diff --git a/.eslintrc b/.eslintrc.json
similarity index 100%
rename from .eslintrc
rename to .eslintrc.json
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 1a324740cbd..34edacfa967 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,10 +1,10 @@
 ---
 name: Bug report
 about: Create a report to help us improve
-
 ---
 
-<!-- Please search existing issues to avoid creating duplicates. -->
+<!-- Please search existing issues to avoid creating duplicates. --> 
+<!-- Also please test using the latest insiders build to make sure your issue has not already been fixed: https://code.visualstudio.com/insiders/ -->
 
 <!-- Use Help > Report Issue to prefill these. -->
 - VSCode Version:
diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md
index 2043e48c7aa..a0435cb1d3e 100644
--- a/.github/ISSUE_TEMPLATE/question.md
+++ b/.github/ISSUE_TEMPLATE/question.md
@@ -1,9 +1,9 @@
 ---
 name: Question
-about: The issue tracker is not for questions. Please ask questions on https://stackoverflow.com/questions/tagged/vscode.
+about: The issue tracker is not for questions. Please ask questions on https://stackoverflow.com/questions/tagged/visual-studio-code.
 
 ---
 
 🚨 The issue tracker is not for questions 🚨
 
-If you have a question, please ask it on https://stackoverflow.com/questions/tagged/vscode.
+If you have a question, please ask it on https://stackoverflow.com/questions/tagged/visual-studio-code.
diff --git a/.github/calendar.yml b/.github/calendar.yml
index a08deeaee6c..d7827edb02b 100644
--- a/.github/calendar.yml
+++ b/.github/calendar.yml
@@ -21,5 +21,11 @@
   '2018-05-15 12:00, US/Pacific':    'development',
   '2018-05-28 18:00, US/Pacific':    'endgame',
   # 'release' not needed anymore, return to 'development' after releasing.
-  '2018-06-06 12:00, US/Pacific':    'development',
+  '2018-06-06 12:00, US/Pacific':    'development', # 1.24.0 released
+  '2018-06-25 18:00, US/Pacific':    'endgame',
+  '2018-07-05 12:00, US/Pacific':    'development', # 1.25.0 released
+  '2018-07-30 18:00, US/Pacific':    'endgame',
+  '2018-08-13 12:00, US/Pacific':    'development', # 1.26.0 released
+  '2018-08-27 18:00, US/Pacific':    'endgame',
+#  '2018-09-05 12:00, US/Pacific':    'development', # 1.27.0 released
 }
diff --git a/.github/classifier.yml b/.github/classifier.yml
index af9e2f84e41..994c12071a2 100644
--- a/.github/classifier.yml
+++ b/.github/classifier.yml
@@ -1,43 +1,69 @@
 {
     perform: true,
     alwaysRequireAssignee: false,
-    labelsRequiringAssignee: [ feature-request ],
+    labelsRequiringAssignee: [],
     autoAssignees: {
+        L10N: [],
+        VIM: [],
         api: {
             assignees: [ jrieken ],
             assignLabel: false
         },
-        color-picker: [],
-        css-less-sass: [ aeschli ],
+        cli: [],
+        color-palette: [],
+        config: [],
+        css-less-scss: [ aeschli ],
+        debug-console: [],
         debug: {
             assignees: [ weinand ],
             assignLabel: false
         },
         diff-editor: [],
+        dropdown: [],
         editor: [],
         editor-1000-limit: [],
         editor-autoclosing: [],
         editor-autoindent: [],
         editor-brackets: [],
         editor-clipboard: [],
+        editor-code-actions: [],
+        editor-code-lens: [],
+        editor-color-picker: [],
+        editor-colors: [],
         editor-columnselect: [],
+        editor-commands: [],
         editor-contrib: [],
-        editor-core: [],
-        editor-find-widget: [],
+        editor-drag-and-drop: [],
+        editor-find: [],
         editor-folding: [],
+        editor-hover: [],
         editor-ime: [],
         editor-input: [],
+        editor-ligatures: [],
+        editor-links: [],
         editor-minimap: [],
         editor-multicursor: [],
+        editor-parameter-hints: [],
+        editor-rendering: [],
         editor-smooth: [],
+        editor-symbols: [],
+        editor-textbuffer: [],
         editor-wrapping: [],
         emmet: [ ramya-rao-a ],
         error-list: [],
+        explorer-custom: [],
+        extension-host: [],
         extensions: [],
+        file-decorations: [],
         file-encoding: {
             assignees: [],
             assignLabel: false
         },
+        file-explorer: {
+            assignees: [ bpasero ],
+            assignLabel: false
+        },
+        file-glob: [],
         file-io: {
             assignees: [],
             assignLabel: false
@@ -46,45 +72,73 @@
             assignees: [],
             assignLabel: false
         },
-        file-explorer: {
-            assignees: [ isidorn ],
-            assignLabel: false
-        },
-        format: [],
+        formatting: [],
         git: [ joaomoreno ],
+        grammar: [],
         hot-exit: [ Tyriar ],
         html: [ aeschli ],
-        i18n: [],
         install-update: [],
         integrated-terminal: [ Tyriar ],
+        integration-test: [],
+        intellisense-config: [],
+        issue-reporter: [ RMacfarlane ],
         javascript: [ mjbvz ],
         json: [],
-        keybindings: [],
         keyboard-layout: [],
+        keybindings: [],
+        keybindings-editor: [],
+        lang-diagnostics: [],
         languages basic: [],
+        list: [],
+        log: [],
         markdown: [ mjbvz ],
+        marketplace: [],
+        menus: [],
         merge-conflict: [ chrmarti ],
         multi-root: {
             assignees: [],
             assignLabel: false
         },
+        os-integration: [],
+        outline: [],
+        output: [],
         perf-profile: [],
+        perf-bloat: [],
+        perf-startup: [],
         php: [ roblourens ],
         proxy: [],
+        quick-pick: [ chrmarti ],
+        release-notes: [],
         remote: {
             assignees: [ jrieken ],
             assignLabel: false
         },
+        rename: [],
+        run-as-admin: [],
+        samples: [],
         scm: [],
         search: [ roblourens ],
+        search-replace: [],
+        settings-editor: [],
+        shared-process: [],
+        smart-select: [],
+        smoke-test: [],
         snippets: {
             assignees: [ jrieken ],
             assignLabel: false
         },
+        suggest: [],
         tasks: [ dbaeumer ],
         telemetry: [],
         themes: [],
+        tokenization: [],
+        tree: [],
         typescript: [ mjbvz ],
+        unit-test: [],
+        uri: [],
+        ux: [],
+        vscode-build: [],
+        webview: [],
         workbench: {
             assignees: [],
             assignLabel: false
@@ -109,6 +163,10 @@
             assignees: [],
             assignLabel: false
         },
+        workbench-grid: {
+            assignees: [],
+            assignLabel: false
+        },
         workbench-history: {
             assignees: [],
             assignLabel: false
@@ -145,6 +203,10 @@
             assignees: [],
             assignLabel: false
         },
+        workbench-views: {
+            assignees: [],
+            assignLabel: false
+        },
         workbench-welcome: [ chrmarti ]
     }
 }
diff --git a/.github/commands.yml b/.github/commands.yml
index ba8c8d7f3ce..56edba1d4da 100644
--- a/.github/commands.yml
+++ b/.github/commands.yml
@@ -29,7 +29,7 @@
             type: 'label',
             name: '*out-of-scope',
             action: 'close',
-            comment: "This issue is being closed to keep the number of issues in our inbox on a manageable level, we are closing issues that have been on the backlog for a long time but have not gained traction: We look at the number of votes the issue has received and the number of duplicate issues filed. If you disagree and feel that this issue is crucial: We are happy to listen and to reconsider.\n\nIf you wonder what we are up to, please see our [roadmap](https://aka.ms/vscoderoadmap) and [issue reporting](https://aka.ms/vscodeissuereporting) guidelines.\n\nThanks for your understanding and happy coding!"
+            comment: "This issue is being closed to keep the number of issues in our inbox on a manageable level, we are closing issues that are not going to be addressed in the foreseeable future: We look at the number of votes the issue has received and the number of duplicate issues filed. If you disagree and feel that this issue is crucial: We are happy to listen and to reconsider.\n\nIf you wonder what we are up to, please see our [roadmap](https://aka.ms/vscoderoadmap) and [issue reporting](https://aka.ms/vscodeissuereporting) guidelines.\n\nThanks for your understanding and happy coding!"
         },
         {
             type: 'label',
@@ -62,5 +62,12 @@
             action: 'comment',
             comment: "Potential duplicates:\n${potentialDuplicates}"
         },
+        {
+            type: 'comment',
+            name: 'needsMoreInfo',
+            action: 'updateLabels',
+            addLabel: 'needs more info',
+            comment: "Thanks for creating this issue! We figured it's missing some basic information or in some other way doesn't follow our [issue reporting](https://aka.ms/vscodeissuereporting) guidelines. Please take the time to review these and update the issue.\n\nHappy Coding!"
+        },
     ]
 }
diff --git a/.github/new_release.yml b/.github/new_release.yml
index a17089e852d..7482b60b108 100644
--- a/.github/new_release.yml
+++ b/.github/new_release.yml
@@ -1,6 +1,6 @@
 {
     newReleaseLabel: 'new release',
     newReleaseColor: '006b75',
-    daysAfterRelease: 7,
+    daysAfterRelease: 5,
     perform: true
-}
\ No newline at end of file
+}
diff --git a/.gitignore b/.gitignore
index ccf4cca05f5..6a9804cd237 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,9 +3,12 @@ npm-debug.log
 Thumbs.db
 node_modules/
 .build/
+extensions/**/dist/
 out/
 out-build/
 out-editor/
+out-editor-src/
+out-editor-build/
 out-editor-esm/
 out-editor-min/
 out-monaco-editor-core/
@@ -14,4 +17,5 @@ out-vscode-min/
 build/node_modules
 coverage/
 test_data/
-yarn-error.log
\ No newline at end of file
+test-results/
+yarn-error.log
diff --git a/.vscode/launch.json b/.vscode/launch.json
index 4761367d036..73b99e84fbb 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -19,6 +19,7 @@
 			"protocol": "inspector",
 			"port": 5870,
 			"restart": true,
+			"smartStep": true,
 			"outFiles": [
 				"${workspaceFolder}/out/**/*.js"
 			]
@@ -29,6 +30,7 @@
 			"name": "Attach to Shared Process",
 			"protocol": "inspector",
 			"port": 5871,
+			"smartStep": true,
 			"outFiles": [
 				"${workspaceFolder}/out/**/*.js"
 			]
@@ -39,6 +41,7 @@
 			"protocol": "inspector",
 			"name": "Attach to Search Process",
 			"port": 5876,
+			"smartStep": true,
 			"outFiles": [
 				"${workspaceFolder}/out/**/*.js"
 			]
@@ -49,6 +52,7 @@
 			"name": "Attach to CLI Process",
 			"protocol": "inspector",
 			"port": 5874,
+			"smartStep": true,
 			"outFiles": [
 				"${workspaceFolder}/out/**/*.js"
 			]
@@ -59,6 +63,7 @@
 			"name": "Attach to Main Process",
 			"protocol": "inspector",
 			"port": 5875,
+			"smartStep": true,
 			"outFiles": [
 				"${workspaceFolder}/out/**/*.js"
 			]
@@ -124,6 +129,7 @@
 			"type": "chrome",
 			"request": "attach",
 			"name": "Attach to VS Code",
+			"smartStep": true,
 			"port": 9222
 		},
 		{
@@ -139,10 +145,11 @@
 			"linux": {
 				"runtimeExecutable": "${workspaceFolder}/scripts/code.sh"
 			},
-			"urlFilter": "*index.html*",
+			"urlFilter": "*workbench.html*",
 			"runtimeArgs": [
 				"--inspect=5875"
 			],
+			"smartStep": true,
 			"skipFiles": [
 				"**/winjs*.js"
 			],
@@ -201,7 +208,7 @@
 			"linux": {
 				"runtimeExecutable": "${workspaceFolder}/.build/electron/code-oss"
 			},
-			"stopOnEntry": false,
+			"outputCapture": "std",
 			"args": [
 				"--delay",
 				"--timeout",
@@ -235,6 +242,15 @@
 				"VSCODE_DEV": "1",
 				"VSCODE_CLI": "1"
 			}
+		},
+		{
+			"name": "Launch Built-in Extension",
+			"type": "extensionHost",
+			"request": "launch",
+			"runtimeExecutable": "${execPath}",
+			"args": [
+				"--extensionDevelopmentPath=${workspaceRoot}/extensions/debug-auto-launch"
+			]
 		}
 	],
 	"compounds": [
diff --git a/.yarnrc b/.yarnrc
index 42f08fa0c02..58d37cc88fb 100644
--- a/.yarnrc
+++ b/.yarnrc
@@ -1,3 +1,3 @@
 disturl "https://atom.io/download/electron"
-target "1.7.12"
+target "2.0.7"
 runtime "electron"
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 09ee1ca9270..f3166331378 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -59,7 +59,7 @@ Please include the following with each issue:
 
 * What you expected to see, versus what you actually saw
 
-* Images, animations, or a link to a video showing the issue occuring
+* Images, animations, or a link to a video showing the issue occurring
 
 * A code snippet that demonstrates the issue or a link to a code repository the developers can easily pull down to recreate the issue locally
 
@@ -81,7 +81,7 @@ Don't feel bad if the developers can't reproduce the issue right away. They will
 
 ### Follow Your Issue
 
-Once submitted, your report will go into the [issue tracking](https://github.com/Microsoft/vscode/wiki/Issue-Tracking) work flow. Be sure to understand what will happen next, so you know what to expect, and how to continue to assist throughout the process.
+Once submitted, your report will go into the [issue tracking](https://github.com/Microsoft/vscode/wiki/Issue-Tracking) workflow. Be sure to understand what will happen next, so you know what to expect, and how to continue to assist throughout the process.
 
 ## Automated Issue Management
 
diff --git a/OSSREADME.json b/OSSREADME.json
index 8f167afc904..e15cccabcad 100644
--- a/OSSREADME.json
+++ b/OSSREADME.json
@@ -2,7 +2,7 @@
 [
 {
 	"name": "chromium",
-	"version": "58.0.3029.110",
+	"version": "61.0.3163.100",
 	"repositoryURL": "http://www.chromium.org/Home",
 	"licenseDetail": [
 		"BSD License",
@@ -38,20 +38,20 @@
 },
 {
 	"name": "libchromiumcontent",
-	"version": "58.0.3029.110",
+	"version": "61.0.3163.100",
 	"license": "MIT",
 	"repositoryURL": "https://github.com/electron/libchromiumcontent",
 	"isProd": true
 },
 {
 	"name": "nodejs",
-	"version": "7.9.0",
+	"version": "8.9.3",
 	"repositoryURL": "https://github.com/nodejs/node",
 	"isProd": true
 },
 {
 	"name": "electron",
-	"version": "1.7.3",
+	"version": "2.0.7",
 	"license": "MIT",
 	"repositoryURL": "https://github.com/electron/electron",
 	"isProd": true
diff --git a/README.md b/README.md
index c44f8166301..7b861aad8c9 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,8 @@
 # Visual Studio Code - Open Source
 
-[![Build Status](https://vscode.visualstudio.com/_apis/public/build/definitions/a4cdce18-a05c-4bb8-9476-5d07e63bfd76/1/badge)](https://aka.ms/vscode-builds)
-[![Coverage Status](https://img.shields.io/coveralls/Microsoft/vscode/master.svg)](https://coveralls.io/github/Microsoft/vscode?branch=master)
+[![Build Status](https://vscode.visualstudio.com/_apis/public/build/definitions/a4cdce18-a05c-4bb8-9476-5d07e63bfd76/1/badge?branchName=master)](https://aka.ms/vscode-builds)
+[![Feature Requests](https://img.shields.io/github/issues/Microsoft/vscode/feature-request.svg)](https://github.com/Microsoft/vscode/issues?utf8=✓&q=is%3Aissue+is%3Aopen+label%3Afeature-request)
+[![Bugs](https://img.shields.io/github/issues/Microsoft/vscode/bug.svg)](https://github.com/Microsoft/vscode/issues?utf8=✓&q=is%3Aissue+is%3Aopen+label%3Abug)
 [![Gitter](https://img.shields.io/badge/chat-on%20gitter-blue.svg)](https://gitter.im/Microsoft/vscode)
 
 [VS Code](https://code.visualstudio.com) is a new type of tool that combines the simplicity of
@@ -16,9 +17,9 @@ VS Code is updated monthly with new features and bug fixes. You can download it
 
 The [`vscode`](https://github.com/microsoft/vscode) repository is where we do development and there are many ways you can participate in the project, for example:
 
-* [Submit bugs and feature requests](https://github.com/microsoft/vscode/issues) and help us verify as they are checked in
-* Review [source code changes](https://github.com/microsoft/vscode/pulls)
-* Review the [documentation](https://github.com/microsoft/vscode-docs) and make pull requests for anything from typos to new content
+* [Submit bugs and feature requests](https://github.com/microsoft/vscode/issues) and help us verify as they are checked in.
+* Review [source code changes](https://github.com/microsoft/vscode/pulls).
+* Review the [documentation](https://github.com/microsoft/vscode-docs) and make pull requests for anything from typos to new content.
 
 ## Contributing
 
@@ -42,6 +43,7 @@ Please see also our [Code of Conduct](CODE_OF_CONDUCT.md).
 * [Tweet](https://twitter.com/code) us with other feedback.
 
 ## Related Projects
+
 Many of the core components and extensions to Code live in their own repositories on GitHub. For example, the [node debug adapter](https://github.com/microsoft/vscode-node-debug) and the [mono debug adapter](https://github.com/microsoft/vscode-mono-debug).
 
 For a complete list, please see the [Related Projects](https://github.com/Microsoft/vscode/wiki/Related-Projects) page on our wiki.
diff --git a/ThirdPartyNotices.txt b/ThirdPartyNotices.txt
index b2fe9e4c585..80e9fd6e808 100644
--- a/ThirdPartyNotices.txt
+++ b/ThirdPartyNotices.txt
@@ -21,48 +21,51 @@ This project incorporates components from the projects listed below. The origina
 14.	davidrios/pug-tmbundle (https://github.com/davidrios/pug-tmbundle)
 15.	definitelytyped (https://github.com/DefinitelyTyped/DefinitelyTyped)
 16.	demyte/language-cshtml (https://github.com/demyte/language-cshtml)
-17.	dotnet/csharp-tmLanguage version 0.1.0 (https://github.com/dotnet/csharp-tmLanguage)
-18.	expand-abbreviation version 0.5.8 (https://github.com/emmetio/expand-abbreviation)
-19.	fadeevab/make.tmbundle (https://github.com/fadeevab/make.tmbundle)
-20.	freebroccolo/atom-language-swift (https://github.com/freebroccolo/atom-language-swift)
-21.	HTML 5.1 W3C Working Draft version 08 October 2015 (http://www.w3.org/TR/2015/WD-html51-20151008/)
-22.	Ikuyadeu/vscode-R (https://github.com/Ikuyadeu/vscode-R)
-23.	Ionic documentation version 1.2.4 (https://github.com/ionic-team/ionic-site)
-24.	ionide/ionide-fsgrammar (https://github.com/ionide/ionide-fsgrammar)
-25.	js-beautify version 1.6.8 (https://github.com/beautify-web/js-beautify)
-26.	Jxck/assert version 1.0.0 (https://github.com/Jxck/assert)
-27.	language-docker (https://github.com/moby/moby)
-28.	language-go version 0.39.0 (https://github.com/atom/language-go)
-29.	language-less (https://github.com/atom/language-less)
-30.	language-php (https://github.com/atom/language-php)
-31.	language-rust version 0.4.9 (https://github.com/zargony/atom-language-rust)
-32.	MagicStack/MagicPython (https://github.com/MagicStack/MagicPython)
-33.	mdn-data version 1.1.12 (https://github.com/mdn/data)
-34.	Microsoft/TypeScript-TmLanguage version 0.0.1 (https://github.com/Microsoft/TypeScript-TmLanguage)
-35.	Microsoft/vscode-JSON.tmLanguage (https://github.com/Microsoft/vscode-JSON.tmLanguage)
-36.	Microsoft/vscode-mssql (https://github.com/Microsoft/vscode-mssql)
-37.	mmims/language-batchfile (https://github.com/mmims/language-batchfile)
-38.	octicons-code version 3.1.0 (https://octicons.github.com)
-39.	octicons-font version 3.1.0 (https://octicons.github.com)
-40.	PowerShell/EditorSyntax (https://github.com/powershell/editorsyntax)
-41.	seti-ui version 0.1.0 (https://github.com/jesseweed/seti-ui)
-42.	shaders-tmLanguage version 0.1.0 (https://github.com/tgjones/shaders-tmLanguage)
-43.	textmate/asp.vb.net.tmbundle (https://github.com/textmate/asp.vb.net.tmbundle)
-44.	textmate/c.tmbundle (https://github.com/textmate/c.tmbundle)
-45.	textmate/diff.tmbundle (https://github.com/textmate/diff.tmbundle)
-46.	textmate/git.tmbundle (https://github.com/textmate/git.tmbundle)
-47.	textmate/groovy.tmbundle (https://github.com/textmate/groovy.tmbundle)
-48.	textmate/html.tmbundle (https://github.com/textmate/html.tmbundle)
-49.	textmate/ini.tmbundle (https://github.com/textmate/ini.tmbundle)
-50.	textmate/javascript.tmbundle (https://github.com/textmate/javascript.tmbundle)
-51.	textmate/lua.tmbundle (https://github.com/textmate/lua.tmbundle)
-52.	textmate/markdown.tmbundle (https://github.com/textmate/markdown.tmbundle)
-53.	textmate/perl.tmbundle (https://github.com/textmate/perl.tmbundle)
-54.	textmate/ruby.tmbundle (https://github.com/textmate/ruby.tmbundle)
-55.	textmate/yaml.tmbundle (https://github.com/textmate/yaml.tmbundle)
-56.	TypeScript-TmLanguage version 0.1.8 (https://github.com/Microsoft/TypeScript-TmLanguage)
-57.	vscode-logfile-highlighter version 1.2.0 (https://github.com/emilast/vscode-logfile-highlighter)
-58.	vscode-swift version 0.0.1 (https://github.com/owensd/vscode-swift)
+17.	Document Object Model ()
+18.	dotnet/csharp-tmLanguage version 0.1.0 (https://github.com/dotnet/csharp-tmLanguage)
+19.	expand-abbreviation version 0.5.8 (https://github.com/emmetio/expand-abbreviation)
+20.	fadeevab/make.tmbundle (https://github.com/fadeevab/make.tmbundle)
+21.	freebroccolo/atom-language-swift (https://github.com/freebroccolo/atom-language-swift)
+22.	HTML 5.1 W3C Working Draft version 08 October 2015 (http://www.w3.org/TR/2015/WD-html51-20151008/)
+23.	Ikuyadeu/vscode-R (https://github.com/Ikuyadeu/vscode-R)
+24.	Ionic documentation version 1.2.4 (https://github.com/ionic-team/ionic-site)
+25.	ionide/ionide-fsgrammar (https://github.com/ionide/ionide-fsgrammar)
+26.	js-beautify version 1.6.8 (https://github.com/beautify-web/js-beautify)
+27.	Jxck/assert version 1.0.0 (https://github.com/Jxck/assert)
+28.	language-docker (https://github.com/moby/moby)
+29.	language-go version 0.39.0 (https://github.com/atom/language-go)
+30.	language-less (https://github.com/atom/language-less)
+31.	language-php (https://github.com/atom/language-php)
+32.	language-rust version 0.4.9 (https://github.com/zargony/atom-language-rust)
+33.	MagicStack/MagicPython (https://github.com/MagicStack/MagicPython)
+34.	mdn-data version 1.1.12 (https://github.com/mdn/data)
+35.	Microsoft/TypeScript-TmLanguage version 0.0.1 (https://github.com/Microsoft/TypeScript-TmLanguage)
+36.	Microsoft/vscode-JSON.tmLanguage (https://github.com/Microsoft/vscode-JSON.tmLanguage)
+37.	Microsoft/vscode-mssql (https://github.com/Microsoft/vscode-mssql)
+38.	mmims/language-batchfile (https://github.com/mmims/language-batchfile)
+39.	octicons-code version 3.1.0 (https://octicons.github.com)
+40.	octicons-font version 3.1.0 (https://octicons.github.com)
+41.	PowerShell/EditorSyntax (https://github.com/powershell/editorsyntax)
+42.	seti-ui version 0.1.0 (https://github.com/jesseweed/seti-ui)
+43.	shaders-tmLanguage version 0.1.0 (https://github.com/tgjones/shaders-tmLanguage)
+44.	textmate/asp.vb.net.tmbundle (https://github.com/textmate/asp.vb.net.tmbundle)
+45.	textmate/c.tmbundle (https://github.com/textmate/c.tmbundle)
+46.	textmate/diff.tmbundle (https://github.com/textmate/diff.tmbundle)
+47.	textmate/git.tmbundle (https://github.com/textmate/git.tmbundle)
+48.	textmate/groovy.tmbundle (https://github.com/textmate/groovy.tmbundle)
+49.	textmate/html.tmbundle (https://github.com/textmate/html.tmbundle)
+50.	textmate/ini.tmbundle (https://github.com/textmate/ini.tmbundle)
+51.	textmate/javascript.tmbundle (https://github.com/textmate/javascript.tmbundle)
+52.	textmate/lua.tmbundle (https://github.com/textmate/lua.tmbundle)
+53.	textmate/markdown.tmbundle (https://github.com/textmate/markdown.tmbundle)
+54.	textmate/perl.tmbundle (https://github.com/textmate/perl.tmbundle)
+55.	textmate/ruby.tmbundle (https://github.com/textmate/ruby.tmbundle)
+56.	textmate/yaml.tmbundle (https://github.com/textmate/yaml.tmbundle)
+57.	TypeScript-TmLanguage version 0.1.8 (https://github.com/Microsoft/TypeScript-TmLanguage)
+58.	Unicode ()
+59.	vscode-logfile-highlighter version 1.2.0 (https://github.com/emilast/vscode-logfile-highlighter)
+60.	vscode-swift version 0.0.1 (https://github.com/owensd/vscode-swift)
+61.	Web Background Synchronization (https://github.com/WICG/BackgroundSync)
 
 
 %% atom/language-c NOTICES AND INFORMATION BEGIN HERE
@@ -600,6 +603,27 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 =========================================
 END OF demyte/language-cshtml NOTICES AND INFORMATION
 
+%% Document Object Model NOTICES AND INFORMATION BEGIN HERE
+=========================================
+W3C License
+This work is being provided by the copyright holders under the following license.
+By obtaining and/or copying this work, you (the licensee) agree that you have read, understood, and will comply with the following terms and conditions.
+Permission to copy, modify, and distribute this work, with or without modification, for any purpose and without fee or royalty is hereby granted, provided that you include the following
+on ALL copies of the work or portions thereof, including modifications:
+* The full text of this NOTICE in a location viewable to users of the redistributed or derivative work.
+* Any pre-existing intellectual property disclaimers, notices, or terms and conditions. If none exist, the W3C Software and Document Short Notice should be included.
+* Notice of any changes or modifications, through a copyright statement on the new code or document such as "This software or document includes material copied from or derived
+from Document Object Model. Copyright © 2015 W3C® (MIT, ERCIM, Keio, Beihang)."
+Disclaimers
+THIS WORK IS PROVIDED "AS IS
+ AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY OR
+FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE OR DOCUMENT WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
+COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENT.
+The name and trademarks of copyright holders may NOT be used in advertising or publicity pertaining to the work without specific, written prior permission.
+Title to copyright in this work will at all times remain with copyright holders.
+=========================================
+END OF Document Object Model NOTICES AND INFORMATION
+
 %% dotnet/csharp-tmLanguage NOTICES AND INFORMATION BEGIN HERE
 =========================================
 MIT License
@@ -831,7 +855,7 @@ END OF ionide/ionide-fsgrammar NOTICES AND INFORMATION
 =========================================
 The MIT License (MIT)
 
-Copyright (c) 2007-2017 Einar Lielmanis, Liam Newman, and contributors.
+Copyright (c) 2007-2018 Einar Lielmanis, Liam Newman, and contributors.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
@@ -2225,6 +2249,66 @@ THE SOFTWARE.
 =========================================
 END OF TypeScript-TmLanguage NOTICES AND INFORMATION
 
+%% Unicode NOTICES AND INFORMATION BEGIN HERE
+=========================================
+Unicode Data Files include all data files under the directories
+http://www.unicode.org/Public/, http://www.unicode.org/reports/,
+http://www.unicode.org/cldr/data/, http://source.icu-project.org/repos/icu/, and
+http://www.unicode.org/utility/trac/browser/.
+
+Unicode Data Files do not include PDF online code charts under the
+directory http://www.unicode.org/Public/.
+
+Software includes any source code published in the Unicode Standard
+or under the directories
+http://www.unicode.org/Public/, http://www.unicode.org/reports/,
+http://www.unicode.org/cldr/data/, http://source.icu-project.org/repos/icu/, and
+http://www.unicode.org/utility/trac/browser/.
+
+NOTICE TO USER: Carefully read the following legal agreement.
+BY DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING UNICODE INC.'S
+DATA FILES ("DATA FILES"), AND/OR SOFTWARE ("SOFTWARE"),
+YOU UNEQUIVOCALLY ACCEPT, AND AGREE TO BE BOUND BY, ALL OF THE
+TERMS AND CONDITIONS OF THIS AGREEMENT.
+IF YOU DO NOT AGREE, DO NOT DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE
+THE DATA FILES OR SOFTWARE.
+
+COPYRIGHT AND PERMISSION NOTICE
+
+Copyright (c) 1991-2017 Unicode, Inc. All rights reserved.
+Distributed under the Terms of Use in http://www.unicode.org/copyright.html.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+=========================================
+END OF Unicode NOTICES AND INFORMATION
+
 %% vscode-logfile-highlighter NOTICES AND INFORMATION BEGIN HERE
 =========================================
 The MIT License (MIT)
@@ -2274,4 +2358,210 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 =========================================
-END OF vscode-swift NOTICES AND INFORMATION
\ No newline at end of file
+END OF vscode-swift NOTICES AND INFORMATION
+
+%% Web Background Synchronization NOTICES AND INFORMATION BEGIN HERE
+=========================================
+Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright {yyyy} {name of copyright owner}
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+=========================================
+END OF Web Background Synchronization NOTICES AND INFORMATION
\ No newline at end of file
diff --git a/build/builtInExtensions.json b/build/builtInExtensions.json
index 795500b06eb..0fba2a82a6f 100644
--- a/build/builtInExtensions.json
+++ b/build/builtInExtensions.json
@@ -1,12 +1,12 @@
 [
 	{
 		"name": "ms-vscode.node-debug",
-		"version": "1.24.0",
+		"version": "1.28.1",
 		"repo": "https://github.com/Microsoft/vscode-node-debug"
 	},
 	{
 		"name": "ms-vscode.node-debug2",
-		"version": "1.25.0",
+		"version": "1.28.0",
 		"repo": "https://github.com/Microsoft/vscode-node-debug2"
 	}
 ]
diff --git a/build/dependencies.js b/build/dependencies.js
index a0b1ee01dc5..2adf7e29ca7 100644
--- a/build/dependencies.js
+++ b/build/dependencies.js
@@ -43,7 +43,7 @@ function asYarnDependency(prefix, tree) {
 }
 
 function getYarnProductionDependencies(cwd) {
-	const raw = cp.execSync('yarn list --json', { cwd, encoding: 'utf8', env: { ...process.env, NODE_ENV: 'production' }, stdio: [null, null, 'ignore'] });
+	const raw = cp.execSync('yarn list --json', { cwd, encoding: 'utf8', env: { ...process.env, NODE_ENV: 'production' }, stdio: [null, null, 'inherit'] });
 	const match = /^{"type":"tree".*$/m.exec(raw);
 
 	if (!match || match.length !== 1) {
diff --git a/build/gulpfile.editor.js b/build/gulpfile.editor.js
index 3fc14da5045..0c7a37b1f76 100644
--- a/build/gulpfile.editor.js
+++ b/build/gulpfile.editor.js
@@ -12,10 +12,12 @@ const File = require('vinyl');
 const i18n = require('./lib/i18n');
 const standalone = require('./lib/standalone');
 const cp = require('child_process');
+const compilation = require('./lib/compilation');
+const monacoapi = require('./monaco/api');
+const fs = require('fs');
 
 var root = path.dirname(__dirname);
 var sha1 = util.getVersion(root);
-// @ts-ignore Microsoft/TypeScript#21262 complains about a require of a JSON file
 var semver = require('./monaco/package.json').version;
 var headerVersion = semver + '(' + sha1 + ')';
 
@@ -59,29 +61,56 @@ var BUNDLED_FILE_HEADER = [
 	''
 ].join('\n');
 
-function editorLoaderConfig() {
-	var result = common.loaderConfig();
-
-	// never ship octicons in editor
-	result.paths['vs/base/browser/ui/octiconLabel/octiconLabel'] = 'out-build/vs/base/browser/ui/octiconLabel/octiconLabel.mock';
-
-	// force css inlining to use base64 -- see https://github.com/Microsoft/monaco-editor/issues/148
-	result['vs/css'] = {
-		inlineResources: 'base64',
-		inlineResourcesLimit: 3000 // see https://github.com/Microsoft/monaco-editor/issues/336
-	};
-
-	return result;
-}
-
 const languages = i18n.defaultLanguages.concat([]);  // i18n.defaultLanguages.concat(process.env.VSCODE_QUALITY !== 'stable' ? i18n.extraLanguages : []);
 
+gulp.task('clean-editor-src', util.rimraf('out-editor-src'));
+gulp.task('extract-editor-src', ['clean-editor-src'], function () {
+	console.log(`If the build fails, consider tweaking shakeLevel below to a lower value.`);
+	const apiusages = monacoapi.execute().usageContent;
+	const extrausages = fs.readFileSync(path.join(root, 'build', 'monaco', 'monaco.usage.recipe')).toString();
+	standalone.extractEditor({
+		sourcesRoot: path.join(root, 'src'),
+		entryPoints: [
+			'vs/editor/editor.main',
+			'vs/editor/editor.worker',
+			'vs/base/worker/workerMain',
+		],
+		inlineEntryPoints: [
+			apiusages,
+			extrausages
+		],
+		libs: [
+			`lib.d.ts`,
+			`lib.es2015.collection.d.ts`
+		],
+		redirects: {
+			'vs/base/browser/ui/octiconLabel/octiconLabel': 'vs/base/browser/ui/octiconLabel/octiconLabel.mock',
+		},
+		compilerOptions: {
+			module: 2, // ModuleKind.AMD
+		},
+		shakeLevel: 2, // 0-Files, 1-InnerFile, 2-ClassMembers
+		importIgnorePattern: /^vs\/css!/,
+		destRoot: path.join(root, 'out-editor-src')
+	});
+});
+
+// Full compile, including nls and inline sources in sourcemaps, for build
+gulp.task('clean-editor-build', util.rimraf('out-editor-build'));
+gulp.task('compile-editor-build', ['clean-editor-build', 'extract-editor-src'], compilation.compileTask('out-editor-src', 'out-editor-build', true));
+
 gulp.task('clean-optimized-editor', util.rimraf('out-editor'));
-gulp.task('optimize-editor', ['clean-optimized-editor', 'compile-client-build'], common.optimizeTask({
+gulp.task('optimize-editor', ['clean-optimized-editor', 'compile-editor-build'], common.optimizeTask({
+	src: 'out-editor-build',
 	entryPoints: editorEntryPoints,
 	otherSources: editorOtherSources,
 	resources: editorResources,
-	loaderConfig: editorLoaderConfig(),
+	loaderConfig: {
+		paths: {
+			'vs': 'out-editor-build/vs',
+			'vscode': 'empty:'
+		}
+	},
 	bundleLoader: false,
 	header: BUNDLED_FILE_HEADER,
 	bundleInfo: true,
@@ -93,17 +122,25 @@ gulp.task('clean-minified-editor', util.rimraf('out-editor-min'));
 gulp.task('minify-editor', ['clean-minified-editor', 'optimize-editor'], common.minifyTask('out-editor'));
 
 gulp.task('clean-editor-esm', util.rimraf('out-editor-esm'));
-gulp.task('extract-editor-esm', ['clean-editor-esm', 'clean-editor-distro'], function () {
-	standalone.createESMSourcesAndResources({
-		entryPoints: [
-			'vs/editor/editor.main',
-			'vs/editor/editor.worker'
-		],
+gulp.task('extract-editor-esm', ['clean-editor-esm', 'clean-editor-distro', 'extract-editor-src'], function () {
+	standalone.createESMSourcesAndResources2({
+		srcFolder: './out-editor-src',
 		outFolder: './out-editor-esm/src',
 		outResourcesFolder: './out-monaco-editor-core/esm',
-		redirects: {
-			'vs/base/browser/ui/octiconLabel/octiconLabel': 'vs/base/browser/ui/octiconLabel/octiconLabel.mock',
-			'vs/nls': 'vs/nls.mock',
+		ignores: [
+			'inlineEntryPoint:0.ts',
+			'inlineEntryPoint:1.ts',
+			'vs/loader.js',
+			'vs/nls.ts',
+			'vs/nls.build.js',
+			'vs/nls.d.ts',
+			'vs/css.js',
+			'vs/css.build.js',
+			'vs/css.d.ts',
+			'vs/base/worker/workerMain.ts',
+		],
+		renames: {
+			'vs/nls.mock.ts': 'vs/nls.ts'
 		}
 	});
 });
@@ -165,7 +202,7 @@ gulp.task('editor-distro', ['clean-editor-distro', 'compile-editor-esm', 'minify
 				this.emit('data', new File({
 					path: data.path.replace(/monaco\.d\.ts/, 'editor.api.d.ts'),
 					base: data.base,
-					contents: new Buffer(toExternalDTS(data.contents.toString()))
+					contents: Buffer.from(toExternalDTS(data.contents.toString()))
 				}));
 			}))
 			.pipe(gulp.dest('out-monaco-editor-core/esm/vs/editor')),
@@ -230,7 +267,7 @@ gulp.task('editor-distro', ['clean-editor-distro', 'compile-editor-esm', 'minify
 });
 
 gulp.task('analyze-editor-distro', function () {
-	// @ts-ignore Microsoft/TypeScript#21262 complains about a require of a JSON file
+	// @ts-ignore
 	var bundleInfo = require('../out-editor/bundleInfo.json');
 	var graph = bundleInfo.graph;
 	var bundles = bundleInfo.bundles;
diff --git a/build/gulpfile.extensions.js b/build/gulpfile.extensions.js
index 3ec638c2f22..bd38427a422 100644
--- a/build/gulpfile.extensions.js
+++ b/build/gulpfile.extensions.js
@@ -20,7 +20,6 @@ const sourcemaps = require('gulp-sourcemaps');
 const nlsDev = require('vscode-nls-dev');
 const root = path.dirname(__dirname);
 const commit = util.getVersion(root);
-const i18n = require('./lib/i18n');
 const plumber = require('gulp-plumber');
 
 const extensionsPath = path.join(path.dirname(__dirname), 'extensions');
@@ -32,8 +31,6 @@ const compilations = glob.sync('**/tsconfig.json', {
 
 const getBaseUrl = out => `https://ticino.blob.core.windows.net/sourcemaps/${commit}/${out}`;
 
-const languages = i18n.defaultLanguages.concat(process.env.VSCODE_QUALITY !== 'stable' ? i18n.extraLanguages : []);
-
 const tasks = compilations.map(function (tsconfigFile) {
 	const absolutePath = path.join(extensionsPath, tsconfigFile);
 	const relativeDirname = path.dirname(tsconfigFile);
@@ -58,7 +55,6 @@ const tasks = compilations.map(function (tsconfigFile) {
 	const srcBase = path.join(root, 'src');
 	const src = path.join(srcBase, '**');
 	const out = path.join(root, 'out');
-	const i18nPath = path.join(__dirname, '..', 'i18n');
 	const baseUrl = getBaseUrl(out);
 
 	let headerId, headerOut;
@@ -102,9 +98,9 @@ const tasks = compilations.map(function (tsconfigFile) {
 					sourceRoot: '../src'
 				}))
 				.pipe(tsFilter.restore)
-				.pipe(build ? nlsDev.createAdditionalLanguageFiles(languages, i18nPath, out) : es.through())
 				.pipe(build ? nlsDev.bundleMetaDataFiles(headerId, headerOut) : es.through())
-				.pipe(build ? nlsDev.bundleLanguageFiles() : es.through())
+				// Filter out *.nls.json file. We needed them only to bundle meta data file.
+				.pipe(filter(['**', '!**/*.nls.json']))
 				.pipe(reporter.end(emitError));
 
 			return es.duplex(input, output);
@@ -171,4 +167,4 @@ gulp.task('watch-extensions', tasks.map(t => t.watch));
 
 gulp.task('clean-extensions-build', tasks.map(t => t.cleanBuild));
 gulp.task('compile-extensions-build', tasks.map(t => t.compileBuild));
-gulp.task('watch-extensions-build', tasks.map(t => t.watchBuild));
\ No newline at end of file
+gulp.task('watch-extensions-build', tasks.map(t => t.watchBuild));
diff --git a/build/gulpfile.hygiene.js b/build/gulpfile.hygiene.js
index a84e78dece1..893568ca9c5 100644
--- a/build/gulpfile.hygiene.js
+++ b/build/gulpfile.hygiene.js
@@ -44,7 +44,9 @@ const indentationFilter = [
 	'!ThirdPartyNotices.txt',
 	'!LICENSE.txt',
 	'!src/vs/nls.js',
+	'!src/vs/nls.build.js',
 	'!src/vs/css.js',
+	'!src/vs/css.build.js',
 	'!src/vs/loader.js',
 	'!src/vs/base/common/marked/marked.js',
 	'!src/vs/base/common/winjs.base.js',
@@ -82,6 +84,7 @@ const indentationFilter = [
 	'!build/{lib,tslintRules}/**/*.js',
 	'!build/**/*.sh',
 	'!build/tfs/**/*.js',
+	'!build/tfs/**/*.config',
 	'!**/Dockerfile',
 	'!extensions/markdown-language-features/media/*.js'
 ];
@@ -104,6 +107,7 @@ const copyrightFilter = [
 	'!**/*.code-workspace',
 	'!build/**/*.init',
 	'!resources/linux/snap/snapcraft.yaml',
+	'!resources/linux/snap/electron-launch',
 	'!resources/win32/bin/code.js',
 	'!extensions/markdown-language-features/media/highlight.css',
 	'!extensions/html-language-features/server/src/modes/typescript/*',
diff --git a/build/gulpfile.mixin.js b/build/gulpfile.mixin.js
index a370981ab3c..29cce77c5dd 100644
--- a/build/gulpfile.mixin.js
+++ b/build/gulpfile.mixin.js
@@ -15,7 +15,6 @@ const remote = require('gulp-remote-src');
 const zip = require('gulp-vinyl-zip');
 const assign = require('object-assign');
 
-// @ts-ignore Microsoft/TypeScript#21262 complains about a require of a JSON file
 const pkg = require('../package.json');
 
 gulp.task('mixin', function () {
@@ -56,7 +55,6 @@ gulp.task('mixin', function () {
 			.pipe(util.rebase(2))
 			.pipe(productJsonFilter)
 			.pipe(buffer())
-			// @ts-ignore Microsoft/TypeScript#21262 complains about a require of a JSON file
 			.pipe(json(o => assign({}, require('../product.json'), o)))
 			.pipe(productJsonFilter.restore);
 
diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
index 30a1563d7b9..46c045e0e89 100644
--- a/build/gulpfile.vscode.js
+++ b/build/gulpfile.vscode.js
@@ -17,23 +17,18 @@ const vfs = require('vinyl-fs');
 const rename = require('gulp-rename');
 const replace = require('gulp-replace');
 const filter = require('gulp-filter');
-const buffer = require('gulp-buffer');
 const json = require('gulp-json-editor');
 const _ = require('underscore');
 const util = require('./lib/util');
 const ext = require('./lib/extensions');
 const buildfile = require('../src/buildfile');
 const common = require('./lib/optimize');
-const nlsDev = require('vscode-nls-dev');
 const root = path.dirname(__dirname);
 const commit = util.getVersion(root);
-// @ts-ignore Microsoft/TypeScript#21262 complains about a require of a JSON file
 const packageJson = require('../package.json');
-// @ts-ignore Microsoft/TypeScript#21262 complains about a require of a JSON file
 const product = require('../product.json');
 const crypto = require('crypto');
 const i18n = require('./lib/i18n');
-const glob = require('glob');
 const deps = require('./dependencies');
 const getElectronVersion = require('./lib/electron').getElectronVersion;
 const createAsar = require('./lib/asar').createAsar;
@@ -42,21 +37,12 @@ const productionDependencies = deps.getProductionDependencies(path.dirname(__dir
 // @ts-ignore
 const baseModules = Object.keys(process.binding('natives')).filter(n => !/^_|\//.test(n));
 const nodeModules = ['electron', 'original-fs']
+	// @ts-ignore JSON checking: dependencies property is optional
 	.concat(Object.keys(product.dependencies || {}))
 	.concat(_.uniq(productionDependencies.map(d => d.name)))
 	.concat(baseModules);
 
 // Build
-// @ts-ignore Microsoft/TypeScript#21262 complains about a require of a JSON file
-const builtInExtensions = require('./builtInExtensions.json');
-
-const excludedExtensions = [
-	'vscode-api-tests',
-	'vscode-colorize-tests',
-	'ms-vscode.node-debug',
-	'ms-vscode.node-debug2',
-];
-
 const vscodeEntryPoints = _.flatten([
 	buildfile.entrypoint('vs/workbench/workbench.main'),
 	buildfile.base,
@@ -69,23 +55,24 @@ const vscodeResources = [
 	'out-build/cli.js',
 	'out-build/driver.js',
 	'out-build/bootstrap.js',
+	'out-build/bootstrap-fork.js',
 	'out-build/bootstrap-amd.js',
+	'out-build/bootstrap-window.js',
 	'out-build/paths.js',
 	'out-build/vs/**/*.{svg,png,cur,html}',
 	'out-build/vs/base/common/performance.js',
-	'out-build/vs/base/node/{stdForkStart.js,terminateProcess.sh, cpuUsage.sh}',
+	'out-build/vs/base/node/{stdForkStart.js,terminateProcess.sh,cpuUsage.sh}',
 	'out-build/vs/base/browser/ui/octiconLabel/octicons/**',
 	'out-build/vs/workbench/browser/media/*-theme.css',
-	'out-build/vs/workbench/electron-browser/bootstrap/**',
 	'out-build/vs/workbench/parts/debug/**/*.json',
 	'out-build/vs/workbench/parts/execution/**/*.scpt',
 	'out-build/vs/workbench/parts/webview/electron-browser/webview-pre.js',
 	'out-build/vs/**/markdown.css',
 	'out-build/vs/workbench/parts/tasks/**/*.json',
-	'out-build/vs/workbench/parts/terminal/electron-browser/terminalProcess.js',
 	'out-build/vs/workbench/parts/welcome/walkThrough/**/*.md',
 	'out-build/vs/workbench/services/files/**/*.exe',
 	'out-build/vs/workbench/services/files/**/*.md',
+	'out-build/vs/code/electron-browser/workbench/**',
 	'out-build/vs/code/electron-browser/sharedProcess/sharedProcess.js',
 	'out-build/vs/code/electron-browser/issue/issueReporter.js',
 	'out-build/vs/code/electron-browser/processExplorer/processExplorer.js',
@@ -98,33 +85,33 @@ const BUNDLED_FILE_HEADER = [
 	' *--------------------------------------------------------*/'
 ].join('\n');
 
-const languages = i18n.defaultLanguages.concat([]);  // i18n.defaultLanguages.concat(process.env.VSCODE_QUALITY !== 'stable' ? i18n.extraLanguages : []);
-
 gulp.task('clean-optimized-vscode', util.rimraf('out-vscode'));
 gulp.task('optimize-vscode', ['clean-optimized-vscode', 'compile-build', 'compile-extensions-build'], common.optimizeTask({
+	src: 'out-build',
 	entryPoints: vscodeEntryPoints,
 	otherSources: [],
 	resources: vscodeResources,
 	loaderConfig: common.loaderConfig(nodeModules),
 	header: BUNDLED_FILE_HEADER,
 	out: 'out-vscode',
-	languages: languages,
 	bundleInfo: undefined
 }));
 
 
 gulp.task('optimize-index-js', ['optimize-vscode'], () => {
-	const fullpath = path.join(process.cwd(), 'out-vscode/vs/workbench/electron-browser/bootstrap/index.js');
+	const fullpath = path.join(process.cwd(), 'out-vscode/vs/code/electron-browser/workbench/workbench.js');
 	const contents = fs.readFileSync(fullpath).toString();
 	const newContents = contents.replace('[/*BUILD->INSERT_NODE_MODULES*/]', JSON.stringify(nodeModules));
 	fs.writeFileSync(fullpath, newContents);
 });
 
-const baseUrl = `https://ticino.blob.core.windows.net/sourcemaps/${commit}/core`;
+const sourceMappingURLBase = `https://ticino.blob.core.windows.net/sourcemaps/${commit}`;
 gulp.task('clean-minified-vscode', util.rimraf('out-vscode-min'));
-gulp.task('minify-vscode', ['clean-minified-vscode', 'optimize-index-js'], common.minifyTask('out-vscode', baseUrl));
+gulp.task('minify-vscode', ['clean-minified-vscode', 'optimize-index-js'], common.minifyTask('out-vscode', `${sourceMappingURLBase}/core`));
 
 // Package
+
+// @ts-ignore JSON checking: darwinCredits is optional
 const darwinCreditsTemplate = product.darwinCredits && _.template(fs.readFileSync(path.join(root, product.darwinCredits), 'utf8'));
 
 const config = {
@@ -153,6 +140,8 @@ const config = {
 	linuxExecutableName: product.applicationName,
 	winIcon: 'resources/win32/code.ico',
 	token: process.env['VSCODE_MIXIN_PASSWORD'] || process.env['GITHUB_TOKEN'] || void 0,
+
+	// @ts-ignore JSON checking: electronRepository is optional
 	repo: product.electronRepository || void 0
 };
 
@@ -225,48 +214,23 @@ function packageTask(platform, arch, opts) {
 		const checksums = computeChecksums(out, [
 			'vs/workbench/workbench.main.js',
 			'vs/workbench/workbench.main.css',
-			'vs/workbench/electron-browser/bootstrap/index.html',
-			'vs/workbench/electron-browser/bootstrap/index.js',
-			'vs/workbench/electron-browser/bootstrap/preload.js'
+			'vs/code/electron-browser/workbench/workbench.html',
+			'vs/code/electron-browser/workbench/workbench.js'
 		]);
 
 		const src = gulp.src(out + '/**', { base: '.' })
-			.pipe(rename(function (path) { path.dirname = path.dirname.replace(new RegExp('^' + out), 'out'); }));
-
-		const root = path.resolve(path.join(__dirname, '..'));
-		const localExtensionDescriptions = glob.sync('extensions/*/package.json')
-			.map(manifestPath => {
-				const extensionPath = path.dirname(path.join(root, manifestPath));
-				const extensionName = path.basename(extensionPath);
-				return { name: extensionName, path: extensionPath };
-			})
-			.filter(({ name }) => excludedExtensions.indexOf(name) === -1)
-			.filter(({ name }) => builtInExtensions.every(b => b.name !== name));
-
-		const localExtensions = es.merge(...localExtensionDescriptions.map(extension => {
-			const nlsFilter = filter('**/*.nls.json', { restore: true });
-
-			return ext.fromLocal(extension.path)
-				.pipe(rename(p => p.dirname = `extensions/${extension.name}/${p.dirname}`))
-				// 	// TODO@Dirk: this filter / buffer is here to make sure the nls.json files are buffered
-				.pipe(nlsFilter)
-				.pipe(buffer())
-				.pipe(nlsDev.createAdditionalLanguageFiles(languages, path.join(__dirname, '..', 'i18n')))
-				.pipe(nlsFilter.restore);
-		}));
-
-		const localExtensionDependencies = gulp.src('extensions/node_modules/**', { base: '.' });
-
-		const marketplaceExtensions = es.merge(...builtInExtensions.map(extension => {
-			return ext.fromMarketplace(extension.name, extension.version)
-				.pipe(rename(p => p.dirname = `extensions/${extension.name}/${p.dirname}`));
-		}));
-
-		const sources = es.merge(src, localExtensions, localExtensionDependencies, marketplaceExtensions)
+			.pipe(rename(function (path) { path.dirname = path.dirname.replace(new RegExp('^' + out), 'out'); }))
 			.pipe(util.setExecutableBit(['**/*.sh']))
 			.pipe(filter(['**', '!**/*.js.map']));
 
+		const root = path.resolve(path.join(__dirname, '..'));
+
+		const sources = es.merge(src, ext.packageExtensionsStream({
+			sourceMappingURLBase: sourceMappingURLBase
+		}));
+
 		let version = packageJson.version;
+		// @ts-ignore JSON checking: quality is optional
 		const quality = product.quality;
 
 		if (quality && quality !== 'stable') {
@@ -277,10 +241,15 @@ function packageTask(platform, arch, opts) {
 		const packageJsonStream = gulp.src(['package.json'], { base: '.' })
 			.pipe(json({ name, version }));
 
-		const settingsSearchBuildId = getSettingsSearchBuildId(packageJson);
 		const date = new Date().toISOString();
+		const productJsonUpdate = { commit, date, checksums };
+
+		if (shouldSetupSettingsSearch()) {
+			productJsonUpdate.settingsSearchBuildId = getSettingsSearchBuildId(packageJson);
+		}
+
 		const productJsonStream = gulp.src(['product.json'], { base: '.' })
-			.pipe(json({ commit, date, checksums, settingsSearchBuildId }));
+			.pipe(json(productJsonUpdate));
 
 		const license = gulp.src(['LICENSES.chromium.html', 'LICENSE.txt', 'ThirdPartyNotices.txt', 'licenses/**'], { base: '.' });
 
@@ -291,6 +260,7 @@ function packageTask(platform, arch, opts) {
 
 		const depsSrc = [
 			..._.flatten(productionDependencies.map(d => path.relative(root, d.path)).map(d => [`${d}/**`, `!${d}/**/{test,tests}/**`])),
+			// @ts-ignore JSON checking: dependencies is optional
 			..._.flatten(Object.keys(product.dependencies || {}).map(d => [`node_modules/${d}/**`, `!node_modules/${d}/**/{test,tests}/**`]))
 		];
 
@@ -359,6 +329,15 @@ function packageTask(platform, arch, opts) {
 				.pipe(rename('bin/' + product.applicationName)));
 		}
 
+		// submit all stats that have been collected
+		// during the build phase
+		if (opts.stats) {
+			result.on('end', () => {
+				const { submitAllStats } = require('./lib/stats');
+				submitAllStats(product, commit).then(() => console.log('Submitted bundle stats!'));
+			});
+		}
+
 		return result.pipe(vfs.dest(destination));
 	};
 }
@@ -371,20 +350,23 @@ gulp.task('clean-vscode-darwin', util.rimraf(path.join(buildRoot, 'VSCode-darwin
 gulp.task('clean-vscode-linux-ia32', util.rimraf(path.join(buildRoot, 'VSCode-linux-ia32')));
 gulp.task('clean-vscode-linux-x64', util.rimraf(path.join(buildRoot, 'VSCode-linux-x64')));
 gulp.task('clean-vscode-linux-arm', util.rimraf(path.join(buildRoot, 'VSCode-linux-arm')));
+gulp.task('clean-vscode-linux-arm64', util.rimraf(path.join(buildRoot, 'VSCode-linux-arm64')));
 
 gulp.task('vscode-win32-ia32', ['optimize-vscode', 'clean-vscode-win32-ia32'], packageTask('win32', 'ia32'));
 gulp.task('vscode-win32-x64', ['optimize-vscode', 'clean-vscode-win32-x64'], packageTask('win32', 'x64'));
-gulp.task('vscode-darwin', ['optimize-vscode', 'clean-vscode-darwin'], packageTask('darwin'));
+gulp.task('vscode-darwin', ['optimize-vscode', 'clean-vscode-darwin'], packageTask('darwin', null, { stats: true }));
 gulp.task('vscode-linux-ia32', ['optimize-vscode', 'clean-vscode-linux-ia32'], packageTask('linux', 'ia32'));
 gulp.task('vscode-linux-x64', ['optimize-vscode', 'clean-vscode-linux-x64'], packageTask('linux', 'x64'));
 gulp.task('vscode-linux-arm', ['optimize-vscode', 'clean-vscode-linux-arm'], packageTask('linux', 'arm'));
+gulp.task('vscode-linux-arm64', ['optimize-vscode', 'clean-vscode-linux-arm64'], packageTask('linux', 'arm64'));
 
 gulp.task('vscode-win32-ia32-min', ['minify-vscode', 'clean-vscode-win32-ia32'], packageTask('win32', 'ia32', { minified: true }));
 gulp.task('vscode-win32-x64-min', ['minify-vscode', 'clean-vscode-win32-x64'], packageTask('win32', 'x64', { minified: true }));
-gulp.task('vscode-darwin-min', ['minify-vscode', 'clean-vscode-darwin'], packageTask('darwin', null, { minified: true }));
+gulp.task('vscode-darwin-min', ['minify-vscode', 'clean-vscode-darwin'], packageTask('darwin', null, { minified: true, stats: true }));
 gulp.task('vscode-linux-ia32-min', ['minify-vscode', 'clean-vscode-linux-ia32'], packageTask('linux', 'ia32', { minified: true }));
 gulp.task('vscode-linux-x64-min', ['minify-vscode', 'clean-vscode-linux-x64'], packageTask('linux', 'x64', { minified: true }));
 gulp.task('vscode-linux-arm-min', ['minify-vscode', 'clean-vscode-linux-arm'], packageTask('linux', 'arm', { minified: true }));
+gulp.task('vscode-linux-arm64-min', ['minify-vscode', 'clean-vscode-linux-arm64'], packageTask('linux', 'arm64', { minified: true }));
 
 // Transifex Localizations
 
@@ -434,37 +416,38 @@ gulp.task('vscode-translations-push-test', ['optimize-vscode'], function () {
 });
 
 gulp.task('vscode-translations-pull', function () {
-	[...i18n.defaultLanguages, ...i18n.extraLanguages].forEach(language => {
-		i18n.pullCoreAndExtensionsXlfFiles(apiHostname, apiName, apiToken, language).pipe(vfs.dest(`../vscode-localization/${language.id}/build`));
-
+	return es.merge([...i18n.defaultLanguages, ...i18n.extraLanguages].map(language => {
 		let includeDefault = !!innoSetupConfig[language.id].defaultInfo;
-		i18n.pullSetupXlfFiles(apiHostname, apiName, apiToken, language, includeDefault).pipe(vfs.dest(`../vscode-localization/${language.id}/setup`));
-	});
+		return i18n.pullSetupXlfFiles(apiHostname, apiName, apiToken, language, includeDefault).pipe(vfs.dest(`../vscode-localization/${language.id}/setup`));
+	}));
 });
 
 gulp.task('vscode-translations-import', function () {
-	[...i18n.defaultLanguages, ...i18n.extraLanguages].forEach(language => {
-		gulp.src(`../vscode-localization/${language.id}/build/*/*.xlf`)
-			.pipe(i18n.prepareI18nFiles())
-			.pipe(vfs.dest(`./i18n/${language.folderName}`));
-		gulp.src(`../vscode-localization/${language.id}/setup/*/*.xlf`)
+	return es.merge([...i18n.defaultLanguages, ...i18n.extraLanguages].map(language => {
+		return gulp.src(`../vscode-localization/${language.id}/setup/*/*.xlf`)
 			.pipe(i18n.prepareIslFiles(language, innoSetupConfig[language.id]))
 			.pipe(vfs.dest(`./build/win32/i18n`));
-	});
+	}));
 });
 
 // Sourcemaps
 
-gulp.task('upload-vscode-sourcemaps', ['minify-vscode'], () => {
+gulp.task('upload-vscode-sourcemaps', ['vscode-darwin-min', 'minify-vscode'], () => {
 	const vs = gulp.src('out-vscode-min/**/*.map', { base: 'out-vscode-min' })
 		.pipe(es.mapSync(f => {
 			f.path = `${f.base}/core/${f.relative}`;
 			return f;
 		}));
 
-	const extensions = gulp.src('extensions/**/out/**/*.map', { base: '.' });
+	const extensionsOut = gulp.src('extensions/**/out/**/*.map', { base: '.' });
+	const extensionsDist = gulp.src('extensions/**/dist/**/*.map', { base: '.' });
 
-	return es.merge(vs, extensions)
+	return es.merge(vs, extensionsOut, extensionsDist)
+		.pipe(es.through(function (data) {
+			// debug
+			console.log('Uploading Sourcemap', data.relative);
+			this.emit('data', data);
+		}))
 		.pipe(azure.upload({
 			account: process.env.AZURE_STORAGE_ACCOUNT,
 			key: process.env.AZURE_STORAGE_ACCESS_KEY,
@@ -475,9 +458,8 @@ gulp.task('upload-vscode-sourcemaps', ['minify-vscode'], () => {
 
 const allConfigDetailsPath = path.join(os.tmpdir(), 'configuration.json');
 gulp.task('upload-vscode-configuration', ['generate-vscode-configuration'], () => {
-	const branch = process.env.BUILD_SOURCEBRANCH;
-
-	if (!/\/master$/.test(branch) && branch.indexOf('/release/') < 0) {
+	if (!shouldSetupSettingsSearch()) {
+		const branch = process.env.BUILD_SOURCEBRANCH;
 		console.log(`Only runs on master and release branches, not ${branch}`);
 		return;
 	}
@@ -500,13 +482,24 @@ gulp.task('upload-vscode-configuration', ['generate-vscode-configuration'], () =
 		}));
 });
 
-function getSettingsSearchBuildId(packageJson) {
-	const previous = util.getPreviousVersion(packageJson.version);
+function shouldSetupSettingsSearch() {
+	const branch = process.env.BUILD_SOURCEBRANCH;
+	return branch && (/\/master$/.test(branch) || branch.indexOf('/release/') >= 0);
+}
 
+function getSettingsSearchBuildId(packageJson) {
 	try {
-		const out = cp.execSync(`git rev-list ${previous}..HEAD --count`);
+		const branch = process.env.BUILD_SOURCEBRANCH;
+		const branchId = branch.indexOf('/release/') >= 0 ? 0 :
+			/\/master$/.test(branch) ? 1 :
+				2; // Some unexpected branch
+
+		const out = cp.execSync(`git rev-list HEAD --count`);
 		const count = parseInt(out.toString());
-		return util.versionStringToNumber(packageJson.version) * 1e4 + count;
+
+		// <version number><commit count><branchId (avoid unlikely conflicts)>
+		// 1.25.1, 1,234,567 commits, master = 1250112345671
+		return util.versionStringToNumber(packageJson.version) * 1e8 + count * 10 + branchId;
 	} catch (e) {
 		throw new Error('Could not determine build number: ' + e.toString());
 	}
@@ -520,6 +513,10 @@ gulp.task('generate-vscode-configuration', () => {
 			return reject(new Error('$AGENT_BUILDDIRECTORY not set'));
 		}
 
+		if (process.env.VSCODE_QUALITY !== 'insider' && process.env.VSCODE_QUALITY !== 'stable') {
+			return resolve();
+		}
+
 		const userDataDir = path.join(os.tmpdir(), 'tmpuserdata');
 		const extensionsDir = path.join(os.tmpdir(), 'tmpextdir');
 		const appName = process.env.VSCODE_QUALITY === 'insider' ? 'Visual\\ Studio\\ Code\\ -\\ Insiders.app' : 'Visual\\ Studio\\ Code.app';
diff --git a/build/gulpfile.vscode.linux.js b/build/gulpfile.vscode.linux.js
index ecbc45df320..ff4ba02d804 100644
--- a/build/gulpfile.vscode.linux.js
+++ b/build/gulpfile.vscode.linux.js
@@ -12,17 +12,14 @@ const shell = require('gulp-shell');
 const es = require('event-stream');
 const vfs = require('vinyl-fs');
 const util = require('./lib/util');
-// @ts-ignore Microsoft/TypeScript#21262 complains about a require of a JSON file
 const packageJson = require('../package.json');
-// @ts-ignore Microsoft/TypeScript#21262 complains about a require of a JSON file
 const product = require('../product.json');
-// @ts-ignore Microsoft/TypeScript#21262 complains about a require of a JSON file
 const rpmDependencies = require('../resources/linux/rpm/dependencies.json');
 
 const linuxPackageRevision = Math.floor(new Date().getTime() / 1000);
 
 function getDebPackageArch(arch) {
-	return { x64: 'amd64', ia32: 'i386', arm: 'armhf' }[arch];
+	return { x64: 'amd64', ia32: 'i386', arm: 'armhf', arm64: "arm64" }[arch];
 }
 
 function prepareDebPackage(arch) {
@@ -75,7 +72,9 @@ function prepareDebPackage(arch) {
 		const postinst = gulp.src('resources/linux/debian/postinst.template', { base: '.' })
 			.pipe(replace('@@NAME@@', product.applicationName))
 			.pipe(replace('@@ARCHITECTURE@@', debArch))
+			// @ts-ignore JSON checking: quality is optional
 			.pipe(replace('@@QUALITY@@', product.quality || '@@QUALITY@@'))
+			// @ts-ignore JSON checking: updateUrl is optional
 			.pipe(replace('@@UPDATEURL@@', product.updateUrl || '@@UPDATEURL@@'))
 			.pipe(rename('DEBIAN/postinst'));
 
@@ -99,7 +98,7 @@ function getRpmBuildPath(rpmArch) {
 }
 
 function getRpmPackageArch(arch) {
-	return { x64: 'x86_64', ia32: 'i386', arm: 'armhf' }[arch];
+	return { x64: 'x86_64', ia32: 'i386', arm: 'armhf', arm64: "arm64" }[arch];
 }
 
 function prepareRpmPackage(arch) {
@@ -133,7 +132,9 @@ function prepareRpmPackage(arch) {
 			.pipe(replace('@@RELEASE@@', linuxPackageRevision))
 			.pipe(replace('@@ARCHITECTURE@@', rpmArch))
 			.pipe(replace('@@LICENSE@@', product.licenseName))
+			// @ts-ignore JSON checking: quality is optional
 			.pipe(replace('@@QUALITY@@', product.quality || '@@QUALITY@@'))
+			// @ts-ignore JSON checking: updateUrl is optional
 			.pipe(replace('@@UPDATEURL@@', product.updateUrl || '@@UPDATEURL@@'))
 			.pipe(replace('@@DEPENDENCIES@@', rpmDependencies[rpmArch].join(', ')))
 			.pipe(rename('SPECS/' + product.applicationName + '.spec'));
@@ -207,33 +208,39 @@ function buildSnapPackage(arch) {
 gulp.task('clean-vscode-linux-ia32-deb', util.rimraf('.build/linux/deb/i386'));
 gulp.task('clean-vscode-linux-x64-deb', util.rimraf('.build/linux/deb/amd64'));
 gulp.task('clean-vscode-linux-arm-deb', util.rimraf('.build/linux/deb/armhf'));
+gulp.task('clean-vscode-linux-arm64-deb', util.rimraf('.build/linux/deb/arm64'));
 gulp.task('clean-vscode-linux-ia32-rpm', util.rimraf('.build/linux/rpm/i386'));
 gulp.task('clean-vscode-linux-x64-rpm', util.rimraf('.build/linux/rpm/x86_64'));
 gulp.task('clean-vscode-linux-arm-rpm', util.rimraf('.build/linux/rpm/armhf'));
+gulp.task('clean-vscode-linux-arm64-rpm', util.rimraf('.build/linux/rpm/arm64'));
 gulp.task('clean-vscode-linux-ia32-snap', util.rimraf('.build/linux/snap/x64'));
 gulp.task('clean-vscode-linux-x64-snap', util.rimraf('.build/linux/snap/x64'));
 gulp.task('clean-vscode-linux-arm-snap', util.rimraf('.build/linux/snap/x64'));
-gulp.task('clean-vscode-linux-ia32-flatpak', util.rimraf('.build/linux/flatpak/i386'));
-gulp.task('clean-vscode-linux-x64-flatpak', util.rimraf('.build/linux/flatpak/x86_64'));
-gulp.task('clean-vscode-linux-arm-flatpak', util.rimraf('.build/linux/flatpak/arm'));
+gulp.task('clean-vscode-linux-arm64-snap', util.rimraf('.build/linux/snap/x64'));
 
 gulp.task('vscode-linux-ia32-prepare-deb', ['clean-vscode-linux-ia32-deb'], prepareDebPackage('ia32'));
 gulp.task('vscode-linux-x64-prepare-deb', ['clean-vscode-linux-x64-deb'], prepareDebPackage('x64'));
 gulp.task('vscode-linux-arm-prepare-deb', ['clean-vscode-linux-arm-deb'], prepareDebPackage('arm'));
+gulp.task('vscode-linux-arm64-prepare-deb', ['clean-vscode-linux-arm64-deb'], prepareDebPackage('arm64'));
 gulp.task('vscode-linux-ia32-build-deb', ['vscode-linux-ia32-prepare-deb'], buildDebPackage('ia32'));
 gulp.task('vscode-linux-x64-build-deb', ['vscode-linux-x64-prepare-deb'], buildDebPackage('x64'));
 gulp.task('vscode-linux-arm-build-deb', ['vscode-linux-arm-prepare-deb'], buildDebPackage('arm'));
+gulp.task('vscode-linux-arm64-build-deb', ['vscode-linux-arm64-prepare-deb'], buildDebPackage('arm64'));
 
 gulp.task('vscode-linux-ia32-prepare-rpm', ['clean-vscode-linux-ia32-rpm'], prepareRpmPackage('ia32'));
 gulp.task('vscode-linux-x64-prepare-rpm', ['clean-vscode-linux-x64-rpm'], prepareRpmPackage('x64'));
 gulp.task('vscode-linux-arm-prepare-rpm', ['clean-vscode-linux-arm-rpm'], prepareRpmPackage('arm'));
+gulp.task('vscode-linux-arm64-prepare-rpm', ['clean-vscode-linux-arm64-rpm'], prepareRpmPackage('arm64'));
 gulp.task('vscode-linux-ia32-build-rpm', ['vscode-linux-ia32-prepare-rpm'], buildRpmPackage('ia32'));
 gulp.task('vscode-linux-x64-build-rpm', ['vscode-linux-x64-prepare-rpm'], buildRpmPackage('x64'));
 gulp.task('vscode-linux-arm-build-rpm', ['vscode-linux-arm-prepare-rpm'], buildRpmPackage('arm'));
+gulp.task('vscode-linux-arm64-build-rpm', ['vscode-linux-arm64-prepare-rpm'], buildRpmPackage('arm64'));
 
 gulp.task('vscode-linux-ia32-prepare-snap', ['clean-vscode-linux-ia32-snap'], prepareSnapPackage('ia32'));
 gulp.task('vscode-linux-x64-prepare-snap', ['clean-vscode-linux-x64-snap'], prepareSnapPackage('x64'));
 gulp.task('vscode-linux-arm-prepare-snap', ['clean-vscode-linux-arm-snap'], prepareSnapPackage('arm'));
+gulp.task('vscode-linux-arm64-prepare-snap', ['clean-vscode-linux-arm64-snap'], prepareSnapPackage('arm64'));
 gulp.task('vscode-linux-ia32-build-snap', ['vscode-linux-ia32-prepare-snap'], buildSnapPackage('ia32'));
 gulp.task('vscode-linux-x64-build-snap', ['vscode-linux-x64-prepare-snap'], buildSnapPackage('x64'));
 gulp.task('vscode-linux-arm-build-snap', ['vscode-linux-arm-prepare-snap'], buildSnapPackage('arm'));
+gulp.task('vscode-linux-arm64-build-snap', ['vscode-linux-arm64-prepare-snap'], buildSnapPackage('arm64'));
diff --git a/build/gulpfile.vscode.win32.js b/build/gulpfile.vscode.win32.js
index 636d9e8300b..7d1ea35a6ab 100644
--- a/build/gulpfile.vscode.win32.js
+++ b/build/gulpfile.vscode.win32.js
@@ -7,44 +7,69 @@
 
 const gulp = require('gulp');
 const path = require('path');
+const fs = require('fs');
 const assert = require('assert');
 const cp = require('child_process');
 const _7z = require('7zip')['7z'];
 const util = require('./lib/util');
-// @ts-ignore Microsoft/TypeScript#21262 complains about a require of a JSON file
 const pkg = require('../package.json');
-// @ts-ignore Microsoft/TypeScript#21262 complains about a require of a JSON file
 const product = require('../product.json');
 const vfs = require('vinyl-fs');
+const mkdirp = require('mkdirp');
 
 const repoPath = path.dirname(__dirname);
 const buildPath = arch => path.join(path.dirname(repoPath), `VSCode-win32-${arch}`);
 const zipDir = arch => path.join(repoPath, '.build', `win32-${arch}`, 'archive');
 const zipPath = arch => path.join(zipDir(arch), `VSCode-win32-${arch}.zip`);
-const setupDir = arch => path.join(repoPath, '.build', `win32-${arch}`, 'setup');
+const setupDir = (arch, target) => path.join(repoPath, '.build', `win32-${arch}`, `${target}-setup`);
 const issPath = path.join(__dirname, 'win32', 'code.iss');
 const innoSetupPath = path.join(path.dirname(path.dirname(require.resolve('innosetup-compiler'))), 'bin', 'ISCC.exe');
+const signPS1 = path.join(repoPath, 'build', 'tfs', 'win32', 'sign.ps1');
 
 function packageInnoSetup(iss, options, cb) {
 	options = options || {};
 
 	const definitions = options.definitions || {};
+	const debug = process.argv.some(arg => arg === '--debug-inno');
+
+	if (debug) {
+		definitions['Debug'] = 'true';
+	}
+
 	const keys = Object.keys(definitions);
 
 	keys.forEach(key => assert(typeof definitions[key] === 'string', `Missing value for '${key}' in Inno Setup package step`));
 
 	const defs = keys.map(key => `/d${key}=${definitions[key]}`);
-	const args = [iss].concat(defs);
+	const args = [
+		iss,
+		...defs,
+		`/sesrp=powershell.exe -ExecutionPolicy bypass ${signPS1} $f`
+	];
 
-	cp.spawn(innoSetupPath, args, { stdio: 'inherit' })
+	cp.spawn(innoSetupPath, args, { stdio: ['ignore', 'inherit', 'inherit'] })
 		.on('error', cb)
 		.on('exit', () => cb(null));
 }
 
-function buildWin32Setup(arch) {
+function buildWin32Setup(arch, target) {
+	if (target !== 'system' && target !== 'user') {
+		throw new Error('Invalid setup target');
+	}
+
 	return cb => {
-		const ia32AppId = product.win32AppId;
-		const x64AppId = product.win32x64AppId;
+		const ia32AppId = target === 'system' ? product.win32AppId : product.win32UserAppId;
+		const x64AppId = target === 'system' ? product.win32x64AppId : product.win32x64UserAppId;
+
+		const sourcePath = buildPath(arch);
+		const outputPath = setupDir(arch, target);
+		mkdirp.sync(outputPath);
+
+		const originalProductJsonPath = path.join(sourcePath, 'resources/app/product.json');
+		const productJsonPath = path.join(outputPath, 'product.json');
+		const productJson = JSON.parse(fs.readFileSync(originalProductJsonPath, 'utf8'));
+		productJson['target'] = target;
+		fs.writeFileSync(productJsonPath, JSON.stringify(productJson, undefined, '\t'));
 
 		const definitions = {
 			NameLong: product.nameLong,
@@ -52,35 +77,42 @@ function buildWin32Setup(arch) {
 			DirName: product.win32DirName,
 			Version: pkg.version,
 			RawVersion: pkg.version.replace(/-\w+$/, ''),
-			NameVersion: product.win32NameVersion,
+			NameVersion: product.win32NameVersion + (target === 'user' ? ' (User)' : ''),
 			ExeBasename: product.nameShort,
 			RegValueName: product.win32RegValueName,
 			ShellNameShort: product.win32ShellNameShort,
 			AppMutex: product.win32MutexName,
 			Arch: arch,
 			AppId: arch === 'ia32' ? ia32AppId : x64AppId,
-			IncompatibleAppId: arch === 'ia32' ? x64AppId : ia32AppId,
+			IncompatibleTargetAppId: arch === 'ia32' ? product.win32AppId : product.win32x64AppId,
+			IncompatibleArchAppId: arch === 'ia32' ? x64AppId : ia32AppId,
 			AppUserId: product.win32AppUserModelId,
 			ArchitecturesAllowed: arch === 'ia32' ? '' : 'x64',
 			ArchitecturesInstallIn64BitMode: arch === 'ia32' ? '' : 'x64',
-			SourceDir: buildPath(arch),
+			SourceDir: sourcePath,
 			RepoDir: repoPath,
-			OutputDir: setupDir(arch)
+			OutputDir: outputPath,
+			InstallTarget: target,
+			ProductJsonPath: productJsonPath
 		};
 
 		packageInnoSetup(issPath, { definitions }, cb);
 	};
 }
 
-gulp.task('clean-vscode-win32-ia32-setup', util.rimraf(setupDir('ia32')));
-gulp.task('vscode-win32-ia32-setup', ['clean-vscode-win32-ia32-setup'], buildWin32Setup('ia32'));
+function defineWin32SetupTasks(arch, target) {
+	gulp.task(`clean-vscode-win32-${arch}-${target}-setup`, util.rimraf(setupDir(arch, target)));
+	gulp.task(`vscode-win32-${arch}-${target}-setup`, [`clean-vscode-win32-${arch}-${target}-setup`], buildWin32Setup(arch, target));
+}
 
-gulp.task('clean-vscode-win32-x64-setup', util.rimraf(setupDir('x64')));
-gulp.task('vscode-win32-x64-setup', ['clean-vscode-win32-x64-setup'], buildWin32Setup('x64'));
+defineWin32SetupTasks('ia32', 'system');
+defineWin32SetupTasks('x64', 'system');
+defineWin32SetupTasks('ia32', 'user');
+defineWin32SetupTasks('x64', 'user');
 
 function archiveWin32Setup(arch) {
 	return cb => {
-		const args = ['a', '-tzip', zipPath(arch), '.', '-r'];
+		const args = ['a', '-tzip', zipPath(arch), '-x!CodeSignSummary*.md', '.', '-r'];
 
 		cp.spawn(_7z, args, { stdio: 'inherit', cwd: buildPath(arch) })
 			.on('error', cb)
diff --git a/build/lib/builtInExtensions.js b/build/lib/builtInExtensions.js
index c03360cf002..88266f3b901 100644
--- a/build/lib/builtInExtensions.js
+++ b/build/lib/builtInExtensions.js
@@ -17,7 +17,6 @@ const ext = require('./extensions');
 const util = require('gulp-util');
 
 const root = path.dirname(path.dirname(__dirname));
-// @ts-ignore Microsoft/TypeScript#21262 complains about a require of a JSON file
 const builtInExtensions = require('../builtInExtensions.json');
 const controlFilePath = path.join(os.homedir(), '.vscode-oss-dev', 'extensions', 'control.json');
 
diff --git a/build/lib/bundle.ts b/build/lib/bundle.ts
index da38acec4f4..43855048c1f 100644
--- a/build/lib/bundle.ts
+++ b/build/lib/bundle.ts
@@ -46,7 +46,7 @@ export interface IEntryPoint {
 	name: string;
 	include?: string[];
 	exclude?: string[];
-	prepend: string[];
+	prepend?: string[];
 	append?: string[];
 	dest?: string;
 }
diff --git a/build/lib/compilation.js b/build/lib/compilation.js
index 998ebb4f379..4f2f374bb5b 100644
--- a/build/lib/compilation.js
+++ b/build/lib/compilation.js
@@ -18,21 +18,24 @@ var _ = require("underscore");
 var monacodts = require("../monaco/api");
 var fs = require("fs");
 var reporter = reporter_1.createReporter();
-var rootDir = path.join(__dirname, '../../src');
-var options = require('../../src/tsconfig.json').compilerOptions;
-options.verbose = false;
-options.sourceMap = true;
-if (process.env['VSCODE_NO_SOURCEMAP']) { // To be used by developers in a hurry
-    options.sourceMap = false;
+function getTypeScriptCompilerOptions(src) {
+    var rootDir = path.join(__dirname, "../../" + src);
+    var options = require("../../" + src + "/tsconfig.json").compilerOptions;
+    options.verbose = false;
+    options.sourceMap = true;
+    if (process.env['VSCODE_NO_SOURCEMAP']) { // To be used by developers in a hurry
+        options.sourceMap = false;
+    }
+    options.rootDir = rootDir;
+    options.sourceRoot = util.toFileUri(rootDir);
+    options.newLine = /\r\n/.test(fs.readFileSync(__filename, 'utf8')) ? 'CRLF' : 'LF';
+    return options;
 }
-options.rootDir = rootDir;
-options.sourceRoot = util.toFileUri(rootDir);
-options.newLine = /\r\n/.test(fs.readFileSync(__filename, 'utf8')) ? 'CRLF' : 'LF';
-function createCompile(build, emitError) {
-    var opts = _.clone(options);
+function createCompile(src, build, emitError) {
+    var opts = _.clone(getTypeScriptCompilerOptions(src));
     opts.inlineSources = !!build;
     opts.noFilesystemLookup = true;
-    var ts = tsb.create(opts, null, null, function (err) { return reporter(err.toString()); });
+    var ts = tsb.create(opts, true, null, function (err) { return reporter(err.toString()); });
     return function (token) {
         var utf8Filter = util.filter(function (data) { return /(\/|\\)test(\/|\\).*utf8/.test(data.path); });
         var tsFilter = util.filter(function (data) { return /\.ts$/.test(data.path); });
@@ -51,32 +54,33 @@ function createCompile(build, emitError) {
             .pipe(sourcemaps.write('.', {
             addComment: false,
             includeContent: !!build,
-            sourceRoot: options.sourceRoot
+            sourceRoot: opts.sourceRoot
         }))
             .pipe(tsFilter.restore)
             .pipe(reporter.end(emitError));
         return es.duplex(input, output);
     };
 }
-function compileTask(out, build) {
+var libDtsGlob = 'node_modules/typescript/lib/*.d.ts';
+function compileTask(src, out, build) {
     return function () {
-        var compile = createCompile(build, true);
-        var src = es.merge(gulp.src('src/**', { base: 'src' }), gulp.src('node_modules/typescript/lib/lib.d.ts'));
+        var compile = createCompile(src, build, true);
+        var srcPipe = es.merge(gulp.src(src + "/**", { base: "" + src }), gulp.src(libDtsGlob));
         // Do not write .d.ts files to disk, as they are not needed there.
         var dtsFilter = util.filter(function (data) { return !/\.d\.ts$/.test(data.path); });
-        return src
+        return srcPipe
             .pipe(compile())
             .pipe(dtsFilter)
             .pipe(gulp.dest(out))
             .pipe(dtsFilter.restore)
-            .pipe(monacodtsTask(out, false));
+            .pipe(src !== 'src' ? es.through() : monacodtsTask(out, false));
     };
 }
 exports.compileTask = compileTask;
 function watchTask(out, build) {
     return function () {
-        var compile = createCompile(build);
-        var src = es.merge(gulp.src('src/**', { base: 'src' }), gulp.src('node_modules/typescript/lib/lib.d.ts'));
+        var compile = createCompile('src', build);
+        var src = es.merge(gulp.src('src/**', { base: 'src' }), gulp.src(libDtsGlob));
         var watchSrc = watch('src/**', { base: 'src' });
         // Do not write .d.ts files to disk, as they are not needed there.
         var dtsFilter = util.filter(function (data) { return !/\.d\.ts$/.test(data.path); });
@@ -122,6 +126,7 @@ function monacodtsTask(out, isWatch) {
                 fs.writeFileSync(result.filePath, result.content);
             }
             else {
+                fs.writeFileSync(result.filePath, result.content);
                 resultStream.emit('error', 'monaco.d.ts is no longer up to date. Please run gulp watch and commit the new file.');
             }
         }
diff --git a/build/lib/compilation.ts b/build/lib/compilation.ts
index cedcb4155b6..2f7dbe664bd 100644
--- a/build/lib/compilation.ts
+++ b/build/lib/compilation.ts
@@ -21,23 +21,26 @@ import * as fs from 'fs';
 
 const reporter = createReporter();
 
-const rootDir = path.join(__dirname, '../../src');
-const options = require('../../src/tsconfig.json').compilerOptions;
-options.verbose = false;
-options.sourceMap = true;
-if (process.env['VSCODE_NO_SOURCEMAP']) { // To be used by developers in a hurry
-	options.sourceMap = false;
+function getTypeScriptCompilerOptions(src: string) {
+	const rootDir = path.join(__dirname, `../../${src}`);
+	const options = require(`../../${src}/tsconfig.json`).compilerOptions;
+	options.verbose = false;
+	options.sourceMap = true;
+	if (process.env['VSCODE_NO_SOURCEMAP']) { // To be used by developers in a hurry
+		options.sourceMap = false;
+	}
+	options.rootDir = rootDir;
+	options.sourceRoot = util.toFileUri(rootDir);
+	options.newLine = /\r\n/.test(fs.readFileSync(__filename, 'utf8')) ? 'CRLF' : 'LF';
+	return options;
 }
-options.rootDir = rootDir;
-options.sourceRoot = util.toFileUri(rootDir);
-options.newLine = /\r\n/.test(fs.readFileSync(__filename, 'utf8')) ? 'CRLF' : 'LF';
 
-function createCompile(build: boolean, emitError?: boolean): (token?: util.ICancellationToken) => NodeJS.ReadWriteStream {
-	const opts = _.clone(options);
+function createCompile(src: string, build: boolean, emitError?: boolean): (token?: util.ICancellationToken) => NodeJS.ReadWriteStream {
+	const opts = _.clone(getTypeScriptCompilerOptions(src));
 	opts.inlineSources = !!build;
 	opts.noFilesystemLookup = true;
 
-	const ts = tsb.create(opts, null, null, err => reporter(err.toString()));
+	const ts = tsb.create(opts, true, null, err => reporter(err.toString()));
 
 	return function (token?: util.ICancellationToken) {
 
@@ -59,7 +62,7 @@ function createCompile(build: boolean, emitError?: boolean): (token?: util.ICanc
 			.pipe(sourcemaps.write('.', {
 				addComment: false,
 				includeContent: !!build,
-				sourceRoot: options.sourceRoot
+				sourceRoot: opts.sourceRoot
 			}))
 			.pipe(tsFilter.restore)
 			.pipe(reporter.end(emitError));
@@ -68,36 +71,38 @@ function createCompile(build: boolean, emitError?: boolean): (token?: util.ICanc
 	};
 }
 
-export function compileTask(out: string, build: boolean): () => NodeJS.ReadWriteStream {
+const libDtsGlob = 'node_modules/typescript/lib/*.d.ts';
+
+export function compileTask(src: string, out: string, build: boolean): () => NodeJS.ReadWriteStream {
 
 	return function () {
-		const compile = createCompile(build, true);
+		const compile = createCompile(src, build, true);
 
-		const src = es.merge(
-			gulp.src('src/**', { base: 'src' }),
-			gulp.src('node_modules/typescript/lib/lib.d.ts'),
+		const srcPipe = es.merge(
+			gulp.src(`${src}/**`, { base: `${src}` }),
+			gulp.src(libDtsGlob),
 		);
 
 		// Do not write .d.ts files to disk, as they are not needed there.
 		const dtsFilter = util.filter(data => !/\.d\.ts$/.test(data.path));
 
-		return src
+		return srcPipe
 			.pipe(compile())
 			.pipe(dtsFilter)
 			.pipe(gulp.dest(out))
 			.pipe(dtsFilter.restore)
-			.pipe(monacodtsTask(out, false));
+			.pipe(src !== 'src' ? es.through() : monacodtsTask(out, false));
 	};
 }
 
 export function watchTask(out: string, build: boolean): () => NodeJS.ReadWriteStream {
 
 	return function () {
-		const compile = createCompile(build);
+		const compile = createCompile('src', build);
 
 		const src = es.merge(
 			gulp.src('src/**', { base: 'src' }),
-			gulp.src('node_modules/typescript/lib/lib.d.ts'),
+			gulp.src(libDtsGlob),
 		);
 		const watchSrc = watch('src/**', { base: 'src' });
 
@@ -150,6 +155,7 @@ function monacodtsTask(out: string, isWatch: boolean): NodeJS.ReadWriteStream {
 			if (isWatch) {
 				fs.writeFileSync(result.filePath, result.content);
 			} else {
+				fs.writeFileSync(result.filePath, result.content);
 				resultStream.emit('error', 'monaco.d.ts is no longer up to date. Please run gulp watch and commit the new file.');
 			}
 		}
diff --git a/build/lib/extensions.js b/build/lib/extensions.js
index ce74ac25ee6..e9ea4c6a8e9 100644
--- a/build/lib/extensions.js
+++ b/build/lib/extensions.js
@@ -3,8 +3,27 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 var es = require("event-stream");
+var fs = require("fs");
+var glob = require("glob");
+var gulp = require("gulp");
+var path = require("path");
+var File = require("vinyl");
+var vsce = require("vsce");
+var stats_1 = require("./stats");
+var util2 = require("./util");
 var assign = require("object-assign");
 var remote = require("gulp-remote-src");
 var flatmap = require('gulp-flatmap');
@@ -14,11 +33,106 @@ var rename = require('gulp-rename');
 var util = require('gulp-util');
 var buffer = require('gulp-buffer');
 var json = require('gulp-json-editor');
-var fs = require("fs");
-var path = require("path");
-var vsce = require("vsce");
-var File = require("vinyl");
-function fromLocal(extensionPath) {
+var webpack = require('webpack');
+var webpackGulp = require('webpack-stream');
+var root = path.resolve(path.join(__dirname, '..', '..'));
+function fromLocal(extensionPath, sourceMappingURLBase) {
+    var webpackFilename = path.join(extensionPath, 'extension.webpack.config.js');
+    if (fs.existsSync(webpackFilename)) {
+        return fromLocalWebpack(extensionPath, sourceMappingURLBase);
+    }
+    else {
+        return fromLocalNormal(extensionPath);
+    }
+}
+exports.fromLocal = fromLocal;
+function fromLocalWebpack(extensionPath, sourceMappingURLBase) {
+    var result = es.through();
+    var packagedDependencies = [];
+    var packageJsonConfig = require(path.join(extensionPath, 'package.json'));
+    var webpackRootConfig = require(path.join(extensionPath, 'extension.webpack.config.js'));
+    for (var key in webpackRootConfig.externals) {
+        if (key in packageJsonConfig.dependencies) {
+            packagedDependencies.push(key);
+        }
+    }
+    vsce.listFiles({ cwd: extensionPath, packageManager: vsce.PackageManager.Yarn, packagedDependencies: packagedDependencies }).then(function (fileNames) {
+        var files = fileNames
+            .map(function (fileName) { return path.join(extensionPath, fileName); })
+            .map(function (filePath) { return new File({
+            path: filePath,
+            stat: fs.statSync(filePath),
+            base: extensionPath,
+            contents: fs.createReadStream(filePath)
+        }); });
+        var filesStream = es.readArray(files);
+        // check for a webpack configuration files, then invoke webpack
+        // and merge its output with the files stream. also rewrite the package.json
+        // file to a new entry point
+        var webpackConfigLocations = glob.sync(path.join(extensionPath, '/**/extension.webpack.config.js'), { ignore: ['**/node_modules'] });
+        var packageJsonFilter = filter(function (f) {
+            if (path.basename(f.path) === 'package.json') {
+                // only modify package.json's next to the webpack file.
+                // to be safe, use existsSync instead of path comparison.
+                return fs.existsSync(path.join(path.dirname(f.path), 'extension.webpack.config.js'));
+            }
+            return false;
+        }, { restore: true });
+        var patchFilesStream = filesStream
+            .pipe(packageJsonFilter)
+            .pipe(buffer())
+            .pipe(json(function (data) {
+            // hardcoded entry point directory!
+            data.main = data.main.replace('/out/', /dist/);
+            return data;
+        }))
+            .pipe(packageJsonFilter.restore);
+        var webpackStreams = webpackConfigLocations.map(function (webpackConfigPath) {
+            var webpackDone = function (err, stats) {
+                util.log("Bundled extension: " + util.colors.yellow(path.join(path.basename(extensionPath), path.relative(extensionPath, webpackConfigPath))) + "...");
+                if (err) {
+                    result.emit('error', err);
+                }
+                var compilation = stats.compilation;
+                if (compilation.errors.length > 0) {
+                    result.emit('error', compilation.errors.join('\n'));
+                }
+                if (compilation.warnings.length > 0) {
+                    result.emit('error', compilation.warnings.join('\n'));
+                }
+            };
+            var webpackConfig = __assign({}, require(webpackConfigPath), { mode: 'production' });
+            var relativeOutputPath = path.relative(extensionPath, webpackConfig.output.path);
+            return webpackGulp(webpackConfig, webpack, webpackDone)
+                .pipe(es.through(function (data) {
+                data.stat = data.stat || {};
+                data.base = extensionPath;
+                this.emit('data', data);
+            }))
+                .pipe(es.through(function (data) {
+                // source map handling:
+                // * rewrite sourceMappingURL
+                // * save to disk so that upload-task picks this up
+                if (sourceMappingURLBase) {
+                    var contents = data.contents.toString('utf8');
+                    data.contents = Buffer.from(contents.replace(/\n\/\/# sourceMappingURL=(.*)$/gm, function (_m, g1) {
+                        return "\n//# sourceMappingURL=" + sourceMappingURLBase + "/extensions/" + path.basename(extensionPath) + "/" + relativeOutputPath + "/" + g1;
+                    }), 'utf8');
+                    if (/\.js\.map$/.test(data.path)) {
+                        if (!fs.existsSync(path.dirname(data.path))) {
+                            fs.mkdirSync(path.dirname(data.path));
+                        }
+                        fs.writeFileSync(data.path, data.contents);
+                    }
+                }
+                this.emit('data', data);
+            }));
+        });
+        es.merge.apply(es, webpackStreams.concat([patchFilesStream])).pipe(result);
+    }).catch(function (err) { return result.emit('error', err); });
+    return result.pipe(stats_1.createStatsStream(path.basename(extensionPath)));
+}
+function fromLocalNormal(extensionPath) {
     var result = es.through();
     vsce.listFiles({ cwd: extensionPath, packageManager: vsce.PackageManager.Yarn })
         .then(function (fileNames) {
@@ -33,9 +147,8 @@ function fromLocal(extensionPath) {
         es.readArray(files).pipe(result);
     })
         .catch(function (err) { return result.emit('error', err); });
-    return result;
+    return result.pipe(stats_1.createStatsStream(path.basename(extensionPath)));
 }
-exports.fromLocal = fromLocal;
 function error(err) {
     var result = es.through();
     setTimeout(function () { return result.emit('error', err); });
@@ -117,3 +230,49 @@ function fromMarketplace(extensionName, version) {
     }));
 }
 exports.fromMarketplace = fromMarketplace;
+var excludedExtensions = [
+    'vscode-api-tests',
+    'vscode-colorize-tests',
+    'ms-vscode.node-debug',
+    'ms-vscode.node-debug2',
+];
+var builtInExtensions = require('../builtInExtensions.json');
+function packageExtensionsStream(opts) {
+    opts = opts || {};
+    var localExtensionDescriptions = glob.sync('extensions/*/package.json')
+        .map(function (manifestPath) {
+        var extensionPath = path.dirname(path.join(root, manifestPath));
+        var extensionName = path.basename(extensionPath);
+        return { name: extensionName, path: extensionPath };
+    })
+        .filter(function (_a) {
+        var name = _a.name;
+        return excludedExtensions.indexOf(name) === -1;
+    })
+        .filter(function (_a) {
+        var name = _a.name;
+        return opts.desiredExtensions ? opts.desiredExtensions.indexOf(name) >= 0 : true;
+    })
+        .filter(function (_a) {
+        var name = _a.name;
+        return builtInExtensions.every(function (b) { return b.name !== name; });
+    });
+    var localExtensions = es.merge.apply(es, localExtensionDescriptions.map(function (extension) {
+        return fromLocal(extension.path, opts.sourceMappingURLBase)
+            .pipe(rename(function (p) { return p.dirname = "extensions/" + extension.name + "/" + p.dirname; }));
+    }));
+    var localExtensionDependencies = gulp.src('extensions/node_modules/**', { base: '.' });
+    var marketplaceExtensions = es.merge.apply(es, builtInExtensions
+        .filter(function (_a) {
+        var name = _a.name;
+        return opts.desiredExtensions ? opts.desiredExtensions.indexOf(name) >= 0 : true;
+    })
+        .map(function (extension) {
+        return fromMarketplace(extension.name, extension.version)
+            .pipe(rename(function (p) { return p.dirname = "extensions/" + extension.name + "/" + p.dirname; }));
+    }));
+    return es.merge(localExtensions, localExtensionDependencies, marketplaceExtensions)
+        .pipe(util2.setExecutableBit(['**/*.sh']))
+        .pipe(filter(['**', '!**/*.js.map']));
+}
+exports.packageExtensionsStream = packageExtensionsStream;
diff --git a/build/lib/extensions.ts b/build/lib/extensions.ts
index 4b05bea1979..731348763c1 100644
--- a/build/lib/extensions.ts
+++ b/build/lib/extensions.ts
@@ -4,7 +4,15 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as es from 'event-stream';
+import * as fs from 'fs';
+import * as glob from 'glob';
+import * as gulp from 'gulp';
+import * as path from 'path';
 import { Stream } from 'stream';
+import * as File from 'vinyl';
+import * as vsce from 'vsce';
+import { createStatsStream } from './stats';
+import * as util2 from './util';
 import assign = require('object-assign');
 import remote = require('gulp-remote-src');
 const flatmap = require('gulp-flatmap');
@@ -14,12 +22,135 @@ const rename = require('gulp-rename');
 const util = require('gulp-util');
 const buffer = require('gulp-buffer');
 const json = require('gulp-json-editor');
-import * as fs from 'fs';
-import * as path from 'path';
-import * as vsce from 'vsce';
-import * as File from 'vinyl';
+const webpack = require('webpack');
+const webpackGulp = require('webpack-stream');
 
-export function fromLocal(extensionPath: string): Stream {
+const root = path.resolve(path.join(__dirname, '..', '..'));
+
+export function fromLocal(extensionPath: string, sourceMappingURLBase?: string): Stream {
+	const webpackFilename = path.join(extensionPath, 'extension.webpack.config.js');
+	if (fs.existsSync(webpackFilename)) {
+		return fromLocalWebpack(extensionPath, sourceMappingURLBase);
+	} else {
+		return fromLocalNormal(extensionPath);
+	}
+}
+
+function fromLocalWebpack(extensionPath: string, sourceMappingURLBase: string): Stream {
+	let result = es.through();
+
+	let packagedDependencies: string[] = [];
+	let packageJsonConfig = require(path.join(extensionPath, 'package.json'));
+	let webpackRootConfig = require(path.join(extensionPath, 'extension.webpack.config.js'));
+	for (const key in webpackRootConfig.externals) {
+		if (key in packageJsonConfig.dependencies) {
+			packagedDependencies.push(key);
+		}
+	}
+
+	vsce.listFiles({ cwd: extensionPath, packageManager: vsce.PackageManager.Yarn, packagedDependencies }).then(fileNames => {
+		const files = fileNames
+			.map(fileName => path.join(extensionPath, fileName))
+			.map(filePath => new File({
+				path: filePath,
+				stat: fs.statSync(filePath),
+				base: extensionPath,
+				contents: fs.createReadStream(filePath) as any
+			}));
+
+		const filesStream = es.readArray(files);
+
+		// check for a webpack configuration files, then invoke webpack
+		// and merge its output with the files stream. also rewrite the package.json
+		// file to a new entry point
+		const webpackConfigLocations = (<string[]>glob.sync(
+			path.join(extensionPath, '/**/extension.webpack.config.js'),
+			{ ignore: ['**/node_modules'] }
+		));
+
+		const packageJsonFilter = filter(f => {
+			if (path.basename(f.path) === 'package.json') {
+				// only modify package.json's next to the webpack file.
+				// to be safe, use existsSync instead of path comparison.
+				return fs.existsSync(path.join(path.dirname(f.path), 'extension.webpack.config.js'));
+			}
+			return false;
+		}, { restore: true });
+
+		const patchFilesStream = filesStream
+			.pipe(packageJsonFilter)
+			.pipe(buffer())
+			.pipe(json(data => {
+				// hardcoded entry point directory!
+				data.main = data.main.replace('/out/', /dist/);
+				return data;
+			}))
+			.pipe(packageJsonFilter.restore);
+
+
+		const webpackStreams = webpackConfigLocations.map(webpackConfigPath => {
+
+			const webpackDone = (err, stats) => {
+				util.log(`Bundled extension: ${util.colors.yellow(path.join(path.basename(extensionPath), path.relative(extensionPath, webpackConfigPath)))}...`);
+				if (err) {
+					result.emit('error', err);
+				}
+				const { compilation } = stats;
+				if (compilation.errors.length > 0) {
+					result.emit('error', compilation.errors.join('\n'));
+				}
+				if (compilation.warnings.length > 0) {
+					result.emit('error', compilation.warnings.join('\n'));
+				}
+			};
+
+			const webpackConfig = {
+				...require(webpackConfigPath),
+				...{ mode: 'production' }
+			};
+			let relativeOutputPath = path.relative(extensionPath, webpackConfig.output.path);
+
+			return webpackGulp(webpackConfig, webpack, webpackDone)
+				.pipe(es.through(function (data) {
+					data.stat = data.stat || {};
+					data.base = extensionPath;
+					this.emit('data', data);
+				}))
+				.pipe(es.through(function (data: File) {
+					// source map handling:
+					// * rewrite sourceMappingURL
+					// * save to disk so that upload-task picks this up
+					if (sourceMappingURLBase) {
+						const contents = (<Buffer>data.contents).toString('utf8');
+						data.contents = Buffer.from(contents.replace(/\n\/\/# sourceMappingURL=(.*)$/gm, function (_m, g1) {
+							return `\n//# sourceMappingURL=${sourceMappingURLBase}/extensions/${path.basename(extensionPath)}/${relativeOutputPath}/${g1}`;
+						}), 'utf8');
+
+						if (/\.js\.map$/.test(data.path)) {
+							if (!fs.existsSync(path.dirname(data.path))) {
+								fs.mkdirSync(path.dirname(data.path));
+							}
+							fs.writeFileSync(data.path, data.contents);
+						}
+					}
+					this.emit('data', data);
+				}));
+		});
+
+		es.merge(...webpackStreams, patchFilesStream)
+			// .pipe(es.through(function (data) {
+			// 	// debug
+			// 	console.log('out', data.path, data.contents.length);
+			// 	this.emit('data', data);
+			// }))
+			.pipe(result);
+
+	}).catch(err => result.emit('error', err));
+
+	return result.pipe(createStatsStream(path.basename(extensionPath)));
+}
+
+function fromLocalNormal(extensionPath: string): Stream {
 	const result = es.through();
 
 	vsce.listFiles({ cwd: extensionPath, packageManager: vsce.PackageManager.Yarn })
@@ -37,7 +168,7 @@ export function fromLocal(extensionPath: string): Stream {
 		})
 		.catch(err => result.emit('error', err));
 
-	return result;
+	return result.pipe(createStatsStream(path.basename(extensionPath)));
 }
 
 function error(err: any): Stream {
@@ -131,3 +262,54 @@ export function fromMarketplace(extensionName: string, version: string): Stream
 				}));
 		}));
 }
+
+interface IPackageExtensionsOptions {
+	/**
+	 * Set to undefined to package all of them.
+	 */
+	desiredExtensions?: string[];
+	sourceMappingURLBase?: string;
+}
+
+const excludedExtensions = [
+	'vscode-api-tests',
+	'vscode-colorize-tests',
+	'ms-vscode.node-debug',
+	'ms-vscode.node-debug2',
+];
+
+const builtInExtensions: { name: string, version: string, repo: string; }[] = require('../builtInExtensions.json');
+
+export function packageExtensionsStream(opts?: IPackageExtensionsOptions): NodeJS.ReadWriteStream {
+	opts = opts || {};
+
+	const localExtensionDescriptions = (<string[]>glob.sync('extensions/*/package.json'))
+		.map(manifestPath => {
+			const extensionPath = path.dirname(path.join(root, manifestPath));
+			const extensionName = path.basename(extensionPath);
+			return { name: extensionName, path: extensionPath };
+		})
+		.filter(({ name }) => excludedExtensions.indexOf(name) === -1)
+		.filter(({ name }) => opts.desiredExtensions ? opts.desiredExtensions.indexOf(name) >= 0 : true)
+		.filter(({ name }) => builtInExtensions.every(b => b.name !== name));
+
+	const localExtensions = es.merge(...localExtensionDescriptions.map(extension => {
+		return fromLocal(extension.path, opts.sourceMappingURLBase)
+			.pipe(rename(p => p.dirname = `extensions/${extension.name}/${p.dirname}`));
+	}));
+
+	const localExtensionDependencies = gulp.src('extensions/node_modules/**', { base: '.' });
+
+	const marketplaceExtensions = es.merge(
+		...builtInExtensions
+			.filter(({ name }) => opts.desiredExtensions ? opts.desiredExtensions.indexOf(name) >= 0 : true)
+			.map(extension => {
+				return fromMarketplace(extension.name, extension.version)
+					.pipe(rename(p => p.dirname = `extensions/${extension.name}/${p.dirname}`));
+			})
+	);
+
+	return es.merge(localExtensions, localExtensionDependencies, marketplaceExtensions)
+		.pipe(util2.setExecutableBit(['**/*.sh']))
+		.pipe(filter(['**', '!**/*.js.map']));
+}
diff --git a/build/lib/i18n.resources.json b/build/lib/i18n.resources.json
index 87da5e9bb0d..81fda4c4e9e 100644
--- a/build/lib/i18n.resources.json
+++ b/build/lib/i18n.resources.json
@@ -78,6 +78,10 @@
 			"name": "vs/workbench/parts/logs",
 			"project": "vscode-workbench"
 		},
+		{
+			"name": "vs/workbench/parts/navigation",
+			"project": "vscode-workbench"
+		},
 		{
 			"name": "vs/workbench/parts/output",
 			"project": "vscode-workbench"
diff --git a/build/lib/optimize.js b/build/lib/optimize.js
index 2693d9f519a..044780ba7fd 100644
--- a/build/lib/optimize.js
+++ b/build/lib/optimize.js
@@ -4,23 +4,24 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 Object.defineProperty(exports, "__esModule", { value: true });
-var path = require("path");
+var es = require("event-stream");
 var gulp = require("gulp");
-var sourcemaps = require("gulp-sourcemaps");
-var filter = require("gulp-filter");
+var concat = require("gulp-concat");
 var minifyCSS = require("gulp-cssnano");
+var filter = require("gulp-filter");
+var flatmap = require("gulp-flatmap");
+var sourcemaps = require("gulp-sourcemaps");
 var uglify = require("gulp-uglify");
 var composer = require("gulp-uglify/composer");
+var gulpUtil = require("gulp-util");
+var path = require("path");
+var pump = require("pump");
 var uglifyes = require("uglify-es");
-var es = require("event-stream");
-var concat = require("gulp-concat");
 var VinylFile = require("vinyl");
 var bundle = require("./bundle");
+var i18n_1 = require("./i18n");
+var stats_1 = require("./stats");
 var util = require("./util");
-var i18n = require("./i18n");
-var gulpUtil = require("gulp-util");
-var flatmap = require("gulp-flatmap");
-var pump = require("pump");
 var REPO_ROOT_PATH = path.join(__dirname, '../..');
 function log(prefix, message) {
     gulpUtil.log(gulpUtil.colors.cyan('[' + prefix + ']'), message);
@@ -38,19 +39,19 @@ function loaderConfig(emptyPaths) {
 }
 exports.loaderConfig = loaderConfig;
 var IS_OUR_COPYRIGHT_REGEXP = /Copyright \(C\) Microsoft Corporation/i;
-function loader(bundledFileHeader, bundleLoader) {
+function loader(src, bundledFileHeader, bundleLoader) {
     var sources = [
-        'out-build/vs/loader.js'
+        src + "/vs/loader.js"
     ];
     if (bundleLoader) {
         sources = sources.concat([
-            'out-build/vs/css.js',
-            'out-build/vs/nls.js'
+            src + "/vs/css.js",
+            src + "/vs/nls.js"
         ]);
     }
     var isFirst = true;
     return (gulp
-        .src(sources, { base: 'out-build' })
+        .src(sources, { base: "" + src })
         .pipe(es.through(function (data) {
         if (isFirst) {
             isFirst = false;
@@ -72,7 +73,7 @@ function loader(bundledFileHeader, bundleLoader) {
         return f;
     })));
 }
-function toConcatStream(bundledFileHeader, sources, dest) {
+function toConcatStream(src, bundledFileHeader, sources, dest) {
     var useSourcemaps = /\.js$/.test(dest) && !/\.nls\.js$/.test(dest);
     // If a bundle ends up including in any of the sources our copyright, then
     // insert a fake source at the beginning of each bundle with our copyright
@@ -92,7 +93,7 @@ function toConcatStream(bundledFileHeader, sources, dest) {
     }
     var treatedSources = sources.map(function (source) {
         var root = source.path ? REPO_ROOT_PATH.replace(/\\/g, '/') : '';
-        var base = source.path ? root + '/out-build' : '';
+        var base = source.path ? root + ("/" + src) : '';
         return new VinylFile({
             path: source.path ? root + '/' + source.path.replace(/\\/g, '/') : 'fake',
             base: base,
@@ -101,14 +102,16 @@ function toConcatStream(bundledFileHeader, sources, dest) {
     });
     return es.readArray(treatedSources)
         .pipe(useSourcemaps ? util.loadSourcemaps() : es.through())
-        .pipe(concat(dest));
+        .pipe(concat(dest))
+        .pipe(stats_1.createStatsStream(dest));
 }
-function toBundleStream(bundledFileHeader, bundles) {
+function toBundleStream(src, bundledFileHeader, bundles) {
     return es.merge(bundles.map(function (bundle) {
-        return toConcatStream(bundledFileHeader, bundle.sources, bundle.dest);
+        return toConcatStream(src, bundledFileHeader, bundle.sources, bundle.dest);
     }));
 }
 function optimizeTask(opts) {
+    var src = opts.src;
     var entryPoints = opts.entryPoints;
     var otherSources = opts.otherSources;
     var resources = opts.resources;
@@ -124,7 +127,7 @@ function optimizeTask(opts) {
             if (err) {
                 return bundlesStream.emit('error', JSON.stringify(err));
             }
-            toBundleStream(bundledFileHeader, result.files).pipe(bundlesStream);
+            toBundleStream(src, bundledFileHeader, result.files).pipe(bundlesStream);
             // Remove css inlined resources
             var filteredResources = resources.slice();
             result.cssInlinedResources.forEach(function (resource) {
@@ -133,7 +136,7 @@ function optimizeTask(opts) {
                 }
                 filteredResources.push('!' + resource);
             });
-            gulp.src(filteredResources, { base: 'out-build' }).pipe(resourcesStream);
+            gulp.src(filteredResources, { base: "" + src }).pipe(resourcesStream);
             var bundleInfoArray = [];
             if (opts.bundleInfo) {
                 bundleInfoArray.push(new VinylFile({
@@ -146,9 +149,9 @@ function optimizeTask(opts) {
         });
         var otherSourcesStream = es.through();
         var otherSourcesStreamArr = [];
-        gulp.src(otherSources, { base: 'out-build' })
+        gulp.src(otherSources, { base: "" + src })
             .pipe(es.through(function (data) {
-            otherSourcesStreamArr.push(toConcatStream(bundledFileHeader, [data], data.relative));
+            otherSourcesStreamArr.push(toConcatStream(src, bundledFileHeader, [data], data.relative));
         }, function () {
             if (!otherSourcesStreamArr.length) {
                 setTimeout(function () { otherSourcesStream.emit('end'); }, 0);
@@ -157,17 +160,17 @@ function optimizeTask(opts) {
                 es.merge(otherSourcesStreamArr).pipe(otherSourcesStream);
             }
         }));
-        var result = es.merge(loader(bundledFileHeader, bundleLoader), bundlesStream, otherSourcesStream, resourcesStream, bundleInfoStream);
+        var result = es.merge(loader(src, bundledFileHeader, bundleLoader), bundlesStream, otherSourcesStream, resourcesStream, bundleInfoStream);
         return result
             .pipe(sourcemaps.write('./', {
             sourceRoot: null,
             addComment: true,
             includeContent: true
         }))
-            .pipe(i18n.processNlsFiles({
+            .pipe(opts.languages && opts.languages.length ? i18n_1.processNlsFiles({
             fileHeader: bundledFileHeader,
             languages: opts.languages
-        }))
+        }) : es.through())
             .pipe(gulp.dest(out));
     };
 }
diff --git a/build/lib/optimize.ts b/build/lib/optimize.ts
index b5636ffb8ef..8a35523dbe2 100644
--- a/build/lib/optimize.ts
+++ b/build/lib/optimize.ts
@@ -5,24 +5,25 @@
 
 'use strict';
 
-import * as path from 'path';
+import * as es from 'event-stream';
 import * as gulp from 'gulp';
-import * as sourcemaps from 'gulp-sourcemaps';
-import * as filter from 'gulp-filter';
+import * as concat from 'gulp-concat';
 import * as minifyCSS from 'gulp-cssnano';
+import * as filter from 'gulp-filter';
+import * as flatmap from 'gulp-flatmap';
+import * as sourcemaps from 'gulp-sourcemaps';
 import * as uglify from 'gulp-uglify';
 import * as composer from 'gulp-uglify/composer';
-import * as uglifyes from 'uglify-es';
-import * as es from 'event-stream';
-import * as concat from 'gulp-concat';
-import * as VinylFile from 'vinyl';
-import * as bundle from './bundle';
-import * as util from './util';
-import * as i18n from './i18n';
 import * as gulpUtil from 'gulp-util';
-import * as flatmap from 'gulp-flatmap';
+import * as path from 'path';
 import * as pump from 'pump';
 import * as sm from 'source-map';
+import * as uglifyes from 'uglify-es';
+import * as VinylFile from 'vinyl';
+import * as bundle from './bundle';
+import { Language, processNlsFiles } from './i18n';
+import { createStatsStream } from './stats';
+import * as util from './util';
 
 const REPO_ROOT_PATH = path.join(__dirname, '../..');
 
@@ -50,21 +51,21 @@ declare class FileSourceMap extends VinylFile {
 	public sourceMap: sm.RawSourceMap;
 }
 
-function loader(bundledFileHeader: string, bundleLoader: boolean): NodeJS.ReadWriteStream {
+function loader(src: string, bundledFileHeader: string, bundleLoader: boolean): NodeJS.ReadWriteStream {
 	let sources = [
-		'out-build/vs/loader.js'
+		`${src}/vs/loader.js`
 	];
 	if (bundleLoader) {
 		sources = sources.concat([
-			'out-build/vs/css.js',
-			'out-build/vs/nls.js'
+			`${src}/vs/css.js`,
+			`${src}/vs/nls.js`
 		]);
 	}
 
 	let isFirst = true;
 	return (
 		gulp
-			.src(sources, { base: 'out-build' })
+			.src(sources, { base: `${src}` })
 			.pipe(es.through(function (data) {
 				if (isFirst) {
 					isFirst = false;
@@ -87,7 +88,7 @@ function loader(bundledFileHeader: string, bundleLoader: boolean): NodeJS.ReadWr
 	);
 }
 
-function toConcatStream(bundledFileHeader: string, sources: bundle.IFile[], dest: string): NodeJS.ReadWriteStream {
+function toConcatStream(src: string, bundledFileHeader: string, sources: bundle.IFile[], dest: string): NodeJS.ReadWriteStream {
 	const useSourcemaps = /\.js$/.test(dest) && !/\.nls\.js$/.test(dest);
 
 	// If a bundle ends up including in any of the sources our copyright, then
@@ -110,7 +111,7 @@ function toConcatStream(bundledFileHeader: string, sources: bundle.IFile[], dest
 
 	const treatedSources = sources.map(function (source) {
 		const root = source.path ? REPO_ROOT_PATH.replace(/\\/g, '/') : '';
-		const base = source.path ? root + '/out-build' : '';
+		const base = source.path ? root + `/${src}` : '';
 
 		return new VinylFile({
 			path: source.path ? root + '/' + source.path.replace(/\\/g, '/') : 'fake',
@@ -121,16 +122,21 @@ function toConcatStream(bundledFileHeader: string, sources: bundle.IFile[], dest
 
 	return es.readArray(treatedSources)
 		.pipe(useSourcemaps ? util.loadSourcemaps() : es.through())
-		.pipe(concat(dest));
+		.pipe(concat(dest))
+		.pipe(createStatsStream(dest));
 }
 
-function toBundleStream(bundledFileHeader: string, bundles: bundle.IConcatFile[]): NodeJS.ReadWriteStream {
+function toBundleStream(src: string, bundledFileHeader: string, bundles: bundle.IConcatFile[]): NodeJS.ReadWriteStream {
 	return es.merge(bundles.map(function (bundle) {
-		return toConcatStream(bundledFileHeader, bundle.sources, bundle.dest);
+		return toConcatStream(src, bundledFileHeader, bundle.sources, bundle.dest);
 	}));
 }
 
 export interface IOptimizeTaskOpts {
+	/**
+	 * The folder to read files from.
+	 */
+	src: string;
 	/**
 	 * (for AMD files, will get bundled and get Copyright treatment)
 	 */
@@ -161,11 +167,13 @@ export interface IOptimizeTaskOpts {
 	 */
 	out: string;
 	/**
-	 * (languages to process)
+	 * (out folder name)
 	 */
-	languages: i18n.Language[];
+	languages?: Language[];
 }
+
 export function optimizeTask(opts: IOptimizeTaskOpts): () => NodeJS.ReadWriteStream {
+	const src = opts.src;
 	const entryPoints = opts.entryPoints;
 	const otherSources = opts.otherSources;
 	const resources = opts.resources;
@@ -182,7 +190,7 @@ export function optimizeTask(opts: IOptimizeTaskOpts): () => NodeJS.ReadWriteStr
 		bundle.bundle(entryPoints, loaderConfig, function (err, result) {
 			if (err) { return bundlesStream.emit('error', JSON.stringify(err)); }
 
-			toBundleStream(bundledFileHeader, result.files).pipe(bundlesStream);
+			toBundleStream(src, bundledFileHeader, result.files).pipe(bundlesStream);
 
 			// Remove css inlined resources
 			const filteredResources = resources.slice();
@@ -192,7 +200,7 @@ export function optimizeTask(opts: IOptimizeTaskOpts): () => NodeJS.ReadWriteStr
 				}
 				filteredResources.push('!' + resource);
 			});
-			gulp.src(filteredResources, { base: 'out-build' }).pipe(resourcesStream);
+			gulp.src(filteredResources, { base: `${src}` }).pipe(resourcesStream);
 
 			const bundleInfoArray: VinylFile[] = [];
 			if (opts.bundleInfo) {
@@ -208,9 +216,9 @@ export function optimizeTask(opts: IOptimizeTaskOpts): () => NodeJS.ReadWriteStr
 		const otherSourcesStream = es.through();
 		const otherSourcesStreamArr: NodeJS.ReadWriteStream[] = [];
 
-		gulp.src(otherSources, { base: 'out-build' })
+		gulp.src(otherSources, { base: `${src}` })
 			.pipe(es.through(function (data) {
-				otherSourcesStreamArr.push(toConcatStream(bundledFileHeader, [data], data.relative));
+				otherSourcesStreamArr.push(toConcatStream(src, bundledFileHeader, [data], data.relative));
 			}, function () {
 				if (!otherSourcesStreamArr.length) {
 					setTimeout(function () { otherSourcesStream.emit('end'); }, 0);
@@ -220,7 +228,7 @@ export function optimizeTask(opts: IOptimizeTaskOpts): () => NodeJS.ReadWriteStr
 			}));
 
 		const result = es.merge(
-			loader(bundledFileHeader, bundleLoader),
+			loader(src, bundledFileHeader, bundleLoader),
 			bundlesStream,
 			otherSourcesStream,
 			resourcesStream,
@@ -233,10 +241,10 @@ export function optimizeTask(opts: IOptimizeTaskOpts): () => NodeJS.ReadWriteStr
 				addComment: true,
 				includeContent: true
 			}))
-			.pipe(i18n.processNlsFiles({
+			.pipe(opts.languages && opts.languages.length ? processNlsFiles({
 				fileHeader: bundledFileHeader,
 				languages: opts.languages
-			}))
+			}) : es.through())
 			.pipe(gulp.dest(out));
 	};
 }
diff --git a/build/lib/standalone.js b/build/lib/standalone.js
index 12511b01d36..3e2bacc25d5 100644
--- a/build/lib/standalone.js
+++ b/build/lib/standalone.js
@@ -7,171 +7,237 @@ Object.defineProperty(exports, "__esModule", { value: true });
 var ts = require("typescript");
 var fs = require("fs");
 var path = require("path");
+var tss = require("./treeshaking");
 var REPO_ROOT = path.join(__dirname, '../../');
 var SRC_DIR = path.join(REPO_ROOT, 'src');
-var OUT_EDITOR = path.join(REPO_ROOT, 'out-editor');
-function createESMSourcesAndResources(options) {
+var dirCache = {};
+function writeFile(filePath, contents) {
+    function ensureDirs(dirPath) {
+        if (dirCache[dirPath]) {
+            return;
+        }
+        dirCache[dirPath] = true;
+        ensureDirs(path.dirname(dirPath));
+        if (fs.existsSync(dirPath)) {
+            return;
+        }
+        fs.mkdirSync(dirPath);
+    }
+    ensureDirs(path.dirname(filePath));
+    fs.writeFileSync(filePath, contents);
+}
+function extractEditor(options) {
+    var result = tss.shake(options);
+    for (var fileName in result) {
+        if (result.hasOwnProperty(fileName)) {
+            writeFile(path.join(options.destRoot, fileName), result[fileName]);
+        }
+    }
+    var copied = {};
+    var copyFile = function (fileName) {
+        if (copied[fileName]) {
+            return;
+        }
+        copied[fileName] = true;
+        var srcPath = path.join(options.sourcesRoot, fileName);
+        var dstPath = path.join(options.destRoot, fileName);
+        writeFile(dstPath, fs.readFileSync(srcPath));
+    };
+    var writeOutputFile = function (fileName, contents) {
+        writeFile(path.join(options.destRoot, fileName), contents);
+    };
+    for (var fileName in result) {
+        if (result.hasOwnProperty(fileName)) {
+            var fileContents = result[fileName];
+            var info = ts.preProcessFile(fileContents);
+            for (var i = info.importedFiles.length - 1; i >= 0; i--) {
+                var importedFileName = info.importedFiles[i].fileName;
+                var importedFilePath = void 0;
+                if (/^vs\/css!/.test(importedFileName)) {
+                    importedFilePath = importedFileName.substr('vs/css!'.length) + '.css';
+                }
+                else {
+                    importedFilePath = importedFileName;
+                }
+                if (/(^\.\/)|(^\.\.\/)/.test(importedFilePath)) {
+                    importedFilePath = path.join(path.dirname(fileName), importedFilePath);
+                }
+                if (/\.css$/.test(importedFilePath)) {
+                    transportCSS(importedFilePath, copyFile, writeOutputFile);
+                }
+                else {
+                    if (fs.existsSync(path.join(options.sourcesRoot, importedFilePath + '.js'))) {
+                        copyFile(importedFilePath + '.js');
+                    }
+                }
+            }
+        }
+    }
+    var tsConfig = JSON.parse(fs.readFileSync(path.join(options.sourcesRoot, 'tsconfig.json')).toString());
+    tsConfig.compilerOptions.noUnusedLocals = false;
+    tsConfig.compilerOptions.preserveConstEnums = false;
+    tsConfig.compilerOptions.declaration = false;
+    writeOutputFile('tsconfig.json', JSON.stringify(tsConfig, null, '\t'));
+    [
+        'vs/css.build.js',
+        'vs/css.d.ts',
+        'vs/css.js',
+        'vs/loader.js',
+        'vs/monaco.d.ts',
+        'vs/nls.build.js',
+        'vs/nls.d.ts',
+        'vs/nls.js',
+        'vs/nls.mock.ts',
+        'typings/lib.ie11_safe_es6.d.ts',
+        'typings/thenable.d.ts',
+        'typings/es6-promise.d.ts',
+        'typings/require.d.ts',
+    ].forEach(copyFile);
+}
+exports.extractEditor = extractEditor;
+function createESMSourcesAndResources2(options) {
+    var SRC_FOLDER = path.join(REPO_ROOT, options.srcFolder);
     var OUT_FOLDER = path.join(REPO_ROOT, options.outFolder);
     var OUT_RESOURCES_FOLDER = path.join(REPO_ROOT, options.outResourcesFolder);
-    var in_queue = Object.create(null);
-    var queue = [];
-    var enqueue = function (module) {
-        if (in_queue[module]) {
-            return;
+    var getDestAbsoluteFilePath = function (file) {
+        var dest = options.renames[file.replace(/\\/g, '/')] || file;
+        if (dest === 'tsconfig.json') {
+            return path.join(OUT_FOLDER, "../tsconfig.json");
         }
-        in_queue[module] = true;
-        queue.push(module);
+        if (/\.ts$/.test(dest)) {
+            return path.join(OUT_FOLDER, dest);
+        }
+        return path.join(OUT_RESOURCES_FOLDER, dest);
     };
-    var seenDir = {};
-    var createDirectoryRecursive = function (dir) {
-        if (seenDir[dir]) {
-            return;
+    var allFiles = walkDirRecursive(SRC_FOLDER);
+    for (var i = 0; i < allFiles.length; i++) {
+        var file = allFiles[i];
+        if (options.ignores.indexOf(file.replace(/\\/g, '/')) >= 0) {
+            continue;
         }
-        var lastSlash = dir.lastIndexOf('/');
-        if (lastSlash === -1) {
-            lastSlash = dir.lastIndexOf('\\');
+        if (file === 'tsconfig.json') {
+            var tsConfig = JSON.parse(fs.readFileSync(path.join(SRC_FOLDER, file)).toString());
+            tsConfig.compilerOptions.moduleResolution = undefined;
+            tsConfig.compilerOptions.baseUrl = undefined;
+            tsConfig.compilerOptions.module = 'es6';
+            tsConfig.compilerOptions.rootDir = 'src';
+            tsConfig.compilerOptions.outDir = path.relative(path.dirname(OUT_FOLDER), OUT_RESOURCES_FOLDER);
+            write(getDestAbsoluteFilePath(file), JSON.stringify(tsConfig, null, '\t'));
+            continue;
         }
-        if (lastSlash !== -1) {
-            createDirectoryRecursive(dir.substring(0, lastSlash));
+        if (/\.d\.ts$/.test(file) || /\.css$/.test(file) || /\.js$/.test(file)) {
+            // Transport the files directly
+            write(getDestAbsoluteFilePath(file), fs.readFileSync(path.join(SRC_FOLDER, file)));
+            continue;
         }
-        seenDir[dir] = true;
-        try {
-            fs.mkdirSync(dir);
-        }
-        catch (err) { }
-    };
-    seenDir[REPO_ROOT] = true;
-    var toggleComments = function (fileContents) {
-        var lines = fileContents.split(/\r\n|\r|\n/);
-        var mode = 0;
-        for (var i = 0; i < lines.length; i++) {
-            var line = lines[i];
-            if (mode === 0) {
-                if (/\/\/ ESM-comment-begin/.test(line)) {
-                    mode = 1;
-                    continue;
+        if (/\.ts$/.test(file)) {
+            // Transform the .ts file
+            var fileContents = fs.readFileSync(path.join(SRC_FOLDER, file)).toString();
+            var info = ts.preProcessFile(fileContents);
+            for (var i_1 = info.importedFiles.length - 1; i_1 >= 0; i_1--) {
+                var importedFilename = info.importedFiles[i_1].fileName;
+                var pos = info.importedFiles[i_1].pos;
+                var end = info.importedFiles[i_1].end;
+                var importedFilepath = void 0;
+                if (/^vs\/css!/.test(importedFilename)) {
+                    importedFilepath = importedFilename.substr('vs/css!'.length) + '.css';
                 }
-                if (/\/\/ ESM-uncomment-begin/.test(line)) {
-                    mode = 2;
-                    continue;
+                else {
+                    importedFilepath = importedFilename;
                 }
-                continue;
+                if (/(^\.\/)|(^\.\.\/)/.test(importedFilepath)) {
+                    importedFilepath = path.join(path.dirname(file), importedFilepath);
+                }
+                var relativePath = void 0;
+                if (importedFilepath === path.dirname(file)) {
+                    relativePath = '../' + path.basename(path.dirname(file));
+                }
+                else if (importedFilepath === path.dirname(path.dirname(file))) {
+                    relativePath = '../../' + path.basename(path.dirname(path.dirname(file)));
+                }
+                else {
+                    relativePath = path.relative(path.dirname(file), importedFilepath);
+                }
+                if (!/(^\.\/)|(^\.\.\/)/.test(relativePath)) {
+                    relativePath = './' + relativePath;
+                }
+                fileContents = (fileContents.substring(0, pos + 1)
+                    + relativePath
+                    + fileContents.substring(end + 1));
             }
-            if (mode === 1) {
-                if (/\/\/ ESM-comment-end/.test(line)) {
-                    mode = 0;
-                    continue;
-                }
-                lines[i] = '// ' + line;
-                continue;
+            fileContents = fileContents.replace(/import ([a-zA-z0-9]+) = require\(('[^']+')\);/g, function (_, m1, m2) {
+                return "import * as " + m1 + " from " + m2 + ";";
+            });
+            write(getDestAbsoluteFilePath(file), fileContents);
+            continue;
+        }
+        console.log("UNKNOWN FILE: " + file);
+    }
+    function walkDirRecursive(dir) {
+        if (dir.charAt(dir.length - 1) !== '/' || dir.charAt(dir.length - 1) !== '\\') {
+            dir += '/';
+        }
+        var result = [];
+        _walkDirRecursive(dir, result, dir.length);
+        return result;
+    }
+    function _walkDirRecursive(dir, result, trimPos) {
+        var files = fs.readdirSync(dir);
+        for (var i = 0; i < files.length; i++) {
+            var file = path.join(dir, files[i]);
+            if (fs.statSync(file).isDirectory()) {
+                _walkDirRecursive(file, result, trimPos);
             }
-            if (mode === 2) {
-                if (/\/\/ ESM-uncomment-end/.test(line)) {
-                    mode = 0;
-                    continue;
-                }
-                lines[i] = line.replace(/^(\s*)\/\/ ?/, function (_, indent) {
-                    return indent;
-                });
+            else {
+                result.push(file.substr(trimPos));
             }
         }
-        return lines.join('\n');
-    };
-    var write = function (filePath, contents) {
-        var absoluteFilePath;
-        if (/\.ts$/.test(filePath)) {
-            absoluteFilePath = path.join(OUT_FOLDER, filePath);
-        }
-        else {
-            absoluteFilePath = path.join(OUT_RESOURCES_FOLDER, filePath);
-        }
-        createDirectoryRecursive(path.dirname(absoluteFilePath));
-        if (/(\.ts$)|(\.js$)/.test(filePath)) {
+    }
+    function write(absoluteFilePath, contents) {
+        if (/(\.ts$)|(\.js$)/.test(absoluteFilePath)) {
             contents = toggleComments(contents.toString());
         }
-        fs.writeFileSync(absoluteFilePath, contents);
-    };
-    options.entryPoints.forEach(function (entryPoint) { return enqueue(entryPoint); });
-    while (queue.length > 0) {
-        var module_1 = queue.shift();
-        if (transportCSS(options, module_1, enqueue, write)) {
-            continue;
+        writeFile(absoluteFilePath, contents);
+        function toggleComments(fileContents) {
+            var lines = fileContents.split(/\r\n|\r|\n/);
+            var mode = 0;
+            for (var i = 0; i < lines.length; i++) {
+                var line = lines[i];
+                if (mode === 0) {
+                    if (/\/\/ ESM-comment-begin/.test(line)) {
+                        mode = 1;
+                        continue;
+                    }
+                    if (/\/\/ ESM-uncomment-begin/.test(line)) {
+                        mode = 2;
+                        continue;
+                    }
+                    continue;
+                }
+                if (mode === 1) {
+                    if (/\/\/ ESM-comment-end/.test(line)) {
+                        mode = 0;
+                        continue;
+                    }
+                    lines[i] = '// ' + line;
+                    continue;
+                }
+                if (mode === 2) {
+                    if (/\/\/ ESM-uncomment-end/.test(line)) {
+                        mode = 0;
+                        continue;
+                    }
+                    lines[i] = line.replace(/^(\s*)\/\/ ?/, function (_, indent) {
+                        return indent;
+                    });
+                }
+            }
+            return lines.join('\n');
         }
-        if (transportResource(options, module_1, enqueue, write)) {
-            continue;
-        }
-        if (transportDTS(options, module_1, enqueue, write)) {
-            continue;
-        }
-        var filename = void 0;
-        if (options.redirects[module_1]) {
-            filename = path.join(SRC_DIR, options.redirects[module_1] + '.ts');
-        }
-        else {
-            filename = path.join(SRC_DIR, module_1 + '.ts');
-        }
-        var fileContents = fs.readFileSync(filename).toString();
-        var info = ts.preProcessFile(fileContents);
-        for (var i = info.importedFiles.length - 1; i >= 0; i--) {
-            var importedFilename = info.importedFiles[i].fileName;
-            var pos = info.importedFiles[i].pos;
-            var end = info.importedFiles[i].end;
-            var importedFilepath = void 0;
-            if (/^vs\/css!/.test(importedFilename)) {
-                importedFilepath = importedFilename.substr('vs/css!'.length) + '.css';
-            }
-            else {
-                importedFilepath = importedFilename;
-            }
-            if (/(^\.\/)|(^\.\.\/)/.test(importedFilepath)) {
-                importedFilepath = path.join(path.dirname(module_1), importedFilepath);
-            }
-            enqueue(importedFilepath);
-            var relativePath = void 0;
-            if (importedFilepath === path.dirname(module_1)) {
-                relativePath = '../' + path.basename(path.dirname(module_1));
-            }
-            else if (importedFilepath === path.dirname(path.dirname(module_1))) {
-                relativePath = '../../' + path.basename(path.dirname(path.dirname(module_1)));
-            }
-            else {
-                relativePath = path.relative(path.dirname(module_1), importedFilepath);
-            }
-            if (!/(^\.\/)|(^\.\.\/)/.test(relativePath)) {
-                relativePath = './' + relativePath;
-            }
-            fileContents = (fileContents.substring(0, pos + 1)
-                + relativePath
-                + fileContents.substring(end + 1));
-        }
-        fileContents = fileContents.replace(/import ([a-zA-z0-9]+) = require\(('[^']+')\);/g, function (_, m1, m2) {
-            return "import * as " + m1 + " from " + m2 + ";";
-        });
-        fileContents = fileContents.replace(/Thenable/g, 'PromiseLike');
-        write(module_1 + '.ts', fileContents);
     }
-    var esm_opts = {
-        "compilerOptions": {
-            "outDir": path.relative(path.dirname(OUT_FOLDER), OUT_RESOURCES_FOLDER),
-            "rootDir": "src",
-            "module": "es6",
-            "target": "es5",
-            "experimentalDecorators": true,
-            "lib": [
-                "dom",
-                "es5",
-                "es2015.collection",
-                "es2015.promise"
-            ],
-            "types": []
-        }
-    };
-    fs.writeFileSync(path.join(path.dirname(OUT_FOLDER), 'tsconfig.json'), JSON.stringify(esm_opts, null, '\t'));
-    var monacodts = fs.readFileSync(path.join(SRC_DIR, 'vs/monaco.d.ts')).toString();
-    fs.writeFileSync(path.join(OUT_FOLDER, 'vs/monaco.d.ts'), monacodts);
 }
-exports.createESMSourcesAndResources = createESMSourcesAndResources;
-function transportCSS(options, module, enqueue, write) {
+exports.createESMSourcesAndResources2 = createESMSourcesAndResources2;
+function transportCSS(module, enqueue, write) {
     if (!/\.css/.test(module)) {
         return false;
     }
@@ -179,10 +245,10 @@ function transportCSS(options, module, enqueue, write) {
     var fileContents = fs.readFileSync(filename).toString();
     var inlineResources = 'base64'; // see https://github.com/Microsoft/monaco-editor/issues/148
     var inlineResourcesLimit = 300000; //3000; // see https://github.com/Microsoft/monaco-editor/issues/336
-    var newContents = _rewriteOrInlineUrls(filename, fileContents, inlineResources === 'base64', inlineResourcesLimit);
+    var newContents = _rewriteOrInlineUrls(fileContents, inlineResources === 'base64', inlineResourcesLimit);
     write(module, newContents);
     return true;
-    function _rewriteOrInlineUrls(originalFileFSPath, contents, forceBase64, inlineByteLimit) {
+    function _rewriteOrInlineUrls(contents, forceBase64, inlineByteLimit) {
         return _replaceURL(contents, function (url) {
             var imagePath = path.join(path.dirname(module), url);
             var fileContents = fs.readFileSync(path.join(SRC_DIR, imagePath));
@@ -239,27 +305,3 @@ function transportCSS(options, module, enqueue, write) {
         return haystack.length >= needle.length && haystack.substr(0, needle.length) === needle;
     }
 }
-function transportResource(options, module, enqueue, write) {
-    if (!/\.svg/.test(module)) {
-        return false;
-    }
-    write(module, fs.readFileSync(path.join(SRC_DIR, module)));
-    return true;
-}
-function transportDTS(options, module, enqueue, write) {
-    if (options.redirects[module] && fs.existsSync(path.join(SRC_DIR, options.redirects[module] + '.ts'))) {
-        return false;
-    }
-    if (!fs.existsSync(path.join(SRC_DIR, module + '.d.ts'))) {
-        return false;
-    }
-    write(module + '.d.ts', fs.readFileSync(path.join(SRC_DIR, module + '.d.ts')));
-    var filename;
-    if (options.redirects[module]) {
-        write(module + '.js', fs.readFileSync(path.join(SRC_DIR, options.redirects[module] + '.js')));
-    }
-    else {
-        write(module + '.js', fs.readFileSync(path.join(SRC_DIR, module + '.js')));
-    }
-    return true;
-}
diff --git a/build/lib/standalone.ts b/build/lib/standalone.ts
index a402cf68405..621b4aea6d4 100644
--- a/build/lib/standalone.ts
+++ b/build/lib/standalone.ts
@@ -6,199 +6,273 @@
 import * as ts from 'typescript';
 import * as fs from 'fs';
 import * as path from 'path';
+import * as tss from './treeshaking';
 
 const REPO_ROOT = path.join(__dirname, '../../');
 const SRC_DIR = path.join(REPO_ROOT, 'src');
-const OUT_EDITOR = path.join(REPO_ROOT, 'out-editor');
 
-export interface IOptions {
-	entryPoints: string[];
-	outFolder: string;
-	outResourcesFolder: string;
-	redirects: { [module: string]: string; };
+let dirCache: { [dir: string]: boolean; } = {};
+
+function writeFile(filePath: string, contents: Buffer | string): void {
+	function ensureDirs(dirPath: string): void {
+		if (dirCache[dirPath]) {
+			return;
+		}
+		dirCache[dirPath] = true;
+
+		ensureDirs(path.dirname(dirPath));
+		if (fs.existsSync(dirPath)) {
+			return;
+		}
+		fs.mkdirSync(dirPath);
+	}
+	ensureDirs(path.dirname(filePath));
+	fs.writeFileSync(filePath, contents);
 }
 
-export function createESMSourcesAndResources(options: IOptions): void {
+export function extractEditor(options: tss.ITreeShakingOptions & { destRoot: string }): void {
+	let result = tss.shake(options);
+	for (let fileName in result) {
+		if (result.hasOwnProperty(fileName)) {
+			writeFile(path.join(options.destRoot, fileName), result[fileName]);
+		}
+	}
+	let copied: { [fileName: string]: boolean; } = {};
+	const copyFile = (fileName: string) => {
+		if (copied[fileName]) {
+			return;
+		}
+		copied[fileName] = true;
+		const srcPath = path.join(options.sourcesRoot, fileName);
+		const dstPath = path.join(options.destRoot, fileName);
+		writeFile(dstPath, fs.readFileSync(srcPath));
+	};
+	const writeOutputFile = (fileName: string, contents: string) => {
+		writeFile(path.join(options.destRoot, fileName), contents);
+	};
+	for (let fileName in result) {
+		if (result.hasOwnProperty(fileName)) {
+			const fileContents = result[fileName];
+			const info = ts.preProcessFile(fileContents);
+
+			for (let i = info.importedFiles.length - 1; i >= 0; i--) {
+				const importedFileName = info.importedFiles[i].fileName;
+
+				let importedFilePath: string;
+				if (/^vs\/css!/.test(importedFileName)) {
+					importedFilePath = importedFileName.substr('vs/css!'.length) + '.css';
+				} else {
+					importedFilePath = importedFileName;
+				}
+				if (/(^\.\/)|(^\.\.\/)/.test(importedFilePath)) {
+					importedFilePath = path.join(path.dirname(fileName), importedFilePath);
+				}
+
+				if (/\.css$/.test(importedFilePath)) {
+					transportCSS(importedFilePath, copyFile, writeOutputFile);
+				} else {
+					if (fs.existsSync(path.join(options.sourcesRoot, importedFilePath + '.js'))) {
+						copyFile(importedFilePath + '.js');
+					}
+				}
+			}
+		}
+	}
+
+	const tsConfig = JSON.parse(fs.readFileSync(path.join(options.sourcesRoot, 'tsconfig.json')).toString());
+	tsConfig.compilerOptions.noUnusedLocals = false;
+	tsConfig.compilerOptions.preserveConstEnums = false;
+	tsConfig.compilerOptions.declaration = false;
+	writeOutputFile('tsconfig.json', JSON.stringify(tsConfig, null, '\t'));
+
+	[
+		'vs/css.build.js',
+		'vs/css.d.ts',
+		'vs/css.js',
+		'vs/loader.js',
+		'vs/monaco.d.ts',
+		'vs/nls.build.js',
+		'vs/nls.d.ts',
+		'vs/nls.js',
+		'vs/nls.mock.ts',
+		'typings/lib.ie11_safe_es6.d.ts',
+		'typings/thenable.d.ts',
+		'typings/es6-promise.d.ts',
+		'typings/require.d.ts',
+	].forEach(copyFile);
+}
+
+export interface IOptions2 {
+	srcFolder: string;
+	outFolder: string;
+	outResourcesFolder: string;
+	ignores: string[];
+	renames: { [filename: string]: string; };
+}
+
+export function createESMSourcesAndResources2(options: IOptions2): void {
+	const SRC_FOLDER = path.join(REPO_ROOT, options.srcFolder);
 	const OUT_FOLDER = path.join(REPO_ROOT, options.outFolder);
 	const OUT_RESOURCES_FOLDER = path.join(REPO_ROOT, options.outResourcesFolder);
 
-	let in_queue: { [module: string]: boolean; } = Object.create(null);
-	let queue: string[] = [];
-
-	const enqueue = (module: string) => {
-		if (in_queue[module]) {
-			return;
+	const getDestAbsoluteFilePath = (file: string): string => {
+		let dest = options.renames[file.replace(/\\/g, '/')] || file;
+		if (dest === 'tsconfig.json') {
+			return path.join(OUT_FOLDER, `../tsconfig.json`);
 		}
-		in_queue[module] = true;
-		queue.push(module);
+		if (/\.ts$/.test(dest)) {
+			return path.join(OUT_FOLDER, dest);
+		}
+		return path.join(OUT_RESOURCES_FOLDER, dest);
 	};
 
-	const seenDir: { [key: string]: boolean; } = {};
-	const createDirectoryRecursive = (dir: string) => {
-		if (seenDir[dir]) {
-			return;
-		}
+	const allFiles = walkDirRecursive(SRC_FOLDER);
+	for (let i = 0; i < allFiles.length; i++) {
+		const file = allFiles[i];
 
-		let lastSlash = dir.lastIndexOf('/');
-		if (lastSlash === -1) {
-			lastSlash = dir.lastIndexOf('\\');
-		}
-		if (lastSlash !== -1) {
-			createDirectoryRecursive(dir.substring(0, lastSlash));
-		}
-		seenDir[dir] = true;
-		try { fs.mkdirSync(dir); } catch (err) { }
-	};
-
-	seenDir[REPO_ROOT] = true;
-
-	const toggleComments = (fileContents: string) => {
-		let lines = fileContents.split(/\r\n|\r|\n/);
-		let mode = 0;
-		for (let i = 0; i < lines.length; i++) {
-			const line = lines[i];
-
-			if (mode === 0) {
-				if (/\/\/ ESM-comment-begin/.test(line)) {
-					mode = 1;
-					continue;
-				}
-				if (/\/\/ ESM-uncomment-begin/.test(line)) {
-					mode = 2;
-					continue;
-				}
-				continue;
-			}
-
-			if (mode === 1) {
-				if (/\/\/ ESM-comment-end/.test(line)) {
-					mode = 0;
-					continue;
-				}
-				lines[i] = '// ' + line;
-				continue;
-			}
-
-			if (mode === 2) {
-				if (/\/\/ ESM-uncomment-end/.test(line)) {
-					mode = 0;
-					continue;
-				}
-				lines[i] = line.replace(/^(\s*)\/\/ ?/, function (_, indent) {
-					return indent;
-				});
-			}
-		}
-
-		return lines.join('\n');
-	};
-
-	const write = (filePath: string, contents: string | Buffer) => {
-		let absoluteFilePath: string;
-		if (/\.ts$/.test(filePath)) {
-			absoluteFilePath = path.join(OUT_FOLDER, filePath);
-		} else {
-			absoluteFilePath = path.join(OUT_RESOURCES_FOLDER, filePath);
-		}
-		createDirectoryRecursive(path.dirname(absoluteFilePath));
-		if (/(\.ts$)|(\.js$)/.test(filePath)) {
-			contents = toggleComments(contents.toString());
-		}
-		fs.writeFileSync(absoluteFilePath, contents);
-	};
-
-	options.entryPoints.forEach((entryPoint) => enqueue(entryPoint));
-
-	while (queue.length > 0) {
-		const module = queue.shift();
-		if (transportCSS(options, module, enqueue, write)) {
-			continue;
-		}
-		if (transportResource(options, module, enqueue, write)) {
-			continue;
-		}
-		if (transportDTS(options, module, enqueue, write)) {
+		if (options.ignores.indexOf(file.replace(/\\/g, '/')) >= 0) {
 			continue;
 		}
 
-		let filename: string;
-		if (options.redirects[module]) {
-			filename = path.join(SRC_DIR, options.redirects[module] + '.ts');
-		} else {
-			filename = path.join(SRC_DIR, module + '.ts');
-		}
-		let fileContents = fs.readFileSync(filename).toString();
-
-		const info = ts.preProcessFile(fileContents);
-
-		for (let i = info.importedFiles.length - 1; i >= 0; i--) {
-			const importedFilename = info.importedFiles[i].fileName;
-			const pos = info.importedFiles[i].pos;
-			const end = info.importedFiles[i].end;
-
-			let importedFilepath: string;
-			if (/^vs\/css!/.test(importedFilename)) {
-				importedFilepath = importedFilename.substr('vs/css!'.length) + '.css';
-			} else {
-				importedFilepath = importedFilename;
-			}
-			if (/(^\.\/)|(^\.\.\/)/.test(importedFilepath)) {
-				importedFilepath = path.join(path.dirname(module), importedFilepath);
-			}
-
-			enqueue(importedFilepath);
-
-			let relativePath: string;
-			if (importedFilepath === path.dirname(module)) {
-				relativePath = '../' + path.basename(path.dirname(module));
-			} else if (importedFilepath === path.dirname(path.dirname(module))) {
-				relativePath = '../../' + path.basename(path.dirname(path.dirname(module)));
-			} else {
-				relativePath = path.relative(path.dirname(module), importedFilepath);
-			}
-			if (!/(^\.\/)|(^\.\.\/)/.test(relativePath)) {
-				relativePath = './' + relativePath;
-			}
-			fileContents = (
-				fileContents.substring(0, pos + 1)
-				+ relativePath
-				+ fileContents.substring(end + 1)
-			);
+		if (file === 'tsconfig.json') {
+			const tsConfig = JSON.parse(fs.readFileSync(path.join(SRC_FOLDER, file)).toString());
+			tsConfig.compilerOptions.moduleResolution = undefined;
+			tsConfig.compilerOptions.baseUrl = undefined;
+			tsConfig.compilerOptions.module = 'es6';
+			tsConfig.compilerOptions.rootDir = 'src';
+			tsConfig.compilerOptions.outDir = path.relative(path.dirname(OUT_FOLDER), OUT_RESOURCES_FOLDER);
+			write(getDestAbsoluteFilePath(file), JSON.stringify(tsConfig, null, '\t'));
+			continue;
 		}
 
-		fileContents = fileContents.replace(/import ([a-zA-z0-9]+) = require\(('[^']+')\);/g, function (_, m1, m2) {
-			return `import * as ${m1} from ${m2};`;
-		});
-		fileContents = fileContents.replace(/Thenable/g, 'PromiseLike');
+		if (/\.d\.ts$/.test(file) || /\.css$/.test(file) || /\.js$/.test(file)) {
+			// Transport the files directly
+			write(getDestAbsoluteFilePath(file), fs.readFileSync(path.join(SRC_FOLDER, file)));
+			continue;
+		}
 
-		write(module + '.ts', fileContents);
+		if (/\.ts$/.test(file)) {
+			// Transform the .ts file
+			let fileContents = fs.readFileSync(path.join(SRC_FOLDER, file)).toString();
+
+			const info = ts.preProcessFile(fileContents);
+
+			for (let i = info.importedFiles.length - 1; i >= 0; i--) {
+				const importedFilename = info.importedFiles[i].fileName;
+				const pos = info.importedFiles[i].pos;
+				const end = info.importedFiles[i].end;
+
+				let importedFilepath: string;
+				if (/^vs\/css!/.test(importedFilename)) {
+					importedFilepath = importedFilename.substr('vs/css!'.length) + '.css';
+				} else {
+					importedFilepath = importedFilename;
+				}
+				if (/(^\.\/)|(^\.\.\/)/.test(importedFilepath)) {
+					importedFilepath = path.join(path.dirname(file), importedFilepath);
+				}
+
+				let relativePath: string;
+				if (importedFilepath === path.dirname(file)) {
+					relativePath = '../' + path.basename(path.dirname(file));
+				} else if (importedFilepath === path.dirname(path.dirname(file))) {
+					relativePath = '../../' + path.basename(path.dirname(path.dirname(file)));
+				} else {
+					relativePath = path.relative(path.dirname(file), importedFilepath);
+				}
+				if (!/(^\.\/)|(^\.\.\/)/.test(relativePath)) {
+					relativePath = './' + relativePath;
+				}
+				fileContents = (
+					fileContents.substring(0, pos + 1)
+					+ relativePath
+					+ fileContents.substring(end + 1)
+				);
+			}
+
+			fileContents = fileContents.replace(/import ([a-zA-z0-9]+) = require\(('[^']+')\);/g, function (_, m1, m2) {
+				return `import * as ${m1} from ${m2};`;
+			});
+
+			write(getDestAbsoluteFilePath(file), fileContents);
+			continue;
+		}
+
+		console.log(`UNKNOWN FILE: ${file}`);
 	}
 
-	const esm_opts = {
-		"compilerOptions": {
-			"outDir": path.relative(path.dirname(OUT_FOLDER), OUT_RESOURCES_FOLDER),
-			"rootDir": "src",
-			"module": "es6",
-			"target": "es5",
-			"experimentalDecorators": true,
-			"lib": [
-				"dom",
-				"es5",
-				"es2015.collection",
-				"es2015.promise"
-			],
-			"types": [
-			]
+
+	function walkDirRecursive(dir: string): string[] {
+		if (dir.charAt(dir.length - 1) !== '/' || dir.charAt(dir.length - 1) !== '\\') {
+			dir += '/';
 		}
-	};
-	fs.writeFileSync(path.join(path.dirname(OUT_FOLDER), 'tsconfig.json'), JSON.stringify(esm_opts, null, '\t'));
+		let result: string[] = [];
+		_walkDirRecursive(dir, result, dir.length);
+		return result;
+	}
 
-	const monacodts = fs.readFileSync(path.join(SRC_DIR, 'vs/monaco.d.ts')).toString();
-	fs.writeFileSync(path.join(OUT_FOLDER, 'vs/monaco.d.ts'), monacodts);
+	function _walkDirRecursive(dir: string, result: string[], trimPos: number): void {
+		const files = fs.readdirSync(dir);
+		for (let i = 0; i < files.length; i++) {
+			const file = path.join(dir, files[i]);
+			if (fs.statSync(file).isDirectory()) {
+				_walkDirRecursive(file, result, trimPos);
+			} else {
+				result.push(file.substr(trimPos));
+			}
+		}
+	}
 
+	function write(absoluteFilePath: string, contents: string | Buffer): void {
+		if (/(\.ts$)|(\.js$)/.test(absoluteFilePath)) {
+			contents = toggleComments(contents.toString());
+		}
+		writeFile(absoluteFilePath, contents);
+
+		function toggleComments(fileContents: string): string {
+			let lines = fileContents.split(/\r\n|\r|\n/);
+			let mode = 0;
+			for (let i = 0; i < lines.length; i++) {
+				const line = lines[i];
+
+				if (mode === 0) {
+					if (/\/\/ ESM-comment-begin/.test(line)) {
+						mode = 1;
+						continue;
+					}
+					if (/\/\/ ESM-uncomment-begin/.test(line)) {
+						mode = 2;
+						continue;
+					}
+					continue;
+				}
+
+				if (mode === 1) {
+					if (/\/\/ ESM-comment-end/.test(line)) {
+						mode = 0;
+						continue;
+					}
+					lines[i] = '// ' + line;
+					continue;
+				}
+
+				if (mode === 2) {
+					if (/\/\/ ESM-uncomment-end/.test(line)) {
+						mode = 0;
+						continue;
+					}
+					lines[i] = line.replace(/^(\s*)\/\/ ?/, function (_, indent) {
+						return indent;
+					});
+				}
+			}
+
+			return lines.join('\n');
+		}
+	}
 }
 
-function transportCSS(options: IOptions, module: string, enqueue: (module: string) => void, write: (path: string, contents: string | Buffer) => void): boolean {
+function transportCSS(module: string, enqueue: (module: string) => void, write: (path: string, contents: string | Buffer) => void): boolean {
 
 	if (!/\.css/.test(module)) {
 		return false;
@@ -209,11 +283,11 @@ function transportCSS(options: IOptions, module: string, enqueue: (module: strin
 	const inlineResources = 'base64'; // see https://github.com/Microsoft/monaco-editor/issues/148
 	const inlineResourcesLimit = 300000;//3000; // see https://github.com/Microsoft/monaco-editor/issues/336
 
-	const newContents = _rewriteOrInlineUrls(filename, fileContents, inlineResources === 'base64', inlineResourcesLimit);
+	const newContents = _rewriteOrInlineUrls(fileContents, inlineResources === 'base64', inlineResourcesLimit);
 	write(module, newContents);
 	return true;
 
-	function _rewriteOrInlineUrls(originalFileFSPath: string, contents: string, forceBase64: boolean, inlineByteLimit: number): string {
+	function _rewriteOrInlineUrls(contents: string, forceBase64: boolean, inlineByteLimit: number): string {
 		return _replaceURL(contents, (url) => {
 			let imagePath = path.join(path.dirname(module), url);
 			let fileContents = fs.readFileSync(path.join(SRC_DIR, imagePath));
@@ -273,33 +347,3 @@ function transportCSS(options: IOptions, module: string, enqueue: (module: strin
 		return haystack.length >= needle.length && haystack.substr(0, needle.length) === needle;
 	}
 }
-
-function transportResource(options: IOptions, module: string, enqueue: (module: string) => void, write: (path: string, contents: string | Buffer) => void): boolean {
-
-	if (!/\.svg/.test(module)) {
-		return false;
-	}
-
-	write(module, fs.readFileSync(path.join(SRC_DIR, module)));
-	return true;
-}
-
-function transportDTS(options: IOptions, module: string, enqueue: (module: string) => void, write: (path: string, contents: string | Buffer) => void): boolean {
-
-	if (options.redirects[module] && fs.existsSync(path.join(SRC_DIR, options.redirects[module] + '.ts'))) {
-		return false;
-	}
-
-	if (!fs.existsSync(path.join(SRC_DIR, module + '.d.ts'))) {
-		return false;
-	}
-
-	write(module + '.d.ts', fs.readFileSync(path.join(SRC_DIR, module + '.d.ts')));
-	let filename: string;
-	if (options.redirects[module]) {
-		write(module + '.js', fs.readFileSync(path.join(SRC_DIR, options.redirects[module] + '.js')));
-	} else {
-		write(module + '.js', fs.readFileSync(path.join(SRC_DIR, module + '.js')));
-	}
-	return true;
-}
diff --git a/build/lib/stats.js b/build/lib/stats.js
new file mode 100644
index 00000000000..8659dc67b09
--- /dev/null
+++ b/build/lib/stats.js
@@ -0,0 +1,122 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+'use strict';
+Object.defineProperty(exports, "__esModule", { value: true });
+var es = require("event-stream");
+var util = require("gulp-util");
+var appInsights = require("applicationinsights");
+var Entry = /** @class */ (function () {
+    function Entry(name, totalCount, totalSize) {
+        this.name = name;
+        this.totalCount = totalCount;
+        this.totalSize = totalSize;
+    }
+    Entry.prototype.toString = function (pretty) {
+        if (!pretty) {
+            if (this.totalCount === 1) {
+                return this.name + ": " + this.totalSize + " bytes";
+            }
+            else {
+                return this.name + ": " + this.totalCount + " files with " + this.totalSize + " bytes";
+            }
+        }
+        else {
+            if (this.totalCount === 1) {
+                return "Stats for '" + util.colors.grey(this.name) + "': " + Math.round(this.totalSize / 1204) + "KB";
+            }
+            else {
+                var count = this.totalCount < 100
+                    ? util.colors.green(this.totalCount.toString())
+                    : util.colors.red(this.totalCount.toString());
+                return "Stats for '" + util.colors.grey(this.name) + "': " + count + " files, " + Math.round(this.totalSize / 1204) + "KB";
+            }
+        }
+    };
+    return Entry;
+}());
+var _entries = new Map();
+function createStatsStream(group, log) {
+    var entry = new Entry(group, 0, 0);
+    _entries.set(entry.name, entry);
+    return es.through(function (data) {
+        var file = data;
+        if (typeof file.path === 'string') {
+            entry.totalCount += 1;
+            if (Buffer.isBuffer(file.contents)) {
+                entry.totalSize += file.contents.length;
+            }
+            else if (file.stat && typeof file.stat.size === 'number') {
+                entry.totalSize += file.stat.size;
+            }
+            else {
+                // funky file...
+            }
+        }
+        this.emit('data', data);
+    }, function () {
+        if (log) {
+            if (entry.totalCount === 1) {
+                util.log("Stats for '" + util.colors.grey(entry.name) + "': " + Math.round(entry.totalSize / 1204) + "KB");
+            }
+            else {
+                var count = entry.totalCount < 100
+                    ? util.colors.green(entry.totalCount.toString())
+                    : util.colors.red(entry.totalCount.toString());
+                util.log("Stats for '" + util.colors.grey(entry.name) + "': " + count + " files, " + Math.round(entry.totalSize / 1204) + "KB");
+            }
+        }
+        this.emit('end');
+    });
+}
+exports.createStatsStream = createStatsStream;
+function submitAllStats(productJson, commit) {
+    var sorted = [];
+    // move entries for single files to the front
+    _entries.forEach(function (value) {
+        if (value.totalCount === 1) {
+            sorted.unshift(value);
+        }
+        else {
+            sorted.push(value);
+        }
+    });
+    // print to console
+    for (var _i = 0, sorted_1 = sorted; _i < sorted_1.length; _i++) {
+        var entry = sorted_1[_i];
+        console.log(entry.toString(true));
+    }
+    // send data as telementry event when the
+    // product is configured to send telemetry
+    if (!productJson || !productJson.aiConfig || typeof productJson.aiConfig.asimovKey !== 'string') {
+        return Promise.resolve();
+    }
+    return new Promise(function (resolve) {
+        var sizes = {};
+        var counts = {};
+        for (var _i = 0, sorted_2 = sorted; _i < sorted_2.length; _i++) {
+            var entry = sorted_2[_i];
+            sizes[entry.name] = entry.totalSize;
+            counts[entry.name] = entry.totalCount;
+        }
+        appInsights.setup(productJson.aiConfig.asimovKey)
+            .setAutoCollectConsole(false)
+            .setAutoCollectExceptions(false)
+            .setAutoCollectPerformance(false)
+            .setAutoCollectRequests(false)
+            .start();
+        var client = appInsights.getClient(productJson.aiConfig.asimovKey);
+        client.config.endpointUrl = 'https://vortex.data.microsoft.com/collect/v1';
+        /* __GDPR__
+            "monacoworkbench/packagemetrics" : {
+                "commit" : {"classification": "SystemMetaData", "purpose": "PerformanceAndHealth" }
+                "size" : {"classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true }
+                "count" : {"classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true }
+            }
+        */
+        client.trackEvent("monacoworkbench/packagemetrics", { commit: commit, size: JSON.stringify(sizes), count: JSON.stringify(counts) });
+        client.sendPendingData(function () { return resolve(); });
+    });
+}
+exports.submitAllStats = submitAllStats;
diff --git a/build/lib/stats.ts b/build/lib/stats.ts
new file mode 100644
index 00000000000..0d94fc31a0c
--- /dev/null
+++ b/build/lib/stats.ts
@@ -0,0 +1,129 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+import * as es from 'event-stream';
+import * as util from 'gulp-util';
+import * as File from 'vinyl';
+import * as appInsights from 'applicationinsights';
+
+class Entry {
+	constructor(readonly name: string, public totalCount: number, public totalSize: number) { }
+
+	toString(pretty?: boolean): string {
+		if (!pretty) {
+			if (this.totalCount === 1) {
+				return `${this.name}: ${this.totalSize} bytes`;
+			} else {
+				return `${this.name}: ${this.totalCount} files with ${this.totalSize} bytes`;
+			}
+		} else {
+			if (this.totalCount === 1) {
+				return `Stats for '${util.colors.grey(this.name)}': ${Math.round(this.totalSize / 1204)}KB`;
+
+			} else {
+				let count = this.totalCount < 100
+					? util.colors.green(this.totalCount.toString())
+					: util.colors.red(this.totalCount.toString());
+
+				return `Stats for '${util.colors.grey(this.name)}': ${count} files, ${Math.round(this.totalSize / 1204)}KB`;
+			}
+		}
+	}
+}
+
+const _entries = new Map<string, Entry>();
+
+export function createStatsStream(group: string, log?: boolean): es.ThroughStream {
+
+	const entry = new Entry(group, 0, 0);
+	_entries.set(entry.name, entry);
+
+	return es.through(function (data) {
+		let file = data as File;
+		if (typeof file.path === 'string') {
+			entry.totalCount += 1;
+			if (Buffer.isBuffer(file.contents)) {
+				entry.totalSize += file.contents.length;
+			} else if (file.stat && typeof file.stat.size === 'number') {
+				entry.totalSize += file.stat.size;
+			} else {
+				// funky file...
+			}
+		}
+		this.emit('data', data);
+	}, function () {
+		if (log) {
+			if (entry.totalCount === 1) {
+				util.log(`Stats for '${util.colors.grey(entry.name)}': ${Math.round(entry.totalSize / 1204)}KB`);
+
+			} else {
+				let count = entry.totalCount < 100
+					? util.colors.green(entry.totalCount.toString())
+					: util.colors.red(entry.totalCount.toString());
+
+				util.log(`Stats for '${util.colors.grey(entry.name)}': ${count} files, ${Math.round(entry.totalSize / 1204)}KB`);
+			}
+		}
+
+		this.emit('end');
+	});
+}
+
+export function submitAllStats(productJson: any, commit: string): Promise<void> {
+
+	let sorted: Entry[] = [];
+	// move entries for single files to the front
+	_entries.forEach(value => {
+		if (value.totalCount === 1) {
+			sorted.unshift(value);
+		} else {
+			sorted.push(value);
+		}
+	});
+
+	// print to console
+	for (const entry of sorted) {
+		console.log(entry.toString(true));
+	}
+
+	// send data as telementry event when the
+	// product is configured to send telemetry
+	if (!productJson || !productJson.aiConfig || typeof productJson.aiConfig.asimovKey !== 'string') {
+		return Promise.resolve();
+	}
+
+	return new Promise(resolve => {
+
+		const sizes = {};
+		const counts = {};
+		for (const entry of sorted) {
+			sizes[entry.name] = entry.totalSize;
+			counts[entry.name] = entry.totalCount;
+		}
+
+		appInsights.setup(productJson.aiConfig.asimovKey)
+			.setAutoCollectConsole(false)
+			.setAutoCollectExceptions(false)
+			.setAutoCollectPerformance(false)
+			.setAutoCollectRequests(false)
+			.start();
+
+		const client = appInsights.getClient(productJson.aiConfig.asimovKey);
+		client.config.endpointUrl = 'https://vortex.data.microsoft.com/collect/v1';
+
+		/* __GDPR__
+			"monacoworkbench/packagemetrics" : {
+				"commit" : {"classification": "SystemMetaData", "purpose": "PerformanceAndHealth" }
+				"size" : {"classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true }
+				"count" : {"classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true }
+			}
+		*/
+		client.trackEvent(`monacoworkbench/packagemetrics`, { commit, size: JSON.stringify(sizes), count: JSON.stringify(counts) });
+		client.sendPendingData(() => resolve());
+	});
+
+}
diff --git a/build/lib/test/util.test.js b/build/lib/test/util.test.js
deleted file mode 100644
index ef0616173b6..00000000000
--- a/build/lib/test/util.test.js
+++ /dev/null
@@ -1,56 +0,0 @@
-"use strict";
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-Object.defineProperty(exports, "__esModule", { value: true });
-var assert = require("assert");
-var util = require("../util");
-function getMockTagExists(tags) {
-    return function (tag) { return tags.indexOf(tag) >= 0; };
-}
-suite('util tests', function () {
-    test('getPreviousVersion - patch', function () {
-        assert.equal(util.getPreviousVersion('1.2.3', getMockTagExists(['1.2.2', '1.2.1', '1.2.0', '1.1.0'])), '1.2.2');
-    });
-    test('getPreviousVersion - patch invalid', function () {
-        try {
-            util.getPreviousVersion('1.2.2', getMockTagExists(['1.2.0', '1.1.0']));
-        }
-        catch (e) {
-            // expected
-            return;
-        }
-        throw new Error('Expected an exception');
-    });
-    test('getPreviousVersion - minor', function () {
-        assert.equal(util.getPreviousVersion('1.2.0', getMockTagExists(['1.1.0', '1.1.1', '1.1.2', '1.1.3'])), '1.1.3');
-        assert.equal(util.getPreviousVersion('1.2.0', getMockTagExists(['1.1.0', '1.0.0'])), '1.1.0');
-    });
-    test('getPreviousVersion - minor gap', function () {
-        assert.equal(util.getPreviousVersion('1.2.0', getMockTagExists(['1.1.0', '1.1.1', '1.1.3'])), '1.1.1');
-    });
-    test('getPreviousVersion - minor invalid', function () {
-        try {
-            util.getPreviousVersion('1.2.0', getMockTagExists(['1.0.0']));
-        }
-        catch (e) {
-            // expected
-            return;
-        }
-        throw new Error('Expected an exception');
-    });
-    test('getPreviousVersion - major', function () {
-        assert.equal(util.getPreviousVersion('2.0.0', getMockTagExists(['1.0.0', '1.1.0', '1.2.0', '1.2.1', '1.2.2'])), '1.2.2');
-    });
-    test('getPreviousVersion - major invalid', function () {
-        try {
-            util.getPreviousVersion('3.0.0', getMockTagExists(['1.0.0']));
-        }
-        catch (e) {
-            // expected
-            return;
-        }
-        throw new Error('Expected an exception');
-    });
-});
diff --git a/build/lib/test/util.test.ts b/build/lib/test/util.test.ts
deleted file mode 100644
index 928e730f06c..00000000000
--- a/build/lib/test/util.test.ts
+++ /dev/null
@@ -1,79 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import assert = require('assert');
-import util = require('../util');
-
-function getMockTagExists(tags: string[]) {
-	return (tag: string) => tags.indexOf(tag) >= 0;
-}
-
-suite('util tests', () => {
-	test('getPreviousVersion - patch', () => {
-		assert.equal(
-			util.getPreviousVersion('1.2.3', getMockTagExists(['1.2.2', '1.2.1', '1.2.0', '1.1.0'])),
-			'1.2.2'
-		);
-	});
-
-	test('getPreviousVersion - patch invalid', () => {
-		try {
-			util.getPreviousVersion('1.2.2', getMockTagExists(['1.2.0', '1.1.0']));
-		} catch (e) {
-			// expected
-			return;
-		}
-
-		throw new Error('Expected an exception');
-	});
-
-	test('getPreviousVersion - minor', () => {
-		assert.equal(
-			util.getPreviousVersion('1.2.0', getMockTagExists(['1.1.0', '1.1.1', '1.1.2', '1.1.3'])),
-			'1.1.3'
-		);
-
-		assert.equal(
-			util.getPreviousVersion('1.2.0', getMockTagExists(['1.1.0', '1.0.0'])),
-			'1.1.0'
-		);
-	});
-
-	test('getPreviousVersion - minor gap', () => {
-		assert.equal(
-			util.getPreviousVersion('1.2.0', getMockTagExists(['1.1.0', '1.1.1', '1.1.3'])),
-			'1.1.1'
-		);
-	});
-
-	test('getPreviousVersion - minor invalid', () => {
-		try {
-			util.getPreviousVersion('1.2.0', getMockTagExists(['1.0.0']));
-		} catch (e) {
-			// expected
-			return;
-		}
-
-		throw new Error('Expected an exception');
-	});
-
-	test('getPreviousVersion - major', () => {
-		assert.equal(
-			util.getPreviousVersion('2.0.0', getMockTagExists(['1.0.0', '1.1.0', '1.2.0', '1.2.1', '1.2.2'])),
-			'1.2.2'
-		);
-	});
-
-	test('getPreviousVersion - major invalid', () => {
-		try {
-			util.getPreviousVersion('3.0.0', getMockTagExists(['1.0.0']));
-		} catch (e) {
-			// expected
-			return;
-		}
-
-		throw new Error('Expected an exception');
-	});
-});
diff --git a/build/lib/treeshaking.js b/build/lib/treeshaking.js
new file mode 100644
index 00000000000..c77fa128912
--- /dev/null
+++ b/build/lib/treeshaking.js
@@ -0,0 +1,682 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+'use strict';
+Object.defineProperty(exports, "__esModule", { value: true });
+var fs = require("fs");
+var path = require("path");
+var ts = require("typescript");
+var TYPESCRIPT_LIB_FOLDER = path.dirname(require.resolve('typescript/lib/lib.d.ts'));
+var ShakeLevel;
+(function (ShakeLevel) {
+    ShakeLevel[ShakeLevel["Files"] = 0] = "Files";
+    ShakeLevel[ShakeLevel["InnerFile"] = 1] = "InnerFile";
+    ShakeLevel[ShakeLevel["ClassMembers"] = 2] = "ClassMembers";
+})(ShakeLevel = exports.ShakeLevel || (exports.ShakeLevel = {}));
+function shake(options) {
+    var languageService = createTypeScriptLanguageService(options);
+    markNodes(languageService, options);
+    return generateResult(languageService, options.shakeLevel);
+}
+exports.shake = shake;
+//#region Discovery, LanguageService & Setup
+function createTypeScriptLanguageService(options) {
+    // Discover referenced files
+    var FILES = discoverAndReadFiles(options);
+    // Add fake usage files
+    options.inlineEntryPoints.forEach(function (inlineEntryPoint, index) {
+        FILES["inlineEntryPoint:" + index + ".ts"] = inlineEntryPoint;
+    });
+    // Resolve libs
+    var RESOLVED_LIBS = {};
+    options.libs.forEach(function (filename) {
+        var filepath = path.join(TYPESCRIPT_LIB_FOLDER, filename);
+        RESOLVED_LIBS["defaultLib:" + filename] = fs.readFileSync(filepath).toString();
+    });
+    var host = new TypeScriptLanguageServiceHost(RESOLVED_LIBS, FILES, options.compilerOptions);
+    return ts.createLanguageService(host);
+}
+/**
+ * Read imports and follow them until all files have been handled
+ */
+function discoverAndReadFiles(options) {
+    var FILES = {};
+    var in_queue = Object.create(null);
+    var queue = [];
+    var enqueue = function (moduleId) {
+        if (in_queue[moduleId]) {
+            return;
+        }
+        in_queue[moduleId] = true;
+        queue.push(moduleId);
+    };
+    options.entryPoints.forEach(function (entryPoint) { return enqueue(entryPoint); });
+    while (queue.length > 0) {
+        var moduleId = queue.shift();
+        var dts_filename = path.join(options.sourcesRoot, moduleId + '.d.ts');
+        if (fs.existsSync(dts_filename)) {
+            var dts_filecontents = fs.readFileSync(dts_filename).toString();
+            FILES[moduleId + '.d.ts'] = dts_filecontents;
+            continue;
+        }
+        var ts_filename = void 0;
+        if (options.redirects[moduleId]) {
+            ts_filename = path.join(options.sourcesRoot, options.redirects[moduleId] + '.ts');
+        }
+        else {
+            ts_filename = path.join(options.sourcesRoot, moduleId + '.ts');
+        }
+        var ts_filecontents = fs.readFileSync(ts_filename).toString();
+        var info = ts.preProcessFile(ts_filecontents);
+        for (var i = info.importedFiles.length - 1; i >= 0; i--) {
+            var importedFileName = info.importedFiles[i].fileName;
+            if (options.importIgnorePattern.test(importedFileName)) {
+                // Ignore vs/css! imports
+                continue;
+            }
+            var importedModuleId = importedFileName;
+            if (/(^\.\/)|(^\.\.\/)/.test(importedModuleId)) {
+                importedModuleId = path.join(path.dirname(moduleId), importedModuleId);
+            }
+            enqueue(importedModuleId);
+        }
+        FILES[moduleId + '.ts'] = ts_filecontents;
+    }
+    return FILES;
+}
+/**
+ * A TypeScript language service host
+ */
+var TypeScriptLanguageServiceHost = /** @class */ (function () {
+    function TypeScriptLanguageServiceHost(libs, files, compilerOptions) {
+        this._libs = libs;
+        this._files = files;
+        this._compilerOptions = compilerOptions;
+    }
+    // --- language service host ---------------
+    TypeScriptLanguageServiceHost.prototype.getCompilationSettings = function () {
+        return this._compilerOptions;
+    };
+    TypeScriptLanguageServiceHost.prototype.getScriptFileNames = function () {
+        return ([]
+            .concat(Object.keys(this._libs))
+            .concat(Object.keys(this._files)));
+    };
+    TypeScriptLanguageServiceHost.prototype.getScriptVersion = function (fileName) {
+        return '1';
+    };
+    TypeScriptLanguageServiceHost.prototype.getProjectVersion = function () {
+        return '1';
+    };
+    TypeScriptLanguageServiceHost.prototype.getScriptSnapshot = function (fileName) {
+        if (this._files.hasOwnProperty(fileName)) {
+            return ts.ScriptSnapshot.fromString(this._files[fileName]);
+        }
+        else if (this._libs.hasOwnProperty(fileName)) {
+            return ts.ScriptSnapshot.fromString(this._libs[fileName]);
+        }
+        else {
+            return ts.ScriptSnapshot.fromString('');
+        }
+    };
+    TypeScriptLanguageServiceHost.prototype.getScriptKind = function (fileName) {
+        return ts.ScriptKind.TS;
+    };
+    TypeScriptLanguageServiceHost.prototype.getCurrentDirectory = function () {
+        return '';
+    };
+    TypeScriptLanguageServiceHost.prototype.getDefaultLibFileName = function (options) {
+        return 'defaultLib:lib.d.ts';
+    };
+    TypeScriptLanguageServiceHost.prototype.isDefaultLibFileName = function (fileName) {
+        return fileName === this.getDefaultLibFileName(this._compilerOptions);
+    };
+    return TypeScriptLanguageServiceHost;
+}());
+//#endregion
+//#region Tree Shaking
+var NodeColor;
+(function (NodeColor) {
+    NodeColor[NodeColor["White"] = 0] = "White";
+    NodeColor[NodeColor["Gray"] = 1] = "Gray";
+    NodeColor[NodeColor["Black"] = 2] = "Black";
+})(NodeColor || (NodeColor = {}));
+function getColor(node) {
+    return node.$$$color || 0 /* White */;
+}
+function setColor(node, color) {
+    node.$$$color = color;
+}
+function nodeOrParentIsBlack(node) {
+    while (node) {
+        var color = getColor(node);
+        if (color === 2 /* Black */) {
+            return true;
+        }
+        node = node.parent;
+    }
+    return false;
+}
+function nodeOrChildIsBlack(node) {
+    if (getColor(node) === 2 /* Black */) {
+        return true;
+    }
+    for (var _i = 0, _a = node.getChildren(); _i < _a.length; _i++) {
+        var child = _a[_i];
+        if (nodeOrChildIsBlack(child)) {
+            return true;
+        }
+    }
+    return false;
+}
+function markNodes(languageService, options) {
+    var program = languageService.getProgram();
+    if (options.shakeLevel === 0 /* Files */) {
+        // Mark all source files Black
+        program.getSourceFiles().forEach(function (sourceFile) {
+            setColor(sourceFile, 2 /* Black */);
+        });
+        return;
+    }
+    var black_queue = [];
+    var gray_queue = [];
+    var sourceFilesLoaded = {};
+    function enqueueTopLevelModuleStatements(sourceFile) {
+        sourceFile.forEachChild(function (node) {
+            if (ts.isImportDeclaration(node)) {
+                if (!node.importClause && ts.isStringLiteral(node.moduleSpecifier)) {
+                    setColor(node, 2 /* Black */);
+                    enqueueImport(node, node.moduleSpecifier.text);
+                }
+                return;
+            }
+            if (ts.isExportDeclaration(node)) {
+                if (ts.isStringLiteral(node.moduleSpecifier)) {
+                    setColor(node, 2 /* Black */);
+                    enqueueImport(node, node.moduleSpecifier.text);
+                }
+                return;
+            }
+            if (ts.isExpressionStatement(node)
+                || ts.isIfStatement(node)
+                || ts.isIterationStatement(node, true)
+                || ts.isExportAssignment(node)) {
+                enqueue_black(node);
+            }
+            if (ts.isImportEqualsDeclaration(node)) {
+                if (/export/.test(node.getFullText(sourceFile))) {
+                    // e.g. "export import Severity = BaseSeverity;"
+                    enqueue_black(node);
+                }
+            }
+        });
+    }
+    function enqueue_gray(node) {
+        if (nodeOrParentIsBlack(node) || getColor(node) === 1 /* Gray */) {
+            return;
+        }
+        setColor(node, 1 /* Gray */);
+        gray_queue.push(node);
+    }
+    function enqueue_black(node) {
+        var previousColor = getColor(node);
+        if (previousColor === 2 /* Black */) {
+            return;
+        }
+        if (previousColor === 1 /* Gray */) {
+            // remove from gray queue
+            gray_queue.splice(gray_queue.indexOf(node), 1);
+            setColor(node, 0 /* White */);
+            // add to black queue
+            enqueue_black(node);
+            // // move from one queue to the other
+            // black_queue.push(node);
+            // setColor(node, NodeColor.Black);
+            return;
+        }
+        if (nodeOrParentIsBlack(node)) {
+            return;
+        }
+        var fileName = node.getSourceFile().fileName;
+        if (/^defaultLib:/.test(fileName) || /\.d\.ts$/.test(fileName)) {
+            setColor(node, 2 /* Black */);
+            return;
+        }
+        var sourceFile = node.getSourceFile();
+        if (!sourceFilesLoaded[sourceFile.fileName]) {
+            sourceFilesLoaded[sourceFile.fileName] = true;
+            enqueueTopLevelModuleStatements(sourceFile);
+        }
+        if (ts.isSourceFile(node)) {
+            return;
+        }
+        setColor(node, 2 /* Black */);
+        black_queue.push(node);
+        if (options.shakeLevel === 2 /* ClassMembers */ && (ts.isMethodDeclaration(node) || ts.isMethodSignature(node) || ts.isPropertySignature(node) || ts.isGetAccessor(node) || ts.isSetAccessor(node))) {
+            var references = languageService.getReferencesAtPosition(node.getSourceFile().fileName, node.name.pos + node.name.getLeadingTriviaWidth());
+            if (references) {
+                for (var i = 0, len = references.length; i < len; i++) {
+                    var reference = references[i];
+                    var referenceSourceFile = program.getSourceFile(reference.fileName);
+                    var referenceNode = getTokenAtPosition(referenceSourceFile, reference.textSpan.start, false, false);
+                    if (ts.isMethodDeclaration(referenceNode.parent)
+                        || ts.isPropertyDeclaration(referenceNode.parent)
+                        || ts.isGetAccessor(referenceNode.parent)
+                        || ts.isSetAccessor(referenceNode.parent)) {
+                        enqueue_gray(referenceNode.parent);
+                    }
+                }
+            }
+        }
+    }
+    function enqueueFile(filename) {
+        var sourceFile = program.getSourceFile(filename);
+        if (!sourceFile) {
+            console.warn("Cannot find source file " + filename);
+            return;
+        }
+        enqueue_black(sourceFile);
+    }
+    function enqueueImport(node, importText) {
+        if (options.importIgnorePattern.test(importText)) {
+            // this import should be ignored
+            return;
+        }
+        var nodeSourceFile = node.getSourceFile();
+        var fullPath;
+        if (/(^\.\/)|(^\.\.\/)/.test(importText)) {
+            fullPath = path.join(path.dirname(nodeSourceFile.fileName), importText) + '.ts';
+        }
+        else {
+            fullPath = importText + '.ts';
+        }
+        enqueueFile(fullPath);
+    }
+    options.entryPoints.forEach(function (moduleId) { return enqueueFile(moduleId + '.ts'); });
+    // Add fake usage files
+    options.inlineEntryPoints.forEach(function (_, index) { return enqueueFile("inlineEntryPoint:" + index + ".ts"); });
+    var step = 0;
+    var checker = program.getTypeChecker();
+    var _loop_1 = function () {
+        ++step;
+        var node = void 0;
+        if (step % 100 === 0) {
+            console.log(step + "/" + (step + black_queue.length + gray_queue.length) + " (" + black_queue.length + ", " + gray_queue.length + ")");
+        }
+        if (black_queue.length === 0) {
+            for (var i = 0; i < gray_queue.length; i++) {
+                var node_1 = gray_queue[i];
+                var nodeParent = node_1.parent;
+                if ((ts.isClassDeclaration(nodeParent) || ts.isInterfaceDeclaration(nodeParent)) && nodeOrChildIsBlack(nodeParent)) {
+                    gray_queue.splice(i, 1);
+                    black_queue.push(node_1);
+                    setColor(node_1, 2 /* Black */);
+                    i--;
+                }
+            }
+        }
+        if (black_queue.length > 0) {
+            node = black_queue.shift();
+        }
+        else {
+            return "break";
+        }
+        var nodeSourceFile = node.getSourceFile();
+        var loop = function (node) {
+            var _a = getRealNodeSymbol(checker, node), symbol = _a[0], symbolImportNode = _a[1];
+            if (symbolImportNode) {
+                setColor(symbolImportNode, 2 /* Black */);
+            }
+            if (symbol && !nodeIsInItsOwnDeclaration(nodeSourceFile, node, symbol)) {
+                for (var i = 0, len = symbol.declarations.length; i < len; i++) {
+                    var declaration = symbol.declarations[i];
+                    if (ts.isSourceFile(declaration)) {
+                        // Do not enqueue full source files
+                        // (they can be the declaration of a module import)
+                        continue;
+                    }
+                    if (options.shakeLevel === 2 /* ClassMembers */ && (ts.isClassDeclaration(declaration) || ts.isInterfaceDeclaration(declaration))) {
+                        enqueue_black(declaration.name);
+                        for (var j = 0; j < declaration.members.length; j++) {
+                            var member = declaration.members[j];
+                            var memberName = member.name ? member.name.getText() : null;
+                            if (ts.isConstructorDeclaration(member)
+                                || ts.isConstructSignatureDeclaration(member)
+                                || ts.isIndexSignatureDeclaration(member)
+                                || ts.isCallSignatureDeclaration(member)
+                                || memberName === 'toJSON'
+                                || memberName === 'toString'
+                                || memberName === 'dispose' // TODO: keeping all `dispose` methods
+                            ) {
+                                enqueue_black(member);
+                            }
+                        }
+                        // queue the heritage clauses
+                        if (declaration.heritageClauses) {
+                            for (var _i = 0, _b = declaration.heritageClauses; _i < _b.length; _i++) {
+                                var heritageClause = _b[_i];
+                                enqueue_black(heritageClause);
+                            }
+                        }
+                    }
+                    else {
+                        enqueue_black(declaration);
+                    }
+                }
+            }
+            node.forEachChild(loop);
+        };
+        node.forEachChild(loop);
+    };
+    while (black_queue.length > 0 || gray_queue.length > 0) {
+        var state_1 = _loop_1();
+        if (state_1 === "break")
+            break;
+    }
+}
+function nodeIsInItsOwnDeclaration(nodeSourceFile, node, symbol) {
+    for (var i = 0, len = symbol.declarations.length; i < len; i++) {
+        var declaration = symbol.declarations[i];
+        var declarationSourceFile = declaration.getSourceFile();
+        if (nodeSourceFile === declarationSourceFile) {
+            if (declaration.pos <= node.pos && node.end <= declaration.end) {
+                return true;
+            }
+        }
+    }
+    return false;
+}
+function generateResult(languageService, shakeLevel) {
+    var program = languageService.getProgram();
+    var result = {};
+    var writeFile = function (filePath, contents) {
+        result[filePath] = contents;
+    };
+    program.getSourceFiles().forEach(function (sourceFile) {
+        var fileName = sourceFile.fileName;
+        if (/^defaultLib:/.test(fileName)) {
+            return;
+        }
+        var destination = fileName;
+        if (/\.d\.ts$/.test(fileName)) {
+            if (nodeOrChildIsBlack(sourceFile)) {
+                writeFile(destination, sourceFile.text);
+            }
+            return;
+        }
+        var text = sourceFile.text;
+        var result = '';
+        function keep(node) {
+            result += text.substring(node.pos, node.end);
+        }
+        function write(data) {
+            result += data;
+        }
+        function writeMarkedNodes(node) {
+            if (getColor(node) === 2 /* Black */) {
+                return keep(node);
+            }
+            // Always keep certain top-level statements
+            if (ts.isSourceFile(node.parent)) {
+                if (ts.isExpressionStatement(node) && ts.isStringLiteral(node.expression) && node.expression.text === 'use strict') {
+                    return keep(node);
+                }
+                if (ts.isVariableStatement(node) && nodeOrChildIsBlack(node)) {
+                    return keep(node);
+                }
+            }
+            // Keep the entire import in import * as X cases
+            if (ts.isImportDeclaration(node)) {
+                if (node.importClause && node.importClause.namedBindings) {
+                    if (ts.isNamespaceImport(node.importClause.namedBindings)) {
+                        if (getColor(node.importClause.namedBindings) === 2 /* Black */) {
+                            return keep(node);
+                        }
+                    }
+                    else {
+                        var survivingImports = [];
+                        for (var i = 0; i < node.importClause.namedBindings.elements.length; i++) {
+                            var importNode = node.importClause.namedBindings.elements[i];
+                            if (getColor(importNode) === 2 /* Black */) {
+                                survivingImports.push(importNode.getFullText(sourceFile));
+                            }
+                        }
+                        var leadingTriviaWidth = node.getLeadingTriviaWidth();
+                        var leadingTrivia = sourceFile.text.substr(node.pos, leadingTriviaWidth);
+                        if (survivingImports.length > 0) {
+                            if (node.importClause && getColor(node.importClause) === 2 /* Black */) {
+                                return write(leadingTrivia + "import " + node.importClause.name.text + ", {" + survivingImports.join(',') + " } from" + node.moduleSpecifier.getFullText(sourceFile) + ";");
+                            }
+                            return write(leadingTrivia + "import {" + survivingImports.join(',') + " } from" + node.moduleSpecifier.getFullText(sourceFile) + ";");
+                        }
+                        else {
+                            if (node.importClause && getColor(node.importClause) === 2 /* Black */) {
+                                return write(leadingTrivia + "import " + node.importClause.name.text + " from" + node.moduleSpecifier.getFullText(sourceFile) + ";");
+                            }
+                        }
+                    }
+                }
+                else {
+                    if (node.importClause && getColor(node.importClause) === 2 /* Black */) {
+                        return keep(node);
+                    }
+                }
+            }
+            if (shakeLevel === 2 /* ClassMembers */ && (ts.isClassDeclaration(node) || ts.isInterfaceDeclaration(node)) && nodeOrChildIsBlack(node)) {
+                var toWrite = node.getFullText();
+                for (var i = node.members.length - 1; i >= 0; i--) {
+                    var member = node.members[i];
+                    if (getColor(member) === 2 /* Black */) {
+                        // keep method
+                        continue;
+                    }
+                    if (/^_(.*)Brand$/.test(member.name.getText())) {
+                        // TODO: keep all members ending with `Brand`...
+                        continue;
+                    }
+                    var pos = member.pos - node.pos;
+                    var end = member.end - node.pos;
+                    toWrite = toWrite.substring(0, pos) + toWrite.substring(end);
+                }
+                return write(toWrite);
+            }
+            if (ts.isFunctionDeclaration(node)) {
+                // Do not go inside functions if they haven't been marked
+                return;
+            }
+            node.forEachChild(writeMarkedNodes);
+        }
+        if (getColor(sourceFile) !== 2 /* Black */) {
+            if (!nodeOrChildIsBlack(sourceFile)) {
+                // none of the elements are reachable => don't write this file at all!
+                return;
+            }
+            sourceFile.forEachChild(writeMarkedNodes);
+            result += sourceFile.endOfFileToken.getFullText(sourceFile);
+        }
+        else {
+            result = text;
+        }
+        writeFile(destination, result);
+    });
+    return result;
+}
+//#endregion
+//#region Utils
+/**
+ * Returns the node's symbol and the `import` node (if the symbol resolved from a different module)
+ */
+function getRealNodeSymbol(checker, node) {
+    /**
+     * Returns the containing object literal property declaration given a possible name node, e.g. "a" in x = { "a": 1 }
+     */
+    /* @internal */
+    function getContainingObjectLiteralElement(node) {
+        switch (node.kind) {
+            case ts.SyntaxKind.StringLiteral:
+            case ts.SyntaxKind.NumericLiteral:
+                if (node.parent.kind === ts.SyntaxKind.ComputedPropertyName) {
+                    return ts.isObjectLiteralElement(node.parent.parent) ? node.parent.parent : undefined;
+                }
+            // falls through
+            case ts.SyntaxKind.Identifier:
+                return ts.isObjectLiteralElement(node.parent) &&
+                    (node.parent.parent.kind === ts.SyntaxKind.ObjectLiteralExpression || node.parent.parent.kind === ts.SyntaxKind.JsxAttributes) &&
+                    node.parent.name === node ? node.parent : undefined;
+        }
+        return undefined;
+    }
+    function getPropertySymbolsFromType(type, propName) {
+        function getTextOfPropertyName(name) {
+            function isStringOrNumericLiteral(node) {
+                var kind = node.kind;
+                return kind === ts.SyntaxKind.StringLiteral
+                    || kind === ts.SyntaxKind.NumericLiteral;
+            }
+            switch (name.kind) {
+                case ts.SyntaxKind.Identifier:
+                    return name.text;
+                case ts.SyntaxKind.StringLiteral:
+                case ts.SyntaxKind.NumericLiteral:
+                    return name.text;
+                case ts.SyntaxKind.ComputedPropertyName:
+                    return isStringOrNumericLiteral(name.expression) ? name.expression.text : undefined;
+            }
+        }
+        var name = getTextOfPropertyName(propName);
+        if (name && type) {
+            var result = [];
+            var symbol_1 = type.getProperty(name);
+            if (type.flags & ts.TypeFlags.Union) {
+                for (var _i = 0, _a = type.types; _i < _a.length; _i++) {
+                    var t = _a[_i];
+                    var symbol_2 = t.getProperty(name);
+                    if (symbol_2) {
+                        result.push(symbol_2);
+                    }
+                }
+                return result;
+            }
+            if (symbol_1) {
+                result.push(symbol_1);
+                return result;
+            }
+        }
+        return undefined;
+    }
+    function getPropertySymbolsFromContextualType(typeChecker, node) {
+        var objectLiteral = node.parent;
+        var contextualType = typeChecker.getContextualType(objectLiteral);
+        return getPropertySymbolsFromType(contextualType, node.name);
+    }
+    // Go to the original declaration for cases:
+    //
+    //   (1) when the aliased symbol was declared in the location(parent).
+    //   (2) when the aliased symbol is originating from an import.
+    //
+    function shouldSkipAlias(node, declaration) {
+        if (node.kind !== ts.SyntaxKind.Identifier) {
+            return false;
+        }
+        if (node.parent === declaration) {
+            return true;
+        }
+        switch (declaration.kind) {
+            case ts.SyntaxKind.ImportClause:
+            case ts.SyntaxKind.ImportEqualsDeclaration:
+                return true;
+            case ts.SyntaxKind.ImportSpecifier:
+                return declaration.parent.kind === ts.SyntaxKind.NamedImports;
+            default:
+                return false;
+        }
+    }
+    if (!ts.isShorthandPropertyAssignment(node)) {
+        if (node.getChildCount() !== 0) {
+            return [null, null];
+        }
+    }
+    var symbol = checker.getSymbolAtLocation(node);
+    var importNode = null;
+    if (symbol && symbol.flags & ts.SymbolFlags.Alias && shouldSkipAlias(node, symbol.declarations[0])) {
+        var aliased = checker.getAliasedSymbol(symbol);
+        if (aliased.declarations) {
+            // We should mark the import as visited
+            importNode = symbol.declarations[0];
+            symbol = aliased;
+        }
+    }
+    if (symbol) {
+        // Because name in short-hand property assignment has two different meanings: property name and property value,
+        // using go-to-definition at such position should go to the variable declaration of the property value rather than
+        // go to the declaration of the property name (in this case stay at the same position). However, if go-to-definition
+        // is performed at the location of property access, we would like to go to definition of the property in the short-hand
+        // assignment. This case and others are handled by the following code.
+        if (node.parent.kind === ts.SyntaxKind.ShorthandPropertyAssignment) {
+            symbol = checker.getShorthandAssignmentValueSymbol(symbol.valueDeclaration);
+        }
+        // If the node is the name of a BindingElement within an ObjectBindingPattern instead of just returning the
+        // declaration the symbol (which is itself), we should try to get to the original type of the ObjectBindingPattern
+        // and return the property declaration for the referenced property.
+        // For example:
+        //      import('./foo').then(({ b/*goto*/ar }) => undefined); => should get use to the declaration in file "./foo"
+        //
+        //      function bar<T>(onfulfilled: (value: T) => void) { //....}
+        //      interface Test {
+        //          pr/*destination*/op1: number
+        //      }
+        //      bar<Test>(({pr/*goto*/op1})=>{});
+        if (ts.isPropertyName(node) && ts.isBindingElement(node.parent) && ts.isObjectBindingPattern(node.parent.parent) &&
+            (node === (node.parent.propertyName || node.parent.name))) {
+            var type = checker.getTypeAtLocation(node.parent.parent);
+            if (type) {
+                var propSymbols = getPropertySymbolsFromType(type, node);
+                if (propSymbols) {
+                    symbol = propSymbols[0];
+                }
+            }
+        }
+        // If the current location we want to find its definition is in an object literal, try to get the contextual type for the
+        // object literal, lookup the property symbol in the contextual type, and use this for goto-definition.
+        // For example
+        //      interface Props{
+        //          /*first*/prop1: number
+        //          prop2: boolean
+        //      }
+        //      function Foo(arg: Props) {}
+        //      Foo( { pr/*1*/op1: 10, prop2: false })
+        var element = getContainingObjectLiteralElement(node);
+        if (element && checker.getContextualType(element.parent)) {
+            var propertySymbols = getPropertySymbolsFromContextualType(checker, element);
+            if (propertySymbols) {
+                symbol = propertySymbols[0];
+            }
+        }
+    }
+    if (symbol && symbol.declarations) {
+        return [symbol, importNode];
+    }
+    return [null, null];
+}
+/** Get the token whose text contains the position */
+function getTokenAtPosition(sourceFile, position, allowPositionInLeadingTrivia, includeEndPosition) {
+    var current = sourceFile;
+    outer: while (true) {
+        // find the child that contains 'position'
+        for (var _i = 0, _a = current.getChildren(); _i < _a.length; _i++) {
+            var child = _a[_i];
+            var start = allowPositionInLeadingTrivia ? child.getFullStart() : child.getStart(sourceFile, /*includeJsDoc*/ true);
+            if (start > position) {
+                // If this child begins after position, then all subsequent children will as well.
+                break;
+            }
+            var end = child.getEnd();
+            if (position < end || (position === end && (child.kind === ts.SyntaxKind.EndOfFileToken || includeEndPosition))) {
+                current = child;
+                continue outer;
+            }
+        }
+        return current;
+    }
+}
diff --git a/build/lib/treeshaking.ts b/build/lib/treeshaking.ts
new file mode 100644
index 00000000000..0527fe3ebce
--- /dev/null
+++ b/build/lib/treeshaking.ts
@@ -0,0 +1,817 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+import * as fs from 'fs';
+import * as path from 'path';
+import * as ts from 'typescript';
+
+const TYPESCRIPT_LIB_FOLDER = path.dirname(require.resolve('typescript/lib/lib.d.ts'));
+
+export const enum ShakeLevel {
+	Files = 0,
+	InnerFile = 1,
+	ClassMembers = 2
+}
+
+export interface ITreeShakingOptions {
+	/**
+	 * The full path to the root where sources are.
+	 */
+	sourcesRoot: string;
+	/**
+	 * Module ids.
+	 * e.g. `vs/editor/editor.main` or `index`
+	 */
+	entryPoints: string[];
+	/**
+	 * Inline usages.
+	 */
+	inlineEntryPoints: string[];
+	/**
+	 * TypeScript libs.
+	 * e.g. `lib.d.ts`, `lib.es2015.collection.d.ts`
+	 */
+	libs: string[];
+	/**
+	 * TypeScript compiler options.
+	 */
+	compilerOptions: ts.CompilerOptions;
+	/**
+	 * The shake level to perform.
+	 */
+	shakeLevel: ShakeLevel;
+	/**
+	 * regex pattern to ignore certain imports e.g. `vs/css!` imports
+	 */
+	importIgnorePattern: RegExp;
+
+	redirects: { [module: string]: string; };
+}
+
+export interface ITreeShakingResult {
+	[file: string]: string;
+}
+
+export function shake(options: ITreeShakingOptions): ITreeShakingResult {
+	const languageService = createTypeScriptLanguageService(options);
+
+	markNodes(languageService, options);
+
+	return generateResult(languageService, options.shakeLevel);
+}
+
+//#region Discovery, LanguageService & Setup
+function createTypeScriptLanguageService(options: ITreeShakingOptions): ts.LanguageService {
+	// Discover referenced files
+	const FILES = discoverAndReadFiles(options);
+
+	// Add fake usage files
+	options.inlineEntryPoints.forEach((inlineEntryPoint, index) => {
+		FILES[`inlineEntryPoint:${index}.ts`] = inlineEntryPoint;
+	});
+
+	// Resolve libs
+	const RESOLVED_LIBS: ILibMap = {};
+	options.libs.forEach((filename) => {
+		const filepath = path.join(TYPESCRIPT_LIB_FOLDER, filename);
+		RESOLVED_LIBS[`defaultLib:${filename}`] = fs.readFileSync(filepath).toString();
+	});
+
+	const host = new TypeScriptLanguageServiceHost(RESOLVED_LIBS, FILES, options.compilerOptions);
+	return ts.createLanguageService(host);
+}
+
+/**
+ * Read imports and follow them until all files have been handled
+ */
+function discoverAndReadFiles(options: ITreeShakingOptions): IFileMap {
+	const FILES: IFileMap = {};
+
+	const in_queue: { [module: string]: boolean; } = Object.create(null);
+	const queue: string[] = [];
+
+	const enqueue = (moduleId: string) => {
+		if (in_queue[moduleId]) {
+			return;
+		}
+		in_queue[moduleId] = true;
+		queue.push(moduleId);
+	};
+
+	options.entryPoints.forEach((entryPoint) => enqueue(entryPoint));
+
+	while (queue.length > 0) {
+		const moduleId = queue.shift();
+		const dts_filename = path.join(options.sourcesRoot, moduleId + '.d.ts');
+		if (fs.existsSync(dts_filename)) {
+			const dts_filecontents = fs.readFileSync(dts_filename).toString();
+			FILES[moduleId + '.d.ts'] = dts_filecontents;
+			continue;
+		}
+
+		let ts_filename: string;
+		if (options.redirects[moduleId]) {
+			ts_filename = path.join(options.sourcesRoot, options.redirects[moduleId] + '.ts');
+		} else {
+			ts_filename = path.join(options.sourcesRoot, moduleId + '.ts');
+		}
+		const ts_filecontents = fs.readFileSync(ts_filename).toString();
+		const info = ts.preProcessFile(ts_filecontents);
+		for (let i = info.importedFiles.length - 1; i >= 0; i--) {
+			const importedFileName = info.importedFiles[i].fileName;
+
+			if (options.importIgnorePattern.test(importedFileName)) {
+				// Ignore vs/css! imports
+				continue;
+			}
+
+			let importedModuleId = importedFileName;
+			if (/(^\.\/)|(^\.\.\/)/.test(importedModuleId)) {
+				importedModuleId = path.join(path.dirname(moduleId), importedModuleId);
+			}
+			enqueue(importedModuleId);
+		}
+
+		FILES[moduleId + '.ts'] = ts_filecontents;
+	}
+
+	return FILES;
+}
+
+interface ILibMap { [libName: string]: string; }
+interface IFileMap { [fileName: string]: string; }
+
+/**
+ * A TypeScript language service host
+ */
+class TypeScriptLanguageServiceHost implements ts.LanguageServiceHost {
+
+	private readonly _libs: ILibMap;
+	private readonly _files: IFileMap;
+	private readonly _compilerOptions: ts.CompilerOptions;
+
+	constructor(libs: ILibMap, files: IFileMap, compilerOptions: ts.CompilerOptions) {
+		this._libs = libs;
+		this._files = files;
+		this._compilerOptions = compilerOptions;
+	}
+
+	// --- language service host ---------------
+
+	getCompilationSettings(): ts.CompilerOptions {
+		return this._compilerOptions;
+	}
+	getScriptFileNames(): string[] {
+		return (
+			[]
+				.concat(Object.keys(this._libs))
+				.concat(Object.keys(this._files))
+		);
+	}
+	getScriptVersion(fileName: string): string {
+		return '1';
+	}
+	getProjectVersion(): string {
+		return '1';
+	}
+	getScriptSnapshot(fileName: string): ts.IScriptSnapshot {
+		if (this._files.hasOwnProperty(fileName)) {
+			return ts.ScriptSnapshot.fromString(this._files[fileName]);
+		} else if (this._libs.hasOwnProperty(fileName)) {
+			return ts.ScriptSnapshot.fromString(this._libs[fileName]);
+		} else {
+			return ts.ScriptSnapshot.fromString('');
+		}
+	}
+	getScriptKind(fileName: string): ts.ScriptKind {
+		return ts.ScriptKind.TS;
+	}
+	getCurrentDirectory(): string {
+		return '';
+	}
+	getDefaultLibFileName(options: ts.CompilerOptions): string {
+		return 'defaultLib:lib.d.ts';
+	}
+	isDefaultLibFileName(fileName: string): boolean {
+		return fileName === this.getDefaultLibFileName(this._compilerOptions);
+	}
+}
+//#endregion
+
+//#region Tree Shaking
+
+const enum NodeColor {
+	White = 0,
+	Gray = 1,
+	Black = 2
+}
+
+function getColor(node: ts.Node): NodeColor {
+	return (<any>node).$$$color || NodeColor.White;
+}
+function setColor(node: ts.Node, color: NodeColor): void {
+	(<any>node).$$$color = color;
+}
+function nodeOrParentIsBlack(node: ts.Node): boolean {
+	while (node) {
+		const color = getColor(node);
+		if (color === NodeColor.Black) {
+			return true;
+		}
+		node = node.parent;
+	}
+	return false;
+}
+function nodeOrChildIsBlack(node: ts.Node): boolean {
+	if (getColor(node) === NodeColor.Black) {
+		return true;
+	}
+	for (const child of node.getChildren()) {
+		if (nodeOrChildIsBlack(child)) {
+			return true;
+		}
+	}
+	return false;
+}
+
+function markNodes(languageService: ts.LanguageService, options: ITreeShakingOptions) {
+	const program = languageService.getProgram();
+
+	if (options.shakeLevel === ShakeLevel.Files) {
+		// Mark all source files Black
+		program.getSourceFiles().forEach((sourceFile) => {
+			setColor(sourceFile, NodeColor.Black);
+		});
+		return;
+	}
+
+	const black_queue: ts.Node[] = [];
+	const gray_queue: ts.Node[] = [];
+	const sourceFilesLoaded: { [fileName: string]: boolean } = {};
+
+	function enqueueTopLevelModuleStatements(sourceFile: ts.SourceFile): void {
+
+		sourceFile.forEachChild((node: ts.Node) => {
+
+			if (ts.isImportDeclaration(node)) {
+				if (!node.importClause && ts.isStringLiteral(node.moduleSpecifier)) {
+					setColor(node, NodeColor.Black);
+					enqueueImport(node, node.moduleSpecifier.text);
+				}
+				return;
+			}
+
+			if (ts.isExportDeclaration(node)) {
+				if (ts.isStringLiteral(node.moduleSpecifier)) {
+					setColor(node, NodeColor.Black);
+					enqueueImport(node, node.moduleSpecifier.text);
+				}
+				return;
+			}
+
+			if (
+				ts.isExpressionStatement(node)
+				|| ts.isIfStatement(node)
+				|| ts.isIterationStatement(node, true)
+				|| ts.isExportAssignment(node)
+			) {
+				enqueue_black(node);
+			}
+
+			if (ts.isImportEqualsDeclaration(node)) {
+				if (/export/.test(node.getFullText(sourceFile))) {
+					// e.g. "export import Severity = BaseSeverity;"
+					enqueue_black(node);
+				}
+			}
+
+		});
+	}
+
+	function enqueue_gray(node: ts.Node): void {
+		if (nodeOrParentIsBlack(node) || getColor(node) === NodeColor.Gray) {
+			return;
+		}
+		setColor(node, NodeColor.Gray);
+		gray_queue.push(node);
+	}
+
+	function enqueue_black(node: ts.Node): void {
+		const previousColor = getColor(node);
+
+		if (previousColor === NodeColor.Black) {
+			return;
+		}
+
+		if (previousColor === NodeColor.Gray) {
+			// remove from gray queue
+			gray_queue.splice(gray_queue.indexOf(node), 1);
+			setColor(node, NodeColor.White);
+
+			// add to black queue
+			enqueue_black(node);
+
+			// // move from one queue to the other
+			// black_queue.push(node);
+			// setColor(node, NodeColor.Black);
+			return;
+		}
+
+		if (nodeOrParentIsBlack(node)) {
+			return;
+		}
+
+		const fileName = node.getSourceFile().fileName;
+		if (/^defaultLib:/.test(fileName) || /\.d\.ts$/.test(fileName)) {
+			setColor(node, NodeColor.Black);
+			return;
+		}
+
+		const sourceFile = node.getSourceFile();
+		if (!sourceFilesLoaded[sourceFile.fileName]) {
+			sourceFilesLoaded[sourceFile.fileName] = true;
+			enqueueTopLevelModuleStatements(sourceFile);
+		}
+
+		if (ts.isSourceFile(node)) {
+			return;
+		}
+
+		setColor(node, NodeColor.Black);
+		black_queue.push(node);
+
+		if (options.shakeLevel === ShakeLevel.ClassMembers && (ts.isMethodDeclaration(node) || ts.isMethodSignature(node) || ts.isPropertySignature(node) || ts.isGetAccessor(node) || ts.isSetAccessor(node))) {
+			const references = languageService.getReferencesAtPosition(node.getSourceFile().fileName, node.name.pos + node.name.getLeadingTriviaWidth());
+			if (references) {
+				for (let i = 0, len = references.length; i < len; i++) {
+					const reference = references[i];
+					const referenceSourceFile = program.getSourceFile(reference.fileName);
+					const referenceNode = getTokenAtPosition(referenceSourceFile, reference.textSpan.start, false, false);
+					if (
+						ts.isMethodDeclaration(referenceNode.parent)
+						|| ts.isPropertyDeclaration(referenceNode.parent)
+						|| ts.isGetAccessor(referenceNode.parent)
+						|| ts.isSetAccessor(referenceNode.parent)
+					) {
+						enqueue_gray(referenceNode.parent);
+					}
+				}
+			}
+		}
+	}
+
+	function enqueueFile(filename: string): void {
+		const sourceFile = program.getSourceFile(filename);
+		if (!sourceFile) {
+			console.warn(`Cannot find source file ${filename}`);
+			return;
+		}
+		enqueue_black(sourceFile);
+	}
+
+	function enqueueImport(node: ts.Node, importText: string): void {
+		if (options.importIgnorePattern.test(importText)) {
+			// this import should be ignored
+			return;
+		}
+
+		const nodeSourceFile = node.getSourceFile();
+		let fullPath: string;
+		if (/(^\.\/)|(^\.\.\/)/.test(importText)) {
+			fullPath = path.join(path.dirname(nodeSourceFile.fileName), importText) + '.ts';
+		} else {
+			fullPath = importText + '.ts';
+		}
+		enqueueFile(fullPath);
+	}
+
+	options.entryPoints.forEach(moduleId => enqueueFile(moduleId + '.ts'));
+	// Add fake usage files
+	options.inlineEntryPoints.forEach((_, index) => enqueueFile(`inlineEntryPoint:${index}.ts`));
+
+	let step = 0;
+
+	const checker = program.getTypeChecker();
+	while (black_queue.length > 0 || gray_queue.length > 0) {
+		++step;
+		let node: ts.Node;
+
+		if (step % 100 === 0) {
+			console.log(`${step}/${step+black_queue.length+gray_queue.length} (${black_queue.length}, ${gray_queue.length})`);
+		}
+
+		if (black_queue.length === 0) {
+			for (let i = 0; i < gray_queue.length; i++) {
+				const node = gray_queue[i];
+				const nodeParent = node.parent;
+				if ((ts.isClassDeclaration(nodeParent) || ts.isInterfaceDeclaration(nodeParent)) && nodeOrChildIsBlack(nodeParent)) {
+					gray_queue.splice(i, 1);
+					black_queue.push(node);
+					setColor(node, NodeColor.Black);
+					i--;
+				}
+			}
+		}
+
+		if (black_queue.length > 0) {
+			node = black_queue.shift();
+		} else {
+			// only gray nodes remaining...
+			break;
+		}
+		const nodeSourceFile = node.getSourceFile();
+
+		const loop = (node: ts.Node) => {
+			const [symbol, symbolImportNode] = getRealNodeSymbol(checker, node);
+			if (symbolImportNode) {
+				setColor(symbolImportNode, NodeColor.Black);
+			}
+
+			if (symbol && !nodeIsInItsOwnDeclaration(nodeSourceFile, node, symbol)) {
+				for (let i = 0, len = symbol.declarations.length; i < len; i++) {
+					const declaration = symbol.declarations[i];
+					if (ts.isSourceFile(declaration)) {
+						// Do not enqueue full source files
+						// (they can be the declaration of a module import)
+						continue;
+					}
+
+					if (options.shakeLevel === ShakeLevel.ClassMembers && (ts.isClassDeclaration(declaration) || ts.isInterfaceDeclaration(declaration))) {
+						enqueue_black(declaration.name);
+
+						for (let j = 0; j < declaration.members.length; j++) {
+							const member = declaration.members[j];
+							const memberName = member.name ? member.name.getText() : null;
+							if (
+								ts.isConstructorDeclaration(member)
+								|| ts.isConstructSignatureDeclaration(member)
+								|| ts.isIndexSignatureDeclaration(member)
+								|| ts.isCallSignatureDeclaration(member)
+								|| memberName === 'toJSON'
+								|| memberName === 'toString'
+								|| memberName === 'dispose'// TODO: keeping all `dispose` methods
+							) {
+								enqueue_black(member);
+							}
+						}
+
+						// queue the heritage clauses
+						if (declaration.heritageClauses) {
+							for (let heritageClause of declaration.heritageClauses) {
+								enqueue_black(heritageClause);
+							}
+						}
+					} else {
+						enqueue_black(declaration);
+					}
+				}
+			}
+			node.forEachChild(loop);
+		};
+		node.forEachChild(loop);
+	}
+}
+
+function nodeIsInItsOwnDeclaration(nodeSourceFile: ts.SourceFile, node: ts.Node, symbol: ts.Symbol): boolean {
+	for (let i = 0, len = symbol.declarations.length; i < len; i++) {
+		const declaration = symbol.declarations[i];
+		const declarationSourceFile = declaration.getSourceFile();
+
+		if (nodeSourceFile === declarationSourceFile) {
+			if (declaration.pos <= node.pos && node.end <= declaration.end) {
+				return true;
+			}
+		}
+	}
+
+	return false;
+}
+
+function generateResult(languageService: ts.LanguageService, shakeLevel: ShakeLevel): ITreeShakingResult {
+	const program = languageService.getProgram();
+
+	let result: ITreeShakingResult = {};
+	const writeFile = (filePath: string, contents: string): void => {
+		result[filePath] = contents;
+	};
+
+	program.getSourceFiles().forEach((sourceFile) => {
+		const fileName = sourceFile.fileName;
+		if (/^defaultLib:/.test(fileName)) {
+			return;
+		}
+		const destination = fileName;
+		if (/\.d\.ts$/.test(fileName)) {
+			if (nodeOrChildIsBlack(sourceFile)) {
+				writeFile(destination, sourceFile.text);
+			}
+			return;
+		}
+
+		let text = sourceFile.text;
+		let result = '';
+
+		function keep(node: ts.Node): void {
+			result += text.substring(node.pos, node.end);
+		}
+		function write(data: string): void {
+			result += data;
+		}
+
+		function writeMarkedNodes(node: ts.Node): void {
+			if (getColor(node) === NodeColor.Black) {
+				return keep(node);
+			}
+
+			// Always keep certain top-level statements
+			if (ts.isSourceFile(node.parent)) {
+				if (ts.isExpressionStatement(node) && ts.isStringLiteral(node.expression) && node.expression.text === 'use strict') {
+					return keep(node);
+				}
+
+				if (ts.isVariableStatement(node) && nodeOrChildIsBlack(node)) {
+					return keep(node);
+				}
+			}
+
+			// Keep the entire import in import * as X cases
+			if (ts.isImportDeclaration(node)) {
+				if (node.importClause && node.importClause.namedBindings) {
+					if (ts.isNamespaceImport(node.importClause.namedBindings)) {
+						if (getColor(node.importClause.namedBindings) === NodeColor.Black) {
+							return keep(node);
+						}
+					} else {
+						let survivingImports: string[] = [];
+						for (let i = 0; i < node.importClause.namedBindings.elements.length; i++) {
+							const importNode = node.importClause.namedBindings.elements[i];
+							if (getColor(importNode) === NodeColor.Black) {
+								survivingImports.push(importNode.getFullText(sourceFile));
+							}
+						}
+						const leadingTriviaWidth = node.getLeadingTriviaWidth();
+						const leadingTrivia = sourceFile.text.substr(node.pos, leadingTriviaWidth);
+						if (survivingImports.length > 0) {
+							if (node.importClause && getColor(node.importClause) === NodeColor.Black) {
+								return write(`${leadingTrivia}import ${node.importClause.name.text}, {${survivingImports.join(',')} } from${node.moduleSpecifier.getFullText(sourceFile)};`);
+							}
+							return write(`${leadingTrivia}import {${survivingImports.join(',')} } from${node.moduleSpecifier.getFullText(sourceFile)};`);
+						} else {
+							if (node.importClause && getColor(node.importClause) === NodeColor.Black) {
+								return write(`${leadingTrivia}import ${node.importClause.name.text} from${node.moduleSpecifier.getFullText(sourceFile)};`);
+							}
+						}
+					}
+				} else {
+					if (node.importClause && getColor(node.importClause) === NodeColor.Black) {
+						return keep(node);
+					}
+				}
+			}
+
+			if (shakeLevel === ShakeLevel.ClassMembers && (ts.isClassDeclaration(node) || ts.isInterfaceDeclaration(node)) && nodeOrChildIsBlack(node)) {
+				let toWrite = node.getFullText();
+				for (let i = node.members.length - 1; i >= 0; i--) {
+					const member = node.members[i];
+					if (getColor(member) === NodeColor.Black) {
+						// keep method
+						continue;
+					}
+					if (/^_(.*)Brand$/.test(member.name.getText())) {
+						// TODO: keep all members ending with `Brand`...
+						continue;
+					}
+
+					let pos = member.pos - node.pos;
+					let end = member.end - node.pos;
+					toWrite = toWrite.substring(0, pos) + toWrite.substring(end);
+				}
+				return write(toWrite);
+			}
+
+			if (ts.isFunctionDeclaration(node)) {
+				// Do not go inside functions if they haven't been marked
+				return;
+			}
+
+			node.forEachChild(writeMarkedNodes);
+		}
+
+		if (getColor(sourceFile) !== NodeColor.Black) {
+			if (!nodeOrChildIsBlack(sourceFile)) {
+				// none of the elements are reachable => don't write this file at all!
+				return;
+			}
+			sourceFile.forEachChild(writeMarkedNodes);
+			result += sourceFile.endOfFileToken.getFullText(sourceFile);
+		} else {
+			result = text;
+		}
+
+		writeFile(destination, result);
+	});
+
+	return result;
+}
+
+//#endregion
+
+//#region Utils
+
+/**
+ * Returns the node's symbol and the `import` node (if the symbol resolved from a different module)
+ */
+function getRealNodeSymbol(checker: ts.TypeChecker, node: ts.Node): [ts.Symbol, ts.Declaration] {
+	/**
+	 * Returns the containing object literal property declaration given a possible name node, e.g. "a" in x = { "a": 1 }
+	 */
+	/* @internal */
+	function getContainingObjectLiteralElement(node: ts.Node): ts.ObjectLiteralElement | undefined {
+		switch (node.kind) {
+			case ts.SyntaxKind.StringLiteral:
+			case ts.SyntaxKind.NumericLiteral:
+				if (node.parent.kind === ts.SyntaxKind.ComputedPropertyName) {
+					return ts.isObjectLiteralElement(node.parent.parent) ? node.parent.parent : undefined;
+				}
+			// falls through
+			case ts.SyntaxKind.Identifier:
+				return ts.isObjectLiteralElement(node.parent) &&
+					(node.parent.parent.kind === ts.SyntaxKind.ObjectLiteralExpression || node.parent.parent.kind === ts.SyntaxKind.JsxAttributes) &&
+					node.parent.name === node ? node.parent : undefined;
+		}
+		return undefined;
+	}
+
+	function getPropertySymbolsFromType(type: ts.Type, propName: ts.PropertyName) {
+		function getTextOfPropertyName(name: ts.PropertyName): string {
+
+			function isStringOrNumericLiteral(node: ts.Node): node is ts.StringLiteral | ts.NumericLiteral {
+				const kind = node.kind;
+				return kind === ts.SyntaxKind.StringLiteral
+					|| kind === ts.SyntaxKind.NumericLiteral;
+			}
+
+			switch (name.kind) {
+				case ts.SyntaxKind.Identifier:
+					return name.text;
+				case ts.SyntaxKind.StringLiteral:
+				case ts.SyntaxKind.NumericLiteral:
+					return name.text;
+				case ts.SyntaxKind.ComputedPropertyName:
+					return isStringOrNumericLiteral(name.expression) ? name.expression.text : undefined!;
+			}
+		}
+
+		const name = getTextOfPropertyName(propName);
+		if (name && type) {
+			const result: ts.Symbol[] = [];
+			const symbol = type.getProperty(name);
+			if (type.flags & ts.TypeFlags.Union) {
+				for (const t of (<ts.UnionType>type).types) {
+					const symbol = t.getProperty(name);
+					if (symbol) {
+						result.push(symbol);
+					}
+				}
+				return result;
+			}
+
+			if (symbol) {
+				result.push(symbol);
+				return result;
+			}
+		}
+		return undefined;
+	}
+
+	function getPropertySymbolsFromContextualType(typeChecker: ts.TypeChecker, node: ts.ObjectLiteralElement): ts.Symbol[] {
+		const objectLiteral = <ts.ObjectLiteralExpression | ts.JsxAttributes>node.parent;
+		const contextualType = typeChecker.getContextualType(objectLiteral)!;
+		return getPropertySymbolsFromType(contextualType, node.name!)!;
+	}
+
+	// Go to the original declaration for cases:
+	//
+	//   (1) when the aliased symbol was declared in the location(parent).
+	//   (2) when the aliased symbol is originating from an import.
+	//
+	function shouldSkipAlias(node: ts.Node, declaration: ts.Node): boolean {
+		if (node.kind !== ts.SyntaxKind.Identifier) {
+			return false;
+		}
+		if (node.parent === declaration) {
+			return true;
+		}
+		switch (declaration.kind) {
+			case ts.SyntaxKind.ImportClause:
+			case ts.SyntaxKind.ImportEqualsDeclaration:
+				return true;
+			case ts.SyntaxKind.ImportSpecifier:
+				return declaration.parent.kind === ts.SyntaxKind.NamedImports;
+			default:
+				return false;
+		}
+	}
+
+	if (!ts.isShorthandPropertyAssignment(node)) {
+		if (node.getChildCount() !== 0) {
+			return [null, null];
+		}
+	}
+
+	let symbol = checker.getSymbolAtLocation(node);
+	let importNode: ts.Declaration = null;
+	if (symbol && symbol.flags & ts.SymbolFlags.Alias && shouldSkipAlias(node, symbol.declarations[0])) {
+		const aliased = checker.getAliasedSymbol(symbol);
+		if (aliased.declarations) {
+			// We should mark the import as visited
+			importNode = symbol.declarations[0];
+			symbol = aliased;
+		}
+	}
+
+	if (symbol) {
+		// Because name in short-hand property assignment has two different meanings: property name and property value,
+		// using go-to-definition at such position should go to the variable declaration of the property value rather than
+		// go to the declaration of the property name (in this case stay at the same position). However, if go-to-definition
+		// is performed at the location of property access, we would like to go to definition of the property in the short-hand
+		// assignment. This case and others are handled by the following code.
+		if (node.parent.kind === ts.SyntaxKind.ShorthandPropertyAssignment) {
+			symbol = checker.getShorthandAssignmentValueSymbol(symbol.valueDeclaration);
+		}
+
+		// If the node is the name of a BindingElement within an ObjectBindingPattern instead of just returning the
+		// declaration the symbol (which is itself), we should try to get to the original type of the ObjectBindingPattern
+		// and return the property declaration for the referenced property.
+		// For example:
+		//      import('./foo').then(({ b/*goto*/ar }) => undefined); => should get use to the declaration in file "./foo"
+		//
+		//      function bar<T>(onfulfilled: (value: T) => void) { //....}
+		//      interface Test {
+		//          pr/*destination*/op1: number
+		//      }
+		//      bar<Test>(({pr/*goto*/op1})=>{});
+		if (ts.isPropertyName(node) && ts.isBindingElement(node.parent) && ts.isObjectBindingPattern(node.parent.parent) &&
+			(node === (node.parent.propertyName || node.parent.name))) {
+			const type = checker.getTypeAtLocation(node.parent.parent);
+			if (type) {
+				const propSymbols = getPropertySymbolsFromType(type, node);
+				if (propSymbols) {
+					symbol = propSymbols[0];
+				}
+			}
+		}
+
+		// If the current location we want to find its definition is in an object literal, try to get the contextual type for the
+		// object literal, lookup the property symbol in the contextual type, and use this for goto-definition.
+		// For example
+		//      interface Props{
+		//          /*first*/prop1: number
+		//          prop2: boolean
+		//      }
+		//      function Foo(arg: Props) {}
+		//      Foo( { pr/*1*/op1: 10, prop2: false })
+		const element = getContainingObjectLiteralElement(node);
+		if (element && checker.getContextualType(element.parent as ts.Expression)) {
+			const propertySymbols = getPropertySymbolsFromContextualType(checker, element);
+			if (propertySymbols) {
+				symbol = propertySymbols[0];
+			}
+		}
+	}
+
+	if (symbol && symbol.declarations) {
+		return [symbol, importNode];
+	}
+
+	return [null, null];
+}
+
+/** Get the token whose text contains the position */
+function getTokenAtPosition(sourceFile: ts.SourceFile, position: number, allowPositionInLeadingTrivia: boolean, includeEndPosition: boolean): ts.Node {
+	let current: ts.Node = sourceFile;
+	outer: while (true) {
+		// find the child that contains 'position'
+		for (const child of current.getChildren()) {
+			const start = allowPositionInLeadingTrivia ? child.getFullStart() : child.getStart(sourceFile, /*includeJsDoc*/ true);
+			if (start > position) {
+				// If this child begins after position, then all subsequent children will as well.
+				break;
+			}
+
+			const end = child.getEnd();
+			if (position < end || (position === end && (child.kind === ts.SyntaxKind.EndOfFileToken || includeEndPosition))) {
+				current = child;
+				continue outer;
+			}
+		}
+
+		return current;
+	}
+}
+
+//#endregion
diff --git a/build/lib/tslint/duplicateImportsRule.js b/build/lib/tslint/duplicateImportsRule.js
index 6acc9d728a6..1e06c4ab575 100644
--- a/build/lib/tslint/duplicateImportsRule.js
+++ b/build/lib/tslint/duplicateImportsRule.js
@@ -4,9 +4,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 var __extends = (this && this.__extends) || (function () {
-    var extendStatics = Object.setPrototypeOf ||
-        ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-        function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
     return function (d, b) {
         extendStatics(d, b);
         function __() { this.constructor = d; }
diff --git a/build/lib/tslint/importPatternsRule.js b/build/lib/tslint/importPatternsRule.js
index 2b1c5cf4b9c..1f03b696996 100644
--- a/build/lib/tslint/importPatternsRule.js
+++ b/build/lib/tslint/importPatternsRule.js
@@ -4,9 +4,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 var __extends = (this && this.__extends) || (function () {
-    var extendStatics = Object.setPrototypeOf ||
-        ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-        function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
     return function (d, b) {
         extendStatics(d, b);
         function __() { this.constructor = d; }
diff --git a/build/lib/tslint/layeringRule.js b/build/lib/tslint/layeringRule.js
index 2afb86e4238..7f35f6b5f5b 100644
--- a/build/lib/tslint/layeringRule.js
+++ b/build/lib/tslint/layeringRule.js
@@ -4,9 +4,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 var __extends = (this && this.__extends) || (function () {
-    var extendStatics = Object.setPrototypeOf ||
-        ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-        function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
     return function (d, b) {
         extendStatics(d, b);
         function __() { this.constructor = d; }
diff --git a/build/lib/tslint/noStandaloneEditorRule.js b/build/lib/tslint/noStandaloneEditorRule.js
index 4bb57bbc322..29ed841de12 100644
--- a/build/lib/tslint/noStandaloneEditorRule.js
+++ b/build/lib/tslint/noStandaloneEditorRule.js
@@ -4,9 +4,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 var __extends = (this && this.__extends) || (function () {
-    var extendStatics = Object.setPrototypeOf ||
-        ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-        function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
     return function (d, b) {
         extendStatics(d, b);
         function __() { this.constructor = d; }
diff --git a/build/lib/tslint/noUnexternalizedStringsRule.js b/build/lib/tslint/noUnexternalizedStringsRule.js
index d5ad583f442..f4ca615803a 100644
--- a/build/lib/tslint/noUnexternalizedStringsRule.js
+++ b/build/lib/tslint/noUnexternalizedStringsRule.js
@@ -4,9 +4,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 var __extends = (this && this.__extends) || (function () {
-    var extendStatics = Object.setPrototypeOf ||
-        ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-        function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
     return function (d, b) {
         extendStatics(d, b);
         function __() { this.constructor = d; }
diff --git a/build/lib/tslint/translationRemindRule.js b/build/lib/tslint/translationRemindRule.js
index ec56aff1535..fe716a38ebe 100644
--- a/build/lib/tslint/translationRemindRule.js
+++ b/build/lib/tslint/translationRemindRule.js
@@ -4,9 +4,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 var __extends = (this && this.__extends) || (function () {
-    var extendStatics = Object.setPrototypeOf ||
-        ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-        function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
     return function (d, b) {
         extendStatics(d, b);
         function __() { this.constructor = d; }
diff --git a/build/lib/util.js b/build/lib/util.js
index 1a2d40327cd..dd6f0b56992 100644
--- a/build/lib/util.js
+++ b/build/lib/util.js
@@ -14,7 +14,6 @@ var fs = require("fs");
 var _rimraf = require("rimraf");
 var git = require("./git");
 var VinylFile = require("vinyl");
-var cp = require("child_process");
 var NoCancellationToken = { isCancellationRequested: function () { return false; } };
 function incremental(streamProvider, initial, supportsCancellation) {
     var input = es.through();
@@ -211,62 +210,6 @@ function filter(fn) {
     return result;
 }
 exports.filter = filter;
-function tagExists(tagName) {
-    try {
-        cp.execSync("git rev-parse " + tagName, { stdio: 'ignore' });
-        return true;
-    }
-    catch (e) {
-        return false;
-    }
-}
-/**
- * Returns the version previous to the given version. Throws if a git tag for that version doesn't exist.
- * Given 1.17.2, return 1.17.1
- * 1.18.0 => 1.17.2. (or the highest 1.17.x)
- * 2.0.0 => 1.18.0 (or the highest 1.x)
- */
-function getPreviousVersion(versionStr, _tagExists) {
-    if (_tagExists === void 0) { _tagExists = tagExists; }
-    function getLatestTagFromBase(semverArr, componentToTest) {
-        var baseVersion = semverArr.join('.');
-        if (!_tagExists(baseVersion)) {
-            throw new Error('Failed to find git tag for base version, ' + baseVersion);
-        }
-        var goodTag;
-        do {
-            goodTag = semverArr.join('.');
-            semverArr[componentToTest]++;
-        } while (_tagExists(semverArr.join('.')));
-        return goodTag;
-    }
-    var semverArr = versionStringToNumberArray(versionStr);
-    if (semverArr[2] > 0) {
-        semverArr[2]--;
-        var previous = semverArr.join('.');
-        if (!_tagExists(previous)) {
-            throw new Error('Failed to find git tag for previous version, ' + previous);
-        }
-        return previous;
-    }
-    else if (semverArr[1] > 0) {
-        semverArr[1]--;
-        return getLatestTagFromBase(semverArr, 2);
-    }
-    else {
-        semverArr[0]--;
-        // Find 1.x.0 for latest x
-        var latestMinorVersion = getLatestTagFromBase(semverArr, 1);
-        // Find 1.x.y for latest y
-        return getLatestTagFromBase(versionStringToNumberArray(latestMinorVersion), 2);
-    }
-}
-exports.getPreviousVersion = getPreviousVersion;
-function versionStringToNumberArray(versionStr) {
-    return versionStr
-        .split('.')
-        .map(function (s) { return parseInt(s); });
-}
 function versionStringToNumber(versionStr) {
     var semverRegex = /(\d+)\.(\d+)\.(\d+)/;
     var match = versionStr.match(semverRegex);
diff --git a/build/lib/util.ts b/build/lib/util.ts
index 9dcbbe72484..e1393b86c5b 100644
--- a/build/lib/util.ts
+++ b/build/lib/util.ts
@@ -17,7 +17,6 @@ import * as git from './git';
 import * as VinylFile from 'vinyl';
 import { ThroughStream } from 'through';
 import * as sm from 'source-map';
-import * as cp from 'child_process';
 
 export interface ICancellationToken {
 	isCancellationRequested(): boolean;
@@ -271,66 +270,6 @@ export function filter(fn: (data: any) => boolean): FilterStream {
 	return result;
 }
 
-function tagExists(tagName: string): boolean {
-	try {
-		cp.execSync(`git rev-parse ${tagName}`, { stdio: 'ignore' });
-		return true;
-	} catch (e) {
-		return false;
-	}
-}
-
-/**
- * Returns the version previous to the given version. Throws if a git tag for that version doesn't exist.
- * Given 1.17.2, return 1.17.1
- * 1.18.0 => 1.17.2. (or the highest 1.17.x)
- * 2.0.0 => 1.18.0 (or the highest 1.x)
- */
-export function getPreviousVersion(versionStr: string, _tagExists = tagExists) {
-	function getLatestTagFromBase(semverArr: number[], componentToTest: number): string {
-		const baseVersion = semverArr.join('.');
-		if (!_tagExists(baseVersion)) {
-			throw new Error('Failed to find git tag for base version, ' + baseVersion);
-		}
-
-		let goodTag;
-		do {
-			goodTag = semverArr.join('.');
-			semverArr[componentToTest]++;
-		} while (_tagExists(semverArr.join('.')));
-
-		return goodTag;
-	}
-
-	const semverArr = versionStringToNumberArray(versionStr);
-	if (semverArr[2] > 0) {
-		semverArr[2]--;
-		const previous = semverArr.join('.');
-		if (!_tagExists(previous)) {
-			throw new Error('Failed to find git tag for previous version, ' + previous);
-		}
-
-		return previous;
-	} else if (semverArr[1] > 0) {
-		semverArr[1]--;
-		return getLatestTagFromBase(semverArr, 2);
-	} else {
-		semverArr[0]--;
-
-		// Find 1.x.0 for latest x
-		const latestMinorVersion = getLatestTagFromBase(semverArr, 1);
-
-		// Find 1.x.y for latest y
-		return getLatestTagFromBase(versionStringToNumberArray(latestMinorVersion), 2);
-	}
-}
-
-function versionStringToNumberArray(versionStr: string): number[] {
-	return versionStr
-		.split('.')
-		.map(s => parseInt(s));
-}
-
 export function versionStringToNumber(versionStr: string) {
 	const semverRegex = /(\d+)\.(\d+)\.(\d+)/;
 	const match = versionStr.match(semverRegex);
diff --git a/build/lib/watch/index.js b/build/lib/watch/index.js
index e1138b07f90..94f73cdd4a0 100644
--- a/build/lib/watch/index.js
+++ b/build/lib/watch/index.js
@@ -19,16 +19,6 @@ function handleDeletions() {
 
 let watch = void 0;
 
-// Disabled due to https://github.com/Microsoft/vscode/issues/36214
-// if (!process.env['VSCODE_USE_LEGACY_WATCH']) {
-// 	try {
-// 		watch = require('./watch-nsfw');
-// 	} catch (err) {
-// 		console.warn('Could not load our cross platform file watcher: ' + err.toString());
-// 		console.warn('Falling back to our platform specific watcher...');
-// 	}
-// }
-
 if (!watch) {
 	watch = process.platform === 'win32' ? require('./watch-win32') : require('gulp-watch');
 }
diff --git a/build/lib/watch/package.json b/build/lib/watch/package.json
index b10e8ed2727..0d031340153 100644
--- a/build/lib/watch/package.json
+++ b/build/lib/watch/package.json
@@ -5,7 +5,6 @@
   "author": "Microsoft ",
   "private": true,
   "devDependencies": {
-    "gulp-watch": "^4.3.9",
-    "nsfw": "^1.0.15"
+    "gulp-watch": "^4.3.9"
   }
 }
diff --git a/build/lib/watch/watch-nsfw.js b/build/lib/watch/watch-nsfw.js
deleted file mode 100644
index fb2b2758d02..00000000000
--- a/build/lib/watch/watch-nsfw.js
+++ /dev/null
@@ -1,94 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-var nsfw = require('nsfw');
-var path = require('path');
-var fs = require('fs');
-var File = require('vinyl');
-var es = require('event-stream');
-var filter = require('gulp-filter');
-
-function toChangeType(type) {
-    switch (type) {
-        case 0: return 'add';
-        case 1: return 'unlink';
-        case 2: return 'change';
-    }
-}
-
-function watch(root) {
-    var result = es.through();
-
-    function handleEvent(path, type) {
-        if (/[/\\].git[/\\]/.test(path) || /[/\\]out[/\\]/.test(path)) {
-            return; // filter as early as possible
-        }
-
-        var file = new File({
-            path: path,
-            base: root
-        });
-        //@ts-ignore
-        file.event = type;
-        result.emit('data', file);
-    }
-
-    nsfw(root, function (events) {
-        for (var i = 0; i < events.length; i++) {
-            var e = events[i];
-            var changeType = e.action;
-
-            if (changeType === 3 /* RENAMED */) {
-                handleEvent(path.join(e.directory, e.oldFile), 'unlink');
-                handleEvent(path.join(e.directory, e.newFile), 'add');
-            } else {
-                handleEvent(path.join(e.directory, e.file), toChangeType(changeType));
-            }
-        }
-    }).then(function (watcher) {
-        watcher.start();
-    });
-
-    return result;
-}
-
-var cache = Object.create(null);
-
-module.exports = function (pattern, options) {
-    options = options || {};
-
-    var cwd = path.normalize(options.cwd || process.cwd());
-    var watcher = cache[cwd];
-
-    if (!watcher) {
-        watcher = cache[cwd] = watch(cwd);
-    }
-
-    var rebase = !options.base ? es.through() : es.mapSync(function (f) {
-        f.base = options.base;
-        return f;
-    });
-
-    return watcher
-        .pipe(filter(['**', '!.git{,/**}'])) // ignore all things git
-        .pipe(filter(pattern))
-        .pipe(es.map(function (file, cb) {
-            fs.stat(file.path, function (err, stat) {
-                if (err && err.code === 'ENOENT') { return cb(null, file); }
-                if (err) { return cb(); }
-                if (!stat.isFile()) { return cb(); }
-
-                fs.readFile(file.path, function (err, contents) {
-                    if (err && err.code === 'ENOENT') { return cb(null, file); }
-                    if (err) { return cb(); }
-
-                    file.contents = contents;
-                    file.stat = stat;
-                    cb(null, file);
-                });
-            });
-        }))
-        .pipe(rebase);
-};
\ No newline at end of file
diff --git a/build/lib/watch/yarn.lock b/build/lib/watch/yarn.lock
index 0b4d3f70bb7..4fb4b56c0f6 100644
--- a/build/lib/watch/yarn.lock
+++ b/build/lib/watch/yarn.lock
@@ -61,10 +61,6 @@ array-unique@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53"
 
-asap@~2.0.3:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
-
 asn1@~0.2.3:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.3.tgz#dac8787713c9966849fc8180777ebe9c1ddf3b86"
@@ -330,16 +326,6 @@ form-data@~2.1.1:
     combined-stream "^1.0.5"
     mime-types "^2.1.12"
 
-fs-extra@^0.26.5:
-  version "0.26.7"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-0.26.7.tgz#9ae1fdd94897798edab76d0918cf42d0c3184fa9"
-  dependencies:
-    graceful-fs "^4.1.2"
-    jsonfile "^2.1.0"
-    klaw "^1.0.0"
-    path-is-absolute "^1.0.0"
-    rimraf "^2.2.8"
-
 fs.realpath@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
@@ -424,7 +410,7 @@ glogg@^1.0.0:
   dependencies:
     sparkles "^1.0.0"
 
-graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.1.9:
+graceful-fs@^4.1.2:
   version "4.1.11"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
 
@@ -649,12 +635,6 @@ json-stringify-safe@~5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
 
-jsonfile@^2.1.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-2.4.0.tgz#3736a2b428b87bbda0cc83b53fa3d633a35c2ae8"
-  optionalDependencies:
-    graceful-fs "^4.1.6"
-
 jsonify@~0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73"
@@ -680,12 +660,6 @@ kind-of@^4.0.0:
   dependencies:
     is-buffer "^1.1.5"
 
-klaw@^1.0.0:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/klaw/-/klaw-1.3.1.tgz#4088433b46b3b1ba259d78785d8e96f73ba02439"
-  optionalDependencies:
-    graceful-fs "^4.1.9"
-
 lodash._basecopy@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz#8da0e6a876cf344c0ad8a54882111dd3c5c7ca36"
@@ -736,14 +710,6 @@ lodash.isarray@^3.0.0:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/lodash.isarray/-/lodash.isarray-3.0.4.tgz#79e4eb88c36a8122af86f844aa9bcd851b5fbb55"
 
-lodash.isinteger@^4.0.4:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz#619c0af3d03f8b04c31f5882840b77b11cd68343"
-
-lodash.isundefined@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/lodash.isundefined/-/lodash.isundefined-3.0.1.tgz#23ef3d9535565203a66cefd5b830f848911afb48"
-
 lodash.keys@^3.0.0:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/lodash.keys/-/lodash.keys-3.1.2.tgz#4dbc0472b156be50a0b286855d1bd0b0c656098a"
@@ -835,7 +801,7 @@ multipipe@^0.1.2:
   dependencies:
     duplexer2 "0.0.2"
 
-nan@^2.0.0, nan@^2.3.0:
+nan@^2.3.0:
   version "2.7.0"
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.7.0.tgz#d95bf721ec877e08db276ed3fc6eb78f9083ad46"
 
@@ -855,12 +821,6 @@ node-pre-gyp@^0.6.39:
     tar "^2.2.1"
     tar-pack "^3.4.0"
 
-nodegit-promise@~4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/nodegit-promise/-/nodegit-promise-4.0.0.tgz#5722b184f2df7327161064a791d2e842c9167b34"
-  dependencies:
-    asap "~2.0.3"
-
 nopt@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d"
@@ -883,16 +843,6 @@ npmlog@^4.0.2:
     gauge "~2.7.3"
     set-blocking "~2.0.0"
 
-nsfw@^1.0.15:
-  version "1.0.16"
-  resolved "https://registry.yarnpkg.com/nsfw/-/nsfw-1.0.16.tgz#78ba3e7f513b53d160c221b9018e0baf108614cc"
-  dependencies:
-    fs-extra "^0.26.5"
-    lodash.isinteger "^4.0.4"
-    lodash.isundefined "^3.0.1"
-    nan "^2.0.0"
-    promisify-node "^0.3.0"
-
 number-is-nan@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
@@ -980,12 +930,6 @@ process-nextick-args@~1.0.6:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3"
 
-promisify-node@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/promisify-node/-/promisify-node-0.3.0.tgz#b4b55acf90faa7d2b8b90ca396899086c03060cf"
-  dependencies:
-    nodegit-promise "~4.0.0"
-
 punycode@^1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
@@ -1089,7 +1033,7 @@ request@2.81.0:
     tunnel-agent "^0.6.0"
     uuid "^3.0.0"
 
-rimraf@2, rimraf@^2.2.8, rimraf@^2.5.1, rimraf@^2.6.1:
+rimraf@2, rimraf@^2.5.1, rimraf@^2.6.1:
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36"
   dependencies:
diff --git a/build/monaco/api.js b/build/monaco/api.js
index 74e9273f35e..ae4a0d26616 100644
--- a/build/monaco/api.js
+++ b/build/monaco/api.js
@@ -134,7 +134,25 @@ function getTopLevelDeclaration(sourceFile, typeName) {
 function getNodeText(sourceFile, node) {
     return sourceFile.getFullText().substring(node.pos, node.end);
 }
-function getMassagedTopLevelDeclarationText(sourceFile, declaration) {
+function hasModifier(modifiers, kind) {
+    if (modifiers) {
+        for (var i = 0; i < modifiers.length; i++) {
+            var mod = modifiers[i];
+            if (mod.kind === kind) {
+                return true;
+            }
+        }
+    }
+    return false;
+}
+function isStatic(member) {
+    return hasModifier(member.modifiers, ts.SyntaxKind.StaticKeyword);
+}
+function isDefaultExport(declaration) {
+    return (hasModifier(declaration.modifiers, ts.SyntaxKind.DefaultKeyword)
+        && hasModifier(declaration.modifiers, ts.SyntaxKind.ExportKeyword));
+}
+function getMassagedTopLevelDeclarationText(sourceFile, declaration, importName, usage) {
     var result = getNodeText(sourceFile, declaration);
     // if (result.indexOf('MonacoWorker') >= 0) {
     // 	console.log('here!');
@@ -142,6 +160,18 @@ function getMassagedTopLevelDeclarationText(sourceFile, declaration) {
     // }
     if (declaration.kind === ts.SyntaxKind.InterfaceDeclaration || declaration.kind === ts.SyntaxKind.ClassDeclaration) {
         var interfaceDeclaration = declaration;
+        var staticTypeName_1 = (isDefaultExport(interfaceDeclaration)
+            ? importName + ".default"
+            : importName + "." + declaration.name.text);
+        var instanceTypeName_1 = staticTypeName_1;
+        var typeParametersCnt = (interfaceDeclaration.typeParameters ? interfaceDeclaration.typeParameters.length : 0);
+        if (typeParametersCnt > 0) {
+            var arr = [];
+            for (var i = 0; i < typeParametersCnt; i++) {
+                arr.push('any');
+            }
+            instanceTypeName_1 = instanceTypeName_1 + "<" + arr.join(',') + ">";
+        }
         var members = interfaceDeclaration.members;
         members.forEach(function (member) {
             try {
@@ -151,6 +181,15 @@ function getMassagedTopLevelDeclarationText(sourceFile, declaration) {
                     result = result.replace(memberText, '');
                     // console.log('AFTER: ', result);
                 }
+                else {
+                    var memberName = member.name.text;
+                    if (isStatic(member)) {
+                        usage.push("a = " + staticTypeName_1 + "." + memberName + ";");
+                    }
+                    else {
+                        usage.push("a = (<" + instanceTypeName_1 + ">b)." + memberName + ";");
+                    }
+                }
             }
             catch (err) {
                 // life..
@@ -211,6 +250,16 @@ function generateDeclarationFile(out, inputFiles, recipe) {
     var endl = /\r\n/.test(recipe) ? '\r\n' : '\n';
     var lines = recipe.split(endl);
     var result = [];
+    var usageCounter = 0;
+    var usageImports = [];
+    var usage = [];
+    usage.push("var a;");
+    usage.push("var b;");
+    var generateUsageImport = function (moduleId) {
+        var importName = 'm' + (++usageCounter);
+        usageImports.push("import * as " + importName + " from '" + moduleId.replace(/\.d\.ts$/, '') + "';");
+        return importName;
+    };
     lines.forEach(function (line) {
         var m1 = line.match(/^\s*#include\(([^;)]*)(;[^)]*)?\)\:(.*)$/);
         if (m1) {
@@ -220,6 +269,7 @@ function generateDeclarationFile(out, inputFiles, recipe) {
             if (!sourceFile_1) {
                 return;
             }
+            var importName_1 = generateUsageImport(moduleId);
             var replacer_1 = createReplacer(m1[2]);
             var typeNames = m1[3].split(/,/);
             typeNames.forEach(function (typeName) {
@@ -232,7 +282,7 @@ function generateDeclarationFile(out, inputFiles, recipe) {
                     logErr('Cannot find type ' + typeName);
                     return;
                 }
-                result.push(replacer_1(getMassagedTopLevelDeclarationText(sourceFile_1, declaration)));
+                result.push(replacer_1(getMassagedTopLevelDeclarationText(sourceFile_1, declaration, importName_1, usage)));
             });
             return;
         }
@@ -244,6 +294,7 @@ function generateDeclarationFile(out, inputFiles, recipe) {
             if (!sourceFile_2) {
                 return;
             }
+            var importName_2 = generateUsageImport(moduleId);
             var replacer_2 = createReplacer(m2[2]);
             var typeNames = m2[3].split(/,/);
             var typesToExcludeMap_1 = {};
@@ -271,7 +322,7 @@ function generateDeclarationFile(out, inputFiles, recipe) {
                         }
                     }
                 }
-                result.push(replacer_2(getMassagedTopLevelDeclarationText(sourceFile_2, declaration)));
+                result.push(replacer_2(getMassagedTopLevelDeclarationText(sourceFile_2, declaration, importName_2, usage)));
             });
             return;
         }
@@ -282,9 +333,12 @@ function generateDeclarationFile(out, inputFiles, recipe) {
     resultTxt = resultTxt.replace(/\bEvent</g, 'IEvent<');
     resultTxt = resultTxt.replace(/\bTPromise</g, 'Promise<');
     resultTxt = format(resultTxt);
-    return resultTxt;
+    return [
+        resultTxt,
+        usageImports.join('\n') + "\n\n" + usage.join('\n')
+    ];
 }
-function getFilesToWatch(out) {
+function getIncludesInRecipe() {
     var recipe = fs.readFileSync(RECIPE_PATH).toString();
     var lines = recipe.split(/\r\n|\n|\r/);
     var result = [];
@@ -292,24 +346,27 @@ function getFilesToWatch(out) {
         var m1 = line.match(/^\s*#include\(([^;)]*)(;[^)]*)?\)\:(.*)$/);
         if (m1) {
             var moduleId = m1[1];
-            result.push(moduleIdToPath(out, moduleId));
+            result.push(moduleId);
             return;
         }
         var m2 = line.match(/^\s*#includeAll\(([^;)]*)(;[^)]*)?\)\:(.*)$/);
         if (m2) {
             var moduleId = m2[1];
-            result.push(moduleIdToPath(out, moduleId));
+            result.push(moduleId);
             return;
         }
     });
     return result;
 }
+function getFilesToWatch(out) {
+    return getIncludesInRecipe().map(function (moduleId) { return moduleIdToPath(out, moduleId); });
+}
 exports.getFilesToWatch = getFilesToWatch;
 function run(out, inputFiles) {
     log('Starting monaco.d.ts generation');
     SOURCE_FILE_MAP = {};
     var recipe = fs.readFileSync(RECIPE_PATH).toString();
-    var result = generateDeclarationFile(out, inputFiles, recipe);
+    var _a = generateDeclarationFile(out, inputFiles, recipe), result = _a[0], usageContent = _a[1];
     var currentContent = fs.readFileSync(DECLARATION_PATH).toString();
     log('Finished monaco.d.ts generation');
     var one = currentContent.replace(/\r\n/gm, '\n');
@@ -317,6 +374,7 @@ function run(out, inputFiles) {
     var isTheSame = one === other;
     return {
         content: result,
+        usageContent: usageContent,
         filePath: DECLARATION_PATH,
         isTheSame: isTheSame
     };
@@ -326,3 +384,78 @@ function complainErrors() {
     logErr('Not running monaco.d.ts generation due to compile errors');
 }
 exports.complainErrors = complainErrors;
+var TypeScriptLanguageServiceHost = /** @class */ (function () {
+    function TypeScriptLanguageServiceHost(libs, files, compilerOptions) {
+        this._libs = libs;
+        this._files = files;
+        this._compilerOptions = compilerOptions;
+    }
+    // --- language service host ---------------
+    TypeScriptLanguageServiceHost.prototype.getCompilationSettings = function () {
+        return this._compilerOptions;
+    };
+    TypeScriptLanguageServiceHost.prototype.getScriptFileNames = function () {
+        return ([]
+            .concat(Object.keys(this._libs))
+            .concat(Object.keys(this._files)));
+    };
+    TypeScriptLanguageServiceHost.prototype.getScriptVersion = function (fileName) {
+        return '1';
+    };
+    TypeScriptLanguageServiceHost.prototype.getProjectVersion = function () {
+        return '1';
+    };
+    TypeScriptLanguageServiceHost.prototype.getScriptSnapshot = function (fileName) {
+        if (this._files.hasOwnProperty(fileName)) {
+            return ts.ScriptSnapshot.fromString(this._files[fileName]);
+        }
+        else if (this._libs.hasOwnProperty(fileName)) {
+            return ts.ScriptSnapshot.fromString(this._libs[fileName]);
+        }
+        else {
+            return ts.ScriptSnapshot.fromString('');
+        }
+    };
+    TypeScriptLanguageServiceHost.prototype.getScriptKind = function (fileName) {
+        return ts.ScriptKind.TS;
+    };
+    TypeScriptLanguageServiceHost.prototype.getCurrentDirectory = function () {
+        return '';
+    };
+    TypeScriptLanguageServiceHost.prototype.getDefaultLibFileName = function (options) {
+        return 'defaultLib:es5';
+    };
+    TypeScriptLanguageServiceHost.prototype.isDefaultLibFileName = function (fileName) {
+        return fileName === this.getDefaultLibFileName(this._compilerOptions);
+    };
+    return TypeScriptLanguageServiceHost;
+}());
+function execute() {
+    var OUTPUT_FILES = {};
+    var SRC_FILES = {};
+    var SRC_FILE_TO_EXPECTED_NAME = {};
+    getIncludesInRecipe().forEach(function (moduleId) {
+        if (/\.d\.ts$/.test(moduleId)) {
+            var fileName_1 = path.join(SRC, moduleId);
+            OUTPUT_FILES[moduleIdToPath('src', moduleId)] = fs.readFileSync(fileName_1).toString();
+            return;
+        }
+        var fileName = path.join(SRC, moduleId) + '.ts';
+        SRC_FILES[fileName] = fs.readFileSync(fileName).toString();
+        SRC_FILE_TO_EXPECTED_NAME[fileName] = moduleIdToPath('src', moduleId);
+    });
+    var languageService = ts.createLanguageService(new TypeScriptLanguageServiceHost({}, SRC_FILES, {}));
+    var t1 = Date.now();
+    Object.keys(SRC_FILES).forEach(function (fileName) {
+        var t = Date.now();
+        var emitOutput = languageService.getEmitOutput(fileName, true);
+        OUTPUT_FILES[SRC_FILE_TO_EXPECTED_NAME[fileName]] = emitOutput.outputFiles[0].text;
+        // console.log(`Generating .d.ts for ${fileName} took ${Date.now() - t} ms`);
+    });
+    console.log("Generating .d.ts took " + (Date.now() - t1) + " ms");
+    // console.log(result.filePath);
+    // fs.writeFileSync(result.filePath, result.content.replace(/\r\n/gm, '\n'));
+    // fs.writeFileSync(path.join(SRC, 'user.ts'), result.usageContent.replace(/\r\n/gm, '\n'));
+    return run('src', OUTPUT_FILES);
+}
+exports.execute = execute;
diff --git a/build/monaco/api.ts b/build/monaco/api.ts
index eff457c5121..64ca2243b58 100644
--- a/build/monaco/api.ts
+++ b/build/monaco/api.ts
@@ -153,8 +153,30 @@ function getNodeText(sourceFile: ts.SourceFile, node: { pos: number; end: number
 	return sourceFile.getFullText().substring(node.pos, node.end);
 }
 
+function hasModifier(modifiers: ts.NodeArray<ts.Modifier>, kind: ts.SyntaxKind): boolean {
+	if (modifiers) {
+		for (let i = 0; i < modifiers.length; i++) {
+			let mod = modifiers[i];
+			if (mod.kind === kind) {
+				return true;
+			}
+		}
+	}
+	return false;
+}
 
-function getMassagedTopLevelDeclarationText(sourceFile: ts.SourceFile, declaration: TSTopLevelDeclare): string {
+function isStatic(member: ts.ClassElement | ts.TypeElement): boolean {
+	return hasModifier(member.modifiers, ts.SyntaxKind.StaticKeyword);
+}
+
+function isDefaultExport(declaration: ts.InterfaceDeclaration | ts.ClassDeclaration): boolean {
+	return (
+		hasModifier(declaration.modifiers, ts.SyntaxKind.DefaultKeyword)
+		&& hasModifier(declaration.modifiers, ts.SyntaxKind.ExportKeyword)
+	);
+}
+
+function getMassagedTopLevelDeclarationText(sourceFile: ts.SourceFile, declaration: TSTopLevelDeclare, importName: string, usage: string[]): string {
 	let result = getNodeText(sourceFile, declaration);
 	// if (result.indexOf('MonacoWorker') >= 0) {
 	// 	console.log('here!');
@@ -163,7 +185,23 @@ function getMassagedTopLevelDeclarationText(sourceFile: ts.SourceFile, declarati
 	if (declaration.kind === ts.SyntaxKind.InterfaceDeclaration || declaration.kind === ts.SyntaxKind.ClassDeclaration) {
 		let interfaceDeclaration = <ts.InterfaceDeclaration | ts.ClassDeclaration>declaration;
 
-		let members: ts.NodeArray<ts.Node> = interfaceDeclaration.members;
+		const staticTypeName = (
+			isDefaultExport(interfaceDeclaration)
+				? `${importName}.default`
+				: `${importName}.${declaration.name.text}`
+		);
+
+		let instanceTypeName = staticTypeName;
+		const typeParametersCnt = (interfaceDeclaration.typeParameters ? interfaceDeclaration.typeParameters.length : 0);
+		if (typeParametersCnt > 0) {
+			let arr: string[] = [];
+			for (let i = 0; i < typeParametersCnt; i++) {
+				arr.push('any');
+			}
+			instanceTypeName = `${instanceTypeName}<${arr.join(',')}>`;
+		}
+
+		const members: ts.NodeArray<ts.ClassElement | ts.TypeElement> = interfaceDeclaration.members;
 		members.forEach((member) => {
 			try {
 				let memberText = getNodeText(sourceFile, member);
@@ -171,6 +209,13 @@ function getMassagedTopLevelDeclarationText(sourceFile: ts.SourceFile, declarati
 					// console.log('BEFORE: ', result);
 					result = result.replace(memberText, '');
 					// console.log('AFTER: ', result);
+				} else {
+					const memberName = (<ts.Identifier | ts.StringLiteral>member.name).text;
+					if (isStatic(member)) {
+						usage.push(`a = ${staticTypeName}.${memberName};`);
+					} else {
+						usage.push(`a = (<${instanceTypeName}>b).${memberName};`);
+					}
 				}
 			} catch (err) {
 				// life..
@@ -237,11 +282,24 @@ function createReplacer(data: string): (str: string) => string {
 	};
 }
 
-function generateDeclarationFile(out: string, inputFiles: { [file: string]: string; }, recipe: string): string {
+function generateDeclarationFile(out: string, inputFiles: { [file: string]: string; }, recipe: string): [string, string] {
 	const endl = /\r\n/.test(recipe) ? '\r\n' : '\n';
 
 	let lines = recipe.split(endl);
-	let result = [];
+	let result: string[] = [];
+
+	let usageCounter = 0;
+	let usageImports: string[] = [];
+	let usage: string[] = [];
+
+	usage.push(`var a;`);
+	usage.push(`var b;`);
+
+	const generateUsageImport = (moduleId: string) => {
+		let importName = 'm' + (++usageCounter);
+		usageImports.push(`import * as ${importName} from '${moduleId.replace(/\.d\.ts$/, '')}';`);
+		return importName;
+	};
 
 	lines.forEach(line => {
 
@@ -254,6 +312,8 @@ function generateDeclarationFile(out: string, inputFiles: { [file: string]: stri
 				return;
 			}
 
+			const importName = generateUsageImport(moduleId);
+
 			let replacer = createReplacer(m1[2]);
 
 			let typeNames = m1[3].split(/,/);
@@ -267,7 +327,7 @@ function generateDeclarationFile(out: string, inputFiles: { [file: string]: stri
 					logErr('Cannot find type ' + typeName);
 					return;
 				}
-				result.push(replacer(getMassagedTopLevelDeclarationText(sourceFile, declaration)));
+				result.push(replacer(getMassagedTopLevelDeclarationText(sourceFile, declaration, importName, usage)));
 			});
 			return;
 		}
@@ -281,6 +341,8 @@ function generateDeclarationFile(out: string, inputFiles: { [file: string]: stri
 				return;
 			}
 
+			const importName = generateUsageImport(moduleId);
+
 			let replacer = createReplacer(m2[2]);
 
 			let typeNames = m2[3].split(/,/);
@@ -309,7 +371,7 @@ function generateDeclarationFile(out: string, inputFiles: { [file: string]: stri
 						}
 					}
 				}
-				result.push(replacer(getMassagedTopLevelDeclarationText(sourceFile, declaration)));
+				result.push(replacer(getMassagedTopLevelDeclarationText(sourceFile, declaration, importName, usage)));
 			});
 			return;
 		}
@@ -324,10 +386,13 @@ function generateDeclarationFile(out: string, inputFiles: { [file: string]: stri
 
 	resultTxt = format(resultTxt);
 
-	return resultTxt;
+	return [
+		resultTxt,
+		`${usageImports.join('\n')}\n\n${usage.join('\n')}`
+	];
 }
 
-export function getFilesToWatch(out: string): string[] {
+function getIncludesInRecipe(): string[] {
 	let recipe = fs.readFileSync(RECIPE_PATH).toString();
 	let lines = recipe.split(/\r\n|\n|\r/);
 	let result = [];
@@ -337,14 +402,14 @@ export function getFilesToWatch(out: string): string[] {
 		let m1 = line.match(/^\s*#include\(([^;)]*)(;[^)]*)?\)\:(.*)$/);
 		if (m1) {
 			let moduleId = m1[1];
-			result.push(moduleIdToPath(out, moduleId));
+			result.push(moduleId);
 			return;
 		}
 
 		let m2 = line.match(/^\s*#includeAll\(([^;)]*)(;[^)]*)?\)\:(.*)$/);
 		if (m2) {
 			let moduleId = m2[1];
-			result.push(moduleIdToPath(out, moduleId));
+			result.push(moduleId);
 			return;
 		}
 	});
@@ -352,8 +417,13 @@ export function getFilesToWatch(out: string): string[] {
 	return result;
 }
 
+export function getFilesToWatch(out: string): string[] {
+	return getIncludesInRecipe().map((moduleId) => moduleIdToPath(out, moduleId));
+}
+
 export interface IMonacoDeclarationResult {
 	content: string;
+	usageContent: string;
 	filePath: string;
 	isTheSame: boolean;
 }
@@ -363,7 +433,7 @@ export function run(out: string, inputFiles: { [file: string]: string; }): IMona
 	SOURCE_FILE_MAP = {};
 
 	let recipe = fs.readFileSync(RECIPE_PATH).toString();
-	let result = generateDeclarationFile(out, inputFiles, recipe);
+	let [result, usageContent] = generateDeclarationFile(out, inputFiles, recipe);
 
 	let currentContent = fs.readFileSync(DECLARATION_PATH).toString();
 	log('Finished monaco.d.ts generation');
@@ -374,6 +444,7 @@ export function run(out: string, inputFiles: { [file: string]: string; }): IMona
 
 	return {
 		content: result,
+		usageContent: usageContent,
 		filePath: DECLARATION_PATH,
 		isTheSame
 	};
@@ -382,3 +453,96 @@ export function run(out: string, inputFiles: { [file: string]: string; }): IMona
 export function complainErrors() {
 	logErr('Not running monaco.d.ts generation due to compile errors');
 }
+
+
+
+interface ILibMap { [libName: string]: string; }
+interface IFileMap { [fileName: string]: string; }
+
+class TypeScriptLanguageServiceHost implements ts.LanguageServiceHost {
+
+	private readonly _libs: ILibMap;
+	private readonly _files: IFileMap;
+	private readonly _compilerOptions: ts.CompilerOptions;
+
+	constructor(libs: ILibMap, files: IFileMap, compilerOptions: ts.CompilerOptions) {
+		this._libs = libs;
+		this._files = files;
+		this._compilerOptions = compilerOptions;
+	}
+
+	// --- language service host ---------------
+
+	getCompilationSettings(): ts.CompilerOptions {
+		return this._compilerOptions;
+	}
+	getScriptFileNames(): string[] {
+		return (
+			[]
+				.concat(Object.keys(this._libs))
+				.concat(Object.keys(this._files))
+		);
+	}
+	getScriptVersion(fileName: string): string {
+		return '1';
+	}
+	getProjectVersion(): string {
+		return '1';
+	}
+	getScriptSnapshot(fileName: string): ts.IScriptSnapshot {
+		if (this._files.hasOwnProperty(fileName)) {
+			return ts.ScriptSnapshot.fromString(this._files[fileName]);
+		} else if (this._libs.hasOwnProperty(fileName)) {
+			return ts.ScriptSnapshot.fromString(this._libs[fileName]);
+		} else {
+			return ts.ScriptSnapshot.fromString('');
+		}
+	}
+	getScriptKind(fileName: string): ts.ScriptKind {
+		return ts.ScriptKind.TS;
+	}
+	getCurrentDirectory(): string {
+		return '';
+	}
+	getDefaultLibFileName(options: ts.CompilerOptions): string {
+		return 'defaultLib:es5';
+	}
+	isDefaultLibFileName(fileName: string): boolean {
+		return fileName === this.getDefaultLibFileName(this._compilerOptions);
+	}
+}
+
+export function execute(): IMonacoDeclarationResult {
+
+	const OUTPUT_FILES: { [file: string]: string; } = {};
+	const SRC_FILES: IFileMap = {};
+	const SRC_FILE_TO_EXPECTED_NAME: { [filename: string]: string; } = {};
+	getIncludesInRecipe().forEach((moduleId) => {
+		if (/\.d\.ts$/.test(moduleId)) {
+			let fileName = path.join(SRC, moduleId);
+			OUTPUT_FILES[moduleIdToPath('src', moduleId)] = fs.readFileSync(fileName).toString();
+			return;
+		}
+
+		let fileName = path.join(SRC, moduleId) + '.ts';
+		SRC_FILES[fileName] = fs.readFileSync(fileName).toString();
+		SRC_FILE_TO_EXPECTED_NAME[fileName] = moduleIdToPath('src', moduleId);
+	});
+
+	const languageService = ts.createLanguageService(new TypeScriptLanguageServiceHost({}, SRC_FILES, {}));
+
+	var t1 = Date.now();
+	Object.keys(SRC_FILES).forEach((fileName) => {
+		var t = Date.now();
+		const emitOutput = languageService.getEmitOutput(fileName, true);
+		OUTPUT_FILES[SRC_FILE_TO_EXPECTED_NAME[fileName]] = emitOutput.outputFiles[0].text;
+		// console.log(`Generating .d.ts for ${fileName} took ${Date.now() - t} ms`);
+	});
+	console.log(`Generating .d.ts took ${Date.now() - t1} ms`);
+
+	// console.log(result.filePath);
+	// fs.writeFileSync(result.filePath, result.content.replace(/\r\n/gm, '\n'));
+	// fs.writeFileSync(path.join(SRC, 'user.ts'), result.usageContent.replace(/\r\n/gm, '\n'));
+
+	return run('src', OUTPUT_FILES);
+}
diff --git a/build/monaco/monaco.d.ts.recipe b/build/monaco/monaco.d.ts.recipe
index 218d4cdf8f5..d1b4e5d873a 100644
--- a/build/monaco/monaco.d.ts.recipe
+++ b/build/monaco/monaco.d.ts.recipe
@@ -25,13 +25,6 @@ declare namespace monaco {
 		dispose(): void;
 	}
 
-	export enum Severity {
-		Ignore = 0,
-		Info = 1,
-		Warning = 2,
-		Error = 3,
-	}
-
 	export enum MarkerTag {
 		Unnecessary = 1,
 	}
@@ -43,8 +36,7 @@ declare namespace monaco {
 		Error = 8,
 	}
 
-
-#include(vs/base/common/winjs.base.d.ts): TValueCallback, ProgressCallback, Promise
+#include(vs/base/common/winjs.base.d.ts): Promise
 #include(vs/base/common/cancellation): CancellationTokenSource, CancellationToken
 #include(vs/base/common/uri): URI, UriComponents
 #include(vs/editor/common/standalone/standaloneBase): KeyCode, KeyMod
diff --git a/build/monaco/monaco.usage.recipe b/build/monaco/monaco.usage.recipe
new file mode 100644
index 00000000000..beaad500aad
--- /dev/null
+++ b/build/monaco/monaco.usage.recipe
@@ -0,0 +1,81 @@
+
+// This file is adding references to various symbols which should not be removed via tree shaking
+
+import { ServiceIdentifier } from 'vs/platform/instantiation/common/instantiation';
+import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
+import { IHighlight } from 'vs/base/parts/quickopen/browser/quickOpenModel';
+import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
+import { IEnvironmentService } from 'vs/platform/environment/common/environment';
+import { CountBadge } from 'vs/base/browser/ui/countBadge/countBadge';
+import { SimpleWorkerClient, create as create1 } from 'vs/base/common/worker/simpleWorker';
+import { create as create2 } from 'vs/editor/common/services/editorSimpleWorker';
+import { QuickOpenWidget } from 'vs/base/parts/quickopen/browser/quickOpenWidget';
+import { SyncDescriptor0, SyncDescriptor1, SyncDescriptor2, SyncDescriptor3, SyncDescriptor4, SyncDescriptor5, SyncDescriptor6, SyncDescriptor7, SyncDescriptor8 } from 'vs/platform/instantiation/common/descriptors';
+import { PolyfillPromise } from 'vs/base/common/winjs.polyfill.promise';
+import { DiffNavigator } from 'vs/editor/browser/widget/diffNavigator';
+import * as editorAPI from 'vs/editor/editor.api';
+
+(function () {
+	var a: any;
+	var b: any;
+	a = (<IContextViewService>b).layout; // IContextViewProvider
+	a = (<IWorkspaceContextService>b).getWorkspaceFolder; // IWorkspaceFolderProvider
+	a = (<IWorkspaceContextService>b).getWorkspace; // IWorkspaceFolderProvider
+	a = (<CountBadge>b).style; // IThemable
+	a = (<QuickOpenWidget>b).style; // IThemable
+	a = (<IEnvironmentService>b).userHome; // IUserHomeProvider
+	a = (<DiffNavigator>b).previous; // IDiffNavigator
+	a = (<ServiceIdentifier<any>>b).type;
+	a = (<IHighlight>b).start;
+	a = (<IHighlight>b).end;
+	a = (<SimpleWorkerClient<any>>b).getProxyObject; // IWorkerClient
+	a = create1;
+	a = create2;
+
+	// promise polyfill
+	a = PolyfillPromise.all;
+	a = PolyfillPromise.race;
+	a = PolyfillPromise.resolve;
+	a = PolyfillPromise.reject;
+	a = (<PolyfillPromise>b).then;
+	a = (<PolyfillPromise>b).catch;
+
+	// injection madness
+	a = (<SyncDescriptor0<any>>b).ctor;
+	a = (<SyncDescriptor0<any>>b).bind;
+	a = (<SyncDescriptor1<any, any>>b).ctor;
+	a = (<SyncDescriptor1<any, any>>b).bind;
+	a = (<SyncDescriptor1<any, any>>b).ctor;
+	a = (<SyncDescriptor1<any, any>>b).bind;
+	a = (<SyncDescriptor2<any, any, any>>b).ctor;
+	a = (<SyncDescriptor2<any, any, any>>b).bind;
+	a = (<SyncDescriptor3<any, any, any, any>>b).ctor;
+	a = (<SyncDescriptor3<any, any, any, any>>b).bind;
+	a = (<SyncDescriptor4<any, any, any, any, any>>b).ctor;
+	a = (<SyncDescriptor4<any, any, any, any, any>>b).bind;
+	a = (<SyncDescriptor5<any, any, any, any, any, any>>b).ctor;
+	a = (<SyncDescriptor5<any, any, any, any, any, any>>b).bind;
+	a = (<SyncDescriptor6<any, any, any, any, any, any, any>>b).ctor;
+	a = (<SyncDescriptor6<any, any, any, any, any, any, any>>b).bind;
+	a = (<SyncDescriptor7<any, any, any, any, any, any, any, any>>b).ctor;
+	a = (<SyncDescriptor7<any, any, any, any, any, any, any, any>>b).bind;
+	a = (<SyncDescriptor8<any, any, any, any, any, any, any, any, any>>b).ctor;
+	a = (<SyncDescriptor8<any, any, any, any, any, any, any, any, any>>b).bind;
+
+	// exported API
+	a = editorAPI.CancellationTokenSource;
+	a = editorAPI.Emitter;
+	a = editorAPI.KeyCode;
+	a = editorAPI.KeyMod;
+	a = editorAPI.Position;
+	a = editorAPI.Range;
+	a = editorAPI.Selection;
+	a = editorAPI.SelectionDirection;
+	a = editorAPI.MarkerSeverity;
+	a = editorAPI.MarkerTag;
+	a = editorAPI.Promise;
+	a = editorAPI.Uri;
+	a = editorAPI.Token;
+	a = editorAPI.editor;
+	a = editorAPI.languages;
+})();
diff --git a/build/monaco/package.json b/build/monaco/package.json
index 256ca1ff534..efd919085b2 100644
--- a/build/monaco/package.json
+++ b/build/monaco/package.json
@@ -1,7 +1,7 @@
 {
   "name": "monaco-editor-core",
   "private": true,
-  "version": "0.12.0",
+  "version": "0.14.3",
   "description": "A browser based code editor",
   "author": "Microsoft Corporation",
   "license": "MIT",
diff --git a/build/npm/update-localization-extension.js b/build/npm/update-localization-extension.js
index 985fbd28cb7..eebf63ed330 100644
--- a/build/npm/update-localization-extension.js
+++ b/build/npm/update-localization-extension.js
@@ -43,7 +43,12 @@ function update(idOrPath) {
 		let apiToken = process.env.TRANSIFEX_API_TOKEN;
 		let languageId = localization.transifexId || localization.languageId;
 		let translationDataFolder = path.join(locExtFolder, 'translations');
-
+		if (languageId === "zh-cn") {
+			languageId = "zh-hans";
+		}
+		if (languageId === "zh-tw") {
+			languageId = "zh-hant";
+		}
 		if (fs.existsSync(translationDataFolder) && fs.existsSync(path.join(translationDataFolder, 'main.i18n.json'))) {
 			console.log('Clearing  \'' + translationDataFolder + '\'...');
 			rimraf.sync(translationDataFolder);
diff --git a/build/package.json b/build/package.json
index 8f89abbc23d..9dd100c7361 100644
--- a/build/package.json
+++ b/build/package.json
@@ -14,7 +14,7 @@
     "documentdb": "1.13.0",
     "mime": "^1.3.4",
     "minimist": "^1.2.0",
-    "typescript": "2.9.1",
+    "typescript": "3.0.3",
     "xml2js": "^0.4.17",
     "github-releases": "^0.4.1",
     "request": "^2.85.0"
diff --git a/build/tfs/continuous-build.yml b/build/tfs/continuous-build.yml
index 0bcd1e7cb2e..a1d4be71335 100644
--- a/build/tfs/continuous-build.yml
+++ b/build/tfs/continuous-build.yml
@@ -1,141 +1,17 @@
-phases:
-- phase: Windows
-  queue: Hosted VS2017
+jobs:
+- job: Windows
+  pool:
+    vmImage: VS2017-Win2016
   steps:
-  - task: NodeTool@0
-    inputs:
-      versionSpec: "8.9.1"
-  - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
-    inputs:
-      versionSpec: "1.3.2"
-  - task: geeklearningio.gl-vsts-tasks-yarn.yarn-task.Yarn@2
-    displayName: Yarn
-    inputs:
-      customRegistry: useFeed
-      customFeed: 'd28dd4e6-8e53-406e-8887-22f7c4dffd0c'
-  # - task: npmAuthenticate@0
-  #   displayName: NPM Authenticate
-  - powershell: |
-      yarn gulp electron
-    displayName: Download Electron
-  - powershell: |
-      yarn gulp hygiene
-    displayName: Run Hygiene Checks
-  - powershell: |
-      yarn check-monaco-editor-compilation
-    displayName: Run Monaco Editor Checks
-  - powershell: |
-      yarn compile
-    displayName: Compile Sources
-  - powershell: |
-      yarn download-builtin-extensions
-    displayName: Download Built-in Extensions
-  - powershell: |
-      .\scripts\test.bat --tfs
-    displayName: Run Unit Tests
-  - powershell: |
-      .\scripts\test-integration.bat
-    displayName: Run Integration Tests
-  - powershell: |
-      yarn smoketest --screenshots "$(Build.ArtifactStagingDirectory)\artifacts" --log "$(Build.ArtifactStagingDirectory)\artifacts\smoketest.log"
-    displayName: Run Smoke Tests
-  - task: PublishBuildArtifacts@1
-    inputs:
-      PathtoPublish: '$(Build.ArtifactStagingDirectory)/artifacts'
-      ArtifactName: build-artifacts-win32
-      publishLocation: Container
-    continueOnError: true
-    condition: succeededOrFailed()
+  - template: win32/continuous-build-win32.yml
 
-- phase: Linux
-  queue: Hosted Linux Preview
+- job: Linux
+  pool: Hosted Linux Preview
   steps:
-  - script: |
-      set -e
-      apt-get update
-      apt-get install -y libxkbfile-dev pkg-config libsecret-1-dev libxss1 libgconf-2-4 dbus xvfb libgtk-3-0
-      cp build/tfs/linux/x64/xvfb.init /etc/init.d/xvfb
-      chmod +x /etc/init.d/xvfb
-      update-rc.d xvfb defaults
-      ln -sf /bin/dbus-daemon /usr/bin/dbus-daemon
-      service xvfb start
-      service dbus start
-  - task: NodeTool@0
-    inputs:
-      versionSpec: "8.9.1"
-  - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
-    inputs:
-      versionSpec: "1.3.2"
-  - task: geeklearningio.gl-vsts-tasks-yarn.yarn-task.Yarn@2
-    displayName: Yarn
-    inputs:
-      customRegistry: useFeed
-      customFeed: 'd28dd4e6-8e53-406e-8887-22f7c4dffd0c'
-  # - task: npmAuthenticate@0
-  #   displayName: NPM Authenticate
-  - script: |
-      yarn gulp electron-x64
-    displayName: Download Electron
-  - script: |
-      yarn gulp hygiene
-    displayName: Run Hygiene Checks
-  - script: |
-      yarn check-monaco-editor-compilation
-    displayName: Run Monaco Editor Checks
-  - script: |
-      yarn compile
-    displayName: Compile Sources
-  - script: |
-      yarn download-builtin-extensions
-    displayName: Download Built-in Extensions
-  - script: |
-      DISPLAY=:10 ./scripts/test.sh --tfs
-    displayName: Run Unit Tests
+  - template: linux/continuous-build-linux.yml
 
-- phase: macOS
-  queue: Hosted macOS Preview
+- job: macOS
+  pool:
+    vmImage: macOS 10.13
   steps:
-  - task: NodeTool@0
-    inputs:
-      versionSpec: "8.9.1"
-  - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
-    inputs:
-      versionSpec: "1.3.2"
-  - task: geeklearningio.gl-vsts-tasks-yarn.yarn-task.Yarn@2
-    displayName: Yarn
-    inputs:
-      customRegistry: useFeed
-      customFeed: 'd28dd4e6-8e53-406e-8887-22f7c4dffd0c'
-  # - task: npmAuthenticate@0
-  #   displayName: NPM Authenticate
-  - script: |
-      yarn gulp electron-x64
-    displayName: Download Electron
-  - script: |
-      yarn gulp hygiene
-    displayName: Run Hygiene Checks
-  - script: |
-      yarn check-monaco-editor-compilation
-    displayName: Run Monaco Editor Checks
-  - script: |
-      yarn compile
-    displayName: Compile Sources
-  - script: |
-      yarn download-builtin-extensions
-    displayName: Download Built-in Extensions
-  - script: |
-      ./scripts/test.sh --tfs
-    displayName: Run Unit Tests
-  - script: |
-      ./scripts/test-integration.sh
-    displayName: Run Integration Tests
-  - script: |
-      yarn smoketest --screenshots "$(Build.ArtifactStagingDirectory)/artifacts" --log "$(Build.ArtifactStagingDirectory)/artifacts/smoketest.log"
-    displayName: Run Smoke Tests
-  - task: PublishBuildArtifacts@1
-    inputs:
-      PathtoPublish: '$(Build.ArtifactStagingDirectory)/artifacts'
-      ArtifactName: build-artifacts-darwin
-      publishLocation: Container
-    continueOnError: true
-    condition: succeededOrFailed()
\ No newline at end of file
+  - template: darwin/continuous-build-darwin.yml
\ No newline at end of file
diff --git a/build/tfs/darwin/continuous-build-darwin.yml b/build/tfs/darwin/continuous-build-darwin.yml
new file mode 100644
index 00000000000..9d3f6254cd6
--- /dev/null
+++ b/build/tfs/darwin/continuous-build-darwin.yml
@@ -0,0 +1,48 @@
+steps:
+- task: NodeTool@0
+  inputs:
+    versionSpec: "8.9.1"
+- task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
+  inputs:
+    versionSpec: "1.9.4"
+- script: |
+    yarn
+  displayName: Install Dependencies
+- script: |
+    yarn gulp electron-x64
+  displayName: Download Electron
+- script: |
+    yarn gulp hygiene
+  displayName: Run Hygiene Checks
+- script: |
+    yarn monaco-compile-check
+  displayName: Run Monaco Editor Checks
+- script: |
+    yarn compile
+  displayName: Compile Sources
+- script: |
+    yarn download-builtin-extensions
+  displayName: Download Built-in Extensions
+- script: |
+    ./scripts/test.sh --tfs "Unit Tests"
+  displayName: Run Unit Tests
+- script: |
+    ./scripts/test-integration.sh --tfs "Integration Tests"
+  displayName: Run Integration Tests
+- script: |
+    yarn smoketest --screenshots "$(Build.ArtifactStagingDirectory)/artifacts" --log "$(Build.ArtifactStagingDirectory)/artifacts/smoketest.log"
+  displayName: Run Smoke Tests
+  continueOnError: true
+- task: PublishBuildArtifacts@1
+  displayName: Publish Smoketest Artifacts
+  inputs:
+    PathtoPublish: '$(Build.ArtifactStagingDirectory)/artifacts'
+    ArtifactName: build-artifacts-darwin
+    publishLocation: Container
+  condition: eq(variables['System.PullRequest.IsFork'], 'False')
+- task: PublishTestResults@2
+  displayName: Publish Tests Results
+  inputs:
+    testResultsFiles: '*-results.xml'
+    searchFolder: '$(Build.ArtifactStagingDirectory)/test-results'
+  condition: succeededOrFailed()
\ No newline at end of file
diff --git a/build/tfs/darwin/enqueue.js b/build/tfs/darwin/enqueue.js
index 3b870657134..2de6022e1fe 100644
--- a/build/tfs/darwin/enqueue.js
+++ b/build/tfs/darwin/enqueue.js
@@ -18,8 +18,8 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
         while (_) try {
-            if (f = 1, y && (t = y[op[0] & 2 ? "return" : op[0] ? "throw" : "next"]) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [0, t.value];
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {
                 case 0: case 1: t = op; break;
                 case 4: _.label++; return { value: op[1], done: false };
diff --git a/build/tfs/darwin/product-build-darwin.yml b/build/tfs/darwin/product-build-darwin.yml
new file mode 100644
index 00000000000..b783a2b5270
--- /dev/null
+++ b/build/tfs/darwin/product-build-darwin.yml
@@ -0,0 +1,86 @@
+steps:
+- task: NodeTool@0
+  inputs:
+    versionSpec: "8.9.1"
+
+- task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
+  inputs:
+    versionSpec: "1.9.4"
+
+- script: |
+    set -e
+    echo "machine monacotools.visualstudio.com password $(VSO_PAT)" > ~/.netrc
+    yarn
+    yarn gulp -- hygiene
+    yarn monaco-compile-check
+    VSCODE_MIXIN_PASSWORD="$(VSCODE_MIXIN_PASSWORD)" yarn gulp -- mixin
+    node build/tfs/common/installDistro.js
+    node build/lib/builtInExtensions.js
+  displayName: Prepare build
+
+- script: |
+    set -e
+    VSCODE_MIXIN_PASSWORD="$(VSCODE_MIXIN_PASSWORD)" \
+    AZURE_STORAGE_ACCESS_KEY="$(AZURE_STORAGE_ACCESS_KEY)" \
+    yarn gulp -- vscode-darwin-min upload-vscode-sourcemaps
+  displayName: Build
+
+- script: |
+    set -e
+    ./scripts/test.sh --build --tfs "Unit Tests"
+    # APP_NAME="`ls $(agent.builddirectory)/VSCode-darwin | head -n 1`"
+    # yarn smoketest -- --build "$(agent.builddirectory)/VSCode-darwin/$APP_NAME"
+  displayName: Run unit tests
+
+- script: |
+    set -e
+    pushd ../VSCode-darwin && zip -r -X -y ../VSCode-darwin.zip * && popd
+  displayName: Archive build
+
+- task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
+  inputs:
+    ConnectedServiceName: 'ESRP CodeSign'
+    FolderPath: '$(agent.builddirectory)'
+    Pattern: 'VSCode-darwin.zip'
+    signConfigType: inlineSignParams
+    inlineOperation: |
+      [
+        {
+          "keyCode": "CP-401337-Apple",
+          "operationSetCode": "MacAppDeveloperSign",
+          "parameters": [ ],
+          "toolName": "sign",
+          "toolVersion": "1.0"
+        }
+      ]
+    SessionTimeout: 120
+  displayName: Codesign
+
+- script: |
+    set -e
+
+    # remove pkg from archive
+    zip -d ../VSCode-darwin.zip "*.pkg"
+
+    # publish the build
+    PACKAGEJSON=`ls ../VSCode-darwin/*.app/Contents/Resources/app/package.json`
+    VERSION=`node -p "require(\"$PACKAGEJSON\").version"`
+    AZURE_DOCUMENTDB_MASTERKEY="$(AZURE_DOCUMENTDB_MASTERKEY)" \
+    AZURE_STORAGE_ACCESS_KEY_2="$(AZURE_STORAGE_ACCESS_KEY_2)" \
+    MOONCAKE_STORAGE_ACCESS_KEY="$(MOONCAKE_STORAGE_ACCESS_KEY)" \
+    node build/tfs/common/publish.js \
+      "$(VSCODE_QUALITY)" \
+      darwin \
+      archive \
+      "VSCode-darwin-$(VSCODE_QUALITY).zip" \
+      $VERSION \
+      true \
+      ../VSCode-darwin.zip
+
+    # publish hockeyapp symbols
+    node build/tfs/common/symbols.js "$(VSCODE_MIXIN_PASSWORD)" "$(VSCODE_HOCKEYAPP_TOKEN)" "$(VSCODE_ARCH)" "$(VSCODE_HOCKEYAPP_ID_MACOS)"
+
+    # upload configuration
+    AZURE_STORAGE_ACCESS_KEY="$(AZURE_STORAGE_ACCESS_KEY)" \
+    yarn gulp -- upload-vscode-configuration
+  displayName: Publish
\ No newline at end of file
diff --git a/build/tfs/linux/continuous-build-linux.yml b/build/tfs/linux/continuous-build-linux.yml
new file mode 100644
index 00000000000..9c2e125447b
--- /dev/null
+++ b/build/tfs/linux/continuous-build-linux.yml
@@ -0,0 +1,44 @@
+steps:
+- script: |
+    set -e
+    apt-get update
+    apt-get install -y libxkbfile-dev pkg-config libsecret-1-dev libxss1 libgconf-2-4 dbus xvfb libgtk-3-0
+    cp build/tfs/linux/x64/xvfb.init /etc/init.d/xvfb
+    chmod +x /etc/init.d/xvfb
+    update-rc.d xvfb defaults
+    ln -sf /bin/dbus-daemon /usr/bin/dbus-daemon
+    service xvfb start
+    service dbus start
+- task: NodeTool@0
+  inputs:
+    versionSpec: "8.9.1"
+- task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
+  inputs:
+    versionSpec: "1.9.4"
+- script: |
+    yarn
+  displayName: Install Dependencies
+- script: |
+    yarn gulp electron-x64
+  displayName: Download Electron
+- script: |
+    yarn gulp hygiene
+  displayName: Run Hygiene Checks
+- script: |
+    yarn monaco-compile-check
+  displayName: Run Monaco Editor Checks
+- script: |
+    yarn compile
+  displayName: Compile Sources
+- script: |
+    yarn download-builtin-extensions
+  displayName: Download Built-in Extensions
+- script: |
+    DISPLAY=:10 ./scripts/test.sh --tfs "Unit Tests"
+  displayName: Run Unit Tests
+- task: PublishTestResults@2
+  displayName: Publish Tests Results
+  inputs:
+    testResultsFiles: '*-results.xml'
+    searchFolder: '$(Build.ArtifactStagingDirectory)/test-results'
+  condition: succeededOrFailed()
\ No newline at end of file
diff --git a/build/tfs/linux/frozen-check.ts b/build/tfs/linux/frozen-check.ts
index 489a24dc28a..c97d33b3953 100644
--- a/build/tfs/linux/frozen-check.ts
+++ b/build/tfs/linux/frozen-check.ts
@@ -39,4 +39,11 @@ function getConfig(quality: string): Promise<Config> {
 }
 
 getConfig(process.argv[2])
-	.then(c => console.log(c.frozen), e => console.error(e));
\ No newline at end of file
+	.then(config => {
+		console.log(config.frozen);
+		process.exit(0);
+	})
+	.catch(err => {
+		console.error(err);
+		process.exit(1);
+	});
\ No newline at end of file
diff --git a/build/tfs/linux/product-build-linux.yml b/build/tfs/linux/product-build-linux.yml
new file mode 100644
index 00000000000..3e1d2e8c9a7
--- /dev/null
+++ b/build/tfs/linux/product-build-linux.yml
@@ -0,0 +1,95 @@
+steps:
+- task: NodeTool@0
+  inputs:
+    versionSpec: "8.9.1"
+
+- task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
+  inputs:
+    versionSpec: "1.9.4"
+
+- script: |
+    set -e
+    export npm_config_arch="$(VSCODE_ARCH)"
+    if [[ "$(VSCODE_ARCH)" == "ia32" ]]; then
+      export PKG_CONFIG_PATH="/usr/lib/i386-linux-gnu/pkgconfig"
+    fi
+
+    echo "machine monacotools.visualstudio.com password $(VSO_PAT)" > ~/.netrc
+    yarn
+    npm run gulp -- hygiene
+    npm run monaco-compile-check
+    VSCODE_MIXIN_PASSWORD="$(VSCODE_MIXIN_PASSWORD)" npm run gulp -- mixin
+    node build/tfs/common/installDistro.js
+    node build/lib/builtInExtensions.js
+
+- script: |
+    set -e
+    VSCODE_MIXIN_PASSWORD="$(VSCODE_MIXIN_PASSWORD)" npm run gulp -- vscode-linux-$(VSCODE_ARCH)-min
+  name: build
+
+- script: |
+    set -e
+    npm run gulp -- "electron-$(VSCODE_ARCH)"
+
+    # xvfb seems to be crashing often, let's make sure it's always up
+    service xvfb start
+
+    DISPLAY=:10 ./scripts/test.sh --build --tfs "Unit Tests"
+    # yarn smoketest -- --build "$(agent.builddirectory)/VSCode-linux-$(VSCODE_ARCH)"
+  name: test
+
+- script: |
+    set -e
+    REPO="$(pwd)"
+    ROOT="$REPO/.."
+    ARCH="$(VSCODE_ARCH)"
+
+    # Publish tarball
+    PLATFORM_LINUX="linux-$(VSCODE_ARCH)"
+    [[ "$ARCH" == "ia32" ]] && DEB_ARCH="i386" || DEB_ARCH="amd64"
+    [[ "$ARCH" == "ia32" ]] && RPM_ARCH="i386" || RPM_ARCH="x86_64"
+    BUILDNAME="VSCode-$PLATFORM_LINUX"
+    BUILD="$ROOT/$BUILDNAME"
+    BUILD_VERSION="$(date +%s)"
+    [ -z "$VSCODE_QUALITY" ] && TARBALL_FILENAME="code-$BUILD_VERSION.tar.gz" || TARBALL_FILENAME="code-$VSCODE_QUALITY-$BUILD_VERSION.tar.gz"
+    TARBALL_PATH="$ROOT/$TARBALL_FILENAME"
+    PACKAGEJSON="$BUILD/resources/app/package.json"
+    VERSION=$(node -p "require(\"$PACKAGEJSON\").version")
+
+    rm -rf $ROOT/code-*.tar.*
+    (cd $ROOT && tar -czf $TARBALL_PATH $BUILDNAME)
+
+    AZURE_DOCUMENTDB_MASTERKEY="$(AZURE_DOCUMENTDB_MASTERKEY)" \
+    AZURE_STORAGE_ACCESS_KEY_2="$(AZURE_STORAGE_ACCESS_KEY_2)" \
+    MOONCAKE_STORAGE_ACCESS_KEY="$(MOONCAKE_STORAGE_ACCESS_KEY)" \
+    node build/tfs/common/publish.js "$VSCODE_QUALITY" "$PLATFORM_LINUX" archive-unsigned "$TARBALL_FILENAME" "$VERSION" true "$TARBALL_PATH"
+
+    # Publish hockeyapp symbols
+    node build/tfs/common/symbols.js "$(VSCODE_MIXIN_PASSWORD)" "$(VSCODE_HOCKEYAPP_TOKEN)" "$(VSCODE_ARCH)" "$(VSCODE_HOCKEYAPP_ID_LINUX64)"
+
+    # Publish DEB
+    npm run gulp -- "vscode-linux-$(VSCODE_ARCH)-build-deb"
+    PLATFORM_DEB="linux-deb-$ARCH"
+    [[ "$ARCH" == "ia32" ]] && DEB_ARCH="i386" || DEB_ARCH="amd64"
+    DEB_FILENAME="$(ls $REPO/.build/linux/deb/$DEB_ARCH/deb/)"
+    DEB_PATH="$REPO/.build/linux/deb/$DEB_ARCH/deb/$DEB_FILENAME"
+
+    AZURE_DOCUMENTDB_MASTERKEY="$(AZURE_DOCUMENTDB_MASTERKEY)" \
+    AZURE_STORAGE_ACCESS_KEY_2="$(AZURE_STORAGE_ACCESS_KEY_2)" \
+    MOONCAKE_STORAGE_ACCESS_KEY="$(MOONCAKE_STORAGE_ACCESS_KEY)" \
+    node build/tfs/common/publish.js "$VSCODE_QUALITY" "$PLATFORM_DEB" package "$DEB_FILENAME" "$VERSION" true "$DEB_PATH"
+
+    # Publish RPM
+    npm run gulp -- "vscode-linux-$(VSCODE_ARCH)-build-rpm"
+    PLATFORM_RPM="linux-rpm-$ARCH"
+    [[ "$ARCH" == "ia32" ]] && RPM_ARCH="i386" || RPM_ARCH="x86_64"
+    RPM_FILENAME="$(ls $REPO/.build/linux/rpm/$RPM_ARCH/ | grep .rpm)"
+    RPM_PATH="$REPO/.build/linux/rpm/$RPM_ARCH/$RPM_FILENAME"
+
+    AZURE_DOCUMENTDB_MASTERKEY="$(AZURE_DOCUMENTDB_MASTERKEY)" \
+    AZURE_STORAGE_ACCESS_KEY_2="$(AZURE_STORAGE_ACCESS_KEY_2)" \
+    MOONCAKE_STORAGE_ACCESS_KEY="$(MOONCAKE_STORAGE_ACCESS_KEY)" \
+    node build/tfs/common/publish.js "$VSCODE_QUALITY" "$PLATFORM_RPM" package "$RPM_FILENAME" "$VERSION" true "$RPM_PATH"
+
+    # SNAP_FILENAME="$(ls $REPO/.build/linux/snap/$ARCH/ | grep .snap)"
+    # SNAP_PATH="$REPO/.build/linux/snap/$ARCH/$SNAP_FILENAME"
diff --git a/build/tfs/linux/release.sh b/build/tfs/linux/release.sh
deleted file mode 100755
index ad74ce0a385..00000000000
--- a/build/tfs/linux/release.sh
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/bin/bash
-set -e
-
-# Arguments
-ARCH="$1"
-LINUX_REPO_PASSWORD="$2"
-
-# Variables
-PLATFORM_LINUX="linux-$ARCH"
-PLATFORM_DEB="linux-deb-$ARCH"
-PLATFORM_RPM="linux-rpm-$ARCH"
-[[ "$ARCH" == "ia32" ]] && DEB_ARCH="i386" || DEB_ARCH="amd64"
-[[ "$ARCH" == "ia32" ]] && RPM_ARCH="i386" || RPM_ARCH="x86_64"
-REPO="`pwd`"
-ROOT="$REPO/.."
-BUILDNAME="VSCode-$PLATFORM_LINUX"
-BUILD="$ROOT/$BUILDNAME"
-BUILD_VERSION="$(ls $REPO/.build/linux/deb/$DEB_ARCH/deb/ | sed -e 's/code-[a-z]*_//g' -e 's/\.deb$//g')"
-[ -z "$VSCODE_QUALITY" ] && TARBALL_FILENAME="code-$BUILD_VERSION.tar.gz" || TARBALL_FILENAME="code-$VSCODE_QUALITY-$BUILD_VERSION.tar.gz"
-TARBALL_PATH="$ROOT/$TARBALL_FILENAME"
-PACKAGEJSON="$BUILD/resources/app/package.json"
-VERSION=$(node -p "require(\"$PACKAGEJSON\").version")
-
-rm -rf $ROOT/code-*.tar.*
-(cd $ROOT && tar -czf $TARBALL_PATH $BUILDNAME)
-
-node build/tfs/common/publish.js $VSCODE_QUALITY $PLATFORM_LINUX archive-unsigned $TARBALL_FILENAME $VERSION true $TARBALL_PATH
-
-DEB_FILENAME="$(ls $REPO/.build/linux/deb/$DEB_ARCH/deb/)"
-DEB_PATH="$REPO/.build/linux/deb/$DEB_ARCH/deb/$DEB_FILENAME"
-
-node build/tfs/common/publish.js $VSCODE_QUALITY $PLATFORM_DEB package $DEB_FILENAME $VERSION true $DEB_PATH
-
-RPM_FILENAME="$(ls $REPO/.build/linux/rpm/$RPM_ARCH/ | grep .rpm)"
-RPM_PATH="$REPO/.build/linux/rpm/$RPM_ARCH/$RPM_FILENAME"
-
-node build/tfs/common/publish.js $VSCODE_QUALITY $PLATFORM_RPM package $RPM_FILENAME $VERSION true $RPM_PATH
-
-# SNAP_FILENAME="$(ls $REPO/.build/linux/snap/$ARCH/ | grep .snap)"
-# SNAP_PATH="$REPO/.build/linux/snap/$ARCH/$SNAP_FILENAME"
-
-IS_FROZEN="$(node build/tfs/linux/frozen-check.js $VSCODE_QUALITY)"
-
-if [ -z "$VSCODE_QUALITY" ]; then
-	echo "VSCODE_QUALITY is not set, skipping repo package publish"
-elif [ "$IS_FROZEN" = "true" ]; then
-	echo "$VSCODE_QUALITY is frozen, skipping repo package publish"
-else
-	if [ "$BUILD_SOURCEBRANCH" = "master" ] || [ "$BUILD_SOURCEBRANCH" = "refs/heads/master" ]; then
-		if [[ $BUILD_QUEUEDBY = *"Project Collection Service Accounts"* || $BUILD_QUEUEDBY = *"Microsoft.VisualStudio.Services.TFS"* ]]; then
-			# Write config files needed by API, use eval to force environment variable expansion
-			pushd build/tfs/linux
-			# Submit to apt repo
-			if [ "$DEB_ARCH" = "amd64" ]; then
-				eval echo '{ \"server\": \"azure-apt-cat.cloudapp.net\", \"protocol\": \"https\", \"port\": \"443\", \"repositoryId\": \"58a4adf642421134a1a48d1a\", \"username\": \"vscode\", \"password\": \"$LINUX_REPO_PASSWORD\" }' > apt-config.json
-
-				./repoapi_client.sh -config apt-config.json -addfile $DEB_PATH
-			fi
-			# Submit to yum repo (disabled as it's manual until signing is automated)
-			# eval echo '{ \"server\": \"azure-apt-cat.cloudapp.net\", \"protocol\": \"https\", \"port\": \"443\", \"repositoryId\": \"58a4ae3542421134a1a48d1b\", \"username\": \"vscode\", \"password\": \"$LINUX_REPO_PASSWORD\" }' > yum-config.json
-
-			# ./repoapi_client.sh -config yum-config.json -addfile $RPM_PATH
-			popd
-			echo "To check repo publish status run ./repoapi_client.sh -config config.json -check <id>"
-		fi
-	fi
-fi
diff --git a/build/tfs/product-build.yml b/build/tfs/product-build.yml
index 35f64ea2dad..b437720a43a 100644
--- a/build/tfs/product-build.yml
+++ b/build/tfs/product-build.yml
@@ -1,413 +1,41 @@
-phases:
-- phase: Windows
+jobs:
+- job: Windows
   condition: eq(variables['VSCODE_BUILD_WIN32'], 'true')
-  queue:
-    name: Hosted VS2017
-    parallel: 2
-    matrix:
-      x64:
-        VSCODE_ARCH: x64
-      ia32:
-        VSCODE_ARCH: ia32
-
-  steps:
-  - task: NodeTool@0
-    inputs:
-      versionSpec: "8.9.1"
-
-  - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
-    inputs:
-      versionSpec: "1.3.2"
-
-  - powershell: |
-      $ErrorActionPreference = "Stop"
-      "machine monacotools.visualstudio.com password $(VSO_PAT)" | Out-File "$env:USERPROFILE\_netrc" -Encoding ASCII
-      $env:npm_config_arch="$(VSCODE_ARCH)"
-      $env:CHILD_CONCURRENCY="1"
-      yarn
-      npm run gulp -- hygiene
-      npm run monaco-compile-check
-      $env:VSCODE_MIXIN_PASSWORD="$(VSCODE_MIXIN_PASSWORD)"
-      npm run gulp -- mixin
-      node build/tfs/common/installDistro.js
-      node build/lib/builtInExtensions.js
-
-  - powershell: |
-      $ErrorActionPreference = "Stop"
-      $env:VSCODE_MIXIN_PASSWORD="$(VSCODE_MIXIN_PASSWORD)"
-      npm run gulp -- "vscode-win32-$(VSCODE_ARCH)-min"
-      npm run gulp -- "vscode-win32-$(VSCODE_ARCH)-copy-inno-updater"
-    name: build
-
-  - powershell: |
-      $ErrorActionPreference = "Stop"
-      npm run gulp -- "electron-$(VSCODE_ARCH)"
-      .\scripts\test.bat --build --tfs
-      # yarn smoketest -- --build "$(agent.builddirectory)\VSCode-win32-$(VSCODE_ARCH)"
-    name: test
-
-  - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
-    inputs:
-      ConnectedServiceName: 'ESRP CodeSign'
-      FolderPath: '$(agent.builddirectory)/VSCode-win32-$(VSCODE_ARCH)'
-      Pattern: '*.dll,*.exe,*.node'
-      signConfigType: inlineSignParams
-      inlineOperation: |
-        [
-          {
-            "keyCode": "CP-229803",
-            "operationSetCode": "SigntoolSign",
-            "parameters": [
-              {
-                "parameterName": "OpusName",
-                "parameterValue": "VS Code"
-              },
-              {
-                "parameterName": "OpusInfo",
-                "parameterValue": "https://code.visualstudio.com/"
-              },
-              {
-                "parameterName": "PageHash",
-                "parameterValue": "/NPH"
-              },
-              {
-                "parameterName": "TimeStamp",
-                "parameterValue": "/t \"http://ts4096.gtm.microsoft.com/TSS/AuthenticodeTS\""
-              }
-            ],
-            "toolName": "sign",
-            "toolVersion": "1.0"
-          },
-          {
-            "keyCode": "CP-230012",
-            "operationSetCode": "SigntoolSign",
-            "parameters": [
-              {
-                "parameterName": "OpusName",
-                "parameterValue": "VS Code"
-              },
-              {
-                "parameterName": "OpusInfo",
-                "parameterValue": "https://code.visualstudio.com/"
-              },
-              {
-                "parameterName": "Append",
-                "parameterValue": "/as"
-              },
-              {
-                "parameterName": "FileDigest",
-                "parameterValue": "/fd \"SHA256\""
-              },
-              {
-                "parameterName": "PageHash",
-                "parameterValue": "/NPH"
-              },
-              {
-                "parameterName": "TimeStamp",
-                "parameterValue": "/tr \"http://rfc3161.gtm.corp.microsoft.com/TSS/HttpTspServer\" /td sha256"
-              }
-            ],
-            "toolName": "sign",
-            "toolVersion": "1.0"
-          },
-          {
-            "keyCode": "CP-230012",
-            "operationSetCode": "SigntoolVerify",
-            "parameters": [
-              {
-                "parameterName": "VerifyAll",
-                "parameterValue": "/all"
-              }
-            ],
-            "toolName": "sign",
-            "toolVersion": "1.0"
-          }
-        ]
-      SessionTimeout: 120
-
-  - powershell: |
-      $ErrorActionPreference = "Stop"
-      npm run gulp -- "vscode-win32-$(VSCODE_ARCH)-archive" "vscode-win32-$(VSCODE_ARCH)-setup"
-
-  - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
-    inputs:
-      ConnectedServiceName: 'ESRP CodeSign'
-      FolderPath: '$(agent.builddirectory)'
-      Pattern: VSCodeSetup.exe
-      signConfigType: inlineSignParams
-      inlineOperation: |
-        [
-          {
-            "keyCode": "CP-229803",
-            "operationSetCode": "SigntoolSign",
-            "parameters": [
-              {
-                "parameterName": "OpusName",
-                "parameterValue": "VS Code"
-              },
-              {
-                "parameterName": "OpusInfo",
-                "parameterValue": "https://code.visualstudio.com/"
-              },
-              {
-                "parameterName": "PageHash",
-                "parameterValue": "/NPH"
-              },
-              {
-                "parameterName": "TimeStamp",
-                "parameterValue": "/t \"http://ts4096.gtm.microsoft.com/TSS/AuthenticodeTS\""
-              }
-            ],
-            "toolName": "sign",
-            "toolVersion": "1.0"
-          },
-          {
-            "keyCode": "CP-230012",
-            "operationSetCode": "SigntoolSign",
-            "parameters": [
-              {
-                "parameterName": "OpusName",
-                "parameterValue": "VS Code"
-              },
-              {
-                "parameterName": "OpusInfo",
-                "parameterValue": "https://code.visualstudio.com/"
-              },
-              {
-                "parameterName": "Append",
-                "parameterValue": "/as"
-              },
-              {
-                "parameterName": "FileDigest",
-                "parameterValue": "/fd \"SHA256\""
-              },
-              {
-                "parameterName": "PageHash",
-                "parameterValue": "/NPH"
-              },
-              {
-                "parameterName": "TimeStamp",
-                "parameterValue": "/tr \"http://rfc3161.gtm.corp.microsoft.com/TSS/HttpTspServer\" /td sha256"
-              }
-            ],
-            "toolName": "sign",
-            "toolVersion": "1.0"
-          },
-          {
-            "keyCode": "CP-230012",
-            "operationSetCode": "SigntoolVerify",
-            "parameters": [
-              {
-                "parameterName": "VerifyAll",
-                "parameterValue": "/all"
-              }
-            ],
-            "toolName": "sign",
-            "toolVersion": "1.0"
-          }
-        ]
-      SessionTimeout: 120
-
-  - powershell: |
-      $ErrorActionPreference = "Stop"
-      $Repo = "$(pwd)"
-      $Root = "$Repo\.."
-      $Exe = "$Repo\.build\win32-$(VSCODE_ARCH)\setup\VSCodeSetup.exe"
-      $Zip = "$Repo\.build\win32-$(VSCODE_ARCH)\archive\VSCode-win32-$(VSCODE_ARCH).zip"
-      $Build = "$Root\VSCode-win32-$(VSCODE_ARCH)"
-
-      # get version
-      $PackageJson = Get-Content -Raw -Path "$Build\resources\app\package.json" | ConvertFrom-Json
-      $Version = $PackageJson.version
-      $Quality = "$env:VSCODE_QUALITY"
-      $env:AZURE_STORAGE_ACCESS_KEY_2 = "$(AZURE_STORAGE_ACCESS_KEY_2)"
-      $env:MOONCAKE_STORAGE_ACCESS_KEY = "$(MOONCAKE_STORAGE_ACCESS_KEY)"
-      $env:AZURE_DOCUMENTDB_MASTERKEY = "$(AZURE_DOCUMENTDB_MASTERKEY)"
-
-      $assetPlatform = if ("$(VSCODE_ARCH)" -eq "ia32") { "win32" } else { "win32-x64" }
-
-      node build/tfs/common/publish.js $Quality "$global:assetPlatform-archive" archive "VSCode-win32-$(VSCODE_ARCH)-$Version.zip" $Version true $Zip
-      node build/tfs/common/publish.js $Quality "$global:assetPlatform" setup "VSCodeSetup-$(VSCODE_ARCH)-$Version.exe" $Version true $Exe
-
-      # publish hockeyapp symbols
-      $hockeyAppId = if ("$(VSCODE_ARCH)" -eq "ia32") { "$(VSCODE_HOCKEYAPP_ID_WIN32)" } else { "$(VSCODE_HOCKEYAPP_ID_WIN64)" }
-      node build/tfs/common/symbols.js "$(VSCODE_MIXIN_PASSWORD)" "$(VSCODE_HOCKEYAPP_TOKEN)" "$(VSCODE_ARCH)" $hockeyAppId
-
-- phase: Linux
-  condition: eq(variables['VSCODE_BUILD_LINUX'], 'true')
-  queue: linux-x64
+  pool:
+    vmImage: VS2017-Win2016
   variables:
     VSCODE_ARCH: x64
-
   steps:
-  - task: NodeTool@0
-    inputs:
-      versionSpec: "8.9.1"
+  - template: win32/product-build-win32.yml
 
-  - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
-    inputs:
-      versionSpec: "1.3.2"
-
-  - script: |
-      set -e
-      export npm_config_arch="$(VSCODE_ARCH)"
-      if [[ "$(VSCODE_ARCH)" == "ia32" ]]; then
-        export PKG_CONFIG_PATH="/usr/lib/i386-linux-gnu/pkgconfig"
-      fi
-
-      echo "machine monacotools.visualstudio.com password $(VSO_PAT)" > ~/.netrc
-      yarn
-      npm run gulp -- hygiene
-      npm run monaco-compile-check
-      VSCODE_MIXIN_PASSWORD="$(VSCODE_MIXIN_PASSWORD)" npm run gulp -- mixin
-      node build/tfs/common/installDistro.js
-      node build/lib/builtInExtensions.js
-
-  - script: |
-      set -e
-      VSCODE_MIXIN_PASSWORD="$(VSCODE_MIXIN_PASSWORD)" npm run gulp -- vscode-linux-$(VSCODE_ARCH)-min
-    name: build
-
-  - script: |
-      set -e
-      npm run gulp -- "electron-$(VSCODE_ARCH)"
-      DISPLAY=:10 ./scripts/test.sh --build --tfs
-      # yarn smoketest -- --build "$(agent.builddirectory)/VSCode-linux-$(VSCODE_ARCH)"
-    name: test
-
-  - script: |
-      set -e
-      npm run gulp -- "vscode-linux-$(VSCODE_ARCH)-build-deb"
-      npm run gulp -- "vscode-linux-$(VSCODE_ARCH)-build-rpm"
-      #npm run gulp -- "vscode-linux-$(VSCODE_ARCH)-build-snap"
-
-      AZURE_DOCUMENTDB_MASTERKEY="$(AZURE_DOCUMENTDB_MASTERKEY)" \
-      AZURE_STORAGE_ACCESS_KEY_2="$(AZURE_STORAGE_ACCESS_KEY_2)" \
-      MOONCAKE_STORAGE_ACCESS_KEY="$(MOONCAKE_STORAGE_ACCESS_KEY)" \
-      ./build/tfs/linux/release2.sh "$(VSCODE_ARCH)" "$(LINUX_REPO_PASSWORD)"
-
-      # publish hockeyapp symbols
-      node build/tfs/common/symbols.js "$(VSCODE_MIXIN_PASSWORD)" "$(VSCODE_HOCKEYAPP_TOKEN)" "$(VSCODE_ARCH)" "$(VSCODE_HOCKEYAPP_ID_LINUX64)"
-
-- phase: Linux32
-  condition: eq(variables['VSCODE_BUILD_LINUX'], 'true')
-  queue: linux-ia32
+- job: Windows32
+  condition: eq(variables['VSCODE_BUILD_WIN32_32BIT'], 'true')
+  pool:
+    vmImage: VS2017-Win2016
   variables:
     VSCODE_ARCH: ia32
-
   steps:
-  - task: NodeTool@0
-    inputs:
-      versionSpec: "8.9.1"
+  - template: win32/product-build-win32.yml
 
-  - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
-    inputs:
-      versionSpec: "1.3.2"
+- job: Linux
+  condition: eq(variables['VSCODE_BUILD_LINUX'], 'true')
+  pool: linux-x64
+  variables:
+    VSCODE_ARCH: x64
+  steps:
+  - template: linux/product-build-linux.yml
 
-  - script: |
-      set -e
-      export npm_config_arch="$(VSCODE_ARCH)"
-      if [[ "$(VSCODE_ARCH)" == "ia32" ]]; then
-        export PKG_CONFIG_PATH="/usr/lib/i386-linux-gnu/pkgconfig"
-      fi
+- job: Linux32
+  condition: eq(variables['VSCODE_BUILD_LINUX_32BIT'], 'true')
+  pool: linux-ia32
+  variables:
+    VSCODE_ARCH: ia32
+  steps:
+  - template: linux/product-build-linux.yml
 
-      echo "machine monacotools.visualstudio.com password $(VSO_PAT)" > ~/.netrc
-      yarn
-      npm run gulp -- hygiene
-      npm run monaco-compile-check
-      VSCODE_MIXIN_PASSWORD="$(VSCODE_MIXIN_PASSWORD)" npm run gulp -- mixin
-      node build/tfs/common/installDistro.js
-      node build/lib/builtInExtensions.js
-
-  - script: |
-      set -e
-      VSCODE_MIXIN_PASSWORD="$(VSCODE_MIXIN_PASSWORD)" npm run gulp -- vscode-linux-$(VSCODE_ARCH)-min
-    name: build
-
-  - script: |
-      set -e
-      npm run gulp -- "electron-$(VSCODE_ARCH)"
-      DISPLAY=:10 ./scripts/test.sh --build --tfs
-      # yarn smoketest -- --build "$(agent.builddirectory)/VSCode-linux-$(VSCODE_ARCH)"
-    name: test
-
-  - script: |
-      set -e
-      npm run gulp -- "vscode-linux-$(VSCODE_ARCH)-build-deb"
-      npm run gulp -- "vscode-linux-$(VSCODE_ARCH)-build-rpm"
-      #npm run gulp -- "vscode-linux-$(VSCODE_ARCH)-build-snap"
-
-      AZURE_DOCUMENTDB_MASTERKEY="$(AZURE_DOCUMENTDB_MASTERKEY)" \
-      AZURE_STORAGE_ACCESS_KEY_2="$(AZURE_STORAGE_ACCESS_KEY_2)" \
-      MOONCAKE_STORAGE_ACCESS_KEY="$(MOONCAKE_STORAGE_ACCESS_KEY)" \
-      ./build/tfs/linux/release.sh "$(VSCODE_ARCH)" "$(LINUX_REPO_PASSWORD)"
-
-      # publish hockeyapp symbols
-      node build/tfs/common/symbols.js "$(VSCODE_MIXIN_PASSWORD)" "$(VSCODE_HOCKEYAPP_TOKEN)" "$(VSCODE_ARCH)" "$(VSCODE_HOCKEYAPP_ID_LINUX32)"
-
-- phase: macOS
+- job: macOS
   condition: eq(variables['VSCODE_BUILD_MACOS'], 'true')
-  queue: Hosted macOS Preview
+  pool:
+    vmImage: macOS 10.13
   steps:
-  - task: NodeTool@0
-    inputs:
-      versionSpec: "8.9.1"
-
-  - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
-    inputs:
-      versionSpec: "1.3.2"
-
-  - script: |
-      set -e
-      echo "machine monacotools.visualstudio.com password $(VSO_PAT)" > ~/.netrc
-      yarn
-      npm run gulp -- hygiene
-      npm run monaco-compile-check
-      VSCODE_MIXIN_PASSWORD="$(VSCODE_MIXIN_PASSWORD)" npm run gulp -- mixin
-      node build/tfs/common/installDistro.js
-      node build/lib/builtInExtensions.js
-
-  - script: |
-      set -e
-      VSCODE_MIXIN_PASSWORD="$(VSCODE_MIXIN_PASSWORD)" \
-      AZURE_STORAGE_ACCESS_KEY="$(AZURE_STORAGE_ACCESS_KEY)" \
-      npm run gulp -- vscode-darwin-min upload-vscode-sourcemaps
-    name: build
-
-  - script: |
-      set -e
-      ./scripts/test.sh --build --tfs
-      APP_NAME="`ls $(agent.builddirectory)/VSCode-darwin | head -n 1`"
-      # yarn smoketest -- --build "$(agent.builddirectory)/VSCode-darwin/$APP_NAME"
-    name: test
-
-  - script: |
-      set -e
-      # archive the unsigned build
-      pushd ../VSCode-darwin && zip -r -X -y ../VSCode-darwin-unsigned.zip * && popd
-
-      # publish the unsigned build
-      PACKAGEJSON=`ls ../VSCode-darwin/*.app/Contents/Resources/app/package.json`
-      VERSION=`node -p "require(\"$PACKAGEJSON\").version"`
-      AZURE_DOCUMENTDB_MASTERKEY="$(AZURE_DOCUMENTDB_MASTERKEY)" \
-      AZURE_STORAGE_ACCESS_KEY_2="$(AZURE_STORAGE_ACCESS_KEY_2)" \
-      MOONCAKE_STORAGE_ACCESS_KEY="$(MOONCAKE_STORAGE_ACCESS_KEY)" \
-      node build/tfs/common/publish.js \
-        "$(VSCODE_QUALITY)" \
-        darwin \
-        archive-unsigned \
-        "VSCode-darwin-$(VSCODE_QUALITY)-unsigned.zip" \
-        $VERSION \
-        false \
-        ../VSCode-darwin-unsigned.zip
-
-      # publish hockeyapp symbols
-      node build/tfs/common/symbols.js "$(VSCODE_MIXIN_PASSWORD)" "$(VSCODE_HOCKEYAPP_TOKEN)" "$(VSCODE_ARCH)" "$(VSCODE_HOCKEYAPP_ID_MACOS)"
-
-      # enqueue the unsigned build
-      AZURE_DOCUMENTDB_MASTERKEY="$(AZURE_DOCUMENTDB_MASTERKEY)" \
-      AZURE_STORAGE_ACCESS_KEY_2="$(AZURE_STORAGE_ACCESS_KEY_2)" \
-      node build/tfs/darwin/enqueue.js "$(VSCODE_QUALITY)"
-
-      AZURE_STORAGE_ACCESS_KEY="$(AZURE_STORAGE_ACCESS_KEY)" \
-      npm run gulp -- upload-vscode-configuration
\ No newline at end of file
+  - template: darwin/product-build-darwin.yml
\ No newline at end of file
diff --git a/build/tfs/win32/ESRPClient/NuGet.config b/build/tfs/win32/ESRPClient/NuGet.config
new file mode 100644
index 00000000000..6d6da347fd2
--- /dev/null
+++ b/build/tfs/win32/ESRPClient/NuGet.config
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+    <packageSources>
+        <add key="ESRP" value="https://microsoft.pkgs.visualstudio.com/_packaging/ESRP/nuget/v3/index.json" />
+    </packageSources>
+</configuration>
\ No newline at end of file
diff --git a/build/tfs/win32/ESRPClient/packages.config b/build/tfs/win32/ESRPClient/packages.config
new file mode 100644
index 00000000000..d7a6f144f47
--- /dev/null
+++ b/build/tfs/win32/ESRPClient/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="EsrpClient" version="1.0.27" />
+</packages>
diff --git a/build/tfs/win32/continuous-build-win32.yml b/build/tfs/win32/continuous-build-win32.yml
new file mode 100644
index 00000000000..780c9a0e197
--- /dev/null
+++ b/build/tfs/win32/continuous-build-win32.yml
@@ -0,0 +1,48 @@
+steps:
+- task: NodeTool@0
+  inputs:
+    versionSpec: "8.9.1"
+- task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
+  inputs:
+    versionSpec: "1.9.4"
+- powershell: |
+    yarn
+  displayName: Install Dependencies
+- powershell: |
+    yarn gulp electron
+  displayName: Download Electron
+- powershell: |
+    yarn gulp hygiene
+  displayName: Run Hygiene Checks
+- powershell: |
+    yarn monaco-compile-check
+  displayName: Run Monaco Editor Checks
+- powershell: |
+    yarn compile
+  displayName: Compile Sources
+- powershell: |
+    yarn download-builtin-extensions
+  displayName: Download Built-in Extensions
+- powershell: |
+    .\scripts\test.bat --tfs "Unit Tests"
+  displayName: Run Unit Tests
+- powershell: |
+    .\scripts\test-integration.bat --tfs "Integration Tests"
+  displayName: Run Integration Tests
+- powershell: |
+    yarn smoketest --screenshots "$(Build.ArtifactStagingDirectory)\artifacts" --log "$(Build.ArtifactStagingDirectory)\artifacts\smoketest.log"
+  displayName: Run Smoke Tests
+  continueOnError: true
+- task: PublishBuildArtifacts@1
+  displayName: Publish Smoketest Artifacts
+  inputs:
+    PathtoPublish: '$(Build.ArtifactStagingDirectory)/artifacts'
+    ArtifactName: build-artifacts-win32
+    publishLocation: Container
+  condition: eq(variables['System.PullRequest.IsFork'], 'False')
+- task: PublishTestResults@2
+  displayName: Publish Tests Results
+  inputs:
+    testResultsFiles: '*-results.xml'
+    searchFolder: '$(Build.ArtifactStagingDirectory)/test-results'
+  condition: succeededOrFailed()
diff --git a/build/tfs/win32/exec.ps1 b/build/tfs/win32/exec.ps1
new file mode 100644
index 00000000000..826cefdf7dd
--- /dev/null
+++ b/build/tfs/win32/exec.ps1
@@ -0,0 +1,24 @@
+# Taken from psake https://github.com/psake/psake
+
+<#
+.SYNOPSIS
+  This is a helper function that runs a scriptblock and checks the PS variable $lastexitcode
+  to see if an error occcured. If an error is detected then an exception is thrown.
+  This function allows you to run command-line programs without having to
+  explicitly check the $lastexitcode variable.
+
+.EXAMPLE
+  exec { svn info $repository_trunk } "Error executing SVN. Please verify SVN command-line client is installed"
+#>
+function Exec
+{
+	[CmdletBinding()]
+	param(
+		[Parameter(Position=0,Mandatory=1)][scriptblock]$cmd,
+		[Parameter(Position=1,Mandatory=0)][string]$errorMessage = ($msgs.error_bad_command -f $cmd)
+	)
+	& $cmd
+	if ($lastexitcode -ne 0) {
+		throw ("Exec: " + $errorMessage)
+	}
+}
\ No newline at end of file
diff --git a/build/tfs/win32/import-esrp-auth-cert.ps1 b/build/tfs/win32/import-esrp-auth-cert.ps1
new file mode 100644
index 00000000000..c345c780231
--- /dev/null
+++ b/build/tfs/win32/import-esrp-auth-cert.ps1
@@ -0,0 +1,14 @@
+Param(
+  [string]$AuthCertificateBase64,
+  [string]$AuthCertificateKey
+)
+
+# Import auth certificate
+$AuthCertificateFileName = [System.IO.Path]::GetTempFileName()
+$AuthCertificateBytes = [Convert]::FromBase64String($AuthCertificateBase64)
+[IO.File]::WriteAllBytes($AuthCertificateFileName, $AuthCertificateBytes)
+$AuthCertificate = Import-PfxCertificate -FilePath $AuthCertificateFileName -CertStoreLocation Cert:\LocalMachine\My -Password (ConvertTo-SecureString $AuthCertificateKey -AsPlainText -Force)
+rm $AuthCertificateFileName
+$ESRPAuthCertificateSubjectName = $AuthCertificate.Subject
+
+Write-Output ("##vso[task.setvariable variable=ESRPAuthCertificateSubjectName;]$ESRPAuthCertificateSubjectName")
\ No newline at end of file
diff --git a/build/tfs/win32/product-build-win32.yml b/build/tfs/win32/product-build-win32.yml
new file mode 100644
index 00000000000..31288bdbdda
--- /dev/null
+++ b/build/tfs/win32/product-build-win32.yml
@@ -0,0 +1,166 @@
+steps:
+- task: NodeTool@0
+  inputs:
+    versionSpec: "8.9.1"
+
+- task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
+  inputs:
+    versionSpec: "1.9.4"
+
+- powershell: |
+    . build/tfs/win32/exec.ps1
+    $ErrorActionPreference = "Stop"
+    "machine monacotools.visualstudio.com password $(VSO_PAT)" | Out-File "$env:USERPROFILE\_netrc" -Encoding ASCII
+    $env:npm_config_arch="$(VSCODE_ARCH)"
+    $env:CHILD_CONCURRENCY="1"
+    $env:VSCODE_MIXIN_PASSWORD="$(VSCODE_MIXIN_PASSWORD)"
+    exec { yarn }
+    exec { npm run gulp -- hygiene }
+    exec { npm run monaco-compile-check }
+    exec { npm run gulp -- mixin }
+    exec { node build/tfs/common/installDistro.js }
+    exec { node build/lib/builtInExtensions.js }
+
+- powershell: |
+    . build/tfs/win32/exec.ps1
+    $ErrorActionPreference = "Stop"
+    $env:VSCODE_MIXIN_PASSWORD="$(VSCODE_MIXIN_PASSWORD)"
+    exec { npm run gulp -- "vscode-win32-$(VSCODE_ARCH)-min" }
+    exec { npm run gulp -- "vscode-win32-$(VSCODE_ARCH)-copy-inno-updater" }
+  name: build
+
+- powershell: |
+    . build/tfs/win32/exec.ps1
+    $ErrorActionPreference = "Stop"
+    exec { npm run gulp -- "electron-$(VSCODE_ARCH)" }
+    exec { .\scripts\test.bat --build --tfs "Unit Tests" }
+    # yarn smoketest -- --build "$(agent.builddirectory)\VSCode-win32-$(VSCODE_ARCH)"
+  name: test
+
+- task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
+  inputs:
+    ConnectedServiceName: 'ESRP CodeSign'
+    FolderPath: '$(agent.builddirectory)/VSCode-win32-$(VSCODE_ARCH)'
+    Pattern: '*.dll,*.exe,*.node'
+    signConfigType: inlineSignParams
+    inlineOperation: |
+      [
+        {
+          "keyCode": "CP-229803",
+          "operationSetCode": "SigntoolSign",
+          "parameters": [
+            {
+              "parameterName": "OpusName",
+              "parameterValue": "VS Code"
+            },
+            {
+              "parameterName": "OpusInfo",
+              "parameterValue": "https://code.visualstudio.com/"
+            },
+            {
+              "parameterName": "PageHash",
+              "parameterValue": "/NPH"
+            },
+            {
+              "parameterName": "TimeStamp",
+              "parameterValue": "/t \"http://ts4096.gtm.microsoft.com/TSS/AuthenticodeTS\""
+            }
+          ],
+          "toolName": "sign",
+          "toolVersion": "1.0"
+        },
+        {
+          "keyCode": "CP-230012",
+          "operationSetCode": "SigntoolSign",
+          "parameters": [
+            {
+              "parameterName": "OpusName",
+              "parameterValue": "VS Code"
+            },
+            {
+              "parameterName": "OpusInfo",
+              "parameterValue": "https://code.visualstudio.com/"
+            },
+            {
+              "parameterName": "Append",
+              "parameterValue": "/as"
+            },
+            {
+              "parameterName": "FileDigest",
+              "parameterValue": "/fd \"SHA256\""
+            },
+            {
+              "parameterName": "PageHash",
+              "parameterValue": "/NPH"
+            },
+            {
+              "parameterName": "TimeStamp",
+              "parameterValue": "/tr \"http://rfc3161.gtm.corp.microsoft.com/TSS/HttpTspServer\" /td sha256"
+            }
+          ],
+          "toolName": "sign",
+          "toolVersion": "1.0"
+        },
+        {
+          "keyCode": "CP-230012",
+          "operationSetCode": "SigntoolVerify",
+          "parameters": [
+            {
+              "parameterName": "VerifyAll",
+              "parameterValue": "/all"
+            }
+          ],
+          "toolName": "sign",
+          "toolVersion": "1.0"
+        }
+      ]
+    SessionTimeout: 120
+
+- task: NuGetCommand@2
+  displayName: Install ESRPClient.exe
+  inputs:
+    restoreSolution: 'build\tfs\win32\ESRPClient\packages.config'
+    feedsToUse: config
+    nugetConfigPath: 'build\tfs\win32\ESRPClient\NuGet.config'
+    externalFeedCredentials: 3fc0b7f7-da09-4ae7-a9c8-d69824b1819b
+    restoreDirectory: packages
+
+- task: ESRPImportCertTask@1
+  displayName: Import ESRP Request Signing Certificate
+  inputs:
+    ESRP: 'ESRP CodeSign'
+
+- powershell: |
+    $ErrorActionPreference = "Stop"
+    .\build\tfs\win32\import-esrp-auth-cert.ps1 -AuthCertificateBase64 $(ESRP_AUTH_CERTIFICATE) -AuthCertificateKey $(ESRP_AUTH_CERTIFICATE_KEY)
+  displayName: Import ESRP Auth Certificate
+
+- powershell: |
+    . build/tfs/win32/exec.ps1
+    $ErrorActionPreference = "Stop"
+    exec { npm run gulp -- "vscode-win32-$(VSCODE_ARCH)-archive" "vscode-win32-$(VSCODE_ARCH)-system-setup" "vscode-win32-$(VSCODE_ARCH)-user-setup" }
+
+    $Repo = "$(pwd)"
+    $Root = "$Repo\.."
+    $SystemExe = "$Repo\.build\win32-$(VSCODE_ARCH)\system-setup\VSCodeSetup.exe"
+    $UserExe = "$Repo\.build\win32-$(VSCODE_ARCH)\user-setup\VSCodeSetup.exe"
+    $Zip = "$Repo\.build\win32-$(VSCODE_ARCH)\archive\VSCode-win32-$(VSCODE_ARCH).zip"
+    $Build = "$Root\VSCode-win32-$(VSCODE_ARCH)"
+
+    # get version
+    $PackageJson = Get-Content -Raw -Path "$Build\resources\app\package.json" | ConvertFrom-Json
+    $Version = $PackageJson.version
+    $Quality = "$env:VSCODE_QUALITY"
+    $env:AZURE_STORAGE_ACCESS_KEY_2 = "$(AZURE_STORAGE_ACCESS_KEY_2)"
+    $env:MOONCAKE_STORAGE_ACCESS_KEY = "$(MOONCAKE_STORAGE_ACCESS_KEY)"
+    $env:AZURE_DOCUMENTDB_MASTERKEY = "$(AZURE_DOCUMENTDB_MASTERKEY)"
+
+    $assetPlatform = if ("$(VSCODE_ARCH)" -eq "ia32") { "win32" } else { "win32-x64" }
+
+    exec { node build/tfs/common/publish.js $Quality "$global:assetPlatform-archive" archive "VSCode-win32-$(VSCODE_ARCH)-$Version.zip" $Version true $Zip }
+    exec { node build/tfs/common/publish.js $Quality "$global:assetPlatform" setup "VSCodeSetup-$(VSCODE_ARCH)-$Version.exe" $Version true $SystemExe }
+    exec { node build/tfs/common/publish.js $Quality "$global:assetPlatform-user" setup "VSCodeUserSetup-$(VSCODE_ARCH)-$Version.exe" $Version true $UserExe }
+
+    # publish hockeyapp symbols
+    $hockeyAppId = if ("$(VSCODE_ARCH)" -eq "ia32") { "$(VSCODE_HOCKEYAPP_ID_WIN32)" } else { "$(VSCODE_HOCKEYAPP_ID_WIN64)" }
+    exec { node build/tfs/common/symbols.js "$(VSCODE_MIXIN_PASSWORD)" "$(VSCODE_HOCKEYAPP_TOKEN)" "$(VSCODE_ARCH)" $hockeyAppId }
diff --git a/build/tfs/win32/sign.ps1 b/build/tfs/win32/sign.ps1
new file mode 100644
index 00000000000..d888a7d104f
--- /dev/null
+++ b/build/tfs/win32/sign.ps1
@@ -0,0 +1,82 @@
+function Create-TmpJson($Obj) {
+	$FileName = [System.IO.Path]::GetTempFileName()
+	ConvertTo-Json -Depth 100 $Obj | Out-File -Encoding UTF8 $FileName
+	return $FileName
+}
+
+$Auth = Create-TmpJson @{
+	Version = "1.0.0"
+	AuthenticationType = "AAD_CERT"
+	ClientId = $env:ESRPClientId
+	AuthCert = @{
+		SubjectName = $env:ESRPAuthCertificateSubjectName
+		StoreLocation = "LocalMachine"
+		StoreName = "My"
+	}
+	RequestSigningCert = @{
+		SubjectName = $env:ESRPCertificateSubjectName
+		StoreLocation = "LocalMachine"
+		StoreName = "My"
+	}
+}
+
+$Policy = Create-TmpJson @{
+	Version = "1.0.0"
+}
+
+$Input = Create-TmpJson @{
+	Version = "1.0.0"
+	SignBatches = @(
+		@{
+			SourceLocationType = "UNC"
+			SignRequestFiles = @(
+				@{
+					SourceLocation = $args[0]
+				}
+			)
+			SigningInfo = @{
+				Operations = @(
+					@{
+						KeyCode = "CP-229803"
+						OperationCode = "SigntoolSign"
+						Parameters = @{
+							OpusName = "VS Code"
+							OpusInfo = "https://code.visualstudio.com/"
+							PageHash = "/NPH"
+							TimeStamp = "/t `"http://ts4096.gtm.microsoft.com/TSS/AuthenticodeTS`""
+						}
+						ToolName = "sign"
+						ToolVersion = "1.0"
+					},
+					@{
+						KeyCode = "CP-230012"
+						OperationCode = "SigntoolSign"
+						Parameters = @{
+							OpusName = "VS Code"
+							OpusInfo = "https://code.visualstudio.com/"
+							Append = "/as"
+							FileDigest = "/fd `"SHA256`""
+							PageHash = "/NPH"
+							TimeStamp = "/tr `"http://rfc3161.gtm.corp.microsoft.com/TSS/HttpTspServer`" /td sha256"
+						}
+						ToolName = "sign"
+						ToolVersion = "1.0"
+					},
+					@{
+						KeyCode = "CP-230012"
+						OperationCode = "SigntoolVerify"
+						Parameters = @{
+							VerifyAll = "/all"
+						}
+						ToolName = "sign"
+						ToolVersion = "1.0"
+					}
+				)
+			}
+		}
+	)
+}
+
+$Output = [System.IO.Path]::GetTempFileName()
+$ScriptPath = Split-Path -Path $MyInvocation.MyCommand.Definition -Parent
+& "$ScriptPath\ESRPClient\packages\EsrpClient.1.0.27\tools\ESRPClient.exe" Sign -a $Auth -p $Policy -i $Input -o $Output
\ No newline at end of file
diff --git a/build/tsconfig.json b/build/tsconfig.json
index d60805e7f77..b2cc8c8a0ab 100644
--- a/build/tsconfig.json
+++ b/build/tsconfig.json
@@ -6,6 +6,7 @@
 		"removeComments": false,
 		"preserveConstEnums": true,
 		"sourceMap": false,
+		"resolveJsonModule": true,
 		"experimentalDecorators": true,
 		// enable JavaScript type checking for the language service
 		// use the tsconfig.build.json for compiling wich disable JavaScript
diff --git a/build/win32/.gitignore b/build/win32/.gitignore
new file mode 100644
index 00000000000..809f6a264e9
--- /dev/null
+++ b/build/win32/.gitignore
@@ -0,0 +1 @@
+code-processed.iss
\ No newline at end of file
diff --git a/build/win32/OSSREADME.json b/build/win32/OSSREADME.json
old mode 100755
new mode 100644
index 5e1078b9519..0635d4a1e9f
--- a/build/win32/OSSREADME.json
+++ b/build/win32/OSSREADME.json
@@ -547,7 +547,34 @@
 	},
 	{
 		"name": "retep998/winapi-rs",
-		"version": "0.3.4",
+		"version": "0.1.1",
+		"repositoryUrl": "https://github.com/retep998/winapi-rs",
+		"licenseDetail": [
+			"Copyright (c) 2015 The winapi-rs Developers",
+			"",
+			"Permission is hereby granted, free of charge, to any person obtaining a copy",
+			"of this software and associated documentation files (the \"Software\"), to deal",
+			"in the Software without restriction, including without limitation the rights",
+			"to use, copy, modify, merge, publish, distribute, sublicense, and/or sell",
+			"copies of the Software, and to permit persons to whom the Software is",
+			"furnished to do so, subject to the following conditions:",
+			"",
+			"The above copyright notice and this permission notice shall be included in all",
+			"copies or substantial portions of the Software.",
+			"",
+			"THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR",
+			"IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,",
+			"FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE",
+			"AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER",
+			"LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,",
+			"OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE",
+			"SOFTWARE."
+		],
+		"isProd": true
+	},
+	{
+		"name": "retep998/winapi-rs",
+		"version": "0.2.2",
 		"repositoryUrl": "https://github.com/retep998/winapi-rs",
 		"licenseDetail": [
 			"Copyright (c) 2015 The winapi-rs Developers",
@@ -601,7 +628,7 @@
 	},
 	{
 		"name": "retep998/winapi-rs",
-		"version": "0.1.1",
+		"version": "0.3.4",
 		"repositoryUrl": "https://github.com/retep998/winapi-rs",
 		"licenseDetail": [
 			"Copyright (c) 2015 The winapi-rs Developers",
@@ -680,33 +707,6 @@
 		],
 		"isProd": true
 	},
-	{
-		"name": "retep998/winapi-rs",
-		"version": "0.2.2",
-		"repositoryUrl": "https://github.com/retep998/winapi-rs",
-		"licenseDetail": [
-			"Copyright (c) 2015 The winapi-rs Developers",
-			"",
-			"Permission is hereby granted, free of charge, to any person obtaining a copy",
-			"of this software and associated documentation files (the \"Software\"), to deal",
-			"in the Software without restriction, including without limitation the rights",
-			"to use, copy, modify, merge, publish, distribute, sublicense, and/or sell",
-			"copies of the Software, and to permit persons to whom the Software is",
-			"furnished to do so, subject to the following conditions:",
-			"",
-			"The above copyright notice and this permission notice shall be included in all",
-			"copies or substantial portions of the Software.",
-			"",
-			"THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR",
-			"IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,",
-			"FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE",
-			"AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER",
-			"LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,",
-			"OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE",
-			"SOFTWARE."
-		],
-		"isProd": true
-	},
 	{
 		"name": "rust-lang-nursery/lazy-static.rs",
 		"version": "1.0.0",
diff --git a/build/win32/code.iss b/build/win32/code.iss
index 9bc3329b03a..d9cf6e14dd7 100644
--- a/build/win32/code.iss
+++ b/build/win32/code.iss
@@ -11,7 +11,6 @@ AppPublisher=Microsoft Corporation
 AppPublisherURL=https://code.visualstudio.com/
 AppSupportURL=https://code.visualstudio.com/
 AppUpdatesURL=https://code.visualstudio.com/
-DefaultDirName={pf}\{#DirName}
 DefaultGroupName={#NameLong}
 AllowNoIcons=yes
 OutputDir={#OutputDir}
@@ -33,9 +32,17 @@ VersionInfoVersion={#RawVersion}
 ShowLanguageDialog=auto
 ArchitecturesAllowed={#ArchitecturesAllowed}
 ArchitecturesInstallIn64BitMode={#ArchitecturesInstallIn64BitMode}
+SignTool=esrp
+
+#if "user" == InstallTarget
+DefaultDirName={userpf}\{#DirName}
+PrivilegesRequired=lowest
+#else
+DefaultDirName={pf}\{#DirName}
+#endif
 
 [Languages]
-Name: "english"; MessagesFile: "compiler:Default.isl,{#RepoDir}\build\win32\i18n\messages.en.isl" {#LocalizedLanguageFile}
+Name: "english"; MessagesFile: "{#RepoDir}\build\win32\i18n\Default.isl,{#RepoDir}\build\win32\i18n\messages.en.isl" {#LocalizedLanguageFile}
 Name: "german"; MessagesFile: "compiler:Languages\German.isl,{#RepoDir}\build\win32\i18n\messages.de.isl" {#LocalizedLanguageFile("deu")}
 Name: "spanish"; MessagesFile: "compiler:Languages\Spanish.isl,{#RepoDir}\build\win32\i18n\messages.es.isl" {#LocalizedLanguageFile("esp")}
 Name: "french"; MessagesFile: "compiler:Languages\French.isl,{#RepoDir}\build\win32\i18n\messages.fr.isl" {#LocalizedLanguageFile("fra")}
@@ -68,8 +75,9 @@ Name: "addtopath"; Description: "{cm:AddToPath}"; GroupDescription: "{cm:Other}"
 Name: "runcode"; Description: "{cm:RunAfter,{#NameShort}}"; GroupDescription: "{cm:Other}"; Check: WizardSilent
 
 [Files]
-Source: "*"; Excludes: "\tools,\tools\*"; DestDir: "{code:GetDestDir}"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "*"; Excludes: "\CodeSignSummary*.md,\tools,\tools\*,\resources\app\product.json"; DestDir: "{code:GetDestDir}"; Flags: ignoreversion recursesubdirs createallsubdirs
 Source: "tools\*"; DestDir: "{app}\tools"; Flags: ignoreversion
+Source: "{#ProductJsonPath}"; DestDir: "{code:GetDestDir}\resources\app"; Flags: ignoreversion
 
 [Icons]
 Name: "{group}\{#NameLong}"; Filename: "{app}\{#ExeBasename}.exe"; AppUserModelID: "{#AppUserId}"
@@ -81,851 +89,870 @@ Filename: "{app}\{#ExeBasename}.exe"; Description: "{cm:LaunchProgram,{#NameLong
 Filename: "{app}\{#ExeBasename}.exe"; Description: "{cm:LaunchProgram,{#NameLong}}"; Flags: nowait postinstall; Check: WizardNotSilent
 
 [Registry]
-Root: HKCR; Subkey: ".ascx\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: ".ascx\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.ascx"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.ascx"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,ASCX}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.ascx"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.ascx\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.ascx\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCR; Subkey: ".asp\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: ".asp\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.asp"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.asp"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,ASP}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.asp"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.asp\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.asp\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCR; Subkey: ".aspx\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: ".aspx\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.aspx"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.aspx"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,ASPX}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.aspx"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.aspx\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.aspx\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCR; Subkey: ".bash\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: ".bash\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.bash"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.bash"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Bash}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.bash"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.bash\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.bash\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCR; Subkey: ".bash_login\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: ".bash_login\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.bash_login"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.bash_login"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Bash Login}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.bash_login"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.bash_login\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.bash_login\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCR; Subkey: ".bash_logout\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: ".bash_logout\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.bash_logout"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.bash_logout"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Bash Logout}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.bash_logout"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.bash_logout\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.bash_logout\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCR; Subkey: ".bash_profile\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: ".bash_profile\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.bash_profile"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.bash_profile"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Bash Profile}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.bash_profile"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.bash_profile\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.bash_profile\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCR; Subkey: ".bashrc\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: ".bashrc\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.bashrc"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.bashrc"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Bash RC}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.bashrc"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.bashrc\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.bashrc\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCR; Subkey: ".bib\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: ".bib\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.bib"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.bib"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,BibTeX}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.bib"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.bib\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.bib\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCR; Subkey: ".bowerrc\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: ".bowerrc\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.bowerrc"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.bowerrc"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Bower RC}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.bowerrc"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.bowerrc\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.bowerrc\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCR; Subkey: ".c\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: ".c\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.c"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.c"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,C}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.c"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.c\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.c\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCR; Subkey: ".cc\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: ".cc\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.cc"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.cc"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,C++}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.cc"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.cc\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.cc\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCR; Subkey: ".clj\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: ".clj\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.clj"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.clj"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Clojure}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.clj"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.clj\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.clj\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCR; Subkey: ".cljs\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: ".cljs\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.cljs"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.cljs"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,ClojureScript}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.cljs"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.cljs\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.cljs\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCR; Subkey: ".cljx\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: ".cljx\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.cljx"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.cljx"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,CLJX}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.cljx"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.cljx\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.cljx\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCR; Subkey: ".clojure\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: ".clojure\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.clojure"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.clojure"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Clojure}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.clojure"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.clojure\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.clojure\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCR; Subkey: ".code-workspace\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: ".code-workspace\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.code-workspace"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.code-workspace"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Code Workspace}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.code"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.code-workspace\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.code-workspace\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCR; Subkey: ".coffee\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: ".coffee\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.coffee"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.coffee"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,CoffeeScript}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.coffee"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.coffee\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.coffee\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCR; Subkey: ".config\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: ".config\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.config"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.config"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Configuration}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.config"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.config\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.config\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCR; Subkey: ".cpp\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: ".cpp\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.cpp"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.cpp"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,C++}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.cpp"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.cpp\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.cpp\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCR; Subkey: ".cs\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: ".cs\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.cs"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.cs"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,C#}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.cs"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.cs\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.cs\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCR; Subkey: ".cshtml\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: ".cshtml\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.cshtml"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.cshtml"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,CSHTML}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.cshtml"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.cshtml\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.cshtml\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCR; Subkey: ".csproj\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: ".csproj\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.csproj"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.csproj"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,C# Project}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.csproj"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.csproj\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.csproj\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCR; Subkey: ".css\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: ".css\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.css"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.css"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,CSS}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.css"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.css\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.css\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCR; Subkey: ".csx\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: ".csx\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.csx"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.csx"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,C# Script}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.csx"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.csx\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.csx\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCR; Subkey: ".ctp\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: ".ctp\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.ctp"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.ctp"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,CakePHP Template}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.ctp"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.ctp\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.ctp\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCR; Subkey: ".cxx\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: ".cxx\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.cxx"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.cxx"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,C++}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.cxx"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.cxx\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.cxx\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCR; Subkey: ".dockerfile\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: ".dockerfile\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.dockerfile"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.dockerfile"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Dockerfile}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.dockerfile"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.dockerfile\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.dockerfile\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCR; Subkey: ".dot\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: ".dot\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.dot"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.dot"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Dot}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.dot"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.dot\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.dot\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCR; Subkey: ".dtd\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: ".dtd\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.dtd"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.dtd"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Document Type Definition}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.dtd"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.dtd\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.dtd\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCR; Subkey: ".editorconfig\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: ".editorconfig\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.editorconfig"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.editorconfig"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Editor Config}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.editorconfig"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.editorconfig\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.editorconfig\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCR; Subkey: ".edn\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: ".edn\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.edn"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.edn"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Extensible Data Notation}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.edn"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.edn\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.edn\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCR; Subkey: ".eyaml\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: ".eyaml\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.eyaml"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.eyaml"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Hiera Eyaml}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.eyaml"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.eyaml\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.eyaml\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCR; Subkey: ".eyml\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: ".eyml\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.eyml"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.eyml"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Hiera Eyaml}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.eyml"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.eyml\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.eyml\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCR; Subkey: ".fs\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: ".fs\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.fs"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.fs"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,F#}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.fs"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.fs\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.fs\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCR; Subkey: ".fsi\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: ".fsi\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.fsi"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.fsi"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,F# Signature}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.fsi"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.fsi\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.fsi\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCR; Subkey: ".fsscript\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: ".fsscript\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.fsscript"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.fsscript"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,F# Script}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.fsscript"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.fsscript\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.fsscript\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCR; Subkey: ".fsx\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: ".fsx\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.fsx"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.fsx"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,F# Script}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.fsx"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.fsx\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.fsx\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCR; Subkey: ".gemspec\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: ".gemspec\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.gemspec"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.gemspec"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Gemspec}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.gemspec"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.gemspec\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.gemspec\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCR; Subkey: ".gitattributes\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: ".gitattributes\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.gitattributes"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.gitattributes"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Git Attributes}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.gitattributes"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.gitattributes"; ValueType: string; ValueName: "AlwaysShowExt"; ValueData: ""; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.gitattributes\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.gitattributes\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCR; Subkey: ".gitconfig\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: ".gitconfig\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.gitconfig"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.gitconfig"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Git Config}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.gitconfig"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.gitconfig"; ValueType: string; ValueName: "AlwaysShowExt"; ValueData: ""; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.gitconfig\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.gitconfig\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCR; Subkey: ".gitignore\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: ".gitignore\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.gitignore"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.gitignore"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Git Ignore}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.gitignore"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.gitignore"; ValueType: string; ValueName: "AlwaysShowExt"; ValueData: ""; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.gitignore\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.gitignore\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCR; Subkey: ".go\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: ".go\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.go"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.go"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Go}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.go"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.go\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.go\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCR; Subkey: ".h\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: ".h\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.h"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.h"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,C Header}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.h"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.h\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.h\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCR; Subkey: ".handlebars\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: ".handlebars\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.handlebars"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.handlebars"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Handlebars}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.handlebars"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.handlebars\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.handlebars\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCR; Subkey: ".hbs\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: ".hbs\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.hbs"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.hbs"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Handlebars}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.hbs"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.hbs\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.hbs\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCR; Subkey: ".hh\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: ".hh\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.hh"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.hh"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,C++ Header}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.hh"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.hh\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.hh\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCR; Subkey: ".hpp\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: ".hpp\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.hpp"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.hpp"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,C++ Header}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.hpp"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.hpp\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.hpp\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCR; Subkey: ".htm\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: ".htm\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.htm"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.htm"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,HTML}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.htm"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.htm\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.htm\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCR; Subkey: ".html\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: ".html\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.html"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.html"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,HTML}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.html"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.html\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.html\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCR; Subkey: ".hxx\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: ".hxx\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.hxx"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.hxx"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,C++ Header}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.hxx"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.hxx\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.hxx\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCR; Subkey: ".ini\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: ".ini\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.ini"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.ini"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,INI}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.ini"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.ini\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.ini\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCR; Subkey: ".jade\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: ".jade\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.jade"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.jade"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Jade}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.jade"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.jade\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.jade\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCR; Subkey: ".jav\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: ".jav\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.jav"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.jav"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Java}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.jav"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.jav\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.jav\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCR; Subkey: ".java\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: ".java\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.java"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.java"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Java}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.java"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.java\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.java\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCR; Subkey: ".js\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: ".js\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.js"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.js"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,JavaScript}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.js"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.js\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.js\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCR; Subkey: ".jscsrc\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: ".jscsrc\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.jscsrc"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.jscsrc"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,JSCS RC}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.jscsrc"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.jscsrc\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.jscsrc\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCR; Subkey: ".jshintrc\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: ".jshintrc\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.jshintrc"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.jshintrc"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,JSHint RC}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.jshintrc"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.jshintrc\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.jshintrc\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCR; Subkey: ".jshtm\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: ".jshtm\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.jshtm"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.jshtm"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,JavaScript HTML Template}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.jshtm"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.jshtm\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.jshtm\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCR; Subkey: ".json\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: ".json\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.json"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.json"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,JSON}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.json"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.json\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.json\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCR; Subkey: ".jsp\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: ".jsp\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.jsp"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.jsp"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Java Server Pages}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.jsp"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.jsp\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.jsp\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCR; Subkey: ".less\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: ".less\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.less"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.less"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,LESS}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.less"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.less\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.less\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCR; Subkey: ".lua\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: ".lua\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.lua"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.lua"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Lua}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.lua"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.lua\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.lua\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCR; Subkey: ".m\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: ".m\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.m"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.m"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Objective C}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.m"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.m\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.m\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCR; Subkey: ".makefile\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: ".makefile\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.makefile"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.makefile"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Makefile}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.makefile"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.makefile\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.makefile\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCR; Subkey: ".markdown\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: ".markdown\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.markdown"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.markdown"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Markdown}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.markdown"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.markdown\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.markdown\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCR; Subkey: ".md\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: ".md\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.md"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.md"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Markdown}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.md"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.md\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.md\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCR; Subkey: ".mdoc\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: ".mdoc\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.mdoc"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.mdoc"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,MDoc}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.mdoc"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.mdoc\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.mdoc\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCR; Subkey: ".mdown\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: ".mdown\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.mdown"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.mdown"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Markdown}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.mdown"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.mdown\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.mdown\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCR; Subkey: ".mdtext\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: ".mdtext\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.mdtext"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.mdtext"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Markdown}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.mdtext"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.mdtext\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.mdtext\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCR; Subkey: ".mdtxt\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: ".mdtxt\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.mdtxt"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.mdtxt"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Markdown}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.mdtxt"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.mdtxt\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.mdtxt\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCR; Subkey: ".mdwn\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: ".mdwn\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.mdwn"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.mdwn"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Markdown}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.mdwn"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.mdwn\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.mdwn\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCR; Subkey: ".mkd\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: ".mkd\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.mkd"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.mkd"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Markdown}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.mkd"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.mkd\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.mkd\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCR; Subkey: ".mkdn\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: ".mkdn\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.mkdn"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.mkdn"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Markdown}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.mkdn"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.mkdn\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.mkdn\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCR; Subkey: ".ml\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: ".ml\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.ml"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.ml"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,OCaml}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.ml"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.ml\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.ml\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCR; Subkey: ".mli\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: ".mli\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.mli"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.mli"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,OCaml}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.mli"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.mli\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.mli\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCR; Subkey: ".npmignore\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: ".npmignore\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.npmignore"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.npmignore"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,NPM Ignore}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.npmignore"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.npmignore"; ValueType: string; ValueName: "AlwaysShowExt"; ValueData: ""; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.npmignore\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.npmignore\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCR; Subkey: ".php\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: ".php\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.php"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.php"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,PHP}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.php"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.php\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.php\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCR; Subkey: ".phtml\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: ".phtml\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.phtml"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.phtml"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,PHP HTML}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.phtml"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.phtml\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.phtml\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCR; Subkey: ".pl\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: ".pl\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.pl"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.pl"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Perl}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.pl"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.pl\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.pl\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCR; Subkey: ".pl6\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: ".pl6\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.pl6"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.pl6"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Perl 6}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.pl6"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.pl6\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.pl6\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCR; Subkey: ".pm\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: ".pm\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.pm"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.pm"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Perl Module}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.pm"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.pm\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.pm\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCR; Subkey: ".pm6\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: ".pm6\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.pm6"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.pm6"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Perl 6 Module}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.pm6"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.pm6\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.pm6\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCR; Subkey: ".pod\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: ".pod\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.pod"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.pod"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Perl POD}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.pod"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.pod\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.pod\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCR; Subkey: ".pp\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: ".pp\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.pp"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.pp"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Perl}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.pp"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.pp\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.pp\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCR; Subkey: ".profile\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: ".profile\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.profile"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.profile"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Profile}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.profile"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.profile\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.profile\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCR; Subkey: ".properties\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: ".properties\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.properties"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.properties"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Properties}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.properties"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.properties\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.properties\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCR; Subkey: ".ps1\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: ".ps1\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.ps1"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.ps1"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,PowerShell}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.ps1"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.ps1\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.ps1\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCR; Subkey: ".psd1\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: ".psd1\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.psd1"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.psd1"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,PowerShell Module Manifest}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.psd1"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.psd1\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.psd1\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCR; Subkey: ".psgi\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: ".psgi\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.psgi"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.psgi"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Perl CGI}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.psgi"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.psgi\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.psgi\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCR; Subkey: ".psm1\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: ".psm1\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.psm1"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.psm1"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,PowerShell Module}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.psm1"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.psm1\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.psm1\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCR; Subkey: ".py\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: ".py\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.py"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.py"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Python}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.py"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.py\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.py\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCR; Subkey: ".r\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: ".r\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.r"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.r"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,R}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.r"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.r\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.r\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCR; Subkey: ".rb\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: ".rb\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.rb"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.rb"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Ruby}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.rb"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.rb\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.rb\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCR; Subkey: ".rhistory\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: ".rhistory\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.rhistory"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.rhistory"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,R History}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.rhistory"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.rhistory\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.rhistory\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCR; Subkey: ".rprofile\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: ".rprofile\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.rprofile"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.rprofile"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,R Profile}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.rprofile"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.rprofile\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.rprofile\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCR; Subkey: ".rs\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: ".rs\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.rs"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.rs"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Rust}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.rs"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.rs\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.rs\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCR; Subkey: ".rt\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: ".rt\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.rt"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.rt"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Rich Text}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.rt"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.rt\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.rt\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCR; Subkey: ".scss\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: ".scss\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.scss"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.scss"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Sass}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.scss"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.scss\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.scss\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCR; Subkey: ".sh\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: ".sh\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.sh"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.sh"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,SH}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.sh"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.sh\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.sh\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCR; Subkey: ".shtml\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: ".shtml\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.shtml"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.shtml"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,SHTML}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.shtml"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.shtml\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.shtml\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCR; Subkey: ".sql\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: ".sql\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.sql"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.sql"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,SQL}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.sql"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.sql\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.sql\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCR; Subkey: ".svg\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: ".svg\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.svg"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.svg"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,SVG}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.svg"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.svg\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.svg\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCR; Subkey: ".svgz\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: ".svgz\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.svgz"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.svgz"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,SVGZ}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.svgz"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.svgz\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.svgz\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCR; Subkey: ".t\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: ".t\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.t"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.t"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Perl}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.t"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.t\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.t\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCR; Subkey: ".tex\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: ".tex\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.tex"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.tex"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,LaTeX}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.tex"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.tex\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.tex\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCR; Subkey: ".ts\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: ".ts\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.ts"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.ts"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,TypeScript}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.ts"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.ts\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.ts\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCR; Subkey: ".txt\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: ".txt\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.txt"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.txt"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Text}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.txt"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.txt\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.txt\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCR; Subkey: ".vb\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: ".vb\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.vb"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.vb"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Visual Basic}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.vb"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.vb\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.vb\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCR; Subkey: ".wxi\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: ".wxi\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.wxi"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.wxi"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,WiX Include}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.wxi"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.wxi\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.wxi\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCR; Subkey: ".wxl\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: ".wxl\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.wxl"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.wxl"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,WiX Localization}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.wxl"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.wxl\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.wxl\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCR; Subkey: ".wxs\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: ".wxs\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.wxs"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.wxs"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,WiX}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.wxs"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.wxs\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.wxs\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCR; Subkey: ".xaml\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: ".xaml\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.xaml"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.xaml"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,XAML}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.xaml"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.xaml\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.xaml\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCR; Subkey: ".xml\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: ".xml\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.xml"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.xml"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,XML}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.xml"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.xml\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.xml\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCR; Subkey: ".yaml\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: ".yaml\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.yaml"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.yaml"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Yaml}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.yaml"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.yaml\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.yaml\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCR; Subkey: ".yml\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: ".yml\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.yml"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.yml"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Yaml}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.yml"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.yml\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.yml\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCR; Subkey: ".zsh\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: ".zsh\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.zsh"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.zsh"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,ZSH}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.zsh"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.zsh\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
-Root: HKCR; Subkey: "{#RegValueName}.zsh\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCR; Subkey: "{#RegValueName}SourceFile"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,{#NameLong}}"; Flags: uninsdeletekey
-Root: HKCR; Subkey: "{#RegValueName}SourceFile\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"
-Root: HKCR; Subkey: "{#RegValueName}SourceFile\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""
-
-Root: HKCR; Subkey: "Applications\{#ExeBasename}.exe"; ValueType: none; ValueName: ""; Flags: uninsdeletekey
-Root: HKCR; Subkey: "Applications\{#ExeBasename}.exe\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"
-Root: HKCR; Subkey: "Applications\{#ExeBasename}.exe\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""
-
-Root: HKCU; Subkey: "Environment"; ValueType: expandsz; ValueName: "Path"; ValueData: "{olddata};{app}\bin"; Tasks: addtopath; Check: NeedsAddPath(ExpandConstant('{app}\bin'))
-
-Root: HKCU; Subkey: "SOFTWARE\Classes\*\shell\{#RegValueName}"; ValueType: expandsz; ValueName: ""; ValueData: "Open w&ith {#ShellNameShort}"; Tasks: addcontextmenufiles; Flags: uninsdeletekey
-Root: HKCU; Subkey: "SOFTWARE\Classes\*\shell\{#RegValueName}"; ValueType: expandsz; ValueName: "Icon"; ValueData: "{app}\{#ExeBasename}.exe"; Tasks: addcontextmenufiles
-Root: HKCU; Subkey: "SOFTWARE\Classes\*\shell\{#RegValueName}\command"; ValueType: expandsz; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: addcontextmenufiles
-Root: HKCU; Subkey: "SOFTWARE\Classes\directory\shell\{#RegValueName}"; ValueType: expandsz; ValueName: ""; ValueData: "Open w&ith {#ShellNameShort}"; Tasks: addcontextmenufolders; Flags: uninsdeletekey
-Root: HKCU; Subkey: "SOFTWARE\Classes\directory\shell\{#RegValueName}"; ValueType: expandsz; ValueName: "Icon"; ValueData: "{app}\{#ExeBasename}.exe"; Tasks: addcontextmenufolders
-Root: HKCU; Subkey: "SOFTWARE\Classes\directory\shell\{#RegValueName}\command"; ValueType: expandsz; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%V"""; Tasks: addcontextmenufolders
-Root: HKCU; Subkey: "SOFTWARE\Classes\directory\background\shell\{#RegValueName}"; ValueType: expandsz; ValueName: ""; ValueData: "Open w&ith {#ShellNameShort}"; Tasks: addcontextmenufolders; Flags: uninsdeletekey
-Root: HKCU; Subkey: "SOFTWARE\Classes\directory\background\shell\{#RegValueName}"; ValueType: expandsz; ValueName: "Icon"; ValueData: "{app}\{#ExeBasename}.exe"; Tasks: addcontextmenufolders
-Root: HKCU; Subkey: "SOFTWARE\Classes\directory\background\shell\{#RegValueName}\command"; ValueType: expandsz; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%V"""; Tasks: addcontextmenufolders
-Root: HKCU; Subkey: "SOFTWARE\Classes\Drive\shell\{#RegValueName}"; ValueType: expandsz; ValueName: ""; ValueData: "Open w&ith {#ShellNameShort}"; Tasks: addcontextmenufolders; Flags: uninsdeletekey
-Root: HKCU; Subkey: "SOFTWARE\Classes\Drive\shell\{#RegValueName}"; ValueType: expandsz; ValueName: "Icon"; ValueData: "{app}\{#ExeBasename}.exe"; Tasks: addcontextmenufolders
-Root: HKCU; Subkey: "SOFTWARE\Classes\Drive\shell\{#RegValueName}\command"; ValueType: expandsz; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%V"""; Tasks: addcontextmenufolders
+#if "user" == InstallTarget
+#define SoftwareClassesRootKey "HKCU"
+#else
+#define SoftwareClassesRootKey "HKLM"
+#endif
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.ascx\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.ascx\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.ascx"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.ascx"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,ASCX}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.ascx"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.ascx\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.ascx\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.asp\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.asp\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.asp"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.asp"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,ASP}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.asp"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.asp\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.asp\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.aspx\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.aspx\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.aspx"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.aspx"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,ASPX}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.aspx"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.aspx\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.aspx\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.bash\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.bash\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.bash"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.bash"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Bash}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.bash"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.bash\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.bash\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.bash_login\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.bash_login\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.bash_login"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.bash_login"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Bash Login}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.bash_login"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.bash_login\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.bash_login\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.bash_logout\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.bash_logout\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.bash_logout"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.bash_logout"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Bash Logout}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.bash_logout"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.bash_logout\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.bash_logout\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.bash_profile\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.bash_profile\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.bash_profile"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.bash_profile"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Bash Profile}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.bash_profile"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.bash_profile\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.bash_profile\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.bashrc\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.bashrc\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.bashrc"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.bashrc"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Bash RC}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.bashrc"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.bashrc\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.bashrc\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.bib\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.bib\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.bib"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.bib"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,BibTeX}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.bib"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.bib\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.bib\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.bowerrc\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.bowerrc\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.bowerrc"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.bowerrc"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Bower RC}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.bowerrc"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.bowerrc\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.bowerrc\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.c\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.c\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.c"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.c"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,C}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.c"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.c\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.c\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.cc\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.cc\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.cc"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.cc"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,C++}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.cc"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.cc\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.cc\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.clj\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.clj\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.clj"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.clj"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Clojure}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.clj"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.clj\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.clj\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.cljs\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.cljs\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.cljs"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.cljs"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,ClojureScript}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.cljs"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.cljs\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.cljs\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.cljx\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.cljx\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.cljx"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.cljx"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,CLJX}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.cljx"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.cljx\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.cljx\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.clojure\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.clojure\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.clojure"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.clojure"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Clojure}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.clojure"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.clojure\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.clojure\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.code-workspace\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.code-workspace\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.code-workspace"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.code-workspace"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Code Workspace}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.code"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.code-workspace\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.code-workspace\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.coffee\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.coffee\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.coffee"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.coffee"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,CoffeeScript}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.coffee"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.coffee\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.coffee\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.config\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.config\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.config"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.config"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Configuration}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.config"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.config\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.config\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.cpp\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.cpp\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.cpp"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.cpp"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,C++}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.cpp"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.cpp\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.cpp\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.cs\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.cs\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.cs"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.cs"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,C#}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.cs"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.cs\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.cs\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.cshtml\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.cshtml\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.cshtml"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.cshtml"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,CSHTML}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.cshtml"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.cshtml\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.cshtml\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.csproj\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.csproj\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.csproj"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.csproj"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,C# Project}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.csproj"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.csproj\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.csproj\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.css\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.css\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.css"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.css"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,CSS}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.css"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.css\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.css\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.csx\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.csx\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.csx"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.csx"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,C# Script}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.csx"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.csx\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.csx\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.ctp\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.ctp\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.ctp"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.ctp"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,CakePHP Template}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.ctp"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.ctp\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.ctp\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.cxx\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.cxx\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.cxx"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.cxx"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,C++}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.cxx"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.cxx\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.cxx\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.dockerfile\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.dockerfile\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.dockerfile"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.dockerfile"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Dockerfile}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.dockerfile"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.dockerfile\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.dockerfile\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.dot\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.dot\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.dot"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.dot"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Dot}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.dot"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.dot\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.dot\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.dtd\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.dtd\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.dtd"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.dtd"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Document Type Definition}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.dtd"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.dtd\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.dtd\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.editorconfig\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.editorconfig\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.editorconfig"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.editorconfig"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Editor Config}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.editorconfig"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.editorconfig\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.editorconfig\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.edn\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.edn\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.edn"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.edn"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Extensible Data Notation}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.edn"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.edn\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.edn\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.eyaml\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.eyaml\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.eyaml"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.eyaml"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Hiera Eyaml}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.eyaml"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.eyaml\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.eyaml\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.eyml\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.eyml\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.eyml"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.eyml"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Hiera Eyaml}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.eyml"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.eyml\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.eyml\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.fs\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.fs\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.fs"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.fs"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,F#}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.fs"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.fs\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.fs\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.fsi\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.fsi\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.fsi"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.fsi"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,F# Signature}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.fsi"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.fsi\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.fsi\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.fsscript\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.fsscript\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.fsscript"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.fsscript"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,F# Script}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.fsscript"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.fsscript\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.fsscript\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.fsx\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.fsx\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.fsx"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.fsx"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,F# Script}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.fsx"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.fsx\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.fsx\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.gemspec\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.gemspec\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.gemspec"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.gemspec"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Gemspec}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.gemspec"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.gemspec\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.gemspec\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.gitattributes\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.gitattributes\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.gitattributes"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.gitattributes"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Git Attributes}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.gitattributes"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.gitattributes"; ValueType: string; ValueName: "AlwaysShowExt"; ValueData: ""; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.gitattributes\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.gitattributes\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.gitconfig\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.gitconfig\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.gitconfig"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.gitconfig"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Git Config}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.gitconfig"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.gitconfig"; ValueType: string; ValueName: "AlwaysShowExt"; ValueData: ""; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.gitconfig\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.gitconfig\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.gitignore\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.gitignore\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.gitignore"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.gitignore"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Git Ignore}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.gitignore"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.gitignore"; ValueType: string; ValueName: "AlwaysShowExt"; ValueData: ""; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.gitignore\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.gitignore\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.go\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.go\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.go"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.go"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Go}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.go"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.go\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.go\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.h\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.h\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.h"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.h"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,C Header}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.h"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.h\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.h\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.handlebars\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.handlebars\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.handlebars"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.handlebars"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Handlebars}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.handlebars"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.handlebars\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.handlebars\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.hbs\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.hbs\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.hbs"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.hbs"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Handlebars}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.hbs"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.hbs\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.hbs\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.hh\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.hh\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.hh"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.hh"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,C++ Header}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.hh"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.hh\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.hh\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.hpp\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.hpp\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.hpp"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.hpp"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,C++ Header}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.hpp"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.hpp\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.hpp\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.htm\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.htm\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.htm"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.htm"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,HTML}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.htm"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.htm\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.htm\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.html\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.html\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.html"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.html"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,HTML}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.html"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.html\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.html\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.hxx\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.hxx\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.hxx"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.hxx"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,C++ Header}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.hxx"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.hxx\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.hxx\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.ini\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.ini\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.ini"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.ini"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,INI}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.ini"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.ini\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.ini\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.jade\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.jade\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.jade"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.jade"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Jade}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.jade"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.jade\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.jade\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.jav\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.jav\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.jav"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.jav"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Java}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.jav"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.jav\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.jav\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.java\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.java\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.java"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.java"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Java}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.java"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.java\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.java\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.js\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.js\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.js"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.js"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,JavaScript}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.js"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.js\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.js\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.jscsrc\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.jscsrc\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.jscsrc"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.jscsrc"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,JSCS RC}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.jscsrc"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.jscsrc\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.jscsrc\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.jshintrc\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.jshintrc\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.jshintrc"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.jshintrc"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,JSHint RC}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.jshintrc"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.jshintrc\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.jshintrc\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.jshtm\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.jshtm\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.jshtm"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.jshtm"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,JavaScript HTML Template}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.jshtm"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.jshtm\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.jshtm\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.json\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.json\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.json"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.json"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,JSON}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.json"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.json\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.json\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.jsp\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.jsp\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.jsp"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.jsp"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Java Server Pages}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.jsp"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.jsp\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.jsp\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.less\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.less\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.less"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.less"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,LESS}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.less"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.less\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.less\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.lua\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.lua\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.lua"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.lua"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Lua}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.lua"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.lua\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.lua\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.m\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.m\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.m"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.m"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Objective C}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.m"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.m\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.m\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.makefile\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.makefile\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.makefile"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.makefile"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Makefile}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.makefile"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.makefile\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.makefile\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.markdown\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.markdown\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.markdown"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.markdown"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Markdown}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.markdown"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.markdown\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.markdown\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.md\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.md\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.md"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.md"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Markdown}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.md"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.md\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.md\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.mdoc\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.mdoc\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.mdoc"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.mdoc"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,MDoc}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.mdoc"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.mdoc\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.mdoc\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.mdown\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.mdown\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.mdown"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.mdown"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Markdown}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.mdown"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.mdown\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.mdown\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.mdtext\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.mdtext\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.mdtext"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.mdtext"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Markdown}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.mdtext"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.mdtext\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.mdtext\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.mdtxt\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.mdtxt\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.mdtxt"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.mdtxt"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Markdown}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.mdtxt"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.mdtxt\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.mdtxt\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.mdwn\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.mdwn\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.mdwn"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.mdwn"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Markdown}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.mdwn"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.mdwn\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.mdwn\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.mkd\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.mkd\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.mkd"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.mkd"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Markdown}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.mkd"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.mkd\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.mkd\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.mkdn\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.mkdn\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.mkdn"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.mkdn"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Markdown}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.mkdn"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.mkdn\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.mkdn\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.ml\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.ml\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.ml"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.ml"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,OCaml}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.ml"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.ml\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.ml\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.mli\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.mli\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.mli"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.mli"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,OCaml}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.mli"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.mli\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.mli\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.npmignore\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.npmignore\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.npmignore"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.npmignore"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,NPM Ignore}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.npmignore"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.npmignore"; ValueType: string; ValueName: "AlwaysShowExt"; ValueData: ""; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.npmignore\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.npmignore\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.php\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.php\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.php"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.php"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,PHP}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.php"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.php\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.php\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.phtml\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.phtml\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.phtml"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.phtml"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,PHP HTML}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.phtml"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.phtml\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.phtml\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.pl\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.pl\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.pl"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.pl"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Perl}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.pl"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.pl\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.pl\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.pl6\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.pl6\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.pl6"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.pl6"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Perl 6}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.pl6"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.pl6\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.pl6\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.pm\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.pm\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.pm"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.pm"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Perl Module}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.pm"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.pm\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.pm\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.pm6\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.pm6\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.pm6"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.pm6"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Perl 6 Module}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.pm6"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.pm6\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.pm6\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.pod\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.pod\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.pod"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.pod"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Perl POD}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.pod"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.pod\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.pod\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.pp\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.pp\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.pp"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.pp"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Perl}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.pp"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.pp\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.pp\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.profile\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.profile\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.profile"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.profile"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Profile}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.profile"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.profile\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.profile\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.properties\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.properties\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.properties"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.properties"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Properties}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.properties"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.properties\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.properties\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.ps1\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.ps1\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.ps1"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.ps1"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,PowerShell}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.ps1"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.ps1\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.ps1\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.psd1\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.psd1\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.psd1"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.psd1"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,PowerShell Module Manifest}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.psd1"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.psd1\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.psd1\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.psgi\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.psgi\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.psgi"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.psgi"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Perl CGI}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.psgi"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.psgi\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.psgi\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.psm1\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.psm1\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.psm1"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.psm1"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,PowerShell Module}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.psm1"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.psm1\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.psm1\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.py\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.py\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.py"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.py"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Python}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.py"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.py\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.py\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.r\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.r\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.r"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.r"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,R}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.r"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.r\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.r\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.rb\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.rb\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.rb"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.rb"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Ruby}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.rb"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.rb\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.rb\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.rhistory\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.rhistory\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.rhistory"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.rhistory"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,R History}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.rhistory"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.rhistory\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.rhistory\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.rprofile\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.rprofile\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.rprofile"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.rprofile"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,R Profile}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.rprofile"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.rprofile\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.rprofile\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.rs\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.rs\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.rs"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.rs"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Rust}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.rs"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.rs\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.rs\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.rt\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.rt\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.rt"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.rt"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Rich Text}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.rt"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.rt\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.rt\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.scss\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.scss\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.scss"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.scss"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Sass}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.scss"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.scss\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.scss\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.sh\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.sh\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.sh"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.sh"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,SH}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.sh"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.sh\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.sh\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.shtml\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.shtml\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.shtml"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.shtml"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,SHTML}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.shtml"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.shtml\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.shtml\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.sql\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.sql\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.sql"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.sql"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,SQL}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.sql"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.sql\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.sql\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.svg\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.svg\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.svg"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.svg"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,SVG}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.svg"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.svg\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.svg\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.svgz\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.svgz\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.svgz"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.svgz"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,SVGZ}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.svgz"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.svgz\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.svgz\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.t\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.t\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.t"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.t"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Perl}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.t"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.t\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.t\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.tex\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.tex\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.tex"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.tex"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,LaTeX}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.tex"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.tex\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.tex\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.ts\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.ts\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.ts"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.ts"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,TypeScript}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.ts"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.ts\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.ts\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.txt\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.txt\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.txt"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.txt"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Text}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.txt"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.txt\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.txt\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.vb\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.vb\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.vb"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.vb"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Visual Basic}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.vb"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.vb\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.vb\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.wxi\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.wxi\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.wxi"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.wxi"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,WiX Include}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.wxi"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.wxi\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.wxi\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.wxl\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.wxl\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.wxl"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.wxl"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,WiX Localization}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.wxl"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.wxl\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.wxl\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.wxs\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.wxs\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.wxs"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.wxs"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,WiX}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.wxs"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.wxs\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.wxs\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.xaml\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.xaml\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.xaml"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.xaml"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,XAML}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.xaml"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.xaml\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.xaml\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.xml\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.xml\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.xml"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.xml"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,XML}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.xml"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.xml\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.xml\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.yaml\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.yaml\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.yaml"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.yaml"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Yaml}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.yaml"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.yaml\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.yaml\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.yml\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.yml\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.yml"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.yml"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Yaml}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.yml"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.yml\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.yml\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.zsh\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.zsh\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.zsh"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.zsh"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,ZSH}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.zsh"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.zsh\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.zsh\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}SourceFile"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,{#NameLong}}"; Flags: uninsdeletekey
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}SourceFile\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}SourceFile\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\Applications\{#ExeBasename}.exe"; ValueType: none; ValueName: ""; Flags: uninsdeletekey
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\Applications\{#ExeBasename}.exe\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\Applications\{#ExeBasename}.exe\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""
+
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\*\shell\{#RegValueName}"; ValueType: expandsz; ValueName: ""; ValueData: "Open w&ith {#ShellNameShort}"; Tasks: addcontextmenufiles; Flags: uninsdeletekey
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\*\shell\{#RegValueName}"; ValueType: expandsz; ValueName: "Icon"; ValueData: "{app}\{#ExeBasename}.exe"; Tasks: addcontextmenufiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\*\shell\{#RegValueName}\command"; ValueType: expandsz; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: addcontextmenufiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\directory\shell\{#RegValueName}"; ValueType: expandsz; ValueName: ""; ValueData: "Open w&ith {#ShellNameShort}"; Tasks: addcontextmenufolders; Flags: uninsdeletekey
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\directory\shell\{#RegValueName}"; ValueType: expandsz; ValueName: "Icon"; ValueData: "{app}\{#ExeBasename}.exe"; Tasks: addcontextmenufolders
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\directory\shell\{#RegValueName}\command"; ValueType: expandsz; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%V"""; Tasks: addcontextmenufolders
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\directory\background\shell\{#RegValueName}"; ValueType: expandsz; ValueName: ""; ValueData: "Open w&ith {#ShellNameShort}"; Tasks: addcontextmenufolders; Flags: uninsdeletekey
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\directory\background\shell\{#RegValueName}"; ValueType: expandsz; ValueName: "Icon"; ValueData: "{app}\{#ExeBasename}.exe"; Tasks: addcontextmenufolders
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\directory\background\shell\{#RegValueName}\command"; ValueType: expandsz; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%V"""; Tasks: addcontextmenufolders
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\Drive\shell\{#RegValueName}"; ValueType: expandsz; ValueName: ""; ValueData: "Open w&ith {#ShellNameShort}"; Tasks: addcontextmenufolders; Flags: uninsdeletekey
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\Drive\shell\{#RegValueName}"; ValueType: expandsz; ValueName: "Icon"; ValueData: "{app}\{#ExeBasename}.exe"; Tasks: addcontextmenufolders
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\Drive\shell\{#RegValueName}\command"; ValueType: expandsz; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%V"""; Tasks: addcontextmenufolders
+
+; Environment
+#if "user" == InstallTarget
+#define EnvironmentRootKey "HKCU"
+#define EnvironmentKey "Environment"
+#define Uninstall64RootKey "HKCU64"
+#define Uninstall32RootKey "HKCU32"
+#else
+#define EnvironmentRootKey "HKLM"
+#define EnvironmentKey "System\CurrentControlSet\Control\Session Manager\Environment"
+#define Uninstall64RootKey "HKLM64"
+#define Uninstall32RootKey "HKLM32"
+#endif
+
+Root: {#EnvironmentRootKey}; Subkey: "{#EnvironmentKey}"; ValueType: expandsz; ValueName: "Path"; ValueData: "{olddata};{app}\bin"; Tasks: addtopath; Check: NeedsAddPath(ExpandConstant('{app}\bin'))
 
 [Code]
 // Don't allow installing conflicting architectures
@@ -937,15 +964,33 @@ var
 begin
   Result := True;
 
-  if IsWin64 then begin
-    RegKey := 'SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\' + copy('{#IncompatibleAppId}', 2, 38) + '_is1';
+  #if "user" == InstallTarget
+    #if "ia32" == Arch
+      #define IncompatibleArchRootKey "HKLM32"
+    #else
+      #define IncompatibleArchRootKey "HKLM64"
+    #endif
+
+    if not WizardSilent() then begin
+      RegKey := 'SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\' + copy('{#IncompatibleTargetAppId}', 2, 38) + '_is1';
+
+      if RegKeyExists({#IncompatibleArchRootKey}, RegKey) then begin
+        if MsgBox('{#NameShort} is already installed on this system for all users. We recommend first uninstalling that version before installing this one. Are you sure you want to continue the installation?', mbConfirmation, MB_YESNO) = IDNO then begin
+          Result := false;
+        end;
+      end;
+    end;
+  #endif
+
+  if Result and IsWin64 then begin
+    RegKey := 'SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\' + copy('{#IncompatibleArchAppId}', 2, 38) + '_is1';
 
     if '{#Arch}' = 'ia32' then begin
-      Result := not RegKeyExists(HKLM64, RegKey);
+      Result := not RegKeyExists({#Uninstall64RootKey}, RegKey);
       ThisArch := '32';
       AltArch := '64';
     end else begin
-      Result := not RegKeyExists(HKLM32, RegKey);
+      Result := not RegKeyExists({#Uninstall32RootKey}, RegKey);
       ThisArch := '64';
       AltArch := '32';
     end;
@@ -1054,7 +1099,7 @@ function NeedsAddPath(Param: string): boolean;
 var
   OrigPath: string;
 begin
-  if not RegQueryStringValue(HKEY_CURRENT_USER, 'Environment', 'Path', OrigPath)
+  if not RegQueryStringValue({#EnvironmentRootKey}, '{#EnvironmentKey}', 'Path', OrigPath)
   then begin
     Result := True;
     exit;
@@ -1073,7 +1118,7 @@ begin
   if not CurUninstallStep = usUninstall then begin
     exit;
   end;
-  if not RegQueryStringValue(HKEY_CURRENT_USER, 'Environment', 'Path', Path)
+  if not RegQueryStringValue({#EnvironmentRootKey}, '{#EnvironmentKey}', 'Path', Path)
   then begin
     exit;
   end;
@@ -1089,5 +1134,9 @@ begin
       end;
     end;
   end;
-  RegWriteExpandStringValue(HKEY_CURRENT_USER, 'Environment', 'Path', NewPath);
+  RegWriteExpandStringValue({#EnvironmentRootKey}, '{#EnvironmentKey}', 'Path', NewPath);
 end;
+
+#ifdef Debug
+  #expr SaveToFile(AddBackslash(SourcePath) + "code-processed.iss")
+#endif
diff --git a/build/win32/i18n/Default.isl b/build/win32/i18n/Default.isl
index fdcfbb16568..370da6b37c7 100644
--- a/build/win32/i18n/Default.isl
+++ b/build/win32/i18n/Default.isl
@@ -9,7 +9,7 @@
 ; two periods being displayed).
 
 [LangOptions]
-; The following three entries are very important. Be sure to read and 
+; The following three entries are very important. Be sure to read and
 ; understand the '[LangOptions] section' topic in the help file.
 LanguageName=English
 LanguageID=$0409
@@ -216,7 +216,7 @@ InstallingLabel=Please wait while Setup installs [name] on your computer.
 ; *** "Setup Completed" wizard page
 FinishedHeadingLabel=Completing the [name] Setup Wizard
 FinishedLabelNoIcons=Setup has finished installing [name] on your computer.
-FinishedLabel=Setup has finished installing [name] on your computer. The application may be launched by selecting the installed shortcuts.
+FinishedLabel=Setup has finished installing [name] on your computer. The application may be launched by selecting the installed icons.
 ClickFinish=Click Finish to exit Setup.
 FinishedRestartLabel=To complete the installation of [name], Setup must restart your computer. Would you like to restart now?
 FinishedRestartMessage=To complete the installation of [name], Setup must restart your computer.%n%nWould you like to restart now?
@@ -296,7 +296,7 @@ UninstallNotFound=File "%1" does not exist. Cannot uninstall.
 UninstallOpenError=File "%1" could not be opened. Cannot uninstall
 UninstallUnsupportedVer=The uninstall log file "%1" is in a format not recognized by this version of the uninstaller. Cannot uninstall
 UninstallUnknownEntry=An unknown entry (%1) was encountered in the uninstall log
-ConfirmUninstall=Are you sure you want to completely remove %1 and all of its components?
+ConfirmUninstall=Are you sure you want to completely remove %1? Extensions and settings will not be removed.
 UninstallOnlyOnWin64=This installation can only be uninstalled on 64-bit Windows.
 OnlyAdminCanUninstall=This installation can only be uninstalled by a user with administrative privileges.
 UninstallStatusLabel=Please wait while %1 is removed from your computer.
@@ -323,9 +323,9 @@ ShutdownBlockReasonUninstallingApp=Uninstalling %1.
 [CustomMessages]
 
 NameAndVersion=%1 version %2
-AdditionalIcons=Additional shortcuts:
-CreateDesktopIcon=Create a &desktop shortcut
-CreateQuickLaunchIcon=Create a &Quick Launch shortcut
+AdditionalIcons=Additional icons:
+CreateDesktopIcon=Create a &desktop icon
+CreateQuickLaunchIcon=Create a &Quick Launch icon
 ProgramOnTheWeb=%1 on the Web
 UninstallProgram=Uninstall %1
 LaunchProgram=Launch %1
@@ -334,4 +334,3 @@ AssocingFileExtension=Associating %1 with the %2 file extension...
 AutoStartProgramGroupDescription=Startup:
 AutoStartProgram=Automatically start %1
 AddonHostProgramNotFound=%1 could not be located in the folder you selected.%n%nDo you want to continue anyway?
-
diff --git a/build/win32/inno_updater.exe b/build/win32/inno_updater.exe
old mode 100755
new mode 100644
index 6d83b2b748b..9a2a7848ffe
Binary files a/build/win32/inno_updater.exe and b/build/win32/inno_updater.exe differ
diff --git a/build/yarn.lock b/build/yarn.lock
index ac6150fcf60..e36dc85525d 100644
--- a/build/yarn.lock
+++ b/build/yarn.lock
@@ -652,9 +652,9 @@ tweetnacl@^0.14.3, tweetnacl@~0.14.0:
   version "0.14.5"
   resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
 
-typescript@2.9.1:
-  version "2.9.1"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.9.1.tgz#fdb19d2c67a15d11995fd15640e373e09ab09961"
+typescript@3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.0.3.tgz#4853b3e275ecdaa27f78fda46dc273a7eb7fc1c8"
 
 underscore@1.8.3, underscore@~1.8.3:
   version "1.8.3"
diff --git a/extensions/bat/syntaxes/batchfile.tmLanguage.json b/extensions/bat/syntaxes/batchfile.tmLanguage.json
index e5f00ed3827..26ae88f43c5 100644
--- a/extensions/bat/syntaxes/batchfile.tmLanguage.json
+++ b/extensions/bat/syntaxes/batchfile.tmLanguage.json
@@ -4,7 +4,7 @@
 		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
 		"Once accepted there, we are happy to receive an update request."
 	],
-	"version": "https://github.com/mmims/language-batchfile/commit/6235c491be4dff49cd3966b50142874d7f79580a",
+	"version": "https://github.com/mmims/language-batchfile/commit/4b67596631b4ecd2c89c2ec1b2e08a6623438903",
 	"name": "Batch File",
 	"scopeName": "source.batchfile",
 	"patterns": [
@@ -163,12 +163,6 @@
 					"end": "(?=$\\n|[&|><)])",
 					"name": "meta.expression.set.batchfile",
 					"patterns": [
-						{
-							"include": "#command_set_inside_arithmetic"
-						},
-						{
-							"include": "#command_set_group"
-						},
 						{
 							"begin": "\"",
 							"beginCaptures": {
@@ -194,6 +188,12 @@
 									"include": "#variables"
 								}
 							]
+						},
+						{
+							"include": "#command_set_inside_arithmetic"
+						},
+						{
+							"include": "#command_set_group"
 						}
 					]
 				},
@@ -266,8 +266,15 @@
 		"command_set_operators": {
 			"patterns": [
 				{
-					"match": "\\+\\=|\\-\\=|\\*\\=|/\\=|%%\\=|&\\=|\\|\\=|\\^\\=|<<\\=|>>\\=",
-					"name": "keyword.operator.assignment.augmented.batchfile"
+					"match": "([^ ]*)(\\+\\=|\\-\\=|\\*\\=|\\/\\=|%%\\=|&\\=|\\|\\=|\\^\\=|<<\\=|>>\\=)",
+					"captures": {
+						"1": {
+							"name": "variable.other.readwrite.batchfile"
+						},
+						"2": {
+							"name": "keyword.operator.assignment.augmented.batchfile"
+						}
+					}
 				},
 				{
 					"match": "\\+|\\-|/|\\*|%%|\\||&|\\^|<<|>>|~",
@@ -278,8 +285,15 @@
 					"name": "keyword.operator.logical.batchfile"
 				},
 				{
-					"match": "=",
-					"name": "keyword.operator.assignment.batchfile"
+					"match": "([^ ][^=]*)(=)",
+					"captures": {
+						"1": {
+							"name": "variable.other.readwrite.batchfile"
+						},
+						"2": {
+							"name": "keyword.operator.assignment.batchfile"
+						}
+					}
 				}
 			]
 		},
diff --git a/extensions/bat/test/colorize-results/test_bat.json b/extensions/bat/test/colorize-results/test_bat.json
index 3c2abc5d2dc..97155fafc8b 100644
--- a/extensions/bat/test/colorize-results/test_bat.json
+++ b/extensions/bat/test/colorize-results/test_bat.json
@@ -135,9 +135,9 @@
 		"c": "::",
 		"t": "source.batchfile comment.line.colon.batchfile punctuation.definition.comment.batchfile",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -146,9 +146,9 @@
 		"c": " Node modules",
 		"t": "source.batchfile comment.line.colon.batchfile",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -245,9 +245,9 @@
 		"c": "::",
 		"t": "source.batchfile comment.line.colon.batchfile punctuation.definition.comment.batchfile",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -256,9 +256,9 @@
 		"c": " Get electron",
 		"t": "source.batchfile comment.line.colon.batchfile",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -278,9 +278,9 @@
 		"c": "::",
 		"t": "source.batchfile comment.line.colon.batchfile punctuation.definition.comment.batchfile",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -289,9 +289,9 @@
 		"c": " Build",
 		"t": "source.batchfile comment.line.colon.batchfile",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -366,9 +366,9 @@
 		"c": "::",
 		"t": "source.batchfile comment.line.colon.batchfile punctuation.definition.comment.batchfile",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -377,9 +377,9 @@
 		"c": " Configuration",
 		"t": "source.batchfile comment.line.colon.batchfile",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
diff --git a/extensions/clojure/test/colorize-results/test_clj.json b/extensions/clojure/test/colorize-results/test_clj.json
index 8a704fb9683..b7dd17d91e8 100644
--- a/extensions/clojure/test/colorize-results/test_clj.json
+++ b/extensions/clojure/test/colorize-results/test_clj.json
@@ -3,9 +3,9 @@
 		"c": ";",
 		"t": "source.clojure comment.line.semicolon.clojure punctuation.definition.comment.clojure",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -14,9 +14,9 @@
 		"c": "; from http://clojure-doc.org/articles/tutorials/introduction.html",
 		"t": "source.clojure comment.line.semicolon.clojure",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -311,9 +311,9 @@
 		"c": ";",
 		"t": "source.clojure comment.line.semicolon.clojure punctuation.definition.comment.clojure",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -322,9 +322,9 @@
 		"c": " A vector",
 		"t": "source.clojure comment.line.semicolon.clojure",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -905,9 +905,9 @@
 		"c": ";",
 		"t": "source.clojure comment.line.semicolon.clojure punctuation.definition.comment.clojure",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -916,9 +916,9 @@
 		"c": " this is more typical usage.",
 		"t": "source.clojure comment.line.semicolon.clojure",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -1433,9 +1433,9 @@
 		"c": ";",
 		"t": "source.clojure comment.line.semicolon.clojure punctuation.definition.comment.clojure",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -1444,9 +1444,9 @@
 		"c": "; ⇒ (+ 1 2 3)",
 		"t": "source.clojure comment.line.semicolon.clojure",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -1840,9 +1840,9 @@
 		"c": ";",
 		"t": "source.clojure comment.line.semicolon.clojure punctuation.definition.comment.clojure",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -1851,9 +1851,9 @@
 		"c": "; Vectors",
 		"t": "source.clojure comment.line.semicolon.clojure",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -2236,9 +2236,9 @@
 		"c": ";",
 		"t": "source.clojure comment.line.semicolon.clojure punctuation.definition.comment.clojure",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -2247,9 +2247,9 @@
 		"c": " ⇒ [:a :b :c :d]",
 		"t": "source.clojure comment.line.semicolon.clojure",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -2346,9 +2346,9 @@
 		"c": ";",
 		"t": "source.clojure comment.line.semicolon.clojure punctuation.definition.comment.clojure",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -2357,9 +2357,9 @@
 		"c": " ⇒ (:d :a :b :c)",
 		"t": "source.clojure comment.line.semicolon.clojure",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -2390,9 +2390,9 @@
 		"c": ";",
 		"t": "source.clojure comment.line.semicolon.clojure punctuation.definition.comment.clojure",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -2401,9 +2401,9 @@
 		"c": " ⇒ is still [:a :b :c]",
 		"t": "source.clojure comment.line.semicolon.clojure",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -2434,9 +2434,9 @@
 		"c": ";",
 		"t": "source.clojure comment.line.semicolon.clojure punctuation.definition.comment.clojure",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -2445,9 +2445,9 @@
 		"c": " ⇒ is still (:a :b :c)",
 		"t": "source.clojure comment.line.semicolon.clojure",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -2456,9 +2456,9 @@
 		"c": ";",
 		"t": "source.clojure comment.line.semicolon.clojure punctuation.definition.comment.clojure",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -2467,9 +2467,9 @@
 		"c": "; Maps",
 		"t": "source.clojure comment.line.semicolon.clojure",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -2753,9 +2753,9 @@
 		"c": ";",
 		"t": "source.clojure comment.line.semicolon.clojure punctuation.definition.comment.clojure",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -2764,9 +2764,9 @@
 		"c": " ⇒ {:a 1 :c 3 :b 2}",
 		"t": "source.clojure comment.line.semicolon.clojure",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -2863,9 +2863,9 @@
 		"c": ";",
 		"t": "source.clojure comment.line.semicolon.clojure punctuation.definition.comment.clojure",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -2874,9 +2874,9 @@
 		"c": " ⇒ {:a 1}",
 		"t": "source.clojure comment.line.semicolon.clojure",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -3050,9 +3050,9 @@
 		"c": ";",
 		"t": "source.clojure comment.line.semicolon.clojure punctuation.definition.comment.clojure",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -3061,9 +3061,9 @@
 		"c": "; ⇒ #'user/my-atom",
 		"t": "source.clojure comment.line.semicolon.clojure",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -3094,9 +3094,9 @@
 		"c": ";",
 		"t": "source.clojure comment.line.semicolon.clojure punctuation.definition.comment.clojure",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -3105,9 +3105,9 @@
 		"c": "; ⇒ {:foo 1}",
 		"t": "source.clojure comment.line.semicolon.clojure",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -3259,9 +3259,9 @@
 		"c": ";",
 		"t": "source.clojure comment.line.semicolon.clojure punctuation.definition.comment.clojure",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -3270,9 +3270,9 @@
 		"c": "; ⇒ {:foo 2}",
 		"t": "source.clojure comment.line.semicolon.clojure",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -3303,9 +3303,9 @@
 		"c": ";",
 		"t": "source.clojure comment.line.semicolon.clojure punctuation.definition.comment.clojure",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -3314,9 +3314,9 @@
 		"c": "; ⇒ {:foo 2}",
 		"t": "source.clojure comment.line.semicolon.clojure",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
diff --git a/extensions/coffeescript/test/colorize-results/test-regex_coffee.json b/extensions/coffeescript/test/colorize-results/test-regex_coffee.json
index ad11ba9d687..9daab0d5533 100644
--- a/extensions/coffeescript/test/colorize-results/test-regex_coffee.json
+++ b/extensions/coffeescript/test/colorize-results/test-regex_coffee.json
@@ -575,9 +575,9 @@
 		"c": "#",
 		"t": "source.coffee comment.line.number-sign.coffee punctuation.definition.comment.coffee",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -586,9 +586,9 @@
 		"c": " numbers",
 		"t": "source.coffee comment.line.number-sign.coffee",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -663,9 +663,9 @@
 		"c": "#",
 		"t": "source.coffee comment.line.number-sign.coffee punctuation.definition.comment.coffee",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -674,9 +674,9 @@
 		"c": " letters",
 		"t": "source.coffee comment.line.number-sign.coffee",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -696,9 +696,9 @@
 		"c": "#",
 		"t": "source.coffee comment.line.number-sign.coffee punctuation.definition.comment.coffee",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -707,9 +707,9 @@
 		"c": " the end",
 		"t": "source.coffee comment.line.number-sign.coffee",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
diff --git a/extensions/coffeescript/test/colorize-results/test_coffee.json b/extensions/coffeescript/test/colorize-results/test_coffee.json
index e7eae7d047f..d3de07d3f82 100644
--- a/extensions/coffeescript/test/colorize-results/test_coffee.json
+++ b/extensions/coffeescript/test/colorize-results/test_coffee.json
@@ -1433,9 +1433,9 @@
 		"c": "#",
 		"t": "source.coffee string.regexp.multiline.coffee comment.line.number-sign.coffee punctuation.definition.comment.coffee",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -1444,9 +1444,9 @@
 		"c": " numbers",
 		"t": "source.coffee string.regexp.multiline.coffee comment.line.number-sign.coffee",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -1521,9 +1521,9 @@
 		"c": "#",
 		"t": "source.coffee string.regexp.multiline.coffee comment.line.number-sign.coffee punctuation.definition.comment.coffee",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -1532,9 +1532,9 @@
 		"c": " letters",
 		"t": "source.coffee string.regexp.multiline.coffee comment.line.number-sign.coffee",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -1576,9 +1576,9 @@
 		"c": "#",
 		"t": "source.coffee string.regexp.multiline.coffee comment.line.number-sign.coffee punctuation.definition.comment.coffee",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -1587,9 +1587,9 @@
 		"c": " the end",
 		"t": "source.coffee string.regexp.multiline.coffee comment.line.number-sign.coffee",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
diff --git a/extensions/configuration-editing/extension.webpack.config.js b/extensions/configuration-editing/extension.webpack.config.js
new file mode 100644
index 00000000000..b474e65cbb1
--- /dev/null
+++ b/extensions/configuration-editing/extension.webpack.config.js
@@ -0,0 +1,20 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+//@ts-check
+
+'use strict';
+
+const withDefaults = require('../shared.webpack.config');
+
+module.exports = withDefaults({
+	context: __dirname,
+	entry: {
+		extension: './src/extension.ts',
+	},
+	resolve: {
+		mainFields: ['module', 'main']
+	}
+});
diff --git a/extensions/configuration-editing/package.json b/extensions/configuration-editing/package.json
index e66a313c9f6..46f4eba3a95 100644
--- a/extensions/configuration-editing/package.json
+++ b/extensions/configuration-editing/package.json
@@ -17,8 +17,8 @@
     "watch": "gulp watch-extension:configuration-editing"
   },
   "dependencies": {
-    "jsonc-parser": "^1.0.0",
-    "vscode-nls": "^3.2.1"
+    "jsonc-parser": "2.0.2",
+    "vscode-nls": "^4.0.0"
   },
   "contributes": {
     "languages": [
@@ -96,6 +96,6 @@
     ]
   },
   "devDependencies": {
-    "@types/node": "7.0.4"
+    "@types/node": "^8.10.25"
   }
-}
\ No newline at end of file
+}
diff --git a/extensions/configuration-editing/package.nls.json b/extensions/configuration-editing/package.nls.json
index b8c247a9de3..20a9c1af8b7 100644
--- a/extensions/configuration-editing/package.nls.json
+++ b/extensions/configuration-editing/package.nls.json
@@ -1,4 +1,4 @@
 {
 	"displayName": "Configuration Editing",
-	"description": "Provides capabilities (advanced IntelliSense, auto-fixing) in configuration files like settings, launch and extension recommendation files."
+	"description": "Provides capabilities (advanced IntelliSense, auto-fixing) in configuration files like settings, launch, and extension recommendation files."
 }
\ No newline at end of file
diff --git a/extensions/configuration-editing/src/extension.ts b/extensions/configuration-editing/src/extension.ts
index 68dbbf165b4..f6ec0b625e7 100644
--- a/extensions/configuration-editing/src/extension.ts
+++ b/extensions/configuration-editing/src/extension.ts
@@ -11,8 +11,8 @@ import { getLocation, visit, parse, ParseErrorCode } from 'jsonc-parser';
 import * as path from 'path';
 import { SettingsDocument } from './settingsDocumentHelper';
 
-const decoration = vscode.window.createTextEditorDecorationType({
-	color: '#9e9e9e'
+const fadedDecoration = vscode.window.createTextEditorDecorationType({
+	color: '#777'
 });
 
 let pendingLaunchJsonDecoration: NodeJS.Timer;
@@ -241,7 +241,7 @@ function updateLaunchJsonDecorations(editor: vscode.TextEditor | undefined): voi
 		}
 	});
 
-	editor.setDecorations(decoration, ranges);
+	editor.setDecorations(fadedDecoration, ranges);
 }
 
 vscode.languages.registerDocumentSymbolProvider({ pattern: '**/launch.json', language: 'jsonc' }, {
diff --git a/extensions/configuration-editing/yarn.lock b/extensions/configuration-editing/yarn.lock
index 29d3d43ae80..c74f1de37ba 100644
--- a/extensions/configuration-editing/yarn.lock
+++ b/extensions/configuration-editing/yarn.lock
@@ -2,14 +2,14 @@
 # yarn lockfile v1
 
 
-"@types/node@7.0.4":
-  version "7.0.4"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.4.tgz#9aabc135979ded383325749f508894c662948c8b"
+"@types/node@^8.10.25":
+  version "8.10.25"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-8.10.25.tgz#801fe4e39372cef18f268db880a5fbfcf71adc7e"
 
-jsonc-parser@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-1.0.0.tgz#ddcc864ae708e60a7a6dd36daea00172fa8d9272"
+jsonc-parser@2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-2.0.2.tgz#42fcf56d70852a043fadafde51ddb4a85649978d"
 
-vscode-nls@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.1.tgz#b1f3e04e8a94a715d5a7bcbc8339c51e6d74ca51"
+vscode-nls@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-4.0.0.tgz#4001c8a6caba5cedb23a9c5ce1090395c0e44002"
diff --git a/extensions/cpp/test/colorize-results/test_c.json b/extensions/cpp/test/colorize-results/test_c.json
index d3bac881c43..0725010d8c2 100644
--- a/extensions/cpp/test/colorize-results/test_c.json
+++ b/extensions/cpp/test/colorize-results/test_c.json
@@ -3,9 +3,9 @@
 		"c": "/*",
 		"t": "source.c comment.block.c punctuation.definition.comment.begin.c",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -14,9 +14,9 @@
 		"c": " C Program to find roots of a quadratic equation when coefficients are entered by user. ",
 		"t": "source.c comment.block.c",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -25,9 +25,9 @@
 		"c": "*/",
 		"t": "source.c comment.block.c punctuation.definition.comment.end.c",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -36,9 +36,9 @@
 		"c": "/*",
 		"t": "source.c comment.block.c punctuation.definition.comment.begin.c",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -47,9 +47,9 @@
 		"c": " Library function sqrt() computes the square root. ",
 		"t": "source.c comment.block.c",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -58,9 +58,9 @@
 		"c": "*/",
 		"t": "source.c comment.block.c punctuation.definition.comment.end.c",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -212,9 +212,9 @@
 		"c": "/*",
 		"t": "source.c comment.block.c punctuation.definition.comment.begin.c",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -223,9 +223,9 @@
 		"c": " This is needed to use sqrt() function.",
 		"t": "source.c comment.block.c",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -234,9 +234,9 @@
 		"c": "*/",
 		"t": "source.c comment.block.c punctuation.definition.comment.end.c",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
diff --git a/extensions/cpp/test/colorize-results/test_cc.json b/extensions/cpp/test/colorize-results/test_cc.json
index 845a693b3ab..f3f72320fb5 100644
--- a/extensions/cpp/test/colorize-results/test_cc.json
+++ b/extensions/cpp/test/colorize-results/test_cc.json
@@ -1114,9 +1114,9 @@
 		"c": "//",
 		"t": "source.cpp meta.block.c comment.line.double-slash.cpp punctuation.definition.comment.cpp",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -1125,9 +1125,9 @@
 		"c": " everything from this point on is interpeted as a string literal...",
 		"t": "source.cpp meta.block.c comment.line.double-slash.cpp",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -1312,9 +1312,9 @@
 		"c": "//",
 		"t": "source.cpp meta.block.c comment.line.double-slash.cpp punctuation.definition.comment.cpp",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -1323,9 +1323,9 @@
 		"c": " sadness.",
 		"t": "source.cpp meta.block.c comment.line.double-slash.cpp",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -1708,9 +1708,9 @@
 		"c": "//",
 		"t": "source.cpp meta.block.c comment.line.double-slash.cpp punctuation.definition.comment.cpp",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -1719,9 +1719,9 @@
 		"c": " the rest of",
 		"t": "source.cpp meta.block.c comment.line.double-slash.cpp",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -1961,9 +1961,9 @@
 		"c": "//",
 		"t": "source.cpp meta.block.c comment.line.double-slash.cpp punctuation.definition.comment.cpp",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -1972,9 +1972,9 @@
 		"c": " the rest of",
 		"t": "source.cpp meta.block.c comment.line.double-slash.cpp",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
diff --git a/extensions/cpp/test/colorize-results/test_cpp.json b/extensions/cpp/test/colorize-results/test_cpp.json
index 8527e98a4f2..b3c9a841cc4 100644
--- a/extensions/cpp/test/colorize-results/test_cpp.json
+++ b/extensions/cpp/test/colorize-results/test_cpp.json
@@ -3,9 +3,9 @@
 		"c": "//",
 		"t": "source.cpp comment.line.double-slash.cpp punctuation.definition.comment.cpp",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -14,9 +14,9 @@
 		"c": " classes example",
 		"t": "source.cpp comment.line.double-slash.cpp",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
diff --git a/extensions/csharp/test/colorize-results/test_cs.json b/extensions/csharp/test/colorize-results/test_cs.json
index 6b56bff9935..1fc73fb341c 100644
--- a/extensions/csharp/test/colorize-results/test_cs.json
+++ b/extensions/csharp/test/colorize-results/test_cs.json
@@ -1114,9 +1114,9 @@
 		"c": "//",
 		"t": "source.cs comment.line.double-slash.cs punctuation.definition.comment.cs",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -1125,9 +1125,9 @@
 		"c": " Display the number of command line arguments:",
 		"t": "source.cs comment.line.double-slash.cs",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
diff --git a/extensions/css-language-features/.vscode/launch.json b/extensions/css-language-features/.vscode/launch.json
index f6f6922c78d..d6393141c5d 100644
--- a/extensions/css-language-features/.vscode/launch.json
+++ b/extensions/css-language-features/.vscode/launch.json
@@ -3,7 +3,10 @@
 	"compounds": [
 		{
 			"name": "Debug Extension and Language Server",
-			"configurations": ["Launch Extension", "Attach Language Server"]
+			"configurations": [
+				"Launch Extension",
+				"Attach Language Server"
+			]
 		}
 	],
 	"configurations": [
@@ -17,7 +20,9 @@
 			],
 			"stopOnEntry": false,
 			"sourceMaps": true,
-			"outFiles": ["${workspaceFolder}/client/out/**/*.js"],
+			"outFiles": [
+				"${workspaceFolder}/client/out/**/*.js"
+			],
 			"smartStep": true,
 			"preLaunchTask": "npm: compile"
 		},
@@ -26,10 +31,15 @@
 			"type": "extensionHost",
 			"request": "launch",
 			"runtimeExecutable": "${execPath}",
-			"args": ["--extensionDevelopmentPath=${workspaceFolder}", "--extensionTestsPath=${workspaceFolder}/client/out/test" ],
+			"args": [
+				"--extensionDevelopmentPath=${workspaceFolder}",
+				"--extensionTestsPath=${workspaceFolder}/client/out/test"
+			],
 			"stopOnEntry": false,
 			"sourceMaps": true,
-			"outFiles": ["${workspaceFolder}/client/out/test/**/*.js"],
+			"outFiles": [
+				"${workspaceFolder}/client/out/test/**/*.js"
+			],
 			"preLaunchTask": "npm: compile"
 		},
 		{
@@ -39,9 +49,31 @@
 			"protocol": "inspector",
 			"port": 6044,
 			"sourceMaps": true,
-			"outFiles": ["${workspaceFolder}/server/out/**/*.js"],
+			"outFiles": [
+				"${workspaceFolder}/server/out/**/*.js"
+			],
 			"smartStep": true,
 			"restart": true
+    },
+    {
+			"name": "Server Unit Tests",
+			"type": "node",
+			"request": "launch",
+			"program": "${workspaceRoot}/node_modules/mocha/bin/_mocha",
+			"stopOnEntry": false,
+			"args": [
+				"--timeout",
+				"999999",
+				"--colors"
+			],
+			"cwd": "${workspaceRoot}",
+			"runtimeExecutable": null,
+			"runtimeArgs": [],
+			"env": {},
+			"sourceMaps": true,
+			"outFiles": [
+				"${workspaceRoot}/server/out/**"
+			]
 		}
 	]
 }
\ No newline at end of file
diff --git a/extensions/css-language-features/.vscodeignore b/extensions/css-language-features/.vscodeignore
index b85541d78ee..89a62ee0761 100644
--- a/extensions/css-language-features/.vscodeignore
+++ b/extensions/css-language-features/.vscodeignore
@@ -1,5 +1,21 @@
+test/**
+.vscode/**
+server/.vscode/**
+node_modules/**
+server/node_modules/**
 client/src/**
-client/tsconfig.json
 server/src/**
+client/out/**
+server/out/**
+client/tsconfig.json
 server/tsconfig.json
-server/node_modules/@types/**
\ No newline at end of file
+server/test/**
+server/bin/**
+server/build/**
+server/yarn.lock
+server/.npmignore
+yarn.lock
+server/extension.webpack.config.js
+extension.webpack.config.js
+!node_modules/vscode-nls/**
+!server/node_modules/vscode-nls/**
\ No newline at end of file
diff --git a/extensions/css-language-features/CONTRIBUTING.md b/extensions/css-language-features/CONTRIBUTING.md
new file mode 100644
index 00000000000..38843f2fbaa
--- /dev/null
+++ b/extensions/css-language-features/CONTRIBUTING.md
@@ -0,0 +1,39 @@
+
+## Setup
+
+- Clone [Microsoft/vscode](https://github.com/microsoft/vscode)
+- Run `yarn` at `/`, this will install
+	- Dependencies for `/extension/css-language-features/`
+	- Dependencies for `/extension/css-language-features/server/`
+	- devDependencies such as `gulp`
+- Open `/extensions/css-language-features/` as the workspace in VS Code
+- Run the [`Launch Extension`](https://github.com/Microsoft/vscode/blob/master/extensions/css-language-features/.vscode/launch.json) debug target in the Debug View. This will:
+	- Launch the `preLaunchTask` task to compile the extension
+	- Launch a new VS Code instance with the `css-language-features` extension loaded
+	- You should see a notification saying the development version of `css-language-features` overwrites the bundled version of `css-language-features`
+- Test the behavior of this extension by editing CSS/SCSS/Less files
+- Run `Reload Window` command in the launched instance to reload the extension
+
+### Contribute to vscode-css-languageservice
+
+[Microsoft/vscode-css-languageservice](https://github.com/Microsoft/vscode-css-languageservice) contains the language smarts for CSS/SCSS/Less.
+This extension wraps the css language service into a Language Server for VS Code.
+If you want to fix CSS/SCSS/Less issues or make improvements, you should make changes at [Microsoft/vscode-css-languageservice](https://github.com/Microsoft/vscode-css-languageservice).
+
+However, within this extension, you can run a development version of `vscode-css-languageservice` to debug code or test language features interactively:
+
+#### Linking `vscode-css-languageservice` in `css-language-features/server/`
+
+- Clone [Microsoft/vscode-css-languageservice](https://github.com/Microsoft/vscode-css-languageservice)
+- Run `yarn` in `vscode-css-languageservice`
+- Run `yarn link` in `vscode-css-languageservice`. This will compile and link `vscode-css-languageservice`
+- In `css-language-features/server/`, run `yarn link vscode-css-languageservice`
+
+#### Testing the development version of `vscode-css-languageservice`
+
+- Open both `vscode-css-languageservice` and this extension in a single workspace with [multi-root workspace](https://code.visualstudio.com/docs/editor/multi-root-workspaces) feature
+- Run `yarn watch` in `vscode-css-languageservice` to recompile the extension whenever it changes
+- Run `yarn watch` at `css-language-features/server/` to recompile this extension with the linked version of `vscode-css-languageservice`
+- Make some changes in `vscode-css-languageservice`
+- Now when you run `Launch Extension` debug target, the launched instance will use your development version of `vscode-css-languageservice`. You can interactively test the language features.
+- You can also run the `Debug Extension and Language Server` debug target, which will launch the extension and attach the debugger to the language server. After successful attach, you should be able to hit breakpoints in both `vscode-css-languageservice` and `css-language-features/server/`
diff --git a/extensions/css-language-features/README.md b/extensions/css-language-features/README.md
index 43065919fd4..5a3fad4948b 100644
--- a/extensions/css-language-features/README.md
+++ b/extensions/css-language-features/README.md
@@ -1,35 +1,9 @@
-# CSS Language Features
+# Language Features for CSS, SCSS, and LESS files
 
-This extension offers CSS/SCSS/Less support in VS Code.
+**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.
 
-## Development
+## Features
 
-- Clone [Microsoft/vscode](https://github.com/microsoft/vscode)
-- Run `yarn` at `/`, this will install
-	- Dependencies for `/extension/css-language-features/`
-	- Dependencies for `/extension/css-language-features/server/`
-	- devDependencies such as `gulp`
-- Open `/extensions/css-language-features/` as the workspace in VS Code
-- Run the [`Launch Extension`](https://github.com/Microsoft/vscode/blob/master/extensions/css-language-features/.vscode/launch.json) debug target in the Debug View. This will:
-	- Launch the `preLaunchTask` task to compile the extension
-	- Launch a new VS Code instance with the `css-language-features` extension loaded
-	- You should see a notification saying the development version of `css-language-features` overwrites the bundled version of `css-language-features`
-- Test the behavior of this extension by editing CSS/SCSS/Less files
-- Run `Reload Window` command in the launched instance to reload the extension
+See [CSS, SCSS and Less in VS Code](https://code.visualstudio.com/docs/languages/css) to learn about the features of this extension.
 
-### Contribute to vscode-css-languageservice
-
-[Microsoft/vscode-css-languageservice](https://github.com/Microsoft/vscode-css-languageservice) contains the language smarts for CSS/SCSS/Less, and this extension wraps the service into a Language Server for VS Code. If you want to fix CSS/SCSS/Less issues or make improvements, you should make changes at [Microsoft/vscode-css-languageservice](https://github.com/Microsoft/vscode-css-languageservice).
-
-However, within this extension, you can run a development version of `vscode-css-languageservice` to debug code or test language features interactively:
-
-- Clone [Microsoft/vscode-css-languageservice](https://github.com/Microsoft/vscode-css-languageservice)
-- Open both `vscode-css-languageservice` and this extension in a single workspace with [multi-root workspace](https://code.visualstudio.com/docs/editor/multi-root-workspaces) feature
-- Run `yarn` in `vscode-css-languageservice`
-- Run `yarn link` in `vscode-css-languageservice`. This will compile and link `vscode-css-languageservice`
-- In `css-language-features/server/`, run `npm link vscode-css-languageservice`
-- Run `yarn watch` at `css-languagefeatures/server/` to recompile this extension with the linked version of `vscode-css-languageservice`
-- Run `yarn watch` in `vscode-css-languageservice`
-- Make some changes in `vscode-css-languageservice`
-- Now when you run `Launch Extension` debug target, the launched instance will use your development version of `vscode-css-languageservice`. You can interactively test the language features.
-- You can also run the `Debug Extension and Language Server` debug target, which will launch the extension and attach the debugger to the language server. After successful attach, you should be able to hit breakpoints in both `vscode-css-languageservice` and `css-language-features/server/`
+Please read the [CONTRIBUTING.md](https://github.com/Microsoft/vscode/blob/master/extensions/css-language-features/CONTRIBUTING.md) file to learn how to contribute to this extension.
\ No newline at end of file
diff --git a/extensions/css-language-features/client/src/cssMain.ts b/extensions/css-language-features/client/src/cssMain.ts
index a7a031bda3c..e91d5408054 100644
--- a/extensions/css-language-features/client/src/cssMain.ts
+++ b/extensions/css-language-features/client/src/cssMain.ts
@@ -4,19 +4,20 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 import * as path from 'path';
+import * as fs from 'fs';
 
 import * as nls from 'vscode-nls';
 const localize = nls.loadMessageBundle();
 
-import { languages, window, commands, ExtensionContext, Range, Position, TextDocument, CompletionItem, CompletionItemKind, TextEdit, SnippetString, FoldingRangeKind, FoldingRange, FoldingContext, CancellationToken } from 'vscode';
+import { languages, window, commands, ExtensionContext, Range, Position, CompletionItem, CompletionItemKind, TextEdit, SnippetString } from 'vscode';
 import { LanguageClient, LanguageClientOptions, ServerOptions, TransportKind, Disposable } from 'vscode-languageclient';
-import { FoldingRangeRequest, FoldingRangeRequestParam, FoldingRangeClientCapabilities, FoldingRangeKind as LSFoldingRangeKind } from 'vscode-languageserver-protocol-foldingprovider';
 
 // this method is called when vs code is activated
 export function activate(context: ExtensionContext) {
 
-	// The server is implemented in node
-	let serverModule = context.asAbsolutePath(path.join('server', 'out', 'cssServerMain.js'));
+	let serverMain = readJSONFile(context.asAbsolutePath('./server/package.json')).main;
+	let serverModule = context.asAbsolutePath(path.join('server', serverMain));
+
 	// The debug options for the server
 	let debugOptions = { execArgv: ['--nolazy', '--inspect=6044'] };
 
@@ -42,21 +43,6 @@ export function activate(context: ExtensionContext) {
 	// Create the language client and start the client.
 	let client = new LanguageClient('css', localize('cssserver.name', 'CSS Language Server'), serverOptions, clientOptions);
 	client.registerProposedFeatures();
-	client.registerFeature({
-		fillClientCapabilities(capabilities: FoldingRangeClientCapabilities): void {
-			let textDocumentCap = capabilities.textDocument;
-			if (!textDocumentCap) {
-				textDocumentCap = capabilities.textDocument = {};
-			}
-			textDocumentCap.foldingRange = {
-				dynamicRegistration: false,
-				rangeLimit: 5000,
-				lineFoldingOnly: true
-			};
-		},
-		initialize(capabilities, documentSelector): void {
-		}
-	});
 
 	let disposable = client.start();
 	// Push the disposable to the context's subscriptions so that the
@@ -85,7 +71,6 @@ export function activate(context: ExtensionContext) {
 
 	client.onReady().then(() => {
 		context.subscriptions.push(initCompletionProvider());
-		context.subscriptions.push(initFoldingProvider());
 	});
 
 	function initCompletionProvider(): Disposable {
@@ -116,38 +101,6 @@ export function activate(context: ExtensionContext) {
 		});
 	}
 
-	function initFoldingProvider(): Disposable {
-		function getKind(kind: string | undefined): FoldingRangeKind | undefined {
-			if (kind) {
-				switch (kind) {
-					case LSFoldingRangeKind.Comment:
-						return FoldingRangeKind.Comment;
-					case LSFoldingRangeKind.Imports:
-						return FoldingRangeKind.Imports;
-					case LSFoldingRangeKind.Region:
-						return FoldingRangeKind.Region;
-				}
-			}
-			return void 0;
-		}
-		return languages.registerFoldingRangeProvider(documentSelector, {
-			provideFoldingRanges(document: TextDocument, context: FoldingContext, token: CancellationToken) {
-				const param: FoldingRangeRequestParam = {
-					textDocument: client.code2ProtocolConverter.asTextDocumentIdentifier(document)
-				};
-				return client.sendRequest(FoldingRangeRequest.type, param, token).then(ranges => {
-					if (Array.isArray(ranges)) {
-						return ranges.map(r => new FoldingRange(r.startLine, r.endLine, getKind(r.kind)));
-					}
-					return null;
-				}, error => {
-					client.logFailedRequest(FoldingRangeRequest.type, error);
-					return null;
-				});
-			}
-		});
-	}
-
 	commands.registerCommand('_css.applyCodeAction', applyCodeAction);
 
 	function applyCodeAction(uri: string, documentVersion: number, edits: TextEdit[]) {
@@ -169,3 +122,12 @@ export function activate(context: ExtensionContext) {
 	}
 }
 
+function readJSONFile(location: string) {
+	try {
+		return JSON.parse(fs.readFileSync(location).toString());
+	} catch (e) {
+		console.log(`Problems reading ${location}: ${e}`);
+		return {};
+	}
+}
+
diff --git a/extensions/css-language-features/extension.webpack.config.js b/extensions/css-language-features/extension.webpack.config.js
new file mode 100644
index 00000000000..3c1d55ef6a0
--- /dev/null
+++ b/extensions/css-language-features/extension.webpack.config.js
@@ -0,0 +1,37 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+//@ts-check
+
+'use strict';
+
+const withDefaults = require('../shared.webpack.config');
+const CopyWebpackPlugin = require('copy-webpack-plugin');
+const path = require('path');
+
+module.exports = withDefaults({
+	context: path.join(__dirname, 'client'),
+	entry: {
+		extension: './src/cssMain.ts',
+	},
+	resolve: {
+		mainFields: ['module', 'main'],
+		extensions: ['.ts', '.js'] // support ts-files and js-files
+	},
+	output: {
+		filename: 'cssMain.js',
+		path: path.join(__dirname, 'client', 'dist'),
+		libraryTarget: "commonjs",
+	},
+	externals: {
+		'./files': 'commonjs', // ignored because it doesn't exist
+	},
+	plugins: [
+		new CopyWebpackPlugin([
+			{ from: './out/*.sh', to: '[name].sh' },
+			{ from: './out/nls.*.json', to: '[name].json' }
+		])
+	]
+});
diff --git a/extensions/css-language-features/package.json b/extensions/css-language-features/package.json
index b3e9af99b7b..a565f4309ef 100644
--- a/extensions/css-language-features/package.json
+++ b/extensions/css-language-features/package.json
@@ -19,6 +19,7 @@
   "scripts": {
     "compile": "gulp compile-extension:css-language-features-client compile-extension:css-language-features-server",
     "watch": "gulp watch-extension:css-language-features-client watch-extension:css-language-features-server",
+    "test": "mocha",
     "postinstall": "cd server && yarn install",
     "install-client-next": "yarn add vscode-languageclient@next"
   },
@@ -109,7 +110,7 @@
               "error"
             ],
             "default": "ignore",
-            "description": "%css.lint.boxModel.desc%"
+            "markdownDescription": "%css.lint.boxModel.desc%"
           },
           "css.lint.universalSelector": {
             "type": "string",
@@ -120,7 +121,7 @@
               "error"
             ],
             "default": "ignore",
-            "description": "%css.lint.universalSelector.desc%"
+            "markdownDescription": "%css.lint.universalSelector.desc%"
           },
           "css.lint.zeroUnits": {
             "type": "string",
@@ -208,7 +209,7 @@
               "error"
             ],
             "default": "warning",
-            "description": "%css.lint.propertyIgnoredDueToDisplay.desc%"
+            "markdownDescription": "%css.lint.propertyIgnoredDueToDisplay.desc%"
           },
           "css.lint.important": {
             "type": "string",
@@ -230,7 +231,7 @@
               "error"
             ],
             "default": "ignore",
-            "description": "%css.lint.float.desc%"
+            "markdownDescription": "%css.lint.float.desc%"
           },
           "css.lint.idSelector": {
             "type": "string",
@@ -243,6 +244,17 @@
             "default": "ignore",
             "description": "%css.lint.idSelector.desc%"
           },
+          "css.lint.unknownAtRules": {
+            "type": "string",
+            "scope": "resource",
+            "enum": [
+              "ignore",
+              "warning",
+              "error"
+            ],
+            "default": "warning",
+            "description": "%css.lint.unknownAtRules.desc%"
+          },
           "css.trace.server": {
             "type": "string",
             "scope": "window",
@@ -338,7 +350,7 @@
               "error"
             ],
             "default": "ignore",
-            "description": "%scss.lint.boxModel.desc%"
+            "markdownDescription": "%scss.lint.boxModel.desc%"
           },
           "scss.lint.universalSelector": {
             "type": "string",
@@ -349,7 +361,7 @@
               "error"
             ],
             "default": "ignore",
-            "description": "%scss.lint.universalSelector.desc%"
+            "markdownDescription": "%scss.lint.universalSelector.desc%"
           },
           "scss.lint.zeroUnits": {
             "type": "string",
@@ -371,7 +383,7 @@
               "error"
             ],
             "default": "warning",
-            "description": "%scss.lint.fontFaceProperties.desc%"
+            "markdownDescription": "%scss.lint.fontFaceProperties.desc%"
           },
           "scss.lint.hexColorLength": {
             "type": "string",
@@ -437,7 +449,7 @@
               "error"
             ],
             "default": "warning",
-            "description": "%scss.lint.propertyIgnoredDueToDisplay.desc%"
+            "markdownDescription": "%scss.lint.propertyIgnoredDueToDisplay.desc%"
           },
           "scss.lint.important": {
             "type": "string",
@@ -448,7 +460,7 @@
               "error"
             ],
             "default": "ignore",
-            "description": "%scss.lint.important.desc%"
+            "markdownDescription": "%scss.lint.important.desc%"
           },
           "scss.lint.float": {
             "type": "string",
@@ -459,7 +471,7 @@
               "error"
             ],
             "default": "ignore",
-            "description": "%scss.lint.float.desc%"
+            "markdownDescription": "%scss.lint.float.desc%"
           },
           "scss.lint.idSelector": {
             "type": "string",
@@ -557,7 +569,7 @@
               "error"
             ],
             "default": "ignore",
-            "description": "%less.lint.boxModel.desc%"
+            "markdownDescription": "%less.lint.boxModel.desc%"
           },
           "less.lint.universalSelector": {
             "type": "string",
@@ -568,7 +580,7 @@
               "error"
             ],
             "default": "ignore",
-            "description": "%less.lint.universalSelector.desc%"
+            "markdownDescription": "%less.lint.universalSelector.desc%"
           },
           "less.lint.zeroUnits": {
             "type": "string",
@@ -590,7 +602,7 @@
               "error"
             ],
             "default": "warning",
-            "description": "%less.lint.fontFaceProperties.desc%"
+            "markdownDescription": "%less.lint.fontFaceProperties.desc%"
           },
           "less.lint.hexColorLength": {
             "type": "string",
@@ -656,7 +668,7 @@
               "error"
             ],
             "default": "warning",
-            "description": "%less.lint.propertyIgnoredDueToDisplay.desc%"
+            "markdownDescription": "%less.lint.propertyIgnoredDueToDisplay.desc%"
           },
           "less.lint.important": {
             "type": "string",
@@ -678,7 +690,7 @@
               "error"
             ],
             "default": "ignore",
-            "description": "%less.lint.float.desc%"
+            "markdownDescription": "%less.lint.float.desc%"
           },
           "less.lint.idSelector": {
             "type": "string",
@@ -696,11 +708,11 @@
     ]
   },
   "dependencies": {
-    "vscode-languageclient": "^4.1.4",
-    "vscode-languageserver-protocol-foldingprovider": "^2.0.1",
-    "vscode-nls": "^3.2.2"
+    "vscode-languageclient": "^5.1.0-next.9",
+    "vscode-nls": "^4.0.0"
   },
   "devDependencies": {
-    "@types/node": "7.0.43"
+    "@types/node": "^8.10.25",
+    "mocha": "^5.2.0"
   }
 }
diff --git a/extensions/css-language-features/package.nls.json b/extensions/css-language-features/package.nls.json
index cbe77ea0abb..f62c6fb669c 100644
--- a/extensions/css-language-features/package.nls.json
+++ b/extensions/css-language-features/package.nls.json
@@ -2,72 +2,73 @@
 	"displayName": "CSS Language Features",
 	"description": "Provides rich language support for CSS, LESS and SCSS files.",
 	"css.title": "CSS",
-	"css.lint.argumentsInColorFunction.desc": "Invalid number of parameters",
-	"css.lint.boxModel.desc": "Do not use width or height when using padding or border",
-	"css.lint.compatibleVendorPrefixes.desc": "When using a vendor-specific prefix make sure to also include all other vendor-specific properties",
-	"css.lint.duplicateProperties.desc": "Do not use duplicate style definitions",
-	"css.lint.emptyRules.desc": "Do not use empty rulesets",
-	"css.lint.float.desc": "Avoid using 'float'. Floats lead to fragile CSS that is easy to break if one aspect of the layout changes.",
-	"css.lint.fontFaceProperties.desc": "@font-face rule must define 'src' and 'font-family' properties",
-	"css.lint.hexColorLength.desc": "Hex colors must consist of three or six hex numbers",
+	"css.lint.argumentsInColorFunction.desc": "Invalid number of parameters.",
+	"css.lint.boxModel.desc": "Do not use `width` or `height` when using `padding` or `border`.",
+	"css.lint.compatibleVendorPrefixes.desc": "When using a vendor-specific prefix make sure to also include all other vendor-specific properties.",
+	"css.lint.duplicateProperties.desc": "Do not use duplicate style definitions.",
+	"css.lint.emptyRules.desc": "Do not use empty rulesets.",
+	"css.lint.float.desc": "Avoid using `float`. Floats lead to fragile CSS that is easy to break if one aspect of the layout changes.",
+	"css.lint.fontFaceProperties.desc": "`@font-face` rule must define `src` and `font-family` properties.",
+	"css.lint.hexColorLength.desc": "Hex colors must consist of three or six hex numbers.",
 	"css.lint.idSelector.desc": "Selectors should not contain IDs because these rules are too tightly coupled with the HTML.",
-	"css.lint.ieHack.desc": "IE hacks are only necessary when supporting IE7 and older",
-	"css.lint.important.desc": "Avoid using !important. It is an indication that the specificity of the entire CSS has gotten out of control and needs to be refactored.",
-	"css.lint.importStatement.desc": "Import statements do not load in parallel",
-	"css.lint.propertyIgnoredDueToDisplay.desc": "Property is ignored due to the display. E.g. with 'display: inline', the width, height, margin-top, margin-bottom, and float properties have no effect",
-	"css.lint.universalSelector.desc": "The universal selector (*) is known to be slow",
+	"css.lint.ieHack.desc": "IE hacks are only necessary when supporting IE7 and older.",
+	"css.lint.important.desc": "Avoid using `!important`. It is an indication that the specificity of the entire CSS has gotten out of control and needs to be refactored.",
+	"css.lint.importStatement.desc": "Import statements do not load in parallel.",
+	"css.lint.propertyIgnoredDueToDisplay.desc": "Property is ignored due to the display. E.g. with `display: inline`, the `width`, `height`, `margin-top`, `margin-bottom`, and `float` properties have no effect.",
+	"css.lint.universalSelector.desc": "The universal selector (`*`) is known to be slow.",
+	"css.lint.unknownAtRules.desc": "Unknown at-rule.",
 	"css.lint.unknownProperties.desc": "Unknown property.",
 	"css.lint.unknownVendorSpecificProperties.desc": "Unknown vendor specific property.",
-	"css.lint.vendorPrefix.desc": "When using a vendor-specific prefix also include the standard property",
-	"css.lint.zeroUnits.desc": "No unit for zero needed",
+	"css.lint.vendorPrefix.desc": "When using a vendor-specific prefix, also include the standard property.",
+	"css.lint.zeroUnits.desc": "No unit for zero needed.",
 	"css.trace.server.desc": "Traces the communication between VS Code and the CSS language server.",
 	"css.validate.title": "Controls CSS validation and problem severities.",
-	"css.validate.desc": "Enables or disables all validations",
+	"css.validate.desc": "Enables or disables all validations.",
 	"less.title": "LESS",
-	"less.lint.argumentsInColorFunction.desc": "Invalid number of parameters",
-	"less.lint.boxModel.desc": "Do not use width or height when using padding or border",
-	"less.lint.compatibleVendorPrefixes.desc": "When using a vendor-specific prefix make sure to also include all other vendor-specific properties",
-	"less.lint.duplicateProperties.desc": "Do not use duplicate style definitions",
-	"less.lint.emptyRules.desc": "Do not use empty rulesets",
-	"less.lint.float.desc": "Avoid using 'float'. Floats lead to fragile CSS that is easy to break if one aspect of the layout changes.",
-	"less.lint.fontFaceProperties.desc": "@font-face rule must define 'src' and 'font-family' properties",
-	"less.lint.hexColorLength.desc": "Hex colors must consist of three or six hex numbers",
+	"less.lint.argumentsInColorFunction.desc": "Invalid number of parameters.",
+	"less.lint.boxModel.desc": "Do not use `width` or `height` when using `padding` or `border`.",
+	"less.lint.compatibleVendorPrefixes.desc": "When using a vendor-specific prefix make sure to also include all other vendor-specific properties.",
+	"less.lint.duplicateProperties.desc": "Do not use duplicate style definitions.",
+	"less.lint.emptyRules.desc": "Do not use empty rulesets.",
+	"less.lint.float.desc": "Avoid using `float`. Floats lead to fragile CSS that is easy to break if one aspect of the layout changes.",
+	"less.lint.fontFaceProperties.desc": "`@font-face` rule must define `src` and `font-family` properties.",
+	"less.lint.hexColorLength.desc": "Hex colors must consist of three or six hex numbers.",
 	"less.lint.idSelector.desc": "Selectors should not contain IDs because these rules are too tightly coupled with the HTML.",
-	"less.lint.ieHack.desc": "IE hacks are only necessary when supporting IE7 and older",
+	"less.lint.ieHack.desc": "IE hacks are only necessary when supporting IE7 and older.",
 	"less.lint.important.desc": "Avoid using !important. It is an indication that the specificity of the entire CSS has gotten out of control and needs to be refactored.",
-	"less.lint.importStatement.desc": "Import statements do not load in parallel",
-	"less.lint.propertyIgnoredDueToDisplay.desc": "Property is ignored due to the display. E.g. with 'display: inline', the width, height, margin-top, margin-bottom, and float properties have no effect",
-	"less.lint.universalSelector.desc": "The universal selector (*) is known to be slow",
+	"less.lint.importStatement.desc": "Import statements do not load in parallel.",
+	"less.lint.propertyIgnoredDueToDisplay.desc": "Property is ignored due to the display. E.g. with `display: inline`, the `width`, `height`, `margin-top`, `margin-bottom`, and `float` properties have no effect.",
+	"less.lint.universalSelector.desc": "The universal selector (`*`) is known to be slow.",
 	"less.lint.unknownProperties.desc": "Unknown property.",
 	"less.lint.unknownVendorSpecificProperties.desc": "Unknown vendor specific property.",
-	"less.lint.vendorPrefix.desc": "When using a vendor-specific prefix also include the standard property",
-	"less.lint.zeroUnits.desc": "No unit for zero needed",
+	"less.lint.vendorPrefix.desc": "When using a vendor-specific prefix, also include the standard property.",
+	"less.lint.zeroUnits.desc": "No unit for zero needed.",
 	"less.validate.title": "Controls LESS validation and problem severities.",
-	"less.validate.desc": "Enables or disables all validations",
+	"less.validate.desc": "Enables or disables all validations.",
 	"scss.title": "SCSS (Sass)",
-	"scss.lint.argumentsInColorFunction.desc": "Invalid number of parameters",
-	"scss.lint.boxModel.desc": "Do not use width or height when using padding or border",
-	"scss.lint.compatibleVendorPrefixes.desc": "When using a vendor-specific prefix make sure to also include all other vendor-specific properties",
-	"scss.lint.duplicateProperties.desc": "Do not use duplicate style definitions",
-	"scss.lint.emptyRules.desc": "Do not use empty rulesets",
-	"scss.lint.float.desc": "Avoid using 'float'. Floats lead to fragile CSS that is easy to break if one aspect of the layout changes.",
-	"scss.lint.fontFaceProperties.desc": "@font-face rule must define 'src' and 'font-family' properties",
-	"scss.lint.hexColorLength.desc": "Hex colors must consist of three or six hex numbers",
+	"scss.lint.argumentsInColorFunction.desc": "Invalid number of parameters.",
+	"scss.lint.boxModel.desc": "Do not use `width` or `height` when using `padding` or `border`.",
+	"scss.lint.compatibleVendorPrefixes.desc": "When using a vendor-specific prefix make sure to also include all other vendor-specific properties.",
+	"scss.lint.duplicateProperties.desc": "Do not use duplicate style definitions.",
+	"scss.lint.emptyRules.desc": "Do not use empty rulesets.",
+	"scss.lint.float.desc": "Avoid using `float`. Floats lead to fragile CSS that is easy to break if one aspect of the layout changes.",
+	"scss.lint.fontFaceProperties.desc": "`@font-face` rule must define `src` and `font-family` properties.",
+	"scss.lint.hexColorLength.desc": "Hex colors must consist of three or six hex numbers.",
 	"scss.lint.idSelector.desc": "Selectors should not contain IDs because these rules are too tightly coupled with the HTML.",
-	"scss.lint.ieHack.desc": "IE hacks are only necessary when supporting IE7 and older",
+	"scss.lint.ieHack.desc": "IE hacks are only necessary when supporting IE7 and older.",
 	"scss.lint.important.desc": "Avoid using !important. It is an indication that the specificity of the entire CSS has gotten out of control and needs to be refactored.",
-	"scss.lint.importStatement.desc": "Import statements do not load in parallel",
-	"scss.lint.propertyIgnoredDueToDisplay.desc": "Property is ignored due to the display. E.g. with 'display: inline', the width, height, margin-top, margin-bottom, and float properties have no effect",
-	"scss.lint.universalSelector.desc": "The universal selector (*) is known to be slow",
+	"scss.lint.importStatement.desc": "Import statements do not load in parallel.",
+	"scss.lint.propertyIgnoredDueToDisplay.desc": "Property is ignored due to the display. E.g. with `display: inline`, the `width`, `height`, `margin-top`, `margin-bottom`, and `float` properties have no effect.",
+	"scss.lint.universalSelector.desc": "The universal selector (`*`) is known to be slow.",
 	"scss.lint.unknownProperties.desc": "Unknown property.",
 	"scss.lint.unknownVendorSpecificProperties.desc": "Unknown vendor specific property.",
-	"scss.lint.vendorPrefix.desc": "When using a vendor-specific prefix also include the standard property",
-	"scss.lint.zeroUnits.desc": "No unit for zero needed",
+	"scss.lint.vendorPrefix.desc": "When using a vendor-specific prefix, also include the standard property.",
+	"scss.lint.zeroUnits.desc": "No unit for zero needed.",
 	"scss.validate.title": "Controls SCSS validation and problem severities.",
-	"scss.validate.desc": "Enables or disables all validations",
-	"less.colorDecorators.enable.desc": "Enables or disables color decorators",
-	"scss.colorDecorators.enable.desc": "Enables or disables color decorators",
-	"css.colorDecorators.enable.desc": "Enables or disables color decorators",
+	"scss.validate.desc": "Enables or disables all validations.",
+	"less.colorDecorators.enable.desc": "Enables or disables color decorators.",
+	"scss.colorDecorators.enable.desc": "Enables or disables color decorators.",
+	"css.colorDecorators.enable.desc": "Enables or disables color decorators.",
 	"css.colorDecorators.enable.deprecationMessage": "The setting `css.colorDecorators.enable` has been deprecated in favor of `editor.colorDecorators`.",
 	"scss.colorDecorators.enable.deprecationMessage": "The setting `scss.colorDecorators.enable` has been deprecated in favor of `editor.colorDecorators`.",
 	"less.colorDecorators.enable.deprecationMessage": "The setting `less.colorDecorators.enable` has been deprecated in favor of `editor.colorDecorators`."
diff --git a/extensions/css-language-features/server/build/filesFillIn.js b/extensions/css-language-features/server/build/filesFillIn.js
new file mode 100644
index 00000000000..906617384e0
--- /dev/null
+++ b/extensions/css-language-features/server/build/filesFillIn.js
@@ -0,0 +1,5 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+module.exports = {};
\ No newline at end of file
diff --git a/extensions/css-language-features/server/extension.webpack.config.js b/extensions/css-language-features/server/extension.webpack.config.js
new file mode 100644
index 00000000000..29533fa59fb
--- /dev/null
+++ b/extensions/css-language-features/server/extension.webpack.config.js
@@ -0,0 +1,38 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+//@ts-check
+
+'use strict';
+
+const withDefaults = require('../../shared.webpack.config');
+const path = require('path');
+var webpack = require('webpack');
+
+module.exports = withDefaults({
+	context: path.join(__dirname),
+	entry: {
+		extension: './src/cssServerMain.ts',
+	},
+	resolve: {
+		mainFields: ['module', 'main'],
+		extensions: ['.ts', '.js'] // support ts-files and js-files
+	},
+	output: {
+		filename: 'cssServerMain.js',
+		path: path.join(__dirname, 'dist'),
+		libraryTarget: "commonjs",
+	},
+	externals: {
+		"vscode-nls": 'commonjs vscode-nls',
+	},
+	plugins: [
+		new webpack.NormalModuleReplacementPlugin(
+			/(\/|\\)vscode-languageserver(\/|\\)lib(\/|\\)files\.js/,
+			require.resolve('./build/filesFillIn')
+		),
+		new webpack.IgnorePlugin(/vertx/)
+	],
+});
diff --git a/extensions/css-language-features/server/package.json b/extensions/css-language-features/server/package.json
index 9404a08ce70..0ef07147fe0 100644
--- a/extensions/css-language-features/server/package.json
+++ b/extensions/css-language-features/server/package.json
@@ -7,14 +7,18 @@
   "engines": {
     "node": "*"
   },
+  "main": "./out/cssServerMain",
   "dependencies": {
-    "vscode-css-languageservice": "^3.0.9-next.18",
-    "vscode-languageserver": "^4.1.3",
-    "vscode-languageserver-protocol-foldingprovider": "^2.0.1"
+    "vscode-css-languageservice": "^3.0.11-next.2",
+    "vscode-languageserver": "^5.1.0-next.5"
   },
   "devDependencies": {
     "@types/mocha": "2.2.33",
-    "@types/node": "7.0.43"
+    "@types/node": "^8.10.25",
+    "glob": "^7.1.2",
+    "mocha": "^5.2.0",
+    "mocha-junit-reporter": "^1.17.0",
+    "mocha-multi-reporters": "^1.1.7"
   },
   "scripts": {
     "compile": "gulp compile-extension:css-language-features-server",
diff --git a/extensions/css-language-features/server/src/cssServerMain.ts b/extensions/css-language-features/server/src/cssServerMain.ts
index 8778faf2b79..853f6690473 100644
--- a/extensions/css-language-features/server/src/cssServerMain.ts
+++ b/extensions/css-language-features/server/src/cssServerMain.ts
@@ -7,15 +7,14 @@
 import {
 	createConnection, IConnection, TextDocuments, InitializeParams, InitializeResult, ServerCapabilities, ConfigurationRequest, WorkspaceFolder
 } from 'vscode-languageserver';
-
+import URI from 'vscode-uri';
 import { TextDocument, CompletionList } from 'vscode-languageserver-types';
 
 import { getCSSLanguageService, getSCSSLanguageService, getLESSLanguageService, LanguageSettings, LanguageService, Stylesheet } from 'vscode-css-languageservice';
 import { getLanguageModelCache } from './languageModelCache';
-import { formatError, runSafe } from './utils/runner';
-import URI from 'vscode-uri';
 import { getPathCompletionParticipant } from './pathCompletion';
-import { FoldingRangeServerCapabilities, FoldingRangeRequest } from 'vscode-languageserver-protocol-foldingprovider';
+import { formatError, runSafe } from './utils/runner';
+import { getDocumentContext } from './utils/documentContext';
 
 export interface Settings {
 	css: LanguageSettings;
@@ -78,7 +77,7 @@ connection.onInitialize((params: InitializeParams): InitializeResult => {
 	scopedSettingsSupport = !!getClientCapability('workspace.configuration', false);
 	foldingRangeLimit = getClientCapability('textDocument.foldingRange.rangeLimit', Number.MAX_VALUE);
 
-	const capabilities: ServerCapabilities & FoldingRangeServerCapabilities = {
+	const capabilities: ServerCapabilities = {
 		// Tell the client that the server works in FULL text document sync mode
 		textDocumentSync: documents.syncKind,
 		completionProvider: snippetSupport ? { resolveProvider: false, triggerCharacters: ['/'] } : undefined,
@@ -87,6 +86,9 @@ connection.onInitialize((params: InitializeParams): InitializeResult => {
 		referencesProvider: true,
 		definitionProvider: true,
 		documentHighlightProvider: true,
+		documentLinkProvider: {
+			resolveProvider: false
+		},
 		codeActionProvider: true,
 		renameProvider: true,
 		colorProvider: {},
@@ -228,29 +230,43 @@ connection.onDocumentSymbol((documentSymbolParams, token) => {
 	}, [], `Error while computing document symbols for ${documentSymbolParams.textDocument.uri}`, token);
 });
 
-connection.onDefinition((documentSymbolParams, token) => {
+connection.onDefinition((documentDefinitionParams, token) => {
 	return runSafe(() => {
-		const document = documents.get(documentSymbolParams.textDocument.uri);
+		const document = documents.get(documentDefinitionParams.textDocument.uri);
 		if (document) {
 
 			const stylesheet = stylesheets.get(document);
-			return getLanguageService(document).findDefinition(document, documentSymbolParams.position, stylesheet);
+			return getLanguageService(document).findDefinition(document, documentDefinitionParams.position, stylesheet);
 		}
 		return null;
-	}, null, `Error while computing definitions for ${documentSymbolParams.textDocument.uri}`, token);
+	}, null, `Error while computing definitions for ${documentDefinitionParams.textDocument.uri}`, token);
 });
 
-connection.onDocumentHighlight((documentSymbolParams, token) => {
+connection.onDocumentHighlight((documentHighlightParams, token) => {
 	return runSafe(() => {
-		const document = documents.get(documentSymbolParams.textDocument.uri);
+		const document = documents.get(documentHighlightParams.textDocument.uri);
 		if (document) {
 			const stylesheet = stylesheets.get(document);
-			return getLanguageService(document).findDocumentHighlights(document, documentSymbolParams.position, stylesheet);
+			return getLanguageService(document).findDocumentHighlights(document, documentHighlightParams.position, stylesheet);
 		}
 		return [];
-	}, [], `Error while computing document highlights for ${documentSymbolParams.textDocument.uri}`, token);
+	}, [], `Error while computing document highlights for ${documentHighlightParams.textDocument.uri}`, token);
 });
 
+
+connection.onDocumentLinks((documentLinkParams, token) => {
+	return runSafe(() => {
+		const document = documents.get(documentLinkParams.textDocument.uri);
+		if (document) {
+			const documentContext = getDocumentContext(document.uri, workspaceFolders);
+			const stylesheet = stylesheets.get(document);
+			return getLanguageService(document).findDocumentLinks(document, stylesheet, documentContext);
+		}
+		return [];
+	}, [], `Error while computing document links for ${documentLinkParams.textDocument.uri}`, token);
+});
+
+
 connection.onReferences((referenceParams, token) => {
 	return runSafe(() => {
 		const document = documents.get(referenceParams.textDocument.uri);
@@ -306,7 +322,7 @@ connection.onRenameRequest((renameParameters, token) => {
 	}, null, `Error while computing renames for ${renameParameters.textDocument.uri}`, token);
 });
 
-connection.onRequest(FoldingRangeRequest.type, (params, token) => {
+connection.onFoldingRanges((params, token) => {
 	return runSafe(() => {
 		const document = documents.get(params.textDocument.uri);
 		if (document) {
diff --git a/extensions/css-language-features/server/src/pathCompletion.ts b/extensions/css-language-features/server/src/pathCompletion.ts
index b072c4136f6..ecbd9a09843 100644
--- a/extensions/css-language-features/server/src/pathCompletion.ts
+++ b/extensions/css-language-features/server/src/pathCompletion.ts
@@ -12,7 +12,7 @@ import { TextDocument, CompletionList, CompletionItemKind, CompletionItem, TextE
 import { WorkspaceFolder } from 'vscode-languageserver';
 import { ICompletionParticipant } from 'vscode-css-languageservice';
 
-import { startsWith } from './utils/strings';
+import { startsWith, endsWith } from './utils/strings';
 
 export function getPathCompletionParticipant(
 	document: TextDocument,
@@ -21,32 +21,79 @@ export function getPathCompletionParticipant(
 ): ICompletionParticipant {
 	return {
 		onCssURILiteralValue: ({ position, range, uriValue }) => {
-			const isValueQuoted = startsWith(uriValue, `'`) || startsWith(uriValue, `"`);
 			const fullValue = stripQuotes(uriValue);
-			const valueBeforeCursor = isValueQuoted
-				? fullValue.slice(0, position.character - (range.start.character + 1))
-				: fullValue.slice(0, position.character - range.start.character);
-
-			if (fullValue === '.' || fullValue === '..') {
-				result.isIncomplete = true;
+			if (!shouldDoPathCompletion(uriValue, workspaceFolders)) {
+				if (fullValue === '.' || fullValue === '..') {
+					result.isIncomplete = true;
+				}
 				return;
 			}
 
-			if (!workspaceFolders || workspaceFolders.length === 0) {
+			let suggestions = providePathSuggestions(uriValue, position, range, document, workspaceFolders);
+			result.items = [...suggestions, ...result.items];
+		},
+		onCssImportPath: ({ position, range, pathValue }) => {
+			const fullValue = stripQuotes(pathValue);
+			if (!shouldDoPathCompletion(pathValue, workspaceFolders)) {
+				if (fullValue === '.' || fullValue === '..') {
+					result.isIncomplete = true;
+				}
 				return;
 			}
-			const workspaceRoot = resolveWorkspaceRoot(document, workspaceFolders);
-			const paths = providePaths(valueBeforeCursor, URI.parse(document.uri).fsPath, workspaceRoot);
 
-			const fullValueRange = isValueQuoted ? shiftRange(range, 1, -1) : range;
-			const replaceRange = pathToReplaceRange(valueBeforeCursor, fullValue, fullValueRange);
-			const suggestions = paths.map(p => pathToSuggestion(p, replaceRange));
+			let suggestions = providePathSuggestions(pathValue, position, range, document, workspaceFolders);
+
+			if (document.languageId === 'scss') {
+				suggestions.forEach(s => {
+					if (startsWith(s.label, '_') && endsWith(s.label, '.scss')) {
+						if (s.textEdit) {
+							s.textEdit.newText = s.label.slice(1, -5);
+						} else {
+							s.label = s.label.slice(1, -5);
+						}
+					}
+				});
+			}
+
 			result.items = [...suggestions, ...result.items];
 		}
-
 	};
 }
 
+function providePathSuggestions(pathValue: string, position: Position, range: Range, document: TextDocument, workspaceFolders: WorkspaceFolder[]) {
+	const fullValue = stripQuotes(pathValue);
+	const isValueQuoted = startsWith(pathValue, `'`) || startsWith(pathValue, `"`);
+	const valueBeforeCursor = isValueQuoted
+		? fullValue.slice(0, position.character - (range.start.character + 1))
+		: fullValue.slice(0, position.character - range.start.character);
+	const workspaceRoot = resolveWorkspaceRoot(document, workspaceFolders);
+	const currentDocFsPath = URI.parse(document.uri).fsPath;
+
+	const paths = providePaths(valueBeforeCursor, currentDocFsPath, workspaceRoot).filter(p => {
+		// Exclude current doc's path
+		return path.resolve(currentDocFsPath, '../', p) !== currentDocFsPath;
+	});
+
+	const fullValueRange = isValueQuoted ? shiftRange(range, 1, -1) : range;
+	const replaceRange = pathToReplaceRange(valueBeforeCursor, fullValue, fullValueRange);
+
+	const suggestions = paths.map(p => pathToSuggestion(p, replaceRange));
+	return suggestions;
+}
+
+function shouldDoPathCompletion(pathValue: string, workspaceFolders: WorkspaceFolder[]): boolean {
+	const fullValue = stripQuotes(pathValue);
+	if (fullValue === '.' || fullValue === '..') {
+		return false;
+	}
+
+	if (!workspaceFolders || workspaceFolders.length === 0) {
+		return false;
+	}
+
+	return true;
+}
+
 function stripQuotes(fullValue: string) {
 	if (startsWith(fullValue, `'`) || startsWith(fullValue, `"`)) {
 		return fullValue.slice(1, -1);
@@ -59,16 +106,19 @@ function stripQuotes(fullValue: string) {
  * Get a list of path suggestions. Folder suggestions are suffixed with a slash.
  */
 function providePaths(valueBeforeCursor: string, activeDocFsPath: string, root?: string): string[] {
-	if (startsWith(valueBeforeCursor, '/') && !root) {
-		return [];
-	}
-
 	const lastIndexOfSlash = valueBeforeCursor.lastIndexOf('/');
 	const valueBeforeLastSlash = valueBeforeCursor.slice(0, lastIndexOfSlash + 1);
 
-	const parentDir = startsWith(valueBeforeCursor, '/')
-		? path.resolve(root, '.' + valueBeforeLastSlash)
-		: path.resolve(activeDocFsPath, '..', valueBeforeLastSlash);
+	const startsWithSlash = startsWith(valueBeforeCursor, '/');
+	let parentDir: string;
+	if (startsWithSlash) {
+		if (!root) {
+			return [];
+		}
+		parentDir = path.resolve(root, '.' + valueBeforeLastSlash);
+	} else {
+		parentDir = path.resolve(activeDocFsPath, '..', valueBeforeLastSlash);
+	}
 
 	try {
 		return fs.readdirSync(parentDir).map(f => {
diff --git a/extensions/css-language-features/server/src/test/completion.test.ts b/extensions/css-language-features/server/src/test/completion.test.ts
index 62094de6b5b..65cfed74d0c 100644
--- a/extensions/css-language-features/server/src/test/completion.test.ts
+++ b/extensions/css-language-features/server/src/test/completion.test.ts
@@ -33,11 +33,11 @@ suite('Completions', () => {
 		}
 	};
 
-	function assertCompletions(value: string, expected: { count?: number, items?: ItemDescription[] }, testUri: string, workspaceFolders?: WorkspaceFolder[]): void {
+	function assertCompletions(value: string, expected: { count?: number, items?: ItemDescription[] }, testUri: string, workspaceFolders?: WorkspaceFolder[], lang: string = 'css'): void {
 		const offset = value.indexOf('|');
 		value = value.substr(0, offset) + value.substr(offset + 1);
 
-		const document = TextDocument.create(testUri, 'css', 0, value);
+		const document = TextDocument.create(testUri, lang, 0, value);
 		const position = document.positionAt(offset);
 
 		if (!workspaceFolders) {
@@ -61,7 +61,7 @@ suite('Completions', () => {
 		}
 	}
 
-	test('CSS Path completion', function () {
+	test('CSS url() Path completion', function () {
 		let testUri = Uri.file(path.resolve(__dirname, '../../test/pathCompletionFixtures/about/about.css')).toString();
 		let folders = [{ name: 'x', uri: Uri.file(path.resolve(__dirname, '../../test')).toString() }];
 
@@ -95,7 +95,6 @@ suite('Completions', () => {
 
 		assertCompletions(`html { background-image: url('|')`, {
 			items: [
-				{ label: 'about.css', resultText: `html { background-image: url('about.css')` },
 				{ label: 'about.html', resultText: `html { background-image: url('about.html')` },
 			]
 		}, testUri, folders);
@@ -121,7 +120,7 @@ suite('Completions', () => {
 		}, testUri, folders);
 	});
 
-	test('CSS Path Completion - Unquoted url', function () {
+	test('CSS url() Path Completion - Unquoted url', function () {
 		let testUri = Uri.file(path.resolve(__dirname, '../../test/pathCompletionFixtures/about/about.css')).toString();
 		let folders = [{ name: 'x', uri: Uri.file(path.resolve(__dirname, '../../test')).toString() }];
 
@@ -149,4 +148,49 @@ suite('Completions', () => {
 			]
 		}, testUri, folders);
 	});
+
+	test('CSS @import Path completion', function () {
+		let testUri = Uri.file(path.resolve(__dirname, '../../test/pathCompletionFixtures/about/about.css')).toString();
+		let folders = [{ name: 'x', uri: Uri.file(path.resolve(__dirname, '../../test')).toString() }];
+
+		assertCompletions(`@import './|'`, {
+			items: [
+				{ label: 'about.html', resultText: `@import './about.html'` },
+			]
+		}, testUri, folders);
+
+		assertCompletions(`@import '../|'`, {
+			items: [
+				{ label: 'about/', resultText: `@import '../about/'` },
+				{ label: 'scss/', resultText: `@import '../scss/'` },
+				{ label: 'index.html', resultText: `@import '../index.html'` },
+				{ label: 'src/', resultText: `@import '../src/'` }
+			]
+		}, testUri, folders);
+	});
+
+	/**
+	 * For SCSS, `@import 'foo';` can be used for importing partial file `_foo.scss`
+	 */
+	test('SCSS @import Path completion', function () {
+		let testCSSUri = Uri.file(path.resolve(__dirname, '../../test/pathCompletionFixtures/about/about.css')).toString();
+		let folders = [{ name: 'x', uri: Uri.file(path.resolve(__dirname, '../../test')).toString() }];
+
+		/**
+		 * We are in a CSS file, so no special treatment for SCSS partial files
+		*/
+		assertCompletions(`@import '../scss/|'`, {
+			items: [
+				{ label: 'main.scss', resultText: `@import '../scss/main.scss'` },
+				{ label: '_foo.scss', resultText: `@import '../scss/_foo.scss'` }
+			]
+		}, testCSSUri, folders);
+
+		let testSCSSUri = Uri.file(path.resolve(__dirname, '../../test/pathCompletionFixtures/scss/main.scss')).toString();
+		assertCompletions(`@import './|'`, {
+			items: [
+				{ label: '_foo.scss', resultText: `@import './foo'` }
+			]
+		}, testSCSSUri, folders, 'scss');
+	});
 });
\ No newline at end of file
diff --git a/extensions/css-language-features/server/src/utils/documentContext.ts b/extensions/css-language-features/server/src/utils/documentContext.ts
new file mode 100644
index 00000000000..b37993b7655
--- /dev/null
+++ b/extensions/css-language-features/server/src/utils/documentContext.ts
@@ -0,0 +1,40 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+'use strict';
+
+import { DocumentContext } from 'vscode-css-languageservice';
+import { endsWith, startsWith } from '../utils/strings';
+import * as url from 'url';
+import { WorkspaceFolder } from 'vscode-languageserver';
+
+export function getDocumentContext(documentUri: string, workspaceFolders: WorkspaceFolder[]): DocumentContext {
+	function getRootFolder(): string | undefined {
+		for (let folder of workspaceFolders) {
+			let folderURI = folder.uri;
+			if (!endsWith(folderURI, '/')) {
+				folderURI = folderURI + '/';
+			}
+			if (startsWith(documentUri, folderURI)) {
+				return folderURI;
+			}
+		}
+		return void 0;
+	}
+
+	return {
+		resolveReference: (ref, base = documentUri) => {
+			if (ref[0] === '/') { // resolve absolute path against the current workspace folder
+				if (startsWith(base, 'file://')) {
+					let folderUri = getRootFolder();
+					if (folderUri) {
+						return folderUri + ref.substr(1);
+					}
+				}
+			}
+			return url.resolve(base, ref);
+		},
+	};
+}
+
diff --git a/extensions/css-language-features/server/src/utils/strings.ts b/extensions/css-language-features/server/src/utils/strings.ts
index f7ad0845cc8..114fb4f0808 100644
--- a/extensions/css-language-features/server/src/utils/strings.ts
+++ b/extensions/css-language-features/server/src/utils/strings.ts
@@ -17,3 +17,17 @@ export function startsWith(haystack: string, needle: string): boolean {
 
 	return true;
 }
+
+/**
+ * Determines if haystack ends with needle.
+ */
+export function endsWith(haystack: string, needle: string): boolean {
+	let diff = haystack.length - needle.length;
+	if (diff > 0) {
+		return haystack.lastIndexOf(needle) === diff;
+	} else if (diff === 0) {
+		return haystack === needle;
+	} else {
+		return false;
+	}
+}
diff --git a/extensions/css-language-features/server/test/index.js b/extensions/css-language-features/server/test/index.js
new file mode 100644
index 00000000000..570751f14ce
--- /dev/null
+++ b/extensions/css-language-features/server/test/index.js
@@ -0,0 +1,34 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+const path = require('path');
+const Mocha = require('mocha');
+const glob = require('glob');
+
+const suite = 'Integration CSS Extension Tests';
+
+const options = {
+	ui: 'tdd',
+	useColors: true,
+	timeout: 60000
+};
+
+if (process.env.BUILD_ARTIFACTSTAGINGDIRECTORY) {
+	options.reporter = 'mocha-multi-reporters';
+	options.reporterOptions = {
+		reporterEnabled: 'spec, mocha-junit-reporter',
+		mochaJunitReporterReporterOptions: {
+			testsuitesTitle: `${suite} ${process.platform}`,
+			mochaFile: path.join(process.env.BUILD_ARTIFACTSTAGINGDIRECTORY, `test-results/${process.platform}-${suite.toLowerCase().replace(/[^\w]/g, '-')}-results.xml`)
+		}
+	};
+}
+
+const mocha = new Mocha(options);
+
+glob.sync(__dirname + '/../out/test/**/*.test.js')
+	.forEach(file => mocha.addFile(file));
+
+mocha.run(failures => process.exit(failures ? -1 : 0));
diff --git a/extensions/css-language-features/server/test/mocha.opts b/extensions/css-language-features/server/test/mocha.opts
deleted file mode 100644
index 97e8b723ae2..00000000000
--- a/extensions/css-language-features/server/test/mocha.opts
+++ /dev/null
@@ -1,3 +0,0 @@
---ui tdd
---useColors true
-./out/test
\ No newline at end of file
diff --git a/extensions/css-language-features/server/test/pathCompletionFixtures/scss/_foo.scss b/extensions/css-language-features/server/test/pathCompletionFixtures/scss/_foo.scss
new file mode 100644
index 00000000000..adae63e647c
--- /dev/null
+++ b/extensions/css-language-features/server/test/pathCompletionFixtures/scss/_foo.scss
@@ -0,0 +1,4 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
\ No newline at end of file
diff --git a/extensions/css-language-features/server/test/pathCompletionFixtures/scss/main.scss b/extensions/css-language-features/server/test/pathCompletionFixtures/scss/main.scss
new file mode 100644
index 00000000000..adae63e647c
--- /dev/null
+++ b/extensions/css-language-features/server/test/pathCompletionFixtures/scss/main.scss
@@ -0,0 +1,4 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
\ No newline at end of file
diff --git a/extensions/css-language-features/server/yarn.lock b/extensions/css-language-features/server/yarn.lock
index f9b1f5c6468..7e5589b98e8 100644
--- a/extensions/css-language-features/server/yarn.lock
+++ b/extensions/css-language-features/server/yarn.lock
@@ -6,50 +6,239 @@
   version "2.2.33"
   resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-2.2.33.tgz#d79a0061ec270379f4d9e225f4096fb436669def"
 
-"@types/node@7.0.43":
-  version "7.0.43"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.43.tgz#a187e08495a075f200ca946079c914e1a5fe962c"
+"@types/node@^8.10.25":
+  version "8.10.25"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-8.10.25.tgz#801fe4e39372cef18f268db880a5fbfcf71adc7e"
 
-vscode-css-languageservice@^3.0.9-next.18:
-  version "3.0.9-next.18"
-  resolved "https://registry.yarnpkg.com/vscode-css-languageservice/-/vscode-css-languageservice-3.0.9-next.18.tgz#f8f25123b5a8cdc9f72fafcd2c0088f726322437"
+ansi-regex@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
+
+balanced-match@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
+
+brace-expansion@^1.1.7:
+  version "1.1.11"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
   dependencies:
-    vscode-languageserver-types "^3.7.2"
-    vscode-nls "^3.2.2"
+    balanced-match "^1.0.0"
+    concat-map "0.0.1"
+
+browser-stdout@1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.1.tgz#baa559ee14ced73452229bad7326467c61fabd60"
+
+charenc@~0.0.1:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/charenc/-/charenc-0.0.2.tgz#c0a1d2f3a7092e03774bfa83f14c0fc5790a8667"
+
+commander@2.15.1:
+  version "2.15.1"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.15.1.tgz#df46e867d0fc2aec66a34662b406a9ccafff5b0f"
+
+concat-map@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
+
+crypt@~0.0.1:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/crypt/-/crypt-0.0.2.tgz#88d7ff7ec0dfb86f713dc87bbb42d044d3e6c41b"
+
+debug@3.1.0, debug@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
+  dependencies:
+    ms "2.0.0"
+
+debug@^2.2.0:
+  version "2.6.9"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
+  dependencies:
+    ms "2.0.0"
+
+diff@3.5.0:
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
+
+escape-string-regexp@1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
+
+fs.realpath@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
+
+glob@7.1.2, glob@^7.1.2:
+  version "7.1.2"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.0.4"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
+growl@1.10.5:
+  version "1.10.5"
+  resolved "https://registry.yarnpkg.com/growl/-/growl-1.10.5.tgz#f2735dc2283674fa67478b10181059355c369e5e"
+
+has-flag@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
+
+he@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/he/-/he-1.1.1.tgz#93410fd21b009735151f8868c2f271f3427e23fd"
+
+inflight@^1.0.4:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
+  dependencies:
+    once "^1.3.0"
+    wrappy "1"
+
+inherits@2:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
+
+is-buffer@~1.1.1:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
+
+lodash@^4.16.4:
+  version "4.17.10"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"
+
+md5@^2.1.0:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/md5/-/md5-2.2.1.tgz#53ab38d5fe3c8891ba465329ea23fac0540126f9"
+  dependencies:
+    charenc "~0.0.1"
+    crypt "~0.0.1"
+    is-buffer "~1.1.1"
+
+minimatch@3.0.4, minimatch@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
+  dependencies:
+    brace-expansion "^1.1.7"
+
+minimist@0.0.8:
+  version "0.0.8"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
+
+mkdirp@0.5.1, mkdirp@~0.5.1:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
+  dependencies:
+    minimist "0.0.8"
+
+mocha-junit-reporter@^1.17.0:
+  version "1.17.0"
+  resolved "https://registry.yarnpkg.com/mocha-junit-reporter/-/mocha-junit-reporter-1.17.0.tgz#2e5149ed40fc5d2e3ca71e42db5ab1fec9c6d85c"
+  dependencies:
+    debug "^2.2.0"
+    md5 "^2.1.0"
+    mkdirp "~0.5.1"
+    strip-ansi "^4.0.0"
+    xml "^1.0.0"
+
+mocha-multi-reporters@^1.1.7:
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/mocha-multi-reporters/-/mocha-multi-reporters-1.1.7.tgz#cc7f3f4d32f478520941d852abb64d9988587d82"
+  dependencies:
+    debug "^3.1.0"
+    lodash "^4.16.4"
+
+mocha@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/mocha/-/mocha-5.2.0.tgz#6d8ae508f59167f940f2b5b3c4a612ae50c90ae6"
+  dependencies:
+    browser-stdout "1.3.1"
+    commander "2.15.1"
+    debug "3.1.0"
+    diff "3.5.0"
+    escape-string-regexp "1.0.5"
+    glob "7.1.2"
+    growl "1.10.5"
+    he "1.1.1"
+    minimatch "3.0.4"
+    mkdirp "0.5.1"
+    supports-color "5.4.0"
+
+ms@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
+
+once@^1.3.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
+  dependencies:
+    wrappy "1"
+
+path-is-absolute@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
+
+strip-ansi@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
+  dependencies:
+    ansi-regex "^3.0.0"
+
+supports-color@5.4.0:
+  version "5.4.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.4.0.tgz#1c6b337402c2137605efe19f10fec390f6faab54"
+  dependencies:
+    has-flag "^3.0.0"
+
+vscode-css-languageservice@^3.0.11-next.2:
+  version "3.0.11-next.2"
+  resolved "https://registry.yarnpkg.com/vscode-css-languageservice/-/vscode-css-languageservice-3.0.11-next.2.tgz#7aa41a895abbcb3c0884d9612ae546c39de8b984"
+  dependencies:
+    vscode-languageserver-types "^3.12.0"
+    vscode-nls "^3.2.5"
 
 vscode-jsonrpc@^3.6.2:
   version "3.6.2"
   resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-3.6.2.tgz#3b5eef691159a15556ecc500e9a8a0dd143470c8"
 
-vscode-languageserver-protocol-foldingprovider@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol-foldingprovider/-/vscode-languageserver-protocol-foldingprovider-2.0.1.tgz#051d0d9e58d1b79dc4681acd48f21797f5515bfd"
-  dependencies:
-    vscode-languageserver-protocol "^3.7.2"
-    vscode-languageserver-types "^3.7.2"
-
-vscode-languageserver-protocol@^3.7.2:
-  version "3.7.2"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.7.2.tgz#df58621c032139010888b6a9ddc969423f9ba9d6"
+vscode-languageserver-protocol@^3.13.0-next.1:
+  version "3.13.0-next.1"
+  resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.13.0-next.1.tgz#24d15aa5769e4b035f6ce38342685959e1eb454e"
   dependencies:
     vscode-jsonrpc "^3.6.2"
-    vscode-languageserver-types "^3.7.2"
+    vscode-languageserver-types "^3.13.0-next.1"
 
-vscode-languageserver-types@^3.7.2:
-  version "3.7.2"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.7.2.tgz#aad8846f8e3e27962648554de5a8417e358f34eb"
+vscode-languageserver-types@^3.12.0:
+  version "3.12.0"
+  resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.12.0.tgz#f96051381b6a050b7175b37d6cb5d2f2eb64b944"
 
-vscode-languageserver@^4.1.3:
-  version "4.1.3"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver/-/vscode-languageserver-4.1.3.tgz#937d37c955b6b9c2409388413cd6f54d1eb9fe7d"
+vscode-languageserver-types@^3.13.0-next.1:
+  version "3.13.0-next.1"
+  resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.13.0-next.1.tgz#dd91b78b13a2a6c7131e8291e3db3183cf566280"
+
+vscode-languageserver@^5.1.0-next.5:
+  version "5.1.0-next.5"
+  resolved "https://registry.yarnpkg.com/vscode-languageserver/-/vscode-languageserver-5.1.0-next.5.tgz#d343278b4de448a31f9db146b98638898c8d4f55"
   dependencies:
-    vscode-languageserver-protocol "^3.7.2"
-    vscode-uri "^1.0.1"
+    vscode-languageserver-protocol "^3.13.0-next.1"
+    vscode-uri "^1.0.5"
 
-vscode-nls@^3.2.2:
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.2.tgz#3817eca5b985c2393de325197cf4e15eb2aa5350"
+vscode-nls@^3.2.5:
+  version "3.2.5"
+  resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.5.tgz#25520c1955108036dec607c85e00a522f247f1a4"
 
-vscode-uri@^1.0.1:
+vscode-uri@^1.0.5:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-1.0.6.tgz#6b8f141b0bbc44ad7b07e94f82f168ac7608ad4d"
+
+wrappy@1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
+
+xml@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-1.0.1.tgz#11a86befeac3c4aa3ec08623651a3c81a6d0bbc8"
+  resolved "https://registry.yarnpkg.com/xml/-/xml-1.0.1.tgz#78ba72020029c5bc87b8a81a3cfcd74b4a2fc1e5"
diff --git a/extensions/css-language-features/test/mocha.opts b/extensions/css-language-features/test/mocha.opts
new file mode 100644
index 00000000000..20fcfb6eef6
--- /dev/null
+++ b/extensions/css-language-features/test/mocha.opts
@@ -0,0 +1,3 @@
+--ui tdd
+--useColors true
+server/out/test/**.test.js
\ No newline at end of file
diff --git a/extensions/css-language-features/yarn.lock b/extensions/css-language-features/yarn.lock
index 98f6af48a34..b0af5d6319b 100644
--- a/extensions/css-language-features/yarn.lock
+++ b/extensions/css-language-features/yarn.lock
@@ -2,38 +2,167 @@
 # yarn lockfile v1
 
 
-"@types/node@7.0.43":
-  version "7.0.43"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.43.tgz#a187e08495a075f200ca946079c914e1a5fe962c"
+"@types/node@^8.10.25":
+  version "8.10.25"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-8.10.25.tgz#801fe4e39372cef18f268db880a5fbfcf71adc7e"
 
-vscode-jsonrpc@^3.6.2:
-  version "3.6.2"
-  resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-3.6.2.tgz#3b5eef691159a15556ecc500e9a8a0dd143470c8"
+balanced-match@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
 
-vscode-languageclient@^4.1.4:
-  version "4.1.4"
-  resolved "https://registry.yarnpkg.com/vscode-languageclient/-/vscode-languageclient-4.1.4.tgz#fff1a6bca4714835dca7fce35bc4ce81442fdf2c"
+brace-expansion@^1.1.7:
+  version "1.1.11"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
   dependencies:
-    vscode-languageserver-protocol "^3.7.2"
+    balanced-match "^1.0.0"
+    concat-map "0.0.1"
 
-vscode-languageserver-protocol-foldingprovider@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol-foldingprovider/-/vscode-languageserver-protocol-foldingprovider-2.0.1.tgz#051d0d9e58d1b79dc4681acd48f21797f5515bfd"
+browser-stdout@1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.1.tgz#baa559ee14ced73452229bad7326467c61fabd60"
+
+commander@2.15.1:
+  version "2.15.1"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.15.1.tgz#df46e867d0fc2aec66a34662b406a9ccafff5b0f"
+
+concat-map@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
+
+debug@3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
   dependencies:
-    vscode-languageserver-protocol "^3.7.2"
-    vscode-languageserver-types "^3.7.2"
+    ms "2.0.0"
 
-vscode-languageserver-protocol@^3.7.2:
-  version "3.7.2"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.7.2.tgz#df58621c032139010888b6a9ddc969423f9ba9d6"
+diff@3.5.0:
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
+
+escape-string-regexp@1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
+
+fs.realpath@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
+
+glob@7.1.2:
+  version "7.1.2"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
   dependencies:
-    vscode-jsonrpc "^3.6.2"
-    vscode-languageserver-types "^3.7.2"
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.0.4"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
 
-vscode-languageserver-types@^3.7.2:
-  version "3.7.2"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.7.2.tgz#aad8846f8e3e27962648554de5a8417e358f34eb"
+growl@1.10.5:
+  version "1.10.5"
+  resolved "https://registry.yarnpkg.com/growl/-/growl-1.10.5.tgz#f2735dc2283674fa67478b10181059355c369e5e"
 
-vscode-nls@^3.2.2:
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.2.tgz#3817eca5b985c2393de325197cf4e15eb2aa5350"
+has-flag@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
+
+he@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/he/-/he-1.1.1.tgz#93410fd21b009735151f8868c2f271f3427e23fd"
+
+inflight@^1.0.4:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
+  dependencies:
+    once "^1.3.0"
+    wrappy "1"
+
+inherits@2:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
+
+minimatch@3.0.4, minimatch@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
+  dependencies:
+    brace-expansion "^1.1.7"
+
+minimist@0.0.8:
+  version "0.0.8"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
+
+mkdirp@0.5.1:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
+  dependencies:
+    minimist "0.0.8"
+
+mocha@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/mocha/-/mocha-5.2.0.tgz#6d8ae508f59167f940f2b5b3c4a612ae50c90ae6"
+  dependencies:
+    browser-stdout "1.3.1"
+    commander "2.15.1"
+    debug "3.1.0"
+    diff "3.5.0"
+    escape-string-regexp "1.0.5"
+    glob "7.1.2"
+    growl "1.10.5"
+    he "1.1.1"
+    minimatch "3.0.4"
+    mkdirp "0.5.1"
+    supports-color "5.4.0"
+
+ms@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
+
+once@^1.3.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
+  dependencies:
+    wrappy "1"
+
+path-is-absolute@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
+
+semver@^5.5.0:
+  version "5.5.1"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.1.tgz#7dfdd8814bdb7cabc7be0fb1d734cfb66c940477"
+
+supports-color@5.4.0:
+  version "5.4.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.4.0.tgz#1c6b337402c2137605efe19f10fec390f6faab54"
+  dependencies:
+    has-flag "^3.0.0"
+
+vscode-jsonrpc@^3.7.0-next.1:
+  version "3.7.0-next.1"
+  resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-3.7.0-next.1.tgz#e7521cd8135006ba8bf57ebcedbf5b03ce17b23e"
+
+vscode-languageclient@^5.1.0-next.9:
+  version "5.1.0-next.9"
+  resolved "https://registry.yarnpkg.com/vscode-languageclient/-/vscode-languageclient-5.1.0-next.9.tgz#fe56c523637c118f7b262952b889f760223ab75a"
+  dependencies:
+    semver "^5.5.0"
+    vscode-languageserver-protocol "^3.13.0-next.2"
+
+vscode-languageserver-protocol@^3.13.0-next.2:
+  version "3.13.0-next.2"
+  resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.13.0-next.2.tgz#7083e50d0d2096ba52de448082445b9c39081fdb"
+  dependencies:
+    vscode-jsonrpc "^3.7.0-next.1"
+    vscode-languageserver-types "^3.13.0-next.1"
+
+vscode-languageserver-types@^3.13.0-next.1:
+  version "3.13.0-next.1"
+  resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.13.0-next.1.tgz#dd91b78b13a2a6c7131e8291e3db3183cf566280"
+
+vscode-nls@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-4.0.0.tgz#4001c8a6caba5cedb23a9c5ce1090395c0e44002"
+
+wrappy@1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
diff --git a/extensions/css/.vscode/launch.json b/extensions/css/.vscode/launch.json
new file mode 100644
index 00000000000..2217bbd0770
--- /dev/null
+++ b/extensions/css/.vscode/launch.json
@@ -0,0 +1,14 @@
+{
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": "Launch Grammar",
+      "type": "extensionHost",
+      "request": "launch",
+      "runtimeExecutable": "${execPath}",
+      "args": [
+        "--extensionDevelopmentPath=${workspaceRoot}"
+      ]
+    }
+  ]
+}
diff --git a/extensions/css/package.json b/extensions/css/package.json
index 9517029a69f..13f737e92fc 100644
--- a/extensions/css/package.json
+++ b/extensions/css/package.json
@@ -8,7 +8,7 @@
     "vscode": "0.10.x"
   },
   "scripts": {
-    "update-grammar": "node ../../build/npm/update-grammar.js atom/language-css grammars/css.cson ./syntaxes/css.tmLanguage.json"
+    "update-grammar": "node ../../build/npm/update-grammar.js octref/language-css grammars/css.cson ./syntaxes/css.tmLanguage.json"
   },
   "contributes": {
     "languages": [
diff --git a/extensions/css/syntaxes/css.tmLanguage.json b/extensions/css/syntaxes/css.tmLanguage.json
index a8fc2fe565e..e0721094a00 100644
--- a/extensions/css/syntaxes/css.tmLanguage.json
+++ b/extensions/css/syntaxes/css.tmLanguage.json
@@ -1,10 +1,10 @@
 {
 	"information_for_contributors": [
-		"This file has been converted from https://github.com/atom/language-css/blob/master/grammars/css.cson",
+		"This file has been converted from https://github.com/octref/language-css/blob/master/grammars/css.cson",
 		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
 		"Once accepted there, we are happy to receive an update request."
 	],
-	"version": "https://github.com/atom/language-css/commit/2bc1e294e2440ad91197263cd9f95dc4b00bab2f",
+	"version": "https://github.com/octref/language-css/commit/c2c3933bbd62f867acf68042f9e82fa1041c4101",
 	"name": "CSS",
 	"scopeName": "source.css",
 	"patterns": [
@@ -508,7 +508,7 @@
 					]
 				},
 				{
-					"begin": "(?i)((@)viewport)(?=[\\s'\"{;]|/\\*|$)",
+					"begin": "(?i)((@)(-ms-|-o-)?viewport)(?=[\\s'\"{;]|/\\*|$)",
 					"beginCaptures": {
 						"1": {
 							"name": "keyword.control.at-rule.viewport.css"
@@ -604,6 +604,45 @@
 							"include": "#string"
 						}
 					]
+				},
+				{
+					"begin": "(?i)(?=@[\\w-]+(\\s|\\(|{|;|/\\*|$))",
+					"end": "(?<=}|;)(?!\\G)",
+					"patterns": [
+						{
+							"begin": "(?i)\\G(@)[\\w-]+",
+							"beginCaptures": {
+								"0": {
+									"name": "keyword.control.at-rule.css"
+								},
+								"1": {
+									"name": "punctuation.definition.keyword.css"
+								}
+							},
+							"end": "(?=\\s*[{;])",
+							"name": "meta.at-rule.header.css"
+						},
+						{
+							"begin": "{",
+							"beginCaptures": {
+								"0": {
+									"name": "punctuation.section.begin.bracket.curly.css"
+								}
+							},
+							"end": "}",
+							"endCaptures": {
+								"0": {
+									"name": "punctuation.section.end.bracket.curly.css"
+								}
+							},
+							"name": "meta.at-rule.body.css",
+							"patterns": [
+								{
+									"include": "$self"
+								}
+							]
+						}
+					]
 				}
 			]
 		},
@@ -1338,7 +1377,7 @@
 		"property-keywords": {
 			"patterns": [
 				{
-					"match": "(?xi) (?<![\\w-])\n(above|absolute|active|add|additive|after-edge|alias|all|all-petite-caps|all-scroll|all-small-caps|alpha|alphabetic|alternate|alternate-reverse\n|always|antialiased|auto|auto-pos|available|avoid|avoid-column|avoid-page|avoid-region|backwards|balance|baseline|before-edge|below|bevel\n|bidi-override|blink|block|block-axis|block-start|block-end|bold|bolder|border|border-box|both|bottom|bottom-outside|break-all|break-word|bullets\n|butt|capitalize|caption|cell|center|central|char|circle|clip|clone|close-quote|closest-corner|closest-side|col-resize|collapse|color|color-burn\n|color-dodge|column|column-reverse|common-ligatures|compact|condensed|contain|content|content-box|contents|context-menu|contextual|copy|cover\n|crisp-edges|crispEdges|crosshair|cyclic|darken|dashed|decimal|default|dense|diagonal-fractions|difference|digits|disabled|disc|discretionary-ligatures\n|distribute|distribute-all-lines|distribute-letter|distribute-space|dot|dotted|double|double-circle|downleft|downright|e-resize|each-line|ease|ease-in\n|ease-in-out|ease-out|economy|ellipse|ellipsis|embed|end|evenodd|ew-resize|exact|exclude|exclusion|expanded|extends|extra-condensed|extra-expanded\n|fallback|farthest-corner|farthest-side|fill|fill-available|fill-box|filled|fit-content|fixed|flat|flex|flex-end|flex-start|flip|forwards|freeze\n|from-image|full-width|geometricPrecision|georgian|grab|grabbing|grayscale|grid|groove|hand|hanging|hard-light|help|hidden|hide\n|historical-forms|historical-ligatures|horizontal|horizontal-tb|hue|icon|ideograph-alpha|ideograph-numeric|ideograph-parenthesis|ideograph-space\n|ideographic|inactive|infinite|inherit|initial|inline|inline-axis|inline-block|inline-end|inline-flex|inline-grid|inline-list-item|inline-start\n|inline-table|inset|inside|inter-character|inter-ideograph|inter-word|intersect|invert|isolate|isolate-override|italic|jis04|jis78|jis83\n|jis90|justify|justify-all|kannada|keep-all|landscape|large|larger|left|lighten|lighter|line|line-edge|line-through|linear|linearRGB\n|lining-nums|list-item|local|loose|lowercase|lr|lr-tb|ltr|luminance|luminosity|main-size|mandatory|manipulation|manual|margin-box|match-parent\n|match-source|mathematical|max-content|medium|menu|message-box|middle|min-content|miter|mixed|move|multiply|n-resize|narrower|ne-resize\n|nearest-neighbor|nesw-resize|newspaper|no-change|no-clip|no-close-quote|no-common-ligatures|no-contextual|no-discretionary-ligatures\n|no-drop|no-historical-ligatures|no-open-quote|no-repeat|none|nonzero|normal|not-allowed|nowrap|ns-resize|numbers|numeric|nw-resize|nwse-resize\n|oblique|oldstyle-nums|open|open-quote|optimizeLegibility|optimizeQuality|optimizeSpeed|optional|ordinal|outset|outside|over|overlay|overline|padding\n|padding-box|page|painted|pan-down|pan-left|pan-right|pan-up|pan-x|pan-y|paused|petite-caps|pixelated|plaintext|pointer|portrait|pre|pre-line\n|pre-wrap|preserve-3d|progress|progressive|proportional-nums|proportional-width|proximity|radial|recto|region|relative|remove|repeat|repeat-[xy]\n|reset-size|reverse|revert|ridge|right|rl|rl-tb|round|row|row-resize|row-reverse|row-severse|rtl|ruby|ruby-base|ruby-base-container|ruby-text\n|ruby-text-container|run-in|running|s-resize|saturation|scale-down|screen|scroll|scroll-position|se-resize|semi-condensed|semi-expanded|separate\n|sesame|show|sideways|sideways-left|sideways-lr|sideways-right|sideways-rl|simplified|slashed-zero|slice|small|small-caps|small-caption|smaller\n|smooth|soft-light|solid|space|space-around|space-between|space-evenly|spell-out|square|sRGB|stacked-fractions|start|static|status-bar|swap\n|step-end|step-start|sticky|stretch|strict|stroke|stroke-box|style|sub|subgrid|subpixel-antialiased|subtract|super|sw-resize|symbolic|table\n|table-caption|table-cell|table-column|table-column-group|table-footer-group|table-header-group|table-row|table-row-group|tabular-nums|tb|tb-rl\n|text|text-after-edge|text-before-edge|text-bottom|text-top|thick|thin|titling-caps|top|top-outside|touch|traditional|transparent|triangle\n|ultra-condensed|ultra-expanded|under|underline|unicase|unset|upleft|uppercase|upright|use-glyph-orientation|use-script|verso|vertical\n|vertical-ideographic|vertical-lr|vertical-rl|vertical-text|view-box|visible|visibleFill|visiblePainted|visibleStroke|w-resize|wait|wavy\n|weight|whitespace|wider|words|wrap|wrap-reverse|x-large|x-small|xx-large|xx-small|zero|zoom-in|zoom-out)\n(?![\\w-])",
+					"match": "(?xi) (?<![\\w-])\n(above|absolute|active|add|additive|after-edge|alias|all|all-petite-caps|all-scroll|all-small-caps|alpha|alphabetic|alternate|alternate-reverse\n|always|antialiased|auto|auto-pos|available|avoid|avoid-column|avoid-page|avoid-region|backwards|balance|baseline|before-edge|below|bevel\n|bidi-override|blink|block|block-axis|block-start|block-end|bold|bolder|border|border-box|both|bottom|bottom-outside|break-all|break-word|bullets\n|butt|capitalize|caption|cell|center|central|char|circle|clip|clone|close-quote|closest-corner|closest-side|col-resize|collapse|color|color-burn\n|color-dodge|column|column-reverse|common-ligatures|compact|condensed|contain|content|content-box|contents|context-menu|contextual|copy|cover\n|crisp-edges|crispEdges|crosshair|cyclic|darken|dashed|decimal|default|dense|diagonal-fractions|difference|digits|disabled|disc|discretionary-ligatures\n|distribute|distribute-all-lines|distribute-letter|distribute-space|dot|dotted|double|double-circle|downleft|downright|e-resize|each-line|ease|ease-in\n|ease-in-out|ease-out|economy|ellipse|ellipsis|embed|end|evenodd|ew-resize|exact|exclude|exclusion|expanded|extends|extra-condensed|extra-expanded\n|fallback|farthest-corner|farthest-side|fill|fill-available|fill-box|filled|fit-content|fixed|flat|flex|flex-end|flex-start|flip|forwards|freeze\n|from-image|full-width|geometricPrecision|georgian|grab|grabbing|grayscale|grid|groove|hand|hanging|hard-light|help|hidden|hide\n|historical-forms|historical-ligatures|horizontal|horizontal-tb|hue|icon|ideograph-alpha|ideograph-numeric|ideograph-parenthesis|ideograph-space\n|ideographic|inactive|infinite|inherit|initial|inline|inline-axis|inline-block|inline-end|inline-flex|inline-grid|inline-list-item|inline-start\n|inline-table|inset|inside|inter-character|inter-ideograph|inter-word|intersect|invert|isolate|isolate-override|italic|jis04|jis78|jis83\n|jis90|justify|justify-all|kannada|keep-all|landscape|large|larger|left|lighten|lighter|line|line-edge|line-through|linear|linearRGB\n|lining-nums|list-item|local|loose|lowercase|lr|lr-tb|ltr|luminance|luminosity|main-size|mandatory|manipulation|manual|margin-box|match-parent\n|match-source|mathematical|max-content|medium|menu|message-box|middle|min-content|miter|mixed|move|multiply|n-resize|narrower|ne-resize\n|nearest-neighbor|nesw-resize|newspaper|no-change|no-clip|no-close-quote|no-common-ligatures|no-contextual|no-discretionary-ligatures\n|no-drop|no-historical-ligatures|no-open-quote|no-repeat|none|nonzero|normal|not-allowed|nowrap|ns-resize|numbers|numeric|nw-resize|nwse-resize\n|oblique|oldstyle-nums|open|open-quote|optimizeLegibility|optimizeQuality|optimizeSpeed|optional|ordinal|outset|outside|over|overlay|overline|padding\n|padding-box|page|painted|pan-down|pan-left|pan-right|pan-up|pan-x|pan-y|paused|petite-caps|pixelated|plaintext|pointer|portrait|pre|pre-line\n|pre-wrap|preserve-3d|progress|progressive|proportional-nums|proportional-width|proximity|radial|recto|region|relative|remove|repeat|repeat-[xy]\n|reset-size|reverse|revert|ridge|right|rl|rl-tb|round|row|row-resize|row-reverse|row-severse|rtl|ruby|ruby-base|ruby-base-container|ruby-text\n|ruby-text-container|run-in|running|s-resize|saturation|scale-down|screen|scroll|scroll-position|self-start|self-end|se-resize|semi-condensed\n|semi-expanded|separate\n|sesame|show|sideways|sideways-left|sideways-lr|sideways-right|sideways-rl|simplified|slashed-zero|slice|small|small-caps|small-caption|smaller\n|smooth|soft-light|solid|space|space-around|space-between|space-evenly|spell-out|square|sRGB|stacked-fractions|start|static|status-bar|swap\n|step-end|step-start|sticky|stretch|strict|stroke|stroke-box|style|sub|subgrid|subpixel-antialiased|subtract|super|sw-resize|symbolic|table\n|table-caption|table-cell|table-column|table-column-group|table-footer-group|table-header-group|table-row|table-row-group|tabular-nums|tb|tb-rl\n|text|text-after-edge|text-before-edge|text-bottom|text-top|thick|thin|titling-caps|top|top-outside|touch|traditional|transparent|triangle\n|ultra-condensed|ultra-expanded|under|underline|unicase|unset|upleft|uppercase|upright|use-glyph-orientation|use-script|verso|vertical\n|vertical-ideographic|vertical-lr|vertical-rl|vertical-text|view-box|visible|visibleFill|visiblePainted|visibleStroke|w-resize|wait|wavy\n|weight|whitespace|wider|words|wrap|wrap-reverse|x-large|x-small|xx-large|xx-small|zero|zoom-in|zoom-out)\n(?![\\w-])",
 					"name": "support.constant.property-value.css"
 				},
 				{
@@ -1358,7 +1397,7 @@
 		"property-names": {
 			"patterns": [
 				{
-					"match": "(?xi) (?<![\\w-])\n(?:\n    # Standard CSS\n    additive-symbols|align-content|align-items|align-self|all|animation|animation-delay|animation-direction\n  | animation-duration|animation-fill-mode|animation-iteration-count|animation-name|animation-play-state\n  | animation-timing-function|backface-visibility|background|background-attachment|background-blend-mode\n  | background-clip|background-color|background-image|background-origin|background-position|background-position-[xy]\n  | background-repeat|background-size|block-size|border|border-block-end|border-block-end-color|border-block-end-style\n  | border-block-end-width|border-block-start|border-block-start-color|border-block-start-style\n  | border-block-start-width|border-bottom|border-bottom-color|border-bottom-left-radius|border-bottom-right-radius\n  | border-bottom-style|border-bottom-width|border-collapse|border-color|border-image|border-image-outset\n  | border-image-repeat|border-image-slice|border-image-source|border-image-width|border-inline-end\n  | border-inline-end-color|border-inline-end-style|border-inline-end-width|border-inline-start\n  | border-inline-start-color|border-inline-start-style|border-inline-start-width|border-left|border-left-color\n  | border-left-style|border-left-width|border-radius|border-right|border-right-color|border-right-style\n  | border-right-width|border-spacing|border-style|border-top|border-top-color|border-top-left-radius\n  | border-top-right-radius|border-top-style|border-top-width|border-width|bottom|box-decoration-break\n  | box-shadow|box-sizing|break-after|break-before|break-inside|caption-side|clear|clip|clip-path|color\n  | column-count|column-fill|column-gap|column-rule|column-rule-color|column-rule-style|column-rule-width\n  | column-span|column-width|columns|content|counter-increment|counter-reset|cursor|direction|display\n  | empty-cells|filter|flex|flex-basis|flex-direction|flex-flow|flex-grow|flex-shrink|flex-wrap|float\n  | font|font-display|font-family|font-feature-settings|font-kerning|font-language-override|font-size|font-size-adjust\n  | font-stretch|font-style|font-synthesis|font-variant|font-variant-alternates|font-variant-caps\n  | font-variant-east-asian|font-variant-ligatures|font-variant-numeric|font-variant-position|font-weight\n  | grid|grid-area|grid-auto-columns|grid-auto-flow|grid-auto-rows|grid-column|grid-column-end|grid-column-gap\n  | grid-column-start|grid-gap|grid-row|grid-row-end|grid-row-gap|grid-row-start|grid-template|grid-template-areas\n  | grid-template-columns|grid-template-rows|height|hyphens|image-orientation|image-rendering|image-resolution\n  | ime-mode|inline-size|isolation|justify-content|left|letter-spacing|line-break|line-height|list-style\n  | list-style-image|list-style-position|list-style-type|margin|margin-block-end|margin-block-start|margin-bottom\n  | margin-inline-end|margin-inline-start|margin-left|margin-right|margin-top|mask|mask-clip|mask-composite\n  | mask-image|mask-mode|mask-origin|mask-position|mask-repeat|mask-size|mask-type|max-block-size|max-height\n  | max-inline-size|max-width|max-zoom|min-block-size|min-height|min-inline-size|min-width|min-zoom|mix-blend-mode\n  | negative|object-fit|object-position|offset-block-end|offset-block-start|offset-inline-end|offset-inline-start\n  | opacity|order|orientation|orphans|outline|outline-color|outline-offset|outline-style|outline-width|overflow\n  | overflow-wrap|overflow-[xy]|pad|padding|padding-block-end|padding-block-start|padding-bottom|padding-inline-end\n  | padding-inline-start|padding-left|padding-right|padding-top|page-break-after|page-break-before|page-break-inside\n  | perspective|perspective-origin|pointer-events|position|prefix|quotes|range|resize|right|ruby-align|ruby-merge\n  | ruby-position|scroll-behavior|scroll-snap-coordinate|scroll-snap-destination|scroll-snap-type|shape-image-threshold\n  | shape-margin|shape-outside|speak-as|src|suffix|symbols|system|tab-size|table-layout|text-align|text-align-last\n  | text-combine-upright|text-decoration|text-decoration-color|text-decoration-line|text-decoration-style|text-emphasis\n  | text-emphasis-color|text-emphasis-position|text-emphasis-style|text-indent|text-orientation|text-overflow\n  | text-rendering|text-shadow|text-transform|text-underline-position|top|touch-action|transform|transform-box\n  | transform-origin|transform-style|transition|transition-delay|transition-duration|transition-property\n  | transition-timing-function|unicode-bidi|unicode-range|user-zoom|vertical-align|visibility|white-space|widows\n  | width|will-change|word-break|word-spacing|word-wrap|writing-mode|z-index|zoom\n\n  # SVG attributes\n  | alignment-baseline|baseline-shift|clip-rule|color-interpolation|color-interpolation-filters|color-profile\n  | color-rendering|dominant-baseline|enable-background|fill|fill-opacity|fill-rule|flood-color|flood-opacity\n  | glyph-orientation-horizontal|glyph-orientation-vertical|kerning|lighting-color|marker-end|marker-mid\n  | marker-start|shape-rendering|stop-color|stop-opacity|stroke|stroke-dasharray|stroke-dashoffset|stroke-linecap\n  | stroke-linejoin|stroke-miterlimit|stroke-opacity|stroke-width|text-anchor|x|y\n\n  # Not listed on MDN; presumably deprecated\n  | adjust|after|align|align-last|alignment|alignment-adjust|appearance|attachment|azimuth|background-break\n  | balance|baseline|before|bidi|binding|bookmark|bookmark-label|bookmark-level|bookmark-target|border-length\n  | bottom-color|bottom-left-radius|bottom-right-radius|bottom-style|bottom-width|box|box-align|box-direction\n  | box-flex|box-flex-group|box-lines|box-ordinal-group|box-orient|box-pack|break|character|collapse|column\n  | column-break-after|column-break-before|count|counter|crop|cue|cue-after|cue-before|decoration|decoration-break\n  | delay|display-model|display-role|down|drop|drop-initial-after-adjust|drop-initial-after-align|drop-initial-before-adjust\n  | drop-initial-before-align|drop-initial-size|drop-initial-value|duration|elevation|emphasis|family|fit|fit-position\n  | flex-group|float-offset|gap|grid-columns|grid-rows|hanging-punctuation|header|hyphenate|hyphenate-after|hyphenate-before\n  | hyphenate-character|hyphenate-lines|hyphenate-resource|icon|image|increment|indent|index|initial-after-adjust\n  | initial-after-align|initial-before-adjust|initial-before-align|initial-size|initial-value|inline-box-align|iteration-count\n  | justify|label|left-color|left-style|left-width|length|level|line|line-stacking|line-stacking-ruby|line-stacking-shift\n  | line-stacking-strategy|lines|list|mark|mark-after|mark-before|marks|marquee|marquee-direction|marquee-play-count|marquee-speed\n  | marquee-style|max|min|model|move-to|name|nav|nav-down|nav-index|nav-left|nav-right|nav-up|new|numeral|offset|ordinal-group\n  | orient|origin|overflow-style|overhang|pack|page|page-policy|pause|pause-after|pause-before|phonemes|pitch|pitch-range\n  | play-count|play-during|play-state|point|presentation|presentation-level|profile|property|punctuation|punctuation-trim\n  | radius|rate|rendering-intent|repeat|replace|reset|resolution|resource|respond-to|rest|rest-after|rest-before|richness\n  | right-color|right-style|right-width|role|rotation|rotation-point|rows|ruby|ruby-overhang|ruby-span|rule|rule-color\n  | rule-style|rule-width|shadow|size|size-adjust|sizing|space|space-collapse|spacing|span|speak|speak-header|speak-numeral\n  | speak-punctuation|speech|speech-rate|speed|stacking|stacking-ruby|stacking-shift|stacking-strategy|stress|stretch\n  | string-set|style|style-image|style-position|style-type|target|target-name|target-new|target-position|text|text-height\n  | text-justify|text-outline|text-replace|text-wrap|timing-function|top-color|top-left-radius|top-right-radius|top-style\n  | top-width|trim|unicode|up|user-select|variant|voice|voice-balance|voice-duration|voice-family|voice-pitch|voice-pitch-range\n  | voice-rate|voice-stress|voice-volume|volume|weight|white|white-space-collapse|word|wrap\n)\n(?![\\w-])",
+					"match": "(?xi) (?<![\\w-])\n(?:\n    # Standard CSS\n    additive-symbols|align-content|align-items|align-self|all|animation|animation-delay|animation-direction\n  | animation-duration|animation-fill-mode|animation-iteration-count|animation-name|animation-play-state\n  | animation-timing-function|backface-visibility|background|background-attachment|background-blend-mode\n  | background-clip|background-color|background-image|background-origin|background-position|background-position-[xy]\n  | background-repeat|background-size|block-size|border|border-block-end|border-block-end-color|border-block-end-style\n  | border-block-end-width|border-block-start|border-block-start-color|border-block-start-style\n  | border-block-start-width|border-bottom|border-bottom-color|border-bottom-left-radius|border-bottom-right-radius\n  | border-bottom-style|border-bottom-width|border-collapse|border-color|border-image|border-image-outset\n  | border-image-repeat|border-image-slice|border-image-source|border-image-width|border-inline-end\n  | border-inline-end-color|border-inline-end-style|border-inline-end-width|border-inline-start\n  | border-inline-start-color|border-inline-start-style|border-inline-start-width|border-left|border-left-color\n  | border-left-style|border-left-width|border-radius|border-right|border-right-color|border-right-style\n  | border-right-width|border-spacing|border-style|border-top|border-top-color|border-top-left-radius\n  | border-top-right-radius|border-top-style|border-top-width|border-width|bottom|box-decoration-break\n  | box-shadow|box-sizing|break-after|break-before|break-inside|caption-side|clear|clip|clip-path|color\n  | column-count|column-fill|column-gap|column-rule|column-rule-color|column-rule-style|column-rule-width\n  | column-span|column-width|columns|content|counter-increment|counter-reset|cursor|direction|display\n  | empty-cells|filter|flex|flex-basis|flex-direction|flex-flow|flex-grow|flex-shrink|flex-wrap|float\n  | font|font-display|font-family|font-feature-settings|font-kerning|font-language-override|font-size|font-size-adjust\n  | font-stretch|font-style|font-synthesis|font-variant|font-variant-alternates|font-variant-caps\n  | font-variant-east-asian|font-variant-ligatures|font-variant-numeric|font-variant-position|font-weight\n  | grid|grid-area|grid-auto-columns|grid-auto-flow|grid-auto-rows|grid-column|grid-column-end|grid-column-gap\n  | grid-column-start|grid-gap|grid-row|grid-row-end|grid-row-gap|grid-row-start|grid-template|grid-template-areas\n  | grid-template-columns|grid-template-rows|height|hyphens|image-orientation|image-rendering|image-resolution\n  | ime-mode|inline-size|isolation|justify-self|justify-items|justify-content|left|letter-spacing|line-break|line-height|list-style\n  | list-style-image|list-style-position|list-style-type|margin|margin-block-end|margin-block-start|margin-bottom\n  | margin-inline-end|margin-inline-start|margin-left|margin-right|margin-top|mask|mask-clip|mask-composite\n  | mask-image|mask-mode|mask-origin|mask-position|mask-repeat|mask-size|mask-type|max-block-size|max-height\n  | max-inline-size|max-width|max-zoom|min-block-size|min-height|min-inline-size|min-width|min-zoom|mix-blend-mode\n  | negative|object-fit|object-position|offset-block-end|offset-block-start|offset-inline-end|offset-inline-start\n  | opacity|order|orientation|orphans|outline|outline-color|outline-offset|outline-style|outline-width|overflow\n  | overflow-wrap|overflow-[xy]|pad|padding|padding-block-end|padding-block-start|padding-bottom|padding-inline-end\n  | padding-inline-start|padding-left|padding-right|padding-top|page-break-after|page-break-before|page-break-inside\n  | perspective|perspective-origin|pointer-events|position|prefix|quotes|range|resize|right|ruby-align|ruby-merge\n  | ruby-position|scroll-behavior|scroll-snap-coordinate|scroll-snap-destination|scroll-snap-type|shape-image-threshold\n  | shape-margin|shape-outside|speak-as|src|suffix|symbols|system|tab-size|table-layout|text-align|text-align-last\n  | text-combine-upright|text-decoration|text-decoration-color|text-decoration-line|text-decoration-style|text-emphasis\n  | text-emphasis-color|text-emphasis-position|text-emphasis-style|text-indent|text-orientation|text-overflow\n  | text-rendering|text-shadow|text-transform|text-underline-position|top|touch-action|transform|transform-box\n  | transform-origin|transform-style|transition|transition-delay|transition-duration|transition-property\n  | transition-timing-function|unicode-bidi|unicode-range|user-zoom|vertical-align|visibility|white-space|widows\n  | width|will-change|word-break|word-spacing|word-wrap|writing-mode|z-index|zoom\n\n  # SVG attributes\n  | alignment-baseline|baseline-shift|clip-rule|color-interpolation|color-interpolation-filters|color-profile\n  | color-rendering|cx|cy|dominant-baseline|enable-background|fill|fill-opacity|fill-rule|flood-color|flood-opacity\n  | glyph-orientation-horizontal|glyph-orientation-vertical|height|kerning|lighting-color|marker-end|marker-mid\n  | marker-start|r|rx|ry|shape-rendering|stop-color|stop-opacity|stroke|stroke-dasharray|stroke-dashoffset|stroke-linecap\n  | stroke-linejoin|stroke-miterlimit|stroke-opacity|stroke-width|text-anchor|width|x|y\n\n  # Not listed on MDN; presumably deprecated\n  | adjust|after|align|align-last|alignment|alignment-adjust|appearance|attachment|azimuth|background-break\n  | balance|baseline|before|bidi|binding|bookmark|bookmark-label|bookmark-level|bookmark-target|border-length\n  | bottom-color|bottom-left-radius|bottom-right-radius|bottom-style|bottom-width|box|box-align|box-direction\n  | box-flex|box-flex-group|box-lines|box-ordinal-group|box-orient|box-pack|break|character|collapse|column\n  | column-break-after|column-break-before|count|counter|crop|cue|cue-after|cue-before|decoration|decoration-break\n  | delay|display-model|display-role|down|drop|drop-initial-after-adjust|drop-initial-after-align|drop-initial-before-adjust\n  | drop-initial-before-align|drop-initial-size|drop-initial-value|duration|elevation|emphasis|family|fit|fit-position\n  | flex-group|float-offset|gap|grid-columns|grid-rows|hanging-punctuation|header|hyphenate|hyphenate-after|hyphenate-before\n  | hyphenate-character|hyphenate-lines|hyphenate-resource|icon|image|increment|indent|index|initial-after-adjust\n  | initial-after-align|initial-before-adjust|initial-before-align|initial-size|initial-value|inline-box-align|iteration-count\n  | justify|label|left-color|left-style|left-width|length|level|line|line-stacking|line-stacking-ruby|line-stacking-shift\n  | line-stacking-strategy|lines|list|mark|mark-after|mark-before|marks|marquee|marquee-direction|marquee-play-count|marquee-speed\n  | marquee-style|max|min|model|move-to|name|nav|nav-down|nav-index|nav-left|nav-right|nav-up|new|numeral|offset|ordinal-group\n  | orient|origin|overflow-style|overhang|pack|page|page-policy|pause|pause-after|pause-before|phonemes|pitch|pitch-range\n  | play-count|play-during|play-state|point|presentation|presentation-level|profile|property|punctuation|punctuation-trim\n  | radius|rate|rendering-intent|repeat|replace|reset|resolution|resource|respond-to|rest|rest-after|rest-before|richness\n  | right-color|right-style|right-width|role|rotation|rotation-point|rows|ruby|ruby-overhang|ruby-span|rule|rule-color\n  | rule-style|rule-width|shadow|size|size-adjust|sizing|space|space-collapse|spacing|span|speak|speak-header|speak-numeral\n  | speak-punctuation|speech|speech-rate|speed|stacking|stacking-ruby|stacking-shift|stacking-strategy|stress|stretch\n  | string-set|style|style-image|style-position|style-type|target|target-name|target-new|target-position|text|text-height\n  | text-justify|text-outline|text-replace|text-wrap|timing-function|top-color|top-left-radius|top-right-radius|top-style\n  | top-width|trim|unicode|up|user-select|variant|voice|voice-balance|voice-duration|voice-family|voice-pitch|voice-pitch-range\n  | voice-rate|voice-stress|voice-volume|volume|weight|white|white-space-collapse|word|wrap\n)\n(?![\\w-])",
 					"name": "support.type.property-name.css"
 				},
 				{
@@ -1411,7 +1450,7 @@
 					"name": "invalid.illegal.colon.css"
 				}
 			},
-			"match": "(?xi)\n(:)(:*)\n(?: active|any-link|checked|default|disabled|empty|enabled|first\n  | (?:first|last|only)-(?:child|of-type)|focus|focus-within|fullscreen|host|hover\n  | in-range|indeterminate|invalid|left|link|optional|out-of-range\n  | read-only|read-write|required|right|root|scope|target|unresolved\n  | valid|visited\n)(?![\\w-]|\\s*[;}])",
+			"match": "(?xi)\n(:)(:*)\n(?: active|any-link|checked|default|defined|disabled|empty|enabled|first\n  | (?:first|last|only)-(?:child|of-type)|focus|focus-visible|focus-within\n  | fullscreen|host|hover|in-range|indeterminate|invalid|left|link\n  | optional|out-of-range|placeholder-shown|read-only|read-write\n  | required|right|root|scope|target|unresolved\n  | valid|visited\n)(?![\\w-]|\\s*[;}])",
 			"name": "entity.other.attribute-name.pseudo-class.css"
 		},
 		"pseudo-elements": {
diff --git a/extensions/css/test/colorize-results/test_css.json b/extensions/css/test/colorize-results/test_css.json
index 6daa830028e..f4abc368d09 100644
--- a/extensions/css/test/colorize-results/test_css.json
+++ b/extensions/css/test/colorize-results/test_css.json
@@ -3,9 +3,9 @@
 		"c": "/*",
 		"t": "source.css comment.block.css punctuation.definition.comment.begin.css",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -14,9 +14,9 @@
 		"c": " css Zen Garden default style v1.02 ",
 		"t": "source.css comment.block.css",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -25,9 +25,9 @@
 		"c": "*/",
 		"t": "source.css comment.block.css punctuation.definition.comment.end.css",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -36,9 +36,9 @@
 		"c": "/*",
 		"t": "source.css comment.block.css punctuation.definition.comment.begin.css",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -47,9 +47,9 @@
 		"c": " css released under Creative Commons License - http://creativecommons.org/licenses/by-nc-sa/1.0/  ",
 		"t": "source.css comment.block.css",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -58,9 +58,9 @@
 		"c": "*/",
 		"t": "source.css comment.block.css punctuation.definition.comment.end.css",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -69,9 +69,9 @@
 		"c": "/*",
 		"t": "source.css comment.block.css punctuation.definition.comment.begin.css",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -80,9 +80,9 @@
 		"c": " This file based on 'Tranquille' by Dave Shea ",
 		"t": "source.css comment.block.css",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -91,9 +91,9 @@
 		"c": "*/",
 		"t": "source.css comment.block.css punctuation.definition.comment.end.css",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -102,9 +102,9 @@
 		"c": "/*",
 		"t": "source.css comment.block.css punctuation.definition.comment.begin.css",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -113,9 +113,9 @@
 		"c": " You may use this file as a foundation for any new work, but you may find it easier to start from scratch. ",
 		"t": "source.css comment.block.css",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -124,9 +124,9 @@
 		"c": "*/",
 		"t": "source.css comment.block.css punctuation.definition.comment.end.css",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -135,9 +135,9 @@
 		"c": "/*",
 		"t": "source.css comment.block.css punctuation.definition.comment.begin.css",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -146,9 +146,9 @@
 		"c": " Not all elements are defined in this file, so you'll most likely want to refer to the xhtml as well. ",
 		"t": "source.css comment.block.css",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -157,9 +157,9 @@
 		"c": "*/",
 		"t": "source.css comment.block.css punctuation.definition.comment.end.css",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -168,9 +168,9 @@
 		"c": "/*",
 		"t": "source.css comment.block.css punctuation.definition.comment.begin.css",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -179,9 +179,9 @@
 		"c": " Your images should be linked as if the CSS file sits in the same folder as the images. ie. no paths. ",
 		"t": "source.css comment.block.css",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -190,9 +190,9 @@
 		"c": "*/",
 		"t": "source.css comment.block.css punctuation.definition.comment.end.css",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -201,9 +201,9 @@
 		"c": "/*",
 		"t": "source.css comment.block.css punctuation.definition.comment.begin.css",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -212,9 +212,9 @@
 		"c": " basic elements ",
 		"t": "source.css comment.block.css",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -223,9 +223,9 @@
 		"c": "*/",
 		"t": "source.css comment.block.css punctuation.definition.comment.end.css",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -3842,9 +3842,9 @@
 		"c": "/*",
 		"t": "source.css comment.block.css punctuation.definition.comment.begin.css",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -3853,9 +3853,9 @@
 		"c": " specific divs ",
 		"t": "source.css comment.block.css",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -3864,9 +3864,9 @@
 		"c": "*/",
 		"t": "source.css comment.block.css punctuation.definition.comment.end.css",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
diff --git a/extensions/debug-auto-launch/.vscodeignore b/extensions/debug-auto-launch/.vscodeignore
new file mode 100644
index 00000000000..d43a539fddf
--- /dev/null
+++ b/extensions/debug-auto-launch/.vscodeignore
@@ -0,0 +1,2 @@
+src/**
+tsconfig.json
\ No newline at end of file
diff --git a/extensions/debug-auto-launch/package.json b/extensions/debug-auto-launch/package.json
new file mode 100644
index 00000000000..7b676cfbe60
--- /dev/null
+++ b/extensions/debug-auto-launch/package.json
@@ -0,0 +1,54 @@
+{
+	"name": "debug-auto-launch",
+	"displayName": "%displayName%",
+	"description": "%description%",
+	"version": "1.0.0",
+	"publisher": "vscode",
+	"engines": {
+		"vscode": "^1.5.0"
+	},
+	"activationEvents": [
+		"*"
+	],
+	"main": "./out/extension",
+	"scripts": {
+		"compile": "gulp compile-extension:debug-auto-launch",
+		"watch": "gulp watch-extension:debug-auto-launch"
+	},
+	"contributes": {
+		"configuration": {
+			"title": "Node debug",
+			"properties": {
+				"debug.node.autoAttach": {
+					"scope": "window",
+					"type": "string",
+					"enum": [
+						"disabled",
+						"on",
+						"off"
+					],
+					"enumDescriptions": [
+						"%debug.node.autoAttach.disabled.description%",
+						"%debug.node.autoAttach.on.description%",
+						"%debug.node.autoAttach.off.description%"
+					],
+					"description": "%debug.node.autoAttach.description%",
+					"default": "disabled"
+				}
+			}
+		},
+		"commands": [
+			{
+				"command": "extension.node-debug.toggleAutoAttach",
+				"title": "%toggle.auto.attach%",
+				"category": "Debug"
+			}
+		]
+	},
+	"dependencies": {
+		"vscode-nls": "^4.0.0"
+	},
+	"devDependencies": {
+		"@types/node": "8.0.33"
+	}
+}
diff --git a/extensions/debug-auto-launch/package.nls.json b/extensions/debug-auto-launch/package.nls.json
new file mode 100644
index 00000000000..030ac5a20a9
--- /dev/null
+++ b/extensions/debug-auto-launch/package.nls.json
@@ -0,0 +1,11 @@
+{
+	"displayName": "Node Debug Auto-attach",
+	"description": "Helper for auto-attach feature when node-debug extensions are not active.",
+
+	"debug.node.autoAttach.description": "Automatically attach node debugger when node.js was launched in debug mode from integrated terminal.",
+	"debug.node.autoAttach.disabled.description": "Auto attach is disabled and not shown in status bar.",
+	"debug.node.autoAttach.on.description": "Auto attach is active.",
+	"debug.node.autoAttach.off.description": "Auto attach is inactive.",
+
+	"toggle.auto.attach": "Toggle Auto Attach"
+}
\ No newline at end of file
diff --git a/extensions/debug-auto-launch/src/extension.ts b/extensions/debug-auto-launch/src/extension.ts
new file mode 100644
index 00000000000..3f101d071bf
--- /dev/null
+++ b/extensions/debug-auto-launch/src/extension.ts
@@ -0,0 +1,134 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+import * as vscode from 'vscode';
+import * as nls from 'vscode-nls';
+
+const localize = nls.loadMessageBundle();
+const ON_TEXT = localize('status.text.auto.attach.on', "Auto Attach: On");
+const OFF_TEXT = localize('status.text.auto.attach.off', "Auto Attach: Off");
+
+const TOGGLE_COMMAND = 'extension.node-debug.toggleAutoAttach';
+const DEBUG_SETTINGS = 'debug.node';
+const AUTO_ATTACH_SETTING = 'autoAttach';
+
+type AUTO_ATTACH_VALUES = 'disabled' | 'on' | 'off';
+
+let currentState: AUTO_ATTACH_VALUES = 'disabled';	// on activation this feature is always disabled and
+let statusItem: vscode.StatusBarItem | undefined;	// there is no status bar item
+let autoAttachStarted = false;
+
+export function activate(context: vscode.ExtensionContext): void {
+
+	context.subscriptions.push(vscode.commands.registerCommand(TOGGLE_COMMAND, toggleAutoAttachSetting));
+
+	context.subscriptions.push(vscode.workspace.onDidChangeConfiguration(e => {
+		if (e.affectsConfiguration(DEBUG_SETTINGS + '.' + AUTO_ATTACH_SETTING)) {
+			updateAutoAttach(context);
+		}
+	}));
+
+	updateAutoAttach(context);
+}
+
+export function deactivate(): void {
+}
+
+
+function toggleAutoAttachSetting(context: vscode.ExtensionContext) {
+
+	const conf = vscode.workspace.getConfiguration(DEBUG_SETTINGS);
+	if (conf) {
+		let value = <AUTO_ATTACH_VALUES>conf.get(AUTO_ATTACH_SETTING);
+		if (value === 'on') {
+			value = 'off';
+		} else {
+			value = 'on';
+		}
+
+		const info = conf.inspect(AUTO_ATTACH_SETTING);
+		let target: vscode.ConfigurationTarget = vscode.ConfigurationTarget.Global;
+		if (info) {
+			if (info.workspaceFolderValue) {
+				target = vscode.ConfigurationTarget.WorkspaceFolder;
+			} else if (info.workspaceValue) {
+				target = vscode.ConfigurationTarget.Workspace;
+			} else if (info.globalValue) {
+				target = vscode.ConfigurationTarget.Global;
+			} else if (info.defaultValue) {
+				// setting not yet used: store setting in workspace
+				if (vscode.workspace.workspaceFolders) {
+					target = vscode.ConfigurationTarget.Workspace;
+				}
+			}
+		}
+		conf.update(AUTO_ATTACH_SETTING, value, target);
+	}
+}
+
+/**
+ * Updates the auto attach feature based on the user or workspace setting
+ */
+function updateAutoAttach(context: vscode.ExtensionContext) {
+
+	const newState = <AUTO_ATTACH_VALUES>vscode.workspace.getConfiguration(DEBUG_SETTINGS).get(AUTO_ATTACH_SETTING);
+
+	if (newState !== currentState) {
+
+		if (newState === 'disabled') {
+
+			// turn everything off
+			if (statusItem) {
+				statusItem.hide();
+				statusItem.text = OFF_TEXT;
+			}
+			if (autoAttachStarted) {
+				vscode.commands.executeCommand('extension.node-debug.stopAutoAttach').then(_ => {
+					currentState = newState;
+					autoAttachStarted = false;
+				});
+			}
+
+		} else {	// 'on' or 'off'
+
+			// make sure status bar item exists and is visible
+			if (!statusItem) {
+				statusItem = vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Left);
+				statusItem.command = TOGGLE_COMMAND;
+				statusItem.tooltip = localize('status.tooltip.auto.attach', "Automatically attach to node.js processes in debug mode");
+				statusItem.show();
+				context.subscriptions.push(statusItem);
+			} else {
+				statusItem.show();
+			}
+
+			if (newState === 'off') {
+				if (autoAttachStarted) {
+					vscode.commands.executeCommand('extension.node-debug.stopAutoAttach').then(_ => {
+						currentState = newState;
+						if (statusItem) {
+							statusItem.text = OFF_TEXT;
+						}
+						autoAttachStarted = false;
+					});
+				}
+
+			} else if (newState === 'on') {
+
+				const vscode_pid = process.env['VSCODE_PID'];
+				const rootPid = vscode_pid ? parseInt(vscode_pid) : 0;
+				vscode.commands.executeCommand('extension.node-debug.startAutoAttach', rootPid).then(_ => {
+					if (statusItem) {
+						statusItem.text = ON_TEXT;
+					}
+					currentState = newState;
+					autoAttachStarted = true;
+				});
+			}
+		}
+	}
+}
diff --git a/extensions/debug-auto-launch/src/typings/ref.d.ts b/extensions/debug-auto-launch/src/typings/ref.d.ts
new file mode 100644
index 00000000000..bc057c55878
--- /dev/null
+++ b/extensions/debug-auto-launch/src/typings/ref.d.ts
@@ -0,0 +1,7 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+/// <reference path='../../../../src/vs/vscode.d.ts'/>
+/// <reference types='@types/node'/>
diff --git a/extensions/debug-auto-launch/tsconfig.json b/extensions/debug-auto-launch/tsconfig.json
new file mode 100644
index 00000000000..2a5517b5543
--- /dev/null
+++ b/extensions/debug-auto-launch/tsconfig.json
@@ -0,0 +1,16 @@
+{
+	"compilerOptions": {
+		"target": "es5",
+		"module": "commonjs",
+		"outDir": "./out",
+		"lib": [
+			"es2015"
+		],
+		"strict": true,
+		"noUnusedLocals": true,
+		"downlevelIteration": true
+	},
+	"include": [
+		"src/**/*"
+	]
+}
\ No newline at end of file
diff --git a/extensions/debug-auto-launch/yarn.lock b/extensions/debug-auto-launch/yarn.lock
new file mode 100644
index 00000000000..888e8da826d
--- /dev/null
+++ b/extensions/debug-auto-launch/yarn.lock
@@ -0,0 +1,11 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+"@types/node@8.0.33":
+  version "8.0.33"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.33.tgz#1126e94374014e54478092830704f6ea89df04cd"
+
+vscode-nls@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-4.0.0.tgz#4001c8a6caba5cedb23a9c5ce1090395c0e44002"
diff --git a/extensions/docker/test/colorize-results/Dockerfile.json b/extensions/docker/test/colorize-results/Dockerfile.json
index a18ec445c04..fcb2e004c16 100644
--- a/extensions/docker/test/colorize-results/Dockerfile.json
+++ b/extensions/docker/test/colorize-results/Dockerfile.json
@@ -179,9 +179,9 @@
 		"c": "#",
 		"t": "source.dockerfile comment.line.number-sign.dockerfile punctuation.definition.comment.dockerfile",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -190,9 +190,9 @@
 		"c": "RUN apt-get install -y nodejs=0.6.12~dfsg1-1ubuntu1",
 		"t": "source.dockerfile comment.line.number-sign.dockerfile",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
diff --git a/extensions/emmet/.vscodeignore b/extensions/emmet/.vscodeignore
index ebab1d50b9b..729e3f56400 100644
--- a/extensions/emmet/.vscodeignore
+++ b/extensions/emmet/.vscodeignore
@@ -1,3 +1,6 @@
 test/**
 src/**
-tsconfig.json
\ No newline at end of file
+out/**
+tsconfig.json
+extension.webpack.config.js
+
diff --git a/extensions/emmet/CONTRIBUTING.md b/extensions/emmet/CONTRIBUTING.md
new file mode 100644
index 00000000000..c6c334828c3
--- /dev/null
+++ b/extensions/emmet/CONTRIBUTING.md
@@ -0,0 +1,14 @@
+## How to build and run from source?
+
+Read the basics about extension authoring from [Extending Visual Studio Code](https://code.visualstudio.com/docs/extensions/overview)
+
+- Read [Build and Run VS Code from Source](https://github.com/Microsoft/vscode/wiki/How-to-Contribute#build-and-run-from-source) to get a local dev set up running for VS Code
+- Open the `extensions/emmet` folder in the vscode repo in VS Code
+- Press F5 to start debugging
+
+## Running tests
+
+Tests for Emmet extension are run as integration tests as part of VS Code.
+
+- Read [Build and Run VS Code from Source](https://github.com/Microsoft/vscode/wiki/How-to-Contribute#build-and-run-from-source) to get a local dev set up running for VS Code
+- Run `./scripts/test-integration.sh` to run all the integrations tests that include the Emmet tests.
\ No newline at end of file
diff --git a/extensions/emmet/README.md b/extensions/emmet/README.md
index a2720bbd541..b755345f787 100644
--- a/extensions/emmet/README.md
+++ b/extensions/emmet/README.md
@@ -1,25 +1,9 @@
 # Emmet integration in Visual Studio Code
 
+**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.
+
 ## Features
 
-See [Emmet in Visual Studio Code](https://code.visualstudio.com/docs/editor/emmet)
-
-## How to build and run from source?
-
-Read the basics about extension authoring from [Extending Visual Studio Code](https://code.visualstudio.com/docs/extensions/overview)
-
-- Read [Build and Run VS Code from Source](https://github.com/Microsoft/vscode/wiki/How-to-Contribute#build-and-run-from-source) to get a local dev set up running for VS Code
-- Open the `extensions/emmet` folder in the vscode repo in VS Code
-- Press F5 to start debugging
-
-## Running tests
-
-Tests for Emmet extension are run as integration tests as part of VS Code.
-
-- Read [Build and Run VS Code from Source](https://github.com/Microsoft/vscode/wiki/How-to-Contribute#build-and-run-from-source) to get a local dev set up running for VS Code
-- Run `./scripts/test-integration.sh` to run all the integrations tests that include the Emmet tests.
-
-
-
-
+See [Emmet in Visual Studio Code](https://code.visualstudio.com/docs/editor/emmet) to learn about the features of this extension.
 
+Please read the [CONTRIBUTING.md](https://github.com/Microsoft/vscode/blob/master/extensions/emmet/CONTRIBUTING.md) file to learn how to contribute to this extension.
\ No newline at end of file
diff --git a/extensions/emmet/extension.webpack.config.js b/extensions/emmet/extension.webpack.config.js
new file mode 100644
index 00000000000..d5064ef4517
--- /dev/null
+++ b/extensions/emmet/extension.webpack.config.js
@@ -0,0 +1,20 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+//@ts-check
+
+'use strict';
+
+const withDefaults = require('../shared.webpack.config');
+
+module.exports = withDefaults({
+	context: __dirname,
+	entry: {
+		extension: './src/extension.ts',
+	},
+	externals: {
+		'vscode-emmet-helper': 'commonjs vscode-emmet-helper',
+	},
+});
diff --git a/extensions/emmet/package.json b/extensions/emmet/package.json
index a8d65da831f..d9be62f74d1 100644
--- a/extensions/emmet/package.json
+++ b/extensions/emmet/package.json
@@ -39,17 +39,17 @@
                         "inMarkupAndStylesheetFilesOnly"
                     ],
                     "default": "always",
-                    "description": "%emmetShowExpandedAbbreviation%"
+                    "markdownDescription": "%emmetShowExpandedAbbreviation%"
                 },
                 "emmet.showAbbreviationSuggestions": {
                     "type": "boolean",
                     "default": true,
-                    "description": "%emmetShowAbbreviationSuggestions%"
+                    "markdownDescription": "%emmetShowAbbreviationSuggestions%"
                 },
                 "emmet.includeLanguages": {
                     "type": "object",
                     "default": {},
-                    "description": "%emmetIncludeLanguages%"
+                    "markdownDescription": "%emmetIncludeLanguages%"
                 },
                 "emmet.variables": {
                     "type": "object",
@@ -183,22 +183,22 @@
                         "css.webkitProperties": {
                             "type": "string",
                             "default": null,
-                            "description": "%emmetPreferencesCssWebkitProperties%"
+                            "markdownDescription": "%emmetPreferencesCssWebkitProperties%"
                         },
                         "css.mozProperties": {
                             "type": "string",
                             "default": null,
-                            "description": "%emmetPreferencesCssMozProperties%"
+                            "markdownDescription": "%emmetPreferencesCssMozProperties%"
                         },
                         "css.oProperties": {
                             "type": "string",
                             "default": null,
-                            "description": "%emmetPreferencesCssOProperties%"
+                            "markdownDescription": "%emmetPreferencesCssOProperties%"
                         },
                         "css.msProperties": {
                             "type": "string",
                             "default": null,
-                            "description": "%emmetPreferencesCssMsProperties%"
+                            "markdownDescription": "%emmetPreferencesCssMsProperties%"
                         },
                         "css.fuzzySearchMinScore": {
                             "type": "number",
@@ -210,12 +210,12 @@
                 "emmet.showSuggestionsAsSnippets": {
                     "type": "boolean",
                     "default": false,
-                    "description": "%emmetShowSuggestionsAsSnippets%"
+                    "markdownDescription": "%emmetShowSuggestionsAsSnippets%"
                 },
                 "emmet.optimizeStylesheetParsing": {
                     "type": "boolean",
                     "default": true,
-                    "description": "%emmetOptimizeStylesheetParsing%"
+                    "markdownDescription": "%emmetOptimizeStylesheetParsing%"
                 }
             }
         },
@@ -438,15 +438,15 @@
     },
     "devDependencies": {
         "@types/node": "8.0.33",
+        "mocha-junit-reporter": "^1.17.0",
+        "mocha-multi-reporters": "^1.1.7",
         "vscode": "1.0.1"
     },
     "dependencies": {
-        "@emmetio/html-matcher": "^0.3.3",
         "@emmetio/css-parser": "ramya-rao-a/css-parser#vscode",
+        "@emmetio/html-matcher": "^0.3.3",
         "@emmetio/math-expression": "^0.1.1",
-        "vscode-emmet-helper": "^1.2.9",
-        "vscode-languageserver-types": "^3.5.0",
         "image-size": "^0.5.2",
-        "vscode-nls": "3.2.1"
+        "vscode-emmet-helper": "^1.2.11"
     }
-}
\ No newline at end of file
+}
diff --git a/extensions/emmet/package.nls.json b/extensions/emmet/package.nls.json
index d43ba09bc46..3f3bf912fd8 100644
--- a/extensions/emmet/package.nls.json
+++ b/extensions/emmet/package.nls.json
@@ -25,10 +25,10 @@
 	"command.decrementNumberByTen": "Decrement by 10",
 	"emmetSyntaxProfiles": "Define profile for specified syntax or use your own profile with specific rules.",
 	"emmetExclude": "An array of languages where Emmet abbreviations should not be expanded.",
-	"emmetExtensionsPath": "Path to a folder containing Emmet profiles and snippets.'",
-	"emmetShowExpandedAbbreviation": "Shows expanded Emmet abbreviations as suggestions.\nThe option \"inMarkupAndStylesheetFilesOnly\" applies to html, haml, jade, slim, xml, xsl, css, scss, sass, less and stylus.\nThe option \"always\" applies to all parts of the file regardless of markup/css.",
-	"emmetShowAbbreviationSuggestions": "Shows possible Emmet abbreviations as suggestions. Not applicable in stylesheets or when emmet.showExpandedAbbreviation is set to \"never\".",
-	"emmetIncludeLanguages": "Enable Emmet abbreviations in languages that are not supported by default. Add a mapping here between the language and emmet supported language.\n E.g.: {\"vue-html\": \"html\", \"javascript\": \"javascriptreact\"}",
+	"emmetExtensionsPath": "Path to a folder containing Emmet profiles and snippets.",
+	"emmetShowExpandedAbbreviation": "Shows expanded Emmet abbreviations as suggestions.\nThe option `\"inMarkupAndStylesheetFilesOnly\"` applies to html, haml, jade, slim, xml, xsl, css, scss, sass, less and stylus.\nThe option `\"always\"` applies to all parts of the file regardless of markup/css.",
+	"emmetShowAbbreviationSuggestions": "Shows possible Emmet abbreviations as suggestions. Not applicable in stylesheets or when emmet.showExpandedAbbreviation is set to `\"never\"`.",
+	"emmetIncludeLanguages": "Enable Emmet abbreviations in languages that are not supported by default. Add a mapping here between the language and emmet supported language.\n E.g.: `{\"vue-html\": \"html\", \"javascript\": \"javascriptreact\"}`",
 	"emmetVariables": "Variables to be used in Emmet snippets",
 	"emmetTriggerExpansionOnTab": "When enabled, Emmet abbreviations are expanded when pressing TAB.",
 	"emmetPreferences": "Preferences used to modify behavior of some actions and resolvers of Emmet.",
@@ -40,7 +40,7 @@
 	"emmetPreferencesCssBetween": "Symbol to be placed at the between CSS property and value when expanding CSS abbreviations",
 	"emmetPreferencesSassBetween": "Symbol to be placed at the between CSS property and value when expanding CSS abbreviations in Sass files",
 	"emmetPreferencesStylusBetween": "Symbol to be placed at the between CSS property and value when expanding CSS abbreviations in Stylus files",
-	"emmetShowSuggestionsAsSnippets": "If true, then Emmet suggestions will show up as snippets allowing you to order them as per editor.snippetSuggestions setting.",
+	"emmetShowSuggestionsAsSnippets": "If `true`, then Emmet suggestions will show up as snippets allowing you to order them as per `#editor.snippetSuggestions#` setting.",
 	"emmetPreferencesBemElementSeparator": "Element separator used for classes when using the BEM filter",
 	"emmetPreferencesBemModifierSeparator": "Modifier separator used for classes when using the BEM filter",
 	"emmetPreferencesFilterCommentBefore": "A definition of comment that should be placed before matched element when comment filter is applied.",
@@ -54,5 +54,5 @@
 	"emmetPreferencesCssOProperties": "Comma separated CSS properties that get the 'o' vendor prefix when used in Emmet abbreviation that starts with `-`. Set to empty string to always avoid the 'o' prefix.",
 	"emmetPreferencesCssMsProperties": "Comma separated CSS properties that get the 'ms' vendor prefix when used in Emmet abbreviation that starts with `-`. Set to empty string to always avoid the 'ms' prefix.",
 	"emmetPreferencesCssFuzzySearchMinScore": "The minimum score (from 0 to 1) that fuzzy-matched abbreviation should achieve. Lower values may produce many false-positive matches, higher values may reduce possible matches.",
-	"emmetOptimizeStylesheetParsing": "When set to false, the whole file is parsed to determine if current position is valid for expanding Emmet abbreviations. When set to true, only the content around the current position in css/scss/less files is parsed."
+	"emmetOptimizeStylesheetParsing": "When set to `false`, the whole file is parsed to determine if current position is valid for expanding Emmet abbreviations. When set to `true`, only the content around the current position in css/scss/less files is parsed."
 }
diff --git a/extensions/emmet/src/abbreviationActions.ts b/extensions/emmet/src/abbreviationActions.ts
index 55f1c1ac986..26444af31e5 100644
--- a/extensions/emmet/src/abbreviationActions.ts
+++ b/extensions/emmet/src/abbreviationActions.ts
@@ -96,6 +96,7 @@ function doWrapping(individualLines: boolean, args: any) {
 			const preceedingWhiteSpace = otherMatches ? otherMatches[1] : '';
 			textToWrapInPreview = rangeToReplace.isSingleLine ? [textToReplace] : ['\n\t' + textToReplace.split('\n' + preceedingWhiteSpace).join('\n\t') + '\n'];
 		}
+		textToWrapInPreview = textToWrapInPreview.map(e => e.replace(/(\$\d)/g, '\\$1'));
 
 		return {
 			previewRange: rangeToReplace,
@@ -497,6 +498,12 @@ export function isValidLocationForEmmetAbbreviation(document: vscode.TextDocumen
 			i--;
 			continue;
 		}
+		// Fix for https://github.com/Microsoft/vscode/issues/55411
+		// A space is not a valid character right after < in a tag name.
+		if (/\s/.test(char) && textToBackTrack[i] === startAngle) {
+			i--;
+			continue;
+		}
 		if (char !== startAngle && char !== endAngle) {
 			continue;
 		}
diff --git a/extensions/emmet/src/balance.ts b/extensions/emmet/src/balance.ts
index 5e323f29e22..4687b734524 100644
--- a/extensions/emmet/src/balance.ts
+++ b/extensions/emmet/src/balance.ts
@@ -61,7 +61,7 @@ function balance(out: boolean) {
 }
 
 function getRangeToBalanceOut(document: vscode.TextDocument, selection: vscode.Selection, rootNode: HtmlNode): vscode.Selection {
-	let nodeToBalance = getHtmlNode(document, rootNode, selection.start);
+	let nodeToBalance = getHtmlNode(document, rootNode, selection.start, false);
 	if (!nodeToBalance) {
 		return selection;
 	}
diff --git a/extensions/emmet/src/locateFile.ts b/extensions/emmet/src/locateFile.ts
index f3fd2146a11..0ef2ad697ca 100644
--- a/extensions/emmet/src/locateFile.ts
+++ b/extensions/emmet/src/locateFile.ts
@@ -10,7 +10,9 @@
 import * as path from 'path';
 import * as fs from 'fs';
 
-const reAbsolute = /^\/+/;
+const reAbsolutePosix = /^\/+/;
+const reAbsoluteWin32 = /^\\+/;
+const reAbsolute = path.sep === '/' ? reAbsolutePosix : reAbsoluteWin32;
 
 /**
  * Locates given `filePath` on user’s file system and returns absolute path to it.
diff --git a/extensions/emmet/src/mergeLines.ts b/extensions/emmet/src/mergeLines.ts
index 848966de4d1..cebcea3010f 100644
--- a/extensions/emmet/src/mergeLines.ts
+++ b/extensions/emmet/src/mergeLines.ts
@@ -34,7 +34,7 @@ function getRangesToReplace(document: vscode.TextDocument, selection: vscode.Sel
 	let endNodeToUpdate: Node | null;
 
 	if (selection.isEmpty) {
-		startNodeToUpdate = endNodeToUpdate = getNode(rootNode, selection.start);
+		startNodeToUpdate = endNodeToUpdate = getNode(rootNode, selection.start, true);
 	} else {
 		startNodeToUpdate = getNode(rootNode, selection.start, true);
 		endNodeToUpdate = getNode(rootNode, selection.end, true);
diff --git a/extensions/emmet/src/removeTag.ts b/extensions/emmet/src/removeTag.ts
index 0ea6e4dde96..9209a6d75e8 100644
--- a/extensions/emmet/src/removeTag.ts
+++ b/extensions/emmet/src/removeTag.ts
@@ -38,7 +38,7 @@ export function removeTag() {
 
 function getRangeToRemove(editor: vscode.TextEditor, rootNode: HtmlNode, selection: vscode.Selection, indentInSpaces: string): vscode.Range[] {
 
-	let nodeToUpdate = getHtmlNode(editor.document, rootNode, selection.start);
+	let nodeToUpdate = getHtmlNode(editor.document, rootNode, selection.start, true);
 	if (!nodeToUpdate) {
 		return [];
 	}
diff --git a/extensions/emmet/src/selectItemHTML.ts b/extensions/emmet/src/selectItemHTML.ts
index d5dbbf33d05..6fe1825fd87 100644
--- a/extensions/emmet/src/selectItemHTML.ts
+++ b/extensions/emmet/src/selectItemHTML.ts
@@ -8,7 +8,7 @@ import { getDeepestNode, findNextWord, findPrevWord, getHtmlNode } from './util'
 import { HtmlNode } from 'EmmetNode';
 
 export function nextItemHTML(selectionStart: vscode.Position, selectionEnd: vscode.Position, editor: vscode.TextEditor, rootNode: HtmlNode): vscode.Selection | undefined {
-	let currentNode = getHtmlNode(editor.document, rootNode, selectionEnd);
+	let currentNode = getHtmlNode(editor.document, rootNode, selectionEnd, false);
 	let nextNode: HtmlNode | undefined = undefined;
 
 	if (!currentNode) {
@@ -31,7 +31,7 @@ export function nextItemHTML(selectionStart: vscode.Position, selectionEnd: vsco
 
 		// Get the first child of current node which is right after the cursor and is not a comment
 		nextNode = currentNode.firstChild;
-		while (nextNode && (selectionEnd.isAfterOrEqual(nextNode.start) || nextNode.type === 'comment')) {
+		while (nextNode && (selectionEnd.isAfterOrEqual(nextNode.end) || nextNode.type === 'comment')) {
 			nextNode = nextNode.nextSibling;
 		}
 	}
@@ -54,7 +54,7 @@ export function nextItemHTML(selectionStart: vscode.Position, selectionEnd: vsco
 }
 
 export function prevItemHTML(selectionStart: vscode.Position, selectionEnd: vscode.Position, editor: vscode.TextEditor, rootNode: HtmlNode): vscode.Selection | undefined {
-	let currentNode = getHtmlNode(editor.document, rootNode, selectionStart);
+	let currentNode = getHtmlNode(editor.document, rootNode, selectionStart, false);
 	let prevNode: HtmlNode | undefined = undefined;
 
 	if (!currentNode) {
@@ -63,7 +63,7 @@ export function prevItemHTML(selectionStart: vscode.Position, selectionEnd: vsco
 
 	if (currentNode.type !== 'comment' && selectionStart.translate(0, -1).isAfter(currentNode.open.start)) {
 
-		if (selectionStart.isBefore(currentNode.open.end) || !currentNode.firstChild) {
+		if (selectionStart.isBefore(currentNode.open.end) || !currentNode.firstChild || selectionEnd.isBeforeOrEqual(currentNode.firstChild.start)) {
 			prevNode = currentNode;
 		} else {
 			// Select the child that appears just before the cursor and is not a comment
diff --git a/extensions/emmet/src/selectItemStylesheet.ts b/extensions/emmet/src/selectItemStylesheet.ts
index 3a63a8cb79f..29df659c564 100644
--- a/extensions/emmet/src/selectItemStylesheet.ts
+++ b/extensions/emmet/src/selectItemStylesheet.ts
@@ -51,7 +51,7 @@ export function nextItemStylesheet(startOffset: vscode.Position, endOffset: vsco
 }
 
 export function prevItemStylesheet(startOffset: vscode.Position, endOffset: vscode.Position, editor: vscode.TextEditor, rootNode: CssNode): vscode.Selection | undefined {
-	let currentNode = <CssNode>getNode(rootNode, startOffset);
+	let currentNode = <CssNode>getNode(rootNode, startOffset, false);
 	if (!currentNode) {
 		currentNode = rootNode;
 	}
diff --git a/extensions/emmet/src/splitJoinTag.ts b/extensions/emmet/src/splitJoinTag.ts
index c437d5d14f3..a5f1d255c85 100644
--- a/extensions/emmet/src/splitJoinTag.ts
+++ b/extensions/emmet/src/splitJoinTag.ts
@@ -20,7 +20,7 @@ export function splitJoinTag() {
 
 	return editor.edit(editBuilder => {
 		editor.selections.reverse().forEach(selection => {
-			let nodeToUpdate = getHtmlNode(editor.document, rootNode, selection.start);
+			let nodeToUpdate = getHtmlNode(editor.document, rootNode, selection.start, true);
 			if (nodeToUpdate) {
 				let textEdit = getRangesToReplace(editor.document, nodeToUpdate);
 				editBuilder.replace(textEdit.range, textEdit.newText);
diff --git a/extensions/emmet/src/test/abbreviationAction.test.ts b/extensions/emmet/src/test/abbreviationAction.test.ts
index 14286654d05..b5fb87d8b07 100644
--- a/extensions/emmet/src/test/abbreviationAction.test.ts
+++ b/extensions/emmet/src/test/abbreviationAction.test.ts
@@ -466,6 +466,16 @@ suite('Tests for jsx, xml and xsl', () => {
 		});
 	});
 
+	test('Expand abbreviation with condition containing less than sign for jsx', () => {
+		return withRandomFileEditor('if (foo < 10) { span.bar', 'javascriptreact', (editor, doc) => {
+			editor.selection = new Selection(0, 27, 0, 27);
+			return expandEmmetAbbreviation({ language: 'javascriptreact' }).then(() => {
+				assert.equal(editor.document.getText(), 'if (foo < 10) { <span className="bar"></span>');
+				return Promise.resolve();
+			});
+		});
+	});
+
 	test('No expanding text inside open tag in completion list (jsx)', () => {
 		return testNoCompletion('jsx', htmlContents, new Selection(2, 4, 2, 4));
 	});
diff --git a/extensions/emmet/src/test/editPointSelectItemBalance.test.ts b/extensions/emmet/src/test/editPointSelectItemBalance.test.ts
index a9f25685b91..f05469ab440 100644
--- a/extensions/emmet/src/test/editPointSelectItemBalance.test.ts
+++ b/extensions/emmet/src/test/editPointSelectItemBalance.test.ts
@@ -113,6 +113,22 @@ suite('Tests for Next/Previous Select/Edit point and Balance actions', () => {
 		});
 	});
 
+	test('Emmet Select Next/Prev item at boundary', function(): any {
+		return withRandomFileEditor(htmlContents, '.html', (editor, doc) => {
+			editor.selections = [new Selection(4, 1, 4, 1)];
+
+			fetchSelectItem('next');
+			testSelection(editor.selection, 2, 4, 6);
+
+			editor.selections = [new Selection(4, 1, 4, 1)];
+
+			fetchSelectItem('prev');
+			testSelection(editor.selection, 1, 3, 5);
+
+			return Promise.resolve();
+		});
+	});
+
 	test('Emmet Next/Prev Item in html template', function (): any {
 		const templateContents = `
 <script type="text/template">
diff --git a/extensions/emmet/src/test/index.ts b/extensions/emmet/src/test/index.ts
index f65a756a8de..f0ee94a91f8 100644
--- a/extensions/emmet/src/test/index.ts
+++ b/extensions/emmet/src/test/index.ts
@@ -3,26 +3,28 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-//
-// PLEASE DO NOT MODIFY / DELETE UNLESS YOU KNOW WHAT YOU ARE DOING
-//
-// This file is providing the test runner to use when running extension tests.
-// By default the test runner in use is Mocha based.
-//
-// You can provide your own test runner if you want to override it by exporting
-// a function run(testRoot: string, clb: (error:Error) => void) that the extension
-// host can call to run the tests. The test runner is expected to use console.log
-// to report the results back to the caller. When the tests are finished, return
-// a possible error to the callback or null if none.
-
+const path = require('path');
 const testRunner = require('vscode/lib/testrunner');
 
-// You can directly control Mocha options by uncommenting the following lines
-// See https://github.com/mochajs/mocha/wiki/Using-mocha-programmatically#set-options for more info
-testRunner.configure({
-	ui: 'tdd', 		// the TDD UI is being used in extension.test.ts (suite, test, etc.)
-	useColors: process.platform !== 'win32', // colored output from test results (only windows cannot handle)
+const suite = 'Integration Emmet Tests';
+
+const options: any = {
+	ui: 'tdd',
+	useColors: true,
 	timeout: 60000
-});
+};
+
+if (process.env.BUILD_ARTIFACTSTAGINGDIRECTORY) {
+	options.reporter = 'mocha-multi-reporters';
+	options.reporterOptions = {
+		reporterEnabled: 'spec, mocha-junit-reporter',
+		mochaJunitReporterReporterOptions: {
+			testsuitesTitle: `${suite} ${process.platform}`,
+			mochaFile: path.join(process.env.BUILD_ARTIFACTSTAGINGDIRECTORY, `test-results/${process.platform}-${suite.toLowerCase().replace(/[^\w]/g, '-')}-results.xml`)
+		}
+	};
+}
+
+testRunner.configure(options);
 
 export = testRunner;
diff --git a/extensions/emmet/src/test/reflectCssValue.test.ts b/extensions/emmet/src/test/reflectCssValue.test.ts
index 5a905da6e6c..17cae8b73ec 100644
--- a/extensions/emmet/src/test/reflectCssValue.test.ts
+++ b/extensions/emmet/src/test/reflectCssValue.test.ts
@@ -56,6 +56,16 @@ suite('Tests for Emmet: Reflect CSS Value command', () => {
 		});
 	});
 
+	test('Reflect Css Value in css file, selecting entire property', function (): any {
+		return withRandomFileEditor(cssContents, '.css', (editor, doc) => {
+			editor.selections = [new Selection(5, 2, 5, 32)];
+			return reflectCssValue().then(() => {
+				assert.equal(doc.getText(), cssContents.replace(/\(50deg\)/g, '(20deg)'));
+				return Promise.resolve();
+			});
+		});
+	});
+
 	test('Reflect Css Value in html file', function (): any {
 		return withRandomFileEditor(htmlContents, '.html', (editor, doc) => {
 			editor.selections = [new Selection(7, 20, 7, 20)];
@@ -66,4 +76,14 @@ suite('Tests for Emmet: Reflect CSS Value command', () => {
 		});
 	});
 
+	test('Reflect Css Value in html file, selecting entire property', function (): any {
+		return withRandomFileEditor(htmlContents, '.html', (editor, doc) => {
+			editor.selections = [new Selection(7, 4, 7, 34)];
+			return reflectCssValue().then(() => {
+				assert.equal(doc.getText(), htmlContents.replace(/\(50deg\)/g, '(20deg)'));
+				return Promise.resolve();
+			});
+		});
+	});
+
 });
\ No newline at end of file
diff --git a/extensions/emmet/src/test/tagActions.test.ts b/extensions/emmet/src/test/tagActions.test.ts
index 6c60eaae2a9..a5d5ca291d7 100644
--- a/extensions/emmet/src/test/tagActions.test.ts
+++ b/extensions/emmet/src/test/tagActions.test.ts
@@ -66,6 +66,31 @@ suite('Tests for Emmet actions on html tags', () => {
 		});
 	});
 
+	// #region update tag
+	test('update tag with entire node selected', () => {
+		const expectedContents = `
+	<div class="hello">
+		<ul>
+			<li><section>Hello</section></li>
+			<li><span>There</span></li>
+			<section><li><span>Bye</span></li></section>
+		</ul>
+		<span/>
+	</div>
+	`;
+		return withRandomFileEditor(contents, 'html', (editor, doc) => {
+			editor.selections = [
+				new Selection(3, 7, 3, 25),
+				new Selection(5, 3, 5, 39),
+			];
+
+			return updateTag('section')!.then(() => {
+				assert.equal(doc.getText(), expectedContents);
+				return Promise.resolve();
+			});
+		});
+	});
+
 	test('update tag with template', () => {
 		const expectedContents = `
 	<script type="text/template">
@@ -89,8 +114,9 @@ suite('Tests for Emmet actions on html tags', () => {
 			});
 		});
 	});
+	// #endregion
 
-
+	// #region remove tag
 	test('remove tag with mutliple cursors', () => {
 		const expectedContents = `
 	<div class="hello">
@@ -116,6 +142,31 @@ suite('Tests for Emmet actions on html tags', () => {
 		});
 	});
 
+	test('remove tag with boundary conditions', () => {
+		const expectedContents = `
+	<div class="hello">
+		<ul>
+			<li>Hello</li>
+			<li><span>There</span></li>
+			<li><span>Bye</span></li>
+		</ul>
+		<span/>
+	</div>
+	`;
+
+		return withRandomFileEditor(contents, 'html', (editor, doc) => {
+			editor.selections = [
+				new Selection(3, 7, 3, 25),
+				new Selection(5, 3, 5, 39),
+			];
+
+			return removeTag()!.then(() => {
+				assert.equal(doc.getText(), expectedContents);
+				return Promise.resolve();
+			});
+		});
+	});
+
 
 	test('remove tag with template', () => {
 		const expectedContents = `
@@ -139,7 +190,9 @@ suite('Tests for Emmet actions on html tags', () => {
 			});
 		});
 	});
+	// #endregion
 
+	// #region split/join tag
 	test('split/join tag with mutliple cursors', () => {
 		const expectedContents = `
 	<div class="hello">
@@ -164,6 +217,30 @@ suite('Tests for Emmet actions on html tags', () => {
 		});
 	});
 
+	test('split/join tag with boundary selection', () => {
+		const expectedContents = `
+	<div class="hello">
+		<ul>
+			<li><span/></li>
+			<li><span>There</span></li>
+			<div><li><span>Bye</span></li></div>
+		</ul>
+		<span></span>
+	</div>
+	`;
+		return withRandomFileEditor(contents, 'html', (editor, doc) => {
+			editor.selections = [
+				new Selection(3, 7, 3, 25), // join tag
+				new Selection(7, 2, 7, 9), // split tag
+			];
+
+			return splitJoinTag()!.then(() => {
+				assert.equal(doc.getText(), expectedContents);
+				return Promise.resolve();
+			});
+		});
+	});
+
 	test('split/join tag with templates', () => {
 		const expectedContents = `
 	<script type="text/template">
@@ -214,7 +291,9 @@ suite('Tests for Emmet actions on html tags', () => {
 			});
 		});
 	});
+	// #endregion
 
+	// #region match tag
 	test('match tag with mutliple cursors', () => {
 		return withRandomFileEditor(contents, 'html', (editor, doc) => {
 			editor.selections = [
@@ -265,6 +344,9 @@ suite('Tests for Emmet actions on html tags', () => {
 		});
 	});
 
+	// #endregion
+
+	// #region merge lines
 	test('merge lines of tag with children when empty selection', () => {
 		const expectedContents = `
 	<div class="hello">
@@ -284,6 +366,25 @@ suite('Tests for Emmet actions on html tags', () => {
 		});
 	});
 
+	test('merge lines of tag with children when full node selection', () => {
+		const expectedContents = `
+	<div class="hello">
+		<ul><li><span>Hello</span></li><li><span>There</span></li><div><li><span>Bye</span></li></div></ul>
+		<span/>
+	</div>
+	`;
+		return withRandomFileEditor(contents, 'html', (editor, doc) => {
+			editor.selections = [
+				new Selection(2, 3, 6, 7)
+			];
+
+			return mergeLines()!.then(() => {
+				assert.equal(doc.getText(), expectedContents);
+				return Promise.resolve();
+			});
+		});
+	});
+
 	test('merge lines is no-op when start and end nodes are on the same line', () => {
 		return withRandomFileEditor(contents, 'html', (editor, doc) => {
 			editor.selections = [
@@ -298,5 +399,6 @@ suite('Tests for Emmet actions on html tags', () => {
 			});
 		});
 	});
+	// #endregion
 });
 
diff --git a/extensions/emmet/src/test/wrapWithAbbreviation.test.ts b/extensions/emmet/src/test/wrapWithAbbreviation.test.ts
index 88f64a3afbb..50f8454d104 100644
--- a/extensions/emmet/src/test/wrapWithAbbreviation.test.ts
+++ b/extensions/emmet/src/test/wrapWithAbbreviation.test.ts
@@ -225,14 +225,14 @@ suite('Tests for Wrap with Abbreviations', () => {
 	test('Wrap individual lines with abbreviation', () => {
 		const contents = `
 	<ul class="nav main">
-		<li class="item1">img</li>
+		<li class="item1">This $10 is not a tabstop</li>
 		<li class="item2">hi.there</li>
 	</ul>
 `;
 		const wrapIndividualLinesExpected = `
 	<ul class="nav main">
 		<ul>
-			<li class="hello1"><li class="item1">img</li></li>
+			<li class="hello1"><li class="item1">This $10 is not a tabstop</li></li>
 			<li class="hello2"><li class="item2">hi.there</li></li>
 		</ul>
 	</ul>
diff --git a/extensions/emmet/src/updateImageSize.ts b/extensions/emmet/src/updateImageSize.ts
index 17959c07460..ba674b5ebc9 100644
--- a/extensions/emmet/src/updateImageSize.ts
+++ b/extensions/emmet/src/updateImageSize.ts
@@ -73,13 +73,13 @@ function updateImageSizeHTML(editor: TextEditor, position: Position): Promise<Te
 function updateImageSizeStyleTag(editor: TextEditor, position: Position): Promise<TextEdit[] | undefined> {
 	const getPropertyInsiderStyleTag = (editor: TextEditor): Property | null => {
 		const rootNode = parseDocument(editor.document);
-		const currentNode = <HtmlNode>getNode(rootNode, position);
+		const currentNode = <HtmlNode>getNode(rootNode, position, true);
 		if (currentNode && currentNode.name === 'style'
 			&& currentNode.open.end.isBefore(position)
 			&& currentNode.close.start.isAfter(position)) {
 			let buffer = new DocumentStreamReader(editor.document, currentNode.open.end, new Range(currentNode.open.end, currentNode.close.start));
 			let rootNode = parseStylesheet(buffer);
-			const node = getNode(rootNode, position);
+			const node = getNode(rootNode, position, true);
 			return (node && node.type === 'property') ? <Property>node : null;
 		}
 		return null;
diff --git a/extensions/emmet/src/updateTag.ts b/extensions/emmet/src/updateTag.ts
index f260d3f1082..b8f568e9e52 100644
--- a/extensions/emmet/src/updateTag.ts
+++ b/extensions/emmet/src/updateTag.ts
@@ -30,7 +30,7 @@ export function updateTag(tagName: string): Thenable<boolean> | undefined {
 }
 
 function getRangesToUpdate(editor: vscode.TextEditor, selection: vscode.Selection, rootNode: HtmlNode): vscode.Range[] {
-	let nodeToUpdate = getHtmlNode(editor.document, rootNode, selection.start);
+	let nodeToUpdate = getHtmlNode(editor.document, rootNode, selection.start, true);
 	if (!nodeToUpdate) {
 		return [];
 	}
diff --git a/extensions/emmet/src/util.ts b/extensions/emmet/src/util.ts
index a8165ff2518..b51d04d6cec 100644
--- a/extensions/emmet/src/util.ts
+++ b/extensions/emmet/src/util.ts
@@ -47,7 +47,7 @@ export const LANGUAGE_MODES: any = {
 	'typescriptreact': ['!', '.', '}', '*', '$', ']', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9']
 };
 
-const allowedMimeTypesInScriptTag = ['text/html', 'text/plain', 'text/x-template', 'text/template'];
+const allowedMimeTypesInScriptTag = ['text/html', 'text/plain', 'text/x-template', 'text/template', 'text/ng-template'];
 
 const emmetModes = ['html', 'pug', 'slim', 'haml', 'xml', 'xsl', 'jsx', 'css', 'scss', 'sass', 'less', 'stylus'];
 
@@ -285,7 +285,7 @@ function findClosingCommentAfterPosition(document: vscode.TextDocument, position
 /**
  * Returns node corresponding to given position in the given root node
  */
-export function getNode(root: Node | undefined, position: vscode.Position, includeNodeBoundary: boolean = false) {
+export function getNode(root: Node | undefined, position: vscode.Position, includeNodeBoundary: boolean) {
 	if (!root) {
 		return null;
 	}
@@ -310,7 +310,7 @@ export function getNode(root: Node | undefined, position: vscode.Position, inclu
 	return foundNode;
 }
 
-export function getHtmlNode(document: vscode.TextDocument, root: Node | undefined, position: vscode.Position, includeNodeBoundary: boolean = false): HtmlNode | undefined {
+export function getHtmlNode(document: vscode.TextDocument, root: Node | undefined, position: vscode.Position, includeNodeBoundary: boolean): HtmlNode | undefined {
 	let currentNode = <HtmlNode>getNode(root, position, includeNodeBoundary);
 	if (!currentNode) { return; }
 
@@ -532,7 +532,7 @@ export function getCssPropertyFromRule(rule: Rule, name: string): Property | und
  */
 export function getCssPropertyFromDocument(editor: vscode.TextEditor, position: vscode.Position): Property | null | undefined {
 	const rootNode = parseDocument(editor.document);
-	const node = getNode(rootNode, position);
+	const node = getNode(rootNode, position, true);
 
 	if (isStyleSheet(editor.document.languageId)) {
 		return node && node.type === 'property' ? <Property>node : null;
@@ -545,7 +545,7 @@ export function getCssPropertyFromDocument(editor: vscode.TextEditor, position:
 		&& htmlNode.close.start.isAfter(position)) {
 		let buffer = new DocumentStreamReader(editor.document, htmlNode.start, new vscode.Range(htmlNode.start, htmlNode.end));
 		let rootNode = parseStylesheet(buffer);
-		const node = getNode(rootNode, position);
+		const node = getNode(rootNode, position, true);
 		return (node && node.type === 'property') ? <Property>node : null;
 	}
 }
diff --git a/extensions/emmet/tsconfig.json b/extensions/emmet/tsconfig.json
index 0a6f9c5eaf7..b035483b959 100644
--- a/extensions/emmet/tsconfig.json
+++ b/extensions/emmet/tsconfig.json
@@ -16,4 +16,4 @@
 	"include": [
 		"src/**/*"
 	]
-}
\ No newline at end of file
+}
diff --git a/extensions/emmet/yarn.lock b/extensions/emmet/yarn.lock
index 6cce9822979..e910402265e 100644
--- a/extensions/emmet/yarn.lock
+++ b/extensions/emmet/yarn.lock
@@ -60,6 +60,10 @@ ansi-regex@^2.0.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
 
+ansi-regex@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
+
 ansi-styles@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-1.1.0.tgz#eaecbf66cd706882760b2f4691582b8f55d7a7de"
@@ -232,6 +236,10 @@ chalk@^1.0.0, chalk@^1.1.1:
     strip-ansi "^3.0.0"
     supports-color "^2.0.0"
 
+charenc@~0.0.1:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/charenc/-/charenc-0.0.2.tgz#c0a1d2f3a7092e03774bfa83f14c0fc5790a8667"
+
 clone-buffer@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/clone-buffer/-/clone-buffer-1.0.0.tgz#e3e25b207ac4e701af721e2cb5a16792cac3dc58"
@@ -294,6 +302,10 @@ core-util-is@1.0.2, core-util-is@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
 
+crypt@~0.0.1:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/crypt/-/crypt-0.0.2.tgz#88d7ff7ec0dfb86f713dc87bbb42d044d3e6c41b"
+
 cryptiles@2.x.x:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-2.0.5.tgz#3bdfecdc608147c1c67202fa291e7dca59eaa3b8"
@@ -335,6 +347,18 @@ debug@2.2.0:
   dependencies:
     ms "0.7.1"
 
+debug@^2.2.0:
+  version "2.6.9"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
+  dependencies:
+    ms "2.0.0"
+
+debug@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
+  dependencies:
+    ms "2.0.0"
+
 decamelize@^1.1.2:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
@@ -873,7 +897,7 @@ is-arrayish@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
 
-is-buffer@^1.1.5:
+is-buffer@^1.1.5, is-buffer@~1.1.1:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
 
@@ -1256,6 +1280,10 @@ lodash.values@~2.4.1:
   dependencies:
     lodash.keys "~2.4.1"
 
+lodash@^4.16.4:
+  version "4.17.10"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"
+
 loud-rejection@^1.0.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/loud-rejection/-/loud-rejection-1.6.0.tgz#5b46f80147edee578870f086d04821cf998e551f"
@@ -1275,6 +1303,14 @@ map-stream@~0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/map-stream/-/map-stream-0.1.0.tgz#e56aa94c4c8055a16404a0674b78f215f7c8e194"
 
+md5@^2.1.0:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/md5/-/md5-2.2.1.tgz#53ab38d5fe3c8891ba465329ea23fac0540126f9"
+  dependencies:
+    charenc "~0.0.1"
+    crypt "~0.0.1"
+    is-buffer "~1.1.1"
+
 meow@^3.3.0:
   version "3.7.0"
   resolved "https://registry.yarnpkg.com/meow/-/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb"
@@ -1353,12 +1389,29 @@ mkdirp@0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.3.0.tgz#1bbf5ab1ba827af23575143490426455f481fe1e"
 
-mkdirp@0.5, mkdirp@0.5.1, mkdirp@^0.5.0, mkdirp@^0.5.1:
+mkdirp@0.5, mkdirp@0.5.1, mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.1:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
   dependencies:
     minimist "0.0.8"
 
+mocha-junit-reporter@^1.17.0:
+  version "1.17.0"
+  resolved "https://registry.yarnpkg.com/mocha-junit-reporter/-/mocha-junit-reporter-1.17.0.tgz#2e5149ed40fc5d2e3ca71e42db5ab1fec9c6d85c"
+  dependencies:
+    debug "^2.2.0"
+    md5 "^2.1.0"
+    mkdirp "~0.5.1"
+    strip-ansi "^4.0.0"
+    xml "^1.0.0"
+
+mocha-multi-reporters@^1.1.7:
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/mocha-multi-reporters/-/mocha-multi-reporters-1.1.7.tgz#cc7f3f4d32f478520941d852abb64d9988587d82"
+  dependencies:
+    debug "^3.1.0"
+    lodash "^4.16.4"
+
 mocha@^2.3.3:
   version "2.5.3"
   resolved "https://registry.yarnpkg.com/mocha/-/mocha-2.5.3.tgz#161be5bdeb496771eb9b35745050b622b5aefc58"
@@ -1378,6 +1431,10 @@ ms@0.7.1:
   version "0.7.1"
   resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.1.tgz#9cd13c03adbff25b65effde7ce864ee952017098"
 
+ms@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
+
 multimatch@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/multimatch/-/multimatch-2.1.0.tgz#9c7906a22fb4c02919e2f5f75161b4cdbd4b2a2b"
@@ -1832,6 +1889,12 @@ strip-ansi@^3.0.0:
   dependencies:
     ansi-regex "^2.0.0"
 
+strip-ansi@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
+  dependencies:
+    ansi-regex "^3.0.0"
+
 strip-bom-stream@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/strip-bom-stream/-/strip-bom-stream-1.0.0.tgz#e7144398577d51a6bed0fa1994fa05f43fd988ee"
@@ -2052,26 +2115,18 @@ vinyl@~2.0.1:
     remove-trailing-separator "^1.0.1"
     replace-ext "^1.0.0"
 
-vscode-emmet-helper@^1.2.9:
-  version "1.2.9"
-  resolved "https://registry.yarnpkg.com/vscode-emmet-helper/-/vscode-emmet-helper-1.2.9.tgz#a194ec6a4350e14a511bc5e16c1f0d0786d8bb58"
+vscode-emmet-helper@^1.2.11:
+  version "1.2.11"
+  resolved "https://registry.yarnpkg.com/vscode-emmet-helper/-/vscode-emmet-helper-1.2.11.tgz#4de78223666bf917eb6dc4b225b6c40f6901950c"
   dependencies:
     "@emmetio/extract-abbreviation" "0.1.6"
     jsonc-parser "^1.0.0"
     vscode-languageserver-types "^3.6.0-next.1"
 
-vscode-languageserver-types@^3.5.0:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.5.0.tgz#e48d79962f0b8e02de955e3f524908e2b19c0374"
-
 vscode-languageserver-types@^3.6.0-next.1:
   version "3.6.0-next.1"
   resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.6.0-next.1.tgz#98e488d3f87b666b4ee1a3d89f0023e246d358f3"
 
-vscode-nls@3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.1.tgz#b1f3e04e8a94a715d5a7bcbc8339c51e6d74ca51"
-
 vscode@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/vscode/-/vscode-1.0.1.tgz#3d161200615fe2af1d92ddc650751159411a513b"
@@ -2094,6 +2149,10 @@ wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
 
+xml@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/xml/-/xml-1.0.1.tgz#78ba72020029c5bc87b8a81a3cfcd74b4a2fc1e5"
+
 "xtend@>=4.0.0 <4.1.0-0", xtend@^4.0.0, xtend@~4.0.0, xtend@~4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
diff --git a/extensions/extension-editing/extension.webpack.config.js b/extensions/extension-editing/extension.webpack.config.js
new file mode 100644
index 00000000000..ca76400f529
--- /dev/null
+++ b/extensions/extension-editing/extension.webpack.config.js
@@ -0,0 +1,25 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+//@ts-check
+
+'use strict';
+
+const withDefaults = require('../shared.webpack.config');
+
+module.exports = withDefaults({
+	context: __dirname,
+	entry: {
+		extension: './src/extension.ts',
+	},
+	resolve: {
+		mainFields: ['module', 'main'],
+		extensions: ['.ts', '.js'] // support ts-files and js-files
+	},
+	externals: {
+		'../../../product.json': 'commonjs ../../../product.json',
+		'typescript': 'commonjs typescript'
+	}
+});
diff --git a/extensions/extension-editing/package.json b/extensions/extension-editing/package.json
index e5c502426c0..0caec7607a6 100644
--- a/extensions/extension-editing/package.json
+++ b/extensions/extension-editing/package.json
@@ -18,10 +18,10 @@
 		"watch": "gulp watch-extension:extension-editing"
 	},
 	"dependencies": {
-		"jsonc-parser": "^1.0.0",
+		"jsonc-parser": "^2.0.2",
 		"markdown-it": "^8.3.1",
 		"parse5": "^3.0.2",
-		"vscode-nls": "^3.2.1"
+		"vscode-nls": "^4.0.0"
 	},
 	"contributes": {
 		"jsonValidation": [
@@ -45,6 +45,6 @@
 	},
 	"devDependencies": {
 		"@types/markdown-it": "0.0.2",
-		"@types/node": "6.0.78"
+		"@types/node": "^8.10.25"
 	}
-}
\ No newline at end of file
+}
diff --git a/extensions/extension-editing/package.nls.json b/extensions/extension-editing/package.nls.json
index 9265e6a3c9d..263fb6bc870 100644
--- a/extensions/extension-editing/package.nls.json
+++ b/extensions/extension-editing/package.nls.json
@@ -1,4 +1,4 @@
 {
-	"displayName": "Package File Editing",
-	"description": "Provides IntelliSense for VS Code extension points and linting capabilities in package.json files."
+	"displayName": "Extension Authoring",
+	"description": "Provides linting capabilities for authoring extensions."
 }
\ No newline at end of file
diff --git a/extensions/extension-editing/src/extensionLinter.ts b/extensions/extension-editing/src/extensionLinter.ts
index 0e486252598..4c415bc9273 100644
--- a/extensions/extension-editing/src/extensionLinter.ts
+++ b/extensions/extension-editing/src/extensionLinter.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as fs from 'fs';
 import * as path from 'path';
+import * as fs from 'fs';
 
 import * as nls from 'vscode-nls';
 const localize = nls.loadMessageBundle();
@@ -12,9 +12,9 @@ const localize = nls.loadMessageBundle();
 import { parseTree, findNodeAtLocation, Node as JsonNode } from 'jsonc-parser';
 import * as MarkdownItType from 'markdown-it';
 
-import { languages, workspace, Disposable, TextDocument, Uri, Diagnostic, Range, DiagnosticSeverity, Position } from 'vscode';
+import { languages, workspace, Disposable, TextDocument, Uri, Diagnostic, Range, DiagnosticSeverity, Position, env } from 'vscode';
 
-const product = require('../../../product.json');
+const product = JSON.parse(fs.readFileSync(path.join(env.appRoot, 'product.json'), { encoding: 'utf-8' }));
 const allowedBadgeProviders: string[] = (product.extensionAllowedBadgeProviders || []).map(s => s.toLowerCase());
 
 const httpsRequired = localize('httpsRequired', "Images must use the HTTPS protocol.");
@@ -250,9 +250,10 @@ export class ExtensionLinter {
 	private readPackageJsonInfo(folder: Uri, tree: JsonNode) {
 		const engine = tree && findNodeAtLocation(tree, ['engines', 'vscode']);
 		const repo = tree && findNodeAtLocation(tree, ['repository', 'url']);
+		const uri = repo && parseUri(repo.value);
 		const info: PackageJsonInfo = {
 			isExtension: !!(engine && engine.type === 'string'),
-			hasHttpsRepository: !!(repo && repo.type === 'string' && repo.value && parseUri(repo.value).scheme.toLowerCase() === 'https')
+			hasHttpsRepository: !!(repo && repo.type === 'string' && repo.value && uri && uri.scheme.toLowerCase() === 'https')
 		};
 		const str = folder.toString();
 		const oldInfo = this.folderToPackageJsonInfo[str];
@@ -264,13 +265,16 @@ export class ExtensionLinter {
 	}
 
 	private async loadPackageJson(folder: Uri) {
-		const file = folder.with({ path: path.posix.join(folder.path, 'package.json') });
-		const exists = await fileExists(file.fsPath);
-		if (!exists) {
+		if (folder.scheme === 'git') { // #36236
+			return undefined;
+		}
+		const file = folder.with({ path: path.posix.join(folder.path, 'package.json') });
+		try {
+			const document = await workspace.openTextDocument(file);
+			return parseTree(document.getText());
+		} catch (err) {
 			return undefined;
 		}
-		const document = await workspace.openTextDocument(file);
-		return parseTree(document.getText());
 	}
 
 	private packageJsonChanged(folder: Uri) {
@@ -286,6 +290,9 @@ export class ExtensionLinter {
 
 	private addDiagnostics(diagnostics: Diagnostic[], document: TextDocument, begin: number, end: number, src: string, context: Context, info: PackageJsonInfo) {
 		const uri = parseUri(src);
+		if (!uri) {
+			return;
+		}
 		const scheme = uri.scheme.toLowerCase();
 
 		if (scheme && scheme !== 'https' && scheme !== 'data') {
@@ -338,20 +345,6 @@ function endsWith(haystack: string, needle: string): boolean {
 	}
 }
 
-function fileExists(path: string): Promise<boolean> {
-	return new Promise((resolve, reject) => {
-		fs.lstat(path, (err, stats) => {
-			if (!err) {
-				resolve(true);
-			} else if (err.code === 'ENOENT') {
-				resolve(false);
-			} else {
-				reject(err);
-			}
-		});
-	});
-}
-
 function parseUri(src: string) {
 	try {
 		return Uri.parse(src);
@@ -359,7 +352,7 @@ function parseUri(src: string) {
 		try {
 			return Uri.parse(encodeURI(src));
 		} catch (err) {
-			return Uri.parse('');
+			return null;
 		}
 	}
 }
\ No newline at end of file
diff --git a/extensions/extension-editing/yarn.lock b/extensions/extension-editing/yarn.lock
index 350fdcb5fe3..c5f65f74b43 100644
--- a/extensions/extension-editing/yarn.lock
+++ b/extensions/extension-editing/yarn.lock
@@ -6,10 +6,14 @@
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/@types/markdown-it/-/markdown-it-0.0.2.tgz#5d9ad19e6e6508cdd2f2596df86fd0aade598660"
 
-"@types/node@6.0.78", "@types/node@^6.0.46":
+"@types/node@^6.0.46":
   version "6.0.78"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-6.0.78.tgz#5d4a3f579c1524e01ee21bf474e6fba09198f470"
 
+"@types/node@^8.10.25":
+  version "8.10.25"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-8.10.25.tgz#801fe4e39372cef18f268db880a5fbfcf71adc7e"
+
 argparse@^1.0.7:
   version "1.0.9"
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.9.tgz#73d83bc263f86e97f8cc4f6bae1b0e90a7d22c86"
@@ -20,9 +24,9 @@ entities@~1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.1.tgz#6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0"
 
-jsonc-parser@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-1.0.0.tgz#ddcc864ae708e60a7a6dd36daea00172fa8d9272"
+jsonc-parser@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-2.0.2.tgz#42fcf56d70852a043fadafde51ddb4a85649978d"
 
 linkify-it@^2.0.0:
   version "2.0.3"
@@ -58,6 +62,6 @@ uc.micro@^1.0.1, uc.micro@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.3.tgz#7ed50d5e0f9a9fb0a573379259f2a77458d50192"
 
-vscode-nls@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.1.tgz#b1f3e04e8a94a715d5a7bcbc8339c51e6d74ca51"
+vscode-nls@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-4.0.0.tgz#4001c8a6caba5cedb23a9c5ce1090395c0e44002"
diff --git a/extensions/fsharp/syntaxes/fsharp.tmLanguage.json b/extensions/fsharp/syntaxes/fsharp.tmLanguage.json
index 3fc11fdde78..4b280955153 100644
--- a/extensions/fsharp/syntaxes/fsharp.tmLanguage.json
+++ b/extensions/fsharp/syntaxes/fsharp.tmLanguage.json
@@ -4,19 +4,19 @@
 		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
 		"Once accepted there, we are happy to receive an update request."
 	],
-	"version": "https://github.com/ionide/ionide-fsgrammar/commit/e15bff40cf4bc42c82bcbdb2a836e4b944b3ef3e",
+	"version": "https://github.com/ionide/ionide-fsgrammar/commit/67c9f45ebbbd5a12d89ffad1661caf8452f1d552",
 	"name": "fsharp",
 	"scopeName": "source.fsharp",
 	"patterns": [
+		{
+			"include": "#compiler_directives"
+		},
 		{
 			"include": "#comments"
 		},
 		{
 			"include": "#constants"
 		},
-		{
-			"include": "#structure"
-		},
 		{
 			"include": "#strings"
 		},
@@ -30,10 +30,10 @@
 			"include": "#definition"
 		},
 		{
-			"include": "#attributes"
+			"include": "#abstract_definition"
 		},
 		{
-			"include": "#method_calls"
+			"include": "#attributes"
 		},
 		{
 			"include": "#modules"
@@ -41,6 +41,12 @@
 		{
 			"include": "#anonymous_functions"
 		},
+		{
+			"include": "#du_declaration"
+		},
+		{
+			"include": "#record_declaration"
+		},
 		{
 			"include": "#keywords"
 		},
@@ -55,6 +61,96 @@
 		}
 	],
 	"repository": {
+		"generic_declaration": {
+			"patterns": [
+				{
+					"match": "([^<>,])",
+					"captures": {
+						"1": {
+							"name": "entity.name.type.fsharp"
+						}
+					}
+				},
+				{
+					"begin": "(<)",
+					"end": "(>)",
+					"beginCaptures": {
+						"1": {
+							"name": "keyword.symbol.fsharp"
+						}
+					},
+					"endCaptures": {
+						"1": {
+							"name": "keyword.symbol.fsharp"
+						}
+					},
+					"patterns": [
+						{
+							"match": "([^<>,])",
+							"captures": {
+								"1": {
+									"name": "entity.name.type.fsharp"
+								}
+							}
+						},
+						{
+							"include": "#generic_declaration"
+						}
+					]
+				},
+				{
+					"include": "#keywords"
+				}
+			]
+		},
+		"record_signature": {
+			"patterns": [
+				{
+					"match": "[[:alpha:]0-9'`^_ ]+(=)([[:alpha:]0-9'`^_ ]+)",
+					"captures": {
+						"1": {
+							"name": "keyword.symbol.fsharp"
+						},
+						"2": {
+							"name": "variable.parameter.fsharp"
+						}
+					}
+				},
+				{
+					"begin": "({)",
+					"end": "(})",
+					"beginCaptures": {
+						"1": {
+							"name": "keyword.symbol.fsharp"
+						}
+					},
+					"endCaptures": {
+						"1": {
+							"name": "keyword.symbol.fsharp"
+						}
+					},
+					"patterns": [
+						{
+							"match": "[[:alpha:]0-9'`^_ ]+(=)([[:alpha:]0-9'`^_ ]+)",
+							"captures": {
+								"1": {
+									"name": "keyword.symbol.fsharp"
+								},
+								"2": {
+									"name": "variable.parameter.fsharp"
+								}
+							}
+						},
+						{
+							"include": "#record_signature"
+						}
+					]
+				},
+				{
+					"include": "#keywords"
+				}
+			]
+		},
 		"anonymous_functions": {
 			"patterns": [
 				{
@@ -63,15 +159,32 @@
 					"end": "(->)",
 					"beginCaptures": {
 						"1": {
-							"name": "keyword.other.function-definition.fsharp"
+							"name": "keyword.fsharp"
 						}
 					},
 					"endCaptures": {
 						"1": {
-							"name": "keyword.other.fsharp"
+							"name": "keyword.fsharp"
 						}
 					},
 					"patterns": [
+						{
+							"include": "#comments"
+						},
+						{
+							"include": "#member_declaration"
+						},
+						{
+							"match": "(:)(\\s*([?[:alpha:]0-9'`<>^._ ]+))*",
+							"captures": {
+								"1": {
+									"name": "keyword.symbol.fsharp"
+								},
+								"2": {
+									"name": "entity.name.type.fsharp"
+								}
+							}
+						},
 						{
 							"include": "#variables"
 						}
@@ -84,7 +197,7 @@
 				{
 					"name": "support.function.attribute.fsharp",
 					"begin": "\\[\\<",
-					"end": "\\>\\]",
+					"end": "\\>\\]|\\]",
 					"patterns": [
 						{
 							"include": "$self"
@@ -95,6 +208,35 @@
 		},
 		"comments": {
 			"patterns": [
+				{
+					"name": "comment.block.markdown.fsharp",
+					"begin": "^\\s*(\\(\\*\\*(?!\\)))(?!\\*\\))$",
+					"while": "^(?!\\s*\\*\\)$)",
+					"beginCaptures": {
+						"1": {
+							"name": "comment.block.fsharp"
+						}
+					},
+					"endCaptures": {
+						"1": {
+							"name": "comment.block.fsharp"
+						}
+					},
+					"patterns": [
+						{
+							"include": "text.html.markdown"
+						}
+					]
+				},
+				{
+					"name": "comment.block.markdown.fsharp.end",
+					"match": "^(\\s*\\*\\)$)",
+					"captures": {
+						"1": {
+							"name": "comment.block.fsharp"
+						}
+					}
+				},
 				{
 					"name": "comment.block.fsharp",
 					"begin": "(\\(\\*(?!\\)))",
@@ -110,6 +252,16 @@
 						}
 					}
 				},
+				{
+					"name": "comment.line.markdown.fsharp",
+					"begin": "///",
+					"while": "///",
+					"patterns": [
+						{
+							"include": "text.html.markdown"
+						}
+					]
+				},
 				{
 					"name": "comment.line.double-slash.fsharp",
 					"match": "//.*$"
@@ -136,43 +288,238 @@
 				}
 			]
 		},
+		"abstract_definition": {
+			"name": "abstract.definition.fsharp",
+			"begin": "\\b(abstract)\\s+(member)?(\\s+\\[\\<.*\\>\\])?\\s*([_[:alpha:]0-9,\\._`\\s]+)(:)",
+			"end": "\\s*(with)\\b|=|$",
+			"beginCaptures": {
+				"1": {
+					"name": "keyword.fsharp"
+				},
+				"2": {
+					"name": "keyword.fsharp"
+				},
+				"3": {
+					"name": "support.function.attribute.fsharp"
+				},
+				"5": {
+					"name": "keyword.fsharp"
+				}
+			},
+			"endCaptures": {
+				"1": {
+					"name": "keyword.fsharp"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#comments"
+				},
+				{
+					"include": "#common_declaration"
+				},
+				{
+					"match": "\\?{0,1}([[:alpha:]0-9'`^._ ]+)\\s*(:)(\\s*([?[:alpha:]0-9'`^._ ]+)){0,1}",
+					"captures": {
+						"1": {
+							"name": "variable.parameter.fsharp"
+						},
+						"2": {
+							"name": "keyword.symbol.fsharp"
+						},
+						"3": {
+							"name": "entity.name.type.fsharp"
+						}
+					}
+				},
+				{
+					"match": "(?!with|get|set\\b)\\b([\\w0-9'`^._]+)",
+					"comments": "Here we need the \\w modifier in order to check that the words isn't blacklisted",
+					"captures": {
+						"1": {
+							"name": "entity.name.type.fsharp"
+						}
+					}
+				},
+				{
+					"include": "#keywords"
+				}
+			]
+		},
 		"definition": {
 			"patterns": [
 				{
 					"name": "binding.fsharp",
-					"begin": "\\b(val mutable|val|let mutable|let inline|let|member|static member|override|let!)(\\s+rec|mutable)?(\\s+\\[\\<.*\\>\\])?\\s*(private|internal|public)?\\s+(\\([^-]*\\)|\\[[^-=]*\\]|[_[:alpha:]]([_[:alpha:]0-9,\\._]|(?<=,)\\s)*|``[_[:alpha:]]([_[:alpha:]0-9,\\._`\\s]|(?<=,)\\s)*)",
-					"end": "((``.*``)|(with)|=|$)",
+					"begin": "\\b(val mutable|val|let mutable|let inline|let|member val|member|static member|override|let!)(\\s+rec|mutable)?(\\s+\\[\\<.*\\>\\])?\\s*(private|internal|public)?\\s+(\\[[^-=]*\\]|[_[:alpha:]]([_[:alpha:]0-9,\\._]+)*|``[_[:alpha:]]([_[:alpha:]0-9,\\._`\\s]+|(?<=,)\\s)*)?",
+					"end": "\\s*(with\\b|=|\\n+=)",
 					"beginCaptures": {
 						"1": {
-							"name": "keyword.other.binding.fsharp"
+							"name": "keyword.fsharp"
 						},
 						"2": {
-							"name": "keyword.other.function-recursive.fsharp"
+							"name": "keyword.fsharp"
 						},
 						"3": {
 							"name": "support.function.attribute.fsharp"
 						},
 						"4": {
-							"name": "keyword.other.access.fsharp"
+							"name": "keyword.fsharp"
 						},
 						"5": {
-							"name": "variable.other.binding.fsharp"
+							"name": "variable.fsharp"
 						}
 					},
 					"endCaptures": {
 						"1": {
-							"name": "keyword.other.fsharp"
-						},
-						"2": {
-							"name": "variable.other.binding.fsharp"
-						},
-						"3": {
-							"name": "keyword.other.fsharp"
+							"name": "keyword.fsharp"
 						}
 					},
 					"patterns": [
+						{
+							"include": "#comments"
+						},
+						{
+							"match": "(:)\\s*(\\()?\\s*(([?[:alpha:]0-9'`^._ ]+))*",
+							"captures": {
+								"1": {
+									"name": "keyword.symbol.fsharp"
+								},
+								"2": {
+									"name": "keyword.symbol.fsharp"
+								},
+								"3": {
+									"name": "entity.name.type.fsharp"
+								}
+							}
+						},
+						{
+							"match": "(\\*\\s*\\()\\s*(([?[:alpha:]0-9'`^._ ]+))*",
+							"captures": {
+								"1": {
+									"name": "keyword.symbol.fsharp"
+								},
+								"2": {
+									"name": "entity.name.type.fsharp"
+								}
+							}
+						},
+						{
+							"match": "(->)\\s*(\\()?\\s*([?[:alpha:]0-9'`^._ ]+)*",
+							"captures": {
+								"1": {
+									"name": "keyword.symbol.fsharp"
+								},
+								"2": {
+									"name": "keyword.symbol.fsharp"
+								},
+								"3": {
+									"name": "entity.name.type.fsharp"
+								}
+							}
+						},
+						{
+							"match": "(\\*)(\\s*([?[:alpha:]0-9'`^._ ]+))*",
+							"captures": {
+								"1": {
+									"name": "keyword.symbol.fsharp"
+								},
+								"2": {
+									"name": "entity.name.type.fsharp"
+								}
+							}
+						},
+						{
+							"begin": "(<)",
+							"end": "(>)",
+							"beginCaptures": {
+								"1": {
+									"name": "keyword.symbol.fsharp"
+								}
+							},
+							"endCaptures": {
+								"1": {
+									"name": "keyword.symbol.fsharp"
+								}
+							},
+							"patterns": [
+								{
+									"include": "#generic_declaration"
+								}
+							]
+						},
+						{
+							"begin": "({)",
+							"end": "(})",
+							"beginCaptures": {
+								"1": {
+									"name": "keyword.symbol.fsharp"
+								}
+							},
+							"endCaptures": {
+								"1": {
+									"name": "keyword.symbol.fsharp"
+								}
+							},
+							"patterns": [
+								{
+									"include": "#record_signature"
+								}
+							]
+						},
 						{
 							"include": "#variables"
+						},
+						{
+							"include": "#keywords"
+						}
+					]
+				}
+			]
+		},
+		"du_declaration": {
+			"patterns": [
+				{
+					"name": "du_declaration.fsharp",
+					"begin": "\\b(of)\\b",
+					"end": "$|(\\|)",
+					"beginCaptures": {
+						"1": {
+							"name": "keyword.fsharp"
+						}
+					},
+					"endCaptures": {
+						"1": {
+							"name": "keyword.symbol.fsharp"
+						}
+					},
+					"patterns": [
+						{
+							"include": "#comments"
+						},
+						{
+							"match": "([[:alpha:]0-9'`<>^._]+|``[[:alpha:]0-9' <>^._]+``)\\s*(:)\\s*([[:alpha:]0-9'`<>^._]+|``[[:alpha:]0-9' <>^._]+``)",
+							"captures": {
+								"1": {
+									"name": "variable.parameter.fsharp"
+								},
+								"2": {
+									"name": "keyword.symbol.fsharp"
+								},
+								"3": {
+									"name": "entity.name.type.fsharp"
+								}
+							}
+						},
+						{
+							"match": "([[:alpha:]0-9'`^._]+)|``([[:alpha:]0-9'^._ ]+)``",
+							"captures": {
+								"1": {
+									"name": "entity.name.type.fsharp"
+								}
+							}
+						},
+						{
+							"include": "#keywords"
 						}
 					]
 				}
@@ -181,17 +528,12 @@
 		"keywords": {
 			"patterns": [
 				{
-					"name": "keyword.other.fsharp",
-					"match": "\\b(function|yield!|yield|class|match|delegate|of|new|in|as|if|then|else|elif|for|begin|end|inherit|do|let\\!|return\\!|return|interface|with|abstract|property|union|enum|member|try|finally|and|when|use|use\\!|struct|while|mutable)\\b"
+					"name": "keyword.fsharp",
+					"match": "\\b(private|to|public|internal|function|yield!|yield|class|exception|match|delegate|of|new|in|as|if|then|else|elif|for|begin|end|inherit|do|let\\!|return\\!|return|interface|with|abstract|property|union|enum|member|try|finally|and|when|use|use\\!|struct|while|mutable)(?!')\\b"
 				},
 				{
-					"name": "meta.preprocessor.fsharp",
-					"begin": "^\\s*#\\s*(light)\\b",
-					"end": "(\\s|$)"
-				},
-				{
-					"name": "keyword.other.fsharp",
-					"match": "(&&&|\\|\\|\\||\\^\\^\\^|~~~|<<<|>>>|\\|>|\\->|\\<\\-|:>|:\\?>|:|\\[|\\]|\\;|<>|=|@|\\|\\||&&|{|}|\\||_|\\.\\.|\\+|\\-|\\*|\\/|\\^|\\!|\\>|\\>\\=|\\>\\>|\\<|\\<\\=|\\<\\<)"
+					"name": "keyword.symbol.fsharp",
+					"match": "(&&&|\\|\\|\\||\\^\\^\\^|~~~|<<<|>>>|\\|>|\\->|\\<\\-|:>|:\\?>|:|\\[|\\]|\\;|<>|=|@|\\|\\||&&|{|}|\\||_|\\.\\.|\\,|\\+|\\-|\\*|\\/|\\^|\\!|\\>|\\>\\=|\\>\\>|\\<|\\<\\=|\\(|\\)|\\<\\<)"
 				}
 			]
 		},
@@ -200,18 +542,23 @@
 				{
 					"name": "entity.name.section.fsharp",
 					"begin": "\\b(namespace|module)\\s*(public|internal|private)?\\s+([[:alpha:]][[:alpha:]0-9'_. ]*)",
-					"end": "(\\s|$)",
+					"end": "(\\s?=|\\s|$)",
 					"beginCaptures": {
 						"1": {
-							"name": "keyword.other.fsharp"
+							"name": "keyword.fsharp"
 						},
 						"2": {
-							"name": "keyword.other.fsharp"
+							"name": "keyword.fsharp"
 						},
 						"3": {
 							"name": "entity.name.section.fsharp"
 						}
 					},
+					"endCaptures": {
+						"1": {
+							"name": "keyword.symbol.fsharp"
+						}
+					},
 					"patterns": [
 						{
 							"name": "entity.name.section.fsharp",
@@ -233,7 +580,7 @@
 					"end": "(\\s|$)",
 					"beginCaptures": {
 						"1": {
-							"name": "keyword.other.fsharp"
+							"name": "keyword.fsharp"
 						},
 						"2": {
 							"name": "entity.name.section.fsharp"
@@ -260,7 +607,7 @@
 					"end": "(\\s|$)",
 					"beginCaptures": {
 						"1": {
-							"name": "keyword.other.namespace-definition.fsharp"
+							"name": "keyword.fsharp"
 						},
 						"2": {
 							"name": "entity.name.type.namespace.fsharp"
@@ -373,7 +720,7 @@
 					"match": "(%0?-?(\\d+)?((a|t)|(\\.\\d+)?(f|F|e|E|g|G|M)|(b|c|s|d|i|x|X|o)|(s|b|O)|(\\+?A)))",
 					"captures": {
 						"1": {
-							"name": "keyword.other.format.specifier.fsharp"
+							"name": "keyword.format.specifier.fsharp"
 						}
 					}
 				}
@@ -387,7 +734,134 @@
 				},
 				{
 					"name": "variable.parameter.fsharp",
-					"match": "[[:alpha:]'_]\\w*"
+					"match": "[[:alpha:]0-9'`<>^._ ]\\w*"
+				}
+			]
+		},
+		"common_declaration": {
+			"patterns": [
+				{
+					"begin": "\\s*(->)\\s*([[:alpha:]0-9'`^._ ]+)(<)",
+					"end": "(>)",
+					"beginCaptures": {
+						"1": {
+							"name": "keyword.symbol.fsharp"
+						},
+						"2": {
+							"name": "entity.name.type.fsharp"
+						},
+						"3": {
+							"name": "keyword.symbol.fsharp"
+						}
+					},
+					"endCaptures": {
+						"1": {
+							"name": "keyword.symbol.fsharp"
+						}
+					},
+					"patterns": [
+						{
+							"match": "([[:alpha:]0-9'`^._ ]+)",
+							"captures": {
+								"1": {
+									"name": "entity.name.type.fsharp"
+								}
+							}
+						},
+						{
+							"include": "#keywords"
+						}
+					]
+				},
+				{
+					"match": "\\s*(->)\\s*([[:alpha:]0-9'`^._ ]+)",
+					"captures": {
+						"1": {
+							"name": "keyword.symbol.fsharp"
+						},
+						"2": {
+							"name": "entity.name.type.fsharp"
+						}
+					}
+				},
+				{
+					"begin": "\\?{0,1}([[:alpha:]0-9'`^._ ]+)\\s*(:)(\\s*([?[:alpha:]0-9'`^._ ]+)(<))",
+					"end": "(>)",
+					"beginCaptures": {
+						"1": {
+							"name": "variable.parameter.fsharp"
+						},
+						"2": {
+							"name": "keyword.symbol.fsharp"
+						},
+						"3": {
+							"name": "keyword.symbol.fsharp"
+						},
+						"4": {
+							"name": "entity.name.type.fsharp"
+						}
+					},
+					"endCaptures": {
+						"1": {
+							"name": "keyword.symbol.fsharp"
+						}
+					},
+					"patterns": [
+						{
+							"match": "([[:alpha:]0-9'`^._ ]+)",
+							"captures": {
+								"1": {
+									"name": "entity.name.type.fsharp"
+								}
+							}
+						},
+						{
+							"include": "#keywords"
+						}
+					]
+				}
+			]
+		},
+		"member_declaration": {
+			"patterns": [
+				{
+					"begin": "(\\()",
+					"end": "(\\))",
+					"beginCaptures": {
+						"1": {
+							"name": "keyword.symbol.fsharp"
+						}
+					},
+					"endCaptures": {
+						"1": {
+							"name": "keyword.symbol.fsharp"
+						}
+					},
+					"patterns": [
+						{
+							"include": "#comments"
+						},
+						{
+							"include": "#common_declaration"
+						},
+						{
+							"match": "\\?{0,1}([[:alpha:]0-9'`^._ ]+)\\s*(:{0,1})(\\s*([?[:alpha:]0-9'`<>^._ ]+)){0,1}",
+							"captures": {
+								"1": {
+									"name": "variable.parameter.fsharp"
+								},
+								"2": {
+									"name": "keyword.symbol.fsharp"
+								},
+								"3": {
+									"name": "entity.name.type.fsharp"
+								}
+							}
+						},
+						{
+							"include": "#keywords"
+						}
+					]
 				}
 			]
 		},
@@ -414,33 +888,212 @@
 			"patterns": [
 				{
 					"name": "record.fsharp",
-					"match": "(type)[\\s]+(private|internal|public)?[\\s]*([[:alpha:]0-9'<>^:,._]+)[\\s]*(\\([[:alpha:]0-9'<>^:,._ ]+\\))?[\\s]*((with)|(as [[:alpha:]0-9']+)|(=)|(\\(\\)))",
-					"captures": {
+					"begin": "\\b(type)[\\s]+(private|internal|public)?(\\s*\\[\\<.*\\>\\])?[\\s]*([[:alpha:]0-9'`^:,._]+|``[[:alpha:]0-9'`^:,._ ]+``)(<)",
+					"end": "\\s*((with)|((as)\\s*([[:alpha:]0-9']+))|(=)|[\\n=]|(\\(\\)))",
+					"beginCaptures": {
 						"1": {
-							"name": "keyword.other.fsharp"
+							"name": "keyword.fsharp"
 						},
 						"2": {
-							"name": "keyword.other.fsharp"
+							"name": "keyword.fsharp"
 						},
 						"3": {
+							"name": "support.function.attribute.fsharp"
+						},
+						"4": {
 							"name": "entity.name.type.fsharp"
 						},
+						"5": {
+							"name": "keyword.symbol.fsharp"
+						}
+					},
+					"endCaptures": {
+						"2": {
+							"name": "keyword.fsharp"
+						},
+						"3": {
+							"name": "keyword.fsharp"
+						},
+						"4": {
+							"name": "keyword.fsharp"
+						},
+						"5": {
+							"name": "variable.parameter.fsharp"
+						},
+						"6": {
+							"name": "keyword.symbol.fsharp"
+						},
+						"7": {
+							"name": "constant.language.unit.fsharp"
+						}
+					},
+					"patterns": [
+						{
+							"include": "#comments"
+						},
+						{
+							"match": "\\s*(>)\\s*(private|internal|public)?",
+							"captures": {
+								"1": {
+									"name": "keyword.symbol.fsharp"
+								},
+								"2": {
+									"name": "keyword.fsharp"
+								}
+							}
+						},
+						{
+							"match": "([[:alpha:]0-9'`^._ ]+)",
+							"captures": {
+								"1": {
+									"name": "entity.name.type.fsharp"
+								}
+							}
+						},
+						{
+							"include": "#member_declaration"
+						},
+						{
+							"include": "#keywords"
+						}
+					]
+				},
+				{
+					"name": "record.fsharp",
+					"begin": "\\b(type)[\\s]+(private|internal|public)?(\\s*\\[\\<.*\\>\\])?[\\s]*([[:alpha:]0-9'`^:,._]+<(.*)>|[[:alpha:]0-9'^:,._]+|``[[:alpha:]0-9'`^:,._ ]+``)[\\s]?(private|internal|public)?[\\s]*",
+					"end": "\\s*((with)|((as)\\s*([[:alpha:]0-9']+))|(=)|[\\n=]|(\\(\\)))",
+					"beginCaptures": {
+						"1": {
+							"name": "keyword.fsharp"
+						},
+						"2": {
+							"name": "keyword.fsharp"
+						},
+						"3": {
+							"name": "support.function.attribute.fsharp"
+						},
 						"4": {
 							"name": "entity.name.type.fsharp"
 						},
 						"6": {
-							"name": "keyword.other.fsharp"
+							"name": "keyword.fsharp"
+						}
+					},
+					"endCaptures": {
+						"2": {
+							"name": "keyword.fsharp"
+						},
+						"3": {
+							"name": "keyword.fsharp"
+						},
+						"4": {
+							"name": "keyword.fsharp"
+						},
+						"5": {
+							"name": "variable.parameter.fsharp"
+						},
+						"6": {
+							"name": "keyword.symbol.fsharp"
 						},
 						"7": {
-							"name": "keyword.other.fsharp"
-						},
-						"8": {
-							"name": "keyword.other.fsharp"
-						},
-						"9": {
 							"name": "constant.language.unit.fsharp"
 						}
-					}
+					},
+					"patterns": [
+						{
+							"include": "#comments"
+						},
+						{
+							"include": "#member_declaration"
+						}
+					]
+				}
+			]
+		},
+		"record_declaration": {
+			"patterns": [
+				{
+					"begin": "(\\{)",
+					"beginCaptures": {
+						"1": {
+							"name": "keyword.symbol.fsharp"
+						}
+					},
+					"end": "(?<=\\})",
+					"patterns": [
+						{
+							"include": "#comments"
+						},
+						{
+							"begin": "(((mutable)\\s[[:alpha:]]+)|[[:alpha:]0-9'`<>^._]*)\\s*((?<!:):(?!:))\\s*",
+							"beginCaptures": {
+								"3": {
+									"name": "keyword.fsharp"
+								},
+								"4": {
+									"name": "keyword.symbol.fsharp"
+								}
+							},
+							"end": "$|(;|\\})",
+							"endCaptures": {
+								"1": {
+									"name": "keyword.symbol.fsharp"
+								}
+							},
+							"patterns": [
+								{
+									"include": "#comments"
+								},
+								{
+									"match": "([[:alpha:]0-9'`^_ ]+)",
+									"captures": {
+										"1": {
+											"name": "entity.name.type.fsharp"
+										}
+									}
+								},
+								{
+									"include": "#keywords"
+								}
+							]
+						},
+						{
+							"include": "#chars"
+						},
+						{
+							"include": "#compiler_directives"
+						},
+						{
+							"include": "#constants"
+						},
+						{
+							"include": "#strings"
+						},
+						{
+							"include": "#chars"
+						},
+						{
+							"include": "#double_tick"
+						},
+						{
+							"include": "#definition"
+						},
+						{
+							"include": "#attributes"
+						},
+						{
+							"include": "#anonymous_functions"
+						},
+						{
+							"include": "#keywords"
+						},
+						{
+							"include": "#cexprs"
+						},
+						{
+							"include": "#text"
+						}
+					]
 				}
 			]
 		},
@@ -448,10 +1101,10 @@
 			"patterns": [
 				{
 					"name": "cexpr.fsharp",
-					"match": "\\b([[:alpha:]]*\\s+\\{)",
+					"match": "\\b(async|seq|promise|task|maybe|asyncMaybe|controller|scope|application|pipeline)\\s*\\{",
 					"captures": {
-						"1": {
-							"name": "keyword.other.fsharp"
+						"0": {
+							"name": "keyword.fsharp"
 						}
 					}
 				}
@@ -477,6 +1130,15 @@
 					"match": "\\\\"
 				}
 			]
+		},
+		"compiler_directives": {
+			"patterns": [
+				{
+					"name": "compiler_directive.fsharp",
+					"match": "\\s?(#if|#elif|#else|#elseif|#endif|#light|#nowarn)",
+					"captures": {}
+				}
+			]
 		}
 	}
 }
\ No newline at end of file
diff --git a/extensions/fsharp/test/colorize-results/test_fs.json b/extensions/fsharp/test/colorize-results/test_fs.json
index ee0ae2ca9c1..328557e57b3 100644
--- a/extensions/fsharp/test/colorize-results/test_fs.json
+++ b/extensions/fsharp/test/colorize-results/test_fs.json
@@ -3,9 +3,9 @@
 		"c": "// from https://msdn.microsoft.com/en-us/library/dd233160.aspx",
 		"t": "source.fsharp comment.line.double-slash.fsharp",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -14,16 +14,16 @@
 		"c": "// The declaration creates a constructor that takes two values, name and age.",
 		"t": "source.fsharp comment.line.double-slash.fsharp",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
 	},
 	{
 		"c": "type",
-		"t": "source.fsharp record.fsharp keyword.other.fsharp",
+		"t": "source.fsharp record.fsharp keyword.fsharp",
 		"r": {
 			"dark_plus": "keyword: #569CD6",
 			"light_plus": "keyword: #0000FF",
@@ -44,7 +44,7 @@
 		}
 	},
 	{
-		"c": "Person(name:string, age:int)",
+		"c": "Person",
 		"t": "source.fsharp record.fsharp entity.name.type.fsharp",
 		"r": {
 			"dark_plus": "entity.name.type: #4EC9B0",
@@ -54,6 +54,105 @@
 			"hc_black": "entity.name.type: #4EC9B0"
 		}
 	},
+	{
+		"c": "(",
+		"t": "source.fsharp record.fsharp keyword.symbol.fsharp",
+		"r": {
+			"dark_plus": "keyword: #569CD6",
+			"light_plus": "keyword: #0000FF",
+			"dark_vs": "keyword: #569CD6",
+			"light_vs": "keyword: #0000FF",
+			"hc_black": "keyword: #569CD6"
+		}
+	},
+	{
+		"c": "name",
+		"t": "source.fsharp record.fsharp variable.parameter.fsharp",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE"
+		}
+	},
+	{
+		"c": ":",
+		"t": "source.fsharp record.fsharp keyword.symbol.fsharp",
+		"r": {
+			"dark_plus": "keyword: #569CD6",
+			"light_plus": "keyword: #0000FF",
+			"dark_vs": "keyword: #569CD6",
+			"light_vs": "keyword: #0000FF",
+			"hc_black": "keyword: #569CD6"
+		}
+	},
+	{
+		"c": "string",
+		"t": "source.fsharp record.fsharp entity.name.type.fsharp",
+		"r": {
+			"dark_plus": "entity.name.type: #4EC9B0",
+			"light_plus": "entity.name.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.type: #4EC9B0"
+		}
+	},
+	{
+		"c": ",",
+		"t": "source.fsharp record.fsharp keyword.symbol.fsharp",
+		"r": {
+			"dark_plus": "keyword: #569CD6",
+			"light_plus": "keyword: #0000FF",
+			"dark_vs": "keyword: #569CD6",
+			"light_vs": "keyword: #0000FF",
+			"hc_black": "keyword: #569CD6"
+		}
+	},
+	{
+		"c": " age",
+		"t": "source.fsharp record.fsharp variable.parameter.fsharp",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE"
+		}
+	},
+	{
+		"c": ":",
+		"t": "source.fsharp record.fsharp keyword.symbol.fsharp",
+		"r": {
+			"dark_plus": "keyword: #569CD6",
+			"light_plus": "keyword: #0000FF",
+			"dark_vs": "keyword: #569CD6",
+			"light_vs": "keyword: #0000FF",
+			"hc_black": "keyword: #569CD6"
+		}
+	},
+	{
+		"c": "int",
+		"t": "source.fsharp record.fsharp entity.name.type.fsharp",
+		"r": {
+			"dark_plus": "entity.name.type: #4EC9B0",
+			"light_plus": "entity.name.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.type: #4EC9B0"
+		}
+	},
+	{
+		"c": ")",
+		"t": "source.fsharp record.fsharp keyword.symbol.fsharp",
+		"r": {
+			"dark_plus": "keyword: #569CD6",
+			"light_plus": "keyword: #0000FF",
+			"dark_vs": "keyword: #569CD6",
+			"light_vs": "keyword: #0000FF",
+			"hc_black": "keyword: #569CD6"
+		}
+	},
 	{
 		"c": " ",
 		"t": "source.fsharp record.fsharp",
@@ -67,7 +166,7 @@
 	},
 	{
 		"c": "=",
-		"t": "source.fsharp record.fsharp keyword.other.fsharp",
+		"t": "source.fsharp record.fsharp keyword.symbol.fsharp",
 		"r": {
 			"dark_plus": "keyword: #569CD6",
 			"light_plus": "keyword: #0000FF",
@@ -89,7 +188,7 @@
 	},
 	{
 		"c": "let mutable",
-		"t": "source.fsharp binding.fsharp keyword.other.binding.fsharp",
+		"t": "source.fsharp binding.fsharp keyword.fsharp",
 		"r": {
 			"dark_plus": "keyword: #569CD6",
 			"light_plus": "keyword: #0000FF",
@@ -111,7 +210,7 @@
 	},
 	{
 		"c": "internalAge",
-		"t": "source.fsharp binding.fsharp variable.other.binding.fsharp",
+		"t": "source.fsharp binding.fsharp variable.fsharp",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -133,7 +232,7 @@
 	},
 	{
 		"c": "=",
-		"t": "source.fsharp binding.fsharp keyword.other.fsharp",
+		"t": "source.fsharp binding.fsharp keyword.fsharp",
 		"r": {
 			"dark_plus": "keyword: #569CD6",
 			"light_plus": "keyword: #0000FF",
@@ -166,7 +265,7 @@
 	},
 	{
 		"c": "new",
-		"t": "source.fsharp keyword.other.fsharp",
+		"t": "source.fsharp keyword.fsharp",
 		"r": {
 			"dark_plus": "keyword: #569CD6",
 			"light_plus": "keyword: #0000FF",
@@ -176,7 +275,18 @@
 		}
 	},
 	{
-		"c": "(name",
+		"c": "(",
+		"t": "source.fsharp keyword.symbol.fsharp",
+		"r": {
+			"dark_plus": "keyword: #569CD6",
+			"light_plus": "keyword: #0000FF",
+			"dark_vs": "keyword: #569CD6",
+			"light_vs": "keyword: #0000FF",
+			"hc_black": "keyword: #569CD6"
+		}
+	},
+	{
+		"c": "name",
 		"t": "source.fsharp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
@@ -188,7 +298,7 @@
 	},
 	{
 		"c": ":",
-		"t": "source.fsharp keyword.other.fsharp",
+		"t": "source.fsharp keyword.symbol.fsharp",
 		"r": {
 			"dark_plus": "keyword: #569CD6",
 			"light_plus": "keyword: #0000FF",
@@ -198,7 +308,29 @@
 		}
 	},
 	{
-		"c": "string) ",
+		"c": "string",
+		"t": "source.fsharp",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": ")",
+		"t": "source.fsharp keyword.symbol.fsharp",
+		"r": {
+			"dark_plus": "keyword: #569CD6",
+			"light_plus": "keyword: #0000FF",
+			"dark_vs": "keyword: #569CD6",
+			"light_vs": "keyword: #0000FF",
+			"hc_black": "keyword: #569CD6"
+		}
+	},
+	{
+		"c": " ",
 		"t": "source.fsharp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
@@ -210,7 +342,7 @@
 	},
 	{
 		"c": "=",
-		"t": "source.fsharp keyword.other.fsharp",
+		"t": "source.fsharp keyword.symbol.fsharp",
 		"r": {
 			"dark_plus": "keyword: #569CD6",
 			"light_plus": "keyword: #0000FF",
@@ -220,7 +352,51 @@
 		}
 	},
 	{
-		"c": " Person(name, ",
+		"c": " Person",
+		"t": "source.fsharp",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": "(",
+		"t": "source.fsharp keyword.symbol.fsharp",
+		"r": {
+			"dark_plus": "keyword: #569CD6",
+			"light_plus": "keyword: #0000FF",
+			"dark_vs": "keyword: #569CD6",
+			"light_vs": "keyword: #0000FF",
+			"hc_black": "keyword: #569CD6"
+		}
+	},
+	{
+		"c": "name",
+		"t": "source.fsharp",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": ",",
+		"t": "source.fsharp keyword.symbol.fsharp",
+		"r": {
+			"dark_plus": "keyword: #569CD6",
+			"light_plus": "keyword: #0000FF",
+			"dark_vs": "keyword: #569CD6",
+			"light_vs": "keyword: #0000FF",
+			"hc_black": "keyword: #569CD6"
+		}
+	},
+	{
+		"c": " ",
 		"t": "source.fsharp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
@@ -243,13 +419,13 @@
 	},
 	{
 		"c": ")",
-		"t": "source.fsharp",
+		"t": "source.fsharp keyword.symbol.fsharp",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF"
+			"dark_plus": "keyword: #569CD6",
+			"light_plus": "keyword: #0000FF",
+			"dark_vs": "keyword: #569CD6",
+			"light_vs": "keyword: #0000FF",
+			"hc_black": "keyword: #569CD6"
 		}
 	},
 	{
@@ -265,7 +441,7 @@
 	},
 	{
 		"c": "member",
-		"t": "source.fsharp binding.fsharp keyword.other.binding.fsharp",
+		"t": "source.fsharp binding.fsharp keyword.fsharp",
 		"r": {
 			"dark_plus": "keyword: #569CD6",
 			"light_plus": "keyword: #0000FF",
@@ -287,7 +463,7 @@
 	},
 	{
 		"c": "this.Name",
-		"t": "source.fsharp binding.fsharp variable.other.binding.fsharp",
+		"t": "source.fsharp binding.fsharp variable.fsharp",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -309,7 +485,7 @@
 	},
 	{
 		"c": "=",
-		"t": "source.fsharp binding.fsharp keyword.other.fsharp",
+		"t": "source.fsharp binding.fsharp keyword.fsharp",
 		"r": {
 			"dark_plus": "keyword: #569CD6",
 			"light_plus": "keyword: #0000FF",
@@ -344,9 +520,9 @@
 		"c": "// A read/write property.",
 		"t": "source.fsharp comment.line.double-slash.fsharp",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -364,7 +540,7 @@
 	},
 	{
 		"c": "member",
-		"t": "source.fsharp binding.fsharp keyword.other.binding.fsharp",
+		"t": "source.fsharp binding.fsharp keyword.fsharp",
 		"r": {
 			"dark_plus": "keyword: #569CD6",
 			"light_plus": "keyword: #0000FF",
@@ -386,7 +562,7 @@
 	},
 	{
 		"c": "this.Age",
-		"t": "source.fsharp binding.fsharp variable.other.binding.fsharp",
+		"t": "source.fsharp binding.fsharp variable.fsharp",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -397,7 +573,7 @@
 	},
 	{
 		"c": "        ",
-		"t": "source.fsharp",
+		"t": "source.fsharp binding.fsharp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -408,7 +584,7 @@
 	},
 	{
 		"c": "with",
-		"t": "source.fsharp keyword.other.fsharp",
+		"t": "source.fsharp binding.fsharp keyword.fsharp",
 		"r": {
 			"dark_plus": "keyword: #569CD6",
 			"light_plus": "keyword: #0000FF",
@@ -452,7 +628,7 @@
 	},
 	{
 		"c": "=",
-		"t": "source.fsharp keyword.other.fsharp",
+		"t": "source.fsharp keyword.symbol.fsharp",
 		"r": {
 			"dark_plus": "keyword: #569CD6",
 			"light_plus": "keyword: #0000FF",
@@ -485,7 +661,7 @@
 	},
 	{
 		"c": "and",
-		"t": "source.fsharp keyword.other.fsharp",
+		"t": "source.fsharp keyword.fsharp",
 		"r": {
 			"dark_plus": "keyword: #569CD6",
 			"light_plus": "keyword: #0000FF",
@@ -495,7 +671,51 @@
 		}
 	},
 	{
-		"c": " set(value) ",
+		"c": " set",
+		"t": "source.fsharp",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": "(",
+		"t": "source.fsharp keyword.symbol.fsharp",
+		"r": {
+			"dark_plus": "keyword: #569CD6",
+			"light_plus": "keyword: #0000FF",
+			"dark_vs": "keyword: #569CD6",
+			"light_vs": "keyword: #0000FF",
+			"hc_black": "keyword: #569CD6"
+		}
+	},
+	{
+		"c": "value",
+		"t": "source.fsharp",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": ")",
+		"t": "source.fsharp keyword.symbol.fsharp",
+		"r": {
+			"dark_plus": "keyword: #569CD6",
+			"light_plus": "keyword: #0000FF",
+			"dark_vs": "keyword: #569CD6",
+			"light_vs": "keyword: #0000FF",
+			"hc_black": "keyword: #569CD6"
+		}
+	},
+	{
+		"c": " ",
 		"t": "source.fsharp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
@@ -507,7 +727,7 @@
 	},
 	{
 		"c": "=",
-		"t": "source.fsharp keyword.other.fsharp",
+		"t": "source.fsharp keyword.symbol.fsharp",
 		"r": {
 			"dark_plus": "keyword: #569CD6",
 			"light_plus": "keyword: #0000FF",
@@ -529,7 +749,7 @@
 	},
 	{
 		"c": "<-",
-		"t": "source.fsharp keyword.other.fsharp",
+		"t": "source.fsharp keyword.symbol.fsharp",
 		"r": {
 			"dark_plus": "keyword: #569CD6",
 			"light_plus": "keyword: #0000FF",
@@ -562,7 +782,7 @@
 	},
 	{
 		"c": "member",
-		"t": "source.fsharp binding.fsharp keyword.other.binding.fsharp",
+		"t": "source.fsharp binding.fsharp keyword.fsharp",
 		"r": {
 			"dark_plus": "keyword: #569CD6",
 			"light_plus": "keyword: #0000FF",
@@ -584,7 +804,7 @@
 	},
 	{
 		"c": "this.HasABirthday",
-		"t": "source.fsharp binding.fsharp variable.other.binding.fsharp",
+		"t": "source.fsharp binding.fsharp variable.fsharp",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -595,13 +815,13 @@
 	},
 	{
 		"c": " ",
-		"t": "source.fsharp binding.fsharp",
+		"t": "source.fsharp binding.fsharp variable.parameter.fsharp",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF"
+			"hc_black": "variable: #9CDCFE"
 		}
 	},
 	{
@@ -628,7 +848,7 @@
 	},
 	{
 		"c": "=",
-		"t": "source.fsharp binding.fsharp keyword.other.fsharp",
+		"t": "source.fsharp binding.fsharp keyword.fsharp",
 		"r": {
 			"dark_plus": "keyword: #569CD6",
 			"light_plus": "keyword: #0000FF",
@@ -650,7 +870,7 @@
 	},
 	{
 		"c": "<-",
-		"t": "source.fsharp keyword.other.fsharp",
+		"t": "source.fsharp keyword.symbol.fsharp",
 		"r": {
 			"dark_plus": "keyword: #569CD6",
 			"light_plus": "keyword: #0000FF",
@@ -672,7 +892,7 @@
 	},
 	{
 		"c": "+",
-		"t": "source.fsharp keyword.other.fsharp",
+		"t": "source.fsharp keyword.symbol.fsharp",
 		"r": {
 			"dark_plus": "keyword: #569CD6",
 			"light_plus": "keyword: #0000FF",
@@ -716,7 +936,7 @@
 	},
 	{
 		"c": "member",
-		"t": "source.fsharp binding.fsharp keyword.other.binding.fsharp",
+		"t": "source.fsharp binding.fsharp keyword.fsharp",
 		"r": {
 			"dark_plus": "keyword: #569CD6",
 			"light_plus": "keyword: #0000FF",
@@ -738,7 +958,7 @@
 	},
 	{
 		"c": "this.IsOfAge",
-		"t": "source.fsharp binding.fsharp variable.other.binding.fsharp",
+		"t": "source.fsharp binding.fsharp variable.fsharp",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -748,18 +968,7 @@
 		}
 	},
 	{
-		"c": " ",
-		"t": "source.fsharp binding.fsharp",
-		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF"
-		}
-	},
-	{
-		"c": "targetAge",
+		"c": " targetAge",
 		"t": "source.fsharp binding.fsharp variable.parameter.fsharp",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
@@ -782,7 +991,7 @@
 	},
 	{
 		"c": "=",
-		"t": "source.fsharp binding.fsharp keyword.other.fsharp",
+		"t": "source.fsharp binding.fsharp keyword.fsharp",
 		"r": {
 			"dark_plus": "keyword: #569CD6",
 			"light_plus": "keyword: #0000FF",
@@ -804,7 +1013,7 @@
 	},
 	{
 		"c": ">=",
-		"t": "source.fsharp keyword.other.fsharp",
+		"t": "source.fsharp keyword.symbol.fsharp",
 		"r": {
 			"dark_plus": "keyword: #569CD6",
 			"light_plus": "keyword: #0000FF",
@@ -837,7 +1046,7 @@
 	},
 	{
 		"c": "override",
-		"t": "source.fsharp binding.fsharp keyword.other.binding.fsharp",
+		"t": "source.fsharp binding.fsharp keyword.fsharp",
 		"r": {
 			"dark_plus": "keyword: #569CD6",
 			"light_plus": "keyword: #0000FF",
@@ -859,7 +1068,7 @@
 	},
 	{
 		"c": "this.ToString",
-		"t": "source.fsharp binding.fsharp variable.other.binding.fsharp",
+		"t": "source.fsharp binding.fsharp variable.fsharp",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -870,13 +1079,13 @@
 	},
 	{
 		"c": " ",
-		"t": "source.fsharp binding.fsharp",
+		"t": "source.fsharp binding.fsharp variable.parameter.fsharp",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF"
+			"hc_black": "variable: #9CDCFE"
 		}
 	},
 	{
@@ -903,7 +1112,7 @@
 	},
 	{
 		"c": "=",
-		"t": "source.fsharp binding.fsharp keyword.other.fsharp",
+		"t": "source.fsharp binding.fsharp keyword.fsharp",
 		"r": {
 			"dark_plus": "keyword: #569CD6",
 			"light_plus": "keyword: #0000FF",
@@ -969,7 +1178,7 @@
 	},
 	{
 		"c": "+",
-		"t": "source.fsharp keyword.other.fsharp",
+		"t": "source.fsharp keyword.symbol.fsharp",
 		"r": {
 			"dark_plus": "keyword: #569CD6",
 			"light_plus": "keyword: #0000FF",
@@ -991,7 +1200,7 @@
 	},
 	{
 		"c": "+",
-		"t": "source.fsharp keyword.other.fsharp",
+		"t": "source.fsharp keyword.symbol.fsharp",
 		"r": {
 			"dark_plus": "keyword: #569CD6",
 			"light_plus": "keyword: #0000FF",
@@ -1057,7 +1266,7 @@
 	},
 	{
 		"c": "+",
-		"t": "source.fsharp keyword.other.fsharp",
+		"t": "source.fsharp keyword.symbol.fsharp",
 		"r": {
 			"dark_plus": "keyword: #569CD6",
 			"light_plus": "keyword: #0000FF",
@@ -1123,7 +1332,7 @@
 	},
 	{
 		"c": "+",
-		"t": "source.fsharp keyword.other.fsharp",
+		"t": "source.fsharp keyword.symbol.fsharp",
 		"r": {
 			"dark_plus": "keyword: #569CD6",
 			"light_plus": "keyword: #0000FF",
@@ -1133,7 +1342,51 @@
 		}
 	},
 	{
-		"c": " (string)internalAge",
+		"c": " ",
+		"t": "source.fsharp",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": "(",
+		"t": "source.fsharp keyword.symbol.fsharp",
+		"r": {
+			"dark_plus": "keyword: #569CD6",
+			"light_plus": "keyword: #0000FF",
+			"dark_vs": "keyword: #569CD6",
+			"light_vs": "keyword: #0000FF",
+			"hc_black": "keyword: #569CD6"
+		}
+	},
+	{
+		"c": "string",
+		"t": "source.fsharp",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": ")",
+		"t": "source.fsharp keyword.symbol.fsharp",
+		"r": {
+			"dark_plus": "keyword: #569CD6",
+			"light_plus": "keyword: #0000FF",
+			"dark_vs": "keyword: #569CD6",
+			"light_vs": "keyword: #0000FF",
+			"hc_black": "keyword: #569CD6"
+		}
+	},
+	{
+		"c": "internalAge",
 		"t": "source.fsharp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
diff --git a/extensions/git/.vscodeignore b/extensions/git/.vscodeignore
index 436567b7d69..360f1f99370 100644
--- a/extensions/git/.vscodeignore
+++ b/extensions/git/.vscodeignore
@@ -1,5 +1,6 @@
 src/**
 test/**
-out/test/**
+out/**
 tsconfig.json
-build/**
\ No newline at end of file
+build/**
+extension.webpack.config.js
diff --git a/extensions/git/README.md b/extensions/git/README.md
index b97ec81e9a0..bd7a8ef26c2 100644
--- a/extensions/git/README.md
+++ b/extensions/git/README.md
@@ -1,2 +1,7 @@
 # Git integration for Visual Studio Code
 
+**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.
+
+## Features
+
+See [Git support in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_git-support) to learn about the features of this extension.
\ No newline at end of file
diff --git a/extensions/git/extension.webpack.config.js b/extensions/git/extension.webpack.config.js
new file mode 100644
index 00000000000..5efa2052e88
--- /dev/null
+++ b/extensions/git/extension.webpack.config.js
@@ -0,0 +1,18 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+//@ts-check
+
+'use strict';
+
+const withDefaults = require('../shared.webpack.config');
+
+module.exports = withDefaults({
+	context: __dirname,
+	entry: {
+		main: './src/main.ts',
+		['askpass-main']: './src/askpass-main.ts'
+	}
+});
diff --git a/extensions/git/package.json b/extensions/git/package.json
index d4a9ebb0d58..2e0d5985172 100644
--- a/extensions/git/package.json
+++ b/extensions/git/package.json
@@ -38,6 +38,11 @@
           "dark": "resources/icons/dark/git.svg"
         }
       },
+      {
+        "command": "git.openRepository",
+        "title": "%command.openRepository%",
+        "category": "Git"
+      },
       {
         "command": "git.close",
         "title": "%command.close%",
@@ -336,6 +341,10 @@
           "command": "git.init",
           "when": "config.git.enabled"
         },
+        {
+          "command": "git.openRepository",
+          "when": "config.git.enabled"
+        },
         {
           "command": "git.close",
           "when": "config.git.enabled && gitOpenRepositoryCount != 0"
@@ -876,12 +885,27 @@
             "string",
             "null"
           ],
-          "description": "%config.path%",
+          "markdownDescription": "%config.path%",
           "default": null,
           "scope": "application"
         },
         "git.autoRepositoryDetection": {
-          "type": "boolean",
+          "type": [
+            "boolean",
+            "string"
+          ],
+          "enum": [
+            true,
+            false,
+            "subFolders",
+            "openEditors"
+          ],
+          "enumDescriptions": [
+            "%config.autoRepositoryDetection.true%",
+            "%config.autoRepositoryDetection.false%",
+            "%config.autoRepositoryDetection.subFolders%",
+            "%config.autoRepositoryDetection.openEditors%"
+          ],
           "description": "%config.autoRepositoryDetection%",
           "default": true
         },
@@ -893,7 +917,10 @@
         "git.autofetch": {
           "type": "boolean",
           "description": "%config.autofetch%",
-          "default": false
+          "default": false,
+          "tags": [
+            "usesOnlineServices"
+          ]
         },
         "git.confirmSync": {
           "type": "boolean",
@@ -907,6 +934,11 @@
             "tracked",
             "off"
           ],
+          "enumDescriptions": [
+            "%config.countBadge.all%",
+            "%config.countBadge.tracked%",
+            "%config.countBadge.off%"
+          ],
           "description": "%config.countBadge%",
           "default": "all"
         },
@@ -918,7 +950,13 @@
             "tags",
             "remote"
           ],
-          "description": "%config.checkoutType%",
+          "enumDescriptions": [
+            "%config.checkoutType.all%",
+            "%config.checkoutType.local%",
+            "%config.checkoutType.tags%",
+            "%config.checkoutType.remote%"
+          ],
+          "markdownDescription": "%config.checkoutType%",
           "default": "all"
         },
         "git.ignoreLegacyWarning": {
@@ -943,11 +981,13 @@
         },
         "git.enableSmartCommit": {
           "type": "boolean",
+          "scope": "resource",
           "description": "%config.enableSmartCommit%",
           "default": false
         },
         "git.enableCommitSigning": {
           "type": "boolean",
+          "scope": "resource",
           "description": "%config.enableCommitSigning%",
           "default": false
         },
@@ -958,6 +998,7 @@
         },
         "git.promptToSaveFilesBeforeCommit": {
           "type": "boolean",
+          "scope": "resource",
           "default": false,
           "description": "%config.promptToSaveFilesBeforeCommit%"
         },
@@ -966,6 +1007,11 @@
           "default": true,
           "description": "%config.showInlineOpenFileAction%"
         },
+        "git.showPushSuccessNotification": {
+          "type": "boolean",
+          "description": "%config.showPushSuccessNotification%",
+          "default": false
+        },
         "git.inputValidation": {
           "type": "string",
           "enum": [
@@ -987,6 +1033,18 @@
           "scope": "resource",
           "default": 10,
           "description": "%config.detectSubmodulesLimit%"
+        },
+        "git.alwaysSignOff": {
+          "type": "boolean",
+          "scope": "resource",
+          "default": false,
+          "description": "%config.alwaysSignOff%"
+        },
+        "git.ignoredRepositories": {
+          "type": "array",
+          "default": [],
+          "scope": "window",
+          "description": "%config.ignoredRepositories%"
         }
       }
     },
@@ -1004,7 +1062,7 @@
         "id": "gitDecoration.modifiedResourceForeground",
         "description": "%colors.modified%",
         "defaults": {
-          "light": "#a76e12",
+          "light": "#895503",
           "dark": "#E2C08D",
           "highContrast": "#E2C08D"
         }
@@ -1022,7 +1080,7 @@
         "id": "gitDecoration.untrackedResourceForeground",
         "description": "%colors.untracked%",
         "defaults": {
-          "light": "#019001",
+          "light": "#018101",
           "dark": "#73C991",
           "highContrast": "#73C991"
         }
@@ -1139,15 +1197,15 @@
     "file-type": "^7.2.0",
     "iconv-lite": "0.4.19",
     "jschardet": "^1.6.0",
-    "vscode-extension-telemetry": "0.0.17",
-    "vscode-nls": "^3.2.1",
+    "vscode-extension-telemetry": "0.0.18",
+    "vscode-nls": "^4.0.0",
     "which": "^1.3.0"
   },
   "devDependencies": {
     "@types/byline": "4.2.31",
     "@types/file-type": "^5.2.1",
     "@types/mocha": "2.2.43",
-    "@types/node": "7.0.43",
+    "@types/node": "^8.10.25",
     "@types/which": "^1.0.28",
     "mocha": "^3.2.0"
   }
diff --git a/extensions/git/package.nls.json b/extensions/git/package.nls.json
index 9b1a2332d1f..bc4c812d75b 100644
--- a/extensions/git/package.nls.json
+++ b/extensions/git/package.nls.json
@@ -3,6 +3,7 @@
 	"description": "Git SCM Integration",
 	"command.clone": "Clone",
 	"command.init": "Initialize Repository",
+	"command.openRepository": "Open Repository",
 	"command.close": "Close Repository",
 	"command.refresh": "Refresh",
 	"command.openChange": "Open Changes",
@@ -49,29 +50,43 @@
 	"command.stash": "Stash",
 	"command.stashPop": "Pop Stash...",
 	"command.stashPopLatest": "Pop Latest Stash",
-	"config.enabled": "Whether git is enabled",
-	"config.path": "Path to the git executable",
-	"config.autoRepositoryDetection": "Whether repositories should be automatically detected",
-	"config.autorefresh": "Whether auto refreshing is enabled",
-	"config.autofetch": "Whether auto fetching is enabled",
-	"config.enableLongCommitWarning": "Whether long commit messages should be warned about",
-	"config.confirmSync": "Confirm before synchronizing git repositories",
-	"config.countBadge": "Controls the git badge counter. `all` counts all changes. `tracked` counts only the tracked changes. `off` turns it off.",
-	"config.checkoutType": "Controls what type of branches are listed when running `Checkout to...`. `all` shows all refs, `local` shows only the local branches, `tags` shows only tags and `remote` shows only remote branches.",
-	"config.ignoreLegacyWarning": "Ignores the legacy Git warning",
-	"config.ignoreMissingGitWarning": "Ignores the warning when Git is missing",
-	"config.ignoreLimitWarning": "Ignores the warning when there are too many changes in a repository",
-	"config.defaultCloneDirectory": "The default location where to clone a git repository",
+	"config.enabled": "Whether git is enabled.",
+	"config.path": "Path and filename of the git executable, e.g. `C:\\Program Files\\Git\\bin\\git.exe` (Windows).",
+	"config.autoRepositoryDetection": "Configures when repositories should be automatically detected.",
+	"config.autoRepositoryDetection.true": "Scan for both subfolders of the current opened folder and parent folders of open files.",
+	"config.autoRepositoryDetection.false": "Disable automatic repository scanning.",
+	"config.autoRepositoryDetection.subFolders": "Scan for subfolders of the currently opened folder.",
+	"config.autoRepositoryDetection.openEditors": "Scan for parent folders of open files.",
+	"config.autorefresh": "Whether auto refreshing is enabled.",
+	"config.autofetch": "Whether auto fetching is enabled.",
+	"config.enableLongCommitWarning": "Whether long commit messages should be warned about.",
+	"config.confirmSync": "Confirm before synchronizing git repositories.",
+	"config.countBadge": "Controls the git badge counter.",
+	"config.countBadge.all": "Count all changes.",
+	"config.countBadge.tracked": "Count only tracked changes.",
+	"config.countBadge.off": "Turn off counter.",
+	"config.checkoutType": "Controls what type of branches are listed when running `Checkout to...`.",
+	"config.checkoutType.all": "Show all references.",
+	"config.checkoutType.local": "Show only local branches.",
+	"config.checkoutType.tags": "Show only tags.",
+	"config.checkoutType.remote": "Show only remote branches.",
+	"config.ignoreLegacyWarning": "Ignores the legacy Git warning.",
+	"config.ignoreMissingGitWarning": "Ignores the warning when Git is missing.",
+	"config.ignoreLimitWarning": "Ignores the warning when there are too many changes in a repository.",
+	"config.defaultCloneDirectory": "The default location to clone a git repository.",
 	"config.enableSmartCommit": "Commit all changes when there are no staged changes.",
 	"config.enableCommitSigning": "Enables commit signing with GPG.",
 	"config.discardAllScope": "Controls what changes are discarded by the `Discard all changes` command. `all` discards all changes. `tracked` discards only tracked files. `prompt` shows a prompt dialog every time the action is run.",
-	"config.decorations.enabled": "Controls if Git contributes colors and badges to the explorer and the open editors view.",
+	"config.decorations.enabled": "Controls whether Git contributes colors and badges to the explorer and the open editors view.",
 	"config.promptToSaveFilesBeforeCommit": "Controls whether Git should check for unsaved files before committing.",
 	"config.showInlineOpenFileAction": "Controls whether to show an inline Open File action in the Git changes view.",
+	"config.showPushSuccessNotification": "Controls whether to show a notification when a push is successful.",
 	"config.inputValidation": "Controls when to show commit message input validation.",
 	"config.detectSubmodules": "Controls whether to automatically detect git submodules.",
 	"colors.added": "Color for added resources.",
 	"config.detectSubmodulesLimit": "Controls the limit of git submodules detected.",
+	"config.alwaysSignOff": "Controls the signoff flag for all commits.",
+	"config.ignoredRepositories": "List of git repositories to ignore.",
 	"colors.modified": "Color for modified resources.",
 	"colors.deleted": "Color for deleted resources.",
 	"colors.untracked": "Color for untracked resources.",
diff --git a/extensions/git/src/api.ts b/extensions/git/src/api.ts
deleted file mode 100644
index 6832fda9531..00000000000
--- a/extensions/git/src/api.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-'use strict';
-
-import { Model } from './model';
-import { Repository as ModelRepository } from './repository';
-import { Uri, SourceControlInputBox } from 'vscode';
-
-export interface InputBox {
-	value: string;
-}
-
-export class InputBoxImpl implements InputBox {
-	set value(value: string) { this.inputBox.value = value; }
-	get value(): string { return this.inputBox.value; }
-	constructor(private inputBox: SourceControlInputBox) { }
-}
-
-export interface Repository {
-	readonly rootUri: Uri;
-	readonly inputBox: InputBox;
-}
-
-export class RepositoryImpl implements Repository {
-
-	readonly rootUri: Uri;
-	readonly inputBox: InputBox;
-
-	constructor(repository: ModelRepository) {
-		this.rootUri = Uri.file(repository.root);
-		this.inputBox = new InputBoxImpl(repository.inputBox);
-	}
-}
-
-export interface API {
-	getRepositories(): Promise<Repository[]>;
-	getGitPath(): Promise<string>;
-}
-
-export class APIImpl implements API {
-
-	constructor(private modelPromise: Promise<Model>) { }
-
-	async getGitPath(): Promise<string> {
-		const model = await this.modelPromise;
-		return model.git.path;
-	}
-
-	async getRepositories(): Promise<Repository[]> {
-		const model = await this.modelPromise;
-		return model.repositories.map(repository => new RepositoryImpl(repository));
-	}
-}
-
-export function createApi(modelPromise: Promise<Model>): API {
-	return new APIImpl(modelPromise);
-}
\ No newline at end of file
diff --git a/extensions/git/src/api/api1.ts b/extensions/git/src/api/api1.ts
new file mode 100644
index 00000000000..ef2d1dea90b
--- /dev/null
+++ b/extensions/git/src/api/api1.ts
@@ -0,0 +1,171 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+import { Model } from '../model';
+import { Repository as BaseRepository, Resource } from '../repository';
+import { InputBox, Git, API, Repository, Remote, RepositoryState, Branch, Ref, Submodule, Commit, Change } from './git';
+import { Event, SourceControlInputBox, Uri } from 'vscode';
+import { mapEvent } from '../util';
+
+class ApiInputBox implements InputBox {
+	set value(value: string) { this._inputBox.value = value; }
+	get value(): string { return this._inputBox.value; }
+	constructor(private _inputBox: SourceControlInputBox) { }
+}
+
+export class ApiChange implements Change {
+
+	constructor(_resource: Resource) { }
+}
+
+export class ApiRepositoryState implements RepositoryState {
+
+	get HEAD(): Branch | undefined { return this._repository.HEAD; }
+	get refs(): Ref[] { return [...this._repository.refs]; }
+	get remotes(): Remote[] { return [...this._repository.remotes]; }
+	get submodules(): Submodule[] { return [...this._repository.submodules]; }
+	get rebaseCommit(): Commit | undefined { return this._repository.rebaseCommit; }
+
+	get mergeChanges(): Change[] { return this._repository.mergeGroup.resourceStates.map(r => new ApiChange(r)); }
+	get indexChanges(): Change[] { return this._repository.indexGroup.resourceStates.map(r => new ApiChange(r)); }
+	get workingTreeChanges(): Change[] { return this._repository.workingTreeGroup.resourceStates.map(r => new ApiChange(r)); }
+
+	readonly onDidChange: Event<void> = this._repository.onDidRunGitStatus;
+
+	constructor(private _repository: BaseRepository) { }
+}
+
+export class ApiRepository implements Repository {
+
+	readonly rootUri: Uri = Uri.file(this._repository.root);
+	readonly inputBox: InputBox = new ApiInputBox(this._repository.inputBox);
+	readonly state: RepositoryState = new ApiRepositoryState(this._repository);
+
+	constructor(private _repository: BaseRepository) { }
+
+	getConfigs(): Promise<{ key: string; value: string; }[]> {
+		return this._repository.getConfigs();
+	}
+
+	getConfig(key: string): Promise<string> {
+		return this._repository.getConfig(key);
+	}
+
+	setConfig(key: string, value: string): Promise<string> {
+		return this._repository.setConfig(key, value);
+	}
+
+	show(ref: string, path: string): Promise<string> {
+		return this._repository.show(ref, path);
+	}
+
+	getCommit(ref: string): Promise<Commit> {
+		return this._repository.getCommit(ref);
+	}
+
+	getObjectDetails(treeish: string, path: string): Promise<{ mode: string; object: string; size: number; }> {
+		return this._repository.getObjectDetails(treeish, path);
+	}
+
+	diffWithHEAD(path: string): Promise<string> {
+		return this._repository.diffWithHEAD(path);
+	}
+
+	diffWith(ref: string, path: string): Promise<string> {
+		return this._repository.diffWith(ref, path);
+	}
+
+	diffIndexWithHEAD(path: string): Promise<string> {
+		return this._repository.diffIndexWithHEAD(path);
+	}
+
+	diffIndexWith(ref: string, path: string): Promise<string> {
+		return this._repository.diffIndexWith(ref, path);
+	}
+
+	diffBlobs(object1: string, object2: string): Promise<string> {
+		return this._repository.diffBlobs(object1, object2);
+	}
+
+	diffBetween(ref1: string, ref2: string, path: string): Promise<string> {
+		return this._repository.diffBetween(ref1, ref2, path);
+	}
+
+	hashObject(data: string): Promise<string> {
+		return this._repository.hashObject(data);
+	}
+
+	createBranch(name: string, checkout: boolean, ref?: string | undefined): Promise<void> {
+		return this._repository.branch(name, checkout, ref);
+	}
+
+	deleteBranch(name: string): Promise<void> {
+		return this._repository.deleteBranch(name);
+	}
+
+	getBranch(name: string): Promise<Branch> {
+		return this._repository.getBranch(name);
+	}
+
+	setBranchUpstream(name: string, upstream: string): Promise<void> {
+		return this._repository.setBranchUpstream(name, upstream);
+	}
+
+	getMergeBase(ref1: string, ref2: string): Promise<string> {
+		return this._repository.getMergeBase(ref1, ref2);
+	}
+
+	status(): Promise<void> {
+		return this._repository.status();
+	}
+
+	checkout(treeish: string): Promise<void> {
+		return this._repository.checkout(treeish);
+	}
+
+	addRemote(name: string, url: string): Promise<void> {
+		return this._repository.addRemote(name, url);
+	}
+
+	removeRemote(name: string): Promise<void> {
+		return this._repository.removeRemote(name);
+	}
+
+	fetch(remote?: string | undefined, ref?: string | undefined): Promise<void> {
+		return this._repository.fetch(remote, ref);
+	}
+
+	pull(): Promise<void> {
+		return this._repository.pull();
+	}
+}
+
+export class ApiGit implements Git {
+
+	get path(): string { return this._model.git.path; }
+
+	constructor(private _model: Model) { }
+}
+
+export class ApiImpl implements API {
+
+	readonly git = new ApiGit(this._model);
+
+	get onDidOpenRepository(): Event<Repository> {
+		return mapEvent(this._model.onDidOpenRepository, r => new ApiRepository(r));
+	}
+
+	get onDidCloseRepository(): Event<Repository> {
+		return mapEvent(this._model.onDidCloseRepository, r => new ApiRepository(r));
+	}
+
+	get repositories(): Repository[] {
+		return this._model.repositories.map(r => new ApiRepository(r));
+	}
+
+	constructor(private _model: Model) { }
+}
diff --git a/extensions/git/src/api/extension.ts b/extensions/git/src/api/extension.ts
new file mode 100644
index 00000000000..622d3110724
--- /dev/null
+++ b/extensions/git/src/api/extension.ts
@@ -0,0 +1,70 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+import { Model } from '../model';
+import { GitExtension, Repository, API } from './git';
+import { ApiRepository, ApiImpl } from './api1';
+
+export function deprecated(target: any, key: string, descriptor: any): void {
+	if (typeof descriptor.value !== 'function') {
+		throw new Error('not supported');
+	}
+
+	const fn = descriptor.value;
+	descriptor.value = function () {
+		console.warn(`Git extension API method '${key}' is deprecated.`);
+		return fn.apply(this, arguments);
+	};
+}
+
+class NoModelGitExtension implements GitExtension {
+
+	@deprecated
+	async getGitPath(): Promise<string> {
+		throw new Error('Git model not found');
+	}
+
+	@deprecated
+	async getRepositories(): Promise<Repository[]> {
+		throw new Error('Git model not found');
+	}
+
+	getAPI(): API {
+		throw new Error('Git model not found');
+	}
+}
+
+class GitExtensionImpl implements GitExtension {
+
+	constructor(private _model: Model) { }
+
+	@deprecated
+	async getGitPath(): Promise<string> {
+		return this._model.git.path;
+	}
+
+	@deprecated
+	async getRepositories(): Promise<Repository[]> {
+		return this._model.repositories.map(repository => new ApiRepository(repository));
+	}
+
+	getAPI(version: number): API {
+		if (version !== 1) {
+			throw new Error(`No API version ${version} found.`);
+		}
+
+		return new ApiImpl(this._model);
+	}
+}
+
+export function createGitExtension(model?: Model): GitExtension {
+	if (!model) {
+		return new NoModelGitExtension();
+	}
+
+	return new GitExtensionImpl(model);
+}
diff --git a/extensions/git/src/api/git.d.ts b/extensions/git/src/api/git.d.ts
new file mode 100644
index 00000000000..b86b263b940
--- /dev/null
+++ b/extensions/git/src/api/git.d.ts
@@ -0,0 +1,164 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Uri, SourceControlInputBox, Event, CancellationToken } from 'vscode';
+
+export interface Git {
+	readonly path: string;
+}
+
+export interface InputBox {
+	value: string;
+}
+
+export const enum RefType {
+	Head,
+	RemoteHead,
+	Tag
+}
+
+export interface Ref {
+	readonly type: RefType;
+	readonly name?: string;
+	readonly commit?: string;
+	readonly remote?: string;
+}
+
+export interface UpstreamRef {
+	readonly remote: string;
+	readonly name: string;
+}
+
+export interface Branch extends Ref {
+	readonly upstream?: UpstreamRef;
+	readonly ahead?: number;
+	readonly behind?: number;
+}
+
+export interface Commit {
+	readonly hash: string;
+	readonly message: string;
+	readonly parents: string[];
+}
+
+export interface Submodule {
+	readonly name: string;
+	readonly path: string;
+	readonly url: string;
+}
+
+export interface Remote {
+	readonly name: string;
+	readonly fetchUrl?: string;
+	readonly pushUrl?: string;
+	readonly isReadOnly: boolean;
+}
+
+export interface Change {
+	// TODO
+}
+
+export interface RepositoryState {
+	readonly HEAD: Branch | undefined;
+	readonly refs: Ref[];
+	readonly remotes: Remote[];
+	readonly submodules: Submodule[];
+	readonly rebaseCommit: Commit | undefined;
+
+	readonly mergeChanges: Change[];
+	readonly indexChanges: Change[];
+	readonly workingTreeChanges: Change[];
+
+	readonly onDidChange: Event<void>;
+}
+
+export interface Repository {
+
+	readonly rootUri: Uri;
+	readonly inputBox: InputBox;
+	readonly state: RepositoryState;
+
+	getConfigs(): Promise<{ key: string; value: string; }[]>;
+	getConfig(key: string): Promise<string>;
+	setConfig(key: string, value: string): Promise<string>;
+
+	show(ref: string, path: string): Promise<string>;
+	getCommit(ref: string): Promise<Commit>;
+	getObjectDetails(treeish: string, path: string): Promise<{ mode: string, object: string, size: number }>;
+
+	diffWithHEAD(path: string): Promise<string>;
+	diffWith(ref: string, path: string): Promise<string>;
+	diffIndexWithHEAD(path: string): Promise<string>;
+	diffIndexWith(ref: string, path: string): Promise<string>;
+	diffBlobs(object1: string, object2: string): Promise<string>;
+	diffBetween(ref1: string, ref2: string, path: string): Promise<string>;
+
+	hashObject(data: string): Promise<string>;
+
+	createBranch(name: string, checkout: boolean, ref?: string): Promise<void>;
+	deleteBranch(name: string): Promise<void>;
+	getBranch(name: string): Promise<Branch>;
+	setBranchUpstream(name: string, upstream: string): Promise<void>;
+
+	getMergeBase(ref1: string, ref2: string): Promise<string>;
+
+	status(): Promise<void>;
+	checkout(treeish: string): Promise<void>;
+
+	addRemote(name: string, url: string): Promise<void>;
+	removeRemote(name: string): Promise<void>;
+
+	fetch(remote?: string, ref?: string): Promise<void>;
+	pull(): Promise<void>;
+}
+
+export interface API {
+	readonly git: Git;
+	readonly repositories: Repository[];
+	readonly onDidOpenRepository: Event<Repository>;
+	readonly onDidCloseRepository: Event<Repository>;
+}
+
+export interface GitExtension {
+
+	/**
+	 * Returns a specific API version.
+	 *
+	 * @param version Version number.
+	 * @returns API instance
+	 */
+	getAPI(version: 1): API;
+}
+
+export const enum GitErrorCodes {
+	BadConfigFile = 'BadConfigFile',
+	AuthenticationFailed = 'AuthenticationFailed',
+	NoUserNameConfigured = 'NoUserNameConfigured',
+	NoUserEmailConfigured = 'NoUserEmailConfigured',
+	NoRemoteRepositorySpecified = 'NoRemoteRepositorySpecified',
+	NotAGitRepository = 'NotAGitRepository',
+	NotAtRepositoryRoot = 'NotAtRepositoryRoot',
+	Conflict = 'Conflict',
+	UnmergedChanges = 'UnmergedChanges',
+	PushRejected = 'PushRejected',
+	RemoteConnectionError = 'RemoteConnectionError',
+	DirtyWorkTree = 'DirtyWorkTree',
+	CantOpenResource = 'CantOpenResource',
+	GitNotFound = 'GitNotFound',
+	CantCreatePipe = 'CantCreatePipe',
+	CantAccessRemote = 'CantAccessRemote',
+	RepositoryNotFound = 'RepositoryNotFound',
+	RepositoryIsLocked = 'RepositoryIsLocked',
+	BranchNotFullyMerged = 'BranchNotFullyMerged',
+	NoRemoteReference = 'NoRemoteReference',
+	InvalidBranchName = 'InvalidBranchName',
+	BranchAlreadyExists = 'BranchAlreadyExists',
+	NoLocalChanges = 'NoLocalChanges',
+	NoStashFound = 'NoStashFound',
+	LocalChangesOverwritten = 'LocalChangesOverwritten',
+	NoUpstreamBranch = 'NoUpstreamBranch',
+	IsInSubmodule = 'IsInSubmodule',
+	WrongCase = 'WrongCase',
+}
\ No newline at end of file
diff --git a/extensions/git/src/autofetch.ts b/extensions/git/src/autofetch.ts
index 758dc82182c..33439a8d315 100644
--- a/extensions/git/src/autofetch.ts
+++ b/extensions/git/src/autofetch.ts
@@ -6,10 +6,10 @@
 'use strict';
 
 import { workspace, Disposable, EventEmitter, Memento, window, MessageItem, ConfigurationTarget } from 'vscode';
-import { GitErrorCodes } from './git';
 import { Repository, Operation } from './repository';
 import { eventToPromise, filterEvent, onceEvent } from './util';
 import * as nls from 'vscode-nls';
+import { GitErrorCodes } from './api/git';
 
 const localize = nls.loadMessageBundle();
 
@@ -102,7 +102,7 @@ export class AutoFetcher {
 			}
 
 			try {
-				await this.repository.fetch();
+				await this.repository.fetchDefault();
 			} catch (err) {
 				if (err.gitErrorCode === GitErrorCodes.AuthenticationFailed) {
 					this.disable();
diff --git a/extensions/git/src/commands.ts b/extensions/git/src/commands.ts
index 6922820b37d..e4b5320a561 100644
--- a/extensions/git/src/commands.ts
+++ b/extensions/git/src/commands.ts
@@ -6,7 +6,7 @@
 'use strict';
 
 import { Uri, commands, Disposable, window, workspace, QuickPickItem, OutputChannel, Range, WorkspaceEdit, Position, LineChange, SourceControlResourceState, TextDocumentShowOptions, ViewColumn, ProgressLocation, TextEditor, MessageOptions } from 'vscode';
-import { Ref, RefType, Git, GitErrorCodes, Branch } from './git';
+import { Git } from './git';
 import { Repository, Resource, Status, CommitOptions, ResourceGroupType } from './repository';
 import { Model } from './model';
 import { toGitUri, fromGitUri } from './uri';
@@ -17,6 +17,7 @@ import { lstat, Stats } from 'fs';
 import * as os from 'os';
 import TelemetryReporter from 'vscode-extension-telemetry';
 import * as nls from 'vscode-nls';
+import { Ref, RefType, Branch, GitErrorCodes } from './api/git';
 
 const localize = nls.loadMessageBundle();
 
@@ -137,6 +138,22 @@ const ImageMimetypes = [
 	'image/bmp'
 ];
 
+async function categorizeResourceByResolution(resources: Resource[]): Promise<{ merge: Resource[], resolved: Resource[], unresolved: Resource[] }> {
+	const selection = resources.filter(s => s instanceof Resource) as Resource[];
+	const merge = selection.filter(s => s.resourceGroupType === ResourceGroupType.Merge);
+	const isBothAddedOrModified = (s: Resource) => s.type === Status.BOTH_MODIFIED || s.type === Status.BOTH_ADDED;
+	const possibleUnresolved = merge.filter(isBothAddedOrModified);
+	const promises = possibleUnresolved.map(s => grep(s.resourceUri.fsPath, /^<{7}|^={7}|^>{7}/));
+	const unresolvedBothModified = await Promise.all<boolean>(promises);
+	const resolved = possibleUnresolved.filter((s, i) => !unresolvedBothModified[i]);
+	const unresolved = [
+		...merge.filter(s => !isBothAddedOrModified(s)),
+		...possibleUnresolved.filter((s, i) => unresolvedBothModified[i])
+	];
+
+	return { merge, resolved, unresolved };
+}
+
 export class CommandCenter {
 
 	private disposables: Disposable[];
@@ -236,7 +253,7 @@ export class CommandCenter {
 				gitRef = indexStatus ? '' : 'HEAD';
 			}
 
-			const { size, object } = await repository.lstree(gitRef, uri.fsPath);
+			const { size, object } = await repository.getObjectDetails(gitRef, uri.fsPath);
 			const { mimetype } = await repository.detectObjectType(object);
 
 			if (mimetype === 'text/plain') {
@@ -485,7 +502,28 @@ export class CommandCenter {
 		}
 
 		await this.git.init(path);
-		await this.model.tryOpenRepository(path);
+		await this.model.openRepository(path);
+	}
+
+	@command('git.openRepository', { repository: false })
+	async openRepository(path?: string): Promise<void> {
+		if (!path) {
+			const result = await window.showOpenDialog({
+				canSelectFiles: false,
+				canSelectFolders: true,
+				canSelectMany: false,
+				defaultUri: Uri.file(os.homedir()),
+				openLabel: localize('open repo', "Open Repository")
+			});
+
+			if (!result || result.length === 0) {
+				return;
+			}
+
+			path = result[0].fsPath;
+		}
+
+		await this.model.openRepository(path);
 	}
 
 	@command('git.close', { repository: true })
@@ -612,11 +650,15 @@ export class CommandCenter {
 
 	@command('git.stage')
 	async stage(...resourceStates: SourceControlResourceState[]): Promise<void> {
+		this.outputChannel.appendLine(`git.stage ${resourceStates.length}`);
+
 		resourceStates = resourceStates.filter(s => !!s);
 
 		if (resourceStates.length === 0 || (resourceStates[0] && !(resourceStates[0].resourceUri instanceof Uri))) {
 			const resource = this.getSCMResource();
 
+			this.outputChannel.appendLine(`git.stage.getSCMResource ${resource ? resource.resourceUri.toString() : null}`);
+
 			if (!resource) {
 				return;
 			}
@@ -625,20 +667,12 @@ export class CommandCenter {
 		}
 
 		const selection = resourceStates.filter(s => s instanceof Resource) as Resource[];
-		const merge = selection.filter(s => s.resourceGroupType === ResourceGroupType.Merge);
-		const bothModified = merge.filter(s => s.type === Status.BOTH_MODIFIED);
-		const promises = bothModified.map(s => grep(s.resourceUri.fsPath, /^<{7}|^={7}|^>{7}/));
-		const unresolvedBothModified = await Promise.all<boolean>(promises);
-		const resolvedConflicts = bothModified.filter((s, i) => !unresolvedBothModified[i]);
-		const unresolvedConflicts = [
-			...merge.filter(s => s.type !== Status.BOTH_MODIFIED),
-			...bothModified.filter((s, i) => unresolvedBothModified[i])
-		];
+		const { resolved, unresolved } = await categorizeResourceByResolution(selection);
 
-		if (unresolvedConflicts.length > 0) {
-			const message = unresolvedConflicts.length > 1
-				? localize('confirm stage files with merge conflicts', "Are you sure you want to stage {0} files with merge conflicts?", unresolvedConflicts.length)
-				: localize('confirm stage file with merge conflicts', "Are you sure you want to stage {0} with merge conflicts?", path.basename(unresolvedConflicts[0].resourceUri.fsPath));
+		if (unresolved.length > 0) {
+			const message = unresolved.length > 1
+				? localize('confirm stage files with merge conflicts', "Are you sure you want to stage {0} files with merge conflicts?", unresolved.length)
+				: localize('confirm stage file with merge conflicts', "Are you sure you want to stage {0} with merge conflicts?", path.basename(unresolved[0].resourceUri.fsPath));
 
 			const yes = localize('yes', "Yes");
 			const pick = await window.showWarningMessage(message, { modal: true }, yes);
@@ -649,8 +683,9 @@ export class CommandCenter {
 		}
 
 		const workingTree = selection.filter(s => s.resourceGroupType === ResourceGroupType.WorkingTree);
-		const scmResources = [...workingTree, ...resolvedConflicts, ...unresolvedConflicts];
+		const scmResources = [...workingTree, ...resolved, ...unresolved];
 
+		this.outputChannel.appendLine(`git.stage.scmResources ${scmResources.length}`);
 		if (!scmResources.length) {
 			return;
 		}
@@ -662,12 +697,12 @@ export class CommandCenter {
 	@command('git.stageAll', { repository: true })
 	async stageAll(repository: Repository): Promise<void> {
 		const resources = repository.mergeGroup.resourceStates.filter(s => s instanceof Resource) as Resource[];
-		const mergeConflicts = resources.filter(s => s.resourceGroupType === ResourceGroupType.Merge);
+		const { merge, unresolved } = await categorizeResourceByResolution(resources);
 
-		if (mergeConflicts.length > 0) {
-			const message = mergeConflicts.length > 1
-				? localize('confirm stage files with merge conflicts', "Are you sure you want to stage {0} files with merge conflicts?", mergeConflicts.length)
-				: localize('confirm stage file with merge conflicts', "Are you sure you want to stage {0} with merge conflicts?", path.basename(mergeConflicts[0].resourceUri.fsPath));
+		if (unresolved.length > 0) {
+			const message = unresolved.length > 1
+				? localize('confirm stage files with merge conflicts', "Are you sure you want to stage {0} files with merge conflicts?", merge.length)
+				: localize('confirm stage file with merge conflicts', "Are you sure you want to stage {0} with merge conflicts?", path.basename(merge[0].resourceUri.fsPath));
 
 			const yes = localize('yes', "Yes");
 			const pick = await window.showWarningMessage(message, { modal: true }, yes);
@@ -770,20 +805,18 @@ export class CommandCenter {
 
 		const originalUri = toGitUri(modifiedUri, '~');
 		const originalDocument = await workspace.openTextDocument(originalUri);
-		const basename = path.basename(modifiedUri.fsPath);
-		const message = localize('confirm revert', "Are you sure you want to revert the selected changes in {0}?", basename);
-		const yes = localize('revert', "Revert Changes");
-		const pick = await window.showWarningMessage(message, { modal: true }, yes);
-
-		if (pick !== yes) {
-			return;
-		}
-
+		const selectionsBeforeRevert = textEditor.selections;
+		const visibleRangesBeforeRevert = textEditor.visibleRanges;
 		const result = applyLineChanges(originalDocument, modifiedDocument, changes);
+
 		const edit = new WorkspaceEdit();
 		edit.replace(modifiedUri, new Range(new Position(0, 0), modifiedDocument.lineAt(modifiedDocument.lineCount - 1).range.end), result);
 		workspace.applyEdit(edit);
+
 		await modifiedDocument.save();
+
+		textEditor.selections = selectionsBeforeRevert;
+		textEditor.revealRange(visibleRangesBeforeRevert[0]);
 	}
 
 	@command('git.unstage')
@@ -980,7 +1013,7 @@ export class CommandCenter {
 		getCommitMessage: () => Promise<string | undefined>,
 		opts?: CommitOptions
 	): Promise<boolean> {
-		const config = workspace.getConfiguration('git');
+		const config = workspace.getConfiguration('git', Uri.file(repository.root));
 		const promptToSaveFilesBeforeCommit = config.get<boolean>('promptToSaveFilesBeforeCommit') === true;
 
 		if (promptToSaveFilesBeforeCommit) {
@@ -989,8 +1022,8 @@ export class CommandCenter {
 
 			if (unsavedTextDocuments.length > 0) {
 				const message = unsavedTextDocuments.length === 1
-					? localize('unsaved files single', "The following file is unsaved: {0}.\n\nWould you like to save it before comitting?", path.basename(unsavedTextDocuments[0].uri.fsPath))
-					: localize('unsaved files', "There are {0} unsaved files.\n\nWould you like to save them before comitting?", unsavedTextDocuments.length);
+					? localize('unsaved files single', "The following file is unsaved: {0}.\n\nWould you like to save it before committing?", path.basename(unsavedTextDocuments[0].uri.fsPath))
+					: localize('unsaved files', "There are {0} unsaved files.\n\nWould you like to save them before committing?", unsavedTextDocuments.length);
 				const saveAndCommit = localize('save and commit', "Save All & Commit");
 				const commit = localize('commit', "Commit Anyway");
 				const pick = await window.showWarningMessage(message, { modal: true }, saveAndCommit, commit);
@@ -1034,6 +1067,10 @@ export class CommandCenter {
 		// enable signing of commits if configurated
 		opts.signCommit = enableCommitSigning;
 
+		if (config.get<boolean>('alwaysSignOff')) {
+			opts.signoff = true;
+		}
+
 		if (
 			// no changes
 			(noStagedChanges && noUnstagedChanges)
@@ -1136,11 +1173,19 @@ export class CommandCenter {
 		const HEAD = repository.HEAD;
 
 		if (!HEAD || !HEAD.commit) {
+			window.showWarningMessage(localize('no more', "Can't undo because HEAD doesn't point to any commit."));
 			return;
 		}
 
 		const commit = await repository.getCommit('HEAD');
-		await repository.reset('HEAD~');
+
+		if (commit.parents.length > 0) {
+			await repository.reset('HEAD~');
+		} else {
+			await repository.deleteRef('HEAD');
+			await this.unstageAll(repository);
+		}
+
 		repository.inputBox.value = commit.message;
 	}
 
@@ -1190,7 +1235,7 @@ export class CommandCenter {
 		}
 
 		const name = result.replace(/^\.|\/\.|\.\.|~|\^|:|\/$|\.lock$|\.lock\/|\\|\*|\s|^\s*$|\.$/g, '-');
-		await repository.branch(name);
+		await repository.branch(name, true);
 	}
 
 	@command('git.deleteBranch', { repository: true })
@@ -1277,16 +1322,7 @@ export class CommandCenter {
 			return;
 		}
 
-		try {
-			await choice.run(repository);
-		} catch (err) {
-			if (err.gitErrorCode !== GitErrorCodes.Conflict) {
-				throw err;
-			}
-
-			const message = localize('merge conflicts', "There are merge conflicts. Resolve them before committing.");
-			await window.showWarningMessage(message);
-		}
+		await choice.run(repository);
 	}
 
 	@command('git.createTag', { repository: true })
@@ -1319,7 +1355,7 @@ export class CommandCenter {
 			return;
 		}
 
-		await repository.fetch();
+		await repository.fetchDefault();
 	}
 
 	@command('git.pullFrom', { repository: true })
@@ -1342,7 +1378,8 @@ export class CommandCenter {
 		const remoteRefs = repository.refs;
 		const remoteRefsFiltered = remoteRefs.filter(r => (r.remote === remotePick.label));
 		const branchPicks = remoteRefsFiltered.map(r => ({ label: r.name })) as { label: string; description: string }[];
-		const branchPick = await window.showQuickPick(branchPicks, { placeHolder });
+		const branchPlaceHolder = localize('pick branch pull', "Pick a branch to pull from");
+		const branchPick = await window.showQuickPick(branchPicks, { placeHolder: branchPlaceHolder });
 
 		if (!branchPick) {
 			return;
@@ -1350,7 +1387,7 @@ export class CommandCenter {
 
 		const remoteCharCnt = remotePick.label.length;
 
-		repository.pullFrom(false, remotePick.label, branchPick.label.slice(remoteCharCnt + 1));
+		await repository.pullFrom(false, remotePick.label, branchPick.label.slice(remoteCharCnt + 1));
 	}
 
 	@command('git.pull', { repository: true })
@@ -1446,7 +1483,7 @@ export class CommandCenter {
 			return;
 		}
 
-		repository.pushTo(pick.label, branchName);
+		await repository.pushTo(pick.label, branchName);
 	}
 
 	private async _sync(repository: Repository, rebase: boolean): Promise<void> {
@@ -1659,10 +1696,11 @@ export class CommandCenter {
 
 			return result.catch(async err => {
 				const options: MessageOptions = {
-					modal: err.gitErrorCode === GitErrorCodes.DirtyWorkTree
+					modal: true
 				};
 
 				let message: string;
+				let type: 'error' | 'warning' = 'error';
 
 				switch (err.gitErrorCode) {
 					case GitErrorCodes.DirtyWorkTree:
@@ -1671,6 +1709,11 @@ export class CommandCenter {
 					case GitErrorCodes.PushRejected:
 						message = localize('cant push', "Can't push refs to remote. Try running 'Pull' first to integrate your changes.");
 						break;
+					case GitErrorCodes.Conflict:
+						message = localize('merge conflicts', "There are merge conflicts. Resolve them before committing.");
+						type = 'warning';
+						options.modal = false;
+						break;
 					default:
 						const hint = (err.stderr || err.message || String(err))
 							.replace(/^error: /mi, '')
@@ -1691,11 +1734,11 @@ export class CommandCenter {
 					return;
 				}
 
-				options.modal = true;
-
 				const outputChannel = this.outputChannel as OutputChannel;
 				const openOutputChannelChoice = localize('open git log', "Open Git Log");
-				const choice = await window.showErrorMessage(message, options, openOutputChannelChoice);
+				const choice = type === 'error'
+					? await window.showErrorMessage(message, options, openOutputChannelChoice)
+					: await window.showWarningMessage(message, options, openOutputChannelChoice);
 
 				if (choice === openOutputChannelChoice) {
 					outputChannel.show();
@@ -1710,7 +1753,12 @@ export class CommandCenter {
 	}
 
 	private getSCMResource(uri?: Uri): Resource | undefined {
-		uri = uri ? uri : window.activeTextEditor && window.activeTextEditor.document.uri;
+		uri = uri ? uri : (window.activeTextEditor && window.activeTextEditor.document.uri);
+
+		this.outputChannel.appendLine(`git.getSCMResource.uri ${uri && uri.toString()}`);
+		for (const r of this.model.repositories.map(r => r.root)) {
+			this.outputChannel.appendLine(`repo root ${r}`);
+		}
 
 		if (!uri) {
 			return undefined;
diff --git a/extensions/git/src/contentProvider.ts b/extensions/git/src/contentProvider.ts
index 443dd774f2a..e03a97bd29b 100644
--- a/extensions/git/src/contentProvider.ts
+++ b/extensions/git/src/contentProvider.ts
@@ -92,7 +92,11 @@ export class GitContentProvider {
 				return '';
 			}
 
-			return await repository.diff(path, { cached: ref === 'index' });
+			if (ref === 'index') {
+				return await repository.diffIndexWithHEAD(path);
+			} else {
+				return await repository.diffWithHEAD(path);
+			}
 		}
 
 		const repository = this.model.getRepository(uri);
diff --git a/extensions/git/src/decorationProvider.ts b/extensions/git/src/decorationProvider.ts
index 48594918f5d..05eff573e72 100644
--- a/extensions/git/src/decorationProvider.ts
+++ b/extensions/git/src/decorationProvider.ts
@@ -11,7 +11,7 @@ import { Repository, GitResourceGroup, Status } from './repository';
 import { Model } from './model';
 import { debounce } from './decorators';
 import { filterEvent, dispose, anyEvent, fireEvent } from './util';
-import { GitErrorCodes } from './git';
+import { GitErrorCodes } from './api/git';
 
 type Callback = { resolve: (status: boolean) => void, reject: (err: any) => void };
 
@@ -93,7 +93,7 @@ class GitDecorationProvider implements DecorationProvider {
 
 	private static SubmoduleDecorationData: DecorationData = {
 		title: 'Submodule',
-		abbreviation: 'S',
+		letter: 'S',
 		color: new ThemeColor('gitDecoration.submoduleResourceForeground')
 	};
 
diff --git a/extensions/git/src/encoding.ts b/extensions/git/src/encoding.ts
index 4396105567f..d2bb831f123 100644
--- a/extensions/git/src/encoding.ts
+++ b/extensions/git/src/encoding.ts
@@ -9,7 +9,7 @@ import * as jschardet from 'jschardet';
 
 jschardet.Constants.MINIMUM_THRESHOLD = 0.2;
 
-function detectEncodingByBOM(buffer: NodeBuffer): string | null {
+function detectEncodingByBOM(buffer: Buffer): string | null {
 	if (!buffer || buffer.length < 2) {
 		return null;
 	}
diff --git a/extensions/git/src/git.ts b/extensions/git/src/git.ts
index 71a8cbc9014..3069b8fd77b 100644
--- a/extensions/git/src/git.ts
+++ b/extensions/git/src/git.ts
@@ -16,6 +16,7 @@ import * as filetype from 'file-type';
 import { assign, groupBy, denodeify, IDisposable, toDisposable, dispose, mkdirp, readBytes, detectUnicodeEncoding, Encoding, onceEvent } from './util';
 import { CancellationToken } from 'vscode';
 import { detectEncoding } from './encoding';
+import { Ref, RefType, Branch, Remote, GitErrorCodes } from './api/git';
 
 const readfile = denodeify<string, string | null, string>(fs.readFile);
 
@@ -31,40 +32,15 @@ export interface IFileStatus {
 	rename?: string;
 }
 
-export interface Remote {
-	name: string;
-	fetchUrl?: string;
-	pushUrl?: string;
-	isReadOnly: boolean;
-}
-
 export interface Stash {
 	index: number;
 	description: string;
 }
 
-export enum RefType {
-	Head,
-	RemoteHead,
-	Tag
-}
-
-export interface Ref {
-	type: RefType;
-	name?: string;
-	commit?: string;
-	remote?: string;
-}
-
-export interface UpstreamRef {
-	remote: string;
-	name: string;
-}
-
-export interface Branch extends Ref {
-	upstream?: UpstreamRef;
-	ahead?: number;
-	behind?: number;
+interface MutableRemote extends Remote {
+	fetchUrl?: string;
+	pushUrl?: string;
+	isReadOnly: boolean;
 }
 
 function parseVersion(raw: string): string {
@@ -309,42 +285,12 @@ export interface IGitOptions {
 	env?: any;
 }
 
-export const GitErrorCodes = {
-	BadConfigFile: 'BadConfigFile',
-	AuthenticationFailed: 'AuthenticationFailed',
-	NoUserNameConfigured: 'NoUserNameConfigured',
-	NoUserEmailConfigured: 'NoUserEmailConfigured',
-	NoRemoteRepositorySpecified: 'NoRemoteRepositorySpecified',
-	NotAGitRepository: 'NotAGitRepository',
-	NotAtRepositoryRoot: 'NotAtRepositoryRoot',
-	Conflict: 'Conflict',
-	UnmergedChanges: 'UnmergedChanges',
-	PushRejected: 'PushRejected',
-	RemoteConnectionError: 'RemoteConnectionError',
-	DirtyWorkTree: 'DirtyWorkTree',
-	CantOpenResource: 'CantOpenResource',
-	GitNotFound: 'GitNotFound',
-	CantCreatePipe: 'CantCreatePipe',
-	CantAccessRemote: 'CantAccessRemote',
-	RepositoryNotFound: 'RepositoryNotFound',
-	RepositoryIsLocked: 'RepositoryIsLocked',
-	BranchNotFullyMerged: 'BranchNotFullyMerged',
-	NoRemoteReference: 'NoRemoteReference',
-	InvalidBranchName: 'InvalidBranchName',
-	BranchAlreadyExists: 'BranchAlreadyExists',
-	NoLocalChanges: 'NoLocalChanges',
-	NoStashFound: 'NoStashFound',
-	LocalChangesOverwritten: 'LocalChangesOverwritten',
-	NoUpstreamBranch: 'NoUpstreamBranch',
-	IsInSubmodule: 'IsInSubmodule'
-};
-
 function getGitErrorCode(stderr: string): string | undefined {
 	if (/Another git process seems to be running in this repository|If no other git process is currently running/.test(stderr)) {
 		return GitErrorCodes.RepositoryIsLocked;
 	} else if (/Authentication failed/.test(stderr)) {
 		return GitErrorCodes.AuthenticationFailed;
-	} else if (/Not a git repository/.test(stderr)) {
+	} else if (/Not a git repository/i.test(stderr)) {
 		return GitErrorCodes.NotAGitRepository;
 	} else if (/bad config file/.test(stderr)) {
 		return GitErrorCodes.BadConfigFile;
@@ -426,6 +372,10 @@ export class Git {
 		return await this._exec(args, options);
 	}
 
+	async exec2(args: string[], options: SpawnOptions = {}): Promise<IExecutionResult<string>> {
+		return await this._exec(args, options);
+	}
+
 	stream(cwd: string, args: string[], options: SpawnOptions = {}): cp.ChildProcess {
 		options = assign({ cwd }, options || {});
 		return this.spawn(args, options);
@@ -501,6 +451,7 @@ export class Git {
 export interface Commit {
 	hash: string;
 	message: string;
+	parents: string[];
 }
 
 export class GitStatusParser {
@@ -631,8 +582,45 @@ export function parseGitmodules(raw: string): Submodule[] {
 	return result;
 }
 
-export interface DiffOptions {
-	cached?: boolean;
+export function parseGitCommit(raw: string): Commit | null {
+	const match = /^([0-9a-f]{40})\n(.*)\n([^]*)$/m.exec(raw.trim());
+	if (!match) {
+		return null;
+	}
+
+	const parents = match[2] ? match[2].split(' ') : [];
+	return { hash: match[1], message: match[3], parents };
+}
+
+interface LsTreeElement {
+	mode: string;
+	type: string;
+	object: string;
+	size: string;
+	file: string;
+}
+
+export function parseLsTree(raw: string): LsTreeElement[] {
+	return raw.split('\n')
+		.filter(l => !!l)
+		.map(line => /^(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(.*)$/.exec(line)!)
+		.filter(m => !!m)
+		.map(([, mode, type, object, size, file]) => ({ mode, type, object, size, file }));
+}
+
+interface LsFilesElement {
+	mode: string;
+	object: string;
+	stage: string;
+	file: string;
+}
+
+export function parseLsFiles(raw: string): LsFilesElement[] {
+	return raw.split('\n')
+		.filter(l => !!l)
+		.map(line => /^(\S+)\s+(\S+)\s+(\S+)\s+(.*)$/.exec(line)!)
+		.filter(m => !!m)
+		.map(([, mode, object, stage, file]) => ({ mode, object, stage, file }));
 }
 
 export class Repository {
@@ -663,7 +651,7 @@ export class Repository {
 		return this.git.spawn(args, options);
 	}
 
-	async config(scope: string, key: string, value: any, options: SpawnOptions): Promise<string> {
+	async config(scope: string, key: string, value: any = null, options: SpawnOptions = {}): Promise<string> {
 		const args = ['config'];
 
 		if (scope) {
@@ -680,6 +668,24 @@ export class Repository {
 		return result.stdout;
 	}
 
+	async getConfigs(scope: string): Promise<{ key: string; value: string; }[]> {
+		const args = ['config'];
+
+		if (scope) {
+			args.push('--' + scope);
+		}
+
+		args.push('-l');
+
+		const result = await this.run(args);
+		const lines = result.stdout.trim().split(/\r|\r\n|\n/);
+
+		return lines.map(entry => {
+			const equalsIndex = entry.indexOf('=');
+			return { key: entry.substr(0, equalsIndex), value: entry.substr(equalsIndex + 1) };
+		});
+	}
+
 	async bufferString(object: string, encoding: string = 'utf8', autoGuessEncoding = false): Promise<string> {
 		const stdout = await this.buffer(object);
 
@@ -699,47 +705,72 @@ export class Repository {
 			return Promise.reject<Buffer>('Can\'t open file from git');
 		}
 
-		const { exitCode, stdout } = await exec(child);
+		const { exitCode, stdout, stderr } = await exec(child);
 
 		if (exitCode) {
-			return Promise.reject<Buffer>(new GitError({
+			const err = new GitError({
 				message: 'Could not show object.',
 				exitCode
-			}));
+			});
+
+			if (/exists on disk, but not in/.test(stderr)) {
+				err.gitErrorCode = GitErrorCodes.WrongCase;
+			}
+
+			return Promise.reject<Buffer>(err);
 		}
 
 		return stdout;
 	}
 
-	async lstree(treeish: string, path: string): Promise<{ mode: string, object: string, size: number }> {
+	async getObjectDetails(treeish: string, path: string): Promise<{ mode: string, object: string, size: number }> {
 		if (!treeish) { // index
-			const { stdout } = await this.run(['ls-files', '--stage', '--', path]);
+			const elements = await this.lsfiles(path);
 
-			const match = /^(\d+)\s+([0-9a-f]{40})\s+(\d+)/.exec(stdout);
-
-			if (!match) {
+			if (elements.length === 0) {
 				throw new GitError({ message: 'Error running ls-files' });
 			}
 
-			const [, mode, object] = match;
+			const { mode, object } = elements[0];
 			const catFile = await this.run(['cat-file', '-s', object]);
 			const size = parseInt(catFile.stdout);
 
 			return { mode, object, size };
 		}
 
-		const { stdout } = await this.run(['ls-tree', '-l', treeish, '--', path]);
+		const elements = await this.lstree(treeish, path);
 
-		const match = /^(\d+)\s+(\w+)\s+([0-9a-f]{40})\s+(\d+)/.exec(stdout);
-
-		if (!match) {
-			throw new GitError({ message: 'Error running ls-tree' });
+		if (elements.length === 0) {
+			throw new GitError({ message: 'Error running ls-files' });
 		}
 
-		const [, mode, , object, size] = match;
+		const { mode, object, size } = elements[0];
 		return { mode, object, size: parseInt(size) };
 	}
 
+	async lstree(treeish: string, path: string): Promise<LsTreeElement[]> {
+		const { stdout } = await this.run(['ls-tree', '-l', treeish, '--', path]);
+		return parseLsTree(stdout);
+	}
+
+	async lsfiles(path: string): Promise<LsFilesElement[]> {
+		const { stdout } = await this.run(['ls-files', '--stage', '--', path]);
+		return parseLsFiles(stdout);
+	}
+
+	async getGitRelativePath(ref: string, relativePath: string): Promise<string> {
+		const relativePathLowercase = relativePath.toLowerCase();
+		const dirname = path.posix.dirname(relativePath) + '/';
+		const elements: { file: string; }[] = ref ? await this.lstree(ref, dirname) : await this.lsfiles(dirname);
+		const element = elements.filter(file => file.file.toLowerCase() === relativePathLowercase)[0];
+
+		if (!element) {
+			throw new GitError({ message: 'Git relative path not found.' });
+		}
+
+		return element.file;
+	}
+
 	async detectObjectType(object: string): Promise<{ mimetype: string, encoding?: string }> {
 		const child = await this.stream(['show', object]);
 		const buffer = await readBytes(child.stdout, 4100);
@@ -780,10 +811,10 @@ export class Repository {
 		}
 	}
 
-	async diff(path: string, options: DiffOptions = {}): Promise<string> {
+	async diff(path: string, cached = false): Promise<string> {
 		const args = ['diff'];
 
-		if (options.cached) {
+		if (cached) {
 			args.push('--cached');
 		}
 
@@ -793,6 +824,57 @@ export class Repository {
 		return result.stdout;
 	}
 
+	async diffWithHEAD(path: string): Promise<string> {
+		const args = ['diff', '--', path];
+		const result = await this.run(args);
+		return result.stdout;
+	}
+
+	async diffWith(ref: string, path: string): Promise<string> {
+		const args = ['diff', ref, '--', path];
+		const result = await this.run(args);
+		return result.stdout;
+	}
+
+	async diffIndexWithHEAD(path: string): Promise<string> {
+		const args = ['diff', '--cached', '--', path];
+		const result = await this.run(args);
+		return result.stdout;
+	}
+
+	async diffIndexWith(ref: string, path: string): Promise<string> {
+		const args = ['diff', '--cached', ref, '--', path];
+		const result = await this.run(args);
+		return result.stdout;
+	}
+
+	async diffBlobs(object1: string, object2: string): Promise<string> {
+		const args = ['diff', object1, object2];
+		const result = await this.run(args);
+		return result.stdout;
+	}
+
+	async diffBetween(ref1: string, ref2: string, path: string): Promise<string> {
+		const args = ['diff', `${ref1}...${ref2}`, '--', path];
+		const result = await this.run(args);
+
+		return result.stdout.trim();
+	}
+
+	async getMergeBase(ref1: string, ref2: string): Promise<string> {
+		const args = ['merge-base', ref1, ref2];
+		const result = await this.run(args);
+
+		return result.stdout.trim();
+	}
+
+	async hashObject(data: string): Promise<string> {
+		const args = ['hash-object', '-w', '--stdin'];
+		const result = await this.run(args, { input: data });
+
+		return result.stdout.trim();
+	}
+
 	async add(paths: string[]): Promise<void> {
 		const args = ['add', '-A', '--'];
 
@@ -822,7 +904,7 @@ export class Repository {
 		let mode: string;
 
 		try {
-			const details = await this.lstree('HEAD', path);
+			const details = await this.getObjectDetails('HEAD', path);
 			mode = details.mode;
 		} catch (err) {
 			mode = '100644';
@@ -876,31 +958,50 @@ export class Repository {
 		try {
 			await this.run(args, { input: message || '' });
 		} catch (commitErr) {
-			if (/not possible because you have unmerged files/.test(commitErr.stderr || '')) {
-				commitErr.gitErrorCode = GitErrorCodes.UnmergedChanges;
-				throw commitErr;
-			}
-
-			try {
-				await this.run(['config', '--get-all', 'user.name']);
-			} catch (err) {
-				err.gitErrorCode = GitErrorCodes.NoUserNameConfigured;
-				throw err;
-			}
-
-			try {
-				await this.run(['config', '--get-all', 'user.email']);
-			} catch (err) {
-				err.gitErrorCode = GitErrorCodes.NoUserEmailConfigured;
-				throw err;
-			}
-
-			throw commitErr;
+			await this.handleCommitError(commitErr);
 		}
 	}
 
-	async branch(name: string, checkout: boolean): Promise<void> {
+	async rebaseContinue(): Promise<void> {
+		const args = ['rebase', '--continue'];
+
+		try {
+			await this.run(args);
+		} catch (commitErr) {
+			await this.handleCommitError(commitErr);
+		}
+	}
+
+	private async handleCommitError(commitErr: any): Promise<void> {
+		if (/not possible because you have unmerged files/.test(commitErr.stderr || '')) {
+			commitErr.gitErrorCode = GitErrorCodes.UnmergedChanges;
+			throw commitErr;
+		}
+
+		try {
+			await this.run(['config', '--get-all', 'user.name']);
+		} catch (err) {
+			err.gitErrorCode = GitErrorCodes.NoUserNameConfigured;
+			throw err;
+		}
+
+		try {
+			await this.run(['config', '--get-all', 'user.email']);
+		} catch (err) {
+			err.gitErrorCode = GitErrorCodes.NoUserEmailConfigured;
+			throw err;
+		}
+
+		throw commitErr;
+	}
+
+	async branch(name: string, checkout: boolean, ref?: string): Promise<void> {
 		const args = checkout ? ['checkout', '-q', '-b', name] : ['branch', '-q', name];
+
+		if (ref) {
+			args.push(ref);
+		}
+
 		await this.run(args);
 	}
 
@@ -914,6 +1015,16 @@ export class Repository {
 		await this.run(args);
 	}
 
+	async setBranchUpstream(name: string, upstream: string): Promise<void> {
+		const args = ['branch', '--set-upstream-to', upstream, name];
+		await this.run(args);
+	}
+
+	async deleteRef(ref: string): Promise<void> {
+		const args = ['update-ref', '-d', ref];
+		await this.run(args);
+	}
+
 	async merge(ref: string): Promise<void> {
 		const args = ['merge', ref];
 
@@ -1006,7 +1117,27 @@ export class Repository {
 		}
 	}
 
-	async fetch(): Promise<void> {
+	async addRemote(name: string, url: string): Promise<void> {
+		const args = ['remote', 'add', name, url];
+		await this.run(args);
+	}
+
+	async removeRemote(name: string): Promise<void> {
+		const args = ['remote', 'rm', name];
+		await this.run(args);
+	}
+
+	async fetch(remote?: string, ref?: string): Promise<void> {
+		const args = ['fetch'];
+
+		if (remote) {
+			args.push(remote);
+
+			if (ref) {
+				args.push(ref);
+			}
+		}
+
 		try {
 			await this.run(['fetch']);
 		} catch (err) {
@@ -1229,7 +1360,7 @@ export class Repository {
 	async getRemotes(): Promise<Remote[]> {
 		const result = await this.run(['remote', '--verbose']);
 		const lines = result.stdout.trim().split('\n').filter(l => !!l);
-		const remotes: Remote[] = [];
+		const remotes: MutableRemote[] = [];
 
 		for (const line of lines) {
 			const parts = line.split(/\s/);
@@ -1328,14 +1459,8 @@ export class Repository {
 	}
 
 	async getCommit(ref: string): Promise<Commit> {
-		const result = await this.run(['show', '-s', '--format=%H\n%B', ref]);
-		const match = /^([0-9a-f]{40})\n([^]*)$/m.exec(result.stdout.trim());
-
-		if (!match) {
-			return Promise.reject<Commit>('bad commit format');
-		}
-
-		return { hash: match[1], message: match[2] };
+		const result = await this.run(['show', '-s', '--format=%H\n%P\n%B', ref]);
+		return parseGitCommit(result.stdout) || Promise.reject<Commit>('bad commit format');
 	}
 
 	async updateSubmodules(paths: string[]): Promise<void> {
diff --git a/extensions/git/src/iterators.ts b/extensions/git/src/iterators.ts
deleted file mode 100644
index 3b0f741f310..00000000000
--- a/extensions/git/src/iterators.ts
+++ /dev/null
@@ -1,57 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-'use strict';
-
-function* filter<T>(it: IterableIterator<T>, condition: (t: T, i: number) => boolean): IterableIterator<T> {
-	let i = 0;
-	for (let t of it) {
-		if (condition(t, i++)) {
-			yield t;
-		}
-	}
-}
-
-function* map<T, R>(it: IterableIterator<T>, fn: (t: T, i: number) => R): IterableIterator<R> {
-	let i = 0;
-	for (let t of it) {
-		yield fn(t, i++);
-	}
-}
-
-export interface FunctionalIterator<T> extends Iterable<T> {
-	filter(condition: (t: T, i: number) => boolean): FunctionalIterator<T>;
-	map<R>(fn: (t: T, i: number) => R): FunctionalIterator<R>;
-	toArray(): T[];
-}
-
-class FunctionalIteratorImpl<T> implements FunctionalIterator<T> {
-
-	constructor(private iterator: IterableIterator<T>) { }
-
-	filter(condition: (t: T, i: number) => boolean): FunctionalIterator<T> {
-		return new FunctionalIteratorImpl(filter(this.iterator, condition));
-	}
-
-	map<R>(fn: (t: T, i: number) => R): FunctionalIterator<R> {
-		return new FunctionalIteratorImpl(map<T, R>(this.iterator, fn));
-	}
-
-	toArray(): T[] {
-		return Array.from(this.iterator);
-	}
-
-	[Symbol.iterator](): IterableIterator<T> {
-		return this.iterator;
-	}
-}
-
-export function iterate<T>(obj: T[] | IterableIterator<T>): FunctionalIterator<T> {
-	if (Array.isArray(obj)) {
-		return new FunctionalIteratorImpl(obj[Symbol.iterator]());
-	}
-
-	return new FunctionalIteratorImpl(obj);
-}
\ No newline at end of file
diff --git a/extensions/git/src/main.ts b/extensions/git/src/main.ts
index fa155966bbf..4ceaf8e5fb1 100644
--- a/extensions/git/src/main.ts
+++ b/extensions/git/src/main.ts
@@ -7,7 +7,8 @@
 
 import * as nls from 'vscode-nls';
 const localize = nls.loadMessageBundle();
-import { ExtensionContext, workspace, window, Disposable, commands, Uri, OutputChannel } from 'vscode';
+
+import { ExtensionContext, workspace, window, Disposable, commands, Uri, OutputChannel, WorkspaceFolder } from 'vscode';
 import { findGit, Git, IGit } from './git';
 import { Model } from './model';
 import { CommandCenter } from './commands';
@@ -16,12 +17,21 @@ import { GitDecorations } from './decorationProvider';
 import { Askpass } from './askpass';
 import { toDisposable, filterEvent, eventToPromise } from './util';
 import TelemetryReporter from 'vscode-extension-telemetry';
-import { API, createApi } from './api';
+import { GitExtension } from './api/git';
 import { GitProtocolHandler } from './protocolHandler';
+import { createGitExtension } from './api/extension';
+import * as path from 'path';
+import * as fs from 'fs';
 
-let telemetryReporter: TelemetryReporter;
+const deactivateTasks: { (): Promise<any>; }[] = [];
 
-async function init(context: ExtensionContext, outputChannel: OutputChannel, disposables: Disposable[]): Promise<Model> {
+export async function deactivate(): Promise<any> {
+	for (const task of deactivateTasks) {
+		await task();
+	}
+}
+
+async function createModel(context: ExtensionContext, outputChannel: OutputChannel, telemetryReporter: TelemetryReporter, disposables: Disposable[]): Promise<Model> {
 	const pathHint = workspace.getConfiguration('git').get<string>('path');
 	const info = await findGit(pathHint, path => outputChannel.appendLine(localize('looking', "Looking for git in: {0}", path)));
 	const askpass = new Askpass();
@@ -63,75 +73,92 @@ async function init(context: ExtensionContext, outputChannel: OutputChannel, dis
 	return model;
 }
 
-async function _activate(context: ExtensionContext, disposables: Disposable[]): Promise<Model | undefined> {
+async function isGitRepository(folder: WorkspaceFolder): Promise<boolean> {
+	if (folder.uri.scheme !== 'file') {
+		return false;
+	}
+
+	const dotGit = path.join(folder.uri.fsPath, '.git');
+
+	try {
+		const dotGitStat = await new Promise<fs.Stats>((c, e) => fs.stat(dotGit, (err, stat) => err ? e(err) : c(stat)));
+		return dotGitStat.isDirectory();
+	} catch (err) {
+		return false;
+	}
+}
+
+async function warnAboutMissingGit(): Promise<void> {
+	const config = workspace.getConfiguration('git');
+	const shouldIgnore = config.get<boolean>('ignoreMissingGitWarning') === true;
+
+	if (shouldIgnore) {
+		return;
+	}
+
+	if (!workspace.workspaceFolders) {
+		return;
+	}
+
+	const areGitRepositories = await Promise.all(workspace.workspaceFolders.map(isGitRepository));
+
+	if (areGitRepositories.every(isGitRepository => !isGitRepository)) {
+		return;
+	}
+
+	const download = localize('downloadgit', "Download Git");
+	const neverShowAgain = localize('neverShowAgain', "Don't Show Again");
+	const choice = await window.showWarningMessage(
+		localize('notfound', "Git not found. Install it or configure it using the 'git.path' setting."),
+		download,
+		neverShowAgain
+	);
+
+	if (choice === download) {
+		commands.executeCommand('vscode.open', Uri.parse('https://git-scm.com/'));
+	} else if (choice === neverShowAgain) {
+		await config.update('ignoreMissingGitWarning', true, true);
+	}
+}
+
+export async function activate(context: ExtensionContext): Promise<GitExtension> {
+	const disposables: Disposable[] = [];
+	context.subscriptions.push(new Disposable(() => Disposable.from(...disposables).dispose()));
+
 	const outputChannel = window.createOutputChannel('Git');
 	commands.registerCommand('git.showOutput', () => outputChannel.show());
 	disposables.push(outputChannel);
 
+	const { name, version, aiKey } = require('../package.json') as { name: string, version: string, aiKey: string };
+	const telemetryReporter = new TelemetryReporter(name, version, aiKey);
+	deactivateTasks.push(() => telemetryReporter.dispose());
+
+	const config = workspace.getConfiguration('git', null);
+	const enabled = config.get<boolean>('enabled');
+
+	if (!enabled) {
+		const onConfigChange = filterEvent(workspace.onDidChangeConfiguration, e => e.affectsConfiguration('git'));
+		const onEnabled = filterEvent(onConfigChange, () => workspace.getConfiguration('git', null).get<boolean>('enabled') === true);
+		await eventToPromise(onEnabled);
+	}
+
 	try {
-		return await init(context, outputChannel, disposables);
+		const model = await createModel(context, outputChannel, telemetryReporter, disposables);
+		return createGitExtension(model);
 	} catch (err) {
 		if (!/Git installation not found/.test(err.message || '')) {
 			throw err;
 		}
 
-		const config = workspace.getConfiguration('git');
-		const shouldIgnore = config.get<boolean>('ignoreMissingGitWarning') === true;
-
-		if (shouldIgnore) {
-			return;
-		}
-
 		console.warn(err.message);
 		outputChannel.appendLine(err.message);
-		outputChannel.show();
 
-		const download = localize('downloadgit', "Download Git");
-		const neverShowAgain = localize('neverShowAgain', "Don't Show Again");
-		const choice = await window.showWarningMessage(
-			localize('notfound', "Git not found. Install it or configure it using the 'git.path' setting."),
-			download,
-			neverShowAgain
-		);
+		await warnAboutMissingGit();
 
-		if (choice === download) {
-			commands.executeCommand('vscode.open', Uri.parse('https://git-scm.com/'));
-		} else if (choice === neverShowAgain) {
-			await config.update('ignoreMissingGitWarning', true, true);
-		}
+		return createGitExtension();
 	}
 }
 
-export function activate(context: ExtensionContext): API {
-	const config = workspace.getConfiguration('git', null);
-	const enabled = config.get<boolean>('enabled');
-
-	const disposables: Disposable[] = [];
-	context.subscriptions.push(new Disposable(() => Disposable.from(...disposables).dispose()));
-
-	const { name, version, aiKey } = require(context.asAbsolutePath('./package.json')) as { name: string, version: string, aiKey: string };
-	telemetryReporter = new TelemetryReporter(name, version, aiKey);
-
-	let activatePromise: Promise<Model | undefined>;
-
-	if (enabled) {
-		activatePromise = _activate(context, disposables);
-	} else {
-		const onConfigChange = filterEvent(workspace.onDidChangeConfiguration, e => e.affectsConfiguration('git'));
-		const onEnabled = filterEvent(onConfigChange, () => workspace.getConfiguration('git', null).get<boolean>('enabled') === true);
-
-		activatePromise = eventToPromise(onEnabled)
-			.then(() => _activate(context, disposables));
-	}
-
-	const modelPromise = activatePromise
-		.then(model => model || Promise.reject<Model>('Git model not found'));
-
-	activatePromise.catch(err => console.error(err));
-
-	return createApi(modelPromise);
-}
-
 async function checkGitVersion(info: IGit): Promise<void> {
 	const config = workspace.getConfiguration('git');
 	const shouldIgnore = config.get<boolean>('ignoreLegacyWarning') === true;
@@ -159,7 +186,3 @@ async function checkGitVersion(info: IGit): Promise<void> {
 		await config.update('ignoreLegacyWarning', true, true);
 	}
 }
-
-export function deactivate(): Promise<any> {
-	return telemetryReporter ? telemetryReporter.dispose() : Promise.resolve(null);
-}
diff --git a/extensions/git/src/model.ts b/extensions/git/src/model.ts
index 65036c93a7b..42011b06c65 100644
--- a/extensions/git/src/model.ts
+++ b/extensions/git/src/model.ts
@@ -9,11 +9,12 @@ import { workspace, WorkspaceFoldersChangeEvent, Uri, window, Event, EventEmitte
 import { Repository, RepositoryState } from './repository';
 import { memoize, sequentialize, debounce } from './decorators';
 import { dispose, anyEvent, filterEvent, isDescendant, firstIndex } from './util';
-import { Git, GitErrorCodes } from './git';
+import { Git } from './git';
 import * as path from 'path';
 import * as fs from 'fs';
 import * as nls from 'vscode-nls';
 import { fromGitUri } from './uri';
+import { GitErrorCodes } from './api/git';
 
 const localize = nls.loadMessageBundle();
 
@@ -91,6 +92,13 @@ export class Model {
 	 * for git repositories.
 	 */
 	private async scanWorkspaceFolders(): Promise<void> {
+		const config = workspace.getConfiguration('git');
+		const autoRepositoryDetection = config.get<boolean | 'subFolders' | 'openEditors'>('autoRepositoryDetection');
+
+		if (autoRepositoryDetection !== true && autoRepositoryDetection !== 'subFolders') {
+			return;
+		}
+
 		for (const folder of workspace.workspaceFolders || []) {
 			const root = folder.uri.fsPath;
 
@@ -99,7 +107,7 @@ export class Model {
 
 				children
 					.filter(child => child !== '.git')
-					.forEach(child => this.tryOpenRepository(path.join(root, child)));
+					.forEach(child => this.openRepository(path.join(root, child)));
 			} catch (err) {
 				// noop
 			}
@@ -118,7 +126,7 @@ export class Model {
 	@debounce(500)
 	private eventuallyScanPossibleGitRepositories(): void {
 		for (const path of this.possibleGitRepositoryPaths) {
-			this.tryOpenRepository(path);
+			this.openRepository(path);
 		}
 
 		this.possibleGitRepositoryPaths.clear();
@@ -139,7 +147,7 @@ export class Model {
 			.filter(r => !activeRepositories.has(r!.repository))
 			.filter(r => !(workspace.workspaceFolders || []).some(f => isDescendant(f.uri.fsPath, r!.repository.root))) as OpenRepository[];
 
-		possibleRepositoryFolders.forEach(p => this.tryOpenRepository(p.uri.fsPath));
+		possibleRepositoryFolders.forEach(p => this.openRepository(p.uri.fsPath));
 		openRepositoriesToDispose.forEach(r => r.dispose());
 	}
 
@@ -153,15 +161,15 @@ export class Model {
 			.filter(({ root }) => workspace.getConfiguration('git', root).get<boolean>('enabled') !== true)
 			.map(({ repository }) => repository);
 
-		possibleRepositoryFolders.forEach(p => this.tryOpenRepository(p.uri.fsPath));
+		possibleRepositoryFolders.forEach(p => this.openRepository(p.uri.fsPath));
 		openRepositoriesToDispose.forEach(r => r.dispose());
 	}
 
 	private onDidChangeVisibleTextEditors(editors: TextEditor[]): void {
 		const config = workspace.getConfiguration('git');
-		const enabled = config.get<boolean>('autoRepositoryDetection') === true;
+		const autoRepositoryDetection = config.get<boolean | 'subFolders' | 'openEditors'>('autoRepositoryDetection');
 
-		if (!enabled) {
+		if (autoRepositoryDetection !== true && autoRepositoryDetection !== 'openEditors') {
 			return;
 		}
 
@@ -178,12 +186,12 @@ export class Model {
 				return;
 			}
 
-			this.tryOpenRepository(path.dirname(uri.fsPath));
+			this.openRepository(path.dirname(uri.fsPath));
 		});
 	}
 
 	@sequentialize
-	async tryOpenRepository(path: string): Promise<void> {
+	async openRepository(path: string): Promise<void> {
 		if (this.getRepository(path)) {
 			return;
 		}
@@ -207,6 +215,13 @@ export class Model {
 				return;
 			}
 
+			const config = workspace.getConfiguration('git');
+			const ignoredRepos = new Set(config.get<Array<string>>('ignoredRepositories'));
+
+			if (ignoredRepos.has(rawRoot)) {
+				return;
+			}
+
 			const repository = new Repository(this.git.open(repositoryRoot), this.globalState);
 
 			this.open(repository);
diff --git a/extensions/git/src/protocolHandler.ts b/extensions/git/src/protocolHandler.ts
index b84d6620068..422ca3df739 100644
--- a/extensions/git/src/protocolHandler.ts
+++ b/extensions/git/src/protocolHandler.ts
@@ -5,16 +5,16 @@
 
 'use strict';
 
-import { ProtocolHandler, Uri, window, Disposable, commands } from 'vscode';
+import { UriHandler, Uri, window, Disposable, commands } from 'vscode';
 import { dispose } from './util';
 import * as querystring from 'querystring';
 
-export class GitProtocolHandler implements ProtocolHandler {
+export class GitProtocolHandler implements UriHandler {
 
 	private disposables: Disposable[] = [];
 
 	constructor() {
-		this.disposables.push(window.registerProtocolHandler(this));
+		this.disposables.push(window.registerUriHandler(this));
 	}
 
 	handleUri(uri: Uri): void {
diff --git a/extensions/git/src/repository.ts b/extensions/git/src/repository.ts
index 5c5fd6814a3..168384c0979 100644
--- a/extensions/git/src/repository.ts
+++ b/extensions/git/src/repository.ts
@@ -6,7 +6,7 @@
 'use strict';
 
 import { commands, Uri, Command, EventEmitter, Event, scm, SourceControl, SourceControlInputBox, SourceControlResourceGroup, SourceControlResourceState, SourceControlResourceDecorations, SourceControlInputBoxValidation, Disposable, ProgressLocation, window, workspace, WorkspaceEdit, ThemeColor, DecorationData, Memento, SourceControlInputBoxValidationType } from 'vscode';
-import { Repository as BaseRepository, Ref, Branch, Remote, Commit, GitErrorCodes, Stash, RefType, GitError, Submodule, DiffOptions } from './git';
+import { Repository as BaseRepository, Commit, Stash, GitError, Submodule } from './git';
 import { anyEvent, filterEvent, eventToPromise, dispose, find, isDescendant, IDisposable, onceEvent, EmptyDisposable, debounceEvent } from './util';
 import { memoize, throttle, debounce } from './decorators';
 import { toGitUri } from './uri';
@@ -15,6 +15,7 @@ import * as path from 'path';
 import * as nls from 'vscode-nls';
 import * as fs from 'fs';
 import { StatusBarCommands } from './statusbar';
+import { Branch, Ref, Remote, RefType, GitErrorCodes } from './api/git';
 
 const timeout = (millis: number) => new Promise(c => setTimeout(c, millis));
 
@@ -25,12 +26,12 @@ function getIconUri(iconName: string, theme: string): Uri {
 	return Uri.file(path.join(iconsRootPath, theme, `${iconName}.svg`));
 }
 
-export enum RepositoryState {
+export const enum RepositoryState {
 	Idle,
 	Disposed
 }
 
-export enum Status {
+export const enum Status {
 	INDEX_MODIFIED,
 	INDEX_ADDED,
 	INDEX_DELETED,
@@ -51,7 +52,7 @@ export enum Status {
 	BOTH_MODIFIED
 }
 
-export enum ResourceGroupType {
+export const enum ResourceGroupType {
 	Merge,
 	Index,
 	WorkingTree
@@ -259,10 +260,10 @@ export class Resource implements SourceControlResourceState {
 
 	get resourceDecoration(): DecorationData {
 		const title = this.tooltip;
-		const abbreviation = this.letter;
+		const letter = this.letter;
 		const color = this.color;
 		const priority = this.priority;
-		return { bubble: true, source: 'git.resource', title, abbreviation, color, priority };
+		return { bubble: true, source: 'git.resource', title, letter, color, priority };
 	}
 
 	constructor(
@@ -274,16 +275,22 @@ export class Resource implements SourceControlResourceState {
 	) { }
 }
 
-export enum Operation {
+export const enum Operation {
 	Status = 'Status',
+	Config = 'Config',
 	Diff = 'Diff',
+	MergeBase = 'MergeBase',
 	Add = 'Add',
 	RevertFiles = 'RevertFiles',
 	Commit = 'Commit',
 	Clean = 'Clean',
 	Branch = 'Branch',
+	GetBranch = 'GetBranch',
+	SetBranchUpstream = 'SetBranchUpstream',
+	HashObject = 'HashObject',
 	Checkout = 'Checkout',
 	Reset = 'Reset',
+	Remote = 'Remote',
 	Fetch = 'Fetch',
 	Pull = 'Pull',
 	Push = 'Push',
@@ -293,13 +300,15 @@ export enum Operation {
 	GetCommitTemplate = 'GetCommitTemplate',
 	DeleteBranch = 'DeleteBranch',
 	RenameBranch = 'RenameBranch',
+	DeleteRef = 'DeleteRef',
 	Merge = 'Merge',
 	Ignore = 'Ignore',
 	Tag = 'Tag',
 	Stash = 'Stash',
 	CheckIgnore = 'CheckIgnore',
-	LSTree = 'LSTree',
-	SubmoduleUpdate = 'SubmoduleUpdate'
+	GetObjectDetails = 'GetObjectDetails',
+	SubmoduleUpdate = 'SubmoduleUpdate',
+	RebaseContinue = 'RebaseContinue',
 }
 
 function isReadOnly(operation: Operation): boolean {
@@ -307,7 +316,8 @@ function isReadOnly(operation: Operation): boolean {
 		case Operation.Show:
 		case Operation.GetCommitTemplate:
 		case Operation.CheckIgnore:
-		case Operation.LSTree:
+		case Operation.GetObjectDetails:
+		case Operation.MergeBase:
 			return true;
 		default:
 			return false;
@@ -318,7 +328,7 @@ function shouldShowProgress(operation: Operation): boolean {
 	switch (operation) {
 		case Operation.Fetch:
 		case Operation.CheckIgnore:
-		case Operation.LSTree:
+		case Operation.GetObjectDetails:
 		case Operation.Show:
 			return false;
 		default:
@@ -479,6 +489,22 @@ export class Repository implements Disposable {
 		return this._submodules;
 	}
 
+	private _rebaseCommit: Commit | undefined = undefined;
+
+	set rebaseCommit(rebaseCommit: Commit | undefined) {
+		if (this._rebaseCommit && !rebaseCommit) {
+			this.inputBox.value = '';
+		} else if (rebaseCommit && (!this._rebaseCommit || this._rebaseCommit.hash !== rebaseCommit.hash)) {
+			this.inputBox.value = rebaseCommit.message;
+		}
+
+		this._rebaseCommit = rebaseCommit;
+	}
+
+	get rebaseCommit(): Commit | undefined {
+		return this._rebaseCommit;
+	}
+
 	private _operations = new OperationsImpl();
 	get operations(): Operations { return this._operations; }
 
@@ -512,9 +538,20 @@ export class Repository implements Disposable {
 		const fsWatcher = workspace.createFileSystemWatcher('**');
 		this.disposables.push(fsWatcher);
 
-		const onWorkspaceChange = anyEvent(fsWatcher.onDidChange, fsWatcher.onDidCreate, fsWatcher.onDidDelete);
-		const onRepositoryChange = filterEvent(onWorkspaceChange, uri => isDescendant(repository.root, uri.fsPath));
-		const onRelevantRepositoryChange = filterEvent(onRepositoryChange, uri => !/\/\.git(\/index\.lock)?$/.test(uri.path));
+		const workspaceFilter = (uri: Uri) => isDescendant(repository.root, uri.fsPath);
+		const onWorkspaceDelete = filterEvent(fsWatcher.onDidDelete, workspaceFilter);
+		const onWorkspaceChange = filterEvent(anyEvent(fsWatcher.onDidChange, fsWatcher.onDidCreate), workspaceFilter);
+		const onRepositoryDotGitDelete = filterEvent(onWorkspaceDelete, uri => /\/\.git$/.test(uri.path));
+		const onRepositoryChange = anyEvent(onWorkspaceDelete, onWorkspaceChange);
+
+		// relevant repository changes are:
+		//  - DELETE .git folder
+		//  - ANY CHANGE within .git folder except .git itself and .git/index.lock
+		const onRelevantRepositoryChange = anyEvent(
+			onRepositoryDotGitDelete,
+			filterEvent(onRepositoryChange, uri => !/\/\.git(\/index\.lock)?$/.test(uri.path))
+		);
+
 		onRelevantRepositoryChange(this.onFSChange, this, this.disposables);
 
 		const onRelevantGitChange = filterEvent(onRelevantRepositoryChange, uri => /\/\.git\//.test(uri.path));
@@ -540,6 +577,16 @@ export class Repository implements Disposable {
 
 		this.disposables.push(new AutoFetcher(this, globalState));
 
+		// https://github.com/Microsoft/vscode/issues/39039
+		const onSuccessfulPush = filterEvent(this.onDidRunOperation, e => e.operation === Operation.Push && !e.error);
+		onSuccessfulPush(() => {
+			const gitConfig = workspace.getConfiguration('git');
+
+			if (gitConfig.get<boolean>('showPushSuccessNotification')) {
+				window.showInformationMessage(localize('push success', "Successfully pushed."));
+			}
+		}, null, this.disposables);
+
 		const statusBar = new StatusBarCommands(this);
 		this.disposables.push(statusBar);
 		statusBar.onDidChange(() => this._sourceControl.statusBarCommands = statusBar.commands, null, this.disposables);
@@ -553,6 +600,15 @@ export class Repository implements Disposable {
 	}
 
 	validateInput(text: string, position: number): SourceControlInputBoxValidation | undefined {
+		if (this.rebaseCommit) {
+			if (this.rebaseCommit.message !== text) {
+				return {
+					message: localize('commit in rebase', "It's not possible to change the commit message in the middle of a rebase. Please complete the rebase operation and use interactive rebase instead."),
+					type: SourceControlInputBoxValidationType.Warning
+				};
+			}
+		}
+
 		const config = workspace.getConfiguration('git');
 		const setting = config.get<'always' | 'warn' | 'off'>('inputValidation');
 
@@ -612,13 +668,53 @@ export class Repository implements Disposable {
 		}
 	}
 
+	getConfigs(): Promise<{ key: string; value: string; }[]> {
+		return this.run(Operation.Config, () => this.repository.getConfigs('local'));
+	}
+
+	getConfig(key: string): Promise<string> {
+		return this.run(Operation.Config, () => this.repository.config('local', key));
+	}
+
+	setConfig(key: string, value: string): Promise<string> {
+		return this.run(Operation.Config, () => this.repository.config('local', key, value));
+	}
+
 	@throttle
 	async status(): Promise<void> {
 		await this.run(Operation.Status);
 	}
 
-	diff(path: string, options: DiffOptions = {}): Promise<string> {
-		return this.run(Operation.Diff, () => this.repository.diff(path, options));
+	diffWithHEAD(path: string): Promise<string> {
+		return this.run(Operation.Diff, () => this.repository.diffWithHEAD(path));
+	}
+
+	diffWith(ref: string, path: string): Promise<string> {
+		return this.run(Operation.Diff, () => this.repository.diffWith(ref, path));
+	}
+
+	diffIndexWithHEAD(path: string): Promise<string> {
+		return this.run(Operation.Diff, () => this.repository.diffIndexWithHEAD(path));
+	}
+
+	diffIndexWith(ref: string, path: string): Promise<string> {
+		return this.run(Operation.Diff, () => this.repository.diffIndexWith(ref, path));
+	}
+
+	diffBlobs(object1: string, object2: string): Promise<string> {
+		return this.run(Operation.Diff, () => this.repository.diffBlobs(object1, object2));
+	}
+
+	diffBetween(ref1: string, ref2: string, path: string): Promise<string> {
+		return this.run(Operation.Diff, () => this.repository.diffBetween(ref1, ref2, path));
+	}
+
+	getMergeBase(ref1: string, ref2: string): Promise<string> {
+		return this.run(Operation.MergeBase, () => this.repository.getMergeBase(ref1, ref2));
+	}
+
+	async hashObject(data: string): Promise<string> {
+		return this.run(Operation.HashObject, () => this.repository.hashObject(data));
 	}
 
 	async add(resources: Uri[]): Promise<void> {
@@ -636,13 +732,23 @@ export class Repository implements Disposable {
 	}
 
 	async commit(message: string, opts: CommitOptions = Object.create(null)): Promise<void> {
-		await this.run(Operation.Commit, async () => {
-			if (opts.all) {
-				await this.repository.add([]);
-			}
+		if (this.rebaseCommit) {
+			await this.run(Operation.RebaseContinue, async () => {
+				if (opts.all) {
+					await this.repository.add([]);
+				}
 
-			await this.repository.commit(message, opts);
-		});
+				await this.repository.rebaseContinue();
+			});
+		} else {
+			await this.run(Operation.Commit, async () => {
+				if (opts.all) {
+					await this.repository.add([]);
+				}
+
+				await this.repository.commit(message, opts);
+			});
+		}
 	}
 
 	async clean(resources: Uri[]): Promise<void> {
@@ -698,7 +804,7 @@ export class Repository implements Disposable {
 		});
 	}
 
-	async branch(name: string): Promise<void> {
+	async branch(name: string, checkout: boolean, ref?: string): Promise<void> {
 		await this.run(Operation.Branch, () => this.repository.branch(name, true));
 	}
 
@@ -710,6 +816,14 @@ export class Repository implements Disposable {
 		await this.run(Operation.RenameBranch, () => this.repository.renameBranch(name));
 	}
 
+	async getBranch(name: string): Promise<Branch> {
+		return await this.run(Operation.GetBranch, () => this.repository.getBranch(name));
+	}
+
+	async setBranchUpstream(name: string, upstream: string): Promise<void> {
+		await this.run(Operation.SetBranchUpstream, () => this.repository.setBranchUpstream(name, upstream));
+	}
+
 	async merge(ref: string): Promise<void> {
 		await this.run(Operation.Merge, () => this.repository.merge(ref));
 	}
@@ -730,8 +844,24 @@ export class Repository implements Disposable {
 		await this.run(Operation.Reset, () => this.repository.reset(treeish, hard));
 	}
 
+	async deleteRef(ref: string): Promise<void> {
+		await this.run(Operation.DeleteRef, () => this.repository.deleteRef(ref));
+	}
+
+	async addRemote(name: string, url: string): Promise<void> {
+		await this.run(Operation.Remote, () => this.repository.addRemote(name, url));
+	}
+
+	async removeRemote(name: string): Promise<void> {
+		await this.run(Operation.Remote, () => this.repository.removeRemote(name));
+	}
+
 	@throttle
-	async fetch(): Promise<void> {
+	async fetchDefault(): Promise<void> {
+		await this.run(Operation.Fetch, () => this.repository.fetch());
+	}
+
+	async fetch(remote?: string, ref?: string): Promise<void> {
 		await this.run(Operation.Fetch, () => this.repository.fetch());
 	}
 
@@ -749,7 +879,7 @@ export class Repository implements Disposable {
 	}
 
 	@throttle
-	async pull(head: Branch | undefined): Promise<void> {
+	async pull(head?: Branch): Promise<void> {
 		let remote: string | undefined;
 		let branch: string | undefined;
 
@@ -825,13 +955,22 @@ export class Repository implements Disposable {
 	}
 
 	async show(ref: string, filePath: string): Promise<string> {
-		return this.run(Operation.Show, () => {
+		return await this.run(Operation.Show, async () => {
 			const relativePath = path.relative(this.repository.root, filePath).replace(/\\/g, '/');
 			const configFiles = workspace.getConfiguration('files', Uri.file(filePath));
 			const defaultEncoding = configFiles.get<string>('encoding');
 			const autoGuessEncoding = configFiles.get<boolean>('autoGuessEncoding');
 
-			return this.repository.bufferString(`${ref}:${relativePath}`, defaultEncoding, autoGuessEncoding);
+			try {
+				return await this.repository.bufferString(`${ref}:${relativePath}`, defaultEncoding, autoGuessEncoding);
+			} catch (err) {
+				if (err.gitErrorCode === GitErrorCodes.WrongCase) {
+					const gitRelativePath = await this.repository.getGitRelativePath(ref, relativePath);
+					return await this.repository.bufferString(`${ref}:${gitRelativePath}`, defaultEncoding, autoGuessEncoding);
+				}
+
+				throw err;
+			}
 		});
 	}
 
@@ -842,8 +981,8 @@ export class Repository implements Disposable {
 		});
 	}
 
-	lstree(ref: string, filePath: string): Promise<{ mode: string, object: string, size: number }> {
-		return this.run(Operation.LSTree, () => this.repository.lstree(ref, filePath));
+	getObjectDetails(ref: string, filePath: string): Promise<{ mode: string, object: string, size: number }> {
+		return this.run(Operation.GetObjectDetails, () => this.repository.getObjectDetails(ref, filePath));
 	}
 
 	detectObjectType(object: string): Promise<{ mimetype: string, encoding?: string }> {
@@ -1025,12 +1164,13 @@ export class Repository implements Disposable {
 			// noop
 		}
 
-		const [refs, remotes, submodules] = await Promise.all([this.repository.getRefs(), this.repository.getRemotes(), this.repository.getSubmodules()]);
+		const [refs, remotes, submodules, rebaseCommit] = await Promise.all([this.repository.getRefs(), this.repository.getRemotes(), this.repository.getSubmodules(), this.getRebaseCommit()]);
 
 		this._HEAD = HEAD;
 		this._refs = refs;
 		this._remotes = remotes;
 		this._submodules = submodules;
+		this.rebaseCommit = rebaseCommit;
 
 		const index: Resource[] = [];
 		const workingTree: Resource[] = [];
@@ -1089,6 +1229,17 @@ export class Repository implements Disposable {
 		this._onDidChangeStatus.fire();
 	}
 
+	private async getRebaseCommit(): Promise<Commit | undefined> {
+		const rebaseHeadPath = path.join(this.repository.root, '.git', 'REBASE_HEAD');
+
+		try {
+			const rebaseHead = await new Promise<string>((c, e) => fs.readFile(rebaseHeadPath, 'utf8', (err, result) => err ? e(err) : c(result)));
+			return await this.getCommit(rebaseHead.trim());
+		} catch (err) {
+			return undefined;
+		}
+	}
+
 	private onFSChange(uri: Uri): void {
 		const config = workspace.getConfiguration('git');
 		const autorefresh = config.get<boolean>('autorefresh');
diff --git a/extensions/git/src/statusbar.ts b/extensions/git/src/statusbar.ts
index 8d093e29b21..8cabe51c016 100644
--- a/extensions/git/src/statusbar.ts
+++ b/extensions/git/src/statusbar.ts
@@ -6,10 +6,10 @@
 'use strict';
 
 import { Disposable, Command, EventEmitter, Event } from 'vscode';
-import { Branch } from './git';
 import { Repository, Operation } from './repository';
 import { anyEvent, dispose } from './util';
 import * as nls from 'vscode-nls';
+import { Branch } from './api/git';
 
 const localize = nls.loadMessageBundle();
 
@@ -24,7 +24,8 @@ class CheckoutStatusBar {
 	}
 
 	get command(): Command | undefined {
-		const title = `$(git-branch) ${this.repository.headLabel}`;
+		const rebasing = !!this.repository.rebaseCommit;
+		const title = `$(git-branch) ${this.repository.headLabel}${rebasing ? ` (${localize('rebasing', 'Rebasing')})` : ''}`;
 
 		return {
 			command: 'git.checkout',
@@ -71,10 +72,11 @@ class SyncStatusBar {
 	}
 
 	private onOperationsChange(): void {
-		this.state = {
-			...this.state,
-			isSyncRunning: this.repository.operations.isRunning(Operation.Sync)
-		};
+		const isSyncRunning = this.repository.operations.isRunning(Operation.Sync) ||
+			this.repository.operations.isRunning(Operation.Push) ||
+			this.repository.operations.isRunning(Operation.Pull);
+
+		this.state = { ...this.state, isSyncRunning };
 	}
 
 	private onModelChange(): void {
@@ -173,4 +175,4 @@ export class StatusBarCommands {
 		this.checkoutStatusBar.dispose();
 		this.disposables = dispose(this.disposables);
 	}
-}
\ No newline at end of file
+}
diff --git a/extensions/git/src/test/git.test.ts b/extensions/git/src/test/git.test.ts
index 09661eebc9c..eee43347351 100644
--- a/extensions/git/src/test/git.test.ts
+++ b/extensions/git/src/test/git.test.ts
@@ -6,7 +6,7 @@
 'use strict';
 
 import 'mocha';
-import { GitStatusParser, parseGitmodules } from '../git';
+import { GitStatusParser, parseGitCommit, parseGitmodules, parseLsTree, parseLsFiles } from '../git';
 import * as assert from 'assert';
 
 suite('git', () => {
@@ -175,4 +175,106 @@ suite('git', () => {
 			]);
 		});
 	});
+
+	suite('parseGitCommit', () => {
+		test('single parent commit', function () {
+			const GIT_OUTPUT_SINGLE_PARENT = `52c293a05038d865604c2284aa8698bd087915a1
+8e5a374372b8393906c7e380dbb09349c5385554
+This is a commit message.`;
+
+			assert.deepEqual(parseGitCommit(GIT_OUTPUT_SINGLE_PARENT), {
+				hash: '52c293a05038d865604c2284aa8698bd087915a1',
+				message: 'This is a commit message.',
+				parents: ['8e5a374372b8393906c7e380dbb09349c5385554']
+			});
+		});
+
+		test('multiple parent commits', function () {
+			const GIT_OUTPUT_MULTIPLE_PARENTS = `52c293a05038d865604c2284aa8698bd087915a1
+8e5a374372b8393906c7e380dbb09349c5385554 df27d8c75b129ab9b178b386077da2822101b217
+This is a commit message.`;
+
+			assert.deepEqual(parseGitCommit(GIT_OUTPUT_MULTIPLE_PARENTS), {
+				hash: '52c293a05038d865604c2284aa8698bd087915a1',
+				message: 'This is a commit message.',
+				parents: ['8e5a374372b8393906c7e380dbb09349c5385554', 'df27d8c75b129ab9b178b386077da2822101b217']
+			});
+		});
+
+		test('no parent commits', function () {
+			const GIT_OUTPUT_NO_PARENTS = `52c293a05038d865604c2284aa8698bd087915a1
+
+This is a commit message.`;
+
+			assert.deepEqual(parseGitCommit(GIT_OUTPUT_NO_PARENTS), {
+				hash: '52c293a05038d865604c2284aa8698bd087915a1',
+				message: 'This is a commit message.',
+				parents: []
+			});
+		});
+	});
+
+	suite('parseLsTree', function () {
+		test('sample', function () {
+			const input = `040000 tree 0274a81f8ee9ca3669295dc40f510bd2021d0043       -	.vscode
+100644 blob 1d487c1817262e4f20efbfa1d04c18f51b0046f6  491570	Screen Shot 2018-06-01 at 14.48.05.png
+100644 blob 686c16e4f019b734655a2576ce8b98749a9ffdb9  764420	Screen Shot 2018-06-07 at 20.04.59.png
+100644 blob 257cc5642cb1a054f08cc83f2d943e56fd3ebe99       4	boom.txt
+100644 blob 86dc360dd25f13fa50ffdc8259e9653921f4f2b7      11	boomcaboom.txt
+100644 blob a68b14060589b16d7ac75f67b905c918c03c06eb      24	file.js
+100644 blob f7bcfb05af46850d780f88c069edcd57481d822d     201	file.md
+100644 blob ab8b86114a051f6490f1ec5e3141b9a632fb46b5       8	hello.js
+100644 blob 257cc5642cb1a054f08cc83f2d943e56fd3ebe99       4	what.js
+100644 blob be859e3f412fa86513cd8bebe8189d1ea1a3e46d      24	what.txt
+100644 blob 56ec42c9dc6fcf4534788f0fe34b36e09f37d085  261186	what.txt2`;
+
+			const output = parseLsTree(input);
+
+			assert.deepEqual(output, [
+				{ mode: '040000', type: 'tree', object: '0274a81f8ee9ca3669295dc40f510bd2021d0043', size: '-', file: '.vscode' },
+				{ mode: '100644', type: 'blob', object: '1d487c1817262e4f20efbfa1d04c18f51b0046f6', size: '491570', file: 'Screen Shot 2018-06-01 at 14.48.05.png' },
+				{ mode: '100644', type: 'blob', object: '686c16e4f019b734655a2576ce8b98749a9ffdb9', size: '764420', file: 'Screen Shot 2018-06-07 at 20.04.59.png' },
+				{ mode: '100644', type: 'blob', object: '257cc5642cb1a054f08cc83f2d943e56fd3ebe99', size: '4', file: 'boom.txt' },
+				{ mode: '100644', type: 'blob', object: '86dc360dd25f13fa50ffdc8259e9653921f4f2b7', size: '11', file: 'boomcaboom.txt' },
+				{ mode: '100644', type: 'blob', object: 'a68b14060589b16d7ac75f67b905c918c03c06eb', size: '24', file: 'file.js' },
+				{ mode: '100644', type: 'blob', object: 'f7bcfb05af46850d780f88c069edcd57481d822d', size: '201', file: 'file.md' },
+				{ mode: '100644', type: 'blob', object: 'ab8b86114a051f6490f1ec5e3141b9a632fb46b5', size: '8', file: 'hello.js' },
+				{ mode: '100644', type: 'blob', object: '257cc5642cb1a054f08cc83f2d943e56fd3ebe99', size: '4', file: 'what.js' },
+				{ mode: '100644', type: 'blob', object: 'be859e3f412fa86513cd8bebe8189d1ea1a3e46d', size: '24', file: 'what.txt' },
+				{ mode: '100644', type: 'blob', object: '56ec42c9dc6fcf4534788f0fe34b36e09f37d085', size: '261186', file: 'what.txt2' }
+			]);
+		});
+	});
+
+	suite('parseLsFiles', function () {
+		test('sample', function () {
+			const input = `100644 7a73a41bfdf76d6f793007240d80983a52f15f97 0	.vscode/settings.json
+100644 1d487c1817262e4f20efbfa1d04c18f51b0046f6 0	Screen Shot 2018-06-01 at 14.48.05.png
+100644 686c16e4f019b734655a2576ce8b98749a9ffdb9 0	Screen Shot 2018-06-07 at 20.04.59.png
+100644 257cc5642cb1a054f08cc83f2d943e56fd3ebe99 0	boom.txt
+100644 86dc360dd25f13fa50ffdc8259e9653921f4f2b7 0	boomcaboom.txt
+100644 a68b14060589b16d7ac75f67b905c918c03c06eb 0	file.js
+100644 f7bcfb05af46850d780f88c069edcd57481d822d 0	file.md
+100644 ab8b86114a051f6490f1ec5e3141b9a632fb46b5 0	hello.js
+100644 257cc5642cb1a054f08cc83f2d943e56fd3ebe99 0	what.js
+100644 be859e3f412fa86513cd8bebe8189d1ea1a3e46d 0	what.txt
+100644 56ec42c9dc6fcf4534788f0fe34b36e09f37d085 0	what.txt2`;
+
+			const output = parseLsFiles(input);
+
+			assert.deepEqual(output, [
+				{ mode: '100644', object: '7a73a41bfdf76d6f793007240d80983a52f15f97', stage: '0', file: '.vscode/settings.json' },
+				{ mode: '100644', object: '1d487c1817262e4f20efbfa1d04c18f51b0046f6', stage: '0', file: 'Screen Shot 2018-06-01 at 14.48.05.png' },
+				{ mode: '100644', object: '686c16e4f019b734655a2576ce8b98749a9ffdb9', stage: '0', file: 'Screen Shot 2018-06-07 at 20.04.59.png' },
+				{ mode: '100644', object: '257cc5642cb1a054f08cc83f2d943e56fd3ebe99', stage: '0', file: 'boom.txt' },
+				{ mode: '100644', object: '86dc360dd25f13fa50ffdc8259e9653921f4f2b7', stage: '0', file: 'boomcaboom.txt' },
+				{ mode: '100644', object: 'a68b14060589b16d7ac75f67b905c918c03c06eb', stage: '0', file: 'file.js' },
+				{ mode: '100644', object: 'f7bcfb05af46850d780f88c069edcd57481d822d', stage: '0', file: 'file.md' },
+				{ mode: '100644', object: 'ab8b86114a051f6490f1ec5e3141b9a632fb46b5', stage: '0', file: 'hello.js' },
+				{ mode: '100644', object: '257cc5642cb1a054f08cc83f2d943e56fd3ebe99', stage: '0', file: 'what.js' },
+				{ mode: '100644', object: 'be859e3f412fa86513cd8bebe8189d1ea1a3e46d', stage: '0', file: 'what.txt' },
+				{ mode: '100644', object: '56ec42c9dc6fcf4534788f0fe34b36e09f37d085', stage: '0', file: 'what.txt2' },
+			]);
+		});
+	});
 });
\ No newline at end of file
diff --git a/extensions/git/src/typings/jschardet.d.ts b/extensions/git/src/typings/jschardet.d.ts
index 9c553b129eb..f252a47fd09 100644
--- a/extensions/git/src/typings/jschardet.d.ts
+++ b/extensions/git/src/typings/jschardet.d.ts
@@ -3,7 +3,7 @@ declare module 'jschardet' {
 		encoding: string,
 		confidence: number
 	}
-	export function detect(buffer: NodeBuffer): IDetectedMap;
+	export function detect(buffer: Buffer): IDetectedMap;
 
 	export const Constants: {
 		MINIMUM_THRESHOLD: number,
diff --git a/extensions/git/src/util.ts b/extensions/git/src/util.ts
index c65b56a3686..78a28ff6ec2 100644
--- a/extensions/git/src/util.ts
+++ b/extensions/git/src/util.ts
@@ -268,7 +268,7 @@ export function readBytes(stream: Readable, bytes: number): Promise<Buffer> {
 	});
 }
 
-export enum Encoding {
+export const enum Encoding {
 	UTF8 = 'utf8',
 	UTF16be = 'utf16be',
 	UTF16le = 'utf16le'
diff --git a/extensions/git/syntaxes/git-rebase.tmLanguage.json b/extensions/git/syntaxes/git-rebase.tmLanguage.json
index 3ee481bede1..a2c116bd09b 100644
--- a/extensions/git/syntaxes/git-rebase.tmLanguage.json
+++ b/extensions/git/syntaxes/git-rebase.tmLanguage.json
@@ -4,7 +4,7 @@
 		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
 		"Once accepted there, we are happy to receive an update request."
 	],
-	"version": "https://github.com/textmate/git.tmbundle/commit/d1db42c2d71948662098183a6df519fb53a7a15b",
+	"version": "https://github.com/textmate/git.tmbundle/commit/3f6ad2138200db14b57a090ecb2d2e733275ca3e",
 	"name": "Git Rebase Message",
 	"scopeName": "text.git-rebase",
 	"patterns": [
@@ -29,7 +29,23 @@
 					"name": "meta.commit-message.git-rebase"
 				}
 			},
-			"match": "^\\s*(pick|p|reword|r|edit|e|squash|s|fixup|f|exec|x|drop|d)\\s+([0-9a-f]+)\\s+(.*)$",
+			"match": "^\\s*(pick|p|reword|r|edit|e|squash|s|fixup|f|drop|d)\\s+([0-9a-f]+)\\s+(.*)$",
+			"name": "meta.commit-command.git-rebase"
+		},
+		{
+			"captures": {
+				"1": {
+					"name": "support.function.git-rebase"
+				},
+				"2": {
+					"patterns": [
+						{
+							"include": "source.shell"
+						}
+					]
+				}
+			},
+			"match": "^\\s*(exec|x)\\s+(.*)$",
 			"name": "meta.commit-command.git-rebase"
 		}
 	]
diff --git a/extensions/git/test/colorize-results/COMMIT_EDITMSG.json b/extensions/git/test/colorize-results/COMMIT_EDITMSG.json
index b5457404c8e..508e3ee199c 100644
--- a/extensions/git/test/colorize-results/COMMIT_EDITMSG.json
+++ b/extensions/git/test/colorize-results/COMMIT_EDITMSG.json
@@ -25,9 +25,9 @@
 		"c": "#",
 		"t": "text.git-commit meta.scope.metadata.git-commit comment.line.number-sign.git-commit punctuation.definition.comment.git-commit",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -36,9 +36,9 @@
 		"c": " Please enter the commit message for your changes. Lines starting",
 		"t": "text.git-commit meta.scope.metadata.git-commit comment.line.number-sign.git-commit",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -47,9 +47,9 @@
 		"c": "#",
 		"t": "text.git-commit meta.scope.metadata.git-commit comment.line.number-sign.git-commit punctuation.definition.comment.git-commit",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -58,9 +58,9 @@
 		"c": " with '#' will be ignored, and an empty message aborts the commit.",
 		"t": "text.git-commit meta.scope.metadata.git-commit comment.line.number-sign.git-commit",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -69,9 +69,9 @@
 		"c": "#",
 		"t": "text.git-commit meta.scope.metadata.git-commit comment.line.number-sign.git-commit punctuation.definition.comment.git-commit",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -80,9 +80,9 @@
 		"c": " On branch master",
 		"t": "text.git-commit meta.scope.metadata.git-commit comment.line.number-sign.git-commit",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -91,9 +91,9 @@
 		"c": "#",
 		"t": "text.git-commit meta.scope.metadata.git-commit comment.line.number-sign.git-commit punctuation.definition.comment.git-commit",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -102,9 +102,9 @@
 		"c": " Your branch is up-to-date with 'origin/master'.",
 		"t": "text.git-commit meta.scope.metadata.git-commit comment.line.number-sign.git-commit",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -113,9 +113,9 @@
 		"c": "#",
 		"t": "text.git-commit meta.scope.metadata.git-commit comment.line.number-sign.git-commit punctuation.definition.comment.git-commit",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -124,9 +124,9 @@
 		"c": "#",
 		"t": "text.git-commit meta.scope.metadata.git-commit comment.line.number-sign.git-commit punctuation.definition.comment.git-commit",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -135,9 +135,9 @@
 		"c": " Changes to be committed:",
 		"t": "text.git-commit meta.scope.metadata.git-commit comment.line.number-sign.git-commit",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -146,9 +146,9 @@
 		"c": "#",
 		"t": "text.git-commit meta.scope.metadata.git-commit comment.line.number-sign.git-commit punctuation.definition.comment.git-commit",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -157,9 +157,9 @@
 		"c": "\t",
 		"t": "text.git-commit meta.scope.metadata.git-commit comment.line.number-sign.git-commit",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -179,9 +179,9 @@
 		"c": "#",
 		"t": "text.git-commit meta.scope.metadata.git-commit comment.line.number-sign.git-commit punctuation.definition.comment.git-commit",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -190,9 +190,9 @@
 		"c": "\t",
 		"t": "text.git-commit meta.scope.metadata.git-commit comment.line.number-sign.git-commit",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -212,9 +212,9 @@
 		"c": "#",
 		"t": "text.git-commit meta.scope.metadata.git-commit comment.line.number-sign.git-commit punctuation.definition.comment.git-commit",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -223,9 +223,9 @@
 		"c": "\t",
 		"t": "text.git-commit meta.scope.metadata.git-commit comment.line.number-sign.git-commit",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -245,9 +245,9 @@
 		"c": "#",
 		"t": "text.git-commit meta.scope.metadata.git-commit comment.line.number-sign.git-commit punctuation.definition.comment.git-commit",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
diff --git a/extensions/git/test/colorize-results/git-rebase-todo.json b/extensions/git/test/colorize-results/git-rebase-todo.json
index 87781fdbe05..d21bab17094 100644
--- a/extensions/git/test/colorize-results/git-rebase-todo.json
+++ b/extensions/git/test/colorize-results/git-rebase-todo.json
@@ -388,9 +388,9 @@
 		"c": "#",
 		"t": "text.git-rebase comment.line.number-sign.git-rebase punctuation.definition.comment.git-rebase",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -399,9 +399,9 @@
 		"c": " Commands:",
 		"t": "text.git-rebase comment.line.number-sign.git-rebase",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -410,9 +410,9 @@
 		"c": "#",
 		"t": "text.git-rebase comment.line.number-sign.git-rebase punctuation.definition.comment.git-rebase",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -421,9 +421,9 @@
 		"c": "  p, pick = use commit",
 		"t": "text.git-rebase comment.line.number-sign.git-rebase",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -432,9 +432,9 @@
 		"c": "#",
 		"t": "text.git-rebase comment.line.number-sign.git-rebase punctuation.definition.comment.git-rebase",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -443,9 +443,9 @@
 		"c": "  r, reword = use commit, but edit the commit message",
 		"t": "text.git-rebase comment.line.number-sign.git-rebase",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -454,9 +454,9 @@
 		"c": "#",
 		"t": "text.git-rebase comment.line.number-sign.git-rebase punctuation.definition.comment.git-rebase",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -465,9 +465,9 @@
 		"c": "  e, edit = use commit, but stop for amending",
 		"t": "text.git-rebase comment.line.number-sign.git-rebase",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -476,9 +476,9 @@
 		"c": "#",
 		"t": "text.git-rebase comment.line.number-sign.git-rebase punctuation.definition.comment.git-rebase",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -487,9 +487,9 @@
 		"c": "  s, squash = use commit, but meld into previous commit",
 		"t": "text.git-rebase comment.line.number-sign.git-rebase",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -498,9 +498,9 @@
 		"c": "#",
 		"t": "text.git-rebase comment.line.number-sign.git-rebase punctuation.definition.comment.git-rebase",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -509,9 +509,9 @@
 		"c": "  f, fixup = like \"squash\", but discard this commit's log message",
 		"t": "text.git-rebase comment.line.number-sign.git-rebase",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -520,9 +520,9 @@
 		"c": "#",
 		"t": "text.git-rebase comment.line.number-sign.git-rebase punctuation.definition.comment.git-rebase",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -531,9 +531,9 @@
 		"c": "  x, exec = run command (the rest of the line) using shell",
 		"t": "text.git-rebase comment.line.number-sign.git-rebase",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
diff --git a/extensions/git/tsconfig.json b/extensions/git/tsconfig.json
index a7eca805f97..7477ea05a83 100644
--- a/extensions/git/tsconfig.json
+++ b/extensions/git/tsconfig.json
@@ -16,4 +16,4 @@
 	"include": [
 		"src/**/*"
 	]
-}
\ No newline at end of file
+}
diff --git a/extensions/git/yarn.lock b/extensions/git/yarn.lock
index 3fb8a6f087a..0a7fcbe6759 100644
--- a/extensions/git/yarn.lock
+++ b/extensions/git/yarn.lock
@@ -22,9 +22,9 @@
   version "8.0.51"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.51.tgz#b31d716fb8d58eeb95c068a039b9b6292817d5fb"
 
-"@types/node@7.0.43":
-  version "7.0.43"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.43.tgz#a187e08495a075f200ca946079c914e1a5fe962c"
+"@types/node@^8.10.25":
+  version "8.10.25"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-8.10.25.tgz#801fe4e39372cef18f268db880a5fbfcf71adc7e"
 
 "@types/which@^1.0.28":
   version "1.0.28"
@@ -257,15 +257,15 @@ supports-color@3.1.2:
   dependencies:
     has-flag "^1.0.0"
 
-vscode-extension-telemetry@0.0.17:
-  version "0.0.17"
-  resolved "https://registry.yarnpkg.com/vscode-extension-telemetry/-/vscode-extension-telemetry-0.0.17.tgz#15123e7edb34e7b9724b6056f54a869bbb922cb7"
+vscode-extension-telemetry@0.0.18:
+  version "0.0.18"
+  resolved "https://registry.yarnpkg.com/vscode-extension-telemetry/-/vscode-extension-telemetry-0.0.18.tgz#602ba20d8c71453aa34533a291e7638f6e5c0327"
   dependencies:
     applicationinsights "1.0.1"
 
-vscode-nls@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.1.tgz#b1f3e04e8a94a715d5a7bcbc8339c51e6d74ca51"
+vscode-nls@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-4.0.0.tgz#4001c8a6caba5cedb23a9c5ce1090395c0e44002"
 
 which@^1.3.0:
   version "1.3.0"
diff --git a/extensions/go/test/colorize-results/test-13777_go.json b/extensions/go/test/colorize-results/test-13777_go.json
index 7012da53227..ba7b1bd76fc 100644
--- a/extensions/go/test/colorize-results/test-13777_go.json
+++ b/extensions/go/test/colorize-results/test-13777_go.json
@@ -80,9 +80,9 @@
 		"c": "//",
 		"t": "source.go comment.line.double-slash.go punctuation.definition.comment.go",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -91,9 +91,9 @@
 		"c": " ( comments after var are now green )",
 		"t": "source.go comment.line.double-slash.go",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
diff --git a/extensions/go/test/colorize-results/test_go.json b/extensions/go/test/colorize-results/test_go.json
index 6916ec49cd2..14cd6ef4230 100644
--- a/extensions/go/test/colorize-results/test_go.json
+++ b/extensions/go/test/colorize-results/test_go.json
@@ -927,9 +927,9 @@
 		"c": "//",
 		"t": "source.go comment.line.double-slash.go punctuation.definition.comment.go",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -938,9 +938,9 @@
 		"c": " create virtual machine",
 		"t": "source.go comment.line.double-slash.go",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
diff --git a/extensions/groovy/test/colorize-results/test_groovy.json b/extensions/groovy/test/colorize-results/test_groovy.json
index 8d1191aa367..13aa74462a8 100644
--- a/extensions/groovy/test/colorize-results/test_groovy.json
+++ b/extensions/groovy/test/colorize-results/test_groovy.json
@@ -3,9 +3,9 @@
 		"c": "//",
 		"t": "source.groovy comment.line.double-slash.groovy punctuation.definition.comment.groovy",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -14,9 +14,9 @@
 		"c": " Hello World",
 		"t": "source.groovy comment.line.double-slash.groovy",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -80,9 +80,9 @@
 		"c": "/*",
 		"t": "source.groovy comment.block.groovy punctuation.definition.comment.groovy",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -91,9 +91,9 @@
 		"c": "  Variables:",
 		"t": "source.groovy comment.block.groovy",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -102,9 +102,9 @@
 		"c": "  You can assign values to variables for later use",
 		"t": "source.groovy comment.block.groovy",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -113,9 +113,9 @@
 		"c": "*/",
 		"t": "source.groovy comment.block.groovy punctuation.definition.comment.groovy",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -542,9 +542,9 @@
 		"c": "/*",
 		"t": "source.groovy comment.block.groovy punctuation.definition.comment.groovy",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -553,9 +553,9 @@
 		"c": "  Collections and maps",
 		"t": "source.groovy comment.block.groovy",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -564,9 +564,9 @@
 		"c": "*/",
 		"t": "source.groovy comment.block.groovy punctuation.definition.comment.groovy",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -575,9 +575,9 @@
 		"c": "//",
 		"t": "source.groovy comment.line.double-slash.groovy punctuation.definition.comment.groovy",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -586,9 +586,9 @@
 		"c": "Creating an empty list",
 		"t": "source.groovy comment.line.double-slash.groovy",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -685,9 +685,9 @@
 		"c": "/*",
 		"t": "source.groovy comment.block.groovy punctuation.definition.comment.groovy",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -696,9 +696,9 @@
 		"c": "** Adding a elements to the list **",
 		"t": "source.groovy comment.block.groovy",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -707,9 +707,9 @@
 		"c": "*/",
 		"t": "source.groovy comment.block.groovy punctuation.definition.comment.groovy",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -718,9 +718,9 @@
 		"c": "//",
 		"t": "source.groovy comment.line.double-slash.groovy punctuation.definition.comment.groovy",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -729,9 +729,9 @@
 		"c": " As with Java",
 		"t": "source.groovy comment.line.double-slash.groovy",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -828,9 +828,9 @@
 		"c": "//",
 		"t": "source.groovy comment.line.double-slash.groovy punctuation.definition.comment.groovy",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -839,9 +839,9 @@
 		"c": " Left shift adds, and returns the list",
 		"t": "source.groovy comment.line.double-slash.groovy",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -916,9 +916,9 @@
 		"c": "//",
 		"t": "source.groovy comment.line.double-slash.groovy punctuation.definition.comment.groovy",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -927,9 +927,9 @@
 		"c": " Add multiple elements",
 		"t": "source.groovy comment.line.double-slash.groovy",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -1092,9 +1092,9 @@
 		"c": "/*",
 		"t": "source.groovy comment.block.groovy punctuation.definition.comment.groovy",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -1103,9 +1103,9 @@
 		"c": "** Removing elements from the list **",
 		"t": "source.groovy comment.block.groovy",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -1114,9 +1114,9 @@
 		"c": "*/",
 		"t": "source.groovy comment.block.groovy punctuation.definition.comment.groovy",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -1125,9 +1125,9 @@
 		"c": "//",
 		"t": "source.groovy comment.line.double-slash.groovy punctuation.definition.comment.groovy",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -1136,9 +1136,9 @@
 		"c": " As with Java",
 		"t": "source.groovy comment.line.double-slash.groovy",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -1235,9 +1235,9 @@
 		"c": "//",
 		"t": "source.groovy comment.line.double-slash.groovy punctuation.definition.comment.groovy",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -1246,9 +1246,9 @@
 		"c": " Subtraction works also",
 		"t": "source.groovy comment.line.double-slash.groovy",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -1345,9 +1345,9 @@
 		"c": "/*",
 		"t": "source.groovy comment.block.groovy punctuation.definition.comment.groovy",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -1356,9 +1356,9 @@
 		"c": "** Iterating Lists **",
 		"t": "source.groovy comment.block.groovy",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -1367,9 +1367,9 @@
 		"c": "*/",
 		"t": "source.groovy comment.block.groovy punctuation.definition.comment.groovy",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -1378,9 +1378,9 @@
 		"c": "//",
 		"t": "source.groovy comment.line.double-slash.groovy punctuation.definition.comment.groovy",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -1389,9 +1389,9 @@
 		"c": " Iterate over elements of a list",
 		"t": "source.groovy comment.line.double-slash.groovy",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -1741,9 +1741,9 @@
 		"c": "/*",
 		"t": "source.groovy comment.block.groovy punctuation.definition.comment.groovy",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -1752,9 +1752,9 @@
 		"c": "** Checking List contents **",
 		"t": "source.groovy comment.block.groovy",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -1763,9 +1763,9 @@
 		"c": "*/",
 		"t": "source.groovy comment.block.groovy punctuation.definition.comment.groovy",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -1774,9 +1774,9 @@
 		"c": "//",
 		"t": "source.groovy comment.line.double-slash.groovy punctuation.definition.comment.groovy",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -1785,9 +1785,9 @@
 		"c": "Evaluate if a list contains element(s) (boolean)",
 		"t": "source.groovy comment.line.double-slash.groovy",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -1928,9 +1928,9 @@
 		"c": "//",
 		"t": "source.groovy comment.line.double-slash.groovy punctuation.definition.comment.groovy",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -1939,9 +1939,9 @@
 		"c": " Or",
 		"t": "source.groovy comment.line.double-slash.groovy",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -2049,9 +2049,9 @@
 		"c": "//",
 		"t": "source.groovy comment.line.double-slash.groovy punctuation.definition.comment.groovy",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -2060,9 +2060,9 @@
 		"c": " To sort without mutating original, you can do:",
 		"t": "source.groovy comment.line.double-slash.groovy",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -2181,9 +2181,9 @@
 		"c": "//",
 		"t": "source.groovy comment.line.double-slash.groovy punctuation.definition.comment.groovy",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -2192,9 +2192,9 @@
 		"c": "Replace all elements in the list",
 		"t": "source.groovy comment.line.double-slash.groovy",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -2379,9 +2379,9 @@
 		"c": "//",
 		"t": "source.groovy comment.line.double-slash.groovy punctuation.definition.comment.groovy",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -2390,9 +2390,9 @@
 		"c": "Shuffle a list",
 		"t": "source.groovy comment.line.double-slash.groovy",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -2533,9 +2533,9 @@
 		"c": "//",
 		"t": "source.groovy comment.line.double-slash.groovy punctuation.definition.comment.groovy",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -2544,9 +2544,9 @@
 		"c": "Clear a list",
 		"t": "source.groovy comment.line.double-slash.groovy",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -2610,9 +2610,9 @@
 		"c": "//",
 		"t": "source.groovy comment.line.double-slash.groovy punctuation.definition.comment.groovy",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -2621,9 +2621,9 @@
 		"c": "Creating an empty map",
 		"t": "source.groovy comment.line.double-slash.groovy",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -2731,9 +2731,9 @@
 		"c": "//",
 		"t": "source.groovy comment.line.double-slash.groovy punctuation.definition.comment.groovy",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -2742,9 +2742,9 @@
 		"c": "Add values",
 		"t": "source.groovy comment.line.double-slash.groovy",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -3215,9 +3215,9 @@
 		"c": "//",
 		"t": "source.groovy comment.line.double-slash.groovy punctuation.definition.comment.groovy",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -3226,9 +3226,9 @@
 		"c": "Iterate over elements of a map",
 		"t": "source.groovy comment.line.double-slash.groovy",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -3644,9 +3644,9 @@
 		"c": "//",
 		"t": "source.groovy comment.line.double-slash.groovy punctuation.definition.comment.groovy",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -3655,9 +3655,9 @@
 		"c": "Evaluate if a map contains a key",
 		"t": "source.groovy comment.line.double-slash.groovy",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -3765,9 +3765,9 @@
 		"c": "//",
 		"t": "source.groovy comment.line.double-slash.groovy punctuation.definition.comment.groovy",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -3776,9 +3776,9 @@
 		"c": "Get the keys of a map",
 		"t": "source.groovy comment.line.double-slash.groovy",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -3919,9 +3919,9 @@
 		"c": "//",
 		"t": "source.groovy meta.definition.class.groovy meta.class.body.groovy comment.line.double-slash.groovy punctuation.definition.comment.groovy",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -3930,9 +3930,9 @@
 		"c": " read only property",
 		"t": "source.groovy meta.definition.class.groovy meta.class.body.groovy comment.line.double-slash.groovy",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -4084,9 +4084,9 @@
 		"c": "//",
 		"t": "source.groovy meta.definition.class.groovy meta.class.body.groovy comment.line.double-slash.groovy punctuation.definition.comment.groovy",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -4095,9 +4095,9 @@
 		"c": " read only property with public getter and protected setter",
 		"t": "source.groovy meta.definition.class.groovy meta.class.body.groovy comment.line.double-slash.groovy",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -4370,9 +4370,9 @@
 		"c": "//",
 		"t": "source.groovy meta.definition.class.groovy meta.class.body.groovy comment.line.double-slash.groovy punctuation.definition.comment.groovy",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -4381,9 +4381,9 @@
 		"c": " dynamically typed property",
 		"t": "source.groovy meta.definition.class.groovy meta.class.body.groovy comment.line.double-slash.groovy",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -4447,9 +4447,9 @@
 		"c": "/*",
 		"t": "source.groovy comment.block.groovy punctuation.definition.comment.groovy",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -4458,9 +4458,9 @@
 		"c": "  Logical Branching and Looping",
 		"t": "source.groovy comment.block.groovy",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -4469,9 +4469,9 @@
 		"c": "*/",
 		"t": "source.groovy comment.block.groovy punctuation.definition.comment.groovy",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -4480,9 +4480,9 @@
 		"c": "//",
 		"t": "source.groovy comment.line.double-slash.groovy punctuation.definition.comment.groovy",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -4491,9 +4491,9 @@
 		"c": "Groovy supports the usual if - else syntax",
 		"t": "source.groovy comment.line.double-slash.groovy",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -4964,9 +4964,9 @@
 		"c": "//",
 		"t": "source.groovy comment.line.double-slash.groovy punctuation.definition.comment.groovy",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -4975,9 +4975,9 @@
 		"c": "Groovy also supports the ternary operator:",
 		"t": "source.groovy comment.line.double-slash.groovy",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -5371,9 +5371,9 @@
 		"c": "//",
 		"t": "source.groovy comment.line.double-slash.groovy punctuation.definition.comment.groovy",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -5382,9 +5382,9 @@
 		"c": "Groovy supports 'The Elvis Operator' too!",
 		"t": "source.groovy comment.line.double-slash.groovy",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -5393,9 +5393,9 @@
 		"c": "//",
 		"t": "source.groovy comment.line.double-slash.groovy punctuation.definition.comment.groovy",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -5404,9 +5404,9 @@
 		"c": "Instead of using the ternary operator:",
 		"t": "source.groovy comment.line.double-slash.groovy",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -5569,9 +5569,9 @@
 		"c": "//",
 		"t": "source.groovy comment.line.double-slash.groovy punctuation.definition.comment.groovy",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -5580,9 +5580,9 @@
 		"c": "We can write it:",
 		"t": "source.groovy comment.line.double-slash.groovy",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -5701,9 +5701,9 @@
 		"c": "//",
 		"t": "source.groovy comment.line.double-slash.groovy punctuation.definition.comment.groovy",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -5712,9 +5712,9 @@
 		"c": "For loop",
 		"t": "source.groovy comment.line.double-slash.groovy",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -5723,9 +5723,9 @@
 		"c": "//",
 		"t": "source.groovy comment.line.double-slash.groovy punctuation.definition.comment.groovy",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -5734,9 +5734,9 @@
 		"c": "Iterate over a range",
 		"t": "source.groovy comment.line.double-slash.groovy",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -5987,9 +5987,9 @@
 		"c": "//",
 		"t": "source.groovy comment.line.double-slash.groovy punctuation.definition.comment.groovy",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -5998,9 +5998,9 @@
 		"c": "Iterate over a list",
 		"t": "source.groovy comment.line.double-slash.groovy",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -6262,9 +6262,9 @@
 		"c": "//",
 		"t": "source.groovy comment.line.double-slash.groovy punctuation.definition.comment.groovy",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -6273,9 +6273,9 @@
 		"c": "Iterate over an array",
 		"t": "source.groovy comment.line.double-slash.groovy",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -6548,9 +6548,9 @@
 		"c": "//",
 		"t": "source.groovy comment.line.double-slash.groovy punctuation.definition.comment.groovy",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -6559,9 +6559,9 @@
 		"c": "Iterate over a map",
 		"t": "source.groovy comment.line.double-slash.groovy",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -7384,9 +7384,9 @@
 		"c": "//",
 		"t": "source.groovy comment.line.double-slash.groovy punctuation.definition.comment.groovy",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -7395,9 +7395,9 @@
 		"c": " = to technologies.collect { it?.toUpperCase() }",
 		"t": "source.groovy comment.line.double-slash.groovy",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -8682,9 +8682,9 @@
 		"c": "//",
 		"t": "source.groovy meta.definition.variable.groovy comment.line.double-slash.groovy punctuation.definition.comment.groovy",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -8693,9 +8693,9 @@
 		"c": " simulate some time consuming processing",
 		"t": "source.groovy meta.definition.variable.groovy comment.line.double-slash.groovy",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -9375,9 +9375,9 @@
 		"c": "//",
 		"t": "source.groovy comment.line.double-slash.groovy punctuation.definition.comment.groovy",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -9386,9 +9386,9 @@
 		"c": "Another example:",
 		"t": "source.groovy comment.line.double-slash.groovy",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -9980,9 +9980,9 @@
 		"c": "//",
 		"t": "source.groovy comment.line.double-slash.groovy punctuation.definition.comment.groovy",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -9991,9 +9991,9 @@
 		"c": "CompileStatic example:",
 		"t": "source.groovy comment.line.double-slash.groovy",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
diff --git a/extensions/grunt/README.md b/extensions/grunt/README.md
index 34132a02dbe..b97ff21b117 100644
--- a/extensions/grunt/README.md
+++ b/extensions/grunt/README.md
@@ -1,10 +1,13 @@
 # Grunt - The JavaScript Task Runner
 
-**Notice** This is a an extension that is bundled with Visual Studio Code.
+**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.
+
+## Features
 
 This extension supports running [Grunt](https://gruntjs.com/) tasks defined in a `gruntfile.js` file as [VS Code tasks](https://code.visualstudio.com/docs/editor/tasks). Grunt tasks with the name 'build', 'compile', or 'watch' are treated as build tasks.
 
-To run Grunt tasks use the `Tasks` menu.
+To run Grunt tasks, use the **Tasks** menu.
 
 ## Settings
-- `grunt.autoDetect` enable detecting tasks from `Gruntfile.js` files, the default is `on`.
+
+- `grunt.autoDetect` - Enable detecting tasks from `gruntfile.js` files, the default is `on`.
diff --git a/extensions/grunt/package.json b/extensions/grunt/package.json
index 182fe384325..dc2520b4982 100644
--- a/extensions/grunt/package.json
+++ b/extensions/grunt/package.json
@@ -1,8 +1,8 @@
 {
   "name": "grunt",
   "publisher": "vscode",
-  "description": "Extension to add Grunt capabilities to VSCode.",
-  "displayName": "Grunt support for VSCode",
+  "description": "Extension to add Grunt capabilities to VS Code.",
+  "displayName": "Grunt support for VS Code",
   "version": "1.0.0",
   "icon": "images/grunt.png",
   "engines": {
@@ -16,10 +16,10 @@
     "watch": "gulp watch-extension:grunt"
   },
   "dependencies": {
-    "vscode-nls": "^3.2.1"
+    "vscode-nls": "^4.0.0"
   },
   "devDependencies": {
-    "@types/node": "7.0.43"
+    "@types/node": "^8.10.25"
   },
   "main": "./out/main",
   "activationEvents": [
@@ -46,7 +46,9 @@
     "taskDefinitions": [
       {
         "type": "grunt",
-        "required": ["task"],
+        "required": [
+          "task"
+        ],
         "properties": {
           "task": {
             "type": "string",
@@ -60,4 +62,4 @@
       }
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/extensions/grunt/package.nls.json b/extensions/grunt/package.nls.json
index 31f3b369af5..7f1b68bbe0b 100644
--- a/extensions/grunt/package.nls.json
+++ b/extensions/grunt/package.nls.json
@@ -1,6 +1,6 @@
 {
-	"description": "Extension to add Grunt capabilities to VSCode.",
-	"displayName": "Grunt support for VSCode",
+	"description": "Extension to add Grunt capabilities to VS Code.",
+	"displayName": "Grunt support for VS Code",
 	"config.grunt.autoDetect": "Controls whether auto detection of Grunt tasks is on or off. Default is on.",
 	"grunt.taskDefinition.type.description": "The Grunt task to customize.",
 	"grunt.taskDefinition.file.description": "The Grunt file that provides the task. Can be omitted."
diff --git a/extensions/grunt/yarn.lock b/extensions/grunt/yarn.lock
index 112e5f2ac8d..913d2622d18 100644
--- a/extensions/grunt/yarn.lock
+++ b/extensions/grunt/yarn.lock
@@ -2,10 +2,10 @@
 # yarn lockfile v1
 
 
-"@types/node@7.0.43":
-  version "7.0.43"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.43.tgz#a187e08495a075f200ca946079c914e1a5fe962c"
+"@types/node@^8.10.25":
+  version "8.10.25"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-8.10.25.tgz#801fe4e39372cef18f268db880a5fbfcf71adc7e"
 
-vscode-nls@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.1.tgz#b1f3e04e8a94a715d5a7bcbc8339c51e6d74ca51"
+vscode-nls@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-4.0.0.tgz#4001c8a6caba5cedb23a9c5ce1090395c0e44002"
diff --git a/extensions/gulp/README.md b/extensions/gulp/README.md
index c06203d7a8d..42accc57541 100644
--- a/extensions/gulp/README.md
+++ b/extensions/gulp/README.md
@@ -1,10 +1,13 @@
 # Gulp - Automate and enhance your workflow
 
-**Notice** This is a an extension that is bundled with Visual Studio Code.
+**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.
+
+## Features
 
 This extension supports running [Gulp](https://gulpjs.com/) tasks defined in a `gulpfile.{js,ts}` file as [VS Code tasks](https://code.visualstudio.com/docs/editor/tasks). Gulp tasks with the name 'build', 'compile', or 'watch' are treated as build tasks.
 
-To run Gulp tasks use the `Tasks` menu.
+To run Gulp tasks, use the **Tasks** menu.
 
 ## Settings
-- `gulp.autoDetect` enable detecting tasks from `gulpfile.{js,ts}` files, the default is `on`.
+
+- `gulp.autoDetect` - Enable detecting tasks from `gulpfile.{js,ts}` files, the default is `on`.
diff --git a/extensions/gulp/package.json b/extensions/gulp/package.json
index bc53fe127f7..0c78e7fada0 100644
--- a/extensions/gulp/package.json
+++ b/extensions/gulp/package.json
@@ -16,10 +16,10 @@
     "watch": "gulp watch-extension:gulp"
   },
   "dependencies": {
-    "vscode-nls": "^3.2.1"
+    "vscode-nls": "^4.0.0"
   },
   "devDependencies": {
-    "@types/node": "7.0.43"
+    "@types/node": "^8.10.25"
   },
   "main": "./out/main",
   "activationEvents": [
@@ -46,7 +46,9 @@
     "taskDefinitions": [
       {
         "type": "gulp",
-        "required": ["task"],
+        "required": [
+          "task"
+        ],
         "properties": {
           "task": {
             "type": "string",
@@ -60,4 +62,4 @@
       }
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/extensions/gulp/yarn.lock b/extensions/gulp/yarn.lock
index 112e5f2ac8d..913d2622d18 100644
--- a/extensions/gulp/yarn.lock
+++ b/extensions/gulp/yarn.lock
@@ -2,10 +2,10 @@
 # yarn lockfile v1
 
 
-"@types/node@7.0.43":
-  version "7.0.43"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.43.tgz#a187e08495a075f200ca946079c914e1a5fe962c"
+"@types/node@^8.10.25":
+  version "8.10.25"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-8.10.25.tgz#801fe4e39372cef18f268db880a5fbfcf71adc7e"
 
-vscode-nls@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.1.tgz#b1f3e04e8a94a715d5a7bcbc8339c51e6d74ca51"
+vscode-nls@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-4.0.0.tgz#4001c8a6caba5cedb23a9c5ce1090395c0e44002"
diff --git a/extensions/handlebars/test/colorize-results/test_hbs.json b/extensions/handlebars/test/colorize-results/test_hbs.json
index 8774d4f3885..f818a57b51e 100644
--- a/extensions/handlebars/test/colorize-results/test_hbs.json
+++ b/extensions/handlebars/test/colorize-results/test_hbs.json
@@ -1059,9 +1059,9 @@
 		"c": "{{!-- only output author name if an author exists --}}",
 		"t": "text.html.handlebars comment.block.handlebars",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
diff --git a/extensions/html-language-features/.vscodeignore b/extensions/html-language-features/.vscodeignore
index da621e23a7a..8d0ba59e94c 100644
--- a/extensions/html-language-features/.vscodeignore
+++ b/extensions/html-language-features/.vscodeignore
@@ -1,8 +1,27 @@
 test/**
-server/tsconfig.json
-server/node_modules/@types/**
+.vscode/**
+server/.vscode/**
+node_modules/**
+server/node_modules/**
+client/src/**
 server/src/**
-server/test/**
-server/out/test/**
+client/out/**
+server/out/**
 client/tsconfig.json
-client/src/**
\ No newline at end of file
+server/tsconfig.json
+server/test/**
+server/bin/**
+server/build/**
+server/yarn.lock
+server/.npmignore
+yarn.lock
+server/extension.webpack.config.js
+extension.webpack.config.js
+!node_modules/vscode-nls/**
+!node_modules/applicationinsights/**
+!node_modules/diagnostic-channel-publishers/**
+!node_modules/diagnostic-channel/**
+!node_modules/semver/**
+!node_modules/vscode-extension-telemetry/**
+!node_modules/zone.js/**
+!server/node_modules/vscode-nls/**
\ No newline at end of file
diff --git a/extensions/html-language-features/CONTRIBUTING.md b/extensions/html-language-features/CONTRIBUTING.md
new file mode 100644
index 00000000000..759abd46871
--- /dev/null
+++ b/extensions/html-language-features/CONTRIBUTING.md
@@ -0,0 +1,37 @@
+## Setup
+
+- Clone [Microsoft/vscode](https://github.com/microsoft/vscode)
+- Run `yarn` at `/`, this will install
+	- Dependencies for `/extension/html-language-features/`
+	- Dependencies for `/extension/html-language-features/server/`
+	- devDependencies such as `gulp`
+- Open `/extensions/html-language-features/` as the workspace in VS Code
+- Run the [`Launch Extension`](https://github.com/Microsoft/vscode/blob/master/extensions/html-language-features/.vscode/launch.json) debug target in the Debug View. This will:
+	- Launch the `preLaunchTask` task to compile the extension
+	- Launch a new VS Code instance with the `html-language-features` extension loaded
+	- You should see a notification saying the development version of `html-language-features` overwrites the bundled version of `html-language-features`
+- Test the behavior of this extension by editing html files
+- Run `Reload Window` command in the launched instance to reload the extension
+
+### Contribute to vscode-html-languageservice
+
+[Microsoft/vscode-html-languageservice](https://github.com/Microsoft/vscode-html-languageservice) contains the language smarts for html.
+This extension wraps the html language service into a Language Server for VS Code.
+If you want to fix html issues or make improvements, you should make changes at [Microsoft/vscode-html-languageservice](https://github.com/Microsoft/vscode-html-languageservice).
+
+However, within this extension, you can run a development version of `vscode-html-languageservice` to debug code or test language features interactively:
+
+#### Linking `vscode-html-languageservice` in `html-language-features/server/`
+
+- Clone [Microsoft/vscode-html-languageservice](https://github.com/Microsoft/vscode-html-languageservice)
+- Run `yarn` in `vscode-html-languageservice`
+- Run `yarn link` in `vscode-html-languageservice`. This will compile and link `vscode-html-languageservice`
+- In `html-language-features/server/`, run `npm link vscode-html-languageservice`
+
+#### Testing the development version of `vscode-html-languageservice`
+
+- Open both `vscode-html-languageservice` and this extension in a single workspace with [multi-root workspace](https://code.visualstudio.com/docs/editor/multi-root-workspaces) feature
+- Run `yarn watch` at `html-languagefeatures/server/` to recompile this extension with the linked version of `vscode-html-languageservice`
+- Make some changes in `vscode-html-languageservice`
+- Now when you run `Launch Extension` debug target, the launched instance will use your development version of `vscode-html-languageservice`. You can interactively test the language features.
+- You can also run the `Debug Extension and Language Server` debug target, which will launch the extension and attach the debugger to the language server. After successful attach, you should be able to hit breakpoints in both `vscode-html-languageservice` and `html-language-features/server/`
\ No newline at end of file
diff --git a/extensions/html-language-features/README.md b/extensions/html-language-features/README.md
new file mode 100644
index 00000000000..d2e78da0be9
--- /dev/null
+++ b/extensions/html-language-features/README.md
@@ -0,0 +1,9 @@
+# Language Features for HTML
+
+**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.
+
+## Features
+
+See [HTML in Visual Studio Code](https://code.visualstudio.com/docs/languages/html) to learn about the features of this extension.
+
+Please read the [CONTRIBUTING.md](https://github.com/Microsoft/vscode/blob/master/extensions/html-language-features/CONTRIBUTING.md) file to learn how to contribute to this extension.
diff --git a/extensions/html-language-features/client/src/htmlMain.ts b/extensions/html-language-features/client/src/htmlMain.ts
index f463ff2ba8a..589c3afbf92 100644
--- a/extensions/html-language-features/client/src/htmlMain.ts
+++ b/extensions/html-language-features/client/src/htmlMain.ts
@@ -5,17 +5,16 @@
 'use strict';
 
 import * as path from 'path';
+import * as fs from 'fs';
 import * as nls from 'vscode-nls';
 const localize = nls.loadMessageBundle();
 
-import { languages, ExtensionContext, IndentAction, Position, TextDocument, Range, CompletionItem, CompletionItemKind, SnippetString, FoldingRangeKind, FoldingRange, FoldingContext } from 'vscode';
-import { LanguageClient, LanguageClientOptions, ServerOptions, TransportKind, RequestType, TextDocumentPositionParams, Disposable, CancellationToken } from 'vscode-languageclient';
+import { languages, ExtensionContext, IndentAction, Position, TextDocument, Range, CompletionItem, CompletionItemKind, SnippetString } from 'vscode';
+import { LanguageClient, LanguageClientOptions, ServerOptions, TransportKind, RequestType, TextDocumentPositionParams } from 'vscode-languageclient';
 import { EMPTY_ELEMENTS } from './htmlEmptyTagsShared';
 import { activateTagClosing } from './tagClosing';
 import TelemetryReporter from 'vscode-extension-telemetry';
 
-import { FoldingRangeRequest, FoldingRangeRequestParam, FoldingRangeClientCapabilities, FoldingRangeKind as LSFoldingRangeKind } from 'vscode-languageserver-protocol-foldingprovider';
-
 namespace TagCloseRequest {
 	export const type: RequestType<TextDocumentPositionParams, string, any, any> = new RequestType('html/tag');
 }
@@ -35,8 +34,9 @@ export function activate(context: ExtensionContext) {
 	let packageInfo = getPackageInfo(context);
 	telemetryReporter = packageInfo && new TelemetryReporter(packageInfo.name, packageInfo.version, packageInfo.aiKey);
 
-	// The server is implemented in node
-	let serverModule = context.asAbsolutePath(path.join('server', 'out', 'htmlServerMain.js'));
+	let serverMain = readJSONFile(context.asAbsolutePath('./server/package.json')).main;
+	let serverModule = context.asAbsolutePath(path.join('server', serverMain));
+
 	// The debug options for the server
 	let debugOptions = { execArgv: ['--nolazy', '--inspect=6045'] };
 
@@ -64,21 +64,6 @@ export function activate(context: ExtensionContext) {
 	// Create the language client and start the client.
 	let client = new LanguageClient('html', localize('htmlserver.name', 'HTML Language Server'), serverOptions, clientOptions);
 	client.registerProposedFeatures();
-	client.registerFeature({
-		fillClientCapabilities(capabilities: FoldingRangeClientCapabilities): void {
-			let textDocumentCap = capabilities.textDocument;
-			if (!textDocumentCap) {
-				textDocumentCap = capabilities.textDocument = {};
-			}
-			textDocumentCap.foldingRange = {
-				dynamicRegistration: false,
-				rangeLimit: 5000,
-				lineFoldingOnly: true
-			};
-		},
-		initialize(capabilities, documentSelector): void {
-		}
-	});
 
 	let disposable = client.start();
 	toDispose.push(disposable);
@@ -96,7 +81,6 @@ export function activate(context: ExtensionContext) {
 			}
 		});
 		toDispose.push(disposable);
-		toDispose.push(initFoldingProvider());
 	});
 
 	languages.setLanguageConfiguration('html', {
@@ -172,42 +156,10 @@ export function activate(context: ExtensionContext) {
 			return null;
 		}
 	});
-
-	function initFoldingProvider(): Disposable {
-		function getKind(kind: string | undefined): FoldingRangeKind | undefined {
-			if (kind) {
-				switch (kind) {
-					case LSFoldingRangeKind.Comment:
-						return FoldingRangeKind.Comment;
-					case LSFoldingRangeKind.Imports:
-						return FoldingRangeKind.Imports;
-					case LSFoldingRangeKind.Region:
-						return FoldingRangeKind.Region;
-				}
-			}
-			return void 0;
-		}
-		return languages.registerFoldingRangeProvider('html', {
-			provideFoldingRanges(document: TextDocument, context: FoldingContext, token: CancellationToken) {
-				const param: FoldingRangeRequestParam = {
-					textDocument: client.code2ProtocolConverter.asTextDocumentIdentifier(document)
-				};
-				return client.sendRequest(FoldingRangeRequest.type, param, token).then(ranges => {
-					if (Array.isArray(ranges)) {
-						return ranges.map(r => new FoldingRange(r.startLine, r.endLine, getKind(r.kind)));
-					}
-					return null;
-				}, error => {
-					client.logFailedRequest(FoldingRangeRequest.type, error);
-					return null;
-				});
-			}
-		});
-	}
 }
 
 function getPackageInfo(context: ExtensionContext): IPackageInfo | null {
-	let extensionPackage = require(context.asAbsolutePath('./package.json'));
+	let extensionPackage = readJSONFile(context.asAbsolutePath('./package.json'));
 	if (extensionPackage) {
 		return {
 			name: extensionPackage.name,
@@ -218,6 +170,16 @@ function getPackageInfo(context: ExtensionContext): IPackageInfo | null {
 	return null;
 }
 
+
+function readJSONFile(location: string) {
+	try {
+		return JSON.parse(fs.readFileSync(location).toString());
+	} catch (e) {
+		console.log(`Problems reading ${location}: ${e}`);
+		return {};
+	}
+}
+
 export function deactivate(): Promise<any> {
 	return telemetryReporter ? telemetryReporter.dispose() : Promise.resolve(null);
 }
\ No newline at end of file
diff --git a/extensions/html-language-features/extension.webpack.config.js b/extensions/html-language-features/extension.webpack.config.js
new file mode 100644
index 00000000000..4f9af795401
--- /dev/null
+++ b/extensions/html-language-features/extension.webpack.config.js
@@ -0,0 +1,37 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+//@ts-check
+
+'use strict';
+
+const withDefaults = require('../shared.webpack.config');
+const CopyWebpackPlugin = require('copy-webpack-plugin');
+const path = require('path');
+
+module.exports = withDefaults({
+	context: path.join(__dirname, 'client'),
+	entry: {
+		extension: './src/htmlMain.ts',
+	},
+	resolve: {
+		mainFields: ['module', 'main'],
+		extensions: ['.ts', '.js'] // support ts-files and js-files
+	},
+	output: {
+		filename: 'htmlMain.js',
+		path: path.join(__dirname, 'client', 'dist'),
+		libraryTarget: "commonjs",
+	},
+	externals: {
+		'./files': 'commonjs', // ignored because it doesn't exist
+	},
+	plugins: [
+		new CopyWebpackPlugin([
+			{ from: './out/*.sh', to: '[name].sh' },
+			{ from: './out/nls.*.json', to: '[name].json' }
+		])
+	]
+});
diff --git a/extensions/html-language-features/package.json b/extensions/html-language-features/package.json
index 5781a2d2faa..c479c3f9359 100644
--- a/extensions/html-language-features/package.json
+++ b/extensions/html-language-features/package.json
@@ -112,26 +112,28 @@
             "auto",
             "force",
             "force-aligned",
-            "force-expand-multiline"
+            "force-expand-multiline",
+            "aligned-multiple"
           ],
           "enumDescriptions": [
             "%html.format.wrapAttributes.auto%",
             "%html.format.wrapAttributes.force%",
             "%html.format.wrapAttributes.forcealign%",
-            "%html.format.wrapAttributes.forcemultiline%"
+            "%html.format.wrapAttributes.forcemultiline%",
+            "%html.format.wrapAttributes.alignedmultiple%"
           ],
           "description": "%html.format.wrapAttributes.desc%"
         },
         "html.suggest.angular1": {
           "type": "boolean",
           "scope": "resource",
-          "default": true,
+          "default": false,
           "description": "%html.suggest.angular1.desc%"
         },
         "html.suggest.ionic": {
           "type": "boolean",
           "scope": "resource",
-          "default": true,
+          "default": false,
           "description": "%html.suggest.ionic.desc%"
         },
         "html.suggest.html5": {
@@ -173,12 +175,11 @@
     }
   },
   "dependencies": {
-    "vscode-extension-telemetry": "0.0.17",
-    "vscode-languageclient": "^4.1.4",
-    "vscode-languageserver-protocol-foldingprovider": "^2.0.1",
-    "vscode-nls": "^3.2.2"
+    "vscode-extension-telemetry": "0.0.18",
+    "vscode-languageclient": "^5.1.0-next.9",
+    "vscode-nls": "^4.0.0"
   },
   "devDependencies": {
-    "@types/node": "7.0.43"
+    "@types/node": "^8.10.25"
   }
 }
diff --git a/extensions/html-language-features/package.nls.json b/extensions/html-language-features/package.nls.json
index 4b59c6fba33..e9d48667067 100644
--- a/extensions/html-language-features/package.nls.json
+++ b/extensions/html-language-features/package.nls.json
@@ -1,12 +1,12 @@
 {
 	"displayName": "HTML Language Features",
-	"description": "Provides rich language support for HTML, Razor and Handlebar files.",
-	"html.format.enable.desc": "Enable/disable default HTML formatter",
+	"description": "Provides rich language support for HTML, Razor, and Handlebar files",
+	"html.format.enable.desc": "Enable/disable default HTML formatter.",
 	"html.format.wrapLineLength.desc": "Maximum amount of characters per line (0 = disable).",
 	"html.format.unformatted.desc": "List of tags, comma separated, that shouldn't be reformatted. 'null' defaults to all tags listed at https://www.w3.org/TR/html5/dom.html#phrasing-content.",
 	"html.format.contentUnformatted.desc": "List of tags, comma separated, where the content shouldn't be reformatted. 'null' defaults to the 'pre' tag.",
 	"html.format.indentInnerHtml.desc": "Indent <head> and <body> sections.",
-	"html.format.preserveNewLines.desc": "Whether existing line breaks before elements should be preserved. Only works before elements, not inside tags or for text.",
+	"html.format.preserveNewLines.desc": "Controls whether existing line breaks before elements should be preserved. Only works before elements, not inside tags or for text.",
 	"html.format.maxPreserveNewLines.desc": "Maximum number of line breaks to be preserved in one chunk. Use 'null' for unlimited.",
 	"html.format.indentHandlebars.desc": "Format and indent {{#foo}} and {{/foo}}.",
 	"html.format.endWithNewline.desc": "End with a newline.",
@@ -16,11 +16,13 @@
 	"html.format.wrapAttributes.force": "Wrap each attribute except first.",
 	"html.format.wrapAttributes.forcealign": "Wrap each attribute except first and keep aligned.",
 	"html.format.wrapAttributes.forcemultiline": "Wrap each attribute.",
-	"html.suggest.angular1.desc":  "Configures if the built-in HTML language support suggests Angular V1 tags and properties.",
-	"html.suggest.ionic.desc": "Configures if the built-in HTML language support suggests Ionic tags, properties and values.",
-	"html.suggest.html5.desc":"Configures if the built-in HTML language support suggests HTML5 tags, properties and values.",
+	"html.format.wrapAttributes.alignedmultiple": "Wrap when line length is exceeded, align attributes vertically.",
+	"html.format.wrapAttributesIndentSize.desc": "Attribute alignment size when using 'force-aligned' or 'aligned-multiple'. Use 'null' to use the editor indent size.",
+	"html.suggest.angular1.desc": "Controls whether the built-in HTML language support suggests Angular V1 tags and properties.",
+	"html.suggest.ionic.desc": "Controls whether the built-in HTML language support suggests Ionic tags, properties and values.",
+	"html.suggest.html5.desc": "Controls whether the built-in HTML language support suggests HTML5 tags, properties and values.",
 	"html.trace.server.desc": "Traces the communication between VS Code and the HTML language server.",
-	"html.validate.scripts": "Configures if the built-in HTML language support validates embedded scripts.",
-	"html.validate.styles": "Configures if the built-in HTML language support validates embedded styles.",
+	"html.validate.scripts": "Controls whether the built-in HTML language support validates embedded scripts.",
+	"html.validate.styles": "Controls whether the built-in HTML language support validates embedded styles.",
 	"html.autoClosingTags": "Enable/disable autoclosing of HTML tags."
 }
\ No newline at end of file
diff --git a/extensions/html-language-features/server/build/filesFillIn.js b/extensions/html-language-features/server/build/filesFillIn.js
new file mode 100644
index 00000000000..906617384e0
--- /dev/null
+++ b/extensions/html-language-features/server/build/filesFillIn.js
@@ -0,0 +1,5 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+module.exports = {};
\ No newline at end of file
diff --git a/extensions/html-language-features/server/extension.webpack.config.js b/extensions/html-language-features/server/extension.webpack.config.js
new file mode 100644
index 00000000000..67d30dd082d
--- /dev/null
+++ b/extensions/html-language-features/server/extension.webpack.config.js
@@ -0,0 +1,39 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+//@ts-check
+
+'use strict';
+
+const withDefaults = require('../../shared.webpack.config');
+const path = require('path');
+var webpack = require('webpack');
+
+module.exports = withDefaults({
+	context: path.join(__dirname),
+	entry: {
+		extension: './src/htmlServerMain.ts',
+	},
+	resolve: {
+		mainFields: ['module', 'main'],
+		extensions: ['.ts', '.js'] // support ts-files and js-files
+	},
+	output: {
+		filename: 'htmlServerMain.js',
+		path: path.join(__dirname, 'dist'),
+		libraryTarget: "commonjs",
+	},
+	externals: {
+		'typescript': 'commonjs typescript',
+		"vscode-nls": 'commonjs vscode-nls',
+	},
+	plugins: [
+		new webpack.NormalModuleReplacementPlugin(
+			/(\/|\\)vscode-languageserver(\/|\\)lib(\/|\\)files\.js/,
+			require.resolve('./build/filesFillIn')
+		),
+		new webpack.IgnorePlugin(/vertx/)
+	],
+});
diff --git a/extensions/html-language-features/server/package.json b/extensions/html-language-features/server/package.json
index e553a500d24..212c3e66399 100644
--- a/extensions/html-language-features/server/package.json
+++ b/extensions/html-language-features/server/package.json
@@ -7,22 +7,26 @@
   "engines": {
     "node": "*"
   },
+  "main": "./out/htmlServerMain",
   "dependencies": {
-    "vscode-css-languageservice": "^3.0.9-next.18",
-    "vscode-html-languageservice": "^2.1.3-next.5",
-    "vscode-languageserver": "^4.1.3",
-    "vscode-languageserver-protocol-foldingprovider": "^2.0.1",
-    "vscode-languageserver-types": "^3.7.2",
-    "vscode-nls": "^3.2.2",
-    "vscode-uri": "^1.0.3"
+    "vscode-css-languageservice": "^3.0.10",
+    "vscode-html-languageservice": "^2.1.7",
+    "vscode-languageserver": "^5.1.0-next.5",
+    "vscode-languageserver-types": "^3.10.0",
+    "vscode-nls": "^4.0.0",
+    "vscode-uri": "^1.0.6"
   },
   "devDependencies": {
     "@types/mocha": "2.2.33",
-    "@types/node": "7.0.43"
+    "@types/node": "^8.10.25",
+    "glob": "^7.1.2",
+    "mocha": "^5.2.0",
+    "mocha-junit-reporter": "^1.17.0",
+    "mocha-multi-reporters": "^1.1.7"
   },
   "scripts": {
-    "compile": "gulp compile-extension:html-language-features-server",
-    "watch": "gulp watch-extension:html-language-features-server",
+    "compile": "npx gulp compile-extension:html-language-features-server",
+    "watch": "npx gulp watch-extension:html-language-features-server",
     "install-service-next": "yarn add vscode-css-languageservice@next && yarn add vscode-html-languageservice@next",
     "install-service-local": "npm install ../../../../vscode-css-languageservice -f && npm install ../../../../vscode-html-languageservice -f",
     "install-server-next": "yarn add vscode-languageserver@next",
diff --git a/extensions/html-language-features/server/src/htmlServerMain.ts b/extensions/html-language-features/server/src/htmlServerMain.ts
index b4e4dc827bd..ffe5c18df41 100644
--- a/extensions/html-language-features/server/src/htmlServerMain.ts
+++ b/extensions/html-language-features/server/src/htmlServerMain.ts
@@ -19,7 +19,6 @@ import { getDocumentContext } from './utils/documentContext';
 import uri from 'vscode-uri';
 import { formatError, runSafe, runSafeAsync } from './utils/runner';
 
-import { FoldingRangeRequest, FoldingRangeServerCapabilities } from 'vscode-languageserver-protocol-foldingprovider';
 import { getFoldingRanges } from './modes/htmlFolding';
 
 namespace TagCloseRequest {
@@ -119,7 +118,7 @@ connection.onInitialize((params: InitializeParams): InitializeResult => {
 	scopedSettingsSupport = getClientCapability('workspace.configuration', false);
 	workspaceFoldersSupport = getClientCapability('workspace.workspaceFolders', false);
 	foldingRangeLimit = getClientCapability('textDocument.foldingRange.rangeLimit', Number.MAX_VALUE);
-	const capabilities: ServerCapabilities & FoldingRangeServerCapabilities = {
+	const capabilities: ServerCapabilities = {
 		// Tell the client that the server works in FULL text document sync mode
 		textDocumentSync: documents.syncKind,
 		completionProvider: clientSnippetSupport ? { resolveProvider: true, triggerCharacters: ['.', ':', '<', '"', '=', '/'] } : undefined,
@@ -441,7 +440,7 @@ connection.onRequest(TagCloseRequest.type, (params, token) => {
 	}, null, `Error while computing tag close actions for ${params.textDocument.uri}`, token);
 });
 
-connection.onRequest(FoldingRangeRequest.type, (params, token) => {
+connection.onFoldingRanges((params, token) => {
 	return runSafe(() => {
 		const document = documents.get(params.textDocument.uri);
 		if (document) {
diff --git a/extensions/html-language-features/server/src/modes/htmlFolding.ts b/extensions/html-language-features/server/src/modes/htmlFolding.ts
index c36b27ad3bf..aa63a24cf9a 100644
--- a/extensions/html-language-features/server/src/modes/htmlFolding.ts
+++ b/extensions/html-language-features/server/src/modes/htmlFolding.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 import { TextDocument, CancellationToken, Position, Range } from 'vscode-languageserver';
-import { FoldingRange } from 'vscode-languageserver-protocol-foldingprovider';
+import { FoldingRange } from 'vscode-languageserver-types';
 import { LanguageModes } from './languageModes';
 
 export function getFoldingRanges(languageModes: LanguageModes, document: TextDocument, maxRanges: number | undefined, cancellationToken: CancellationToken | null): FoldingRange[] {
diff --git a/extensions/html-language-features/server/src/modes/htmlMode.ts b/extensions/html-language-features/server/src/modes/htmlMode.ts
index cd3edbaed4b..29fb01d4cb8 100644
--- a/extensions/html-language-features/server/src/modes/htmlMode.ts
+++ b/extensions/html-language-features/server/src/modes/htmlMode.ts
@@ -6,10 +6,8 @@
 
 import { getLanguageModelCache } from '../languageModelCache';
 import { LanguageService as HTMLLanguageService, HTMLDocument, DocumentContext, FormattingOptions, HTMLFormatConfiguration } from 'vscode-html-languageservice';
-import { TextDocument, Position, Range, CompletionItem } from 'vscode-languageserver-types';
+import { TextDocument, Position, Range, CompletionItem, FoldingRange } from 'vscode-languageserver-types';
 import { LanguageMode, Workspace } from './languageModes';
-
-import { FoldingRange } from 'vscode-languageserver-protocol-foldingprovider';
 import { getPathCompletionParticipant } from './pathCompletion';
 
 export function getHTMLMode(htmlLanguageService: HTMLLanguageService, workspace: Workspace): LanguageMode {
diff --git a/extensions/html-language-features/server/src/modes/javascriptMode.ts b/extensions/html-language-features/server/src/modes/javascriptMode.ts
index 191253d0d2c..b43c125ddea 100644
--- a/extensions/html-language-features/server/src/modes/javascriptMode.ts
+++ b/extensions/html-language-features/server/src/modes/javascriptMode.ts
@@ -5,20 +5,26 @@
 'use strict';
 
 import { LanguageModelCache, getLanguageModelCache } from '../languageModelCache';
-import { SymbolInformation, SymbolKind, CompletionItem, Location, SignatureHelp, SignatureInformation, ParameterInformation, Definition, TextEdit, TextDocument, Diagnostic, DiagnosticSeverity, Range, CompletionItemKind, Hover, MarkedString, DocumentHighlight, DocumentHighlightKind, CompletionList, Position, FormattingOptions } from 'vscode-languageserver-types';
+import {
+	SymbolInformation, SymbolKind, CompletionItem, Location, SignatureHelp, SignatureInformation, ParameterInformation,
+	Definition, TextEdit, TextDocument, Diagnostic, DiagnosticSeverity, Range, CompletionItemKind, Hover, MarkedString,
+	DocumentHighlight, DocumentHighlightKind, CompletionList, Position, FormattingOptions, FoldingRange, FoldingRangeKind
+} from 'vscode-languageserver-types';
 import { LanguageMode, Settings, Workspace } from './languageModes';
 import { getWordAtText, startsWith, isWhitespaceOnly, repeat } from '../utils/strings';
 import { HTMLDocumentRegions } from './embeddedSupport';
 
 import * as ts from 'typescript';
 import { join } from 'path';
-import { FoldingRange, FoldingRangeKind } from 'vscode-languageserver-protocol-foldingprovider';
 
 const FILE_NAME = 'vscode://javascript/1';  // the same 'file' is used for all contents
-const JQUERY_D_TS = join(__dirname, '../../lib/jquery.d.ts');
-
 const JS_WORD_REGEX = /(-?\d*\.\d\w*)|([^\`\~\!\@\#\%\^\&\*\(\)\-\=\+\[\{\]\}\\\|\;\:\'\"\,\.\<\>\/\?\s]+)/g;
 
+let jquery_d_ts = join(__dirname, '../lib/jquery.d.ts'); // when packaged
+if (!ts.sys.fileExists(jquery_d_ts)) {
+	jquery_d_ts = join(__dirname, '../../lib/jquery.d.ts'); // from source
+}
+
 export function getJavaScriptMode(documentRegions: LanguageModelCache<HTMLDocumentRegions>, workspace: Workspace): LanguageMode {
 	let jsDocuments = getLanguageModelCache<TextDocument>(10, 60, document => documentRegions.get(document).getEmbeddedDocument('javascript'));
 
@@ -33,7 +39,7 @@ export function getJavaScriptMode(documentRegions: LanguageModelCache<HTMLDocume
 	}
 	const host: ts.LanguageServiceHost = {
 		getCompilationSettings: () => compilerOptions,
-		getScriptFileNames: () => [FILE_NAME, JQUERY_D_TS],
+		getScriptFileNames: () => [FILE_NAME, jquery_d_ts],
 		getScriptKind: () => ts.ScriptKind.JS,
 		getScriptVersion: (fileName: string) => {
 			if (fileName === FILE_NAME) {
@@ -131,7 +137,7 @@ export function getJavaScriptMode(documentRegions: LanguageModelCache<HTMLDocume
 		},
 		doSignatureHelp(document: TextDocument, position: Position): SignatureHelp | null {
 			updateCurrentTextDocument(document);
-			let signHelp = jsLanguageService.getSignatureHelpItems(FILE_NAME, currentTextDocument.offsetAt(position));
+			let signHelp = jsLanguageService.getSignatureHelpItems(FILE_NAME, currentTextDocument.offsetAt(position), undefined);
 			if (signHelp) {
 				let ret: SignatureHelp = {
 					activeSignature: signHelp.selectedItemIndex,
diff --git a/extensions/html-language-features/server/src/modes/languageModes.ts b/extensions/html-language-features/server/src/modes/languageModes.ts
index 282c4f75ef4..6fcba8d24dc 100644
--- a/extensions/html-language-features/server/src/modes/languageModes.ts
+++ b/extensions/html-language-features/server/src/modes/languageModes.ts
@@ -7,10 +7,9 @@
 import { getLanguageService as getHTMLLanguageService, DocumentContext } from 'vscode-html-languageservice';
 import {
 	CompletionItem, Location, SignatureHelp, Definition, TextEdit, TextDocument, Diagnostic, DocumentLink, Range,
-	Hover, DocumentHighlight, CompletionList, Position, FormattingOptions, SymbolInformation
+	Hover, DocumentHighlight, CompletionList, Position, FormattingOptions, SymbolInformation, FoldingRange
 } from 'vscode-languageserver-types';
 import { ColorInformation, ColorPresentation, Color, WorkspaceFolder } from 'vscode-languageserver';
-import { FoldingRange } from 'vscode-languageserver-protocol-foldingprovider';
 
 import { getLanguageModelCache, LanguageModelCache } from '../languageModelCache';
 import { getDocumentRegions, HTMLDocumentRegions } from './embeddedSupport';
diff --git a/extensions/html-language-features/server/src/modes/pathCompletion.ts b/extensions/html-language-features/server/src/modes/pathCompletion.ts
index 9bb123dcaac..05448ed9dd2 100644
--- a/extensions/html-language-features/server/src/modes/pathCompletion.ts
+++ b/extensions/html-language-features/server/src/modes/pathCompletion.ts
@@ -63,16 +63,19 @@ function shouldDoPathCompletion(tag: string, attr: string, value: string) {
  * Get a list of path suggestions. Folder suggestions are suffixed with a slash.
  */
 function providePaths(valueBeforeCursor: string, activeDocFsPath: string, root?: string): string[] {
-	if (startsWith(valueBeforeCursor, '/') && !root) {
-		return [];
-	}
-
 	const lastIndexOfSlash = valueBeforeCursor.lastIndexOf('/');
 	const valueBeforeLastSlash = valueBeforeCursor.slice(0, lastIndexOfSlash + 1);
 
-	const parentDir = startsWith(valueBeforeCursor, '/')
-		? path.resolve(root, '.' + valueBeforeLastSlash)
-		: path.resolve(activeDocFsPath, '..', valueBeforeLastSlash);
+	const startsWithSlash = startsWith(valueBeforeCursor, '/');
+	let parentDir: string;
+	if (startsWithSlash) {
+		if (!root) {
+			return [];
+		}
+		parentDir = path.resolve(root, '.' + valueBeforeLastSlash);
+	} else {
+		parentDir = path.resolve(activeDocFsPath, '..', valueBeforeLastSlash);
+	}
 
 	try {
 		return fs.readdirSync(parentDir).map(f => {
diff --git a/extensions/html-language-features/server/test/index.js b/extensions/html-language-features/server/test/index.js
new file mode 100644
index 00000000000..c1b6dc3a888
--- /dev/null
+++ b/extensions/html-language-features/server/test/index.js
@@ -0,0 +1,34 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+const path = require('path');
+const Mocha = require('mocha');
+const glob = require('glob');
+
+const suite = 'Integration HTML Extension Tests';
+
+const options = {
+	ui: 'tdd',
+	useColors: true,
+	timeout: 60000
+};
+
+if (process.env.BUILD_ARTIFACTSTAGINGDIRECTORY) {
+	options.reporter = 'mocha-multi-reporters';
+	options.reporterOptions = {
+		reporterEnabled: 'spec, mocha-junit-reporter',
+		mochaJunitReporterReporterOptions: {
+			testsuitesTitle: `${suite} ${process.platform}`,
+			mochaFile: path.join(process.env.BUILD_ARTIFACTSTAGINGDIRECTORY, `test-results/${process.platform}-${suite.toLowerCase().replace(/[^\w]/g, '-')}-results.xml`)
+		}
+	};
+}
+
+const mocha = new Mocha(options);
+
+glob.sync(__dirname + '/../out/test/**/*.test.js')
+	.forEach(file => mocha.addFile(file));
+
+mocha.run(failures => process.exit(failures ? -1 : 0));
diff --git a/extensions/html-language-features/server/test/mocha.opts b/extensions/html-language-features/server/test/mocha.opts
deleted file mode 100644
index d3e46273a0c..00000000000
--- a/extensions/html-language-features/server/test/mocha.opts
+++ /dev/null
@@ -1,3 +0,0 @@
---ui tdd
---useColors true
-./out/test/**/*.test.js
\ No newline at end of file
diff --git a/extensions/html-language-features/server/yarn.lock b/extensions/html-language-features/server/yarn.lock
index 324c20b8cf0..f3d0c4a98b7 100644
--- a/extensions/html-language-features/server/yarn.lock
+++ b/extensions/html-language-features/server/yarn.lock
@@ -6,62 +6,259 @@
   version "2.2.33"
   resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-2.2.33.tgz#d79a0061ec270379f4d9e225f4096fb436669def"
 
-"@types/node@7.0.43":
-  version "7.0.43"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.43.tgz#a187e08495a075f200ca946079c914e1a5fe962c"
+"@types/node@^8.10.25":
+  version "8.10.25"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-8.10.25.tgz#801fe4e39372cef18f268db880a5fbfcf71adc7e"
 
-vscode-css-languageservice@^3.0.9-next.18:
-  version "3.0.9-next.18"
-  resolved "https://registry.yarnpkg.com/vscode-css-languageservice/-/vscode-css-languageservice-3.0.9-next.18.tgz#f8f25123b5a8cdc9f72fafcd2c0088f726322437"
-  dependencies:
-    vscode-languageserver-types "^3.7.2"
-    vscode-nls "^3.2.2"
+ansi-regex@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
 
-vscode-html-languageservice@^2.1.3-next.5:
-  version "2.1.3-next.5"
-  resolved "https://registry.yarnpkg.com/vscode-html-languageservice/-/vscode-html-languageservice-2.1.3-next.5.tgz#cfbf4ffed96845ad13999d572ce0b5c2aeee84af"
+balanced-match@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
+
+brace-expansion@^1.1.7:
+  version "1.1.11"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
   dependencies:
-    vscode-languageserver-types "^3.7.2"
-    vscode-nls "^3.2.2"
-    vscode-uri "^1.0.3"
+    balanced-match "^1.0.0"
+    concat-map "0.0.1"
+
+browser-stdout@1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.1.tgz#baa559ee14ced73452229bad7326467c61fabd60"
+
+charenc@~0.0.1:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/charenc/-/charenc-0.0.2.tgz#c0a1d2f3a7092e03774bfa83f14c0fc5790a8667"
+
+commander@2.15.1:
+  version "2.15.1"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.15.1.tgz#df46e867d0fc2aec66a34662b406a9ccafff5b0f"
+
+concat-map@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
+
+crypt@~0.0.1:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/crypt/-/crypt-0.0.2.tgz#88d7ff7ec0dfb86f713dc87bbb42d044d3e6c41b"
+
+debug@3.1.0, debug@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
+  dependencies:
+    ms "2.0.0"
+
+debug@^2.2.0:
+  version "2.6.9"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
+  dependencies:
+    ms "2.0.0"
+
+diff@3.5.0:
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
+
+escape-string-regexp@1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
+
+fs.realpath@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
+
+glob@7.1.2, glob@^7.1.2:
+  version "7.1.2"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.0.4"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
+growl@1.10.5:
+  version "1.10.5"
+  resolved "https://registry.yarnpkg.com/growl/-/growl-1.10.5.tgz#f2735dc2283674fa67478b10181059355c369e5e"
+
+has-flag@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
+
+he@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/he/-/he-1.1.1.tgz#93410fd21b009735151f8868c2f271f3427e23fd"
+
+inflight@^1.0.4:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
+  dependencies:
+    once "^1.3.0"
+    wrappy "1"
+
+inherits@2:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
+
+is-buffer@~1.1.1:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
+
+lodash@^4.16.4:
+  version "4.17.10"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"
+
+md5@^2.1.0:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/md5/-/md5-2.2.1.tgz#53ab38d5fe3c8891ba465329ea23fac0540126f9"
+  dependencies:
+    charenc "~0.0.1"
+    crypt "~0.0.1"
+    is-buffer "~1.1.1"
+
+minimatch@3.0.4, minimatch@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
+  dependencies:
+    brace-expansion "^1.1.7"
+
+minimist@0.0.8:
+  version "0.0.8"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
+
+mkdirp@0.5.1, mkdirp@~0.5.1:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
+  dependencies:
+    minimist "0.0.8"
+
+mocha-junit-reporter@^1.17.0:
+  version "1.17.0"
+  resolved "https://registry.yarnpkg.com/mocha-junit-reporter/-/mocha-junit-reporter-1.17.0.tgz#2e5149ed40fc5d2e3ca71e42db5ab1fec9c6d85c"
+  dependencies:
+    debug "^2.2.0"
+    md5 "^2.1.0"
+    mkdirp "~0.5.1"
+    strip-ansi "^4.0.0"
+    xml "^1.0.0"
+
+mocha-multi-reporters@^1.1.7:
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/mocha-multi-reporters/-/mocha-multi-reporters-1.1.7.tgz#cc7f3f4d32f478520941d852abb64d9988587d82"
+  dependencies:
+    debug "^3.1.0"
+    lodash "^4.16.4"
+
+mocha@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/mocha/-/mocha-5.2.0.tgz#6d8ae508f59167f940f2b5b3c4a612ae50c90ae6"
+  dependencies:
+    browser-stdout "1.3.1"
+    commander "2.15.1"
+    debug "3.1.0"
+    diff "3.5.0"
+    escape-string-regexp "1.0.5"
+    glob "7.1.2"
+    growl "1.10.5"
+    he "1.1.1"
+    minimatch "3.0.4"
+    mkdirp "0.5.1"
+    supports-color "5.4.0"
+
+ms@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
+
+once@^1.3.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
+  dependencies:
+    wrappy "1"
+
+path-is-absolute@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
+
+strip-ansi@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
+  dependencies:
+    ansi-regex "^3.0.0"
+
+supports-color@5.4.0:
+  version "5.4.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.4.0.tgz#1c6b337402c2137605efe19f10fec390f6faab54"
+  dependencies:
+    has-flag "^3.0.0"
+
+vscode-css-languageservice@^3.0.10:
+  version "3.0.10"
+  resolved "https://registry.yarnpkg.com/vscode-css-languageservice/-/vscode-css-languageservice-3.0.10.tgz#71ece7e0d19227e9f21bcd5d5d928f817a7d701e"
+  dependencies:
+    vscode-languageserver-types "^3.12.0"
+    vscode-nls "^3.2.5"
+
+vscode-html-languageservice@^2.1.7:
+  version "2.1.7"
+  resolved "https://registry.yarnpkg.com/vscode-html-languageservice/-/vscode-html-languageservice-2.1.7.tgz#0177c01f0946ea42aae1068bc0b7ef09e3959daa"
+  dependencies:
+    vscode-languageserver-types "^3.12.0"
+    vscode-nls "^3.2.5"
+    vscode-uri "^1.0.6"
 
 vscode-jsonrpc@^3.6.2:
   version "3.6.2"
   resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-3.6.2.tgz#3b5eef691159a15556ecc500e9a8a0dd143470c8"
 
-vscode-languageserver-protocol-foldingprovider@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol-foldingprovider/-/vscode-languageserver-protocol-foldingprovider-2.0.1.tgz#051d0d9e58d1b79dc4681acd48f21797f5515bfd"
-  dependencies:
-    vscode-languageserver-protocol "^3.7.2"
-    vscode-languageserver-types "^3.7.2"
-
-vscode-languageserver-protocol@^3.7.2:
-  version "3.7.2"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.7.2.tgz#df58621c032139010888b6a9ddc969423f9ba9d6"
+vscode-languageserver-protocol@^3.13.0-next.1:
+  version "3.13.0-next.1"
+  resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.13.0-next.1.tgz#24d15aa5769e4b035f6ce38342685959e1eb454e"
   dependencies:
     vscode-jsonrpc "^3.6.2"
-    vscode-languageserver-types "^3.7.2"
+    vscode-languageserver-types "^3.13.0-next.1"
 
-vscode-languageserver-types@^3.7.2:
-  version "3.7.2"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.7.2.tgz#aad8846f8e3e27962648554de5a8417e358f34eb"
+vscode-languageserver-types@^3.10.0:
+  version "3.10.0"
+  resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.10.0.tgz#944e5308f3b36a3f372c766f1a344e903ec9c389"
 
-vscode-languageserver@^4.1.3:
-  version "4.1.3"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver/-/vscode-languageserver-4.1.3.tgz#937d37c955b6b9c2409388413cd6f54d1eb9fe7d"
+vscode-languageserver-types@^3.12.0:
+  version "3.12.0"
+  resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.12.0.tgz#f96051381b6a050b7175b37d6cb5d2f2eb64b944"
+
+vscode-languageserver-types@^3.13.0-next.1:
+  version "3.13.0-next.1"
+  resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.13.0-next.1.tgz#dd91b78b13a2a6c7131e8291e3db3183cf566280"
+
+vscode-languageserver@^5.1.0-next.5:
+  version "5.1.0-next.5"
+  resolved "https://registry.yarnpkg.com/vscode-languageserver/-/vscode-languageserver-5.1.0-next.5.tgz#d343278b4de448a31f9db146b98638898c8d4f55"
   dependencies:
-    vscode-languageserver-protocol "^3.7.2"
-    vscode-uri "^1.0.1"
+    vscode-languageserver-protocol "^3.13.0-next.1"
+    vscode-uri "^1.0.5"
 
-vscode-nls@^3.2.2:
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.2.tgz#3817eca5b985c2393de325197cf4e15eb2aa5350"
+vscode-nls@^3.2.5:
+  version "3.2.5"
+  resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.5.tgz#25520c1955108036dec607c85e00a522f247f1a4"
 
-vscode-uri@^1.0.1:
+vscode-nls@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-4.0.0.tgz#4001c8a6caba5cedb23a9c5ce1090395c0e44002"
+
+vscode-uri@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-1.0.5.tgz#3b899a8ef71c37f3054d79bdbdda31c7bf36f20d"
+
+vscode-uri@^1.0.6:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-1.0.6.tgz#6b8f141b0bbc44ad7b07e94f82f168ac7608ad4d"
+
+wrappy@1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
+
+xml@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-1.0.1.tgz#11a86befeac3c4aa3ec08623651a3c81a6d0bbc8"
-
-vscode-uri@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-1.0.3.tgz#631bdbf716dccab0e65291a8dc25c23232085a52"
+  resolved "https://registry.yarnpkg.com/xml/-/xml-1.0.1.tgz#78ba72020029c5bc87b8a81a3cfcd74b4a2fc1e5"
diff --git a/extensions/html-language-features/yarn.lock b/extensions/html-language-features/yarn.lock
index 36c0c89cd28..0d575e41a32 100644
--- a/extensions/html-language-features/yarn.lock
+++ b/extensions/html-language-features/yarn.lock
@@ -2,9 +2,9 @@
 # yarn lockfile v1
 
 
-"@types/node@7.0.43":
-  version "7.0.43"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.43.tgz#a187e08495a075f200ca946079c914e1a5fe962c"
+"@types/node@^8.10.25":
+  version "8.10.25"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-8.10.25.tgz#801fe4e39372cef18f268db880a5fbfcf71adc7e"
 
 applicationinsights@1.0.1:
   version "1.0.1"
@@ -24,47 +24,41 @@ diagnostic-channel@0.2.0:
   dependencies:
     semver "^5.3.0"
 
-semver@^5.3.0:
-  version "5.5.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab"
+semver@^5.3.0, semver@^5.5.0:
+  version "5.5.1"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.1.tgz#7dfdd8814bdb7cabc7be0fb1d734cfb66c940477"
 
-vscode-extension-telemetry@0.0.17:
-  version "0.0.17"
-  resolved "https://registry.yarnpkg.com/vscode-extension-telemetry/-/vscode-extension-telemetry-0.0.17.tgz#15123e7edb34e7b9724b6056f54a869bbb922cb7"
+vscode-extension-telemetry@0.0.18:
+  version "0.0.18"
+  resolved "https://registry.yarnpkg.com/vscode-extension-telemetry/-/vscode-extension-telemetry-0.0.18.tgz#602ba20d8c71453aa34533a291e7638f6e5c0327"
   dependencies:
     applicationinsights "1.0.1"
 
-vscode-jsonrpc@^3.6.2:
-  version "3.6.2"
-  resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-3.6.2.tgz#3b5eef691159a15556ecc500e9a8a0dd143470c8"
+vscode-jsonrpc@^3.7.0-next.1:
+  version "3.7.0-next.1"
+  resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-3.7.0-next.1.tgz#e7521cd8135006ba8bf57ebcedbf5b03ce17b23e"
 
-vscode-languageclient@^4.1.4:
-  version "4.1.4"
-  resolved "https://registry.yarnpkg.com/vscode-languageclient/-/vscode-languageclient-4.1.4.tgz#fff1a6bca4714835dca7fce35bc4ce81442fdf2c"
+vscode-languageclient@^5.1.0-next.9:
+  version "5.1.0-next.9"
+  resolved "https://registry.yarnpkg.com/vscode-languageclient/-/vscode-languageclient-5.1.0-next.9.tgz#fe56c523637c118f7b262952b889f760223ab75a"
   dependencies:
-    vscode-languageserver-protocol "^3.7.2"
+    semver "^5.5.0"
+    vscode-languageserver-protocol "^3.13.0-next.2"
 
-vscode-languageserver-protocol-foldingprovider@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol-foldingprovider/-/vscode-languageserver-protocol-foldingprovider-2.0.1.tgz#051d0d9e58d1b79dc4681acd48f21797f5515bfd"
+vscode-languageserver-protocol@^3.13.0-next.2:
+  version "3.13.0-next.2"
+  resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.13.0-next.2.tgz#7083e50d0d2096ba52de448082445b9c39081fdb"
   dependencies:
-    vscode-languageserver-protocol "^3.7.2"
-    vscode-languageserver-types "^3.7.2"
+    vscode-jsonrpc "^3.7.0-next.1"
+    vscode-languageserver-types "^3.13.0-next.1"
 
-vscode-languageserver-protocol@^3.7.2:
-  version "3.7.2"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.7.2.tgz#df58621c032139010888b6a9ddc969423f9ba9d6"
-  dependencies:
-    vscode-jsonrpc "^3.6.2"
-    vscode-languageserver-types "^3.7.2"
+vscode-languageserver-types@^3.13.0-next.1:
+  version "3.13.0-next.1"
+  resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.13.0-next.1.tgz#dd91b78b13a2a6c7131e8291e3db3183cf566280"
 
-vscode-languageserver-types@^3.7.2:
-  version "3.7.2"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.7.2.tgz#aad8846f8e3e27962648554de5a8417e358f34eb"
-
-vscode-nls@^3.2.2:
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.2.tgz#3817eca5b985c2393de325197cf4e15eb2aa5350"
+vscode-nls@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-4.0.0.tgz#4001c8a6caba5cedb23a9c5ce1090395c0e44002"
 
 zone.js@0.7.6:
   version "0.7.6"
diff --git a/extensions/html/syntaxes/html.tmLanguage.json b/extensions/html/syntaxes/html.tmLanguage.json
index 6b9b1f58e7d..31f584840f6 100644
--- a/extensions/html/syntaxes/html.tmLanguage.json
+++ b/extensions/html/syntaxes/html.tmLanguage.json
@@ -4,12 +4,12 @@
 		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
 		"Once accepted there, we are happy to receive an update request."
 	],
-	"version": "https://github.com/textmate/html.tmbundle/commit/a723f08ebd49c67c22aca08dd8f17d0bf836ec93",
+	"version": "https://github.com/textmate/html.tmbundle/commit/6a6fb2967e2f562a634fca97d18018104d428f1c",
 	"name": "HTML",
 	"scopeName": "text.html.basic",
 	"injections": {
-		"R:text.html - (comment.block, text.html source)": {
-			"comment": "Use R: to ensure this matches after any other injections.",
+		"R:text.html - (comment.block, text.html meta.embedded, meta.tag.*.*.html, meta.tag.*.*.*.html, meta.tag.*.*.*.*.html)": {
+			"comment": "Uses R: to ensure this matches after any other injections.",
 			"patterns": [
 				{
 					"match": "<",
@@ -19,38 +19,6 @@
 		}
 	},
 	"patterns": [
-		{
-			"begin": "(<)([a-zA-Z][a-zA-Z0-9:-]*)(?=[^>]*></\\2>)",
-			"beginCaptures": {
-				"1": {
-					"name": "punctuation.definition.tag.html"
-				},
-				"2": {
-					"name": "entity.name.tag.html"
-				}
-			},
-			"end": "(>(<)/)(\\2)(>)",
-			"endCaptures": {
-				"1": {
-					"name": "punctuation.definition.tag.html"
-				},
-				"2": {
-					"name": "meta.scope.between-tag-pair.html"
-				},
-				"3": {
-					"name": "entity.name.tag.html"
-				},
-				"4": {
-					"name": "punctuation.definition.tag.html"
-				}
-			},
-			"name": "meta.tag.any.html",
-			"patterns": [
-				{
-					"include": "#tag-stuff"
-				}
-			]
-		},
 		{
 			"begin": "(<\\?)(xml)",
 			"captures": {
@@ -58,481 +26,463 @@
 					"name": "punctuation.definition.tag.html"
 				},
 				"2": {
-					"name": "entity.name.tag.xml.html"
+					"name": "entity.name.tag.html"
 				}
 			},
 			"end": "(\\?>)",
-			"name": "meta.tag.preprocessor.xml.html",
+			"name": "meta.tag.metadata.processing.xml.html",
 			"patterns": [
 				{
-					"include": "#tag-generic-attribute"
-				},
-				{
-					"include": "#string-double-quoted"
-				},
-				{
-					"include": "#string-single-quoted"
+					"include": "#attribute"
 				}
 			]
 		},
 		{
+			"include": "#comment"
+		},
+		{
+			"begin": "<!(?=(?i:DOCTYPE\\s))",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.definition.tag.begin.html"
+				}
+			},
+			"end": ">",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.tag.end.html"
+				}
+			},
+			"name": "meta.tag.metadata.doctype.html",
+			"patterns": [
+				{
+					"match": "\\G(?i:DOCTYPE)",
+					"name": "entity.name.tag.html"
+				},
+				{
+					"begin": "\"",
+					"end": "\"",
+					"name": "string.quoted.double.html"
+				},
+				{
+					"match": "[^\\s>]+",
+					"name": "entity.other.attribute-name.html"
+				}
+			]
+		},
+		{
+			"include": "#cdata"
+		},
+		{
+			"include": "#tags-valid"
+		},
+		{
+			"include": "#tags-invalid"
+		},
+		{
+			"include": "#entities"
+		}
+	],
+	"repository": {
+		"attribute": {
+			"patterns": [
+				{
+					"begin": "(s(hape|cope|t(ep|art)|ize(s)?|p(ellcheck|an)|elected|lot|andbox|rc(set|doc|lang)?)|h(ttp-equiv|i(dden|gh)|e(ight|aders)|ref(lang)?)|n(o(nce|validate|module)|ame)|c(h(ecked|arset)|ite|o(nt(ent(editable)?|rols)|ords|l(s(pan)?|or))|lass|rossorigin)|t(ype(mustmatch)?|itle|a(rget|bindex)|ranslate)|i(s(map)?|n(tegrity|putmode)|tem(scope|type|id|prop|ref)|d)|op(timum|en)|d(i(sabled|r(name)?)|ownload|e(coding|f(er|ault))|at(etime|a)|raggable)|usemap|p(ing|oster|la(ysinline|ceholder)|attern|reload)|enctype|value|kind|for(m(novalidate|target|enctype|action|method)?)?|w(idth|rap)|l(ist|o(op|w)|a(ng|bel))|a(s(ync)?|c(ce(sskey|pt(-charset)?)|tion)|uto(c(omplete|apitalize)|play|focus)|l(t|low(usermedia|paymentrequest|fullscreen))|bbr)|r(ows(pan)?|e(versed|quired|ferrerpolicy|l|adonly))|m(in(length)?|u(ted|ltiple)|e(thod|dia)|a(nifest|x(length)?)))(?![\\w:-])",
+					"beginCaptures": {
+						"0": {
+							"name": "entity.other.attribute-name.html"
+						}
+					},
+					"comment": "HTML5 attributes, not event handlers",
+					"end": "(?=\\s*+[^=\\s])",
+					"name": "meta.attribute.$1.html",
+					"patterns": [
+						{
+							"include": "#attribute-interior"
+						}
+					]
+				},
+				{
+					"begin": "style(?![\\w:-])",
+					"beginCaptures": {
+						"0": {
+							"name": "entity.other.attribute-name.html"
+						}
+					},
+					"comment": "HTML5 style attribute",
+					"end": "(?=\\s*+[^=\\s])",
+					"name": "meta.attribute.style.html",
+					"patterns": [
+						{
+							"begin": "=",
+							"beginCaptures": {
+								"0": {
+									"name": "punctuation.separator.key-value.html"
+								}
+							},
+							"end": "(?<=[^\\s=])(?!\\s*=)|(?=/?>)",
+							"patterns": [
+								{
+									"begin": "(?=[^\\s=<>`/]|/(?!>))",
+									"end": "(?!\\G)",
+									"name": "meta.embedded.line.css",
+									"patterns": [
+										{
+											"captures": {
+												"0": {
+													"name": "source.css"
+												}
+											},
+											"match": "([^\\s\"'=<>`/]|/(?!>))+",
+											"name": "string.unquoted.html"
+										},
+										{
+											"begin": "\"",
+											"beginCaptures": {
+												"0": {
+													"name": "punctuation.definition.string.begin.html"
+												}
+											},
+											"contentName": "source.css",
+											"end": "(\")",
+											"endCaptures": {
+												"0": {
+													"name": "punctuation.definition.string.end.html"
+												},
+												"1": {
+													"name": "source.css"
+												}
+											},
+											"name": "string.quoted.double.html",
+											"patterns": [
+												{
+													"include": "#entities"
+												}
+											]
+										},
+										{
+											"begin": "'",
+											"beginCaptures": {
+												"0": {
+													"name": "punctuation.definition.string.begin.html"
+												}
+											},
+											"contentName": "source.css",
+											"end": "(')",
+											"endCaptures": {
+												"0": {
+													"name": "punctuation.definition.string.end.html"
+												},
+												"1": {
+													"name": "source.css"
+												}
+											},
+											"name": "string.quoted.single.html",
+											"patterns": [
+												{
+													"include": "#entities"
+												}
+											]
+										}
+									]
+								},
+								{
+									"match": "=",
+									"name": "invalid.illegal.unexpected-equals-sign.html"
+								}
+							]
+						}
+					]
+				},
+				{
+					"begin": "on(s(croll|t(orage|alled)|u(spend|bmit)|e(curitypolicyviolation|ek(ing|ed)|lect))|hashchange|c(hange|o(ntextmenu|py)|u(t|echange)|l(ick|ose)|an(cel|play(through)?))|t(imeupdate|oggle)|in(put|valid)|o(nline|ffline)|d(urationchange|r(op|ag(start|over|e(n(ter|d)|xit)|leave)?)|blclick)|un(handledrejection|load)|p(opstate|lay(ing)?|a(ste|use|ge(show|hide))|rogress)|e(nded|rror|mptied)|volumechange|key(down|up|press)|focus|w(heel|aiting)|l(oad(start|e(nd|d(data|metadata)))?|anguagechange)|a(uxclick|fterprint|bort)|r(e(s(ize|et)|jectionhandled)|atechange)|m(ouse(o(ut|ver)|down|up|enter|leave|move)|essage(error)?)|b(efore(unload|print)|lur))(?![\\w:-])",
+					"beginCaptures": {
+						"0": {
+							"name": "entity.other.attribute-name.html"
+						}
+					},
+					"comment": "HTML5 attributes, event handlers",
+					"end": "(?=\\s*+[^=\\s])",
+					"name": "meta.attribute.event-handler.$1.html",
+					"patterns": [
+						{
+							"begin": "=",
+							"beginCaptures": {
+								"0": {
+									"name": "punctuation.separator.key-value.html"
+								}
+							},
+							"end": "(?<=[^\\s=])(?!\\s*=)|(?=/?>)",
+							"patterns": [
+								{
+									"begin": "(?=[^\\s=<>`/]|/(?!>))",
+									"end": "(?!\\G)",
+									"name": "meta.embedded.line.js",
+									"patterns": [
+										{
+											"captures": {
+												"0": {
+													"name": "source.js"
+												},
+												"1": {
+													"patterns": [
+														{
+															"include": "source.js"
+														}
+													]
+												}
+											},
+											"match": "(([^\\s\"'=<>`/]|/(?!>))+)",
+											"name": "string.unquoted.html"
+										},
+										{
+											"begin": "\"",
+											"beginCaptures": {
+												"0": {
+													"name": "punctuation.definition.string.begin.html"
+												}
+											},
+											"contentName": "source.js",
+											"end": "(\")",
+											"endCaptures": {
+												"0": {
+													"name": "punctuation.definition.string.end.html"
+												},
+												"1": {
+													"name": "source.js"
+												}
+											},
+											"name": "string.quoted.double.html",
+											"patterns": [
+												{
+													"captures": {
+														"0": {
+															"patterns": [
+																{
+																	"include": "source.js"
+																}
+															]
+														}
+													},
+													"match": "[^\\n\"]+"
+												}
+											]
+										},
+										{
+											"begin": "'",
+											"beginCaptures": {
+												"0": {
+													"name": "punctuation.definition.string.begin.html"
+												}
+											},
+											"contentName": "source.js",
+											"end": "(')",
+											"endCaptures": {
+												"0": {
+													"name": "punctuation.definition.string.end.html"
+												},
+												"1": {
+													"name": "source.js"
+												}
+											},
+											"name": "string.quoted.single.html",
+											"patterns": [
+												{
+													"captures": {
+														"0": {
+															"patterns": [
+																{
+																	"include": "source.js"
+																}
+															]
+														}
+													},
+													"match": "[^\\n']+"
+												}
+											]
+										}
+									]
+								},
+								{
+									"match": "=",
+									"name": "invalid.illegal.unexpected-equals-sign.html"
+								}
+							]
+						}
+					]
+				},
+				{
+					"begin": "(data-[a-z\\-]+)(?![\\w:-])",
+					"beginCaptures": {
+						"0": {
+							"name": "entity.other.attribute-name.html"
+						}
+					},
+					"comment": "HTML5 attributes, data-*",
+					"end": "(?=\\s*+[^=\\s])",
+					"name": "meta.attribute.data-x.$1.html",
+					"patterns": [
+						{
+							"include": "#attribute-interior"
+						}
+					]
+				},
+				{
+					"begin": "(align|bgcolor|border)(?![\\w:-])",
+					"beginCaptures": {
+						"0": {
+							"name": "invalid.deprecated.entity.other.attribute-name.html"
+						}
+					},
+					"comment": "HTML attributes, deprecated",
+					"end": "(?=\\s*+[^=\\s])",
+					"name": "meta.attribute.$1.html",
+					"patterns": [
+						{
+							"include": "#attribute-interior"
+						}
+					]
+				},
+				{
+					"begin": "([^\\x{0020}\"'<>/=\\x{0000}-\\x{001F}\\x{007F}-\\x{009F}\\x{FDD0}-\\x{FDEF}\\x{FFFE}\\x{FFFF}\\x{1FFFE}\\x{1FFFF}\\x{2FFFE}\\x{2FFFF}\\x{3FFFE}\\x{3FFFF}\\x{4FFFE}\\x{4FFFF}\\x{5FFFE}\\x{5FFFF}\\x{6FFFE}\\x{6FFFF}\\x{7FFFE}\\x{7FFFF}\\x{8FFFE}\\x{8FFFF}\\x{9FFFE}\\x{9FFFF}\\x{AFFFE}\\x{AFFFF}\\x{BFFFE}\\x{BFFFF}\\x{CFFFE}\\x{CFFFF}\\x{DFFFE}\\x{DFFFF}\\x{EFFFE}\\x{EFFFF}\\x{FFFFE}\\x{FFFFF}\\x{10FFFE}\\x{10FFFF}]+)",
+					"beginCaptures": {
+						"0": {
+							"name": "entity.other.attribute-name.html"
+						}
+					},
+					"comment": "Anything else that is valid",
+					"end": "(?=\\s*+[^=\\s])",
+					"name": "meta.attribute.unrecognized.$1.html",
+					"patterns": [
+						{
+							"include": "#attribute-interior"
+						}
+					]
+				},
+				{
+					"match": "[^\\s>]+",
+					"name": "invalid.illegal.character-not-allowed-here.html"
+				}
+			]
+		},
+		"attribute-interior": {
+			"patterns": [
+				{
+					"begin": "=",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.separator.key-value.html"
+						}
+					},
+					"end": "(?<=[^\\s=])(?!\\s*=)|(?=/?>)",
+					"patterns": [
+						{
+							"match": "([^\\s\"'=<>`/]|/(?!>))+",
+							"name": "string.unquoted.html"
+						},
+						{
+							"begin": "\"",
+							"beginCaptures": {
+								"0": {
+									"name": "punctuation.definition.string.begin.html"
+								}
+							},
+							"end": "\"",
+							"endCaptures": {
+								"0": {
+									"name": "punctuation.definition.string.end.html"
+								}
+							},
+							"name": "string.quoted.double.html",
+							"patterns": [
+								{
+									"include": "#entities"
+								}
+							]
+						},
+						{
+							"begin": "'",
+							"beginCaptures": {
+								"0": {
+									"name": "punctuation.definition.string.begin.html"
+								}
+							},
+							"end": "'",
+							"endCaptures": {
+								"0": {
+									"name": "punctuation.definition.string.end.html"
+								}
+							},
+							"name": "string.quoted.single.html",
+							"patterns": [
+								{
+									"include": "#entities"
+								}
+							]
+						},
+						{
+							"match": "=",
+							"name": "invalid.illegal.unexpected-equals-sign.html"
+						}
+					]
+				}
+			]
+		},
+		"cdata": {
+			"begin": "<!\\[CDATA\\[",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.definition.tag.begin.html"
+				}
+			},
+			"contentName": "string.other.inline-data.html",
+			"end": "]]>",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.tag.end.html"
+				}
+			},
+			"name": "meta.tag.metadata.cdata.html"
+		},
+		"comment": {
 			"begin": "<!--",
 			"captures": {
 				"0": {
 					"name": "punctuation.definition.comment.html"
 				}
 			},
-			"end": "--\\s*>",
+			"end": "-->",
 			"name": "comment.block.html",
 			"patterns": [
 				{
-					"match": "--",
-					"name": "invalid.illegal.bad-comments-or-CDATA.html"
+					"match": "\\G-?>",
+					"name": "invalid.illegal.characters-not-allowed-here.html"
 				},
 				{
-					"include": "#embedded-code"
-				}
-			]
-		},
-		{
-			"begin": "<!",
-			"captures": {
-				"0": {
-					"name": "punctuation.definition.tag.html"
-				}
-			},
-			"end": ">",
-			"name": "meta.tag.sgml.html",
-			"patterns": [
-				{
-					"begin": "(?i:DOCTYPE)",
-					"captures": {
-						"1": {
-							"name": "entity.name.tag.doctype.html"
-						}
-					},
-					"end": "(?=>)",
-					"name": "meta.tag.sgml.doctype.html",
-					"patterns": [
-						{
-							"match": "\"[^\">]*\"",
-							"name": "string.quoted.double.doctype.identifiers-and-DTDs.html"
-						}
-					]
+					"match": "<!--(?!>)|<!-(?=-->)",
+					"name": "invalid.illegal.characters-not-allowed-here.html"
 				},
 				{
-					"begin": "\\[CDATA\\[",
-					"end": "]](?=>)",
-					"name": "constant.other.inline-data.html"
-				},
-				{
-					"match": "(\\s*)(?!--|>)\\S(\\s*)",
-					"name": "invalid.illegal.bad-comments-or-CDATA.html"
-				}
-			]
-		},
-		{
-			"include": "#embedded-code"
-		},
-		{
-			"begin": "(^[ \\t]+)?(?=<(?i:style))",
-			"beginCaptures": {
-				"1": {
-					"name": "punctuation.whitespace.embedded.leading.html"
-				}
-			},
-			"end": "(?!\\G)([ \\t]*$\\n?)?",
-			"endCaptures": {
-				"1": {
-					"name": "punctuation.whitespace.embedded.trailing.html"
-				}
-			},
-			"patterns": [
-				{
-					"begin": "(<)((?i:style))\\b",
-					"beginCaptures": {
-						"0": {
-							"name": "meta.tag.metadata.style.html"
-						},
-						"1": {
-							"name": "punctuation.definition.tag.begin.html"
-						},
-						"2": {
-							"name": "entity.name.tag.html"
-						}
-					},
-					"end": "(/>)|((<)/)((?i:style))(>)",
-					"endCaptures": {
-						"0": {
-							"name": "meta.tag.metadata.style.html"
-						},
-						"1": {
-							"name": "punctuation.definition.tag.end.html"
-						},
-						"2": {
-							"name": "punctuation.definition.tag.begin.html"
-						},
-						"3": {
-							"name": "source.css"
-						},
-						"4": {
-							"name": "entity.name.tag.html"
-						},
-						"5": {
-							"name": "punctuation.definition.tag.end.html"
-						}
-					},
-					"name": "meta.embedded.block.html",
-					"patterns": [
-						{
-							"begin": "\\G",
-							"captures": {
-								"1": {
-									"name": "punctuation.definition.tag.end.html"
-								}
-							},
-							"end": "(?=/>)|(>)",
-							"name": "meta.tag.metadata.style.html",
-							"patterns": [
-								{
-									"include": "#tag-stuff"
-								}
-							]
-						},
-						{
-							"begin": "(?!\\G)",
-							"end": "(?=</(?i:style))",
-							"name": "source.css",
-							"patterns": [
-								{
-									"include": "#embedded-code"
-								},
-								{
-									"include": "source.css"
-								}
-							]
-						}
-					]
-				}
-			]
-		},
-		{
-			"begin": "(^[ \\t]+)?(?=<(?i:script))",
-			"beginCaptures": {
-				"1": {
-					"name": "punctuation.whitespace.embedded.leading.html"
-				}
-			},
-			"end": "(?!\\G)([ \\t]*$\\n?)?",
-			"endCaptures": {
-				"1": {
-					"name": "punctuation.whitespace.embedded.trailing.html"
-				}
-			},
-			"patterns": [
-				{
-					"begin": "(<)((?i:script))\\b",
-					"beginCaptures": {
-						"0": {
-							"name": "meta.tag.metadata.script.html"
-						},
-						"1": {
-							"name": "punctuation.definition.tag.begin.html"
-						},
-						"2": {
-							"name": "entity.name.tag.html"
-						}
-					},
-					"end": "(/>)|(/)((?i:script))(>)",
-					"endCaptures": {
-						"0": {
-							"name": "meta.tag.metadata.script.html"
-						},
-						"1": {
-							"name": "punctuation.definition.tag.end.html"
-						},
-						"2": {
-							"name": "punctuation.definition.tag.begin.html"
-						},
-						"3": {
-							"name": "entity.name.tag.html"
-						},
-						"4": {
-							"name": "punctuation.definition.tag.end.html"
-						}
-					},
-					"name": "meta.embedded.block.html",
-					"patterns": [
-						{
-							"begin": "\\G",
-							"end": "(?=/>|/)",
-							"patterns": [
-								{
-									"begin": "(>)",
-									"beginCaptures": {
-										"0": {
-											"name": "meta.tag.metadata.script.html"
-										},
-										"1": {
-											"name": "punctuation.definition.tag.end.html"
-										}
-									},
-									"end": "((<))(?=/(?i:script))",
-									"endCaptures": {
-										"0": {
-											"name": "meta.tag.metadata.script.html"
-										},
-										"1": {
-											"name": "punctuation.definition.tag.begin.html"
-										},
-										"2": {
-											"name": "source.js"
-										}
-									},
-									"patterns": [
-										{
-											"begin": "\\G",
-											"end": "(?=</(?i:script))",
-											"name": "source.js",
-											"patterns": [
-												{
-													"begin": "(^[ \\t]+)?(?=//)",
-													"beginCaptures": {
-														"1": {
-															"name": "punctuation.whitespace.comment.leading.js"
-														}
-													},
-													"end": "(?!\\G)",
-													"patterns": [
-														{
-															"begin": "//",
-															"beginCaptures": {
-																"0": {
-																	"name": "punctuation.definition.comment.js"
-																}
-															},
-															"end": "(?=</script)|\\n",
-															"name": "comment.line.double-slash.js"
-														}
-													]
-												},
-												{
-													"begin": "/\\*",
-													"captures": {
-														"0": {
-															"name": "punctuation.definition.comment.js"
-														}
-													},
-													"end": "\\*/|(?=</script)",
-													"name": "comment.block.js"
-												},
-												{
-													"include": "source.js"
-												}
-											]
-										}
-									]
-								},
-								{
-									"begin": "\\G",
-									"end": "(?i:(?=/?>|type(?=[\\s=])(?!\\s*=\\s*('|\"|)(text/(javascript|ecmascript|babel)|application/((x-)?javascript|ecmascript|babel)|module)[\\s\"'>])))",
-									"name": "meta.tag.metadata.script.html",
-									"patterns": [
-										{
-											"include": "#tag-stuff"
-										}
-									]
-								},
-								{
-									"begin": "(?=(?i:type\\s*=\\s*('|\"|)(text/(x-handlebars|(x-(handlebars-)?|ng-)?template|html)[\\s\"'>])))",
-									"end": "((<))(?=/(?i:script))",
-									"endCaptures": {
-										"0": {
-											"name": "meta.tag.metadata.script.html"
-										},
-										"1": {
-											"name": "punctuation.definition.tag.begin.html"
-										},
-										"2": {
-											"name": "text.html.basic"
-										}
-									},
-									"patterns": [
-										{
-											"begin": "\\G",
-											"end": "(>)|(?=/>)",
-											"endCaptures": {
-												"1": {
-													"name": "punctuation.definition.tag.end.html"
-												}
-											},
-											"name": "meta.tag.metadata.script.html",
-											"patterns": [
-												{
-													"include": "#tag-stuff"
-												}
-											]
-										},
-										{
-											"begin": "(?!\\G)",
-											"end": "(?=</(?i:script))",
-											"name": "text.html.basic",
-											"patterns": [
-												{
-													"include": "text.html.basic"
-												}
-											]
-										}
-									]
-								},
-								{
-									"begin": "(?=(?i:type))",
-									"end": "(<)(?=/(?i:script))",
-									"endCaptures": {
-										"0": {
-											"name": "meta.tag.metadata.script.html"
-										},
-										"1": {
-											"name": "punctuation.definition.tag.begin.html"
-										}
-									},
-									"patterns": [
-										{
-											"begin": "\\G",
-											"end": "(>)|(?=/>)",
-											"endCaptures": {
-												"1": {
-													"name": "punctuation.definition.tag.end.html"
-												}
-											},
-											"name": "meta.tag.metadata.script.html",
-											"patterns": [
-												{
-													"include": "#tag-stuff"
-												}
-											]
-										},
-										{
-											"begin": "(?!\\G)",
-											"end": "(?=</(?i:script))",
-											"name": "source.unknown"
-										}
-									]
-								}
-							]
-						}
-					]
-				}
-			]
-		},
-		{
-			"begin": "(</?)((?i:body|head|html)\\b)",
-			"captures": {
-				"1": {
-					"name": "punctuation.definition.tag.html"
-				},
-				"2": {
-					"name": "entity.name.tag.structure.any.html"
-				}
-			},
-			"end": "(>)",
-			"name": "meta.tag.structure.any.html",
-			"patterns": [
-				{
-					"include": "#tag-stuff"
-				}
-			]
-		},
-		{
-			"begin": "(</?)((?i:address|blockquote|dd|div|section|article|aside|header|footer|nav|menu|dl|dt|fieldset|form|frame|frameset|h1|h2|h3|h4|h5|h6|iframe|noframes|object|ol|p|ul|applet|center|dir|hr|pre)\\b)",
-			"beginCaptures": {
-				"1": {
-					"name": "punctuation.definition.tag.begin.html"
-				},
-				"2": {
-					"name": "entity.name.tag.block.any.html"
-				}
-			},
-			"end": "(>)",
-			"endCaptures": {
-				"1": {
-					"name": "punctuation.definition.tag.end.html"
-				}
-			},
-			"name": "meta.tag.block.any.html",
-			"patterns": [
-				{
-					"include": "#tag-stuff"
-				}
-			]
-		},
-		{
-			"begin": "(</?)((?i:a|abbr|acronym|area|b|base|basefont|bdo|big|br|button|caption|cite|code|col|colgroup|del|dfn|em|font|head|html|i|img|input|ins|isindex|kbd|label|legend|li|link|map|meta|noscript|optgroup|option|param|q|s|samp|script|select|small|span|strike|strong|style|sub|sup|table|tbody|td|textarea|tfoot|th|thead|title|tr|tt|u|var)\\b(?!-))",
-			"beginCaptures": {
-				"1": {
-					"name": "punctuation.definition.tag.begin.html"
-				},
-				"2": {
-					"name": "entity.name.tag.inline.any.html"
-				}
-			},
-			"end": "((?: ?/)?>)",
-			"endCaptures": {
-				"1": {
-					"name": "punctuation.definition.tag.end.html"
-				}
-			},
-			"name": "meta.tag.inline.any.html",
-			"patterns": [
-				{
-					"include": "#tag-stuff"
-				}
-			]
-		},
-		{
-			"begin": "(</?)([a-zA-Z][a-zA-Z0-9:-]*)",
-			"beginCaptures": {
-				"1": {
-					"name": "punctuation.definition.tag.begin.html"
-				},
-				"2": {
-					"name": "entity.name.tag.other.html"
-				}
-			},
-			"end": "(/?>)",
-			"endCaptures": {
-				"1": {
-					"name": "punctuation.definition.tag.end.html"
-				}
-			},
-			"name": "meta.tag.other.html",
-			"patterns": [
-				{
-					"include": "#tag-stuff"
-				}
-			]
-		},
-		{
-			"include": "#entities"
-		},
-		{
-			"match": "<>",
-			"name": "invalid.illegal.incomplete.html"
-		}
-	],
-	"repository": {
-		"embedded-code": {
-			"patterns": [
-				{
-					"include": "#smarty"
-				},
-				{
-					"include": "#python"
+					"match": "--!>",
+					"name": "invalid.illegal.characters-not-allowed-here.html"
 				}
 			]
 		},
 		"entities": {
 			"patterns": [
+				{
+					"captures": {
+						"1": {
+							"name": "punctuation.definition.entity.html"
+						},
+						"912": {
+							"name": "punctuation.definition.entity.html"
+						}
+					},
+					"comment": "Yes this is a bit ridiculous, there are quite a lot of these",
+					"match": "(?x)\n\t\t\t\t\t\t(&)\t(?=[a-zA-Z])\n\t\t\t\t\t\t(\n\t\t\t\t\t\t\t(a(s(ymp(eq)?|cr|t)|n(d(slope|d|v|and)?|g(s(t|ph)|zarr|e|le|rt(vb(d)?)?|msd(a(h|c|d|e|f|a|g|b))?)?)|c(y|irc|d|ute|E)?|tilde|o(pf|gon)|uml|p(id|os|prox(eq)?|e|E|acir)?|elig|f(r)?|w(conint|int)|l(pha|e(ph|fsym))|acute|ring|grave|m(p|a(cr|lg))|breve)|A(s(sign|cr)|nd|MP|c(y|irc)|tilde|o(pf|gon)|uml|pplyFunction|fr|Elig|lpha|acute|ring|grave|macr|breve))\n\t\t\t\t\t\t  | (B(scr|cy|opf|umpeq|e(cause|ta|rnoullis)|fr|a(ckslash|r(v|wed))|reve)|b(s(cr|im(e)?|ol(hsub|b)?|emi)|n(ot|e(quiv)?)|c(y|ong)|ig(s(tar|qcup)|c(irc|up|ap)|triangle(down|up)|o(times|dot|plus)|uplus|vee|wedge)|o(t(tom)?|pf|wtie|x(h(d|u|D|U)?|times|H(d|u|D|U)?|d(R|l|r|L)|u(R|l|r|L)|plus|D(R|l|r|L)|v(R|h|H|l|r|L)?|U(R|l|r|L)|V(R|h|H|l|r|L)?|minus|box))|Not|dquo|u(ll(et)?|mp(e(q)?|E)?)|prime|e(caus(e)?|t(h|ween|a)|psi|rnou|mptyv)|karow|fr|l(ock|k(1(2|4)|34)|a(nk|ck(square|triangle(down|left|right)?|lozenge)))|a(ck(sim(eq)?|cong|prime|epsilon)|r(vee|wed(ge)?))|r(eve|vbar)|brk(tbrk)?))\n\t\t\t\t\t\t  | (c(s(cr|u(p(e)?|b(e)?))|h(cy|i|eck(mark)?)|ylcty|c(irc|ups(sm)?|edil|a(ps|ron))|tdot|ir(scir|c(eq|le(d(R|circ|S|dash|ast)|arrow(left|right)))?|e|fnint|E|mid)?|o(n(int|g(dot)?)|p(y(sr)?|f|rod)|lon(e(q)?)?|m(p(fn|le(xes|ment))?|ma(t)?))|dot|u(darr(l|r)|p(s|c(up|ap)|or|dot|brcap)?|e(sc|pr)|vee|wed|larr(p)?|r(vearrow(left|right)|ly(eq(succ|prec)|vee|wedge)|arr(m)?|ren))|e(nt(erdot)?|dil|mptyv)|fr|w(conint|int)|lubs(uit)?|a(cute|p(s|c(up|ap)|dot|and|brcup)?|r(on|et))|r(oss|arr))|C(scr|hi|c(irc|onint|edil|aron)|ircle(Minus|Times|Dot|Plus)|Hcy|o(n(tourIntegral|int|gruent)|unterClockwiseContourIntegral|p(f|roduct)|lon(e)?)|dot|up(Cap)?|OPY|e(nterDot|dilla)|fr|lo(seCurly(DoubleQuote|Quote)|ckwiseContourIntegral)|a(yleys|cute|p(italDifferentialD)?)|ross))\n\t\t\t\t\t\t  | (d(s(c(y|r)|trok|ol)|har(l|r)|c(y|aron)|t(dot|ri(f)?)|i(sin|e|v(ide(ontimes)?|onx)?|am(s|ond(suit)?)?|gamma)|Har|z(cy|igrarr)|o(t(square|plus|eq(dot)?|minus)?|ublebarwedge|pf|wn(harpoon(left|right)|downarrows|arrow)|llar)|d(otseq|a(rr|gger))?|u(har|arr)|jcy|e(lta|g|mptyv)|f(isht|r)|wangle|lc(orn|rop)|a(sh(v)?|leth|rr|gger)|r(c(orn|rop)|bkarow)|b(karow|lac)|Arr)|D(s(cr|trok)|c(y|aron)|Scy|i(fferentialD|a(critical(Grave|Tilde|Do(t|ubleAcute)|Acute)|mond))|o(t(Dot|Equal)?|uble(Right(Tee|Arrow)|ContourIntegral|Do(t|wnArrow)|Up(DownArrow|Arrow)|VerticalBar|L(ong(RightArrow|Left(RightArrow|Arrow))|eft(RightArrow|Tee|Arrow)))|pf|wn(Right(TeeVector|Vector(Bar)?)|Breve|Tee(Arrow)?|arrow|Left(RightVector|TeeVector|Vector(Bar)?)|Arrow(Bar|UpArrow)?))|Zcy|el(ta)?|D(otrahd)?|Jcy|fr|a(shv|rr|gger)))\n\t\t\t\t\t\t  | (e(s(cr|im|dot)|n(sp|g)|c(y|ir(c)?|olon|aron)|t(h|a)|o(pf|gon)|dot|u(ro|ml)|p(si(v|lon)?|lus|ar(sl)?)|e|D(ot|Dot)|q(s(im|lant(less|gtr))|c(irc|olon)|u(iv(DD)?|est|als)|vparsl)|f(Dot|r)|l(s(dot)?|inters|l)?|a(ster|cute)|r(Dot|arr)|g(s(dot)?|rave)?|x(cl|ist|p(onentiale|ectation))|m(sp(1(3|4))?|pty(set|v)?|acr))|E(s(cr|im)|c(y|irc|aron)|ta|o(pf|gon)|NG|dot|uml|TH|psilon|qu(ilibrium|al(Tilde)?)|fr|lement|acute|grave|x(ists|ponentialE)|m(pty(SmallSquare|VerySmallSquare)|acr)))\n\t\t\t\t\t\t  | (f(scr|nof|cy|ilig|o(pf|r(k(v)?|all))|jlig|partint|emale|f(ilig|l(ig|lig)|r)|l(tns|lig|at)|allingdotseq|r(own|a(sl|c(1(2|8|3|4|5|6)|78|2(3|5)|3(8|4|5)|45|5(8|6)))))|F(scr|cy|illed(SmallSquare|VerySmallSquare)|o(uriertrf|pf|rAll)|fr))\n\t\t\t\t\t\t  | (G(scr|c(y|irc|edil)|t|opf|dot|T|Jcy|fr|amma(d)?|reater(Greater|SlantEqual|Tilde|Equal(Less)?|FullEqual|Less)|g|breve)|g(s(cr|im(e|l)?)|n(sim|e(q(q)?)?|E|ap(prox)?)|c(y|irc)|t(c(c|ir)|dot|quest|lPar|r(sim|dot|eq(qless|less)|less|a(pprox|rr)))?|imel|opf|dot|jcy|e(s(cc|dot(o(l)?)?|l(es)?)?|q(slant|q)?|l)?|v(nE|ertneqq)|fr|E(l)?|l(j|E|a)?|a(cute|p|mma(d)?)|rave|g(g)?|breve))\n\t\t\t\t\t\t  | (h(s(cr|trok|lash)|y(phen|bull)|circ|o(ok(leftarrow|rightarrow)|pf|arr|rbar|mtht)|e(llip|arts(uit)?|rcon)|ks(earow|warow)|fr|a(irsp|lf|r(dcy|r(cir|w)?)|milt)|bar|Arr)|H(s(cr|trok)|circ|ilbertSpace|o(pf|rizontalLine)|ump(DownHump|Equal)|fr|a(cek|t)|ARDcy))\n\t\t\t\t\t\t  | (i(s(cr|in(s(v)?|dot|v|E)?)|n(care|t(cal|prod|e(rcal|gers)|larhk)?|odot|fin(tie)?)?|c(y|irc)?|t(ilde)?|i(nfin|i(nt|int)|ota)?|o(cy|ta|pf|gon)|u(kcy|ml)|jlig|prod|e(cy|xcl)|quest|f(f|r)|acute|grave|m(of|ped|a(cr|th|g(part|e|line))))|I(scr|n(t(e(rsection|gral))?|visible(Comma|Times))|c(y|irc)|tilde|o(ta|pf|gon)|dot|u(kcy|ml)|Ocy|Jlig|fr|Ecy|acute|grave|m(plies|a(cr|ginaryI))?))\n\t\t\t\t\t\t  | (j(s(cr|ercy)|c(y|irc)|opf|ukcy|fr|math)|J(s(cr|ercy)|c(y|irc)|opf|ukcy|fr))\n\t\t\t\t\t\t  | (k(scr|hcy|c(y|edil)|opf|jcy|fr|appa(v)?|green)|K(scr|c(y|edil)|Hcy|opf|Jcy|fr|appa))\n\t\t\t\t\t\t  | (l(s(h|cr|trok|im(e|g)?|q(uo(r)?|b)|aquo)|h(ar(d|u(l)?)|blk)|n(sim|e(q(q)?)?|E|ap(prox)?)|c(y|ub|e(il|dil)|aron)|Barr|t(hree|c(c|ir)|imes|dot|quest|larr|r(i(e|f)?|Par))?|Har|o(ng(left(arrow|rightarrow)|rightarrow|mapsto)|times|z(enge|f)?|oparrow(left|right)|p(f|lus|ar)|w(ast|bar)|a(ng|rr)|brk)|d(sh|ca|quo(r)?|r(dhar|ushar))|ur(dshar|uhar)|jcy|par(lt)?|e(s(s(sim|dot|eq(qgtr|gtr)|approx|gtr)|cc|dot(o(r)?)?|g(es)?)?|q(slant|q)?|ft(harpoon(down|up)|threetimes|leftarrows|arrow(tail)?|right(squigarrow|harpoons|arrow(s)?))|g)?|v(nE|ertneqq)|f(isht|loor|r)|E(g)?|l(hard|corner|tri|arr)?|a(ng(d|le)?|cute|t(e(s)?|ail)?|p|emptyv|quo|rr(sim|hk|tl|pl|fs|lp|b(fs)?)?|gran|mbda)|r(har(d)?|corner|tri|arr|m)|g(E)?|m(idot|oust(ache)?)|b(arr|r(k(sl(d|u)|e)|ac(e|k))|brk)|A(tail|arr|rr))|L(s(h|cr|trok)|c(y|edil|aron)|t|o(ng(RightArrow|left(arrow|rightarrow)|rightarrow|Left(RightArrow|Arrow))|pf|wer(RightArrow|LeftArrow))|T|e(ss(Greater|SlantEqual|Tilde|EqualGreater|FullEqual|Less)|ft(Right(Vector|Arrow)|Ceiling|T(ee(Vector|Arrow)?|riangle(Bar|Equal)?)|Do(ubleBracket|wn(TeeVector|Vector(Bar)?))|Up(TeeVector|DownVector|Vector(Bar)?)|Vector(Bar)?|arrow|rightarrow|Floor|A(ngleBracket|rrow(RightArrow|Bar)?)))|Jcy|fr|l(eftarrow)?|a(ng|cute|placetrf|rr|mbda)|midot))\n\t\t\t\t\t\t  | (M(scr|cy|inusPlus|opf|u|e(diumSpace|llintrf)|fr|ap)|m(s(cr|tpos)|ho|nplus|c(y|omma)|i(nus(d(u)?|b)?|cro|d(cir|dot|ast)?)|o(dels|pf)|dash|u(ltimap|map)?|p|easuredangle|DDot|fr|l(cp|dr)|a(cr|p(sto(down|up|left)?)?|l(t(ese)?|e)|rker)))\n\t\t\t\t\t\t  | (n(s(hort(parallel|mid)|c(cue|e|r)?|im(e(q)?)?|u(cc(eq)?|p(set(eq(q)?)?|e|E)?|b(set(eq(q)?)?|e|E)?)|par|qsu(pe|be)|mid)|Rightarrow|h(par|arr|Arr)|G(t(v)?|g)|c(y|ong(dot)?|up|edil|a(p|ron))|t(ilde|lg|riangle(left(eq)?|right(eq)?)|gl)|i(s(d)?|v)?|o(t(ni(v(c|a|b))?|in(dot|v(c|a|b)|E)?)?|pf)|dash|u(m(sp|ero)?)?|jcy|p(olint|ar(sl|t|allel)?|r(cue|e(c(eq)?)?)?)|e(s(im|ear)|dot|quiv|ar(hk|r(ow)?)|xist(s)?|Arr)?|v(sim|infin|Harr|dash|Dash|l(t(rie)?|e|Arr)|ap|r(trie|Arr)|g(t|e))|fr|w(near|ar(hk|r(ow)?)|Arr)|V(dash|Dash)|l(sim|t(ri(e)?)?|dr|e(s(s)?|q(slant|q)?|ft(arrow|rightarrow))?|E|arr|Arr)|a(ng|cute|tur(al(s)?)?|p(id|os|prox|E)?|bla)|r(tri(e)?|ightarrow|arr(c|w)?|Arr)|g(sim|t(r)?|e(s|q(slant|q)?)?|E)|mid|L(t(v)?|eft(arrow|rightarrow)|l)|b(sp|ump(e)?))|N(scr|c(y|edil|aron)|tilde|o(nBreakingSpace|Break|t(R(ightTriangle(Bar|Equal)?|everseElement)|Greater(Greater|SlantEqual|Tilde|Equal|FullEqual|Less)?|S(u(cceeds(SlantEqual|Tilde|Equal)?|perset(Equal)?|bset(Equal)?)|quareSu(perset(Equal)?|bset(Equal)?))|Hump(DownHump|Equal)|Nested(GreaterGreater|LessLess)|C(ongruent|upCap)|Tilde(Tilde|Equal|FullEqual)?|DoubleVerticalBar|Precedes(SlantEqual|Equal)?|E(qual(Tilde)?|lement|xists)|VerticalBar|Le(ss(Greater|SlantEqual|Tilde|Equal|Less)?|ftTriangle(Bar|Equal)?))?|pf)|u|e(sted(GreaterGreater|LessLess)|wLine|gative(MediumSpace|Thi(nSpace|ckSpace)|VeryThinSpace))|Jcy|fr|acute))\n\t\t\t\t\t\t  | (o(s(cr|ol|lash)|h(m|bar)|c(y|ir(c)?)|ti(lde|mes(as)?)|S|int|opf|d(sold|iv|ot|ash|blac)|uml|p(erp|lus|ar)|elig|vbar|f(cir|r)|l(c(ir|ross)|t|ine|arr)|a(st|cute)|r(slope|igof|or|d(er(of)?|f|m)?|v|arr)?|g(t|on|rave)|m(i(nus|cron|d)|ega|acr))|O(s(cr|lash)|c(y|irc)|ti(lde|mes)|opf|dblac|uml|penCurly(DoubleQuote|Quote)|ver(B(ar|rac(e|ket))|Parenthesis)|fr|Elig|acute|r|grave|m(icron|ega|acr)))\n\t\t\t\t\t\t  | (p(s(cr|i)|h(i(v)?|one|mmat)|cy|i(tchfork|v)?|o(intint|und|pf)|uncsp|er(cnt|tenk|iod|p|mil)|fr|l(us(sim|cir|two|d(o|u)|e|acir|mn|b)?|an(ck(h)?|kv))|ar(s(im|l)|t|a(llel)?)?|r(sim|n(sim|E|ap)|cue|ime(s)?|o(d|p(to)?|f(surf|line|alar))|urel|e(c(sim|n(sim|eqq|approx)|curlyeq|eq|approx)?)?|E|ap)?|m)|P(s(cr|i)|hi|cy|i|o(incareplane|pf)|fr|lusMinus|artialD|r(ime|o(duct|portion(al)?)|ecedes(SlantEqual|Tilde|Equal)?)?))\n\t\t\t\t\t\t  | (q(scr|int|opf|u(ot|est(eq)?|at(int|ernions))|prime|fr)|Q(scr|opf|UOT|fr))\n\t\t\t\t\t\t  | (R(s(h|cr)|ho|c(y|edil|aron)|Barr|ight(Ceiling|T(ee(Vector|Arrow)?|riangle(Bar|Equal)?)|Do(ubleBracket|wn(TeeVector|Vector(Bar)?))|Up(TeeVector|DownVector|Vector(Bar)?)|Vector(Bar)?|arrow|Floor|A(ngleBracket|rrow(Bar|LeftArrow)?))|o(undImplies|pf)|uleDelayed|e(verse(UpEquilibrium|E(quilibrium|lement)))?|fr|EG|a(ng|cute|rr(tl)?)|rightarrow)|r(s(h|cr|q(uo(r)?|b)|aquo)|h(o(v)?|ar(d|u(l)?))|nmid|c(y|ub|e(il|dil)|aron)|Barr|t(hree|imes|ri(e|f|ltri)?)|i(singdotseq|ng|ght(squigarrow|harpoon(down|up)|threetimes|left(harpoons|arrows)|arrow(tail)?|rightarrows))|Har|o(times|p(f|lus|ar)|a(ng|rr)|brk)|d(sh|ca|quo(r)?|ldhar)|uluhar|p(polint|ar(gt)?)|e(ct|al(s|ine|part)?|g)|f(isht|loor|r)|l(har|arr|m)|a(ng(d|e|le)?|c(ute|e)|t(io(nals)?|ail)|dic|emptyv|quo|rr(sim|hk|c|tl|pl|fs|w|lp|ap|b(fs)?)?)|rarr|x|moust(ache)?|b(arr|r(k(sl(d|u)|e)|ac(e|k))|brk)|A(tail|arr|rr)))\n\t\t\t\t\t\t  | (s(s(cr|tarf|etmn|mile)|h(y|c(hcy|y)|ort(parallel|mid)|arp)|c(sim|y|n(sim|E|ap)|cue|irc|polint|e(dil)?|E|a(p|ron))?|t(ar(f)?|r(ns|aight(phi|epsilon)))|i(gma(v|f)?|m(ne|dot|plus|e(q)?|l(E)?|rarr|g(E)?)?)|zlig|o(pf|ftcy|l(b(ar)?)?)|dot(e|b)?|u(ng|cc(sim|n(sim|eqq|approx)|curlyeq|eq|approx)?|p(s(im|u(p|b)|et(neq(q)?|eq(q)?)?)|hs(ol|ub)|1|n(e|E)|2|d(sub|ot)|3|plus|e(dot)?|E|larr|mult)?|m|b(s(im|u(p|b)|et(neq(q)?|eq(q)?)?)|n(e|E)|dot|plus|e(dot)?|E|rarr|mult)?)|pa(des(uit)?|r)|e(swar|ct|tm(n|inus)|ar(hk|r(ow)?)|xt|mi|Arr)|q(su(p(set(eq)?|e)?|b(set(eq)?|e)?)|c(up(s)?|ap(s)?)|u(f|ar(e|f))?)|fr(own)?|w(nwar|ar(hk|r(ow)?)|Arr)|larr|acute|rarr|m(t(e(s)?)?|i(d|le)|eparsl|a(shp|llsetminus))|bquo)|S(scr|hort(RightArrow|DownArrow|UpArrow|LeftArrow)|c(y|irc|edil|aron)?|tar|igma|H(cy|CHcy)|opf|u(c(hThat|ceeds(SlantEqual|Tilde|Equal)?)|p(set|erset(Equal)?)?|m|b(set(Equal)?)?)|OFTcy|q(uare(Su(perset(Equal)?|bset(Equal)?)|Intersection|Union)?|rt)|fr|acute|mallCircle))\n\t\t\t\t\t\t  | (t(s(hcy|c(y|r)|trok)|h(i(nsp|ck(sim|approx))|orn|e(ta(sym|v)?|re(4|fore))|k(sim|ap))|c(y|edil|aron)|i(nt|lde|mes(d|b(ar)?)?)|o(sa|p(cir|f(ork)?|bot)?|ea)|dot|prime|elrec|fr|w(ixt|ohead(leftarrow|rightarrow))|a(u|rget)|r(i(sb|time|dot|plus|e|angle(down|q|left(eq)?|right(eq)?)?|minus)|pezium|ade)|brk)|T(s(cr|trok)|RADE|h(i(nSpace|ckSpace)|e(ta|refore))|c(y|edil|aron)|S(cy|Hcy)|ilde(Tilde|Equal|FullEqual)?|HORN|opf|fr|a(u|b)|ripleDot))\n\t\t\t\t\t\t  | (u(scr|h(ar(l|r)|blk)|c(y|irc)|t(ilde|dot|ri(f)?)|Har|o(pf|gon)|d(har|arr|blac)|u(arr|ml)|p(si(h|lon)?|harpoon(left|right)|downarrow|uparrows|lus|arrow)|f(isht|r)|wangle|l(c(orn(er)?|rop)|tri)|a(cute|rr)|r(c(orn(er)?|rop)|tri|ing)|grave|m(l|acr)|br(cy|eve)|Arr)|U(scr|n(ion(Plus)?|der(B(ar|rac(e|ket))|Parenthesis))|c(y|irc)|tilde|o(pf|gon)|dblac|uml|p(si(lon)?|downarrow|Tee(Arrow)?|per(RightArrow|LeftArrow)|DownArrow|Equilibrium|arrow|Arrow(Bar|DownArrow)?)|fr|a(cute|rr(ocir)?)|ring|grave|macr|br(cy|eve)))\n\t\t\t\t\t\t  | (v(s(cr|u(pn(e|E)|bn(e|E)))|nsu(p|b)|cy|Bar(v)?|zigzag|opf|dash|prop|e(e(eq|bar)?|llip|r(t|bar))|Dash|fr|ltri|a(ngrt|r(s(igma|u(psetneq(q)?|bsetneq(q)?))|nothing|t(heta|riangle(left|right))|p(hi|i|ropto)|epsilon|kappa|r(ho)?))|rtri|Arr)|V(scr|cy|opf|dash(l)?|e(e|r(yThinSpace|t(ical(Bar|Separator|Tilde|Line))?|bar))|Dash|vdash|fr|bar))\n\t\t\t\t\t\t  | (w(scr|circ|opf|p|e(ierp|d(ge(q)?|bar))|fr|r(eath)?)|W(scr|circ|opf|edge|fr))\n\t\t\t\t\t\t  | (X(scr|i|opf|fr)|x(s(cr|qcup)|h(arr|Arr)|nis|c(irc|up|ap)|i|o(time|dot|p(f|lus))|dtri|u(tri|plus)|vee|fr|wedge|l(arr|Arr)|r(arr|Arr)|map))\n\t\t\t\t\t\t  | (y(scr|c(y|irc)|icy|opf|u(cy|ml)|en|fr|ac(y|ute))|Y(scr|c(y|irc)|opf|uml|Icy|Ucy|fr|acute|Acy))\n\t\t\t\t\t\t  | (z(scr|hcy|c(y|aron)|igrarr|opf|dot|e(ta|etrf)|fr|w(nj|j)|acute)|Z(scr|c(y|aron)|Hcy|opf|dot|e(ta|roWidthSpace)|fr|acute))\n\t\t\t\t\t\t)\n\t\t\t\t\t\t(;)\n\t\t\t\t\t",
+					"name": "constant.character.entity.named.$2.html"
+				},
 				{
 					"captures": {
 						"1": {
@@ -542,199 +492,2073 @@
 							"name": "punctuation.definition.entity.html"
 						}
 					},
-					"match": "(&)([a-zA-Z0-9]+|#[0-9]+|#[xX][0-9a-fA-F]+)(;)",
-					"name": "constant.character.entity.html"
+					"match": "(&)#[0-9]+(;)",
+					"name": "constant.character.entity.numeric.decimal.html"
 				},
 				{
-					"match": "&",
-					"name": "invalid.illegal.bad-ampersand.html"
-				}
-			]
-		},
-		"python": {
-			"begin": "(?:^\\s*)<\\?python(?!.*\\?>)",
-			"end": "\\?>(?:\\s*$\\n)?",
-			"name": "source.python.embedded.html",
-			"patterns": [
-				{
-					"include": "source.python"
-				}
-			]
-		},
-		"smarty": {
-			"patterns": [
-				{
-					"begin": "(\\{(literal)\\})",
 					"captures": {
 						"1": {
-							"name": "source.smarty.embedded.html"
+							"name": "punctuation.definition.entity.html"
+						},
+						"3": {
+							"name": "punctuation.definition.entity.html"
+						}
+					},
+					"match": "(&)#[xX][0-9a-fA-F]+(;)",
+					"name": "constant.character.entity.numeric.hexadecimal.html"
+				},
+				{
+					"match": "&(?=[a-zA-Z0-9]+;)",
+					"name": "invalid.illegal.ambiguous-ampersand.html"
+				}
+			]
+		},
+		"math": {
+			"patterns": [
+				{
+					"begin": "(?i)(<)(math)(?=\\s|/?>)(?:(([^\"'>]|\"[^\"]*\"|'[^']*')*)(>))?",
+					"beginCaptures": {
+						"0": {
+							"name": "meta.tag.structure.$2.start.html"
+						},
+						"1": {
+							"name": "punctuation.definition.tag.begin.html"
 						},
 						"2": {
-							"name": "support.function.built-in.smarty"
+							"name": "entity.name.tag.html"
+						},
+						"3": {
+							"patterns": [
+								{
+									"include": "#attribute"
+								}
+							]
+						},
+						"5": {
+							"name": "punctuation.definition.tag.end.html"
 						}
 					},
-					"end": "(\\{/(literal)\\})"
-				},
-				{
-					"begin": "{{|{",
-					"disabled": 1,
-					"end": "}}|}",
-					"name": "source.smarty.embedded.html",
-					"patterns": [
-						{
-							"include": "source.smarty"
-						}
-					]
-				}
-			]
-		},
-		"string-double-quoted": {
-			"begin": "\"",
-			"beginCaptures": {
-				"0": {
-					"name": "punctuation.definition.string.begin.html"
-				}
-			},
-			"end": "\"",
-			"endCaptures": {
-				"0": {
-					"name": "punctuation.definition.string.end.html"
-				}
-			},
-			"name": "string.quoted.double.html",
-			"patterns": [
-				{
-					"include": "#embedded-code"
-				},
-				{
-					"include": "#entities"
-				}
-			]
-		},
-		"string-single-quoted": {
-			"begin": "'",
-			"beginCaptures": {
-				"0": {
-					"name": "punctuation.definition.string.begin.html"
-				}
-			},
-			"end": "'",
-			"endCaptures": {
-				"0": {
-					"name": "punctuation.definition.string.end.html"
-				}
-			},
-			"name": "string.quoted.single.html",
-			"patterns": [
-				{
-					"include": "#embedded-code"
-				},
-				{
-					"include": "#entities"
-				}
-			]
-		},
-		"tag-generic-attribute": {
-			"match": "(?<=[^=])\\b([a-zA-Z0-9:-]+)",
-			"name": "entity.other.attribute-name.html"
-		},
-		"tag-id-attribute": {
-			"begin": "\\b(id)\\b\\s*(=)",
-			"captures": {
-				"1": {
-					"name": "entity.other.attribute-name.id.html"
-				},
-				"2": {
-					"name": "punctuation.separator.key-value.html"
-				}
-			},
-			"end": "(?!\\G)(?<='|\"|[^\\s<>/])",
-			"name": "meta.attribute-with-value.id.html",
-			"patterns": [
-				{
-					"begin": "\"",
-					"beginCaptures": {
-						"0": {
-							"name": "punctuation.definition.string.begin.html"
-						}
-					},
-					"contentName": "meta.toc-list.id.html",
-					"end": "\"",
+					"end": "(?i)(</)(\\2)\\s*(>)",
 					"endCaptures": {
 						"0": {
-							"name": "punctuation.definition.string.end.html"
+							"name": "meta.tag.structure.$2.end.html"
+						},
+						"1": {
+							"name": "punctuation.definition.tag.begin.html"
+						},
+						"2": {
+							"name": "entity.name.tag.html"
+						},
+						"3": {
+							"name": "punctuation.definition.tag.end.html"
 						}
 					},
-					"name": "string.quoted.double.html",
+					"name": "meta.element.structure.$2.html",
 					"patterns": [
 						{
-							"include": "#embedded-code"
+							"begin": "(?<!>)\\G",
+							"end": ">",
+							"endCaptures": {
+								"0": {
+									"name": "punctuation.definition.tag.end.html"
+								}
+							},
+							"name": "meta.tag.structure.start.html",
+							"patterns": [
+								{
+									"include": "#attribute"
+								}
+							]
 						},
 						{
-							"include": "#entities"
+							"include": "#tags"
 						}
 					]
-				},
-				{
-					"begin": "'",
-					"beginCaptures": {
-						"0": {
-							"name": "punctuation.definition.string.begin.html"
-						}
-					},
-					"contentName": "meta.toc-list.id.html",
-					"end": "'",
-					"endCaptures": {
-						"0": {
-							"name": "punctuation.definition.string.end.html"
-						}
-					},
-					"name": "string.quoted.single.html",
-					"patterns": [
-						{
-							"include": "#embedded-code"
-						},
-						{
-							"include": "#entities"
-						}
-					]
-				},
-				{
-					"captures": {
-						"0": {
-							"name": "meta.toc-list.id.html"
-						}
-					},
-					"match": "(?<==)(?:[^\\s<>/'\"]|/(?!>))+",
-					"name": "string.unquoted.html"
 				}
-			]
+			],
+			"repository": {
+				"attribute": {
+					"patterns": [
+						{
+							"begin": "(s(hift|ymmetric|cript(sizemultiplier|level|minsize)|t(ackalign|retchy)|ide|u(pscriptshift|bscriptshift)|e(parator(s)?|lection)|rc)|h(eight|ref)|n(otation|umalign)|c(haralign|olumn(spa(n|cing)|width|lines|align)|lose|rossout)|i(n(dent(shift(first|last)?|target|align(first|last)?)|fixlinebreakstyle)|d)|o(pen|verflow)|d(i(splay(style)?|r)|e(nomalign|cimalpoint|pth))|position|e(dge|qual(columns|rows))|voffset|f(orm|ence|rame(spacing)?)|width|l(space|ine(thickness|leading|break(style|multchar)?)|o(ngdivstyle|cation)|ength|quote|argeop)|a(c(cent(under)?|tiontype)|l(t(text|img(-(height|valign|width))?)|ign(mentscope)?))|r(space|ow(spa(n|cing)|lines|align)|quote)|groupalign|x(link:href|mlns)|m(in(size|labelspacing)|ovablelimits|a(th(size|color|variant|background)|xsize))|bevelled)(?![\\w:-])",
+							"beginCaptures": {
+								"0": {
+									"name": "entity.other.attribute-name.html"
+								}
+							},
+							"end": "(?=\\s*+[^=\\s])",
+							"name": "meta.attribute.$1.html",
+							"patterns": [
+								{
+									"include": "#attribute-interior"
+								}
+							]
+						},
+						{
+							"begin": "([^\\x{0020}\"'<>/=\\x{0000}-\\x{001F}\\x{007F}-\\x{009F}\\x{FDD0}-\\x{FDEF}\\x{FFFE}\\x{FFFF}\\x{1FFFE}\\x{1FFFF}\\x{2FFFE}\\x{2FFFF}\\x{3FFFE}\\x{3FFFF}\\x{4FFFE}\\x{4FFFF}\\x{5FFFE}\\x{5FFFF}\\x{6FFFE}\\x{6FFFF}\\x{7FFFE}\\x{7FFFF}\\x{8FFFE}\\x{8FFFF}\\x{9FFFE}\\x{9FFFF}\\x{AFFFE}\\x{AFFFF}\\x{BFFFE}\\x{BFFFF}\\x{CFFFE}\\x{CFFFF}\\x{DFFFE}\\x{DFFFF}\\x{EFFFE}\\x{EFFFF}\\x{FFFFE}\\x{FFFFF}\\x{10FFFE}\\x{10FFFF}]+)",
+							"beginCaptures": {
+								"0": {
+									"name": "entity.other.attribute-name.html"
+								}
+							},
+							"comment": "Anything else that is valid",
+							"end": "(?=\\s*+[^=\\s])",
+							"name": "meta.attribute.unrecognized.$1.html",
+							"patterns": [
+								{
+									"include": "#attribute-interior"
+								}
+							]
+						},
+						{
+							"match": "[^\\s>]+",
+							"name": "invalid.illegal.character-not-allowed-here.html"
+						}
+					]
+				},
+				"tags": {
+					"patterns": [
+						{
+							"include": "#comment"
+						},
+						{
+							"include": "#cdata"
+						},
+						{
+							"captures": {
+								"0": {
+									"name": "meta.tag.structure.math.$2.void.html"
+								},
+								"1": {
+									"name": "punctuation.definition.tag.begin.html"
+								},
+								"2": {
+									"name": "entity.name.tag.html"
+								},
+								"3": {
+									"patterns": [
+										{
+											"include": "#attribute"
+										}
+									]
+								},
+								"5": {
+									"name": "punctuation.definition.tag.end.html"
+								}
+							},
+							"match": "(?i)(<)(annotation|annotation-xml|semantics|menclose|merror|mfenced|mfrac|mpadded|mphantom|mroot|mrow|msqrt|mstyle|mmultiscripts|mover|mprescripts|msub|msubsup|msup|munder|munderover|none|mlabeledtr|mtable|mtd|mtr|mlongdiv|mscarries|mscarry|msgroup|msline|msrow|mstack|maction)(?=\\s|/?>)(?:(([^\"'>]|\"[^\"]*\"|'[^']*')*)(/>))",
+							"name": "meta.element.structure.math.$2.html"
+						},
+						{
+							"begin": "(?i)(<)(annotation|annotation-xml|semantics|menclose|merror|mfenced|mfrac|mpadded|mphantom|mroot|mrow|msqrt|mstyle|mmultiscripts|mover|mprescripts|msub|msubsup|msup|munder|munderover|none|mlabeledtr|mtable|mtd|mtr|mlongdiv|mscarries|mscarry|msgroup|msline|msrow|mstack|maction)(?=\\s|/?>)(?:(([^\"'>]|\"[^\"]*\"|'[^']*')*)(>))?",
+							"beginCaptures": {
+								"0": {
+									"name": "meta.tag.structure.math.$2.start.html"
+								},
+								"1": {
+									"name": "punctuation.definition.tag.begin.html"
+								},
+								"2": {
+									"name": "entity.name.tag.html"
+								},
+								"3": {
+									"patterns": [
+										{
+											"include": "#attribute"
+										}
+									]
+								},
+								"5": {
+									"name": "punctuation.definition.tag.end.html"
+								}
+							},
+							"end": "(?i)(</)(\\2)\\s*(>)|(/>)|(?=</\\w+)",
+							"endCaptures": {
+								"0": {
+									"name": "meta.tag.structure.math.$2.end.html"
+								},
+								"1": {
+									"name": "punctuation.definition.tag.begin.html"
+								},
+								"2": {
+									"name": "entity.name.tag.html"
+								},
+								"3": {
+									"name": "punctuation.definition.tag.end.html"
+								},
+								"4": {
+									"name": "punctuation.definition.tag.end.html"
+								}
+							},
+							"name": "meta.element.structure.math.$2.html",
+							"patterns": [
+								{
+									"begin": "(?<!>)\\G",
+									"end": "(?=/>)|>",
+									"endCaptures": {
+										"0": {
+											"name": "punctuation.definition.tag.end.html"
+										}
+									},
+									"name": "meta.tag.structure.start.html",
+									"patterns": [
+										{
+											"include": "#attribute"
+										}
+									]
+								},
+								{
+									"include": "#tags"
+								}
+							]
+						},
+						{
+							"captures": {
+								"0": {
+									"name": "meta.tag.inline.math.$2.void.html"
+								},
+								"1": {
+									"name": "punctuation.definition.tag.begin.html"
+								},
+								"2": {
+									"name": "entity.name.tag.html"
+								},
+								"3": {
+									"patterns": [
+										{
+											"include": "#attribute"
+										}
+									]
+								},
+								"5": {
+									"name": "punctuation.definition.tag.end.html"
+								}
+							},
+							"match": "(?i)(<)(mi|mn|mo|ms|mspace|mtext|maligngroup|malignmark)(?=\\s|/?>)(?:(([^\"'>]|\"[^\"]*\"|'[^']*')*)(/>))",
+							"name": "meta.element.inline.math.$2.html"
+						},
+						{
+							"begin": "(?i)(<)(mi|mn|mo|ms|mspace|mtext|maligngroup|malignmark)(?=\\s|/?>)(?:(([^\"'>]|\"[^\"]*\"|'[^']*')*)(>))?",
+							"beginCaptures": {
+								"0": {
+									"name": "meta.tag.inline.math.$2.start.html"
+								},
+								"1": {
+									"name": "punctuation.definition.tag.begin.html"
+								},
+								"2": {
+									"name": "entity.name.tag.html"
+								},
+								"3": {
+									"patterns": [
+										{
+											"include": "#attribute"
+										}
+									]
+								},
+								"5": {
+									"name": "punctuation.definition.tag.end.html"
+								}
+							},
+							"end": "(?i)(</)(\\2)\\s*(>)|(/>)|(?=</\\w+)",
+							"endCaptures": {
+								"0": {
+									"name": "meta.tag.inline.math.$2.end.html"
+								},
+								"1": {
+									"name": "punctuation.definition.tag.begin.html"
+								},
+								"2": {
+									"name": "entity.name.tag.html"
+								},
+								"3": {
+									"name": "punctuation.definition.tag.end.html"
+								},
+								"4": {
+									"name": "punctuation.definition.tag.end.html"
+								}
+							},
+							"name": "meta.element.inline.math.$2.html",
+							"patterns": [
+								{
+									"begin": "(?<!>)\\G",
+									"end": "(?=/>)|>",
+									"endCaptures": {
+										"0": {
+											"name": "punctuation.definition.tag.end.html"
+										}
+									},
+									"name": "meta.tag.inline.start.html",
+									"patterns": [
+										{
+											"include": "#attribute"
+										}
+									]
+								},
+								{
+									"include": "#tags"
+								}
+							]
+						},
+						{
+							"captures": {
+								"0": {
+									"name": "meta.tag.object.math.$2.void.html"
+								},
+								"1": {
+									"name": "punctuation.definition.tag.begin.html"
+								},
+								"2": {
+									"name": "entity.name.tag.html"
+								},
+								"3": {
+									"patterns": [
+										{
+											"include": "#attribute"
+										}
+									]
+								},
+								"5": {
+									"name": "punctuation.definition.tag.end.html"
+								}
+							},
+							"match": "(?i)(<)(mglyph)(?=\\s|/?>)(?:(([^\"'>]|\"[^\"]*\"|'[^']*')*)(/>))",
+							"name": "meta.element.object.math.$2.html"
+						},
+						{
+							"begin": "(?i)(<)(mglyph)(?=\\s|/?>)(?:(([^\"'>]|\"[^\"]*\"|'[^']*')*)(>))?",
+							"beginCaptures": {
+								"0": {
+									"name": "meta.tag.object.math.$2.start.html"
+								},
+								"1": {
+									"name": "punctuation.definition.tag.begin.html"
+								},
+								"2": {
+									"name": "entity.name.tag.html"
+								},
+								"3": {
+									"patterns": [
+										{
+											"include": "#attribute"
+										}
+									]
+								},
+								"5": {
+									"name": "punctuation.definition.tag.end.html"
+								}
+							},
+							"end": "(?i)(</)(\\2)\\s*(>)|(/>)|(?=</\\w+)",
+							"endCaptures": {
+								"0": {
+									"name": "meta.tag.object.math.$2.end.html"
+								},
+								"1": {
+									"name": "punctuation.definition.tag.begin.html"
+								},
+								"2": {
+									"name": "entity.name.tag.html"
+								},
+								"3": {
+									"name": "punctuation.definition.tag.end.html"
+								},
+								"4": {
+									"name": "punctuation.definition.tag.end.html"
+								}
+							},
+							"name": "meta.element.object.math.$2.html",
+							"patterns": [
+								{
+									"begin": "(?<!>)\\G",
+									"end": "(?=/>)|>",
+									"endCaptures": {
+										"0": {
+											"name": "punctuation.definition.tag.end.html"
+										}
+									},
+									"name": "meta.tag.object.start.html",
+									"patterns": [
+										{
+											"include": "#attribute"
+										}
+									]
+								},
+								{
+									"include": "#tags"
+								}
+							]
+						},
+						{
+							"captures": {
+								"0": {
+									"name": "meta.tag.other.invalid.void.html"
+								},
+								"1": {
+									"name": "punctuation.definition.tag.begin.html"
+								},
+								"2": {
+									"name": "entity.name.tag.html"
+								},
+								"3": {
+									"name": "invalid.illegal.unrecognized-tag.html"
+								},
+								"4": {
+									"patterns": [
+										{
+											"include": "#attribute"
+										}
+									]
+								},
+								"6": {
+									"name": "punctuation.definition.tag.end.html"
+								}
+							},
+							"match": "(?i)(<)(([\\w:]+))(?=\\s|/?>)(?:(([^\"'>]|\"[^\"]*\"|'[^']*')*)(/>))",
+							"name": "meta.element.other.invalid.html"
+						},
+						{
+							"begin": "(?i)(<)((\\w[^\\s>]*))(?=\\s|/?>)(?:(([^\"'>]|\"[^\"]*\"|'[^']*')*)(>))?",
+							"beginCaptures": {
+								"0": {
+									"name": "meta.tag.other.invalid.start.html"
+								},
+								"1": {
+									"name": "punctuation.definition.tag.begin.html"
+								},
+								"2": {
+									"name": "entity.name.tag.html"
+								},
+								"3": {
+									"name": "invalid.illegal.unrecognized-tag.html"
+								},
+								"4": {
+									"patterns": [
+										{
+											"include": "#attribute"
+										}
+									]
+								},
+								"6": {
+									"name": "punctuation.definition.tag.end.html"
+								}
+							},
+							"end": "(?i)(</)((\\2))\\s*(>)|(/>)|(?=</\\w+)",
+							"endCaptures": {
+								"0": {
+									"name": "meta.tag.other.invalid.end.html"
+								},
+								"1": {
+									"name": "punctuation.definition.tag.begin.html"
+								},
+								"2": {
+									"name": "entity.name.tag.html"
+								},
+								"3": {
+									"name": "invalid.illegal.unrecognized-tag.html"
+								},
+								"4": {
+									"name": "punctuation.definition.tag.end.html"
+								},
+								"5": {
+									"name": "punctuation.definition.tag.end.html"
+								}
+							},
+							"name": "meta.element.other.invalid.html",
+							"patterns": [
+								{
+									"begin": "(?<!>)\\G",
+									"end": "(?=/>)|>",
+									"endCaptures": {
+										"0": {
+											"name": "punctuation.definition.tag.end.html"
+										}
+									},
+									"name": "meta.tag.other.invalid.start.html",
+									"patterns": [
+										{
+											"include": "#attribute"
+										}
+									]
+								},
+								{
+									"include": "#tags"
+								}
+							]
+						},
+						{
+							"include": "#tags-invalid"
+						}
+					]
+				}
+			}
 		},
-		"tag-stuff": {
+		"svg": {
 			"patterns": [
 				{
-					"include": "#tag-id-attribute"
+					"begin": "(?i)(<)(svg)(?=\\s|/?>)(?:(([^\"'>]|\"[^\"]*\"|'[^']*')*)(>))?",
+					"beginCaptures": {
+						"0": {
+							"name": "meta.tag.structure.$2.start.html"
+						},
+						"1": {
+							"name": "punctuation.definition.tag.begin.html"
+						},
+						"2": {
+							"name": "entity.name.tag.html"
+						},
+						"3": {
+							"patterns": [
+								{
+									"include": "#attribute"
+								}
+							]
+						},
+						"5": {
+							"name": "punctuation.definition.tag.end.html"
+						}
+					},
+					"end": "(?i)(</)(\\2)\\s*(>)",
+					"endCaptures": {
+						"0": {
+							"name": "meta.tag.structure.$2.end.html"
+						},
+						"1": {
+							"name": "punctuation.definition.tag.begin.html"
+						},
+						"2": {
+							"name": "entity.name.tag.html"
+						},
+						"3": {
+							"name": "punctuation.definition.tag.end.html"
+						}
+					},
+					"name": "meta.element.structure.$2.html",
+					"patterns": [
+						{
+							"begin": "(?<!>)\\G",
+							"end": ">",
+							"endCaptures": {
+								"0": {
+									"name": "punctuation.definition.tag.end.html"
+								}
+							},
+							"name": "meta.tag.structure.start.html",
+							"patterns": [
+								{
+									"include": "#attribute"
+								}
+							]
+						},
+						{
+							"include": "#tags"
+						}
+					]
+				}
+			],
+			"repository": {
+				"attribute": {
+					"patterns": [
+						{
+							"begin": "(s(hape-rendering|ystemLanguage|cale|t(yle|itchTiles|op-(color|opacity)|dDeviation|em(h|v)|artOffset|r(i(ng|kethrough-(thickness|position))|oke(-(opacity|dash(offset|array)|width|line(cap|join)|miterlimit))?))|urfaceScale|p(e(cular(Constant|Exponent)|ed)|acing|readMethod)|eed|lope)|h(oriz-(origin-x|adv-x)|eight|anging|ref(lang)?)|y(1|2|ChannelSelector)?|n(umOctaves|ame)|c(y|o(ntentS(criptType|tyleType)|lor(-(interpolation(-filters)?|profile|rendering))?)|ursor|l(ip(-(path|rule)|PathUnits)?|ass)|a(p-height|lcMode)|x)|t(ype|o|ext(-(decoration|anchor|rendering)|Length)|a(rget(X|Y)?|b(index|leValues))|ransform)|i(n(tercept|2)?|d(eographic)?|mage-rendering)|z(oomAndPan)?|o(p(erator|acity)|ver(flow|line-(thickness|position))|ffset|r(i(ent(ation)?|gin)|der))|d(y|i(splay|visor|ffuseConstant|rection)|ominant-baseline|ur|e(scent|celerate)|x)?|u(1|n(i(code(-(range|bidi))?|ts-per-em)|derline-(thickness|position))|2)|p(ing|oint(s(At(X|Y|Z))?|er-events)|a(nose-1|t(h(Length)?|tern(ContentUnits|Transform|Units))|int-order)|r(imitiveUnits|eserveA(spectRatio|lpha)))|e(n(d|able-background)|dgeMode|levation|x(ternalResourcesRequired|ponent))|v(i(sibility|ew(Box|Target))|-(hanging|ideographic|alphabetic|mathematical)|e(ctor-effect|r(sion|t-(origin-(y|x)|adv-y)))|alues)|k(1|2|3|e(y(Splines|Times|Points)|rn(ing|el(Matrix|UnitLength)))|4)?|f(y|il(ter(Res|Units)?|l(-(opacity|rule))?)|o(nt-(s(t(yle|retch)|ize(-adjust)?)|variant|family|weight)|rmat)|lood-(color|opacity)|r(om)?|x)|w(idth(s)?|ord-spacing|riting-mode)|l(i(ghting-color|mitingConeAngle)|ocal|e(ngthAdjust|tter-spacing)|ang)|a(scent|cc(umulate|ent-height)|ttribute(Name|Type)|zimuth|dditive|utoReverse|l(ignment-baseline|phabetic|lowReorder)|rabic-form|mplitude)|r(y|otate|e(s(tart|ult)|ndering-intent|peat(Count|Dur)|quired(Extensions|Features)|f(X|Y|errerPolicy)|l)|adius|x)?|g(1|2|lyph(Ref|-(name|orientation-(horizontal|vertical)))|radient(Transform|Units))|x(1|2|ChannelSelector|-height|link:(show|href|t(ype|itle)|a(ctuate|rcrole)|role)|ml:(space|lang|base))?|m(in|ode|e(thod|dia)|a(sk(ContentUnits|Units)?|thematical|rker(Height|-(start|end|mid)|Units|Width)|x))|b(y|ias|egin|ase(Profile|line-shift|Frequency)|box))(?![\\w:-])",
+							"beginCaptures": {
+								"0": {
+									"name": "entity.other.attribute-name.html"
+								}
+							},
+							"end": "(?=\\s*+[^=\\s])",
+							"name": "meta.attribute.$1.html",
+							"patterns": [
+								{
+									"include": "#attribute-interior"
+								}
+							]
+						},
+						{
+							"begin": "([^\\x{0020}\"'<>/=\\x{0000}-\\x{001F}\\x{007F}-\\x{009F}\\x{FDD0}-\\x{FDEF}\\x{FFFE}\\x{FFFF}\\x{1FFFE}\\x{1FFFF}\\x{2FFFE}\\x{2FFFF}\\x{3FFFE}\\x{3FFFF}\\x{4FFFE}\\x{4FFFF}\\x{5FFFE}\\x{5FFFF}\\x{6FFFE}\\x{6FFFF}\\x{7FFFE}\\x{7FFFF}\\x{8FFFE}\\x{8FFFF}\\x{9FFFE}\\x{9FFFF}\\x{AFFFE}\\x{AFFFF}\\x{BFFFE}\\x{BFFFF}\\x{CFFFE}\\x{CFFFF}\\x{DFFFE}\\x{DFFFF}\\x{EFFFE}\\x{EFFFF}\\x{FFFFE}\\x{FFFFF}\\x{10FFFE}\\x{10FFFF}]+)",
+							"beginCaptures": {
+								"0": {
+									"name": "entity.other.attribute-name.html"
+								}
+							},
+							"comment": "Anything else that is valid",
+							"end": "(?=\\s*+[^=\\s])",
+							"name": "meta.attribute.unrecognized.$1.html",
+							"patterns": [
+								{
+									"include": "#attribute-interior"
+								}
+							]
+						},
+						{
+							"match": "[^\\s>]+",
+							"name": "invalid.illegal.character-not-allowed-here.html"
+						}
+					]
 				},
+				"tags": {
+					"patterns": [
+						{
+							"include": "#comment"
+						},
+						{
+							"include": "#cdata"
+						},
+						{
+							"captures": {
+								"0": {
+									"name": "meta.tag.metadata.svg.$2.void.html"
+								},
+								"1": {
+									"name": "punctuation.definition.tag.begin.html"
+								},
+								"2": {
+									"name": "entity.name.tag.html"
+								},
+								"3": {
+									"patterns": [
+										{
+											"include": "#attribute"
+										}
+									]
+								},
+								"5": {
+									"name": "punctuation.definition.tag.end.html"
+								}
+							},
+							"match": "(?i)(<)(color-profile|desc|metadata|script|style|title)(?=\\s|/?>)(?:(([^\"'>]|\"[^\"]*\"|'[^']*')*)(/>))",
+							"name": "meta.element.metadata.svg.$2.html"
+						},
+						{
+							"begin": "(?i)(<)(color-profile|desc|metadata|script|style|title)(?=\\s|/?>)(?:(([^\"'>]|\"[^\"]*\"|'[^']*')*)(>))?",
+							"beginCaptures": {
+								"0": {
+									"name": "meta.tag.metadata.svg.$2.start.html"
+								},
+								"1": {
+									"name": "punctuation.definition.tag.begin.html"
+								},
+								"2": {
+									"name": "entity.name.tag.html"
+								},
+								"3": {
+									"patterns": [
+										{
+											"include": "#attribute"
+										}
+									]
+								},
+								"5": {
+									"name": "punctuation.definition.tag.end.html"
+								}
+							},
+							"end": "(?i)(</)(\\2)\\s*(>)|(/>)|(?=</\\w+)",
+							"endCaptures": {
+								"0": {
+									"name": "meta.tag.metadata.svg.$2.end.html"
+								},
+								"1": {
+									"name": "punctuation.definition.tag.begin.html"
+								},
+								"2": {
+									"name": "entity.name.tag.html"
+								},
+								"3": {
+									"name": "punctuation.definition.tag.end.html"
+								},
+								"4": {
+									"name": "punctuation.definition.tag.end.html"
+								}
+							},
+							"name": "meta.element.metadata.svg.$2.html",
+							"patterns": [
+								{
+									"begin": "(?<!>)\\G",
+									"end": "(?=/>)|>",
+									"endCaptures": {
+										"0": {
+											"name": "punctuation.definition.tag.end.html"
+										}
+									},
+									"name": "meta.tag.metadata.start.html",
+									"patterns": [
+										{
+											"include": "#attribute"
+										}
+									]
+								},
+								{
+									"include": "#tags"
+								}
+							]
+						},
+						{
+							"captures": {
+								"0": {
+									"name": "meta.tag.structure.svg.$2.void.html"
+								},
+								"1": {
+									"name": "punctuation.definition.tag.begin.html"
+								},
+								"2": {
+									"name": "entity.name.tag.html"
+								},
+								"3": {
+									"patterns": [
+										{
+											"include": "#attribute"
+										}
+									]
+								},
+								"5": {
+									"name": "punctuation.definition.tag.end.html"
+								}
+							},
+							"match": "(?i)(<)(animateMotion|clipPath|defs|feComponentTransfer|feDiffuseLighting|feMerge|feSpecularLighting|filter|g|hatch|linearGradient|marker|mask|mesh|meshgradient|meshpatch|meshrow|pattern|radialGradient|switch|text|textPath)(?=\\s|/?>)(?:(([^\"'>]|\"[^\"]*\"|'[^']*')*)(/>))",
+							"name": "meta.element.structure.svg.$2.html"
+						},
+						{
+							"begin": "(?i)(<)(animateMotion|clipPath|defs|feComponentTransfer|feDiffuseLighting|feMerge|feSpecularLighting|filter|g|hatch|linearGradient|marker|mask|mesh|meshgradient|meshpatch|meshrow|pattern|radialGradient|switch|text|textPath)(?=\\s|/?>)(?:(([^\"'>]|\"[^\"]*\"|'[^']*')*)(>))?",
+							"beginCaptures": {
+								"0": {
+									"name": "meta.tag.structure.svg.$2.start.html"
+								},
+								"1": {
+									"name": "punctuation.definition.tag.begin.html"
+								},
+								"2": {
+									"name": "entity.name.tag.html"
+								},
+								"3": {
+									"patterns": [
+										{
+											"include": "#attribute"
+										}
+									]
+								},
+								"5": {
+									"name": "punctuation.definition.tag.end.html"
+								}
+							},
+							"end": "(?i)(</)(\\2)\\s*(>)|(/>)|(?=</\\w+)",
+							"endCaptures": {
+								"0": {
+									"name": "meta.tag.structure.svg.$2.end.html"
+								},
+								"1": {
+									"name": "punctuation.definition.tag.begin.html"
+								},
+								"2": {
+									"name": "entity.name.tag.html"
+								},
+								"3": {
+									"name": "punctuation.definition.tag.end.html"
+								},
+								"4": {
+									"name": "punctuation.definition.tag.end.html"
+								}
+							},
+							"name": "meta.element.structure.svg.$2.html",
+							"patterns": [
+								{
+									"begin": "(?<!>)\\G",
+									"end": "(?=/>)|>",
+									"endCaptures": {
+										"0": {
+											"name": "punctuation.definition.tag.end.html"
+										}
+									},
+									"name": "meta.tag.structure.start.html",
+									"patterns": [
+										{
+											"include": "#attribute"
+										}
+									]
+								},
+								{
+									"include": "#tags"
+								}
+							]
+						},
+						{
+							"captures": {
+								"0": {
+									"name": "meta.tag.inline.svg.$2.void.html"
+								},
+								"1": {
+									"name": "punctuation.definition.tag.begin.html"
+								},
+								"2": {
+									"name": "entity.name.tag.html"
+								},
+								"3": {
+									"patterns": [
+										{
+											"include": "#attribute"
+										}
+									]
+								},
+								"5": {
+									"name": "punctuation.definition.tag.end.html"
+								}
+							},
+							"match": "(?i)(<)(a|animate|discard|feBlend|feColorMatrix|feComposite|feConvolveMatrix|feDisplacementMap|feDistantLight|feDropShadow|feFlood|feFuncA|feFuncB|feFuncG|feFuncR|feGaussianBlur|feMergeNode|feMorphology|feOffset|fePointLight|feSpotLight|feTile|feTurbulence|hatchPath|mpath|set|solidcolor|stop|tspan)(?=\\s|/?>)(?:(([^\"'>]|\"[^\"]*\"|'[^']*')*)(/>))",
+							"name": "meta.element.inline.svg.$2.html"
+						},
+						{
+							"begin": "(?i)(<)(a|animate|discard|feBlend|feColorMatrix|feComposite|feConvolveMatrix|feDisplacementMap|feDistantLight|feDropShadow|feFlood|feFuncA|feFuncB|feFuncG|feFuncR|feGaussianBlur|feMergeNode|feMorphology|feOffset|fePointLight|feSpotLight|feTile|feTurbulence|hatchPath|mpath|set|solidcolor|stop|tspan)(?=\\s|/?>)(?:(([^\"'>]|\"[^\"]*\"|'[^']*')*)(>))?",
+							"beginCaptures": {
+								"0": {
+									"name": "meta.tag.inline.svg.$2.start.html"
+								},
+								"1": {
+									"name": "punctuation.definition.tag.begin.html"
+								},
+								"2": {
+									"name": "entity.name.tag.html"
+								},
+								"3": {
+									"patterns": [
+										{
+											"include": "#attribute"
+										}
+									]
+								},
+								"5": {
+									"name": "punctuation.definition.tag.end.html"
+								}
+							},
+							"end": "(?i)(</)(\\2)\\s*(>)|(/>)|(?=</\\w+)",
+							"endCaptures": {
+								"0": {
+									"name": "meta.tag.inline.svg.$2.end.html"
+								},
+								"1": {
+									"name": "punctuation.definition.tag.begin.html"
+								},
+								"2": {
+									"name": "entity.name.tag.html"
+								},
+								"3": {
+									"name": "punctuation.definition.tag.end.html"
+								},
+								"4": {
+									"name": "punctuation.definition.tag.end.html"
+								}
+							},
+							"name": "meta.element.inline.svg.$2.html",
+							"patterns": [
+								{
+									"begin": "(?<!>)\\G",
+									"end": "(?=/>)|>",
+									"endCaptures": {
+										"0": {
+											"name": "punctuation.definition.tag.end.html"
+										}
+									},
+									"name": "meta.tag.inline.start.html",
+									"patterns": [
+										{
+											"include": "#attribute"
+										}
+									]
+								},
+								{
+									"include": "#tags"
+								}
+							]
+						},
+						{
+							"captures": {
+								"0": {
+									"name": "meta.tag.object.svg.$2.void.html"
+								},
+								"1": {
+									"name": "punctuation.definition.tag.begin.html"
+								},
+								"2": {
+									"name": "entity.name.tag.html"
+								},
+								"3": {
+									"patterns": [
+										{
+											"include": "#attribute"
+										}
+									]
+								},
+								"5": {
+									"name": "punctuation.definition.tag.end.html"
+								}
+							},
+							"match": "(?i)(<)(circle|ellipse|feImage|foreignObject|image|line|path|polygon|polyline|rect|symbol|use|view)(?=\\s|/?>)(?:(([^\"'>]|\"[^\"]*\"|'[^']*')*)(/>))",
+							"name": "meta.element.object.svg.$2.html"
+						},
+						{
+							"begin": "(?i)(<)(a|circle|ellipse|feImage|foreignObject|image|line|path|polygon|polyline|rect|symbol|use|view)(?=\\s|/?>)(?:(([^\"'>]|\"[^\"]*\"|'[^']*')*)(>))?",
+							"beginCaptures": {
+								"0": {
+									"name": "meta.tag.object.svg.$2.start.html"
+								},
+								"1": {
+									"name": "punctuation.definition.tag.begin.html"
+								},
+								"2": {
+									"name": "entity.name.tag.html"
+								},
+								"3": {
+									"patterns": [
+										{
+											"include": "#attribute"
+										}
+									]
+								},
+								"5": {
+									"name": "punctuation.definition.tag.end.html"
+								}
+							},
+							"end": "(?i)(</)(\\2)\\s*(>)|(/>)|(?=</\\w+)",
+							"endCaptures": {
+								"0": {
+									"name": "meta.tag.object.svg.$2.end.html"
+								},
+								"1": {
+									"name": "punctuation.definition.tag.begin.html"
+								},
+								"2": {
+									"name": "entity.name.tag.html"
+								},
+								"3": {
+									"name": "punctuation.definition.tag.end.html"
+								},
+								"4": {
+									"name": "punctuation.definition.tag.end.html"
+								}
+							},
+							"name": "meta.element.object.svg.$2.html",
+							"patterns": [
+								{
+									"begin": "(?<!>)\\G",
+									"end": "(?=/>)|>",
+									"endCaptures": {
+										"0": {
+											"name": "punctuation.definition.tag.end.html"
+										}
+									},
+									"name": "meta.tag.object.start.html",
+									"patterns": [
+										{
+											"include": "#attribute"
+										}
+									]
+								},
+								{
+									"include": "#tags"
+								}
+							]
+						},
+						{
+							"captures": {
+								"0": {
+									"name": "meta.tag.other.svg.$2.void.html"
+								},
+								"1": {
+									"name": "punctuation.definition.tag.begin.html"
+								},
+								"2": {
+									"name": "entity.name.tag.html"
+								},
+								"3": {
+									"name": "invalid.deprecated.html"
+								},
+								"4": {
+									"patterns": [
+										{
+											"include": "#attribute"
+										}
+									]
+								},
+								"6": {
+									"name": "punctuation.definition.tag.end.html"
+								}
+							},
+							"match": "(?i)(<)((altGlyph|altGlyphDef|altGlyphItem|animateColor|animateTransform|cursor|font|font-face|font-face-format|font-face-name|font-face-src|font-face-uri|glyph|glyphRef|hkern|missing-glyph|tref|vkern))(?=\\s|/?>)(?:(([^\"'>]|\"[^\"]*\"|'[^']*')*)(/>))",
+							"name": "meta.element.other.svg.$2.html"
+						},
+						{
+							"begin": "(?i)(<)((altGlyph|altGlyphDef|altGlyphItem|animateColor|animateTransform|cursor|font|font-face|font-face-format|font-face-name|font-face-src|font-face-uri|glyph|glyphRef|hkern|missing-glyph|tref|vkern))(?=\\s|/?>)(?:(([^\"'>]|\"[^\"]*\"|'[^']*')*)(>))?",
+							"beginCaptures": {
+								"0": {
+									"name": "meta.tag.other.svg.$2.start.html"
+								},
+								"1": {
+									"name": "punctuation.definition.tag.begin.html"
+								},
+								"2": {
+									"name": "entity.name.tag.html"
+								},
+								"3": {
+									"name": "invalid.deprecated.html"
+								},
+								"4": {
+									"patterns": [
+										{
+											"include": "#attribute"
+										}
+									]
+								},
+								"6": {
+									"name": "punctuation.definition.tag.end.html"
+								}
+							},
+							"end": "(?i)(</)((\\2))\\s*(>)|(/>)|(?=</\\w+)",
+							"endCaptures": {
+								"0": {
+									"name": "meta.tag.other.svg.$2.end.html"
+								},
+								"1": {
+									"name": "punctuation.definition.tag.begin.html"
+								},
+								"2": {
+									"name": "entity.name.tag.html"
+								},
+								"3": {
+									"name": "invalid.deprecated.html"
+								},
+								"4": {
+									"name": "punctuation.definition.tag.end.html"
+								},
+								"5": {
+									"name": "punctuation.definition.tag.end.html"
+								}
+							},
+							"name": "meta.element.other.svg.$2.html",
+							"patterns": [
+								{
+									"begin": "(?<!>)\\G",
+									"end": "(?=/>)|>",
+									"endCaptures": {
+										"0": {
+											"name": "punctuation.definition.tag.end.html"
+										}
+									},
+									"name": "meta.tag.other.start.html",
+									"patterns": [
+										{
+											"include": "#attribute"
+										}
+									]
+								},
+								{
+									"include": "#tags"
+								}
+							]
+						},
+						{
+							"captures": {
+								"0": {
+									"name": "meta.tag.other.invalid.void.html"
+								},
+								"1": {
+									"name": "punctuation.definition.tag.begin.html"
+								},
+								"2": {
+									"name": "entity.name.tag.html"
+								},
+								"3": {
+									"name": "invalid.illegal.unrecognized-tag.html"
+								},
+								"4": {
+									"patterns": [
+										{
+											"include": "#attribute"
+										}
+									]
+								},
+								"6": {
+									"name": "punctuation.definition.tag.end.html"
+								}
+							},
+							"match": "(?i)(<)(([\\w:]+))(?=\\s|/?>)(?:(([^\"'>]|\"[^\"]*\"|'[^']*')*)(/>))",
+							"name": "meta.element.other.invalid.html"
+						},
+						{
+							"begin": "(?i)(<)((\\w[^\\s>]*))(?=\\s|/?>)(?:(([^\"'>]|\"[^\"]*\"|'[^']*')*)(>))?",
+							"beginCaptures": {
+								"0": {
+									"name": "meta.tag.other.invalid.start.html"
+								},
+								"1": {
+									"name": "punctuation.definition.tag.begin.html"
+								},
+								"2": {
+									"name": "entity.name.tag.html"
+								},
+								"3": {
+									"name": "invalid.illegal.unrecognized-tag.html"
+								},
+								"4": {
+									"patterns": [
+										{
+											"include": "#attribute"
+										}
+									]
+								},
+								"6": {
+									"name": "punctuation.definition.tag.end.html"
+								}
+							},
+							"end": "(?i)(</)((\\2))\\s*(>)|(/>)|(?=</\\w+)",
+							"endCaptures": {
+								"0": {
+									"name": "meta.tag.other.invalid.end.html"
+								},
+								"1": {
+									"name": "punctuation.definition.tag.begin.html"
+								},
+								"2": {
+									"name": "entity.name.tag.html"
+								},
+								"3": {
+									"name": "invalid.illegal.unrecognized-tag.html"
+								},
+								"4": {
+									"name": "punctuation.definition.tag.end.html"
+								},
+								"5": {
+									"name": "punctuation.definition.tag.end.html"
+								}
+							},
+							"name": "meta.element.other.invalid.html",
+							"patterns": [
+								{
+									"begin": "(?<!>)\\G",
+									"end": "(?=/>)|>",
+									"endCaptures": {
+										"0": {
+											"name": "punctuation.definition.tag.end.html"
+										}
+									},
+									"name": "meta.tag.other.invalid.start.html",
+									"patterns": [
+										{
+											"include": "#attribute"
+										}
+									]
+								},
+								{
+									"include": "#tags"
+								}
+							]
+						},
+						{
+							"include": "#tags-invalid"
+						}
+					]
+				}
+			}
+		},
+		"tags-invalid": {
+			"patterns": [
 				{
-					"include": "#tag-generic-attribute"
-				},
-				{
-					"include": "#string-double-quoted"
-				},
-				{
-					"include": "#string-single-quoted"
-				},
-				{
-					"include": "#embedded-code"
-				},
-				{
-					"include": "#unquoted-attribute"
+					"begin": "(</?)((\\w[^\\s>]*))(?<!/)",
+					"beginCaptures": {
+						"1": {
+							"name": "punctuation.definition.tag.begin.html"
+						},
+						"2": {
+							"name": "entity.name.tag.html"
+						},
+						"3": {
+							"name": "invalid.illegal.unrecognized-tag.html"
+						}
+					},
+					"end": "((?: ?/)?>)",
+					"endCaptures": {
+						"1": {
+							"name": "punctuation.definition.tag.end.html"
+						}
+					},
+					"name": "meta.tag.other.$2.html",
+					"patterns": [
+						{
+							"include": "#attribute"
+						}
+					]
 				}
 			]
 		},
-		"unquoted-attribute": {
-			"match": "(?<==)(?:[^\\s<>/'\"]|/(?!>))+",
-			"name": "string.unquoted.html"
+		"tags-valid": {
+			"patterns": [
+				{
+					"begin": "(^[ \\t]+)?(?=<(?i:style)\\b(?!-))",
+					"beginCaptures": {
+						"1": {
+							"name": "punctuation.whitespace.embedded.leading.html"
+						}
+					},
+					"end": "(?!\\G)([ \\t]*$\\n?)?",
+					"endCaptures": {
+						"1": {
+							"name": "punctuation.whitespace.embedded.trailing.html"
+						}
+					},
+					"patterns": [
+						{
+							"begin": "(?i)(<)(style)(?=\\s|/?>)",
+							"beginCaptures": {
+								"0": {
+									"name": "meta.tag.metadata.style.start.html"
+								},
+								"1": {
+									"name": "punctuation.definition.tag.begin.html"
+								},
+								"2": {
+									"name": "entity.name.tag.html"
+								}
+							},
+							"end": "(?i)((<)/)(style)\\s*(>)",
+							"endCaptures": {
+								"0": {
+									"name": "meta.tag.metadata.style.end.html"
+								},
+								"1": {
+									"name": "punctuation.definition.tag.begin.html"
+								},
+								"2": {
+									"name": "source.css"
+								},
+								"3": {
+									"name": "entity.name.tag.html"
+								},
+								"4": {
+									"name": "punctuation.definition.tag.end.html"
+								}
+							},
+							"name": "meta.embedded.block.html",
+							"patterns": [
+								{
+									"begin": "\\G",
+									"captures": {
+										"1": {
+											"name": "punctuation.definition.tag.end.html"
+										}
+									},
+									"end": "(>)",
+									"name": "meta.tag.metadata.style.start.html",
+									"patterns": [
+										{
+											"include": "#attribute"
+										}
+									]
+								},
+								{
+									"begin": "(?!\\G)",
+									"end": "(?=</(?i:style))",
+									"name": "source.css",
+									"patterns": [
+										{
+											"include": "source.css"
+										}
+									]
+								}
+							]
+						}
+					]
+				},
+				{
+					"begin": "(^[ \\t]+)?(?=<(?i:script)\\b(?!-))",
+					"beginCaptures": {
+						"1": {
+							"name": "punctuation.whitespace.embedded.leading.html"
+						}
+					},
+					"end": "(?!\\G)([ \\t]*$\\n?)?",
+					"endCaptures": {
+						"1": {
+							"name": "punctuation.whitespace.embedded.trailing.html"
+						}
+					},
+					"patterns": [
+						{
+							"begin": "(<)((?i:script))\\b",
+							"beginCaptures": {
+								"0": {
+									"name": "meta.tag.metadata.script.start.html"
+								},
+								"1": {
+									"name": "punctuation.definition.tag.begin.html"
+								},
+								"2": {
+									"name": "entity.name.tag.html"
+								}
+							},
+							"end": "(/)((?i:script))(>)",
+							"endCaptures": {
+								"0": {
+									"name": "meta.tag.metadata.script.end.html"
+								},
+								"1": {
+									"name": "punctuation.definition.tag.begin.html"
+								},
+								"2": {
+									"name": "entity.name.tag.html"
+								},
+								"3": {
+									"name": "punctuation.definition.tag.end.html"
+								}
+							},
+							"name": "meta.embedded.block.html",
+							"patterns": [
+								{
+									"begin": "\\G",
+									"end": "(?=/)",
+									"patterns": [
+										{
+											"begin": "(>)",
+											"beginCaptures": {
+												"0": {
+													"name": "meta.tag.metadata.script.start.html"
+												},
+												"1": {
+													"name": "punctuation.definition.tag.end.html"
+												}
+											},
+											"end": "((<))(?=/(?i:script))",
+											"endCaptures": {
+												"0": {
+													"name": "meta.tag.metadata.script.end.html"
+												},
+												"1": {
+													"name": "punctuation.definition.tag.begin.html"
+												},
+												"2": {
+													"name": "source.js"
+												}
+											},
+											"patterns": [
+												{
+													"begin": "\\G",
+													"end": "(?=</(?i:script))",
+													"name": "source.js",
+													"patterns": [
+														{
+															"begin": "(^[ \\t]+)?(?=//)",
+															"beginCaptures": {
+																"1": {
+																	"name": "punctuation.whitespace.comment.leading.js"
+																}
+															},
+															"end": "(?!\\G)",
+															"patterns": [
+																{
+																	"begin": "//",
+																	"beginCaptures": {
+																		"0": {
+																			"name": "punctuation.definition.comment.js"
+																		}
+																	},
+																	"end": "(?=</script)|\\n",
+																	"name": "comment.line.double-slash.js"
+																}
+															]
+														},
+														{
+															"begin": "/\\*",
+															"captures": {
+																"0": {
+																	"name": "punctuation.definition.comment.js"
+																}
+															},
+															"end": "\\*/|(?=</script)",
+															"name": "comment.block.js"
+														},
+														{
+															"include": "source.js"
+														}
+													]
+												}
+											]
+										},
+										{
+											"begin": "\\G",
+											"end": "(?ix:\n\t\t\t\t\t\t\t\t\t\t\t\t(?=>\t\t\t\t\t\t\t\t\t\t\t# Tag without type attribute\n\t\t\t\t\t\t\t\t\t\t\t\t  | type(?=[\\s=])\n\t\t\t\t\t\t\t\t\t\t\t\t  \t(?!\\s*=\\s*\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t(\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t''\t\t\t\t\t\t\t\t# Empty\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t  | \"\"\t\t\t\t\t\t\t\t\t#   Values\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t  | ('|\"|)\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t(\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\ttext/\t\t\t\t\t\t\t# Text mime-types\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t(\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tjavascript(1\\.[0-5])?\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t  | x-javascript\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t  | jscript\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t  | livescript\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t  | (x-)?ecmascript\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t  | babel\t\t\t\t\t\t# Javascript variant currently\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t  \t\t\t\t\t\t\t\t#   recognized as such\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t  \t)\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t  | application/\t\t\t\t\t# Application mime-types\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t  \t(\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t(x-)?javascript\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t  | (x-)?ecmascript\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t)\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t  | module\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t  \t)\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t[\\s\"'>]\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t)\n\t\t\t\t\t\t\t\t\t\t\t\t\t)\n\t\t\t\t\t\t\t\t\t\t\t\t)\n\t\t\t\t\t\t\t\t\t\t\t)",
+											"name": "meta.tag.metadata.script.start.html",
+											"patterns": [
+												{
+													"include": "#attribute"
+												}
+											]
+										},
+										{
+											"begin": "(?ix:\n\t\t\t\t\t\t\t\t\t\t\t\t(?=\n\t\t\t\t\t\t\t\t\t\t\t\t\ttype\\s*=\\s*\n\t\t\t\t\t\t\t\t\t\t\t\t\t('|\"|)\n\t\t\t\t\t\t\t\t\t\t\t\t\ttext/\n\t\t\t\t\t\t\t\t\t\t\t\t\t(\n\t\t\t\t\t\t\t\t\t\t\t\t\t\tx-handlebars\n\t\t\t\t\t\t\t\t\t\t\t\t\t  | (x-(handlebars-)?|ng-)?template\n\t\t\t\t\t\t\t\t\t\t\t\t\t  | html\n\t\t\t\t\t\t\t\t\t\t\t\t\t)\n\t\t\t\t\t\t\t\t\t\t\t\t\t[\\s\"'>]\n\t\t\t\t\t\t\t\t\t\t\t\t)\n\t\t\t\t\t\t\t\t\t\t\t)",
+											"end": "((<))(?=/(?i:script))",
+											"endCaptures": {
+												"0": {
+													"name": "meta.tag.metadata.script.end.html"
+												},
+												"1": {
+													"name": "punctuation.definition.tag.begin.html"
+												},
+												"2": {
+													"name": "text.html.basic"
+												}
+											},
+											"patterns": [
+												{
+													"begin": "\\G",
+													"end": "(>)",
+													"endCaptures": {
+														"1": {
+															"name": "punctuation.definition.tag.end.html"
+														}
+													},
+													"name": "meta.tag.metadata.script.start.html",
+													"patterns": [
+														{
+															"include": "#attribute"
+														}
+													]
+												},
+												{
+													"begin": "(?!\\G)",
+													"end": "(?=</(?i:script))",
+													"name": "text.html.basic",
+													"patterns": [
+														{
+															"include": "text.html.basic"
+														}
+													]
+												}
+											]
+										},
+										{
+											"begin": "(?=(?i:type))",
+											"end": "(<)(?=/(?i:script))",
+											"endCaptures": {
+												"0": {
+													"name": "meta.tag.metadata.script.end.html"
+												},
+												"1": {
+													"name": "punctuation.definition.tag.begin.html"
+												}
+											},
+											"patterns": [
+												{
+													"begin": "\\G",
+													"end": "(>)",
+													"endCaptures": {
+														"1": {
+															"name": "punctuation.definition.tag.end.html"
+														}
+													},
+													"name": "meta.tag.metadata.script.start.html",
+													"patterns": [
+														{
+															"include": "#attribute"
+														}
+													]
+												},
+												{
+													"begin": "(?!\\G)",
+													"end": "(?=</(?i:script))",
+													"name": "source.unknown"
+												}
+											]
+										}
+									]
+								}
+							]
+						}
+					]
+				},
+				{
+					"begin": "(?i)(<)(base|link|meta)(?=\\s|/?>)",
+					"beginCaptures": {
+						"1": {
+							"name": "punctuation.definition.tag.begin.html"
+						},
+						"2": {
+							"name": "entity.name.tag.html"
+						}
+					},
+					"end": "/?>",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.tag.end.html"
+						}
+					},
+					"name": "meta.tag.metadata.$2.void.html",
+					"patterns": [
+						{
+							"include": "#attribute"
+						}
+					]
+				},
+				{
+					"begin": "(?i)(<)(noscript|title)(?=\\s|/?>)",
+					"beginCaptures": {
+						"1": {
+							"name": "punctuation.definition.tag.begin.html"
+						},
+						"2": {
+							"name": "entity.name.tag.html"
+						}
+					},
+					"end": ">",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.tag.end.html"
+						}
+					},
+					"name": "meta.tag.metadata.$2.start.html",
+					"patterns": [
+						{
+							"include": "#attribute"
+						}
+					]
+				},
+				{
+					"begin": "(?i)(</)(noscript|title)(?=\\s|/?>)",
+					"beginCaptures": {
+						"1": {
+							"name": "punctuation.definition.tag.begin.html"
+						},
+						"2": {
+							"name": "entity.name.tag.html"
+						}
+					},
+					"end": ">",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.tag.end.html"
+						}
+					},
+					"name": "meta.tag.metadata.$2.end.html",
+					"patterns": [
+						{
+							"include": "#attribute"
+						}
+					]
+				},
+				{
+					"begin": "(?i)(<)(col|hr|input)(?=\\s|/?>)",
+					"beginCaptures": {
+						"1": {
+							"name": "punctuation.definition.tag.begin.html"
+						},
+						"2": {
+							"name": "entity.name.tag.html"
+						}
+					},
+					"end": "/?>",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.tag.end.html"
+						}
+					},
+					"name": "meta.tag.structure.$2.void.html",
+					"patterns": [
+						{
+							"include": "#attribute"
+						}
+					]
+				},
+				{
+					"begin": "(?i)(<)(address|article|aside|blockquote|body|button|caption|colgroup|datalist|dd|details|dialog|div|dl|dt|fieldset|figcaption|figure|footer|form|head|header|hgroup|html|h[1-6]|label|legend|li|main|map|menu|meter|nav|ol|optgroup|option|output|p|pre|progress|section|select|slot|summary|table|tbody|td|template|textarea|tfoot|th|thead|tr|ul)(?=\\s|/?>)",
+					"beginCaptures": {
+						"1": {
+							"name": "punctuation.definition.tag.begin.html"
+						},
+						"2": {
+							"name": "entity.name.tag.html"
+						}
+					},
+					"end": ">",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.tag.end.html"
+						}
+					},
+					"name": "meta.tag.structure.$2.start.html",
+					"patterns": [
+						{
+							"include": "#attribute"
+						}
+					]
+				},
+				{
+					"begin": "(?i)(</)(address|article|aside|blockquote|body|button|caption|colgroup|datalist|dd|details|dialog|div|dl|dt|fieldset|figcaption|figure|footer|form|head|header|hgroup|html|h[1-6]|label|legend|li|main|map|menu|meter|nav|ol|optgroup|option|output|p|pre|progress|section|select|slot|summary|table|tbody|td|template|textarea|tfoot|th|thead|tr|ul)(?=\\s|/?>)",
+					"beginCaptures": {
+						"1": {
+							"name": "punctuation.definition.tag.begin.html"
+						},
+						"2": {
+							"name": "entity.name.tag.html"
+						}
+					},
+					"end": ">",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.tag.end.html"
+						}
+					},
+					"name": "meta.tag.structure.$2.end.html",
+					"patterns": [
+						{
+							"include": "#attribute"
+						}
+					]
+				},
+				{
+					"begin": "(?i)(<)(area|br|wbr)(?=\\s|/?>)",
+					"beginCaptures": {
+						"1": {
+							"name": "punctuation.definition.tag.begin.html"
+						},
+						"2": {
+							"name": "entity.name.tag.html"
+						}
+					},
+					"end": "/?>",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.tag.end.html"
+						}
+					},
+					"name": "meta.tag.inline.$2.void.html",
+					"patterns": [
+						{
+							"include": "#attribute"
+						}
+					]
+				},
+				{
+					"begin": "(?i)(<)(a|abbr|b|bdi|bdo|cite|code|data|del|dfn|em|i|ins|kbd|mark|q|rp|rt|ruby|s|samp|small|span|strong|sub|sup|time|u|var)(?=\\s|/?>)",
+					"beginCaptures": {
+						"1": {
+							"name": "punctuation.definition.tag.begin.html"
+						},
+						"2": {
+							"name": "entity.name.tag.html"
+						}
+					},
+					"end": ">",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.tag.end.html"
+						}
+					},
+					"name": "meta.tag.inline.$2.start.html",
+					"patterns": [
+						{
+							"include": "#attribute"
+						}
+					]
+				},
+				{
+					"begin": "(?i)(</)(a|abbr|b|bdi|bdo|cite|code|data|del|dfn|em|i|ins|kbd|mark|q|rp|rt|ruby|s|samp|small|span|strong|sub|sup|time|u|var)(?=\\s|/?>)",
+					"beginCaptures": {
+						"1": {
+							"name": "punctuation.definition.tag.begin.html"
+						},
+						"2": {
+							"name": "entity.name.tag.html"
+						}
+					},
+					"end": ">",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.tag.end.html"
+						}
+					},
+					"name": "meta.tag.inline.$2.end.html",
+					"patterns": [
+						{
+							"include": "#attribute"
+						}
+					]
+				},
+				{
+					"begin": "(?i)(<)(embed|img|param|source|track)(?=\\s|/?>)",
+					"beginCaptures": {
+						"1": {
+							"name": "punctuation.definition.tag.begin.html"
+						},
+						"2": {
+							"name": "entity.name.tag.html"
+						}
+					},
+					"end": "/?>",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.tag.end.html"
+						}
+					},
+					"name": "meta.tag.object.$2.void.html",
+					"patterns": [
+						{
+							"include": "#attribute"
+						}
+					]
+				},
+				{
+					"begin": "(?i)(<)(audio|canvas|iframe|object|picture|video)(?=\\s|/?>)",
+					"beginCaptures": {
+						"1": {
+							"name": "punctuation.definition.tag.begin.html"
+						},
+						"2": {
+							"name": "entity.name.tag.html"
+						}
+					},
+					"end": ">",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.tag.end.html"
+						}
+					},
+					"name": "meta.tag.object.$2.start.html",
+					"patterns": [
+						{
+							"include": "#attribute"
+						}
+					]
+				},
+				{
+					"begin": "(?i)(</)(audio|canvas|iframe|object|picture|video)(?=\\s|/?>)",
+					"beginCaptures": {
+						"1": {
+							"name": "punctuation.definition.tag.begin.html"
+						},
+						"2": {
+							"name": "entity.name.tag.html"
+						}
+					},
+					"end": ">",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.tag.end.html"
+						}
+					},
+					"name": "meta.tag.object.$2.end.html",
+					"patterns": [
+						{
+							"include": "#attribute"
+						}
+					]
+				},
+				{
+					"begin": "(?i)(<)((basefont|isindex))(?=\\s|/?>)",
+					"beginCaptures": {
+						"1": {
+							"name": "punctuation.definition.tag.begin.html"
+						},
+						"2": {
+							"name": "entity.name.tag.html"
+						},
+						"3": {
+							"name": "invalid.deprecated.html"
+						}
+					},
+					"end": "/?>",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.tag.end.html"
+						}
+					},
+					"name": "meta.tag.metadata.$2.void.html",
+					"patterns": [
+						{
+							"include": "#attribute"
+						}
+					]
+				},
+				{
+					"begin": "(?i)(<)((center|frameset|noembed|noframes))(?=\\s|/?>)",
+					"beginCaptures": {
+						"1": {
+							"name": "punctuation.definition.tag.begin.html"
+						},
+						"2": {
+							"name": "entity.name.tag.html"
+						},
+						"3": {
+							"name": "invalid.deprecated.html"
+						}
+					},
+					"end": ">",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.tag.end.html"
+						}
+					},
+					"name": "meta.tag.structure.$2.start.html",
+					"patterns": [
+						{
+							"include": "#attribute"
+						}
+					]
+				},
+				{
+					"begin": "(?i)(</)((center|frameset|noembed|noframes))(?=\\s|/?>)",
+					"beginCaptures": {
+						"1": {
+							"name": "punctuation.definition.tag.begin.html"
+						},
+						"2": {
+							"name": "entity.name.tag.html"
+						},
+						"3": {
+							"name": "invalid.deprecated.html"
+						}
+					},
+					"end": ">",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.tag.end.html"
+						}
+					},
+					"name": "meta.tag.structure.$2.end.html",
+					"patterns": [
+						{
+							"include": "#attribute"
+						}
+					]
+				},
+				{
+					"begin": "(?i)(<)((acronym|big|blink|font|strike|tt|xmp))(?=\\s|/?>)",
+					"beginCaptures": {
+						"1": {
+							"name": "punctuation.definition.tag.begin.html"
+						},
+						"2": {
+							"name": "entity.name.tag.html"
+						},
+						"3": {
+							"name": "invalid.deprecated.html"
+						}
+					},
+					"end": ">",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.tag.end.html"
+						}
+					},
+					"name": "meta.tag.inline.$2.start.html",
+					"patterns": [
+						{
+							"include": "#attribute"
+						}
+					]
+				},
+				{
+					"begin": "(?i)(</)((acronym|big|blink|font|strike|tt|xmp))(?=\\s|/?>)",
+					"beginCaptures": {
+						"1": {
+							"name": "punctuation.definition.tag.begin.html"
+						},
+						"2": {
+							"name": "entity.name.tag.html"
+						},
+						"3": {
+							"name": "invalid.deprecated.html"
+						}
+					},
+					"end": ">",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.tag.end.html"
+						}
+					},
+					"name": "meta.tag.inline.$2.end.html",
+					"patterns": [
+						{
+							"include": "#attribute"
+						}
+					]
+				},
+				{
+					"begin": "(?i)(<)((frame))(?=\\s|/?>)",
+					"beginCaptures": {
+						"1": {
+							"name": "punctuation.definition.tag.begin.html"
+						},
+						"2": {
+							"name": "entity.name.tag.html"
+						},
+						"3": {
+							"name": "invalid.deprecated.html"
+						}
+					},
+					"end": "/?>",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.tag.end.html"
+						}
+					},
+					"name": "meta.tag.object.$2.void.html",
+					"patterns": [
+						{
+							"include": "#attribute"
+						}
+					]
+				},
+				{
+					"begin": "(?i)(<)((applet))(?=\\s|/?>)",
+					"beginCaptures": {
+						"1": {
+							"name": "punctuation.definition.tag.begin.html"
+						},
+						"2": {
+							"name": "entity.name.tag.html"
+						},
+						"3": {
+							"name": "invalid.deprecated.html"
+						}
+					},
+					"end": ">",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.tag.end.html"
+						}
+					},
+					"name": "meta.tag.object.$2.start.html",
+					"patterns": [
+						{
+							"include": "#attribute"
+						}
+					]
+				},
+				{
+					"begin": "(?i)(</)((applet))(?=\\s|/?>)",
+					"beginCaptures": {
+						"1": {
+							"name": "punctuation.definition.tag.begin.html"
+						},
+						"2": {
+							"name": "entity.name.tag.html"
+						},
+						"3": {
+							"name": "invalid.deprecated.html"
+						}
+					},
+					"end": ">",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.tag.end.html"
+						}
+					},
+					"name": "meta.tag.object.$2.end.html",
+					"patterns": [
+						{
+							"include": "#attribute"
+						}
+					]
+				},
+				{
+					"begin": "(?i)(<)((dir|keygen|listing|menuitem|plaintext|spacer))(?=\\s|/?>)",
+					"beginCaptures": {
+						"1": {
+							"name": "punctuation.definition.tag.begin.html"
+						},
+						"2": {
+							"name": "entity.name.tag.html"
+						},
+						"3": {
+							"name": "invalid.illegal.no-longer-supported.html"
+						}
+					},
+					"end": ">",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.tag.end.html"
+						}
+					},
+					"name": "meta.tag.other.$2.start.html",
+					"patterns": [
+						{
+							"include": "#attribute"
+						}
+					]
+				},
+				{
+					"begin": "(?i)(</)((dir|keygen|listing|menuitem|plaintext|spacer))(?=\\s|/?>)",
+					"beginCaptures": {
+						"1": {
+							"name": "punctuation.definition.tag.begin.html"
+						},
+						"2": {
+							"name": "entity.name.tag.html"
+						},
+						"3": {
+							"name": "invalid.illegal.no-longer-supported.html"
+						}
+					},
+					"end": ">",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.tag.end.html"
+						}
+					},
+					"name": "meta.tag.other.$2.end.html",
+					"patterns": [
+						{
+							"include": "#attribute"
+						}
+					]
+				},
+				{
+					"include": "#math"
+				},
+				{
+					"include": "#svg"
+				},
+				{
+					"begin": "(<)([a-zA-Z][.0-9_a-zA-Z\\x{00B7}\\x{00C0}-\\x{00D6}\\x{00D8}-\\x{00F6}\\x{00F8}-\\x{037D}\\x{037F}-\\x{1FFF}\\x{200C}-\\x{200D}\\x{203F}-\\x{2040}\\x{2070}-\\x{218F}\\x{2C00}-\\x{2FEF}\\x{3001}-\\x{D7FF}\\x{F900}-\\x{FDCF}\\x{FDF0}-\\x{FFFD}\\x{10000}-\\x{EFFFF}]*-[\\-.0-9_a-zA-Z\\x{00B7}\\x{00C0}-\\x{00D6}\\x{00D8}-\\x{00F6}\\x{00F8}-\\x{037D}\\x{037F}-\\x{1FFF}\\x{200C}-\\x{200D}\\x{203F}-\\x{2040}\\x{2070}-\\x{218F}\\x{2C00}-\\x{2FEF}\\x{3001}-\\x{D7FF}\\x{F900}-\\x{FDCF}\\x{FDF0}-\\x{FFFD}\\x{10000}-\\x{EFFFF}]*)(?=\\s|/?>)",
+					"beginCaptures": {
+						"1": {
+							"name": "punctuation.definition.tag.begin.html"
+						},
+						"2": {
+							"name": "entity.name.tag.html"
+						}
+					},
+					"end": "/?>",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.tag.end.html"
+						}
+					},
+					"name": "meta.tag.custom.start.html",
+					"patterns": [
+						{
+							"include": "#attribute"
+						}
+					]
+				},
+				{
+					"begin": "(</)([a-zA-Z][.0-9_a-zA-Z\\x{00B7}\\x{00C0}-\\x{00D6}\\x{00D8}-\\x{00F6}\\x{00F8}-\\x{037D}\\x{037F}-\\x{1FFF}\\x{200C}-\\x{200D}\\x{203F}-\\x{2040}\\x{2070}-\\x{218F}\\x{2C00}-\\x{2FEF}\\x{3001}-\\x{D7FF}\\x{F900}-\\x{FDCF}\\x{FDF0}-\\x{FFFD}\\x{10000}-\\x{EFFFF}]*-[\\-.0-9_a-zA-Z\\x{00B7}\\x{00C0}-\\x{00D6}\\x{00D8}-\\x{00F6}\\x{00F8}-\\x{037D}\\x{037F}-\\x{1FFF}\\x{200C}-\\x{200D}\\x{203F}-\\x{2040}\\x{2070}-\\x{218F}\\x{2C00}-\\x{2FEF}\\x{3001}-\\x{D7FF}\\x{F900}-\\x{FDCF}\\x{FDF0}-\\x{FFFD}\\x{10000}-\\x{EFFFF}]*)(?=\\s|/?>)",
+					"beginCaptures": {
+						"1": {
+							"name": "punctuation.definition.tag.begin.html"
+						},
+						"2": {
+							"name": "entity.name.tag.html"
+						}
+					},
+					"end": ">",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.tag.end.html"
+						}
+					},
+					"name": "meta.tag.custom.end.html",
+					"patterns": [
+						{
+							"include": "#attribute"
+						}
+					]
+				}
+			]
 		}
 	}
 }
\ No newline at end of file
diff --git a/extensions/html/test/colorize-results/12750_html.json b/extensions/html/test/colorize-results/12750_html.json
index a89b03aa84f..389ca104ac5 100644
--- a/extensions/html/test/colorize-results/12750_html.json
+++ b/extensions/html/test/colorize-results/12750_html.json
@@ -1,7 +1,7 @@
 [
 	{
 		"c": "<",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html punctuation.definition.tag.begin.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.start.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -12,7 +12,7 @@
 	},
 	{
 		"c": "script",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html entity.name.tag.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.start.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -23,7 +23,7 @@
 	},
 	{
 		"c": " ",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.start.html",
 		"r": {
 			"dark_plus": "meta.embedded: #D4D4D4",
 			"light_plus": "meta.embedded: #000000",
@@ -34,7 +34,7 @@
 	},
 	{
 		"c": "type",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html entity.other.attribute-name.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.start.html meta.attribute.type.html entity.other.attribute-name.html",
 		"r": {
 			"dark_plus": "entity.other.attribute-name: #9CDCFE",
 			"light_plus": "entity.other.attribute-name: #FF0000",
@@ -45,7 +45,7 @@
 	},
 	{
 		"c": "=",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.start.html meta.attribute.type.html punctuation.separator.key-value.html",
 		"r": {
 			"dark_plus": "meta.embedded: #D4D4D4",
 			"light_plus": "meta.embedded: #000000",
@@ -56,7 +56,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html string.quoted.double.html punctuation.definition.string.begin.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.start.html meta.attribute.type.html string.quoted.double.html punctuation.definition.string.begin.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.double.html: #0000FF",
@@ -67,7 +67,7 @@
 	},
 	{
 		"c": "text/javascript",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html string.quoted.double.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.start.html meta.attribute.type.html string.quoted.double.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.double.html: #0000FF",
@@ -78,7 +78,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html string.quoted.double.html punctuation.definition.string.end.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.start.html meta.attribute.type.html string.quoted.double.html punctuation.definition.string.end.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.double.html: #0000FF",
@@ -89,7 +89,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html punctuation.definition.tag.end.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.start.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -210,7 +210,7 @@
 	},
 	{
 		"c": "<",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html punctuation.definition.tag.begin.html source.js",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.end.html punctuation.definition.tag.begin.html source.js",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -221,7 +221,7 @@
 	},
 	{
 		"c": "/",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html punctuation.definition.tag.begin.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.end.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -232,7 +232,7 @@
 	},
 	{
 		"c": "script",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html entity.name.tag.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.end.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -243,7 +243,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html punctuation.definition.tag.end.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.end.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -254,7 +254,7 @@
 	},
 	{
 		"c": "<",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html punctuation.definition.tag.begin.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.start.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -265,7 +265,7 @@
 	},
 	{
 		"c": "script",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html entity.name.tag.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.start.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -276,7 +276,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html punctuation.definition.tag.end.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.start.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -397,7 +397,7 @@
 	},
 	{
 		"c": "<",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html punctuation.definition.tag.begin.html source.js",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.end.html punctuation.definition.tag.begin.html source.js",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -408,7 +408,7 @@
 	},
 	{
 		"c": "/",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html punctuation.definition.tag.begin.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.end.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -419,7 +419,7 @@
 	},
 	{
 		"c": "script",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html entity.name.tag.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.end.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -430,7 +430,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html punctuation.definition.tag.end.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.end.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
diff --git a/extensions/html/test/colorize-results/13448_html.json b/extensions/html/test/colorize-results/13448_html.json
index 1a442d66c0b..2be7fc0e698 100644
--- a/extensions/html/test/colorize-results/13448_html.json
+++ b/extensions/html/test/colorize-results/13448_html.json
@@ -1,7 +1,7 @@
 [
 	{
 		"c": "<",
-		"t": "text.html.basic meta.tag.other.html punctuation.definition.tag.begin.html",
+		"t": "text.html.basic meta.tag.custom.start.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -12,7 +12,7 @@
 	},
 	{
 		"c": "ion-view",
-		"t": "text.html.basic meta.tag.other.html entity.name.tag.other.html",
+		"t": "text.html.basic meta.tag.custom.start.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -23,7 +23,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.basic meta.tag.other.html punctuation.definition.tag.end.html",
+		"t": "text.html.basic meta.tag.custom.start.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -34,7 +34,7 @@
 	},
 	{
 		"c": "<",
-		"t": "text.html.basic meta.tag.other.html punctuation.definition.tag.begin.html",
+		"t": "text.html.basic meta.tag.custom.start.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -45,7 +45,7 @@
 	},
 	{
 		"c": "button-view",
-		"t": "text.html.basic meta.tag.other.html entity.name.tag.other.html",
+		"t": "text.html.basic meta.tag.custom.start.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -56,7 +56,7 @@
 	},
 	{
 		"c": "/>",
-		"t": "text.html.basic meta.tag.other.html punctuation.definition.tag.end.html",
+		"t": "text.html.basic meta.tag.custom.start.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -67,7 +67,7 @@
 	},
 	{
 		"c": "<",
-		"t": "text.html.basic meta.tag.any.html punctuation.definition.tag.html",
+		"t": "text.html.basic meta.tag.custom.start.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -78,7 +78,7 @@
 	},
 	{
 		"c": "font-face",
-		"t": "text.html.basic meta.tag.any.html entity.name.tag.html",
+		"t": "text.html.basic meta.tag.custom.start.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -89,51 +89,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.basic meta.tag.any.html punctuation.definition.tag.html",
-		"r": {
-			"dark_plus": "punctuation.definition.tag: #808080",
-			"light_plus": "punctuation.definition.tag: #800000",
-			"dark_vs": "punctuation.definition.tag: #808080",
-			"light_vs": "punctuation.definition.tag: #800000",
-			"hc_black": "punctuation.definition.tag: #808080"
-		}
-	},
-	{
-		"c": "<",
-		"t": "text.html.basic meta.tag.any.html punctuation.definition.tag.html meta.scope.between-tag-pair.html",
-		"r": {
-			"dark_plus": "punctuation.definition.tag: #808080",
-			"light_plus": "punctuation.definition.tag: #800000",
-			"dark_vs": "punctuation.definition.tag: #808080",
-			"light_vs": "punctuation.definition.tag: #800000",
-			"hc_black": "punctuation.definition.tag: #808080"
-		}
-	},
-	{
-		"c": "/",
-		"t": "text.html.basic meta.tag.any.html punctuation.definition.tag.html",
-		"r": {
-			"dark_plus": "punctuation.definition.tag: #808080",
-			"light_plus": "punctuation.definition.tag: #800000",
-			"dark_vs": "punctuation.definition.tag: #808080",
-			"light_vs": "punctuation.definition.tag: #800000",
-			"hc_black": "punctuation.definition.tag: #808080"
-		}
-	},
-	{
-		"c": "font-face",
-		"t": "text.html.basic meta.tag.any.html entity.name.tag.html",
-		"r": {
-			"dark_plus": "entity.name.tag: #569CD6",
-			"light_plus": "entity.name.tag: #800000",
-			"dark_vs": "entity.name.tag: #569CD6",
-			"light_vs": "entity.name.tag: #800000",
-			"hc_black": "entity.name.tag: #569CD6"
-		}
-	},
-	{
-		"c": ">",
-		"t": "text.html.basic meta.tag.any.html punctuation.definition.tag.html",
+		"t": "text.html.basic meta.tag.custom.start.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -144,7 +100,7 @@
 	},
 	{
 		"c": "</",
-		"t": "text.html.basic meta.tag.other.html punctuation.definition.tag.begin.html",
+		"t": "text.html.basic meta.tag.custom.end.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -154,8 +110,8 @@
 		}
 	},
 	{
-		"c": "ion-view",
-		"t": "text.html.basic meta.tag.other.html entity.name.tag.other.html",
+		"c": "font-face",
+		"t": "text.html.basic meta.tag.custom.end.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -166,7 +122,40 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.basic meta.tag.other.html punctuation.definition.tag.end.html",
+		"t": "text.html.basic meta.tag.custom.end.html punctuation.definition.tag.end.html",
+		"r": {
+			"dark_plus": "punctuation.definition.tag: #808080",
+			"light_plus": "punctuation.definition.tag: #800000",
+			"dark_vs": "punctuation.definition.tag: #808080",
+			"light_vs": "punctuation.definition.tag: #800000",
+			"hc_black": "punctuation.definition.tag: #808080"
+		}
+	},
+	{
+		"c": "</",
+		"t": "text.html.basic meta.tag.custom.end.html punctuation.definition.tag.begin.html",
+		"r": {
+			"dark_plus": "punctuation.definition.tag: #808080",
+			"light_plus": "punctuation.definition.tag: #800000",
+			"dark_vs": "punctuation.definition.tag: #808080",
+			"light_vs": "punctuation.definition.tag: #800000",
+			"hc_black": "punctuation.definition.tag: #808080"
+		}
+	},
+	{
+		"c": "ion-view",
+		"t": "text.html.basic meta.tag.custom.end.html entity.name.tag.html",
+		"r": {
+			"dark_plus": "entity.name.tag: #569CD6",
+			"light_plus": "entity.name.tag: #800000",
+			"dark_vs": "entity.name.tag: #569CD6",
+			"light_vs": "entity.name.tag: #800000",
+			"hc_black": "entity.name.tag: #569CD6"
+		}
+	},
+	{
+		"c": ">",
+		"t": "text.html.basic meta.tag.custom.end.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
diff --git a/extensions/html/test/colorize-results/25920_html.json b/extensions/html/test/colorize-results/25920_html.json
index 16b71acbe88..81f4d3c143b 100644
--- a/extensions/html/test/colorize-results/25920_html.json
+++ b/extensions/html/test/colorize-results/25920_html.json
@@ -1,7 +1,7 @@
 [
 	{
 		"c": "<",
-		"t": "text.html.basic meta.tag.structure.any.html punctuation.definition.tag.html",
+		"t": "text.html.basic meta.tag.structure.html.start.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -12,7 +12,7 @@
 	},
 	{
 		"c": "html",
-		"t": "text.html.basic meta.tag.structure.any.html entity.name.tag.structure.any.html",
+		"t": "text.html.basic meta.tag.structure.html.start.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -23,7 +23,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.basic meta.tag.structure.any.html punctuation.definition.tag.html",
+		"t": "text.html.basic meta.tag.structure.html.start.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -34,7 +34,7 @@
 	},
 	{
 		"c": "<",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html punctuation.definition.tag.begin.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.start.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -45,7 +45,7 @@
 	},
 	{
 		"c": "script",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html entity.name.tag.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.start.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -56,7 +56,7 @@
 	},
 	{
 		"c": " ",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.start.html",
 		"r": {
 			"dark_plus": "meta.embedded: #D4D4D4",
 			"light_plus": "meta.embedded: #000000",
@@ -67,7 +67,7 @@
 	},
 	{
 		"c": "type",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html entity.other.attribute-name.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.start.html meta.attribute.type.html entity.other.attribute-name.html",
 		"r": {
 			"dark_plus": "entity.other.attribute-name: #9CDCFE",
 			"light_plus": "entity.other.attribute-name: #FF0000",
@@ -78,7 +78,7 @@
 	},
 	{
 		"c": "=",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.start.html meta.attribute.type.html punctuation.separator.key-value.html",
 		"r": {
 			"dark_plus": "meta.embedded: #D4D4D4",
 			"light_plus": "meta.embedded: #000000",
@@ -89,7 +89,7 @@
 	},
 	{
 		"c": "'",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html string.quoted.single.html punctuation.definition.string.begin.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.start.html meta.attribute.type.html string.quoted.single.html punctuation.definition.string.begin.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.single.html: #0000FF",
@@ -100,7 +100,7 @@
 	},
 	{
 		"c": "text/html",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html string.quoted.single.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.start.html meta.attribute.type.html string.quoted.single.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.single.html: #0000FF",
@@ -111,7 +111,7 @@
 	},
 	{
 		"c": "'",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html string.quoted.single.html punctuation.definition.string.end.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.start.html meta.attribute.type.html string.quoted.single.html punctuation.definition.string.end.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.single.html: #0000FF",
@@ -122,7 +122,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html punctuation.definition.tag.end.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.start.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -144,7 +144,7 @@
 	},
 	{
 		"c": "<",
-		"t": "text.html.basic meta.embedded.block.html text.html.basic meta.tag.any.html punctuation.definition.tag.html",
+		"t": "text.html.basic meta.embedded.block.html text.html.basic meta.tag.structure.div.start.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -155,7 +155,7 @@
 	},
 	{
 		"c": "div",
-		"t": "text.html.basic meta.embedded.block.html text.html.basic meta.tag.any.html entity.name.tag.html",
+		"t": "text.html.basic meta.embedded.block.html text.html.basic meta.tag.structure.div.start.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -166,7 +166,7 @@
 	},
 	{
 		"c": " ",
-		"t": "text.html.basic meta.embedded.block.html text.html.basic meta.tag.any.html",
+		"t": "text.html.basic meta.embedded.block.html text.html.basic meta.tag.structure.div.start.html",
 		"r": {
 			"dark_plus": "meta.embedded: #D4D4D4",
 			"light_plus": "meta.embedded: #000000",
@@ -177,7 +177,7 @@
 	},
 	{
 		"c": "class",
-		"t": "text.html.basic meta.embedded.block.html text.html.basic meta.tag.any.html entity.other.attribute-name.html",
+		"t": "text.html.basic meta.embedded.block.html text.html.basic meta.tag.structure.div.start.html meta.attribute.class.html entity.other.attribute-name.html",
 		"r": {
 			"dark_plus": "entity.other.attribute-name: #9CDCFE",
 			"light_plus": "entity.other.attribute-name: #FF0000",
@@ -188,7 +188,7 @@
 	},
 	{
 		"c": "=",
-		"t": "text.html.basic meta.embedded.block.html text.html.basic meta.tag.any.html",
+		"t": "text.html.basic meta.embedded.block.html text.html.basic meta.tag.structure.div.start.html meta.attribute.class.html punctuation.separator.key-value.html",
 		"r": {
 			"dark_plus": "meta.embedded: #D4D4D4",
 			"light_plus": "meta.embedded: #000000",
@@ -199,7 +199,7 @@
 	},
 	{
 		"c": "'",
-		"t": "text.html.basic meta.embedded.block.html text.html.basic meta.tag.any.html string.quoted.single.html punctuation.definition.string.begin.html",
+		"t": "text.html.basic meta.embedded.block.html text.html.basic meta.tag.structure.div.start.html meta.attribute.class.html string.quoted.single.html punctuation.definition.string.begin.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.single.html: #0000FF",
@@ -210,7 +210,7 @@
 	},
 	{
 		"c": "foo",
-		"t": "text.html.basic meta.embedded.block.html text.html.basic meta.tag.any.html string.quoted.single.html",
+		"t": "text.html.basic meta.embedded.block.html text.html.basic meta.tag.structure.div.start.html meta.attribute.class.html string.quoted.single.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.single.html: #0000FF",
@@ -221,7 +221,7 @@
 	},
 	{
 		"c": "'",
-		"t": "text.html.basic meta.embedded.block.html text.html.basic meta.tag.any.html string.quoted.single.html punctuation.definition.string.end.html",
+		"t": "text.html.basic meta.embedded.block.html text.html.basic meta.tag.structure.div.start.html meta.attribute.class.html string.quoted.single.html punctuation.definition.string.end.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.single.html: #0000FF",
@@ -232,7 +232,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.basic meta.embedded.block.html text.html.basic meta.tag.any.html punctuation.definition.tag.html",
+		"t": "text.html.basic meta.embedded.block.html text.html.basic meta.tag.structure.div.start.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -242,19 +242,8 @@
 		}
 	},
 	{
-		"c": "<",
-		"t": "text.html.basic meta.embedded.block.html text.html.basic meta.tag.any.html punctuation.definition.tag.html meta.scope.between-tag-pair.html",
-		"r": {
-			"dark_plus": "punctuation.definition.tag: #808080",
-			"light_plus": "punctuation.definition.tag: #800000",
-			"dark_vs": "punctuation.definition.tag: #808080",
-			"light_vs": "punctuation.definition.tag: #800000",
-			"hc_black": "punctuation.definition.tag: #808080"
-		}
-	},
-	{
-		"c": "/",
-		"t": "text.html.basic meta.embedded.block.html text.html.basic meta.tag.any.html punctuation.definition.tag.html",
+		"c": "</",
+		"t": "text.html.basic meta.embedded.block.html text.html.basic meta.tag.structure.div.end.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -265,7 +254,7 @@
 	},
 	{
 		"c": "div",
-		"t": "text.html.basic meta.embedded.block.html text.html.basic meta.tag.any.html entity.name.tag.html",
+		"t": "text.html.basic meta.embedded.block.html text.html.basic meta.tag.structure.div.end.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -276,7 +265,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.basic meta.embedded.block.html text.html.basic meta.tag.any.html punctuation.definition.tag.html",
+		"t": "text.html.basic meta.embedded.block.html text.html.basic meta.tag.structure.div.end.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -287,7 +276,7 @@
 	},
 	{
 		"c": "<",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html punctuation.definition.tag.begin.html text.html.basic",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.end.html punctuation.definition.tag.begin.html text.html.basic",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -298,7 +287,7 @@
 	},
 	{
 		"c": "/",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html punctuation.definition.tag.begin.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.end.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -309,7 +298,7 @@
 	},
 	{
 		"c": "script",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html entity.name.tag.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.end.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -320,7 +309,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html punctuation.definition.tag.end.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.end.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -331,7 +320,7 @@
 	},
 	{
 		"c": "<",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html punctuation.definition.tag.begin.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.start.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -342,7 +331,7 @@
 	},
 	{
 		"c": "script",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html entity.name.tag.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.start.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -353,7 +342,7 @@
 	},
 	{
 		"c": " ",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.start.html",
 		"r": {
 			"dark_plus": "meta.embedded: #D4D4D4",
 			"light_plus": "meta.embedded: #000000",
@@ -364,7 +353,7 @@
 	},
 	{
 		"c": "type",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html entity.other.attribute-name.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.start.html meta.attribute.type.html entity.other.attribute-name.html",
 		"r": {
 			"dark_plus": "entity.other.attribute-name: #9CDCFE",
 			"light_plus": "entity.other.attribute-name: #FF0000",
@@ -375,7 +364,7 @@
 	},
 	{
 		"c": "=",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.start.html meta.attribute.type.html punctuation.separator.key-value.html",
 		"r": {
 			"dark_plus": "meta.embedded: #D4D4D4",
 			"light_plus": "meta.embedded: #000000",
@@ -386,7 +375,7 @@
 	},
 	{
 		"c": "'",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html string.quoted.single.html punctuation.definition.string.begin.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.start.html meta.attribute.type.html string.quoted.single.html punctuation.definition.string.begin.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.single.html: #0000FF",
@@ -397,7 +386,7 @@
 	},
 	{
 		"c": "module",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html string.quoted.single.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.start.html meta.attribute.type.html string.quoted.single.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.single.html: #0000FF",
@@ -408,7 +397,7 @@
 	},
 	{
 		"c": "'",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html string.quoted.single.html punctuation.definition.string.end.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.start.html meta.attribute.type.html string.quoted.single.html punctuation.definition.string.end.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.single.html: #0000FF",
@@ -419,7 +408,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html punctuation.definition.tag.end.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.start.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -529,7 +518,7 @@
 	},
 	{
 		"c": "<",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html punctuation.definition.tag.begin.html source.js",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.end.html punctuation.definition.tag.begin.html source.js",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -540,7 +529,7 @@
 	},
 	{
 		"c": "/",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html punctuation.definition.tag.begin.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.end.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -551,7 +540,7 @@
 	},
 	{
 		"c": "script",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html entity.name.tag.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.end.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -562,7 +551,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html punctuation.definition.tag.end.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.end.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -573,7 +562,7 @@
 	},
 	{
 		"c": "<",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html punctuation.definition.tag.begin.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.start.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -584,7 +573,7 @@
 	},
 	{
 		"c": "script",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html entity.name.tag.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.start.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -595,7 +584,7 @@
 	},
 	{
 		"c": " ",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.start.html",
 		"r": {
 			"dark_plus": "meta.embedded: #D4D4D4",
 			"light_plus": "meta.embedded: #000000",
@@ -606,7 +595,7 @@
 	},
 	{
 		"c": "type",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html entity.other.attribute-name.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.start.html meta.attribute.type.html entity.other.attribute-name.html",
 		"r": {
 			"dark_plus": "entity.other.attribute-name: #9CDCFE",
 			"light_plus": "entity.other.attribute-name: #FF0000",
@@ -617,7 +606,7 @@
 	},
 	{
 		"c": "=",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.start.html meta.attribute.type.html punctuation.separator.key-value.html",
 		"r": {
 			"dark_plus": "meta.embedded: #D4D4D4",
 			"light_plus": "meta.embedded: #000000",
@@ -628,7 +617,7 @@
 	},
 	{
 		"c": "'",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html string.quoted.single.html punctuation.definition.string.begin.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.start.html meta.attribute.type.html string.quoted.single.html punctuation.definition.string.begin.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.single.html: #0000FF",
@@ -639,7 +628,7 @@
 	},
 	{
 		"c": "text/ng-template",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html string.quoted.single.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.start.html meta.attribute.type.html string.quoted.single.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.single.html: #0000FF",
@@ -650,7 +639,7 @@
 	},
 	{
 		"c": "'",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html string.quoted.single.html punctuation.definition.string.end.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.start.html meta.attribute.type.html string.quoted.single.html punctuation.definition.string.end.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.single.html: #0000FF",
@@ -661,7 +650,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html punctuation.definition.tag.end.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.start.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -683,7 +672,7 @@
 	},
 	{
 		"c": "<",
-		"t": "text.html.basic meta.embedded.block.html text.html.basic meta.tag.any.html punctuation.definition.tag.html",
+		"t": "text.html.basic meta.embedded.block.html text.html.basic meta.tag.structure.div.start.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -694,7 +683,7 @@
 	},
 	{
 		"c": "div",
-		"t": "text.html.basic meta.embedded.block.html text.html.basic meta.tag.any.html entity.name.tag.html",
+		"t": "text.html.basic meta.embedded.block.html text.html.basic meta.tag.structure.div.start.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -705,7 +694,7 @@
 	},
 	{
 		"c": " ",
-		"t": "text.html.basic meta.embedded.block.html text.html.basic meta.tag.any.html",
+		"t": "text.html.basic meta.embedded.block.html text.html.basic meta.tag.structure.div.start.html",
 		"r": {
 			"dark_plus": "meta.embedded: #D4D4D4",
 			"light_plus": "meta.embedded: #000000",
@@ -716,7 +705,7 @@
 	},
 	{
 		"c": "class",
-		"t": "text.html.basic meta.embedded.block.html text.html.basic meta.tag.any.html entity.other.attribute-name.html",
+		"t": "text.html.basic meta.embedded.block.html text.html.basic meta.tag.structure.div.start.html meta.attribute.class.html entity.other.attribute-name.html",
 		"r": {
 			"dark_plus": "entity.other.attribute-name: #9CDCFE",
 			"light_plus": "entity.other.attribute-name: #FF0000",
@@ -727,7 +716,7 @@
 	},
 	{
 		"c": "=",
-		"t": "text.html.basic meta.embedded.block.html text.html.basic meta.tag.any.html",
+		"t": "text.html.basic meta.embedded.block.html text.html.basic meta.tag.structure.div.start.html meta.attribute.class.html punctuation.separator.key-value.html",
 		"r": {
 			"dark_plus": "meta.embedded: #D4D4D4",
 			"light_plus": "meta.embedded: #000000",
@@ -738,7 +727,7 @@
 	},
 	{
 		"c": "'",
-		"t": "text.html.basic meta.embedded.block.html text.html.basic meta.tag.any.html string.quoted.single.html punctuation.definition.string.begin.html",
+		"t": "text.html.basic meta.embedded.block.html text.html.basic meta.tag.structure.div.start.html meta.attribute.class.html string.quoted.single.html punctuation.definition.string.begin.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.single.html: #0000FF",
@@ -749,7 +738,7 @@
 	},
 	{
 		"c": "foo",
-		"t": "text.html.basic meta.embedded.block.html text.html.basic meta.tag.any.html string.quoted.single.html",
+		"t": "text.html.basic meta.embedded.block.html text.html.basic meta.tag.structure.div.start.html meta.attribute.class.html string.quoted.single.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.single.html: #0000FF",
@@ -760,7 +749,7 @@
 	},
 	{
 		"c": "'",
-		"t": "text.html.basic meta.embedded.block.html text.html.basic meta.tag.any.html string.quoted.single.html punctuation.definition.string.end.html",
+		"t": "text.html.basic meta.embedded.block.html text.html.basic meta.tag.structure.div.start.html meta.attribute.class.html string.quoted.single.html punctuation.definition.string.end.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.single.html: #0000FF",
@@ -771,7 +760,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.basic meta.embedded.block.html text.html.basic meta.tag.any.html punctuation.definition.tag.html",
+		"t": "text.html.basic meta.embedded.block.html text.html.basic meta.tag.structure.div.start.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -781,19 +770,8 @@
 		}
 	},
 	{
-		"c": "<",
-		"t": "text.html.basic meta.embedded.block.html text.html.basic meta.tag.any.html punctuation.definition.tag.html meta.scope.between-tag-pair.html",
-		"r": {
-			"dark_plus": "punctuation.definition.tag: #808080",
-			"light_plus": "punctuation.definition.tag: #800000",
-			"dark_vs": "punctuation.definition.tag: #808080",
-			"light_vs": "punctuation.definition.tag: #800000",
-			"hc_black": "punctuation.definition.tag: #808080"
-		}
-	},
-	{
-		"c": "/",
-		"t": "text.html.basic meta.embedded.block.html text.html.basic meta.tag.any.html punctuation.definition.tag.html",
+		"c": "</",
+		"t": "text.html.basic meta.embedded.block.html text.html.basic meta.tag.structure.div.end.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -804,7 +782,7 @@
 	},
 	{
 		"c": "div",
-		"t": "text.html.basic meta.embedded.block.html text.html.basic meta.tag.any.html entity.name.tag.html",
+		"t": "text.html.basic meta.embedded.block.html text.html.basic meta.tag.structure.div.end.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -815,7 +793,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.basic meta.embedded.block.html text.html.basic meta.tag.any.html punctuation.definition.tag.html",
+		"t": "text.html.basic meta.embedded.block.html text.html.basic meta.tag.structure.div.end.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -826,7 +804,7 @@
 	},
 	{
 		"c": "<",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html punctuation.definition.tag.begin.html text.html.basic",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.end.html punctuation.definition.tag.begin.html text.html.basic",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -837,7 +815,7 @@
 	},
 	{
 		"c": "/",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html punctuation.definition.tag.begin.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.end.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -848,7 +826,7 @@
 	},
 	{
 		"c": "script",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html entity.name.tag.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.end.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -859,7 +837,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html punctuation.definition.tag.end.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.end.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -870,7 +848,7 @@
 	},
 	{
 		"c": "<",
-		"t": "text.html.basic meta.tag.structure.any.html punctuation.definition.tag.html",
+		"t": "text.html.basic meta.tag.structure.body.start.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -881,7 +859,7 @@
 	},
 	{
 		"c": "body",
-		"t": "text.html.basic meta.tag.structure.any.html entity.name.tag.structure.any.html",
+		"t": "text.html.basic meta.tag.structure.body.start.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -892,7 +870,7 @@
 	},
 	{
 		"c": " ",
-		"t": "text.html.basic meta.tag.structure.any.html",
+		"t": "text.html.basic meta.tag.structure.body.start.html",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -903,7 +881,7 @@
 	},
 	{
 		"c": "class",
-		"t": "text.html.basic meta.tag.structure.any.html entity.other.attribute-name.html",
+		"t": "text.html.basic meta.tag.structure.body.start.html meta.attribute.class.html entity.other.attribute-name.html",
 		"r": {
 			"dark_plus": "entity.other.attribute-name: #9CDCFE",
 			"light_plus": "entity.other.attribute-name: #FF0000",
@@ -914,7 +892,7 @@
 	},
 	{
 		"c": "=",
-		"t": "text.html.basic meta.tag.structure.any.html",
+		"t": "text.html.basic meta.tag.structure.body.start.html meta.attribute.class.html punctuation.separator.key-value.html",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -925,7 +903,7 @@
 	},
 	{
 		"c": "'",
-		"t": "text.html.basic meta.tag.structure.any.html string.quoted.single.html punctuation.definition.string.begin.html",
+		"t": "text.html.basic meta.tag.structure.body.start.html meta.attribute.class.html string.quoted.single.html punctuation.definition.string.begin.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.single.html: #0000FF",
@@ -936,7 +914,7 @@
 	},
 	{
 		"c": "bar",
-		"t": "text.html.basic meta.tag.structure.any.html string.quoted.single.html",
+		"t": "text.html.basic meta.tag.structure.body.start.html meta.attribute.class.html string.quoted.single.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.single.html: #0000FF",
@@ -947,7 +925,7 @@
 	},
 	{
 		"c": "'",
-		"t": "text.html.basic meta.tag.structure.any.html string.quoted.single.html punctuation.definition.string.end.html",
+		"t": "text.html.basic meta.tag.structure.body.start.html meta.attribute.class.html string.quoted.single.html punctuation.definition.string.end.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.single.html: #0000FF",
@@ -958,7 +936,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.basic meta.tag.structure.any.html punctuation.definition.tag.html",
+		"t": "text.html.basic meta.tag.structure.body.start.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -969,7 +947,7 @@
 	},
 	{
 		"c": "</",
-		"t": "text.html.basic meta.tag.structure.any.html punctuation.definition.tag.html",
+		"t": "text.html.basic meta.tag.structure.body.end.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -980,7 +958,7 @@
 	},
 	{
 		"c": "body",
-		"t": "text.html.basic meta.tag.structure.any.html entity.name.tag.structure.any.html",
+		"t": "text.html.basic meta.tag.structure.body.end.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -991,7 +969,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.basic meta.tag.structure.any.html punctuation.definition.tag.html",
+		"t": "text.html.basic meta.tag.structure.body.end.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -1002,7 +980,7 @@
 	},
 	{
 		"c": "</",
-		"t": "text.html.basic meta.tag.structure.any.html punctuation.definition.tag.html",
+		"t": "text.html.basic meta.tag.structure.html.end.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -1013,7 +991,7 @@
 	},
 	{
 		"c": "html",
-		"t": "text.html.basic meta.tag.structure.any.html entity.name.tag.structure.any.html",
+		"t": "text.html.basic meta.tag.structure.html.end.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -1024,7 +1002,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.basic meta.tag.structure.any.html punctuation.definition.tag.html",
+		"t": "text.html.basic meta.tag.structure.html.end.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
diff --git a/extensions/html/test/colorize-results/test_html.json b/extensions/html/test/colorize-results/test_html.json
index a1da5d2c393..20ca7fac857 100644
--- a/extensions/html/test/colorize-results/test_html.json
+++ b/extensions/html/test/colorize-results/test_html.json
@@ -1,7 +1,7 @@
 [
 	{
 		"c": "<",
-		"t": "text.html.basic meta.tag.structure.any.html punctuation.definition.tag.html",
+		"t": "text.html.basic meta.tag.structure.html.start.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -12,7 +12,7 @@
 	},
 	{
 		"c": "html",
-		"t": "text.html.basic meta.tag.structure.any.html entity.name.tag.structure.any.html",
+		"t": "text.html.basic meta.tag.structure.html.start.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -23,7 +23,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.basic meta.tag.structure.any.html punctuation.definition.tag.html",
+		"t": "text.html.basic meta.tag.structure.html.start.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -34,7 +34,7 @@
 	},
 	{
 		"c": "<",
-		"t": "text.html.basic meta.tag.structure.any.html punctuation.definition.tag.html",
+		"t": "text.html.basic meta.tag.structure.head.start.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -45,7 +45,7 @@
 	},
 	{
 		"c": "head",
-		"t": "text.html.basic meta.tag.structure.any.html entity.name.tag.structure.any.html",
+		"t": "text.html.basic meta.tag.structure.head.start.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -56,7 +56,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.basic meta.tag.structure.any.html punctuation.definition.tag.html",
+		"t": "text.html.basic meta.tag.structure.head.start.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -78,7 +78,7 @@
 	},
 	{
 		"c": "<",
-		"t": "text.html.basic meta.tag.inline.any.html punctuation.definition.tag.begin.html",
+		"t": "text.html.basic meta.tag.metadata.meta.void.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -89,7 +89,7 @@
 	},
 	{
 		"c": "meta",
-		"t": "text.html.basic meta.tag.inline.any.html entity.name.tag.inline.any.html",
+		"t": "text.html.basic meta.tag.metadata.meta.void.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -100,7 +100,7 @@
 	},
 	{
 		"c": " ",
-		"t": "text.html.basic meta.tag.inline.any.html",
+		"t": "text.html.basic meta.tag.metadata.meta.void.html",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -111,7 +111,7 @@
 	},
 	{
 		"c": "charset",
-		"t": "text.html.basic meta.tag.inline.any.html entity.other.attribute-name.html",
+		"t": "text.html.basic meta.tag.metadata.meta.void.html meta.attribute.charset.html entity.other.attribute-name.html",
 		"r": {
 			"dark_plus": "entity.other.attribute-name: #9CDCFE",
 			"light_plus": "entity.other.attribute-name: #FF0000",
@@ -122,7 +122,7 @@
 	},
 	{
 		"c": "=",
-		"t": "text.html.basic meta.tag.inline.any.html",
+		"t": "text.html.basic meta.tag.metadata.meta.void.html meta.attribute.charset.html punctuation.separator.key-value.html",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -133,7 +133,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "text.html.basic meta.tag.inline.any.html string.quoted.double.html punctuation.definition.string.begin.html",
+		"t": "text.html.basic meta.tag.metadata.meta.void.html meta.attribute.charset.html string.quoted.double.html punctuation.definition.string.begin.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.double.html: #0000FF",
@@ -144,7 +144,7 @@
 	},
 	{
 		"c": "utf-8",
-		"t": "text.html.basic meta.tag.inline.any.html string.quoted.double.html",
+		"t": "text.html.basic meta.tag.metadata.meta.void.html meta.attribute.charset.html string.quoted.double.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.double.html: #0000FF",
@@ -155,7 +155,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "text.html.basic meta.tag.inline.any.html string.quoted.double.html punctuation.definition.string.end.html",
+		"t": "text.html.basic meta.tag.metadata.meta.void.html meta.attribute.charset.html string.quoted.double.html punctuation.definition.string.end.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.double.html: #0000FF",
@@ -166,7 +166,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.basic meta.tag.inline.any.html punctuation.definition.tag.end.html",
+		"t": "text.html.basic meta.tag.metadata.meta.void.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -188,7 +188,7 @@
 	},
 	{
 		"c": "<",
-		"t": "text.html.basic meta.tag.inline.any.html punctuation.definition.tag.begin.html",
+		"t": "text.html.basic meta.tag.metadata.title.start.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -199,7 +199,7 @@
 	},
 	{
 		"c": "title",
-		"t": "text.html.basic meta.tag.inline.any.html entity.name.tag.inline.any.html",
+		"t": "text.html.basic meta.tag.metadata.title.start.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -210,7 +210,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.basic meta.tag.inline.any.html punctuation.definition.tag.end.html",
+		"t": "text.html.basic meta.tag.metadata.title.start.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -232,7 +232,7 @@
 	},
 	{
 		"c": "</",
-		"t": "text.html.basic meta.tag.inline.any.html punctuation.definition.tag.begin.html",
+		"t": "text.html.basic meta.tag.metadata.title.end.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -243,7 +243,7 @@
 	},
 	{
 		"c": "title",
-		"t": "text.html.basic meta.tag.inline.any.html entity.name.tag.inline.any.html",
+		"t": "text.html.basic meta.tag.metadata.title.end.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -254,7 +254,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.basic meta.tag.inline.any.html punctuation.definition.tag.end.html",
+		"t": "text.html.basic meta.tag.metadata.title.end.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -276,7 +276,7 @@
 	},
 	{
 		"c": "<",
-		"t": "text.html.basic meta.tag.inline.any.html punctuation.definition.tag.begin.html",
+		"t": "text.html.basic meta.tag.metadata.link.void.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -287,7 +287,7 @@
 	},
 	{
 		"c": "link",
-		"t": "text.html.basic meta.tag.inline.any.html entity.name.tag.inline.any.html",
+		"t": "text.html.basic meta.tag.metadata.link.void.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -298,7 +298,7 @@
 	},
 	{
 		"c": " ",
-		"t": "text.html.basic meta.tag.inline.any.html",
+		"t": "text.html.basic meta.tag.metadata.link.void.html",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -309,7 +309,7 @@
 	},
 	{
 		"c": "href",
-		"t": "text.html.basic meta.tag.inline.any.html entity.other.attribute-name.html",
+		"t": "text.html.basic meta.tag.metadata.link.void.html meta.attribute.href.html entity.other.attribute-name.html",
 		"r": {
 			"dark_plus": "entity.other.attribute-name: #9CDCFE",
 			"light_plus": "entity.other.attribute-name: #FF0000",
@@ -320,7 +320,7 @@
 	},
 	{
 		"c": "=",
-		"t": "text.html.basic meta.tag.inline.any.html",
+		"t": "text.html.basic meta.tag.metadata.link.void.html meta.attribute.href.html punctuation.separator.key-value.html",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -331,7 +331,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "text.html.basic meta.tag.inline.any.html string.quoted.double.html punctuation.definition.string.begin.html",
+		"t": "text.html.basic meta.tag.metadata.link.void.html meta.attribute.href.html string.quoted.double.html punctuation.definition.string.begin.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.double.html: #0000FF",
@@ -342,7 +342,7 @@
 	},
 	{
 		"c": "https://cdn.rawgit.com/mochajs/mocha/2.2.5/mocha.css",
-		"t": "text.html.basic meta.tag.inline.any.html string.quoted.double.html",
+		"t": "text.html.basic meta.tag.metadata.link.void.html meta.attribute.href.html string.quoted.double.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.double.html: #0000FF",
@@ -353,7 +353,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "text.html.basic meta.tag.inline.any.html string.quoted.double.html punctuation.definition.string.end.html",
+		"t": "text.html.basic meta.tag.metadata.link.void.html meta.attribute.href.html string.quoted.double.html punctuation.definition.string.end.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.double.html: #0000FF",
@@ -364,7 +364,7 @@
 	},
 	{
 		"c": " ",
-		"t": "text.html.basic meta.tag.inline.any.html",
+		"t": "text.html.basic meta.tag.metadata.link.void.html",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -375,7 +375,7 @@
 	},
 	{
 		"c": "rel",
-		"t": "text.html.basic meta.tag.inline.any.html entity.other.attribute-name.html",
+		"t": "text.html.basic meta.tag.metadata.link.void.html meta.attribute.rel.html entity.other.attribute-name.html",
 		"r": {
 			"dark_plus": "entity.other.attribute-name: #9CDCFE",
 			"light_plus": "entity.other.attribute-name: #FF0000",
@@ -386,7 +386,7 @@
 	},
 	{
 		"c": "=",
-		"t": "text.html.basic meta.tag.inline.any.html",
+		"t": "text.html.basic meta.tag.metadata.link.void.html meta.attribute.rel.html punctuation.separator.key-value.html",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -397,7 +397,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "text.html.basic meta.tag.inline.any.html string.quoted.double.html punctuation.definition.string.begin.html",
+		"t": "text.html.basic meta.tag.metadata.link.void.html meta.attribute.rel.html string.quoted.double.html punctuation.definition.string.begin.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.double.html: #0000FF",
@@ -408,7 +408,7 @@
 	},
 	{
 		"c": "stylesheet",
-		"t": "text.html.basic meta.tag.inline.any.html string.quoted.double.html",
+		"t": "text.html.basic meta.tag.metadata.link.void.html meta.attribute.rel.html string.quoted.double.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.double.html: #0000FF",
@@ -419,7 +419,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "text.html.basic meta.tag.inline.any.html string.quoted.double.html punctuation.definition.string.end.html",
+		"t": "text.html.basic meta.tag.metadata.link.void.html meta.attribute.rel.html string.quoted.double.html punctuation.definition.string.end.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.double.html: #0000FF",
@@ -429,8 +429,19 @@
 		}
 	},
 	{
-		"c": " />",
-		"t": "text.html.basic meta.tag.inline.any.html punctuation.definition.tag.end.html",
+		"c": " ",
+		"t": "text.html.basic meta.tag.metadata.link.void.html",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": "/>",
+		"t": "text.html.basic meta.tag.metadata.link.void.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -452,7 +463,7 @@
 	},
 	{
 		"c": "<",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.style.html punctuation.definition.tag.begin.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.style.start.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -463,7 +474,7 @@
 	},
 	{
 		"c": "style",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.style.html entity.name.tag.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.style.start.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -474,7 +485,7 @@
 	},
 	{
 		"c": " ",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.style.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.style.start.html",
 		"r": {
 			"dark_plus": "meta.embedded: #D4D4D4",
 			"light_plus": "meta.embedded: #000000",
@@ -485,7 +496,7 @@
 	},
 	{
 		"c": "type",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.style.html entity.other.attribute-name.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.style.start.html meta.attribute.type.html entity.other.attribute-name.html",
 		"r": {
 			"dark_plus": "entity.other.attribute-name: #9CDCFE",
 			"light_plus": "entity.other.attribute-name: #FF0000",
@@ -496,7 +507,7 @@
 	},
 	{
 		"c": "=",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.style.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.style.start.html meta.attribute.type.html punctuation.separator.key-value.html",
 		"r": {
 			"dark_plus": "meta.embedded: #D4D4D4",
 			"light_plus": "meta.embedded: #000000",
@@ -507,7 +518,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.style.html string.quoted.double.html punctuation.definition.string.begin.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.style.start.html meta.attribute.type.html string.quoted.double.html punctuation.definition.string.begin.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.double.html: #0000FF",
@@ -518,7 +529,7 @@
 	},
 	{
 		"c": "text/css",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.style.html string.quoted.double.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.style.start.html meta.attribute.type.html string.quoted.double.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.double.html: #0000FF",
@@ -529,7 +540,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.style.html string.quoted.double.html punctuation.definition.string.end.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.style.start.html meta.attribute.type.html string.quoted.double.html punctuation.definition.string.end.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.double.html: #0000FF",
@@ -540,7 +551,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.style.html punctuation.definition.tag.end.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.style.start.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -771,7 +782,7 @@
 	},
 	{
 		"c": "<",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.style.html punctuation.definition.tag.begin.html source.css",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.style.end.html punctuation.definition.tag.begin.html source.css",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -782,7 +793,7 @@
 	},
 	{
 		"c": "/",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.style.html punctuation.definition.tag.begin.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.style.end.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -793,7 +804,7 @@
 	},
 	{
 		"c": "style",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.style.html entity.name.tag.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.style.end.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -804,7 +815,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.style.html punctuation.definition.tag.end.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.style.end.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -815,7 +826,7 @@
 	},
 	{
 		"c": "</",
-		"t": "text.html.basic meta.tag.structure.any.html punctuation.definition.tag.html",
+		"t": "text.html.basic meta.tag.structure.head.end.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -826,7 +837,7 @@
 	},
 	{
 		"c": "head",
-		"t": "text.html.basic meta.tag.structure.any.html entity.name.tag.structure.any.html",
+		"t": "text.html.basic meta.tag.structure.head.end.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -837,7 +848,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.basic meta.tag.structure.any.html punctuation.definition.tag.html",
+		"t": "text.html.basic meta.tag.structure.head.end.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -848,7 +859,7 @@
 	},
 	{
 		"c": "<",
-		"t": "text.html.basic meta.tag.structure.any.html punctuation.definition.tag.html",
+		"t": "text.html.basic meta.tag.structure.body.start.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -859,7 +870,7 @@
 	},
 	{
 		"c": "body",
-		"t": "text.html.basic meta.tag.structure.any.html entity.name.tag.structure.any.html",
+		"t": "text.html.basic meta.tag.structure.body.start.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -870,7 +881,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.basic meta.tag.structure.any.html punctuation.definition.tag.html",
+		"t": "text.html.basic meta.tag.structure.body.start.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -892,7 +903,7 @@
 	},
 	{
 		"c": "<",
-		"t": "text.html.basic meta.tag.any.html punctuation.definition.tag.html",
+		"t": "text.html.basic meta.tag.structure.div.start.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -903,7 +914,7 @@
 	},
 	{
 		"c": "div",
-		"t": "text.html.basic meta.tag.any.html entity.name.tag.html",
+		"t": "text.html.basic meta.tag.structure.div.start.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -914,7 +925,7 @@
 	},
 	{
 		"c": " ",
-		"t": "text.html.basic meta.tag.any.html",
+		"t": "text.html.basic meta.tag.structure.div.start.html",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -925,7 +936,7 @@
 	},
 	{
 		"c": "id",
-		"t": "text.html.basic meta.tag.any.html meta.attribute-with-value.id.html entity.other.attribute-name.id.html",
+		"t": "text.html.basic meta.tag.structure.div.start.html meta.attribute.id.html entity.other.attribute-name.html",
 		"r": {
 			"dark_plus": "entity.other.attribute-name: #9CDCFE",
 			"light_plus": "entity.other.attribute-name: #FF0000",
@@ -936,7 +947,7 @@
 	},
 	{
 		"c": "=",
-		"t": "text.html.basic meta.tag.any.html meta.attribute-with-value.id.html punctuation.separator.key-value.html",
+		"t": "text.html.basic meta.tag.structure.div.start.html meta.attribute.id.html punctuation.separator.key-value.html",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -947,7 +958,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "text.html.basic meta.tag.any.html meta.attribute-with-value.id.html string.quoted.double.html punctuation.definition.string.begin.html",
+		"t": "text.html.basic meta.tag.structure.div.start.html meta.attribute.id.html string.quoted.double.html punctuation.definition.string.begin.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.double.html: #0000FF",
@@ -958,7 +969,7 @@
 	},
 	{
 		"c": "mocha",
-		"t": "text.html.basic meta.tag.any.html meta.attribute-with-value.id.html string.quoted.double.html meta.toc-list.id.html",
+		"t": "text.html.basic meta.tag.structure.div.start.html meta.attribute.id.html string.quoted.double.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.double.html: #0000FF",
@@ -969,7 +980,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "text.html.basic meta.tag.any.html meta.attribute-with-value.id.html string.quoted.double.html punctuation.definition.string.end.html",
+		"t": "text.html.basic meta.tag.structure.div.start.html meta.attribute.id.html string.quoted.double.html punctuation.definition.string.end.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.double.html: #0000FF",
@@ -980,7 +991,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.basic meta.tag.any.html punctuation.definition.tag.html",
+		"t": "text.html.basic meta.tag.structure.div.start.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -990,19 +1001,8 @@
 		}
 	},
 	{
-		"c": "<",
-		"t": "text.html.basic meta.tag.any.html punctuation.definition.tag.html meta.scope.between-tag-pair.html",
-		"r": {
-			"dark_plus": "punctuation.definition.tag: #808080",
-			"light_plus": "punctuation.definition.tag: #800000",
-			"dark_vs": "punctuation.definition.tag: #808080",
-			"light_vs": "punctuation.definition.tag: #800000",
-			"hc_black": "punctuation.definition.tag: #808080"
-		}
-	},
-	{
-		"c": "/",
-		"t": "text.html.basic meta.tag.any.html punctuation.definition.tag.html",
+		"c": "</",
+		"t": "text.html.basic meta.tag.structure.div.end.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -1013,7 +1013,7 @@
 	},
 	{
 		"c": "div",
-		"t": "text.html.basic meta.tag.any.html entity.name.tag.html",
+		"t": "text.html.basic meta.tag.structure.div.end.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -1024,7 +1024,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.basic meta.tag.any.html punctuation.definition.tag.html",
+		"t": "text.html.basic meta.tag.structure.div.end.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -1048,9 +1048,9 @@
 		"c": "<!--",
 		"t": "text.html.basic comment.block.html punctuation.definition.comment.html",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -1059,9 +1059,9 @@
 		"c": "<script src=\"https://cdn.rawgit.com/jquery/jquery/2.1.4/dist/jquery.min.js\"></script>",
 		"t": "text.html.basic comment.block.html",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -1070,9 +1070,9 @@
 		"c": "\t<script src=\"https://cdn.rawgit.com/Automattic/expect.js/0.3.1/index.js\"></script>",
 		"t": "text.html.basic comment.block.html",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -1081,9 +1081,9 @@
 		"c": "-->",
 		"t": "text.html.basic comment.block.html punctuation.definition.comment.html",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -1101,7 +1101,7 @@
 	},
 	{
 		"c": "<",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html punctuation.definition.tag.begin.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.start.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -1112,7 +1112,7 @@
 	},
 	{
 		"c": "script",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html entity.name.tag.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.start.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -1123,7 +1123,7 @@
 	},
 	{
 		"c": " ",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.start.html",
 		"r": {
 			"dark_plus": "meta.embedded: #D4D4D4",
 			"light_plus": "meta.embedded: #000000",
@@ -1134,7 +1134,7 @@
 	},
 	{
 		"c": "src",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html entity.other.attribute-name.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.start.html meta.attribute.src.html entity.other.attribute-name.html",
 		"r": {
 			"dark_plus": "entity.other.attribute-name: #9CDCFE",
 			"light_plus": "entity.other.attribute-name: #FF0000",
@@ -1145,7 +1145,7 @@
 	},
 	{
 		"c": "=",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.start.html meta.attribute.src.html punctuation.separator.key-value.html",
 		"r": {
 			"dark_plus": "meta.embedded: #D4D4D4",
 			"light_plus": "meta.embedded: #000000",
@@ -1156,7 +1156,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html string.quoted.double.html punctuation.definition.string.begin.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.start.html meta.attribute.src.html string.quoted.double.html punctuation.definition.string.begin.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.double.html: #0000FF",
@@ -1167,7 +1167,7 @@
 	},
 	{
 		"c": "/out/vs/loader.js",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html string.quoted.double.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.start.html meta.attribute.src.html string.quoted.double.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.double.html: #0000FF",
@@ -1178,7 +1178,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html string.quoted.double.html punctuation.definition.string.end.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.start.html meta.attribute.src.html string.quoted.double.html punctuation.definition.string.end.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.double.html: #0000FF",
@@ -1189,7 +1189,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html punctuation.definition.tag.end.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.start.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -1200,7 +1200,7 @@
 	},
 	{
 		"c": "<",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html punctuation.definition.tag.begin.html source.js",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.end.html punctuation.definition.tag.begin.html source.js",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -1211,7 +1211,7 @@
 	},
 	{
 		"c": "/",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html punctuation.definition.tag.begin.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.end.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -1222,7 +1222,7 @@
 	},
 	{
 		"c": "script",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html entity.name.tag.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.end.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -1233,7 +1233,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html punctuation.definition.tag.end.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.end.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -1255,7 +1255,7 @@
 	},
 	{
 		"c": "<",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html punctuation.definition.tag.begin.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.start.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -1266,7 +1266,7 @@
 	},
 	{
 		"c": "script",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html entity.name.tag.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.start.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -1277,7 +1277,7 @@
 	},
 	{
 		"c": " ",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.start.html",
 		"r": {
 			"dark_plus": "meta.embedded: #D4D4D4",
 			"light_plus": "meta.embedded: #000000",
@@ -1288,7 +1288,7 @@
 	},
 	{
 		"c": "src",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html entity.other.attribute-name.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.start.html meta.attribute.src.html entity.other.attribute-name.html",
 		"r": {
 			"dark_plus": "entity.other.attribute-name: #9CDCFE",
 			"light_plus": "entity.other.attribute-name: #FF0000",
@@ -1299,7 +1299,7 @@
 	},
 	{
 		"c": "=",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.start.html meta.attribute.src.html punctuation.separator.key-value.html",
 		"r": {
 			"dark_plus": "meta.embedded: #D4D4D4",
 			"light_plus": "meta.embedded: #000000",
@@ -1310,7 +1310,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html string.quoted.double.html punctuation.definition.string.begin.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.start.html meta.attribute.src.html string.quoted.double.html punctuation.definition.string.begin.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.double.html: #0000FF",
@@ -1321,7 +1321,7 @@
 	},
 	{
 		"c": "https://cdn.rawgit.com/mochajs/mocha/2.2.5/mocha.js",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html string.quoted.double.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.start.html meta.attribute.src.html string.quoted.double.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.double.html: #0000FF",
@@ -1332,7 +1332,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html string.quoted.double.html punctuation.definition.string.end.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.start.html meta.attribute.src.html string.quoted.double.html punctuation.definition.string.end.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.double.html: #0000FF",
@@ -1343,7 +1343,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html punctuation.definition.tag.end.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.start.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -1354,7 +1354,7 @@
 	},
 	{
 		"c": "<",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html punctuation.definition.tag.begin.html source.js",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.end.html punctuation.definition.tag.begin.html source.js",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -1365,7 +1365,7 @@
 	},
 	{
 		"c": "/",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html punctuation.definition.tag.begin.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.end.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -1376,7 +1376,7 @@
 	},
 	{
 		"c": "script",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html entity.name.tag.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.end.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -1387,7 +1387,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html punctuation.definition.tag.end.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.end.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -1409,7 +1409,7 @@
 	},
 	{
 		"c": "<",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html punctuation.definition.tag.begin.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.start.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -1420,7 +1420,7 @@
 	},
 	{
 		"c": "script",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html entity.name.tag.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.start.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -1431,7 +1431,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html punctuation.definition.tag.end.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.start.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -2212,7 +2212,7 @@
 	},
 	{
 		"c": "<",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html punctuation.definition.tag.begin.html source.js",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.end.html punctuation.definition.tag.begin.html source.js",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -2223,7 +2223,7 @@
 	},
 	{
 		"c": "/",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html punctuation.definition.tag.begin.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.end.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -2234,7 +2234,7 @@
 	},
 	{
 		"c": "script",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html entity.name.tag.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.end.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -2245,7 +2245,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html punctuation.definition.tag.end.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.end.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -2267,7 +2267,7 @@
 	},
 	{
 		"c": "<",
-		"t": "text.html.basic meta.tag.block.any.html punctuation.definition.tag.begin.html",
+		"t": "text.html.basic meta.tag.structure.div.start.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -2278,7 +2278,7 @@
 	},
 	{
 		"c": "div",
-		"t": "text.html.basic meta.tag.block.any.html entity.name.tag.block.any.html",
+		"t": "text.html.basic meta.tag.structure.div.start.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -2289,7 +2289,7 @@
 	},
 	{
 		"c": " ",
-		"t": "text.html.basic meta.tag.block.any.html",
+		"t": "text.html.basic meta.tag.structure.div.start.html",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2300,7 +2300,7 @@
 	},
 	{
 		"c": "class",
-		"t": "text.html.basic meta.tag.block.any.html entity.other.attribute-name.html",
+		"t": "text.html.basic meta.tag.structure.div.start.html meta.attribute.class.html entity.other.attribute-name.html",
 		"r": {
 			"dark_plus": "entity.other.attribute-name: #9CDCFE",
 			"light_plus": "entity.other.attribute-name: #FF0000",
@@ -2311,7 +2311,7 @@
 	},
 	{
 		"c": "=",
-		"t": "text.html.basic meta.tag.block.any.html",
+		"t": "text.html.basic meta.tag.structure.div.start.html meta.attribute.class.html punctuation.separator.key-value.html",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2322,7 +2322,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "text.html.basic meta.tag.block.any.html string.quoted.double.html punctuation.definition.string.begin.html",
+		"t": "text.html.basic meta.tag.structure.div.start.html meta.attribute.class.html string.quoted.double.html punctuation.definition.string.begin.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.double.html: #0000FF",
@@ -2333,7 +2333,7 @@
 	},
 	{
 		"c": "js-stale-session-flash stale-session-flash flash flash-warn flash-banner hidden",
-		"t": "text.html.basic meta.tag.block.any.html string.quoted.double.html",
+		"t": "text.html.basic meta.tag.structure.div.start.html meta.attribute.class.html string.quoted.double.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.double.html: #0000FF",
@@ -2344,7 +2344,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "text.html.basic meta.tag.block.any.html string.quoted.double.html punctuation.definition.string.end.html",
+		"t": "text.html.basic meta.tag.structure.div.start.html meta.attribute.class.html string.quoted.double.html punctuation.definition.string.end.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.double.html: #0000FF",
@@ -2355,7 +2355,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.basic meta.tag.block.any.html punctuation.definition.tag.end.html",
+		"t": "text.html.basic meta.tag.structure.div.start.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -2377,7 +2377,7 @@
 	},
 	{
 		"c": "<",
-		"t": "text.html.basic meta.tag.any.html punctuation.definition.tag.html",
+		"t": "text.html.basic meta.tag.inline.span.start.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -2388,7 +2388,7 @@
 	},
 	{
 		"c": "span",
-		"t": "text.html.basic meta.tag.any.html entity.name.tag.html",
+		"t": "text.html.basic meta.tag.inline.span.start.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -2399,7 +2399,7 @@
 	},
 	{
 		"c": " ",
-		"t": "text.html.basic meta.tag.any.html",
+		"t": "text.html.basic meta.tag.inline.span.start.html",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2410,7 +2410,7 @@
 	},
 	{
 		"c": "class",
-		"t": "text.html.basic meta.tag.any.html entity.other.attribute-name.html",
+		"t": "text.html.basic meta.tag.inline.span.start.html meta.attribute.class.html entity.other.attribute-name.html",
 		"r": {
 			"dark_plus": "entity.other.attribute-name: #9CDCFE",
 			"light_plus": "entity.other.attribute-name: #FF0000",
@@ -2421,7 +2421,7 @@
 	},
 	{
 		"c": "=",
-		"t": "text.html.basic meta.tag.any.html",
+		"t": "text.html.basic meta.tag.inline.span.start.html meta.attribute.class.html punctuation.separator.key-value.html",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2432,7 +2432,7 @@
 	},
 	{
 		"c": "octicon",
-		"t": "text.html.basic meta.tag.any.html string.unquoted.html",
+		"t": "text.html.basic meta.tag.inline.span.start.html meta.attribute.class.html string.unquoted.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.unquoted.html: #0000FF",
@@ -2443,7 +2443,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.basic meta.tag.any.html punctuation.definition.tag.html",
+		"t": "text.html.basic meta.tag.inline.span.start.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -2453,19 +2453,8 @@
 		}
 	},
 	{
-		"c": "<",
-		"t": "text.html.basic meta.tag.any.html punctuation.definition.tag.html meta.scope.between-tag-pair.html",
-		"r": {
-			"dark_plus": "punctuation.definition.tag: #808080",
-			"light_plus": "punctuation.definition.tag: #800000",
-			"dark_vs": "punctuation.definition.tag: #808080",
-			"light_vs": "punctuation.definition.tag: #800000",
-			"hc_black": "punctuation.definition.tag: #808080"
-		}
-	},
-	{
-		"c": "/",
-		"t": "text.html.basic meta.tag.any.html punctuation.definition.tag.html",
+		"c": "</",
+		"t": "text.html.basic meta.tag.inline.span.end.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -2476,7 +2465,7 @@
 	},
 	{
 		"c": "span",
-		"t": "text.html.basic meta.tag.any.html entity.name.tag.html",
+		"t": "text.html.basic meta.tag.inline.span.end.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -2487,7 +2476,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.basic meta.tag.any.html punctuation.definition.tag.html",
+		"t": "text.html.basic meta.tag.inline.span.end.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -2509,7 +2498,7 @@
 	},
 	{
 		"c": "<",
-		"t": "text.html.basic meta.tag.inline.any.html punctuation.definition.tag.begin.html",
+		"t": "text.html.basic meta.tag.inline.span.start.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -2520,7 +2509,7 @@
 	},
 	{
 		"c": "span",
-		"t": "text.html.basic meta.tag.inline.any.html entity.name.tag.inline.any.html",
+		"t": "text.html.basic meta.tag.inline.span.start.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -2531,7 +2520,7 @@
 	},
 	{
 		"c": " ",
-		"t": "text.html.basic meta.tag.inline.any.html",
+		"t": "text.html.basic meta.tag.inline.span.start.html",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2542,7 +2531,7 @@
 	},
 	{
 		"c": "class",
-		"t": "text.html.basic meta.tag.inline.any.html entity.other.attribute-name.html",
+		"t": "text.html.basic meta.tag.inline.span.start.html meta.attribute.class.html entity.other.attribute-name.html",
 		"r": {
 			"dark_plus": "entity.other.attribute-name: #9CDCFE",
 			"light_plus": "entity.other.attribute-name: #FF0000",
@@ -2553,7 +2542,7 @@
 	},
 	{
 		"c": "=",
-		"t": "text.html.basic meta.tag.inline.any.html",
+		"t": "text.html.basic meta.tag.inline.span.start.html meta.attribute.class.html punctuation.separator.key-value.html",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2564,7 +2553,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "text.html.basic meta.tag.inline.any.html string.quoted.double.html punctuation.definition.string.begin.html",
+		"t": "text.html.basic meta.tag.inline.span.start.html meta.attribute.class.html string.quoted.double.html punctuation.definition.string.begin.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.double.html: #0000FF",
@@ -2575,7 +2564,7 @@
 	},
 	{
 		"c": "signed-in-tab-flash",
-		"t": "text.html.basic meta.tag.inline.any.html string.quoted.double.html",
+		"t": "text.html.basic meta.tag.inline.span.start.html meta.attribute.class.html string.quoted.double.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.double.html: #0000FF",
@@ -2586,7 +2575,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "text.html.basic meta.tag.inline.any.html string.quoted.double.html punctuation.definition.string.end.html",
+		"t": "text.html.basic meta.tag.inline.span.start.html meta.attribute.class.html string.quoted.double.html punctuation.definition.string.end.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.double.html: #0000FF",
@@ -2597,7 +2586,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.basic meta.tag.inline.any.html punctuation.definition.tag.end.html",
+		"t": "text.html.basic meta.tag.inline.span.start.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -2619,7 +2608,7 @@
 	},
 	{
 		"c": "<",
-		"t": "text.html.basic meta.tag.inline.any.html punctuation.definition.tag.begin.html",
+		"t": "text.html.basic meta.tag.inline.a.start.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -2630,7 +2619,7 @@
 	},
 	{
 		"c": "a",
-		"t": "text.html.basic meta.tag.inline.any.html entity.name.tag.inline.any.html",
+		"t": "text.html.basic meta.tag.inline.a.start.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -2641,7 +2630,7 @@
 	},
 	{
 		"c": " ",
-		"t": "text.html.basic meta.tag.inline.any.html",
+		"t": "text.html.basic meta.tag.inline.a.start.html",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2652,7 +2641,7 @@
 	},
 	{
 		"c": "href",
-		"t": "text.html.basic meta.tag.inline.any.html entity.other.attribute-name.html",
+		"t": "text.html.basic meta.tag.inline.a.start.html meta.attribute.href.html entity.other.attribute-name.html",
 		"r": {
 			"dark_plus": "entity.other.attribute-name: #9CDCFE",
 			"light_plus": "entity.other.attribute-name: #FF0000",
@@ -2663,7 +2652,7 @@
 	},
 	{
 		"c": "=",
-		"t": "text.html.basic meta.tag.inline.any.html",
+		"t": "text.html.basic meta.tag.inline.a.start.html meta.attribute.href.html punctuation.separator.key-value.html",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2674,7 +2663,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "text.html.basic meta.tag.inline.any.html string.quoted.double.html punctuation.definition.string.begin.html",
+		"t": "text.html.basic meta.tag.inline.a.start.html meta.attribute.href.html string.quoted.double.html punctuation.definition.string.begin.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.double.html: #0000FF",
@@ -2685,7 +2674,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "text.html.basic meta.tag.inline.any.html string.quoted.double.html punctuation.definition.string.end.html",
+		"t": "text.html.basic meta.tag.inline.a.start.html meta.attribute.href.html string.quoted.double.html punctuation.definition.string.end.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.double.html: #0000FF",
@@ -2696,7 +2685,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.basic meta.tag.inline.any.html punctuation.definition.tag.end.html",
+		"t": "text.html.basic meta.tag.inline.a.start.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -2718,7 +2707,7 @@
 	},
 	{
 		"c": "</",
-		"t": "text.html.basic meta.tag.inline.any.html punctuation.definition.tag.begin.html",
+		"t": "text.html.basic meta.tag.inline.a.end.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -2729,7 +2718,7 @@
 	},
 	{
 		"c": "a",
-		"t": "text.html.basic meta.tag.inline.any.html entity.name.tag.inline.any.html",
+		"t": "text.html.basic meta.tag.inline.a.end.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -2740,7 +2729,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.basic meta.tag.inline.any.html punctuation.definition.tag.end.html",
+		"t": "text.html.basic meta.tag.inline.a.end.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -2762,7 +2751,7 @@
 	},
 	{
 		"c": "</",
-		"t": "text.html.basic meta.tag.inline.any.html punctuation.definition.tag.begin.html",
+		"t": "text.html.basic meta.tag.inline.span.end.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -2773,7 +2762,7 @@
 	},
 	{
 		"c": "span",
-		"t": "text.html.basic meta.tag.inline.any.html entity.name.tag.inline.any.html",
+		"t": "text.html.basic meta.tag.inline.span.end.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -2784,7 +2773,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.basic meta.tag.inline.any.html punctuation.definition.tag.end.html",
+		"t": "text.html.basic meta.tag.inline.span.end.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -2806,7 +2795,7 @@
 	},
 	{
 		"c": "<",
-		"t": "text.html.basic meta.tag.inline.any.html punctuation.definition.tag.begin.html",
+		"t": "text.html.basic meta.tag.inline.span.start.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -2817,7 +2806,7 @@
 	},
 	{
 		"c": "span",
-		"t": "text.html.basic meta.tag.inline.any.html entity.name.tag.inline.any.html",
+		"t": "text.html.basic meta.tag.inline.span.start.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -2828,7 +2817,7 @@
 	},
 	{
 		"c": " ",
-		"t": "text.html.basic meta.tag.inline.any.html",
+		"t": "text.html.basic meta.tag.inline.span.start.html",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2839,7 +2828,7 @@
 	},
 	{
 		"c": "class",
-		"t": "text.html.basic meta.tag.inline.any.html entity.other.attribute-name.html",
+		"t": "text.html.basic meta.tag.inline.span.start.html meta.attribute.class.html entity.other.attribute-name.html",
 		"r": {
 			"dark_plus": "entity.other.attribute-name: #9CDCFE",
 			"light_plus": "entity.other.attribute-name: #FF0000",
@@ -2850,7 +2839,7 @@
 	},
 	{
 		"c": "=",
-		"t": "text.html.basic meta.tag.inline.any.html",
+		"t": "text.html.basic meta.tag.inline.span.start.html meta.attribute.class.html punctuation.separator.key-value.html",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2861,7 +2850,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "text.html.basic meta.tag.inline.any.html string.quoted.double.html punctuation.definition.string.begin.html",
+		"t": "text.html.basic meta.tag.inline.span.start.html meta.attribute.class.html string.quoted.double.html punctuation.definition.string.begin.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.double.html: #0000FF",
@@ -2872,7 +2861,7 @@
 	},
 	{
 		"c": "signed-out-tab-flash",
-		"t": "text.html.basic meta.tag.inline.any.html string.quoted.double.html",
+		"t": "text.html.basic meta.tag.inline.span.start.html meta.attribute.class.html string.quoted.double.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.double.html: #0000FF",
@@ -2883,7 +2872,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "text.html.basic meta.tag.inline.any.html string.quoted.double.html punctuation.definition.string.end.html",
+		"t": "text.html.basic meta.tag.inline.span.start.html meta.attribute.class.html string.quoted.double.html punctuation.definition.string.end.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.double.html: #0000FF",
@@ -2894,7 +2883,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.basic meta.tag.inline.any.html punctuation.definition.tag.end.html",
+		"t": "text.html.basic meta.tag.inline.span.start.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -2916,7 +2905,7 @@
 	},
 	{
 		"c": "<",
-		"t": "text.html.basic meta.tag.inline.any.html punctuation.definition.tag.begin.html",
+		"t": "text.html.basic meta.tag.inline.a.start.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -2927,7 +2916,7 @@
 	},
 	{
 		"c": "a",
-		"t": "text.html.basic meta.tag.inline.any.html entity.name.tag.inline.any.html",
+		"t": "text.html.basic meta.tag.inline.a.start.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -2938,7 +2927,7 @@
 	},
 	{
 		"c": " ",
-		"t": "text.html.basic meta.tag.inline.any.html",
+		"t": "text.html.basic meta.tag.inline.a.start.html",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2949,7 +2938,7 @@
 	},
 	{
 		"c": "href",
-		"t": "text.html.basic meta.tag.inline.any.html entity.other.attribute-name.html",
+		"t": "text.html.basic meta.tag.inline.a.start.html meta.attribute.href.html entity.other.attribute-name.html",
 		"r": {
 			"dark_plus": "entity.other.attribute-name: #9CDCFE",
 			"light_plus": "entity.other.attribute-name: #FF0000",
@@ -2960,7 +2949,7 @@
 	},
 	{
 		"c": "=",
-		"t": "text.html.basic meta.tag.inline.any.html",
+		"t": "text.html.basic meta.tag.inline.a.start.html meta.attribute.href.html punctuation.separator.key-value.html",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2971,7 +2960,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "text.html.basic meta.tag.inline.any.html string.quoted.double.html punctuation.definition.string.begin.html",
+		"t": "text.html.basic meta.tag.inline.a.start.html meta.attribute.href.html string.quoted.double.html punctuation.definition.string.begin.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.double.html: #0000FF",
@@ -2982,7 +2971,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "text.html.basic meta.tag.inline.any.html string.quoted.double.html punctuation.definition.string.end.html",
+		"t": "text.html.basic meta.tag.inline.a.start.html meta.attribute.href.html string.quoted.double.html punctuation.definition.string.end.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.double.html: #0000FF",
@@ -2993,7 +2982,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.basic meta.tag.inline.any.html punctuation.definition.tag.end.html",
+		"t": "text.html.basic meta.tag.inline.a.start.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -3015,7 +3004,7 @@
 	},
 	{
 		"c": "</",
-		"t": "text.html.basic meta.tag.inline.any.html punctuation.definition.tag.begin.html",
+		"t": "text.html.basic meta.tag.inline.a.end.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -3026,7 +3015,7 @@
 	},
 	{
 		"c": "a",
-		"t": "text.html.basic meta.tag.inline.any.html entity.name.tag.inline.any.html",
+		"t": "text.html.basic meta.tag.inline.a.end.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -3037,7 +3026,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.basic meta.tag.inline.any.html punctuation.definition.tag.end.html",
+		"t": "text.html.basic meta.tag.inline.a.end.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -3059,7 +3048,7 @@
 	},
 	{
 		"c": "</",
-		"t": "text.html.basic meta.tag.inline.any.html punctuation.definition.tag.begin.html",
+		"t": "text.html.basic meta.tag.inline.span.end.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -3070,7 +3059,7 @@
 	},
 	{
 		"c": "span",
-		"t": "text.html.basic meta.tag.inline.any.html entity.name.tag.inline.any.html",
+		"t": "text.html.basic meta.tag.inline.span.end.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -3081,7 +3070,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.basic meta.tag.inline.any.html punctuation.definition.tag.end.html",
+		"t": "text.html.basic meta.tag.inline.span.end.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -3103,7 +3092,7 @@
 	},
 	{
 		"c": "</",
-		"t": "text.html.basic meta.tag.block.any.html punctuation.definition.tag.begin.html",
+		"t": "text.html.basic meta.tag.structure.div.end.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -3114,7 +3103,7 @@
 	},
 	{
 		"c": "div",
-		"t": "text.html.basic meta.tag.block.any.html entity.name.tag.block.any.html",
+		"t": "text.html.basic meta.tag.structure.div.end.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -3125,7 +3114,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.basic meta.tag.block.any.html punctuation.definition.tag.end.html",
+		"t": "text.html.basic meta.tag.structure.div.end.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -3136,7 +3125,7 @@
 	},
 	{
 		"c": "</",
-		"t": "text.html.basic meta.tag.structure.any.html punctuation.definition.tag.html",
+		"t": "text.html.basic meta.tag.structure.body.end.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -3147,7 +3136,7 @@
 	},
 	{
 		"c": "body",
-		"t": "text.html.basic meta.tag.structure.any.html entity.name.tag.structure.any.html",
+		"t": "text.html.basic meta.tag.structure.body.end.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -3158,7 +3147,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.basic meta.tag.structure.any.html punctuation.definition.tag.html",
+		"t": "text.html.basic meta.tag.structure.body.end.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -3169,7 +3158,7 @@
 	},
 	{
 		"c": "</",
-		"t": "text.html.basic meta.tag.structure.any.html punctuation.definition.tag.html",
+		"t": "text.html.basic meta.tag.structure.html.end.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -3180,7 +3169,7 @@
 	},
 	{
 		"c": "html",
-		"t": "text.html.basic meta.tag.structure.any.html entity.name.tag.structure.any.html",
+		"t": "text.html.basic meta.tag.structure.html.end.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -3191,7 +3180,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.basic meta.tag.structure.any.html punctuation.definition.tag.html",
+		"t": "text.html.basic meta.tag.structure.html.end.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
diff --git a/extensions/ini/test/colorize-results/test_ini.json b/extensions/ini/test/colorize-results/test_ini.json
index 5b001c68246..39c089f5cef 100644
--- a/extensions/ini/test/colorize-results/test_ini.json
+++ b/extensions/ini/test/colorize-results/test_ini.json
@@ -3,9 +3,9 @@
 		"c": ";",
 		"t": "source.ini comment.line.semicolon.ini punctuation.definition.comment.ini",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -14,9 +14,9 @@
 		"c": " last modified 1 April 2001 by John Doe",
 		"t": "source.ini comment.line.semicolon.ini",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -157,9 +157,9 @@
 		"c": ";",
 		"t": "source.ini comment.line.semicolon.ini punctuation.definition.comment.ini",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -168,9 +168,9 @@
 		"c": " use IP address in case network name resolution is not working",
 		"t": "source.ini comment.line.semicolon.ini",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
diff --git a/extensions/jake/README.md b/extensions/jake/README.md
index cbaa043b0a2..969c970def7 100644
--- a/extensions/jake/README.md
+++ b/extensions/jake/README.md
@@ -1,10 +1,13 @@
 # Jake - JavaScript build tool
 
-**Notice** This is a an extension that is bundled with Visual Studio Code.
+**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.
+
+## Features
 
 This extension supports running [Jake](http://jakejs.com/) tasks defined in a `Jakefile.js` file as [VS Code tasks](https://code.visualstudio.com/docs/editor/tasks). Jake tasks with the name 'build', 'compile', or 'watch' are treated as build tasks.
 
-To run Jake tasks use the `Tasks` menu.
+To run Jake tasks, use the **Tasks** menu.
 
 ## Settings
-- `jake.autoDetect` enable detecting tasks from `Jakefile.js` files, the default is `on`.
+
+- `jake.autoDetect` - Enable detecting tasks from `Jakefile.js` files, the default is `on`.
diff --git a/extensions/jake/package.json b/extensions/jake/package.json
index 2330f353026..f35e49fee26 100644
--- a/extensions/jake/package.json
+++ b/extensions/jake/package.json
@@ -16,10 +16,10 @@
     "watch": "gulp watch-extension:jake"
   },
   "dependencies": {
-    "vscode-nls": "^3.2.1"
+    "vscode-nls": "^4.0.0"
   },
   "devDependencies": {
-    "@types/node": "7.0.43"
+    "@types/node": "^8.10.25"
   },
   "main": "./out/main",
   "activationEvents": [
@@ -46,7 +46,9 @@
     "taskDefinitions": [
       {
         "type": "jake",
-        "required": ["task"],
+        "required": [
+          "task"
+        ],
         "properties": {
           "task": {
             "type": "string",
@@ -60,4 +62,4 @@
       }
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/extensions/jake/package.nls.json b/extensions/jake/package.nls.json
index b8cdb170d33..8150f471e6d 100644
--- a/extensions/jake/package.nls.json
+++ b/extensions/jake/package.nls.json
@@ -1,6 +1,6 @@
 {
-	"description": "Extension to add Jake capabilities to VSCode.",
-	"displayName": "Jake support for VSCode",
+	"description": "Extension to add Jake capabilities to VS Code.",
+	"displayName": "Jake support for VS Code",
 	"jake.taskDefinition.type.description": "The Jake task to customize.",
 	"jake.taskDefinition.file.description": "The Jake file that provides the task. Can be omitted.",
 	"config.jake.autoDetect": "Controls whether auto detection of Jake tasks is on or off. Default is on."
diff --git a/extensions/jake/yarn.lock b/extensions/jake/yarn.lock
index 112e5f2ac8d..913d2622d18 100644
--- a/extensions/jake/yarn.lock
+++ b/extensions/jake/yarn.lock
@@ -2,10 +2,10 @@
 # yarn lockfile v1
 
 
-"@types/node@7.0.43":
-  version "7.0.43"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.43.tgz#a187e08495a075f200ca946079c914e1a5fe962c"
+"@types/node@^8.10.25":
+  version "8.10.25"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-8.10.25.tgz#801fe4e39372cef18f268db880a5fbfcf71adc7e"
 
-vscode-nls@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.1.tgz#b1f3e04e8a94a715d5a7bcbc8339c51e6d74ca51"
+vscode-nls@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-4.0.0.tgz#4001c8a6caba5cedb23a9c5ce1090395c0e44002"
diff --git a/extensions/java/syntaxes/java.tmLanguage.json b/extensions/java/syntaxes/java.tmLanguage.json
index f0c867f59c8..d4477107155 100644
--- a/extensions/java/syntaxes/java.tmLanguage.json
+++ b/extensions/java/syntaxes/java.tmLanguage.json
@@ -4,7 +4,7 @@
 		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
 		"Once accepted there, we are happy to receive an update request."
 	],
-	"version": "https://github.com/atom/language-java/commit/bbbd3236c0ef9a9cd8c59d6ad4bd6b9b231dc714",
+	"version": "https://github.com/atom/language-java/commit/f213dfac7dc3726170046c8f0c174c9e9f13e4ce",
 	"name": "Java",
 	"scopeName": "source.java",
 	"patterns": [
@@ -102,6 +102,9 @@
 		},
 		{
 			"include": "#code"
+		},
+		{
+			"include": "#module"
 		}
 	],
 	"repository": {
@@ -180,6 +183,25 @@
 				}
 			]
 		},
+		"anonymous-block-and-instance-initializer": {
+			"begin": "{",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.section.block.begin.bracket.curly.java"
+				}
+			},
+			"end": "}",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.section.block.end.bracket.curly.java"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#code"
+				}
+			]
+		},
 		"anonymous-classes-and-new": {
 			"begin": "\\bnew\\b",
 			"beginCaptures": {
@@ -367,36 +389,6 @@
 				}
 			]
 		},
-		"anonymous-block-and-instance-initializer": {
-			"begin": "{",
-			"beginCaptures": {
-				"0": {
-					"name": "punctuation.section.block.begin.bracket.curly.java"
-				}
-			},
-			"end": "}",
-			"endCaptures": {
-				"0": {
-					"name": "punctuation.section.block.end.bracket.curly.java"
-				}
-			},
-			"patterns": [
-				{
-					"include": "#code"
-				}
-			]
-		},
-		"static-initializer": {
-			"patterns": [
-				{
-					"include": "#anonymous-block-and-instance-initializer"
-				},
-				{
-					"match": "static",
-					"name": "storage.modifier.java"
-				}
-			]
-		},
 		"code": {
 			"patterns": [
 				{
@@ -447,15 +439,15 @@
 				{
 					"include": "#function-call"
 				},
+				{
+					"include": "#variables"
+				},
 				{
 					"include": "#objects"
 				},
 				{
 					"include": "#properties"
 				},
-				{
-					"include": "#variables"
-				},
 				{
 					"include": "#strings"
 				},
@@ -591,149 +583,6 @@
 				}
 			]
 		},
-		"try-catch-finally": {
-			"patterns": [
-				{
-					"begin": "\\btry\\b",
-					"beginCaptures": {
-						"0": {
-							"name": "keyword.control.try.java"
-						}
-					},
-					"end": "}",
-					"endCaptures": {
-						"0": {
-							"name": "punctuation.section.try.end.bracket.curly.java"
-						}
-					},
-					"name": "meta.try.java",
-					"patterns": [
-						{
-							"begin": "\\(",
-							"beginCaptures": {
-								"0": {
-									"name": "punctuation.section.try.resources.begin.bracket.round.java"
-								}
-							},
-							"end": "\\)",
-							"endCaptures": {
-								"0": {
-									"name": "punctuation.section.try.resources.end.bracket.round.java"
-								}
-							},
-							"name": "meta.try.resources.java",
-							"patterns": [
-								{
-									"include": "#code"
-								}
-							]
-						},
-						{
-							"begin": "{",
-							"beginCaptures": {
-								"0": {
-									"name": "punctuation.section.try.begin.bracket.curly.java"
-								}
-							},
-							"end": "(?=})",
-							"contentName": "meta.try.body.java",
-							"patterns": [
-								{
-									"include": "#code"
-								}
-							]
-						}
-					]
-				},
-				{
-					"begin": "\\b(catch)\\b\\s*(?=\\(\\s*[^\\s]+\\s*[^)]+\\))",
-					"beginCaptures": {
-						"1": {
-							"name": "keyword.control.catch.java"
-						}
-					},
-					"end": "}",
-					"endCaptures": {
-						"0": {
-							"name": "punctuation.section.catch.end.bracket.curly.java"
-						}
-					},
-					"name": "meta.catch.java",
-					"patterns": [
-						{
-							"begin": "\\(",
-							"beginCaptures": {
-								"0": {
-									"name": "punctuation.definition.parameters.begin.bracket.round.java"
-								}
-							},
-							"end": "\\)",
-							"endCaptures": {
-								"0": {
-									"name": "punctuation.definition.parameters.end.bracket.round.java"
-								}
-							},
-							"contentName": "meta.catch.parameters.java",
-							"patterns": [
-								{
-									"include": "#comments"
-								},
-								{
-									"include": "#parameters"
-								}
-							]
-						},
-						{
-							"begin": "{",
-							"beginCaptures": {
-								"0": {
-									"name": "punctuation.section.catch.begin.bracket.curly.java"
-								}
-							},
-							"end": "(?=})",
-							"contentName": "meta.catch.body.java",
-							"patterns": [
-								{
-									"include": "#code"
-								}
-							]
-						}
-					]
-				},
-				{
-					"begin": "\\bfinally\\b",
-					"beginCaptures": {
-						"0": {
-							"name": "keyword.control.finally.java"
-						}
-					},
-					"end": "}",
-					"endCaptures": {
-						"0": {
-							"name": "punctuation.section.finally.end.bracket.curly.java"
-						}
-					},
-					"name": "meta.finally.java",
-					"patterns": [
-						{
-							"begin": "{",
-							"beginCaptures": {
-								"0": {
-									"name": "punctuation.section.finally.begin.bracket.curly.java"
-								}
-							},
-							"end": "(?=})",
-							"contentName": "meta.finally.body.java",
-							"patterns": [
-								{
-									"include": "#code"
-								}
-							]
-						}
-					]
-				}
-			]
-		},
 		"constants-and-special-vars": {
 			"patterns": [
 				{
@@ -750,66 +599,6 @@
 				}
 			]
 		},
-		"generics": {
-			"begin": "<",
-			"beginCaptures": {
-				"0": {
-					"name": "punctuation.bracket.angle.java"
-				}
-			},
-			"end": ">",
-			"endCaptures": {
-				"0": {
-					"name": "punctuation.bracket.angle.java"
-				}
-			},
-			"patterns": [
-				{
-					"match": "\\b(extends|super)\\b",
-					"name": "storage.modifier.$1.java"
-				},
-				{
-					"match": "(?<!\\.)([a-zA-Z$_][a-zA-Z0-9$_]*)(?=\\s*<)",
-					"captures": {
-						"1": {
-							"name": "storage.type.java"
-						}
-					}
-				},
-				{
-					"include": "#primitive-arrays"
-				},
-				{
-					"match": "[a-zA-Z$_][a-zA-Z0-9$_]*",
-					"name": "storage.type.generic.java"
-				},
-				{
-					"match": "\\?",
-					"name": "storage.type.generic.wildcard.java"
-				},
-				{
-					"match": "&",
-					"name": "punctuation.separator.types.java"
-				},
-				{
-					"match": ",",
-					"name": "punctuation.separator.delimiter.java"
-				},
-				{
-					"match": "\\.",
-					"name": "punctuation.separator.period.java"
-				},
-				{
-					"include": "#parens"
-				},
-				{
-					"include": "#generics"
-				},
-				{
-					"include": "#comments"
-				}
-			]
-		},
 		"enums": {
 			"begin": "^\\s*(enum)\\s+(\\w+)",
 			"beginCaptures": {
@@ -874,6 +663,66 @@
 				}
 			]
 		},
+		"generics": {
+			"begin": "<",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.bracket.angle.java"
+				}
+			},
+			"end": ">",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.bracket.angle.java"
+				}
+			},
+			"patterns": [
+				{
+					"match": "\\b(extends|super)\\b",
+					"name": "storage.modifier.$1.java"
+				},
+				{
+					"match": "(?<!\\.)([a-zA-Z$_][a-zA-Z0-9$_]*)(?=\\s*<)",
+					"captures": {
+						"1": {
+							"name": "storage.type.java"
+						}
+					}
+				},
+				{
+					"include": "#primitive-arrays"
+				},
+				{
+					"match": "[a-zA-Z$_][a-zA-Z0-9$_]*",
+					"name": "storage.type.generic.java"
+				},
+				{
+					"match": "\\?",
+					"name": "storage.type.generic.wildcard.java"
+				},
+				{
+					"match": "&",
+					"name": "punctuation.separator.types.java"
+				},
+				{
+					"match": ",",
+					"name": "punctuation.separator.delimiter.java"
+				},
+				{
+					"match": "\\.",
+					"name": "punctuation.separator.period.java"
+				},
+				{
+					"include": "#parens"
+				},
+				{
+					"include": "#generics"
+				},
+				{
+					"include": "#comments"
+				}
+			]
+		},
 		"keywords": {
 			"patterns": [
 				{
@@ -942,6 +791,24 @@
 				}
 			]
 		},
+		"member-variables": {
+			"begin": "(?=private|protected|public|native|synchronized|abstract|threadsafe|transient|static|final)",
+			"end": "(?=\\=|;)",
+			"patterns": [
+				{
+					"include": "#storage-modifiers"
+				},
+				{
+					"include": "#variables"
+				},
+				{
+					"include": "#primitive-arrays"
+				},
+				{
+					"include": "#object-types"
+				}
+			]
+		},
 		"method-call": {
 			"begin": "(\\.)\\s*([A-Za-z_$][\\w$]*)\\s*(\\()",
 			"beginCaptures": {
@@ -1049,6 +916,45 @@
 				}
 			]
 		},
+		"module": {
+			"begin": "((open)\\s)?(module)\\s+(\\w+)",
+			"end": "}",
+			"beginCaptures": {
+				"1": {
+					"name": "storage.modifier.java"
+				},
+				"3": {
+					"name": "storage.modifier.java"
+				},
+				"4": {
+					"name": "entity.name.type.module.java"
+				}
+			},
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.section.module.end.bracket.curly.java"
+				}
+			},
+			"name": "meta.module.java",
+			"patterns": [
+				{
+					"begin": "{",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.section.module.begin.bracket.curly.java"
+						}
+					},
+					"end": "(?=})",
+					"contentName": "meta.module.body.java",
+					"patterns": [
+						{
+							"match": "\\b(requires|transitive|exports|opens|to|uses|provides|with)\\b",
+							"name": "keyword.module.java"
+						}
+					]
+				}
+			]
+		},
 		"numbers": {
 			"patterns": [
 				{
@@ -1075,10 +981,19 @@
 					"include": "#generics"
 				},
 				{
-					"begin": "\\b(?:[A-Z]\\w*\\s*(\\.)\\s*)*([A-Z]\\w*)\\s*(?=\\[)",
+					"begin": "\\b((?:[A-Za-z]\\w*\\s*\\.\\s*)*)([A-Z]\\w*)\\s*(?=\\[)",
 					"beginCaptures": {
 						"1": {
-							"name": "punctuation.separator.period.java"
+							"patterns": [
+								{
+									"match": "[A-Za-z]\\w*",
+									"name": "storage.type.java"
+								},
+								{
+									"match": "\\.",
+									"name": "punctuation.separator.period.java"
+								}
+							]
 						},
 						"2": {
 							"name": "storage.type.object.array.java"
@@ -1095,28 +1010,36 @@
 					]
 				},
 				{
-					"begin": "\\b((?:[A-Z]\\w*\\s*(\\.)\\s*)*[A-Z]\\w*)\\s*(?=<)",
-					"beginCaptures": {
-						"1": {
-							"name": "storage.type.java"
-						},
-						"2": {
-							"name": "punctuation.separator.period.java"
-						}
-					},
-					"end": "(?<=>)|(?!;)",
-					"patterns": [
-						{
-							"include": "#generics"
-						}
-					]
-				},
-				{
-					"match": "\\b(?:[A-Z]\\w*\\s*(\\.)\\s*)*[A-Z]\\w*\\b((?=\\s*[A-Za-z$_\\n])|(?=\\s*\\.\\.\\.))",
-					"name": "storage.type.java",
+					"match": "\\b((?:[A-Za-z]\\w*\\s*\\.\\s*)*[A-Z]\\w*)\\s*(?=<)",
 					"captures": {
 						"1": {
-							"name": "punctuation.separator.period.java"
+							"patterns": [
+								{
+									"match": "[A-Za-z]\\w*",
+									"name": "storage.type.java"
+								},
+								{
+									"match": "\\.",
+									"name": "punctuation.separator.period.java"
+								}
+							]
+						}
+					}
+				},
+				{
+					"match": "\\b((?:[A-Za-z]\\w*\\s*\\.\\s*)*[A-Z]\\w*)\\b((?=\\s*[A-Za-z$_\\n])|(?=\\s*\\.\\.\\.))",
+					"captures": {
+						"1": {
+							"patterns": [
+								{
+									"match": "[A-Za-z]\\w*",
+									"name": "storage.type.java"
+								},
+								{
+									"match": "\\.",
+									"name": "punctuation.separator.period.java"
+								}
+							]
 						}
 					}
 				}
@@ -1298,6 +1221,17 @@
 				}
 			]
 		},
+		"static-initializer": {
+			"patterns": [
+				{
+					"include": "#anonymous-block-and-instance-initializer"
+				},
+				{
+					"match": "static",
+					"name": "storage.modifier.java"
+				}
+			]
+		},
 		"storage-modifiers": {
 			"match": "\\b(public|private|protected|static|final|native|synchronized|abstract|threadsafe|transient|volatile|default|strictfp)\\b",
 			"name": "storage.modifier.java"
@@ -1359,13 +1293,173 @@
 			"name": "meta.throwables.java",
 			"patterns": [
 				{
-					"include": "#object-types"
+					"match": ",",
+					"name": "punctuation.separator.delimiter.java"
+				},
+				{
+					"match": "[a-zA-Z$_][\\.a-zA-Z0-9$_]*",
+					"name": "storage.type.java"
+				}
+			]
+		},
+		"try-catch-finally": {
+			"patterns": [
+				{
+					"begin": "\\btry\\b",
+					"beginCaptures": {
+						"0": {
+							"name": "keyword.control.try.java"
+						}
+					},
+					"end": "}",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.section.try.end.bracket.curly.java"
+						}
+					},
+					"name": "meta.try.java",
+					"patterns": [
+						{
+							"begin": "\\(",
+							"beginCaptures": {
+								"0": {
+									"name": "punctuation.section.try.resources.begin.bracket.round.java"
+								}
+							},
+							"end": "\\)",
+							"endCaptures": {
+								"0": {
+									"name": "punctuation.section.try.resources.end.bracket.round.java"
+								}
+							},
+							"name": "meta.try.resources.java",
+							"patterns": [
+								{
+									"include": "#code"
+								}
+							]
+						},
+						{
+							"begin": "{",
+							"beginCaptures": {
+								"0": {
+									"name": "punctuation.section.try.begin.bracket.curly.java"
+								}
+							},
+							"end": "(?=})",
+							"contentName": "meta.try.body.java",
+							"patterns": [
+								{
+									"include": "#code"
+								}
+							]
+						}
+					]
+				},
+				{
+					"begin": "\\b(catch)\\b\\s*(?=\\(\\s*[^\\s]+\\s*[^)]+\\))",
+					"beginCaptures": {
+						"1": {
+							"name": "keyword.control.catch.java"
+						}
+					},
+					"end": "}",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.section.catch.end.bracket.curly.java"
+						}
+					},
+					"name": "meta.catch.java",
+					"patterns": [
+						{
+							"begin": "\\(",
+							"beginCaptures": {
+								"0": {
+									"name": "punctuation.definition.parameters.begin.bracket.round.java"
+								}
+							},
+							"end": "\\)",
+							"endCaptures": {
+								"0": {
+									"name": "punctuation.definition.parameters.end.bracket.round.java"
+								}
+							},
+							"contentName": "meta.catch.parameters.java",
+							"patterns": [
+								{
+									"include": "#comments"
+								},
+								{
+									"match": "\\|",
+									"name": "punctuation.catch.separator.java"
+								},
+								{
+									"match": "([a-zA-Z$_][\\.a-zA-Z0-9$_]*)\\s*(\\w+)?",
+									"captures": {
+										"1": {
+											"name": "storage.type.java"
+										},
+										"2": {
+											"name": "variable.parameter.java"
+										}
+									}
+								}
+							]
+						},
+						{
+							"begin": "{",
+							"beginCaptures": {
+								"0": {
+									"name": "punctuation.section.catch.begin.bracket.curly.java"
+								}
+							},
+							"end": "(?=})",
+							"contentName": "meta.catch.body.java",
+							"patterns": [
+								{
+									"include": "#code"
+								}
+							]
+						}
+					]
+				},
+				{
+					"begin": "\\bfinally\\b",
+					"beginCaptures": {
+						"0": {
+							"name": "keyword.control.finally.java"
+						}
+					},
+					"end": "}",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.section.finally.end.bracket.curly.java"
+						}
+					},
+					"name": "meta.finally.java",
+					"patterns": [
+						{
+							"begin": "{",
+							"beginCaptures": {
+								"0": {
+									"name": "punctuation.section.finally.begin.bracket.curly.java"
+								}
+							},
+							"end": "(?=})",
+							"contentName": "meta.finally.body.java",
+							"patterns": [
+								{
+									"include": "#code"
+								}
+							]
+						}
+					]
 				}
 			]
 		},
 		"variables": {
-			"begin": "(?x)\n(?=\n  (\n    (void|boolean|byte|char|short|int|float|long|double)\n    |\n    (?>(\\w+\\.)*[A-Z]+\\w*) # e.g. `javax.ws.rs.Response`, or `String`\n  )\n  (\n    <[\\w<>,\\.?\\s]*> # e.g. `HashMap<Integer, String>`, or `List<java.lang.String>`\n  )?\n  (\n    (\\[\\])* # int[][]\n  )?\n  \\s+\n  [A-Za-z_$][\\w$]* # At least one identifier after space\n  ([\\w\\[\\],$][\\w\\[\\],\\s]*)? # possibly primitive array or additional identifiers\n  \\s*(=|;)\n)",
-			"end": "(?=;)",
+			"begin": "(?x)\n(?=\n  (\n    (void|boolean|byte|char|short|int|float|long|double)\n    |\n    (?>(\\w+\\.)*[A-Z]+\\w*) # e.g. `javax.ws.rs.Response`, or `String`\n  )\n  (\n    <[\\w<>,\\.?\\s\\[\\]]*> # e.g. `HashMap<Integer, String>`, or `List<java.lang.String>`\n  )?\n  (\n    (\\[\\])* # int[][]\n  )?\n  \\s+\n  [A-Za-z_$][\\w$]* # At least one identifier after space\n  ([\\w\\[\\],$][\\w\\[\\],\\s]*)? # possibly primitive array or additional identifiers\n  \\s*(=|;)\n)",
+			"end": "(?=\\=|;)",
 			"name": "meta.definition.variable.java",
 			"patterns": [
 				{
@@ -1379,42 +1473,10 @@
 				{
 					"include": "#all-types"
 				},
-				{
-					"begin": "=",
-					"beginCaptures": {
-						"0": {
-							"name": "keyword.operator.assignment.java"
-						}
-					},
-					"end": "(?=;)",
-					"patterns": [
-						{
-							"include": "#code"
-						}
-					]
-				},
 				{
 					"include": "#code"
 				}
 			]
-		},
-		"member-variables": {
-			"begin": "(?=private|protected|public|native|synchronized|abstract|threadsafe|transient|static|final)",
-			"end": "(?=;)",
-			"patterns": [
-				{
-					"include": "#storage-modifiers"
-				},
-				{
-					"include": "#variables"
-				},
-				{
-					"include": "#primitive-arrays"
-				},
-				{
-					"include": "#object-types"
-				}
-			]
 		}
 	}
 }
\ No newline at end of file
diff --git a/extensions/java/test/colorize-results/basic_java.json b/extensions/java/test/colorize-results/basic_java.json
index 1ef3a8ff324..ce736eb21d2 100644
--- a/extensions/java/test/colorize-results/basic_java.json
+++ b/extensions/java/test/colorize-results/basic_java.json
@@ -245,9 +245,9 @@
 		"c": "/*",
 		"t": "source.java comment.block.java punctuation.definition.comment.java",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -256,9 +256,9 @@
 		"c": " * Multi line comment",
 		"t": "source.java comment.block.java",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -267,9 +267,9 @@
 		"c": " ",
 		"t": "source.java comment.block.java",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -278,9 +278,9 @@
 		"c": "*/",
 		"t": "source.java comment.block.java punctuation.definition.comment.java",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -443,9 +443,9 @@
 		"c": "\t/**",
 		"t": "source.java meta.class.java meta.class.body.java comment.block.javadoc.java punctuation.definition.comment.java",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -454,9 +454,9 @@
 		"c": "\t * <p>Note:</p> Hello",
 		"t": "source.java meta.class.java meta.class.body.java comment.block.javadoc.java",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -465,9 +465,9 @@
 		"c": "\t * ",
 		"t": "source.java meta.class.java meta.class.body.java comment.block.javadoc.java",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -487,9 +487,9 @@
 		"c": " ",
 		"t": "source.java meta.class.java meta.class.body.java comment.block.javadoc.java",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -500,7 +500,7 @@
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "variable: #9CDCFE"
 		}
@@ -509,9 +509,9 @@
 		"c": "\t ",
 		"t": "source.java meta.class.java meta.class.body.java comment.block.javadoc.java",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -520,9 +520,9 @@
 		"c": "*/",
 		"t": "source.java meta.class.java meta.class.body.java comment.block.javadoc.java punctuation.definition.comment.java",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -727,7 +727,7 @@
 	},
 	{
 		"c": "=",
-		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java meta.definition.variable.java keyword.operator.assignment.java",
+		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java keyword.operator.assignment.java",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -738,7 +738,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java meta.definition.variable.java",
+		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -749,7 +749,7 @@
 	},
 	{
 		"c": "0.0",
-		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java meta.definition.variable.java constant.numeric.decimal.java",
+		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java constant.numeric.decimal.java",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #09885A",
@@ -826,7 +826,7 @@
 	},
 	{
 		"c": "=",
-		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java meta.definition.variable.java keyword.operator.assignment.java",
+		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java keyword.operator.assignment.java",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -837,7 +837,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java meta.definition.variable.java",
+		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -848,7 +848,7 @@
 	},
 	{
 		"c": "10e3",
-		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java meta.definition.variable.java constant.numeric.decimal.java",
+		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java constant.numeric.decimal.java",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #09885A",
@@ -925,7 +925,7 @@
 	},
 	{
 		"c": "=",
-		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java meta.definition.variable.java keyword.operator.assignment.java",
+		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java keyword.operator.assignment.java",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -936,7 +936,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java meta.definition.variable.java",
+		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -947,7 +947,7 @@
 	},
 	{
 		"c": "134l",
-		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java meta.definition.variable.java constant.numeric.decimal.java",
+		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java constant.numeric.decimal.java",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #09885A",
@@ -1004,9 +1004,9 @@
 		"c": "/*",
 		"t": "source.java meta.class.java meta.class.body.java comment.block.java punctuation.definition.comment.java",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -1015,9 +1015,9 @@
 		"c": "\t * multiline comment",
 		"t": "source.java meta.class.java meta.class.body.java comment.block.java",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -1026,9 +1026,9 @@
 		"c": "\t ",
 		"t": "source.java meta.class.java meta.class.body.java comment.block.java",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -1037,9 +1037,9 @@
 		"c": "*/",
 		"t": "source.java meta.class.java meta.class.body.java comment.block.java punctuation.definition.comment.java",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -1398,7 +1398,7 @@
 	},
 	{
 		"c": "=",
-		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java meta.definition.variable.java keyword.operator.assignment.java",
+		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java keyword.operator.assignment.java",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -1409,7 +1409,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java meta.definition.variable.java",
+		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1420,7 +1420,7 @@
 	},
 	{
 		"c": "0",
-		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java meta.definition.variable.java constant.numeric.decimal.java",
+		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java constant.numeric.decimal.java",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #09885A",
@@ -1829,9 +1829,9 @@
 		"c": "//",
 		"t": "source.java meta.class.java meta.class.body.java comment.line.double-slash.java punctuation.definition.comment.java",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -1840,9 +1840,9 @@
 		"c": "single line comment",
 		"t": "source.java meta.class.java meta.class.body.java comment.line.double-slash.java",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -2047,7 +2047,7 @@
 	},
 	{
 		"c": "=",
-		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java meta.definition.variable.java keyword.operator.assignment.java",
+		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java keyword.operator.assignment.java",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -2058,7 +2058,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java meta.definition.variable.java",
+		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2069,7 +2069,7 @@
 	},
 	{
 		"c": "0x5",
-		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java meta.definition.variable.java constant.numeric.hex.java",
+		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java constant.numeric.hex.java",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #09885A",
@@ -2179,7 +2179,7 @@
 	},
 	{
 		"c": "=",
-		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java meta.definition.variable.java keyword.operator.assignment.java",
+		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java keyword.operator.assignment.java",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -2190,7 +2190,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java meta.definition.variable.java",
+		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2201,7 +2201,7 @@
 	},
 	{
 		"c": "new",
-		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java meta.definition.variable.java keyword.control.new.java",
+		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java keyword.control.new.java",
 		"r": {
 			"dark_plus": "keyword.control: #C586C0",
 			"light_plus": "keyword.control: #AF00DB",
@@ -2212,7 +2212,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java meta.definition.variable.java",
+		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2223,7 +2223,7 @@
 	},
 	{
 		"c": "Vector",
-		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java meta.definition.variable.java meta.function-call.java entity.name.function.java",
+		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java meta.function-call.java entity.name.function.java",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -2234,7 +2234,7 @@
 	},
 	{
 		"c": "(",
-		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java meta.definition.variable.java meta.function-call.java punctuation.definition.parameters.begin.bracket.round.java",
+		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java meta.function-call.java punctuation.definition.parameters.begin.bracket.round.java",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2245,7 +2245,7 @@
 	},
 	{
 		"c": ")",
-		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java meta.definition.variable.java meta.function-call.java punctuation.definition.parameters.end.bracket.round.java",
+		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java meta.function-call.java punctuation.definition.parameters.end.bracket.round.java",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
diff --git a/extensions/javascript/javascript-language-configuration.json b/extensions/javascript/javascript-language-configuration.json
index 1e8f440a420..b41053843cf 100644
--- a/extensions/javascript/javascript-language-configuration.json
+++ b/extensions/javascript/javascript-language-configuration.json
@@ -25,6 +25,7 @@
 		["\"", "\""],
 		["`", "`"]
 	],
+	"autoCloseBefore": ";:.,=}])>` \n\t",
 	"folding": {
 		"markers": {
 			"start": "^\\s*//\\s*#?region\\b",
diff --git a/extensions/javascript/syntaxes/JavaScript.tmLanguage.json b/extensions/javascript/syntaxes/JavaScript.tmLanguage.json
index 4589797b3e3..7ea9fe439fb 100644
--- a/extensions/javascript/syntaxes/JavaScript.tmLanguage.json
+++ b/extensions/javascript/syntaxes/JavaScript.tmLanguage.json
@@ -4,7 +4,7 @@
 		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
 		"Once accepted there, we are happy to receive an update request."
 	],
-	"version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/53ce68bc2e8abcfa9bce7fb555ccd60c5bacd11e",
+	"version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/67d50d27f0c459e6ccc9adc6645454ecb1c2406c",
 	"name": "JavaScript (with React support)",
 	"scopeName": "source.js",
 	"patterns": [
@@ -93,6 +93,10 @@
 				},
 				{
 					"include": "#export-declaration"
+				},
+				{
+					"name": "storage.modifier.js",
+					"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(declare|export)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))"
 				}
 			]
 		},
@@ -140,12 +144,12 @@
 					"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(with)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))"
 				},
 				{
-					"name": "keyword.other.debugger.js",
-					"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(debugger)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))"
+					"name": "keyword.control.js",
+					"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(package)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))"
 				},
 				{
-					"name": "storage.modifier.js",
-					"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(declare)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))"
+					"name": "keyword.other.debugger.js",
+					"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(debugger)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))"
 				}
 			]
 		},
@@ -281,41 +285,26 @@
 			]
 		},
 		"var-expr": {
-			"name": "meta.var.expr.js",
-			"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?\\b(var|let|const(?!\\s+enum\\b))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))",
-			"beginCaptures": {
-				"1": {
-					"name": "keyword.control.export.js"
-				},
-				"2": {
-					"name": "storage.type.js"
-				}
-			},
-			"end": "(?=$|^|;|}|(\\s+(of|in)\\s+))",
 			"patterns": [
 				{
-					"include": "#destructuring-variable"
-				},
-				{
-					"include": "#var-single-variable"
-				},
-				{
-					"include": "#variable-initializer"
-				},
-				{
-					"include": "#comment"
-				},
-				{
-					"begin": "(,)\\s*(?!\\S)",
-					"beginCaptures": {
-						"1": {
-							"name": "punctuation.separator.comma.js"
-						}
-					},
-					"end": "(?<!,)((?==|;|}|(\\s+(of|in)\\s+)|^\\s*$))|((?<=\\S)(?=\\s*$))",
+					"name": "meta.var.expr.js",
+					"begin": "(?=(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(var|let)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))",
+					"end": "(?!(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(var|let)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))((?=;|}|(\\s+(of|in)\\s+)|^\\s*$|;|(?:^\\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\\b))|((?<!^let|[^\\._$[:alnum:]]let|^var|[^\\._$[:alnum:]]var)(?=\\s*$)))",
 					"patterns": [
 						{
-							"include": "#comment"
+							"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(var|let)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*",
+							"beginCaptures": {
+								"1": {
+									"name": "keyword.control.export.js"
+								},
+								"2": {
+									"name": "storage.modifier.js"
+								},
+								"3": {
+									"name": "storage.type.js"
+								}
+							},
+							"end": "(?=\\S)"
 						},
 						{
 							"include": "#destructuring-variable"
@@ -323,13 +312,116 @@
 						{
 							"include": "#var-single-variable"
 						},
+						{
+							"include": "#variable-initializer"
+						},
+						{
+							"include": "#comment"
+						},
+						{
+							"begin": "(,)\\s*((?!\\S)|(?=\\/\\/))",
+							"beginCaptures": {
+								"1": {
+									"name": "punctuation.separator.comma.js"
+								}
+							},
+							"end": "(?<!,)(((?==|;|}|(\\s+(of|in)\\s+)|^\\s*$))|((?<=\\S)(?=\\s*$)))",
+							"patterns": [
+								{
+									"include": "#single-line-comment-consuming-line-ending"
+								},
+								{
+									"include": "#comment"
+								},
+								{
+									"include": "#destructuring-variable"
+								},
+								{
+									"include": "#var-single-variable"
+								},
+								{
+									"include": "#punctuation-comma"
+								}
+							]
+						},
 						{
 							"include": "#punctuation-comma"
 						}
 					]
 				},
 				{
-					"include": "#punctuation-comma"
+					"name": "meta.var.expr.js",
+					"begin": "(?=(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(const(?!\\s+enum\\b))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))",
+					"beginCaptures": {
+						"1": {
+							"name": "keyword.control.export.js"
+						},
+						"2": {
+							"name": "storage.modifier.js"
+						},
+						"3": {
+							"name": "storage.type.js"
+						}
+					},
+					"end": "(?!(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(const(?!\\s+enum\\b))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))((?=;|}|(\\s+(of|in)\\s+)|^\\s*$|;|(?:^\\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\\b))|((?<!^const|[^\\._$[:alnum:]]const)(?=\\s*$)))",
+					"patterns": [
+						{
+							"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(const(?!\\s+enum\\b))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*",
+							"beginCaptures": {
+								"1": {
+									"name": "keyword.control.export.js"
+								},
+								"2": {
+									"name": "storage.modifier.js"
+								},
+								"3": {
+									"name": "storage.type.js"
+								}
+							},
+							"end": "(?=\\S)"
+						},
+						{
+							"include": "#destructuring-const"
+						},
+						{
+							"include": "#var-single-const"
+						},
+						{
+							"include": "#variable-initializer"
+						},
+						{
+							"include": "#comment"
+						},
+						{
+							"begin": "(,)\\s*((?!\\S)|(?=\\/\\/))",
+							"beginCaptures": {
+								"1": {
+									"name": "punctuation.separator.comma.js"
+								}
+							},
+							"end": "(?<!,)(((?==|;|}|(\\s+(of|in)\\s+)|^\\s*$))|((?<=\\S)(?=\\s*$)))",
+							"patterns": [
+								{
+									"include": "#single-line-comment-consuming-line-ending"
+								},
+								{
+									"include": "#comment"
+								},
+								{
+									"include": "#destructuring-const"
+								},
+								{
+									"include": "#var-single-const"
+								},
+								{
+									"include": "#punctuation-comma"
+								}
+							]
+						},
+						{
+							"include": "#punctuation-comma"
+						}
+					]
 				}
 			]
 		},
@@ -337,7 +429,7 @@
 			"patterns": [
 				{
 					"name": "meta.var-single-variable.expr.js",
-					"begin": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ([\\(]\\s*([\\{\\[]\\s*)?$) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ([\\(]\\s*([\\{\\[]\\s*)?$) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
+					"begin": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$))) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
 					"beginCaptures": {
 						"1": {
 							"name": "meta.definition.variable.js entity.name.function.js"
@@ -382,6 +474,40 @@
 				}
 			]
 		},
+		"var-single-const": {
+			"patterns": [
+				{
+					"name": "meta.var-single-variable.expr.js",
+					"begin": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$))) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
+					"beginCaptures": {
+						"1": {
+							"name": "meta.definition.variable.js variable.other.constant.js entity.name.function.js"
+						}
+					},
+					"end": "(?=$|^|[;,=}]|(\\s+(of|in)\\s+))",
+					"patterns": [
+						{
+							"include": "#var-single-variable-type-annotation"
+						}
+					]
+				},
+				{
+					"name": "meta.var-single-variable.expr.js",
+					"begin": "([_$[:alpha:]][_$[:alnum:]]*)",
+					"beginCaptures": {
+						"1": {
+							"name": "meta.definition.variable.js variable.other.constant.js"
+						}
+					},
+					"end": "(?=$|^|[;,=}]|(\\s+(of|in)\\s+))",
+					"patterns": [
+						{
+							"include": "#var-single-variable-type-annotation"
+						}
+					]
+				}
+			]
+		},
 		"var-single-variable-type-annotation": {
 			"patterns": [
 				{
@@ -431,6 +557,42 @@
 				}
 			]
 		},
+		"destructuring-const": {
+			"patterns": [
+				{
+					"name": "meta.object-binding-pattern-variable.js",
+					"begin": "(?<!=|:|^of|[^\\._$[:alnum:]]of|^in|[^\\._$[:alnum:]]in)\\s*(?=\\{)",
+					"end": "(?=$|^|[;,=}]|(\\s+(of|in)\\s+))",
+					"patterns": [
+						{
+							"include": "#object-binding-pattern-const"
+						},
+						{
+							"include": "#type-annotation"
+						},
+						{
+							"include": "#comment"
+						}
+					]
+				},
+				{
+					"name": "meta.array-binding-pattern-variable.js",
+					"begin": "(?<!=|:|^of|[^\\._$[:alnum:]]of|^in|[^\\._$[:alnum:]]in)\\s*(?=\\[)",
+					"end": "(?=$|^|[;,=}]|(\\s+(of|in)\\s+))",
+					"patterns": [
+						{
+							"include": "#array-binding-pattern-const"
+						},
+						{
+							"include": "#type-annotation"
+						},
+						{
+							"include": "#comment"
+						}
+					]
+				}
+			]
+		},
 		"object-binding-element": {
 			"patterns": [
 				{
@@ -462,6 +624,37 @@
 				}
 			]
 		},
+		"object-binding-element-const": {
+			"patterns": [
+				{
+					"include": "#comment"
+				},
+				{
+					"begin": "(?x)(?=((\\b(?<!\\$)0(x|X)[0-9a-fA-F][0-9a-fA-F_]*\\b(?!\\$))|(\\b(?<!\\$)0(b|B)[01][01_]*\\b(?!\\$))|(\\b(?<!\\$)0(o|O)?[0-7][0-7_]*\\b(?!\\$))|((?<!\\$)(?:\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)| # 1.1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*\\b)|             # 1.E+3\n  (?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)|             # .1E+3\n  (?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)|                 # 1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*\\b)|                      # 1.1\n  (?:\\b[0-9][0-9_]*(\\.)\\B)|                                  # 1.\n  (?:\\B(\\.)[0-9][0-9_]*\\b)|                                  # .1\n  (?:\\b[0-9][0-9_]*\\b(?!\\.))                                 # 1\n)(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\\\'|\\\\)*\\')|(\\\"([^\\\"\\\\]|\\\\\\\"|\\\\)*\\\")|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(:))",
+					"end": "(?=,|\\})",
+					"patterns": [
+						{
+							"include": "#object-binding-element-propertyName"
+						},
+						{
+							"include": "#binding-element-const"
+						}
+					]
+				},
+				{
+					"include": "#object-binding-pattern-const"
+				},
+				{
+					"include": "#destructuring-variable-rest-const"
+				},
+				{
+					"include": "#variable-initializer"
+				},
+				{
+					"include": "#punctuation-comma"
+				}
+			]
+		},
 		"object-binding-element-propertyName": {
 			"begin": "(?x)(?=((\\b(?<!\\$)0(x|X)[0-9a-fA-F][0-9a-fA-F_]*\\b(?!\\$))|(\\b(?<!\\$)0(b|B)[01][01_]*\\b(?!\\$))|(\\b(?<!\\$)0(o|O)?[0-7][0-7_]*\\b(?!\\$))|((?<!\\$)(?:\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)| # 1.1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*\\b)|             # 1.E+3\n  (?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)|             # .1E+3\n  (?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)|                 # 1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*\\b)|                      # 1.1\n  (?:\\b[0-9][0-9_]*(\\.)\\B)|                                  # 1.\n  (?:\\B(\\.)[0-9][0-9_]*\\b)|                                  # .1\n  (?:\\b[0-9][0-9_]*\\b(?!\\.))                                 # 1\n)(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\\\'|\\\\)*\\')|(\\\"([^\\\"\\\\]|\\\\\\\"|\\\\)*\\\")|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(:))",
 			"end": "(:)",
@@ -508,6 +701,28 @@
 				}
 			]
 		},
+		"binding-element-const": {
+			"patterns": [
+				{
+					"include": "#comment"
+				},
+				{
+					"include": "#string"
+				},
+				{
+					"include": "#object-binding-pattern-const"
+				},
+				{
+					"include": "#array-binding-pattern-const"
+				},
+				{
+					"include": "#destructuring-variable-rest-const"
+				},
+				{
+					"include": "#variable-initializer"
+				}
+			]
+		},
 		"destructuring-variable-rest": {
 			"match": "(?:(\\.\\.\\.)\\s*)?([_$[:alpha:]][_$[:alnum:]]*)",
 			"captures": {
@@ -519,6 +734,17 @@
 				}
 			}
 		},
+		"destructuring-variable-rest-const": {
+			"match": "(?:(\\.\\.\\.)\\s*)?([_$[:alpha:]][_$[:alnum:]]*)",
+			"captures": {
+				"1": {
+					"name": "keyword.operator.rest.js"
+				},
+				"2": {
+					"name": "meta.definition.variable.js variable.other.constant.js"
+				}
+			}
+		},
 		"object-binding-pattern": {
 			"begin": "(?:(\\.\\.\\.)\\s*)?(\\{)",
 			"beginCaptures": {
@@ -541,6 +767,28 @@
 				}
 			]
 		},
+		"object-binding-pattern-const": {
+			"begin": "(?:(\\.\\.\\.)\\s*)?(\\{)",
+			"beginCaptures": {
+				"1": {
+					"name": "keyword.operator.rest.js"
+				},
+				"2": {
+					"name": "punctuation.definition.binding-pattern.object.js"
+				}
+			},
+			"end": "\\}",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.binding-pattern.object.js"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#object-binding-element-const"
+				}
+			]
+		},
 		"array-binding-pattern": {
 			"begin": "(?:(\\.\\.\\.)\\s*)?(\\[)",
 			"beginCaptures": {
@@ -566,6 +814,31 @@
 				}
 			]
 		},
+		"array-binding-pattern-const": {
+			"begin": "(?:(\\.\\.\\.)\\s*)?(\\[)",
+			"beginCaptures": {
+				"1": {
+					"name": "keyword.operator.rest.js"
+				},
+				"2": {
+					"name": "punctuation.definition.binding-pattern.array.js"
+				}
+			},
+			"end": "\\]",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.binding-pattern.array.js"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#binding-element-const"
+				},
+				{
+					"include": "#punctuation-comma"
+				}
+			]
+		},
 		"parameter-name": {
 			"patterns": [
 				{
@@ -577,7 +850,7 @@
 					}
 				},
 				{
-					"match": "(?x)(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<!=|:)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*(\\??)(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ([\\(]\\s*([\\{\\[]\\s*)?$) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ([\\(]\\s*([\\{\\[]\\s*)?$) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
+					"match": "(?x)(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<!=|:)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*(\\??)(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$))) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
 					"captures": {
 						"1": {
 							"name": "storage.modifier.js"
@@ -622,9 +895,12 @@
 			"patterns": [
 				{
 					"name": "meta.parameter.object-binding-pattern.js",
-					"begin": "(?<!=|:)\\s*(\\{)",
+					"begin": "(?<!=|:)\\s*(?:(\\.\\.\\.)\\s*)?(\\{)",
 					"beginCaptures": {
 						"1": {
+							"name": "keyword.operator.rest.js"
+						},
+						"2": {
 							"name": "punctuation.definition.binding-pattern.object.js"
 						}
 					},
@@ -642,9 +918,12 @@
 				},
 				{
 					"name": "meta.paramter.array-binding-pattern.js",
-					"begin": "(?<!=|:)\\s*(\\[)",
+					"begin": "(?<!=|:)\\s*(?:(\\.\\.\\.)\\s*)?(\\[)",
 					"beginCaptures": {
 						"1": {
+							"name": "keyword.operator.rest.js"
+						},
+						"2": {
 							"name": "punctuation.definition.binding-pattern.array.js"
 						}
 					},
@@ -778,56 +1057,50 @@
 		},
 		"field-declaration": {
 			"name": "meta.field.declaration.js",
-			"begin": "(?x)(?<!\\()(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(readonly)\\s+)?(?=((\\b(?<!\\$)0(x|X)[0-9a-fA-F][0-9a-fA-F_]*\\b(?!\\$))|(\\b(?<!\\$)0(b|B)[01][01_]*\\b(?!\\$))|(\\b(?<!\\$)0(o|O)?[0-7][0-7_]*\\b(?!\\$))|((?<!\\$)(?:\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)| # 1.1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*\\b)|             # 1.E+3\n  (?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)|             # .1E+3\n  (?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)|                 # 1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*\\b)|                      # 1.1\n  (?:\\b[0-9][0-9_]*(\\.)\\B)|                                  # 1.\n  (?:\\B(\\.)[0-9][0-9_]*\\b)|                                  # .1\n  (?:\\b[0-9][0-9_]*\\b(?!\\.))                                 # 1\n)(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\\\'|\\\\)*\\')|(\\\"([^\\\"\\\\]|\\\\\\\"|\\\\)*\\\")|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(\\?\\s*)?(=|:))",
+			"begin": "(?x)(?<!\\()(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(readonly)\\s+)?(?=\\s*((\\b(?<!\\$)0(x|X)[0-9a-fA-F][0-9a-fA-F_]*\\b(?!\\$))|(\\b(?<!\\$)0(b|B)[01][01_]*\\b(?!\\$))|(\\b(?<!\\$)0(o|O)?[0-7][0-7_]*\\b(?!\\$))|((?<!\\$)(?:\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)| # 1.1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*\\b)|             # 1.E+3\n  (?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)|             # .1E+3\n  (?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)|                 # 1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*\\b)|                      # 1.1\n  (?:\\b[0-9][0-9_]*(\\.)\\B)|                                  # 1.\n  (?:\\B(\\.)[0-9][0-9_]*\\b)|                                  # .1\n  (?:\\b[0-9][0-9_]*\\b(?!\\.))                                 # 1\n)(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\\\'|\\\\)*\\')|(\\\"([^\\\"\\\\]|\\\\\\\"|\\\\)*\\\")|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(\\?\\s*)?(=|:|;|,|$))",
 			"beginCaptures": {
 				"1": {
 					"name": "storage.modifier.js"
 				}
 			},
-			"end": "(?x)(?=\\}|;|,|$|(^(?!((\\b(?<!\\$)0(x|X)[0-9a-fA-F][0-9a-fA-F_]*\\b(?!\\$))|(\\b(?<!\\$)0(b|B)[01][01_]*\\b(?!\\$))|(\\b(?<!\\$)0(o|O)?[0-7][0-7_]*\\b(?!\\$))|((?<!\\$)(?:\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)| # 1.1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*\\b)|             # 1.E+3\n  (?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)|             # .1E+3\n  (?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)|                 # 1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*\\b)|                      # 1.1\n  (?:\\b[0-9][0-9_]*(\\.)\\B)|                                  # 1.\n  (?:\\B(\\.)[0-9][0-9_]*\\b)|                                  # .1\n  (?:\\b[0-9][0-9_]*\\b(?!\\.))                                 # 1\n)(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\\\'|\\\\)*\\')|(\\\"([^\\\"\\\\]|\\\\\\\"|\\\\)*\\\")|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(\\?\\s*)?(=|:))))|(?<=\\})",
+			"end": "(?x)(?=\\}|;|,|$|(^(?!\\s*((\\b(?<!\\$)0(x|X)[0-9a-fA-F][0-9a-fA-F_]*\\b(?!\\$))|(\\b(?<!\\$)0(b|B)[01][01_]*\\b(?!\\$))|(\\b(?<!\\$)0(o|O)?[0-7][0-7_]*\\b(?!\\$))|((?<!\\$)(?:\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)| # 1.1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*\\b)|             # 1.E+3\n  (?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)|             # .1E+3\n  (?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)|                 # 1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*\\b)|                      # 1.1\n  (?:\\b[0-9][0-9_]*(\\.)\\B)|                                  # 1.\n  (?:\\B(\\.)[0-9][0-9_]*\\b)|                                  # .1\n  (?:\\b[0-9][0-9_]*\\b(?!\\.))                                 # 1\n)(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\\\'|\\\\)*\\')|(\\\"([^\\\"\\\\]|\\\\\\\"|\\\\)*\\\")|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(\\?\\s*)?(=|:|;|,|$))))|(?<=\\})",
 			"patterns": [
 				{
 					"include": "#variable-initializer"
 				},
 				{
-					"begin": "(?x)(?=((\\b(?<!\\$)0(x|X)[0-9a-fA-F][0-9a-fA-F_]*\\b(?!\\$))|(\\b(?<!\\$)0(b|B)[01][01_]*\\b(?!\\$))|(\\b(?<!\\$)0(o|O)?[0-7][0-7_]*\\b(?!\\$))|((?<!\\$)(?:\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)| # 1.1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*\\b)|             # 1.E+3\n  (?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)|             # .1E+3\n  (?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)|                 # 1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*\\b)|                      # 1.1\n  (?:\\b[0-9][0-9_]*(\\.)\\B)|                                  # 1.\n  (?:\\B(\\.)[0-9][0-9_]*\\b)|                                  # .1\n  (?:\\b[0-9][0-9_]*\\b(?!\\.))                                 # 1\n)(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\\\'|\\\\)*\\')|(\\\"([^\\\"\\\\]|\\\\\\\"|\\\\)*\\\")|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(\\?\\s*)?(=|:))",
-					"end": "(?x)(?=[};,=]|$|(^(?!((\\b(?<!\\$)0(x|X)[0-9a-fA-F][0-9a-fA-F_]*\\b(?!\\$))|(\\b(?<!\\$)0(b|B)[01][01_]*\\b(?!\\$))|(\\b(?<!\\$)0(o|O)?[0-7][0-7_]*\\b(?!\\$))|((?<!\\$)(?:\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)| # 1.1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*\\b)|             # 1.E+3\n  (?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)|             # .1E+3\n  (?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)|                 # 1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*\\b)|                      # 1.1\n  (?:\\b[0-9][0-9_]*(\\.)\\B)|                                  # 1.\n  (?:\\B(\\.)[0-9][0-9_]*\\b)|                                  # .1\n  (?:\\b[0-9][0-9_]*\\b(?!\\.))                                 # 1\n)(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\\\'|\\\\)*\\')|(\\\"([^\\\"\\\\]|\\\\\\\"|\\\\)*\\\")|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(\\?\\s*)?(=|:))))|(?<=\\})",
-					"patterns": [
-						{
-							"include": "#type-annotation"
+					"include": "#type-annotation"
+				},
+				{
+					"include": "#string"
+				},
+				{
+					"include": "#array-literal"
+				},
+				{
+					"include": "#numeric-literal"
+				},
+				{
+					"include": "#comment"
+				},
+				{
+					"match": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(\\?)?(?=(\\?\\s*)?\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$))) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
+					"captures": {
+						"1": {
+							"name": "meta.definition.property.js entity.name.function.js"
 						},
-						{
-							"include": "#string"
-						},
-						{
-							"include": "#array-literal"
-						},
-						{
-							"include": "#numeric-literal"
-						},
-						{
-							"include": "#comment"
-						},
-						{
-							"match": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(\\?)?(?=(\\?\\s*)?\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ([\\(]\\s*([\\{\\[]\\s*)?$) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ([\\(]\\s*([\\{\\[]\\s*)?$) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
-							"captures": {
-								"1": {
-									"name": "meta.definition.property.js entity.name.function.js"
-								},
-								"2": {
-									"name": "keyword.operator.optional.js"
-								}
-							}
-						},
-						{
-							"name": "meta.definition.property.js variable.object.property.js",
-							"match": "[_$[:alpha:]][_$[:alnum:]]*"
-						},
-						{
-							"name": "keyword.operator.optional.js",
-							"match": "\\?"
+						"2": {
+							"name": "keyword.operator.optional.js"
 						}
-					]
+					}
+				},
+				{
+					"name": "meta.definition.property.js variable.object.property.js",
+					"match": "[_$[:alpha:]][_$[:alnum:]]*"
+				},
+				{
+					"name": "keyword.operator.optional.js",
+					"match": "\\?"
 				}
 			]
 		},
@@ -865,21 +1138,24 @@
 		},
 		"function-declaration": {
 			"name": "meta.function.js",
-			"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(export)\\s+)?(?:(async)\\s+)?(function\\b)(?:\\s*(\\*))?(?:(?:\\s+|(?<=\\*))([_$[:alpha:]][_$[:alnum:]]*))?\\s*",
+			"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?(?:(async)\\s+)?(function\\b)(?:\\s*(\\*))?(?:(?:\\s+|(?<=\\*))([_$[:alpha:]][_$[:alnum:]]*))?\\s*",
 			"beginCaptures": {
 				"1": {
 					"name": "keyword.control.export.js"
 				},
 				"2": {
-					"name": "storage.modifier.async.js"
+					"name": "storage.modifier.js"
 				},
 				"3": {
-					"name": "storage.type.function.js"
+					"name": "storage.modifier.async.js"
 				},
 				"4": {
-					"name": "keyword.generator.asterisk.js"
+					"name": "storage.type.function.js"
 				},
 				"5": {
+					"name": "keyword.generator.asterisk.js"
+				},
+				"6": {
 					"name": "meta.definition.function.js entity.name.function.js"
 				}
 			},
@@ -915,6 +1191,9 @@
 				{
 					"include": "#function-name"
 				},
+				{
+					"include": "#single-line-comment-consuming-line-ending"
+				},
 				{
 					"include": "#function-body"
 				}
@@ -951,7 +1230,7 @@
 			"patterns": [
 				{
 					"name": "meta.method.declaration.js",
-					"begin": "(?x)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(public|private|protected)\\s+)?(?:\\b(abstract)\\s+)?(?:\\b(async)\\s+)?\\b(constructor)\\b(?!:)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))",
+					"begin": "(?x)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(public|private|protected)\\s+)?(?:\\b(abstract)\\s+)?(?:\\b(async)\\s+)?\\s*\\b(constructor)\\b(?!:)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))",
 					"beginCaptures": {
 						"1": {
 							"name": "storage.modifier.js"
@@ -978,7 +1257,7 @@
 				},
 				{
 					"name": "meta.method.declaration.js",
-					"begin": "(?x)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(public|private|protected)\\s+)?(?:\\b(abstract)\\s+)?(?:\\b(async)\\s+)?(?:(?:\\b(new)\\b(?!:)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|(?:(\\*)\\s*)?)(?=\\s*[\\(\\<])",
+					"begin": "(?x)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(public|private|protected)\\s+)?(?:\\b(abstract)\\s+)?(?:\\b(async)\\s+)?(?:(?:\\s*\\b(new)\\b(?!:)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|(?:(\\*)\\s*)?)(?=\\s*[\\(\\<])",
 					"beginCaptures": {
 						"1": {
 							"name": "storage.modifier.js"
@@ -1008,7 +1287,7 @@
 				},
 				{
 					"name": "meta.method.declaration.js",
-					"begin": "(?x)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(public|private|protected)\\s+)?(?:\\b(abstract)\\s+)?(?:\\b(async)\\s+)?(?:\\b(get|set)\\s+)?(?:(\\*)\\s*)?(?=(((\\b(?<!\\$)0(x|X)[0-9a-fA-F][0-9a-fA-F_]*\\b(?!\\$))|(\\b(?<!\\$)0(b|B)[01][01_]*\\b(?!\\$))|(\\b(?<!\\$)0(o|O)?[0-7][0-7_]*\\b(?!\\$))|((?<!\\$)(?:\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)| # 1.1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*\\b)|             # 1.E+3\n  (?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)|             # .1E+3\n  (?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)|                 # 1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*\\b)|                      # 1.1\n  (?:\\b[0-9][0-9_]*(\\.)\\B)|                                  # 1.\n  (?:\\B(\\.)[0-9][0-9_]*\\b)|                                  # .1\n  (?:\\b[0-9][0-9_]*\\b(?!\\.))                                 # 1\n)(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\\\'|\\\\)*\\')|(\\\"([^\\\"\\\\]|\\\\\\\"|\\\\)*\\\")|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(\\??))\\s*[\\(\\<])",
+					"begin": "(?x)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(public|private|protected)\\s+)?(?:\\b(abstract)\\s+)?(?:\\b(async)\\s+)?(?:\\b(get|set)\\s+)?(?:(\\*)\\s*)?(?=\\s*(((\\b(?<!\\$)0(x|X)[0-9a-fA-F][0-9a-fA-F_]*\\b(?!\\$))|(\\b(?<!\\$)0(b|B)[01][01_]*\\b(?!\\$))|(\\b(?<!\\$)0(o|O)?[0-7][0-7_]*\\b(?!\\$))|((?<!\\$)(?:\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)| # 1.1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*\\b)|             # 1.E+3\n  (?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)|             # .1E+3\n  (?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)|                 # 1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*\\b)|                      # 1.1\n  (?:\\b[0-9][0-9_]*(\\.)\\B)|                                  # 1.\n  (?:\\B(\\.)[0-9][0-9_]*\\b)|                                  # .1\n  (?:\\b[0-9][0-9_]*\\b(?!\\.))                                 # 1\n)(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\\\'|\\\\)*\\')|(\\\"([^\\\"\\\\]|\\\\\\\"|\\\\)*\\\")|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(\\??))\\s*[\\(\\<])",
 					"beginCaptures": {
 						"1": {
 							"name": "storage.modifier.js"
@@ -1040,7 +1319,7 @@
 		},
 		"object-literal-method-declaration": {
 			"name": "meta.method.declaration.js",
-			"begin": "(?x)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(async)\\s+)?(?:\\b(get|set)\\s+)?(?:(\\*)\\s*)?(?=(((\\b(?<!\\$)0(x|X)[0-9a-fA-F][0-9a-fA-F_]*\\b(?!\\$))|(\\b(?<!\\$)0(b|B)[01][01_]*\\b(?!\\$))|(\\b(?<!\\$)0(o|O)?[0-7][0-7_]*\\b(?!\\$))|((?<!\\$)(?:\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)| # 1.1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*\\b)|             # 1.E+3\n  (?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)|             # .1E+3\n  (?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)|                 # 1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*\\b)|                      # 1.1\n  (?:\\b[0-9][0-9_]*(\\.)\\B)|                                  # 1.\n  (?:\\B(\\.)[0-9][0-9_]*\\b)|                                  # .1\n  (?:\\b[0-9][0-9_]*\\b(?!\\.))                                 # 1\n)(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\\\'|\\\\)*\\')|(\\\"([^\\\"\\\\]|\\\\\\\"|\\\\)*\\\")|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(\\??))\\s*[\\(\\<])",
+			"begin": "(?x)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(async)\\s+)?(?:\\b(get|set)\\s+)?(?:(\\*)\\s*)?(?=\\s*(((\\b(?<!\\$)0(x|X)[0-9a-fA-F][0-9a-fA-F_]*\\b(?!\\$))|(\\b(?<!\\$)0(b|B)[01][01_]*\\b(?!\\$))|(\\b(?<!\\$)0(o|O)?[0-7][0-7_]*\\b(?!\\$))|((?<!\\$)(?:\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)| # 1.1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*\\b)|             # 1.E+3\n  (?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)|             # .1E+3\n  (?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)|                 # 1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*\\b)|                      # 1.1\n  (?:\\b[0-9][0-9_]*(\\.)\\B)|                                  # 1.\n  (?:\\B(\\.)[0-9][0-9_]*\\b)|                                  # .1\n  (?:\\b[0-9][0-9_]*\\b(?!\\.))                                 # 1\n)(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\\\'|\\\\)*\\')|(\\\"([^\\\"\\\\]|\\\\\\\"|\\\\)*\\\")|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(\\??))\\s*[\\(\\<])",
 			"beginCaptures": {
 				"1": {
 					"name": "storage.modifier.async.js"
@@ -1061,7 +1340,7 @@
 					"include": "#function-body"
 				},
 				{
-					"begin": "(?x)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(async)\\s+)?(?:\\b(get|set)\\s+)?(?:(\\*)\\s*)?(?=(((\\b(?<!\\$)0(x|X)[0-9a-fA-F][0-9a-fA-F_]*\\b(?!\\$))|(\\b(?<!\\$)0(b|B)[01][01_]*\\b(?!\\$))|(\\b(?<!\\$)0(o|O)?[0-7][0-7_]*\\b(?!\\$))|((?<!\\$)(?:\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)| # 1.1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*\\b)|             # 1.E+3\n  (?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)|             # .1E+3\n  (?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)|                 # 1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*\\b)|                      # 1.1\n  (?:\\b[0-9][0-9_]*(\\.)\\B)|                                  # 1.\n  (?:\\B(\\.)[0-9][0-9_]*\\b)|                                  # .1\n  (?:\\b[0-9][0-9_]*\\b(?!\\.))                                 # 1\n)(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\\\'|\\\\)*\\')|(\\\"([^\\\"\\\\]|\\\\\\\"|\\\\)*\\\")|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(\\??))\\s*[\\(\\<])",
+					"begin": "(?x)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(async)\\s+)?(?:\\b(get|set)\\s+)?(?:(\\*)\\s*)?(?=\\s*(((\\b(?<!\\$)0(x|X)[0-9a-fA-F][0-9a-fA-F_]*\\b(?!\\$))|(\\b(?<!\\$)0(b|B)[01][01_]*\\b(?!\\$))|(\\b(?<!\\$)0(o|O)?[0-7][0-7_]*\\b(?!\\$))|((?<!\\$)(?:\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)| # 1.1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*\\b)|             # 1.E+3\n  (?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)|             # .1E+3\n  (?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)|                 # 1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*\\b)|                      # 1.1\n  (?:\\b[0-9][0-9_]*(\\.)\\B)|                                  # 1.\n  (?:\\B(\\.)[0-9][0-9_]*\\b)|                                  # .1\n  (?:\\b[0-9][0-9_]*\\b(?!\\.))                                 # 1\n)(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\\\'|\\\\)*\\')|(\\\"([^\\\"\\\\]|\\\\\\\"|\\\\)*\\\")|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(\\??))\\s*[\\(\\<])",
 					"beginCaptures": {
 						"1": {
 							"name": "storage.modifier.async.js"
@@ -1165,7 +1444,7 @@
 		},
 		"indexer-declaration": {
 			"name": "meta.indexer.declaration.js",
-			"begin": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(readonly)\\s*)?(\\[)\\s*([_$[:alpha:]][_$[:alnum:]]*)\\s*(?=:)",
+			"begin": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(readonly)\\s*)?\\s*(\\[)\\s*([_$[:alpha:]][_$[:alnum:]]*)\\s*(?=:)",
 			"beginCaptures": {
 				"1": {
 					"name": "storage.modifier.js"
@@ -1194,7 +1473,7 @@
 		},
 		"indexer-mapped-type-declaration": {
 			"name": "meta.indexer.mappedtype.declaration.js",
-			"begin": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))([+-])?(readonly)\\s*)?(\\[)\\s*([_$[:alpha:]][_$[:alnum:]]*)\\s+(in)\\s+",
+			"begin": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))([+-])?(readonly)\\s*)?\\s*(\\[)\\s*([_$[:alpha:]][_$[:alnum:]]*)\\s+(in)\\s+",
 			"beginCaptures": {
 				"1": {
 					"name": "keyword.operator.type.modifier.js"
@@ -1278,7 +1557,7 @@
 		},
 		"class-declaration": {
 			"name": "meta.class.js",
-			"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(export)\\s+)?\\b(?:(abstract)\\s+)?\\b(class)\\b(?=\\s+|/[/*])",
+			"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(?:(abstract)\\s+)?\\b(class)\\b(?=\\s+|/[/*])",
 			"beginCaptures": {
 				"1": {
 					"name": "keyword.control.export.js"
@@ -1287,6 +1566,9 @@
 					"name": "storage.modifier.js"
 				},
 				"3": {
+					"name": "storage.modifier.js"
+				},
+				"4": {
 					"name": "storage.type.class.js"
 				}
 			},
@@ -1338,7 +1620,7 @@
 		},
 		"interface-declaration": {
 			"name": "meta.interface.js",
-			"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(export)\\s+)?\\b(?:(abstract)\\s+)?\\b(interface)\\b(?=\\s+|/[/*])",
+			"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(?:(abstract)\\s+)?\\b(interface)\\b(?=\\s+|/[/*])",
 			"beginCaptures": {
 				"1": {
 					"name": "keyword.control.export.js"
@@ -1347,6 +1629,9 @@
 					"name": "storage.modifier.js"
 				},
 				"3": {
+					"name": "storage.modifier.js"
+				},
+				"4": {
 					"name": "storage.type.interface.js"
 				}
 			},
@@ -1500,7 +1785,7 @@
 		},
 		"enum-declaration": {
 			"name": "meta.enum.declaration.js",
-			"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:\\b(const)\\s+)?\\b(enum)\\s+([_$[:alpha:]][_$[:alnum:]]*)",
+			"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?(?:\\b(const)\\s+)?\\b(enum)\\s+([_$[:alpha:]][_$[:alnum:]]*)",
 			"beginCaptures": {
 				"1": {
 					"name": "keyword.control.export.js"
@@ -1509,9 +1794,12 @@
 					"name": "storage.modifier.js"
 				},
 				"3": {
-					"name": "storage.type.enum.js"
+					"name": "storage.modifier.js"
 				},
 				"4": {
+					"name": "storage.type.enum.js"
+				},
+				"5": {
 					"name": "entity.name.type.enum.js"
 				}
 			},
@@ -1581,16 +1869,19 @@
 		},
 		"namespace-declaration": {
 			"name": "meta.namespace.declaration.js",
-			"begin": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?\\b(namespace|module)\\s+(?=[_$[:alpha:]\"'`]))",
+			"begin": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(namespace|module)\\s+(?=[_$[:alpha:]\"'`]))",
 			"beginCaptures": {
 				"1": {
 					"name": "keyword.control.export.js"
 				},
 				"2": {
+					"name": "storage.modifier.js"
+				},
+				"3": {
 					"name": "storage.type.namespace.js"
 				}
 			},
-			"end": "(?<=\\})|(?=;|\\babstract\\b|\\basync\\b|\\bclass\\b|\\bconst\\b|\\bdeclare\\b|\\benum\\b|\\bexport\\b|\\bfunction\\b|\\bimport\\b|\\binterface\\b|\\blet\\b|\\bmodule\\b|\\bnamespace\\b|\\breturn\\b|\\btype\\b|\\bvar\\b)",
+			"end": "(?<=\\})|(?=;|(?:^\\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\\b))",
 			"patterns": [
 				{
 					"include": "#comment"
@@ -1612,19 +1903,22 @@
 		},
 		"type-alias-declaration": {
 			"name": "meta.type.declaration.js",
-			"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?\\b(type)\\b\\s+([_$[:alpha:]][_$[:alnum:]]*)\\s*",
+			"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(type)\\b\\s+([_$[:alpha:]][_$[:alnum:]]*)\\s*",
 			"beginCaptures": {
 				"1": {
 					"name": "keyword.control.export.js"
 				},
 				"2": {
-					"name": "storage.type.type.js"
+					"name": "storage.modifier.js"
 				},
 				"3": {
+					"name": "storage.type.type.js"
+				},
+				"4": {
 					"name": "entity.name.type.alias.js"
 				}
 			},
-			"end": "(?=\\}|;|\\babstract\\b|\\basync\\b|\\bclass\\b|\\bconst\\b|\\bdeclare\\b|\\benum\\b|\\bexport\\b|\\bfunction\\b|\\bimport\\b|\\binterface\\b|\\blet\\b|\\bmodule\\b|\\bnamespace\\b|\\breturn\\b|\\btype\\b|\\bvar\\b)",
+			"end": "(?=\\}|;|(?:^\\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\\b))",
 			"patterns": [
 				{
 					"include": "#comment"
@@ -1639,7 +1933,7 @@
 							"name": "keyword.operator.assignment.js"
 						}
 					},
-					"end": "(?=\\}|;|\\babstract\\b|\\basync\\b|\\bclass\\b|\\bconst\\b|\\bdeclare\\b|\\benum\\b|\\bexport\\b|\\bfunction\\b|\\bimport\\b|\\binterface\\b|\\blet\\b|\\bmodule\\b|\\bnamespace\\b|\\breturn\\b|\\btype\\b|\\bvar\\b)",
+					"end": "(?=\\}|;|(?:^\\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\\b))",
 					"patterns": [
 						{
 							"include": "#type"
@@ -1652,24 +1946,27 @@
 			"patterns": [
 				{
 					"name": "meta.import-equals.external.js",
-					"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?\\b(import)\\s+([_$[:alpha:]][_$[:alnum:]]*)\\s*(=)\\s*(require)\\s*(\\()",
+					"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(import)\\s+([_$[:alpha:]][_$[:alnum:]]*)\\s*(=)\\s*(require)\\s*(\\()",
 					"beginCaptures": {
 						"1": {
 							"name": "keyword.control.export.js"
 						},
 						"2": {
-							"name": "keyword.control.import.js"
+							"name": "storage.modifier.js"
 						},
 						"3": {
-							"name": "variable.other.readwrite.alias.js"
+							"name": "keyword.control.import.js"
 						},
 						"4": {
-							"name": "keyword.operator.assignment.js"
+							"name": "variable.other.readwrite.alias.js"
 						},
 						"5": {
-							"name": "keyword.control.require.js"
+							"name": "keyword.operator.assignment.js"
 						},
 						"6": {
+							"name": "keyword.control.require.js"
+						},
+						"7": {
 							"name": "meta.brace.round.js"
 						}
 					},
@@ -1690,18 +1987,21 @@
 				},
 				{
 					"name": "meta.import-equals.internal.js",
-					"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?\\b(import)\\s+([_$[:alpha:]][_$[:alnum:]]*)\\s*(=)\\s*(?!require\\b)",
+					"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(import)\\s+([_$[:alpha:]][_$[:alnum:]]*)\\s*(=)\\s*(?!require\\b)",
 					"beginCaptures": {
 						"1": {
 							"name": "keyword.control.export.js"
 						},
 						"2": {
-							"name": "keyword.control.import.js"
+							"name": "storage.modifier.js"
 						},
 						"3": {
-							"name": "variable.other.readwrite.alias.js"
+							"name": "keyword.control.import.js"
 						},
 						"4": {
+							"name": "variable.other.readwrite.alias.js"
+						},
+						"5": {
 							"name": "keyword.operator.assignment.js"
 						}
 					},
@@ -1734,12 +2034,15 @@
 		},
 		"import-declaration": {
 			"name": "meta.import.js",
-			"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?\\b(import)(?!\\s*[:\\(])(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))",
+			"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(import)(?!\\s*[:\\(])(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))",
 			"beginCaptures": {
 				"1": {
 					"name": "keyword.control.export.js"
 				},
 				"2": {
+					"name": "storage.modifier.js"
+				},
+				"3": {
 					"name": "keyword.control.import.js"
 				}
 			},
@@ -1803,8 +2106,11 @@
 							"name": "keyword.control.default.js"
 						}
 					},
-					"end": "(?=$|;|\\babstract\\b|\\basync\\b|\\bclass\\b|\\bconst\\b|\\bdeclare\\b|\\benum\\b|\\bexport\\b|\\bfunction\\b|\\bimport\\b|\\binterface\\b|\\blet\\b|\\bmodule\\b|\\bnamespace\\b|\\breturn\\b|\\btype\\b|\\bvar\\b)",
+					"end": "(?=$|;|(?:^\\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\\b))",
 					"patterns": [
+						{
+							"include": "#interface-declaration"
+						},
 						{
 							"include": "#expression"
 						}
@@ -1812,13 +2118,13 @@
 				},
 				{
 					"name": "meta.export.js",
-					"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(export)(?!\\s*:)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))",
+					"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(export)(?!\\s*:)((?=\\s*[\\{*])|((?=\\s*[_$[:alpha:]][_$[:alnum:]]*(\\s|,))(?!\\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\\b)))",
 					"beginCaptures": {
 						"0": {
 							"name": "keyword.control.export.js"
 						}
 					},
-					"end": "(?=$|;|\\babstract\\b|\\basync\\b|\\bclass\\b|\\bconst\\b|\\bdeclare\\b|\\benum\\b|\\bexport\\b|\\bfunction\\b|\\bimport\\b|\\binterface\\b|\\blet\\b|\\bmodule\\b|\\bnamespace\\b|\\breturn\\b|\\btype\\b|\\bvar\\b)",
+					"end": "(?=$|;|(?:^\\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\\b))",
 					"patterns": [
 						{
 							"include": "#import-export-declaration"
@@ -2163,7 +2469,7 @@
 				},
 				{
 					"name": "meta.object.member.js",
-					"match": "(?x)(?:([_$[:alpha:]][_$[:alnum:]]*)\\s*(?=:\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ([\\(]\\s*([\\{\\[]\\s*)?$) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
+					"match": "(?x)(?:([_$[:alpha:]][_$[:alnum:]]*)\\s*(?=:\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
 					"captures": {
 						"0": {
 							"name": "meta.object-literal.key.js"
@@ -2311,13 +2617,13 @@
 			]
 		},
 		"function-call": {
-			"begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*)\\s*(\\?\\.\\s*)?(<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[=]|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[=]|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>\\s*)?\\()",
-			"end": "(?<=\\))(?!(([_$[:alpha:]][_$[:alnum:]]*\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*)\\s*(\\?\\.\\s*)?(<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[=]|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[=]|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>\\s*)?\\()",
+			"begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*)\\s*(\\?\\.\\s*)?(<\\s*(((keyof|infer)\\s+)|(\\*(?=\\s*[,>]))|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer)\\s+)|(\\*(?=\\s*[,>]))|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>\\s*)?\\()",
+			"end": "(?<=\\))(?!(([_$[:alpha:]][_$[:alnum:]]*\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*)\\s*(\\?\\.\\s*)?(<\\s*(((keyof|infer)\\s+)|(\\*(?=\\s*[,>]))|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer)\\s+)|(\\*(?=\\s*[,>]))|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>\\s*)?\\()",
 			"patterns": [
 				{
 					"name": "meta.function-call.js",
 					"begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*))",
-					"end": "(?=\\s*(\\?\\.\\s*)?(<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[=]|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[=]|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>\\s*)?\\()",
+					"end": "(?=\\s*(\\?\\.\\s*)?(<\\s*(((keyof|infer)\\s+)|(\\*(?=\\s*[,>]))|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer)\\s+)|(\\*(?=\\s*[,>]))|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>\\s*)?\\()",
 					"patterns": [
 						{
 							"include": "#literal"
@@ -2408,7 +2714,7 @@
 					]
 				},
 				{
-					"begin": "(?<=[(=,]|=>)\\s*(async)?(?=\\s*((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*))?\\(\\s*$)",
+					"begin": "(?<=[(=,]|=>)\\s*(async)?(?=\\s*((((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*))?\\()|(<))\\s*$)",
 					"beginCaptures": {
 						"1": {
 							"name": "storage.modifier.async.js"
@@ -2536,11 +2842,11 @@
 				},
 				{
 					"name": "keyword.operator.expression.in.js",
-					"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))in(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))"
+					"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))in(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))(?!\\()"
 				},
 				{
 					"name": "keyword.operator.expression.of.js",
-					"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))of(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))"
+					"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))of(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))(?!\\()"
 				},
 				{
 					"name": "keyword.operator.expression.instanceof.js",
@@ -2564,7 +2870,7 @@
 							"name": "keyword.control.as.js"
 						}
 					},
-					"end": "(?=$|^|[;,:})\\]]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(as)\\s+))",
+					"end": "(?=$|^|[;,:})\\]]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(as)\\s+)|(\\s+\\<))",
 					"patterns": [
 						{
 							"include": "#type"
@@ -2663,9 +2969,9 @@
 		},
 		"array-literal": {
 			"name": "meta.array.literal.js",
-			"begin": "\\[",
+			"begin": "\\s*(\\[)",
 			"beginCaptures": {
-				"0": {
+				"1": {
 					"name": "meta.brace.square.js"
 				}
 			},
@@ -3000,7 +3306,7 @@
 					"include": "#object-identifiers"
 				},
 				{
-					"match": "(?x)(?:(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))\\s*)?([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ([\\(]\\s*([\\{\\[]\\s*)?$) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n))",
+					"match": "(?x)(?:(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))\\s*)?([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n))",
 					"captures": {
 						"1": {
 							"name": "punctuation.accessor.js"
@@ -3253,6 +3559,10 @@
 				},
 				{
 					"include": "#punctuation-comma"
+				},
+				{
+					"name": "keyword.operator.assignment.js",
+					"match": "(=)(?!>)"
 				}
 			]
 		},
@@ -3327,7 +3637,7 @@
 		},
 		"type-primitive": {
 			"name": "support.type.primitive.js",
-			"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(string|number|boolean|symbol|any|void|never)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))"
+			"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(string|number|boolean|symbol|any|void|never|unknown)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))"
 		},
 		"type-builtin-literals": {
 			"name": "support.type.builtin.js",
@@ -3467,10 +3777,57 @@
 			},
 			"patterns": [
 				{
-					"include": "#type"
+					"include": "#destructuring-parameter"
 				},
 				{
-					"include": "#function-parameters"
+					"match": "(?x)(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<!=|:)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))\\s*(\\??)(?=\\s*(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$))))",
+					"captures": {
+						"1": {
+							"name": "storage.modifier.js"
+						},
+						"2": {
+							"name": "keyword.operator.rest.js"
+						},
+						"3": {
+							"name": "entity.name.function.js variable.language.this.js"
+						},
+						"4": {
+							"name": "entity.name.function.js"
+						},
+						"5": {
+							"name": "keyword.operator.optional.js"
+						}
+					}
+				},
+				{
+					"match": "(?x)(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<!=|:)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))\\s*(\\??)(?=:)",
+					"captures": {
+						"1": {
+							"name": "storage.modifier.js"
+						},
+						"2": {
+							"name": "keyword.operator.rest.js"
+						},
+						"3": {
+							"name": "variable.parameter.js variable.language.this.js"
+						},
+						"4": {
+							"name": "variable.parameter.js"
+						},
+						"5": {
+							"name": "keyword.operator.optional.js"
+						}
+					}
+				},
+				{
+					"include": "#type-annotation"
+				},
+				{
+					"name": "punctuation.separator.parameter.js",
+					"match": ","
+				},
+				{
+					"include": "#type"
 				}
 			]
 		},
@@ -3574,13 +3931,10 @@
 					"include": "#typeof-operator"
 				},
 				{
-					"begin": "(?:([&|])|(=(?!>)))(?=\\s*\\{)",
+					"begin": "([&|\\*])(?=\\s*\\{)",
 					"beginCaptures": {
-						"1": {
+						"0": {
 							"name": "keyword.operator.type.js"
-						},
-						"2": {
-							"name": "keyword.operator.assignment.js"
 						}
 					},
 					"end": "(?<=\\})",
@@ -3591,13 +3945,10 @@
 					]
 				},
 				{
-					"begin": "([&|])|(=(?!>))",
+					"begin": "[&|\\*]",
 					"beginCaptures": {
-						"1": {
+						"0": {
 							"name": "keyword.operator.type.js"
-						},
-						"2": {
-							"name": "keyword.operator.assignment.js"
 						}
 					},
 					"end": "(?=\\S)"
@@ -3729,7 +4080,7 @@
 			"patterns": [
 				{
 					"name": "string.template.js",
-					"begin": "([_$[:alpha:]][_$[:alnum:]]*)\\s*(?=(<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[=]|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[=]|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>\\s*)`)",
+					"begin": "([_$[:alpha:]][_$[:alnum:]]*)\\s*(?=(<\\s*(((keyof|infer)\\s+)|(\\*(?=\\s*[,>]))|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer)\\s+)|(\\*(?=\\s*[,>]))|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>\\s*)`)",
 					"beginCaptures": {
 						"1": {
 							"name": "entity.name.function.tagged-template.js"
@@ -3795,7 +4146,7 @@
 			"patterns": [
 				{
 					"name": "string.regexp.js",
-					"begin": "(?<!\\+\\+|--)(?<=[=(:,\\[?+!]|^return|[^\\._$[:alnum:]]return|^case|[^\\._$[:alnum:]]case|=>|&&|\\|\\||\\*\\/)\\s*(\\/)(?![\\/*])(?=(?:[^\\/\\\\\\[]|\\\\.|\\[([^\\]\\\\]|\\\\.)+\\])+\\/(?![\\/*])[gimsuy]*(?!\\s*[a-zA-Z0-9_$]))",
+					"begin": "(?<!\\+\\+|--|})(?<=[=(:,\\[?+!]|^return|[^\\._$[:alnum:]]return|^case|[^\\._$[:alnum:]]case|=>|&&|\\|\\||\\*\\/)\\s*(\\/)(?![\\/*])(?=(?:[^\\/\\\\\\[]|\\\\.|\\[([^\\]\\\\]|\\\\.)+\\])+\\/[gimsuy]*(?!\\s*[a-zA-Z0-9_$]))",
 					"beginCaptures": {
 						"1": {
 							"name": "punctuation.definition.string.begin.js"
@@ -3818,7 +4169,7 @@
 				},
 				{
 					"name": "string.regexp.js",
-					"begin": "(?<![_$[:alnum:])\\]]|\\+\\+|--)\\/(?![\\/*])(?=(?:[^\\/\\\\\\[]|\\\\.|\\[([^\\]\\\\]|\\\\.)+\\])+\\/(?![\\/*])[gimsuy]*(?!\\s*[a-zA-Z0-9_$]))",
+					"begin": "(?<![_$[:alnum:])\\]]|\\+\\+|--|})\\/(?![\\/*])(?=(?:[^\\/\\\\\\[]|\\\\.|\\[([^\\]\\\\]|\\\\.)+\\])+\\/[gimsuy]*(?!\\s*[a-zA-Z0-9_$]))",
 					"beginCaptures": {
 						"0": {
 							"name": "punctuation.definition.string.begin.js"
@@ -4061,20 +4412,42 @@
 							"name": "punctuation.decorator.internaldeclaration.js"
 						}
 					},
-					"end": "(?=^)",
+					"end": "(?=$)",
 					"contentName": "comment.line.double-slash.js"
 				}
 			]
 		},
+		"single-line-comment-consuming-line-ending": {
+			"begin": "(^[ \\t]+)?((//)(?:\\s*((@)internal)(?=\\s|$))?)",
+			"beginCaptures": {
+				"1": {
+					"name": "punctuation.whitespace.comment.leading.js"
+				},
+				"2": {
+					"name": "comment.line.double-slash.js"
+				},
+				"3": {
+					"name": "punctuation.definition.comment.js"
+				},
+				"4": {
+					"name": "storage.type.internaldeclaration.js"
+				},
+				"5": {
+					"name": "punctuation.decorator.internaldeclaration.js"
+				}
+			},
+			"end": "(?=^)",
+			"contentName": "comment.line.double-slash.js"
+		},
 		"directives": {
 			"name": "comment.line.triple-slash.directive.js",
-			"begin": "^(///)\\s*(?=<(reference|amd-dependency|amd-module)(\\s+(path|types|no-default-lib|name)\\s*=\\s*((\\'([^\\'\\\\]|\\\\\\'|\\\\)*\\')|(\\\"([^\\\"\\\\]|\\\\\\\"|\\\\)*\\\")))+\\s*/>\\s*$)",
+			"begin": "^(///)\\s*(?=<(reference|amd-dependency|amd-module)(\\s+(path|types|no-default-lib|lib|name)\\s*=\\s*((\\'([^\\'\\\\]|\\\\\\'|\\\\)*\\')|(\\\"([^\\\"\\\\]|\\\\\\\"|\\\\)*\\\")))+\\s*/>\\s*$)",
 			"beginCaptures": {
 				"1": {
 					"name": "punctuation.definition.comment.js"
 				}
 			},
-			"end": "(?=^)",
+			"end": "(?=$)",
 			"patterns": [
 				{
 					"name": "meta.tag.js",
@@ -4096,7 +4469,7 @@
 					"patterns": [
 						{
 							"name": "entity.other.attribute-name.directive.js",
-							"match": "path|types|no-default-lib|name"
+							"match": "path|types|no-default-lib|lib|name"
 						},
 						{
 							"name": "keyword.operator.assignment.js",
@@ -4557,8 +4930,8 @@
 			]
 		},
 		"jsx-tag-without-attributes-in-expression": {
-			"begin": "(?<!\\+\\+|--)(?<=[({\\[,?=>:*]|&&|\\|\\||\\?|^return|[^\\._$[:alnum:]]return|^default|[^\\._$[:alnum:]]default|^)\\s*(?=(<)\\s*(?:([_$a-zA-Z][-$\\w.]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\\w.]*))(?<!\\.|-))?\\s*(>))",
-			"end": "(?!(<)\\s*(?:([_$a-zA-Z][-$\\w.]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\\w.]*))(?<!\\.|-))?\\s*(>))",
+			"begin": "(?<!\\+\\+|--)(?<=[({\\[,?=>:*]|&&|\\|\\||\\?|^await|[^\\._$[:alnum:]]await|^return|[^\\._$[:alnum:]]return|^default|[^\\._$[:alnum:]]default|^yield|[^\\._$[:alnum:]]yield|^)\\s*(?=(<)\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<!\\.|-))?\\s*(>))",
+			"end": "(?!(<)\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<!\\.|-))?\\s*(>))",
 			"patterns": [
 				{
 					"include": "#jsx-tag-without-attributes"
@@ -4567,8 +4940,8 @@
 		},
 		"jsx-tag-without-attributes": {
 			"name": "meta.tag.without-attributes.js",
-			"begin": "(<)\\s*(?:([_$a-zA-Z][-$\\w.]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\\w.]*))(?<!\\.|-))?\\s*(>)",
-			"end": "(</)\\s*(?:([_$a-zA-Z][-$\\w.]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\\w.]*))(?<!\\.|-))?\\s*(>)",
+			"begin": "(<)\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<!\\.|-))?\\s*(>)",
+			"end": "(</)\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<!\\.|-))?\\s*(>)",
 			"beginCaptures": {
 				"1": {
 					"name": "punctuation.definition.tag.begin.js"
@@ -4617,8 +4990,8 @@
 			]
 		},
 		"jsx-tag-in-expression": {
-			"begin": "(?x)\n  (?<!\\+\\+|--)(?<=[({\\[,?=>:*]|&&|\\|\\||\\?|^return|[^\\._$[:alnum:]]return|^default|[^\\._$[:alnum:]]default|^)\\s*\n  (?!<\\s*[_$[:alpha:]][_$[:alnum:]]*((\\s+extends\\s+[^=>])|,)) # look ahead is not type parameter of arrow\n  (?=(<)\\s*(?:([_$a-zA-Z][-$\\w.]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\\w.]*))(?<!\\.|-))(?=((<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[=]|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[=]|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>\\s*)|(\\s+))(?!\\?)|\\/?>))",
-			"end": "(?!(<)\\s*(?:([_$a-zA-Z][-$\\w.]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\\w.]*))(?<!\\.|-))(?=((<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[=]|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[=]|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>\\s*)|(\\s+))(?!\\?)|\\/?>))",
+			"begin": "(?x)\n  (?<!\\+\\+|--)(?<=[({\\[,?=>:*]|&&|\\|\\||\\?|^await|[^\\._$[:alnum:]]await|^return|[^\\._$[:alnum:]]return|^default|[^\\._$[:alnum:]]default|^yield|[^\\._$[:alnum:]]yield|^)\\s*\n  (?!<\\s*[_$[:alpha:]][_$[:alnum:]]*((\\s+extends\\s+[^=>])|,)) # look ahead is not type parameter of arrow\n  (?=(<)\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<!\\.|-))(?=((<\\s*)|(\\s+))(?!\\?)|\\/?>))",
+			"end": "(?!(<)\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<!\\.|-))(?=((<\\s*)|(\\s+))(?!\\?)|\\/?>))",
 			"patterns": [
 				{
 					"include": "#jsx-tag"
@@ -4627,8 +5000,8 @@
 		},
 		"jsx-tag": {
 			"name": "meta.tag.js",
-			"begin": "(?=(<)\\s*(?:([_$a-zA-Z][-$\\w.]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\\w.]*))(?<!\\.|-))(?=((<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[=]|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[=]|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>\\s*)|(\\s+))(?!\\?)|\\/?>))",
-			"end": "(/>)|(?:(</)\\s*(?:([_$a-zA-Z][-$\\w.]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\\w.]*))(?<!\\.|-))?\\s*(>))",
+			"begin": "(?=(<)\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<!\\.|-))(?=((<\\s*)|(\\s+))(?!\\?)|\\/?>))",
+			"end": "(/>)|(?:(</)\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<!\\.|-))?\\s*(>))",
 			"endCaptures": {
 				"1": {
 					"name": "punctuation.definition.tag.end.js"
@@ -4654,7 +5027,7 @@
 			},
 			"patterns": [
 				{
-					"begin": "(<)\\s*(?:([_$a-zA-Z][-$\\w.]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\\w.]*))(?<!\\.|-))(?=((<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[=]|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[=]|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>\\s*)|(\\s+))(?!\\?)|\\/?>)",
+					"begin": "(<)\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<!\\.|-))(?=((<\\s*)|(\\s+))(?!\\?)|\\/?>)",
 					"beginCaptures": {
 						"1": {
 							"name": "punctuation.definition.tag.begin.js"
@@ -4787,7 +5160,7 @@
 			]
 		},
 		"jsx-tag-attribute-name": {
-			"match": "(?x)\n  \\s*\n  (?:([_$a-zA-Z][-$\\w.]*)(:))?\n  ([_$a-zA-Z][-$\\w]*)\n  (?=\\s|=|/?>|/\\*|//)",
+			"match": "(?x)\n  \\s*\n  (?:([_$[:alpha:]][-_$[:alnum:].]*)(:))?\n  ([_$[:alpha:]][-_$[:alnum:]]*)\n  (?=\\s|=|/?>|/\\*|//)",
 			"captures": {
 				"1": {
 					"name": "entity.other.attribute-name.namespace.js"
diff --git a/extensions/javascript/syntaxes/JavaScriptReact.tmLanguage.json b/extensions/javascript/syntaxes/JavaScriptReact.tmLanguage.json
index 7fb037fb111..8cb16316df7 100644
--- a/extensions/javascript/syntaxes/JavaScriptReact.tmLanguage.json
+++ b/extensions/javascript/syntaxes/JavaScriptReact.tmLanguage.json
@@ -4,7 +4,7 @@
 		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
 		"Once accepted there, we are happy to receive an update request."
 	],
-	"version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/53ce68bc2e8abcfa9bce7fb555ccd60c5bacd11e",
+	"version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/67d50d27f0c459e6ccc9adc6645454ecb1c2406c",
 	"name": "JavaScript (with React support)",
 	"scopeName": "source.js.jsx",
 	"patterns": [
@@ -93,6 +93,10 @@
 				},
 				{
 					"include": "#export-declaration"
+				},
+				{
+					"name": "storage.modifier.js.jsx",
+					"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(declare|export)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))"
 				}
 			]
 		},
@@ -140,12 +144,12 @@
 					"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(with)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))"
 				},
 				{
-					"name": "keyword.other.debugger.js.jsx",
-					"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(debugger)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))"
+					"name": "keyword.control.js.jsx",
+					"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(package)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))"
 				},
 				{
-					"name": "storage.modifier.js.jsx",
-					"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(declare)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))"
+					"name": "keyword.other.debugger.js.jsx",
+					"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(debugger)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))"
 				}
 			]
 		},
@@ -281,41 +285,26 @@
 			]
 		},
 		"var-expr": {
-			"name": "meta.var.expr.js.jsx",
-			"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?\\b(var|let|const(?!\\s+enum\\b))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))",
-			"beginCaptures": {
-				"1": {
-					"name": "keyword.control.export.js.jsx"
-				},
-				"2": {
-					"name": "storage.type.js.jsx"
-				}
-			},
-			"end": "(?=$|^|;|}|(\\s+(of|in)\\s+))",
 			"patterns": [
 				{
-					"include": "#destructuring-variable"
-				},
-				{
-					"include": "#var-single-variable"
-				},
-				{
-					"include": "#variable-initializer"
-				},
-				{
-					"include": "#comment"
-				},
-				{
-					"begin": "(,)\\s*(?!\\S)",
-					"beginCaptures": {
-						"1": {
-							"name": "punctuation.separator.comma.js.jsx"
-						}
-					},
-					"end": "(?<!,)((?==|;|}|(\\s+(of|in)\\s+)|^\\s*$))|((?<=\\S)(?=\\s*$))",
+					"name": "meta.var.expr.js.jsx",
+					"begin": "(?=(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(var|let)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))",
+					"end": "(?!(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(var|let)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))((?=;|}|(\\s+(of|in)\\s+)|^\\s*$|;|(?:^\\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\\b))|((?<!^let|[^\\._$[:alnum:]]let|^var|[^\\._$[:alnum:]]var)(?=\\s*$)))",
 					"patterns": [
 						{
-							"include": "#comment"
+							"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(var|let)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*",
+							"beginCaptures": {
+								"1": {
+									"name": "keyword.control.export.js.jsx"
+								},
+								"2": {
+									"name": "storage.modifier.js.jsx"
+								},
+								"3": {
+									"name": "storage.type.js.jsx"
+								}
+							},
+							"end": "(?=\\S)"
 						},
 						{
 							"include": "#destructuring-variable"
@@ -323,13 +312,116 @@
 						{
 							"include": "#var-single-variable"
 						},
+						{
+							"include": "#variable-initializer"
+						},
+						{
+							"include": "#comment"
+						},
+						{
+							"begin": "(,)\\s*((?!\\S)|(?=\\/\\/))",
+							"beginCaptures": {
+								"1": {
+									"name": "punctuation.separator.comma.js.jsx"
+								}
+							},
+							"end": "(?<!,)(((?==|;|}|(\\s+(of|in)\\s+)|^\\s*$))|((?<=\\S)(?=\\s*$)))",
+							"patterns": [
+								{
+									"include": "#single-line-comment-consuming-line-ending"
+								},
+								{
+									"include": "#comment"
+								},
+								{
+									"include": "#destructuring-variable"
+								},
+								{
+									"include": "#var-single-variable"
+								},
+								{
+									"include": "#punctuation-comma"
+								}
+							]
+						},
 						{
 							"include": "#punctuation-comma"
 						}
 					]
 				},
 				{
-					"include": "#punctuation-comma"
+					"name": "meta.var.expr.js.jsx",
+					"begin": "(?=(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(const(?!\\s+enum\\b))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))",
+					"beginCaptures": {
+						"1": {
+							"name": "keyword.control.export.js.jsx"
+						},
+						"2": {
+							"name": "storage.modifier.js.jsx"
+						},
+						"3": {
+							"name": "storage.type.js.jsx"
+						}
+					},
+					"end": "(?!(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(const(?!\\s+enum\\b))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))((?=;|}|(\\s+(of|in)\\s+)|^\\s*$|;|(?:^\\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\\b))|((?<!^const|[^\\._$[:alnum:]]const)(?=\\s*$)))",
+					"patterns": [
+						{
+							"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(const(?!\\s+enum\\b))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*",
+							"beginCaptures": {
+								"1": {
+									"name": "keyword.control.export.js.jsx"
+								},
+								"2": {
+									"name": "storage.modifier.js.jsx"
+								},
+								"3": {
+									"name": "storage.type.js.jsx"
+								}
+							},
+							"end": "(?=\\S)"
+						},
+						{
+							"include": "#destructuring-const"
+						},
+						{
+							"include": "#var-single-const"
+						},
+						{
+							"include": "#variable-initializer"
+						},
+						{
+							"include": "#comment"
+						},
+						{
+							"begin": "(,)\\s*((?!\\S)|(?=\\/\\/))",
+							"beginCaptures": {
+								"1": {
+									"name": "punctuation.separator.comma.js.jsx"
+								}
+							},
+							"end": "(?<!,)(((?==|;|}|(\\s+(of|in)\\s+)|^\\s*$))|((?<=\\S)(?=\\s*$)))",
+							"patterns": [
+								{
+									"include": "#single-line-comment-consuming-line-ending"
+								},
+								{
+									"include": "#comment"
+								},
+								{
+									"include": "#destructuring-const"
+								},
+								{
+									"include": "#var-single-const"
+								},
+								{
+									"include": "#punctuation-comma"
+								}
+							]
+						},
+						{
+							"include": "#punctuation-comma"
+						}
+					]
 				}
 			]
 		},
@@ -337,7 +429,7 @@
 			"patterns": [
 				{
 					"name": "meta.var-single-variable.expr.js.jsx",
-					"begin": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ([\\(]\\s*([\\{\\[]\\s*)?$) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ([\\(]\\s*([\\{\\[]\\s*)?$) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
+					"begin": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$))) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
 					"beginCaptures": {
 						"1": {
 							"name": "meta.definition.variable.js.jsx entity.name.function.js.jsx"
@@ -382,6 +474,40 @@
 				}
 			]
 		},
+		"var-single-const": {
+			"patterns": [
+				{
+					"name": "meta.var-single-variable.expr.js.jsx",
+					"begin": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$))) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
+					"beginCaptures": {
+						"1": {
+							"name": "meta.definition.variable.js.jsx variable.other.constant.js.jsx entity.name.function.js.jsx"
+						}
+					},
+					"end": "(?=$|^|[;,=}]|(\\s+(of|in)\\s+))",
+					"patterns": [
+						{
+							"include": "#var-single-variable-type-annotation"
+						}
+					]
+				},
+				{
+					"name": "meta.var-single-variable.expr.js.jsx",
+					"begin": "([_$[:alpha:]][_$[:alnum:]]*)",
+					"beginCaptures": {
+						"1": {
+							"name": "meta.definition.variable.js.jsx variable.other.constant.js.jsx"
+						}
+					},
+					"end": "(?=$|^|[;,=}]|(\\s+(of|in)\\s+))",
+					"patterns": [
+						{
+							"include": "#var-single-variable-type-annotation"
+						}
+					]
+				}
+			]
+		},
 		"var-single-variable-type-annotation": {
 			"patterns": [
 				{
@@ -431,6 +557,42 @@
 				}
 			]
 		},
+		"destructuring-const": {
+			"patterns": [
+				{
+					"name": "meta.object-binding-pattern-variable.js.jsx",
+					"begin": "(?<!=|:|^of|[^\\._$[:alnum:]]of|^in|[^\\._$[:alnum:]]in)\\s*(?=\\{)",
+					"end": "(?=$|^|[;,=}]|(\\s+(of|in)\\s+))",
+					"patterns": [
+						{
+							"include": "#object-binding-pattern-const"
+						},
+						{
+							"include": "#type-annotation"
+						},
+						{
+							"include": "#comment"
+						}
+					]
+				},
+				{
+					"name": "meta.array-binding-pattern-variable.js.jsx",
+					"begin": "(?<!=|:|^of|[^\\._$[:alnum:]]of|^in|[^\\._$[:alnum:]]in)\\s*(?=\\[)",
+					"end": "(?=$|^|[;,=}]|(\\s+(of|in)\\s+))",
+					"patterns": [
+						{
+							"include": "#array-binding-pattern-const"
+						},
+						{
+							"include": "#type-annotation"
+						},
+						{
+							"include": "#comment"
+						}
+					]
+				}
+			]
+		},
 		"object-binding-element": {
 			"patterns": [
 				{
@@ -462,6 +624,37 @@
 				}
 			]
 		},
+		"object-binding-element-const": {
+			"patterns": [
+				{
+					"include": "#comment"
+				},
+				{
+					"begin": "(?x)(?=((\\b(?<!\\$)0(x|X)[0-9a-fA-F][0-9a-fA-F_]*\\b(?!\\$))|(\\b(?<!\\$)0(b|B)[01][01_]*\\b(?!\\$))|(\\b(?<!\\$)0(o|O)?[0-7][0-7_]*\\b(?!\\$))|((?<!\\$)(?:\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)| # 1.1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*\\b)|             # 1.E+3\n  (?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)|             # .1E+3\n  (?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)|                 # 1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*\\b)|                      # 1.1\n  (?:\\b[0-9][0-9_]*(\\.)\\B)|                                  # 1.\n  (?:\\B(\\.)[0-9][0-9_]*\\b)|                                  # .1\n  (?:\\b[0-9][0-9_]*\\b(?!\\.))                                 # 1\n)(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\\\'|\\\\)*\\')|(\\\"([^\\\"\\\\]|\\\\\\\"|\\\\)*\\\")|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(:))",
+					"end": "(?=,|\\})",
+					"patterns": [
+						{
+							"include": "#object-binding-element-propertyName"
+						},
+						{
+							"include": "#binding-element-const"
+						}
+					]
+				},
+				{
+					"include": "#object-binding-pattern-const"
+				},
+				{
+					"include": "#destructuring-variable-rest-const"
+				},
+				{
+					"include": "#variable-initializer"
+				},
+				{
+					"include": "#punctuation-comma"
+				}
+			]
+		},
 		"object-binding-element-propertyName": {
 			"begin": "(?x)(?=((\\b(?<!\\$)0(x|X)[0-9a-fA-F][0-9a-fA-F_]*\\b(?!\\$))|(\\b(?<!\\$)0(b|B)[01][01_]*\\b(?!\\$))|(\\b(?<!\\$)0(o|O)?[0-7][0-7_]*\\b(?!\\$))|((?<!\\$)(?:\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)| # 1.1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*\\b)|             # 1.E+3\n  (?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)|             # .1E+3\n  (?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)|                 # 1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*\\b)|                      # 1.1\n  (?:\\b[0-9][0-9_]*(\\.)\\B)|                                  # 1.\n  (?:\\B(\\.)[0-9][0-9_]*\\b)|                                  # .1\n  (?:\\b[0-9][0-9_]*\\b(?!\\.))                                 # 1\n)(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\\\'|\\\\)*\\')|(\\\"([^\\\"\\\\]|\\\\\\\"|\\\\)*\\\")|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(:))",
 			"end": "(:)",
@@ -508,6 +701,28 @@
 				}
 			]
 		},
+		"binding-element-const": {
+			"patterns": [
+				{
+					"include": "#comment"
+				},
+				{
+					"include": "#string"
+				},
+				{
+					"include": "#object-binding-pattern-const"
+				},
+				{
+					"include": "#array-binding-pattern-const"
+				},
+				{
+					"include": "#destructuring-variable-rest-const"
+				},
+				{
+					"include": "#variable-initializer"
+				}
+			]
+		},
 		"destructuring-variable-rest": {
 			"match": "(?:(\\.\\.\\.)\\s*)?([_$[:alpha:]][_$[:alnum:]]*)",
 			"captures": {
@@ -519,6 +734,17 @@
 				}
 			}
 		},
+		"destructuring-variable-rest-const": {
+			"match": "(?:(\\.\\.\\.)\\s*)?([_$[:alpha:]][_$[:alnum:]]*)",
+			"captures": {
+				"1": {
+					"name": "keyword.operator.rest.js.jsx"
+				},
+				"2": {
+					"name": "meta.definition.variable.js.jsx variable.other.constant.js.jsx"
+				}
+			}
+		},
 		"object-binding-pattern": {
 			"begin": "(?:(\\.\\.\\.)\\s*)?(\\{)",
 			"beginCaptures": {
@@ -541,6 +767,28 @@
 				}
 			]
 		},
+		"object-binding-pattern-const": {
+			"begin": "(?:(\\.\\.\\.)\\s*)?(\\{)",
+			"beginCaptures": {
+				"1": {
+					"name": "keyword.operator.rest.js.jsx"
+				},
+				"2": {
+					"name": "punctuation.definition.binding-pattern.object.js.jsx"
+				}
+			},
+			"end": "\\}",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.binding-pattern.object.js.jsx"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#object-binding-element-const"
+				}
+			]
+		},
 		"array-binding-pattern": {
 			"begin": "(?:(\\.\\.\\.)\\s*)?(\\[)",
 			"beginCaptures": {
@@ -566,6 +814,31 @@
 				}
 			]
 		},
+		"array-binding-pattern-const": {
+			"begin": "(?:(\\.\\.\\.)\\s*)?(\\[)",
+			"beginCaptures": {
+				"1": {
+					"name": "keyword.operator.rest.js.jsx"
+				},
+				"2": {
+					"name": "punctuation.definition.binding-pattern.array.js.jsx"
+				}
+			},
+			"end": "\\]",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.binding-pattern.array.js.jsx"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#binding-element-const"
+				},
+				{
+					"include": "#punctuation-comma"
+				}
+			]
+		},
 		"parameter-name": {
 			"patterns": [
 				{
@@ -577,7 +850,7 @@
 					}
 				},
 				{
-					"match": "(?x)(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<!=|:)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*(\\??)(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ([\\(]\\s*([\\{\\[]\\s*)?$) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ([\\(]\\s*([\\{\\[]\\s*)?$) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
+					"match": "(?x)(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<!=|:)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*(\\??)(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$))) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
 					"captures": {
 						"1": {
 							"name": "storage.modifier.js.jsx"
@@ -622,9 +895,12 @@
 			"patterns": [
 				{
 					"name": "meta.parameter.object-binding-pattern.js.jsx",
-					"begin": "(?<!=|:)\\s*(\\{)",
+					"begin": "(?<!=|:)\\s*(?:(\\.\\.\\.)\\s*)?(\\{)",
 					"beginCaptures": {
 						"1": {
+							"name": "keyword.operator.rest.js.jsx"
+						},
+						"2": {
 							"name": "punctuation.definition.binding-pattern.object.js.jsx"
 						}
 					},
@@ -642,9 +918,12 @@
 				},
 				{
 					"name": "meta.paramter.array-binding-pattern.js.jsx",
-					"begin": "(?<!=|:)\\s*(\\[)",
+					"begin": "(?<!=|:)\\s*(?:(\\.\\.\\.)\\s*)?(\\[)",
 					"beginCaptures": {
 						"1": {
+							"name": "keyword.operator.rest.js.jsx"
+						},
+						"2": {
 							"name": "punctuation.definition.binding-pattern.array.js.jsx"
 						}
 					},
@@ -778,56 +1057,50 @@
 		},
 		"field-declaration": {
 			"name": "meta.field.declaration.js.jsx",
-			"begin": "(?x)(?<!\\()(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(readonly)\\s+)?(?=((\\b(?<!\\$)0(x|X)[0-9a-fA-F][0-9a-fA-F_]*\\b(?!\\$))|(\\b(?<!\\$)0(b|B)[01][01_]*\\b(?!\\$))|(\\b(?<!\\$)0(o|O)?[0-7][0-7_]*\\b(?!\\$))|((?<!\\$)(?:\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)| # 1.1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*\\b)|             # 1.E+3\n  (?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)|             # .1E+3\n  (?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)|                 # 1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*\\b)|                      # 1.1\n  (?:\\b[0-9][0-9_]*(\\.)\\B)|                                  # 1.\n  (?:\\B(\\.)[0-9][0-9_]*\\b)|                                  # .1\n  (?:\\b[0-9][0-9_]*\\b(?!\\.))                                 # 1\n)(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\\\'|\\\\)*\\')|(\\\"([^\\\"\\\\]|\\\\\\\"|\\\\)*\\\")|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(\\?\\s*)?(=|:))",
+			"begin": "(?x)(?<!\\()(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(readonly)\\s+)?(?=\\s*((\\b(?<!\\$)0(x|X)[0-9a-fA-F][0-9a-fA-F_]*\\b(?!\\$))|(\\b(?<!\\$)0(b|B)[01][01_]*\\b(?!\\$))|(\\b(?<!\\$)0(o|O)?[0-7][0-7_]*\\b(?!\\$))|((?<!\\$)(?:\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)| # 1.1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*\\b)|             # 1.E+3\n  (?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)|             # .1E+3\n  (?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)|                 # 1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*\\b)|                      # 1.1\n  (?:\\b[0-9][0-9_]*(\\.)\\B)|                                  # 1.\n  (?:\\B(\\.)[0-9][0-9_]*\\b)|                                  # .1\n  (?:\\b[0-9][0-9_]*\\b(?!\\.))                                 # 1\n)(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\\\'|\\\\)*\\')|(\\\"([^\\\"\\\\]|\\\\\\\"|\\\\)*\\\")|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(\\?\\s*)?(=|:|;|,|$))",
 			"beginCaptures": {
 				"1": {
 					"name": "storage.modifier.js.jsx"
 				}
 			},
-			"end": "(?x)(?=\\}|;|,|$|(^(?!((\\b(?<!\\$)0(x|X)[0-9a-fA-F][0-9a-fA-F_]*\\b(?!\\$))|(\\b(?<!\\$)0(b|B)[01][01_]*\\b(?!\\$))|(\\b(?<!\\$)0(o|O)?[0-7][0-7_]*\\b(?!\\$))|((?<!\\$)(?:\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)| # 1.1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*\\b)|             # 1.E+3\n  (?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)|             # .1E+3\n  (?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)|                 # 1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*\\b)|                      # 1.1\n  (?:\\b[0-9][0-9_]*(\\.)\\B)|                                  # 1.\n  (?:\\B(\\.)[0-9][0-9_]*\\b)|                                  # .1\n  (?:\\b[0-9][0-9_]*\\b(?!\\.))                                 # 1\n)(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\\\'|\\\\)*\\')|(\\\"([^\\\"\\\\]|\\\\\\\"|\\\\)*\\\")|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(\\?\\s*)?(=|:))))|(?<=\\})",
+			"end": "(?x)(?=\\}|;|,|$|(^(?!\\s*((\\b(?<!\\$)0(x|X)[0-9a-fA-F][0-9a-fA-F_]*\\b(?!\\$))|(\\b(?<!\\$)0(b|B)[01][01_]*\\b(?!\\$))|(\\b(?<!\\$)0(o|O)?[0-7][0-7_]*\\b(?!\\$))|((?<!\\$)(?:\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)| # 1.1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*\\b)|             # 1.E+3\n  (?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)|             # .1E+3\n  (?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)|                 # 1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*\\b)|                      # 1.1\n  (?:\\b[0-9][0-9_]*(\\.)\\B)|                                  # 1.\n  (?:\\B(\\.)[0-9][0-9_]*\\b)|                                  # .1\n  (?:\\b[0-9][0-9_]*\\b(?!\\.))                                 # 1\n)(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\\\'|\\\\)*\\')|(\\\"([^\\\"\\\\]|\\\\\\\"|\\\\)*\\\")|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(\\?\\s*)?(=|:|;|,|$))))|(?<=\\})",
 			"patterns": [
 				{
 					"include": "#variable-initializer"
 				},
 				{
-					"begin": "(?x)(?=((\\b(?<!\\$)0(x|X)[0-9a-fA-F][0-9a-fA-F_]*\\b(?!\\$))|(\\b(?<!\\$)0(b|B)[01][01_]*\\b(?!\\$))|(\\b(?<!\\$)0(o|O)?[0-7][0-7_]*\\b(?!\\$))|((?<!\\$)(?:\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)| # 1.1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*\\b)|             # 1.E+3\n  (?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)|             # .1E+3\n  (?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)|                 # 1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*\\b)|                      # 1.1\n  (?:\\b[0-9][0-9_]*(\\.)\\B)|                                  # 1.\n  (?:\\B(\\.)[0-9][0-9_]*\\b)|                                  # .1\n  (?:\\b[0-9][0-9_]*\\b(?!\\.))                                 # 1\n)(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\\\'|\\\\)*\\')|(\\\"([^\\\"\\\\]|\\\\\\\"|\\\\)*\\\")|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(\\?\\s*)?(=|:))",
-					"end": "(?x)(?=[};,=]|$|(^(?!((\\b(?<!\\$)0(x|X)[0-9a-fA-F][0-9a-fA-F_]*\\b(?!\\$))|(\\b(?<!\\$)0(b|B)[01][01_]*\\b(?!\\$))|(\\b(?<!\\$)0(o|O)?[0-7][0-7_]*\\b(?!\\$))|((?<!\\$)(?:\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)| # 1.1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*\\b)|             # 1.E+3\n  (?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)|             # .1E+3\n  (?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)|                 # 1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*\\b)|                      # 1.1\n  (?:\\b[0-9][0-9_]*(\\.)\\B)|                                  # 1.\n  (?:\\B(\\.)[0-9][0-9_]*\\b)|                                  # .1\n  (?:\\b[0-9][0-9_]*\\b(?!\\.))                                 # 1\n)(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\\\'|\\\\)*\\')|(\\\"([^\\\"\\\\]|\\\\\\\"|\\\\)*\\\")|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(\\?\\s*)?(=|:))))|(?<=\\})",
-					"patterns": [
-						{
-							"include": "#type-annotation"
+					"include": "#type-annotation"
+				},
+				{
+					"include": "#string"
+				},
+				{
+					"include": "#array-literal"
+				},
+				{
+					"include": "#numeric-literal"
+				},
+				{
+					"include": "#comment"
+				},
+				{
+					"match": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(\\?)?(?=(\\?\\s*)?\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$))) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
+					"captures": {
+						"1": {
+							"name": "meta.definition.property.js.jsx entity.name.function.js.jsx"
 						},
-						{
-							"include": "#string"
-						},
-						{
-							"include": "#array-literal"
-						},
-						{
-							"include": "#numeric-literal"
-						},
-						{
-							"include": "#comment"
-						},
-						{
-							"match": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(\\?)?(?=(\\?\\s*)?\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ([\\(]\\s*([\\{\\[]\\s*)?$) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ([\\(]\\s*([\\{\\[]\\s*)?$) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
-							"captures": {
-								"1": {
-									"name": "meta.definition.property.js.jsx entity.name.function.js.jsx"
-								},
-								"2": {
-									"name": "keyword.operator.optional.js.jsx"
-								}
-							}
-						},
-						{
-							"name": "meta.definition.property.js.jsx variable.object.property.js.jsx",
-							"match": "[_$[:alpha:]][_$[:alnum:]]*"
-						},
-						{
-							"name": "keyword.operator.optional.js.jsx",
-							"match": "\\?"
+						"2": {
+							"name": "keyword.operator.optional.js.jsx"
 						}
-					]
+					}
+				},
+				{
+					"name": "meta.definition.property.js.jsx variable.object.property.js.jsx",
+					"match": "[_$[:alpha:]][_$[:alnum:]]*"
+				},
+				{
+					"name": "keyword.operator.optional.js.jsx",
+					"match": "\\?"
 				}
 			]
 		},
@@ -865,21 +1138,24 @@
 		},
 		"function-declaration": {
 			"name": "meta.function.js.jsx",
-			"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(export)\\s+)?(?:(async)\\s+)?(function\\b)(?:\\s*(\\*))?(?:(?:\\s+|(?<=\\*))([_$[:alpha:]][_$[:alnum:]]*))?\\s*",
+			"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?(?:(async)\\s+)?(function\\b)(?:\\s*(\\*))?(?:(?:\\s+|(?<=\\*))([_$[:alpha:]][_$[:alnum:]]*))?\\s*",
 			"beginCaptures": {
 				"1": {
 					"name": "keyword.control.export.js.jsx"
 				},
 				"2": {
-					"name": "storage.modifier.async.js.jsx"
+					"name": "storage.modifier.js.jsx"
 				},
 				"3": {
-					"name": "storage.type.function.js.jsx"
+					"name": "storage.modifier.async.js.jsx"
 				},
 				"4": {
-					"name": "keyword.generator.asterisk.js.jsx"
+					"name": "storage.type.function.js.jsx"
 				},
 				"5": {
+					"name": "keyword.generator.asterisk.js.jsx"
+				},
+				"6": {
 					"name": "meta.definition.function.js.jsx entity.name.function.js.jsx"
 				}
 			},
@@ -915,6 +1191,9 @@
 				{
 					"include": "#function-name"
 				},
+				{
+					"include": "#single-line-comment-consuming-line-ending"
+				},
 				{
 					"include": "#function-body"
 				}
@@ -951,7 +1230,7 @@
 			"patterns": [
 				{
 					"name": "meta.method.declaration.js.jsx",
-					"begin": "(?x)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(public|private|protected)\\s+)?(?:\\b(abstract)\\s+)?(?:\\b(async)\\s+)?\\b(constructor)\\b(?!:)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))",
+					"begin": "(?x)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(public|private|protected)\\s+)?(?:\\b(abstract)\\s+)?(?:\\b(async)\\s+)?\\s*\\b(constructor)\\b(?!:)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))",
 					"beginCaptures": {
 						"1": {
 							"name": "storage.modifier.js.jsx"
@@ -978,7 +1257,7 @@
 				},
 				{
 					"name": "meta.method.declaration.js.jsx",
-					"begin": "(?x)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(public|private|protected)\\s+)?(?:\\b(abstract)\\s+)?(?:\\b(async)\\s+)?(?:(?:\\b(new)\\b(?!:)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|(?:(\\*)\\s*)?)(?=\\s*[\\(\\<])",
+					"begin": "(?x)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(public|private|protected)\\s+)?(?:\\b(abstract)\\s+)?(?:\\b(async)\\s+)?(?:(?:\\s*\\b(new)\\b(?!:)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|(?:(\\*)\\s*)?)(?=\\s*[\\(\\<])",
 					"beginCaptures": {
 						"1": {
 							"name": "storage.modifier.js.jsx"
@@ -1008,7 +1287,7 @@
 				},
 				{
 					"name": "meta.method.declaration.js.jsx",
-					"begin": "(?x)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(public|private|protected)\\s+)?(?:\\b(abstract)\\s+)?(?:\\b(async)\\s+)?(?:\\b(get|set)\\s+)?(?:(\\*)\\s*)?(?=(((\\b(?<!\\$)0(x|X)[0-9a-fA-F][0-9a-fA-F_]*\\b(?!\\$))|(\\b(?<!\\$)0(b|B)[01][01_]*\\b(?!\\$))|(\\b(?<!\\$)0(o|O)?[0-7][0-7_]*\\b(?!\\$))|((?<!\\$)(?:\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)| # 1.1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*\\b)|             # 1.E+3\n  (?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)|             # .1E+3\n  (?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)|                 # 1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*\\b)|                      # 1.1\n  (?:\\b[0-9][0-9_]*(\\.)\\B)|                                  # 1.\n  (?:\\B(\\.)[0-9][0-9_]*\\b)|                                  # .1\n  (?:\\b[0-9][0-9_]*\\b(?!\\.))                                 # 1\n)(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\\\'|\\\\)*\\')|(\\\"([^\\\"\\\\]|\\\\\\\"|\\\\)*\\\")|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(\\??))\\s*[\\(\\<])",
+					"begin": "(?x)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(public|private|protected)\\s+)?(?:\\b(abstract)\\s+)?(?:\\b(async)\\s+)?(?:\\b(get|set)\\s+)?(?:(\\*)\\s*)?(?=\\s*(((\\b(?<!\\$)0(x|X)[0-9a-fA-F][0-9a-fA-F_]*\\b(?!\\$))|(\\b(?<!\\$)0(b|B)[01][01_]*\\b(?!\\$))|(\\b(?<!\\$)0(o|O)?[0-7][0-7_]*\\b(?!\\$))|((?<!\\$)(?:\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)| # 1.1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*\\b)|             # 1.E+3\n  (?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)|             # .1E+3\n  (?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)|                 # 1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*\\b)|                      # 1.1\n  (?:\\b[0-9][0-9_]*(\\.)\\B)|                                  # 1.\n  (?:\\B(\\.)[0-9][0-9_]*\\b)|                                  # .1\n  (?:\\b[0-9][0-9_]*\\b(?!\\.))                                 # 1\n)(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\\\'|\\\\)*\\')|(\\\"([^\\\"\\\\]|\\\\\\\"|\\\\)*\\\")|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(\\??))\\s*[\\(\\<])",
 					"beginCaptures": {
 						"1": {
 							"name": "storage.modifier.js.jsx"
@@ -1040,7 +1319,7 @@
 		},
 		"object-literal-method-declaration": {
 			"name": "meta.method.declaration.js.jsx",
-			"begin": "(?x)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(async)\\s+)?(?:\\b(get|set)\\s+)?(?:(\\*)\\s*)?(?=(((\\b(?<!\\$)0(x|X)[0-9a-fA-F][0-9a-fA-F_]*\\b(?!\\$))|(\\b(?<!\\$)0(b|B)[01][01_]*\\b(?!\\$))|(\\b(?<!\\$)0(o|O)?[0-7][0-7_]*\\b(?!\\$))|((?<!\\$)(?:\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)| # 1.1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*\\b)|             # 1.E+3\n  (?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)|             # .1E+3\n  (?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)|                 # 1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*\\b)|                      # 1.1\n  (?:\\b[0-9][0-9_]*(\\.)\\B)|                                  # 1.\n  (?:\\B(\\.)[0-9][0-9_]*\\b)|                                  # .1\n  (?:\\b[0-9][0-9_]*\\b(?!\\.))                                 # 1\n)(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\\\'|\\\\)*\\')|(\\\"([^\\\"\\\\]|\\\\\\\"|\\\\)*\\\")|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(\\??))\\s*[\\(\\<])",
+			"begin": "(?x)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(async)\\s+)?(?:\\b(get|set)\\s+)?(?:(\\*)\\s*)?(?=\\s*(((\\b(?<!\\$)0(x|X)[0-9a-fA-F][0-9a-fA-F_]*\\b(?!\\$))|(\\b(?<!\\$)0(b|B)[01][01_]*\\b(?!\\$))|(\\b(?<!\\$)0(o|O)?[0-7][0-7_]*\\b(?!\\$))|((?<!\\$)(?:\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)| # 1.1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*\\b)|             # 1.E+3\n  (?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)|             # .1E+3\n  (?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)|                 # 1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*\\b)|                      # 1.1\n  (?:\\b[0-9][0-9_]*(\\.)\\B)|                                  # 1.\n  (?:\\B(\\.)[0-9][0-9_]*\\b)|                                  # .1\n  (?:\\b[0-9][0-9_]*\\b(?!\\.))                                 # 1\n)(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\\\'|\\\\)*\\')|(\\\"([^\\\"\\\\]|\\\\\\\"|\\\\)*\\\")|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(\\??))\\s*[\\(\\<])",
 			"beginCaptures": {
 				"1": {
 					"name": "storage.modifier.async.js.jsx"
@@ -1061,7 +1340,7 @@
 					"include": "#function-body"
 				},
 				{
-					"begin": "(?x)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(async)\\s+)?(?:\\b(get|set)\\s+)?(?:(\\*)\\s*)?(?=(((\\b(?<!\\$)0(x|X)[0-9a-fA-F][0-9a-fA-F_]*\\b(?!\\$))|(\\b(?<!\\$)0(b|B)[01][01_]*\\b(?!\\$))|(\\b(?<!\\$)0(o|O)?[0-7][0-7_]*\\b(?!\\$))|((?<!\\$)(?:\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)| # 1.1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*\\b)|             # 1.E+3\n  (?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)|             # .1E+3\n  (?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)|                 # 1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*\\b)|                      # 1.1\n  (?:\\b[0-9][0-9_]*(\\.)\\B)|                                  # 1.\n  (?:\\B(\\.)[0-9][0-9_]*\\b)|                                  # .1\n  (?:\\b[0-9][0-9_]*\\b(?!\\.))                                 # 1\n)(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\\\'|\\\\)*\\')|(\\\"([^\\\"\\\\]|\\\\\\\"|\\\\)*\\\")|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(\\??))\\s*[\\(\\<])",
+					"begin": "(?x)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(async)\\s+)?(?:\\b(get|set)\\s+)?(?:(\\*)\\s*)?(?=\\s*(((\\b(?<!\\$)0(x|X)[0-9a-fA-F][0-9a-fA-F_]*\\b(?!\\$))|(\\b(?<!\\$)0(b|B)[01][01_]*\\b(?!\\$))|(\\b(?<!\\$)0(o|O)?[0-7][0-7_]*\\b(?!\\$))|((?<!\\$)(?:\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)| # 1.1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*\\b)|             # 1.E+3\n  (?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)|             # .1E+3\n  (?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)|                 # 1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*\\b)|                      # 1.1\n  (?:\\b[0-9][0-9_]*(\\.)\\B)|                                  # 1.\n  (?:\\B(\\.)[0-9][0-9_]*\\b)|                                  # .1\n  (?:\\b[0-9][0-9_]*\\b(?!\\.))                                 # 1\n)(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\\\'|\\\\)*\\')|(\\\"([^\\\"\\\\]|\\\\\\\"|\\\\)*\\\")|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(\\??))\\s*[\\(\\<])",
 					"beginCaptures": {
 						"1": {
 							"name": "storage.modifier.async.js.jsx"
@@ -1165,7 +1444,7 @@
 		},
 		"indexer-declaration": {
 			"name": "meta.indexer.declaration.js.jsx",
-			"begin": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(readonly)\\s*)?(\\[)\\s*([_$[:alpha:]][_$[:alnum:]]*)\\s*(?=:)",
+			"begin": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(readonly)\\s*)?\\s*(\\[)\\s*([_$[:alpha:]][_$[:alnum:]]*)\\s*(?=:)",
 			"beginCaptures": {
 				"1": {
 					"name": "storage.modifier.js.jsx"
@@ -1194,7 +1473,7 @@
 		},
 		"indexer-mapped-type-declaration": {
 			"name": "meta.indexer.mappedtype.declaration.js.jsx",
-			"begin": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))([+-])?(readonly)\\s*)?(\\[)\\s*([_$[:alpha:]][_$[:alnum:]]*)\\s+(in)\\s+",
+			"begin": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))([+-])?(readonly)\\s*)?\\s*(\\[)\\s*([_$[:alpha:]][_$[:alnum:]]*)\\s+(in)\\s+",
 			"beginCaptures": {
 				"1": {
 					"name": "keyword.operator.type.modifier.js.jsx"
@@ -1278,7 +1557,7 @@
 		},
 		"class-declaration": {
 			"name": "meta.class.js.jsx",
-			"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(export)\\s+)?\\b(?:(abstract)\\s+)?\\b(class)\\b(?=\\s+|/[/*])",
+			"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(?:(abstract)\\s+)?\\b(class)\\b(?=\\s+|/[/*])",
 			"beginCaptures": {
 				"1": {
 					"name": "keyword.control.export.js.jsx"
@@ -1287,6 +1566,9 @@
 					"name": "storage.modifier.js.jsx"
 				},
 				"3": {
+					"name": "storage.modifier.js.jsx"
+				},
+				"4": {
 					"name": "storage.type.class.js.jsx"
 				}
 			},
@@ -1338,7 +1620,7 @@
 		},
 		"interface-declaration": {
 			"name": "meta.interface.js.jsx",
-			"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(export)\\s+)?\\b(?:(abstract)\\s+)?\\b(interface)\\b(?=\\s+|/[/*])",
+			"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(?:(abstract)\\s+)?\\b(interface)\\b(?=\\s+|/[/*])",
 			"beginCaptures": {
 				"1": {
 					"name": "keyword.control.export.js.jsx"
@@ -1347,6 +1629,9 @@
 					"name": "storage.modifier.js.jsx"
 				},
 				"3": {
+					"name": "storage.modifier.js.jsx"
+				},
+				"4": {
 					"name": "storage.type.interface.js.jsx"
 				}
 			},
@@ -1500,7 +1785,7 @@
 		},
 		"enum-declaration": {
 			"name": "meta.enum.declaration.js.jsx",
-			"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:\\b(const)\\s+)?\\b(enum)\\s+([_$[:alpha:]][_$[:alnum:]]*)",
+			"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?(?:\\b(const)\\s+)?\\b(enum)\\s+([_$[:alpha:]][_$[:alnum:]]*)",
 			"beginCaptures": {
 				"1": {
 					"name": "keyword.control.export.js.jsx"
@@ -1509,9 +1794,12 @@
 					"name": "storage.modifier.js.jsx"
 				},
 				"3": {
-					"name": "storage.type.enum.js.jsx"
+					"name": "storage.modifier.js.jsx"
 				},
 				"4": {
+					"name": "storage.type.enum.js.jsx"
+				},
+				"5": {
 					"name": "entity.name.type.enum.js.jsx"
 				}
 			},
@@ -1581,16 +1869,19 @@
 		},
 		"namespace-declaration": {
 			"name": "meta.namespace.declaration.js.jsx",
-			"begin": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?\\b(namespace|module)\\s+(?=[_$[:alpha:]\"'`]))",
+			"begin": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(namespace|module)\\s+(?=[_$[:alpha:]\"'`]))",
 			"beginCaptures": {
 				"1": {
 					"name": "keyword.control.export.js.jsx"
 				},
 				"2": {
+					"name": "storage.modifier.js.jsx"
+				},
+				"3": {
 					"name": "storage.type.namespace.js.jsx"
 				}
 			},
-			"end": "(?<=\\})|(?=;|\\babstract\\b|\\basync\\b|\\bclass\\b|\\bconst\\b|\\bdeclare\\b|\\benum\\b|\\bexport\\b|\\bfunction\\b|\\bimport\\b|\\binterface\\b|\\blet\\b|\\bmodule\\b|\\bnamespace\\b|\\breturn\\b|\\btype\\b|\\bvar\\b)",
+			"end": "(?<=\\})|(?=;|(?:^\\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\\b))",
 			"patterns": [
 				{
 					"include": "#comment"
@@ -1612,19 +1903,22 @@
 		},
 		"type-alias-declaration": {
 			"name": "meta.type.declaration.js.jsx",
-			"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?\\b(type)\\b\\s+([_$[:alpha:]][_$[:alnum:]]*)\\s*",
+			"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(type)\\b\\s+([_$[:alpha:]][_$[:alnum:]]*)\\s*",
 			"beginCaptures": {
 				"1": {
 					"name": "keyword.control.export.js.jsx"
 				},
 				"2": {
-					"name": "storage.type.type.js.jsx"
+					"name": "storage.modifier.js.jsx"
 				},
 				"3": {
+					"name": "storage.type.type.js.jsx"
+				},
+				"4": {
 					"name": "entity.name.type.alias.js.jsx"
 				}
 			},
-			"end": "(?=\\}|;|\\babstract\\b|\\basync\\b|\\bclass\\b|\\bconst\\b|\\bdeclare\\b|\\benum\\b|\\bexport\\b|\\bfunction\\b|\\bimport\\b|\\binterface\\b|\\blet\\b|\\bmodule\\b|\\bnamespace\\b|\\breturn\\b|\\btype\\b|\\bvar\\b)",
+			"end": "(?=\\}|;|(?:^\\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\\b))",
 			"patterns": [
 				{
 					"include": "#comment"
@@ -1639,7 +1933,7 @@
 							"name": "keyword.operator.assignment.js.jsx"
 						}
 					},
-					"end": "(?=\\}|;|\\babstract\\b|\\basync\\b|\\bclass\\b|\\bconst\\b|\\bdeclare\\b|\\benum\\b|\\bexport\\b|\\bfunction\\b|\\bimport\\b|\\binterface\\b|\\blet\\b|\\bmodule\\b|\\bnamespace\\b|\\breturn\\b|\\btype\\b|\\bvar\\b)",
+					"end": "(?=\\}|;|(?:^\\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\\b))",
 					"patterns": [
 						{
 							"include": "#type"
@@ -1652,24 +1946,27 @@
 			"patterns": [
 				{
 					"name": "meta.import-equals.external.js.jsx",
-					"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?\\b(import)\\s+([_$[:alpha:]][_$[:alnum:]]*)\\s*(=)\\s*(require)\\s*(\\()",
+					"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(import)\\s+([_$[:alpha:]][_$[:alnum:]]*)\\s*(=)\\s*(require)\\s*(\\()",
 					"beginCaptures": {
 						"1": {
 							"name": "keyword.control.export.js.jsx"
 						},
 						"2": {
-							"name": "keyword.control.import.js.jsx"
+							"name": "storage.modifier.js.jsx"
 						},
 						"3": {
-							"name": "variable.other.readwrite.alias.js.jsx"
+							"name": "keyword.control.import.js.jsx"
 						},
 						"4": {
-							"name": "keyword.operator.assignment.js.jsx"
+							"name": "variable.other.readwrite.alias.js.jsx"
 						},
 						"5": {
-							"name": "keyword.control.require.js.jsx"
+							"name": "keyword.operator.assignment.js.jsx"
 						},
 						"6": {
+							"name": "keyword.control.require.js.jsx"
+						},
+						"7": {
 							"name": "meta.brace.round.js.jsx"
 						}
 					},
@@ -1690,18 +1987,21 @@
 				},
 				{
 					"name": "meta.import-equals.internal.js.jsx",
-					"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?\\b(import)\\s+([_$[:alpha:]][_$[:alnum:]]*)\\s*(=)\\s*(?!require\\b)",
+					"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(import)\\s+([_$[:alpha:]][_$[:alnum:]]*)\\s*(=)\\s*(?!require\\b)",
 					"beginCaptures": {
 						"1": {
 							"name": "keyword.control.export.js.jsx"
 						},
 						"2": {
-							"name": "keyword.control.import.js.jsx"
+							"name": "storage.modifier.js.jsx"
 						},
 						"3": {
-							"name": "variable.other.readwrite.alias.js.jsx"
+							"name": "keyword.control.import.js.jsx"
 						},
 						"4": {
+							"name": "variable.other.readwrite.alias.js.jsx"
+						},
+						"5": {
 							"name": "keyword.operator.assignment.js.jsx"
 						}
 					},
@@ -1734,12 +2034,15 @@
 		},
 		"import-declaration": {
 			"name": "meta.import.js.jsx",
-			"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?\\b(import)(?!\\s*[:\\(])(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))",
+			"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(import)(?!\\s*[:\\(])(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))",
 			"beginCaptures": {
 				"1": {
 					"name": "keyword.control.export.js.jsx"
 				},
 				"2": {
+					"name": "storage.modifier.js.jsx"
+				},
+				"3": {
 					"name": "keyword.control.import.js.jsx"
 				}
 			},
@@ -1803,8 +2106,11 @@
 							"name": "keyword.control.default.js.jsx"
 						}
 					},
-					"end": "(?=$|;|\\babstract\\b|\\basync\\b|\\bclass\\b|\\bconst\\b|\\bdeclare\\b|\\benum\\b|\\bexport\\b|\\bfunction\\b|\\bimport\\b|\\binterface\\b|\\blet\\b|\\bmodule\\b|\\bnamespace\\b|\\breturn\\b|\\btype\\b|\\bvar\\b)",
+					"end": "(?=$|;|(?:^\\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\\b))",
 					"patterns": [
+						{
+							"include": "#interface-declaration"
+						},
 						{
 							"include": "#expression"
 						}
@@ -1812,13 +2118,13 @@
 				},
 				{
 					"name": "meta.export.js.jsx",
-					"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(export)(?!\\s*:)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))",
+					"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(export)(?!\\s*:)((?=\\s*[\\{*])|((?=\\s*[_$[:alpha:]][_$[:alnum:]]*(\\s|,))(?!\\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\\b)))",
 					"beginCaptures": {
 						"0": {
 							"name": "keyword.control.export.js.jsx"
 						}
 					},
-					"end": "(?=$|;|\\babstract\\b|\\basync\\b|\\bclass\\b|\\bconst\\b|\\bdeclare\\b|\\benum\\b|\\bexport\\b|\\bfunction\\b|\\bimport\\b|\\binterface\\b|\\blet\\b|\\bmodule\\b|\\bnamespace\\b|\\breturn\\b|\\btype\\b|\\bvar\\b)",
+					"end": "(?=$|;|(?:^\\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\\b))",
 					"patterns": [
 						{
 							"include": "#import-export-declaration"
@@ -2163,7 +2469,7 @@
 				},
 				{
 					"name": "meta.object.member.js.jsx",
-					"match": "(?x)(?:([_$[:alpha:]][_$[:alnum:]]*)\\s*(?=:\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ([\\(]\\s*([\\{\\[]\\s*)?$) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
+					"match": "(?x)(?:([_$[:alpha:]][_$[:alnum:]]*)\\s*(?=:\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
 					"captures": {
 						"0": {
 							"name": "meta.object-literal.key.js.jsx"
@@ -2311,13 +2617,13 @@
 			]
 		},
 		"function-call": {
-			"begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*)\\s*(\\?\\.\\s*)?(<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[=]|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[=]|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>\\s*)?\\()",
-			"end": "(?<=\\))(?!(([_$[:alpha:]][_$[:alnum:]]*\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*)\\s*(\\?\\.\\s*)?(<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[=]|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[=]|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>\\s*)?\\()",
+			"begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*)\\s*(\\?\\.\\s*)?(<\\s*(((keyof|infer)\\s+)|(\\*(?=\\s*[,>]))|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer)\\s+)|(\\*(?=\\s*[,>]))|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>\\s*)?\\()",
+			"end": "(?<=\\))(?!(([_$[:alpha:]][_$[:alnum:]]*\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*)\\s*(\\?\\.\\s*)?(<\\s*(((keyof|infer)\\s+)|(\\*(?=\\s*[,>]))|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer)\\s+)|(\\*(?=\\s*[,>]))|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>\\s*)?\\()",
 			"patterns": [
 				{
 					"name": "meta.function-call.js.jsx",
 					"begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*))",
-					"end": "(?=\\s*(\\?\\.\\s*)?(<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[=]|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[=]|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>\\s*)?\\()",
+					"end": "(?=\\s*(\\?\\.\\s*)?(<\\s*(((keyof|infer)\\s+)|(\\*(?=\\s*[,>]))|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer)\\s+)|(\\*(?=\\s*[,>]))|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>\\s*)?\\()",
 					"patterns": [
 						{
 							"include": "#literal"
@@ -2408,7 +2714,7 @@
 					]
 				},
 				{
-					"begin": "(?<=[(=,]|=>)\\s*(async)?(?=\\s*((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*))?\\(\\s*$)",
+					"begin": "(?<=[(=,]|=>)\\s*(async)?(?=\\s*((((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*))?\\()|(<))\\s*$)",
 					"beginCaptures": {
 						"1": {
 							"name": "storage.modifier.async.js.jsx"
@@ -2536,11 +2842,11 @@
 				},
 				{
 					"name": "keyword.operator.expression.in.js.jsx",
-					"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))in(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))"
+					"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))in(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))(?!\\()"
 				},
 				{
 					"name": "keyword.operator.expression.of.js.jsx",
-					"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))of(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))"
+					"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))of(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))(?!\\()"
 				},
 				{
 					"name": "keyword.operator.expression.instanceof.js.jsx",
@@ -2564,7 +2870,7 @@
 							"name": "keyword.control.as.js.jsx"
 						}
 					},
-					"end": "(?=$|^|[;,:})\\]]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(as)\\s+))",
+					"end": "(?=$|^|[;,:})\\]]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(as)\\s+)|(\\s+\\<))",
 					"patterns": [
 						{
 							"include": "#type"
@@ -2663,9 +2969,9 @@
 		},
 		"array-literal": {
 			"name": "meta.array.literal.js.jsx",
-			"begin": "\\[",
+			"begin": "\\s*(\\[)",
 			"beginCaptures": {
-				"0": {
+				"1": {
 					"name": "meta.brace.square.js.jsx"
 				}
 			},
@@ -3000,7 +3306,7 @@
 					"include": "#object-identifiers"
 				},
 				{
-					"match": "(?x)(?:(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))\\s*)?([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ([\\(]\\s*([\\{\\[]\\s*)?$) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n))",
+					"match": "(?x)(?:(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))\\s*)?([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n))",
 					"captures": {
 						"1": {
 							"name": "punctuation.accessor.js.jsx"
@@ -3253,6 +3559,10 @@
 				},
 				{
 					"include": "#punctuation-comma"
+				},
+				{
+					"name": "keyword.operator.assignment.js.jsx",
+					"match": "(=)(?!>)"
 				}
 			]
 		},
@@ -3327,7 +3637,7 @@
 		},
 		"type-primitive": {
 			"name": "support.type.primitive.js.jsx",
-			"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(string|number|boolean|symbol|any|void|never)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))"
+			"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(string|number|boolean|symbol|any|void|never|unknown)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))"
 		},
 		"type-builtin-literals": {
 			"name": "support.type.builtin.js.jsx",
@@ -3467,10 +3777,57 @@
 			},
 			"patterns": [
 				{
-					"include": "#type"
+					"include": "#destructuring-parameter"
 				},
 				{
-					"include": "#function-parameters"
+					"match": "(?x)(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<!=|:)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))\\s*(\\??)(?=\\s*(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$))))",
+					"captures": {
+						"1": {
+							"name": "storage.modifier.js.jsx"
+						},
+						"2": {
+							"name": "keyword.operator.rest.js.jsx"
+						},
+						"3": {
+							"name": "entity.name.function.js.jsx variable.language.this.js.jsx"
+						},
+						"4": {
+							"name": "entity.name.function.js.jsx"
+						},
+						"5": {
+							"name": "keyword.operator.optional.js.jsx"
+						}
+					}
+				},
+				{
+					"match": "(?x)(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<!=|:)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))\\s*(\\??)(?=:)",
+					"captures": {
+						"1": {
+							"name": "storage.modifier.js.jsx"
+						},
+						"2": {
+							"name": "keyword.operator.rest.js.jsx"
+						},
+						"3": {
+							"name": "variable.parameter.js.jsx variable.language.this.js.jsx"
+						},
+						"4": {
+							"name": "variable.parameter.js.jsx"
+						},
+						"5": {
+							"name": "keyword.operator.optional.js.jsx"
+						}
+					}
+				},
+				{
+					"include": "#type-annotation"
+				},
+				{
+					"name": "punctuation.separator.parameter.js.jsx",
+					"match": ","
+				},
+				{
+					"include": "#type"
 				}
 			]
 		},
@@ -3574,13 +3931,10 @@
 					"include": "#typeof-operator"
 				},
 				{
-					"begin": "(?:([&|])|(=(?!>)))(?=\\s*\\{)",
+					"begin": "([&|\\*])(?=\\s*\\{)",
 					"beginCaptures": {
-						"1": {
+						"0": {
 							"name": "keyword.operator.type.js.jsx"
-						},
-						"2": {
-							"name": "keyword.operator.assignment.js.jsx"
 						}
 					},
 					"end": "(?<=\\})",
@@ -3591,13 +3945,10 @@
 					]
 				},
 				{
-					"begin": "([&|])|(=(?!>))",
+					"begin": "[&|\\*]",
 					"beginCaptures": {
-						"1": {
+						"0": {
 							"name": "keyword.operator.type.js.jsx"
-						},
-						"2": {
-							"name": "keyword.operator.assignment.js.jsx"
 						}
 					},
 					"end": "(?=\\S)"
@@ -3729,7 +4080,7 @@
 			"patterns": [
 				{
 					"name": "string.template.js.jsx",
-					"begin": "([_$[:alpha:]][_$[:alnum:]]*)\\s*(?=(<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[=]|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[=]|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>\\s*)`)",
+					"begin": "([_$[:alpha:]][_$[:alnum:]]*)\\s*(?=(<\\s*(((keyof|infer)\\s+)|(\\*(?=\\s*[,>]))|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer)\\s+)|(\\*(?=\\s*[,>]))|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>\\s*)`)",
 					"beginCaptures": {
 						"1": {
 							"name": "entity.name.function.tagged-template.js.jsx"
@@ -3795,7 +4146,7 @@
 			"patterns": [
 				{
 					"name": "string.regexp.js.jsx",
-					"begin": "(?<!\\+\\+|--)(?<=[=(:,\\[?+!]|^return|[^\\._$[:alnum:]]return|^case|[^\\._$[:alnum:]]case|=>|&&|\\|\\||\\*\\/)\\s*(\\/)(?![\\/*])(?=(?:[^\\/\\\\\\[]|\\\\.|\\[([^\\]\\\\]|\\\\.)+\\])+\\/(?![\\/*])[gimsuy]*(?!\\s*[a-zA-Z0-9_$]))",
+					"begin": "(?<!\\+\\+|--|})(?<=[=(:,\\[?+!]|^return|[^\\._$[:alnum:]]return|^case|[^\\._$[:alnum:]]case|=>|&&|\\|\\||\\*\\/)\\s*(\\/)(?![\\/*])(?=(?:[^\\/\\\\\\[]|\\\\.|\\[([^\\]\\\\]|\\\\.)+\\])+\\/[gimsuy]*(?!\\s*[a-zA-Z0-9_$]))",
 					"beginCaptures": {
 						"1": {
 							"name": "punctuation.definition.string.begin.js.jsx"
@@ -3818,7 +4169,7 @@
 				},
 				{
 					"name": "string.regexp.js.jsx",
-					"begin": "(?<![_$[:alnum:])\\]]|\\+\\+|--)\\/(?![\\/*])(?=(?:[^\\/\\\\\\[]|\\\\.|\\[([^\\]\\\\]|\\\\.)+\\])+\\/(?![\\/*])[gimsuy]*(?!\\s*[a-zA-Z0-9_$]))",
+					"begin": "(?<![_$[:alnum:])\\]]|\\+\\+|--|})\\/(?![\\/*])(?=(?:[^\\/\\\\\\[]|\\\\.|\\[([^\\]\\\\]|\\\\.)+\\])+\\/[gimsuy]*(?!\\s*[a-zA-Z0-9_$]))",
 					"beginCaptures": {
 						"0": {
 							"name": "punctuation.definition.string.begin.js.jsx"
@@ -4061,20 +4412,42 @@
 							"name": "punctuation.decorator.internaldeclaration.js.jsx"
 						}
 					},
-					"end": "(?=^)",
+					"end": "(?=$)",
 					"contentName": "comment.line.double-slash.js.jsx"
 				}
 			]
 		},
+		"single-line-comment-consuming-line-ending": {
+			"begin": "(^[ \\t]+)?((//)(?:\\s*((@)internal)(?=\\s|$))?)",
+			"beginCaptures": {
+				"1": {
+					"name": "punctuation.whitespace.comment.leading.js.jsx"
+				},
+				"2": {
+					"name": "comment.line.double-slash.js.jsx"
+				},
+				"3": {
+					"name": "punctuation.definition.comment.js.jsx"
+				},
+				"4": {
+					"name": "storage.type.internaldeclaration.js.jsx"
+				},
+				"5": {
+					"name": "punctuation.decorator.internaldeclaration.js.jsx"
+				}
+			},
+			"end": "(?=^)",
+			"contentName": "comment.line.double-slash.js.jsx"
+		},
 		"directives": {
 			"name": "comment.line.triple-slash.directive.js.jsx",
-			"begin": "^(///)\\s*(?=<(reference|amd-dependency|amd-module)(\\s+(path|types|no-default-lib|name)\\s*=\\s*((\\'([^\\'\\\\]|\\\\\\'|\\\\)*\\')|(\\\"([^\\\"\\\\]|\\\\\\\"|\\\\)*\\\")))+\\s*/>\\s*$)",
+			"begin": "^(///)\\s*(?=<(reference|amd-dependency|amd-module)(\\s+(path|types|no-default-lib|lib|name)\\s*=\\s*((\\'([^\\'\\\\]|\\\\\\'|\\\\)*\\')|(\\\"([^\\\"\\\\]|\\\\\\\"|\\\\)*\\\")))+\\s*/>\\s*$)",
 			"beginCaptures": {
 				"1": {
 					"name": "punctuation.definition.comment.js.jsx"
 				}
 			},
-			"end": "(?=^)",
+			"end": "(?=$)",
 			"patterns": [
 				{
 					"name": "meta.tag.js.jsx",
@@ -4096,7 +4469,7 @@
 					"patterns": [
 						{
 							"name": "entity.other.attribute-name.directive.js.jsx",
-							"match": "path|types|no-default-lib|name"
+							"match": "path|types|no-default-lib|lib|name"
 						},
 						{
 							"name": "keyword.operator.assignment.js.jsx",
@@ -4557,8 +4930,8 @@
 			]
 		},
 		"jsx-tag-without-attributes-in-expression": {
-			"begin": "(?<!\\+\\+|--)(?<=[({\\[,?=>:*]|&&|\\|\\||\\?|^return|[^\\._$[:alnum:]]return|^default|[^\\._$[:alnum:]]default|^)\\s*(?=(<)\\s*(?:([_$a-zA-Z][-$\\w.]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\\w.]*))(?<!\\.|-))?\\s*(>))",
-			"end": "(?!(<)\\s*(?:([_$a-zA-Z][-$\\w.]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\\w.]*))(?<!\\.|-))?\\s*(>))",
+			"begin": "(?<!\\+\\+|--)(?<=[({\\[,?=>:*]|&&|\\|\\||\\?|^await|[^\\._$[:alnum:]]await|^return|[^\\._$[:alnum:]]return|^default|[^\\._$[:alnum:]]default|^yield|[^\\._$[:alnum:]]yield|^)\\s*(?=(<)\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<!\\.|-))?\\s*(>))",
+			"end": "(?!(<)\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<!\\.|-))?\\s*(>))",
 			"patterns": [
 				{
 					"include": "#jsx-tag-without-attributes"
@@ -4567,8 +4940,8 @@
 		},
 		"jsx-tag-without-attributes": {
 			"name": "meta.tag.without-attributes.js.jsx",
-			"begin": "(<)\\s*(?:([_$a-zA-Z][-$\\w.]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\\w.]*))(?<!\\.|-))?\\s*(>)",
-			"end": "(</)\\s*(?:([_$a-zA-Z][-$\\w.]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\\w.]*))(?<!\\.|-))?\\s*(>)",
+			"begin": "(<)\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<!\\.|-))?\\s*(>)",
+			"end": "(</)\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<!\\.|-))?\\s*(>)",
 			"beginCaptures": {
 				"1": {
 					"name": "punctuation.definition.tag.begin.js.jsx"
@@ -4617,8 +4990,8 @@
 			]
 		},
 		"jsx-tag-in-expression": {
-			"begin": "(?x)\n  (?<!\\+\\+|--)(?<=[({\\[,?=>:*]|&&|\\|\\||\\?|^return|[^\\._$[:alnum:]]return|^default|[^\\._$[:alnum:]]default|^)\\s*\n  (?!<\\s*[_$[:alpha:]][_$[:alnum:]]*((\\s+extends\\s+[^=>])|,)) # look ahead is not type parameter of arrow\n  (?=(<)\\s*(?:([_$a-zA-Z][-$\\w.]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\\w.]*))(?<!\\.|-))(?=((<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[=]|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[=]|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>\\s*)|(\\s+))(?!\\?)|\\/?>))",
-			"end": "(?!(<)\\s*(?:([_$a-zA-Z][-$\\w.]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\\w.]*))(?<!\\.|-))(?=((<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[=]|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[=]|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>\\s*)|(\\s+))(?!\\?)|\\/?>))",
+			"begin": "(?x)\n  (?<!\\+\\+|--)(?<=[({\\[,?=>:*]|&&|\\|\\||\\?|^await|[^\\._$[:alnum:]]await|^return|[^\\._$[:alnum:]]return|^default|[^\\._$[:alnum:]]default|^yield|[^\\._$[:alnum:]]yield|^)\\s*\n  (?!<\\s*[_$[:alpha:]][_$[:alnum:]]*((\\s+extends\\s+[^=>])|,)) # look ahead is not type parameter of arrow\n  (?=(<)\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<!\\.|-))(?=((<\\s*)|(\\s+))(?!\\?)|\\/?>))",
+			"end": "(?!(<)\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<!\\.|-))(?=((<\\s*)|(\\s+))(?!\\?)|\\/?>))",
 			"patterns": [
 				{
 					"include": "#jsx-tag"
@@ -4627,8 +5000,8 @@
 		},
 		"jsx-tag": {
 			"name": "meta.tag.js.jsx",
-			"begin": "(?=(<)\\s*(?:([_$a-zA-Z][-$\\w.]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\\w.]*))(?<!\\.|-))(?=((<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[=]|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[=]|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>\\s*)|(\\s+))(?!\\?)|\\/?>))",
-			"end": "(/>)|(?:(</)\\s*(?:([_$a-zA-Z][-$\\w.]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\\w.]*))(?<!\\.|-))?\\s*(>))",
+			"begin": "(?=(<)\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<!\\.|-))(?=((<\\s*)|(\\s+))(?!\\?)|\\/?>))",
+			"end": "(/>)|(?:(</)\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<!\\.|-))?\\s*(>))",
 			"endCaptures": {
 				"1": {
 					"name": "punctuation.definition.tag.end.js.jsx"
@@ -4654,7 +5027,7 @@
 			},
 			"patterns": [
 				{
-					"begin": "(<)\\s*(?:([_$a-zA-Z][-$\\w.]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\\w.]*))(?<!\\.|-))(?=((<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[=]|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[=]|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>\\s*)|(\\s+))(?!\\?)|\\/?>)",
+					"begin": "(<)\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<!\\.|-))(?=((<\\s*)|(\\s+))(?!\\?)|\\/?>)",
 					"beginCaptures": {
 						"1": {
 							"name": "punctuation.definition.tag.begin.js.jsx"
@@ -4787,7 +5160,7 @@
 			]
 		},
 		"jsx-tag-attribute-name": {
-			"match": "(?x)\n  \\s*\n  (?:([_$a-zA-Z][-$\\w.]*)(:))?\n  ([_$a-zA-Z][-$\\w]*)\n  (?=\\s|=|/?>|/\\*|//)",
+			"match": "(?x)\n  \\s*\n  (?:([_$[:alpha:]][-_$[:alnum:].]*)(:))?\n  ([_$[:alpha:]][-_$[:alnum:]]*)\n  (?=\\s|=|/?>|/\\*|//)",
 			"captures": {
 				"1": {
 					"name": "entity.other.attribute-name.namespace.js.jsx"
diff --git a/extensions/javascript/test/colorize-results/test_js.json b/extensions/javascript/test/colorize-results/test_js.json
index 4d2acf6739f..6ba00939cdf 100644
--- a/extensions/javascript/test/colorize-results/test_js.json
+++ b/extensions/javascript/test/colorize-results/test_js.json
@@ -3,9 +3,9 @@
 		"c": "/*",
 		"t": "source.js comment.block.js punctuation.definition.comment.js",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -14,9 +14,9 @@
 		"c": "---------------------------------------------------------------------------------------------",
 		"t": "source.js comment.block.js",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -25,9 +25,9 @@
 		"c": " *  Copyright (c) Microsoft Corporation. All rights reserved.",
 		"t": "source.js comment.block.js",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -36,9 +36,9 @@
 		"c": " *  Licensed under the MIT License. See License.txt in the project root for license information.",
 		"t": "source.js comment.block.js",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -47,9 +47,9 @@
 		"c": " *--------------------------------------------------------------------------------------------",
 		"t": "source.js comment.block.js",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -58,9 +58,9 @@
 		"c": "*/",
 		"t": "source.js comment.block.js punctuation.definition.comment.js",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -2861,7 +2861,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.js",
+		"t": "source.js meta.array.literal.js",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -3169,7 +3169,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.js meta.function.js meta.block.js meta.var.expr.js",
+		"t": "source.js meta.function.js meta.block.js meta.var.expr.js meta.array.literal.js",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
diff --git a/extensions/javascript/test/colorize-results/test_jsx.json b/extensions/javascript/test/colorize-results/test_jsx.json
index a375d5d7b9d..cdd8b8cdfa4 100644
--- a/extensions/javascript/test/colorize-results/test_jsx.json
+++ b/extensions/javascript/test/colorize-results/test_jsx.json
@@ -520,9 +520,9 @@
 		"c": "//",
 		"t": "source.js.jsx meta.var.expr.js.jsx meta.objectliteral.js.jsx meta.object.member.js.jsx meta.function.expression.js.jsx meta.block.js.jsx comment.line.double-slash.js.jsx punctuation.definition.comment.js.jsx",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -531,9 +531,9 @@
 		"c": " Prevent following the link.",
 		"t": "source.js.jsx meta.var.expr.js.jsx meta.objectliteral.js.jsx meta.object.member.js.jsx meta.function.expression.js.jsx meta.block.js.jsx comment.line.double-slash.js.jsx",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -619,9 +619,9 @@
 		"c": "//",
 		"t": "source.js.jsx meta.var.expr.js.jsx meta.objectliteral.js.jsx meta.object.member.js.jsx meta.function.expression.js.jsx meta.block.js.jsx comment.line.double-slash.js.jsx punctuation.definition.comment.js.jsx",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -630,9 +630,9 @@
 		"c": " Invert the chosen default.",
 		"t": "source.js.jsx meta.var.expr.js.jsx meta.objectliteral.js.jsx meta.object.member.js.jsx meta.function.expression.js.jsx meta.block.js.jsx comment.line.double-slash.js.jsx",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -652,9 +652,9 @@
 		"c": "//",
 		"t": "source.js.jsx meta.var.expr.js.jsx meta.objectliteral.js.jsx meta.object.member.js.jsx meta.function.expression.js.jsx meta.block.js.jsx comment.line.double-slash.js.jsx punctuation.definition.comment.js.jsx",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -663,9 +663,9 @@
 		"c": " This will trigger an intelligent re-render of the component.",
 		"t": "source.js.jsx meta.var.expr.js.jsx meta.objectliteral.js.jsx meta.object.member.js.jsx meta.function.expression.js.jsx meta.block.js.jsx comment.line.double-slash.js.jsx",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -1037,9 +1037,9 @@
 		"c": "//",
 		"t": "source.js.jsx meta.var.expr.js.jsx meta.objectliteral.js.jsx meta.object.member.js.jsx meta.function.expression.js.jsx meta.block.js.jsx comment.line.double-slash.js.jsx punctuation.definition.comment.js.jsx",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -1048,9 +1048,9 @@
 		"c": " Default to the default message.",
 		"t": "source.js.jsx meta.var.expr.js.jsx meta.objectliteral.js.jsx meta.object.member.js.jsx meta.function.expression.js.jsx meta.block.js.jsx comment.line.double-slash.js.jsx",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -1213,9 +1213,9 @@
 		"c": "//",
 		"t": "source.js.jsx meta.var.expr.js.jsx meta.objectliteral.js.jsx meta.object.member.js.jsx meta.function.expression.js.jsx meta.block.js.jsx comment.line.double-slash.js.jsx punctuation.definition.comment.js.jsx",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -1224,9 +1224,9 @@
 		"c": " If toggled, show the alternate message.",
 		"t": "source.js.jsx meta.var.expr.js.jsx meta.objectliteral.js.jsx meta.object.member.js.jsx meta.function.expression.js.jsx meta.block.js.jsx comment.line.double-slash.js.jsx",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
diff --git a/extensions/json-language-features/.vscodeignore b/extensions/json-language-features/.vscodeignore
index d30ea9070d5..d6de18538dd 100644
--- a/extensions/json-language-features/.vscodeignore
+++ b/extensions/json-language-features/.vscodeignore
@@ -1,7 +1,26 @@
-test/**
-client/tsconfig.json
+.vscode/**
+server/.vscode/**
+node_modules/**
+server/node_modules/**
 client/src/**
-server/bin
-server/tsconfig.json
 server/src/**
-server/node_modules/@types/**
\ No newline at end of file
+client/out/**
+server/out/**
+client/tsconfig.json
+server/tsconfig.json
+server/test/**
+server/bin/**
+server/build/**
+server/yarn.lock
+server/.npmignore
+yarn.lock
+server/extension.webpack.config.js
+extension.webpack.config.js
+!node_modules/vscode-nls/**
+!node_modules/applicationinsights/**
+!node_modules/diagnostic-channel-publishers/**
+!node_modules/diagnostic-channel/**
+!node_modules/semver/**
+!node_modules/vscode-extension-telemetry/**
+!node_modules/zone.js/**
+!server/node_modules/vscode-nls/**
\ No newline at end of file
diff --git a/extensions/json-language-features/README.md b/extensions/json-language-features/README.md
new file mode 100644
index 00000000000..2ff5e6e57d3
--- /dev/null
+++ b/extensions/json-language-features/README.md
@@ -0,0 +1,7 @@
+# Language Features for JSON files
+
+**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.
+
+## Features
+
+See [JSON in Visual Studio Code](https://code.visualstudio.com/docs/languages/json) to learn about the features of this extension.
\ No newline at end of file
diff --git a/extensions/json-language-features/client/src/jsonMain.ts b/extensions/json-language-features/client/src/jsonMain.ts
index 2cd653dfa4b..88326058e17 100644
--- a/extensions/json-language-features/client/src/jsonMain.ts
+++ b/extensions/json-language-features/client/src/jsonMain.ts
@@ -5,15 +5,14 @@
 'use strict';
 
 import * as path from 'path';
+import * as fs from 'fs';
 import * as nls from 'vscode-nls';
 const localize = nls.loadMessageBundle();
 
-import { workspace, languages, ExtensionContext, extensions, Uri, LanguageConfiguration, TextDocument, FoldingRangeKind, FoldingRange, Disposable, FoldingContext } from 'vscode';
-import { LanguageClient, LanguageClientOptions, RequestType, ServerOptions, TransportKind, NotificationType, DidChangeConfigurationNotification, CancellationToken } from 'vscode-languageclient';
+import { workspace, languages, ExtensionContext, extensions, Uri, LanguageConfiguration } from 'vscode';
+import { LanguageClient, LanguageClientOptions, RequestType, ServerOptions, TransportKind, NotificationType, DidChangeConfigurationNotification } from 'vscode-languageclient';
 import TelemetryReporter from 'vscode-extension-telemetry';
 
-import { FoldingRangeRequest, FoldingRangeRequestParam, FoldingRangeClientCapabilities, FoldingRangeKind as LSFoldingRangeKind } from 'vscode-languageserver-protocol-foldingprovider';
-
 import { hash } from './utils/hash';
 
 namespace VSCodeContentRequest {
@@ -64,8 +63,9 @@ export function activate(context: ExtensionContext) {
 	let packageInfo = getPackageInfo(context);
 	telemetryReporter = packageInfo && new TelemetryReporter(packageInfo.name, packageInfo.version, packageInfo.aiKey);
 
-	// The server is implemented in node
-	let serverModule = context.asAbsolutePath(path.join('server', 'out', 'jsonServerMain.js'));
+	let serverMain = readJSONFile(context.asAbsolutePath('./server/package.json')).main;
+	let serverModule = context.asAbsolutePath(path.join('server', serverMain));
+
 	// The debug options for the server
 	let debugOptions = { execArgv: ['--nolazy', '--inspect=' + (9000 + Math.round(Math.random() * 10000))] };
 
@@ -97,21 +97,6 @@ export function activate(context: ExtensionContext) {
 	// Create the language client and start the client.
 	let client = new LanguageClient('json', localize('jsonserver.name', 'JSON Language Server'), serverOptions, clientOptions);
 	client.registerProposedFeatures();
-	client.registerFeature({
-		fillClientCapabilities(capabilities: FoldingRangeClientCapabilities): void {
-			let textDocumentCap = capabilities.textDocument;
-			if (!textDocumentCap) {
-				textDocumentCap = capabilities.textDocument = {};
-			}
-			textDocumentCap.foldingRange = {
-				dynamicRegistration: false,
-				rangeLimit: 5000,
-				lineFoldingOnly: true
-			};
-		},
-		initialize(capabilities, documentSelector): void {
-		}
-	});
 
 	let disposable = client.start();
 	toDispose.push(disposable);
@@ -141,8 +126,6 @@ export function activate(context: ExtensionContext) {
 		toDispose.push(workspace.onDidCloseTextDocument(d => handleContentChange(d.uri)));
 
 		client.sendNotification(SchemaAssociationNotification.type, getSchemaAssociation(context));
-
-		toDispose.push(initFoldingProvider());
 	});
 
 	let languageConfiguration: LanguageConfiguration = {
@@ -154,38 +137,6 @@ export function activate(context: ExtensionContext) {
 	};
 	languages.setLanguageConfiguration('json', languageConfiguration);
 	languages.setLanguageConfiguration('jsonc', languageConfiguration);
-
-	function initFoldingProvider(): Disposable {
-		function getKind(kind: string | undefined): FoldingRangeKind | undefined {
-			if (kind) {
-				switch (kind) {
-					case LSFoldingRangeKind.Comment:
-						return FoldingRangeKind.Comment;
-					case LSFoldingRangeKind.Imports:
-						return FoldingRangeKind.Imports;
-					case LSFoldingRangeKind.Region:
-						return FoldingRangeKind.Region;
-				}
-			}
-			return void 0;
-		}
-		return languages.registerFoldingRangeProvider(documentSelector, {
-			provideFoldingRanges(document: TextDocument, context: FoldingContext, token: CancellationToken) {
-				const param: FoldingRangeRequestParam = {
-					textDocument: client.code2ProtocolConverter.asTextDocumentIdentifier(document)
-				};
-				return client.sendRequest(FoldingRangeRequest.type, param, token).then(ranges => {
-					if (Array.isArray(ranges)) {
-						return ranges.map(r => new FoldingRange(r.startLine, r.endLine, getKind(r.kind)));
-					}
-					return null;
-				}, error => {
-					client.logFailedRequest(FoldingRangeRequest.type, error);
-					return null;
-				});
-			}
-		});
-	}
 }
 
 export function deactivate(): Promise<any> {
@@ -251,11 +202,22 @@ function getSettings(): Settings {
 				settings.json!.schemas!.push(schemaSetting);
 			}
 			let fileMatches = setting.fileMatch;
+			let resultingFileMatches = schemaSetting.fileMatch!;
 			if (Array.isArray(fileMatches)) {
 				if (fileMatchPrefix) {
-					fileMatches = fileMatches.map(m => fileMatchPrefix + m);
+					for (let fileMatch of fileMatches) {
+						if (fileMatch[0] === '/') {
+							resultingFileMatches.push(fileMatchPrefix + fileMatch);
+							resultingFileMatches.push(fileMatchPrefix + '/*' + fileMatch);
+						} else {
+							resultingFileMatches.push(fileMatchPrefix + '/' + fileMatch);
+							resultingFileMatches.push(fileMatchPrefix + '/*/' + fileMatch);
+						}
+					}
+				} else {
+					resultingFileMatches.push(...fileMatches);
 				}
-				schemaSetting.fileMatch!.push(...fileMatches);
+
 			}
 			if (setting.schema) {
 				schemaSetting.schema = setting.schema;
@@ -276,10 +238,10 @@ function getSettings(): Settings {
 			let folderSchemas = schemaConfigInfo!.workspaceFolderValue;
 			if (Array.isArray(folderSchemas)) {
 				let folderPath = folderUri.toString();
-				if (folderPath[folderPath.length - 1] !== '/') {
-					folderPath = folderPath + '/';
+				if (folderPath[folderPath.length - 1] === '/') {
+					folderPath = folderPath.substr(0, folderPath.length - 1);
 				}
-				collectSchemaSettings(folderSchemas, folderUri.fsPath, folderPath + '*');
+				collectSchemaSettings(folderSchemas, folderUri.fsPath, folderPath);
 			}
 		}
 	}
@@ -299,7 +261,7 @@ function getSchemaId(schema: JSONSchemaSettings, rootPath?: string) {
 }
 
 function getPackageInfo(context: ExtensionContext): IPackageInfo | undefined {
-	let extensionPackage = require(context.asAbsolutePath('./package.json'));
+	let extensionPackage = readJSONFile(context.asAbsolutePath('./package.json'));
 	if (extensionPackage) {
 		return {
 			name: extensionPackage.name,
@@ -309,3 +271,13 @@ function getPackageInfo(context: ExtensionContext): IPackageInfo | undefined {
 	}
 	return void 0;
 }
+
+function readJSONFile(location: string) {
+	try {
+		return JSON.parse(fs.readFileSync(location).toString());
+	} catch (e) {
+		console.log(`Problems reading ${location}: ${e}`);
+		return {};
+	}
+
+}
diff --git a/extensions/json-language-features/extension.webpack.config.js b/extensions/json-language-features/extension.webpack.config.js
new file mode 100644
index 00000000000..eb71544d875
--- /dev/null
+++ b/extensions/json-language-features/extension.webpack.config.js
@@ -0,0 +1,37 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+//@ts-check
+
+'use strict';
+
+const withDefaults = require('../shared.webpack.config');
+const CopyWebpackPlugin = require('copy-webpack-plugin');
+const path = require('path');
+
+module.exports = withDefaults({
+	context: path.join(__dirname, 'client'),
+	entry: {
+		extension: './src/jsonMain.ts',
+	},
+	resolve: {
+		mainFields: ['module', 'main'],
+		extensions: ['.ts', '.js'] // support ts-files and js-files
+	},
+	output: {
+		filename: 'jsonMain.js',
+		path: path.join(__dirname, 'client', 'dist'),
+		libraryTarget: "commonjs",
+	},
+	externals: {
+		'./files': 'commonjs', // ignored because it doesn't exist
+	},
+	plugins: [
+		new CopyWebpackPlugin([
+			{ from: './out/*.sh', to: '[name].sh' },
+			{ from: './out/nls.*.json', to: '[name].json' }
+		])
+	]
+});
diff --git a/extensions/json-language-features/package.json b/extensions/json-language-features/package.json
index 2e245fdafd8..99af0a42c57 100644
--- a/extensions/json-language-features/package.json
+++ b/extensions/json-language-features/package.json
@@ -59,7 +59,7 @@
                 "description": "%json.schemas.fileMatch.desc%"
               },
               "schema": {
-                "$ref": "http://json-schema.org/draft-04/schema#",
+                "$ref": "http://json-schema.org/draft-07/schema#",
                 "description": "%json.schemas.schema.desc%"
               }
             }
@@ -100,12 +100,11 @@
     }
   },
   "dependencies": {
-    "vscode-extension-telemetry": "0.0.17",
-    "vscode-languageclient": "^4.1.4",
-    "vscode-languageserver-protocol-foldingprovider": "^2.0.1",
-    "vscode-nls": "^3.2.2"
+    "vscode-extension-telemetry": "0.0.18",
+    "vscode-languageclient": "^5.1.0-next.9",
+    "vscode-nls": "^4.0.0"
   },
   "devDependencies": {
-    "@types/node": "7.0.43"
+    "@types/node": "^8.10.25"
   }
 }
diff --git a/extensions/json-language-features/package.nls.json b/extensions/json-language-features/package.nls.json
index f9d52e8ebcf..943de414e15 100644
--- a/extensions/json-language-features/package.nls.json
+++ b/extensions/json-language-features/package.nls.json
@@ -6,7 +6,7 @@
 	"json.schemas.fileMatch.desc": "An array of file patterns to match against when resolving JSON files to schemas.",
 	"json.schemas.fileMatch.item.desc": "A file pattern that can contain '*' to match against when resolving JSON files to schemas.",
 	"json.schemas.schema.desc": "The schema definition for the given URL. The schema only needs to be provided to avoid accesses to the schema URL.",
-	"json.format.enable.desc": "Enable/disable default JSON formatter (requires restart)",
+	"json.format.enable.desc": "Enable/disable default JSON formatter",
 	"json.tracing.desc": "Traces the communication between VS Code and the JSON language server.",
 	"json.colorDecorators.enable.desc": "Enables or disables color decorators",
 	"json.colorDecorators.enable.deprecationMessage": "The setting `json.colorDecorators.enable` has been deprecated in favor of `editor.colorDecorators`."
diff --git a/extensions/json-language-features/server/build/filesFillIn.js b/extensions/json-language-features/server/build/filesFillIn.js
new file mode 100644
index 00000000000..906617384e0
--- /dev/null
+++ b/extensions/json-language-features/server/build/filesFillIn.js
@@ -0,0 +1,5 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+module.exports = {};
\ No newline at end of file
diff --git a/extensions/json-language-features/server/extension.webpack.config.js b/extensions/json-language-features/server/extension.webpack.config.js
new file mode 100644
index 00000000000..1f350b9159c
--- /dev/null
+++ b/extensions/json-language-features/server/extension.webpack.config.js
@@ -0,0 +1,38 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+//@ts-check
+
+'use strict';
+
+const withDefaults = require('../../shared.webpack.config');
+const path = require('path');
+var webpack = require('webpack');
+
+module.exports = withDefaults({
+	context: path.join(__dirname),
+	entry: {
+		extension: './src/jsonServerMain.ts',
+	},
+	resolve: {
+		mainFields: ['module', 'main'],
+		extensions: ['.ts', '.js'] // support ts-files and js-files
+	},
+	output: {
+		filename: 'jsonServerMain.js',
+		path: path.join(__dirname, 'dist'),
+		libraryTarget: "commonjs",
+	},
+	externals: {
+		"vscode-nls": 'commonjs vscode-nls',
+	},
+	plugins: [
+		new webpack.NormalModuleReplacementPlugin(
+			/(\/|\\)vscode-languageserver(\/|\\)lib(\/|\\)files\.js/,
+			require.resolve('./build/filesFillIn')
+		),
+		new webpack.IgnorePlugin(/vertx/)
+	],
+});
diff --git a/extensions/json-language-features/server/package.json b/extensions/json-language-features/server/package.json
index 8ae80565173..5d0708d1af2 100644
--- a/extensions/json-language-features/server/package.json
+++ b/extensions/json-language-features/server/package.json
@@ -10,18 +10,18 @@
   "bin": {
     "vscode-json-languageserver": "./bin/vscode-json-languageserver"
   },
+  "main": "./out/jsonServerMain",
   "dependencies": {
-    "jsonc-parser": "^2.0.0-next.1",
-    "request-light": "^0.2.2",
-    "vscode-json-languageservice": "^3.1.2-next.3",
-    "vscode-languageserver": "^4.1.3",
-    "vscode-languageserver-protocol-foldingprovider": "^2.0.1",
-    "vscode-nls": "^3.2.2",
-    "vscode-uri": "^1.0.3"
+    "jsonc-parser": "^2.0.2",
+    "request-light": "^0.2.3",
+    "vscode-json-languageservice": "^3.1.6",
+    "vscode-languageserver": "^5.1.0-next.3",
+    "vscode-nls": "^4.0.0",
+    "vscode-uri": "^1.0.6"
   },
   "devDependencies": {
     "@types/mocha": "2.2.33",
-    "@types/node": "7.0.43"
+    "@types/node": "^8.10.25"
   },
   "scripts": {
     "prepublishOnly": "npm run clean && npm run test",
diff --git a/extensions/json-language-features/server/src/jsonServerMain.ts b/extensions/json-language-features/server/src/jsonServerMain.ts
index 2fa7619d1ff..c152a7ac137 100644
--- a/extensions/json-language-features/server/src/jsonServerMain.ts
+++ b/extensions/json-language-features/server/src/jsonServerMain.ts
@@ -19,8 +19,6 @@ import { formatError, runSafe, runSafeAsync } from './utils/runner';
 import { JSONDocument, JSONSchema, getLanguageService, DocumentLanguageSettings, SchemaConfiguration } from 'vscode-json-languageservice';
 import { getLanguageModelCache } from './languageModelCache';
 
-import { FoldingRangeRequest, FoldingRangeServerCapabilities } from 'vscode-languageserver-protocol-foldingprovider';
-
 interface ISchemaAssociations {
 	[pattern: string]: string[];
 }
@@ -61,6 +59,7 @@ documents.listen(connection);
 let clientSnippetSupport = false;
 let clientDynamicRegisterSupport = false;
 let foldingRangeLimit = Number.MAX_VALUE;
+let hierarchicalDocumentSymbolSupport = false;
 
 // After the server has started the client sends an initialize request. The server receives
 // in the passed params the rootPath of the workspace plus the client capabilities.
@@ -81,7 +80,8 @@ connection.onInitialize((params: InitializeParams): InitializeResult => {
 	clientSnippetSupport = getClientCapability('textDocument.completion.completionItem.snippetSupport', false);
 	clientDynamicRegisterSupport = getClientCapability('workspace.symbol.dynamicRegistration', false);
 	foldingRangeLimit = getClientCapability('textDocument.foldingRange.rangeLimit', Number.MAX_VALUE);
-	const capabilities: ServerCapabilities & FoldingRangeServerCapabilities = {
+	hierarchicalDocumentSymbolSupport = getClientCapability('textDocument.documentSymbol.hierarchicalDocumentSymbolSupport', false);
+	const capabilities: ServerCapabilities = {
 		// Tell the client that the server works in FULL text document sync mode
 		textDocumentSync: documents.syncKind,
 		completionProvider: clientSnippetSupport ? { resolveProvider: true, triggerCharacters: ['"', ':'] } : void 0,
@@ -344,7 +344,11 @@ connection.onDocumentSymbol((documentSymbolParams, token) => {
 		const document = documents.get(documentSymbolParams.textDocument.uri);
 		if (document) {
 			const jsonDocument = getJSONDocument(document);
-			return languageService.findDocumentSymbols(document, jsonDocument);
+			if (hierarchicalDocumentSymbolSupport) {
+				return languageService.findDocumentSymbols2(document, jsonDocument);
+			} else {
+				return languageService.findDocumentSymbols(document, jsonDocument);
+			}
 		}
 		return [];
 	}, [], `Error while computing document symbols for ${documentSymbolParams.textDocument.uri}`, token);
@@ -382,7 +386,7 @@ connection.onColorPresentation((params, token) => {
 	}, [], `Error while computing color presentations for ${params.textDocument.uri}`, token);
 });
 
-connection.onRequest(FoldingRangeRequest.type, (params, token) => {
+connection.onFoldingRanges((params, token) => {
 	return runSafe(() => {
 		const document = documents.get(params.textDocument.uri);
 		if (document) {
diff --git a/extensions/json-language-features/server/yarn.lock b/extensions/json-language-features/server/yarn.lock
index ce5677e6ae0..7ad4e279765 100644
--- a/extensions/json-language-features/server/yarn.lock
+++ b/extensions/json-language-features/server/yarn.lock
@@ -6,9 +6,9 @@
   version "2.2.33"
   resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-2.2.33.tgz#d79a0061ec270379f4d9e225f4096fb436669def"
 
-"@types/node@7.0.43":
-  version "7.0.43"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.43.tgz#a187e08495a075f200ca946079c914e1a5fe962c"
+"@types/node@^8.10.25":
+  version "8.10.25"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-8.10.25.tgz#801fe4e39372cef18f268db880a5fbfcf71adc7e"
 
 agent-base@4, agent-base@^4.1.0:
   version "4.1.2"
@@ -16,13 +16,7 @@ agent-base@4, agent-base@^4.1.0:
   dependencies:
     es6-promisify "^5.0.0"
 
-debug@2:
-  version "2.6.9"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
-  dependencies:
-    ms "2.0.0"
-
-debug@^3.1.0:
+debug@3.1.0, debug@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
   dependencies:
@@ -38,90 +32,83 @@ es6-promisify@^5.0.0:
   dependencies:
     es6-promise "^4.0.3"
 
-http-proxy-agent@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-2.0.0.tgz#46482a2f0523a4d6082551709f469cb3e4a85ff4"
+http-proxy-agent@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz#e4821beef5b2142a2026bd73926fe537631c5405"
   dependencies:
     agent-base "4"
-    debug "2"
+    debug "3.1.0"
 
-https-proxy-agent@2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.1.1.tgz#a7ce4382a1ba8266ee848578778122d491260fd9"
+https-proxy-agent@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.1.tgz#51552970fa04d723e04c56d04178c3f92592bbc0"
   dependencies:
     agent-base "^4.1.0"
     debug "^3.1.0"
 
-jsonc-parser@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-2.0.0.tgz#62ff087a7e753875febf3c55f1fc0cd737c36b5a"
+jsonc-parser@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-2.0.1.tgz#9d23cd2709714fff508a1a6679d82135bee1ae60"
 
-jsonc-parser@^2.0.0-next.1:
-  version "2.0.0-next.1"
-  resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-2.0.0-next.1.tgz#445a824f765a96abfbb286d759a9b1d226b18088"
+jsonc-parser@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-2.0.2.tgz#42fcf56d70852a043fadafde51ddb4a85649978d"
 
 ms@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
 
-request-light@^0.2.2:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/request-light/-/request-light-0.2.2.tgz#53e48af32ad1514e45221ea5ece5ce782720f712"
+request-light@^0.2.3:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/request-light/-/request-light-0.2.3.tgz#a18635ec6dd92f8705c019c42ef645f684d94f7e"
   dependencies:
-    http-proxy-agent "2.0.0"
-    https-proxy-agent "2.1.1"
-    vscode-nls "^2.0.2"
-
-vscode-json-languageservice@^3.1.2-next.3:
-  version "3.1.2-next.3"
-  resolved "https://registry.yarnpkg.com/vscode-json-languageservice/-/vscode-json-languageservice-3.1.2-next.3.tgz#cc0902148f898b413987fb1b4c4a9e7fc1a79c78"
-  dependencies:
-    jsonc-parser "^2.0.0"
-    vscode-languageserver-types "^3.7.2"
+    http-proxy-agent "^2.1.0"
+    https-proxy-agent "^2.2.1"
     vscode-nls "^3.2.2"
-    vscode-uri "^1.0.3"
+
+vscode-json-languageservice@^3.1.6:
+  version "3.1.6"
+  resolved "https://registry.yarnpkg.com/vscode-json-languageservice/-/vscode-json-languageservice-3.1.6.tgz#272e21eb9abcefe6c1ed38be141f0a76d5ddf0cd"
+  dependencies:
+    jsonc-parser "^2.0.1"
+    vscode-languageserver-types "^3.12.0"
+    vscode-nls "^3.2.4"
+    vscode-uri "^1.0.6"
 
 vscode-jsonrpc@^3.6.2:
   version "3.6.2"
   resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-3.6.2.tgz#3b5eef691159a15556ecc500e9a8a0dd143470c8"
 
-vscode-languageserver-protocol-foldingprovider@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol-foldingprovider/-/vscode-languageserver-protocol-foldingprovider-2.0.1.tgz#051d0d9e58d1b79dc4681acd48f21797f5515bfd"
-  dependencies:
-    vscode-languageserver-protocol "^3.7.2"
-    vscode-languageserver-types "^3.7.2"
-
-vscode-languageserver-protocol@^3.7.2:
-  version "3.7.2"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.7.2.tgz#df58621c032139010888b6a9ddc969423f9ba9d6"
+vscode-languageserver-protocol@^3.12.0:
+  version "3.12.0"
+  resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.12.0.tgz#5b23501292abad88f0463b01e83ff98e64a37652"
   dependencies:
     vscode-jsonrpc "^3.6.2"
-    vscode-languageserver-types "^3.7.2"
+    vscode-languageserver-types "^3.12.0"
 
-vscode-languageserver-types@^3.7.2:
-  version "3.7.2"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.7.2.tgz#aad8846f8e3e27962648554de5a8417e358f34eb"
+vscode-languageserver-types@^3.12.0:
+  version "3.12.0"
+  resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.12.0.tgz#f96051381b6a050b7175b37d6cb5d2f2eb64b944"
 
-vscode-languageserver@^4.1.3:
-  version "4.1.3"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver/-/vscode-languageserver-4.1.3.tgz#937d37c955b6b9c2409388413cd6f54d1eb9fe7d"
+vscode-languageserver@^5.1.0-next.3:
+  version "5.1.0-next.3"
+  resolved "https://registry.yarnpkg.com/vscode-languageserver/-/vscode-languageserver-5.1.0-next.3.tgz#352ce1f0f8bdfc47c1236277ebe865e25b087ccd"
   dependencies:
-    vscode-languageserver-protocol "^3.7.2"
-    vscode-uri "^1.0.1"
+    vscode-languageserver-protocol "^3.12.0"
+    vscode-uri "^1.0.5"
 
-vscode-nls@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-2.0.2.tgz#808522380844b8ad153499af5c3b03921aea02da"
+vscode-nls@^3.2.2, vscode-nls@^3.2.4:
+  version "3.2.4"
+  resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.4.tgz#2166b4183c8aea884d20727f5449e62be69fd398"
 
-vscode-nls@^3.2.2:
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.2.tgz#3817eca5b985c2393de325197cf4e15eb2aa5350"
+vscode-nls@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-4.0.0.tgz#4001c8a6caba5cedb23a9c5ce1090395c0e44002"
 
-vscode-uri@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-1.0.1.tgz#11a86befeac3c4aa3ec08623651a3c81a6d0bbc8"
+vscode-uri@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-1.0.5.tgz#3b899a8ef71c37f3054d79bdbdda31c7bf36f20d"
 
-vscode-uri@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-1.0.3.tgz#631bdbf716dccab0e65291a8dc25c23232085a52"
+vscode-uri@^1.0.6:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-1.0.6.tgz#6b8f141b0bbc44ad7b07e94f82f168ac7608ad4d"
diff --git a/extensions/json-language-features/yarn.lock b/extensions/json-language-features/yarn.lock
index 36c0c89cd28..6c37fe1c098 100644
--- a/extensions/json-language-features/yarn.lock
+++ b/extensions/json-language-features/yarn.lock
@@ -2,9 +2,9 @@
 # yarn lockfile v1
 
 
-"@types/node@7.0.43":
-  version "7.0.43"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.43.tgz#a187e08495a075f200ca946079c914e1a5fe962c"
+"@types/node@^8.10.25":
+  version "8.10.25"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-8.10.25.tgz#801fe4e39372cef18f268db880a5fbfcf71adc7e"
 
 applicationinsights@1.0.1:
   version "1.0.1"
@@ -28,43 +28,41 @@ semver@^5.3.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab"
 
-vscode-extension-telemetry@0.0.17:
-  version "0.0.17"
-  resolved "https://registry.yarnpkg.com/vscode-extension-telemetry/-/vscode-extension-telemetry-0.0.17.tgz#15123e7edb34e7b9724b6056f54a869bbb922cb7"
+semver@^5.5.0:
+  version "5.5.1"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.1.tgz#7dfdd8814bdb7cabc7be0fb1d734cfb66c940477"
+
+vscode-extension-telemetry@0.0.18:
+  version "0.0.18"
+  resolved "https://registry.yarnpkg.com/vscode-extension-telemetry/-/vscode-extension-telemetry-0.0.18.tgz#602ba20d8c71453aa34533a291e7638f6e5c0327"
   dependencies:
     applicationinsights "1.0.1"
 
-vscode-jsonrpc@^3.6.2:
-  version "3.6.2"
-  resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-3.6.2.tgz#3b5eef691159a15556ecc500e9a8a0dd143470c8"
+vscode-jsonrpc@^3.7.0-next.1:
+  version "3.7.0-next.1"
+  resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-3.7.0-next.1.tgz#e7521cd8135006ba8bf57ebcedbf5b03ce17b23e"
 
-vscode-languageclient@^4.1.4:
-  version "4.1.4"
-  resolved "https://registry.yarnpkg.com/vscode-languageclient/-/vscode-languageclient-4.1.4.tgz#fff1a6bca4714835dca7fce35bc4ce81442fdf2c"
+vscode-languageclient@^5.1.0-next.9:
+  version "5.1.0-next.9"
+  resolved "https://registry.yarnpkg.com/vscode-languageclient/-/vscode-languageclient-5.1.0-next.9.tgz#fe56c523637c118f7b262952b889f760223ab75a"
   dependencies:
-    vscode-languageserver-protocol "^3.7.2"
+    semver "^5.5.0"
+    vscode-languageserver-protocol "^3.13.0-next.2"
 
-vscode-languageserver-protocol-foldingprovider@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol-foldingprovider/-/vscode-languageserver-protocol-foldingprovider-2.0.1.tgz#051d0d9e58d1b79dc4681acd48f21797f5515bfd"
+vscode-languageserver-protocol@^3.13.0-next.2:
+  version "3.13.0-next.2"
+  resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.13.0-next.2.tgz#7083e50d0d2096ba52de448082445b9c39081fdb"
   dependencies:
-    vscode-languageserver-protocol "^3.7.2"
-    vscode-languageserver-types "^3.7.2"
+    vscode-jsonrpc "^3.7.0-next.1"
+    vscode-languageserver-types "^3.13.0-next.1"
 
-vscode-languageserver-protocol@^3.7.2:
-  version "3.7.2"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.7.2.tgz#df58621c032139010888b6a9ddc969423f9ba9d6"
-  dependencies:
-    vscode-jsonrpc "^3.6.2"
-    vscode-languageserver-types "^3.7.2"
+vscode-languageserver-types@^3.13.0-next.1:
+  version "3.13.0-next.1"
+  resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.13.0-next.1.tgz#dd91b78b13a2a6c7131e8291e3db3183cf566280"
 
-vscode-languageserver-types@^3.7.2:
-  version "3.7.2"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.7.2.tgz#aad8846f8e3e27962648554de5a8417e358f34eb"
-
-vscode-nls@^3.2.2:
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.2.tgz#3817eca5b985c2393de325197cf4e15eb2aa5350"
+vscode-nls@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-4.0.0.tgz#4001c8a6caba5cedb23a9c5ce1090395c0e44002"
 
 zone.js@0.7.6:
   version "0.7.6"
diff --git a/extensions/json/build/update-grammars.js b/extensions/json/build/update-grammars.js
new file mode 100644
index 00000000000..d7d92e18258
--- /dev/null
+++ b/extensions/json/build/update-grammars.js
@@ -0,0 +1,41 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+'use strict';
+
+var updateGrammar = require('../../../build/npm/update-grammar');
+
+function adaptJSON(grammar, replacementScope) {
+	grammar.name = 'JSON with comments';
+	grammar.scopeName = `source${replacementScope}`;
+
+	var fixScopeNames = function(rule) {
+		if (typeof rule.name === 'string') {
+			rule.name = rule.name.replace(/\.json/g, replacementScope);
+		}
+		if (typeof rule.contentName === 'string') {
+			rule.contentName = rule.contentName.replace(/\.json/g, replacementScope);
+		}
+		for (var property in rule) {
+			var value = rule[property];
+			if (typeof value === 'object') {
+				fixScopeNames(value);
+			}
+		}
+	};
+
+	var repository = grammar.repository;
+	for (var key in repository) {
+		fixScopeNames(repository[key]);
+	}
+}
+
+var tsGrammarRepo = 'Microsoft/vscode-JSON.tmLanguage';
+updateGrammar.update(tsGrammarRepo, 'JSON.tmLanguage', './syntaxes/JSON.tmLanguage.json');
+updateGrammar.update(tsGrammarRepo, 'JSON.tmLanguage', './syntaxes/JSONC.tmLanguage.json', grammar => adaptJSON(grammar, '.json.comments'));
+
+
+
+
+
diff --git a/extensions/json/package.json b/extensions/json/package.json
index 9ef7b078963..e8dc83372ad 100644
--- a/extensions/json/package.json
+++ b/extensions/json/package.json
@@ -8,7 +8,7 @@
     "vscode": "0.10.x"
   },
   "scripts": {
-    "update-grammar": "node ../../build/npm/update-grammar.js Microsoft/vscode-JSON.tmLanguage JSON.tmLanguage ./syntaxes/JSON.tmLanguage.json"
+    "update-grammar": "node ./build/update-grammars.js"
   },
   "contributes": {
     "languages": [
@@ -58,14 +58,14 @@
       },
       {
         "language": "jsonc",
-        "scopeName": "source.json",
-        "path": "./syntaxes/JSON.tmLanguage.json"
+        "scopeName": "source.json.comments",
+        "path": "./syntaxes/JSONC.tmLanguage.json"
       }
     ],
     "jsonValidation": [
       {
         "fileMatch": "*.schema.json",
-        "url": "http://json-schema.org/draft-04/schema#"
+        "url": "http://json-schema.org/draft-07/schema#"
       }
     ]
   }
diff --git a/extensions/json/syntaxes/JSONC.tmLanguage.json b/extensions/json/syntaxes/JSONC.tmLanguage.json
new file mode 100644
index 00000000000..50028ef0f35
--- /dev/null
+++ b/extensions/json/syntaxes/JSONC.tmLanguage.json
@@ -0,0 +1,213 @@
+{
+	"information_for_contributors": [
+		"This file has been converted from https://github.com/Microsoft/vscode-JSON.tmLanguage/blob/master/JSON.tmLanguage",
+		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
+		"Once accepted there, we are happy to receive an update request."
+	],
+	"version": "https://github.com/Microsoft/vscode-JSON.tmLanguage/commit/9bd83f1c252b375e957203f21793316203f61f70",
+	"name": "JSON with comments",
+	"scopeName": "source.json.comments",
+	"patterns": [
+		{
+			"include": "#value"
+		}
+	],
+	"repository": {
+		"array": {
+			"begin": "\\[",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.definition.array.begin.json.comments"
+				}
+			},
+			"end": "\\]",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.array.end.json.comments"
+				}
+			},
+			"name": "meta.structure.array.json.comments",
+			"patterns": [
+				{
+					"include": "#value"
+				},
+				{
+					"match": ",",
+					"name": "punctuation.separator.array.json.comments"
+				},
+				{
+					"match": "[^\\s\\]]",
+					"name": "invalid.illegal.expected-array-separator.json.comments"
+				}
+			]
+		},
+		"comments": {
+			"patterns": [
+				{
+					"begin": "/\\*\\*(?!/)",
+					"captures": {
+						"0": {
+							"name": "punctuation.definition.comment.json.comments"
+						}
+					},
+					"end": "\\*/",
+					"name": "comment.block.documentation.json.comments"
+				},
+				{
+					"begin": "/\\*",
+					"captures": {
+						"0": {
+							"name": "punctuation.definition.comment.json.comments"
+						}
+					},
+					"end": "\\*/",
+					"name": "comment.block.json.comments"
+				},
+				{
+					"captures": {
+						"1": {
+							"name": "punctuation.definition.comment.json.comments"
+						}
+					},
+					"match": "(//).*$\\n?",
+					"name": "comment.line.double-slash.js"
+				}
+			]
+		},
+		"constant": {
+			"match": "\\b(?:true|false|null)\\b",
+			"name": "constant.language.json.comments"
+		},
+		"number": {
+			"match": "(?x)        # turn on extended mode\n  -?        # an optional minus\n  (?:\n    0       # a zero\n    |       # ...or...\n    [1-9]   # a 1-9 character\n    \\d*     # followed by zero or more digits\n  )\n  (?:\n    (?:\n      \\.    # a period\n      \\d+   # followed by one or more digits\n    )?\n    (?:\n      [eE]  # an e character\n      [+-]? # followed by an option +/-\n      \\d+   # followed by one or more digits\n    )?      # make exponent optional\n  )?        # make decimal portion optional",
+			"name": "constant.numeric.json.comments"
+		},
+		"object": {
+			"begin": "\\{",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.definition.dictionary.begin.json.comments"
+				}
+			},
+			"end": "\\}",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.dictionary.end.json.comments"
+				}
+			},
+			"name": "meta.structure.dictionary.json.comments",
+			"patterns": [
+				{
+					"comment": "the JSON object key",
+					"include": "#objectkey"
+				},
+				{
+					"include": "#comments"
+				},
+				{
+					"begin": ":",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.separator.dictionary.key-value.json.comments"
+						}
+					},
+					"end": "(,)|(?=\\})",
+					"endCaptures": {
+						"1": {
+							"name": "punctuation.separator.dictionary.pair.json.comments"
+						}
+					},
+					"name": "meta.structure.dictionary.value.json.comments",
+					"patterns": [
+						{
+							"comment": "the JSON object value",
+							"include": "#value"
+						},
+						{
+							"match": "[^\\s,]",
+							"name": "invalid.illegal.expected-dictionary-separator.json.comments"
+						}
+					]
+				},
+				{
+					"match": "[^\\s\\}]",
+					"name": "invalid.illegal.expected-dictionary-separator.json.comments"
+				}
+			]
+		},
+		"string": {
+			"begin": "\"",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.definition.string.begin.json.comments"
+				}
+			},
+			"end": "\"",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.string.end.json.comments"
+				}
+			},
+			"name": "string.quoted.double.json.comments",
+			"patterns": [
+				{
+					"include": "#stringcontent"
+				}
+			]
+		},
+		"objectkey": {
+			"begin": "\"",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.support.type.property-name.begin.json.comments"
+				}
+			},
+			"end": "\"",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.support.type.property-name.end.json.comments"
+				}
+			},
+			"name": "string.json.comments support.type.property-name.json.comments",
+			"patterns": [
+				{
+					"include": "#stringcontent"
+				}
+			]
+		},
+		"stringcontent": {
+			"patterns": [
+				{
+					"match": "(?x)                # turn on extended mode\n  \\\\                # a literal backslash\n  (?:               # ...followed by...\n    [\"\\\\/bfnrt]     # one of these characters\n    |               # ...or...\n    u               # a u\n    [0-9a-fA-F]{4}) # and four hex digits",
+					"name": "constant.character.escape.json.comments"
+				},
+				{
+					"match": "\\\\.",
+					"name": "invalid.illegal.unrecognized-string-escape.json.comments"
+				}
+			]
+		},
+		"value": {
+			"patterns": [
+				{
+					"include": "#constant"
+				},
+				{
+					"include": "#number"
+				},
+				{
+					"include": "#string"
+				},
+				{
+					"include": "#array"
+				},
+				{
+					"include": "#object"
+				},
+				{
+					"include": "#comments"
+				}
+			]
+		}
+	}
+}
\ No newline at end of file
diff --git a/extensions/json/test/colorize-results/test_json.json b/extensions/json/test/colorize-results/test_json.json
index 19641069faa..75561c366d7 100644
--- a/extensions/json/test/colorize-results/test_json.json
+++ b/extensions/json/test/colorize-results/test_json.json
@@ -25,9 +25,9 @@
 		"c": "//",
 		"t": "source.json meta.structure.dictionary.json comment.line.double-slash.js punctuation.definition.comment.json",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -36,9 +36,9 @@
 		"c": " a comment",
 		"t": "source.json meta.structure.dictionary.json comment.line.double-slash.js",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
diff --git a/extensions/less/package.nls.json b/extensions/less/package.nls.json
index 7010e123b8e..bad671bf059 100644
--- a/extensions/less/package.nls.json
+++ b/extensions/less/package.nls.json
@@ -1,4 +1,4 @@
 {
 	"displayName": "Less Language Basics",
-	"description": "Provides syntax highlighting, bracket matching and folding Less files."
+	"description": "Provides syntax highlighting, bracket matching and folding in Less files."
 }
\ No newline at end of file
diff --git a/extensions/log/syntaxes/log.tmLanguage.json b/extensions/log/syntaxes/log.tmLanguage.json
index 21f8880e6e2..15cb646dadb 100644
--- a/extensions/log/syntaxes/log.tmLanguage.json
+++ b/extensions/log/syntaxes/log.tmLanguage.json
@@ -4,7 +4,7 @@
 		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
 		"Once accepted there, we are happy to receive an update request."
 	],
-	"version": "https://github.com/emilast/vscode-logfile-highlighter/commit/ec0e98bdfbe3b39da175f9f6983aa7a7109acc93",
+	"version": "https://github.com/emilast/vscode-logfile-highlighter/commit/03cb9582024f477f93f3d27c46f7c084b2b14afe",
 	"name": "Log file",
 	"scopeName": "text.log",
 	"patterns": [
@@ -86,7 +86,7 @@
 			"name": "constant.language log.constant"
 		},
 		{
-			"match": "\\b([\\w-]+\\.)+([\\w-])+\\b",
+			"match": "(?<![\\w/\\\\])([\\w-]+\\.)+([\\w-])+(?![\\w/\\\\])",
 			"name": "constant.language log.constant"
 		}
 	]
diff --git a/extensions/log/test/colorize-results/test_log.json b/extensions/log/test/colorize-results/test_log.json
index 0b295cad127..2057a5b8764 100644
--- a/extensions/log/test/colorize-results/test_log.json
+++ b/extensions/log/test/colorize-results/test_log.json
@@ -14,9 +14,9 @@
 		"c": "2017-12-21",
 		"t": "text.log comment log.date",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -36,9 +36,9 @@
 		"c": "12:47:29.584",
 		"t": "text.log comment log.date",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -80,9 +80,9 @@
 		"c": "2017-12-21",
 		"t": "text.log comment log.date",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -102,9 +102,9 @@
 		"c": "12:47:29.614",
 		"t": "text.log comment log.date",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -135,9 +135,9 @@
 		"c": "2017-12-21",
 		"t": "text.log comment log.date",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -157,9 +157,9 @@
 		"c": "12:47:29.632",
 		"t": "text.log comment log.date",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -190,9 +190,9 @@
 		"c": "2017-12-21",
 		"t": "text.log comment log.date",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -212,9 +212,9 @@
 		"c": "12:47:29.636",
 		"t": "text.log comment log.date",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -245,9 +245,9 @@
 		"c": "2017-12-21",
 		"t": "text.log comment log.date",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -267,9 +267,9 @@
 		"c": "12:47:32.164",
 		"t": "text.log comment log.date",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -311,9 +311,9 @@
 		"c": "2017-12-21",
 		"t": "text.log comment log.date",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -333,9 +333,9 @@
 		"c": "12:47:33.122",
 		"t": "text.log comment log.date",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -377,9 +377,9 @@
 		"c": "2017-12-21",
 		"t": "text.log comment log.date",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -399,9 +399,9 @@
 		"c": "12:47:34.249",
 		"t": "text.log comment log.date",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -443,9 +443,9 @@
 		"c": "2017-12-21",
 		"t": "text.log comment log.date",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -465,9 +465,9 @@
 		"c": "12:47:48.078",
 		"t": "text.log comment log.date",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -509,9 +509,9 @@
 		"c": "2017-12-21",
 		"t": "text.log comment log.date",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -531,9 +531,9 @@
 		"c": "12:47:49.294",
 		"t": "text.log comment log.date",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
diff --git a/extensions/lua/syntaxes/lua.tmLanguage.json b/extensions/lua/syntaxes/lua.tmLanguage.json
index 8adc657f806..c2b31570531 100644
--- a/extensions/lua/syntaxes/lua.tmLanguage.json
+++ b/extensions/lua/syntaxes/lua.tmLanguage.json
@@ -4,23 +4,25 @@
 		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
 		"Once accepted there, we are happy to receive an update request."
 	],
-	"version": "https://github.com/textmate/lua.tmbundle/commit/42da2c6ff5d86c068f72520f856190f413911a80",
+	"version": "https://github.com/textmate/lua.tmbundle/commit/8ae5641365b28f697121ba1133890e8d81f5b00e",
 	"name": "Lua",
 	"scopeName": "source.lua",
-	"comment": "Lua Syntax: version 0.8",
 	"patterns": [
 		{
-			"begin": "\\b((local\\b)\\s+)?(function)\\s*(\\s+[a-zA-Z_][a-zA-Z0-9_]*(\\.[a-zA-Z_][a-zA-Z0-9_]*)*(:[a-zA-Z_][a-zA-Z0-9_]*)?\\s*)?(\\()",
+			"begin": "\\b(?:(local)\\s+)?(function)\\s*(?:\\s+([a-zA-Z_][a-zA-Z0-9_]*(?:([\\.:])[a-zA-Z_][a-zA-Z0-9_]*)?)\\s*)?(\\()",
 			"beginCaptures": {
 				"1": {
 					"name": "storage.modifier.local.lua"
 				},
-				"3": {
+				"2": {
 					"name": "keyword.control.lua"
 				},
-				"4": {
+				"3": {
 					"name": "entity.name.function.lua"
 				},
+				"4": {
+					"name": "punctuation.separator.parameter.lua"
+				},
 				"5": {
 					"name": "punctuation.definition.parameters.begin.lua"
 				}
@@ -36,6 +38,10 @@
 				{
 					"match": "[a-zA-Z_][a-zA-Z0-9_]*",
 					"name": "variable.parameter.function.lua"
+				},
+				{
+					"match": ",",
+					"name": "punctuation.separator.arguments.lua"
 				}
 			]
 		},
diff --git a/extensions/lua/test/colorize-results/test_lua.json b/extensions/lua/test/colorize-results/test_lua.json
index bc041f3ac30..21c3d794e5b 100644
--- a/extensions/lua/test/colorize-results/test_lua.json
+++ b/extensions/lua/test/colorize-results/test_lua.json
@@ -14,9 +14,9 @@
 		"c": "--",
 		"t": "source.lua comment.line.double-dash.lua punctuation.definition.comment.lua",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -25,9 +25,9 @@
 		"c": " defines a factorial function",
 		"t": "source.lua comment.line.double-dash.lua",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -55,7 +55,18 @@
 		}
 	},
 	{
-		"c": " fact ",
+		"c": " ",
+		"t": "source.lua meta.function.lua",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": "fact",
 		"t": "source.lua meta.function.lua entity.name.function.lua",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
@@ -66,7 +77,7 @@
 		}
 	},
 	{
-		"c": "(",
+		"c": " ",
 		"t": "source.lua meta.function.lua",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
@@ -76,6 +87,17 @@
 			"hc_black": "default: #FFFFFF"
 		}
 	},
+	{
+		"c": "(",
+		"t": "source.lua meta.function.lua punctuation.definition.parameters.begin.lua",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
 	{
 		"c": "n",
 		"t": "source.lua meta.function.lua variable.parameter.function.lua",
@@ -586,9 +608,9 @@
 		"c": "--",
 		"t": "source.lua comment.line.double-dash.lua punctuation.definition.comment.lua",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -597,9 +619,9 @@
 		"c": " read a number",
 		"t": "source.lua comment.line.double-dash.lua",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
diff --git a/extensions/make/package.json b/extensions/make/package.json
index cc244fbf7ba..f66762ba800 100644
--- a/extensions/make/package.json
+++ b/extensions/make/package.json
@@ -4,29 +4,47 @@
 	"description": "%description%",
 	"version": "1.0.0",
 	"publisher": "vscode",
-	"engines": { "vscode": "*" },
+	"engines": {
+		"vscode": "*"
+	},
 	"scripts": {
 		"update-grammar": "node ../../build/npm/update-grammar.js fadeevab/make.tmbundle Syntaxes/Makefile.plist ./syntaxes/make.tmLanguage.json"
 	},
 	"contributes": {
-
-		"languages": [{
-			"id": "makefile",
-			"aliases": ["Makefile", "makefile"],
-			"extensions": [ ".mk" ],
-			"filenames": [ "Makefile", "makefile", "GNUmakefile", "OCamlMakefile" ],
-      "firstLine": "^#!/usr/bin/make",
-			"configuration": "./language-configuration.json"
-		}],
-		"grammars": [{
-			"language": "makefile",
-			"scopeName": "source.makefile",
-			"path": "./syntaxes/make.tmLanguage.json"
-		}],
+		"languages": [
+			{
+				"id": "makefile",
+				"aliases": [
+					"Makefile",
+					"makefile"
+				],
+				"extensions": [
+					".mk"
+				],
+				"filenames": [
+					"Makefile",
+					"makefile",
+					"GNUmakefile",
+					"OCamlMakefile"
+				],
+				"firstLine": "^#!\\s*/usr/bin/make",
+				"configuration": "./language-configuration.json"
+			}
+		],
+		"grammars": [
+			{
+				"language": "makefile",
+				"scopeName": "source.makefile",
+				"path": "./syntaxes/make.tmLanguage.json",
+				"tokenTypes": {
+					"string.interpolated": "other"
+				}
+			}
+		],
 		"configurationDefaults": {
 			"[makefile]": {
 				"editor.insertSpaces": false
 			}
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/extensions/make/syntaxes/make.tmLanguage.json b/extensions/make/syntaxes/make.tmLanguage.json
index 505336ac862..acfd8adea23 100644
--- a/extensions/make/syntaxes/make.tmLanguage.json
+++ b/extensions/make/syntaxes/make.tmLanguage.json
@@ -4,7 +4,7 @@
 		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
 		"Once accepted there, we are happy to receive an update request."
 	],
-	"version": "https://github.com/fadeevab/make.tmbundle/commit/43e1a67476dea3ddefbb4f0ee7901834b31b8bee",
+	"version": "https://github.com/fadeevab/make.tmbundle/commit/d94d403d6d31623763a4ff86b656886fa699ef60",
 	"name": "Makefile",
 	"scopeName": "source.makefile",
 	"patterns": [
@@ -257,7 +257,7 @@
 				}
 			]
 		},
-		"interpolation": {
+		"shell-interpolation": {
 			"begin": "(?=`)",
 			"end": "(?!\\G)",
 			"name": "meta.embedded.line.shell",
@@ -288,18 +288,6 @@
 				}
 			]
 		},
-		"braces-interpolation": {
-			"begin": "\\(",
-			"end": "\\)",
-			"patterns": [
-				{
-					"include": "#variables"
-				},
-				{
-					"include": "#braces-interpolation"
-				}
-			]
-		},
 		"recipe": {
 			"begin": "^(?!\\t)([^:]*)(:)(?!\\=)",
 			"beginCaptures": {
@@ -404,6 +392,40 @@
 				{
 					"include": "#comment"
 				},
+				{
+					"include": "#variables"
+				},
+				{
+					"include": "#shell-interpolation"
+				}
+			]
+		},
+		"interpolation": {
+			"patterns": [
+				{
+					"include": "#parentheses-interpolation"
+				},
+				{
+					"include": "#braces-interpolation"
+				}
+			]
+		},
+		"parentheses-interpolation": {
+			"begin": "\\(",
+			"end": "\\)",
+			"patterns": [
+				{
+					"include": "#variables"
+				},
+				{
+					"include": "#interpolation"
+				}
+			]
+		},
+		"braces-interpolation": {
+			"begin": "{",
+			"end": "}",
+			"patterns": [
 				{
 					"include": "#variables"
 				},
@@ -415,11 +437,28 @@
 		"variables": {
 			"patterns": [
 				{
-					"match": "\\$[^\\(\\)]",
-					"name": "variable.language.makefile"
+					"include": "#simple-variable"
 				},
 				{
-					"begin": "(\\$|(?<=\\$))\\(",
+					"include": "#variable-parentheses"
+				},
+				{
+					"include": "#variable-braces"
+				}
+			]
+		},
+		"simple-variable": {
+			"patterns": [
+				{
+					"match": "\\$[^(){}]",
+					"name": "variable.language.makefile"
+				}
+			]
+		},
+		"variable-parentheses": {
+			"patterns": [
+				{
+					"begin": "\\$\\(",
 					"captures": {
 						"0": {
 							"name": "punctuation.definition.variable.makefile"
@@ -432,64 +471,199 @@
 							"include": "#variables"
 						},
 						{
-							"match": "(?<=\\()(MAKEFILES|VPATH|SHELL|MAKESHELL|MAKE|MAKELEVEL|MAKEFLAGS|MAKECMDGOALS|CURDIR|SUFFIXES|\\.LIBPATTERNS)(?=\\s*\\))",
-							"name": "variable.language.makefile"
+							"include": "#builtin-variable-parentheses"
 						},
 						{
-							"begin": "(?<=\\()(subst|patsubst|strip|findstring|filter(-out)?|sort|word(list)?|firstword|lastword|dir|notdir|suffix|basename|addsuffix|addprefix|join|wildcard|realpath|abspath|info|error|warning|shell|foreach|if|or|and|call|eval|value|file|guile)\\s",
-							"beginCaptures": {
-								"1": {
-									"name": "support.function.$1.makefile"
-								}
-							},
-							"end": "(?=\\)|((?<!\\\\)\\n))",
-							"name": "meta.scope.function-call.makefile",
-							"patterns": [
-								{
-									"include": "#variables"
-								},
-								{
-									"include": "#braces-interpolation"
-								},
-								{
-									"match": "%|\\*",
-									"name": "constant.other.placeholder.makefile"
-								},
-								{
-									"match": "\\\\\\n",
-									"name": "constant.character.escape.continuation.makefile"
-								}
-							]
+							"include": "#function-variable-parentheses"
 						},
 						{
-							"begin": "(?<=\\()(origin|flavor)\\s(?=[^\\s)]+\\s*\\))",
-							"contentName": "variable.other.makefile",
-							"beginCaptures": {
-								"1": {
-									"name": "support.function.$1.makefile"
-								}
-							},
-							"end": "(?=\\))",
-							"name": "meta.scope.function-call.makefile",
-							"patterns": [
-								{
-									"include": "#variables"
-								}
-							]
+							"include": "#flavor-variable-parentheses"
 						},
 						{
-							"begin": "(?<=\\()(?!\\))",
-							"end": "(?=\\)|((?<!\\\\)\\n))",
-							"name": "variable.other.makefile",
-							"patterns": [
-								{
-									"include": "#variables"
-								},
-								{
-									"match": "\\\\\\n",
-									"name": "constant.character.escape.continuation.makefile"
-								}
-							]
+							"include": "#another-variable-parentheses"
+						}
+					]
+				}
+			]
+		},
+		"variable-braces": {
+			"patterns": [
+				{
+					"begin": "\\${",
+					"captures": {
+						"0": {
+							"name": "punctuation.definition.variable.makefile"
+						}
+					},
+					"end": "}|((?<!\\\\)\\n)",
+					"name": "string.interpolated.makefile",
+					"patterns": [
+						{
+							"include": "#variables"
+						},
+						{
+							"include": "#builtin-variable-braces"
+						},
+						{
+							"include": "#function-variable-braces"
+						},
+						{
+							"include": "#flavor-variable-braces"
+						},
+						{
+							"include": "#another-variable-braces"
+						}
+					]
+				}
+			]
+		},
+		"builtin-variable-parentheses": {
+			"patterns": [
+				{
+					"match": "(?<=\\()(MAKEFILES|VPATH|SHELL|MAKESHELL|MAKE|MAKELEVEL|MAKEFLAGS|MAKECMDGOALS|CURDIR|SUFFIXES|\\.LIBPATTERNS)(?=\\s*\\))",
+					"name": "variable.language.makefile"
+				}
+			]
+		},
+		"builtin-variable-braces": {
+			"patterns": [
+				{
+					"match": "(?<={)(MAKEFILES|VPATH|SHELL|MAKESHELL|MAKE|MAKELEVEL|MAKEFLAGS|MAKECMDGOALS|CURDIR|SUFFIXES|\\.LIBPATTERNS)(?=\\s*})",
+					"name": "variable.language.makefile"
+				}
+			]
+		},
+		"function-variable-parentheses": {
+			"patterns": [
+				{
+					"begin": "(?<=\\()(subst|patsubst|strip|findstring|filter(-out)?|sort|word(list)?|firstword|lastword|dir|notdir|suffix|basename|addsuffix|addprefix|join|wildcard|realpath|abspath|info|error|warning|shell|foreach|if|or|and|call|eval|value|file|guile)\\s",
+					"beginCaptures": {
+						"1": {
+							"name": "support.function.$1.makefile"
+						}
+					},
+					"end": "(?=\\)|((?<!\\\\)\\n))",
+					"name": "meta.scope.function-call.makefile",
+					"patterns": [
+						{
+							"include": "#variables"
+						},
+						{
+							"include": "#interpolation"
+						},
+						{
+							"match": "%|\\*",
+							"name": "constant.other.placeholder.makefile"
+						},
+						{
+							"match": "\\\\\\n",
+							"name": "constant.character.escape.continuation.makefile"
+						}
+					]
+				}
+			]
+		},
+		"function-variable-braces": {
+			"patterns": [
+				{
+					"begin": "(?<={)(subst|patsubst|strip|findstring|filter(-out)?|sort|word(list)?|firstword|lastword|dir|notdir|suffix|basename|addsuffix|addprefix|join|wildcard|realpath|abspath|info|error|warning|shell|foreach|if|or|and|call|eval|value|file|guile)\\s",
+					"beginCaptures": {
+						"1": {
+							"name": "support.function.$1.makefile"
+						}
+					},
+					"end": "(?=}|((?<!\\\\)\\n))",
+					"name": "meta.scope.function-call.makefile",
+					"patterns": [
+						{
+							"include": "#variables"
+						},
+						{
+							"include": "#interpolation"
+						},
+						{
+							"match": "%|\\*",
+							"name": "constant.other.placeholder.makefile"
+						},
+						{
+							"match": "\\\\\\n",
+							"name": "constant.character.escape.continuation.makefile"
+						}
+					]
+				}
+			]
+		},
+		"flavor-variable-parentheses": {
+			"patterns": [
+				{
+					"begin": "(?<=\\()(origin|flavor)\\s(?=[^\\s)]+\\s*\\))",
+					"contentName": "variable.other.makefile",
+					"beginCaptures": {
+						"1": {
+							"name": "support.function.$1.makefile"
+						}
+					},
+					"end": "(?=\\))",
+					"name": "meta.scope.function-call.makefile",
+					"patterns": [
+						{
+							"include": "#variables"
+						}
+					]
+				}
+			]
+		},
+		"flavor-variable-braces": {
+			"patterns": [
+				{
+					"begin": "(?<={)(origin|flavor)\\s(?=[^\\s}]+\\s*})",
+					"contentName": "variable.other.makefile",
+					"beginCaptures": {
+						"1": {
+							"name": "support.function.$1.makefile"
+						}
+					},
+					"end": "(?=})",
+					"name": "meta.scope.function-call.makefile",
+					"patterns": [
+						{
+							"include": "#variables"
+						}
+					]
+				}
+			]
+		},
+		"another-variable-parentheses": {
+			"patterns": [
+				{
+					"begin": "(?<=\\()(?!\\))",
+					"end": "(?=\\)|((?<!\\\\)\\n))",
+					"name": "variable.other.makefile",
+					"patterns": [
+						{
+							"include": "#variables"
+						},
+						{
+							"match": "\\\\\\n",
+							"name": "constant.character.escape.continuation.makefile"
+						}
+					]
+				}
+			]
+		},
+		"another-variable-braces": {
+			"patterns": [
+				{
+					"begin": "(?<={)(?!})",
+					"end": "(?=}|((?<!\\\\)\\n))",
+					"name": "variable.other.makefile",
+					"patterns": [
+						{
+							"include": "#variables"
+						},
+						{
+							"match": "\\\\\\n",
+							"name": "constant.character.escape.continuation.makefile"
 						}
 					]
 				}
diff --git a/extensions/make/test/colorize-fixtures/makefile b/extensions/make/test/colorize-fixtures/makefile
index 5d01e6a16e3..74f93dd5d1c 100644
--- a/extensions/make/test/colorize-fixtures/makefile
+++ b/extensions/make/test/colorize-fixtures/makefile
@@ -25,6 +25,10 @@ hello.o: hello.cpp \
 clean:
 	rm *o hello
 
+all:
+	# "$$" in a shell means to escape makefile's variable substitution.
+	some_shell_var=$$(sed -nre 's/some regex with (group)/\1/p')
+
 define defined
   $(info Checking existance of $(1) $(flavor $(1)))
   $(if $(filter undefined,$(flavor $(1))),0,1)
@@ -38,4 +42,15 @@ endif
 
 ifeq ($(strip $(call defined,CODIT_DIR)),0)
   $(info CODIT_DIR must be set in $(TOP_DIR)3rdparty.mk)
-endif
\ No newline at end of file
+endif
+
+CXXVER_GE480 := $(shell expr `$(CXX) -dumpversion | sed -e 's/\.\([0-9][0-9]\)/\1/g' -e 's/\.\([0-9]\)/0\1/g' -e 's/^[0-9]\{3,4\}$$/&00/'` \>= 40800)
+
+ok := ok
+$(info Braces {} in parentheses ({}): ${ok})
+${info Parentheses () in braces {()}: $(ok)}
+
+ifeq ("${ok}", "skip")
+  $(ok))}
+  ${ok}})
+endif
diff --git a/extensions/make/test/colorize-results/makefile.json b/extensions/make/test/colorize-results/makefile.json
index 03fbc6814fb..1e2cee1cb1c 100644
--- a/extensions/make/test/colorize-results/makefile.json
+++ b/extensions/make/test/colorize-results/makefile.json
@@ -300,9 +300,9 @@
 		"c": "#",
 		"t": "source.makefile meta.scope.target.makefile meta.scope.prerequisites.makefile comment.line.number-sign.makefile punctuation.definition.comment.makefile",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -311,9 +311,9 @@
 		"c": " This is a long ",
 		"t": "source.makefile meta.scope.target.makefile meta.scope.prerequisites.makefile comment.line.number-sign.makefile",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -324,7 +324,7 @@
 		"r": {
 			"dark_plus": "constant.character.escape: #D7BA7D",
 			"light_plus": "constant.character.escape: #FF0000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "constant.character: #569CD6"
 		}
@@ -333,9 +333,9 @@
 		"c": "         comment inside prerequisites.",
 		"t": "source.makefile meta.scope.target.makefile meta.scope.prerequisites.makefile comment.line.number-sign.makefile",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -355,9 +355,9 @@
 		"c": "#",
 		"t": "source.makefile comment.line.number-sign.makefile punctuation.definition.comment.makefile",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -366,9 +366,9 @@
 		"c": " There are a building steps ",
 		"t": "source.makefile comment.line.number-sign.makefile",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -379,7 +379,7 @@
 		"r": {
 			"dark_plus": "constant.character.escape: #D7BA7D",
 			"light_plus": "constant.character.escape: #FF0000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "constant.character: #569CD6"
 		}
@@ -388,9 +388,9 @@
 		"c": "\tbelow. And the tab is at the beginning of this line.",
 		"t": "source.makefile comment.line.number-sign.makefile",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -692,6 +692,94 @@
 			"hc_black": "default: #FFFFFF"
 		}
 	},
+	{
+		"c": "all",
+		"t": "source.makefile meta.scope.target.makefile entity.name.function.target.makefile",
+		"r": {
+			"dark_plus": "entity.name.function: #DCDCAA",
+			"light_plus": "entity.name.function: #795E26",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.function: #DCDCAA"
+		}
+	},
+	{
+		"c": ":",
+		"t": "source.makefile meta.scope.target.makefile punctuation.separator.key-value.makefile",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": "\t",
+		"t": "source.makefile punctuation.whitespace.comment.leading.makefile",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": "#",
+		"t": "source.makefile comment.line.number-sign.makefile punctuation.definition.comment.makefile",
+		"r": {
+			"dark_plus": "comment: #6A9955",
+			"light_plus": "comment: #008000",
+			"dark_vs": "comment: #6A9955",
+			"light_vs": "comment: #008000",
+			"hc_black": "comment: #7CA668"
+		}
+	},
+	{
+		"c": " \"$$\" in a shell means to escape makefile's variable substitution.",
+		"t": "source.makefile comment.line.number-sign.makefile",
+		"r": {
+			"dark_plus": "comment: #6A9955",
+			"light_plus": "comment: #008000",
+			"dark_vs": "comment: #6A9955",
+			"light_vs": "comment: #008000",
+			"hc_black": "comment: #7CA668"
+		}
+	},
+	{
+		"c": "\tsome_shell_var=",
+		"t": "source.makefile",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": "$$",
+		"t": "source.makefile variable.language.makefile",
+		"r": {
+			"dark_plus": "variable.language: #569CD6",
+			"light_plus": "variable.language: #0000FF",
+			"dark_vs": "variable.language: #569CD6",
+			"light_vs": "variable.language: #0000FF",
+			"hc_black": "variable: #9CDCFE"
+		}
+	},
+	{
+		"c": "(sed -nre 's/some regex with (group)/\\1/p')",
+		"t": "source.makefile",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
 	{
 		"c": "define",
 		"t": "source.makefile meta.scope.conditional.makefile keyword.control.define.makefile",
@@ -1572,6 +1660,545 @@
 			"hc_black": "string: #CE9178"
 		}
 	},
+	{
+		"c": "endif",
+		"t": "source.makefile meta.scope.conditional.makefile keyword.control.endif.makefile",
+		"r": {
+			"dark_plus": "keyword.control: #C586C0",
+			"light_plus": "keyword.control: #AF00DB",
+			"dark_vs": "keyword.control: #569CD6",
+			"light_vs": "keyword.control: #0000FF",
+			"hc_black": "keyword.control: #C586C0"
+		}
+	},
+	{
+		"c": "CXXVER_GE480",
+		"t": "source.makefile variable.other.makefile",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.makefile",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": ":=",
+		"t": "source.makefile punctuation.separator.key-value.makefile",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.makefile",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": "$(",
+		"t": "source.makefile string.interpolated.makefile punctuation.definition.variable.makefile",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178"
+		}
+	},
+	{
+		"c": "shell",
+		"t": "source.makefile string.interpolated.makefile meta.scope.function-call.makefile support.function.shell.makefile",
+		"r": {
+			"dark_plus": "support.function: #DCDCAA",
+			"light_plus": "support.function: #795E26",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "support.function: #DCDCAA"
+		}
+	},
+	{
+		"c": " expr `",
+		"t": "source.makefile string.interpolated.makefile meta.scope.function-call.makefile",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178"
+		}
+	},
+	{
+		"c": "$(",
+		"t": "source.makefile string.interpolated.makefile meta.scope.function-call.makefile string.interpolated.makefile punctuation.definition.variable.makefile",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178"
+		}
+	},
+	{
+		"c": "CXX",
+		"t": "source.makefile string.interpolated.makefile meta.scope.function-call.makefile string.interpolated.makefile variable.other.makefile",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "variable: #9CDCFE"
+		}
+	},
+	{
+		"c": ")",
+		"t": "source.makefile string.interpolated.makefile meta.scope.function-call.makefile string.interpolated.makefile punctuation.definition.variable.makefile",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178"
+		}
+	},
+	{
+		"c": " -dumpversion | sed -e 's/\\.\\([0-9][0-9]\\)/\\1/g' -e 's/\\.\\([0-9]\\)/0\\1/g' -e 's/^[0-9]\\{3,4\\}",
+		"t": "source.makefile string.interpolated.makefile meta.scope.function-call.makefile",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178"
+		}
+	},
+	{
+		"c": "$$",
+		"t": "source.makefile string.interpolated.makefile meta.scope.function-call.makefile variable.language.makefile",
+		"r": {
+			"dark_plus": "variable.language: #569CD6",
+			"light_plus": "variable.language: #0000FF",
+			"dark_vs": "variable.language: #569CD6",
+			"light_vs": "variable.language: #0000FF",
+			"hc_black": "variable: #9CDCFE"
+		}
+	},
+	{
+		"c": "/&00/'` \\>= 40800",
+		"t": "source.makefile string.interpolated.makefile meta.scope.function-call.makefile",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178"
+		}
+	},
+	{
+		"c": ")",
+		"t": "source.makefile string.interpolated.makefile punctuation.definition.variable.makefile",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178"
+		}
+	},
+	{
+		"c": "ok",
+		"t": "source.makefile variable.other.makefile",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.makefile",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": ":=",
+		"t": "source.makefile punctuation.separator.key-value.makefile",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": " ok",
+		"t": "source.makefile",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": "$(",
+		"t": "source.makefile string.interpolated.makefile punctuation.definition.variable.makefile",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178"
+		}
+	},
+	{
+		"c": "info",
+		"t": "source.makefile string.interpolated.makefile meta.scope.function-call.makefile support.function.info.makefile",
+		"r": {
+			"dark_plus": "support.function: #DCDCAA",
+			"light_plus": "support.function: #795E26",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "support.function: #DCDCAA"
+		}
+	},
+	{
+		"c": " Braces {} in parentheses ({}): ",
+		"t": "source.makefile string.interpolated.makefile meta.scope.function-call.makefile",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178"
+		}
+	},
+	{
+		"c": "${",
+		"t": "source.makefile string.interpolated.makefile meta.scope.function-call.makefile string.interpolated.makefile punctuation.definition.variable.makefile",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178"
+		}
+	},
+	{
+		"c": "ok",
+		"t": "source.makefile string.interpolated.makefile meta.scope.function-call.makefile string.interpolated.makefile variable.other.makefile",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "variable: #9CDCFE"
+		}
+	},
+	{
+		"c": "}",
+		"t": "source.makefile string.interpolated.makefile meta.scope.function-call.makefile string.interpolated.makefile punctuation.definition.variable.makefile",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178"
+		}
+	},
+	{
+		"c": ")",
+		"t": "source.makefile string.interpolated.makefile punctuation.definition.variable.makefile",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178"
+		}
+	},
+	{
+		"c": "${",
+		"t": "source.makefile string.interpolated.makefile punctuation.definition.variable.makefile",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178"
+		}
+	},
+	{
+		"c": "info",
+		"t": "source.makefile string.interpolated.makefile meta.scope.function-call.makefile support.function.info.makefile",
+		"r": {
+			"dark_plus": "support.function: #DCDCAA",
+			"light_plus": "support.function: #795E26",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "support.function: #DCDCAA"
+		}
+	},
+	{
+		"c": " Parentheses () in braces {()}: ",
+		"t": "source.makefile string.interpolated.makefile meta.scope.function-call.makefile",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178"
+		}
+	},
+	{
+		"c": "$(",
+		"t": "source.makefile string.interpolated.makefile meta.scope.function-call.makefile string.interpolated.makefile punctuation.definition.variable.makefile",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178"
+		}
+	},
+	{
+		"c": "ok",
+		"t": "source.makefile string.interpolated.makefile meta.scope.function-call.makefile string.interpolated.makefile variable.other.makefile",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "variable: #9CDCFE"
+		}
+	},
+	{
+		"c": ")",
+		"t": "source.makefile string.interpolated.makefile meta.scope.function-call.makefile string.interpolated.makefile punctuation.definition.variable.makefile",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178"
+		}
+	},
+	{
+		"c": "}",
+		"t": "source.makefile string.interpolated.makefile punctuation.definition.variable.makefile",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178"
+		}
+	},
+	{
+		"c": "ifeq",
+		"t": "source.makefile meta.scope.conditional.makefile keyword.control.ifeq.makefile",
+		"r": {
+			"dark_plus": "keyword.control: #C586C0",
+			"light_plus": "keyword.control: #AF00DB",
+			"dark_vs": "keyword.control: #569CD6",
+			"light_vs": "keyword.control: #0000FF",
+			"hc_black": "keyword.control: #C586C0"
+		}
+	},
+	{
+		"c": " (\"",
+		"t": "source.makefile meta.scope.conditional.makefile meta.scope.condition.makefile",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": "${",
+		"t": "source.makefile meta.scope.conditional.makefile meta.scope.condition.makefile string.interpolated.makefile punctuation.definition.variable.makefile",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178"
+		}
+	},
+	{
+		"c": "ok",
+		"t": "source.makefile meta.scope.conditional.makefile meta.scope.condition.makefile string.interpolated.makefile variable.other.makefile",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "variable: #9CDCFE"
+		}
+	},
+	{
+		"c": "}",
+		"t": "source.makefile meta.scope.conditional.makefile meta.scope.condition.makefile string.interpolated.makefile punctuation.definition.variable.makefile",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178"
+		}
+	},
+	{
+		"c": "\", \"skip\")",
+		"t": "source.makefile meta.scope.conditional.makefile meta.scope.condition.makefile",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": "  ",
+		"t": "source.makefile meta.scope.conditional.makefile",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": "$(",
+		"t": "source.makefile meta.scope.conditional.makefile string.interpolated.makefile punctuation.definition.variable.makefile",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178"
+		}
+	},
+	{
+		"c": "ok",
+		"t": "source.makefile meta.scope.conditional.makefile string.interpolated.makefile variable.other.makefile",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "variable: #9CDCFE"
+		}
+	},
+	{
+		"c": ")",
+		"t": "source.makefile meta.scope.conditional.makefile string.interpolated.makefile punctuation.definition.variable.makefile",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178"
+		}
+	},
+	{
+		"c": ")}",
+		"t": "source.makefile meta.scope.conditional.makefile",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": "  ",
+		"t": "source.makefile meta.scope.conditional.makefile",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": "${",
+		"t": "source.makefile meta.scope.conditional.makefile string.interpolated.makefile punctuation.definition.variable.makefile",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178"
+		}
+	},
+	{
+		"c": "ok",
+		"t": "source.makefile meta.scope.conditional.makefile string.interpolated.makefile variable.other.makefile",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "variable: #9CDCFE"
+		}
+	},
+	{
+		"c": "}",
+		"t": "source.makefile meta.scope.conditional.makefile string.interpolated.makefile punctuation.definition.variable.makefile",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178"
+		}
+	},
+	{
+		"c": "})",
+		"t": "source.makefile meta.scope.conditional.makefile",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
 	{
 		"c": "endif",
 		"t": "source.makefile meta.scope.conditional.makefile keyword.control.endif.makefile",
diff --git a/extensions/markdown-basics/language-configuration.json b/extensions/markdown-basics/language-configuration.json
index 23a25ede9cc..ccddf061e75 100644
--- a/extensions/markdown-basics/language-configuration.json
+++ b/extensions/markdown-basics/language-configuration.json
@@ -36,7 +36,9 @@
 	"surroundingPairs": [
 		["(", ")"],
 		["[", "]"],
-		["`", "`"]
+		["`", "`"],
+		["_", "_"],
+		["*", "*"]
 	],
 	"folding": {
 		"offSide": true,
diff --git a/extensions/markdown-basics/package.json b/extensions/markdown-basics/package.json
index a091ad8ea29..a81c7625531 100644
--- a/extensions/markdown-basics/package.json
+++ b/extensions/markdown-basics/package.json
@@ -17,9 +17,14 @@
 				],
 				"extensions": [
 					".md",
+          ".mkd",
+          ".mdwn",
 					".mdown",
 					".markdown",
-					".markdn"
+					".markdn",
+          ".mdtxt",
+          ".mdtext",
+					".workbook"
 				],
 				"configuration": "./language-configuration.json"
 			}
@@ -86,4 +91,4 @@
 	"scripts": {
 		"update-grammar": "node ../../build/npm/update-grammar.js microsoft/vscode-markdown-tm-grammar syntaxes/markdown.tmLanguage ./syntaxes/markdown.tmLanguage.json"
 	}
-}
\ No newline at end of file
+}
diff --git a/extensions/markdown-basics/snippets/markdown.json b/extensions/markdown-basics/snippets/markdown.json
index 6bba2591d10..4a5152c18c8 100644
--- a/extensions/markdown-basics/snippets/markdown.json
+++ b/extensions/markdown-basics/snippets/markdown.json
@@ -60,12 +60,12 @@
 	},
 	"Insert link": {
 		"prefix": "link",
-		"body": "[${1:text}](http://${2:link})$0",
+		"body": "[${1:text}](https://${2:link})$0",
 		"description": "Insert link"
 	},
 	"Insert image": {
 		"prefix": "image",
-		"body": "![${1:alt}](http://${2:link})$0",
+		"body": "![${1:alt}](https://${2:link})$0",
 		"description": "Insert image"
 	}
 }
diff --git a/extensions/markdown-basics/syntaxes/markdown.tmLanguage.json b/extensions/markdown-basics/syntaxes/markdown.tmLanguage.json
index 52b3dcd3ca9..d49d0688467 100644
--- a/extensions/markdown-basics/syntaxes/markdown.tmLanguage.json
+++ b/extensions/markdown-basics/syntaxes/markdown.tmLanguage.json
@@ -4,7 +4,7 @@
 		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
 		"Once accepted there, we are happy to receive an update request."
 	],
-	"version": "https://github.com/microsoft/vscode-markdown-tm-grammar/commit/ab08007feb924996eff9399c169f171fa17899ca",
+	"version": "https://github.com/microsoft/vscode-markdown-tm-grammar/commit/4504240cdb13a4640f64fc98a0adb858226a879e",
 	"name": "Markdown",
 	"scopeName": "text.html.markdown",
 	"patterns": [
@@ -722,7 +722,7 @@
 							"contentName": "meta.embedded.block.dosbatch",
 							"patterns": [
 								{
-									"include": "source.dosbatch"
+									"include": "source.batchfile"
 								}
 							]
 						}
@@ -1994,7 +1994,7 @@
 					"while": "(^|\\G)([ ]{4}|\\t)"
 				},
 				"separator": {
-					"match": "(^|\\G)[ ]{0,3}([*-_])([ ]{0,2}\\2){2,}[ \\t]*$\\n?",
+					"match": "(^|\\G)[ ]{0,3}([\\*\\-\\_])([ ]{0,2}\\2){2,}[ \\t]*$\\n?",
 					"name": "meta.separator.markdown"
 				}
 			}
diff --git a/extensions/markdown-basics/test/colorize-results/test-33886_md.json b/extensions/markdown-basics/test/colorize-results/test-33886_md.json
index 185d172e8af..179172a5738 100644
--- a/extensions/markdown-basics/test/colorize-results/test-33886_md.json
+++ b/extensions/markdown-basics/test/colorize-results/test-33886_md.json
@@ -34,7 +34,7 @@
 	},
 	{
 		"c": "<",
-		"t": "text.html.markdown meta.tag.block.any.html punctuation.definition.tag.begin.html",
+		"t": "text.html.markdown meta.tag.structure.pre.start.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -45,7 +45,7 @@
 	},
 	{
 		"c": "pre",
-		"t": "text.html.markdown meta.tag.block.any.html entity.name.tag.block.any.html",
+		"t": "text.html.markdown meta.tag.structure.pre.start.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -56,7 +56,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.markdown meta.tag.block.any.html punctuation.definition.tag.end.html",
+		"t": "text.html.markdown meta.tag.structure.pre.start.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -67,7 +67,7 @@
 	},
 	{
 		"c": "<",
-		"t": "text.html.markdown meta.tag.inline.any.html punctuation.definition.tag.begin.html",
+		"t": "text.html.markdown meta.tag.inline.code.start.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -78,7 +78,7 @@
 	},
 	{
 		"c": "code",
-		"t": "text.html.markdown meta.tag.inline.any.html entity.name.tag.inline.any.html",
+		"t": "text.html.markdown meta.tag.inline.code.start.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -89,7 +89,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.markdown meta.tag.inline.any.html punctuation.definition.tag.end.html",
+		"t": "text.html.markdown meta.tag.inline.code.start.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -111,7 +111,7 @@
 	},
 	{
 		"c": "</",
-		"t": "text.html.markdown meta.paragraph.markdown meta.tag.inline.any.html punctuation.definition.tag.begin.html",
+		"t": "text.html.markdown meta.paragraph.markdown meta.tag.inline.code.end.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -122,7 +122,7 @@
 	},
 	{
 		"c": "code",
-		"t": "text.html.markdown meta.paragraph.markdown meta.tag.inline.any.html entity.name.tag.inline.any.html",
+		"t": "text.html.markdown meta.paragraph.markdown meta.tag.inline.code.end.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -133,7 +133,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.markdown meta.paragraph.markdown meta.tag.inline.any.html punctuation.definition.tag.end.html",
+		"t": "text.html.markdown meta.paragraph.markdown meta.tag.inline.code.end.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -144,7 +144,7 @@
 	},
 	{
 		"c": "</",
-		"t": "text.html.markdown meta.paragraph.markdown meta.tag.block.any.html punctuation.definition.tag.begin.html",
+		"t": "text.html.markdown meta.paragraph.markdown meta.tag.structure.pre.end.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -155,7 +155,7 @@
 	},
 	{
 		"c": "pre",
-		"t": "text.html.markdown meta.paragraph.markdown meta.tag.block.any.html entity.name.tag.block.any.html",
+		"t": "text.html.markdown meta.paragraph.markdown meta.tag.structure.pre.end.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -166,7 +166,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.markdown meta.paragraph.markdown meta.tag.block.any.html punctuation.definition.tag.end.html",
+		"t": "text.html.markdown meta.paragraph.markdown meta.tag.structure.pre.end.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -210,7 +210,7 @@
 	},
 	{
 		"c": "<",
-		"t": "text.html.markdown meta.tag.block.any.html punctuation.definition.tag.begin.html",
+		"t": "text.html.markdown meta.tag.structure.pre.start.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -221,7 +221,7 @@
 	},
 	{
 		"c": "pre",
-		"t": "text.html.markdown meta.tag.block.any.html entity.name.tag.block.any.html",
+		"t": "text.html.markdown meta.tag.structure.pre.start.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -232,7 +232,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.markdown meta.tag.block.any.html punctuation.definition.tag.end.html",
+		"t": "text.html.markdown meta.tag.structure.pre.start.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -265,7 +265,7 @@
 	},
 	{
 		"c": "</",
-		"t": "text.html.markdown meta.paragraph.markdown meta.tag.block.any.html punctuation.definition.tag.begin.html",
+		"t": "text.html.markdown meta.paragraph.markdown meta.tag.structure.pre.end.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -276,7 +276,7 @@
 	},
 	{
 		"c": "pre",
-		"t": "text.html.markdown meta.paragraph.markdown meta.tag.block.any.html entity.name.tag.block.any.html",
+		"t": "text.html.markdown meta.paragraph.markdown meta.tag.structure.pre.end.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -287,7 +287,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.markdown meta.paragraph.markdown meta.tag.block.any.html punctuation.definition.tag.end.html",
+		"t": "text.html.markdown meta.paragraph.markdown meta.tag.structure.pre.end.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
diff --git a/extensions/markdown-basics/test/colorize-results/test_md.json b/extensions/markdown-basics/test/colorize-results/test_md.json
index eb09a71c815..dc9ce77ffe7 100644
--- a/extensions/markdown-basics/test/colorize-results/test_md.json
+++ b/extensions/markdown-basics/test/colorize-results/test_md.json
@@ -300,9 +300,9 @@
 		"c": "<!--",
 		"t": "text.html.markdown comment.block.html punctuation.definition.comment.html",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -311,9 +311,9 @@
 		"c": " html madness ",
 		"t": "text.html.markdown comment.block.html",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -322,16 +322,16 @@
 		"c": "-->",
 		"t": "text.html.markdown comment.block.html punctuation.definition.comment.html",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
 	},
 	{
 		"c": "<",
-		"t": "text.html.markdown meta.tag.block.any.html punctuation.definition.tag.begin.html",
+		"t": "text.html.markdown meta.tag.structure.div.start.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -342,7 +342,7 @@
 	},
 	{
 		"c": "div",
-		"t": "text.html.markdown meta.tag.block.any.html entity.name.tag.block.any.html",
+		"t": "text.html.markdown meta.tag.structure.div.start.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -353,7 +353,7 @@
 	},
 	{
 		"c": " ",
-		"t": "text.html.markdown meta.tag.block.any.html",
+		"t": "text.html.markdown meta.tag.structure.div.start.html",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -364,7 +364,7 @@
 	},
 	{
 		"c": "class",
-		"t": "text.html.markdown meta.tag.block.any.html entity.other.attribute-name.html",
+		"t": "text.html.markdown meta.tag.structure.div.start.html meta.attribute.class.html entity.other.attribute-name.html",
 		"r": {
 			"dark_plus": "entity.other.attribute-name: #9CDCFE",
 			"light_plus": "entity.other.attribute-name: #FF0000",
@@ -375,7 +375,7 @@
 	},
 	{
 		"c": "=",
-		"t": "text.html.markdown meta.tag.block.any.html",
+		"t": "text.html.markdown meta.tag.structure.div.start.html meta.attribute.class.html punctuation.separator.key-value.html",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -386,7 +386,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "text.html.markdown meta.tag.block.any.html string.quoted.double.html punctuation.definition.string.begin.html",
+		"t": "text.html.markdown meta.tag.structure.div.start.html meta.attribute.class.html string.quoted.double.html punctuation.definition.string.begin.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.double.html: #0000FF",
@@ -397,7 +397,7 @@
 	},
 	{
 		"c": "custom-class",
-		"t": "text.html.markdown meta.tag.block.any.html string.quoted.double.html",
+		"t": "text.html.markdown meta.tag.structure.div.start.html meta.attribute.class.html string.quoted.double.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.double.html: #0000FF",
@@ -408,7 +408,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "text.html.markdown meta.tag.block.any.html string.quoted.double.html punctuation.definition.string.end.html",
+		"t": "text.html.markdown meta.tag.structure.div.start.html meta.attribute.class.html string.quoted.double.html punctuation.definition.string.end.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.double.html: #0000FF",
@@ -419,7 +419,7 @@
 	},
 	{
 		"c": " ",
-		"t": "text.html.markdown meta.tag.block.any.html",
+		"t": "text.html.markdown meta.tag.structure.div.start.html",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -430,7 +430,7 @@
 	},
 	{
 		"c": "markdown",
-		"t": "text.html.markdown meta.tag.block.any.html entity.other.attribute-name.html",
+		"t": "text.html.markdown meta.tag.structure.div.start.html meta.attribute.unrecognized.markdown.html entity.other.attribute-name.html",
 		"r": {
 			"dark_plus": "entity.other.attribute-name: #9CDCFE",
 			"light_plus": "entity.other.attribute-name: #FF0000",
@@ -441,7 +441,7 @@
 	},
 	{
 		"c": "=",
-		"t": "text.html.markdown meta.tag.block.any.html",
+		"t": "text.html.markdown meta.tag.structure.div.start.html meta.attribute.unrecognized.markdown.html punctuation.separator.key-value.html",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -452,7 +452,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "text.html.markdown meta.tag.block.any.html string.quoted.double.html punctuation.definition.string.begin.html",
+		"t": "text.html.markdown meta.tag.structure.div.start.html meta.attribute.unrecognized.markdown.html string.quoted.double.html punctuation.definition.string.begin.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.double.html: #0000FF",
@@ -463,7 +463,7 @@
 	},
 	{
 		"c": "1",
-		"t": "text.html.markdown meta.tag.block.any.html string.quoted.double.html",
+		"t": "text.html.markdown meta.tag.structure.div.start.html meta.attribute.unrecognized.markdown.html string.quoted.double.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.double.html: #0000FF",
@@ -474,7 +474,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "text.html.markdown meta.tag.block.any.html string.quoted.double.html punctuation.definition.string.end.html",
+		"t": "text.html.markdown meta.tag.structure.div.start.html meta.attribute.unrecognized.markdown.html string.quoted.double.html punctuation.definition.string.end.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.double.html: #0000FF",
@@ -485,7 +485,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.markdown meta.tag.block.any.html punctuation.definition.tag.end.html",
+		"t": "text.html.markdown meta.tag.structure.div.start.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -507,7 +507,7 @@
 	},
 	{
 		"c": "<",
-		"t": "text.html.markdown meta.tag.block.any.html punctuation.definition.tag.begin.html",
+		"t": "text.html.markdown meta.tag.structure.div.start.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -518,7 +518,7 @@
 	},
 	{
 		"c": "div",
-		"t": "text.html.markdown meta.tag.block.any.html entity.name.tag.block.any.html",
+		"t": "text.html.markdown meta.tag.structure.div.start.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -529,7 +529,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.markdown meta.tag.block.any.html punctuation.definition.tag.end.html",
+		"t": "text.html.markdown meta.tag.structure.div.start.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -562,7 +562,7 @@
 	},
 	{
 		"c": "</",
-		"t": "text.html.markdown meta.tag.block.any.html punctuation.definition.tag.begin.html",
+		"t": "text.html.markdown meta.tag.structure.div.end.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -573,7 +573,7 @@
 	},
 	{
 		"c": "div",
-		"t": "text.html.markdown meta.tag.block.any.html entity.name.tag.block.any.html",
+		"t": "text.html.markdown meta.tag.structure.div.end.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -584,7 +584,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.markdown meta.tag.block.any.html punctuation.definition.tag.end.html",
+		"t": "text.html.markdown meta.tag.structure.div.end.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -606,7 +606,7 @@
 	},
 	{
 		"c": "<",
-		"t": "text.html.markdown meta.embedded.block.html meta.tag.metadata.script.html punctuation.definition.tag.begin.html",
+		"t": "text.html.markdown meta.embedded.block.html meta.tag.metadata.script.start.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -617,7 +617,7 @@
 	},
 	{
 		"c": "script",
-		"t": "text.html.markdown meta.embedded.block.html meta.tag.metadata.script.html entity.name.tag.html",
+		"t": "text.html.markdown meta.embedded.block.html meta.tag.metadata.script.start.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -628,7 +628,7 @@
 	},
 	{
 		"c": " ",
-		"t": "text.html.markdown meta.embedded.block.html meta.tag.metadata.script.html",
+		"t": "text.html.markdown meta.embedded.block.html meta.tag.metadata.script.start.html",
 		"r": {
 			"dark_plus": "meta.embedded: #D4D4D4",
 			"light_plus": "meta.embedded: #000000",
@@ -639,7 +639,7 @@
 	},
 	{
 		"c": "type",
-		"t": "text.html.markdown meta.embedded.block.html meta.tag.metadata.script.html entity.other.attribute-name.html",
+		"t": "text.html.markdown meta.embedded.block.html meta.tag.metadata.script.start.html meta.attribute.type.html entity.other.attribute-name.html",
 		"r": {
 			"dark_plus": "entity.other.attribute-name: #9CDCFE",
 			"light_plus": "entity.other.attribute-name: #FF0000",
@@ -650,7 +650,7 @@
 	},
 	{
 		"c": "=",
-		"t": "text.html.markdown meta.embedded.block.html meta.tag.metadata.script.html",
+		"t": "text.html.markdown meta.embedded.block.html meta.tag.metadata.script.start.html meta.attribute.type.html punctuation.separator.key-value.html",
 		"r": {
 			"dark_plus": "meta.embedded: #D4D4D4",
 			"light_plus": "meta.embedded: #000000",
@@ -661,7 +661,7 @@
 	},
 	{
 		"c": "'",
-		"t": "text.html.markdown meta.embedded.block.html meta.tag.metadata.script.html string.quoted.single.html punctuation.definition.string.begin.html",
+		"t": "text.html.markdown meta.embedded.block.html meta.tag.metadata.script.start.html meta.attribute.type.html string.quoted.single.html punctuation.definition.string.begin.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.single.html: #0000FF",
@@ -672,7 +672,7 @@
 	},
 	{
 		"c": "text/x-koka",
-		"t": "text.html.markdown meta.embedded.block.html meta.tag.metadata.script.html string.quoted.single.html",
+		"t": "text.html.markdown meta.embedded.block.html meta.tag.metadata.script.start.html meta.attribute.type.html string.quoted.single.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.single.html: #0000FF",
@@ -683,7 +683,7 @@
 	},
 	{
 		"c": "'",
-		"t": "text.html.markdown meta.embedded.block.html meta.tag.metadata.script.html string.quoted.single.html punctuation.definition.string.end.html",
+		"t": "text.html.markdown meta.embedded.block.html meta.tag.metadata.script.start.html meta.attribute.type.html string.quoted.single.html punctuation.definition.string.end.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.single.html: #0000FF",
@@ -694,7 +694,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.markdown meta.embedded.block.html meta.tag.metadata.script.html punctuation.definition.tag.end.html",
+		"t": "text.html.markdown meta.embedded.block.html meta.tag.metadata.script.start.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -727,7 +727,7 @@
 	},
 	{
 		"c": "</",
-		"t": "text.html.markdown meta.embedded.block.html meta.tag.metadata.script.html punctuation.definition.tag.begin.html",
+		"t": "text.html.markdown meta.embedded.block.html meta.tag.metadata.script.end.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -738,7 +738,7 @@
 	},
 	{
 		"c": "script",
-		"t": "text.html.markdown meta.embedded.block.html meta.tag.metadata.script.html entity.name.tag.html",
+		"t": "text.html.markdown meta.embedded.block.html meta.tag.metadata.script.end.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -749,7 +749,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.markdown meta.embedded.block.html meta.tag.metadata.script.html punctuation.definition.tag.end.html",
+		"t": "text.html.markdown meta.embedded.block.html meta.tag.metadata.script.end.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -770,29 +770,7 @@
 		}
 	},
 	{
-		"c": "  and a ",
-		"t": "text.html.markdown",
-		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF"
-		}
-	},
-	{
-		"c": "&",
-		"t": "text.html.markdown invalid.illegal.bad-ampersand.html",
-		"r": {
-			"dark_plus": "invalid: #F44747",
-			"light_plus": "invalid: #CD3131",
-			"dark_vs": "invalid: #F44747",
-			"light_vs": "invalid: #CD3131",
-			"hc_black": "invalid: #F44747"
-		}
-	},
-	{
-		"c": " ",
+		"c": "  and a & ",
 		"t": "text.html.markdown",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
@@ -804,7 +782,7 @@
 	},
 	{
 		"c": "<",
-		"t": "text.html.markdown meta.tag.inline.any.html punctuation.definition.tag.begin.html",
+		"t": "text.html.markdown meta.tag.inline.b.start.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -815,7 +793,7 @@
 	},
 	{
 		"c": "b",
-		"t": "text.html.markdown meta.tag.inline.any.html entity.name.tag.inline.any.html",
+		"t": "text.html.markdown meta.tag.inline.b.start.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -826,7 +804,7 @@
 	},
 	{
 		"c": " ",
-		"t": "text.html.markdown meta.tag.inline.any.html",
+		"t": "text.html.markdown meta.tag.inline.b.start.html",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -837,7 +815,7 @@
 	},
 	{
 		"c": "class",
-		"t": "text.html.markdown meta.tag.inline.any.html entity.other.attribute-name.html",
+		"t": "text.html.markdown meta.tag.inline.b.start.html meta.attribute.class.html entity.other.attribute-name.html",
 		"r": {
 			"dark_plus": "entity.other.attribute-name: #9CDCFE",
 			"light_plus": "entity.other.attribute-name: #FF0000",
@@ -848,7 +826,7 @@
 	},
 	{
 		"c": "=",
-		"t": "text.html.markdown meta.tag.inline.any.html",
+		"t": "text.html.markdown meta.tag.inline.b.start.html meta.attribute.class.html punctuation.separator.key-value.html",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -859,7 +837,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "text.html.markdown meta.tag.inline.any.html string.quoted.double.html punctuation.definition.string.begin.html",
+		"t": "text.html.markdown meta.tag.inline.b.start.html meta.attribute.class.html string.quoted.double.html punctuation.definition.string.begin.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.double.html: #0000FF",
@@ -870,7 +848,7 @@
 	},
 	{
 		"c": "bold",
-		"t": "text.html.markdown meta.tag.inline.any.html string.quoted.double.html",
+		"t": "text.html.markdown meta.tag.inline.b.start.html meta.attribute.class.html string.quoted.double.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.double.html: #0000FF",
@@ -881,7 +859,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "text.html.markdown meta.tag.inline.any.html string.quoted.double.html punctuation.definition.string.end.html",
+		"t": "text.html.markdown meta.tag.inline.b.start.html meta.attribute.class.html string.quoted.double.html punctuation.definition.string.end.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.double.html: #0000FF",
@@ -892,7 +870,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.markdown meta.tag.inline.any.html punctuation.definition.tag.end.html",
+		"t": "text.html.markdown meta.tag.inline.b.start.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -914,7 +892,7 @@
 	},
 	{
 		"c": "</",
-		"t": "text.html.markdown meta.tag.inline.any.html punctuation.definition.tag.begin.html",
+		"t": "text.html.markdown meta.tag.inline.b.end.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -925,7 +903,7 @@
 	},
 	{
 		"c": "b",
-		"t": "text.html.markdown meta.tag.inline.any.html entity.name.tag.inline.any.html",
+		"t": "text.html.markdown meta.tag.inline.b.end.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -936,7 +914,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.markdown meta.tag.inline.any.html punctuation.definition.tag.end.html",
+		"t": "text.html.markdown meta.tag.inline.b.end.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -969,7 +947,7 @@
 	},
 	{
 		"c": "<",
-		"t": "text.html.markdown meta.embedded.block.html meta.tag.metadata.style.html punctuation.definition.tag.begin.html",
+		"t": "text.html.markdown meta.embedded.block.html meta.tag.metadata.style.start.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -980,7 +958,7 @@
 	},
 	{
 		"c": "style",
-		"t": "text.html.markdown meta.embedded.block.html meta.tag.metadata.style.html entity.name.tag.html",
+		"t": "text.html.markdown meta.embedded.block.html meta.tag.metadata.style.start.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -991,7 +969,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.markdown meta.embedded.block.html meta.tag.metadata.style.html punctuation.definition.tag.end.html",
+		"t": "text.html.markdown meta.embedded.block.html meta.tag.metadata.style.start.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -1156,7 +1134,7 @@
 	},
 	{
 		"c": "<",
-		"t": "text.html.markdown meta.embedded.block.html meta.tag.metadata.style.html punctuation.definition.tag.begin.html source.css",
+		"t": "text.html.markdown meta.embedded.block.html meta.tag.metadata.style.end.html punctuation.definition.tag.begin.html source.css",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -1167,7 +1145,7 @@
 	},
 	{
 		"c": "/",
-		"t": "text.html.markdown meta.embedded.block.html meta.tag.metadata.style.html punctuation.definition.tag.begin.html",
+		"t": "text.html.markdown meta.embedded.block.html meta.tag.metadata.style.end.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -1178,7 +1156,7 @@
 	},
 	{
 		"c": "style",
-		"t": "text.html.markdown meta.embedded.block.html meta.tag.metadata.style.html entity.name.tag.html",
+		"t": "text.html.markdown meta.embedded.block.html meta.tag.metadata.style.end.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -1189,7 +1167,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.markdown meta.embedded.block.html meta.tag.metadata.style.html punctuation.definition.tag.end.html",
+		"t": "text.html.markdown meta.embedded.block.html meta.tag.metadata.style.end.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -1200,7 +1178,7 @@
 	},
 	{
 		"c": "</",
-		"t": "text.html.markdown meta.tag.block.any.html punctuation.definition.tag.begin.html",
+		"t": "text.html.markdown meta.tag.structure.div.end.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -1211,7 +1189,7 @@
 	},
 	{
 		"c": "div",
-		"t": "text.html.markdown meta.tag.block.any.html entity.name.tag.block.any.html",
+		"t": "text.html.markdown meta.tag.structure.div.end.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -1222,7 +1200,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.markdown meta.tag.block.any.html punctuation.definition.tag.end.html",
+		"t": "text.html.markdown meta.tag.structure.div.end.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -1620,9 +1598,9 @@
 		"c": ">",
 		"t": "text.html.markdown markup.quote.markdown beginning.punctuation.definition.quote.markdown",
 		"r": {
-			"dark_plus": "beginning.punctuation.definition.quote.markdown: #608B4E",
+			"dark_plus": "beginning.punctuation.definition.quote.markdown: #6A9955",
 			"light_plus": "beginning.punctuation.definition.quote.markdown: #0451A5",
-			"dark_vs": "beginning.punctuation.definition.quote.markdown: #608B4E",
+			"dark_vs": "beginning.punctuation.definition.quote.markdown: #6A9955",
 			"light_vs": "beginning.punctuation.definition.quote.markdown: #0451A5",
 			"hc_black": "default: #FFFFFF"
 		}
@@ -1653,9 +1631,9 @@
 		"c": ">",
 		"t": "text.html.markdown markup.quote.markdown beginning.punctuation.definition.quote.markdown",
 		"r": {
-			"dark_plus": "beginning.punctuation.definition.quote.markdown: #608B4E",
+			"dark_plus": "beginning.punctuation.definition.quote.markdown: #6A9955",
 			"light_plus": "beginning.punctuation.definition.quote.markdown: #0451A5",
-			"dark_vs": "beginning.punctuation.definition.quote.markdown: #608B4E",
+			"dark_vs": "beginning.punctuation.definition.quote.markdown: #6A9955",
 			"light_vs": "beginning.punctuation.definition.quote.markdown: #0451A5",
 			"hc_black": "default: #FFFFFF"
 		}
@@ -1664,9 +1642,9 @@
 		"c": ">",
 		"t": "text.html.markdown markup.quote.markdown markup.quote.markdown beginning.punctuation.definition.quote.markdown",
 		"r": {
-			"dark_plus": "beginning.punctuation.definition.quote.markdown: #608B4E",
+			"dark_plus": "beginning.punctuation.definition.quote.markdown: #6A9955",
 			"light_plus": "beginning.punctuation.definition.quote.markdown: #0451A5",
-			"dark_vs": "beginning.punctuation.definition.quote.markdown: #608B4E",
+			"dark_vs": "beginning.punctuation.definition.quote.markdown: #6A9955",
 			"light_vs": "beginning.punctuation.definition.quote.markdown: #0451A5",
 			"hc_black": "default: #FFFFFF"
 		}
@@ -1741,9 +1719,9 @@
 		"c": ">",
 		"t": "text.html.markdown markup.list.numbered.markdown markup.quote.markdown beginning.punctuation.definition.quote.markdown",
 		"r": {
-			"dark_plus": "beginning.punctuation.definition.quote.markdown: #608B4E",
+			"dark_plus": "beginning.punctuation.definition.quote.markdown: #6A9955",
 			"light_plus": "beginning.punctuation.definition.quote.markdown: #0451A5",
-			"dark_vs": "beginning.punctuation.definition.quote.markdown: #608B4E",
+			"dark_vs": "beginning.punctuation.definition.quote.markdown: #6A9955",
 			"light_vs": "beginning.punctuation.definition.quote.markdown: #0451A5",
 			"hc_black": "default: #FFFFFF"
 		}
@@ -2520,7 +2498,7 @@
 	},
 	{
 		"c": "<",
-		"t": "text.html.markdown meta.paragraph.markdown meta.tag.inline.any.html punctuation.definition.tag.begin.html",
+		"t": "text.html.markdown meta.paragraph.markdown meta.tag.inline.abbr.start.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -2531,7 +2509,7 @@
 	},
 	{
 		"c": "abbr",
-		"t": "text.html.markdown meta.paragraph.markdown meta.tag.inline.any.html entity.name.tag.inline.any.html",
+		"t": "text.html.markdown meta.paragraph.markdown meta.tag.inline.abbr.start.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -2542,7 +2520,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.markdown meta.paragraph.markdown meta.tag.inline.any.html punctuation.definition.tag.end.html",
+		"t": "text.html.markdown meta.paragraph.markdown meta.tag.inline.abbr.start.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
diff --git a/extensions/markdown-language-features/.vscodeignore b/extensions/markdown-language-features/.vscodeignore
index ebab1d50b9b..6d68d9a450e 100644
--- a/extensions/markdown-language-features/.vscodeignore
+++ b/extensions/markdown-language-features/.vscodeignore
@@ -1,3 +1,4 @@
 test/**
 src/**
-tsconfig.json
\ No newline at end of file
+tsconfig.json
+out/test/**
\ No newline at end of file
diff --git a/extensions/markdown-language-features/README.md b/extensions/markdown-language-features/README.md
new file mode 100644
index 00000000000..e80e9e886bb
--- /dev/null
+++ b/extensions/markdown-language-features/README.md
@@ -0,0 +1,7 @@
+# Language Features for Markdown files
+
+**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.
+
+## Features
+
+See [Markdown in Visual Studio Code](https://code.visualstudio.com/docs/languages/markdown) to learn about the features of this extension.
\ No newline at end of file
diff --git a/extensions/markdown-language-features/extension.webpack.config.js b/extensions/markdown-language-features/extension.webpack.config.js
new file mode 100644
index 00000000000..de88398eca0
--- /dev/null
+++ b/extensions/markdown-language-features/extension.webpack.config.js
@@ -0,0 +1,20 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+//@ts-check
+
+'use strict';
+
+const withDefaults = require('../shared.webpack.config');
+
+module.exports = withDefaults({
+	context: __dirname,
+	resolve: {
+		mainFields: ['module', 'main']
+	},
+	entry: {
+		extension: './src/extension.ts',
+	}
+});
diff --git a/extensions/markdown-language-features/media/highlight.css b/extensions/markdown-language-features/media/highlight.css
index fd39af662c0..3b748b1c4f9 100644
--- a/extensions/markdown-language-features/media/highlight.css
+++ b/extensions/markdown-language-features/media/highlight.css
@@ -120,6 +120,11 @@ Visual Studio-like style based on original C# coloring by Jason Diamond <jason@d
 
 */
 
+.vscode-light .hljs-function,
+.vscode-light .hljs-params {
+	color: inherit;
+}
+
 .vscode-light .hljs-comment,
 .vscode-light .hljs-quote,
 .vscode-light .hljs-variable {
diff --git a/extensions/markdown-language-features/media/markdown.css b/extensions/markdown-language-features/media/markdown.css
index 65a73a4e998..e78f73d9666 100644
--- a/extensions/markdown-language-features/media/markdown.css
+++ b/extensions/markdown-language-features/media/markdown.css
@@ -196,18 +196,15 @@ pre code {
 }
 
 
-.vscode-light pre:not(.hljs),
-.vscode-light code > div {
+.vscode-light pre {
 	background-color: rgba(220, 220, 220, 0.4);
 }
 
-.vscode-dark pre:not(.hljs),
-.vscode-dark code > div {
+.vscode-dark pre {
 	background-color: rgba(10, 10, 10, 0.4);
 }
 
-.vscode-high-contrast pre:not(.hljs),
-.vscode-high-contrast code > div {
+.vscode-high-contrast pre {
 	background-color: rgb(0, 0, 0);
 }
 
diff --git a/extensions/markdown-language-features/package.json b/extensions/markdown-language-features/package.json
index aef3b9ed3bb..e0c56e6cb10 100644
--- a/extensions/markdown-language-features/package.json
+++ b/extensions/markdown-language-features/package.json
@@ -292,22 +292,24 @@
 		"build-preview": "webpack --mode development"
 	},
 	"dependencies": {
-		"highlight.js": "9.5.0",
-		"markdown-it": "^8.4.0",
+		"highlight.js": "9.12.0",
+		"markdown-it": "^8.4.1",
 		"markdown-it-named-headers": "0.0.4",
-		"vscode-extension-telemetry": "0.0.17",
-		"vscode-nls": "^3.2.1"
+		"vscode-extension-telemetry": "0.0.18",
+		"vscode-nls": "^4.0.0"
 	},
 	"devDependencies": {
 		"@types/highlight.js": "9.1.10",
 		"@types/lodash.throttle": "^4.1.3",
 		"@types/markdown-it": "0.0.2",
-		"@types/node": "7.0.43",
+		"@types/node": "^8.10.25",
 		"lodash.throttle": "^4.1.1",
+		"mocha-junit-reporter": "^1.17.0",
+		"mocha-multi-reporters": "^1.1.7",
 		"ts-loader": "^4.0.1",
 		"typescript": "^2.7.2",
 		"vscode": "^1.1.10",
 		"webpack": "^4.1.0",
 		"webpack-cli": "^2.0.10"
 	}
-}
\ No newline at end of file
+}
diff --git a/extensions/markdown-language-features/src/commands/openDocumentLink.ts b/extensions/markdown-language-features/src/commands/openDocumentLink.ts
index 86828c02806..97303b4ecb7 100644
--- a/extensions/markdown-language-features/src/commands/openDocumentLink.ts
+++ b/extensions/markdown-language-features/src/commands/openDocumentLink.ts
@@ -63,7 +63,7 @@ export class OpenDocumentLinkCommand implements Command {
 			if (entry) {
 				return editor.revealRange(new vscode.Range(entry.line, 0, entry.line, 0), vscode.TextEditorRevealType.AtTop);
 			}
-			const lineNumberFragment = fragment.match(/^L(\d+)$/);
+			const lineNumberFragment = fragment.match(/^L(\d+)$/i);
 			if (lineNumberFragment) {
 				const line = +lineNumberFragment[1] - 1;
 				if (!isNaN(line)) {
diff --git a/extensions/markdown-language-features/src/commands/showPreview.ts b/extensions/markdown-language-features/src/commands/showPreview.ts
index c522c2b5ddc..bd59d575bbb 100644
--- a/extensions/markdown-language-features/src/commands/showPreview.ts
+++ b/extensions/markdown-language-features/src/commands/showPreview.ts
@@ -10,27 +10,6 @@ import { MarkdownPreviewManager } from '../features/previewManager';
 import { TelemetryReporter } from '../telemetryReporter';
 import { PreviewSettings } from '../features/preview';
 
-
-function getViewColumn(sideBySide: boolean): vscode.ViewColumn | undefined {
-	const active = vscode.window.activeTextEditor;
-	if (!active) {
-		return vscode.ViewColumn.One;
-	}
-
-	if (!sideBySide) {
-		return active.viewColumn;
-	}
-
-	switch (active.viewColumn) {
-		case vscode.ViewColumn.One:
-			return vscode.ViewColumn.Two;
-		case vscode.ViewColumn.Two:
-			return vscode.ViewColumn.Three;
-	}
-
-	return active.viewColumn;
-}
-
 interface ShowPreviewSettings {
 	readonly sideBySide?: boolean;
 	readonly locked?: boolean;
@@ -59,9 +38,10 @@ async function showPreview(
 		return;
 	}
 
+	const resourceColumn = (vscode.window.activeTextEditor && vscode.window.activeTextEditor.viewColumn) || vscode.ViewColumn.One;
 	webviewManager.preview(resource, {
-		resourceColumn: (vscode.window.activeTextEditor && vscode.window.activeTextEditor.viewColumn) || vscode.ViewColumn.One,
-		previewColumn: getViewColumn(!!previewSettings.sideBySide) || vscode.ViewColumn.Active,
+		resourceColumn: resourceColumn,
+		previewColumn: previewSettings.sideBySide ? resourceColumn + 1 : resourceColumn,
 		locked: !!previewSettings.locked
 	});
 
diff --git a/extensions/markdown-language-features/src/extension.ts b/extensions/markdown-language-features/src/extension.ts
index a9d95e36ce8..7786db20216 100644
--- a/extensions/markdown-language-features/src/extension.ts
+++ b/extensions/markdown-language-features/src/extension.ts
@@ -24,7 +24,7 @@ export function activate(context: vscode.ExtensionContext) {
 	const telemetryReporter = loadDefaultTelemetryReporter();
 	context.subscriptions.push(telemetryReporter);
 
-	const contributions = getMarkdownExtensionContributions();
+	const contributions = getMarkdownExtensionContributions(context);
 
 	const cspArbiter = new ExtensionContentSecurityPolicyArbiter(context.globalState, context.workspaceState);
 	const engine = new MarkdownEngine(contributions, githubSlugifier);
diff --git a/extensions/markdown-language-features/src/features/documentSymbolProvider.ts b/extensions/markdown-language-features/src/features/documentSymbolProvider.ts
index 38b33197200..bf0d5edb852 100644
--- a/extensions/markdown-language-features/src/features/documentSymbolProvider.ts
+++ b/extensions/markdown-language-features/src/features/documentSymbolProvider.ts
@@ -5,8 +5,13 @@
 
 import * as vscode from 'vscode';
 import { MarkdownEngine } from '../markdownEngine';
-import { TableOfContentsProvider, SkinnyTextDocument } from '../tableOfContentsProvider';
+import { TableOfContentsProvider, SkinnyTextDocument, TocEntry } from '../tableOfContentsProvider';
 
+interface MarkdownSymbol {
+	readonly level: number;
+	readonly parent: MarkdownSymbol | undefined;
+	readonly children: vscode.DocumentSymbol[];
+}
 
 export default class MDDocumentSymbolProvider implements vscode.DocumentSymbolProvider {
 
@@ -14,10 +19,57 @@ export default class MDDocumentSymbolProvider implements vscode.DocumentSymbolPr
 		private readonly engine: MarkdownEngine
 	) { }
 
-	public async provideDocumentSymbols(document: SkinnyTextDocument): Promise<vscode.SymbolInformation[]> {
+	public async provideDocumentSymbolInformation(document: SkinnyTextDocument): Promise<vscode.SymbolInformation[]> {
 		const toc = await new TableOfContentsProvider(this.engine, document).getToc();
-		return toc.map(entry => {
-			return new vscode.SymbolInformation('#'.repeat(entry.level) + ' ' + entry.text, vscode.SymbolKind.String, '', entry.location);
-		});
+		return toc.map(entry => this.toSymbolInformation(entry));
+	}
+
+	public async provideDocumentSymbols(document: SkinnyTextDocument): Promise<vscode.DocumentSymbol[]> {
+		const toc = await new TableOfContentsProvider(this.engine, document).getToc();
+		const root: MarkdownSymbol = {
+			level: -Infinity,
+			children: [],
+			parent: undefined
+		};
+		this.buildTree(root, toc);
+		return root.children;
+	}
+
+	private buildTree(parent: MarkdownSymbol, entries: TocEntry[]) {
+		if (!entries.length) {
+			return;
+		}
+
+		const entry = entries[0];
+		const symbol = this.toDocumentSymbol(entry);
+		symbol.children = [];
+
+		while (parent && entry.level <= parent.level) {
+			parent = parent.parent!;
+		}
+		parent.children.push(symbol);
+		this.buildTree({ level: entry.level, children: symbol.children, parent }, entries.slice(1));
+	}
+
+
+	private toSymbolInformation(entry: TocEntry): vscode.SymbolInformation {
+		return new vscode.SymbolInformation(
+			this.getSymbolName(entry),
+			vscode.SymbolKind.String,
+			'',
+			entry.location);
+	}
+
+	private toDocumentSymbol(entry: TocEntry) {
+		return new vscode.DocumentSymbol(
+			this.getSymbolName(entry),
+			'',
+			vscode.SymbolKind.String,
+			entry.location.range,
+			entry.location.range);
+	}
+
+	private getSymbolName(entry: TocEntry): string {
+		return '#'.repeat(entry.level) + ' ' + entry.text;
 	}
 }
\ No newline at end of file
diff --git a/extensions/markdown-language-features/src/features/foldingProvider.ts b/extensions/markdown-language-features/src/features/foldingProvider.ts
index 236908a1f1f..2de47bd78ca 100644
--- a/extensions/markdown-language-features/src/features/foldingProvider.ts
+++ b/extensions/markdown-language-features/src/features/foldingProvider.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { Token } from 'markdown-it';
 import * as vscode from 'vscode';
-
 import { MarkdownEngine } from '../markdownEngine';
 import { TableOfContentsProvider } from '../tableOfContentsProvider';
 
@@ -16,35 +16,83 @@ export default class MarkdownFoldingProvider implements vscode.FoldingRangeProvi
 		private readonly engine: MarkdownEngine
 	) { }
 
+	private async getRegions(document: vscode.TextDocument): Promise<vscode.FoldingRange[]> {
+
+		const isStartRegion = (t: string) => /^\s*<!--\s*#?region\b.*-->/.test(t);
+		const isEndRegion = (t: string) => /^\s*<!--\s*#?endregion\b.*-->/.test(t);
+
+		const isRegionMarker = (token: Token) => token.type === 'html_block' &&
+			(isStartRegion(token.content) || isEndRegion(token.content));
+
+
+		const tokens = await this.engine.parse(document.uri, document.getText());
+		const regionMarkers = tokens.filter(isRegionMarker)
+			.map(token => ({ line: token.map[0], isStart: isStartRegion(token.content) }));
+
+		const nestingStack: { line: number, isStart: boolean }[] = [];
+		return regionMarkers
+			.map(marker => {
+				if (marker.isStart) {
+					nestingStack.push(marker);
+				} else if (nestingStack.length && nestingStack[nestingStack.length - 1].isStart) {
+					return new vscode.FoldingRange(nestingStack.pop()!.line, marker.line, vscode.FoldingRangeKind.Region);
+				} else {
+					// noop: invalid nesting (i.e. [end, start] or [start, end, end])
+				}
+				return null;
+			})
+			.filter((region: vscode.FoldingRange | null): region is vscode.FoldingRange => !!region);
+	}
+
 	public async provideFoldingRanges(
 		document: vscode.TextDocument,
 		_: vscode.FoldingContext,
 		_token: vscode.CancellationToken
 	): Promise<vscode.FoldingRange[]> {
-		const tocProvider = new TableOfContentsProvider(this.engine, document);
-		let toc = await tocProvider.getToc();
-		if (toc.length > rangeLimit) {
-			toc = toc.slice(0, rangeLimit);
-		}
-
-		const foldingRanges = toc.map((entry, startIndex) => {
-			const start = entry.line;
-			let end: number | undefined = undefined;
-			for (let i = startIndex + 1; i < toc.length; ++i) {
-				if (toc[i].level <= entry.level) {
-					end = toc[i].line - 1;
-					if (document.lineAt(end).isEmptyOrWhitespace && end >= start + 1) {
-						end = end - 1;
-					}
-					break;
-				}
-			}
-			return new vscode.FoldingRange(
-				start,
-				typeof end === 'number' ? end : document.lineCount - 1);
-		});
-
-
-		return foldingRanges;
+		const foldables = await Promise.all([
+			this.getRegions(document),
+			this.getHeaderFoldingRanges(document),
+			this.getBlockFoldingRanges(document)]);
+		return [].concat.apply([], foldables).slice(0, rangeLimit);
 	}
-}
\ No newline at end of file
+
+	private async getHeaderFoldingRanges(document: vscode.TextDocument) {
+		const tocProvider = new TableOfContentsProvider(this.engine, document);
+		const toc = await tocProvider.getToc();
+		return toc.map(entry => {
+			let endLine = entry.location.range.end.line;
+			if (document.lineAt(endLine).isEmptyOrWhitespace && endLine >= entry.line + 1) {
+				endLine = endLine - 1;
+			}
+			return new vscode.FoldingRange(entry.line, endLine);
+		});
+	}
+
+	private async getBlockFoldingRanges(document: vscode.TextDocument): Promise<vscode.FoldingRange[]> {
+
+		const isFoldableToken = (token: Token) => {
+			switch (token.type) {
+				case 'fence':
+				case 'list_item_open':
+					return token.map[1] > token.map[0];
+
+				case 'html_block':
+					return token.map[1] > token.map[0] + 1;
+
+				default:
+					return false;
+			}
+		};
+
+		const tokens = await this.engine.parse(document.uri, document.getText());
+		const multiLineListItems = tokens.filter(isFoldableToken);
+		return multiLineListItems.map(listItem => {
+			const start = listItem.map[0];
+			let end = listItem.map[1] - 1;
+			if (document.lineAt(end).isEmptyOrWhitespace && end >= start + 1) {
+				end = end - 1;
+			}
+			return new vscode.FoldingRange(start, end);
+		});
+	}
+}
diff --git a/extensions/markdown-language-features/src/features/preview.ts b/extensions/markdown-language-features/src/features/preview.ts
index c5b9b4809bd..f15efe24098 100644
--- a/extensions/markdown-language-features/src/features/preview.ts
+++ b/extensions/markdown-language-features/src/features/preview.ts
@@ -34,14 +34,14 @@ export class MarkdownPreview {
 	private isScrolling = false;
 	private _disposed: boolean = false;
 
-
 	public static async revive(
 		webview: vscode.WebviewPanel,
 		state: any,
 		contentProvider: MarkdownContentProvider,
 		previewConfigurations: MarkdownPreviewConfigurationManager,
 		logger: Logger,
-		topmostLineMonitor: MarkdownFileTopmostLineMonitor
+		topmostLineMonitor: MarkdownFileTopmostLineMonitor,
+		contributions: MarkdownContributions,
 	): Promise<MarkdownPreview> {
 		const resource = vscode.Uri.parse(state.resource);
 		const locked = state.locked;
@@ -54,7 +54,10 @@ export class MarkdownPreview {
 			contentProvider,
 			previewConfigurations,
 			logger,
-			topmostLineMonitor);
+			topmostLineMonitor,
+			contributions);
+
+		preview.editor.webview.options = MarkdownPreview.getWebviewOptions(resource, contributions);
 
 		if (!isNaN(line)) {
 			preview.line = line;
@@ -77,10 +80,8 @@ export class MarkdownPreview {
 			MarkdownPreview.viewType,
 			MarkdownPreview.getPreviewTitle(resource, locked),
 			previewColumn, {
-				enableScripts: true,
-				enableCommandUris: true,
 				enableFindWidget: true,
-				localResourceRoots: MarkdownPreview.getLocalResourceRoots(resource, contributions)
+				...MarkdownPreview.getWebviewOptions(resource, contributions)
 			});
 
 		return new MarkdownPreview(
@@ -90,7 +91,8 @@ export class MarkdownPreview {
 			contentProvider,
 			previewConfigurations,
 			logger,
-			topmostLineMonitor);
+			topmostLineMonitor,
+			contributions);
 	}
 
 	private constructor(
@@ -100,7 +102,8 @@ export class MarkdownPreview {
 		private readonly _contentProvider: MarkdownContentProvider,
 		private readonly _previewConfigurations: MarkdownPreviewConfigurationManager,
 		private readonly _logger: Logger,
-		topmostLineMonitor: MarkdownFileTopmostLineMonitor
+		topmostLineMonitor: MarkdownFileTopmostLineMonitor,
+		private readonly _contributions: MarkdownContributions,
 	) {
 		this._resource = resource;
 		this._locked = locked;
@@ -239,10 +242,6 @@ export class MarkdownPreview {
 		return this.editor.viewColumn;
 	}
 
-	public isWebviewOf(webview: vscode.WebviewPanel): boolean {
-		return this.editor === webview;
-	}
-
 	public matchesResource(
 		otherResource: vscode.Uri,
 		otherPosition: vscode.ViewColumn | undefined,
@@ -272,6 +271,14 @@ export class MarkdownPreview {
 		this.editor.title = MarkdownPreview.getPreviewTitle(this._resource, this._locked);
 	}
 
+	private get iconPath() {
+		const root = path.join(this._contributions.extensionPath, 'media');
+		return {
+			light: vscode.Uri.file(path.join(root, 'Preview.svg')),
+			dark: vscode.Uri.file(path.join(root, 'Preview_inverse.svg'))
+		};
+	}
+
 	private isPreviewOf(resource: vscode.Uri): boolean {
 		return this._resource.fsPath === resource.fsPath;
 	}
@@ -328,10 +335,23 @@ export class MarkdownPreview {
 		const content = await this._contentProvider.provideTextDocumentContent(document, this._previewConfigurations, this.line, this.state);
 		if (this._resource === resource) {
 			this.editor.title = MarkdownPreview.getPreviewTitle(this._resource, this._locked);
+			this.editor.iconPath = this.iconPath;
+			this.editor.webview.options = MarkdownPreview.getWebviewOptions(resource, this._contributions);
 			this.editor.webview.html = content;
 		}
 	}
 
+	private static getWebviewOptions(
+		resource: vscode.Uri,
+		contributions: MarkdownContributions
+	): vscode.WebviewOptions {
+		return {
+			enableScripts: true,
+			enableCommandUris: true,
+			localResourceRoots: MarkdownPreview.getLocalResourceRoots(resource, contributions)
+		};
+	}
+
 	private static getLocalResourceRoots(
 		resource: vscode.Uri,
 		contributions: MarkdownContributions
diff --git a/extensions/markdown-language-features/src/features/previewConfig.ts b/extensions/markdown-language-features/src/features/previewConfig.ts
index 5f120a1507f..d660bf10793 100644
--- a/extensions/markdown-language-features/src/features/previewConfig.ts
+++ b/extensions/markdown-language-features/src/features/previewConfig.ts
@@ -27,7 +27,7 @@ export class MarkdownPreviewConfiguration {
 	private constructor(resource: vscode.Uri) {
 		const editorConfig = vscode.workspace.getConfiguration('editor', resource);
 		const markdownConfig = vscode.workspace.getConfiguration('markdown', resource);
-		const markdownEditorConfig = vscode.workspace.getConfiguration('[markdown]');
+		const markdownEditorConfig = vscode.workspace.getConfiguration('[markdown]', resource);
 
 		this.scrollBeyondLastLine = editorConfig.get<boolean>('scrollBeyondLastLine', false);
 
diff --git a/extensions/markdown-language-features/src/features/previewManager.ts b/extensions/markdown-language-features/src/features/previewManager.ts
index aec8c251bc2..15e414f762e 100644
--- a/extensions/markdown-language-features/src/features/previewManager.ts
+++ b/extensions/markdown-language-features/src/features/previewManager.ts
@@ -16,33 +16,33 @@ import { MarkdownContentProvider } from './previewContentProvider';
 export class MarkdownPreviewManager implements vscode.WebviewPanelSerializer {
 	private static readonly markdownPreviewActiveContextKey = 'markdownPreviewFocus';
 
-	private readonly topmostLineMonitor = new MarkdownFileTopmostLineMonitor();
-	private readonly previewConfigurations = new MarkdownPreviewConfigurationManager();
-	private readonly previews: MarkdownPreview[] = [];
-	private activePreview: MarkdownPreview | undefined = undefined;
-	private readonly disposables: vscode.Disposable[] = [];
+	private readonly _topmostLineMonitor = new MarkdownFileTopmostLineMonitor();
+	private readonly _previewConfigurations = new MarkdownPreviewConfigurationManager();
+	private readonly _previews: MarkdownPreview[] = [];
+	private _activePreview: MarkdownPreview | undefined = undefined;
+	private readonly _disposables: vscode.Disposable[] = [];
 
 	public constructor(
-		private readonly contentProvider: MarkdownContentProvider,
-		private readonly logger: Logger,
-		private readonly contributions: MarkdownContributions
+		private readonly _contentProvider: MarkdownContentProvider,
+		private readonly _logger: Logger,
+		private readonly _contributions: MarkdownContributions
 	) {
-		this.disposables.push(vscode.window.registerWebviewPanelSerializer(MarkdownPreview.viewType, this));
+		this._disposables.push(vscode.window.registerWebviewPanelSerializer(MarkdownPreview.viewType, this));
 	}
 
 	public dispose(): void {
-		disposeAll(this.disposables);
-		disposeAll(this.previews);
+		disposeAll(this._disposables);
+		disposeAll(this._previews);
 	}
 
 	public refresh() {
-		for (const preview of this.previews) {
+		for (const preview of this._previews) {
 			preview.refresh();
 		}
 	}
 
 	public updateConfiguration() {
-		for (const preview of this.previews) {
+		for (const preview of this._previews) {
 			preview.updateConfiguration();
 		}
 	}
@@ -62,16 +62,16 @@ export class MarkdownPreviewManager implements vscode.WebviewPanelSerializer {
 	}
 
 	public get activePreviewResource() {
-		return this.activePreview && this.activePreview.resource;
+		return this._activePreview && this._activePreview.resource;
 	}
 
 	public toggleLock() {
-		const preview = this.activePreview;
+		const preview = this._activePreview;
 		if (preview) {
 			preview.toggleLock();
 
 			// Close any previews that are now redundant, such as having two dynamic previews in the same editor group
-			for (const otherPreview of this.previews) {
+			for (const otherPreview of this._previews) {
 				if (otherPreview !== preview && preview.matches(otherPreview)) {
 					otherPreview.dispose();
 				}
@@ -86,10 +86,11 @@ export class MarkdownPreviewManager implements vscode.WebviewPanelSerializer {
 		const preview = await MarkdownPreview.revive(
 			webview,
 			state,
-			this.contentProvider,
-			this.previewConfigurations,
-			this.logger,
-			this.topmostLineMonitor);
+			this._contentProvider,
+			this._previewConfigurations,
+			this._logger,
+			this._topmostLineMonitor,
+			this._contributions);
 
 		this.registerPreview(preview);
 	}
@@ -98,7 +99,7 @@ export class MarkdownPreviewManager implements vscode.WebviewPanelSerializer {
 		resource: vscode.Uri,
 		previewSettings: PreviewSettings
 	): MarkdownPreview | undefined {
-		return this.previews.find(preview =>
+		return this._previews.find(preview =>
 			preview.matchesResource(resource, previewSettings.previewColumn, previewSettings.locked));
 	}
 
@@ -110,39 +111,39 @@ export class MarkdownPreviewManager implements vscode.WebviewPanelSerializer {
 			resource,
 			previewSettings.previewColumn,
 			previewSettings.locked,
-			this.contentProvider,
-			this.previewConfigurations,
-			this.logger,
-			this.topmostLineMonitor,
-			this.contributions);
+			this._contentProvider,
+			this._previewConfigurations,
+			this._logger,
+			this._topmostLineMonitor,
+			this._contributions);
 
 		this.setPreviewActiveContext(true);
-		this.activePreview = preview;
+		this._activePreview = preview;
 		return this.registerPreview(preview);
 	}
 
 	private registerPreview(
 		preview: MarkdownPreview
 	): MarkdownPreview {
-		this.previews.push(preview);
+		this._previews.push(preview);
 
 		preview.onDispose(() => {
-			const existing = this.previews.indexOf(preview);
+			const existing = this._previews.indexOf(preview);
 			if (existing === -1) {
 				return;
 			}
 
-			this.previews.splice(existing, 1);
-			if (this.activePreview === preview) {
+			this._previews.splice(existing, 1);
+			if (this._activePreview === preview) {
 				this.setPreviewActiveContext(false);
-				this.activePreview = undefined;
+				this._activePreview = undefined;
 			}
 		});
 
 		preview.onDidChangeViewState(({ webviewPanel }) => {
-			disposeAll(this.previews.filter(otherPreview => preview !== otherPreview && preview!.matches(otherPreview)));
-			this.setPreviewActiveContext(webviewPanel.visible);
-			this.activePreview = webviewPanel.visible ? preview : undefined;
+			disposeAll(this._previews.filter(otherPreview => preview !== otherPreview && preview!.matches(otherPreview)));
+			this.setPreviewActiveContext(webviewPanel.active);
+			this._activePreview = webviewPanel.active ? preview : undefined;
 		});
 
 		return preview;
diff --git a/extensions/markdown-language-features/src/features/workspaceSymbolProvider.ts b/extensions/markdown-language-features/src/features/workspaceSymbolProvider.ts
index 9cbce783e12..12e51c75d76 100644
--- a/extensions/markdown-language-features/src/features/workspaceSymbolProvider.ts
+++ b/extensions/markdown-language-features/src/features/workspaceSymbolProvider.ts
@@ -136,7 +136,7 @@ export default class MarkdownWorkspaceSymbolProvider implements vscode.Workspace
 
 	private getSymbols(document: SkinnyTextDocument): Lazy<Thenable<vscode.SymbolInformation[]>> {
 		return lazy(async () => {
-			return this._symbolProvider.provideDocumentSymbols(document);
+			return this._symbolProvider.provideDocumentSymbolInformation(document);
 		});
 	}
 
diff --git a/extensions/markdown-language-features/src/logger.ts b/extensions/markdown-language-features/src/logger.ts
index f5a4a776533..4ee89cbb811 100644
--- a/extensions/markdown-language-features/src/logger.ts
+++ b/extensions/markdown-language-features/src/logger.ts
@@ -3,7 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { OutputChannel, window, workspace } from 'vscode';
+import * as vscode from 'vscode';
+import { lazy } from './util/lazy';
 
 enum Trace {
 	Off,
@@ -31,7 +32,8 @@ function isString(value: any): value is string {
 
 export class Logger {
 	private trace?: Trace;
-	private _output?: OutputChannel;
+
+	private readonly outputChannel = lazy(() => vscode.window.createOutputChannel('Markdown'));
 
 	constructor() {
 		this.updateConfiguration();
@@ -39,9 +41,9 @@ export class Logger {
 
 	public log(message: string, data?: any): void {
 		if (this.trace === Trace.Verbose) {
-			this.output.appendLine(`[Log - ${(new Date().toLocaleTimeString())}] ${message}`);
+			this.appendLine(`[Log - ${(new Date().toLocaleTimeString())}] ${message}`);
 			if (data) {
-				this.output.appendLine(Logger.data2String(data));
+				this.appendLine(Logger.data2String(data));
 			}
 		}
 	}
@@ -50,15 +52,12 @@ export class Logger {
 		this.trace = this.readTrace();
 	}
 
-	private get output(): OutputChannel {
-		if (!this._output) {
-			this._output = window.createOutputChannel('Markdown');
-		}
-		return this._output;
+	private appendLine(value: string) {
+		return this.outputChannel.value.appendLine(value);
 	}
 
 	private readTrace(): Trace {
-		return Trace.fromString(workspace.getConfiguration().get<string>('markdown.trace', 'off'));
+		return Trace.fromString(vscode.workspace.getConfiguration().get<string>('markdown.trace', 'off'));
 	}
 
 	private static data2String(data: any): string {
@@ -73,4 +72,4 @@ export class Logger {
 		}
 		return JSON.stringify(data, undefined, 2);
 	}
-}
\ No newline at end of file
+}
diff --git a/extensions/markdown-language-features/src/markdownEngine.ts b/extensions/markdown-language-features/src/markdownEngine.ts
index e6c422c14ce..bc67e0bee18 100644
--- a/extensions/markdown-language-features/src/markdownEngine.ts
+++ b/extensions/markdown-language-features/src/markdownEngine.ts
@@ -47,7 +47,7 @@ export class MarkdownEngine {
 							return `<div>${hljs.highlight(lang, str, true).value}</div>`;
 						} catch (error) { }
 					}
-					return `<code><div>${this.md!.utils.escapeHtml(str)}</div>`;
+					return `<code><div>${this.md!.utils.escapeHtml(str)}</div></code>`;
 				}
 			}).use(mdnh, {
 				slugify: (header: string) => this.slugifier.fromHeading(header).value
@@ -107,6 +107,7 @@ export class MarkdownEngine {
 		return engine.parse(text, {}).map(token => {
 			if (token.map) {
 				token.map[0] += offset;
+				token.map[1] += offset;
 			}
 			return token;
 		});
diff --git a/extensions/markdown-language-features/src/markdownExtensions.ts b/extensions/markdown-language-features/src/markdownExtensions.ts
index a9ef207cf38..55c8d76e7a4 100644
--- a/extensions/markdown-language-features/src/markdownExtensions.ts
+++ b/extensions/markdown-language-features/src/markdownExtensions.ts
@@ -26,6 +26,7 @@ const resolveExtensionResources = (extension: vscode.Extension<any>, resourcePat
 };
 
 export interface MarkdownContributions {
+	readonly extensionPath: string;
 	readonly previewScripts: vscode.Uri[];
 	readonly previewStyles: vscode.Uri[];
 	readonly markdownItPlugins: Thenable<(md: any) => any>[];
@@ -40,6 +41,10 @@ class MarkdownExtensionContributions implements MarkdownContributions {
 
 	private _loaded = false;
 
+	public constructor(
+		public readonly extensionPath: string,
+	) { }
+
 	public get previewScripts(): vscode.Uri[] {
 		this.ensureLoaded();
 		return this._scripts;
@@ -111,6 +116,6 @@ class MarkdownExtensionContributions implements MarkdownContributions {
 	}
 }
 
-export function getMarkdownExtensionContributions(): MarkdownContributions {
-	return new MarkdownExtensionContributions();
+export function getMarkdownExtensionContributions(context: vscode.ExtensionContext): MarkdownContributions {
+	return new MarkdownExtensionContributions(context.extensionPath);
 }
\ No newline at end of file
diff --git a/extensions/markdown-language-features/src/security.ts b/extensions/markdown-language-features/src/security.ts
index a09ce1f538a..3a62eed2dbd 100644
--- a/extensions/markdown-language-features/src/security.ts
+++ b/extensions/markdown-language-features/src/security.ts
@@ -11,7 +11,7 @@ import * as nls from 'vscode-nls';
 
 const localize = nls.loadMessageBundle();
 
-export enum MarkdownPreviewSecurityLevel {
+export const enum MarkdownPreviewSecurityLevel {
 	Strict = 0,
 	AllowInsecureContent = 1,
 	AllowScriptsAndAllContent = 2,
diff --git a/extensions/markdown-language-features/src/slugify.ts b/extensions/markdown-language-features/src/slugify.ts
index c3e167e89e0..5b9146b602f 100644
--- a/extensions/markdown-language-features/src/slugify.ts
+++ b/extensions/markdown-language-features/src/slugify.ts
@@ -23,7 +23,7 @@ export const githubSlugifier: Slugifier = new class implements Slugifier {
 			heading.trim()
 				.toLowerCase()
 				.replace(/\s+/g, '-') // Replace whitespace with -
-				.replace(/[\]\[\!\'\#\$\%\&\'\(\)\*\+\,\.\/\:\;\<\=\>\?\@\\\^\_\{\|\}\~\`]/g, '') // Remove known puctuators
+				.replace(/[\]\[\!\'\#\$\%\&\'\(\)\*\+\,\.\/\:\;\<\=\>\?\@\\\^\_\{\|\}\~\`。，、；：？！…—·ˉ¨‘’“”々～‖∶＂＇｀｜〃〔〕〈〉《》「」『』．〖〗【】（）［］｛｝]/g, '') // Remove known punctuators
 				.replace(/^\-+/, '') // Remove leading -
 				.replace(/\-+$/, '') // Remove trailing -
 		);
diff --git a/extensions/markdown-language-features/src/tableOfContentsProvider.ts b/extensions/markdown-language-features/src/tableOfContentsProvider.ts
index ff2cd01ad24..944fc750734 100644
--- a/extensions/markdown-language-features/src/tableOfContentsProvider.ts
+++ b/extensions/markdown-language-features/src/tableOfContentsProvider.ts
@@ -17,6 +17,7 @@ export interface TocEntry {
 
 export interface SkinnyTextDocument {
 	readonly uri: vscode.Uri;
+	readonly lineCount: number;
 	getText(): string;
 	lineAt(line: number): vscode.TextLine;
 }
@@ -61,7 +62,25 @@ export class TableOfContentsProvider {
 				location: new vscode.Location(document.uri, line.range)
 			});
 		}
-		return toc;
+
+		// Get full range of section
+		return toc.map((entry, startIndex): TocEntry => {
+			let end: number | undefined = undefined;
+			for (let i = startIndex + 1; i < toc.length; ++i) {
+				if (toc[i].level <= entry.level) {
+					end = toc[i].line - 1;
+					break;
+				}
+			}
+			const endLine = typeof end === 'number' ? end : document.lineCount - 1;
+			return {
+				...entry,
+				location: new vscode.Location(document.uri,
+					new vscode.Range(
+						entry.location.range.start,
+						new vscode.Position(endLine, document.lineAt(endLine).range.end.character)))
+			};
+		});
 	}
 
 	private static getHeaderLevel(markup: string): number {
diff --git a/extensions/markdown-language-features/src/test/documentLinkProvider.test.ts b/extensions/markdown-language-features/src/test/documentLinkProvider.test.ts
index 910ed3c9bdf..5a1d0c87880 100644
--- a/extensions/markdown-language-features/src/test/documentLinkProvider.test.ts
+++ b/extensions/markdown-language-features/src/test/documentLinkProvider.test.ts
@@ -10,7 +10,7 @@ import LinkProvider from '../features/documentLinkProvider';
 import { InMemoryDocument } from './inMemoryDocument';
 
 
-const testFileName = vscode.Uri.parse('test.md');
+const testFileName = vscode.Uri.file('test.md');
 
 const noopToken = new class implements vscode.CancellationToken {
 	private _onCancellationRequestedEmitter = new vscode.EventEmitter<void>();
diff --git a/extensions/markdown-language-features/src/test/documentSymbolProvider.test.ts b/extensions/markdown-language-features/src/test/documentSymbolProvider.test.ts
new file mode 100644
index 00000000000..9533f807cf9
--- /dev/null
+++ b/extensions/markdown-language-features/src/test/documentSymbolProvider.test.ts
@@ -0,0 +1,86 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as assert from 'assert';
+import 'mocha';
+import * as vscode from 'vscode';
+import SymbolProvider from '../features/documentSymbolProvider';
+import { InMemoryDocument } from './inMemoryDocument';
+import { createNewMarkdownEngine } from './engine';
+
+
+const testFileName = vscode.Uri.file('test.md');
+
+
+function getSymbolsForFile(fileContents: string) {
+	const doc = new InMemoryDocument(testFileName, fileContents);
+	const provider = new SymbolProvider(createNewMarkdownEngine());
+	return provider.provideDocumentSymbols(doc);
+}
+
+
+suite('markdown.DocumentSymbolProvider', () => {
+	test('Should not return anything for empty document', async () => {
+		const symbols = await getSymbolsForFile('');
+		assert.strictEqual(symbols.length, 0);
+	});
+
+	test('Should not return anything for document with no headers', async () => {
+		const symbols = await getSymbolsForFile('a\na');
+		assert.strictEqual(symbols.length, 0);
+	});
+
+	test('Should not return anything for document with # but no real headers', async () => {
+		const symbols = await getSymbolsForFile('a#a\na#');
+		assert.strictEqual(symbols.length, 0);
+	});
+
+	test('Should return single symbol for single header', async () => {
+		const symbols = await getSymbolsForFile('# h');
+		assert.strictEqual(symbols.length, 1);
+		assert.strictEqual(symbols[0].name, '# h');
+	});
+
+	test('Should not care about symbol level for single header', async () => {
+		const symbols = await getSymbolsForFile('### h');
+		assert.strictEqual(symbols.length, 1);
+		assert.strictEqual(symbols[0].name, '### h');
+	});
+
+	test('Should put symbols of same level in flat list', async () => {
+		const symbols = await getSymbolsForFile('## h\n## h2');
+		assert.strictEqual(symbols.length, 2);
+		assert.strictEqual(symbols[0].name, '## h');
+		assert.strictEqual(symbols[1].name, '## h2');
+	});
+
+	test('Should nest symbol of level - 1 under parent', async () => {
+
+		const symbols = await getSymbolsForFile('# h\n## h2\n## h3');
+		assert.strictEqual(symbols.length, 1);
+		assert.strictEqual(symbols[0].name, '# h');
+		assert.strictEqual(symbols[0].children.length, 2);
+		assert.strictEqual(symbols[0].children[0].name, '## h2');
+		assert.strictEqual(symbols[0].children[1].name, '## h3');
+	});
+
+	test('Should nest symbol of level - n under parent', async () => {
+		const symbols = await getSymbolsForFile('# h\n#### h2');
+		assert.strictEqual(symbols.length, 1);
+		assert.strictEqual(symbols[0].name, '# h');
+		assert.strictEqual(symbols[0].children.length, 1);
+		assert.strictEqual(symbols[0].children[0].name, '#### h2');
+	});
+
+	test('Should flatten children where lower level occurs first', async () => {
+		const symbols = await getSymbolsForFile('# h\n### h2\n## h3');
+		assert.strictEqual(symbols.length, 1);
+		assert.strictEqual(symbols[0].name, '# h');
+		assert.strictEqual(symbols[0].children.length, 2);
+		assert.strictEqual(symbols[0].children[0].name, '### h2');
+		assert.strictEqual(symbols[0].children[1].name, '## h3');
+	});
+});
+
diff --git a/extensions/markdown-language-features/src/test/engine.ts b/extensions/markdown-language-features/src/test/engine.ts
index 860bafad7cc..a1834e057a2 100644
--- a/extensions/markdown-language-features/src/test/engine.ts
+++ b/extensions/markdown-language-features/src/test/engine.ts
@@ -9,6 +9,7 @@ import { MarkdownContributions } from '../markdownExtensions';
 import { githubSlugifier } from '../slugify';
 
 const emptyContributions = new class implements MarkdownContributions {
+	readonly extensionPath = '';
 	readonly previewScripts: vscode.Uri[] = [];
 	readonly previewStyles: vscode.Uri[] = [];
 	readonly previewResourceRoots: vscode.Uri[] = [];
diff --git a/extensions/markdown-language-features/src/test/foldingProvider.test.ts b/extensions/markdown-language-features/src/test/foldingProvider.test.ts
index 44c570d64d4..2ad8444d967 100644
--- a/extensions/markdown-language-features/src/test/foldingProvider.test.ts
+++ b/extensions/markdown-language-features/src/test/foldingProvider.test.ts
@@ -11,7 +11,7 @@ import MarkdownFoldingProvider from '../features/foldingProvider';
 import { InMemoryDocument } from './inMemoryDocument';
 import { createNewMarkdownEngine } from './engine';
 
-const testFileName = vscode.Uri.parse('test.md');
+const testFileName = vscode.Uri.file('test.md');
 
 suite('markdown.FoldingProvider', () => {
 	test('Should not return anything for empty document', async () => {
@@ -78,6 +78,103 @@ y`);
 		assert.strictEqual(firstFold.end, 2);
 	});
 
+	test('Should fold nested <!-- #region --> markers', async () => {
+		const folds = await getFoldsForDocument(`a
+<!-- #region -->
+b
+<!-- #region hello!-->
+b.a
+<!-- #endregion -->
+b
+<!-- #region: foo! -->
+b.b
+<!-- #endregion: foo -->
+b
+<!-- #endregion -->
+a`);
+		assert.strictEqual(folds.length, 3);
+		const [outer, first, second] = folds.sort((a, b) => a.start - b.start);
+
+		assert.strictEqual(outer.start, 1);
+		assert.strictEqual(outer.end, 11);
+		assert.strictEqual(first.start, 3);
+		assert.strictEqual(first.end, 5);
+		assert.strictEqual(second.start, 7);
+		assert.strictEqual(second.end, 9);
+	});
+
+	test('Should fold from list to end of document', async () => {
+		const folds = await getFoldsForDocument(`a
+- b
+c
+d`);
+		assert.strictEqual(folds.length, 1);
+		const firstFold = folds[0];
+		assert.strictEqual(firstFold.start, 1);
+		assert.strictEqual(firstFold.end, 3);
+	});
+
+	test('lists folds should span multiple lines of content', async () => {
+		const folds = await getFoldsForDocument(`a
+- This list item\n  spans multiple\n  lines.`);
+		assert.strictEqual(folds.length, 1);
+		const firstFold = folds[0];
+		assert.strictEqual(firstFold.start, 1);
+		assert.strictEqual(firstFold.end, 3);
+	});
+
+	test('List should leave single blankline before new element', async () => {
+		const folds = await getFoldsForDocument(`- a
+a
+
+
+b`);
+		assert.strictEqual(folds.length, 1);
+		const firstFold = folds[0];
+		assert.strictEqual(firstFold.start, 0);
+		assert.strictEqual(firstFold.end, 3);
+	});
+
+	test('Should fold fenced code blocks', async () => {
+		const folds = await getFoldsForDocument(`~~~ts
+a
+~~~
+b`);
+		assert.strictEqual(folds.length, 1);
+		const firstFold = folds[0];
+		assert.strictEqual(firstFold.start, 0);
+		assert.strictEqual(firstFold.end, 2);
+	});
+
+	test('Should fold fenced code blocks with yaml front matter', async () => {
+		const folds = await getFoldsForDocument(`---
+title: bla
+---
+
+~~~ts
+a
+~~~
+
+a
+a
+b
+a`);
+		assert.strictEqual(folds.length, 1);
+		const firstFold = folds[0];
+		assert.strictEqual(firstFold.start, 4);
+		assert.strictEqual(firstFold.end, 6);
+	});
+
+	test('Should fold html blocks', async () => {
+		const folds = await getFoldsForDocument(`x
+<div>
+	fa
+</div>`);
+		assert.strictEqual(folds.length, 1);
+		const firstFold = folds[0];
+		assert.strictEqual(firstFold.start, 1);
+		assert.strictEqual(firstFold.end, 3);
+	});
 });
 
 
diff --git a/extensions/markdown-language-features/src/test/index.ts b/extensions/markdown-language-features/src/test/index.ts
index f65a756a8de..bd7e03c9a52 100644
--- a/extensions/markdown-language-features/src/test/index.ts
+++ b/extensions/markdown-language-features/src/test/index.ts
@@ -3,26 +3,28 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-//
-// PLEASE DO NOT MODIFY / DELETE UNLESS YOU KNOW WHAT YOU ARE DOING
-//
-// This file is providing the test runner to use when running extension tests.
-// By default the test runner in use is Mocha based.
-//
-// You can provide your own test runner if you want to override it by exporting
-// a function run(testRoot: string, clb: (error:Error) => void) that the extension
-// host can call to run the tests. The test runner is expected to use console.log
-// to report the results back to the caller. When the tests are finished, return
-// a possible error to the callback or null if none.
-
+const path = require('path');
 const testRunner = require('vscode/lib/testrunner');
 
-// You can directly control Mocha options by uncommenting the following lines
-// See https://github.com/mochajs/mocha/wiki/Using-mocha-programmatically#set-options for more info
-testRunner.configure({
-	ui: 'tdd', 		// the TDD UI is being used in extension.test.ts (suite, test, etc.)
-	useColors: process.platform !== 'win32', // colored output from test results (only windows cannot handle)
+const suite = 'Integration Markdown Tests';
+
+const options: any = {
+	ui: 'tdd',
+	useColors: true,
 	timeout: 60000
-});
+};
+
+if (process.env.BUILD_ARTIFACTSTAGINGDIRECTORY) {
+	options.reporter = 'mocha-multi-reporters';
+	options.reporterOptions = {
+		reporterEnabled: 'spec, mocha-junit-reporter',
+		mochaJunitReporterReporterOptions: {
+			testsuitesTitle: `${suite} ${process.platform}`,
+			mochaFile: path.join(process.env.BUILD_ARTIFACTSTAGINGDIRECTORY, `test-results/${process.platform}-${suite.toLowerCase().replace(/[^\w]/g, '-')}-results.xml`)
+		}
+	};
+}
+
+testRunner.configure(options);
 
 export = testRunner;
diff --git a/extensions/markdown-language-features/src/test/tableOfContentsProvider.test.ts b/extensions/markdown-language-features/src/test/tableOfContentsProvider.test.ts
index 6d6f382ae7e..ee103b294ca 100644
--- a/extensions/markdown-language-features/src/test/tableOfContentsProvider.test.ts
+++ b/extensions/markdown-language-features/src/test/tableOfContentsProvider.test.ts
@@ -11,7 +11,7 @@ import { TableOfContentsProvider } from '../tableOfContentsProvider';
 import { InMemoryDocument } from './inMemoryDocument';
 import { createNewMarkdownEngine } from './engine';
 
-const testFileName = vscode.Uri.parse('test.md');
+const testFileName = vscode.Uri.file('test.md');
 
 suite('markdown.TableOfContentsProvider', () => {
 	test('Lookup should not return anything for empty document', async () => {
diff --git a/extensions/markdown-language-features/src/test/workspaceSymbolProvider.test.ts b/extensions/markdown-language-features/src/test/workspaceSymbolProvider.test.ts
index 2ee12a7979c..f5b3eb0ea4a 100644
--- a/extensions/markdown-language-features/src/test/workspaceSymbolProvider.test.ts
+++ b/extensions/markdown-language-features/src/test/workspaceSymbolProvider.test.ts
@@ -22,7 +22,7 @@ suite('markdown.WorkspaceSymbolProvider', () => {
 	});
 
 	test('Should return symbols from workspace with one markdown file', async () => {
-		const testFileName = vscode.Uri.parse('test.md');
+		const testFileName = vscode.Uri.file('test.md');
 
 		const provider = new MarkdownWorkspaceSymbolProvider(symbolProvider, new InMemoryWorkspaceMarkdownDocumentProvider([
 			new InMemoryDocument(testFileName, `# header1\nabc\n## header2`)
@@ -49,7 +49,7 @@ suite('markdown.WorkspaceSymbolProvider', () => {
 	});
 
 	test('Should update results when markdown file changes symbols', async () => {
-		const testFileName = vscode.Uri.parse('test.md');
+		const testFileName = vscode.Uri.file('test.md');
 
 		const workspaceFileProvider = new InMemoryWorkspaceMarkdownDocumentProvider([
 			new InMemoryDocument(testFileName, `# header1`)
@@ -68,7 +68,7 @@ suite('markdown.WorkspaceSymbolProvider', () => {
 	});
 
 	test('Should remove results when file is deleted', async () => {
-		const testFileName = vscode.Uri.parse('test.md');
+		const testFileName = vscode.Uri.file('test.md');
 
 		const workspaceFileProvider = new InMemoryWorkspaceMarkdownDocumentProvider([
 			new InMemoryDocument(testFileName, `# header1`)
@@ -84,7 +84,7 @@ suite('markdown.WorkspaceSymbolProvider', () => {
 	});
 
 	test('Should update results when markdown file is created', async () => {
-		const testFileName = vscode.Uri.parse('test.md');
+		const testFileName = vscode.Uri.file('test.md');
 
 		const workspaceFileProvider = new InMemoryWorkspaceMarkdownDocumentProvider([
 			new InMemoryDocument(testFileName, `# header1`)
@@ -94,7 +94,7 @@ suite('markdown.WorkspaceSymbolProvider', () => {
 		assert.strictEqual((await provider.provideWorkspaceSymbols('')).length, 1);
 
 		// Creat file
-		workspaceFileProvider.createDocument(new InMemoryDocument(vscode.Uri.parse('test2.md'), `# new header\nabc\n## header2`));
+		workspaceFileProvider.createDocument(new InMemoryDocument(vscode.Uri.file('test2.md'), `# new header\nabc\n## header2`));
 		const newSymbols = await provider.provideWorkspaceSymbols('');
 		assert.strictEqual(newSymbols.length, 3);
 	});
@@ -105,7 +105,7 @@ class InMemoryWorkspaceMarkdownDocumentProvider implements WorkspaceMarkdownDocu
 	private readonly _documents = new Map<string, vscode.TextDocument>();
 
 	constructor(documents: vscode.TextDocument[]) {
-		for( const doc of documents) {
+		for (const doc of documents) {
 			this._documents.set(doc.fileName, doc);
 		}
 	}
diff --git a/extensions/markdown-language-features/src/util/topmostLineMonitor.ts b/extensions/markdown-language-features/src/util/topmostLineMonitor.ts
index 700a3e376c1..4348e142f59 100644
--- a/extensions/markdown-language-features/src/util/topmostLineMonitor.ts
+++ b/extensions/markdown-language-features/src/util/topmostLineMonitor.ts
@@ -4,16 +4,16 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as vscode from 'vscode';
-
 import { disposeAll } from '../util/dispose';
 import { isMarkdownFile } from './file';
 
-
 export class MarkdownFileTopmostLineMonitor {
 	private readonly disposables: vscode.Disposable[] = [];
 
 	private readonly pendingUpdates = new Map<string, number>();
 
+	private readonly throttle = 50;
+
 	constructor() {
 		vscode.window.onDidChangeTextEditorVisibleRanges(event => {
 			if (isMarkdownFile(event.textEditor.document)) {
@@ -47,7 +47,7 @@ export class MarkdownFileTopmostLineMonitor {
 					});
 					this.pendingUpdates.delete(key);
 				}
-			}, 50);
+			}, this.throttle);
 		}
 
 		this.pendingUpdates.set(key, line);
diff --git a/extensions/markdown-language-features/yarn.lock b/extensions/markdown-language-features/yarn.lock
index 98047a5cefd..36dd88648f1 100644
--- a/extensions/markdown-language-features/yarn.lock
+++ b/extensions/markdown-language-features/yarn.lock
@@ -24,9 +24,9 @@
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/@types/markdown-it/-/markdown-it-0.0.2.tgz#5d9ad19e6e6508cdd2f2596df86fd0aade598660"
 
-"@types/node@7.0.43":
-  version "7.0.43"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.43.tgz#a187e08495a075f200ca946079c914e1a5fe962c"
+"@types/node@^8.10.25":
+  version "8.10.25"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-8.10.25.tgz#801fe4e39372cef18f268db880a5fbfcf71adc7e"
 
 abbrev@1:
   version "1.1.1"
@@ -1153,6 +1153,10 @@ chardet@^0.4.0:
   version "0.4.2"
   resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.4.2.tgz#b5473b33dc97c424e5d98dc87d55d4d8a29c8bf2"
 
+charenc@~0.0.1:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/charenc/-/charenc-0.0.2.tgz#c0a1d2f3a7092e03774bfa83f14c0fc5790a8667"
+
 chokidar@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.0.2.tgz#4dc65139eeb2714977735b6a35d06e97b494dfd7"
@@ -1439,6 +1443,10 @@ cross-spawn@^6.0.4:
     shebang-command "^1.2.0"
     which "^1.2.9"
 
+crypt@~0.0.1:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/crypt/-/crypt-0.0.2.tgz#88d7ff7ec0dfb86f713dc87bbb42d044d3e6c41b"
+
 cryptiles@2.x.x:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-2.0.5.tgz#3bdfecdc608147c1c67202fa291e7dca59eaa3b8"
@@ -2536,9 +2544,9 @@ he@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/he/-/he-1.1.1.tgz#93410fd21b009735151f8868c2f271f3427e23fd"
 
-highlight.js@9.5.0:
-  version "9.5.0"
-  resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.5.0.tgz#46ae51b9db00f70052bcdf196cd404757b6582ae"
+highlight.js@9.12.0:
+  version "9.12.0"
+  resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.12.0.tgz#e6d9dbe57cbefe60751f02af336195870c90c01e"
 
 hmac-drbg@^1.0.0:
   version "1.0.1"
@@ -2745,7 +2753,7 @@ is-binary-path@^1.0.0:
   dependencies:
     binary-extensions "^1.0.0"
 
-is-buffer@^1.1.5:
+is-buffer@^1.1.5, is-buffer@~1.1.1:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
 
@@ -3295,6 +3303,10 @@ lodash@^4.11.1, lodash@^4.13.1, lodash@^4.14.0, lodash@^4.17.2, lodash@^4.17.4,
   version "4.17.5"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.5.tgz#99a92d65c0272debe8c96b6057bc8fbfa3bed511"
 
+lodash@^4.16.4:
+  version "4.17.10"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"
+
 log-symbols@2.2.0, log-symbols@^2.1.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-2.2.0.tgz#5740e1c5d6f0dfda4ad9323b5332107ef6b4c40a"
@@ -3357,15 +3369,15 @@ markdown-it-named-headers@0.0.4:
   dependencies:
     string "^3.0.1"
 
-markdown-it@^8.4.0:
-  version "8.4.0"
-  resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-8.4.0.tgz#e2400881bf171f7018ed1bd9da441dac8af6306d"
+markdown-it@^8.4.1:
+  version "8.4.1"
+  resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-8.4.1.tgz#206fe59b0e4e1b78a7c73250af9b34a4ad0aaf44"
   dependencies:
     argparse "^1.0.7"
     entities "~1.1.1"
     linkify-it "^2.0.0"
     mdurl "^1.0.1"
-    uc.micro "^1.0.3"
+    uc.micro "^1.0.5"
 
 md5.js@^1.3.4:
   version "1.3.4"
@@ -3374,6 +3386,14 @@ md5.js@^1.3.4:
     hash-base "^3.0.0"
     inherits "^2.0.1"
 
+md5@^2.1.0:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/md5/-/md5-2.2.1.tgz#53ab38d5fe3c8891ba465329ea23fac0540126f9"
+  dependencies:
+    charenc "~0.0.1"
+    crypt "~0.0.1"
+    is-buffer "~1.1.1"
+
 mdurl@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e"
@@ -3535,12 +3555,29 @@ mixin-deep@^1.2.0:
     for-in "^1.0.2"
     is-extendable "^1.0.1"
 
-mkdirp@0.5.1, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0:
+mkdirp@0.5.1, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
   dependencies:
     minimist "0.0.8"
 
+mocha-junit-reporter@^1.17.0:
+  version "1.17.0"
+  resolved "https://registry.yarnpkg.com/mocha-junit-reporter/-/mocha-junit-reporter-1.17.0.tgz#2e5149ed40fc5d2e3ca71e42db5ab1fec9c6d85c"
+  dependencies:
+    debug "^2.2.0"
+    md5 "^2.1.0"
+    mkdirp "~0.5.1"
+    strip-ansi "^4.0.0"
+    xml "^1.0.0"
+
+mocha-multi-reporters@^1.1.7:
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/mocha-multi-reporters/-/mocha-multi-reporters-1.1.7.tgz#cc7f3f4d32f478520941d852abb64d9988587d82"
+  dependencies:
+    debug "^3.1.0"
+    lodash "^4.16.4"
+
 mocha@^4.0.1:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/mocha/-/mocha-4.1.0.tgz#7d86cfbcf35cb829e2754c32e17355ec05338794"
@@ -5159,10 +5196,14 @@ typescript@^2.7.2:
   version "2.7.2"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.7.2.tgz#2d615a1ef4aee4f574425cdff7026edf81919836"
 
-uc.micro@^1.0.1, uc.micro@^1.0.3:
+uc.micro@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.3.tgz#7ed50d5e0f9a9fb0a573379259f2a77458d50192"
 
+uc.micro@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.5.tgz#0c65f15f815aa08b560a61ce8b4db7ffc3f45376"
+
 uglify-es@^3.3.4:
   version "3.3.10"
   resolved "https://registry.yarnpkg.com/uglify-es/-/uglify-es-3.3.10.tgz#8b0b7992cebe20edc26de1bf325cef797b8f3fa5"
@@ -5415,15 +5456,15 @@ vm-browserify@0.0.4:
   dependencies:
     indexof "0.0.1"
 
-vscode-extension-telemetry@0.0.17:
-  version "0.0.17"
-  resolved "https://registry.yarnpkg.com/vscode-extension-telemetry/-/vscode-extension-telemetry-0.0.17.tgz#15123e7edb34e7b9724b6056f54a869bbb922cb7"
+vscode-extension-telemetry@0.0.18:
+  version "0.0.18"
+  resolved "https://registry.yarnpkg.com/vscode-extension-telemetry/-/vscode-extension-telemetry-0.0.18.tgz#602ba20d8c71453aa34533a291e7638f6e5c0327"
   dependencies:
     applicationinsights "1.0.1"
 
-vscode-nls@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.1.tgz#b1f3e04e8a94a715d5a7bcbc8339c51e6d74ca51"
+vscode-nls@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-4.0.0.tgz#4001c8a6caba5cedb23a9c5ce1090395c0e44002"
 
 vscode@^1.1.10:
   version "1.1.10"
@@ -5565,6 +5606,10 @@ write-file-atomic@^1.2.0:
     imurmurhash "^0.1.4"
     slide "^1.1.5"
 
+xml@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/xml/-/xml-1.0.1.tgz#78ba72020029c5bc87b8a81a3cfcd74b4a2fc1e5"
+
 "xtend@>=4.0.0 <4.1.0-0", xtend@^4.0.0, xtend@~4.0.0, xtend@~4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
diff --git a/extensions/merge-conflict/README.md b/extensions/merge-conflict/README.md
index a2f874bcb42..8077ecd6517 100644
--- a/extensions/merge-conflict/README.md
+++ b/extensions/merge-conflict/README.md
@@ -1,5 +1,7 @@
 # Merge Conflict
 
-See [documentation](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts).
+**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.
 
-**Notice** This is a an extension that is bundled with Visual Studio Code.
+## Features
+
+See [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.
diff --git a/extensions/merge-conflict/package.json b/extensions/merge-conflict/package.json
index f58bb6f2a90..cbf3b4755bd 100644
--- a/extensions/merge-conflict/package.json
+++ b/extensions/merge-conflict/package.json
@@ -79,7 +79,7 @@
       {
         "category": "%command.category%",
         "title": "%command.compare%",
-        "original":"Compare Current Conflict",
+        "original": "Compare Current Conflict",
         "command": "merge-conflict.compare"
       }
     ],
@@ -100,9 +100,9 @@
     }
   },
   "dependencies": {
-    "vscode-nls": "^3.2.1"
+    "vscode-nls": "^4.0.0"
   },
   "devDependencies": {
     "@types/node": "8.0.33"
   }
-}
\ No newline at end of file
+}
diff --git a/extensions/merge-conflict/package.nls.json b/extensions/merge-conflict/package.nls.json
index 66076bd7a87..ed7430674cb 100644
--- a/extensions/merge-conflict/package.nls.json
+++ b/extensions/merge-conflict/package.nls.json
@@ -13,6 +13,6 @@
 	"command.previous": "Previous Conflict",
 	"command.compare": "Compare Current Conflict",
 	"config.title": "Merge Conflict",
-	"config.codeLensEnabled": "Enable/disable merge conflict block CodeLens within editor",
-	"config.decoratorsEnabled": "Enable/disable merge conflict decorators within editor"
+	"config.codeLensEnabled": "Create a Code Lens for merge conflict blocks within editor.",
+	"config.decoratorsEnabled": "Create decorators for merge conflict blocks within editor."
 }
\ No newline at end of file
diff --git a/extensions/merge-conflict/src/interfaces.ts b/extensions/merge-conflict/src/interfaces.ts
index b45cd252c9d..bab96d13318 100644
--- a/extensions/merge-conflict/src/interfaces.ts
+++ b/extensions/merge-conflict/src/interfaces.ts
@@ -11,7 +11,7 @@ export interface IMergeRegion {
 	decoratorContent: vscode.Range;
 }
 
-export enum CommitType {
+export const enum CommitType {
 	Current,
 	Incoming,
 	Both
diff --git a/extensions/merge-conflict/yarn.lock b/extensions/merge-conflict/yarn.lock
index 355d778c63c..888e8da826d 100644
--- a/extensions/merge-conflict/yarn.lock
+++ b/extensions/merge-conflict/yarn.lock
@@ -6,6 +6,6 @@
   version "8.0.33"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.33.tgz#1126e94374014e54478092830704f6ea89df04cd"
 
-vscode-nls@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.1.tgz#b1f3e04e8a94a715d5a7bcbc8339c51e6d74ca51"
+vscode-nls@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-4.0.0.tgz#4001c8a6caba5cedb23a9c5ce1090395c0e44002"
diff --git a/extensions/npm/.vscode/tasks.json b/extensions/npm/.vscode/tasks.json
index 0a411c1c867..b7c8a281635 100644
--- a/extensions/npm/.vscode/tasks.json
+++ b/extensions/npm/.vscode/tasks.json
@@ -1,8 +1,10 @@
 {
-	"version": "0.1.0",
+	"version": "2.0.0",
 	"command": "npm",
-	"isShellCommand": true,
-	"showOutput": "silent",
+	"type": "shell",
+	"presentation": {
+		"reveal": "silent",
+	},
 	"args": ["run", "compile"],
 	"isBackground": true,
 	"problemMatcher": "$tsc-watch"
diff --git a/extensions/npm/README.md b/extensions/npm/README.md
index 625002ee7ee..a24a7d69d6e 100644
--- a/extensions/npm/README.md
+++ b/extensions/npm/README.md
@@ -1,18 +1,38 @@
 # Node npm
 
-**Notice** This is a an extension that is bundled with Visual Studio Code.
+**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.
+
+## Features
+
+### Task Running
 
 This extension supports running npm scripts defined in the `package.json` as [tasks](https://code.visualstudio.com/docs/editor/tasks). Scripts with the name 'build', 'compile', or 'watch'
 are treated as build tasks.
 
-To run scripts as tasks you use the `Tasks` menu.
+To run scripts as tasks, use the **Tasks** menu.
 
-For more information about auto detection of Tasks pls see the [documentation](https://code.visualstudio.com/Docs/editor/tasks#_task-autodetection).
+For more information about auto detection of Tasks, see the [documentation](https://code.visualstudio.com/Docs/editor/tasks#_task-autodetection).
+
+### Script Explorer
+
+The Npm Script Explorer shows the npm scripts found in your workspace. The explorer view is enabled by the setting `npm.enableScriptExplorer`. A script can be opened, run, or debug from the explorer.
+
+### Run Scripts from the Editor
+
+The extension supports to run the selected script as a task when editing the `package.json`file. You can either run a script from
+the hover shown on a script or using the command `Run Selected Npm Script`.
+
+### Others
+
+The extension fetches data from https://registry.npmjs/org and https://registry.bower.io to provide auto-completion and information on hover features on npm dependencies.
 
 ## Settings
-- `npm.autoDetect` enable detecting scripts as tasks, the default is `on`.
-- `npm.runSilent` run npm script with the `--silent` option, the default is `false`.
-- `npm.packageManager` the package manager used to run the scripts: `npm` or `yarn`, the default is `npm`.
-- `npm.exclude` glob patterns for folders that should be excluded from automatic script detection. The pattern is matched against the **absolute path** of the package.json. For example, to exclude all test folders use '&ast;&ast;/test/&ast;&ast;'.
-- `npm.enableScriptExplorer` enable an explorer view for npm scripts.
-- `npm.scriptExplorerAction` the default click action: `open` or `run`, the default is `open`.
+
+- `npm.autoDetect` - Enable detecting scripts as tasks, the default is `on`.
+- `npm.runSilent` - Run npm script with the `--silent` option, the default is `false`.
+- `npm.packageManager` - The package manager used to run the scripts: `npm` or `yarn`, the default is `npm`.
+- `npm.exclude` - Glob patterns for folders that should be excluded from automatic script detection. The pattern is matched against the **absolute path** of the package.json. For example, to exclude all test folders use '&ast;&ast;/test/&ast;&ast;'.
+- `npm.enableScriptExplorer` - Enable an explorer view for npm scripts.
+- `npm.scriptExplorerAction` - The default click action: `open` or `run`, the default is `open`.
+- `npm.scriptCodeLens.enable` - Enable/disable the code lenses to run a script, the default is `false`.
+
diff --git a/extensions/npm/package.json b/extensions/npm/package.json
index 32e2402c4c1..ebaa3f9cd69 100644
--- a/extensions/npm/package.json
+++ b/extensions/npm/package.json
@@ -20,11 +20,11 @@
     "jsonc-parser": "^1.0.0",
     "minimatch": "^3.0.4",
     "request-light": "^0.2.2",
-    "vscode-nls": "^3.2.1"
+    "vscode-nls": "^4.0.0"
   },
   "devDependencies": {
     "@types/minimatch": "^3.0.3",
-    "@types/node": "7.0.43"
+    "@types/node": "^8.10.25"
   },
   "main": "./out/main",
   "activationEvents": [
@@ -82,9 +82,46 @@
           "light": "resources/light/refresh.svg",
           "dark": "resources/dark/refresh.svg"
         }
+      },
+      {
+        "command": "npm.runSelectedScript",
+        "title": "%command.runSelectedScript%"
       }
     ],
     "menus": {
+      "commandPalette": [
+        {
+          "command": "npm.refresh",
+          "when": "false"
+        },
+        {
+          "command": "npm.runScript",
+          "when": "false"
+        },
+        {
+          "command": "npm.debugScript",
+          "when": "false"
+        },
+        {
+          "command": "npm.openScript",
+          "when": "false"
+        },
+        {
+          "command": "npm.runInstall",
+          "when": "false"
+        },
+        {
+          "command": "npm.runSelectedScript",
+          "when": "false"
+        }
+      ],
+      "editor/context": [
+        {
+          "command": "npm.runSelectedScript",
+          "when": "resourceFilename == 'package.json'",
+          "group": "navigation@+1"
+        }
+      ],
       "view/title": [
         {
           "command": "npm.refresh",
@@ -102,7 +139,8 @@
           "command": "npm.runInstall",
           "when": "view == npm && viewItem == packageJSON",
           "group": "navigation@2"
-        },        {
+        },
+        {
           "command": "npm.openScript",
           "when": "view == npm && viewItem == script",
           "group": "navigation@1"
@@ -153,7 +191,7 @@
           "type": "boolean",
           "default": false,
           "scope": "resource",
-          "description": "%config.npm.runSilent%"
+          "markdownDescription": "%config.npm.runSilent%"
         },
         "npm.packageManager": {
           "scope": "resource",
@@ -188,9 +226,18 @@
             "open",
             "run"
           ],
-          "description": "%config.npm.scriptExplorerAction%",
+          "markdownDescription": "%config.npm.scriptExplorerAction%",
           "scope": "window",
           "default": "open"
+        },
+        "npm.fetchOnlinePackageInfo": {
+          "type": "boolean",
+          "description": "%config.npm.fetchOnlinePackageInfo%",
+          "default": true,
+          "scope": "window",
+          "tags": [
+            "usesOnlineServices"
+          ]
         }
       }
     },
@@ -223,4 +270,4 @@
       }
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/extensions/npm/package.nls.json b/extensions/npm/package.nls.json
index ccc6aa3114c..4a33bcc0bc3 100644
--- a/extensions/npm/package.nls.json
+++ b/extensions/npm/package.nls.json
@@ -1,12 +1,13 @@
 {
 	"description": "Extension to add task support for npm scripts.",
-	"displayName": "Npm support for VSCode",
-	"config.npm.autoDetect": "Controls whether auto detection of npm scripts is on or off. Default is on.",
+	"displayName": "Npm support for VS Code",
+	"config.npm.autoDetect": "Controls whether npm scripts should be automatically detected.",
 	"config.npm.runSilent": "Run npm commands with the `--silent` option.",
 	"config.npm.packageManager": "The package manager used to run scripts.",
 	"config.npm.exclude": "Configure glob patterns for folders that should be excluded from automatic script detection.",
 	"config.npm.enableScriptExplorer": "Enable an explorer view for npm scripts.",
-	"config.npm.scriptExplorerAction": "The default click action used in the scripts explorer: 'open' or 'run', the default is 'open'.",
+	"config.npm.scriptExplorerAction": "The default click action used in the scripts explorer: `open` or `run`, the default is `open`.",
+	"config.npm.fetchOnlinePackageInfo": "Fetch data from https://registry.npmjs/org and https://registry.bower.io to provide auto-completion and information on hover features on npm dependencies.",
 	"npm.parseError": "Npm task detection: failed to parse the file {0}",
 	"taskdef.script": "The npm script to customize.",
 	"taskdef.path": "The path to the folder of the package.json file that provides the script. Can be omitted.",
@@ -15,5 +16,6 @@
 	"command.run": "Run",
 	"command.debug": "Debug",
 	"command.openScript": "Open",
-	"command.runInstall": "Run Install"
+	"command.runInstall": "Run Install",
+	"command.runSelectedScript": "Run Script"
 }
diff --git a/extensions/npm/src/commands.ts b/extensions/npm/src/commands.ts
new file mode 100644
index 00000000000..509d536db92
--- /dev/null
+++ b/extensions/npm/src/commands.ts
@@ -0,0 +1,32 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+'use strict';
+
+import * as vscode from 'vscode';
+import {
+	runScript, findScriptAtPosition
+} from './tasks';
+import * as nls from 'vscode-nls';
+
+const localize = nls.loadMessageBundle();
+
+export function runSelectedScript() {
+	let editor = vscode.window.activeTextEditor;
+	if (!editor) {
+		return;
+	}
+	let document = editor.document;
+	let contents = document.getText();
+	let selection = editor.selection;
+	let offset = document.offsetAt(selection.anchor);
+
+	let script = findScriptAtPosition(contents, offset);
+	if (script) {
+		runScript(script, document);
+	} else {
+		let message = localize('noScriptFound', 'Could not find an npm script at the selection.');
+		vscode.window.showErrorMessage(message);
+	}
+}
\ No newline at end of file
diff --git a/extensions/npm/src/features/bowerJSONContribution.ts b/extensions/npm/src/features/bowerJSONContribution.ts
index a00f347078c..300d7dad1f0 100644
--- a/extensions/npm/src/features/bowerJSONContribution.ts
+++ b/extensions/npm/src/features/bowerJSONContribution.ts
@@ -4,8 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import { MarkedString, CompletionItemKind, CompletionItem, DocumentSelector, SnippetString } from 'vscode';
-import { IJSONContribution, ISuggestionsCollector } from './jsonContributions';
+import { MarkedString, CompletionItemKind, CompletionItem, DocumentSelector, SnippetString, workspace } from 'vscode';
+import { IJSONContribution, ISuggestionsCollector, xhrDisabled } from './jsonContributions';
 import { XHRRequest } from 'request-light';
 import { Location } from 'jsonc-parser';
 import { textToMarkedString } from './markedTextUtil';
@@ -25,13 +25,20 @@ export class BowerJSONContribution implements IJSONContribution {
 		'hui', 'bootstrap-languages', 'async', 'gulp', 'jquery-pjax', 'coffeescript', 'hammer.js', 'ace', 'leaflet', 'jquery-mobile', 'sweetalert', 'typeahead.js', 'soup', 'typehead.js',
 		'sails', 'codeigniter2'];
 
-	public constructor(private xhr: XHRRequest) {
+	private xhr: XHRRequest;
+
+	public constructor(xhr: XHRRequest) {
+		this.xhr = xhr;
 	}
 
 	public getDocumentSelector(): DocumentSelector {
 		return [{ language: 'json', scheme: '*', pattern: '**/bower.json' }, { language: 'json', scheme: '*', pattern: '**/.bower.json' }];
 	}
 
+	private onlineEnabled() {
+		return !!workspace.getConfiguration('npm').get('fetchOnlinePackageInfo');
+	}
+
 	public collectDefaultSuggestions(_resource: string, collector: ISuggestionsCollector): Thenable<any> {
 		const defaultValue = {
 			'name': '${1:name}',
@@ -50,7 +57,7 @@ export class BowerJSONContribution implements IJSONContribution {
 
 	public collectPropertySuggestions(_resource: string, location: Location, currentWord: string, addValue: boolean, isLast: boolean, collector: ISuggestionsCollector): Thenable<any> | null {
 		if ((location.matches(['dependencies']) || location.matches(['devDependencies']))) {
-			if (currentWord.length > 0) {
+			if (currentWord.length > 0 && this.onlineEnabled()) {
 				const queryUrl = 'https://registry.bower.io/packages/search/' + encodeURIComponent(currentWord);
 
 				return this.xhr({
@@ -144,6 +151,10 @@ export class BowerJSONContribution implements IJSONContribution {
 	}
 
 	private getInfo(pack: string): Thenable<string | undefined> {
+		if (!this.onlineEnabled()) {
+			return Promise.resolve(undefined);
+		}
+
 		const queryUrl = 'https://registry.bower.io/packages/' + encodeURIComponent(pack);
 
 		return this.xhr({
diff --git a/extensions/npm/src/features/jsonContributions.ts b/extensions/npm/src/features/jsonContributions.ts
index 81f8a66f2c2..a18bccf28ff 100644
--- a/extensions/npm/src/features/jsonContributions.ts
+++ b/extensions/npm/src/features/jsonContributions.ts
@@ -164,3 +164,5 @@ export class JSONCompletionItemProvider implements CompletionItemProvider {
 		return nextToken === SyntaxKind.CloseBraceToken || nextToken === SyntaxKind.EOF;
 	}
 }
+
+export const xhrDisabled = () => Promise.reject({ responseText: 'Use of online resources is disabled.' });
\ No newline at end of file
diff --git a/extensions/npm/src/features/packageJSONContribution.ts b/extensions/npm/src/features/packageJSONContribution.ts
index b060290eb51..38e4ce05310 100644
--- a/extensions/npm/src/features/packageJSONContribution.ts
+++ b/extensions/npm/src/features/packageJSONContribution.ts
@@ -4,8 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import { MarkedString, CompletionItemKind, CompletionItem, DocumentSelector, SnippetString } from 'vscode';
-import { IJSONContribution, ISuggestionsCollector } from './jsonContributions';
+import { MarkedString, CompletionItemKind, CompletionItem, DocumentSelector, SnippetString, workspace } from 'vscode';
+import { IJSONContribution, ISuggestionsCollector, xhrDisabled } from './jsonContributions';
 import { XHRRequest } from 'request-light';
 import { Location } from 'jsonc-parser';
 import { textToMarkedString } from './markedTextUtil';
@@ -28,12 +28,14 @@ export class PackageJSONContribution implements IJSONContribution {
 		'jsdom', 'stylus', 'when', 'readable-stream', 'aws-sdk', 'concat-stream', 'chai', 'Thenable', 'wrench'];
 
 	private knownScopes = ['@types', '@angular'];
+	private xhr: XHRRequest;
 
 	public getDocumentSelector(): DocumentSelector {
 		return [{ language: 'json', scheme: '*', pattern: '**/package.json' }];
 	}
 
-	public constructor(private xhr: XHRRequest) {
+	public constructor(xhr: XHRRequest) {
+		this.xhr = xhr;
 	}
 
 	public collectDefaultSuggestions(_fileName: string, result: ISuggestionsCollector): Thenable<any> {
@@ -52,6 +54,10 @@ export class PackageJSONContribution implements IJSONContribution {
 		return Promise.resolve(null);
 	}
 
+	private onlineEnabled() {
+		return !!workspace.getConfiguration('npm').get('fetchOnlinePackageInfo');
+	}
+
 	public collectPropertySuggestions(
 		_resource: string,
 		location: Location,
@@ -60,6 +66,10 @@ export class PackageJSONContribution implements IJSONContribution {
 		isLast: boolean,
 		collector: ISuggestionsCollector
 	): Thenable<any> | null {
+		if (!this.onlineEnabled()) {
+			return null;
+		}
+
 		if ((location.matches(['dependencies']) || location.matches(['devDependencies']) || location.matches(['optionalDependencies']) || location.matches(['peerDependencies']))) {
 			let queryUrl: string;
 			if (currentWord.length > 0) {
@@ -209,6 +219,10 @@ export class PackageJSONContribution implements IJSONContribution {
 		location: Location,
 		result: ISuggestionsCollector
 	): Thenable<any> | null {
+		if (!this.onlineEnabled()) {
+			return null;
+		}
+
 		if ((location.matches(['dependencies', '*']) || location.matches(['devDependencies', '*']) || location.matches(['optionalDependencies', '*']) || location.matches(['peerDependencies', '*']))) {
 			const currentKey = location.path[location.path.length - 1];
 			if (typeof currentKey === 'string') {
diff --git a/extensions/npm/src/main.ts b/extensions/npm/src/main.ts
index 023fddbffb6..02e22490fd7 100644
--- a/extensions/npm/src/main.ts
+++ b/extensions/npm/src/main.ts
@@ -6,21 +6,22 @@
 
 import * as httpRequest from 'request-light';
 import * as vscode from 'vscode';
-
 import { addJSONProviders } from './features/jsonContributions';
 import { NpmScriptsTreeDataProvider } from './npmView';
-import { provideNpmScripts, invalidateScriptsCache } from './tasks';
-
-let taskProvider: vscode.Disposable | undefined;
+import { invalidateTasksCache, NpmTaskProvider } from './tasks';
+import { invalidateHoverScriptsCache, NpmScriptHoverProvider } from './scriptHover';
+import { runSelectedScript } from './commands';
 
 export async function activate(context: vscode.ExtensionContext): Promise<void> {
-	taskProvider = registerTaskProvider(context);
+	const taskProvider = registerTaskProvider(context);
 	const treeDataProvider = registerExplorer(context);
+	const hoverProvider = registerHoverProvider(context);
+
 	configureHttpRequest();
-	vscode.workspace.onDidChangeConfiguration((e) => {
+	let d = vscode.workspace.onDidChangeConfiguration((e) => {
 		configureHttpRequest();
 		if (e.affectsConfiguration('npm.exclude')) {
-			invalidateScriptsCache();
+			invalidateTasksCache();
 			if (treeDataProvider) {
 				treeDataProvider.refresh();
 			}
@@ -31,26 +32,34 @@ export async function activate(context: vscode.ExtensionContext): Promise<void>
 			}
 		}
 	});
+	context.subscriptions.push(d);
+
+	d = vscode.workspace.onDidChangeTextDocument((e) => {
+		invalidateHoverScriptsCache(e.document);
+	});
+	context.subscriptions.push(d);
+	context.subscriptions.push(vscode.commands.registerCommand('npm.runSelectedScript', runSelectedScript));
 	context.subscriptions.push(addJSONProviders(httpRequest.xhr));
 }
 
 function registerTaskProvider(context: vscode.ExtensionContext): vscode.Disposable | undefined {
+
+	function invalidateScriptCaches() {
+		invalidateHoverScriptsCache();
+		invalidateTasksCache();
+	}
+
 	if (vscode.workspace.workspaceFolders) {
 		let watcher = vscode.workspace.createFileSystemWatcher('**/package.json');
-		watcher.onDidChange((_e) => invalidateScriptsCache());
-		watcher.onDidDelete((_e) => invalidateScriptsCache());
-		watcher.onDidCreate((_e) => invalidateScriptsCache());
+		watcher.onDidChange((_e) => invalidateScriptCaches());
+		watcher.onDidDelete((_e) => invalidateScriptCaches());
+		watcher.onDidCreate((_e) => invalidateScriptCaches());
 		context.subscriptions.push(watcher);
 
-		let provider: vscode.TaskProvider = {
-			provideTasks: async () => {
-				return provideNpmScripts();
-			},
-			resolveTask(_task: vscode.Task): vscode.Task | undefined {
-				return undefined;
-			}
-		};
-		return vscode.workspace.registerTaskProvider('npm', provider);
+		let provider: vscode.TaskProvider = new NpmTaskProvider(context);
+		let disposable = vscode.workspace.registerTaskProvider('npm', provider);
+		context.subscriptions.push(disposable);
+		return disposable;
 	}
 	return undefined;
 }
@@ -65,13 +74,24 @@ function registerExplorer(context: vscode.ExtensionContext): NpmScriptsTreeDataP
 	return undefined;
 }
 
+function registerHoverProvider(context: vscode.ExtensionContext): NpmScriptHoverProvider | undefined {
+	if (vscode.workspace.workspaceFolders) {
+		let npmSelector: vscode.DocumentSelector = {
+			language: 'json',
+			scheme: 'file',
+			pattern: '**/package.json'
+		};
+		let provider = new NpmScriptHoverProvider(context);
+		context.subscriptions.push(vscode.languages.registerHoverProvider(npmSelector, provider));
+		return provider;
+	}
+	return undefined;
+}
+
 function configureHttpRequest() {
 	const httpSettings = vscode.workspace.getConfiguration('http');
 	httpRequest.configure(httpSettings.get<string>('proxy', ''), httpSettings.get<boolean>('proxyStrictSSL', true));
 }
 
 export function deactivate(): void {
-	if (taskProvider) {
-		taskProvider.dispose();
-	}
 }
diff --git a/extensions/npm/src/npmView.ts b/extensions/npm/src/npmView.ts
index 3bf86c5b1e2..f737df23e1b 100644
--- a/extensions/npm/src/npmView.ts
+++ b/extensions/npm/src/npmView.ts
@@ -6,14 +6,14 @@
 
 import * as path from 'path';
 import {
-	DebugConfiguration, Event, EventEmitter, ExtensionContext, Task,
+	Event, EventEmitter, ExtensionContext, Task,
 	TextDocument, ThemeIcon, TreeDataProvider, TreeItem, TreeItemCollapsibleState, Uri,
-	WorkspaceFolder, commands, debug, window, workspace, tasks, Selection, TaskGroup
+	WorkspaceFolder, commands, window, workspace, tasks, Selection, TaskGroup
 } from 'vscode';
 import { visit, JSONVisitor } from 'jsonc-parser';
 import {
 	NpmTaskDefinition, getPackageJsonUriFromTask, getScripts,
-	isWorkspaceFolder, getPackageManager, getTaskName, createTask
+	isWorkspaceFolder, getTaskName, createTask, extractDebugArgFromScript, startDebugging
 } from './tasks';
 import * as nls from 'vscode-nls';
 
@@ -162,21 +162,7 @@ export class NpmScriptsTreeDataProvider implements TreeDataProvider<TreeItem> {
 	}
 
 	private extractDebugArg(scripts: any, task: Task): [string, number] | undefined {
-		let script: string = scripts[task.name];
-
-		let match = script.match(/--(inspect|debug)(-brk)?(=(\d*))?/);
-		if (match) {
-			if (match[4]) {
-				return [match[1], parseInt(match[4])];
-			}
-			if (match[1] === 'inspect') {
-				return [match[1], 9229];
-			}
-			if (match[1] === 'debug') {
-				return [match[1], 5858];
-			}
-		}
-		return undefined;
+		return extractDebugArgFromScript(scripts[task.name]);
 	}
 
 	private async debugScript(script: NpmScript) {
@@ -189,7 +175,7 @@ export class NpmScriptsTreeDataProvider implements TreeDataProvider<TreeItem> {
 			return;
 		}
 
-		let debugArg = await this.extractDebugArg(scripts, task);
+		let debugArg = this.extractDebugArg(scripts, task);
 		if (!debugArg) {
 			let message = localize('noDebugOptions', 'Could not launch "{0}" for debugging because the scripts lacks a node debug option, e.g. "--inspect-brk".', task.name);
 			let learnMore = localize('learnMore', 'Learn More');
@@ -200,29 +186,7 @@ export class NpmScriptsTreeDataProvider implements TreeDataProvider<TreeItem> {
 			}
 			return;
 		}
-
-		let protocol = 'inspector';
-		if (debugArg[0] === 'debug') {
-			protocol = 'legacy';
-		}
-
-		let packageManager = getPackageManager(script.getFolder());
-		const config: DebugConfiguration = {
-			type: 'node',
-			request: 'launch',
-			name: `Debug ${task.name}`,
-			runtimeExecutable: packageManager,
-			runtimeArgs: [
-				'run-script',
-				task.name,
-			],
-			port: debugArg[1],
-			protocol: protocol
-		};
-
-		if (isWorkspaceFolder(task.scope)) {
-			debug.startDebugging(task.scope, config);
-		}
+		startDebugging(task.name, debugArg[0], debugArg[1], script.getFolder());
 	}
 
 	private scriptNotValid(task: Task) {
@@ -354,7 +318,6 @@ export class NpmScriptsTreeDataProvider implements TreeDataProvider<TreeItem> {
 	private buildTaskTree(tasks: Task[]): Folder[] | PackageJSON[] | NoScripts[] {
 		let folders: Map<String, Folder> = new Map();
 		let packages: Map<String, PackageJSON> = new Map();
-		let scripts: Map<String, NpmScript> = new Map();
 
 		let folder = null;
 		let packageJson = null;
@@ -376,11 +339,8 @@ export class NpmScriptsTreeDataProvider implements TreeDataProvider<TreeItem> {
 					packages.set(fullPath, packageJson);
 				}
 				let fullScriptPath = path.join(packageJson.path, each.name);
-				if (!scripts.get(fullScriptPath)) {
-					let script = new NpmScript(this.extensionContext, packageJson, each);
-					packageJson.addScript(script);
-					scripts.set(fullScriptPath, script);
-				}
+				let script = new NpmScript(this.extensionContext, packageJson, each);
+				packageJson.addScript(script);
 			}
 		});
 		if (folders.size === 1) {
diff --git a/extensions/npm/src/scriptHover.ts b/extensions/npm/src/scriptHover.ts
new file mode 100644
index 00000000000..d81ceee0807
--- /dev/null
+++ b/extensions/npm/src/scriptHover.ts
@@ -0,0 +1,126 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+'use strict';
+
+import {
+	ExtensionContext, TextDocument, commands, ProviderResult, CancellationToken,
+	workspace, tasks, Range, HoverProvider, Hover, Position, MarkdownString, Uri
+} from 'vscode';
+import {
+	createTask, startDebugging, findAllScriptRanges, extractDebugArgFromScript
+} from './tasks';
+import * as nls from 'vscode-nls';
+
+const localize = nls.loadMessageBundle();
+
+let cachedDocument: Uri | undefined = undefined;
+let cachedScriptsMap: Map<string, [number, number, string]> | undefined = undefined;
+
+export function invalidateHoverScriptsCache(document?: TextDocument) {
+	if (!document) {
+		cachedDocument = undefined;
+		return;
+	}
+	if (document.uri === cachedDocument) {
+		cachedDocument = undefined;
+	}
+}
+
+export class NpmScriptHoverProvider implements HoverProvider {
+	private extensionContext: ExtensionContext;
+
+	constructor(context: ExtensionContext) {
+		this.extensionContext = context;
+		context.subscriptions.push(commands.registerCommand('npm.runScriptFromHover', this.runScriptFromHover, this));
+		context.subscriptions.push(commands.registerCommand('npm.debugScriptFromHover', this.debugScriptFromHover, this));
+	}
+
+	public provideHover(document: TextDocument, position: Position, _token: CancellationToken): ProviderResult<Hover> {
+		let hover: Hover | undefined = undefined;
+
+		if (!cachedDocument || cachedDocument.fsPath !== document.uri.fsPath) {
+			cachedScriptsMap = findAllScriptRanges(document.getText());
+			cachedDocument = document.uri;
+		}
+
+		cachedScriptsMap!.forEach((value, key) => {
+			let start = document.positionAt(value[0]);
+			let end = document.positionAt(value[0] + value[1]);
+			let range = new Range(start, end);
+
+			if (range.contains(position)) {
+				let contents: MarkdownString = new MarkdownString();
+				contents.isTrusted = true;
+				contents.appendMarkdown(this.createRunScriptMarkdown(key, document.uri));
+
+				let debugArgs = extractDebugArgFromScript(value[2]);
+				if (debugArgs) {
+					contents.appendMarkdown(this.createDebugScriptMarkdown(key, document.uri, debugArgs[0], debugArgs[1]));
+				}
+				hover = new Hover(contents);
+			}
+		});
+		return hover;
+	}
+
+	private createRunScriptMarkdown(script: string, documentUri: Uri): string {
+		let args = {
+			documentUri: documentUri,
+			script: script,
+		};
+		return this.createMarkdownLink(
+			localize('runScript', 'Run Script'),
+			'npm.runScriptFromHover',
+			args,
+			localize('runScript.tooltip', 'Run the script as a task')
+		);
+	}
+
+	private createDebugScriptMarkdown(script: string, documentUri: Uri, protocol: string, port: number): string {
+		let args = {
+			documentUri: documentUri,
+			script: script,
+			protocol: protocol,
+			port: port
+		};
+		return this.createMarkdownLink(
+			localize('debugScript', 'Debug Script'),
+			'npm.debugScriptFromHover',
+			args,
+			localize('debugScript.tooltip', 'Runs the script under the debugger'),
+			'|'
+		);
+	}
+
+	private createMarkdownLink(label: string, cmd: string, args: any, tooltip: string, separator?: string): string {
+		let encodedArgs = encodeURIComponent(JSON.stringify(args));
+		let prefix = '';
+		if (separator) {
+			prefix = ` ${separator} `;
+		}
+		return `${prefix}[${label}](command:${cmd}?${encodedArgs} "${tooltip}")`;
+	}
+
+	public runScriptFromHover(args: any) {
+		let script = args.script;
+		let documentUri = args.documentUri;
+		let folder = workspace.getWorkspaceFolder(documentUri);
+		if (folder) {
+			let task = createTask(script, `run ${script}`, folder, documentUri);
+			tasks.executeTask(task);
+		}
+	}
+
+	public debugScriptFromHover(args: any) {
+		let script = args.script;
+		let documentUri = args.documentUri;
+		let protocol = args.protocol;
+		let port = args.port;
+		let folder = workspace.getWorkspaceFolder(documentUri);
+		if (folder) {
+			startDebugging(script, protocol, port, folder);
+		}
+	}
+}
diff --git a/extensions/npm/src/tasks.ts b/extensions/npm/src/tasks.ts
index 88fa3c82824..189fd98baec 100644
--- a/extensions/npm/src/tasks.ts
+++ b/extensions/npm/src/tasks.ts
@@ -4,7 +4,10 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import { TaskDefinition, Task, TaskGroup, WorkspaceFolder, RelativePattern, ShellExecution, Uri, workspace } from 'vscode';
+import {
+	TaskDefinition, Task, TaskGroup, WorkspaceFolder, RelativePattern, ShellExecution, Uri, workspace,
+	DebugConfiguration, debug, TaskProvider, ExtensionContext, TextDocument, tasks
+} from 'vscode';
 import * as path from 'path';
 import * as fs from 'fs';
 import * as minimatch from 'minimatch';
@@ -22,7 +25,23 @@ type AutoDetect = 'on' | 'off';
 
 let cachedTasks: Task[] | undefined = undefined;
 
-export function invalidateScriptsCache() {
+export class NpmTaskProvider implements TaskProvider {
+	private extensionContext: ExtensionContext;
+
+	constructor(context: ExtensionContext) {
+		this.extensionContext = context;
+	}
+
+	public provideTasks() {
+		return provideNpmScripts();
+	}
+
+	public resolveTask(_task: Task): Task | undefined {
+		return undefined;
+	}
+}
+
+export function invalidateTasksCache() {
 	cachedTasks = undefined;
 }
 
@@ -100,6 +119,7 @@ async function detectNpmScripts(): Promise<Task[]> {
 
 	let emptyTasks: Task[] = [];
 	let allTasks: Task[] = [];
+	let visitedPackageJsonFiles: Set<string> = new Set();
 
 	let folders = workspace.workspaceFolders;
 	if (!folders) {
@@ -112,8 +132,10 @@ async function detectNpmScripts(): Promise<Task[]> {
 				let relativePattern = new RelativePattern(folder, '**/package.json');
 				let paths = await workspace.findFiles(relativePattern, '**/node_modules/**');
 				for (let j = 0; j < paths.length; j++) {
-					if (!isExcluded(folder, paths[j])) {
-						let tasks = await provideNpmScriptsForFolder(paths[j]);
+					let path = paths[j];
+					if (!isExcluded(folder, path) && !visitedPackageJsonFiles.has(path.fsPath)) {
+						let tasks = await provideNpmScriptsForFolder(path);
+						visitedPackageJsonFiles.add(path.fsPath);
 						allTasks.push(...tasks);
 					}
 				}
@@ -159,7 +181,7 @@ function isExcluded(folder: WorkspaceFolder, packageJsonUri: Uri) {
 }
 
 function isDebugScript(script: string): boolean {
-	let match = script.match(/--(inspect|debug)(-brk)?(=(\d*))?/);
+	let match = script.match(/--(inspect|debug)(-brk)?(=((\[[0-9a-fA-F:]*\]|[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+|[a-zA-Z0-9\.]*):)?(\d+))?/);
 	return match !== null;
 }
 
@@ -266,6 +288,61 @@ async function readFile(file: string): Promise<string> {
 	});
 }
 
+export function runScript(script: string, document: TextDocument) {
+	let uri = document.uri;
+	let folder = workspace.getWorkspaceFolder(uri);
+	if (folder) {
+		let task = createTask(script, `run ${script}`, folder, uri);
+		tasks.executeTask(task);
+	}
+}
+
+export function extractDebugArgFromScript(scriptValue: string): [string, number] | undefined {
+	// matches --debug, --debug=1234, --debug-brk, debug-brk=1234, --inspect,
+	// --inspect=1234, --inspect-brk, --inspect-brk=1234,
+	// --inspect=localhost:1245, --inspect=127.0.0.1:1234, --inspect=[aa:1:0:0:0]:1234, --inspect=:1234
+	let match = scriptValue.match(/--(inspect|debug)(-brk)?(=((\[[0-9a-fA-F:]*\]|[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+|[a-zA-Z0-9\.]*):)?(\d+))?/);
+
+	if (match) {
+		if (match[6]) {
+			return [match[1], parseInt(match[6])];
+		}
+		if (match[1] === 'inspect') {
+			return [match[1], 9229];
+		}
+		if (match[1] === 'debug') {
+			return [match[1], 5858];
+		}
+	}
+	return undefined;
+}
+
+export function startDebugging(scriptName: string, protocol: string, port: number, folder: WorkspaceFolder) {
+	let p = 'inspector';
+	if (protocol === 'debug') {
+		p = 'legacy';
+	}
+
+	let packageManager = getPackageManager(folder);
+	const config: DebugConfiguration = {
+		type: 'node',
+		request: 'launch',
+		name: `Debug ${scriptName}`,
+		runtimeExecutable: packageManager,
+		runtimeArgs: [
+			'run',
+			scriptName,
+		],
+		port: port,
+		protocol: p
+	};
+
+	if (folder) {
+		debug.startDebugging(folder, config);
+	}
+}
+
+
 export type StringMap = { [s: string]: string; };
 
 async function findAllScripts(buffer: string): Promise<StringMap> {
@@ -275,7 +352,6 @@ async function findAllScripts(buffer: string): Promise<StringMap> {
 
 	let visitor: JSONVisitor = {
 		onError(_error: ParseErrorCode, _offset: number, _length: number) {
-			// TODO: inform user about the parse error
 		},
 		onObjectEnd() {
 			if (inScripts) {
@@ -301,6 +377,80 @@ async function findAllScripts(buffer: string): Promise<StringMap> {
 	return scripts;
 }
 
+export function findAllScriptRanges(buffer: string): Map<string, [number, number, string]> {
+	var scripts: Map<string, [number, number, string]> = new Map();
+	let script: string | undefined = undefined;
+	let offset: number;
+	let length: number;
+
+	let inScripts = false;
+
+	let visitor: JSONVisitor = {
+		onError(_error: ParseErrorCode, _offset: number, _length: number) {
+		},
+		onObjectEnd() {
+			if (inScripts) {
+				inScripts = false;
+			}
+		},
+		onLiteralValue(value: any, _offset: number, _length: number) {
+			if (script) {
+				scripts.set(script, [offset, length, value]);
+				script = undefined;
+			}
+		},
+		onObjectProperty(property: string, off: number, len: number) {
+			if (property === 'scripts') {
+				inScripts = true;
+			}
+			else if (inScripts) {
+				script = property;
+				offset = off;
+				length = len;
+			}
+		}
+	};
+	visit(buffer, visitor);
+	return scripts;
+}
+
+export function findScriptAtPosition(buffer: string, offset: number): string | undefined {
+	let script: string | undefined = undefined;
+	let inScripts = false;
+	let scriptStart: number | undefined;
+	let visitor: JSONVisitor = {
+		onError(_error: ParseErrorCode, _offset: number, _length: number) {
+		},
+		onObjectEnd() {
+			if (inScripts) {
+				inScripts = false;
+				scriptStart = undefined;
+			}
+		},
+		onLiteralValue(value: any, nodeOffset: number, nodeLength: number) {
+			if (inScripts && scriptStart) {
+				if (offset >= scriptStart && offset < nodeOffset + nodeLength) {
+					// found the script
+					inScripts = false;
+				} else {
+					script = undefined;
+				}
+			}
+		},
+		onObjectProperty(property: string, nodeOffset: number, nodeLength: number) {
+			if (property === 'scripts') {
+				inScripts = true;
+			}
+			else if (inScripts) {
+				scriptStart = nodeOffset;
+				script = property;
+			}
+		}
+	};
+	visit(buffer, visitor);
+	return script;
+}
+
 export async function getScripts(packageJsonUri: Uri): Promise<StringMap | undefined> {
 
 	if (packageJsonUri.scheme !== 'file') {
diff --git a/extensions/npm/yarn.lock b/extensions/npm/yarn.lock
index 741a6fe9a22..0cb54a6c9ba 100644
--- a/extensions/npm/yarn.lock
+++ b/extensions/npm/yarn.lock
@@ -6,9 +6,9 @@
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
 
-"@types/node@7.0.43":
-  version "7.0.43"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.43.tgz#a187e08495a075f200ca946079c914e1a5fe962c"
+"@types/node@^8.10.25":
+  version "8.10.25"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-8.10.25.tgz#801fe4e39372cef18f268db880a5fbfcf71adc7e"
 
 agent-base@4, agent-base@^4.1.0:
   version "4.2.0"
@@ -93,6 +93,6 @@ vscode-nls@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-2.0.2.tgz#808522380844b8ad153499af5c3b03921aea02da"
 
-vscode-nls@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.1.tgz#b1f3e04e8a94a715d5a7bcbc8339c51e6d74ca51"
+vscode-nls@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-4.0.0.tgz#4001c8a6caba5cedb23a9c5ce1090395c0e44002"
diff --git a/extensions/objective-c/test/colorize-results/test_m.json b/extensions/objective-c/test/colorize-results/test_m.json
index ed1bda084e3..691fe71e9a5 100644
--- a/extensions/objective-c/test/colorize-results/test_m.json
+++ b/extensions/objective-c/test/colorize-results/test_m.json
@@ -3,9 +3,9 @@
 		"c": "//",
 		"t": "source.objc comment.line.double-slash.cpp punctuation.definition.comment.cpp",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -14,9 +14,9 @@
 		"c": "//",
 		"t": "source.objc comment.line.double-slash.cpp punctuation.definition.comment.cpp",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -25,9 +25,9 @@
 		"c": "  Copyright (c) Microsoft Corporation. All rights reserved.",
 		"t": "source.objc comment.line.double-slash.cpp",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -36,9 +36,9 @@
 		"c": "//",
 		"t": "source.objc comment.line.double-slash.cpp punctuation.definition.comment.cpp",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -179,9 +179,9 @@
 		"c": "/*",
 		"t": "source.objc comment.block.c punctuation.definition.comment.begin.c",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -190,9 +190,9 @@
 		"c": "\tMulti",
 		"t": "source.objc comment.block.c",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -201,9 +201,9 @@
 		"c": "\tLine",
 		"t": "source.objc comment.block.c",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -212,9 +212,9 @@
 		"c": "\tComments",
 		"t": "source.objc comment.block.c",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -223,9 +223,9 @@
 		"c": "*/",
 		"t": "source.objc comment.block.c punctuation.definition.comment.end.c",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -2225,9 +2225,9 @@
 		"c": "//",
 		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c comment.line.double-slash.cpp punctuation.definition.comment.cpp",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -2236,9 +2236,9 @@
 		"c": " add a tap gesture recognizer",
 		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c comment.line.double-slash.cpp",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
diff --git a/extensions/package.json b/extensions/package.json
index fa2015e1e6f..6c03d54ee8d 100644
--- a/extensions/package.json
+++ b/extensions/package.json
@@ -3,9 +3,9 @@
   "version": "0.0.1",
   "description": "Dependencies shared by all extensions",
   "dependencies": {
-    "typescript": "2.9.1"
+    "typescript": "3.0.3"
   },
   "scripts": {
     "postinstall": "node ./postinstall"
   }
-}
\ No newline at end of file
+}
diff --git a/extensions/perl/test/colorize-results/test_pl.json b/extensions/perl/test/colorize-results/test_pl.json
index 7e575aa4652..ecfd9660ad8 100644
--- a/extensions/perl/test/colorize-results/test_pl.json
+++ b/extensions/perl/test/colorize-results/test_pl.json
@@ -278,9 +278,9 @@
 		"c": "#",
 		"t": "source.perl comment.line.number-sign.perl punctuation.definition.comment.perl",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -289,9 +289,9 @@
 		"c": " Check for that =.",
 		"t": "source.perl comment.line.number-sign.perl",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -1015,9 +1015,9 @@
 		"c": "#",
 		"t": "source.perl comment.line.number-sign.perl punctuation.definition.comment.perl",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -1026,9 +1026,9 @@
 		"c": "#",
 		"t": "source.perl comment.line.number-sign.perl punctuation.definition.comment.perl",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -1037,9 +1037,9 @@
 		"c": " This function opens and reads one file, and calls",
 		"t": "source.perl comment.line.number-sign.perl",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -1048,9 +1048,9 @@
 		"c": "#",
 		"t": "source.perl comment.line.number-sign.perl punctuation.definition.comment.perl",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -1059,9 +1059,9 @@
 		"c": " check_line to analyze each line.  Call it with the",
 		"t": "source.perl comment.line.number-sign.perl",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -1070,9 +1070,9 @@
 		"c": "#",
 		"t": "source.perl comment.line.number-sign.perl punctuation.definition.comment.perl",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -1081,9 +1081,9 @@
 		"c": " file name.",
 		"t": "source.perl comment.line.number-sign.perl",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -1092,9 +1092,9 @@
 		"c": "#",
 		"t": "source.perl comment.line.number-sign.perl punctuation.definition.comment.perl",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -1939,9 +1939,9 @@
 		"c": "#",
 		"t": "source.perl comment.line.number-sign.perl punctuation.definition.comment.perl",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -1950,9 +1950,9 @@
 		"c": "#",
 		"t": "source.perl comment.line.number-sign.perl punctuation.definition.comment.perl",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -1961,9 +1961,9 @@
 		"c": " Go through the argument list and check each file",
 		"t": "source.perl comment.line.number-sign.perl",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -1972,9 +1972,9 @@
 		"c": "#",
 		"t": "source.perl comment.line.number-sign.perl punctuation.definition.comment.perl",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
diff --git a/extensions/php-language-features/.vscodeignore b/extensions/php-language-features/.vscodeignore
index d43a539fddf..5e3da7eecc7 100644
--- a/extensions/php-language-features/.vscodeignore
+++ b/extensions/php-language-features/.vscodeignore
@@ -1,2 +1,3 @@
 src/**
-tsconfig.json
\ No newline at end of file
+tsconfig.json
+out/test/**
\ No newline at end of file
diff --git a/extensions/php-language-features/README.md b/extensions/php-language-features/README.md
new file mode 100644
index 00000000000..c00be6a964e
--- /dev/null
+++ b/extensions/php-language-features/README.md
@@ -0,0 +1,7 @@
+# Language Features for PHP files
+
+**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.
+
+## Features
+
+See [PHP in Visual Studio Code](https://code.visualstudio.com/docs/languages/php) to learn about the features of this extension.
\ No newline at end of file
diff --git a/extensions/php-language-features/package.json b/extensions/php-language-features/package.json
index dc2332a328f..fa6865ec982 100644
--- a/extensions/php-language-features/package.json
+++ b/extensions/php-language-features/package.json
@@ -77,9 +77,9 @@
 		"watch": "gulp watch-extension:php"
 	},
 	"dependencies": {
-		"vscode-nls": "^3.2.1"
+		"vscode-nls": "^4.0.0"
 	},
 	"devDependencies": {
-		"@types/node": "7.0.43"
+		"@types/node": "^8.10.25"
 	}
 }
diff --git a/extensions/php-language-features/package.nls.json b/extensions/php-language-features/package.nls.json
index c991103e41d..3920760d1d2 100644
--- a/extensions/php-language-features/package.nls.json
+++ b/extensions/php-language-features/package.nls.json
@@ -1,5 +1,5 @@
 {
-	"configuration.suggest.basic": "Configures if the built-in PHP language suggestions are enabled. The support suggests PHP globals and variables.",
+	"configuration.suggest.basic": "Controls whether the built-in PHP language suggestions are enabled. The support suggests PHP globals and variables.",
 	"configuration.validate.enable": "Enable/disable built-in PHP validation.",
 	"configuration.validate.executablePath": "Points to the PHP executable.",
 	"configuration.validate.run": "Whether the linter is run on save or on type.",
diff --git a/extensions/php-language-features/src/features/validationProvider.ts b/extensions/php-language-features/src/features/validationProvider.ts
index d139fde1121..c3c513d3220 100644
--- a/extensions/php-language-features/src/features/validationProvider.ts
+++ b/extensions/php-language-features/src/features/validationProvider.ts
@@ -23,7 +23,7 @@ export class LineDecoder {
 		this.remaining = null;
 	}
 
-	public write(buffer: NodeBuffer): string[] {
+	public write(buffer: Buffer): string[] {
 		var result: string[] = [];
 		var value = this.remaining
 			? this.remaining + this.stringDecoder.write(buffer)
diff --git a/extensions/php-language-features/yarn.lock b/extensions/php-language-features/yarn.lock
index 112e5f2ac8d..913d2622d18 100644
--- a/extensions/php-language-features/yarn.lock
+++ b/extensions/php-language-features/yarn.lock
@@ -2,10 +2,10 @@
 # yarn lockfile v1
 
 
-"@types/node@7.0.43":
-  version "7.0.43"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.43.tgz#a187e08495a075f200ca946079c914e1a5fe962c"
+"@types/node@^8.10.25":
+  version "8.10.25"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-8.10.25.tgz#801fe4e39372cef18f268db880a5fbfcf71adc7e"
 
-vscode-nls@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.1.tgz#b1f3e04e8a94a715d5a7bcbc8339c51e6d74ca51"
+vscode-nls@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-4.0.0.tgz#4001c8a6caba5cedb23a9c5ce1090395c0e44002"
diff --git a/extensions/php/package.json b/extensions/php/package.json
index 64b788d2010..53d0b2ebe45 100644
--- a/extensions/php/package.json
+++ b/extensions/php/package.json
@@ -22,7 +22,7 @@
 					"PHP",
 					"php"
 				],
-				"firstLine": "^#!/.*\\bphp\\b",
+				"firstLine": "^#!\\s*/.*\\bphp\\b",
 				"mimetypes": [
 					"application/x-php"
 				],
diff --git a/extensions/php/syntaxes/html.tmLanguage.json b/extensions/php/syntaxes/html.tmLanguage.json
index 1ed6de8d2c9..59db289a2d5 100644
--- a/extensions/php/syntaxes/html.tmLanguage.json
+++ b/extensions/php/syntaxes/html.tmLanguage.json
@@ -4,10 +4,111 @@
 		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
 		"Once accepted there, we are happy to receive an update request."
 	],
-	"version": "https://github.com/atom/language-php/commit/29c140e1531e0b5e842e5bfd4377f879d8b79cd4",
+	"version": "https://github.com/atom/language-php/commit/72bfa9592e689fdcb70562ff7d882ad5308e79f7",
 	"name": "PHP",
 	"scopeName": "text.html.php",
 	"injections": {
+		"L:source.php string.quoted.single.sql.php source.sql.embedded.php": {
+			"patterns": [
+				{
+					"match": "(#)(\\\\'|[^'])*(?='|$)",
+					"name": "comment.line.number-sign.sql",
+					"captures": {
+						"1": {
+							"name": "punctuation.definition.comment.sql"
+						}
+					}
+				},
+				{
+					"match": "(--)(\\\\'|[^'])*(?='|$)",
+					"name": "comment.line.double-dash.sql",
+					"captures": {
+						"1": {
+							"name": "punctuation.definition.comment.sql"
+						}
+					}
+				},
+				{
+					"match": "\\\\[\\\\'`\"]",
+					"name": "constant.character.escape.php"
+				},
+				{
+					"match": "\"(?=((\\\\\")|[^\"'])*('|$))",
+					"name": "string.quoted.double.unclosed.sql"
+				}
+			]
+		},
+		"L:source.php string.quoted.double.sql.php source.sql.embedded.php": {
+			"patterns": [
+				{
+					"match": "(#)(\\\\\"|[^\"])*(?=\"|$)",
+					"name": "comment.line.number-sign.sql",
+					"captures": {
+						"1": {
+							"name": "punctuation.definition.comment.sql"
+						}
+					}
+				},
+				{
+					"match": "(--)(\\\\\"|[^\"])*(?=\"|$)",
+					"name": "comment.line.double-dash.sql",
+					"captures": {
+						"1": {
+							"name": "punctuation.definition.comment.sql"
+						}
+					}
+				},
+				{
+					"match": "\\\\[\\\\'`\"]",
+					"name": "constant.character.escape.php"
+				},
+				{
+					"match": "(')([^'\\\\]*)(')",
+					"name": "string.quoted.single.sql",
+					"captures": {
+						"1": {
+							"name": "punctuation.definition.string.begin.sql"
+						},
+						"2": {
+							"patterns": [
+								{
+									"include": "source.php#interpolation_double_quoted"
+								}
+							]
+						},
+						"3": {
+							"name": "punctuation.definition.string.end.sql"
+						}
+					}
+				},
+				{
+					"match": "(`)([^`\\\\]*)(`)",
+					"name": "string.quoted.other.backtick.sql",
+					"captures": {
+						"1": {
+							"name": "punctuation.definition.string.begin.sql"
+						},
+						"2": {
+							"patterns": [
+								{
+									"include": "source.php#interpolation_double_quoted"
+								}
+							]
+						},
+						"3": {
+							"name": "punctuation.definition.string.end.sql"
+						}
+					}
+				},
+				{
+					"match": "'(?=((\\\\')|[^'\"])*(\"|$))",
+					"name": "string.quoted.single.unclosed.sql"
+				},
+				{
+					"include": "source.php#interpolation_double_quoted"
+				}
+			]
+		},
 		"text.html.php - (meta.embedded | meta.tag), L:text.html.php meta.tag, L:text.html.php source.js": {
 			"patterns": [
 				{
diff --git a/extensions/php/syntaxes/php.tmLanguage.json b/extensions/php/syntaxes/php.tmLanguage.json
index 3bc1a69114d..62153a2b04b 100644
--- a/extensions/php/syntaxes/php.tmLanguage.json
+++ b/extensions/php/syntaxes/php.tmLanguage.json
@@ -4,7 +4,7 @@
 		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
 		"Once accepted there, we are happy to receive an update request."
 	],
-	"version": "https://github.com/atom/language-php/commit/b054176835218c446d22b3c1b9dcfdcf8cacf49f",
+	"version": "https://github.com/atom/language-php/commit/13842b6dfb4568f76e8fa0c08dbff74347ee13c6",
 	"scopeName": "source.php",
 	"patterns": [
 		{
@@ -2544,59 +2544,6 @@
 			},
 			"name": "string.quoted.double.sql.php",
 			"patterns": [
-				{
-					"match": "(#)(\\\\\"|[^\"])*(?=\"|$)",
-					"name": "comment.line.number-sign.sql",
-					"captures": {
-						"1": {
-							"name": "punctuation.definition.comment.sql"
-						}
-					}
-				},
-				{
-					"match": "(--)(\\\\\"|[^\"])*(?=\"|$)",
-					"name": "comment.line.double-dash.sql",
-					"captures": {
-						"1": {
-							"name": "punctuation.definition.comment.sql"
-						}
-					}
-				},
-				{
-					"match": "\\\\[\\\\\"`']",
-					"name": "constant.character.escape.php"
-				},
-				{
-					"match": "'(?=((\\\\')|[^'\"])*(\"|$))",
-					"name": "string.quoted.single.unclosed.sql"
-				},
-				{
-					"match": "`(?=((\\\\`)|[^`\"])*(\"|$))",
-					"name": "string.quoted.other.backtick.unclosed.sql"
-				},
-				{
-					"begin": "'",
-					"end": "'",
-					"name": "string.quoted.single.sql",
-					"patterns": [
-						{
-							"include": "#interpolation_double_quoted"
-						}
-					]
-				},
-				{
-					"begin": "`",
-					"end": "`",
-					"name": "string.quoted.other.backtick.sql",
-					"patterns": [
-						{
-							"include": "#interpolation_double_quoted"
-						}
-					]
-				},
-				{
-					"include": "#interpolation_double_quoted"
-				},
 				{
 					"include": "source.sql"
 				}
@@ -2618,36 +2565,6 @@
 			},
 			"name": "string.quoted.single.sql.php",
 			"patterns": [
-				{
-					"match": "(#)(\\\\'|[^'])*(?='|$)",
-					"name": "comment.line.number-sign.sql",
-					"captures": {
-						"1": {
-							"name": "punctuation.definition.comment.sql"
-						}
-					}
-				},
-				{
-					"match": "(--)(\\\\'|[^'])*(?='|$)",
-					"name": "comment.line.double-dash.sql",
-					"captures": {
-						"1": {
-							"name": "punctuation.definition.comment.sql"
-						}
-					}
-				},
-				{
-					"match": "\\\\[\\\\'`\"]",
-					"name": "constant.character.escape.php"
-				},
-				{
-					"match": "`(?=((\\\\`)|[^`'])*('|$))",
-					"name": "string.quoted.other.backtick.unclosed.sql"
-				},
-				{
-					"match": "\"(?=((\\\\\")|[^\"'])*('|$))",
-					"name": "string.quoted.double.unclosed.sql"
-				},
 				{
 					"include": "source.sql"
 				}
diff --git a/extensions/php/test/colorize-results/issue-28354_php.json b/extensions/php/test/colorize-results/issue-28354_php.json
index cc9924d3945..12e439430fb 100644
--- a/extensions/php/test/colorize-results/issue-28354_php.json
+++ b/extensions/php/test/colorize-results/issue-28354_php.json
@@ -1,7 +1,7 @@
 [
 	{
 		"c": "<",
-		"t": "text.html.php meta.embedded.block.html meta.tag.metadata.script.html punctuation.definition.tag.begin.html",
+		"t": "text.html.php meta.embedded.block.html meta.tag.metadata.script.start.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -12,7 +12,7 @@
 	},
 	{
 		"c": "script",
-		"t": "text.html.php meta.embedded.block.html meta.tag.metadata.script.html entity.name.tag.html",
+		"t": "text.html.php meta.embedded.block.html meta.tag.metadata.script.start.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -23,7 +23,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.php meta.embedded.block.html meta.tag.metadata.script.html punctuation.definition.tag.end.html",
+		"t": "text.html.php meta.embedded.block.html meta.tag.metadata.script.start.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -496,7 +496,7 @@
 	},
 	{
 		"c": "<",
-		"t": "text.html.php meta.embedded.block.html meta.tag.metadata.script.html punctuation.definition.tag.begin.html source.js",
+		"t": "text.html.php meta.embedded.block.html meta.tag.metadata.script.end.html punctuation.definition.tag.begin.html source.js",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -507,7 +507,7 @@
 	},
 	{
 		"c": "/",
-		"t": "text.html.php meta.embedded.block.html meta.tag.metadata.script.html punctuation.definition.tag.begin.html",
+		"t": "text.html.php meta.embedded.block.html meta.tag.metadata.script.end.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -518,7 +518,7 @@
 	},
 	{
 		"c": "script",
-		"t": "text.html.php meta.embedded.block.html meta.tag.metadata.script.html entity.name.tag.html",
+		"t": "text.html.php meta.embedded.block.html meta.tag.metadata.script.end.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -529,7 +529,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.php meta.embedded.block.html meta.tag.metadata.script.html punctuation.definition.tag.end.html",
+		"t": "text.html.php meta.embedded.block.html meta.tag.metadata.script.end.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
diff --git a/extensions/php/test/colorize-results/test_php.json b/extensions/php/test/colorize-results/test_php.json
index 4cb58182b1a..277428ac11b 100644
--- a/extensions/php/test/colorize-results/test_php.json
+++ b/extensions/php/test/colorize-results/test_php.json
@@ -1,7 +1,7 @@
 [
 	{
 		"c": "<",
-		"t": "text.html.php meta.tag.structure.any.html punctuation.definition.tag.html",
+		"t": "text.html.php meta.tag.structure.html.start.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -12,7 +12,7 @@
 	},
 	{
 		"c": "html",
-		"t": "text.html.php meta.tag.structure.any.html entity.name.tag.structure.any.html",
+		"t": "text.html.php meta.tag.structure.html.start.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -23,7 +23,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.php meta.tag.structure.any.html punctuation.definition.tag.html",
+		"t": "text.html.php meta.tag.structure.html.start.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -34,7 +34,7 @@
 	},
 	{
 		"c": "<",
-		"t": "text.html.php meta.tag.structure.any.html punctuation.definition.tag.html",
+		"t": "text.html.php meta.tag.structure.head.start.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -45,7 +45,7 @@
 	},
 	{
 		"c": "head",
-		"t": "text.html.php meta.tag.structure.any.html entity.name.tag.structure.any.html",
+		"t": "text.html.php meta.tag.structure.head.start.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -56,7 +56,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.php meta.tag.structure.any.html punctuation.definition.tag.html",
+		"t": "text.html.php meta.tag.structure.head.start.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -78,7 +78,7 @@
 	},
 	{
 		"c": "<",
-		"t": "text.html.php meta.tag.inline.any.html punctuation.definition.tag.begin.html",
+		"t": "text.html.php meta.tag.metadata.title.start.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -89,7 +89,7 @@
 	},
 	{
 		"c": "title",
-		"t": "text.html.php meta.tag.inline.any.html entity.name.tag.inline.any.html",
+		"t": "text.html.php meta.tag.metadata.title.start.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -100,7 +100,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.php meta.tag.inline.any.html punctuation.definition.tag.end.html",
+		"t": "text.html.php meta.tag.metadata.title.start.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -122,7 +122,7 @@
 	},
 	{
 		"c": "</",
-		"t": "text.html.php meta.tag.inline.any.html punctuation.definition.tag.begin.html",
+		"t": "text.html.php meta.tag.metadata.title.end.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -133,7 +133,7 @@
 	},
 	{
 		"c": "title",
-		"t": "text.html.php meta.tag.inline.any.html entity.name.tag.inline.any.html",
+		"t": "text.html.php meta.tag.metadata.title.end.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -144,7 +144,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.php meta.tag.inline.any.html punctuation.definition.tag.end.html",
+		"t": "text.html.php meta.tag.metadata.title.end.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -155,7 +155,7 @@
 	},
 	{
 		"c": "</",
-		"t": "text.html.php meta.tag.structure.any.html punctuation.definition.tag.html",
+		"t": "text.html.php meta.tag.structure.head.end.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -166,7 +166,7 @@
 	},
 	{
 		"c": "head",
-		"t": "text.html.php meta.tag.structure.any.html entity.name.tag.structure.any.html",
+		"t": "text.html.php meta.tag.structure.head.end.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -177,7 +177,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.php meta.tag.structure.any.html punctuation.definition.tag.html",
+		"t": "text.html.php meta.tag.structure.head.end.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -188,7 +188,7 @@
 	},
 	{
 		"c": "<",
-		"t": "text.html.php meta.tag.structure.any.html punctuation.definition.tag.html",
+		"t": "text.html.php meta.tag.structure.body.start.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -199,7 +199,7 @@
 	},
 	{
 		"c": "body",
-		"t": "text.html.php meta.tag.structure.any.html entity.name.tag.structure.any.html",
+		"t": "text.html.php meta.tag.structure.body.start.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -210,7 +210,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.php meta.tag.structure.any.html punctuation.definition.tag.html",
+		"t": "text.html.php meta.tag.structure.body.start.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -322,9 +322,9 @@
 		"c": "//",
 		"t": "text.html.php meta.embedded.block.php source.php comment.line.double-slash.php punctuation.definition.comment.php",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -333,9 +333,9 @@
 		"c": " Code to be executed",
 		"t": "text.html.php meta.embedded.block.php source.php comment.line.double-slash.php",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -377,9 +377,9 @@
 		"c": "/*",
 		"t": "text.html.php meta.embedded.block.php source.php comment.block.php punctuation.definition.comment.php",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -388,9 +388,9 @@
 		"c": " Example PHP file",
 		"t": "text.html.php meta.embedded.block.php source.php comment.block.php",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -399,9 +399,9 @@
 		"c": "\tmultiline comment",
 		"t": "text.html.php meta.embedded.block.php source.php comment.block.php",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -410,9 +410,9 @@
 		"c": "\t",
 		"t": "text.html.php meta.embedded.block.php source.php comment.block.php",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -421,9 +421,9 @@
 		"c": "*/",
 		"t": "text.html.php meta.embedded.block.php source.php comment.block.php punctuation.definition.comment.php",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -2654,9 +2654,9 @@
 		"c": "//",
 		"t": "text.html.php meta.embedded.block.php source.php comment.line.double-slash.php punctuation.definition.comment.php",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -2665,9 +2665,9 @@
 		"c": " display shuffled cards (EXAMPLE ONLY)",
 		"t": "text.html.php meta.embedded.block.php source.php comment.line.double-slash.php",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -3565,7 +3565,7 @@
 	},
 	{
 		"c": "</",
-		"t": "text.html.php meta.tag.structure.any.html punctuation.definition.tag.html",
+		"t": "text.html.php meta.tag.structure.body.end.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -3576,7 +3576,7 @@
 	},
 	{
 		"c": "body",
-		"t": "text.html.php meta.tag.structure.any.html entity.name.tag.structure.any.html",
+		"t": "text.html.php meta.tag.structure.body.end.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -3587,7 +3587,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.php meta.tag.structure.any.html punctuation.definition.tag.html",
+		"t": "text.html.php meta.tag.structure.body.end.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -3598,7 +3598,7 @@
 	},
 	{
 		"c": "</",
-		"t": "text.html.php meta.tag.structure.any.html punctuation.definition.tag.html",
+		"t": "text.html.php meta.tag.structure.html.end.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -3609,7 +3609,7 @@
 	},
 	{
 		"c": "html",
-		"t": "text.html.php meta.tag.structure.any.html entity.name.tag.structure.any.html",
+		"t": "text.html.php meta.tag.structure.html.end.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -3620,7 +3620,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.php meta.tag.structure.any.html punctuation.definition.tag.html",
+		"t": "text.html.php meta.tag.structure.html.end.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
diff --git a/extensions/powershell/package.json b/extensions/powershell/package.json
index 5fcb928726d..399f6fc5601 100644
--- a/extensions/powershell/package.json
+++ b/extensions/powershell/package.json
@@ -10,7 +10,7 @@
 			"id": "powershell",
 			"extensions": [ ".ps1", ".psm1", ".psd1", ".pssc", ".psrc" ],
 			"aliases": [ "PowerShell", "powershell", "ps", "ps1" ],
-			"firstLine": "^#!/.*\\bpwsh\\b",
+			"firstLine": "^#!\\s*/.*\\bpwsh\\b",
 			"configuration": "./language-configuration.json"
 		}],
 		"grammars": [{
diff --git a/extensions/powershell/syntaxes/powershell.tmLanguage.json b/extensions/powershell/syntaxes/powershell.tmLanguage.json
index 194627d46a5..60dee137b19 100644
--- a/extensions/powershell/syntaxes/powershell.tmLanguage.json
+++ b/extensions/powershell/syntaxes/powershell.tmLanguage.json
@@ -4,7 +4,7 @@
 		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
 		"Once accepted there, we are happy to receive an update request."
 	],
-	"version": "https://github.com/PowerShell/EditorSyntax/commit/529562fbe4ba9abde22282ee8b00141284968f4b",
+	"version": "https://github.com/PowerShell/EditorSyntax/commit/6f5438611c54922ea94c81532a2dcfee72190039",
 	"name": "PowerShell",
 	"scopeName": "source.powershell",
 	"patterns": [
@@ -157,16 +157,16 @@
 				}
 			]
 		},
-		{
-			"match": "(?<!\\w)-([ci]?[lg][te]|eq|ne)",
-			"name": "keyword.operator.logical.powershell"
-		},
 		{
 			"match": "(\\b(([A-Za-z0-9\\-_\\.]+)\\.(?i:exe|com|cmd|bat))\\b)",
 			"name": "support.function.powershell"
 		},
 		{
-			"match": "(?<!\\w|-)((?i:begin|break|catch|continue|data|default|define|do|dynamicparam|else|elseif|end|exit|finally|for|foreach(?!-object)|from|if|in|inlinescript|parallel|param|process|return|switch|throw|trap|try|until|var|where(?!-object)|while)|%|\\?)(?!\\w)",
+			"match": "(?<!\\w|-|\\.)((?i:begin|break|catch|continue|data|default|define|do|dynamicparam|else|elseif|end|exit|finally|for|from|if|in|inlinescript|parallel|param|process|return|sequence|switch|throw|trap|try|until|var|while)|%|\\?)(?!\\w)",
+			"name": "keyword.control.powershell"
+		},
+		{
+			"match": "(?<!\\w|-|[^\\)]\\.)((?i:(foreach|where)(?!-object))|%|\\?)(?!\\w)",
 			"name": "keyword.control.powershell"
 		},
 		{
@@ -188,7 +188,7 @@
 				}
 			},
 			"comment": "capture should be entity.name.type, but it doesn't provide a good color in the default schema.",
-			"match": "(?<!\\w)((?i:class)|%|\\?)(?:\\s)+((?:\\p{L}|\\d|_|-|)+)\\b"
+			"match": "(?<!\\w|-)((?i:class)|%|\\?)(?:\\s)+((?:\\p{L}|\\d|_|-|)+)\\b"
 		},
 		{
 			"match": "(?<!\\w)-(?i:is(?:not)?|as)\\b",
@@ -207,7 +207,7 @@
 			"name": "keyword.operator.logical.powershell"
 		},
 		{
-			"match": "(?<!\\w)-(?i:band|bor|bnot|bxor)(?!\\p{L})",
+			"match": "(?<!\\w)-(?i:band|bor|bnot|bxor|shl|shr)(?!\\p{L})",
 			"name": "keyword.operator.bitwise.powershell"
 		},
 		{
@@ -314,7 +314,7 @@
 							"include": "$self"
 						},
 						{
-							"match": "(?i)\\b(mandatory|valuefrompipeline|valuefrompipelinebypropertyname|valuefromremainingarguments|position|parametersetname|defaultparametersetname|supportsshouldprocess|positionalbinding|helpuri|confirmimpact|helpmessage)\\b(?:\\s+)?(=)",
+							"match": "(?i)\\b(mandatory|valuefrompipeline|valuefrompipelinebypropertyname|valuefromremainingarguments|position|parametersetname|defaultparametersetname|supportsshouldprocess|supportspaging|positionalbinding|helpuri|confirmimpact|helpmessage)\\b(?:\\s+)?(=)?",
 							"captures": {
 								"1": {
 									"name": "variable.parameter.attribute.powershell"
diff --git a/extensions/powershell/test/colorize-results/test_ps1.json b/extensions/powershell/test/colorize-results/test_ps1.json
index 7227273d55b..b09a52ebc66 100644
--- a/extensions/powershell/test/colorize-results/test_ps1.json
+++ b/extensions/powershell/test/colorize-results/test_ps1.json
@@ -3,9 +3,9 @@
 		"c": "#",
 		"t": "source.powershell comment.line.powershell punctuation.definition.comment.powershell",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -14,9 +14,9 @@
 		"c": " Copyright Microsoft Corporation",
 		"t": "source.powershell comment.line.powershell",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -1697,9 +1697,9 @@
 		"c": "#",
 		"t": "source.powershell comment.line.powershell punctuation.definition.comment.powershell",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -1708,9 +1708,9 @@
 		"c": " PowerShell commands need elevation for dependencies installation and running tests",
 		"t": "source.powershell comment.line.powershell",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
diff --git a/extensions/python/package.json b/extensions/python/package.json
index 967436313ea..48151bd6245 100644
--- a/extensions/python/package.json
+++ b/extensions/python/package.json
@@ -12,7 +12,7 @@
 			"id": "python",
 			"extensions": [ ".py", ".rpy", ".pyw", ".cpy", ".gyp", ".gypi", ".snakefile", ".smk"],
 			"aliases": [ "Python", "py" ],
-			"firstLine": "^#!/.*\\bpython[0-9.-]*\\b",
+			"firstLine": "^#!\\s*/.*\\bpython[0-9.-]*\\b",
 			"configuration": "./language-configuration.json"
 		}],
 		"grammars": [{
diff --git a/extensions/python/test/colorize-results/test_py.json b/extensions/python/test/colorize-results/test_py.json
index 235958f078f..21d185717d4 100644
--- a/extensions/python/test/colorize-results/test_py.json
+++ b/extensions/python/test/colorize-results/test_py.json
@@ -113,9 +113,9 @@
 		"c": "#",
 		"t": "source.python comment.line.number-sign.python punctuation.definition.comment.python",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -124,9 +124,9 @@
 		"c": " Bananas the monkey can eat.",
 		"t": "source.python comment.line.number-sign.python",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -1906,9 +1906,9 @@
 		"c": "#",
 		"t": "source.python comment.line.number-sign.python punctuation.definition.comment.python",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -1917,9 +1917,9 @@
 		"c": " Looks like a valid date",
 		"t": "source.python comment.line.number-sign.python",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -3017,9 +3017,9 @@
 		"c": "#",
 		"t": "source.python comment.line.number-sign.python punctuation.definition.comment.python",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -3028,9 +3028,9 @@
 		"c": "comment",
 		"t": "source.python comment.line.number-sign.python",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -3149,9 +3149,9 @@
 		"c": "#",
 		"t": "source.python comment.line.number-sign.python punctuation.definition.comment.python",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -3160,9 +3160,9 @@
 		"c": "sqadsad",
 		"t": "source.python comment.line.number-sign.python",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -6108,9 +6108,9 @@
 		"c": "#",
 		"t": "source.python comment.line.number-sign.python punctuation.definition.comment.python",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -6119,9 +6119,9 @@
 		"c": " Comments in dictionary items should be colorized accordingly",
 		"t": "source.python comment.line.number-sign.python",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -6262,9 +6262,9 @@
 		"c": "#",
 		"t": "source.python comment.line.number-sign.python punctuation.definition.comment.python",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -6273,9 +6273,9 @@
 		"c": " this should be colorized as comment",
 		"t": "source.python comment.line.number-sign.python",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -6383,9 +6383,9 @@
 		"c": "#",
 		"t": "source.python comment.line.number-sign.python punctuation.definition.comment.python",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -6394,9 +6394,9 @@
 		"c": "this should be colorized as comment",
 		"t": "source.python comment.line.number-sign.python",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -6416,9 +6416,9 @@
 		"c": "#",
 		"t": "source.python comment.line.number-sign.python punctuation.definition.comment.python",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -6427,9 +6427,9 @@
 		"c": " test raw strings",
 		"t": "source.python comment.line.number-sign.python",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -6581,9 +6581,9 @@
 		"c": "#",
 		"t": "source.python comment.line.number-sign.python punctuation.definition.comment.python",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -6592,9 +6592,9 @@
 		"c": " highlight doctests",
 		"t": "source.python comment.line.number-sign.python",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
diff --git a/extensions/r/test/colorize-results/test_r.json b/extensions/r/test/colorize-results/test_r.json
index d9dfb68a0e5..2cba70d079b 100644
--- a/extensions/r/test/colorize-results/test_r.json
+++ b/extensions/r/test/colorize-results/test_r.json
@@ -3,9 +3,9 @@
 		"c": "#",
 		"t": "source.r comment.line.number-sign.r punctuation.definition.comment.r",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -14,9 +14,9 @@
 		"c": " © Microsoft. All rights reserved.",
 		"t": "source.r comment.line.number-sign.r",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -25,9 +25,9 @@
 		"c": "#'",
 		"t": "source.r comment.line.roxygen.r punctuation.definition.comment.r",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -36,9 +36,9 @@
 		"c": " Add together two numbers.",
 		"t": "source.r comment.line.roxygen.r",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -47,9 +47,9 @@
 		"c": "#'",
 		"t": "source.r comment.line.roxygen.r punctuation.definition.comment.r",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -58,9 +58,9 @@
 		"c": "#'",
 		"t": "source.r comment.line.roxygen.r punctuation.definition.comment.r",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -69,9 +69,9 @@
 		"c": " ",
 		"t": "source.r comment.line.roxygen.r",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -91,9 +91,9 @@
 		"c": " ",
 		"t": "source.r comment.line.roxygen.r",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -104,7 +104,7 @@
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "variable: #9CDCFE"
 		}
@@ -113,9 +113,9 @@
 		"c": " A number.",
 		"t": "source.r comment.line.roxygen.r",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -124,9 +124,9 @@
 		"c": "#'",
 		"t": "source.r comment.line.roxygen.r punctuation.definition.comment.r",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -135,9 +135,9 @@
 		"c": " ",
 		"t": "source.r comment.line.roxygen.r",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -157,9 +157,9 @@
 		"c": " ",
 		"t": "source.r comment.line.roxygen.r",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -170,7 +170,7 @@
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "variable: #9CDCFE"
 		}
@@ -179,9 +179,9 @@
 		"c": " A number.",
 		"t": "source.r comment.line.roxygen.r",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -190,9 +190,9 @@
 		"c": "#'",
 		"t": "source.r comment.line.roxygen.r punctuation.definition.comment.r",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -201,9 +201,9 @@
 		"c": " ",
 		"t": "source.r comment.line.roxygen.r",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -223,9 +223,9 @@
 		"c": " The sum of \\code{x} and \\code{y}.",
 		"t": "source.r comment.line.roxygen.r",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -234,9 +234,9 @@
 		"c": "#'",
 		"t": "source.r comment.line.roxygen.r punctuation.definition.comment.r",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -245,9 +245,9 @@
 		"c": " ",
 		"t": "source.r comment.line.roxygen.r",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -267,9 +267,9 @@
 		"c": "#'",
 		"t": "source.r comment.line.roxygen.r punctuation.definition.comment.r",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -278,9 +278,9 @@
 		"c": " add(1, 1)",
 		"t": "source.r comment.line.roxygen.r",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -289,9 +289,9 @@
 		"c": "#'",
 		"t": "source.r comment.line.roxygen.r punctuation.definition.comment.r",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -300,9 +300,9 @@
 		"c": " add(10, 1)",
 		"t": "source.r comment.line.roxygen.r",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
diff --git a/extensions/razor/syntaxes/cshtml.tmLanguage.json b/extensions/razor/syntaxes/cshtml.tmLanguage.json
index 2995e473ee0..c662cee2fa3 100644
--- a/extensions/razor/syntaxes/cshtml.tmLanguage.json
+++ b/extensions/razor/syntaxes/cshtml.tmLanguage.json
@@ -4,146 +4,39 @@
 		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
 		"Once accepted there, we are happy to receive an update request."
 	],
-	"version": "https://github.com/demyte/language-cshtml/commit/cbf0e35971324e861247145e92f4cbbe0bc42d0e",
+	"version": "https://github.com/demyte/language-cshtml/commit/e6e54d5a86a28cc1e44609a32aaa10a244cd3f81",
 	"name": "ASP.NET Razor",
 	"scopeName": "text.html.cshtml",
 	"patterns": [
 		{
-			"name": "section.embedded.source.cshtml",
-			"begin": "(@?([a-zA-Z0-9]+)?)(\\s[a-zA-Z0-9]+)?(\n|\r)?(\\{)",
-			"beginCaptures": {
-				"0": {
-					"name": "punctuation.section.embedded.begin.cshtml"
-				},
-				"1": {
-					"name": "keyword.control.cshtml"
-				}
-			},
-			"patterns": [
-				{
-					"name": "section.embedded.source.cshtml",
-					"begin": "(@?([a-zA-Z0-9]+)?)(\\s[a-zA-Z0-9]+)?(\n|\r)?(\\{)",
-					"beginCaptures": {
-						"0": {
-							"name": "punctuation.section.embedded.begin.cshtml"
-						},
-						"1": {
-							"name": "keyword.control.cshtml"
-						}
-					},
-					"patterns": [
-						{
-							"include": "#embedded-code"
-						},
-						{
-							"include": "#general-includes"
-						},
-						{
-							"include": "source.cs"
-						}
-					],
-					"end": "\\}",
-					"endCaptures": {
-						"0": {
-							"name": "punctuation.section.embedded.begin.cshtml"
-						}
-					}
-				},
-				{
-					"include": "#embedded-code"
-				},
-				{
-					"include": "#general-includes"
-				},
-				{
-					"include": "source.cs"
-				}
-			],
-			"end": "\\}",
-			"endCaptures": {
-				"0": {
-					"name": "punctuation.section.embedded.begin.cshtml"
-				}
-			},
-			"comments": "Simple multi-line code section"
+			"include": "#razor-directives"
 		},
 		{
-			"begin": "(@[a-zA-Z0-9]+)(\\s?)",
-			"captures": {
-				"0": {
-					"name": "section.embedded.begin.cshtml"
-				},
-				"1": {
-					"name": "keyword.control.cshtml"
-				}
-			},
-			"patterns": [
-				{
-					"match": "(([a-zA-Z0-9]+)(\\.)?)+?",
-					"captures": {
-						"2": {
-							"name": "entity.name.tag.source.cshtml"
-						},
-						"3": {
-							"name": "punctuation.separator.namespace.source.cshtml"
-						}
-					}
-				},
-				{
-					"include": "#embedded-code"
-				},
-				{
-					"include": "#general-includes"
-				}
-			],
-			"end": "(\\n|\\s)",
-			"comments": "Single statement Razor tags"
+			"include": "#razor-code-block"
 		},
 		{
-			"begin": "(@\\()",
-			"captures": {
-				"0": {
-					"name": "punctuation.section.embedded.begin.cshtml"
-				}
-			},
-			"patterns": [
-				{
-					"include": "#embedded-code"
-				},
-				{
-					"include": "#general-includes"
-				},
-				{
-					"include": "source.cs"
-				}
-			],
-			"end": "(\\))",
-			"comments": "Covers same line Razor statments with embedded C#"
+			"include": "#razor-else-if"
 		},
 		{
-			"include": "#comments"
+			"include": "#razor-if"
+		},
+		{
+			"include": "#razor-else"
+		},
+		{
+			"include": "#razor-foreach"
+		},
+		{
+			"include": "#explicit-razor-expression"
+		},
+		{
+			"include": "#implicit-razor-expression"
 		},
 		{
 			"include": "text.html.basic"
 		}
 	],
 	"repository": {
-		"embedded-code": {
-			"match": "(@?[a-zA-Z0-9]+)(\\.([a-zA-Z0-9]+))?",
-			"captures": {
-				"1": {
-					"name": "keyword.control.cshtml"
-				},
-				"3": {
-					"name": "entity.name.tag.source.cshtml"
-				}
-			},
-			"patterns": [
-				{
-					"include": "#general-includes"
-				}
-			]
-		},
 		"comments": {
 			"begin": "@\\*",
 			"captures": {
@@ -154,66 +47,293 @@
 			"end": "\\*@",
 			"name": "comment.block.cshtml"
 		},
-		"line-comments": {
-			"name": "comment.line.double-slash.cshtml",
-			"begin": "(\\s*)//",
-			"end": "$(\\s*)"
-		},
-		"block-comments": {
-			"name": "comment.block.cshtml",
-			"begin": "/\\*",
-			"end": "((?=})|(\\*/))"
-		},
-		"single-quotes": {
-			"name": "string.quoted.single.cshtml",
-			"begin": "'",
-			"end": "'"
-		},
-		"double-quotes": {
-			"name": "string.quoted.double.cshtml",
-			"begin": "\"",
-			"end": "\"",
+		"razor-directives": {
+			"name": "meta.directive.cshtml",
 			"patterns": [
 				{
-					"include": "text.html.basic"
+					"include": "#using-directive"
+				},
+				{
+					"include": "#model-directive"
+				},
+				{
+					"include": "#inherits-directive"
+				},
+				{
+					"include": "#inject-directive"
+				},
+				{
+					"include": "#implements-directive"
+				},
+				{
+					"include": "#layout-directive"
+				},
+				{
+					"include": "#page-directive"
+				},
+				{
+					"include": "#functions-directive"
 				}
 			]
 		},
-		"round-brackets": {
-			"name": "string.bracers.round.cshtml",
-			"begin": "\\(",
-			"end": "\\)"
-		},
-		"squiggly-brackets": {
-			"name": "string.bracers.squiggly.cshtml",
-			"begin": "{",
-			"end": "}"
-		},
-		"general-includes": {
+		"explicit-razor-expression": {
+			"name": "meta.expression.explicit.cshtml",
+			"begin": "(@)\\(",
+			"captures": {
+				"0": {
+					"name": "keyword.control.cshtml"
+				}
+			},
 			"patterns": [
 				{
-					"include": "#comments"
+					"include": "source.cs"
+				}
+			],
+			"end": "\\)"
+		},
+		"implicit-razor-expression": {
+			"name": "meta.expression.implicit.cshtml",
+			"begin": "(@)([a-zA-Z0-9\\.\\_\\(\\)]+)",
+			"captures": {
+				"0": {
+					"name": "keyword.control.cshtml"
+				}
+			},
+			"end": "$"
+		},
+		"using-directive": {
+			"name": "meta.directive.using.cshtml",
+			"begin": "(@using)\\s+",
+			"captures": {
+				"0": {
+					"name": "keyword.control.cshtml"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#csharp-namespace-identifier"
+				}
+			],
+			"end": "$"
+		},
+		"model-directive": {
+			"name": "meta.directive.model.cshtml",
+			"begin": "(@model)\\s+",
+			"captures": {
+				"0": {
+					"name": "keyword.control.cshtml"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#csharp-type-name"
+				}
+			],
+			"end": "$"
+		},
+		"inherits-directive": {
+			"name": "meta.directive.inherits.cshtml",
+			"begin": "(@inherits)\\s+",
+			"captures": {
+				"0": {
+					"name": "keyword.control.cshtml"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#csharp-type-name"
+				}
+			],
+			"end": "$"
+		},
+		"inject-directive": {
+			"name": "meta.directive.inject.cshtml",
+			"begin": "(@inject)\\s+",
+			"captures": {
+				"0": {
+					"name": "keyword.control.cshtml"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#csharp-type-name"
+				}
+			],
+			"end": "$"
+		},
+		"implements-directive": {
+			"name": "meta.directive.implements.cshtml",
+			"begin": "(@implements)\\s+",
+			"captures": {
+				"0": {
+					"name": "keyword.control.cshtml"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#csharp-type-name"
+				}
+			],
+			"end": "$"
+		},
+		"layout-directive": {
+			"name": "meta.directive.layout.cshtml",
+			"begin": "(@layout)\\s+",
+			"captures": {
+				"0": {
+					"name": "keyword.control.cshtml"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#csharp-type-name"
+				}
+			],
+			"end": "$"
+		},
+		"page-directive": {
+			"name": "meta.directive.page.cshtml",
+			"begin": "(@page)\\s+",
+			"captures": {
+				"0": {
+					"name": "keyword.control.cshtml"
+				}
+			},
+			"patterns": [
+				{
+					"include": "source.cs"
+				}
+			],
+			"end": "$"
+		},
+		"functions-directive": {
+			"name": "meta.directive.functions.cshtml",
+			"match": "(@functions)",
+			"captures": {
+				"0": {
+					"name": "keyword.control.cshtml"
+				}
+			}
+		},
+		"razor-if": {
+			"begin": "(@if)",
+			"captures": {
+				"0": {
+					"name": "keyword.control.cshtml"
+				}
+			},
+			"patterns": [
+				{
+					"include": "source.cs"
+				}
+			],
+			"end": "$"
+		},
+		"razor-else": {
+			"begin": "(else)",
+			"captures": {
+				"0": {
+					"name": "keyword.control.cshtml"
+				}
+			},
+			"patterns": [
+				{
+					"include": "source.cs"
+				}
+			],
+			"end": "$"
+		},
+		"razor-else-if": {
+			"begin": "(else\\s+if)",
+			"captures": {
+				"0": {
+					"name": "keyword.control.cshtml"
+				}
+			},
+			"patterns": [
+				{
+					"include": "source.cs"
+				}
+			],
+			"end": "$"
+		},
+		"razor-foreach": {
+			"begin": "(@foreach)\\s+\\(",
+			"captures": {
+				"0": {
+					"name": "keyword.control.cshtml"
+				}
+			},
+			"patterns": [
+				{
+					"include": "source.cs"
+				}
+			],
+			"end": "\\)"
+		},
+		"razor-code-block": {
+			"begin": "@?\\{",
+			"captures": {
+				"0": {
+					"name": "keyword.control.cshtml"
+				}
+			},
+			"patterns": [
+				{
+					"include": "text.html.cshtml"
 				},
 				{
-					"include": "#line-comments"
+					"include": "source.cs"
+				}
+			],
+			"end": "\\}"
+		},
+		"csharp-namespace-identifier": {
+			"patterns": [
+				{
+					"name": "entity.name.type.namespace.cs",
+					"match": "[_[:alpha:]][_[:alnum:]]*"
+				}
+			]
+		},
+		"csharp-type-name": {
+			"patterns": [
+				{
+					"match": "([_[:alpha:]][_[:alnum:]]*)\\s*(\\:\\:)",
+					"captures": {
+						"1": {
+							"name": "entity.name.type.alias.cs"
+						},
+						"2": {
+							"name": "punctuation.separator.coloncolon.cs"
+						}
+					}
 				},
 				{
-					"include": "#block-comments"
+					"match": "([_[:alpha:]][_[:alnum:]]*)\\s*(\\.)",
+					"captures": {
+						"1": {
+							"name": "storage.type.cs"
+						},
+						"2": {
+							"name": "punctuation.accessor.cs"
+						}
+					}
 				},
 				{
-					"include": "#round-brackets"
+					"match": "(\\.)\\s*([_[:alpha:]][_[:alnum:]]*)",
+					"captures": {
+						"1": {
+							"name": "punctuation.accessor.cs"
+						},
+						"2": {
+							"name": "storage.type.cs"
+						}
+					}
 				},
 				{
-					"include": "#squiggly-brackets"
-				},
-				{
-					"include": "#single-quotes"
-				},
-				{
-					"include": "#double-quotes"
-				},
-				{
-					"include": "text.html.basic"
+					"name": "storage.type.cs",
+					"match": "[_[:alpha:]][_[:alnum:]]*"
 				}
 			]
 		}
diff --git a/extensions/razor/test/colorize-results/test_cshtml.json b/extensions/razor/test/colorize-results/test_cshtml.json
index e7eead2eeeb..37e1a3d66d1 100644
--- a/extensions/razor/test/colorize-results/test_cshtml.json
+++ b/extensions/razor/test/colorize-results/test_cshtml.json
@@ -1,7 +1,7 @@
 [
 	{
-		"c": "@",
-		"t": "text.html.cshtml section.embedded.source.cshtml punctuation.section.embedded.begin.cshtml keyword.control.cshtml",
+		"c": "@{",
+		"t": "text.html.cshtml keyword.control.cshtml",
 		"r": {
 			"dark_plus": "keyword.control: #C586C0",
 			"light_plus": "keyword.control: #AF00DB",
@@ -10,20 +10,9 @@
 			"hc_black": "keyword.control: #C586C0"
 		}
 	},
-	{
-		"c": "{",
-		"t": "text.html.cshtml section.embedded.source.cshtml punctuation.section.embedded.begin.cshtml",
-		"r": {
-			"dark_plus": "punctuation.section.embedded: #569CD6",
-			"light_plus": "punctuation.section.embedded: #0000FF",
-			"dark_vs": "punctuation.section.embedded: #569CD6",
-			"light_vs": "punctuation.section.embedded: #0000FF",
-			"hc_black": "punctuation.section.embedded: #569CD6"
-		}
-	},
 	{
 		"c": "    ",
-		"t": "text.html.cshtml section.embedded.source.cshtml",
+		"t": "text.html.cshtml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -34,18 +23,18 @@
 	},
 	{
 		"c": "var",
-		"t": "text.html.cshtml section.embedded.source.cshtml keyword.control.cshtml",
+		"t": "text.html.cshtml keyword.other.var.cs",
 		"r": {
-			"dark_plus": "keyword.control: #C586C0",
-			"light_plus": "keyword.control: #AF00DB",
-			"dark_vs": "keyword.control: #569CD6",
-			"light_vs": "keyword.control: #0000FF",
-			"hc_black": "keyword.control: #C586C0"
+			"dark_plus": "keyword: #569CD6",
+			"light_plus": "keyword: #0000FF",
+			"dark_vs": "keyword: #569CD6",
+			"light_vs": "keyword: #0000FF",
+			"hc_black": "keyword: #569CD6"
 		}
 	},
 	{
 		"c": " ",
-		"t": "text.html.cshtml section.embedded.source.cshtml",
+		"t": "text.html.cshtml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -56,18 +45,18 @@
 	},
 	{
 		"c": "total",
-		"t": "text.html.cshtml section.embedded.source.cshtml keyword.control.cshtml",
+		"t": "text.html.cshtml entity.name.variable.local.cs",
 		"r": {
-			"dark_plus": "keyword.control: #C586C0",
-			"light_plus": "keyword.control: #AF00DB",
-			"dark_vs": "keyword.control: #569CD6",
-			"light_vs": "keyword.control: #0000FF",
-			"hc_black": "keyword.control: #C586C0"
+			"dark_plus": "entity.name.variable: #9CDCFE",
+			"light_plus": "entity.name.variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
 		}
 	},
 	{
 		"c": " ",
-		"t": "text.html.cshtml section.embedded.source.cshtml",
+		"t": "text.html.cshtml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -78,7 +67,7 @@
 	},
 	{
 		"c": "=",
-		"t": "text.html.cshtml section.embedded.source.cshtml keyword.operator.assignment.cs",
+		"t": "text.html.cshtml keyword.operator.assignment.cs",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -89,7 +78,7 @@
 	},
 	{
 		"c": " ",
-		"t": "text.html.cshtml section.embedded.source.cshtml",
+		"t": "text.html.cshtml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -100,18 +89,18 @@
 	},
 	{
 		"c": "0",
-		"t": "text.html.cshtml section.embedded.source.cshtml keyword.control.cshtml",
+		"t": "text.html.cshtml constant.numeric.decimal.cs",
 		"r": {
-			"dark_plus": "keyword.control: #C586C0",
-			"light_plus": "keyword.control: #AF00DB",
-			"dark_vs": "keyword.control: #569CD6",
-			"light_vs": "keyword.control: #0000FF",
-			"hc_black": "keyword.control: #C586C0"
+			"dark_plus": "constant.numeric: #B5CEA8",
+			"light_plus": "constant.numeric: #09885A",
+			"dark_vs": "constant.numeric: #B5CEA8",
+			"light_vs": "constant.numeric: #09885A",
+			"hc_black": "constant.numeric: #B5CEA8"
 		}
 	},
 	{
 		"c": ";",
-		"t": "text.html.cshtml section.embedded.source.cshtml punctuation.terminator.statement.cs",
+		"t": "text.html.cshtml punctuation.terminator.statement.cs",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -122,7 +111,7 @@
 	},
 	{
 		"c": "    ",
-		"t": "text.html.cshtml section.embedded.source.cshtml",
+		"t": "text.html.cshtml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -133,18 +122,18 @@
 	},
 	{
 		"c": "var",
-		"t": "text.html.cshtml section.embedded.source.cshtml keyword.control.cshtml",
+		"t": "text.html.cshtml keyword.other.var.cs",
 		"r": {
-			"dark_plus": "keyword.control: #C586C0",
-			"light_plus": "keyword.control: #AF00DB",
-			"dark_vs": "keyword.control: #569CD6",
-			"light_vs": "keyword.control: #0000FF",
-			"hc_black": "keyword.control: #C586C0"
+			"dark_plus": "keyword: #569CD6",
+			"light_plus": "keyword: #0000FF",
+			"dark_vs": "keyword: #569CD6",
+			"light_vs": "keyword: #0000FF",
+			"hc_black": "keyword: #569CD6"
 		}
 	},
 	{
 		"c": " ",
-		"t": "text.html.cshtml section.embedded.source.cshtml",
+		"t": "text.html.cshtml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -155,18 +144,18 @@
 	},
 	{
 		"c": "totalMessage",
-		"t": "text.html.cshtml section.embedded.source.cshtml keyword.control.cshtml",
+		"t": "text.html.cshtml entity.name.variable.local.cs",
 		"r": {
-			"dark_plus": "keyword.control: #C586C0",
-			"light_plus": "keyword.control: #AF00DB",
-			"dark_vs": "keyword.control: #569CD6",
-			"light_vs": "keyword.control: #0000FF",
-			"hc_black": "keyword.control: #C586C0"
+			"dark_plus": "entity.name.variable: #9CDCFE",
+			"light_plus": "entity.name.variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
 		}
 	},
 	{
 		"c": " ",
-		"t": "text.html.cshtml section.embedded.source.cshtml",
+		"t": "text.html.cshtml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -177,7 +166,7 @@
 	},
 	{
 		"c": "=",
-		"t": "text.html.cshtml section.embedded.source.cshtml keyword.operator.assignment.cs",
+		"t": "text.html.cshtml keyword.operator.assignment.cs",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -188,7 +177,7 @@
 	},
 	{
 		"c": " ",
-		"t": "text.html.cshtml section.embedded.source.cshtml",
+		"t": "text.html.cshtml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -198,8 +187,19 @@
 		}
 	},
 	{
-		"c": "\"\"",
-		"t": "text.html.cshtml section.embedded.source.cshtml string.quoted.double.cshtml",
+		"c": "\"",
+		"t": "text.html.cshtml string.quoted.double.cs punctuation.definition.string.begin.cs",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178"
+		}
+	},
+	{
+		"c": "\"",
+		"t": "text.html.cshtml string.quoted.double.cs punctuation.definition.string.end.cs",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -210,7 +210,216 @@
 	},
 	{
 		"c": ";",
-		"t": "text.html.cshtml section.embedded.source.cshtml punctuation.terminator.statement.cs",
+		"t": "text.html.cshtml punctuation.terminator.statement.cs",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": "    @",
+		"t": "text.html.cshtml",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": "*",
+		"t": "text.html.cshtml keyword.operator.arithmetic.cs",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4"
+		}
+	},
+	{
+		"c": " ",
+		"t": "text.html.cshtml",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": "a",
+		"t": "text.html.cshtml variable.other.readwrite.cs",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE"
+		}
+	},
+	{
+		"c": " ",
+		"t": "text.html.cshtml",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": "multiline",
+		"t": "text.html.cshtml variable.other.readwrite.cs",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE"
+		}
+	},
+	{
+		"c": "      ",
+		"t": "text.html.cshtml",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": "razor",
+		"t": "text.html.cshtml variable.other.readwrite.cs",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE"
+		}
+	},
+	{
+		"c": " ",
+		"t": "text.html.cshtml",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": "comment",
+		"t": "text.html.cshtml variable.other.readwrite.cs",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE"
+		}
+	},
+	{
+		"c": " ",
+		"t": "text.html.cshtml",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": "embedded",
+		"t": "text.html.cshtml variable.other.readwrite.cs",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE"
+		}
+	},
+	{
+		"c": " ",
+		"t": "text.html.cshtml",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": "in",
+		"t": "text.html.cshtml variable.other.readwrite.cs",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE"
+		}
+	},
+	{
+		"c": " ",
+		"t": "text.html.cshtml",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": "csharp",
+		"t": "text.html.cshtml variable.other.readwrite.cs",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE"
+		}
+	},
+	{
+		"c": " ",
+		"t": "text.html.cshtml",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": "*",
+		"t": "text.html.cshtml keyword.operator.arithmetic.cs",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4"
+		}
+	},
+	{
+		"c": "@",
+		"t": "text.html.cshtml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -221,62 +430,7 @@
 	},
 	{
 		"c": "    ",
-		"t": "text.html.cshtml section.embedded.source.cshtml",
-		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF"
-		}
-	},
-	{
-		"c": "@*",
-		"t": "text.html.cshtml section.embedded.source.cshtml comment.block.cshtml punctuation.definition.comment.source.cshtml",
-		"r": {
-			"dark_plus": "comment: #608B4E",
-			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
-			"light_vs": "comment: #008000",
-			"hc_black": "comment: #7CA668"
-		}
-	},
-	{
-		"c": " a multiline",
-		"t": "text.html.cshtml section.embedded.source.cshtml comment.block.cshtml",
-		"r": {
-			"dark_plus": "comment: #608B4E",
-			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
-			"light_vs": "comment: #008000",
-			"hc_black": "comment: #7CA668"
-		}
-	},
-	{
-		"c": "      razor comment embedded in csharp ",
-		"t": "text.html.cshtml section.embedded.source.cshtml comment.block.cshtml",
-		"r": {
-			"dark_plus": "comment: #608B4E",
-			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
-			"light_vs": "comment: #008000",
-			"hc_black": "comment: #7CA668"
-		}
-	},
-	{
-		"c": "*@",
-		"t": "text.html.cshtml section.embedded.source.cshtml comment.block.cshtml punctuation.definition.comment.source.cshtml",
-		"r": {
-			"dark_plus": "comment: #608B4E",
-			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
-			"light_vs": "comment: #008000",
-			"hc_black": "comment: #7CA668"
-		}
-	},
-	{
-		"c": "    ",
-		"t": "text.html.cshtml section.embedded.source.cshtml",
+		"t": "text.html.cshtml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -287,7 +441,7 @@
 	},
 	{
 		"c": "if",
-		"t": "text.html.cshtml section.embedded.source.cshtml keyword.control.cshtml",
+		"t": "text.html.cshtml keyword.control.conditional.if.cs",
 		"r": {
 			"dark_plus": "keyword.control: #C586C0",
 			"light_plus": "keyword.control: #AF00DB",
@@ -298,7 +452,7 @@
 	},
 	{
 		"c": " ",
-		"t": "text.html.cshtml section.embedded.source.cshtml",
+		"t": "text.html.cshtml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -308,19 +462,41 @@
 		}
 	},
 	{
-		"c": "(IsPost)",
-		"t": "text.html.cshtml section.embedded.source.cshtml string.bracers.round.cshtml",
+		"c": "(",
+		"t": "text.html.cshtml punctuation.parenthesis.open.cs",
 		"r": {
-			"dark_plus": "string: #CE9178",
-			"light_plus": "string: #A31515",
-			"dark_vs": "string: #CE9178",
-			"light_vs": "string: #A31515",
-			"hc_black": "string: #CE9178"
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": "IsPost",
+		"t": "text.html.cshtml variable.other.readwrite.cs",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE"
+		}
+	},
+	{
+		"c": ")",
+		"t": "text.html.cshtml punctuation.parenthesis.close.cs",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
 		}
 	},
 	{
 		"c": " ",
-		"t": "text.html.cshtml section.embedded.source.cshtml",
+		"t": "text.html.cshtml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -331,29 +507,51 @@
 	},
 	{
 		"c": "{",
-		"t": "text.html.cshtml section.embedded.source.cshtml section.embedded.source.cshtml punctuation.section.embedded.begin.cshtml",
+		"t": "text.html.cshtml punctuation.curlybrace.open.cs",
 		"r": {
-			"dark_plus": "punctuation.section.embedded: #569CD6",
-			"light_plus": "punctuation.section.embedded: #0000FF",
-			"dark_vs": "punctuation.section.embedded: #569CD6",
-			"light_vs": "punctuation.section.embedded: #0000FF",
-			"hc_black": "punctuation.section.embedded: #569CD6"
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
 		}
 	},
 	{
-		"c": "        // Retrieve the numbers that the user entered.",
-		"t": "text.html.cshtml section.embedded.source.cshtml section.embedded.source.cshtml comment.line.double-slash.cshtml",
+		"c": "        ",
+		"t": "text.html.cshtml punctuation.whitespace.comment.leading.cs",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": "//",
+		"t": "text.html.cshtml comment.line.double-slash.cs punctuation.definition.comment.cs",
+		"r": {
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
+			"light_vs": "comment: #008000",
+			"hc_black": "comment: #7CA668"
+		}
+	},
+	{
+		"c": " Retrieve the numbers that the user entered.",
+		"t": "text.html.cshtml comment.line.double-slash.cs",
+		"r": {
+			"dark_plus": "comment: #6A9955",
+			"light_plus": "comment: #008000",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
 	},
 	{
 		"c": "        ",
-		"t": "text.html.cshtml section.embedded.source.cshtml section.embedded.source.cshtml",
+		"t": "text.html.cshtml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -364,18 +562,18 @@
 	},
 	{
 		"c": "var",
-		"t": "text.html.cshtml section.embedded.source.cshtml section.embedded.source.cshtml keyword.control.cshtml",
+		"t": "text.html.cshtml keyword.other.var.cs",
 		"r": {
-			"dark_plus": "keyword.control: #C586C0",
-			"light_plus": "keyword.control: #AF00DB",
-			"dark_vs": "keyword.control: #569CD6",
-			"light_vs": "keyword.control: #0000FF",
-			"hc_black": "keyword.control: #C586C0"
+			"dark_plus": "keyword: #569CD6",
+			"light_plus": "keyword: #0000FF",
+			"dark_vs": "keyword: #569CD6",
+			"light_vs": "keyword: #0000FF",
+			"hc_black": "keyword: #569CD6"
 		}
 	},
 	{
 		"c": " ",
-		"t": "text.html.cshtml section.embedded.source.cshtml section.embedded.source.cshtml",
+		"t": "text.html.cshtml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -386,18 +584,18 @@
 	},
 	{
 		"c": "num1",
-		"t": "text.html.cshtml section.embedded.source.cshtml section.embedded.source.cshtml keyword.control.cshtml",
+		"t": "text.html.cshtml entity.name.variable.local.cs",
 		"r": {
-			"dark_plus": "keyword.control: #C586C0",
-			"light_plus": "keyword.control: #AF00DB",
-			"dark_vs": "keyword.control: #569CD6",
-			"light_vs": "keyword.control: #0000FF",
-			"hc_black": "keyword.control: #C586C0"
+			"dark_plus": "entity.name.variable: #9CDCFE",
+			"light_plus": "entity.name.variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
 		}
 	},
 	{
 		"c": " ",
-		"t": "text.html.cshtml section.embedded.source.cshtml section.embedded.source.cshtml",
+		"t": "text.html.cshtml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -408,7 +606,7 @@
 	},
 	{
 		"c": "=",
-		"t": "text.html.cshtml section.embedded.source.cshtml section.embedded.source.cshtml keyword.operator.assignment.cs",
+		"t": "text.html.cshtml keyword.operator.assignment.cs",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -419,7 +617,7 @@
 	},
 	{
 		"c": " ",
-		"t": "text.html.cshtml section.embedded.source.cshtml section.embedded.source.cshtml",
+		"t": "text.html.cshtml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -430,18 +628,18 @@
 	},
 	{
 		"c": "Request",
-		"t": "text.html.cshtml section.embedded.source.cshtml section.embedded.source.cshtml keyword.control.cshtml",
+		"t": "text.html.cshtml variable.other.object.property.cs",
 		"r": {
-			"dark_plus": "keyword.control: #C586C0",
-			"light_plus": "keyword.control: #AF00DB",
-			"dark_vs": "keyword.control: #569CD6",
-			"light_vs": "keyword.control: #0000FF",
-			"hc_black": "keyword.control: #C586C0"
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE"
 		}
 	},
 	{
 		"c": "[",
-		"t": "text.html.cshtml section.embedded.source.cshtml section.embedded.source.cshtml punctuation.squarebracket.open.cs",
+		"t": "text.html.cshtml punctuation.squarebracket.open.cs",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -452,40 +650,40 @@
 	},
 	{
 		"c": "\"",
-		"t": "text.html.cshtml section.embedded.source.cshtml section.embedded.source.cshtml",
+		"t": "text.html.cshtml string.quoted.double.cs punctuation.definition.string.begin.cs",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF"
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178"
 		}
 	},
 	{
 		"c": "text1",
-		"t": "text.html.cshtml section.embedded.source.cshtml section.embedded.source.cshtml storage.type.cs",
+		"t": "text.html.cshtml string.quoted.double.cs",
 		"r": {
-			"dark_plus": "storage.type.cs: #4EC9B0",
-			"light_plus": "storage.type.cs: #267F99",
-			"dark_vs": "storage.type: #569CD6",
-			"light_vs": "storage.type: #0000FF",
-			"hc_black": "storage.type.cs: #4EC9B0"
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178"
 		}
 	},
 	{
 		"c": "\"",
-		"t": "text.html.cshtml section.embedded.source.cshtml section.embedded.source.cshtml",
+		"t": "text.html.cshtml string.quoted.double.cs punctuation.definition.string.end.cs",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF"
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178"
 		}
 	},
 	{
 		"c": "]",
-		"t": "text.html.cshtml section.embedded.source.cshtml section.embedded.source.cshtml punctuation.squarebracket.close.cs",
+		"t": "text.html.cshtml punctuation.squarebracket.close.cs",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -496,7 +694,7 @@
 	},
 	{
 		"c": ";",
-		"t": "text.html.cshtml section.embedded.source.cshtml section.embedded.source.cshtml punctuation.terminator.statement.cs",
+		"t": "text.html.cshtml punctuation.terminator.statement.cs",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -507,7 +705,7 @@
 	},
 	{
 		"c": "        ",
-		"t": "text.html.cshtml section.embedded.source.cshtml section.embedded.source.cshtml",
+		"t": "text.html.cshtml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -518,18 +716,18 @@
 	},
 	{
 		"c": "var",
-		"t": "text.html.cshtml section.embedded.source.cshtml section.embedded.source.cshtml keyword.control.cshtml",
+		"t": "text.html.cshtml keyword.other.var.cs",
 		"r": {
-			"dark_plus": "keyword.control: #C586C0",
-			"light_plus": "keyword.control: #AF00DB",
-			"dark_vs": "keyword.control: #569CD6",
-			"light_vs": "keyword.control: #0000FF",
-			"hc_black": "keyword.control: #C586C0"
+			"dark_plus": "keyword: #569CD6",
+			"light_plus": "keyword: #0000FF",
+			"dark_vs": "keyword: #569CD6",
+			"light_vs": "keyword: #0000FF",
+			"hc_black": "keyword: #569CD6"
 		}
 	},
 	{
 		"c": " ",
-		"t": "text.html.cshtml section.embedded.source.cshtml section.embedded.source.cshtml",
+		"t": "text.html.cshtml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -540,18 +738,18 @@
 	},
 	{
 		"c": "num2",
-		"t": "text.html.cshtml section.embedded.source.cshtml section.embedded.source.cshtml keyword.control.cshtml",
+		"t": "text.html.cshtml entity.name.variable.local.cs",
 		"r": {
-			"dark_plus": "keyword.control: #C586C0",
-			"light_plus": "keyword.control: #AF00DB",
-			"dark_vs": "keyword.control: #569CD6",
-			"light_vs": "keyword.control: #0000FF",
-			"hc_black": "keyword.control: #C586C0"
+			"dark_plus": "entity.name.variable: #9CDCFE",
+			"light_plus": "entity.name.variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
 		}
 	},
 	{
 		"c": " ",
-		"t": "text.html.cshtml section.embedded.source.cshtml section.embedded.source.cshtml",
+		"t": "text.html.cshtml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -562,7 +760,7 @@
 	},
 	{
 		"c": "=",
-		"t": "text.html.cshtml section.embedded.source.cshtml section.embedded.source.cshtml keyword.operator.assignment.cs",
+		"t": "text.html.cshtml keyword.operator.assignment.cs",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -573,7 +771,7 @@
 	},
 	{
 		"c": " ",
-		"t": "text.html.cshtml section.embedded.source.cshtml section.embedded.source.cshtml",
+		"t": "text.html.cshtml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -584,18 +782,18 @@
 	},
 	{
 		"c": "Request",
-		"t": "text.html.cshtml section.embedded.source.cshtml section.embedded.source.cshtml keyword.control.cshtml",
+		"t": "text.html.cshtml variable.other.object.property.cs",
 		"r": {
-			"dark_plus": "keyword.control: #C586C0",
-			"light_plus": "keyword.control: #AF00DB",
-			"dark_vs": "keyword.control: #569CD6",
-			"light_vs": "keyword.control: #0000FF",
-			"hc_black": "keyword.control: #C586C0"
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE"
 		}
 	},
 	{
 		"c": "[",
-		"t": "text.html.cshtml section.embedded.source.cshtml section.embedded.source.cshtml punctuation.squarebracket.open.cs",
+		"t": "text.html.cshtml punctuation.squarebracket.open.cs",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -606,40 +804,40 @@
 	},
 	{
 		"c": "\"",
-		"t": "text.html.cshtml section.embedded.source.cshtml section.embedded.source.cshtml",
+		"t": "text.html.cshtml string.quoted.double.cs punctuation.definition.string.begin.cs",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF"
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178"
 		}
 	},
 	{
 		"c": "text2",
-		"t": "text.html.cshtml section.embedded.source.cshtml section.embedded.source.cshtml storage.type.cs",
+		"t": "text.html.cshtml string.quoted.double.cs",
 		"r": {
-			"dark_plus": "storage.type.cs: #4EC9B0",
-			"light_plus": "storage.type.cs: #267F99",
-			"dark_vs": "storage.type: #569CD6",
-			"light_vs": "storage.type: #0000FF",
-			"hc_black": "storage.type.cs: #4EC9B0"
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178"
 		}
 	},
 	{
 		"c": "\"",
-		"t": "text.html.cshtml section.embedded.source.cshtml section.embedded.source.cshtml",
+		"t": "text.html.cshtml string.quoted.double.cs punctuation.definition.string.end.cs",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF"
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178"
 		}
 	},
 	{
 		"c": "]",
-		"t": "text.html.cshtml section.embedded.source.cshtml section.embedded.source.cshtml punctuation.squarebracket.close.cs",
+		"t": "text.html.cshtml punctuation.squarebracket.close.cs",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -650,7 +848,7 @@
 	},
 	{
 		"c": ";",
-		"t": "text.html.cshtml section.embedded.source.cshtml section.embedded.source.cshtml punctuation.terminator.statement.cs",
+		"t": "text.html.cshtml punctuation.terminator.statement.cs",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -660,19 +858,41 @@
 		}
 	},
 	{
-		"c": "        // Convert the entered strings into integers numbers and add.",
-		"t": "text.html.cshtml section.embedded.source.cshtml section.embedded.source.cshtml comment.line.double-slash.cshtml",
+		"c": "        ",
+		"t": "text.html.cshtml punctuation.whitespace.comment.leading.cs",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": "//",
+		"t": "text.html.cshtml comment.line.double-slash.cs punctuation.definition.comment.cs",
+		"r": {
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
+			"light_vs": "comment: #008000",
+			"hc_black": "comment: #7CA668"
+		}
+	},
+	{
+		"c": " Convert the entered strings into integers numbers and add.",
+		"t": "text.html.cshtml comment.line.double-slash.cs",
+		"r": {
+			"dark_plus": "comment: #6A9955",
+			"light_plus": "comment: #008000",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
 	},
 	{
 		"c": "        ",
-		"t": "text.html.cshtml section.embedded.source.cshtml section.embedded.source.cshtml",
+		"t": "text.html.cshtml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -683,18 +903,18 @@
 	},
 	{
 		"c": "total",
-		"t": "text.html.cshtml section.embedded.source.cshtml section.embedded.source.cshtml keyword.control.cshtml",
+		"t": "text.html.cshtml variable.other.readwrite.cs",
 		"r": {
-			"dark_plus": "keyword.control: #C586C0",
-			"light_plus": "keyword.control: #AF00DB",
-			"dark_vs": "keyword.control: #569CD6",
-			"light_vs": "keyword.control: #0000FF",
-			"hc_black": "keyword.control: #C586C0"
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE"
 		}
 	},
 	{
 		"c": " ",
-		"t": "text.html.cshtml section.embedded.source.cshtml section.embedded.source.cshtml",
+		"t": "text.html.cshtml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -705,7 +925,7 @@
 	},
 	{
 		"c": "=",
-		"t": "text.html.cshtml section.embedded.source.cshtml section.embedded.source.cshtml keyword.operator.assignment.cs",
+		"t": "text.html.cshtml keyword.operator.assignment.cs",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -716,7 +936,7 @@
 	},
 	{
 		"c": " ",
-		"t": "text.html.cshtml section.embedded.source.cshtml section.embedded.source.cshtml",
+		"t": "text.html.cshtml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -727,18 +947,18 @@
 	},
 	{
 		"c": "num1",
-		"t": "text.html.cshtml section.embedded.source.cshtml section.embedded.source.cshtml keyword.control.cshtml",
+		"t": "text.html.cshtml variable.other.object.cs",
 		"r": {
-			"dark_plus": "keyword.control: #C586C0",
-			"light_plus": "keyword.control: #AF00DB",
-			"dark_vs": "keyword.control: #569CD6",
-			"light_vs": "keyword.control: #0000FF",
-			"hc_black": "keyword.control: #C586C0"
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE"
 		}
 	},
 	{
 		"c": ".",
-		"t": "text.html.cshtml section.embedded.source.cshtml section.embedded.source.cshtml",
+		"t": "text.html.cshtml punctuation.accessor.cs",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -749,29 +969,40 @@
 	},
 	{
 		"c": "AsInt",
-		"t": "text.html.cshtml section.embedded.source.cshtml section.embedded.source.cshtml entity.name.tag.source.cshtml",
+		"t": "text.html.cshtml entity.name.function.cs",
 		"r": {
-			"dark_plus": "entity.name.tag: #569CD6",
-			"light_plus": "entity.name.tag: #800000",
-			"dark_vs": "entity.name.tag: #569CD6",
-			"light_vs": "entity.name.tag: #800000",
-			"hc_black": "entity.name.tag: #569CD6"
+			"dark_plus": "entity.name.function: #DCDCAA",
+			"light_plus": "entity.name.function: #795E26",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.function: #DCDCAA"
 		}
 	},
 	{
-		"c": "()",
-		"t": "text.html.cshtml section.embedded.source.cshtml section.embedded.source.cshtml string.bracers.round.cshtml",
+		"c": "(",
+		"t": "text.html.cshtml punctuation.parenthesis.open.cs",
 		"r": {
-			"dark_plus": "string: #CE9178",
-			"light_plus": "string: #A31515",
-			"dark_vs": "string: #CE9178",
-			"light_vs": "string: #A31515",
-			"hc_black": "string: #CE9178"
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": ")",
+		"t": "text.html.cshtml punctuation.parenthesis.close.cs",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
 		}
 	},
 	{
 		"c": " ",
-		"t": "text.html.cshtml section.embedded.source.cshtml section.embedded.source.cshtml",
+		"t": "text.html.cshtml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -782,7 +1013,7 @@
 	},
 	{
 		"c": "+",
-		"t": "text.html.cshtml section.embedded.source.cshtml section.embedded.source.cshtml keyword.operator.arithmetic.cs",
+		"t": "text.html.cshtml keyword.operator.arithmetic.cs",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -793,7 +1024,7 @@
 	},
 	{
 		"c": " ",
-		"t": "text.html.cshtml section.embedded.source.cshtml section.embedded.source.cshtml",
+		"t": "text.html.cshtml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -804,18 +1035,18 @@
 	},
 	{
 		"c": "num2",
-		"t": "text.html.cshtml section.embedded.source.cshtml section.embedded.source.cshtml keyword.control.cshtml",
+		"t": "text.html.cshtml variable.other.object.cs",
 		"r": {
-			"dark_plus": "keyword.control: #C586C0",
-			"light_plus": "keyword.control: #AF00DB",
-			"dark_vs": "keyword.control: #569CD6",
-			"light_vs": "keyword.control: #0000FF",
-			"hc_black": "keyword.control: #C586C0"
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE"
 		}
 	},
 	{
 		"c": ".",
-		"t": "text.html.cshtml section.embedded.source.cshtml section.embedded.source.cshtml",
+		"t": "text.html.cshtml punctuation.accessor.cs",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -826,29 +1057,40 @@
 	},
 	{
 		"c": "AsInt",
-		"t": "text.html.cshtml section.embedded.source.cshtml section.embedded.source.cshtml entity.name.tag.source.cshtml",
+		"t": "text.html.cshtml entity.name.function.cs",
 		"r": {
-			"dark_plus": "entity.name.tag: #569CD6",
-			"light_plus": "entity.name.tag: #800000",
-			"dark_vs": "entity.name.tag: #569CD6",
-			"light_vs": "entity.name.tag: #800000",
-			"hc_black": "entity.name.tag: #569CD6"
+			"dark_plus": "entity.name.function: #DCDCAA",
+			"light_plus": "entity.name.function: #795E26",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.function: #DCDCAA"
 		}
 	},
 	{
-		"c": "()",
-		"t": "text.html.cshtml section.embedded.source.cshtml section.embedded.source.cshtml string.bracers.round.cshtml",
+		"c": "(",
+		"t": "text.html.cshtml punctuation.parenthesis.open.cs",
 		"r": {
-			"dark_plus": "string: #CE9178",
-			"light_plus": "string: #A31515",
-			"dark_vs": "string: #CE9178",
-			"light_vs": "string: #A31515",
-			"hc_black": "string: #CE9178"
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": ")",
+		"t": "text.html.cshtml punctuation.parenthesis.close.cs",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
 		}
 	},
 	{
 		"c": ";",
-		"t": "text.html.cshtml section.embedded.source.cshtml section.embedded.source.cshtml punctuation.terminator.statement.cs",
+		"t": "text.html.cshtml punctuation.terminator.statement.cs",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -859,7 +1101,7 @@
 	},
 	{
 		"c": "\t\t",
-		"t": "text.html.cshtml section.embedded.source.cshtml section.embedded.source.cshtml",
+		"t": "text.html.cshtml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -870,84 +1112,73 @@
 	},
 	{
 		"c": "<",
-		"t": "text.html.cshtml section.embedded.source.cshtml section.embedded.source.cshtml meta.tag.other.html punctuation.definition.tag.begin.html",
+		"t": "text.html.cshtml keyword.operator.relational.cs",
 		"r": {
-			"dark_plus": "punctuation.definition.tag: #808080",
-			"light_plus": "punctuation.definition.tag: #800000",
-			"dark_vs": "punctuation.definition.tag: #808080",
-			"light_vs": "punctuation.definition.tag: #800000",
-			"hc_black": "punctuation.definition.tag: #808080"
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4"
 		}
 	},
 	{
 		"c": "italic",
-		"t": "text.html.cshtml section.embedded.source.cshtml section.embedded.source.cshtml meta.tag.other.html entity.name.tag.other.html",
+		"t": "text.html.cshtml variable.other.readwrite.cs",
 		"r": {
-			"dark_plus": "entity.name.tag: #569CD6",
-			"light_plus": "entity.name.tag: #800000",
-			"dark_vs": "entity.name.tag: #569CD6",
-			"light_vs": "entity.name.tag: #800000",
-			"hc_black": "entity.name.tag: #569CD6"
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE"
 		}
 	},
 	{
-		"c": ">",
-		"t": "text.html.cshtml section.embedded.source.cshtml section.embedded.source.cshtml meta.tag.other.html punctuation.definition.tag.end.html",
+		"c": "><",
+		"t": "text.html.cshtml keyword.operator.relational.cs",
 		"r": {
-			"dark_plus": "punctuation.definition.tag: #808080",
-			"light_plus": "punctuation.definition.tag: #800000",
-			"dark_vs": "punctuation.definition.tag: #808080",
-			"light_vs": "punctuation.definition.tag: #800000",
-			"hc_black": "punctuation.definition.tag: #808080"
-		}
-	},
-	{
-		"c": "<",
-		"t": "text.html.cshtml section.embedded.source.cshtml section.embedded.source.cshtml meta.tag.other.html punctuation.definition.tag.begin.html",
-		"r": {
-			"dark_plus": "punctuation.definition.tag: #808080",
-			"light_plus": "punctuation.definition.tag: #800000",
-			"dark_vs": "punctuation.definition.tag: #808080",
-			"light_vs": "punctuation.definition.tag: #800000",
-			"hc_black": "punctuation.definition.tag: #808080"
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4"
 		}
 	},
 	{
 		"c": "bold",
-		"t": "text.html.cshtml section.embedded.source.cshtml section.embedded.source.cshtml meta.tag.other.html entity.name.tag.other.html",
+		"t": "text.html.cshtml variable.other.readwrite.cs",
 		"r": {
-			"dark_plus": "entity.name.tag: #569CD6",
-			"light_plus": "entity.name.tag: #800000",
-			"dark_vs": "entity.name.tag: #569CD6",
-			"light_vs": "entity.name.tag: #800000",
-			"hc_black": "entity.name.tag: #569CD6"
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE"
 		}
 	},
 	{
 		"c": ">",
-		"t": "text.html.cshtml section.embedded.source.cshtml section.embedded.source.cshtml meta.tag.other.html punctuation.definition.tag.end.html",
+		"t": "text.html.cshtml keyword.operator.relational.cs",
 		"r": {
-			"dark_plus": "punctuation.definition.tag: #808080",
-			"light_plus": "punctuation.definition.tag: #800000",
-			"dark_vs": "punctuation.definition.tag: #808080",
-			"light_vs": "punctuation.definition.tag: #800000",
-			"hc_black": "punctuation.definition.tag: #808080"
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4"
 		}
 	},
 	{
 		"c": "totalMessage",
-		"t": "text.html.cshtml section.embedded.source.cshtml section.embedded.source.cshtml keyword.control.cshtml",
+		"t": "text.html.cshtml variable.other.readwrite.cs",
 		"r": {
-			"dark_plus": "keyword.control: #C586C0",
-			"light_plus": "keyword.control: #AF00DB",
-			"dark_vs": "keyword.control: #569CD6",
-			"light_vs": "keyword.control: #0000FF",
-			"hc_black": "keyword.control: #C586C0"
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE"
 		}
 	},
 	{
 		"c": " ",
-		"t": "text.html.cshtml section.embedded.source.cshtml section.embedded.source.cshtml",
+		"t": "text.html.cshtml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -958,7 +1189,7 @@
 	},
 	{
 		"c": "=",
-		"t": "text.html.cshtml section.embedded.source.cshtml section.embedded.source.cshtml keyword.operator.assignment.cs",
+		"t": "text.html.cshtml keyword.operator.assignment.cs",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -969,7 +1200,7 @@
 	},
 	{
 		"c": " ",
-		"t": "text.html.cshtml section.embedded.source.cshtml section.embedded.source.cshtml",
+		"t": "text.html.cshtml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -979,8 +1210,30 @@
 		}
 	},
 	{
-		"c": "\"Total = \"",
-		"t": "text.html.cshtml section.embedded.source.cshtml section.embedded.source.cshtml string.quoted.double.cshtml",
+		"c": "\"",
+		"t": "text.html.cshtml string.quoted.double.cs punctuation.definition.string.begin.cs",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178"
+		}
+	},
+	{
+		"c": "Total = ",
+		"t": "text.html.cshtml string.quoted.double.cs",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178"
+		}
+	},
+	{
+		"c": "\"",
+		"t": "text.html.cshtml string.quoted.double.cs punctuation.definition.string.end.cs",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -991,7 +1244,7 @@
 	},
 	{
 		"c": " ",
-		"t": "text.html.cshtml section.embedded.source.cshtml section.embedded.source.cshtml",
+		"t": "text.html.cshtml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1002,7 +1255,7 @@
 	},
 	{
 		"c": "+",
-		"t": "text.html.cshtml section.embedded.source.cshtml section.embedded.source.cshtml keyword.operator.arithmetic.cs",
+		"t": "text.html.cshtml keyword.operator.arithmetic.cs",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -1013,7 +1266,7 @@
 	},
 	{
 		"c": " ",
-		"t": "text.html.cshtml section.embedded.source.cshtml section.embedded.source.cshtml",
+		"t": "text.html.cshtml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1024,7 +1277,128 @@
 	},
 	{
 		"c": "total",
-		"t": "text.html.cshtml section.embedded.source.cshtml section.embedded.source.cshtml keyword.control.cshtml",
+		"t": "text.html.cshtml variable.other.readwrite.cs",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE"
+		}
+	},
+	{
+		"c": ";",
+		"t": "text.html.cshtml punctuation.terminator.statement.cs",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": "<",
+		"t": "text.html.cshtml keyword.operator.relational.cs",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4"
+		}
+	},
+	{
+		"c": "/",
+		"t": "text.html.cshtml keyword.operator.arithmetic.cs",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4"
+		}
+	},
+	{
+		"c": "bold",
+		"t": "text.html.cshtml variable.other.readwrite.cs",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE"
+		}
+	},
+	{
+		"c": "><",
+		"t": "text.html.cshtml keyword.operator.relational.cs",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4"
+		}
+	},
+	{
+		"c": "/",
+		"t": "text.html.cshtml keyword.operator.arithmetic.cs",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4"
+		}
+	},
+	{
+		"c": "italic",
+		"t": "text.html.cshtml variable.other.readwrite.cs",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE"
+		}
+	},
+	{
+		"c": ">",
+		"t": "text.html.cshtml keyword.operator.relational.cs",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4"
+		}
+	},
+	{
+		"c": "    ",
+		"t": "text.html.cshtml",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": "}",
+		"t": "text.html.cshtml punctuation.curlybrace.close.cs",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": "}",
+		"t": "text.html.cshtml keyword.control.cshtml",
 		"r": {
 			"dark_plus": "keyword.control: #C586C0",
 			"light_plus": "keyword.control: #AF00DB",
@@ -1033,119 +1407,9 @@
 			"hc_black": "keyword.control: #C586C0"
 		}
 	},
-	{
-		"c": ";",
-		"t": "text.html.cshtml section.embedded.source.cshtml section.embedded.source.cshtml punctuation.terminator.statement.cs",
-		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF"
-		}
-	},
-	{
-		"c": "</",
-		"t": "text.html.cshtml section.embedded.source.cshtml section.embedded.source.cshtml meta.tag.other.html punctuation.definition.tag.begin.html",
-		"r": {
-			"dark_plus": "punctuation.definition.tag: #808080",
-			"light_plus": "punctuation.definition.tag: #800000",
-			"dark_vs": "punctuation.definition.tag: #808080",
-			"light_vs": "punctuation.definition.tag: #800000",
-			"hc_black": "punctuation.definition.tag: #808080"
-		}
-	},
-	{
-		"c": "bold",
-		"t": "text.html.cshtml section.embedded.source.cshtml section.embedded.source.cshtml meta.tag.other.html entity.name.tag.other.html",
-		"r": {
-			"dark_plus": "entity.name.tag: #569CD6",
-			"light_plus": "entity.name.tag: #800000",
-			"dark_vs": "entity.name.tag: #569CD6",
-			"light_vs": "entity.name.tag: #800000",
-			"hc_black": "entity.name.tag: #569CD6"
-		}
-	},
-	{
-		"c": ">",
-		"t": "text.html.cshtml section.embedded.source.cshtml section.embedded.source.cshtml meta.tag.other.html punctuation.definition.tag.end.html",
-		"r": {
-			"dark_plus": "punctuation.definition.tag: #808080",
-			"light_plus": "punctuation.definition.tag: #800000",
-			"dark_vs": "punctuation.definition.tag: #808080",
-			"light_vs": "punctuation.definition.tag: #800000",
-			"hc_black": "punctuation.definition.tag: #808080"
-		}
-	},
-	{
-		"c": "</",
-		"t": "text.html.cshtml section.embedded.source.cshtml section.embedded.source.cshtml meta.tag.other.html punctuation.definition.tag.begin.html",
-		"r": {
-			"dark_plus": "punctuation.definition.tag: #808080",
-			"light_plus": "punctuation.definition.tag: #800000",
-			"dark_vs": "punctuation.definition.tag: #808080",
-			"light_vs": "punctuation.definition.tag: #800000",
-			"hc_black": "punctuation.definition.tag: #808080"
-		}
-	},
-	{
-		"c": "italic",
-		"t": "text.html.cshtml section.embedded.source.cshtml section.embedded.source.cshtml meta.tag.other.html entity.name.tag.other.html",
-		"r": {
-			"dark_plus": "entity.name.tag: #569CD6",
-			"light_plus": "entity.name.tag: #800000",
-			"dark_vs": "entity.name.tag: #569CD6",
-			"light_vs": "entity.name.tag: #800000",
-			"hc_black": "entity.name.tag: #569CD6"
-		}
-	},
-	{
-		"c": ">",
-		"t": "text.html.cshtml section.embedded.source.cshtml section.embedded.source.cshtml meta.tag.other.html punctuation.definition.tag.end.html",
-		"r": {
-			"dark_plus": "punctuation.definition.tag: #808080",
-			"light_plus": "punctuation.definition.tag: #800000",
-			"dark_vs": "punctuation.definition.tag: #808080",
-			"light_vs": "punctuation.definition.tag: #800000",
-			"hc_black": "punctuation.definition.tag: #808080"
-		}
-	},
-	{
-		"c": "    ",
-		"t": "text.html.cshtml section.embedded.source.cshtml section.embedded.source.cshtml",
-		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF"
-		}
-	},
-	{
-		"c": "}",
-		"t": "text.html.cshtml section.embedded.source.cshtml section.embedded.source.cshtml punctuation.section.embedded.begin.cshtml",
-		"r": {
-			"dark_plus": "punctuation.section.embedded: #569CD6",
-			"light_plus": "punctuation.section.embedded: #0000FF",
-			"dark_vs": "punctuation.section.embedded: #569CD6",
-			"light_vs": "punctuation.section.embedded: #0000FF",
-			"hc_black": "punctuation.section.embedded: #569CD6"
-		}
-	},
-	{
-		"c": "}",
-		"t": "text.html.cshtml section.embedded.source.cshtml punctuation.section.embedded.begin.cshtml",
-		"r": {
-			"dark_plus": "punctuation.section.embedded: #569CD6",
-			"light_plus": "punctuation.section.embedded: #0000FF",
-			"dark_vs": "punctuation.section.embedded: #569CD6",
-			"light_vs": "punctuation.section.embedded: #0000FF",
-			"hc_black": "punctuation.section.embedded: #569CD6"
-		}
-	},
 	{
 		"c": "<!",
-		"t": "text.html.cshtml meta.tag.sgml.html punctuation.definition.tag.html",
+		"t": "text.html.cshtml meta.tag.metadata.doctype.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -1155,41 +1419,8 @@
 		}
 	},
 	{
-		"c": "DOCTYPE html",
-		"t": "text.html.cshtml meta.tag.sgml.html meta.tag.sgml.doctype.html",
-		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF"
-		}
-	},
-	{
-		"c": ">",
-		"t": "text.html.cshtml meta.tag.sgml.html punctuation.definition.tag.html",
-		"r": {
-			"dark_plus": "punctuation.definition.tag: #808080",
-			"light_plus": "punctuation.definition.tag: #800000",
-			"dark_vs": "punctuation.definition.tag: #808080",
-			"light_vs": "punctuation.definition.tag: #800000",
-			"hc_black": "punctuation.definition.tag: #808080"
-		}
-	},
-	{
-		"c": "<",
-		"t": "text.html.cshtml meta.tag.structure.any.html punctuation.definition.tag.html",
-		"r": {
-			"dark_plus": "punctuation.definition.tag: #808080",
-			"light_plus": "punctuation.definition.tag: #800000",
-			"dark_vs": "punctuation.definition.tag: #808080",
-			"light_vs": "punctuation.definition.tag: #800000",
-			"hc_black": "punctuation.definition.tag: #808080"
-		}
-	},
-	{
-		"c": "html",
-		"t": "text.html.cshtml meta.tag.structure.any.html entity.name.tag.structure.any.html",
+		"c": "DOCTYPE",
+		"t": "text.html.cshtml meta.tag.metadata.doctype.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -1200,7 +1431,62 @@
 	},
 	{
 		"c": " ",
-		"t": "text.html.cshtml meta.tag.structure.any.html",
+		"t": "text.html.cshtml meta.tag.metadata.doctype.html",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": "html",
+		"t": "text.html.cshtml meta.tag.metadata.doctype.html entity.other.attribute-name.html",
+		"r": {
+			"dark_plus": "entity.other.attribute-name: #9CDCFE",
+			"light_plus": "entity.other.attribute-name: #FF0000",
+			"dark_vs": "entity.other.attribute-name: #9CDCFE",
+			"light_vs": "entity.other.attribute-name: #FF0000",
+			"hc_black": "entity.other.attribute-name: #9CDCFE"
+		}
+	},
+	{
+		"c": ">",
+		"t": "text.html.cshtml meta.tag.metadata.doctype.html punctuation.definition.tag.end.html",
+		"r": {
+			"dark_plus": "punctuation.definition.tag: #808080",
+			"light_plus": "punctuation.definition.tag: #800000",
+			"dark_vs": "punctuation.definition.tag: #808080",
+			"light_vs": "punctuation.definition.tag: #800000",
+			"hc_black": "punctuation.definition.tag: #808080"
+		}
+	},
+	{
+		"c": "<",
+		"t": "text.html.cshtml meta.tag.structure.html.start.html punctuation.definition.tag.begin.html",
+		"r": {
+			"dark_plus": "punctuation.definition.tag: #808080",
+			"light_plus": "punctuation.definition.tag: #800000",
+			"dark_vs": "punctuation.definition.tag: #808080",
+			"light_vs": "punctuation.definition.tag: #800000",
+			"hc_black": "punctuation.definition.tag: #808080"
+		}
+	},
+	{
+		"c": "html",
+		"t": "text.html.cshtml meta.tag.structure.html.start.html entity.name.tag.html",
+		"r": {
+			"dark_plus": "entity.name.tag: #569CD6",
+			"light_plus": "entity.name.tag: #800000",
+			"dark_vs": "entity.name.tag: #569CD6",
+			"light_vs": "entity.name.tag: #800000",
+			"hc_black": "entity.name.tag: #569CD6"
+		}
+	},
+	{
+		"c": " ",
+		"t": "text.html.cshtml meta.tag.structure.html.start.html",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1211,7 +1497,7 @@
 	},
 	{
 		"c": "lang",
-		"t": "text.html.cshtml meta.tag.structure.any.html entity.other.attribute-name.html",
+		"t": "text.html.cshtml meta.tag.structure.html.start.html meta.attribute.lang.html entity.other.attribute-name.html",
 		"r": {
 			"dark_plus": "entity.other.attribute-name: #9CDCFE",
 			"light_plus": "entity.other.attribute-name: #FF0000",
@@ -1222,7 +1508,7 @@
 	},
 	{
 		"c": "=",
-		"t": "text.html.cshtml meta.tag.structure.any.html",
+		"t": "text.html.cshtml meta.tag.structure.html.start.html meta.attribute.lang.html punctuation.separator.key-value.html",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1233,7 +1519,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "text.html.cshtml meta.tag.structure.any.html string.quoted.double.html punctuation.definition.string.begin.html",
+		"t": "text.html.cshtml meta.tag.structure.html.start.html meta.attribute.lang.html string.quoted.double.html punctuation.definition.string.begin.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.double.html: #0000FF",
@@ -1244,7 +1530,7 @@
 	},
 	{
 		"c": "en",
-		"t": "text.html.cshtml meta.tag.structure.any.html string.quoted.double.html",
+		"t": "text.html.cshtml meta.tag.structure.html.start.html meta.attribute.lang.html string.quoted.double.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.double.html: #0000FF",
@@ -1255,7 +1541,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "text.html.cshtml meta.tag.structure.any.html string.quoted.double.html punctuation.definition.string.end.html",
+		"t": "text.html.cshtml meta.tag.structure.html.start.html meta.attribute.lang.html string.quoted.double.html punctuation.definition.string.end.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.double.html: #0000FF",
@@ -1266,7 +1552,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.cshtml meta.tag.structure.any.html punctuation.definition.tag.html",
+		"t": "text.html.cshtml meta.tag.structure.html.start.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -1288,7 +1574,7 @@
 	},
 	{
 		"c": "<",
-		"t": "text.html.cshtml meta.tag.structure.any.html punctuation.definition.tag.html",
+		"t": "text.html.cshtml meta.tag.structure.head.start.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -1299,7 +1585,7 @@
 	},
 	{
 		"c": "head",
-		"t": "text.html.cshtml meta.tag.structure.any.html entity.name.tag.structure.any.html",
+		"t": "text.html.cshtml meta.tag.structure.head.start.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -1310,7 +1596,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.cshtml meta.tag.structure.any.html punctuation.definition.tag.html",
+		"t": "text.html.cshtml meta.tag.structure.head.start.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -1332,7 +1618,7 @@
 	},
 	{
 		"c": "<",
-		"t": "text.html.cshtml meta.tag.inline.any.html punctuation.definition.tag.begin.html",
+		"t": "text.html.cshtml meta.tag.metadata.title.start.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -1343,7 +1629,7 @@
 	},
 	{
 		"c": "title",
-		"t": "text.html.cshtml meta.tag.inline.any.html entity.name.tag.inline.any.html",
+		"t": "text.html.cshtml meta.tag.metadata.title.start.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -1354,7 +1640,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.cshtml meta.tag.inline.any.html punctuation.definition.tag.end.html",
+		"t": "text.html.cshtml meta.tag.metadata.title.start.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -1376,7 +1662,7 @@
 	},
 	{
 		"c": "</",
-		"t": "text.html.cshtml meta.tag.inline.any.html punctuation.definition.tag.begin.html",
+		"t": "text.html.cshtml meta.tag.metadata.title.end.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -1387,7 +1673,7 @@
 	},
 	{
 		"c": "title",
-		"t": "text.html.cshtml meta.tag.inline.any.html entity.name.tag.inline.any.html",
+		"t": "text.html.cshtml meta.tag.metadata.title.end.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -1398,7 +1684,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.cshtml meta.tag.inline.any.html punctuation.definition.tag.end.html",
+		"t": "text.html.cshtml meta.tag.metadata.title.end.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -1420,7 +1706,7 @@
 	},
 	{
 		"c": "<",
-		"t": "text.html.cshtml meta.tag.inline.any.html punctuation.definition.tag.begin.html",
+		"t": "text.html.cshtml meta.tag.metadata.meta.void.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -1431,7 +1717,7 @@
 	},
 	{
 		"c": "meta",
-		"t": "text.html.cshtml meta.tag.inline.any.html entity.name.tag.inline.any.html",
+		"t": "text.html.cshtml meta.tag.metadata.meta.void.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -1442,7 +1728,7 @@
 	},
 	{
 		"c": " ",
-		"t": "text.html.cshtml meta.tag.inline.any.html",
+		"t": "text.html.cshtml meta.tag.metadata.meta.void.html",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1453,7 +1739,7 @@
 	},
 	{
 		"c": "charset",
-		"t": "text.html.cshtml meta.tag.inline.any.html entity.other.attribute-name.html",
+		"t": "text.html.cshtml meta.tag.metadata.meta.void.html meta.attribute.charset.html entity.other.attribute-name.html",
 		"r": {
 			"dark_plus": "entity.other.attribute-name: #9CDCFE",
 			"light_plus": "entity.other.attribute-name: #FF0000",
@@ -1464,7 +1750,7 @@
 	},
 	{
 		"c": "=",
-		"t": "text.html.cshtml meta.tag.inline.any.html",
+		"t": "text.html.cshtml meta.tag.metadata.meta.void.html meta.attribute.charset.html punctuation.separator.key-value.html",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1475,7 +1761,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "text.html.cshtml meta.tag.inline.any.html string.quoted.double.html punctuation.definition.string.begin.html",
+		"t": "text.html.cshtml meta.tag.metadata.meta.void.html meta.attribute.charset.html string.quoted.double.html punctuation.definition.string.begin.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.double.html: #0000FF",
@@ -1486,7 +1772,7 @@
 	},
 	{
 		"c": "utf-8",
-		"t": "text.html.cshtml meta.tag.inline.any.html string.quoted.double.html",
+		"t": "text.html.cshtml meta.tag.metadata.meta.void.html meta.attribute.charset.html string.quoted.double.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.double.html: #0000FF",
@@ -1497,7 +1783,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "text.html.cshtml meta.tag.inline.any.html string.quoted.double.html punctuation.definition.string.end.html",
+		"t": "text.html.cshtml meta.tag.metadata.meta.void.html meta.attribute.charset.html string.quoted.double.html punctuation.definition.string.end.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.double.html: #0000FF",
@@ -1507,8 +1793,19 @@
 		}
 	},
 	{
-		"c": " />",
-		"t": "text.html.cshtml meta.tag.inline.any.html punctuation.definition.tag.end.html",
+		"c": " ",
+		"t": "text.html.cshtml meta.tag.metadata.meta.void.html",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": "/>",
+		"t": "text.html.cshtml meta.tag.metadata.meta.void.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -1530,7 +1827,7 @@
 	},
 	{
 		"c": "</",
-		"t": "text.html.cshtml meta.tag.structure.any.html punctuation.definition.tag.html",
+		"t": "text.html.cshtml meta.tag.structure.head.end.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -1541,7 +1838,7 @@
 	},
 	{
 		"c": "head",
-		"t": "text.html.cshtml meta.tag.structure.any.html entity.name.tag.structure.any.html",
+		"t": "text.html.cshtml meta.tag.structure.head.end.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -1552,7 +1849,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.cshtml meta.tag.structure.any.html punctuation.definition.tag.html",
+		"t": "text.html.cshtml meta.tag.structure.head.end.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -1563,7 +1860,7 @@
 	},
 	{
 		"c": "<",
-		"t": "text.html.cshtml meta.tag.structure.any.html punctuation.definition.tag.html",
+		"t": "text.html.cshtml meta.tag.structure.body.start.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -1574,7 +1871,7 @@
 	},
 	{
 		"c": "body",
-		"t": "text.html.cshtml meta.tag.structure.any.html entity.name.tag.structure.any.html",
+		"t": "text.html.cshtml meta.tag.structure.body.start.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -1585,7 +1882,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.cshtml meta.tag.structure.any.html punctuation.definition.tag.html",
+		"t": "text.html.cshtml meta.tag.structure.body.start.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -1607,7 +1904,7 @@
 	},
 	{
 		"c": "<",
-		"t": "text.html.cshtml meta.tag.block.any.html punctuation.definition.tag.begin.html",
+		"t": "text.html.cshtml meta.tag.structure.p.start.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -1618,7 +1915,7 @@
 	},
 	{
 		"c": "p",
-		"t": "text.html.cshtml meta.tag.block.any.html entity.name.tag.block.any.html",
+		"t": "text.html.cshtml meta.tag.structure.p.start.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -1629,7 +1926,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.cshtml meta.tag.block.any.html punctuation.definition.tag.end.html",
+		"t": "text.html.cshtml meta.tag.structure.p.start.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -1651,7 +1948,7 @@
 	},
 	{
 		"c": "<",
-		"t": "text.html.cshtml meta.tag.inline.any.html punctuation.definition.tag.begin.html",
+		"t": "text.html.cshtml meta.tag.inline.strong.start.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -1662,7 +1959,7 @@
 	},
 	{
 		"c": "strong",
-		"t": "text.html.cshtml meta.tag.inline.any.html entity.name.tag.inline.any.html",
+		"t": "text.html.cshtml meta.tag.inline.strong.start.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -1673,7 +1970,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.cshtml meta.tag.inline.any.html punctuation.definition.tag.end.html",
+		"t": "text.html.cshtml meta.tag.inline.strong.start.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -1695,7 +1992,7 @@
 	},
 	{
 		"c": "</",
-		"t": "text.html.cshtml meta.tag.inline.any.html punctuation.definition.tag.begin.html",
+		"t": "text.html.cshtml meta.tag.inline.strong.end.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -1706,7 +2003,7 @@
 	},
 	{
 		"c": "strong",
-		"t": "text.html.cshtml meta.tag.inline.any.html entity.name.tag.inline.any.html",
+		"t": "text.html.cshtml meta.tag.inline.strong.end.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -1717,7 +2014,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.cshtml meta.tag.inline.any.html punctuation.definition.tag.end.html",
+		"t": "text.html.cshtml meta.tag.inline.strong.end.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -1739,7 +2036,7 @@
 	},
 	{
 		"c": "</",
-		"t": "text.html.cshtml meta.tag.block.any.html punctuation.definition.tag.begin.html",
+		"t": "text.html.cshtml meta.tag.structure.p.end.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -1750,7 +2047,7 @@
 	},
 	{
 		"c": "p",
-		"t": "text.html.cshtml meta.tag.block.any.html entity.name.tag.block.any.html",
+		"t": "text.html.cshtml meta.tag.structure.p.end.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -1761,7 +2058,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.cshtml meta.tag.block.any.html punctuation.definition.tag.end.html",
+		"t": "text.html.cshtml meta.tag.structure.p.end.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -1783,7 +2080,7 @@
 	},
 	{
 		"c": "<",
-		"t": "text.html.cshtml meta.tag.block.any.html punctuation.definition.tag.begin.html",
+		"t": "text.html.cshtml meta.tag.structure.form.start.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -1794,7 +2091,7 @@
 	},
 	{
 		"c": "form",
-		"t": "text.html.cshtml meta.tag.block.any.html entity.name.tag.block.any.html",
+		"t": "text.html.cshtml meta.tag.structure.form.start.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -1805,7 +2102,7 @@
 	},
 	{
 		"c": " ",
-		"t": "text.html.cshtml meta.tag.block.any.html",
+		"t": "text.html.cshtml meta.tag.structure.form.start.html",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1816,7 +2113,7 @@
 	},
 	{
 		"c": "action",
-		"t": "text.html.cshtml meta.tag.block.any.html entity.other.attribute-name.html",
+		"t": "text.html.cshtml meta.tag.structure.form.start.html meta.attribute.action.html entity.other.attribute-name.html",
 		"r": {
 			"dark_plus": "entity.other.attribute-name: #9CDCFE",
 			"light_plus": "entity.other.attribute-name: #FF0000",
@@ -1827,7 +2124,7 @@
 	},
 	{
 		"c": "=",
-		"t": "text.html.cshtml meta.tag.block.any.html",
+		"t": "text.html.cshtml meta.tag.structure.form.start.html meta.attribute.action.html punctuation.separator.key-value.html",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1838,7 +2135,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "text.html.cshtml meta.tag.block.any.html string.quoted.double.html punctuation.definition.string.begin.html",
+		"t": "text.html.cshtml meta.tag.structure.form.start.html meta.attribute.action.html string.quoted.double.html punctuation.definition.string.begin.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.double.html: #0000FF",
@@ -1849,7 +2146,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "text.html.cshtml meta.tag.block.any.html string.quoted.double.html punctuation.definition.string.end.html",
+		"t": "text.html.cshtml meta.tag.structure.form.start.html meta.attribute.action.html string.quoted.double.html punctuation.definition.string.end.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.double.html: #0000FF",
@@ -1860,7 +2157,7 @@
 	},
 	{
 		"c": " ",
-		"t": "text.html.cshtml meta.tag.block.any.html",
+		"t": "text.html.cshtml meta.tag.structure.form.start.html",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1871,7 +2168,7 @@
 	},
 	{
 		"c": "method",
-		"t": "text.html.cshtml meta.tag.block.any.html entity.other.attribute-name.html",
+		"t": "text.html.cshtml meta.tag.structure.form.start.html meta.attribute.method.html entity.other.attribute-name.html",
 		"r": {
 			"dark_plus": "entity.other.attribute-name: #9CDCFE",
 			"light_plus": "entity.other.attribute-name: #FF0000",
@@ -1882,7 +2179,7 @@
 	},
 	{
 		"c": "=",
-		"t": "text.html.cshtml meta.tag.block.any.html",
+		"t": "text.html.cshtml meta.tag.structure.form.start.html meta.attribute.method.html punctuation.separator.key-value.html",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1893,7 +2190,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "text.html.cshtml meta.tag.block.any.html string.quoted.double.html punctuation.definition.string.begin.html",
+		"t": "text.html.cshtml meta.tag.structure.form.start.html meta.attribute.method.html string.quoted.double.html punctuation.definition.string.begin.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.double.html: #0000FF",
@@ -1904,7 +2201,7 @@
 	},
 	{
 		"c": "post",
-		"t": "text.html.cshtml meta.tag.block.any.html string.quoted.double.html",
+		"t": "text.html.cshtml meta.tag.structure.form.start.html meta.attribute.method.html string.quoted.double.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.double.html: #0000FF",
@@ -1915,7 +2212,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "text.html.cshtml meta.tag.block.any.html string.quoted.double.html punctuation.definition.string.end.html",
+		"t": "text.html.cshtml meta.tag.structure.form.start.html meta.attribute.method.html string.quoted.double.html punctuation.definition.string.end.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.double.html: #0000FF",
@@ -1926,7 +2223,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.cshtml meta.tag.block.any.html punctuation.definition.tag.end.html",
+		"t": "text.html.cshtml meta.tag.structure.form.start.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -1948,7 +2245,7 @@
 	},
 	{
 		"c": "<",
-		"t": "text.html.cshtml meta.tag.block.any.html punctuation.definition.tag.begin.html",
+		"t": "text.html.cshtml meta.tag.structure.p.start.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -1959,7 +2256,7 @@
 	},
 	{
 		"c": "p",
-		"t": "text.html.cshtml meta.tag.block.any.html entity.name.tag.block.any.html",
+		"t": "text.html.cshtml meta.tag.structure.p.start.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -1970,7 +2267,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.cshtml meta.tag.block.any.html punctuation.definition.tag.end.html",
+		"t": "text.html.cshtml meta.tag.structure.p.start.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -1981,7 +2278,7 @@
 	},
 	{
 		"c": "<",
-		"t": "text.html.cshtml meta.tag.inline.any.html punctuation.definition.tag.begin.html",
+		"t": "text.html.cshtml meta.tag.structure.label.start.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -1992,7 +2289,7 @@
 	},
 	{
 		"c": "label",
-		"t": "text.html.cshtml meta.tag.inline.any.html entity.name.tag.inline.any.html",
+		"t": "text.html.cshtml meta.tag.structure.label.start.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -2003,7 +2300,7 @@
 	},
 	{
 		"c": " ",
-		"t": "text.html.cshtml meta.tag.inline.any.html",
+		"t": "text.html.cshtml meta.tag.structure.label.start.html",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2014,7 +2311,7 @@
 	},
 	{
 		"c": "for",
-		"t": "text.html.cshtml meta.tag.inline.any.html entity.other.attribute-name.html",
+		"t": "text.html.cshtml meta.tag.structure.label.start.html meta.attribute.for.html entity.other.attribute-name.html",
 		"r": {
 			"dark_plus": "entity.other.attribute-name: #9CDCFE",
 			"light_plus": "entity.other.attribute-name: #FF0000",
@@ -2025,7 +2322,7 @@
 	},
 	{
 		"c": "=",
-		"t": "text.html.cshtml meta.tag.inline.any.html",
+		"t": "text.html.cshtml meta.tag.structure.label.start.html meta.attribute.for.html punctuation.separator.key-value.html",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2036,7 +2333,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "text.html.cshtml meta.tag.inline.any.html string.quoted.double.html punctuation.definition.string.begin.html",
+		"t": "text.html.cshtml meta.tag.structure.label.start.html meta.attribute.for.html string.quoted.double.html punctuation.definition.string.begin.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.double.html: #0000FF",
@@ -2047,7 +2344,7 @@
 	},
 	{
 		"c": "text1",
-		"t": "text.html.cshtml meta.tag.inline.any.html string.quoted.double.html",
+		"t": "text.html.cshtml meta.tag.structure.label.start.html meta.attribute.for.html string.quoted.double.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.double.html: #0000FF",
@@ -2058,7 +2355,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "text.html.cshtml meta.tag.inline.any.html string.quoted.double.html punctuation.definition.string.end.html",
+		"t": "text.html.cshtml meta.tag.structure.label.start.html meta.attribute.for.html string.quoted.double.html punctuation.definition.string.end.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.double.html: #0000FF",
@@ -2069,7 +2366,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.cshtml meta.tag.inline.any.html punctuation.definition.tag.end.html",
+		"t": "text.html.cshtml meta.tag.structure.label.start.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -2091,7 +2388,7 @@
 	},
 	{
 		"c": "</",
-		"t": "text.html.cshtml meta.tag.inline.any.html punctuation.definition.tag.begin.html",
+		"t": "text.html.cshtml meta.tag.structure.label.end.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -2102,7 +2399,7 @@
 	},
 	{
 		"c": "label",
-		"t": "text.html.cshtml meta.tag.inline.any.html entity.name.tag.inline.any.html",
+		"t": "text.html.cshtml meta.tag.structure.label.end.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -2113,7 +2410,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.cshtml meta.tag.inline.any.html punctuation.definition.tag.end.html",
+		"t": "text.html.cshtml meta.tag.structure.label.end.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -2135,7 +2432,7 @@
 	},
 	{
 		"c": "<",
-		"t": "text.html.cshtml meta.tag.inline.any.html punctuation.definition.tag.begin.html",
+		"t": "text.html.cshtml meta.tag.structure.input.void.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -2146,7 +2443,7 @@
 	},
 	{
 		"c": "input",
-		"t": "text.html.cshtml meta.tag.inline.any.html entity.name.tag.inline.any.html",
+		"t": "text.html.cshtml meta.tag.structure.input.void.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -2157,7 +2454,7 @@
 	},
 	{
 		"c": " ",
-		"t": "text.html.cshtml meta.tag.inline.any.html",
+		"t": "text.html.cshtml meta.tag.structure.input.void.html",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2168,7 +2465,7 @@
 	},
 	{
 		"c": "type",
-		"t": "text.html.cshtml meta.tag.inline.any.html entity.other.attribute-name.html",
+		"t": "text.html.cshtml meta.tag.structure.input.void.html meta.attribute.type.html entity.other.attribute-name.html",
 		"r": {
 			"dark_plus": "entity.other.attribute-name: #9CDCFE",
 			"light_plus": "entity.other.attribute-name: #FF0000",
@@ -2179,7 +2476,7 @@
 	},
 	{
 		"c": "=",
-		"t": "text.html.cshtml meta.tag.inline.any.html",
+		"t": "text.html.cshtml meta.tag.structure.input.void.html meta.attribute.type.html punctuation.separator.key-value.html",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2190,7 +2487,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "text.html.cshtml meta.tag.inline.any.html string.quoted.double.html punctuation.definition.string.begin.html",
+		"t": "text.html.cshtml meta.tag.structure.input.void.html meta.attribute.type.html string.quoted.double.html punctuation.definition.string.begin.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.double.html: #0000FF",
@@ -2201,7 +2498,7 @@
 	},
 	{
 		"c": "text",
-		"t": "text.html.cshtml meta.tag.inline.any.html string.quoted.double.html",
+		"t": "text.html.cshtml meta.tag.structure.input.void.html meta.attribute.type.html string.quoted.double.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.double.html: #0000FF",
@@ -2212,7 +2509,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "text.html.cshtml meta.tag.inline.any.html string.quoted.double.html punctuation.definition.string.end.html",
+		"t": "text.html.cshtml meta.tag.structure.input.void.html meta.attribute.type.html string.quoted.double.html punctuation.definition.string.end.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.double.html: #0000FF",
@@ -2223,7 +2520,7 @@
 	},
 	{
 		"c": " ",
-		"t": "text.html.cshtml meta.tag.inline.any.html",
+		"t": "text.html.cshtml meta.tag.structure.input.void.html",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2234,7 +2531,7 @@
 	},
 	{
 		"c": "name",
-		"t": "text.html.cshtml meta.tag.inline.any.html entity.other.attribute-name.html",
+		"t": "text.html.cshtml meta.tag.structure.input.void.html meta.attribute.name.html entity.other.attribute-name.html",
 		"r": {
 			"dark_plus": "entity.other.attribute-name: #9CDCFE",
 			"light_plus": "entity.other.attribute-name: #FF0000",
@@ -2245,7 +2542,7 @@
 	},
 	{
 		"c": "=",
-		"t": "text.html.cshtml meta.tag.inline.any.html",
+		"t": "text.html.cshtml meta.tag.structure.input.void.html meta.attribute.name.html punctuation.separator.key-value.html",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2256,7 +2553,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "text.html.cshtml meta.tag.inline.any.html string.quoted.double.html punctuation.definition.string.begin.html",
+		"t": "text.html.cshtml meta.tag.structure.input.void.html meta.attribute.name.html string.quoted.double.html punctuation.definition.string.begin.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.double.html: #0000FF",
@@ -2267,7 +2564,7 @@
 	},
 	{
 		"c": "text1",
-		"t": "text.html.cshtml meta.tag.inline.any.html string.quoted.double.html",
+		"t": "text.html.cshtml meta.tag.structure.input.void.html meta.attribute.name.html string.quoted.double.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.double.html: #0000FF",
@@ -2278,7 +2575,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "text.html.cshtml meta.tag.inline.any.html string.quoted.double.html punctuation.definition.string.end.html",
+		"t": "text.html.cshtml meta.tag.structure.input.void.html meta.attribute.name.html string.quoted.double.html punctuation.definition.string.end.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.double.html: #0000FF",
@@ -2288,8 +2585,19 @@
 		}
 	},
 	{
-		"c": " />",
-		"t": "text.html.cshtml meta.tag.inline.any.html punctuation.definition.tag.end.html",
+		"c": " ",
+		"t": "text.html.cshtml meta.tag.structure.input.void.html",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": "/>",
+		"t": "text.html.cshtml meta.tag.structure.input.void.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -2311,7 +2619,7 @@
 	},
 	{
 		"c": "</",
-		"t": "text.html.cshtml meta.tag.block.any.html punctuation.definition.tag.begin.html",
+		"t": "text.html.cshtml meta.tag.structure.p.end.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -2322,7 +2630,7 @@
 	},
 	{
 		"c": "p",
-		"t": "text.html.cshtml meta.tag.block.any.html entity.name.tag.block.any.html",
+		"t": "text.html.cshtml meta.tag.structure.p.end.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -2333,7 +2641,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.cshtml meta.tag.block.any.html punctuation.definition.tag.end.html",
+		"t": "text.html.cshtml meta.tag.structure.p.end.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -2355,7 +2663,7 @@
 	},
 	{
 		"c": "<",
-		"t": "text.html.cshtml meta.tag.block.any.html punctuation.definition.tag.begin.html",
+		"t": "text.html.cshtml meta.tag.structure.p.start.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -2366,7 +2674,7 @@
 	},
 	{
 		"c": "p",
-		"t": "text.html.cshtml meta.tag.block.any.html entity.name.tag.block.any.html",
+		"t": "text.html.cshtml meta.tag.structure.p.start.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -2377,7 +2685,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.cshtml meta.tag.block.any.html punctuation.definition.tag.end.html",
+		"t": "text.html.cshtml meta.tag.structure.p.start.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -2388,7 +2696,7 @@
 	},
 	{
 		"c": "<",
-		"t": "text.html.cshtml meta.tag.inline.any.html punctuation.definition.tag.begin.html",
+		"t": "text.html.cshtml meta.tag.structure.label.start.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -2399,7 +2707,7 @@
 	},
 	{
 		"c": "label",
-		"t": "text.html.cshtml meta.tag.inline.any.html entity.name.tag.inline.any.html",
+		"t": "text.html.cshtml meta.tag.structure.label.start.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -2410,7 +2718,7 @@
 	},
 	{
 		"c": " ",
-		"t": "text.html.cshtml meta.tag.inline.any.html",
+		"t": "text.html.cshtml meta.tag.structure.label.start.html",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2421,7 +2729,7 @@
 	},
 	{
 		"c": "for",
-		"t": "text.html.cshtml meta.tag.inline.any.html entity.other.attribute-name.html",
+		"t": "text.html.cshtml meta.tag.structure.label.start.html meta.attribute.for.html entity.other.attribute-name.html",
 		"r": {
 			"dark_plus": "entity.other.attribute-name: #9CDCFE",
 			"light_plus": "entity.other.attribute-name: #FF0000",
@@ -2432,7 +2740,7 @@
 	},
 	{
 		"c": "=",
-		"t": "text.html.cshtml meta.tag.inline.any.html",
+		"t": "text.html.cshtml meta.tag.structure.label.start.html meta.attribute.for.html punctuation.separator.key-value.html",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2443,7 +2751,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "text.html.cshtml meta.tag.inline.any.html string.quoted.double.html punctuation.definition.string.begin.html",
+		"t": "text.html.cshtml meta.tag.structure.label.start.html meta.attribute.for.html string.quoted.double.html punctuation.definition.string.begin.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.double.html: #0000FF",
@@ -2454,7 +2762,7 @@
 	},
 	{
 		"c": "text2",
-		"t": "text.html.cshtml meta.tag.inline.any.html string.quoted.double.html",
+		"t": "text.html.cshtml meta.tag.structure.label.start.html meta.attribute.for.html string.quoted.double.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.double.html: #0000FF",
@@ -2465,7 +2773,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "text.html.cshtml meta.tag.inline.any.html string.quoted.double.html punctuation.definition.string.end.html",
+		"t": "text.html.cshtml meta.tag.structure.label.start.html meta.attribute.for.html string.quoted.double.html punctuation.definition.string.end.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.double.html: #0000FF",
@@ -2476,7 +2784,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.cshtml meta.tag.inline.any.html punctuation.definition.tag.end.html",
+		"t": "text.html.cshtml meta.tag.structure.label.start.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -2498,7 +2806,7 @@
 	},
 	{
 		"c": "</",
-		"t": "text.html.cshtml meta.tag.inline.any.html punctuation.definition.tag.begin.html",
+		"t": "text.html.cshtml meta.tag.structure.label.end.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -2509,7 +2817,7 @@
 	},
 	{
 		"c": "label",
-		"t": "text.html.cshtml meta.tag.inline.any.html entity.name.tag.inline.any.html",
+		"t": "text.html.cshtml meta.tag.structure.label.end.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -2520,7 +2828,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.cshtml meta.tag.inline.any.html punctuation.definition.tag.end.html",
+		"t": "text.html.cshtml meta.tag.structure.label.end.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -2542,7 +2850,7 @@
 	},
 	{
 		"c": "<",
-		"t": "text.html.cshtml meta.tag.inline.any.html punctuation.definition.tag.begin.html",
+		"t": "text.html.cshtml meta.tag.structure.input.void.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -2553,7 +2861,7 @@
 	},
 	{
 		"c": "input",
-		"t": "text.html.cshtml meta.tag.inline.any.html entity.name.tag.inline.any.html",
+		"t": "text.html.cshtml meta.tag.structure.input.void.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -2564,7 +2872,7 @@
 	},
 	{
 		"c": " ",
-		"t": "text.html.cshtml meta.tag.inline.any.html",
+		"t": "text.html.cshtml meta.tag.structure.input.void.html",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2575,7 +2883,7 @@
 	},
 	{
 		"c": "type",
-		"t": "text.html.cshtml meta.tag.inline.any.html entity.other.attribute-name.html",
+		"t": "text.html.cshtml meta.tag.structure.input.void.html meta.attribute.type.html entity.other.attribute-name.html",
 		"r": {
 			"dark_plus": "entity.other.attribute-name: #9CDCFE",
 			"light_plus": "entity.other.attribute-name: #FF0000",
@@ -2586,7 +2894,7 @@
 	},
 	{
 		"c": "=",
-		"t": "text.html.cshtml meta.tag.inline.any.html",
+		"t": "text.html.cshtml meta.tag.structure.input.void.html meta.attribute.type.html punctuation.separator.key-value.html",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2597,7 +2905,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "text.html.cshtml meta.tag.inline.any.html string.quoted.double.html punctuation.definition.string.begin.html",
+		"t": "text.html.cshtml meta.tag.structure.input.void.html meta.attribute.type.html string.quoted.double.html punctuation.definition.string.begin.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.double.html: #0000FF",
@@ -2608,7 +2916,7 @@
 	},
 	{
 		"c": "text",
-		"t": "text.html.cshtml meta.tag.inline.any.html string.quoted.double.html",
+		"t": "text.html.cshtml meta.tag.structure.input.void.html meta.attribute.type.html string.quoted.double.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.double.html: #0000FF",
@@ -2619,7 +2927,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "text.html.cshtml meta.tag.inline.any.html string.quoted.double.html punctuation.definition.string.end.html",
+		"t": "text.html.cshtml meta.tag.structure.input.void.html meta.attribute.type.html string.quoted.double.html punctuation.definition.string.end.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.double.html: #0000FF",
@@ -2630,7 +2938,7 @@
 	},
 	{
 		"c": " ",
-		"t": "text.html.cshtml meta.tag.inline.any.html",
+		"t": "text.html.cshtml meta.tag.structure.input.void.html",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2641,7 +2949,7 @@
 	},
 	{
 		"c": "name",
-		"t": "text.html.cshtml meta.tag.inline.any.html entity.other.attribute-name.html",
+		"t": "text.html.cshtml meta.tag.structure.input.void.html meta.attribute.name.html entity.other.attribute-name.html",
 		"r": {
 			"dark_plus": "entity.other.attribute-name: #9CDCFE",
 			"light_plus": "entity.other.attribute-name: #FF0000",
@@ -2652,7 +2960,7 @@
 	},
 	{
 		"c": "=",
-		"t": "text.html.cshtml meta.tag.inline.any.html",
+		"t": "text.html.cshtml meta.tag.structure.input.void.html meta.attribute.name.html punctuation.separator.key-value.html",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2663,7 +2971,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "text.html.cshtml meta.tag.inline.any.html string.quoted.double.html punctuation.definition.string.begin.html",
+		"t": "text.html.cshtml meta.tag.structure.input.void.html meta.attribute.name.html string.quoted.double.html punctuation.definition.string.begin.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.double.html: #0000FF",
@@ -2674,7 +2982,7 @@
 	},
 	{
 		"c": "text2",
-		"t": "text.html.cshtml meta.tag.inline.any.html string.quoted.double.html",
+		"t": "text.html.cshtml meta.tag.structure.input.void.html meta.attribute.name.html string.quoted.double.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.double.html: #0000FF",
@@ -2685,7 +2993,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "text.html.cshtml meta.tag.inline.any.html string.quoted.double.html punctuation.definition.string.end.html",
+		"t": "text.html.cshtml meta.tag.structure.input.void.html meta.attribute.name.html string.quoted.double.html punctuation.definition.string.end.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.double.html: #0000FF",
@@ -2695,8 +3003,19 @@
 		}
 	},
 	{
-		"c": " />",
-		"t": "text.html.cshtml meta.tag.inline.any.html punctuation.definition.tag.end.html",
+		"c": " ",
+		"t": "text.html.cshtml meta.tag.structure.input.void.html",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": "/>",
+		"t": "text.html.cshtml meta.tag.structure.input.void.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -2718,7 +3037,7 @@
 	},
 	{
 		"c": "</",
-		"t": "text.html.cshtml meta.tag.block.any.html punctuation.definition.tag.begin.html",
+		"t": "text.html.cshtml meta.tag.structure.p.end.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -2729,7 +3048,7 @@
 	},
 	{
 		"c": "p",
-		"t": "text.html.cshtml meta.tag.block.any.html entity.name.tag.block.any.html",
+		"t": "text.html.cshtml meta.tag.structure.p.end.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -2740,7 +3059,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.cshtml meta.tag.block.any.html punctuation.definition.tag.end.html",
+		"t": "text.html.cshtml meta.tag.structure.p.end.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -2762,7 +3081,7 @@
 	},
 	{
 		"c": "<",
-		"t": "text.html.cshtml meta.tag.block.any.html punctuation.definition.tag.begin.html",
+		"t": "text.html.cshtml meta.tag.structure.p.start.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -2773,7 +3092,7 @@
 	},
 	{
 		"c": "p",
-		"t": "text.html.cshtml meta.tag.block.any.html entity.name.tag.block.any.html",
+		"t": "text.html.cshtml meta.tag.structure.p.start.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -2784,7 +3103,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.cshtml meta.tag.block.any.html punctuation.definition.tag.end.html",
+		"t": "text.html.cshtml meta.tag.structure.p.start.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -2795,7 +3114,7 @@
 	},
 	{
 		"c": "<",
-		"t": "text.html.cshtml meta.tag.inline.any.html punctuation.definition.tag.begin.html",
+		"t": "text.html.cshtml meta.tag.structure.input.void.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -2806,7 +3125,7 @@
 	},
 	{
 		"c": "input",
-		"t": "text.html.cshtml meta.tag.inline.any.html entity.name.tag.inline.any.html",
+		"t": "text.html.cshtml meta.tag.structure.input.void.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -2817,7 +3136,7 @@
 	},
 	{
 		"c": " ",
-		"t": "text.html.cshtml meta.tag.inline.any.html",
+		"t": "text.html.cshtml meta.tag.structure.input.void.html",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2828,7 +3147,7 @@
 	},
 	{
 		"c": "type",
-		"t": "text.html.cshtml meta.tag.inline.any.html entity.other.attribute-name.html",
+		"t": "text.html.cshtml meta.tag.structure.input.void.html meta.attribute.type.html entity.other.attribute-name.html",
 		"r": {
 			"dark_plus": "entity.other.attribute-name: #9CDCFE",
 			"light_plus": "entity.other.attribute-name: #FF0000",
@@ -2839,7 +3158,7 @@
 	},
 	{
 		"c": "=",
-		"t": "text.html.cshtml meta.tag.inline.any.html",
+		"t": "text.html.cshtml meta.tag.structure.input.void.html meta.attribute.type.html punctuation.separator.key-value.html",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2850,7 +3169,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "text.html.cshtml meta.tag.inline.any.html string.quoted.double.html punctuation.definition.string.begin.html",
+		"t": "text.html.cshtml meta.tag.structure.input.void.html meta.attribute.type.html string.quoted.double.html punctuation.definition.string.begin.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.double.html: #0000FF",
@@ -2861,7 +3180,7 @@
 	},
 	{
 		"c": "submit",
-		"t": "text.html.cshtml meta.tag.inline.any.html string.quoted.double.html",
+		"t": "text.html.cshtml meta.tag.structure.input.void.html meta.attribute.type.html string.quoted.double.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.double.html: #0000FF",
@@ -2872,7 +3191,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "text.html.cshtml meta.tag.inline.any.html string.quoted.double.html punctuation.definition.string.end.html",
+		"t": "text.html.cshtml meta.tag.structure.input.void.html meta.attribute.type.html string.quoted.double.html punctuation.definition.string.end.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.double.html: #0000FF",
@@ -2883,7 +3202,7 @@
 	},
 	{
 		"c": " ",
-		"t": "text.html.cshtml meta.tag.inline.any.html",
+		"t": "text.html.cshtml meta.tag.structure.input.void.html",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2894,7 +3213,7 @@
 	},
 	{
 		"c": "value",
-		"t": "text.html.cshtml meta.tag.inline.any.html entity.other.attribute-name.html",
+		"t": "text.html.cshtml meta.tag.structure.input.void.html meta.attribute.value.html entity.other.attribute-name.html",
 		"r": {
 			"dark_plus": "entity.other.attribute-name: #9CDCFE",
 			"light_plus": "entity.other.attribute-name: #FF0000",
@@ -2905,7 +3224,7 @@
 	},
 	{
 		"c": "=",
-		"t": "text.html.cshtml meta.tag.inline.any.html",
+		"t": "text.html.cshtml meta.tag.structure.input.void.html meta.attribute.value.html punctuation.separator.key-value.html",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2916,7 +3235,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "text.html.cshtml meta.tag.inline.any.html string.quoted.double.html punctuation.definition.string.begin.html",
+		"t": "text.html.cshtml meta.tag.structure.input.void.html meta.attribute.value.html string.quoted.double.html punctuation.definition.string.begin.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.double.html: #0000FF",
@@ -2927,7 +3246,7 @@
 	},
 	{
 		"c": "Add",
-		"t": "text.html.cshtml meta.tag.inline.any.html string.quoted.double.html",
+		"t": "text.html.cshtml meta.tag.structure.input.void.html meta.attribute.value.html string.quoted.double.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.double.html: #0000FF",
@@ -2938,7 +3257,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "text.html.cshtml meta.tag.inline.any.html string.quoted.double.html punctuation.definition.string.end.html",
+		"t": "text.html.cshtml meta.tag.structure.input.void.html meta.attribute.value.html string.quoted.double.html punctuation.definition.string.end.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.double.html: #0000FF",
@@ -2948,8 +3267,19 @@
 		}
 	},
 	{
-		"c": " />",
-		"t": "text.html.cshtml meta.tag.inline.any.html punctuation.definition.tag.end.html",
+		"c": " ",
+		"t": "text.html.cshtml meta.tag.structure.input.void.html",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": "/>",
+		"t": "text.html.cshtml meta.tag.structure.input.void.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -2960,7 +3290,7 @@
 	},
 	{
 		"c": "</",
-		"t": "text.html.cshtml meta.tag.block.any.html punctuation.definition.tag.begin.html",
+		"t": "text.html.cshtml meta.tag.structure.p.end.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -2971,7 +3301,7 @@
 	},
 	{
 		"c": "p",
-		"t": "text.html.cshtml meta.tag.block.any.html entity.name.tag.block.any.html",
+		"t": "text.html.cshtml meta.tag.structure.p.end.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -2982,7 +3312,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.cshtml meta.tag.block.any.html punctuation.definition.tag.end.html",
+		"t": "text.html.cshtml meta.tag.structure.p.end.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -3004,7 +3334,7 @@
 	},
 	{
 		"c": "</",
-		"t": "text.html.cshtml meta.tag.block.any.html punctuation.definition.tag.begin.html",
+		"t": "text.html.cshtml meta.tag.structure.form.end.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -3015,7 +3345,7 @@
 	},
 	{
 		"c": "form",
-		"t": "text.html.cshtml meta.tag.block.any.html entity.name.tag.block.any.html",
+		"t": "text.html.cshtml meta.tag.structure.form.end.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -3026,7 +3356,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.cshtml meta.tag.block.any.html punctuation.definition.tag.end.html",
+		"t": "text.html.cshtml meta.tag.structure.form.end.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -3036,7 +3366,7 @@
 		}
 	},
 	{
-		"c": "\t",
+		"c": "\t@* now we call the totalMessage method",
 		"t": "text.html.cshtml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
@@ -3047,47 +3377,14 @@
 		}
 	},
 	{
-		"c": "@*",
-		"t": "text.html.cshtml comment.block.cshtml punctuation.definition.comment.source.cshtml",
+		"c": "\t   (a multi line razor comment outside code) *@",
+		"t": "text.html.cshtml",
 		"r": {
-			"dark_plus": "comment: #608B4E",
-			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
-			"light_vs": "comment: #008000",
-			"hc_black": "comment: #7CA668"
-		}
-	},
-	{
-		"c": " now we call the totalMessage method",
-		"t": "text.html.cshtml comment.block.cshtml",
-		"r": {
-			"dark_plus": "comment: #608B4E",
-			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
-			"light_vs": "comment: #008000",
-			"hc_black": "comment: #7CA668"
-		}
-	},
-	{
-		"c": "\t   (a multi line razor comment outside code) ",
-		"t": "text.html.cshtml comment.block.cshtml",
-		"r": {
-			"dark_plus": "comment: #608B4E",
-			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
-			"light_vs": "comment: #008000",
-			"hc_black": "comment: #7CA668"
-		}
-	},
-	{
-		"c": "*@",
-		"t": "text.html.cshtml comment.block.cshtml punctuation.definition.comment.source.cshtml",
-		"r": {
-			"dark_plus": "comment: #608B4E",
-			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
-			"light_vs": "comment: #008000",
-			"hc_black": "comment: #7CA668"
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
 		}
 	},
 	{
@@ -3103,7 +3400,7 @@
 	},
 	{
 		"c": "<",
-		"t": "text.html.cshtml meta.tag.block.any.html punctuation.definition.tag.begin.html",
+		"t": "text.html.cshtml meta.tag.structure.p.start.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -3114,7 +3411,7 @@
 	},
 	{
 		"c": "p",
-		"t": "text.html.cshtml meta.tag.block.any.html entity.name.tag.block.any.html",
+		"t": "text.html.cshtml meta.tag.structure.p.start.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -3125,7 +3422,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.cshtml meta.tag.block.any.html punctuation.definition.tag.end.html",
+		"t": "text.html.cshtml meta.tag.structure.p.start.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -3136,7 +3433,7 @@
 	},
 	{
 		"c": "@totalMessage",
-		"t": "text.html.cshtml section.embedded.begin.cshtml keyword.control.cshtml",
+		"t": "text.html.cshtml meta.expression.implicit.cshtml keyword.control.cshtml",
 		"r": {
 			"dark_plus": "keyword.control: #C586C0",
 			"light_plus": "keyword.control: #AF00DB",
@@ -3146,36 +3443,14 @@
 		}
 	},
 	{
-		"c": "</",
-		"t": "text.html.cshtml meta.tag.block.any.html punctuation.definition.tag.begin.html",
+		"c": "</p>",
+		"t": "text.html.cshtml meta.expression.implicit.cshtml",
 		"r": {
-			"dark_plus": "punctuation.definition.tag: #808080",
-			"light_plus": "punctuation.definition.tag: #800000",
-			"dark_vs": "punctuation.definition.tag: #808080",
-			"light_vs": "punctuation.definition.tag: #800000",
-			"hc_black": "punctuation.definition.tag: #808080"
-		}
-	},
-	{
-		"c": "p",
-		"t": "text.html.cshtml meta.tag.block.any.html entity.name.tag.block.any.html",
-		"r": {
-			"dark_plus": "entity.name.tag: #569CD6",
-			"light_plus": "entity.name.tag: #800000",
-			"dark_vs": "entity.name.tag: #569CD6",
-			"light_vs": "entity.name.tag: #800000",
-			"hc_black": "entity.name.tag: #569CD6"
-		}
-	},
-	{
-		"c": ">",
-		"t": "text.html.cshtml meta.tag.block.any.html punctuation.definition.tag.end.html",
-		"r": {
-			"dark_plus": "punctuation.definition.tag: #808080",
-			"light_plus": "punctuation.definition.tag: #800000",
-			"dark_vs": "punctuation.definition.tag: #808080",
-			"light_vs": "punctuation.definition.tag: #800000",
-			"hc_black": "punctuation.definition.tag: #808080"
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
 		}
 	},
 	{
@@ -3191,7 +3466,7 @@
 	},
 	{
 		"c": "<",
-		"t": "text.html.cshtml meta.tag.block.any.html punctuation.definition.tag.begin.html",
+		"t": "text.html.cshtml meta.tag.structure.p.start.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -3202,7 +3477,7 @@
 	},
 	{
 		"c": "p",
-		"t": "text.html.cshtml meta.tag.block.any.html entity.name.tag.block.any.html",
+		"t": "text.html.cshtml meta.tag.structure.p.start.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -3213,7 +3488,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.cshtml meta.tag.block.any.html punctuation.definition.tag.end.html",
+		"t": "text.html.cshtml meta.tag.structure.p.start.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -3224,18 +3499,7 @@
 	},
 	{
 		"c": "@(",
-		"t": "text.html.cshtml punctuation.section.embedded.begin.cshtml",
-		"r": {
-			"dark_plus": "punctuation.section.embedded: #569CD6",
-			"light_plus": "punctuation.section.embedded: #0000FF",
-			"dark_vs": "punctuation.section.embedded: #569CD6",
-			"light_vs": "punctuation.section.embedded: #0000FF",
-			"hc_black": "punctuation.section.embedded: #569CD6"
-		}
-	},
-	{
-		"c": "totalMessage",
-		"t": "text.html.cshtml keyword.control.cshtml",
+		"t": "text.html.cshtml meta.expression.explicit.cshtml keyword.control.cshtml",
 		"r": {
 			"dark_plus": "keyword.control: #C586C0",
 			"light_plus": "keyword.control: #AF00DB",
@@ -3244,9 +3508,20 @@
 			"hc_black": "keyword.control: #C586C0"
 		}
 	},
+	{
+		"c": "totalMessage",
+		"t": "text.html.cshtml meta.expression.explicit.cshtml variable.other.readwrite.cs",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE"
+		}
+	},
 	{
 		"c": "+",
-		"t": "text.html.cshtml keyword.operator.arithmetic.cs",
+		"t": "text.html.cshtml meta.expression.explicit.cshtml keyword.operator.arithmetic.cs",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -3256,8 +3531,30 @@
 		}
 	},
 	{
-		"c": "\"!\"",
-		"t": "text.html.cshtml string.quoted.double.cshtml",
+		"c": "\"",
+		"t": "text.html.cshtml meta.expression.explicit.cshtml string.quoted.double.cs punctuation.definition.string.begin.cs",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178"
+		}
+	},
+	{
+		"c": "!",
+		"t": "text.html.cshtml meta.expression.explicit.cshtml string.quoted.double.cs",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178"
+		}
+	},
+	{
+		"c": "\"",
+		"t": "text.html.cshtml meta.expression.explicit.cshtml string.quoted.double.cs punctuation.definition.string.end.cs",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -3268,18 +3565,18 @@
 	},
 	{
 		"c": ")",
-		"t": "text.html.cshtml punctuation.section.embedded.begin.cshtml",
+		"t": "text.html.cshtml meta.expression.explicit.cshtml keyword.control.cshtml",
 		"r": {
-			"dark_plus": "punctuation.section.embedded: #569CD6",
-			"light_plus": "punctuation.section.embedded: #0000FF",
-			"dark_vs": "punctuation.section.embedded: #569CD6",
-			"light_vs": "punctuation.section.embedded: #0000FF",
-			"hc_black": "punctuation.section.embedded: #569CD6"
+			"dark_plus": "keyword.control: #C586C0",
+			"light_plus": "keyword.control: #AF00DB",
+			"dark_vs": "keyword.control: #569CD6",
+			"light_vs": "keyword.control: #0000FF",
+			"hc_black": "keyword.control: #C586C0"
 		}
 	},
 	{
 		"c": "</",
-		"t": "text.html.cshtml meta.tag.block.any.html punctuation.definition.tag.begin.html",
+		"t": "text.html.cshtml meta.tag.structure.p.end.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -3290,7 +3587,7 @@
 	},
 	{
 		"c": "p",
-		"t": "text.html.cshtml meta.tag.block.any.html entity.name.tag.block.any.html",
+		"t": "text.html.cshtml meta.tag.structure.p.end.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -3301,7 +3598,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.cshtml meta.tag.block.any.html punctuation.definition.tag.end.html",
+		"t": "text.html.cshtml meta.tag.structure.p.end.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -3322,8 +3619,8 @@
 		}
 	},
 	{
-		"c": "@domain",
-		"t": "text.html.cshtml section.embedded.begin.cshtml keyword.control.cshtml",
+		"c": "@domain.com",
+		"t": "text.html.cshtml meta.expression.implicit.cshtml keyword.control.cshtml",
 		"r": {
 			"dark_plus": "keyword.control: #C586C0",
 			"light_plus": "keyword.control: #AF00DB",
@@ -3332,31 +3629,9 @@
 			"hc_black": "keyword.control: #C586C0"
 		}
 	},
-	{
-		"c": ".",
-		"t": "text.html.cshtml",
-		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF"
-		}
-	},
-	{
-		"c": "com",
-		"t": "text.html.cshtml entity.name.tag.source.cshtml",
-		"r": {
-			"dark_plus": "entity.name.tag: #569CD6",
-			"light_plus": "entity.name.tag: #800000",
-			"dark_vs": "entity.name.tag: #569CD6",
-			"light_vs": "entity.name.tag: #800000",
-			"hc_black": "entity.name.tag: #569CD6"
-		}
-	},
 	{
 		"c": "</",
-		"t": "text.html.cshtml meta.tag.structure.any.html punctuation.definition.tag.html",
+		"t": "text.html.cshtml meta.tag.structure.body.end.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -3367,7 +3642,7 @@
 	},
 	{
 		"c": "body",
-		"t": "text.html.cshtml meta.tag.structure.any.html entity.name.tag.structure.any.html",
+		"t": "text.html.cshtml meta.tag.structure.body.end.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -3378,7 +3653,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.cshtml meta.tag.structure.any.html punctuation.definition.tag.html",
+		"t": "text.html.cshtml meta.tag.structure.body.end.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -3389,7 +3664,7 @@
 	},
 	{
 		"c": "</",
-		"t": "text.html.cshtml meta.tag.structure.any.html punctuation.definition.tag.html",
+		"t": "text.html.cshtml meta.tag.structure.html.end.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -3400,7 +3675,7 @@
 	},
 	{
 		"c": "html",
-		"t": "text.html.cshtml meta.tag.structure.any.html entity.name.tag.structure.any.html",
+		"t": "text.html.cshtml meta.tag.structure.html.end.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -3411,7 +3686,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.cshtml meta.tag.structure.any.html punctuation.definition.tag.html",
+		"t": "text.html.cshtml meta.tag.structure.html.end.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
diff --git a/extensions/ruby/package.json b/extensions/ruby/package.json
index 89bebf40aa5..98d66a891e4 100644
--- a/extensions/ruby/package.json
+++ b/extensions/ruby/package.json
@@ -14,7 +14,7 @@
 			"extensions": [ ".rb", ".rbx", ".rjs", ".gemspec", ".rake", ".ru", ".erb" ],
 			"filenames": [ "rakefile", "gemfile", "guardfile", "podfile", "capfile" ],
 			"aliases": [ "Ruby", "rb" ],
-			"firstLine": "^#!/.*\\bruby\\b",
+			"firstLine": "^#!\\s*/.*\\bruby\\b",
 			"configuration": "./language-configuration.json"
 		}],
 		"grammars": [{
diff --git a/extensions/ruby/test/colorize-results/test_rb.json b/extensions/ruby/test/colorize-results/test_rb.json
index 4a5fa89c87e..c53ee5970e2 100644
--- a/extensions/ruby/test/colorize-results/test_rb.json
+++ b/extensions/ruby/test/colorize-results/test_rb.json
@@ -3,9 +3,9 @@
 		"c": "#",
 		"t": "source.ruby comment.line.number-sign.ruby punctuation.definition.comment.ruby",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -14,9 +14,9 @@
 		"c": " encoding: utf-8",
 		"t": "source.ruby comment.line.number-sign.ruby",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -25,9 +25,9 @@
 		"c": "#",
 		"t": "source.ruby comment.line.number-sign.ruby punctuation.definition.comment.ruby",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -36,9 +36,9 @@
 		"c": " Code generated by Microsoft (R) AutoRest Code Generator 0.16.0.0",
 		"t": "source.ruby comment.line.number-sign.ruby",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -47,9 +47,9 @@
 		"c": "#",
 		"t": "source.ruby comment.line.number-sign.ruby punctuation.definition.comment.ruby",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -58,9 +58,9 @@
 		"c": " Changes may cause incorrect behavior and will be lost if the code is",
 		"t": "source.ruby comment.line.number-sign.ruby",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -69,9 +69,9 @@
 		"c": "#",
 		"t": "source.ruby comment.line.number-sign.ruby punctuation.definition.comment.ruby",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -80,9 +80,9 @@
 		"c": " regenerated.",
 		"t": "source.ruby comment.line.number-sign.ruby",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -179,9 +179,9 @@
 		"c": "#",
 		"t": "source.ruby comment.line.number-sign.ruby punctuation.definition.comment.ruby",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -201,9 +201,9 @@
 		"c": "#",
 		"t": "source.ruby comment.line.number-sign.ruby punctuation.definition.comment.ruby",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -212,9 +212,9 @@
 		"c": " A service client - single point of access to the REST API.",
 		"t": "source.ruby comment.line.number-sign.ruby",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -234,9 +234,9 @@
 		"c": "#",
 		"t": "source.ruby comment.line.number-sign.ruby punctuation.definition.comment.ruby",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -498,9 +498,9 @@
 		"c": "#",
 		"t": "source.ruby comment.line.number-sign.ruby punctuation.definition.comment.ruby",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -509,9 +509,9 @@
 		"c": " @return job_collections",
 		"t": "source.ruby comment.line.number-sign.ruby",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -586,9 +586,9 @@
 		"c": "#",
 		"t": "source.ruby comment.line.number-sign.ruby punctuation.definition.comment.ruby",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -608,9 +608,9 @@
 		"c": "#",
 		"t": "source.ruby comment.line.number-sign.ruby punctuation.definition.comment.ruby",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -619,9 +619,9 @@
 		"c": " Creates initializes a new instance of the SchedulerManagementClient class.",
 		"t": "source.ruby comment.line.number-sign.ruby",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -641,9 +641,9 @@
 		"c": "#",
 		"t": "source.ruby comment.line.number-sign.ruby punctuation.definition.comment.ruby",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -652,9 +652,9 @@
 		"c": " @param credentials [MsRest::ServiceClientCredentials] credentials to authorize HTTP requests made by the service client.",
 		"t": "source.ruby comment.line.number-sign.ruby",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -674,9 +674,9 @@
 		"c": "#",
 		"t": "source.ruby comment.line.number-sign.ruby punctuation.definition.comment.ruby",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -685,9 +685,9 @@
 		"c": " @param base_url [String] the base URI of the service.",
 		"t": "source.ruby comment.line.number-sign.ruby",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -707,9 +707,9 @@
 		"c": "#",
 		"t": "source.ruby comment.line.number-sign.ruby punctuation.definition.comment.ruby",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -718,9 +718,9 @@
 		"c": " @param options [Array] filters to be applied to the HTTP requests.",
 		"t": "source.ruby comment.line.number-sign.ruby",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -740,9 +740,9 @@
 		"c": "#",
 		"t": "source.ruby comment.line.number-sign.ruby punctuation.definition.comment.ruby",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
diff --git a/extensions/rust/language-configuration.json b/extensions/rust/language-configuration.json
index 34396c3121e..6f198f44f4e 100644
--- a/extensions/rust/language-configuration.json
+++ b/extensions/rust/language-configuration.json
@@ -20,5 +20,11 @@
 		["(", ")"],
 		["\"", "\""],
 		["'", "'"]
-	]
+	],
+	"folding": {
+		"markers": {
+			"start": "^\\s*//\\s*#?region\\b",
+			"end": "^\\s*//\\s*#?endregion\\b"
+		}
+	}
 }
diff --git a/extensions/scss/test/colorize-results/test_scss.json b/extensions/scss/test/colorize-results/test_scss.json
index 9528b311bae..497e8c13fd0 100644
--- a/extensions/scss/test/colorize-results/test_scss.json
+++ b/extensions/scss/test/colorize-results/test_scss.json
@@ -3,9 +3,9 @@
 		"c": "//",
 		"t": "source.css.scss comment.line.scss punctuation.definition.comment.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -14,9 +14,9 @@
 		"c": " snippets from the Sass documentation at http://sass-lang.com/",
 		"t": "source.css.scss comment.line.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -25,9 +25,9 @@
 		"c": "/*",
 		"t": "source.css.scss comment.block.scss punctuation.definition.comment.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -36,9 +36,9 @@
 		"c": " css stuff ",
 		"t": "source.css.scss comment.block.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -47,9 +47,9 @@
 		"c": "*/",
 		"t": "source.css.scss comment.block.scss punctuation.definition.comment.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -58,9 +58,9 @@
 		"c": "/*",
 		"t": "source.css.scss comment.block.scss punctuation.definition.comment.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -69,9 +69,9 @@
 		"c": " charset ",
 		"t": "source.css.scss comment.block.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -80,9 +80,9 @@
 		"c": "*/",
 		"t": "source.css.scss comment.block.scss punctuation.definition.comment.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -168,9 +168,9 @@
 		"c": "/*",
 		"t": "source.css.scss comment.block.scss punctuation.definition.comment.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -179,9 +179,9 @@
 		"c": " nested rules ",
 		"t": "source.css.scss comment.block.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -190,9 +190,9 @@
 		"c": "*/",
 		"t": "source.css.scss comment.block.scss punctuation.definition.comment.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -773,9 +773,9 @@
 		"c": "/*",
 		"t": "source.css.scss comment.block.scss punctuation.definition.comment.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -784,9 +784,9 @@
 		"c": " parent selector (&) ",
 		"t": "source.css.scss comment.block.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -795,9 +795,9 @@
 		"c": "*/",
 		"t": "source.css.scss comment.block.scss punctuation.definition.comment.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -1213,9 +1213,9 @@
 		"c": "/*",
 		"t": "source.css.scss comment.block.scss punctuation.definition.comment.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -1224,9 +1224,9 @@
 		"c": " nested properties ",
 		"t": "source.css.scss comment.block.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -1235,9 +1235,9 @@
 		"c": "*/",
 		"t": "source.css.scss comment.block.scss punctuation.definition.comment.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -1642,9 +1642,9 @@
 		"c": "/*",
 		"t": "source.css.scss comment.block.scss punctuation.definition.comment.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -1653,9 +1653,9 @@
 		"c": " nesting conflicts ",
 		"t": "source.css.scss comment.block.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -1664,9 +1664,9 @@
 		"c": "*/",
 		"t": "source.css.scss comment.block.scss punctuation.definition.comment.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -1785,9 +1785,9 @@
 		"c": "//",
 		"t": "source.css.scss meta.property-list.scss meta.property-list.scss comment.line.scss punctuation.definition.comment.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -1796,9 +1796,9 @@
 		"c": " properties",
 		"t": "source.css.scss meta.property-list.scss meta.property-list.scss comment.line.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -1994,9 +1994,9 @@
 		"c": "//",
 		"t": "source.css.scss meta.property-list.scss comment.line.scss punctuation.definition.comment.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -2005,9 +2005,9 @@
 		"c": " rule",
 		"t": "source.css.scss meta.property-list.scss comment.line.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -2093,9 +2093,9 @@
 		"c": "//",
 		"t": "source.css.scss meta.property-list.scss meta.property-list.scss comment.line.scss punctuation.definition.comment.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -2104,9 +2104,9 @@
 		"c": " selector",
 		"t": "source.css.scss meta.property-list.scss meta.property-list.scss comment.line.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -2258,9 +2258,9 @@
 		"c": "//",
 		"t": "source.css.scss meta.property-list.scss meta.property-value.scss comment.line.scss punctuation.definition.comment.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -2269,9 +2269,9 @@
 		"c": " selector",
 		"t": "source.css.scss meta.property-list.scss meta.property-value.scss comment.line.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -2368,9 +2368,9 @@
 		"c": "//",
 		"t": "source.css.scss comment.line.scss punctuation.definition.comment.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -2379,9 +2379,9 @@
 		"c": " rule",
 		"t": "source.css.scss comment.line.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -2401,9 +2401,9 @@
 		"c": "/*",
 		"t": "source.css.scss comment.block.scss punctuation.definition.comment.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -2412,9 +2412,9 @@
 		"c": " extended comment syntax ",
 		"t": "source.css.scss comment.block.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -2423,9 +2423,9 @@
 		"c": "*/",
 		"t": "source.css.scss comment.block.scss punctuation.definition.comment.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -2434,9 +2434,9 @@
 		"c": "/*",
 		"t": "source.css.scss comment.block.scss punctuation.definition.comment.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -2445,9 +2445,9 @@
 		"c": " This comment is",
 		"t": "source.css.scss comment.block.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -2456,9 +2456,9 @@
 		"c": " * several lines long.",
 		"t": "source.css.scss comment.block.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -2467,9 +2467,9 @@
 		"c": " * since it uses the CSS comment syntax,",
 		"t": "source.css.scss comment.block.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -2478,9 +2478,9 @@
 		"c": " * it will appear in the CSS output. ",
 		"t": "source.css.scss comment.block.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -2489,9 +2489,9 @@
 		"c": "*/",
 		"t": "source.css.scss comment.block.scss punctuation.definition.comment.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -2621,9 +2621,9 @@
 		"c": "//",
 		"t": "source.css.scss comment.line.scss punctuation.definition.comment.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -2632,9 +2632,9 @@
 		"c": " These comments are only one line long each.",
 		"t": "source.css.scss comment.line.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -2643,9 +2643,9 @@
 		"c": "//",
 		"t": "source.css.scss comment.line.scss punctuation.definition.comment.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -2654,9 +2654,9 @@
 		"c": " They won't appear in the CSS output,",
 		"t": "source.css.scss comment.line.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -2665,9 +2665,9 @@
 		"c": "//",
 		"t": "source.css.scss comment.line.scss punctuation.definition.comment.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -2676,9 +2676,9 @@
 		"c": " since they use the single-line comment syntax.",
 		"t": "source.css.scss comment.line.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -2808,9 +2808,9 @@
 		"c": "/*",
 		"t": "source.css.scss comment.block.scss punctuation.definition.comment.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -2819,9 +2819,9 @@
 		"c": " variables ",
 		"t": "source.css.scss comment.block.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -2830,9 +2830,9 @@
 		"c": "*/",
 		"t": "source.css.scss comment.block.scss punctuation.definition.comment.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -3776,9 +3776,9 @@
 		"c": "/*",
 		"t": "source.css.scss comment.block.scss punctuation.definition.comment.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -3787,9 +3787,9 @@
 		"c": " variable declaration with whitespaces ",
 		"t": "source.css.scss comment.block.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -3798,9 +3798,9 @@
 		"c": "*/",
 		"t": "source.css.scss comment.block.scss punctuation.definition.comment.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -3809,9 +3809,9 @@
 		"c": "//",
 		"t": "source.css.scss comment.line.scss punctuation.definition.comment.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -3820,9 +3820,9 @@
 		"c": " Set the color of your columns",
 		"t": "source.css.scss comment.line.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -4051,9 +4051,9 @@
 		"c": "/*",
 		"t": "source.css.scss comment.block.scss punctuation.definition.comment.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -4062,9 +4062,9 @@
 		"c": " operations",
 		"t": "source.css.scss comment.block.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -4073,9 +4073,9 @@
 		"c": "*/",
 		"t": "source.css.scss comment.block.scss punctuation.definition.comment.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -5382,9 +5382,9 @@
 		"c": "/*",
 		"t": "source.css.scss comment.block.scss punctuation.definition.comment.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -5393,9 +5393,9 @@
 		"c": " functions",
 		"t": "source.css.scss comment.block.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -5404,9 +5404,9 @@
 		"c": "*/",
 		"t": "source.css.scss comment.block.scss punctuation.definition.comment.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -6086,9 +6086,9 @@
 		"c": "/*",
 		"t": "source.css.scss comment.block.scss punctuation.definition.comment.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -6097,9 +6097,9 @@
 		"c": " @import ",
 		"t": "source.css.scss comment.block.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -6108,9 +6108,9 @@
 		"c": "*/",
 		"t": "source.css.scss comment.block.scss punctuation.definition.comment.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -6636,9 +6636,9 @@
 		"c": "/*",
 		"t": "source.css.scss comment.block.scss punctuation.definition.comment.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -6647,9 +6647,9 @@
 		"c": " @media ",
 		"t": "source.css.scss comment.block.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -6658,9 +6658,9 @@
 		"c": "*/",
 		"t": "source.css.scss comment.block.scss punctuation.definition.comment.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -7076,9 +7076,9 @@
 		"c": "/*",
 		"t": "source.css.scss comment.block.scss punctuation.definition.comment.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -7087,9 +7087,9 @@
 		"c": " @extend ",
 		"t": "source.css.scss comment.block.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -7098,9 +7098,9 @@
 		"c": "*/",
 		"t": "source.css.scss comment.block.scss punctuation.definition.comment.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -7989,9 +7989,9 @@
 		"c": "/*",
 		"t": "source.css.scss comment.block.scss punctuation.definition.comment.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -8000,9 +8000,9 @@
 		"c": " @debug and @warn ",
 		"t": "source.css.scss comment.block.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -8011,9 +8011,9 @@
 		"c": "*/",
 		"t": "source.css.scss comment.block.scss punctuation.definition.comment.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -9166,9 +9166,9 @@
 		"c": "/*",
 		"t": "source.css.scss comment.block.scss punctuation.definition.comment.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -9177,9 +9177,9 @@
 		"c": " control directives ",
 		"t": "source.css.scss comment.block.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -9188,9 +9188,9 @@
 		"c": "*/",
 		"t": "source.css.scss comment.block.scss punctuation.definition.comment.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -9199,9 +9199,9 @@
 		"c": "/*",
 		"t": "source.css.scss comment.block.scss punctuation.definition.comment.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -9210,9 +9210,9 @@
 		"c": " if statement ",
 		"t": "source.css.scss comment.block.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -9221,9 +9221,9 @@
 		"c": "*/",
 		"t": "source.css.scss comment.block.scss punctuation.definition.comment.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -9980,9 +9980,9 @@
 		"c": "/*",
 		"t": "source.css.scss comment.block.scss punctuation.definition.comment.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -9991,9 +9991,9 @@
 		"c": " if else statement ",
 		"t": "source.css.scss comment.block.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -10002,9 +10002,9 @@
 		"c": "*/",
 		"t": "source.css.scss comment.block.scss punctuation.definition.comment.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -10420,9 +10420,9 @@
 		"c": "/*",
 		"t": "source.css.scss comment.block.scss punctuation.definition.comment.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -10431,9 +10431,9 @@
 		"c": " for statement ",
 		"t": "source.css.scss comment.block.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -10442,9 +10442,9 @@
 		"c": "*/",
 		"t": "source.css.scss comment.block.scss punctuation.definition.comment.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -10849,9 +10849,9 @@
 		"c": "/*",
 		"t": "source.css.scss comment.block.scss punctuation.definition.comment.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -10860,9 +10860,9 @@
 		"c": " each statement ",
 		"t": "source.css.scss comment.block.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -10871,9 +10871,9 @@
 		"c": "*/",
 		"t": "source.css.scss comment.block.scss punctuation.definition.comment.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -11278,9 +11278,9 @@
 		"c": "/*",
 		"t": "source.css.scss meta.at-rule.each.scss comment.block.scss punctuation.definition.comment.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -11289,9 +11289,9 @@
 		"c": " while statement ",
 		"t": "source.css.scss meta.at-rule.each.scss comment.block.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -11300,9 +11300,9 @@
 		"c": "*/",
 		"t": "source.css.scss meta.at-rule.each.scss comment.block.scss punctuation.definition.comment.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -11817,9 +11817,9 @@
 		"c": "/*",
 		"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss comment.block.scss punctuation.definition.comment.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -11828,9 +11828,9 @@
 		"c": " function with controlstatements ",
 		"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss comment.block.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -11839,9 +11839,9 @@
 		"c": "*/",
 		"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss comment.block.scss punctuation.definition.comment.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -12752,9 +12752,9 @@
 		"c": "/*",
 		"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss comment.block.scss punctuation.definition.comment.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -12763,9 +12763,9 @@
 		"c": " @mixin simple",
 		"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss comment.block.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -12774,9 +12774,9 @@
 		"c": "*/",
 		"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss comment.block.scss punctuation.definition.comment.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -13412,9 +13412,9 @@
 		"c": "/*",
 		"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss comment.block.scss punctuation.definition.comment.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -13423,9 +13423,9 @@
 		"c": " mixin with parameters ",
 		"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss comment.block.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -13434,9 +13434,9 @@
 		"c": "*/",
 		"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss comment.block.scss punctuation.definition.comment.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -14039,9 +14039,9 @@
 		"c": "/*",
 		"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss comment.block.scss punctuation.definition.comment.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -14050,9 +14050,9 @@
 		"c": " mixin with varargs ",
 		"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss comment.block.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -14061,9 +14061,9 @@
 		"c": "*/",
 		"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss comment.block.scss punctuation.definition.comment.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -14787,9 +14787,9 @@
 		"c": "/*",
 		"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss comment.block.scss punctuation.definition.comment.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -14798,9 +14798,9 @@
 		"c": " include with varargs ",
 		"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss comment.block.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -14809,9 +14809,9 @@
 		"c": "*/",
 		"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss comment.block.scss punctuation.definition.comment.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -15458,9 +15458,9 @@
 		"c": "/*",
 		"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss comment.block.scss punctuation.definition.comment.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -15469,9 +15469,9 @@
 		"c": " include with body ",
 		"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss comment.block.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -15480,9 +15480,9 @@
 		"c": "*/",
 		"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss comment.block.scss punctuation.definition.comment.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -16129,9 +16129,9 @@
 		"c": "/*",
 		"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss comment.block.scss punctuation.definition.comment.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -16140,9 +16140,9 @@
 		"c": " attributes ",
 		"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss comment.block.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -16151,9 +16151,9 @@
 		"c": "*/",
 		"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss comment.block.scss punctuation.definition.comment.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -16382,9 +16382,9 @@
 		"c": "/*",
 		"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss comment.block.scss punctuation.definition.comment.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -16393,9 +16393,9 @@
 		"c": "page ",
 		"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss comment.block.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -16404,9 +16404,9 @@
 		"c": "*/",
 		"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss comment.block.scss punctuation.definition.comment.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -16646,9 +16646,9 @@
 		"c": "/*",
 		"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss comment.block.scss punctuation.definition.comment.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -16657,9 +16657,9 @@
 		"c": " missing semicolons ",
 		"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss comment.block.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -16668,9 +16668,9 @@
 		"c": "*/",
 		"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss comment.block.scss punctuation.definition.comment.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -17603,9 +17603,9 @@
 		"c": "/*",
 		"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss comment.block.scss punctuation.definition.comment.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -17614,9 +17614,9 @@
 		"c": " extend with interpolation variable ",
 		"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss comment.block.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -17625,9 +17625,9 @@
 		"c": "*/",
 		"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss comment.block.scss punctuation.definition.comment.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -18351,9 +18351,9 @@
 		"c": "/*",
 		"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss comment.block.scss punctuation.definition.comment.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -18362,9 +18362,9 @@
 		"c": " css3: @font face ",
 		"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss comment.block.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -18373,9 +18373,9 @@
 		"c": "*/",
 		"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss comment.block.scss punctuation.definition.comment.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -18637,9 +18637,9 @@
 		"c": "/*",
 		"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss comment.block.scss punctuation.definition.comment.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -18648,9 +18648,9 @@
 		"c": " rule names with variables ",
 		"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss comment.block.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -18659,9 +18659,9 @@
 		"c": "*/",
 		"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss comment.block.scss punctuation.definition.comment.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -19209,9 +19209,9 @@
 		"c": "/*",
 		"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss comment.block.scss punctuation.definition.comment.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -19220,9 +19220,9 @@
 		"c": " keyframes ",
 		"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss comment.block.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -19231,9 +19231,9 @@
 		"c": "*/",
 		"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss comment.block.scss punctuation.definition.comment.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -20518,9 +20518,9 @@
 		"c": "/*",
 		"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss comment.block.scss punctuation.definition.comment.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -20529,9 +20529,9 @@
 		"c": " string escaping ",
 		"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss comment.block.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -20540,9 +20540,9 @@
 		"c": "*/",
 		"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss comment.block.scss punctuation.definition.comment.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -20760,9 +20760,9 @@
 		"c": "/*",
 		"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss comment.block.scss punctuation.definition.comment.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -20771,9 +20771,9 @@
 		"c": " a comment ",
 		"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss comment.block.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -20782,9 +20782,9 @@
 		"c": "*/",
 		"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss comment.block.scss punctuation.definition.comment.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -20947,9 +20947,9 @@
 		"c": "/*",
 		"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss comment.block.scss punctuation.definition.comment.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -20958,9 +20958,9 @@
 		"c": " another comment ",
 		"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss comment.block.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -20969,9 +20969,9 @@
 		"c": "*/",
 		"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss comment.block.scss punctuation.definition.comment.scss",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
diff --git a/extensions/search-rg/.vscodeignore b/extensions/search-rg/.vscodeignore
index d257eda277b..fbe382ac81a 100644
--- a/extensions/search-rg/.vscodeignore
+++ b/extensions/search-rg/.vscodeignore
@@ -1,4 +1,5 @@
 build/**
 src/**
 test/**
-tsconfig.json
\ No newline at end of file
+tsconfig.json
+out/test/**
\ No newline at end of file
diff --git a/extensions/search-rg/package.json b/extensions/search-rg/package.json
index a1be44dffd5..db787871c9e 100644
--- a/extensions/search-rg/package.json
+++ b/extensions/search-rg/package.json
@@ -13,9 +13,9 @@
   },
   "categories": [],
   "dependencies": {
-    "vscode-extension-telemetry": "0.0.15",
-    "vscode-nls": "^3.2.1",
-    "vscode-ripgrep": "^1.0.0"
+    "vscode-extension-telemetry": "0.0.18",
+    "vscode-nls": "^4.0.0",
+    "vscode-ripgrep": "1.1.0"
   },
   "devDependencies": {
     "@types/node": "8.0.33",
@@ -24,6 +24,7 @@
   },
   "scripts": {},
   "activationEvents": [
+    "onSearch:file",
     "*"
   ],
   "main": "./out/extension",
diff --git a/extensions/search-rg/src/extension.ts b/extensions/search-rg/src/extension.ts
index a2e4611ffef..9c725266796 100644
--- a/extensions/search-rg/src/extension.ts
+++ b/extensions/search-rg/src/extension.ts
@@ -4,28 +4,53 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as vscode from 'vscode';
-import { RipgrepTextSearchEngine } from './ripgrepTextSearch';
 import { RipgrepFileSearchEngine } from './ripgrepFileSearch';
+import { RipgrepTextSearchEngine } from './ripgrepTextSearch';
 
 export function activate(): void {
 	if (vscode.workspace.getConfiguration('searchRipgrep').get('enable')) {
 		const outputChannel = vscode.window.createOutputChannel('search-rg');
+
 		const provider = new RipgrepSearchProvider(outputChannel);
-		vscode.workspace.registerSearchProvider('file', provider);
+		vscode.workspace.registerFileIndexProvider('file', provider);
+		vscode.workspace.registerTextSearchProvider('file', provider);
 	}
 }
 
-class RipgrepSearchProvider implements vscode.SearchProvider {
+type SearchEngine = RipgrepFileSearchEngine | RipgrepTextSearchEngine;
+
+class RipgrepSearchProvider implements vscode.FileIndexProvider, vscode.TextSearchProvider {
+	private inProgress: Set<SearchEngine> = new Set();
+
 	constructor(private outputChannel: vscode.OutputChannel) {
+		process.once('exit', () => this.dispose());
 	}
 
 	provideTextSearchResults(query: vscode.TextSearchQuery, options: vscode.TextSearchOptions, progress: vscode.Progress<vscode.TextSearchResult>, token: vscode.CancellationToken): Thenable<void> {
 		const engine = new RipgrepTextSearchEngine(this.outputChannel);
-		return engine.provideTextSearchResults(query, options, progress, token);
+		return this.withEngine(engine, () => engine.provideTextSearchResults(query, options, progress, token));
 	}
 
-	provideFileSearchResults(options: vscode.SearchOptions, progress: vscode.Progress<string>, token: vscode.CancellationToken): Thenable<void> {
+	provideFileIndex(options: vscode.FileSearchOptions, token: vscode.CancellationToken): Thenable<vscode.Uri[]> {
 		const engine = new RipgrepFileSearchEngine(this.outputChannel);
-		return engine.provideFileSearchResults(options, progress, token);
+
+		const results: vscode.Uri[] = [];
+		const onResult = relativePathMatch => {
+			results.push(vscode.Uri.file(options.folder.fsPath + '/' + relativePathMatch));
+		};
+
+		return this.withEngine(engine, () => engine.provideFileSearchResults(options, { report: onResult }, token))
+			.then(() => results);
+	}
+
+	private withEngine(engine: SearchEngine, fn: () => Thenable<void>): Thenable<void> {
+		this.inProgress.add(engine);
+		return fn().then(() => {
+			this.inProgress.delete(engine);
+		});
+	}
+
+	private dispose() {
+		this.inProgress.forEach(engine => engine.cancel());
 	}
 }
\ No newline at end of file
diff --git a/extensions/search-rg/src/ripgrep.ts b/extensions/search-rg/src/ripgrep.ts
new file mode 100644
index 00000000000..cb3878ee031
--- /dev/null
+++ b/extensions/search-rg/src/ripgrep.ts
@@ -0,0 +1,10 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+import { rgPath } from 'vscode-ripgrep';
+
+export { rgPath };
\ No newline at end of file
diff --git a/extensions/search-rg/src/ripgrepFileSearch.ts b/extensions/search-rg/src/ripgrepFileSearch.ts
index eca337d9691..de95a2fe39f 100644
--- a/extensions/search-rg/src/ripgrepFileSearch.ts
+++ b/extensions/search-rg/src/ripgrepFileSearch.ts
@@ -7,10 +7,10 @@ import * as cp from 'child_process';
 import { Readable } from 'stream';
 import { NodeStringDecoder, StringDecoder } from 'string_decoder';
 import * as vscode from 'vscode';
-import { rgPath } from 'vscode-ripgrep';
 import { normalizeNFC, normalizeNFD } from './normalization';
-import { anchorGlob } from './ripgrepHelpers';
+import { rgPath } from './ripgrep';
 import { rgErrorMsgForDisplay } from './ripgrepTextSearch';
+import { anchorGlob } from './utils';
 
 const isMac = process.platform === 'darwin';
 
@@ -19,18 +19,18 @@ const rgDiskPath = rgPath.replace(/\bnode_modules\.asar\b/, 'node_modules.asar.u
 
 export class RipgrepFileSearchEngine {
 	private rgProc: cp.ChildProcess;
-	private killRgProcFn: (code?: number) => void;
+	private isDone: boolean;
 
-	constructor(private outputChannel: vscode.OutputChannel) {
-		this.killRgProcFn = () => this.rgProc && this.rgProc.kill();
-		process.once('exit', this.killRgProcFn);
+	constructor(private outputChannel: vscode.OutputChannel) { }
+
+	cancel() {
+		this.isDone = true;
+		if (this.rgProc) {
+			this.rgProc.kill();
+		}
 	}
 
-	private dispose() {
-		process.removeListener('exit', this.killRgProcFn);
-	}
-
-	provideFileSearchResults(options: vscode.SearchOptions, progress: vscode.Progress<string>, token: vscode.CancellationToken): Thenable<void> {
+	provideFileSearchResults(options: vscode.FileSearchOptions, progress: vscode.Progress<string>, token: vscode.CancellationToken): Thenable<void> {
 		this.outputChannel.appendLine(`provideFileSearchResults ${JSON.stringify({
 			...options,
 			...{
@@ -39,12 +39,7 @@ export class RipgrepFileSearchEngine {
 		})}`);
 
 		return new Promise((resolve, reject) => {
-			let isDone = false;
-			const cancel = () => {
-				isDone = true;
-				this.rgProc.kill();
-			};
-			token.onCancellationRequested(cancel);
+			token.onCancellationRequested(() => this.cancel());
 
 			const rgArgs = getRgArgs(options);
 
@@ -93,7 +88,7 @@ export class RipgrepFileSearchEngine {
 				});
 
 				if (last) {
-					if (isDone) {
+					if (this.isDone) {
 						resolve();
 					} else {
 						// Trigger last result
@@ -106,40 +101,46 @@ export class RipgrepFileSearchEngine {
 					}
 				}
 			});
-		}).then(
-			() => this.dispose(),
-			err => {
-				this.dispose();
-				return Promise.reject(err);
-			});
+		});
 	}
 
 	private collectStdout(cmd: cp.ChildProcess, cb: (err: Error, stdout?: string, last?: boolean) => void): void {
-		let done = (err: Error, stdout?: string, last?: boolean) => {
+		let onData = (err: Error, stdout?: string, last?: boolean) => {
 			if (err || last) {
-				done = () => { };
+				onData = () => { };
 			}
 
 			cb(err, stdout, last);
 		};
 
-		this.forwardData(cmd.stdout, done);
-		const stderr = this.collectData(cmd.stderr);
-
 		let gotData = false;
-		cmd.stdout.once('data', () => gotData = true);
+		if (cmd.stdout) {
+			// Should be non-null, but #38195
+			this.forwardData(cmd.stdout, onData);
+			cmd.stdout.once('data', () => gotData = true);
+		} else {
+			this.outputChannel.appendLine('stdout is null');
+		}
+
+		let stderr: Buffer[];
+		if (cmd.stderr) {
+			// Should be non-null, but #38195
+			stderr = this.collectData(cmd.stderr);
+		} else {
+			this.outputChannel.appendLine('stderr is null');
+		}
 
 		cmd.on('error', (err: Error) => {
-			done(err);
+			onData(err);
 		});
 
 		cmd.on('close', (code: number) => {
 			// ripgrep returns code=1 when no results are found
 			let stderrText, displayMsg: string;
 			if (!gotData && (stderrText = this.decodeData(stderr)) && (displayMsg = rgErrorMsgForDisplay(stderrText))) {
-				done(new Error(`command failed with error code ${code}: ${displayMsg}`));
+				onData(new Error(`command failed with error code ${code}: ${displayMsg}`));
 			} else {
-				done(null, '', true);
+				onData(null, '', true);
 			}
 		});
 	}
@@ -203,6 +204,9 @@ function getRgArgs(options: vscode.FileSearchOptions): string[] {
 		args.push('--follow');
 	}
 
+	args.push('--no-config');
+	args.push('--no-ignore-global');
+
 	// Folder to search
 	args.push('--');
 
diff --git a/extensions/search-rg/src/ripgrepHelpers.ts b/extensions/search-rg/src/ripgrepHelpers.ts
deleted file mode 100644
index 5487be750a0..00000000000
--- a/extensions/search-rg/src/ripgrepHelpers.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-'use strict';
-
-import * as vscode from 'vscode';
-
-import * as path from 'path';
-
-export function fixDriveC(_path: string): string {
-	const root = path.parse(_path).root;
-	return root.toLowerCase() === 'c:/' ?
-		_path.replace(/^c:[/\\]/i, '/') :
-		_path;
-}
-
-export function anchorGlob(glob: string): string {
-	return glob.startsWith('**') || glob.startsWith('/') ? glob : `/${glob}`;
-}
diff --git a/extensions/search-rg/src/ripgrepTextSearch.ts b/extensions/search-rg/src/ripgrepTextSearch.ts
index b617035268d..6853cec9deb 100644
--- a/extensions/search-rg/src/ripgrepTextSearch.ts
+++ b/extensions/search-rg/src/ripgrepTextSearch.ts
@@ -7,12 +7,11 @@
 
 import * as cp from 'child_process';
 import { EventEmitter } from 'events';
+import * as path from 'path';
 import { NodeStringDecoder, StringDecoder } from 'string_decoder';
 import * as vscode from 'vscode';
-import { rgPath } from 'vscode-ripgrep';
-import { anchorGlob } from './ripgrepHelpers';
-
-
+import { rgPath } from './ripgrep';
+import { anchorGlob, createTextSearchResult } from './utils';
 
 // If vscode-ripgrep is in an .asar file, then the binary is unpacked.
 const rgDiskPath = rgPath.replace(/\bnode_modules\.asar\b/, 'node_modules.asar.unpacked');
@@ -23,12 +22,21 @@ const MAX_TEXT_RESULTS = 10000;
 export class RipgrepTextSearchEngine {
 	private isDone = false;
 	private rgProc: cp.ChildProcess;
-	private killRgProcFn: (code?: number) => void;
 
 	private ripgrepParser: RipgrepParser;
 
-	constructor(private outputChannel: vscode.OutputChannel) {
-		this.killRgProcFn = () => this.rgProc && this.rgProc.kill();
+	constructor(private outputChannel: vscode.OutputChannel) { }
+
+	cancel() {
+		this.isDone = true;
+
+		if (this.rgProc) {
+			this.rgProc.kill();
+		}
+
+		if (this.ripgrepParser) {
+			this.ripgrepParser.cancel();
+		}
 	}
 
 	provideTextSearchResults(query: vscode.TextSearchQuery, options: vscode.TextSearchOptions, progress: vscode.Progress<vscode.TextSearchResult>, token: vscode.CancellationToken): Thenable<void> {
@@ -40,12 +48,7 @@ export class RipgrepTextSearchEngine {
 		})}`);
 
 		return new Promise((resolve, reject) => {
-			const cancel = () => {
-				this.isDone = true;
-				this.ripgrepParser.cancel();
-				this.rgProc.kill();
-			};
-			token.onCancellationRequested(cancel);
+			token.onCancellationRequested(() => this.cancel());
 
 			const rgArgs = getRgArgs(query, options);
 
@@ -57,7 +60,6 @@ export class RipgrepTextSearchEngine {
 			this.outputChannel.appendLine(`rg ${escapedArgs}\n - cwd: ${cwd}`);
 
 			this.rgProc = cp.spawn(rgDiskPath, rgArgs, { cwd });
-			process.once('exit', this.killRgProcFn);
 			this.rgProc.on('error', e => {
 				console.error(e);
 				this.outputChannel.append('Error: ' + (e && e.message));
@@ -65,14 +67,14 @@ export class RipgrepTextSearchEngine {
 			});
 
 			let gotResult = false;
-			this.ripgrepParser = new RipgrepParser(MAX_TEXT_RESULTS, cwd);
+			this.ripgrepParser = new RipgrepParser(MAX_TEXT_RESULTS, cwd, options.previewOptions);
 			this.ripgrepParser.on('result', (match: vscode.TextSearchResult) => {
 				gotResult = true;
 				progress.report(match);
 			});
 
 			this.ripgrepParser.on('hitLimit', () => {
-				cancel();
+				this.cancel();
 			});
 
 			this.rgProc.stdout.on('data', data => {
@@ -93,7 +95,6 @@ export class RipgrepTextSearchEngine {
 				this.outputChannel.appendLine(gotData ? 'Got data from stdout' : 'No data from stdout');
 				this.outputChannel.appendLine(gotResult ? 'Got result from parser' : 'No result from parser');
 				this.outputChannel.appendLine('');
-				process.removeListener('exit', this.killRgProcFn);
 				if (this.isDone) {
 					resolve();
 				} else {
@@ -118,7 +119,7 @@ export class RipgrepTextSearchEngine {
  * "failed" when a fatal error was produced.
  */
 export function rgErrorMsgForDisplay(msg: string): string | undefined {
-	const firstLine = msg.split('\n')[0];
+	const firstLine = msg.split('\n')[0].trim();
 
 	if (firstLine.startsWith('Error parsing regex')) {
 		return firstLine;
@@ -130,8 +131,13 @@ export function rgErrorMsgForDisplay(msg: string): string | undefined {
 		return firstLine.charAt(0).toUpperCase() + firstLine.substr(1);
 	}
 
+	if (firstLine === `Literal '\\n' not allowed.`) {
+		// I won't localize this because none of the Ripgrep error messages are localized
+		return `Literal '\\n' currently not supported`;
+	}
+
 	if (firstLine.startsWith('Literal ')) {
-		// e.g. "Literal \n not allowed"
+		// Other unsupported chars
 		return firstLine;
 	}
 
@@ -154,7 +160,7 @@ export class RipgrepParser extends EventEmitter {
 
 	private numResults = 0;
 
-	constructor(private maxResults: number, private rootFolder: string) {
+	constructor(private maxResults: number, private rootFolder: string, private previewOptions?: vscode.TextSearchPreviewOptions) {
 		super();
 		this.stringDecoder = new StringDecoder();
 	}
@@ -283,19 +289,11 @@ export class RipgrepParser extends EventEmitter {
 		realTextParts.push(chunk);
 
 		// Get full real text line without color codes
-		const preview = realTextParts.join('');
+		const previewText = realTextParts.join('');
 
+		const uri = vscode.Uri.file(path.join(this.rootFolder, this.currentFile));
 		lineMatches
-			.map(range => {
-				return <vscode.TextSearchResult>{
-					path: this.currentFile,
-					range,
-					preview: {
-						text: preview,
-						match: new vscode.Range(0, range.start.character, 0, range.end.character)
-					}
-				};
-			})
+			.map(range => createTextSearchResult(uri, previewText, range, this.previewOptions))
 			.forEach(match => this.onResult(match));
 
 		if (hitLimit) {
@@ -360,6 +358,7 @@ function getRgArgs(query: vscode.TextSearchQuery, options: vscode.TextSearchOpti
 	}
 
 	args.push('--no-config');
+	args.push('--no-ignore-global');
 
 	// Folder to search
 	args.push('--');
diff --git a/extensions/search-rg/src/test/searchrg.test.ts b/extensions/search-rg/src/test/searchrg.test.ts
new file mode 100644
index 00000000000..af55abf9b0f
--- /dev/null
+++ b/extensions/search-rg/src/test/searchrg.test.ts
@@ -0,0 +1,132 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+import 'mocha';
+import * as assert from 'assert';
+import * as vscode from 'vscode';
+import * as path from 'path';
+import { createTextSearchResult } from '../utils';
+
+function createOneLineRange(lineNumber: number, startCol: number, endCol: number): vscode.Range {
+	return new vscode.Range(lineNumber, startCol, lineNumber, endCol);
+}
+
+const uri = vscode.Uri.file('/foo/bar');
+
+suite('search-rg', () => {
+	const previewOptions1: vscode.TextSearchPreviewOptions = {
+		leadingChars: 10,
+		maxLines: 1,
+		totalChars: 100
+	};
+
+	test('empty', () => {
+		assert.deepEqual(
+			createTextSearchResult(uri, '', createOneLineRange(5, 0, 0)),
+			<vscode.TextSearchResult>{
+				preview: {
+					text: '',
+					match: createOneLineRange(0, 0, 0)
+				},
+				range: createOneLineRange(5, 0, 0),
+				uri
+			});
+
+		assert.deepEqual(
+			createTextSearchResult(uri, '', createOneLineRange(5, 0, 0), previewOptions1),
+			<vscode.TextSearchResult>{
+				preview: {
+					text: '',
+					match: createOneLineRange(0, 0, 0)
+				},
+				range: createOneLineRange(5, 0, 0),
+				uri
+			});
+	});
+
+	test('short', () => {
+		assert.deepEqual(
+			createTextSearchResult(uri, 'foo bar', createOneLineRange(5, 4, 7)),
+			<vscode.TextSearchResult>{
+				preview: {
+					text: 'foo bar',
+					match: createOneLineRange(0, 4, 7)
+				},
+				range: createOneLineRange(5, 4, 7),
+				uri
+			});
+
+		assert.deepEqual(
+			createTextSearchResult(uri, 'foo bar', createOneLineRange(5, 4, 7), previewOptions1),
+			<vscode.TextSearchResult>{
+				preview: {
+					text: 'foo bar',
+					match: createOneLineRange(0, 4, 7)
+				},
+				range: createOneLineRange(5, 4, 7),
+				uri
+			});
+	});
+
+	test('leading', () => {
+		assert.deepEqual(
+			createTextSearchResult(uri, 'long text very long text foo', createOneLineRange(5, 25, 28), previewOptions1),
+			<vscode.TextSearchResult>{
+				preview: {
+					text: 'long text foo',
+					match: createOneLineRange(0, 10, 13)
+				},
+				range: createOneLineRange(5, 25, 28),
+				uri
+			});
+	});
+
+	test('trailing', () => {
+		assert.deepEqual(
+			createTextSearchResult(uri, 'foo long text very long text long text very long text long text very long text long text very long text long text very long text', createOneLineRange(5, 0, 3), previewOptions1),
+			<vscode.TextSearchResult>{
+				preview: {
+					text: 'foo long text very long text long text very long text long text very long text long text very long t',
+					match: createOneLineRange(0, 0, 3)
+				},
+				range: createOneLineRange(5, 0, 3),
+				uri
+			});
+	});
+
+	test('middle', () => {
+		assert.deepEqual(
+			createTextSearchResult(uri, 'long text very long text long foo text very long text long text very long text long text very long text long text very long text', createOneLineRange(5, 30, 33), previewOptions1),
+			<vscode.TextSearchResult>{
+				preview: {
+					text: 'text long foo text very long text long text very long text long text very long text long text very l',
+					match: createOneLineRange(0, 10, 13)
+				},
+				range: createOneLineRange(5, 30, 33),
+				uri
+			});
+	});
+
+	test('truncating match', () => {
+		const previewOptions: vscode.TextSearchPreviewOptions = {
+			leadingChars: 4,
+			maxLines: 1,
+			totalChars: 5
+		};
+
+		assert.deepEqual(
+			createTextSearchResult(uri, 'foo bar', createOneLineRange(0, 4, 7), previewOptions),
+			<vscode.TextSearchResult>{
+				preview: {
+					text: 'foo b',
+					match: createOneLineRange(0, 4, 5)
+				},
+				range: createOneLineRange(0, 4, 7),
+				uri
+			});
+	});
+});
\ No newline at end of file
diff --git a/extensions/search-rg/src/utils.ts b/extensions/search-rg/src/utils.ts
new file mode 100644
index 00000000000..5b65f3a598a
--- /dev/null
+++ b/extensions/search-rg/src/utils.ts
@@ -0,0 +1,45 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+import * as path from 'path';
+import * as vscode from 'vscode';
+
+export function fixDriveC(_path: string): string {
+	const root = path.parse(_path).root;
+	return root.toLowerCase() === 'c:/' ?
+		_path.replace(/^c:[/\\]/i, '/') :
+		_path;
+}
+
+export function anchorGlob(glob: string): string {
+	return glob.startsWith('**') || glob.startsWith('/') ? glob : `/${glob}`;
+}
+
+export function createTextSearchResult(uri: vscode.Uri, fullText: string, range: vscode.Range, previewOptions?: vscode.TextSearchPreviewOptions): vscode.TextSearchResult {
+	let preview: vscode.TextSearchResultPreview;
+	if (previewOptions) {
+		const previewStart = Math.max(range.start.character - previewOptions.leadingChars, 0);
+		const previewEnd = previewOptions.totalChars + previewStart;
+		const endOfMatchRangeInPreview = Math.min(previewEnd, range.end.character - previewStart);
+
+		preview = {
+			text: fullText.substring(previewStart, previewEnd),
+			match: new vscode.Range(0, range.start.character - previewStart, 0, endOfMatchRangeInPreview)
+		};
+	} else {
+		preview = {
+			text: fullText,
+			match: new vscode.Range(0, range.start.character, 0, range.end.character)
+		};
+	}
+
+	return <vscode.TextSearchResult>{
+		uri,
+		range,
+		preview
+	};
+}
diff --git a/extensions/search-rg/yarn.lock b/extensions/search-rg/yarn.lock
index d9ab440ec66..453a2ba6ef4 100644
--- a/extensions/search-rg/yarn.lock
+++ b/extensions/search-rg/yarn.lock
@@ -1539,19 +1539,19 @@ vinyl@^2.0.1, vinyl@^2.0.2:
     remove-trailing-separator "^1.0.1"
     replace-ext "^1.0.0"
 
-vscode-extension-telemetry@0.0.15:
-  version "0.0.15"
-  resolved "https://registry.yarnpkg.com/vscode-extension-telemetry/-/vscode-extension-telemetry-0.0.15.tgz#685c32f3b67e8fb85ba689c1d7f88ff90ff87856"
+vscode-extension-telemetry@0.0.18:
+  version "0.0.18"
+  resolved "https://registry.yarnpkg.com/vscode-extension-telemetry/-/vscode-extension-telemetry-0.0.18.tgz#602ba20d8c71453aa34533a291e7638f6e5c0327"
   dependencies:
     applicationinsights "1.0.1"
 
-vscode-nls@^3.2.1:
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.2.tgz#3817eca5b985c2393de325197cf4e15eb2aa5350"
+vscode-nls@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-4.0.0.tgz#4001c8a6caba5cedb23a9c5ce1090395c0e44002"
 
-vscode-ripgrep@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/vscode-ripgrep/-/vscode-ripgrep-1.0.0.tgz#99d81e96cc2437a1bc20f28facbcca72516e9c73"
+vscode-ripgrep@1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/vscode-ripgrep/-/vscode-ripgrep-1.1.0.tgz#93c1e39d88342ee1b15530a12898ce930d511948"
 
 vscode@^1.1.17:
   version "1.1.17"
diff --git a/extensions/shared.webpack.config.js b/extensions/shared.webpack.config.js
new file mode 100644
index 00000000000..7f5bbae55b1
--- /dev/null
+++ b/extensions/shared.webpack.config.js
@@ -0,0 +1,74 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+//@ts-check
+/** @typedef {import('webpack').Configuration} WebpackConfig **/
+
+'use strict';
+
+const path = require('path');
+const merge = require('merge-options');
+const CopyWebpackPlugin = require('copy-webpack-plugin');
+
+
+module.exports = function withDefaults(/**@type WebpackConfig*/extConfig) {
+
+	/** @type WebpackConfig */
+	let defaultConfig = {
+		mode: 'none', // this leaves the source code as close as possible to the original (when packaging we set this to 'production')
+		target: 'node', // extensions run in a node context
+		node: {
+			__dirname: false // leave the __dirname-behaviour intact
+		},
+		resolve: {
+			mainFields: ['main'], // prefer the main-entry of package.json files
+			extensions: ['.ts', '.js'] // support ts-files and js-files
+		},
+		module: {
+			rules: [{
+				test: /\.ts$/,
+				exclude: /node_modules/,
+				use: [{
+					// vscode-nls-dev loader:
+					// * rewrite nls-calls
+					loader: 'vscode-nls-dev/lib/webpack-loader',
+					options: {
+						base: path.join(extConfig.context, 'src')
+					}
+				}, {
+					// configure TypeScript loader:
+					// * enable sources maps for end-to-end source maps
+					loader: 'ts-loader',
+					options: {
+						compilerOptions: {
+							"sourceMap": true,
+						}
+					}
+				}]
+			}]
+		},
+		externals: {
+			'vscode': 'commonjs vscode', // ignored because it doesn't exist
+
+			"vscode-extension-telemetry": 'commonjs vscode-extension-telemetry', // commonly used
+		},
+		output: {
+			// all output goes into `dist`.
+			// packaging depends on that and this must always be like it
+			filename: '[name].js',
+			path: path.join(extConfig.context, 'dist'),
+			libraryTarget: "commonjs",
+		},
+		// yes, really source maps
+		devtool: 'source-map',
+		plugins: [
+			new CopyWebpackPlugin([
+				{ from: './out/**/*', to: '.', ignore: ['*.js', '*.js.map'], flatten: true }
+			])
+		],
+	};
+
+	return merge(defaultConfig, extConfig);
+};
diff --git a/extensions/shellscript/test/colorize-results/test_sh.json b/extensions/shellscript/test/colorize-results/test_sh.json
index 36a9ce993e4..6760e596443 100644
--- a/extensions/shellscript/test/colorize-results/test_sh.json
+++ b/extensions/shellscript/test/colorize-results/test_sh.json
@@ -3,9 +3,9 @@
 		"c": "#!",
 		"t": "source.shell comment.line.number-sign.shebang.shell punctuation.definition.comment.shebang.shell",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -14,9 +14,9 @@
 		"c": "/usr/bin/env bash",
 		"t": "source.shell comment.line.number-sign.shebang.shell",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -1246,9 +1246,9 @@
 		"c": "#",
 		"t": "source.shell meta.function.shell meta.scope.group.shell comment.line.number-sign.shell punctuation.definition.comment.shell",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -1257,9 +1257,9 @@
 		"c": " Node modules",
 		"t": "source.shell meta.function.shell meta.scope.group.shell comment.line.number-sign.shell",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -1334,9 +1334,9 @@
 		"c": "#",
 		"t": "source.shell meta.function.shell meta.scope.group.shell comment.line.number-sign.shell punctuation.definition.comment.shell",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -1345,9 +1345,9 @@
 		"c": " Configuration",
 		"t": "source.shell meta.function.shell meta.scope.group.shell comment.line.number-sign.shell",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -1400,9 +1400,9 @@
 		"c": "#",
 		"t": "source.shell meta.function.shell meta.scope.group.shell comment.line.number-sign.shell punctuation.definition.comment.shell",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -1411,9 +1411,9 @@
 		"c": " Launch Code",
 		"t": "source.shell meta.function.shell meta.scope.group.shell comment.line.number-sign.shell",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
diff --git a/extensions/theme-defaults/themes/dark_defaults.json b/extensions/theme-defaults/themes/dark_defaults.json
index cb9e20066b5..87b37508468 100644
--- a/extensions/theme-defaults/themes/dark_defaults.json
+++ b/extensions/theme-defaults/themes/dark_defaults.json
@@ -10,6 +10,9 @@
 		"editor.selectionHighlightBackground": "#ADD6FF26",
 		"list.dropBackground": "#383B3D",
 		"activityBarBadge.background": "#007ACC",
-		"sideBarTitle.foreground": "#BBBBBB"
+		"sideBarTitle.foreground": "#BBBBBB",
+		"input.placeholderForeground": "#A6A6A6",
+		"settings.textInputBackground": "#292929",
+		"settings.numberInputBackground": "#292929"
 	}
 }
\ No newline at end of file
diff --git a/extensions/theme-defaults/themes/dark_plus.json b/extensions/theme-defaults/themes/dark_plus.json
index 0ccbaeb606d..3e2c5ac607c 100644
--- a/extensions/theme-defaults/themes/dark_plus.json
+++ b/extensions/theme-defaults/themes/dark_plus.json
@@ -27,6 +27,8 @@
 				"storage.type.boolean.go",
 				"storage.type.string.go",
 				"storage.type.uintptr.go",
+				"storage.type.error.go",
+				"storage.type.rune.go",
 				"storage.type.cs",
 				"storage.type.generic.cs",
 				"storage.type.modifier.cs",
diff --git a/extensions/theme-defaults/themes/dark_vs.json b/extensions/theme-defaults/themes/dark_vs.json
index c2a15addb8d..2cbdca4a8f1 100644
--- a/extensions/theme-defaults/themes/dark_vs.json
+++ b/extensions/theme-defaults/themes/dark_vs.json
@@ -33,7 +33,7 @@
 		{
 			"scope": "comment",
 			"settings": {
-				"foreground": "#608b4e"
+				"foreground": "#6A9955"
 			}
 		},
 		{
@@ -143,7 +143,7 @@
 		{
 			"scope": "beginning.punctuation.definition.quote.markdown",
 			"settings": {
-				"foreground": "#608b4e"
+				"foreground": "#6A9955"
 			}
 		},
 		{
diff --git a/extensions/theme-defaults/themes/light_defaults.json b/extensions/theme-defaults/themes/light_defaults.json
index 2ee46debb3a..dc53cbfb1ea 100644
--- a/extensions/theme-defaults/themes/light_defaults.json
+++ b/extensions/theme-defaults/themes/light_defaults.json
@@ -12,6 +12,8 @@
 		"activityBarBadge.background": "#007ACC",
 		"sideBarTitle.foreground": "#6F6F6F",
 		"list.hoverBackground": "#E8E8E8",
-		"input.placeholderForeground": "#ADADAD"
+		"input.placeholderForeground": "#767676",
+		"settings.textInputBorder": "#CECECE",
+		"settings.numberInputBorder": "#CECECE"
 	}
 }
\ No newline at end of file
diff --git a/extensions/theme-defaults/themes/light_plus.json b/extensions/theme-defaults/themes/light_plus.json
index 4c9985d44f2..726cae4058d 100644
--- a/extensions/theme-defaults/themes/light_plus.json
+++ b/extensions/theme-defaults/themes/light_plus.json
@@ -27,6 +27,8 @@
 				"storage.type.boolean.go",
 				"storage.type.string.go",
 				"storage.type.uintptr.go",
+				"storage.type.error.go",
+				"storage.type.rune.go",
 				"storage.type.cs",
 				"storage.type.generic.cs",
 				"storage.type.modifier.cs",
diff --git a/extensions/theme-defaults/themes/light_vs.json b/extensions/theme-defaults/themes/light_vs.json
index 0fafec36645..4134ce0a4cb 100644
--- a/extensions/theme-defaults/themes/light_vs.json
+++ b/extensions/theme-defaults/themes/light_vs.json
@@ -290,7 +290,9 @@
 			}
 		},
 		{
-			"scope": "support.type.property-name.json",
+			"scope": [
+				"support.type.property-name.json"
+			],
 			"settings": {
 				"foreground": "#0451a5"
 			}
diff --git a/extensions/theme-kimbie-dark/themes/kimbie-dark-color-theme.json b/extensions/theme-kimbie-dark/themes/kimbie-dark-color-theme.json
index 9a93b5e73e9..41d9d0b2d8e 100644
--- a/extensions/theme-kimbie-dark/themes/kimbie-dark-color-theme.json
+++ b/extensions/theme-kimbie-dark/themes/kimbie-dark-color-theme.json
@@ -3,6 +3,7 @@
 	"type": "dark",
 	"colors": {
 		"input.background": "#51412c",
+		"dropdown.background": "#51412c",
 		"editor.background": "#221a0f",
 		"editor.foreground": "#d3af86",
 		"focusBorder": "#a57a4c",
diff --git a/extensions/theme-monokai/themes/monokai-color-theme.json b/extensions/theme-monokai/themes/monokai-color-theme.json
index 7321af7b015..e7f00d712e6 100644
--- a/extensions/theme-monokai/themes/monokai-color-theme.json
+++ b/extensions/theme-monokai/themes/monokai-color-theme.json
@@ -11,6 +11,8 @@
 		"list.activeSelectionBackground": "#75715E",
 		"list.focusBackground": "#414339",
 		"dropdown.listBackground": "#1e1f1c",
+		"settings.textInputBackground": "#32342d",
+		"settings.numberInputBackground": "#32342d",
 		"list.inactiveSelectionBackground": "#414339",
 		"list.hoverBackground": "#3e3d32",
 		"list.dropBackground": "#414339",
diff --git a/extensions/theme-quietlight/themes/quietlight-color-theme.json b/extensions/theme-quietlight/themes/quietlight-color-theme.json
index 3e1ad56f8ad..5d575484e9c 100644
--- a/extensions/theme-quietlight/themes/quietlight-color-theme.json
+++ b/extensions/theme-quietlight/themes/quietlight-color-theme.json
@@ -40,7 +40,8 @@
 			"name": "Comments: Documentation",
 			"scope": [
 				"comment.documentation",
-				"comment.block.documentation"
+				"comment.block.documentation",
+				"comment.block.documentation punctuation.definition.comment "
 			],
 			"settings": {
 				"foreground": "#448C27"
@@ -96,7 +97,7 @@
 				"variable.language"
 			],
 			"settings": {
-				"foreground": "#AB6526"
+				"foreground": "#9C5D27"
 			}
 		},
 		{
@@ -154,7 +155,7 @@
 				"constant"
 			],
 			"settings": {
-				"foreground": "#AB6526"
+				"foreground": "#9C5D27"
 			}
 		},
 		{
@@ -182,7 +183,7 @@
 			"name": "Strings: Symbols",
 			"scope": "constant.other.symbol",
 			"settings": {
-				"foreground": "#AB6526"
+				"foreground": "#9C5D27"
 			}
 		},
 		{
@@ -255,7 +256,7 @@
 				"punctuation.definition.entity"
 			],
 			"settings": {
-				"foreground": "#AB6526"
+				"foreground": "#9C5D27"
 			}
 		},
 		{
@@ -281,7 +282,7 @@
 				"support.type.property-name"
 			],
 			"settings": {
-				"foreground": "#AB6526"
+				"foreground": "#9C5D27"
 			}
 		},
 		{
@@ -426,7 +427,7 @@
 			"scope": "markup.inline.raw",
 			"settings": {
 				"fontStyle": "",
-				"foreground": "#AB6526"
+				"foreground": "#9C5D27"
 			}
 		},
 		{
@@ -528,6 +529,7 @@
 		"inputValidation.errorBorder": "#f1897f",
 		"errorForeground": "#f1897f",
 		"badge.background": "#705697AA",
-		"progressBar.background": "#705697"
+		"progressBar.background": "#705697",
+		"walkThrough.embeddedEditorBackground": "#00000014"
 	}
 }
diff --git a/extensions/theme-seti/build/update-icon-theme.js b/extensions/theme-seti/build/update-icon-theme.js
index 31d7bffe3a7..ed22a1fb3c4 100644
--- a/extensions/theme-seti/build/update-icon-theme.js
+++ b/extensions/theme-seti/build/update-icon-theme.js
@@ -10,6 +10,31 @@ let fs = require('fs');
 let https = require('https');
 let url = require('url');
 
+// list of languagesIs not shipped with VSCode. The information is used to associate an icon with a langauge association
+let nonBuiltInLanguages = { // { fileNames, extensions }
+	"r": { extensions: ['r', 'rhistory', 'rprofile', 'rt'] },
+	"argdown": { extensions: ['ad', 'adown', 'argdown', 'argdn'] },
+	"elm": { extensions: ['elm'] },
+	"ocaml": { extensions: ['ml', 'mli'] },
+	"nunjucks": { extensions: ['nunjucks', 'nunjs', 'nunj', 'nj', 'njk', 'tmpl', 'tpl'] },
+	"mustache": { extensions: ['mustache', 'mst', 'mu', 'stache'] },
+	"erb": { extensions: ['erb', 'rhtml', 'html.erb'] },
+	"terraform": { extensions: ['tf', 'tfvars', 'hcl'] },
+	"vue": { extensions: ['vue'] },
+	"sass": { extensions: ['sass'] },
+	"puppet": { extensions: ['puppet'] },
+	"kotlin": { extensions: ['kt'] },
+	"jinja": { extensions: ['jinja'] },
+	"haxe": { extensions: ['hx'] },
+	"haskell": { extensions: ['hs'] },
+	"gradle": { extensions: ['gradle'] },
+	"elixir": { extensions: ['ex'] },
+	"haml": { extensions: ['haml'] },
+	"stylus": { extensions: ['styl'] },
+	"vala": { extensions: ['vala'] },
+	"todo": { fileNames: ['todo'] }
+}
+
 function getCommitSha(repoId, repoPath) {
 	let commitInfo = 'https://api.github.com/repos/' + repoId + '/commits?path=' + repoPath;
 	return download(commitInfo).then(function (content) {
@@ -34,7 +59,7 @@ function download(source) {
 	}
 	return new Promise((c, e) => {
 		let _url = url.parse(source);
-		let options = { host: _url.host, port: _url.port, path: _url.path, headers: { 'User-Agent': 'NodeJS' }};
+		let options = { host: _url.host, port: _url.port, path: _url.path, headers: { 'User-Agent': 'NodeJS' } };
 		let content = '';
 		https.get(options, function (response) {
 			response.on('data', function (data) {
@@ -50,7 +75,7 @@ function download(source) {
 
 function readFile(fileName) {
 	return new Promise((c, e) => {
-		fs.readFile(fileName, function(err, data) {
+		fs.readFile(fileName, function (err, data) {
 			if (err) {
 				e(err);
 			} else {
@@ -67,12 +92,12 @@ function downloadBinary(source, dest) {
 
 	return new Promise((c, e) => {
 		https.get(source, function (response) {
-			switch(response.statusCode) {
+			switch (response.statusCode) {
 				case 200:
 					let file = fs.createWriteStream(dest);
-					response.on('data', function(chunk){
+					response.on('data', function (chunk) {
 						file.write(chunk);
-					}).on('end', function(){
+					}).on('end', function () {
 						file.end();
 						c(null);
 					}).on('error', function (err) {
@@ -107,7 +132,7 @@ function copyFile(fileName, dest) {
 		rd.on("error", handleError);
 		let wr = fs.createWriteStream(dest);
 		wr.on("error", handleError);
-		wr.on("close", function() {
+		wr.on("close", function () {
 			if (!cbCalled) {
 				c();
 				cbCalled = true;
@@ -119,7 +144,7 @@ function copyFile(fileName, dest) {
 
 function darkenColor(color) {
 	let res = '#';
-	for (let i = 1; i < 7; i+=2) {
+	for (let i = 1; i < 7; i += 2) {
 		let newVal = Math.round(parseInt('0x' + color.substr(i, 2), 16) * 0.9);
 		let hex = newVal.toString(16);
 		if (hex.length == 1) {
@@ -133,7 +158,7 @@ function darkenColor(color) {
 function getLanguageMappings() {
 	let langMappings = {};
 	let allExtensions = fs.readdirSync('..');
-	for (let i= 0; i < allExtensions.length; i++) {
+	for (let i = 0; i < allExtensions.length; i++) {
 		let dirPath = path.join('..', allExtensions[i], 'package.json');
 		if (fs.existsSync(dirPath)) {
 			let content = fs.readFileSync(dirPath).toString();
@@ -158,13 +183,16 @@ function getLanguageMappings() {
 			}
 		}
 	}
+	for (let languageId in nonBuiltInLanguages) {
+		langMappings[languageId] = nonBuiltInLanguages[languageId];
+	}
 	return langMappings;
 }
 
 //let font = 'https://raw.githubusercontent.com/jesseweed/seti-ui/master/styles/_fonts/seti/seti.woff';
 let font = '../../../seti-ui/styles/_fonts/seti/seti.woff';
 
-exports.copyFont = function() {
+exports.copyFont = function () {
 	return downloadBinary(font, './icons/seti.woff');
 };
 
@@ -172,13 +200,13 @@ exports.copyFont = function() {
 //let mappings = 'https://raw.githubusercontent.com/jesseweed/seti-ui/master/styles/components/icons/mapping.less';
 //let colors = 'https://raw.githubusercontent.com/jesseweed/seti-ui/master/styles/ui-variables.less';
 
-let fontMappings = '../../../seti-ui/styles/_fonts/seti.less';
-let mappings = '../../../seti-ui/styles/components/icons/mapping.less';
-let colors = '../../../seti-ui/styles/ui-variables.less';
+let fontMappingsFile = '../../../seti-ui/styles/_fonts/seti.less';
+let fileAssociationFile = '../../../seti-ui/styles/components/icons/mapping.less';
+let colorsFile = '../../../seti-ui/styles/ui-variables.less';
 
 exports.update = function () {
 
-	console.log('Reading from ' + fontMappings);
+	console.log('Reading from ' + fontMappingsFile);
 	let def2Content = {};
 	let ext2Def = {};
 	let fileName2Def = {};
@@ -234,7 +262,7 @@ exports.update = function () {
 				size: "150%"
 			}],
 			iconDefinitions: iconDefinitions,
-		//	folder: "_folder",
+			//	folder: "_folder",
 			file: "_default",
 			fileExtensions: ext2Def,
 			fileNames: fileName2Def,
@@ -256,15 +284,15 @@ exports.update = function () {
 
 	let match;
 
-	return download(fontMappings).then(function (content) {
+	return download(fontMappingsFile).then(function (content) {
 		let regex = /@([\w-]+):\s*'(\\E[0-9A-F]+)';/g;
 		let contents = {};
 		while ((match = regex.exec(content)) !== null) {
 			contents[match[1]] = match[2];
 		}
 
-		return download(mappings).then(function (content) {
-			let regex2 = /\.icon-(?:set|partial)\('([\w-\.]+)',\s*'([\w-]+)',\s*(@[\w-]+)\)/g;
+		return download(fileAssociationFile).then(function (content) {
+			let regex2 = /\.icon-(?:set|partial)\(['"]([\w-\.]+)['"],\s*['"]([\w-]+)['"],\s*(@[\w-]+)\)/g;
 			while ((match = regex2.exec(content)) !== null) {
 				let pattern = match[1];
 				let def = '_' + match[2];
@@ -304,26 +332,28 @@ exports.update = function () {
 				}
 				if (preferredDef) {
 					lang2Def[lang] = preferredDef;
-					for (let i2 = 0; i2 < exts.length; i2++) {
-						// remove the extension association, unless it is different from the preferred
-						if (ext2Def[exts[i2]] === preferredDef) {
-							delete ext2Def[exts[i2]];
+					if (!nonBuiltInLanguages[lang]) {
+						for (let i2 = 0; i2 < exts.length; i2++) {
+							// remove the extension association, unless it is different from the preferred
+							if (ext2Def[exts[i2]] === preferredDef) {
+								delete ext2Def[exts[i2]];
+							}
 						}
-					}
-					for (let i2 = 0; i2 < fileNames.length; i2++) {
-						// remove the fileName association, unless it is different from the preferred
-						if (fileName2Def[fileNames[i2]] === preferredDef) {
-							delete fileName2Def[fileNames[i2]];
+						for (let i2 = 0; i2 < fileNames.length; i2++) {
+							// remove the fileName association, unless it is different from the preferred
+							if (fileName2Def[fileNames[i2]] === preferredDef) {
+								delete fileName2Def[fileNames[i2]];
+							}
 						}
 					}
 				}
 			}
 
 
-			return download(colors).then(function (content) {
+			return download(colorsFile).then(function (content) {
 				let regex3 = /(@[\w-]+):\s*(#[0-9a-z]+)/g;
 				while ((match = regex3.exec(content)) !== null) {
-					colorId2Value[match[1]] =  match[2];
+					colorId2Value[match[1]] = match[2];
 				}
 				return getCommitSha('jesseweed/seti-ui', 'styles/_fonts/seti.less').then(function (info) {
 					try {
diff --git a/extensions/theme-seti/icons/seti.woff b/extensions/theme-seti/icons/seti.woff
index 476c5a9946b..ea92f2627db 100644
Binary files a/extensions/theme-seti/icons/seti.woff and b/extensions/theme-seti/icons/seti.woff differ
diff --git a/extensions/theme-seti/icons/vs-seti-icon-theme.json b/extensions/theme-seti/icons/vs-seti-icon-theme.json
index 6aeb37e95c6..ad4817d51f7 100644
--- a/extensions/theme-seti/icons/vs-seti-icon-theme.json
+++ b/extensions/theme-seti/icons/vs-seti-icon-theme.json
@@ -22,1151 +22,1223 @@
 		}
 	],
 	"iconDefinitions": {
-		"_asm_light": {
+		"_R_light": {
+			"fontCharacter": "\\E001",
+			"fontColor": "#498ba7"
+		},
+		"_R": {
+			"fontCharacter": "\\E001",
+			"fontColor": "#519aba"
+		},
+		"_argdown_light": {
 			"fontCharacter": "\\E003",
+			"fontColor": "#498ba7"
+		},
+		"_argdown": {
+			"fontCharacter": "\\E003",
+			"fontColor": "#519aba"
+		},
+		"_asm_light": {
+			"fontCharacter": "\\E004",
 			"fontColor": "#b8383d"
 		},
 		"_asm": {
-			"fontCharacter": "\\E003",
+			"fontCharacter": "\\E004",
 			"fontColor": "#cc3e44"
 		},
 		"_audio_light": {
-			"fontCharacter": "\\E004",
+			"fontCharacter": "\\E005",
 			"fontColor": "#9068b0"
 		},
 		"_audio": {
-			"fontCharacter": "\\E004",
+			"fontCharacter": "\\E005",
 			"fontColor": "#a074c4"
 		},
 		"_babel_light": {
-			"fontCharacter": "\\E005",
+			"fontCharacter": "\\E006",
 			"fontColor": "#b7b73b"
 		},
 		"_babel": {
-			"fontCharacter": "\\E005",
+			"fontCharacter": "\\E006",
 			"fontColor": "#cbcb41"
 		},
 		"_bower_light": {
-			"fontCharacter": "\\E006",
+			"fontCharacter": "\\E007",
 			"fontColor": "#cc6d2e"
 		},
 		"_bower": {
-			"fontCharacter": "\\E006",
+			"fontCharacter": "\\E007",
 			"fontColor": "#e37933"
 		},
 		"_bsl_light": {
-			"fontCharacter": "\\E007",
+			"fontCharacter": "\\E008",
 			"fontColor": "#b8383d"
 		},
 		"_bsl": {
-			"fontCharacter": "\\E007",
+			"fontCharacter": "\\E008",
 			"fontColor": "#cc3e44"
 		},
 		"_c_light": {
-			"fontCharacter": "\\E009",
+			"fontCharacter": "\\E00A",
 			"fontColor": "#498ba7"
 		},
 		"_c": {
-			"fontCharacter": "\\E009",
+			"fontCharacter": "\\E00A",
 			"fontColor": "#519aba"
 		},
 		"_c-sharp_light": {
-			"fontCharacter": "\\E008",
+			"fontCharacter": "\\E009",
 			"fontColor": "#498ba7"
 		},
 		"_c-sharp": {
-			"fontCharacter": "\\E008",
+			"fontCharacter": "\\E009",
 			"fontColor": "#519aba"
 		},
 		"_c_1_light": {
-			"fontCharacter": "\\E009",
+			"fontCharacter": "\\E00A",
 			"fontColor": "#9068b0"
 		},
 		"_c_1": {
-			"fontCharacter": "\\E009",
+			"fontCharacter": "\\E00A",
 			"fontColor": "#a074c4"
 		},
 		"_c_2_light": {
-			"fontCharacter": "\\E009",
+			"fontCharacter": "\\E00A",
 			"fontColor": "#b7b73b"
 		},
 		"_c_2": {
-			"fontCharacter": "\\E009",
+			"fontCharacter": "\\E00A",
 			"fontColor": "#cbcb41"
 		},
 		"_cake_light": {
-			"fontCharacter": "\\E00A",
+			"fontCharacter": "\\E00B",
 			"fontColor": "#b8383d"
 		},
 		"_cake": {
-			"fontCharacter": "\\E00A",
+			"fontCharacter": "\\E00B",
 			"fontColor": "#cc3e44"
 		},
 		"_cake_php_light": {
-			"fontCharacter": "\\E00B",
+			"fontCharacter": "\\E00C",
 			"fontColor": "#b8383d"
 		},
 		"_cake_php": {
-			"fontCharacter": "\\E00B",
+			"fontCharacter": "\\E00C",
 			"fontColor": "#cc3e44"
 		},
 		"_clock_light": {
-			"fontCharacter": "\\E00F",
+			"fontCharacter": "\\E010",
 			"fontColor": "#498ba7"
 		},
 		"_clock": {
-			"fontCharacter": "\\E00F",
+			"fontCharacter": "\\E010",
 			"fontColor": "#519aba"
 		},
 		"_clock_1_light": {
-			"fontCharacter": "\\E00F",
+			"fontCharacter": "\\E010",
 			"fontColor": "#627379"
 		},
 		"_clock_1": {
-			"fontCharacter": "\\E00F",
+			"fontCharacter": "\\E010",
 			"fontColor": "#6d8086"
 		},
 		"_clojure_light": {
-			"fontCharacter": "\\E010",
+			"fontCharacter": "\\E011",
 			"fontColor": "#7fae42"
 		},
 		"_clojure": {
-			"fontCharacter": "\\E010",
+			"fontCharacter": "\\E011",
 			"fontColor": "#8dc149"
 		},
 		"_clojure_1_light": {
-			"fontCharacter": "\\E010",
+			"fontCharacter": "\\E011",
 			"fontColor": "#498ba7"
 		},
 		"_clojure_1": {
-			"fontCharacter": "\\E010",
+			"fontCharacter": "\\E011",
 			"fontColor": "#519aba"
 		},
 		"_code-climate_light": {
-			"fontCharacter": "\\E011",
+			"fontCharacter": "\\E012",
 			"fontColor": "#7fae42"
 		},
 		"_code-climate": {
-			"fontCharacter": "\\E011",
+			"fontCharacter": "\\E012",
 			"fontColor": "#8dc149"
 		},
 		"_coffee_light": {
-			"fontCharacter": "\\E012",
+			"fontCharacter": "\\E013",
 			"fontColor": "#b7b73b"
 		},
 		"_coffee": {
-			"fontCharacter": "\\E012",
+			"fontCharacter": "\\E013",
 			"fontColor": "#cbcb41"
 		},
 		"_coldfusion_light": {
-			"fontCharacter": "\\E014",
+			"fontCharacter": "\\E015",
 			"fontColor": "#498ba7"
 		},
 		"_coldfusion": {
-			"fontCharacter": "\\E014",
+			"fontCharacter": "\\E015",
 			"fontColor": "#519aba"
 		},
 		"_config_light": {
-			"fontCharacter": "\\E015",
+			"fontCharacter": "\\E016",
 			"fontColor": "#627379"
 		},
 		"_config": {
-			"fontCharacter": "\\E015",
+			"fontCharacter": "\\E016",
 			"fontColor": "#6d8086"
 		},
 		"_cpp_light": {
-			"fontCharacter": "\\E016",
+			"fontCharacter": "\\E017",
 			"fontColor": "#498ba7"
 		},
 		"_cpp": {
-			"fontCharacter": "\\E016",
+			"fontCharacter": "\\E017",
 			"fontColor": "#519aba"
 		},
 		"_cpp_1_light": {
-			"fontCharacter": "\\E016",
+			"fontCharacter": "\\E017",
 			"fontColor": "#9068b0"
 		},
 		"_cpp_1": {
-			"fontCharacter": "\\E016",
+			"fontCharacter": "\\E017",
 			"fontColor": "#a074c4"
 		},
 		"_crystal_light": {
-			"fontCharacter": "\\E017",
+			"fontCharacter": "\\E018",
 			"fontColor": "#bfc2c1"
 		},
 		"_crystal": {
-			"fontCharacter": "\\E017",
+			"fontCharacter": "\\E018",
 			"fontColor": "#d4d7d6"
 		},
 		"_crystal_embedded_light": {
-			"fontCharacter": "\\E018",
+			"fontCharacter": "\\E019",
 			"fontColor": "#bfc2c1"
 		},
 		"_crystal_embedded": {
-			"fontCharacter": "\\E018",
+			"fontCharacter": "\\E019",
 			"fontColor": "#d4d7d6"
 		},
 		"_css_light": {
-			"fontCharacter": "\\E019",
+			"fontCharacter": "\\E01A",
 			"fontColor": "#498ba7"
 		},
 		"_css": {
-			"fontCharacter": "\\E019",
+			"fontCharacter": "\\E01A",
 			"fontColor": "#519aba"
 		},
 		"_csv_light": {
-			"fontCharacter": "\\E01A",
+			"fontCharacter": "\\E01B",
 			"fontColor": "#7fae42"
 		},
 		"_csv": {
-			"fontCharacter": "\\E01A",
+			"fontCharacter": "\\E01B",
 			"fontColor": "#8dc149"
 		},
 		"_d_light": {
-			"fontCharacter": "\\E01B",
+			"fontCharacter": "\\E01C",
 			"fontColor": "#b8383d"
 		},
 		"_d": {
-			"fontCharacter": "\\E01B",
+			"fontCharacter": "\\E01C",
 			"fontColor": "#cc3e44"
 		},
 		"_db_light": {
-			"fontCharacter": "\\E01C",
+			"fontCharacter": "\\E01D",
 			"fontColor": "#dd4b78"
 		},
 		"_db": {
-			"fontCharacter": "\\E01C",
+			"fontCharacter": "\\E01D",
 			"fontColor": "#f55385"
 		},
 		"_default_light": {
-			"fontCharacter": "\\E01D",
+			"fontCharacter": "\\E01E",
 			"fontColor": "#bfc2c1"
 		},
 		"_default": {
-			"fontCharacter": "\\E01D",
+			"fontCharacter": "\\E01E",
 			"fontColor": "#d4d7d6"
 		},
 		"_docker_light": {
-			"fontCharacter": "\\E01F",
+			"fontCharacter": "\\E020",
 			"fontColor": "#498ba7"
 		},
 		"_docker": {
-			"fontCharacter": "\\E01F",
+			"fontCharacter": "\\E020",
 			"fontColor": "#519aba"
 		},
 		"_docker_1_light": {
-			"fontCharacter": "\\E01F",
+			"fontCharacter": "\\E020",
 			"fontColor": "#455155"
 		},
 		"_docker_1": {
-			"fontCharacter": "\\E01F",
+			"fontCharacter": "\\E020",
 			"fontColor": "#4d5a5e"
 		},
 		"_docker_2_light": {
-			"fontCharacter": "\\E01F",
+			"fontCharacter": "\\E020",
 			"fontColor": "#7fae42"
 		},
 		"_docker_2": {
-			"fontCharacter": "\\E01F",
+			"fontCharacter": "\\E020",
 			"fontColor": "#8dc149"
 		},
 		"_docker_3_light": {
-			"fontCharacter": "\\E01F",
+			"fontCharacter": "\\E020",
 			"fontColor": "#dd4b78"
 		},
 		"_docker_3": {
-			"fontCharacter": "\\E01F",
+			"fontCharacter": "\\E020",
 			"fontColor": "#f55385"
 		},
 		"_ejs_light": {
-			"fontCharacter": "\\E021",
+			"fontCharacter": "\\E022",
 			"fontColor": "#b7b73b"
 		},
 		"_ejs": {
-			"fontCharacter": "\\E021",
+			"fontCharacter": "\\E022",
 			"fontColor": "#cbcb41"
 		},
 		"_elixir_light": {
-			"fontCharacter": "\\E022",
+			"fontCharacter": "\\E023",
 			"fontColor": "#9068b0"
 		},
 		"_elixir": {
-			"fontCharacter": "\\E022",
+			"fontCharacter": "\\E023",
 			"fontColor": "#a074c4"
 		},
 		"_elixir_script_light": {
-			"fontCharacter": "\\E023",
+			"fontCharacter": "\\E024",
 			"fontColor": "#9068b0"
 		},
 		"_elixir_script": {
-			"fontCharacter": "\\E023",
+			"fontCharacter": "\\E024",
 			"fontColor": "#a074c4"
 		},
 		"_elm_light": {
-			"fontCharacter": "\\E024",
+			"fontCharacter": "\\E025",
 			"fontColor": "#498ba7"
 		},
 		"_elm": {
-			"fontCharacter": "\\E024",
+			"fontCharacter": "\\E025",
 			"fontColor": "#519aba"
 		},
 		"_eslint_light": {
-			"fontCharacter": "\\E026",
+			"fontCharacter": "\\E027",
 			"fontColor": "#9068b0"
 		},
 		"_eslint": {
-			"fontCharacter": "\\E026",
+			"fontCharacter": "\\E027",
 			"fontColor": "#a074c4"
 		},
 		"_eslint_1_light": {
-			"fontCharacter": "\\E026",
+			"fontCharacter": "\\E027",
 			"fontColor": "#455155"
 		},
 		"_eslint_1": {
-			"fontCharacter": "\\E026",
+			"fontCharacter": "\\E027",
 			"fontColor": "#4d5a5e"
 		},
 		"_ethereum_light": {
-			"fontCharacter": "\\E027",
+			"fontCharacter": "\\E028",
 			"fontColor": "#498ba7"
 		},
 		"_ethereum": {
-			"fontCharacter": "\\E027",
+			"fontCharacter": "\\E028",
 			"fontColor": "#519aba"
 		},
 		"_f-sharp_light": {
-			"fontCharacter": "\\E028",
+			"fontCharacter": "\\E029",
 			"fontColor": "#498ba7"
 		},
 		"_f-sharp": {
-			"fontCharacter": "\\E028",
+			"fontCharacter": "\\E029",
 			"fontColor": "#519aba"
 		},
 		"_favicon_light": {
-			"fontCharacter": "\\E029",
+			"fontCharacter": "\\E02A",
 			"fontColor": "#b7b73b"
 		},
 		"_favicon": {
-			"fontCharacter": "\\E029",
+			"fontCharacter": "\\E02A",
 			"fontColor": "#cbcb41"
 		},
 		"_firebase_light": {
-			"fontCharacter": "\\E02A",
+			"fontCharacter": "\\E02B",
 			"fontColor": "#cc6d2e"
 		},
 		"_firebase": {
-			"fontCharacter": "\\E02A",
+			"fontCharacter": "\\E02B",
 			"fontColor": "#e37933"
 		},
 		"_firefox_light": {
-			"fontCharacter": "\\E02B",
+			"fontCharacter": "\\E02C",
 			"fontColor": "#cc6d2e"
 		},
 		"_firefox": {
-			"fontCharacter": "\\E02B",
+			"fontCharacter": "\\E02C",
 			"fontColor": "#e37933"
 		},
 		"_font_light": {
-			"fontCharacter": "\\E02D",
+			"fontCharacter": "\\E02E",
 			"fontColor": "#b8383d"
 		},
 		"_font": {
-			"fontCharacter": "\\E02D",
+			"fontCharacter": "\\E02E",
 			"fontColor": "#cc3e44"
 		},
 		"_git_light": {
-			"fontCharacter": "\\E02E",
+			"fontCharacter": "\\E02F",
 			"fontColor": "#3b4b52"
 		},
 		"_git": {
-			"fontCharacter": "\\E02E",
+			"fontCharacter": "\\E02F",
 			"fontColor": "#41535b"
 		},
 		"_go_light": {
-			"fontCharacter": "\\E032",
+			"fontCharacter": "\\E033",
 			"fontColor": "#498ba7"
 		},
 		"_go": {
-			"fontCharacter": "\\E032",
+			"fontCharacter": "\\E033",
 			"fontColor": "#519aba"
 		},
 		"_go2_light": {
-			"fontCharacter": "\\E033",
+			"fontCharacter": "\\E034",
 			"fontColor": "#498ba7"
 		},
 		"_go2": {
-			"fontCharacter": "\\E033",
+			"fontCharacter": "\\E034",
 			"fontColor": "#519aba"
 		},
 		"_gradle_light": {
-			"fontCharacter": "\\E034",
+			"fontCharacter": "\\E035",
 			"fontColor": "#7fae42"
 		},
 		"_gradle": {
-			"fontCharacter": "\\E034",
+			"fontCharacter": "\\E035",
 			"fontColor": "#8dc149"
 		},
 		"_grails_light": {
-			"fontCharacter": "\\E035",
+			"fontCharacter": "\\E036",
 			"fontColor": "#7fae42"
 		},
 		"_grails": {
-			"fontCharacter": "\\E035",
+			"fontCharacter": "\\E036",
 			"fontColor": "#8dc149"
 		},
 		"_grunt_light": {
-			"fontCharacter": "\\E036",
+			"fontCharacter": "\\E037",
 			"fontColor": "#cc6d2e"
 		},
 		"_grunt": {
-			"fontCharacter": "\\E036",
+			"fontCharacter": "\\E037",
 			"fontColor": "#e37933"
 		},
 		"_gulp_light": {
-			"fontCharacter": "\\E037",
+			"fontCharacter": "\\E038",
 			"fontColor": "#b8383d"
 		},
 		"_gulp": {
-			"fontCharacter": "\\E037",
+			"fontCharacter": "\\E038",
 			"fontColor": "#cc3e44"
 		},
 		"_haml_light": {
-			"fontCharacter": "\\E039",
+			"fontCharacter": "\\E03A",
 			"fontColor": "#b8383d"
 		},
 		"_haml": {
-			"fontCharacter": "\\E039",
+			"fontCharacter": "\\E03A",
 			"fontColor": "#cc3e44"
 		},
 		"_haskell_light": {
-			"fontCharacter": "\\E03A",
+			"fontCharacter": "\\E03B",
 			"fontColor": "#9068b0"
 		},
 		"_haskell": {
-			"fontCharacter": "\\E03A",
+			"fontCharacter": "\\E03B",
 			"fontColor": "#a074c4"
 		},
 		"_haxe_light": {
-			"fontCharacter": "\\E03B",
+			"fontCharacter": "\\E03C",
 			"fontColor": "#cc6d2e"
 		},
 		"_haxe": {
-			"fontCharacter": "\\E03B",
+			"fontCharacter": "\\E03C",
 			"fontColor": "#e37933"
 		},
 		"_haxe_1_light": {
-			"fontCharacter": "\\E03B",
+			"fontCharacter": "\\E03C",
 			"fontColor": "#b7b73b"
 		},
 		"_haxe_1": {
-			"fontCharacter": "\\E03B",
+			"fontCharacter": "\\E03C",
 			"fontColor": "#cbcb41"
 		},
 		"_haxe_2_light": {
-			"fontCharacter": "\\E03B",
+			"fontCharacter": "\\E03C",
 			"fontColor": "#498ba7"
 		},
 		"_haxe_2": {
-			"fontCharacter": "\\E03B",
+			"fontCharacter": "\\E03C",
 			"fontColor": "#519aba"
 		},
 		"_haxe_3_light": {
-			"fontCharacter": "\\E03B",
+			"fontCharacter": "\\E03C",
 			"fontColor": "#9068b0"
 		},
 		"_haxe_3": {
-			"fontCharacter": "\\E03B",
+			"fontCharacter": "\\E03C",
 			"fontColor": "#a074c4"
 		},
 		"_heroku_light": {
-			"fontCharacter": "\\E03C",
+			"fontCharacter": "\\E03D",
 			"fontColor": "#9068b0"
 		},
 		"_heroku": {
-			"fontCharacter": "\\E03C",
+			"fontCharacter": "\\E03D",
 			"fontColor": "#a074c4"
 		},
 		"_hex_light": {
-			"fontCharacter": "\\E03D",
+			"fontCharacter": "\\E03E",
 			"fontColor": "#b8383d"
 		},
 		"_hex": {
-			"fontCharacter": "\\E03D",
+			"fontCharacter": "\\E03E",
 			"fontColor": "#cc3e44"
 		},
 		"_html_light": {
-			"fontCharacter": "\\E03E",
+			"fontCharacter": "\\E03F",
 			"fontColor": "#cc6d2e"
 		},
 		"_html": {
-			"fontCharacter": "\\E03E",
+			"fontCharacter": "\\E03F",
 			"fontColor": "#e37933"
 		},
 		"_html_erb_light": {
-			"fontCharacter": "\\E03F",
+			"fontCharacter": "\\E040",
 			"fontColor": "#b8383d"
 		},
 		"_html_erb": {
-			"fontCharacter": "\\E03F",
+			"fontCharacter": "\\E040",
 			"fontColor": "#cc3e44"
 		},
 		"_ignored_light": {
-			"fontCharacter": "\\E040",
+			"fontCharacter": "\\E041",
 			"fontColor": "#3b4b52"
 		},
 		"_ignored": {
-			"fontCharacter": "\\E040",
+			"fontCharacter": "\\E041",
 			"fontColor": "#41535b"
 		},
 		"_illustrator_light": {
-			"fontCharacter": "\\E041",
+			"fontCharacter": "\\E042",
 			"fontColor": "#b7b73b"
 		},
 		"_illustrator": {
-			"fontCharacter": "\\E041",
+			"fontCharacter": "\\E042",
 			"fontColor": "#cbcb41"
 		},
 		"_image_light": {
-			"fontCharacter": "\\E042",
+			"fontCharacter": "\\E043",
 			"fontColor": "#9068b0"
 		},
 		"_image": {
-			"fontCharacter": "\\E042",
+			"fontCharacter": "\\E043",
 			"fontColor": "#a074c4"
 		},
 		"_info_light": {
-			"fontCharacter": "\\E043",
+			"fontCharacter": "\\E044",
 			"fontColor": "#498ba7"
 		},
 		"_info": {
-			"fontCharacter": "\\E043",
+			"fontCharacter": "\\E044",
 			"fontColor": "#519aba"
 		},
 		"_ionic_light": {
-			"fontCharacter": "\\E044",
+			"fontCharacter": "\\E045",
 			"fontColor": "#498ba7"
 		},
 		"_ionic": {
-			"fontCharacter": "\\E044",
+			"fontCharacter": "\\E045",
 			"fontColor": "#519aba"
 		},
 		"_jade_light": {
-			"fontCharacter": "\\E045",
+			"fontCharacter": "\\E046",
 			"fontColor": "#b8383d"
 		},
 		"_jade": {
-			"fontCharacter": "\\E045",
+			"fontCharacter": "\\E046",
 			"fontColor": "#cc3e44"
 		},
 		"_java_light": {
-			"fontCharacter": "\\E046",
+			"fontCharacter": "\\E047",
 			"fontColor": "#b8383d"
 		},
 		"_java": {
-			"fontCharacter": "\\E046",
+			"fontCharacter": "\\E047",
 			"fontColor": "#cc3e44"
 		},
 		"_javascript_light": {
-			"fontCharacter": "\\E047",
+			"fontCharacter": "\\E048",
 			"fontColor": "#b7b73b"
 		},
 		"_javascript": {
-			"fontCharacter": "\\E047",
+			"fontCharacter": "\\E048",
 			"fontColor": "#cbcb41"
 		},
 		"_javascript_1_light": {
-			"fontCharacter": "\\E047",
+			"fontCharacter": "\\E048",
 			"fontColor": "#cc6d2e"
 		},
 		"_javascript_1": {
-			"fontCharacter": "\\E047",
+			"fontCharacter": "\\E048",
 			"fontColor": "#e37933"
 		},
 		"_javascript_2_light": {
-			"fontCharacter": "\\E047",
+			"fontCharacter": "\\E048",
 			"fontColor": "#498ba7"
 		},
 		"_javascript_2": {
-			"fontCharacter": "\\E047",
+			"fontCharacter": "\\E048",
 			"fontColor": "#519aba"
 		},
 		"_jenkins_light": {
-			"fontCharacter": "\\E048",
+			"fontCharacter": "\\E049",
 			"fontColor": "#b8383d"
 		},
 		"_jenkins": {
-			"fontCharacter": "\\E048",
+			"fontCharacter": "\\E049",
 			"fontColor": "#cc3e44"
 		},
 		"_jinja_light": {
-			"fontCharacter": "\\E049",
+			"fontCharacter": "\\E04A",
 			"fontColor": "#b8383d"
 		},
 		"_jinja": {
-			"fontCharacter": "\\E049",
+			"fontCharacter": "\\E04A",
 			"fontColor": "#cc3e44"
 		},
 		"_json_light": {
-			"fontCharacter": "\\E04B",
+			"fontCharacter": "\\E04C",
 			"fontColor": "#b7b73b"
 		},
 		"_json": {
-			"fontCharacter": "\\E04B",
+			"fontCharacter": "\\E04C",
 			"fontColor": "#cbcb41"
 		},
-		"_julia_light": {
+		"_json_1_light": {
 			"fontCharacter": "\\E04C",
+			"fontColor": "#7fae42"
+		},
+		"_json_1": {
+			"fontCharacter": "\\E04C",
+			"fontColor": "#8dc149"
+		},
+		"_julia_light": {
+			"fontCharacter": "\\E04D",
 			"fontColor": "#9068b0"
 		},
 		"_julia": {
-			"fontCharacter": "\\E04C",
+			"fontCharacter": "\\E04D",
 			"fontColor": "#a074c4"
 		},
 		"_karma_light": {
-			"fontCharacter": "\\E04D",
+			"fontCharacter": "\\E04E",
 			"fontColor": "#7fae42"
 		},
 		"_karma": {
-			"fontCharacter": "\\E04D",
+			"fontCharacter": "\\E04E",
 			"fontColor": "#8dc149"
 		},
+		"_kotlin_light": {
+			"fontCharacter": "\\E04F",
+			"fontColor": "#cc6d2e"
+		},
+		"_kotlin": {
+			"fontCharacter": "\\E04F",
+			"fontColor": "#e37933"
+		},
 		"_less_light": {
-			"fontCharacter": "\\E04E",
+			"fontCharacter": "\\E050",
 			"fontColor": "#498ba7"
 		},
 		"_less": {
-			"fontCharacter": "\\E04E",
+			"fontCharacter": "\\E050",
 			"fontColor": "#519aba"
 		},
 		"_license_light": {
-			"fontCharacter": "\\E04F",
+			"fontCharacter": "\\E051",
 			"fontColor": "#b7b73b"
 		},
 		"_license": {
-			"fontCharacter": "\\E04F",
+			"fontCharacter": "\\E051",
 			"fontColor": "#cbcb41"
 		},
 		"_license_1_light": {
-			"fontCharacter": "\\E04F",
+			"fontCharacter": "\\E051",
 			"fontColor": "#cc6d2e"
 		},
 		"_license_1": {
-			"fontCharacter": "\\E04F",
+			"fontCharacter": "\\E051",
 			"fontColor": "#e37933"
 		},
 		"_license_2_light": {
-			"fontCharacter": "\\E04F",
+			"fontCharacter": "\\E051",
 			"fontColor": "#b8383d"
 		},
 		"_license_2": {
-			"fontCharacter": "\\E04F",
+			"fontCharacter": "\\E051",
 			"fontColor": "#cc3e44"
 		},
 		"_liquid_light": {
-			"fontCharacter": "\\E050",
+			"fontCharacter": "\\E052",
 			"fontColor": "#7fae42"
 		},
 		"_liquid": {
-			"fontCharacter": "\\E050",
+			"fontCharacter": "\\E052",
 			"fontColor": "#8dc149"
 		},
 		"_livescript_light": {
-			"fontCharacter": "\\E051",
+			"fontCharacter": "\\E053",
 			"fontColor": "#498ba7"
 		},
 		"_livescript": {
-			"fontCharacter": "\\E051",
+			"fontCharacter": "\\E053",
 			"fontColor": "#519aba"
 		},
 		"_lock_light": {
-			"fontCharacter": "\\E052",
+			"fontCharacter": "\\E054",
 			"fontColor": "#7fae42"
 		},
 		"_lock": {
-			"fontCharacter": "\\E052",
+			"fontCharacter": "\\E054",
 			"fontColor": "#8dc149"
 		},
 		"_lua_light": {
-			"fontCharacter": "\\E053",
+			"fontCharacter": "\\E055",
 			"fontColor": "#498ba7"
 		},
 		"_lua": {
-			"fontCharacter": "\\E053",
+			"fontCharacter": "\\E055",
 			"fontColor": "#519aba"
 		},
 		"_makefile_light": {
-			"fontCharacter": "\\E054",
+			"fontCharacter": "\\E056",
 			"fontColor": "#cc6d2e"
 		},
 		"_makefile": {
-			"fontCharacter": "\\E054",
+			"fontCharacter": "\\E056",
 			"fontColor": "#e37933"
 		},
 		"_makefile_1_light": {
-			"fontCharacter": "\\E054",
+			"fontCharacter": "\\E056",
 			"fontColor": "#9068b0"
 		},
 		"_makefile_1": {
-			"fontCharacter": "\\E054",
+			"fontCharacter": "\\E056",
 			"fontColor": "#a074c4"
 		},
 		"_makefile_2_light": {
-			"fontCharacter": "\\E054",
+			"fontCharacter": "\\E056",
 			"fontColor": "#627379"
 		},
 		"_makefile_2": {
-			"fontCharacter": "\\E054",
+			"fontCharacter": "\\E056",
 			"fontColor": "#6d8086"
 		},
 		"_makefile_3_light": {
-			"fontCharacter": "\\E054",
+			"fontCharacter": "\\E056",
 			"fontColor": "#498ba7"
 		},
 		"_makefile_3": {
-			"fontCharacter": "\\E054",
+			"fontCharacter": "\\E056",
 			"fontColor": "#519aba"
 		},
 		"_markdown_light": {
-			"fontCharacter": "\\E055",
+			"fontCharacter": "\\E057",
 			"fontColor": "#498ba7"
 		},
 		"_markdown": {
-			"fontCharacter": "\\E055",
+			"fontCharacter": "\\E057",
 			"fontColor": "#519aba"
 		},
 		"_maven_light": {
-			"fontCharacter": "\\E056",
+			"fontCharacter": "\\E058",
 			"fontColor": "#b8383d"
 		},
 		"_maven": {
-			"fontCharacter": "\\E056",
+			"fontCharacter": "\\E058",
 			"fontColor": "#cc3e44"
 		},
 		"_mdo_light": {
-			"fontCharacter": "\\E057",
+			"fontCharacter": "\\E059",
 			"fontColor": "#b8383d"
 		},
 		"_mdo": {
-			"fontCharacter": "\\E057",
+			"fontCharacter": "\\E059",
 			"fontColor": "#cc3e44"
 		},
 		"_mustache_light": {
-			"fontCharacter": "\\E058",
+			"fontCharacter": "\\E05A",
 			"fontColor": "#cc6d2e"
 		},
 		"_mustache": {
-			"fontCharacter": "\\E058",
+			"fontCharacter": "\\E05A",
 			"fontColor": "#e37933"
 		},
 		"_npm_light": {
-			"fontCharacter": "\\E05A",
+			"fontCharacter": "\\E05C",
 			"fontColor": "#3b4b52"
 		},
 		"_npm": {
-			"fontCharacter": "\\E05A",
+			"fontCharacter": "\\E05C",
 			"fontColor": "#41535b"
 		},
 		"_npm_1_light": {
-			"fontCharacter": "\\E05A",
+			"fontCharacter": "\\E05C",
 			"fontColor": "#b8383d"
 		},
 		"_npm_1": {
-			"fontCharacter": "\\E05A",
+			"fontCharacter": "\\E05C",
 			"fontColor": "#cc3e44"
 		},
 		"_npm_ignored_light": {
-			"fontCharacter": "\\E05B",
+			"fontCharacter": "\\E05D",
 			"fontColor": "#3b4b52"
 		},
 		"_npm_ignored": {
-			"fontCharacter": "\\E05B",
+			"fontCharacter": "\\E05D",
 			"fontColor": "#41535b"
 		},
 		"_nunjucks_light": {
-			"fontCharacter": "\\E05C",
+			"fontCharacter": "\\E05E",
 			"fontColor": "#7fae42"
 		},
 		"_nunjucks": {
-			"fontCharacter": "\\E05C",
+			"fontCharacter": "\\E05E",
 			"fontColor": "#8dc149"
 		},
 		"_ocaml_light": {
-			"fontCharacter": "\\E05D",
+			"fontCharacter": "\\E05F",
 			"fontColor": "#cc6d2e"
 		},
 		"_ocaml": {
-			"fontCharacter": "\\E05D",
+			"fontCharacter": "\\E05F",
 			"fontColor": "#e37933"
 		},
 		"_odata_light": {
-			"fontCharacter": "\\E05E",
+			"fontCharacter": "\\E060",
 			"fontColor": "#cc6d2e"
 		},
 		"_odata": {
-			"fontCharacter": "\\E05E",
+			"fontCharacter": "\\E060",
 			"fontColor": "#e37933"
 		},
 		"_pdf_light": {
-			"fontCharacter": "\\E05F",
+			"fontCharacter": "\\E061",
 			"fontColor": "#b8383d"
 		},
 		"_pdf": {
-			"fontCharacter": "\\E05F",
+			"fontCharacter": "\\E061",
 			"fontColor": "#cc3e44"
 		},
 		"_perl_light": {
-			"fontCharacter": "\\E060",
+			"fontCharacter": "\\E062",
 			"fontColor": "#498ba7"
 		},
 		"_perl": {
-			"fontCharacter": "\\E060",
+			"fontCharacter": "\\E062",
 			"fontColor": "#519aba"
 		},
 		"_photoshop_light": {
-			"fontCharacter": "\\E061",
+			"fontCharacter": "\\E063",
 			"fontColor": "#498ba7"
 		},
 		"_photoshop": {
-			"fontCharacter": "\\E061",
+			"fontCharacter": "\\E063",
 			"fontColor": "#519aba"
 		},
 		"_php_light": {
-			"fontCharacter": "\\E062",
+			"fontCharacter": "\\E064",
 			"fontColor": "#9068b0"
 		},
 		"_php": {
-			"fontCharacter": "\\E062",
+			"fontCharacter": "\\E064",
 			"fontColor": "#a074c4"
 		},
 		"_powershell_light": {
-			"fontCharacter": "\\E063",
+			"fontCharacter": "\\E065",
 			"fontColor": "#498ba7"
 		},
 		"_powershell": {
-			"fontCharacter": "\\E063",
+			"fontCharacter": "\\E065",
 			"fontColor": "#519aba"
 		},
 		"_pug_light": {
-			"fontCharacter": "\\E065",
+			"fontCharacter": "\\E067",
 			"fontColor": "#b8383d"
 		},
 		"_pug": {
-			"fontCharacter": "\\E065",
+			"fontCharacter": "\\E067",
 			"fontColor": "#cc3e44"
 		},
 		"_puppet_light": {
-			"fontCharacter": "\\E066",
+			"fontCharacter": "\\E068",
 			"fontColor": "#b7b73b"
 		},
 		"_puppet": {
-			"fontCharacter": "\\E066",
+			"fontCharacter": "\\E068",
 			"fontColor": "#cbcb41"
 		},
 		"_python_light": {
-			"fontCharacter": "\\E067",
+			"fontCharacter": "\\E069",
 			"fontColor": "#498ba7"
 		},
 		"_python": {
-			"fontCharacter": "\\E067",
+			"fontCharacter": "\\E069",
 			"fontColor": "#519aba"
 		},
 		"_react_light": {
-			"fontCharacter": "\\E069",
+			"fontCharacter": "\\E06B",
 			"fontColor": "#498ba7"
 		},
 		"_react": {
-			"fontCharacter": "\\E069",
+			"fontCharacter": "\\E06B",
 			"fontColor": "#519aba"
 		},
 		"_rollup_light": {
-			"fontCharacter": "\\E06A",
+			"fontCharacter": "\\E06C",
 			"fontColor": "#b8383d"
 		},
 		"_rollup": {
-			"fontCharacter": "\\E06A",
+			"fontCharacter": "\\E06C",
 			"fontColor": "#cc3e44"
 		},
 		"_ruby_light": {
-			"fontCharacter": "\\E06B",
+			"fontCharacter": "\\E06D",
 			"fontColor": "#b8383d"
 		},
 		"_ruby": {
-			"fontCharacter": "\\E06B",
+			"fontCharacter": "\\E06D",
 			"fontColor": "#cc3e44"
 		},
 		"_rust_light": {
-			"fontCharacter": "\\E06C",
+			"fontCharacter": "\\E06E",
 			"fontColor": "#627379"
 		},
 		"_rust": {
-			"fontCharacter": "\\E06C",
+			"fontCharacter": "\\E06E",
 			"fontColor": "#6d8086"
 		},
 		"_salesforce_light": {
-			"fontCharacter": "\\E06D",
+			"fontCharacter": "\\E06F",
 			"fontColor": "#498ba7"
 		},
 		"_salesforce": {
-			"fontCharacter": "\\E06D",
+			"fontCharacter": "\\E06F",
 			"fontColor": "#519aba"
 		},
 		"_sass_light": {
-			"fontCharacter": "\\E06E",
+			"fontCharacter": "\\E070",
 			"fontColor": "#dd4b78"
 		},
 		"_sass": {
-			"fontCharacter": "\\E06E",
+			"fontCharacter": "\\E070",
 			"fontColor": "#f55385"
 		},
 		"_sbt_light": {
-			"fontCharacter": "\\E06F",
+			"fontCharacter": "\\E071",
 			"fontColor": "#498ba7"
 		},
 		"_sbt": {
-			"fontCharacter": "\\E06F",
+			"fontCharacter": "\\E071",
 			"fontColor": "#519aba"
 		},
 		"_scala_light": {
-			"fontCharacter": "\\E070",
+			"fontCharacter": "\\E072",
 			"fontColor": "#b8383d"
 		},
 		"_scala": {
-			"fontCharacter": "\\E070",
+			"fontCharacter": "\\E072",
 			"fontColor": "#cc3e44"
 		},
 		"_shell_light": {
-			"fontCharacter": "\\E073",
+			"fontCharacter": "\\E075",
 			"fontColor": "#455155"
 		},
 		"_shell": {
-			"fontCharacter": "\\E073",
+			"fontCharacter": "\\E075",
 			"fontColor": "#4d5a5e"
 		},
 		"_slim_light": {
-			"fontCharacter": "\\E074",
+			"fontCharacter": "\\E076",
 			"fontColor": "#cc6d2e"
 		},
 		"_slim": {
-			"fontCharacter": "\\E074",
+			"fontCharacter": "\\E076",
 			"fontColor": "#e37933"
 		},
 		"_smarty_light": {
-			"fontCharacter": "\\E075",
+			"fontCharacter": "\\E077",
 			"fontColor": "#b7b73b"
 		},
 		"_smarty": {
-			"fontCharacter": "\\E075",
+			"fontCharacter": "\\E077",
 			"fontColor": "#cbcb41"
 		},
 		"_spring_light": {
-			"fontCharacter": "\\E076",
+			"fontCharacter": "\\E078",
 			"fontColor": "#7fae42"
 		},
 		"_spring": {
-			"fontCharacter": "\\E076",
+			"fontCharacter": "\\E078",
 			"fontColor": "#8dc149"
 		},
+		"_stylelint_light": {
+			"fontCharacter": "\\E079",
+			"fontColor": "#bfc2c1"
+		},
+		"_stylelint": {
+			"fontCharacter": "\\E079",
+			"fontColor": "#d4d7d6"
+		},
+		"_stylelint_1_light": {
+			"fontCharacter": "\\E079",
+			"fontColor": "#455155"
+		},
+		"_stylelint_1": {
+			"fontCharacter": "\\E079",
+			"fontColor": "#4d5a5e"
+		},
 		"_stylus_light": {
-			"fontCharacter": "\\E077",
+			"fontCharacter": "\\E07A",
 			"fontColor": "#7fae42"
 		},
 		"_stylus": {
-			"fontCharacter": "\\E077",
+			"fontCharacter": "\\E07A",
 			"fontColor": "#8dc149"
 		},
 		"_sublime_light": {
-			"fontCharacter": "\\E078",
+			"fontCharacter": "\\E07B",
 			"fontColor": "#cc6d2e"
 		},
 		"_sublime": {
-			"fontCharacter": "\\E078",
+			"fontCharacter": "\\E07B",
 			"fontColor": "#e37933"
 		},
 		"_svg_light": {
-			"fontCharacter": "\\E079",
+			"fontCharacter": "\\E07C",
 			"fontColor": "#9068b0"
 		},
 		"_svg": {
-			"fontCharacter": "\\E079",
+			"fontCharacter": "\\E07C",
 			"fontColor": "#a074c4"
 		},
+		"_svg_1_light": {
+			"fontCharacter": "\\E07C",
+			"fontColor": "#498ba7"
+		},
+		"_svg_1": {
+			"fontCharacter": "\\E07C",
+			"fontColor": "#519aba"
+		},
 		"_swift_light": {
-			"fontCharacter": "\\E07A",
+			"fontCharacter": "\\E07D",
 			"fontColor": "#cc6d2e"
 		},
 		"_swift": {
-			"fontCharacter": "\\E07A",
+			"fontCharacter": "\\E07D",
 			"fontColor": "#e37933"
 		},
 		"_terraform_light": {
-			"fontCharacter": "\\E07B",
+			"fontCharacter": "\\E07E",
 			"fontColor": "#9068b0"
 		},
 		"_terraform": {
-			"fontCharacter": "\\E07B",
+			"fontCharacter": "\\E07E",
 			"fontColor": "#a074c4"
 		},
 		"_tex_light": {
-			"fontCharacter": "\\E07C",
+			"fontCharacter": "\\E07F",
 			"fontColor": "#498ba7"
 		},
 		"_tex": {
-			"fontCharacter": "\\E07C",
+			"fontCharacter": "\\E07F",
 			"fontColor": "#519aba"
 		},
 		"_tex_1_light": {
-			"fontCharacter": "\\E07C",
+			"fontCharacter": "\\E07F",
 			"fontColor": "#b7b73b"
 		},
 		"_tex_1": {
-			"fontCharacter": "\\E07C",
+			"fontCharacter": "\\E07F",
 			"fontColor": "#cbcb41"
 		},
 		"_tex_2_light": {
-			"fontCharacter": "\\E07C",
+			"fontCharacter": "\\E07F",
 			"fontColor": "#cc6d2e"
 		},
 		"_tex_2": {
-			"fontCharacter": "\\E07C",
+			"fontCharacter": "\\E07F",
 			"fontColor": "#e37933"
 		},
 		"_tex_3_light": {
-			"fontCharacter": "\\E07C",
+			"fontCharacter": "\\E07F",
 			"fontColor": "#bfc2c1"
 		},
 		"_tex_3": {
-			"fontCharacter": "\\E07C",
+			"fontCharacter": "\\E07F",
 			"fontColor": "#d4d7d6"
 		},
 		"_todo": {
-			"fontCharacter": "\\E07E"
+			"fontCharacter": "\\E081"
 		},
 		"_twig_light": {
-			"fontCharacter": "\\E07F",
+			"fontCharacter": "\\E082",
 			"fontColor": "#7fae42"
 		},
 		"_twig": {
-			"fontCharacter": "\\E07F",
+			"fontCharacter": "\\E082",
 			"fontColor": "#8dc149"
 		},
 		"_typescript_light": {
-			"fontCharacter": "\\E080",
+			"fontCharacter": "\\E083",
 			"fontColor": "#498ba7"
 		},
 		"_typescript": {
-			"fontCharacter": "\\E080",
+			"fontCharacter": "\\E083",
 			"fontColor": "#519aba"
 		},
 		"_typescript_1_light": {
-			"fontCharacter": "\\E080",
+			"fontCharacter": "\\E083",
 			"fontColor": "#b7b73b"
 		},
 		"_typescript_1": {
-			"fontCharacter": "\\E080",
+			"fontCharacter": "\\E083",
 			"fontColor": "#cbcb41"
 		},
 		"_vala_light": {
-			"fontCharacter": "\\E081",
+			"fontCharacter": "\\E084",
 			"fontColor": "#627379"
 		},
 		"_vala": {
-			"fontCharacter": "\\E081",
+			"fontCharacter": "\\E084",
 			"fontColor": "#6d8086"
 		},
 		"_video_light": {
-			"fontCharacter": "\\E082",
+			"fontCharacter": "\\E085",
 			"fontColor": "#dd4b78"
 		},
 		"_video": {
-			"fontCharacter": "\\E082",
+			"fontCharacter": "\\E085",
 			"fontColor": "#f55385"
 		},
 		"_vue_light": {
-			"fontCharacter": "\\E083",
+			"fontCharacter": "\\E086",
 			"fontColor": "#7fae42"
 		},
 		"_vue": {
-			"fontCharacter": "\\E083",
+			"fontCharacter": "\\E086",
 			"fontColor": "#8dc149"
 		},
+		"_wasm_light": {
+			"fontCharacter": "\\E087",
+			"fontColor": "#9068b0"
+		},
+		"_wasm": {
+			"fontCharacter": "\\E087",
+			"fontColor": "#a074c4"
+		},
+		"_wat_light": {
+			"fontCharacter": "\\E088",
+			"fontColor": "#9068b0"
+		},
+		"_wat": {
+			"fontCharacter": "\\E088",
+			"fontColor": "#a074c4"
+		},
 		"_webpack_light": {
-			"fontCharacter": "\\E084",
+			"fontCharacter": "\\E089",
 			"fontColor": "#498ba7"
 		},
 		"_webpack": {
-			"fontCharacter": "\\E084",
+			"fontCharacter": "\\E089",
 			"fontColor": "#519aba"
 		},
 		"_wgt_light": {
-			"fontCharacter": "\\E085",
+			"fontCharacter": "\\E08A",
 			"fontColor": "#498ba7"
 		},
 		"_wgt": {
-			"fontCharacter": "\\E085",
+			"fontCharacter": "\\E08A",
 			"fontColor": "#519aba"
 		},
 		"_windows_light": {
-			"fontCharacter": "\\E086",
+			"fontCharacter": "\\E08B",
 			"fontColor": "#498ba7"
 		},
 		"_windows": {
-			"fontCharacter": "\\E086",
+			"fontCharacter": "\\E08B",
 			"fontColor": "#519aba"
 		},
 		"_word_light": {
-			"fontCharacter": "\\E087",
+			"fontCharacter": "\\E08C",
 			"fontColor": "#498ba7"
 		},
 		"_word": {
-			"fontCharacter": "\\E087",
+			"fontCharacter": "\\E08C",
 			"fontColor": "#519aba"
 		},
 		"_xls_light": {
-			"fontCharacter": "\\E088",
+			"fontCharacter": "\\E08D",
 			"fontColor": "#7fae42"
 		},
 		"_xls": {
-			"fontCharacter": "\\E088",
+			"fontCharacter": "\\E08D",
 			"fontColor": "#8dc149"
 		},
 		"_xml_light": {
-			"fontCharacter": "\\E089",
+			"fontCharacter": "\\E08E",
 			"fontColor": "#cc6d2e"
 		},
 		"_xml": {
-			"fontCharacter": "\\E089",
+			"fontCharacter": "\\E08E",
 			"fontColor": "#e37933"
 		},
 		"_yarn_light": {
-			"fontCharacter": "\\E08A",
+			"fontCharacter": "\\E08F",
 			"fontColor": "#498ba7"
 		},
 		"_yarn": {
-			"fontCharacter": "\\E08A",
+			"fontCharacter": "\\E08F",
 			"fontColor": "#519aba"
 		},
 		"_yml_light": {
-			"fontCharacter": "\\E08B",
+			"fontCharacter": "\\E090",
 			"fontColor": "#9068b0"
 		},
 		"_yml": {
-			"fontCharacter": "\\E08B",
+			"fontCharacter": "\\E090",
 			"fontColor": "#a074c4"
 		},
 		"_zip_light": {
-			"fontCharacter": "\\E08C",
+			"fontCharacter": "\\E091",
 			"fontColor": "#b8383d"
 		},
 		"_zip": {
-			"fontCharacter": "\\E08C",
+			"fontCharacter": "\\E091",
 			"fontColor": "#cc3e44"
 		},
 		"_zip_1_light": {
-			"fontCharacter": "\\E08C",
+			"fontCharacter": "\\E091",
 			"fontColor": "#627379"
 		},
 		"_zip_1": {
-			"fontCharacter": "\\E08C",
+			"fontCharacter": "\\E091",
 			"fontColor": "#6d8086"
 		}
 	},
@@ -1231,8 +1303,12 @@
 		"jinja": "_jinja",
 		"jinja2": "_jinja",
 		"jl": "_julia",
+		"kt": "_kotlin",
+		"kts": "_kotlin",
 		"liquid": "_liquid",
 		"ls": "_livescript",
+		"argdown": "_argdown",
+		"ad": "_argdown",
 		"mustache": "_mustache",
 		"stache": "_mustache",
 		"njk": "_nunjucks",
@@ -1254,6 +1330,7 @@
 		"pp": "_puppet",
 		"epp": "_puppet",
 		"cjsx": "_react",
+		"r": "_R",
 		"erb": "_html_erb",
 		"erb.html": "_html_erb",
 		"html.erb": "_html_erb",
@@ -1279,6 +1356,8 @@
 		"vala": "_vala",
 		"vapi": "_vala",
 		"vue": "_vue",
+		"wasm": "_wasm",
+		"wat": "_wat",
 		"jar": "_zip",
 		"zip": "_zip_1",
 		"wgt": "_wgt",
@@ -1310,6 +1389,12 @@
 		"mp3": "_audio",
 		"ogg": "_audio",
 		"wav": "_audio",
+		"flac": "_audio",
+		"3ds": "_svg_1",
+		"3dm": "_svg_1",
+		"stl": "_svg_1",
+		"obj": "_svg_1",
+		"dae": "_svg_1",
 		"babelrc": "_babel",
 		"bowerrc": "_bower",
 		"dockerignore": "_docker_1",
@@ -1323,6 +1408,12 @@
 		"firebaserc": "_firebase",
 		"jshintrc": "_javascript_2",
 		"jscsrc": "_javascript_2",
+		"stylelintrc": "_stylelint",
+		"stylelintrc.json": "_stylelint",
+		"stylelintrc.yaml": "_stylelint",
+		"stylelintrc.yml": "_stylelint",
+		"stylelintrc.js": "_stylelint",
+		"stylelintignore": "_stylelint_1",
 		"direnv": "_config",
 		"env": "_config",
 		"static": "_config",
@@ -1341,9 +1432,13 @@
 		"readme.md": "_info",
 		"changelog.md": "_clock",
 		"changelog": "_clock",
+		"changes.md": "_clock",
 		"version.md": "_clock",
 		"version": "_clock",
 		"mvnw": "_maven",
+		"swagger.json": "_json_1",
+		"swagger.yml": "_json_1",
+		"swagger.yaml": "_json_1",
 		"mime.types": "_config",
 		"jenkinsfile": "_jenkins",
 		"bower.json": "_bower",
@@ -1360,6 +1455,7 @@
 		"ionic.project": "_ionic",
 		"rollup.config.js": "_rollup",
 		"sass-lint.yml": "_sass",
+		"stylelint.config.js": "_stylelint",
 		"yarn.clean": "_yarn",
 		"yarn.lock": "_yarn",
 		"webpack.config.js": "_webpack",
@@ -1405,6 +1501,7 @@
 		"powershell": "_powershell",
 		"jade": "_jade",
 		"python": "_python",
+		"r": "_R",
 		"ruby": "_ruby",
 		"rust": "_rust",
 		"scss": "_sass",
@@ -1414,7 +1511,26 @@
 		"typescript": "_typescript",
 		"typescriptreact": "_react",
 		"xml": "_xml",
-		"yaml": "_yml"
+		"yaml": "_yml",
+		"argdown": "_argdown",
+		"elm": "_elm",
+		"ocaml": "_ocaml",
+		"nunjucks": "_nunjucks",
+		"mustache": "_mustache",
+		"erb": "_html_erb",
+		"terraform": "_terraform",
+		"vue": "_vue",
+		"sass": "_sass",
+		"kotlin": "_kotlin",
+		"jinja": "_jinja",
+		"haxe": "_haxe",
+		"haskell": "_haskell",
+		"gradle": "_gradle",
+		"elixir": "_elixir",
+		"haml": "_haml",
+		"stylus": "_stylus",
+		"vala": "_vala",
+		"todo": "_todo"
 	},
 	"light": {
 		"file": "_default_light",
@@ -1478,8 +1594,12 @@
 			"jinja": "_jinja_light",
 			"jinja2": "_jinja_light",
 			"jl": "_julia_light",
+			"kt": "_kotlin_light",
+			"kts": "_kotlin_light",
 			"liquid": "_liquid_light",
 			"ls": "_livescript_light",
+			"argdown": "_argdown_light",
+			"ad": "_argdown_light",
 			"mustache": "_mustache_light",
 			"stache": "_mustache_light",
 			"njk": "_nunjucks_light",
@@ -1501,6 +1621,7 @@
 			"pp": "_puppet_light",
 			"epp": "_puppet_light",
 			"cjsx": "_react_light",
+			"r": "_R_light",
 			"erb": "_html_erb_light",
 			"erb.html": "_html_erb_light",
 			"html.erb": "_html_erb_light",
@@ -1526,6 +1647,8 @@
 			"vala": "_vala_light",
 			"vapi": "_vala_light",
 			"vue": "_vue_light",
+			"wasm": "_wasm_light",
+			"wat": "_wat_light",
 			"jar": "_zip_light",
 			"zip": "_zip_1_light",
 			"wgt": "_wgt_light",
@@ -1557,6 +1680,12 @@
 			"mp3": "_audio_light",
 			"ogg": "_audio_light",
 			"wav": "_audio_light",
+			"flac": "_audio_light",
+			"3ds": "_svg_1_light",
+			"3dm": "_svg_1_light",
+			"stl": "_svg_1_light",
+			"obj": "_svg_1_light",
+			"dae": "_svg_1_light",
 			"babelrc": "_babel_light",
 			"bowerrc": "_bower_light",
 			"dockerignore": "_docker_1_light",
@@ -1570,6 +1699,12 @@
 			"firebaserc": "_firebase_light",
 			"jshintrc": "_javascript_2_light",
 			"jscsrc": "_javascript_2_light",
+			"stylelintrc": "_stylelint_light",
+			"stylelintrc.json": "_stylelint_light",
+			"stylelintrc.yaml": "_stylelint_light",
+			"stylelintrc.yml": "_stylelint_light",
+			"stylelintrc.js": "_stylelint_light",
+			"stylelintignore": "_stylelint_1_light",
 			"direnv": "_config_light",
 			"env": "_config_light",
 			"static": "_config_light",
@@ -1610,6 +1745,7 @@
 			"powershell": "_powershell_light",
 			"jade": "_jade_light",
 			"python": "_python_light",
+			"r": "_R_light",
 			"ruby": "_ruby_light",
 			"rust": "_rust_light",
 			"scss": "_sass_light",
@@ -1619,7 +1755,25 @@
 			"typescript": "_typescript_light",
 			"typescriptreact": "_react_light",
 			"xml": "_xml_light",
-			"yaml": "_yml_light"
+			"yaml": "_yml_light",
+			"argdown": "_argdown_light",
+			"elm": "_elm_light",
+			"ocaml": "_ocaml_light",
+			"nunjucks": "_nunjucks_light",
+			"mustache": "_mustache_light",
+			"erb": "_html_erb_light",
+			"terraform": "_terraform_light",
+			"vue": "_vue_light",
+			"sass": "_sass_light",
+			"kotlin": "_kotlin_light",
+			"jinja": "_jinja_light",
+			"haxe": "_haxe_light",
+			"haskell": "_haskell_light",
+			"gradle": "_gradle_light",
+			"elixir": "_elixir_light",
+			"haml": "_haml_light",
+			"stylus": "_stylus_light",
+			"vala": "_vala_light"
 		},
 		"fileNames": {
 			"mix": "_hex_light",
@@ -1628,9 +1782,13 @@
 			"readme.md": "_info_light",
 			"changelog.md": "_clock_light",
 			"changelog": "_clock_light",
+			"changes.md": "_clock_light",
 			"version.md": "_clock_light",
 			"version": "_clock_light",
 			"mvnw": "_maven_light",
+			"swagger.json": "_json_1_light",
+			"swagger.yml": "_json_1_light",
+			"swagger.yaml": "_json_1_light",
 			"mime.types": "_config_light",
 			"jenkinsfile": "_jenkins_light",
 			"bower.json": "_bower_light",
@@ -1647,6 +1805,7 @@
 			"ionic.project": "_ionic_light",
 			"rollup.config.js": "_rollup_light",
 			"sass-lint.yml": "_sass_light",
+			"stylelint.config.js": "_stylelint_light",
 			"yarn.clean": "_yarn_light",
 			"yarn.lock": "_yarn_light",
 			"webpack.config.js": "_webpack_light",
@@ -1663,5 +1822,5 @@
 			"npm-debug.log": "_npm_ignored_light"
 		}
 	},
-	"version": "https://github.com/jesseweed/seti-ui/commit/188dda34a56b9555c7d363771264c24f4693983d"
+	"version": "https://github.com/jesseweed/seti-ui/commit/7714a720646300bb8f6d1690752cd71f50991414"
 }
\ No newline at end of file
diff --git a/extensions/theme-solarized-light/themes/solarized-light-color-theme.json b/extensions/theme-solarized-light/themes/solarized-light-color-theme.json
index 37f3e385d7b..1f0cd3202e7 100644
--- a/extensions/theme-solarized-light/themes/solarized-light-color-theme.json
+++ b/extensions/theme-solarized-light/themes/solarized-light-color-theme.json
@@ -481,6 +481,9 @@
 		"terminal.ansiBrightBlue": "#839496",
 		"terminal.ansiBrightMagenta": "#6c71c4",
 		"terminal.ansiBrightCyan": "#93a1a1",
-		"terminal.ansiBrightWhite": "#eee8d5"
+		"terminal.ansiBrightWhite": "#eee8d5",
+
+		// Interactive Playground
+		"walkThrough.embeddedEditorBackground": "#00000014"
 	}
 }
\ No newline at end of file
diff --git a/extensions/typescript-basics/language-configuration.json b/extensions/typescript-basics/language-configuration.json
index 1e8f440a420..b41053843cf 100644
--- a/extensions/typescript-basics/language-configuration.json
+++ b/extensions/typescript-basics/language-configuration.json
@@ -25,6 +25,7 @@
 		["\"", "\""],
 		["`", "`"]
 	],
+	"autoCloseBefore": ";:.,=}])>` \n\t",
 	"folding": {
 		"markers": {
 			"start": "^\\s*//\\s*#?region\\b",
diff --git a/extensions/typescript-basics/syntaxes/TypeScript.tmLanguage.json b/extensions/typescript-basics/syntaxes/TypeScript.tmLanguage.json
index 6cc1633cd14..1003c443970 100644
--- a/extensions/typescript-basics/syntaxes/TypeScript.tmLanguage.json
+++ b/extensions/typescript-basics/syntaxes/TypeScript.tmLanguage.json
@@ -4,7 +4,7 @@
 		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
 		"Once accepted there, we are happy to receive an update request."
 	],
-	"version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/53ce68bc2e8abcfa9bce7fb555ccd60c5bacd11e",
+	"version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/3f8583969690a13fc8d41cbc788d4ab5a19248ca",
 	"name": "TypeScript",
 	"scopeName": "source.ts",
 	"patterns": [
@@ -93,6 +93,10 @@
 				},
 				{
 					"include": "#export-declaration"
+				},
+				{
+					"name": "storage.modifier.ts",
+					"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(declare|export)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))"
 				}
 			]
 		},
@@ -140,12 +144,12 @@
 					"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(with)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))"
 				},
 				{
-					"name": "keyword.other.debugger.ts",
-					"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(debugger)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))"
+					"name": "keyword.control.ts",
+					"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(package)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))"
 				},
 				{
-					"name": "storage.modifier.ts",
-					"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(declare)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))"
+					"name": "keyword.other.debugger.ts",
+					"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(debugger)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))"
 				}
 			]
 		},
@@ -278,41 +282,26 @@
 			]
 		},
 		"var-expr": {
-			"name": "meta.var.expr.ts",
-			"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?\\b(var|let|const(?!\\s+enum\\b))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))",
-			"beginCaptures": {
-				"1": {
-					"name": "keyword.control.export.ts"
-				},
-				"2": {
-					"name": "storage.type.ts"
-				}
-			},
-			"end": "(?=$|^|;|}|(\\s+(of|in)\\s+))",
 			"patterns": [
 				{
-					"include": "#destructuring-variable"
-				},
-				{
-					"include": "#var-single-variable"
-				},
-				{
-					"include": "#variable-initializer"
-				},
-				{
-					"include": "#comment"
-				},
-				{
-					"begin": "(,)\\s*(?!\\S)",
-					"beginCaptures": {
-						"1": {
-							"name": "punctuation.separator.comma.ts"
-						}
-					},
-					"end": "(?<!,)((?==|;|}|(\\s+(of|in)\\s+)|^\\s*$))|((?<=\\S)(?=\\s*$))",
+					"name": "meta.var.expr.ts",
+					"begin": "(?=(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(var|let)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))",
+					"end": "(?!(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(var|let)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))((?=;|}|(\\s+(of|in)\\s+)|^\\s*$|;|(?:^\\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\\b))|((?<!^let|[^\\._$[:alnum:]]let|^var|[^\\._$[:alnum:]]var)(?=\\s*$)))",
 					"patterns": [
 						{
-							"include": "#comment"
+							"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(var|let)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*",
+							"beginCaptures": {
+								"1": {
+									"name": "keyword.control.export.ts"
+								},
+								"2": {
+									"name": "storage.modifier.ts"
+								},
+								"3": {
+									"name": "storage.type.ts"
+								}
+							},
+							"end": "(?=\\S)"
 						},
 						{
 							"include": "#destructuring-variable"
@@ -320,13 +309,116 @@
 						{
 							"include": "#var-single-variable"
 						},
+						{
+							"include": "#variable-initializer"
+						},
+						{
+							"include": "#comment"
+						},
+						{
+							"begin": "(,)\\s*((?!\\S)|(?=\\/\\/))",
+							"beginCaptures": {
+								"1": {
+									"name": "punctuation.separator.comma.ts"
+								}
+							},
+							"end": "(?<!,)(((?==|;|}|(\\s+(of|in)\\s+)|^\\s*$))|((?<=\\S)(?=\\s*$)))",
+							"patterns": [
+								{
+									"include": "#single-line-comment-consuming-line-ending"
+								},
+								{
+									"include": "#comment"
+								},
+								{
+									"include": "#destructuring-variable"
+								},
+								{
+									"include": "#var-single-variable"
+								},
+								{
+									"include": "#punctuation-comma"
+								}
+							]
+						},
 						{
 							"include": "#punctuation-comma"
 						}
 					]
 				},
 				{
-					"include": "#punctuation-comma"
+					"name": "meta.var.expr.ts",
+					"begin": "(?=(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(const(?!\\s+enum\\b))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))",
+					"beginCaptures": {
+						"1": {
+							"name": "keyword.control.export.ts"
+						},
+						"2": {
+							"name": "storage.modifier.ts"
+						},
+						"3": {
+							"name": "storage.type.ts"
+						}
+					},
+					"end": "(?!(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(const(?!\\s+enum\\b))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))((?=;|}|(\\s+(of|in)\\s+)|^\\s*$|;|(?:^\\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\\b))|((?<!^const|[^\\._$[:alnum:]]const)(?=\\s*$)))",
+					"patterns": [
+						{
+							"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(const(?!\\s+enum\\b))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*",
+							"beginCaptures": {
+								"1": {
+									"name": "keyword.control.export.ts"
+								},
+								"2": {
+									"name": "storage.modifier.ts"
+								},
+								"3": {
+									"name": "storage.type.ts"
+								}
+							},
+							"end": "(?=\\S)"
+						},
+						{
+							"include": "#destructuring-const"
+						},
+						{
+							"include": "#var-single-const"
+						},
+						{
+							"include": "#variable-initializer"
+						},
+						{
+							"include": "#comment"
+						},
+						{
+							"begin": "(,)\\s*((?!\\S)|(?=\\/\\/))",
+							"beginCaptures": {
+								"1": {
+									"name": "punctuation.separator.comma.ts"
+								}
+							},
+							"end": "(?<!,)(((?==|;|}|(\\s+(of|in)\\s+)|^\\s*$))|((?<=\\S)(?=\\s*$)))",
+							"patterns": [
+								{
+									"include": "#single-line-comment-consuming-line-ending"
+								},
+								{
+									"include": "#comment"
+								},
+								{
+									"include": "#destructuring-const"
+								},
+								{
+									"include": "#var-single-const"
+								},
+								{
+									"include": "#punctuation-comma"
+								}
+							]
+						},
+						{
+							"include": "#punctuation-comma"
+						}
+					]
 				}
 			]
 		},
@@ -334,7 +426,7 @@
 			"patterns": [
 				{
 					"name": "meta.var-single-variable.expr.ts",
-					"begin": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?[\\(]\\s*([\\{\\[]\\s*)?$) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?[\\(]\\s*([\\{\\[]\\s*)?$) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
+					"begin": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?[\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*((<\\s*$)|((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?[\\(]\\s*([\\{\\[]\\s*)?$))) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?[\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
 					"beginCaptures": {
 						"1": {
 							"name": "meta.definition.variable.ts entity.name.function.ts"
@@ -379,6 +471,40 @@
 				}
 			]
 		},
+		"var-single-const": {
+			"patterns": [
+				{
+					"name": "meta.var-single-variable.expr.ts",
+					"begin": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?[\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*((<\\s*$)|((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?[\\(]\\s*([\\{\\[]\\s*)?$))) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?[\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
+					"beginCaptures": {
+						"1": {
+							"name": "meta.definition.variable.ts variable.other.constant.ts entity.name.function.ts"
+						}
+					},
+					"end": "(?=$|^|[;,=}]|(\\s+(of|in)\\s+))",
+					"patterns": [
+						{
+							"include": "#var-single-variable-type-annotation"
+						}
+					]
+				},
+				{
+					"name": "meta.var-single-variable.expr.ts",
+					"begin": "([_$[:alpha:]][_$[:alnum:]]*)",
+					"beginCaptures": {
+						"1": {
+							"name": "meta.definition.variable.ts variable.other.constant.ts"
+						}
+					},
+					"end": "(?=$|^|[;,=}]|(\\s+(of|in)\\s+))",
+					"patterns": [
+						{
+							"include": "#var-single-variable-type-annotation"
+						}
+					]
+				}
+			]
+		},
 		"var-single-variable-type-annotation": {
 			"patterns": [
 				{
@@ -428,6 +554,42 @@
 				}
 			]
 		},
+		"destructuring-const": {
+			"patterns": [
+				{
+					"name": "meta.object-binding-pattern-variable.ts",
+					"begin": "(?<!=|:|^of|[^\\._$[:alnum:]]of|^in|[^\\._$[:alnum:]]in)\\s*(?=\\{)",
+					"end": "(?=$|^|[;,=}]|(\\s+(of|in)\\s+))",
+					"patterns": [
+						{
+							"include": "#object-binding-pattern-const"
+						},
+						{
+							"include": "#type-annotation"
+						},
+						{
+							"include": "#comment"
+						}
+					]
+				},
+				{
+					"name": "meta.array-binding-pattern-variable.ts",
+					"begin": "(?<!=|:|^of|[^\\._$[:alnum:]]of|^in|[^\\._$[:alnum:]]in)\\s*(?=\\[)",
+					"end": "(?=$|^|[;,=}]|(\\s+(of|in)\\s+))",
+					"patterns": [
+						{
+							"include": "#array-binding-pattern-const"
+						},
+						{
+							"include": "#type-annotation"
+						},
+						{
+							"include": "#comment"
+						}
+					]
+				}
+			]
+		},
 		"object-binding-element": {
 			"patterns": [
 				{
@@ -459,6 +621,37 @@
 				}
 			]
 		},
+		"object-binding-element-const": {
+			"patterns": [
+				{
+					"include": "#comment"
+				},
+				{
+					"begin": "(?x)(?=((\\b(?<!\\$)0(x|X)[0-9a-fA-F][0-9a-fA-F_]*\\b(?!\\$))|(\\b(?<!\\$)0(b|B)[01][01_]*\\b(?!\\$))|(\\b(?<!\\$)0(o|O)?[0-7][0-7_]*\\b(?!\\$))|((?<!\\$)(?:\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)| # 1.1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*\\b)|             # 1.E+3\n  (?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)|             # .1E+3\n  (?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)|                 # 1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*\\b)|                      # 1.1\n  (?:\\b[0-9][0-9_]*(\\.)\\B)|                                  # 1.\n  (?:\\B(\\.)[0-9][0-9_]*\\b)|                                  # .1\n  (?:\\b[0-9][0-9_]*\\b(?!\\.))                                 # 1\n)(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\\\'|\\\\)*\\')|(\\\"([^\\\"\\\\]|\\\\\\\"|\\\\)*\\\")|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(:))",
+					"end": "(?=,|\\})",
+					"patterns": [
+						{
+							"include": "#object-binding-element-propertyName"
+						},
+						{
+							"include": "#binding-element-const"
+						}
+					]
+				},
+				{
+					"include": "#object-binding-pattern-const"
+				},
+				{
+					"include": "#destructuring-variable-rest-const"
+				},
+				{
+					"include": "#variable-initializer"
+				},
+				{
+					"include": "#punctuation-comma"
+				}
+			]
+		},
 		"object-binding-element-propertyName": {
 			"begin": "(?x)(?=((\\b(?<!\\$)0(x|X)[0-9a-fA-F][0-9a-fA-F_]*\\b(?!\\$))|(\\b(?<!\\$)0(b|B)[01][01_]*\\b(?!\\$))|(\\b(?<!\\$)0(o|O)?[0-7][0-7_]*\\b(?!\\$))|((?<!\\$)(?:\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)| # 1.1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*\\b)|             # 1.E+3\n  (?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)|             # .1E+3\n  (?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)|                 # 1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*\\b)|                      # 1.1\n  (?:\\b[0-9][0-9_]*(\\.)\\B)|                                  # 1.\n  (?:\\B(\\.)[0-9][0-9_]*\\b)|                                  # .1\n  (?:\\b[0-9][0-9_]*\\b(?!\\.))                                 # 1\n)(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\\\'|\\\\)*\\')|(\\\"([^\\\"\\\\]|\\\\\\\"|\\\\)*\\\")|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(:))",
 			"end": "(:)",
@@ -505,6 +698,28 @@
 				}
 			]
 		},
+		"binding-element-const": {
+			"patterns": [
+				{
+					"include": "#comment"
+				},
+				{
+					"include": "#string"
+				},
+				{
+					"include": "#object-binding-pattern-const"
+				},
+				{
+					"include": "#array-binding-pattern-const"
+				},
+				{
+					"include": "#destructuring-variable-rest-const"
+				},
+				{
+					"include": "#variable-initializer"
+				}
+			]
+		},
 		"destructuring-variable-rest": {
 			"match": "(?:(\\.\\.\\.)\\s*)?([_$[:alpha:]][_$[:alnum:]]*)",
 			"captures": {
@@ -516,6 +731,17 @@
 				}
 			}
 		},
+		"destructuring-variable-rest-const": {
+			"match": "(?:(\\.\\.\\.)\\s*)?([_$[:alpha:]][_$[:alnum:]]*)",
+			"captures": {
+				"1": {
+					"name": "keyword.operator.rest.ts"
+				},
+				"2": {
+					"name": "meta.definition.variable.ts variable.other.constant.ts"
+				}
+			}
+		},
 		"object-binding-pattern": {
 			"begin": "(?:(\\.\\.\\.)\\s*)?(\\{)",
 			"beginCaptures": {
@@ -538,6 +764,28 @@
 				}
 			]
 		},
+		"object-binding-pattern-const": {
+			"begin": "(?:(\\.\\.\\.)\\s*)?(\\{)",
+			"beginCaptures": {
+				"1": {
+					"name": "keyword.operator.rest.ts"
+				},
+				"2": {
+					"name": "punctuation.definition.binding-pattern.object.ts"
+				}
+			},
+			"end": "\\}",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.binding-pattern.object.ts"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#object-binding-element-const"
+				}
+			]
+		},
 		"array-binding-pattern": {
 			"begin": "(?:(\\.\\.\\.)\\s*)?(\\[)",
 			"beginCaptures": {
@@ -563,6 +811,31 @@
 				}
 			]
 		},
+		"array-binding-pattern-const": {
+			"begin": "(?:(\\.\\.\\.)\\s*)?(\\[)",
+			"beginCaptures": {
+				"1": {
+					"name": "keyword.operator.rest.ts"
+				},
+				"2": {
+					"name": "punctuation.definition.binding-pattern.array.ts"
+				}
+			},
+			"end": "\\]",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.binding-pattern.array.ts"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#binding-element-const"
+				},
+				{
+					"include": "#punctuation-comma"
+				}
+			]
+		},
 		"parameter-name": {
 			"patterns": [
 				{
@@ -574,7 +847,7 @@
 					}
 				},
 				{
-					"match": "(?x)(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<!=|:)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*(\\??)(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?[\\(]\\s*([\\{\\[]\\s*)?$) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?[\\(]\\s*([\\{\\[]\\s*)?$) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
+					"match": "(?x)(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<!=|:)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*(\\??)(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?[\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*((<\\s*$)|((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?[\\(]\\s*([\\{\\[]\\s*)?$))) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?[\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
 					"captures": {
 						"1": {
 							"name": "storage.modifier.ts"
@@ -619,9 +892,12 @@
 			"patterns": [
 				{
 					"name": "meta.parameter.object-binding-pattern.ts",
-					"begin": "(?<!=|:)\\s*(\\{)",
+					"begin": "(?<!=|:)\\s*(?:(\\.\\.\\.)\\s*)?(\\{)",
 					"beginCaptures": {
 						"1": {
+							"name": "keyword.operator.rest.ts"
+						},
+						"2": {
 							"name": "punctuation.definition.binding-pattern.object.ts"
 						}
 					},
@@ -639,9 +915,12 @@
 				},
 				{
 					"name": "meta.paramter.array-binding-pattern.ts",
-					"begin": "(?<!=|:)\\s*(\\[)",
+					"begin": "(?<!=|:)\\s*(?:(\\.\\.\\.)\\s*)?(\\[)",
 					"beginCaptures": {
 						"1": {
+							"name": "keyword.operator.rest.ts"
+						},
+						"2": {
 							"name": "punctuation.definition.binding-pattern.array.ts"
 						}
 					},
@@ -775,56 +1054,50 @@
 		},
 		"field-declaration": {
 			"name": "meta.field.declaration.ts",
-			"begin": "(?x)(?<!\\()(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(readonly)\\s+)?(?=((\\b(?<!\\$)0(x|X)[0-9a-fA-F][0-9a-fA-F_]*\\b(?!\\$))|(\\b(?<!\\$)0(b|B)[01][01_]*\\b(?!\\$))|(\\b(?<!\\$)0(o|O)?[0-7][0-7_]*\\b(?!\\$))|((?<!\\$)(?:\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)| # 1.1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*\\b)|             # 1.E+3\n  (?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)|             # .1E+3\n  (?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)|                 # 1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*\\b)|                      # 1.1\n  (?:\\b[0-9][0-9_]*(\\.)\\B)|                                  # 1.\n  (?:\\B(\\.)[0-9][0-9_]*\\b)|                                  # .1\n  (?:\\b[0-9][0-9_]*\\b(?!\\.))                                 # 1\n)(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\\\'|\\\\)*\\')|(\\\"([^\\\"\\\\]|\\\\\\\"|\\\\)*\\\")|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(\\?\\s*)?(=|:))",
+			"begin": "(?x)(?<!\\()(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(readonly)\\s+)?(?=\\s*((\\b(?<!\\$)0(x|X)[0-9a-fA-F][0-9a-fA-F_]*\\b(?!\\$))|(\\b(?<!\\$)0(b|B)[01][01_]*\\b(?!\\$))|(\\b(?<!\\$)0(o|O)?[0-7][0-7_]*\\b(?!\\$))|((?<!\\$)(?:\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)| # 1.1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*\\b)|             # 1.E+3\n  (?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)|             # .1E+3\n  (?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)|                 # 1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*\\b)|                      # 1.1\n  (?:\\b[0-9][0-9_]*(\\.)\\B)|                                  # 1.\n  (?:\\B(\\.)[0-9][0-9_]*\\b)|                                  # .1\n  (?:\\b[0-9][0-9_]*\\b(?!\\.))                                 # 1\n)(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\\\'|\\\\)*\\')|(\\\"([^\\\"\\\\]|\\\\\\\"|\\\\)*\\\")|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(\\?\\s*)?(=|:|;|,|$))",
 			"beginCaptures": {
 				"1": {
 					"name": "storage.modifier.ts"
 				}
 			},
-			"end": "(?x)(?=\\}|;|,|$|(^(?!((\\b(?<!\\$)0(x|X)[0-9a-fA-F][0-9a-fA-F_]*\\b(?!\\$))|(\\b(?<!\\$)0(b|B)[01][01_]*\\b(?!\\$))|(\\b(?<!\\$)0(o|O)?[0-7][0-7_]*\\b(?!\\$))|((?<!\\$)(?:\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)| # 1.1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*\\b)|             # 1.E+3\n  (?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)|             # .1E+3\n  (?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)|                 # 1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*\\b)|                      # 1.1\n  (?:\\b[0-9][0-9_]*(\\.)\\B)|                                  # 1.\n  (?:\\B(\\.)[0-9][0-9_]*\\b)|                                  # .1\n  (?:\\b[0-9][0-9_]*\\b(?!\\.))                                 # 1\n)(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\\\'|\\\\)*\\')|(\\\"([^\\\"\\\\]|\\\\\\\"|\\\\)*\\\")|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(\\?\\s*)?(=|:))))|(?<=\\})",
+			"end": "(?x)(?=\\}|;|,|$|(^(?!\\s*((\\b(?<!\\$)0(x|X)[0-9a-fA-F][0-9a-fA-F_]*\\b(?!\\$))|(\\b(?<!\\$)0(b|B)[01][01_]*\\b(?!\\$))|(\\b(?<!\\$)0(o|O)?[0-7][0-7_]*\\b(?!\\$))|((?<!\\$)(?:\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)| # 1.1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*\\b)|             # 1.E+3\n  (?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)|             # .1E+3\n  (?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)|                 # 1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*\\b)|                      # 1.1\n  (?:\\b[0-9][0-9_]*(\\.)\\B)|                                  # 1.\n  (?:\\B(\\.)[0-9][0-9_]*\\b)|                                  # .1\n  (?:\\b[0-9][0-9_]*\\b(?!\\.))                                 # 1\n)(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\\\'|\\\\)*\\')|(\\\"([^\\\"\\\\]|\\\\\\\"|\\\\)*\\\")|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(\\?\\s*)?(=|:|;|,|$))))|(?<=\\})",
 			"patterns": [
 				{
 					"include": "#variable-initializer"
 				},
 				{
-					"begin": "(?x)(?=((\\b(?<!\\$)0(x|X)[0-9a-fA-F][0-9a-fA-F_]*\\b(?!\\$))|(\\b(?<!\\$)0(b|B)[01][01_]*\\b(?!\\$))|(\\b(?<!\\$)0(o|O)?[0-7][0-7_]*\\b(?!\\$))|((?<!\\$)(?:\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)| # 1.1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*\\b)|             # 1.E+3\n  (?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)|             # .1E+3\n  (?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)|                 # 1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*\\b)|                      # 1.1\n  (?:\\b[0-9][0-9_]*(\\.)\\B)|                                  # 1.\n  (?:\\B(\\.)[0-9][0-9_]*\\b)|                                  # .1\n  (?:\\b[0-9][0-9_]*\\b(?!\\.))                                 # 1\n)(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\\\'|\\\\)*\\')|(\\\"([^\\\"\\\\]|\\\\\\\"|\\\\)*\\\")|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(\\?\\s*)?(=|:))",
-					"end": "(?x)(?=[};,=]|$|(^(?!((\\b(?<!\\$)0(x|X)[0-9a-fA-F][0-9a-fA-F_]*\\b(?!\\$))|(\\b(?<!\\$)0(b|B)[01][01_]*\\b(?!\\$))|(\\b(?<!\\$)0(o|O)?[0-7][0-7_]*\\b(?!\\$))|((?<!\\$)(?:\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)| # 1.1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*\\b)|             # 1.E+3\n  (?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)|             # .1E+3\n  (?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)|                 # 1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*\\b)|                      # 1.1\n  (?:\\b[0-9][0-9_]*(\\.)\\B)|                                  # 1.\n  (?:\\B(\\.)[0-9][0-9_]*\\b)|                                  # .1\n  (?:\\b[0-9][0-9_]*\\b(?!\\.))                                 # 1\n)(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\\\'|\\\\)*\\')|(\\\"([^\\\"\\\\]|\\\\\\\"|\\\\)*\\\")|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(\\?\\s*)?(=|:))))|(?<=\\})",
-					"patterns": [
-						{
-							"include": "#type-annotation"
+					"include": "#type-annotation"
+				},
+				{
+					"include": "#string"
+				},
+				{
+					"include": "#array-literal"
+				},
+				{
+					"include": "#numeric-literal"
+				},
+				{
+					"include": "#comment"
+				},
+				{
+					"match": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(\\?)?(?=(\\?\\s*)?\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?[\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*((<\\s*$)|((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?[\\(]\\s*([\\{\\[]\\s*)?$))) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?[\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
+					"captures": {
+						"1": {
+							"name": "meta.definition.property.ts entity.name.function.ts"
 						},
-						{
-							"include": "#string"
-						},
-						{
-							"include": "#array-literal"
-						},
-						{
-							"include": "#numeric-literal"
-						},
-						{
-							"include": "#comment"
-						},
-						{
-							"match": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(\\?)?(?=(\\?\\s*)?\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?[\\(]\\s*([\\{\\[]\\s*)?$) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?[\\(]\\s*([\\{\\[]\\s*)?$) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
-							"captures": {
-								"1": {
-									"name": "meta.definition.property.ts entity.name.function.ts"
-								},
-								"2": {
-									"name": "keyword.operator.optional.ts"
-								}
-							}
-						},
-						{
-							"name": "meta.definition.property.ts variable.object.property.ts",
-							"match": "[_$[:alpha:]][_$[:alnum:]]*"
-						},
-						{
-							"name": "keyword.operator.optional.ts",
-							"match": "\\?"
+						"2": {
+							"name": "keyword.operator.optional.ts"
 						}
-					]
+					}
+				},
+				{
+					"name": "meta.definition.property.ts variable.object.property.ts",
+					"match": "[_$[:alpha:]][_$[:alnum:]]*"
+				},
+				{
+					"name": "keyword.operator.optional.ts",
+					"match": "\\?"
 				}
 			]
 		},
@@ -862,21 +1135,24 @@
 		},
 		"function-declaration": {
 			"name": "meta.function.ts",
-			"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(export)\\s+)?(?:(async)\\s+)?(function\\b)(?:\\s*(\\*))?(?:(?:\\s+|(?<=\\*))([_$[:alpha:]][_$[:alnum:]]*))?\\s*",
+			"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?(?:(async)\\s+)?(function\\b)(?:\\s*(\\*))?(?:(?:\\s+|(?<=\\*))([_$[:alpha:]][_$[:alnum:]]*))?\\s*",
 			"beginCaptures": {
 				"1": {
 					"name": "keyword.control.export.ts"
 				},
 				"2": {
-					"name": "storage.modifier.async.ts"
+					"name": "storage.modifier.ts"
 				},
 				"3": {
-					"name": "storage.type.function.ts"
+					"name": "storage.modifier.async.ts"
 				},
 				"4": {
-					"name": "keyword.generator.asterisk.ts"
+					"name": "storage.type.function.ts"
 				},
 				"5": {
+					"name": "keyword.generator.asterisk.ts"
+				},
+				"6": {
 					"name": "meta.definition.function.ts entity.name.function.ts"
 				}
 			},
@@ -912,6 +1188,9 @@
 				{
 					"include": "#function-name"
 				},
+				{
+					"include": "#single-line-comment-consuming-line-ending"
+				},
 				{
 					"include": "#function-body"
 				}
@@ -948,7 +1227,7 @@
 			"patterns": [
 				{
 					"name": "meta.method.declaration.ts",
-					"begin": "(?x)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(public|private|protected)\\s+)?(?:\\b(abstract)\\s+)?(?:\\b(async)\\s+)?\\b(constructor)\\b(?!:)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))",
+					"begin": "(?x)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(public|private|protected)\\s+)?(?:\\b(abstract)\\s+)?(?:\\b(async)\\s+)?\\s*\\b(constructor)\\b(?!:)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))",
 					"beginCaptures": {
 						"1": {
 							"name": "storage.modifier.ts"
@@ -975,7 +1254,7 @@
 				},
 				{
 					"name": "meta.method.declaration.ts",
-					"begin": "(?x)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(public|private|protected)\\s+)?(?:\\b(abstract)\\s+)?(?:\\b(async)\\s+)?(?:(?:\\b(new)\\b(?!:)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|(?:(\\*)\\s*)?)(?=\\s*[\\(\\<])",
+					"begin": "(?x)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(public|private|protected)\\s+)?(?:\\b(abstract)\\s+)?(?:\\b(async)\\s+)?(?:(?:\\s*\\b(new)\\b(?!:)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|(?:(\\*)\\s*)?)(?=\\s*[\\(\\<])",
 					"beginCaptures": {
 						"1": {
 							"name": "storage.modifier.ts"
@@ -1005,7 +1284,7 @@
 				},
 				{
 					"name": "meta.method.declaration.ts",
-					"begin": "(?x)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(public|private|protected)\\s+)?(?:\\b(abstract)\\s+)?(?:\\b(async)\\s+)?(?:\\b(get|set)\\s+)?(?:(\\*)\\s*)?(?=(((\\b(?<!\\$)0(x|X)[0-9a-fA-F][0-9a-fA-F_]*\\b(?!\\$))|(\\b(?<!\\$)0(b|B)[01][01_]*\\b(?!\\$))|(\\b(?<!\\$)0(o|O)?[0-7][0-7_]*\\b(?!\\$))|((?<!\\$)(?:\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)| # 1.1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*\\b)|             # 1.E+3\n  (?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)|             # .1E+3\n  (?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)|                 # 1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*\\b)|                      # 1.1\n  (?:\\b[0-9][0-9_]*(\\.)\\B)|                                  # 1.\n  (?:\\B(\\.)[0-9][0-9_]*\\b)|                                  # .1\n  (?:\\b[0-9][0-9_]*\\b(?!\\.))                                 # 1\n)(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\\\'|\\\\)*\\')|(\\\"([^\\\"\\\\]|\\\\\\\"|\\\\)*\\\")|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(\\??))\\s*[\\(\\<])",
+					"begin": "(?x)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(public|private|protected)\\s+)?(?:\\b(abstract)\\s+)?(?:\\b(async)\\s+)?(?:\\b(get|set)\\s+)?(?:(\\*)\\s*)?(?=\\s*(((\\b(?<!\\$)0(x|X)[0-9a-fA-F][0-9a-fA-F_]*\\b(?!\\$))|(\\b(?<!\\$)0(b|B)[01][01_]*\\b(?!\\$))|(\\b(?<!\\$)0(o|O)?[0-7][0-7_]*\\b(?!\\$))|((?<!\\$)(?:\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)| # 1.1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*\\b)|             # 1.E+3\n  (?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)|             # .1E+3\n  (?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)|                 # 1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*\\b)|                      # 1.1\n  (?:\\b[0-9][0-9_]*(\\.)\\B)|                                  # 1.\n  (?:\\B(\\.)[0-9][0-9_]*\\b)|                                  # .1\n  (?:\\b[0-9][0-9_]*\\b(?!\\.))                                 # 1\n)(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\\\'|\\\\)*\\')|(\\\"([^\\\"\\\\]|\\\\\\\"|\\\\)*\\\")|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(\\??))\\s*[\\(\\<])",
 					"beginCaptures": {
 						"1": {
 							"name": "storage.modifier.ts"
@@ -1037,7 +1316,7 @@
 		},
 		"object-literal-method-declaration": {
 			"name": "meta.method.declaration.ts",
-			"begin": "(?x)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(async)\\s+)?(?:\\b(get|set)\\s+)?(?:(\\*)\\s*)?(?=(((\\b(?<!\\$)0(x|X)[0-9a-fA-F][0-9a-fA-F_]*\\b(?!\\$))|(\\b(?<!\\$)0(b|B)[01][01_]*\\b(?!\\$))|(\\b(?<!\\$)0(o|O)?[0-7][0-7_]*\\b(?!\\$))|((?<!\\$)(?:\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)| # 1.1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*\\b)|             # 1.E+3\n  (?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)|             # .1E+3\n  (?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)|                 # 1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*\\b)|                      # 1.1\n  (?:\\b[0-9][0-9_]*(\\.)\\B)|                                  # 1.\n  (?:\\B(\\.)[0-9][0-9_]*\\b)|                                  # .1\n  (?:\\b[0-9][0-9_]*\\b(?!\\.))                                 # 1\n)(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\\\'|\\\\)*\\')|(\\\"([^\\\"\\\\]|\\\\\\\"|\\\\)*\\\")|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(\\??))\\s*[\\(\\<])",
+			"begin": "(?x)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(async)\\s+)?(?:\\b(get|set)\\s+)?(?:(\\*)\\s*)?(?=\\s*(((\\b(?<!\\$)0(x|X)[0-9a-fA-F][0-9a-fA-F_]*\\b(?!\\$))|(\\b(?<!\\$)0(b|B)[01][01_]*\\b(?!\\$))|(\\b(?<!\\$)0(o|O)?[0-7][0-7_]*\\b(?!\\$))|((?<!\\$)(?:\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)| # 1.1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*\\b)|             # 1.E+3\n  (?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)|             # .1E+3\n  (?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)|                 # 1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*\\b)|                      # 1.1\n  (?:\\b[0-9][0-9_]*(\\.)\\B)|                                  # 1.\n  (?:\\B(\\.)[0-9][0-9_]*\\b)|                                  # .1\n  (?:\\b[0-9][0-9_]*\\b(?!\\.))                                 # 1\n)(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\\\'|\\\\)*\\')|(\\\"([^\\\"\\\\]|\\\\\\\"|\\\\)*\\\")|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(\\??))\\s*[\\(\\<])",
 			"beginCaptures": {
 				"1": {
 					"name": "storage.modifier.async.ts"
@@ -1058,7 +1337,7 @@
 					"include": "#function-body"
 				},
 				{
-					"begin": "(?x)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(async)\\s+)?(?:\\b(get|set)\\s+)?(?:(\\*)\\s*)?(?=(((\\b(?<!\\$)0(x|X)[0-9a-fA-F][0-9a-fA-F_]*\\b(?!\\$))|(\\b(?<!\\$)0(b|B)[01][01_]*\\b(?!\\$))|(\\b(?<!\\$)0(o|O)?[0-7][0-7_]*\\b(?!\\$))|((?<!\\$)(?:\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)| # 1.1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*\\b)|             # 1.E+3\n  (?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)|             # .1E+3\n  (?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)|                 # 1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*\\b)|                      # 1.1\n  (?:\\b[0-9][0-9_]*(\\.)\\B)|                                  # 1.\n  (?:\\B(\\.)[0-9][0-9_]*\\b)|                                  # .1\n  (?:\\b[0-9][0-9_]*\\b(?!\\.))                                 # 1\n)(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\\\'|\\\\)*\\')|(\\\"([^\\\"\\\\]|\\\\\\\"|\\\\)*\\\")|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(\\??))\\s*[\\(\\<])",
+					"begin": "(?x)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(async)\\s+)?(?:\\b(get|set)\\s+)?(?:(\\*)\\s*)?(?=\\s*(((\\b(?<!\\$)0(x|X)[0-9a-fA-F][0-9a-fA-F_]*\\b(?!\\$))|(\\b(?<!\\$)0(b|B)[01][01_]*\\b(?!\\$))|(\\b(?<!\\$)0(o|O)?[0-7][0-7_]*\\b(?!\\$))|((?<!\\$)(?:\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)| # 1.1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*\\b)|             # 1.E+3\n  (?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)|             # .1E+3\n  (?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)|                 # 1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*\\b)|                      # 1.1\n  (?:\\b[0-9][0-9_]*(\\.)\\B)|                                  # 1.\n  (?:\\B(\\.)[0-9][0-9_]*\\b)|                                  # .1\n  (?:\\b[0-9][0-9_]*\\b(?!\\.))                                 # 1\n)(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\\\'|\\\\)*\\')|(\\\"([^\\\"\\\\]|\\\\\\\"|\\\\)*\\\")|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(\\??))\\s*[\\(\\<])",
 					"beginCaptures": {
 						"1": {
 							"name": "storage.modifier.async.ts"
@@ -1162,7 +1441,7 @@
 		},
 		"indexer-declaration": {
 			"name": "meta.indexer.declaration.ts",
-			"begin": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(readonly)\\s*)?(\\[)\\s*([_$[:alpha:]][_$[:alnum:]]*)\\s*(?=:)",
+			"begin": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(readonly)\\s*)?\\s*(\\[)\\s*([_$[:alpha:]][_$[:alnum:]]*)\\s*(?=:)",
 			"beginCaptures": {
 				"1": {
 					"name": "storage.modifier.ts"
@@ -1191,7 +1470,7 @@
 		},
 		"indexer-mapped-type-declaration": {
 			"name": "meta.indexer.mappedtype.declaration.ts",
-			"begin": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))([+-])?(readonly)\\s*)?(\\[)\\s*([_$[:alpha:]][_$[:alnum:]]*)\\s+(in)\\s+",
+			"begin": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))([+-])?(readonly)\\s*)?\\s*(\\[)\\s*([_$[:alpha:]][_$[:alnum:]]*)\\s+(in)\\s+",
 			"beginCaptures": {
 				"1": {
 					"name": "keyword.operator.type.modifier.ts"
@@ -1275,7 +1554,7 @@
 		},
 		"class-declaration": {
 			"name": "meta.class.ts",
-			"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(export)\\s+)?\\b(?:(abstract)\\s+)?\\b(class)\\b(?=\\s+|/[/*])",
+			"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(?:(abstract)\\s+)?\\b(class)\\b(?=\\s+|/[/*])",
 			"beginCaptures": {
 				"1": {
 					"name": "keyword.control.export.ts"
@@ -1284,6 +1563,9 @@
 					"name": "storage.modifier.ts"
 				},
 				"3": {
+					"name": "storage.modifier.ts"
+				},
+				"4": {
 					"name": "storage.type.class.ts"
 				}
 			},
@@ -1335,7 +1617,7 @@
 		},
 		"interface-declaration": {
 			"name": "meta.interface.ts",
-			"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(export)\\s+)?\\b(?:(abstract)\\s+)?\\b(interface)\\b(?=\\s+|/[/*])",
+			"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(?:(abstract)\\s+)?\\b(interface)\\b(?=\\s+|/[/*])",
 			"beginCaptures": {
 				"1": {
 					"name": "keyword.control.export.ts"
@@ -1344,6 +1626,9 @@
 					"name": "storage.modifier.ts"
 				},
 				"3": {
+					"name": "storage.modifier.ts"
+				},
+				"4": {
 					"name": "storage.type.interface.ts"
 				}
 			},
@@ -1497,7 +1782,7 @@
 		},
 		"enum-declaration": {
 			"name": "meta.enum.declaration.ts",
-			"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:\\b(const)\\s+)?\\b(enum)\\s+([_$[:alpha:]][_$[:alnum:]]*)",
+			"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?(?:\\b(const)\\s+)?\\b(enum)\\s+([_$[:alpha:]][_$[:alnum:]]*)",
 			"beginCaptures": {
 				"1": {
 					"name": "keyword.control.export.ts"
@@ -1506,9 +1791,12 @@
 					"name": "storage.modifier.ts"
 				},
 				"3": {
-					"name": "storage.type.enum.ts"
+					"name": "storage.modifier.ts"
 				},
 				"4": {
+					"name": "storage.type.enum.ts"
+				},
+				"5": {
 					"name": "entity.name.type.enum.ts"
 				}
 			},
@@ -1578,16 +1866,19 @@
 		},
 		"namespace-declaration": {
 			"name": "meta.namespace.declaration.ts",
-			"begin": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?\\b(namespace|module)\\s+(?=[_$[:alpha:]\"'`]))",
+			"begin": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(namespace|module)\\s+(?=[_$[:alpha:]\"'`]))",
 			"beginCaptures": {
 				"1": {
 					"name": "keyword.control.export.ts"
 				},
 				"2": {
+					"name": "storage.modifier.ts"
+				},
+				"3": {
 					"name": "storage.type.namespace.ts"
 				}
 			},
-			"end": "(?<=\\})|(?=;|\\babstract\\b|\\basync\\b|\\bclass\\b|\\bconst\\b|\\bdeclare\\b|\\benum\\b|\\bexport\\b|\\bfunction\\b|\\bimport\\b|\\binterface\\b|\\blet\\b|\\bmodule\\b|\\bnamespace\\b|\\breturn\\b|\\btype\\b|\\bvar\\b)",
+			"end": "(?<=\\})|(?=;|(?:^\\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\\b))",
 			"patterns": [
 				{
 					"include": "#comment"
@@ -1609,19 +1900,22 @@
 		},
 		"type-alias-declaration": {
 			"name": "meta.type.declaration.ts",
-			"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?\\b(type)\\b\\s+([_$[:alpha:]][_$[:alnum:]]*)\\s*",
+			"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(type)\\b\\s+([_$[:alpha:]][_$[:alnum:]]*)\\s*",
 			"beginCaptures": {
 				"1": {
 					"name": "keyword.control.export.ts"
 				},
 				"2": {
-					"name": "storage.type.type.ts"
+					"name": "storage.modifier.ts"
 				},
 				"3": {
+					"name": "storage.type.type.ts"
+				},
+				"4": {
 					"name": "entity.name.type.alias.ts"
 				}
 			},
-			"end": "(?=\\}|;|\\babstract\\b|\\basync\\b|\\bclass\\b|\\bconst\\b|\\bdeclare\\b|\\benum\\b|\\bexport\\b|\\bfunction\\b|\\bimport\\b|\\binterface\\b|\\blet\\b|\\bmodule\\b|\\bnamespace\\b|\\breturn\\b|\\btype\\b|\\bvar\\b)",
+			"end": "(?=\\}|;|(?:^\\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\\b))",
 			"patterns": [
 				{
 					"include": "#comment"
@@ -1636,7 +1930,7 @@
 							"name": "keyword.operator.assignment.ts"
 						}
 					},
-					"end": "(?=\\}|;|\\babstract\\b|\\basync\\b|\\bclass\\b|\\bconst\\b|\\bdeclare\\b|\\benum\\b|\\bexport\\b|\\bfunction\\b|\\bimport\\b|\\binterface\\b|\\blet\\b|\\bmodule\\b|\\bnamespace\\b|\\breturn\\b|\\btype\\b|\\bvar\\b)",
+					"end": "(?=\\}|;|(?:^\\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\\b))",
 					"patterns": [
 						{
 							"include": "#type"
@@ -1649,24 +1943,27 @@
 			"patterns": [
 				{
 					"name": "meta.import-equals.external.ts",
-					"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?\\b(import)\\s+([_$[:alpha:]][_$[:alnum:]]*)\\s*(=)\\s*(require)\\s*(\\()",
+					"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(import)\\s+([_$[:alpha:]][_$[:alnum:]]*)\\s*(=)\\s*(require)\\s*(\\()",
 					"beginCaptures": {
 						"1": {
 							"name": "keyword.control.export.ts"
 						},
 						"2": {
-							"name": "keyword.control.import.ts"
+							"name": "storage.modifier.ts"
 						},
 						"3": {
-							"name": "variable.other.readwrite.alias.ts"
+							"name": "keyword.control.import.ts"
 						},
 						"4": {
-							"name": "keyword.operator.assignment.ts"
+							"name": "variable.other.readwrite.alias.ts"
 						},
 						"5": {
-							"name": "keyword.control.require.ts"
+							"name": "keyword.operator.assignment.ts"
 						},
 						"6": {
+							"name": "keyword.control.require.ts"
+						},
+						"7": {
 							"name": "meta.brace.round.ts"
 						}
 					},
@@ -1687,18 +1984,21 @@
 				},
 				{
 					"name": "meta.import-equals.internal.ts",
-					"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?\\b(import)\\s+([_$[:alpha:]][_$[:alnum:]]*)\\s*(=)\\s*(?!require\\b)",
+					"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(import)\\s+([_$[:alpha:]][_$[:alnum:]]*)\\s*(=)\\s*(?!require\\b)",
 					"beginCaptures": {
 						"1": {
 							"name": "keyword.control.export.ts"
 						},
 						"2": {
-							"name": "keyword.control.import.ts"
+							"name": "storage.modifier.ts"
 						},
 						"3": {
-							"name": "variable.other.readwrite.alias.ts"
+							"name": "keyword.control.import.ts"
 						},
 						"4": {
+							"name": "variable.other.readwrite.alias.ts"
+						},
+						"5": {
 							"name": "keyword.operator.assignment.ts"
 						}
 					},
@@ -1731,12 +2031,15 @@
 		},
 		"import-declaration": {
 			"name": "meta.import.ts",
-			"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?\\b(import)(?!\\s*[:\\(])(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))",
+			"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(import)(?!\\s*[:\\(])(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))",
 			"beginCaptures": {
 				"1": {
 					"name": "keyword.control.export.ts"
 				},
 				"2": {
+					"name": "storage.modifier.ts"
+				},
+				"3": {
 					"name": "keyword.control.import.ts"
 				}
 			},
@@ -1800,8 +2103,11 @@
 							"name": "keyword.control.default.ts"
 						}
 					},
-					"end": "(?=$|;|\\babstract\\b|\\basync\\b|\\bclass\\b|\\bconst\\b|\\bdeclare\\b|\\benum\\b|\\bexport\\b|\\bfunction\\b|\\bimport\\b|\\binterface\\b|\\blet\\b|\\bmodule\\b|\\bnamespace\\b|\\breturn\\b|\\btype\\b|\\bvar\\b)",
+					"end": "(?=$|;|(?:^\\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\\b))",
 					"patterns": [
+						{
+							"include": "#interface-declaration"
+						},
 						{
 							"include": "#expression"
 						}
@@ -1809,13 +2115,13 @@
 				},
 				{
 					"name": "meta.export.ts",
-					"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(export)(?!\\s*:)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))",
+					"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(export)(?!\\s*:)((?=\\s*[\\{*])|((?=\\s*[_$[:alpha:]][_$[:alnum:]]*(\\s|,))(?!\\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\\b)))",
 					"beginCaptures": {
 						"0": {
 							"name": "keyword.control.export.ts"
 						}
 					},
-					"end": "(?=$|;|\\babstract\\b|\\basync\\b|\\bclass\\b|\\bconst\\b|\\bdeclare\\b|\\benum\\b|\\bexport\\b|\\bfunction\\b|\\bimport\\b|\\binterface\\b|\\blet\\b|\\bmodule\\b|\\bnamespace\\b|\\breturn\\b|\\btype\\b|\\bvar\\b)",
+					"end": "(?=$|;|(?:^\\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\\b))",
 					"patterns": [
 						{
 							"include": "#import-export-declaration"
@@ -2160,7 +2466,7 @@
 				},
 				{
 					"name": "meta.object.member.ts",
-					"match": "(?x)(?:([_$[:alpha:]][_$[:alnum:]]*)\\s*(?=:\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?[\\(]\\s*([\\{\\[]\\s*)?$) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
+					"match": "(?x)(?:([_$[:alpha:]][_$[:alnum:]]*)\\s*(?=:\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?[\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
 					"captures": {
 						"0": {
 							"name": "meta.object-literal.key.ts"
@@ -2308,13 +2614,13 @@
 			]
 		},
 		"function-call": {
-			"begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*)\\s*(\\?\\.\\s*)?(<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[=]|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[=]|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>\\s*)?\\()",
-			"end": "(?<=\\))(?!(([_$[:alpha:]][_$[:alnum:]]*\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*)\\s*(\\?\\.\\s*)?(<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[=]|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[=]|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>\\s*)?\\()",
+			"begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*)\\s*(\\?\\.\\s*)?(<\\s*(((keyof|infer)\\s+)|(\\*(?=\\s*[,>]))|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer)\\s+)|(\\*(?=\\s*[,>]))|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>\\s*)?\\()",
+			"end": "(?<=\\))(?!(([_$[:alpha:]][_$[:alnum:]]*\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*)\\s*(\\?\\.\\s*)?(<\\s*(((keyof|infer)\\s+)|(\\*(?=\\s*[,>]))|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer)\\s+)|(\\*(?=\\s*[,>]))|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>\\s*)?\\()",
 			"patterns": [
 				{
 					"name": "meta.function-call.ts",
 					"begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*))",
-					"end": "(?=\\s*(\\?\\.\\s*)?(<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[=]|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[=]|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>\\s*)?\\()",
+					"end": "(?=\\s*(\\?\\.\\s*)?(<\\s*(((keyof|infer)\\s+)|(\\*(?=\\s*[,>]))|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer)\\s+)|(\\*(?=\\s*[,>]))|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>\\s*)?\\()",
 					"patterns": [
 						{
 							"include": "#literal"
@@ -2405,7 +2711,7 @@
 					]
 				},
 				{
-					"begin": "(?<=[(=,]|=>)\\s*(async)?(?=\\s*((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*))?\\(\\s*$)",
+					"begin": "(?<=[(=,]|=>)\\s*(async)?(?=\\s*((((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*))?\\()|(<))\\s*$)",
 					"beginCaptures": {
 						"1": {
 							"name": "storage.modifier.async.ts"
@@ -2488,7 +2794,7 @@
 			"patterns": [
 				{
 					"name": "cast.expr.ts",
-					"begin": "(?:(?<!\\+\\+|--)(?<=^return|[^\\._$[:alnum:]]return|^throw|[^\\._$[:alnum:]]throw|^yield|[^\\._$[:alnum:]]yield|^await|[^\\._$[:alnum:]]await|^default|[^\\._$[:alnum:]]default|[=(,:>*?\\&\\|\\^]|[^_$[:alnum:]](?:\\+\\+|\\-\\-)|[^\\+]\\+|[^\\-]\\-))\\s*(<)(?!<?\\=)",
+					"begin": "(?:(?<!\\+\\+|--)(?<=^return|[^\\._$[:alnum:]]return|^throw|[^\\._$[:alnum:]]throw|^yield|[^\\._$[:alnum:]]yield|^await|[^\\._$[:alnum:]]await|^default|[^\\._$[:alnum:]]default|[=(,:>*?\\&\\|\\^]|[^_$[:alnum:]](?:\\+\\+|\\-\\-)|[^\\+]\\+|[^\\-]\\-))\\s*(<)(?!<?\\=)(?!\\s*$)",
 					"beginCaptures": {
 						"1": {
 							"name": "meta.brace.angle.ts"
@@ -2570,11 +2876,11 @@
 				},
 				{
 					"name": "keyword.operator.expression.in.ts",
-					"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))in(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))"
+					"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))in(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))(?!\\()"
 				},
 				{
 					"name": "keyword.operator.expression.of.ts",
-					"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))of(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))"
+					"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))of(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))(?!\\()"
 				},
 				{
 					"name": "keyword.operator.expression.instanceof.ts",
@@ -2598,7 +2904,7 @@
 							"name": "keyword.control.as.ts"
 						}
 					},
-					"end": "(?=$|^|[;,:})\\]]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(as)\\s+))",
+					"end": "(?=$|^|[;,:})\\]]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(as)\\s+)|(\\s+\\<))",
 					"patterns": [
 						{
 							"include": "#type"
@@ -2697,9 +3003,9 @@
 		},
 		"array-literal": {
 			"name": "meta.array.literal.ts",
-			"begin": "\\[",
+			"begin": "\\s*(\\[)",
 			"beginCaptures": {
-				"0": {
+				"1": {
 					"name": "meta.brace.square.ts"
 				}
 			},
@@ -3034,7 +3340,7 @@
 					"include": "#object-identifiers"
 				},
 				{
-					"match": "(?x)(?:(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))\\s*)?([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?[\\(]\\s*([\\{\\[]\\s*)?$) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n))",
+					"match": "(?x)(?:(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))\\s*)?([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?[\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n))",
 					"captures": {
 						"1": {
 							"name": "punctuation.accessor.ts"
@@ -3287,6 +3593,10 @@
 				},
 				{
 					"include": "#punctuation-comma"
+				},
+				{
+					"name": "keyword.operator.assignment.ts",
+					"match": "(=)(?!>)"
 				}
 			]
 		},
@@ -3361,7 +3671,7 @@
 		},
 		"type-primitive": {
 			"name": "support.type.primitive.ts",
-			"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(string|number|boolean|symbol|any|void|never)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))"
+			"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(string|number|boolean|symbol|any|void|never|unknown)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))"
 		},
 		"type-builtin-literals": {
 			"name": "support.type.builtin.ts",
@@ -3501,10 +3811,57 @@
 			},
 			"patterns": [
 				{
-					"include": "#type"
+					"include": "#destructuring-parameter"
 				},
 				{
-					"include": "#function-parameters"
+					"match": "(?x)(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<!=|:)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))\\s*(\\??)(?=\\s*(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*((<\\s*$)|((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?[\\(]\\s*([\\{\\[]\\s*)?$))))",
+					"captures": {
+						"1": {
+							"name": "storage.modifier.ts"
+						},
+						"2": {
+							"name": "keyword.operator.rest.ts"
+						},
+						"3": {
+							"name": "entity.name.function.ts variable.language.this.ts"
+						},
+						"4": {
+							"name": "entity.name.function.ts"
+						},
+						"5": {
+							"name": "keyword.operator.optional.ts"
+						}
+					}
+				},
+				{
+					"match": "(?x)(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<!=|:)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))\\s*(\\??)(?=:)",
+					"captures": {
+						"1": {
+							"name": "storage.modifier.ts"
+						},
+						"2": {
+							"name": "keyword.operator.rest.ts"
+						},
+						"3": {
+							"name": "variable.parameter.ts variable.language.this.ts"
+						},
+						"4": {
+							"name": "variable.parameter.ts"
+						},
+						"5": {
+							"name": "keyword.operator.optional.ts"
+						}
+					}
+				},
+				{
+					"include": "#type-annotation"
+				},
+				{
+					"name": "punctuation.separator.parameter.ts",
+					"match": ","
+				},
+				{
+					"include": "#type"
 				}
 			]
 		},
@@ -3608,13 +3965,10 @@
 					"include": "#typeof-operator"
 				},
 				{
-					"begin": "(?:([&|])|(=(?!>)))(?=\\s*\\{)",
+					"begin": "([&|\\*])(?=\\s*\\{)",
 					"beginCaptures": {
-						"1": {
+						"0": {
 							"name": "keyword.operator.type.ts"
-						},
-						"2": {
-							"name": "keyword.operator.assignment.ts"
 						}
 					},
 					"end": "(?<=\\})",
@@ -3625,13 +3979,10 @@
 					]
 				},
 				{
-					"begin": "([&|])|(=(?!>))",
+					"begin": "[&|\\*]",
 					"beginCaptures": {
-						"1": {
+						"0": {
 							"name": "keyword.operator.type.ts"
-						},
-						"2": {
-							"name": "keyword.operator.assignment.ts"
 						}
 					},
 					"end": "(?=\\S)"
@@ -3763,7 +4114,7 @@
 			"patterns": [
 				{
 					"name": "string.template.ts",
-					"begin": "([_$[:alpha:]][_$[:alnum:]]*)\\s*(?=(<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[=]|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[=]|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>\\s*)`)",
+					"begin": "([_$[:alpha:]][_$[:alnum:]]*)\\s*(?=(<\\s*(((keyof|infer)\\s+)|(\\*(?=\\s*[,>]))|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer)\\s+)|(\\*(?=\\s*[,>]))|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>\\s*)`)",
 					"beginCaptures": {
 						"1": {
 							"name": "entity.name.function.tagged-template.ts"
@@ -3829,7 +4180,7 @@
 			"patterns": [
 				{
 					"name": "string.regexp.ts",
-					"begin": "(?<!\\+\\+|--)(?<=[=(:,\\[?+!]|^return|[^\\._$[:alnum:]]return|^case|[^\\._$[:alnum:]]case|=>|&&|\\|\\||\\*\\/)\\s*(\\/)(?![\\/*])(?=(?:[^\\/\\\\\\[]|\\\\.|\\[([^\\]\\\\]|\\\\.)+\\])+\\/(?![\\/*])[gimsuy]*(?!\\s*[a-zA-Z0-9_$]))",
+					"begin": "(?<!\\+\\+|--|})(?<=[=(:,\\[?+!]|^return|[^\\._$[:alnum:]]return|^case|[^\\._$[:alnum:]]case|=>|&&|\\|\\||\\*\\/)\\s*(\\/)(?![\\/*])(?=(?:[^\\/\\\\\\[]|\\\\.|\\[([^\\]\\\\]|\\\\.)+\\])+\\/[gimsuy]*(?!\\s*[a-zA-Z0-9_$]))",
 					"beginCaptures": {
 						"1": {
 							"name": "punctuation.definition.string.begin.ts"
@@ -3852,7 +4203,7 @@
 				},
 				{
 					"name": "string.regexp.ts",
-					"begin": "(?<![_$[:alnum:])\\]]|\\+\\+|--)\\/(?![\\/*])(?=(?:[^\\/\\\\\\[]|\\\\.|\\[([^\\]\\\\]|\\\\.)+\\])+\\/(?![\\/*])[gimsuy]*(?!\\s*[a-zA-Z0-9_$]))",
+					"begin": "(?<![_$[:alnum:])\\]]|\\+\\+|--|})\\/(?![\\/*])(?=(?:[^\\/\\\\\\[]|\\\\.|\\[([^\\]\\\\]|\\\\.)+\\])+\\/[gimsuy]*(?!\\s*[a-zA-Z0-9_$]))",
 					"beginCaptures": {
 						"0": {
 							"name": "punctuation.definition.string.begin.ts"
@@ -4095,20 +4446,42 @@
 							"name": "punctuation.decorator.internaldeclaration.ts"
 						}
 					},
-					"end": "(?=^)",
+					"end": "(?=$)",
 					"contentName": "comment.line.double-slash.ts"
 				}
 			]
 		},
+		"single-line-comment-consuming-line-ending": {
+			"begin": "(^[ \\t]+)?((//)(?:\\s*((@)internal)(?=\\s|$))?)",
+			"beginCaptures": {
+				"1": {
+					"name": "punctuation.whitespace.comment.leading.ts"
+				},
+				"2": {
+					"name": "comment.line.double-slash.ts"
+				},
+				"3": {
+					"name": "punctuation.definition.comment.ts"
+				},
+				"4": {
+					"name": "storage.type.internaldeclaration.ts"
+				},
+				"5": {
+					"name": "punctuation.decorator.internaldeclaration.ts"
+				}
+			},
+			"end": "(?=^)",
+			"contentName": "comment.line.double-slash.ts"
+		},
 		"directives": {
 			"name": "comment.line.triple-slash.directive.ts",
-			"begin": "^(///)\\s*(?=<(reference|amd-dependency|amd-module)(\\s+(path|types|no-default-lib|name)\\s*=\\s*((\\'([^\\'\\\\]|\\\\\\'|\\\\)*\\')|(\\\"([^\\\"\\\\]|\\\\\\\"|\\\\)*\\\")))+\\s*/>\\s*$)",
+			"begin": "^(///)\\s*(?=<(reference|amd-dependency|amd-module)(\\s+(path|types|no-default-lib|lib|name)\\s*=\\s*((\\'([^\\'\\\\]|\\\\\\'|\\\\)*\\')|(\\\"([^\\\"\\\\]|\\\\\\\"|\\\\)*\\\")))+\\s*/>\\s*$)",
 			"beginCaptures": {
 				"1": {
 					"name": "punctuation.definition.comment.ts"
 				}
 			},
-			"end": "(?=^)",
+			"end": "(?=$)",
 			"patterns": [
 				{
 					"name": "meta.tag.ts",
@@ -4130,7 +4503,7 @@
 					"patterns": [
 						{
 							"name": "entity.other.attribute-name.directive.ts",
-							"match": "path|types|no-default-lib|name"
+							"match": "path|types|no-default-lib|lib|name"
 						},
 						{
 							"name": "keyword.operator.assignment.ts",
diff --git a/extensions/typescript-basics/syntaxes/TypeScriptReact.tmLanguage.json b/extensions/typescript-basics/syntaxes/TypeScriptReact.tmLanguage.json
index 7f80b22ef0d..2b7cc3076b6 100644
--- a/extensions/typescript-basics/syntaxes/TypeScriptReact.tmLanguage.json
+++ b/extensions/typescript-basics/syntaxes/TypeScriptReact.tmLanguage.json
@@ -4,7 +4,7 @@
 		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
 		"Once accepted there, we are happy to receive an update request."
 	],
-	"version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/53ce68bc2e8abcfa9bce7fb555ccd60c5bacd11e",
+	"version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/67d50d27f0c459e6ccc9adc6645454ecb1c2406c",
 	"name": "TypeScriptReact",
 	"scopeName": "source.tsx",
 	"patterns": [
@@ -93,6 +93,10 @@
 				},
 				{
 					"include": "#export-declaration"
+				},
+				{
+					"name": "storage.modifier.tsx",
+					"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(declare|export)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))"
 				}
 			]
 		},
@@ -140,12 +144,12 @@
 					"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(with)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))"
 				},
 				{
-					"name": "keyword.other.debugger.tsx",
-					"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(debugger)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))"
+					"name": "keyword.control.tsx",
+					"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(package)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))"
 				},
 				{
-					"name": "storage.modifier.tsx",
-					"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(declare)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))"
+					"name": "keyword.other.debugger.tsx",
+					"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(debugger)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))"
 				}
 			]
 		},
@@ -281,41 +285,26 @@
 			]
 		},
 		"var-expr": {
-			"name": "meta.var.expr.tsx",
-			"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?\\b(var|let|const(?!\\s+enum\\b))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))",
-			"beginCaptures": {
-				"1": {
-					"name": "keyword.control.export.tsx"
-				},
-				"2": {
-					"name": "storage.type.tsx"
-				}
-			},
-			"end": "(?=$|^|;|}|(\\s+(of|in)\\s+))",
 			"patterns": [
 				{
-					"include": "#destructuring-variable"
-				},
-				{
-					"include": "#var-single-variable"
-				},
-				{
-					"include": "#variable-initializer"
-				},
-				{
-					"include": "#comment"
-				},
-				{
-					"begin": "(,)\\s*(?!\\S)",
-					"beginCaptures": {
-						"1": {
-							"name": "punctuation.separator.comma.tsx"
-						}
-					},
-					"end": "(?<!,)((?==|;|}|(\\s+(of|in)\\s+)|^\\s*$))|((?<=\\S)(?=\\s*$))",
+					"name": "meta.var.expr.tsx",
+					"begin": "(?=(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(var|let)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))",
+					"end": "(?!(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(var|let)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))((?=;|}|(\\s+(of|in)\\s+)|^\\s*$|;|(?:^\\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\\b))|((?<!^let|[^\\._$[:alnum:]]let|^var|[^\\._$[:alnum:]]var)(?=\\s*$)))",
 					"patterns": [
 						{
-							"include": "#comment"
+							"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(var|let)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*",
+							"beginCaptures": {
+								"1": {
+									"name": "keyword.control.export.tsx"
+								},
+								"2": {
+									"name": "storage.modifier.tsx"
+								},
+								"3": {
+									"name": "storage.type.tsx"
+								}
+							},
+							"end": "(?=\\S)"
 						},
 						{
 							"include": "#destructuring-variable"
@@ -323,13 +312,116 @@
 						{
 							"include": "#var-single-variable"
 						},
+						{
+							"include": "#variable-initializer"
+						},
+						{
+							"include": "#comment"
+						},
+						{
+							"begin": "(,)\\s*((?!\\S)|(?=\\/\\/))",
+							"beginCaptures": {
+								"1": {
+									"name": "punctuation.separator.comma.tsx"
+								}
+							},
+							"end": "(?<!,)(((?==|;|}|(\\s+(of|in)\\s+)|^\\s*$))|((?<=\\S)(?=\\s*$)))",
+							"patterns": [
+								{
+									"include": "#single-line-comment-consuming-line-ending"
+								},
+								{
+									"include": "#comment"
+								},
+								{
+									"include": "#destructuring-variable"
+								},
+								{
+									"include": "#var-single-variable"
+								},
+								{
+									"include": "#punctuation-comma"
+								}
+							]
+						},
 						{
 							"include": "#punctuation-comma"
 						}
 					]
 				},
 				{
-					"include": "#punctuation-comma"
+					"name": "meta.var.expr.tsx",
+					"begin": "(?=(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(const(?!\\s+enum\\b))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))",
+					"beginCaptures": {
+						"1": {
+							"name": "keyword.control.export.tsx"
+						},
+						"2": {
+							"name": "storage.modifier.tsx"
+						},
+						"3": {
+							"name": "storage.type.tsx"
+						}
+					},
+					"end": "(?!(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(const(?!\\s+enum\\b))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))((?=;|}|(\\s+(of|in)\\s+)|^\\s*$|;|(?:^\\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\\b))|((?<!^const|[^\\._$[:alnum:]]const)(?=\\s*$)))",
+					"patterns": [
+						{
+							"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(const(?!\\s+enum\\b))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*",
+							"beginCaptures": {
+								"1": {
+									"name": "keyword.control.export.tsx"
+								},
+								"2": {
+									"name": "storage.modifier.tsx"
+								},
+								"3": {
+									"name": "storage.type.tsx"
+								}
+							},
+							"end": "(?=\\S)"
+						},
+						{
+							"include": "#destructuring-const"
+						},
+						{
+							"include": "#var-single-const"
+						},
+						{
+							"include": "#variable-initializer"
+						},
+						{
+							"include": "#comment"
+						},
+						{
+							"begin": "(,)\\s*((?!\\S)|(?=\\/\\/))",
+							"beginCaptures": {
+								"1": {
+									"name": "punctuation.separator.comma.tsx"
+								}
+							},
+							"end": "(?<!,)(((?==|;|}|(\\s+(of|in)\\s+)|^\\s*$))|((?<=\\S)(?=\\s*$)))",
+							"patterns": [
+								{
+									"include": "#single-line-comment-consuming-line-ending"
+								},
+								{
+									"include": "#comment"
+								},
+								{
+									"include": "#destructuring-const"
+								},
+								{
+									"include": "#var-single-const"
+								},
+								{
+									"include": "#punctuation-comma"
+								}
+							]
+						},
+						{
+							"include": "#punctuation-comma"
+						}
+					]
 				}
 			]
 		},
@@ -337,7 +429,7 @@
 			"patterns": [
 				{
 					"name": "meta.var-single-variable.expr.tsx",
-					"begin": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ([\\(]\\s*([\\{\\[]\\s*)?$) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ([\\(]\\s*([\\{\\[]\\s*)?$) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
+					"begin": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$))) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
 					"beginCaptures": {
 						"1": {
 							"name": "meta.definition.variable.tsx entity.name.function.tsx"
@@ -382,6 +474,40 @@
 				}
 			]
 		},
+		"var-single-const": {
+			"patterns": [
+				{
+					"name": "meta.var-single-variable.expr.tsx",
+					"begin": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$))) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
+					"beginCaptures": {
+						"1": {
+							"name": "meta.definition.variable.tsx variable.other.constant.tsx entity.name.function.tsx"
+						}
+					},
+					"end": "(?=$|^|[;,=}]|(\\s+(of|in)\\s+))",
+					"patterns": [
+						{
+							"include": "#var-single-variable-type-annotation"
+						}
+					]
+				},
+				{
+					"name": "meta.var-single-variable.expr.tsx",
+					"begin": "([_$[:alpha:]][_$[:alnum:]]*)",
+					"beginCaptures": {
+						"1": {
+							"name": "meta.definition.variable.tsx variable.other.constant.tsx"
+						}
+					},
+					"end": "(?=$|^|[;,=}]|(\\s+(of|in)\\s+))",
+					"patterns": [
+						{
+							"include": "#var-single-variable-type-annotation"
+						}
+					]
+				}
+			]
+		},
 		"var-single-variable-type-annotation": {
 			"patterns": [
 				{
@@ -431,6 +557,42 @@
 				}
 			]
 		},
+		"destructuring-const": {
+			"patterns": [
+				{
+					"name": "meta.object-binding-pattern-variable.tsx",
+					"begin": "(?<!=|:|^of|[^\\._$[:alnum:]]of|^in|[^\\._$[:alnum:]]in)\\s*(?=\\{)",
+					"end": "(?=$|^|[;,=}]|(\\s+(of|in)\\s+))",
+					"patterns": [
+						{
+							"include": "#object-binding-pattern-const"
+						},
+						{
+							"include": "#type-annotation"
+						},
+						{
+							"include": "#comment"
+						}
+					]
+				},
+				{
+					"name": "meta.array-binding-pattern-variable.tsx",
+					"begin": "(?<!=|:|^of|[^\\._$[:alnum:]]of|^in|[^\\._$[:alnum:]]in)\\s*(?=\\[)",
+					"end": "(?=$|^|[;,=}]|(\\s+(of|in)\\s+))",
+					"patterns": [
+						{
+							"include": "#array-binding-pattern-const"
+						},
+						{
+							"include": "#type-annotation"
+						},
+						{
+							"include": "#comment"
+						}
+					]
+				}
+			]
+		},
 		"object-binding-element": {
 			"patterns": [
 				{
@@ -462,6 +624,37 @@
 				}
 			]
 		},
+		"object-binding-element-const": {
+			"patterns": [
+				{
+					"include": "#comment"
+				},
+				{
+					"begin": "(?x)(?=((\\b(?<!\\$)0(x|X)[0-9a-fA-F][0-9a-fA-F_]*\\b(?!\\$))|(\\b(?<!\\$)0(b|B)[01][01_]*\\b(?!\\$))|(\\b(?<!\\$)0(o|O)?[0-7][0-7_]*\\b(?!\\$))|((?<!\\$)(?:\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)| # 1.1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*\\b)|             # 1.E+3\n  (?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)|             # .1E+3\n  (?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)|                 # 1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*\\b)|                      # 1.1\n  (?:\\b[0-9][0-9_]*(\\.)\\B)|                                  # 1.\n  (?:\\B(\\.)[0-9][0-9_]*\\b)|                                  # .1\n  (?:\\b[0-9][0-9_]*\\b(?!\\.))                                 # 1\n)(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\\\'|\\\\)*\\')|(\\\"([^\\\"\\\\]|\\\\\\\"|\\\\)*\\\")|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(:))",
+					"end": "(?=,|\\})",
+					"patterns": [
+						{
+							"include": "#object-binding-element-propertyName"
+						},
+						{
+							"include": "#binding-element-const"
+						}
+					]
+				},
+				{
+					"include": "#object-binding-pattern-const"
+				},
+				{
+					"include": "#destructuring-variable-rest-const"
+				},
+				{
+					"include": "#variable-initializer"
+				},
+				{
+					"include": "#punctuation-comma"
+				}
+			]
+		},
 		"object-binding-element-propertyName": {
 			"begin": "(?x)(?=((\\b(?<!\\$)0(x|X)[0-9a-fA-F][0-9a-fA-F_]*\\b(?!\\$))|(\\b(?<!\\$)0(b|B)[01][01_]*\\b(?!\\$))|(\\b(?<!\\$)0(o|O)?[0-7][0-7_]*\\b(?!\\$))|((?<!\\$)(?:\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)| # 1.1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*\\b)|             # 1.E+3\n  (?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)|             # .1E+3\n  (?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)|                 # 1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*\\b)|                      # 1.1\n  (?:\\b[0-9][0-9_]*(\\.)\\B)|                                  # 1.\n  (?:\\B(\\.)[0-9][0-9_]*\\b)|                                  # .1\n  (?:\\b[0-9][0-9_]*\\b(?!\\.))                                 # 1\n)(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\\\'|\\\\)*\\')|(\\\"([^\\\"\\\\]|\\\\\\\"|\\\\)*\\\")|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(:))",
 			"end": "(:)",
@@ -508,6 +701,28 @@
 				}
 			]
 		},
+		"binding-element-const": {
+			"patterns": [
+				{
+					"include": "#comment"
+				},
+				{
+					"include": "#string"
+				},
+				{
+					"include": "#object-binding-pattern-const"
+				},
+				{
+					"include": "#array-binding-pattern-const"
+				},
+				{
+					"include": "#destructuring-variable-rest-const"
+				},
+				{
+					"include": "#variable-initializer"
+				}
+			]
+		},
 		"destructuring-variable-rest": {
 			"match": "(?:(\\.\\.\\.)\\s*)?([_$[:alpha:]][_$[:alnum:]]*)",
 			"captures": {
@@ -519,6 +734,17 @@
 				}
 			}
 		},
+		"destructuring-variable-rest-const": {
+			"match": "(?:(\\.\\.\\.)\\s*)?([_$[:alpha:]][_$[:alnum:]]*)",
+			"captures": {
+				"1": {
+					"name": "keyword.operator.rest.tsx"
+				},
+				"2": {
+					"name": "meta.definition.variable.tsx variable.other.constant.tsx"
+				}
+			}
+		},
 		"object-binding-pattern": {
 			"begin": "(?:(\\.\\.\\.)\\s*)?(\\{)",
 			"beginCaptures": {
@@ -541,6 +767,28 @@
 				}
 			]
 		},
+		"object-binding-pattern-const": {
+			"begin": "(?:(\\.\\.\\.)\\s*)?(\\{)",
+			"beginCaptures": {
+				"1": {
+					"name": "keyword.operator.rest.tsx"
+				},
+				"2": {
+					"name": "punctuation.definition.binding-pattern.object.tsx"
+				}
+			},
+			"end": "\\}",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.binding-pattern.object.tsx"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#object-binding-element-const"
+				}
+			]
+		},
 		"array-binding-pattern": {
 			"begin": "(?:(\\.\\.\\.)\\s*)?(\\[)",
 			"beginCaptures": {
@@ -566,6 +814,31 @@
 				}
 			]
 		},
+		"array-binding-pattern-const": {
+			"begin": "(?:(\\.\\.\\.)\\s*)?(\\[)",
+			"beginCaptures": {
+				"1": {
+					"name": "keyword.operator.rest.tsx"
+				},
+				"2": {
+					"name": "punctuation.definition.binding-pattern.array.tsx"
+				}
+			},
+			"end": "\\]",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.binding-pattern.array.tsx"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#binding-element-const"
+				},
+				{
+					"include": "#punctuation-comma"
+				}
+			]
+		},
 		"parameter-name": {
 			"patterns": [
 				{
@@ -577,7 +850,7 @@
 					}
 				},
 				{
-					"match": "(?x)(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<!=|:)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*(\\??)(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ([\\(]\\s*([\\{\\[]\\s*)?$) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ([\\(]\\s*([\\{\\[]\\s*)?$) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
+					"match": "(?x)(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<!=|:)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*(\\??)(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$))) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
 					"captures": {
 						"1": {
 							"name": "storage.modifier.tsx"
@@ -622,9 +895,12 @@
 			"patterns": [
 				{
 					"name": "meta.parameter.object-binding-pattern.tsx",
-					"begin": "(?<!=|:)\\s*(\\{)",
+					"begin": "(?<!=|:)\\s*(?:(\\.\\.\\.)\\s*)?(\\{)",
 					"beginCaptures": {
 						"1": {
+							"name": "keyword.operator.rest.tsx"
+						},
+						"2": {
 							"name": "punctuation.definition.binding-pattern.object.tsx"
 						}
 					},
@@ -642,9 +918,12 @@
 				},
 				{
 					"name": "meta.paramter.array-binding-pattern.tsx",
-					"begin": "(?<!=|:)\\s*(\\[)",
+					"begin": "(?<!=|:)\\s*(?:(\\.\\.\\.)\\s*)?(\\[)",
 					"beginCaptures": {
 						"1": {
+							"name": "keyword.operator.rest.tsx"
+						},
+						"2": {
 							"name": "punctuation.definition.binding-pattern.array.tsx"
 						}
 					},
@@ -778,56 +1057,50 @@
 		},
 		"field-declaration": {
 			"name": "meta.field.declaration.tsx",
-			"begin": "(?x)(?<!\\()(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(readonly)\\s+)?(?=((\\b(?<!\\$)0(x|X)[0-9a-fA-F][0-9a-fA-F_]*\\b(?!\\$))|(\\b(?<!\\$)0(b|B)[01][01_]*\\b(?!\\$))|(\\b(?<!\\$)0(o|O)?[0-7][0-7_]*\\b(?!\\$))|((?<!\\$)(?:\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)| # 1.1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*\\b)|             # 1.E+3\n  (?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)|             # .1E+3\n  (?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)|                 # 1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*\\b)|                      # 1.1\n  (?:\\b[0-9][0-9_]*(\\.)\\B)|                                  # 1.\n  (?:\\B(\\.)[0-9][0-9_]*\\b)|                                  # .1\n  (?:\\b[0-9][0-9_]*\\b(?!\\.))                                 # 1\n)(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\\\'|\\\\)*\\')|(\\\"([^\\\"\\\\]|\\\\\\\"|\\\\)*\\\")|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(\\?\\s*)?(=|:))",
+			"begin": "(?x)(?<!\\()(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(readonly)\\s+)?(?=\\s*((\\b(?<!\\$)0(x|X)[0-9a-fA-F][0-9a-fA-F_]*\\b(?!\\$))|(\\b(?<!\\$)0(b|B)[01][01_]*\\b(?!\\$))|(\\b(?<!\\$)0(o|O)?[0-7][0-7_]*\\b(?!\\$))|((?<!\\$)(?:\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)| # 1.1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*\\b)|             # 1.E+3\n  (?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)|             # .1E+3\n  (?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)|                 # 1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*\\b)|                      # 1.1\n  (?:\\b[0-9][0-9_]*(\\.)\\B)|                                  # 1.\n  (?:\\B(\\.)[0-9][0-9_]*\\b)|                                  # .1\n  (?:\\b[0-9][0-9_]*\\b(?!\\.))                                 # 1\n)(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\\\'|\\\\)*\\')|(\\\"([^\\\"\\\\]|\\\\\\\"|\\\\)*\\\")|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(\\?\\s*)?(=|:|;|,|$))",
 			"beginCaptures": {
 				"1": {
 					"name": "storage.modifier.tsx"
 				}
 			},
-			"end": "(?x)(?=\\}|;|,|$|(^(?!((\\b(?<!\\$)0(x|X)[0-9a-fA-F][0-9a-fA-F_]*\\b(?!\\$))|(\\b(?<!\\$)0(b|B)[01][01_]*\\b(?!\\$))|(\\b(?<!\\$)0(o|O)?[0-7][0-7_]*\\b(?!\\$))|((?<!\\$)(?:\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)| # 1.1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*\\b)|             # 1.E+3\n  (?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)|             # .1E+3\n  (?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)|                 # 1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*\\b)|                      # 1.1\n  (?:\\b[0-9][0-9_]*(\\.)\\B)|                                  # 1.\n  (?:\\B(\\.)[0-9][0-9_]*\\b)|                                  # .1\n  (?:\\b[0-9][0-9_]*\\b(?!\\.))                                 # 1\n)(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\\\'|\\\\)*\\')|(\\\"([^\\\"\\\\]|\\\\\\\"|\\\\)*\\\")|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(\\?\\s*)?(=|:))))|(?<=\\})",
+			"end": "(?x)(?=\\}|;|,|$|(^(?!\\s*((\\b(?<!\\$)0(x|X)[0-9a-fA-F][0-9a-fA-F_]*\\b(?!\\$))|(\\b(?<!\\$)0(b|B)[01][01_]*\\b(?!\\$))|(\\b(?<!\\$)0(o|O)?[0-7][0-7_]*\\b(?!\\$))|((?<!\\$)(?:\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)| # 1.1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*\\b)|             # 1.E+3\n  (?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)|             # .1E+3\n  (?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)|                 # 1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*\\b)|                      # 1.1\n  (?:\\b[0-9][0-9_]*(\\.)\\B)|                                  # 1.\n  (?:\\B(\\.)[0-9][0-9_]*\\b)|                                  # .1\n  (?:\\b[0-9][0-9_]*\\b(?!\\.))                                 # 1\n)(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\\\'|\\\\)*\\')|(\\\"([^\\\"\\\\]|\\\\\\\"|\\\\)*\\\")|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(\\?\\s*)?(=|:|;|,|$))))|(?<=\\})",
 			"patterns": [
 				{
 					"include": "#variable-initializer"
 				},
 				{
-					"begin": "(?x)(?=((\\b(?<!\\$)0(x|X)[0-9a-fA-F][0-9a-fA-F_]*\\b(?!\\$))|(\\b(?<!\\$)0(b|B)[01][01_]*\\b(?!\\$))|(\\b(?<!\\$)0(o|O)?[0-7][0-7_]*\\b(?!\\$))|((?<!\\$)(?:\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)| # 1.1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*\\b)|             # 1.E+3\n  (?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)|             # .1E+3\n  (?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)|                 # 1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*\\b)|                      # 1.1\n  (?:\\b[0-9][0-9_]*(\\.)\\B)|                                  # 1.\n  (?:\\B(\\.)[0-9][0-9_]*\\b)|                                  # .1\n  (?:\\b[0-9][0-9_]*\\b(?!\\.))                                 # 1\n)(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\\\'|\\\\)*\\')|(\\\"([^\\\"\\\\]|\\\\\\\"|\\\\)*\\\")|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(\\?\\s*)?(=|:))",
-					"end": "(?x)(?=[};,=]|$|(^(?!((\\b(?<!\\$)0(x|X)[0-9a-fA-F][0-9a-fA-F_]*\\b(?!\\$))|(\\b(?<!\\$)0(b|B)[01][01_]*\\b(?!\\$))|(\\b(?<!\\$)0(o|O)?[0-7][0-7_]*\\b(?!\\$))|((?<!\\$)(?:\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)| # 1.1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*\\b)|             # 1.E+3\n  (?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)|             # .1E+3\n  (?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)|                 # 1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*\\b)|                      # 1.1\n  (?:\\b[0-9][0-9_]*(\\.)\\B)|                                  # 1.\n  (?:\\B(\\.)[0-9][0-9_]*\\b)|                                  # .1\n  (?:\\b[0-9][0-9_]*\\b(?!\\.))                                 # 1\n)(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\\\'|\\\\)*\\')|(\\\"([^\\\"\\\\]|\\\\\\\"|\\\\)*\\\")|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(\\?\\s*)?(=|:))))|(?<=\\})",
-					"patterns": [
-						{
-							"include": "#type-annotation"
+					"include": "#type-annotation"
+				},
+				{
+					"include": "#string"
+				},
+				{
+					"include": "#array-literal"
+				},
+				{
+					"include": "#numeric-literal"
+				},
+				{
+					"include": "#comment"
+				},
+				{
+					"match": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(\\?)?(?=(\\?\\s*)?\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$))) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
+					"captures": {
+						"1": {
+							"name": "meta.definition.property.tsx entity.name.function.tsx"
 						},
-						{
-							"include": "#string"
-						},
-						{
-							"include": "#array-literal"
-						},
-						{
-							"include": "#numeric-literal"
-						},
-						{
-							"include": "#comment"
-						},
-						{
-							"match": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(\\?)?(?=(\\?\\s*)?\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ([\\(]\\s*([\\{\\[]\\s*)?$) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ([\\(]\\s*([\\{\\[]\\s*)?$) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
-							"captures": {
-								"1": {
-									"name": "meta.definition.property.tsx entity.name.function.tsx"
-								},
-								"2": {
-									"name": "keyword.operator.optional.tsx"
-								}
-							}
-						},
-						{
-							"name": "meta.definition.property.tsx variable.object.property.tsx",
-							"match": "[_$[:alpha:]][_$[:alnum:]]*"
-						},
-						{
-							"name": "keyword.operator.optional.tsx",
-							"match": "\\?"
+						"2": {
+							"name": "keyword.operator.optional.tsx"
 						}
-					]
+					}
+				},
+				{
+					"name": "meta.definition.property.tsx variable.object.property.tsx",
+					"match": "[_$[:alpha:]][_$[:alnum:]]*"
+				},
+				{
+					"name": "keyword.operator.optional.tsx",
+					"match": "\\?"
 				}
 			]
 		},
@@ -865,21 +1138,24 @@
 		},
 		"function-declaration": {
 			"name": "meta.function.tsx",
-			"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(export)\\s+)?(?:(async)\\s+)?(function\\b)(?:\\s*(\\*))?(?:(?:\\s+|(?<=\\*))([_$[:alpha:]][_$[:alnum:]]*))?\\s*",
+			"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?(?:(async)\\s+)?(function\\b)(?:\\s*(\\*))?(?:(?:\\s+|(?<=\\*))([_$[:alpha:]][_$[:alnum:]]*))?\\s*",
 			"beginCaptures": {
 				"1": {
 					"name": "keyword.control.export.tsx"
 				},
 				"2": {
-					"name": "storage.modifier.async.tsx"
+					"name": "storage.modifier.tsx"
 				},
 				"3": {
-					"name": "storage.type.function.tsx"
+					"name": "storage.modifier.async.tsx"
 				},
 				"4": {
-					"name": "keyword.generator.asterisk.tsx"
+					"name": "storage.type.function.tsx"
 				},
 				"5": {
+					"name": "keyword.generator.asterisk.tsx"
+				},
+				"6": {
 					"name": "meta.definition.function.tsx entity.name.function.tsx"
 				}
 			},
@@ -915,6 +1191,9 @@
 				{
 					"include": "#function-name"
 				},
+				{
+					"include": "#single-line-comment-consuming-line-ending"
+				},
 				{
 					"include": "#function-body"
 				}
@@ -951,7 +1230,7 @@
 			"patterns": [
 				{
 					"name": "meta.method.declaration.tsx",
-					"begin": "(?x)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(public|private|protected)\\s+)?(?:\\b(abstract)\\s+)?(?:\\b(async)\\s+)?\\b(constructor)\\b(?!:)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))",
+					"begin": "(?x)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(public|private|protected)\\s+)?(?:\\b(abstract)\\s+)?(?:\\b(async)\\s+)?\\s*\\b(constructor)\\b(?!:)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))",
 					"beginCaptures": {
 						"1": {
 							"name": "storage.modifier.tsx"
@@ -978,7 +1257,7 @@
 				},
 				{
 					"name": "meta.method.declaration.tsx",
-					"begin": "(?x)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(public|private|protected)\\s+)?(?:\\b(abstract)\\s+)?(?:\\b(async)\\s+)?(?:(?:\\b(new)\\b(?!:)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|(?:(\\*)\\s*)?)(?=\\s*[\\(\\<])",
+					"begin": "(?x)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(public|private|protected)\\s+)?(?:\\b(abstract)\\s+)?(?:\\b(async)\\s+)?(?:(?:\\s*\\b(new)\\b(?!:)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|(?:(\\*)\\s*)?)(?=\\s*[\\(\\<])",
 					"beginCaptures": {
 						"1": {
 							"name": "storage.modifier.tsx"
@@ -1008,7 +1287,7 @@
 				},
 				{
 					"name": "meta.method.declaration.tsx",
-					"begin": "(?x)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(public|private|protected)\\s+)?(?:\\b(abstract)\\s+)?(?:\\b(async)\\s+)?(?:\\b(get|set)\\s+)?(?:(\\*)\\s*)?(?=(((\\b(?<!\\$)0(x|X)[0-9a-fA-F][0-9a-fA-F_]*\\b(?!\\$))|(\\b(?<!\\$)0(b|B)[01][01_]*\\b(?!\\$))|(\\b(?<!\\$)0(o|O)?[0-7][0-7_]*\\b(?!\\$))|((?<!\\$)(?:\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)| # 1.1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*\\b)|             # 1.E+3\n  (?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)|             # .1E+3\n  (?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)|                 # 1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*\\b)|                      # 1.1\n  (?:\\b[0-9][0-9_]*(\\.)\\B)|                                  # 1.\n  (?:\\B(\\.)[0-9][0-9_]*\\b)|                                  # .1\n  (?:\\b[0-9][0-9_]*\\b(?!\\.))                                 # 1\n)(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\\\'|\\\\)*\\')|(\\\"([^\\\"\\\\]|\\\\\\\"|\\\\)*\\\")|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(\\??))\\s*[\\(\\<])",
+					"begin": "(?x)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(public|private|protected)\\s+)?(?:\\b(abstract)\\s+)?(?:\\b(async)\\s+)?(?:\\b(get|set)\\s+)?(?:(\\*)\\s*)?(?=\\s*(((\\b(?<!\\$)0(x|X)[0-9a-fA-F][0-9a-fA-F_]*\\b(?!\\$))|(\\b(?<!\\$)0(b|B)[01][01_]*\\b(?!\\$))|(\\b(?<!\\$)0(o|O)?[0-7][0-7_]*\\b(?!\\$))|((?<!\\$)(?:\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)| # 1.1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*\\b)|             # 1.E+3\n  (?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)|             # .1E+3\n  (?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)|                 # 1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*\\b)|                      # 1.1\n  (?:\\b[0-9][0-9_]*(\\.)\\B)|                                  # 1.\n  (?:\\B(\\.)[0-9][0-9_]*\\b)|                                  # .1\n  (?:\\b[0-9][0-9_]*\\b(?!\\.))                                 # 1\n)(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\\\'|\\\\)*\\')|(\\\"([^\\\"\\\\]|\\\\\\\"|\\\\)*\\\")|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(\\??))\\s*[\\(\\<])",
 					"beginCaptures": {
 						"1": {
 							"name": "storage.modifier.tsx"
@@ -1040,7 +1319,7 @@
 		},
 		"object-literal-method-declaration": {
 			"name": "meta.method.declaration.tsx",
-			"begin": "(?x)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(async)\\s+)?(?:\\b(get|set)\\s+)?(?:(\\*)\\s*)?(?=(((\\b(?<!\\$)0(x|X)[0-9a-fA-F][0-9a-fA-F_]*\\b(?!\\$))|(\\b(?<!\\$)0(b|B)[01][01_]*\\b(?!\\$))|(\\b(?<!\\$)0(o|O)?[0-7][0-7_]*\\b(?!\\$))|((?<!\\$)(?:\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)| # 1.1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*\\b)|             # 1.E+3\n  (?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)|             # .1E+3\n  (?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)|                 # 1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*\\b)|                      # 1.1\n  (?:\\b[0-9][0-9_]*(\\.)\\B)|                                  # 1.\n  (?:\\B(\\.)[0-9][0-9_]*\\b)|                                  # .1\n  (?:\\b[0-9][0-9_]*\\b(?!\\.))                                 # 1\n)(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\\\'|\\\\)*\\')|(\\\"([^\\\"\\\\]|\\\\\\\"|\\\\)*\\\")|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(\\??))\\s*[\\(\\<])",
+			"begin": "(?x)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(async)\\s+)?(?:\\b(get|set)\\s+)?(?:(\\*)\\s*)?(?=\\s*(((\\b(?<!\\$)0(x|X)[0-9a-fA-F][0-9a-fA-F_]*\\b(?!\\$))|(\\b(?<!\\$)0(b|B)[01][01_]*\\b(?!\\$))|(\\b(?<!\\$)0(o|O)?[0-7][0-7_]*\\b(?!\\$))|((?<!\\$)(?:\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)| # 1.1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*\\b)|             # 1.E+3\n  (?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)|             # .1E+3\n  (?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)|                 # 1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*\\b)|                      # 1.1\n  (?:\\b[0-9][0-9_]*(\\.)\\B)|                                  # 1.\n  (?:\\B(\\.)[0-9][0-9_]*\\b)|                                  # .1\n  (?:\\b[0-9][0-9_]*\\b(?!\\.))                                 # 1\n)(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\\\'|\\\\)*\\')|(\\\"([^\\\"\\\\]|\\\\\\\"|\\\\)*\\\")|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(\\??))\\s*[\\(\\<])",
 			"beginCaptures": {
 				"1": {
 					"name": "storage.modifier.async.tsx"
@@ -1061,7 +1340,7 @@
 					"include": "#function-body"
 				},
 				{
-					"begin": "(?x)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(async)\\s+)?(?:\\b(get|set)\\s+)?(?:(\\*)\\s*)?(?=(((\\b(?<!\\$)0(x|X)[0-9a-fA-F][0-9a-fA-F_]*\\b(?!\\$))|(\\b(?<!\\$)0(b|B)[01][01_]*\\b(?!\\$))|(\\b(?<!\\$)0(o|O)?[0-7][0-7_]*\\b(?!\\$))|((?<!\\$)(?:\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)| # 1.1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*\\b)|             # 1.E+3\n  (?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)|             # .1E+3\n  (?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)|                 # 1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*\\b)|                      # 1.1\n  (?:\\b[0-9][0-9_]*(\\.)\\B)|                                  # 1.\n  (?:\\B(\\.)[0-9][0-9_]*\\b)|                                  # .1\n  (?:\\b[0-9][0-9_]*\\b(?!\\.))                                 # 1\n)(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\\\'|\\\\)*\\')|(\\\"([^\\\"\\\\]|\\\\\\\"|\\\\)*\\\")|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(\\??))\\s*[\\(\\<])",
+					"begin": "(?x)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(async)\\s+)?(?:\\b(get|set)\\s+)?(?:(\\*)\\s*)?(?=\\s*(((\\b(?<!\\$)0(x|X)[0-9a-fA-F][0-9a-fA-F_]*\\b(?!\\$))|(\\b(?<!\\$)0(b|B)[01][01_]*\\b(?!\\$))|(\\b(?<!\\$)0(o|O)?[0-7][0-7_]*\\b(?!\\$))|((?<!\\$)(?:\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)| # 1.1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*\\b)|             # 1.E+3\n  (?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)|             # .1E+3\n  (?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\\b)|                 # 1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*\\b)|                      # 1.1\n  (?:\\b[0-9][0-9_]*(\\.)\\B)|                                  # 1.\n  (?:\\B(\\.)[0-9][0-9_]*\\b)|                                  # .1\n  (?:\\b[0-9][0-9_]*\\b(?!\\.))                                 # 1\n)(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\\\'|\\\\)*\\')|(\\\"([^\\\"\\\\]|\\\\\\\"|\\\\)*\\\")|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(\\??))\\s*[\\(\\<])",
 					"beginCaptures": {
 						"1": {
 							"name": "storage.modifier.async.tsx"
@@ -1165,7 +1444,7 @@
 		},
 		"indexer-declaration": {
 			"name": "meta.indexer.declaration.tsx",
-			"begin": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(readonly)\\s*)?(\\[)\\s*([_$[:alpha:]][_$[:alnum:]]*)\\s*(?=:)",
+			"begin": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(readonly)\\s*)?\\s*(\\[)\\s*([_$[:alpha:]][_$[:alnum:]]*)\\s*(?=:)",
 			"beginCaptures": {
 				"1": {
 					"name": "storage.modifier.tsx"
@@ -1194,7 +1473,7 @@
 		},
 		"indexer-mapped-type-declaration": {
 			"name": "meta.indexer.mappedtype.declaration.tsx",
-			"begin": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))([+-])?(readonly)\\s*)?(\\[)\\s*([_$[:alpha:]][_$[:alnum:]]*)\\s+(in)\\s+",
+			"begin": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))([+-])?(readonly)\\s*)?\\s*(\\[)\\s*([_$[:alpha:]][_$[:alnum:]]*)\\s+(in)\\s+",
 			"beginCaptures": {
 				"1": {
 					"name": "keyword.operator.type.modifier.tsx"
@@ -1278,7 +1557,7 @@
 		},
 		"class-declaration": {
 			"name": "meta.class.tsx",
-			"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(export)\\s+)?\\b(?:(abstract)\\s+)?\\b(class)\\b(?=\\s+|/[/*])",
+			"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(?:(abstract)\\s+)?\\b(class)\\b(?=\\s+|/[/*])",
 			"beginCaptures": {
 				"1": {
 					"name": "keyword.control.export.tsx"
@@ -1287,6 +1566,9 @@
 					"name": "storage.modifier.tsx"
 				},
 				"3": {
+					"name": "storage.modifier.tsx"
+				},
+				"4": {
 					"name": "storage.type.class.tsx"
 				}
 			},
@@ -1338,7 +1620,7 @@
 		},
 		"interface-declaration": {
 			"name": "meta.interface.tsx",
-			"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(export)\\s+)?\\b(?:(abstract)\\s+)?\\b(interface)\\b(?=\\s+|/[/*])",
+			"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(?:(abstract)\\s+)?\\b(interface)\\b(?=\\s+|/[/*])",
 			"beginCaptures": {
 				"1": {
 					"name": "keyword.control.export.tsx"
@@ -1347,6 +1629,9 @@
 					"name": "storage.modifier.tsx"
 				},
 				"3": {
+					"name": "storage.modifier.tsx"
+				},
+				"4": {
 					"name": "storage.type.interface.tsx"
 				}
 			},
@@ -1500,7 +1785,7 @@
 		},
 		"enum-declaration": {
 			"name": "meta.enum.declaration.tsx",
-			"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:\\b(const)\\s+)?\\b(enum)\\s+([_$[:alpha:]][_$[:alnum:]]*)",
+			"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?(?:\\b(const)\\s+)?\\b(enum)\\s+([_$[:alpha:]][_$[:alnum:]]*)",
 			"beginCaptures": {
 				"1": {
 					"name": "keyword.control.export.tsx"
@@ -1509,9 +1794,12 @@
 					"name": "storage.modifier.tsx"
 				},
 				"3": {
-					"name": "storage.type.enum.tsx"
+					"name": "storage.modifier.tsx"
 				},
 				"4": {
+					"name": "storage.type.enum.tsx"
+				},
+				"5": {
 					"name": "entity.name.type.enum.tsx"
 				}
 			},
@@ -1581,16 +1869,19 @@
 		},
 		"namespace-declaration": {
 			"name": "meta.namespace.declaration.tsx",
-			"begin": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?\\b(namespace|module)\\s+(?=[_$[:alpha:]\"'`]))",
+			"begin": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(namespace|module)\\s+(?=[_$[:alpha:]\"'`]))",
 			"beginCaptures": {
 				"1": {
 					"name": "keyword.control.export.tsx"
 				},
 				"2": {
+					"name": "storage.modifier.tsx"
+				},
+				"3": {
 					"name": "storage.type.namespace.tsx"
 				}
 			},
-			"end": "(?<=\\})|(?=;|\\babstract\\b|\\basync\\b|\\bclass\\b|\\bconst\\b|\\bdeclare\\b|\\benum\\b|\\bexport\\b|\\bfunction\\b|\\bimport\\b|\\binterface\\b|\\blet\\b|\\bmodule\\b|\\bnamespace\\b|\\breturn\\b|\\btype\\b|\\bvar\\b)",
+			"end": "(?<=\\})|(?=;|(?:^\\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\\b))",
 			"patterns": [
 				{
 					"include": "#comment"
@@ -1612,19 +1903,22 @@
 		},
 		"type-alias-declaration": {
 			"name": "meta.type.declaration.tsx",
-			"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?\\b(type)\\b\\s+([_$[:alpha:]][_$[:alnum:]]*)\\s*",
+			"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(type)\\b\\s+([_$[:alpha:]][_$[:alnum:]]*)\\s*",
 			"beginCaptures": {
 				"1": {
 					"name": "keyword.control.export.tsx"
 				},
 				"2": {
-					"name": "storage.type.type.tsx"
+					"name": "storage.modifier.tsx"
 				},
 				"3": {
+					"name": "storage.type.type.tsx"
+				},
+				"4": {
 					"name": "entity.name.type.alias.tsx"
 				}
 			},
-			"end": "(?=\\}|;|\\babstract\\b|\\basync\\b|\\bclass\\b|\\bconst\\b|\\bdeclare\\b|\\benum\\b|\\bexport\\b|\\bfunction\\b|\\bimport\\b|\\binterface\\b|\\blet\\b|\\bmodule\\b|\\bnamespace\\b|\\breturn\\b|\\btype\\b|\\bvar\\b)",
+			"end": "(?=\\}|;|(?:^\\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\\b))",
 			"patterns": [
 				{
 					"include": "#comment"
@@ -1639,7 +1933,7 @@
 							"name": "keyword.operator.assignment.tsx"
 						}
 					},
-					"end": "(?=\\}|;|\\babstract\\b|\\basync\\b|\\bclass\\b|\\bconst\\b|\\bdeclare\\b|\\benum\\b|\\bexport\\b|\\bfunction\\b|\\bimport\\b|\\binterface\\b|\\blet\\b|\\bmodule\\b|\\bnamespace\\b|\\breturn\\b|\\btype\\b|\\bvar\\b)",
+					"end": "(?=\\}|;|(?:^\\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\\b))",
 					"patterns": [
 						{
 							"include": "#type"
@@ -1652,24 +1946,27 @@
 			"patterns": [
 				{
 					"name": "meta.import-equals.external.tsx",
-					"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?\\b(import)\\s+([_$[:alpha:]][_$[:alnum:]]*)\\s*(=)\\s*(require)\\s*(\\()",
+					"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(import)\\s+([_$[:alpha:]][_$[:alnum:]]*)\\s*(=)\\s*(require)\\s*(\\()",
 					"beginCaptures": {
 						"1": {
 							"name": "keyword.control.export.tsx"
 						},
 						"2": {
-							"name": "keyword.control.import.tsx"
+							"name": "storage.modifier.tsx"
 						},
 						"3": {
-							"name": "variable.other.readwrite.alias.tsx"
+							"name": "keyword.control.import.tsx"
 						},
 						"4": {
-							"name": "keyword.operator.assignment.tsx"
+							"name": "variable.other.readwrite.alias.tsx"
 						},
 						"5": {
-							"name": "keyword.control.require.tsx"
+							"name": "keyword.operator.assignment.tsx"
 						},
 						"6": {
+							"name": "keyword.control.require.tsx"
+						},
+						"7": {
 							"name": "meta.brace.round.tsx"
 						}
 					},
@@ -1690,18 +1987,21 @@
 				},
 				{
 					"name": "meta.import-equals.internal.tsx",
-					"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?\\b(import)\\s+([_$[:alpha:]][_$[:alnum:]]*)\\s*(=)\\s*(?!require\\b)",
+					"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(import)\\s+([_$[:alpha:]][_$[:alnum:]]*)\\s*(=)\\s*(?!require\\b)",
 					"beginCaptures": {
 						"1": {
 							"name": "keyword.control.export.tsx"
 						},
 						"2": {
-							"name": "keyword.control.import.tsx"
+							"name": "storage.modifier.tsx"
 						},
 						"3": {
-							"name": "variable.other.readwrite.alias.tsx"
+							"name": "keyword.control.import.tsx"
 						},
 						"4": {
+							"name": "variable.other.readwrite.alias.tsx"
+						},
+						"5": {
 							"name": "keyword.operator.assignment.tsx"
 						}
 					},
@@ -1734,12 +2034,15 @@
 		},
 		"import-declaration": {
 			"name": "meta.import.tsx",
-			"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?\\b(import)(?!\\s*[:\\(])(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))",
+			"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(import)(?!\\s*[:\\(])(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))",
 			"beginCaptures": {
 				"1": {
 					"name": "keyword.control.export.tsx"
 				},
 				"2": {
+					"name": "storage.modifier.tsx"
+				},
+				"3": {
 					"name": "keyword.control.import.tsx"
 				}
 			},
@@ -1803,8 +2106,11 @@
 							"name": "keyword.control.default.tsx"
 						}
 					},
-					"end": "(?=$|;|\\babstract\\b|\\basync\\b|\\bclass\\b|\\bconst\\b|\\bdeclare\\b|\\benum\\b|\\bexport\\b|\\bfunction\\b|\\bimport\\b|\\binterface\\b|\\blet\\b|\\bmodule\\b|\\bnamespace\\b|\\breturn\\b|\\btype\\b|\\bvar\\b)",
+					"end": "(?=$|;|(?:^\\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\\b))",
 					"patterns": [
+						{
+							"include": "#interface-declaration"
+						},
 						{
 							"include": "#expression"
 						}
@@ -1812,13 +2118,13 @@
 				},
 				{
 					"name": "meta.export.tsx",
-					"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(export)(?!\\s*:)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))",
+					"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(export)(?!\\s*:)((?=\\s*[\\{*])|((?=\\s*[_$[:alpha:]][_$[:alnum:]]*(\\s|,))(?!\\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\\b)))",
 					"beginCaptures": {
 						"0": {
 							"name": "keyword.control.export.tsx"
 						}
 					},
-					"end": "(?=$|;|\\babstract\\b|\\basync\\b|\\bclass\\b|\\bconst\\b|\\bdeclare\\b|\\benum\\b|\\bexport\\b|\\bfunction\\b|\\bimport\\b|\\binterface\\b|\\blet\\b|\\bmodule\\b|\\bnamespace\\b|\\breturn\\b|\\btype\\b|\\bvar\\b)",
+					"end": "(?=$|;|(?:^\\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\\b))",
 					"patterns": [
 						{
 							"include": "#import-export-declaration"
@@ -2163,7 +2469,7 @@
 				},
 				{
 					"name": "meta.object.member.tsx",
-					"match": "(?x)(?:([_$[:alpha:]][_$[:alnum:]]*)\\s*(?=:\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ([\\(]\\s*([\\{\\[]\\s*)?$) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
+					"match": "(?x)(?:([_$[:alpha:]][_$[:alnum:]]*)\\s*(?=:\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
 					"captures": {
 						"0": {
 							"name": "meta.object-literal.key.tsx"
@@ -2311,13 +2617,13 @@
 			]
 		},
 		"function-call": {
-			"begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*)\\s*(\\?\\.\\s*)?(<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[=]|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[=]|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>\\s*)?\\()",
-			"end": "(?<=\\))(?!(([_$[:alpha:]][_$[:alnum:]]*\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*)\\s*(\\?\\.\\s*)?(<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[=]|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[=]|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>\\s*)?\\()",
+			"begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*)\\s*(\\?\\.\\s*)?(<\\s*(((keyof|infer)\\s+)|(\\*(?=\\s*[,>]))|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer)\\s+)|(\\*(?=\\s*[,>]))|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>\\s*)?\\()",
+			"end": "(?<=\\))(?!(([_$[:alpha:]][_$[:alnum:]]*\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*)\\s*(\\?\\.\\s*)?(<\\s*(((keyof|infer)\\s+)|(\\*(?=\\s*[,>]))|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer)\\s+)|(\\*(?=\\s*[,>]))|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>\\s*)?\\()",
 			"patterns": [
 				{
 					"name": "meta.function-call.tsx",
 					"begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*))",
-					"end": "(?=\\s*(\\?\\.\\s*)?(<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[=]|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[=]|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>\\s*)?\\()",
+					"end": "(?=\\s*(\\?\\.\\s*)?(<\\s*(((keyof|infer)\\s+)|(\\*(?=\\s*[,>]))|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer)\\s+)|(\\*(?=\\s*[,>]))|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>\\s*)?\\()",
 					"patterns": [
 						{
 							"include": "#literal"
@@ -2408,7 +2714,7 @@
 					]
 				},
 				{
-					"begin": "(?<=[(=,]|=>)\\s*(async)?(?=\\s*((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*))?\\(\\s*$)",
+					"begin": "(?<=[(=,]|=>)\\s*(async)?(?=\\s*((((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*))?\\()|(<))\\s*$)",
 					"beginCaptures": {
 						"1": {
 							"name": "storage.modifier.async.tsx"
@@ -2536,11 +2842,11 @@
 				},
 				{
 					"name": "keyword.operator.expression.in.tsx",
-					"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))in(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))"
+					"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))in(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))(?!\\()"
 				},
 				{
 					"name": "keyword.operator.expression.of.tsx",
-					"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))of(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))"
+					"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))of(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))(?!\\()"
 				},
 				{
 					"name": "keyword.operator.expression.instanceof.tsx",
@@ -2564,7 +2870,7 @@
 							"name": "keyword.control.as.tsx"
 						}
 					},
-					"end": "(?=$|^|[;,:})\\]]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(as)\\s+))",
+					"end": "(?=$|^|[;,:})\\]]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(as)\\s+)|(\\s+\\<))",
 					"patterns": [
 						{
 							"include": "#type"
@@ -2663,9 +2969,9 @@
 		},
 		"array-literal": {
 			"name": "meta.array.literal.tsx",
-			"begin": "\\[",
+			"begin": "\\s*(\\[)",
 			"beginCaptures": {
-				"0": {
+				"1": {
 					"name": "meta.brace.square.tsx"
 				}
 			},
@@ -3000,7 +3306,7 @@
 					"include": "#object-identifiers"
 				},
 				{
-					"match": "(?x)(?:(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))\\s*)?([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ([\\(]\\s*([\\{\\[]\\s*)?$) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n))",
+					"match": "(?x)(?:(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))\\s*)?([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n))",
 					"captures": {
 						"1": {
 							"name": "punctuation.accessor.tsx"
@@ -3253,6 +3559,10 @@
 				},
 				{
 					"include": "#punctuation-comma"
+				},
+				{
+					"name": "keyword.operator.assignment.tsx",
+					"match": "(=)(?!>)"
 				}
 			]
 		},
@@ -3327,7 +3637,7 @@
 		},
 		"type-primitive": {
 			"name": "support.type.primitive.tsx",
-			"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(string|number|boolean|symbol|any|void|never)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))"
+			"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(string|number|boolean|symbol|any|void|never|unknown)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))"
 		},
 		"type-builtin-literals": {
 			"name": "support.type.builtin.tsx",
@@ -3467,10 +3777,57 @@
 			},
 			"patterns": [
 				{
-					"include": "#type"
+					"include": "#destructuring-parameter"
 				},
 				{
-					"include": "#function-parameters"
+					"match": "(?x)(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<!=|:)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))\\s*(\\??)(?=\\s*(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$))))",
+					"captures": {
+						"1": {
+							"name": "storage.modifier.tsx"
+						},
+						"2": {
+							"name": "keyword.operator.rest.tsx"
+						},
+						"3": {
+							"name": "entity.name.function.tsx variable.language.this.tsx"
+						},
+						"4": {
+							"name": "entity.name.function.tsx"
+						},
+						"5": {
+							"name": "keyword.operator.optional.tsx"
+						}
+					}
+				},
+				{
+					"match": "(?x)(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<!=|:)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))\\s*(\\??)(?=:)",
+					"captures": {
+						"1": {
+							"name": "storage.modifier.tsx"
+						},
+						"2": {
+							"name": "keyword.operator.rest.tsx"
+						},
+						"3": {
+							"name": "variable.parameter.tsx variable.language.this.tsx"
+						},
+						"4": {
+							"name": "variable.parameter.tsx"
+						},
+						"5": {
+							"name": "keyword.operator.optional.tsx"
+						}
+					}
+				},
+				{
+					"include": "#type-annotation"
+				},
+				{
+					"name": "punctuation.separator.parameter.tsx",
+					"match": ","
+				},
+				{
+					"include": "#type"
 				}
 			]
 		},
@@ -3574,13 +3931,10 @@
 					"include": "#typeof-operator"
 				},
 				{
-					"begin": "(?:([&|])|(=(?!>)))(?=\\s*\\{)",
+					"begin": "([&|\\*])(?=\\s*\\{)",
 					"beginCaptures": {
-						"1": {
+						"0": {
 							"name": "keyword.operator.type.tsx"
-						},
-						"2": {
-							"name": "keyword.operator.assignment.tsx"
 						}
 					},
 					"end": "(?<=\\})",
@@ -3591,13 +3945,10 @@
 					]
 				},
 				{
-					"begin": "([&|])|(=(?!>))",
+					"begin": "[&|\\*]",
 					"beginCaptures": {
-						"1": {
+						"0": {
 							"name": "keyword.operator.type.tsx"
-						},
-						"2": {
-							"name": "keyword.operator.assignment.tsx"
 						}
 					},
 					"end": "(?=\\S)"
@@ -3729,7 +4080,7 @@
 			"patterns": [
 				{
 					"name": "string.template.tsx",
-					"begin": "([_$[:alpha:]][_$[:alnum:]]*)\\s*(?=(<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[=]|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[=]|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>\\s*)`)",
+					"begin": "([_$[:alpha:]][_$[:alnum:]]*)\\s*(?=(<\\s*(((keyof|infer)\\s+)|(\\*(?=\\s*[,>]))|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer)\\s+)|(\\*(?=\\s*[,>]))|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>\\s*)`)",
 					"beginCaptures": {
 						"1": {
 							"name": "entity.name.function.tagged-template.tsx"
@@ -3795,7 +4146,7 @@
 			"patterns": [
 				{
 					"name": "string.regexp.tsx",
-					"begin": "(?<!\\+\\+|--)(?<=[=(:,\\[?+!]|^return|[^\\._$[:alnum:]]return|^case|[^\\._$[:alnum:]]case|=>|&&|\\|\\||\\*\\/)\\s*(\\/)(?![\\/*])(?=(?:[^\\/\\\\\\[]|\\\\.|\\[([^\\]\\\\]|\\\\.)+\\])+\\/(?![\\/*])[gimsuy]*(?!\\s*[a-zA-Z0-9_$]))",
+					"begin": "(?<!\\+\\+|--|})(?<=[=(:,\\[?+!]|^return|[^\\._$[:alnum:]]return|^case|[^\\._$[:alnum:]]case|=>|&&|\\|\\||\\*\\/)\\s*(\\/)(?![\\/*])(?=(?:[^\\/\\\\\\[]|\\\\.|\\[([^\\]\\\\]|\\\\.)+\\])+\\/[gimsuy]*(?!\\s*[a-zA-Z0-9_$]))",
 					"beginCaptures": {
 						"1": {
 							"name": "punctuation.definition.string.begin.tsx"
@@ -3818,7 +4169,7 @@
 				},
 				{
 					"name": "string.regexp.tsx",
-					"begin": "(?<![_$[:alnum:])\\]]|\\+\\+|--)\\/(?![\\/*])(?=(?:[^\\/\\\\\\[]|\\\\.|\\[([^\\]\\\\]|\\\\.)+\\])+\\/(?![\\/*])[gimsuy]*(?!\\s*[a-zA-Z0-9_$]))",
+					"begin": "(?<![_$[:alnum:])\\]]|\\+\\+|--|})\\/(?![\\/*])(?=(?:[^\\/\\\\\\[]|\\\\.|\\[([^\\]\\\\]|\\\\.)+\\])+\\/[gimsuy]*(?!\\s*[a-zA-Z0-9_$]))",
 					"beginCaptures": {
 						"0": {
 							"name": "punctuation.definition.string.begin.tsx"
@@ -4061,20 +4412,42 @@
 							"name": "punctuation.decorator.internaldeclaration.tsx"
 						}
 					},
-					"end": "(?=^)",
+					"end": "(?=$)",
 					"contentName": "comment.line.double-slash.tsx"
 				}
 			]
 		},
+		"single-line-comment-consuming-line-ending": {
+			"begin": "(^[ \\t]+)?((//)(?:\\s*((@)internal)(?=\\s|$))?)",
+			"beginCaptures": {
+				"1": {
+					"name": "punctuation.whitespace.comment.leading.tsx"
+				},
+				"2": {
+					"name": "comment.line.double-slash.tsx"
+				},
+				"3": {
+					"name": "punctuation.definition.comment.tsx"
+				},
+				"4": {
+					"name": "storage.type.internaldeclaration.tsx"
+				},
+				"5": {
+					"name": "punctuation.decorator.internaldeclaration.tsx"
+				}
+			},
+			"end": "(?=^)",
+			"contentName": "comment.line.double-slash.tsx"
+		},
 		"directives": {
 			"name": "comment.line.triple-slash.directive.tsx",
-			"begin": "^(///)\\s*(?=<(reference|amd-dependency|amd-module)(\\s+(path|types|no-default-lib|name)\\s*=\\s*((\\'([^\\'\\\\]|\\\\\\'|\\\\)*\\')|(\\\"([^\\\"\\\\]|\\\\\\\"|\\\\)*\\\")))+\\s*/>\\s*$)",
+			"begin": "^(///)\\s*(?=<(reference|amd-dependency|amd-module)(\\s+(path|types|no-default-lib|lib|name)\\s*=\\s*((\\'([^\\'\\\\]|\\\\\\'|\\\\)*\\')|(\\\"([^\\\"\\\\]|\\\\\\\"|\\\\)*\\\")))+\\s*/>\\s*$)",
 			"beginCaptures": {
 				"1": {
 					"name": "punctuation.definition.comment.tsx"
 				}
 			},
-			"end": "(?=^)",
+			"end": "(?=$)",
 			"patterns": [
 				{
 					"name": "meta.tag.tsx",
@@ -4096,7 +4469,7 @@
 					"patterns": [
 						{
 							"name": "entity.other.attribute-name.directive.tsx",
-							"match": "path|types|no-default-lib|name"
+							"match": "path|types|no-default-lib|lib|name"
 						},
 						{
 							"name": "keyword.operator.assignment.tsx",
@@ -4557,8 +4930,8 @@
 			]
 		},
 		"jsx-tag-without-attributes-in-expression": {
-			"begin": "(?<!\\+\\+|--)(?<=[({\\[,?=>:*]|&&|\\|\\||\\?|^return|[^\\._$[:alnum:]]return|^default|[^\\._$[:alnum:]]default|^)\\s*(?=(<)\\s*(?:([_$a-zA-Z][-$\\w.]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\\w.]*))(?<!\\.|-))?\\s*(>))",
-			"end": "(?!(<)\\s*(?:([_$a-zA-Z][-$\\w.]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\\w.]*))(?<!\\.|-))?\\s*(>))",
+			"begin": "(?<!\\+\\+|--)(?<=[({\\[,?=>:*]|&&|\\|\\||\\?|^await|[^\\._$[:alnum:]]await|^return|[^\\._$[:alnum:]]return|^default|[^\\._$[:alnum:]]default|^yield|[^\\._$[:alnum:]]yield|^)\\s*(?=(<)\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<!\\.|-))?\\s*(>))",
+			"end": "(?!(<)\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<!\\.|-))?\\s*(>))",
 			"patterns": [
 				{
 					"include": "#jsx-tag-without-attributes"
@@ -4567,8 +4940,8 @@
 		},
 		"jsx-tag-without-attributes": {
 			"name": "meta.tag.without-attributes.tsx",
-			"begin": "(<)\\s*(?:([_$a-zA-Z][-$\\w.]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\\w.]*))(?<!\\.|-))?\\s*(>)",
-			"end": "(</)\\s*(?:([_$a-zA-Z][-$\\w.]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\\w.]*))(?<!\\.|-))?\\s*(>)",
+			"begin": "(<)\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<!\\.|-))?\\s*(>)",
+			"end": "(</)\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<!\\.|-))?\\s*(>)",
 			"beginCaptures": {
 				"1": {
 					"name": "punctuation.definition.tag.begin.tsx"
@@ -4617,8 +4990,8 @@
 			]
 		},
 		"jsx-tag-in-expression": {
-			"begin": "(?x)\n  (?<!\\+\\+|--)(?<=[({\\[,?=>:*]|&&|\\|\\||\\?|^return|[^\\._$[:alnum:]]return|^default|[^\\._$[:alnum:]]default|^)\\s*\n  (?!<\\s*[_$[:alpha:]][_$[:alnum:]]*((\\s+extends\\s+[^=>])|,)) # look ahead is not type parameter of arrow\n  (?=(<)\\s*(?:([_$a-zA-Z][-$\\w.]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\\w.]*))(?<!\\.|-))(?=((<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[=]|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[=]|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>\\s*)|(\\s+))(?!\\?)|\\/?>))",
-			"end": "(?!(<)\\s*(?:([_$a-zA-Z][-$\\w.]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\\w.]*))(?<!\\.|-))(?=((<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[=]|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[=]|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>\\s*)|(\\s+))(?!\\?)|\\/?>))",
+			"begin": "(?x)\n  (?<!\\+\\+|--)(?<=[({\\[,?=>:*]|&&|\\|\\||\\?|^await|[^\\._$[:alnum:]]await|^return|[^\\._$[:alnum:]]return|^default|[^\\._$[:alnum:]]default|^yield|[^\\._$[:alnum:]]yield|^)\\s*\n  (?!<\\s*[_$[:alpha:]][_$[:alnum:]]*((\\s+extends\\s+[^=>])|,)) # look ahead is not type parameter of arrow\n  (?=(<)\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<!\\.|-))(?=((<\\s*)|(\\s+))(?!\\?)|\\/?>))",
+			"end": "(?!(<)\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<!\\.|-))(?=((<\\s*)|(\\s+))(?!\\?)|\\/?>))",
 			"patterns": [
 				{
 					"include": "#jsx-tag"
@@ -4627,8 +5000,8 @@
 		},
 		"jsx-tag": {
 			"name": "meta.tag.tsx",
-			"begin": "(?=(<)\\s*(?:([_$a-zA-Z][-$\\w.]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\\w.]*))(?<!\\.|-))(?=((<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[=]|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[=]|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>\\s*)|(\\s+))(?!\\?)|\\/?>))",
-			"end": "(/>)|(?:(</)\\s*(?:([_$a-zA-Z][-$\\w.]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\\w.]*))(?<!\\.|-))?\\s*(>))",
+			"begin": "(?=(<)\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<!\\.|-))(?=((<\\s*)|(\\s+))(?!\\?)|\\/?>))",
+			"end": "(/>)|(?:(</)\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<!\\.|-))?\\s*(>))",
 			"endCaptures": {
 				"1": {
 					"name": "punctuation.definition.tag.end.tsx"
@@ -4654,7 +5027,7 @@
 			},
 			"patterns": [
 				{
-					"begin": "(<)\\s*(?:([_$a-zA-Z][-$\\w.]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\\w.]*))(?<!\\.|-))(?=((<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[=]|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[=]|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>\\s*)|(\\s+))(?!\\?)|\\/?>)",
+					"begin": "(<)\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<!\\.|-))(?=((<\\s*)|(\\s+))(?!\\?)|\\/?>)",
 					"beginCaptures": {
 						"1": {
 							"name": "punctuation.definition.tag.begin.tsx"
@@ -4787,7 +5160,7 @@
 			]
 		},
 		"jsx-tag-attribute-name": {
-			"match": "(?x)\n  \\s*\n  (?:([_$a-zA-Z][-$\\w.]*)(:))?\n  ([_$a-zA-Z][-$\\w]*)\n  (?=\\s|=|/?>|/\\*|//)",
+			"match": "(?x)\n  \\s*\n  (?:([_$[:alpha:]][-_$[:alnum:].]*)(:))?\n  ([_$[:alpha:]][-_$[:alnum:]]*)\n  (?=\\s|=|/?>|/\\*|//)",
 			"captures": {
 				"1": {
 					"name": "entity.other.attribute-name.namespace.tsx"
diff --git a/extensions/typescript-basics/test/colorize-results/test-brackets_tsx.json b/extensions/typescript-basics/test/colorize-results/test-brackets_tsx.json
index 92fe70a1da2..c7e165ae25e 100644
--- a/extensions/typescript-basics/test/colorize-results/test-brackets_tsx.json
+++ b/extensions/typescript-basics/test/colorize-results/test-brackets_tsx.json
@@ -146,9 +146,9 @@
 		"c": "//",
 		"t": "source.tsx comment.line.double-slash.tsx punctuation.definition.comment.tsx",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -157,9 +157,9 @@
 		"c": " Highlight ok here",
 		"t": "source.tsx comment.line.double-slash.tsx",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -221,7 +221,7 @@
 	},
 	{
 		"c": "   ",
-		"t": "source.tsx meta.interface.tsx",
+		"t": "source.tsx meta.interface.tsx meta.field.declaration.tsx",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
diff --git a/extensions/typescript-basics/test/colorize-results/test-issue11_ts.json b/extensions/typescript-basics/test/colorize-results/test-issue11_ts.json
index c7ee2e71f21..379ac403ce6 100644
--- a/extensions/typescript-basics/test/colorize-results/test-issue11_ts.json
+++ b/extensions/typescript-basics/test/colorize-results/test-issue11_ts.json
@@ -1937,7 +1937,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.ts meta.class.ts meta.type.parameters.ts meta.object.type.ts",
+		"t": "source.ts meta.class.ts meta.type.parameters.ts meta.object.type.ts meta.field.declaration.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2960,7 +2960,7 @@
 	},
 	{
 		"c": "t",
-		"t": "source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts",
+		"t": "source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.constant.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
diff --git a/extensions/typescript-basics/test/colorize-results/test-issue5431_ts.json b/extensions/typescript-basics/test/colorize-results/test-issue5431_ts.json
index e2fc02cc2ad..6a27304f24a 100644
--- a/extensions/typescript-basics/test/colorize-results/test-issue5431_ts.json
+++ b/extensions/typescript-basics/test/colorize-results/test-issue5431_ts.json
@@ -188,7 +188,7 @@
 	},
 	{
 		"c": "timeRange",
-		"t": "source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts",
+		"t": "source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.constant.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
diff --git a/extensions/typescript-basics/test/colorize-results/test-issue5465_ts.json b/extensions/typescript-basics/test/colorize-results/test-issue5465_ts.json
index f4a61d6e1ac..717e252e429 100644
--- a/extensions/typescript-basics/test/colorize-results/test-issue5465_ts.json
+++ b/extensions/typescript-basics/test/colorize-results/test-issue5465_ts.json
@@ -199,7 +199,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.ts meta.function.ts meta.block.ts",
+		"t": "source.ts meta.function.ts meta.block.ts meta.array.literal.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
diff --git a/extensions/typescript-basics/test/colorize-results/test-issue5566_ts.json b/extensions/typescript-basics/test/colorize-results/test-issue5566_ts.json
index 86357c7c0cd..c7c430d7632 100644
--- a/extensions/typescript-basics/test/colorize-results/test-issue5566_ts.json
+++ b/extensions/typescript-basics/test/colorize-results/test-issue5566_ts.json
@@ -111,7 +111,7 @@
 	},
 	{
 		"c": "foo",
-		"t": "source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts entity.name.function.ts",
+		"t": "source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.constant.ts entity.name.function.ts",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
diff --git a/extensions/typescript-basics/test/colorize-results/test-members_ts.json b/extensions/typescript-basics/test/colorize-results/test-members_ts.json
index 05e924b9c13..04519a1105b 100644
--- a/extensions/typescript-basics/test/colorize-results/test-members_ts.json
+++ b/extensions/typescript-basics/test/colorize-results/test-members_ts.json
@@ -122,7 +122,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.ts meta.class.ts",
+		"t": "source.ts meta.class.ts meta.field.declaration.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
diff --git a/extensions/typescript-basics/test/colorize-results/test_ts.json b/extensions/typescript-basics/test/colorize-results/test_ts.json
index 72fb99dba53..bf74c1c2174 100644
--- a/extensions/typescript-basics/test/colorize-results/test_ts.json
+++ b/extensions/typescript-basics/test/colorize-results/test_ts.json
@@ -3,9 +3,9 @@
 		"c": "/*",
 		"t": "source.ts comment.block.ts punctuation.definition.comment.ts",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -14,9 +14,9 @@
 		"c": " Game of Life",
 		"t": "source.ts comment.block.ts",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -25,9 +25,9 @@
 		"c": " * Implemented in TypeScript",
 		"t": "source.ts comment.block.ts",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -36,9 +36,9 @@
 		"c": " * To learn more about TypeScript, please visit http://www.typescriptlang.org/",
 		"t": "source.ts comment.block.ts",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -47,9 +47,9 @@
 		"c": " ",
 		"t": "source.ts comment.block.ts",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -58,9 +58,9 @@
 		"c": "*/",
 		"t": "source.ts comment.block.ts punctuation.definition.comment.ts",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -232,7 +232,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.ts meta.namespace.declaration.ts meta.block.ts meta.class.ts",
+		"t": "source.ts meta.namespace.declaration.ts meta.block.ts meta.class.ts meta.field.declaration.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -320,7 +320,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.ts meta.namespace.declaration.ts meta.block.ts meta.class.ts",
+		"t": "source.ts meta.namespace.declaration.ts meta.block.ts meta.class.ts meta.field.declaration.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -408,7 +408,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.ts meta.namespace.declaration.ts meta.block.ts meta.class.ts",
+		"t": "source.ts meta.namespace.declaration.ts meta.block.ts meta.class.ts meta.field.declaration.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -474,7 +474,7 @@
 	},
 	{
 		"c": "\t\t",
-		"t": "source.ts meta.namespace.declaration.ts meta.block.ts meta.class.ts",
+		"t": "source.ts meta.namespace.declaration.ts meta.block.ts meta.class.ts meta.method.declaration.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1156,7 +1156,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.ts meta.namespace.declaration.ts meta.block.ts meta.class.ts",
+		"t": "source.ts meta.namespace.declaration.ts meta.block.ts meta.class.ts meta.field.declaration.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1244,7 +1244,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.ts meta.namespace.declaration.ts meta.block.ts meta.class.ts",
+		"t": "source.ts meta.namespace.declaration.ts meta.block.ts meta.class.ts meta.field.declaration.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1332,7 +1332,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.ts meta.namespace.declaration.ts meta.block.ts meta.class.ts",
+		"t": "source.ts meta.namespace.declaration.ts meta.block.ts meta.class.ts meta.field.declaration.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1420,7 +1420,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.ts meta.namespace.declaration.ts meta.block.ts meta.class.ts",
+		"t": "source.ts meta.namespace.declaration.ts meta.block.ts meta.class.ts meta.field.declaration.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1508,7 +1508,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.ts meta.namespace.declaration.ts meta.block.ts meta.class.ts",
+		"t": "source.ts meta.namespace.declaration.ts meta.block.ts meta.class.ts meta.field.declaration.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1596,7 +1596,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.ts meta.namespace.declaration.ts meta.block.ts meta.class.ts",
+		"t": "source.ts meta.namespace.declaration.ts meta.block.ts meta.class.ts meta.field.declaration.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1684,7 +1684,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.ts meta.namespace.declaration.ts meta.block.ts meta.class.ts",
+		"t": "source.ts meta.namespace.declaration.ts meta.block.ts meta.class.ts meta.field.declaration.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1772,7 +1772,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.ts meta.namespace.declaration.ts meta.block.ts meta.class.ts",
+		"t": "source.ts meta.namespace.declaration.ts meta.block.ts meta.class.ts meta.field.declaration.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1860,7 +1860,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.ts meta.namespace.declaration.ts meta.block.ts meta.class.ts",
+		"t": "source.ts meta.namespace.declaration.ts meta.block.ts meta.class.ts meta.field.declaration.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1871,7 +1871,7 @@
 	},
 	{
 		"c": "world",
-		"t": "source.ts meta.namespace.declaration.ts meta.block.ts meta.class.ts variable.other.readwrite.ts",
+		"t": "source.ts meta.namespace.declaration.ts meta.block.ts meta.class.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -1893,7 +1893,7 @@
 	},
 	{
 		"c": "\t\t",
-		"t": "source.ts meta.namespace.declaration.ts meta.block.ts meta.class.ts",
+		"t": "source.ts meta.namespace.declaration.ts meta.block.ts meta.class.ts meta.method.declaration.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -8416,7 +8416,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.ts meta.namespace.declaration.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts",
+		"t": "source.ts meta.namespace.declaration.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.array.literal.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -8801,7 +8801,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.ts meta.namespace.declaration.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts meta.var.expr.ts",
+		"t": "source.ts meta.namespace.declaration.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts meta.var.expr.ts meta.array.literal.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
diff --git a/extensions/typescript-basics/test/colorize-results/tsconfig_json.json b/extensions/typescript-basics/test/colorize-results/tsconfig_json.json
index 13700965aba..69ce07f643d 100644
--- a/extensions/typescript-basics/test/colorize-results/tsconfig_json.json
+++ b/extensions/typescript-basics/test/colorize-results/tsconfig_json.json
@@ -1,7 +1,7 @@
 [
 	{
 		"c": "{",
-		"t": "source.json meta.structure.dictionary.json punctuation.definition.dictionary.begin.json",
+		"t": "source.json.comments meta.structure.dictionary.json.comments punctuation.definition.dictionary.begin.json.comments",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -12,7 +12,7 @@
 	},
 	{
 		"c": "\t",
-		"t": "source.json meta.structure.dictionary.json",
+		"t": "source.json.comments meta.structure.dictionary.json.comments",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -23,7 +23,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "source.json meta.structure.dictionary.json string.json support.type.property-name.json punctuation.support.type.property-name.begin.json",
+		"t": "source.json.comments meta.structure.dictionary.json.comments string.json.comments support.type.property-name.json.comments punctuation.support.type.property-name.begin.json.comments",
 		"r": {
 			"dark_plus": "support.type.property-name: #9CDCFE",
 			"light_plus": "support.type.property-name.json: #0451A5",
@@ -34,7 +34,7 @@
 	},
 	{
 		"c": "compilerOptions",
-		"t": "source.json meta.structure.dictionary.json string.json support.type.property-name.json",
+		"t": "source.json.comments meta.structure.dictionary.json.comments string.json.comments support.type.property-name.json.comments",
 		"r": {
 			"dark_plus": "support.type.property-name: #9CDCFE",
 			"light_plus": "support.type.property-name.json: #0451A5",
@@ -45,7 +45,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "source.json meta.structure.dictionary.json string.json support.type.property-name.json punctuation.support.type.property-name.end.json",
+		"t": "source.json.comments meta.structure.dictionary.json.comments string.json.comments support.type.property-name.json.comments punctuation.support.type.property-name.end.json.comments",
 		"r": {
 			"dark_plus": "support.type.property-name: #9CDCFE",
 			"light_plus": "support.type.property-name.json: #0451A5",
@@ -56,7 +56,7 @@
 	},
 	{
 		"c": ":",
-		"t": "source.json meta.structure.dictionary.json meta.structure.dictionary.value.json punctuation.separator.dictionary.key-value.json",
+		"t": "source.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments punctuation.separator.dictionary.key-value.json.comments",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -67,7 +67,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.json meta.structure.dictionary.json meta.structure.dictionary.value.json",
+		"t": "source.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -78,7 +78,7 @@
 	},
 	{
 		"c": "{",
-		"t": "source.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json punctuation.definition.dictionary.begin.json",
+		"t": "source.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.comments punctuation.definition.dictionary.begin.json.comments",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -89,7 +89,7 @@
 	},
 	{
 		"c": "\t\t",
-		"t": "source.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json",
+		"t": "source.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.comments",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -100,7 +100,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "source.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json string.json support.type.property-name.json punctuation.support.type.property-name.begin.json",
+		"t": "source.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.comments string.json.comments support.type.property-name.json.comments punctuation.support.type.property-name.begin.json.comments",
 		"r": {
 			"dark_plus": "support.type.property-name: #9CDCFE",
 			"light_plus": "support.type.property-name.json: #0451A5",
@@ -111,7 +111,7 @@
 	},
 	{
 		"c": "target",
-		"t": "source.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json string.json support.type.property-name.json",
+		"t": "source.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.comments string.json.comments support.type.property-name.json.comments",
 		"r": {
 			"dark_plus": "support.type.property-name: #9CDCFE",
 			"light_plus": "support.type.property-name.json: #0451A5",
@@ -122,7 +122,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "source.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json string.json support.type.property-name.json punctuation.support.type.property-name.end.json",
+		"t": "source.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.comments string.json.comments support.type.property-name.json.comments punctuation.support.type.property-name.end.json.comments",
 		"r": {
 			"dark_plus": "support.type.property-name: #9CDCFE",
 			"light_plus": "support.type.property-name.json: #0451A5",
@@ -133,7 +133,7 @@
 	},
 	{
 		"c": ":",
-		"t": "source.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json punctuation.separator.dictionary.key-value.json",
+		"t": "source.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments punctuation.separator.dictionary.key-value.json.comments",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -144,7 +144,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json",
+		"t": "source.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -155,7 +155,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "source.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json string.quoted.double.json punctuation.definition.string.begin.json",
+		"t": "source.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments string.quoted.double.json.comments punctuation.definition.string.begin.json.comments",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -166,7 +166,7 @@
 	},
 	{
 		"c": "es6",
-		"t": "source.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json string.quoted.double.json",
+		"t": "source.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments string.quoted.double.json.comments",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -177,7 +177,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "source.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json string.quoted.double.json punctuation.definition.string.end.json",
+		"t": "source.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments string.quoted.double.json.comments punctuation.definition.string.end.json.comments",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -188,7 +188,7 @@
 	},
 	{
 		"c": "\t",
-		"t": "source.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json",
+		"t": "source.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -199,7 +199,7 @@
 	},
 	{
 		"c": "}",
-		"t": "source.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json punctuation.definition.dictionary.end.json",
+		"t": "source.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.comments punctuation.definition.dictionary.end.json.comments",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -210,7 +210,7 @@
 	},
 	{
 		"c": "}",
-		"t": "source.json meta.structure.dictionary.json punctuation.definition.dictionary.end.json",
+		"t": "source.json.comments meta.structure.dictionary.json.comments punctuation.definition.dictionary.end.json.comments",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
diff --git a/extensions/typescript-language-features/.vscodeignore b/extensions/typescript-language-features/.vscodeignore
index d257eda277b..4f118359bf9 100644
--- a/extensions/typescript-language-features/.vscodeignore
+++ b/extensions/typescript-language-features/.vscodeignore
@@ -1,4 +1,6 @@
 build/**
 src/**
 test/**
-tsconfig.json
\ No newline at end of file
+out/**
+tsconfig.json
+extension.webpack.config.js
diff --git a/extensions/typescript-language-features/OSSREADME.json b/extensions/typescript-language-features/OSSREADME.json
index 160da003cd8..692c0592a16 100644
--- a/extensions/typescript-language-features/OSSREADME.json
+++ b/extensions/typescript-language-features/OSSREADME.json
@@ -1,7 +1,106 @@
-[{
-	"name": "TypeScript-TmLanguage",
-	"version": "0.1.8",
-	"license": "MIT",
-	"repositoryURL": "https://github.com/Microsoft/TypeScript-TmLanguage",
-	"description": "The files syntaxes/TypeScript.tmLanguage.json and syntaxes/TypeScriptReact.tmLanguage.json were derived from TypeScript.tmLanguage and TypeScriptReact.tmLanguage in https://github.com/Microsoft/TypeScript-TmLanguage."
-}]
+[
+	{
+		"name": "TypeScript-TmLanguage",
+		"version": "0.1.8",
+		"license": "MIT",
+		"repositoryURL": "https://github.com/Microsoft/TypeScript-TmLanguage",
+		"description": "The files syntaxes/TypeScript.tmLanguage.json and syntaxes/TypeScriptReact.tmLanguage.json were derived from TypeScript.tmLanguage and TypeScriptReact.tmLanguage in https://github.com/Microsoft/TypeScript-TmLanguage."
+	},
+	{
+		"name": "definitelytyped",
+		"license": "MIT",
+		"repositoryURL": "https://github.com/DefinitelyTyped/DefinitelyTyped",
+		"description": "Typings files that are downloaded by TypeScript. These typings power IntelliSense for JavaScript and TypeScript."
+	},
+	{
+		"name": "Unicode",
+		"license": "UNICODE, INC. LICENSE AGREEMENT - DATA FILES AND SOFTWARE",
+		"description": "These files are included by TypeScript.Ø",
+		"licenseDetail": [
+			"Unicode Data Files include all data files under the directories",
+			"http://www.unicode.org/Public/, http://www.unicode.org/reports/,",
+			"http://www.unicode.org/cldr/data/, http://source.icu-project.org/repos/icu/, and",
+			"http://www.unicode.org/utility/trac/browser/.",
+			"",
+			"Unicode Data Files do not include PDF online code charts under the",
+			"directory http://www.unicode.org/Public/.",
+			"",
+			"Software includes any source code published in the Unicode Standard",
+			"or under the directories",
+			"http://www.unicode.org/Public/, http://www.unicode.org/reports/,",
+			"http://www.unicode.org/cldr/data/, http://source.icu-project.org/repos/icu/, and",
+			"http://www.unicode.org/utility/trac/browser/.",
+			"",
+			"NOTICE TO USER: Carefully read the following legal agreement.",
+			"BY DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING UNICODE INC.'S",
+			"DATA FILES (\"DATA FILES\"), AND/OR SOFTWARE (\"SOFTWARE\"),",
+			"YOU UNEQUIVOCALLY ACCEPT, AND AGREE TO BE BOUND BY, ALL OF THE",
+			"TERMS AND CONDITIONS OF THIS AGREEMENT.",
+			"IF YOU DO NOT AGREE, DO NOT DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE",
+			"THE DATA FILES OR SOFTWARE.",
+			"",
+			"COPYRIGHT AND PERMISSION NOTICE",
+			"",
+			"Copyright (c) 1991-2017 Unicode, Inc. All rights reserved.",
+			"Distributed under the Terms of Use in http://www.unicode.org/copyright.html.",
+			"",
+			"Permission is hereby granted, free of charge, to any person obtaining",
+			"a copy of the Unicode data files and any associated documentation",
+			"(the \"Data Files\") or Unicode software and any associated documentation",
+			"(the \"Software\") to deal in the Data Files or Software",
+			"without restriction, including without limitation the rights to use,",
+			"copy, modify, merge, publish, distribute, and/or sell copies of",
+			"the Data Files or Software, and to permit persons to whom the Data Files",
+			"or Software are furnished to do so, provided that either",
+			"(a) this copyright and permission notice appear with all copies",
+			"of the Data Files or Software, or",
+			"(b) this copyright and permission notice appear in associated",
+			"Documentation.",
+			"",
+			"THE DATA FILES AND SOFTWARE ARE PROVIDED \"AS IS\", WITHOUT WARRANTY OF",
+			"ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE",
+			"WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND",
+			"NONINFRINGEMENT OF THIRD PARTY RIGHTS.",
+			"IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS",
+			"NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL",
+			"DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,",
+			"DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER",
+			"TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR",
+			"PERFORMANCE OF THE DATA FILES OR SOFTWARE.",
+			"",
+			"Except as contained in this notice, the name of a copyright holder",
+			"shall not be used in advertising or otherwise to promote the sale,",
+			"use or other dealings in these Data Files or Software without prior",
+			"written authorization of the copyright holder."
+		]
+	},
+	{
+		"name": "Document Object Model",
+		"license": "W3C License",
+		"description": "These files",
+		"licenseDetail": [
+			"W3C License",
+			"This work is being provided by the copyright holders under the following license.",
+			"By obtaining and/or copying this work, you (the licensee) agree that you have read, understood, and will comply with the following terms and conditions.",
+			"Permission to copy, modify, and distribute this work, with or without modification, for any purpose and without fee or royalty is hereby granted, provided that you include the following ",
+			"on ALL copies of the work or portions thereof, including modifications:",
+			"* The full text of this NOTICE in a location viewable to users of the redistributed or derivative work.",
+			"* Any pre-existing intellectual property disclaimers, notices, or terms and conditions. If none exist, the W3C Software and Document Short Notice should be included.",
+			"* Notice of any changes or modifications, through a copyright statement on the new code or document such as \"This software or document includes material copied from or derived ",
+			"from Document Object Model. Copyright © 2015 W3C® (MIT, ERCIM, Keio, Beihang).\" ",
+			"Disclaimers",
+			"THIS WORK IS PROVIDED \"AS IS",
+			" AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY OR ",
+			"FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE OR DOCUMENT WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.",
+			"COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENT.",
+			"The name and trademarks of copyright holders may NOT be used in advertising or publicity pertaining to the work without specific, written prior permission. ",
+			"Title to copyright in this work will at all times remain with copyright holders."
+		]
+	},
+	{
+		"name": "Web Background Synchronization",
+		"license": "Apache2",
+		"repositoryURL": "https://github.com/WICG/BackgroundSync",
+		"description": "TypeScript includes files related to this specification"
+	}
+]
\ No newline at end of file
diff --git a/extensions/typescript-language-features/README.md b/extensions/typescript-language-features/README.md
new file mode 100644
index 00000000000..26942f9d460
--- /dev/null
+++ b/extensions/typescript-language-features/README.md
@@ -0,0 +1,7 @@
+# Language Features for Typescript and Javascript files
+
+**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.
+
+## Features
+
+See [Typescript in Visual Studio Code](https://code.visualstudio.com/docs/languages/typescript) and [Javascript in Visual Studio Code](https://code.visualstudio.com/docs/languages/javascript) to learn about the features of this extension.
\ No newline at end of file
diff --git a/extensions/typescript-language-features/extension.webpack.config.js b/extensions/typescript-language-features/extension.webpack.config.js
new file mode 100644
index 00000000000..de88398eca0
--- /dev/null
+++ b/extensions/typescript-language-features/extension.webpack.config.js
@@ -0,0 +1,20 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+//@ts-check
+
+'use strict';
+
+const withDefaults = require('../shared.webpack.config');
+
+module.exports = withDefaults({
+	context: __dirname,
+	resolve: {
+		mainFields: ['module', 'main']
+	},
+	entry: {
+		extension: './src/extension.ts',
+	}
+});
diff --git a/extensions/typescript-language-features/package.json b/extensions/typescript-language-features/package.json
index d94a54d8837..4e5a46671d9 100644
--- a/extensions/typescript-language-features/package.json
+++ b/extensions/typescript-language-features/package.json
@@ -16,13 +16,14 @@
     "Programming Languages"
   ],
   "dependencies": {
-    "semver": "4.3.6",
-    "vscode-extension-telemetry": "0.0.17",
-    "vscode-nls": "^3.2.1"
+    "jsonc-parser": "^2.0.1",
+    "semver": "5.5.1",
+    "vscode-extension-telemetry": "0.0.18",
+    "vscode-nls": "^4.0.0"
   },
   "devDependencies": {
     "@types/node": "8.0.33",
-    "@types/semver": "5.4.0",
+    "@types/semver": "^5.5.0",
     "vscode": "^1.1.10"
   },
   "scripts": {
@@ -40,7 +41,8 @@
     "onCommand:javascript.goToProjectConfig",
     "onCommand:typescript.goToProjectConfig",
     "onCommand:typescript.openTsServerLog",
-    "onCommand:workbench.action.tasks.runTask"
+    "onCommand:workbench.action.tasks.runTask",
+    "onLanguage:jsonc"
   ],
   "main": "./out/extension",
   "contributes": {
@@ -68,7 +70,10 @@
           "type": "boolean",
           "default": false,
           "description": "%typescript.disableAutomaticTypeAcquisition%",
-          "scope": "window"
+          "scope": "window",
+          "tags": [
+            "usesOnlineServices"
+          ]
         },
         "typescript.npm": {
           "type": [
@@ -361,13 +366,20 @@
         "javascript.implicitProjectConfig.experimentalDecorators": {
           "type": "boolean",
           "default": false,
-          "description": "%javascript.implicitProjectConfig.experimentalDecorators%",
+          "markdownDescription": "%javascript.implicitProjectConfig.experimentalDecorators%",
           "scope": "window"
         },
         "javascript.nameSuggestions": {
           "type": "boolean",
           "default": true,
           "description": "%javascript.nameSuggestions%",
+          "scope": "resource",
+          "deprecationMessage": "%javascript.nameSuggestions.deprecationMessage%"
+        },
+        "javascript.suggest.names": {
+          "type": "boolean",
+          "default": true,
+          "description": "%configuration.suggest.names%",
           "scope": "resource"
         },
         "typescript.tsc.autoDetect": {
@@ -379,6 +391,12 @@
             "build",
             "watch"
           ],
+          "enumDescriptions": [
+            "%typescript.tsc.autoDetect.on%",
+            "%typescript.tsc.autoDetect.off%",
+            "%typescript.tsc.autoDetect.build%",
+            "%typescript.tsc.autoDetect.watch%"
+          ],
           "description": "%typescript.tsc.autoDetect%",
           "scope": "window"
         },
@@ -386,12 +404,38 @@
           "type": "boolean",
           "default": true,
           "description": "%typescript.quickSuggestionsForPaths%",
+          "scope": "resource",
+          "deprecationMessage": "%typescript.quickSuggestionsForPaths.deprecationMessage%"
+        },
+        "javascript.suggest.paths": {
+          "type": "boolean",
+          "default": true,
+          "description": "%configuration.suggest.paths%",
+          "scope": "resource"
+        },
+        "typescript.suggest.paths": {
+          "type": "boolean",
+          "default": true,
+          "description": "%configuration.suggest.paths%",
           "scope": "resource"
         },
         "typescript.autoImportSuggestions.enabled": {
           "type": "boolean",
           "default": true,
           "description": "%typescript.autoImportSuggestions.enabled%",
+          "scope": "resource",
+          "deprecationMessage": "%typescript.autoImportSuggestions.enabled.deprecationMessage%"
+        },
+        "javascript.suggest.autoImports": {
+          "type": "boolean",
+          "default": true,
+          "description": "%configuration.suggest.autoImports%",
+          "scope": "resource"
+        },
+        "typescript.suggest.autoImports": {
+          "type": "boolean",
+          "default": true,
+          "description": "%configuration.suggest.autoImports%",
           "scope": "resource"
         },
         "typescript.locale": {
@@ -413,7 +457,7 @@
             null
           ],
           "default": null,
-          "description": "%typescript.locale%",
+          "markdownDescription": "%typescript.locale%",
           "scope": "window"
         },
         "javascript.suggestionActions.enabled": {
@@ -436,7 +480,7 @@
             "double"
           ],
           "default": "auto",
-          "description": "%typescript.preferences.quoteStyle%",
+          "markdownDescription": "%typescript.preferences.quoteStyle%",
           "scope": "resource"
         },
         "typescript.preferences.quoteStyle": {
@@ -447,7 +491,7 @@
             "double"
           ],
           "default": "auto",
-          "description": "%typescript.preferences.quoteStyle%",
+          "markdownDescription": "%typescript.preferences.quoteStyle%",
           "scope": "resource"
         },
         "javascript.preferences.importModuleSpecifier": {
@@ -457,6 +501,11 @@
             "relative",
             "non-relative"
           ],
+          "markdownEnumDescriptions": [
+            "%typescript.preferences.importModuleSpecifier.auto%",
+            "%typescript.preferences.importModuleSpecifier.relative%",
+            "%typescript.preferences.importModuleSpecifier.nonRelative%"
+          ],
           "default": "auto",
           "description": "%typescript.preferences.importModuleSpecifier%",
           "scope": "resource"
@@ -468,22 +517,15 @@
             "relative",
             "non-relative"
           ],
+          "enumDescriptions": [
+            "%typescript.preferences.importModuleSpecifier.auto%",
+            "%typescript.preferences.importModuleSpecifier.relative%",
+            "%typescript.preferences.importModuleSpecifier.nonRelative%"
+          ],
           "default": "auto",
           "description": "%typescript.preferences.importModuleSpecifier%",
           "scope": "resource"
         },
-        "javascript.showUnused": {
-          "type": "boolean",
-          "default": true,
-          "description": "%typescript.showUnused%",
-          "scope": "resource"
-        },
-        "typescript.showUnused": {
-          "type": "boolean",
-          "default": true,
-          "description": "%typescript.showUnused%",
-          "scope": "resource"
-        },
         "typescript.updateImportsOnFileMove.enabled": {
           "type": "string",
           "enum": [
@@ -491,6 +533,11 @@
             "always",
             "never"
           ],
+          "enumDescriptions": [
+            "%typescript.updateImportsOnFileMove.enabled.prompt%",
+            "%typescript.updateImportsOnFileMove.enabled.always%",
+            "%typescript.updateImportsOnFileMove.enabled.never%"
+          ],
           "default": "prompt",
           "description": "%typescript.updateImportsOnFileMove.enabled%",
           "scope": "resource"
@@ -505,6 +552,28 @@
           "default": "prompt",
           "description": "%typescript.updateImportsOnFileMove.enabled%",
           "scope": "resource"
+        },
+        "typescript.autoClosingTags": {
+          "type": "boolean",
+          "default": true,
+          "description": "%typescript.autoClosingTags%"
+        },
+        "javascript.autoClosingTags": {
+          "type": "boolean",
+          "default": true,
+          "description": "%typescript.autoClosingTags%"
+        },
+        "javascript.suggest.enabled": {
+          "type": "boolean",
+          "default": true,
+          "description": "%typescript.suggest.enabled%",
+          "scope": "resource"
+        },
+        "typescript.suggest.enabled": {
+          "type": "boolean",
+          "default": true,
+          "description": "%typescript.suggest.enabled%",
+          "scope": "resource"
         }
       }
     },
diff --git a/extensions/typescript-language-features/package.nls.json b/extensions/typescript-language-features/package.nls.json
index 89ece21cf38..443ecfa32c9 100644
--- a/extensions/typescript-language-features/package.nls.json
+++ b/extensions/typescript-language-features/package.nls.json
@@ -5,55 +5,72 @@
 	"configuration.typescript": "TypeScript",
 	"typescript.useCodeSnippetsOnMethodSuggest.dec": "Complete functions with their parameter signature.",
 	"typescript.tsdk.desc": "Specifies the folder path containing the tsserver and lib*.d.ts files to use.",
-	"typescript.disableAutomaticTypeAcquisition": "Disables automatic type acquisition. Requires TypeScript >= 2.0.6.",
+	"typescript.disableAutomaticTypeAcquisition": "Disables automatic type acquisition.",
 	"typescript.tsserver.log": "Enables logging of the TS server to a file. This log can be used to diagnose TS Server issues. The log may contain file paths, source code, and other potentially sensitive information from your project.",
-	"typescript.tsserver.pluginPaths": "Additional paths to discover Typescript Language Service plugins. Requires TypeScript >= 2.3.0.",
+	"typescript.tsserver.pluginPaths": "Additional paths to discover Typescript Language Service plugins. Requires using TypeScript 2.3.0 or newer in the workspace.",
 	"typescript.tsserver.pluginPaths.item": "Either an absolute or relative path. Relative path will be resolved against workspace folder(s).",
 	"typescript.tsserver.trace": "Enables tracing of messages sent to the TS server. This trace can be used to diagnose TS Server issues. The trace may contain file paths, source code, and other potentially sensitive information from your project.",
 	"typescript.validate.enable": "Enable/disable TypeScript validation.",
 	"typescript.format.enable": "Enable/disable default TypeScript formatter.",
 	"javascript.format.enable": "Enable/disable default JavaScript formatter.",
 	"format.insertSpaceAfterCommaDelimiter": "Defines space handling after a comma delimiter.",
-	"format.insertSpaceAfterConstructor": "Defines space handling after the constructor keyword. Requires TypeScript >= 2.3.0.",
-	"format.insertSpaceAfterSemicolonInForStatements": " Defines space handling after a semicolon in a for statement.",
+	"format.insertSpaceAfterConstructor": "Defines space handling after the constructor keyword. Requires using TypeScript 2.3.0 or newer in the workspace.",
+	"format.insertSpaceAfterSemicolonInForStatements": "Defines space handling after a semicolon in a for statement.",
 	"format.insertSpaceBeforeAndAfterBinaryOperators": "Defines space handling after a binary operator.",
 	"format.insertSpaceAfterKeywordsInControlFlowStatements": "Defines space handling after keywords in a control flow statement.",
 	"format.insertSpaceAfterFunctionKeywordForAnonymousFunctions": "Defines space handling after function keyword for anonymous functions.",
-	"format.insertSpaceBeforeFunctionParenthesis": "Defines space handling before function argument parentheses. Requires TypeScript >= 2.1.5.",
+	"format.insertSpaceBeforeFunctionParenthesis": "Defines space handling before function argument parentheses.",
 	"format.insertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis": "Defines space handling after opening and before closing non-empty parenthesis.",
 	"format.insertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets": "Defines space handling after opening and before closing non-empty brackets.",
-	"format.insertSpaceAfterOpeningAndBeforeClosingNonemptyBraces": "Defines space handling after opening and before closing non-empty braces. Requires TypeScript >= 2.3.0.",
-	"format.insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces": "Defines space handling after opening and before closing template string braces. Requires TypeScript >= 2.0.6.",
-	"format.insertSpaceAfterOpeningAndBeforeClosingJsxExpressionBraces": "Defines space handling after opening and before closing JSX expression braces. Requires TypeScript >= 2.0.6.",
-	"format.insertSpaceAfterTypeAssertion": "Defines space handling after type assertions in TypeScript. Requires TypeScript >= 2.4.",
+	"format.insertSpaceAfterOpeningAndBeforeClosingNonemptyBraces": "Defines space handling after opening and before closing non-empty braces. Requires using TypeScript 2.3.0 or newer in the workspace.",
+	"format.insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces": "Defines space handling after opening and before closing template string braces.",
+	"format.insertSpaceAfterOpeningAndBeforeClosingJsxExpressionBraces": "Defines space handling after opening and before closing JSX expression braces.",
+	"format.insertSpaceAfterTypeAssertion": "Defines space handling after type assertions in TypeScript. Requires using TypeScript 2.4 or newer in the workspace.",
 	"format.placeOpenBraceOnNewLineForFunctions": "Defines whether an open brace is put onto a new line for functions or not.",
 	"format.placeOpenBraceOnNewLineForControlBlocks": "Defines whether an open brace is put onto a new line for control blocks or not.",
 	"javascript.validate.enable": "Enable/disable JavaScript validation.",
 	"goToProjectConfig.title": "Go to Project Configuration",
 	"javascript.referencesCodeLens.enabled": "Enable/disable references CodeLens in JavaScript files.",
-	"typescript.referencesCodeLens.enabled": "Enable/disable references CodeLens in TypeScript files. Requires TypeScript >= 2.0.6.",
-	"typescript.implementationsCodeLens.enabled": "Enable/disable implementations CodeLens. Requires TypeScript >= 2.2.0.",
-	"typescript.openTsServerLog.title": "Open TS Server log",
-	"typescript.restartTsServer": "Restart TS server",
-	"typescript.selectTypeScriptVersion.title": "Select TypeScript Version",
-	"typescript.reportStyleChecksAsWarnings": "Report style checks as warnings",
-	"jsDocCompletion.enabled": "Enable/disable auto JSDoc comments",
-	"javascript.implicitProjectConfig.checkJs": "Enable/disable semantic checking of JavaScript files. Existing jsconfig.json or tsconfig.json files override this setting. Requires TypeScript >= 2.3.1.",
-	"typescript.npm": "Specifies the path to the NPM executable used for Automatic Type Acquisition. Requires TypeScript >= 2.3.4.",
+	"typescript.referencesCodeLens.enabled": "Enable/disable references CodeLens in TypeScript files.",
+	"typescript.implementationsCodeLens.enabled": "Enable/disable implementations CodeLens. This CodeLens shows the implementers of an interface.",
+	"typescript.openTsServerLog.title": "Open TS Server log.",
+	"typescript.restartTsServer": "Restart TS server.",
+	"typescript.selectTypeScriptVersion.title": "Select TypeScript Version.",
+	"typescript.reportStyleChecksAsWarnings": "Report style checks as warnings.",
+	"jsDocCompletion.enabled": "Enable/disable auto JSDoc comments.",
+	"javascript.implicitProjectConfig.checkJs": "Enable/disable semantic checking of JavaScript files. Existing jsconfig.json or tsconfig.json files override this setting. Requires using TypeScript 2.3.1 or newer in the workspace.",
+	"typescript.npm": "Specifies the path to the NPM executable used for Automatic Type Acquisition. Requires using TypeScript 2.3.4 or newer in the workspace.",
 	"typescript.check.npmIsInstalled": "Check if NPM is installed for Automatic Type Acquisition.",
 	"javascript.nameSuggestions": "Enable/disable including unique names from the file in JavaScript suggestion lists.",
-	"typescript.tsc.autoDetect": "Controls auto detection of tsc tasks. 'off' disables this feature. 'build' only creates single run compile tasks. 'watch' only creates compile and watch tasks. 'on' creates both build and watch tasks. Default is 'on'.",
+	"javascript.nameSuggestions.deprecationMessage": "Please use the new `javascript.suggest.names` setting.",
+	"configuration.suggest.names": "Enable/disable including unique names from the file in JavaScript suggestions.",
+	"typescript.tsc.autoDetect": "Controls auto detection of tsc tasks.",
+	"typescript.tsc.autoDetect.off": "Disable this feature.",
+	"typescript.tsc.autoDetect.on": "Create both build and watch tasks.",
+	"typescript.tsc.autoDetect.build": "Only create single run compile tasks.",
+	"typescript.tsc.autoDetect.watch": "Only create compile and watch tasks.",
 	"typescript.problemMatchers.tsc.label": "TypeScript problems",
 	"typescript.problemMatchers.tscWatch.label": "TypeScript problems (watch mode)",
 	"typescript.quickSuggestionsForPaths": "Enable/disable quick suggestions when typing out an import path.",
-	"typescript.locale": "Sets the locale used to report JavaScript and TypeScript errors. Requires TypeScript >= 2.6.0. Default of 'null' uses VS Code's locale.",
-	"javascript.implicitProjectConfig.experimentalDecorators": "Enable/disable 'experimentalDecorators' for JavaScript files that are not part of a project. Existing jsconfig.json or tsconfig.json files override this setting. Requires TypeScript >= 2.3.1.",
-	"typescript.autoImportSuggestions.enabled": "Enable/disable auto import suggestions. Requires TypeScript >= 2.6.1",
+	"typescript.quickSuggestionsForPaths.deprecationMessage": "Please use the new `javascript.suggest.paths` and `typescript.suggest.paths` settings to enable/disable path suggestions.",
+	"configuration.suggest.paths": "Enable/disable suggestions for paths in import statements and require calls.",
+	"typescript.locale": "Sets the locale used to report JavaScript and TypeScript errors. Requires using TypeScript 2.6.0 or newer in the workspace. Default of `null` uses VS Code's locale.",
+	"javascript.implicitProjectConfig.experimentalDecorators": "Enable/disable `experimentalDecorators` for JavaScript files that are not part of a project. Existing jsconfig.json or tsconfig.json files override this setting. Requires using TypeScript 2.3.1 or newer in the workspace.",
+	"configuration.suggest.autoImports": "Enable/disable auto import suggestions. Requires using TypeScript 2.6.1 or newer in the workspace.",
+	"typescript.autoImportSuggestions.enabled": "Enable/disable auto import suggestions. Requires using TypeScript 2.6.1 or newer in the workspace.",
+	"typescript.autoImportSuggestions.enabled.deprecationMessage": "Please use the new 'typescript.suggest.autoImports' and 'javascript.suggest.autoImports' settings.",
 	"taskDefinition.tsconfig.description": "The tsconfig file that defines the TS build.",
-	"javascript.suggestionActions.enabled": "Enable/disable suggestion diagnostics for JavaScript files in the editor. Requires TypeScript >= 2.8",
-	"typescript.suggestionActions.enabled": "Enable/disable suggestion diagnostics for TypeScript files in the editor. Requires TypeScript >= 2.8",
-	"typescript.preferences.quoteStyle": "Preferred quote style to use for quick fixes: 'single' quotes, 'double' quotes, or 'auto' infer quote type from existing imports. Requires TypeScript >= 2.9",
-	"typescript.preferences.importModuleSpecifier": "Preferred path style for auto imports:\n- \"relative\" to the file location.\n- \"non-relative\" based on the 'baseUrl' configured in your 'jsconfig.json' / 'tsconfig.json'.\n- \"auto\" infer the shortest path type.\nRequires TypeScript >= 2.9",
-	"typescript.showUnused": "Enable/disable highlighting of unused variables in code. Requires TypeScript >= 2.9",
-	"typescript.updateImportsOnFileMove.enabled": "Enable/disable automatic updating of import paths when you rename or move a file in VS Code. Possible values are: 'prompt' on each rename, 'always' update paths automatically, and 'never' rename paths and don't prompt me. Requires TypeScript >= 2.9"
-}
\ No newline at end of file
+	"javascript.suggestionActions.enabled": "Enable/disable suggestion diagnostics for JavaScript files in the editor. Requires using TypeScript 2.8 or newer in the workspace.",
+	"typescript.suggestionActions.enabled": "Enable/disable suggestion diagnostics for TypeScript files in the editor. Requires using TypeScript 2.8 or newer in the workspace.",
+	"typescript.preferences.quoteStyle": "Preferred quote style to use for quick fixes: `single` quotes, `double` quotes, or `auto` infer quote type from existing imports. Requires using TypeScript 2.9 or newer in the workspace.",
+	"typescript.preferences.importModuleSpecifier": "Preferred path style for auto imports.",
+	"typescript.preferences.importModuleSpecifier.auto": "Infer the shortest path type.",
+	"typescript.preferences.importModuleSpecifier.relative": "Relative to the file location.",
+	"typescript.preferences.importModuleSpecifier.nonRelative": "Based on the `baseUrl` configured in your `jsconfig.json` / `tsconfig.json`.",
+	"typescript.updateImportsOnFileMove.enabled": "Enable/disable automatic updating of import paths when you rename or move a file in VS Code. Requires using TypeScript 2.9 or newer in the workspace.",
+	"typescript.updateImportsOnFileMove.enabled.prompt": "Prompt on each rename.",
+	"typescript.updateImportsOnFileMove.enabled.always": "Always update paths automatically.",
+	"typescript.updateImportsOnFileMove.enabled.never": "Never rename paths and don't prompt.",
+	"typescript.autoClosingTags": "Enable/disable automatic closing of JSX tags. Requires using TypeScript 3.0 or newer in the workspace.",
+	"typescript.suggest.enabled": "Enabled/disable autocomplete suggestions."
+}
diff --git a/extensions/typescript-language-features/src/commands.ts b/extensions/typescript-language-features/src/commands.ts
index 0f7c3b4a99f..2c40c512e18 100644
--- a/extensions/typescript-language-features/src/commands.ts
+++ b/extensions/typescript-language-features/src/commands.ts
@@ -4,13 +4,14 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as vscode from 'vscode';
-
+import * as nls from 'vscode-nls';
 import TypeScriptServiceClientHost from './typeScriptServiceClientHost';
 import { Command } from './utils/commandManager';
 import { Lazy } from './utils/lazy';
-import { openOrCreateConfigFile, isImplicitProjectConfigFile } from './utils/tsconfig';
+import { isImplicitProjectConfigFile, openOrCreateConfigFile } from './utils/tsconfig';
+import { nulToken } from './utils/cancellation';
+
 
-import * as nls from 'vscode-nls';
 const localize = nls.loadMessageBundle();
 
 
@@ -121,7 +122,7 @@ async function goToProjectConfig(
 
 	const file = client.toPath(resource);
 	// TSServer errors when 'projectInfo' is invoked on a non js/ts file
-	if (!file || !clientHost.handles(resource)) {
+	if (!file || !await clientHost.handles(resource)) {
 		vscode.window.showWarningMessage(
 			localize(
 				'typescript.projectConfigUnsupportedFile',
@@ -131,7 +132,7 @@ async function goToProjectConfig(
 
 	let res: protocol.ProjectInfoResponse | undefined = undefined;
 	try {
-		res = await client.execute('projectInfo', { file, needFileNameList: false } as protocol.ProjectInfoRequestArgs);
+		res = await client.execute('projectInfo', { file, needFileNameList: false }, nulToken);
 	} catch {
 		// noop
 	}
diff --git a/extensions/typescript-language-features/src/extension.ts b/extensions/typescript-language-features/src/extension.ts
index 521da08e6dc..74f0ac6f509 100644
--- a/extensions/typescript-language-features/src/extension.ts
+++ b/extensions/typescript-language-features/src/extension.ts
@@ -16,6 +16,7 @@ import LogDirectoryProvider from './utils/logDirectoryProvider';
 import ManagedFileContextManager from './utils/managedFileContext';
 import { getContributedTypeScriptServerPlugins, TypeScriptServerPlugin } from './utils/plugins';
 import * as ProjectStatus from './utils/projectStatus';
+import { flatten } from './utils/arrays';
 
 
 export function activate(
@@ -32,7 +33,14 @@ export function activate(
 	context.subscriptions.push(new TypeScriptTaskProviderManager(lazyClientHost.map(x => x.serviceClient)));
 	context.subscriptions.push(new LanguageConfigurationManager());
 
-	const supportedLanguage = [].concat.apply([], standardLanguageDescriptions.map(x => x.modeIds).concat(plugins.map(x => x.languages)));
+	import('./features/tsconfig').then(module => {
+		context.subscriptions.push(module.register());
+	});
+
+	const supportedLanguage = flatten([
+		...standardLanguageDescriptions.map(x => x.modeIds),
+		...plugins.map(x => x.languages)
+	]);
 	function didOpenTextDocument(textDocument: vscode.TextDocument): boolean {
 		if (isSupportedDocument(supportedLanguage, textDocument)) {
 			openListener.dispose();
diff --git a/extensions/typescript-language-features/src/features/baseCodeLensProvider.ts b/extensions/typescript-language-features/src/features/baseCodeLensProvider.ts
index 8e30d03c0ba..6204d3521ac 100644
--- a/extensions/typescript-language-features/src/features/baseCodeLensProvider.ts
+++ b/extensions/typescript-language-features/src/features/baseCodeLensProvider.ts
@@ -3,18 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CodeLensProvider, CodeLens, CancellationToken, TextDocument, Range, Uri, Position, Event, EventEmitter } from 'vscode';
+import * as vscode from 'vscode';
 import * as Proto from '../protocol';
-
 import { ITypeScriptServiceClient } from '../typescriptService';
-import * as typeConverters from '../utils/typeConverters';
 import { escapeRegExp } from '../utils/regexp';
+import * as typeConverters from '../utils/typeConverters';
 
-export class ReferencesCodeLens extends CodeLens {
+
+export class ReferencesCodeLens extends vscode.CodeLens {
 	constructor(
-		public document: Uri,
+		public document: vscode.Uri,
 		public file: string,
-		range: Range
+		range: vscode.Range
 	) {
 		super(range);
 	}
@@ -26,7 +26,7 @@ export class CachedNavTreeResponse {
 	private document: string = '';
 
 	public execute(
-		document: TextDocument,
+		document: vscode.TextDocument,
 		f: () => Promise<Proto.NavTreeResponse>
 	) {
 		if (this.matches(document)) {
@@ -36,12 +36,12 @@ export class CachedNavTreeResponse {
 		return this.update(document, f());
 	}
 
-	private matches(document: TextDocument): boolean {
+	private matches(document: vscode.TextDocument): boolean {
 		return this.version === document.version && this.document === document.uri.toString();
 	}
 
 	private update(
-		document: TextDocument,
+		document: vscode.TextDocument,
 		response: Promise<Proto.NavTreeResponse>
 	): Promise<Proto.NavTreeResponse> {
 		this.response = response;
@@ -51,19 +51,19 @@ export class CachedNavTreeResponse {
 	}
 }
 
-export abstract class TypeScriptBaseCodeLensProvider implements CodeLensProvider {
-	private onDidChangeCodeLensesEmitter = new EventEmitter<void>();
+export abstract class TypeScriptBaseCodeLensProvider implements vscode.CodeLensProvider {
+	private onDidChangeCodeLensesEmitter = new vscode.EventEmitter<void>();
 
 	public constructor(
 		protected client: ITypeScriptServiceClient,
 		private cachedResponse: CachedNavTreeResponse
 	) { }
 
-	public get onDidChangeCodeLenses(): Event<void> {
+	public get onDidChangeCodeLenses(): vscode.Event<void> {
 		return this.onDidChangeCodeLensesEmitter.event;
 	}
 
-	async provideCodeLenses(document: TextDocument, token: CancellationToken): Promise<CodeLens[]> {
+	async provideCodeLenses(document: vscode.TextDocument, token: vscode.CancellationToken): Promise<vscode.CodeLens[]> {
 		const filepath = this.client.toPath(document.uri);
 		if (!filepath) {
 			return [];
@@ -76,7 +76,7 @@ export abstract class TypeScriptBaseCodeLensProvider implements CodeLensProvider
 			}
 
 			const tree = response.body;
-			const referenceableSpans: Range[] = [];
+			const referenceableSpans: vscode.Range[] = [];
 			if (tree && tree.childItems) {
 				tree.childItems.forEach(item => this.walkNavTree(document, item, null, referenceableSpans));
 			}
@@ -87,16 +87,16 @@ export abstract class TypeScriptBaseCodeLensProvider implements CodeLensProvider
 	}
 
 	protected abstract extractSymbol(
-		document: TextDocument,
+		document: vscode.TextDocument,
 		item: Proto.NavigationTree,
 		parent: Proto.NavigationTree | null
-	): Range | null;
+	): vscode.Range | null;
 
 	private walkNavTree(
-		document: TextDocument,
+		document: vscode.TextDocument,
 		item: Proto.NavigationTree,
 		parent: Proto.NavigationTree | null,
-		results: Range[]
+		results: vscode.Range[]
 	): void {
 		if (!item) {
 			return;
@@ -109,16 +109,17 @@ export abstract class TypeScriptBaseCodeLensProvider implements CodeLensProvider
 
 		(item.childItems || []).forEach(child => this.walkNavTree(document, child, item, results));
 	}
-
-	/**
-	 * TODO: TS currently requires the position for 'references 'to be inside of the identifer
-	 * Massage the range to make sure this is the case
-	 */
-	protected getSymbolRange(document: TextDocument, item: Proto.NavigationTree): Range | null {
+	protected getSymbolRange(document: vscode.TextDocument, item: Proto.NavigationTree): vscode.Range | null {
 		if (!item) {
 			return null;
 		}
 
+		// TS 3.0+ provides a span for just the symbol
+		if (item.nameSpan) {
+			return typeConverters.Range.fromTextSpan((item as any).nameSpan);
+		}
+
+		// In older versions, we have to calculate this manually. See #23924
 		const span = item.spans && item.spans[0];
 		if (!span) {
 			return null;
@@ -130,8 +131,8 @@ export abstract class TypeScriptBaseCodeLensProvider implements CodeLensProvider
 		const identifierMatch = new RegExp(`^(.*?(\\b|\\W))${escapeRegExp(item.text || '')}(\\b|\\W)`, 'gm');
 		const match = identifierMatch.exec(text);
 		const prefixLength = match ? match.index + match[1].length : 0;
-		const startOffset = document.offsetAt(new Position(range.start.line, range.start.character)) + prefixLength;
-		return new Range(
+		const startOffset = document.offsetAt(new vscode.Position(range.start.line, range.start.character)) + prefixLength;
+		return new vscode.Range(
 			document.positionAt(startOffset),
 			document.positionAt(startOffset + item.text.length));
 	}
diff --git a/extensions/typescript-language-features/src/features/bufferSyncSupport.ts b/extensions/typescript-language-features/src/features/bufferSyncSupport.ts
index faa6d7c483d..d180d95c460 100644
--- a/extensions/typescript-language-features/src/features/bufferSyncSupport.ts
+++ b/extensions/typescript-language-features/src/features/bufferSyncSupport.ts
@@ -4,25 +4,21 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as fs from 'fs';
-import { CancellationTokenSource, Disposable, TextDocument, TextDocumentChangeEvent, TextDocumentContentChangeEvent, Uri, workspace, EventEmitter } from 'vscode';
+import * as vscode from 'vscode';
 import * as Proto from '../protocol';
 import { ITypeScriptServiceClient } from '../typescriptService';
-import { Delayer } from '../utils/async';
-import { disposeAll } from '../utils/dispose';
-import * as languageModeIds from '../utils/languageModeIds';
 import API from '../utils/api';
-import { memoize } from '../utils/memoize';
-import { getTempFile } from '../utils/temp';
+import { Delayer } from '../utils/async';
+import { Disposable } from '../utils/dispose';
+import * as languageModeIds from '../utils/languageModeIds';
+import { ResourceMap } from '../utils/resourceMap';
+import * as typeConverters from '../utils/typeConverters';
 
 enum BufferKind {
 	TypeScript = 1,
 	JavaScript = 2,
 }
 
-interface IDiagnosticRequestor {
-	requestDiagnostic(resource: Uri): void;
-}
-
 function mode2ScriptKind(mode: string): 'TS' | 'TSX' | 'JS' | 'JSX' | undefined {
 	switch (mode) {
 		case languageModeIds.typescript: return 'TS';
@@ -36,9 +32,8 @@ function mode2ScriptKind(mode: string): 'TS' | 'TSX' | 'JS' | 'JSX' | undefined
 class SyncedBuffer {
 
 	constructor(
-		private readonly document: TextDocument,
+		private readonly document: vscode.TextDocument,
 		public readonly filepath: string,
-		private readonly diagnosticRequestor: IDiagnosticRequestor,
 		private readonly client: ITypeScriptServiceClient
 	) { }
 
@@ -68,10 +63,10 @@ class SyncedBuffer {
 			}
 		}
 
-		this.client.execute('open', args, false);
+		this.client.executeWithoutWaitingForResponse('open', args);
 	}
 
-	public get resource(): Uri {
+	public get resource(): vscode.Uri {
 		return this.document.uri;
 	}
 
@@ -96,105 +91,123 @@ class SyncedBuffer {
 		const args: Proto.FileRequestArgs = {
 			file: this.filepath
 		};
-		this.client.execute('close', args, false);
+		this.client.executeWithoutWaitingForResponse('close', args);
 	}
 
-	public onContentChanged(events: TextDocumentContentChangeEvent[]): void {
+	public onContentChanged(events: vscode.TextDocumentContentChangeEvent[]): void {
 		for (const { range, text } of events) {
 			const args: Proto.ChangeRequestArgs = {
-				file: this.filepath,
-				line: range.start.line + 1,
-				offset: range.start.character + 1,
-				endLine: range.end.line + 1,
-				endOffset: range.end.character + 1,
-				insertString: text
+				insertString: text,
+				...typeConverters.Range.toFormattingRequestArgs(this.filepath, range)
 			};
-			this.client.execute('change', args, false);
+			this.client.executeWithoutWaitingForResponse('change', args);
 		}
-		this.diagnosticRequestor.requestDiagnostic(this.document.uri);
 	}
 }
 
-class SyncedBufferMap {
-	private readonly _map = new Map<string, SyncedBuffer>();
-
-	constructor(
-		private readonly _normalizePath: (resource: Uri) => string | null
-	) { }
-
-	public has(resource: Uri): boolean {
-		const file = this.toKey(resource);
-		return !!file && this._map.has(file);
-	}
-
-	public get(resource: Uri): SyncedBuffer | undefined {
-		const file = this.toKey(resource);
-		return file ? this._map.get(file) : undefined;
-	}
+class SyncedBufferMap extends ResourceMap<SyncedBuffer> {
 
 	public getForPath(filePath: string): SyncedBuffer | undefined {
-		return this.get(Uri.file(filePath));
-	}
-
-	public set(resource: Uri, buffer: SyncedBuffer) {
-		const file = this.toKey(resource);
-		if (file) {
-			this._map.set(file, buffer);
-		}
-	}
-
-	public delete(resource: Uri): void {
-		const file = this.toKey(resource);
-		if (file) {
-			this._map.delete(file);
-		}
+		return this.get(vscode.Uri.file(filePath));
 	}
 
 	public get allBuffers(): Iterable<SyncedBuffer> {
-		return this._map.values();
-	}
-
-	public get allResources(): Iterable<string> {
-		return this._map.keys();
-	}
-
-	private toKey(resource: Uri): string | null {
-		return this._normalizePath(resource);
+		return this.values;
 	}
 }
 
+class PendingDiagnostics extends ResourceMap<number> {
+	public getOrderedFileSet(): ResourceMap<void> {
+		const orderedResources = Array.from(this.entries)
+			.sort((a, b) => a.value - b.value)
+			.map(entry => entry.resource);
 
-export default class BufferSyncSupport {
+		const map = new ResourceMap<void>();
+		for (const resource of orderedResources) {
+			map.set(resource, void 0);
+		}
+		return map;
+	}
+}
+
+class GetErrRequest {
+
+	public static executeGetErrRequest(
+		client: ITypeScriptServiceClient,
+		files: ResourceMap<void>,
+		onDone: () => void
+	) {
+		const token = new vscode.CancellationTokenSource();
+		return new GetErrRequest(client, files, token, onDone);
+	}
+
+	private _done: boolean = false;
+
+	private constructor(
+		client: ITypeScriptServiceClient,
+		public readonly files: ResourceMap<void>,
+		private readonly _token: vscode.CancellationTokenSource,
+		onDone: () => void
+	) {
+		const args: Proto.GeterrRequestArgs = {
+			delay: 0,
+			files: Array.from(files.entries)
+				.map(entry => client.normalizedPath(entry.resource))
+				.filter(x => !!x) as string[]
+		};
+
+		client.executeAsync('geterr', args, _token.token)
+			.then(undefined, () => { })
+			.then(() => {
+				if (this._done) {
+					return;
+				}
+				this._done = true;
+				onDone();
+			});
+	}
+
+	public cancel(): any {
+		if (!this._done) {
+			this._token.cancel();
+		}
+
+		this._token.dispose();
+	}
+}
+
+export default class BufferSyncSupport extends Disposable {
 
 	private readonly client: ITypeScriptServiceClient;
 
 	private _validateJavaScript: boolean = true;
 	private _validateTypeScript: boolean = true;
 	private readonly modeIds: Set<string>;
-	private readonly disposables: Disposable[] = [];
 	private readonly syncedBuffers: SyncedBufferMap;
-
-	private readonly pendingDiagnostics = new Map<string, number>();
+	private readonly pendingDiagnostics: PendingDiagnostics;
 	private readonly diagnosticDelayer: Delayer<any>;
-	private pendingGetErr: { request: Promise<any>, files: string[], token: CancellationTokenSource } | undefined;
+	private pendingGetErr: GetErrRequest | undefined;
 	private listening: boolean = false;
 
 	constructor(
 		client: ITypeScriptServiceClient,
 		modeIds: string[]
 	) {
+		super();
 		this.client = client;
 		this.modeIds = new Set<string>(modeIds);
 
 		this.diagnosticDelayer = new Delayer<any>(300);
 
-		this.syncedBuffers = new SyncedBufferMap(path => this.normalizePath(path));
+		const pathNormalizer = (path: vscode.Uri) => this.client.normalizedPath(path);
+		this.syncedBuffers = new SyncedBufferMap(pathNormalizer);
+		this.pendingDiagnostics = new PendingDiagnostics(pathNormalizer);
 
 		this.updateConfiguration();
-		workspace.onDidChangeConfiguration(() => this.updateConfiguration(), null);
+		vscode.workspace.onDidChangeConfiguration(this.updateConfiguration, this, this._disposables);
 	}
 
-	private readonly _onDelete = new EventEmitter<Uri>();
+	private readonly _onDelete = this._register(new vscode.EventEmitter<vscode.Uri>());
 	public readonly onDelete = this._onDelete.event;
 
 	public listen(): void {
@@ -202,22 +215,22 @@ export default class BufferSyncSupport {
 			return;
 		}
 		this.listening = true;
-		workspace.onDidOpenTextDocument(this.openTextDocument, this, this.disposables);
-		workspace.onDidCloseTextDocument(this.onDidCloseTextDocument, this, this.disposables);
-		workspace.onDidChangeTextDocument(this.onDidChangeTextDocument, this, this.disposables);
-		workspace.textDocuments.forEach(this.openTextDocument, this);
+		vscode.workspace.onDidOpenTextDocument(this.openTextDocument, this, this._disposables);
+		vscode.workspace.onDidCloseTextDocument(this.onDidCloseTextDocument, this, this._disposables);
+		vscode.workspace.onDidChangeTextDocument(this.onDidChangeTextDocument, this, this._disposables);
+		vscode.workspace.textDocuments.forEach(this.openTextDocument, this);
 	}
 
-	public handles(resource: Uri): boolean {
+	public handles(resource: vscode.Uri): boolean {
 		return this.syncedBuffers.has(resource);
 	}
 
-	public toResource(filePath: string): Uri {
+	public toResource(filePath: string): vscode.Uri {
 		const buffer = this.syncedBuffers.getForPath(filePath);
 		if (buffer) {
 			return buffer.resource;
 		}
-		return Uri.file(filePath);
+		return vscode.Uri.file(filePath);
 	}
 
 	public reOpenDocuments(): void {
@@ -226,12 +239,7 @@ export default class BufferSyncSupport {
 		}
 	}
 
-	public dispose(): void {
-		disposeAll(this.disposables);
-		this._onDelete.dispose();
-	}
-
-	public openTextDocument(document: TextDocument): void {
+	public openTextDocument(document: vscode.TextDocument): void {
 		if (!this.modeIds.has(document.languageId)) {
 			return;
 		}
@@ -245,17 +253,18 @@ export default class BufferSyncSupport {
 			return;
 		}
 
-		const syncedBuffer = new SyncedBuffer(document, filepath, this, this.client);
+		const syncedBuffer = new SyncedBuffer(document, filepath, this.client);
 		this.syncedBuffers.set(resource, syncedBuffer);
 		syncedBuffer.open();
-		this.requestDiagnostic(resource);
+		this.requestDiagnostic(syncedBuffer);
 	}
 
-	public closeResource(resource: Uri): void {
+	public closeResource(resource: vscode.Uri): void {
 		const syncedBuffer = this.syncedBuffers.get(resource);
 		if (!syncedBuffer) {
 			return;
 		}
+		this.pendingDiagnostics.delete(resource);
 		this.syncedBuffers.delete(resource);
 		syncedBuffer.close();
 		if (!fs.existsSync(resource.fsPath)) {
@@ -264,121 +273,113 @@ export default class BufferSyncSupport {
 		}
 	}
 
-	private onDidCloseTextDocument(document: TextDocument): void {
+	public interuptGetErr<R>(f: () => R): R {
+		if (!this.pendingGetErr) {
+			return f();
+		}
+
+		this.pendingGetErr.cancel();
+		this.pendingGetErr = undefined;
+		const result = f();
+		this.triggerDiagnostics();
+		return result;
+	}
+
+	private onDidCloseTextDocument(document: vscode.TextDocument): void {
 		this.closeResource(document.uri);
 	}
 
-	private onDidChangeTextDocument(e: TextDocumentChangeEvent): void {
+	private onDidChangeTextDocument(e: vscode.TextDocumentChangeEvent): void {
 		const syncedBuffer = this.syncedBuffers.get(e.document.uri);
 		if (!syncedBuffer) {
 			return;
 		}
 
 		syncedBuffer.onContentChanged(e.contentChanges);
-		if (this.pendingGetErr) {
-			this.pendingGetErr.token.cancel();
+		const didTrigger = this.requestDiagnostic(syncedBuffer);
+
+		if (!didTrigger && this.pendingGetErr) {
+			// In this case we always want to re-trigger all diagnostics
+			this.pendingGetErr.cancel();
 			this.pendingGetErr = undefined;
+			this.triggerDiagnostics();
 		}
 	}
 
 	public requestAllDiagnostics() {
 		for (const buffer of this.syncedBuffers.allBuffers) {
 			if (this.shouldValidate(buffer)) {
-				this.pendingDiagnostics.set(buffer.filepath, Date.now());
+				this.pendingDiagnostics.set(buffer.resource, Date.now());
 			}
 		}
-		this.diagnosticDelayer.trigger(() => {
-			this.sendPendingDiagnostics();
-		}, 200);
+		this.triggerDiagnostics();
 	}
 
-	public getErr(resources: Uri[]): any {
+	public getErr(resources: vscode.Uri[]): any {
 		const handledResources = resources.filter(resource => this.handles(resource));
 		if (!handledResources.length) {
 			return;
 		}
 
 		for (const resource of handledResources) {
-			const file = this.client.normalizedPath(resource);
-			if (file) {
-				this.pendingDiagnostics.set(file, Date.now());
-			}
+			this.pendingDiagnostics.set(resource, Date.now());
 		}
 
-		this.diagnosticDelayer.trigger(() => {
-			this.sendPendingDiagnostics();
-		}, 200);
+		this.triggerDiagnostics();
 	}
 
-	public requestDiagnostic(resource: Uri): void {
-		const file = this.client.normalizedPath(resource);
-		if (!file) {
-			return;
-		}
-
-		this.pendingDiagnostics.set(file, Date.now());
-		const buffer = this.syncedBuffers.get(resource);
-		if (!buffer || !this.shouldValidate(buffer)) {
-			return;
-		}
-
-		let delay = 300;
-		const lineCount = buffer.lineCount;
-		delay = Math.min(Math.max(Math.ceil(lineCount / 20), 300), 800);
+	private triggerDiagnostics(delay: number = 200) {
 		this.diagnosticDelayer.trigger(() => {
 			this.sendPendingDiagnostics();
 		}, delay);
 	}
 
-	public hasPendingDiagnostics(resource: Uri): boolean {
-		const file = this.client.normalizedPath(resource);
-		return !file || this.pendingDiagnostics.has(file);
+	private requestDiagnostic(buffer: SyncedBuffer): boolean {
+		if (!this.shouldValidate(buffer)) {
+			return false;
+		}
+
+		this.pendingDiagnostics.set(buffer.resource, Date.now());
+
+		const delay = Math.min(Math.max(Math.ceil(buffer.lineCount / 20), 300), 800);
+		this.triggerDiagnostics(delay);
+		return true;
+	}
+
+	public hasPendingDiagnostics(resource: vscode.Uri): boolean {
+		return this.pendingDiagnostics.has(resource);
 	}
 
 	private sendPendingDiagnostics(): void {
-		const files = new Set(Array.from(this.pendingDiagnostics.entries())
-			.sort((a, b) => a[1] - b[1])
-			.map(entry => entry[0]));
+		const orderedFileSet = this.pendingDiagnostics.getOrderedFileSet();
 
 		// Add all open TS buffers to the geterr request. They might be visible
-		for (const file of this.syncedBuffers.allResources) {
-			if (!this.pendingDiagnostics.get(file)) {
-				files.add(file);
+		for (const buffer of this.syncedBuffers.values) {
+			orderedFileSet.set(buffer.resource, void 0);
+		}
+
+		if (orderedFileSet.size) {
+			if (this.pendingGetErr) {
+				this.pendingGetErr.cancel();
+
+				for (const file of this.pendingGetErr.files.entries) {
+					orderedFileSet.set(file.resource, void 0);
+				}
 			}
+
+			const getErr = this.pendingGetErr = GetErrRequest.executeGetErrRequest(this.client, orderedFileSet, () => {
+				if (this.pendingGetErr === getErr) {
+					this.pendingGetErr = undefined;
+				}
+			});
 		}
 
-		if (this.pendingGetErr) {
-			for (const file of this.pendingGetErr.files) {
-				files.add(file);
-			}
-		}
-
-		if (files.size) {
-			const fileList = Array.from(files);
-			const args: Proto.GeterrRequestArgs = {
-				delay: 0,
-				files: fileList
-			};
-			const token = new CancellationTokenSource();
-
-			const getErr = this.pendingGetErr = {
-				request: this.client.executeAsync('geterr', args, token.token)
-					.then(undefined, () => { })
-					.then(() => {
-						if (this.pendingGetErr === getErr) {
-							this.pendingGetErr = undefined;
-						}
-					}),
-				files: fileList,
-				token
-			};
-		}
 		this.pendingDiagnostics.clear();
 	}
 
 	private updateConfiguration() {
-		const jsConfig = workspace.getConfiguration('javascript', null);
-		const tsConfig = workspace.getConfiguration('typescript', null);
+		const jsConfig = vscode.workspace.getConfiguration('javascript', null);
+		const tsConfig = vscode.workspace.getConfiguration('typescript', null);
 
 		this._validateJavaScript = jsConfig.get<boolean>('validate.enable', true);
 		this._validateTypeScript = tsConfig.get<boolean>('validate.enable', true);
@@ -394,40 +395,4 @@ export default class BufferSyncSupport {
 				return this._validateTypeScript;
 		}
 	}
-
-	private normalizePath(path: Uri): string | null {
-		const key = this.client.normalizedPath(path);
-		if (!key) {
-			return key;
-		}
-
-		return this.isCaseInsensitivePath(key) ? key.toLowerCase() : key;
-	}
-
-	private isCaseInsensitivePath(path: string) {
-		if (isWindowsPath(path)) {
-			return true;
-		}
-
-		return path[0] === '/' && this.onIsCaseInsenitiveFileSystem;
-	}
-
-	@memoize
-	private get onIsCaseInsenitiveFileSystem() {
-		if (process.platform === 'win32') {
-			return true;
-		}
-
-		if (process.platform !== 'darwin') {
-			return false;
-		}
-
-		const temp = getTempFile('typescript-case-check');
-		fs.writeFileSync(temp, '');
-		return fs.existsSync(temp.toUpperCase());
-	}
-}
-
-function isWindowsPath(path: string): boolean {
-	return /^[a-zA-Z]:\\/.test(path);
 }
diff --git a/extensions/typescript-language-features/src/features/completions.ts b/extensions/typescript-language-features/src/features/completions.ts
index da141a3f244..6eb216c3689 100644
--- a/extensions/typescript-language-features/src/features/completions.ts
+++ b/extensions/typescript-language-features/src/features/completions.ts
@@ -4,23 +4,30 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as vscode from 'vscode';
-
-import { ITypeScriptServiceClient } from '../typescriptService';
-import TypingsStatus from '../utils/typingsStatus';
-
+import * as nls from 'vscode-nls';
 import * as Proto from '../protocol';
 import * as PConst from '../protocol.const';
+import { ITypeScriptServiceClient } from '../typescriptService';
+import API from '../utils/api';
+import { nulToken } from '../utils/cancellation';
+import { applyCodeAction } from '../utils/codeAction';
+import { Command, CommandManager } from '../utils/commandManager';
+import { ConfigurationDependentRegistration } from '../utils/dependentRegistration';
+import { memoize } from '../utils/memoize';
 import * as Previewer from '../utils/previewer';
 import * as typeConverters from '../utils/typeConverters';
-
-import * as nls from 'vscode-nls';
-import { applyCodeAction } from '../utils/codeAction';
-import { CommandManager, Command } from '../utils/commandManager';
+import TypingsStatus from '../utils/typingsStatus';
 import FileConfigurationManager from './fileConfigurationManager';
-import API from '../utils/api';
 
 const localize = nls.loadMessageBundle();
 
+
+interface CommitCharactersSettings {
+	readonly isNewIdentifierLocation: boolean;
+	readonly isInValidCommitCharacterContext: boolean;
+	readonly enableCallCompletions: boolean;
+}
+
 class MyCompletionItem extends vscode.CompletionItem {
 	public readonly useCodeSnippet: boolean;
 
@@ -29,15 +36,16 @@ class MyCompletionItem extends vscode.CompletionItem {
 		public readonly document: vscode.TextDocument,
 		line: string,
 		public readonly tsEntry: Proto.CompletionEntry,
-		enableDotCompletions: boolean,
-		useCodeSnippetsOnMethodSuggest: boolean
+		useCodeSnippetsOnMethodSuggest: boolean,
+		public readonly commitCharactersSettings: CommitCharactersSettings
 	) {
-		super(tsEntry.name);
+		super(tsEntry.name, MyCompletionItem.convertKind(tsEntry.kind));
 
 		if (tsEntry.isRecommended) {
 			// Make sure isRecommended property always comes first
 			// https://github.com/Microsoft/vscode/issues/40325
-			this.sortText = '\0' + tsEntry.sortText;
+			this.sortText = tsEntry.sortText;
+			this.preselect = true;
 		} else if (tsEntry.source) {
 			// De-prioritze auto-imports
 			// https://github.com/Microsoft/vscode/issues/40311
@@ -46,11 +54,8 @@ class MyCompletionItem extends vscode.CompletionItem {
 			this.sortText = tsEntry.sortText;
 		}
 
-		this.kind = MyCompletionItem.convertKind(tsEntry.kind);
 		this.position = position;
-		this.commitCharacters = MyCompletionItem.getCommitCharacters(enableDotCompletions, !useCodeSnippetsOnMethodSuggest, tsEntry.kind);
 		this.useCodeSnippet = useCodeSnippetsOnMethodSuggest && (this.kind === vscode.CompletionItemKind.Function || this.kind === vscode.CompletionItemKind.Method);
-
 		if (tsEntry.replacementSpan) {
 			this.range = typeConverters.Range.fromTextSpan(tsEntry.replacementSpan);
 		}
@@ -81,19 +86,22 @@ class MyCompletionItem extends vscode.CompletionItem {
 			}
 			this.label += '?';
 		}
+		this.resolveRange(line);
 	}
 
-	public resolve(): void {
-		if (!this.range) {
-			// Try getting longer, prefix based range for completions that span words
-			const wordRange = this.document.getWordRangeAtPosition(this.position);
-			const text = this.document.getText(new vscode.Range(this.position.line, Math.max(0, this.position.character - this.label.length), this.position.line, this.position.character)).toLowerCase();
-			const entryName = this.label.toLowerCase();
-			for (let i = entryName.length; i >= 0; --i) {
-				if (text.endsWith(entryName.substr(0, i)) && (!wordRange || wordRange.start.character > this.position.character - i)) {
-					this.range = new vscode.Range(this.position.line, Math.max(0, this.position.character - i), this.position.line, this.position.character);
-					break;
-				}
+	private resolveRange(line: string): void {
+		if (this.range) {
+			return;
+		}
+
+		// Try getting longer, prefix based range for completions that span words
+		const wordRange = this.document.getWordRangeAtPosition(this.position);
+		const text = line.slice(Math.max(0, this.position.character - this.label.length), this.position.character).toLowerCase();
+		const entryName = this.label.toLowerCase();
+		for (let i = entryName.length; i >= 0; --i) {
+			if (text.endsWith(entryName.substr(0, i)) && (!wordRange || wordRange.start.character > this.position.character - i)) {
+				this.range = new vscode.Range(this.position.line, Math.max(0, this.position.character - i), this.position.line, this.position.character);
+				break;
 			}
 		}
 	}
@@ -132,7 +140,6 @@ class MyCompletionItem extends vscode.CompletionItem {
 			case PConst.Kind.interface:
 				return vscode.CompletionItemKind.Interface;
 			case PConst.Kind.warning:
-			case PConst.Kind.file:
 			case PConst.Kind.script:
 				return vscode.CompletionItemKind.File;
 			case PConst.Kind.directory:
@@ -143,12 +150,14 @@ class MyCompletionItem extends vscode.CompletionItem {
 		return vscode.CompletionItemKind.Property;
 	}
 
-	private static getCommitCharacters(
-		enableDotCompletions: boolean,
-		enableCallCompletions: boolean,
-		kind: string
-	): string[] | undefined {
-		switch (kind) {
+	@memoize
+	public get commitCharacters(): string[] | undefined {
+		if (this.commitCharactersSettings.isNewIdentifierLocation || !this.commitCharactersSettings.isInValidCommitCharacterContext) {
+			return undefined;
+		}
+
+		const commitCharacters: string[] = [];
+		switch (this.tsEntry.kind) {
 			case PConst.Kind.memberGetAccessor:
 			case PConst.Kind.memberSetAccessor:
 			case PConst.Kind.constructSignature:
@@ -156,7 +165,9 @@ class MyCompletionItem extends vscode.CompletionItem {
 			case PConst.Kind.indexSignature:
 			case PConst.Kind.enum:
 			case PConst.Kind.interface:
-				return enableDotCompletions ? ['.'] : undefined;
+				commitCharacters.push('.', ';');
+
+				break;
 
 			case PConst.Kind.module:
 			case PConst.Kind.alias:
@@ -168,10 +179,14 @@ class MyCompletionItem extends vscode.CompletionItem {
 			case PConst.Kind.class:
 			case PConst.Kind.function:
 			case PConst.Kind.memberFunction:
-				return enableDotCompletions ? (enableCallCompletions ? ['.', '('] : ['.']) : undefined;
+			case PConst.Kind.keyword:
+				commitCharacters.push('.', ',', ';');
+				if (this.commitCharactersSettings.enableCallCompletions) {
+					commitCharacters.push('(');
+				}
+				break;
 		}
-
-		return undefined;
+		return commitCharacters.length === 0 ? undefined : commitCharacters;
 	}
 }
 
@@ -189,7 +204,7 @@ class ApplyCompletionCodeActionCommand implements Command {
 		}
 
 		if (codeActions.length === 1) {
-			return applyCodeAction(this.client, codeActions[0]);
+			return applyCodeAction(this.client, codeActions[0], nulToken);
 		}
 
 		interface MyQuickPickItem extends vscode.QuickPickItem {
@@ -214,33 +229,39 @@ class ApplyCompletionCodeActionCommand implements Command {
 		if (!action) {
 			return false;
 		}
-		return applyCodeAction(this.client, action);
+		return applyCodeAction(this.client, action, nulToken);
 	}
 }
 
 interface CompletionConfiguration {
 	readonly useCodeSnippetsOnMethodSuggest: boolean;
 	readonly nameSuggestions: boolean;
-	readonly quickSuggestionsForPaths: boolean;
+	readonly pathSuggestions: boolean;
 	readonly autoImportSuggestions: boolean;
 }
 
 namespace CompletionConfiguration {
 	export const useCodeSnippetsOnMethodSuggest = 'useCodeSnippetsOnMethodSuggest';
-	export const nameSuggestions = 'nameSuggestions';
-	export const quickSuggestionsForPaths = 'quickSuggestionsForPaths';
-	export const autoImportSuggestions = 'autoImportSuggestions.enabled';
+	export const nameSuggestions = 'suggest.names';
+	export const nameSuggestions_deprecated = 'nameSuggestions';
+	export const pathSuggestions = 'suggest.paths';
+	export const autoImportSuggestions = 'suggest.autoImports';
+	export const autoImportSuggestions_deprecated = 'autoImportSuggestions.enabled';
 
 	export function getConfigurationForResource(
+		modeId: string,
 		resource: vscode.Uri
 	): CompletionConfiguration {
-		// TS settings are shared by both JS and TS.
+		const config = vscode.workspace.getConfiguration(modeId, resource);
+
+		// Deprecated TS settings that were shared by both JS and TS.
 		const typeScriptConfig = vscode.workspace.getConfiguration('typescript', resource);
+
 		return {
 			useCodeSnippetsOnMethodSuggest: typeScriptConfig.get<boolean>(CompletionConfiguration.useCodeSnippetsOnMethodSuggest, false),
-			quickSuggestionsForPaths: typeScriptConfig.get<boolean>(CompletionConfiguration.quickSuggestionsForPaths, true),
-			autoImportSuggestions: typeScriptConfig.get<boolean>(CompletionConfiguration.autoImportSuggestions, true),
-			nameSuggestions: vscode.workspace.getConfiguration('javascript', resource).get(CompletionConfiguration.nameSuggestions, true)
+			pathSuggestions: config.get<boolean>(CompletionConfiguration.pathSuggestions, true),
+			autoImportSuggestions: config.get<boolean>(CompletionConfiguration.autoImportSuggestions, typeScriptConfig.get<boolean>(CompletionConfiguration.autoImportSuggestions_deprecated, true)),
+			nameSuggestions: config.get<boolean>(CompletionConfiguration.nameSuggestions, vscode.workspace.getConfiguration('javascript', resource).get(CompletionConfiguration.nameSuggestions_deprecated, true))
 		};
 	}
 }
@@ -251,6 +272,7 @@ class TypeScriptCompletionItemProvider implements vscode.CompletionItemProvider
 
 	constructor(
 		private readonly client: ITypeScriptServiceClient,
+		private readonly modeId: string,
 		private readonly typingsStatus: TypingsStatus,
 		private readonly fileConfigurationManager: FileConfigurationManager,
 		commandManager: CommandManager
@@ -263,7 +285,7 @@ class TypeScriptCompletionItemProvider implements vscode.CompletionItemProvider
 		position: vscode.Position,
 		token: vscode.CancellationToken,
 		context: vscode.CompletionContext
-	): Promise<vscode.CompletionItem[]> {
+	): Promise<vscode.CompletionItem[] | null> {
 		if (this.typingsStatus.isAcquiringTypings) {
 			return Promise.reject<vscode.CompletionItem[]>({
 				label: localize(
@@ -277,17 +299,17 @@ class TypeScriptCompletionItemProvider implements vscode.CompletionItemProvider
 
 		const file = this.client.toPath(document.uri);
 		if (!file) {
-			return [];
+			return null;
 		}
 
 		const line = document.lineAt(position.line);
-		const completionConfiguration = CompletionConfiguration.getConfigurationForResource(document.uri);
+		const completionConfiguration = CompletionConfiguration.getConfigurationForResource(this.modeId, document.uri);
 
-		if (!this.shouldTrigger(context, completionConfiguration, line, position)) {
-			return [];
+		if (!this.shouldTrigger(context, line, position)) {
+			return null;
 		}
 
-		await this.fileConfigurationManager.ensureConfigurationForDocument(document, token);
+		await this.client.interuptGetErr(() => this.fileConfigurationManager.ensureConfigurationForDocument(document, token));
 
 		const args: Proto.CompletionsRequestArgs = {
 			...typeConverters.Position.toFileLocationRequestArgs(file, position),
@@ -296,32 +318,35 @@ class TypeScriptCompletionItemProvider implements vscode.CompletionItemProvider
 			triggerCharacter: context.triggerCharacter as Proto.CompletionsTriggerCharacter
 		};
 
-		let msg: Proto.CompletionEntry[] | undefined = undefined;
+		let isNewIdentifierLocation = true;
+		let msg: ReadonlyArray<Proto.CompletionEntry> | undefined = undefined;
 		try {
-			const response = await this.client.execute('completions', args, token);
-			msg = response.body;
-			if (!msg) {
-				return [];
+			if (this.client.apiVersion.gte(API.v300)) {
+				const { body } = await this.client.interuptGetErr(() => this.client.execute('completionInfo', args, token));
+				if (!body) {
+					return null;
+				}
+				isNewIdentifierLocation = body.isNewIdentifierLocation;
+				msg = body.entries;
+			} else {
+				const { body } = await this.client.interuptGetErr(() => this.client.execute('completions', args, token));
+				if (!body) {
+					return null;
+				}
+				msg = body;
 			}
 		} catch {
-			return [];
+			return null;
 		}
 
-		const enableDotCompletions = this.shouldEnableDotCompletions(document, position);
-
-		const completionItems: vscode.CompletionItem[] = [];
-		for (const element of msg) {
-			if (element.kind === PConst.Kind.warning && !completionConfiguration.nameSuggestions) {
-				continue;
-			}
-			if (!completionConfiguration.autoImportSuggestions && element.hasAction) {
-				continue;
-			}
-			const item = new MyCompletionItem(position, document, line.text, element, enableDotCompletions, completionConfiguration.useCodeSnippetsOnMethodSuggest);
-			completionItems.push(item);
-		}
-
-		return completionItems;
+		const isInValidCommitCharacterContext = this.isInValidCommitCharacterContext(document, position);
+		return msg
+			.filter(entry => !shouldExcludeCompletionEntry(entry, completionConfiguration))
+			.map(entry => new MyCompletionItem(position, document, line.text, entry, completionConfiguration.useCodeSnippetsOnMethodSuggest, {
+				isNewIdentifierLocation,
+				isInValidCommitCharacterContext,
+				enableCallCompletions: !completionConfiguration.useCodeSnippetsOnMethodSuggest
+			}));
 	}
 
 	public async resolveCompletionItem(
@@ -337,8 +362,6 @@ class TypeScriptCompletionItemProvider implements vscode.CompletionItemProvider
 			return undefined;
 		}
 
-		item.resolve();
-
 		const args: Proto.CompletionDetailsRequestArgs = {
 			...typeConverters.Position.toFileLocationRequestArgs(filepath, item.position),
 			entryNames: [
@@ -346,14 +369,14 @@ class TypeScriptCompletionItemProvider implements vscode.CompletionItemProvider
 			]
 		};
 
-		let response: Proto.CompletionDetailsResponse;
+		let details: Proto.CompletionEntryDetails[] | undefined;
 		try {
-			response = await this.client.execute('completionEntryDetails', args, token);
+			const { body } = await this.client.execute('completionEntryDetails', args, token);
+			details = body;
 		} catch {
 			return item;
 		}
 
-		const details = response.body;
 		if (!details || !details.length || !details[0]) {
 			return item;
 		}
@@ -366,7 +389,7 @@ class TypeScriptCompletionItemProvider implements vscode.CompletionItemProvider
 		item.additionalTextEdits = additionalTextEdits;
 
 		if (detail && item.useCodeSnippet) {
-			const shouldCompleteFunction = await this.isValidFunctionCompletionContext(filepath, item.position);
+			const shouldCompleteFunction = await this.isValidFunctionCompletionContext(filepath, item.position, token);
 			if (shouldCompleteFunction) {
 				item.insertText = this.snippetForFunctionCall(item, detail);
 			}
@@ -425,7 +448,7 @@ class TypeScriptCompletionItemProvider implements vscode.CompletionItemProvider
 		};
 	}
 
-	private shouldEnableDotCompletions(
+	private isInValidCommitCharacterContext(
 		document: vscode.TextDocument,
 		position: vscode.Position
 	): boolean {
@@ -436,7 +459,7 @@ class TypeScriptCompletionItemProvider implements vscode.CompletionItemProvider
 			const preText = document.getText(new vscode.Range(
 				position.line, 0,
 				position.line, position.character - 1));
-			return preText.match(/[a-z_$\)\]\}]\s*$/ig) !== null;
+			return preText.match(/(^|[a-z_$\(\)\[\]\{\}])\s*$/ig) !== null;
 		}
 
 		return true;
@@ -444,46 +467,39 @@ class TypeScriptCompletionItemProvider implements vscode.CompletionItemProvider
 
 	private shouldTrigger(
 		context: vscode.CompletionContext,
-		config: CompletionConfiguration,
 		line: vscode.TextLine,
 		position: vscode.Position
 	): boolean {
-		if ((context.triggerCharacter === '"' || context.triggerCharacter === '\'') && !this.client.apiVersion.gte(API.v290)) {
-			if (!config.quickSuggestionsForPaths) {
-				return false;
+		if (context.triggerCharacter && !this.client.apiVersion.gte(API.v290)) {
+			if ((context.triggerCharacter === '"' || context.triggerCharacter === '\'')) {
+				// make sure we are in something that looks like the start of an import
+				const pre = line.text.slice(0, position.character);
+				if (!pre.match(/\b(from|import)\s*["']$/) && !pre.match(/\b(import|require)\(['"]$/)) {
+					return false;
+				}
 			}
 
-			// make sure we are in something that looks like the start of an import
-			const pre = line.text.slice(0, position.character);
-			if (!pre.match(/\b(from|import)\s*["']$/) && !pre.match(/\b(import|require)\(['"]$/)) {
-				return false;
-			}
-		}
-
-		if (context.triggerCharacter === '/') {
-			if (!config.quickSuggestionsForPaths) {
-				return false;
+			if (context.triggerCharacter === '/') {
+				// make sure we are in something that looks like an import path
+				const pre = line.text.slice(0, position.character);
+				if (!pre.match(/\b(from|import)\s*["'][^'"]*$/) && !pre.match(/\b(import|require)\(['"][^'"]*$/)) {
+					return false;
+				}
 			}
 
-			// make sure we are in something that looks like an import path
-			const pre = line.text.slice(0, position.character);
-			if (!pre.match(/\b(from|import)\s*["'][^'"]*$/) && !pre.match(/\b(import|require)\(['"][^'"]*$/)) {
+			if (context.triggerCharacter === '@') {
+				// make sure we are in something that looks like the start of a jsdoc comment
+				const pre = line.text.slice(0, position.character);
+				if (!pre.match(/^\s*\*[ ]?@/) && !pre.match(/\/\*\*+[ ]?@/)) {
+					return false;
+				}
+			}
+
+			if (context.triggerCharacter === '<') {
 				return false;
 			}
 		}
 
-		if (context.triggerCharacter === '@' && !this.client.apiVersion.gte(API.v290)) {
-			// make sure we are in something that looks like the start of a jsdoc comment
-			const pre = line.text.slice(0, position.character);
-			if (!pre.match(/^\s*\*[ ]?@/) && !pre.match(/\/\*\*+[ ]?@/)) {
-				return false;
-			}
-		}
-
-		if (context.triggerCharacter === '<') {
-			return this.client.apiVersion.gte(API.v290);
-		}
-
 		return true;
 	}
 
@@ -504,14 +520,14 @@ class TypeScriptCompletionItemProvider implements vscode.CompletionItemProvider
 
 	private async isValidFunctionCompletionContext(
 		filepath: string,
-		position: vscode.Position
+		position: vscode.Position,
+		token: vscode.CancellationToken
 	): Promise<boolean> {
 		// Workaround for https://github.com/Microsoft/TypeScript/issues/12677
 		// Don't complete function calls inside of destructive assigments or imports
 		try {
-			const infoResponse = await this.client.execute('quickinfo', typeConverters.Position.toFileLocationRequestArgs(filepath, position));
-			const info = infoResponse.body;
-			switch (info && info.kind) {
+			const { body } = await this.client.execute('quickinfo', typeConverters.Position.toFileLocationRequestArgs(filepath, position), token);
+			switch (body && body.kind) {
 				case 'var':
 				case 'let':
 				case 'const':
@@ -583,15 +599,28 @@ class TypeScriptCompletionItemProvider implements vscode.CompletionItemProvider
 	}
 }
 
+function shouldExcludeCompletionEntry(
+	element: Proto.CompletionEntry,
+	completionConfiguration: CompletionConfiguration
+) {
+	return (
+		(!completionConfiguration.nameSuggestions && element.kind === PConst.Kind.warning)
+		|| (!completionConfiguration.pathSuggestions &&
+			(element.kind === PConst.Kind.directory || element.kind === PConst.Kind.script || element.kind === PConst.Kind.externalModuleName))
+		|| (!completionConfiguration.autoImportSuggestions && element.hasAction)
+	);
+}
 
 export function register(
 	selector: vscode.DocumentSelector,
+	modeId: string,
 	client: ITypeScriptServiceClient,
 	typingsStatus: TypingsStatus,
 	fileConfigurationManager: FileConfigurationManager,
 	commandManager: CommandManager,
 ) {
-	return vscode.languages.registerCompletionItemProvider(selector,
-		new TypeScriptCompletionItemProvider(client, typingsStatus, fileConfigurationManager, commandManager),
-		...TypeScriptCompletionItemProvider.triggerCharacters);
-}
\ No newline at end of file
+	return new ConfigurationDependentRegistration(modeId, 'suggest.enabled', () =>
+		vscode.languages.registerCompletionItemProvider(selector,
+			new TypeScriptCompletionItemProvider(client, modeId, typingsStatus, fileConfigurationManager, commandManager),
+			...TypeScriptCompletionItemProvider.triggerCharacters));
+}
diff --git a/extensions/typescript-language-features/src/features/definitionProviderBase.ts b/extensions/typescript-language-features/src/features/definitionProviderBase.ts
index c34d6df3382..186d3e711dd 100644
--- a/extensions/typescript-language-features/src/features/definitionProviderBase.ts
+++ b/extensions/typescript-language-features/src/features/definitionProviderBase.ts
@@ -3,23 +3,23 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { TextDocument, Position, CancellationToken, Location } from 'vscode';
-
+import * as vscode from 'vscode';
 import * as Proto from '../protocol';
 import { ITypeScriptServiceClient } from '../typescriptService';
 import * as typeConverters from '../utils/typeConverters';
 
+
 export default class TypeScriptDefinitionProviderBase {
 	constructor(
-		private readonly client: ITypeScriptServiceClient
+		protected readonly client: ITypeScriptServiceClient
 	) { }
 
 	protected async getSymbolLocations(
 		definitionType: 'definition' | 'implementation' | 'typeDefinition',
-		document: TextDocument,
-		position: Position,
-		token: CancellationToken | boolean
-	): Promise<Location[] | undefined> {
+		document: vscode.TextDocument,
+		position: vscode.Position,
+		token: vscode.CancellationToken
+	): Promise<vscode.Location[] | undefined> {
 		const filepath = this.client.toPath(document.uri);
 		if (!filepath) {
 			return undefined;
@@ -32,7 +32,7 @@ export default class TypeScriptDefinitionProviderBase {
 			return locations.map(location =>
 				typeConverters.Location.fromTextSpan(this.client.toResource(location.file), location));
 		} catch {
-			return [];
+			return undefined;
 		}
 	}
 }
\ No newline at end of file
diff --git a/extensions/typescript-language-features/src/features/definitions.ts b/extensions/typescript-language-features/src/features/definitions.ts
index 0f5e565390a..6e260d5d089 100644
--- a/extensions/typescript-language-features/src/features/definitions.ts
+++ b/extensions/typescript-language-features/src/features/definitions.ts
@@ -5,10 +5,50 @@
 
 import * as vscode from 'vscode';
 import { ITypeScriptServiceClient } from '../typescriptService';
+import API from '../utils/api';
+import * as typeConverters from '../utils/typeConverters';
 import DefinitionProviderBase from './definitionProviderBase';
 
-class TypeScriptDefinitionProvider extends DefinitionProviderBase implements vscode.DefinitionProvider {
-	public provideDefinition(document: vscode.TextDocument, position: vscode.Position, token: vscode.CancellationToken | boolean): Promise<vscode.Definition | undefined> {
+export default class TypeScriptDefinitionProvider extends DefinitionProviderBase implements vscode.DefinitionProvider {
+	constructor(
+		client: ITypeScriptServiceClient
+	) {
+		super(client);
+	}
+
+	public async provideDefinition(
+		document: vscode.TextDocument,
+		position: vscode.Position,
+		token: vscode.CancellationToken
+	): Promise<vscode.DefinitionLink[] | vscode.Definition | undefined> {
+		if (this.client.apiVersion.gte(API.v270)) {
+			const filepath = this.client.toPath(document.uri);
+			if (!filepath) {
+				return undefined;
+			}
+
+			const args = typeConverters.Position.toFileLocationRequestArgs(filepath, position);
+			try {
+				const { body } = await this.client.execute('definitionAndBoundSpan', args, token);
+				if (!body) {
+					return undefined;
+				}
+
+				const span = body.textSpan ? typeConverters.Range.fromTextSpan(body.textSpan) : undefined;
+				return body.definitions
+					.map(location => {
+						const target = typeConverters.Location.fromTextSpan(this.client.toResource(location.file), location);
+						return <vscode.DefinitionLink>{
+							originSelectionRange: span,
+							targetRange: target.range,
+							targetUri: target.uri,
+						};
+					});
+			} catch {
+				return [];
+			}
+		}
+
 		return this.getSymbolLocations('definition', document, position, token);
 	}
 }
diff --git a/extensions/typescript-language-features/src/features/diagnostics.ts b/extensions/typescript-language-features/src/features/diagnostics.ts
index e2884f74d36..a37cd310c42 100644
--- a/extensions/typescript-language-features/src/features/diagnostics.ts
+++ b/extensions/typescript-language-features/src/features/diagnostics.ts
@@ -3,127 +3,203 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import *  as vscode from 'vscode';
+import * as vscode from 'vscode';
+import { ResourceMap } from '../utils/resourceMap';
+import { DiagnosticLanguage, allDiagnosticLangauges } from '../utils/languageDescription';
 
-export class DiagnosticSet {
-	private _map: ObjectMap<vscode.Diagnostic[]> = Object.create(null);
-
-	public set(
-		file: vscode.Uri,
-		diagnostics: vscode.Diagnostic[]
-	) {
-		this._map[this.key(file)] = diagnostics;
-	}
-
-	public get(file: vscode.Uri): vscode.Diagnostic[] {
-		return this._map[this.key(file)] || [];
-	}
-
-	public clear(): void {
-		this._map = Object.create(null);
-	}
-
-	private key(file: vscode.Uri): string {
-		return file.toString(true);
-	}
-}
-
-export enum DiagnosticKind {
+export const enum DiagnosticKind {
 	Syntax,
 	Semantic,
 	Suggestion
 }
 
-const allDiagnosticKinds = [DiagnosticKind.Syntax, DiagnosticKind.Semantic, DiagnosticKind.Suggestion];
+class FileDiagnostics {
+	private readonly _diagnostics = new Map<DiagnosticKind, vscode.Diagnostic[]>();
+
+	constructor(
+		public readonly file: vscode.Uri,
+		public language: DiagnosticLanguage
+	) { }
+
+	public updateDiagnostics(
+		language: DiagnosticLanguage,
+		kind: DiagnosticKind,
+		diagnostics: vscode.Diagnostic[]
+	): boolean {
+		if (language !== this.language) {
+			this._diagnostics.clear();
+			this.language = language;
+		}
+
+		if (diagnostics.length === 0) {
+			const existing = this._diagnostics.get(kind);
+			if (!existing || existing && existing.length === 0) {
+				// No need to update
+				return false;
+			}
+		}
+
+		this._diagnostics.set(kind, diagnostics);
+		return true;
+	}
+
+	public getDiagnostics(settings: DiagnosticSettings): vscode.Diagnostic[] {
+		if (!settings.getValidate(this.language)) {
+			return [];
+		}
+
+		return [
+			...this.get(DiagnosticKind.Syntax),
+			...this.get(DiagnosticKind.Semantic),
+			...this.getSuggestionDiagnostics(settings),
+		];
+	}
+
+	private getSuggestionDiagnostics(settings: DiagnosticSettings) {
+		const enableSuggestions = settings.getEnableSuggestions(this.language);
+		return this.get(DiagnosticKind.Suggestion).filter(x => {
+			if (!enableSuggestions) {
+				// Still show unused
+				return x.tags && x.tags.indexOf(vscode.DiagnosticTag.Unnecessary) !== -1;
+			}
+			return true;
+		});
+	}
+
+	private get(kind: DiagnosticKind): vscode.Diagnostic[] {
+		return this._diagnostics.get(kind) || [];
+	}
+}
+
+interface LangaugeDiagnosticSettings {
+	readonly validate: boolean;
+	readonly enableSuggestions: boolean;
+}
+
+class DiagnosticSettings {
+	private static readonly defaultSettings: LangaugeDiagnosticSettings = {
+		validate: true,
+		enableSuggestions: true
+	};
+
+	private readonly _languageSettings = new Map<DiagnosticLanguage, LangaugeDiagnosticSettings>();
+
+	constructor() {
+		for (const language of allDiagnosticLangauges) {
+			this._languageSettings.set(language, DiagnosticSettings.defaultSettings);
+		}
+	}
+
+	public getValidate(language: DiagnosticLanguage): boolean {
+		return this.get(language).validate;
+	}
+
+	public setValidate(language: DiagnosticLanguage, value: boolean): boolean {
+		return this.update(language, settings => ({
+			validate: value,
+			enableSuggestions: settings.enableSuggestions
+		}));
+	}
+
+	public getEnableSuggestions(language: DiagnosticLanguage): boolean {
+		return this.get(language).enableSuggestions;
+	}
+
+	public setEnableSuggestions(language: DiagnosticLanguage, value: boolean): boolean {
+		return this.update(language, settings => ({
+			validate: settings.validate,
+			enableSuggestions: value
+		}));
+	}
+
+	private get(language: DiagnosticLanguage): LangaugeDiagnosticSettings {
+		return this._languageSettings.get(language) || DiagnosticSettings.defaultSettings;
+	}
+
+	private update(language: DiagnosticLanguage, f: (x: LangaugeDiagnosticSettings) => LangaugeDiagnosticSettings): boolean {
+		const currentSettings = this.get(language);
+		const newSettings = f(currentSettings);
+		this._languageSettings.set(language, newSettings);
+		return currentSettings.validate === newSettings.validate
+			&& currentSettings.enableSuggestions && currentSettings.enableSuggestions;
+	}
+}
 
 export class DiagnosticsManager {
-
-	private readonly _diagnostics = new Map<DiagnosticKind, DiagnosticSet>();
+	private readonly _diagnostics = new ResourceMap<FileDiagnostics>();
+	private readonly _settings = new DiagnosticSettings();
 	private readonly _currentDiagnostics: vscode.DiagnosticCollection;
-	private readonly _pendingUpdates: { [key: string]: any } = Object.create(null);
-	private _validate: boolean = true;
-	private _enableSuggestions: boolean = true;
+	private _pendingUpdates = new ResourceMap<any>();
 
-	private readonly updateDelay = 50;
+	private readonly _updateDelay = 50;
 
 	constructor(
 		owner: string
 	) {
-		for (const kind of allDiagnosticKinds) {
-			this._diagnostics.set(kind, new DiagnosticSet());
-		}
-
 		this._currentDiagnostics = vscode.languages.createDiagnosticCollection(owner);
 	}
 
 	public dispose() {
 		this._currentDiagnostics.dispose();
 
-		for (const key of Object.keys(this._pendingUpdates)) {
-			clearTimeout(this._pendingUpdates[key]);
-			delete this._pendingUpdates[key];
+		for (const value of this._pendingUpdates.values) {
+			clearTimeout(value);
 		}
+		this._pendingUpdates = new ResourceMap<any>();
 	}
 
 	public reInitialize(): void {
 		this._currentDiagnostics.clear();
+		this._diagnostics.clear();
+	}
 
-		for (const diagnosticSet of this._diagnostics.values()) {
-			diagnosticSet.clear();
+	public setValidate(language: DiagnosticLanguage, value: boolean) {
+		const didUpdate = this._settings.setValidate(language, value);
+		if (didUpdate) {
+			this.rebuild();
 		}
 	}
 
-	public set validate(value: boolean) {
-		if (this._validate === value) {
-			return;
-		}
-
-		this._validate = value;
-		if (!value) {
-			this._currentDiagnostics.clear();
+	public setEnableSuggestions(language: DiagnosticLanguage, value: boolean) {
+		const didUpdate = this._settings.setEnableSuggestions(language, value);
+		if (didUpdate) {
+			this.rebuild();
 		}
 	}
 
-	public set enableSuggestions(value: boolean) {
-		if (this._enableSuggestions === value) {
-			return;
-		}
-
-		this._enableSuggestions = value;
-		if (!value) {
-			this._currentDiagnostics.clear();
-		}
-	}
-
-	public diagnosticsReceived(
+	public updateDiagnostics(
+		file: vscode.Uri,
+		language: DiagnosticLanguage,
 		kind: DiagnosticKind,
+		diagnostics: vscode.Diagnostic[]
+	): void {
+
+		let didUpdate = false;
+		const entry = this._diagnostics.get(file);
+		if (entry) {
+			didUpdate = entry.updateDiagnostics(language, kind, diagnostics);
+		} else if (diagnostics.length) {
+			const fileDiagnostics = new FileDiagnostics(file, language);
+			fileDiagnostics.updateDiagnostics(language, kind, diagnostics);
+			this._diagnostics.set(file, fileDiagnostics);
+			didUpdate = true;
+		}
+
+		if (didUpdate) {
+			this.scheduleDiagnosticsUpdate(file);
+		}
+	}
+
+	public configFileDiagnosticsReceived(
 		file: vscode.Uri,
 		diagnostics: vscode.Diagnostic[]
 	): void {
-		const collection = this._diagnostics.get(kind);
-		if (!collection) {
-			return;
-		}
-
-		if (diagnostics.length === 0) {
-			const existing = collection.get(file);
-			if (existing.length === 0) {
-				// No need to update
-				return;
-			}
-		}
-
-		collection.set(file, diagnostics);
-
-		this.scheduleDiagnosticsUpdate(file);
-	}
-
-	public configFileDiagnosticsReceived(file: vscode.Uri, diagnostics: vscode.Diagnostic[]): void {
 		this._currentDiagnostics.set(file, diagnostics);
 	}
 
 	public delete(resource: vscode.Uri): void {
 		this._currentDiagnostics.delete(resource);
+		this._diagnostics.delete(resource);
 	}
 
 	public getDiagnostics(file: vscode.Uri): vscode.Diagnostic[] {
@@ -131,37 +207,25 @@ export class DiagnosticsManager {
 	}
 
 	private scheduleDiagnosticsUpdate(file: vscode.Uri) {
-		const key = file.fsPath;
-		if (!this._pendingUpdates[key]) {
-			this._pendingUpdates[key] = setTimeout(() => this.updateCurrentDiagnostics(file), this.updateDelay);
+		if (!this._pendingUpdates.has(file)) {
+			this._pendingUpdates.set(file, setTimeout(() => this.updateCurrentDiagnostics(file), this._updateDelay));
 		}
 	}
 
-	private updateCurrentDiagnostics(file: vscode.Uri) {
-		if (this._pendingUpdates[file.fsPath]) {
-			clearTimeout(this._pendingUpdates[file.fsPath]);
-			delete this._pendingUpdates[file.fsPath];
+	private updateCurrentDiagnostics(file: vscode.Uri): void {
+		if (this._pendingUpdates.has(file)) {
+			clearTimeout(this._pendingUpdates.get(file));
+			this._pendingUpdates.delete(file);
 		}
 
-		if (!this._validate) {
-			return;
-		}
-
-		const allDiagnostics = [
-			...this._diagnostics.get(DiagnosticKind.Syntax)!.get(file),
-			...this._diagnostics.get(DiagnosticKind.Semantic)!.get(file),
-			...this.getSuggestionDiagnostics(file),
-		];
-		this._currentDiagnostics.set(file, allDiagnostics);
+		const fileDiagnostics = this._diagnostics.get(file);
+		this._currentDiagnostics.set(file, fileDiagnostics ? fileDiagnostics.getDiagnostics(this._settings) : []);
 	}
 
-	private getSuggestionDiagnostics(file: vscode.Uri) {
-		return this._diagnostics.get(DiagnosticKind.Suggestion)!.get(file).filter(x => {
-			if (!this._enableSuggestions) {
-				// Still show unused
-				return x.customTags && x.customTags.indexOf(vscode.DiagnosticTag.Unnecessary) !== -1;
-			}
-			return true;
-		});
+	private rebuild(): void {
+		this._currentDiagnostics.clear();
+		for (const fileDiagnostic of Array.from(this._diagnostics.values)) {
+			this._currentDiagnostics.set(fileDiagnostic.file, fileDiagnostic.getDiagnostics(this._settings));
+		}
 	}
 }
\ No newline at end of file
diff --git a/extensions/typescript-language-features/src/features/directiveCommentCompletions.ts b/extensions/typescript-language-features/src/features/directiveCommentCompletions.ts
index 41d5bd8e8cd..8ec98eefb8f 100644
--- a/extensions/typescript-language-features/src/features/directiveCommentCompletions.ts
+++ b/extensions/typescript-language-features/src/features/directiveCommentCompletions.ts
@@ -6,14 +6,14 @@
 import * as vscode from 'vscode';
 import * as nls from 'vscode-nls';
 import { ITypeScriptServiceClient } from '../typescriptService';
-import { VersionDependentRegistration } from '../utils/dependentRegistration';
 import API from '../utils/api';
+import { VersionDependentRegistration } from '../utils/dependentRegistration';
 
 const localize = nls.loadMessageBundle();
 
 interface Directive {
-	value: string;
-	description: string;
+	readonly value: string;
+	readonly description: string;
 }
 
 const directives: Directive[] = [
@@ -21,17 +21,17 @@ const directives: Directive[] = [
 		value: '@ts-check',
 		description: localize(
 			'ts-check',
-			'Enables semantic checking in a JavaScript file. Must be at the top of a file.')
+			"Enables semantic checking in a JavaScript file. Must be at the top of a file.")
 	}, {
 		value: '@ts-nocheck',
 		description: localize(
 			'ts-nocheck',
-			'Disables semantic checking in a JavaScript file. Must be at the top of a file.')
+			"Disables semantic checking in a JavaScript file. Must be at the top of a file.")
 	}, {
 		value: '@ts-ignore',
 		description: localize(
 			'ts-ignore',
-			'Suppresses @ts-check errors on the next line of a file.')
+			"Suppresses @ts-check errors on the next line of a file.")
 	}
 ];
 
@@ -63,13 +63,6 @@ class DirectiveCommentCompletionProvider implements vscode.CompletionItemProvide
 		}
 		return [];
 	}
-
-	public resolveCompletionItem(
-		item: vscode.CompletionItem,
-		_token: vscode.CancellationToken
-	) {
-		return item;
-	}
 }
 
 export function register(
diff --git a/extensions/typescript-language-features/src/features/documentHighlight.ts b/extensions/typescript-language-features/src/features/documentHighlight.ts
index 2e7f619739f..d661e154fdd 100644
--- a/extensions/typescript-language-features/src/features/documentHighlight.ts
+++ b/extensions/typescript-language-features/src/features/documentHighlight.ts
@@ -4,12 +4,12 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as vscode from 'vscode';
-
 import * as Proto from '../protocol';
-
 import { ITypeScriptServiceClient } from '../typescriptService';
 import * as typeConverters from '../utils/typeConverters';
 
+
+
 class TypeScriptDocumentHighlightProvider implements vscode.DocumentHighlightProvider {
 	public constructor(
 		private readonly client: ITypeScriptServiceClient
@@ -26,18 +26,20 @@ class TypeScriptDocumentHighlightProvider implements vscode.DocumentHighlightPro
 		}
 
 		const args = typeConverters.Position.toFileLocationRequestArgs(file, position);
+		let items: Proto.OccurrencesResponseItem[];
 		try {
-			const response = await this.client.execute('occurrences', args, token);
-			if (response && response.body) {
-				return response.body
-					.filter(x => !x.isInString)
-					.map(documentHighlightFromOccurance);
+			const { body } = await this.client.execute('occurrences', args, token);
+			if (!body) {
+				return [];
 			}
+			items = body;
 		} catch {
-			// noop
+			return [];
 		}
 
-		return [];
+		return items
+			.filter(x => !x.isInString)
+			.map(documentHighlightFromOccurance);
 	}
 }
 
diff --git a/extensions/typescript-language-features/src/features/documentSymbol.ts b/extensions/typescript-language-features/src/features/documentSymbol.ts
index 8df78a13761..8925d2fb3b1 100644
--- a/extensions/typescript-language-features/src/features/documentSymbol.ts
+++ b/extensions/typescript-language-features/src/features/documentSymbol.ts
@@ -4,12 +4,10 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as vscode from 'vscode';
-
 import * as Proto from '../protocol';
 import * as PConst from '../protocol.const';
 import { ITypeScriptServiceClient } from '../typescriptService';
 import * as typeConverters from '../utils/typeConverters';
-import API from '../utils/api';
 
 const getSymbolKind = (kind: string): vscode.SymbolKind => {
 	switch (kind) {
@@ -33,82 +31,63 @@ const getSymbolKind = (kind: string): vscode.SymbolKind => {
 
 class TypeScriptDocumentSymbolProvider implements vscode.DocumentSymbolProvider {
 	public constructor(
-		private readonly client: ITypeScriptServiceClient) { }
+		private readonly client: ITypeScriptServiceClient
+	) { }
 
-	public async provideDocumentSymbols(resource: vscode.TextDocument, token: vscode.CancellationToken): Promise<any> { // todo@joh `any[]` temporary hack to make typescript happy...
-		const filepath = this.client.toPath(resource.uri);
-		if (!filepath) {
-			return [];
+	public async provideDocumentSymbols(resource: vscode.TextDocument, token: vscode.CancellationToken): Promise<vscode.DocumentSymbol[] | undefined> {
+		const file = this.client.toPath(resource.uri);
+		if (!file) {
+			return undefined;
 		}
-		const args: Proto.FileRequestArgs = {
-			file: filepath
-		};
 
+		let tree: Proto.NavigationTree;
 		try {
-			if (this.client.apiVersion.gte(API.v206)) {
-				const response = await this.client.execute('navtree', args, token);
-				if (response.body) {
-					// The root represents the file. Ignore this when showing in the UI
-					const tree = response.body;
-					if (tree.childItems) {
-						const result = new Array<vscode.SymbolInformation2>();
-						tree.childItems.forEach(item => TypeScriptDocumentSymbolProvider.convertNavTree(resource.uri, result, item));
-						return result;
-					}
-				}
-			} else {
-				const response = await this.client.execute('navbar', args, token);
-				if (response.body) {
-					const result = new Array<vscode.SymbolInformation>();
-					const foldingMap: ObjectMap<vscode.SymbolInformation> = Object.create(null);
-					response.body.forEach(item => TypeScriptDocumentSymbolProvider.convertNavBar(resource.uri, 0, foldingMap, result as vscode.SymbolInformation[], item));
-					return result;
-				}
+			const args: Proto.FileRequestArgs = { file };
+			const { body } = await this.client.execute('navtree', args, token);
+			if (!body) {
+				return undefined;
 			}
-			return [];
-		} catch (e) {
-			return [];
+			tree = body;
+		} catch {
+			return undefined;
 		}
+
+		if (tree && tree.childItems) {
+			// The root represents the file. Ignore this when showing in the UI
+			const result: vscode.DocumentSymbol[] = [];
+			tree.childItems.forEach(item => TypeScriptDocumentSymbolProvider.convertNavTree(resource.uri, result, item));
+			return result;
+		}
+
+		return undefined;
 	}
 
-	private static convertNavBar(resource: vscode.Uri, indent: number, foldingMap: ObjectMap<vscode.SymbolInformation>, bucket: vscode.SymbolInformation[], item: Proto.NavigationBarItem, containerLabel?: string): void {
-		const realIndent = indent + item.indent;
-		const key = `${realIndent}|${item.text}`;
-		if (realIndent !== 0 && !foldingMap[key] && TypeScriptDocumentSymbolProvider.shouldInclueEntry(item)) {
-			const result = new vscode.SymbolInformation(item.text,
-				getSymbolKind(item.kind),
-				containerLabel ? containerLabel : '',
-				typeConverters.Location.fromTextSpan(resource, item.spans[0]));
-			foldingMap[key] = result;
-			bucket.push(result);
-		}
-		if (item.childItems && item.childItems.length > 0) {
-			for (const child of item.childItems) {
-				TypeScriptDocumentSymbolProvider.convertNavBar(resource, realIndent + 1, foldingMap, bucket, child, item.text);
-			}
-		}
-	}
-
-	private static convertNavTree(resource: vscode.Uri, bucket: vscode.SymbolInformation[], item: Proto.NavigationTree): boolean {
-		const symbolInfo = new vscode.SymbolInformation2(
-			item.text,
-			getSymbolKind(item.kind),
-			'', // no container name
-			typeConverters.Location.fromTextSpan(resource, item.spans[0]),
-		);
-
+	private static convertNavTree(resource: vscode.Uri, bucket: vscode.DocumentSymbol[], item: Proto.NavigationTree): boolean {
 		let shouldInclude = TypeScriptDocumentSymbolProvider.shouldInclueEntry(item);
 
-		if (item.childItems) {
-			for (const child of item.childItems) {
-				const includedChild = TypeScriptDocumentSymbolProvider.convertNavTree(resource, symbolInfo.children, child);
-				shouldInclude = shouldInclude || includedChild;
+		const children = new Set(item.childItems || []);
+		for (const span of item.spans) {
+			const range = typeConverters.Range.fromTextSpan(span);
+			const symbolInfo = new vscode.DocumentSymbol(
+				item.text,
+				'',
+				getSymbolKind(item.kind),
+				range,
+				range);
+
+			for (const child of children) {
+				if (child.spans.some(span => !!range.intersection(typeConverters.Range.fromTextSpan(span)))) {
+					const includedChild = TypeScriptDocumentSymbolProvider.convertNavTree(resource, symbolInfo.children, child);
+					shouldInclude = shouldInclude || includedChild;
+					children.delete(child);
+				}
+			}
+
+			if (shouldInclude) {
+				bucket.push(symbolInfo);
 			}
 		}
 
-		if (shouldInclude) {
-			bucket.push(symbolInfo);
-		}
 		return shouldInclude;
 	}
 
diff --git a/extensions/typescript-language-features/src/features/fileConfigurationManager.ts b/extensions/typescript-language-features/src/features/fileConfigurationManager.ts
index 0cb8c3da539..3068e8df5e1 100644
--- a/extensions/typescript-language-features/src/features/fileConfigurationManager.ts
+++ b/extensions/typescript-language-features/src/features/fileConfigurationManager.ts
@@ -3,12 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { workspace as Workspace, FormattingOptions, TextDocument, CancellationToken, window, Disposable, workspace, WorkspaceConfiguration } from 'vscode';
-
+import * as vscode from 'vscode';
 import * as Proto from '../protocol';
 import { ITypeScriptServiceClient } from '../typescriptService';
-import * as languageIds from '../utils/languageModeIds';
 import API from '../utils/api';
+import { isTypeScriptDocument } from '../utils/languageModeIds';
+import { ResourceMap } from '../utils/resourceMap';
+
 
 function objsAreEqual<T>(a: T, b: T): boolean {
 	let keys = Object.keys(a);
@@ -22,8 +23,8 @@ function objsAreEqual<T>(a: T, b: T): boolean {
 }
 
 interface FileConfiguration {
-	formatOptions: Proto.FormatCodeSettings;
-	preferences: Proto.UserPreferences;
+	readonly formatOptions: Proto.FormatCodeSettings;
+	readonly preferences: Proto.UserPreferences;
 }
 
 function areFileConfigurationsEqual(a: FileConfiguration, b: FileConfiguration): boolean {
@@ -34,19 +35,18 @@ function areFileConfigurationsEqual(a: FileConfiguration, b: FileConfiguration):
 }
 
 export default class FileConfigurationManager {
-	private onDidCloseTextDocumentSub: Disposable | undefined;
-	private formatOptions: { [key: string]: FileConfiguration | undefined } = Object.create(null);
+	private onDidCloseTextDocumentSub: vscode.Disposable | undefined;
+	private formatOptions = new ResourceMap<FileConfiguration>();
 
 	public constructor(
 		private readonly client: ITypeScriptServiceClient
 	) {
-		this.onDidCloseTextDocumentSub = Workspace.onDidCloseTextDocument((textDocument) => {
-			const key = textDocument.uri.toString();
+		this.onDidCloseTextDocumentSub = vscode.workspace.onDidCloseTextDocument((textDocument) => {
 			// When a document gets closed delete the cached formatting options.
 			// This is necessary since the tsserver now closed a project when its
 			// last file in it closes which drops the stored formatting options
 			// as well.
-			delete this.formatOptions[key];
+			this.formatOptions.delete(textDocument.uri);
 		});
 	}
 
@@ -58,53 +58,74 @@ export default class FileConfigurationManager {
 	}
 
 	public async ensureConfigurationForDocument(
-		document: TextDocument,
-		token: CancellationToken | undefined
+		document: vscode.TextDocument,
+		token: vscode.CancellationToken
 	): Promise<void> {
-		const editor = window.visibleTextEditors.find(editor => editor.document.fileName === document.fileName);
-		if (editor) {
-			const formattingOptions = {
-				tabSize: editor.options.tabSize,
-				insertSpaces: editor.options.insertSpaces
-			} as FormattingOptions;
+		const formattingOptions = this.getFormattingOptions(document);
+		if (formattingOptions) {
 			return this.ensureConfigurationOptions(document, formattingOptions, token);
 		}
 	}
 
+	private getFormattingOptions(
+		document: vscode.TextDocument
+	): vscode.FormattingOptions | undefined {
+		const editor = vscode.window.visibleTextEditors.find(editor => editor.document.fileName === document.fileName);
+		return editor
+			? {
+				tabSize: editor.options.tabSize,
+				insertSpaces: editor.options.insertSpaces
+			} as vscode.FormattingOptions
+			: undefined;
+	}
+
 	public async ensureConfigurationOptions(
-		document: TextDocument,
-		options: FormattingOptions,
-		token: CancellationToken | undefined
+		document: vscode.TextDocument,
+		options: vscode.FormattingOptions,
+		token: vscode.CancellationToken
 	): Promise<void> {
 		const file = this.client.toPath(document.uri);
 		if (!file) {
 			return;
 		}
 
-		const key = document.uri.toString();
-		const cachedOptions = this.formatOptions[key];
+		const cachedOptions = this.formatOptions.get(document.uri);
 		const currentOptions = this.getFileOptions(document, options);
-
 		if (cachedOptions && areFileConfigurationsEqual(cachedOptions, currentOptions)) {
 			return;
 		}
 
+		this.formatOptions.set(document.uri, currentOptions);
 		const args: Proto.ConfigureRequestArguments = {
 			file,
 			...currentOptions,
 		};
 		await this.client.execute('configure', args, token);
-		this.formatOptions[key] = currentOptions;
+	}
+
+	public async setGlobalConfigurationFromDocument(
+		document: vscode.TextDocument,
+		token: vscode.CancellationToken,
+	): Promise<void> {
+		const formattingOptions = this.getFormattingOptions(document);
+		if (!formattingOptions) {
+			return;
+		}
+
+		const args: Proto.ConfigureRequestArguments = {
+			file: undefined /*global*/,
+			...this.getFileOptions(document, formattingOptions),
+		};
+		await this.client.execute('configure', args, token);
 	}
 
 	public reset() {
-		this.formatOptions = Object.create(null);
+		this.formatOptions.clear();
 	}
 
-
 	private getFileOptions(
-		document: TextDocument,
-		options: FormattingOptions
+		document: vscode.TextDocument,
+		options: vscode.FormattingOptions
 	): FileConfiguration {
 		return {
 			formatOptions: this.getFormatOptions(document, options),
@@ -113,10 +134,10 @@ export default class FileConfigurationManager {
 	}
 
 	private getFormatOptions(
-		document: TextDocument,
-		options: FormattingOptions
+		document: vscode.TextDocument,
+		options: vscode.FormattingOptions
 	): Proto.FormatCodeSettings {
-		const config = workspace.getConfiguration(
+		const config = vscode.workspace.getConfiguration(
 			isTypeScriptDocument(document) ? 'typescript.format' : 'javascript.format',
 			document.uri);
 
@@ -144,12 +165,12 @@ export default class FileConfigurationManager {
 		};
 	}
 
-	private getPreferences(document: TextDocument): Proto.UserPreferences {
+	private getPreferences(document: vscode.TextDocument): Proto.UserPreferences {
 		if (!this.client.apiVersion.gte(API.v290)) {
 			return {};
 		}
 
-		const preferences = workspace.getConfiguration(
+		const preferences = vscode.workspace.getConfiguration(
 			isTypeScriptDocument(document) ? 'typescript.preferences' : 'javascript.preferences',
 			document.uri);
 
@@ -161,7 +182,7 @@ export default class FileConfigurationManager {
 	}
 }
 
-function getQuoteStylePreference(config: WorkspaceConfiguration) {
+function getQuoteStylePreference(config: vscode.WorkspaceConfiguration) {
 	switch (config.get<string>('quoteStyle')) {
 		case 'single': return 'single';
 		case 'double': return 'double';
@@ -169,14 +190,10 @@ function getQuoteStylePreference(config: WorkspaceConfiguration) {
 	}
 }
 
-function getImportModuleSpecifierPreference(config: WorkspaceConfiguration) {
+function getImportModuleSpecifierPreference(config: vscode.WorkspaceConfiguration) {
 	switch (config.get<string>('importModuleSpecifier')) {
 		case 'relative': return 'relative';
 		case 'non-relative': return 'non-relative';
 		default: return undefined;
 	}
-}
-
-function isTypeScriptDocument(document: TextDocument) {
-	return document.languageId === languageIds.typescript || document.languageId === languageIds.typescriptreact;
-}
+}
\ No newline at end of file
diff --git a/extensions/typescript-language-features/src/features/folding.ts b/extensions/typescript-language-features/src/features/folding.ts
index 556fafcbaa9..471cf26cff2 100644
--- a/extensions/typescript-language-features/src/features/folding.ts
+++ b/extensions/typescript-language-features/src/features/folding.ts
@@ -6,9 +6,9 @@
 import * as vscode from 'vscode';
 import * as Proto from '../protocol';
 import { ITypeScriptServiceClient } from '../typescriptService';
-import * as typeConverters from '../utils/typeConverters';
-import { VersionDependentRegistration } from '../utils/dependentRegistration';
 import API from '../utils/api';
+import { VersionDependentRegistration } from '../utils/dependentRegistration';
+import * as typeConverters from '../utils/typeConverters';
 
 class TypeScriptFoldingProvider implements vscode.FoldingRangeProvider {
 	public constructor(
@@ -26,12 +26,12 @@ class TypeScriptFoldingProvider implements vscode.FoldingRangeProvider {
 		}
 
 		const args: Proto.FileRequestArgs = { file };
-		const response: Proto.OutliningSpansResponse = await this.client.execute('getOutliningSpans', args, token);
-		if (!response || !response.body) {
+		const { body } = await this.client.execute('getOutliningSpans', args, token);
+		if (!body) {
 			return;
 		}
 
-		return response.body
+		return body
 			.map(span => this.convertOutliningSpan(span, document))
 			.filter(foldingRange => !!foldingRange) as vscode.FoldingRange[];
 	}
diff --git a/extensions/typescript-language-features/src/features/formatting.ts b/extensions/typescript-language-features/src/features/formatting.ts
index e0556c99ec8..b3ecff09d17 100644
--- a/extensions/typescript-language-features/src/features/formatting.ts
+++ b/extensions/typescript-language-features/src/features/formatting.ts
@@ -10,59 +10,38 @@ import { ConfigurationDependentRegistration } from '../utils/dependentRegistrati
 import * as typeConverters from '../utils/typeConverters';
 import FileConfigurationManager from './fileConfigurationManager';
 
-
 class TypeScriptFormattingProvider implements vscode.DocumentRangeFormattingEditProvider, vscode.OnTypeFormattingEditProvider {
-	private enabled: boolean = true;
-
 	public constructor(
 		private readonly client: ITypeScriptServiceClient,
 		private readonly formattingOptionsManager: FileConfigurationManager
 	) { }
 
-	public updateConfiguration(config: vscode.WorkspaceConfiguration): void {
-		this.enabled = config.get('format.enable', true);
-	}
-
-	public isEnabled(): boolean {
-		return this.enabled;
-	}
-
-	private async doFormat(
-		document: vscode.TextDocument,
-		options: vscode.FormattingOptions,
-		args: Proto.FormatRequestArgs,
-		token: vscode.CancellationToken
-	): Promise<vscode.TextEdit[]> {
-		await this.formattingOptionsManager.ensureConfigurationOptions(document, options, token);
-		try {
-			const response = await this.client.execute('format', args, token);
-			if (response.body) {
-				return response.body.map(typeConverters.TextEdit.fromCodeEdit);
-			}
-		} catch {
-			// noop
-		}
-		return [];
-	}
-
 	public async provideDocumentRangeFormattingEdits(
 		document: vscode.TextDocument,
 		range: vscode.Range,
 		options: vscode.FormattingOptions,
 		token: vscode.CancellationToken
-	): Promise<vscode.TextEdit[]> {
-		const absPath = this.client.toPath(document.uri);
-		if (!absPath) {
-			return [];
+	): Promise<vscode.TextEdit[] | undefined> {
+		const file = this.client.toPath(document.uri);
+		if (!file) {
+			return undefined;
 		}
-		const args: Proto.FormatRequestArgs = {
-			file: absPath,
-			line: range.start.line + 1,
-			offset: range.start.character + 1,
-			endLine: range.end.line + 1,
-			endOffset: range.end.character + 1
-		};
-		return this.doFormat(document, options, args, token);
+
+		await this.formattingOptionsManager.ensureConfigurationOptions(document, options, token);
+
+		let edits: Proto.CodeEdit[];
+		try {
+			const args = typeConverters.Range.toFormattingRequestArgs(file, range);
+			const { body } = await this.client.execute('format', args, token);
+			if (!body) {
+				return undefined;
+			}
+			edits = body;
+		} catch {
+			return undefined;
+		}
+
+		return edits.map(typeConverters.TextEdit.fromCodeEdit);
 	}
 
 	public async provideOnTypeFormattingEdits(
@@ -72,22 +51,20 @@ class TypeScriptFormattingProvider implements vscode.DocumentRangeFormattingEdit
 		options: vscode.FormattingOptions,
 		token: vscode.CancellationToken
 	): Promise<vscode.TextEdit[]> {
-		const filepath = this.client.toPath(document.uri);
-		if (!filepath) {
+		const file = this.client.toPath(document.uri);
+		if (!file) {
 			return [];
 		}
 
 		await this.formattingOptionsManager.ensureConfigurationOptions(document, options, token);
 
 		const args: Proto.FormatOnKeyRequestArgs = {
-			file: filepath,
-			line: position.line + 1,
-			offset: position.character + 1,
+			...typeConverters.Position.toFileLocationRequestArgs(file, position),
 			key: ch
 		};
 		try {
-			const response = await this.client.execute('formatonkey', args, token);
-			const edits = response.body;
+			const { body } = await this.client.execute('formatonkey', args, token);
+			const edits = body;
 			const result: vscode.TextEdit[] = [];
 			if (!edits) {
 				return result;
diff --git a/extensions/typescript-language-features/src/features/hover.ts b/extensions/typescript-language-features/src/features/hover.ts
index e6fce8635c1..19f78ee5f33 100644
--- a/extensions/typescript-language-features/src/features/hover.ts
+++ b/extensions/typescript-language-features/src/features/hover.ts
@@ -4,12 +4,12 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as vscode from 'vscode';
-
 import * as Proto from '../protocol';
 import { ITypeScriptServiceClient } from '../typescriptService';
 import { tagsMarkdownPreview } from '../utils/previewer';
 import * as typeConverters from '../utils/typeConverters';
 
+
 class TypeScriptHoverProvider implements vscode.HoverProvider {
 
 	public constructor(
@@ -25,14 +25,14 @@ class TypeScriptHoverProvider implements vscode.HoverProvider {
 		if (!filepath) {
 			return undefined;
 		}
+
 		const args = typeConverters.Position.toFileLocationRequestArgs(filepath, position);
 		try {
-			const response = await this.client.execute('quickinfo', args, token);
-			if (response && response.body) {
-				const data = response.body;
+			const { body } = await this.client.interuptGetErr(() => this.client.execute('quickinfo', args, token));
+			if (body) {
 				return new vscode.Hover(
-					TypeScriptHoverProvider.getContents(data),
-					typeConverters.Range.fromTextSpan(data));
+					TypeScriptHoverProvider.getContents(body),
+					typeConverters.Range.fromTextSpan(body));
 			}
 		} catch (e) {
 			// noop
diff --git a/extensions/typescript-language-features/src/features/implementations.ts b/extensions/typescript-language-features/src/features/implementations.ts
index c2627a35244..d750587ea8d 100644
--- a/extensions/typescript-language-features/src/features/implementations.ts
+++ b/extensions/typescript-language-features/src/features/implementations.ts
@@ -10,7 +10,7 @@ import { VersionDependentRegistration } from '../utils/dependentRegistration';
 import DefinitionProviderBase from './definitionProviderBase';
 
 class TypeScriptImplementationProvider extends DefinitionProviderBase implements vscode.ImplementationProvider {
-	public provideImplementation(document: vscode.TextDocument, position: vscode.Position, token: vscode.CancellationToken | boolean): Promise<vscode.Definition | undefined> {
+	public provideImplementation(document: vscode.TextDocument, position: vscode.Position, token: vscode.CancellationToken): Promise<vscode.Definition | undefined> {
 		return this.getSymbolLocations('implementation', document, position, token);
 	}
 }
diff --git a/extensions/typescript-language-features/src/features/implementationsCodeLens.ts b/extensions/typescript-language-features/src/features/implementationsCodeLens.ts
index 8bb4cfa2e8b..32559e09e21 100644
--- a/extensions/typescript-language-features/src/features/implementationsCodeLens.ts
+++ b/extensions/typescript-language-features/src/features/implementationsCodeLens.ts
@@ -10,50 +10,45 @@ import * as PConst from '../protocol.const';
 import { ITypeScriptServiceClient } from '../typescriptService';
 import API from '../utils/api';
 import { ConfigurationDependentRegistration, VersionDependentRegistration } from '../utils/dependentRegistration';
-import * as typeConverters from '../utils/typeConverters';
 import { CachedNavTreeResponse, ReferencesCodeLens, TypeScriptBaseCodeLensProvider } from './baseCodeLensProvider';
 const localize = nls.loadMessageBundle();
 
 export default class TypeScriptImplementationsCodeLensProvider extends TypeScriptBaseCodeLensProvider {
 
-	public resolveCodeLens(inputCodeLens: vscode.CodeLens, token: vscode.CancellationToken): Promise<vscode.CodeLens> {
+	public async resolveCodeLens(
+		inputCodeLens: vscode.CodeLens,
+		_token: vscode.CancellationToken,
+	): Promise<vscode.CodeLens> {
 		const codeLens = inputCodeLens as ReferencesCodeLens;
-		const args = typeConverters.Position.toFileLocationRequestArgs(codeLens.file, codeLens.range.start);
-		return this.client.execute('implementation', args, token).then(response => {
-			if (!response || !response.body) {
-				throw codeLens;
+		try {
+			const locations: vscode.Location[] | undefined = await vscode.commands.executeCommand<vscode.Location[]>('vscode.executeImplementationProvider', codeLens.document, codeLens.range.start);
+			if (locations) {
+				codeLens.command = this.getCommand(locations, codeLens);
+				return codeLens;
 			}
+		} catch {
+			// noop
+		}
 
-			const locations = response.body
-				.map(reference =>
-					// Only take first line on implementation: https://github.com/Microsoft/vscode/issues/23924
-					new vscode.Location(this.client.toResource(reference.file),
-						reference.start.line === reference.end.line
-							? typeConverters.Range.fromTextSpan(reference)
-							: new vscode.Range(
-								reference.start.line - 1, reference.start.offset - 1,
-								reference.start.line, 0)))
-				// Exclude original from implementations
-				.filter(location =>
-					!(location.uri.toString() === codeLens.document.toString() &&
-						location.range.start.line === codeLens.range.start.line &&
-						location.range.start.character === codeLens.range.start.character));
+		codeLens.command = {
+			title: localize('implementationsErrorLabel', 'Could not determine implementations'),
+			command: ''
+		};
+		return codeLens;
+	}
 
-			codeLens.command = {
-				title: locations.length === 1
-					? localize('oneImplementationLabel', '1 implementation')
-					: localize('manyImplementationLabel', '{0} implementations', locations.length),
-				command: locations.length ? 'editor.action.showReferences' : '',
-				arguments: [codeLens.document, codeLens.range.start, locations]
-			};
-			return codeLens;
-		}).catch(() => {
-			codeLens.command = {
-				title: localize('implementationsErrorLabel', 'Could not determine implementations'),
-				command: ''
-			};
-			return codeLens;
-		});
+	private getCommand(locations: vscode.Location[], codeLens: ReferencesCodeLens): vscode.Command | undefined {
+		return {
+			title: this.getTitle(locations),
+			command: locations.length ? 'editor.action.showReferences' : '',
+			arguments: [codeLens.document, codeLens.range.start, locations]
+		};
+	}
+
+	private getTitle(locations: vscode.Location[]): string {
+		return locations.length === 1
+			? localize('oneImplementationLabel', '1 implementation')
+			: localize('manyImplementationLabel', '{0} implementations', locations.length);
 	}
 
 	protected extractSymbol(
diff --git a/extensions/typescript-language-features/src/features/jsDocCompletions.ts b/extensions/typescript-language-features/src/features/jsDocCompletions.ts
index b8683b81e77..e251e37542e 100644
--- a/extensions/typescript-language-features/src/features/jsDocCompletions.ts
+++ b/extensions/typescript-language-features/src/features/jsDocCompletions.ts
@@ -3,192 +3,102 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationToken, CompletionItem, CompletionItemKind, CompletionItemProvider, Disposable, DocumentSelector, languages, Position, Range, SnippetString, TextDocument, TextEditor, Uri, window } from 'vscode';
+import * as vscode from 'vscode';
 import * as nls from 'vscode-nls';
 import * as Proto from '../protocol';
 import { ITypeScriptServiceClient } from '../typescriptService';
-import { Command, CommandManager } from '../utils/commandManager';
 import { ConfigurationDependentRegistration } from '../utils/dependentRegistration';
 import * as typeConverters from '../utils/typeConverters';
 
 
 const localize = nls.loadMessageBundle();
 
-class JsDocCompletionItem extends CompletionItem {
+const defaultJsDoc = new vscode.SnippetString(`/**\n * $0\n */`);
+
+class JsDocCompletionItem extends vscode.CompletionItem {
 	constructor(
-		document: TextDocument,
-		position: Position
+		public readonly document: vscode.TextDocument,
+		public readonly position: vscode.Position
 	) {
-		super('/** */', CompletionItemKind.Snippet);
+		super('/** */', vscode.CompletionItemKind.Snippet);
 		this.detail = localize('typescript.jsDocCompletionItem.documentation', 'JSDoc comment');
-		this.insertText = '';
 		this.sortText = '\0';
 
 		const line = document.lineAt(position.line).text;
 		const prefix = line.slice(0, position.character).match(/\/\**\s*$/);
 		const suffix = line.slice(position.character).match(/^\s*\**\//);
 		const start = position.translate(0, prefix ? -prefix[0].length : 0);
-		this.range = new Range(
+		this.range = new vscode.Range(
 			start,
 			position.translate(0, suffix ? suffix[0].length : 0));
-
-		this.command = {
-			title: 'Try Complete JSDoc',
-			command: TryCompleteJsDocCommand.COMMAND_NAME,
-			arguments: [document.uri, start]
-		};
 	}
 }
 
-class JsDocCompletionProvider implements CompletionItemProvider {
+class JsDocCompletionProvider implements vscode.CompletionItemProvider {
 
 	constructor(
 		private readonly client: ITypeScriptServiceClient,
-		commandManager: CommandManager
-	) {
-		commandManager.register(new TryCompleteJsDocCommand(client));
-	}
+	) { }
 
 	public async provideCompletionItems(
-		document: TextDocument,
-		position: Position,
-		token: CancellationToken
-	): Promise<CompletionItem[]> {
+		document: vscode.TextDocument,
+		position: vscode.Position,
+		token: vscode.CancellationToken
+	): Promise<vscode.CompletionItem[] | undefined> {
 		const file = this.client.toPath(document.uri);
 		if (!file) {
-			return [];
+			return undefined;
 		}
 
-		if (!this.isValidCursorPosition(document, position)) {
-			return [];
+		if (!this.isPotentiallyValidDocCompletionPosition(document, position)) {
+			return undefined;
 		}
 
-		if (!await this.isCommentableLocation(file, position, token)) {
-			return [];
+		const args = typeConverters.Position.toFileLocationRequestArgs(file, position);
+		let res: Proto.DocCommandTemplateResponse | undefined;
+		try {
+			res = await this.client.execute('docCommentTemplate', args, token);
+		} catch {
+			return undefined;
 		}
 
-		return [new JsDocCompletionItem(document, position)];
+		if (!res.body) {
+			return undefined;
+		}
+
+		const item = new JsDocCompletionItem(document, position);
+
+		// Workaround for #43619
+		// docCommentTemplate previously returned undefined for empty jsdoc templates.
+		// TS 2.7 now returns a single line doc comment, which breaks indentation.
+		if (res.body.newText === '/** */') {
+			item.insertText = defaultJsDoc;
+		} else {
+			item.insertText = templateToSnippet(res.body.newText);
+		}
+
+		return [item];
 	}
 
-	private async isCommentableLocation(
-		file: string,
-		position: Position,
-		token: CancellationToken
-	): Promise<boolean> {
-		const args: Proto.FileRequestArgs = {
-			file
-		};
-		const response = await Promise.race([
-			this.client.execute('navtree', args, token),
-			new Promise<Proto.NavTreeResponse>((resolve) => setTimeout(resolve, 250))
-		]);
-
-		if (!response || !response.body) {
-			return false;
-		}
-
-		const body = response.body;
-
-		function matchesPosition(tree: Proto.NavigationTree): boolean {
-			if (!tree.spans.length) {
-				return false;
-			}
-			const span = typeConverters.Range.fromTextSpan(tree.spans[0]);
-			if (position.line === span.start.line - 1 || position.line === span.start.line) {
-				return true;
-			}
-
-			return tree.childItems ? tree.childItems.some(matchesPosition) : false;
-		}
-
-		return matchesPosition(body);
-	}
-
-	private isValidCursorPosition(document: TextDocument, position: Position): boolean {
+	private isPotentiallyValidDocCompletionPosition(
+		document: vscode.TextDocument,
+		position: vscode.Position
+	): boolean {
 		// Only show the JSdoc completion when the everything before the cursor is whitespace
 		// or could be the opening of a comment
 		const line = document.lineAt(position.line).text;
 		const prefix = line.slice(0, position.character);
-		return prefix.match(/^\s*$|\/\*\*\s*$|^\s*\/\*\*+\s*$/) !== null;
-	}
+		if (prefix.match(/^\s*$|\/\*\*\s*$|^\s*\/\*\*+\s*$/) === null) {
+			return false;
+		}
 
-	public resolveCompletionItem(item: CompletionItem, _token: CancellationToken) {
-		return item;
+		// And everything after is possibly a closing comment or more whitespace
+		const suffix = line.slice(position.character);
+		return suffix.match(/^\s*\*+\//) !== null;
 	}
 }
 
-class TryCompleteJsDocCommand implements Command {
-	public static readonly COMMAND_NAME = '_typeScript.tryCompleteJsDoc';
-	public readonly id = TryCompleteJsDocCommand.COMMAND_NAME;
-
-	constructor(
-		private readonly client: ITypeScriptServiceClient
-	) { }
-
-	/**
-	 * Try to insert a jsdoc comment, using a template provide by typescript
-	 * if possible, otherwise falling back to a default comment format.
-	 */
-	public async execute(resource: Uri, start: Position): Promise<boolean> {
-		const file = this.client.toPath(resource);
-		if (!file) {
-			return false;
-		}
-
-		const editor = window.activeTextEditor;
-		if (!editor || editor.document.uri.fsPath !== resource.fsPath) {
-			return false;
-		}
-
-		const didInsertFromTemplate = await this.tryInsertJsDocFromTemplate(editor, file, start);
-		if (didInsertFromTemplate) {
-			return true;
-		}
-
-		return this.tryInsertDefaultDoc(editor, start);
-	}
-
-	private async tryInsertJsDocFromTemplate(editor: TextEditor, file: string, position: Position): Promise<boolean> {
-		const snippet = await TryCompleteJsDocCommand.getSnippetTemplate(this.client, file, position);
-		if (!snippet) {
-			return false;
-		}
-		return editor.insertSnippet(
-			snippet,
-			position,
-			{ undoStopBefore: false, undoStopAfter: true });
-	}
-
-	public static getSnippetTemplate(client: ITypeScriptServiceClient, file: string, position: Position): Promise<SnippetString | undefined> {
-		const args = typeConverters.Position.toFileLocationRequestArgs(file, position);
-		return Promise.race([
-			client.execute('docCommentTemplate', args),
-			new Promise<Proto.DocCommandTemplateResponse>((_, reject) => setTimeout(reject, 250))
-		]).then((res: Proto.DocCommandTemplateResponse) => {
-			if (!res || !res.body) {
-				return undefined;
-			}
-			// Workaround for #43619
-			// docCommentTemplate previously returned undefined for empty jsdoc templates.
-			// TS 2.7 now returns a single line doc comment, which breaks indentation.
-			if (res.body.newText === '/** */') {
-				return undefined;
-			}
-			return templateToSnippet(res.body.newText);
-		}, () => undefined);
-	}
-
-	/**
-	 * Insert the default JSDoc
-	 */
-	private tryInsertDefaultDoc(editor: TextEditor, position: Position): Thenable<boolean> {
-		const snippet = new SnippetString(`/**\n * $0\n */`);
-		return editor.insertSnippet(snippet, position, { undoStopBefore: false, undoStopAfter: true });
-	}
-}
-
-
-export function templateToSnippet(template: string): SnippetString {
+export function templateToSnippet(template: string): vscode.SnippetString {
 	// TODO: use append placeholder
 	let snippetIndex = 1;
 	template = template.replace(/\$/g, '\\$');
@@ -204,17 +114,16 @@ export function templateToSnippet(template: string): SnippetString {
 		out += post + ` \${${snippetIndex++}}`;
 		return out;
 	});
-	return new SnippetString(template);
+	return new vscode.SnippetString(template);
 }
 
 export function register(
-	selector: DocumentSelector,
+	selector: vscode.DocumentSelector,
 	client: ITypeScriptServiceClient,
-	commandManager: CommandManager
-): Disposable {
+): vscode.Disposable {
 	return new ConfigurationDependentRegistration('jsDocCompletion', 'enabled', () => {
-		return languages.registerCompletionItemProvider(selector,
-			new JsDocCompletionProvider(client, commandManager),
+		return vscode.languages.registerCompletionItemProvider(selector,
+			new JsDocCompletionProvider(client),
 			'*');
 	});
 }
diff --git a/extensions/typescript-language-features/src/features/languageConfiguration.ts b/extensions/typescript-language-features/src/features/languageConfiguration.ts
index fc6fd3269eb..99515964e77 100644
--- a/extensions/typescript-language-features/src/features/languageConfiguration.ts
+++ b/extensions/typescript-language-features/src/features/languageConfiguration.ts
@@ -9,14 +9,12 @@
  * ------------------------------------------------------------------------------------------ */
 
 import * as vscode from 'vscode';
-import { disposeAll } from '../utils/dispose';
+import { Disposable } from '../utils/dispose';
 import * as languageModeIds from '../utils/languageModeIds';
 
 const jsTsLanguageConfiguration: vscode.LanguageConfiguration = {
 	indentationRules: {
-		// ^(.*\*/)?\s*\}.*$
-		decreaseIndentPattern: /^((?!.*?\/\*).*\*\/)?\s*[\}\]\)].*$/,
-		// ^.*\{[^}"']*$
+		decreaseIndentPattern: /^((?!.*?\/\*).*\*\/)?\s*[\}\]].*$/,
 		increaseIndentPattern: /^((?!\/\/).)*(\{[^}"'`]*|\([^)"'`]*|\[[^\]"'`]*)$/
 	},
 	wordPattern: /(-?\d*\.\d\w*)|([^\`\~\!\@\#\%\^\&\*\(\)\-\=\+\[\{\]\}\\\|\;\:\'\"\,\.\<\>\/\?\s]+)/g,
@@ -65,10 +63,10 @@ const jsxTagsLanguageConfiguration: vscode.LanguageConfiguration = {
 	],
 };
 
-export class LanguageConfigurationManager {
-	private readonly _registrations: vscode.Disposable[] = [];
+export class LanguageConfigurationManager extends Disposable {
 
 	constructor() {
+		super();
 		const standardLanguages = [
 			languageModeIds.javascript,
 			languageModeIds.javascriptreact,
@@ -83,10 +81,6 @@ export class LanguageConfigurationManager {
 	}
 
 	private registerConfiguration(language: string, config: vscode.LanguageConfiguration) {
-		this._registrations.push(vscode.languages.setLanguageConfiguration(language, config));
-	}
-
-	dispose() {
-		disposeAll(this._registrations);
+		this._register(vscode.languages.setLanguageConfiguration(language, config));
 	}
 }
diff --git a/extensions/typescript-language-features/src/features/organizeImports.ts b/extensions/typescript-language-features/src/features/organizeImports.ts
index 7d8697903a7..302da37e8fe 100644
--- a/extensions/typescript-language-features/src/features/organizeImports.ts
+++ b/extensions/typescript-language-features/src/features/organizeImports.ts
@@ -7,11 +7,13 @@ import * as vscode from 'vscode';
 import * as nls from 'vscode-nls';
 import * as Proto from '../protocol';
 import { ITypeScriptServiceClient } from '../typescriptService';
+import API from '../utils/api';
 import { Command, CommandManager } from '../utils/commandManager';
+import { VersionDependentRegistration } from '../utils/dependentRegistration';
 import * as typeconverts from '../utils/typeConverters';
 import FileConfigurationManager from './fileConfigurationManager';
-import { VersionDependentRegistration } from '../utils/dependentRegistration';
-import API from '../utils/api';
+import TelemetryReporter from '../utils/telemetry';
+import { nulToken } from '../utils/cancellation';
 
 const localize = nls.loadMessageBundle();
 
@@ -22,10 +24,20 @@ class OrganizeImportsCommand implements Command {
 	public readonly id = OrganizeImportsCommand.Id;
 
 	constructor(
-		private readonly client: ITypeScriptServiceClient
+		private readonly client: ITypeScriptServiceClient,
+		private readonly telemetryReporter: TelemetryReporter,
 	) { }
 
 	public async execute(file: string): Promise<boolean> {
+		/* __GDPR__
+			"organizeImports.execute" : {
+				"${include}": [
+					"${TypeScriptCommonProperties}"
+				]
+			}
+		*/
+		this.telemetryReporter.logTelemetry('organizeImports.execute', {});
+
 		const args: Proto.OrganizeImportsRequestArgs = {
 			scope: {
 				type: 'file',
@@ -34,13 +46,9 @@ class OrganizeImportsCommand implements Command {
 				}
 			}
 		};
-		const response = await this.client.execute('organizeImports', args);
-		if (!response || !response.success) {
-			return false;
-		}
-
-		const edits = typeconverts.WorkspaceEdit.fromFromFileCodeEdits(this.client, response.body);
-		return await vscode.workspace.applyEdit(edits);
+		const { body } = await this.client.execute('organizeImports', args, nulToken);
+		const edits = typeconverts.WorkspaceEdit.fromFileCodeEdits(this.client, body);
+		return vscode.workspace.applyEdit(edits);
 	}
 }
 
@@ -49,8 +57,10 @@ export class OrganizeImportsCodeActionProvider implements vscode.CodeActionProvi
 		private readonly client: ITypeScriptServiceClient,
 		commandManager: CommandManager,
 		private readonly fileConfigManager: FileConfigurationManager,
+		telemetryReporter: TelemetryReporter,
+
 	) {
-		commandManager.register(new OrganizeImportsCommand(client));
+		commandManager.register(new OrganizeImportsCommand(client, telemetryReporter));
 	}
 
 	public readonly metadata: vscode.CodeActionProviderMetadata = {
@@ -60,7 +70,7 @@ export class OrganizeImportsCodeActionProvider implements vscode.CodeActionProvi
 	public provideCodeActions(
 		document: vscode.TextDocument,
 		_range: vscode.Range,
-		_context: vscode.CodeActionContext,
+		context: vscode.CodeActionContext,
 		token: vscode.CancellationToken
 	): vscode.CodeAction[] {
 		const file = this.client.toPath(document.uri);
@@ -68,6 +78,10 @@ export class OrganizeImportsCodeActionProvider implements vscode.CodeActionProvi
 			return [];
 		}
 
+		if (!context.only || !context.only.contains(vscode.CodeActionKind.SourceOrganizeImports)) {
+			return [];
+		}
+
 		this.fileConfigManager.ensureConfigurationForDocument(document, token);
 
 		const action = new vscode.CodeAction(
@@ -82,10 +96,11 @@ export function register(
 	selector: vscode.DocumentSelector,
 	client: ITypeScriptServiceClient,
 	commandManager: CommandManager,
-	fileConfigurationManager: FileConfigurationManager
+	fileConfigurationManager: FileConfigurationManager,
+	telemetryReporter: TelemetryReporter,
 ) {
 	return new VersionDependentRegistration(client, API.v280, () => {
-		const organizeImportsProvider = new OrganizeImportsCodeActionProvider(client, commandManager, fileConfigurationManager);
+		const organizeImportsProvider = new OrganizeImportsCodeActionProvider(client, commandManager, fileConfigurationManager, telemetryReporter);
 		return vscode.languages.registerCodeActionsProvider(selector,
 			organizeImportsProvider,
 			organizeImportsProvider.metadata);
diff --git a/extensions/typescript-language-features/src/features/quickFix.ts b/extensions/typescript-language-features/src/features/quickFix.ts
index 8a9762def39..769f08cb51a 100644
--- a/extensions/typescript-language-features/src/features/quickFix.ts
+++ b/extensions/typescript-language-features/src/features/quickFix.ts
@@ -10,10 +10,12 @@ import { ITypeScriptServiceClient } from '../typescriptService';
 import API from '../utils/api';
 import { applyCodeActionCommands, getEditForCodeAction } from '../utils/codeAction';
 import { Command, CommandManager } from '../utils/commandManager';
+import { VersionDependentRegistration } from '../utils/dependentRegistration';
 import TelemetryReporter from '../utils/telemetry';
 import * as typeConverters from '../utils/typeConverters';
 import { DiagnosticsManager } from './diagnostics';
 import FileConfigurationManager from './fileConfigurationManager';
+import { nulToken } from '../utils/cancellation';
 
 const localize = nls.loadMessageBundle();
 
@@ -29,20 +31,19 @@ class ApplyCodeActionCommand implements Command {
 	public async execute(
 		action: Proto.CodeFixAction
 	): Promise<boolean> {
-		if (action.fixName) {
-			/* __GDPR__
-				"quickFix.execute" : {
-					"fixName" : { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" },
-					"${include}": [
-						"${TypeScriptCommonProperties}"
-					]
-				}
-			*/
-			this.telemetryReporter.logTelemetry('quickFix.execute', {
-				fixName: action.fixName
-			});
-		}
-		return applyCodeActionCommands(this.client, action);
+		/* __GDPR__
+			"quickFix.execute" : {
+				"fixName" : { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" },
+				"${include}": [
+					"${TypeScriptCommonProperties}"
+				]
+			}
+		*/
+		this.telemetryReporter.logTelemetry('quickFix.execute', {
+			fixName: action.fixName
+		});
+
+		return applyCodeActionCommands(this.client, action.commands, nulToken);
 	}
 }
 
@@ -64,19 +65,17 @@ class ApplyFixAllCodeAction implements Command {
 			return;
 		}
 
-		if (tsAction.fixName) {
-			/* __GDPR__
-				"quickFixAll.execute" : {
-					"fixName" : { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" },
-					"${include}": [
-						"${TypeScriptCommonProperties}"
-					]
-				}
-			*/
-			this.telemetryReporter.logTelemetry('quickFixAll.execute', {
-				fixName: tsAction.fixName
-			});
-		}
+		/* __GDPR__
+			"quickFixAll.execute" : {
+				"fixName" : { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" },
+				"${include}": [
+					"${TypeScriptCommonProperties}"
+				]
+			}
+		*/
+		this.telemetryReporter.logTelemetry('quickFixAll.execute', {
+			fixName: tsAction.fixName
+		});
 
 		const args: Proto.GetCombinedCodeFixRequestArgs = {
 			scope: {
@@ -87,17 +86,14 @@ class ApplyFixAllCodeAction implements Command {
 		};
 
 		try {
-			const combinedCodeFixesResponse = await this.client.execute('getCombinedCodeFix', args);
-			if (!combinedCodeFixesResponse.body) {
+			const { body } = await this.client.execute('getCombinedCodeFix', args, nulToken);
+			if (!body) {
 				return;
 			}
 
-			const edit = typeConverters.WorkspaceEdit.fromFromFileCodeEdits(this.client, combinedCodeFixesResponse.body.changes);
+			const edit = typeConverters.WorkspaceEdit.fromFileCodeEdits(this.client, body.changes);
 			await vscode.workspace.applyEdit(edit);
-
-			if (combinedCodeFixesResponse.command) {
-				await vscode.commands.executeCommand(ApplyCodeActionCommand.ID, combinedCodeFixesResponse.command);
-			}
+			await applyCodeActionCommands(this.client, body.commands, nulToken);
 		} catch {
 			// noop
 		}
@@ -128,6 +124,34 @@ class DiagnosticsSet {
 	public get values(): Iterable<vscode.Diagnostic> {
 		return this._values.values();
 	}
+
+	public get size() {
+		return this._values.size;
+	}
+}
+
+class CodeActionSet {
+	private _actions: vscode.CodeAction[] = [];
+	private _fixAllActions = new Set<{}>();
+
+	public get values() {
+		return this._actions;
+	}
+
+	public addAction(action: vscode.CodeAction) {
+		this._actions.push(action);
+	}
+
+	public addFixAllAction(fixId: {}, action: vscode.CodeAction) {
+		if (!this.hasFixAllAction(fixId)) {
+			this.addAction(action);
+			this._fixAllActions.add(fixId);
+		}
+	}
+
+	public hasFixAllAction(fixId: {}) {
+		return this._fixAllActions.has(fixId);
+	}
 }
 
 class SupportedCodeActionProvider {
@@ -137,15 +161,14 @@ class SupportedCodeActionProvider {
 		private readonly client: ITypeScriptServiceClient
 	) { }
 
-	public async getFixableDiagnosticsForContext(context: vscode.CodeActionContext): Promise<vscode.Diagnostic[]> {
+	public async getFixableDiagnosticsForContext(context: vscode.CodeActionContext): Promise<DiagnosticsSet> {
 		const supportedActions = await this.supportedCodeActions;
-		const fixableDiagnostics = DiagnosticsSet.from(context.diagnostics.filter(diagnostic => supportedActions.has(+(diagnostic.code!))));
-		return Array.from(fixableDiagnostics.values);
+		return DiagnosticsSet.from(context.diagnostics.filter(diagnostic => supportedActions.has(+(diagnostic.code!))));
 	}
 
 	private get supportedCodeActions(): Thenable<Set<number>> {
 		if (!this._supportedCodeActions) {
-			this._supportedCodeActions = this.client.execute('getSupportedCodeFixes', null, undefined)
+			this._supportedCodeActions = this.client.execute('getSupportedCodeFixes', null, nulToken)
 				.then(response => response.body || [])
 				.then(codes => codes.map(code => +code).filter(code => !isNaN(code)))
 				.then(codes => new Set(codes));
@@ -156,6 +179,10 @@ class SupportedCodeActionProvider {
 
 class TypeScriptQuickFixProvider implements vscode.CodeActionProvider {
 
+	public static readonly metadata: vscode.CodeActionProviderMetadata = {
+		providedCodeActionKinds: [vscode.CodeActionKind.QuickFix]
+	};
+
 	private readonly supportedCodeActionProvider: SupportedCodeActionProvider;
 
 	constructor(
@@ -177,17 +204,13 @@ class TypeScriptQuickFixProvider implements vscode.CodeActionProvider {
 		context: vscode.CodeActionContext,
 		token: vscode.CancellationToken
 	): Promise<vscode.CodeAction[]> {
-		if (!this.client.apiVersion.gte(API.v213)) {
-			return [];
-		}
-
 		const file = this.client.toPath(document.uri);
 		if (!file) {
 			return [];
 		}
 
 		const fixableDiagnostics = await this.supportedCodeActionProvider.getFixableDiagnosticsForContext(context);
-		if (!fixableDiagnostics.length) {
+		if (!fixableDiagnostics.size) {
 			return [];
 		}
 
@@ -198,7 +221,7 @@ class TypeScriptQuickFixProvider implements vscode.CodeActionProvider {
 		await this.formattingConfigurationManager.ensureConfigurationForDocument(document, token);
 
 		const results: vscode.CodeAction[] = [];
-		for (const diagnostic of fixableDiagnostics) {
+		for (const diagnostic of fixableDiagnostics.values) {
 			results.push(...await this.getFixesForDiagnostic(document, file, diagnostic, token));
 		}
 		return results;
@@ -214,26 +237,28 @@ class TypeScriptQuickFixProvider implements vscode.CodeActionProvider {
 			...typeConverters.Range.toFileRangeRequestArgs(file, diagnostic.range),
 			errorCodes: [+(diagnostic.code!)]
 		};
-		const codeFixesResponse = await this.client.execute('getCodeFixes', args, token);
-		if (codeFixesResponse.body) {
-			const results: vscode.CodeAction[] = [];
-			for (const tsCodeFix of codeFixesResponse.body) {
-				results.push(...await this.getAllFixesForTsCodeAction(document, file, diagnostic, tsCodeFix));
-			}
-			return results;
+		const { body } = await this.client.execute('getCodeFixes', args, token);
+		if (!body) {
+			return [];
 		}
-		return [];
+
+		const results = new CodeActionSet();
+		for (const tsCodeFix of body) {
+			this.addAllFixesForTsCodeAction(results, document, file, diagnostic, tsCodeFix);
+		}
+		return results.values;
 	}
 
-	private async getAllFixesForTsCodeAction(
+	private addAllFixesForTsCodeAction(
+		results: CodeActionSet,
 		document: vscode.TextDocument,
 		file: string,
 		diagnostic: vscode.Diagnostic,
 		tsAction: Proto.CodeAction
-	): Promise<Iterable<vscode.CodeAction>> {
-		const singleFix = this.getSingleFixForTsCodeAction(diagnostic, tsAction);
-		const fixAll = await this.getFixAllForTsCodeAction(document, file, diagnostic, tsAction as Proto.CodeFixAction);
-		return fixAll ? [singleFix, fixAll] : [singleFix];
+	): CodeActionSet {
+		results.addAction(this.getSingleFixForTsCodeAction(diagnostic, tsAction));
+		this.addFixAllForTsCodeAction(results, document, file, diagnostic, tsAction as Proto.CodeFixAction);
+		return results;
 	}
 
 	private getSingleFixForTsCodeAction(
@@ -243,42 +268,41 @@ class TypeScriptQuickFixProvider implements vscode.CodeActionProvider {
 		const codeAction = new vscode.CodeAction(tsAction.description, vscode.CodeActionKind.QuickFix);
 		codeAction.edit = getEditForCodeAction(this.client, tsAction);
 		codeAction.diagnostics = [diagnostic];
-		if (tsAction.commands) {
-			codeAction.command = {
-				command: ApplyCodeActionCommand.ID,
-				arguments: [tsAction],
-				title: tsAction.description
-			};
-		}
+		codeAction.command = {
+			command: ApplyCodeActionCommand.ID,
+			arguments: [tsAction],
+			title: ''
+		};
 		return codeAction;
 	}
 
-	private async getFixAllForTsCodeAction(
+	private addFixAllForTsCodeAction(
+		results: CodeActionSet,
 		document: vscode.TextDocument,
 		file: string,
 		diagnostic: vscode.Diagnostic,
 		tsAction: Proto.CodeFixAction,
-	): Promise<vscode.CodeAction | undefined> {
-		if (!tsAction.fixId || !this.client.apiVersion.gte(API.v270)) {
-			return undefined;
+	): CodeActionSet {
+		if (!tsAction.fixId || !this.client.apiVersion.gte(API.v270) || results.hasFixAllAction(results)) {
+			return results;
 		}
 
 		// Make sure there are multiple diagnostics of the same type in the file
 		if (!this.diagnosticsManager.getDiagnostics(document.uri).some(x => x.code === diagnostic.code && x !== diagnostic)) {
-			return;
+			return results;
 		}
 
 		const action = new vscode.CodeAction(
 			tsAction.fixAllDescription || localize('fixAllInFileLabel', '{0} (Fix all in file)', tsAction.description),
 			vscode.CodeActionKind.QuickFix);
 		action.diagnostics = [diagnostic];
-
 		action.command = {
 			command: ApplyFixAllCodeAction.ID,
 			arguments: [file, tsAction],
 			title: ''
 		};
-		return action;
+		results.addFixAllAction(tsAction.fixId, action);
+		return results;
 	}
 }
 
@@ -290,6 +314,8 @@ export function register(
 	diagnosticsManager: DiagnosticsManager,
 	telemetryReporter: TelemetryReporter
 ) {
-	return vscode.languages.registerCodeActionsProvider(selector,
-		new TypeScriptQuickFixProvider(client, fileConfigurationManager, commandManager, diagnosticsManager, telemetryReporter));
+	return new VersionDependentRegistration(client, API.v213, () =>
+		vscode.languages.registerCodeActionsProvider(selector,
+			new TypeScriptQuickFixProvider(client, fileConfigurationManager, commandManager, diagnosticsManager, telemetryReporter),
+			TypeScriptQuickFixProvider.metadata));
 }
diff --git a/extensions/typescript-language-features/src/features/refactor.ts b/extensions/typescript-language-features/src/features/refactor.ts
index bd65b8481a6..7817a2fef68 100644
--- a/extensions/typescript-language-features/src/features/refactor.ts
+++ b/extensions/typescript-language-features/src/features/refactor.ts
@@ -4,22 +4,24 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as vscode from 'vscode';
-import * as fs from 'fs';
-
 import * as Proto from '../protocol';
 import { ITypeScriptServiceClient } from '../typescriptService';
+import API from '../utils/api';
+import { Command, CommandManager } from '../utils/commandManager';
+import { VersionDependentRegistration } from '../utils/dependentRegistration';
+import TelemetryReporter from '../utils/telemetry';
 import * as typeConverters from '../utils/typeConverters';
 import FormattingOptionsManager from './fileConfigurationManager';
-import { CommandManager, Command } from '../utils/commandManager';
-import { VersionDependentRegistration } from '../utils/dependentRegistration';
-import API from '../utils/api';
+import { nulToken } from '../utils/cancellation';
+
 
 class ApplyRefactoringCommand implements Command {
 	public static readonly ID = '_typescript.applyRefactoring';
 	public readonly id = ApplyRefactoringCommand.ID;
 
 	constructor(
-		private readonly client: ITypeScriptServiceClient
+		private readonly client: ITypeScriptServiceClient,
+		private readonly telemetryReporter: TelemetryReporter
 	) { }
 
 	public async execute(
@@ -29,36 +31,34 @@ class ApplyRefactoringCommand implements Command {
 		action: string,
 		range: vscode.Range
 	): Promise<boolean> {
+		/* __GDPR__
+			"refactor.execute" : {
+				"action" : { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" },
+				"${include}": [
+					"${TypeScriptCommonProperties}"
+				]
+			}
+		*/
+		this.telemetryReporter.logTelemetry('refactor.execute', {
+			action: action
+		});
+
 		const args: Proto.GetEditsForRefactorRequestArgs = {
 			...typeConverters.Range.toFileRangeRequestArgs(file, range),
 			refactor,
 			action
 		};
-		const response = await this.client.execute('getEditsForRefactor', args);
-		if (!response || !response.body || !response.body.edits.length) {
+		const { body } = await this.client.execute('getEditsForRefactor', args, nulToken);
+		if (!body || !body.edits.length) {
 			return false;
 		}
 
-		for (const edit of response.body.edits) {
-			try {
-				await vscode.workspace.openTextDocument(edit.fileName);
-			} catch {
-				try {
-					if (!fs.existsSync(edit.fileName)) {
-						fs.writeFileSync(edit.fileName, '');
-					}
-				} catch {
-					// noop
-				}
-			}
-		}
-
-		const edit = typeConverters.WorkspaceEdit.fromFromFileCodeEdits(this.client, response.body.edits);
-		if (!(await vscode.workspace.applyEdit(edit))) {
+		const workspaceEdit = await this.toWorkspaceEdit(body);
+		if (!(await vscode.workspace.applyEdit(workspaceEdit))) {
 			return false;
 		}
 
-		const renameLocation = response.body.renameLocation;
+		const renameLocation = body.renameLocation;
 		if (renameLocation) {
 			await vscode.commands.executeCommand('editor.action.rename', [
 				document.uri,
@@ -67,6 +67,15 @@ class ApplyRefactoringCommand implements Command {
 		}
 		return true;
 	}
+
+	private async toWorkspaceEdit(body: Proto.RefactorEditInfo) {
+		const workspaceEdit = new vscode.WorkspaceEdit();
+		for (const edit of body.edits) {
+			workspaceEdit.createFile(this.client.toResource(edit.fileName), { ignoreIfExists: true });
+		}
+		typeConverters.WorkspaceEdit.withFileCodeEdits(workspaceEdit, this.client, body.edits);
+		return workspaceEdit;
+	}
 }
 
 class SelectRefactorCommand implements Command {
@@ -102,9 +111,10 @@ class TypeScriptRefactorProvider implements vscode.CodeActionProvider {
 	constructor(
 		private readonly client: ITypeScriptServiceClient,
 		private readonly formattingOptionsManager: FormattingOptionsManager,
-		commandManager: CommandManager
+		commandManager: CommandManager,
+		telemetryReporter: TelemetryReporter
 	) {
-		const doRefactoringCommand = commandManager.register(new ApplyRefactoringCommand(this.client));
+		const doRefactoringCommand = commandManager.register(new ApplyRefactoringCommand(this.client, telemetryReporter));
 		commandManager.register(new SelectRefactorCommand(doRefactoringCommand));
 	}
 
@@ -127,20 +137,21 @@ class TypeScriptRefactorProvider implements vscode.CodeActionProvider {
 			return undefined;
 		}
 
-		await this.formattingOptionsManager.ensureConfigurationForDocument(document, undefined);
+		await this.formattingOptionsManager.ensureConfigurationForDocument(document, token);
 
 		const args: Proto.GetApplicableRefactorsRequestArgs = typeConverters.Range.toFileRangeRequestArgs(file, rangeOrSelection);
-		let response: Proto.GetApplicableRefactorsResponse;
+		let refactorings: Proto.ApplicableRefactorInfo[];
 		try {
-			response = await this.client.execute('getApplicableRefactors', args, token);
-			if (!response || !response.body) {
+			const { body } = await this.client.execute('getApplicableRefactors', args, token);
+			if (!body) {
 				return undefined;
 			}
+			refactorings = body;
 		} catch {
 			return undefined;
 		}
 
-		return this.convertApplicableRefactors(response.body, document, file, rangeOrSelection);
+		return this.convertApplicableRefactors(refactorings, document, file, rangeOrSelection);
 	}
 
 	private convertApplicableRefactors(
@@ -189,7 +200,7 @@ class TypeScriptRefactorProvider implements vscode.CodeActionProvider {
 			return false;
 		}
 
-		return rangeOrSelection instanceof vscode.Selection && (!rangeOrSelection.isEmpty || context.triggerKind === vscode.CodeActionTrigger.Manual);
+		return rangeOrSelection instanceof vscode.Selection && !rangeOrSelection.isEmpty;
 	}
 
 	private static getKind(refactor: Proto.RefactorActionInfo) {
@@ -209,10 +220,11 @@ export function register(
 	client: ITypeScriptServiceClient,
 	formattingOptionsManager: FormattingOptionsManager,
 	commandManager: CommandManager,
+	telemetryReporter: TelemetryReporter,
 ) {
 	return new VersionDependentRegistration(client, API.v240, () => {
 		return vscode.languages.registerCodeActionsProvider(selector,
-			new TypeScriptRefactorProvider(client, formattingOptionsManager, commandManager),
+			new TypeScriptRefactorProvider(client, formattingOptionsManager, commandManager, telemetryReporter),
 			TypeScriptRefactorProvider.metadata);
 	});
 }
diff --git a/extensions/typescript-language-features/src/features/references.ts b/extensions/typescript-language-features/src/features/references.ts
index 4664c1b1ce3..50c62b3b722 100644
--- a/extensions/typescript-language-features/src/features/references.ts
+++ b/extensions/typescript-language-features/src/features/references.ts
@@ -4,10 +4,10 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as vscode from 'vscode';
-
 import { ITypeScriptServiceClient } from '../typescriptService';
-import * as typeConverters from '../utils/typeConverters';
 import API from '../utils/api';
+import * as typeConverters from '../utils/typeConverters';
+
 
 class TypeScriptReferenceSupport implements vscode.ReferenceProvider {
 	public constructor(
@@ -26,13 +26,13 @@ class TypeScriptReferenceSupport implements vscode.ReferenceProvider {
 
 		const args = typeConverters.Position.toFileLocationRequestArgs(filepath, position);
 		try {
-			const msg = await this.client.execute('references', args, token);
-			if (!msg.body) {
+			const { body } = await this.client.execute('references', args, token);
+			if (!body) {
 				return [];
 			}
 			const result: vscode.Location[] = [];
 			const has203Features = this.client.apiVersion.gte(API.v203);
-			for (const ref of msg.body.refs) {
+			for (const ref of body.refs) {
 				if (!options.includeDeclaration && has203Features && ref.isDefinition) {
 					continue;
 				}
diff --git a/extensions/typescript-language-features/src/features/referencesCodeLens.ts b/extensions/typescript-language-features/src/features/referencesCodeLens.ts
index 059d3e9e16e..ea227ac99c1 100644
--- a/extensions/typescript-language-features/src/features/referencesCodeLens.ts
+++ b/extensions/typescript-language-features/src/features/referencesCodeLens.ts
@@ -10,38 +10,33 @@ import * as PConst from '../protocol.const';
 import { ITypeScriptServiceClient } from '../typescriptService';
 import API from '../utils/api';
 import { ConfigurationDependentRegistration, VersionDependentRegistration } from '../utils/dependentRegistration';
-import * as typeConverters from '../utils/typeConverters';
 import { CachedNavTreeResponse, ReferencesCodeLens, TypeScriptBaseCodeLensProvider } from './baseCodeLensProvider';
 
 const localize = nls.loadMessageBundle();
 
 class TypeScriptReferencesCodeLensProvider extends TypeScriptBaseCodeLensProvider {
 
-	public resolveCodeLens(inputCodeLens: vscode.CodeLens, token: vscode.CancellationToken): Promise<vscode.CodeLens> {
+	public resolveCodeLens(inputCodeLens: vscode.CodeLens, _token: vscode.CancellationToken): Thenable<vscode.CodeLens> {
 		const codeLens = inputCodeLens as ReferencesCodeLens;
-		const args = typeConverters.Position.toFileLocationRequestArgs(codeLens.file, codeLens.range.start);
-		return this.client.execute('references', args, token).then(response => {
-			if (!response || !response.body) {
+		return vscode.commands.executeCommand<vscode.Location[]>('vscode.executeReferenceProvider', codeLens.document, codeLens.range.start).then((locations: vscode.Location[] | undefined) => {
+			if (!locations) {
 				throw codeLens;
 			}
 
-			const locations = response.body.refs
-				.map(reference =>
-					typeConverters.Location.fromTextSpan(this.client.toResource(reference.file), reference))
-				.filter(location =>
-					// Exclude original definition from references
-					!(location.uri.toString() === codeLens.document.toString() &&
-						location.range.start.isEqual(codeLens.range.start)));
+			const referenceLocations = locations.filter(location =>
+				// Exclude original definition from references
+				!(location.uri.toString() === codeLens.document.toString() &&
+					location.range.start.isEqual(codeLens.range.start)));
 
 			codeLens.command = {
-				title: locations.length === 1
+				title: referenceLocations.length === 1
 					? localize('oneReferenceLabel', '1 reference')
-					: localize('manyReferenceLabel', '{0} references', locations.length),
-				command: locations.length ? 'editor.action.showReferences' : '',
-				arguments: [codeLens.document, codeLens.range.start, locations]
+					: localize('manyReferenceLabel', '{0} references', referenceLocations.length),
+				command: referenceLocations.length ? 'editor.action.showReferences' : '',
+				arguments: [codeLens.document, codeLens.range.start, referenceLocations]
 			};
 			return codeLens;
-		}).catch(() => {
+		}).then(undefined, () => {
 			codeLens.command = {
 				title: localize('referenceErrorLabel', 'Could not determine references'),
 				command: ''
diff --git a/extensions/typescript-language-features/src/features/rename.ts b/extensions/typescript-language-features/src/features/rename.ts
index 576f7fa62f0..a8589ad988d 100644
--- a/extensions/typescript-language-features/src/features/rename.ts
+++ b/extensions/typescript-language-features/src/features/rename.ts
@@ -4,11 +4,11 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as vscode from 'vscode';
-
 import * as Proto from '../protocol';
 import { ITypeScriptServiceClient } from '../typescriptService';
 import * as typeConverters from '../utils/typeConverters';
 
+
 class TypeScriptRenameProvider implements vscode.RenameProvider {
 	public constructor(
 		private readonly client: ITypeScriptServiceClient
@@ -31,22 +31,22 @@ class TypeScriptRenameProvider implements vscode.RenameProvider {
 			findInComments: false
 		};
 
+		let body: Proto.RenameResponseBody | undefined;
 		try {
-			const response = await this.client.execute('rename', args, token);
-			if (!response.body) {
+			body = (await this.client.execute('rename', args, token)).body;
+			if (!body) {
 				return null;
 			}
-
-			const renameInfo = response.body.info;
-			if (!renameInfo.canRename) {
-				return Promise.reject<vscode.WorkspaceEdit>(renameInfo.localizedErrorMessage);
-			}
-
-			return this.toWorkspaceEdit(response.body.locs, newName);
 		} catch {
 			// noop
+			return null;
 		}
-		return null;
+
+		const renameInfo = body.info;
+		if (!renameInfo.canRename) {
+			return Promise.reject<vscode.WorkspaceEdit>(renameInfo.localizedErrorMessage);
+		}
+		return this.toWorkspaceEdit(body.locs, newName);
 	}
 
 	private toWorkspaceEdit(
diff --git a/extensions/typescript-language-features/src/features/signatureHelp.ts b/extensions/typescript-language-features/src/features/signatureHelp.ts
index b682e0b0367..d5698187e34 100644
--- a/extensions/typescript-language-features/src/features/signatureHelp.ts
+++ b/extensions/typescript-language-features/src/features/signatureHelp.ts
@@ -20,21 +20,25 @@ class TypeScriptSignatureHelpProvider implements vscode.SignatureHelpProvider {
 	public async provideSignatureHelp(
 		document: vscode.TextDocument,
 		position: vscode.Position,
-		token: vscode.CancellationToken
+		token: vscode.CancellationToken,
+		context?: vscode.SignatureHelpContext,
 	): Promise<vscode.SignatureHelp | undefined> {
 		const filepath = this.client.toPath(document.uri);
 		if (!filepath) {
 			return undefined;
 		}
-		const args: Proto.SignatureHelpRequestArgs = typeConverters.Position.toFileLocationRequestArgs(filepath, position);
+		const args: Proto.SignatureHelpRequestArgs = {
+			...typeConverters.Position.toFileLocationRequestArgs(filepath, position),
+			triggerReason: toTsTriggerReason(context!)
+		};
 
-		let info: Proto.SignatureHelpItems | undefined = undefined;
+		let info: Proto.SignatureHelpItems;
 		try {
-			const response = await this.client.execute('signatureHelp', args, token);
-			info = response.body;
-			if (!info) {
+			const { body } = await this.client.execute('signatureHelp', args, token);
+			if (!body) {
 				return undefined;
 			}
+			info = body;
 		} catch {
 			return undefined;
 		}
@@ -71,6 +75,23 @@ class TypeScriptSignatureHelpProvider implements vscode.SignatureHelpProvider {
 	}
 }
 
+function toTsTriggerReason(context: vscode.SignatureHelpContext): Proto.SignatureHelpTriggerReason {
+	switch (context.triggerReason) {
+		case vscode.SignatureHelpTriggerReason.Retrigger:
+			return { kind: 'retrigger' };
+
+		case vscode.SignatureHelpTriggerReason.TriggerCharacter:
+			if (context.triggerCharacter) {
+				return { kind: 'characterTyped', triggerCharacter: context.triggerCharacter as any };
+			} else {
+				return { kind: 'invoked' };
+			}
+
+		case vscode.SignatureHelpTriggerReason.Invoke:
+		default:
+			return { kind: 'invoked' };
+	}
+}
 export function register(
 	selector: vscode.DocumentSelector,
 	client: ITypeScriptServiceClient,
diff --git a/extensions/typescript-language-features/src/features/tagClosing.ts b/extensions/typescript-language-features/src/features/tagClosing.ts
new file mode 100644
index 00000000000..ab9843ae7f2
--- /dev/null
+++ b/extensions/typescript-language-features/src/features/tagClosing.ts
@@ -0,0 +1,169 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as vscode from 'vscode';
+import * as Proto from '../protocol';
+import { ITypeScriptServiceClient } from '../typescriptService';
+import API from '../utils/api';
+import { ConditionalRegistration, ConfigurationDependentRegistration, VersionDependentRegistration } from '../utils/dependentRegistration';
+import { Disposable } from '../utils/dispose';
+import * as typeConverters from '../utils/typeConverters';
+
+class TagClosing extends Disposable {
+
+	private _disposed = false;
+	private _timeout: NodeJS.Timer | undefined = undefined;
+	private _cancel: vscode.CancellationTokenSource | undefined = undefined;
+
+	constructor(
+		private readonly client: ITypeScriptServiceClient
+	) {
+		super();
+		vscode.workspace.onDidChangeTextDocument(
+			event => this.onDidChangeTextDocument(event.document, event.contentChanges),
+			null,
+			this._disposables);
+	}
+
+	public dispose() {
+		super.dispose();
+		this._disposed = true;
+
+		if (this._timeout) {
+			clearTimeout(this._timeout);
+			this._timeout = undefined;
+		}
+
+		if (this._cancel) {
+			this._cancel.cancel();
+			this._cancel.dispose();
+			this._cancel = undefined;
+		}
+	}
+
+	private onDidChangeTextDocument(
+		document: vscode.TextDocument,
+		changes: vscode.TextDocumentContentChangeEvent[]
+	) {
+		const activeDocument = vscode.window.activeTextEditor && vscode.window.activeTextEditor.document;
+		if (document !== activeDocument || changes.length === 0) {
+			return;
+		}
+
+		const filepath = this.client.toPath(document.uri);
+		if (!filepath) {
+			return;
+		}
+
+		if (typeof this._timeout !== 'undefined') {
+			clearTimeout(this._timeout);
+		}
+
+		if (this._cancel) {
+			this._cancel.cancel();
+			this._cancel.dispose();
+			this._cancel = undefined;
+		}
+
+		const lastChange = changes[changes.length - 1];
+		const lastCharacter = lastChange.text[lastChange.text.length - 1];
+		if (lastChange.rangeLength > 0 || lastCharacter !== '>' && lastCharacter !== '/') {
+			return;
+		}
+
+		const priorCharacter = lastChange.range.start.character > 0
+			? document.getText(new vscode.Range(lastChange.range.start.translate({ characterDelta: -1 }), lastChange.range.start))
+			: '';
+		if (priorCharacter === '>') {
+			return;
+		}
+
+		const rangeStart = lastChange.range.start;
+		const version = document.version;
+		this._timeout = setTimeout(async () => {
+			this._timeout = undefined;
+
+			if (this._disposed) {
+				return;
+			}
+
+			let position = new vscode.Position(rangeStart.line, rangeStart.character + lastChange.text.length);
+			let insertion: Proto.TextInsertion;
+			const args: Proto.JsxClosingTagRequestArgs = typeConverters.Position.toFileLocationRequestArgs(filepath, position);
+
+			this._cancel = new vscode.CancellationTokenSource();
+			try {
+				const { body } = await this.client.execute('jsxClosingTag', args, this._cancel.token);
+				if (!body) {
+					return;
+				}
+				insertion = body;
+			} catch {
+				return;
+			}
+
+			if (this._disposed) {
+				return;
+			}
+
+			const activeEditor = vscode.window.activeTextEditor;
+			if (!activeEditor) {
+				return;
+			}
+
+			const activeDocument = activeEditor.document;
+			if (document === activeDocument && activeDocument.version === version) {
+				activeEditor.insertSnippet(
+					this.getTagSnippet(insertion),
+					this.getInsertionPositions(activeEditor, position));
+			}
+		}, 100);
+	}
+
+	private getTagSnippet(closingTag: Proto.TextInsertion): vscode.SnippetString {
+		const snippet = new vscode.SnippetString();
+		snippet.appendPlaceholder('', 0);
+		snippet.appendText(closingTag.newText);
+		return snippet;
+	}
+
+	private getInsertionPositions(editor: vscode.TextEditor, position: vscode.Position) {
+		const activeSelectionPositions = editor.selections.map(s => s.active);
+		return activeSelectionPositions.some(p => p.isEqual(position))
+			? activeSelectionPositions
+			: position;
+	}
+}
+
+export class ActiveDocumentDependentRegistration extends Disposable {
+	private readonly _registration: ConditionalRegistration;
+
+	constructor(
+		private readonly selector: vscode.DocumentSelector,
+		register: () => vscode.Disposable,
+	) {
+		super();
+		this._registration = this._register(new ConditionalRegistration(register));
+		vscode.window.onDidChangeActiveTextEditor(this.update, this, this._disposables);
+		this.update();
+	}
+
+	private update() {
+		const editor = vscode.window.activeTextEditor;
+		const enabled = !!(editor && vscode.languages.match(this.selector, editor.document));
+		this._registration.update(enabled);
+	}
+}
+
+export function register(
+	selector: vscode.DocumentSelector,
+	modeId: string,
+	client: ITypeScriptServiceClient,
+) {
+	return new VersionDependentRegistration(client, API.v300, () =>
+		new ConfigurationDependentRegistration(modeId, 'autoClosingTags', () =>
+			new ActiveDocumentDependentRegistration(selector, () =>
+				new TagClosing(client))));
+}
diff --git a/extensions/typescript-language-features/src/features/task.ts b/extensions/typescript-language-features/src/features/task.ts
index c0d7fb00511..e819a1c092b 100644
--- a/extensions/typescript-language-features/src/features/task.ts
+++ b/extensions/typescript-language-features/src/features/task.ts
@@ -8,14 +8,14 @@
 import * as fs from 'fs';
 import * as path from 'path';
 import * as vscode from 'vscode';
-
+import * as nls from 'vscode-nls';
 import * as Proto from '../protocol';
 import { ITypeScriptServiceClient } from '../typescriptService';
-import TsConfigProvider, { TSConfig } from '../utils/tsconfigProvider';
-import { isImplicitProjectConfigFile } from '../utils/tsconfig';
-
-import * as nls from 'vscode-nls';
 import { Lazy } from '../utils/lazy';
+import { isImplicitProjectConfigFile } from '../utils/tsconfig';
+import TsConfigProvider, { TSConfig } from '../utils/tsconfigProvider';
+
+
 const localize = nls.loadMessageBundle();
 
 type AutoDetect = 'on' | 'off' | 'build' | 'watch';
@@ -78,7 +78,10 @@ class TscTaskProvider implements vscode.TaskProvider {
 
 	private async getAllTsConfigs(token: vscode.CancellationToken): Promise<TSConfig[]> {
 		const out = new Set<TSConfig>();
-		const configs = (await this.getTsConfigForActiveFile(token)).concat(await this.getTsConfigsInWorkspace());
+		const configs = [
+			...await this.getTsConfigForActiveFile(token),
+			...await this.getTsConfigsInWorkspace()
+		];
 		for (const config of configs) {
 			if (await exists(config.path)) {
 				out.add(config);
diff --git a/extensions/typescript-language-features/src/features/tsconfig.ts b/extensions/typescript-language-features/src/features/tsconfig.ts
new file mode 100644
index 00000000000..a7e89ea1332
--- /dev/null
+++ b/extensions/typescript-language-features/src/features/tsconfig.ts
@@ -0,0 +1,115 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as jsonc from 'jsonc-parser';
+import { dirname, join, basename } from 'path';
+import * as vscode from 'vscode';
+import { flatten } from '../utils/arrays';
+
+function mapChildren<R>(node: jsonc.Node | undefined, f: (x: jsonc.Node) => R): R[] {
+	return node && node.type === 'array' && node.children
+		? node.children.map(f)
+		: [];
+}
+
+class TsconfigLinkProvider implements vscode.DocumentLinkProvider {
+
+	public provideDocumentLinks(
+		document: vscode.TextDocument,
+		_token: vscode.CancellationToken
+	): vscode.ProviderResult<vscode.DocumentLink[]> {
+		const root = jsonc.parseTree(document.getText());
+		if (!root) {
+			return null;
+		}
+
+		return [
+			this.getExendsLink(document, root),
+			...this.getFilesLinks(document, root),
+			...this.getReferencesLinks(document, root)
+		].filter(x => !!x) as vscode.DocumentLink[];
+	}
+
+	private getExendsLink(document: vscode.TextDocument, root: jsonc.Node): vscode.DocumentLink | undefined {
+		const extendsNode = jsonc.findNodeAtLocation(root, ['extends']);
+		if (!this.isPathValue(extendsNode)) {
+			return undefined;
+		}
+
+		return new vscode.DocumentLink(
+			this.getRange(document, extendsNode),
+			basename(extendsNode.value).match('.json$')
+				? this.getFileTarget(document, extendsNode)
+				: vscode.Uri.file(join(dirname(document.uri.fsPath), extendsNode!.value + '.json')));
+	}
+
+	private getFilesLinks(document: vscode.TextDocument, root: jsonc.Node) {
+		return mapChildren(
+			jsonc.findNodeAtLocation(root, ['files']),
+			child => this.pathNodeToLink(document, child));
+	}
+
+	private getReferencesLinks(document: vscode.TextDocument, root: jsonc.Node) {
+		return mapChildren(
+			jsonc.findNodeAtLocation(root, ['references']),
+			child => {
+				const pathNode = jsonc.findNodeAtLocation(child, ['path']);
+				if (!this.isPathValue(pathNode)) {
+					return undefined;
+				}
+
+				return new vscode.DocumentLink(this.getRange(document, pathNode),
+					basename(pathNode.value).match('.json$')
+						? this.getFileTarget(document, pathNode)
+						: this.getFolderTarget(document, pathNode));
+			});
+	}
+
+	private pathNodeToLink(
+		document: vscode.TextDocument,
+		node: jsonc.Node | undefined
+	): vscode.DocumentLink | undefined {
+		return this.isPathValue(node)
+			? new vscode.DocumentLink(this.getRange(document, node), this.getFileTarget(document, node))
+			: undefined;
+	}
+
+	private isPathValue(extendsNode: jsonc.Node | undefined): extendsNode is jsonc.Node {
+		return extendsNode
+			&& extendsNode.type === 'string'
+			&& extendsNode.value
+			&& !(extendsNode.value as string).includes('*'); // don't treat globs as links.
+	}
+
+	private getFileTarget(document: vscode.TextDocument, node: jsonc.Node): vscode.Uri {
+		return vscode.Uri.file(join(dirname(document.uri.fsPath), node!.value));
+	}
+
+	private getFolderTarget(document: vscode.TextDocument, node: jsonc.Node): vscode.Uri {
+		return vscode.Uri.file(join(dirname(document.uri.fsPath), node!.value, 'tsconfig.json'));
+	}
+
+	private getRange(document: vscode.TextDocument, node: jsonc.Node) {
+		const offset = node!.offset;
+		const start = document.positionAt(offset + 1);
+		const end = document.positionAt(offset + (node!.length - 1));
+		return new vscode.Range(start, end);
+	}
+}
+
+export function register() {
+	const patterns: vscode.GlobPattern[] = [
+		'**/[jt]sconfig.json',
+		'**/[jt]sconfig.*.json',
+	];
+
+	const languages = ['json', 'jsonc'];
+
+	const selector: vscode.DocumentSelector = flatten(
+		languages.map(language =>
+			patterns.map((pattern): vscode.DocumentFilter => ({ language, pattern }))));
+
+	return vscode.languages.registerDocumentLinkProvider(selector, new TsconfigLinkProvider());
+}
diff --git a/extensions/typescript-language-features/src/features/typeDefinitions.ts b/extensions/typescript-language-features/src/features/typeDefinitions.ts
index 9ec9b48222e..45d89aeaedd 100644
--- a/extensions/typescript-language-features/src/features/typeDefinitions.ts
+++ b/extensions/typescript-language-features/src/features/typeDefinitions.ts
@@ -5,12 +5,12 @@
 
 import * as vscode from 'vscode';
 import { ITypeScriptServiceClient } from '../typescriptService';
+import API from '../utils/api';
 import { VersionDependentRegistration } from '../utils/dependentRegistration';
 import DefinitionProviderBase from './definitionProviderBase';
-import API from '../utils/api';
 
 export default class TypeScriptTypeDefinitionProvider extends DefinitionProviderBase implements vscode.TypeDefinitionProvider {
-	public provideTypeDefinition(document: vscode.TextDocument, position: vscode.Position, token: vscode.CancellationToken | boolean): Promise<vscode.Definition | undefined> {
+	public provideTypeDefinition(document: vscode.TextDocument, position: vscode.Position, token: vscode.CancellationToken): Promise<vscode.Definition | undefined> {
 		return this.getSymbolLocations('typeDefinition', document, position, token);
 	}
 }
diff --git a/extensions/typescript-language-features/src/features/updatePathsOnRename.ts b/extensions/typescript-language-features/src/features/updatePathsOnRename.ts
index e0662805aa6..3d266ef00ec 100644
--- a/extensions/typescript-language-features/src/features/updatePathsOnRename.ts
+++ b/extensions/typescript-language-features/src/features/updatePathsOnRename.ts
@@ -3,15 +3,20 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import * as fs from 'fs';
 import * as path from 'path';
 import * as vscode from 'vscode';
 import * as nls from 'vscode-nls';
 import * as Proto from '../protocol';
 import { ITypeScriptServiceClient } from '../typescriptService';
 import API from '../utils/api';
-import * as languageIds from '../utils/languageModeIds';
+import * as fileSchemes from '../utils/fileSchemes';
+import { isTypeScriptDocument } from '../utils/languageModeIds';
+import { escapeRegExp } from '../utils/regexp';
 import * as typeConverters from '../utils/typeConverters';
 import FileConfigurationManager from './fileConfigurationManager';
+import { VersionDependentRegistration } from '../utils/dependentRegistration';
+import { nulToken } from '../utils/cancellation';
 
 const localize = nls.loadMessageBundle();
 
@@ -23,16 +28,16 @@ enum UpdateImportsOnFileMoveSetting {
 	Never = 'never',
 }
 
-export class UpdateImportsOnFileRenameHandler {
+class UpdateImportsOnFileRenameHandler {
 	private readonly _onDidRenameSub: vscode.Disposable;
 
 	public constructor(
 		private readonly client: ITypeScriptServiceClient,
 		private readonly fileConfigurationManager: FileConfigurationManager,
-		private readonly handles: (uri: vscode.Uri) => Promise<boolean>,
+		private readonly _handles: (uri: vscode.Uri) => Promise<boolean>,
 	) {
-		this._onDidRenameSub = vscode.workspace.onDidRenameResource(e => {
-			this.doRename(e.oldResource, e.newResource);
+		this._onDidRenameSub = vscode.workspace.onDidRenameFile(e => {
+			this.doRename(e.oldUri, e.newUri);
 		});
 	}
 
@@ -44,11 +49,13 @@ export class UpdateImportsOnFileRenameHandler {
 		oldResource: vscode.Uri,
 		newResource: vscode.Uri,
 	): Promise<void> {
-		if (!this.client.apiVersion.gte(API.v290)) {
+		const targetResource = await this.getTargetResource(newResource);
+		if (!targetResource) {
 			return;
 		}
 
-		if (!await this.handles(newResource)) {
+		const targetFile = this.client.toPath(targetResource);
+		if (!targetFile) {
 			return;
 		}
 
@@ -62,7 +69,7 @@ export class UpdateImportsOnFileRenameHandler {
 			return;
 		}
 
-		const document = await vscode.workspace.openTextDocument(newResource);
+		const document = await vscode.workspace.openTextDocument(targetResource);
 
 		const config = this.getConfiguration(document);
 		const setting = config.get<UpdateImportsOnFileMoveSetting>(updateImportsOnFileMoveName);
@@ -71,20 +78,37 @@ export class UpdateImportsOnFileRenameHandler {
 		}
 
 		// Make sure TS knows about file
-		this.client.bufferSyncSupport.closeResource(oldResource);
+		this.client.bufferSyncSupport.closeResource(targetResource);
 		this.client.bufferSyncSupport.openTextDocument(document);
 
-		const edits = await this.getEditsForFileRename(document, oldFile, newFile);
+		if (!this.client.apiVersion.gte(API.v300) && !fs.lstatSync(newResource.fsPath).isDirectory()) {
+			// Workaround for https://github.com/Microsoft/vscode/issues/52967
+			// Never attempt to update import paths if the file does not contain something the looks like an export
+			try {
+				const { body } = await this.client.execute('navtree', { file: newFile }, nulToken);
+				const hasExport = (node: Proto.NavigationTree): boolean => {
+					return !!node.kindModifiers.match(/\bexports?\b/g) || !!(node.childItems && node.childItems.some(hasExport));
+				};
+				if (!body || !hasExport(body)) {
+					return;
+				}
+			} catch {
+				// noop
+			}
+		}
+
+		const edits = await this.getEditsForFileRename(targetFile, document, oldFile, newFile);
 		if (!edits || !edits.size) {
 			return;
 		}
 
-		if (await this.confirmActionWithUser(document)) {
+		if (await this.confirmActionWithUser(newResource, document)) {
 			await vscode.workspace.applyEdit(edits);
 		}
 	}
 
 	private async confirmActionWithUser(
+		newResource: vscode.Uri,
 		newDocument: vscode.TextDocument
 	): Promise<boolean> {
 		const config = this.getConfiguration(newDocument);
@@ -96,7 +120,7 @@ export class UpdateImportsOnFileRenameHandler {
 				return false;
 			case UpdateImportsOnFileMoveSetting.Prompt:
 			default:
-				return this.promptUser(newDocument);
+				return this.promptUser(newResource, newDocument);
 		}
 	}
 
@@ -105,6 +129,7 @@ export class UpdateImportsOnFileRenameHandler {
 	}
 
 	private async promptUser(
+		newResource: vscode.Uri,
 		newDocument: vscode.TextDocument
 	): Promise<boolean> {
 		enum Choice {
@@ -120,7 +145,7 @@ export class UpdateImportsOnFileRenameHandler {
 		}
 
 		const response = await vscode.window.showInformationMessage<Item>(
-			localize('prompt', "Automatically update imports for moved file: '{0}'?", path.basename(newDocument.fileName)), {
+			localize('prompt', "Automatically update imports for moved file: '{0}'?", path.basename(newResource.fsPath)), {
 				modal: true,
 			},
 			{
@@ -177,27 +202,113 @@ export class UpdateImportsOnFileRenameHandler {
 		return false;
 	}
 
+	private async getTargetResource(resource: vscode.Uri): Promise<vscode.Uri | undefined> {
+		if (resource.scheme !== fileSchemes.file) {
+			return undefined;
+		}
+
+		const isDirectory = fs.lstatSync(resource.fsPath).isDirectory();
+		if (isDirectory && this.client.apiVersion.gte(API.v300)) {
+			return resource;
+		}
+
+		if (isDirectory && this.client.apiVersion.gte(API.v292)) {
+			const files = await vscode.workspace.findFiles({
+				base: resource.fsPath,
+				pattern: '**/*.{ts,tsx,js,jsx}',
+			}, '**/node_modules/**', 1);
+			return files[0];
+		}
+
+		return (await this._handles(resource)) ? resource : undefined;
+	}
+
 	private async getEditsForFileRename(
+		targetResource: string,
 		document: vscode.TextDocument,
 		oldFile: string,
 		newFile: string,
 	) {
-		await this.fileConfigurationManager.ensureConfigurationForDocument(document, undefined);
+		const isDirectoryRename = fs.lstatSync(newFile).isDirectory();
+		await this.fileConfigurationManager.setGlobalConfigurationFromDocument(document, nulToken);
 
-		const args: Proto.GetEditsForFileRenameRequestArgs = {
-			file: newFile,
+		const args: Proto.GetEditsForFileRenameRequestArgs & { file: string } = {
+			file: targetResource,
 			oldFilePath: oldFile,
 			newFilePath: newFile,
 		};
-		const response = await this.client.execute('getEditsForFileRename', args);
+		const response = await this.client.execute('getEditsForFileRename', args, nulToken);
 		if (!response || !response.body) {
 			return;
 		}
 
-		return typeConverters.WorkspaceEdit.fromFromFileCodeEdits(this.client, response.body);
+		const edits: Proto.FileCodeEdits[] = [];
+		for (const edit of response.body) {
+			// Workaround for https://github.com/Microsoft/vscode/issues/52675
+			if (!this.client.apiVersion.gte(API.v300)) {
+				if ((edit as Proto.FileCodeEdits).fileName.match(/[\/\\]node_modules[\/\\]/gi)) {
+					continue;
+				}
+				for (const change of (edit as Proto.FileCodeEdits).textChanges) {
+					if (change.newText.match(/\/node_modules\//gi)) {
+						continue;
+					}
+				}
+			}
+
+			edits.push(await this.fixEdit(edit, isDirectoryRename, oldFile, newFile));
+		}
+		return typeConverters.WorkspaceEdit.fromFileCodeEdits(this.client, edits);
+	}
+
+	private async fixEdit(
+		edit: Proto.FileCodeEdits,
+		isDirectoryRename: boolean,
+		oldFile: string,
+		newFile: string,
+	): Promise<Proto.FileCodeEdits> {
+		if (!isDirectoryRename || this.client.apiVersion.gte(API.v300)) {
+			return edit;
+		}
+
+		const document = await vscode.workspace.openTextDocument(edit.fileName);
+		const oldFileRe = new RegExp('/' + escapeRegExp(path.basename(oldFile)) + '/');
+
+		// Workaround for https://github.com/Microsoft/TypeScript/issues/24968
+		const textChanges = edit.textChanges.map((change): Proto.CodeEdit => {
+			const existingText = document.getText(typeConverters.Range.fromTextSpan(change));
+			const existingMatch = existingText.match(oldFileRe);
+			if (!existingMatch) {
+				return change;
+			}
+
+			const match = new RegExp('/' + escapeRegExp(path.basename(newFile)) + '/(.+)$', 'g').exec(change.newText);
+			if (!match) {
+				return change;
+			}
+
+			return {
+				newText: change.newText.slice(0, -match[1].length),
+				start: change.start,
+				end: {
+					line: change.end.line,
+					offset: change.end.offset - match[1].length
+				}
+			};
+		});
+
+		return {
+			fileName: edit.fileName,
+			textChanges
+		};
 	}
 }
 
-function isTypeScriptDocument(document: vscode.TextDocument) {
-	return document.languageId === languageIds.typescript || document.languageId === languageIds.typescriptreact;
-}
+export function register(
+	client: ITypeScriptServiceClient,
+	fileConfigurationManager: FileConfigurationManager,
+	handles: (uri: vscode.Uri) => Promise<boolean>,
+) {
+	return new VersionDependentRegistration(client, API.v290, () =>
+		new UpdateImportsOnFileRenameHandler(client, fileConfigurationManager, handles));
+}
\ No newline at end of file
diff --git a/extensions/typescript-language-features/src/features/workspaceSymbols.ts b/extensions/typescript-language-features/src/features/workspaceSymbols.ts
index 5d987b85133..4d06850baa0 100644
--- a/extensions/typescript-language-features/src/features/workspaceSymbols.ts
+++ b/extensions/typescript-language-features/src/features/workspaceSymbols.ts
@@ -44,13 +44,13 @@ class TypeScriptWorkspaceSymbolProvider implements vscode.WorkspaceSymbolProvide
 			file: filepath,
 			searchValue: search
 		};
-		const response = await this.client.execute('navto', args, token);
-		if (!response.body) {
+		const { body } = await this.client.execute('navto', args, token);
+		if (!body) {
 			return [];
 		}
 
 		const result: vscode.SymbolInformation[] = [];
-		for (const item of response.body) {
+		for (const item of body) {
 			if (!item.containerName && item.kind === 'alias') {
 				continue;
 			}
diff --git a/extensions/typescript-language-features/src/languageProvider.ts b/extensions/typescript-language-features/src/languageProvider.ts
index d98389d62ea..f0cf8759915 100644
--- a/extensions/typescript-language-features/src/languageProvider.ts
+++ b/extensions/typescript-language-features/src/languageProvider.ts
@@ -3,34 +3,25 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as vscode from 'vscode';
 import { basename } from 'path';
-
-import TypeScriptServiceClient from './typescriptServiceClient';
-import TypingsStatus from './utils/typingsStatus';
-import FileConfigurationManager from './features/fileConfigurationManager';
-import { CommandManager } from './utils/commandManager';
-import { DiagnosticsManager, DiagnosticKind } from './features/diagnostics';
-import { LanguageDescription } from './utils/languageDescription';
-import * as fileSchemes from './utils/fileSchemes';
+import * as vscode from 'vscode';
 import { CachedNavTreeResponse } from './features/baseCodeLensProvider';
+import { DiagnosticKind } from './features/diagnostics';
+import FileConfigurationManager from './features/fileConfigurationManager';
+import TypeScriptServiceClient from './typescriptServiceClient';
+import { CommandManager } from './utils/commandManager';
+import { Disposable } from './utils/dispose';
+import * as fileSchemes from './utils/fileSchemes';
+import { LanguageDescription } from './utils/languageDescription';
 import { memoize } from './utils/memoize';
-import { disposeAll } from './utils/dispose';
 import TelemetryReporter from './utils/telemetry';
-import { UpdateImportsOnFileRenameHandler } from './features/updatePathsOnRename';
+import TypingsStatus from './utils/typingsStatus';
+
 
 const validateSetting = 'validate.enable';
 const suggestionSetting = 'suggestionActions.enabled';
 
-export default class LanguageProvider {
-	private readonly diagnosticsManager: DiagnosticsManager;
-
-	private _validate: boolean = true;
-	private _enableSuggestionDiagnostics: boolean = true;
-
-	private readonly disposables: vscode.Disposable[] = [];
-
-	private readonly renameHandler: UpdateImportsOnFileRenameHandler;
+export default class LanguageProvider extends Disposable {
 
 	constructor(
 		private readonly client: TypeScriptServiceClient,
@@ -40,35 +31,15 @@ export default class LanguageProvider {
 		private readonly typingsStatus: TypingsStatus,
 		private readonly fileConfigurationManager: FileConfigurationManager
 	) {
-		this.client.bufferSyncSupport.onDelete(resource => {
-			this.diagnosticsManager.delete(resource);
-		}, null, this.disposables);
-
-		this.diagnosticsManager = new DiagnosticsManager(description.diagnosticOwner);
-
-		vscode.workspace.onDidChangeConfiguration(this.configurationChanged, this, this.disposables);
+		super();
+		vscode.workspace.onDidChangeConfiguration(this.configurationChanged, this, this._disposables);
 		this.configurationChanged();
 
 		client.onReady(async () => {
 			await this.registerProviders();
 		});
-
-		this.renameHandler = new UpdateImportsOnFileRenameHandler(this.client, this.fileConfigurationManager, async uri => {
-			try {
-				const doc = await vscode.workspace.openTextDocument(uri);
-				return this.handles(uri, doc);
-			} catch {
-				return false;
-			}
-		});
 	}
 
-	public dispose(): void {
-		disposeAll(this.disposables);
-
-		this.diagnosticsManager.dispose();
-		this.renameHandler.dispose();
-	}
 
 	@memoize
 	private get documentSelector(): vscode.DocumentFilter[] {
@@ -86,26 +57,27 @@ export default class LanguageProvider {
 
 		const cachedResponse = new CachedNavTreeResponse();
 
-		this.disposables.push((await import('./features/completions')).register(selector, this.client, this.typingsStatus, this.fileConfigurationManager, this.commandManager));
-		this.disposables.push((await import('./features/definitions')).register(selector, this.client));
-		this.disposables.push((await import('./features/directiveCommentCompletions')).register(selector, this.client));
-		this.disposables.push((await import('./features/documentHighlight')).register(selector, this.client));
-		this.disposables.push((await import('./features/documentSymbol')).register(selector, this.client));
-		this.disposables.push((await import('./features/folding')).register(selector, this.client));
-		this.disposables.push((await import('./features/formatting')).register(selector, this.description.id, this.client, this.fileConfigurationManager));
-		this.disposables.push((await import('./features/hover')).register(selector, this.client));
-		this.disposables.push((await import('./features/implementations')).register(selector, this.client));
-		this.disposables.push((await import('./features/implementationsCodeLens')).register(selector, this.description.id, this.client, cachedResponse));
-		this.disposables.push((await import('./features/jsDocCompletions')).register(selector, this.client, this.commandManager));
-		this.disposables.push((await import('./features/organizeImports')).register(selector, this.client, this.commandManager, this.fileConfigurationManager));
-		this.disposables.push((await import('./features/quickFix')).register(selector, this.client, this.fileConfigurationManager, this.commandManager, this.diagnosticsManager, this.telemetryReporter));
-		this.disposables.push((await import('./features/refactor')).register(selector, this.client, this.fileConfigurationManager, this.commandManager));
-		this.disposables.push((await import('./features/references')).register(selector, this.client));
-		this.disposables.push((await import('./features/referencesCodeLens')).register(selector, this.description.id, this.client, cachedResponse));
-		this.disposables.push((await import('./features/rename')).register(selector, this.client));
-		this.disposables.push((await import('./features/signatureHelp')).register(selector, this.client));
-		this.disposables.push((await import('./features/typeDefinitions')).register(selector, this.client));
-		this.disposables.push((await import('./features/workspaceSymbols')).register(this.client, this.description.modeIds));
+		this._register((await import('./features/completions')).register(selector, this.description.id, this.client, this.typingsStatus, this.fileConfigurationManager, this.commandManager));
+		this._register((await import('./features/definitions')).register(selector, this.client));
+		this._register((await import('./features/directiveCommentCompletions')).register(selector, this.client));
+		this._register((await import('./features/documentHighlight')).register(selector, this.client));
+		this._register((await import('./features/documentSymbol')).register(selector, this.client));
+		this._register((await import('./features/folding')).register(selector, this.client));
+		this._register((await import('./features/formatting')).register(selector, this.description.id, this.client, this.fileConfigurationManager));
+		this._register((await import('./features/hover')).register(selector, this.client));
+		this._register((await import('./features/implementations')).register(selector, this.client));
+		this._register((await import('./features/implementationsCodeLens')).register(selector, this.description.id, this.client, cachedResponse));
+		this._register((await import('./features/jsDocCompletions')).register(selector, this.client));
+		this._register((await import('./features/organizeImports')).register(selector, this.client, this.commandManager, this.fileConfigurationManager, this.telemetryReporter));
+		this._register((await import('./features/quickFix')).register(selector, this.client, this.fileConfigurationManager, this.commandManager, this.client.diagnosticsManager, this.telemetryReporter));
+		this._register((await import('./features/refactor')).register(selector, this.client, this.fileConfigurationManager, this.commandManager, this.telemetryReporter));
+		this._register((await import('./features/references')).register(selector, this.client));
+		this._register((await import('./features/referencesCodeLens')).register(selector, this.description.id, this.client, cachedResponse));
+		this._register((await import('./features/rename')).register(selector, this.client));
+		this._register((await import('./features/signatureHelp')).register(selector, this.client));
+		this._register((await import('./features/tagClosing')).register(selector, this.description.id, this.client));
+		this._register((await import('./features/typeDefinitions')).register(selector, this.client));
+		this._register((await import('./features/workspaceSymbols')).register(this.client, this.description.modeIds));
 	}
 
 	private configurationChanged(): void {
@@ -119,10 +91,6 @@ export default class LanguageProvider {
 			return true;
 		}
 
-		if (this.client.bufferSyncSupport.handles(resource)) {
-			return true;
-		}
-
 		const base = basename(resource.fsPath);
 		return !!base && base === this.description.configFile;
 	}
@@ -136,30 +104,15 @@ export default class LanguageProvider {
 	}
 
 	private updateValidate(value: boolean) {
-		if (this._validate === value) {
-			return;
-		}
-		this._validate = value;
-		this.diagnosticsManager.validate = value;
-		if (value) {
-			this.triggerAllDiagnostics();
-		}
+		this.client.diagnosticsManager.setValidate(this._diagnosticLanguage, value);
 	}
 
 	private updateSuggestionDiagnostics(value: boolean) {
-		if (this._enableSuggestionDiagnostics === value) {
-			return;
-		}
-
-		this._enableSuggestionDiagnostics = value;
-		this.diagnosticsManager.enableSuggestions = value;
-		if (value) {
-			this.triggerAllDiagnostics();
-		}
+		this.client.diagnosticsManager.setEnableSuggestions(this._diagnosticLanguage, value);
 	}
 
 	public reInitialize(): void {
-		this.diagnosticsManager.reInitialize();
+		this.client.diagnosticsManager.reInitialize();
 	}
 
 	public triggerAllDiagnostics(): void {
@@ -169,9 +122,9 @@ export default class LanguageProvider {
 	public diagnosticsReceived(diagnosticsKind: DiagnosticKind, file: vscode.Uri, diagnostics: (vscode.Diagnostic & { reportUnnecessary: any })[]): void {
 		const config = vscode.workspace.getConfiguration(this.id, file);
 		const reportUnnecessary = config.get<boolean>('showUnused', true);
-		this.diagnosticsManager.diagnosticsReceived(diagnosticsKind, file, diagnostics.filter(diag => {
+		this.client.diagnosticsManager.updateDiagnostics(file, this._diagnosticLanguage, diagnosticsKind, diagnostics.filter(diag => {
 			if (!reportUnnecessary) {
-				diag.customTags = undefined;
+				diag.tags = undefined;
 				if (diag.reportUnnecessary && diag.severity === vscode.DiagnosticSeverity.Hint) {
 					return false;
 				}
@@ -181,6 +134,10 @@ export default class LanguageProvider {
 	}
 
 	public configFileDiagnosticsReceived(file: vscode.Uri, diagnostics: vscode.Diagnostic[]): void {
-		this.diagnosticsManager.configFileDiagnosticsReceived(file, diagnostics);
+		this.client.diagnosticsManager.configFileDiagnosticsReceived(file, diagnostics);
+	}
+
+	private get _diagnosticLanguage() {
+		return this.description.diagnosticLanguage;
 	}
 }
\ No newline at end of file
diff --git a/extensions/typescript-language-features/src/protocol.const.ts b/extensions/typescript-language-features/src/protocol.const.ts
index 735e2aac259..c03c1ca9076 100644
--- a/extensions/typescript-language-features/src/protocol.const.ts
+++ b/extensions/typescript-language-features/src/protocol.const.ts
@@ -13,7 +13,6 @@ export class Kind {
 	public static readonly directory = 'directory';
 	public static readonly enum = 'enum';
 	public static readonly externalModuleName = 'external module name';
-	public static readonly file = 'file';
 	public static readonly function = 'function';
 	public static readonly indexSignature = 'index';
 	public static readonly interface = 'interface';
diff --git a/extensions/typescript-language-features/src/protocol.d.ts b/extensions/typescript-language-features/src/protocol.d.ts
index 0015b80d927..6e926eb8d7e 100644
--- a/extensions/typescript-language-features/src/protocol.d.ts
+++ b/extensions/typescript-language-features/src/protocol.d.ts
@@ -1,2 +1,2 @@
 import * as Proto from 'typescript/lib/protocol';
-export = Proto;
\ No newline at end of file
+export = Proto;
diff --git a/extensions/typescript-language-features/src/test/previewer.test.ts b/extensions/typescript-language-features/src/test/previewer.test.ts
new file mode 100644
index 00000000000..011187b2af4
--- /dev/null
+++ b/extensions/typescript-language-features/src/test/previewer.test.ts
@@ -0,0 +1,22 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as assert from 'assert';
+import 'mocha';
+import { tagsMarkdownPreview } from '../utils/previewer';
+
+suite('typescript.previewer', () => {
+	test('Should ignore hyphens after a param tag', async () => {
+		assert.strictEqual(
+			tagsMarkdownPreview([
+				{
+					name: 'param',
+					text: 'a - b'
+				}
+			]),
+			'*@param* `a` — b');
+	});
+});
+
diff --git a/extensions/typescript-language-features/src/typeScriptServiceClientHost.ts b/extensions/typescript-language-features/src/typeScriptServiceClientHost.ts
index f0f3610f63f..afff7001672 100644
--- a/extensions/typescript-language-features/src/typeScriptServiceClientHost.ts
+++ b/extensions/typescript-language-features/src/typeScriptServiceClientHost.ts
@@ -8,25 +8,23 @@
  * https://github.com/Microsoft/TypeScript-Sublime-Plugin/blob/master/TypeScript%20Indent.tmPreferences
  * ------------------------------------------------------------------------------------------ */
 
-import { workspace, Memento, Diagnostic, Range, Disposable, Uri, DiagnosticSeverity, DiagnosticTag, DiagnosticRelatedInformation } from 'vscode';
-
+import * as vscode from 'vscode';
+import { DiagnosticKind } from './features/diagnostics';
+import FileConfigurationManager from './features/fileConfigurationManager';
+import { register as registerUpdatePathsOnRename } from './features/updatePathsOnRename';
+import LanguageProvider from './languageProvider';
 import * as Proto from './protocol';
 import * as PConst from './protocol.const';
-
 import TypeScriptServiceClient from './typescriptServiceClient';
-import LanguageProvider from './languageProvider';
-
-import TypingsStatus, { AtaProgressReporter } from './utils/typingsStatus';
-import VersionStatus from './utils/versionStatus';
+import API from './utils/api';
+import { CommandManager } from './utils/commandManager';
+import { Disposable } from './utils/dispose';
+import { LanguageDescription, DiagnosticLanguage } from './utils/languageDescription';
+import LogDirectoryProvider from './utils/logDirectoryProvider';
 import { TypeScriptServerPlugin } from './utils/plugins';
 import * as typeConverters from './utils/typeConverters';
-import { CommandManager } from './utils/commandManager';
-import { LanguageDescription } from './utils/languageDescription';
-import LogDirectoryProvider from './utils/logDirectoryProvider';
-import { disposeAll } from './utils/dispose';
-import { DiagnosticKind } from './features/diagnostics';
-import API from './utils/api';
-import FileConfigurationManager from './features/fileConfigurationManager';
+import TypingsStatus, { AtaProgressReporter } from './utils/typingsStatus';
+import VersionStatus from './utils/versionStatus';
 
 // Style check diagnostics that can be reported as warnings
 const styleCheckDiagnostics = [
@@ -38,13 +36,11 @@ const styleCheckDiagnostics = [
 	7030	// not all code paths return a value
 ];
 
-export default class TypeScriptServiceClientHost {
-	private readonly ataProgressReporter: AtaProgressReporter;
+export default class TypeScriptServiceClientHost extends Disposable {
 	private readonly typingsStatus: TypingsStatus;
 	private readonly client: TypeScriptServiceClient;
 	private readonly languages: LanguageProvider[] = [];
 	private readonly languagePerId = new Map<string, LanguageProvider>();
-	private readonly disposables: Disposable[] = [];
 	private readonly versionStatus: VersionStatus;
 	private readonly fileConfigurationManager: FileConfigurationManager;
 
@@ -52,13 +48,14 @@ export default class TypeScriptServiceClientHost {
 
 	constructor(
 		descriptions: LanguageDescription[],
-		workspaceState: Memento,
+		workspaceState: vscode.Memento,
 		plugins: TypeScriptServerPlugin[],
 		private readonly commandManager: CommandManager,
 		logDirectoryProvider: LogDirectoryProvider
 	) {
+		super();
 		const handleProjectCreateOrDelete = () => {
-			this.client.execute('reloadProjects', null, false);
+			this.client.executeWithoutWaitingForResponse('reloadProjects', null);
 			this.triggerAllDiagnostics();
 		};
 		const handleProjectChange = () => {
@@ -66,11 +63,11 @@ export default class TypeScriptServiceClientHost {
 				this.triggerAllDiagnostics();
 			}, 1500);
 		};
-		const configFileWatcher = workspace.createFileSystemWatcher('**/[tj]sconfig.json');
-		this.disposables.push(configFileWatcher);
-		configFileWatcher.onDidCreate(handleProjectCreateOrDelete, this, this.disposables);
-		configFileWatcher.onDidDelete(handleProjectCreateOrDelete, this, this.disposables);
-		configFileWatcher.onDidChange(handleProjectChange, this, this.disposables);
+		const configFileWatcher = vscode.workspace.createFileSystemWatcher('**/[tj]sconfig.json');
+		this._register(configFileWatcher);
+		configFileWatcher.onDidCreate(handleProjectCreateOrDelete, this, this._disposables);
+		configFileWatcher.onDidDelete(handleProjectCreateOrDelete, this, this._disposables);
+		configFileWatcher.onDidChange(handleProjectChange, this, this._disposables);
 
 		const allModeIds = this.getAllModeIds(descriptions);
 		this.client = new TypeScriptServiceClient(
@@ -79,30 +76,31 @@ export default class TypeScriptServiceClientHost {
 			plugins,
 			logDirectoryProvider,
 			allModeIds);
-		this.disposables.push(this.client);
+		this._register(this.client);
 
 		this.client.onDiagnosticsReceived(({ kind, resource, diagnostics }) => {
 			this.diagnosticsReceived(kind, resource, diagnostics);
-		}, null, this.disposables);
+		}, null, this._disposables);
 
-		this.client.onConfigDiagnosticsReceived(diag => this.configFileDiagnosticsReceived(diag), null, this.disposables);
-		this.client.onResendModelsRequested(() => this.populateService(), null, this.disposables);
+		this.client.onConfigDiagnosticsReceived(diag => this.configFileDiagnosticsReceived(diag), null, this._disposables);
+		this.client.onResendModelsRequested(() => this.populateService(), null, this._disposables);
 
 		this.versionStatus = new VersionStatus(resource => this.client.toPath(resource));
-		this.disposables.push(this.versionStatus);
-
-		this.typingsStatus = new TypingsStatus(this.client);
-		this.ataProgressReporter = new AtaProgressReporter(this.client);
-		this.fileConfigurationManager = new FileConfigurationManager(this.client);
+		this._register(this.versionStatus);
 
+		this._register(new AtaProgressReporter(this.client));
+		this.typingsStatus = this._register(new TypingsStatus(this.client));
+		this.fileConfigurationManager = this._register(new FileConfigurationManager(this.client));
 
 		for (const description of descriptions) {
 			const manager = new LanguageProvider(this.client, description, this.commandManager, this.client.telemetryReporter, this.typingsStatus, this.fileConfigurationManager);
 			this.languages.push(manager);
-			this.disposables.push(manager);
+			this._register(manager);
 			this.languagePerId.set(description.id, manager);
 		}
 
+		this._register(registerUpdatePathsOnRename(this.client, this.fileConfigurationManager, uri => this.handles(uri)));
+
 		this.client.ensureServiceStarted();
 		this.client.onReady(() => {
 			if (!this.client.apiVersion.gte(API.v230)) {
@@ -119,13 +117,14 @@ export default class TypeScriptServiceClientHost {
 				const description: LanguageDescription = {
 					id: 'typescript-plugins',
 					modeIds: Array.from(languages.values()),
-					diagnosticSource: 'ts-plugins',
+					diagnosticSource: 'ts-plugin',
+					diagnosticLanguage: DiagnosticLanguage.TypeScript,
 					diagnosticOwner: 'typescript',
 					isExternal: true
 				};
 				const manager = new LanguageProvider(this.client, description, this.commandManager, this.client.telemetryReporter, this.typingsStatus, this.fileConfigurationManager);
 				this.languages.push(manager);
-				this.disposables.push(manager);
+				this._register(manager);
 				this.languagePerId.set(description.id, manager);
 			}
 		});
@@ -134,7 +133,7 @@ export default class TypeScriptServiceClientHost {
 			this.triggerAllDiagnostics();
 		});
 
-		workspace.onDidChangeConfiguration(this.configurationChanged, this, this.disposables);
+		vscode.workspace.onDidChangeConfiguration(this.configurationChanged, this, this._disposables);
 		this.configurationChanged();
 	}
 
@@ -146,35 +145,32 @@ export default class TypeScriptServiceClientHost {
 		return allModeIds;
 	}
 
-	public dispose(): void {
-		disposeAll(this.disposables);
-		this.typingsStatus.dispose();
-		this.ataProgressReporter.dispose();
-		this.fileConfigurationManager.dispose();
-	}
-
 	public get serviceClient(): TypeScriptServiceClient {
 		return this.client;
 	}
 
 	public reloadProjects(): void {
-		this.client.execute('reloadProjects', null, false);
+		this.client.executeWithoutWaitingForResponse('reloadProjects', null);
 		this.triggerAllDiagnostics();
 	}
 
-	public handles(resource: Uri): boolean {
-		return !!this.findLanguage(resource);
+	public async handles(resource: vscode.Uri): Promise<boolean> {
+		const provider = await this.findLanguage(resource);
+		if (provider) {
+			return true;
+		}
+		return this.client.bufferSyncSupport.handles(resource);
 	}
 
 	private configurationChanged(): void {
-		const typescriptConfig = workspace.getConfiguration('typescript');
+		const typescriptConfig = vscode.workspace.getConfiguration('typescript');
 
 		this.reportStyleCheckAsWarnings = typescriptConfig.get('reportStyleChecksAsWarnings', true);
 	}
 
-	private async findLanguage(resource: Uri): Promise<LanguageProvider | undefined> {
+	private async findLanguage(resource: vscode.Uri): Promise<LanguageProvider | undefined> {
 		try {
-			const doc = await workspace.openTextDocument(resource);
+			const doc = await vscode.workspace.openTextDocument(resource);
 			return this.languages.find(language => language.handles(resource, doc));
 		} catch {
 			return undefined;
@@ -193,7 +189,7 @@ export default class TypeScriptServiceClientHost {
 		this.client.bufferSyncSupport.requestAllDiagnostics();
 
 		// See https://github.com/Microsoft/TypeScript/issues/5530
-		workspace.saveAll(false).then(() => {
+		vscode.workspace.saveAll(false).then(() => {
 			for (const language of this.languagePerId.values()) {
 				language.reInitialize();
 			}
@@ -202,7 +198,7 @@ export default class TypeScriptServiceClientHost {
 
 	private async diagnosticsReceived(
 		kind: DiagnosticKind,
-		resource: Uri,
+		resource: vscode.Uri,
 		diagnostics: Proto.Diagnostic[]
 	): Promise<void> {
 		const language = await this.findLanguage(resource);
@@ -228,10 +224,10 @@ export default class TypeScriptServiceClientHost {
 			if (body.diagnostics.length === 0) {
 				language.configFileDiagnosticsReceived(this.client.toResource(body.configFile), []);
 			} else if (body.diagnostics.length >= 1) {
-				workspace.openTextDocument(Uri.file(body.configFile)).then((document) => {
+				vscode.workspace.openTextDocument(vscode.Uri.file(body.configFile)).then((document) => {
 					let curly: [number, number, number] | undefined = undefined;
 					let nonCurly: [number, number, number] | undefined = undefined;
-					let diagnostic: Diagnostic;
+					let diagnostic: vscode.Diagnostic;
 					for (let index = 0; index < document.lineCount; index++) {
 						const line = document.lineAt(index);
 						const text = line.text;
@@ -250,16 +246,16 @@ export default class TypeScriptServiceClientHost {
 					}
 					const match = curly || nonCurly;
 					if (match) {
-						diagnostic = new Diagnostic(new Range(match[0], match[1], match[0], match[2]), body.diagnostics[0].text);
+						diagnostic = new vscode.Diagnostic(new vscode.Range(match[0], match[1], match[0], match[2]), body.diagnostics[0].text);
 					} else {
-						diagnostic = new Diagnostic(new Range(0, 0, 0, 0), body.diagnostics[0].text);
+						diagnostic = new vscode.Diagnostic(new vscode.Range(0, 0, 0, 0), body.diagnostics[0].text);
 					}
 					if (diagnostic) {
 						diagnostic.source = language.diagnosticSource;
 						language.configFileDiagnosticsReceived(this.client.toResource(body.configFile), [diagnostic]);
 					}
 				}, _error => {
-					language.configFileDiagnosticsReceived(this.client.toResource(body.configFile), [new Diagnostic(new Range(0, 0, 0, 0), body.diagnostics[0].text)]);
+					language.configFileDiagnosticsReceived(this.client.toResource(body.configFile), [new vscode.Diagnostic(new vscode.Range(0, 0, 0, 0), body.diagnostics[0].text)]);
 				});
 			}
 		});
@@ -268,57 +264,56 @@ export default class TypeScriptServiceClientHost {
 	private createMarkerDatas(
 		diagnostics: Proto.Diagnostic[],
 		source: string
-	): (Diagnostic & { reportUnnecessary: any })[] {
+	): (vscode.Diagnostic & { reportUnnecessary: any })[] {
 		return diagnostics.map(tsDiag => this.tsDiagnosticToVsDiagnostic(tsDiag, source));
 	}
 
-	private tsDiagnosticToVsDiagnostic(diagnostic: Proto.Diagnostic, source: string): Diagnostic & { reportUnnecessary: any } {
+	private tsDiagnosticToVsDiagnostic(diagnostic: Proto.Diagnostic, source: string): vscode.Diagnostic & { reportUnnecessary: any } {
 		const { start, end, text } = diagnostic;
-		const range = new Range(typeConverters.Position.fromLocation(start), typeConverters.Position.fromLocation(end));
-		const converted = new Diagnostic(range, text);
+		const range = new vscode.Range(typeConverters.Position.fromLocation(start), typeConverters.Position.fromLocation(end));
+		const converted = new vscode.Diagnostic(range, text);
 		converted.severity = this.getDiagnosticSeverity(diagnostic);
 		converted.source = diagnostic.source || source;
 		if (diagnostic.code) {
 			converted.code = diagnostic.code;
 		}
-		// TODO: requires TS 3.0
-		const relatedInformation = (diagnostic as any).relatedInformation;
+		const relatedInformation = diagnostic.relatedInformation;
 		if (relatedInformation) {
 			converted.relatedInformation = relatedInformation.map((info: any) => {
 				let span = info.span;
 				if (!span) {
 					return undefined;
 				}
-				return new DiagnosticRelatedInformation(typeConverters.Location.fromTextSpan(this.client.toResource(span.file), span), info.message);
-			}).filter((x: any) => !!x) as DiagnosticRelatedInformation[];
+				return new vscode.DiagnosticRelatedInformation(typeConverters.Location.fromTextSpan(this.client.toResource(span.file), span), info.message);
+			}).filter((x: any) => !!x) as vscode.DiagnosticRelatedInformation[];
 		}
 		if (diagnostic.reportsUnnecessary) {
-			converted.customTags = [DiagnosticTag.Unnecessary];
+			converted.tags = [vscode.DiagnosticTag.Unnecessary];
 		}
-		(converted as Diagnostic & { reportUnnecessary: any }).reportUnnecessary = diagnostic.reportsUnnecessary;
-		return converted as Diagnostic & { reportUnnecessary: any };
+		(converted as vscode.Diagnostic & { reportUnnecessary: any }).reportUnnecessary = diagnostic.reportsUnnecessary;
+		return converted as vscode.Diagnostic & { reportUnnecessary: any };
 	}
 
-	private getDiagnosticSeverity(diagnostic: Proto.Diagnostic): DiagnosticSeverity {
+	private getDiagnosticSeverity(diagnostic: Proto.Diagnostic): vscode.DiagnosticSeverity {
 		if (this.reportStyleCheckAsWarnings
 			&& this.isStyleCheckDiagnostic(diagnostic.code)
 			&& diagnostic.category === PConst.DiagnosticCategory.error
 		) {
-			return DiagnosticSeverity.Warning;
+			return vscode.DiagnosticSeverity.Warning;
 		}
 
 		switch (diagnostic.category) {
 			case PConst.DiagnosticCategory.error:
-				return DiagnosticSeverity.Error;
+				return vscode.DiagnosticSeverity.Error;
 
 			case PConst.DiagnosticCategory.warning:
-				return DiagnosticSeverity.Warning;
+				return vscode.DiagnosticSeverity.Warning;
 
 			case PConst.DiagnosticCategory.suggestion:
-				return DiagnosticSeverity.Hint;
+				return vscode.DiagnosticSeverity.Hint;
 
 			default:
-				return DiagnosticSeverity.Error;
+				return vscode.DiagnosticSeverity.Error;
 		}
 	}
 
diff --git a/extensions/typescript-language-features/src/typescriptService.ts b/extensions/typescript-language-features/src/typescriptService.ts
index ef58af1e635..aff38d6a44c 100644
--- a/extensions/typescript-language-features/src/typescriptService.ts
+++ b/extensions/typescript-language-features/src/typescriptService.ts
@@ -3,13 +3,46 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationToken, Uri, Event } from 'vscode';
+import * as vscode from 'vscode';
+import BufferSyncSupport from './features/bufferSyncSupport';
 import * as Proto from './protocol';
 import API from './utils/api';
-import { TypeScriptServerPlugin } from './utils/plugins';
 import { TypeScriptServiceConfiguration } from './utils/configuration';
 import Logger from './utils/logger';
-import BufferSyncSupport from './features/bufferSyncSupport';
+import { TypeScriptServerPlugin } from './utils/plugins';
+
+interface TypeScriptRequestTypes {
+	'applyCodeActionCommand': [Proto.ApplyCodeActionCommandRequestArgs, Proto.ApplyCodeActionCommandResponse];
+	'completionEntryDetails': [Proto.CompletionDetailsRequestArgs, Proto.CompletionDetailsResponse];
+	'completionInfo': [Proto.CompletionsRequestArgs, Proto.CompletionInfoResponse];
+	'completions': [Proto.CompletionsRequestArgs, Proto.CompletionsResponse];
+	'configure': [Proto.ConfigureRequestArguments, Proto.ConfigureResponse];
+	'definition': [Proto.FileLocationRequestArgs, Proto.DefinitionResponse];
+	'definitionAndBoundSpan': [Proto.FileLocationRequestArgs, Proto.DefinitionInfoAndBoundSpanReponse];
+	'docCommentTemplate': [Proto.FileLocationRequestArgs, Proto.DocCommandTemplateResponse];
+	'format': [Proto.FormatRequestArgs, Proto.FormatResponse];
+	'formatonkey': [Proto.FormatOnKeyRequestArgs, Proto.FormatResponse];
+	'getApplicableRefactors': [Proto.GetApplicableRefactorsRequestArgs, Proto.GetApplicableRefactorsResponse];
+	'getCodeFixes': [Proto.CodeFixRequestArgs, Proto.GetCodeFixesResponse];
+	'getCombinedCodeFix': [Proto.GetCombinedCodeFixRequestArgs, Proto.GetCombinedCodeFixResponse];
+	'getEditsForFileRename': [Proto.GetEditsForFileRenameRequestArgs, Proto.GetEditsForFileRenameResponse];
+	'getEditsForRefactor': [Proto.GetEditsForRefactorRequestArgs, Proto.GetEditsForRefactorResponse];
+	'getOutliningSpans': [Proto.FileRequestArgs, Proto.OutliningSpansResponse];
+	'getSupportedCodeFixes': [null, Proto.GetSupportedCodeFixesResponse];
+	'implementation': [Proto.FileLocationRequestArgs, Proto.ImplementationResponse];
+	'jsxClosingTag': [Proto.JsxClosingTagRequestArgs, Proto.JsxClosingTagResponse];
+	'navto': [Proto.NavtoRequestArgs, Proto.NavtoResponse];
+	'navtree': [Proto.FileRequestArgs, Proto.NavTreeResponse];
+	'occurrences': [Proto.FileLocationRequestArgs, Proto.OccurrencesResponse];
+	'organizeImports': [Proto.OrganizeImportsRequestArgs, Proto.OrganizeImportsResponse];
+	'projectInfo': [Proto.ProjectInfoRequestArgs, Proto.ProjectInfoResponse];
+	'quickinfo': [Proto.FileLocationRequestArgs, Proto.QuickInfoResponse];
+	'references': [Proto.FileLocationRequestArgs, Proto.ReferencesResponse];
+	'rename': [Proto.RenameRequestArgs, Proto.RenameResponse];
+	'signatureHelp': [Proto.SignatureHelpRequestArgs, Proto.SignatureHelpResponse];
+	'typeDefinition': [Proto.FileLocationRequestArgs, Proto.TypeDefinitionResponse];
+}
+
 
 export interface ITypeScriptServiceClient {
 	/**
@@ -17,27 +50,27 @@ export interface ITypeScriptServiceClient {
 	 *
 	 * Does not try handling case insensitivity.
 	 */
-	normalizedPath(resource: Uri): string | null;
+	normalizedPath(resource: vscode.Uri): string | null;
 
 	/**
 	 * Map a resource to a normalized path
 	 *
 	 * This will attempt to handle case insensitivity.
 	 */
-	toPath(resource: Uri): string | null;
+	toPath(resource: vscode.Uri): string | null;
 
 	/**
 	 * Convert a path to a resource.
 	 */
-	toResource(filepath: string): Uri;
+	toResource(filepath: string): vscode.Uri;
 
-	getWorkspaceRootForResource(resource: Uri): string | undefined;
+	getWorkspaceRootForResource(resource: vscode.Uri): string | undefined;
 
-	readonly onTsServerStarted: Event<API>;
-	readonly onProjectLanguageServiceStateChanged: Event<Proto.ProjectLanguageServiceStateEventBody>;
-	readonly onDidBeginInstallTypings: Event<Proto.BeginInstallTypesEventBody>;
-	readonly onDidEndInstallTypings: Event<Proto.EndInstallTypesEventBody>;
-	readonly onTypesInstallerInitializationFailed: Event<Proto.TypesInstallerInitializationFailedEventBody>;
+	readonly onTsServerStarted: vscode.Event<API>;
+	readonly onProjectLanguageServiceStateChanged: vscode.Event<Proto.ProjectLanguageServiceStateEventBody>;
+	readonly onDidBeginInstallTypings: vscode.Event<Proto.BeginInstallTypesEventBody>;
+	readonly onDidEndInstallTypings: vscode.Event<Proto.EndInstallTypesEventBody>;
+	readonly onTypesInstallerInitializationFailed: vscode.Event<Proto.TypesInstallerInitializationFailedEventBody>;
 
 	readonly apiVersion: API;
 	readonly plugins: TypeScriptServerPlugin[];
@@ -45,40 +78,22 @@ export interface ITypeScriptServiceClient {
 	readonly logger: Logger;
 	readonly bufferSyncSupport: BufferSyncSupport;
 
-	execute(command: 'configure', args: Proto.ConfigureRequestArguments, token?: CancellationToken): Promise<Proto.ConfigureResponse>;
-	execute(command: 'open', args: Proto.OpenRequestArgs, expectedResult: boolean, token?: CancellationToken): Promise<any>;
-	execute(command: 'close', args: Proto.FileRequestArgs, expectedResult: boolean, token?: CancellationToken): Promise<any>;
-	execute(command: 'change', args: Proto.ChangeRequestArgs, expectedResult: boolean, token?: CancellationToken): Promise<any>;
-	execute(command: 'quickinfo', args: Proto.FileLocationRequestArgs, token?: CancellationToken): Promise<Proto.QuickInfoResponse>;
-	execute(command: 'completions', args: Proto.CompletionsRequestArgs, token?: CancellationToken): Promise<Proto.CompletionsResponse>;
-	execute(command: 'completionEntryDetails', args: Proto.CompletionDetailsRequestArgs, token?: CancellationToken): Promise<Proto.CompletionDetailsResponse>;
-	execute(command: 'signatureHelp', args: Proto.SignatureHelpRequestArgs, token?: CancellationToken): Promise<Proto.SignatureHelpResponse>;
-	execute(command: 'definition', args: Proto.FileLocationRequestArgs, token?: CancellationToken): Promise<Proto.DefinitionResponse>;
-	execute(command: 'implementation', args: Proto.FileLocationRequestArgs, token?: CancellationToken): Promise<Proto.ImplementationResponse>;
-	execute(command: 'typeDefinition', args: Proto.FileLocationRequestArgs, token?: CancellationToken): Promise<Proto.TypeDefinitionResponse>;
-	execute(command: 'references', args: Proto.FileLocationRequestArgs, token?: CancellationToken): Promise<Proto.ReferencesResponse>;
-	execute(command: 'navto', args: Proto.NavtoRequestArgs, token?: CancellationToken): Promise<Proto.NavtoResponse>;
-	execute(command: 'navbar', args: Proto.FileRequestArgs, token?: CancellationToken): Promise<Proto.NavBarResponse>;
-	execute(command: 'format', args: Proto.FormatRequestArgs, token?: CancellationToken): Promise<Proto.FormatResponse>;
-	execute(command: 'formatonkey', args: Proto.FormatOnKeyRequestArgs, token?: CancellationToken): Promise<Proto.FormatResponse>;
-	execute(command: 'rename', args: Proto.RenameRequestArgs, token?: CancellationToken): Promise<Proto.RenameResponse>;
-	execute(command: 'occurrences', args: Proto.FileLocationRequestArgs, token?: CancellationToken): Promise<Proto.OccurrencesResponse>;
-	execute(command: 'projectInfo', args: Proto.ProjectInfoRequestArgs, token?: CancellationToken): Promise<Proto.ProjectInfoResponse>;
-	execute(command: 'reloadProjects', args: any, expectedResult: boolean, token?: CancellationToken): Promise<any>;
-	execute(command: 'reload', args: Proto.ReloadRequestArgs, expectedResult: boolean, token?: CancellationToken): Promise<any>;
-	execute(command: 'compilerOptionsForInferredProjects', args: Proto.SetCompilerOptionsForInferredProjectsArgs, token?: CancellationToken): Promise<any>;
-	execute(command: 'navtree', args: Proto.FileRequestArgs, token?: CancellationToken): Promise<Proto.NavTreeResponse>;
-	execute(command: 'getCodeFixes', args: Proto.CodeFixRequestArgs, token?: CancellationToken): Promise<Proto.GetCodeFixesResponse>;
-	execute(command: 'getSupportedCodeFixes', args: null, token?: CancellationToken): Promise<Proto.GetSupportedCodeFixesResponse>;
-	execute(command: 'getCombinedCodeFix', args: Proto.GetCombinedCodeFixRequestArgs, token?: CancellationToken): Promise<Proto.GetCombinedCodeFixResponse>;
-	execute(command: 'docCommentTemplate', args: Proto.FileLocationRequestArgs, token?: CancellationToken): Promise<Proto.DocCommandTemplateResponse>;
-	execute(command: 'getApplicableRefactors', args: Proto.GetApplicableRefactorsRequestArgs, token?: CancellationToken): Promise<Proto.GetApplicableRefactorsResponse>;
-	execute(command: 'getEditsForRefactor', args: Proto.GetEditsForRefactorRequestArgs, token?: CancellationToken): Promise<Proto.GetEditsForRefactorResponse>;
-	execute(command: 'applyCodeActionCommand', args: Proto.ApplyCodeActionCommandRequestArgs, token?: CancellationToken): Promise<Proto.ApplyCodeActionCommandResponse>;
-	execute(command: 'organizeImports', args: Proto.OrganizeImportsRequestArgs, token?: CancellationToken): Promise<Proto.OrganizeImportsResponse>;
-	execute(command: 'getOutliningSpans', args: Proto.FileRequestArgs, token: CancellationToken): Promise<Proto.OutliningSpansResponse>;
-	execute(command: 'getEditsForFileRename', args: Proto.GetEditsForFileRenameRequestArgs): Promise<Proto.GetEditsForFileRenameResponse>;
-	execute(command: string, args: any, expectedResult: boolean | CancellationToken, token?: CancellationToken): Promise<any>;
+	execute<K extends keyof TypeScriptRequestTypes>(
+		command: K,
+		args: TypeScriptRequestTypes[K][0],
+		token: vscode.CancellationToken
+	): Promise<TypeScriptRequestTypes[K][1]>;
 
-	executeAsync(command: 'geterr', args: Proto.GeterrRequestArgs, token: CancellationToken): Promise<any>;
+	executeWithoutWaitingForResponse(command: 'open', args: Proto.OpenRequestArgs): void;
+	executeWithoutWaitingForResponse(command: 'close', args: Proto.FileRequestArgs): void;
+	executeWithoutWaitingForResponse(command: 'change', args: Proto.ChangeRequestArgs): void;
+	executeWithoutWaitingForResponse(command: 'compilerOptionsForInferredProjects', args: Proto.SetCompilerOptionsForInferredProjectsArgs): void;
+	executeWithoutWaitingForResponse(command: 'reloadProjects', args: null): void;
+
+	executeAsync(command: 'geterr', args: Proto.GeterrRequestArgs, token: vscode.CancellationToken): Promise<any>;
+
+	/**
+	 * Cancel on going geterr requests and re-queue them after `f` has been evaluated.
+	 */
+	interuptGetErr<R>(f: () => R): R;
 }
\ No newline at end of file
diff --git a/extensions/typescript-language-features/src/typescriptServiceClient.ts b/extensions/typescript-language-features/src/typescriptServiceClient.ts
index e152f0f6ca9..04bee73f6de 100644
--- a/extensions/typescript-language-features/src/typescriptServiceClient.ts
+++ b/extensions/typescript-language-features/src/typescriptServiceClient.ts
@@ -4,34 +4,31 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as cp from 'child_process';
-import * as path from 'path';
 import * as fs from 'fs';
-
-import * as electron from './utils/electron';
-import { Reader, ICallback } from './utils/wireProtocol';
-
-import { workspace, window, Uri, CancellationToken, Disposable, Memento, MessageItem, EventEmitter, commands, env } from 'vscode';
+import * as path from 'path';
+import * as vscode from 'vscode';
+import * as nls from 'vscode-nls';
+import BufferSyncSupport from './features/bufferSyncSupport';
+import { DiagnosticKind, DiagnosticsManager } from './features/diagnostics';
 import * as Proto from './protocol';
 import { ITypeScriptServiceClient } from './typescriptService';
-import { TypeScriptServerPlugin } from './utils/plugins';
-import Logger from './utils/logger';
-
+import API from './utils/api';
+import { TsServerLogLevel, TypeScriptServiceConfiguration } from './utils/configuration';
+import { Disposable } from './utils/dispose';
+import * as electron from './utils/electron';
+import * as fileSchemes from './utils/fileSchemes';
 import * as is from './utils/is';
+import LogDirectoryProvider from './utils/logDirectoryProvider';
+import Logger from './utils/logger';
+import { TypeScriptPluginPathsProvider } from './utils/pluginPathsProvider';
+import { TypeScriptServerPlugin } from './utils/plugins';
 import TelemetryReporter from './utils/telemetry';
 import Tracer from './utils/tracer';
-import API from './utils/api';
-
-import * as nls from 'vscode-nls';
-import { TypeScriptServiceConfiguration, TsServerLogLevel } from './utils/configuration';
-import { TypeScriptVersionProvider, TypeScriptVersion } from './utils/versionProvider';
-import { TypeScriptVersionPicker } from './utils/versionPicker';
-import * as fileSchemes from './utils/fileSchemes';
 import { inferredProjectConfig } from './utils/tsconfig';
-import LogDirectoryProvider from './utils/logDirectoryProvider';
-import { disposeAll } from './utils/dispose';
-import { DiagnosticKind } from './features/diagnostics';
-import { TypeScriptPluginPathsProvider } from './utils/pluginPathsProvider';
-import BufferSyncSupport from './features/bufferSyncSupport';
+import { TypeScriptVersionPicker } from './utils/versionPicker';
+import { TypeScriptVersion, TypeScriptVersionProvider } from './utils/versionProvider';
+import { Reader } from './utils/wireProtocol';
+
 
 const localize = nls.loadMessageBundle();
 
@@ -123,10 +120,15 @@ class RequestQueue {
 	}
 }
 
-class ForkedTsServerProcess {
+class ForkedTsServerProcess extends Disposable {
+	private readonly _reader: Reader<Proto.Response>;
+
 	constructor(
 		private childProcess: cp.ChildProcess
-	) { }
+	) {
+		super();
+		this._reader = new Reader<Proto.Response>(this.childProcess.stdout);
+	}
 
 	public onError(cb: (err: Error) => void): void {
 		this.childProcess.on('error', cb);
@@ -140,13 +142,9 @@ class ForkedTsServerProcess {
 		this.childProcess.stdin.write(JSON.stringify(serverRequest) + '\r\n', 'utf8');
 	}
 
-	public createReader(
-		callback: ICallback<Proto.Response>,
-		onError: (error: any) => void
-	) {
-		// tslint:disable-next-line:no-unused-expression
-		new Reader<Proto.Response>(this.childProcess.stdout, callback, onError);
-	}
+	public get onReaderError() { return this._reader.onError; }
+
+	public get onData() { return this._reader.onData; }
 
 	public kill() {
 		this.childProcess.kill();
@@ -155,11 +153,11 @@ class ForkedTsServerProcess {
 
 export interface TsDiagnostics {
 	readonly kind: DiagnosticKind;
-	readonly resource: Uri;
+	readonly resource: vscode.Uri;
 	readonly diagnostics: Proto.Diagnostic[];
 }
 
-export default class TypeScriptServiceClient implements ITypeScriptServiceClient {
+export default class TypeScriptServiceClient extends Disposable implements ITypeScriptServiceClient {
 	private static readonly WALK_THROUGH_SNIPPET_SCHEME_COLON = `${fileSchemes.walkThroughSnippet}:`;
 
 	private pathSeparator: string;
@@ -173,7 +171,7 @@ export default class TypeScriptServiceClient implements ITypeScriptServiceClient
 	private tracer: Tracer;
 	public readonly logger: Logger = new Logger();
 	private tsServerLogFile: string | null = null;
-	private servicePromise: Thenable<ForkedTsServerProcess> | null;
+	private servicePromise: Thenable<ForkedTsServerProcess | null> | null;
 	private lastError: Error | null;
 	private lastStart: number;
 	private numberRestarts: number;
@@ -194,17 +192,17 @@ export default class TypeScriptServiceClient implements ITypeScriptServiceClient
 	 */
 	private _tsserverVersion: string | undefined;
 
-	private readonly disposables: Disposable[] = [];
-
 	public readonly bufferSyncSupport: BufferSyncSupport;
+	public readonly diagnosticsManager: DiagnosticsManager;
 
 	constructor(
-		private readonly workspaceState: Memento,
+		private readonly workspaceState: vscode.Memento,
 		private readonly onDidChangeTypeScriptVersion: (version: TypeScriptVersion) => void,
 		public readonly plugins: TypeScriptServerPlugin[],
 		private readonly logDirectoryProvider: LogDirectoryProvider,
 		allModeIds: string[]
 	) {
+		super();
 		this.pathSeparator = path.sep;
 		this.lastStart = Date.now();
 
@@ -231,7 +229,12 @@ export default class TypeScriptServiceClient implements ITypeScriptServiceClient
 		this.bufferSyncSupport = new BufferSyncSupport(this, allModeIds);
 		this.onReady(() => { this.bufferSyncSupport.listen(); });
 
-		workspace.onDidChangeConfiguration(() => {
+		this.diagnosticsManager = new DiagnosticsManager('typescript');
+		this.bufferSyncSupport.onDelete(resource => {
+			this.diagnosticsManager.delete(resource);
+		}, null, this._disposables);
+
+		vscode.workspace.onDidChangeConfiguration(() => {
 			const oldConfiguration = this._configuration;
 			this._configuration = TypeScriptServiceConfiguration.loadFromWorkspace();
 
@@ -250,9 +253,9 @@ export default class TypeScriptServiceClient implements ITypeScriptServiceClient
 					this.restartTsServer();
 				}
 			}
-		}, this, this.disposables);
+		}, this, this._disposables);
 		this.telemetryReporter = new TelemetryReporter(() => this._tsserverVersion || this._apiVersion.versionString);
-		this.disposables.push(this.telemetryReporter);
+		this._register(this.telemetryReporter);
 	}
 
 	public get configuration() {
@@ -260,22 +263,17 @@ export default class TypeScriptServiceClient implements ITypeScriptServiceClient
 	}
 
 	public dispose() {
+		super.dispose();
+
 		this.bufferSyncSupport.dispose();
-		this._onTsServerStarted.dispose();
-		this._onDidBeginInstallTypings.dispose();
-		this._onDidEndInstallTypings.dispose();
-		this._onTypesInstallerInitializationFailed.dispose();
 
 		if (this.servicePromise) {
 			this.servicePromise.then(childProcess => {
-				childProcess.kill();
+				if (childProcess) {
+					childProcess.kill();
+				}
 			}).then(undefined, () => void 0);
 		}
-
-		disposeAll(this.disposables);
-		this._onDiagnosticsReceived.dispose();
-		this._onConfigDiagnosticsReceived.dispose();
-		this._onResendModelsRequested.dispose();
 	}
 
 	public restartTsServer(): void {
@@ -288,7 +286,9 @@ export default class TypeScriptServiceClient implements ITypeScriptServiceClient
 			this.servicePromise = this.servicePromise.then(childProcess => {
 				this.info('Killing TS Server');
 				this.isRestarting = true;
-				childProcess.kill();
+				if (childProcess) {
+					childProcess.kill();
+				}
 				this.resetClientVersion();
 			}).then(start);
 		} else {
@@ -296,28 +296,28 @@ export default class TypeScriptServiceClient implements ITypeScriptServiceClient
 		}
 	}
 
-	private readonly _onTsServerStarted = new EventEmitter<API>();
+	private readonly _onTsServerStarted = this._register(new vscode.EventEmitter<API>());
 	public readonly onTsServerStarted = this._onTsServerStarted.event;
 
-	private readonly _onDiagnosticsReceived = new EventEmitter<TsDiagnostics>();
+	private readonly _onDiagnosticsReceived = this._register(new vscode.EventEmitter<TsDiagnostics>());
 	public readonly onDiagnosticsReceived = this._onDiagnosticsReceived.event;
 
-	private readonly _onConfigDiagnosticsReceived = new EventEmitter<Proto.ConfigFileDiagnosticEvent>();
+	private readonly _onConfigDiagnosticsReceived = this._register(new vscode.EventEmitter<Proto.ConfigFileDiagnosticEvent>());
 	public readonly onConfigDiagnosticsReceived = this._onConfigDiagnosticsReceived.event;
 
-	private readonly _onResendModelsRequested = new EventEmitter<void>();
+	private readonly _onResendModelsRequested = this._register(new vscode.EventEmitter<void>());
 	public readonly onResendModelsRequested = this._onResendModelsRequested.event;
 
-	private readonly _onProjectLanguageServiceStateChanged = new EventEmitter<Proto.ProjectLanguageServiceStateEventBody>();
+	private readonly _onProjectLanguageServiceStateChanged = this._register(new vscode.EventEmitter<Proto.ProjectLanguageServiceStateEventBody>());
 	public readonly onProjectLanguageServiceStateChanged = this._onProjectLanguageServiceStateChanged.event;
 
-	private readonly _onDidBeginInstallTypings = new EventEmitter<Proto.BeginInstallTypesEventBody>();
+	private readonly _onDidBeginInstallTypings = this._register(new vscode.EventEmitter<Proto.BeginInstallTypesEventBody>());
 	public readonly onDidBeginInstallTypings = this._onDidBeginInstallTypings.event;
 
-	private readonly _onDidEndInstallTypings = new EventEmitter<Proto.EndInstallTypesEventBody>();
+	private readonly _onDidEndInstallTypings = this._register(new vscode.EventEmitter<Proto.EndInstallTypesEventBody>());
 	public readonly onDidEndInstallTypings = this._onDidEndInstallTypings.event;
 
-	private readonly _onTypesInstallerInitializationFailed = new EventEmitter<Proto.TypesInstallerInitializationFailedEventBody>();
+	private readonly _onTypesInstallerInitializationFailed = this._register(new vscode.EventEmitter<Proto.TypesInstallerInitializationFailedEventBody>());
 	public readonly onTypesInstallerInitializationFailed = this._onTypesInstallerInitializationFailed.event;
 
 	public get apiVersion(): API {
@@ -340,7 +340,7 @@ export default class TypeScriptServiceClient implements ITypeScriptServiceClient
 		this.telemetryReporter.logTelemetry(eventName, properties);
 	}
 
-	private service(): Thenable<ForkedTsServerProcess> {
+	private service(): Thenable<ForkedTsServerProcess | null> {
 		if (this.servicePromise) {
 			return this.servicePromise;
 		}
@@ -360,12 +360,17 @@ export default class TypeScriptServiceClient implements ITypeScriptServiceClient
 		}
 	}
 
-	private startService(resendModels: boolean = false): Promise<ForkedTsServerProcess> {
+	private token: number = 0;
+	private startService(resendModels: boolean = false): Promise<ForkedTsServerProcess> | null {
+		if (this.isDisposed) {
+			return null;
+		}
+
 		let currentVersion = this.versionPicker.currentVersion;
 
 		this.info(`Using tsserver from: ${currentVersion.path}`);
 		if (!fs.existsSync(currentVersion.tsServerPath)) {
-			window.showWarningMessage(localize('noServerFound', 'The path {0} doesn\'t point to a valid tsserver install. Falling back to bundled TypeScript version.', currentVersion.path));
+			vscode.window.showWarningMessage(localize('noServerFound', 'The path {0} doesn\'t point to a valid tsserver install. Falling back to bundled TypeScript version.', currentVersion.path));
 
 			this.versionPicker.useBundledVersion();
 			currentVersion = this.versionPicker.currentVersion;
@@ -377,6 +382,7 @@ export default class TypeScriptServiceClient implements ITypeScriptServiceClient
 		this.requestQueue = new RequestQueue();
 		this.callbacks = new CallbackMap();
 		this.lastError = null;
+		let mytoken = ++this.token;
 
 		return this.servicePromise = new Promise<ForkedTsServerProcess>(async (resolve, reject) => {
 			try {
@@ -385,76 +391,82 @@ export default class TypeScriptServiceClient implements ITypeScriptServiceClient
 				const tsServerForkOptions: electron.IForkOptions = {
 					execArgv: debugPort ? [`--inspect=${debugPort}`] : [] // [`--debug-brk=5859`]
 				};
-				electron.fork(currentVersion.tsServerPath, tsServerForkArgs, tsServerForkOptions, this.logger, (err: any, childProcess: cp.ChildProcess | null) => {
-					if (err || !childProcess) {
-						this.lastError = err;
-						this.error('Starting TSServer failed with error.', err);
-						window.showErrorMessage(localize('serverCouldNotBeStarted', 'TypeScript language server couldn\'t be started. Error message is: {0}', err.message || err));
-						/* __GDPR__
-							"error" : {
-								"${include}": [
-									"${TypeScriptCommonProperties}"
-								]
-							}
-						*/
-						this.logTelemetry('error');
-						this.resetClientVersion();
+				const childProcess = electron.fork(currentVersion.tsServerPath, tsServerForkArgs, tsServerForkOptions, this.logger);
+				childProcess.once('error', (err: Error) => {
+					this.lastError = err;
+					this.error('Starting TSServer failed with error.', err);
+					vscode.window.showErrorMessage(localize('serverCouldNotBeStarted', 'TypeScript language server couldn\'t be started. Error message is: {0}', err.message || err.name));
+					/* __GDPR__
+						"error" : {
+							"${include}": [
+								"${TypeScriptCommonProperties}"
+							]
+						}
+					*/
+					this.logTelemetry('error');
+					this.resetClientVersion();
+					return;
+				});
+
+				this.info('Started TSServer');
+				const handle = new ForkedTsServerProcess(childProcess);
+				this.lastStart = Date.now();
+
+				handle.onError((err: Error) => {
+					if (this.token !== mytoken) {
+						// this is coming from an old process
 						return;
 					}
-
-					this.info('Started TSServer');
-					const handle = new ForkedTsServerProcess(childProcess);
-					this.lastStart = Date.now();
-
-					handle.onError((err: Error) => {
-						this.lastError = err;
-						this.error('TSServer errored with error.', err);
-						if (this.tsServerLogFile) {
-							this.error(`TSServer log file: ${this.tsServerLogFile}`);
+					this.lastError = err;
+					this.error('TSServer errored with error.', err);
+					if (this.tsServerLogFile) {
+						this.error(`TSServer log file: ${this.tsServerLogFile}`);
+					}
+					/* __GDPR__
+						"tsserver.error" : {
+							"${include}": [
+								"${TypeScriptCommonProperties}"
+							]
 						}
+					*/
+					this.logTelemetry('tsserver.error');
+					this.serviceExited(false);
+				});
+				handle.onExit((code: any) => {
+					if (this.token !== mytoken) {
+						// this is coming from an old process
+						return;
+					}
+					if (code === null || typeof code === 'undefined') {
+						this.info('TSServer exited');
+					} else {
+						this.error(`TSServer exited with code: ${code}`);
 						/* __GDPR__
-							"tsserver.error" : {
+							"tsserver.exitWithCode" : {
+								"code" : { "classification": "CallstackOrException", "purpose": "PerformanceAndHealth" },
 								"${include}": [
 									"${TypeScriptCommonProperties}"
 								]
 							}
 						*/
-						this.logTelemetry('tsserver.error');
-						this.serviceExited(false);
-					});
-					handle.onExit((code: any) => {
-						if (code === null || typeof code === 'undefined') {
-							this.info('TSServer exited');
-						} else {
-							this.error(`TSServer exited with code: ${code}`);
-							/* __GDPR__
-								"tsserver.exitWithCode" : {
-									"code" : { "classification": "CallstackOrException", "purpose": "PerformanceAndHealth" },
-									"${include}": [
-										"${TypeScriptCommonProperties}"
-									]
-								}
-							*/
-							this.logTelemetry('tsserver.exitWithCode', { code: code });
-						}
+						this.logTelemetry('tsserver.exitWithCode', { code: code });
+					}
 
-						if (this.tsServerLogFile) {
-							this.info(`TSServer log file: ${this.tsServerLogFile}`);
-						}
-						this.serviceExited(!this.isRestarting);
-						this.isRestarting = false;
-					});
-
-					handle.createReader(
-						msg => { this.dispatchMessage(msg); },
-						error => { this.error('ReaderError', error); });
-
-					this._onReady!.resolve();
-					resolve(handle);
-					this._onTsServerStarted.fire(currentVersion.version);
-
-					this.serviceStarted(resendModels);
+					if (this.tsServerLogFile) {
+						this.info(`TSServer log file: ${this.tsServerLogFile}`);
+					}
+					this.serviceExited(!this.isRestarting);
+					this.isRestarting = false;
 				});
+
+				handle.onData(msg => this.dispatchMessage(msg));
+				handle.onReaderError(error => this.error('ReaderError', error));
+
+				this._onReady!.resolve();
+				resolve(handle);
+				this._onTsServerStarted.fire(currentVersion.version);
+
+				this.serviceStarted(resendModels);
 			} catch (error) {
 				reject(error);
 			}
@@ -476,7 +488,7 @@ export default class TypeScriptServiceClient implements ITypeScriptServiceClient
 
 	public async openTsServerLogFile(): Promise<boolean> {
 		if (!this.apiVersion.gte(API.v222)) {
-			window.showErrorMessage(
+			vscode.window.showErrorMessage(
 				localize(
 					'typescript.openTsServerLog.notSupported',
 					'TS Server logging requires TS 2.2.2+'));
@@ -484,7 +496,7 @@ export default class TypeScriptServiceClient implements ITypeScriptServiceClient
 		}
 
 		if (this._configuration.tsServerLogLevel === TsServerLogLevel.Off) {
-			window.showErrorMessage<MessageItem>(
+			vscode.window.showErrorMessage<vscode.MessageItem>(
 				localize(
 					'typescript.openTsServerLog.loggingNotEnabled',
 					'TS Server logging is off. Please set `typescript.tsserver.log` and restart the TS server to enable logging'),
@@ -495,7 +507,7 @@ export default class TypeScriptServiceClient implements ITypeScriptServiceClient
 				})
 				.then(selection => {
 					if (selection) {
-						return workspace.getConfiguration().update('typescript.tsserver.log', 'verbose', true).then(() => {
+						return vscode.workspace.getConfiguration().update('typescript.tsserver.log', 'verbose', true).then(() => {
 							this.restartTsServer();
 						});
 					}
@@ -505,17 +517,17 @@ export default class TypeScriptServiceClient implements ITypeScriptServiceClient
 		}
 
 		if (!this.tsServerLogFile) {
-			window.showWarningMessage(localize(
+			vscode.window.showWarningMessage(localize(
 				'typescript.openTsServerLog.noLogFile',
 				'TS Server has not started logging.'));
 			return false;
 		}
 
 		try {
-			await commands.executeCommand('revealFileInOS', Uri.parse(this.tsServerLogFile));
+			await vscode.commands.executeCommand('revealFileInOS', vscode.Uri.parse(this.tsServerLogFile));
 			return true;
 		} catch {
-			window.showWarningMessage(localize(
+			vscode.window.showWarningMessage(localize(
 				'openTsServerLog.openFileFailedFailed',
 				'Could not open TS Server log file'));
 			return false;
@@ -526,7 +538,7 @@ export default class TypeScriptServiceClient implements ITypeScriptServiceClient
 		const configureOptions: Proto.ConfigureRequestArguments = {
 			hostInfo: 'vscode'
 		};
-		this.execute('configure', configureOptions);
+		this.executeWithoutWaitingForResponse('configure', configureOptions);
 		this.setCompilerOptionsForInferredProjects(this._configuration);
 		if (resendModels) {
 			this._onResendModelsRequested.fire();
@@ -541,7 +553,7 @@ export default class TypeScriptServiceClient implements ITypeScriptServiceClient
 		const args: Proto.SetCompilerOptionsForInferredProjectsArgs = {
 			options: this.getCompilerOptionsForInferredProjects(configuration)
 		};
-		this.execute('compilerOptionsForInferredProjects', args, true);
+		this.executeWithoutWaitingForResponse('compilerOptionsForInferredProjects', args);
 	}
 
 	private getCompilerOptionsForInferredProjects(configuration: TypeScriptServiceConfiguration): Proto.ExternalProjectCompilerOptions {
@@ -558,7 +570,7 @@ export default class TypeScriptServiceClient implements ITypeScriptServiceClient
 			reportIssue
 		}
 
-		interface MyMessageItem extends MessageItem {
+		interface MyMessageItem extends vscode.MessageItem {
 			id: MessageAction;
 		}
 
@@ -579,7 +591,7 @@ export default class TypeScriptServiceClient implements ITypeScriptServiceClient
 				if (diff < 10 * 1000 /* 10 seconds */) {
 					this.lastStart = Date.now();
 					startService = false;
-					prompt = window.showErrorMessage<MyMessageItem>(
+					prompt = vscode.window.showErrorMessage<MyMessageItem>(
 						localize('serverDiedAfterStart', 'The TypeScript language service died 5 times right after it got started. The service will not be restarted.'),
 						{
 							title: localize('serverDiedReportIssue', 'Report Issue'),
@@ -596,7 +608,7 @@ export default class TypeScriptServiceClient implements ITypeScriptServiceClient
 					this.resetClientVersion();
 				} else if (diff < 60 * 1000 /* 1 Minutes */) {
 					this.lastStart = Date.now();
-					prompt = window.showWarningMessage<MyMessageItem>(
+					prompt = vscode.window.showWarningMessage<MyMessageItem>(
 						localize('serverDied', 'The TypeScript language service died unexpectedly 5 times in the last 5 Minutes.'),
 						{
 							title: localize('serverDiedReportIssue', 'Report Issue'),
@@ -606,7 +618,7 @@ export default class TypeScriptServiceClient implements ITypeScriptServiceClient
 				if (prompt) {
 					prompt.then(item => {
 						if (item && item.id === MessageAction.reportIssue) {
-							return commands.executeCommand('workbench.action.reportIssues');
+							return vscode.commands.executeCommand('workbench.action.reportIssues');
 						}
 						return undefined;
 					});
@@ -618,7 +630,7 @@ export default class TypeScriptServiceClient implements ITypeScriptServiceClient
 		}
 	}
 
-	public normalizedPath(resource: Uri): string | null {
+	public normalizedPath(resource: vscode.Uri): string | null {
 		if (this._apiVersion.gte(API.v213)) {
 			if (resource.scheme === fileSchemes.walkThroughSnippet || resource.scheme === fileSchemes.untitled) {
 				const dirName = path.dirname(resource.path);
@@ -640,7 +652,7 @@ export default class TypeScriptServiceClient implements ITypeScriptServiceClient
 		return result.replace(new RegExp('\\' + this.pathSeparator, 'g'), '/');
 	}
 
-	public toPath(resource: Uri): string | null {
+	public toPath(resource: vscode.Uri): string | null {
 		return this.normalizedPath(resource);
 	}
 
@@ -648,11 +660,11 @@ export default class TypeScriptServiceClient implements ITypeScriptServiceClient
 		return this._apiVersion.gte(API.v270) ? '^' : '';
 	}
 
-	public toResource(filepath: string): Uri {
+	public toResource(filepath: string): vscode.Uri {
 		if (this._apiVersion.gte(API.v213)) {
 			if (filepath.startsWith(TypeScriptServiceClient.WALK_THROUGH_SNIPPET_SCHEME_COLON) || (filepath.startsWith(fileSchemes.untitled + ':'))
 			) {
-				let resource = Uri.parse(filepath);
+				let resource = vscode.Uri.parse(filepath);
 				if (this.inMemoryResourcePrefix) {
 					const dirName = path.dirname(resource.path);
 					const fileName = path.basename(resource.path);
@@ -666,8 +678,8 @@ export default class TypeScriptServiceClient implements ITypeScriptServiceClient
 		return this.bufferSyncSupport.toResource(filepath);
 	}
 
-	public getWorkspaceRootForResource(resource: Uri): string | undefined {
-		const roots = workspace.workspaceFolders;
+	public getWorkspaceRootForResource(resource: vscode.Uri): string | undefined {
+		const roots = vscode.workspace.workspaceFolders;
 		if (!roots || !roots.length) {
 			return undefined;
 		}
@@ -684,22 +696,31 @@ export default class TypeScriptServiceClient implements ITypeScriptServiceClient
 		return undefined;
 	}
 
-	public executeAsync(command: string, args: Proto.GeterrRequestArgs, token: CancellationToken): Promise<any> {
-		return this.executeImpl(command, args, { isAsync: true, token, expectsResult: true });
+	public execute(command: string, args: any, token: vscode.CancellationToken): Promise<any> {
+		return this.executeImpl(command, args, {
+			isAsync: false,
+			token,
+			expectsResult: true
+		});
 	}
 
-	public execute(command: string, args: any, expectsResultOrToken?: boolean | CancellationToken): Promise<any> {
-		let token: CancellationToken | undefined = undefined;
-		let expectsResult = true;
-		if (typeof expectsResultOrToken === 'boolean') {
-			expectsResult = expectsResultOrToken;
-		} else {
-			token = expectsResultOrToken;
-		}
-		return this.executeImpl(command, args, { isAsync: false, token, expectsResult });
+	public executeWithoutWaitingForResponse(command: string, args: any): void {
+		this.executeImpl(command, args, {
+			isAsync: false,
+			token: undefined,
+			expectsResult: false
+		});
 	}
 
-	private executeImpl(command: string, args: any, executeInfo: { isAsync: boolean, token?: CancellationToken, expectsResult: boolean }): Promise<any> {
+	public executeAsync(command: string, args: Proto.GeterrRequestArgs, token: vscode.CancellationToken): Promise<any> {
+		return this.executeImpl(command, args, {
+			isAsync: true,
+			token,
+			expectsResult: true
+		});
+	}
+
+	private executeImpl(command: string, args: any, executeInfo: { isAsync: boolean, token?: vscode.CancellationToken, expectsResult: boolean }): Promise<any> {
 		const request = this.requestQueue.createRequest(command, args);
 		const requestInfo: RequestItem = {
 			request: request,
@@ -721,6 +742,17 @@ export default class TypeScriptServiceClient implements ITypeScriptServiceClient
 				if (!wasCancelled) {
 					this.error(`'${command}' request failed with error.`, err);
 					const properties = this.parseErrorText(err && err.message, command);
+					/* __GDPR__
+						"languageServiceErrorResponse" : {
+							"command" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+							"message" : { "classification": "CallstackOrException", "purpose": "PerformanceAndHealth" },
+							"stack" : { "classification": "CallstackOrException", "purpose": "PerformanceAndHealth" },
+							"errortext" : { "classification": "CallstackOrException", "purpose": "PerformanceAndHealth" },
+							"${include}": [
+								"${TypeScriptCommonProperties}"
+							]
+						}
+					*/
 					this.logTelemetry('languageServiceErrorResponse', properties);
 				}
 				throw err;
@@ -734,6 +766,10 @@ export default class TypeScriptServiceClient implements ITypeScriptServiceClient
 		return result;
 	}
 
+	public interuptGetErr<R>(f: () => R): R {
+		return this.bufferSyncSupport.interuptGetErr(f);
+	}
+
 	/**
 	 * Given a `errorText` from a tsserver request indicating failure in handling a request,
 	 * prepares a payload for telemetry-logging.
@@ -774,8 +810,10 @@ export default class TypeScriptServiceClient implements ITypeScriptServiceClient
 			this.callbacks.add(serverRequest.seq, requestItem.callbacks, requestItem.isAsync);
 		}
 		this.service()
-			.then((childProcess) => {
-				childProcess.write(serverRequest);
+			.then(childProcess => {
+				if (childProcess) {
+					childProcess.write(serverRequest);
+				}
 			})
 			.then(undefined, err => {
 				const callback = this.callbacks.fetch(serverRequest.seq);
@@ -879,7 +917,7 @@ export default class TypeScriptServiceClient implements ITypeScriptServiceClient
 			case 'projectsUpdatedInBackground':
 				if (event.body) {
 					const body = (event as Proto.ProjectsUpdatedInBackgroundEvent).body;
-					const resources = body.openFiles.map(Uri.file);
+					const resources = body.openFiles.map(vscode.Uri.file);
 					this.bufferSyncSupport.getErr(resources);
 				}
 				break;
@@ -974,7 +1012,7 @@ export default class TypeScriptServiceClient implements ITypeScriptServiceClient
 		}
 
 		if (this.apiVersion.gte(API.v222)) {
-			this.cancellationPipeName = electron.getTempSock('tscancellation');
+			this.cancellationPipeName = electron.getTempFile('tscancellation');
 			args.push('--cancellationPipeName', this.cancellationPipeName + '*');
 		}
 
@@ -1053,7 +1091,7 @@ export default class TypeScriptServiceClient implements ITypeScriptServiceClient
 const getTsLocale = (configuration: TypeScriptServiceConfiguration): string | undefined =>
 	(configuration.locale
 		? configuration.locale
-		: env.language);
+		: vscode.env.language);
 
 function getDignosticsKind(event: Proto.Event) {
 	switch (event.event) {
diff --git a/extensions/typescript-language-features/src/utils/api.ts b/extensions/typescript-language-features/src/utils/api.ts
index 2f499965df1..11e22609951 100644
--- a/extensions/typescript-language-features/src/utils/api.ts
+++ b/extensions/typescript-language-features/src/utils/api.ts
@@ -24,11 +24,12 @@ export default class API {
 	public static readonly v240 = API.fromSimpleString('2.4.0');
 	public static readonly v250 = API.fromSimpleString('2.5.0');
 	public static readonly v260 = API.fromSimpleString('2.6.0');
-	public static readonly v262 = API.fromSimpleString('2.6.2');
 	public static readonly v270 = API.fromSimpleString('2.7.0');
 	public static readonly v280 = API.fromSimpleString('2.8.0');
 	public static readonly v290 = API.fromSimpleString('2.9.0');
 	public static readonly v291 = API.fromSimpleString('2.9.1');
+	public static readonly v292 = API.fromSimpleString('2.9.2');
+	public static readonly v300 = API.fromSimpleString('3.0.0');
 
 
 	public static fromVersionString(versionString: string): API {
diff --git a/extensions/typescript-language-features/src/utils/arrays.ts b/extensions/typescript-language-features/src/utils/arrays.ts
index 57dbd54a29c..3a15e38981a 100644
--- a/extensions/typescript-language-features/src/utils/arrays.ts
+++ b/extensions/typescript-language-features/src/utils/arrays.ts
@@ -14,4 +14,8 @@ export function equals<T>(one: T[], other: T[], itemEquals: (a: T, b: T) => bool
 	}
 
 	return true;
+}
+
+export function flatten<T>(arr: T[][]): T[] {
+	return [].concat.apply([], arr);
 }
\ No newline at end of file
diff --git a/extensions/typescript-language-features/src/utils/cancellation.ts b/extensions/typescript-language-features/src/utils/cancellation.ts
new file mode 100644
index 00000000000..10933baa939
--- /dev/null
+++ b/extensions/typescript-language-features/src/utils/cancellation.ts
@@ -0,0 +1,10 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as vscode from 'vscode';
+
+const nulTokenSource = new vscode.CancellationTokenSource();
+
+export const nulToken = nulTokenSource.token;
\ No newline at end of file
diff --git a/extensions/typescript-language-features/src/utils/codeAction.ts b/extensions/typescript-language-features/src/utils/codeAction.ts
index 984ea6bc9f3..c45379e611a 100644
--- a/extensions/typescript-language-features/src/utils/codeAction.ts
+++ b/extensions/typescript-language-features/src/utils/codeAction.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { WorkspaceEdit, workspace } from 'vscode';
+import * as vscode from 'vscode';
 import * as Proto from '../protocol';
 import { ITypeScriptServiceClient } from '../typescriptService';
 import * as typeConverters from './typeConverters';
@@ -11,35 +11,34 @@ import * as typeConverters from './typeConverters';
 export function getEditForCodeAction(
 	client: ITypeScriptServiceClient,
 	action: Proto.CodeAction
-): WorkspaceEdit | undefined {
+): vscode.WorkspaceEdit | undefined {
 	return action.changes && action.changes.length
-		? typeConverters.WorkspaceEdit.fromFromFileCodeEdits(client, action.changes)
+		? typeConverters.WorkspaceEdit.fromFileCodeEdits(client, action.changes)
 		: undefined;
 }
 
 export async function applyCodeAction(
 	client: ITypeScriptServiceClient,
-	action: Proto.CodeAction
+	action: Proto.CodeAction,
+	token: vscode.CancellationToken
 ): Promise<boolean> {
 	const workspaceEdit = getEditForCodeAction(client, action);
 	if (workspaceEdit) {
-		if (!(await workspace.applyEdit(workspaceEdit))) {
+		if (!(await vscode.workspace.applyEdit(workspaceEdit))) {
 			return false;
 		}
 	}
-	return applyCodeActionCommands(client, action);
+	return applyCodeActionCommands(client, action.commands, token);
 }
 
 export async function applyCodeActionCommands(
 	client: ITypeScriptServiceClient,
-	action: Proto.CodeAction
+	commands: ReadonlyArray<{}> | undefined,
+	token: vscode.CancellationToken,
 ): Promise<boolean> {
-	if (action.commands && action.commands.length) {
-		for (const command of action.commands) {
-			const response = await client.execute('applyCodeActionCommand', { command });
-			if (!response || !response.body) {
-				return false;
-			}
+	if (commands && commands.length) {
+		for (const command of commands) {
+			await client.execute('applyCodeActionCommand', { command }, token);
 		}
 	}
 	return true;
diff --git a/extensions/typescript-language-features/src/utils/configuration.ts b/extensions/typescript-language-features/src/utils/configuration.ts
index 9359a2bbed0..adeb071062e 100644
--- a/extensions/typescript-language-features/src/utils/configuration.ts
+++ b/extensions/typescript-language-features/src/utils/configuration.ts
@@ -2,7 +2,7 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import { WorkspaceConfiguration, workspace } from 'vscode';
+import * as vscode from 'vscode';
 import * as arrays from './arrays';
 
 export enum TsServerLogLevel {
@@ -58,7 +58,7 @@ export class TypeScriptServiceConfiguration {
 	}
 
 	private constructor() {
-		const configuration = workspace.getConfiguration();
+		const configuration = vscode.workspace.getConfiguration();
 
 		this.locale = TypeScriptServiceConfiguration.extractLocale(configuration);
 		this.globalTsdk = TypeScriptServiceConfiguration.extractGlobalTsdk(configuration);
@@ -83,7 +83,7 @@ export class TypeScriptServiceConfiguration {
 			&& arrays.equals(this.tsServerPluginPaths, other.tsServerPluginPaths);
 	}
 
-	private static extractGlobalTsdk(configuration: WorkspaceConfiguration): string | null {
+	private static extractGlobalTsdk(configuration: vscode.WorkspaceConfiguration): string | null {
 		const inspect = configuration.inspect('typescript.tsdk');
 		if (inspect && inspect.globalValue && 'string' === typeof inspect.globalValue) {
 			return inspect.globalValue;
@@ -91,7 +91,7 @@ export class TypeScriptServiceConfiguration {
 		return null;
 	}
 
-	private static extractLocalTsdk(configuration: WorkspaceConfiguration): string | null {
+	private static extractLocalTsdk(configuration: vscode.WorkspaceConfiguration): string | null {
 		const inspect = configuration.inspect('typescript.tsdk');
 		if (inspect && inspect.workspaceValue && 'string' === typeof inspect.workspaceValue) {
 			return inspect.workspaceValue;
@@ -99,32 +99,32 @@ export class TypeScriptServiceConfiguration {
 		return null;
 	}
 
-	private static readTsServerLogLevel(configuration: WorkspaceConfiguration): TsServerLogLevel {
+	private static readTsServerLogLevel(configuration: vscode.WorkspaceConfiguration): TsServerLogLevel {
 		const setting = configuration.get<string>('typescript.tsserver.log', 'off');
 		return TsServerLogLevel.fromString(setting);
 	}
 
-	private static readTsServerPluginPaths(configuration: WorkspaceConfiguration): string[] {
+	private static readTsServerPluginPaths(configuration: vscode.WorkspaceConfiguration): string[] {
 		return configuration.get<string[]>('typescript.tsserver.pluginPaths', []);
 	}
 
-	private static readCheckJs(configuration: WorkspaceConfiguration): boolean {
+	private static readCheckJs(configuration: vscode.WorkspaceConfiguration): boolean {
 		return configuration.get<boolean>('javascript.implicitProjectConfig.checkJs', false);
 	}
 
-	private static readExperimentalDecorators(configuration: WorkspaceConfiguration): boolean {
+	private static readExperimentalDecorators(configuration: vscode.WorkspaceConfiguration): boolean {
 		return configuration.get<boolean>('javascript.implicitProjectConfig.experimentalDecorators', false);
 	}
 
-	private static readNpmLocation(configuration: WorkspaceConfiguration): string | null {
+	private static readNpmLocation(configuration: vscode.WorkspaceConfiguration): string | null {
 		return configuration.get<string | null>('typescript.npm', null);
 	}
 
-	private static readDisableAutomaticTypeAcquisition(configuration: WorkspaceConfiguration): boolean {
+	private static readDisableAutomaticTypeAcquisition(configuration: vscode.WorkspaceConfiguration): boolean {
 		return configuration.get<boolean>('typescript.disableAutomaticTypeAcquisition', false);
 	}
 
-	private static extractLocale(configuration: WorkspaceConfiguration): string | null {
+	private static extractLocale(configuration: vscode.WorkspaceConfiguration): string | null {
 		return configuration.get<string | null>('typescript.locale', null);
 	}
 }
diff --git a/extensions/typescript-language-features/src/utils/dependentRegistration.ts b/extensions/typescript-language-features/src/utils/dependentRegistration.ts
index 88e0cf00b02..434379f57e1 100644
--- a/extensions/typescript-language-features/src/utils/dependentRegistration.ts
+++ b/extensions/typescript-language-features/src/utils/dependentRegistration.ts
@@ -5,10 +5,10 @@
 
 import * as vscode from 'vscode';
 import { ITypeScriptServiceClient } from '../typescriptService';
-import API from '../utils/api';
-import { disposeAll } from '../utils/dispose';
+import API from './api';
+import { Disposable } from './dispose';
 
-class ConditionalRegistration {
+export class ConditionalRegistration {
 	private registration: vscode.Disposable | undefined = undefined;
 
 	public constructor(
@@ -36,15 +36,15 @@ class ConditionalRegistration {
 	}
 }
 
-export class VersionDependentRegistration {
+export class VersionDependentRegistration extends Disposable {
 	private readonly _registration: ConditionalRegistration;
-	private readonly _disposables: vscode.Disposable[] = [];
 
 	constructor(
 		private readonly client: ITypeScriptServiceClient,
 		private readonly minVersion: API,
 		register: () => vscode.Disposable,
 	) {
+		super();
 		this._registration = new ConditionalRegistration(register);
 
 		this.update(client.apiVersion);
@@ -55,7 +55,7 @@ export class VersionDependentRegistration {
 	}
 
 	public dispose() {
-		disposeAll(this._disposables);
+		super.dispose();
 		this._registration.dispose();
 	}
 
@@ -65,31 +65,27 @@ export class VersionDependentRegistration {
 }
 
 
-export class ConfigurationDependentRegistration {
+export class ConfigurationDependentRegistration extends Disposable {
 	private readonly _registration: ConditionalRegistration;
-	private readonly _disposables: vscode.Disposable[] = [];
 
 	constructor(
 		private readonly language: string,
 		private readonly configValue: string,
 		register: () => vscode.Disposable,
 	) {
+		super();
 		this._registration = new ConditionalRegistration(register);
-
 		this.update();
-
-		vscode.workspace.onDidChangeConfiguration(() => {
-			this.update();
-		}, null, this._disposables);
+		vscode.workspace.onDidChangeConfiguration(this.update, this, this._disposables);
 	}
 
 	public dispose() {
-		disposeAll(this._disposables);
+		super.dispose();
 		this._registration.dispose();
 	}
 
 	private update() {
-		const config = vscode.workspace.getConfiguration(this.language);
+		const config = vscode.workspace.getConfiguration(this.language, null);
 		this._registration.update(!!config.get<boolean>(this.configValue));
 	}
 }
diff --git a/extensions/typescript-language-features/src/utils/dispose.ts b/extensions/typescript-language-features/src/utils/dispose.ts
index b7c72f8b8b4..ba629191cf5 100644
--- a/extensions/typescript-language-features/src/utils/dispose.ts
+++ b/extensions/typescript-language-features/src/utils/dispose.ts
@@ -5,7 +5,7 @@
 
 import * as vscode from 'vscode';
 
-export function disposeAll(disposables: vscode.Disposable[]) {
+function disposeAll(disposables: vscode.Disposable[]) {
 	while (disposables.length) {
 		const item = disposables.pop();
 		if (item) {
@@ -13,3 +13,30 @@ export function disposeAll(disposables: vscode.Disposable[]) {
 		}
 	}
 }
+
+export abstract class Disposable {
+	private _isDisposed = false;
+
+	protected _disposables: vscode.Disposable[] = [];
+
+	public dispose(): any {
+		if (this._isDisposed) {
+			return;
+		}
+		this._isDisposed = true;
+		disposeAll(this._disposables);
+	}
+
+	protected _register<T extends vscode.Disposable>(value: T): T {
+		if (this._isDisposed) {
+			value.dispose();
+		} else {
+			this._disposables.push(value);
+		}
+		return value;
+	}
+
+	protected get isDisposed() {
+		return this._isDisposed;
+	}
+}
\ No newline at end of file
diff --git a/extensions/typescript-language-features/src/utils/electron.ts b/extensions/typescript-language-features/src/utils/electron.ts
index 34a6534f8ec..b6ed76ceea0 100644
--- a/extensions/typescript-language-features/src/utils/electron.ts
+++ b/extensions/typescript-language-features/src/utils/electron.ts
@@ -4,10 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 
 import Logger from './logger';
-import { getTempFile, makeRandomHexString } from './temp';
+import * as temp from './temp';
 import path = require('path');
-import os = require('os');
-import net = require('net');
+import fs = require('fs');
 import cp = require('child_process');
 
 export interface IForkOptions {
@@ -15,37 +14,27 @@ export interface IForkOptions {
 	execArgv?: string[];
 }
 
-export function getTempSock(prefix: string): string {
-	const fullName = `vscode-${prefix}-${makeRandomHexString(20)}`;
-	return getTempFile(fullName + '.sock');
+const getRootTempDir = (() => {
+	let dir: string | undefined;
+	return () => {
+		if (!dir) {
+			dir = temp.getTempFile(`vscode-typescript`);
+			if (!fs.existsSync(dir)) {
+				fs.mkdirSync(dir);
+			}
+		}
+		return dir;
+	};
+})();
+
+export function getTempFile(prefix: string): string {
+	return path.join(getRootTempDir(), `${prefix}-${temp.makeRandomHexString(20)}.tmp`);
 }
 
-function generatePipeName(): string {
-	return getPipeName(makeRandomHexString(40));
-}
-
-function getPipeName(name: string): string {
-	const fullName = 'vscode-' + name;
-	if (process.platform === 'win32') {
-		return '\\\\.\\pipe\\' + fullName + '-sock';
-	}
-
-	// Mac/Unix: use socket file
-	return path.join(os.tmpdir(), fullName + '.sock');
-}
-
-function generatePatchedEnv(
-	env: any,
-	stdInPipeName: string,
-	stdOutPipeName: string,
-	stdErrPipeName: string
-): any {
+function generatePatchedEnv(env: any): any {
 	const newEnv = Object.assign({}, env);
 
 	// Set the two unique pipe names and the electron flag as process env
-	newEnv['STDIN_PIPE_NAME'] = stdInPipeName;
-	newEnv['STDOUT_PIPE_NAME'] = stdOutPipeName;
-	newEnv['STDERR_PIPE_NAME'] = stdErrPipeName;
 	newEnv['ELECTRON_RUN_AS_NODE'] = '1';
 
 	// Ensure we always have a PATH set
@@ -57,87 +46,18 @@ export function fork(
 	modulePath: string,
 	args: string[],
 	options: IForkOptions,
-	logger: Logger,
-	callback: (error: any, cp: cp.ChildProcess | null) => void,
-): void {
-
-	let callbackCalled = false;
-	const resolve = (result: cp.ChildProcess) => {
-		if (callbackCalled) {
-			return;
-		}
-		callbackCalled = true;
-		callback(null, result);
-	};
-	const reject = (err: any) => {
-		if (callbackCalled) {
-			return;
-		}
-		callbackCalled = true;
-		callback(err, null);
-	};
-
-	// Generate three unique pipe names
-	const stdInPipeName = generatePipeName();
-	const stdOutPipeName = generatePipeName();
-	const stdErrPipeName = generatePipeName();
-
-
-	const newEnv = generatePatchedEnv(process.env, stdInPipeName, stdOutPipeName, stdErrPipeName);
+	logger: Logger
+): cp.ChildProcess {
+	const newEnv = generatePatchedEnv(process.env);
 	newEnv['NODE_PATH'] = path.join(modulePath, '..', '..', '..');
-	let childProcess: cp.ChildProcess;
-
-	// Begin listening to stderr pipe
-	let stdErrServer = net.createServer((stdErrStream) => {
-		// From now on the childProcess.stderr is available for reading
-		childProcess.stderr = stdErrStream;
-	});
-	stdErrServer.listen(stdErrPipeName);
-
-	// Begin listening to stdout pipe
-	let stdOutServer = net.createServer((stdOutStream) => {
-		// The child process will write exactly one chunk with content `ready` when it has installed a listener to the stdin pipe
-
-		stdOutStream.once('data', (_chunk: Buffer) => {
-			// The child process is sending me the `ready` chunk, time to connect to the stdin pipe
-			childProcess.stdin = <any>net.connect(stdInPipeName);
-
-			// From now on the childProcess.stdout is available for reading
-			childProcess.stdout = stdOutStream;
-
-			resolve(childProcess);
-		});
-	});
-	stdOutServer.listen(stdOutPipeName);
-
-	let serverClosed = false;
-	const closeServer = () => {
-		if (serverClosed) {
-			return;
-		}
-		serverClosed = true;
-		stdOutServer.close();
-		stdErrServer.close();
-	};
 
 	// Create the process
 	logger.info('Forking TSServer', `PATH: ${newEnv['PATH']} `);
 
-	const bootstrapperPath = require.resolve('./electronForkStart');
-	childProcess = cp.fork(bootstrapperPath, [modulePath].concat(args), {
+	return cp.fork(modulePath, args, {
 		silent: true,
 		cwd: options.cwd,
 		env: newEnv,
 		execArgv: options.execArgv
 	});
-
-	childProcess.once('error', (err: Error) => {
-		closeServer();
-		reject(err);
-	});
-
-	childProcess.once('exit', (err: Error) => {
-		closeServer();
-		reject(err);
-	});
 }
diff --git a/extensions/typescript-language-features/src/utils/electronForkStart.ts b/extensions/typescript-language-features/src/utils/electronForkStart.ts
deleted file mode 100644
index a29d9bca680..00000000000
--- a/extensions/typescript-language-features/src/utils/electronForkStart.ts
+++ /dev/null
@@ -1,198 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-var net = require('net'),
-	fs = require('fs');
-
-var ENABLE_LOGGING = false;
-
-var log = (function () {
-	if (!ENABLE_LOGGING) {
-		return function () { };
-	}
-	var isFirst = true;
-	var LOG_LOCATION = 'C:\\stdFork.log';
-	return function log(str: any) {
-		if (isFirst) {
-			isFirst = false;
-			fs.writeFileSync(LOG_LOCATION, str + '\n');
-			return;
-		}
-		fs.appendFileSync(LOG_LOCATION, str + '\n');
-	};
-})();
-
-var stdInPipeName = process.env['STDIN_PIPE_NAME'];
-var stdOutPipeName = process.env['STDOUT_PIPE_NAME'];
-var stdErrPipeName = process.env['STDERR_PIPE_NAME'];
-
-log('STDIN_PIPE_NAME: ' + stdInPipeName);
-log('STDOUT_PIPE_NAME: ' + stdOutPipeName);
-log('STDERR_PIPE_NAME: ' + stdErrPipeName);
-log('ELECTRON_RUN_AS_NODE: ' + process.env['ELECTRON_RUN_AS_NODE']);
-
-// stdout redirection to named pipe
-(function () {
-	log('Beginning stdout redirection...');
-
-	// Create a writing stream to the stdout pipe
-	var stdOutStream = net.connect(stdOutPipeName);
-
-	// unref stdOutStream to behave like a normal standard out
-	stdOutStream.unref();
-
-	// handle process.stdout
-	(<any>process).__defineGetter__('stdout', function () { return stdOutStream; });
-
-	// Create a writing stream to the stderr pipe
-	var stdErrStream = net.connect(stdErrPipeName);
-
-	// unref stdErrStream to behave like a normal standard out
-	stdErrStream.unref();
-
-	// handle process.stderr
-	(<any>process).__defineGetter__('stderr', function () { return stdErrStream; });
-
-	var fsWriteSyncString = function (fd: number, str: string, _position: number, encoding?: string) {
-		//  fs.writeSync(fd, string[, position[, encoding]]);
-		var buf = Buffer.from(str, encoding || 'utf8');
-		return fsWriteSyncBuffer(fd, buf, 0, buf.length);
-	};
-
-	var fsWriteSyncBuffer = function (fd: number, buffer: Buffer, off: number, len: number) {
-		off = Math.abs(off | 0);
-		len = Math.abs(len | 0);
-
-		//  fs.writeSync(fd, buffer, offset, length[, position]);
-		var buffer_length = buffer.length;
-
-		if (off > buffer_length) {
-			throw new Error('offset out of bounds');
-		}
-		if (len > buffer_length) {
-			throw new Error('length out of bounds');
-		}
-		if (((off + len) | 0) < off) {
-			throw new Error('off + len overflow');
-		}
-		if (buffer_length - off < len) {
-			// Asking for more than is left over in the buffer
-			throw new Error('off + len > buffer.length');
-		}
-
-		var slicedBuffer = buffer;
-		if (off !== 0 || len !== buffer_length) {
-			slicedBuffer = buffer.slice(off, off + len);
-		}
-
-		if (fd === 1) {
-			stdOutStream.write(slicedBuffer);
-		} else {
-			stdErrStream.write(slicedBuffer);
-		}
-		return slicedBuffer.length;
-	};
-
-	// handle fs.writeSync(1, ...)
-	var originalWriteSync = fs.writeSync;
-	fs.writeSync = function (fd: number, data: any, _position: number, _encoding?: string) {
-		if (fd !== 1 && fd !== 2) {
-			return originalWriteSync.apply(fs, arguments);
-		}
-		// usage:
-		//  fs.writeSync(fd, buffer, offset, length[, position]);
-		// OR
-		//  fs.writeSync(fd, string[, position[, encoding]]);
-
-		if (data instanceof Buffer) {
-			return fsWriteSyncBuffer.apply(null, arguments);
-		}
-
-		// For compatibility reasons with fs.writeSync, writing null will write "null", etc
-		if (typeof data !== 'string') {
-			data += '';
-		}
-
-		return fsWriteSyncString.apply(null, arguments);
-	};
-
-	log('Finished defining process.stdout, process.stderr and fs.writeSync');
-})();
-
-// stdin redirection to named pipe
-(function () {
-
-	// Begin listening to stdin pipe
-	var server = net.createServer(function (stream: any) {
-		// Stop accepting new connections, keep the existing one alive
-		server.close();
-
-		log('Parent process has connected to my stdin. All should be good now.');
-
-		// handle process.stdin
-		(<any>process).__defineGetter__('stdin', function () {
-			return stream;
-		});
-
-		// Remove myself from process.argv
-		process.argv.splice(1, 1);
-
-		// Load the actual program
-		var program = process.argv[1];
-		log('Loading program: ' + program);
-
-		// Unset the custom environmental variables that should not get inherited
-		delete process.env['STDIN_PIPE_NAME'];
-		delete process.env['STDOUT_PIPE_NAME'];
-		delete process.env['STDERR_PIPE_NAME'];
-		delete process.env['ELECTRON_RUN_AS_NODE'];
-
-		require(program);
-
-		log('Finished loading program.');
-
-		var stdinIsReferenced = true;
-		var timer = setInterval(function () {
-			var listenerCount = (
-				stream.listeners('data').length +
-				stream.listeners('end').length +
-				stream.listeners('close').length +
-				stream.listeners('error').length
-			);
-			// log('listenerCount: ' + listenerCount);
-			if (listenerCount <= 1) {
-				// No more "actual" listeners, only internal node
-				if (stdinIsReferenced) {
-					stdinIsReferenced = false;
-					// log('unreferencing stream!!!');
-					stream.unref();
-				}
-			} else {
-				// There are "actual" listeners
-				if (!stdinIsReferenced) {
-					stdinIsReferenced = true;
-					stream.ref();
-				}
-			}
-			// log(
-			// 	'' + stream.listeners('data').length +
-			// 	' ' + stream.listeners('end').length +
-			// 	' ' + stream.listeners('close').length +
-			// 	' ' + stream.listeners('error').length
-			// );
-		}, 1000);
-
-		if ((<any>timer).unref) {
-			(<any>timer).unref();
-		}
-	});
-
-
-	server.listen(stdInPipeName, function () {
-		// signal via stdout that the parent process can now begin writing to stdin pipe
-		process.stdout.write('ready');
-	});
-
-})();
\ No newline at end of file
diff --git a/extensions/typescript-language-features/src/utils/languageDescription.ts b/extensions/typescript-language-features/src/utils/languageDescription.ts
index cd84e9b5f47..32cec300ebd 100644
--- a/extensions/typescript-language-features/src/utils/languageDescription.ts
+++ b/extensions/typescript-language-features/src/utils/languageDescription.ts
@@ -4,26 +4,36 @@
  *--------------------------------------------------------------------------------------------*/
 import * as languageModeIds from './languageModeIds';
 
+export const enum DiagnosticLanguage {
+	JavaScript,
+	TypeScript
+}
+
+export const allDiagnosticLangauges = [DiagnosticLanguage.JavaScript, DiagnosticLanguage.TypeScript];
+
 export interface LanguageDescription {
 	readonly id: string;
+	readonly diagnosticOwner: string;
 	readonly diagnosticSource: string;
+	readonly diagnosticLanguage: DiagnosticLanguage;
 	readonly modeIds: string[];
 	readonly configFile?: string;
 	readonly isExternal?: boolean;
-	readonly diagnosticOwner: string;
 }
 
 export const standardLanguageDescriptions: LanguageDescription[] = [
 	{
 		id: 'typescript',
-		diagnosticSource: 'ts',
 		diagnosticOwner: 'typescript',
+		diagnosticSource: 'ts',
+		diagnosticLanguage: DiagnosticLanguage.TypeScript,
 		modeIds: [languageModeIds.typescript, languageModeIds.typescriptreact],
 		configFile: 'tsconfig.json'
 	}, {
 		id: 'javascript',
-		diagnosticSource: 'ts',
 		diagnosticOwner: 'typescript',
+		diagnosticSource: 'ts',
+		diagnosticLanguage: DiagnosticLanguage.JavaScript,
 		modeIds: [languageModeIds.javascript, languageModeIds.javascriptreact],
 		configFile: 'jsconfig.json'
 	}
diff --git a/extensions/typescript-language-features/src/utils/languageModeIds.ts b/extensions/typescript-language-features/src/utils/languageModeIds.ts
index 5fe187e13db..9be48067eda 100644
--- a/extensions/typescript-language-features/src/utils/languageModeIds.ts
+++ b/extensions/typescript-language-features/src/utils/languageModeIds.ts
@@ -14,4 +14,8 @@ export const jsxTags = 'jsx-tags';
 
 export function isSupportedLanguageMode(doc: vscode.TextDocument) {
 	return vscode.languages.match([typescript, typescriptreact, javascript, javascriptreact], doc) > 0;
+}
+
+export function isTypeScriptDocument(doc: vscode.TextDocument) {
+	return vscode.languages.match([typescript, typescriptreact], doc) > 0;
 }
\ No newline at end of file
diff --git a/extensions/typescript-language-features/src/utils/logDirectoryProvider.ts b/extensions/typescript-language-features/src/utils/logDirectoryProvider.ts
index fba55ea03e1..5f97d445a90 100644
--- a/extensions/typescript-language-features/src/utils/logDirectoryProvider.ts
+++ b/extensions/typescript-language-features/src/utils/logDirectoryProvider.ts
@@ -28,13 +28,13 @@ export default class LogDirectoryProvider {
 	@memoize
 	private logDirectory(): string | undefined {
 		try {
-			const path = this.context.logDirectory;
+			const path = this.context.logPath;
 			if (!fs.existsSync(path)) {
 				fs.mkdirSync(path);
 			}
-			return this.context.logDirectory;
+			return this.context.logPath;
 		} catch {
 			return undefined;
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/extensions/typescript-language-features/src/utils/logger.ts b/extensions/typescript-language-features/src/utils/logger.ts
index cc57346efbf..7ba79adad12 100644
--- a/extensions/typescript-language-features/src/utils/logger.ts
+++ b/extensions/typescript-language-features/src/utils/logger.ts
@@ -3,18 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { OutputChannel, window } from 'vscode';
+import * as vscode from 'vscode';
+import * as nls from 'vscode-nls';
 import * as is from './is';
 import { memoize } from './memoize';
 
-import * as nls from 'vscode-nls';
 const localize = nls.loadMessageBundle();
 
 export default class Logger {
 
 	@memoize
-	private get output(): OutputChannel {
-		return window.createOutputChannel(localize('channelName', 'TypeScript'));
+	private get output(): vscode.OutputChannel {
+		return vscode.window.createOutputChannel(localize('channelName', 'TypeScript'));
 	}
 
 	private data2String(data: any): string {
diff --git a/extensions/typescript-language-features/src/utils/managedFileContext.ts b/extensions/typescript-language-features/src/utils/managedFileContext.ts
index b16f4524061..f88e90e19e0 100644
--- a/extensions/typescript-language-features/src/utils/managedFileContext.ts
+++ b/extensions/typescript-language-features/src/utils/managedFileContext.ts
@@ -9,9 +9,8 @@ import { isSupportedLanguageMode } from './languageModeIds';
 /**
  * When clause context set when the current file is managed by vscode's built-in typescript extension.
  */
-const isManagedFile_contextName = 'typescript.isManagedFile';
-
 export default class ManagedFileContextManager {
+	private static readonly contextName = 'typescript.isManagedFile';
 
 	private isInManagedFileContext: boolean = false;
 
@@ -41,8 +40,7 @@ export default class ManagedFileContextManager {
 			return;
 		}
 
-		vscode.commands.executeCommand('setContext', isManagedFile_contextName, newValue);
+		vscode.commands.executeCommand('setContext', ManagedFileContextManager.contextName, newValue);
 		this.isInManagedFileContext = newValue;
 	}
 }
-
diff --git a/extensions/typescript-language-features/src/utils/pluginPathsProvider.ts b/extensions/typescript-language-features/src/utils/pluginPathsProvider.ts
index e2e39d68801..547660f0649 100644
--- a/extensions/typescript-language-features/src/utils/pluginPathsProvider.ts
+++ b/extensions/typescript-language-features/src/utils/pluginPathsProvider.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import * as path from 'path';
-import { workspace } from 'vscode';
-
+import * as vscode from 'vscode';
 import { TypeScriptServiceConfiguration } from './configuration';
 import { RelativeWorkspacePathResolver } from './relativePathResolver';
 
+
 export class TypeScriptPluginPathsProvider {
 	public readonly relativePathResolver: RelativeWorkspacePathResolver = new RelativeWorkspacePathResolver();
 
@@ -37,7 +37,7 @@ export class TypeScriptPluginPathsProvider {
 			return [workspacePath];
 		}
 
-		return (workspace.workspaceFolders || [])
+		return (vscode.workspace.workspaceFolders || [])
 			.map(workspaceFolder => path.join(workspaceFolder.uri.fsPath, pluginPath));
 	}
 }
\ No newline at end of file
diff --git a/extensions/typescript-language-features/src/utils/plugins.ts b/extensions/typescript-language-features/src/utils/plugins.ts
index 13966dd0b06..e67df651b40 100644
--- a/extensions/typescript-language-features/src/utils/plugins.ts
+++ b/extensions/typescript-language-features/src/utils/plugins.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { extensions } from 'vscode';
+import * as vscode from 'vscode';
 
 export interface TypeScriptServerPlugin {
 	readonly path: string;
@@ -13,7 +13,7 @@ export interface TypeScriptServerPlugin {
 
 export function getContributedTypeScriptServerPlugins(): TypeScriptServerPlugin[] {
 	const plugins: TypeScriptServerPlugin[] = [];
-	for (const extension of extensions.all) {
+	for (const extension of vscode.extensions.all) {
 		const pack = extension.packageJSON;
 		if (pack.contributes && pack.contributes.typescriptServerPlugins && Array.isArray(pack.contributes.typescriptServerPlugins)) {
 			for (const plugin of pack.contributes.typescriptServerPlugins) {
diff --git a/extensions/typescript-language-features/src/utils/previewer.ts b/extensions/typescript-language-features/src/utils/previewer.ts
index 647ae3bf91b..aa698b2c163 100644
--- a/extensions/typescript-language-features/src/utils/previewer.ts
+++ b/extensions/typescript-language-features/src/utils/previewer.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import * as vscode from 'vscode';
 import * as Proto from '../protocol';
-import { MarkdownString } from 'vscode';
 
 function getTagBodyText(tag: Proto.JSDocTagInfo): string | undefined {
 	if (!tag.text) {
@@ -27,7 +27,7 @@ function getTagBodyText(tag: Proto.JSDocTagInfo): string | undefined {
 function getTagDocumentation(tag: Proto.JSDocTagInfo): string | undefined {
 	switch (tag.name) {
 		case 'param':
-			const body = (tag.text || '').split(/^([\w\.]+)\s*/);
+			const body = (tag.text || '').split(/^([\w\.]+)\s*-?\s*/);
 			if (body && body.length === 3) {
 				const param = body[1];
 				const doc = body[2];
@@ -64,21 +64,26 @@ export function tagsMarkdownPreview(tags: Proto.JSDocTagInfo[]): string {
 export function markdownDocumentation(
 	documentation: Proto.SymbolDisplayPart[],
 	tags: Proto.JSDocTagInfo[]
-): MarkdownString {
-	const out = new MarkdownString();
+): vscode.MarkdownString {
+	const out = new vscode.MarkdownString();
 	addMarkdownDocumentation(out, documentation, tags);
 	return out;
 }
 
 export function addMarkdownDocumentation(
-	out: MarkdownString,
-	documentation: Proto.SymbolDisplayPart[],
-	tags: Proto.JSDocTagInfo[]
-): MarkdownString {
-	out.appendMarkdown(plain(documentation));
-	const tagsPreview = tagsMarkdownPreview(tags);
-	if (tagsPreview) {
-		out.appendMarkdown('\n\n' + tagsPreview);
+	out: vscode.MarkdownString,
+	documentation: Proto.SymbolDisplayPart[] | undefined,
+	tags: Proto.JSDocTagInfo[] | undefined
+): vscode.MarkdownString {
+	if (documentation) {
+		out.appendMarkdown(plain(documentation));
+	}
+
+	if (tags) {
+		const tagsPreview = tagsMarkdownPreview(tags);
+		if (tagsPreview) {
+			out.appendMarkdown('\n\n' + tagsPreview);
+		}
 	}
 	return out;
-}
\ No newline at end of file
+}
diff --git a/extensions/typescript-language-features/src/utils/projectStatus.ts b/extensions/typescript-language-features/src/utils/projectStatus.ts
index 8fbc39d2ce6..4eb9b8c7686 100644
--- a/extensions/typescript-language-features/src/utils/projectStatus.ts
+++ b/extensions/typescript-language-features/src/utils/projectStatus.ts
@@ -4,10 +4,10 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as vscode from 'vscode';
-import { ITypeScriptServiceClient } from '../typescriptService';
 import { loadMessageBundle } from 'vscode-nls';
-import { openOrCreateConfigFile, isImplicitProjectConfigFile } from './tsconfig';
+import { ITypeScriptServiceClient } from '../typescriptService';
 import TelemetryReporter from './telemetry';
+import { isImplicitProjectConfigFile, openOrCreateConfigFile } from './tsconfig';
 
 const localize = loadMessageBundle();
 
diff --git a/extensions/typescript-language-features/src/utils/relativePathResolver.ts b/extensions/typescript-language-features/src/utils/relativePathResolver.ts
index e424fca126a..85b72a55d6b 100644
--- a/extensions/typescript-language-features/src/utils/relativePathResolver.ts
+++ b/extensions/typescript-language-features/src/utils/relativePathResolver.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import * as path from 'path';
-import { workspace } from 'vscode';
+import * as vscode from 'vscode';
 
 export class RelativeWorkspacePathResolver {
 	public asAbsoluteWorkspacePath(relativePath: string): string | undefined {
-		for (const root of workspace.workspaceFolders || []) {
+		for (const root of vscode.workspace.workspaceFolders || []) {
 			const rootPrefixes = [`./${root.name}/`, `${root.name}/`, `.\\${root.name}\\`, `${root.name}\\`];
 			for (const rootPrefix of rootPrefixes) {
 				if (relativePath.startsWith(rootPrefix)) {
diff --git a/extensions/typescript-language-features/src/utils/resourceMap.ts b/extensions/typescript-language-features/src/utils/resourceMap.ts
new file mode 100644
index 00000000000..33d6f00b4be
--- /dev/null
+++ b/extensions/typescript-language-features/src/utils/resourceMap.ts
@@ -0,0 +1,105 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as fs from 'fs';
+import * as vscode from 'vscode';
+import { memoize } from './memoize';
+import { getTempFile } from './temp';
+
+/**
+ * Maps of file resources
+ *
+ * Attempts to handle correct mapping on both case sensitive and case in-sensitive
+ * file systems.
+ */
+export class ResourceMap<T> {
+	private readonly _map = new Map<string, { resource: vscode.Uri, value: T }>();
+
+	constructor(
+		private readonly _normalizePath: (resource: vscode.Uri) => string | null = (resource) => resource.fsPath
+	) { }
+
+	public get size() {
+		return this._map.size;
+	}
+
+	public has(resource: vscode.Uri): boolean {
+		const file = this.toKey(resource);
+		return !!file && this._map.has(file);
+	}
+
+	public get(resource: vscode.Uri): T | undefined {
+		const file = this.toKey(resource);
+		if (!file) {
+			return undefined;
+		}
+		const entry = this._map.get(file);
+		return entry ? entry.value : undefined;
+	}
+
+	public set(resource: vscode.Uri, value: T) {
+		const file = this.toKey(resource);
+		if (!file) {
+			return;
+		}
+		const entry = this._map.get(file);
+		if (entry) {
+			entry.value = value;
+		} else {
+			this._map.set(file, { resource, value });
+		}
+	}
+
+	public delete(resource: vscode.Uri): void {
+		const file = this.toKey(resource);
+		if (file) {
+			this._map.delete(file);
+		}
+	}
+
+	public clear(): void {
+		this._map.clear();
+	}
+
+	public get values(): Iterable<T> {
+		return Array.from(this._map.values()).map(x => x.value);
+	}
+
+	public get entries(): Iterable<{ resource: vscode.Uri, value: T }> {
+		return this._map.values();
+	}
+
+	private toKey(resource: vscode.Uri): string | null {
+		const key = this._normalizePath(resource);
+		if (!key) {
+			return key;
+		}
+		return this.isCaseInsensitivePath(key) ? key.toLowerCase() : key;
+	}
+
+	private isCaseInsensitivePath(path: string) {
+		if (isWindowsPath(path)) {
+			return true;
+		}
+		return path[0] === '/' && this.onIsCaseInsenitiveFileSystem;
+	}
+
+	@memoize
+	private get onIsCaseInsenitiveFileSystem() {
+		if (process.platform === 'win32') {
+			return true;
+		}
+		if (process.platform !== 'darwin') {
+			return false;
+		}
+		const temp = getTempFile('typescript-case-check');
+		fs.writeFileSync(temp, '');
+		return fs.existsSync(temp.toUpperCase());
+	}
+}
+
+export function isWindowsPath(path: string): boolean {
+	return /^[a-zA-Z]:\\/.test(path);
+}
diff --git a/extensions/typescript-language-features/src/utils/telemetry.ts b/extensions/typescript-language-features/src/utils/telemetry.ts
index 8f83e2cc904..4ac7a953937 100644
--- a/extensions/typescript-language-features/src/utils/telemetry.ts
+++ b/extensions/typescript-language-features/src/utils/telemetry.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as path from 'path';
+import * as vscode from 'vscode';
 import VsCodeTelemetryReporter from 'vscode-extension-telemetry';
 import { memoize } from './memoize';
 
@@ -59,15 +59,14 @@ export default class TelemetryReporter {
 
 	@memoize
 	private get packageInfo(): IPackageInfo | null {
-		const packagePath = path.join(__dirname, '..', '..', 'package.json');
-		const extensionPackage = require(packagePath);
-		if (extensionPackage) {
+		const { packageJSON } = vscode.extensions.getExtension('vscode.typescript-language-features')!;
+		if (packageJSON) {
 			return {
-				name: extensionPackage.name,
-				version: extensionPackage.version,
-				aiKey: extensionPackage.aiKey
+				name: packageJSON.name,
+				version: packageJSON.version,
+				aiKey: packageJSON.aiKey
 			};
 		}
 		return null;
 	}
-}
\ No newline at end of file
+}
diff --git a/extensions/typescript-language-features/src/utils/tracer.ts b/extensions/typescript-language-features/src/utils/tracer.ts
index 97ce34a2abd..2f2394dcaa1 100644
--- a/extensions/typescript-language-features/src/utils/tracer.ts
+++ b/extensions/typescript-language-features/src/utils/tracer.ts
@@ -3,12 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { workspace } from 'vscode';
-
+import * as vscode from 'vscode';
 import * as Proto from '../protocol';
 import Logger from './logger';
 
-
 enum Trace {
 	Off,
 	Messages,
@@ -45,7 +43,7 @@ export default class Tracer {
 	}
 
 	private static readTrace(): Trace {
-		let result: Trace = Trace.fromString(workspace.getConfiguration().get<string>('typescript.tsserver.trace', 'off'));
+		let result: Trace = Trace.fromString(vscode.workspace.getConfiguration().get<string>('typescript.tsserver.trace', 'off'));
 		if (result === Trace.Off && !!process.env.TSS_TRACE) {
 			result = Trace.Messages;
 		}
diff --git a/extensions/typescript-language-features/src/utils/tsconfig.ts b/extensions/typescript-language-features/src/utils/tsconfig.ts
index 91293a8cc11..bc2f9c232a1 100644
--- a/extensions/typescript-language-features/src/utils/tsconfig.ts
+++ b/extensions/typescript-language-features/src/utils/tsconfig.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as vscode from 'vscode';
 import * as path from 'path';
+import * as vscode from 'vscode';
 import * as Proto from '../protocol';
-
 import { TypeScriptServiceConfiguration } from './configuration';
 
+
 export function isImplicitProjectConfigFile(configFileName: string) {
 	return configFileName.indexOf('/dev/null/') === 0;
 }
diff --git a/extensions/typescript-language-features/src/utils/typeConverters.ts b/extensions/typescript-language-features/src/utils/typeConverters.ts
index d65b1468e9d..44ad7f4ae5e 100644
--- a/extensions/typescript-language-features/src/utils/typeConverters.ts
+++ b/extensions/typescript-language-features/src/utils/typeConverters.ts
@@ -24,6 +24,14 @@ export namespace Range {
 		endLine: range.end.line + 1,
 		endOffset: range.end.character + 1
 	});
+
+	export const toFormattingRequestArgs = (file: string, range: vscode.Range): Proto.FormatRequestArgs => ({
+		file,
+		line: range.start.line + 1,
+		offset: range.start.character + 1,
+		endLine: range.end.line + 1,
+		endOffset: range.end.character + 1
+	});
 }
 
 export namespace Position {
@@ -50,11 +58,18 @@ export namespace TextEdit {
 }
 
 export namespace WorkspaceEdit {
-	export function fromFromFileCodeEdits(
+	export function fromFileCodeEdits(
+		client: ITypeScriptServiceClient,
+		edits: Iterable<Proto.FileCodeEdits>
+	): vscode.WorkspaceEdit {
+		return withFileCodeEdits(new vscode.WorkspaceEdit(), client, edits);
+
+	}
+	export function withFileCodeEdits(
+		workspaceEdit: vscode.WorkspaceEdit,
 		client: ITypeScriptServiceClient,
 		edits: Iterable<Proto.FileCodeEdits>
 	): vscode.WorkspaceEdit {
-		const workspaceEdit = new vscode.WorkspaceEdit();
 		for (const edit of edits) {
 			for (const textChange of edit.textChanges) {
 				workspaceEdit.replace(client.toResource(edit.fileName),
diff --git a/extensions/typescript-language-features/src/utils/typingsStatus.ts b/extensions/typescript-language-features/src/utils/typingsStatus.ts
index cde711cd61b..78f303f0f39 100644
--- a/extensions/typescript-language-features/src/utils/typingsStatus.ts
+++ b/extensions/typescript-language-features/src/utils/typingsStatus.ts
@@ -3,18 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { MessageItem, workspace, Disposable, ProgressLocation, window } from 'vscode';
-import { ITypeScriptServiceClient } from '../typescriptService';
+import * as vscode from 'vscode';
 import { loadMessageBundle } from 'vscode-nls';
+import { ITypeScriptServiceClient } from '../typescriptService';
 
 const localize = loadMessageBundle();
 
 const typingsInstallTimeout = 30 * 1000;
 
-export default class TypingsStatus extends Disposable {
+export default class TypingsStatus extends vscode.Disposable {
 	private _acquiringTypings: { [eventId: string]: NodeJS.Timer } = Object.create({});
 	private _client: ITypeScriptServiceClient;
-	private _subscriptions: Disposable[] = [];
+	private _subscriptions: vscode.Disposable[] = [];
 
 	constructor(client: ITypeScriptServiceClient) {
 		super(() => this.dispose());
@@ -60,10 +60,10 @@ export default class TypingsStatus extends Disposable {
 export class AtaProgressReporter {
 
 	private _promises = new Map<number, Function>();
-	private _disposable: Disposable;
+	private _disposable: vscode.Disposable;
 
 	constructor(client: ITypeScriptServiceClient) {
-		this._disposable = Disposable.from(
+		this._disposable = vscode.Disposable.from(
 			client.onDidBeginInstallTypings(e => this._onBegin(e.eventId)),
 			client.onDidEndInstallTypings(e => this._onEndOrTimeout(e.eventId)),
 			client.onTypesInstallerInitializationFailed(_ => this.onTypesInstallerInitializationFailed()));
@@ -83,8 +83,8 @@ export class AtaProgressReporter {
 			});
 		});
 
-		window.withProgress({
-			location: ProgressLocation.Window,
+		vscode.window.withProgress({
+			location: vscode.ProgressLocation.Window,
 			title: localize('installingPackages', "Fetching data for better TypeScript IntelliSense")
 		}, () => promise);
 	}
@@ -98,12 +98,12 @@ export class AtaProgressReporter {
 	}
 
 	private onTypesInstallerInitializationFailed() {
-		interface MyMessageItem extends MessageItem {
+		interface MyMessageItem extends vscode.MessageItem {
 			id: number;
 		}
 
-		if (workspace.getConfiguration('typescript').get<boolean>('check.npmIsInstalled', true)) {
-			window.showWarningMessage<MyMessageItem>(
+		if (vscode.workspace.getConfiguration('typescript').get<boolean>('check.npmIsInstalled', true)) {
+			vscode.window.showWarningMessage<MyMessageItem>(
 				localize(
 					'typesInstallerInitializationFailed.title',
 					"Could not install typings files for JavaScript language features. Please ensure that NPM is installed or configure 'typescript.npm' in your user settings. Click [here]({0}) to learn more.",
@@ -118,7 +118,7 @@ export class AtaProgressReporter {
 				}
 				switch (selected.id) {
 					case 1:
-						const tsConfig = workspace.getConfiguration('typescript');
+						const tsConfig = vscode.workspace.getConfiguration('typescript');
 						tsConfig.update('check.npmIsInstalled', false, true);
 						break;
 				}
diff --git a/extensions/typescript-language-features/src/utils/versionPicker.ts b/extensions/typescript-language-features/src/utils/versionPicker.ts
index f48aae90c27..bf81cb5c466 100644
--- a/extensions/typescript-language-features/src/utils/versionPicker.ts
+++ b/extensions/typescript-language-features/src/utils/versionPicker.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import * as vscode from 'vscode';
 import * as nls from 'vscode-nls';
-import { TypeScriptVersionProvider, TypeScriptVersion } from './versionProvider';
-import { Memento, commands, Uri, window, QuickPickItem, workspace } from 'vscode';
+import { TypeScriptVersion, TypeScriptVersionProvider } from './versionProvider';
 
 const localize = nls.loadMessageBundle();
 
 const useWorkspaceTsdkStorageKey = 'typescript.useWorkspaceTsdk';
 
-interface MyQuickPickItem extends QuickPickItem {
+interface MyQuickPickItem extends vscode.QuickPickItem {
 	id: MessageAction;
 	version?: TypeScriptVersion;
 }
@@ -27,7 +27,7 @@ export class TypeScriptVersionPicker {
 
 	public constructor(
 		private readonly versionProvider: TypeScriptVersionProvider,
-		private readonly workspaceState: Memento
+		private readonly workspaceState: vscode.Memento
 	) {
 		this._currentVersion = this.versionProvider.defaultVersion;
 
@@ -82,7 +82,7 @@ export class TypeScriptVersionPicker {
 			id: MessageAction.learnMore
 		});
 
-		const selected = await window.showQuickPick<MyQuickPickItem>(pickOptions, {
+		const selected = await vscode.window.showQuickPick<MyQuickPickItem>(pickOptions, {
 			placeHolder: localize(
 				'selectTsVersion',
 				'Select the TypeScript version used for JavaScript and TypeScript language features'),
@@ -97,7 +97,7 @@ export class TypeScriptVersionPicker {
 			case MessageAction.useLocal:
 				await this.workspaceState.update(useWorkspaceTsdkStorageKey, true);
 				if (selected.version) {
-					const tsConfig = workspace.getConfiguration('typescript');
+					const tsConfig = vscode.workspace.getConfiguration('typescript');
 					await tsConfig.update('tsdk', selected.version.pathLabel, false);
 
 					const previousVersion = this.currentVersion;
@@ -114,7 +114,7 @@ export class TypeScriptVersionPicker {
 
 
 			case MessageAction.learnMore:
-				commands.executeCommand('vscode.open', Uri.parse('https://go.microsoft.com/fwlink/?linkid=839919'));
+				vscode.commands.executeCommand('vscode.open', vscode.Uri.parse('https://go.microsoft.com/fwlink/?linkid=839919'));
 				return { oldVersion: this.currentVersion };
 
 			default:
diff --git a/extensions/typescript-language-features/src/utils/versionProvider.ts b/extensions/typescript-language-features/src/utils/versionProvider.ts
index 25ecb3355d1..8787d174667 100644
--- a/extensions/typescript-language-features/src/utils/versionProvider.ts
+++ b/extensions/typescript-language-features/src/utils/versionProvider.ts
@@ -2,17 +2,14 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import * as nls from 'vscode-nls';
-const localize = nls.loadMessageBundle();
-
-import * as path from 'path';
 import * as fs from 'fs';
-
-import { workspace, window } from 'vscode';
-
+import * as path from 'path';
+import * as vscode from 'vscode';
+import * as nls from 'vscode-nls';
+import API from './api';
 import { TypeScriptServiceConfiguration } from './configuration';
 import { RelativeWorkspacePathResolver } from './relativePathResolver';
-import API from './api';
+const localize = nls.loadMessageBundle();
 
 
 export class TypeScriptVersion {
@@ -40,7 +37,7 @@ export class TypeScriptVersion {
 		}
 
 		// Allow TS developers to provide custom version
-		const tsdkVersion = workspace.getConfiguration().get<string | undefined>('typescript.tsdk_version', undefined);
+		const tsdkVersion = vscode.workspace.getConfiguration().get<string | undefined>('typescript.tsdk_version', undefined);
 		if (tsdkVersion) {
 			return API.fromVersionString(tsdkVersion);
 		}
@@ -143,16 +140,16 @@ export class TypeScriptVersionProvider {
 
 	public get bundledVersion(): TypeScriptVersion {
 		try {
-			const bundledVersion = new TypeScriptVersion(
-				path.dirname(require.resolve('typescript/lib/tsserver.js')),
-				'');
+			const { extensionPath } = vscode.extensions.getExtension('vscode.typescript-language-features')!;
+			const typescriptPath = path.join(extensionPath, '../node_modules/typescript/lib');
+			const bundledVersion = new TypeScriptVersion(typescriptPath, '');
 			if (bundledVersion.isValid) {
 				return bundledVersion;
 			}
 		} catch (e) {
 			// noop
 		}
-		window.showErrorMessage(localize(
+		vscode.window.showErrorMessage(localize(
 			'noBundledServerFound',
 			'VS Code\'s tsserver was deleted by another application such as a misbehaving virus detection tool. Please reinstall VS Code.'));
 		throw new Error('Could not find bundled tsserver.js');
@@ -182,14 +179,14 @@ export class TypeScriptVersionProvider {
 	}
 
 	private loadTypeScriptVersionsFromPath(relativePath: string): TypeScriptVersion[] {
-		if (!workspace.workspaceFolders) {
+		if (!vscode.workspace.workspaceFolders) {
 			return [];
 		}
 
 		const versions: TypeScriptVersion[] = [];
-		for (const root of workspace.workspaceFolders) {
+		for (const root of vscode.workspace.workspaceFolders) {
 			let label: string = relativePath;
-			if (workspace.workspaceFolders && workspace.workspaceFolders.length > 1) {
+			if (vscode.workspace.workspaceFolders && vscode.workspace.workspaceFolders.length > 1) {
 				label = path.join(root.name, relativePath);
 			}
 
diff --git a/extensions/typescript-language-features/src/utils/versionStatus.ts b/extensions/typescript-language-features/src/utils/versionStatus.ts
index d852137cb65..450b50a2dc1 100644
--- a/extensions/typescript-language-features/src/utils/versionStatus.ts
+++ b/extensions/typescript-language-features/src/utils/versionStatus.ts
@@ -4,8 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as vscode from 'vscode';
-import { TypeScriptVersion } from './versionProvider';
 import * as languageModeIds from './languageModeIds';
+import { TypeScriptVersion } from './versionProvider';
 
 export default class VersionStatus {
 	private readonly _onChangeEditorSub: vscode.Disposable;
diff --git a/extensions/typescript-language-features/src/utils/wireProtocol.ts b/extensions/typescript-language-features/src/utils/wireProtocol.ts
index 528a9a0f71b..6de9d9d5ed4 100644
--- a/extensions/typescript-language-features/src/utils/wireProtocol.ts
+++ b/extensions/typescript-language-features/src/utils/wireProtocol.ts
@@ -4,6 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as stream from 'stream';
+import * as vscode from 'vscode';
+import { Disposable } from './dispose';
 
 const DefaultSize: number = 8192;
 const ContentLength: string = 'Content-Length: ';
@@ -78,26 +80,27 @@ class ProtocolBuffer {
 	}
 }
 
-export interface ICallback<T> {
-	(data: T): void;
-}
-
-export class Reader<T> {
+export class Reader<T> extends Disposable {
 
 	private readonly buffer: ProtocolBuffer = new ProtocolBuffer();
 	private nextMessageLength: number = -1;
 
-	public constructor(
-		private readonly readable: stream.Readable,
-		private readonly callback: ICallback<T>,
-		private readonly onError: (error: any) => void
-	) {
-		this.readable.on('data', (data: Buffer) => {
-			this.onLengthData(data);
-		});
+	public constructor(readable: stream.Readable) {
+		super();
+		readable.on('data', data => this.onLengthData(data));
 	}
 
-	private onLengthData(data: Buffer): void {
+	private readonly _onError = this._register(new vscode.EventEmitter<Error>());
+	public readonly onError = this._onError.event;
+
+	private readonly _onData = this._register(new vscode.EventEmitter<T>());
+	public readonly onData = this._onData.event;
+
+	private onLengthData(data: Buffer | string): void {
+		if (this.isDisposed) {
+			return;
+		}
+
 		try {
 			this.buffer.append(data);
 			while (true) {
@@ -113,10 +116,10 @@ export class Reader<T> {
 				}
 				this.nextMessageLength = -1;
 				const json = JSON.parse(msg);
-				this.callback(json);
+				this._onData.fire(json);
 			}
 		} catch (e) {
-			this.onError(e);
+			this._onError.fire(e);
 		}
 	}
 }
diff --git a/extensions/typescript-language-features/yarn.lock b/extensions/typescript-language-features/yarn.lock
index b9c4b1eece7..e0094482d5b 100644
--- a/extensions/typescript-language-features/yarn.lock
+++ b/extensions/typescript-language-features/yarn.lock
@@ -6,9 +6,9 @@
   version "8.0.33"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.33.tgz#1126e94374014e54478092830704f6ea89df04cd"
 
-"@types/semver@5.4.0":
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/@types/semver/-/semver-5.4.0.tgz#f3658535af7f1f502acd6da7daf405ffeb1f7ee4"
+"@types/semver@^5.5.0":
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/@types/semver/-/semver-5.5.0.tgz#146c2a29ee7d3bae4bf2fcb274636e264c813c45"
 
 ajv@^5.1.0:
   version "5.5.2"
@@ -835,6 +835,10 @@ json-stringify-safe@~5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
 
+jsonc-parser@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-2.0.1.tgz#9d23cd2709714fff508a1a6679d82135bee1ae60"
+
 jsonify@~0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73"
@@ -1270,9 +1274,9 @@ safe-buffer@^5.0.1, safe-buffer@^5.1.1, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
 
-semver@4.3.6:
-  version "4.3.6"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-4.3.6.tgz#300bc6e0e86374f7ba61068b5b1ecd57fc6532da"
+semver@5.5.1:
+  version "5.5.1"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.1.tgz#7dfdd8814bdb7cabc7be0fb1d734cfb66c940477"
 
 semver@^5.3.0, semver@^5.4.1:
   version "5.5.0"
@@ -1542,15 +1546,15 @@ vinyl@^2.0.1, vinyl@^2.0.2:
     remove-trailing-separator "^1.0.1"
     replace-ext "^1.0.0"
 
-vscode-extension-telemetry@0.0.17:
-  version "0.0.17"
-  resolved "https://registry.yarnpkg.com/vscode-extension-telemetry/-/vscode-extension-telemetry-0.0.17.tgz#15123e7edb34e7b9724b6056f54a869bbb922cb7"
+vscode-extension-telemetry@0.0.18:
+  version "0.0.18"
+  resolved "https://registry.yarnpkg.com/vscode-extension-telemetry/-/vscode-extension-telemetry-0.0.18.tgz#602ba20d8c71453aa34533a291e7638f6e5c0327"
   dependencies:
     applicationinsights "1.0.1"
 
-vscode-nls@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.1.tgz#b1f3e04e8a94a715d5a7bcbc8339c51e6d74ca51"
+vscode-nls@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-4.0.0.tgz#4001c8a6caba5cedb23a9c5ce1090395c0e44002"
 
 vscode@^1.1.10:
   version "1.1.17"
diff --git a/extensions/vb/test/colorize-results/test_vb.json b/extensions/vb/test/colorize-results/test_vb.json
index b4567db9c74..ee27f71ae6c 100644
--- a/extensions/vb/test/colorize-results/test_vb.json
+++ b/extensions/vb/test/colorize-results/test_vb.json
@@ -3,9 +3,9 @@
 		"c": "'",
 		"t": "source.asp.vb.net comment.line.apostrophe.asp punctuation.definition.comment.asp",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -14,9 +14,9 @@
 		"c": " Copyright (c) Microsoft Corporation. All rights reserved.",
 		"t": "source.asp.vb.net comment.line.apostrophe.asp",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -630,9 +630,9 @@
 		"c": "'",
 		"t": "source.asp.vb.net comment.line.apostrophe.asp punctuation.definition.comment.asp",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -641,9 +641,9 @@
 		"c": " The Timer property of the DateAndTime object returns the seconds",
 		"t": "source.asp.vb.net comment.line.apostrophe.asp",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -674,9 +674,9 @@
 		"c": "'",
 		"t": "source.asp.vb.net comment.line.apostrophe.asp punctuation.definition.comment.asp",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -685,9 +685,9 @@
 		"c": " and milliseconds that have passed since midnight.",
 		"t": "source.asp.vb.net comment.line.apostrophe.asp",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -1114,9 +1114,9 @@
 		"c": "'",
 		"t": "source.asp.vb.net comment.line.apostrophe.asp punctuation.definition.comment.asp",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -1125,9 +1125,9 @@
 		"c": " In a real application, some unit of work would",
 		"t": "source.asp.vb.net comment.line.apostrophe.asp",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -1180,9 +1180,9 @@
 		"c": "'",
 		"t": "source.asp.vb.net comment.line.apostrophe.asp punctuation.definition.comment.asp",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -1191,9 +1191,9 @@
 		"c": " be done here each time through the loop.",
 		"t": "source.asp.vb.net comment.line.apostrophe.asp",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -1763,9 +1763,9 @@
 		"c": "'",
 		"t": "source.asp.vb.net comment.line.apostrophe.asp punctuation.definition.comment.asp",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -1774,9 +1774,9 @@
 		"c": " Check to see if the operation was canceled.",
 		"t": "source.asp.vb.net comment.line.apostrophe.asp",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
diff --git a/extensions/vscode-api-tests/package.json b/extensions/vscode-api-tests/package.json
index e93913708b9..4c3f93d4fc2 100644
--- a/extensions/vscode-api-tests/package.json
+++ b/extensions/vscode-api-tests/package.json
@@ -5,8 +5,10 @@
 	"publisher": "vscode",
 	"enableProposedApi": true,
 	"private": true,
+	"main": "horse",
+	"activationEvents": [],
 	"engines": {
-		"vscode": "*"
+		"vscode": "1.25.0"
 	},
 	"contributes": {
 		"configuration": {
@@ -47,7 +49,9 @@
 	},
 	"devDependencies": {
 		"@types/mocha": "2.2.43",
-		"@types/node": "7.0.43",
+		"@types/node": "^8.10.25",
+		"mocha-junit-reporter": "^1.17.0",
+		"mocha-multi-reporters": "^1.1.7",
 		"typescript": "^1.6.2",
 		"vscode": "1.1.5"
 	}
diff --git a/extensions/vscode-api-tests/src/singlefolder-tests/index.ts b/extensions/vscode-api-tests/src/singlefolder-tests/index.ts
index f65a756a8de..edd765036c2 100644
--- a/extensions/vscode-api-tests/src/singlefolder-tests/index.ts
+++ b/extensions/vscode-api-tests/src/singlefolder-tests/index.ts
@@ -3,26 +3,28 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-//
-// PLEASE DO NOT MODIFY / DELETE UNLESS YOU KNOW WHAT YOU ARE DOING
-//
-// This file is providing the test runner to use when running extension tests.
-// By default the test runner in use is Mocha based.
-//
-// You can provide your own test runner if you want to override it by exporting
-// a function run(testRoot: string, clb: (error:Error) => void) that the extension
-// host can call to run the tests. The test runner is expected to use console.log
-// to report the results back to the caller. When the tests are finished, return
-// a possible error to the callback or null if none.
-
+const path = require('path');
 const testRunner = require('vscode/lib/testrunner');
 
-// You can directly control Mocha options by uncommenting the following lines
-// See https://github.com/mochajs/mocha/wiki/Using-mocha-programmatically#set-options for more info
-testRunner.configure({
-	ui: 'tdd', 		// the TDD UI is being used in extension.test.ts (suite, test, etc.)
-	useColors: process.platform !== 'win32', // colored output from test results (only windows cannot handle)
+const suite = 'Integration Single Folder Tests';
+
+const options: any = {
+	ui: 'tdd',
+	useColors: true,
 	timeout: 60000
-});
+};
+
+if (process.env.BUILD_ARTIFACTSTAGINGDIRECTORY) {
+	options.reporter = 'mocha-multi-reporters';
+	options.reporterOptions = {
+		reporterEnabled: 'spec, mocha-junit-reporter',
+		mochaJunitReporterReporterOptions: {
+			testsuitesTitle: `${suite} ${process.platform}`,
+			mochaFile: path.join(process.env.BUILD_ARTIFACTSTAGINGDIRECTORY, `test-results/${process.platform}-${suite.toLowerCase().replace(/[^\w]/g, '-')}-results.xml`)
+		}
+	};
+}
+
+testRunner.configure(options);
 
 export = testRunner;
diff --git a/extensions/vscode-api-tests/src/singlefolder-tests/quickInput.test.ts b/extensions/vscode-api-tests/src/singlefolder-tests/quickInput.test.ts
new file mode 100644
index 00000000000..852f924b362
--- /dev/null
+++ b/extensions/vscode-api-tests/src/singlefolder-tests/quickInput.test.ts
@@ -0,0 +1,183 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+import * as assert from 'assert';
+import { window, commands } from 'vscode';
+import { closeAllEditors } from '../utils';
+
+interface QuickPickExpected {
+	events: string[];
+	activeItems: string[][];
+	selectionItems: string[][];
+	acceptedItems: {
+		active: string[][];
+		selection: string[][];
+		dispose: boolean[];
+	};
+}
+
+suite('window namespace tests', function () {
+
+	suite('QuickInput tests', function () {
+		teardown(closeAllEditors);
+
+		test('createQuickPick, select second', function (_done) {
+			let done = (err?: any) => {
+				done = () => {};
+				_done(err);
+			};
+
+			const quickPick = createQuickPick({
+				events: ['active', 'active', 'selection', 'accept', 'hide'],
+				activeItems: [['eins'], ['zwei']],
+				selectionItems: [['zwei']],
+				acceptedItems: {
+					active: [['zwei']],
+					selection: [['zwei']],
+					dispose: [true]
+				},
+			}, (err?: any) => done(err));
+			quickPick.items = ['eins', 'zwei', 'drei'].map(label => ({ label }));
+			quickPick.show();
+
+			(async () => {
+				await commands.executeCommand('workbench.action.quickOpenSelectNext');
+				await commands.executeCommand('workbench.action.acceptSelectedQuickOpenItem');
+			})()
+				.catch(err => done(err));
+		});
+
+		test('createQuickPick, focus second', function (_done) {
+			let done = (err?: any) => {
+				done = () => {};
+				_done(err);
+			};
+
+			const quickPick = createQuickPick({
+				events: ['active', 'selection', 'accept', 'hide'],
+				activeItems: [['zwei']],
+				selectionItems: [['zwei']],
+				acceptedItems: {
+					active: [['zwei']],
+					selection: [['zwei']],
+					dispose: [true]
+				},
+			}, (err?: any) => done(err));
+			quickPick.items = ['eins', 'zwei', 'drei'].map(label => ({ label }));
+			quickPick.activeItems = [quickPick.items[1]];
+			quickPick.show();
+
+			(async () => {
+				await commands.executeCommand('workbench.action.acceptSelectedQuickOpenItem');
+			})()
+				.catch(err => done(err));
+		});
+
+		test('createQuickPick, select first and second', function (_done) {
+			let done = (err?: any) => {
+				done = () => {};
+				_done(err);
+			};
+
+			const quickPick = createQuickPick({
+				events: ['active', 'selection', 'active', 'selection', 'accept', 'hide'],
+				activeItems: [['eins'], ['zwei']],
+				selectionItems: [['eins'], ['eins', 'zwei']],
+				acceptedItems: {
+					active: [['zwei']],
+					selection: [['eins', 'zwei']],
+					dispose: [true]
+				},
+			}, (err?: any) => done(err));
+			quickPick.canSelectMany = true;
+			quickPick.items = ['eins', 'zwei', 'drei'].map(label => ({ label }));
+			quickPick.show();
+
+			(async () => {
+				await commands.executeCommand('workbench.action.quickOpenSelectNext');
+				await commands.executeCommand('workbench.action.quickPickManyToggle');
+				await commands.executeCommand('workbench.action.quickOpenSelectNext');
+				await commands.executeCommand('workbench.action.quickPickManyToggle');
+				await commands.executeCommand('workbench.action.acceptSelectedQuickOpenItem');
+			})()
+				.catch(err => done(err));
+		});
+
+		test('createQuickPick, selection events', function (_done) {
+			let done = (err?: any) => {
+				done = () => {};
+				_done(err);
+			};
+
+			const quickPick = createQuickPick({
+				events: ['active', 'selection', 'accept', 'selection', 'accept', 'hide'],
+				activeItems: [['eins']],
+				selectionItems: [['zwei'], ['drei']],
+				acceptedItems: {
+					active: [['eins'], ['eins']],
+					selection: [['zwei'], ['drei']],
+					dispose: [false, true]
+				},
+			}, (err?: any) => done(err));
+			quickPick.items = ['eins', 'zwei', 'drei'].map(label => ({ label }));
+			quickPick.show();
+
+			quickPick.selectedItems = [quickPick.items[1]];
+			setTimeout(() => {
+				quickPick.selectedItems = [quickPick.items[2]];
+			}, 0);
+		});
+	});
+});
+
+function createQuickPick(expected: QuickPickExpected, done: (err?: any) => void) {
+	const quickPick = window.createQuickPick();
+	quickPick.onDidChangeActive(items => {
+		try {
+			assert.equal('active', expected.events.shift());
+			const expectedItems = expected.activeItems.shift();
+			assert.deepEqual(items.map(item => item.label), expectedItems);
+			assert.deepEqual(quickPick.activeItems.map(item => item.label), expectedItems);
+		} catch (err) {
+			done(err);
+		}
+	});
+	quickPick.onDidChangeSelection(items => {
+		try {
+			assert.equal('selection', expected.events.shift());
+			const expectedItems = expected.selectionItems.shift();
+			assert.deepEqual(items.map(item => item.label), expectedItems);
+			assert.deepEqual(quickPick.selectedItems.map(item => item.label), expectedItems);
+		} catch (err) {
+			done(err);
+		}
+	});
+	quickPick.onDidAccept(() => {
+		try {
+			assert.equal('accept', expected.events.shift());
+			const expectedActive = expected.acceptedItems.active.shift();
+			assert.deepEqual(quickPick.activeItems.map(item => item.label), expectedActive);
+			const expectedSelection = expected.acceptedItems.selection.shift();
+			assert.deepEqual(quickPick.selectedItems.map(item => item.label), expectedSelection);
+			if (expected.acceptedItems.dispose.shift()) {
+				quickPick.dispose();
+			}
+		} catch (err) {
+			done(err);
+		}
+	});
+	quickPick.onDidHide(() => {
+		try {
+			assert.equal('hide', expected.events.shift());
+			done();
+		} catch (err) {
+			done(err);
+		}
+	});
+
+	return quickPick;
+}
\ No newline at end of file
diff --git a/extensions/vscode-api-tests/src/singlefolder-tests/window.test.ts b/extensions/vscode-api-tests/src/singlefolder-tests/window.test.ts
index efe7c1848e6..9aee0b079f8 100644
--- a/extensions/vscode-api-tests/src/singlefolder-tests/window.test.ts
+++ b/extensions/vscode-api-tests/src/singlefolder-tests/window.test.ts
@@ -6,7 +6,7 @@
 'use strict';
 
 import * as assert from 'assert';
-import { workspace, window, commands, ViewColumn, TextEditorViewColumnChangeEvent, Uri, Selection, Position, CancellationTokenSource, TextEditorSelectionChangeKind } from 'vscode';
+import { workspace, window, commands, ViewColumn, TextEditorViewColumnChangeEvent, Uri, Selection, Position, CancellationTokenSource, TextEditorSelectionChangeKind, Terminal } from 'vscode';
 import { join } from 'path';
 import { closeAllEditors, pathEquals, createRandomFile } from '../utils';
 
@@ -81,7 +81,7 @@ suite('window namespace tests', () => {
 		});
 	});
 
-	test('editor, onDidChangeTextEditorViewColumn', () => {
+	test('editor, onDidChangeTextEditorViewColumn (close editor)', () => {
 
 		let actualEvent: TextEditorViewColumnChangeEvent;
 
@@ -119,6 +119,51 @@ suite('window namespace tests', () => {
 		});
 	});
 
+	test('editor, onDidChangeTextEditorViewColumn (move editor group)', () => {
+
+		let actualEvents: TextEditorViewColumnChangeEvent[] = [];
+
+		let registration1 = workspace.registerTextDocumentContentProvider('bikes', {
+			provideTextDocumentContent() {
+				return 'mountainbiking,roadcycling';
+			}
+		});
+
+		return Promise.all([
+			workspace.openTextDocument(Uri.parse('bikes://testing/one')).then(doc => window.showTextDocument(doc, ViewColumn.One)),
+			workspace.openTextDocument(Uri.parse('bikes://testing/two')).then(doc => window.showTextDocument(doc, ViewColumn.Two))
+		]).then(editors => {
+
+			let [, two] = editors;
+			two.show();
+
+			return new Promise(resolve => {
+
+				let registration2 = window.onDidChangeTextEditorViewColumn(event => {
+					actualEvents.push(event);
+
+					if (actualEvents.length === 2) {
+						registration2.dispose();
+						resolve();
+					}
+				});
+
+				// move active editor group left
+				return commands.executeCommand('workbench.action.moveActiveEditorGroupLeft');
+
+			}).then(() => {
+				assert.equal(actualEvents.length, 2);
+
+				for (let i = 0; i < actualEvents.length; i++) {
+					const event = actualEvents[i];
+					assert.equal(event.viewColumn, event.textEditor.viewColumn);
+				}
+
+				registration1.dispose();
+			});
+		});
+	});
+
 	test('active editor not always correct... #49125', async function () {
 		const [docA, docB] = await Promise.all([
 			workspace.openTextDocument(await createRandomFile()),
@@ -156,6 +201,56 @@ suite('window namespace tests', () => {
 		assert.equal(window.activeTextEditor!.viewColumn, ViewColumn.Two);
 	});
 
+	test('showTextDocument ViewColumn.BESIDE', async () => {
+		const [docA, docB, docC] = await Promise.all([
+			workspace.openTextDocument(await createRandomFile()),
+			workspace.openTextDocument(await createRandomFile()),
+			workspace.openTextDocument(await createRandomFile())
+		]);
+
+		await window.showTextDocument(docA, ViewColumn.One);
+		await window.showTextDocument(docB, ViewColumn.Beside);
+
+		assert.ok(window.activeTextEditor);
+		assert.ok(window.activeTextEditor!.document === docB);
+		assert.equal(window.activeTextEditor!.viewColumn, ViewColumn.Two);
+
+		await window.showTextDocument(docC, ViewColumn.Beside);
+
+		assert.ok(window.activeTextEditor!.document === docC);
+		assert.equal(window.activeTextEditor!.viewColumn, ViewColumn.Three);
+	});
+
+	test('showTextDocument ViewColumn is always defined (even when opening > ViewColumn.Nine)', async () => {
+		const [doc1, doc2, doc3, doc4, doc5, doc6, doc7, doc8, doc9, doc10] = await Promise.all([
+			workspace.openTextDocument(await createRandomFile()),
+			workspace.openTextDocument(await createRandomFile()),
+			workspace.openTextDocument(await createRandomFile()),
+			workspace.openTextDocument(await createRandomFile()),
+			workspace.openTextDocument(await createRandomFile()),
+			workspace.openTextDocument(await createRandomFile()),
+			workspace.openTextDocument(await createRandomFile()),
+			workspace.openTextDocument(await createRandomFile()),
+			workspace.openTextDocument(await createRandomFile()),
+			workspace.openTextDocument(await createRandomFile())
+		]);
+
+		await window.showTextDocument(doc1, ViewColumn.One);
+		await window.showTextDocument(doc2, ViewColumn.Two);
+		await window.showTextDocument(doc3, ViewColumn.Three);
+		await window.showTextDocument(doc4, ViewColumn.Four);
+		await window.showTextDocument(doc5, ViewColumn.Five);
+		await window.showTextDocument(doc6, ViewColumn.Six);
+		await window.showTextDocument(doc7, ViewColumn.Seven);
+		await window.showTextDocument(doc8, ViewColumn.Eight);
+		await window.showTextDocument(doc9, ViewColumn.Nine);
+		await window.showTextDocument(doc10, ViewColumn.Beside);
+
+		assert.ok(window.activeTextEditor);
+		assert.ok(window.activeTextEditor!.document === doc10);
+		assert.equal(window.activeTextEditor!.viewColumn, 10);
+	});
+
 	test('issue #27408 - showTextDocument & vscode.diff always default to ViewColumn.One', async () => {
 		const [docA, docB, docC] = await Promise.all([
 			workspace.openTextDocument(await createRandomFile()),
@@ -297,6 +392,15 @@ suite('window namespace tests', () => {
 		]);
 	});
 
+	test('showInputBox - value not empty on second try', async function () {
+		const one = window.showInputBox({ value: 'notempty' });
+		await commands.executeCommand('workbench.action.acceptSelectedQuickOpenItem');
+		assert.equal(await one, 'notempty');
+		const two = window.showInputBox({ value: 'notempty' });
+		await commands.executeCommand('workbench.action.acceptSelectedQuickOpenItem');
+		assert.equal(await two, 'notempty');
+	});
+
 
 	test('showQuickPick, accept first', async function () {
 		const pick = window.showQuickPick(['eins', 'zwei', 'drei']);
@@ -306,9 +410,14 @@ suite('window namespace tests', () => {
 
 	test('showQuickPick, accept second', async function () {
 		const resolves: ((value: string) => void)[] = [];
+		let done: () => void;
+		const unexpected = new Promise((resolve, reject) => {
+			done = () => resolve();
+			resolves.push(reject);
+		});
 		const first = new Promise(resolve => resolves.push(resolve));
 		const pick = window.showQuickPick(['eins', 'zwei', 'drei'], {
-			onDidSelectItem: item => resolves.shift()!(item as string)
+			onDidSelectItem: item => resolves.pop()!(item as string)
 		});
 		assert.equal(await first, 'eins');
 		const second = new Promise(resolve => resolves.push(resolve));
@@ -316,12 +425,19 @@ suite('window namespace tests', () => {
 		assert.equal(await second, 'zwei');
 		await commands.executeCommand('workbench.action.acceptSelectedQuickOpenItem');
 		assert.equal(await pick, 'zwei');
+		done!();
+		return unexpected;
 	});
 
 	test('showQuickPick, select first two', async function () {
 		const resolves: ((value: string) => void)[] = [];
+		let done: () => void;
+		const unexpected = new Promise((resolve, reject) => {
+			done = () => resolve();
+			resolves.push(reject);
+		});
 		const picks = window.showQuickPick(['eins', 'zwei', 'drei'], {
-			onDidSelectItem: item => resolves.shift()!(item as string),
+			onDidSelectItem: item => resolves.pop()!(item as string),
 			canPickMany: true
 		});
 		const first = new Promise(resolve => resolves.push(resolve));
@@ -334,6 +450,20 @@ suite('window namespace tests', () => {
 		await commands.executeCommand('workbench.action.quickPickManyToggle');
 		await commands.executeCommand('workbench.action.acceptSelectedQuickOpenItem');
 		assert.deepStrictEqual(await picks, ['eins', 'zwei']);
+		done!();
+		return unexpected;
+	});
+
+	test('showQuickPick, keep selection (Microsoft/vscode-azure-account#67)', async function () {
+		const picks = window.showQuickPick([
+			{ label: 'eins' },
+			{ label: 'zwei', picked: true },
+			{ label: 'drei', picked: true }
+		], {
+			canPickMany: true
+		});
+		await commands.executeCommand('workbench.action.acceptSelectedQuickOpenItem');
+		assert.deepStrictEqual((await picks)!.map(pick => pick.label), ['zwei', 'drei']);
 	});
 
 	test('showQuickPick, undefined on cancel', function () {
@@ -356,12 +486,13 @@ suite('window namespace tests', () => {
 
 	test('showQuickPick, canceled by another picker', function () {
 
+		const source = new CancellationTokenSource();
+
 		const result = window.showQuickPick(['eins', 'zwei', 'drei'], { ignoreFocusOut: true }).then(result => {
+			source.cancel();
 			assert.equal(result, undefined);
 		});
 
-		const source = new CancellationTokenSource();
-		source.cancel();
 		window.showQuickPick(['eins', 'zwei', 'drei'], undefined, source.token);
 
 		return result;
@@ -374,8 +505,8 @@ suite('window namespace tests', () => {
 		});
 
 		const source = new CancellationTokenSource();
-		source.cancel();
 		window.showInputBox(undefined, source.token);
+		source.cancel();
 
 		return result;
 	});
@@ -417,7 +548,7 @@ suite('window namespace tests', () => {
 		});
 	});
 
-	test('Default value for showInput Box accepted even if fails validateInput, #33691', function () {
+	test('Default value for showInput Box not accepted when it fails validateInput, reversing #33691', async function () {
 		const result = window.showInputBox({
 			validateInput: (value: string) => {
 				if (!value || value.trim().length === 0) {
@@ -427,19 +558,9 @@ suite('window namespace tests', () => {
 			}
 		});
 
-		const accept = commands.executeCommand('workbench.action.acceptSelectedQuickOpenItem');
-		return Promise.race([
-			result.then(() => assert.ok(false)),
-			accept.then(() => assert.ok(false), err => assert.ok(err))
-				.then(() => new Promise(resolve => setTimeout(resolve, 10)))
-		])
-			.then(() => {
-				const close = commands.executeCommand('workbench.action.closeQuickOpen');
-				return Promise.all([result, close])
-					.then(([value]) => {
-						assert.equal(value, undefined);
-					});
-			});
+		await commands.executeCommand('workbench.action.acceptSelectedQuickOpenItem');
+		await commands.executeCommand('workbench.action.closeQuickOpen');
+		assert.equal(await result, undefined);
 	});
 
 
@@ -463,37 +584,143 @@ suite('window namespace tests', () => {
 		});
 	});
 
-	test('createTerminal, Terminal.name', () => {
-		const terminal = window.createTerminal('foo');
-		assert.equal(terminal.name, 'foo');
+	suite('Terminal', () => {
+		test('createTerminal, Terminal.name', () => {
+			const terminal = window.createTerminal('foo');
+			assert.equal(terminal.name, 'foo');
 
-		assert.throws(() => {
-			(<any>terminal).name = 'bar';
-		}, 'Terminal.name should be readonly');
-	});
-
-	test('terminal, sendText immediately after createTerminal should not throw', () => {
-		const terminal = window.createTerminal();
-		assert.doesNotThrow(terminal.sendText.bind(terminal, 'echo "foo"'));
-	});
-
-	test('terminal, onDidCloseTerminal event fires when terminal is disposed', (done) => {
-		const terminal = window.createTerminal();
-		window.onDidCloseTerminal((eventTerminal) => {
-			assert.equal(terminal, eventTerminal);
-			done();
+			assert.throws(() => {
+				(<any>terminal).name = 'bar';
+			}, 'Terminal.name should be readonly');
+			terminal.dispose();
 		});
-		terminal.dispose();
-	});
 
-	test('terminal, processId immediately after createTerminal should fetch the pid', (done) => {
-		window.createTerminal().processId.then(id => {
-			assert.ok(id > 0);
-			done();
+		test('sendText immediately after createTerminal should not throw', () => {
+			const terminal = window.createTerminal();
+			assert.doesNotThrow(terminal.sendText.bind(terminal, 'echo "foo"'));
+			terminal.dispose();
 		});
-	});
 
-	test('terminal, name should set terminal.name', () => {
-		assert.equal(window.createTerminal('foo').name, 'foo');
+		test('onDidCloseTerminal event fires when terminal is disposed', (done) => {
+			const terminal = window.createTerminal();
+			const reg = window.onDidCloseTerminal((eventTerminal) => {
+				assert.equal(terminal, eventTerminal);
+				reg.dispose();
+				done();
+			});
+			terminal.dispose();
+		});
+
+		test('processId immediately after createTerminal should fetch the pid', (done) => {
+			const terminal = window.createTerminal();
+			terminal.processId.then(id => {
+				assert.ok(id > 0);
+				terminal.dispose();
+				done();
+			});
+		});
+
+		test('name in constructor should set terminal.name', () => {
+			const terminal = window.createTerminal('a');
+			assert.equal(terminal.name, 'a');
+			terminal.dispose();
+		});
+
+		test('onDidOpenTerminal should fire when a terminal is created', (done) => {
+			const reg1 = window.onDidOpenTerminal(term => {
+				assert.equal(term.name, 'b');
+				reg1.dispose();
+				const reg2 = window.onDidCloseTerminal(() => {
+					reg2.dispose();
+					done();
+				});
+				terminal.dispose();
+			});
+			const terminal = window.createTerminal('b');
+		});
+
+		test('createTerminalRenderer should fire onDidOpenTerminal and onDidCloseTerminal', (done) => {
+			const reg1 = window.onDidOpenTerminal(term => {
+				assert.equal(term.name, 'c');
+				reg1.dispose();
+				const reg2 = window.onDidCloseTerminal(() => {
+					reg2.dispose();
+					done();
+				});
+				term.dispose();
+			});
+			window.createTerminalRenderer('c');
+		});
+
+		test('terminal renderers should get maximum dimensions set when shown', (done) => {
+			let terminal: Terminal;
+			const reg1 = window.onDidOpenTerminal(term => {
+				reg1.dispose();
+				term.show();
+				terminal = term;
+			});
+			const renderer = window.createTerminalRenderer('foo');
+			const reg2 = renderer.onDidChangeMaximumDimensions(dimensions => {
+				assert.ok(dimensions.columns > 0);
+				assert.ok(dimensions.rows > 0);
+				reg2.dispose();
+				const reg3 = window.onDidCloseTerminal(() => {
+					reg3.dispose();
+					done();
+				});
+				terminal.dispose();
+			});
+		});
+
+		test('TerminalRenderer.write should fire Terminal.onData', (done) => {
+			const reg1 = window.onDidOpenTerminal(terminal => {
+				reg1.dispose();
+				const reg2 = terminal.onDidWriteData(data => {
+					assert.equal(data, 'bar');
+					reg2.dispose();
+					const reg3 = window.onDidCloseTerminal(() => {
+						reg3.dispose();
+						done();
+					});
+					terminal.dispose();
+				});
+				renderer.write('bar');
+			});
+			const renderer = window.createTerminalRenderer('foo');
+		});
+
+		test('Terminal.sendText should fire Terminal.onInput', (done) => {
+			const reg1 = window.onDidOpenTerminal(terminal => {
+				reg1.dispose();
+				const reg2 = renderer.onDidAcceptInput(data => {
+					assert.equal(data, 'bar');
+					reg2.dispose();
+					const reg3 = window.onDidCloseTerminal(() => {
+						reg3.dispose();
+						done();
+					});
+					terminal.dispose();
+				});
+				terminal.sendText('bar', false);
+			});
+			const renderer = window.createTerminalRenderer('foo');
+		});
+
+		test('onDidChangeActiveTerminal should fire when new terminals are created', (done) => {
+			const reg1 = window.onDidChangeActiveTerminal((active: Terminal | undefined) => {
+				assert.equal(active, terminal);
+				assert.equal(active, window.activeTerminal);
+				reg1.dispose();
+				const reg2 = window.onDidChangeActiveTerminal((active: Terminal | undefined) => {
+					assert.equal(active, undefined);
+					assert.equal(active, window.activeTerminal);
+					reg2.dispose();
+					done();
+				});
+				terminal.dispose();
+			});
+			const terminal = window.createTerminal();
+			terminal.show();
+		});
 	});
 });
diff --git a/extensions/vscode-api-tests/src/singlefolder-tests/workspace.test.ts b/extensions/vscode-api-tests/src/singlefolder-tests/workspace.test.ts
index a26fc00bfab..fbfe2e98bab 100644
--- a/extensions/vscode-api-tests/src/singlefolder-tests/workspace.test.ts
+++ b/extensions/vscode-api-tests/src/singlefolder-tests/workspace.test.ts
@@ -7,9 +7,10 @@
 
 import * as assert from 'assert';
 import * as vscode from 'vscode';
-import { createRandomFile, deleteFile, closeAllEditors, pathEquals } from '../utils';
-import { join, basename } from 'path';
+import { createRandomFile, deleteFile, closeAllEditors, pathEquals, rndName } from '../utils';
+import { join, posix, basename } from 'path';
 import * as fs from 'fs';
+import * as os from 'os';
 
 suite('workspace-namespace', () => {
 
@@ -498,17 +499,46 @@ suite('workspace-namespace', () => {
 		});
 	});
 
-	// TODO@Joh this test fails randomly
-	// test('findFiles, cancellation', () => {
+	test('findFiles, cancellation', () => {
 
-	// 	const source = new CancellationTokenSource();
-	// 	const token = source.token; // just to get an instance first
-	// 	source.cancel();
+		const source = new vscode.CancellationTokenSource();
+		const token = source.token; // just to get an instance first
+		source.cancel();
 
-	// 	return vscode.workspace.findFiles('*.js', null, 100, token).then((res) => {
-	// 		assert.equal(res, void 0);
-	// 	});
-	// });
+		return vscode.workspace.findFiles('*.js', null, 100, token).then((res) => {
+			assert.deepEqual(res, []);
+		});
+	});
+
+	test('findTextInFiles', async () => {
+		const options: vscode.FindTextInFilesOptions = {
+			include: '*.ts',
+			previewOptions: {
+				leadingChars: 2,
+				maxLines: 1,
+				totalChars: 100
+			}
+		};
+
+		const results: vscode.TextSearchResult[] = [];
+		await vscode.workspace.findTextInFiles({ pattern: 'foo' }, options, result => {
+			results.push(result);
+		});
+
+		assert.equal(results.length, 1);
+		assert.equal(results[0].preview.text, 'n foo(): void {');
+		assert.equal(vscode.workspace.asRelativePath(results[0].uri), '10linefile.ts');
+	});
+
+	test('findTextInFiles, cancellation', async () => {
+		const results: vscode.TextSearchResult[] = [];
+		const cancellation = new vscode.CancellationTokenSource();
+		cancellation.cancel();
+
+		await vscode.workspace.findTextInFiles({ pattern: 'foo' }, result => {
+			results.push(result);
+		}, cancellation.token);
+	});
 
 	test('applyEdit', () => {
 
@@ -519,43 +549,216 @@ suite('workspace-namespace', () => {
 		});
 	});
 
+	test('applyEdit should fail when editing deleted resource', async () => {
+		const resource = await createRandomFile();
 
-	// test('applyEdit should fail when editing deleted resource', async () => {
-	// 	const resource = await createRandomFile();
+		const edit = new vscode.WorkspaceEdit();
+		edit.deleteFile(resource);
+		edit.insert(resource, new vscode.Position(0, 0), '');
 
-	// 	const edit = new vscode.WorkspaceEdit();
-	// 	edit.deleteResource(resource);
-	// 	try {
-	// 		edit.insert(resource, new vscode.Position(0, 0), '');
-	// 		assert.fail(false, 'Should disallow edit of deleted resource');
-	// 	} catch {
-	// 		// noop
-	// 	}
-	// });
+		let success = await vscode.workspace.applyEdit(edit);
+		assert.equal(success, false);
+	});
 
-	// test('applyEdit should fail when renaming deleted resource', async () => {
-	// 	const resource = await createRandomFile();
+	test('applyEdit should fail when renaming deleted resource', async () => {
+		const resource = await createRandomFile();
 
-	// 	const edit = new vscode.WorkspaceEdit();
-	// 	edit.deleteResource(resource);
-	// 	try {
-	// 		edit.renameResource(resource, resource);
-	// 		assert.fail(false, 'Should disallow rename of deleted resource');
-	// 	} catch {
-	// 		// noop
-	// 	}
-	// });
+		const edit = new vscode.WorkspaceEdit();
+		edit.deleteFile(resource);
+		edit.renameFile(resource, resource);
 
-	// test('applyEdit should fail when editing renamed from resource', async () => {
-	// 	const resource = await createRandomFile();
-	// 	const newResource = vscode.Uri.parse(resource.fsPath + '.1');
-	// 	const edit = new vscode.WorkspaceEdit();
-	// 	edit.renameResource(resource, newResource);
-	// 	try {
-	// 		edit.insert(resource, new vscode.Position(0, 0), '');
-	// 		assert.fail(false, 'Should disallow editing renamed file');
-	// 	} catch {
-	// 		// noop
-	// 	}
-	// });
+		let success = await vscode.workspace.applyEdit(edit);
+		assert.equal(success, false);
+	});
+
+	test('applyEdit should fail when editing renamed from resource', async () => {
+		const resource = await createRandomFile();
+		const newResource = vscode.Uri.parse(resource.fsPath + '.1');
+		const edit = new vscode.WorkspaceEdit();
+		edit.renameFile(resource, newResource);
+		edit.insert(resource, new vscode.Position(0, 0), '');
+
+		let success = await vscode.workspace.applyEdit(edit);
+		assert.equal(success, false);
+	});
+
+	test('applyEdit "edit A -> rename A to B -> edit B"', async () => {
+		const oldUri = await createRandomFile();
+		const newUri = oldUri.with({ path: oldUri.path + 'NEW' });
+		const edit = new vscode.WorkspaceEdit();
+		edit.insert(oldUri, new vscode.Position(0, 0), 'BEFORE');
+		edit.renameFile(oldUri, newUri);
+		edit.insert(newUri, new vscode.Position(0, 0), 'AFTER');
+
+		let success = await vscode.workspace.applyEdit(edit);
+		assert.equal(success, true);
+
+		let doc = await vscode.workspace.openTextDocument(newUri);
+		assert.equal(doc.getText(), 'AFTERBEFORE');
+	});
+
+	function nameWithUnderscore(uri: vscode.Uri) {
+		return uri.with({ path: posix.join(posix.dirname(uri.path), `_${posix.basename(uri.path)}`) });
+	}
+
+	test('WorkspaceEdit: applying edits before and after rename duplicates resource #42633', async function () {
+		let docUri = await createRandomFile();
+		let newUri = nameWithUnderscore(docUri);
+
+		let we = new vscode.WorkspaceEdit();
+		we.insert(docUri, new vscode.Position(0, 0), 'Hello');
+		we.insert(docUri, new vscode.Position(0, 0), 'Foo');
+		we.renameFile(docUri, newUri);
+		we.insert(newUri, new vscode.Position(0, 0), 'Bar');
+
+		assert.ok(await vscode.workspace.applyEdit(we));
+		let doc = await vscode.workspace.openTextDocument(newUri);
+		assert.equal(doc.getText(), 'BarHelloFoo');
+	});
+
+	test('WorkspaceEdit: Problem recreating a renamed resource #42634', async function () {
+		let docUri = await createRandomFile();
+		let newUri = nameWithUnderscore(docUri);
+
+		let we = new vscode.WorkspaceEdit();
+		we.insert(docUri, new vscode.Position(0, 0), 'Hello');
+		we.insert(docUri, new vscode.Position(0, 0), 'Foo');
+		we.renameFile(docUri, newUri);
+
+		we.createFile(docUri);
+		we.insert(docUri, new vscode.Position(0, 0), 'Bar');
+
+		assert.ok(await vscode.workspace.applyEdit(we));
+
+		let newDoc = await vscode.workspace.openTextDocument(newUri);
+		assert.equal(newDoc.getText(), 'HelloFoo');
+		let doc = await vscode.workspace.openTextDocument(docUri);
+		assert.equal(doc.getText(), 'Bar');
+	});
+
+	test('WorkspaceEdit api - after saving a deleted file, it still shows up as deleted. #42667', async function () {
+		let docUri = await createRandomFile();
+		let we = new vscode.WorkspaceEdit();
+		we.deleteFile(docUri);
+		we.insert(docUri, new vscode.Position(0, 0), 'InsertText');
+
+		assert.ok(!(await vscode.workspace.applyEdit(we)));
+		try {
+			await vscode.workspace.openTextDocument(docUri);
+			assert.ok(false);
+		} catch (e) {
+			assert.ok(true);
+		}
+	});
+
+	test('WorkspaceEdit: edit and rename parent folder duplicates resource #42641', async function () {
+
+		let dir = join(os.tmpdir(), 'before-' + rndName());
+		if (!fs.existsSync(dir)) {
+			fs.mkdirSync(dir);
+		}
+
+		let docUri = await createRandomFile('', dir);
+		let docParent = docUri.with({ path: posix.dirname(docUri.path) });
+		let newParent = nameWithUnderscore(docParent);
+
+		let we = new vscode.WorkspaceEdit();
+		we.insert(docUri, new vscode.Position(0, 0), 'Hello');
+		we.renameFile(docParent, newParent);
+
+		assert.ok(await vscode.workspace.applyEdit(we));
+
+		try {
+			await vscode.workspace.openTextDocument(docUri);
+			assert.ok(false);
+		} catch (e) {
+			assert.ok(true);
+		}
+
+		let newUri = newParent.with({ path: posix.join(newParent.path, posix.basename(docUri.path)) });
+		let doc = await vscode.workspace.openTextDocument(newUri);
+		assert.ok(doc);
+
+		assert.equal(doc.getText(), 'Hello');
+	});
+
+	test('WorkspaceEdit: rename resource followed by edit does not work #42638', async function () {
+		let docUri = await createRandomFile();
+		let newUri = nameWithUnderscore(docUri);
+
+		let we = new vscode.WorkspaceEdit();
+		we.renameFile(docUri, newUri);
+		we.insert(newUri, new vscode.Position(0, 0), 'Hello');
+
+		assert.ok(await vscode.workspace.applyEdit(we));
+
+		let doc = await vscode.workspace.openTextDocument(newUri);
+		assert.equal(doc.getText(), 'Hello');
+	});
+
+	test('WorkspaceEdit: create & override', async function () {
+
+		let docUri = await createRandomFile('before');
+
+		let we = new vscode.WorkspaceEdit();
+		we.createFile(docUri);
+		assert.ok(!await vscode.workspace.applyEdit(we));
+		assert.equal((await vscode.workspace.openTextDocument(docUri)).getText(), 'before');
+
+		we = new vscode.WorkspaceEdit();
+		we.createFile(docUri, { overwrite: true });
+		assert.ok(await vscode.workspace.applyEdit(we));
+		assert.equal((await vscode.workspace.openTextDocument(docUri)).getText(), '');
+	});
+
+	test('WorkspaceEdit: create & ignoreIfExists', async function () {
+		let docUri = await createRandomFile('before');
+
+		let we = new vscode.WorkspaceEdit();
+		we.createFile(docUri, { ignoreIfExists: true });
+		assert.ok(await vscode.workspace.applyEdit(we));
+		assert.equal((await vscode.workspace.openTextDocument(docUri)).getText(), 'before');
+
+		we = new vscode.WorkspaceEdit();
+		we.createFile(docUri, { overwrite: true, ignoreIfExists: true });
+		assert.ok(await vscode.workspace.applyEdit(we));
+		assert.equal((await vscode.workspace.openTextDocument(docUri)).getText(), '');
+	});
+
+	test('WorkspaceEdit: rename & ignoreIfExists', async function () {
+		let aUri = await createRandomFile('aaa');
+		let bUri = await createRandomFile('bbb');
+
+		let we = new vscode.WorkspaceEdit();
+		we.renameFile(aUri, bUri);
+		assert.ok(!await vscode.workspace.applyEdit(we));
+
+		we = new vscode.WorkspaceEdit();
+		we.renameFile(aUri, bUri, { ignoreIfExists: true });
+		assert.ok(await vscode.workspace.applyEdit(we));
+
+		we = new vscode.WorkspaceEdit();
+		we.renameFile(aUri, bUri, { overwrite: false, ignoreIfExists: true });
+		assert.ok(!await vscode.workspace.applyEdit(we));
+
+		we = new vscode.WorkspaceEdit();
+		we.renameFile(aUri, bUri, { overwrite: true, ignoreIfExists: true });
+		assert.ok(await vscode.workspace.applyEdit(we));
+	});
+
+	test('WorkspaceEdit: delete & ignoreIfNotExists', async function () {
+
+		let docUri = await createRandomFile();
+		let we = new vscode.WorkspaceEdit();
+		we.deleteFile(docUri, { ignoreIfNotExists: false });
+		assert.ok(await vscode.workspace.applyEdit(we));
+
+		we = new vscode.WorkspaceEdit();
+		we.deleteFile(docUri, { ignoreIfNotExists: false });
+		assert.ok(!await vscode.workspace.applyEdit(we));
+
+		we = new vscode.WorkspaceEdit();
+		we.deleteFile(docUri, { ignoreIfNotExists: true });
+		assert.ok(await vscode.workspace.applyEdit(we));
+	});
 });
diff --git a/extensions/vscode-api-tests/src/utils.ts b/extensions/vscode-api-tests/src/utils.ts
index 0d869ed787d..f2b3511598c 100644
--- a/extensions/vscode-api-tests/src/utils.ts
+++ b/extensions/vscode-api-tests/src/utils.ts
@@ -10,13 +10,13 @@ import * as fs from 'fs';
 import * as os from 'os';
 import { join } from 'path';
 
-function rndName() {
+export function rndName() {
 	return Math.random().toString(36).replace(/[^a-z]+/g, '').substr(0, 10);
 }
 
-export function createRandomFile(contents = ''): Thenable<vscode.Uri> {
+export function createRandomFile(contents = '', dir: string = os.tmpdir()): Thenable<vscode.Uri> {
 	return new Promise((resolve, reject) => {
-		const tmpFile = join(os.tmpdir(), rndName());
+		const tmpFile = join(dir, rndName());
 		fs.writeFile(tmpFile, contents, (error) => {
 			if (error) {
 				return reject(error);
diff --git a/extensions/vscode-api-tests/src/workspace-tests/index.ts b/extensions/vscode-api-tests/src/workspace-tests/index.ts
index f65a756a8de..da6644b2fcd 100644
--- a/extensions/vscode-api-tests/src/workspace-tests/index.ts
+++ b/extensions/vscode-api-tests/src/workspace-tests/index.ts
@@ -3,26 +3,28 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-//
-// PLEASE DO NOT MODIFY / DELETE UNLESS YOU KNOW WHAT YOU ARE DOING
-//
-// This file is providing the test runner to use when running extension tests.
-// By default the test runner in use is Mocha based.
-//
-// You can provide your own test runner if you want to override it by exporting
-// a function run(testRoot: string, clb: (error:Error) => void) that the extension
-// host can call to run the tests. The test runner is expected to use console.log
-// to report the results back to the caller. When the tests are finished, return
-// a possible error to the callback or null if none.
-
+const path = require('path');
 const testRunner = require('vscode/lib/testrunner');
 
-// You can directly control Mocha options by uncommenting the following lines
-// See https://github.com/mochajs/mocha/wiki/Using-mocha-programmatically#set-options for more info
-testRunner.configure({
-	ui: 'tdd', 		// the TDD UI is being used in extension.test.ts (suite, test, etc.)
-	useColors: process.platform !== 'win32', // colored output from test results (only windows cannot handle)
+const suite = 'Integration Workspace Tests';
+
+const options: any = {
+	ui: 'tdd',
+	useColors: true,
 	timeout: 60000
-});
+};
+
+if (process.env.BUILD_ARTIFACTSTAGINGDIRECTORY) {
+	options.reporter = 'mocha-multi-reporters';
+	options.reporterOptions = {
+		reporterEnabled: 'spec, mocha-junit-reporter',
+		mochaJunitReporterReporterOptions: {
+			testsuitesTitle: `${suite} ${process.platform}`,
+			mochaFile: path.join(process.env.BUILD_ARTIFACTSTAGINGDIRECTORY, `test-results/${process.platform}-${suite.toLowerCase().replace(/[^\w]/g, '-')}-results.xml`)
+		}
+	};
+}
+
+testRunner.configure(options);
 
 export = testRunner;
diff --git a/extensions/vscode-api-tests/yarn.lock b/extensions/vscode-api-tests/yarn.lock
index 614b35058b4..5fee636122b 100644
--- a/extensions/vscode-api-tests/yarn.lock
+++ b/extensions/vscode-api-tests/yarn.lock
@@ -6,9 +6,9 @@
   version "2.2.43"
   resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-2.2.43.tgz#03c54589c43ad048cbcbfd63999b55d0424eec27"
 
-"@types/node@7.0.43":
-  version "7.0.43"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.43.tgz#a187e08495a075f200ca946079c914e1a5fe962c"
+"@types/node@^8.10.25":
+  version "8.10.25"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-8.10.25.tgz#801fe4e39372cef18f268db880a5fbfcf71adc7e"
 
 ajv@^5.1.0:
   version "5.3.0"
@@ -23,6 +23,10 @@ ansi-regex@^2.0.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
 
+ansi-regex@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
+
 ansi-styles@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
@@ -166,6 +170,10 @@ chalk@^1.0.0, chalk@^1.1.1:
     strip-ansi "^3.0.0"
     supports-color "^2.0.0"
 
+charenc@~0.0.1:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/charenc/-/charenc-0.0.2.tgz#c0a1d2f3a7092e03774bfa83f14c0fc5790a8667"
+
 clone-buffer@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/clone-buffer/-/clone-buffer-1.0.0.tgz#e3e25b207ac4e701af721e2cb5a16792cac3dc58"
@@ -226,6 +234,10 @@ core-util-is@1.0.2, core-util-is@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
 
+crypt@~0.0.1:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/crypt/-/crypt-0.0.2.tgz#88d7ff7ec0dfb86f713dc87bbb42d044d3e6c41b"
+
 cryptiles@2.x.x:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-2.0.5.tgz#3bdfecdc608147c1c67202fa291e7dca59eaa3b8"
@@ -254,6 +266,18 @@ debug@2.6.8:
   dependencies:
     ms "2.0.0"
 
+debug@^2.2.0:
+  version "2.6.9"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
+  dependencies:
+    ms "2.0.0"
+
+debug@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
+  dependencies:
+    ms "2.0.0"
+
 deep-assign@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/deep-assign/-/deep-assign-1.0.0.tgz#b092743be8427dc621ea0067cdec7e70dd19f37b"
@@ -728,7 +752,7 @@ inherits@2, inherits@^2.0.1, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
 
-is-buffer@^1.1.5:
+is-buffer@^1.1.5, is-buffer@~1.1.1:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
 
@@ -1008,10 +1032,22 @@ lodash.templatesettings@^3.0.0:
     lodash._reinterpolate "^3.0.0"
     lodash.escape "^3.0.0"
 
+lodash@^4.16.4:
+  version "4.17.10"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"
+
 map-stream@~0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/map-stream/-/map-stream-0.1.0.tgz#e56aa94c4c8055a16404a0674b78f215f7c8e194"
 
+md5@^2.1.0:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/md5/-/md5-2.2.1.tgz#53ab38d5fe3c8891ba465329ea23fac0540126f9"
+  dependencies:
+    charenc "~0.0.1"
+    crypt "~0.0.1"
+    is-buffer "~1.1.1"
+
 merge-stream@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-1.0.1.tgz#4041202d508a342ba00174008df0c251b8c135e1"
@@ -1060,12 +1096,29 @@ minimist@^1.1.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
 
-mkdirp@0.5.1, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1:
+mkdirp@0.5.1, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.1:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
   dependencies:
     minimist "0.0.8"
 
+mocha-junit-reporter@^1.17.0:
+  version "1.17.0"
+  resolved "https://registry.yarnpkg.com/mocha-junit-reporter/-/mocha-junit-reporter-1.17.0.tgz#2e5149ed40fc5d2e3ca71e42db5ab1fec9c6d85c"
+  dependencies:
+    debug "^2.2.0"
+    md5 "^2.1.0"
+    mkdirp "~0.5.1"
+    strip-ansi "^4.0.0"
+    xml "^1.0.0"
+
+mocha-multi-reporters@^1.1.7:
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/mocha-multi-reporters/-/mocha-multi-reporters-1.1.7.tgz#cc7f3f4d32f478520941d852abb64d9988587d82"
+  dependencies:
+    debug "^3.1.0"
+    lodash "^4.16.4"
+
 mocha@^3.2.0:
   version "3.5.3"
   resolved "https://registry.yarnpkg.com/mocha/-/mocha-3.5.3.tgz#1e0480fe36d2da5858d1eb6acc38418b26eaa20d"
@@ -1440,6 +1493,12 @@ strip-ansi@^3.0.0:
   dependencies:
     ansi-regex "^2.0.0"
 
+strip-ansi@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
+  dependencies:
+    ansi-regex "^3.0.0"
+
 strip-bom-stream@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/strip-bom-stream/-/strip-bom-stream-1.0.0.tgz#e7144398577d51a6bed0fa1994fa05f43fd988ee"
@@ -1651,6 +1710,10 @@ wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
 
+xml@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/xml/-/xml-1.0.1.tgz#78ba72020029c5bc87b8a81a3cfcd74b4a2fc1e5"
+
 "xtend@>=4.0.0 <4.1.0-0", xtend@^4.0.0, xtend@~4.0.0, xtend@~4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
diff --git a/extensions/vscode-colorize-tests/package.json b/extensions/vscode-colorize-tests/package.json
index 0d6da2add03..9b43cfa2a6c 100644
--- a/extensions/vscode-colorize-tests/package.json
+++ b/extensions/vscode-colorize-tests/package.json
@@ -12,7 +12,9 @@
 		"postinstall": "node ./node_modules/vscode/bin/install"
 	},
 	"devDependencies": {
-		"@types/node": "7.0.43",
+		"@types/node": "^8.10.25",
+		"mocha-junit-reporter": "^1.17.0",
+		"mocha-multi-reporters": "^1.1.7",
 		"vscode": "1.1.5"
 	}
-}
\ No newline at end of file
+}
diff --git a/extensions/vscode-colorize-tests/src/index.ts b/extensions/vscode-colorize-tests/src/index.ts
index da1cb0f2c42..48a666ea0f7 100644
--- a/extensions/vscode-colorize-tests/src/index.ts
+++ b/extensions/vscode-colorize-tests/src/index.ts
@@ -3,26 +3,28 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-//
-// PLEASE DO NOT MODIFY / DELETE UNLESS YOU KNOW WHAT YOU ARE DOING
-//
-// This file is providing the test runner to use when running extension tests.
-// By default the test runner in use is Mocha based.
-//
-// You can provide your own test runner if you want to override it by exporting
-// a function run(testRoot: string, clb: (error:Error) => void) that the extension
-// host can call to run the tests. The test runner is expected to use console.log
-// to report the results back to the caller. When the tests are finished, return
-// a possible error to the callback or null if none.
-
+const path = require('path');
 const testRunner = require('vscode/lib/testrunner');
 
-// You can directly control Mocha options by uncommenting the following lines
-// See https://github.com/mochajs/mocha/wiki/Using-mocha-programmatically#set-options for more info
-testRunner.configure({
-	ui: 'tdd', 		// the TDD UI is being used in extension.test.ts (suite, test, etc.)
-	useColors: process.platform !== 'win32', // colored output from test results (only windows cannot handle)
-	timeout: 60000
-});
+const suite = 'Integration Colorize Tests';
 
-export = testRunner;
\ No newline at end of file
+const options: any = {
+	ui: 'tdd',
+	useColors: true,
+	timeout: 60000
+};
+
+if (process.env.BUILD_ARTIFACTSTAGINGDIRECTORY) {
+	options.reporter = 'mocha-multi-reporters';
+	options.reporterOptions = {
+		reporterEnabled: 'spec, mocha-junit-reporter',
+		mochaJunitReporterReporterOptions: {
+			testsuitesTitle: `${suite} ${process.platform}`,
+			mochaFile: path.join(process.env.BUILD_ARTIFACTSTAGINGDIRECTORY, `test-results/${process.platform}-${suite.toLowerCase().replace(/[^\w]/g, '-')}-results.xml`)
+		}
+	};
+}
+
+testRunner.configure(options);
+
+export = testRunner;
diff --git a/extensions/vscode-colorize-tests/yarn.lock b/extensions/vscode-colorize-tests/yarn.lock
index d06c1af5427..b4e9355d74f 100644
--- a/extensions/vscode-colorize-tests/yarn.lock
+++ b/extensions/vscode-colorize-tests/yarn.lock
@@ -2,9 +2,9 @@
 # yarn lockfile v1
 
 
-"@types/node@7.0.43":
-  version "7.0.43"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.43.tgz#a187e08495a075f200ca946079c914e1a5fe962c"
+"@types/node@^8.10.25":
+  version "8.10.25"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-8.10.25.tgz#801fe4e39372cef18f268db880a5fbfcf71adc7e"
 
 ajv@^5.1.0:
   version "5.3.0"
@@ -19,6 +19,10 @@ ansi-regex@^2.0.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
 
+ansi-regex@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
+
 ansi-styles@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
@@ -162,6 +166,10 @@ chalk@^1.0.0, chalk@^1.1.1:
     strip-ansi "^3.0.0"
     supports-color "^2.0.0"
 
+charenc@~0.0.1:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/charenc/-/charenc-0.0.2.tgz#c0a1d2f3a7092e03774bfa83f14c0fc5790a8667"
+
 clone-buffer@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/clone-buffer/-/clone-buffer-1.0.0.tgz#e3e25b207ac4e701af721e2cb5a16792cac3dc58"
@@ -222,6 +230,10 @@ core-util-is@1.0.2, core-util-is@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
 
+crypt@~0.0.1:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/crypt/-/crypt-0.0.2.tgz#88d7ff7ec0dfb86f713dc87bbb42d044d3e6c41b"
+
 cryptiles@2.x.x:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-2.0.5.tgz#3bdfecdc608147c1c67202fa291e7dca59eaa3b8"
@@ -250,6 +262,18 @@ debug@2.6.8:
   dependencies:
     ms "2.0.0"
 
+debug@^2.2.0:
+  version "2.6.9"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
+  dependencies:
+    ms "2.0.0"
+
+debug@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
+  dependencies:
+    ms "2.0.0"
+
 deep-assign@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/deep-assign/-/deep-assign-1.0.0.tgz#b092743be8427dc621ea0067cdec7e70dd19f37b"
@@ -724,7 +748,7 @@ inherits@2, inherits@^2.0.1, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
 
-is-buffer@^1.1.5:
+is-buffer@^1.1.5, is-buffer@~1.1.1:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
 
@@ -1004,10 +1028,22 @@ lodash.templatesettings@^3.0.0:
     lodash._reinterpolate "^3.0.0"
     lodash.escape "^3.0.0"
 
+lodash@^4.16.4:
+  version "4.17.10"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"
+
 map-stream@~0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/map-stream/-/map-stream-0.1.0.tgz#e56aa94c4c8055a16404a0674b78f215f7c8e194"
 
+md5@^2.1.0:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/md5/-/md5-2.2.1.tgz#53ab38d5fe3c8891ba465329ea23fac0540126f9"
+  dependencies:
+    charenc "~0.0.1"
+    crypt "~0.0.1"
+    is-buffer "~1.1.1"
+
 merge-stream@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-1.0.1.tgz#4041202d508a342ba00174008df0c251b8c135e1"
@@ -1056,12 +1092,29 @@ minimist@^1.1.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
 
-mkdirp@0.5.1, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1:
+mkdirp@0.5.1, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.1:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
   dependencies:
     minimist "0.0.8"
 
+mocha-junit-reporter@^1.17.0:
+  version "1.17.0"
+  resolved "https://registry.yarnpkg.com/mocha-junit-reporter/-/mocha-junit-reporter-1.17.0.tgz#2e5149ed40fc5d2e3ca71e42db5ab1fec9c6d85c"
+  dependencies:
+    debug "^2.2.0"
+    md5 "^2.1.0"
+    mkdirp "~0.5.1"
+    strip-ansi "^4.0.0"
+    xml "^1.0.0"
+
+mocha-multi-reporters@^1.1.7:
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/mocha-multi-reporters/-/mocha-multi-reporters-1.1.7.tgz#cc7f3f4d32f478520941d852abb64d9988587d82"
+  dependencies:
+    debug "^3.1.0"
+    lodash "^4.16.4"
+
 mocha@^3.2.0:
   version "3.5.3"
   resolved "https://registry.yarnpkg.com/mocha/-/mocha-3.5.3.tgz#1e0480fe36d2da5858d1eb6acc38418b26eaa20d"
@@ -1436,6 +1489,12 @@ strip-ansi@^3.0.0:
   dependencies:
     ansi-regex "^2.0.0"
 
+strip-ansi@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
+  dependencies:
+    ansi-regex "^3.0.0"
+
 strip-bom-stream@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/strip-bom-stream/-/strip-bom-stream-1.0.0.tgz#e7144398577d51a6bed0fa1994fa05f43fd988ee"
@@ -1643,6 +1702,10 @@ wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
 
+xml@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/xml/-/xml-1.0.1.tgz#78ba72020029c5bc87b8a81a3cfcd74b4a2fc1e5"
+
 "xtend@>=4.0.0 <4.1.0-0", xtend@^4.0.0, xtend@~4.0.0, xtend@~4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
diff --git a/extensions/xml/syntaxes/xml.tmLanguage.json b/extensions/xml/syntaxes/xml.tmLanguage.json
index 532e3908f25..acebb5275ed 100644
--- a/extensions/xml/syntaxes/xml.tmLanguage.json
+++ b/extensions/xml/syntaxes/xml.tmLanguage.json
@@ -4,7 +4,7 @@
 		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
 		"Once accepted there, we are happy to receive an update request."
 	],
-	"version": "https://github.com/atom/language-xml/commit/27352842917b911383122bdcf98ed0d69d55c179",
+	"version": "https://github.com/atom/language-xml/commit/bd810deb404a12bea8ec5799fda2909349ba2654",
 	"name": "XML",
 	"scopeName": "text.xml",
 	"patterns": [
@@ -350,14 +350,38 @@
 			]
 		},
 		"comments": {
-			"begin": "<[!%]--",
-			"captures": {
-				"0": {
-					"name": "punctuation.definition.comment.xml"
+			"patterns": [
+				{
+					"begin": "<%--",
+					"captures": {
+						"0": {
+							"name": "punctuation.definition.comment.xml"
+						},
+						"end": "--%>",
+						"name": "comment.block.xml"
+					}
+				},
+				{
+					"begin": "<!--",
+					"captures": {
+						"0": {
+							"name": "punctuation.definition.comment.xml"
+						}
+					},
+					"end": "-->",
+					"name": "comment.block.xml",
+					"patterns": [
+						{
+							"begin": "--(?!>)",
+							"captures": {
+								"0": {
+									"name": "invalid.illegal.bad-comments-or-CDATA.xml"
+								}
+							}
+						}
+					]
 				}
-			},
-			"end": "--%?>",
-			"name": "comment.block.xml"
+			]
 		}
 	}
 }
\ No newline at end of file
diff --git a/extensions/xml/test/colorize-results/test_xml.json b/extensions/xml/test/colorize-results/test_xml.json
index 80525b29179..b16beb8b122 100644
--- a/extensions/xml/test/colorize-results/test_xml.json
+++ b/extensions/xml/test/colorize-results/test_xml.json
@@ -795,9 +795,9 @@
 		"c": "<!--",
 		"t": "text.xml comment.block.xml punctuation.definition.comment.xml",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -806,9 +806,9 @@
 		"c": " The stuff below was added for extra tokenizer testing ",
 		"t": "text.xml comment.block.xml",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -817,9 +817,9 @@
 		"c": "-->",
 		"t": "text.xml comment.block.xml punctuation.definition.comment.xml",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
diff --git a/extensions/yaml/syntaxes/yaml.tmLanguage.json b/extensions/yaml/syntaxes/yaml.tmLanguage.json
index 6f08b6e72c9..447df713901 100644
--- a/extensions/yaml/syntaxes/yaml.tmLanguage.json
+++ b/extensions/yaml/syntaxes/yaml.tmLanguage.json
@@ -4,7 +4,7 @@
 		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
 		"Once accepted there, we are happy to receive an update request."
 	],
-	"version": "https://github.com/textmate/yaml.tmbundle/commit/efc96efafe5e48480cf55a2ed124b388cbea4440",
+	"version": "https://github.com/textmate/yaml.tmbundle/commit/e54ceae3b719506dba7e481a77cea4a8b576ae46",
 	"name": "YAML",
 	"scopeName": "source.yaml",
 	"patterns": [
@@ -121,16 +121,16 @@
 			"begin": "(?:(\\|)|(>))([1-9])?([-+])?(.*\\n?)",
 			"beginCaptures": {
 				"1": {
-					"name": "punctuation.definition.block.scalar.literal.yaml"
+					"name": "keyword.control.flow.block-scalar.literal.yaml"
 				},
 				"2": {
-					"name": "punctuation.definition.block.scalar.folded.yaml"
+					"name": "keyword.control.flow.block-scalar.folded.yaml"
 				},
 				"3": {
 					"name": "constant.numeric.indentation-indicator.yaml"
 				},
 				"4": {
-					"name": "support.other.chomping-indicator.yaml"
+					"name": "storage.modifier.chomping-indicator.yaml"
 				},
 				"5": {
 					"patterns": [
@@ -154,7 +154,7 @@
 			]
 		},
 		"block-sequence": {
-			"match": "(-)( |\\t|$)",
+			"match": "(-)(?!\\S)",
 			"name": "punctuation.definition.block.sequence.item.yaml"
 		},
 		"comment": {
@@ -211,7 +211,7 @@
 							"name": "support.type.tag-prefix.yaml"
 						}
 					},
-					"match": "(?x)\n                        \\G\n                        (TAG)\n                        (?:[ \\t]+\n                            ((?:!(?:[0-9A-Za-z\\-]*!)?))\n                            (?:[ \\t]+ (\n                                  !              (?x: %\\p{XDigit}{2} | [0-9A-Za-z\\-#;/?:@&=+$,_.!~*'()\\[\\]] )*\n                                | (?![,!\\[\\]{}]) (?x: %\\p{XDigit}{2} | [0-9A-Za-z\\-#;/?:@&=+$,_.!~*'()\\[\\]] )+\n                                )\n                            )?\n                        )?\n                    "
+					"match": "(?x)\n                        \\G\n                        (TAG)\n                        (?:[ \\t]+\n                            ((?:!(?:[0-9A-Za-z\\-]*!)?))\n                            (?:[ \\t]+ (\n                                  !              (?x: %[0-9A-Fa-f]{2} | [0-9A-Za-z\\-#;/?:@&=+$,_.!~*'()\\[\\]] )*\n                                | (?![,!\\[\\]{}]) (?x: %[0-9A-Fa-f]{2} | [0-9A-Za-z\\-#;/?:@&=+$,_.!~*'()\\[\\]] )+\n                                )\n                            )?\n                        )?\n                    "
 				},
 				{
 					"captures": {
@@ -598,7 +598,7 @@
 					"match": "\\G((&))([^\\s\\[\\]/{/},]+)(\\S+)?"
 				},
 				{
-					"match": "(?x)\n                        \\G\n                        (?:\n                            ! < (?: %\\p{XDigit}{2} | [0-9A-Za-z\\-#;/?:@&=+$,_.!~*'()\\[\\]] )+ >\n                          | (?:!(?:[0-9A-Za-z\\-]*!)?) (?: %\\p{XDigit}{2} | [0-9A-Za-z\\-#;/?:@&=+$_.~*'()] )+\n                          | !\n                        )\n                        (?=\\ |\\t|$)\n                    ",
+					"match": "(?x)\n                        \\G\n                        (?:\n                            ! < (?: %[0-9A-Fa-f]{2} | [0-9A-Za-z\\-#;/?:@&=+$,_.!~*'()\\[\\]] )+ >\n                          | (?:!(?:[0-9A-Za-z\\-]*!)?) (?: %[0-9A-Fa-f]{2} | [0-9A-Za-z\\-#;/?:@&=+$_.~*'()] )+\n                          | !\n                        )\n                        (?=\\ |\\t|$)\n                    ",
 					"name": "storage.type.tag-handle.yaml"
 				},
 				{
diff --git a/extensions/yaml/test/colorize-results/issue-4008_yaml.json b/extensions/yaml/test/colorize-results/issue-4008_yaml.json
index 40390772066..10329df780e 100644
--- a/extensions/yaml/test/colorize-results/issue-4008_yaml.json
+++ b/extensions/yaml/test/colorize-results/issue-4008_yaml.json
@@ -1,6 +1,6 @@
 [
 	{
-		"c": "- ",
+		"c": "-",
 		"t": "source.yaml punctuation.definition.block.sequence.item.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
@@ -10,6 +10,17 @@
 			"hc_black": "default: #FFFFFF"
 		}
 	},
+	{
+		"c": " ",
+		"t": "source.yaml",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
 	{
 		"c": "blue",
 		"t": "source.yaml string.unquoted.plain.out.yaml entity.name.tag.yaml",
@@ -55,7 +66,7 @@
 		}
 	},
 	{
-		"c": "- ",
+		"c": "-",
 		"t": "source.yaml punctuation.definition.block.sequence.item.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
@@ -65,6 +76,17 @@
 			"hc_black": "default: #FFFFFF"
 		}
 	},
+	{
+		"c": " ",
+		"t": "source.yaml",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
 	{
 		"c": "not_blue",
 		"t": "source.yaml string.unquoted.plain.out.yaml entity.name.tag.yaml",
@@ -110,7 +132,7 @@
 		}
 	},
 	{
-		"c": "- ",
+		"c": "-",
 		"t": "source.yaml punctuation.definition.block.sequence.item.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
@@ -120,6 +142,17 @@
 			"hc_black": "default: #FFFFFF"
 		}
 	},
+	{
+		"c": " ",
+		"t": "source.yaml",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
 	{
 		"c": "blue",
 		"t": "source.yaml string.unquoted.plain.out.yaml entity.name.tag.yaml",
@@ -165,7 +198,7 @@
 		}
 	},
 	{
-		"c": "- ",
+		"c": "-",
 		"t": "source.yaml punctuation.definition.block.sequence.item.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
@@ -175,6 +208,17 @@
 			"hc_black": "default: #FFFFFF"
 		}
 	},
+	{
+		"c": " ",
+		"t": "source.yaml",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
 	{
 		"c": "not_blue",
 		"t": "source.yaml string.unquoted.plain.out.yaml entity.name.tag.yaml",
diff --git a/extensions/yaml/test/colorize-results/test_yaml.json b/extensions/yaml/test/colorize-results/test_yaml.json
index e4e35ba7eef..6c871b32208 100644
--- a/extensions/yaml/test/colorize-results/test_yaml.json
+++ b/extensions/yaml/test/colorize-results/test_yaml.json
@@ -3,9 +3,9 @@
 		"c": "#",
 		"t": "source.yaml comment.line.number-sign.yaml punctuation.definition.comment.yaml",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -14,9 +14,9 @@
 		"c": " sequencer protocols for Laser eye surgery",
 		"t": "source.yaml comment.line.number-sign.yaml",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -33,7 +33,7 @@
 		}
 	},
 	{
-		"c": "- ",
+		"c": "-",
 		"t": "source.yaml punctuation.definition.block.sequence.item.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
@@ -43,6 +43,17 @@
 			"hc_black": "default: #FFFFFF"
 		}
 	},
+	{
+		"c": " ",
+		"t": "source.yaml",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
 	{
 		"c": "step",
 		"t": "source.yaml string.unquoted.plain.out.yaml entity.name.tag.yaml",
@@ -113,9 +124,9 @@
 		"c": "#",
 		"t": "source.yaml comment.line.number-sign.yaml punctuation.definition.comment.yaml",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -124,9 +135,9 @@
 		"c": " defines anchor label &id001",
 		"t": "source.yaml comment.line.number-sign.yaml",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -297,7 +308,7 @@
 		}
 	},
 	{
-		"c": "- ",
+		"c": "-",
 		"t": "source.yaml punctuation.definition.block.sequence.item.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
@@ -307,6 +318,17 @@
 			"hc_black": "default: #FFFFFF"
 		}
 	},
+	{
+		"c": " ",
+		"t": "source.yaml",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
 	{
 		"c": "step",
 		"t": "source.yaml string.unquoted.plain.out.yaml entity.name.tag.yaml",
@@ -377,9 +399,9 @@
 		"c": "#",
 		"t": "source.yaml comment.line.number-sign.yaml punctuation.definition.comment.yaml",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
@@ -388,15 +410,15 @@
 		"c": " refers to the first step (with anchor &id001)",
 		"t": "source.yaml comment.line.number-sign.yaml",
 		"r": {
-			"dark_plus": "comment: #608B4E",
+			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
+			"dark_vs": "comment: #6A9955",
 			"light_vs": "comment: #008000",
 			"hc_black": "comment: #7CA668"
 		}
 	},
 	{
-		"c": "- ",
+		"c": "-",
 		"t": "source.yaml punctuation.definition.block.sequence.item.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
@@ -406,6 +428,17 @@
 			"hc_black": "default: #FFFFFF"
 		}
 	},
+	{
+		"c": " ",
+		"t": "source.yaml",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
 	{
 		"c": "step",
 		"t": "source.yaml string.unquoted.plain.out.yaml entity.name.tag.yaml",
@@ -528,7 +561,7 @@
 		}
 	},
 	{
-		"c": "- ",
+		"c": "-",
 		"t": "source.yaml punctuation.definition.block.sequence.item.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
@@ -538,6 +571,17 @@
 			"hc_black": "default: #FFFFFF"
 		}
 	},
+	{
+		"c": " ",
+		"t": "source.yaml",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
 	{
 		"c": "step",
 		"t": "source.yaml string.unquoted.plain.out.yaml entity.name.tag.yaml",
@@ -594,7 +638,7 @@
 		}
 	},
 	{
-		"c": "- ",
+		"c": "-",
 		"t": "source.yaml punctuation.definition.block.sequence.item.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
@@ -604,6 +648,17 @@
 			"hc_black": "default: #FFFFFF"
 		}
 	},
+	{
+		"c": " ",
+		"t": "source.yaml",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
 	{
 		"c": "{",
 		"t": "source.yaml meta.flow-mapping.yaml punctuation.definition.mapping.begin.yaml",
@@ -737,7 +792,7 @@
 		}
 	},
 	{
-		"c": "- ",
+		"c": "-",
 		"t": "source.yaml punctuation.definition.block.sequence.item.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
@@ -747,6 +802,17 @@
 			"hc_black": "default: #FFFFFF"
 		}
 	},
+	{
+		"c": " ",
+		"t": "source.yaml",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
 	{
 		"c": "name",
 		"t": "source.yaml string.unquoted.plain.out.yaml entity.name.tag.yaml",
@@ -990,7 +1056,7 @@
 		}
 	},
 	{
-		"c": "- ",
+		"c": "-",
 		"t": "source.yaml punctuation.definition.block.sequence.item.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
@@ -1000,6 +1066,17 @@
 			"hc_black": "default: #FFFFFF"
 		}
 	},
+	{
+		"c": " ",
+		"t": "source.yaml",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
 	{
 		"c": "Mary Smith",
 		"t": "source.yaml string.unquoted.plain.out.yaml",
@@ -1023,7 +1100,7 @@
 		}
 	},
 	{
-		"c": "- ",
+		"c": "-",
 		"t": "source.yaml punctuation.definition.block.sequence.item.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
@@ -1033,6 +1110,17 @@
 			"hc_black": "default: #FFFFFF"
 		}
 	},
+	{
+		"c": " ",
+		"t": "source.yaml",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
 	{
 		"c": "Susan Williams",
 		"t": "source.yaml string.unquoted.plain.out.yaml",
diff --git a/extensions/yarn.lock b/extensions/yarn.lock
index 7f849990c1b..7f3b23d2118 100644
--- a/extensions/yarn.lock
+++ b/extensions/yarn.lock
@@ -2,6 +2,6 @@
 # yarn lockfile v1
 
 
-typescript@2.9.1:
-  version "2.9.1"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.9.1.tgz#fdb19d2c67a15d11995fd15640e373e09ab09961"
+typescript@3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.0.3.tgz#4853b3e275ecdaa27f78fda46dc273a7eb7fc1c8"
diff --git a/gulpfile.js b/gulpfile.js
index db6d924ae73..fe899377d79 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -15,12 +15,12 @@ const compilation = require('./build/lib/compilation');
 
 // Fast compile for development time
 gulp.task('clean-client', util.rimraf('out'));
-gulp.task('compile-client', ['clean-client'], compilation.compileTask('out', false));
+gulp.task('compile-client', ['clean-client'], compilation.compileTask('src', 'out', false));
 gulp.task('watch-client', ['clean-client'], compilation.watchTask('out', false));
 
 // Full compile, including nls and inline sources in sourcemaps, for build
 gulp.task('clean-client-build', util.rimraf('out-build'));
-gulp.task('compile-client-build', ['clean-client-build'], compilation.compileTask('out-build', true));
+gulp.task('compile-client-build', ['clean-client-build'], compilation.compileTask('src', 'out-build', true));
 gulp.task('watch-client-build', ['clean-client-build'], compilation.watchTask('out-build', true));
 
 // Default
@@ -36,42 +36,12 @@ gulp.task('clean-build', ['clean-client-build', 'clean-extensions-build']);
 gulp.task('compile-build', ['compile-client-build', 'compile-extensions-build']);
 gulp.task('watch-build', ['watch-client-build', 'watch-extensions-build']);
 
-var ALL_EDITOR_TASKS = [
-	// Always defined tasks
-	'clean-client',
-	'compile-client',
-	'watch-client',
-	'clean-client-build',
-	'compile-client-build',
-	'watch-client-build',
-
-	// Editor tasks (defined in gulpfile.editor)
-	'clean-optimized-editor',
-	'optimize-editor',
-	'clean-minified-editor',
-	'minify-editor',
-	'clean-editor-distro',
-	'editor-distro',
-	'analyze-editor-distro',
-
-	// hygiene tasks
-	'tslint',
-	'hygiene',
-];
-
-var runningEditorTasks = process.argv.length > 2 && process.argv.slice(2).every(function (arg) { return (ALL_EDITOR_TASKS.indexOf(arg) !== -1); });
-
 process.on('unhandledRejection', (reason, p) => {
 	console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);
 	process.exit(1);
 });
 
-if (runningEditorTasks) {
-	require(`./build/gulpfile.editor`);
-	require(`./build/gulpfile.hygiene`);
-} else {
-	// Load all the gulpfiles only if running tasks other than the editor tasks
-	const build = path.join(__dirname, 'build');
-	require('glob').sync('gulpfile.*.js', { cwd: build })
-		.forEach(f => require(`./build/${f}`));
-}
+// Load all the gulpfiles only if running tasks other than the editor tasks
+const build = path.join(__dirname, 'build');
+require('glob').sync('gulpfile.*.js', { cwd: build })
+	.forEach(f => require(`./build/${f}`));
diff --git a/i18n/.gitignore b/i18n/.gitignore
deleted file mode 100644
index 2664d9bf9a3..00000000000
--- a/i18n/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-!out/
\ No newline at end of file
diff --git a/i18n/chs/extensions/azure-account/out/azure-account.i18n.json b/i18n/chs/extensions/azure-account/out/azure-account.i18n.json
deleted file mode 100644
index d64636616d4..00000000000
--- a/i18n/chs/extensions/azure-account/out/azure-account.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"azure-account.copyAndOpen": "复制并打开",
-	"azure-account.close": "关闭",
-	"azure-account.login": "登录",
-	"azure-account.loginFirst": "还未登录，请先登录。",
-	"azure-account.userCodeFailed": "获取用户代码失败",
-	"azure-account.tokenFailed": "用设备代码获取令牌",
-	"azure-account.tokenFromRefreshTokenFailed": "用刷新的令牌获取令牌"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/azure-account/out/extension.i18n.json b/i18n/chs/extensions/azure-account/out/extension.i18n.json
deleted file mode 100644
index d90c9399da5..00000000000
--- a/i18n/chs/extensions/azure-account/out/extension.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"azure-account.loggingIn": "Azure: 正在登录...",
-	"azure-account.loggedIn": "Azure: {0}"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/bat/package.i18n.json b/i18n/chs/extensions/bat/package.i18n.json
deleted file mode 100644
index 7d2ac2761f0..00000000000
--- a/i18n/chs/extensions/bat/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Windows 批处理语言基础功能",
-	"description": "在 Windows 批处理文件中提供代码片段、语法高亮、括号匹配和折叠功能。"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/clojure/package.i18n.json b/i18n/chs/extensions/clojure/package.i18n.json
deleted file mode 100644
index 4c635c6ce36..00000000000
--- a/i18n/chs/extensions/clojure/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Clojure 语言基础功能",
-	"description": "在 Clojure 文件中提供语法高亮和括号匹配功能。"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/coffeescript/package.i18n.json b/i18n/chs/extensions/coffeescript/package.i18n.json
deleted file mode 100644
index dfe05d58b4a..00000000000
--- a/i18n/chs/extensions/coffeescript/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "CoffeeScript 语言基础功能",
-	"description": "在 CoffeeScript 文件中提供代码片段、语法高亮、括号匹配和折叠功能。"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/configuration-editing/out/extension.i18n.json b/i18n/chs/extensions/configuration-editing/out/extension.i18n.json
deleted file mode 100644
index 2932e9c481f..00000000000
--- a/i18n/chs/extensions/configuration-editing/out/extension.i18n.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"workspaceFolder": "在 VS Code 中打开的文件夹的路径",
-	"workspaceFolderBasename": "在 VS Code 中打开的文件夹的名称 (不包含任何斜杠 \"/\" )",
-	"relativeFile": "相对于 ${workspaceFolder}，当前打开的文件路径",
-	"file": "当前打开的文件",
-	"cwd": "启动时任务运行程序的当前工作目录",
-	"lineNumber": "活动文件中当前选定行的行号",
-	"selectedText": "当前在活动文件中选定的文本",
-	"fileDirname": "当前打开的文件的完整目录名",
-	"fileExtname": "当前打开的文件的扩展名",
-	"fileBasename": "当前打开的文件的文件名",
-	"fileBasenameNoExtension": "当前打开的文件的文件名 (不包含文件扩展名)",
-	"exampleExtension": "示例"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json b/i18n/chs/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json
deleted file mode 100644
index 740dec3dd6b..00000000000
--- a/i18n/chs/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"activeEditorShort": "文件名 (例如 myFile.txt)",
-	"activeEditorMedium": "相对于工作区文件夹的文件路径 (例如 myFolder/myFile.txt)",
-	"activeEditorLong": "文件的完整路径 (例如 /Users/Development/myProject/myFolder/myFile.txt)",
-	"rootName": "工作区名称 (例如 myFolder 或 myWorkspace)",
-	"rootPath": "工作区路径 (例如 /Users/Development/myWorkspace)",
-	"folderName": "文件所在工作区文件夹的名称 (例如 myFolder)",
-	"folderPath": "文件所在工作区文件夹的路径 (例如 /Users/Development/myFolder)",
-	"appName": "例如 VS Code",
-	"dirty": "一个更新的指示器，指示活动编辑器是否更新",
-	"separator": "一个条件分隔符(\"-\")，仅在左右是具有值的变量时才显示",
-	"assocLabelFile": "带扩展名的文件",
-	"assocDescriptionFile": "将所有匹配其文件名内的 glob 模式的文件映射到具有给定标识符的语言。",
-	"assocLabelPath": "带路径的文件",
-	"assocDescriptionPath": "将所有匹配其路径内绝对路径 glob 模式的文件映射到具有给定标识符的语言。",
-	"fileLabel": "按扩展名的文件",
-	"fileDescription": "与具有特定文件扩展名的所有文件匹配。",
-	"filesLabel": "具有多个扩展名的文件",
-	"filesDescription": "与具有任意文件扩展名的所有文件匹配。",
-	"derivedLabel": "具有同级文件的文件(按名称)",
-	"derivedDescription": "与具有名称相同但扩展名不同的同级文件的文件匹配。",
-	"topFolderLabel": "按名称的文件夹(顶级)",
-	"topFolderDescription": "与具有特定名称的顶级文件夹匹配。",
-	"topFoldersLabel": "使用多个名称的文件夹(顶级)",
-	"topFoldersDescription": "与多个顶级文件夹匹配。",
-	"folderLabel": "按名称的文件夹(任意位置)",
-	"folderDescription": "与任意位置具有特定名称的文件夹匹配。",
-	"falseDescription": "禁用该模式。",
-	"trueDescription": "启用该模式。",
-	"siblingsDescription": "与具有名称相同但扩展名不同的同级文件的文件匹配。",
-	"languageSpecificEditorSettings": "特定语言编辑器设置",
-	"languageSpecificEditorSettingsDescription": "替代语言编辑器设置"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/configuration-editing/package.i18n.json b/i18n/chs/extensions/configuration-editing/package.i18n.json
deleted file mode 100644
index aaeed5da05e..00000000000
--- a/i18n/chs/extensions/configuration-editing/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "配置编辑",
-	"description": "在配置文件 (如设置、启动和扩展推荐文件) 中提供高级 IntelliSense、自动修复等功能"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/cpp/package.i18n.json b/i18n/chs/extensions/cpp/package.i18n.json
deleted file mode 100644
index 13d16dde7c6..00000000000
--- a/i18n/chs/extensions/cpp/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "C/C++ 语言基础功能",
-	"description": "在 C/C++ 文件中提供代码片段、语法高亮、括号匹配和折叠功能。"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/csharp/package.i18n.json b/i18n/chs/extensions/csharp/package.i18n.json
deleted file mode 100644
index b7994211965..00000000000
--- a/i18n/chs/extensions/csharp/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "C# 语言基础功能",
-	"description": "在 C# 文件中提供代码片段、语法高亮、括号匹配和折叠功能。"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/css-language-features/client/out/cssMain.i18n.json b/i18n/chs/extensions/css-language-features/client/out/cssMain.i18n.json
deleted file mode 100644
index bbb5b917ca9..00000000000
--- a/i18n/chs/extensions/css-language-features/client/out/cssMain.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"cssserver.name": "CSS 语言服务器",
-	"folding.start": "折叠区域开始",
-	"folding.end": "折叠区域结束"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/css-language-features/package.i18n.json b/i18n/chs/extensions/css-language-features/package.i18n.json
deleted file mode 100644
index e35e92e1f84..00000000000
--- a/i18n/chs/extensions/css-language-features/package.i18n.json
+++ /dev/null
@@ -1,81 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "CSS 语言功能",
-	"description": "为 CSS、LESS 和 SCSS 文件提供丰富的语言支持。",
-	"css.title": "CSS",
-	"css.lint.argumentsInColorFunction.desc": "参数数量无效",
-	"css.lint.boxModel.desc": "使用边距或边框时，不要使用宽度或高度",
-	"css.lint.compatibleVendorPrefixes.desc": "使用供应商特定前缀时，确保同时包括所有其他供应商特定属性",
-	"css.lint.duplicateProperties.desc": "不要使用重复的样式定义",
-	"css.lint.emptyRules.desc": "不要使用空规则集",
-	"css.lint.float.desc": "避免使用“float”。浮动会带来脆弱的 CSS，如果布局的某一方面更改，将很容易破坏 CSS。",
-	"css.lint.fontFaceProperties.desc": "@font-face 规则必须定义 \"src\" 和 \"font-family\" 属性",
-	"css.lint.hexColorLength.desc": "十六进制颜色必须由三个或六个十六进制数字组成",
-	"css.lint.idSelector.desc": "选择器不应包含 ID，因为这些规则与 HTML 的耦合过于紧密。",
-	"css.lint.ieHack.desc": "仅当支持 IE7 及更低版本时，才需要 IE hack",
-	"css.lint.important.desc": "避免使用 !important。它表明整个 CSS 的特异性已经失去控制且需要重构。",
-	"css.lint.importStatement.desc": "Import 语句不会并行加载",
-	"css.lint.propertyIgnoredDueToDisplay.desc": "因显示而忽略属性。例如，使用 \"display: inline\"时，宽度、高度、上边距、下边距和 float 属性将不起作用",
-	"css.lint.universalSelector.desc": "通配选择符 (*) 运行效率低",
-	"css.lint.unknownProperties.desc": "未知的属性。",
-	"css.lint.unknownVendorSpecificProperties.desc": "未知的供应商特定属性。",
-	"css.lint.vendorPrefix.desc": "使用供应商特定前缀时，还应包括标准属性",
-	"css.lint.zeroUnits.desc": "零不需要单位",
-	"css.trace.server.desc": "跟踪 VS Code 与 CSS 语言服务器之间的通信。",
-	"css.validate.title": "控制 CSS 验证和问题严重性。",
-	"css.validate.desc": "启用或禁用所有验证",
-	"less.title": "LESS",
-	"less.lint.argumentsInColorFunction.desc": "参数数量无效",
-	"less.lint.boxModel.desc": "使用边距或边框时，不要使用宽度或高度",
-	"less.lint.compatibleVendorPrefixes.desc": "使用供应商特定前缀时，确保同时包括所有其他供应商特定属性",
-	"less.lint.duplicateProperties.desc": "不要使用重复的样式定义",
-	"less.lint.emptyRules.desc": "不要使用空规则集",
-	"less.lint.float.desc": "避免使用“float”。浮动会带来脆弱的 CSS，如果布局的某一方面更改，将很容易破坏 CSS。",
-	"less.lint.fontFaceProperties.desc": "@font-face 规则必须定义 \"src\" 和 \"font-family\" 属性",
-	"less.lint.hexColorLength.desc": "十六进制颜色必须由三个或六个十六进制数字组成",
-	"less.lint.idSelector.desc": "选择器不应包含 ID，因为这些规则与 HTML 的耦合过于紧密。",
-	"less.lint.ieHack.desc": "仅当支持 IE7 及更低版本时，才需要 IE hack",
-	"less.lint.important.desc": "避免使用 !important。它表明整个 CSS 的特异性已经失去控制且需要重构。",
-	"less.lint.importStatement.desc": "Import 语句不会并行加载",
-	"less.lint.propertyIgnoredDueToDisplay.desc": "因显示而忽略属性。例如，使用 \"display: inline\"时，宽度、高度、上边距、下边距和 float 属性将不起作用",
-	"less.lint.universalSelector.desc": "通配选择符 (*) 运行效率低",
-	"less.lint.unknownProperties.desc": "未知的属性。",
-	"less.lint.unknownVendorSpecificProperties.desc": "未知的供应商特定属性。",
-	"less.lint.vendorPrefix.desc": "使用供应商特定前缀时，还应包括标准属性",
-	"less.lint.zeroUnits.desc": "零不需要单位",
-	"less.validate.title": "控制 LESS 验证和问题严重性。",
-	"less.validate.desc": "启用或禁用所有验证",
-	"scss.title": "SCSS (Sass)",
-	"scss.lint.argumentsInColorFunction.desc": "参数数量无效",
-	"scss.lint.boxModel.desc": "使用边距或边框时，不要使用宽度或高度",
-	"scss.lint.compatibleVendorPrefixes.desc": "使用供应商特定前缀时，确保同时包括所有其他供应商特定属性",
-	"scss.lint.duplicateProperties.desc": "不要使用重复的样式定义",
-	"scss.lint.emptyRules.desc": "不要使用空规则集",
-	"scss.lint.float.desc": "避免使用“float”。浮动会带来脆弱的 CSS，如果布局的某一方面更改，将很容易破坏 CSS。",
-	"scss.lint.fontFaceProperties.desc": "@font-face 规则必须定义 \"src\" 和 \"font-family\" 属性",
-	"scss.lint.hexColorLength.desc": "十六进制颜色必须由三个或六个十六进制数字组成",
-	"scss.lint.idSelector.desc": "选择器不应包含 ID，因为这些规则与 HTML 的耦合过于紧密。",
-	"scss.lint.ieHack.desc": "仅当支持 IE7 及更低版本时，才需要 IE hack",
-	"scss.lint.important.desc": "避免使用 !important。它表明整个 CSS 的特异性已经失去控制且需要重构。",
-	"scss.lint.importStatement.desc": "Import 语句不会并行加载",
-	"scss.lint.propertyIgnoredDueToDisplay.desc": "因显示而忽略属性。例如，使用 \"display: inline\"时，宽度、高度、上边距、下边距和 float 属性将不起作用",
-	"scss.lint.universalSelector.desc": "通配选择符 (*) 运行效率低",
-	"scss.lint.unknownProperties.desc": "未知的属性。",
-	"scss.lint.unknownVendorSpecificProperties.desc": "未知的供应商特定属性。",
-	"scss.lint.vendorPrefix.desc": "使用供应商特定前缀时，还应包括标准属性",
-	"scss.lint.zeroUnits.desc": "零不需要单位",
-	"scss.validate.title": "控制 SCSS 验证和问题严重性。",
-	"scss.validate.desc": "启用或禁用所有验证",
-	"less.colorDecorators.enable.desc": "启用或禁用颜色修饰器",
-	"scss.colorDecorators.enable.desc": "启用或禁用颜色修饰器",
-	"css.colorDecorators.enable.desc": "启用或禁用颜色修饰器",
-	"css.colorDecorators.enable.deprecationMessage": "已弃用设置 \"css.colorDecorators.enabl\"，请改用 \"editor.colorDecorators\"。",
-	"scss.colorDecorators.enable.deprecationMessage": "已弃用设置 \"scss.colorDecorators.enable\"，请改用 \"editor.colorDecorators\"。",
-	"less.colorDecorators.enable.deprecationMessage": "已弃用设置 \"less.colorDecorators.enable\"，请改用 \"editor.colorDecorators\"。"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/css/client/out/cssMain.i18n.json b/i18n/chs/extensions/css/client/out/cssMain.i18n.json
deleted file mode 100644
index bbb5b917ca9..00000000000
--- a/i18n/chs/extensions/css/client/out/cssMain.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"cssserver.name": "CSS 语言服务器",
-	"folding.start": "折叠区域开始",
-	"folding.end": "折叠区域结束"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/css/package.i18n.json b/i18n/chs/extensions/css/package.i18n.json
deleted file mode 100644
index 52369e22e58..00000000000
--- a/i18n/chs/extensions/css/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "CSS 语言基础功能",
-	"description": "为 CSS、LESS 和 SCSS 文件中提供语法高亮和括号匹配功能。"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/diff/package.i18n.json b/i18n/chs/extensions/diff/package.i18n.json
deleted file mode 100644
index 989efc9d0d2..00000000000
--- a/i18n/chs/extensions/diff/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Diff 文件语言功能",
-	"description": "在 Diff 文件中提供语法高亮、括号匹配和其他语言功能"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/docker/package.i18n.json b/i18n/chs/extensions/docker/package.i18n.json
deleted file mode 100644
index b4225f7d675..00000000000
--- a/i18n/chs/extensions/docker/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Docker 语言基础功能",
-	"description": "在 Docker 文件中提供语法高亮和括号匹配功能。"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/emmet/package.i18n.json b/i18n/chs/extensions/emmet/package.i18n.json
deleted file mode 100644
index 5cf0382870f..00000000000
--- a/i18n/chs/extensions/emmet/package.i18n.json
+++ /dev/null
@@ -1,65 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"description": "适用于 VS Code 的 Emmet 支持",
-	"command.wrapWithAbbreviation": "使用缩写包围",
-	"command.wrapIndividualLinesWithAbbreviation": "输入缩写包围个别行",
-	"command.removeTag": "移除标签",
-	"command.updateTag": "更新标签",
-	"command.matchTag": "转至匹配对",
-	"command.balanceIn": "平衡(向内)",
-	"command.balanceOut": "平衡(向外)",
-	"command.prevEditPoint": "转到上一编辑点",
-	"command.nextEditPoint": "转到下一编辑点",
-	"command.mergeLines": "合并行",
-	"command.selectPrevItem": "选择上一项",
-	"command.selectNextItem": "选择下一项",
-	"command.splitJoinTag": "分离/联接标记",
-	"command.toggleComment": "切换注释",
-	"command.evaluateMathExpression": "求数学表达式的值",
-	"command.updateImageSize": "更新图像大小",
-	"command.reflectCSSValue": "映射 CSS 值",
-	"command.incrementNumberByOne": "增加 1",
-	"command.decrementNumberByOne": "减少 1",
-	"command.incrementNumberByOneTenth": "增加 0.1",
-	"command.decrementNumberByOneTenth": "减少 0.1",
-	"command.incrementNumberByTen": "增加 10",
-	"command.decrementNumberByTen": "减少 10",
-	"emmetSyntaxProfiles": "为指定的语法定义配置文件或使用带有特定规则的配置文件。",
-	"emmetExclude": "不应展开 Emmet 缩写的语言数组。",
-	"emmetExtensionsPath": "包含 Emmet 配置文件与代码片段的文件夹路径。",
-	"emmetShowExpandedAbbreviation": "在建议中显示展开的 Emmet 缩写。\n选择 \"inMarkupAndStylesheetFilesOnly\" 选项将仅应用于 html、haml、jade、slim、xml、xsl、css、scss、sass、less 和 stylus 文件。\n选择 \"always\" 选项将应用于所有适用文件不限于标记或 CSS 的所有部分。",
-	"emmetShowAbbreviationSuggestions": "显示可能的 Emmet 缩写作为建议。在样式表中或当 emmet.showExpandedAbbreviation 设置为 \"never\" 时不适用。",
-	"emmetIncludeLanguages": "在默认不支持 Emmet 的语言中启用 Emmet 缩写功能。在此添加该语言与受支持的语言间的映射。\n示例: {\"vue-html\": \"html\", \"javascript\": \"javascriptreact\"}",
-	"emmetVariables": "用于 Emmet 代码片段的变量",
-	"emmetTriggerExpansionOnTab": "启用后，按下 TAB 键，将展开 Emmet 缩写。",
-	"emmetPreferences": "用于修改 Emmet 某些操作和解析程序的行为的首选项。",
-	"emmetPreferencesIntUnit": "整数值的默认单位",
-	"emmetPreferencesFloatUnit": "浮点数值的默认单位",
-	"emmetPreferencesCssAfter": "展开 CSS 缩写时在 CSS 属性末尾放置的符号",
-	"emmetPreferencesSassAfter": "在 Sass 文件中展开 CSS 缩写时在 CSS 属性末尾放置的符号",
-	"emmetPreferencesStylusAfter": "在 Stylus 文件中展开 CSS 缩写时在 CSS 属性末尾放置的符号",
-	"emmetPreferencesCssBetween": "展开 CSS 缩写时在 CSS 属性之间放置的符号",
-	"emmetPreferencesSassBetween": "在 Sass 文件中展开 CSS 缩写时在 CSS 属性之间放置的符号",
-	"emmetPreferencesStylusBetween": "在 Stylus 文件中展开 CSS 缩写时在 CSS 属性之间放置的符号",
-	"emmetShowSuggestionsAsSnippets": "若为 \"true\"，Emmet 建议将显示为代码片段。你可以在 editor.snippetSuggestions 设置中排列顺序。",
-	"emmetPreferencesBemElementSeparator": "在使用 BEM 过滤器时，类名使用的元素分隔符",
-	"emmetPreferencesBemModifierSeparator": "在使用 BEM 过滤器时，类名使用的修饰符分隔符",
-	"emmetPreferencesFilterCommentBefore": "使用注释过滤器时，应置于匹配元素前注释的定义。",
-	"emmetPreferencesFilterCommentAfter": "使用注释过滤器时，应置于匹配元素后注释的定义。",
-	"emmetPreferencesFilterCommentTrigger": "用半角逗号 (\",\") 隔开的属性名缩写的数组，将由注释筛选器应用",
-	"emmetPreferencesFormatNoIndentTags": "表示不应向内缩进的标记名称数组",
-	"emmetPreferencesFormatForceIndentTags": "表示应始终向内缩进的标记名称数组",
-	"emmetPreferencesAllowCompactBoolean": "若为 \"true\"，将生成紧凑型布尔属性",
-	"emmetPreferencesCssWebkitProperties": "Emmet 缩写中使用的由 \"-\" 打头有 \"webkit\" 前缀的 CSS 属性，使用半角逗号 (\",\") 进行分隔。若要始终避免 \"webkit\" 前缀，请设为空字符串。",
-	"emmetPreferencesCssMozProperties": "Emmet 缩写中使用的由 \"-\" 打头有 \"moz\" 前缀的 CSS 属性，使用半角逗号 (\",\") 进行分隔。若要始终避免 \"moz\" 前缀，请设为空字符串。",
-	"emmetPreferencesCssOProperties": "Emmet 缩写中使用的由 \"-\" 打头有 \"o\" 前缀的 CSS 属性，使用半角逗号 (\",\") 进行分隔。若要始终避免 \"o\" 前缀，请设为空字符串。",
-	"emmetPreferencesCssMsProperties": "Emmet 缩写中使用的由 \"-\" 打头有 \"ms\" 前缀的 CSS 属性，使用半角逗号 (\",\") 进行分隔。若要始终避免 \"ms\" 前缀，请设为空字符串。",
-	"emmetPreferencesCssFuzzySearchMinScore": "显示的缩写模糊匹配应达到的最低分数 (0 到 1 之间)。较低的值可能使匹配错误变多，较高的值可能将不会显示应有的匹配项。",
-	"emmetOptimizeStylesheetParsing": "当设置为 false 时，将分析整个文件并确定当前位置能否展开 Emmet 缩写。当设置为 true 时，则仅在 CSS/SCSS/LESS 文件中进行分析。"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/extension-editing/out/extensionLinter.i18n.json b/i18n/chs/extensions/extension-editing/out/extensionLinter.i18n.json
deleted file mode 100644
index 605e80db792..00000000000
--- a/i18n/chs/extensions/extension-editing/out/extensionLinter.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"httpsRequired": "图像必须使用 HTTPS 协议。",
-	"svgsNotValid": "SVG 不是有效的图像源。",
-	"embeddedSvgsNotValid": "嵌入的 SVG 不是有效的图像源。",
-	"dataUrlsNotValid": "数据 URL 不是有效的图像源。",
-	"relativeUrlRequiresHttpsRepository": "相关 URL 要求在 package.json 中指定使用 HTTPS 协议的存储库。",
-	"relativeIconUrlRequiresHttpsRepository": "图标要求在此 package.json 中指定使用 HTTPS 协议的存储库。",
-	"relativeBadgeUrlRequiresHttpsRepository": "相对徽章 URL 要求在 package.json 中指定使用 HTTPS 协议的存储库。"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/extension-editing/out/packageDocumentHelper.i18n.json b/i18n/chs/extensions/extension-editing/out/packageDocumentHelper.i18n.json
deleted file mode 100644
index c15dee52d29..00000000000
--- a/i18n/chs/extensions/extension-editing/out/packageDocumentHelper.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"languageSpecificEditorSettings": "特定语言编辑器设置",
-	"languageSpecificEditorSettingsDescription": "替代语言编辑器设置"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/extension-editing/package.i18n.json b/i18n/chs/extensions/extension-editing/package.i18n.json
deleted file mode 100644
index 52ba58a30d8..00000000000
--- a/i18n/chs/extensions/extension-editing/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Package 文件编辑",
-	"description": "为 VS Code 扩展点提供 IntelliSense，并为 package.json 文件提供 linting 功能。"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/fsharp/package.i18n.json b/i18n/chs/extensions/fsharp/package.i18n.json
deleted file mode 100644
index c0ed9b41f3f..00000000000
--- a/i18n/chs/extensions/fsharp/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "F# 语言基础功能",
-	"description": "在 F# 文件中提供代码片段、语法高亮、括号匹配和折叠功能。"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/git/out/askpass-main.i18n.json b/i18n/chs/extensions/git/out/askpass-main.i18n.json
deleted file mode 100644
index fc1422d5377..00000000000
--- a/i18n/chs/extensions/git/out/askpass-main.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"missOrInvalid": "凭据丢失或无效。"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/git/out/autofetch.i18n.json b/i18n/chs/extensions/git/out/autofetch.i18n.json
deleted file mode 100644
index 1b09e9c6bd8..00000000000
--- a/i18n/chs/extensions/git/out/autofetch.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"yes": "是",
-	"no": "否",
-	"not now": "稍后询问",
-	"suggest auto fetch": "您希望 Code [定期运行 \"git fetch\"]({0}) 吗?"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/git/out/commands.i18n.json b/i18n/chs/extensions/git/out/commands.i18n.json
deleted file mode 100644
index 04fae89946b..00000000000
--- a/i18n/chs/extensions/git/out/commands.i18n.json
+++ /dev/null
@@ -1,91 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"tag at": "{0} 处的 Tag",
-	"remote branch at": "{0} 处的远程分支",
-	"create branch": "$(plus) 创建新分支",
-	"repourl": "存储库 URL",
-	"selectFolder": "选择存储库位置",
-	"cloning": "正在克隆 Git 存储库“{0}”...",
-	"proposeopen": "是否要打开已克隆存储库?",
-	"openrepo": "打开存储库",
-	"add": "添加到工作区",
-	"proposeopen2": "您是希望打开克隆的存储库，还是将其添加到当前工作区?",
-	"init": "选择用于初始化 Git 储存库的工作区文件夹",
-	"init repo": "初始化存储库",
-	"create repo": "初始化存储库",
-	"are you sure": "将在“{0}”中创建 Git 存储库。确定要继续吗？",
-	"HEAD not available": "“{0}”的 HEAD 版本不可用。",
-	"confirm stage files with merge conflicts": "确定要暂存含有合并冲突的 {0} 个文件吗?",
-	"confirm stage file with merge conflicts": "确定要暂存含有合并冲突的 {0}  吗?",
-	"yes": "是",
-	"confirm revert": "是否确实要还原 {0} 中的已选更改?",
-	"revert": "还原更改",
-	"discard": "放弃更改",
-	"confirm delete": "是否确定要删除 {0}?",
-	"delete file": "删除文件",
-	"confirm discard": "确定要放弃 {0} 中更改吗?",
-	"confirm discard multiple": "是否确实要放弃 {0} 文件中的更改?",
-	"warn untracked": "这将删除 {0} 个未跟踪的文件!",
-	"confirm discard all single": "确定要放弃 {0} 中更改吗?",
-	"confirm discard all": "确定要放弃在 {0} 个文件中的所有更改吗？\n此操作不可撤销!\n你当前的工作集将会永远丢失。",
-	"discardAll multiple": "放弃 1 个文件",
-	"discardAll": "放弃所有 {0} 个文件",
-	"confirm delete multiple": "是否确定要删除 {0} 个文件?",
-	"delete files": "删除文件",
-	"there are untracked files single": "若放弃下面未跟踪的文件，其将被从硬盘上删除: {0}。",
-	"there are untracked files": "若放弃 {0} 个未跟踪的文件，其将被从硬盘上删除。",
-	"confirm discard all 2": "{0}\n\n此操作不可撤销，你当前的工作集将会永远丢失。",
-	"yes discard tracked": "放弃 1  个已跟踪的文件",
-	"yes discard tracked multiple": "放弃 {0} 个已跟踪的文件",
-	"unsaved files single": "以下文件尚未保存：{0}。\n\n您要在提交之前保存吗?",
-	"unsaved files": "当前有 {0} 个文件尚未保存。\n\n您要在提交之前保存吗?",
-	"save and commit": "全部保存并提交",
-	"commit": "仍要提交",
-	"no staged changes": "现在没有暂存的更改以供提交\n\n是否要直接自动暂存所有更改并提交？",
-	"always": "始终",
-	"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": "删除分支",
-	"invalid branch name": "分支名称无效",
-	"branch already exists": "已存在名为“{0}”的分支",
-	"select a branch to merge from": "选择要从其合并的分支",
-	"merge conflicts": "存在合并冲突。请在提交之前解决这些冲突。",
-	"tag name": "标签名称",
-	"provide tag name": "请提供标签名称",
-	"tag message": "消息",
-	"provide tag message": "请提供消息以对标签进行注释",
-	"no remotes to fetch": "此存储库未配置可以从中抓取的远程存储库。",
-	"no remotes to pull": "存储库未配置任何可进行拉取的远程存储库。",
-	"pick remote pull repo": "选择要从其拉取分支的远程位置",
-	"no remotes to push": "存储库未配置任何要推送到的远程存储库。",
-	"nobranch": "请签出一个分支以推送到远程。",
-	"confirm publish branch": "分支“{0}”没有上游分支。您要发布此分支吗?",
-	"ok": "确定",
-	"push with tags success": "已成功带标签进行推送。",
-	"pick remote": "选取要将分支“{0}”发布到的远程:",
-	"sync is unpredictable": "此操作将推送提交至“{0}/{1}”，并从中拉取提交。",
-	"never again": "确定，且不再显示",
-	"no remotes to publish": "存储库未配置任何要发布到的远程存储库。",
-	"no changes stash": "没有要储藏的更改。",
-	"provide stash message": "提供储藏消息(可选)",
-	"stash message": "储藏消息",
-	"no stashes": "没有可以恢复的储藏。",
-	"pick stash to pop": "选择要弹出的储藏",
-	"clean repo": "在签出前，请清理存储库工作树。",
-	"cant push": "无法推送 refs 到远端。您可以试着运行“拉取”功能，整合您的更改。",
-	"git error details": "Git: {0}",
-	"git error": "Git 错误",
-	"open git log": "打开 Git 日志"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/git/out/main.i18n.json b/i18n/chs/extensions/git/out/main.i18n.json
deleted file mode 100644
index 3af01415f05..00000000000
--- a/i18n/chs/extensions/git/out/main.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"looking": "正在查找 Git: {0}",
-	"using git": "将使用位于 {1} 的 Git {0}",
-	"downloadgit": "下载 Git",
-	"neverShowAgain": "不再显示",
-	"notfound": "未找到 Git。请安装 Git，或在 \"git.path\" 设置中配置。",
-	"updateGit": "更新 Git",
-	"git20": "你似乎已安装 Git {0}。Code 和 Git 版本 >=2 一起工作最佳"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/git/out/model.i18n.json b/i18n/chs/extensions/git/out/model.i18n.json
deleted file mode 100644
index e965f8d5735..00000000000
--- a/i18n/chs/extensions/git/out/model.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"too many submodules": "“{0}”存储库中的 {1} 个子模块将不会自动打开。您仍可以通过打开其中的文件来单独打开每个子模块。",
-	"no repositories": "没有可用存储库",
-	"pick repo": "选择存储库"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/git/out/repository.i18n.json b/i18n/chs/extensions/git/out/repository.i18n.json
deleted file mode 100644
index 9cf0fee4369..00000000000
--- a/i18n/chs/extensions/git/out/repository.i18n.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"open": "打开",
-	"index modified": "已修改索引",
-	"modified": "已修改",
-	"index added": "已添加索引",
-	"index deleted": "已删除索引",
-	"deleted": "已删除",
-	"index renamed": "已重命名索引",
-	"index copied": "已复制索引",
-	"untracked": "未跟踪的",
-	"ignored": "已忽略",
-	"both deleted": "两者均已删除",
-	"added by us": "已由我们添加",
-	"deleted by them": "已被他们删除",
-	"added by them": "已由他们添加",
-	"deleted by us": "已被我们删除",
-	"both added": "两者均已添加",
-	"both modified": "二者均已修改",
-	"commitMessage": "消息 (按 {0} 提交)",
-	"commit": "提交",
-	"merge changes": "合并更改",
-	"staged changes": "暂存的更改",
-	"changes": "更改",
-	"commitMessageCountdown": "当前行剩余 {0} 个字符",
-	"commitMessageWarning": "当前行比 {1} 超出 {0} 个字符",
-	"neveragain": "不再显示",
-	"huge": "Git 存储库“{0}”中存在大量活动更改，将仅启用部分 Git 功能。"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/git/out/scmProvider.i18n.json b/i18n/chs/extensions/git/out/scmProvider.i18n.json
deleted file mode 100644
index c52199b46c1..00000000000
--- a/i18n/chs/extensions/git/out/scmProvider.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"commit": "提交"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/git/out/statusbar.i18n.json b/i18n/chs/extensions/git/out/statusbar.i18n.json
deleted file mode 100644
index b5019c165fd..00000000000
--- a/i18n/chs/extensions/git/out/statusbar.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"checkout": "签出...",
-	"sync changes": "同步更改",
-	"publish changes": "发布更改",
-	"syncing changes": "正在同步更改..."
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/git/package.i18n.json b/i18n/chs/extensions/git/package.i18n.json
deleted file mode 100644
index 7c2a3b49c9f..00000000000
--- a/i18n/chs/extensions/git/package.i18n.json
+++ /dev/null
@@ -1,87 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Git",
-	"description": "Git 源代码管理集成",
-	"command.clone": "克隆",
-	"command.init": "初始化存储库",
-	"command.close": "关闭存储库",
-	"command.refresh": "刷新",
-	"command.openChange": "打开更改",
-	"command.openFile": "打开文件",
-	"command.openHEADFile": "打开文件 (HEAD)",
-	"command.stage": "暂存更改",
-	"command.stageAll": "暂存所有更改",
-	"command.stageSelectedRanges": "暂存所选范围",
-	"command.revertSelectedRanges": "还原所选更改",
-	"command.stageChange": "暂存更改",
-	"command.revertChange": "还原更改",
-	"command.unstage": "取消暂存更改",
-	"command.unstageAll": "取消暂存所有更改",
-	"command.unstageSelectedRanges": "取消暂存所选范围",
-	"command.clean": "放弃更改",
-	"command.cleanAll": "放弃所有更改",
-	"command.commit": "提交",
-	"command.commitStaged": "提交已暂存文件",
-	"command.commitStagedSigned": "提交已暂存文件(已签名)",
-	"command.commitStagedAmend": "已暂存提交(修改)",
-	"command.commitAll": "全部提交",
-	"command.commitAllSigned": "全部提交(已签名)",
-	"command.commitAllAmend": "全部提交(修改)",
-	"command.undoCommit": "撤消上次提交",
-	"command.checkout": "签出到...",
-	"command.branch": "创建分支...",
-	"command.deleteBranch": "删除分支...",
-	"command.renameBranch": "重命名分支...",
-	"command.merge": "合并分支...",
-	"command.createTag": "创建标签",
-	"command.fetch": "抓取",
-	"command.pull": "拉取",
-	"command.pullRebase": "拉取(变基)",
-	"command.pullFrom": "拉取自...",
-	"command.push": "推送",
-	"command.pushTo": "推送到...",
-	"command.pushWithTags": "带标签推送",
-	"command.sync": "同步",
-	"command.syncRebase": "同步(变基)",
-	"command.publish": "发布分支",
-	"command.showOutput": "显示 Git 输出",
-	"command.ignore": "将文件添加到 .gitignore",
-	"command.stashIncludeUntracked": "储藏(包含未跟踪)",
-	"command.stash": "储藏",
-	"command.stashPop": "弹出储藏...",
-	"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.ignoreLegacyWarning": "忽略“旧版 Git”警告",
-	"config.ignoreMissingGitWarning": "忽略“缺失 Git”警告",
-	"config.ignoreLimitWarning": "忽略“存储库中存在大量更改”的警告",
-	"config.defaultCloneDirectory": "克隆 Git 存储库的默认位置",
-	"config.enableSmartCommit": "在没有暂存的更改时提交所有更改。",
-	"config.enableCommitSigning": "启用使用 GPG 签名的提交",
-	"config.discardAllScope": "控制运行“放弃所有更改”命令时放弃的更改类型。\"all\" 放弃所有更改。\"tracked\" 只放弃跟踪的文件。\"prompt\" 表示在每次运行此操作时显示提示对话框。",
-	"config.decorations.enabled": "控制 Git 是否向资源管理器和“打开的编辑器”视图添加颜色和小标。",
-	"config.promptToSaveFilesBeforeCommit": "控制 Git 是否在提交之前检查未保存的文件。",
-	"config.showInlineOpenFileAction": "控制是否在 Git 更改视图中显示内联“打开文件”操作。",
-	"config.inputValidation": "控制何时显示提交消息输入验证。",
-	"config.detectSubmodules": "控制是否自动检测 Git 子模块。",
-	"config.detectSubmodulesLimit": "控制可检测到的 Git 子模块的限制。",
-	"colors.modified": "已修改资源的颜色。",
-	"colors.deleted": "已删除资源的颜色。",
-	"colors.untracked": "未跟踪资源的颜色。",
-	"colors.ignored": "已忽略资源的颜色。",
-	"colors.conflict": "存在冲突的资源的颜色。",
-	"colors.submodule": "子模块资源的颜色。"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/go/package.i18n.json b/i18n/chs/extensions/go/package.i18n.json
deleted file mode 100644
index b0a267de736..00000000000
--- a/i18n/chs/extensions/go/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Go 语言基础功能",
-	"description": "在 Go 文件中提供语法高亮和括号匹配功能。"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/groovy/package.i18n.json b/i18n/chs/extensions/groovy/package.i18n.json
deleted file mode 100644
index a4158aaa1e4..00000000000
--- a/i18n/chs/extensions/groovy/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Groovy 语言基础功能",
-	"description": "在 Groovy 文件中提供代码片段、语法高亮和括号匹配功能。"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/grunt/out/main.i18n.json b/i18n/chs/extensions/grunt/out/main.i18n.json
deleted file mode 100644
index 1212c2fb367..00000000000
--- a/i18n/chs/extensions/grunt/out/main.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"execFailed": "在文件夹 {0} 中自动检测 Grunt 失败，错误: {1}"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/grunt/package.i18n.json b/i18n/chs/extensions/grunt/package.i18n.json
deleted file mode 100644
index 79d0cc7c97a..00000000000
--- a/i18n/chs/extensions/grunt/package.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"description": "向 VSCode 提供 Grunt 功能的扩展。",
-	"displayName": "适用于 VSCode 的 Grunt 支持",
-	"config.grunt.autoDetect": "控制是否自动检测 Grunt 任务。默认开启。",
-	"grunt.taskDefinition.type.description": "要自定义的 Grunt 任务。",
-	"grunt.taskDefinition.file.description": "提供任务的 Grunt 文件。可以省略。"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/gulp/out/main.i18n.json b/i18n/chs/extensions/gulp/out/main.i18n.json
deleted file mode 100644
index fe8ac1df9fc..00000000000
--- a/i18n/chs/extensions/gulp/out/main.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"execFailed": "在文件夹 {0} 中自动检测 gulp 失败，错误: {1}"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/gulp/package.i18n.json b/i18n/chs/extensions/gulp/package.i18n.json
deleted file mode 100644
index 982e7640b35..00000000000
--- a/i18n/chs/extensions/gulp/package.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"description": "向 VSCode 提供 Gulp 功能的扩展。",
-	"displayName": "适用于 VSCode 的 Gulp 支持",
-	"config.gulp.autoDetect": "控制是否自动检测 Gulp 任务。默认开启。",
-	"gulp.taskDefinition.type.description": "要自定义的 Gulp 任务。",
-	"gulp.taskDefinition.file.description": "提供任务的 Gulp 文件。可以省略。"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/handlebars/package.i18n.json b/i18n/chs/extensions/handlebars/package.i18n.json
deleted file mode 100644
index c6c0c6eca85..00000000000
--- a/i18n/chs/extensions/handlebars/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Handlebars 语言基础功能",
-	"description": "在 Handlebars 文件中提供语法高亮和括号匹配功能。"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/hlsl/package.i18n.json b/i18n/chs/extensions/hlsl/package.i18n.json
deleted file mode 100644
index 2ee5d27be78..00000000000
--- a/i18n/chs/extensions/hlsl/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "HLSL 语言基础功能",
-	"description": "在 HLSL 文件中提供语法高亮和括号匹配功能。"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/html-language-features/client/out/htmlMain.i18n.json b/i18n/chs/extensions/html-language-features/client/out/htmlMain.i18n.json
deleted file mode 100644
index 9df9ff90438..00000000000
--- a/i18n/chs/extensions/html-language-features/client/out/htmlMain.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"htmlserver.name": "HTML 语言服务器",
-	"folding.start": "折叠区域开始",
-	"folding.end": "折叠区域结束"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/html-language-features/package.i18n.json b/i18n/chs/extensions/html-language-features/package.i18n.json
deleted file mode 100644
index 10478bc7fed..00000000000
--- a/i18n/chs/extensions/html-language-features/package.i18n.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "HTML 语言功能",
-	"description": "为 HTML、Razor 和 Handlebar 文件提供丰富的语言支持。",
-	"html.format.enable.desc": "启用/禁用默认 HTML 格式化程序",
-	"html.format.wrapLineLength.desc": "每行最大字符数(0 = 禁用)。",
-	"html.format.unformatted.desc": "以逗号分隔的标记列表不应重设格式。\"null\" 默认为所有列于 https://www.w3.org/TR/html5/dom.html#phrasing-content 的标记。",
-	"html.format.contentUnformatted.desc": "以逗号分隔的标记列表，不应在其中重新设置内容的格式。\"null\" 默认为 \"pre\" 标记。",
-	"html.format.indentInnerHtml.desc": "缩进 <head> 和 <body> 部分。",
-	"html.format.preserveNewLines.desc": "是否要保留元素前面的现有换行符。仅适用于元素前，不适用于标记内或文本。",
-	"html.format.maxPreserveNewLines.desc": "要保留在一个区块中的换行符的最大数量。对于无限制使用 \"null\"。",
-	"html.format.indentHandlebars.desc": "格式和缩进 {{#foo}} 和 {{/foo}}。",
-	"html.format.endWithNewline.desc": "以新行结束。",
-	"html.format.extraLiners.desc": "标记列表，以逗号分隔，其前应有额外新行。\"null\" 默认为“标头、正文、/html”。",
-	"html.format.wrapAttributes.desc": "对属性进行换行。",
-	"html.format.wrapAttributes.auto": "仅在超出行长度时才对属性进行换行。",
-	"html.format.wrapAttributes.force": "对除第一个属性外的其他每个属性进行换行。",
-	"html.format.wrapAttributes.forcealign": "对除第一个属性外的其他每个属性进行换行，并保持对齐。",
-	"html.format.wrapAttributes.forcemultiline": "对每个属性进行换行。",
-	"html.suggest.angular1.desc": "配置内置 HTML 语言支持是否建议 Angular V1 标记和属性。",
-	"html.suggest.ionic.desc": "配置内置 HTML 语言支持是否建议 Ionic 标记、属性和值。",
-	"html.suggest.html5.desc": "配置内置 HTML 语言支持是否建议 HTML5 标记、属性和值。",
-	"html.trace.server.desc": "跟踪 VS Code 与 HTML 语言服务器之间的通信。",
-	"html.validate.scripts": "配置内置的 HTML 语言支持是否对嵌入的脚本进行验证。",
-	"html.validate.styles": "配置内置的 HTML 语言支持是否对嵌入的样式进行验证。",
-	"html.autoClosingTags": "启用/禁用 HTML 标记的自动关闭。"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/html/client/out/htmlMain.i18n.json b/i18n/chs/extensions/html/client/out/htmlMain.i18n.json
deleted file mode 100644
index 9df9ff90438..00000000000
--- a/i18n/chs/extensions/html/client/out/htmlMain.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"htmlserver.name": "HTML 语言服务器",
-	"folding.start": "折叠区域开始",
-	"folding.end": "折叠区域结束"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/html/package.i18n.json b/i18n/chs/extensions/html/package.i18n.json
deleted file mode 100644
index ba42e46c478..00000000000
--- a/i18n/chs/extensions/html/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "HTML 语言基础功能",
-	"description": "在 HTML 文件中提供语法高亮、括号匹配和代码片段功能。"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/ini/package.i18n.json b/i18n/chs/extensions/ini/package.i18n.json
deleted file mode 100644
index 5d48fc51f2a..00000000000
--- a/i18n/chs/extensions/ini/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Ini 语言基础功能",
-	"description": "在 Ini 文件中提供语法高亮和括号匹配功能。"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/jake/out/main.i18n.json b/i18n/chs/extensions/jake/out/main.i18n.json
deleted file mode 100644
index c930a80d85c..00000000000
--- a/i18n/chs/extensions/jake/out/main.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"execFailed": "在文件夹 {0} 中自动检测 Jake 失败，错误: {1}"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/jake/package.i18n.json b/i18n/chs/extensions/jake/package.i18n.json
deleted file mode 100644
index 9d5c24a7211..00000000000
--- a/i18n/chs/extensions/jake/package.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"description": "向 VSCode 提供 Jake 功能的扩展。",
-	"displayName": "适用于 VSCode 的 Jake 支持",
-	"jake.taskDefinition.type.description": "要自定义的 Jake 任务。",
-	"jake.taskDefinition.file.description": "提供任务的 Jake 文件。可以省略。",
-	"config.jake.autoDetect": "控制是否自动检测 Jake 任务。默认开启。"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/java/package.i18n.json b/i18n/chs/extensions/java/package.i18n.json
deleted file mode 100644
index b92604f1ca0..00000000000
--- a/i18n/chs/extensions/java/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Java 语言基础功能",
-	"description": "在 Java 文件中提供代码片段、语法高亮、括号匹配和折叠功能。"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/javascript/out/features/bowerJSONContribution.i18n.json b/i18n/chs/extensions/javascript/out/features/bowerJSONContribution.i18n.json
deleted file mode 100644
index 8513b108684..00000000000
--- a/i18n/chs/extensions/javascript/out/features/bowerJSONContribution.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"json.bower.default": "默认 bower.json",
-	"json.bower.error.repoaccess": "对 Bower 存储库发出的请求失败: {0}",
-	"json.bower.latest.version": "最新"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/javascript/out/features/packageJSONContribution.i18n.json b/i18n/chs/extensions/javascript/out/features/packageJSONContribution.i18n.json
deleted file mode 100644
index d1742c03946..00000000000
--- a/i18n/chs/extensions/javascript/out/features/packageJSONContribution.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"json.package.default": "默认 package.json",
-	"json.npm.error.repoaccess": "对 NPM 存储库发出的请求失败: {0}",
-	"json.npm.latestversion": "当前最新版本的包",
-	"json.npm.majorversion": "与最新主要版本(1.x.x)匹配",
-	"json.npm.minorversion": "与最新次要版本(1.2.x)匹配",
-	"json.npm.version.hover": "最新版本: {0}"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/javascript/package.i18n.json b/i18n/chs/extensions/javascript/package.i18n.json
deleted file mode 100644
index 1f13d6c8a35..00000000000
--- a/i18n/chs/extensions/javascript/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "JavaScript 语言基础功能",
-	"description": "在 JavaScript 文件中提供代码片段、语法高亮、括号匹配和折叠功能。"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/json-language-features/client/out/jsonMain.i18n.json b/i18n/chs/extensions/json-language-features/client/out/jsonMain.i18n.json
deleted file mode 100644
index dac0ceb960a..00000000000
--- a/i18n/chs/extensions/json-language-features/client/out/jsonMain.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"jsonserver.name": "JSON 语言服务器"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/json-language-features/package.i18n.json b/i18n/chs/extensions/json-language-features/package.i18n.json
deleted file mode 100644
index 340eded0989..00000000000
--- a/i18n/chs/extensions/json-language-features/package.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "JSON 语言功能",
-	"description": "为 JSON 文件提供丰富的语言支持",
-	"json.schemas.desc": "将当前项目中的 JSON 文件与架构关联起来",
-	"json.schemas.url.desc": "当前目录中指向架构的 URL 或相对路径",
-	"json.schemas.fileMatch.desc": "将 JSON 文件解析到架构时，用于匹配的一组文件模式。",
-	"json.schemas.fileMatch.item.desc": "将 JSON 文件解析到架构时，用于匹配的可以包含 \"*\" 的文件模式。",
-	"json.schemas.schema.desc": "给定 URL 的架构定义。只需提供该架构以避免对架构 URL 的访问。",
-	"json.format.enable.desc": "启用/禁用默认 JSON 格式化程序(需要重启)",
-	"json.tracing.desc": "跟踪 VS Code 与 JSON 语言服务器之间的通信。",
-	"json.colorDecorators.enable.desc": "启用或禁用颜色修饰器",
-	"json.colorDecorators.enable.deprecationMessage": "已弃用设置 \"json.colorDecorators.enable\"，请改用 \"editor.colorDecorators\"。"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/json/client/out/jsonMain.i18n.json b/i18n/chs/extensions/json/client/out/jsonMain.i18n.json
deleted file mode 100644
index dac0ceb960a..00000000000
--- a/i18n/chs/extensions/json/client/out/jsonMain.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"jsonserver.name": "JSON 语言服务器"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/json/package.i18n.json b/i18n/chs/extensions/json/package.i18n.json
deleted file mode 100644
index 6138d8e11f1..00000000000
--- a/i18n/chs/extensions/json/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "JSON 语言基础功能",
-	"description": "在 JSON 文件中提供语法高亮和括号匹配功能。"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/less/package.i18n.json b/i18n/chs/extensions/less/package.i18n.json
deleted file mode 100644
index 8b407681c83..00000000000
--- a/i18n/chs/extensions/less/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Less 语言基础功能",
-	"description": "在 Less 文件中提供语法高亮、括号匹配和折叠功能。"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/log/package.i18n.json b/i18n/chs/extensions/log/package.i18n.json
deleted file mode 100644
index 1bd1e8654c6..00000000000
--- a/i18n/chs/extensions/log/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "日志",
-	"description": "为扩展名为 .log 的文件提供语法高亮功能。"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/lua/package.i18n.json b/i18n/chs/extensions/lua/package.i18n.json
deleted file mode 100644
index ccf6c8a29e4..00000000000
--- a/i18n/chs/extensions/lua/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Lua 语言基础功能",
-	"description": "在 Lua 文件中提供语法高亮和括号匹配功能。"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/make/package.i18n.json b/i18n/chs/extensions/make/package.i18n.json
deleted file mode 100644
index 721c76f04f8..00000000000
--- a/i18n/chs/extensions/make/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Make 语言基础功能",
-	"description": "在 Make 文件中提供语法高亮和括号匹配功能。"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/markdown-basics/package.i18n.json b/i18n/chs/extensions/markdown-basics/package.i18n.json
deleted file mode 100644
index e0c1be03cc8..00000000000
--- a/i18n/chs/extensions/markdown-basics/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Markdown 语言基础功能",
-	"description": "在 Markdown 文件中提供代码片段和语法高亮功能。"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json b/i18n/chs/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json
deleted file mode 100644
index d0a2ce8701e..00000000000
--- a/i18n/chs/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"onPreviewStyleLoadError": "无法加载“markdown.styles”：{0}"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/markdown-language-features/out/features/preview.i18n.json b/i18n/chs/extensions/markdown-language-features/out/features/preview.i18n.json
deleted file mode 100644
index 479e1e30f0b..00000000000
--- a/i18n/chs/extensions/markdown-language-features/out/features/preview.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"lockedPreviewTitle": "[预览] {0}",
-	"previewTitle": "预览 {0}"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/markdown-language-features/out/features/previewContentProvider.i18n.json b/i18n/chs/extensions/markdown-language-features/out/features/previewContentProvider.i18n.json
deleted file mode 100644
index 6a53189d1b3..00000000000
--- a/i18n/chs/extensions/markdown-language-features/out/features/previewContentProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"preview.securityMessage.text": "已禁用此文档中的部分内容",
-	"preview.securityMessage.title": "已禁用此 Markdown 预览中的可能不安全的内容。更改 Markdown 预览安全设置以允许不安全内容或启用脚本。",
-	"preview.securityMessage.label": "已禁用内容安全警告"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/markdown-language-features/out/security.i18n.json b/i18n/chs/extensions/markdown-language-features/out/security.i18n.json
deleted file mode 100644
index 43ddb78737c..00000000000
--- a/i18n/chs/extensions/markdown-language-features/out/security.i18n.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"strict.title": "严格",
-	"strict.description": "仅载入安全内容",
-	"insecureLocalContent.title": "允许不安全的本地内容",
-	"insecureLocalContent.description": "允许通过 http 载入来自 localhost 的内容",
-	"insecureContent.title": "允许不安全内容",
-	"insecureContent.description": "允许通过 http 载入内容",
-	"disable.title": "禁用",
-	"disable.description": "允许所有内容，执行所有脚本。不推荐",
-	"moreInfo.title": "详细信息",
-	"enableSecurityWarning.title": "在此工作区中启用预览安全警告",
-	"disableSecurityWarning.title": "在此工作区中取消预览安全警告",
-	"toggleSecurityWarning.description": "不影响内容安全级别",
-	"preview.showPreviewSecuritySelector.title": "选择此工作区中 Markdown 预览的安全设置"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/markdown-language-features/package.i18n.json b/i18n/chs/extensions/markdown-language-features/package.i18n.json
deleted file mode 100644
index 6790472bfc0..00000000000
--- a/i18n/chs/extensions/markdown-language-features/package.i18n.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Markdown 语言功能",
-	"description": "为 Markdown 提供丰富的语言支持。",
-	"markdown.preview.breaks.desc": "设置换行符如何在 markdown 预览中呈现。将其设置为 \"true\" 会为每一个新行创建一个 <br>。",
-	"markdown.preview.linkify": "在 Markdown 预览中启用或禁用将类似 URL 的文本转换为链接。",
-	"markdown.preview.doubleClickToSwitchToEditor.desc": "在 Markdown 预览中双击切换到编辑器。",
-	"markdown.preview.fontFamily.desc": "控制 Markdown 预览中使用的字体系列。",
-	"markdown.preview.fontSize.desc": "控制 Markdown 预览中使用的字号(以像素为单位)。",
-	"markdown.preview.lineHeight.desc": "控制 Markdown 预览中使用的行高。此数值与字号相关。",
-	"markdown.preview.markEditorSelection.desc": "在 Markdown 预览中标记当前的编辑器选定内容。",
-	"markdown.preview.scrollEditorWithPreview.desc": "滚动 Markdown 预览时，更新其编辑器视图。",
-	"markdown.preview.scrollPreviewWithEditor.desc": "滚动 Markdown 编辑器时，更新其预览视图。",
-	"markdown.preview.scrollPreviewWithEditorSelection.desc": "[弃用] 滚动 Markdown 预览以显示编辑器当前所选行。",
-	"markdown.preview.scrollPreviewWithEditorSelection.deprecationMessage": "此设置已被 \"markdown.preview.scrollPreviewWithEditor\" 替换且不再有任何效果。",
-	"markdown.preview.title": "打开预览",
-	"markdown.previewFrontMatter.dec": "设置如何在 Markdown 预览中呈现 YAML 扉页。“隐藏”会删除扉页。否则，扉页则被视为 Markdown 内容。",
-	"markdown.previewSide.title": "打开侧边预览",
-	"markdown.showLockedPreviewToSide.title": "在侧边打开锁定的预览",
-	"markdown.showSource.title": "显示源",
-	"markdown.styles.dec": "要在 Markdown 预览中使用的 CSS 样式表的 URL 或本地路径列表。相对路径被解释为相对于资源管理器中打开的文件夹。如果没有任何打开的文件夹，则会被解释为相对于 Markdown 文件的位置。所有的 \"\\\" 需写为 \"\\\\\"。",
-	"markdown.showPreviewSecuritySelector.title": "更改预览安全设置",
-	"markdown.trace.desc": "对 Markdown 扩展启用调试日志记录。",
-	"markdown.preview.refresh.title": "刷新预览",
-	"markdown.preview.toggleLock.title": "切换开关锁定预览"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/markdown/out/commands.i18n.json b/i18n/chs/extensions/markdown/out/commands.i18n.json
deleted file mode 100644
index a4778a6ab94..00000000000
--- a/i18n/chs/extensions/markdown/out/commands.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"previewTitle": "预览 {0}",
-	"onPreviewStyleLoadError": "无法加载“markdown.styles”：{0}"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/markdown/out/commands/onPreviewStyleLoadError.i18n.json b/i18n/chs/extensions/markdown/out/commands/onPreviewStyleLoadError.i18n.json
deleted file mode 100644
index d0a2ce8701e..00000000000
--- a/i18n/chs/extensions/markdown/out/commands/onPreviewStyleLoadError.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"onPreviewStyleLoadError": "无法加载“markdown.styles”：{0}"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/markdown/out/extension.i18n.json b/i18n/chs/extensions/markdown/out/extension.i18n.json
deleted file mode 100644
index c145efb44ed..00000000000
--- a/i18n/chs/extensions/markdown/out/extension.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"onPreviewStyleLoadError": "无法加载“markdown.styles”：{0}",
-	"previewTitle": "预览 {0}"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/markdown/out/features/preview.i18n.json b/i18n/chs/extensions/markdown/out/features/preview.i18n.json
deleted file mode 100644
index 479e1e30f0b..00000000000
--- a/i18n/chs/extensions/markdown/out/features/preview.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"lockedPreviewTitle": "[预览] {0}",
-	"previewTitle": "预览 {0}"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/markdown/out/features/previewContentProvider.i18n.json b/i18n/chs/extensions/markdown/out/features/previewContentProvider.i18n.json
deleted file mode 100644
index 6a53189d1b3..00000000000
--- a/i18n/chs/extensions/markdown/out/features/previewContentProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"preview.securityMessage.text": "已禁用此文档中的部分内容",
-	"preview.securityMessage.title": "已禁用此 Markdown 预览中的可能不安全的内容。更改 Markdown 预览安全设置以允许不安全内容或启用脚本。",
-	"preview.securityMessage.label": "已禁用内容安全警告"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/markdown/out/previewContentProvider.i18n.json b/i18n/chs/extensions/markdown/out/previewContentProvider.i18n.json
deleted file mode 100644
index 4ff7c59a498..00000000000
--- a/i18n/chs/extensions/markdown/out/previewContentProvider.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"preview.securityMessage.text": "已禁用此文档中的部分内容",
-	"preview.securityMessage.title": "已禁用此 Markdown 预览中的可能不安全的内容。更改 Markdown 预览安全设置以允许不安全内容或启用脚本。",
-	"preview.securityMessage.label": "已禁用内容安全警告"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/markdown/out/security.i18n.json b/i18n/chs/extensions/markdown/out/security.i18n.json
deleted file mode 100644
index 152913f9116..00000000000
--- a/i18n/chs/extensions/markdown/out/security.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"strict.title": "严格",
-	"strict.description": "仅载入安全内容",
-	"insecureContent.title": "允许不安全内容",
-	"insecureContent.description": "允许通过 http 载入内容",
-	"disable.title": "禁用",
-	"disable.description": "允许所有内容，执行所有脚本。不推荐",
-	"moreInfo.title": "详细信息",
-	"enableSecurityWarning.title": "在此工作区中启用预览安全警告",
-	"disableSecurityWarning.title": "在此工作区中取消预览安全警告",
-	"toggleSecurityWarning.description": "不影响内容安全级别",
-	"preview.showPreviewSecuritySelector.title": "选择此工作区中 Markdown 预览的安全设置"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/markdown/package.i18n.json b/i18n/chs/extensions/markdown/package.i18n.json
deleted file mode 100644
index 11595bfc615..00000000000
--- a/i18n/chs/extensions/markdown/package.i18n.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Markdown 语言功能",
-	"description": "为 Markdown 提供丰富的语言支持。",
-	"markdown.preview.breaks.desc": "设置换行符如何在 markdown 预览中呈现。将其设置为 \"true\" 会为每一个新行创建一个 <br>。",
-	"markdown.preview.linkify": "在 Markdown 预览中启用或禁用将类似 URL 的文本转换为链接。",
-	"markdown.preview.doubleClickToSwitchToEditor.desc": "在 Markdown 预览中双击切换到编辑器。",
-	"markdown.preview.fontFamily.desc": "控制 Markdown 预览中使用的字体系列。",
-	"markdown.preview.fontSize.desc": "控制 Markdown 预览中使用的字号(以像素为单位)。",
-	"markdown.preview.lineHeight.desc": "控制 Markdown 预览中使用的行高。此数值与字号相关。",
-	"markdown.preview.markEditorSelection.desc": "在 Markdown 预览中标记当前的编辑器选定内容。",
-	"markdown.preview.scrollEditorWithPreview.desc": "滚动 Markdown 预览时，更新其编辑器视图。",
-	"markdown.preview.scrollPreviewWithEditor.desc": "滚动 Markdown 编辑器时，更新其预览视图。",
-	"markdown.preview.scrollPreviewWithEditorSelection.desc": "[弃用] 滚动 Markdown 预览以显示编辑器当前所选行。",
-	"markdown.preview.scrollPreviewWithEditorSelection.deprecationMessage": "此设置已被 \"markdown.preview.scrollPreviewWithEditor\" 替换且不再有任何效果。",
-	"markdown.preview.title": "打开预览",
-	"markdown.previewFrontMatter.dec": "设置如何在 Markdown 预览中呈现 YAML 扉页。“隐藏”会删除扉页。否则，扉页则被视为 Markdown 内容。",
-	"markdown.previewSide.title": "打开侧边预览",
-	"markdown.showLockedPreviewToSide.title": "在侧边打开锁定的预览",
-	"markdown.showSource.title": "显示源",
-	"markdown.styles.dec": "要在 Markdown 预览中使用的 CSS 样式表的 URL 或本地路径列表。相对路径被解释为相对于资源管理器中打开的文件夹。如果没有任何打开的文件夹，则会被解释为相对于 Markdown 文件的位置。所有的 \"\\\" 需写为 \"\\\\\"。",
-	"markdown.showPreviewSecuritySelector.title": "更改预览安全设置",
-	"markdown.trace.desc": "对 Markdown 扩展启用调试日志记录。",
-	"markdown.preview.refresh.title": "刷新预览",
-	"markdown.preview.toggleLock.title": "切换预览锁定"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/merge-conflict/out/codelensProvider.i18n.json b/i18n/chs/extensions/merge-conflict/out/codelensProvider.i18n.json
deleted file mode 100644
index 926b56a9bd5..00000000000
--- a/i18n/chs/extensions/merge-conflict/out/codelensProvider.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"acceptCurrentChange": "采用当前更改",
-	"acceptIncomingChange": "采用传入的更改",
-	"acceptBothChanges": "保留双方更改",
-	"compareChanges": "比较变更"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/merge-conflict/out/commandHandler.i18n.json b/i18n/chs/extensions/merge-conflict/out/commandHandler.i18n.json
deleted file mode 100644
index 143b1bf90a7..00000000000
--- a/i18n/chs/extensions/merge-conflict/out/commandHandler.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"cursorNotInConflict": "编辑器光标不在合并冲突内",
-	"compareChangesTitle": "{0}：当前更改 ⟷ 传入的更改",
-	"cursorOnCommonAncestorsRange": "编辑器光标在共同来源块上，请将其移动至“当前”或“传入”区域中",
-	"cursorOnSplitterRange": "编辑器光标在合并冲突分割线上，请将其移动至“当前”或“传入”区域中",
-	"noConflicts": "没有在此文件中找到合并冲突",
-	"noOtherConflictsInThisFile": "此文件中没有其他合并冲突了"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/merge-conflict/out/mergeDecorator.i18n.json b/i18n/chs/extensions/merge-conflict/out/mergeDecorator.i18n.json
deleted file mode 100644
index 4d2a79f628f..00000000000
--- a/i18n/chs/extensions/merge-conflict/out/mergeDecorator.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"currentChange": "(当前更改)",
-	"incomingChange": "(传入的更改)"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/merge-conflict/package.i18n.json b/i18n/chs/extensions/merge-conflict/package.i18n.json
deleted file mode 100644
index 4a3b57f3568..00000000000
--- a/i18n/chs/extensions/merge-conflict/package.i18n.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "合并冲突",
-	"description": "为内联合并冲突提供高亮和命令。",
-	"command.category": "合并冲突",
-	"command.accept.all-current": "全部采用当前内容",
-	"command.accept.all-incoming": "全部采用传入版本",
-	"command.accept.all-both": "全部保留两者",
-	"command.accept.current": "采用当前内容",
-	"command.accept.incoming": "采用传入内容",
-	"command.accept.selection": "采用选中版本",
-	"command.accept.both": "保留两者",
-	"command.next": "下一个冲突",
-	"command.previous": "上一个冲突",
-	"command.compare": "比较当前冲突",
-	"config.title": "合并冲突",
-	"config.codeLensEnabled": "启用/禁用编辑器内合并冲突区域的 CodeLens",
-	"config.decoratorsEnabled": "启用/禁用编辑器内的合并冲突修饰器"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/npm/out/features/bowerJSONContribution.i18n.json b/i18n/chs/extensions/npm/out/features/bowerJSONContribution.i18n.json
deleted file mode 100644
index 8513b108684..00000000000
--- a/i18n/chs/extensions/npm/out/features/bowerJSONContribution.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"json.bower.default": "默认 bower.json",
-	"json.bower.error.repoaccess": "对 Bower 存储库发出的请求失败: {0}",
-	"json.bower.latest.version": "最新"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/npm/out/features/packageJSONContribution.i18n.json b/i18n/chs/extensions/npm/out/features/packageJSONContribution.i18n.json
deleted file mode 100644
index d1742c03946..00000000000
--- a/i18n/chs/extensions/npm/out/features/packageJSONContribution.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"json.package.default": "默认 package.json",
-	"json.npm.error.repoaccess": "对 NPM 存储库发出的请求失败: {0}",
-	"json.npm.latestversion": "当前最新版本的包",
-	"json.npm.majorversion": "与最新主要版本(1.x.x)匹配",
-	"json.npm.minorversion": "与最新次要版本(1.2.x)匹配",
-	"json.npm.version.hover": "最新版本: {0}"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/npm/out/main.i18n.json b/i18n/chs/extensions/npm/out/main.i18n.json
deleted file mode 100644
index e0f67df3bad..00000000000
--- a/i18n/chs/extensions/npm/out/main.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"npm.parseError": "Npm 任务检测: 无法分析文件 {0}"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/npm/out/npmView.i18n.json b/i18n/chs/extensions/npm/out/npmView.i18n.json
deleted file mode 100644
index b826cc7a7f5..00000000000
--- a/i18n/chs/extensions/npm/out/npmView.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noScripts": "找不到脚本",
-	"noDebugOptions": "无法启动“{0}”并进行调试。脚本缺少 Node 调试选项，如 \"--inspect-brk\"。",
-	"learnMore": "了解详细信息",
-	"ok": "确定",
-	"scriptInvalid": "找不到脚本“{0}”。请尝试刷新视图。"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/npm/out/tasks.i18n.json b/i18n/chs/extensions/npm/out/tasks.i18n.json
deleted file mode 100644
index e0f67df3bad..00000000000
--- a/i18n/chs/extensions/npm/out/tasks.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"npm.parseError": "Npm 任务检测: 无法分析文件 {0}"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/npm/package.i18n.json b/i18n/chs/extensions/npm/package.i18n.json
deleted file mode 100644
index 3f53500fe1f..00000000000
--- a/i18n/chs/extensions/npm/package.i18n.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"description": "为 npm 脚本提供任务支持的扩展。",
-	"displayName": "适用于 VSCode 的 npm 支持",
-	"config.npm.autoDetect": "控制是否自动检测 npm 脚本。默认开启",
-	"config.npm.runSilent": "使用 \"--silent\" 选项运行 npm 命令。",
-	"config.npm.packageManager": "用于运行脚本的程序包管理器。",
-	"config.npm.exclude": "配置应从自动脚本检测中排除的文件夹的 glob 模式。",
-	"config.npm.enableScriptExplorer": "在资源管理器中启用“npm 脚本”视图。",
-	"config.npm.scriptExplorerAction": "在脚本资源管理器中点击时进行的默认操作: \"open\" (打开) 或 \"run\" (运行)。默认值为 \"open\"。",
-	"npm.parseError": "Npm 任务检测: 无法分析文件 {0}",
-	"taskdef.script": "要自定义的 npm 脚本。",
-	"taskdef.path": "包含 package.json 文件的文件夹路径，其中 package.json 文件提供脚本。可以省略。",
-	"view.name": "npm 脚本",
-	"command.refresh": "刷新",
-	"command.run": "运行",
-	"command.debug": "调试",
-	"command.openScript": "开放",
-	"command.runInstall": "运行 install"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/objective-c/package.i18n.json b/i18n/chs/extensions/objective-c/package.i18n.json
deleted file mode 100644
index 1bc94f77c5d..00000000000
--- a/i18n/chs/extensions/objective-c/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Objective-C 语言基础功能",
-	"description": "在 Objective-C 文件中提供语法高亮和括号匹配功能。"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/package-json/out/features/bowerJSONContribution.i18n.json b/i18n/chs/extensions/package-json/out/features/bowerJSONContribution.i18n.json
deleted file mode 100644
index 8513b108684..00000000000
--- a/i18n/chs/extensions/package-json/out/features/bowerJSONContribution.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"json.bower.default": "默认 bower.json",
-	"json.bower.error.repoaccess": "对 Bower 存储库发出的请求失败: {0}",
-	"json.bower.latest.version": "最新"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/package-json/out/features/packageJSONContribution.i18n.json b/i18n/chs/extensions/package-json/out/features/packageJSONContribution.i18n.json
deleted file mode 100644
index d1742c03946..00000000000
--- a/i18n/chs/extensions/package-json/out/features/packageJSONContribution.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"json.package.default": "默认 package.json",
-	"json.npm.error.repoaccess": "对 NPM 存储库发出的请求失败: {0}",
-	"json.npm.latestversion": "当前最新版本的包",
-	"json.npm.majorversion": "与最新主要版本(1.x.x)匹配",
-	"json.npm.minorversion": "与最新次要版本(1.2.x)匹配",
-	"json.npm.version.hover": "最新版本: {0}"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/package-json/package.i18n.json b/i18n/chs/extensions/package-json/package.i18n.json
deleted file mode 100644
index 35229bd6699..00000000000
--- a/i18n/chs/extensions/package-json/package.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	]
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/perl/package.i18n.json b/i18n/chs/extensions/perl/package.i18n.json
deleted file mode 100644
index 4696cbf1259..00000000000
--- a/i18n/chs/extensions/perl/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Perl 语言基础功能",
-	"description": "在 Perl 文件中提供语法高亮和括号匹配功能。"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/php-language-features/out/features/validationProvider.i18n.json b/i18n/chs/extensions/php-language-features/out/features/validationProvider.i18n.json
deleted file mode 100644
index c5281f10087..00000000000
--- a/i18n/chs/extensions/php-language-features/out/features/validationProvider.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"php.useExecutablePath": "是否允许执行 {0} (定义为工作区设置)以进行 PHP 文件的 lint 操作?",
-	"php.yes": "Allow",
-	"php.no": "不允许",
-	"wrongExecutable": "无法验证，因为 {0} 不是有效的 PHP 可执行文件。请使用设置 \"php.validate.executablePath\" 配置 PHP 可执行文件。",
-	"noExecutable": "无法验证，因为未设置任何 PHP 可执行文件。请使用设置 \"php.validate.executablePath\" 配置 PHP 可执行文件。",
-	"unknownReason": "使用路径运行 php 失败: {0}。原因未知。"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/php-language-features/package.i18n.json b/i18n/chs/extensions/php-language-features/package.i18n.json
deleted file mode 100644
index 0871582ebd7..00000000000
--- a/i18n/chs/extensions/php-language-features/package.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"configuration.suggest.basic": "如果已启用内置 PHP 语言建议，则进行配置。此支持建议 PHP 全局变量和变量。",
-	"configuration.validate.enable": "启用/禁用内置的 PHP 验证。",
-	"configuration.validate.executablePath": "指向 PHP 可执行文件。",
-	"configuration.validate.run": "决定 linter 是在保存时还是输入时运行。",
-	"configuration.title": "PHP",
-	"commands.categroy.php": "PHP",
-	"command.untrustValidationExecutable": "禁止 PHP 验证程序(定义为工作区设置)",
-	"displayName": "PHP 语言功能",
-	"description": "为 PHP 文件提供丰富的语言支持。"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/php/out/features/validationProvider.i18n.json b/i18n/chs/extensions/php/out/features/validationProvider.i18n.json
deleted file mode 100644
index c5281f10087..00000000000
--- a/i18n/chs/extensions/php/out/features/validationProvider.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"php.useExecutablePath": "是否允许执行 {0} (定义为工作区设置)以进行 PHP 文件的 lint 操作?",
-	"php.yes": "Allow",
-	"php.no": "不允许",
-	"wrongExecutable": "无法验证，因为 {0} 不是有效的 PHP 可执行文件。请使用设置 \"php.validate.executablePath\" 配置 PHP 可执行文件。",
-	"noExecutable": "无法验证，因为未设置任何 PHP 可执行文件。请使用设置 \"php.validate.executablePath\" 配置 PHP 可执行文件。",
-	"unknownReason": "使用路径运行 php 失败: {0}。原因未知。"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/php/package.i18n.json b/i18n/chs/extensions/php/package.i18n.json
deleted file mode 100644
index f946b5c8649..00000000000
--- a/i18n/chs/extensions/php/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "PHP 语言基础功能",
-	"description": "为 PHP 文件提供语法高亮和括号匹配功能。"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/powershell/package.i18n.json b/i18n/chs/extensions/powershell/package.i18n.json
deleted file mode 100644
index 14622550d48..00000000000
--- a/i18n/chs/extensions/powershell/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Powershell 语言基础功能",
-	"description": "在 Powershell 文件中提供代码片段、语法高亮、括号匹配和折叠功能。"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/pug/package.i18n.json b/i18n/chs/extensions/pug/package.i18n.json
deleted file mode 100644
index 24c920d25f7..00000000000
--- a/i18n/chs/extensions/pug/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Pug 语言基础功能",
-	"description": "在 Pug 文件中提供语法高亮和括号匹配功能。"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/python/package.i18n.json b/i18n/chs/extensions/python/package.i18n.json
deleted file mode 100644
index 62196639cdc..00000000000
--- a/i18n/chs/extensions/python/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Python 语言基础功能",
-	"description": "在 Python 文件中提供语法高亮、括号匹配和折叠功能。"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/r/package.i18n.json b/i18n/chs/extensions/r/package.i18n.json
deleted file mode 100644
index d581dc6aaa7..00000000000
--- a/i18n/chs/extensions/r/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "R 语言基础功能",
-	"description": "在 R 文件中提供语法高亮和括号匹配功能。"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/razor/package.i18n.json b/i18n/chs/extensions/razor/package.i18n.json
deleted file mode 100644
index 0c86bd13f22..00000000000
--- a/i18n/chs/extensions/razor/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Razor 语言基础功能",
-	"description": "在 Razor 文件中提供语法高亮、括号匹配和折叠功能。"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/ruby/package.i18n.json b/i18n/chs/extensions/ruby/package.i18n.json
deleted file mode 100644
index 6ea13c8993b..00000000000
--- a/i18n/chs/extensions/ruby/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Ruby 语言基础功能",
-	"description": "在 Ruby 文件中提供语法高亮和括号匹配功能。"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/rust/package.i18n.json b/i18n/chs/extensions/rust/package.i18n.json
deleted file mode 100644
index c5699e00c0f..00000000000
--- a/i18n/chs/extensions/rust/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Rust 语言基础功能",
-	"description": "在 Rust 文件中提供语法高亮和括号匹配功能。"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/scss/package.i18n.json b/i18n/chs/extensions/scss/package.i18n.json
deleted file mode 100644
index 5911a71e885..00000000000
--- a/i18n/chs/extensions/scss/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "SCSS 语言基础功能",
-	"description": "在 SCSS 文件中提供语法高亮、括号匹配和折叠功能。"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/search-rg/package.i18n.json b/i18n/chs/extensions/search-rg/package.i18n.json
deleted file mode 100644
index ded449a23e6..00000000000
--- a/i18n/chs/extensions/search-rg/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "搜索 (ripgrep)",
-	"description": "使用 Ripgrep 提供搜索。"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/shaderlab/package.i18n.json b/i18n/chs/extensions/shaderlab/package.i18n.json
deleted file mode 100644
index ed41d7478e7..00000000000
--- a/i18n/chs/extensions/shaderlab/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Shaderlab 语言基础功能",
-	"description": "在 Shaderlab 文件中提供语法高亮和括号匹配功能。"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/shellscript/package.i18n.json b/i18n/chs/extensions/shellscript/package.i18n.json
deleted file mode 100644
index 6f1ff987bec..00000000000
--- a/i18n/chs/extensions/shellscript/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Shell 脚本语言基础功能",
-	"description": "在 Shell 脚本文件中提供语法高亮和括号匹配功能。"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/sql/package.i18n.json b/i18n/chs/extensions/sql/package.i18n.json
deleted file mode 100644
index 2381cf5ce83..00000000000
--- a/i18n/chs/extensions/sql/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "SQL 语言基础功能",
-	"description": "在 SQL 文件中提供语法高亮和括号匹配功能。"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/swift/package.i18n.json b/i18n/chs/extensions/swift/package.i18n.json
deleted file mode 100644
index 3b7c7f35b5f..00000000000
--- a/i18n/chs/extensions/swift/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Swift 语言基础功能",
-	"description": "在 Swift 文件中提供代码片段、语法高亮和括号匹配功能。"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/theme-abyss/package.i18n.json b/i18n/chs/extensions/theme-abyss/package.i18n.json
deleted file mode 100644
index c36692c7026..00000000000
--- a/i18n/chs/extensions/theme-abyss/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Abyss 主题",
-	"description": "适用于 Visual Studio Code 的 Abyss 主题"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/theme-defaults/package.i18n.json b/i18n/chs/extensions/theme-defaults/package.i18n.json
deleted file mode 100644
index a979bac6af3..00000000000
--- a/i18n/chs/extensions/theme-defaults/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "默认主题",
-	"description": "默认浅色和深色主题 (包括 Visual Studio 和 + 版)"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/theme-kimbie-dark/package.i18n.json b/i18n/chs/extensions/theme-kimbie-dark/package.i18n.json
deleted file mode 100644
index a8a31a889a3..00000000000
--- a/i18n/chs/extensions/theme-kimbie-dark/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Kimbie Dark 主题",
-	"description": "适用于 Visual Studio Code 的 Kimbie dark 主题"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/theme-monokai-dimmed/package.i18n.json b/i18n/chs/extensions/theme-monokai-dimmed/package.i18n.json
deleted file mode 100644
index 75b843de80b..00000000000
--- a/i18n/chs/extensions/theme-monokai-dimmed/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Monokai Dimmed 主题",
-	"description": "适用于 Visual Studio Code 的 Monokai dimmed 主题"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/theme-monokai/package.i18n.json b/i18n/chs/extensions/theme-monokai/package.i18n.json
deleted file mode 100644
index fe4e81d8431..00000000000
--- a/i18n/chs/extensions/theme-monokai/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Monokai 主题",
-	"description": "适用于 Visual Studio Code 的 Monokai 主题"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/theme-quietlight/package.i18n.json b/i18n/chs/extensions/theme-quietlight/package.i18n.json
deleted file mode 100644
index 606725eb29b..00000000000
--- a/i18n/chs/extensions/theme-quietlight/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Quiet Light 主题",
-	"description": "适用于 Visual Studio Code 的 Quiet light 主题"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/theme-red/package.i18n.json b/i18n/chs/extensions/theme-red/package.i18n.json
deleted file mode 100644
index a9429b9b827..00000000000
--- a/i18n/chs/extensions/theme-red/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Red 主题",
-	"description": "适用于 Visual Studio Code 的 Red 主题"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/theme-seti/package.i18n.json b/i18n/chs/extensions/theme-seti/package.i18n.json
deleted file mode 100644
index 864627f87af..00000000000
--- a/i18n/chs/extensions/theme-seti/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Seti 文件图标主题",
-	"description": "由 Seti UI 文件图标构成的文件图标主题"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/theme-solarized-dark/package.i18n.json b/i18n/chs/extensions/theme-solarized-dark/package.i18n.json
deleted file mode 100644
index cd7e29a8724..00000000000
--- a/i18n/chs/extensions/theme-solarized-dark/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Solarized Dark 主题",
-	"description": "适用于 Visual Studio Code 的 Solarized dark 主题"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/theme-solarized-light/package.i18n.json b/i18n/chs/extensions/theme-solarized-light/package.i18n.json
deleted file mode 100644
index e8a09333331..00000000000
--- a/i18n/chs/extensions/theme-solarized-light/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Solarized Light 主题",
-	"description": "适用于 Visual Studio Code 的 Solarized light 主题"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/theme-tomorrow-night-blue/package.i18n.json b/i18n/chs/extensions/theme-tomorrow-night-blue/package.i18n.json
deleted file mode 100644
index 5008c9f5f17..00000000000
--- a/i18n/chs/extensions/theme-tomorrow-night-blue/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Tomorrow Night Blue 主题",
-	"description": "适用于 Visual Studio Code 的 Tomorrow night blue 主题"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/typescript-basics/package.i18n.json b/i18n/chs/extensions/typescript-basics/package.i18n.json
deleted file mode 100644
index 4ee301eeb44..00000000000
--- a/i18n/chs/extensions/typescript-basics/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "TypeScript 语言基础功能",
-	"description": "在 TypeScript 文件中提供代码片段、语法高亮、括号匹配和折叠功能。"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/typescript-language-features/out/commands.i18n.json b/i18n/chs/extensions/typescript-language-features/out/commands.i18n.json
deleted file mode 100644
index 71f03151b6f..00000000000
--- a/i18n/chs/extensions/typescript-language-features/out/commands.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"typescript.projectConfigNoWorkspace": "请在 VS Code 中打开一个文件夹，以使用 TypeScript 或 JavaScript 项目",
-	"typescript.projectConfigUnsupportedFile": "无法确定 TypeScript 或 JavaScript 项目。不受支持的文件类型",
-	"typescript.projectConfigCouldNotGetInfo": "无法确定 TypeScript 或 JavaScript 项目",
-	"typescript.noTypeScriptProjectConfig": "文件不属于 TypeScript 项目。点击[这里]({0})了解更多。",
-	"typescript.noJavaScriptProjectConfig": "文件不属于 JavaScript 项目。点击[这里]({0})了解更多。",
-	"typescript.configureTsconfigQuickPick": "配置 tsconfig.json",
-	"typescript.configureJsconfigQuickPick": "配置 jsconfig.json"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/typescript-language-features/out/features/completionItemProvider.i18n.json b/i18n/chs/extensions/typescript-language-features/out/features/completionItemProvider.i18n.json
deleted file mode 100644
index cec1f8a1e0a..00000000000
--- a/i18n/chs/extensions/typescript-language-features/out/features/completionItemProvider.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"selectCodeAction": "选择要应用的代码操作",
-	"acquiringTypingsLabel": "正在获取 typings...",
-	"acquiringTypingsDetail": "获取 IntelliSense 的 typings 定义。",
-	"autoImportLabel": "从 {0} 自动导入"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/typescript-language-features/out/features/directiveCommentCompletionProvider.i18n.json b/i18n/chs/extensions/typescript-language-features/out/features/directiveCommentCompletionProvider.i18n.json
deleted file mode 100644
index 0e60e3412a4..00000000000
--- a/i18n/chs/extensions/typescript-language-features/out/features/directiveCommentCompletionProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"ts-check": "在 JavaScript 文件中启用语义检查。必须在文件顶部。",
-	"ts-nocheck": "在 JavaScript 文件中禁用语义检查。必须在文件顶部。",
-	"ts-ignore": "取消文件下一行的 @ts-check 错误提示。"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/typescript-language-features/out/features/implementationsCodeLensProvider.i18n.json b/i18n/chs/extensions/typescript-language-features/out/features/implementationsCodeLensProvider.i18n.json
deleted file mode 100644
index 021db468b54..00000000000
--- a/i18n/chs/extensions/typescript-language-features/out/features/implementationsCodeLensProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"oneImplementationLabel": "1 个实现",
-	"manyImplementationLabel": "{0} 个实现",
-	"implementationsErrorLabel": "无法确定实现"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/typescript-language-features/out/features/jsDocCompletionProvider.i18n.json b/i18n/chs/extensions/typescript-language-features/out/features/jsDocCompletionProvider.i18n.json
deleted file mode 100644
index 1d385873b11..00000000000
--- a/i18n/chs/extensions/typescript-language-features/out/features/jsDocCompletionProvider.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"typescript.jsDocCompletionItem.documentation": "JSDoc 注释"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/typescript-language-features/out/features/organizeImports.i18n.json b/i18n/chs/extensions/typescript-language-features/out/features/organizeImports.i18n.json
deleted file mode 100644
index 77f30b069ab..00000000000
--- a/i18n/chs/extensions/typescript-language-features/out/features/organizeImports.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"oraganizeImportsAction.title": "整理 import 语句"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/typescript-language-features/out/features/quickFixProvider.i18n.json b/i18n/chs/extensions/typescript-language-features/out/features/quickFixProvider.i18n.json
deleted file mode 100644
index d22ade03db1..00000000000
--- a/i18n/chs/extensions/typescript-language-features/out/features/quickFixProvider.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"fixAllInFileLabel": "{0} (修复文件中所有)"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/typescript-language-features/out/features/referencesCodeLensProvider.i18n.json b/i18n/chs/extensions/typescript-language-features/out/features/referencesCodeLensProvider.i18n.json
deleted file mode 100644
index 5410b680677..00000000000
--- a/i18n/chs/extensions/typescript-language-features/out/features/referencesCodeLensProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"oneReferenceLabel": "1 个引用",
-	"manyReferenceLabel": "{0} 个引用",
-	"referenceErrorLabel": "无法确定引用"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/typescript-language-features/out/features/taskProvider.i18n.json b/i18n/chs/extensions/typescript-language-features/out/features/taskProvider.i18n.json
deleted file mode 100644
index cd6842c9ce3..00000000000
--- a/i18n/chs/extensions/typescript-language-features/out/features/taskProvider.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"buildTscLabel": "构建 - {0}",
-	"buildAndWatchTscLabel": "监视 - {0}"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/typescript-language-features/out/features/updatePathsOnRename.i18n.json b/i18n/chs/extensions/typescript-language-features/out/features/updatePathsOnRename.i18n.json
deleted file mode 100644
index 9e215d949d1..00000000000
--- a/i18n/chs/extensions/typescript-language-features/out/features/updatePathsOnRename.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"prompt": "是否自动更新已移动文件 ({0}) 的 import 语句?",
-	"reject.title": "否",
-	"accept.title": "是",
-	"always.title": "是，始终更新 import 语句",
-	"never.title": "否，从不更新 import 语句"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/typescript-language-features/out/typescriptServiceClient.i18n.json b/i18n/chs/extensions/typescript-language-features/out/typescriptServiceClient.i18n.json
deleted file mode 100644
index d4107581eba..00000000000
--- a/i18n/chs/extensions/typescript-language-features/out/typescriptServiceClient.i18n.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noServerFound": "路径 {0} 未指向有效的 tsserver 安装。请回退到捆绑的 TypeScript 版本。",
-	"serverCouldNotBeStarted": "无法启动 TypeScript 语言服务器。错误消息为: {0}",
-	"typescript.openTsServerLog.notSupported": "TS 服务器日志记录需要 TS 2.2.2+",
-	"typescript.openTsServerLog.loggingNotEnabled": "TS 服务器日志记录已关闭。请设置 \"typescript.tsserver.log\" 并重启\n TS 服务器以启用日志记录",
-	"typescript.openTsServerLog.enableAndReloadOption": "启用日志记录并重启 TS 服务器",
-	"typescript.openTsServerLog.noLogFile": "TS 服务器尚未启动日志记录。",
-	"openTsServerLog.openFileFailedFailed": "无法打开 TS 服务器日志文件",
-	"serverDiedAfterStart": "TypeScript 语言服务在其启动后已中止 5 次。将不会重启该服务。",
-	"serverDiedReportIssue": "使用英文报告问题",
-	"serverDied": "在过去 5 分钟内，TypeScript 语言服务意外中止了 5 次。"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/typescript-language-features/out/utils/api.i18n.json b/i18n/chs/extensions/typescript-language-features/out/utils/api.i18n.json
deleted file mode 100644
index 006fe312258..00000000000
--- a/i18n/chs/extensions/typescript-language-features/out/utils/api.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"invalidVersion": "无效版本"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/typescript-language-features/out/utils/logger.i18n.json b/i18n/chs/extensions/typescript-language-features/out/utils/logger.i18n.json
deleted file mode 100644
index 8f5ef5415b9..00000000000
--- a/i18n/chs/extensions/typescript-language-features/out/utils/logger.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"channelName": "TypeScript"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/typescript-language-features/out/utils/projectStatus.i18n.json b/i18n/chs/extensions/typescript-language-features/out/utils/projectStatus.i18n.json
deleted file mode 100644
index cd5096356f3..00000000000
--- a/i18n/chs/extensions/typescript-language-features/out/utils/projectStatus.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hintExclude": "若要启用项目范围内的 JavaScript/TypeScript 语言功能，请排除包含多个文件的文件夹，例如: {0}",
-	"hintExclude.generic": "若要启用项目范围内的 JavaScript/TypeScript 语言功能，请排除包含不需要处理的源文件的大型文件夹。",
-	"large.label": "配置排除",
-	"hintExclude.tooltip": "若要启用项目范围内的 JavaScript/TypeScript 语言功能，请排除包含不需要处理的源文件的大型文件夹。"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/typescript-language-features/out/utils/typingsStatus.i18n.json b/i18n/chs/extensions/typescript-language-features/out/utils/typingsStatus.i18n.json
deleted file mode 100644
index fe9128f40d0..00000000000
--- a/i18n/chs/extensions/typescript-language-features/out/utils/typingsStatus.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"installingPackages": "提取数据以实现更好的 TypeScript IntelliSense",
-	"typesInstallerInitializationFailed.title": "无法为 JavaScript 语言功能安装 typings 文件。请确认 NPM 已安装，或在你的用户设置中配置 “typescript.npm”。点击[这里]({0})了解更多。",
-	"typesInstallerInitializationFailed.doNotCheckAgain": "不再显示"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/typescript-language-features/out/utils/versionPicker.i18n.json b/i18n/chs/extensions/typescript-language-features/out/utils/versionPicker.i18n.json
deleted file mode 100644
index c9f87e17e81..00000000000
--- a/i18n/chs/extensions/typescript-language-features/out/utils/versionPicker.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"useVSCodeVersionOption": "使用 VS Code 的版本",
-	"useWorkspaceVersionOption": "使用工作区版本",
-	"learnMore": "了解详细信息",
-	"selectTsVersion": "选择用于 JavaScript 和 TypeScript 语言功能的 TypeScript 版本"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/typescript-language-features/out/utils/versionProvider.i18n.json b/i18n/chs/extensions/typescript-language-features/out/utils/versionProvider.i18n.json
deleted file mode 100644
index 4bb999f00f5..00000000000
--- a/i18n/chs/extensions/typescript-language-features/out/utils/versionProvider.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"couldNotLoadTsVersion": "无法获取此目录 TypeScript 的版本",
-	"noBundledServerFound": "VS Code 的 tsserver 已被其他应用程序(例如运行异常的病毒检测工具)删除。请重新安装 VS Code。"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/typescript-language-features/package.i18n.json b/i18n/chs/extensions/typescript-language-features/package.i18n.json
deleted file mode 100644
index a6ef01afb9f..00000000000
--- a/i18n/chs/extensions/typescript-language-features/package.i18n.json
+++ /dev/null
@@ -1,67 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "JavaScript 和 TypeScript 的语言功能",
-	"description": "为 JavaScript 和 TypeScript 提供丰富的语言支持。",
-	"reloadProjects.title": "重载项目",
-	"configuration.typescript": "TypeScript",
-	"typescript.useCodeSnippetsOnMethodSuggest.dec": "完成函数的参数签名。",
-	"typescript.tsdk.desc": "指定包含要使用的 tsserver 和 lib*.d.ts 文件的文件夹路径。",
-	"typescript.disableAutomaticTypeAcquisition": "禁用自动获取类型。需要 TypeScript >= 2.0.6。",
-	"typescript.tsserver.log": "将 TS 服务器的日志保存到一个文件。此日志可用于诊断 TS 服务器问题。日志可能包含你的项目中的文件路径、源代码和其他可能敏感的信息。",
-	"typescript.tsserver.pluginPaths": "其他可搜索 TypeScript 语言服务插件的路径。需要 TypeScript >= 2.3.0。",
-	"typescript.tsserver.pluginPaths.item": "相对或绝对路径。相对路径将根据工作区文件夹进行解析。",
-	"typescript.tsserver.trace": "对发送到 TS 服务器的消息启用跟踪。此跟踪信息可用于诊断 TS 服务器问题。 跟踪信息可能包含你的项目中的文件路径、源代码和其他可能敏感的信息。",
-	"typescript.validate.enable": "启用/禁用 TypeScript 验证。",
-	"typescript.format.enable": "启用/禁用默认 TypeScript 格式化程序。",
-	"javascript.format.enable": "启用/禁用 JavaScript 格式化程序。",
-	"format.insertSpaceAfterCommaDelimiter": "定义逗号分隔符后面的空格处理。",
-	"format.insertSpaceAfterConstructor": "定义构造器关键字后的空格处理。要求 TypeScript >= 2.3.0。",
-	"format.insertSpaceAfterSemicolonInForStatements": "在 For 语句中，定义分号后面的空格处理。",
-	"format.insertSpaceBeforeAndAfterBinaryOperators": "定义二进制运算符后面的空格处理",
-	"format.insertSpaceAfterKeywordsInControlFlowStatements": "定义控制流语句中关键字后面的空格处理。",
-	"format.insertSpaceAfterFunctionKeywordForAnonymousFunctions": "定义匿名函数的函数关键字后面的空格处理。",
-	"format.insertSpaceBeforeFunctionParenthesis": "在函数参数括号前定义空格处理。需要 TypeScript >= 2.1.5。",
-	"format.insertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis": "定义非空小括号的左括号后和右括号前的空格处理方式。",
-	"format.insertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets": "定义非空中括号的左括号后和右括号前的空格处理方式。",
-	"format.insertSpaceAfterOpeningAndBeforeClosingNonemptyBraces": "定义非空大括号的左括号后和右括号前的空格处理方式。要求 TypeScript >= 2.3.0。",
-	"format.insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces": "定义模板字符串的左括号后面和右括号前面的空格处理。要求 TypeScript >= 2.0.6。",
-	"format.insertSpaceAfterOpeningAndBeforeClosingJsxExpressionBraces": "定义 JSX 表达式左括号后面和右括号前面的空格处理。要求 TypeScript >= 2.0.6。",
-	"format.insertSpaceAfterTypeAssertion": "定义 TypeScript 中类型断言后的空格处理。要求 TypeScript >= 2.4。",
-	"format.placeOpenBraceOnNewLineForFunctions": "定义函数的左大括号是否放置在新的一行。",
-	"format.placeOpenBraceOnNewLineForControlBlocks": "定义控制块的左括号是否放置在新的一行。",
-	"javascript.validate.enable": "启用/禁用 JavaScript 验证。",
-	"goToProjectConfig.title": "转到项目配置",
-	"javascript.referencesCodeLens.enabled": "启用/禁用在 JavaScript 文件中引用 CodeLens。",
-	"typescript.referencesCodeLens.enabled": "启用/禁用在 TypeScript 文件中引用 CodeLens。要求 TypeScript >= 2.0.6。",
-	"typescript.implementationsCodeLens.enabled": "启用/禁用实现 CodeLens。要求 TypeScript >= 2.2.0。",
-	"typescript.openTsServerLog.title": "打开 TS 服务器日志",
-	"typescript.restartTsServer": "重启 TS 服务器",
-	"typescript.selectTypeScriptVersion.title": "选择 TypeScript 版本",
-	"typescript.reportStyleChecksAsWarnings": "将风格检查问题报告为警告",
-	"jsDocCompletion.enabled": "启用/禁用自动 JSDoc 注释",
-	"javascript.implicitProjectConfig.checkJs": "启用或禁用 JavaScript 文件的语义检查。若有 jsconfig.json 或 tsconfig.json 文件，将覆盖此设置。要求 TypeScript >= 2.3.1。",
-	"typescript.npm": "指定用于自动获取类型的 NPM 可执行文件的路径。要求 TypeScript >= 2.3.4。",
-	"typescript.check.npmIsInstalled": "检查是否安装了 NPM 以自动获取类型。",
-	"javascript.nameSuggestions": "启用/禁用在 JavaScript 建议列表中包含文件中的唯一名称。",
-	"typescript.tsc.autoDetect": "控制 tsc 任务的自动检测。\"off\" 关闭此功能。\"build\" 仅创建单次运行编译任务。\"watch\" 仅创建编译及监视任务。\"on\" 创建构建及监视任务。默认值为 \"on\"。",
-	"typescript.problemMatchers.tsc.label": "TypeScript 问题",
-	"typescript.problemMatchers.tscWatch.label": "TypeScript 问题(观看模式)",
-	"typescript.quickSuggestionsForPaths": "当输入导入路径时启用或禁用快速建议。",
-	"typescript.locale": "设置在报告 JavaScript 和 TypeScript 错误时使用的区域设置。要求 TypeScript >= 2.6.0。默认 (\"null\") 将使用 VS Code 的区域设置。",
-	"javascript.implicitProjectConfig.experimentalDecorators": "对不属于任何工程的 JavaScript 文件启用或禁用 \"experimentalDecorators\" 设置。若有 jsconfig.json 或 tsconfig.json 文件，将覆盖此设置。要求 TypeScript >= 2.3.1。",
-	"typescript.autoImportSuggestions.enabled": "启用或禁用自动导入建议。要求 TypeScript >= 2.6.1",
-	"typescript.experimental.syntaxFolding": "启用或禁用语法折叠标记。",
-	"taskDefinition.tsconfig.description": "定义 TS 生成的 tsconfig 文件。",
-	"javascript.suggestionActions.enabled": "在 JavaScript 文件中启用或禁用编辑器的建议诊断。需要 TypeScript >= 2.8",
-	"typescript.suggestionActions.enabled": "在 TypeScript 文件中启用或禁用编辑器的建议诊断。要求 TypeScript >= 2.8",
-	"typescript.preferences.quoteStyle": "用于快速修复的首选引用样式: \"single\" (单引号)、\"double\" (双引号) 或 \"auto\" (从已有 import 语句中推测引号类型)。要求 TypeScript >= 2.9",
-	"typescript.preferences.importModuleSpecifier": "自动 import 语句中首选的路径类型:\n- \"relative\"，相对路径。\n- \"non-relative\"，根据 \"jsconfig.json\" 或 \"tsconfig.json\" 中设置的 \"baseUrl\" 的计算出的路径。\n- \"auto\"，推测最短路径类型。\n要求 TypeScript >= 2.9",
-	"typescript.showUnused": "启用或禁用突出显示代码中未使用的变量。要求 TypeScript >= 2.9",
-	"typescript.updateImportsOnFileMove.enabled": "在 VS Code 中重命名或移动文件时启用或禁用自动更新 import 语句的路径。可选值有: \"prompt\" (在每次重命名时提示)、\"always\" (始终自动更新路径) 和 \"never\" (从不重命名路径且不要提示)。要求 TypeScript >= 2.9"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/typescript/out/commands.i18n.json b/i18n/chs/extensions/typescript/out/commands.i18n.json
deleted file mode 100644
index 71f03151b6f..00000000000
--- a/i18n/chs/extensions/typescript/out/commands.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"typescript.projectConfigNoWorkspace": "请在 VS Code 中打开一个文件夹，以使用 TypeScript 或 JavaScript 项目",
-	"typescript.projectConfigUnsupportedFile": "无法确定 TypeScript 或 JavaScript 项目。不受支持的文件类型",
-	"typescript.projectConfigCouldNotGetInfo": "无法确定 TypeScript 或 JavaScript 项目",
-	"typescript.noTypeScriptProjectConfig": "文件不属于 TypeScript 项目。点击[这里]({0})了解更多。",
-	"typescript.noJavaScriptProjectConfig": "文件不属于 JavaScript 项目。点击[这里]({0})了解更多。",
-	"typescript.configureTsconfigQuickPick": "配置 tsconfig.json",
-	"typescript.configureJsconfigQuickPick": "配置 jsconfig.json"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/typescript/out/features/bufferSyncSupport.i18n.json b/i18n/chs/extensions/typescript/out/features/bufferSyncSupport.i18n.json
deleted file mode 100644
index 2b32badbce5..00000000000
--- a/i18n/chs/extensions/typescript/out/features/bufferSyncSupport.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"versionMismatch": "正在使用 TypeScript ({1}) 实现的编辑器功能。TypeScript ({0}) 已经全局安装在你的电脑上。VS Code 中发生的错误可能会与 TCS 中不同",
-	"moreInformation": "详细信息",
-	"doNotCheckAgain": "不再检查",
-	"close": "关闭",
-	"updateTscCheck": "已将用户设置 \"typescript.check.tscVersion\" 更新为 false"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/typescript/out/features/completionItemProvider.i18n.json b/i18n/chs/extensions/typescript/out/features/completionItemProvider.i18n.json
deleted file mode 100644
index cec1f8a1e0a..00000000000
--- a/i18n/chs/extensions/typescript/out/features/completionItemProvider.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"selectCodeAction": "选择要应用的代码操作",
-	"acquiringTypingsLabel": "正在获取 typings...",
-	"acquiringTypingsDetail": "获取 IntelliSense 的 typings 定义。",
-	"autoImportLabel": "从 {0} 自动导入"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/typescript/out/features/directiveCommentCompletionProvider.i18n.json b/i18n/chs/extensions/typescript/out/features/directiveCommentCompletionProvider.i18n.json
deleted file mode 100644
index 0e60e3412a4..00000000000
--- a/i18n/chs/extensions/typescript/out/features/directiveCommentCompletionProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"ts-check": "在 JavaScript 文件中启用语义检查。必须在文件顶部。",
-	"ts-nocheck": "在 JavaScript 文件中禁用语义检查。必须在文件顶部。",
-	"ts-ignore": "取消文件下一行的 @ts-check 错误提示。"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/typescript/out/features/implementationsCodeLensProvider.i18n.json b/i18n/chs/extensions/typescript/out/features/implementationsCodeLensProvider.i18n.json
deleted file mode 100644
index 021db468b54..00000000000
--- a/i18n/chs/extensions/typescript/out/features/implementationsCodeLensProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"oneImplementationLabel": "1 个实现",
-	"manyImplementationLabel": "{0} 个实现",
-	"implementationsErrorLabel": "无法确定实现"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/typescript/out/features/jsDocCompletionProvider.i18n.json b/i18n/chs/extensions/typescript/out/features/jsDocCompletionProvider.i18n.json
deleted file mode 100644
index 1d385873b11..00000000000
--- a/i18n/chs/extensions/typescript/out/features/jsDocCompletionProvider.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"typescript.jsDocCompletionItem.documentation": "JSDoc 注释"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/typescript/out/features/quickFixProvider.i18n.json b/i18n/chs/extensions/typescript/out/features/quickFixProvider.i18n.json
deleted file mode 100644
index d22ade03db1..00000000000
--- a/i18n/chs/extensions/typescript/out/features/quickFixProvider.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"fixAllInFileLabel": "{0} (修复文件中所有)"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/typescript/out/features/referencesCodeLensProvider.i18n.json b/i18n/chs/extensions/typescript/out/features/referencesCodeLensProvider.i18n.json
deleted file mode 100644
index 5410b680677..00000000000
--- a/i18n/chs/extensions/typescript/out/features/referencesCodeLensProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"oneReferenceLabel": "1 个引用",
-	"manyReferenceLabel": "{0} 个引用",
-	"referenceErrorLabel": "无法确定引用"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/typescript/out/features/taskProvider.i18n.json b/i18n/chs/extensions/typescript/out/features/taskProvider.i18n.json
deleted file mode 100644
index cd6842c9ce3..00000000000
--- a/i18n/chs/extensions/typescript/out/features/taskProvider.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"buildTscLabel": "构建 - {0}",
-	"buildAndWatchTscLabel": "监视 - {0}"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/typescript/out/typescriptMain.i18n.json b/i18n/chs/extensions/typescript/out/typescriptMain.i18n.json
deleted file mode 100644
index 36b3b2d5f6b..00000000000
--- a/i18n/chs/extensions/typescript/out/typescriptMain.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"typescript.projectConfigNoWorkspace": "请在 VS Code 中打开一个文件夹，以使用 TypeScript 或 JavaScript 项目",
-	"typescript.projectConfigUnsupportedFile": "无法确定 TypeScript 或 JavaScript 项目。不受支持的文件类型",
-	"typescript.projectConfigCouldNotGetInfo": "无法确定 TypeScript 或 JavaScript 项目",
-	"typescript.noTypeScriptProjectConfig": "文件不属于 TypeScript 项目",
-	"typescript.noJavaScriptProjectConfig": "文件不属于 JavaScript 项目",
-	"typescript.configureTsconfigQuickPick": "配置 tsconfig.json",
-	"typescript.configureJsconfigQuickPick": "配置 jsconfig.json",
-	"typescript.projectConfigLearnMore": "了解详细信息"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/typescript/out/typescriptServiceClient.i18n.json b/i18n/chs/extensions/typescript/out/typescriptServiceClient.i18n.json
deleted file mode 100644
index d0647ba9a4d..00000000000
--- a/i18n/chs/extensions/typescript/out/typescriptServiceClient.i18n.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noServerFound": "路径 {0} 未指向有效的 tsserver 安装。请回退到捆绑的 TypeScript 版本。",
-	"serverCouldNotBeStarted": "无法启动 TypeScript 语言服务器。错误消息为: {0}",
-	"typescript.openTsServerLog.notSupported": "TS 服务器日志记录需要 TS 2.2.2+",
-	"typescript.openTsServerLog.loggingNotEnabled": "TS 服务器日志记录已关闭。请设置 \"typescript.tsserver.log\" 并重启\n TS 服务器以启用日志记录",
-	"typescript.openTsServerLog.enableAndReloadOption": "启用日志记录并重启 TS 服务器",
-	"typescript.openTsServerLog.noLogFile": "TS 服务器尚未启动日志记录。",
-	"openTsServerLog.openFileFailedFailed": "无法打开 TS 服务器日志文件",
-	"serverDiedAfterStart": "TypeScript 语言服务在其启动后已中止 5 次。将不会重启该服务。",
-	"serverDiedReportIssue": "报告问题",
-	"serverDied": "在过去 5 分钟内，TypeScript 语言服务意外中止了 5 次。"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/typescript/out/utils/api.i18n.json b/i18n/chs/extensions/typescript/out/utils/api.i18n.json
deleted file mode 100644
index 006fe312258..00000000000
--- a/i18n/chs/extensions/typescript/out/utils/api.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"invalidVersion": "无效版本"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/typescript/out/utils/logger.i18n.json b/i18n/chs/extensions/typescript/out/utils/logger.i18n.json
deleted file mode 100644
index 8f5ef5415b9..00000000000
--- a/i18n/chs/extensions/typescript/out/utils/logger.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"channelName": "TypeScript"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/typescript/out/utils/projectStatus.i18n.json b/i18n/chs/extensions/typescript/out/utils/projectStatus.i18n.json
deleted file mode 100644
index cd5096356f3..00000000000
--- a/i18n/chs/extensions/typescript/out/utils/projectStatus.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hintExclude": "若要启用项目范围内的 JavaScript/TypeScript 语言功能，请排除包含多个文件的文件夹，例如: {0}",
-	"hintExclude.generic": "若要启用项目范围内的 JavaScript/TypeScript 语言功能，请排除包含不需要处理的源文件的大型文件夹。",
-	"large.label": "配置排除",
-	"hintExclude.tooltip": "若要启用项目范围内的 JavaScript/TypeScript 语言功能，请排除包含不需要处理的源文件的大型文件夹。"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/typescript/out/utils/typingsStatus.i18n.json b/i18n/chs/extensions/typescript/out/utils/typingsStatus.i18n.json
deleted file mode 100644
index fe9128f40d0..00000000000
--- a/i18n/chs/extensions/typescript/out/utils/typingsStatus.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"installingPackages": "提取数据以实现更好的 TypeScript IntelliSense",
-	"typesInstallerInitializationFailed.title": "无法为 JavaScript 语言功能安装 typings 文件。请确认 NPM 已安装，或在你的用户设置中配置 “typescript.npm”。点击[这里]({0})了解更多。",
-	"typesInstallerInitializationFailed.doNotCheckAgain": "不再显示"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/typescript/out/utils/versionPicker.i18n.json b/i18n/chs/extensions/typescript/out/utils/versionPicker.i18n.json
deleted file mode 100644
index c9f87e17e81..00000000000
--- a/i18n/chs/extensions/typescript/out/utils/versionPicker.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"useVSCodeVersionOption": "使用 VS Code 的版本",
-	"useWorkspaceVersionOption": "使用工作区版本",
-	"learnMore": "了解详细信息",
-	"selectTsVersion": "选择用于 JavaScript 和 TypeScript 语言功能的 TypeScript 版本"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/typescript/out/utils/versionProvider.i18n.json b/i18n/chs/extensions/typescript/out/utils/versionProvider.i18n.json
deleted file mode 100644
index 4bb999f00f5..00000000000
--- a/i18n/chs/extensions/typescript/out/utils/versionProvider.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"couldNotLoadTsVersion": "无法获取此目录 TypeScript 的版本",
-	"noBundledServerFound": "VS Code 的 tsserver 已被其他应用程序(例如运行异常的病毒检测工具)删除。请重新安装 VS Code。"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/typescript/package.i18n.json b/i18n/chs/extensions/typescript/package.i18n.json
deleted file mode 100644
index bfdc4b0322d..00000000000
--- a/i18n/chs/extensions/typescript/package.i18n.json
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "JavaScript 和 TypeScript 的语言功能",
-	"description": "为 JavaScript 和 TypeScript 提供丰富的语言支持。",
-	"typescript.reloadProjects.title": "重载项目",
-	"javascript.reloadProjects.title": "重载项目",
-	"configuration.typescript": "TypeScript",
-	"typescript.useCodeSnippetsOnMethodSuggest.dec": "完成函数的参数签名。",
-	"typescript.tsdk.desc": "指定包含要使用的 tsserver 和 lib*.d.ts 文件的文件夹路径。",
-	"typescript.disableAutomaticTypeAcquisition": "禁用自动获取类型。需要 TypeScript >= 2.0.6。",
-	"typescript.tsserver.log": "将 TS 服务器的日志保存到一个文件。此日志可用于诊断 TS 服务器问题。日志可能包含你的项目中的文件路径、源代码和其他可能敏感的信息。",
-	"typescript.tsserver.trace": "对发送到 TS 服务器的消息启用跟踪。此跟踪信息可用于诊断 TS 服务器问题。 跟踪信息可能包含你的项目中的文件路径、源代码和其他可能敏感的信息。",
-	"typescript.validate.enable": "启用/禁用 TypeScript 验证。",
-	"typescript.format.enable": "启用/禁用默认 TypeScript 格式化程序。",
-	"javascript.format.enable": "启用/禁用 JavaScript 格式化程序。",
-	"format.insertSpaceAfterCommaDelimiter": "定义逗号分隔符后面的空格处理。",
-	"format.insertSpaceAfterConstructor": "定义构造器关键字后的空格处理。要求 TypeScript >= 2.3.0。",
-	"format.insertSpaceAfterSemicolonInForStatements": "在 For 语句中，定义分号后面的空格处理。",
-	"format.insertSpaceBeforeAndAfterBinaryOperators": "定义二进制运算符后面的空格处理",
-	"format.insertSpaceAfterKeywordsInControlFlowStatements": "定义控制流语句中关键字后面的空格处理。",
-	"format.insertSpaceAfterFunctionKeywordForAnonymousFunctions": "定义匿名函数的函数关键字后面的空格处理。",
-	"format.insertSpaceBeforeFunctionParenthesis": "在函数参数括号前定义空格处理。需要 TypeScript >= 2.1.5。",
-	"format.insertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis": "定义非空圆括号的左括号后面和右括号前面的空格处理。",
-	"format.insertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets": "定义非空方括号的左括号后面和右括号前面的空格处理。",
-	"format.insertSpaceAfterOpeningAndBeforeClosingNonemptyBraces": "定义非空括号的左括号后面和右括号前面的空格处理。要求 TypeScript >= 2.3.0。",
-	"format.insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces": "定义模板字符串的左括号后面和右括号前面的空格处理。要求 TypeScript >= 2.0.6。",
-	"format.insertSpaceAfterOpeningAndBeforeClosingJsxExpressionBraces": "定义 JSX 表达式左括号后面和右括号前面的空格处理。要求 TypeScript >= 2.0.6。",
-	"format.insertSpaceAfterTypeAssertion": "定义 TypeScript 中类型断言后的空格处理。要求 TypeScript >= 2.4。",
-	"format.placeOpenBraceOnNewLineForFunctions": "定义函数的左大括号是否放置在新的一行。",
-	"format.placeOpenBraceOnNewLineForControlBlocks": "定义控制块的左括号是否放置在新的一行。",
-	"javascript.validate.enable": "启用/禁用 JavaScript 验证。",
-	"typescript.goToProjectConfig.title": "转到项目配置",
-	"javascript.goToProjectConfig.title": "转到项目配置",
-	"javascript.referencesCodeLens.enabled": "启用/禁用在 JavaScript 文件中引用 CodeLens。",
-	"typescript.referencesCodeLens.enabled": "启用/禁用在 TypeScript 文件中引用 CodeLens。要求 TypeScript >= 2.0.6。",
-	"typescript.implementationsCodeLens.enabled": "启用/禁用实现 CodeLens。要求 TypeScript >= 2.2.0。",
-	"typescript.openTsServerLog.title": "打开 TS 服务器日志",
-	"typescript.restartTsServer": "重启 TS 服务器",
-	"typescript.selectTypeScriptVersion.title": "选择 TypeScript 版本",
-	"typescript.reportStyleChecksAsWarnings": "将风格检查问题报告为警告",
-	"jsDocCompletion.enabled": "启用/禁用自动 JSDoc 注释",
-	"javascript.implicitProjectConfig.checkJs": "启用/禁用 JavaScript 文件的语义检查。现有的 jsconfig.json 或\n tsconfig.json 文件会覆盖此设置。要求 TypeScript >=2.3.1。",
-	"typescript.npm": "指定用于自动获取类型的 NPM 可执行文件的路径。要求 TypeScript >= 2.3.4。",
-	"typescript.check.npmIsInstalled": "检查是否安装了 NPM 以自动获取类型。",
-	"javascript.nameSuggestions": "启用/禁用在 JavaScript 建议列表中包含文件中的唯一名称。",
-	"typescript.tsc.autoDetect": "控制 tsc 任务的自动检测。\"off\" 关闭此功能。\"build\" 仅创建单次运行编译任务。\"watch\" 仅创建编译及监视任务。\"on\" 创建构建及监视任务。默认值为 \"on\"。",
-	"typescript.problemMatchers.tsc.label": "TypeScript 问题",
-	"typescript.problemMatchers.tscWatch.label": "TypeScript 问题(观看模式)",
-	"typescript.quickSuggestionsForPaths": "当输入导入路径时启用或禁用快速建议。",
-	"typescript.locale": "设置报告 TypeScript 错误时使用的区域设置。要求 TypeScript >= 2.6.0。默认 (\"null\") 将使用 VS Code 的区域设置。",
-	"javascript.implicitProjectConfig.experimentalDecorators": "对不属于任何工程的 JavaScript 文件启用或禁用 \"experimentalDecorators\" 设置。现有的 jsconfig.json 或\n tsconfig.json 文件会覆盖此设置。要求 TypeScript >=2.3.1。",
-	"typescript.autoImportSuggestions.enabled": "启用或禁用自动导入建议。要求 TypeScript >= 2.6.1",
-	"typescript.experimental.syntaxFolding": "启用或禁用语法折叠标记。",
-	"taskDefinition.tsconfig.description": "定义 TS 生成的 tsconfig 文件。"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/vb/package.i18n.json b/i18n/chs/extensions/vb/package.i18n.json
deleted file mode 100644
index e69d4d60383..00000000000
--- a/i18n/chs/extensions/vb/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Visual Basic 语言基础功能",
-	"description": "在 Visual Basic 文件中提供代码片段、语法高亮、括号匹配和折叠功能。"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/xml/package.i18n.json b/i18n/chs/extensions/xml/package.i18n.json
deleted file mode 100644
index 3cea21c3bae..00000000000
--- a/i18n/chs/extensions/xml/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "XML 语言基础功能",
-	"description": "在 XML 文件中提供语法高亮和括号匹配功能。"
-}
\ No newline at end of file
diff --git a/i18n/chs/extensions/yaml/package.i18n.json b/i18n/chs/extensions/yaml/package.i18n.json
deleted file mode 100644
index 13b5559d23b..00000000000
--- a/i18n/chs/extensions/yaml/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "YAML 语言基础功能",
-	"description": "在 YAML 文件中提供语法高亮和括号匹配功能。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/base/browser/ui/actionbar/actionbar.i18n.json b/i18n/chs/src/vs/base/browser/ui/actionbar/actionbar.i18n.json
deleted file mode 100644
index 309631273fe..00000000000
--- a/i18n/chs/src/vs/base/browser/ui/actionbar/actionbar.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"titleLabel": "{0} ({1})"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/base/browser/ui/aria/aria.i18n.json b/i18n/chs/src/vs/base/browser/ui/aria/aria.i18n.json
deleted file mode 100644
index 88f90da06b7..00000000000
--- a/i18n/chs/src/vs/base/browser/ui/aria/aria.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"repeated": "{0} (已再次发生)"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/base/browser/ui/findinput/findInput.i18n.json b/i18n/chs/src/vs/base/browser/ui/findinput/findInput.i18n.json
deleted file mode 100644
index 70f9d2f01c5..00000000000
--- a/i18n/chs/src/vs/base/browser/ui/findinput/findInput.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"defaultLabel": "输入"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/base/browser/ui/findinput/findInputCheckboxes.i18n.json b/i18n/chs/src/vs/base/browser/ui/findinput/findInputCheckboxes.i18n.json
deleted file mode 100644
index 953f702f6dd..00000000000
--- a/i18n/chs/src/vs/base/browser/ui/findinput/findInputCheckboxes.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"caseDescription": "区分大小写",
-	"wordsDescription": "全字匹配",
-	"regexDescription": "使用正则表达式"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/base/browser/ui/inputbox/inputBox.i18n.json b/i18n/chs/src/vs/base/browser/ui/inputbox/inputBox.i18n.json
deleted file mode 100644
index 21793ea598c..00000000000
--- a/i18n/chs/src/vs/base/browser/ui/inputbox/inputBox.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"alertErrorMessage": "错误: {0}",
-	"alertWarningMessage": "警告: {0}",
-	"alertInfoMessage": "信息: {0}"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/base/browser/ui/resourceviewer/resourceViewer.i18n.json b/i18n/chs/src/vs/base/browser/ui/resourceviewer/resourceViewer.i18n.json
deleted file mode 100644
index 9b711babbbf..00000000000
--- a/i18n/chs/src/vs/base/browser/ui/resourceviewer/resourceViewer.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"imgMeta": "{0}x{1} {2}",
-	"largeImageError": "图像太大，无法在编辑器中显示。 ",
-	"resourceOpenExternalButton": "使用外部程序打开图片？",
-	"nativeBinaryError": "文件将不在编辑器中显示，因为它是二进制文件、非常大或使用不支持的文本编码。",
-	"sizeB": "{0} B",
-	"sizeKB": "{0} KB",
-	"sizeMB": "{0} MB",
-	"sizeGB": "{0} GB",
-	"sizeTB": "{0} TB"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json b/i18n/chs/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json
deleted file mode 100644
index 750d811d866..00000000000
--- a/i18n/chs/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"selectAriaOption": "{0}"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/base/browser/ui/toolbar/toolbar.i18n.json b/i18n/chs/src/vs/base/browser/ui/toolbar/toolbar.i18n.json
deleted file mode 100644
index 908cc558c0e..00000000000
--- a/i18n/chs/src/vs/base/browser/ui/toolbar/toolbar.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"more": "更多"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/base/common/errorMessage.i18n.json b/i18n/chs/src/vs/base/common/errorMessage.i18n.json
deleted file mode 100644
index a59f8398f4d..00000000000
--- a/i18n/chs/src/vs/base/common/errorMessage.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"stackTrace.format": "{0}: {1}",
-	"error.defaultMessage": "出现未知错误。有关详细信息，请参阅日志。",
-	"nodeExceptionMessage": "发生了系统错误 ({0})",
-	"error.moreErrors": "{0} 个(共 {1} 个错误)"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/base/common/json.i18n.json b/i18n/chs/src/vs/base/common/json.i18n.json
deleted file mode 100644
index 782185bb396..00000000000
--- a/i18n/chs/src/vs/base/common/json.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"error.invalidSymbol": "符号无效",
-	"error.invalidNumberFormat": "数字格式无效",
-	"error.propertyNameExpected": "需要属性名",
-	"error.valueExpected": "需要值",
-	"error.colonExpected": "需要冒号",
-	"error.commaExpected": "需要逗号",
-	"error.closeBraceExpected": "需要右大括号",
-	"error.closeBracketExpected": "需要右括号",
-	"error.endOfFileExpected": "需要文件结尾标识(EOF)"
-}
diff --git a/i18n/chs/src/vs/base/common/jsonErrorMessages.i18n.json b/i18n/chs/src/vs/base/common/jsonErrorMessages.i18n.json
deleted file mode 100644
index 530ce16d6ed..00000000000
--- a/i18n/chs/src/vs/base/common/jsonErrorMessages.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"error.invalidSymbol": "无效符号",
-	"error.invalidNumberFormat": "数字格式无效",
-	"error.propertyNameExpected": "需要属性名",
-	"error.valueExpected": "需要值",
-	"error.colonExpected": "需要冒号",
-	"error.commaExpected": "需要逗号",
-	"error.closeBraceExpected": "需要右大括号",
-	"error.closeBracketExpected": "需要右括号",
-	"error.endOfFileExpected": "需要文件结尾(EOF)"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/base/common/keybindingLabels.i18n.json b/i18n/chs/src/vs/base/common/keybindingLabels.i18n.json
deleted file mode 100644
index 88f9db8bef5..00000000000
--- a/i18n/chs/src/vs/base/common/keybindingLabels.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"ctrlKey": "Ctrl",
-	"shiftKey": "Shift",
-	"altKey": "Alt",
-	"windowsKey": "Windows",
-	"ctrlKey.long": "Control",
-	"shiftKey.long": "Shift",
-	"altKey.long": "Alt",
-	"cmdKey.long": "Command",
-	"windowsKey.long": "Windows"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/base/common/processes.i18n.json b/i18n/chs/src/vs/base/common/processes.i18n.json
deleted file mode 100644
index 1b288ec0aeb..00000000000
--- a/i18n/chs/src/vs/base/common/processes.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"ExecutableParser.commandMissing": "错误: 可执行信息必须定义字符串类型的命令。",
-	"ExecutableParser.isShellCommand": "警告: isShellCommand 的类型必须为布尔型。正在忽略值 {0}。",
-	"ExecutableParser.args": "警告: args 的类型必须为 string[]。正在忽略值 {0}。",
-	"ExecutableParser.invalidCWD": "警告: options.cwd 的类型必须为字符串。正在忽略值 {0}。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/base/common/severity.i18n.json b/i18n/chs/src/vs/base/common/severity.i18n.json
deleted file mode 100644
index 3112dd48a98..00000000000
--- a/i18n/chs/src/vs/base/common/severity.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"sev.error": "错误",
-	"sev.warning": "警告",
-	"sev.info": "信息"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/base/node/processes.i18n.json b/i18n/chs/src/vs/base/node/processes.i18n.json
deleted file mode 100644
index a4ef2b86290..00000000000
--- a/i18n/chs/src/vs/base/node/processes.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"TaskRunner.UNC": "无法在 UNC 驱动器上执行 Shell 命令。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/base/node/ps.i18n.json b/i18n/chs/src/vs/base/node/ps.i18n.json
deleted file mode 100644
index 4b6a11e30ab..00000000000
--- a/i18n/chs/src/vs/base/node/ps.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"collecting": "正在收集 CPU 与内存信息。这可能需要几秒钟的时间。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/base/node/zip.i18n.json b/i18n/chs/src/vs/base/node/zip.i18n.json
deleted file mode 100644
index d6198d6cf8d..00000000000
--- a/i18n/chs/src/vs/base/node/zip.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"incompleteExtract": "解压不完整。找到了 {0} / {1} 个项目",
-	"notFound": "在 Zip 中找不到 {0}。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/base/parts/quickopen/browser/quickOpenModel.i18n.json b/i18n/chs/src/vs/base/parts/quickopen/browser/quickOpenModel.i18n.json
deleted file mode 100644
index 611678a9267..00000000000
--- a/i18n/chs/src/vs/base/parts/quickopen/browser/quickOpenModel.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"quickOpenAriaLabelEntry": "{0}，选取器",
-	"quickOpenAriaLabel": "选取器"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/base/parts/quickopen/browser/quickOpenWidget.i18n.json b/i18n/chs/src/vs/base/parts/quickopen/browser/quickOpenWidget.i18n.json
deleted file mode 100644
index 9825ab687f1..00000000000
--- a/i18n/chs/src/vs/base/parts/quickopen/browser/quickOpenWidget.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"quickOpenAriaLabel": "快速选取器。键入以缩小结果范围。",
-	"treeAriaLabel": "快速选取器"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/base/parts/tree/browser/treeDefaults.i18n.json b/i18n/chs/src/vs/base/parts/tree/browser/treeDefaults.i18n.json
deleted file mode 100644
index 1aae2987980..00000000000
--- a/i18n/chs/src/vs/base/parts/tree/browser/treeDefaults.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"collapse": "折叠"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json b/i18n/chs/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
deleted file mode 100644
index 537865041fd..00000000000
--- a/i18n/chs/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hide": "隐藏",
-	"show": "显示",
-	"previewOnGitHub": "在 GitHub 中预览",
-	"loadingData": "正在加载数据...",
-	"rateLimited": "超出 GitHub 查询限制。请稍候。",
-	"similarIssues": "类似的问题",
-	"open": "开放",
-	"closed": "已关闭",
-	"noSimilarIssues": "没有找到类似问题",
-	"settingsSearchIssue": "设置搜索的问题",
-	"bugReporter": "问题报告",
-	"featureRequest": "功能请求",
-	"performanceIssue": "性能问题",
-	"stepsToReproduce": "重现步骤",
-	"bugDescription": "请分享能稳定重现此问题的必要步骤，并包含实际和预期的结果。我们支持 GitHub 版的 Markdown。您将能在 GitHub 上预览时编辑这个问题并添加截图。",
-	"performanceIssueDesciption": "这个性能问题是在什么时候发生的? 是在启动时，还是在一系列特定的操作之后? 我们支持 GitHub 版的 Markdown。您将能在 GitHub 上预览时编辑这个问题并添加截图。",
-	"description": "描述",
-	"featureRequestDescription": "请描述您希望能够使用的功能。我们支持 GitHub 版的 Markdown。您将能在 GitHub 上预览时编辑问题并添加截图。",
-	"expectedResults": "预期结果",
-	"settingsSearchResultsDescription": "请列出您在搜索此项时希望看到的结果。我们支持 GitHub 版的 Markdown。您将能在 GitHub 上预览时编辑问题并添加截图。",
-	"pasteData": "所需的数据太大，无法直接发送。我们已经将其写入剪贴板，请粘贴。",
-	"disabledExtensions": "扩展已禁用"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json b/i18n/chs/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
deleted file mode 100644
index b6a3844bc2b..00000000000
--- a/i18n/chs/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"completeInEnglish": "请使用英文进行填写。",
-	"issueTypeLabel": "这是一个",
-	"issueSourceLabel": "提交到",
-	"vscode": "Visual Studio Code",
-	"extension": "扩展",
-	"disableExtensionsLabelText": "请试着在{0}之后重现问题。如果此问题仅在扩展运行时才能重现，那么这可能是一个扩展的问题。",
-	"disableExtensions": "禁用所有扩展并重新加载窗口",
-	"chooseExtension": "扩展",
-	"issueTitleLabel": "标题",
-	"issueTitleRequired": "请输入标题。",
-	"titleLengthValidation": "标题太长。",
-	"details": "请输入详细信息。",
-	"sendSystemInfo": "包含系统信息 ({0})",
-	"show": "显示",
-	"sendProcessInfo": "包含当前运行中的进程 ({0})",
-	"sendWorkspaceInfo": "包含工作区元数据 ({0})",
-	"sendExtensions": "包含已启用的扩展 ({0})",
-	"sendSearchedExtensions": "发送已搜索的扩展 ({0})",
-	"sendSettingsSearchDetails": "发送设置搜索的详细信息 ({0})"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/code/electron-browser/processExplorer/processExplorerMain.i18n.json b/i18n/chs/src/vs/code/electron-browser/processExplorer/processExplorerMain.i18n.json
deleted file mode 100644
index 9dca8b3d760..00000000000
--- a/i18n/chs/src/vs/code/electron-browser/processExplorer/processExplorerMain.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"cpu": "CPU %",
-	"memory": "内存 (MB)",
-	"pid": "PID",
-	"name": "名称",
-	"killProcess": "结束进程",
-	"forceKillProcess": "强制结束进程",
-	"copy": "复制",
-	"copyAll": "全部复制"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/code/electron-main/auth.i18n.json b/i18n/chs/src/vs/code/electron-main/auth.i18n.json
deleted file mode 100644
index 6395ea30426..00000000000
--- a/i18n/chs/src/vs/code/electron-main/auth.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"authRequire": "需要验证代理",
-	"proxyauth": "{0} 代理需要验证。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/code/electron-main/logUploader.i18n.json b/i18n/chs/src/vs/code/electron-main/logUploader.i18n.json
deleted file mode 100644
index 2ebc552b382..00000000000
--- a/i18n/chs/src/vs/code/electron-main/logUploader.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"invalidEndpoint": "日志上传端点无效",
-	"beginUploading": "正在上传...",
-	"didUploadLogs": "上传成功! 日志文件 ID: {0}",
-	"logUploadPromptHeader": "即将上传您的会话日志到安全的 Microsoft 端点，其仅能被 Microsoft 的 VS Code 团队成员访问。",
-	"logUploadPromptBody": "会话日志可能包含个人信息，如完整路径或者文件内容。请检查并编辑您的会话日志文件: “{0}”",
-	"logUploadPromptBodyDetails": "如果继续，表示您确认您已经检查与编辑了会话日志文件并同意 Microsoft 使用这些文件来调试 VS Code。",
-	"logUploadPromptAcceptInstructions": "为继续上传，请使用 \"--upload-logs={0}\" 运行 code",
-	"postError": "上传日志时出错: {0}",
-	"responseError": "上传日志时出错。收到 {0} — {1}",
-	"parseError": "分析响应时出错",
-	"zipError": "压缩日志时出错: {0}"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/code/electron-main/main.i18n.json b/i18n/chs/src/vs/code/electron-main/main.i18n.json
deleted file mode 100644
index 6c70d4ed210..00000000000
--- a/i18n/chs/src/vs/code/electron-main/main.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"secondInstanceNoResponse": "{0} 的另一实例正在运行但没有响应",
-	"secondInstanceNoResponseDetail": "请先关闭其他所有实例，然后重试。",
-	"secondInstanceAdmin": "{0} 的第二个实例已经以管理员身份运行。",
-	"secondInstanceAdminDetail": "请先关闭另一个实例，然后重试。",
-	"close": "关闭(&&C)"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/code/electron-main/menus.i18n.json b/i18n/chs/src/vs/code/electron-main/menus.i18n.json
deleted file mode 100644
index 8ef99d97e56..00000000000
--- a/i18n/chs/src/vs/code/electron-main/menus.i18n.json
+++ /dev/null
@@ -1,193 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"mFile": "文件(&&F)",
-	"mEdit": "编辑(&&E)",
-	"mSelection": "选择(&&S)",
-	"mView": "查看(&&V)",
-	"mGoto": "转到(&&G)",
-	"mDebug": "调试(&&D)",
-	"mWindow": "窗口",
-	"mHelp": "帮助(&&H)",
-	"mTask": "任务(&&T)",
-	"miNewWindow": "新建窗口(&&W)",
-	"mAbout": "关于 {0}",
-	"mServices": "服务",
-	"mHide": "隐藏 {0}",
-	"mHideOthers": "隐藏其他",
-	"mShowAll": "全部显示",
-	"miQuit": "退出 {0}",
-	"miNewFile": "新建文件(&&N)",
-	"miOpen": "打开(&&O)...",
-	"miOpenWorkspace": "打开工作区(&&K)...",
-	"miOpenFolder": "打开文件夹(&&F)...",
-	"miOpenFile": "打开文件(&&O)...",
-	"miOpenRecent": "打开最近的文件(&&R)",
-	"miSaveWorkspaceAs": "将工作区另存为...",
-	"miAddFolderToWorkspace": "将文件夹添加到工作区(&&D)...",
-	"miSave": "保存(&&S)",
-	"miSaveAs": "另存为(&&A)...",
-	"miSaveAll": "全部保存(&&L)",
-	"miAutoSave": "自动保存",
-	"miRevert": "还原文件(&&V)",
-	"miCloseWindow": "关闭窗口(&&W)",
-	"miCloseWorkspace": "关闭工作区(&&W)",
-	"miCloseFolder": "关闭文件夹(&&F)",
-	"miCloseEditor": "关闭编辑器(&&C)",
-	"miExit": "退出(&&X)",
-	"miOpenSettings": "设置(&&S)",
-	"miOpenKeymap": "键盘快捷方式(&&K)",
-	"miOpenKeymapExtensions": "按键映射扩展(&&K)",
-	"miOpenSnippets": "用户代码片段(&&S)",
-	"miSelectColorTheme": "颜色主题(&&C)",
-	"miSelectIconTheme": "文件图标主题(&&I)",
-	"miPreferences": "首选项(&&P)",
-	"miReopenClosedEditor": "重新打开已关闭的编辑器(&&R)",
-	"miMore": "更多(&&M)...",
-	"miClearRecentOpen": "清除最近打开记录",
-	"miUndo": "撤消(&&U)",
-	"miRedo": "恢复(&&R)",
-	"miCut": "剪切(&&T)",
-	"miCopy": "复制(&&C)",
-	"miPaste": "粘贴(&&P)",
-	"miFind": "查找(&&F)",
-	"miReplace": "替换(&&R)",
-	"miFindInFiles": "在文件中查找(&&I)",
-	"miReplaceInFiles": "在文件中替换(&&I)",
-	"miEmmetExpandAbbreviation": "Emmet: 展开缩写(&&X)",
-	"miShowEmmetCommands": "Emmet(&&M)...",
-	"miToggleLineComment": "切换行注释(&&T)",
-	"miToggleBlockComment": "切换块注释(&&B)",
-	"miMultiCursorAlt": "切换为“Alt+单击”进行多光标功能",
-	"miMultiCursorCmd": "切换为“Cmd+单击”进行多光标功能",
-	"miMultiCursorCtrl": "切换为“Ctrl+单击”进行多光标功能",
-	"miInsertCursorAbove": "在上面添加光标(&&A)",
-	"miInsertCursorBelow": "在下面添加光标(&&D)",
-	"miInsertCursorAtEndOfEachLineSelected": "在行尾添加光标(&&U)",
-	"miAddSelectionToNextFindMatch": "添加下一个匹配项(&&N)",
-	"miAddSelectionToPreviousFindMatch": "添加上一个匹配项(&&R)",
-	"miSelectHighlights": "选择所有匹配项(&&O)",
-	"miCopyLinesUp": "向上复制一行(&&C)",
-	"miCopyLinesDown": "向下复制一行(&&P)",
-	"miMoveLinesUp": "向上移动一行(&&V)",
-	"miMoveLinesDown": "向下移动一行(&&L)",
-	"miSelectAll": "全选(&&S)",
-	"miSmartSelectGrow": "展开选定内容(&&E)",
-	"miSmartSelectShrink": "缩小选定范围(&&S)",
-	"miViewExplorer": "资源管理器(&&E)",
-	"miViewSearch": "搜索(&&S)",
-	"miViewSCM": "源代码管理(&&C)",
-	"miViewDebug": "调试(&&D)",
-	"miViewExtensions": "扩展(&&X)",
-	"miToggleOutput": "输出(&&O)",
-	"miToggleDebugConsole": "调试控制台(&&B)",
-	"miToggleIntegratedTerminal": "集成终端(&&I)",
-	"miMarker": "问题(&&P)",
-	"miCommandPalette": "命令面板(&&C)...",
-	"miOpenView": "打开视图(&&O)...",
-	"miToggleFullScreen": "切换全屏(&&F)",
-	"miToggleZenMode": "切换 Zen 模式",
-	"miToggleCenteredLayout": "切换居中布局",
-	"miToggleMenuBar": "切换菜单栏(&&B)",
-	"miSplitEditor": "拆分编辑器(&&E)",
-	"miToggleEditorLayout": "切换编辑器组布局(&&L)",
-	"miToggleSidebar": "切换侧边栏(&&T)",
-	"miMoveSidebarRight": "向右移动侧边栏(&&M)",
-	"miMoveSidebarLeft": "向左移动侧边栏(&&M)",
-	"miTogglePanel": "切换面板(&&P)",
-	"miHideStatusbar": "隐藏状态栏(&&H)",
-	"miShowStatusbar": "显示状态栏(&&S)",
-	"miHideActivityBar": "隐藏活动栏(&&A)",
-	"miShowActivityBar": "显示活动栏(&&A)",
-	"miToggleWordWrap": "切换自动换行(&&W)",
-	"miToggleMinimap": "切换小地图(&&M)",
-	"miToggleRenderWhitespace": "切换呈现空格(&&R)",
-	"miToggleRenderControlCharacters": "切换控制字符(&&C)",
-	"miZoomIn": "放大(&&Z)",
-	"miZoomOut": "缩小(&&U)",
-	"miZoomReset": "重置缩放(&&R)",
-	"miBack": "后退(&&B)",
-	"miForward": "前进(&&F)",
-	"miNextEditor": "下一个编辑器(&&N)",
-	"miPreviousEditor": "上一个编辑器(&&P)",
-	"miNextEditorInGroup": "组中下一个使用过的编辑器(&&N)",
-	"miPreviousEditorInGroup": "组中上一个使用过的编辑器(&&P)",
-	"miSwitchEditor": "切换编辑器(&&E)",
-	"miFocusFirstGroup": "第一组(&&F)",
-	"miFocusSecondGroup": "第二组(&&S)",
-	"miFocusThirdGroup": "第三组(&&T)",
-	"miNextGroup": "下一组(&&N)",
-	"miPreviousGroup": "上一组(&&P)",
-	"miSwitchGroup": "切换组(&&G)",
-	"miGotoFile": "转到文件(&&F)...",
-	"miGotoSymbolInFile": "转到文件中的符号(&&S)...",
-	"miGotoSymbolInWorkspace": "转到工作区中的符号(&&W)...",
-	"miGotoDefinition": "转到定义(&&D)...",
-	"miGotoTypeDefinition": "转到类型定义(&&T)",
-	"miGotoImplementation": "转到实现(&&I)",
-	"miGotoLine": "转到行(&&L)...",
-	"miStartDebugging": "启动调试(&&S)",
-	"miStartWithoutDebugging": "非调试启动(&&W)",
-	"miStopDebugging": "停止调试(&&S)",
-	"miRestart Debugging": "重启调试(&&R)",
-	"miOpenConfigurations": "打开配置(&&C)",
-	"miAddConfiguration": "添加配置...",
-	"miStepOver": "单步跳过(&&O)",
-	"miStepInto": "单步执行(&&I)",
-	"miStepOut": "单步跳出(&&U)",
-	"miContinue": "继续(&&C)",
-	"miToggleBreakpoint": "切换断点(&&B)",
-	"miConditionalBreakpoint": "条件断点(&&C)...",
-	"miInlineBreakpoint": "内联断点(&&O)",
-	"miFunctionBreakpoint": "函数断点(&&F)...",
-	"miLogPoint": "记录点(&&L)...",
-	"miNewBreakpoint": "新建断点(&&N)",
-	"miEnableAllBreakpoints": "启用所有断点",
-	"miDisableAllBreakpoints": "禁用所有断点(&&L)",
-	"miRemoveAllBreakpoints": "删除所有断点(&&R)",
-	"miInstallAdditionalDebuggers": "安装其他调试器(&&I)...",
-	"mMinimize": "最小化",
-	"mZoom": "缩放",
-	"mBringToFront": "全部置于顶层",
-	"miSwitchWindow": "切换窗口(&&W)...",
-	"mShowPreviousTab": "显示上一个选项卡",
-	"mShowNextTab": "显示下一个选项卡",
-	"mMoveTabToNewWindow": "移动标签页到新窗口",
-	"mMergeAllWindows": "合并所有窗口",
-	"miToggleDevTools": "切换开发人员工具(&&T)",
-	"miAccessibilityOptions": "辅助功能选项(&&O)",
-	"miOpenProcessExplorerer": "打开进程管理器(&&P)",
-	"miReportIssue": "使用英文报告问题(&&I)",
-	"miWelcome": "欢迎使用(&&W)",
-	"miInteractivePlayground": "交互式演练场(&&I)",
-	"miDocumentation": "文档(&&D)",
-	"miReleaseNotes": "发行说明(&&R)",
-	"miKeyboardShortcuts": "快捷键参考(&&K)",
-	"miIntroductoryVideos": "介绍性视频(&&V)",
-	"miTipsAndTricks": "提示与技巧(&&T)",
-	"miTwitter": "在 Twitter 上加入我们(&&J)",
-	"miUserVoice": "搜索功能请求(&&S)",
-	"miLicense": "查看许可证(&&L)",
-	"miPrivacyStatement": "隐私声明(&&P)",
-	"miAbout": "关于(&&A)",
-	"miRunTask": "运行任务(&&R)...",
-	"miBuildTask": "运行生成任务(&&B)...",
-	"miRunningTask": "显示正在运行的任务(&&G)...",
-	"miRestartTask": "重启正在运行的任务(&&E)...",
-	"miTerminateTask": "终止任务(&&T)...",
-	"miConfigureTask": "配置任务(&&C)...",
-	"miConfigureBuildTask": "配置默认生成任务(&&F)...",
-	"accessibilityOptionsWindowTitle": "辅助功能选项",
-	"miCheckForUpdates": "检查更新...",
-	"miCheckingForUpdates": "正在检查更新...",
-	"miDownloadUpdate": "下载可用更新",
-	"miDownloadingUpdate": "正在下载更新...",
-	"miInstallUpdate": "安装更新...",
-	"miInstallingUpdate": "正在安装更新...",
-	"miRestartToUpdate": "重启以更新..."
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/code/electron-main/window.i18n.json b/i18n/chs/src/vs/code/electron-main/window.i18n.json
deleted file mode 100644
index 2311f762898..00000000000
--- a/i18n/chs/src/vs/code/electron-main/window.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hiddenMenuBar": "你仍可以通过 Alt 键访问菜单栏。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/code/electron-main/windows.i18n.json b/i18n/chs/src/vs/code/electron-main/windows.i18n.json
deleted file mode 100644
index b2eae61077b..00000000000
--- a/i18n/chs/src/vs/code/electron-main/windows.i18n.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"ok": "确定",
-	"pathNotExistTitle": "路径不存在",
-	"pathNotExistDetail": "磁盘上似乎不再存在路径“{0}”。",
-	"reopen": "重新打开(&&R)",
-	"wait": "继续等待(&&K)",
-	"close": "关闭(&&C)",
-	"appStalled": "窗口不再响应",
-	"appStalledDetail": "你可以重新打开或关闭窗口，或者保持等待。",
-	"appCrashed": "窗口出现故障",
-	"appCrashedDetail": "我们对此引起的不便表示抱歉! 请重启该窗口从上次停止的位置继续。",
-	"open": "打开",
-	"openFolder": "打开文件夹",
-	"openFile": "打开文件",
-	"workspaceOpenedMessage": "无法保存工作区“{0}”",
-	"workspaceOpenedDetail": "已在另一个窗口打开工作区。请先关闭该窗口，然后重试。",
-	"openWorkspace": "打开(&&O)...",
-	"openWorkspaceTitle": "打开工作区",
-	"save": "保存(&&S)",
-	"doNotSave": "不保存(&&N)",
-	"cancel": "取消",
-	"saveWorkspaceMessage": "你是否要将你的工作区配置保存为文件？",
-	"saveWorkspaceDetail": "若要再次打开此工作区，请先保存。",
-	"saveWorkspace": "保存工作区"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/code/node/cliProcessMain.i18n.json b/i18n/chs/src/vs/code/node/cliProcessMain.i18n.json
deleted file mode 100644
index 315b275c12b..00000000000
--- a/i18n/chs/src/vs/code/node/cliProcessMain.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"notFound": "找不到扩展“{0}”。",
-	"notInstalled": "未安装扩展“{0}”。",
-	"useId": "确保使用完整扩展 ID，包括发布服务器，如: {0}",
-	"successVsixInstall": "已成功安装扩展“{0}”!",
-	"cancelVsixInstall": "已取消安装扩展“{0}”。",
-	"alreadyInstalled": "已安装扩展“{0}”。",
-	"foundExtension": "在商店中找到了“{0}”。",
-	"installing": "正在安装...",
-	"successInstall": "已成功安装扩展“{0}” v{1}!",
-	"uninstalling": "正在卸载 {0}...",
-	"successUninstall": "已成功卸载扩展“{0}”!"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/editor/browser/services/bulkEdit.i18n.json b/i18n/chs/src/vs/editor/browser/services/bulkEdit.i18n.json
deleted file mode 100644
index 25c58451792..00000000000
--- a/i18n/chs/src/vs/editor/browser/services/bulkEdit.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"summary.0": "未做编辑",
-	"summary.nm": "在 {1} 个文件中进行了 {0} 次编辑",
-	"summary.n0": "在 1 个文件中进行了 {0} 次编辑",
-	"conflict": "这些文件也已同时更改: {0}"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/editor/browser/widget/codeEditorWidget.i18n.json b/i18n/chs/src/vs/editor/browser/widget/codeEditorWidget.i18n.json
deleted file mode 100644
index c66c25ea99c..00000000000
--- a/i18n/chs/src/vs/editor/browser/widget/codeEditorWidget.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"cursors.maximum": "光标数量被限制为 {0}。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/editor/browser/widget/diffEditorWidget.i18n.json b/i18n/chs/src/vs/editor/browser/widget/diffEditorWidget.i18n.json
deleted file mode 100644
index 27868d57db3..00000000000
--- a/i18n/chs/src/vs/editor/browser/widget/diffEditorWidget.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"diff.tooLarge": "文件过大，无法比较。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/editor/browser/widget/diffReview.i18n.json b/i18n/chs/src/vs/editor/browser/widget/diffReview.i18n.json
deleted file mode 100644
index 7fb45c01a5b..00000000000
--- a/i18n/chs/src/vs/editor/browser/widget/diffReview.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"label.close": "关闭",
-	"no_lines": "无内容",
-	"one_line": "1 行",
-	"more_lines": "{0} 行",
-	"header": "差异 {0}，总共 {1}: 原始，{2}，{3}；改后，{4}，{5}",
-	"blankLine": "空白",
-	"equalLine": "未修改 {0}，已修改 {1}: {2}",
-	"insertLine": "+ 已修改 {0}: {1}",
-	"deleteLine": "- 未修改 {0}: {1} ",
-	"editor.action.diffReview.next": "转至下一个差异",
-	"editor.action.diffReview.prev": "转至上一个差异"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/editor/common/commonCodeEditor.i18n.json b/i18n/chs/src/vs/editor/common/commonCodeEditor.i18n.json
deleted file mode 100644
index c66c25ea99c..00000000000
--- a/i18n/chs/src/vs/editor/common/commonCodeEditor.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"cursors.maximum": "光标数量被限制为 {0}。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/editor/common/config/commonEditorConfig.i18n.json b/i18n/chs/src/vs/editor/common/config/commonEditorConfig.i18n.json
deleted file mode 100644
index e4c993e2df8..00000000000
--- a/i18n/chs/src/vs/editor/common/config/commonEditorConfig.i18n.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"editorConfigurationTitle": "编辑器",
-	"fontFamily": "控制字体系列。",
-	"fontWeight": "控制字体粗细。",
-	"fontSize": "以像素为单位控制字号。",
-	"lineHeight": "控制行高。使用 0 通过字号计算行高。",
-	"letterSpacing": "以像素为单位控制字符间距。",
-	"lineNumbers.off": "不显示行号。",
-	"lineNumbers.on": "将行号显示为绝对行数。",
-	"lineNumbers.relative": "将行号显示为与光标相隔的行数。",
-	"lineNumbers.interval": "每 10 行显示一次行号。",
-	"lineNumbers": "控制行号的显示。",
-	"rulers": "在一定数量的等宽字符后显示垂直标尺。输入多个值，显示多个标尺。若数组为空，则不绘制标尺。",
-	"wordSeparators": "执行文字相关的导航或操作时将用作文字分隔符的字符",
-	"tabSize": "一个制表符等于的空格数。该设置在 \"editor.detectIndentation\" 启用时根据文件内容可能会被覆盖。",
-	"tabSize.errorMessage": "应为“number”。注意，值“auto”已由“editor.detectIndentation”设置替换。",
-	"insertSpaces": "按 Tab 键时插入空格。该设置在 \"editor.detectIndentation\" 启用时根据文件内容可能会被覆盖。",
-	"insertSpaces.errorMessage": "应为 \"boolean\"。注意，值 \"auto\" 已由 \"editor.detectIndentation\" 设置替换。",
-	"detectIndentation": "当打开文件时，将基于文件内容检测 \"editor.tabSize\" 和 \"editor.insertSpaces\"。",
-	"roundedSelection": "控制选取范围是否有圆角",
-	"scrollBeyondLastLine": "控制编辑器是否可以滚动到最后一行之后",
-	"scrollBeyondLastColumn": "控制编辑器水平滚动时可以超出滚动的字符数",
-	"smoothScrolling": "控制编辑器是否在滚动时使用动画",
-	"minimap.enabled": "控制是否显示 minimap",
-	"minimap.side": "控制在哪一侧显示小地图。",
-	"minimap.showSlider": "控制是否自动隐藏小地图滑块。",
-	"minimap.renderCharacters": "呈现某行上的实际字符(与颜色块相反)",
-	"minimap.maxColumn": "限制最小映射的宽度，尽量多地呈现特定数量的列",
-	"find.seedSearchStringFromSelection": "控制是否将编辑器的选中内容作为搜索词填入到查找组件",
-	"find.autoFindInSelection": "控制当编辑器中选中多个字符或多行文字时是否开启“在选定内容中查找”选项 ",
-	"find.globalFindClipboard": "控制“查找”小组件是否读取或修改 macOS 的共享查找剪贴板",
-	"wordWrap.off": "永不换行。",
-	"wordWrap.on": "将在视区宽度处换行。",
-	"wordWrap.wordWrapColumn": "将在 \"editor.wordWrapColumn\" 处换行。",
-	"wordWrap.bounded": "将在最小视区和 \"editor.wordWrapColumn\" 处换行。",
-	"wordWrap": "控制折行方式。可以选择:\n - \"off\" (禁用折行)，\n - \"on\" (根据视区宽度折行)，\n - \"wordWrapColumn\" (在 \"editor.wordWrapColumn\" 处换行)\n - \"bounded\" (在视区宽度和 \"editor.wordWrapColumn\" 两者的较小者处换行)。",
-	"wordWrapColumn": "在 \"editor.wordWrap\" 为 \"wordWrapColumn\" 或 \"bounded\" 时控制编辑器列的换行。",
-	"wrappingIndent": "控制折行的缩进。可为 \"none\"、\"same\" 或 \"indent\" 或 \"deepIndent\"。",
-	"mouseWheelScrollSensitivity": "要对鼠标滚轮滚动事件的 \"deltaX\" 和 \"deltaY\" 使用的乘数 ",
-	"multiCursorModifier.ctrlCmd": "映射为 \"Ctrl\" (Windows 和 Linux) 或 \"Command\" (macOS)",
-	"multiCursorModifier.alt": "映射为 \"Alt\" (Windows 和 Linux) 或 \"Option\" (macOS)",
-	"multiCursorModifier": "在通过鼠标添加多个光标时使用的修改键。\"ctrlCmd\" 会映射为 \"Ctrl\" (Windows 和 Linux) 或 \"Command\" (macOS)。“转到定义”和“打开链接”功能所需的鼠标动作将会相应调整，不与多光标修改键冲突。",
-	"multiCursorMergeOverlapping": "当多个光标重叠时进行合并。",
-	"quickSuggestions.strings": "在字符串内启用快速建议。",
-	"quickSuggestions.comments": "在注释内启用快速建议。",
-	"quickSuggestions.other": "在字符串和注释外启用快速建议。",
-	"quickSuggestions": "控制键入时是否应自动显示建议",
-	"quickSuggestionsDelay": "控制延迟多少毫秒后将显示快速建议",
-	"parameterHints": "启用在输入时显示含有参数文档和类型信息的小面板",
-	"autoClosingBrackets": "控制编辑器是否应该在左括号后自动插入右括号",
-	"formatOnType": "控制编辑器是否应在键入后自动设置行的格式",
-	"formatOnPaste": "控制编辑器是否应自动设置粘贴内容的格式。格式化程序必须可用并且能设置文档中某一范围的格式。",
-	"autoIndent": "控制编辑器是否在用户键入、粘贴或移动行时自动调整缩进。语言的缩进规则必须可用。",
-	"suggestOnTriggerCharacters": "控制键入触发器字符时是否应自动显示建议",
-	"acceptSuggestionOnEnter": "控制按下 \"Enter\" 键是否像 \"Tab\" 键一样接受建议。这能减少“插入新行”和“接受建议”命令之间的歧义。若此项的值为 \"smart\"，则仅在文字改变时，\"Enter\" 键才能接受建议",
-	"acceptSuggestionOnCommitCharacter": "控制是否应在遇到提交字符时接受建议。例如，在 JavaScript 中，分号(\";\")可以为提交字符，可接受建议并键入该字符。",
-	"snippetSuggestions.top": "在其他建议上方显示代码片段建议。",
-	"snippetSuggestions.bottom": "在其他建议下方显示代码片段建议。",
-	"snippetSuggestions.inline": "在其他建议中穿插显示代码片段建议。",
-	"snippetSuggestions.none": "不显示代码片段建议。",
-	"snippetSuggestions": "控制是否将代码段与其他建议一起显示以及它们的排序方式。",
-	"emptySelectionClipboard": "控制没有选择内容的复制是否复制当前行。",
-	"wordBasedSuggestions": "控制是否根据文档中的文字计算自动完成列表。",
-	"suggestSelection.first": "始终选择第一个建议。",
-	"suggestSelection.recentlyUsed": "选择最近的建议，除非进一步键入选择其他。例如 \"console. -> console.log\"，因为最近补全过 'log' 。",
-	"suggestSelection.recentlyUsedByPrefix": "根据之前补全过建议的前缀选择建议。例如，\"co -> console\"、\"con -> const\"。",
-	"suggestSelection": "控制在建议列表中如何预先选择建议。",
-	"suggestFontSize": "建议小组件的字号",
-	"suggestLineHeight": "建议小组件的行高",
-	"selectionHighlight": "控制编辑器是否应突出显示选项的近似匹配",
-	"occurrencesHighlight": "控制编辑器是否应该突出显示语义符号次数",
-	"overviewRulerLanes": "控制可在概述标尺同一位置显示的效果数量",
-	"overviewRulerBorder": "控制概述标尺周围是否要绘制边框。",
-	"cursorBlinking": "控制光标的动画样式。",
-	"mouseWheelZoom": "按住 Ctrl 键并滚动鼠标滚轮可缩放编辑器字体大小",
-	"cursorStyle": "控制光标样式，接受的值为 \"block\"、\"block-outline\"、\"line\"、\"line-thin\" 、\"underline\" 和 \"underline-thin\"",
-	"cursorWidth": "当 editor.cursorStyle 设置为 \"line\" 时控制光标的宽度。",
-	"fontLigatures": "启用字体连字",
-	"hideCursorInOverviewRuler": "控制光标是否应隐藏在概述标尺中。",
-	"renderWhitespace": "控制编辑器在空白字符上显示特殊符号的方式。可选值为 \"none\"(无)、\"boundary\"(边界) 或 \"all\"(所有)。选择 \"boundary\" 选项，则不会在单词之间的单个空格上显示特殊符号。",
-	"renderControlCharacters": "控制编辑器是否应呈现控制字符",
-	"renderIndentGuides": "控制编辑器是否应呈现缩进参考线",
-	"renderLineHighlight": "控制编辑器应如何呈现当前行突出显示，可能为“无”、“装订线”、“线”和“全部”。",
-	"codeLens": "控制是否在编辑器中显示 CodeLens",
-	"folding": "控制编辑器是否启用代码折叠功能",
-	"foldingStrategyAuto": "若语言特定的折叠策略可用，将直接使用；否则，将回退到基于缩进的折叠策略。",
-	"foldingStrategyIndentation": "始终使用基于缩进的折叠策略",
-	"foldingStrategy": "控制折叠范围的计算方式。\"auto\" 将使用语言特定的折叠策略 (若可用)。\"indentation\" 将强制使用基于缩进的折叠策略。",
-	"showFoldingControls": "控制是否自动隐藏导航线上的折叠控件。",
-	"matchBrackets": "当选择其中一项时，将突出显示匹配的括号。",
-	"glyphMargin": "控制编辑器是否应呈现垂直字形边距。字形边距最常用于调试。",
-	"useTabStops": "在制表位后插入和删除空格",
-	"trimAutoWhitespace": "删除尾随自动插入的空格",
-	"stablePeek": "即使在双击编辑器内容或按 Esc 键时，也要保持速览编辑器的打开状态。",
-	"dragAndDrop": "控制编辑器是否应该允许通过拖放移动所选项。",
-	"accessibilitySupport.auto": "编辑器将使用平台 API 以检测是否附加了屏幕阅读器。",
-	"accessibilitySupport.on": "编辑器将对屏幕阅读器的使用进行永久优化。",
-	"accessibilitySupport.off": "编辑器将不再对屏幕阅读器的使用进行优化。",
-	"accessibilitySupport": "控制编辑器是否应运行在对屏幕阅读器进行优化的模式。",
-	"links": "控制编辑器是否应检测链接并使它们可被点击",
-	"colorDecorators": "控制编辑器是否显示内联颜色修饰器和颜色选取器。",
-	"codeActions": "启用代码操作小灯泡提示",
-	"codeActionsOnSave.organizeImports": "是否在保存时整理 import 语句?",
-	"codeActionsOnSave": "在保存时运行的代码操作类型。",
-	"codeActionsOnSaveTimeout": "在保存时运行的代码操作的超时时间。",
-	"selectionClipboard": "控制是否支持 Linux 主剪贴板。",
-	"sideBySide": "控制 Diff 编辑器以并排或内联形式显示差异",
-	"ignoreTrimWhitespace": "控制差异编辑器是否将对前导空格或尾随空格的更改显示为差异",
-	"largeFileOptimizations": "对大型文件进行特殊处理，禁用某些内存密集型功能。",
-	"renderIndicators": "控制差异编辑器是否为已添加/删除的更改显示 +/- 指示符号"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/editor/common/config/defaultConfig.i18n.json b/i18n/chs/src/vs/editor/common/config/defaultConfig.i18n.json
deleted file mode 100644
index 9d5691d3e42..00000000000
--- a/i18n/chs/src/vs/editor/common/config/defaultConfig.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"editorViewAccessibleLabel": "编辑器内容"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/editor/common/config/editorOptions.i18n.json b/i18n/chs/src/vs/editor/common/config/editorOptions.i18n.json
deleted file mode 100644
index ef808e76a7c..00000000000
--- a/i18n/chs/src/vs/editor/common/config/editorOptions.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"accessibilityOffAriaLabel": "现在无法访问编辑器。按 Alt+F1  显示选项。",
-	"editorViewAccessibleLabel": "编辑器内容"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/editor/common/controller/cursor.i18n.json b/i18n/chs/src/vs/editor/common/controller/cursor.i18n.json
deleted file mode 100644
index 95498535e48..00000000000
--- a/i18n/chs/src/vs/editor/common/controller/cursor.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"corrupt.commands": "执行命令时出现意外异常。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/editor/common/model/textModelWithTokens.i18n.json b/i18n/chs/src/vs/editor/common/model/textModelWithTokens.i18n.json
deleted file mode 100644
index 78434c3bc46..00000000000
--- a/i18n/chs/src/vs/editor/common/model/textModelWithTokens.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"mode.tokenizationSupportFailed": "标记输入时模式失败。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/editor/common/modes/modesRegistry.i18n.json b/i18n/chs/src/vs/editor/common/modes/modesRegistry.i18n.json
deleted file mode 100644
index 000771926dd..00000000000
--- a/i18n/chs/src/vs/editor/common/modes/modesRegistry.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"plainText.alias": "纯文本"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/editor/common/services/bulkEdit.i18n.json b/i18n/chs/src/vs/editor/common/services/bulkEdit.i18n.json
deleted file mode 100644
index 2b957467d14..00000000000
--- a/i18n/chs/src/vs/editor/common/services/bulkEdit.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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}",
-	"summary.0": "未做编辑",
-	"summary.nm": "在 {1} 个文件中进行了 {0} 次编辑",
-	"summary.n0": "在 1 个文件中进行了 {0} 次编辑"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/editor/common/services/modeServiceImpl.i18n.json b/i18n/chs/src/vs/editor/common/services/modeServiceImpl.i18n.json
deleted file mode 100644
index 98ea77da7b5..00000000000
--- a/i18n/chs/src/vs/editor/common/services/modeServiceImpl.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"vscode.extension.contributes.languages": "有助于语言声明。",
-	"vscode.extension.contributes.languages.id": "语言 ID。",
-	"vscode.extension.contributes.languages.aliases": "语言的别名。",
-	"vscode.extension.contributes.languages.extensions": "与语言关联的文件扩展名。",
-	"vscode.extension.contributes.languages.filenames": "与语言关联的文件名。",
-	"vscode.extension.contributes.languages.filenamePatterns": "与语言关联的文件名 glob 模式。",
-	"vscode.extension.contributes.languages.mimetypes": "与语言关联的 Mime 类型。",
-	"vscode.extension.contributes.languages.firstLine": "与语言文件的第一行匹配的正则表达式。",
-	"vscode.extension.contributes.languages.configuration": "包含语言配置选项的文件的相对路径。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/editor/common/services/modelServiceImpl.i18n.json b/i18n/chs/src/vs/editor/common/services/modelServiceImpl.i18n.json
deleted file mode 100644
index e12a9398484..00000000000
--- a/i18n/chs/src/vs/editor/common/services/modelServiceImpl.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"diagAndSourceMultiline": "[{0}]\n{1}",
-	"diagAndSource": "[{0}] {1}"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/editor/common/view/editorColorRegistry.i18n.json b/i18n/chs/src/vs/editor/common/view/editorColorRegistry.i18n.json
deleted file mode 100644
index 264f0668a4d..00000000000
--- a/i18n/chs/src/vs/editor/common/view/editorColorRegistry.i18n.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"lineHighlight": "光标所在行高亮内容的背景颜色。",
-	"lineHighlightBorderBox": "光标所在行四周边框的背景颜色。",
-	"rangeHighlight": "高亮范围的背景色，像是由 \"Quick Open\" 和“查找”功能高亮的范围。颜色必须透明，使其不会挡住下方的其他元素。",
-	"rangeHighlightBorder": "高亮区域边框的背景颜色。",
-	"caret": "编辑器光标颜色。",
-	"editorCursorBackground": "编辑器光标的背景色。可以自定义块型光标覆盖字符的颜色。",
-	"editorWhitespaces": "编辑器中空白字符的颜色。",
-	"editorIndentGuides": "编辑器缩进参考线的颜色。",
-	"editorActiveIndentGuide": "编辑器活动缩进参考线的颜色。",
-	"editorLineNumbers": "编辑器行号的颜色。",
-	"editorActiveLineNumber": "编辑器活动行号的颜色",
-	"deprecatedEditorActiveLineNumber": "\"Id\" 已被弃用，请改用 \"editorLineNumber.activeForeground\"。",
-	"editorRuler": "编辑器标尺的颜色。",
-	"editorCodeLensForeground": "编辑器 CodeLens 的前景色",
-	"editorBracketMatchBackground": "匹配括号的背景色",
-	"editorBracketMatchBorder": "匹配括号外框的颜色",
-	"editorOverviewRulerBorder": "概览标尺边框的颜色。",
-	"editorGutter": "编辑器导航线的背景色。导航线包括边缘符号和行号。",
-	"errorForeground": "编辑器中错误波浪线的前景色。",
-	"errorBorder": "编辑器中错误波浪线的边框颜色。",
-	"warningForeground": "编辑器中警告波浪线的前景色。",
-	"warningBorder": "编辑器中警告波浪线的边框颜色。",
-	"infoForeground": "编辑器中信息波浪线的前景色。",
-	"infoBorder": "编辑器中信息波浪线的边框颜色。",
-	"hintForeground": "编辑器中提示波浪线的前景色。",
-	"hintBorder": "编辑器中提示波浪线的边框颜色。",
-	"unnecessaryForeground": "编辑器中不必要代码的前景色。",
-	"overviewRulerRangeHighlight": "概览标尺中高亮范围的标记颜色。颜色必须透明，使其不会挡住下方的其他元素。",
-	"overviewRuleError": "概述错误的标尺标记颜色。",
-	"overviewRuleWarning": "概述警告的标尺标记颜色。",
-	"overviewRuleInfo": "概述信息的标尺标记颜色。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/editor/contrib/accessibility/browser/accessibility.i18n.json b/i18n/chs/src/vs/editor/contrib/accessibility/browser/accessibility.i18n.json
deleted file mode 100644
index 94299c46f7b..00000000000
--- a/i18n/chs/src/vs/editor/contrib/accessibility/browser/accessibility.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"introMsg": "感谢试用 VS Code 的辅助功能选项。",
-	"status": "状态:",
-	"tabFocusModeOnMsg": "在当前编辑器中按 Tab 会将焦点移动到下一个可聚焦的元素。按 {0} 来切换此行为。",
-	"tabFocusModeOnMsgNoKb": "在当前编辑器中按 Tab 会将焦点移动到下一个可聚焦的元素。当前无法通过键绑定触发命令 {0}。",
-	"tabFocusModeOffMsg": "在当前编辑器中按 Tab 将插入制表符。按 {0} 来切换此行为。",
-	"tabFocusModeOffMsgNoKb": "在当前编辑器中按 Tab 会插入制表符。当前无法通过键绑定触发命令 {0}。",
-	"outroMsg": "你可以按 Esc 键来消除此提示并返回到编辑器。",
-	"ShowAccessibilityHelpAction": "显示辅助功能帮助"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/editor/contrib/bracketMatching/bracketMatching.i18n.json b/i18n/chs/src/vs/editor/contrib/bracketMatching/bracketMatching.i18n.json
deleted file mode 100644
index 616ef02d88c..00000000000
--- a/i18n/chs/src/vs/editor/contrib/bracketMatching/bracketMatching.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"overviewRulerBracketMatchForeground": "概览标尺上表示匹配括号的标记颜色。",
-	"smartSelect.jumpBracket": "转到括号",
-	"smartSelect.selectToBracket": "选择括号所有内容"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/editor/contrib/bracketMatching/common/bracketMatching.i18n.json b/i18n/chs/src/vs/editor/contrib/bracketMatching/common/bracketMatching.i18n.json
deleted file mode 100644
index e6089cc95a1..00000000000
--- a/i18n/chs/src/vs/editor/contrib/bracketMatching/common/bracketMatching.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"smartSelect.jumpBracket": "转到括号"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/editor/contrib/caretOperations/caretOperations.i18n.json b/i18n/chs/src/vs/editor/contrib/caretOperations/caretOperations.i18n.json
deleted file mode 100644
index a826ac8c15c..00000000000
--- a/i18n/chs/src/vs/editor/contrib/caretOperations/caretOperations.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"caret.moveLeft": "将插入点左移",
-	"caret.moveRight": "将插入点右移"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/editor/contrib/caretOperations/common/caretOperations.i18n.json b/i18n/chs/src/vs/editor/contrib/caretOperations/common/caretOperations.i18n.json
deleted file mode 100644
index 3e762317766..00000000000
--- a/i18n/chs/src/vs/editor/contrib/caretOperations/common/caretOperations.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"caret.moveLeft": "将插入点左移",
-	"caret.moveRight": "将插入点右移"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/editor/contrib/caretOperations/common/transpose.i18n.json b/i18n/chs/src/vs/editor/contrib/caretOperations/common/transpose.i18n.json
deleted file mode 100644
index 93fd558794e..00000000000
--- a/i18n/chs/src/vs/editor/contrib/caretOperations/common/transpose.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"transposeLetters.label": "转置字母"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/editor/contrib/caretOperations/transpose.i18n.json b/i18n/chs/src/vs/editor/contrib/caretOperations/transpose.i18n.json
deleted file mode 100644
index 5a5a880ac2c..00000000000
--- a/i18n/chs/src/vs/editor/contrib/caretOperations/transpose.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"transposeLetters.label": "转置字母"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/editor/contrib/clipboard/browser/clipboard.i18n.json b/i18n/chs/src/vs/editor/contrib/clipboard/browser/clipboard.i18n.json
deleted file mode 100644
index 08e6a1cc3ec..00000000000
--- a/i18n/chs/src/vs/editor/contrib/clipboard/browser/clipboard.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"actions.clipboard.cutLabel": "剪切",
-	"actions.clipboard.copyLabel": "复制",
-	"actions.clipboard.pasteLabel": "粘贴",
-	"actions.clipboard.copyWithSyntaxHighlightingLabel": "复制并突出显示语法"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/editor/contrib/clipboard/clipboard.i18n.json b/i18n/chs/src/vs/editor/contrib/clipboard/clipboard.i18n.json
deleted file mode 100644
index 5136869ddbf..00000000000
--- a/i18n/chs/src/vs/editor/contrib/clipboard/clipboard.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"actions.clipboard.cutLabel": "剪切",
-	"actions.clipboard.copyLabel": "复制",
-	"actions.clipboard.pasteLabel": "粘贴",
-	"actions.clipboard.copyWithSyntaxHighlightingLabel": "复制并突出显示语法"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/editor/contrib/codeAction/codeActionCommands.i18n.json b/i18n/chs/src/vs/editor/contrib/codeAction/codeActionCommands.i18n.json
deleted file mode 100644
index d034836e1c7..00000000000
--- a/i18n/chs/src/vs/editor/contrib/codeAction/codeActionCommands.i18n.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"quickFixWithKb": "显示修补程序({0})",
-	"quickFix": "显示修补程序",
-	"quickfix.trigger.label": "快速修复...",
-	"editor.action.quickFix.noneMessage": "没有可用的代码操作",
-	"refactor.label": "重构...",
-	"editor.action.refactor.noneMessage": "没有可用的重构操作",
-	"source.label": "源代码操作...",
-	"editor.action.source.noneMessage": "没有可用的源代码操作",
-	"organizeImports.label": "整理 import 语句",
-	"editor.action.organize.noneMessage": "没有可用的整理 import 语句操作"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/editor/contrib/comment/comment.i18n.json b/i18n/chs/src/vs/editor/contrib/comment/comment.i18n.json
deleted file mode 100644
index a6c7bab3142..00000000000
--- a/i18n/chs/src/vs/editor/contrib/comment/comment.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"comment.line": "切换行注释",
-	"comment.line.add": "添加行注释",
-	"comment.line.remove": "删除行注释",
-	"comment.block": "切换块注释"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/editor/contrib/comment/common/comment.i18n.json b/i18n/chs/src/vs/editor/contrib/comment/common/comment.i18n.json
deleted file mode 100644
index 34ee8916cd6..00000000000
--- a/i18n/chs/src/vs/editor/contrib/comment/common/comment.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"comment.line": "切换行注释",
-	"comment.line.add": "添加行注释",
-	"comment.line.remove": "删除行注释",
-	"comment.block": "切换块注释"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/editor/contrib/contextmenu/browser/contextmenu.i18n.json b/i18n/chs/src/vs/editor/contrib/contextmenu/browser/contextmenu.i18n.json
deleted file mode 100644
index 73baa574779..00000000000
--- a/i18n/chs/src/vs/editor/contrib/contextmenu/browser/contextmenu.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"action.showContextMenu.label": "显示编辑器上下文菜单"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/editor/contrib/contextmenu/contextmenu.i18n.json b/i18n/chs/src/vs/editor/contrib/contextmenu/contextmenu.i18n.json
deleted file mode 100644
index 010f0c49d56..00000000000
--- a/i18n/chs/src/vs/editor/contrib/contextmenu/contextmenu.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"action.showContextMenu.label": "显示编辑器上下文菜单"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/editor/contrib/find/browser/findWidget.i18n.json b/i18n/chs/src/vs/editor/contrib/find/browser/findWidget.i18n.json
deleted file mode 100644
index 9f9c20bbce2..00000000000
--- a/i18n/chs/src/vs/editor/contrib/find/browser/findWidget.i18n.json
+++ /dev/null
@@ -1,21 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"label.find": "查找",
-	"placeholder.find": "查找",
-	"label.previousMatchButton": "上一个匹配",
-	"label.nextMatchButton": "下一个匹配",
-	"label.toggleSelectionFind": "在选定内容中查找",
-	"label.closeButton": "关闭",
-	"label.replace": "替换",
-	"placeholder.replace": "替换",
-	"label.replaceButton": "替换",
-	"label.replaceAllButton": "全部替换",
-	"label.toggleReplaceButton": "切换替换模式",
-	"title.matchesCountLimit": "仅高亮了前 {0} 个结果，但所有查找操作均针对全文。",
-	"label.matchesLocation": "第 {0} 个(共 {1} 个)",
-	"label.noResults": "无结果"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/editor/contrib/find/browser/simpleFindWidget.i18n.json b/i18n/chs/src/vs/editor/contrib/find/browser/simpleFindWidget.i18n.json
deleted file mode 100644
index d650d2c5ce6..00000000000
--- a/i18n/chs/src/vs/editor/contrib/find/browser/simpleFindWidget.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"label.find": "查找",
-	"placeholder.find": "查找",
-	"label.previousMatchButton": "上一个匹配",
-	"label.nextMatchButton": "下一个匹配",
-	"label.closeButton": "关闭"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/editor/contrib/find/common/findController.i18n.json b/i18n/chs/src/vs/editor/contrib/find/common/findController.i18n.json
deleted file mode 100644
index 385ba32bfeb..00000000000
--- a/i18n/chs/src/vs/editor/contrib/find/common/findController.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"startFindAction": "查找",
-	"findNextMatchAction": "查找下一个",
-	"findPreviousMatchAction": "查找上一个",
-	"nextSelectionMatchFindAction": "查找下一个选择",
-	"previousSelectionMatchFindAction": "查找上一个选择",
-	"startReplace": "替换",
-	"showNextFindTermAction": "显示下一个搜索结果",
-	"showPreviousFindTermAction": "显示上一个搜索结果"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/editor/contrib/find/findController.i18n.json b/i18n/chs/src/vs/editor/contrib/find/findController.i18n.json
deleted file mode 100644
index 3d18cdf8a9e..00000000000
--- a/i18n/chs/src/vs/editor/contrib/find/findController.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"startFindAction": "查找",
-	"startFindWithSelectionAction": "查找选定内容",
-	"findNextMatchAction": "查找下一个",
-	"findPreviousMatchAction": "查找上一个",
-	"nextSelectionMatchFindAction": "查找下一个选择",
-	"previousSelectionMatchFindAction": "查找上一个选择",
-	"startReplace": "替换",
-	"showNextFindTermAction": "显示下一个搜索结果",
-	"showPreviousFindTermAction": "显示上一个搜索结果"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/editor/contrib/find/findWidget.i18n.json b/i18n/chs/src/vs/editor/contrib/find/findWidget.i18n.json
deleted file mode 100644
index 11f63183173..00000000000
--- a/i18n/chs/src/vs/editor/contrib/find/findWidget.i18n.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"label.find": "查找",
-	"placeholder.find": "查找",
-	"label.previousMatchButton": "上一个匹配",
-	"label.nextMatchButton": "下一个匹配",
-	"label.toggleSelectionFind": "在选定内容中查找",
-	"label.closeButton": "关闭",
-	"label.replace": "替换",
-	"placeholder.replace": "替换",
-	"label.replaceButton": "替换",
-	"label.replaceAllButton": "全部替换",
-	"label.toggleReplaceButton": "切换替换模式",
-	"title.matchesCountLimit": "仅高亮了前 {0} 个结果，但所有查找操作均针对全文。",
-	"label.matchesLocation": "{0} / {1}",
-	"label.noResults": "无结果"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/editor/contrib/find/simpleFindWidget.i18n.json b/i18n/chs/src/vs/editor/contrib/find/simpleFindWidget.i18n.json
deleted file mode 100644
index 0672329d3bc..00000000000
--- a/i18n/chs/src/vs/editor/contrib/find/simpleFindWidget.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"label.find": "查找",
-	"placeholder.find": "查找",
-	"label.previousMatchButton": "上一个匹配",
-	"label.nextMatchButton": "下一个匹配",
-	"label.closeButton": "关闭"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/editor/contrib/folding/browser/folding.i18n.json b/i18n/chs/src/vs/editor/contrib/folding/browser/folding.i18n.json
deleted file mode 100644
index fc7ce793f68..00000000000
--- a/i18n/chs/src/vs/editor/contrib/folding/browser/folding.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"unfoldAction.label": "展开",
-	"unFoldRecursivelyAction.label": "以递归方式展开",
-	"foldAction.label": "折叠",
-	"foldRecursivelyAction.label": "以递归方式折叠",
-	"foldAllAction.label": "全部折叠",
-	"unfoldAllAction.label": "全部展开",
-	"foldLevelAction.label": "折叠级别 {0}"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/editor/contrib/folding/folding.i18n.json b/i18n/chs/src/vs/editor/contrib/folding/folding.i18n.json
deleted file mode 100644
index 70ee3277953..00000000000
--- a/i18n/chs/src/vs/editor/contrib/folding/folding.i18n.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"unfoldAction.label": "展开",
-	"unFoldRecursivelyAction.label": "以递归方式展开",
-	"foldAction.label": "折叠",
-	"foldRecursivelyAction.label": "以递归方式折叠",
-	"foldAllBlockComments.label": "折叠所有块注释",
-	"foldAllMarkerRegions.label": "折叠所有区域",
-	"unfoldAllMarkerRegions.label": "展开所有区域",
-	"foldAllAction.label": "全部折叠",
-	"unfoldAllAction.label": "全部展开",
-	"foldLevelAction.label": "折叠级别 {0}"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/editor/contrib/fontZoom/fontZoom.i18n.json b/i18n/chs/src/vs/editor/contrib/fontZoom/fontZoom.i18n.json
deleted file mode 100644
index f38289f737e..00000000000
--- a/i18n/chs/src/vs/editor/contrib/fontZoom/fontZoom.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"EditorFontZoomIn.label": "放大编辑器字体",
-	"EditorFontZoomOut.label": "缩小编辑器字体",
-	"EditorFontZoomReset.label": "重置编辑器字体大小"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/editor/contrib/format/browser/formatActions.i18n.json b/i18n/chs/src/vs/editor/contrib/format/browser/formatActions.i18n.json
deleted file mode 100644
index 628b8cc784e..00000000000
--- a/i18n/chs/src/vs/editor/contrib/format/browser/formatActions.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"hint11": "在第 {0} 行进行了 1 次格式编辑",
-	"hintn1": "在第 {1} 行进行了 {0} 次格式编辑",
-	"hint1n": "第 {0} 行到第 {1} 行间进行了 1 次格式编辑",
-	"hintnn": "第 {1} 行到第 {2} 行间进行了 {0} 次格式编辑",
-	"no.provider": "抱歉，当前没有安装“{0}”文件的格式化程序。",
-	"formatDocument.label": "格式化文件",
-	"formatSelection.label": "格式化选定代码"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/editor/contrib/format/formatActions.i18n.json b/i18n/chs/src/vs/editor/contrib/format/formatActions.i18n.json
deleted file mode 100644
index 2c87f057c00..00000000000
--- a/i18n/chs/src/vs/editor/contrib/format/formatActions.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hint11": "在第 {0} 行进行了 1 次格式编辑",
-	"hintn1": "在第 {1} 行进行了 {0} 次格式编辑",
-	"hint1n": "第 {0} 行到第 {1} 行间进行了 1 次格式编辑",
-	"hintnn": "第 {1} 行到第 {2} 行间进行了 {0} 次格式编辑",
-	"no.provider": "当前没有安装“{0}”文件的格式化程序。",
-	"formatDocument.label": "格式化文件",
-	"no.documentprovider": "当前没有安装“{0}”文件的文档格式化程序。",
-	"formatSelection.label": "格式化选定代码",
-	"no.selectionprovider": "当前没有安装“{0}”文件的选定项格式化程序。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.i18n.json b/i18n/chs/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.i18n.json
deleted file mode 100644
index 43e19c32c0c..00000000000
--- a/i18n/chs/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.i18n.json
+++ /dev/null
@@ -1,24 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"noResultWord": "未找到“{0}”的任何定义",
-	"generic.noResults": "找不到定义",
-	"meta.title": " – {0} 定义",
-	"actions.goToDecl.label": "转到定义",
-	"actions.goToDeclToSide.label": "打开侧边的定义",
-	"actions.previewDecl.label": "查看定义",
-	"goToImplementation.noResultWord": "未找到“{0}”的实现",
-	"goToImplementation.generic.noResults": "未找到实现",
-	"meta.implementations.title": "– {0} 个实现",
-	"actions.goToImplementation.label": "转到实现",
-	"actions.peekImplementation.label": "速览实现",
-	"goToTypeDefinition.noResultWord": "未找到“{0}”的类型定义",
-	"goToTypeDefinition.generic.noResults": "未找到类型定义",
-	"meta.typeDefinitions.title": " – {0} 个类型定义",
-	"actions.goToTypeDefinition.label": "转到类型定义",
-	"actions.peekTypeDefinition.label": "快速查看类型定义",
-	"multipleResults": "单击显示 {0} 个定义。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/editor/contrib/goToDeclaration/browser/goToDeclarationCommands.i18n.json b/i18n/chs/src/vs/editor/contrib/goToDeclaration/browser/goToDeclarationCommands.i18n.json
deleted file mode 100644
index e788771d2f2..00000000000
--- a/i18n/chs/src/vs/editor/contrib/goToDeclaration/browser/goToDeclarationCommands.i18n.json
+++ /dev/null
@@ -1,23 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"noResultWord": "未找到“{0}”的任何定义",
-	"generic.noResults": "找不到定义",
-	"meta.title": " – {0} 定义",
-	"actions.goToDecl.label": "转到定义",
-	"actions.goToDeclToSide.label": "打开侧边的定义",
-	"actions.previewDecl.label": "查看定义",
-	"goToImplementation.noResultWord": "未找到“{0}”的实现",
-	"goToImplementation.generic.noResults": "未找到实现",
-	"meta.implementations.title": "– {0} 个实现",
-	"actions.goToImplementation.label": "转到实现",
-	"actions.peekImplementation.label": "速览实现",
-	"goToTypeDefinition.noResultWord": "未找到“{0}”的类型定义",
-	"goToTypeDefinition.generic.noResults": "未找到类型定义",
-	"meta.typeDefinitions.title": " – {0} 个类型定义",
-	"actions.goToTypeDefinition.label": "转到类型定义",
-	"actions.peekTypeDefinition.label": "快速查看类型定义"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/editor/contrib/goToDeclaration/browser/goToDeclarationMouse.i18n.json b/i18n/chs/src/vs/editor/contrib/goToDeclaration/browser/goToDeclarationMouse.i18n.json
deleted file mode 100644
index ab0b4761cf9..00000000000
--- a/i18n/chs/src/vs/editor/contrib/goToDeclaration/browser/goToDeclarationMouse.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"multipleResults": "单击显示 {0} 个定义。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/editor/contrib/goToDeclaration/goToDeclarationCommands.i18n.json b/i18n/chs/src/vs/editor/contrib/goToDeclaration/goToDeclarationCommands.i18n.json
deleted file mode 100644
index 6193422f957..00000000000
--- a/i18n/chs/src/vs/editor/contrib/goToDeclaration/goToDeclarationCommands.i18n.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noResultWord": "未找到“{0}”的任何定义",
-	"generic.noResults": "找不到定义",
-	"meta.title": " – {0} 定义",
-	"actions.goToDecl.label": "转到定义",
-	"actions.goToDeclToSide.label": "打开侧边的定义",
-	"actions.previewDecl.label": "速览定义",
-	"goToImplementation.noResultWord": "未找到“{0}”的实现",
-	"goToImplementation.generic.noResults": "未找到实现",
-	"meta.implementations.title": "– {0} 个实现",
-	"actions.goToImplementation.label": "转到实现",
-	"actions.peekImplementation.label": "速览实现",
-	"goToTypeDefinition.noResultWord": "未找到“{0}”的类型定义",
-	"goToTypeDefinition.generic.noResults": "未找到类型定义",
-	"meta.typeDefinitions.title": " – {0} 个类型定义",
-	"actions.goToTypeDefinition.label": "转到类型定义",
-	"actions.peekTypeDefinition.label": "速览类型定义"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/editor/contrib/goToDeclaration/goToDeclarationMouse.i18n.json b/i18n/chs/src/vs/editor/contrib/goToDeclaration/goToDeclarationMouse.i18n.json
deleted file mode 100644
index ffb98add2f9..00000000000
--- a/i18n/chs/src/vs/editor/contrib/goToDeclaration/goToDeclarationMouse.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"multipleResults": "单击显示 {0} 个定义。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/editor/contrib/goToDefinition/goToDefinitionCommands.i18n.json b/i18n/chs/src/vs/editor/contrib/goToDefinition/goToDefinitionCommands.i18n.json
deleted file mode 100644
index 6193422f957..00000000000
--- a/i18n/chs/src/vs/editor/contrib/goToDefinition/goToDefinitionCommands.i18n.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noResultWord": "未找到“{0}”的任何定义",
-	"generic.noResults": "找不到定义",
-	"meta.title": " – {0} 定义",
-	"actions.goToDecl.label": "转到定义",
-	"actions.goToDeclToSide.label": "打开侧边的定义",
-	"actions.previewDecl.label": "速览定义",
-	"goToImplementation.noResultWord": "未找到“{0}”的实现",
-	"goToImplementation.generic.noResults": "未找到实现",
-	"meta.implementations.title": "– {0} 个实现",
-	"actions.goToImplementation.label": "转到实现",
-	"actions.peekImplementation.label": "速览实现",
-	"goToTypeDefinition.noResultWord": "未找到“{0}”的类型定义",
-	"goToTypeDefinition.generic.noResults": "未找到类型定义",
-	"meta.typeDefinitions.title": " – {0} 个类型定义",
-	"actions.goToTypeDefinition.label": "转到类型定义",
-	"actions.peekTypeDefinition.label": "速览类型定义"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/editor/contrib/goToDefinition/goToDefinitionMouse.i18n.json b/i18n/chs/src/vs/editor/contrib/goToDefinition/goToDefinitionMouse.i18n.json
deleted file mode 100644
index ffb98add2f9..00000000000
--- a/i18n/chs/src/vs/editor/contrib/goToDefinition/goToDefinitionMouse.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"multipleResults": "单击显示 {0} 个定义。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/editor/contrib/gotoError/browser/gotoError.i18n.json b/i18n/chs/src/vs/editor/contrib/gotoError/browser/gotoError.i18n.json
deleted file mode 100644
index 8dc6ee58760..00000000000
--- a/i18n/chs/src/vs/editor/contrib/gotoError/browser/gotoError.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"title.wo_source": "({0}/{1})",
-	"markerAction.next.label": "转到下一个错误或警告",
-	"markerAction.previous.label": "转到上一个错误或警告",
-	"editorMarkerNavigationError": "编辑器标记导航小组件错误颜色。",
-	"editorMarkerNavigationWarning": "编辑器标记导航小组件警告颜色。",
-	"editorMarkerNavigationInfo": "编辑器标记导航小组件信息颜色。",
-	"editorMarkerNavigationBackground": "编辑器标记导航小组件背景色。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/editor/contrib/gotoError/gotoError.i18n.json b/i18n/chs/src/vs/editor/contrib/gotoError/gotoError.i18n.json
deleted file mode 100644
index 07ca5b15140..00000000000
--- a/i18n/chs/src/vs/editor/contrib/gotoError/gotoError.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"markerAction.next.label": "转到下一个问题 (错误、警告、信息)",
-	"markerAction.previous.label": "转到上一个问题 (错误、警告、信息)",
-	"markerAction.nextInFiles.label": "转到文件中的下一个问题 (错误、警告、信息)",
-	"markerAction.previousInFiles.label": "转到文件中的上一个问题 (错误、警告、信息)"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json b/i18n/chs/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json
deleted file mode 100644
index 321c1e11989..00000000000
--- a/i18n/chs/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"title.wo_source": "({0}/{1})",
-	"editorMarkerNavigationError": "编辑器标记导航小组件错误颜色。",
-	"editorMarkerNavigationWarning": "编辑器标记导航小组件警告颜色。",
-	"editorMarkerNavigationInfo": "编辑器标记导航小组件信息颜色。",
-	"editorMarkerNavigationBackground": "编辑器标记导航小组件背景色。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/editor/contrib/hover/browser/hover.i18n.json b/i18n/chs/src/vs/editor/contrib/hover/browser/hover.i18n.json
deleted file mode 100644
index 65910844481..00000000000
--- a/i18n/chs/src/vs/editor/contrib/hover/browser/hover.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"showHover": "显示悬停"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/editor/contrib/hover/browser/modesContentHover.i18n.json b/i18n/chs/src/vs/editor/contrib/hover/browser/modesContentHover.i18n.json
deleted file mode 100644
index f37c4060b5b..00000000000
--- a/i18n/chs/src/vs/editor/contrib/hover/browser/modesContentHover.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"modesContentHover.loading": "正在加载..."
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/editor/contrib/hover/hover.i18n.json b/i18n/chs/src/vs/editor/contrib/hover/hover.i18n.json
deleted file mode 100644
index c2521d4adb8..00000000000
--- a/i18n/chs/src/vs/editor/contrib/hover/hover.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"showHover": "显示悬停"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/editor/contrib/hover/modesContentHover.i18n.json b/i18n/chs/src/vs/editor/contrib/hover/modesContentHover.i18n.json
deleted file mode 100644
index 7a10f90cf3c..00000000000
--- a/i18n/chs/src/vs/editor/contrib/hover/modesContentHover.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"modesContentHover.loading": "正在加载..."
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/editor/contrib/inPlaceReplace/common/inPlaceReplace.i18n.json b/i18n/chs/src/vs/editor/contrib/inPlaceReplace/common/inPlaceReplace.i18n.json
deleted file mode 100644
index 8017b862c10..00000000000
--- a/i18n/chs/src/vs/editor/contrib/inPlaceReplace/common/inPlaceReplace.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"InPlaceReplaceAction.previous.label": "替换为上一个值",
-	"InPlaceReplaceAction.next.label": "替换为下一个值"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/editor/contrib/inPlaceReplace/inPlaceReplace.i18n.json b/i18n/chs/src/vs/editor/contrib/inPlaceReplace/inPlaceReplace.i18n.json
deleted file mode 100644
index 967bab05d6b..00000000000
--- a/i18n/chs/src/vs/editor/contrib/inPlaceReplace/inPlaceReplace.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"InPlaceReplaceAction.previous.label": "替换为上一个值",
-	"InPlaceReplaceAction.next.label": "替换为下一个值"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/editor/contrib/indentation/common/indentation.i18n.json b/i18n/chs/src/vs/editor/contrib/indentation/common/indentation.i18n.json
deleted file mode 100644
index 5bd5906da32..00000000000
--- a/i18n/chs/src/vs/editor/contrib/indentation/common/indentation.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"indentationToSpaces": "将缩进转换为空格",
-	"indentationToTabs": "将缩进转换为制表符",
-	"configuredTabSize": "已配置制表符大小",
-	"selectTabWidth": "选择当前文件的制表符大小",
-	"indentUsingTabs": "使用“Tab”缩进",
-	"indentUsingSpaces": "使用空格缩进",
-	"detectIndentation": "检查内容中的缩进",
-	"editor.reindentlines": "重新缩进行"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/editor/contrib/indentation/indentation.i18n.json b/i18n/chs/src/vs/editor/contrib/indentation/indentation.i18n.json
deleted file mode 100644
index 4d58ce1b623..00000000000
--- a/i18n/chs/src/vs/editor/contrib/indentation/indentation.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"indentationToSpaces": "将缩进转换为空格",
-	"indentationToTabs": "将缩进转换为制表符",
-	"configuredTabSize": "已配置制表符大小",
-	"selectTabWidth": "选择当前文件的制表符大小",
-	"indentUsingTabs": "使用“Tab”缩进",
-	"indentUsingSpaces": "使用空格缩进",
-	"detectIndentation": "检查内容中的缩进",
-	"editor.reindentlines": "重新缩进行",
-	"editor.reindentselectedlines": "重新缩进所选行"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/editor/contrib/inspectTMScopes/electron-browser/inspectTMScopes.i18n.json b/i18n/chs/src/vs/editor/contrib/inspectTMScopes/electron-browser/inspectTMScopes.i18n.json
deleted file mode 100644
index 69af1a1991c..00000000000
--- a/i18n/chs/src/vs/editor/contrib/inspectTMScopes/electron-browser/inspectTMScopes.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"inspectTMScopes": "开发者: 检查 TM 作用域",
-	"inspectTMScopesWidget.loading": "正在加载..."
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/editor/contrib/linesOperations/common/linesOperations.i18n.json b/i18n/chs/src/vs/editor/contrib/linesOperations/common/linesOperations.i18n.json
deleted file mode 100644
index 346d11b6706..00000000000
--- a/i18n/chs/src/vs/editor/contrib/linesOperations/common/linesOperations.i18n.json
+++ /dev/null
@@ -1,25 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"lines.copyUp": "向上复制行",
-	"lines.copyDown": "向下复制行",
-	"lines.moveUp": "向上移动行",
-	"lines.moveDown": "向下移动行",
-	"lines.sortAscending": "按升序排列行",
-	"lines.sortDescending": "按降序排列行",
-	"lines.trimTrailingWhitespace": "裁剪尾随空格",
-	"lines.delete": "删除行",
-	"lines.indent": "行缩进",
-	"lines.outdent": "行减少缩进",
-	"lines.insertBefore": "在上面插入行",
-	"lines.insertAfter": "在下面插入行",
-	"lines.deleteAllLeft": "删除左侧所有内容",
-	"lines.deleteAllRight": "删除右侧所有内容",
-	"lines.joinLines": "合并行",
-	"editor.transpose": "转置游标处的字符",
-	"editor.transformToUppercase": "转换为大写",
-	"editor.transformToLowercase": "转换为小写"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/editor/contrib/linesOperations/linesOperations.i18n.json b/i18n/chs/src/vs/editor/contrib/linesOperations/linesOperations.i18n.json
deleted file mode 100644
index bd07fd8e466..00000000000
--- a/i18n/chs/src/vs/editor/contrib/linesOperations/linesOperations.i18n.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"lines.copyUp": "向上复制行",
-	"lines.copyDown": "向下复制行",
-	"lines.moveUp": "向上移动行",
-	"lines.moveDown": "向下移动行",
-	"lines.sortAscending": "按升序排列行",
-	"lines.sortDescending": "按降序排列行",
-	"lines.trimTrailingWhitespace": "裁剪尾随空格",
-	"lines.delete": "删除行",
-	"lines.indent": "行缩进",
-	"lines.outdent": "行减少缩进",
-	"lines.insertBefore": "在上面插入行",
-	"lines.insertAfter": "在下面插入行",
-	"lines.deleteAllLeft": "删除左侧所有内容",
-	"lines.deleteAllRight": "删除右侧所有内容",
-	"lines.joinLines": "合并行",
-	"editor.transpose": "转置游标处的字符",
-	"editor.transformToUppercase": "转换为大写",
-	"editor.transformToLowercase": "转换为小写"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/editor/contrib/links/browser/links.i18n.json b/i18n/chs/src/vs/editor/contrib/links/browser/links.i18n.json
deleted file mode 100644
index c228820d8fc..00000000000
--- a/i18n/chs/src/vs/editor/contrib/links/browser/links.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"links.navigate.mac": "Cmd + 单击以跟踪链接",
-	"links.navigate": "Ctrl + 单击以跟踪链接",
-	"links.command.mac": "Cmd + 单击以执行命令",
-	"links.command": "Ctrl + 单击以执行命令",
-	"links.navigate.al": "按住 Alt 并单击可访问链接",
-	"links.command.al": "Alt + 单击以执行命令",
-	"invalid.url": "抱歉，无法打开此链接，因为其格式不正确: {0}",
-	"missing.url": "抱歉，无法打开此链接，因为其目标丢失。",
-	"label": "打开链接"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/editor/contrib/links/links.i18n.json b/i18n/chs/src/vs/editor/contrib/links/links.i18n.json
deleted file mode 100644
index 587ed84ae6a..00000000000
--- a/i18n/chs/src/vs/editor/contrib/links/links.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"links.navigate.mac": "按住 Cmd 并单击可访问链接",
-	"links.navigate": "按住 Ctrl 并单击可访问链接",
-	"links.command.mac": "Cmd + 单击以执行命令",
-	"links.command": "Ctrl + 单击以执行命令",
-	"links.navigate.al.mac": "按住 Option 并单击可访问链接",
-	"links.navigate.al": "按住 Alt 并单击可访问链接",
-	"links.command.al.mac": "按住 Option 并单击可执行命令",
-	"links.command.al": "Alt + 单击以执行命令",
-	"invalid.url": "此链接格式不正确，无法打开: {0}",
-	"missing.url": "此链接目标已丢失，无法打开。",
-	"label": "打开链接"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/editor/contrib/message/messageController.i18n.json b/i18n/chs/src/vs/editor/contrib/message/messageController.i18n.json
deleted file mode 100644
index 7f7e56c0130..00000000000
--- a/i18n/chs/src/vs/editor/contrib/message/messageController.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"editor.readonly": "无法在只读编辑器中编辑"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/editor/contrib/multicursor/common/multicursor.i18n.json b/i18n/chs/src/vs/editor/contrib/multicursor/common/multicursor.i18n.json
deleted file mode 100644
index 3c402b850dd..00000000000
--- a/i18n/chs/src/vs/editor/contrib/multicursor/common/multicursor.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"mutlicursor.insertAbove": "在上面添加光标",
-	"mutlicursor.insertBelow": "在下面添加光标",
-	"mutlicursor.insertAtEndOfEachLineSelected": "在行尾添加光标",
-	"addSelectionToNextFindMatch": "将选择添加到下一个查找匹配项",
-	"addSelectionToPreviousFindMatch": "将选择内容添加到上一查找匹配项",
-	"moveSelectionToNextFindMatch": "将上次选择移动到下一个查找匹配项",
-	"moveSelectionToPreviousFindMatch": "将上个选择内容移动到上一查找匹配项",
-	"selectAllOccurrencesOfFindMatch": "选择所有找到的查找匹配项",
-	"changeAll.label": "更改所有匹配项"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/editor/contrib/multicursor/multicursor.i18n.json b/i18n/chs/src/vs/editor/contrib/multicursor/multicursor.i18n.json
deleted file mode 100644
index bfbe414d0c0..00000000000
--- a/i18n/chs/src/vs/editor/contrib/multicursor/multicursor.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"mutlicursor.insertAbove": "在上面添加光标",
-	"mutlicursor.insertBelow": "在下面添加光标",
-	"mutlicursor.insertAtEndOfEachLineSelected": "在行尾添加光标",
-	"addSelectionToNextFindMatch": "将选择添加到下一个查找匹配项",
-	"addSelectionToPreviousFindMatch": "将选择内容添加到上一查找匹配项",
-	"moveSelectionToNextFindMatch": "将上次选择移动到下一个查找匹配项",
-	"moveSelectionToPreviousFindMatch": "将上个选择内容移动到上一查找匹配项",
-	"selectAllOccurrencesOfFindMatch": "选择所有找到的查找匹配项",
-	"changeAll.label": "更改所有匹配项"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/editor/contrib/parameterHints/browser/parameterHints.i18n.json b/i18n/chs/src/vs/editor/contrib/parameterHints/browser/parameterHints.i18n.json
deleted file mode 100644
index af6d0f3a465..00000000000
--- a/i18n/chs/src/vs/editor/contrib/parameterHints/browser/parameterHints.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"parameterHints.trigger.label": "触发参数提示"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/editor/contrib/parameterHints/browser/parameterHintsWidget.i18n.json b/i18n/chs/src/vs/editor/contrib/parameterHints/browser/parameterHintsWidget.i18n.json
deleted file mode 100644
index d56310c9916..00000000000
--- a/i18n/chs/src/vs/editor/contrib/parameterHints/browser/parameterHintsWidget.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"hint": "{0}，提示"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/editor/contrib/parameterHints/parameterHints.i18n.json b/i18n/chs/src/vs/editor/contrib/parameterHints/parameterHints.i18n.json
deleted file mode 100644
index 56ce732bfa4..00000000000
--- a/i18n/chs/src/vs/editor/contrib/parameterHints/parameterHints.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"parameterHints.trigger.label": "触发参数提示"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/editor/contrib/parameterHints/parameterHintsWidget.i18n.json b/i18n/chs/src/vs/editor/contrib/parameterHints/parameterHintsWidget.i18n.json
deleted file mode 100644
index 1336c4e8e07..00000000000
--- a/i18n/chs/src/vs/editor/contrib/parameterHints/parameterHintsWidget.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hint": "{0}，提示"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/editor/contrib/quickFix/browser/quickFixCommands.i18n.json b/i18n/chs/src/vs/editor/contrib/quickFix/browser/quickFixCommands.i18n.json
deleted file mode 100644
index 57cec414a18..00000000000
--- a/i18n/chs/src/vs/editor/contrib/quickFix/browser/quickFixCommands.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"quickFixWithKb": "显示修补程序({0})",
-	"quickFix": "显示修补程序",
-	"quickfix.trigger.label": "快速修复"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/editor/contrib/quickFix/quickFixCommands.i18n.json b/i18n/chs/src/vs/editor/contrib/quickFix/quickFixCommands.i18n.json
deleted file mode 100644
index 2ae7fb21ca1..00000000000
--- a/i18n/chs/src/vs/editor/contrib/quickFix/quickFixCommands.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"quickFixWithKb": "显示修补程序({0})",
-	"quickFix": "显示修补程序",
-	"quickfix.trigger.label": "快速修复",
-	"refactor.label": "重构"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/editor/contrib/referenceSearch/browser/peekViewWidget.i18n.json b/i18n/chs/src/vs/editor/contrib/referenceSearch/browser/peekViewWidget.i18n.json
deleted file mode 100644
index 3ebf52a28ce..00000000000
--- a/i18n/chs/src/vs/editor/contrib/referenceSearch/browser/peekViewWidget.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"label.close": "关闭"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/editor/contrib/referenceSearch/browser/referenceSearch.i18n.json b/i18n/chs/src/vs/editor/contrib/referenceSearch/browser/referenceSearch.i18n.json
deleted file mode 100644
index 6feb8c65167..00000000000
--- a/i18n/chs/src/vs/editor/contrib/referenceSearch/browser/referenceSearch.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"meta.titleReference": " – {0} 个引用",
-	"references.action.label": "查找所有引用"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/editor/contrib/referenceSearch/browser/referencesController.i18n.json b/i18n/chs/src/vs/editor/contrib/referenceSearch/browser/referencesController.i18n.json
deleted file mode 100644
index ee8d3370d1d..00000000000
--- a/i18n/chs/src/vs/editor/contrib/referenceSearch/browser/referencesController.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"labelLoading": "正在加载..."
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/editor/contrib/referenceSearch/browser/referencesModel.i18n.json b/i18n/chs/src/vs/editor/contrib/referenceSearch/browser/referencesModel.i18n.json
deleted file mode 100644
index 710eeeefcfc..00000000000
--- a/i18n/chs/src/vs/editor/contrib/referenceSearch/browser/referencesModel.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"aria.oneReference": "在文件 {0} 的 {1} 行 {2} 列的符号",
-	"aria.fileReferences.1": "{0}  中有 1 个符号，完整路径：{1}",
-	"aria.fileReferences.N": "{1} 中有 {0} 个符号，完整路径：{2}",
-	"aria.result.0": "未找到结果",
-	"aria.result.1": "在 {0} 中找到 1 个符号",
-	"aria.result.n1": "在 {1} 中找到 {0} 个符号",
-	"aria.result.nm": "在 {1} 个文件中找到 {0} 个符号"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/editor/contrib/referenceSearch/browser/referencesWidget.i18n.json b/i18n/chs/src/vs/editor/contrib/referenceSearch/browser/referencesWidget.i18n.json
deleted file mode 100644
index 70e89645ee3..00000000000
--- a/i18n/chs/src/vs/editor/contrib/referenceSearch/browser/referencesWidget.i18n.json
+++ /dev/null
@@ -1,27 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"referencesFailre": "解析文件失败。",
-	"referencesCount": "{0} 个引用",
-	"referenceCount": "{0} 个引用",
-	"missingPreviewMessage": "无可用预览",
-	"treeAriaLabel": "引用",
-	"noResults": "无结果",
-	"peekView.alternateTitle": "引用",
-	"peekViewTitleBackground": "速览视图标题区域背景颜色。",
-	"peekViewTitleForeground": "速览视图标题颜色。",
-	"peekViewTitleInfoForeground": "速览视图标题信息颜色。",
-	"peekViewBorder": "速览视图边框和箭头颜色。",
-	"peekViewResultsBackground": "速览视图结果列表背景颜色。",
-	"peekViewResultsMatchForeground": "速览视图结果列表中行节点的前景色。",
-	"peekViewResultsFileForeground": "速览视图结果列表中文件节点的前景色。",
-	"peekViewResultsSelectionBackground": "速览视图结果列表中所选条目的背景颜色。",
-	"peekViewResultsSelectionForeground": "速览视图结果列表中所选条目的前景色。",
-	"peekViewEditorBackground": "速览视图编辑器背景颜色。",
-	"peekViewEditorGutterBackground": "速览视图编辑器中导航线的背景颜色。",
-	"peekViewResultsMatchHighlight": "在速览视图结果列表中匹配突出显示颜色。",
-	"peekViewEditorMatchHighlight": "在速览视图编辑器中匹配突出显示颜色。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/editor/contrib/referenceSearch/peekViewWidget.i18n.json b/i18n/chs/src/vs/editor/contrib/referenceSearch/peekViewWidget.i18n.json
deleted file mode 100644
index 2f78922d49e..00000000000
--- a/i18n/chs/src/vs/editor/contrib/referenceSearch/peekViewWidget.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"label.close": "关闭"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/editor/contrib/referenceSearch/referenceSearch.i18n.json b/i18n/chs/src/vs/editor/contrib/referenceSearch/referenceSearch.i18n.json
deleted file mode 100644
index 6223eb92711..00000000000
--- a/i18n/chs/src/vs/editor/contrib/referenceSearch/referenceSearch.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"meta.titleReference": " – {0} 个引用",
-	"references.action.label": "查找所有引用"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/editor/contrib/referenceSearch/referencesController.i18n.json b/i18n/chs/src/vs/editor/contrib/referenceSearch/referencesController.i18n.json
deleted file mode 100644
index efc40de4001..00000000000
--- a/i18n/chs/src/vs/editor/contrib/referenceSearch/referencesController.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"labelLoading": "正在加载..."
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/editor/contrib/referenceSearch/referencesModel.i18n.json b/i18n/chs/src/vs/editor/contrib/referenceSearch/referencesModel.i18n.json
deleted file mode 100644
index 4815c2b60cf..00000000000
--- a/i18n/chs/src/vs/editor/contrib/referenceSearch/referencesModel.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"aria.oneReference": "在文件 {0} 的 {1} 行 {2} 列的符号",
-	"aria.fileReferences.1": "{0}  中有 1 个符号，完整路径：{1}",
-	"aria.fileReferences.N": "{1} 中有 {0} 个符号，完整路径：{2}",
-	"aria.result.0": "未找到结果",
-	"aria.result.1": "在 {0} 中找到 1 个符号",
-	"aria.result.n1": "在 {1} 中找到 {0} 个符号",
-	"aria.result.nm": "在 {1} 个文件中找到 {0} 个符号"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/editor/contrib/referenceSearch/referencesWidget.i18n.json b/i18n/chs/src/vs/editor/contrib/referenceSearch/referencesWidget.i18n.json
deleted file mode 100644
index b08100f3e5c..00000000000
--- a/i18n/chs/src/vs/editor/contrib/referenceSearch/referencesWidget.i18n.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"referencesFailre": "解析文件失败。",
-	"referencesCount": "{0} 个引用",
-	"referenceCount": "{0} 个引用",
-	"missingPreviewMessage": "无可用预览",
-	"treeAriaLabel": "引用",
-	"noResults": "无结果",
-	"peekView.alternateTitle": "引用",
-	"peekViewTitleBackground": "速览视图标题区域背景颜色。",
-	"peekViewTitleForeground": "速览视图标题颜色。",
-	"peekViewTitleInfoForeground": "速览视图标题信息颜色。",
-	"peekViewBorder": "速览视图边框和箭头颜色。",
-	"peekViewResultsBackground": "速览视图结果列表背景颜色。",
-	"peekViewResultsMatchForeground": "速览视图结果列表中行节点的前景色。",
-	"peekViewResultsFileForeground": "速览视图结果列表中文件节点的前景色。",
-	"peekViewResultsSelectionBackground": "速览视图结果列表中所选条目的背景颜色。",
-	"peekViewResultsSelectionForeground": "速览视图结果列表中所选条目的前景色。",
-	"peekViewEditorBackground": "速览视图编辑器背景颜色。",
-	"peekViewEditorGutterBackground": "速览视图编辑器中导航线的背景颜色。",
-	"peekViewResultsMatchHighlight": "在速览视图结果列表中匹配突出显示颜色。",
-	"peekViewEditorMatchHighlight": "在速览视图编辑器中匹配突出显示颜色。",
-	"peekViewEditorMatchHighlightBorder": "在速览视图编辑器中匹配项的突出显示边框。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/editor/contrib/rename/browser/rename.i18n.json b/i18n/chs/src/vs/editor/contrib/rename/browser/rename.i18n.json
deleted file mode 100644
index 1f33c3d33d2..00000000000
--- a/i18n/chs/src/vs/editor/contrib/rename/browser/rename.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"no result": "无结果。",
-	"aria": "成功将“{0}”重命名为“{1}”。摘要：{2}",
-	"rename.failed": "抱歉，重命名无法执行。",
-	"rename.label": "重命名符号"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/editor/contrib/rename/browser/renameInputField.i18n.json b/i18n/chs/src/vs/editor/contrib/rename/browser/renameInputField.i18n.json
deleted file mode 100644
index e4a7636ddc1..00000000000
--- a/i18n/chs/src/vs/editor/contrib/rename/browser/renameInputField.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"renameAriaLabel": "重命名输入。键入新名称并按 \"Enter\" 提交。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/editor/contrib/rename/rename.i18n.json b/i18n/chs/src/vs/editor/contrib/rename/rename.i18n.json
deleted file mode 100644
index af3ea20fa8e..00000000000
--- a/i18n/chs/src/vs/editor/contrib/rename/rename.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"no result": "无结果。",
-	"aria": "成功将“{0}”重命名为“{1}”。摘要：{2}",
-	"rename.failed": "无法进行重命名。",
-	"rename.label": "重命名符号"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/editor/contrib/rename/renameInputField.i18n.json b/i18n/chs/src/vs/editor/contrib/rename/renameInputField.i18n.json
deleted file mode 100644
index 69632e59f3e..00000000000
--- a/i18n/chs/src/vs/editor/contrib/rename/renameInputField.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"renameAriaLabel": "重命名输入。键入新名称并按 \"Enter\" 提交。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/editor/contrib/smartSelect/common/smartSelect.i18n.json b/i18n/chs/src/vs/editor/contrib/smartSelect/common/smartSelect.i18n.json
deleted file mode 100644
index 6109b7602b0..00000000000
--- a/i18n/chs/src/vs/editor/contrib/smartSelect/common/smartSelect.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"smartSelect.grow": "扩大选择",
-	"smartSelect.shrink": "缩小选择"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/editor/contrib/smartSelect/smartSelect.i18n.json b/i18n/chs/src/vs/editor/contrib/smartSelect/smartSelect.i18n.json
deleted file mode 100644
index 321dfdb0f9b..00000000000
--- a/i18n/chs/src/vs/editor/contrib/smartSelect/smartSelect.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"smartSelect.grow": "扩大选择",
-	"smartSelect.shrink": "缩小选择"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/editor/contrib/snippet/snippetVariables.i18n.json b/i18n/chs/src/vs/editor/contrib/snippet/snippetVariables.i18n.json
deleted file mode 100644
index 4729c703440..00000000000
--- a/i18n/chs/src/vs/editor/contrib/snippet/snippetVariables.i18n.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"Sunday": "星期日",
-	"Monday": "星期一",
-	"Tuesday": "星期二",
-	"Wednesday": "星期三",
-	"Thursday": "星期四",
-	"Friday": "星期五",
-	"Saturday": "星期六",
-	"SundayShort": "周日",
-	"MondayShort": "周一",
-	"TuesdayShort": "周二",
-	"WednesdayShort": "周三",
-	"ThursdayShort": "周四",
-	"FridayShort": "周五",
-	"SaturdayShort": "周六",
-	"January": "一月",
-	"February": "二月",
-	"March": "三月",
-	"April": "四月",
-	"May": "五月",
-	"June": "六月",
-	"July": "七月",
-	"August": "八月",
-	"September": "九月",
-	"October": "十月",
-	"November": "十一月",
-	"December": "十二月",
-	"JanuaryShort": "1月",
-	"FebruaryShort": "2月",
-	"MarchShort": "3月",
-	"AprilShort": "4月",
-	"MayShort": "5月",
-	"JuneShort": "6月",
-	"JulyShort": "7月",
-	"AugustShort": "8月",
-	"SeptemberShort": "9月",
-	"OctoberShort": "10月",
-	"NovemberShort": "11月",
-	"DecemberShort": "12月"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/editor/contrib/suggest/browser/suggestController.i18n.json b/i18n/chs/src/vs/editor/contrib/suggest/browser/suggestController.i18n.json
deleted file mode 100644
index ef3fe110728..00000000000
--- a/i18n/chs/src/vs/editor/contrib/suggest/browser/suggestController.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"arai.alert.snippet": "确认“{0}”插入以下文本：{1}",
-	"suggest.trigger.label": "触发建议"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/editor/contrib/suggest/browser/suggestWidget.i18n.json b/i18n/chs/src/vs/editor/contrib/suggest/browser/suggestWidget.i18n.json
deleted file mode 100644
index ec34ba659f1..00000000000
--- a/i18n/chs/src/vs/editor/contrib/suggest/browser/suggestWidget.i18n.json
+++ /dev/null
@@ -1,21 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"editorSuggestWidgetBackground": "建议小组件的背景颜色",
-	"editorSuggestWidgetBorder": "建议小组件的边框颜色",
-	"editorSuggestWidgetForeground": "建议小组件的前景颜色。",
-	"editorSuggestWidgetSelectedBackground": "建议小组件中被选择条目的背景颜色。",
-	"editorSuggestWidgetHighlightForeground": "建议小组件中匹配内容的高亮颜色。",
-	"readMore": "阅读详细信息...{0}",
-	"suggestionWithDetailsAriaLabel": "{0}(建议)具有详细信息",
-	"suggestionAriaLabel": "{0}，建议",
-	"readLess": "阅读简略信息...{0}",
-	"suggestWidget.loading": "正在加载...",
-	"suggestWidget.noSuggestions": "无建议。",
-	"suggestionAriaAccepted": "{0}，已接受",
-	"ariaCurrentSuggestionWithDetails": "{0}(建议)具有详细信息",
-	"ariaCurrentSuggestion": "{0}，建议"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/editor/contrib/suggest/suggestController.i18n.json b/i18n/chs/src/vs/editor/contrib/suggest/suggestController.i18n.json
deleted file mode 100644
index bc962160f2e..00000000000
--- a/i18n/chs/src/vs/editor/contrib/suggest/suggestController.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"arai.alert.snippet": "确认“{0}”插入以下文本：{1}",
-	"suggest.trigger.label": "触发建议"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/editor/contrib/suggest/suggestWidget.i18n.json b/i18n/chs/src/vs/editor/contrib/suggest/suggestWidget.i18n.json
deleted file mode 100644
index 5c90a573a7f..00000000000
--- a/i18n/chs/src/vs/editor/contrib/suggest/suggestWidget.i18n.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"editorSuggestWidgetBackground": "建议小组件的背景颜色",
-	"editorSuggestWidgetBorder": "建议小组件的边框颜色",
-	"editorSuggestWidgetForeground": "建议小组件的前景颜色。",
-	"editorSuggestWidgetSelectedBackground": "建议小组件中被选择条目的背景颜色。",
-	"editorSuggestWidgetHighlightForeground": "建议小组件中匹配内容的高亮颜色。",
-	"readMore": "阅读详细信息...{0}",
-	"suggestionWithDetailsAriaLabel": "{0}(建议)具有详细信息",
-	"suggestionAriaLabel": "{0}，建议",
-	"readLess": "阅读简略信息...{0}",
-	"suggestWidget.loading": "正在加载...",
-	"suggestWidget.noSuggestions": "无建议。",
-	"suggestionAriaAccepted": "{0}，已接受",
-	"ariaCurrentSuggestionWithDetails": "{0}(建议)具有详细信息",
-	"ariaCurrentSuggestion": "{0}，建议"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/editor/contrib/toggleTabFocusMode/common/toggleTabFocusMode.i18n.json b/i18n/chs/src/vs/editor/contrib/toggleTabFocusMode/common/toggleTabFocusMode.i18n.json
deleted file mode 100644
index 897e74dff44..00000000000
--- a/i18n/chs/src/vs/editor/contrib/toggleTabFocusMode/common/toggleTabFocusMode.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"toggle.tabMovesFocus": "切换 Tab 键是否移动焦点"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/editor/contrib/toggleTabFocusMode/toggleTabFocusMode.i18n.json b/i18n/chs/src/vs/editor/contrib/toggleTabFocusMode/toggleTabFocusMode.i18n.json
deleted file mode 100644
index b09f6849ba6..00000000000
--- a/i18n/chs/src/vs/editor/contrib/toggleTabFocusMode/toggleTabFocusMode.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggle.tabMovesFocus": "切换 Tab 键是否移动焦点"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/editor/contrib/wordHighlighter/common/wordHighlighter.i18n.json b/i18n/chs/src/vs/editor/contrib/wordHighlighter/common/wordHighlighter.i18n.json
deleted file mode 100644
index 7926047995c..00000000000
--- a/i18n/chs/src/vs/editor/contrib/wordHighlighter/common/wordHighlighter.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"wordHighlight": "读取访问时符号的背景颜色，例如读取变量时。",
-	"wordHighlightStrong": "写入访问时符号的背景颜色，例如写入变量时。",
-	"overviewRulerWordHighlightForeground": "概述符号突出显示的标尺标记颜色。",
-	"overviewRulerWordHighlightStrongForeground": "概述写访问符号突出显示的标尺标记颜色。",
-	"wordHighlight.next.label": "转到下一个突出显示的符号",
-	"wordHighlight.previous.label": "转到上一个突出显示的符号"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json b/i18n/chs/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
deleted file mode 100644
index 1340c8a0009..00000000000
--- a/i18n/chs/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"wordHighlight": "符号在进行读取访问操作时的背景颜色，例如读取变量时。颜色必须透明，使其不会挡住下方的其他元素。",
-	"wordHighlightStrong": "符号在进行写入访问操作时的背景颜色，例如写入变量时。颜色必须透明，使其不会挡住下方的其他元素。",
-	"wordHighlightBorder": "符号在进行读取访问操作时的边框颜色，例如读取变量。",
-	"wordHighlightStrongBorder": "符号在进行写入访问操作时的边框颜色，例如写入变量。",
-	"overviewRulerWordHighlightForeground": "概览标尺中符号高亮的标记颜色。颜色必须透明，使其不会挡住下方的其他元素。",
-	"overviewRulerWordHighlightStrongForeground": "概览标尺中写入访问符号高亮的标记颜色。颜色必须透明，使其不会挡住下方的其他元素。",
-	"wordHighlight.next.label": "转到下一个突出显示的符号",
-	"wordHighlight.previous.label": "转到上一个突出显示的符号"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/editor/contrib/zoneWidget/browser/peekViewWidget.i18n.json b/i18n/chs/src/vs/editor/contrib/zoneWidget/browser/peekViewWidget.i18n.json
deleted file mode 100644
index 3ebf52a28ce..00000000000
--- a/i18n/chs/src/vs/editor/contrib/zoneWidget/browser/peekViewWidget.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"label.close": "关闭"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/editor/electron-browser/textMate/TMSyntax.i18n.json b/i18n/chs/src/vs/editor/electron-browser/textMate/TMSyntax.i18n.json
deleted file mode 100644
index bfa6530c7f3..00000000000
--- a/i18n/chs/src/vs/editor/electron-browser/textMate/TMSyntax.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"invalid.language": "“contributes.{0}.language”中存在未知的语言。提供的值: {1}",
-	"invalid.scopeName": "“contributes.{0}.scopeName”中应为字符串。提供的值: {1}",
-	"invalid.path.0": "“contributes.{0}.path”中应为字符串。提供的值: {1}",
-	"invalid.injectTo": "\"contributes.{0}.injectTo\" 中的值无效。必须为语言范围名称数组。提供的值: {1}",
-	"invalid.embeddedLanguages": "\"contributes.{0}.embeddedLanguages\" 中的值无效。必须为从作用域名称到语言的对象映射。提供的值: {1}",
-	"invalid.path.1": "“contributes.{0}.path”({1})应包含在扩展的文件夹({2})内。这可能会使扩展不可移植。",
-	"no-tm-grammar": "没有注册这种语言的 TM 语法。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/editor/node/languageConfigurationExtensionPoint.i18n.json b/i18n/chs/src/vs/editor/node/languageConfigurationExtensionPoint.i18n.json
deleted file mode 100644
index a4b09b5b447..00000000000
--- a/i18n/chs/src/vs/editor/node/languageConfigurationExtensionPoint.i18n.json
+++ /dev/null
@@ -1,23 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"parseErrors": "错误分析 {0}: {1}",
-	"schema.openBracket": "左方括号字符或字符串序列。",
-	"schema.closeBracket": "右方括号字符或字符串序列。",
-	"schema.comments": "定义注释符号",
-	"schema.blockComments": "定义块注释的标记方式。",
-	"schema.blockComment.begin": "作为块注释开头的字符序列。",
-	"schema.blockComment.end": "作为块注释结尾的字符序列。",
-	"schema.lineComment": "作为行注释开头的字符序列。",
-	"schema.brackets": "定义增加和减少缩进的括号。",
-	"schema.autoClosingPairs": "定义括号对。当输入左方括号时，将自动插入右方括号。",
-	"schema.autoClosingPairs.notIn": "定义禁用了自动配对的作用域列表。",
-	"schema.surroundingPairs": "定义可用于包围所选字符串的括号对。",
-	"schema.wordPattern": "此语言的文本定义。",
-	"schema.wordPattern.pattern": "用于匹配文本的正则表达式模式。",
-	"schema.wordPattern.flags": "用于匹配文本的正则表达式标志。",
-	"schema.wordPattern.flags.errorMessage": "必须匹配模式“/^([gimuy]+)$/”。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/editor/node/textMate/TMGrammars.i18n.json b/i18n/chs/src/vs/editor/node/textMate/TMGrammars.i18n.json
deleted file mode 100644
index dfbe43b5ad9..00000000000
--- a/i18n/chs/src/vs/editor/node/textMate/TMGrammars.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"vscode.extension.contributes.grammars": "贡献 textmate tokenizer。",
-	"vscode.extension.contributes.grammars.language": "此语法为其贡献了内容的语言标识符。",
-	"vscode.extension.contributes.grammars.scopeName": "tmLanguage 文件所用的 textmate 范围名称。",
-	"vscode.extension.contributes.grammars.path": "tmLanguage 文件的路径。该路径是相对于扩展文件夹，通常以 \"./syntaxes/\" 开头。",
-	"vscode.extension.contributes.grammars.embeddedLanguages": "如果此语法包含嵌入式语言，则为作用域名称到语言 ID 的映射。",
-	"vscode.extension.contributes.grammars.injectTo": "此语法注入到的语言范围名称列表。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/platform/actions/browser/menuItemActionItem.i18n.json b/i18n/chs/src/vs/platform/actions/browser/menuItemActionItem.i18n.json
deleted file mode 100644
index 0d4e76110bb..00000000000
--- a/i18n/chs/src/vs/platform/actions/browser/menuItemActionItem.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"titleAndKb": "{0} ({1})"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json b/i18n/chs/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
deleted file mode 100644
index d23732f8ae4..00000000000
--- a/i18n/chs/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"requirearray": "菜单项必须为一个数组",
-	"requirestring": "属性“{0}”是必要属性，其类型必须是“string”",
-	"optstring": "属性“{0}”可以被省略，否则其类型必须为“string”",
-	"vscode.extension.contributes.menuItem.command": "要执行的命令的标识符。该命令必须在 \"commands\" 部分中声明",
-	"vscode.extension.contributes.menuItem.alt": "要执行的替代命令的标识符。该命令必须在 ”commands\" 部分中声明",
-	"vscode.extension.contributes.menuItem.when": "为显示此项必须为 \"true\" 的条件",
-	"vscode.extension.contributes.menuItem.group": "此命令所属的组",
-	"vscode.extension.contributes.menus": "向编辑器提供菜单项",
-	"menus.commandPalette": "命令面板",
-	"menus.touchBar": "Multi-Touch Bar (仅 macOS)",
-	"menus.editorTitle": "编辑器标题菜单",
-	"menus.editorContext": "编辑器上下文菜单",
-	"menus.explorerContext": "文件资源管理器上下文菜单",
-	"menus.editorTabContext": "编辑器选项卡上下文菜单",
-	"menus.debugCallstackContext": "调试调用堆栈上下文菜单",
-	"menus.scmTitle": "源代码管理标题菜单",
-	"menus.scmSourceControl": "源代码管理菜单",
-	"menus.resourceGroupContext": "源代码管理资源组上下文菜单",
-	"menus.resourceStateContext": "源代码管理资源状态上下文菜单",
-	"view.viewTitle": "提供的视图的标题菜单",
-	"view.itemContext": "提供的视图中的项目的上下文菜单",
-	"nonempty": "应为非空值。",
-	"opticon": "属性 \"icon\" 可以省略，否则其必须为字符串或是类似 \"{dark, light}\" 的文本",
-	"requireStringOrObject": "属性“{0}”是必要属性，其类型必须是 \"string\" 或 \"object\"",
-	"requirestrings": "属性“{0}”和“{1}”是必要属性，其类型必须是 \"string\"",
-	"vscode.extension.contributes.commandType.command": "要执行的命令的标识符",
-	"vscode.extension.contributes.commandType.title": "在 UI 中依据其表示命令的标题",
-	"vscode.extension.contributes.commandType.category": "(可选)类别字符串按命令在 UI 中分组",
-	"vscode.extension.contributes.commandType.icon": "(可选)在 UI 中用来表示命令的图标。文件路径或者主题配置",
-	"vscode.extension.contributes.commandType.icon.light": "使用浅色主题时的图标路径",
-	"vscode.extension.contributes.commandType.icon.dark": "使用深色主题时的图标路径",
-	"vscode.extension.contributes.commands": "对命令面板提供命令。",
-	"dup": "命令“{0}”在 \"commands\" 部分重复出现。",
-	"menuId.invalid": "“{0}”为无效菜单标识符",
-	"missing.command": "菜单项引用未在“命令”部分进行定义的命令“{0}”。",
-	"missing.altCommand": "菜单项引用了未在 \"commands\" 部分定义的替代命令“{0}”。",
-	"dupe.command": "菜单项引用的命令中默认和替代命令相同"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/platform/configuration/common/configurationRegistry.i18n.json b/i18n/chs/src/vs/platform/configuration/common/configurationRegistry.i18n.json
deleted file mode 100644
index ec196bb66b1..00000000000
--- a/i18n/chs/src/vs/platform/configuration/common/configurationRegistry.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"defaultConfigurations.title": "默认配置替代",
-	"overrideSettings.description": "针对 {0} 语言，配置替代编辑器设置。",
-	"overrideSettings.defaultDescription": "针对某种语言，配置替代编辑器设置。",
-	"config.property.languageDefault": "无法注册“{0}”。其符合描述特定语言编辑器设置的表达式 \"\\\\[.*\\\\]$\"。请使用 \"configurationDefaults\"。",
-	"config.property.duplicate": "无法注册“{0}”。此属性已注册。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/platform/dialogs/common/dialogs.i18n.json b/i18n/chs/src/vs/platform/dialogs/common/dialogs.i18n.json
deleted file mode 100644
index d31cf13c73b..00000000000
--- a/i18n/chs/src/vs/platform/dialogs/common/dialogs.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"moreFile": "...1 个其他文件未显示",
-	"moreFiles": "...{0} 个其他文件未显示"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/platform/dialogs/node/dialogService.i18n.json b/i18n/chs/src/vs/platform/dialogs/node/dialogService.i18n.json
deleted file mode 100644
index 7667b941599..00000000000
--- a/i18n/chs/src/vs/platform/dialogs/node/dialogService.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"cancel": "取消"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/platform/environment/node/argv.i18n.json b/i18n/chs/src/vs/platform/environment/node/argv.i18n.json
deleted file mode 100644
index 9b8e352f2e0..00000000000
--- a/i18n/chs/src/vs/platform/environment/node/argv.i18n.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"gotoValidation": "\"--goto\" 模式中的参数格式应为 \"FILE(:LINE(:CHARACTER))\"。",
-	"diff": "将两个文件相互比较。",
-	"add": "将文件夹添加到上一个活动窗口。",
-	"goto": "打开路径下的文件并定位到特定行和特定列。",
-	"newWindow": "强制打开新窗口。",
-	"reuseWindow": "强制打开上一个活动窗口中的文件或文件夹。",
-	"wait": "等文件关闭后再返回。",
-	"locale": "要使用的区域设置(例如 en-US 或 zh-TW)。",
-	"userDataDir": "指定保存用户数据的目录。可用于打开多个不同的 Code 实例。",
-	"version": "打印版本。",
-	"help": "打印使用情况。",
-	"extensionHomePath": "设置扩展的根路径。",
-	"listExtensions": "列出已安装的扩展。",
-	"showVersions": "使用 --list-extension 时，显示已安装扩展的版本。",
-	"installExtension": "安装扩展。",
-	"uninstallExtension": "卸载扩展。",
-	"experimentalApis": "为扩展启用实验性 API 功能。",
-	"verbose": "打印详细输出(隐含 --wait 参数)。",
-	"log": "使用的日志级别。默认值为 \"info\"。允许的值为 \"critical\" (关键)、\"error\" (错误)、\"warn\" (警告)、\"info\" (信息)、\"debug\" (调试)、\"trace\" (跟踪) 和 \"off\" (关闭)。",
-	"status": "打印进程使用情况和诊断信息。",
-	"performance": "通过启用 \"Developer: Startup Performance\" 命令开始。",
-	"prof-startup": "启动期间运行 CPU 探查器",
-	"disableExtensions": "禁用所有已安装的扩展。",
-	"inspect-extensions": "允许调试和分析扩展。您可以在开发人员工具中找到连接 URI。",
-	"inspect-brk-extensions": "允许扩展宿主在启动后暂停时进行扩展的调试和分析。您可以在开发人员工具中找到连接 URI。",
-	"disableGPU": "禁用 GPU 硬件加速。",
-	"uploadLogs": "将当前会话的日志上传到安全端点。",
-	"maxMemory": "单个窗口最大内存大小 (单位为 MB)。",
-	"usage": "使用情况",
-	"options": "选项",
-	"paths": "路径",
-	"stdinWindows": "要读取其他程序的输出，请追加 \"-\" (例如 \"echo Hello World | {0} -')",
-	"stdinUnix": "要从 stdin 中读取，请追加 \"-\" (例如 \"ps aux | grep code | {0} -')",
-	"optionsUpperCase": "选项",
-	"extensionsManagement": "扩展管理",
-	"troubleshooting": "故障排查"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/platform/extensionManagement/common/extensionEnablementService.i18n.json b/i18n/chs/src/vs/platform/extensionManagement/common/extensionEnablementService.i18n.json
deleted file mode 100644
index 6c4c6887b12..00000000000
--- a/i18n/chs/src/vs/platform/extensionManagement/common/extensionEnablementService.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noWorkspace": "无工作区"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/platform/extensionManagement/common/extensionManagement.i18n.json b/i18n/chs/src/vs/platform/extensionManagement/common/extensionManagement.i18n.json
deleted file mode 100644
index fe5e15ea579..00000000000
--- a/i18n/chs/src/vs/platform/extensionManagement/common/extensionManagement.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"extensions": "扩展",
-	"preferences": "首选项"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/platform/extensionManagement/node/extensionGalleryService.i18n.json b/i18n/chs/src/vs/platform/extensionManagement/node/extensionGalleryService.i18n.json
deleted file mode 100644
index 88cc5cd9c95..00000000000
--- a/i18n/chs/src/vs/platform/extensionManagement/node/extensionGalleryService.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"notCompatibleDownload": "无法下载。找不到与 VS Code 当前版本 ({0}) 兼容的扩展。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json b/i18n/chs/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
deleted file mode 100644
index 7fee73e8505..00000000000
--- a/i18n/chs/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"invalidManifest": "扩展无效: package.json 不是 JSON 文件。",
-	"incompatible": "无法安装扩展“{0}”，它与 Code “{1}”不兼容。",
-	"restartCode": "请先重启 Code 再重新安装 {0}。",
-	"installingOutdatedExtension": "您已安装此扩展的新版程序。是否要使用旧版覆盖？",
-	"override": "覆盖",
-	"cancel": "取消",
-	"errorInstallingDependencies": "安装依赖项时出错。{0}",
-	"MarketPlaceDisabled": "商店未启用",
-	"removeError": "删除扩展时出错: {0}。请重启 VS Code，然后重试。",
-	"Not a Marketplace extension": "只能重新安装商店中的扩展",
-	"notFoundCompatible": "无法安装“{0}”；没有可用的版本与 VS Code “{1}”兼容。",
-	"malicious extension": "无法安装此扩展，它被报告存在问题。",
-	"notFoundCompatibleDependency": "无法安装。找不到与 VS Code 当前版本 ({1}) 兼容的依赖扩展“{0}”。",
-	"quitCode": "无法安装扩展。请在重启 VS Code 后重新安装。",
-	"exitCode": "无法安装扩展。请在重启 VS Code 后重新安装。",
-	"renameError": "将 {0} 重命名为 {1} 时发生未知错误",
-	"uninstallDependeciesConfirmation": "是仅卸载“{0}”还是与其依赖项一起卸载?",
-	"uninstallOnly": "仅此扩展",
-	"uninstallAll": "全部卸载",
-	"singleDependentError": "无法卸载扩展程序“{0}”。扩展程序“{1}”依赖于此。",
-	"twoDependentsError": "无法卸载扩展程序“{0}”。扩展程序“{1}”、“{2}”依赖于此。",
-	"multipleDependentsError": "无法卸载扩展程序“{0}”。扩展程序“{1}”、“{2}”以及其他扩展程序都依赖于此。",
-	"notExists": "找不到扩展"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/platform/extensions/common/abstractExtensionService.i18n.json b/i18n/chs/src/vs/platform/extensions/common/abstractExtensionService.i18n.json
deleted file mode 100644
index 9e906e992b8..00000000000
--- a/i18n/chs/src/vs/platform/extensions/common/abstractExtensionService.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"unknownDep": "无法激活扩展”{1}“。原因: 未知依赖关系“{0}”。",
-	"failedDep1": "无法激活扩展”{1}“。原因: 无法激活依赖关系”{0}“。",
-	"failedDep2": "无法激活扩展”{0}“。原因: 依赖关系多于 10 级(最可能是依赖关系循环)。",
-	"activationError": "激活扩展“{0}”失败: {1}。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/platform/extensions/common/extensionsRegistry.i18n.json b/i18n/chs/src/vs/platform/extensions/common/extensionsRegistry.i18n.json
deleted file mode 100644
index 05a0fa4acd3..00000000000
--- a/i18n/chs/src/vs/platform/extensions/common/extensionsRegistry.i18n.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.engines.vscode": "对于 VS Code 扩展，指定与其兼容的 VS Code 版本。不能为 *。 例如: ^0.10.5 表示最低兼容 VS Code 版本 0.10.5。",
-	"vscode.extension.publisher": "VS Code 扩展的发布者。",
-	"vscode.extension.displayName": "VS Code 库中使用的扩展的显示名称。",
-	"vscode.extension.categories": "VS Code 库用于对扩展进行分类的类别。",
-	"vscode.extension.galleryBanner": "VS Code 商城使用的横幅。",
-	"vscode.extension.galleryBanner.color": "VS Code 商城页标题上的横幅颜色。",
-	"vscode.extension.galleryBanner.theme": "横幅文字的颜色主题。",
-	"vscode.extension.contributes": "由此包表示的 VS Code 扩展的所有贡献。",
-	"vscode.extension.preview": "在 Marketplace 中设置扩展，将其标记为“预览”。",
-	"vscode.extension.activationEvents": "VS Code 扩展的激活事件。",
-	"vscode.extension.activationEvents.onLanguage": "在打开被解析为指定语言的文件时发出的激活事件。",
-	"vscode.extension.activationEvents.onCommand": "在调用指定命令时发出的激活事件。",
-	"vscode.extension.activationEvents.onDebug": "在用户准备调试或准备设置调试配置时发出的激活事件。",
-	"vscode.extension.activationEvents.onDebugInitialConfigurations": "在需要创建 \"launch.json\" 文件 (且需要调用 provideDebugConfigurations 的所有方法) 时发出的激活事件。",
-	"vscode.extension.activationEvents.onDebugResolve": "在将要启动具有特定类型的调试会话 (且需要调用相应的 resolveDebugConfiguration 方法) 时发出的激活事件。",
-	"vscode.extension.activationEvents.workspaceContains": "在打开至少包含一个匹配指定 glob 模式的文件的文件夹时发出的激活事件。",
-	"vscode.extension.activationEvents.onView": "在指定视图被展开时发出的激活事件。",
-	"vscode.extension.activationEvents.star": "在 VS Code 启动时发出的激活事件。为确保良好的最终用户体验，请仅在其他激活事件组合不适用于你的情况时，才在扩展中使用此事件。",
-	"vscode.extension.badges": "在 Marketplace 的扩展页边栏中显示的徽章数组。",
-	"vscode.extension.badges.url": "徽章图像 URL。",
-	"vscode.extension.badges.href": "徽章链接。",
-	"vscode.extension.badges.description": "徽章说明。",
-	"vscode.extension.extensionDependencies": "其他扩展的依赖关系。扩展的标识符始终是 ${publisher}.${name}。例如: vscode.csharp。",
-	"vscode.extension.scripts.prepublish": "包作为 VS Code 扩展发布前执行的脚本。",
-	"vscode.extension.icon": "128 x 128 像素图标的路径。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/platform/extensions/node/extensionValidator.i18n.json b/i18n/chs/src/vs/platform/extensions/node/extensionValidator.i18n.json
deleted file mode 100644
index ee27fc55d23..00000000000
--- a/i18n/chs/src/vs/platform/extensions/node/extensionValidator.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"versionSyntax": "无法解析 \"engines.vscode\" 的值 {0}。请改为如 ^1.22.0, ^1.22.x 等。",
-	"versionSpecificity1": "\"engines.vscode\" ({0}) 中指定的版本不够具体。对于 1.0.0 之前的 vscode 版本，请至少定义主要和次要想要的版本。例如: ^0.10.0、0.10.x、0.11.0 等。",
-	"versionSpecificity2": "\"engines.vscode\" ({0}) 中指定的版本不够具体。对于 1.0.0 之后的 vscode 版本，请至少定义主要想要的版本。例如: ^1.10.0、1.10.x、1.x.x、2.x.x 等。",
-	"versionMismatch": "扩展与 Code {0} 不兼容。扩展需要: {1}。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/platform/history/electron-main/historyMainService.i18n.json b/i18n/chs/src/vs/platform/history/electron-main/historyMainService.i18n.json
deleted file mode 100644
index 489a4f30e26..00000000000
--- a/i18n/chs/src/vs/platform/history/electron-main/historyMainService.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"newWindow": "新建窗口",
-	"newWindowDesc": "打开一个新窗口",
-	"recentFolders": "最近使用的工作区",
-	"folderDesc": "{0} {1}",
-	"codeWorkspace": "代码工作区"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/platform/integrity/node/integrityServiceImpl.i18n.json b/i18n/chs/src/vs/platform/integrity/node/integrityServiceImpl.i18n.json
deleted file mode 100644
index ab22eb3b5eb..00000000000
--- a/i18n/chs/src/vs/platform/integrity/node/integrityServiceImpl.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"integrity.prompt": "{0} 安装似乎损坏。请重新安装。",
-	"integrity.moreInformation": "详细信息",
-	"integrity.dontShowAgain": "不再显示"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/platform/issue/electron-main/issueService.i18n.json b/i18n/chs/src/vs/platform/issue/electron-main/issueService.i18n.json
deleted file mode 100644
index 6e606ef5354..00000000000
--- a/i18n/chs/src/vs/platform/issue/electron-main/issueService.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"issueReporter": "问题报告程序",
-	"processExplorer": "进程管理器"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/platform/jsonschemas/common/jsonValidationExtensionPoint.i18n.json b/i18n/chs/src/vs/platform/jsonschemas/common/jsonValidationExtensionPoint.i18n.json
deleted file mode 100644
index 627c1c2f349..00000000000
--- a/i18n/chs/src/vs/platform/jsonschemas/common/jsonValidationExtensionPoint.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"contributes.jsonValidation": "用于 json 架构配置。",
-	"contributes.jsonValidation.fileMatch": "要匹配的文件模式，例如 \"package.json\" 或 \"*.launch\"。",
-	"contributes.jsonValidation.url": "到扩展文件夹('./')的架构 URL (\"http:\"、\"https:\")或相对路径。",
-	"invalid.jsonValidation": "configuration.jsonValidation 必须是数组",
-	"invalid.fileMatch": "必须定义 \"configuration.jsonValidation.fileMatch\" ",
-	"invalid.url": "configuration.jsonValidation.url 必须是 URL 或相对路径",
-	"invalid.url.fileschema": "configuration.jsonValidation.url 是无效的相对 URL: {0}",
-	"invalid.url.schema": "configuration.jsonValidation.url 必须以 \"http:\"、\"https:\" 或 \"./\" 开头以引用位于扩展中的架构。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/platform/keybinding/common/abstractKeybindingService.i18n.json b/i18n/chs/src/vs/platform/keybinding/common/abstractKeybindingService.i18n.json
deleted file mode 100644
index 12c5b30d77a..00000000000
--- a/i18n/chs/src/vs/platform/keybinding/common/abstractKeybindingService.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"first.chord": "已按下({0})。正在等待同时按下第二个键...",
-	"missing.chord": "组合键({0}, {1})不是命令。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/platform/keybinding/common/keybindingLabels.i18n.json b/i18n/chs/src/vs/platform/keybinding/common/keybindingLabels.i18n.json
deleted file mode 100644
index 0e97d8b37c3..00000000000
--- a/i18n/chs/src/vs/platform/keybinding/common/keybindingLabels.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"ctrlKey": "Ctrl",
-	"shiftKey": "Shift",
-	"altKey": "Alt",
-	"windowsKey": "Windows",
-	"ctrlKey.long": "Control",
-	"shiftKey.long": "Shift",
-	"altKey.long": "Alt",
-	"cmdKey.long": "Command",
-	"windowsKey.long": "Windows"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/platform/list/browser/listService.i18n.json b/i18n/chs/src/vs/platform/list/browser/listService.i18n.json
deleted file mode 100644
index 58e15e4f2c0..00000000000
--- a/i18n/chs/src/vs/platform/list/browser/listService.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"workbenchConfigurationTitle": "工作台",
-	"multiSelectModifier.ctrlCmd": "映射为 \"Ctrl\" (Windows 和 Linux) 或 \"Command\" (macOS)",
-	"multiSelectModifier.alt": "映射为 \"Alt\" (Windows 和 Linux) 或 \"Option\" (macOS)",
-	"multiSelectModifier": "在通过鼠标多选树和列表条目时使用的修改键 (例如资源管理器、打开的编辑器和源代码管理视图)。\"ctrlCmd\" 在 Windows 和 Linux 上会映射为 \"Ctrl\" ，在 macOS 上会映射为 \"Command\" 。“在侧边打开”功能所需的鼠标动作 (若可用) 将会相应调整，不与多选修改键冲突。",
-	"openMode.singleClick": "在鼠标单击时打开项目。",
-	"openMode.doubleClick": "在鼠标双击时打开项目。",
-	"openModeModifier": "控制如何在受支持的树和列表中使用鼠标来打开项目。设置为 \"singleClick\" 可单击打开项目，\"doubleClick\" 仅可双击打开项目。对于树中含子节点的节点，此设置将控制使用单击还是双击来展开他们。注意，某些不适用此项的树或列表可能会忽略此设置。",
-	"horizontalScrolling setting": "控制工作台中的树控件是否支持水平滚动。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/platform/localizations/common/localizations.i18n.json b/i18n/chs/src/vs/platform/localizations/common/localizations.i18n.json
deleted file mode 100644
index 23f2b3a6b88..00000000000
--- a/i18n/chs/src/vs/platform/localizations/common/localizations.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.contributes.localizations": "向编辑器提供本地化内容",
-	"vscode.extension.contributes.localizations.languageId": "显示字符串翻译的目标语言 ID。",
-	"vscode.extension.contributes.localizations.languageName": "语言的英文名称。",
-	"vscode.extension.contributes.localizations.languageNameLocalized": "提供语言的名称。",
-	"vscode.extension.contributes.localizations.translations": "与语言关联的翻译的列表。",
-	"vscode.extension.contributes.localizations.translations.id": "使用此翻译的 VS Code 或扩展的 ID。VS Code 的 ID 总为 \"vscode\"，扩展的 ID 的格式应为 \"publisherId.extensionName\"。",
-	"vscode.extension.contributes.localizations.translations.id.pattern": "翻译 VS Code 或者扩展，ID 分别应为 \"vscode\" 或格式为 \"publisherId.extensionName\"。",
-	"vscode.extension.contributes.localizations.translations.path": "包含语言翻译的文件的相对路径。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/platform/markers/common/markers.i18n.json b/i18n/chs/src/vs/platform/markers/common/markers.i18n.json
deleted file mode 100644
index 3112dd48a98..00000000000
--- a/i18n/chs/src/vs/platform/markers/common/markers.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"sev.error": "错误",
-	"sev.warning": "警告",
-	"sev.info": "信息"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/platform/markers/common/problemMatcher.i18n.json b/i18n/chs/src/vs/platform/markers/common/problemMatcher.i18n.json
deleted file mode 100644
index 19b1a8f86ed..00000000000
--- a/i18n/chs/src/vs/platform/markers/common/problemMatcher.i18n.json
+++ /dev/null
@@ -1,72 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"ProblemPatternParser.loopProperty.notLast": "循环属性仅在最一个行匹配程序上受支持。",
-	"ProblemPatternParser.problemPattern.missingRegExp": "问题模式缺少正则表达式。",
-	"ProblemPatternParser.problemPattern.missingProperty": "问题模式无效。它必须至少包含一个文件、消息和行或位置匹配组。",
-	"ProblemPatternParser.invalidRegexp": "错误：字符串 {0} 不是有效的正则表达式。\n",
-	"ProblemPatternSchema.regexp": "用于在输出中查找错误、警告或信息的正则表达式。",
-	"ProblemPatternSchema.file": "文件名的匹配组索引。如果省略，则使用 1。",
-	"ProblemPatternSchema.location": "问题位置的匹配组索引。有效的位置模式为(line)、(line,column)和(startLine,startColumn,endLine,endColumn)。如果省略了，将假定(line,column)。",
-	"ProblemPatternSchema.line": "问题行的匹配组索引。默认值为 2",
-	"ProblemPatternSchema.column": "问题行字符的匹配组索引。默认值为 3",
-	"ProblemPatternSchema.endLine": "问题结束行的匹配组索引。默认为未定义",
-	"ProblemPatternSchema.endColumn": "问题结束行字符的匹配组索引。默认为未定义",
-	"ProblemPatternSchema.severity": "问题严重性的匹配组索引。默认为未定义",
-	"ProblemPatternSchema.code": "问题代码的匹配组索引。默认为未定义",
-	"ProblemPatternSchema.message": "消息的匹配组索引。如果省略，则在指定了位置时默认值为 4，在其他情况下默认值为 5。",
-	"ProblemPatternSchema.loop": "在多行中，匹配程序循环指示是否只要匹配就在循环中执行此模式。只能在多行模式的最后一个模式上指定。",
-	"NamedProblemPatternSchema.name": "问题模式的名称。",
-	"NamedMultiLineProblemPatternSchema.name": "问题多行问题模式的名称。",
-	"NamedMultiLineProblemPatternSchema.patterns": "实际模式。",
-	"ProblemPatternExtPoint": "提供问题模式",
-	"ProblemPatternRegistry.error": "无效问题模式。此模式将被忽略。",
-	"ProblemMatcherParser.noProblemMatcher": "错误: 描述无法转换为问题匹配程序:\n{0}\n",
-	"ProblemMatcherParser.noProblemPattern": "错误: 描述未定义有效的问题模式:\n{0}\n",
-	"ProblemMatcherParser.noOwner": "错误: 描述未定义所有者:\n{0}\n",
-	"ProblemMatcherParser.noFileLocation": "错误: 描述未定义文件位置:\n{0}\n",
-	"ProblemMatcherParser.unknownSeverity": "信息：未知严重性 {0}。有效值为“error”、“warning”和“info”。\n",
-	"ProblemMatcherParser.noDefinedPatter": "错误: 标识符为 {0} 的模式不存在。",
-	"ProblemMatcherParser.noIdentifier": "错误: 模式属性引用空标识符。",
-	"ProblemMatcherParser.noValidIdentifier": "错误: 模式属性 {0} 是无效的模式变量名。",
-	"ProblemMatcherParser.problemPattern.watchingMatcher": "问题匹配程序必须定义监视的开始模式和结束模式。",
-	"ProblemMatcherParser.invalidRegexp": "错误: 字符串 {0} 不是有效的正则表达式。\n",
-	"WatchingPatternSchema.regexp": "用于检测后台任务开始或结束的正则表达式。",
-	"WatchingPatternSchema.file": "文件名的匹配组索引。可以省略。",
-	"PatternTypeSchema.name": "所提供或预定义模式的名称",
-	"PatternTypeSchema.description": "问题模式或者所提供或预定义问题模式的名称。如果已指定基准，则可以省略。",
-	"ProblemMatcherSchema.base": "要使用的基问题匹配程序的名称。",
-	"ProblemMatcherSchema.owner": "代码内问题的所有者。如果指定了基准，则可省略。如果省略，并且未指定基准，则默认值为“外部”。",
-	"ProblemMatcherSchema.severity": "捕获问题的默认严重性。如果模式未定义严重性的匹配组，则使用。",
-	"ProblemMatcherSchema.applyTo": "控制文本文档上报告的问题是否仅应用于打开、关闭或所有文档。",
-	"ProblemMatcherSchema.fileLocation": "定义应如何解释问题模式中报告的文件名。",
-	"ProblemMatcherSchema.background": "用于跟踪在后台任务上激活的匹配程序的开始和结束的模式。",
-	"ProblemMatcherSchema.background.activeOnStart": "如果设置为 true，则会在任务开始时激活后台监控。这相当于发出与 beginPattern 匹配的行。",
-	"ProblemMatcherSchema.background.beginsPattern": "如果在输出内匹配，则会发出后台任务开始的信号。",
-	"ProblemMatcherSchema.background.endsPattern": "如果在输出内匹配，则会发出后台任务结束的信号。",
-	"ProblemMatcherSchema.watching.deprecated": "“watching”属性已被弃用。请改用“background”。",
-	"ProblemMatcherSchema.watching": "用于跟踪监视匹配程序开始和结束的模式。",
-	"ProblemMatcherSchema.watching.activeOnStart": "如果设置为 true，则当任务开始时观察程序处于活动模式。这相当于发出与 beginPattern 匹配的行。",
-	"ProblemMatcherSchema.watching.beginsPattern": "如果在输出内匹配，则在监视任务开始时会发出信号。",
-	"ProblemMatcherSchema.watching.endsPattern": "如果在输出内匹配，则在监视任务结束时会发出信号。",
-	"LegacyProblemMatcherSchema.watchedBegin.deprecated": "此属性已弃用。请改用观看属性。",
-	"LegacyProblemMatcherSchema.watchedBegin": "一个正则表达式，发出受监视任务开始执行(通过文件监视触发)的信号。",
-	"LegacyProblemMatcherSchema.watchedEnd.deprecated": "此属性已弃用。请改用观看属性。",
-	"LegacyProblemMatcherSchema.watchedEnd": "一个正则表达式，发出受监视任务结束执行的信号。",
-	"NamedProblemMatcherSchema.name": "要引用的问题匹配程序的名称。",
-	"NamedProblemMatcherSchema.label": "问题匹配程序的人类可读标签。",
-	"ProblemMatcherExtPoint": "提供问题匹配程序",
-	"msCompile": "微软编译器问题",
-	"lessCompile": "Less 问题",
-	"gulp-tsc": "Gulp TSC 问题",
-	"jshint": "JSHint 问题",
-	"jshint-stylish": "JSHint stylish 问题",
-	"eslint-compact": "ESLint compact 问题",
-	"eslint-stylish": "ESLint stylish 问题",
-	"go": "Go 问题"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/platform/message/common/message.i18n.json b/i18n/chs/src/vs/platform/message/common/message.i18n.json
deleted file mode 100644
index db08df116ee..00000000000
--- a/i18n/chs/src/vs/platform/message/common/message.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"close": "关闭",
-	"later": "稍后",
-	"cancel": "取消",
-	"moreFile": "...1 个其他文件未显示",
-	"moreFiles": "...{0} 个其他文件未显示"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/platform/node/minimalTranslations.i18n.json b/i18n/chs/src/vs/platform/node/minimalTranslations.i18n.json
deleted file mode 100644
index 678021ac78a..00000000000
--- a/i18n/chs/src/vs/platform/node/minimalTranslations.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"showLanguagePackExtensions": "VS Code 能够以 {0} 语言显示。在商店中搜索语言包即可开始。",
-	"searchMarketplace": "搜索商店",
-	"installAndRestartMessage": "VS Code 能够以 {0} 语言显示。现在安装语言包即可开始使用。需要重启。",
-	"installAndRestart": "安装并重启"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/platform/request/node/request.i18n.json b/i18n/chs/src/vs/platform/request/node/request.i18n.json
deleted file mode 100644
index 18f37de6de6..00000000000
--- a/i18n/chs/src/vs/platform/request/node/request.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"httpConfigurationTitle": "HTTP",
-	"proxy": "要使用的代理设置。如果尚未设置，则将从 http_proxy 和 https_proxy 环境变量获取",
-	"strictSSL": "是否应根据提供的 CA 列表验证代理服务器证书。",
-	"proxyAuthorization": "要作为每个网络请求的 \"Proxy-Authorization\" 标头发送的值。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/platform/telemetry/common/telemetryService.i18n.json b/i18n/chs/src/vs/platform/telemetry/common/telemetryService.i18n.json
deleted file mode 100644
index e91e8844b0e..00000000000
--- a/i18n/chs/src/vs/platform/telemetry/common/telemetryService.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"telemetryConfigurationTitle": "遥测",
-	"telemetry.enableTelemetry": "启用要发送给 Microsoft 的使用情况数据和错误。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/platform/theme/common/colorExtensionPoint.i18n.json b/i18n/chs/src/vs/platform/theme/common/colorExtensionPoint.i18n.json
deleted file mode 100644
index 5e33981fbb8..00000000000
--- a/i18n/chs/src/vs/platform/theme/common/colorExtensionPoint.i18n.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"contributes.color": "提供由扩展定义的主题颜色",
-	"contributes.color.id": "主题颜色标识符",
-	"contributes.color.id.format": "标识符应满足 aa[.bb]*",
-	"contributes.color.description": "主题颜色描述",
-	"contributes.defaults.light": "浅色主题的默认颜色。应为十六进制颜色值 (#RRGGBB[AA]) 或是主题颜色标识符，其提供默认值。",
-	"contributes.defaults.dark": "深色主题的默认颜色。应为十六进制颜色值 (#RRGGBB[AA]) 或是主题颜色标识符，其提供默认值。",
-	"contributes.defaults.highContrast": "高对比度主题的默认颜色。应为十六进制颜色值 (#RRGGBB[AA]) 或是主题颜色标识符，其提供默认值。",
-	"invalid.colorConfiguration": "\"configuration.colors\" 必须是数组",
-	"invalid.default.colorType": "{0} 必须为十六进制颜色值 (#RRGGBB[AA] 或 #RGB[A]) 或是主题颜色标识符，其提供默认值。",
-	"invalid.id": "必须定义 \"configuration.colors.id\"，且不能为空",
-	"invalid.id.format": "\"configuration.colors.id\" 必须满足 word[.word]*",
-	"invalid.description": "必须定义 \"configuration.colors.description\"，且不能为空",
-	"invalid.defaults": "必须定义 “configuration.colors.defaults”，且须包含 \"light\"(浅色)、\"dark\"(深色) 和 \"highContrast\"(高对比度)"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/platform/theme/common/colorRegistry.i18n.json b/i18n/chs/src/vs/platform/theme/common/colorRegistry.i18n.json
deleted file mode 100644
index c983e4e827a..00000000000
--- a/i18n/chs/src/vs/platform/theme/common/colorRegistry.i18n.json
+++ /dev/null
@@ -1,101 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"schema.colors": "工作台中使用的颜色。",
-	"foreground": "整体前景色。此颜色仅在不被组件覆盖时适用。",
-	"errorForeground": "错误信息的整体前景色。此颜色仅在不被组件覆盖时适用。",
-	"descriptionForeground": "提供其他信息的说明文本的前景色，例如标签文本。",
-	"focusBorder": "焦点元素的整体边框颜色。此颜色仅在不被其他组件覆盖时适用。",
-	"contrastBorder": "在元素周围额外的一层边框，用来提高对比度从而区别其他元素。",
-	"activeContrastBorder": "在活动元素周围额外的一层边框，用来提高对比度从而区别其他元素。",
-	"selectionBackground": "工作台所选文本的背景颜色（例如输入字段或文本区域）。注意，本设置不适用于编辑器。",
-	"textSeparatorForeground": "文字分隔符的颜色。",
-	"textLinkForeground": "文本中链接的前景色。",
-	"textLinkActiveForeground": "文本中链接在点击或鼠标悬停时的前景色 。",
-	"textPreformatForeground": "预格式化文本段的前景色。",
-	"textBlockQuoteBackground": "文本中块引用的背景颜色。",
-	"textBlockQuoteBorder": "文本中块引用的边框颜色。",
-	"textCodeBlockBackground": "文本中代码块的背景颜色。",
-	"widgetShadow": "编辑器内小组件（如查找/替换）的阴影颜色。",
-	"inputBoxBackground": "输入框背景色。",
-	"inputBoxForeground": "输入框前景色。",
-	"inputBoxBorder": "输入框边框。",
-	"inputBoxActiveOptionBorder": "输入字段中已激活选项的边框颜色。",
-	"inputPlaceholderForeground": "输入框中占位符的前景色。",
-	"inputValidationInfoBackground": "输入验证结果为信息级别时的背景色。",
-	"inputValidationInfoBorder": "严重性为信息时输入验证的边框颜色。",
-	"inputValidationWarningBackground": "严重性为警告时输入验证的背景色。",
-	"inputValidationWarningBorder": "严重性为警告时输入验证的边框颜色。",
-	"inputValidationErrorBackground": "输入验证结果为错误级别时的背景色。",
-	"inputValidationErrorBorder": "严重性为错误时输入验证的边框颜色。",
-	"dropdownBackground": "下拉列表背景色。",
-	"dropdownListBackground": "下拉列表背景色。",
-	"dropdownForeground": "下拉列表前景色。",
-	"dropdownBorder": "下拉列表边框。",
-	"listFocusBackground": "焦点项在列表或树活动时的背景颜色。活动的列表或树具有键盘焦点，非活动的没有。",
-	"listFocusForeground": "焦点项在列表或树活动时的背景颜色。活动的列表或树具有键盘焦点，非活动的没有。",
-	"listActiveSelectionBackground": "已选项在列表或树活动时的背景颜色。活动的列表或树具有键盘焦点，非活动的没有。",
-	"listActiveSelectionForeground": "已选项在列表或树活动时的前景颜色。活动的列表或树具有键盘焦点，非活动的没有。",
-	"listInactiveSelectionBackground": "已选项在列表或树非活动时的背景颜色。活动的列表或树具有键盘焦点，非活动的没有。",
-	"listInactiveSelectionForeground": "已选项在列表或树非活动时的前景颜色。活动的列表或树具有键盘焦点，非活动的没有。",
-	"listHoverBackground": "使用鼠标移动项目时，列表或树的背景颜色。",
-	"listHoverForeground": "鼠标在项目上悬停时，列表或树的前景颜色。",
-	"listDropBackground": "使用鼠标移动项目时，列表或树进行拖放的背景颜色。",
-	"highlight": "在列表或树中搜索时，其中匹配内容的高亮颜色。",
-	"invalidItemForeground": "列表或树中无效项的前景色，例如资源管理器中没有解析的根目录。",
-	"listErrorForeground": "包含错误的列表项的前景色。",
-	"listWarningForeground": "包含警告的列表项的前景色。",
-	"pickerGroupForeground": "快速选取器分组标签的颜色。",
-	"pickerGroupBorder": "快速选取器分组边框的颜色。",
-	"buttonForeground": "按钮前景色。",
-	"buttonBackground": "按钮背景色。",
-	"buttonHoverBackground": "按钮在悬停时的背景颜色。",
-	"badgeBackground": "Badge 背景色。Badge 是小型的信息标签，如表示搜索结果数量的标签。",
-	"badgeForeground": "Badge 前景色。Badge 是小型的信息标签，如表示搜索结果数量的标签。",
-	"scrollbarShadow": "表示视图被滚动的滚动条阴影。",
-	"scrollbarSliderBackground": "滚动条滑块背景色",
-	"scrollbarSliderHoverBackground": "滚动条滑块在悬停时的背景色",
-	"scrollbarSliderActiveBackground": "滚动条滑块在被点击时的背景色。",
-	"progressBarBackground": "表示长时间操作的进度条的背景色。",
-	"editorBackground": "编辑器背景颜色。",
-	"editorForeground": "编辑器默认前景色。",
-	"editorWidgetBackground": "编辑器组件(如查找/替换)背景颜色。",
-	"editorWidgetBorder": "编辑器小部件的边框颜色。此颜色仅在小部件有边框且不被小部件重写时适用。",
-	"editorSelectionBackground": "编辑器所选内容的颜色。",
-	"editorSelectionForeground": "用以彰显高对比度的所选文本的颜色。",
-	"editorInactiveSelection": "非活动编辑器内已选内容的颜色。颜色必须透明，使其不会挡住下方的其他元素。",
-	"editorSelectionHighlight": "与所选项内容相同的区域的颜色。颜色必须透明，使其不会挡住下方的其他元素。",
-	"editorSelectionHighlightBorder": "与所选项内容相同的区域的边框颜色。",
-	"editorFindMatch": "当前搜索匹配项的颜色。",
-	"findMatchHighlight": "其他搜索匹配项的颜色。颜色必须透明，使其不会挡住下方的其他元素。",
-	"findRangeHighlight": "搜索限制范围的颜色。颜色必须透明，使其不会挡住下方的其他元素。",
-	"editorFindMatchBorder": "当前搜索匹配项的边框颜色。",
-	"findMatchHighlightBorder": "其他搜索匹配项的边框颜色。",
-	"findRangeHighlightBorder": "搜索限制范围的边框颜色。颜色必须透明，使其不会挡住下方的其他元素。",
-	"findWidgetResizeBorder": "“查找”小部件中大小调整条的边框颜色。",
-	"hoverHighlight": "文本在悬停提示显示时的高亮颜色。颜色必须透明，使其不会挡住下方的其他元素。",
-	"hoverBackground": "编辑器悬停提示的背景颜色。",
-	"hoverBorder": "光标悬停时编辑器的边框颜色。",
-	"activeLinkForeground": "活动链接颜色。",
-	"diffEditorInserted": "插入文本的背景色。颜色必须透明，使其不会挡住下方的其他元素。",
-	"diffEditorRemoved": "移除文本的背景色。颜色必须透明，使其不会挡住下方的其他元素。",
-	"diffEditorInsertedOutline": "插入的文本的轮廓颜色。",
-	"diffEditorRemovedOutline": "被删除文本的轮廓颜色。",
-	"mergeCurrentHeaderBackground": "内嵌的合并冲突处理器中当前版本区域头部的背景色。颜色必须透明，使其不会挡住下方的其他元素。",
-	"mergeCurrentContentBackground": "内嵌的合并冲突处理器中当前版本区域内容的背景色。颜色必须透明，使其不会挡住下方的其他元素。",
-	"mergeIncomingHeaderBackground": "内嵌的合并冲突处理器中传入版本区域头部的背景色。颜色必须透明，使其不会挡住下方的其他元素。",
-	"mergeIncomingContentBackground": "内嵌的合并冲突处理器中传入版本区域内容的背景色。颜色必须透明，使其不会挡住下方的其他元素。",
-	"mergeCommonHeaderBackground": "内嵌的合并冲突处理器中共同上级区域头部的背景色。颜色必须透明，使其不会挡住下方的其他元素。",
-	"mergeCommonContentBackground": "内嵌的合并冲突处理器中共同上级区域内容的背景色。颜色必须透明，使其不会挡住下方的其他元素。",
-	"mergeBorder": "内联合并冲突中标头和分割线的边框颜色。",
-	"overviewRulerCurrentContentForeground": "内联合并冲突中当前版本区域的概览标尺前景色。",
-	"overviewRulerIncomingContentForeground": "内联合并冲突中传入的版本区域的概览标尺前景色。",
-	"overviewRulerCommonContentForeground": "内联合并冲突中共同祖先区域的概览标尺前景色。",
-	"overviewRulerFindMatchForeground": "概览标尺中查找匹配项的标记颜色。颜色必须透明，使其不会挡住下方的其他元素。",
-	"overviewRulerSelectionHighlightForeground": "概览标尺中选择高亮的标记颜色。颜色必须透明，使其不会挡住下方的其他元素。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/platform/update/node/update.config.contribution.i18n.json b/i18n/chs/src/vs/platform/update/node/update.config.contribution.i18n.json
deleted file mode 100644
index 90386ed6e64..00000000000
--- a/i18n/chs/src/vs/platform/update/node/update.config.contribution.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"updateConfigurationTitle": "更新",
-	"updateChannel": "配置是否从更新通道接收自动更新。更改后需要重启。",
-	"enableWindowsBackgroundUpdates": "启用 Windows 后台更新。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/platform/url/electron-browser/inactiveExtensionUrlHandler.i18n.json b/i18n/chs/src/vs/platform/url/electron-browser/inactiveExtensionUrlHandler.i18n.json
deleted file mode 100644
index 90f88818479..00000000000
--- a/i18n/chs/src/vs/platform/url/electron-browser/inactiveExtensionUrlHandler.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"confirmUrl": "是否允许扩展打开此 URL?"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/platform/windows/electron-main/windowsService.i18n.json b/i18n/chs/src/vs/platform/windows/electron-main/windowsService.i18n.json
deleted file mode 100644
index e6136f0533c..00000000000
--- a/i18n/chs/src/vs/platform/windows/electron-main/windowsService.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"aboutDetail": "版本 {0}\n提交 {1}\n日期 {2}\nShell {3}\n渲染器 {4}\nNode {5}\n架构 {6}",
-	"okButton": "确定",
-	"copy": "复制(&&C)"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/platform/workspaces/common/workspaces.i18n.json b/i18n/chs/src/vs/platform/workspaces/common/workspaces.i18n.json
deleted file mode 100644
index 2d543ebd224..00000000000
--- a/i18n/chs/src/vs/platform/workspaces/common/workspaces.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"codeWorkspace": "Code 工作区",
-	"untitledWorkspace": "无标题 (工作区)",
-	"workspaceNameVerbose": "{0} (工作区)",
-	"workspaceName": "{0} (工作区)"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/api/browser/localizationsExtensionPoint.i18n.json b/i18n/chs/src/vs/workbench/api/browser/localizationsExtensionPoint.i18n.json
deleted file mode 100644
index 0f2a6cc68a5..00000000000
--- a/i18n/chs/src/vs/workbench/api/browser/localizationsExtensionPoint.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"requirearray": "localizations 必须为数组",
-	"requirestring": "属性“{0}”是必要属性，其类型必须是 \"string\"",
-	"optstring": "属性“{0}”可以省略，否则其类型必须是 \"string\"",
-	"vscode.extension.contributes.localizations": "向编辑器提供本地化内容",
-	"vscode.extension.contributes.localizations.languageId": "显示字符串翻译的目标语言 ID。",
-	"vscode.extension.contributes.localizations.languageName": "显示字符串翻译的目标语言名称。",
-	"vscode.extension.contributes.localizations.translations": "文件夹的相对路径，其中包含了提供语言的所有翻译文件。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/api/browser/viewsContainersExtensionPoint.i18n.json b/i18n/chs/src/vs/workbench/api/browser/viewsContainersExtensionPoint.i18n.json
deleted file mode 100644
index 017005cd335..00000000000
--- a/i18n/chs/src/vs/workbench/api/browser/viewsContainersExtensionPoint.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.contributes.views.containers.id": "用于标识容器的唯一 ID，视图能在容器内通过 \"view\" 参与点提供。",
-	"vscode.extension.contributes.views.containers.title": "人类可读的用于表示此容器的字符串",
-	"vscode.extension.contributes.views.containers.icon": "容器图标的路径。图标大小为 24x24，并居中放置在 50x40 的区域内，其填充颜色为 \"rgb(215, 218, 224)\" 或 \"#d7dae0\"。所有图片格式均可用，推荐使用 SVG 格式。",
-	"vscode.extension.contributes.viewsContainers": "向编辑器提供视图容器",
-	"views.container.activitybar": "向活动栏提供视图容器",
-	"test": "测试",
-	"requirearray": "视图容器必须为数组",
-	"requireidstring": "属性“{0}”是必要属性，其类型必须是 \"string\"。仅支持字母、数字、\"_\" 和 \"-\"。",
-	"requirestring": "“{0}”是必要属性，其类型必须是 \"string\" ",
-	"showViewlet": "显示 {0}",
-	"view": "查看"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json b/i18n/chs/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json
deleted file mode 100644
index 25d7a8f6bec..00000000000
--- a/i18n/chs/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"requirearray": "视图必须为数组",
-	"requirestring": "属性“{0}”是必要属性，其类型必须是 \"string\"",
-	"optstring": "属性“{0}”可以省略，否则其类型必须是 \"string\"",
-	"vscode.extension.contributes.view.id": "视图的标识符。使用标识符通过“vscode.window.registerTreeDataProviderForView” API 注册数据提供程序。同时将“onView:${id}”事件注册到“activationEvents”以激活你的扩展。",
-	"vscode.extension.contributes.view.name": "人类可读的视图名称。将会被显示",
-	"vscode.extension.contributes.view.when": "显示此视图必须为真的条件",
-	"vscode.extension.contributes.views": "向编辑器提供视图",
-	"views.explorer": "向活动栏中的“资源管理器”容器提供视图",
-	"views.debug": "向活动栏中的“调试”容器提供视图",
-	"views.scm": "向活动栏中的“源代码管理”容器提供视图",
-	"views.test": "向活动栏中的“测试”容器提供视图",
-	"views.contributed": "在扩展提供的视图容器中提供视图。",
-	"ViewContainerDoesnotExist": "视图容器“{0}”不存在。所有注册到其中的视图将被添加到“资源管理器”中。",
-	"duplicateView1": "无法在位置“{1}”注册多个 ID 同为“{0}”的视图。",
-	"duplicateView2": "ID 为“{0}”的视图在位置“{1}”已被注册"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/api/electron-browser/mainThreadExtensionService.i18n.json b/i18n/chs/src/vs/workbench/api/electron-browser/mainThreadExtensionService.i18n.json
deleted file mode 100644
index 1b83e2539f4..00000000000
--- a/i18n/chs/src/vs/workbench/api/electron-browser/mainThreadExtensionService.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"overwritingExtension": "使用扩展程序 {1} 覆盖扩展程序 {0}。",
-	"extensionUnderDevelopment": "正在 {0} 处加载开发扩展程序"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/api/electron-browser/mainThreadMessageService.i18n.json b/i18n/chs/src/vs/workbench/api/electron-browser/mainThreadMessageService.i18n.json
deleted file mode 100644
index 9914529823e..00000000000
--- a/i18n/chs/src/vs/workbench/api/electron-browser/mainThreadMessageService.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"extensionSource": "{0} (扩展)",
-	"defaultSource": "扩展",
-	"manageExtension": "管理扩展",
-	"cancel": "取消",
-	"ok": "确定"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json b/i18n/chs/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
deleted file mode 100644
index 8117f5f86ff..00000000000
--- a/i18n/chs/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"timeout.formatOnSave": "在 {0}ms 后终止了保存时进行的格式设置",
-	"codeActionsOnSave.didTimeout": "在 {0}ms 后终止了 codeActionsOnSave ",
-	"timeout.onWillSave": "在 1750ms 后终止了 onWillSaveTextDocument 事件",
-	"saveParticipants": "正在运行保存参与程序..."
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json b/i18n/chs/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json
deleted file mode 100644
index ee8688cdc85..00000000000
--- a/i18n/chs/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"task.label": "{0}: {1}"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/api/electron-browser/mainThreadWebview.i18n.json b/i18n/chs/src/vs/workbench/api/electron-browser/mainThreadWebview.i18n.json
deleted file mode 100644
index a9a4a765557..00000000000
--- a/i18n/chs/src/vs/workbench/api/electron-browser/mainThreadWebview.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"errorMessage": "还原视图时出错: {0}"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/api/electron-browser/mainThreadWorkspace.i18n.json b/i18n/chs/src/vs/workbench/api/electron-browser/mainThreadWorkspace.i18n.json
deleted file mode 100644
index 6f163e86578..00000000000
--- a/i18n/chs/src/vs/workbench/api/electron-browser/mainThreadWorkspace.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"folderStatusMessageAddSingleFolder": "扩展“{0}”添加了 1 个文件夹到工作区",
-	"folderStatusMessageAddMultipleFolders": "扩展“{0}”添加了 {1} 个文件夹到工作区",
-	"folderStatusMessageRemoveSingleFolder": "扩展“{0}”从工作区删除了 1 个文件夹",
-	"folderStatusMessageRemoveMultipleFolders": "扩展“{0}”从工作区删除了 {1} 个文件夹",
-	"folderStatusChangeFolder": "扩展“{0}”更改了工作区中的文件夹"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/api/node/extHostDiagnostics.i18n.json b/i18n/chs/src/vs/workbench/api/node/extHostDiagnostics.i18n.json
deleted file mode 100644
index 58ed5906ab1..00000000000
--- a/i18n/chs/src/vs/workbench/api/node/extHostDiagnostics.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"limitHit": "未显示 {0} 个进一步的错误和警告。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/api/node/extHostExplorerView.i18n.json b/i18n/chs/src/vs/workbench/api/node/extHostExplorerView.i18n.json
deleted file mode 100644
index dc7534a7060..00000000000
--- a/i18n/chs/src/vs/workbench/api/node/extHostExplorerView.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"treeExplorer.notRegistered": "没有注册 ID 为“{0}”的 TreeExplorerNodeProvider。",
-	"treeExplorer.failedToProvideRootNode": "TreeExplorerNodeProvider“{0}”无法提供根节点。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/api/node/extHostExtensionActivator.i18n.json b/i18n/chs/src/vs/workbench/api/node/extHostExtensionActivator.i18n.json
deleted file mode 100644
index a986da91051..00000000000
--- a/i18n/chs/src/vs/workbench/api/node/extHostExtensionActivator.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"unknownDep": "无法激活扩展“{1}”。原因: 未知的依赖项“{0}”。",
-	"failedDep1": "无法激活扩展“{1}”。原因: 无法激活依赖项“{0}”。",
-	"failedDep2": "无法激活扩展”{0}“。原因: 依赖关系超过 10 级(很可能存在循环依赖)。",
-	"activationError": "激活扩展“{0}”失败: {1}。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/api/node/extHostProgress.i18n.json b/i18n/chs/src/vs/workbench/api/node/extHostProgress.i18n.json
deleted file mode 100644
index 07256b420b4..00000000000
--- a/i18n/chs/src/vs/workbench/api/node/extHostProgress.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"extensionSource": "{0} (扩展)"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/api/node/extHostTask.i18n.json b/i18n/chs/src/vs/workbench/api/node/extHostTask.i18n.json
deleted file mode 100644
index ee8688cdc85..00000000000
--- a/i18n/chs/src/vs/workbench/api/node/extHostTask.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"task.label": "{0}: {1}"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/api/node/extHostTreeExplorers.i18n.json b/i18n/chs/src/vs/workbench/api/node/extHostTreeExplorers.i18n.json
deleted file mode 100644
index 9515ef35f27..00000000000
--- a/i18n/chs/src/vs/workbench/api/node/extHostTreeExplorers.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"treeExplorer.notRegistered": "没有注册 ID 为“{0}”的 TreeExplorerNodeProvider。",
-	"treeExplorer.failedToProvideRootNode": "TreeExplorerNodeProvider“{0}”无法提供根节点。",
-	"treeExplorer.failedToResolveChildren": "TreeExplorerNodeProvider“{0}”无法解析 Children。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/api/node/extHostTreeView.i18n.json b/i18n/chs/src/vs/workbench/api/node/extHostTreeView.i18n.json
deleted file mode 100644
index dc7534a7060..00000000000
--- a/i18n/chs/src/vs/workbench/api/node/extHostTreeView.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"treeExplorer.notRegistered": "没有注册 ID 为“{0}”的 TreeExplorerNodeProvider。",
-	"treeExplorer.failedToProvideRootNode": "TreeExplorerNodeProvider“{0}”无法提供根节点。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/api/node/extHostTreeViews.i18n.json b/i18n/chs/src/vs/workbench/api/node/extHostTreeViews.i18n.json
deleted file mode 100644
index 468408a29dd..00000000000
--- a/i18n/chs/src/vs/workbench/api/node/extHostTreeViews.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"treeView.notRegistered": "没有注册 ID 为“{0}”的树形图。",
-	"treeView.duplicateElement": "ID 为 {0} 的元素已被注册"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/api/node/extHostWorkspace.i18n.json b/i18n/chs/src/vs/workbench/api/node/extHostWorkspace.i18n.json
deleted file mode 100644
index b6fcf7d2c19..00000000000
--- a/i18n/chs/src/vs/workbench/api/node/extHostWorkspace.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"updateerror": "扩展“{0}”未能更新工作区文件夹: {1}"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/api/node/mainThreadExtensionService.i18n.json b/i18n/chs/src/vs/workbench/api/node/mainThreadExtensionService.i18n.json
deleted file mode 100644
index 1b83e2539f4..00000000000
--- a/i18n/chs/src/vs/workbench/api/node/mainThreadExtensionService.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"overwritingExtension": "使用扩展程序 {1} 覆盖扩展程序 {0}。",
-	"extensionUnderDevelopment": "正在 {0} 处加载开发扩展程序"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/api/node/mainThreadMessageService.i18n.json b/i18n/chs/src/vs/workbench/api/node/mainThreadMessageService.i18n.json
deleted file mode 100644
index d95075ca825..00000000000
--- a/i18n/chs/src/vs/workbench/api/node/mainThreadMessageService.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"close": "关闭",
-	"cancel": "取消",
-	"ok": "确定"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/browser/actions/configureLocale.i18n.json b/i18n/chs/src/vs/workbench/browser/actions/configureLocale.i18n.json
deleted file mode 100644
index c8f8f1edc8f..00000000000
--- a/i18n/chs/src/vs/workbench/browser/actions/configureLocale.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"configureLocale": "配置语言",
-	"displayLanguage": "定义 VSCode 的显示语言。",
-	"doc": "请参阅 {0}，了解支持的语言列表。",
-	"restart": "更改此值需要重启 VSCode。",
-	"fail.createSettings": "无法创建“{0}”({1})。",
-	"JsonSchema.locale": "要使用的 UI 语言。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/browser/actions/fileActions.i18n.json b/i18n/chs/src/vs/workbench/browser/actions/fileActions.i18n.json
deleted file mode 100644
index 37e6e574bb8..00000000000
--- a/i18n/chs/src/vs/workbench/browser/actions/fileActions.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"openFolder": "打开文件夹...",
-	"openFileFolder": "打开...",
-	"add": "添加"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/browser/actions/toggleActivityBarVisibility.i18n.json b/i18n/chs/src/vs/workbench/browser/actions/toggleActivityBarVisibility.i18n.json
deleted file mode 100644
index 14510096c00..00000000000
--- a/i18n/chs/src/vs/workbench/browser/actions/toggleActivityBarVisibility.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleActivityBar": "切换活动栏可见性",
-	"view": "查看"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/browser/actions/toggleCenteredLayout.i18n.json b/i18n/chs/src/vs/workbench/browser/actions/toggleCenteredLayout.i18n.json
deleted file mode 100644
index c273236df2f..00000000000
--- a/i18n/chs/src/vs/workbench/browser/actions/toggleCenteredLayout.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleCenteredLayout": "切换居中布局",
-	"view": "查看"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/browser/actions/toggleEditorLayout.i18n.json b/i18n/chs/src/vs/workbench/browser/actions/toggleEditorLayout.i18n.json
deleted file mode 100644
index 845765873d7..00000000000
--- a/i18n/chs/src/vs/workbench/browser/actions/toggleEditorLayout.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleEditorGroupLayout": "切换编辑器组布局(垂直/水平)",
-	"horizontalLayout": "水平编辑器组布局",
-	"verticalLayout": "垂直编辑器组布局",
-	"view": "查看"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/browser/actions/toggleSidebarPosition.i18n.json b/i18n/chs/src/vs/workbench/browser/actions/toggleSidebarPosition.i18n.json
deleted file mode 100644
index 5bb1e98bfca..00000000000
--- a/i18n/chs/src/vs/workbench/browser/actions/toggleSidebarPosition.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleSidebarPosition": "切换边栏位置",
-	"view": "查看"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/browser/actions/toggleSidebarVisibility.i18n.json b/i18n/chs/src/vs/workbench/browser/actions/toggleSidebarVisibility.i18n.json
deleted file mode 100644
index 3ca6b7c5b55..00000000000
--- a/i18n/chs/src/vs/workbench/browser/actions/toggleSidebarVisibility.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleSidebar": "切换侧边栏可见性",
-	"view": "查看"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/browser/actions/toggleStatusbarVisibility.i18n.json b/i18n/chs/src/vs/workbench/browser/actions/toggleStatusbarVisibility.i18n.json
deleted file mode 100644
index 15a0f7bad63..00000000000
--- a/i18n/chs/src/vs/workbench/browser/actions/toggleStatusbarVisibility.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleStatusbar": "切换状态栏可见性",
-	"view": "查看"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/browser/actions/toggleTabsVisibility.i18n.json b/i18n/chs/src/vs/workbench/browser/actions/toggleTabsVisibility.i18n.json
deleted file mode 100644
index d1f4960fa10..00000000000
--- a/i18n/chs/src/vs/workbench/browser/actions/toggleTabsVisibility.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleTabs": "切换标签页可见性",
-	"view": "查看"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/browser/actions/toggleZenMode.i18n.json b/i18n/chs/src/vs/workbench/browser/actions/toggleZenMode.i18n.json
deleted file mode 100644
index bc36dd5da51..00000000000
--- a/i18n/chs/src/vs/workbench/browser/actions/toggleZenMode.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleZenMode": "切换 Zen 模式",
-	"view": "查看"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/browser/actions/workspaceActions.i18n.json b/i18n/chs/src/vs/workbench/browser/actions/workspaceActions.i18n.json
deleted file mode 100644
index 1be88d0e515..00000000000
--- a/i18n/chs/src/vs/workbench/browser/actions/workspaceActions.i18n.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openFile": "打开文件...",
-	"openFolder": "打开文件夹...",
-	"openFileFolder": "打开...",
-	"globalRemoveFolderFromWorkspace": "将文件夹从工作区删除…",
-	"saveWorkspaceAsAction": "将工作区另存为...",
-	"save": "保存(&&S)",
-	"saveWorkspace": "保存工作区",
-	"openWorkspaceAction": "打开工作区...",
-	"openWorkspaceConfigFile": "打开工作区配置文件",
-	"duplicateWorkspaceInNewWindow": "复制此工作区并在新窗口打开"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/browser/actions/workspaceCommands.i18n.json b/i18n/chs/src/vs/workbench/browser/actions/workspaceCommands.i18n.json
deleted file mode 100644
index 4edf839a663..00000000000
--- a/i18n/chs/src/vs/workbench/browser/actions/workspaceCommands.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"addFolderToWorkspace": "将文件夹添加到工作区...",
-	"add": "添加(&&A)",
-	"addFolderToWorkspaceTitle": "将文件夹添加到工作区",
-	"workspaceFolderPickerPlaceholder": "选择工作区文件夹"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/browser/parts/activitybar/activitybarActions.i18n.json b/i18n/chs/src/vs/workbench/browser/parts/activitybar/activitybarActions.i18n.json
deleted file mode 100644
index 6484617f5e8..00000000000
--- a/i18n/chs/src/vs/workbench/browser/parts/activitybar/activitybarActions.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"badgeTitle": "{0} - {1}",
-	"titleKeybinding": "{0} ({1})",
-	"removeFromActivityBar": "从活动栏中隐藏",
-	"keepInActivityBar": "保留活动栏",
-	"additionalViews": "其他视图",
-	"numberBadge": "{0} ({1})",
-	"manageExtension": "管理扩展",
-	"toggle": "切换已固定的视图"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/browser/parts/activitybar/activitybarPart.i18n.json b/i18n/chs/src/vs/workbench/browser/parts/activitybar/activitybarPart.i18n.json
deleted file mode 100644
index e5136c6aced..00000000000
--- a/i18n/chs/src/vs/workbench/browser/parts/activitybar/activitybarPart.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hideActivitBar": "隐藏活动栏",
-	"globalActions": "全局动作"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/browser/parts/compositePart.i18n.json b/i18n/chs/src/vs/workbench/browser/parts/compositePart.i18n.json
deleted file mode 100644
index 5be42c8edeb..00000000000
--- a/i18n/chs/src/vs/workbench/browser/parts/compositePart.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"ariaCompositeToolbarLabel": "{0} 操作",
-	"titleTooltip": "{0} ({1})"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/browser/parts/compositebar/compositeBar.i18n.json b/i18n/chs/src/vs/workbench/browser/parts/compositebar/compositeBar.i18n.json
deleted file mode 100644
index 2e8d897c540..00000000000
--- a/i18n/chs/src/vs/workbench/browser/parts/compositebar/compositeBar.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"activityBarAriaLabel": "活动视图切换器"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/browser/parts/compositebar/compositeBarActions.i18n.json b/i18n/chs/src/vs/workbench/browser/parts/compositebar/compositeBarActions.i18n.json
deleted file mode 100644
index 2fec61ef1b8..00000000000
--- a/i18n/chs/src/vs/workbench/browser/parts/compositebar/compositeBarActions.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"largeNumberBadge": "1万+",
-	"badgeTitle": "{0} - {1}",
-	"additionalViews": "其他视图",
-	"numberBadge": "{0} ({1})",
-	"manageExtension": "管理扩展",
-	"titleKeybinding": "{0} ({1})",
-	"hide": "隐藏",
-	"keep": "保持",
-	"toggle": "切换已固定的视图"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/browser/parts/editor/binaryDiffEditor.i18n.json b/i18n/chs/src/vs/workbench/browser/parts/editor/binaryDiffEditor.i18n.json
deleted file mode 100644
index ea1317f6659..00000000000
--- a/i18n/chs/src/vs/workbench/browser/parts/editor/binaryDiffEditor.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"metadataDiff": "{0} ↔ {1}"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/browser/parts/editor/binaryEditor.i18n.json b/i18n/chs/src/vs/workbench/browser/parts/editor/binaryEditor.i18n.json
deleted file mode 100644
index 0dcb0b4961b..00000000000
--- a/i18n/chs/src/vs/workbench/browser/parts/editor/binaryEditor.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"binaryEditor": "二进制查看器"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json b/i18n/chs/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json
deleted file mode 100644
index 0afdcb03a40..00000000000
--- a/i18n/chs/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"textEditor": "文本编辑器",
-	"textDiffEditor": "文本差异编辑器",
-	"binaryDiffEditor": "二进制差异编辑器",
-	"sideBySideEditor": "并排编辑器",
-	"groupOnePicker": "在第一组中显示编辑器",
-	"groupTwoPicker": "在第二组中显示编辑器",
-	"groupThreePicker": "在第三组中显示编辑器",
-	"allEditorsPicker": "显示所有已打开的编辑器",
-	"view": "查看",
-	"file": "文件",
-	"close": "关闭",
-	"closeOthers": "关闭其他",
-	"closeRight": "关闭右侧",
-	"closeAllSaved": "关闭已保存",
-	"closeAll": "全部关闭",
-	"keepOpen": "保持打开状态",
-	"toggleInlineView": "切换内联视图",
-	"showOpenedEditors": "显示打开的编辑器",
-	"keepEditor": "保留编辑器",
-	"closeEditorsInGroup": "关闭组中的所有编辑器",
-	"closeSavedEditors": "关闭组中已保存的编辑器",
-	"closeOtherEditors": "关闭其他编辑器",
-	"closeRightEditors": "关闭右侧编辑器"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/browser/parts/editor/editorActions.i18n.json b/i18n/chs/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
deleted file mode 100644
index d88886a3538..00000000000
--- a/i18n/chs/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
+++ /dev/null
@@ -1,58 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"splitEditor": "拆分编辑器",
-	"joinTwoGroups": "合并两个组的编辑器",
-	"navigateEditorGroups": "在编辑器组间进行导航",
-	"focusActiveEditorGroup": "聚焦活动编辑器组",
-	"focusFirstEditorGroup": "聚焦于第一个编辑器组",
-	"focusSecondEditorGroup": "聚焦于第二个编辑器组",
-	"focusThirdEditorGroup": "聚焦于第三个编辑器组",
-	"focusPreviousGroup": "聚焦于上一个组",
-	"focusNextGroup": "聚焦于下一个组",
-	"openToSide": "打开到侧边",
-	"closeEditor": "关闭编辑器",
-	"closeOneEditor": "关闭",
-	"revertAndCloseActiveEditor": "还原并关闭编辑器",
-	"closeEditorsToTheLeft": "关闭左侧编辑器",
-	"closeAllEditors": "关闭所有编辑器",
-	"closeEditorsInOtherGroups": "关闭其他组中的编辑器",
-	"moveActiveGroupLeft": "向左移动编辑器组",
-	"moveActiveGroupRight": "向右移动编辑器组",
-	"minimizeOtherEditorGroups": "最小化其他编辑器组",
-	"evenEditorGroups": "编辑器组平均宽度",
-	"maximizeEditor": "最大化编辑器组并隐藏边栏",
-	"openNextEditor": "打开下一个编辑器",
-	"openPreviousEditor": "打开上一个编辑器",
-	"nextEditorInGroup": "打开组中的下一个编辑器",
-	"openPreviousEditorInGroup": "打开组中上一个编辑器",
-	"lastEditorInGroup": "打开组中上一个编辑器",
-	"navigateNext": "前进",
-	"navigatePrevious": "后退",
-	"navigateLast": "转到最后",
-	"reopenClosedEditor": "重新打开已关闭的编辑器",
-	"clearRecentFiles": "清除最近打开",
-	"showEditorsInFirstGroup": "在第一组中显示编辑器",
-	"showEditorsInSecondGroup": "在第二组中显示编辑器",
-	"showEditorsInThirdGroup": "在第三组中显示编辑器",
-	"showAllEditors": "显示所有编辑器",
-	"openPreviousRecentlyUsedEditorInGroup": "打开组中上一个最近使用的编辑器",
-	"openNextRecentlyUsedEditorInGroup": "打开组中下一个最近使用的编辑器",
-	"navigateEditorHistoryByInput": "从历史记录里打开上一个编辑器",
-	"openNextRecentlyUsedEditor": "打开下一个最近使用的编辑器",
-	"openPreviousRecentlyUsedEditor": "打开上一个最近使用的编辑器",
-	"clearEditorHistory": "清除编辑器历史记录",
-	"focusLastEditorInStack": "打开组中上一个编辑器",
-	"moveEditorLeft": "向左移动编辑器",
-	"moveEditorRight": "向右移动编辑器",
-	"moveEditorToPreviousGroup": "将编辑器移动到上一组",
-	"moveEditorToNextGroup": "将编辑器移动到下一组",
-	"moveEditorToFirstGroup": "将编辑器移动到第一组",
-	"moveEditorToSecondGroup": "将编辑器移动到第二组",
-	"moveEditorToThirdGroup": "将编辑器移动到第三组"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json b/i18n/chs/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json
deleted file mode 100644
index 7288c171522..00000000000
--- a/i18n/chs/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"editorCommand.activeEditorMove.description": "按标签或按组移动活动编辑器",
-	"editorCommand.activeEditorMove.arg.name": "活动编辑器移动参数",
-	"editorCommand.activeEditorMove.arg.description": "参数属性:\n\t* \"to\": 提供向何处移动的字符串值。\n\t* \"by\": 提供移动的单位的字符串值。按选项卡或按组。\n\t* \"value\": 提供移动的位置数量或移动到的绝对位置的数字型值。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/browser/parts/editor/editorPart.i18n.json b/i18n/chs/src/vs/workbench/browser/parts/editor/editorPart.i18n.json
deleted file mode 100644
index c82e283a050..00000000000
--- a/i18n/chs/src/vs/workbench/browser/parts/editor/editorPart.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"groupOneVertical": "左侧",
-	"groupTwoVertical": "居中",
-	"groupThreeVertical": "右侧",
-	"groupOneHorizontal": "顶部",
-	"groupTwoHorizontal": "居中",
-	"groupThreeHorizontal": "底部",
-	"editorOpenError": "无法打开“{0}”: {1}。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/browser/parts/editor/editorPicker.i18n.json b/i18n/chs/src/vs/workbench/browser/parts/editor/editorPicker.i18n.json
deleted file mode 100644
index 9a7c78be728..00000000000
--- a/i18n/chs/src/vs/workbench/browser/parts/editor/editorPicker.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"entryAriaLabel": "{0}, 编辑器组选取器",
-	"groupLabel": "组: {0}",
-	"noResultsFoundInGroup": "未在组中找到匹配的已打开编辑器",
-	"noOpenedEditors": "已打开的编辑器组列表当前为空",
-	"noResultsFound": "未找到匹配的已打开编辑器",
-	"noOpenedEditorsAllGroups": "已打开的编辑器列表当前为空"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json b/i18n/chs/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json
deleted file mode 100644
index 885d0713a18..00000000000
--- a/i18n/chs/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"singleSelectionRange": "行 {0}，列 {1} (已选择{2})",
-	"singleSelection": "行 {0}，列 {1}",
-	"multiSelectionRange": "{0} 选择(已选择 {1} 个字符)",
-	"multiSelection": "{0} 选择",
-	"endOfLineLineFeed": "LF",
-	"endOfLineCarriageReturnLineFeed": "CRLF",
-	"tabFocusModeEnabled": "按 Tab 移动焦点",
-	"screenReaderDetected": "已为屏幕阅读器优化",
-	"screenReaderDetectedExtra": "如果你没有使用屏幕阅读器，请将设置中的“editor.accessibilitySupport”改为“off”。",
-	"disableTabMode": "禁用辅助功能模式",
-	"gotoLine": "转到行",
-	"selectIndentation": "选择缩进",
-	"selectEncoding": "选择编码",
-	"selectEOL": "选择行尾序列",
-	"selectLanguageMode": "选择语言模式",
-	"fileInfo": "文件信息",
-	"spacesSize": "空格: {0}",
-	"tabSize": "制表符长度: {0}",
-	"showLanguageExtensions": "搜索“{0}”的应用市场扩展程序...",
-	"changeMode": "更改语言模式",
-	"noEditor": "此时没有处于活动状态的文本编辑器",
-	"languageDescription": "({0}) - 已配置的语言",
-	"languageDescriptionConfigured": "({0})",
-	"languagesPicks": "语言(标识符)",
-	"configureModeSettings": "配置“{0}”语言基础设置...",
-	"configureAssociationsExt": "“{0}”的配置文件关联...",
-	"autoDetect": "自动检测",
-	"pickLanguage": "选择语言模式",
-	"currentAssociation": "当前关联",
-	"pickLanguageToConfigure": "选择要与“{0}”关联的语言模式",
-	"changeIndentation": "更改缩进",
-	"noWritableCodeEditor": "活动代码编辑器为只读模式。",
-	"indentView": "更改视图",
-	"indentConvert": "转换文件",
-	"pickAction": "选择操作",
-	"changeEndOfLine": "更改行尾序列",
-	"pickEndOfLine": "选择行尾序列",
-	"changeEncoding": "更改文件编码",
-	"noFileEditor": "此时无活动文件",
-	"saveWithEncoding": "通过编码保存",
-	"reopenWithEncoding": "通过编码重新打开",
-	"guessedEncoding": "通过内容猜测",
-	"pickEncodingForReopen": "选择文件编码以重新打开文件",
-	"pickEncodingForSave": "选择用于保存的文件编码",
-	"screenReaderDetectedExplanation.title": "已为屏幕阅读器优化",
-	"screenReaderDetectedExplanation.question": "你在使用屏幕阅读器额来操作 VS Code 吗？",
-	"screenReaderDetectedExplanation.answerYes": "是",
-	"screenReaderDetectedExplanation.answerNo": "否",
-	"screenReaderDetectedExplanation.body1": "VS Code 已为屏幕阅读器的使用进行优化。",
-	"screenReaderDetectedExplanation.body2": "某些编辑器功能可能会有不同的行为，例如自动换行、折叠等。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/browser/parts/editor/resourceViewer.i18n.json b/i18n/chs/src/vs/workbench/browser/parts/editor/resourceViewer.i18n.json
deleted file mode 100644
index 041d404a5fb..00000000000
--- a/i18n/chs/src/vs/workbench/browser/parts/editor/resourceViewer.i18n.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"sizeB": "{0} B",
-	"sizeKB": "{0} KB",
-	"sizeMB": "{0} MB",
-	"sizeGB": "{0} GB",
-	"sizeTB": "{0} TB",
-	"largeImageError": "图片太大，无法在编辑器中显示 ({0})。 ",
-	"resourceOpenExternalButton": "使用外部程序打开图片？",
-	"nativeFileTooLargeError": "文件太大，无法在编辑器中显示 ({0})。",
-	"nativeBinaryError": "此文件是二进制文件或使用了不支持的文本编码，无法在编辑器中显示。",
-	"openAsText": "是否仍要打开?",
-	"zoom.action.fit.label": "整个图像",
-	"imgMeta": "{0}x{1} {2}"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/browser/parts/editor/tabsTitleControl.i18n.json b/i18n/chs/src/vs/workbench/browser/parts/editor/tabsTitleControl.i18n.json
deleted file mode 100644
index a8c33fb8fff..00000000000
--- a/i18n/chs/src/vs/workbench/browser/parts/editor/tabsTitleControl.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"araLabelTabActions": "选项卡操作"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json b/i18n/chs/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json
deleted file mode 100644
index f99f129b03c..00000000000
--- a/i18n/chs/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"textDiffEditor": "文本差异编辑器",
-	"readonlyEditorWithInputAriaLabel": "{0}。只读文本比较编辑器。",
-	"readonlyEditorAriaLabel": "只读文本比较编辑器。",
-	"editableEditorWithInputAriaLabel": "{0}。文本文件比较编辑器。",
-	"editableEditorAriaLabel": "文本文件比较编辑器。",
-	"navigate.next.label": "下一个更改",
-	"navigate.prev.label": "上一个更改",
-	"toggleIgnoreTrimWhitespace.label": "忽略可裁剪的空白字符"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/browser/parts/editor/textEditor.i18n.json b/i18n/chs/src/vs/workbench/browser/parts/editor/textEditor.i18n.json
deleted file mode 100644
index 5713f6e5c57..00000000000
--- a/i18n/chs/src/vs/workbench/browser/parts/editor/textEditor.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"editorLabelWithGroup": "{0}，所在组为: {1}。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/browser/parts/editor/textResourceEditor.i18n.json b/i18n/chs/src/vs/workbench/browser/parts/editor/textResourceEditor.i18n.json
deleted file mode 100644
index 7f278e955bb..00000000000
--- a/i18n/chs/src/vs/workbench/browser/parts/editor/textResourceEditor.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"textEditor": "文本编辑器",
-	"readonlyEditorWithInputAriaLabel": "{0}。只读文本编辑器。",
-	"readonlyEditorAriaLabel": "只读文本编辑器。",
-	"untitledFileEditorWithInputAriaLabel": "{0}。无标题文件文本编辑器。",
-	"untitledFileEditorAriaLabel": "无标题文件文本编辑器。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/browser/parts/editor/titleControl.i18n.json b/i18n/chs/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
deleted file mode 100644
index 928aff21e49..00000000000
--- a/i18n/chs/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"araLabelEditorActions": "编辑器操作"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/browser/parts/notifications/notificationsActions.i18n.json b/i18n/chs/src/vs/workbench/browser/parts/notifications/notificationsActions.i18n.json
deleted file mode 100644
index 609be4f4565..00000000000
--- a/i18n/chs/src/vs/workbench/browser/parts/notifications/notificationsActions.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"clearNotification": "清除通知",
-	"clearNotifications": "清除所有通知",
-	"hideNotificationsCenter": "隐藏通知",
-	"expandNotification": "展开通知",
-	"collapseNotification": "折叠通知",
-	"configureNotification": "配置通知",
-	"copyNotification": "复制文本"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/browser/parts/notifications/notificationsAlerts.i18n.json b/i18n/chs/src/vs/workbench/browser/parts/notifications/notificationsAlerts.i18n.json
deleted file mode 100644
index 21793ea598c..00000000000
--- a/i18n/chs/src/vs/workbench/browser/parts/notifications/notificationsAlerts.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"alertErrorMessage": "错误: {0}",
-	"alertWarningMessage": "警告: {0}",
-	"alertInfoMessage": "信息: {0}"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json b/i18n/chs/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json
deleted file mode 100644
index de6818efc1d..00000000000
--- a/i18n/chs/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"notificationsEmpty": "没有新通知",
-	"notifications": "通知",
-	"notificationsToolbar": "通知中心操作",
-	"notificationsList": "通知列表"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/browser/parts/notifications/notificationsCommands.i18n.json b/i18n/chs/src/vs/workbench/browser/parts/notifications/notificationsCommands.i18n.json
deleted file mode 100644
index bb8beb2a397..00000000000
--- a/i18n/chs/src/vs/workbench/browser/parts/notifications/notificationsCommands.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"notifications": "通知",
-	"showNotifications": "显示通知",
-	"hideNotifications": "隐藏通知",
-	"clearAllNotifications": "清除所有通知"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/browser/parts/notifications/notificationsStatus.i18n.json b/i18n/chs/src/vs/workbench/browser/parts/notifications/notificationsStatus.i18n.json
deleted file mode 100644
index b4d73509bc1..00000000000
--- a/i18n/chs/src/vs/workbench/browser/parts/notifications/notificationsStatus.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hideNotifications": "隐藏通知",
-	"zeroNotifications": "没有通知",
-	"noNotifications": "没有新通知",
-	"oneNotification": "1 条新通知",
-	"notifications": "{0} 条新通知"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/browser/parts/notifications/notificationsToasts.i18n.json b/i18n/chs/src/vs/workbench/browser/parts/notifications/notificationsToasts.i18n.json
deleted file mode 100644
index b8424e3c3db..00000000000
--- a/i18n/chs/src/vs/workbench/browser/parts/notifications/notificationsToasts.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"notificationsToast": "通知横幅"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/browser/parts/notifications/notificationsViewer.i18n.json b/i18n/chs/src/vs/workbench/browser/parts/notifications/notificationsViewer.i18n.json
deleted file mode 100644
index c7731000c1d..00000000000
--- a/i18n/chs/src/vs/workbench/browser/parts/notifications/notificationsViewer.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"notificationActions": "通知操作",
-	"notificationSource": "来源: {0}"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/browser/parts/panel/panelActions.i18n.json b/i18n/chs/src/vs/workbench/browser/parts/panel/panelActions.i18n.json
deleted file mode 100644
index 2bc66f46ab8..00000000000
--- a/i18n/chs/src/vs/workbench/browser/parts/panel/panelActions.i18n.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"closePanel": "关闭面板",
-	"togglePanel": "切换面板",
-	"focusPanel": "聚焦到面板中",
-	"toggledPanelPosition": "切换面板位置",
-	"moveToRight": "移动到右侧",
-	"moveToBottom": "移动到底部",
-	"toggleMaximizedPanel": "切换最大化面板",
-	"maximizePanel": "最大化面板大小",
-	"minimizePanel": "恢复面板大小",
-	"view": "查看"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/browser/parts/panel/panelPart.i18n.json b/i18n/chs/src/vs/workbench/browser/parts/panel/panelPart.i18n.json
deleted file mode 100644
index 401610c43b3..00000000000
--- a/i18n/chs/src/vs/workbench/browser/parts/panel/panelPart.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hidePanel": "隐藏面板"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/browser/parts/quickinput/quickInput.i18n.json b/i18n/chs/src/vs/workbench/browser/parts/quickinput/quickInput.i18n.json
deleted file mode 100644
index 23748047f41..00000000000
--- a/i18n/chs/src/vs/workbench/browser/parts/quickinput/quickInput.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"inputModeEntryDescription": "{0} (按 \"Enter\" 键确认或按 \"Esc\" 键取消)",
-	"inputModeEntry": "按 \"Enter\" 键确认或按 \"Esc\" 键取消",
-	"quickInput.countSelected": "已选 {0} 项",
-	"ok": "确定"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/browser/parts/quickinput/quickInputBox.i18n.json b/i18n/chs/src/vs/workbench/browser/parts/quickinput/quickInputBox.i18n.json
deleted file mode 100644
index a968ba2efad..00000000000
--- a/i18n/chs/src/vs/workbench/browser/parts/quickinput/quickInputBox.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"quickInputBox.ariaLabel": "在此输入可缩小结果范围。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/browser/parts/quickopen/quickOpenController.i18n.json b/i18n/chs/src/vs/workbench/browser/parts/quickopen/quickOpenController.i18n.json
deleted file mode 100644
index f902c2a464b..00000000000
--- a/i18n/chs/src/vs/workbench/browser/parts/quickopen/quickOpenController.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"emptyPicks": "无条目可供选取",
-	"quickOpenInput": "键入 \"?\" 从此处获取有关可进行的操作的帮助",
-	"historyMatches": "最近打开",
-	"noResultsFound1": "未找到结果",
-	"canNotRunPlaceholder": "在当前上下文中无法使用此 Quick Open 处理程序",
-	"entryAriaLabel": "{0}，最近打开",
-	"removeFromEditorHistory": "从历史记录中删除",
-	"pickHistory": "选择要从历史记录中删除的编辑器项"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/browser/parts/quickopen/quickopen.contribution.i18n.json b/i18n/chs/src/vs/workbench/browser/parts/quickopen/quickopen.contribution.i18n.json
deleted file mode 100644
index 04188ac2f79..00000000000
--- a/i18n/chs/src/vs/workbench/browser/parts/quickopen/quickopen.contribution.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"quickOpen": "转到文件...",
-	"quickNavigateNext": "在 Quick Open 中导航到下一个",
-	"quickNavigatePrevious": "在 Quick Open 中导航到上一个",
-	"quickSelectNext": "在 Quick Open 中选择“下一步”",
-	"quickSelectPrevious": "在 Quick Open 中选择“上一步”"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/browser/parts/quickopen/quickopen.i18n.json b/i18n/chs/src/vs/workbench/browser/parts/quickopen/quickopen.i18n.json
deleted file mode 100644
index e8d0fe848b0..00000000000
--- a/i18n/chs/src/vs/workbench/browser/parts/quickopen/quickopen.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"quickOpen": "转到文件...",
-	"quickNavigateNext": "在 Quick Open 中导航到下一个",
-	"quickNavigatePrevious": "在 Quick Open 中导航到上一个",
-	"quickSelectNext": "在 Quick Open 中选择“下一步”",
-	"quickSelectPrevious": "在 Quick Open 中选择“上一步”"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/browser/parts/sidebar/sidebarPart.i18n.json b/i18n/chs/src/vs/workbench/browser/parts/sidebar/sidebarPart.i18n.json
deleted file mode 100644
index cd46a67b91b..00000000000
--- a/i18n/chs/src/vs/workbench/browser/parts/sidebar/sidebarPart.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"focusSideBar": "聚焦信息侧边栏",
-	"viewCategory": "查看"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/browser/parts/statusbar/statusbarPart.i18n.json b/i18n/chs/src/vs/workbench/browser/parts/statusbar/statusbarPart.i18n.json
deleted file mode 100644
index be10f4109e7..00000000000
--- a/i18n/chs/src/vs/workbench/browser/parts/statusbar/statusbarPart.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"manageExtension": "管理扩展"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/browser/parts/titlebar/titlebarPart.i18n.json b/i18n/chs/src/vs/workbench/browser/parts/titlebar/titlebarPart.i18n.json
deleted file mode 100644
index 4a2dece6b8d..00000000000
--- a/i18n/chs/src/vs/workbench/browser/parts/titlebar/titlebarPart.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"patchedWindowTitle": "[不受支持]",
-	"userIsAdmin": "[管理员]",
-	"userIsSudo": "[超级用户]",
-	"devExtensionWindowTitlePrefix": "[扩展开发主机]"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/browser/parts/views/panelViewlet.i18n.json b/i18n/chs/src/vs/workbench/browser/parts/views/panelViewlet.i18n.json
deleted file mode 100644
index 33244815132..00000000000
--- a/i18n/chs/src/vs/workbench/browser/parts/views/panelViewlet.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"viewToolbarAriaLabel": "{0} 操作"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/browser/parts/views/views.i18n.json b/i18n/chs/src/vs/workbench/browser/parts/views/views.i18n.json
deleted file mode 100644
index 1e211f7c694..00000000000
--- a/i18n/chs/src/vs/workbench/browser/parts/views/views.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"viewToolbarAriaLabel": "{0} 操作",
-	"hideView": "从侧边栏中隐藏"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/browser/parts/views/viewsRegistry.i18n.json b/i18n/chs/src/vs/workbench/browser/parts/views/viewsRegistry.i18n.json
deleted file mode 100644
index 85f57daaba0..00000000000
--- a/i18n/chs/src/vs/workbench/browser/parts/views/viewsRegistry.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"duplicateId": "ID 为“{0}”的视图在位置“{1}”已被注册"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/browser/parts/views/viewsViewlet.i18n.json b/i18n/chs/src/vs/workbench/browser/parts/views/viewsViewlet.i18n.json
deleted file mode 100644
index 51045c0c145..00000000000
--- a/i18n/chs/src/vs/workbench/browser/parts/views/viewsViewlet.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"cannot toggle": "无法切换视图 {0} 的可见性",
-	"cannot show": "无法显示视图 {0}，已依据其 \"when\" 条件隐藏",
-	"hideView": "隐藏"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/browser/quickopen.i18n.json b/i18n/chs/src/vs/workbench/browser/quickopen.i18n.json
deleted file mode 100644
index bcf11424e2a..00000000000
--- a/i18n/chs/src/vs/workbench/browser/quickopen.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noResultsMatching": "没有匹配的结果",
-	"noResultsFound2": "未找到结果"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/browser/viewlet.i18n.json b/i18n/chs/src/vs/workbench/browser/viewlet.i18n.json
deleted file mode 100644
index 919d7c73323..00000000000
--- a/i18n/chs/src/vs/workbench/browser/viewlet.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"compositePart.hideSideBarLabel": "隐藏侧边栏",
-	"collapse": "全部折叠"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/common/theme.i18n.json b/i18n/chs/src/vs/workbench/common/theme.i18n.json
deleted file mode 100644
index 9dff140c48c..00000000000
--- a/i18n/chs/src/vs/workbench/common/theme.i18n.json
+++ /dev/null
@@ -1,72 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"tabActiveBackground": "活动选项卡的背景色。在编辑器区域，选项卡是编辑器的容器。可在一个编辑器组中打开多个选项卡。可以有多个编辑器组。",
-	"tabInactiveBackground": "非活动选项卡的背景色。在编辑器区域，选项卡是编辑器的容器。可在一个编辑器组中打开多个选项卡。可以有多个编辑器组。",
-	"tabHoverBackground": "选项卡被悬停时的背景色。选项卡是编辑器区域中编辑器的容器。可在一个编辑器组中打开多个选项卡。可以有多个编辑器组。",
-	"tabUnfocusedHoverBackground": "非焦点组选项卡被悬停时的背景色。选项卡是编辑器区域中编辑器的容器。可在一个编辑器组中打开多个选项卡。可以有多个编辑器组。",
-	"tabBorder": "用于将选项卡彼此分隔开的边框。选项卡是编辑器区域中编辑器的容器。可在一个编辑器组中打开多个选项卡。可以存在多个编辑器组。",
-	"tabActiveBorder": "活动选项卡底部的边框。选项卡是编辑器区域中编辑器的容器。可在一个编辑器组中打开多个选项卡。可以存在多个编辑器组。",
-	"tabActiveBorderTop": "活动选项卡顶部的边框。选项卡是编辑器区域中编辑器的容器。可在一个编辑器组中打开多个选项卡。可以存在多个编辑器组。",
-	"tabActiveUnfocusedBorder": "在失去焦点的编辑器组中的活动选项卡底部的边框。选项卡是编辑器区域中编辑器的容器。可在一个编辑器组中打开多个选项卡。可以存在多个编辑器组。",
-	"tabActiveUnfocusedBorderTop": "在失去焦点的编辑器组中的活动选项卡顶部的边框。选项卡是编辑器区域中编辑器的容器。可在一个编辑器组中打开多个选项卡。可以存在多个编辑器组。",
-	"tabHoverBorder": "选项卡被悬停时用于突出显示的边框。选项卡是编辑器区域中编辑器的容器。可在一个编辑器组中打开多个选项卡。可以有多个编辑器组。",
-	"tabUnfocusedHoverBorder": "非焦点组选项卡被悬停时用于突出显示的边框。选项卡是编辑器区域中编辑器的容器。可在一个编辑器组中打开多个选项卡。可以有多个编辑器组。",
-	"tabActiveForeground": "活动组中活动选项卡的前景色。在编辑器区域，选项卡是编辑器的容器。可在一个编辑器组中打开多个选项卡。可以有多个编辑器组。",
-	"tabInactiveForeground": "活动组中非活动选项卡的前景色。在编辑器区域，选项卡是编辑器的容器。可在一个编辑器组中打开多个选项卡。可以有多个编辑器组。",
-	"tabUnfocusedActiveForeground": "一个失去焦点的编辑器组中的活动选项卡的前景色。在编辑器区域，选项卡是编辑器的容器。可在一个编辑器组中打开多个选项卡。可以有多个编辑器组。",
-	"tabUnfocusedInactiveForeground": "在一个失去焦点的组中非活动选项卡的前景色。在编辑器区域，选项卡是编辑器的容器。可在一个编辑器组中打开多个选项卡。可以有多个编辑器组。",
-	"editorGroupBackground": "编辑器组的背景颜色。编辑器组是编辑器的容器。此颜色在拖动编辑器组时显示。",
-	"tabsContainerBackground": "启用选项卡时编辑器组标题的背景颜色。编辑器组是编辑器的容器。",
-	"tabsContainerBorder": "选项卡启用时编辑器组标题的边框颜色。编辑器组是编辑器的容器。",
-	"editorGroupHeaderBackground": "禁用选项卡 (\"workbench.editor.showTabs\": false) 时编辑器组标题颜色。编辑器组是编辑器的容器。",
-	"editorGroupBorder": "将多个编辑器组彼此分隔开的颜色。编辑器组是编辑器的容器。",
-	"editorDragAndDropBackground": "拖动编辑器时的背景颜色。此颜色应有透明度，以便编辑器内容能透过背景。",
-	"panelBackground": "面板的背景色。面板显示在编辑器区域下方，可包含输出和集成终端等视图。",
-	"panelBorder": "将面板与编辑器隔开的边框的颜色。面板显示在编辑区域下方，包含输出和集成终端等视图。",
-	"panelActiveTitleForeground": "活动面板的标题颜色。面板显示在编辑器区域下方，并包含输出和集成终端等视图。",
-	"panelInactiveTitleForeground": "非活动面板的标题颜色。面板显示在编辑器区域下方，并包含输出和集成终端等视图。",
-	"panelActiveTitleBorder": "活动面板的边框颜色。面板显示在编辑器区域下方，包含输出和集成终端等视图。",
-	"panelDragAndDropBackground": "面板标题项在拖放时的反馈颜色。此颜色应有透明度，以便面板项仍能透过。面板显示在编辑器区域下方，包含输出和集成终端等视图。",
-	"statusBarForeground": "工作区打开时状态栏的前景色。状态栏显示在窗口底部。",
-	"statusBarNoFolderForeground": "没有打开文件夹时状态栏的前景色。状态栏显示在窗口底部。",
-	"statusBarBackground": "工作区打开时状态栏的背景色。状态栏显示在窗口底部。",
-	"statusBarNoFolderBackground": "没有打开文件夹时状态栏的背景色。状态栏显示在窗口底部。",
-	"statusBarBorder": "状态栏分隔侧边栏和编辑器的边框颜色。状态栏显示在窗口底部。",
-	"statusBarNoFolderBorder": "当没有打开文件夹时，用来使状态栏与侧边栏、编辑器分隔的状态栏边框颜色。状态栏显示在窗口底部。",
-	"statusBarItemActiveBackground": "单击时的状态栏项背景色。状态栏显示在窗口底部。",
-	"statusBarItemHoverBackground": "悬停时的状态栏项背景色。状态栏显示在窗口底部。",
-	"statusBarProminentItemBackground": "状态栏突出显示项的背景颜色。突出显示项比状态栏中的其他条目更醒目以表明其重要性。在命令面板中更改“切换 Tab 键是否移动焦点”可查看示例。状态栏显示在窗口底部。",
-	"statusBarProminentItemHoverBackground": "状态栏突出显示项在被悬停时的背景颜色。突出显示项比状态栏中的其他条目更醒目以表明其重要性。在命令面板中更改“切换 Tab 键是否移动焦点”可查看示例。状态栏显示在窗口底部。",
-	"activityBarBackground": "活动栏背景色。活动栏显示在最左侧或最右侧，并允许在侧边栏的视图间切换。",
-	"activityBarForeground": "活动栏前景色(例如用于图标)。活动栏显示在最左侧或最右侧，并允许在侧边栏的视图间切换。",
-	"activityBarBorder": "活动栏分隔侧边栏的边框颜色。活动栏显示在最左侧或最右侧，并可以切换侧边栏的视图。",
-	"activityBarDragAndDropBackground": "活动栏项在被拖放时的反馈颜色。此颜色应有透明度，以便活动栏条目能透过此颜色。活动栏显示在最左侧或最右侧，并允许在侧边栏视图之间切换。",
-	"activityBarBadgeBackground": "活动通知徽章背景色。活动栏显示在最左侧或最右侧，并允许在侧边栏的视图间切换。",
-	"activityBarBadgeForeground": "活动通知徽章前景色。活动栏显示在最左侧或最右侧，并允许在侧边栏的视图间切换。",
-	"sideBarBackground": "侧边栏背景色。侧边栏是资源管理器和搜索等视图的容器。",
-	"sideBarForeground": "侧边栏前景色。侧边栏是资源管理器和搜索等视图的容器。",
-	"sideBarBorder": "侧边栏分隔编辑器的边框颜色。侧边栏包含资源管理器、搜索等视图。",
-	"sideBarTitleForeground": "侧边栏标题前景色。侧边栏是资源管理器和搜索等视图的容器。",
-	"sideBarDragAndDropBackground": "侧边栏中的部分在拖放时的反馈颜色。此颜色应有透明度，以便侧边栏中的部分仍能透过。侧边栏是资源管理器和搜索等视图的容器。",
-	"sideBarSectionHeaderBackground": "侧边栏节标题的背景颜色。侧边栏是资源管理器和搜索等视图的容器。",
-	"sideBarSectionHeaderForeground": "侧边栏节标题的前景色。侧边栏包括资源管理器、搜索等视图。",
-	"titleBarActiveForeground": "窗口处于活动状态时的标题栏前景色。请注意，该颜色当前仅在 macOS 上受支持。",
-	"titleBarInactiveForeground": "窗口处于非活动状态时的标题栏前景色。请注意，该颜色当前仅在 macOS 上受支持。",
-	"titleBarActiveBackground": "窗口处于活动状态时的标题栏背景色。请注意，该颜色当前仅在 macOS 上受支持。",
-	"titleBarInactiveBackground": "窗口处于非活动状态时的标题栏背景色。请注意，该颜色当前仅在 macOS 上受支持。",
-	"titleBarBorder": "标题栏边框颜色。请注意，该颜色当前仅在 macOS 上受支持。",
-	"notificationCenterBorder": "通知中心的边框颜色。通知从窗口右下角滑入。",
-	"notificationToastBorder": "通知横幅的边框颜色。通知从窗口右下角滑入。",
-	"notificationsForeground": "通知的前景色。通知从窗口右下角滑入。",
-	"notificationsBackground": "通知的背景色。通知从窗口右下角滑入。",
-	"notificationsLink": "通知链接的前景色。通知从窗口右下角滑入。",
-	"notificationCenterHeaderForeground": "通知中心头部的前景色。通知从窗口右下角滑入。",
-	"notificationCenterHeaderBackground": "通知中心头部的背景色。通知从窗口右下角滑入。",
-	"notificationsBorder": "通知中心中分隔通知的边框的颜色。通知从窗口右下角滑入。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/common/views.i18n.json b/i18n/chs/src/vs/workbench/common/views.i18n.json
deleted file mode 100644
index bb6a3e28cb1..00000000000
--- a/i18n/chs/src/vs/workbench/common/views.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"duplicateId": "ID 为 {0} 的视图在位置“{1}”已被注册"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/electron-browser/actions.i18n.json b/i18n/chs/src/vs/workbench/electron-browser/actions.i18n.json
deleted file mode 100644
index c8466983eb9..00000000000
--- a/i18n/chs/src/vs/workbench/electron-browser/actions.i18n.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"closeWindow": "关闭窗口",
-	"closeWorkspace": "关闭工作区",
-	"noWorkspaceOpened": "此实例当前没有打开工作区，无法关闭。",
-	"newWindow": "新建窗口",
-	"toggleFullScreen": "切换全屏",
-	"toggleMenuBar": "切换菜单栏",
-	"toggleDevTools": "切换开发人员工具",
-	"zoomIn": "放大",
-	"zoomOut": "缩小",
-	"zoomReset": "重置缩放",
-	"appPerf": "启动性能",
-	"reloadWindow": "重新加载窗口",
-	"reloadWindowWithExntesionsDisabled": "禁用扩展后重新加载窗口",
-	"switchWindowPlaceHolder": "选择切换的窗口",
-	"current": "当前窗口",
-	"close": "关闭窗口",
-	"switchWindow": "切换窗口...",
-	"quickSwitchWindow": "快速切换窗口...",
-	"workspaces": "工作区",
-	"files": "文件",
-	"openRecentPlaceHolderMac": "选择并打开(按住 Cmd 键在新窗口中打开) ",
-	"openRecentPlaceHolder": "选择并打开(按住 Ctrl 键在新窗口中打开)",
-	"remove": "从最近打开中删除",
-	"openRecent": "打开最近的文件…",
-	"quickOpenRecent": "快速打开最近的文件…",
-	"reportIssueInEnglish": "使用英文报告问题",
-	"openProcessExplorer": "打开进程管理器",
-	"reportPerformanceIssue": "报告性能问题",
-	"keybindingsReference": "键盘快捷方式参考",
-	"openDocumentationUrl": "文档",
-	"openIntroductoryVideosUrl": "入门视频",
-	"openTipsAndTricksUrl": "提示与技巧",
-	"toggleSharedProcess": "切换共享进程",
-	"navigateLeft": "导航到左侧视图",
-	"navigateRight": "导航到右侧视图",
-	"navigateUp": "导航到上方视图",
-	"navigateDown": "导航到下方视图",
-	"increaseViewSize": "增加当前视图大小",
-	"decreaseViewSize": "减小当前视图大小",
-	"showPreviousTab": "显示上一个窗口选项卡",
-	"showNextWindowTab": "显示下一个窗口选项卡",
-	"moveWindowTabToNewWindow": "将窗口选项卡移动到新窗口",
-	"mergeAllWindowTabs": "合并所有窗口",
-	"toggleWindowTabsBar": "切换窗口选项卡栏",
-	"about": "关于 {0}",
-	"inspect context keys": "检查上下文键值"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/electron-browser/commands.i18n.json b/i18n/chs/src/vs/workbench/electron-browser/commands.i18n.json
deleted file mode 100644
index 983899514ca..00000000000
--- a/i18n/chs/src/vs/workbench/electron-browser/commands.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"diffLeftRightLabel": "{0} ⟷ {1}"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/electron-browser/configureLocale.i18n.json b/i18n/chs/src/vs/workbench/electron-browser/configureLocale.i18n.json
deleted file mode 100644
index c8f8f1edc8f..00000000000
--- a/i18n/chs/src/vs/workbench/electron-browser/configureLocale.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"configureLocale": "配置语言",
-	"displayLanguage": "定义 VSCode 的显示语言。",
-	"doc": "请参阅 {0}，了解支持的语言列表。",
-	"restart": "更改此值需要重启 VSCode。",
-	"fail.createSettings": "无法创建“{0}”({1})。",
-	"JsonSchema.locale": "要使用的 UI 语言。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/electron-browser/crashReporter.i18n.json b/i18n/chs/src/vs/workbench/electron-browser/crashReporter.i18n.json
deleted file mode 100644
index 0581515bc92..00000000000
--- a/i18n/chs/src/vs/workbench/electron-browser/crashReporter.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"telemetryConfigurationTitle": "遥测",
-	"telemetry.enableCrashReporting": "启用要发送给 Microsoft 的故障报表。\n此选项需重启才可生效。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/electron-browser/extensionHost.i18n.json b/i18n/chs/src/vs/workbench/electron-browser/extensionHost.i18n.json
deleted file mode 100644
index 2f9f1e433c1..00000000000
--- a/i18n/chs/src/vs/workbench/electron-browser/extensionHost.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"extensionHostProcess.startupFailDebug": "扩展未在 10 秒内启动，可能在第一行已停止，需要调试器才能继续。",
-	"extensionHostProcess.startupFail": "扩展主机未在 10 秒内启动，这可能是一个问题。",
-	"extensionHostProcess.error": "扩展主机中的错误: {0}",
-	"devTools": "开发人员工具",
-	"extensionHostProcess.crash": "扩展主机意外终止。请重新加载窗口以恢复。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/electron-browser/main.contribution.i18n.json b/i18n/chs/src/vs/workbench/electron-browser/main.contribution.i18n.json
deleted file mode 100644
index eb24c55b636..00000000000
--- a/i18n/chs/src/vs/workbench/electron-browser/main.contribution.i18n.json
+++ /dev/null
@@ -1,91 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"view": "查看",
-	"help": "帮助",
-	"file": "文件",
-	"workspaces": "工作区",
-	"developer": "开发者",
-	"workbenchConfigurationTitle": "工作台",
-	"showEditorTabs": "控制打开的编辑器是否显示在选项卡中。",
-	"workbench.editor.labelFormat.default": "显示文件名。当启用选项卡且在同一组内有两个相同名称的文件时，将添加每个文件路径中可以用于区分的部分。在选项卡被禁用且编辑器活动时，将显示相对于工作区文件夹的路径。",
-	"workbench.editor.labelFormat.short": "在文件的目录名之后显示文件名。",
-	"workbench.editor.labelFormat.medium": "在文件相对当前工作区文件夹的路径之后显示文件名。",
-	"workbench.editor.labelFormat.long": "在文件的绝对路径之后显示文件名。",
-	"tabDescription": "控制编辑器标签的格式。修改这项设置会让文件的路径更容易理解：\n- short: \"parent\"\n- medium: \"workspace/src/parent\"\n- long: \"/home/user/workspace/src/parent\"\n- default: 当与另一选项卡标题相同时为 \".../parent\"。选项卡被禁用时则为相对工作区路径",
-	"editorTabCloseButton": "控制编辑器的选项卡关闭按钮的位置，或当设置为 \"off\" 时禁用关闭它们。",
-	"tabSizing": "控制编辑器选项卡的大小。若设置为 \"fit\"，选项卡将总是足够大，能够完全显示编辑器标签。若设置为 \"shrink\"，将在不能一次全部显示所有选项卡时，允许选项卡缩小。",
-	"showIcons": "控制打开的编辑器是否随图标一起显示。这还需启用图标主题。",
-	"enablePreview": "控制是否将打开的编辑器显示为预览。预览编辑器将会重用至其被保留(例如，通过双击或编辑)，且其字体样式将为斜体。",
-	"enablePreviewFromQuickOpen": "控制 Quick Open 中打开的编辑器是否显示为预览。预览编辑器可以重新使用，直到将其保留(例如，通过双击或编辑)。",
-	"closeOnFileDelete": "控制文件被其他某些进程删除或重命名时是否应该自动关闭显示文件的编辑器。禁用此项会保持编辑器作为此类事件的脏文件打开。请注意，从应用程序内部进行删除操作会始终关闭编辑器，并且脏文件始终不会关闭以保存数据。",
-	"editorOpenPositioning": "控制打开编辑器的位置。选择“左侧”或“右侧”以在当前活动位置的左侧或右侧打开编辑器。选择“第一个”或“最后一个”以从当前活动位置独立打开编辑器。",
-	"revealIfOpen": "控制打开时编辑器是否显示在任何可见组中。如果禁用，编辑器会优先在当前活动编辑器组中打开。如果启用，会显示已打开的编辑器而不是在当前活动编辑器组中再次打开。请注意，有些情况下会忽略此设置，例如强制编辑器在特定组中或在当前活动组的边侧打开时。",
-	"swipeToNavigate": "使用三指横扫在打开的文件之间导航",
-	"commandHistory": "控制命令面板中保留最近使用命令的数量。设置为 0 时禁用命令历史功能。",
-	"preserveInput": "控制是否在再次打开命令面板时恢复上一次的输入内容。",
-	"closeOnFocusLost": "控制 Quick Open 是否应在失去焦点时自动关闭。",
-	"openDefaultSettings": "控制打开设置时是否打开显示所有默认设置的编辑器。",
-	"sideBarLocation": "控制边栏的位置。它可显示在工作台的左侧或右侧。",
-	"panelDefaultLocation": "控制此面板的默认位置。可显示在工作台的底部或右侧。",
-	"statusBarVisibility": "控制工作台底部状态栏的可见性。",
-	"activityBarVisibility": "控制工作台中活动栏的可见性。",
-	"viewVisibility": "控制是否显示视图头部的操作项。视图头部操作项可以一直，或是仅当聚焦到和悬停在视图上时显示。",
-	"fontAliasing": "控制工作台中字体的渲染方式\n- default: 次像素平滑字体。将在大多数非 retina 显示器上显示最清晰的文字\n- antialiased: 进行像素而不是次像素级别的字体平滑。可能会导致字体整体显示得更细\n- none: 禁用字体平滑。将显示边缘粗糙、有锯齿的文字\n- auto: 根据显示器 DPI 自动应用 \"default\" 或 \"antialiased\" 选项。",
-	"workbench.fontAliasing.default": "次像素平滑字体。将在大多数非 retina 显示器上显示最清晰的文字。",
-	"workbench.fontAliasing.antialiased": "进行像素而不是次像素级别的字体平滑。可能会导致字体整体显示得更细。",
-	"workbench.fontAliasing.none": "禁用字体平滑。将显示边缘粗糙、有锯齿的文字。",
-	"workbench.fontAliasing.auto": "根据显示器 DPI 自动应用 \"default\" 或 \"antialiased\" 选项。",
-	"enableNaturalLanguageSettingsSearch": "控制是否在设置中启用自然语言搜索模式。",
-	"windowConfigurationTitle": "窗口",
-	"window.openFilesInNewWindow.on": "文件将在新窗口中打开",
-	"window.openFilesInNewWindow.off": "文件将在该文件的文件夹打开的窗口中打开，或在上一个活动窗口中打开",
-	"window.openFilesInNewWindow.defaultMac": "在不通过“程序坞”(Dock) 或“访达”(Finder) 打开的情况下，文件将在其所在文件夹的已有窗口中打开，或在上一个活动窗口中打开",
-	"window.openFilesInNewWindow.default": "除了从软件内部选择的文件 (如，从“文件”菜单选择)，其他所有文件都将在新窗口中打开",
-	"openFilesInNewWindowMac": "控制是否在新窗口中打开文件。\n- default: 在不通过“程序坞”(Dock) 或“访达”(Finder) 打开的情况下，文件将在其所在文件夹的已有窗口中打开，或在上一个活动窗口中打开\n- on: 文件将在新窗口中打开\n- off: 文件将在其所在文件夹的已有窗口中打开，或在上一个活动窗口中打开\n注意，此设置可能会被忽略 (例如，在使用 -new-window 或 -reuse-window 命令行选项时)。",
-	"openFilesInNewWindow": "控制是否在新窗口中打开文件。\n- default: 除了从软件内部选择的文件 (如，从“文件”菜单选择)，其他所有文件都将在新窗口中打开\n- on: 文件将在新窗口中打开\n- off: 文件将在其所在文件夹的已有窗口中打开，或在上一个活动窗口中打开\n注意，此设置可能会被忽略 (例如，在使用 -new-window 或 -reuse-window 命令行选项时)。",
-	"window.openFoldersInNewWindow.on": "文件夹将在新窗口中打开",
-	"window.openFoldersInNewWindow.off": "文件夹将替换上一个活动窗口",
-	"window.openFoldersInNewWindow.default": "文件夹在新窗口中打开，除非从应用程序内选取一个文件夹(例如，通过“文件”菜单)",
-	"openFoldersInNewWindow": "控制文件夹应在新窗口中打开还是替换上一活动窗口。\n- default: 文件夹将在新窗口中打开，除非文件是从应用程序内选取的(例如通过“文件”菜单)\n- on: 文件夹将在新窗口中打开\n- off: 文件夹将替换上一活动窗口\n注意，可能仍会存在忽略此设置的情况(例如当使用 -new-window 或 -reuse-window 命令行选项时)。",
-	"window.openWithoutArgumentsInNewWindow.on": "打开一个新的空窗口",
-	"window.openWithoutArgumentsInNewWindow.off": "聚焦于最后活动的运行实例",
-	"openWithoutArgumentsInNewWindow": "控制在另一实例无参启动时打开新的空窗口或是聚焦到最后运行的实例\n- on: 打开新的空窗口\n- off: 最后活动的运行实例将获得焦点\n注意，此设置可能会被忽略 (例如，在使用 -new-window 或 -reuse-window 命令行选项时)。",
-	"window.reopenFolders.all": "重新打开所有窗口。",
-	"window.reopenFolders.folders": "重新打开所有文件夹。空工作区将不会被恢复。",
-	"window.reopenFolders.one": "重新打开上一个活动窗口。",
-	"window.reopenFolders.none": "永远不重新打开窗口。总是以一个空窗口启动。",
-	"restoreWindows": "控制重启后重新打开窗口的方式。选择 \"none\" 则永远在启动时打开一个空工作区，\"one\" 则重新打开最后使用的窗口，\"folders\" 则重新打开所有含有文件夹的窗口，\"all\" 则重新打开上次会话的所有窗口。",
-	"restoreFullscreen": "如果窗口已退出全屏模式，控制其是否应还原为全屏模式。",
-	"zoomLevel": "调整窗口的缩放级别。原始大小是 0，每次递增(例如 1)或递减(例如 -1)表示放大或缩小 20%。也可以输入小数以便以更精细的粒度调整缩放级别。",
-	"title": "根据活动编辑器控制窗口标题。变量基于上下文进行替换:\n${activeEditorShort}: 文件名 (如 myFile.txt)\n${activeEditorMedium}: 相对于工作区文件夹的文件路径 (如 myFolder/myFile.txt)\n${activeEditorLong}: 文件的完整路径 (如 /Users/Development/myProject/myFolder/myFile.txt)\n${folderName}: 文件所在工作区文件夹名称 (如 myFolder)\n${folderPath}: 文件所在工作区文件夹路径 (如 /Users/Development/myFolder)\n${rootName}: 工作区名称 (如 myFolder 或 myWorkspace)\n${rootPath}: 工作区路径 (如 /Users/Development/myWorkspace)\n${appName}: 如 VS Code\n${dirty}: 活动编辑器有更新时显示的更新指示器\n${separator}: 仅在被有值变量或静态文本包围时显示的分隔符 (\" - \")",
-	"window.newWindowDimensions.default": "在屏幕中心打开新窗口。",
-	"window.newWindowDimensions.inherit": "以与上一个活动窗口相同的尺寸打开新窗口。",
-	"window.newWindowDimensions.maximized": "打开最大化的新窗口。",
-	"window.newWindowDimensions.fullscreen": "在全屏模式下打开新窗口。",
-	"newWindowDimensions": "控制在已有窗口时新打开窗口的尺寸。默认情况下，新窗口将以小尺寸在屏幕的中央打开。当设置为“inherit”时，新窗口将继承上一活动窗口的尺寸，设置为“maximized”时窗口将被最大化，设置为“fullscreen”时则变为全屏。请注意，此设置对第一个打开的窗口无效。第一个窗口总是会恢复关闭前的大小和位置。",
-	"closeWhenEmpty": "控制关闭最后一个编辑器是否关闭整个窗口。此设置仅适用于不显示文件夹的窗口。",
-	"window.menuBarVisibility.default": "菜单仅在全屏模式下隐藏。",
-	"window.menuBarVisibility.visible": "菜单始终可见，即使处于全屏模式下。",
-	"window.menuBarVisibility.toggle": "菜单隐藏，但可以通过 Alt 键显示。",
-	"window.menuBarVisibility.hidden": "菜单始终隐藏。",
-	"menuBarVisibility": "控制菜单栏的可见性。“切换”设置表示隐藏菜单栏，按一次 Alt 键则将显示此菜单栏。默认情况下，除非窗口为全屏，否则菜单栏可见。",
-	"enableMenuBarMnemonics": "启用后，即可使用 Alt 快捷键打开主菜单。若禁用助记键，这些 Alt 快捷键将能绑定到编辑器命令。",
-	"autoDetectHighContrast": "如果已启用，将自动更改为高对比度主题；如果 Windows 正在使用高对比度主题，则当离开 Windows 高对比度主题时会更改为深色主题。",
-	"titleBarStyle": "调整窗口标题栏的外观。更改需要在完全重启后才能应用。",
-	"window.nativeTabs": "\n启用macOS Sierra窗口选项卡。请注意，更改需要完全重新启动程序才能生效。如果配置此选项，本机选项卡将禁用自定义标题栏样式。",
-	"window.smoothScrollingWorkaround": "启用解决方案来修复还原最小化的 VS Code 窗口后平滑滚动消失的问题。这个滚动的卡顿问题出现在拥有精确式触控板的设备上，比如来自 Microsoft 的 Surface 设备(https://github.com/Microsoft/vscode/issues/13612)。如果启用这个解决方案，窗口布局可能会在从最小化状态中还原后有些许闪烁，其他方面则无大碍。",
-	"window.clickThroughInactive": "启用后，点击非活动窗口后将在激活窗口的同时触发光标之下的元素 (若可点击)。禁用后，点击非活动窗口仅能激活窗口，再次点击才能触发元素。",
-	"zenModeConfigurationTitle": "Zen 模式",
-	"zenMode.fullScreen": "控制打开 Zen Mode 是否也会将工作台置于全屏模式。",
-	"zenMode.centerLayout": "控制是否在 Zen 模式中启用居中布局",
-	"zenMode.hideTabs": "控制打开 Zen 模式是否也会隐藏工作台选项卡。",
-	"zenMode.hideStatusBar": "控制打开 Zen 模式是否也会隐藏工作台底部的状态栏。",
-	"zenMode.hideActivityBar": "控制打开 Zen 模式是否也会隐藏工作台左侧的活动栏。",
-	"zenMode.restore": "控制如果某窗口已退出 zen 模式，是否应还原到 zen 模式。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/electron-browser/main.i18n.json b/i18n/chs/src/vs/workbench/electron-browser/main.i18n.json
deleted file mode 100644
index 03de288e981..00000000000
--- a/i18n/chs/src/vs/workbench/electron-browser/main.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"loaderError": "无法加载需要的文件。您的 Internet 连接已断开，或者您连接的服务器已脱机。请刷新浏览器并重试。",
-	"loaderErrorNative": "未能加载所需文件。请重启应用程序重试。详细信息: {0}"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/electron-browser/shell.i18n.json b/i18n/chs/src/vs/workbench/electron-browser/shell.i18n.json
deleted file mode 100644
index 3f8eff44c3f..00000000000
--- a/i18n/chs/src/vs/workbench/electron-browser/shell.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"runningAsRoot": "不建议将 Code 作为“根”运行。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/electron-browser/window.i18n.json b/i18n/chs/src/vs/workbench/electron-browser/window.i18n.json
deleted file mode 100644
index b437f51e7f9..00000000000
--- a/i18n/chs/src/vs/workbench/electron-browser/window.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"undo": "撤消",
-	"redo": "恢复",
-	"cut": "剪切",
-	"copy": "复制",
-	"paste": "粘贴",
-	"selectAll": "全选",
-	"runningAsRoot": "不建议以 root 用户身份运行 {0}。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/electron-browser/workbench.i18n.json b/i18n/chs/src/vs/workbench/electron-browser/workbench.i18n.json
deleted file mode 100644
index 7d2adf39ce0..00000000000
--- a/i18n/chs/src/vs/workbench/electron-browser/workbench.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"developer": "开发者",
-	"file": "文件"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/node/extensionHostMain.i18n.json b/i18n/chs/src/vs/workbench/node/extensionHostMain.i18n.json
deleted file mode 100644
index 28bf47289a8..00000000000
--- a/i18n/chs/src/vs/workbench/node/extensionHostMain.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"extensionTestError": "路径 {0} 未指向有效的扩展测试运行程序。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/node/extensionPoints.i18n.json b/i18n/chs/src/vs/workbench/node/extensionPoints.i18n.json
deleted file mode 100644
index eb7858e1e0c..00000000000
--- a/i18n/chs/src/vs/workbench/node/extensionPoints.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"jsonParseFail": "未能分析 {0}: {1}。",
-	"fileReadFail": "无法读取文件 {0}: {1}。",
-	"jsonsParseFail": "未能分析 {0} 或 {1}: {2}。",
-	"missingNLSKey": "无法找到键 {0} 的消息。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/cli/electron-browser/cli.contribution.i18n.json b/i18n/chs/src/vs/workbench/parts/cli/electron-browser/cli.contribution.i18n.json
deleted file mode 100644
index 57b974f49bb..00000000000
--- a/i18n/chs/src/vs/workbench/parts/cli/electron-browser/cli.contribution.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"install": "在 PATH 中安装“{0}”命令",
-	"not available": "此命令不可用",
-	"successIn": "已成功在 PATH 中安装了 Shell 命令“{0}”。",
-	"ok": "确定",
-	"cancel2": "取消",
-	"warnEscalation": "Code 将使用 \"osascript\" 来提示获取管理员权限，进一步安装 shell 命令。",
-	"cantCreateBinFolder": "无法创建 \"/usr/local/bin\"。",
-	"aborted": "已中止",
-	"uninstall": "从 PATH 中卸载“{0}”命令",
-	"successFrom": "已成功从 PATH 卸载 Shell 命令“{0}”。",
-	"shellCommand": "Shell 命令"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/codeEditor/electron-browser/accessibility.i18n.json b/i18n/chs/src/vs/workbench/parts/codeEditor/electron-browser/accessibility.i18n.json
deleted file mode 100644
index 60affc06866..00000000000
--- a/i18n/chs/src/vs/workbench/parts/codeEditor/electron-browser/accessibility.i18n.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"emergencyConfOn": "现在将设置 \"editor.accessibilitySupport\" 更改为 \"on\"。",
-	"openingDocs": "正在打开 VS Code 辅助功能文档页面。",
-	"introMsg": "感谢试用 VS Code 的辅助功能选项。",
-	"status": "状态:",
-	"changeConfigToOnMac": "要配置编辑器对屏幕阅读器进行永久优化，请按 Command+E。",
-	"changeConfigToOnWinLinux": "要配置编辑器对屏幕阅读器进行永久优化，请按 Ctrl+E。",
-	"auto_unknown": "编辑器被配置为使用平台 API 以检测是否附加了屏幕阅读器，但当前运行时不支持此功能。",
-	"auto_on": "编辑器自动检测到已附加屏幕阅读器。",
-	"auto_off": "编辑器被配置为自动检测是否附加了屏幕阅读器，当前未检测到。",
-	"configuredOn": "已配置编辑器对屏幕阅读器进行永久优化 — 您可以更改 \"editor.accessibilitySupport\" 设置进行调整。",
-	"configuredOff": "编辑器被配置为不对屏幕阅读器的使用进行优化。",
-	"tabFocusModeOnMsg": "在当前编辑器中按 Tab 会将焦点移动到下一个可聚焦的元素。按 {0} 来切换此行为。",
-	"tabFocusModeOnMsgNoKb": "若在当前编辑器中按 Tab 键，将移动焦点到下一个可聚焦的元素。当前无法通过按键绑定触发命令 {0}。",
-	"tabFocusModeOffMsg": "在当前编辑器中按 Tab 将插入制表符。按 {0} 来切换此行为。",
-	"tabFocusModeOffMsgNoKb": "若在当前编辑器中按 Tab 键，将插入制表符。当前无法通过按键绑定触发命令 {0}。",
-	"openDocMac": "按 Command+H 以打开浏览器窗口，其中包含更多有关 VS Code 辅助功能的信息。",
-	"openDocWinLinux": "按 Ctrl+H 以打开浏览器窗口，其中包含更多有关 VS Code 辅助功能的信息。",
-	"outroMsg": "你可以按 Esc 或 Shift+Esc 消除此工具提示并返回到编辑器。",
-	"ShowAccessibilityHelpAction": "显示辅助功能帮助"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/codeEditor/electron-browser/inspectKeybindings.i18n.json b/i18n/chs/src/vs/workbench/parts/codeEditor/electron-browser/inspectKeybindings.i18n.json
deleted file mode 100644
index 8bec2cf0968..00000000000
--- a/i18n/chs/src/vs/workbench/parts/codeEditor/electron-browser/inspectKeybindings.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"workbench.action.inspectKeyMap": "开发者: 检查按键映射"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/codeEditor/electron-browser/inspectTMScopes.i18n.json b/i18n/chs/src/vs/workbench/parts/codeEditor/electron-browser/inspectTMScopes.i18n.json
deleted file mode 100644
index 69af1a1991c..00000000000
--- a/i18n/chs/src/vs/workbench/parts/codeEditor/electron-browser/inspectTMScopes.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"inspectTMScopes": "开发者: 检查 TM 作用域",
-	"inspectTMScopesWidget.loading": "正在加载..."
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/codeEditor/electron-browser/languageConfiguration/languageConfigurationExtensionPoint.i18n.json b/i18n/chs/src/vs/workbench/parts/codeEditor/electron-browser/languageConfiguration/languageConfigurationExtensionPoint.i18n.json
deleted file mode 100644
index 4d6f4a6905a..00000000000
--- a/i18n/chs/src/vs/workbench/parts/codeEditor/electron-browser/languageConfiguration/languageConfigurationExtensionPoint.i18n.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"parseErrors": "错误分析 {0}: {1}",
-	"schema.openBracket": "左方括号字符或字符串序列。",
-	"schema.closeBracket": "右方括号字符或字符串序列。",
-	"schema.comments": "定义注释符号",
-	"schema.blockComments": "定义块注释的标记方式。",
-	"schema.blockComment.begin": "作为块注释开头的字符序列。",
-	"schema.blockComment.end": "作为块注释结尾的字符序列。",
-	"schema.lineComment": "作为行注释开头的字符序列。",
-	"schema.brackets": "定义增加和减少缩进的括号。",
-	"schema.autoClosingPairs": "定义括号对。当输入左方括号时，将自动插入右方括号。",
-	"schema.autoClosingPairs.notIn": "定义禁用了自动配对的作用域列表。",
-	"schema.surroundingPairs": "定义可用于包围所选字符串的括号对。",
-	"schema.wordPattern": "此语言的文本定义。",
-	"schema.wordPattern.pattern": "用于匹配文本的正则表达式模式。",
-	"schema.wordPattern.flags": "用于匹配文本的正则表达式标志。",
-	"schema.wordPattern.flags.errorMessage": "必须匹配模式“/^([gimuy]+)$/”。",
-	"schema.indentationRules": "语言的缩进设置。",
-	"schema.indentationRules.increaseIndentPattern": "如果一行文本匹配此模式，则之后所有内容都应被缩进一次（直到匹配其他规则）。",
-	"schema.indentationRules.increaseIndentPattern.pattern": "increaseIndentPattern 的正则表达式模式。",
-	"schema.indentationRules.increaseIndentPattern.flags": "increaseIndentPattern 的正则表达式标志。",
-	"schema.indentationRules.increaseIndentPattern.errorMessage": "必须匹配模式“/^([gimuy]+)$/”。",
-	"schema.indentationRules.decreaseIndentPattern": "如果一行文本匹配此模式，则之后所有内容都应被取消缩进一次（直到匹配其他规则）。",
-	"schema.indentationRules.decreaseIndentPattern.pattern": "decreaseIndentPattern 的正则表达式模式。",
-	"schema.indentationRules.decreaseIndentPattern.flags": "decreaseIndentPattern 的正则表达式标志。",
-	"schema.indentationRules.decreaseIndentPattern.errorMessage": "必须匹配模式“/^([gimuy]+)$/”。",
-	"schema.indentationRules.indentNextLinePattern": "如果某一行匹配此模式，那么仅此行之后的**下一行**应缩进一次。",
-	"schema.indentationRules.indentNextLinePattern.pattern": "indentNextLinePattern 的正则表达式模式。",
-	"schema.indentationRules.indentNextLinePattern.flags": "indentNextLinePattern 的正则表达式标志。",
-	"schema.indentationRules.indentNextLinePattern.errorMessage": "必须匹配模式“/^([gimuy]+)$/”。",
-	"schema.indentationRules.unIndentedLinePattern": "如果某一行匹配此模式，那么不应更改此行的缩进，且不应针对其他规则对其进行计算。",
-	"schema.indentationRules.unIndentedLinePattern.pattern": "unIndentedLinePattern 的正则表达式模式。",
-	"schema.indentationRules.unIndentedLinePattern.flags": "unIndentedLinePattern 的正则表达式标志。",
-	"schema.indentationRules.unIndentedLinePattern.errorMessage": "必须匹配模式“/^([gimuy]+)$/”。",
-	"schema.folding": "此语言的折叠设置。",
-	"schema.folding.offSide": "若一种语言使用缩进表示其代码块，它将遵循越位规则 (off-side rule)。若设置此项，空白行将属于其之后的代码块。",
-	"schema.folding.markers": "语言特定的折叠标记。例如，\"#region\" 与 \"#endregion\"。开始与结束标记的正则表达式需设计得效率高，因其将对每一行的内容进行测试。",
-	"schema.folding.markers.start": "开始标记的正则表达式模式。其应以 \"^\" 开始。",
-	"schema.folding.markers.end": "结束标记的正则表达式模式。其应以 \"^\" 开始。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/codeEditor/electron-browser/largeFileOptimizations.i18n.json b/i18n/chs/src/vs/workbench/parts/codeEditor/electron-browser/largeFileOptimizations.i18n.json
deleted file mode 100644
index 55bdc78aa7b..00000000000
--- a/i18n/chs/src/vs/workbench/parts/codeEditor/electron-browser/largeFileOptimizations.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"largeFile": "{0}: 为减少内存使用并避免卡顿或崩溃，我们已关闭对此大型文件内容的标记、折行和折叠。",
-	"neverShowAgain": "确定，且不再显示",
-	"removeOptimizations": "强制启用功能",
-	"reopenFilePrompt": "请重新打开文件以使此设置生效。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/codeEditor/electron-browser/textMate/inspectTMScopes.i18n.json b/i18n/chs/src/vs/workbench/parts/codeEditor/electron-browser/textMate/inspectTMScopes.i18n.json
deleted file mode 100644
index cf2056ad45d..00000000000
--- a/i18n/chs/src/vs/workbench/parts/codeEditor/electron-browser/textMate/inspectTMScopes.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"inspectTMScopes": "开发者: 检查 TM 作用域",
-	"inspectTMScopesWidget.loading": "正在加载..."
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/codeEditor/electron-browser/toggleMinimap.i18n.json b/i18n/chs/src/vs/workbench/parts/codeEditor/electron-browser/toggleMinimap.i18n.json
deleted file mode 100644
index 85fa76a8791..00000000000
--- a/i18n/chs/src/vs/workbench/parts/codeEditor/electron-browser/toggleMinimap.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleMinimap": "查看: 切换小地图"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/codeEditor/electron-browser/toggleMultiCursorModifier.i18n.json b/i18n/chs/src/vs/workbench/parts/codeEditor/electron-browser/toggleMultiCursorModifier.i18n.json
deleted file mode 100644
index 1e1337ff23d..00000000000
--- a/i18n/chs/src/vs/workbench/parts/codeEditor/electron-browser/toggleMultiCursorModifier.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleLocation": "切换多行修改键"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderControlCharacter.i18n.json b/i18n/chs/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderControlCharacter.i18n.json
deleted file mode 100644
index 9ad649d33c7..00000000000
--- a/i18n/chs/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderControlCharacter.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleRenderControlCharacters": "查看: 切换控制字符"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderWhitespace.i18n.json b/i18n/chs/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderWhitespace.i18n.json
deleted file mode 100644
index b03ad9960c7..00000000000
--- a/i18n/chs/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderWhitespace.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleRenderWhitespace": "查看: 切换呈现空格"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/codeEditor/electron-browser/toggleWordWrap.i18n.json b/i18n/chs/src/vs/workbench/parts/codeEditor/electron-browser/toggleWordWrap.i18n.json
deleted file mode 100644
index 29326f2be7b..00000000000
--- a/i18n/chs/src/vs/workbench/parts/codeEditor/electron-browser/toggleWordWrap.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggle.wordwrap": "查看: 切换自动换行",
-	"wordWrap.notInDiffEditor": "不能在差异编辑器中切换自动换行。",
-	"unwrapMinified": "在此文件禁用折行",
-	"wrapMinified": "在此文件启用折行"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/codeEditor/electron-browser/wordWrapMigration.i18n.json b/i18n/chs/src/vs/workbench/parts/codeEditor/electron-browser/wordWrapMigration.i18n.json
deleted file mode 100644
index 4c61437ec3b..00000000000
--- a/i18n/chs/src/vs/workbench/parts/codeEditor/electron-browser/wordWrapMigration.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"wordWrapMigration.ok": "确定",
-	"wordWrapMigration.dontShowAgain": "不再显示",
-	"wordWrapMigration.openSettings": "打开设置",
-	"wordWrapMigration.prompt": "已弃用设置 \"editor.wrappingColumn\"，改用 \"editor.wordWrap\"。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/debug/browser/breakpointWidget.i18n.json b/i18n/chs/src/vs/workbench/parts/debug/browser/breakpointWidget.i18n.json
deleted file mode 100644
index a137b8337ff..00000000000
--- a/i18n/chs/src/vs/workbench/parts/debug/browser/breakpointWidget.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"breakpointWidgetExpressionPlaceholder": "在表达式计算结果为 true 时中断。按 \"Enter\" 表示接受，\"Esc\" 表示取消。",
-	"breakpointWidgetAriaLabel": "如果此条件为 true，程序仅会在此处停止。按 Enter 接受或按 Esc 取消。",
-	"breakpointWidgetHitCountPlaceholder": "在满足命中次数条件时中断。按 \"Enter\" 表示接受，\"Esc\" 表示取消。",
-	"breakpointWidgetHitCountAriaLabel": "如果达到命中次数，程序仅会在此处停止。按 Enter 接受或按 Esc 取消。",
-	"expression": "表达式",
-	"hitCount": "命中次数"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json b/i18n/chs/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
deleted file mode 100644
index 37748eebebc..00000000000
--- a/i18n/chs/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"logPoint": "记录点",
-	"breakpoint": "断点",
-	"editBreakpoint": "编辑 {0}...",
-	"removeBreakpoint": "删除 {0}",
-	"functionBreakpointsNotSupported": "此调试类型不支持函数断点",
-	"functionBreakpointPlaceholder": "要断开的函数",
-	"functionBreakPointInputAriaLabel": "键入函数断点",
-	"breakpointDisabledHover": "已禁用的断点",
-	"breakpointUnverifieddHover": "未验证的断点",
-	"functionBreakpointUnsupported": "不受此调试类型支持的函数断点",
-	"breakpointDirtydHover": "未验证的断点。对文件进行了修改，请重启调试会话。",
-	"logBreakpointUnsupported": "不受此调试类型支持的记录点",
-	"conditionalBreakpointUnsupported": "不受此调试类型支持的条件断点",
-	"hitBreakpointUnsupported": "命中不受此调试类型支持的条件断点"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/debug/browser/debugActionItems.i18n.json b/i18n/chs/src/vs/workbench/parts/debug/browser/debugActionItems.i18n.json
deleted file mode 100644
index b6020d7255c..00000000000
--- a/i18n/chs/src/vs/workbench/parts/debug/browser/debugActionItems.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noConfigurations": "没有配置",
-	"addConfigTo": "添加配置 ({0})...",
-	"addConfiguration": "添加配置..."
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/debug/browser/debugActions.i18n.json b/i18n/chs/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
deleted file mode 100644
index fbf479d82e2..00000000000
--- a/i18n/chs/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openLaunchJson": "打开 {0}",
-	"launchJsonNeedsConfigurtion": "配置或修复 \"launch.json\"",
-	"noFolderDebugConfig": "请先打开一个文件夹以进行高级调试配置。",
-	"startDebug": "开始调试",
-	"startWithoutDebugging": "开始执行(不调试)",
-	"selectAndStartDebugging": "选择并开始调试",
-	"restartDebug": "重启",
-	"reconnectDebug": "重新连接",
-	"stepOverDebug": "单步跳过",
-	"stepIntoDebug": "单步调试",
-	"stepOutDebug": "单步跳出",
-	"stopDebug": "停止",
-	"disconnectDebug": "断开连接",
-	"continueDebug": "继续",
-	"pauseDebug": "暂停",
-	"terminateThread": "终止线程",
-	"restartFrame": "重新启动框架",
-	"removeBreakpoint": "删除断点",
-	"removeAllBreakpoints": "删除所有断点",
-	"enableAllBreakpoints": "启用所有断点",
-	"disableAllBreakpoints": "禁用所有断点",
-	"activateBreakpoints": "激活断点",
-	"deactivateBreakpoints": "停用断点",
-	"reapplyAllBreakpoints": "重新应用所有断点",
-	"addFunctionBreakpoint": "添加函数断点",
-	"setValue": "设置值",
-	"addWatchExpression": "添加表达式",
-	"editWatchExpression": "编辑表达式",
-	"addToWatchExpressions": "添加到监视",
-	"removeWatchExpression": "删除表达式",
-	"removeAllWatchExpressions": "删除所有表达式",
-	"clearRepl": "清除控制台",
-	"debugConsoleAction": "调试控制台",
-	"unreadOutput": "调试控制台中的新输出",
-	"debugFocusConsole": "焦点调试控制台",
-	"focusSession": "聚焦于“会话”视图",
-	"stepBackDebug": "后退",
-	"reverseContinue": "反向"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/debug/browser/debugActionsWidget.i18n.json b/i18n/chs/src/vs/workbench/parts/debug/browser/debugActionsWidget.i18n.json
deleted file mode 100644
index 855bec562b3..00000000000
--- a/i18n/chs/src/vs/workbench/parts/debug/browser/debugActionsWidget.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"debugToolBarBackground": "调试工具栏背景颜色。",
-	"debugToolBarBorder": "调试工具栏边框颜色。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/debug/browser/debugCommands.i18n.json b/i18n/chs/src/vs/workbench/parts/debug/browser/debugCommands.i18n.json
deleted file mode 100644
index 643345df81c..00000000000
--- a/i18n/chs/src/vs/workbench/parts/debug/browser/debugCommands.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noFolderDebugConfig": "请先打开一个文件夹以进行高级调试配置。",
-	"inlineBreakpoint": "内联断点",
-	"debug": "调试",
-	"addInlineBreakpoint": "添加内联断点"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/debug/browser/debugContentProvider.i18n.json b/i18n/chs/src/vs/workbench/parts/debug/browser/debugContentProvider.i18n.json
deleted file mode 100644
index e2b3dd234b8..00000000000
--- a/i18n/chs/src/vs/workbench/parts/debug/browser/debugContentProvider.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"unable": "无法解析无调试会话的资源",
-	"canNotResolveSource": "无法解析资源 {0}，没有来自调试扩展的响应。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json b/i18n/chs/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
deleted file mode 100644
index 9a15af1e91b..00000000000
--- a/i18n/chs/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleBreakpointAction": "调试: 切换断点",
-	"conditionalBreakpointEditorAction": "调试: 添加条件断点...",
-	"logPointEditorAction": "调试: 添加记录点...",
-	"runToCursor": "运行到光标处",
-	"debugEvaluate": "调试: 求值",
-	"debugAddToWatch": "调试: 添加到监视",
-	"showDebugHover": "调试: 显示悬停",
-	"goToNextBreakpoint": "调试: 转到下一个断点",
-	"goToPreviousBreakpoint": "调试: 转到上一个断点"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/debug/browser/debugEditorModelManager.i18n.json b/i18n/chs/src/vs/workbench/parts/debug/browser/debugEditorModelManager.i18n.json
deleted file mode 100644
index cb544908c9c..00000000000
--- a/i18n/chs/src/vs/workbench/parts/debug/browser/debugEditorModelManager.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"breakpointDisabledHover": "已禁用断点",
-	"breakpointUnverifieddHover": "未验证的断点",
-	"breakpointDirtydHover": "未验证的断点。对文件进行了修改，请重启调试会话。",
-	"breakpointUnsupported": "不受此调试类型支持的条件断点"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/debug/browser/debugQuickOpen.i18n.json b/i18n/chs/src/vs/workbench/parts/debug/browser/debugQuickOpen.i18n.json
deleted file mode 100644
index e7916ba4c3b..00000000000
--- a/i18n/chs/src/vs/workbench/parts/debug/browser/debugQuickOpen.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"entryAriaLabel": "{0}，调试",
-	"debugAriaLabel": "键入启动配置的名称以运行。",
-	"addConfigTo": "添加配置 ({0})...",
-	"addConfiguration": "添加配置...",
-	"noConfigurationsMatching": "无任何调试配置匹配",
-	"noConfigurationsFound": "找不到任何调试配置。请创建一个 \"launch.json\" 文件。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/debug/browser/debugStatus.i18n.json b/i18n/chs/src/vs/workbench/parts/debug/browser/debugStatus.i18n.json
deleted file mode 100644
index f7f60a95751..00000000000
--- a/i18n/chs/src/vs/workbench/parts/debug/browser/debugStatus.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"selectAndStartDebug": "选择并启动调试配置"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/debug/browser/debugViewlet.i18n.json b/i18n/chs/src/vs/workbench/parts/debug/browser/debugViewlet.i18n.json
deleted file mode 100644
index 4c63e256224..00000000000
--- a/i18n/chs/src/vs/workbench/parts/debug/browser/debugViewlet.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"startAdditionalSession": "启动其他会话",
-	"debugFocusVariablesView": "聚焦于变量视图",
-	"debugFocusWatchView": "聚焦于监视视图",
-	"debugFocusCallStackView": "聚焦于调用堆栈视图",
-	"debugFocusBreakpointsView": "聚焦于断点视图"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/debug/browser/exceptionWidget.i18n.json b/i18n/chs/src/vs/workbench/parts/debug/browser/exceptionWidget.i18n.json
deleted file mode 100644
index de6e884bef1..00000000000
--- a/i18n/chs/src/vs/workbench/parts/debug/browser/exceptionWidget.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"debugExceptionWidgetBorder": "异常小组件边框颜色。",
-	"debugExceptionWidgetBackground": "异常小组件背景颜色。",
-	"exceptionThrownWithId": "发生异常: {0}",
-	"exceptionThrown": "出现异常。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/debug/browser/linkDetector.i18n.json b/i18n/chs/src/vs/workbench/parts/debug/browser/linkDetector.i18n.json
deleted file mode 100644
index 710d5957387..00000000000
--- a/i18n/chs/src/vs/workbench/parts/debug/browser/linkDetector.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"fileLinkMac": "单击打开 (按住 Cmd 键并单击在侧边打开)",
-	"fileLink": "单击打开 (按住 Ctrl 键并单击在侧边打开)"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/debug/browser/statusbarColorProvider.i18n.json b/i18n/chs/src/vs/workbench/parts/debug/browser/statusbarColorProvider.i18n.json
deleted file mode 100644
index cd6b52432c5..00000000000
--- a/i18n/chs/src/vs/workbench/parts/debug/browser/statusbarColorProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"statusBarDebuggingBackground": "调试程序时状态栏的背景色。状态栏显示在窗口底部",
-	"statusBarDebuggingForeground": "调试程序时状态栏的前景色。状态栏显示在窗口底部",
-	"statusBarDebuggingBorder": "调试程序时区别于侧边栏和编辑器的状态栏边框颜色。状态栏显示在窗口底部。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/debug/common/debug.i18n.json b/i18n/chs/src/vs/workbench/parts/debug/common/debug.i18n.json
deleted file mode 100644
index b3810d02250..00000000000
--- a/i18n/chs/src/vs/workbench/parts/debug/common/debug.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"internalConsoleOptions": "内部调试控制台的控制行为。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/debug/common/debugModel.i18n.json b/i18n/chs/src/vs/workbench/parts/debug/common/debugModel.i18n.json
deleted file mode 100644
index 5f3eb257259..00000000000
--- a/i18n/chs/src/vs/workbench/parts/debug/common/debugModel.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"notAvailable": "不可用",
-	"startDebugFirst": "请启动调试会话以评估"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/debug/common/debugSchemas.i18n.json b/i18n/chs/src/vs/workbench/parts/debug/common/debugSchemas.i18n.json
deleted file mode 100644
index 1f5ffac7dfd..00000000000
--- a/i18n/chs/src/vs/workbench/parts/debug/common/debugSchemas.i18n.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.contributes.debuggers": "用于调试适配器。",
-	"vscode.extension.contributes.debuggers.type": "此调试适配器的唯一标识符。",
-	"vscode.extension.contributes.debuggers.label": "显示此调试适配器的名称。",
-	"vscode.extension.contributes.debuggers.program": "调试适配器程序的路径。该路径是绝对路径或相对于扩展文件夹的相对路径。",
-	"vscode.extension.contributes.debuggers.args": "要传递给适配器的可选参数。",
-	"vscode.extension.contributes.debuggers.runtime": "可选运行时，以防程序属性不可执行，但需要运行时。",
-	"vscode.extension.contributes.debuggers.runtimeArgs": "可选运行时参数。",
-	"vscode.extension.contributes.debuggers.variables": "将 \"launch.json\" 中的交互式变量(例如 ${action.pickProcess})映射到命令中。",
-	"vscode.extension.contributes.debuggers.initialConfigurations": "用于生成初始 \"launch.json\" 的配置。",
-	"vscode.extension.contributes.debuggers.languages": "可能被视为“默认调试程序”的调试扩展的语言列表。",
-	"vscode.extension.contributes.debuggers.adapterExecutableCommand": "如果指定的 VS Code 将调用此命令以确定调试适配器的可执行路径和要传递的参数。",
-	"vscode.extension.contributes.debuggers.configurationSnippets": "用于在 \"launch.json\" 中添加新配置的代码段。",
-	"vscode.extension.contributes.debuggers.configurationAttributes": "用于验证 \"launch.json\" 的 JSON 架构配置。",
-	"vscode.extension.contributes.debuggers.windows": "Windows 特定的设置。",
-	"vscode.extension.contributes.debuggers.windows.runtime": "用于 Windows 的运行时。",
-	"vscode.extension.contributes.debuggers.osx": "macOS 特定的设置。",
-	"vscode.extension.contributes.debuggers.osx.runtime": "用于 macOS 的运行时。",
-	"vscode.extension.contributes.debuggers.linux": "Linux 特定的设置。",
-	"vscode.extension.contributes.debuggers.linux.runtime": "用于 Linux 的运行时。",
-	"vscode.extension.contributes.breakpoints": "添加断点。",
-	"vscode.extension.contributes.breakpoints.language": "对此语言允许断点。",
-	"app.launch.json.title": "启动",
-	"app.launch.json.version": "此文件格式的版本。",
-	"app.launch.json.configurations": "配置列表。使用 IntelliSense 添加新配置或编辑现有配置。",
-	"app.launch.json.compounds": "复合列表。每个复合可引用多个配置，这些配置将一起启动。",
-	"app.launch.json.compound.name": "复合的名称。在启动配置下拉菜单中显示。",
-	"useUniqueNames": "配置名称必须唯一。",
-	"app.launch.json.compound.folder": "复合项所在的文件夹的名称。",
-	"app.launch.json.compounds.configurations": "将作为此复合的一部分启动的配置名称。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/debug/common/debugSource.i18n.json b/i18n/chs/src/vs/workbench/parts/debug/common/debugSource.i18n.json
deleted file mode 100644
index 3b5169b21ad..00000000000
--- a/i18n/chs/src/vs/workbench/parts/debug/common/debugSource.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"unknownSource": "未知源"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json b/i18n/chs/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
deleted file mode 100644
index b59a0f71781..00000000000
--- a/i18n/chs/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"breakpointWidgetLogMessagePlaceholder": "断点命中时记录的消息。{} 内的表达式将被替换。按 \"Enter\" 键确认，\"Esc\" 键取消。",
-	"breakpointWidgetHitCountPlaceholder": "在命中次数条件满足时中断。按 \"Enter\" 键确认，\"Esc\" 键取消。",
-	"breakpointWidgetExpressionPlaceholder": "在表达式结果为真时中断。按 \"Enter\" 键确认，\"Esc\" 键取消。",
-	"expression": "表达式",
-	"hitCount": "命中次数",
-	"logMessage": "记录消息"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/debug/electron-browser/breakpointsView.i18n.json b/i18n/chs/src/vs/workbench/parts/debug/electron-browser/breakpointsView.i18n.json
deleted file mode 100644
index 3b0a739f573..00000000000
--- a/i18n/chs/src/vs/workbench/parts/debug/electron-browser/breakpointsView.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"editConditionalBreakpoint": "编辑断点...",
-	"functionBreakpointsNotSupported": "此调试类型不支持函数断点",
-	"functionBreakpointPlaceholder": "要断开的函数",
-	"functionBreakPointInputAriaLabel": "键入函数断点"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/debug/electron-browser/callStackView.i18n.json b/i18n/chs/src/vs/workbench/parts/debug/electron-browser/callStackView.i18n.json
deleted file mode 100644
index ba75f29be78..00000000000
--- a/i18n/chs/src/vs/workbench/parts/debug/electron-browser/callStackView.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"callstackSection": "调用堆栈部分",
-	"debugStopped": "因 {0} 已暂停",
-	"callStackAriaLabel": "调试调用堆栈",
-	"session": "会话",
-	"paused": "已暂停",
-	"running": "正在运行",
-	"thread": "线程",
-	"pausedOn": "因 {0} 已暂停",
-	"loadMoreStackFrames": "加载多个堆栈帧",
-	"threadAriaLabel": "线程 {0}，调用堆栈，调试",
-	"stackFrameAriaLabel": "堆栈帧 {0} 行 {1} {2}，调用堆栈，调试"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json b/i18n/chs/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
deleted file mode 100644
index 2544cb87789..00000000000
--- a/i18n/chs/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleDebugViewlet": "显示调试",
-	"toggleDebugPanel": "调试控制台",
-	"debug": "调试",
-	"debugPanel": "调试控制台",
-	"variables": "变量",
-	"watch": "监视",
-	"callStack": "调用堆栈",
-	"breakpoints": "断点",
-	"view": "查看",
-	"debugCategory": "调试",
-	"debugCommands": "调试配置",
-	"debugConfigurationTitle": "调试",
-	"allowBreakpointsEverywhere": "允许在任何文件中设置断点",
-	"openExplorerOnEnd": "调试会话结束时自动打开资源管理器视图",
-	"inlineValues": "调试时，在编辑器中显示变量值内联",
-	"toolBarLocation": "控制调试工具栏位置。其位置可为 \"floating\" (在所有视图之上浮动)、\"docked\" (停靠于“调试”视图) 或 \"hidden\" (隐藏)",
-	"never": "在状态栏中不再显示调试",
-	"always": "始终在状态栏中显示调试",
-	"onFirstSessionStart": "仅于第一次启动调试后在状态栏中显示调试",
-	"showInStatusBar": "控制何时显示调试状态栏",
-	"openDebug": "控制是否在调试会话开始时打开调试视图。",
-	"enableAllHovers": "控制调试过程中是否启用非调试悬停提示。若为 \"true\"，将调用悬停提供程序提供悬停提示。即使此项设置为 \"true\"，普通悬停提示也不会显示。",
-	"launch": "全局的调试启动配置。应用作跨工作区共享的 \"launch.json\" 的替代。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/debug/electron-browser/debugCommands.i18n.json b/i18n/chs/src/vs/workbench/parts/debug/electron-browser/debugCommands.i18n.json
deleted file mode 100644
index f1ed8668671..00000000000
--- a/i18n/chs/src/vs/workbench/parts/debug/electron-browser/debugCommands.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noFolderDebugConfig": "请先打开一个文件夹以进行高级调试配置。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json b/i18n/chs/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json
deleted file mode 100644
index e3c5fb5aeb8..00000000000
--- a/i18n/chs/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"debugNoType": "不可省略调试器的 \"type\" 属性，且其类型必须是 \"string\" 。",
-	"selectDebug": "选择环境",
-	"DebugConfig.failed": "无法在 \".vscode\" 文件夹({0})内创建 \"launch.json\" 文件。",
-	"workspace": "工作区",
-	"user settings": "用户设置"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json b/i18n/chs/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
deleted file mode 100644
index da65e9cdea7..00000000000
--- a/i18n/chs/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"logPoint": "记录点",
-	"breakpoint": "断点",
-	"removeBreakpoint": "删除 {0}",
-	"editBreakpoint": "编辑 {0}...",
-	"disableBreakpoint": "禁用 {0}",
-	"enableBreakpoint": "启用 {0}",
-	"removeBreakpoints": "删除断点",
-	"removeInlineBreakpointOnColumn": "删除第 {0} 列的内联断点",
-	"removeLineBreakpoint": "删除行断点",
-	"editBreakpoints": "编辑断点",
-	"editInlineBreakpointOnColumn": "编辑第 {0} 列的内联断点",
-	"editLineBrekapoint": "编辑行断点",
-	"enableDisableBreakpoints": "启用/禁用断点",
-	"disableInlineColumnBreakpoint": "禁用第 {0} 列的内联断点",
-	"disableBreakpointOnLine": "禁用行断点",
-	"enableBreakpoints": "启用第 {0} 列的内联断点",
-	"enableBreakpointOnLine": "启用行断点",
-	"addBreakpoint": "添加断点",
-	"addConditionalBreakpoint": "添加条件断点...",
-	"addLogPoint": "添加记录点...",
-	"breakpointHasCondition": "此{0}的{1}将在删除后丢失。请考虑仅禁用此{0}。",
-	"message": "消息",
-	"condition": "条件",
-	"removeLogPoint": "删除 {0}",
-	"disableLogPoint": "禁用 {0}",
-	"cancel": "取消",
-	"addConfiguration": "添加配置..."
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/debug/electron-browser/debugHover.i18n.json b/i18n/chs/src/vs/workbench/parts/debug/electron-browser/debugHover.i18n.json
deleted file mode 100644
index 32ba7d8672a..00000000000
--- a/i18n/chs/src/vs/workbench/parts/debug/electron-browser/debugHover.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"treeAriaLabel": "调试悬停"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json b/i18n/chs/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
deleted file mode 100644
index d713b18f9f7..00000000000
--- a/i18n/chs/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"snapshotObj": "仅显示了此对象的基元值。",
-	"debuggingPaused": "已暂停调试，原因 {0}，{1} {2}",
-	"debuggingStarted": "已开始调试。",
-	"debuggingStopped": "已停止调试。",
-	"breakpointAdded": "已添加断点，行 {0}, 文件 {1}",
-	"breakpointRemoved": "已删除断点，行 {0}，文件 {1}",
-	"compoundMustHaveConfigurations": "复合项必须拥有 \"configurations\" 属性集，才能启动多个配置。",
-	"noConfigurationNameInWorkspace": "在工作区中找不到启动配置“{0}”。",
-	"multipleConfigurationNamesInWorkspace": "工作区中存在多个启动配置“{0}”。请使用文件夹名称来限定配置。",
-	"noFolderWithName": "无法在复合项“{2}”中为配置“{1}”找到名为“{0}”的文件夹。",
-	"configMissing": "\"launch.json\" 中缺少配置“{0}”。",
-	"launchJsonDoesNotExist": "\"launch.json\" 不存在。",
-	"debugRequestNotSupported": "所选调试配置的属性“{0}”的值“{1}”不受支持。",
-	"debugRequesMissing": "所选的调试配置缺少属性“{0}”。",
-	"debugTypeNotSupported": "配置的类型“{0}”不受支持。",
-	"debugTypeMissing": "所选的启动配置缺少属性 \"type\"。",
-	"debugAnyway": "仍进行调试",
-	"preLaunchTaskErrors": "preLaunchTask“{0}”期间检测到多个生成错误。",
-	"preLaunchTaskError": "preLaunchTask“{0}”期间检测到一个生成错误。",
-	"preLaunchTaskExitCode": "preLaunchTask“{0}”已终止，退出代码为 {1}。",
-	"showErrors": "显示错误",
-	"noFolderWorkspaceDebugError": "无法调试活动文件。请确保它保存在磁盘上，并确保已为该文件类型安装了调试扩展。",
-	"cancel": "取消",
-	"DebugTaskNotFound": "找不到任务“{0}”。",
-	"taskNotTracked": "无法跟踪任务“{0}”。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/debug/electron-browser/debugViewer.i18n.json b/i18n/chs/src/vs/workbench/parts/debug/electron-browser/debugViewer.i18n.json
deleted file mode 100644
index bb73d4436f8..00000000000
--- a/i18n/chs/src/vs/workbench/parts/debug/electron-browser/debugViewer.i18n.json
+++ /dev/null
@@ -1,28 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"process": "进程",
-	"paused": "已暂停",
-	"running": "正在运行",
-	"thread": "线程",
-	"pausedOn": "因 {0} 已暂停",
-	"loadMoreStackFrames": "加载多个堆栈帧",
-	"threadAriaLabel": "线程 {0}，调用堆栈，调试",
-	"stackFrameAriaLabel": "堆栈帧 {0} 行 {1} {2}，调用堆栈，调试",
-	"variableValueAriaLabel": "键入新的变量值",
-	"variableScopeAriaLabel": "范围 {0}，变量，调试",
-	"variableAriaLabel": "{0} 值 {1}，变量，调试",
-	"watchExpressionPlaceholder": "要监视的表达式",
-	"watchExpressionInputAriaLabel": "键入监视表达式",
-	"watchExpressionAriaLabel": "{0} 值 {1}，监视，调试",
-	"watchVariableAriaLabel": "{0} 值 {1}，监视，调试",
-	"functionBreakpointPlaceholder": "要断开的函数",
-	"functionBreakPointInputAriaLabel": "键入函数断点",
-	"functionBreakpointsNotSupported": "此调试类型不支持函数断点",
-	"breakpointAriaLabel": "断点行 {0} {1}，断点，调试",
-	"functionBreakpointAriaLabel": "函数断点 {0}，断点，调试",
-	"exceptionBreakpointAriaLabel": "异常断点 {0}，断点，调试"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/debug/electron-browser/debugViews.i18n.json b/i18n/chs/src/vs/workbench/parts/debug/electron-browser/debugViews.i18n.json
deleted file mode 100644
index 230f0bd8f03..00000000000
--- a/i18n/chs/src/vs/workbench/parts/debug/electron-browser/debugViews.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"variablesSection": "变量部分",
-	"variablesAriaTreeLabel": "调试变量",
-	"expressionsSection": "表达式部分",
-	"watchAriaTreeLabel": "调试监视表达式",
-	"callstackSection": "调用堆栈部分",
-	"debugStopped": "因 {0} 已暂停",
-	"callStackAriaLabel": "调试调用堆栈",
-	"breakpointsSection": "断点部分",
-	"breakpointsAriaTreeLabel": "调试断点"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/debug/electron-browser/electronDebugActions.i18n.json b/i18n/chs/src/vs/workbench/parts/debug/electron-browser/electronDebugActions.i18n.json
deleted file mode 100644
index b8563c03f0c..00000000000
--- a/i18n/chs/src/vs/workbench/parts/debug/electron-browser/electronDebugActions.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"copyValue": "复制值",
-	"copyAsExpression": "复制表达式",
-	"copy": "复制",
-	"copyAll": "全部复制",
-	"copyStackTrace": "复制调用堆栈"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/debug/electron-browser/rawDebugSession.i18n.json b/i18n/chs/src/vs/workbench/parts/debug/electron-browser/rawDebugSession.i18n.json
deleted file mode 100644
index 3a56b23d721..00000000000
--- a/i18n/chs/src/vs/workbench/parts/debug/electron-browser/rawDebugSession.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"moreInfo": "详细信息",
-	"debugAdapterCrash": "调试适配器进程已意外终止"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/debug/electron-browser/repl.i18n.json b/i18n/chs/src/vs/workbench/parts/debug/electron-browser/repl.i18n.json
deleted file mode 100644
index 893d233dda8..00000000000
--- a/i18n/chs/src/vs/workbench/parts/debug/electron-browser/repl.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"replAriaLabel": "读取 Eval 打印循环面板",
-	"actions.repl.historyPrevious": "上一个历史记录",
-	"actions.repl.historyNext": "下一个历史记录",
-	"actions.repl.acceptInput": "接受 REPL 的输入",
-	"actions.repl.copyAll": "调试: 复制控制台所有内容"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/debug/electron-browser/replViewer.i18n.json b/i18n/chs/src/vs/workbench/parts/debug/electron-browser/replViewer.i18n.json
deleted file mode 100644
index d79a7ed7134..00000000000
--- a/i18n/chs/src/vs/workbench/parts/debug/electron-browser/replViewer.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"stateCapture": "对象状态捕获自第一个评估",
-	"replVariableAriaLabel": "变量 {0} 具有值 {1}、读取 Eval 打印循环，调试",
-	"replExpressionAriaLabel": "表达式 {0} 具有值 {1}，读取 Eval 打印循环，调试",
-	"replValueOutputAriaLabel": "{0}，读取 Eval 打印循环，调试",
-	"replRawObjectAriaLabel": "Repl（交互式解释器）变量 {0} 具有值 {1}，读取 求值 输出 循环，调试"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/debug/electron-browser/statusbarColorProvider.i18n.json b/i18n/chs/src/vs/workbench/parts/debug/electron-browser/statusbarColorProvider.i18n.json
deleted file mode 100644
index cd6b52432c5..00000000000
--- a/i18n/chs/src/vs/workbench/parts/debug/electron-browser/statusbarColorProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"statusBarDebuggingBackground": "调试程序时状态栏的背景色。状态栏显示在窗口底部",
-	"statusBarDebuggingForeground": "调试程序时状态栏的前景色。状态栏显示在窗口底部",
-	"statusBarDebuggingBorder": "调试程序时区别于侧边栏和编辑器的状态栏边框颜色。状态栏显示在窗口底部。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json b/i18n/chs/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json
deleted file mode 100644
index 728adbd6b66..00000000000
--- a/i18n/chs/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"debug.terminal.title": "调试对象"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/debug/electron-browser/variablesView.i18n.json b/i18n/chs/src/vs/workbench/parts/debug/electron-browser/variablesView.i18n.json
deleted file mode 100644
index 27cba1f270b..00000000000
--- a/i18n/chs/src/vs/workbench/parts/debug/electron-browser/variablesView.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"variablesSection": "变量部分",
-	"variablesAriaTreeLabel": "调试变量",
-	"variableValueAriaLabel": "键入新的变量值",
-	"variableScopeAriaLabel": "范围 {0}，变量，调试",
-	"variableAriaLabel": "{0} 值 {1}，变量，调试"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/debug/electron-browser/watchExpressionsView.i18n.json b/i18n/chs/src/vs/workbench/parts/debug/electron-browser/watchExpressionsView.i18n.json
deleted file mode 100644
index 9335c7ffe6f..00000000000
--- a/i18n/chs/src/vs/workbench/parts/debug/electron-browser/watchExpressionsView.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"expressionsSection": "表达式部分",
-	"watchAriaTreeLabel": "调试监视表达式",
-	"watchExpressionPlaceholder": "要监视的表达式",
-	"watchExpressionInputAriaLabel": "键入监视表达式",
-	"watchExpressionAriaLabel": "{0} 值 {1}，监视，调试",
-	"watchVariableAriaLabel": "{0} 值 {1}，监视，调试"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json b/i18n/chs/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
deleted file mode 100644
index cd5c87160d6..00000000000
--- a/i18n/chs/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"debugAdapterBinNotFound": "调试适配器可执行的“{0}”不存在。",
-	"debugAdapterCannotDetermineExecutable": "无法确定调试适配器“{0}”的可执行文件。",
-	"unableToLaunchDebugAdapter": "无法从“{0}”启动调试适配器。",
-	"unableToLaunchDebugAdapterNoArgs": "无法启动调试适配器。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/debug/node/debugger.i18n.json b/i18n/chs/src/vs/workbench/parts/debug/node/debugger.i18n.json
deleted file mode 100644
index d94c69e8e71..00000000000
--- a/i18n/chs/src/vs/workbench/parts/debug/node/debugger.i18n.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"launch.config.comment1": "使用 IntelliSense 了解相关属性。 ",
-	"launch.config.comment2": "悬停以查看现有属性的描述。",
-	"launch.config.comment3": "欲了解更多信息，请访问: {0}",
-	"debugType": "配置类型。",
-	"debugTypeNotRecognised": "无法识别此调试类型。确保已经安装并启用相应的调试扩展。",
-	"node2NotSupported": "不再支持 \"node2\"，改用 \"node\"，并将 \"protocol\" 属性设为 \"inspector\"。",
-	"debugName": "配置名称；在启动配置下拉菜单中显示。",
-	"debugRequest": "请求配置类型。可以是“启动”或“附加”。",
-	"debugServer": "仅用于调试扩展开发: 如果已指定端口，VS 代码会尝试连接到在服务器模式中运行的调试适配器",
-	"debugPrelaunchTask": "调试会话开始前要运行的任务。",
-	"debugPostDebugTask": "调试会话结束后运行的任务。",
-	"debugWindowsConfiguration": "特定于 Windows 的启动配置属性。",
-	"debugOSXConfiguration": "特定于 OS X 的启动配置属性。",
-	"debugLinuxConfiguration": "特定于 Linux 的启动配置属性。",
-	"deprecatedVariables": "已弃用 \"env.\"、\"config.\" 和 \"command.\"，改用 \"env:\"、\"config:\" 和 \"command:\"。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/debug/node/terminals.i18n.json b/i18n/chs/src/vs/workbench/parts/debug/node/terminals.i18n.json
deleted file mode 100644
index 87183ec39c7..00000000000
--- a/i18n/chs/src/vs/workbench/parts/debug/node/terminals.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"console.title": "VS Code 控制台",
-	"mac.terminal.script.failed": "脚本“{0}”失败，退出代码为 {1}",
-	"mac.terminal.type.not.supported": "不支持“{0}”",
-	"press.any.key": "按任意键继续...",
-	"linux.term.failed": "“{0}”失败，退出代码为 {1}"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/emmet/browser/actions/showEmmetCommands.i18n.json b/i18n/chs/src/vs/workbench/parts/emmet/browser/actions/showEmmetCommands.i18n.json
deleted file mode 100644
index bef83278f9c..00000000000
--- a/i18n/chs/src/vs/workbench/parts/emmet/browser/actions/showEmmetCommands.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"showEmmetCommands": "显示 Emmet 命令"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/emmet/electron-browser/actions/balance.i18n.json b/i18n/chs/src/vs/workbench/parts/emmet/electron-browser/actions/balance.i18n.json
deleted file mode 100644
index 344b7a80602..00000000000
--- a/i18n/chs/src/vs/workbench/parts/emmet/electron-browser/actions/balance.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"balanceInward": "Emmet: 平衡(向内)",
-	"balanceOutward": "Emmet: 平衡(向外)"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/emmet/electron-browser/actions/editPoints.i18n.json b/i18n/chs/src/vs/workbench/parts/emmet/electron-browser/actions/editPoints.i18n.json
deleted file mode 100644
index fbb9c2b2cd2..00000000000
--- a/i18n/chs/src/vs/workbench/parts/emmet/electron-browser/actions/editPoints.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"previousEditPoint": "Emmet: 转到上一编辑点",
-	"nextEditPoint": "Emmet: 转到下一编辑点"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/emmet/electron-browser/actions/evaluateMath.i18n.json b/i18n/chs/src/vs/workbench/parts/emmet/electron-browser/actions/evaluateMath.i18n.json
deleted file mode 100644
index f4159d50b0e..00000000000
--- a/i18n/chs/src/vs/workbench/parts/emmet/electron-browser/actions/evaluateMath.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"evaluateMathExpression": "Emmet: 求数学表达式的值"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/emmet/electron-browser/actions/expandAbbreviation.i18n.json b/i18n/chs/src/vs/workbench/parts/emmet/electron-browser/actions/expandAbbreviation.i18n.json
deleted file mode 100644
index 1a7f67d3ea9..00000000000
--- a/i18n/chs/src/vs/workbench/parts/emmet/electron-browser/actions/expandAbbreviation.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"expandAbbreviationAction": "Emmet: 展开缩写"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/emmet/electron-browser/actions/incrementDecrement.i18n.json b/i18n/chs/src/vs/workbench/parts/emmet/electron-browser/actions/incrementDecrement.i18n.json
deleted file mode 100644
index 81f7dcfcab1..00000000000
--- a/i18n/chs/src/vs/workbench/parts/emmet/electron-browser/actions/incrementDecrement.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"incrementNumberByOneTenth": "Emmet: 增加 0.1",
-	"incrementNumberByOne": "Emmet: 增加 1",
-	"incrementNumberByTen": "Emmet: 增加 10",
-	"decrementNumberByOneTenth": "Emmet: 减少 0.1",
-	"decrementNumberByOne": "Emmet: 减少 1",
-	"decrementNumberByTen": "Emmet: 减少 10"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/emmet/electron-browser/actions/matchingPair.i18n.json b/i18n/chs/src/vs/workbench/parts/emmet/electron-browser/actions/matchingPair.i18n.json
deleted file mode 100644
index bb3ef016208..00000000000
--- a/i18n/chs/src/vs/workbench/parts/emmet/electron-browser/actions/matchingPair.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"matchingPair": "Emmet: 转到匹配对"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/emmet/electron-browser/actions/mergeLines.i18n.json b/i18n/chs/src/vs/workbench/parts/emmet/electron-browser/actions/mergeLines.i18n.json
deleted file mode 100644
index 8548113b66b..00000000000
--- a/i18n/chs/src/vs/workbench/parts/emmet/electron-browser/actions/mergeLines.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"mergeLines": "Emmet: 合并行"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/emmet/electron-browser/actions/reflectCssValue.i18n.json b/i18n/chs/src/vs/workbench/parts/emmet/electron-browser/actions/reflectCssValue.i18n.json
deleted file mode 100644
index 1dcfdd7b85c..00000000000
--- a/i18n/chs/src/vs/workbench/parts/emmet/electron-browser/actions/reflectCssValue.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"reflectCSSValue": "Emmet: 反射 CSS 值"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/emmet/electron-browser/actions/removeTag.i18n.json b/i18n/chs/src/vs/workbench/parts/emmet/electron-browser/actions/removeTag.i18n.json
deleted file mode 100644
index 545f1c107e7..00000000000
--- a/i18n/chs/src/vs/workbench/parts/emmet/electron-browser/actions/removeTag.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"removeTag": "Emmet: 删除标签"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/emmet/electron-browser/actions/selectItem.i18n.json b/i18n/chs/src/vs/workbench/parts/emmet/electron-browser/actions/selectItem.i18n.json
deleted file mode 100644
index 6d307aadabf..00000000000
--- a/i18n/chs/src/vs/workbench/parts/emmet/electron-browser/actions/selectItem.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"selectPreviousItem": "Emmet: 选择上一项",
-	"selectNextItem": "Emmet: 选择下一项"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/emmet/electron-browser/actions/splitJoinTag.i18n.json b/i18n/chs/src/vs/workbench/parts/emmet/electron-browser/actions/splitJoinTag.i18n.json
deleted file mode 100644
index 53e4eaafbd9..00000000000
--- a/i18n/chs/src/vs/workbench/parts/emmet/electron-browser/actions/splitJoinTag.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"splitJoinTag": "Emmet: 分离/联接标签"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/emmet/electron-browser/actions/toggleComment.i18n.json b/i18n/chs/src/vs/workbench/parts/emmet/electron-browser/actions/toggleComment.i18n.json
deleted file mode 100644
index ecb3f893e89..00000000000
--- a/i18n/chs/src/vs/workbench/parts/emmet/electron-browser/actions/toggleComment.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"toggleComment": "Emmet: 切换注释"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/emmet/electron-browser/actions/updateImageSize.i18n.json b/i18n/chs/src/vs/workbench/parts/emmet/electron-browser/actions/updateImageSize.i18n.json
deleted file mode 100644
index d68725525c8..00000000000
--- a/i18n/chs/src/vs/workbench/parts/emmet/electron-browser/actions/updateImageSize.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"updateImageSize": "Emmet: 更新图像大小"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/emmet/electron-browser/actions/updateTag.i18n.json b/i18n/chs/src/vs/workbench/parts/emmet/electron-browser/actions/updateTag.i18n.json
deleted file mode 100644
index 8bf2821c120..00000000000
--- a/i18n/chs/src/vs/workbench/parts/emmet/electron-browser/actions/updateTag.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"updateTag": "Emmet: 更新标签",
-	"enterTag": "输入标签",
-	"tag": "标签"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/emmet/electron-browser/actions/wrapWithAbbreviation.i18n.json b/i18n/chs/src/vs/workbench/parts/emmet/electron-browser/actions/wrapWithAbbreviation.i18n.json
deleted file mode 100644
index 21f0c06d363..00000000000
--- a/i18n/chs/src/vs/workbench/parts/emmet/electron-browser/actions/wrapWithAbbreviation.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"wrapWithAbbreviationAction": "Emmet: 使用缩写进行包围",
-	"enterAbbreviation": "输入缩写",
-	"abbreviation": "缩写"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/emmet/electron-browser/emmet.contribution.i18n.json b/i18n/chs/src/vs/workbench/parts/emmet/electron-browser/emmet.contribution.i18n.json
deleted file mode 100644
index c14acb9c9cd..00000000000
--- a/i18n/chs/src/vs/workbench/parts/emmet/electron-browser/emmet.contribution.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"emmetConfigurationTitle": "Emmet",
-	"triggerExpansionOnTab": "启用后，按 TAB 键时，将展开 Emmet 缩写。若 emmet.useNewemmet 设置为 true，则不适用。",
-	"emmetPreferences": "用于修改 Emmet 的某些操作和解决程序的行为的首选项。若 emmet.useNewemmet 设置为 true，则不适用。",
-	"emmetSyntaxProfiles": "为指定的语法定义配置文件或使用带有特定规则的配置文件。",
-	"emmetExclude": "不应展开 Emmet 缩写的语言数组。",
-	"emmetExtensionsPath": "包含 Emmet 配置文件、片段和首选项的文件夹路径。当 emmet.useNewEmmet 设置为 true 时，只有配置文件才服从于扩展路径。",
-	"useNewEmmet": "试用新版 Emmet 模块（最终会替换旧版单一 Emmet 库）体验所有 Emmet 功能。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/emmet/node/actions/balance.i18n.json b/i18n/chs/src/vs/workbench/parts/emmet/node/actions/balance.i18n.json
deleted file mode 100644
index 344b7a80602..00000000000
--- a/i18n/chs/src/vs/workbench/parts/emmet/node/actions/balance.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"balanceInward": "Emmet: 平衡(向内)",
-	"balanceOutward": "Emmet: 平衡(向外)"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/emmet/node/actions/editPoints.i18n.json b/i18n/chs/src/vs/workbench/parts/emmet/node/actions/editPoints.i18n.json
deleted file mode 100644
index 87fec1a103c..00000000000
--- a/i18n/chs/src/vs/workbench/parts/emmet/node/actions/editPoints.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"previousEditPoint": "Emmet: 上一编辑点",
-	"nextEditPoint": "Emmet: 下一编辑点"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/emmet/node/actions/evaluateMath.i18n.json b/i18n/chs/src/vs/workbench/parts/emmet/node/actions/evaluateMath.i18n.json
deleted file mode 100644
index 0598c67b46e..00000000000
--- a/i18n/chs/src/vs/workbench/parts/emmet/node/actions/evaluateMath.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"evaluateMathExpression": "Emmet: 评估数学表达式"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/emmet/node/actions/expandAbbreviation.i18n.json b/i18n/chs/src/vs/workbench/parts/emmet/node/actions/expandAbbreviation.i18n.json
deleted file mode 100644
index dcef9178c36..00000000000
--- a/i18n/chs/src/vs/workbench/parts/emmet/node/actions/expandAbbreviation.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"expandAbbreviationAction": "Emmet: 展开缩写"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/emmet/node/actions/incrementDecrement.i18n.json b/i18n/chs/src/vs/workbench/parts/emmet/node/actions/incrementDecrement.i18n.json
deleted file mode 100644
index 403f855e5eb..00000000000
--- a/i18n/chs/src/vs/workbench/parts/emmet/node/actions/incrementDecrement.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"incrementNumberByOneTenth": "Emmet: 以 0.1 为增量",
-	"incrementNumberByOne": "Emmet: 以 1 为增量",
-	"incrementNumberByTen": "Emmet: 以 10 为增量",
-	"decrementNumberByOneTenth": "Emmet: 以 0.1 为减量",
-	"decrementNumberByOne": "Emmet: 以 1 为减量",
-	"decrementNumberByTen": "Emmet: 以 10 为减量"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/emmet/node/actions/matchingPair.i18n.json b/i18n/chs/src/vs/workbench/parts/emmet/node/actions/matchingPair.i18n.json
deleted file mode 100644
index bb3ef016208..00000000000
--- a/i18n/chs/src/vs/workbench/parts/emmet/node/actions/matchingPair.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"matchingPair": "Emmet: 转到匹配对"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/emmet/node/actions/mergeLines.i18n.json b/i18n/chs/src/vs/workbench/parts/emmet/node/actions/mergeLines.i18n.json
deleted file mode 100644
index 8548113b66b..00000000000
--- a/i18n/chs/src/vs/workbench/parts/emmet/node/actions/mergeLines.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"mergeLines": "Emmet: 合并行"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/emmet/node/actions/reflectCssValue.i18n.json b/i18n/chs/src/vs/workbench/parts/emmet/node/actions/reflectCssValue.i18n.json
deleted file mode 100644
index 1dcfdd7b85c..00000000000
--- a/i18n/chs/src/vs/workbench/parts/emmet/node/actions/reflectCssValue.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"reflectCSSValue": "Emmet: 反射 CSS 值"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/emmet/node/actions/removeTag.i18n.json b/i18n/chs/src/vs/workbench/parts/emmet/node/actions/removeTag.i18n.json
deleted file mode 100644
index b58d42bcafe..00000000000
--- a/i18n/chs/src/vs/workbench/parts/emmet/node/actions/removeTag.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"removeTag": "Emmet: 删除标记"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/emmet/node/actions/selectItem.i18n.json b/i18n/chs/src/vs/workbench/parts/emmet/node/actions/selectItem.i18n.json
deleted file mode 100644
index 6d307aadabf..00000000000
--- a/i18n/chs/src/vs/workbench/parts/emmet/node/actions/selectItem.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"selectPreviousItem": "Emmet: 选择上一项",
-	"selectNextItem": "Emmet: 选择下一项"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/emmet/node/actions/splitJoinTag.i18n.json b/i18n/chs/src/vs/workbench/parts/emmet/node/actions/splitJoinTag.i18n.json
deleted file mode 100644
index 5796a0dcab8..00000000000
--- a/i18n/chs/src/vs/workbench/parts/emmet/node/actions/splitJoinTag.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"splitJoinTag": "Emmet: 分离/联接标记"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/emmet/node/actions/toggleComment.i18n.json b/i18n/chs/src/vs/workbench/parts/emmet/node/actions/toggleComment.i18n.json
deleted file mode 100644
index ecb3f893e89..00000000000
--- a/i18n/chs/src/vs/workbench/parts/emmet/node/actions/toggleComment.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"toggleComment": "Emmet: 切换注释"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/emmet/node/actions/updateImageSize.i18n.json b/i18n/chs/src/vs/workbench/parts/emmet/node/actions/updateImageSize.i18n.json
deleted file mode 100644
index c5d6fd7b350..00000000000
--- a/i18n/chs/src/vs/workbench/parts/emmet/node/actions/updateImageSize.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"updateImageSize": "Emmet: 更新映像大小"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/emmet/node/actions/updateTag.i18n.json b/i18n/chs/src/vs/workbench/parts/emmet/node/actions/updateTag.i18n.json
deleted file mode 100644
index 486e5397c4b..00000000000
--- a/i18n/chs/src/vs/workbench/parts/emmet/node/actions/updateTag.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"updateTag": "Emmet: 更新标记",
-	"enterTag": "输入标记",
-	"tag": "标记"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/emmet/node/actions/wrapWithAbbreviation.i18n.json b/i18n/chs/src/vs/workbench/parts/emmet/node/actions/wrapWithAbbreviation.i18n.json
deleted file mode 100644
index dbca7bf9016..00000000000
--- a/i18n/chs/src/vs/workbench/parts/emmet/node/actions/wrapWithAbbreviation.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"wrapWithAbbreviationAction": "Emmet: 使用缩写进行包装",
-	"enterAbbreviation": "输入缩写",
-	"abbreviation": "缩写"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/emmet/node/emmet.contribution.i18n.json b/i18n/chs/src/vs/workbench/parts/emmet/node/emmet.contribution.i18n.json
deleted file mode 100644
index 6a402e79e1e..00000000000
--- a/i18n/chs/src/vs/workbench/parts/emmet/node/emmet.contribution.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"emmetConfigurationTitle": "Emmet",
-	"triggerExpansionOnTab": "启用后，按 TAB 键时，将展开 Emmet 缩写。",
-	"emmetPreferences": "用于修改 Emmet 的某些操作和解决程序的首选项。",
-	"emmetSyntaxProfiles": "为指定的语法定义配置文件或使用带有特定规则的配置文件。",
-	"emmetExclude": "emmet 缩写不应在其中展开的语言数组。",
-	"emmetExtensionsPath": "转至包含 Emmet 配置文件、片段和首选项的文件的路径"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json b/i18n/chs/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
deleted file mode 100644
index d453e14482f..00000000000
--- a/i18n/chs/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"terminalConfigurationTitle": "外部终端",
-	"explorer.openInTerminalKind": "自定义要启动的终端类型。",
-	"terminal.external.windowsExec": "自定义要在 Windows 上运行的终端。",
-	"terminal.external.osxExec": "自定义要在 OS X 上运行的终端应用程序。",
-	"terminal.external.linuxExec": "自定义要在 Linux 上运行的终端。",
-	"globalConsoleActionWin": "打开新命令提示符",
-	"globalConsoleActionMacLinux": "打开新终端",
-	"scopedConsoleActionWin": "在命令提示符中打开",
-	"scopedConsoleActionMacLinux": "在终端中打开"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/execution/electron-browser/terminal.contribution.i18n.json b/i18n/chs/src/vs/workbench/parts/execution/electron-browser/terminal.contribution.i18n.json
deleted file mode 100644
index 5ef1f763af2..00000000000
--- a/i18n/chs/src/vs/workbench/parts/execution/electron-browser/terminal.contribution.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"terminalConfigurationTitle": "外部终端",
-	"terminal.external.windowsExec": "自定义要在 Windows 上运行的终端。",
-	"terminal.external.osxExec": "自定义要在 OS X 上运行的终端应用程序。",
-	"terminal.external.linuxExec": "自定义要在 Linux 上运行的终端。",
-	"globalConsoleActionWin": "打开新命令提示符",
-	"globalConsoleActionMacLinux": "打开新终端",
-	"scopedConsoleActionWin": "在命令提示符中打开",
-	"scopedConsoleActionMacLinux": "在终端中打开"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/execution/electron-browser/terminalService.i18n.json b/i18n/chs/src/vs/workbench/parts/execution/electron-browser/terminalService.i18n.json
deleted file mode 100644
index 87183ec39c7..00000000000
--- a/i18n/chs/src/vs/workbench/parts/execution/electron-browser/terminalService.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"console.title": "VS Code 控制台",
-	"mac.terminal.script.failed": "脚本“{0}”失败，退出代码为 {1}",
-	"mac.terminal.type.not.supported": "不支持“{0}”",
-	"press.any.key": "按任意键继续...",
-	"linux.term.failed": "“{0}”失败，退出代码为 {1}"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/explorers/browser/treeExplorer.contribution.i18n.json b/i18n/chs/src/vs/workbench/parts/explorers/browser/treeExplorer.contribution.i18n.json
deleted file mode 100644
index 076eadb1e72..00000000000
--- a/i18n/chs/src/vs/workbench/parts/explorers/browser/treeExplorer.contribution.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"vscode.extension.contributes.view": "添加自定义视图",
-	"vscode.extension.contributes.view.id": "用于标识通过 vscode.workspace.createTreeView 创建的视图的唯一 ID",
-	"vscode.extension.contributes.view.label": "用于呈现视图的人类可读的字符串",
-	"vscode.extension.contributes.view.icon": "视图图标的路径",
-	"vscode.extension.contributes.views": "添加自定义视图",
-	"showViewlet": "显示 {0}",
-	"view": "查看"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/explorers/browser/treeExplorerActions.i18n.json b/i18n/chs/src/vs/workbench/parts/explorers/browser/treeExplorerActions.i18n.json
deleted file mode 100644
index 81a891a95bf..00000000000
--- a/i18n/chs/src/vs/workbench/parts/explorers/browser/treeExplorerActions.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"refresh": "刷新"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/explorers/browser/treeExplorerService.i18n.json b/i18n/chs/src/vs/workbench/parts/explorers/browser/treeExplorerService.i18n.json
deleted file mode 100644
index 3f4ae93037e..00000000000
--- a/i18n/chs/src/vs/workbench/parts/explorers/browser/treeExplorerService.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"treeExplorer.noMatchingProviderId": "没有注册 ID 为 {providerId}的 TreeExplorerNodeProvider。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/explorers/browser/views/treeExplorerView.i18n.json b/i18n/chs/src/vs/workbench/parts/explorers/browser/views/treeExplorerView.i18n.json
deleted file mode 100644
index 5ed0afe8c60..00000000000
--- a/i18n/chs/src/vs/workbench/parts/explorers/browser/views/treeExplorerView.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"treeExplorerViewlet.tree": "树资源管理器部分"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/extensions/browser/dependenciesViewer.i18n.json b/i18n/chs/src/vs/workbench/parts/extensions/browser/dependenciesViewer.i18n.json
deleted file mode 100644
index d984e3b227d..00000000000
--- a/i18n/chs/src/vs/workbench/parts/extensions/browser/dependenciesViewer.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"error": "错误",
-	"Unknown Dependency": "未知依赖项:"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json b/i18n/chs/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json
deleted file mode 100644
index 8c7037df74f..00000000000
--- a/i18n/chs/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"name": "扩展名",
-	"extension id": "扩展标识符",
-	"preview": "预览版",
-	"builtin": "内置",
-	"publisher": "发布服务器名称",
-	"install count": "安装计数",
-	"rating": "评级",
-	"repository": "存储库",
-	"license": "许可证",
-	"details": "详细信息",
-	"contributions": "发布内容",
-	"changelog": "更改日志",
-	"dependencies": "依赖项",
-	"noReadme": "无可用自述文件。",
-	"noChangelog": "无可用的更改日志。",
-	"noContributions": "没有发布内容",
-	"noDependencies": "没有依赖项",
-	"settings": "设置({0})",
-	"setting name": "名称",
-	"description": "描述",
-	"default": "默认",
-	"debuggers": "调试程序({0})",
-	"debugger name": "名称",
-	"debugger type": "类型",
-	"views": "视图 ({0})",
-	"view id": "ID",
-	"view name": "名称",
-	"view location": "位置",
-	"localizations": "本地化 ({0})",
-	"localizations language id": "语言 ID",
-	"localizations language name": "语言名称",
-	"localizations localized language name": "语言的本地名称",
-	"colorThemes": "颜色主题 ({0})",
-	"iconThemes": "图标主题 ({0})",
-	"colors": "颜色 ({0})",
-	"colorId": "ID",
-	"defaultDark": "深色默认",
-	"defaultLight": "浅色默认",
-	"defaultHC": "高对比度默认",
-	"JSON Validation": "JSON 验证({0})",
-	"fileMatch": "匹配文件",
-	"schema": "结构",
-	"commands": "命令({0})",
-	"command name": "名称",
-	"keyboard shortcuts": "键盘快捷方式",
-	"menuContexts": "菜单上下文",
-	"languages": "语言({0})",
-	"language id": "ID",
-	"language name": "名称",
-	"file extensions": "文件扩展名",
-	"grammar": "语法",
-	"snippets": "代码片段"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json b/i18n/chs/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
deleted file mode 100644
index d7e48510561..00000000000
--- a/i18n/chs/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
+++ /dev/null
@@ -1,81 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"download": "手动下载",
-	"install vsix": "下载后，请手动安装“{0}”的 VSIX。",
-	"installAction": "安装",
-	"installing": "正在安装",
-	"failedToInstall": "未能安装“{0}”。",
-	"uninstallAction": "卸载",
-	"Uninstalling": "正在卸载",
-	"updateAction": "更新",
-	"updateTo": "更新到 {0}",
-	"failedToUpdate": "未能升级“{0}”。",
-	"ManageExtensionAction.uninstallingTooltip": "正在卸载",
-	"enableForWorkspaceAction": "启用(工作区)",
-	"enableGloballyAction": "启用",
-	"enableAction": "启用",
-	"disableForWorkspaceAction": "禁用(工作区)",
-	"disableGloballyAction": "禁用",
-	"disableAction": "禁用",
-	"checkForUpdates": "检查更新",
-	"enableAutoUpdate": "启用自动更新扩展",
-	"disableAutoUpdate": "禁用自动更新扩展",
-	"updateAll": "更新所有扩展",
-	"reloadAction": "重新加载",
-	"postUpdateTooltip": "重载以更新",
-	"postUpdateMessage": "重载此窗口以激活更新的扩展“{0}”?",
-	"postEnableTooltip": "重载以激活",
-	"postEnableMessage": "重载此窗口以激活扩展“{0}”?",
-	"postDisableTooltip": "重载以停用",
-	"postDisableMessage": "重载此窗口以停用扩展“{0}”?",
-	"postUninstallTooltip": "重载以停用",
-	"postUninstallMessage": "重载此窗口以停用未安装的扩展“{0}”?",
-	"toggleExtensionsViewlet": "显示扩展",
-	"installExtensions": "安装扩展",
-	"showEnabledExtensions": "显示启用的扩展",
-	"showInstalledExtensions": "显示已安装扩展",
-	"showDisabledExtensions": "显示禁用的扩展",
-	"clearExtensionsInput": "清除扩展输入",
-	"showBuiltInExtensions": "显示内置的扩展",
-	"showOutdatedExtensions": "显示过时的扩展",
-	"showPopularExtensions": "显示常用的扩展",
-	"showRecommendedExtensions": "显示推荐的扩展",
-	"installWorkspaceRecommendedExtensions": "安装根据工作区推荐的所有扩展",
-	"allExtensionsInstalled": "已安装根据工作区推荐的所有扩展",
-	"installRecommendedExtension": "安装推荐的扩展",
-	"extensionInstalled": "您已经安装过此推荐扩展",
-	"showRecommendedKeymapExtensionsShort": "按键映射",
-	"showLanguageExtensionsShort": "语言扩展",
-	"showAzureExtensionsShort": "Azure 扩展",
-	"OpenExtensionsFile.failed": "无法在 \".vscode\" 文件夹({0})内创建 \"extensions.json\" 文件。",
-	"configureWorkspaceRecommendedExtensions": "配置建议的扩展(工作区)",
-	"configureWorkspaceFolderRecommendedExtensions": "配置建议的扩展(工作区文件夹)",
-	"malicious tooltip": "此扩展被报告存在问题。",
-	"malicious": "恶意扩展",
-	"disabled": "已禁用",
-	"disabled globally": "已禁用",
-	"disabled workspace": "已在此工作区禁用",
-	"disableAll": "禁用所有已安装的扩展",
-	"disableAllWorkspace": "禁用此工作区的所有已安装的扩展",
-	"enableAll": "启用所有扩展",
-	"enableAllWorkspace": "启用这个工作区的所有扩展",
-	"openExtensionsFolder": "打开扩展文件夹",
-	"installVSIX": "从 VSIX 安装...",
-	"installFromVSIX": "从 VSIX 文件安装",
-	"installButton": "安装(&&I)",
-	"InstallVSIXAction.success": "已成功安装扩展。重载即可启用。",
-	"InstallVSIXAction.reloadNow": "立即重新加载",
-	"reinstall": "重新安装扩展...",
-	"selectExtension": "选择要重新安装的扩展",
-	"ReinstallAction.success": "已成功重新安装扩展。",
-	"ReinstallAction.reloadNow": "立即重新加载",
-	"extensionButtonProminentBackground": "扩展中突出操作的按钮背景色（比如 安装按钮）。",
-	"extensionButtonProminentForeground": "扩展中突出操作的按钮前景色（比如 安装按钮）。",
-	"extensionButtonProminentHoverBackground": "扩展中突出操作的按钮被悬停时的颜色（比如 安装按钮）。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/extensions/browser/extensionsList.i18n.json b/i18n/chs/src/vs/workbench/parts/extensions/browser/extensionsList.i18n.json
deleted file mode 100644
index 9d3b2556c66..00000000000
--- a/i18n/chs/src/vs/workbench/parts/extensions/browser/extensionsList.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"recommended": "推荐"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/extensions/browser/extensionsQuickOpen.i18n.json b/i18n/chs/src/vs/workbench/parts/extensions/browser/extensionsQuickOpen.i18n.json
deleted file mode 100644
index b2c6d0230ee..00000000000
--- a/i18n/chs/src/vs/workbench/parts/extensions/browser/extensionsQuickOpen.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"manage": "按 Enter 管理你的扩展。",
-	"notfound": "没有在商店中找到扩展“{0}”。",
-	"install": "按 Enter 键在商店中安装“{0}”。",
-	"searchFor": "按 Enter 键在商店中搜索“{0}”。",
-	"noExtensionsToInstall": "键入扩展名称"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/extensions/browser/extensionsWidgets.i18n.json b/i18n/chs/src/vs/workbench/parts/extensions/browser/extensionsWidgets.i18n.json
deleted file mode 100644
index 260b41bdf21..00000000000
--- a/i18n/chs/src/vs/workbench/parts/extensions/browser/extensionsWidgets.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"ratedByUsers": "评价来自 {0} 位用户",
-	"ratedBySingleUser": "评价来自 1 位用户"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/extensions/common/extensionsFileTemplate.i18n.json b/i18n/chs/src/vs/workbench/parts/extensions/common/extensionsFileTemplate.i18n.json
deleted file mode 100644
index 14c19f3830f..00000000000
--- a/i18n/chs/src/vs/workbench/parts/extensions/common/extensionsFileTemplate.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"app.extensions.json.title": "扩展",
-	"app.extensions.json.recommendations": "扩展推荐项的列表。扩展的标识符始终为 \"${publisher}.${name}\"。例如 \"vscode.csharp\"。",
-	"app.extension.identifier.errorMessage": "预期的格式 \"${publisher}.${name}\"。例如: \"vscode.csharp\"。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/extensions/common/extensionsInput.i18n.json b/i18n/chs/src/vs/workbench/parts/extensions/common/extensionsInput.i18n.json
deleted file mode 100644
index 180f6de51b0..00000000000
--- a/i18n/chs/src/vs/workbench/parts/extensions/common/extensionsInput.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"extensionsInputName": "扩展: {0}"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json b/i18n/chs/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
deleted file mode 100644
index fd635993248..00000000000
--- a/i18n/chs/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
+++ /dev/null
@@ -1,69 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"name": "扩展名",
-	"extension id": "扩展标识符",
-	"preview": "预览版",
-	"builtin": "内置",
-	"publisher": "发布者名称",
-	"install count": "安装计数",
-	"rating": "评级",
-	"repository": "存储库",
-	"license": "许可证",
-	"details": "详细信息",
-	"detailstooltip": "扩展详细信息，显示扩展的 \"README.md\" 文件。",
-	"contributions": "发布内容",
-	"contributionstooltip": "包含此扩展向 VS Code 编辑器提供的功能",
-	"changelog": "更改日志",
-	"changelogtooltip": "扩展的更新历史，显示扩展的 \"CHANGELOG.md\" 文件。",
-	"dependencies": "依赖项",
-	"dependenciestooltip": "包含此扩展依赖的扩展",
-	"noReadme": "无可用自述文件。",
-	"noChangelog": "无可用的更改日志。",
-	"noContributions": "没有发布内容",
-	"noDependencies": "没有依赖项",
-	"settings": "设置({0})",
-	"setting name": "名称",
-	"description": "描述",
-	"default": "默认",
-	"debuggers": "调试程序({0})",
-	"debugger name": "名称",
-	"debugger type": "类型",
-	"viewContainers": "视图容器 ({0})",
-	"view container id": "ID",
-	"view container title": "标题",
-	"view container location": "位置",
-	"views": "视图 ({0})",
-	"view id": "ID",
-	"view name": "名称",
-	"view location": "位置",
-	"localizations": "本地化 ({0})",
-	"localizations language id": "语言 ID",
-	"localizations language name": "语言名称",
-	"localizations localized language name": "语言本地名称",
-	"colorThemes": "颜色主题 ({0})",
-	"iconThemes": "图标主题 ({0})",
-	"colors": "颜色 ({0})",
-	"colorId": "ID",
-	"defaultDark": "深色默认",
-	"defaultLight": "浅色默认",
-	"defaultHC": "高对比度默认",
-	"JSON Validation": "JSON 验证({0})",
-	"fileMatch": "匹配文件",
-	"schema": "结构",
-	"commands": "命令({0})",
-	"command name": "名称",
-	"keyboard shortcuts": "键盘快捷方式",
-	"menuContexts": "菜单上下文",
-	"languages": "语言({0})",
-	"language id": "ID",
-	"language name": "名称",
-	"file extensions": "文件扩展名",
-	"grammar": "语法",
-	"snippets": "代码片段"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/extensions/electron-browser/extensionProfileService.i18n.json b/i18n/chs/src/vs/workbench/parts/extensions/electron-browser/extensionProfileService.i18n.json
deleted file mode 100644
index 783d077bdc2..00000000000
--- a/i18n/chs/src/vs/workbench/parts/extensions/electron-browser/extensionProfileService.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"restart1": "分析扩展",
-	"restart2": "必须重新启动才能分析扩展。是否现在就重启“{0}”?",
-	"restart3": "重启",
-	"cancel": "取消",
-	"selectAndStartDebug": "单击停止分析。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json b/i18n/chs/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
deleted file mode 100644
index 6d06818b00c..00000000000
--- a/i18n/chs/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"neverShowAgain": "不再显示",
-	"searchMarketplace": "搜索商店",
-	"dynamicWorkspaceRecommendation": "您可能会对这个扩展感兴趣，它在 {0} 存储库的用户间流行。",
-	"exeBasedRecommendation": "根据你安装的 {0}，向你推荐此扩展。",
-	"fileBasedRecommendation": "根据您最近打开的文件推荐此扩展。",
-	"workspaceRecommendation": "当前工作区的用户推荐此扩展。",
-	"reallyRecommended2": "建议对这种类型的文件使用“{0}”扩展。",
-	"reallyRecommendedExtensionPack": "建议对这种类型的文件使用“{0}”扩展包。",
-	"install": "安装",
-	"showRecommendations": "显示建议",
-	"showLanguageExtensions": "商店中有可以对 \".{0}\" 文件提供帮助的扩展。",
-	"workspaceRecommended": "此工作区具有扩展建议。",
-	"installAll": "全部安装",
-	"ignoreExtensionRecommendations": "你是否要忽略所有推荐的扩展?",
-	"ignoreAll": "是，忽略全部",
-	"no": "否"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/extensions/electron-browser/extensions.contribution.i18n.json b/i18n/chs/src/vs/workbench/parts/extensions/electron-browser/extensions.contribution.i18n.json
deleted file mode 100644
index 6e3ad69f939..00000000000
--- a/i18n/chs/src/vs/workbench/parts/extensions/electron-browser/extensions.contribution.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"extensionsCommands": "管理扩展",
-	"galleryExtensionsCommands": "安装库扩展",
-	"extension": "扩展",
-	"runtimeExtension": "正在运行的扩展",
-	"extensions": "扩展",
-	"view": "查看",
-	"developer": "开发者",
-	"extensionsConfigurationTitle": "扩展",
-	"extensionsAutoUpdate": "自动更新扩展",
-	"extensionsIgnoreRecommendations": "如果设置为 \"true\"，将不再显示扩展建议的通知。",
-	"extensionsShowRecommendationsOnlyOnDemand": "若设置为 \"true\"，除非由用户进行请求，我们不会获取或显示推荐。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.i18n.json b/i18n/chs/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.i18n.json
deleted file mode 100644
index 7ccc8b8a1fd..00000000000
--- a/i18n/chs/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openExtensionsFolder": "打开扩展文件夹",
-	"installVSIX": "从 VSIX 安装...",
-	"installFromVSIX": "从 VSIX 文件安装",
-	"installButton": "安装(&&I)",
-	"InstallVSIXAction.success": "已成功安装扩展。重载即可启用。",
-	"InstallVSIXAction.reloadNow": "立即重新加载"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/extensions/electron-browser/extensionsUtils.i18n.json b/i18n/chs/src/vs/workbench/parts/extensions/electron-browser/extensionsUtils.i18n.json
deleted file mode 100644
index 29a3ffd6c16..00000000000
--- a/i18n/chs/src/vs/workbench/parts/extensions/electron-browser/extensionsUtils.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"disableOtherKeymapsConfirmation": "是否禁用其他按键映射扩展 ({0})，从而避免按键绑定之间的冲突?",
-	"yes": "是",
-	"no": "否"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json b/i18n/chs/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
deleted file mode 100644
index 8a74c0239ff..00000000000
--- a/i18n/chs/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"marketPlace": "商店",
-	"installedExtensions": "已安装",
-	"searchInstalledExtensions": "已安装",
-	"recommendedExtensions": "推荐",
-	"otherRecommendedExtensions": "其他推荐",
-	"workspaceRecommendedExtensions": "工作区推荐",
-	"builtInExtensions": "功能",
-	"builtInThemesExtensions": "主题",
-	"builtInBasicsExtensions": "编程语言",
-	"searchExtensions": "在商店中搜索扩展",
-	"sort by installs": "排序依据: 安装计数",
-	"sort by rating": "排序依据: 评分",
-	"sort by name": "排序依据: 名称",
-	"suggestProxyError": "市场返回 \"ECONNREFUSED\"。请检查 \"http.proxy\" 设置。",
-	"extensions": "扩展",
-	"outdatedExtensions": "{0} 个过时的扩展",
-	"malicious warning": "我们卸载了“{0}”，它被报告存在问题。",
-	"reloadNow": "立即重新加载"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/extensions/electron-browser/extensionsViews.i18n.json b/i18n/chs/src/vs/workbench/parts/extensions/electron-browser/extensionsViews.i18n.json
deleted file mode 100644
index 4f97efc4e8b..00000000000
--- a/i18n/chs/src/vs/workbench/parts/extensions/electron-browser/extensionsViews.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"extensions": "扩展",
-	"no extensions found": "找不到扩展。",
-	"suggestProxyError": "市场返回 \"ECONNREFUSED\"。请检查 \"http.proxy\" 设置。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/extensions/electron-browser/keymapExtensions.i18n.json b/i18n/chs/src/vs/workbench/parts/extensions/electron-browser/keymapExtensions.i18n.json
deleted file mode 100644
index 93b977836eb..00000000000
--- a/i18n/chs/src/vs/workbench/parts/extensions/electron-browser/keymapExtensions.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"disableOtherKeymapsConfirmation": "禁用其他键映射以避免键绑定之间的冲突?",
-	"yes": "是",
-	"no": "否"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/extensions/electron-browser/runtimeExtensionsEditor.i18n.json b/i18n/chs/src/vs/workbench/parts/extensions/electron-browser/runtimeExtensionsEditor.i18n.json
deleted file mode 100644
index 36c67ef52ab..00000000000
--- a/i18n/chs/src/vs/workbench/parts/extensions/electron-browser/runtimeExtensionsEditor.i18n.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"starActivation": "已于启动时激活",
-	"workspaceContainsGlobActivation": "已激活，因为工作区中存在与 {0} 匹配的文件",
-	"workspaceContainsFileActivation": "已激活，因为工作区中存在文件 {0}",
-	"languageActivation": "已激活，因为您打开了 {0} 文件",
-	"workspaceGenericActivation": "已于 {0} 时激活",
-	"errors": "{0} 个未捕获的错误",
-	"extensionsInputName": "正在运行的扩展",
-	"showRuntimeExtensions": "显示正在运行的扩展",
-	"reportExtensionIssue": "报告问题",
-	"extensionHostProfileStart": "开始分析扩展主机",
-	"extensionHostProfileStop": "停止分析扩展主机",
-	"saveExtensionHostProfile": "保存扩展主机分析文件"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.i18n.json b/i18n/chs/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.i18n.json
deleted file mode 100644
index 239636a1a30..00000000000
--- a/i18n/chs/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.i18n.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"installingVSIXExtension": "从 VSIX 安装扩展...",
-	"malicious": "此扩展被报告存在问题。",
-	"installingMarketPlaceExtension": "正在从商店安装扩展...",
-	"uninstallingExtension": "正在卸载扩展...",
-	"enableDependeciesConfirmation": "启用扩展也会启用其依赖项。是否要继续?",
-	"enable": "是",
-	"doNotEnable": "否",
-	"disableDependeciesConfirmation": "是否同时禁用扩展的依赖项?",
-	"yes": "是",
-	"no": "否",
-	"cancel": "取消",
-	"singleDependentError": "无法禁用扩展“{0}”。扩展“{1}”取决于此。",
-	"twoDependentsError": "无法禁用扩展“{0}”。扩展“{1}”和扩展“{2}”取决于此。",
-	"multipleDependentsError": "无法禁用扩展“{0}”。扩展“{1}”、“{2}”和其他扩展取决于此。",
-	"installConfirmation": "是否要安装“{0}”扩展？",
-	"install": "安装"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json b/i18n/chs/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json
deleted file mode 100644
index aa5a46d3109..00000000000
--- a/i18n/chs/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"workbenchConfigurationTitle": "工作台",
-	"feedbackVisibility": "控制是否显示工作台底部状态栏中的 Twitter 反馈 (笑脸图标)。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/feedback/electron-browser/feedback.i18n.json b/i18n/chs/src/vs/workbench/parts/feedback/electron-browser/feedback.i18n.json
deleted file mode 100644
index c98e15157a9..00000000000
--- a/i18n/chs/src/vs/workbench/parts/feedback/electron-browser/feedback.i18n.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"sendFeedback": "Tweet 反馈",
-	"label.sendASmile": "通过 Tweet 向我们发送反馈。",
-	"patchedVersion1": "安装已损坏。",
-	"patchedVersion2": "如果您提交了 bug，请指定此项。",
-	"sentiment": "您的体验如何?",
-	"smileCaption": "愉快",
-	"frownCaption": "忧伤",
-	"other ways to contact us": "联系我们的其他方式",
-	"submit a bug": "提交 bug",
-	"request a missing feature": "请求缺失功能",
-	"tell us why?": "告诉我们原因?",
-	"commentsHeader": "注释",
-	"showFeedback": "在状态栏中显示反馈笑脸图标",
-	"tweet": "Tweet",
-	"character left": "剩余字符",
-	"characters left": "剩余字符",
-	"feedbackSending": "正在发送",
-	"feedbackSent": "谢谢",
-	"feedbackSendingError": "重试"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json b/i18n/chs/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json
deleted file mode 100644
index c800714c60b..00000000000
--- a/i18n/chs/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hide": "隐藏"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/files/browser/editors/binaryFileEditor.i18n.json b/i18n/chs/src/vs/workbench/parts/files/browser/editors/binaryFileEditor.i18n.json
deleted file mode 100644
index c66daea6612..00000000000
--- a/i18n/chs/src/vs/workbench/parts/files/browser/editors/binaryFileEditor.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"binaryFileEditor": "二进制文件查看器"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/files/browser/editors/textFileEditor.i18n.json b/i18n/chs/src/vs/workbench/parts/files/browser/editors/textFileEditor.i18n.json
deleted file mode 100644
index 021d6bf5787..00000000000
--- a/i18n/chs/src/vs/workbench/parts/files/browser/editors/textFileEditor.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"textFileEditor": "文本文件编辑器",
-	"createFile": "创建文件",
-	"relaunchWithIncreasedMemoryLimit": "以 {0}MB 重启",
-	"configureMemoryLimit": "配置内存限制",
-	"fileEditorWithInputAriaLabel": "{0}。文本文件编辑器。",
-	"fileEditorAriaLabel": "文本文件编辑器。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/files/browser/explorerViewlet.i18n.json b/i18n/chs/src/vs/workbench/parts/files/browser/explorerViewlet.i18n.json
deleted file mode 100644
index c1ad2f1b1e0..00000000000
--- a/i18n/chs/src/vs/workbench/parts/files/browser/explorerViewlet.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"folders": "文件夹"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/files/browser/fileActions.contribution.i18n.json b/i18n/chs/src/vs/workbench/parts/files/browser/fileActions.contribution.i18n.json
deleted file mode 100644
index 30c68b4c7ad..00000000000
--- a/i18n/chs/src/vs/workbench/parts/files/browser/fileActions.contribution.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"filesCategory": "文件",
-	"revealInSideBar": "在侧边栏中显示",
-	"acceptLocalChanges": "使用你的更改并覆盖磁盘上的内容。",
-	"revertLocalChanges": "放弃你的更改并还原为磁盘上的内容"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/files/browser/fileActions.i18n.json b/i18n/chs/src/vs/workbench/parts/files/browser/fileActions.i18n.json
deleted file mode 100644
index f9208415003..00000000000
--- a/i18n/chs/src/vs/workbench/parts/files/browser/fileActions.i18n.json
+++ /dev/null
@@ -1,75 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"retry": "重试",
-	"rename": "重命名",
-	"newFile": "新建文件",
-	"newFolder": "新建文件夹",
-	"openFolderFirst": "先打开一个文件夹，以在其中创建文件或文件夹。",
-	"newUntitledFile": "新的无标题文件",
-	"createNewFile": "新建文件",
-	"createNewFolder": "新建文件夹",
-	"deleteButtonLabelRecycleBin": "移动到回收站(&&M)",
-	"deleteButtonLabelTrash": "移动到回收站(&&M)",
-	"deleteButtonLabel": "删除(&&D)",
-	"dirtyMessageFolderOneDelete": "你正在删除的文件夹有 1 个文件具有未保存的更改。是否继续?",
-	"dirtyMessageFolderDelete": "你正在删除的文件夹有 {0} 个文件具有未保存的更改。是否继续?",
-	"dirtyMessageFileDelete": "你正在删除的文件具有未保存的更改。是否继续?",
-	"dirtyWarning": "如果不保存，更改将丢失。",
-	"confirmMoveTrashMessageFolder": "是否确实要删除“{0}”及其内容?",
-	"confirmMoveTrashMessageFile": "是否确实要删除“{0}”?",
-	"undoBin": "可以从回收站还原。",
-	"undoTrash": "可以从回收站还原。",
-	"doNotAskAgain": "不再询问",
-	"confirmDeleteMessageFolder": "是否确定要永久删除“{0}”及其内容?",
-	"confirmDeleteMessageFile": "是否确定要永久删除“{0}”?",
-	"irreversible": "此操作不可逆!",
-	"permDelete": "永久删除",
-	"delete": "删除",
-	"importFiles": "导入文件",
-	"confirmOverwrite": "目标文件夹中已存在具有相同名称的文件或文件夹。是否要替换它?",
-	"replaceButtonLabel": "替换(&&R)",
-	"copyFile": "复制",
-	"pasteFile": "粘贴",
-	"duplicateFile": "重复",
-	"openToSide": "打开到侧边",
-	"compareSource": "选择以进行比较",
-	"globalCompareFile": "比较活动文件与...",
-	"openFileToCompare": "首先打开文件以将其与另外一个文件比较。",
-	"compareWith": "将“{0}”与“{1}”比较",
-	"compareFiles": "比较文件",
-	"refresh": "刷新",
-	"save": "保存",
-	"saveAs": "另存为...",
-	"saveAll": "全部保存",
-	"saveAllInGroup": "保存组中的全部内容",
-	"saveFiles": "保存所有文件",
-	"revert": "还原文件",
-	"focusOpenEditors": "专注于“打开的编辑器”视图",
-	"focusFilesExplorer": "关注文件资源浏览器",
-	"showInExplorer": "在侧边栏中显示活动文件",
-	"openFileToShow": "请先打开要在浏览器中显示的文件",
-	"collapseExplorerFolders": "在资源管理器中折叠文件夹",
-	"refreshExplorer": "刷新资源管理器",
-	"openFileInNewWindow": "在新窗口中打开活动文件",
-	"openFileToShowInNewWindow": "请先打开要在新窗口中打开的文件",
-	"revealInWindows": "在资源管理器中显示",
-	"revealInMac": "在 Finder 中显示",
-	"openContainer": "打开所在的文件夹",
-	"revealActiveFileInWindows": "Windows 资源管理器中显示活动文件",
-	"revealActiveFileInMac": "在 Finder 中显示活动文件",
-	"openActiveFileContainer": "打开活动文件所在的文件夹",
-	"copyPath": "复制路径",
-	"copyPathOfActive": "复制活动文件的路径",
-	"emptyFileNameError": "必须提供文件或文件夹名。",
-	"fileNameExistsError": "此位置已存在文件或文件夹 **{0}**。请选择其他名称。",
-	"invalidFileNameError": "名称 **{0}** 作为文件或文件夹名无效。请选择其他名称。",
-	"filePathTooLongError": "名称 **{0}** 导致路径太长。请选择更短的名称。",
-	"compareWithSaved": "比较活动与已保存的文件",
-	"modifiedLabel": "{0} (磁盘上) ↔ {1}",
-	"compareWithClipboard": "比较活动文件与剪贴板",
-	"clipboardComparisonLabel": "剪贴板 ↔ {0}"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/files/browser/fileCommands.i18n.json b/i18n/chs/src/vs/workbench/parts/files/browser/fileCommands.i18n.json
deleted file mode 100644
index 702c021c5f3..00000000000
--- a/i18n/chs/src/vs/workbench/parts/files/browser/fileCommands.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"openFileToCopy": "首先打开文件以复制其路径",
-	"openFileToReveal": "首先打开文件以展现"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/files/browser/files.contribution.i18n.json b/i18n/chs/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
deleted file mode 100644
index 63427668f5f..00000000000
--- a/i18n/chs/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
+++ /dev/null
@@ -1,53 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"showExplorerViewlet": "显示资源管理器",
-	"explore": "资源管理器",
-	"view": "查看",
-	"textFileEditor": "文本文件编辑器",
-	"binaryFileEditor": "二进制文件编辑器",
-	"filesConfigurationTitle": "文件",
-	"exclude": "配置 glob 模式以在搜索中排除文件和文件夹。例如，文件资源管理器根据此设置决定文件或文件夹的显示和隐藏。",
-	"files.exclude.boolean": "匹配文件路径所依据的 glob 模式。设置为 true 或 false 可启用或禁用该模式。",
-	"files.exclude.when": "对匹配文件的同级文件的其他检查。使用 $(basename) 作为匹配文件名的变量。",
-	"associations": "配置语言的文件关联(如: \"*.extension\": \"html\")。这些关联的优先级高于已安装语言的默认关联。",
-	"encoding": "读取和编写文件时使用的默认字符集编码。也可以根据语言配置此设置。",
-	"autoGuessEncoding": "如果启用，会在打开文件时尝试猜测字符集编码。也可以根据语言配置此设置。",
-	"eol": "默认行尾字符。使用 \\n 表示 LF，\\r\\n 表示 CRLF。",
-	"trimTrailingWhitespace": "启用后，将在保存文件时剪裁尾随空格。",
-	"insertFinalNewline": "启用后，保存文件时在文件末尾插入一个最终新行。",
-	"trimFinalNewlines": "启用后，保存文件时将删除在最终新行后的所有新行。",
-	"files.autoSave.off": "永不自动保存更新后的文件。",
-	"files.autoSave.afterDelay": "配置 \"files.autoSaveDelay\" 后自动保存更新后的文件。",
-	"files.autoSave.onFocusChange": "编辑器失去焦点时自动保存更新后的文件。",
-	"files.autoSave.onWindowChange": "窗口失去焦点时自动保存更新后的文件。",
-	"autoSave": "控制已更新文件的自动保存。接受的值:“{0}”、\"{1}”、“{2}”(编辑器失去焦点)、“{3}”(窗口失去焦点)。如果设置为“{4}”，则可在 \"files.autoSaveDelay\" 中配置延迟。",
-	"autoSaveDelay": "控制在多少毫秒后自动保存更改过的文件。仅在“files.autoSave”设置为“{0}”时适用。",
-	"watcherExclude": "配置文件路径的 glob 模式以从文件监视排除。模式必须在绝对路径上匹配(例如 ** 前缀或完整路径需正确匹配)。更改此设置需要重启。如果在启动时遇到 Code 消耗大量 CPU 时间，则可以排除大型文件夹以减少初始加载。",
-	"hotExit.off": "禁用热退出。",
-	"hotExit.onExit": "应用程序关闭时将触发热退出。在 Windows/Linux 上关闭最后一个窗口或触发 workbench.action.quit 命令（命令托盘、键绑定、菜单）会引起应用程序关闭。下次启动时将还原所有已备份的窗口。",
-	"hotExit.onExitAndWindowClose": "应用程序关闭时将触发热退出。在 Windows/Linux 上关闭最后一个窗口、触发 workbench.action.quit 命令（命令托盘、键绑定、菜单）会引起应用程序关闭。对于任何有文件夹打开的窗口，则不论该窗口是否是最后一个窗口。下次启动时将还原所有未打开文件夹的窗口。若要还原打开有文件夹的窗口，请将“window.restoreWindows”设置为“all”。",
-	"hotExit": "控制是否在会话间记住未保存的文件，以允许在退出编辑器时跳过保存提示。",
-	"useExperimentalFileWatcher": "使用新的试验文件观察程序。",
-	"defaultLanguage": "分配给新文件的默认语言模式。",
-	"editorConfigurationTitle": "编辑器",
-	"formatOnSave": "保存时设置文件的格式。格式化程序必须可用，不能自动保存文件，并且不能关闭编辑器。",
-	"explorerConfigurationTitle": "文件资源管理器",
-	"openEditorsVisible": "在“打开的编辑器”窗格中显示的编辑器数量。将其设置为 0 可隐藏窗格。",
-	"dynamicHeight": "控制打开的编辑器部分的高度是否应动态适应元素数量。",
-	"autoReveal": "控制资源管理器是否应在打开文件时自动显示并选择它们。",
-	"enableDragAndDrop": "控制资源管理器是否应该允许通过拖放移动文件和文件夹。",
-	"confirmDragAndDrop": "控制在资源管理器内拖放移动文件或文件夹时是否进行确认。",
-	"confirmDelete": "控制资源管理器是否应在删除文件到回收站时进行确认。",
-	"sortOrder.default": "按名称的字母顺序排列文件和文件夹。文件夹显示在文件前。",
-	"sortOrder.mixed": "按名称的字母顺序排列文件和文件夹。两者穿插显示。",
-	"sortOrder.filesFirst": "按名称的字母顺序排列文件和文件夹。文件显示在文件夹前。",
-	"sortOrder.type": "按扩展名的字母顺序排列文件和文件夹。文件夹显示在文件前。",
-	"sortOrder.modified": "按最后修改日期降序排列文件和文件夹。文件夹显示在文件前。",
-	"sortOrder": "控制资源管理器文件和文件夹的排列顺序。除了默认排列顺序，你也可以设置为 \"mixed\" (文件和文件夹一起排序)、\"type\" (按文件类型排)、\"modified\" (按最后修改日期排)或是 \"filesFirst\" (将文件排在文件夹前)。",
-	"explorer.decorations.colors": "控制文件修饰是否用颜色。",
-	"explorer.decorations.badges": "控制文件修饰是否用徽章。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/files/browser/saveErrorHandler.i18n.json b/i18n/chs/src/vs/workbench/parts/files/browser/saveErrorHandler.i18n.json
deleted file mode 100644
index 8ebee88ce98..00000000000
--- a/i18n/chs/src/vs/workbench/parts/files/browser/saveErrorHandler.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"userGuide": "使用右侧编辑器工具栏的操作来**撤消**你的更改或用你的更改来**覆盖**磁盘上的内容",
-	"discard": "放弃",
-	"overwrite": "覆盖",
-	"retry": "重试",
-	"readonlySaveError": "无法保存“{0}”: 文件写保护。选择“覆盖”以删除保护。 ",
-	"genericSaveError": "未能保存“{0}”: {1}",
-	"staleSaveError": "无法保存“{0}”: 磁盘上的内容较新。单击 **比较** 以比较你的版本和磁盘上的版本。",
-	"compareChanges": "比较",
-	"saveConflictDiffLabel": "{0} (on disk) ↔ {1} (in {2}) - 解决保存的冲突"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/files/browser/views/emptyView.i18n.json b/i18n/chs/src/vs/workbench/parts/files/browser/views/emptyView.i18n.json
deleted file mode 100644
index 5939052419b..00000000000
--- a/i18n/chs/src/vs/workbench/parts/files/browser/views/emptyView.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"noWorkspace": "无打开的文件夹",
-	"explorerSection": "文件资源管理器部分",
-	"noWorkspaceHelp": "你还没有在工作区中添加文件夹。",
-	"addFolder": "添加文件夹",
-	"noFolderHelp": "尚未打开文件夹。",
-	"openFolder": "打开文件夹"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/files/browser/views/explorerDecorationsProvider.i18n.json b/i18n/chs/src/vs/workbench/parts/files/browser/views/explorerDecorationsProvider.i18n.json
deleted file mode 100644
index e301fea30f0..00000000000
--- a/i18n/chs/src/vs/workbench/parts/files/browser/views/explorerDecorationsProvider.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"label": "资源管理器",
-	"canNotResolve": "无法解析工作区文件夹"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/files/browser/views/explorerView.i18n.json b/i18n/chs/src/vs/workbench/parts/files/browser/views/explorerView.i18n.json
deleted file mode 100644
index 7193836bd08..00000000000
--- a/i18n/chs/src/vs/workbench/parts/files/browser/views/explorerView.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"explorerSection": "文件资源管理器部分",
-	"treeAriaLabel": "文件资源管理器"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/files/browser/views/explorerViewer.i18n.json b/i18n/chs/src/vs/workbench/parts/files/browser/views/explorerViewer.i18n.json
deleted file mode 100644
index d97098d02f7..00000000000
--- a/i18n/chs/src/vs/workbench/parts/files/browser/views/explorerViewer.i18n.json
+++ /dev/null
@@ -1,19 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"fileInputAriaLabel": "键入文件名。按 Enter 以确认或按 Esc 以取消。",
-	"filesExplorerViewerAriaLabel": "{0}，文件资源管理器",
-	"dropFolders": "你是否要将文件夹添加到工作区?",
-	"dropFolder": "你是否要将文件夹添加到工作区?",
-	"addFolders": "添加文件夹(&&A)",
-	"addFolder": "添加文件夹(&&A)",
-	"confirmMove": "是否确实要移动“{0}”?",
-	"doNotAskAgain": "不再询问",
-	"moveButtonLabel": "移动(&&M)",
-	"confirmOverwriteMessage": "目标文件夹中已存在“{0}”。是否要将其替换?",
-	"irreversible": "此操作不可逆!",
-	"replaceButtonLabel": "替换(&&R)"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/files/browser/views/openEditorsView.i18n.json b/i18n/chs/src/vs/workbench/parts/files/browser/views/openEditorsView.i18n.json
deleted file mode 100644
index 1639569b110..00000000000
--- a/i18n/chs/src/vs/workbench/parts/files/browser/views/openEditorsView.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"openEditors": "打开的编辑器",
-	"openEditosrSection": "打开的编辑器部分",
-	"treeAriaLabel": "打开的编辑器: 活动文件列表",
-	"dirtyCounter": "{0} 个未保存"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/files/browser/views/openEditorsViewer.i18n.json b/i18n/chs/src/vs/workbench/parts/files/browser/views/openEditorsViewer.i18n.json
deleted file mode 100644
index 5b583f97926..00000000000
--- a/i18n/chs/src/vs/workbench/parts/files/browser/views/openEditorsViewer.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"editorGroupAriaLabel": "{0}, 编辑器组",
-	"openEditorAriaLabel": "{0}, 打开编辑器",
-	"saveAll": "全部保存",
-	"closeAllUnmodified": "关闭未更改",
-	"closeAll": "全部关闭",
-	"compareWithSaved": "与已保存文件比较",
-	"close": "关闭",
-	"closeOthers": "关闭其他"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/files/common/dirtyFilesTracker.i18n.json b/i18n/chs/src/vs/workbench/parts/files/common/dirtyFilesTracker.i18n.json
deleted file mode 100644
index 03f2d8acb06..00000000000
--- a/i18n/chs/src/vs/workbench/parts/files/common/dirtyFilesTracker.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"dirtyFile": "1 个未保存的文件",
-	"dirtyFiles": "{0} 个未保存的文件"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/files/common/editors/fileEditorInput.i18n.json b/i18n/chs/src/vs/workbench/parts/files/common/editors/fileEditorInput.i18n.json
deleted file mode 100644
index 44cfddb8634..00000000000
--- a/i18n/chs/src/vs/workbench/parts/files/common/editors/fileEditorInput.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"orphanedFile": "{0} (磁盘上已删除)"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/files/electron-browser/explorerViewlet.i18n.json b/i18n/chs/src/vs/workbench/parts/files/electron-browser/explorerViewlet.i18n.json
deleted file mode 100644
index 2a264fc0233..00000000000
--- a/i18n/chs/src/vs/workbench/parts/files/electron-browser/explorerViewlet.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"folders": "文件夹"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json b/i18n/chs/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
deleted file mode 100644
index f82464e4491..00000000000
--- a/i18n/chs/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"filesCategory": "文件",
-	"revealInSideBar": "在侧边栏中显示",
-	"acceptLocalChanges": "使用你的更改并覆盖磁盘上的内容。",
-	"revertLocalChanges": "放弃你的更改并还原为磁盘上的内容",
-	"copyPathOfActive": "复制活动文件的路径",
-	"saveAllInGroup": "保存组中的全部内容",
-	"saveFiles": "保存所有文件",
-	"revert": "还原文件",
-	"compareActiveWithSaved": "比较活动与已保存的文件",
-	"closeEditor": "关闭编辑器",
-	"view": "查看",
-	"openToSide": "在侧边打开",
-	"revealInWindows": "在资源管理器中显示",
-	"revealInMac": "在 Finder 中显示",
-	"openContainer": "打开所在的文件夹",
-	"copyPath": "复制路径",
-	"saveAll": "全部保存",
-	"compareWithSaved": "与已保存文件比较",
-	"compareWithSelected": "与已选项目进行比较",
-	"compareSource": "选择进行比较",
-	"compareSelected": "将已选项进行比较",
-	"close": "关闭",
-	"closeOthers": "关闭其他",
-	"closeSaved": "关闭已保存",
-	"closeAll": "全部关闭",
-	"deleteFile": "永久删除"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json b/i18n/chs/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
deleted file mode 100644
index 1da53727f33..00000000000
--- a/i18n/chs/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
+++ /dev/null
@@ -1,72 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"newFile": "新建文件",
-	"newFolder": "新建文件夹",
-	"rename": "重命名",
-	"delete": "删除",
-	"copyFile": "复制",
-	"pasteFile": "粘贴",
-	"retry": "重试",
-	"renameWhenSourcePathIsParentOfTargetError": "请使用“新建文件夹”或“新建文件”命令来向已有文件夹添加子项",
-	"newUntitledFile": "新的无标题文件",
-	"createNewFile": "新建文件",
-	"createNewFolder": "新建文件夹",
-	"deleteButtonLabelRecycleBin": "移动到回收站(&&M)",
-	"deleteButtonLabelTrash": "移动到废纸篓(&&M)",
-	"deleteButtonLabel": "删除(&&D)",
-	"dirtyMessageFilesDelete": "你删除的文件中具有未保存的更改。是否继续?",
-	"dirtyMessageFolderOneDelete": "你正在删除的文件夹有 1 个文件具有未保存的更改。是否继续?",
-	"dirtyMessageFolderDelete": "你正在删除的文件夹有 {0} 个文件具有未保存的更改。是否继续?",
-	"dirtyMessageFileDelete": "你正在删除的文件具有未保存的更改。是否继续?",
-	"dirtyWarning": "如果不保存，更改将丢失。",
-	"undoBin": "可以从回收站还原。",
-	"undoTrash": "可以从废纸篓还原。",
-	"doNotAskAgain": "不再询问",
-	"irreversible": "此操作不可逆!",
-	"binFailed": "无法删除到回收站。是否永久删除？",
-	"trashFailed": "无法删除到废纸篓。是否永久删除？",
-	"deletePermanentlyButtonLabel": "永久删除(&&D)",
-	"retryButtonLabel": "重试(&&R)",
-	"confirmMoveTrashMessageFilesAndDirectories": "是否确定要删除以下 {0} 个文件或文件夹 (包括其内容)?",
-	"confirmMoveTrashMessageMultipleDirectories": "是否确定要删除以下 {0} 个文件夹及其内容?",
-	"confirmMoveTrashMessageMultiple": "是否确定要删除以下 {0} 个文件?",
-	"confirmMoveTrashMessageFolder": "是否确实要删除“{0}”及其内容?",
-	"confirmMoveTrashMessageFile": "是否确实要删除“{0}”?",
-	"confirmDeleteMessageFilesAndDirectories": "是否确定要永久删除以下 {0} 个文件或文件夹 (包括其内容)?",
-	"confirmDeleteMessageMultipleDirectories": "是否确定要永久删除以下 {0} 个目录及其内容?",
-	"confirmDeleteMessageMultiple": "是否确定要永久删除以下 {0} 个文件?",
-	"confirmDeleteMessageFolder": "是否确定要永久删除“{0}”及其内容?",
-	"confirmDeleteMessageFile": "是否确定要永久删除“{0}”?",
-	"addFiles": "添加文件",
-	"confirmOverwrite": "目标文件夹中已存在具有相同名称的文件或文件夹。是否要替换它?",
-	"replaceButtonLabel": "替换(&&R)",
-	"fileIsAncestor": "粘贴的项目是目标文件夹的上级",
-	"fileDeleted": "粘贴的文件已被删除或移动",
-	"duplicateFile": "重复",
-	"globalCompareFile": "比较活动文件与...",
-	"openFileToCompare": "首先打开文件以将其与另外一个文件比较。",
-	"refresh": "刷新",
-	"saveAllInGroup": "保存组中的全部内容",
-	"focusOpenEditors": "专注于“打开的编辑器”视图",
-	"focusFilesExplorer": "关注文件资源浏览器",
-	"showInExplorer": "在侧边栏中显示活动文件",
-	"openFileToShow": "请先打开要在浏览器中显示的文件",
-	"collapseExplorerFolders": "在资源管理器中折叠文件夹",
-	"refreshExplorer": "刷新资源管理器",
-	"openFileInNewWindow": "在新窗口中打开活动文件",
-	"openFileToShowInNewWindow": "请先打开要在新窗口中打开的文件",
-	"copyPath": "复制路径",
-	"emptyFileNameError": "必须提供文件或文件夹名。",
-	"fileNameStartsWithSlashError": "文件或文件夹名称不能以斜线开头。",
-	"fileNameExistsError": "此位置已存在文件或文件夹 **{0}**。请选择其他名称。",
-	"invalidFileNameError": "名称 **{0}** 作为文件或文件夹名无效。请选择其他名称。",
-	"filePathTooLongError": "名称 **{0}** 导致路径太长。请选择更短的名称。",
-	"compareWithClipboard": "比较活动文件与剪贴板",
-	"clipboardComparisonLabel": "剪贴板 ↔ {0}"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json b/i18n/chs/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
deleted file mode 100644
index 10c5b3be19a..00000000000
--- a/i18n/chs/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"revealInWindows": "在资源管理器中显示",
-	"revealInMac": "在 Finder 中显示",
-	"openContainer": "打开所在的文件夹",
-	"saveAs": "另存为...",
-	"save": "保存",
-	"saveAll": "全部保存",
-	"removeFolderFromWorkspace": "将文件夹从工作区删除",
-	"genericRevertError": "未能还原“{0}”: {1}",
-	"modifiedLabel": "{0} (磁盘上) ↔ {1}",
-	"openFileToReveal": "首先打开文件以展现",
-	"openFileToCopy": "首先打开文件以复制其路径"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json b/i18n/chs/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
deleted file mode 100644
index 4067aaffcec..00000000000
--- a/i18n/chs/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"showExplorerViewlet": "显示资源管理器",
-	"explore": "资源管理器",
-	"view": "查看",
-	"textFileEditor": "文本文件编辑器",
-	"binaryFileEditor": "二进制文件编辑器",
-	"filesConfigurationTitle": "文件",
-	"exclude": "配置 glob 模式以在搜索中排除文件和文件夹。例如，文件资源管理器根据此设置决定文件或文件夹的显示和隐藏。",
-	"files.exclude.boolean": "匹配文件路径所依据的 glob 模式。设置为 true 或 false 可启用或禁用该模式。",
-	"files.exclude.when": "对匹配文件的同级文件的其他检查。使用 $(basename) 作为匹配文件名的变量。",
-	"associations": "配置语言的文件关联(如: \"*.extension\": \"html\")。这些关联的优先级高于已安装语言的默认关联。",
-	"encoding": "读取和编写文件时使用的默认字符集编码。也可以根据语言配置此设置。",
-	"autoGuessEncoding": "如果启用，会在打开文件时尝试猜测字符集编码。也可以根据语言配置此设置。",
-	"eol": "默认行尾字符。使用 \\n 表示 LF，\\r\\n 表示 CRLF。",
-	"trimTrailingWhitespace": "启用后，将在保存文件时剪裁尾随空格。",
-	"insertFinalNewline": "启用后，保存文件时在文件末尾插入一个最终新行。",
-	"trimFinalNewlines": "启用后，保存文件时将删除在最终新行后的所有新行。",
-	"files.autoSave.off": "永不自动保存更新后的文件。",
-	"files.autoSave.afterDelay": "配置 \"files.autoSaveDelay\" 后自动保存更新后的文件。",
-	"files.autoSave.onFocusChange": "编辑器失去焦点时自动保存更新后的文件。",
-	"files.autoSave.onWindowChange": "窗口失去焦点时自动保存更新后的文件。",
-	"autoSave": "控制何时自动保存已更新文件。接受的值: \"{0}\"、\"{1}\"、\"{2}\" (编辑器失去焦点)、\"{3}\" (窗口失去焦点)。如果设置为 \"{4}\"，可在 \"files.autoSaveDelay\" 中配置延迟时间。",
-	"autoSaveDelay": "控制在多少毫秒后自动保存更改过的文件。仅在“files.autoSave”设置为“{0}”时适用。",
-	"watcherExclude": "配置文件路径的 glob 模式以从文件监视排除。模式必须在绝对路径上匹配(例如 ** 前缀或完整路径需正确匹配)。更改此设置需要重启。如果在启动时遇到 Code 消耗大量 CPU 时间，则可以排除大型文件夹以减少初始加载。",
-	"hotExit.off": "禁用热退出。",
-	"hotExit.onExit": "应用程序关闭时将自动保留未保存内容 (热退出)。关闭的定义为，在 Windows/Linux 上关闭最后一个窗口或者在全平台触发 workbench.action.quit 命令 (命令托盘、键绑定、菜单)。下次启动时将还原所有已备份的窗口。",
-	"hotExit.onExitAndWindowClose": "应用程序关闭时将自动保留未保存内容 (热退出)。关闭的定义为，在 Windows/Linux 上关闭最后一个窗口，在全平台触发 workbench.action.quit 命令 (命令托盘、按键绑定、菜单)，对于任何打开有文件夹的窗口，则不论该窗口是否是最后一个窗口。下次启动时将还原所有未打开文件夹的窗口。若要还原打开有文件夹的窗口，请将 \"window.restoreWindows\" 设置为 \"all\"。",
-	"hotExit": "控制是否在会话间记住未保存的文件，以允许在退出编辑器时跳过保存提示。",
-	"useExperimentalFileWatcher": "使用新的试验文件观察程序。",
-	"defaultLanguage": "分配给新文件的默认语言模式。",
-	"maxMemoryForLargeFilesMB": "在打开大型文件时，控制 VS Code 可在重启后使用的内存。在命令行中指定“--max-memory=新的大小”参数可达到相同效果。",
-	"editorConfigurationTitle": "编辑器",
-	"formatOnSave": "保存时设置文件的格式。格式化程序必须可用，不能自动保存文件，并且不能关闭编辑器。",
-	"formatOnSaveTimeout": "在保存时格式化操作的超时时间。为 formatOnSave 命令指定时间限制 (单位: 毫秒)。运行超过设定时间的命令将被取消。",
-	"explorerConfigurationTitle": "文件资源管理器",
-	"openEditorsVisible": "在“打开的编辑器”窗格中显示的编辑器数量。",
-	"autoReveal": "控制资源管理器是否应在打开文件时自动显示并选择它们。",
-	"enableDragAndDrop": "控制资源管理器是否应该允许通过拖放移动文件和文件夹。",
-	"confirmDragAndDrop": "控制在资源管理器内拖放移动文件或文件夹时是否进行确认。",
-	"confirmDelete": "控制资源管理器是否应在删除文件到废纸篓时进行确认。",
-	"sortOrder.default": "按名称的字母顺序排列文件和文件夹。文件夹显示在文件前。",
-	"sortOrder.mixed": "按名称的字母顺序排列文件和文件夹。两者穿插显示。",
-	"sortOrder.filesFirst": "按名称的字母顺序排列文件和文件夹。文件显示在文件夹前。",
-	"sortOrder.type": "按扩展名的字母顺序排列文件和文件夹。文件夹显示在文件前。",
-	"sortOrder.modified": "按最后修改日期降序排列文件和文件夹。文件夹显示在文件前。",
-	"sortOrder": "控制资源管理器文件和文件夹的排列顺序。除了默认排列顺序，你也可以设置为 \"mixed\" (文件和文件夹一起排序)、\"type\" (按文件类型排)、\"modified\" (按最后修改日期排)或是 \"filesFirst\" (将文件排在文件夹前)。",
-	"explorer.decorations.colors": "控制文件修饰是否用颜色。",
-	"explorer.decorations.badges": "控制文件修饰是否用徽章。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json b/i18n/chs/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json
deleted file mode 100644
index 253dcd9399a..00000000000
--- a/i18n/chs/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"userGuide": "使用编辑器工具栏中的操作撤消更改或覆盖磁盘上的内容",
-	"staleSaveError": "无法保存“{0}”: 磁盘上的内容较新。请将您的版本和磁盘上的版本进行比较。",
-	"retry": "重试",
-	"discard": "放弃",
-	"readonlySaveErrorAdmin": "无法保存“{0}”: 文件写保护。选择“以管理员身份覆盖”可作为管理员重试。 ",
-	"readonlySaveError": "无法保存“{0}”: 文件写保护。选择“覆盖”可尝试移除保护。",
-	"permissionDeniedSaveError": "无法保存“{0}”: 权限不足。选择“以管理员身份覆盖”可作为管理员重试。",
-	"genericSaveError": "未能保存“{0}”: {1}",
-	"learnMore": "了解详细信息",
-	"dontShowAgain": "不再显示",
-	"compareChanges": "比较",
-	"saveConflictDiffLabel": "{0} (on disk) ↔ {1} (in {2}) - 解决保存的冲突",
-	"overwriteElevated": "以管理员身份覆盖...",
-	"saveElevated": "以管理员身份重试...",
-	"overwrite": "覆盖"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/files/electron-browser/views/emptyView.i18n.json b/i18n/chs/src/vs/workbench/parts/files/electron-browser/views/emptyView.i18n.json
deleted file mode 100644
index 2f0074e98c0..00000000000
--- a/i18n/chs/src/vs/workbench/parts/files/electron-browser/views/emptyView.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noWorkspace": "无打开的文件夹",
-	"explorerSection": "文件资源管理器部分",
-	"noWorkspaceHelp": "你还没有在工作区中添加文件夹。",
-	"addFolder": "添加文件夹",
-	"noFolderHelp": "尚未打开文件夹。",
-	"openFolder": "打开文件夹"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/files/electron-browser/views/explorerDecorationsProvider.i18n.json b/i18n/chs/src/vs/workbench/parts/files/electron-browser/views/explorerDecorationsProvider.i18n.json
deleted file mode 100644
index e233769d4db..00000000000
--- a/i18n/chs/src/vs/workbench/parts/files/electron-browser/views/explorerDecorationsProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"label": "资源管理器",
-	"canNotResolve": "无法解析工作区文件夹",
-	"symbolicLlink": "符号链接"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/files/electron-browser/views/explorerView.i18n.json b/i18n/chs/src/vs/workbench/parts/files/electron-browser/views/explorerView.i18n.json
deleted file mode 100644
index 12f3bb23e14..00000000000
--- a/i18n/chs/src/vs/workbench/parts/files/electron-browser/views/explorerView.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"explorerSection": "文件资源管理器部分",
-	"treeAriaLabel": "文件资源管理器"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json b/i18n/chs/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
deleted file mode 100644
index feb8a37af6b..00000000000
--- a/i18n/chs/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"fileInputAriaLabel": "输入文件名。按 \"Enter\" 键确认或按 \"Esc\" 键取消。",
-	"createFileFromExplorerInfoMessage": "在 **{1}** 中创建文件 **{0}**",
-	"renameFileFromExplorerInfoMessage": "移动并重命名为 **{0}**",
-	"createFolderFromExplorerInfoMessage": "在 **{1}** 中创建文件夹 **{0}**",
-	"filesExplorerViewerAriaLabel": "{0}，文件资源管理器",
-	"dropFolders": "你是否要将文件夹添加到工作区?",
-	"dropFolder": "你是否要将文件夹添加到工作区?",
-	"addFolders": "添加文件夹(&&A)",
-	"addFolder": "添加文件夹(&&A)",
-	"confirmRootsMove": "是否确定要更改工作区中多个根文件夹的顺序?",
-	"confirmMultiMove": "是否确定要移动以下 {0} 个文件?",
-	"confirmRootMove": "是否确定要更改工作区中根文件夹“{0}”的顺序?",
-	"confirmMove": "是否确实要移动“{0}”?",
-	"doNotAskAgain": "不再询问",
-	"moveButtonLabel": "移动(&&M)",
-	"confirmOverwriteMessage": "目标文件夹中已存在“{0}”。是否要将其替换?",
-	"irreversible": "此操作不可逆!",
-	"replaceButtonLabel": "替换(&&R)"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json b/i18n/chs/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json
deleted file mode 100644
index eb40d6687d9..00000000000
--- a/i18n/chs/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openEditors": "打开的编辑器",
-	"openEditosrSection": "打开的编辑器部分",
-	"dirtyCounter": "{0} 个未保存"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/files/electron-browser/views/openEditorsViewer.i18n.json b/i18n/chs/src/vs/workbench/parts/files/electron-browser/views/openEditorsViewer.i18n.json
deleted file mode 100644
index 5b583f97926..00000000000
--- a/i18n/chs/src/vs/workbench/parts/files/electron-browser/views/openEditorsViewer.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"editorGroupAriaLabel": "{0}, 编辑器组",
-	"openEditorAriaLabel": "{0}, 打开编辑器",
-	"saveAll": "全部保存",
-	"closeAllUnmodified": "关闭未更改",
-	"closeAll": "全部关闭",
-	"compareWithSaved": "与已保存文件比较",
-	"close": "关闭",
-	"closeOthers": "关闭其他"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/git/browser/gitActions.contribution.i18n.json b/i18n/chs/src/vs/workbench/parts/git/browser/gitActions.contribution.i18n.json
deleted file mode 100644
index b9f2f4ef654..00000000000
--- a/i18n/chs/src/vs/workbench/parts/git/browser/gitActions.contribution.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"switchToChangesView": "切换到更改视图",
-	"openInEditor": "切换到编辑器视图",
-	"workbenchStage": "暂存",
-	"workbenchUnstage": "取消暂存",
-	"stageSelectedLines": "暂存选定行",
-	"unstageSelectedLines": "取消暂存选定的行",
-	"revertSelectedLines": "还原所选行",
-	"confirmRevertMessage": "是否确实要还原所选更改?",
-	"irreversible": "此操作不可逆!",
-	"revertChangesLabel": "还原更改(&&R)",
-	"openChange": "打开更改",
-	"openFile": "打开文件",
-	"git": "GIT"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/git/browser/gitActions.i18n.json b/i18n/chs/src/vs/workbench/parts/git/browser/gitActions.i18n.json
deleted file mode 100644
index 7e84ec55a6a..00000000000
--- a/i18n/chs/src/vs/workbench/parts/git/browser/gitActions.i18n.json
+++ /dev/null
@@ -1,46 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"openChange": "打开更改",
-	"openFile": "打开文件",
-	"init": "初始化",
-	"refresh": "刷新",
-	"stageChanges": "暂存",
-	"stageAllChanges": "全部暂存",
-	"confirmUndoMessage": "是否确定要清理所有更改?",
-	"confirmUndoAllOne": "{0} 个文件中存在未暂存的更改。\n\n此操作是不可逆的!",
-	"confirmUndoAllMultiple": "{0} 个文件中存在未暂存的更改。\n\n此操作是不可逆的!",
-	"cleanChangesLabel": "清理更改(&&C)",
-	"confirmUndo": "是否确实要清理“{0}”中的更改?",
-	"irreversible": "此操作不可逆!",
-	"undoChanges": "清理",
-	"undoAllChanges": "全部清理",
-	"unstage": "取消暂存",
-	"unstageAllChanges": "取消全部暂存",
-	"dirtyTreeCheckout": "无法签出。请首先提交或存储工作。",
-	"commitStaged": "提交已暂存文件",
-	"commitStagedAmend": "已暂存提交(修改)",
-	"commitStagedSignedOff": "提交暂存数据(已签收)",
-	"commit": "Commit",
-	"commitMessage": "提交消息",
-	"commitAll": "全部提交",
-	"commitAllSignedOff": "提交所有数据(已签收)",
-	"commitAll2": "全部提交",
-	"commitStaged2": "提交已暂存文件",
-	"dirtyTreePull": "无法拉取。请首先提交或存储工作。",
-	"authFailed": "在 GIT 远程上进行身份验证失败。",
-	"pushToRemote": "推送到...",
-	"pushToRemotePickMessage": "选择将分支“{0}”推送到的远程位置:",
-	"publish": "发布",
-	"confirmPublishMessage": "是否确定要将“{0}”发布到“{1}”?",
-	"confirmPublishMessageButton": "发布(&&P)",
-	"publishPickMessage": "选取要将分支“{0}”发布到的远程:",
-	"sync is unpredictable": "此操作从“{0}”推送和拉取提交。",
-	"ok": "确定",
-	"cancel": "取消",
-	"never again": "好，永不再显示",
-	"undoLastCommit": "撤消上次提交"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/git/browser/gitQuickOpen.i18n.json b/i18n/chs/src/vs/workbench/parts/git/browser/gitQuickOpen.i18n.json
deleted file mode 100644
index 669d22f5c2f..00000000000
--- a/i18n/chs/src/vs/workbench/parts/git/browser/gitQuickOpen.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"refAriaLabel": "{0}，GIT",
-	"checkoutBranch": "{0} 处的分支",
-	"checkoutRemoteBranch": "{0} 处的远程分支",
-	"checkoutTag": "{0} 处的 Tag",
-	"alreadyCheckedOut": "分支 {0} 已是当前分支",
-	"branchAriaLabel": "{0}，GIT 分支",
-	"createBranch": "创建分支 {0}",
-	"noBranches": "无其他分支",
-	"notValidBranchName": "请提供有效的分支名称"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/git/browser/gitServices.i18n.json b/i18n/chs/src/vs/workbench/parts/git/browser/gitServices.i18n.json
deleted file mode 100644
index 434dcfd2907..00000000000
--- a/i18n/chs/src/vs/workbench/parts/git/browser/gitServices.i18n.json
+++ /dev/null
@@ -1,30 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"cantOpen": "无法打开此 git 资源。",
-	"gitIndexChanges": "{0} (index) ↔ {1}",
-	"gitIndexChangesDesc": "{0} - 对索引的更改",
-	"gitIndexChangesRenamed": "{0} ← {1}",
-	"gitIndexChangesRenamedDesc": "{0} - 已重命名 - 对索引的更改",
-	"workingTreeChanges": "{0} (HEAD) ↔ {1}",
-	"workingTreeChangesDesc": "{0} - 对工作树的更改",
-	"gitMergeChanges": "{0} (merge) ↔ {1}",
-	"gitMergeChangesDesc": "{0} - 合并更改",
-	"updateGit": "你似乎已安装 git {0}。在 git >=2.0.0 情况下代码工作最佳。",
-	"download": "下载",
-	"neverShowAgain": "不再显示",
-	"configureUsernameEmail": "请配置 GIT 用户名和电子邮件。",
-	"badConfigFile": "Git {0}",
-	"unmergedChanges": "提交更改前，你应首先解决未合并的更改。",
-	"showOutput": "显示输出",
-	"cancel": "取消",
-	"checkNativeConsole": "运行 GIT 操作存在问题。请审阅输出或使用控制台检查你的存储库的状态。",
-	"changesFromIndex": "{0} (index)",
-	"changesFromIndexDesc": "{0} - 对索引的更改",
-	"changesFromTree": "{0} ({1})",
-	"changesFromTreeDesc": "{0} - 对 {1} 的更改",
-	"cantOpenResource": "无法打开此 git 资源。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/git/browser/gitWidgets.i18n.json b/i18n/chs/src/vs/workbench/parts/git/browser/gitWidgets.i18n.json
deleted file mode 100644
index 5f1f19d5dfc..00000000000
--- a/i18n/chs/src/vs/workbench/parts/git/browser/gitWidgets.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"publishBranch": "发布分支",
-	"syncBranch": "同步更改",
-	"gitNotEnabled": "此工作区中未启用 GIT。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/git/browser/gitWorkbenchContributions.i18n.json b/i18n/chs/src/vs/workbench/parts/git/browser/gitWorkbenchContributions.i18n.json
deleted file mode 100644
index a78139f5efc..00000000000
--- a/i18n/chs/src/vs/workbench/parts/git/browser/gitWorkbenchContributions.i18n.json
+++ /dev/null
@@ -1,23 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"gitProgressBadge": "正在运行 GIT 状态",
-	"gitPendingChangesBadge": "{0} 个挂起的更改",
-	"toggleGitViewlet": "显示 GIT",
-	"git": "GIT",
-	"view": "查看",
-	"gitCommands": "GIT 命令",
-	"gitConfigurationTitle": "GIT",
-	"gitEnabled": "是否启用了 GIT",
-	"gitPath": "可执行 GIT 的路径",
-	"gitAutoRefresh": "是否已启用自动刷新",
-	"gitAutoFetch": "是否启用了自动提取。",
-	"gitLongCommit": "是否针对长段提交消息进行警告",
-	"gitLargeRepos": "始终允许大型存储库由 Code 托管。",
-	"confirmSync": "同步 Git 存储库前请先进行确认。",
-	"countBadge": "控制 git 徽章计数器。",
-	"checkoutType": "控制列出哪些分支类型。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/git/browser/views/changes/changesView.i18n.json b/i18n/chs/src/vs/workbench/parts/git/browser/views/changes/changesView.i18n.json
deleted file mode 100644
index 74e6bb09eef..00000000000
--- a/i18n/chs/src/vs/workbench/parts/git/browser/views/changes/changesView.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"needMessage": "请提供提交消息。您可以始终按下“{0}”以提交更改。如果存在任何暂存的更改，将仅提交这些更改；否则，提交所有更改。",
-	"nothingToCommit": "在有一些更改要提交时，键入提交信息，并按下“{0}”以提交更改。如果存在任何暂存的更改，将仅提交这些更改；否则，提交所有更改。",
-	"longCommit": "建议保持提交的第一行在 50 个字符以内。可以随时使用更多行显示额外信息。",
-	"commitMessage": "Message (press {0} to commit)",
-	"commitMessageAriaLabel": "GIT: 键入提交信息并按 {0} 以提交",
-	"treeAriaLabel": "GIT 更改视图",
-	"showOutput": "显示 GIT 输出"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/git/browser/views/changes/changesViewer.i18n.json b/i18n/chs/src/vs/workbench/parts/git/browser/views/changes/changesViewer.i18n.json
deleted file mode 100644
index 92605307241..00000000000
--- a/i18n/chs/src/vs/workbench/parts/git/browser/views/changes/changesViewer.i18n.json
+++ /dev/null
@@ -1,38 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"stagedChanges": "暂存的更改",
-	"allChanges": "更改",
-	"mergeChanges": "合并更改",
-	"outsideOfWorkspace": "此文件位于当前工作区之外。",
-	"modified-char": "M",
-	"added-char": "A",
-	"deleted-char": "D",
-	"renamed-char": "R",
-	"copied-char": "C",
-	"untracked-char": "U",
-	"ignored-char": "!",
-	"title-index-modified": "已在索引中修改",
-	"title-modified": "已修改",
-	"title-index-added": "已添加到索引",
-	"title-index-deleted": "已在索引中删除",
-	"title-deleted": "已删除",
-	"title-index-renamed": "已在索引中重新命名",
-	"title-index-copied": "已在索引中复制",
-	"title-untracked": "未跟踪的",
-	"title-ignored": "已忽略",
-	"title-conflict-both-deleted": "冲突: 二者均已删除",
-	"title-conflict-added-by-us": "冲突: 已由我们添加",
-	"title-conflict-deleted-by-them": "冲突: 已由他们删除",
-	"title-conflict-added-by-them": "冲突: 已由他们添加",
-	"title-conflict-deleted-by-us": "冲突: 已由我们删除",
-	"title-conflict-both-added": "冲突: 二者均已添加",
-	"title-conflict-both-modified": "冲突: 二者均已修改",
-	"fileStatusAriaLabel": "文件夹 {1} 中的文件 {0} 具有状态: {2}，GIT",
-	"ariaLabelStagedChanges": "暂存的更改，GIT",
-	"ariaLabelChanges": "更改，GIT",
-	"ariaLabelMerge": "合并，GIT"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/git/browser/views/disabled/disabledView.i18n.json b/i18n/chs/src/vs/workbench/parts/git/browser/views/disabled/disabledView.i18n.json
deleted file mode 100644
index c9c913297a8..00000000000
--- a/i18n/chs/src/vs/workbench/parts/git/browser/views/disabled/disabledView.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"disabled": "在设置中禁用 GIT。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/git/browser/views/empty/emptyView.i18n.json b/i18n/chs/src/vs/workbench/parts/git/browser/views/empty/emptyView.i18n.json
deleted file mode 100644
index e4d4e20d715..00000000000
--- a/i18n/chs/src/vs/workbench/parts/git/browser/views/empty/emptyView.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"noGit": "此工作区尚未使用 Git 源代码管理。",
-	"gitinit": "初始化 GIT 存储库"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/git/browser/views/gitless/gitlessView.i18n.json b/i18n/chs/src/vs/workbench/parts/git/browser/views/gitless/gitlessView.i18n.json
deleted file mode 100644
index bc83209d62d..00000000000
--- a/i18n/chs/src/vs/workbench/parts/git/browser/views/gitless/gitlessView.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"macInstallWith": "可以使用 {0} 进行安装，也可以从 {1} 下载，或者只需在终端提示上键入 {3} 来安装 {2} 命令行开发人员工具。 ",
-	"winInstallWith": "可以使用 {0} 进行安装，也可以从 {1} 下载。",
-	"linuxDownloadFrom": "可从 {0} 中下载它。",
-	"downloadFrom": "可从 {0} 中下载它。",
-	"looksLike": "你的系统上似乎未安装 GIT。",
-	"pleaseRestart": "安装 GIT 后，请重启 VSCode。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/git/browser/views/huge/hugeView.i18n.json b/i18n/chs/src/vs/workbench/parts/git/browser/views/huge/hugeView.i18n.json
deleted file mode 100644
index 10698e48163..00000000000
--- a/i18n/chs/src/vs/workbench/parts/git/browser/views/huge/hugeView.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"huge": "你的存储库中似乎存在大量活动更改。\n这会导致 Code 变得非常缓慢。",
-	"setting": "可通过以下设置永久禁用此警告:",
-	"allo": "允许使用大型存储库"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/git/browser/views/notroot/notrootView.i18n.json b/i18n/chs/src/vs/workbench/parts/git/browser/views/notroot/notrootView.i18n.json
deleted file mode 100644
index 66d2027829c..00000000000
--- a/i18n/chs/src/vs/workbench/parts/git/browser/views/notroot/notrootView.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"wrongRoot": "此目录似乎包含在 GIT 存储库中。",
-	"pleaseRestart": "打开存储库的根目录以访问 GIT 功能。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/git/browser/views/noworkspace/noworkspaceView.i18n.json b/i18n/chs/src/vs/workbench/parts/git/browser/views/noworkspace/noworkspaceView.i18n.json
deleted file mode 100644
index 6d25c372dda..00000000000
--- a/i18n/chs/src/vs/workbench/parts/git/browser/views/noworkspace/noworkspaceView.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"noWorkspaceHelp": "尚未打开文件夹。",
-	"pleaseRestart": "通过 GIT 存储库打开文件夹以访问 GIT 功能。",
-	"openFolder": "打开文件夹"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/git/electron-browser/git.contribution.i18n.json b/i18n/chs/src/vs/workbench/parts/git/electron-browser/git.contribution.i18n.json
deleted file mode 100644
index e1f8ce8325b..00000000000
--- a/i18n/chs/src/vs/workbench/parts/git/electron-browser/git.contribution.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"toggleSCMViewlet": "显示 SCM",
-	"git": "GIT"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/git/electron-browser/gitActions.i18n.json b/i18n/chs/src/vs/workbench/parts/git/electron-browser/gitActions.i18n.json
deleted file mode 100644
index 9005183fd40..00000000000
--- a/i18n/chs/src/vs/workbench/parts/git/electron-browser/gitActions.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"valid": "提供一个有效的 GIT 存储库 URL",
-	"url": "存储库 URL",
-	"directory": "目标克隆目录",
-	"cloning": "正在克隆存储库“{0}”...",
-	"already exists": "目标存储库已存在，请选择要克隆到的另一个目录。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/git/electron-main/askpassService.i18n.json b/i18n/chs/src/vs/workbench/parts/git/electron-main/askpassService.i18n.json
deleted file mode 100644
index fa15e3b391d..00000000000
--- a/i18n/chs/src/vs/workbench/parts/git/electron-main/askpassService.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"git": "GIT"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/git/node/git.lib.i18n.json b/i18n/chs/src/vs/workbench/parts/git/node/git.lib.i18n.json
deleted file mode 100644
index b6ae41ce274..00000000000
--- a/i18n/chs/src/vs/workbench/parts/git/node/git.lib.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"errorBuffer": "无法从 git 中打开文件",
-	"fileBinaryError": "文件似乎是二进制文件，无法作为文档打开"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/html/browser/html.contribution.i18n.json b/i18n/chs/src/vs/workbench/parts/html/browser/html.contribution.i18n.json
deleted file mode 100644
index f094961018a..00000000000
--- a/i18n/chs/src/vs/workbench/parts/html/browser/html.contribution.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"html.editor.label": "HTML 预览"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/html/browser/htmlPreviewPart.i18n.json b/i18n/chs/src/vs/workbench/parts/html/browser/htmlPreviewPart.i18n.json
deleted file mode 100644
index 2d7ab40f3c9..00000000000
--- a/i18n/chs/src/vs/workbench/parts/html/browser/htmlPreviewPart.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"html.voidInput": "无效的编辑器输入。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/html/browser/webview.contribution.i18n.json b/i18n/chs/src/vs/workbench/parts/html/browser/webview.contribution.i18n.json
deleted file mode 100644
index 4602f031212..00000000000
--- a/i18n/chs/src/vs/workbench/parts/html/browser/webview.contribution.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"developer": "开发者"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/html/browser/webview.i18n.json b/i18n/chs/src/vs/workbench/parts/html/browser/webview.i18n.json
deleted file mode 100644
index ad5eb63d630..00000000000
--- a/i18n/chs/src/vs/workbench/parts/html/browser/webview.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"devtools.webview": "开发人员: Webview 工具"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/html/browser/webviewCommands.i18n.json b/i18n/chs/src/vs/workbench/parts/html/browser/webviewCommands.i18n.json
deleted file mode 100644
index 9a9e19c86ab..00000000000
--- a/i18n/chs/src/vs/workbench/parts/html/browser/webviewCommands.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"editor.action.webvieweditor.showFind": "聚焦于查找小组件",
-	"openToolsLabel": "打开 Webview 开发工具",
-	"refreshWebviewLabel": "重新加载 Webview"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json b/i18n/chs/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json
deleted file mode 100644
index f094961018a..00000000000
--- a/i18n/chs/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"html.editor.label": "HTML 预览"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json b/i18n/chs/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json
deleted file mode 100644
index 3cbb0b9c0cb..00000000000
--- a/i18n/chs/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"html.voidInput": "编辑器输入无效。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json b/i18n/chs/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json
deleted file mode 100644
index 4602f031212..00000000000
--- a/i18n/chs/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"developer": "开发者"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json b/i18n/chs/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json
deleted file mode 100644
index bad27cc286a..00000000000
--- a/i18n/chs/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openToolsLabel": "打开 Webview 开发工具",
-	"refreshWebviewLabel": "重新加载 Webview"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json b/i18n/chs/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
deleted file mode 100644
index 3654ab60cb3..00000000000
--- a/i18n/chs/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"updateLocale": "是否将 VS Code 的界面语言更换为 {0} 并重新启动?",
-	"yes": "是",
-	"no": "否",
-	"neverAgain": "不再显示",
-	"JsonSchema.locale": "使用的界面语言。",
-	"vscode.extension.contributes.localizations": "向编辑器提供本地化内容",
-	"vscode.extension.contributes.localizations.languageId": "显示字符串翻译的目标语言 ID。",
-	"vscode.extension.contributes.localizations.languageName": "语言的英文名称。",
-	"vscode.extension.contributes.localizations.languageNameLocalized": "提供语言的名称。",
-	"vscode.extension.contributes.localizations.translations": "与语言关联的翻译的列表。",
-	"vscode.extension.contributes.localizations.translations.id": "使用此翻译的 VS Code 或扩展的 ID。VS Code 的 ID 总为 \"vscode\"，扩展的 ID 的格式应为 \"publisherId.extensionName\"。",
-	"vscode.extension.contributes.localizations.translations.id.pattern": "翻译 VS Code 或者扩展，ID 分别应为 \"vscode\" 或格式为 \"publisherId.extensionName\"。",
-	"vscode.extension.contributes.localizations.translations.path": "包含语言翻译的文件的相对路径。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/localizations/browser/localizationsActions.i18n.json b/i18n/chs/src/vs/workbench/parts/localizations/browser/localizationsActions.i18n.json
deleted file mode 100644
index 3e746df31e0..00000000000
--- a/i18n/chs/src/vs/workbench/parts/localizations/browser/localizationsActions.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"configureLocale": "配置语言",
-	"displayLanguage": "定义 VSCode 的显示语言。",
-	"doc": "请参阅 {0}，了解支持的语言列表。",
-	"restart": "更改此值需要重启 VSCode。",
-	"fail.createSettings": "无法创建“{0}”({1})。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/localizations/electron-browser/localizations.contribution.i18n.json b/i18n/chs/src/vs/workbench/parts/localizations/electron-browser/localizations.contribution.i18n.json
deleted file mode 100644
index cf9392bc8de..00000000000
--- a/i18n/chs/src/vs/workbench/parts/localizations/electron-browser/localizations.contribution.i18n.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"updateLocale": "是否将 VS Code 的界面语言更换为 {0} 并重新启动?",
-	"activateLanguagePack": "是否重启 VS Code 并激活刚刚安装的语言包?",
-	"yes": "是",
-	"no": "否",
-	"neverAgain": "不再显示",
-	"install language pack": "不久后，VS Code 将仅支持商店扩展形式的界面语言包。请安装“{0}”扩展以继续使用当前的界面语言。",
-	"install": "安装",
-	"more information": "更多信息...",
-	"JsonSchema.locale": "使用的界面语言。",
-	"vscode.extension.contributes.localizations": "向编辑器提供本地化内容",
-	"vscode.extension.contributes.localizations.languageId": "显示字符串翻译的目标语言 ID。",
-	"vscode.extension.contributes.localizations.languageName": "语言的英文名称。",
-	"vscode.extension.contributes.localizations.languageNameLocalized": "提供语言的名称。",
-	"vscode.extension.contributes.localizations.translations": "与语言关联的翻译的列表。",
-	"vscode.extension.contributes.localizations.translations.id": "使用此翻译的 VS Code 或扩展的 ID。VS Code 的 ID 总为 \"vscode\"，扩展的 ID 的格式应为 \"publisherId.extensionName\"。",
-	"vscode.extension.contributes.localizations.translations.id.pattern": "翻译 VS Code 或者扩展，ID 分别应为 \"vscode\" 或格式为 \"publisherId.extensionName\"。",
-	"vscode.extension.contributes.localizations.translations.path": "包含语言翻译的文件的相对路径。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/localizations/electron-browser/localizationsActions.i18n.json b/i18n/chs/src/vs/workbench/parts/localizations/electron-browser/localizationsActions.i18n.json
deleted file mode 100644
index 9719f721f2a..00000000000
--- a/i18n/chs/src/vs/workbench/parts/localizations/electron-browser/localizationsActions.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"configureLocale": "配置显示语言",
-	"displayLanguage": "定义 VSCode 的显示语言。",
-	"doc": "请参阅 {0}，了解支持的语言列表。",
-	"restart": "更改此值需要重启 VSCode。",
-	"fail.createSettings": "无法创建“{0}”({1})。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json b/i18n/chs/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json
deleted file mode 100644
index 3aaa4125fd2..00000000000
--- a/i18n/chs/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"mainLog": "日志(主进程)",
-	"sharedLog": "日志(共享进程)",
-	"rendererLog": "日志(窗口进程)",
-	"extensionsLog": "日志(扩展主机)",
-	"developer": "开发者"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json b/i18n/chs/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json
deleted file mode 100644
index 6d8451561be..00000000000
--- a/i18n/chs/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openLogsFolder": "打开日志文件夹",
-	"showLogs": "显示日志...",
-	"rendererProcess": "窗口 ({0})",
-	"emptyWindow": "窗口",
-	"extensionHost": "扩展主机",
-	"sharedProcess": "共享进程",
-	"mainProcess": "主进程",
-	"selectProcess": "选择进程日志",
-	"openLogFile": "打开日志文件...",
-	"setLogLevel": "设置日志级别...",
-	"trace": "跟踪",
-	"debug": "调试",
-	"info": "信息",
-	"warn": "警告",
-	"err": "错误",
-	"critical": "严重",
-	"off": "关闭",
-	"selectLogLevel": "选择日志级别",
-	"default and current": "默认 当前",
-	"default": "默认",
-	"current": "当前"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/markers/browser/markersFileDecorations.i18n.json b/i18n/chs/src/vs/workbench/parts/markers/browser/markersFileDecorations.i18n.json
deleted file mode 100644
index f4c0a38ab65..00000000000
--- a/i18n/chs/src/vs/workbench/parts/markers/browser/markersFileDecorations.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"label": "问题",
-	"tooltip.1": "此文件存在 1 个问题",
-	"tooltip.N": "此文件存在 {0} 个问题",
-	"markers.showOnFile": "显示关于文件与文件夹的错误与警告。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/markers/browser/markersPanel.i18n.json b/i18n/chs/src/vs/workbench/parts/markers/browser/markersPanel.i18n.json
deleted file mode 100644
index 158b3a24233..00000000000
--- a/i18n/chs/src/vs/workbench/parts/markers/browser/markersPanel.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"totalProblems": "总计 {0} 个问题",
-	"filteredProblems": "显示 {0} 个 (共 {1} 个) 问题"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/markers/common/markers.i18n.json b/i18n/chs/src/vs/workbench/parts/markers/common/markers.i18n.json
deleted file mode 100644
index 158b3a24233..00000000000
--- a/i18n/chs/src/vs/workbench/parts/markers/common/markers.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"totalProblems": "总计 {0} 个问题",
-	"filteredProblems": "显示 {0} 个 (共 {1} 个) 问题"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/markers/common/messages.i18n.json b/i18n/chs/src/vs/workbench/parts/markers/common/messages.i18n.json
deleted file mode 100644
index fd25b458d39..00000000000
--- a/i18n/chs/src/vs/workbench/parts/markers/common/messages.i18n.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"viewCategory": "查看",
-	"problems.view.toggle.label": "切换问题 (错误、警告、信息) 视图",
-	"problems.view.focus.label": "聚焦于问题 (错误、警告、信息) 视图",
-	"problems.panel.configuration.title": "问题预览",
-	"problems.panel.configuration.autoreveal": "控制问题预览是否应在打开文件时自动显示它们。",
-	"markers.panel.title.problems": "问题",
-	"markers.panel.aria.label.problems.tree": "按文件分组的问题",
-	"markers.panel.no.problems.build": "目前尚未在工作区检测到问题。",
-	"markers.panel.no.problems.filters": "使用提供的筛选条件未找到结果",
-	"markers.panel.action.filter": "筛选器问题",
-	"markers.panel.filter.placeholder": "按类型或文本进行筛选",
-	"markers.panel.filter.errors": "错误",
-	"markers.panel.filter.warnings": "警告",
-	"markers.panel.filter.infos": "信息",
-	"markers.panel.single.error.label": "1 个错误",
-	"markers.panel.multiple.errors.label": "{0} 个错误",
-	"markers.panel.single.warning.label": "1 条警告",
-	"markers.panel.multiple.warnings.label": "{0} 条警告",
-	"markers.panel.single.info.label": "1 条信息",
-	"markers.panel.multiple.infos.label": "{0} 条信息",
-	"markers.panel.single.unknown.label": "1 个未知",
-	"markers.panel.multiple.unknowns.label": "{0} 个未知",
-	"markers.panel.at.ln.col.number": "({0}，{1})",
-	"problems.tree.aria.label.resource": "含有 {1} 问题的 {0}",
-	"problems.tree.aria.label.error.marker": "由 {0} 生成的错误: 第 {2} 行处的 {1} 和字符 {3}",
-	"problems.tree.aria.label.error.marker.nosource": "错误: 第 {1} 行处的 {0} 和字符 {2}",
-	"problems.tree.aria.label.warning.marker": "由 {0} 生成的警告: 第 {2} 行处的 {1} 和字符 {3}",
-	"problems.tree.aria.label.warning.marker.nosource": "警告: 第 {1} 行处的 {0} 和字符 {2}",
-	"problems.tree.aria.label.info.marker": "由 {0} 生成的信息: 第 {2} 行处的 {1} 和字符 {3}",
-	"problems.tree.aria.label.info.marker.nosource": "信息: 第 {1} 行处的 {0} 和字符 {2}",
-	"problems.tree.aria.label.marker": "由 {0} 生成的问题: 第 {2} 行处的 {1} 和字符 {3}",
-	"problems.tree.aria.label.marker.nosource": "问题: {1} 行 {2} 列的 {0}",
-	"errors.warnings.show.label": "显示错误和警告"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json b/i18n/chs/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json
deleted file mode 100644
index 04a7e7edc85..00000000000
--- a/i18n/chs/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"copyMarker": "复制",
-	"copyMessage": "复制消息"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/markers/electron-browser/markers.i18n.json b/i18n/chs/src/vs/workbench/parts/markers/electron-browser/markers.i18n.json
deleted file mode 100644
index f53a9ecd185..00000000000
--- a/i18n/chs/src/vs/workbench/parts/markers/electron-browser/markers.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"totalProblems": "总计 {0} 个问题"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/markers/electron-browser/markersElectronContributions.i18n.json b/i18n/chs/src/vs/workbench/parts/markers/electron-browser/markersElectronContributions.i18n.json
deleted file mode 100644
index 7cf34baa098..00000000000
--- a/i18n/chs/src/vs/workbench/parts/markers/electron-browser/markersElectronContributions.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"copyMarker": "复制",
-	"copyMarkerMessage": "复制消息"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.i18n.json b/i18n/chs/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.i18n.json
deleted file mode 100644
index f4c0a38ab65..00000000000
--- a/i18n/chs/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"label": "问题",
-	"tooltip.1": "此文件存在 1 个问题",
-	"tooltip.N": "此文件存在 {0} 个问题",
-	"markers.showOnFile": "显示关于文件与文件夹的错误与警告。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/markers/electron-browser/markersPanel.i18n.json b/i18n/chs/src/vs/workbench/parts/markers/electron-browser/markersPanel.i18n.json
deleted file mode 100644
index 50341baaf7d..00000000000
--- a/i18n/chs/src/vs/workbench/parts/markers/electron-browser/markersPanel.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"disableFilesExclude": "禁用排除的文件筛选器。",
-	"clearFilter": "清除筛选。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/markers/electron-browser/markersPanelActions.i18n.json b/i18n/chs/src/vs/workbench/parts/markers/electron-browser/markersPanelActions.i18n.json
deleted file mode 100644
index 30ef269d07d..00000000000
--- a/i18n/chs/src/vs/workbench/parts/markers/electron-browser/markersPanelActions.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"showing filtered problems": "显示 {0} / {1}"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json b/i18n/chs/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
deleted file mode 100644
index 90e2b4ea2c2..00000000000
--- a/i18n/chs/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"viewCategory": "查看",
-	"problems.view.toggle.label": "切换问题 (错误、警告、信息) 视图",
-	"problems.view.focus.label": "聚焦于问题 (错误、警告、信息) 视图",
-	"problems.panel.configuration.title": "问题预览",
-	"problems.panel.configuration.autoreveal": "控制在打开文件时是否在问题视图中对其进行定位。",
-	"markers.panel.title.problems": "问题",
-	"markers.panel.aria.label.problems.tree": "按文件分组的问题",
-	"markers.panel.no.problems.build": "目前尚未在工作区检测到问题。",
-	"markers.panel.no.problems.filters": "在给定的筛选条件下，没有找到结果。",
-	"markers.panel.no.problems.file.exclusions": "由于启用了文件排除筛选器，所有问题均已隐藏。",
-	"markers.panel.action.useFilesExclude": "使用文件排除设置进行筛选",
-	"markers.panel.action.donotUseFilesExclude": "不使用文件排除设置",
-	"markers.panel.action.filter": "筛选器问题",
-	"markers.panel.filter.ariaLabel": "筛选器问题",
-	"markers.panel.filter.placeholder": "筛选。例: text, **/*.ts, !**/node_modules/**",
-	"markers.panel.filter.errors": "错误",
-	"markers.panel.filter.warnings": "警告",
-	"markers.panel.filter.infos": "信息",
-	"markers.panel.single.error.label": "1 个错误",
-	"markers.panel.multiple.errors.label": "{0} 个错误",
-	"markers.panel.single.warning.label": "1 条警告",
-	"markers.panel.multiple.warnings.label": "{0} 条警告",
-	"markers.panel.single.info.label": "1 条信息",
-	"markers.panel.multiple.infos.label": "{0} 条信息",
-	"markers.panel.single.unknown.label": "1 个未知",
-	"markers.panel.multiple.unknowns.label": "{0} 个未知",
-	"markers.panel.at.ln.col.number": "({0}，{1})",
-	"problems.tree.aria.label.resource": "含有 {1} 问题的 {0}",
-	"problems.tree.aria.label.marker.relatedInformation": "此问题包含对 {0} 个位置的引用。",
-	"problems.tree.aria.label.error.marker": "{0} 生成的错误: {2} 行 {3} 列，{1}。{4}",
-	"problems.tree.aria.label.error.marker.nosource": "错误: {1} 行 {2} 列，{0}。{3}",
-	"problems.tree.aria.label.warning.marker": "{0} 生成的警告: {2} 行 {3} 列，{1}。{4}",
-	"problems.tree.aria.label.warning.marker.nosource": "警告: {1} 行 {2} 列，{0}。{3}",
-	"problems.tree.aria.label.info.marker": "{0} 生成的信息: {2} 行 {3} 列，{1}。{4}",
-	"problems.tree.aria.label.info.marker.nosource": "信息: {1} 行 {2} 列，{0}。{3}",
-	"problems.tree.aria.label.marker": "{0} 生成的问题: {2} 行 {3} 列，{1}。{4}",
-	"problems.tree.aria.label.marker.nosource": "问题: {1} 行 {2} 列，{0}。{3}",
-	"problems.tree.aria.label.relatedinfo.message": "{3} 的 {1} 行 {2} 列，{0}",
-	"errors.warnings.show.label": "显示错误和警告"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/nps/electron-browser/nps.contribution.i18n.json b/i18n/chs/src/vs/workbench/parts/nps/electron-browser/nps.contribution.i18n.json
deleted file mode 100644
index d3829780ea9..00000000000
--- a/i18n/chs/src/vs/workbench/parts/nps/electron-browser/nps.contribution.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"surveyQuestion": "您愿意参与一次简短的反馈调查吗？",
-	"takeSurvey": "参加调查",
-	"remindLater": "稍后提醒",
-	"neverAgain": "不再显示"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/outline/electron-browser/outline.contribution.i18n.json b/i18n/chs/src/vs/workbench/parts/outline/electron-browser/outline.contribution.i18n.json
deleted file mode 100644
index f5017835b2b..00000000000
--- a/i18n/chs/src/vs/workbench/parts/outline/electron-browser/outline.contribution.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"name": "大纲",
-	"category.focus": "文件",
-	"label.focus": "聚焦于“大纲”视图"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/outline/electron-browser/outlinePanel.i18n.json b/i18n/chs/src/vs/workbench/parts/outline/electron-browser/outlinePanel.i18n.json
deleted file mode 100644
index 245e047eceb..00000000000
--- a/i18n/chs/src/vs/workbench/parts/outline/electron-browser/outlinePanel.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"filter": "筛选",
-	"collapse": "全部折叠",
-	"sortByPosition": "排序依据：位置",
-	"sortByName": "排序依据: 名称",
-	"sortByKind": "排序方式: 类型",
-	"live": "跟随光标",
-	"no-editor": "当前打开的编辑器无法提供大纲信息。",
-	"too-many-symbols": "抱歉，文件太大，无法显示大纲。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/outline/electron-browser/outlineTree.i18n.json b/i18n/chs/src/vs/workbench/parts/outline/electron-browser/outlineTree.i18n.json
deleted file mode 100644
index 7276c784d7a..00000000000
--- a/i18n/chs/src/vs/workbench/parts/outline/electron-browser/outlineTree.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"outline.title": "{1} 中的第 {0} 行 "
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/output/browser/output.contribution.i18n.json b/i18n/chs/src/vs/workbench/parts/output/browser/output.contribution.i18n.json
deleted file mode 100644
index a96772cdf43..00000000000
--- a/i18n/chs/src/vs/workbench/parts/output/browser/output.contribution.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"output": "输出",
-	"viewCategory": "查看",
-	"clearOutput.label": "清除输出"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/output/browser/outputActions.i18n.json b/i18n/chs/src/vs/workbench/parts/output/browser/outputActions.i18n.json
deleted file mode 100644
index d1ae5895425..00000000000
--- a/i18n/chs/src/vs/workbench/parts/output/browser/outputActions.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleOutput": "切换输出",
-	"clearOutput": "清除输出",
-	"toggleOutputScrollLock": "切换输出 Scroll Lock",
-	"switchToOutput.label": "切换到输出",
-	"openInLogViewer": "打开日志文件"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/output/browser/outputPanel.i18n.json b/i18n/chs/src/vs/workbench/parts/output/browser/outputPanel.i18n.json
deleted file mode 100644
index 86434356887..00000000000
--- a/i18n/chs/src/vs/workbench/parts/output/browser/outputPanel.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"output": "输出",
-	"outputPanelWithInputAriaLabel": "{0}，输出面板",
-	"outputPanelAriaLabel": "输出面板"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/output/common/output.i18n.json b/i18n/chs/src/vs/workbench/parts/output/common/output.i18n.json
deleted file mode 100644
index 79b46e2bcb2..00000000000
--- a/i18n/chs/src/vs/workbench/parts/output/common/output.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"output": "输出",
-	"channel": "用于“{0}”"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json b/i18n/chs/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
deleted file mode 100644
index 3a4c87eda4f..00000000000
--- a/i18n/chs/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"output": "输出",
-	"logViewer": "日志查看器",
-	"viewCategory": "查看",
-	"clearOutput.label": "清除输出",
-	"openActiveLogOutputFile": "查看: 打开活动日志输出文件"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json b/i18n/chs/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json
deleted file mode 100644
index fa3bf1243ba..00000000000
--- a/i18n/chs/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"output": "{0} - 输出",
-	"channel": "“{0}”的输出通道"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/performance/electron-browser/performance.contribution.i18n.json b/i18n/chs/src/vs/workbench/parts/performance/electron-browser/performance.contribution.i18n.json
deleted file mode 100644
index 9b26b94472e..00000000000
--- a/i18n/chs/src/vs/workbench/parts/performance/electron-browser/performance.contribution.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"prof.message": "已成功创建描述文件。",
-	"prof.detail": "请创建问题并手动附加以下文件：\n{0}",
-	"prof.restartAndFileIssue": "创建问题并重启",
-	"prof.restart": "重启",
-	"prof.thanks": "感谢您的帮助。",
-	"prof.detail.restart": "需要重新启动才能继续使用“{0}”。再次感谢您的贡献。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/performance/electron-browser/startupProfiler.i18n.json b/i18n/chs/src/vs/workbench/parts/performance/electron-browser/startupProfiler.i18n.json
deleted file mode 100644
index aa1e51d6b36..00000000000
--- a/i18n/chs/src/vs/workbench/parts/performance/electron-browser/startupProfiler.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"prof.message": "已成功创建分析文件。",
-	"prof.detail": "请创建问题并手动附加以下文件：\n{0}",
-	"prof.restartAndFileIssue": "创建问题并重启",
-	"prof.restart": "重启",
-	"prof.thanks": "感谢您的帮助。",
-	"prof.detail.restart": "需要重新启动才能继续使用“{0}”。再次感谢您的贡献。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/preferences/browser/keybindingWidgets.i18n.json b/i18n/chs/src/vs/workbench/parts/preferences/browser/keybindingWidgets.i18n.json
deleted file mode 100644
index 13f35b362be..00000000000
--- a/i18n/chs/src/vs/workbench/parts/preferences/browser/keybindingWidgets.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"defineKeybinding.oneExists": "已有 1 条命令的按键绑定与此相同",
-	"defineKeybinding.existing": "已有 {0} 条命令的按键绑定与此相同",
-	"defineKeybinding.initial": "先按所需的组合键，再按 Enter 键。",
-	"defineKeybinding.chordsTo": "加上"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json b/i18n/chs/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
deleted file mode 100644
index 03b2d9ae25a..00000000000
--- a/i18n/chs/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"showDefaultKeybindings": "显示默认按键绑定",
-	"showUserKeybindings": "显示用户按键绑定",
-	"SearchKeybindings.AriaLabel": "搜索按键绑定",
-	"SearchKeybindings.Placeholder": "搜索按键绑定",
-	"sortByPrecedene": "按优先级排序",
-	"header-message": "高级自定义请打开和编辑",
-	"keybindings-file-name": "keybindings.json",
-	"keybindingsLabel": "按键绑定",
-	"changeLabel": "更改按键绑定",
-	"addLabel": "添加按键绑定",
-	"removeLabel": "删除键绑定",
-	"resetLabel": "重置按键绑定",
-	"showSameKeybindings": "显示相同的按键绑定",
-	"copyLabel": "复制",
-	"copyCommandLabel": "拷贝命令",
-	"error": "编辑按键绑定时发生错误“{0}”。请打开 \"keybindings.json\" 文件并检查错误。",
-	"command": "命令",
-	"keybinding": "按键绑定",
-	"source": "来源",
-	"when": "何时",
-	"editKeybindingLabelWithKey": "更改按键绑定 {0}",
-	"editKeybindingLabel": "更改键绑定",
-	"addKeybindingLabelWithKey": "添加按键绑定 {0}",
-	"addKeybindingLabel": "添加键绑定",
-	"title": "{0} ({1})",
-	"commandAriaLabel": "命令为 {0}。",
-	"keybindingAriaLabel": "按键绑定为 {0}。",
-	"noKeybinding": "没有绑定按键。",
-	"sourceAriaLabel": "源为 {0}。",
-	"whenAriaLabel": "时间为 {0}。",
-	"noWhen": "没有时间上下文。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/preferences/browser/keybindingsEditorContribution.i18n.json b/i18n/chs/src/vs/workbench/parts/preferences/browser/keybindingsEditorContribution.i18n.json
deleted file mode 100644
index 78e022fe03f..00000000000
--- a/i18n/chs/src/vs/workbench/parts/preferences/browser/keybindingsEditorContribution.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"defineKeybinding.start": "定义按键绑定",
-	"defineKeybinding.kbLayoutErrorMessage": "在当前键盘布局下无法生成此组合键。",
-	"defineKeybinding.kbLayoutLocalAndUSMessage": "在你的键盘布局上为 **{0}**（美国标准布局上为 **{1}**）。",
-	"defineKeybinding.kbLayoutLocalMessage": "在你的键盘布局上为 **{0}**。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/preferences/browser/preferences.contribution.i18n.json b/i18n/chs/src/vs/workbench/parts/preferences/browser/preferences.contribution.i18n.json
deleted file mode 100644
index 87559f85c85..00000000000
--- a/i18n/chs/src/vs/workbench/parts/preferences/browser/preferences.contribution.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"defaultPreferencesEditor": "默认首选项编辑器",
-	"keybindingsEditor": "键绑定编辑器",
-	"preferences": "首选项"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json b/i18n/chs/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
deleted file mode 100644
index 40d61e0227f..00000000000
--- a/i18n/chs/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openRawDefaultSettings": "打开默认设置原始文档",
-	"openSettings2": "打开设置 (预览版)",
-	"openSettings": "打开设置",
-	"openGlobalSettings": "打开用户设置",
-	"openGlobalKeybindings": "打开键盘快捷方式",
-	"openGlobalKeybindingsFile": "打开键盘快捷方式文件",
-	"openWorkspaceSettings": "打开工作区设置",
-	"openFolderSettings": "打开文件夹设置",
-	"configureLanguageBasedSettings": "配置语言特定的设置...",
-	"languageDescriptionConfigured": "({0})",
-	"pickLanguage": "选择语言"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json b/i18n/chs/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
deleted file mode 100644
index 2a65e037066..00000000000
--- a/i18n/chs/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"SearchSettingsWidget.AriaLabel": "搜索设置",
-	"SearchSettingsWidget.Placeholder": "搜索设置",
-	"noSettingsFound": "无结果",
-	"oneSettingFound": "找到 1 个设置",
-	"settingsFound": "找到 {0} 个设置",
-	"totalSettingsMessage": "总计 {0} 个设置",
-	"nlpResult": "自然语言结果",
-	"filterResult": "筛选结果",
-	"defaultSettings": "默认设置",
-	"defaultUserSettings": "默认用户设置",
-	"defaultWorkspaceSettings": "默认工作区设置",
-	"defaultFolderSettings": "默认文件夹设置",
-	"defaultEditorReadonly": "在右侧编辑器中编辑以覆盖默认值。",
-	"preferencesAriaLabel": "默认首选项。只读文本编辑器。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json b/i18n/chs/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
deleted file mode 100644
index 9fc53ead3b4..00000000000
--- a/i18n/chs/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"emptyUserSettingsHeader": "将设置放入此处以覆盖\"默认设置\"。",
-	"emptyWorkspaceSettingsHeader": "将设置放入此处以覆盖\"用户设置\"。",
-	"emptyFolderSettingsHeader": "将文件夹设置放入此处以覆盖\"工作区设置\"。",
-	"reportSettingsSearchIssue": "使用英文报告问题",
-	"newExtensionLabel": "显示扩展“{0}”",
-	"editTtile": "编辑",
-	"replaceDefaultValue": "在设置中替换",
-	"copyDefaultValue": "复制到设置"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/preferences/browser/preferencesService.i18n.json b/i18n/chs/src/vs/workbench/parts/preferences/browser/preferencesService.i18n.json
deleted file mode 100644
index 108b3ed82c4..00000000000
--- a/i18n/chs/src/vs/workbench/parts/preferences/browser/preferencesService.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openFolderFirst": "首先打开文件夹以创建工作区设置",
-	"emptyKeybindingsHeader": "将键绑定放入此文件中以覆盖默认值",
-	"defaultKeybindings": "默认的键绑定",
-	"folderSettingsName": "{0} (文件夹设置)",
-	"fail.createSettings": "无法创建“{0}”({1})。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json b/i18n/chs/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
deleted file mode 100644
index 8970ed17aa1..00000000000
--- a/i18n/chs/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"defaultSettings": "将您的设置放入右侧编辑器以覆盖。",
-	"noSettingsFound": "未找到设置。",
-	"settingsSwitcherBarAriaLabel": "设置转换器",
-	"userSettings": "用户设置",
-	"workspaceSettings": "工作区设置",
-	"folderSettings": "文件夹设置"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/preferences/browser/settingsEditor2.i18n.json b/i18n/chs/src/vs/workbench/parts/preferences/browser/settingsEditor2.i18n.json
deleted file mode 100644
index 176d58a11af..00000000000
--- a/i18n/chs/src/vs/workbench/parts/preferences/browser/settingsEditor2.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"previewWarning": "预览版",
-	"previewLabel": "当前显示的是新版设置编辑器的预览版界面。",
-	"SearchSettings.AriaLabel": "搜索设置",
-	"SearchSettings.Placeholder": "搜索设置",
-	"advancedCustomizationLabel": "高级自定义请打开和编辑",
-	"openSettingsLabel": "settings.json",
-	"showOverriddenOnly": "仅显示已修改项",
-	"treeAriaLabel": "设置",
-	"feedbackButtonLabel": "提供反馈"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/preferences/browser/settingsTree.i18n.json b/i18n/chs/src/vs/workbench/parts/preferences/browser/settingsTree.i18n.json
deleted file mode 100644
index 4bface2e83a..00000000000
--- a/i18n/chs/src/vs/workbench/parts/preferences/browser/settingsTree.i18n.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"modifiedItemForeground": "已修改的设置项的前景色。",
-	"workspace": "工作区",
-	"user": "用户",
-	"resetButtonTitle": "重置",
-	"configured": "已修改",
-	"alsoConfiguredIn": "同时修改于",
-	"configuredIn": "修改于",
-	"editInSettingsJson": "在 settings.json 中编辑",
-	"settingRowAriaLabel": "{0} {1}，设置",
-	"groupRowAriaLabel": "{0}，组"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/preferences/common/keybindingsEditorModel.i18n.json b/i18n/chs/src/vs/workbench/parts/preferences/common/keybindingsEditorModel.i18n.json
deleted file mode 100644
index 818148dcf3a..00000000000
--- a/i18n/chs/src/vs/workbench/parts/preferences/common/keybindingsEditorModel.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"default": "默认",
-	"user": "用户",
-	"meta": "元数据",
-	"option": "选项"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/preferences/common/preferences.i18n.json b/i18n/chs/src/vs/workbench/parts/preferences/common/preferences.i18n.json
deleted file mode 100644
index 340c0705c4a..00000000000
--- a/i18n/chs/src/vs/workbench/parts/preferences/common/preferences.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"userSettingsTarget": "用户设置",
-	"workspaceSettingsTarget": "工作区设置"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json b/i18n/chs/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json
deleted file mode 100644
index 4c83144fd6c..00000000000
--- a/i18n/chs/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"commonlyUsed": "常用设置",
-	"defaultKeybindingsHeader": "通过将键绑定放入键绑定文件中来覆盖键绑定。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/preferences/electron-browser/preferences.contribution.i18n.json b/i18n/chs/src/vs/workbench/parts/preferences/electron-browser/preferences.contribution.i18n.json
deleted file mode 100644
index 5fa3f1da9bd..00000000000
--- a/i18n/chs/src/vs/workbench/parts/preferences/electron-browser/preferences.contribution.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"defaultPreferencesEditor": "默认首选项编辑器",
-	"settingsEditor2": "设置编辑器 2",
-	"keybindingsEditor": "按键绑定编辑器",
-	"preferences": "首选项"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/quickopen/browser/commandsHandler.i18n.json b/i18n/chs/src/vs/workbench/parts/quickopen/browser/commandsHandler.i18n.json
deleted file mode 100644
index c8c1380c75a..00000000000
--- a/i18n/chs/src/vs/workbench/parts/quickopen/browser/commandsHandler.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"showTriggerActions": "显示所有命令",
-	"clearCommandHistory": "清除命令历史记录",
-	"showCommands.label": "命令面板...",
-	"entryAriaLabelWithKey": "{0}、{1} ，命令",
-	"entryAriaLabel": "{0}，命令",
-	"actionNotEnabled": "在当前上下文中没有启用命令“{0}”。",
-	"canNotRun": "命令“{0}”导致了一个错误。",
-	"recentlyUsed": "最近使用",
-	"morecCommands": "其他命令",
-	"cat.title": "{0}: {1}",
-	"noCommandsMatching": "没有匹配的命令"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/quickopen/browser/gotoLineHandler.i18n.json b/i18n/chs/src/vs/workbench/parts/quickopen/browser/gotoLineHandler.i18n.json
deleted file mode 100644
index 1a434b363a3..00000000000
--- a/i18n/chs/src/vs/workbench/parts/quickopen/browser/gotoLineHandler.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"gotoLine": "转到行...",
-	"gotoLineLabelEmptyWithLimit": "键入要导航到的介于 1 和 {0} 之间的行号",
-	"gotoLineLabelEmpty": "键入要导航到的行号",
-	"gotoLineColumnLabel": "转到第 {0} 行，第 {1} 列",
-	"gotoLineLabel": "转到第 {0} 行",
-	"gotoLineHandlerAriaLabel": "键入要导航到的行号。",
-	"cannotRunGotoLine": "首先打开文本文件以转到行"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/quickopen/browser/gotoSymbolHandler.i18n.json b/i18n/chs/src/vs/workbench/parts/quickopen/browser/gotoSymbolHandler.i18n.json
deleted file mode 100644
index 597395ca0b7..00000000000
--- a/i18n/chs/src/vs/workbench/parts/quickopen/browser/gotoSymbolHandler.i18n.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"gotoSymbol": "转到文件中的符号...",
-	"symbols": "符号({0})",
-	"method": "方法({0})",
-	"function": "函数({0})",
-	"_constructor": "构造函数({0})",
-	"variable": "变量({0})",
-	"class": "类({0})",
-	"interface": "接口({0})",
-	"namespace": "命名空间({0})",
-	"package": "包({0})",
-	"modules": "模块({0})",
-	"property": "属性({0})",
-	"enum": "枚举({0})",
-	"string": "字符串({0})",
-	"rule": "规则({0})",
-	"file": "文件({0})",
-	"array": "数组({0})",
-	"number": "编号({0})",
-	"boolean": "布尔值({0})",
-	"object": "对象({0})",
-	"key": "键({0})",
-	"entryAriaLabel": "{0}，符号",
-	"noSymbolsMatching": "没有匹配的符号",
-	"noSymbolsFound": "找不到符号",
-	"gotoSymbolHandlerAriaLabel": "键入以减少当前活动编辑器的符号",
-	"cannotRunGotoSymbolInFile": "没有该文件的任何符号信息",
-	"cannotRunGotoSymbol": "首先打开文本文件以转到符号"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/quickopen/browser/helpHandler.i18n.json b/i18n/chs/src/vs/workbench/parts/quickopen/browser/helpHandler.i18n.json
deleted file mode 100644
index bf4d0edb828..00000000000
--- a/i18n/chs/src/vs/workbench/parts/quickopen/browser/helpHandler.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"entryAriaLabel": "{0}，选取器帮助",
-	"globalCommands": "全局命令",
-	"editorCommands": "编辑器命令"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json b/i18n/chs/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json
deleted file mode 100644
index 8e121198c82..00000000000
--- a/i18n/chs/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"view": "查看",
-	"commandsHandlerDescriptionDefault": "显示并运行命令",
-	"gotoLineDescriptionMac": "转到行",
-	"gotoLineDescriptionWin": "转到行",
-	"gotoSymbolDescription": "转到“文件”中的“符号”",
-	"gotoSymbolDescriptionScoped": "按类别转到“文件”中的“符号”",
-	"helpDescription": "显示帮助",
-	"viewPickerDescription": "打开视图"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/quickopen/browser/viewPickerHandler.i18n.json b/i18n/chs/src/vs/workbench/parts/quickopen/browser/viewPickerHandler.i18n.json
deleted file mode 100644
index 0646176b891..00000000000
--- a/i18n/chs/src/vs/workbench/parts/quickopen/browser/viewPickerHandler.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"entryAriaLabel": "{0}，视图选取器",
-	"views": "视图",
-	"panels": "面板",
-	"terminals": "终端",
-	"terminalTitle": "{0}: {1}",
-	"channels": "输出",
-	"openView": "打开视图",
-	"quickOpenView": "Quick Open 视图"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.i18n.json b/i18n/chs/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.i18n.json
deleted file mode 100644
index c5941b1e095..00000000000
--- a/i18n/chs/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"relaunchSettingMessage": "设置已更改，需要重启才能生效。",
-	"relaunchSettingDetail": "按下“重启”按钮以重新启动 {0} 并启用该设置。",
-	"restart": "重启(&&R)"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.i18n.json b/i18n/chs/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.i18n.json
deleted file mode 100644
index a45d6d27c48..00000000000
--- a/i18n/chs/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.i18n.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"changes": "第 {0} 个更改 (共 {1} 个)",
-	"change": "第 {0} 个更改 (共 {1} 个)",
-	"show previous change": "显示上一个更改",
-	"show next change": "显示下一个更改",
-	"move to previous change": "移动到上一个更改",
-	"move to next change": "移动到下一个更改",
-	"editorGutterModifiedBackground": "编辑器导航线中被修改行的背景颜色。",
-	"editorGutterAddedBackground": "编辑器导航线中已插入行的背景颜色。",
-	"editorGutterDeletedBackground": "编辑器导航线中被删除行的背景颜色。",
-	"overviewRulerModifiedForeground": "概览标尺中已修改内容的颜色。",
-	"overviewRulerAddedForeground": "概览标尺中已增加内容的颜色。",
-	"overviewRulerDeletedForeground": "概览标尺中已删除内容的颜色。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json b/i18n/chs/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
deleted file mode 100644
index 8c0bab20637..00000000000
--- a/i18n/chs/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleGitViewlet": "显示 Git",
-	"source control": "源代码管理",
-	"toggleSCMViewlet": "显示源代码管理",
-	"view": "查看",
-	"scmConfigurationTitle": "源代码管理",
-	"alwaysShowProviders": "是否总是显示源代码管理提供程序部分。",
-	"diffDecorations": "控制编辑器中差异的显示效果。",
-	"diffGutterWidth": "控制导航线上已添加和已修改差异图标的宽度 (px)。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/scm/electron-browser/scmActivity.i18n.json b/i18n/chs/src/vs/workbench/parts/scm/electron-browser/scmActivity.i18n.json
deleted file mode 100644
index 25bc56292d5..00000000000
--- a/i18n/chs/src/vs/workbench/parts/scm/electron-browser/scmActivity.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"scmPendingChangesBadge": "{0} 个挂起的更改"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/scm/electron-browser/scmMenus.i18n.json b/i18n/chs/src/vs/workbench/parts/scm/electron-browser/scmMenus.i18n.json
deleted file mode 100644
index 89c41c7a05b..00000000000
--- a/i18n/chs/src/vs/workbench/parts/scm/electron-browser/scmMenus.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"installAdditionalSCMProviders": "安装其他 SCM 提供程序...",
-	"switch provider": "切换源代码管理系统..."
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json b/i18n/chs/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
deleted file mode 100644
index 72a33d59853..00000000000
--- a/i18n/chs/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"scm providers": "源代码管理提供程序",
-	"hideRepository": "隐藏",
-	"installAdditionalSCMProviders": "安装其他源代码管理提供程序...",
-	"no open repo": "没有活动的源代码管理提供程序。",
-	"source control": "源代码管理",
-	"viewletTitle": "{0}: {1}",
-	"hideView": "隐藏"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/search/browser/openAnythingHandler.i18n.json b/i18n/chs/src/vs/workbench/parts/search/browser/openAnythingHandler.i18n.json
deleted file mode 100644
index d0d2bce40eb..00000000000
--- a/i18n/chs/src/vs/workbench/parts/search/browser/openAnythingHandler.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"fileAndTypeResults": "文件和符号结果",
-	"fileResults": "文件结果"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/search/browser/openFileHandler.i18n.json b/i18n/chs/src/vs/workbench/parts/search/browser/openFileHandler.i18n.json
deleted file mode 100644
index 4174ad7490b..00000000000
--- a/i18n/chs/src/vs/workbench/parts/search/browser/openFileHandler.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"entryAriaLabel": "{0}，文件选取器",
-	"searchResults": "搜索结果"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/search/browser/openSymbolHandler.i18n.json b/i18n/chs/src/vs/workbench/parts/search/browser/openSymbolHandler.i18n.json
deleted file mode 100644
index 40fc5403aa7..00000000000
--- a/i18n/chs/src/vs/workbench/parts/search/browser/openSymbolHandler.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"entryAriaLabel": "{0}，符号选取器",
-	"symbols": "符号结果",
-	"noSymbolsMatching": "没有匹配的符号",
-	"noSymbolsWithoutInput": "键入以搜索符号"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/search/browser/patternInputWidget.i18n.json b/i18n/chs/src/vs/workbench/parts/search/browser/patternInputWidget.i18n.json
deleted file mode 100644
index 124b5e5955a..00000000000
--- a/i18n/chs/src/vs/workbench/parts/search/browser/patternInputWidget.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"defaultLabel": "输入",
-	"useExcludesAndIgnoreFilesDescription": "使用“排除设置”与“忽略文件”"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/search/browser/replaceService.i18n.json b/i18n/chs/src/vs/workbench/parts/search/browser/replaceService.i18n.json
deleted file mode 100644
index 9d1480f139a..00000000000
--- a/i18n/chs/src/vs/workbench/parts/search/browser/replaceService.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"fileReplaceChanges": "{0} ↔ {1} (Replace Preview)"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/search/browser/search.contribution.i18n.json b/i18n/chs/src/vs/workbench/parts/search/browser/search.contribution.i18n.json
deleted file mode 100644
index 971f3dddcce..00000000000
--- a/i18n/chs/src/vs/workbench/parts/search/browser/search.contribution.i18n.json
+++ /dev/null
@@ -1,22 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"showTriggerActions": "转到工作区中的符号...",
-	"name": "搜索",
-	"search": "搜索",
-	"view": "查看",
-	"openAnythingHandlerDescription": "转到文件",
-	"openSymbolDescriptionNormal": "转到工作区中的符号",
-	"searchOutputChannelTitle": "搜索",
-	"searchConfigurationTitle": "搜索",
-	"exclude": "配置 glob 模式以在搜索中排除文件和文件夹。从 files.exclude 设置中继承所有 glob 模式。",
-	"exclude.boolean": "匹配文件路径所依据的 glob 模式。设置为 true 或 false 可启用或禁用该模式。",
-	"exclude.when": "对匹配文件的同级文件的其他检查。使用 $(basename) 作为匹配文件名的变量。",
-	"useRipgrep": "控制是否在文本和文件搜索中使用 ripgrep",
-	"useIgnoreFiles": "控制搜索文件时是否使用 .gitignore 和 .ignore 文件。",
-	"search.quickOpen.includeSymbols": "配置为在 Quick Open 文件结果中包括全局符号搜索的结果。",
-	"search.followSymlinks": "控制是否在搜索中跟踪符号链接。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/search/browser/searchActions.i18n.json b/i18n/chs/src/vs/workbench/parts/search/browser/searchActions.i18n.json
deleted file mode 100644
index db5d7a07f49..00000000000
--- a/i18n/chs/src/vs/workbench/parts/search/browser/searchActions.i18n.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"nextSearchIncludePattern": "显示下一个搜索包含模式",
-	"previousSearchIncludePattern": "显示上一个搜索包含模式",
-	"nextSearchExcludePattern": "显示下一个搜索排除模式",
-	"previousSearchExcludePattern": "显示上一个搜索排除模式",
-	"nextSearchTerm": "显示下一个搜索词",
-	"previousSearchTerm": "显示上一个搜索词",
-	"nextReplaceTerm": "显示下一个搜索替换词",
-	"previousReplaceTerm": "显示上一个搜索替换词",
-	"findInFiles": "在文件中查找",
-	"replaceInFiles": "在文件中替换",
-	"RefreshAction.label": "刷新",
-	"CollapseDeepestExpandedLevelAction.label": "全部折叠",
-	"ClearSearchResultsAction.label": "清除",
-	"CancelSearchAction.label": "取消搜索",
-	"FocusNextSearchResult.label": "聚焦下一搜索结果",
-	"FocusPreviousSearchResult.label": "聚焦上一搜索结果",
-	"RemoveAction.label": "消除",
-	"file.replaceAll.label": "全部替换",
-	"match.replace.label": "替换"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/search/browser/searchResultsView.i18n.json b/i18n/chs/src/vs/workbench/parts/search/browser/searchResultsView.i18n.json
deleted file mode 100644
index 5edf64ccbf5..00000000000
--- a/i18n/chs/src/vs/workbench/parts/search/browser/searchResultsView.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"searchFolderMatch.other.label": "其他文件",
-	"searchFileMatches": "已找到 {0} 个文件",
-	"searchFileMatch": "已找到 {0} 个文件",
-	"searchMatches": "已找到 {0} 个匹配项",
-	"searchMatch": "已找到 {0} 个匹配项",
-	"folderMatchAriaLabel": "根目录 {1} 中找到 {0} 个匹配，搜索结果",
-	"fileMatchAriaLabel": "文件夹 {2} 的文件 {1} 中有 {0} 个匹配项，搜索结果",
-	"replacePreviewResultAria": "在第 {2} 列替换词组 {0} 为 {1}，同行文本为 {3}",
-	"searchResultAria": "在第 {1} 列找到词组 {0}，同行文本为 {2}"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/search/browser/searchView.i18n.json b/i18n/chs/src/vs/workbench/parts/search/browser/searchView.i18n.json
deleted file mode 100644
index 562098e1fa1..00000000000
--- a/i18n/chs/src/vs/workbench/parts/search/browser/searchView.i18n.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"moreSearch": "切换搜索详细信息",
-	"searchScope.includes": "包含的文件",
-	"label.includes": "搜索包含模式",
-	"searchScope.excludes": "排除的文件",
-	"label.excludes": "搜索排除模式",
-	"replaceAll.confirmation.title": "全部替换",
-	"replaceAll.confirm.button": "替换(&&R)",
-	"replaceAll.occurrence.file.message": "已将 {1} 文件中出现的 {0} 替换为“{2}”。",
-	"removeAll.occurrence.file.message": "已替换 {1} 文件中出现的 {0}。",
-	"replaceAll.occurrence.files.message": "已将 {1} 文件中出现的 {0} 替换为“{2}”。",
-	"removeAll.occurrence.files.message": "已替换 {1} 文件中出现的 {0}。",
-	"replaceAll.occurrences.file.message": "已将 {1} 文件中出现的 {0} 替换为“{2}”。",
-	"removeAll.occurrences.file.message": "已替换 {1} 文件中出现的 {0}。",
-	"replaceAll.occurrences.files.message": "已将 {1} 个文件中出现的 {0} 处替换为“{2}”。 ",
-	"removeAll.occurrences.files.message": "已替换 {1} 文件中出现的 {0}。",
-	"removeAll.occurrence.file.confirmation.message": "是否将 {1} 文件中出现的 {0} 替换为“{2}”?",
-	"replaceAll.occurrence.file.confirmation.message": "替换 {1} 个文件中出现的全部 {0} 处？ ",
-	"removeAll.occurrence.files.confirmation.message": "是否将 {1} 文件中出现的 {0} 替换为“{2}”?",
-	"replaceAll.occurrence.files.confirmation.message": "是否替换 {1} 文件中出现的 {0}?",
-	"removeAll.occurrences.file.confirmation.message": "是否将 {1} 文件中出现的 {0} 替换为“{2}”?",
-	"replaceAll.occurrences.file.confirmation.message": "是否替换 {1} 文件中出现的 {0}?",
-	"removeAll.occurrences.files.confirmation.message": "是否将 {1} 个文件中的 {0} 次匹配替换为“{2}”?",
-	"replaceAll.occurrences.files.confirmation.message": "是否替换 {1} 文件中出现的 {0}?",
-	"treeAriaLabel": "搜索结果",
-	"searchPathNotFoundError": "找不到搜索路径: {0}",
-	"searchMaxResultsWarning": "结果集仅包含所有匹配项的子集。请使你的搜索更加具体，减少结果。",
-	"searchCanceled": "在找到结果前取消了搜索 - ",
-	"noResultsIncludesExcludes": "在“{0}”中找不到结果(“{1}”除外) - ",
-	"noResultsIncludes": "“{0}”中未找到任何结果 - ",
-	"noResultsExcludes": "除“{0}”外，未找到任何结果 - ",
-	"noResultsFound": "找不到结果。查看设置中配置的排除项并忽略文件 - ",
-	"rerunSearch.message": "再次搜索",
-	"rerunSearchInAll.message": "在所有文件中再次搜索",
-	"openSettings.message": "打开设置",
-	"openSettings.learnMore": "了解详细信息",
-	"ariaSearchResultsStatus": "搜索 {1} 文件中返回的 {0} 个结果",
-	"search.file.result": "{0} 个结果，包含于 {1} 个文件中",
-	"search.files.result": "{0} 个结果，包含于 {1} 个文件中",
-	"search.file.results": "{0} 个结果，包含于 {1} 个文件中",
-	"search.files.results": "{0} 个结果，包含于 {1} 个文件中",
-	"searchWithoutFolder": "尚未打开文件夹。当前仅可搜索打开的文件夹 - ",
-	"openFolder": "打开文件夹"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json b/i18n/chs/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
deleted file mode 100644
index e6d06592621..00000000000
--- a/i18n/chs/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"moreSearch": "切换搜索详细信息",
-	"searchScope.includes": "要包含的文件",
-	"label.includes": "搜索包含模式",
-	"searchScope.excludes": "要排除的文件",
-	"label.excludes": "搜索排除模式",
-	"replaceAll.confirmation.title": "全部替换",
-	"replaceAll.confirm.button": "替换(&&R)",
-	"replaceAll.occurrence.file.message": "已将 {1} 文件中出现的 {0} 替换为“{2}”。",
-	"removeAll.occurrence.file.message": "已替换 {1} 文件中出现的 {0}。",
-	"replaceAll.occurrence.files.message": "已将 {1} 文件中出现的 {0} 替换为“{2}”。",
-	"removeAll.occurrence.files.message": "已替换 {1} 文件中出现的 {0}。",
-	"replaceAll.occurrences.file.message": "已将 {1} 文件中出现的 {0} 替换为“{2}”。",
-	"removeAll.occurrences.file.message": "已替换 {1} 文件中出现的 {0}。",
-	"replaceAll.occurrences.files.message": "已将 {1} 个文件中出现的 {0} 处替换为“{2}”。 ",
-	"removeAll.occurrences.files.message": "已替换 {1} 文件中出现的 {0}。",
-	"removeAll.occurrence.file.confirmation.message": "是否将 {1} 文件中出现的 {0} 替换为“{2}”?",
-	"replaceAll.occurrence.file.confirmation.message": "替换 {1} 个文件中出现的全部 {0} 处？ ",
-	"removeAll.occurrence.files.confirmation.message": "是否将 {1} 文件中出现的 {0} 替换为“{2}”?",
-	"replaceAll.occurrence.files.confirmation.message": "是否替换 {1} 文件中出现的 {0}?",
-	"removeAll.occurrences.file.confirmation.message": "是否将 {1} 文件中出现的 {0} 替换为“{2}”?",
-	"replaceAll.occurrences.file.confirmation.message": "是否替换 {1} 文件中出现的 {0}?",
-	"removeAll.occurrences.files.confirmation.message": "是否将 {1} 个文件中的 {0} 次匹配替换为“{2}”?",
-	"replaceAll.occurrences.files.confirmation.message": "是否替换 {1} 文件中出现的 {0}?",
-	"treeAriaLabel": "搜索结果",
-	"searchPathNotFoundError": "找不到搜索路径: {0}",
-	"searchMaxResultsWarning": "结果集仅包含所有匹配项的子集。请使你的搜索更加具体，减少结果。",
-	"searchCanceled": "在找到结果前取消了搜索 - ",
-	"noResultsIncludesExcludes": "在“{0}”中找不到结果(“{1}”除外) - ",
-	"noResultsIncludes": "“{0}”中未找到任何结果 - ",
-	"noResultsExcludes": "除“{0}”外，未找到任何结果 - ",
-	"noResultsFound": "找不到结果。查看设置中配置的排除项并忽略文件 - ",
-	"rerunSearch.message": "再次搜索",
-	"rerunSearchInAll.message": "在所有文件中再次搜索",
-	"openSettings.message": "打开设置",
-	"openSettings.learnMore": "了解详细信息",
-	"ariaSearchResultsStatus": "搜索 {1} 文件中返回的 {0} 个结果",
-	"search.file.result": "{1} 文件中有 {0} 个结果",
-	"search.files.result": "{1} 文件中有 {0} 个结果",
-	"search.file.results": "{1} 文件中有 {0} 个结果",
-	"search.files.results": "{1} 文件中有 {0} 个结果",
-	"searchWithoutFolder": "尚未打开文件夹。当前仅可搜索打开的文件夹 - ",
-	"openFolder": "打开文件夹"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/search/browser/searchWidget.i18n.json b/i18n/chs/src/vs/workbench/parts/search/browser/searchWidget.i18n.json
deleted file mode 100644
index e8fe1fb6be7..00000000000
--- a/i18n/chs/src/vs/workbench/parts/search/browser/searchWidget.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"search.action.replaceAll.disabled.label": "全部替换(提交搜索以启用)",
-	"search.action.replaceAll.enabled.label": "全部替换",
-	"search.replace.toggle.button.title": "切换替换",
-	"label.Search": "搜索: 键入搜索词，然后按 Enter 键搜索或按 Esc 键取消",
-	"search.placeHolder": "搜索",
-	"label.Replace": "替换: 键入待替换词，然后按 Enter 键预览或按 Esc 键取消",
-	"search.replace.placeHolder": "替换",
-	"regexp.validationFailure": "表达式与所有内容相匹配",
-	"regexp.backreferenceValidationFailure": "不支持后向引用"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/search/common/queryBuilder.i18n.json b/i18n/chs/src/vs/workbench/parts/search/common/queryBuilder.i18n.json
deleted file mode 100644
index b1e7023bb9f..00000000000
--- a/i18n/chs/src/vs/workbench/parts/search/common/queryBuilder.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"search.noWorkspaceWithName": "工作区中没有名为“{0}”的文件夹 "
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json b/i18n/chs/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
deleted file mode 100644
index 61397c437f2..00000000000
--- a/i18n/chs/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"search": "搜索",
-	"copyMatchLabel": "复制",
-	"copyPathLabel": "复制路径",
-	"copyAllLabel": "全部复制",
-	"clearSearchHistoryLabel": "清除搜索历史记录",
-	"toggleSearchViewPositionLabel": "切换搜索视图位置",
-	"findInFolder": "在文件夹中查找...",
-	"findInWorkspace": "在工作区中查找...",
-	"showTriggerActions": "转到工作区中的符号...",
-	"name": "搜索",
-	"showSearchViewl": "显示搜索",
-	"view": "查看",
-	"findInFiles": "在文件中查找",
-	"openAnythingHandlerDescription": "转到文件",
-	"openSymbolDescriptionNormal": "转到工作区中的符号",
-	"searchConfigurationTitle": "搜索",
-	"exclude": "配置 glob 模式以在搜索中排除文件和文件夹。从 files.exclude 设置中继承所有 glob 模式。",
-	"exclude.boolean": "匹配文件路径所依据的 glob 模式。设置为 true 或 false 可启用或禁用该模式。",
-	"exclude.when": "对匹配文件的同级文件的其他检查。使用 $(basename) 作为匹配文件名的变量。",
-	"useRipgrep": "控制是否在文本和文件搜索中使用 ripgrep",
-	"useIgnoreFiles": "控制搜索文件时是否使用 .gitignore 和 .ignore 文件。",
-	"search.quickOpen.includeSymbols": "配置为在 Quick Open 文件结果中包括全局符号搜索的结果。",
-	"search.followSymlinks": "控制是否在搜索中跟踪符号链接。",
-	"search.smartCase": "若搜索词全为小写，则不区分大小写进行搜索，否则区分大小写进行搜索",
-	"search.globalFindClipboard": "控制“搜索”视图是否读取或修改 macOS 的共享查找剪贴板",
-	"search.location": "控制搜索功能显示在侧边栏还是水平空间更大的面板区域"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/search/electron-browser/searchActions.i18n.json b/i18n/chs/src/vs/workbench/parts/search/electron-browser/searchActions.i18n.json
deleted file mode 100644
index 1821ff81617..00000000000
--- a/i18n/chs/src/vs/workbench/parts/search/electron-browser/searchActions.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"findInFolder": "在文件夹中查找...",
-	"findInWorkspace": "在工作区中查找..."
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/snippets/electron-browser/TMSnippets.i18n.json b/i18n/chs/src/vs/workbench/parts/snippets/electron-browser/TMSnippets.i18n.json
deleted file mode 100644
index a667d902bfe..00000000000
--- a/i18n/chs/src/vs/workbench/parts/snippets/electron-browser/TMSnippets.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"vscode.extension.contributes.snippets": "添加代码段。",
-	"vscode.extension.contributes.snippets-language": "此代码片段参与的语言标识符。",
-	"vscode.extension.contributes.snippets-path": "代码片段文件的路径。该路径相对于扩展文件夹，通常以 \"./snippets/\" 开头。",
-	"invalid.language": "“contributes.{0}.language”中存在未知的语言。提供的值: {1}",
-	"invalid.path.0": "“contributes.{0}.path”中应为字符串。提供的值: {1}",
-	"invalid.path.1": "“contributes.{0}.path”({1})应包含在扩展的文件夹({2})内。这可能会使扩展不可移植。",
-	"badVariableUse": "“{0}”代码片段很可能混淆了片段变量和片段占位符。有关详细信息，请访问 https://code.visualstudio.com/docs/editor/userdefinedsnippets#_snippet-syntax。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json b/i18n/chs/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json
deleted file mode 100644
index 779254ef8e6..00000000000
--- a/i18n/chs/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"global.scope": "(全局)",
-	"global.1": "({0})",
-	"new.global": "新建全局代码片段文件...",
-	"group.global": "现有代码片段",
-	"new.global.sep": "新代码片段",
-	"openSnippet.pickLanguage": "选择代码片段文件或创建代码片段",
-	"openSnippet.label": "配置用户代码片段",
-	"preferences": "首选项"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/snippets/electron-browser/insertSnippet.i18n.json b/i18n/chs/src/vs/workbench/parts/snippets/electron-browser/insertSnippet.i18n.json
deleted file mode 100644
index 007913532b9..00000000000
--- a/i18n/chs/src/vs/workbench/parts/snippets/electron-browser/insertSnippet.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"snippet.suggestions.label": "插入代码片段",
-	"sep.userSnippet": "用户代码片段",
-	"sep.extSnippet": "扩展代码片段"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json b/i18n/chs/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json
deleted file mode 100644
index 0b17c6271c3..00000000000
--- a/i18n/chs/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"snippetSchema.json.default": "空代码片段",
-	"snippetSchema.json": "用户代码片段配置",
-	"snippetSchema.json.prefix": "在 Intellisense 中选择代码片段时将使用的前缀",
-	"snippetSchema.json.body": "代码片段的内容。使用“$1”和“${1:defaultText}”定义光标位置，使用“$0”定义最终光标位置。使用“${varName}”和“${varName:defaultText}”插入变量值，例如“这是文件：$TM_FILENAME”。",
-	"snippetSchema.json.description": "代码片段描述。",
-	"snippetSchema.json.scope": "此代码片段适用语言的名称列表，例如 \"typescript,javascript\"。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json b/i18n/chs/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json
deleted file mode 100644
index f62e870f672..00000000000
--- a/i18n/chs/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"source.snippetGlobal": "全局用户代码片段",
-	"source.snippet": "用户代码片段"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json b/i18n/chs/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
deleted file mode 100644
index d0caabc81b4..00000000000
--- a/i18n/chs/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"invalid.path.0": "“contributes.{0}.path”中应为字符串。提供的值: {1}",
-	"invalid.language.0": "省略语言时，\"contributes.{0}.path\" 的值必须为一个 \".code-snippets\" 文件。提供的值: {1}",
-	"invalid.language": "“contributes.{0}.language”中存在未知的语言。提供的值: {1}",
-	"invalid.path.1": "“contributes.{0}.path”({1})应包含在扩展的文件夹({2})内。这可能会使扩展不可移植。",
-	"vscode.extension.contributes.snippets": "添加代码段。",
-	"vscode.extension.contributes.snippets-language": "此代码片段参与的语言标识符。",
-	"vscode.extension.contributes.snippets-path": "代码片段文件的路径。该路径相对于扩展文件夹，通常以 \"./snippets/\" 开头。",
-	"badVariableUse": "扩展“{0}”中的一个或多个代码片段很可能混淆了片段变量和片段占位符 (有关详细信息，请访问 https://code.visualstudio.com/docs/editor/userdefinedsnippets#_snippet-syntax )",
-	"badFile": "无法读取代码片段文件“{0}”。",
-	"detail.snippet": "{0} ({1})",
-	"snippetSuggest.longLabel": "{0}，{1}"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/snippets/electron-browser/tabCompletion.i18n.json b/i18n/chs/src/vs/workbench/parts/snippets/electron-browser/tabCompletion.i18n.json
deleted file mode 100644
index 36d6e0407ee..00000000000
--- a/i18n/chs/src/vs/workbench/parts/snippets/electron-browser/tabCompletion.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"tabCompletion": "当其前缀匹配时插入代码段。当 \"quickSuggestions\" 未启用时，效果最佳。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/surveys/electron-browser/languageSurveys.contribution.i18n.json b/i18n/chs/src/vs/workbench/parts/surveys/electron-browser/languageSurveys.contribution.i18n.json
deleted file mode 100644
index 8f54754adc7..00000000000
--- a/i18n/chs/src/vs/workbench/parts/surveys/electron-browser/languageSurveys.contribution.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"helpUs": "帮助我们改善对 {0} 的支持",
-	"takeShortSurvey": "参与小调查",
-	"remindLater": "稍后提醒",
-	"neverAgain": "不再显示"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/surveys/electron-browser/nps.contribution.i18n.json b/i18n/chs/src/vs/workbench/parts/surveys/electron-browser/nps.contribution.i18n.json
deleted file mode 100644
index 5f305836c67..00000000000
--- a/i18n/chs/src/vs/workbench/parts/surveys/electron-browser/nps.contribution.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"surveyQuestion": "您愿意参与一次简短的反馈调查吗？",
-	"takeSurvey": "参与调查",
-	"remindLater": "稍后提醒",
-	"neverAgain": "不再显示"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/tasks/browser/buildQuickOpen.i18n.json b/i18n/chs/src/vs/workbench/parts/tasks/browser/buildQuickOpen.i18n.json
deleted file mode 100644
index 67e2a353734..00000000000
--- a/i18n/chs/src/vs/workbench/parts/tasks/browser/buildQuickOpen.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"tasksAriaLabel": "键入生成任务的名称",
-	"noTasksMatching": "没有匹配的任务",
-	"noTasksFound": "找不到生成任务"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/tasks/browser/quickOpen.i18n.json b/i18n/chs/src/vs/workbench/parts/tasks/browser/quickOpen.i18n.json
deleted file mode 100644
index b7b149f717e..00000000000
--- a/i18n/chs/src/vs/workbench/parts/tasks/browser/quickOpen.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"entryAriaLabel": "{0}，任务",
-	"recentlyUsed": "最近使用的任务",
-	"configured": "已配置的任务",
-	"detected": "检测到的任务",
-	"customizeTask": "配置任务"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/tasks/browser/restartQuickOpen.i18n.json b/i18n/chs/src/vs/workbench/parts/tasks/browser/restartQuickOpen.i18n.json
deleted file mode 100644
index 5ddd907a1c1..00000000000
--- a/i18n/chs/src/vs/workbench/parts/tasks/browser/restartQuickOpen.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"tasksAriaLabel": "键入要重启的任务的名称",
-	"noTasksMatching": "没有匹配的任务",
-	"noTasksFound": "没有发现要重启的任务"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/tasks/browser/taskQuickOpen.i18n.json b/i18n/chs/src/vs/workbench/parts/tasks/browser/taskQuickOpen.i18n.json
deleted file mode 100644
index 8cafd5df85a..00000000000
--- a/i18n/chs/src/vs/workbench/parts/tasks/browser/taskQuickOpen.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"tasksAriaLabel": "键入要运行的任务的名称",
-	"noTasksMatching": "没有匹配的任务",
-	"noTasksFound": "找不到任务"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/tasks/browser/terminateQuickOpen.i18n.json b/i18n/chs/src/vs/workbench/parts/tasks/browser/terminateQuickOpen.i18n.json
deleted file mode 100644
index 202a5f386ac..00000000000
--- a/i18n/chs/src/vs/workbench/parts/tasks/browser/terminateQuickOpen.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"tasksAriaLabel": "Type the name of a task to terminate",
-	"noTasksMatching": "没有匹配的任务",
-	"noTasksFound": "No tasks to terminate found"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/tasks/browser/testQuickOpen.i18n.json b/i18n/chs/src/vs/workbench/parts/tasks/browser/testQuickOpen.i18n.json
deleted file mode 100644
index 2e83da22717..00000000000
--- a/i18n/chs/src/vs/workbench/parts/tasks/browser/testQuickOpen.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"tasksAriaLabel": "键入测试任务的名称",
-	"noTasksMatching": "没有匹配的任务",
-	"noTasksFound": "没有找到测试任务"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json b/i18n/chs/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json
deleted file mode 100644
index ba6cda60d7e..00000000000
--- a/i18n/chs/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json
+++ /dev/null
@@ -1,76 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"ProblemPatternParser.loopProperty.notLast": "循环属性仅在最一个行匹配程序上受支持。",
-	"ProblemPatternParser.problemPattern.kindProperty.notFirst": "问题模式无效。\"kind\" 属性必须提供，且仅能为第一个元素",
-	"ProblemPatternParser.problemPattern.missingRegExp": "问题模式缺少正则表达式。",
-	"ProblemPatternParser.problemPattern.missingProperty": "问题模式无效。必须至少包含一个文件和一条消息。",
-	"ProblemPatternParser.problemPattern.missingLocation": "问题模式无效。它必须为“file”，代码行或消息匹配组其中的一项。",
-	"ProblemPatternParser.invalidRegexp": "错误：字符串 {0} 不是有效的正则表达式。\n",
-	"ProblemPatternSchema.regexp": "用于在输出中查找错误、警告或信息的正则表达式。",
-	"ProblemPatternSchema.kind": "模式匹配的是一个位置 (文件、一行) 还是仅为一个文件。",
-	"ProblemPatternSchema.file": "文件名的匹配组索引。如果省略，则使用 1。",
-	"ProblemPatternSchema.location": "问题位置的匹配组索引。有效的位置模式为(line)、(line,column)和(startLine,startColumn,endLine,endColumn)。如果省略了，将假定(line,column)。",
-	"ProblemPatternSchema.line": "问题行的匹配组索引。默认值为 2",
-	"ProblemPatternSchema.column": "问题行字符的匹配组索引。默认值为 3",
-	"ProblemPatternSchema.endLine": "问题结束行的匹配组索引。默认为未定义",
-	"ProblemPatternSchema.endColumn": "问题结束行字符的匹配组索引。默认为未定义",
-	"ProblemPatternSchema.severity": "问题严重性的匹配组索引。默认为未定义",
-	"ProblemPatternSchema.code": "问题代码的匹配组索引。默认为未定义",
-	"ProblemPatternSchema.message": "消息的匹配组索引。如果省略，则在指定了位置时默认值为 4，在其他情况下默认值为 5。",
-	"ProblemPatternSchema.loop": "在多行中，匹配程序循环指示是否只要匹配就在循环中执行此模式。只能在多行模式的最后一个模式上指定。",
-	"NamedProblemPatternSchema.name": "问题模式的名称。",
-	"NamedMultiLineProblemPatternSchema.name": "问题多行问题模式的名称。",
-	"NamedMultiLineProblemPatternSchema.patterns": "实际模式。",
-	"ProblemPatternExtPoint": "提供问题模式",
-	"ProblemPatternRegistry.error": "无效问题模式。此模式将被忽略。",
-	"ProblemMatcherParser.noProblemMatcher": "错误: 描述无法转换为问题匹配程序:\n{0}\n",
-	"ProblemMatcherParser.noProblemPattern": "错误: 描述未定义有效的问题模式:\n{0}\n",
-	"ProblemMatcherParser.noOwner": "错误: 描述未定义所有者:\n{0}\n",
-	"ProblemMatcherParser.noFileLocation": "错误: 描述未定义文件位置:\n{0}\n",
-	"ProblemMatcherParser.unknownSeverity": "信息：未知严重性 {0}。有效值为“error”、“warning”和“info”。\n",
-	"ProblemMatcherParser.noDefinedPatter": "错误: 标识符为 {0} 的模式不存在。",
-	"ProblemMatcherParser.noIdentifier": "错误: 模式属性引用空标识符。",
-	"ProblemMatcherParser.noValidIdentifier": "错误: 模式属性 {0} 是无效的模式变量名。",
-	"ProblemMatcherParser.problemPattern.watchingMatcher": "问题匹配程序必须定义监视的开始模式和结束模式。",
-	"ProblemMatcherParser.invalidRegexp": "错误：字符串 {0} 不是有效的正则表达式。\n",
-	"WatchingPatternSchema.regexp": "用于检测后台任务开始或结束的正则表达式。",
-	"WatchingPatternSchema.file": "文件名的匹配组索引。可以省略。",
-	"PatternTypeSchema.name": "所提供或预定义模式的名称",
-	"PatternTypeSchema.description": "问题模式或者所提供或预定义问题模式的名称。如果已指定基准，则可以省略。",
-	"ProblemMatcherSchema.base": "要使用的基问题匹配程序的名称。",
-	"ProblemMatcherSchema.owner": "代码内问题的所有者。如果指定了基准，则可省略。如果省略，并且未指定基准，则默认值为“外部”。",
-	"ProblemMatcherSchema.source": "描述此诊断信息来源的人类可读字符串。如，\"typescript\" 或 \"super lint\"。",
-	"ProblemMatcherSchema.severity": "捕获问题的默认严重性。如果模式未定义严重性的匹配组，则使用。",
-	"ProblemMatcherSchema.applyTo": "控制文本文档上报告的问题是否仅应用于打开、关闭或所有文档。",
-	"ProblemMatcherSchema.fileLocation": "定义应如何解释问题模式中报告的文件名。",
-	"ProblemMatcherSchema.background": "用于跟踪在后台任务上激活的匹配程序的开始和结束的模式。",
-	"ProblemMatcherSchema.background.activeOnStart": "如果设置为 true，则会在任务开始时激活后台监控。这相当于发出与 beginPattern 匹配的行。",
-	"ProblemMatcherSchema.background.beginsPattern": "如果在输出内匹配，则会发出后台任务开始的信号。",
-	"ProblemMatcherSchema.background.endsPattern": "如果在输出内匹配，则会发出后台任务结束的信号。",
-	"ProblemMatcherSchema.watching.deprecated": "“watching”属性已被弃用。请改用“background”。",
-	"ProblemMatcherSchema.watching": "用于跟踪监视匹配程序开始和结束的模式。",
-	"ProblemMatcherSchema.watching.activeOnStart": "如果设置为 true，则当任务开始时观察程序处于活动模式。这相当于发出与 beginPattern 匹配的行。",
-	"ProblemMatcherSchema.watching.beginsPattern": "如果在输出内匹配，则在监视任务开始时会发出信号。",
-	"ProblemMatcherSchema.watching.endsPattern": "如果在输出内匹配，则在监视任务结束时会发出信号。",
-	"LegacyProblemMatcherSchema.watchedBegin.deprecated": "此属性已弃用。请改用观看属性。",
-	"LegacyProblemMatcherSchema.watchedBegin": "一个正则表达式，发出受监视任务开始执行(通过文件监视触发)的信号。",
-	"LegacyProblemMatcherSchema.watchedEnd.deprecated": "此属性已弃用。请改用观看属性。",
-	"LegacyProblemMatcherSchema.watchedEnd": "一个正则表达式，发出受监视任务结束执行的信号。",
-	"NamedProblemMatcherSchema.name": "要引用的问题匹配程序的名称。",
-	"NamedProblemMatcherSchema.label": "问题匹配程序的人类可读标签。",
-	"ProblemMatcherExtPoint": "提供问题匹配程序",
-	"msCompile": "微软编译器问题",
-	"lessCompile": "Less 问题",
-	"gulp-tsc": "Gulp TSC 问题",
-	"jshint": "JSHint 问题",
-	"jshint-stylish": "JSHint stylish 问题",
-	"eslint-compact": "ESLint compact 问题",
-	"eslint-stylish": "ESLint stylish 问题",
-	"go": "Go 问题"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/tasks/common/taskConfiguration.i18n.json b/i18n/chs/src/vs/workbench/parts/tasks/common/taskConfiguration.i18n.json
deleted file mode 100644
index 29d782900ad..00000000000
--- a/i18n/chs/src/vs/workbench/parts/tasks/common/taskConfiguration.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"ConfigurationParser.invalidCWD": "警告: options.cwd 必须属于字符串类型。正在忽略值 {0}\n",
-	"ConfigurationParser.noargs": "错误: 命令参数必须是字符串数组。提供的值为:\n{0}",
-	"ConfigurationParser.noShell": "警告: 仅当在终端中执行任务时支持 shell 配置。",
-	"ConfigurationParser.noName": "错误: 声明范围内的问题匹配程序必须具有名称:\n{0}\n",
-	"ConfigurationParser.unknownMatcherKind": "警告: 已定义的问题匹配程序未知。受支持的类型为 string | ProblemMatcher | (string | ProblemMatcher)[]。\n{0}\n",
-	"ConfigurationParser.invalidVaraibleReference": "错误: 无效的 problemMatcher 引用: {0}\n",
-	"ConfigurationParser.noTaskName": "错误: 任务必须提供 taskName 属性。将忽略该任务。\n{0}\n",
-	"taskConfiguration.shellArgs": "警告: 任务“{0}”是 shell 命令，该命令的名称或其中一个参数具有非转义空格。若要确保命令行引用正确，请将参数合并到该命令。",
-	"taskConfiguration.noCommandOrDependsOn": "错误：任务“{0}”既不指定命令，也不指定 dependsOn 属性。将忽略该任务。其定义为:\n{1}",
-	"taskConfiguration.noCommand": "错误: 任务“{0}”未定义命令。将忽略该任务。其定义为:\n{1}"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/tasks/common/taskDefinitionRegistry.i18n.json b/i18n/chs/src/vs/workbench/parts/tasks/common/taskDefinitionRegistry.i18n.json
deleted file mode 100644
index 648a76dc169..00000000000
--- a/i18n/chs/src/vs/workbench/parts/tasks/common/taskDefinitionRegistry.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"TaskDefinition.description": "实际任务类型。请注意，以 \"$\" 开头的类型仅保留内部使用。",
-	"TaskDefinition.properties": "任务类型的其他属性",
-	"TaskTypeConfiguration.noType": "任务类型配置缺少必需的 \"taskType\" 属性",
-	"TaskDefinitionExtPoint": "配置任务种类"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/tasks/common/taskTemplates.i18n.json b/i18n/chs/src/vs/workbench/parts/tasks/common/taskTemplates.i18n.json
deleted file mode 100644
index 60cb3e70139..00000000000
--- a/i18n/chs/src/vs/workbench/parts/tasks/common/taskTemplates.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"dotnetCore": "执行 .NET Core 生成命令",
-	"msbuild": "执行生成目标",
-	"externalCommand": "运行任意外部命令的示例",
-	"Maven": "执行常见的 maven 命令"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/tasks/common/taskTypeRegistry.i18n.json b/i18n/chs/src/vs/workbench/parts/tasks/common/taskTypeRegistry.i18n.json
deleted file mode 100644
index 8b6ad71cd4e..00000000000
--- a/i18n/chs/src/vs/workbench/parts/tasks/common/taskTypeRegistry.i18n.json
+++ /dev/null
@@ -1,6 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/tasks/electron-browser/jsonSchemaCommon.i18n.json b/i18n/chs/src/vs/workbench/parts/tasks/electron-browser/jsonSchemaCommon.i18n.json
deleted file mode 100644
index 2daa964a55b..00000000000
--- a/i18n/chs/src/vs/workbench/parts/tasks/electron-browser/jsonSchemaCommon.i18n.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"JsonSchema.options": "其他命令选项",
-	"JsonSchema.options.cwd": "已执行程序或脚本的当前工作目录。如果省略，则使用代码的当前工作区根。",
-	"JsonSchema.options.env": "已执行程序或 shell 的环境。如果省略，则使用父进程的环境。",
-	"JsonSchema.shellConfiguration": "配置使用的 shell。",
-	"JsonSchema.shell.executable": "待使用的 shell。",
-	"JsonSchema.shell.args": "shell 参数。",
-	"JsonSchema.command": "要执行的命令。可以是外部程序或 shell 命令。",
-	"JsonSchema.tasks.args": "在调用此任务时传递给命令的参数。",
-	"JsonSchema.tasks.taskName": "任务名称",
-	"JsonSchema.tasks.windows": "Windows 特定的命令配置",
-	"JsonSchema.tasks.mac": "Mac 特定的命令配置",
-	"JsonSchema.tasks.linux": "Linux 特定的命令配置",
-	"JsonSchema.tasks.suppressTaskName": "控制是否将任务名作为参数添加到命令。如果省略，则使用全局定义的值。",
-	"JsonSchema.tasks.showOutput": "控制是否显示正在运行的任务的输出。如果省略，则使用全局定义的值。",
-	"JsonSchema.echoCommand": "控制是否将已执行的命令回显到输出。默认值为 false。",
-	"JsonSchema.tasks.watching.deprecation": "已弃用。改用 isBackground。",
-	"JsonSchema.tasks.watching": "已执行的任务是否保持活动状态，并且是否在监视文件系统。",
-	"JsonSchema.tasks.background": "已执行的任务是否保持活动状态并在后台运行。",
-	"JsonSchema.tasks.promptOnClose": "若 VS Code 关闭时有任务运行，是否提醒用户。",
-	"JsonSchema.tasks.build": "将此任务映射到代码的默认生成命令。",
-	"JsonSchema.tasks.test": "将此任务映射到代码的默认测试命令。",
-	"JsonSchema.tasks.matchers": "要使用的问题匹配程序。可以是字符串或问题匹配程序定义，或字符串和问题匹配程序数组。",
-	"JsonSchema.args": "传递到命令的其他参数。",
-	"JsonSchema.showOutput": "控制是否显示运行任务的输出。如果省略，则使用“始终”。",
-	"JsonSchema.watching.deprecation": "已弃用。改用 isBackground。",
-	"JsonSchema.watching": "已执行的任务是否保持活动状态，并且是否在监视文件系统。",
-	"JsonSchema.background": "已执行的任务是否保持活动状态并在后台运行。",
-	"JsonSchema.promptOnClose": "在具有正在运行的后台任务的情况下关闭 VS 代码时是否提示用户。",
-	"JsonSchema.suppressTaskName": "控制是否将任务名作为参数添加到命令。默认值是 false。",
-	"JsonSchema.taskSelector": "指示参数是任务的前缀。",
-	"JsonSchema.matchers": "要使用的问题匹配程序。可以是字符串或问题匹配程序定义，或字符串和问题匹配程序数组。",
-	"JsonSchema.tasks": "任务配置。通常是外部任务运行程序中已定义任务的扩充。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v1.i18n.json b/i18n/chs/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v1.i18n.json
deleted file mode 100644
index f5392753881..00000000000
--- a/i18n/chs/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v1.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"JsonSchema.version": "配置的版本号",
-	"JsonSchema._runner": "此 runner 已完成使命。请使用官方 runner 属性",
-	"JsonSchema.runner": "定义任务是否作为进程执行，输出显示在输出窗口还是在终端内。",
-	"JsonSchema.windows": "Windows 特定的命令配置",
-	"JsonSchema.mac": "Mac 特定的命令配置",
-	"JsonSchema.linux": "Linux 特定的命令配置",
-	"JsonSchema.shell": "指定命令是 shell 命令还是外部程序。如果省略，默认值是 false。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json b/i18n/chs/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
deleted file mode 100644
index 97fec3bb83d..00000000000
--- a/i18n/chs/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"JsonSchema.shell": "指定命令是 shell 命令还是外部程序。如果省略，默认值是 false。",
-	"JsonSchema.tasks.isShellCommand.deprecated": "isShellCommand 属性已被弃用。请改为使用任务的 type 属性和选项中的 shell 属性。另请参阅 1.14 发行说明。",
-	"JsonSchema.tasks.dependsOn.string": "此任务依赖的另一任务。",
-	"JsonSchema.tasks.dependsOn.array": "此任务依赖的其他任务。",
-	"JsonSchema.tasks.presentation": "配置用于显示任务输出和读取输入的面板。",
-	"JsonSchema.tasks.presentation.echo": "控制是否将执行的命令显示到面板中。默认值为“true”。",
-	"JsonSchema.tasks.presentation.focus": "控制面板是否获取焦点。默认值为“false”。如果设置为“true”，面板也会显示。",
-	"JsonSchema.tasks.presentation.reveal.always": "总是在此任务执行时显示终端。",
-	"JsonSchema.tasks.presentation.reveal.silent": "仅在任务没有关联问题匹配程序且在执行时发生错误时显示终端。",
-	"JsonSchema.tasks.presentation.reveal.never": "不要在此任务执行时显示终端。",
-	"JsonSchema.tasks.presentation.reveals": "控制是否显示运行此任务的面板。默认值为“always”。",
-	"JsonSchema.tasks.presentation.instance": "控制是否在任务间共享面板。同一个任务使用相同面板还是每次运行时新创建一个面板。",
-	"JsonSchema.tasks.terminal": "terminal 属性已被弃用。请改为使用 presentation",
-	"JsonSchema.tasks.group.kind": "任务的执行组。",
-	"JsonSchema.tasks.group.isDefault": "定义此任务是否为组中的默认任务。",
-	"JsonSchema.tasks.group.defaultBuild": "将此任务标记为默认生成任务。",
-	"JsonSchema.tasks.group.defaultTest": "将此任务标记为默认测试任务。",
-	"JsonSchema.tasks.group.build": "将此任务标记为可通过“运行生成任务”命令获取的生成任务。",
-	"JsonSchema.tasks.group.test": "将此任务标记为可通过“运行测试任务”命令获取的测试任务。",
-	"JsonSchema.tasks.group.none": "将任务分配为没有组",
-	"JsonSchema.tasks.group": "定义此任务属于的执行组。它支持 \"build\" 以将其添加到生成组，也支持 \"test\" 以将其添加到测试组。",
-	"JsonSchema.tasks.type": "定义任务是被作为进程运行还是在 shell 中作为命令运行。",
-	"JsonSchema.commandArray": "执行的 Shell 命令。数组项将使用空格连接",
-	"JsonSchema.command.quotedString.value": "实际命令值",
-	"JsonSchema.tasks.quoting.escape": "使用 Shell 的转义字符来转义文本 (如，PowerShell 下的 ` 和 bash 下的 \\ )",
-	"JsonSchema.tasks.quoting.strong": "使用 Shell 的强引用字符来引用参数 (如，在 PowerShell 和 bash 下的 \" )。",
-	"JsonSchema.tasks.quoting.weak": "使用 Shell 的弱引用字符来引用参数 (如，在 PowerShell 和 bash 下的 ' )。",
-	"JsonSchema.command.quotesString.quote": "如何引用命令值。",
-	"JsonSchema.command": "要执行的命令。可以是外部程序或 shell 命令。",
-	"JsonSchema.args.quotedString.value": "实际参数值",
-	"JsonSchema.args.quotesString.quote": "如何引用参数值。",
-	"JsonSchema.tasks.args": "在调用此任务时传递给命令的参数。",
-	"JsonSchema.tasks.label": "任务的用户界面标签",
-	"JsonSchema.version": "配置的版本号。",
-	"JsonSchema.tasks.identifier": "用于在 launch.json 或 dependsOn 子句中引用任务的用户定义标识符。",
-	"JsonSchema.tasks.taskLabel": "任务标签",
-	"JsonSchema.tasks.taskName": "任务名称",
-	"JsonSchema.tasks.taskName.deprecated": "任务的 name 属性已被弃用。请改为使用 label 属性。",
-	"JsonSchema.tasks.background": "已执行的任务是否保持活动状态并在后台运行。",
-	"JsonSchema.tasks.promptOnClose": "若 VS Code 关闭时有任务运行，是否提醒用户。 ",
-	"JsonSchema.tasks.matchers": "要使用的问题匹配程序。可以是字符串或问题匹配程序定义，或字符串和问题匹配程序数组。",
-	"JsonSchema.customizations.customizes.type": "要自定义的任务类型",
-	"JsonSchema.tasks.customize.deprecated": "customize 属性已被弃用。请参阅 1.14 发行说明了解如何迁移到新的任务自定义方法",
-	"JsonSchema.tasks.showOputput.deprecated": "showOutput 属性已被弃用。请改为使用 presentation 属性内的 reveal 属性。另请参阅 1.14 发行说明。",
-	"JsonSchema.tasks.echoCommand.deprecated": "isBuildCommand 属性已被弃用。请改为使用 presentation 属性内的 echo 属性。另请参阅 1.14 发行说明。",
-	"JsonSchema.tasks.suppressTaskName.deprecated": "suppressTaskName 属性已被弃用。请改为在任务中内嵌命令及其参数。另请参阅 1.14 发行说明。",
-	"JsonSchema.tasks.isBuildCommand.deprecated": "isBuildCommand 属性已被弃用。请改为使用 group 属性。另请参阅 1.14 发行说明。",
-	"JsonSchema.tasks.isTestCommand.deprecated": "isTestCommand 属性已被弃用。请改为使用 group 属性。另请参阅 1.14 发行说明。",
-	"JsonSchema.tasks.taskSelector.deprecated": "taskSelector 属性已被弃用。请改为在任务中内嵌命令及其参数。另请参阅 1.14 发行说明。",
-	"JsonSchema.windows": "Windows 特定的命令配置",
-	"JsonSchema.mac": "Mac 特定的命令配置",
-	"JsonSchema.linux": "Linux 特定的命令配置"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json b/i18n/chs/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
deleted file mode 100644
index 41326098874..00000000000
--- a/i18n/chs/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
+++ /dev/null
@@ -1,89 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"tasksCategory": "任务",
-	"ConfigureTaskRunnerAction.label": "配置任务",
-	"totalErrors": "{0} 个错误",
-	"totalWarnings": "{0} 条警告",
-	"totalInfos": "{0} 条信息",
-	"problems": "问题",
-	"building": "正在生成...",
-	"manyProblems": "1万+",
-	"runningTasks": "显示运行中的任务",
-	"tasks": "任务",
-	"TaskSystem.noHotSwap": "在有活动任务运行时更换任务执行引擎需要重新加载窗口",
-	"reloadWindow": "重新加载窗口",
-	"TaskServer.folderIgnored": "由于使用任务版本 0.1.0，文件夹 {0} 将被忽略",
-	"TaskService.noBuildTask1": "未定义任何生成任务。使用 \"isBuildCommand\" 在 tasks.json 文件中标记任务。",
-	"TaskService.noBuildTask2": "未定义任何生成任务。在 tasks.json 文件中将任务标记为 \"build\" 组。",
-	"TaskService.noTestTask1": "未定义任何测试任务。使用 \"isTestCommand\" 在 tasks.json 文件中标记任务。",
-	"TaskService.noTestTask2": "未定义任何测试任务。在 tasks.json 文件中将任务标记为 \"test\" 组。",
-	"TaskServer.noTask": "未找到要执行的请求任务 {0}。",
-	"TaskService.associate": "相关",
-	"TaskService.attachProblemMatcher.continueWithout": "继续而不扫描任务输出",
-	"TaskService.attachProblemMatcher.never": "永不扫描任务输出",
-	"TaskService.attachProblemMatcher.learnMoreAbout": "了解有关扫描任务输出的详细信息",
-	"selectProblemMatcher": "选择针对何种错误和警告扫描任务输出",
-	"customizeParseErrors": "当前任务配置存在错误。请先更正错误，再自定义任务。",
-	"moreThanOneBuildTask": "当前 tasks.json 中定义了多个生成任务。正在执行第一个。\n",
-	"TaskSystem.activeSame.background": "任务“{0}”已激活，并且处于后台模式。",
-	"TaskSystem.activeSame.noBackground": "任务“{0}”已处于活动状态。",
-	"terminateTask": "终止任务",
-	"restartTask": "重启任务",
-	"TaskSystem.active": "当前已有任务正在运行。请先终止它，然后再执行另一项任务。",
-	"TaskSystem.restartFailed": "未能终止并重启任务 {0}",
-	"TaskService.noConfiguration": "错误: {0} 任务检测没有提供拥有下列配置的任务:\n{1}\n将忽略此任务。\n",
-	"TaskSystem.configurationErrors": "错误: 提供的任务配置具有验证错误，无法使用。请首先改正错误。",
-	"taskService.ignoreingFolder": "将忽略工作区文件夹 {0} 的任务配置。多文件夹工作区任务支持要求所有文件夹使用任务版本 2.0.0\n",
-	"TaskSystem.invalidTaskJson": "错误: tasks.json 文件的内容具有语法错误。请先更正错误然后再执行任务。\n",
-	"TaskSystem.runningTask": "存在运行中的任务。要终止它吗?",
-	"TaskSystem.terminateTask": "终止任务(&&T)",
-	"TaskSystem.noProcess": "启动的任务不再存在。如果任务已衍生出后台进程，则退出 VS Code 可能会导致出现孤立的进程。若要避免此情况，请使用等待标记启动最后一个后台进程。",
-	"TaskSystem.exitAnyways": "仍然退出(&&E)",
-	"TerminateAction.label": "终止任务",
-	"TaskSystem.unknownError": "运行任务时发生了错误。请参见任务日志了解详细信息。",
-	"TaskService.noWorkspace": "任务仅在工作区文件夹上可用。",
-	"recentlyUsed": "最近使用的任务",
-	"configured": "已配置的任务",
-	"detected": "检测到的任务",
-	"TaskService.ignoredFolder": "由于使用任务版本 0.1.0，以下工作区文件夹将被忽略: {0}",
-	"TaskService.notAgain": "不再显示",
-	"TaskService.pickRunTask": "选择要运行的任务",
-	"TaslService.noEntryToRun": "没有找到要运行的任务。配置任务...",
-	"TaskService.fetchingBuildTasks": "正在获取生成任务...",
-	"TaskService.pickBuildTask": "选择要运行的生成任务",
-	"TaskService.noBuildTask": "没有找到要运行的生成任务。配置生成任务...",
-	"TaskService.fetchingTestTasks": "正在获取测试任务...",
-	"TaskService.pickTestTask": "选择要运行的测试任务",
-	"TaskService.noTestTaskTerminal": "没有找到要运行的测试任务。配置任务...",
-	"TaskService.tastToTerminate": "选择要终止的任务",
-	"TaskService.noTaskRunning": "当前没有运行中的任务",
-	"TerminateAction.noProcess": "启动的进程不再存在。如果任务衍生的后台任务退出 VS Code，则可能会导致出现孤立的进程。",
-	"TerminateAction.failed": "未能终止运行中的任务",
-	"TaskService.tastToRestart": "选择要重启的任务",
-	"TaskService.noTaskToRestart": "没有要重启的任务",
-	"TaskService.template": "选择任务模板",
-	"TaskService.createJsonFile": "使用模板创建 tasks.json 文件",
-	"TaskService.openJsonFile": "打开 tasks.json 文件",
-	"TaskService.pickTask": "选择要配置的任务",
-	"TaskService.defaultBuildTaskExists": "{0} 已被标记为默认生成任务",
-	"TaskService.pickDefaultBuildTask": "选择要用作默认生成任务的任务",
-	"TaskService.defaultTestTaskExists": "{0} 已被标记为默认测试任务。",
-	"TaskService.pickDefaultTestTask": "选择要用作默认测试任务的任务",
-	"TaskService.pickShowTask": "选择要显示输出的任务",
-	"TaskService.noTaskIsRunning": "没有运行中的任务",
-	"ShowLogAction.label": "显示任务日志",
-	"RunTaskAction.label": "运行任务",
-	"RestartTaskAction.label": "重启正在运行的任务",
-	"ShowTasksAction.label": "显示运行中的任务",
-	"BuildAction.label": "运行生成任务",
-	"TestAction.label": "运行测试任务",
-	"ConfigureDefaultBuildTask.label": "配置默认生成任务",
-	"ConfigureDefaultTestTask.label": "配置默认测试任务",
-	"quickOpen.task": "运行任务"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/tasks/electron-browser/taskPanel.i18n.json b/i18n/chs/src/vs/workbench/parts/tasks/electron-browser/taskPanel.i18n.json
deleted file mode 100644
index 3d2cdf01e70..00000000000
--- a/i18n/chs/src/vs/workbench/parts/tasks/electron-browser/taskPanel.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"tasks": "任务"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.i18n.json b/i18n/chs/src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.i18n.json
deleted file mode 100644
index 677579a7a5d..00000000000
--- a/i18n/chs/src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"TerminalTaskSystem.unknownError": "在执行任务时发生未知错误。请参见任务输出日志了解详细信息。",
-	"dependencyFailed": "无法解析在工作区文件夹“{1}”中的依赖任务“{0}”",
-	"TerminalTaskSystem.terminalName": "任务 - {0}",
-	"closeTerminal": "按任意键关闭终端。",
-	"reuseTerminal": "终端将被任务重用，按任意键关闭。",
-	"TerminalTaskSystem": "无法使用 cmd.exe 在 UNC 驱动器上执行 Shell 命令。",
-	"unkownProblemMatcher": "无法解析问题匹配程序 {0}。此匹配程序将被忽略"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/tasks/node/processRunnerDetector.i18n.json b/i18n/chs/src/vs/workbench/parts/tasks/node/processRunnerDetector.i18n.json
deleted file mode 100644
index 0cdab41830e..00000000000
--- a/i18n/chs/src/vs/workbench/parts/tasks/node/processRunnerDetector.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"TaskSystemDetector.noGulpTasks": "正在运行的 gulp --tasks-simple 没有列出任何任务。你运行 npm 安装了吗?",
-	"TaskSystemDetector.noJakeTasks": "正在运行的 jake --tasks 没有列出任何任务。你运行 npm 安装了吗?",
-	"TaskSystemDetector.noGulpProgram": "你的系统上没有安装 Gulp。运行 npm install -g gulp 以安装它。",
-	"TaskSystemDetector.noJakeProgram": "你的系统上没有安装 Jake。运行 npm install -g jake 以安装它。",
-	"TaskSystemDetector.noGruntProgram": "你的系统上没有安装 Grunt。运行 npm install -g grunt 以安装它。",
-	"TaskSystemDetector.noProgram": "找不到程序 {0}。消息是 {1}",
-	"TaskSystemDetector.buildTaskDetected": "检测到名为“{0}”的生成任务。",
-	"TaskSystemDetector.testTaskDetected": "测试检测到的名为“{0}”的测试任务。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/tasks/node/processTaskSystem.i18n.json b/i18n/chs/src/vs/workbench/parts/tasks/node/processTaskSystem.i18n.json
deleted file mode 100644
index 7dc881f5026..00000000000
--- a/i18n/chs/src/vs/workbench/parts/tasks/node/processTaskSystem.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"TaskRunnerSystem.unknownError": "在执行任务时发生未知错误。请参见任务输出日志了解详细信息。",
-	"TaskRunnerSystem.watchingBuildTaskFinished": "\n监视生成任务已完成",
-	"TaskRunnerSystem.childProcessError": "启动外部程序 {0} {1} 失败。",
-	"TaskRunnerSystem.cancelRequested": "\n已根据用户请求终止了任务'{0}' ",
-	"unkownProblemMatcher": "无法解析问题匹配程序 {0}。此匹配程序将被忽略"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json b/i18n/chs/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
deleted file mode 100644
index 6d505c88ed5..00000000000
--- a/i18n/chs/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"ConfigurationParser.invalidCWD": "警告: options.cwd 必须为 \"string\" 类型。将忽略值 {0}\n",
-	"ConfigurationParser.inValidArg": "错误: 命令参数必须是字符串或有效引用的字符串。提供的值为: {0}",
-	"ConfigurationParser.noargs": "错误: 命令参数必须是字符串数组。提供的值为:\n{0}",
-	"ConfigurationParser.noShell": "警告: 仅当在终端中执行任务时支持 shell 配置。",
-	"ConfigurationParser.noName": "错误: 声明范围内的问题匹配程序必须具有名称:\n{0}\n",
-	"ConfigurationParser.unknownMatcherKind": "警告: 已定义的问题匹配程序未知。受支持的类型为 string | ProblemMatcher | (string | ProblemMatcher)[]。\n{0}\n",
-	"ConfigurationParser.invalidVaraibleReference": "错误: 无效的 problemMatcher 引用: {0}\n",
-	"ConfigurationParser.noTaskType": "错误: 任务必须提供 type 属性。将忽略该任务。\n{0}\n",
-	"ConfigurationParser.noTypeDefinition": "错误: 没有注册任务类型“{0}”。你是不是忘记安装含有相应任务提供器的扩展?",
-	"ConfigurationParser.missingRequiredProperty": "错误: 任务配置“{0}”缺失必要属性“{1}”。将忽略该任务。",
-	"ConfigurationParser.notCustom": "错误: 任务未声明为自定义任务。将忽略配置。\n{0}\n",
-	"ConfigurationParser.noTaskName": "错误: 任务必须提供 label 属性。将忽略该任务。\n{0}\n",
-	"taskConfiguration.noCommandOrDependsOn": "错误：任务“{0}”既不指定命令，也不指定 dependsOn 属性。将忽略该任务。其定义为:\n{1}",
-	"taskConfiguration.noCommand": "错误: 任务“{0}”未定义命令。将忽略该任务。其定义为:\n{1}",
-	"TaskParse.noOsSpecificGlobalTasks": "任务版本 2.0.0 不支持全局操作系统特定任务。请将他们转换为含有操作系统特定命令的任务。受影响的任务有:\n{0}"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.i18n.json b/i18n/chs/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.i18n.json
deleted file mode 100644
index 0f7562b50c4..00000000000
--- a/i18n/chs/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"termEntryAriaLabel": "{0}，终端选取器",
-	"termCreateEntryAriaLabel": "{0}，新建终端",
-	"workbench.action.terminal.newplus": "$(plus) 新建集成终端",
-	"noTerminalsMatching": "没有匹配的终端",
-	"noTerminalsFound": "没有打开终端"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/terminal/common/terminalColorRegistry.i18n.json b/i18n/chs/src/vs/workbench/parts/terminal/common/terminalColorRegistry.i18n.json
deleted file mode 100644
index 1c55c29463d..00000000000
--- a/i18n/chs/src/vs/workbench/parts/terminal/common/terminalColorRegistry.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"terminal.background": "终端的背景颜色，允许终端的颜色与面板不同。",
-	"terminal.foreground": "终端的前景颜色。",
-	"terminalCursor.foreground": "终端光标的前景色。",
-	"terminalCursor.background": "终端光标的背景色。允许自定义被 block 光标遮住的字符的颜色。",
-	"terminal.selectionBackground": "终端选中内容的背景颜色。",
-	"terminal.border": "分隔终端中拆分窗格的边框的颜色。默认值为 panel.border 的颜色",
-	"terminal.ansiColor": "终端中的 ANSI 颜色“{0}”。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json b/i18n/chs/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
deleted file mode 100644
index c2fbe4fef10..00000000000
--- a/i18n/chs/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"quickOpen.terminal": "显示所有已打开的终端",
-	"terminal": "终端",
-	"terminalIntegratedConfigurationTitle": "集成终端",
-	"terminal.integrated.shell.linux": "终端在 Linux 上使用的 shell 的路径。",
-	"terminal.integrated.shellArgs.linux": "在 Linux 终端上时要使用的命令行参数。",
-	"terminal.integrated.shell.osx": "终端在 OS X 上使用的 shell 的路径。",
-	"terminal.integrated.shellArgs.osx": "在 OS X 终端上时要使用的命令行参数。",
-	"terminal.integrated.shell.windows": "终端在 Windows 使用的 shell 路径。使用随 Windows 一起提供的 shell (cmd、PowerShell 或 Bash on Ubuntu) 时。",
-	"terminal.integrated.shellArgs.windows": "在 Windows 终端上时使用的命令行参数。",
-	"terminal.integrated.macOptionIsMeta": "在终端中，使用 Option 键作为 Meta 键。(macOS)",
-	"terminal.integrated.copyOnSelection": "设置后，终端中选中的文字将被复制到剪贴板。",
-	"terminal.integrated.fontFamily": "控制终端的字体系列，这在编辑器中是默认的。fontFamily 的值。",
-	"terminal.integrated.fontSize": "控制终端的字号(以像素为单位)。",
-	"terminal.integrated.letterSpacing": "控制终端字符的间距。此项的值为整数，表示在字符间添加的额外像素数。",
-	"terminal.integrated.lineHeight": "控制终端的行高，此数字乘上终端字号得到实际行高(以像素为单位)。",
-	"terminal.integrated.fontWeight": "终端中非粗体字使用的字重。",
-	"terminal.integrated.fontWeightBold": "终端中粗体字使用的字重。",
-	"terminal.integrated.cursorBlinking": "控制终端光标是否闪烁。",
-	"terminal.integrated.cursorStyle": "控制终端游标的样式。",
-	"terminal.integrated.scrollback": "控制终端保持在缓冲区的最大行数。",
-	"terminal.integrated.setLocaleVariables": "控制是否在终端启动时设置区域设置变量，在 OS X 上默认设置为 true，在其他平台上为 false。",
-	"terminal.integrated.rendererType": "控制终端的渲染方式。如果选择 \"canvas\" ，则使用标准 (快速的) canvas 渲染器；若为 \"dom\"，则回退到基于 DOM 的渲染器；若为 \"auto\"，则让 VS Code 选择最佳方式。此设定要在重载 VS Code 后才能生效。",
-	"terminal.integrated.rightClickBehavior": "控制终端在点击右键时进行的操作，可选值为 \"default\"、 \"copyPaste\" 和 \"selectWord\"。选择 \"default\" 将显示上下文菜单；选择 \"copyPaste\" 将在有选择内容时进行复制，其他时候进行粘贴；选择 \"selectWord\" 终端将选择光标下的字并显示上下文菜单。",
-	"terminal.integrated.cwd": "将在其中启动终端的一个显式起始路径，它用作 shell 进程的当前工作目录(cwd)。当根目录为不方便的 cwd 时，此路径在工作区设置中可能十分有用。",
-	"terminal.integrated.confirmOnExit": "在存在活动终端会话的情况下，退出时是否要确认。",
-	"terminal.integrated.enableBell": "是否启用终端响铃。",
-	"terminal.integrated.commandsToSkipShell": "一组命令 ID，其键绑定不发送到 shell 而始终由 Code 处理。这使得通常由 shell 使用的键绑定的使用效果与未将终端设为焦点时相同，例如按 Ctrl+P 启动 Quick Open。",
-	"terminal.integrated.env.osx": "要添加到 VS Code 进程中的带有环境变量的对象，其会被 OS X 终端使用。",
-	"terminal.integrated.env.linux": "要添加到 VS Code 进程中的带有环境变量的对象，其会被 Linux 终端使用。",
-	"terminal.integrated.env.windows": "要添加到 VS Code 进程中的带有环境变量的对象，其会被 Windows 终端使用。",
-	"terminal.integrated.showExitAlert": "当退出代码非零时，显示“终端进程以某退出代码终止”的警告。",
-	"terminal.integrated.experimentalRestore": "启动 VS Code 时，是否自动恢复工作区的终端会话。这是一项实验性设置，可能会出现问题，将来也可能会有变化。",
-	"terminalCategory": "终端",
-	"viewCategory": "查看"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json b/i18n/chs/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
deleted file mode 100644
index 1becbfa0f08..00000000000
--- a/i18n/chs/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
+++ /dev/null
@@ -1,63 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"workbench.action.terminal.toggleTerminal": "切换集成终端",
-	"workbench.action.terminal.kill": "终止活动终端实例",
-	"workbench.action.terminal.kill.short": "终止终端",
-	"workbench.action.terminal.quickKill": "终止终端实例",
-	"workbench.action.terminal.copySelection": "复制所选内容",
-	"workbench.action.terminal.selectAll": "全选",
-	"workbench.action.terminal.deleteWordLeft": "删除左侧的字符",
-	"workbench.action.terminal.deleteWordRight": "删除右侧的字符",
-	"workbench.action.terminal.moveToLineStart": "移动到行首",
-	"workbench.action.terminal.moveToLineEnd": "移动到行尾",
-	"workbench.action.terminal.new": "新建集成终端",
-	"workbench.action.terminal.new.short": "新的终端",
-	"workbench.action.terminal.newWorkspacePlaceholder": "选择当前工作目录新建终端",
-	"workbench.action.terminal.newInActiveWorkspace": "新建集成终端 (活动工作区)",
-	"workbench.action.terminal.split": "拆分终端",
-	"workbench.action.terminal.splitInActiveWorkspace": "拆分终端 (活动工作区)",
-	"workbench.action.terminal.focusPreviousPane": "聚焦于上一个窗格",
-	"workbench.action.terminal.focusNextPane": "聚焦于下一个窗格",
-	"workbench.action.terminal.resizePaneLeft": "向左调整窗格大小",
-	"workbench.action.terminal.resizePaneRight": "向右调整窗格大小",
-	"workbench.action.terminal.resizePaneUp": "向上调整窗格大小",
-	"workbench.action.terminal.resizePaneDown": "向下调整窗格大小",
-	"workbench.action.terminal.focus": "聚焦于终端",
-	"workbench.action.terminal.focusNext": "聚焦于下一终端",
-	"workbench.action.terminal.focusPrevious": "聚焦于上一终端",
-	"workbench.action.terminal.paste": "粘贴到活动终端中",
-	"workbench.action.terminal.DefaultShell": "选择默认 Shell",
-	"workbench.action.terminal.runSelectedText": "在活动终端运行所选文本",
-	"workbench.action.terminal.runActiveFile": "在活动终端中运行活动文件",
-	"workbench.action.terminal.runActiveFile.noFile": "只有磁盘上的文件可在终端上运行",
-	"workbench.action.terminal.switchTerminal": "切换终端",
-	"workbench.action.terminal.scrollDown": "向下滚动(行)",
-	"workbench.action.terminal.scrollDownPage": "向下滚动(页)",
-	"workbench.action.terminal.scrollToBottom": "滚动到底部",
-	"workbench.action.terminal.scrollUp": "向上滚动(行)",
-	"workbench.action.terminal.scrollUpPage": "向上滚动(页)",
-	"workbench.action.terminal.scrollToTop": "滚动到顶部",
-	"workbench.action.terminal.clear": "清除",
-	"workbench.action.terminal.clearSelection": "清除选定内容",
-	"workbench.action.terminal.allowWorkspaceShell": "允许配置工作区 Shell",
-	"workbench.action.terminal.disallowWorkspaceShell": "禁止配置工作区 Shell",
-	"workbench.action.terminal.rename": "重命名",
-	"workbench.action.terminal.rename.prompt": "输入终端名称",
-	"workbench.action.terminal.focusFindWidget": "聚焦于查找小组件",
-	"workbench.action.terminal.hideFindWidget": "隐藏查找小组件",
-	"nextTerminalFindTerm": "显示下一个搜索结果",
-	"previousTerminalFindTerm": "显示上一个搜索结果",
-	"quickOpenTerm": "切换活动终端",
-	"workbench.action.terminal.scrollToPreviousCommand": "滚动到上一条命令",
-	"workbench.action.terminal.scrollToNextCommand": "滚动到下一条命令",
-	"workbench.action.terminal.selectToPreviousCommand": "选择上一条命令所有内容",
-	"workbench.action.terminal.selectToNextCommand": "选择下一条命令所有内容",
-	"workbench.action.terminal.selectToPreviousLine": "选择上一行的所有内容",
-	"workbench.action.terminal.selectToNextLine": "选择下一行的所有内容"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json b/i18n/chs/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
deleted file mode 100644
index 1c55c29463d..00000000000
--- a/i18n/chs/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"terminal.background": "终端的背景颜色，允许终端的颜色与面板不同。",
-	"terminal.foreground": "终端的前景颜色。",
-	"terminalCursor.foreground": "终端光标的前景色。",
-	"terminalCursor.background": "终端光标的背景色。允许自定义被 block 光标遮住的字符的颜色。",
-	"terminal.selectionBackground": "终端选中内容的背景颜色。",
-	"terminal.border": "分隔终端中拆分窗格的边框的颜色。默认值为 panel.border 的颜色",
-	"terminal.ansiColor": "终端中的 ANSI 颜色“{0}”。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/terminal/electron-browser/terminalConfigHelper.i18n.json b/i18n/chs/src/vs/workbench/parts/terminal/electron-browser/terminalConfigHelper.i18n.json
deleted file mode 100644
index b384b2a5b91..00000000000
--- a/i18n/chs/src/vs/workbench/parts/terminal/electron-browser/terminalConfigHelper.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"terminal.integrated.allowWorkspaceShell": "是否允许在终端中启动 {0} (定义为工作区设置)?",
-	"allow": "允许",
-	"disallow": "不允许"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/terminal/electron-browser/terminalFindWidget.i18n.json b/i18n/chs/src/vs/workbench/parts/terminal/electron-browser/terminalFindWidget.i18n.json
deleted file mode 100644
index d650d2c5ce6..00000000000
--- a/i18n/chs/src/vs/workbench/parts/terminal/electron-browser/terminalFindWidget.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"label.find": "查找",
-	"placeholder.find": "查找",
-	"label.previousMatchButton": "上一个匹配",
-	"label.nextMatchButton": "下一个匹配",
-	"label.closeButton": "关闭"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json b/i18n/chs/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json
deleted file mode 100644
index a789273830a..00000000000
--- a/i18n/chs/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"terminal.integrated.a11yBlankLine": "空行",
-	"terminal.integrated.a11yPromptLabel": "终端输入",
-	"terminal.integrated.a11yTooMuchOutput": "输出太多，无法朗读。请手动转到行内进行阅读",
-	"yes": "是",
-	"terminal.rendererInAllNewTerminals": "所有新创建的终端都将使用非 GPU 渲染器。",
-	"no": "否",
-	"dontShowAgain": "不再显示",
-	"terminal.slowRendering": "集成终端的标准渲染器似乎在您的计算机上运行得很慢。使用基于 DOM 的渲染器也许能提高性能，是否切换? [阅读有关终端设置的更多信息](https://code.visualstudio.com/docs/editor/integrated-terminal#_changing-how-the-terminal-is-rendered)。",
-	"terminal.integrated.copySelection.noSelection": "没有在终端中选择要复制的内容",
-	"terminal.integrated.exitedWithCode": "终端进程已终止，退出代码: {0}",
-	"terminal.integrated.waitOnExit": "按任意键以关闭终端",
-	"terminal.integrated.launchFailed": "终端进程命令“{0} {1}”无法启动 (退出代码: {2})",
-	"terminal.integrated.launchFailedExtHost": "无法启动终端进程 (退出代码: {0})"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/terminal/electron-browser/terminalLinkHandler.i18n.json b/i18n/chs/src/vs/workbench/parts/terminal/electron-browser/terminalLinkHandler.i18n.json
deleted file mode 100644
index ff2f4ed9fb9..00000000000
--- a/i18n/chs/src/vs/workbench/parts/terminal/electron-browser/terminalLinkHandler.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"terminalLinkHandler.followLinkAlt": "Alt + 单击以访问链接",
-	"terminalLinkHandler.followLinkCmd": "Cmd + 单击以跟踪链接",
-	"terminalLinkHandler.followLinkCtrl": "按住 Ctrl 并单击可访问链接"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json b/i18n/chs/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json
deleted file mode 100644
index 83f8b168ba5..00000000000
--- a/i18n/chs/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"terminal.useMonospace": "使用 \"monospace\"",
-	"terminal.monospaceOnly": "终端只支持等宽字体。",
-	"copy": "复制",
-	"split": "拆分",
-	"paste": "粘贴",
-	"selectAll": "全选",
-	"clear": "清除"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json b/i18n/chs/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
deleted file mode 100644
index 226ce4dc16f..00000000000
--- a/i18n/chs/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"terminal.integrated.chooseWindowsShellInfo": "你可以按下“自定义”按钮并更换默认终端 Shell。",
-	"customize": "自定义",
-	"never again": "不再显示",
-	"terminal.integrated.chooseWindowsShell": "选择首选的终端 shell，你可稍后在设置中进行更改",
-	"terminalService.terminalCloseConfirmationSingular": "存在一个活动的终端会话，是否要终止此会话?",
-	"terminalService.terminalCloseConfirmationPlural": "存在 {0} 个活动的终端会话，是否要终止这些会话?"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/themes/electron-browser/themes.contribution.i18n.json b/i18n/chs/src/vs/workbench/parts/themes/electron-browser/themes.contribution.i18n.json
deleted file mode 100644
index 21caf37372f..00000000000
--- a/i18n/chs/src/vs/workbench/parts/themes/electron-browser/themes.contribution.i18n.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"selectTheme.label": "颜色主题",
-	"themes.category.light": "浅色主题",
-	"themes.category.dark": "深色主题",
-	"themes.category.hc": "高对比度主题",
-	"installColorThemes": "安装其他颜色主题...",
-	"themes.selectTheme": "选择颜色主题 (按上下箭头键预览)",
-	"selectIconTheme.label": "文件图标主题",
-	"noIconThemeLabel": "无",
-	"noIconThemeDesc": "禁用文件图标",
-	"installIconThemes": "安装其他文件图标主题...",
-	"themes.selectIconTheme": "选择文件图标主题",
-	"generateColorTheme.label": "使用当前设置生成颜色主题",
-	"preferences": "首选项",
-	"developer": "开发者"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/trust/electron-browser/unsupportedWorkspaceSettings.contribution.i18n.json b/i18n/chs/src/vs/workbench/parts/trust/electron-browser/unsupportedWorkspaceSettings.contribution.i18n.json
deleted file mode 100644
index 8b074252bc9..00000000000
--- a/i18n/chs/src/vs/workbench/parts/trust/electron-browser/unsupportedWorkspaceSettings.contribution.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openWorkspaceSettings": "打开工作区设置",
-	"dontShowAgain": "不再显示",
-	"unsupportedWorkspaceSettings": "此工作区包含仅可在“用户设置”中配置的设置 ({0})。单击[这里]({1})了解更多信息。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json b/i18n/chs/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json
deleted file mode 100644
index 7f372029862..00000000000
--- a/i18n/chs/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"releaseNotesInputName": "发行说明: {0}",
-	"unassigned": "未分配"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/update/electron-browser/releaseNotesInput.i18n.json b/i18n/chs/src/vs/workbench/parts/update/electron-browser/releaseNotesInput.i18n.json
deleted file mode 100644
index a27ae958dd2..00000000000
--- a/i18n/chs/src/vs/workbench/parts/update/electron-browser/releaseNotesInput.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"releaseNotesInputName": "发行说明: {0}"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/update/electron-browser/update.contribution.i18n.json b/i18n/chs/src/vs/workbench/parts/update/electron-browser/update.contribution.i18n.json
deleted file mode 100644
index 5ec1a529b22..00000000000
--- a/i18n/chs/src/vs/workbench/parts/update/electron-browser/update.contribution.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"release notes": "发行说明"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/update/electron-browser/update.i18n.json b/i18n/chs/src/vs/workbench/parts/update/electron-browser/update.i18n.json
deleted file mode 100644
index 34456c16f63..00000000000
--- a/i18n/chs/src/vs/workbench/parts/update/electron-browser/update.i18n.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"releaseNotes": "发行说明",
-	"showReleaseNotes": "显示发行说明",
-	"read the release notes": "欢迎使用 {0} v{1}! 是否要阅读发布说明?",
-	"licenseChanged": "我们对许可条款进行了修改，请点击[此处]({0})进行查看。",
-	"neveragain": "不再显示",
-	"64bitisavailable": "Windows 64 位版的 {0} 已经发布! 单击[这里]({1})了解更多信息。",
-	"updateIsReady": "有新的 {0} 的更新可用。",
-	"noUpdatesAvailable": "当前没有可用的更新。",
-	"ok": "确定",
-	"thereIsUpdateAvailable": "存在可用更新。",
-	"download now": "立即下载",
-	"later": "稍后",
-	"updateAvailable": "现有更新可用: {0} {1}",
-	"installUpdate": "安装更新",
-	"updateInstalling": "正在后台安装 {0} {1}，我们将在完成后通知您。 ",
-	"updateAvailableAfterRestart": "重新启动 {0} 即可应用最新更新。",
-	"updateNow": "立即更新",
-	"commandPalette": "命令面板...",
-	"settings": "设置",
-	"keyboardShortcuts": "键盘快捷方式",
-	"showExtensions": "管理扩展",
-	"userSnippets": "用户代码片段",
-	"selectTheme.label": "颜色主题",
-	"themes.selectIconTheme.label": "文件图标主题",
-	"checkForUpdates": "检查更新...",
-	"checkingForUpdates": "正在检查更新...",
-	"DownloadingUpdate": "正在下载更新...",
-	"installUpdate...": "安装更新...",
-	"installingUpdate": "正在安装更新...",
-	"restartToUpdate": "重启以更新..."
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/url/electron-browser/url.contribution.i18n.json b/i18n/chs/src/vs/workbench/parts/url/electron-browser/url.contribution.i18n.json
deleted file mode 100644
index 7e8fa2b4d60..00000000000
--- a/i18n/chs/src/vs/workbench/parts/url/electron-browser/url.contribution.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openUrl": "打开 URL",
-	"developer": "开发者"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/views/browser/views.i18n.json b/i18n/chs/src/vs/workbench/parts/views/browser/views.i18n.json
deleted file mode 100644
index 1e211f7c694..00000000000
--- a/i18n/chs/src/vs/workbench/parts/views/browser/views.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"viewToolbarAriaLabel": "{0} 操作",
-	"hideView": "从侧边栏中隐藏"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/views/browser/viewsExtensionPoint.i18n.json b/i18n/chs/src/vs/workbench/parts/views/browser/viewsExtensionPoint.i18n.json
deleted file mode 100644
index 51684ff56d1..00000000000
--- a/i18n/chs/src/vs/workbench/parts/views/browser/viewsExtensionPoint.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"requirearray": "视图必须为数组",
-	"requirestring": "属性“{0}”是必需的，其类型必须是“string”",
-	"optstring": "属性“{0}”可以省略，否则其类型必须是 \"string\"",
-	"vscode.extension.contributes.view.id": "视图的标识符。使用标识符通过“vscode.window.registerTreeDataProviderForView” API 注册数据提供程序。同时将“onView:${id}”事件注册到“activationEvents”以激活你的扩展。",
-	"vscode.extension.contributes.view.name": "人类可读的视图名称。将会被显示",
-	"vscode.extension.contributes.view.when": "显示此视图必须为真的条件",
-	"vscode.extension.contributes.views": "向编辑器提供视图",
-	"views.explorer": "资源管理器视图",
-	"views.debug": "调试视图",
-	"locationId.invalid": "“{0}”为无效视图位置"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/watermark/electron-browser/watermark.i18n.json b/i18n/chs/src/vs/workbench/parts/watermark/electron-browser/watermark.i18n.json
deleted file mode 100644
index 4245389d1ad..00000000000
--- a/i18n/chs/src/vs/workbench/parts/watermark/electron-browser/watermark.i18n.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"watermark.showCommands": "显示所有命令",
-	"watermark.quickOpen": "转到文件",
-	"watermark.openFile": "打开文件",
-	"watermark.openFolder": "打开文件夹",
-	"watermark.openFileFolder": "打开文件或文件夹",
-	"watermark.openRecent": "打开最近的文件",
-	"watermark.newUntitledFile": "新的无标题文件",
-	"watermark.toggleTerminal": "切换终端",
-	"watermark.findInFiles": "在文件中查找",
-	"watermark.startDebugging": "开始调试",
-	"watermark.unboundCommand": "未绑定",
-	"workbenchConfigurationTitle": "工作台",
-	"tips.enabled": "启用后，当没有打开编辑器时将显示水印提示。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json b/i18n/chs/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json
deleted file mode 100644
index 2de51221fc9..00000000000
--- a/i18n/chs/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"webview.editor.label": "webview 编辑器",
-	"developer": "开发者"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/webview/electron-browser/webviewCommands.i18n.json b/i18n/chs/src/vs/workbench/parts/webview/electron-browser/webviewCommands.i18n.json
deleted file mode 100644
index bad27cc286a..00000000000
--- a/i18n/chs/src/vs/workbench/parts/webview/electron-browser/webviewCommands.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openToolsLabel": "打开 Webview 开发工具",
-	"refreshWebviewLabel": "重新加载 Webview"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json b/i18n/chs/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json
deleted file mode 100644
index 4230b0cfc3a..00000000000
--- a/i18n/chs/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"telemetryOptOut.optOutNotice": "帮助改善 VS Code，允许 Microsoft 收集使用数据。请阅读我们的[隐私声明]({0})并了解如何[选择退出]({1})。",
-	"telemetryOptOut.optInNotice": "帮助改善 VS Code，允许 Microsoft 收集使用数据。请阅读我们的[隐私声明]({0})并了解如何[选择加入]({1})。",
-	"telemetryOptOut.readMore": "了解详细信息"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/welcome/overlay/browser/welcomeOverlay.i18n.json b/i18n/chs/src/vs/workbench/parts/welcome/overlay/browser/welcomeOverlay.i18n.json
deleted file mode 100644
index 3f4b053f902..00000000000
--- a/i18n/chs/src/vs/workbench/parts/welcome/overlay/browser/welcomeOverlay.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"welcomeOverlay.explorer": "文件资源管理器",
-	"welcomeOverlay.search": "跨文件搜索",
-	"welcomeOverlay.git": "源代码管理",
-	"welcomeOverlay.debug": "启动和调试",
-	"welcomeOverlay.extensions": "管理扩展",
-	"welcomeOverlay.problems": "查看错误和警告",
-	"welcomeOverlay.commandPalette": "查找并运行所有命令",
-	"welcomeOverlay.notifications": "显示通知",
-	"welcomeOverlay": "用户界面概览",
-	"hideWelcomeOverlay": "隐藏界面概览",
-	"help": "帮助"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json b/i18n/chs/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
deleted file mode 100644
index e799257937a..00000000000
--- a/i18n/chs/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"welcomePage.vscode": "Visual Studio Code",
-	"welcomePage.editingEvolved": "编辑进化",
-	"welcomePage.start": "开始",
-	"welcomePage.newFile": "新建文件",
-	"welcomePage.openFolder": "打开文件夹...",
-	"welcomePage.addWorkspaceFolder": "添加工作区文件夹...",
-	"welcomePage.recent": "最近",
-	"welcomePage.moreRecent": "更多...",
-	"welcomePage.noRecentFolders": "无最近使用文件夹",
-	"welcomePage.help": "帮助",
-	"welcomePage.keybindingsCheatsheet": "快捷键速查表(可打印)",
-	"welcomePage.introductoryVideos": "入门视频",
-	"welcomePage.tipsAndTricks": "提示与技巧",
-	"welcomePage.productDocumentation": "产品文档",
-	"welcomePage.gitHubRepository": "GitHub 存储库",
-	"welcomePage.stackOverflow": "Stack Overflow",
-	"welcomePage.showOnStartup": "启动时显示欢迎页",
-	"welcomePage.customize": "自定义",
-	"welcomePage.installExtensionPacks": "工具和语言",
-	"welcomePage.installExtensionPacksDescription": "安装对 {0} 和 {1} 的支持",
-	"welcomePage.moreExtensions": "更多",
-	"welcomePage.installKeymapDescription": "设置和按键绑定",
-	"welcomePage.installKeymapExtension": "安装 {0} 和 {1} 的设置和快捷键",
-	"welcomePage.others": "其他",
-	"welcomePage.colorTheme": "颜色主题",
-	"welcomePage.colorThemeDescription": "使编辑器和代码呈现你喜欢的外观",
-	"welcomePage.learn": "学习",
-	"welcomePage.showCommands": "查找并运行所有命令",
-	"welcomePage.showCommandsDescription": "使用命令面板快速访问和搜索命令 ({0})",
-	"welcomePage.interfaceOverview": "界面概览",
-	"welcomePage.interfaceOverviewDescription": "查看突出显示主要 UI 组件的叠加图",
-	"welcomePage.interactivePlayground": "交互式演练场",
-	"welcomePage.interactivePlaygroundDescription": "在简短演练中试用编辑器的基本功能"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.contribution.i18n.json b/i18n/chs/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.contribution.i18n.json
deleted file mode 100644
index 52ac27ba5d7..00000000000
--- a/i18n/chs/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.contribution.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"workbenchConfigurationTitle": "工作台",
-	"workbench.startupEditor.none": "启动(不带编辑器)。",
-	"workbench.startupEditor.welcomePage": "打开欢迎页面（默认）。",
-	"workbench.startupEditor.newUntitledFile": "打开新的无标题文档",
-	"workbench.startupEditor": "在未能恢复上一会话信息的情况下，控制启动时显示的编辑器。选择 \"none\" 表示启动时不打开编辑器，\"welcomePage\" 表示打开欢迎页面(默认)，\"newUntitledFile\" 表示打开新的无标题文档(仅打开一个空工作区)。",
-	"help": "帮助"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json b/i18n/chs/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json
deleted file mode 100644
index a4d5faf6286..00000000000
--- a/i18n/chs/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"welcomePage": "欢迎使用",
-	"welcomePage.javaScript": "JavaScript",
-	"welcomePage.typeScript": "TypeScript",
-	"welcomePage.python": "Python",
-	"welcomePage.php": "PHP",
-	"welcomePage.azure": "Azure",
-	"welcomePage.showAzureExtensions": "显示 Azure 扩展",
-	"welcomePage.docker": "Docker",
-	"welcomePage.vim": "Vim",
-	"welcomePage.sublime": "Sublime",
-	"welcomePage.atom": "Atom",
-	"welcomePage.extensionPackAlreadyInstalled": "已安装对 {0} 的支持。",
-	"welcomePage.willReloadAfterInstallingExtensionPack": "安装对 {0} 的额外支持后，将重载窗口。",
-	"welcomePage.installingExtensionPack": "正在安装对 {0} 的额外支持...",
-	"welcomePage.extensionPackNotFound": "找不到对 {0} (ID: {1}) 的支持。",
-	"welcomePage.keymapAlreadyInstalled": "已安装 {0} 键盘快捷方式。",
-	"welcomePage.willReloadAfterInstallingKeymap": "安装 {0} 键盘快捷方式后，将重载窗口。",
-	"welcomePage.installingKeymap": "正在安装 {0} 键盘快捷方式...",
-	"welcomePage.keymapNotFound": "找不到 ID 为 {1} 的 {0} 键盘快捷方式。",
-	"welcome.title": "欢迎使用",
-	"welcomePage.openFolderWithPath": "打开路径为 {1} 的文件夹 {0}",
-	"welcomePage.extensionListSeparator": "、",
-	"welcomePage.installKeymap": "安装 {0} 按键映射",
-	"welcomePage.installExtensionPack": "安装对 {0} 的额外支持",
-	"welcomePage.installedKeymap": "已安装 {0} 按键映射",
-	"welcomePage.installedExtensionPack": "已安装 {0} 支持",
-	"ok": "确定",
-	"details": "详细信息",
-	"welcomePage.buttonBackground": "欢迎页按钮的背景色。",
-	"welcomePage.buttonHoverBackground": "欢迎页按钮被悬停时的背景色。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/welcome/walkThrough/electron-browser/editor/editorWalkThrough.i18n.json b/i18n/chs/src/vs/workbench/parts/welcome/walkThrough/electron-browser/editor/editorWalkThrough.i18n.json
deleted file mode 100644
index e8f117370d9..00000000000
--- a/i18n/chs/src/vs/workbench/parts/welcome/walkThrough/electron-browser/editor/editorWalkThrough.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"editorWalkThrough.title": "交互式演练场",
-	"editorWalkThrough": "交互式演练场"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThrough.contribution.i18n.json b/i18n/chs/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThrough.contribution.i18n.json
deleted file mode 100644
index 7842db88db4..00000000000
--- a/i18n/chs/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThrough.contribution.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"walkThrough.editor.label": "交互式演练场",
-	"help": "帮助"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughActions.i18n.json b/i18n/chs/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughActions.i18n.json
deleted file mode 100644
index 5f682bc8696..00000000000
--- a/i18n/chs/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughActions.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"editorWalkThrough.arrowUp": "向上滚动(行)",
-	"editorWalkThrough.arrowDown": "向下滚动(行)",
-	"editorWalkThrough.pageUp": "向上滚动(页)",
-	"editorWalkThrough.pageDown": "向下滚动(页)"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughPart.i18n.json b/i18n/chs/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughPart.i18n.json
deleted file mode 100644
index 6a01d064a11..00000000000
--- a/i18n/chs/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughPart.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"walkThrough.unboundCommand": "未绑定",
-	"walkThrough.gitNotFound": "你的系统上似乎未安装 Git。",
-	"walkThrough.embeddedEditorBackground": "嵌入于交互式演练场中的编辑器的背景颜色。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/services/actions/electron-browser/menusExtensionPoint.i18n.json b/i18n/chs/src/vs/workbench/services/actions/electron-browser/menusExtensionPoint.i18n.json
deleted file mode 100644
index 6e0887932a2..00000000000
--- a/i18n/chs/src/vs/workbench/services/actions/electron-browser/menusExtensionPoint.i18n.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"requirearray": "菜单项必须为一个数组",
-	"requirestring": "“{0}”是必要属性，其类型必须是 \"string\"",
-	"optstring": "属性“{0}”可以省略，否则其类型必须是 \"string\"",
-	"vscode.extension.contributes.menuItem.command": "要执行的命令的标识符。该命令必须在 \"commands\" 部分中声明",
-	"vscode.extension.contributes.menuItem.alt": "要执行的替代命令的标识符。该命令必须在 ”commands\" 部分中声明",
-	"vscode.extension.contributes.menuItem.when": "为显示此项必须为 \"true\" 的条件",
-	"vscode.extension.contributes.menuItem.group": "此命令所属的组",
-	"vscode.extension.contributes.menus": "向编辑器提供菜单项",
-	"menus.commandPalette": "命令面板",
-	"menus.touchBar": "Multi-Touch Bar (仅 macOS)",
-	"menus.editorTitle": "编辑器标题菜单",
-	"menus.editorContext": "编辑器上下文菜单",
-	"menus.explorerContext": "文件资源管理器上下文菜单",
-	"menus.editorTabContext": "编辑器选项卡上下文菜单",
-	"menus.debugCallstackContext": "调试调用堆栈上下文菜单",
-	"menus.scmTitle": "源代码管理标题菜单",
-	"menus.scmSourceControl": "源代码管理菜单",
-	"menus.resourceGroupContext": "源代码管理资源组上下文菜单",
-	"menus.resourceStateContext": "源代码管理资源状态上下文菜单",
-	"view.viewTitle": "提供的视图的标题菜单",
-	"view.itemContext": "提供的视图中的项目的上下文菜单",
-	"nonempty": "应为非空值。",
-	"opticon": "属性 \"icon\" 可以省略，否则其必须为字符串或是类似 \"{dark, light}\" 的文本",
-	"requireStringOrObject": "属性“{0}”是必要属性，其类型必须是 \"string\" 或 \"object\"",
-	"requirestrings": "属性“{0}”和“{1}”是必要属性，其类型必须是 \"string\"",
-	"vscode.extension.contributes.commandType.command": "要执行的命令的标识符",
-	"vscode.extension.contributes.commandType.title": "在界面中显示的命令名称",
-	"vscode.extension.contributes.commandType.category": "(可选) 类别字符串，命令在界面中根据此项分组",
-	"vscode.extension.contributes.commandType.icon": "(可选) 在界面中显示的命令图标。可为文件路径或主题配置",
-	"vscode.extension.contributes.commandType.icon.light": "使用浅色主题时的图标路径",
-	"vscode.extension.contributes.commandType.icon.dark": "使用深色主题时的图标路径",
-	"vscode.extension.contributes.commands": "对命令面板提供命令。",
-	"dup": "命令“{0}”在 \"commands\" 部分重复出现。",
-	"menuId.invalid": "“{0}”为无效菜单标识符",
-	"missing.command": "菜单项引用未在“命令”部分进行定义的命令“{0}”。",
-	"missing.altCommand": "菜单项引用了未在 \"commands\" 部分定义的替代命令“{0}”。",
-	"dupe.command": "菜单项引用的命令中默认和替代命令相同"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/services/bulkEdit/electron-browser/bulkEditService.i18n.json b/i18n/chs/src/vs/workbench/services/bulkEdit/electron-browser/bulkEditService.i18n.json
deleted file mode 100644
index 25c58451792..00000000000
--- a/i18n/chs/src/vs/workbench/services/bulkEdit/electron-browser/bulkEditService.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"summary.0": "未做编辑",
-	"summary.nm": "在 {1} 个文件中进行了 {0} 次编辑",
-	"summary.n0": "在 1 个文件中进行了 {0} 次编辑",
-	"conflict": "这些文件也已同时更改: {0}"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/services/configuration/common/configurationExtensionPoint.i18n.json b/i18n/chs/src/vs/workbench/services/configuration/common/configurationExtensionPoint.i18n.json
deleted file mode 100644
index 58203e80a7e..00000000000
--- a/i18n/chs/src/vs/workbench/services/configuration/common/configurationExtensionPoint.i18n.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.contributes.configuration.title": "设置项的介绍。这段文本将在设置文件中作为另外的注释。",
-	"vscode.extension.contributes.configuration.properties": "配置属性的描述。",
-	"scope.application.description": "特定于应用的配置，仅可在“用户”设置中配置。",
-	"scope.window.description": "特定于窗口的配置，可在“用户”或“工作区”设置中配置。",
-	"scope.resource.description": "特定于资源的配置，可在“用户”、“工作区”或“文件夹”设置中配置。",
-	"scope.description": "配置适用的范围。可用范围有 \"window\" (窗口) 和 \"resource\" (资源)。",
-	"vscode.extension.contributes.defaultConfiguration": "按语言提供默认编辑器配置设置。",
-	"vscode.extension.contributes.configuration": "用于配置字符串。",
-	"invalid.title": "configuration.title 必须是字符串",
-	"invalid.properties": "configuration.properties 必须是对象",
-	"invalid.property": "\"configuration.property\" 必须是对象",
-	"invalid.allOf": "\"configuration.allOf\" 已被弃用且不应被使用。你可以将多个配置单元作为数组传递给 \"configuration\" 参与点。",
-	"workspaceConfig.folders.description": "将载入到工作区的文件夹列表。",
-	"workspaceConfig.path.description": "文件路径。例如 \"/root/folderA\" 或 \"./folderA\"。后者表示根据工作区文件位置进行解析的相对路径。",
-	"workspaceConfig.name.description": "文件夹的可选名称。",
-	"workspaceConfig.uri.description": "文件夹的 URI",
-	"workspaceConfig.settings.description": "工作区设置",
-	"workspaceConfig.launch.description": "工作区启动配置",
-	"workspaceConfig.extensions.description": "工作区扩展",
-	"unknownWorkspaceProperty": "未知的工作区配置属性"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/services/configuration/node/configuration.i18n.json b/i18n/chs/src/vs/workbench/services/configuration/node/configuration.i18n.json
deleted file mode 100644
index 2eb80022de4..00000000000
--- a/i18n/chs/src/vs/workbench/services/configuration/node/configuration.i18n.json
+++ /dev/null
@@ -1,24 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"vscode.extension.contributes.configuration.title": "设置摘要。此标签将在设置文件中用作分隔注释。",
-	"vscode.extension.contributes.configuration.properties": "配置属性的描述。",
-	"scope.window.description": "特定于窗口的配置，可在“用户”或“工作区”设置中配置。",
-	"scope.resource.description": "特定于资源的配置，可在“用户”、“工作区”或“文件夹”设置中配置。",
-	"scope.description": "配置适用的范围。可用范围有“窗口”和“资源”。",
-	"vscode.extension.contributes.configuration": "用于配置字符串。",
-	"invalid.title": "configuration.title 必须是字符串",
-	"vscode.extension.contributes.defaultConfiguration": "按语言提供默认编辑器配置设置。",
-	"invalid.properties": "configuration.properties 必须是对象",
-	"invalid.allOf": "\"configuration.allOf\" 已被弃用且不应被使用。你可以将多个配置单元作为数组传递给 \"configuration\" 参与点。",
-	"workspaceConfig.folders.description": "将载入到工作区的文件夹列表。",
-	"workspaceConfig.path.description": "文件路径。例如 \"/root/folderA\" 或 \"./folderA\"。后者表示根据工作区文件位置进行解析的相对路径。",
-	"workspaceConfig.name.description": "文件夹的可选名称。",
-	"workspaceConfig.uri.description": "文件夹的 URI",
-	"workspaceConfig.settings.description": "工作区设置",
-	"workspaceConfig.extensions.description": "工作区扩展",
-	"unknownWorkspaceProperty": "未知的工作区配置属性"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json b/i18n/chs/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
deleted file mode 100644
index 5acf3a0fa36..00000000000
--- a/i18n/chs/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openTasksConfiguration": "打开任务配置",
-	"openLaunchConfiguration": "打开启动配置",
-	"open": "打开设置",
-	"saveAndRetry": "保存并重试",
-	"errorUnknownKey": "没有注册配置 {1}，因此无法写入 {0}。",
-	"errorInvalidWorkspaceConfigurationApplication": "无法将 {0} 写入“工作区设置”。此设置只能写于“用户设置”。",
-	"errorInvalidFolderConfiguration": "{0} 不支持文件夹资源域，因此无法写入\"文件夹设置\"。",
-	"errorInvalidUserTarget": "{0} 不支持全局域，因此无法写入\"用户设置\"。",
-	"errorInvalidWorkspaceTarget": "{0} 不在多文件夹工作区环境下支持工作区作用域，因此无法写入“工作区设置”。",
-	"errorInvalidFolderTarget": "未提供资源，因此无法写入\"文件夹设置\"。",
-	"errorNoWorkspaceOpened": "没有打开任何工作区，因此无法写入 {0}。请先打开一个工作区，然后重试。",
-	"errorInvalidTaskConfiguration": "无法写入任务配置文件。请打开文件并更正错误或警告，然后重试。",
-	"errorInvalidLaunchConfiguration": "无法写入启动配置文件。请打开文件并更正错误或警告，然后重试。",
-	"errorInvalidConfiguration": "无法写入用户设置。请打开用户设置并清除错误或警告，然后重试。",
-	"errorInvalidConfigurationWorkspace": "无法写入工作区设置。请打开工作区设置并清除错误或警告，然后重试。",
-	"errorInvalidConfigurationFolder": "无法写入文件夹设置。请打开“{0}”文件夹设置并清除错误或警告，然后重试。",
-	"errorTasksConfigurationFileDirty": "任务配置文件已变更，无法写入。请先保存此文件，然后重试。",
-	"errorLaunchConfigurationFileDirty": "启动配置文件已变更，无法写入。请先保存此文件，然后重试。",
-	"errorConfigurationFileDirty": "用户设置文件已变更，无法写入。请先保存此文件，然后重试。",
-	"errorConfigurationFileDirtyWorkspace": "工作区设置文件已变更，无法写入。请先保存此文件，然后重试。",
-	"errorConfigurationFileDirtyFolder": "文件夹设置文件已变更，无法写入。请先保存“{0}”文件夹设置文件，然后重试。",
-	"userTarget": "用户设置",
-	"workspaceTarget": "工作区设置",
-	"folderTarget": "文件夹设置"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/services/configuration/node/configurationService.i18n.json b/i18n/chs/src/vs/workbench/services/configuration/node/configurationService.i18n.json
deleted file mode 100644
index 96542629007..00000000000
--- a/i18n/chs/src/vs/workbench/services/configuration/node/configurationService.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"unsupportedApplicationSetting": "此设置仅可应用于“用户设置”",
-	"unsupportedWindowSetting": "当前无法应用此设置。将在直接打开此文件夹时应用。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/services/configuration/node/jsonEditingService.i18n.json b/i18n/chs/src/vs/workbench/services/configuration/node/jsonEditingService.i18n.json
deleted file mode 100644
index d3e44116384..00000000000
--- a/i18n/chs/src/vs/workbench/services/configuration/node/jsonEditingService.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"errorInvalidFile": "无法写入文件。请打开文件以更正错误或警告，然后重试。",
-	"errorFileDirty": "无法写入文件因为其已变更。请先保存此文件，然后重试。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json b/i18n/chs/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
deleted file mode 100644
index de10b1f332d..00000000000
--- a/i18n/chs/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"stringsOnlySupported": "命令 {0} 未返回字符串结果。若命令用于替换变量，其结果仅支持字符串。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/services/configurationResolver/node/variableResolver.i18n.json b/i18n/chs/src/vs/workbench/services/configurationResolver/node/variableResolver.i18n.json
deleted file mode 100644
index 9742dac3db3..00000000000
--- a/i18n/chs/src/vs/workbench/services/configurationResolver/node/variableResolver.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"missingEnvVarName": "未给出环境变量名称，因此无法解析“{0}”。",
-	"configNotFound": "未能找到设置“{1}”，因此无法解析“{0}”。",
-	"configNoString": "“{1}”为结构类型值，因此无法解析“{0}”。",
-	"missingConfigName": "未给出设置名称，因此无法解析“{0}”。",
-	"noValueForCommand": "命令不含值，因此无法解析“{0}”。",
-	"canNotFindFolder": "找不到文件夹“{1}”，因此无法解析“{0}”。",
-	"canNotResolveWorkspaceFolderMultiRoot": "无法在多文件夹工作区中解析“{0}”。使用 \":\" 和工作区文件夹名称来限定此变量的作用域。",
-	"canNotResolveWorkspaceFolder": "无法解析“{0}”。请打开一个文件夹。",
-	"canNotResolveFile": "无法解析“{0}”。请打开一个编辑器。",
-	"canNotResolveLineNumber": "无法解析“{0}”。请确保已在活动编辑器中选择一行内容。",
-	"canNotResolveSelectedText": "无法解析“{0}”。请确保已在活动编辑器中选择一些文字。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/services/crashReporter/common/crashReporterService.i18n.json b/i18n/chs/src/vs/workbench/services/crashReporter/common/crashReporterService.i18n.json
deleted file mode 100644
index 0581515bc92..00000000000
--- a/i18n/chs/src/vs/workbench/services/crashReporter/common/crashReporterService.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"telemetryConfigurationTitle": "遥测",
-	"telemetry.enableCrashReporting": "启用要发送给 Microsoft 的故障报表。\n此选项需重启才可生效。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/services/crashReporter/electron-browser/crashReporterService.i18n.json b/i18n/chs/src/vs/workbench/services/crashReporter/electron-browser/crashReporterService.i18n.json
deleted file mode 100644
index 3f37d1e6050..00000000000
--- a/i18n/chs/src/vs/workbench/services/crashReporter/electron-browser/crashReporterService.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"telemetryConfigurationTitle": "遥测",
-	"telemetry.enableCrashReporting": "启用要发送给 Microsoft 的故障报表。\n此选项需重启才可生效。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/services/decorations/browser/decorationsService.i18n.json b/i18n/chs/src/vs/workbench/services/decorations/browser/decorationsService.i18n.json
deleted file mode 100644
index 42e502a0b2b..00000000000
--- a/i18n/chs/src/vs/workbench/services/decorations/browser/decorationsService.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"bubbleTitle": "包含强调项"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json b/i18n/chs/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json
deleted file mode 100644
index e3294fd3329..00000000000
--- a/i18n/chs/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"yesButton": "是(&&Y)",
-	"cancelButton": "取消"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/services/dialogs/electron-browser/dialogs.i18n.json b/i18n/chs/src/vs/workbench/services/dialogs/electron-browser/dialogs.i18n.json
deleted file mode 100644
index f12f85763bf..00000000000
--- a/i18n/chs/src/vs/workbench/services/dialogs/electron-browser/dialogs.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"yesButton": "是(&&Y)",
-	"cancelButton": "取消",
-	"moreFile": "...1 个其他文件未显示",
-	"moreFiles": "...{0} 个其他文件未显示"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/services/editor/browser/editorService.i18n.json b/i18n/chs/src/vs/workbench/services/editor/browser/editorService.i18n.json
deleted file mode 100644
index 50e968f8ee3..00000000000
--- a/i18n/chs/src/vs/workbench/services/editor/browser/editorService.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"compareLabels": "{0} ↔ {1}"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/services/editor/common/editorService.i18n.json b/i18n/chs/src/vs/workbench/services/editor/common/editorService.i18n.json
deleted file mode 100644
index ca1ee0161c1..00000000000
--- a/i18n/chs/src/vs/workbench/services/editor/common/editorService.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"compareLabels": "{0} ↔ {1}"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/services/extensions/common/extensionsRegistry.i18n.json b/i18n/chs/src/vs/workbench/services/extensions/common/extensionsRegistry.i18n.json
deleted file mode 100644
index cc00a7772b1..00000000000
--- a/i18n/chs/src/vs/workbench/services/extensions/common/extensionsRegistry.i18n.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.engines": "引擎兼容性。",
-	"vscode.extension.engines.vscode": "对于 VS Code 扩展，指定与其兼容的 VS Code 版本。不能为 *。 例如: ^0.10.5 表示最低兼容 VS Code 版本 0.10.5。",
-	"vscode.extension.publisher": "VS Code 扩展的发布者。",
-	"vscode.extension.displayName": "VS Code 库中使用的扩展的显示名称。",
-	"vscode.extension.categories": "VS Code 库用于对扩展进行分类的类别。",
-	"vscode.extension.category.languages.deprecated": "请改用 \"Programming Languages\"",
-	"vscode.extension.galleryBanner": "VS Code 商城使用的横幅。",
-	"vscode.extension.galleryBanner.color": "VS Code 商城页标题上的横幅颜色。",
-	"vscode.extension.galleryBanner.theme": "横幅文字的颜色主题。",
-	"vscode.extension.contributes": "由此包表示的 VS Code 扩展的所有贡献。",
-	"vscode.extension.preview": "在商店中将扩展标记为“预览版”。",
-	"vscode.extension.activationEvents": "VS Code 扩展的激活事件。",
-	"vscode.extension.activationEvents.onLanguage": "在打开被解析为指定语言的文件时发出的激活事件。",
-	"vscode.extension.activationEvents.onCommand": "在调用指定命令时发出的激活事件。",
-	"vscode.extension.activationEvents.onDebug": "在用户准备调试或准备设置调试配置时发出的激活事件。",
-	"vscode.extension.activationEvents.onDebugInitialConfigurations": "在需要创建 \"launch.json\" 文件 (且需要调用 provideDebugConfigurations 的所有方法) 时发出的激活事件。",
-	"vscode.extension.activationEvents.onDebugResolve": "在将要启动具有特定类型的调试会话 (且需要调用相应的 resolveDebugConfiguration 方法) 时发出的激活事件。",
-	"vscode.extension.activationEvents.workspaceContains": "在打开至少包含一个匹配指定 glob 模式的文件的文件夹时发出的激活事件。",
-	"vscode.extension.activationEvents.onView": "在指定视图被展开时发出的激活事件。",
-	"vscode.extension.activationEvents.onUri": "在打开系统范围内并指向此扩展的 URI 时发出的激活事件。",
-	"vscode.extension.activationEvents.star": "在 VS Code 启动时发出的激活事件。为确保良好的最终用户体验，请仅在其他激活事件组合不适用于你的情况时，才在扩展中使用此事件。",
-	"vscode.extension.badges": "显示在商店扩展页面侧边栏的徽章的数组",
-	"vscode.extension.badges.url": "徽章图像 URL。",
-	"vscode.extension.badges.href": "徽章链接。",
-	"vscode.extension.badges.description": "徽章说明。",
-	"vscode.extension.markdown": "控制商店中使用的 Markdown 渲染引擎。可为 \"github\" (默认) 或 \"standard\" (标准)。",
-	"vscode.extension.qna": "控制市场中的“问与答”(Q&A)链接。设置为 \"marketplace\" 可启用市场的默认“问与答”页面。设置为其他字符串可指向自定义的“问与答”页面。设置为 \"false\" 可完全禁用“问与答”。",
-	"vscode.extension.extensionDependencies": "其他扩展的依赖关系。扩展的标识符始终是 ${publisher}.${name}。例如: vscode.csharp。",
-	"vscode.extension.scripts.prepublish": "包作为 VS Code 扩展发布前执行的脚本。",
-	"vscode.extension.scripts.uninstall": "VS Code 扩展的卸载钩子。在扩展从 VS Code 卸载且 VS Code 重启 (关闭后开启) 后执行的脚本。仅支持 Node 脚本。",
-	"vscode.extension.icon": "128 x 128 像素图标的路径。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/services/extensions/electron-browser/extensionHost.i18n.json b/i18n/chs/src/vs/workbench/services/extensions/electron-browser/extensionHost.i18n.json
deleted file mode 100644
index 13113edbb5a..00000000000
--- a/i18n/chs/src/vs/workbench/services/extensions/electron-browser/extensionHost.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"extensionHostProcess.startupFailDebug": "扩展未在 10 秒内启动，可能在第一行已停止，需要调试器才能继续。",
-	"extensionHostProcess.startupFail": "扩展主机未在 10 秒内启动，可能发生了一个问题。",
-	"reloadWindow": "重新加载窗口",
-	"extensionHostProcess.error": "扩展主机中的错误: {0}"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/services/extensions/electron-browser/extensionHostProfiler.i18n.json b/i18n/chs/src/vs/workbench/services/extensions/electron-browser/extensionHostProfiler.i18n.json
deleted file mode 100644
index 4859bfeff5d..00000000000
--- a/i18n/chs/src/vs/workbench/services/extensions/electron-browser/extensionHostProfiler.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"message": "$(zap) 正在分析扩展主机..."
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/services/extensions/electron-browser/extensionPoints.i18n.json b/i18n/chs/src/vs/workbench/services/extensions/electron-browser/extensionPoints.i18n.json
deleted file mode 100644
index 66729225347..00000000000
--- a/i18n/chs/src/vs/workbench/services/extensions/electron-browser/extensionPoints.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"jsonParseFail": "未能分析 {0}: {1}。",
-	"fileReadFail": "无法读取文件 {0}: {1}。",
-	"jsonsParseReportErrors": "未能分析 {0}: {1}。",
-	"missingNLSKey": "无法找到键 {0} 的消息。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json b/i18n/chs/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json
deleted file mode 100644
index 53d5f14ef4a..00000000000
--- a/i18n/chs/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"extensionsDisabled": "已禁用所有扩展。",
-	"extensionHostProcess.crash": "扩展宿主意外终止。",
-	"extensionHostProcess.unresponsiveCrash": "扩展宿主因没有响应而被终止。",
-	"devTools": "打开开发人员工具",
-	"restart": "重启扩展宿主",
-	"overwritingExtension": "使用扩展程序 {1} 覆盖扩展程序 {0}。",
-	"extensionUnderDevelopment": "正在 {0} 处加载开发扩展程序",
-	"extensionCache.invalid": "扩展在磁盘上已被修改。请重新加载窗口。",
-	"reloadWindow": "重新加载窗口"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/services/extensions/node/extensionPoints.i18n.json b/i18n/chs/src/vs/workbench/services/extensions/node/extensionPoints.i18n.json
deleted file mode 100644
index 0c176dc5672..00000000000
--- a/i18n/chs/src/vs/workbench/services/extensions/node/extensionPoints.i18n.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"jsonParseFail": "未能分析 {0}: {1}。",
-	"fileReadFail": "无法读取文件 {0}: {1}。",
-	"jsonsParseReportErrors": "未能分析 {0}: {1}。",
-	"missingNLSKey": "无法找到键 {0} 的消息。",
-	"notSemver": "扩展版本与 semver 不兼容。",
-	"extensionDescription.empty": "已获得空扩展说明",
-	"extensionDescription.publisher": "属性“{0}”是必要属性，其类型必须是 \"string\"",
-	"extensionDescription.name": "属性“{0}”是必要属性，其类型必须是 \"string\"",
-	"extensionDescription.version": "属性“{0}”是必要属性，其类型必须是 \"string\"",
-	"extensionDescription.engines": "属性“{0}”是必要属性，其类型必须是 \"object\"",
-	"extensionDescription.engines.vscode": "属性“{0}”是必要属性，其类型必须是 \"string\"",
-	"extensionDescription.extensionDependencies": "属性“{0}”可以省略，否则其类型必须是 \"string[]\"",
-	"extensionDescription.activationEvents1": "属性“{0}”可以省略，否则其类型必须是 \"string[]\"",
-	"extensionDescription.activationEvents2": "必须同时指定或同时省略属性”{0}“和”{1}“",
-	"extensionDescription.main1": "属性“{0}”可以省略，否则其类型必须是 \"string\"",
-	"extensionDescription.main2": "应在扩展文件夹({1})中包含 \"main\" ({0})。这可能会使扩展不可移植。",
-	"extensionDescription.main3": "必须同时指定或同时省略属性”{0}“和”{1}“"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/services/files/electron-browser/fileService.i18n.json b/i18n/chs/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
deleted file mode 100644
index a3ff524058d..00000000000
--- a/i18n/chs/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"netVersionError": "缺少 Microsoft .NET Framework 4.5。请访问链接进行安装。",
-	"installNet": "下载 .NET Framework 4.5",
-	"neverShowAgain": "不再显示",
-	"enospcError": "{0} 无法监视这个大型工作区的文件变化。请访问说明链接解决此问题。",
-	"learnMore": "说明",
-	"fileInvalidPath": "无效的文件资源({0})",
-	"fileIsDirectoryError": "文件是目录",
-	"fileNotModifiedError": "自以下时间未修改的文件:",
-	"fileTooLargeForHeapError": "若要打开此大小的文件，需要重新启动 VS Code，并允许其使用更多内存",
-	"fileTooLargeError": "文件太大，无法打开",
-	"fileNotFoundError": "找不到文件({0})",
-	"fileBinaryError": "文件似乎是二进制文件，无法作为文档打开",
-	"filePermission": "写入文件时权限被拒绝 ({0})",
-	"fileExists": "已存在要创建的文件 ({0})",
-	"fileModifiedError": "自以下时间已修改的文件:",
-	"fileReadOnlyError": "文件为只读文件",
-	"fileMoveConflict": "无法移动/复制。文件已存在于目标位置。",
-	"unableToMoveCopyError": "无法移动/复制。文件将替换其所在的文件夹。",
-	"binFailed": "未能将“{0}”移动到回收站",
-	"trashFailed": "未能将“{0}”移动到废纸篓"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json b/i18n/chs/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
deleted file mode 100644
index 8d343959d43..00000000000
--- a/i18n/chs/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"invalidPath": "资源“{0}”的路径必须是绝对路径",
-	"fileNotFoundError": "找不到文件({0})",
-	"fileIsDirectoryError": "文件是目录",
-	"fileNotModifiedError": "自以下时间未修改的文件:",
-	"fileBinaryError": "文件似乎是二进制文件，无法作为文档打开",
-	"err.create": "未能创建文件 {0}",
-	"fileMoveConflict": "无法移动/复制。文件已存在于目标位置。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/services/files/node/fileService.i18n.json b/i18n/chs/src/vs/workbench/services/files/node/fileService.i18n.json
deleted file mode 100644
index c2cd87e923e..00000000000
--- a/i18n/chs/src/vs/workbench/services/files/node/fileService.i18n.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"fileInvalidPath": "无效的文件资源({0})",
-	"fileIsDirectoryError": "文件是目录",
-	"fileNotModifiedError": "自以下时间未修改的文件:",
-	"fileTooLargeForHeapError": "文件大小超过默认内存限制。您可以使用更高的限制重新启动，当前限制为 {0}MB",
-	"fileTooLargeError": "文件太大，无法打开",
-	"fileNotFoundError": "找不到文件({0})",
-	"fileBinaryError": "文件似乎是二进制文件，无法作为文档打开",
-	"filePermission": "写入文件时权限被拒绝 ({0})",
-	"fileExists": "已存在要创建的文件 ({0})",
-	"fileMoveConflict": "无法移动/复制。文件已存在于目标位置。",
-	"unableToMoveCopyError": "无法移动/复制。文件将替换其所在的文件夹。",
-	"foldersCopyError": "无法将文件夹复制到工作区中。请选择单独的文件来进行复制。",
-	"fileModifiedError": "自以下时间已修改的文件:",
-	"fileReadOnlyError": "文件为只读文件"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/services/jsonschemas/common/jsonValidationExtensionPoint.i18n.json b/i18n/chs/src/vs/workbench/services/jsonschemas/common/jsonValidationExtensionPoint.i18n.json
deleted file mode 100644
index 627c1c2f349..00000000000
--- a/i18n/chs/src/vs/workbench/services/jsonschemas/common/jsonValidationExtensionPoint.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"contributes.jsonValidation": "用于 json 架构配置。",
-	"contributes.jsonValidation.fileMatch": "要匹配的文件模式，例如 \"package.json\" 或 \"*.launch\"。",
-	"contributes.jsonValidation.url": "到扩展文件夹('./')的架构 URL (\"http:\"、\"https:\")或相对路径。",
-	"invalid.jsonValidation": "configuration.jsonValidation 必须是数组",
-	"invalid.fileMatch": "必须定义 \"configuration.jsonValidation.fileMatch\" ",
-	"invalid.url": "configuration.jsonValidation.url 必须是 URL 或相对路径",
-	"invalid.url.fileschema": "configuration.jsonValidation.url 是无效的相对 URL: {0}",
-	"invalid.url.schema": "configuration.jsonValidation.url 必须以 \"http:\"、\"https:\" 或 \"./\" 开头以引用位于扩展中的架构。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/services/keybinding/common/keybindingEditing.i18n.json b/i18n/chs/src/vs/workbench/services/keybinding/common/keybindingEditing.i18n.json
deleted file mode 100644
index e0ea3ff7ed1..00000000000
--- a/i18n/chs/src/vs/workbench/services/keybinding/common/keybindingEditing.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"errorKeybindingsFileDirty": "按键绑定配置文件已变更，现在无法写入。请先保存此文件，然后重试。",
-	"parseErrors": "无法写入按键绑定配置文件。请打开文件并更正错误或警告，然后重试。",
-	"errorInvalidConfiguration": "无法写入按键绑定配置文件。文件内含有非数组类型对象。请打开文件进行清理，然后重试。",
-	"emptyKeybindingsHeader": "将按键绑定配置放入此文件中即可覆盖默认值"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/services/keybinding/electron-browser/keybindingService.i18n.json b/i18n/chs/src/vs/workbench/services/keybinding/electron-browser/keybindingService.i18n.json
deleted file mode 100644
index b3755673dac..00000000000
--- a/i18n/chs/src/vs/workbench/services/keybinding/electron-browser/keybindingService.i18n.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"nonempty": "应为非空值。",
-	"requirestring": "“{0}”是必要属性，其类型必须是 \"string\" ",
-	"optstring": "属性“{0}”可以省略，否则其类型必须是 \"string\"",
-	"vscode.extension.contributes.keybindings.command": "触发按键绑定时运行的命令的标识符。",
-	"vscode.extension.contributes.keybindings.key": "按键或按键序列。用加号分隔按键，用空格分隔序列。例如，Ctrl+O 和 Ctrl+L L（连续按键）。",
-	"vscode.extension.contributes.keybindings.mac": "Mac 特定的键或键序列。",
-	"vscode.extension.contributes.keybindings.linux": "Linux 特定的键或键序列。",
-	"vscode.extension.contributes.keybindings.win": "Windows 特定的键或键序列。",
-	"vscode.extension.contributes.keybindings.when": "键处于活动状态时的条件。",
-	"vscode.extension.contributes.keybindings": "提供按键绑定。",
-	"invalid.keybindings": "无效的“contributes.{0}”: {1}",
-	"unboundCommands": "以下是其他可用命令:",
-	"keybindings.json.title": "按键绑定配置",
-	"keybindings.json.key": "键或键序列(用空格分隔)",
-	"keybindings.json.command": "要执行的命令的名称",
-	"keybindings.json.when": "键处于活动状态时的条件。",
-	"keybindings.json.args": "要传递给命令以执行的参数。",
-	"keyboardConfigurationTitle": "键盘",
-	"dispatch": "控制按键的分派逻辑以使用 \"code\" (推荐) 或 \"keyCode\"。",
-	"touchbar.enabled": "启用键盘上的 macOS 触控栏按钮 (若可用)。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/services/message/browser/messageList.i18n.json b/i18n/chs/src/vs/workbench/services/message/browser/messageList.i18n.json
deleted file mode 100644
index f14c2eab305..00000000000
--- a/i18n/chs/src/vs/workbench/services/message/browser/messageList.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"alertErrorMessage": "错误: {0}",
-	"alertWarningMessage": "警告: {0}",
-	"alertInfoMessage": "信息: {0}",
-	"error": "错误",
-	"warning": "警告",
-	"info": "信息",
-	"close": "关闭"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/services/message/electron-browser/messageService.i18n.json b/i18n/chs/src/vs/workbench/services/message/electron-browser/messageService.i18n.json
deleted file mode 100644
index e3294fd3329..00000000000
--- a/i18n/chs/src/vs/workbench/services/message/electron-browser/messageService.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"yesButton": "是(&&Y)",
-	"cancelButton": "取消"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/services/mode/common/workbenchModeService.i18n.json b/i18n/chs/src/vs/workbench/services/mode/common/workbenchModeService.i18n.json
deleted file mode 100644
index d7fe4a68804..00000000000
--- a/i18n/chs/src/vs/workbench/services/mode/common/workbenchModeService.i18n.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.contributes.languages": "提供语言声明。",
-	"vscode.extension.contributes.languages.id": "语言 ID。",
-	"vscode.extension.contributes.languages.aliases": "语言的别名。",
-	"vscode.extension.contributes.languages.extensions": "与语言关联的文件扩展名。",
-	"vscode.extension.contributes.languages.filenames": "与语言关联的文件名。",
-	"vscode.extension.contributes.languages.filenamePatterns": "与语言关联的文件名 glob 模式。",
-	"vscode.extension.contributes.languages.mimetypes": "与语言关联的 Mime 类型。",
-	"vscode.extension.contributes.languages.firstLine": "与语言文件的第一行匹配的正则表达式。",
-	"vscode.extension.contributes.languages.configuration": "包含语言配置选项的文件的相对路径。",
-	"invalid": "“contributes.{0}”无效。应为数组。",
-	"invalid.empty": "“contributes.{0}”的值为空",
-	"require.id": "属性“{0}”是必需的，其类型必须是“字符串”",
-	"opt.extensions": "属性“{0}”可以省略，其类型必须是 \"string[]\"",
-	"opt.filenames": "属性“{0}”可以省略，其类型必须是 \"string[]\"",
-	"opt.firstLine": "属性“{0}”可以省略，其类型必须是“字符串”",
-	"opt.configuration": "属性“{0}”可以省略，其类型必须是“字符串”",
-	"opt.aliases": "属性“{0}”可以省略，其类型必须是 \"string[]\"",
-	"opt.mimetypes": "属性“{0}”可以省略，其类型必须是 \"string[]\""
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/services/progress/browser/progressService2.i18n.json b/i18n/chs/src/vs/workbench/services/progress/browser/progressService2.i18n.json
deleted file mode 100644
index 2ac63294841..00000000000
--- a/i18n/chs/src/vs/workbench/services/progress/browser/progressService2.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"progress.subtitle": "{0} - {1}",
-	"progress.title": "{0}: {1}",
-	"cancel": "取消"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/services/textMate/electron-browser/TMGrammars.i18n.json b/i18n/chs/src/vs/workbench/services/textMate/electron-browser/TMGrammars.i18n.json
deleted file mode 100644
index 87b767e9654..00000000000
--- a/i18n/chs/src/vs/workbench/services/textMate/electron-browser/TMGrammars.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.contributes.grammars": "贡献 textmate tokenizer。",
-	"vscode.extension.contributes.grammars.language": "此语法对应语言的标识符。",
-	"vscode.extension.contributes.grammars.scopeName": "tmLanguage 文件所用的 textmate 范围名称。",
-	"vscode.extension.contributes.grammars.path": "tmLanguage 文件的路径。该路径是相对于扩展文件夹，通常以 \"./syntaxes/\" 开头。",
-	"vscode.extension.contributes.grammars.embeddedLanguages": "如果此语法包含嵌入式语言，则为作用域名称到语言 ID 的映射。",
-	"vscode.extension.contributes.grammars.tokenTypes": "从作用域名到标记类型的映射。",
-	"vscode.extension.contributes.grammars.injectTo": "此语法注入到的语言范围名称列表。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/services/textMate/electron-browser/TMSyntax.i18n.json b/i18n/chs/src/vs/workbench/services/textMate/electron-browser/TMSyntax.i18n.json
deleted file mode 100644
index 1d5c795a440..00000000000
--- a/i18n/chs/src/vs/workbench/services/textMate/electron-browser/TMSyntax.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"invalid.language": "\"contributes.{0}.language\" 中包含未知语言。提供的值: {1}",
-	"invalid.scopeName": "\"contributes.{0}.scopeName\" 应为字符串。提供的值: {1}",
-	"invalid.path.0": "“contributes.{0}.path”中应为字符串。提供的值: {1}",
-	"invalid.injectTo": "\"contributes.{0}.injectTo\" 中的值无效。必须为语言范围名称数组。提供的值: {1}",
-	"invalid.embeddedLanguages": "\"contributes.{0}.embeddedLanguages\" 中的值无效。必须为从作用域名称到语言的对象映射。提供的值: {1}",
-	"invalid.tokenTypes": "\"contributes.{0}.tokenTypes\" 的值无效。必须为从作用域名称到标记类型的对象映射。当前值: {1}",
-	"invalid.path.1": "“contributes.{0}.path”({1})应包含在扩展的文件夹({2})内。这可能会使扩展不可移植。",
-	"no-tm-grammar": "没有注册这种语言的 TM 语法。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/services/textfile/common/textFileEditorModel.i18n.json b/i18n/chs/src/vs/workbench/services/textfile/common/textFileEditorModel.i18n.json
deleted file mode 100644
index 15ffd0fecab..00000000000
--- a/i18n/chs/src/vs/workbench/services/textfile/common/textFileEditorModel.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"saveFileFirst": "文件已更新。请首先保存它，然后再通过另一个编码重新打开它。",
-	"genericSaveError": "未能保存“{0}”: {1}"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/services/textfile/common/textFileService.i18n.json b/i18n/chs/src/vs/workbench/services/textfile/common/textFileService.i18n.json
deleted file mode 100644
index 9fc3fe871b0..00000000000
--- a/i18n/chs/src/vs/workbench/services/textfile/common/textFileService.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"files.backup.failSave": "无法将更改的文件写入备份位置 (错误: {0})。请先保存你的文件，然后退出。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json b/i18n/chs/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json
deleted file mode 100644
index bfa6e5440fb..00000000000
--- a/i18n/chs/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"saveChangesMessage": "是否要保存对 {0} 的更改?",
-	"saveChangesMessages": "是否要保存对下列 {0} 个文件的更改?",
-	"saveAll": "全部保存(&&S)",
-	"save": "保存(&&S)",
-	"dontSave": "不保存(&&N)",
-	"cancel": "取消",
-	"saveChangesDetail": "如果不保存，更改将丢失。",
-	"allFiles": "所有文件",
-	"noExt": "无扩展"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/services/themes/common/colorExtensionPoint.i18n.json b/i18n/chs/src/vs/workbench/services/themes/common/colorExtensionPoint.i18n.json
deleted file mode 100644
index 5e33981fbb8..00000000000
--- a/i18n/chs/src/vs/workbench/services/themes/common/colorExtensionPoint.i18n.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"contributes.color": "提供由扩展定义的主题颜色",
-	"contributes.color.id": "主题颜色标识符",
-	"contributes.color.id.format": "标识符应满足 aa[.bb]*",
-	"contributes.color.description": "主题颜色描述",
-	"contributes.defaults.light": "浅色主题的默认颜色。应为十六进制颜色值 (#RRGGBB[AA]) 或是主题颜色标识符，其提供默认值。",
-	"contributes.defaults.dark": "深色主题的默认颜色。应为十六进制颜色值 (#RRGGBB[AA]) 或是主题颜色标识符，其提供默认值。",
-	"contributes.defaults.highContrast": "高对比度主题的默认颜色。应为十六进制颜色值 (#RRGGBB[AA]) 或是主题颜色标识符，其提供默认值。",
-	"invalid.colorConfiguration": "\"configuration.colors\" 必须是数组",
-	"invalid.default.colorType": "{0} 必须为十六进制颜色值 (#RRGGBB[AA] 或 #RGB[A]) 或是主题颜色标识符，其提供默认值。",
-	"invalid.id": "必须定义 \"configuration.colors.id\"，且不能为空",
-	"invalid.id.format": "\"configuration.colors.id\" 必须满足 word[.word]*",
-	"invalid.description": "必须定义 \"configuration.colors.description\"，且不能为空",
-	"invalid.defaults": "必须定义 “configuration.colors.defaults”，且须包含 \"light\"(浅色)、\"dark\"(深色) 和 \"highContrast\"(高对比度)"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/services/themes/common/colorThemeSchema.i18n.json b/i18n/chs/src/vs/workbench/services/themes/common/colorThemeSchema.i18n.json
deleted file mode 100644
index 4d22aba950e..00000000000
--- a/i18n/chs/src/vs/workbench/services/themes/common/colorThemeSchema.i18n.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"schema.token.settings": "标记的颜色和样式。",
-	"schema.token.foreground": "标记的前景色。",
-	"schema.token.background.warning": "暂不支持标记背景色。",
-	"schema.token.fontStyle": "这条规则的字体样式: \"italic\" (斜体)、\"bold\" (粗体)、\"underline\" (下划线) 或是上述的组合。空字符串将清除继承的设置。",
-	"schema.fontStyle.error": "字体样式必须为 \"italic\" (斜体)、\"bold\" (粗体)、\"underline\" (下划线) 、上述的组合或是为空字符串。",
-	"schema.token.fontStyle.none": "无 (清除继承的设置)",
-	"schema.properties.name": "规则的描述。",
-	"schema.properties.scope": "此规则适用的范围选择器。",
-	"schema.tokenColors.path": "tmTheme 文件路径(相对于当前文件)。",
-	"schema.colors": "语法突出显示颜色"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/services/themes/common/fileIconThemeSchema.i18n.json b/i18n/chs/src/vs/workbench/services/themes/common/fileIconThemeSchema.i18n.json
deleted file mode 100644
index 0d1a71b58b8..00000000000
--- a/i18n/chs/src/vs/workbench/services/themes/common/fileIconThemeSchema.i18n.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"schema.folderExpanded": "展开文件夹的文件夹图标。展开文件夹图标是可选的。如果未设置，将显示为文件夹定义的图标。",
-	"schema.folder": "折叠文件夹的文件夹图标，如果未设置 folderExpanded，也指展开文件夹的文件夹图标。",
-	"schema.file": "默认文件图标，针对不与任何扩展名、文件名或语言 ID 匹配的所有文件显示。",
-	"schema.folderNames": "将文件夹名关联到图标。对象键是文件夹名，但不包括任何路径段。不允许任何模式或通配符。文件夹名匹配不区分大小写。",
-	"schema.folderName": "关联的图标定义的 ID。",
-	"schema.folderNamesExpanded": "将文件夹名关联到展开文件夹的图标。对象键是文件夹名，但不包括任何路径段。不允许任何模式或通配符。文件夹名匹配不区分大小写。",
-	"schema.folderNameExpanded": "关联的图标定义的 ID。",
-	"schema.fileExtensions": "将文件扩展名关联到图标。对象键是文件扩展名。扩展名是文件名的最后一个部分，位于最后一个点之后(不包括该点)。比较扩展名时不区分大小写。",
-	"schema.fileExtension": "关联的图标定义的 ID。",
-	"schema.fileNames": "将文件名关联到图标。对象键是完整的文件名，但不包括任何路径段。文件名可以包括句点和可能的文件扩展名。不允许任何模式或通配符。文件名匹配不区分大小写。",
-	"schema.fileName": "关联的图标定义的 ID。",
-	"schema.languageIds": "将语言与图标相关联。对象键是语言贡献点中定义的语言 ID。",
-	"schema.languageId": "关联的图标定义的 ID。",
-	"schema.fonts": "图标定义中使用的字体。",
-	"schema.id": "字体的 ID。",
-	"schema.src": "字体的位置。",
-	"schema.font-path": "相对于当前图标主题文件的字体路径。",
-	"schema.font-format": "字体的格式。",
-	"schema.font-weight": "字体的粗细。",
-	"schema.font-sstyle": "字体的样式。",
-	"schema.font-size": "字体的默认大小。",
-	"schema.iconDefinitions": "将文件关联到图标时可以使用的所有图标的说明。",
-	"schema.iconDefinition": "图标定义。对象键是定义的 ID。",
-	"schema.iconPath": "使用 SVG 或 PNG 时: 到图像的路径。该路径相对于图标设置文件。",
-	"schema.fontCharacter": "使用字形字体时: 要使用的字体中的字符。",
-	"schema.fontColor": "使用字形字体时: 要使用的颜色。",
-	"schema.fontSize": "使用某种字体时: 文本字体的字体大小(以百分比表示)。如果未设置，则默认为字体定义中的大小。",
-	"schema.fontId": "使用某种字体时: 字体的 ID。如果未设置，则默认为第一个字体定义。",
-	"schema.light": "浅色主题中文件图标的可选关联。",
-	"schema.highContrast": "高对比度颜色主题中文件图标的可选关联。",
-	"schema.hidesExplorerArrows": "配置文件资源管理器的箭头是否应在此主题启用时隐藏。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/services/themes/electron-browser/colorThemeData.i18n.json b/i18n/chs/src/vs/workbench/services/themes/electron-browser/colorThemeData.i18n.json
deleted file mode 100644
index fdbbd851c6e..00000000000
--- a/i18n/chs/src/vs/workbench/services/themes/electron-browser/colorThemeData.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"error.cannotparsejson": "分析 JSON 主题文件 {0} 时出现问题",
-	"error.invalidformat.colors": "分析颜色主题文件时出现问题：{0}。属性“colors”不是“object”类型。",
-	"error.invalidformat.tokenColors": "分析颜色主题文件时出现问题：{0}。属性 \"tokenColors\" 应为指定颜色的数组或是指向 TextMate 主题文件的路径",
-	"error.plist.invalidformat": "分析 tmTheme 文件时出现问题：{0}。“settings”不是数组。",
-	"error.cannotparse": "分析 tmTheme 文件时出现问题：{0}",
-	"error.cannotload": "分析 tmTheme 文件 {0} 时出现问题：{1}"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/services/themes/electron-browser/colorThemeStore.i18n.json b/i18n/chs/src/vs/workbench/services/themes/electron-browser/colorThemeStore.i18n.json
deleted file mode 100644
index d77c2cc06df..00000000000
--- a/i18n/chs/src/vs/workbench/services/themes/electron-browser/colorThemeStore.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.contributes.themes": "请提供 TextMate 颜色主题。",
-	"vscode.extension.contributes.themes.id": "用户设置中使用的图标主题的 ID。",
-	"vscode.extension.contributes.themes.label": "颜色主题在界面中的显示名称。",
-	"vscode.extension.contributes.themes.uiTheme": "用于定义编辑器周围颜色的基本主题: \"vs\" 是浅色主题，\"vs-dark\" 是深色主题。\"hc-black\" 是深色高对比度主题。",
-	"vscode.extension.contributes.themes.path": "tmTheme 文件的路径。该路径相对于扩展文件夹，通常为 \"./themes/themeFile.tmTheme\"。",
-	"reqarray": "扩展点“{0}”必须是一个数组。",
-	"reqpath": "“contributes.{0}.path”中应为字符串。提供的值: {1}",
-	"invalid.path.1": "“contributes.{0}.path”({1})应包含在扩展的文件夹({2})内。这可能会使扩展不可移植。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/services/themes/electron-browser/fileIconThemeData.i18n.json b/i18n/chs/src/vs/workbench/services/themes/electron-browser/fileIconThemeData.i18n.json
deleted file mode 100644
index 5e90bdadb26..00000000000
--- a/i18n/chs/src/vs/workbench/services/themes/electron-browser/fileIconThemeData.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"error.cannotparseicontheme": "分析文件图标文件时出现问题: {0}"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/services/themes/electron-browser/fileIconThemeStore.i18n.json b/i18n/chs/src/vs/workbench/services/themes/electron-browser/fileIconThemeStore.i18n.json
deleted file mode 100644
index a8fabec9ee1..00000000000
--- a/i18n/chs/src/vs/workbench/services/themes/electron-browser/fileIconThemeStore.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.contributes.iconThemes": "提供文件图标主题。",
-	"vscode.extension.contributes.iconThemes.id": "用户设置中使用的图标主题的 ID。",
-	"vscode.extension.contributes.iconThemes.label": "在界面中显示的图标主题名称 ",
-	"vscode.extension.contributes.iconThemes.path": "图标主题定义文件的路径。该路径相对于扩展文件夹，通常是 \"./icons/awesome-icon-theme.json\"。",
-	"reqarray": "扩展点“{0}”必须是一个数组。",
-	"reqpath": "“contributes.{0}.path”中应为字符串。提供的值: {1}",
-	"reqid": "contributes.{0}.id\" 中的预期字符串。提供的值: {1}",
-	"invalid.path.1": "“contributes.{0}.path”({1})应包含在扩展的文件夹({2})内。这可能会使扩展不可移植。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json b/i18n/chs/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
deleted file mode 100644
index b8184384917..00000000000
--- a/i18n/chs/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"error.cannotloadtheme": "无法加载 {0}: {1}",
-	"colorTheme": "指定工作台中使用的颜色主题。",
-	"colorThemeError": "主题未知或未安装。",
-	"iconTheme": "指定在工作台中使用的图标主题，或指定 \"null\" 以不显示任何文件图标。",
-	"noIconThemeDesc": "无文件图标",
-	"iconThemeError": "文件图标主题未知或未安装。",
-	"workbenchColors": "覆盖当前所选颜色主题的颜色。",
-	"editorColors.comments": "设置注释的颜色和样式",
-	"editorColors.strings": "设置字符串文本的颜色和样式",
-	"editorColors.keywords": "设置关键字的颜色和样式。",
-	"editorColors.numbers": "设置数字的颜色和样式。",
-	"editorColors.types": "设置类型定义与引用的颜色和样式。",
-	"editorColors.functions": "设置函数定义与引用的颜色和样式。",
-	"editorColors.variables": "设置变量定义和引用的颜色和样式。",
-	"editorColors.textMateRules": "使用 TextMate 主题规则设置颜色和样式(高级)。",
-	"editorColors": "覆盖当前所选颜色主题中的编辑器颜色和字体样式。"
-}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json b/i18n/chs/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json
deleted file mode 100644
index 6495d3ab4d4..00000000000
--- a/i18n/chs/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"errorInvalidTaskConfiguration": "无法写入工作区配置文件。请打开文件以更正错误或警告，然后重试。",
-	"errorWorkspaceConfigurationFileDirty": "文件已变更，因此无法写入工作区配置文件。请先保存此文件，然后重试。",
-	"openWorkspaceConfigurationFile": "打开工作区配置"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/azure-account/out/azure-account.i18n.json b/i18n/cht/extensions/azure-account/out/azure-account.i18n.json
deleted file mode 100644
index fbb65831a11..00000000000
--- a/i18n/cht/extensions/azure-account/out/azure-account.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"azure-account.copyAndOpen": "複製和打開",
-	"azure-account.close": "關閉",
-	"azure-account.login": "登入",
-	"azure-account.loginFirst": "未登入，請先登入。",
-	"azure-account.userCodeFailed": "取得使用者代碼失敗",
-	"azure-account.tokenFailed": "取得權杖與裝置代碼",
-	"azure-account.tokenFromRefreshTokenFailed": "取得權杖與重新整理權杖"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/azure-account/out/extension.i18n.json b/i18n/cht/extensions/azure-account/out/extension.i18n.json
deleted file mode 100644
index 55e65eed602..00000000000
--- a/i18n/cht/extensions/azure-account/out/extension.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"azure-account.loggingIn": "Azure: 正在登入...",
-	"azure-account.loggedIn": "Azure: {0}"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/bat/package.i18n.json b/i18n/cht/extensions/bat/package.i18n.json
deleted file mode 100644
index 79280ede148..00000000000
--- a/i18n/cht/extensions/bat/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Windows Bat 語言基礎知識",
-	"description": "為 Windows 批次檔案提供程式碼片段、語法醒目提示、括弧對應與摺疊功能。"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/clojure/package.i18n.json b/i18n/cht/extensions/clojure/package.i18n.json
deleted file mode 100644
index 9991d30d934..00000000000
--- a/i18n/cht/extensions/clojure/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Clojure 語言基礎知識",
-	"description": "Clojure 檔案中提供語法醒目提示與括號對稱功能"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/coffeescript/package.i18n.json b/i18n/cht/extensions/coffeescript/package.i18n.json
deleted file mode 100644
index 1b93a7c7f85..00000000000
--- a/i18n/cht/extensions/coffeescript/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "CoffeeScript 語言基礎知識",
-	"description": "CoffeeScript 檔案中提供程式碼片段, 語法醒目提示, 括號對稱與可折疊區域功能。"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/configuration-editing/out/extension.i18n.json b/i18n/cht/extensions/configuration-editing/out/extension.i18n.json
deleted file mode 100644
index d53909248a1..00000000000
--- a/i18n/cht/extensions/configuration-editing/out/extension.i18n.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"workspaceFolder": "在 VS Code 中已開啟的資料夾路徑",
-	"workspaceFolderBasename": "在 VS Code 內已開啟的資料夾名稱，不包含任何斜線 (/)",
-	"relativeFile": "目前已開啟與 ${workspaceFolder} 相關的檔案",
-	"file": "目前已開啟的檔案",
-	"cwd": "啟用時工作執行器目前工作目錄",
-	"lineNumber": "在使用中的檔案內目前已選取的行數",
-	"selectedText": "在使用中的檔案內目前已選取的文字",
-	"fileDirname": "目前已開啟檔案的 dirname",
-	"fileExtname": "目前已開啟檔案的副檔名",
-	"fileBasename": "目前已開啟檔案的 basename",
-	"fileBasenameNoExtension": "目前已開啟檔案的 basename，不包含副檔名",
-	"exampleExtension": "範例"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json b/i18n/cht/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json
deleted file mode 100644
index 1bb81e3f679..00000000000
--- a/i18n/cht/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"activeEditorShort": "檔案名稱(例如：myFile.txt)",
-	"activeEditorMedium": "檔案相對於工作區資料夾的相對路徑(例如：myFolder/myFile.txt)",
-	"activeEditorLong": "檔案完整路徑 (例如 /Users/Development/myProject/myFolder/myFile.txt)",
-	"rootName": "工作區名稱 (例如 myFolder or myWorkspace)",
-	"rootPath": "工作區檔案路徑 (例如 /Users/Development/myWorkspace)",
-	"folderName": "包含在工作區內的檔案名稱 (例如 myFolder)",
-	"folderPath": "包含在工作區內的檔案路徑 (例如 /Users/Development/myFolder)",
-	"appName": "例如 VS Code",
-	"dirty": "若使用中的編輯器已變更，即為已變更的指示區",
-	"separator": "條件式分隔符號 (' - ')，只會在前後為具有值的變數時顯示",
-	"assocLabelFile": "檔案副檔名",
-	"assocDescriptionFile": "將檔案名稱符合 Glob 模式的所有檔案，對應到具有指定識別碼的語言。",
-	"assocLabelPath": "檔案路徑",
-	"assocDescriptionPath": "將檔案路徑符合絕對路徑 Glob 模式的所有檔案，對應到具有指定識別碼的語言。",
-	"fileLabel": "依副檔名排列的檔案",
-	"fileDescription": "比對所有具特定副檔名的檔案。",
-	"filesLabel": "具多個副檔名的檔案",
-	"filesDescription": "比對所有具任何副檔名的檔案。",
-	"derivedLabel": "依名稱排列且同層級的檔案",
-	"derivedDescription": "比對名稱相同但副檔名不同的同層級檔案。",
-	"topFolderLabel": "依名稱排列的資料夾 (最上層)",
-	"topFolderDescription": "比對具特定名稱的最上層資料夾。",
-	"topFoldersLabel": "具多個名稱的資料夾 (最上層)",
-	"topFoldersDescription": "比對多個最上層資料夾。",
-	"folderLabel": "依名稱排列的資料夾 (任何位置)",
-	"folderDescription": "在所有位置比對具特定名稱的資料夾。",
-	"falseDescription": "停用模式。",
-	"trueDescription": "啟用模式。",
-	"siblingsDescription": "比對名稱相同但副檔名不同的同層級檔案。",
-	"languageSpecificEditorSettings": "語言專用編輯器設定",
-	"languageSpecificEditorSettingsDescription": "針對語言覆寫編輯器設定"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/configuration-editing/package.i18n.json b/i18n/cht/extensions/configuration-editing/package.i18n.json
deleted file mode 100644
index 51eef8b7349..00000000000
--- a/i18n/cht/extensions/configuration-editing/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "編輯設定值",
-	"description": "在設定、啟動及延伸模組建議檔案等組態檔中，提供進階 IntelliSense 及自動修正等功能。"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/cpp/package.i18n.json b/i18n/cht/extensions/cpp/package.i18n.json
deleted file mode 100644
index dc69428b234..00000000000
--- a/i18n/cht/extensions/cpp/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "C/C++ 語言基礎知識",
-	"description": "為 C/C++ 檔案提供程式碼片段、語法醒目提示、括弧對應與摺疊功能。"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/csharp/package.i18n.json b/i18n/cht/extensions/csharp/package.i18n.json
deleted file mode 100644
index 07da1d6a537..00000000000
--- a/i18n/cht/extensions/csharp/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "C# 語言基礎知識",
-	"description": "為 C# 檔案提供程式碼片段、語法醒目提示、括弧對應與摺疊功能。"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/css-language-features/client/out/cssMain.i18n.json b/i18n/cht/extensions/css-language-features/client/out/cssMain.i18n.json
deleted file mode 100644
index 8d5e76dfac0..00000000000
--- a/i18n/cht/extensions/css-language-features/client/out/cssMain.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"cssserver.name": "CSS 語言伺服器",
-	"folding.start": "摺疊區域開始",
-	"folding.end": "摺疊區域結束"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/css-language-features/package.i18n.json b/i18n/cht/extensions/css-language-features/package.i18n.json
deleted file mode 100644
index d40f448f342..00000000000
--- a/i18n/cht/extensions/css-language-features/package.i18n.json
+++ /dev/null
@@ -1,81 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "CSS 語言功能",
-	"description": "為 CSS, LESS 和 SCSS 檔案提供豐富的語言支援 ",
-	"css.title": "CSS",
-	"css.lint.argumentsInColorFunction.desc": "參數數目無效",
-	"css.lint.boxModel.desc": "使用填補或框線時不要使用寬度或高度。",
-	"css.lint.compatibleVendorPrefixes.desc": "在使用廠商專屬的前置詞時，請確定也包括其他所有的廠商特定屬性。",
-	"css.lint.duplicateProperties.desc": "請勿使用重複的樣式定義",
-	"css.lint.emptyRules.desc": "請勿使用空白規則集",
-	"css.lint.float.desc": "避免使用 'float'。浮動會使 CSS 脆弱，在版面配置的任一層面改變時容易中斷。",
-	"css.lint.fontFaceProperties.desc": "@font-face 規則必須定義 'src' 和 'font-family' 屬性",
-	"css.lint.hexColorLength.desc": "十六進位色彩必須由三個或六個十六進位數字組成",
-	"css.lint.idSelector.desc": "選取器不應包含 ID，因為這些規則與 HTML 結合過於緊密。",
-	"css.lint.ieHack.desc": "只有在支援 IE7 及更舊的版本時才需要 IE Hack",
-	"css.lint.important.desc": "避免使用 !important。這表示整個 CSS 的明確性皆失控，需要重構。",
-	"css.lint.importStatement.desc": "匯入陳述式不會平行載入",
-	"css.lint.propertyIgnoredDueToDisplay.desc": "屬性因顯示而忽略。例如，若為 'display: inline'，則 width、height、margin-top、margin-bottom 以及 float 屬性就不會有任何作用。",
-	"css.lint.universalSelector.desc": "已知通用選取器 (*) 速度緩慢",
-	"css.lint.unknownProperties.desc": "未知的屬性。",
-	"css.lint.unknownVendorSpecificProperties.desc": "未知的廠商特定屬性。",
-	"css.lint.vendorPrefix.desc": "在使用廠商專屬的前置詞時，也包括標準屬性。",
-	"css.lint.zeroUnits.desc": "零不需要任何單位",
-	"css.trace.server.desc": "追蹤 VS Code 與 CSS 語言伺服器之間的通訊。",
-	"css.validate.title": "控制 CSS 驗證與問題嚴重性。",
-	"css.validate.desc": "啟用或停用所有驗證",
-	"less.title": "LESS",
-	"less.lint.argumentsInColorFunction.desc": "參數數目無效",
-	"less.lint.boxModel.desc": "使用填補或框線時不要使用寬度或高度。",
-	"less.lint.compatibleVendorPrefixes.desc": "在使用廠商專屬的前置詞時，請確定也包括其他所有的廠商特定屬性。",
-	"less.lint.duplicateProperties.desc": "請勿使用重複的樣式定義",
-	"less.lint.emptyRules.desc": "請勿使用空白規則集",
-	"less.lint.float.desc": "避免使用 'float'。浮動會使 CSS 脆弱，在版面配置的任一層面改變時容易中斷。",
-	"less.lint.fontFaceProperties.desc": "@font-face 規則必須定義 'src' 和 'font-family' 屬性",
-	"less.lint.hexColorLength.desc": "十六進位色彩必須由三個或六個十六進位數字組成",
-	"less.lint.idSelector.desc": "選取器不應包含 ID，因為這些規則與 HTML 結合過於緊密。",
-	"less.lint.ieHack.desc": "只有在支援 IE7 及更舊的版本時才需要 IE Hack",
-	"less.lint.important.desc": "避免使用 !important。這表示整個 CSS 的明確性皆失控，需要重構。",
-	"less.lint.importStatement.desc": "匯入陳述式不會平行載入",
-	"less.lint.propertyIgnoredDueToDisplay.desc": "屬性因顯示而忽略。例如，若為 'display: inline'，則 width、height、margin-top、margin-bottom 以及 float 屬性就不會有任何作用。",
-	"less.lint.universalSelector.desc": "已知通用選取器 (*) 速度緩慢",
-	"less.lint.unknownProperties.desc": "未知的屬性。",
-	"less.lint.unknownVendorSpecificProperties.desc": "未知的廠商特定屬性。",
-	"less.lint.vendorPrefix.desc": "在使用廠商專屬的前置詞時，也包括標準屬性。",
-	"less.lint.zeroUnits.desc": "零不需要任何單位",
-	"less.validate.title": "控制 LESS 驗證與問題嚴重性。",
-	"less.validate.desc": "啟用或停用所有驗證",
-	"scss.title": "SCSS (Sass)",
-	"scss.lint.argumentsInColorFunction.desc": "參數數目無效",
-	"scss.lint.boxModel.desc": "使用填補或框線時不要使用寬度或高度。",
-	"scss.lint.compatibleVendorPrefixes.desc": "在使用廠商專屬的前置詞時，請確定也包括其他所有的廠商特定屬性。",
-	"scss.lint.duplicateProperties.desc": "請勿使用重複的樣式定義",
-	"scss.lint.emptyRules.desc": "請勿使用空白規則集",
-	"scss.lint.float.desc": "避免使用 'float'。浮動會使 CSS 脆弱，在版面配置的任一層面改變時容易中斷。",
-	"scss.lint.fontFaceProperties.desc": "@font-face 規則必須定義 'src' 和 'font-family' 屬性",
-	"scss.lint.hexColorLength.desc": "十六進位色彩必須由三個或六個十六進位數字組成",
-	"scss.lint.idSelector.desc": "選取器不應包含 ID，因為這些規則與 HTML 結合過於緊密。",
-	"scss.lint.ieHack.desc": "只有在支援 IE7 及更舊的版本時才需要 IE Hack",
-	"scss.lint.important.desc": "避免使用 !important。這表示整個 CSS 的明確性皆失控，需要重構。",
-	"scss.lint.importStatement.desc": "匯入陳述式不會平行載入",
-	"scss.lint.propertyIgnoredDueToDisplay.desc": "屬性因顯示而忽略。例如，若為 'display: inline'，則 width、height、margin-top、margin-bottom 以及 float 屬性就不會有任何作用。",
-	"scss.lint.universalSelector.desc": "已知通用選取器 (*) 速度緩慢",
-	"scss.lint.unknownProperties.desc": "未知的屬性。",
-	"scss.lint.unknownVendorSpecificProperties.desc": "未知的廠商特定屬性。",
-	"scss.lint.vendorPrefix.desc": "在使用廠商專屬的前置詞時，也包括標準屬性。",
-	"scss.lint.zeroUnits.desc": "零不需要任何單位",
-	"scss.validate.title": "控制 SCSS 驗證與問題嚴重性。",
-	"scss.validate.desc": "啟用或停用所有驗證",
-	"less.colorDecorators.enable.desc": "啟用或停用彩色裝飾項目",
-	"scss.colorDecorators.enable.desc": "啟用或停用彩色裝飾項目",
-	"css.colorDecorators.enable.desc": "啟用或停用彩色裝飾項目",
-	"css.colorDecorators.enable.deprecationMessage": "設定 `css.colorDecorators.enable` 已淘汰，改為 `editor.colorDecorators`。",
-	"scss.colorDecorators.enable.deprecationMessage": "設定 `scss.colorDecorators.enable` 已淘汰，改為 `editor.colorDecorators`。",
-	"less.colorDecorators.enable.deprecationMessage": "設定 `less.colorDecorators.enable` 已淘汰，改為 `editor.colorDecorators`。"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/css/client/out/cssMain.i18n.json b/i18n/cht/extensions/css/client/out/cssMain.i18n.json
deleted file mode 100644
index 8d5e76dfac0..00000000000
--- a/i18n/cht/extensions/css/client/out/cssMain.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"cssserver.name": "CSS 語言伺服器",
-	"folding.start": "摺疊區域開始",
-	"folding.end": "摺疊區域結束"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/css/package.i18n.json b/i18n/cht/extensions/css/package.i18n.json
deleted file mode 100644
index 3b83a3b860e..00000000000
--- a/i18n/cht/extensions/css/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "CSS 語言基礎知識",
-	"description": "為 CSS、LESS 與 SCSS 檔案提供語法醒目提示與括弧對應功能。"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/diff/package.i18n.json b/i18n/cht/extensions/diff/package.i18n.json
deleted file mode 100644
index a2060291ce3..00000000000
--- a/i18n/cht/extensions/diff/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Diff File 語言功能",
-	"description": "Diff File 檔案中提供語法醒目提示, 括號對稱與其他語言功能"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/docker/package.i18n.json b/i18n/cht/extensions/docker/package.i18n.json
deleted file mode 100644
index fe17e5f0a6d..00000000000
--- a/i18n/cht/extensions/docker/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Docker 語言基礎知識",
-	"description": "為 Docker 檔案提供語法醒目提示及括弧對應功能。"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/emmet/package.i18n.json b/i18n/cht/extensions/emmet/package.i18n.json
deleted file mode 100644
index b3dc8be8bb9..00000000000
--- a/i18n/cht/extensions/emmet/package.i18n.json
+++ /dev/null
@@ -1,65 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"description": "VS Code 的 Emnet 支援",
-	"command.wrapWithAbbreviation": "使用縮寫換行",
-	"command.wrapIndividualLinesWithAbbreviation": "使用縮寫換每一行",
-	"command.removeTag": "移除標籤",
-	"command.updateTag": "更新標記",
-	"command.matchTag": "前往相符的配對",
-	"command.balanceIn": "平衡(向內)",
-	"command.balanceOut": "平衡(向外)",
-	"command.prevEditPoint": "移至上一個編輯端點",
-	"command.nextEditPoint": "移至下一個編輯端點",
-	"command.mergeLines": "合併行",
-	"command.selectPrevItem": "選取上一個項目",
-	"command.selectNextItem": "選取下一個項目",
-	"command.splitJoinTag": "分割/聯結標記",
-	"command.toggleComment": "切換註解",
-	"command.evaluateMathExpression": "評估數學運算式",
-	"command.updateImageSize": "更新影像大小",
-	"command.reflectCSSValue": "反射 CSS 值",
-	"command.incrementNumberByOne": "依 1 遞增",
-	"command.decrementNumberByOne": "依 1 遞減",
-	"command.incrementNumberByOneTenth": "依 0.1 遞增",
-	"command.decrementNumberByOneTenth": "依 0.1 遞減",
-	"command.incrementNumberByTen": "依 10 遞增",
-	"command.decrementNumberByTen": "依 10 遞減",
-	"emmetSyntaxProfiles": "為指定的語法定義設定檔，或透過特定規則使用自己的設定檔。",
-	"emmetExclude": "不應展開 Emmet 縮寫的語言陣列。",
-	"emmetExtensionsPath": "包含 Emmet 設定檔及程式碼片段的資料夾路徑",
-	"emmetShowExpandedAbbreviation": "顯示建議之展開的 Emmet 縮寫。\n\"inMarkupAndStylesheetFilesOnly\" 選項適用於 html、haml、jade、slim、xml、xsl、css、scss、sass、less 和 stylus。\n不論 markup/css 為何，該選項「一律」適用於檔案的所有部分。",
-	"emmetShowAbbreviationSuggestions": "顯示建議可能的 Emmet 縮寫。但在樣式表內或 emmet.showExpandedAbbreviation 設為「永不」時，則不適用。",
-	"emmetIncludeLanguages": "以預設未支援的語言啟用 Emmet 縮寫。在此新增該語言和 Emmet 支援的語言間之對應。\n例如: {\"vue-html\": \"html\", \"javascript\": \"javascriptreact\"} ",
-	"emmetVariables": "在 Emmet 程式碼片段中使用的變數",
-	"emmetTriggerExpansionOnTab": "啟用時，按下 Tab 鍵即可展開 Emmet 縮寫。",
-	"emmetPreferences": "喜好設定，用以修改某些動作的行為及 Emmet 的解析程式。",
-	"emmetPreferencesIntUnit": "整數值的預設單位",
-	"emmetPreferencesFloatUnit": "浮點值的預設單位",
-	"emmetPreferencesCssAfter": "展開 CSS 縮寫時，要放在 CSS 屬性結尾的符號 ",
-	"emmetPreferencesSassAfter": "在 SASS 檔案中展開 CSS 縮寫時，要放在 CSS 屬性結尾的符號",
-	"emmetPreferencesStylusAfter": "在手寫筆檔案中展開 CSS 縮寫時，要放在 CSS 屬性結尾的符號",
-	"emmetPreferencesCssBetween": "展開 CSS 縮寫時，要放在 CSS 屬性與值之間的符號",
-	"emmetPreferencesSassBetween": "在 SASS 檔案中展開 CSS 縮寫時，要放在 CSS 屬性與值之間的符號",
-	"emmetPreferencesStylusBetween": "在手寫筆檔案中展開 CSS 縮寫時，要放在 CSS 屬性與值之間的符號",
-	"emmetShowSuggestionsAsSnippets": "若為 true，則 Emmet 建議會顯示為程式碼片段，可讓您在每個 editor.snippetSuggestions 設定為其排序。",
-	"emmetPreferencesBemElementSeparator": "使用 BEM 篩選時用於類別的元素分隔符號",
-	"emmetPreferencesBemModifierSeparator": "使用 BEM 篩選時用於類別的修飾詞分隔符號",
-	"emmetPreferencesFilterCommentBefore": "套用註解篩選時必須置於相符元素前的註解定義。",
-	"emmetPreferencesFilterCommentAfter": "套用註解篩選時必須置於相符元素後的註解定義。 ",
-	"emmetPreferencesFilterCommentTrigger": "必須採用縮寫以套用註解篩選的屬性名稱逗點分隔清單",
-	"emmetPreferencesFormatNoIndentTags": "陣列的標籤名稱不應向內縮排",
-	"emmetPreferencesFormatForceIndentTags": "陣列的標籤名稱應總是向內縮排",
-	"emmetPreferencesAllowCompactBoolean": "若為 true，則生成布林屬性的嚴謹表示法",
-	"emmetPreferencesCssWebkitProperties": "在以 `-` 開頭的 Emmet 縮寫中使用時，會取得 'webkit' 廠商前綴的逗點分隔 CSS 屬性。設定為空白字串可避免總是取得 'webkit' 前綴。",
-	"emmetPreferencesCssMozProperties": "在以 `-` 開頭的 Emmet 縮寫中使用時，會取得 'moz' 廠商前綴的逗點分隔 CSS 屬性。設定為空白字串可避免總是取得 'moz' 前綴。",
-	"emmetPreferencesCssOProperties": "在以 `-` 開頭的 Emmet 縮寫中使用時，會取得 'o' 廠商前綴的逗點分隔 CSS 屬性。設定為空白字串可避免總是取得 'o' 前綴。",
-	"emmetPreferencesCssMsProperties": "在以 `-` 開頭的 Emmet 縮寫中使用時，會取得 'ms' 廠商前綴的逗點分隔 CSS 屬性。設定為空白字串可避免總是取得 'ms' 前綴。",
-	"emmetPreferencesCssFuzzySearchMinScore": "模糊比對的縮寫應該達到最低分數(從 0 到 1)。較低數值可能產生錯誤的比對，較高的數值可能會降低可能的比對。",
-	"emmetOptimizeStylesheetParsing": "當設定為 false 時，將解析整個檔案以確定目前的位置是否適用於展開 Emmet 縮寫。當設定為 true 時，僅會解析 css/scss/less 檔案中目前位置周圍的內容。"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/extension-editing/out/extensionLinter.i18n.json b/i18n/cht/extensions/extension-editing/out/extensionLinter.i18n.json
deleted file mode 100644
index 67c98d58805..00000000000
--- a/i18n/cht/extensions/extension-editing/out/extensionLinter.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"httpsRequired": "影像必須使用 HTTPS 通訊協定。",
-	"svgsNotValid": "SVGs 不是有效的影像來源。",
-	"embeddedSvgsNotValid": "內嵌 SVGs 不是有效的影像來源。",
-	"dataUrlsNotValid": "資料 URL 不是有效的影像來源。",
-	"relativeUrlRequiresHttpsRepository": "相對影像 URL 必須在 package.json 中指定使用 HTTPS 通訊協定的存放庫。",
-	"relativeIconUrlRequiresHttpsRepository": "圖示必須在 package.json 中指定使用 HTTPS 通訊協定的存放庫。",
-	"relativeBadgeUrlRequiresHttpsRepository": "相對徽章 URL 必須在 package.json 中指定使用 HTTPS 通訊協定的存放庫。"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/extension-editing/out/packageDocumentHelper.i18n.json b/i18n/cht/extensions/extension-editing/out/packageDocumentHelper.i18n.json
deleted file mode 100644
index 0914fa17e4e..00000000000
--- a/i18n/cht/extensions/extension-editing/out/packageDocumentHelper.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"languageSpecificEditorSettings": "語言專用編輯器設定",
-	"languageSpecificEditorSettingsDescription": "針對語言覆寫編輯器設定"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/extension-editing/package.i18n.json b/i18n/cht/extensions/extension-editing/package.i18n.json
deleted file mode 100644
index 5e12b75c197..00000000000
--- a/i18n/cht/extensions/extension-editing/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "套件檔案編輯",
-	"description": "為 package.json 檔案提供 VS Code 的 IntelliSense 擴充點與 lint 功能。"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/fsharp/package.i18n.json b/i18n/cht/extensions/fsharp/package.i18n.json
deleted file mode 100644
index a9f68dc906b..00000000000
--- a/i18n/cht/extensions/fsharp/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "F# 語言基礎知識",
-	"description": "為 F# 檔案提供程式碼片段、語法醒目提示、括弧對應與摺疊功能。"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/git/out/askpass-main.i18n.json b/i18n/cht/extensions/git/out/askpass-main.i18n.json
deleted file mode 100644
index e205315d101..00000000000
--- a/i18n/cht/extensions/git/out/askpass-main.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"missOrInvalid": "缺少認證或其無效。"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/git/out/autofetch.i18n.json b/i18n/cht/extensions/git/out/autofetch.i18n.json
deleted file mode 100644
index 15e10683f31..00000000000
--- a/i18n/cht/extensions/git/out/autofetch.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"yes": "是",
-	"no": "否",
-	"not now": "稍後詢問我",
-	"suggest auto fetch": "您希望 Code [定期執行 'git fetch']({0}) 嗎?"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/git/out/commands.i18n.json b/i18n/cht/extensions/git/out/commands.i18n.json
deleted file mode 100644
index f99c465da1e..00000000000
--- a/i18n/cht/extensions/git/out/commands.i18n.json
+++ /dev/null
@@ -1,91 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"tag at": "位於 {0} 的標記",
-	"remote branch at": "位於 {0} 的遠端分支",
-	"create branch": "$(plus) 建立新的分支",
-	"repourl": "儲存庫 URL",
-	"selectFolder": "選擇儲存庫位置",
-	"cloning": "正在複製 git 存放庫 '{0}'...",
-	"proposeopen": "要開啟複製的儲存庫嗎?",
-	"openrepo": "開啟儲存庫",
-	"add": "新增到工作區",
-	"proposeopen2": "要開啟以複製的儲存庫, 或將其新增到目前工作區？",
-	"init": "選擇工作區資料夾以初始化 git 儲存庫",
-	"init repo": "初始化儲存庫",
-	"create repo": "初始化儲存庫",
-	"are you sure": "這會建立一個 Git 儲存庫在 '{0}'。確定要繼續嗎？",
-	"HEAD not available": "'{0}' 的 HEAD 版本無法使用。",
-	"confirm stage files with merge conflicts": "確定要暫存 {0} 個有合併衝突的檔案嗎?",
-	"confirm stage file with merge conflicts": "確定要暫存有合併衝突的 {0} 嗎?",
-	"yes": "是",
-	"confirm revert": "確定要還原您在 {0} 中選取的變更嗎?",
-	"revert": "還原變更",
-	"discard": "捨棄變更",
-	"confirm delete": "您確定要刪除'{0}'嗎?",
-	"delete file": "刪除檔案",
-	"confirm discard": "確定要捨棄 {0} 中的變更嗎?",
-	"confirm discard multiple": "確定要捨棄 {0} 檔案中的變更嗎?",
-	"warn untracked": "這會刪除 {0} 個未追蹤的檔案！",
-	"confirm discard all single": "確定要捨棄 {0} 中的變更嗎?",
-	"confirm discard all": "確定要捨棄在 {0} 個檔案中的所有變更嗎? 此動作無法復原! 您會永遠失去目前的工作集。",
-	"discardAll multiple": "捨棄1個檔案",
-	"discardAll": "捨棄所有 {0} 檔案",
-	"confirm delete multiple": "確定要刪除 {0} 個檔案嗎?",
-	"delete files": "刪除檔案",
-	"there are untracked files single": "下列未追蹤檔案若被捨棄，將會從磁碟中刪除: {0}。",
-	"there are untracked files": "有 {0} 個未追蹤檔案若被捨棄，將會從磁碟中刪除。",
-	"confirm discard all 2": "{0}\n\n這項動作無法復原，您會永久失去目前的工作集。",
-	"yes discard tracked": "捨棄 1 個追蹤的檔案",
-	"yes discard tracked multiple": "捨棄 {0} 個追蹤的檔案",
-	"unsaved files single": "下列檔案尚未儲存： {0}。\n\n您要在認可之前進行儲存嗎？",
-	"unsaved files": "有 {0} 個未儲存檔案。\n\n您要在認可之前進行儲存嗎？",
-	"save and commit": "儲存全部且認可",
-	"commit": "無論如何仍認可",
-	"no staged changes": "沒有暫存變更進行提交\n\n您希望自動暫存您所有變更並直接提交?",
-	"always": "永遠",
-	"no changes": "沒有任何變更要認可。",
-	"commit message": "認可訊息",
-	"provide commit message": "請提供認可訊息",
-	"select a ref to checkout": "選擇參考進行簽出",
-	"branch name": "分支名稱",
-	"provide branch name": "請提供分支名稱",
-	"select branch to delete": "選擇分支進行刪除",
-	"confirm force delete branch": "分支 '{0}' 尚未完整合併. 確定刪除嗎?",
-	"delete branch": "刪除分支",
-	"invalid branch name": "分支名稱無效",
-	"branch already exists": "分支名稱 '{0}' 已經存在",
-	"select a branch to merge from": "選擇要合併的分支。",
-	"merge conflicts": "合併衝突。提交前請解決衝突。",
-	"tag name": "標籤名稱",
-	"provide tag name": "請提供標籤名稱",
-	"tag message": "訊息",
-	"provide tag message": "請提供訊息以標註標籤",
-	"no remotes to fetch": "您的儲存庫未設定要擷取的遠端來源。",
-	"no remotes to pull": "您的儲存庫未設定要提取的遠端來源。",
-	"pick remote pull repo": "挑選要將分支提取出的遠端",
-	"no remotes to push": "您的儲存庫未設定要推送的遠端目標。",
-	"nobranch": "請簽出分支以推送到遠端。",
-	"confirm publish branch": "分支 '{0}' 沒有任何上游分支。 您仍想發布這個分支嗎？",
-	"ok": "確定",
-	"push with tags success": "已成功使用標籤推送。",
-	"pick remote": "挑選要發行分支 '{0}' 的目標遠端:",
-	"sync is unpredictable": "此動作會推送認可至`{0}/{1}`並從中提取認可。",
-	"never again": "確定，不要再顯示",
-	"no remotes to publish": "您的儲存庫未設定要發行的遠端目標。",
-	"no changes stash": "沒有變更可供隱藏。",
-	"provide stash message": "可選擇提供隱藏訊息",
-	"stash message": "隱藏訊息",
-	"no stashes": "沒有要隱藏可供還原。",
-	"pick stash to pop": "請挑選要快顯的隱藏",
-	"clean repo": "請先清除您的本地儲存庫工作區再簽出。",
-	"cant push": "無法將參考推送到遠端。請先嘗試執行 '提取' 以整合您的變更。",
-	"git error details": "Git: {0}",
-	"git error": "Git 錯誤",
-	"open git log": "開啟 Git 記錄"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/git/out/main.i18n.json b/i18n/cht/extensions/git/out/main.i18n.json
deleted file mode 100644
index ca5e23909a4..00000000000
--- a/i18n/cht/extensions/git/out/main.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"looking": "尋找 git : {0}",
-	"using git": "正在使用來自 {1} 的 git {0}",
-	"downloadgit": "下載 Git",
-	"neverShowAgain": "不要再顯示",
-	"notfound": "找不到 Git。安裝它或使用 \"git. path\" 設置。",
-	"updateGit": "更新 Git",
-	"git20": "您似乎已安裝 Git {0}。Code 搭配 Git >= 2 的執行效果最佳"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/git/out/model.i18n.json b/i18n/cht/extensions/git/out/model.i18n.json
deleted file mode 100644
index 9d0c6873465..00000000000
--- a/i18n/cht/extensions/git/out/model.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"too many submodules": "'{0}' 存放庫有 {1} 個無法自動開啟的子模組。您仍可在其中開啟檔案來個別開啟子模組。",
-	"no repositories": "沒有存放庫可供使用",
-	"pick repo": "請選擇存放庫"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/git/out/repository.i18n.json b/i18n/cht/extensions/git/out/repository.i18n.json
deleted file mode 100644
index a54587b5b75..00000000000
--- a/i18n/cht/extensions/git/out/repository.i18n.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"open": "開啟",
-	"index modified": "已修改索引",
-	"modified": "已修改",
-	"index added": "已新增索引",
-	"index deleted": "已刪除索引",
-	"deleted": "已刪除",
-	"index renamed": "已重新命名索引",
-	"index copied": "已複製索引",
-	"untracked": "已取消追蹤",
-	"ignored": "已忽略",
-	"both deleted": "皆已刪除",
-	"added by us": "已由我們新增",
-	"deleted by them": "已受到他們刪除",
-	"added by them": "已由他們新增",
-	"deleted by us": "已受到我們刪除",
-	"both added": "皆已新增",
-	"both modified": "皆已修改",
-	"commitMessage": "訊息 (按 {0} 以認可)",
-	"commit": "認可",
-	"merge changes": "合併變更",
-	"staged changes": "暫存的變更",
-	"changes": "變更",
-	"commitMessageCountdown": "在目前行數剩餘 {0} 個字元",
-	"commitMessageWarning": "在目前行數有 {0} 個字元已超過 {1} 個",
-	"neveragain": "不要再顯示",
-	"huge": "位於 '{0}' 的 Git 儲存庫有過多使用中的變更，只有部份 Git 功能會被啟用。"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/git/out/scmProvider.i18n.json b/i18n/cht/extensions/git/out/scmProvider.i18n.json
deleted file mode 100644
index e71dab52f4e..00000000000
--- a/i18n/cht/extensions/git/out/scmProvider.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"commit": "認可"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/git/out/statusbar.i18n.json b/i18n/cht/extensions/git/out/statusbar.i18n.json
deleted file mode 100644
index b271390645e..00000000000
--- a/i18n/cht/extensions/git/out/statusbar.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"checkout": "簽出...",
-	"sync changes": "同步處理變更",
-	"publish changes": "發行變更",
-	"syncing changes": "正在同步處理變更..."
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/git/package.i18n.json b/i18n/cht/extensions/git/package.i18n.json
deleted file mode 100644
index bc042cb15d8..00000000000
--- a/i18n/cht/extensions/git/package.i18n.json
+++ /dev/null
@@ -1,87 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Git",
-	"description": "Git SCM 整合",
-	"command.clone": "複製",
-	"command.init": "初始化儲存庫",
-	"command.close": "關閉存放庫",
-	"command.refresh": "重新整理",
-	"command.openChange": "開啟變更",
-	"command.openFile": "開啟檔案",
-	"command.openHEADFile": "開啟檔案 (HEAD)",
-	"command.stage": "暫存變更",
-	"command.stageAll": "暫存所有變更",
-	"command.stageSelectedRanges": "暫存選取的範圍",
-	"command.revertSelectedRanges": "還原選取的範圍",
-	"command.stageChange": "暫存變更",
-	"command.revertChange": "還原變更",
-	"command.unstage": "取消暫存變更",
-	"command.unstageAll": "取消暫存所有變更",
-	"command.unstageSelectedRanges": "取消暫存選取的範圍",
-	"command.clean": "捨棄變更",
-	"command.cleanAll": "捨棄所有變更",
-	"command.commit": "Commit",
-	"command.commitStaged": "認可暫存",
-	"command.commitStagedSigned": "認可暫存 (已簽章)",
-	"command.commitStagedAmend": "認可暫存 (修改)",
-	"command.commitAll": "全部認可",
-	"command.commitAllSigned": "全部認可 (已簽章)",
-	"command.commitAllAmend": "全部認可(修改)",
-	"command.undoCommit": "復原上次認可",
-	"command.checkout": "簽出至...",
-	"command.branch": "建立分支...",
-	"command.deleteBranch": "刪除分支...",
-	"command.renameBranch": "重新命名分支...",
-	"command.merge": "合併分支...",
-	"command.createTag": "建立標籤",
-	"command.fetch": "擷取",
-	"command.pull": "提取",
-	"command.pullRebase": "提取 (重訂基底)",
-	"command.pullFrom": "從...提取",
-	"command.push": "推送",
-	"command.pushTo": "推送至...",
-	"command.pushWithTags": "使用標籤推送",
-	"command.sync": "同步處理",
-	"command.syncRebase": "同步 (重定基底)",
-	"command.publish": "發行分支",
-	"command.showOutput": "顯示 Git 輸出",
-	"command.ignore": "將檔案新增到 .gitignore",
-	"command.stashIncludeUntracked": "隱藏 (包含未被追蹤的檔案)",
-	"command.stash": "隱藏",
-	"command.stashPop": "快顯隱藏...",
-	"command.stashPopLatest": "快顯上一次的隱藏",
-	"config.enabled": "是否啟用 GIT",
-	"config.path": "Git 可執行檔的路徑",
-	"config.autoRepositoryDetection": "是否自動偵測儲存庫",
-	"config.autorefresh": "是否啟用自動重新整理",
-	"config.autofetch": "是否啟用自動擷取",
-	"config.enableLongCommitWarning": "是否發出長認可訊息的警告",
-	"config.confirmSync": "請先確認再同步處理 GIT 存放庫",
-	"config.countBadge": "控制 git 徽章計數器。[全部] 會計算所有變更。[已追蹤] 只會計算追蹤的變更。[關閉] 會將其關閉。",
-	"config.checkoutType": "控制在執行 [簽出至...] 時，會列出哪些類型的分支。[全部] 會顯示所有參考，[本機] 只會顯示本機分支，[標籤] 只會顯示標籤，以及 [遠端] 只會顯示遠端分支。",
-	"config.ignoreLegacyWarning": "略過舊的 Git 警告",
-	"config.ignoreMissingGitWarning": "忽略遺漏 Git 時的警告",
-	"config.ignoreLimitWarning": "當儲存庫中有過多變更時，略過警告。",
-	"config.defaultCloneDirectory": "複製 Git 儲存庫的預設位置",
-	"config.enableSmartCommit": "無暫存變更時提交所有變更。",
-	"config.enableCommitSigning": "啟用 GPG 認可簽署。",
-	"config.discardAllScope": "控制 `Discard all changes` 命令會捨棄的變更。`all` 會捨棄所有變更。`tracked` 只會捨棄追蹤的檔案。`prompt` 會在每次動作執行時顯示提示對話方塊。",
-	"config.decorations.enabled": "控制 Git 是否提供色彩及徽章給總管及開啟編輯器視窗。",
-	"config.promptToSaveFilesBeforeCommit": "控制Git是否應該在提交之前檢查未儲存的檔案。",
-	"config.showInlineOpenFileAction": "控制是否在Git變更列表中的檔名旁顯示“開啟檔案”的動作按鈕。",
-	"config.inputValidation": "控制何時顯示認可訊息輸入驗證。",
-	"config.detectSubmodules": "控制是否自動偵測 Git 子模組。",
-	"config.detectSubmodulesLimit": "控制 Git 子模組的偵測限制",
-	"colors.modified": "修改資源的顏色。",
-	"colors.deleted": "刪除資源的顏色",
-	"colors.untracked": "未追蹤資源的顏色。",
-	"colors.ignored": "忽略資源的顏色。",
-	"colors.conflict": "帶有衝突資源的顏色。",
-	"colors.submodule": "子模組資源的顏色"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/go/package.i18n.json b/i18n/cht/extensions/go/package.i18n.json
deleted file mode 100644
index 73a4b98fcd8..00000000000
--- a/i18n/cht/extensions/go/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Go 語言基礎知識",
-	"description": "為 Go 檔案提供語法醒目提示與括弧對應功能。"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/groovy/package.i18n.json b/i18n/cht/extensions/groovy/package.i18n.json
deleted file mode 100644
index fd6857a06bb..00000000000
--- a/i18n/cht/extensions/groovy/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Grovy 語言基礎知識",
-	"description": "為 Groovy 檔案提供程式碼片段、語法醒目提示及括弧對應功能。"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/grunt/out/main.i18n.json b/i18n/cht/extensions/grunt/out/main.i18n.json
deleted file mode 100644
index 6c79bed1711..00000000000
--- a/i18n/cht/extensions/grunt/out/main.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"execFailed": "Grunt 在資料夾 {0} 的自動偵測失敗。錯誤: {1}"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/grunt/package.i18n.json b/i18n/cht/extensions/grunt/package.i18n.json
deleted file mode 100644
index fd12a801508..00000000000
--- a/i18n/cht/extensions/grunt/package.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"description": "將 Grunt 功能新增至 VSCode 的延伸模組。",
-	"displayName": "VSCode 的 Grunt 支援",
-	"config.grunt.autoDetect": "控制 Grunt 工作的自動偵測為開啟或關閉。預設為開。",
-	"grunt.taskDefinition.type.description": "要自訂的 Grunt 支援。",
-	"grunt.taskDefinition.file.description": "提供工作的 Grunt 檔案。可以省略。"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/gulp/out/main.i18n.json b/i18n/cht/extensions/gulp/out/main.i18n.json
deleted file mode 100644
index 23577c6bf9c..00000000000
--- a/i18n/cht/extensions/gulp/out/main.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"execFailed": "Gulp 在資料夾 {0} 的自動偵測失敗。錯誤: {1}"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/gulp/package.i18n.json b/i18n/cht/extensions/gulp/package.i18n.json
deleted file mode 100644
index e3349fbbfdd..00000000000
--- a/i18n/cht/extensions/gulp/package.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"description": "將 Gulp 功能新增至 VSCode 的延伸模組。",
-	"displayName": "VSCode 的 Gulp 支援。",
-	"config.gulp.autoDetect": "控制 Gulp 工作的自動偵測為開啟或關閉。預設為開。",
-	"gulp.taskDefinition.type.description": "要自訂的 Gulp 工作。",
-	"gulp.taskDefinition.file.description": "提供工作的 Gulp 檔案。可以省略。"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/handlebars/package.i18n.json b/i18n/cht/extensions/handlebars/package.i18n.json
deleted file mode 100644
index 6e3e815769a..00000000000
--- a/i18n/cht/extensions/handlebars/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Handlebars 語言基礎知識",
-	"description": "為 Handlebars 檔案提供語法醒目提示及括弧對應功能。"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/hlsl/package.i18n.json b/i18n/cht/extensions/hlsl/package.i18n.json
deleted file mode 100644
index f89b570c901..00000000000
--- a/i18n/cht/extensions/hlsl/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "HLSL 語言基礎知識",
-	"description": "為 HLSL 檔案提供語法醒目提示與括弧對應功能。"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/html-language-features/client/out/htmlMain.i18n.json b/i18n/cht/extensions/html-language-features/client/out/htmlMain.i18n.json
deleted file mode 100644
index 0c001145a7a..00000000000
--- a/i18n/cht/extensions/html-language-features/client/out/htmlMain.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"htmlserver.name": "HTML 語言伺服器",
-	"folding.start": "摺疊區域開始",
-	"folding.end": "摺疊區域結束"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/html-language-features/package.i18n.json b/i18n/cht/extensions/html-language-features/package.i18n.json
deleted file mode 100644
index d83d91cc72a..00000000000
--- a/i18n/cht/extensions/html-language-features/package.i18n.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "HTML 語言功能",
-	"description": "為 HTML、Razor 及 Handlebars 檔案提供豐富的語言支援。",
-	"html.format.enable.desc": "啟用/停用預設 HTML 格式器",
-	"html.format.wrapLineLength.desc": "每行的字元數上限 (0 = 停用)。",
-	"html.format.unformatted.desc": "不應重新格式化的逗號分隔標記清單。'null' 預設為 https://www.w3.org/TR/html5/dom.html#phrasing-content 中列出的所有標記。",
-	"html.format.contentUnformatted.desc": "逗點分隔的標記清單，其中內容的格式不應重新設定。'null' 預設為 'pre' 標記。",
-	"html.format.indentInnerHtml.desc": "縮排 <head> 及 <body> 區段。",
-	"html.format.preserveNewLines.desc": "是否應保留項目前方現有的分行符號。僅適用於項目前方，而不適用於標記內或文字。",
-	"html.format.maxPreserveNewLines.desc": "一個區塊要保留的最大分行符號數。使用 'null' 表示無限制。",
-	"html.format.indentHandlebars.desc": "格式化並縮排 {{#foo}} 及 {{/foo}}。",
-	"html.format.endWithNewline.desc": "以新行字元結尾。",
-	"html.format.extraLiners.desc": "前方應有額外新行字元的標記清單，須以逗號分隔。'null' 的預設值為 \"head, body, /html\"。",
-	"html.format.wrapAttributes.desc": "將屬性換行。",
-	"html.format.wrapAttributes.auto": "只在超過行的長度時將屬性換行。",
-	"html.format.wrapAttributes.force": "將第一個以外的每個屬性換行。",
-	"html.format.wrapAttributes.forcealign": "將第一個以外的每個屬性換行，並保持對齊。",
-	"html.format.wrapAttributes.forcemultiline": "將每個屬性換行。",
-	"html.suggest.angular1.desc": "設定內建 HTML 語言支援是否建議 Angular V1 標記和屬性。",
-	"html.suggest.ionic.desc": "設定內建 HTML 語言支援是否建議 Ionic 標記、屬性和值。",
-	"html.suggest.html5.desc": "設定內建 HTML 語言支援是否建議 HTML5 標記、屬性和值。",
-	"html.trace.server.desc": "追蹤 VS Code 與 HTML  語言伺服器之間的通訊。",
-	"html.validate.scripts": "設定內建 HTML 語言支援是否會驗證內嵌指定碼。",
-	"html.validate.styles": "設定內建 HTML 語言支援是否會驗證內嵌樣式。",
-	"html.autoClosingTags": "啟用/停用 HTML 標籤的自動關閉功能。"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/html/client/out/htmlMain.i18n.json b/i18n/cht/extensions/html/client/out/htmlMain.i18n.json
deleted file mode 100644
index 0c001145a7a..00000000000
--- a/i18n/cht/extensions/html/client/out/htmlMain.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"htmlserver.name": "HTML 語言伺服器",
-	"folding.start": "摺疊區域開始",
-	"folding.end": "摺疊區域結束"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/html/package.i18n.json b/i18n/cht/extensions/html/package.i18n.json
deleted file mode 100644
index eb9141c8094..00000000000
--- a/i18n/cht/extensions/html/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "HTML 語言基礎知識",
-	"description": "為 HTML 檔案提供語法醒目提示、括弧對應與程式碼片段功能。"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/ini/package.i18n.json b/i18n/cht/extensions/ini/package.i18n.json
deleted file mode 100644
index 894b815508f..00000000000
--- a/i18n/cht/extensions/ini/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Ini 語言基礎知識",
-	"description": "為 Ini 檔案提供語法醒目提示與括弧對應功能。"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/jake/out/main.i18n.json b/i18n/cht/extensions/jake/out/main.i18n.json
deleted file mode 100644
index b9fdfb71204..00000000000
--- a/i18n/cht/extensions/jake/out/main.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"execFailed": "Jake 在資料夾 {0} 的自動偵測失敗。錯誤: {1}"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/jake/package.i18n.json b/i18n/cht/extensions/jake/package.i18n.json
deleted file mode 100644
index e83e9579b86..00000000000
--- a/i18n/cht/extensions/jake/package.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"description": "將 Jake 功能新增至 VSCode 的延伸模組。",
-	"displayName": "VSCode 的 Jake 支援",
-	"jake.taskDefinition.type.description": "要自訂的 Jake 工作。",
-	"jake.taskDefinition.file.description": "提供工作的 Jack 檔案。可以省略。",
-	"config.jake.autoDetect": "控制 Jake 工作的自動偵測為開啟或關閉。預設為開。"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/java/package.i18n.json b/i18n/cht/extensions/java/package.i18n.json
deleted file mode 100644
index 61ab0c09dff..00000000000
--- a/i18n/cht/extensions/java/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "JAVA 語言基礎知識",
-	"description": "為 Java 檔案提供程式碼片段、語法醒目提示、括弧對應與摺疊功能。"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/javascript/out/features/bowerJSONContribution.i18n.json b/i18n/cht/extensions/javascript/out/features/bowerJSONContribution.i18n.json
deleted file mode 100644
index d15ab81b35b..00000000000
--- a/i18n/cht/extensions/javascript/out/features/bowerJSONContribution.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"json.bower.default": "預設 bower.json",
-	"json.bower.error.repoaccess": "對 Bower 儲存機制的要求失敗: {0}",
-	"json.bower.latest.version": "最新"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/javascript/out/features/packageJSONContribution.i18n.json b/i18n/cht/extensions/javascript/out/features/packageJSONContribution.i18n.json
deleted file mode 100644
index e99dcec49df..00000000000
--- a/i18n/cht/extensions/javascript/out/features/packageJSONContribution.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"json.package.default": "預設 package.json",
-	"json.npm.error.repoaccess": "對 NPM 儲存機制的要求失敗: {0}",
-	"json.npm.latestversion": "封裝目前的最新版本",
-	"json.npm.majorversion": "比對最新的主要版本 (1.x.x)",
-	"json.npm.minorversion": "比對最新的次要版本 (1.2.x)",
-	"json.npm.version.hover": "最新版本: {0}"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/javascript/package.i18n.json b/i18n/cht/extensions/javascript/package.i18n.json
deleted file mode 100644
index 7b4fe9dc2a3..00000000000
--- a/i18n/cht/extensions/javascript/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "JavaScript 語言基礎知識",
-	"description": "為 JavaScript 檔案提供程式碼片段、語法醒目提示、括弧對應與摺疊功能。"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/json-language-features/client/out/jsonMain.i18n.json b/i18n/cht/extensions/json-language-features/client/out/jsonMain.i18n.json
deleted file mode 100644
index 275d7ba3cb0..00000000000
--- a/i18n/cht/extensions/json-language-features/client/out/jsonMain.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"jsonserver.name": "JSON 語言伺服器"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/json-language-features/package.i18n.json b/i18n/cht/extensions/json-language-features/package.i18n.json
deleted file mode 100644
index 15eaaf64aef..00000000000
--- a/i18n/cht/extensions/json-language-features/package.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "JSON 語言功能",
-	"description": "為 JSON 檔案提供豐富的語言支援",
-	"json.schemas.desc": "在結構描述與目前專案的 JSON 檔案之間建立關聯",
-	"json.schemas.url.desc": "目前目錄中的結構描述 URL 或結構描述相對路徑",
-	"json.schemas.fileMatch.desc": "檔案模式陣列，在將 JSON 檔案解析成結構描述時的比對對象。",
-	"json.schemas.fileMatch.item.desc": "可包含 '*' 的檔案模式，在將 JSON 檔案解析成結構描述時的比對對象。",
-	"json.schemas.schema.desc": "指定 URL 的結構描述定義。只須提供結構描述以避免存取結構描述 URL。",
-	"json.format.enable.desc": "啟用/停用預設 JSON 格式器 (需要重新啟動)",
-	"json.tracing.desc": "追蹤 VS Code 與 JSON 語言伺服器之間的通訊。",
-	"json.colorDecorators.enable.desc": "啟用或停用彩色裝飾項目",
-	"json.colorDecorators.enable.deprecationMessage": "設定 `json.colorDecorators.enable` 已淘汰，將改為 `editor.colorDecorators`。"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/json/client/out/jsonMain.i18n.json b/i18n/cht/extensions/json/client/out/jsonMain.i18n.json
deleted file mode 100644
index 275d7ba3cb0..00000000000
--- a/i18n/cht/extensions/json/client/out/jsonMain.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"jsonserver.name": "JSON 語言伺服器"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/json/package.i18n.json b/i18n/cht/extensions/json/package.i18n.json
deleted file mode 100644
index 909f55cf270..00000000000
--- a/i18n/cht/extensions/json/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "JSON 語言基礎知識",
-	"description": "為 JSON  檔案提供語法醒目提示與括弧對應功能。"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/less/package.i18n.json b/i18n/cht/extensions/less/package.i18n.json
deleted file mode 100644
index a2a32f06c6a..00000000000
--- a/i18n/cht/extensions/less/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Less 語言基礎知識",
-	"description": "為 Less 檔案提供語法醒目提示、括弧對應與摺疊功能。"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/log/package.i18n.json b/i18n/cht/extensions/log/package.i18n.json
deleted file mode 100644
index 9a43b2c80de..00000000000
--- a/i18n/cht/extensions/log/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "日誌",
-	"description": "為具有 .log 副檔名的檔案提供語法醒目提示功能。"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/lua/package.i18n.json b/i18n/cht/extensions/lua/package.i18n.json
deleted file mode 100644
index aa69805cc84..00000000000
--- a/i18n/cht/extensions/lua/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Lua 語言基礎知識",
-	"description": "為 Lua 檔案提供語法醒目提示與括弧對應功能。"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/make/package.i18n.json b/i18n/cht/extensions/make/package.i18n.json
deleted file mode 100644
index 43f7897aa31..00000000000
--- a/i18n/cht/extensions/make/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Make 語言基礎知識",
-	"description": "為 Make 檔案提供語法醒目提示與括弧對應功能。"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/markdown-basics/package.i18n.json b/i18n/cht/extensions/markdown-basics/package.i18n.json
deleted file mode 100644
index c1f9350d041..00000000000
--- a/i18n/cht/extensions/markdown-basics/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Markdown 語言基礎知識",
-	"description": "為 Markdown 提供程式碼片段和語法醒目提示。"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json b/i18n/cht/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json
deleted file mode 100644
index 2f489d0fef5..00000000000
--- a/i18n/cht/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"onPreviewStyleLoadError": "無法載入 ‘markdown.style' 樣式:{0}"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/markdown-language-features/out/features/preview.i18n.json b/i18n/cht/extensions/markdown-language-features/out/features/preview.i18n.json
deleted file mode 100644
index 74c6cf18168..00000000000
--- a/i18n/cht/extensions/markdown-language-features/out/features/preview.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"lockedPreviewTitle": "[預覽] {0}",
-	"previewTitle": "預覽 [0]"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/markdown-language-features/out/features/previewContentProvider.i18n.json b/i18n/cht/extensions/markdown-language-features/out/features/previewContentProvider.i18n.json
deleted file mode 100644
index fe1f5c5a4e5..00000000000
--- a/i18n/cht/extensions/markdown-language-features/out/features/previewContentProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"preview.securityMessage.text": "此文件中的部分內容已停用",
-	"preview.securityMessage.title": "Markdown 預覽中已停用可能不安全或不安全的內容。請將 Markdown 預覽的安全性設定變更為允許不安全內容，或啟用指令碼",
-	"preview.securityMessage.label": "內容已停用安全性警告"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/markdown-language-features/out/security.i18n.json b/i18n/cht/extensions/markdown-language-features/out/security.i18n.json
deleted file mode 100644
index 6f41794bacc..00000000000
--- a/i18n/cht/extensions/markdown-language-features/out/security.i18n.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"strict.title": "嚴謹",
-	"strict.description": "僅載入安全內容",
-	"insecureLocalContent.title": "允許不安全的本機內容",
-	"insecureLocalContent.description": "啟用從本機提供 http 載入內容",
-	"insecureContent.title": "允許不安全的內容",
-	"insecureContent.description": "啟用 http 載入內容",
-	"disable.title": "停用",
-	"disable.description": "允許所有內容與指令碼執行。不建議",
-	"moreInfo.title": "詳細資訊",
-	"enableSecurityWarning.title": "允許此工作區預覽安全性警告",
-	"disableSecurityWarning.title": "不允許此工作區預覽安全性警告",
-	"toggleSecurityWarning.description": "不影響內容安全性層級",
-	"preview.showPreviewSecuritySelector.title": "選擇此工作區 Markdown 預覽的安全性設定"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/markdown-language-features/package.i18n.json b/i18n/cht/extensions/markdown-language-features/package.i18n.json
deleted file mode 100644
index d27fa896c2a..00000000000
--- a/i18n/cht/extensions/markdown-language-features/package.i18n.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Markdown 語言功能",
-	"description": "為 Markdown 提供豐富的語言支援。",
-	"markdown.preview.breaks.desc": "設定在 Markdown 預覽中如何顯示分行符號。設為 'trure' 為每個新行建立<br>",
-	"markdown.preview.linkify": "啟用或停用在 Markdown 預覽中將類似 URL 的文字轉換為連結。",
-	"markdown.preview.doubleClickToSwitchToEditor.desc": "在 Markdown 預覽中按兩下會切換到編輯器。",
-	"markdown.preview.fontFamily.desc": "控制 Markdown 預覽中使用的字型家族。",
-	"markdown.preview.fontSize.desc": "控制 Markdown 預覽中使用的字型大小 (以像素為單位)。",
-	"markdown.preview.lineHeight.desc": "控制 Markdown 預覽中使用的行高。此數字相對於字型大小。",
-	"markdown.preview.markEditorSelection.desc": "在 Markdown 預覽中標記目前的編輯器選取範圍。",
-	"markdown.preview.scrollEditorWithPreview.desc": "在捲動 Markdown 預覽時更新編輯器的檢視。",
-	"markdown.preview.scrollPreviewWithEditor.desc": "在捲動 Markdown 編輯器時更新預覽的檢視。",
-	"markdown.preview.scrollPreviewWithEditorSelection.desc": "[已淘汰] 捲動 Markdown 預覽，以從編輯器顯示目前選取的程式行。",
-	"markdown.preview.scrollPreviewWithEditorSelection.deprecationMessage": "此設定已由 'markdown.preview.scrollPreviewWithEditor' 取代，不再具有任何效果。",
-	"markdown.preview.title": "開啟預覽",
-	"markdown.previewFrontMatter.dec": "設定 YAML 前端在 Markdown 預覽中呈現的方式。[隱藏] 會移除前端。否則，前端會視為 Markdown 內容。",
-	"markdown.previewSide.title": "在一側開啟預覽",
-	"markdown.showLockedPreviewToSide.title": "在側面開啟鎖定的預覽",
-	"markdown.showSource.title": "顯示來源",
-	"markdown.styles.dec": "可從 Markdown 預覽使用之 CSS 樣式表的 URL 或本機路徑清單。相對路徑是相對於在總管中開啟的資料夾來進行解釋。若沒有開啟資料夾，路徑則是相對於 Markdown 檔案的位置來進行解釋。所有 '\\' 都必須寫成 '\\\\'。",
-	"markdown.showPreviewSecuritySelector.title": "變更預覽的安全性設定",
-	"markdown.trace.desc": "允許 Markdown 延伸模組進行偵錯記錄。",
-	"markdown.preview.refresh.title": "重新整理預覽",
-	"markdown.preview.toggleLock.title": "切換預覽鎖定"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/markdown/out/commands.i18n.json b/i18n/cht/extensions/markdown/out/commands.i18n.json
deleted file mode 100644
index c176ff214f9..00000000000
--- a/i18n/cht/extensions/markdown/out/commands.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"previewTitle": "預覽 [0]",
-	"onPreviewStyleLoadError": "無法載入 ‘markdown.style' 樣式:{0}"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/markdown/out/commands/onPreviewStyleLoadError.i18n.json b/i18n/cht/extensions/markdown/out/commands/onPreviewStyleLoadError.i18n.json
deleted file mode 100644
index 2f489d0fef5..00000000000
--- a/i18n/cht/extensions/markdown/out/commands/onPreviewStyleLoadError.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"onPreviewStyleLoadError": "無法載入 ‘markdown.style' 樣式:{0}"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/markdown/out/extension.i18n.json b/i18n/cht/extensions/markdown/out/extension.i18n.json
deleted file mode 100644
index 240d5457c78..00000000000
--- a/i18n/cht/extensions/markdown/out/extension.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"onPreviewStyleLoadError": "無法載入 ‘markdown.style' 樣式:{0}",
-	"previewTitle": "預覽 [0]"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/markdown/out/features/preview.i18n.json b/i18n/cht/extensions/markdown/out/features/preview.i18n.json
deleted file mode 100644
index 74c6cf18168..00000000000
--- a/i18n/cht/extensions/markdown/out/features/preview.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"lockedPreviewTitle": "[預覽] {0}",
-	"previewTitle": "預覽 [0]"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/markdown/out/features/previewContentProvider.i18n.json b/i18n/cht/extensions/markdown/out/features/previewContentProvider.i18n.json
deleted file mode 100644
index fe1f5c5a4e5..00000000000
--- a/i18n/cht/extensions/markdown/out/features/previewContentProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"preview.securityMessage.text": "此文件中的部分內容已停用",
-	"preview.securityMessage.title": "Markdown 預覽中已停用可能不安全或不安全的內容。請將 Markdown 預覽的安全性設定變更為允許不安全內容，或啟用指令碼",
-	"preview.securityMessage.label": "內容已停用安全性警告"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/markdown/out/previewContentProvider.i18n.json b/i18n/cht/extensions/markdown/out/previewContentProvider.i18n.json
deleted file mode 100644
index 66d00227018..00000000000
--- a/i18n/cht/extensions/markdown/out/previewContentProvider.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"preview.securityMessage.text": "此文件中的部分內容已停用",
-	"preview.securityMessage.title": "Markdown 預覽中已停用可能不安全或不安全的內容。請將 Markdown 預覽的安全性設定變更為允許不安全內容，或啟用指令碼",
-	"preview.securityMessage.label": "內容已停用安全性警告"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/markdown/out/security.i18n.json b/i18n/cht/extensions/markdown/out/security.i18n.json
deleted file mode 100644
index cc4260be39f..00000000000
--- a/i18n/cht/extensions/markdown/out/security.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"strict.title": "嚴謹",
-	"strict.description": "僅載入安全內容",
-	"insecureContent.title": "允許不安全的內容",
-	"insecureContent.description": "啟用 http 載入內容",
-	"disable.title": "停用",
-	"disable.description": "允許所有內容與指令碼執行。不建議",
-	"moreInfo.title": "詳細資訊",
-	"enableSecurityWarning.title": "允許此工作區預覽安全性警告",
-	"disableSecurityWarning.title": "不允許此工作區預覽安全性警告",
-	"toggleSecurityWarning.description": "不影響內容安全性層級",
-	"preview.showPreviewSecuritySelector.title": "選擇此工作區 Markdown 預覽的安全性設定"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/markdown/package.i18n.json b/i18n/cht/extensions/markdown/package.i18n.json
deleted file mode 100644
index d27fa896c2a..00000000000
--- a/i18n/cht/extensions/markdown/package.i18n.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Markdown 語言功能",
-	"description": "為 Markdown 提供豐富的語言支援。",
-	"markdown.preview.breaks.desc": "設定在 Markdown 預覽中如何顯示分行符號。設為 'trure' 為每個新行建立<br>",
-	"markdown.preview.linkify": "啟用或停用在 Markdown 預覽中將類似 URL 的文字轉換為連結。",
-	"markdown.preview.doubleClickToSwitchToEditor.desc": "在 Markdown 預覽中按兩下會切換到編輯器。",
-	"markdown.preview.fontFamily.desc": "控制 Markdown 預覽中使用的字型家族。",
-	"markdown.preview.fontSize.desc": "控制 Markdown 預覽中使用的字型大小 (以像素為單位)。",
-	"markdown.preview.lineHeight.desc": "控制 Markdown 預覽中使用的行高。此數字相對於字型大小。",
-	"markdown.preview.markEditorSelection.desc": "在 Markdown 預覽中標記目前的編輯器選取範圍。",
-	"markdown.preview.scrollEditorWithPreview.desc": "在捲動 Markdown 預覽時更新編輯器的檢視。",
-	"markdown.preview.scrollPreviewWithEditor.desc": "在捲動 Markdown 編輯器時更新預覽的檢視。",
-	"markdown.preview.scrollPreviewWithEditorSelection.desc": "[已淘汰] 捲動 Markdown 預覽，以從編輯器顯示目前選取的程式行。",
-	"markdown.preview.scrollPreviewWithEditorSelection.deprecationMessage": "此設定已由 'markdown.preview.scrollPreviewWithEditor' 取代，不再具有任何效果。",
-	"markdown.preview.title": "開啟預覽",
-	"markdown.previewFrontMatter.dec": "設定 YAML 前端在 Markdown 預覽中呈現的方式。[隱藏] 會移除前端。否則，前端會視為 Markdown 內容。",
-	"markdown.previewSide.title": "在一側開啟預覽",
-	"markdown.showLockedPreviewToSide.title": "在側面開啟鎖定的預覽",
-	"markdown.showSource.title": "顯示來源",
-	"markdown.styles.dec": "可從 Markdown 預覽使用之 CSS 樣式表的 URL 或本機路徑清單。相對路徑是相對於在總管中開啟的資料夾來進行解釋。若沒有開啟資料夾，路徑則是相對於 Markdown 檔案的位置來進行解釋。所有 '\\' 都必須寫成 '\\\\'。",
-	"markdown.showPreviewSecuritySelector.title": "變更預覽的安全性設定",
-	"markdown.trace.desc": "允許 Markdown 延伸模組進行偵錯記錄。",
-	"markdown.preview.refresh.title": "重新整理預覽",
-	"markdown.preview.toggleLock.title": "切換預覽鎖定"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/merge-conflict/out/codelensProvider.i18n.json b/i18n/cht/extensions/merge-conflict/out/codelensProvider.i18n.json
deleted file mode 100644
index ffa2bc67593..00000000000
--- a/i18n/cht/extensions/merge-conflict/out/codelensProvider.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"acceptCurrentChange": "接受當前變更",
-	"acceptIncomingChange": "接受來源變更",
-	"acceptBothChanges": "接受兩者變更",
-	"compareChanges": "比較變更"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/merge-conflict/out/commandHandler.i18n.json b/i18n/cht/extensions/merge-conflict/out/commandHandler.i18n.json
deleted file mode 100644
index 4e3057fe672..00000000000
--- a/i18n/cht/extensions/merge-conflict/out/commandHandler.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"cursorNotInConflict": "編輯器游標不在衝突合併範圍之內",
-	"compareChangesTitle": "{0}: 當前變更⟷來源變更",
-	"cursorOnCommonAncestorsRange": "編輯器游標在共同上階區塊內，請移動至「當前項目」或「來源項目」區塊",
-	"cursorOnSplitterRange": "編輯器游標在衝突合併工具範圍內,請移動至\"當前項目\"或來源項目\"區塊",
-	"noConflicts": "檔案內找不到需要合併衝突項目",
-	"noOtherConflictsInThisFile": "此檔案內沒有其他的衝突合併項目"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/merge-conflict/out/mergeDecorator.i18n.json b/i18n/cht/extensions/merge-conflict/out/mergeDecorator.i18n.json
deleted file mode 100644
index 5b274b20f9b..00000000000
--- a/i18n/cht/extensions/merge-conflict/out/mergeDecorator.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"currentChange": "(目前變更)",
-	"incomingChange": "(來源變更)"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/merge-conflict/package.i18n.json b/i18n/cht/extensions/merge-conflict/package.i18n.json
deleted file mode 100644
index c12550f5f7a..00000000000
--- a/i18n/cht/extensions/merge-conflict/package.i18n.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "合併衝突",
-	"description": "內嵌合併衝突的醒目提式與命令。",
-	"command.category": "合併衝突",
-	"command.accept.all-current": "接受所有當前項目",
-	"command.accept.all-incoming": "接受所有來源",
-	"command.accept.all-both": "接受兩者所有項目",
-	"command.accept.current": "接受當前項目",
-	"command.accept.incoming": "接受來源項目",
-	"command.accept.selection": "接受選取項目",
-	"command.accept.both": "接受兩者",
-	"command.next": "下一個衝突",
-	"command.previous": "前一個衝突",
-	"command.compare": "比較目前衝突",
-	"config.title": "合併衝突",
-	"config.codeLensEnabled": "啟用/停用 編輯器CodeLens衝突合併 ",
-	"config.decoratorsEnabled": "啟用/停用 編輯器衝突合併色彩裝飾"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/npm/out/features/bowerJSONContribution.i18n.json b/i18n/cht/extensions/npm/out/features/bowerJSONContribution.i18n.json
deleted file mode 100644
index d15ab81b35b..00000000000
--- a/i18n/cht/extensions/npm/out/features/bowerJSONContribution.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"json.bower.default": "預設 bower.json",
-	"json.bower.error.repoaccess": "對 Bower 儲存機制的要求失敗: {0}",
-	"json.bower.latest.version": "最新"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/npm/out/features/packageJSONContribution.i18n.json b/i18n/cht/extensions/npm/out/features/packageJSONContribution.i18n.json
deleted file mode 100644
index e99dcec49df..00000000000
--- a/i18n/cht/extensions/npm/out/features/packageJSONContribution.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"json.package.default": "預設 package.json",
-	"json.npm.error.repoaccess": "對 NPM 儲存機制的要求失敗: {0}",
-	"json.npm.latestversion": "封裝目前的最新版本",
-	"json.npm.majorversion": "比對最新的主要版本 (1.x.x)",
-	"json.npm.minorversion": "比對最新的次要版本 (1.2.x)",
-	"json.npm.version.hover": "最新版本: {0}"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/npm/out/main.i18n.json b/i18n/cht/extensions/npm/out/main.i18n.json
deleted file mode 100644
index f0e654540ce..00000000000
--- a/i18n/cht/extensions/npm/out/main.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"npm.parseError": "Npm 工作刪除: 解析檔案 {0} 失敗"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/npm/out/npmView.i18n.json b/i18n/cht/extensions/npm/out/npmView.i18n.json
deleted file mode 100644
index 1053101f617..00000000000
--- a/i18n/cht/extensions/npm/out/npmView.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noScripts": "找不到指令碼",
-	"noDebugOptions": "因為指令碼缺少節點偵錯選項 (例如 '--inspect-brk')，所以無法啟動 \"{0}\" 以進行偵錯。",
-	"learnMore": "深入了解",
-	"ok": "確定",
-	"scriptInvalid": "找不到指令碼 \"{0}\"。請嘗試重新整理檢視。"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/npm/out/tasks.i18n.json b/i18n/cht/extensions/npm/out/tasks.i18n.json
deleted file mode 100644
index f0e654540ce..00000000000
--- a/i18n/cht/extensions/npm/out/tasks.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"npm.parseError": "Npm 工作刪除: 解析檔案 {0} 失敗"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/npm/package.i18n.json b/i18n/cht/extensions/npm/package.i18n.json
deleted file mode 100644
index e1e497559e0..00000000000
--- a/i18n/cht/extensions/npm/package.i18n.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"description": "為 npm 指令碼新增工作支援的延伸模組。",
-	"displayName": "VSCode 的 Npm 支援",
-	"config.npm.autoDetect": "控制是否自動檢測npm腳本.預設為開啟.",
-	"config.npm.runSilent": "以 `--silent` 選項執行 npm 命令。 ",
-	"config.npm.packageManager": "用來執行指令碼的套件管理員。",
-	"config.npm.exclude": "為應從自動指令碼偵測排除的資料夾設定 Glob 模式。",
-	"config.npm.enableScriptExplorer": "啟用 npm 指令碼的總管檢視。",
-	"config.npm.scriptExplorerAction": "指令碼總管中預設按一下行為: 'open' 或 'run', 預設值為 'open'。",
-	"npm.parseError": "Npm 工作刪除: 解析檔案 {0} 失敗",
-	"taskdef.script": "要自訂的 npm 指令碼。",
-	"taskdef.path": "提供指令碼 package.json 檔案的資料夾路徑。可以省略。",
-	"view.name": "Npm 指令碼",
-	"command.refresh": "重新整理",
-	"command.run": "執行",
-	"command.debug": "偵錯",
-	"command.openScript": "開啟",
-	"command.runInstall": "執行安裝"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/objective-c/package.i18n.json b/i18n/cht/extensions/objective-c/package.i18n.json
deleted file mode 100644
index 62647ae8f6b..00000000000
--- a/i18n/cht/extensions/objective-c/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Objective-C 語言基礎知識",
-	"description": " Objective-C 檔案中的語法醒目提示和括號對稱功能。"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/package-json/out/features/bowerJSONContribution.i18n.json b/i18n/cht/extensions/package-json/out/features/bowerJSONContribution.i18n.json
deleted file mode 100644
index d15ab81b35b..00000000000
--- a/i18n/cht/extensions/package-json/out/features/bowerJSONContribution.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"json.bower.default": "預設 bower.json",
-	"json.bower.error.repoaccess": "對 Bower 儲存機制的要求失敗: {0}",
-	"json.bower.latest.version": "最新"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/package-json/out/features/packageJSONContribution.i18n.json b/i18n/cht/extensions/package-json/out/features/packageJSONContribution.i18n.json
deleted file mode 100644
index e99dcec49df..00000000000
--- a/i18n/cht/extensions/package-json/out/features/packageJSONContribution.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"json.package.default": "預設 package.json",
-	"json.npm.error.repoaccess": "對 NPM 儲存機制的要求失敗: {0}",
-	"json.npm.latestversion": "封裝目前的最新版本",
-	"json.npm.majorversion": "比對最新的主要版本 (1.x.x)",
-	"json.npm.minorversion": "比對最新的次要版本 (1.2.x)",
-	"json.npm.version.hover": "最新版本: {0}"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/package-json/package.i18n.json b/i18n/cht/extensions/package-json/package.i18n.json
deleted file mode 100644
index 35229bd6699..00000000000
--- a/i18n/cht/extensions/package-json/package.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	]
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/perl/package.i18n.json b/i18n/cht/extensions/perl/package.i18n.json
deleted file mode 100644
index dd60e768ef9..00000000000
--- a/i18n/cht/extensions/perl/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Perl 語言基礎知識",
-	"description": "為 Perl 檔案提供語法醒目提示與括弧對應功能。"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/php-language-features/out/features/validationProvider.i18n.json b/i18n/cht/extensions/php-language-features/out/features/validationProvider.i18n.json
deleted file mode 100644
index 62153a9c2da..00000000000
--- a/i18n/cht/extensions/php-language-features/out/features/validationProvider.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"php.useExecutablePath": "要允許 {0} (定義為工作區設定) 執行，以使用 lint 標記 PHP 檔案嗎?",
-	"php.yes": "允許",
-	"php.no": "不允許",
-	"wrongExecutable": "因為 {0} 不是有效的 PHP 可執行檔，所以無法驗證。您可以使用設定 'php.validate.executablePath' 設定 PHP 可執行檔。",
-	"noExecutable": "因為未設定任何 PHP 可執行檔，所以無法驗證。您可以使用 'php.validate.executablePath'  設定可執行檔。",
-	"unknownReason": "無法使用路徑 {0} 執行 PHP。原因不明。"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/php-language-features/package.i18n.json b/i18n/cht/extensions/php-language-features/package.i18n.json
deleted file mode 100644
index abe5dfe9ea4..00000000000
--- a/i18n/cht/extensions/php-language-features/package.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"configuration.suggest.basic": "設定是否啟用內建 PHP 語言建議。此支援會建議 PHP 全域和變數。",
-	"configuration.validate.enable": "啟用/停用內建 PHP 驗證。",
-	"configuration.validate.executablePath": "指向 PHP 可執行檔。",
-	"configuration.validate.run": "是否在儲存或輸入時執行 linter。",
-	"configuration.title": "PHP",
-	"commands.categroy.php": "PHP",
-	"command.untrustValidationExecutable": "禁止 PHP 驗證可執行檔 (定義為工作區設定)",
-	"displayName": "PHP 語言功能",
-	"description": "為 PHP 檔案提供豐富的語言支援。"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/php/out/features/validationProvider.i18n.json b/i18n/cht/extensions/php/out/features/validationProvider.i18n.json
deleted file mode 100644
index 62153a9c2da..00000000000
--- a/i18n/cht/extensions/php/out/features/validationProvider.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"php.useExecutablePath": "要允許 {0} (定義為工作區設定) 執行，以使用 lint 標記 PHP 檔案嗎?",
-	"php.yes": "允許",
-	"php.no": "不允許",
-	"wrongExecutable": "因為 {0} 不是有效的 PHP 可執行檔，所以無法驗證。您可以使用設定 'php.validate.executablePath' 設定 PHP 可執行檔。",
-	"noExecutable": "因為未設定任何 PHP 可執行檔，所以無法驗證。您可以使用 'php.validate.executablePath'  設定可執行檔。",
-	"unknownReason": "無法使用路徑 {0} 執行 PHP。原因不明。"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/php/package.i18n.json b/i18n/cht/extensions/php/package.i18n.json
deleted file mode 100644
index d6cdfe9a0f2..00000000000
--- a/i18n/cht/extensions/php/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "PHP 語言基礎知識",
-	"description": "為 PHP 檔案提供語法醒目提示與括弧對應功能。"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/powershell/package.i18n.json b/i18n/cht/extensions/powershell/package.i18n.json
deleted file mode 100644
index 66b700e09a4..00000000000
--- a/i18n/cht/extensions/powershell/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Powershell 語言基礎知識",
-	"description": "為 PowerShell 檔案提供程式碼片段、語法醒目提示、括弧對應與摺疊功能。"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/pug/package.i18n.json b/i18n/cht/extensions/pug/package.i18n.json
deleted file mode 100644
index c23951889ca..00000000000
--- a/i18n/cht/extensions/pug/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Pug 語言基礎知識",
-	"description": "為 Pug 檔案提供語法醒目提示與括弧對應功能。"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/python/package.i18n.json b/i18n/cht/extensions/python/package.i18n.json
deleted file mode 100644
index 61843b3659c..00000000000
--- a/i18n/cht/extensions/python/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Python 語言基礎知識",
-	"description": "為 Python 檔案提供語法醒目提示、括弧對應與摺疊功能。"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/r/package.i18n.json b/i18n/cht/extensions/r/package.i18n.json
deleted file mode 100644
index 44ea2361268..00000000000
--- a/i18n/cht/extensions/r/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "R 語言基礎知識",
-	"description": "為 R 檔案提供語法醒目提示與括弧對應功能。"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/razor/package.i18n.json b/i18n/cht/extensions/razor/package.i18n.json
deleted file mode 100644
index fd380c8eb0b..00000000000
--- a/i18n/cht/extensions/razor/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Razor 語言基礎知識",
-	"description": "為 Razor 檔案提供語法醒目提示、括弧對應與摺疊功能。"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/ruby/package.i18n.json b/i18n/cht/extensions/ruby/package.i18n.json
deleted file mode 100644
index 98bb2fa6ae5..00000000000
--- a/i18n/cht/extensions/ruby/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Ruby 語言基礎知識",
-	"description": "為 Ruby 檔案提供語法醒目提示與括弧對應功能。"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/rust/package.i18n.json b/i18n/cht/extensions/rust/package.i18n.json
deleted file mode 100644
index 5a0272a8e28..00000000000
--- a/i18n/cht/extensions/rust/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Rust 語言基礎知識",
-	"description": "為 Rust 檔案提供語法醒目提示與括弧對應功能。"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/scss/package.i18n.json b/i18n/cht/extensions/scss/package.i18n.json
deleted file mode 100644
index 433ce03d1b5..00000000000
--- a/i18n/cht/extensions/scss/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "SCSS 語言基礎知識",
-	"description": "為 SCSS 檔案提供語法醒目提示、括弧對應與摺疊功能。"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/search-rg/package.i18n.json b/i18n/cht/extensions/search-rg/package.i18n.json
deleted file mode 100644
index 36c540fd95f..00000000000
--- a/i18n/cht/extensions/search-rg/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "搜尋 (ripgrep)",
-	"description": "使用 Ripgrep 提供搜尋。"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/shaderlab/package.i18n.json b/i18n/cht/extensions/shaderlab/package.i18n.json
deleted file mode 100644
index 64249778d22..00000000000
--- a/i18n/cht/extensions/shaderlab/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Shaderlab 語言基礎知識",
-	"description": "為 Shaderlab 檔案提供語法醒目提示與括弧對應功能。"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/shellscript/package.i18n.json b/i18n/cht/extensions/shellscript/package.i18n.json
deleted file mode 100644
index e29ba9378a4..00000000000
--- a/i18n/cht/extensions/shellscript/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Shell Script 語言基礎知識",
-	"description": "為 Shell Script 檔案提供語法醒目提示與括弧對應功能。"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/sql/package.i18n.json b/i18n/cht/extensions/sql/package.i18n.json
deleted file mode 100644
index 43aea024d36..00000000000
--- a/i18n/cht/extensions/sql/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "SQL 語言基礎知識",
-	"description": "為 SQL 檔案提供語法醒目提示與括弧對應功能。"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/swift/package.i18n.json b/i18n/cht/extensions/swift/package.i18n.json
deleted file mode 100644
index b98cfd74827..00000000000
--- a/i18n/cht/extensions/swift/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Swift 語言基礎知識",
-	"description": "為 Swift 檔案提供程式碼片段、語法醒目提示及括弧對應功能。"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/theme-abyss/package.i18n.json b/i18n/cht/extensions/theme-abyss/package.i18n.json
deleted file mode 100644
index 367c2ead77d..00000000000
--- a/i18n/cht/extensions/theme-abyss/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Abyss 佈景主題",
-	"description": "Visual Studio Code的Abyss 佈景主題"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/theme-defaults/package.i18n.json b/i18n/cht/extensions/theme-defaults/package.i18n.json
deleted file mode 100644
index 77940cf9c6a..00000000000
--- a/i18n/cht/extensions/theme-defaults/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "預設佈景主題",
-	"description": "預設淺色與深色佈景主題 (Plus 與 Visual Studio)"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/theme-kimbie-dark/package.i18n.json b/i18n/cht/extensions/theme-kimbie-dark/package.i18n.json
deleted file mode 100644
index 3b425fc8eb2..00000000000
--- a/i18n/cht/extensions/theme-kimbie-dark/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Kimbie 深色佈景主題",
-	"description": "Visual Studio Code 的 Kimbie 深色佈景主題"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/theme-monokai-dimmed/package.i18n.json b/i18n/cht/extensions/theme-monokai-dimmed/package.i18n.json
deleted file mode 100644
index 35a5fd5d8b1..00000000000
--- a/i18n/cht/extensions/theme-monokai-dimmed/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Monokai 暗灰色佈景主題",
-	"description": "Visual Studio Code 的 Monokai 暗灰色佈景主題"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/theme-monokai/package.i18n.json b/i18n/cht/extensions/theme-monokai/package.i18n.json
deleted file mode 100644
index a9a54dfb52b..00000000000
--- a/i18n/cht/extensions/theme-monokai/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Monokai 佈景主題",
-	"description": "Visual Studio Code 的 Monokai 佈景主題"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/theme-quietlight/package.i18n.json b/i18n/cht/extensions/theme-quietlight/package.i18n.json
deleted file mode 100644
index 4b7c2ec24d2..00000000000
--- a/i18n/cht/extensions/theme-quietlight/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Quiet 淺色佈景主題",
-	"description": "Visual Studio Code 的 Quiet 淺色佈景主題"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/theme-red/package.i18n.json b/i18n/cht/extensions/theme-red/package.i18n.json
deleted file mode 100644
index 085f41903e0..00000000000
--- a/i18n/cht/extensions/theme-red/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "紅色佈景主題",
-	"description": "Visual Studio Code 的紅色佈景主題"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/theme-seti/package.i18n.json b/i18n/cht/extensions/theme-seti/package.i18n.json
deleted file mode 100644
index 514ed6d52d7..00000000000
--- a/i18n/cht/extensions/theme-seti/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Seti 檔案圖式佈景主題",
-	"description": "以 Seti UI 檔案圖示為範本製作的檔案圖示佈景主題"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/theme-solarized-dark/package.i18n.json b/i18n/cht/extensions/theme-solarized-dark/package.i18n.json
deleted file mode 100644
index 2ff9e6422f9..00000000000
--- a/i18n/cht/extensions/theme-solarized-dark/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Solarized 深色佈景主題",
-	"description": "Visual Studio Code 的 Solarized 深色佈景主題"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/theme-solarized-light/package.i18n.json b/i18n/cht/extensions/theme-solarized-light/package.i18n.json
deleted file mode 100644
index 9b00620cec2..00000000000
--- a/i18n/cht/extensions/theme-solarized-light/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Solarized 淺色佈景主題",
-	"description": "Visual Studio Code 的 Solarized 淺色佈景主題"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/theme-tomorrow-night-blue/package.i18n.json b/i18n/cht/extensions/theme-tomorrow-night-blue/package.i18n.json
deleted file mode 100644
index c56ef374186..00000000000
--- a/i18n/cht/extensions/theme-tomorrow-night-blue/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "明夜憂藍佈景主題",
-	"description": "Visual Studio Code 的明夜憂藍佈景主題"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/typescript-basics/package.i18n.json b/i18n/cht/extensions/typescript-basics/package.i18n.json
deleted file mode 100644
index 0d9de7e7b4d..00000000000
--- a/i18n/cht/extensions/typescript-basics/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "TypeScript 語言基礎知識",
-	"description": "為 TypeScript 檔案提供程式碼片段、語法醒目提示、括弧對應與摺疊功能。"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/typescript-language-features/out/commands.i18n.json b/i18n/cht/extensions/typescript-language-features/out/commands.i18n.json
deleted file mode 100644
index 90f4f953b40..00000000000
--- a/i18n/cht/extensions/typescript-language-features/out/commands.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"typescript.projectConfigNoWorkspace": "請在 VS Code 中開啟資料夾，以使用 TypeScript 或 JavaScript 專案",
-	"typescript.projectConfigUnsupportedFile": "無法判斷 TypeScript 或 JavaScript 專案。不支援的檔案類型",
-	"typescript.projectConfigCouldNotGetInfo": "無法判斷 TypeScript 或 JavaScript 專案",
-	"typescript.noTypeScriptProjectConfig": "檔案不屬於 TypeScript 專案。若要深入了解，請按一下[這裡]({0})。",
-	"typescript.noJavaScriptProjectConfig": "檔案不屬於 JavaScript 專案。若要深入了解，請按一下[這裡]({0})。",
-	"typescript.configureTsconfigQuickPick": "設定 tsconfig.json",
-	"typescript.configureJsconfigQuickPick": "設定 jsconfig.json"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/typescript-language-features/out/features/completionItemProvider.i18n.json b/i18n/cht/extensions/typescript-language-features/out/features/completionItemProvider.i18n.json
deleted file mode 100644
index 18117a677b6..00000000000
--- a/i18n/cht/extensions/typescript-language-features/out/features/completionItemProvider.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"selectCodeAction": "選擇要套用的程式碼動作",
-	"acquiringTypingsLabel": "正在擷取 typings...",
-	"acquiringTypingsDetail": "正在為 IntelliSense 擷取 typings 定義。",
-	"autoImportLabel": "自動從 {0} 匯入"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/typescript-language-features/out/features/directiveCommentCompletionProvider.i18n.json b/i18n/cht/extensions/typescript-language-features/out/features/directiveCommentCompletionProvider.i18n.json
deleted file mode 100644
index 7d901d9ed96..00000000000
--- a/i18n/cht/extensions/typescript-language-features/out/features/directiveCommentCompletionProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"ts-check": "啟用 JavaScript 檔案的語意檢查。必須在檔案的最上面。",
-	"ts-nocheck": "停用 JavaScript 檔案的語意檢查。必須在檔案的最上面。",
-	"ts-ignore": "隱藏下一行@ts-check 的錯誤警告。"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/typescript-language-features/out/features/implementationsCodeLensProvider.i18n.json b/i18n/cht/extensions/typescript-language-features/out/features/implementationsCodeLensProvider.i18n.json
deleted file mode 100644
index 16a3b7e5e58..00000000000
--- a/i18n/cht/extensions/typescript-language-features/out/features/implementationsCodeLensProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"oneImplementationLabel": "1 個實作",
-	"manyImplementationLabel": "{0} 個實作",
-	"implementationsErrorLabel": "無法判斷實作數"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/typescript-language-features/out/features/jsDocCompletionProvider.i18n.json b/i18n/cht/extensions/typescript-language-features/out/features/jsDocCompletionProvider.i18n.json
deleted file mode 100644
index 2851c131eab..00000000000
--- a/i18n/cht/extensions/typescript-language-features/out/features/jsDocCompletionProvider.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"typescript.jsDocCompletionItem.documentation": "JSDoc 註解"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/typescript-language-features/out/features/organizeImports.i18n.json b/i18n/cht/extensions/typescript-language-features/out/features/organizeImports.i18n.json
deleted file mode 100644
index d3f0fb21867..00000000000
--- a/i18n/cht/extensions/typescript-language-features/out/features/organizeImports.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"oraganizeImportsAction.title": "組織匯入"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/typescript-language-features/out/features/quickFixProvider.i18n.json b/i18n/cht/extensions/typescript-language-features/out/features/quickFixProvider.i18n.json
deleted file mode 100644
index 85939cee970..00000000000
--- a/i18n/cht/extensions/typescript-language-features/out/features/quickFixProvider.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"fixAllInFileLabel": "{0} (檔案中修復全部)"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/typescript-language-features/out/features/referencesCodeLensProvider.i18n.json b/i18n/cht/extensions/typescript-language-features/out/features/referencesCodeLensProvider.i18n.json
deleted file mode 100644
index 4ae222d6a1d..00000000000
--- a/i18n/cht/extensions/typescript-language-features/out/features/referencesCodeLensProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"oneReferenceLabel": "1 個參考",
-	"manyReferenceLabel": "{0} 個參考",
-	"referenceErrorLabel": "無法判斷參考"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/typescript-language-features/out/features/taskProvider.i18n.json b/i18n/cht/extensions/typescript-language-features/out/features/taskProvider.i18n.json
deleted file mode 100644
index 61ba5737e64..00000000000
--- a/i18n/cht/extensions/typescript-language-features/out/features/taskProvider.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"buildTscLabel": "建置 - {0}",
-	"buildAndWatchTscLabel": "監看 - {0}"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/typescript-language-features/out/features/updatePathsOnRename.i18n.json b/i18n/cht/extensions/typescript-language-features/out/features/updatePathsOnRename.i18n.json
deleted file mode 100644
index b379c372c3b..00000000000
--- a/i18n/cht/extensions/typescript-language-features/out/features/updatePathsOnRename.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"prompt": "自動更新已移動檔案的匯入: '{0}' 嗎?",
-	"reject.title": "否",
-	"accept.title": "是",
-	"always.title": "是，一律更新匯入",
-	"never.title": "否，一律不更新匯入"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/typescript-language-features/out/typescriptServiceClient.i18n.json b/i18n/cht/extensions/typescript-language-features/out/typescriptServiceClient.i18n.json
deleted file mode 100644
index 54beeeb5b8d..00000000000
--- a/i18n/cht/extensions/typescript-language-features/out/typescriptServiceClient.i18n.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noServerFound": "路徑 {0} 未指向有效的 tsserver 安裝。即將回復為配套的 TypeScript 版本。",
-	"serverCouldNotBeStarted": "無法啟動 TypeScript 語言伺服器。錯誤訊息為: {0}",
-	"typescript.openTsServerLog.notSupported": "TS 伺服器的記錄功能需要 TS 2.2.2+",
-	"typescript.openTsServerLog.loggingNotEnabled": "TS 伺服器記錄功能已關閉。請設定 `typescript.tsserver.log` 並重新啟動 TS 伺服器，以啟用記錄功能",
-	"typescript.openTsServerLog.enableAndReloadOption": "啟用記錄功能並重新啟動 TS 伺服器",
-	"typescript.openTsServerLog.noLogFile": "TS 伺服器尚未開始記錄。",
-	"openTsServerLog.openFileFailedFailed": "無法開啟 TS 伺服器記錄檔",
-	"serverDiedAfterStart": "TypeScript 語言服務在啟動後立即中止 5 次。服務將不會重新啟動。",
-	"serverDiedReportIssue": "回報問題",
-	"serverDied": "TypeScript 語言服務在過去 5 分鐘內意外中止 5 次。"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/typescript-language-features/out/utils/api.i18n.json b/i18n/cht/extensions/typescript-language-features/out/utils/api.i18n.json
deleted file mode 100644
index bb0bb1a4af9..00000000000
--- a/i18n/cht/extensions/typescript-language-features/out/utils/api.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"invalidVersion": "無效的版本"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/typescript-language-features/out/utils/logger.i18n.json b/i18n/cht/extensions/typescript-language-features/out/utils/logger.i18n.json
deleted file mode 100644
index 8f5ef5415b9..00000000000
--- a/i18n/cht/extensions/typescript-language-features/out/utils/logger.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"channelName": "TypeScript"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/typescript-language-features/out/utils/projectStatus.i18n.json b/i18n/cht/extensions/typescript-language-features/out/utils/projectStatus.i18n.json
deleted file mode 100644
index 5d6e558a988..00000000000
--- a/i18n/cht/extensions/typescript-language-features/out/utils/projectStatus.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hintExclude": "若要讓整個專案都能使用 JavaScript/TypeScript 語言功能，請排除內含許多檔案的資料夾，例如: {0}",
-	"hintExclude.generic": "若要讓整個專案都能使用 JavaScript/TypeScript 語言功能，請排除內含您未使用之來源檔案的大型資料夾。",
-	"large.label": "設定排除項目",
-	"hintExclude.tooltip": "若要讓整個專案都能使用 JavaScript/TypeScript 語言功能，請排除內含您未使用之來源檔案的大型資料夾。"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/typescript-language-features/out/utils/typingsStatus.i18n.json b/i18n/cht/extensions/typescript-language-features/out/utils/typingsStatus.i18n.json
deleted file mode 100644
index e80262263f7..00000000000
--- a/i18n/cht/extensions/typescript-language-features/out/utils/typingsStatus.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"installingPackages": "正在擷取資料以改善 TypeScript IntelliSense",
-	"typesInstallerInitializationFailed.title": "無法為 JavaScript 語言功能安裝 typings 檔案。請確認已安裝 NPM，或在使用者設定中設定 'typescript.npm'。若要深入了解，請按一下[這裡]({0})。",
-	"typesInstallerInitializationFailed.doNotCheckAgain": "不要再顯示"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/typescript-language-features/out/utils/versionPicker.i18n.json b/i18n/cht/extensions/typescript-language-features/out/utils/versionPicker.i18n.json
deleted file mode 100644
index fdf7133b824..00000000000
--- a/i18n/cht/extensions/typescript-language-features/out/utils/versionPicker.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"useVSCodeVersionOption": "使用 VS Code 的版本",
-	"useWorkspaceVersionOption": "使用工作區版本",
-	"learnMore": "深入了解",
-	"selectTsVersion": "選取 JavaScript 與 TypeScript 功能使用的 TypeScript 版本"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/typescript-language-features/out/utils/versionProvider.i18n.json b/i18n/cht/extensions/typescript-language-features/out/utils/versionProvider.i18n.json
deleted file mode 100644
index 8d374cb1886..00000000000
--- a/i18n/cht/extensions/typescript-language-features/out/utils/versionProvider.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"couldNotLoadTsVersion": "無法在此路徑載入 TypeScript 版本",
-	"noBundledServerFound": "其他應用程式已刪除了 VS Code 的 tsserver，例如行為不當的病毒偵測工具。請重新安裝 VS Code。"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/typescript-language-features/package.i18n.json b/i18n/cht/extensions/typescript-language-features/package.i18n.json
deleted file mode 100644
index efbb6f7c43b..00000000000
--- a/i18n/cht/extensions/typescript-language-features/package.i18n.json
+++ /dev/null
@@ -1,67 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "TypeScript 和 JavaScript 語言功能",
-	"description": "為 JavaScript 和 TypeScript 提供豐富的語言支援。",
-	"reloadProjects.title": "重新載入專案",
-	"configuration.typescript": "TypeScript",
-	"typescript.useCodeSnippetsOnMethodSuggest.dec": "使用其參數簽章完成函式。",
-	"typescript.tsdk.desc": "指定資料夾路徑，其中包含要使用的 tsserver 和 lib*.d.ts 檔案。",
-	"typescript.disableAutomaticTypeAcquisition": "停用自動類型取得。需要 TypeScript >= 2.0.6。",
-	"typescript.tsserver.log": "允許 TS 伺服器記錄到檔案。此記錄可用來診斷 TS 伺服器問題。記錄可能包含檔案路徑、原始程式碼及您專案中可能具有敏感性的其他資訊。",
-	"typescript.tsserver.pluginPaths": "發現 TypeScript 語言服務外掛的其他路徑。需要 TypeScript >= 2.3.0。",
-	"typescript.tsserver.pluginPaths.item": "無論是絕對路徑或是相對路徑。相對路徑將會根據工作區資料夾進行解析。",
-	"typescript.tsserver.trace": "允許將訊息追蹤傳送到 TS 伺服器。此追蹤可用來診斷 TS 伺服器問題。追蹤可能包含檔案路徑、原始程式碼及您專案中可能具有敏感性的其他資訊。",
-	"typescript.validate.enable": "啟用/停用 TypeScript 驗證。",
-	"typescript.format.enable": "啟用/停用預設 TypeScript 格式器。",
-	"javascript.format.enable": "啟用/停用預設 JavaScript 格式器。",
-	"format.insertSpaceAfterCommaDelimiter": "定義逗號分隔符號後的空格處理。",
-	"format.insertSpaceAfterConstructor": "定義 constructor 關鍵字後空格處理。需要 TypeScript >= 2.3.0。",
-	"format.insertSpaceAfterSemicolonInForStatements": " 定義 for 陳述式內分號後的空格處理。",
-	"format.insertSpaceBeforeAndAfterBinaryOperators": "定義二元運算子後的空格處理。",
-	"format.insertSpaceAfterKeywordsInControlFlowStatements": "定義控制流程陳述式內關鍵字後的空格處理方式。",
-	"format.insertSpaceAfterFunctionKeywordForAnonymousFunctions": "定義匿名函式之函式關鍵字後的空格處理。",
-	"format.insertSpaceBeforeFunctionParenthesis": "定義如何處理函式引數括號之前的空格。TypeScript 必須 >= 2.1.5。",
-	"format.insertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis": "定義左右非空白括弧間的空格處理。",
-	"format.insertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets": "定義左右非空白括弧間的空格處理。",
-	"format.insertSpaceAfterOpeningAndBeforeClosingNonemptyBraces": "定義左右非空白括弧間的空格處理。需要 TypeScript >= 2.3.0。",
-	"format.insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces": "定義範本字串左右大括弧間的空格處理。需要 TypeScript >= 2.0.6。",
-	"format.insertSpaceAfterOpeningAndBeforeClosingJsxExpressionBraces": "定義 JSX 運算式左右大括弧間的空格處理。需要 TypeScript >= 2.0.6。",
-	"format.insertSpaceAfterTypeAssertion": "定義在 TypeScript 內類型宣告後空格處理。需要 TypeScript >= 2.4。",
-	"format.placeOpenBraceOnNewLineForFunctions": "定義是否將左大括弧放入函式的新行。",
-	"format.placeOpenBraceOnNewLineForControlBlocks": "定義是否將左大括弧放入控制區塊的新行。",
-	"javascript.validate.enable": "啟用/停用 JavaScript 驗證。",
-	"goToProjectConfig.title": "移至專案組態",
-	"javascript.referencesCodeLens.enabled": "在JavaScript檔案啟用/停用 參考CodeLens ",
-	"typescript.referencesCodeLens.enabled": "在TypeScript檔案啟用/停用CodeLens參考。需要TypeScript>=2.0.6。",
-	"typescript.implementationsCodeLens.enabled": "啟用/停用實作 CodeLens。需要 TypeScript >= 2.2.0。",
-	"typescript.openTsServerLog.title": "開啟 TS 伺服器記錄",
-	"typescript.restartTsServer": "重新啟動TS伺服器",
-	"typescript.selectTypeScriptVersion.title": "選取 TypeScript 版本",
-	"typescript.reportStyleChecksAsWarnings": "使用警告顯示樣式檢查",
-	"jsDocCompletion.enabled": "啟用/停用自動 JSDoc 註解",
-	"javascript.implicitProjectConfig.checkJs": "啟用/停用 JavaScript 檔案的語義檢查。現有的 jsconfig.json或 tsconfig.json 檔案會覆寫此設定。需要 TypeScript >= 2.3.1。",
-	"typescript.npm": "指定用於自動類型取得的 NPM 可執行檔路徑。TypeScript 必須 >= 2.3.4.",
-	"typescript.check.npmIsInstalled": "檢查是否已安裝NPM用以取得自動類型擷取.",
-	"javascript.nameSuggestions": "從JavaScript推薦表檔案中啟用/停用包含唯一檔名",
-	"typescript.tsc.autoDetect": "控制自動偵測 tsc 任務。 'off' 停用此功能。 'build' 僅建立單次編譯任務。 'watch'  僅建立編譯並監看任務。 'on' 同時建立編譯及監看任務。預設值為 'on'。",
-	"typescript.problemMatchers.tsc.label": "TypeScript 問題",
-	"typescript.problemMatchers.tscWatch.label": " TypeScript 問題 (監看模式)",
-	"typescript.quickSuggestionsForPaths": "啟用/停用在輸入匯入路徑顯示即時建議。",
-	"typescript.locale": "進行用來回報 JavaScript 和 TypeScript 錯誤的地區設定。需要 TypeScript >= 2.6.0。'null' 預設會使用 VS Code 的地區設定。",
-	"javascript.implicitProjectConfig.experimentalDecorators": "啟用/停用不屬於專案之 JavaScript 檔案的'experimentalDecorators'。現有的 jsconfig.json 或 tsconfig.json 檔案會覆寫此設定。需要 TypeScript >= 2.3.1。",
-	"typescript.autoImportSuggestions.enabled": "啟用/停用 自動匯入建議。需要 TypeScript >=2.6.1",
-	"typescript.experimental.syntaxFolding": "啟用/停用語法感知摺疊標記。",
-	"taskDefinition.tsconfig.description": "定義 TS 組建的 tsconfig 檔案。",
-	"javascript.suggestionActions.enabled": "編輯器內啟用/停用 JavaScript 檔案建議診斷。需要 TypeScript >= 2.8",
-	"typescript.suggestionActions.enabled": "啟用/停用 編輯器內的 TypeScript 檔案建議診斷。需要 TypeScript >= 2.8",
-	"typescript.preferences.quoteStyle": "用於快速修正的偏好引號樣式: 'single' (單) 引號、'double' (雙) 引號或從現有匯入 'auto' (自動) 推斷引號類型。需要 TypeScript >= 2.9",
-	"typescript.preferences.importModuleSpecifier": "自動匯入的偏好路徑樣式:\n- \"relative\" (相對) 於檔案路徑。\n- \"non-relative\" (非相對)，根據在您 'jsconfig.json' / 'tsconfig.json' 中設定的 'baseUrl'。\n- \"auto\" (自動) 推斷最短的路徑類型。\n需要 TypeScript >= 2.9",
-	"typescript.showUnused": "啟用/停用 高亮顯示在程式碼中未使用的變數。需要 TypeScript >= 2.9",
-	"typescript.updateImportsOnFileMove.enabled": "當您在 VS Code 中重新命名或移動檔案時，啟用/停用自動更新匯入路徑。可使用的值為： 'prompt' 每次重新命名時， 'always' 自動更新路徑， 'never' 重新命名路徑且不再提示我。需要TypeScript >= 2.9"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/typescript/out/commands.i18n.json b/i18n/cht/extensions/typescript/out/commands.i18n.json
deleted file mode 100644
index 90f4f953b40..00000000000
--- a/i18n/cht/extensions/typescript/out/commands.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"typescript.projectConfigNoWorkspace": "請在 VS Code 中開啟資料夾，以使用 TypeScript 或 JavaScript 專案",
-	"typescript.projectConfigUnsupportedFile": "無法判斷 TypeScript 或 JavaScript 專案。不支援的檔案類型",
-	"typescript.projectConfigCouldNotGetInfo": "無法判斷 TypeScript 或 JavaScript 專案",
-	"typescript.noTypeScriptProjectConfig": "檔案不屬於 TypeScript 專案。若要深入了解，請按一下[這裡]({0})。",
-	"typescript.noJavaScriptProjectConfig": "檔案不屬於 JavaScript 專案。若要深入了解，請按一下[這裡]({0})。",
-	"typescript.configureTsconfigQuickPick": "設定 tsconfig.json",
-	"typescript.configureJsconfigQuickPick": "設定 jsconfig.json"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/typescript/out/features/bufferSyncSupport.i18n.json b/i18n/cht/extensions/typescript/out/features/bufferSyncSupport.i18n.json
deleted file mode 100644
index 8d73858cf4f..00000000000
--- a/i18n/cht/extensions/typescript/out/features/bufferSyncSupport.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"moreInformation": "詳細資訊",
-	"doNotCheckAgain": "不要再檢查",
-	"close": "關閉",
-	"updateTscCheck": "已將使用者設定 'typescript.check.tscVersion' 更新為 false"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/typescript/out/features/completionItemProvider.i18n.json b/i18n/cht/extensions/typescript/out/features/completionItemProvider.i18n.json
deleted file mode 100644
index 18117a677b6..00000000000
--- a/i18n/cht/extensions/typescript/out/features/completionItemProvider.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"selectCodeAction": "選擇要套用的程式碼動作",
-	"acquiringTypingsLabel": "正在擷取 typings...",
-	"acquiringTypingsDetail": "正在為 IntelliSense 擷取 typings 定義。",
-	"autoImportLabel": "自動從 {0} 匯入"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/typescript/out/features/directiveCommentCompletionProvider.i18n.json b/i18n/cht/extensions/typescript/out/features/directiveCommentCompletionProvider.i18n.json
deleted file mode 100644
index 7d901d9ed96..00000000000
--- a/i18n/cht/extensions/typescript/out/features/directiveCommentCompletionProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"ts-check": "啟用 JavaScript 檔案的語意檢查。必須在檔案的最上面。",
-	"ts-nocheck": "停用 JavaScript 檔案的語意檢查。必須在檔案的最上面。",
-	"ts-ignore": "隱藏下一行@ts-check 的錯誤警告。"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/typescript/out/features/implementationsCodeLensProvider.i18n.json b/i18n/cht/extensions/typescript/out/features/implementationsCodeLensProvider.i18n.json
deleted file mode 100644
index 16a3b7e5e58..00000000000
--- a/i18n/cht/extensions/typescript/out/features/implementationsCodeLensProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"oneImplementationLabel": "1 個實作",
-	"manyImplementationLabel": "{0} 個實作",
-	"implementationsErrorLabel": "無法判斷實作數"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/typescript/out/features/jsDocCompletionProvider.i18n.json b/i18n/cht/extensions/typescript/out/features/jsDocCompletionProvider.i18n.json
deleted file mode 100644
index 2851c131eab..00000000000
--- a/i18n/cht/extensions/typescript/out/features/jsDocCompletionProvider.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"typescript.jsDocCompletionItem.documentation": "JSDoc 註解"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/typescript/out/features/quickFixProvider.i18n.json b/i18n/cht/extensions/typescript/out/features/quickFixProvider.i18n.json
deleted file mode 100644
index 85939cee970..00000000000
--- a/i18n/cht/extensions/typescript/out/features/quickFixProvider.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"fixAllInFileLabel": "{0} (檔案中修復全部)"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/typescript/out/features/referencesCodeLensProvider.i18n.json b/i18n/cht/extensions/typescript/out/features/referencesCodeLensProvider.i18n.json
deleted file mode 100644
index 4ae222d6a1d..00000000000
--- a/i18n/cht/extensions/typescript/out/features/referencesCodeLensProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"oneReferenceLabel": "1 個參考",
-	"manyReferenceLabel": "{0} 個參考",
-	"referenceErrorLabel": "無法判斷參考"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/typescript/out/features/taskProvider.i18n.json b/i18n/cht/extensions/typescript/out/features/taskProvider.i18n.json
deleted file mode 100644
index 61ba5737e64..00000000000
--- a/i18n/cht/extensions/typescript/out/features/taskProvider.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"buildTscLabel": "建置 - {0}",
-	"buildAndWatchTscLabel": "監看 - {0}"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/typescript/out/typescriptMain.i18n.json b/i18n/cht/extensions/typescript/out/typescriptMain.i18n.json
deleted file mode 100644
index 628429984fc..00000000000
--- a/i18n/cht/extensions/typescript/out/typescriptMain.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"typescript.projectConfigNoWorkspace": "請在 VS Code 中開啟資料夾，以使用 TypeScript 或 JavaScript 專案",
-	"typescript.projectConfigUnsupportedFile": "無法判斷 TypeScript 或 JavaScript 專案。不支援的檔案類型",
-	"typescript.projectConfigCouldNotGetInfo": "無法判斷 TypeScript 或 JavaScript 專案",
-	"typescript.noTypeScriptProjectConfig": "檔案不是 TypeScript 專案的一部份",
-	"typescript.noJavaScriptProjectConfig": "檔案不是 JavaScript 專案的一部份",
-	"typescript.configureTsconfigQuickPick": "設定 tsconfig.json",
-	"typescript.configureJsconfigQuickPick": "設定 jsconfig.json",
-	"typescript.projectConfigLearnMore": "深入了解"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/typescript/out/typescriptServiceClient.i18n.json b/i18n/cht/extensions/typescript/out/typescriptServiceClient.i18n.json
deleted file mode 100644
index 54beeeb5b8d..00000000000
--- a/i18n/cht/extensions/typescript/out/typescriptServiceClient.i18n.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noServerFound": "路徑 {0} 未指向有效的 tsserver 安裝。即將回復為配套的 TypeScript 版本。",
-	"serverCouldNotBeStarted": "無法啟動 TypeScript 語言伺服器。錯誤訊息為: {0}",
-	"typescript.openTsServerLog.notSupported": "TS 伺服器的記錄功能需要 TS 2.2.2+",
-	"typescript.openTsServerLog.loggingNotEnabled": "TS 伺服器記錄功能已關閉。請設定 `typescript.tsserver.log` 並重新啟動 TS 伺服器，以啟用記錄功能",
-	"typescript.openTsServerLog.enableAndReloadOption": "啟用記錄功能並重新啟動 TS 伺服器",
-	"typescript.openTsServerLog.noLogFile": "TS 伺服器尚未開始記錄。",
-	"openTsServerLog.openFileFailedFailed": "無法開啟 TS 伺服器記錄檔",
-	"serverDiedAfterStart": "TypeScript 語言服務在啟動後立即中止 5 次。服務將不會重新啟動。",
-	"serverDiedReportIssue": "回報問題",
-	"serverDied": "TypeScript 語言服務在過去 5 分鐘內意外中止 5 次。"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/typescript/out/utils/api.i18n.json b/i18n/cht/extensions/typescript/out/utils/api.i18n.json
deleted file mode 100644
index bb0bb1a4af9..00000000000
--- a/i18n/cht/extensions/typescript/out/utils/api.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"invalidVersion": "無效的版本"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/typescript/out/utils/logger.i18n.json b/i18n/cht/extensions/typescript/out/utils/logger.i18n.json
deleted file mode 100644
index 8f5ef5415b9..00000000000
--- a/i18n/cht/extensions/typescript/out/utils/logger.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"channelName": "TypeScript"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/typescript/out/utils/projectStatus.i18n.json b/i18n/cht/extensions/typescript/out/utils/projectStatus.i18n.json
deleted file mode 100644
index 5d6e558a988..00000000000
--- a/i18n/cht/extensions/typescript/out/utils/projectStatus.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hintExclude": "若要讓整個專案都能使用 JavaScript/TypeScript 語言功能，請排除內含許多檔案的資料夾，例如: {0}",
-	"hintExclude.generic": "若要讓整個專案都能使用 JavaScript/TypeScript 語言功能，請排除內含您未使用之來源檔案的大型資料夾。",
-	"large.label": "設定排除項目",
-	"hintExclude.tooltip": "若要讓整個專案都能使用 JavaScript/TypeScript 語言功能，請排除內含您未使用之來源檔案的大型資料夾。"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/typescript/out/utils/typingsStatus.i18n.json b/i18n/cht/extensions/typescript/out/utils/typingsStatus.i18n.json
deleted file mode 100644
index e80262263f7..00000000000
--- a/i18n/cht/extensions/typescript/out/utils/typingsStatus.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"installingPackages": "正在擷取資料以改善 TypeScript IntelliSense",
-	"typesInstallerInitializationFailed.title": "無法為 JavaScript 語言功能安裝 typings 檔案。請確認已安裝 NPM，或在使用者設定中設定 'typescript.npm'。若要深入了解，請按一下[這裡]({0})。",
-	"typesInstallerInitializationFailed.doNotCheckAgain": "不要再顯示"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/typescript/out/utils/versionPicker.i18n.json b/i18n/cht/extensions/typescript/out/utils/versionPicker.i18n.json
deleted file mode 100644
index fdf7133b824..00000000000
--- a/i18n/cht/extensions/typescript/out/utils/versionPicker.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"useVSCodeVersionOption": "使用 VS Code 的版本",
-	"useWorkspaceVersionOption": "使用工作區版本",
-	"learnMore": "深入了解",
-	"selectTsVersion": "選取 JavaScript 與 TypeScript 功能使用的 TypeScript 版本"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/typescript/out/utils/versionProvider.i18n.json b/i18n/cht/extensions/typescript/out/utils/versionProvider.i18n.json
deleted file mode 100644
index 8d374cb1886..00000000000
--- a/i18n/cht/extensions/typescript/out/utils/versionProvider.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"couldNotLoadTsVersion": "無法在此路徑載入 TypeScript 版本",
-	"noBundledServerFound": "其他應用程式已刪除了 VS Code 的 tsserver，例如行為不當的病毒偵測工具。請重新安裝 VS Code。"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/typescript/package.i18n.json b/i18n/cht/extensions/typescript/package.i18n.json
deleted file mode 100644
index 003b932658c..00000000000
--- a/i18n/cht/extensions/typescript/package.i18n.json
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "TypeScript 和 JavaScript 語言功能",
-	"description": "為 JavaScript 和 TypeScript 提供豐富的語言支援。",
-	"typescript.reloadProjects.title": "重新載入專案",
-	"javascript.reloadProjects.title": "重新載入專案",
-	"configuration.typescript": "TypeScript",
-	"typescript.useCodeSnippetsOnMethodSuggest.dec": "使用其參數簽章完成函式。",
-	"typescript.tsdk.desc": "指定資料夾路徑，其中包含要使用的 tsserver 和 lib*.d.ts 檔案。",
-	"typescript.disableAutomaticTypeAcquisition": "停用自動類型取得。需要 TypeScript >= 2.0.6。",
-	"typescript.tsserver.log": "允許 TS 伺服器記錄到檔案。此記錄可用來診斷 TS 伺服器問題。記錄可能包含檔案路徑、原始程式碼及您專案中可能具有敏感性的其他資訊。",
-	"typescript.tsserver.trace": "允許將訊息追蹤傳送到 TS 伺服器。此追蹤可用來診斷 TS 伺服器問題。追蹤可能包含檔案路徑、原始程式碼及您專案中可能具有敏感性的其他資訊。",
-	"typescript.validate.enable": "啟用/停用 TypeScript 驗證。",
-	"typescript.format.enable": "啟用/停用預設 TypeScript 格式器。",
-	"javascript.format.enable": "啟用/停用預設 JavaScript 格式器。",
-	"format.insertSpaceAfterCommaDelimiter": "定義逗號分隔符號後的空格處理。",
-	"format.insertSpaceAfterConstructor": "定義 constructor 關鍵字後空格處理。需要 TypeScript >= 2.3.0。",
-	"format.insertSpaceAfterSemicolonInForStatements": " 定義 for 陳述式內分號後的空格處理。",
-	"format.insertSpaceBeforeAndAfterBinaryOperators": "定義二元運算子後的空格處理。",
-	"format.insertSpaceAfterKeywordsInControlFlowStatements": "定義控制流程陳述式內關鍵字後的空格處理方式。",
-	"format.insertSpaceAfterFunctionKeywordForAnonymousFunctions": "定義匿名函式之函式關鍵字後的空格處理。",
-	"format.insertSpaceBeforeFunctionParenthesis": "定義如何處理函式引數括號之前的空格。TypeScript 必須 >= 2.1.5。",
-	"format.insertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis": "定義左右非空白括弧間的空格處理。",
-	"format.insertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets": "定義左右非空白中括弧間的空格處理。",
-	"format.insertSpaceAfterOpeningAndBeforeClosingNonemptyBraces": "定義範非空白左右大括弧間的空格處理。需要 TypeScript >= 2.3.0。",
-	"format.insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces": "定義範本字串左右大括弧間的空格處理。需要 TypeScript >= 2.0.6。",
-	"format.insertSpaceAfterOpeningAndBeforeClosingJsxExpressionBraces": "定義 JSX 運算式左右大括弧間的空格處理。需要 TypeScript >= 2.0.6。",
-	"format.insertSpaceAfterTypeAssertion": "定義在 TypeScript 內類型宣告後空格處理。需要 TypeScript >= 2.4。",
-	"format.placeOpenBraceOnNewLineForFunctions": "定義是否將左大括弧放入函式的新行。",
-	"format.placeOpenBraceOnNewLineForControlBlocks": "定義是否將左大括弧放入控制區塊的新行。",
-	"javascript.validate.enable": "啟用/停用 JavaScript 驗證。",
-	"typescript.goToProjectConfig.title": "移至專案組態",
-	"javascript.goToProjectConfig.title": "移至專案組態",
-	"javascript.referencesCodeLens.enabled": "在JavaScript檔案啟用/停用 參考CodeLens ",
-	"typescript.referencesCodeLens.enabled": "在TypeScript檔案啟用/停用CodeLens參考。需要TypeScript>=2.0.6。",
-	"typescript.implementationsCodeLens.enabled": "啟用/停用實作 CodeLens。需要 TypeScript >= 2.2.0。",
-	"typescript.openTsServerLog.title": "開啟 TS 伺服器記錄",
-	"typescript.restartTsServer": "重新啟動TS伺服器",
-	"typescript.selectTypeScriptVersion.title": "選取 TypeScript 版本",
-	"typescript.reportStyleChecksAsWarnings": "使用警告顯示樣式檢查",
-	"jsDocCompletion.enabled": "啟用/停用自動 JSDoc 註解",
-	"javascript.implicitProjectConfig.checkJs": "啟用/停用 JavaScript 檔案的語意檢查。現有的 jsconfig.json 或 tsconfig.json 檔案會覆寫此設定。需要 TypeScript >=2.3.1。",
-	"typescript.npm": "指定用於自動類型取得的 NPM 可執行檔路徑。TypeScript 必須 >= 2.3.4.",
-	"typescript.check.npmIsInstalled": "檢查是否已安裝NPM用以取得自動類型擷取.",
-	"javascript.nameSuggestions": "從JavaScript推薦表檔案中啟用/停用包含唯一檔名",
-	"typescript.tsc.autoDetect": "控制自動偵測 tsc 任務。 'off' 停用此功能。 'build' 僅建立單次編譯任務。 'watch'  僅建立編譯並監看任務。 'on' 同時建立編譯及監看任務。預設值為 'on'。",
-	"typescript.problemMatchers.tsc.label": "TypeScript 問題",
-	"typescript.problemMatchers.tscWatch.label": " TypeScript 問題 (監看模式)",
-	"typescript.quickSuggestionsForPaths": "啟用/停用在輸入匯入路徑顯示即時建議。",
-	"typescript.locale": "設定報告 TypeScript 錯誤的語系。需要 TypeScript >= 2.6.0。預設值 'null' 則使用 VS Code 的語系來顯示 TypeScript 錯誤。",
-	"javascript.implicitProjectConfig.experimentalDecorators": "啟用/停用 JavaScript 檔案中非專案部分的 'experimentalDecorators'。現有的 jsconfig.json 或 tsconfig.json 檔案會覆寫此設定。需要 TypeScript >=2.3.1。",
-	"typescript.autoImportSuggestions.enabled": "啟用/停用 自動匯入建議。需要 TypeScript >=2.6.1",
-	"typescript.experimental.syntaxFolding": "啟用/停用語法感知摺疊標記。",
-	"taskDefinition.tsconfig.description": "定義 TS 組建的 tsconfig 檔案。"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/vb/package.i18n.json b/i18n/cht/extensions/vb/package.i18n.json
deleted file mode 100644
index 46f6a61fdc5..00000000000
--- a/i18n/cht/extensions/vb/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Visual Basic 語言基礎知識",
-	"description": "為 Visual Basic 檔案提供程式碼片段、語法醒目提示、括弧對應與摺疊功能。"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/xml/package.i18n.json b/i18n/cht/extensions/xml/package.i18n.json
deleted file mode 100644
index d9556638839..00000000000
--- a/i18n/cht/extensions/xml/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "XML 語言基礎知識",
-	"description": "為 XML 檔案提供語法醒目提式與括弧對應功能。"
-}
\ No newline at end of file
diff --git a/i18n/cht/extensions/yaml/package.i18n.json b/i18n/cht/extensions/yaml/package.i18n.json
deleted file mode 100644
index 759c416a806..00000000000
--- a/i18n/cht/extensions/yaml/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "YAML 語言基礎知識",
-	"description": "為 YAML 檔案提供語法醒目提示與括弧對應功能。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/base/browser/ui/actionbar/actionbar.i18n.json b/i18n/cht/src/vs/base/browser/ui/actionbar/actionbar.i18n.json
deleted file mode 100644
index 309631273fe..00000000000
--- a/i18n/cht/src/vs/base/browser/ui/actionbar/actionbar.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"titleLabel": "{0} ({1})"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/base/browser/ui/aria/aria.i18n.json b/i18n/cht/src/vs/base/browser/ui/aria/aria.i18n.json
deleted file mode 100644
index 52feacc9ed0..00000000000
--- a/i18n/cht/src/vs/base/browser/ui/aria/aria.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"repeated": "{0} (再次出現)"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/base/browser/ui/findinput/findInput.i18n.json b/i18n/cht/src/vs/base/browser/ui/findinput/findInput.i18n.json
deleted file mode 100644
index af4ca6305b9..00000000000
--- a/i18n/cht/src/vs/base/browser/ui/findinput/findInput.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"defaultLabel": "輸入"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/base/browser/ui/findinput/findInputCheckboxes.i18n.json b/i18n/cht/src/vs/base/browser/ui/findinput/findInputCheckboxes.i18n.json
deleted file mode 100644
index e46bcc69eaf..00000000000
--- a/i18n/cht/src/vs/base/browser/ui/findinput/findInputCheckboxes.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"caseDescription": "大小寫須相符",
-	"wordsDescription": "全字拼寫須相符",
-	"regexDescription": "使用規則運算式"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/base/browser/ui/inputbox/inputBox.i18n.json b/i18n/cht/src/vs/base/browser/ui/inputbox/inputBox.i18n.json
deleted file mode 100644
index 4b3808d2548..00000000000
--- a/i18n/cht/src/vs/base/browser/ui/inputbox/inputBox.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"alertErrorMessage": "錯誤: {0}",
-	"alertWarningMessage": "警告: {0}",
-	"alertInfoMessage": "資訊: {0}"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/base/browser/ui/resourceviewer/resourceViewer.i18n.json b/i18n/cht/src/vs/base/browser/ui/resourceviewer/resourceViewer.i18n.json
deleted file mode 100644
index 6a2f428328a..00000000000
--- a/i18n/cht/src/vs/base/browser/ui/resourceviewer/resourceViewer.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"imgMeta": "{0}x{1} {2}",
-	"largeImageError": "因為影像太大，無法在編輯器中顯示。",
-	"resourceOpenExternalButton": "要使用外部程式打開影像嗎?",
-	"nativeBinaryError": "檔案為二進位檔、非常大或使用不支援的文字編碼，因此將不會顯示於編輯器中。",
-	"sizeB": "{0}B",
-	"sizeKB": "{0}KB",
-	"sizeMB": "{0}MB",
-	"sizeGB": "{0}GB",
-	"sizeTB": "{0}TB"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json b/i18n/cht/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json
deleted file mode 100644
index 750d811d866..00000000000
--- a/i18n/cht/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"selectAriaOption": "{0}"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/base/browser/ui/toolbar/toolbar.i18n.json b/i18n/cht/src/vs/base/browser/ui/toolbar/toolbar.i18n.json
deleted file mode 100644
index da024cdfaaf..00000000000
--- a/i18n/cht/src/vs/base/browser/ui/toolbar/toolbar.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"more": "其他"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/base/common/errorMessage.i18n.json b/i18n/cht/src/vs/base/common/errorMessage.i18n.json
deleted file mode 100644
index 7e066d7fcc3..00000000000
--- a/i18n/cht/src/vs/base/common/errorMessage.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"stackTrace.format": "{0}: {1}",
-	"error.defaultMessage": "發生未知的錯誤。如需詳細資訊，請參閱記錄檔。",
-	"nodeExceptionMessage": "發生系統錯誤 ({0})",
-	"error.moreErrors": "{0} (總計 {1} 個錯誤)"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/base/common/json.i18n.json b/i18n/cht/src/vs/base/common/json.i18n.json
deleted file mode 100644
index a131a45e657..00000000000
--- a/i18n/cht/src/vs/base/common/json.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"error.invalidSymbol": "符號無效",
-	"error.invalidNumberFormat": "數字格式無效",
-	"error.propertyNameExpected": "必須有屬性名稱",
-	"error.valueExpected": "必須有值",
-	"error.colonExpected": "必須為冒號",
-	"error.commaExpected": "必須為逗號",
-	"error.closeBraceExpected": "必須為右大括號",
-	"error.closeBracketExpected": "必須為右中括號",
-	"error.endOfFileExpected": "必須為檔案結尾"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/base/common/jsonErrorMessages.i18n.json b/i18n/cht/src/vs/base/common/jsonErrorMessages.i18n.json
deleted file mode 100644
index 376804b803a..00000000000
--- a/i18n/cht/src/vs/base/common/jsonErrorMessages.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"error.invalidSymbol": "無效的符號",
-	"error.invalidNumberFormat": "無效的數字格式",
-	"error.propertyNameExpected": "須有屬性名稱",
-	"error.valueExpected": "必須有值",
-	"error.colonExpected": "必須有冒號",
-	"error.commaExpected": "必須有逗號",
-	"error.closeBraceExpected": "必須為右大括號",
-	"error.closeBracketExpected": "必須為右中括號",
-	"error.endOfFileExpected": "必須有檔案結尾"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/base/common/keybindingLabels.i18n.json b/i18n/cht/src/vs/base/common/keybindingLabels.i18n.json
deleted file mode 100644
index 88f9db8bef5..00000000000
--- a/i18n/cht/src/vs/base/common/keybindingLabels.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"ctrlKey": "Ctrl",
-	"shiftKey": "Shift",
-	"altKey": "Alt",
-	"windowsKey": "Windows",
-	"ctrlKey.long": "Control",
-	"shiftKey.long": "Shift",
-	"altKey.long": "Alt",
-	"cmdKey.long": "Command",
-	"windowsKey.long": "Windows"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/base/common/processes.i18n.json b/i18n/cht/src/vs/base/common/processes.i18n.json
deleted file mode 100644
index 0f1d9717660..00000000000
--- a/i18n/cht/src/vs/base/common/processes.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"ExecutableParser.commandMissing": "錯誤: 可執行檔資訊必須定義字串類型的命令。",
-	"ExecutableParser.isShellCommand": "警告: isShellCommand 必須屬於布林值類型。即將忽略值 {0}。",
-	"ExecutableParser.args": "警告: args 必須屬於 string[] 類型。即將忽略值 {0}。",
-	"ExecutableParser.invalidCWD": "警告: options.cwd 必須屬於字串類型。即將忽略值 {0}。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/base/common/severity.i18n.json b/i18n/cht/src/vs/base/common/severity.i18n.json
deleted file mode 100644
index cd4eb5c86cf..00000000000
--- a/i18n/cht/src/vs/base/common/severity.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"sev.error": "錯誤",
-	"sev.warning": "警告",
-	"sev.info": "資訊"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/base/node/processes.i18n.json b/i18n/cht/src/vs/base/node/processes.i18n.json
deleted file mode 100644
index 5989cf78970..00000000000
--- a/i18n/cht/src/vs/base/node/processes.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"TaskRunner.UNC": "無法在 UNC 磁碟機上執行殼層命令。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/base/node/ps.i18n.json b/i18n/cht/src/vs/base/node/ps.i18n.json
deleted file mode 100644
index 832371dc960..00000000000
--- a/i18n/cht/src/vs/base/node/ps.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"collecting": "收集 CPU 與記憶體資訊中，可能需要幾秒鐘的時間。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/base/node/zip.i18n.json b/i18n/cht/src/vs/base/node/zip.i18n.json
deleted file mode 100644
index 12569f5c94e..00000000000
--- a/i18n/cht/src/vs/base/node/zip.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"incompleteExtract": "未完成。已找到 {0} 個項目 (共 {1} 個)",
-	"notFound": "在 ZIP 中找不到 {0}。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/base/parts/quickopen/browser/quickOpenModel.i18n.json b/i18n/cht/src/vs/base/parts/quickopen/browser/quickOpenModel.i18n.json
deleted file mode 100644
index 24d6f90f7ad..00000000000
--- a/i18n/cht/src/vs/base/parts/quickopen/browser/quickOpenModel.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"quickOpenAriaLabelEntry": "{0}，選擇器",
-	"quickOpenAriaLabel": "選擇器"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/base/parts/quickopen/browser/quickOpenWidget.i18n.json b/i18n/cht/src/vs/base/parts/quickopen/browser/quickOpenWidget.i18n.json
deleted file mode 100644
index 09de553c00d..00000000000
--- a/i18n/cht/src/vs/base/parts/quickopen/browser/quickOpenWidget.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"quickOpenAriaLabel": "快速選擇器。輸入以縮小結果範圍。",
-	"treeAriaLabel": "快速選擇器"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/base/parts/tree/browser/treeDefaults.i18n.json b/i18n/cht/src/vs/base/parts/tree/browser/treeDefaults.i18n.json
deleted file mode 100644
index b3b43314999..00000000000
--- a/i18n/cht/src/vs/base/parts/tree/browser/treeDefaults.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"collapse": "摺疊"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json b/i18n/cht/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
deleted file mode 100644
index 09acbc3ec19..00000000000
--- a/i18n/cht/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hide": "隱藏",
-	"show": "顯示",
-	"previewOnGitHub": "在 GitHub 預覽",
-	"loadingData": "正在載入資料...",
-	"rateLimited": "超出了 GitHub 查詢限制。請稍候。",
-	"similarIssues": "相似的問題",
-	"open": "開啟",
-	"closed": "已關閉",
-	"noSimilarIssues": "未發現相似的問題",
-	"settingsSearchIssue": "設定值搜尋問題",
-	"bugReporter": "臭蟲回報",
-	"featureRequest": "功能要求",
-	"performanceIssue": "效能問題",
-	"stepsToReproduce": "重現的步驟",
-	"bugDescription": "請共用必要步驟以確實複製問題。請包含實際與預期的結果。我們支援 GitHub 慣用的 Markdown 語言。當我們在 GitHub 進行預覽時，您仍可編輯問題和新增螢幕擷取畫面。",
-	"performanceIssueDesciption": "效能問題的發生時間點為何? 問題是在啟動或經過一組特定動作後發生的? 我們支援 GitHub 慣用的 Markdown 語言。當我們在 GitHub 上進行預覽時，您仍可編輯問題和新增螢幕擷取畫面。",
-	"description": "描述",
-	"featureRequestDescription": "請描述您希望新增的功能。我們支援 GitHub 慣用的 Markdown 語言。當我們在 GitHub 上進行預覽時，您仍可編輯問題和新增螢幕擷取畫面。",
-	"expectedResults": "預期的結果",
-	"settingsSearchResultsDescription": "請列出您以此查詢進行搜尋時，預期看到的結果。我們支援 GitHub 慣用的 Markdown 語言。當我們在 GitHub 上進行預覽時，您仍可編輯問題和新增螢幕擷取畫面。",
-	"pasteData": "因為必要資料太大，我們已為您將其寫入您的剪貼簿。請貼上。",
-	"disabledExtensions": "延伸模組已停用"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json b/i18n/cht/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
deleted file mode 100644
index 59aba8fe086..00000000000
--- a/i18n/cht/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"completeInEnglish": "請用英語填寫這張表格。",
-	"issueTypeLabel": "這是一個",
-	"issueSourceLabel": "檔案，位於",
-	"vscode": "Visual Studio Code",
-	"extension": "擴充功能",
-	"disableExtensionsLabelText": "嘗試在 {0} 之後重現問題。如果問題僅在使用中的擴充功能時重現，則可能是擴充功能的問題。",
-	"disableExtensions": "停用所有延伸模組並重新載入視窗",
-	"chooseExtension": "擴充功能",
-	"issueTitleLabel": "標題",
-	"issueTitleRequired": "請輸入標題。",
-	"titleLengthValidation": "標題太長。",
-	"details": "請輸入詳細資料。",
-	"sendSystemInfo": "包含我的系統資訊 ({0})",
-	"show": "顯示",
-	"sendProcessInfo": "包含我目前正在執行的程序 ({0})",
-	"sendWorkspaceInfo": "包含我的工作區詮釋資料 ({0})",
-	"sendExtensions": "包含我已啟用擴充功能 ({0})",
-	"sendSearchedExtensions": "傳送已搜尋的擴充功能 ({0})",
-	"sendSettingsSearchDetails": "傳送設置搜尋詳細資料 ({0})"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/code/electron-browser/processExplorer/processExplorerMain.i18n.json b/i18n/cht/src/vs/code/electron-browser/processExplorer/processExplorerMain.i18n.json
deleted file mode 100644
index 5c87f722316..00000000000
--- a/i18n/cht/src/vs/code/electron-browser/processExplorer/processExplorerMain.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"cpu": "CPU %",
-	"memory": "記憶體 (MB)",
-	"pid": "pid",
-	"name": "名稱",
-	"killProcess": "關閉處理序",
-	"forceKillProcess": "強制關閉處理序",
-	"copy": "複製",
-	"copyAll": "全部複製"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/code/electron-main/auth.i18n.json b/i18n/cht/src/vs/code/electron-main/auth.i18n.json
deleted file mode 100644
index e6c89f97dd8..00000000000
--- a/i18n/cht/src/vs/code/electron-main/auth.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"authRequire": "必須進行 Proxy 驗證 ",
-	"proxyauth": "Proxy {0} 必須進行驗證。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/code/electron-main/logUploader.i18n.json b/i18n/cht/src/vs/code/electron-main/logUploader.i18n.json
deleted file mode 100644
index 353e452eb1a..00000000000
--- a/i18n/cht/src/vs/code/electron-main/logUploader.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"invalidEndpoint": "記錄檔上傳者端點無效",
-	"beginUploading": "上傳中...",
-	"didUploadLogs": "上傳成功! 記錄檔識別碼: {0}",
-	"logUploadPromptHeader": "您即將將工作階段記錄上傳到安全的 Microsoft 端點，只有 VS Code 小組的 Microsoft 成員能夠存取。",
-	"logUploadPromptBody": "工作階段記錄可能包含完整路徑或檔案內容等個人資訊。請從此處檢閱並編輯您的工作階段記錄檔: '{0}'",
-	"logUploadPromptBodyDetails": "繼續進行即表示您確認已對工作階段記錄檔進行檢閱與編輯，並接受 Microsoft 將其用於偵錯 VS Code。",
-	"logUploadPromptAcceptInstructions": "請執行程式碼 '--upload-logs={0}' 以繼續上傳",
-	"postError": "張貼記錄時發生錯誤: {0}",
-	"responseError": "張貼記錄時發生錯誤。得到 {0} - {1}",
-	"parseError": "剖析回應時發生錯誤",
-	"zipError": "壓縮記錄檔時發生錯誤: {0}"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/code/electron-main/main.i18n.json b/i18n/cht/src/vs/code/electron-main/main.i18n.json
deleted file mode 100644
index 3ef3df123ca..00000000000
--- a/i18n/cht/src/vs/code/electron-main/main.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"secondInstanceNoResponse": "另一個 {0} 執行個體正在執行，但沒有回應",
-	"secondInstanceNoResponseDetail": "請關閉其他所有執行個體，然後再試一次。",
-	"secondInstanceAdmin": "{0} 的第二個實例已作為管理員運行。",
-	"secondInstanceAdminDetail": "請關閉其他執行個體，然後再試一次。",
-	"close": "關閉(&&C)"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/code/electron-main/menus.i18n.json b/i18n/cht/src/vs/code/electron-main/menus.i18n.json
deleted file mode 100644
index 5f037b2a895..00000000000
--- a/i18n/cht/src/vs/code/electron-main/menus.i18n.json
+++ /dev/null
@@ -1,193 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"mFile": "檔案 (&&F)",
-	"mEdit": "編輯(&&E)",
-	"mSelection": "選取項目(&&S)",
-	"mView": "檢視 (&&V)",
-	"mGoto": "前往(&&G)",
-	"mDebug": "偵錯 (&&D)",
-	"mWindow": "視窗",
-	"mHelp": "說明 (&&H)",
-	"mTask": "工作(&&T)",
-	"miNewWindow": "開新視窗(&&W)",
-	"mAbout": "關於 {0}",
-	"mServices": "服務",
-	"mHide": "隱藏 {0}",
-	"mHideOthers": "隱藏其他",
-	"mShowAll": "全部顯示",
-	"miQuit": "結束 {0}",
-	"miNewFile": "新增檔案(&&N)",
-	"miOpen": "開啟(&&O)...",
-	"miOpenWorkspace": "開啟工作區 (&&k)...",
-	"miOpenFolder": "開啟資料夾(&&F)...",
-	"miOpenFile": "開啟檔案(&&O)...",
-	"miOpenRecent": "開啟最近的檔案(&&R)",
-	"miSaveWorkspaceAs": "另存工作區為...",
-	"miAddFolderToWorkspace": "新增資料夾至工作區 (&&A)...",
-	"miSave": "儲存(&&S)",
-	"miSaveAs": "另存新檔(&&A)...",
-	"miSaveAll": "全部儲存(&&L)",
-	"miAutoSave": "自動儲存",
-	"miRevert": "還原檔案(&&V)",
-	"miCloseWindow": "關閉視窗(&&E)",
-	"miCloseWorkspace": "關閉工作區(&&W)",
-	"miCloseFolder": "關閉資料夾(&&F)",
-	"miCloseEditor": "關閉編輯器(&&C)",
-	"miExit": "結束(&&X)",
-	"miOpenSettings": "設定(&&S)",
-	"miOpenKeymap": "鍵盤快速鍵(&&K)",
-	"miOpenKeymapExtensions": "按鍵對應延伸模組(&&K)",
-	"miOpenSnippets": "使用者程式碼片段(&&S)",
-	"miSelectColorTheme": "色彩佈景主題(&&C)",
-	"miSelectIconTheme": "檔案圖示佈景主題(&&I)",
-	"miPreferences": "喜好設定(&&P)",
-	"miReopenClosedEditor": "重新開啟已關閉的編輯器(&&R)",
-	"miMore": "更多(&&M)...",
-	"miClearRecentOpen": "清除最近開啟的(&&C)",
-	"miUndo": "復原(&&U)",
-	"miRedo": "重做(&&R)",
-	"miCut": "剪下(&&T)",
-	"miCopy": "複製(&&C)",
-	"miPaste": "貼上(&&P)",
-	"miFind": "尋找(&&F)",
-	"miReplace": "取代(&&R)",
-	"miFindInFiles": "在檔案中尋找(&&I)",
-	"miReplaceInFiles": "檔案中取代(&&I)",
-	"miEmmetExpandAbbreviation": "Emmet: 展開縮寫(&&X)",
-	"miShowEmmetCommands": "Emmet(&&M)...",
-	"miToggleLineComment": "切換行註解(&&T)",
-	"miToggleBlockComment": "切換區塊註解(&&B)",
-	"miMultiCursorAlt": "切換到 Alt+ 按一下啟用多重游標",
-	"miMultiCursorCmd": "切換到 Cmd+ 按一下啟用多重游標",
-	"miMultiCursorCtrl": "切換到 Ctrl+ 按一下啟用多重游標",
-	"miInsertCursorAbove": "在上方新增游標(&&A)",
-	"miInsertCursorBelow": "在下方新增游標(&&D)",
-	"miInsertCursorAtEndOfEachLineSelected": "在行尾新增游標(&&U)",
-	"miAddSelectionToNextFindMatch": "新增下一個項目(&&N)",
-	"miAddSelectionToPreviousFindMatch": "新增上一個項目(&&R)",
-	"miSelectHighlights": "選取所有項目(&&O)",
-	"miCopyLinesUp": "將行向上複製(&&C)",
-	"miCopyLinesDown": "將行向下複製(&&P)",
-	"miMoveLinesUp": "上移一行(&&V)",
-	"miMoveLinesDown": "下移一行(&&L)",
-	"miSelectAll": "全選(&&S)",
-	"miSmartSelectGrow": "展開選取範圍(&&E)",
-	"miSmartSelectShrink": "壓縮選取範圍(&&S)",
-	"miViewExplorer": "檔案總管(&&E)",
-	"miViewSearch": "搜尋(&&S)",
-	"miViewSCM": "SCM",
-	"miViewDebug": "偵錯 (&&D)",
-	"miViewExtensions": "擴充功能(&&X)",
-	"miToggleOutput": "輸出(&&O)",
-	"miToggleDebugConsole": "偵錯主控台(&&B)",
-	"miToggleIntegratedTerminal": "整合式終端機(&&I)",
-	"miMarker": "問題(&&P)",
-	"miCommandPalette": "命令選擇區(&&C)...",
-	"miOpenView": "開啟檢視(&&O)...",
-	"miToggleFullScreen": "切換全螢幕(&&F)",
-	"miToggleZenMode": "切換無干擾模式",
-	"miToggleCenteredLayout": "切換置中配置",
-	"miToggleMenuBar": "切換功能表列(&&B)",
-	"miSplitEditor": "分割編輯器(&&E)",
-	"miToggleEditorLayout": "切換編輯器群組配置(&&L)",
-	"miToggleSidebar": "切換提要欄位(&&T)",
-	"miMoveSidebarRight": "將提要欄位右移(&&M)",
-	"miMoveSidebarLeft": "將提要欄位左移(&&M)",
-	"miTogglePanel": "切換面板(&&P)",
-	"miHideStatusbar": "隱藏狀態列(&&H)",
-	"miShowStatusbar": "顯示狀態列(&&S)",
-	"miHideActivityBar": "隱藏活動列(&&A)",
-	"miShowActivityBar": "顯示活動列(&&A)",
-	"miToggleWordWrap": "切換自動換行(&&W)",
-	"miToggleMinimap": "切換迷你地圖(&M)",
-	"miToggleRenderWhitespace": "切換轉譯空白字元(&&R)",
-	"miToggleRenderControlCharacters": "切換&&控制字元",
-	"miZoomIn": "放大(&&Z)",
-	"miZoomOut": "縮小(&&U)",
-	"miZoomReset": "重設縮放(&&R)",
-	"miBack": "上一步(&B)",
-	"miForward": "下一頁(&&F)",
-	"miNextEditor": "下一個編輯器(&&N)",
-	"miPreviousEditor": "上一個編輯器(&&P)",
-	"miNextEditorInGroup": "群組中下一個已使用的編輯器(&&N)",
-	"miPreviousEditorInGroup": "群組中上一個已使用的編輯器(&&P)",
-	"miSwitchEditor": "切換編輯器(&&E)",
-	"miFocusFirstGroup": "第一個群組(&&F)",
-	"miFocusSecondGroup": "第二個群組(&&S)",
-	"miFocusThirdGroup": "第三個群組(&&T)",
-	"miNextGroup": "下一個群組(&&N)",
-	"miPreviousGroup": "上一個群組(&&P)",
-	"miSwitchGroup": "切換群組(&&G)",
-	"miGotoFile": "移至檔案(&&F)...",
-	"miGotoSymbolInFile": "前往檔案中的符號(&&S)...",
-	"miGotoSymbolInWorkspace": "前往工作區中的符號(&&W)...",
-	"miGotoDefinition": "移至定義(&&D)",
-	"miGotoTypeDefinition": "移至類型定義(&&T)",
-	"miGotoImplementation": "前往實作(&&I)",
-	"miGotoLine": "移至行(&&L)...",
-	"miStartDebugging": "啟動偵錯(&&S)",
-	"miStartWithoutDebugging": "只啟動但不偵錯(&&W)",
-	"miStopDebugging": "停止偵錯(&&S)",
-	"miRestart Debugging": "重新啟動偵錯(&&R)",
-	"miOpenConfigurations": "開啟設定(&&C)",
-	"miAddConfiguration": "新增組態...",
-	"miStepOver": "不進入函式(&&O)",
-	"miStepInto": "逐步執行(&&I)",
-	"miStepOut": "跳離函式(&&U)",
-	"miContinue": "繼續(&&C)",
-	"miToggleBreakpoint": "切換中斷點(&&B)",
-	"miConditionalBreakpoint": "條件式中斷點(&&C)...",
-	"miInlineBreakpoint": "內嵌中斷點",
-	"miFunctionBreakpoint": "函式中斷點(&&F}...",
-	"miLogPoint": "&&記錄點...",
-	"miNewBreakpoint": "新增中斷點(&&N)",
-	"miEnableAllBreakpoints": "啟用所有中斷點",
-	"miDisableAllBreakpoints": "停用所有中斷點(&&L)",
-	"miRemoveAllBreakpoints": "移除所有中斷點(&&R)",
-	"miInstallAdditionalDebuggers": "安裝其他偵錯工具(&&I)...",
-	"mMinimize": "最小化",
-	"mZoom": "縮放",
-	"mBringToFront": "全部提到最上層",
-	"miSwitchWindow": "切換視窗(&&W)",
-	"mShowPreviousTab": "顯示上一個頁籤",
-	"mShowNextTab": "顯示下一個頁籤",
-	"mMoveTabToNewWindow": "移動頁籤至新視窗",
-	"mMergeAllWindows": "合併所有視窗",
-	"miToggleDevTools": "切換開發人員工具(&&T)",
-	"miAccessibilityOptions": "協助工具選項(&&O)",
-	"miOpenProcessExplorerer": "開啟處理序總管 (&&P)",
-	"miReportIssue": "回報問題 (&&I)",
-	"miWelcome": "歡迎使用(&&W)",
-	"miInteractivePlayground": "Interactive Playground(&&I)",
-	"miDocumentation": "文件(&&D)",
-	"miReleaseNotes": "版本資訊(&&R)",
-	"miKeyboardShortcuts": "鍵盤快速鍵參考(&&K)",
-	"miIntroductoryVideos": "簡介影片(&&V)",
-	"miTipsAndTricks": "秘訣與提示(&&T)",
-	"miTwitter": "加入我們的 Twitter(&&J)",
-	"miUserVoice": "搜尋功能要求(&&S)",
-	"miLicense": "檢視授權(&&L)",
-	"miPrivacyStatement": "隱私權聲明(&&P)",
-	"miAbout": "關於(&&A)",
-	"miRunTask": "執行工作(&&R)",
-	"miBuildTask": "執行建置工作(&&B)...",
-	"miRunningTask": "顯示執行中的工作(&&G)...",
-	"miRestartTask": "重新開始執行工作(&&E)...",
-	"miTerminateTask": "終止工作(&&T)...",
-	"miConfigureTask": "設定工作(&&C)",
-	"miConfigureBuildTask": "設定預設建置工作(&&F)...",
-	"accessibilityOptionsWindowTitle": "協助工具選項",
-	"miCheckForUpdates": "查看是否有更新",
-	"miCheckingForUpdates": "正在查看是否有更新...",
-	"miDownloadUpdate": "下載可用更新",
-	"miDownloadingUpdate": "正在下載更新...",
-	"miInstallUpdate": "安裝更新...",
-	"miInstallingUpdate": "正在安裝更新...",
-	"miRestartToUpdate": "重新啟動以更新..."
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/code/electron-main/window.i18n.json b/i18n/cht/src/vs/code/electron-main/window.i18n.json
deleted file mode 100644
index 532e962cdee..00000000000
--- a/i18n/cht/src/vs/code/electron-main/window.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hiddenMenuBar": "您仍然可以按 Alt 鍵來存取功能表列。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/code/electron-main/windows.i18n.json b/i18n/cht/src/vs/code/electron-main/windows.i18n.json
deleted file mode 100644
index 0f0e6e8b8de..00000000000
--- a/i18n/cht/src/vs/code/electron-main/windows.i18n.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"ok": "確定",
-	"pathNotExistTitle": "路徑不存在",
-	"pathNotExistDetail": "磁碟上似乎已沒有路徑 '{0}'。",
-	"reopen": "重新開啟(&&R)",
-	"wait": "繼續等候(&&K)",
-	"close": "關閉(&&C)",
-	"appStalled": "視窗已沒有回應",
-	"appStalledDetail": "您可以重新開啟或關閉視窗，或是繼續等候。",
-	"appCrashed": "視窗已損毀",
-	"appCrashedDetail": "很抱歉造成您的不便! 您可以重新開啟視窗，從您離開的地方繼續進行。",
-	"open": "開啟",
-	"openFolder": "開啟資料夾",
-	"openFile": "開啟檔案",
-	"workspaceOpenedMessage": "無法儲存工作區 '{0}'",
-	"workspaceOpenedDetail": "此工作區已在其他視窗中開啟。請先關閉該視窗再重試一次。",
-	"openWorkspace": "開啟(&&O)...",
-	"openWorkspaceTitle": "開啟工作區",
-	"save": "儲存(&&S)",
-	"doNotSave": "不要儲存(&&N)",
-	"cancel": "取消",
-	"saveWorkspaceMessage": "要將工作區組態儲存為檔案嗎?",
-	"saveWorkspaceDetail": "如果您預計再次開啟工作區，請儲存工作區。",
-	"saveWorkspace": "儲存工作區"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/code/node/cliProcessMain.i18n.json b/i18n/cht/src/vs/code/node/cliProcessMain.i18n.json
deleted file mode 100644
index 8923a6c9eae..00000000000
--- a/i18n/cht/src/vs/code/node/cliProcessMain.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"notFound": "找不到擴充功能 '{0}'。",
-	"notInstalled": "未安裝擴充功能 '{0}'。",
-	"useId": "請確定您使用完整擴充功能識別碼 (包括發行者)，例如: {0}",
-	"successVsixInstall": "已成功安裝延伸模組 '{0}'!",
-	"cancelVsixInstall": "已取消安裝擴充功能 \"{0}\"。",
-	"alreadyInstalled": "已安裝過擴充功能 '{0}'。",
-	"foundExtension": "在市集中找到 '{0}'。",
-	"installing": "正在安裝...",
-	"successInstall": "已成功安裝擴充功能 '{0}' v{1}!",
-	"uninstalling": "正在將 {0} 解除安裝...",
-	"successUninstall": "已成功將擴充功能 '{0}' 解除安裝!"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/editor/browser/services/bulkEdit.i18n.json b/i18n/cht/src/vs/editor/browser/services/bulkEdit.i18n.json
deleted file mode 100644
index 6b06734150d..00000000000
--- a/i18n/cht/src/vs/editor/browser/services/bulkEdit.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"summary.0": "未進行任何編輯",
-	"summary.nm": "在 {1} 個檔案中進行了 {0} 項文字編輯",
-	"summary.n0": "在一個檔案中進行了 {0} 項文字編輯",
-	"conflict": "這些檔案已同時變更: {0}"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/editor/browser/widget/codeEditorWidget.i18n.json b/i18n/cht/src/vs/editor/browser/widget/codeEditorWidget.i18n.json
deleted file mode 100644
index 9ba9d8d6b87..00000000000
--- a/i18n/cht/src/vs/editor/browser/widget/codeEditorWidget.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"cursors.maximum": "游標數已限制為 {0} 個。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/editor/browser/widget/diffEditorWidget.i18n.json b/i18n/cht/src/vs/editor/browser/widget/diffEditorWidget.i18n.json
deleted file mode 100644
index 859ea73188c..00000000000
--- a/i18n/cht/src/vs/editor/browser/widget/diffEditorWidget.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"diff.tooLarge": "因其中一個檔案過大而無法比較。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/editor/browser/widget/diffReview.i18n.json b/i18n/cht/src/vs/editor/browser/widget/diffReview.i18n.json
deleted file mode 100644
index 53633b55880..00000000000
--- a/i18n/cht/src/vs/editor/browser/widget/diffReview.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"label.close": "關閉",
-	"no_lines": "沒有任何行",
-	"one_line": "1 個行",
-	"more_lines": "{0} 個行",
-	"header": "{1} 的 {0} 不同: 原始為 {2}，{3}，修改後為 {4}，{5}",
-	"blankLine": "空白",
-	"equalLine": "原始 {0},修改後{1}: {2",
-	"insertLine": "+ 修改後 {0}: {1}",
-	"deleteLine": "- 原始 {0}: {1}",
-	"editor.action.diffReview.next": "移至下一個差異",
-	"editor.action.diffReview.prev": "移至上一個差異"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/editor/common/commonCodeEditor.i18n.json b/i18n/cht/src/vs/editor/common/commonCodeEditor.i18n.json
deleted file mode 100644
index 9ba9d8d6b87..00000000000
--- a/i18n/cht/src/vs/editor/common/commonCodeEditor.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"cursors.maximum": "游標數已限制為 {0} 個。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/editor/common/config/commonEditorConfig.i18n.json b/i18n/cht/src/vs/editor/common/config/commonEditorConfig.i18n.json
deleted file mode 100644
index 15a1cfb1f06..00000000000
--- a/i18n/cht/src/vs/editor/common/config/commonEditorConfig.i18n.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"editorConfigurationTitle": "編輯器",
-	"fontFamily": "控制字型家族。",
-	"fontWeight": "控制字型寬度。",
-	"fontSize": "控制字型大小 (以像素為單位)。",
-	"lineHeight": "控制行高。使用 0 會從 fontSize 計算 lineHeight。",
-	"letterSpacing": "控制字元間距 (以像素為單位)",
-	"lineNumbers.off": "不顯示行號。",
-	"lineNumbers.on": "行號以絕對值顯示。",
-	"lineNumbers.relative": "行號以目前游標的相對值顯示。",
-	"lineNumbers.interval": "每 10 行顯示行號。",
-	"lineNumbers": "控制行號的顯示。",
-	"rulers": "在特定的等寬字元數之後轉譯垂直尺規。有多個尺規就使用多個值。若陣列為空，則不繪製任何尺規。",
-	"wordSeparators": "執行文字相關導覽或作業時將作為文字分隔符號的字元",
-	"tabSize": "與 Tab 相等的空格數量。當 `editor.detectIndentation` 已開啟時，會根據檔案內容覆寫此設定。",
-	"tabSize.errorMessage": "必須是 'number'。請注意，值 \"auto\" 已由 `editor.detectIndentation` 設定取代。",
-	"insertSpaces": "與 Tab 相等的空格數量。當 `editor.detectIndentation` 已開啟時，會根據檔案內容覆寫此設定。",
-	"insertSpaces.errorMessage": "必須是 'boolean'。請注意，值 \"auto\" 已由 `editor.detect Indentation` 設定取代。",
-	"detectIndentation": "開啟檔案時，會依據檔案內容來偵測 `editor.tabSize` 及 `editor.insertSpaces`。",
-	"roundedSelection": "控制選取範圍是否有圓角",
-	"scrollBeyondLastLine": "控制編輯器是否會捲動到最後一行之後",
-	"scrollBeyondLastColumn": "控制編輯器水平捲動所超出的額外字元數",
-	"smoothScrolling": "控制編輯器是否會使用動畫捲動",
-	"minimap.enabled": "控制是否會顯示迷你地圖",
-	"minimap.side": "控制要在哪端呈現迷你地圖。",
-	"minimap.showSlider": "自動隱藏迷你地圖滑桿",
-	"minimap.renderCharacters": "呈現行內的實際字元 (而不是彩色區塊)",
-	"minimap.maxColumn": "限制迷你地圖的寬度，以呈現最多的資料行",
-	"find.seedSearchStringFromSelection": "控制編譯器選取範圍是否預設為尋找工具的搜尋字串",
-	"find.autoFindInSelection": "控制編譯器內選取多字元或多行內文是否開啟選取範圍尋找功能",
-	"find.globalFindClipboard": "控制尋找小工具是否在 macOS 上讀取或修改共用尋找剪貼簿  ",
-	"wordWrap.off": "一律不換行。",
-	"wordWrap.on": "依檢視區寬度換行。",
-	"wordWrap.wordWrapColumn": "於 'editor.wordWrapColumn' 換行。",
-	"wordWrap.bounded": "當檢視區縮至最小並設定 'editor.wordWrapColumn' 時換行。",
-	"wordWrap": "控制是否自動換行。可以是:\n - 'off' (停用換行),\n - 'on' (檢視區換行),\n - 'wordWrapColumn' (於 'editor.wordWrapColumn' 換行`) 或\n - 'bounded' (當檢視區縮至最小並設定 'editor.wordWrapColumn' 時換行).",
-	"wordWrapColumn": "當 `editor.wordWrap` 為 [wordWrapColumn] 或 [bounded] 時，控制編輯器中的資料行換行。",
-	"wrappingIndent": "控制換行的縮排。可以是 'none'、'same' 或 'deepIndent'。",
-	"mouseWheelScrollSensitivity": "滑鼠滾輪捲動事件的 'deltaX' 與 'deltaY' 所使用的乘數",
-	"multiCursorModifier.ctrlCmd": "對應 Windows 和 Linux 的 `Control` 與對應 macOS 的 `Command`",
-	"multiCursorModifier.alt": "對應 Windows 和 Linux 的 `Alt` 與對應 macOS 的 `Option`",
-	"multiCursorModifier": "用於新增多個滑鼠游標的修改。 `ctrlCmd` 會對應到 Windows 和 Linux 上的 `Control` 以及 macOS 上的 `Command`。 [移至定義] 及 [開啟連結] 滑鼠手勢將會適應以避免和 multicursor 修改衝突。",
-	"multiCursorMergeOverlapping": "在多個游標重疊時將其合併。",
-	"quickSuggestions.strings": "允許在字串內顯示即時建議。",
-	"quickSuggestions.comments": "允許在註解中顯示即時建議。",
-	"quickSuggestions.other": "允許在字串與註解以外之處顯示即時建議。",
-	"quickSuggestions": "控制是否應在輸入時自動顯示建議",
-	"quickSuggestionsDelay": "控制延遲顯示快速建議的毫秒數",
-	"parameterHints": "當您輸入時啟用彈出視窗，顯示參數文件與類型資訊",
-	"autoClosingBrackets": "控制編輯器是否應在左括號後自動插入右括號",
-	"formatOnType": "控制編輯器是否應在輸入一行後自動格式化",
-	"formatOnPaste": "控制編輯器是否應自動設定貼上的內容格式。格式器必須可供使用，而且格式器應該能夠設定文件中一個範圍的格式。",
-	"autoIndent": "控制當使用者輸入, 貼上或移行時，編輯器應自動調整縮排。語言的縮排規則必須可用",
-	"suggestOnTriggerCharacters": "控制輸入觸發字元時，是否應自動顯示建議",
-	"acceptSuggestionOnEnter": "控制除了 'Tab' 外，是否也藉由按下 'Enter' 接受建議。如此可避免混淆要插入新行或接受建議。設定值'smart'表示在文字變更同時，只透過Enter接受建議。",
-	"acceptSuggestionOnCommitCharacter": "控制認可字元是否應接受建議。例如在 JavaScript 中，分號 (';') 可以是接受建議並鍵入該字元的認可字元。",
-	"snippetSuggestions.top": "將程式碼片段建議顯示於其他建議的頂端。",
-	"snippetSuggestions.bottom": "將程式碼片段建議顯示於其他建議的下方。",
-	"snippetSuggestions.inline": "將程式碼片段建議與其他建議一同顯示。",
-	"snippetSuggestions.none": "不顯示程式碼片段建議。",
-	"snippetSuggestions": "控制程式碼片段是否隨其他建議顯示，以及其排序方式。",
-	"emptySelectionClipboard": "控制複製時不選取任何項目是否會複製目前程式行。",
-	"wordBasedSuggestions": "控制是否應根據文件中的單字計算自動完成。",
-	"suggestSelection.first": "一律選取第一個建議。",
-	"suggestSelection.recentlyUsed": "除非進一步的鍵入選取一個建議，否則選取最近的建議。例如，因為 `log` 最近完成，所以 `console.| -> console.log`。",
-	"suggestSelection.recentlyUsedByPrefix": "根據先前已完成這些建議的首碼選取建議。例如，`co -> console` 與 `con -> const`。",
-	"suggestSelection": "控制在顯示建議清單時如何預先選取建議。",
-	"suggestFontSize": "建議小工具的字型大小",
-	"suggestLineHeight": "建議小工具的行高",
-	"selectionHighlight": "控制編輯器是否應反白顯示與選取範圍相似的符合項",
-	"occurrencesHighlight": "控制編輯器是否應反白顯示出現的語意符號",
-	"overviewRulerLanes": "控制可在概觀尺規中相同位置顯示的裝飾項目數",
-	"overviewRulerBorder": "控制是否應在概觀尺規周圍繪製邊框。",
-	"cursorBlinking": "控制游標動畫樣式。",
-	"mouseWheelZoom": "使用滑鼠滾輪並按住 Ctrl 時，縮放編輯器的字型",
-	"cursorStyle": "控制游標樣式。接受的值為 'block'、'block-outline'、'line'、'line-thin'、'underline' 及 'underline-thin'",
-	"cursorWidth": "控制游標寬度，當 editor.cursorStyle 設定為 'line' 時。",
-	"fontLigatures": "啟用連字字型",
-	"hideCursorInOverviewRuler": "控制游標是否應隱藏在概觀尺規中。",
-	"renderWhitespace": "控制編輯器轉譯空白字元的方式，可能為 'none'、'boundary' 及 'all'。'boundary' 選項不會轉譯字組間的單一空格。",
-	"renderControlCharacters": "控制編輯器是否應顯示控制字元",
-	"renderIndentGuides": "控制編輯器是否應顯示縮排輔助線",
-	"renderLineHighlight": "控制編輯器應如何轉譯目前反白的行，可能的值有 'none'、'gutter'、'line' 和 'all'。",
-	"codeLens": "控制編輯器是否顯示 CodeLens",
-	"folding": "控制編輯器是否已啟用程式碼摺疊功能",
-	"foldingStrategyAuto": "如果可行，請使用語言特定摺疊策略，否則請退回至縮排式策略。",
-	"foldingStrategyIndentation": "一律使用縮排式摺疊策略",
-	"foldingStrategy": "控制折疊範圍的計算方式。'auto' 會在可行的情況下挑選使用語言特定摺疊策略。'indentation' 則會強制使用縮排式摺疊策略。",
-	"showFoldingControls": "自動隱藏摺疊控制向",
-	"matchBrackets": "當選取某側的括號時，強調顯示另一側的配對括號。",
-	"glyphMargin": "控制編輯器是否應轉譯垂直字符邊界。字符邊界最常用來進行偵錯。",
-	"useTabStops": "插入和刪除接在定位停駐點後的空白字元",
-	"trimAutoWhitespace": "移除尾端自動插入的空白字元",
-	"stablePeek": "讓預覽編輯器在使用者按兩下其內容或點擊 Escape 時保持開啟。",
-	"dragAndDrop": "控制編輯器是否允許透過拖放動作移動選取範圍。",
-	"accessibilitySupport.auto": "編輯器將使用平台 API 以偵測螢幕助讀程式附加。",
-	"accessibilitySupport.on": "編輯器將會為螢幕助讀程式的使用方式永久地最佳化。",
-	"accessibilitySupport.off": "編輯器不會為螢幕助讀程式的使用方式進行最佳化。",
-	"accessibilitySupport": "控制編輯器是否應於已為螢幕助讀程式最佳化的模式中執行。",
-	"links": "控制編輯器是否應偵測連結且讓它可點擊",
-	"colorDecorators": "控制編輯器是否應轉譯內嵌色彩裝飾項目與色彩選擇器。",
-	"codeActions": "啟用程式動作燈泡提示",
-	"codeActionsOnSave.organizeImports": "要在儲存時執行組織匯入嗎?",
-	"codeActionsOnSave": "要在儲存時執行的程式碼動作種類。",
-	"codeActionsOnSaveTimeout": "儲存時執行的程式碼動作逾時。",
-	"selectionClipboard": "控制是否應支援 Linux 主要剪貼簿。",
-	"sideBySide": "控制 Diff 編輯器要並排或內嵌顯示差異",
-	"ignoreTrimWhitespace": "控制 Diff 編輯器是否將開頭或尾端空白字元的變更顯示為差異",
-	"largeFileOptimizations": "針對大型檔案停用部分高記憶體需求功能的特殊處理方式。",
-	"renderIndicators": "控制 Diff 編輯器是否要為新增的/移除的變更顯示 +/- 標記"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/editor/common/config/defaultConfig.i18n.json b/i18n/cht/src/vs/editor/common/config/defaultConfig.i18n.json
deleted file mode 100644
index f48289922ad..00000000000
--- a/i18n/cht/src/vs/editor/common/config/defaultConfig.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"editorViewAccessibleLabel": "編輯器內容"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/editor/common/config/editorOptions.i18n.json b/i18n/cht/src/vs/editor/common/config/editorOptions.i18n.json
deleted file mode 100644
index 8c7d2c010e3..00000000000
--- a/i18n/cht/src/vs/editor/common/config/editorOptions.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"accessibilityOffAriaLabel": "編輯器現在無法存取。按Alt+F1尋求選項",
-	"editorViewAccessibleLabel": "編輯器內容"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/editor/common/controller/cursor.i18n.json b/i18n/cht/src/vs/editor/common/controller/cursor.i18n.json
deleted file mode 100644
index 661093ae982..00000000000
--- a/i18n/cht/src/vs/editor/common/controller/cursor.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"corrupt.commands": "執行命令時發生未預期的例外狀況。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/editor/common/model/textModelWithTokens.i18n.json b/i18n/cht/src/vs/editor/common/model/textModelWithTokens.i18n.json
deleted file mode 100644
index 0e0c1c7212e..00000000000
--- a/i18n/cht/src/vs/editor/common/model/textModelWithTokens.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"mode.tokenizationSupportFailed": "將輸入語彙基元化時，模式失敗。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/editor/common/modes/modesRegistry.i18n.json b/i18n/cht/src/vs/editor/common/modes/modesRegistry.i18n.json
deleted file mode 100644
index 20ced9d2517..00000000000
--- a/i18n/cht/src/vs/editor/common/modes/modesRegistry.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"plainText.alias": "純文字"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/editor/common/services/bulkEdit.i18n.json b/i18n/cht/src/vs/editor/common/services/bulkEdit.i18n.json
deleted file mode 100644
index cf3f3771d6a..00000000000
--- a/i18n/cht/src/vs/editor/common/services/bulkEdit.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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}",
-	"summary.0": "未進行任何編輯",
-	"summary.nm": "在 {1} 個檔案中進行了 {0} 項文字編輯",
-	"summary.n0": "在一個檔案中進行了 {0} 項文字編輯"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/editor/common/services/modeServiceImpl.i18n.json b/i18n/cht/src/vs/editor/common/services/modeServiceImpl.i18n.json
deleted file mode 100644
index 8be2d8858a6..00000000000
--- a/i18n/cht/src/vs/editor/common/services/modeServiceImpl.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"vscode.extension.contributes.languages": "提供語言宣告。",
-	"vscode.extension.contributes.languages.id": "語言的識別碼。",
-	"vscode.extension.contributes.languages.aliases": "語言的別名名稱。",
-	"vscode.extension.contributes.languages.extensions": "與語言相關聯的副檔名。",
-	"vscode.extension.contributes.languages.filenames": "與語言相關聯的檔案名稱。",
-	"vscode.extension.contributes.languages.filenamePatterns": "與語言相關聯的檔案名稱 Glob 模式。",
-	"vscode.extension.contributes.languages.mimetypes": "與語言相關聯的 MIME 類型。",
-	"vscode.extension.contributes.languages.firstLine": "規則運算式，符合語言檔案的第一行。",
-	"vscode.extension.contributes.languages.configuration": "檔案的相對路徑，其中該檔案包含語言組態選項。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/editor/common/services/modelServiceImpl.i18n.json b/i18n/cht/src/vs/editor/common/services/modelServiceImpl.i18n.json
deleted file mode 100644
index e12a9398484..00000000000
--- a/i18n/cht/src/vs/editor/common/services/modelServiceImpl.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"diagAndSourceMultiline": "[{0}]\n{1}",
-	"diagAndSource": "[{0}] {1}"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/editor/common/view/editorColorRegistry.i18n.json b/i18n/cht/src/vs/editor/common/view/editorColorRegistry.i18n.json
deleted file mode 100644
index 66736a4e736..00000000000
--- a/i18n/cht/src/vs/editor/common/view/editorColorRegistry.i18n.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"lineHighlight": "目前游標位置行的反白顯示背景色彩。",
-	"lineHighlightBorderBox": "目前游標位置行之周圍框線的背景色彩。",
-	"rangeHighlight": "突顯顯示範圍的背景顏色，例如快速開啟和尋找功能。不能使用非透明的顏色來隱藏底層的樣式。",
-	"rangeHighlightBorder": "反白顯示範圍周圍邊框的背景顏色。",
-	"caret": "編輯器游標的色彩。",
-	"editorCursorBackground": "編輯器游標的背景色彩。允許自訂區塊游標重疊的字元色彩。",
-	"editorWhitespaces": "編輯器中空白字元的色彩。",
-	"editorIndentGuides": "編輯器縮排輔助線的色彩。",
-	"editorActiveIndentGuide": "使用中編輯器縮排輔助線的色彩。",
-	"editorLineNumbers": "編輯器行號的色彩。",
-	"editorActiveLineNumber": "編輯器使用中行號的色彩 ",
-	"deprecatedEditorActiveLineNumber": "Id 已取代。請改用 'editorLineNumber.activeForeground' 。",
-	"editorRuler": "編輯器尺規的色彩",
-	"editorCodeLensForeground": "編輯器程式碼濾鏡的前景色彩",
-	"editorBracketMatchBackground": "成對括號背景色彩",
-	"editorBracketMatchBorder": "成對括號邊框色彩",
-	"editorOverviewRulerBorder": "預覽檢視編輯器尺規的邊框色彩.",
-	"editorGutter": "編輯器邊框的背景顏色,包含行號與字形圖示的邊框.",
-	"errorForeground": "編輯器內錯誤提示線的前景色彩.",
-	"errorBorder": "編輯器內錯誤提示線的邊框色彩.",
-	"warningForeground": "編輯器內警告提示線的前景色彩.",
-	"warningBorder": "編輯器內警告提示線的邊框色彩.",
-	"infoForeground": "編輯器內資訊提示線的前景色彩",
-	"infoBorder": "編輯器內資訊提示線的邊框色彩",
-	"hintForeground": "編輯器內提示訊息的提示線前景色彩",
-	"hintBorder": "編輯器內提示訊息的提示線邊框色彩",
-	"unnecessaryForeground": "編輯器中不必要程式碼的前景色彩。",
-	"overviewRulerRangeHighlight": "概述反白範圍的尺規標記顏色。不能使用非透明的顏色來隱藏底層的樣式。",
-	"overviewRuleError": "錯誤的概觀尺規標記色彩。",
-	"overviewRuleWarning": "警示的概觀尺規標記色彩。",
-	"overviewRuleInfo": "資訊的概觀尺規標記色彩。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/editor/contrib/accessibility/browser/accessibility.i18n.json b/i18n/cht/src/vs/editor/contrib/accessibility/browser/accessibility.i18n.json
deleted file mode 100644
index c08a059fc1a..00000000000
--- a/i18n/cht/src/vs/editor/contrib/accessibility/browser/accessibility.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"introMsg": "感謝您試用 VS Code 的協助工具選項。",
-	"status": "狀態:",
-	"tabFocusModeOnMsg": "在目前的編輯器中按 Tab 鍵會將焦點移至下一個可設定焦點的元素。按 {0} 可切換此行為。",
-	"tabFocusModeOnMsgNoKb": "在目前的編輯器中按 Tab 鍵會將焦點移至下一個可設定焦點的元素。命令 {0} 目前無法由按鍵繫結關係觸發。",
-	"tabFocusModeOffMsg": "在目前的編輯器中按 Tab 鍵會插入定位字元。按 {0} 可切換此行為。",
-	"tabFocusModeOffMsgNoKb": "在目前的編輯器中按 Tab 鍵會插入定位字元。命令 {0} 目前無法由按鍵繫結關係觸發。",
-	"outroMsg": "您可以按 Esc 鍵來解除此工具提示並返回編輯器。",
-	"ShowAccessibilityHelpAction": "顯示協助工具說明"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/editor/contrib/bracketMatching/bracketMatching.i18n.json b/i18n/cht/src/vs/editor/contrib/bracketMatching/bracketMatching.i18n.json
deleted file mode 100644
index 0b42de2f004..00000000000
--- a/i18n/cht/src/vs/editor/contrib/bracketMatching/bracketMatching.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"overviewRulerBracketMatchForeground": "成對括弧的概觀尺規標記色彩。",
-	"smartSelect.jumpBracket": "移至方括弧",
-	"smartSelect.selectToBracket": "選取至括弧"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/editor/contrib/bracketMatching/common/bracketMatching.i18n.json b/i18n/cht/src/vs/editor/contrib/bracketMatching/common/bracketMatching.i18n.json
deleted file mode 100644
index 1f0f5396a7c..00000000000
--- a/i18n/cht/src/vs/editor/contrib/bracketMatching/common/bracketMatching.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"smartSelect.jumpBracket": "移至方括弧"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/editor/contrib/caretOperations/caretOperations.i18n.json b/i18n/cht/src/vs/editor/contrib/caretOperations/caretOperations.i18n.json
deleted file mode 100644
index 9176e1b88c6..00000000000
--- a/i18n/cht/src/vs/editor/contrib/caretOperations/caretOperations.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"caret.moveLeft": "將插入點左移",
-	"caret.moveRight": "將插入點右移"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/editor/contrib/caretOperations/common/caretOperations.i18n.json b/i18n/cht/src/vs/editor/contrib/caretOperations/common/caretOperations.i18n.json
deleted file mode 100644
index c91537d9f09..00000000000
--- a/i18n/cht/src/vs/editor/contrib/caretOperations/common/caretOperations.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"caret.moveLeft": "將插入點左移",
-	"caret.moveRight": "將插入點右移"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/editor/contrib/caretOperations/common/transpose.i18n.json b/i18n/cht/src/vs/editor/contrib/caretOperations/common/transpose.i18n.json
deleted file mode 100644
index 0fdec24164c..00000000000
--- a/i18n/cht/src/vs/editor/contrib/caretOperations/common/transpose.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"transposeLetters.label": "調換字母"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/editor/contrib/caretOperations/transpose.i18n.json b/i18n/cht/src/vs/editor/contrib/caretOperations/transpose.i18n.json
deleted file mode 100644
index 607554f6d41..00000000000
--- a/i18n/cht/src/vs/editor/contrib/caretOperations/transpose.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"transposeLetters.label": "調換字母"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/editor/contrib/clipboard/browser/clipboard.i18n.json b/i18n/cht/src/vs/editor/contrib/clipboard/browser/clipboard.i18n.json
deleted file mode 100644
index ed1d999b907..00000000000
--- a/i18n/cht/src/vs/editor/contrib/clipboard/browser/clipboard.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"actions.clipboard.cutLabel": "剪下",
-	"actions.clipboard.copyLabel": "複製",
-	"actions.clipboard.pasteLabel": "貼上",
-	"actions.clipboard.copyWithSyntaxHighlightingLabel": "隨語法醒目提示複製"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/editor/contrib/clipboard/clipboard.i18n.json b/i18n/cht/src/vs/editor/contrib/clipboard/clipboard.i18n.json
deleted file mode 100644
index 1d9bb3e45bc..00000000000
--- a/i18n/cht/src/vs/editor/contrib/clipboard/clipboard.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"actions.clipboard.cutLabel": "剪下",
-	"actions.clipboard.copyLabel": "複製",
-	"actions.clipboard.pasteLabel": "貼上",
-	"actions.clipboard.copyWithSyntaxHighlightingLabel": "隨語法醒目提示複製"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/editor/contrib/codeAction/codeActionCommands.i18n.json b/i18n/cht/src/vs/editor/contrib/codeAction/codeActionCommands.i18n.json
deleted file mode 100644
index aa47b7bc824..00000000000
--- a/i18n/cht/src/vs/editor/contrib/codeAction/codeActionCommands.i18n.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"quickFixWithKb": "顯示修正 ({0})",
-	"quickFix": "顯示修正",
-	"quickfix.trigger.label": "快速修復...",
-	"editor.action.quickFix.noneMessage": "沒有可用的程式碼操作",
-	"refactor.label": "重構...",
-	"editor.action.refactor.noneMessage": "沒有可用的重構",
-	"source.label": "來源動作...",
-	"editor.action.source.noneMessage": "沒有可用的來源動作",
-	"organizeImports.label": "組織匯入",
-	"editor.action.organize.noneMessage": "沒有任何可用的組織匯入動作"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/editor/contrib/comment/comment.i18n.json b/i18n/cht/src/vs/editor/contrib/comment/comment.i18n.json
deleted file mode 100644
index 7e887fa6a98..00000000000
--- a/i18n/cht/src/vs/editor/contrib/comment/comment.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"comment.line": "切換行註解",
-	"comment.line.add": "加入行註解",
-	"comment.line.remove": "移除行註解",
-	"comment.block": "切換區塊註解"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/editor/contrib/comment/common/comment.i18n.json b/i18n/cht/src/vs/editor/contrib/comment/common/comment.i18n.json
deleted file mode 100644
index 1179814825d..00000000000
--- a/i18n/cht/src/vs/editor/contrib/comment/common/comment.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"comment.line": "切換行註解",
-	"comment.line.add": "加入行註解",
-	"comment.line.remove": "移除行註解",
-	"comment.block": "切換區塊註解"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/editor/contrib/contextmenu/browser/contextmenu.i18n.json b/i18n/cht/src/vs/editor/contrib/contextmenu/browser/contextmenu.i18n.json
deleted file mode 100644
index 90809e4802b..00000000000
--- a/i18n/cht/src/vs/editor/contrib/contextmenu/browser/contextmenu.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"action.showContextMenu.label": "顯示編輯器內容功能表"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/editor/contrib/contextmenu/contextmenu.i18n.json b/i18n/cht/src/vs/editor/contrib/contextmenu/contextmenu.i18n.json
deleted file mode 100644
index cf0bac1e6ba..00000000000
--- a/i18n/cht/src/vs/editor/contrib/contextmenu/contextmenu.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"action.showContextMenu.label": "顯示編輯器內容功能表"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/editor/contrib/find/browser/findWidget.i18n.json b/i18n/cht/src/vs/editor/contrib/find/browser/findWidget.i18n.json
deleted file mode 100644
index 7b79c72e500..00000000000
--- a/i18n/cht/src/vs/editor/contrib/find/browser/findWidget.i18n.json
+++ /dev/null
@@ -1,21 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"label.find": "尋找",
-	"placeholder.find": "尋找",
-	"label.previousMatchButton": "上一個符合項",
-	"label.nextMatchButton": "下一個相符項",
-	"label.toggleSelectionFind": "在選取範圍中尋找",
-	"label.closeButton": "關閉",
-	"label.replace": "取代",
-	"placeholder.replace": "取代",
-	"label.replaceButton": "取代",
-	"label.replaceAllButton": "全部取代",
-	"label.toggleReplaceButton": "切換取代模式",
-	"title.matchesCountLimit": "僅反白顯示前 {0} 筆結果，但所有尋找作業會在完整文字上執行。",
-	"label.matchesLocation": "{0} / {1}",
-	"label.noResults": "沒有結果"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/editor/contrib/find/browser/simpleFindWidget.i18n.json b/i18n/cht/src/vs/editor/contrib/find/browser/simpleFindWidget.i18n.json
deleted file mode 100644
index f2ff92bce07..00000000000
--- a/i18n/cht/src/vs/editor/contrib/find/browser/simpleFindWidget.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"label.find": "尋找",
-	"placeholder.find": "尋找",
-	"label.previousMatchButton": "上一個符合項",
-	"label.nextMatchButton": "下一個相符項",
-	"label.closeButton": "關閉"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/editor/contrib/find/common/findController.i18n.json b/i18n/cht/src/vs/editor/contrib/find/common/findController.i18n.json
deleted file mode 100644
index cbbf89b710f..00000000000
--- a/i18n/cht/src/vs/editor/contrib/find/common/findController.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"startFindAction": "尋找",
-	"findNextMatchAction": "尋找下一個",
-	"findPreviousMatchAction": "尋找上一個",
-	"nextSelectionMatchFindAction": "尋找下一個選取項目",
-	"previousSelectionMatchFindAction": "尋找上一個選取項目",
-	"startReplace": "取代",
-	"showNextFindTermAction": "顯示下一個尋找字詞",
-	"showPreviousFindTermAction": "顯示上一個尋找字詞"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/editor/contrib/find/findController.i18n.json b/i18n/cht/src/vs/editor/contrib/find/findController.i18n.json
deleted file mode 100644
index 204b3af146d..00000000000
--- a/i18n/cht/src/vs/editor/contrib/find/findController.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"startFindAction": "尋找",
-	"startFindWithSelectionAction": "尋找選取項目",
-	"findNextMatchAction": "尋找下一個",
-	"findPreviousMatchAction": "尋找上一個",
-	"nextSelectionMatchFindAction": "尋找下一個選取項目",
-	"previousSelectionMatchFindAction": "尋找上一個選取項目",
-	"startReplace": "取代",
-	"showNextFindTermAction": "顯示下一個尋找字詞",
-	"showPreviousFindTermAction": "顯示上一個尋找字詞"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/editor/contrib/find/findWidget.i18n.json b/i18n/cht/src/vs/editor/contrib/find/findWidget.i18n.json
deleted file mode 100644
index a946f170afb..00000000000
--- a/i18n/cht/src/vs/editor/contrib/find/findWidget.i18n.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"label.find": "尋找",
-	"placeholder.find": "尋找",
-	"label.previousMatchButton": "上一個符合項",
-	"label.nextMatchButton": "下一個相符項",
-	"label.toggleSelectionFind": "在選取範圍中尋找",
-	"label.closeButton": "關閉",
-	"label.replace": "取代",
-	"placeholder.replace": "取代",
-	"label.replaceButton": "取代",
-	"label.replaceAllButton": "全部取代",
-	"label.toggleReplaceButton": "切換取代模式",
-	"title.matchesCountLimit": "僅反白顯示前 {0} 筆結果，但所有尋找作業會在完整文字上執行。",
-	"label.matchesLocation": "{0} / {1}",
-	"label.noResults": "沒有結果"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/editor/contrib/find/simpleFindWidget.i18n.json b/i18n/cht/src/vs/editor/contrib/find/simpleFindWidget.i18n.json
deleted file mode 100644
index e40f392b463..00000000000
--- a/i18n/cht/src/vs/editor/contrib/find/simpleFindWidget.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"label.find": "尋找",
-	"placeholder.find": "尋找",
-	"label.previousMatchButton": "上一個符合項",
-	"label.nextMatchButton": "下一個相符項",
-	"label.closeButton": "關閉"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/editor/contrib/folding/browser/folding.i18n.json b/i18n/cht/src/vs/editor/contrib/folding/browser/folding.i18n.json
deleted file mode 100644
index 1b002f9dd0d..00000000000
--- a/i18n/cht/src/vs/editor/contrib/folding/browser/folding.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"unfoldAction.label": "展開",
-	"unFoldRecursivelyAction.label": "以遞迴方式展開",
-	"foldAction.label": "摺疊",
-	"foldRecursivelyAction.label": "以遞迴方式摺疊",
-	"foldAllAction.label": "全部摺疊",
-	"unfoldAllAction.label": "全部展開",
-	"foldLevelAction.label": "摺疊層級 {0}"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/editor/contrib/folding/folding.i18n.json b/i18n/cht/src/vs/editor/contrib/folding/folding.i18n.json
deleted file mode 100644
index a6a6e14fc00..00000000000
--- a/i18n/cht/src/vs/editor/contrib/folding/folding.i18n.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"unfoldAction.label": "展開",
-	"unFoldRecursivelyAction.label": "以遞迴方式展開",
-	"foldAction.label": "摺疊",
-	"foldRecursivelyAction.label": "以遞迴方式摺疊",
-	"foldAllBlockComments.label": "摺疊全部區塊註解",
-	"foldAllMarkerRegions.label": "折疊所有區域",
-	"unfoldAllMarkerRegions.label": "展開所有區域",
-	"foldAllAction.label": "全部摺疊",
-	"unfoldAllAction.label": "全部展開",
-	"foldLevelAction.label": "摺疊層級 {0}"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/editor/contrib/fontZoom/fontZoom.i18n.json b/i18n/cht/src/vs/editor/contrib/fontZoom/fontZoom.i18n.json
deleted file mode 100644
index 105a545c251..00000000000
--- a/i18n/cht/src/vs/editor/contrib/fontZoom/fontZoom.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"EditorFontZoomIn.label": "編輯器字體放大",
-	"EditorFontZoomOut.label": "編輯器字型縮小",
-	"EditorFontZoomReset.label": "編輯器字體重設縮放"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/editor/contrib/format/browser/formatActions.i18n.json b/i18n/cht/src/vs/editor/contrib/format/browser/formatActions.i18n.json
deleted file mode 100644
index 84321c58d5f..00000000000
--- a/i18n/cht/src/vs/editor/contrib/format/browser/formatActions.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"hint11": "在行 {0} 編輯了 1 項格式",
-	"hintn1": "在行 {1} 編輯了 {0} 項格式",
-	"hint1n": "在行 {0} 與行 {1} 之間編輯了 1 項格式",
-	"hintnn": "在行 {1} 與行 {2} 之間編輯了 {0} 項格式",
-	"no.provider": "抱歉，尚無安裝適用於 '{0}' 檔案的格式器",
-	"formatDocument.label": "將文件格式化",
-	"formatSelection.label": "將選取項目格式化"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/editor/contrib/format/formatActions.i18n.json b/i18n/cht/src/vs/editor/contrib/format/formatActions.i18n.json
deleted file mode 100644
index 16fb9e10b1a..00000000000
--- a/i18n/cht/src/vs/editor/contrib/format/formatActions.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hint11": "在行 {0} 編輯了 1 項格式",
-	"hintn1": "在行 {1} 編輯了 {0} 項格式",
-	"hint1n": "在行 {0} 與行 {1} 之間編輯了 1 項格式",
-	"hintnn": "在行 {1} 與行 {2} 之間編輯了 {0} 項格式",
-	"no.provider": "尚無安裝適用於 '{0}' 檔案的格式器",
-	"formatDocument.label": "將文件格式化",
-	"no.documentprovider": "未安裝 '{0}' 檔案的文件格式器。",
-	"formatSelection.label": "將選取項目格式化",
-	"no.selectionprovider": "未安裝 '{0}' 檔案的選擇格式器。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.i18n.json b/i18n/cht/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.i18n.json
deleted file mode 100644
index 9af28821a92..00000000000
--- a/i18n/cht/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.i18n.json
+++ /dev/null
@@ -1,24 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"noResultWord": "找不到 '{0}' 的定義",
-	"generic.noResults": "找不到任何定義",
-	"meta.title": " - {0} 個定義",
-	"actions.goToDecl.label": "移至定義",
-	"actions.goToDeclToSide.label": "在一側開啟定義",
-	"actions.previewDecl.label": "預覽定義",
-	"goToImplementation.noResultWord": "找不到 '{0}' 的任何實作",
-	"goToImplementation.generic.noResults": "找不到任何實作",
-	"meta.implementations.title": " – {0} 個實作",
-	"actions.goToImplementation.label": "前往實作",
-	"actions.peekImplementation.label": "預覽實作",
-	"goToTypeDefinition.noResultWord": "找不到 '{0}' 的任何類型定義",
-	"goToTypeDefinition.generic.noResults": "找不到任何類型定義",
-	"meta.typeDefinitions.title": " – {0} 個定義",
-	"actions.goToTypeDefinition.label": "移至類型定義",
-	"actions.peekTypeDefinition.label": "預覽類型定義",
-	"multipleResults": "按一下以顯示 {0} 項定義。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/editor/contrib/goToDeclaration/browser/goToDeclarationCommands.i18n.json b/i18n/cht/src/vs/editor/contrib/goToDeclaration/browser/goToDeclarationCommands.i18n.json
deleted file mode 100644
index 26ea0a1761c..00000000000
--- a/i18n/cht/src/vs/editor/contrib/goToDeclaration/browser/goToDeclarationCommands.i18n.json
+++ /dev/null
@@ -1,23 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"noResultWord": "找不到 '{0}' 的定義",
-	"generic.noResults": "找不到任何定義",
-	"meta.title": " - {0} 個定義",
-	"actions.goToDecl.label": "移至定義",
-	"actions.goToDeclToSide.label": "在一側開啟定義",
-	"actions.previewDecl.label": "預覽定義",
-	"goToImplementation.noResultWord": "找不到 '{0}' 的任何實作",
-	"goToImplementation.generic.noResults": "找不到任何實作",
-	"meta.implementations.title": " – {0} 個實作",
-	"actions.goToImplementation.label": "前往實作",
-	"actions.peekImplementation.label": "預覽實作",
-	"goToTypeDefinition.noResultWord": "找不到 '{0}' 的任何類型定義",
-	"goToTypeDefinition.generic.noResults": "找不到任何類型定義",
-	"meta.typeDefinitions.title": " – {0} 個定義",
-	"actions.goToTypeDefinition.label": "移至類型定義",
-	"actions.peekTypeDefinition.label": "預覽類型定義"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/editor/contrib/goToDeclaration/browser/goToDeclarationMouse.i18n.json b/i18n/cht/src/vs/editor/contrib/goToDeclaration/browser/goToDeclarationMouse.i18n.json
deleted file mode 100644
index 24cf4f7503f..00000000000
--- a/i18n/cht/src/vs/editor/contrib/goToDeclaration/browser/goToDeclarationMouse.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"multipleResults": "按一下以顯示 {0} 項定義。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/editor/contrib/goToDeclaration/goToDeclarationCommands.i18n.json b/i18n/cht/src/vs/editor/contrib/goToDeclaration/goToDeclarationCommands.i18n.json
deleted file mode 100644
index 0a7549d729d..00000000000
--- a/i18n/cht/src/vs/editor/contrib/goToDeclaration/goToDeclarationCommands.i18n.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noResultWord": "找不到 '{0}' 的定義",
-	"generic.noResults": "找不到任何定義",
-	"meta.title": " - {0} 個定義",
-	"actions.goToDecl.label": "移至定義",
-	"actions.goToDeclToSide.label": "在一側開啟定義",
-	"actions.previewDecl.label": "預覽定義",
-	"goToImplementation.noResultWord": "找不到 '{0}' 的任何實作",
-	"goToImplementation.generic.noResults": "找不到任何實作",
-	"meta.implementations.title": " – {0} 個實作",
-	"actions.goToImplementation.label": "前往實作",
-	"actions.peekImplementation.label": "預覽實作",
-	"goToTypeDefinition.noResultWord": "找不到 '{0}' 的任何類型定義",
-	"goToTypeDefinition.generic.noResults": "找不到任何類型定義",
-	"meta.typeDefinitions.title": " – {0} 個定義",
-	"actions.goToTypeDefinition.label": "移至類型定義",
-	"actions.peekTypeDefinition.label": "預覽類型定義"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/editor/contrib/goToDeclaration/goToDeclarationMouse.i18n.json b/i18n/cht/src/vs/editor/contrib/goToDeclaration/goToDeclarationMouse.i18n.json
deleted file mode 100644
index b2fa307e489..00000000000
--- a/i18n/cht/src/vs/editor/contrib/goToDeclaration/goToDeclarationMouse.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"multipleResults": "按一下以顯示 {0} 項定義。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/editor/contrib/goToDefinition/goToDefinitionCommands.i18n.json b/i18n/cht/src/vs/editor/contrib/goToDefinition/goToDefinitionCommands.i18n.json
deleted file mode 100644
index 0a7549d729d..00000000000
--- a/i18n/cht/src/vs/editor/contrib/goToDefinition/goToDefinitionCommands.i18n.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noResultWord": "找不到 '{0}' 的定義",
-	"generic.noResults": "找不到任何定義",
-	"meta.title": " - {0} 個定義",
-	"actions.goToDecl.label": "移至定義",
-	"actions.goToDeclToSide.label": "在一側開啟定義",
-	"actions.previewDecl.label": "預覽定義",
-	"goToImplementation.noResultWord": "找不到 '{0}' 的任何實作",
-	"goToImplementation.generic.noResults": "找不到任何實作",
-	"meta.implementations.title": " – {0} 個實作",
-	"actions.goToImplementation.label": "前往實作",
-	"actions.peekImplementation.label": "預覽實作",
-	"goToTypeDefinition.noResultWord": "找不到 '{0}' 的任何類型定義",
-	"goToTypeDefinition.generic.noResults": "找不到任何類型定義",
-	"meta.typeDefinitions.title": " – {0} 個定義",
-	"actions.goToTypeDefinition.label": "移至類型定義",
-	"actions.peekTypeDefinition.label": "預覽類型定義"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/editor/contrib/goToDefinition/goToDefinitionMouse.i18n.json b/i18n/cht/src/vs/editor/contrib/goToDefinition/goToDefinitionMouse.i18n.json
deleted file mode 100644
index b2fa307e489..00000000000
--- a/i18n/cht/src/vs/editor/contrib/goToDefinition/goToDefinitionMouse.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"multipleResults": "按一下以顯示 {0} 項定義。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/editor/contrib/gotoError/browser/gotoError.i18n.json b/i18n/cht/src/vs/editor/contrib/gotoError/browser/gotoError.i18n.json
deleted file mode 100644
index 9fbf329131b..00000000000
--- a/i18n/cht/src/vs/editor/contrib/gotoError/browser/gotoError.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"title.wo_source": "({0}/{1})",
-	"markerAction.next.label": "移至下一個錯誤或警告",
-	"markerAction.previous.label": "移至上一個錯誤或警告",
-	"editorMarkerNavigationError": "編輯器標記導覽小工具錯誤的色彩。",
-	"editorMarkerNavigationWarning": "編輯器標記導覽小工具警告的色彩。",
-	"editorMarkerNavigationInfo": "編輯器標記導覽小工具資訊的色彩",
-	"editorMarkerNavigationBackground": "編輯器標記導覽小工具的背景。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/editor/contrib/gotoError/gotoError.i18n.json b/i18n/cht/src/vs/editor/contrib/gotoError/gotoError.i18n.json
deleted file mode 100644
index 36aedfc24d5..00000000000
--- a/i18n/cht/src/vs/editor/contrib/gotoError/gotoError.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"markerAction.next.label": "移至下一個問題 (錯誤, 警告, 資訊)",
-	"markerAction.previous.label": "移至上一個問題 (錯誤, 警告, 資訊)",
-	"markerAction.nextInFiles.label": "移至檔案裡面的下一個問題 (錯誤, 警告, 資訊)",
-	"markerAction.previousInFiles.label": "移至檔案裡面的上一個問題 (錯誤, 警告, 資訊)"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json b/i18n/cht/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json
deleted file mode 100644
index 11b5e18ff6c..00000000000
--- a/i18n/cht/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"title.wo_source": "({0}/{1})",
-	"editorMarkerNavigationError": "編輯器標記導覽小工具錯誤的色彩。",
-	"editorMarkerNavigationWarning": "編輯器標記導覽小工具警告的色彩。",
-	"editorMarkerNavigationInfo": "編輯器標記導覽小工具資訊的色彩",
-	"editorMarkerNavigationBackground": "編輯器標記導覽小工具的背景。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/editor/contrib/hover/browser/hover.i18n.json b/i18n/cht/src/vs/editor/contrib/hover/browser/hover.i18n.json
deleted file mode 100644
index 7895cc33c1f..00000000000
--- a/i18n/cht/src/vs/editor/contrib/hover/browser/hover.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"showHover": "動態顯示"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/editor/contrib/hover/browser/modesContentHover.i18n.json b/i18n/cht/src/vs/editor/contrib/hover/browser/modesContentHover.i18n.json
deleted file mode 100644
index 08e865d8b15..00000000000
--- a/i18n/cht/src/vs/editor/contrib/hover/browser/modesContentHover.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"modesContentHover.loading": "正在載入..."
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/editor/contrib/hover/hover.i18n.json b/i18n/cht/src/vs/editor/contrib/hover/hover.i18n.json
deleted file mode 100644
index c04625e8438..00000000000
--- a/i18n/cht/src/vs/editor/contrib/hover/hover.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"showHover": "動態顯示"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/editor/contrib/hover/modesContentHover.i18n.json b/i18n/cht/src/vs/editor/contrib/hover/modesContentHover.i18n.json
deleted file mode 100644
index 171abb4b913..00000000000
--- a/i18n/cht/src/vs/editor/contrib/hover/modesContentHover.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"modesContentHover.loading": "正在載入..."
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/editor/contrib/inPlaceReplace/common/inPlaceReplace.i18n.json b/i18n/cht/src/vs/editor/contrib/inPlaceReplace/common/inPlaceReplace.i18n.json
deleted file mode 100644
index 48be4f65048..00000000000
--- a/i18n/cht/src/vs/editor/contrib/inPlaceReplace/common/inPlaceReplace.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"InPlaceReplaceAction.previous.label": "以上一個值取代",
-	"InPlaceReplaceAction.next.label": "以下一個值取代"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/editor/contrib/inPlaceReplace/inPlaceReplace.i18n.json b/i18n/cht/src/vs/editor/contrib/inPlaceReplace/inPlaceReplace.i18n.json
deleted file mode 100644
index a9da9239035..00000000000
--- a/i18n/cht/src/vs/editor/contrib/inPlaceReplace/inPlaceReplace.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"InPlaceReplaceAction.previous.label": "以上一個值取代",
-	"InPlaceReplaceAction.next.label": "以下一個值取代"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/editor/contrib/indentation/common/indentation.i18n.json b/i18n/cht/src/vs/editor/contrib/indentation/common/indentation.i18n.json
deleted file mode 100644
index 174b6d1af3f..00000000000
--- a/i18n/cht/src/vs/editor/contrib/indentation/common/indentation.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"indentationToSpaces": "將縮排轉換成空格",
-	"indentationToTabs": "將縮排轉換成定位點",
-	"configuredTabSize": "已設定的定位點大小",
-	"selectTabWidth": "選取目前檔案的定位點大小",
-	"indentUsingTabs": "使用 Tab 進行縮排",
-	"indentUsingSpaces": "使用空格鍵進行縮排",
-	"detectIndentation": "偵測內容中的縮排",
-	"editor.reindentlines": "重新將行縮排"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/editor/contrib/indentation/indentation.i18n.json b/i18n/cht/src/vs/editor/contrib/indentation/indentation.i18n.json
deleted file mode 100644
index 3e64ed6bba7..00000000000
--- a/i18n/cht/src/vs/editor/contrib/indentation/indentation.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"indentationToSpaces": "將縮排轉換成空格",
-	"indentationToTabs": "將縮排轉換成定位點",
-	"configuredTabSize": "已設定的定位點大小",
-	"selectTabWidth": "選取目前檔案的定位點大小",
-	"indentUsingTabs": "使用 Tab 進行縮排",
-	"indentUsingSpaces": "使用空格鍵進行縮排",
-	"detectIndentation": "偵測內容中的縮排",
-	"editor.reindentlines": "重新將行縮排",
-	"editor.reindentselectedlines": "重新將選取的行縮排"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/editor/contrib/inspectTMScopes/electron-browser/inspectTMScopes.i18n.json b/i18n/cht/src/vs/editor/contrib/inspectTMScopes/electron-browser/inspectTMScopes.i18n.json
deleted file mode 100644
index ef380d89f98..00000000000
--- a/i18n/cht/src/vs/editor/contrib/inspectTMScopes/electron-browser/inspectTMScopes.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"inspectTMScopes": "開發人員: 檢查 TM 範圍",
-	"inspectTMScopesWidget.loading": "正在載入..."
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/editor/contrib/linesOperations/common/linesOperations.i18n.json b/i18n/cht/src/vs/editor/contrib/linesOperations/common/linesOperations.i18n.json
deleted file mode 100644
index 80873b659f2..00000000000
--- a/i18n/cht/src/vs/editor/contrib/linesOperations/common/linesOperations.i18n.json
+++ /dev/null
@@ -1,25 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"lines.copyUp": "將行向上複製",
-	"lines.copyDown": "將行向下複製",
-	"lines.moveUp": "上移一行",
-	"lines.moveDown": "下移一行",
-	"lines.sortAscending": "遞增排序行",
-	"lines.sortDescending": "遞減排序行",
-	"lines.trimTrailingWhitespace": "修剪尾端空白",
-	"lines.delete": "刪除行",
-	"lines.indent": "縮排行",
-	"lines.outdent": "凸排行",
-	"lines.insertBefore": "在上方插入行",
-	"lines.insertAfter": "在下方插入行",
-	"lines.deleteAllLeft": "左邊全部刪除",
-	"lines.deleteAllRight": "刪除所有右方項目",
-	"lines.joinLines": "連接線",
-	"editor.transpose": "轉置游標周圍的字元數",
-	"editor.transformToUppercase": "轉換到大寫",
-	"editor.transformToLowercase": "轉換到小寫"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/editor/contrib/linesOperations/linesOperations.i18n.json b/i18n/cht/src/vs/editor/contrib/linesOperations/linesOperations.i18n.json
deleted file mode 100644
index a62fe81f01b..00000000000
--- a/i18n/cht/src/vs/editor/contrib/linesOperations/linesOperations.i18n.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"lines.copyUp": "將行向上複製",
-	"lines.copyDown": "將行向下複製",
-	"lines.moveUp": "上移一行",
-	"lines.moveDown": "下移一行",
-	"lines.sortAscending": "遞增排序行",
-	"lines.sortDescending": "遞減排序行",
-	"lines.trimTrailingWhitespace": "修剪尾端空白",
-	"lines.delete": "刪除行",
-	"lines.indent": "縮排行",
-	"lines.outdent": "凸排行",
-	"lines.insertBefore": "在上方插入行",
-	"lines.insertAfter": "在下方插入行",
-	"lines.deleteAllLeft": "左邊全部刪除",
-	"lines.deleteAllRight": "刪除所有右方項目",
-	"lines.joinLines": "連接線",
-	"editor.transpose": "轉置游標周圍的字元數",
-	"editor.transformToUppercase": "轉換到大寫",
-	"editor.transformToLowercase": "轉換到小寫"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/editor/contrib/links/browser/links.i18n.json b/i18n/cht/src/vs/editor/contrib/links/browser/links.i18n.json
deleted file mode 100644
index 5b2914f9c87..00000000000
--- a/i18n/cht/src/vs/editor/contrib/links/browser/links.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"links.navigate.mac": "按住 Cmd 並按一下按鍵以追蹤連結",
-	"links.navigate": "按住 Ctrl 並按一下滑鼠按鈕可連入連結",
-	"links.command.mac": "按住 Cmd 並按一下滑鼠以執行命令",
-	"links.command": "按住 Ctrl 並按一下滑鼠以執行命令",
-	"links.navigate.al": "按住Alt並點擊以追蹤連結",
-	"links.command.al": "按住 Alt 並按一下滑鼠以執行命令",
-	"invalid.url": "抱歉，因為此連結的語式不正確，所以無法加以開啟: {0}",
-	"missing.url": "抱歉，因為此連結遺失目標，所以無法加以開啟。",
-	"label": "開啟連結"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/editor/contrib/links/links.i18n.json b/i18n/cht/src/vs/editor/contrib/links/links.i18n.json
deleted file mode 100644
index d175645515a..00000000000
--- a/i18n/cht/src/vs/editor/contrib/links/links.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"links.navigate.mac": "按住 Cmd 並按一下滑鼠按鈕可連入連結",
-	"links.navigate": "按住 Ctrl 並按一下滑鼠按鈕可連入連結",
-	"links.command.mac": "按住 Cmd 並按一下滑鼠以執行命令",
-	"links.command": "按住 Ctrl 並按一下滑鼠以執行命令",
-	"links.navigate.al.mac": "按住 Option 並按一下滑鼠按鈕以追蹤連結",
-	"links.navigate.al": "按住Alt並點擊以追蹤連結",
-	"links.command.al.mac": "按住 Option 並按一下滑鼠以執行命令",
-	"links.command.al": "按住 Alt 並按一下滑鼠以執行命令",
-	"invalid.url": "因為此連結的格式不正確，所以無法開啟: {0}",
-	"missing.url": "因為此連結目標遺失，所以無法開啟。",
-	"label": "開啟連結"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/editor/contrib/message/messageController.i18n.json b/i18n/cht/src/vs/editor/contrib/message/messageController.i18n.json
deleted file mode 100644
index f6fa676ddd7..00000000000
--- a/i18n/cht/src/vs/editor/contrib/message/messageController.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"editor.readonly": "無法在唯讀編輯器中編輯"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/editor/contrib/multicursor/common/multicursor.i18n.json b/i18n/cht/src/vs/editor/contrib/multicursor/common/multicursor.i18n.json
deleted file mode 100644
index 381e4cfcb4c..00000000000
--- a/i18n/cht/src/vs/editor/contrib/multicursor/common/multicursor.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"mutlicursor.insertAbove": "在上方加入游標",
-	"mutlicursor.insertBelow": "在下方加入游標",
-	"mutlicursor.insertAtEndOfEachLineSelected": "在行尾新增游標",
-	"addSelectionToNextFindMatch": "將選取項目加入下一個找到的相符項",
-	"addSelectionToPreviousFindMatch": "將選取項目加入前一個找到的相符項中",
-	"moveSelectionToNextFindMatch": "將最後一個選擇項目移至下一個找到的相符項",
-	"moveSelectionToPreviousFindMatch": "將最後一個選擇項目移至前一個找到的相符項",
-	"selectAllOccurrencesOfFindMatch": "選取所有找到的相符項目",
-	"changeAll.label": "變更所有發生次數"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/editor/contrib/multicursor/multicursor.i18n.json b/i18n/cht/src/vs/editor/contrib/multicursor/multicursor.i18n.json
deleted file mode 100644
index 8eb7135060e..00000000000
--- a/i18n/cht/src/vs/editor/contrib/multicursor/multicursor.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"mutlicursor.insertAbove": "在上方加入游標",
-	"mutlicursor.insertBelow": "在下方加入游標",
-	"mutlicursor.insertAtEndOfEachLineSelected": "在行尾新增游標",
-	"addSelectionToNextFindMatch": "將選取項目加入下一個找到的相符項",
-	"addSelectionToPreviousFindMatch": "將選取項目加入前一個找到的相符項中",
-	"moveSelectionToNextFindMatch": "將最後一個選擇項目移至下一個找到的相符項",
-	"moveSelectionToPreviousFindMatch": "將最後一個選擇項目移至前一個找到的相符項",
-	"selectAllOccurrencesOfFindMatch": "選取所有找到的相符項目",
-	"changeAll.label": "變更所有發生次數"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/editor/contrib/parameterHints/browser/parameterHints.i18n.json b/i18n/cht/src/vs/editor/contrib/parameterHints/browser/parameterHints.i18n.json
deleted file mode 100644
index be94bfc3770..00000000000
--- a/i18n/cht/src/vs/editor/contrib/parameterHints/browser/parameterHints.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"parameterHints.trigger.label": "觸發參數提示"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/editor/contrib/parameterHints/browser/parameterHintsWidget.i18n.json b/i18n/cht/src/vs/editor/contrib/parameterHints/browser/parameterHintsWidget.i18n.json
deleted file mode 100644
index d56310c9916..00000000000
--- a/i18n/cht/src/vs/editor/contrib/parameterHints/browser/parameterHintsWidget.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"hint": "{0}，提示"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/editor/contrib/parameterHints/parameterHints.i18n.json b/i18n/cht/src/vs/editor/contrib/parameterHints/parameterHints.i18n.json
deleted file mode 100644
index 6838b4ecf1a..00000000000
--- a/i18n/cht/src/vs/editor/contrib/parameterHints/parameterHints.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"parameterHints.trigger.label": "觸發參數提示"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/editor/contrib/parameterHints/parameterHintsWidget.i18n.json b/i18n/cht/src/vs/editor/contrib/parameterHints/parameterHintsWidget.i18n.json
deleted file mode 100644
index 1336c4e8e07..00000000000
--- a/i18n/cht/src/vs/editor/contrib/parameterHints/parameterHintsWidget.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hint": "{0}，提示"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/editor/contrib/quickFix/browser/quickFixCommands.i18n.json b/i18n/cht/src/vs/editor/contrib/quickFix/browser/quickFixCommands.i18n.json
deleted file mode 100644
index faa980e9cbd..00000000000
--- a/i18n/cht/src/vs/editor/contrib/quickFix/browser/quickFixCommands.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"quickFixWithKb": "顯示修正 ({0})",
-	"quickFix": "顯示修正",
-	"quickfix.trigger.label": "Quick Fix"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/editor/contrib/quickFix/quickFixCommands.i18n.json b/i18n/cht/src/vs/editor/contrib/quickFix/quickFixCommands.i18n.json
deleted file mode 100644
index ecc3f0686d3..00000000000
--- a/i18n/cht/src/vs/editor/contrib/quickFix/quickFixCommands.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"quickFixWithKb": "顯示修正 ({0})",
-	"quickFix": "顯示修正",
-	"quickfix.trigger.label": "Quick Fix",
-	"refactor.label": "重構"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/editor/contrib/referenceSearch/browser/peekViewWidget.i18n.json b/i18n/cht/src/vs/editor/contrib/referenceSearch/browser/peekViewWidget.i18n.json
deleted file mode 100644
index 8b7662c4c93..00000000000
--- a/i18n/cht/src/vs/editor/contrib/referenceSearch/browser/peekViewWidget.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"label.close": "關閉"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/editor/contrib/referenceSearch/browser/referenceSearch.i18n.json b/i18n/cht/src/vs/editor/contrib/referenceSearch/browser/referenceSearch.i18n.json
deleted file mode 100644
index 6818cd5b159..00000000000
--- a/i18n/cht/src/vs/editor/contrib/referenceSearch/browser/referenceSearch.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"meta.titleReference": " - {0} 個參考",
-	"references.action.label": "尋找所有參考"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/editor/contrib/referenceSearch/browser/referencesController.i18n.json b/i18n/cht/src/vs/editor/contrib/referenceSearch/browser/referencesController.i18n.json
deleted file mode 100644
index 49f8938476d..00000000000
--- a/i18n/cht/src/vs/editor/contrib/referenceSearch/browser/referencesController.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"labelLoading": "正在載入..."
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/editor/contrib/referenceSearch/browser/referencesModel.i18n.json b/i18n/cht/src/vs/editor/contrib/referenceSearch/browser/referencesModel.i18n.json
deleted file mode 100644
index e42c2aa0966..00000000000
--- a/i18n/cht/src/vs/editor/contrib/referenceSearch/browser/referencesModel.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"aria.oneReference": "個符號位於 {0} 中的第 {1} 行第 {2} 欄",
-	"aria.fileReferences.1": "1 個符號位於 {0}, 完整路徑 {1}",
-	"aria.fileReferences.N": "{0} 個符號位於 {1}, 完整路徑 {2}",
-	"aria.result.0": "找不到結果",
-	"aria.result.1": "在 {0} 中找到 1 個符號",
-	"aria.result.n1": "在 {1} 中找到 {0} 個符號",
-	"aria.result.nm": "在 {1} 個檔案中找到 {0} 個符號"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/editor/contrib/referenceSearch/browser/referencesWidget.i18n.json b/i18n/cht/src/vs/editor/contrib/referenceSearch/browser/referencesWidget.i18n.json
deleted file mode 100644
index 3dca8b60ce1..00000000000
--- a/i18n/cht/src/vs/editor/contrib/referenceSearch/browser/referencesWidget.i18n.json
+++ /dev/null
@@ -1,27 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"referencesFailre": "無法解析檔案。",
-	"referencesCount": "{0} 個參考",
-	"referenceCount": "{0} 個參考",
-	"missingPreviewMessage": "無法預覽",
-	"treeAriaLabel": "參考",
-	"noResults": "沒有結果",
-	"peekView.alternateTitle": "參考",
-	"peekViewTitleBackground": "預覽檢視標題區域的背景色彩。",
-	"peekViewTitleForeground": "預覽檢視標題的色彩。",
-	"peekViewTitleInfoForeground": "預覽檢視標題資訊的色彩。",
-	"peekViewBorder": "預覽檢視之框線與箭頭的色彩。",
-	"peekViewResultsBackground": "預覽檢視中結果清單的背景色彩。",
-	"peekViewResultsMatchForeground": "預覽檢視結果列表中行節點的前景色彩",
-	"peekViewResultsFileForeground": "預覽檢視結果列表中檔案節點的前景色彩",
-	"peekViewResultsSelectionBackground": "在預覽檢視之結果清單中選取項目時的背景色彩。",
-	"peekViewResultsSelectionForeground": "在預覽檢視之結果清單中選取項目時的前景色彩。",
-	"peekViewEditorBackground": "預覽檢視編輯器的背景色彩。",
-	"peekViewEditorGutterBackground": "預覽檢視編輯器邊框(含行號或字形圖示)的背景色彩。",
-	"peekViewResultsMatchHighlight": "在預覽檢視編輯器中比對時的反白顯示色彩。",
-	"peekViewEditorMatchHighlight": "預覽檢視編輯器中比對時的反白顯示色彩。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/editor/contrib/referenceSearch/peekViewWidget.i18n.json b/i18n/cht/src/vs/editor/contrib/referenceSearch/peekViewWidget.i18n.json
deleted file mode 100644
index 3a62a154f7e..00000000000
--- a/i18n/cht/src/vs/editor/contrib/referenceSearch/peekViewWidget.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"label.close": "關閉"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/editor/contrib/referenceSearch/referenceSearch.i18n.json b/i18n/cht/src/vs/editor/contrib/referenceSearch/referenceSearch.i18n.json
deleted file mode 100644
index 83fffdb6bb8..00000000000
--- a/i18n/cht/src/vs/editor/contrib/referenceSearch/referenceSearch.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"meta.titleReference": " - {0} 個參考",
-	"references.action.label": "尋找所有參考"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/editor/contrib/referenceSearch/referencesController.i18n.json b/i18n/cht/src/vs/editor/contrib/referenceSearch/referencesController.i18n.json
deleted file mode 100644
index 89698296b4f..00000000000
--- a/i18n/cht/src/vs/editor/contrib/referenceSearch/referencesController.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"labelLoading": "正在載入..."
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/editor/contrib/referenceSearch/referencesModel.i18n.json b/i18n/cht/src/vs/editor/contrib/referenceSearch/referencesModel.i18n.json
deleted file mode 100644
index 72b8bc688fb..00000000000
--- a/i18n/cht/src/vs/editor/contrib/referenceSearch/referencesModel.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"aria.oneReference": "個符號位於 {0} 中的第 {1} 行第 {2} 欄",
-	"aria.fileReferences.1": "1 個符號位於 {0}, 完整路徑 {1}",
-	"aria.fileReferences.N": "{0} 個符號位於 {1}, 完整路徑 {2}",
-	"aria.result.0": "找不到結果",
-	"aria.result.1": "在 {0} 中找到 1 個符號",
-	"aria.result.n1": "在 {1} 中找到 {0} 個符號",
-	"aria.result.nm": "在 {1} 個檔案中找到 {0} 個符號"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/editor/contrib/referenceSearch/referencesWidget.i18n.json b/i18n/cht/src/vs/editor/contrib/referenceSearch/referencesWidget.i18n.json
deleted file mode 100644
index e9731705f94..00000000000
--- a/i18n/cht/src/vs/editor/contrib/referenceSearch/referencesWidget.i18n.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"referencesFailre": "無法解析檔案。",
-	"referencesCount": "{0} 個參考",
-	"referenceCount": "{0} 個參考",
-	"missingPreviewMessage": "無法預覽",
-	"treeAriaLabel": "參考",
-	"noResults": "沒有結果",
-	"peekView.alternateTitle": "參考",
-	"peekViewTitleBackground": "預覽檢視標題區域的背景色彩。",
-	"peekViewTitleForeground": "預覽檢視標題的色彩。",
-	"peekViewTitleInfoForeground": "預覽檢視標題資訊的色彩。",
-	"peekViewBorder": "預覽檢視之框線與箭頭的色彩。",
-	"peekViewResultsBackground": "預覽檢視中結果清單的背景色彩。",
-	"peekViewResultsMatchForeground": "預覽檢視結果列表中行節點的前景色彩",
-	"peekViewResultsFileForeground": "預覽檢視結果列表中檔案節點的前景色彩",
-	"peekViewResultsSelectionBackground": "在預覽檢視之結果清單中選取項目時的背景色彩。",
-	"peekViewResultsSelectionForeground": "在預覽檢視之結果清單中選取項目時的前景色彩。",
-	"peekViewEditorBackground": "預覽檢視編輯器的背景色彩。",
-	"peekViewEditorGutterBackground": "預覽檢視編輯器邊框(含行號或字形圖示)的背景色彩。",
-	"peekViewResultsMatchHighlight": "在預覽檢視編輯器中比對時的反白顯示色彩。",
-	"peekViewEditorMatchHighlight": "預覽檢視編輯器中比對時的反白顯示色彩。",
-	"peekViewEditorMatchHighlightBorder": "在預覽檢視編輯器中比對時的反白顯示邊界。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/editor/contrib/rename/browser/rename.i18n.json b/i18n/cht/src/vs/editor/contrib/rename/browser/rename.i18n.json
deleted file mode 100644
index e1b559cf2ec..00000000000
--- a/i18n/cht/src/vs/editor/contrib/rename/browser/rename.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"no result": "沒有結果。",
-	"aria": "已成功將 '{0}' 重新命名為 '{1}'。摘要: {2}",
-	"rename.failed": "抱歉，無法執行重新命名。",
-	"rename.label": "重新命名符號"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/editor/contrib/rename/browser/renameInputField.i18n.json b/i18n/cht/src/vs/editor/contrib/rename/browser/renameInputField.i18n.json
deleted file mode 100644
index 75bf62bd612..00000000000
--- a/i18n/cht/src/vs/editor/contrib/rename/browser/renameInputField.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"renameAriaLabel": "為輸入重新命名。請鍵入新名稱，然後按 Enter 以認可。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/editor/contrib/rename/rename.i18n.json b/i18n/cht/src/vs/editor/contrib/rename/rename.i18n.json
deleted file mode 100644
index 8e5f1002f0c..00000000000
--- a/i18n/cht/src/vs/editor/contrib/rename/rename.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"no result": "沒有結果。",
-	"aria": "已成功將 '{0}' 重新命名為 '{1}'。摘要: {2}",
-	"rename.failed": "重新命名無法執行。",
-	"rename.label": "重新命名符號"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/editor/contrib/rename/renameInputField.i18n.json b/i18n/cht/src/vs/editor/contrib/rename/renameInputField.i18n.json
deleted file mode 100644
index 80d00f3fc2d..00000000000
--- a/i18n/cht/src/vs/editor/contrib/rename/renameInputField.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"renameAriaLabel": "為輸入重新命名。請鍵入新名稱，然後按 Enter 以認可。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/editor/contrib/smartSelect/common/smartSelect.i18n.json b/i18n/cht/src/vs/editor/contrib/smartSelect/common/smartSelect.i18n.json
deleted file mode 100644
index a72697babba..00000000000
--- a/i18n/cht/src/vs/editor/contrib/smartSelect/common/smartSelect.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"smartSelect.grow": "展開選取",
-	"smartSelect.shrink": "縮小選取"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/editor/contrib/smartSelect/smartSelect.i18n.json b/i18n/cht/src/vs/editor/contrib/smartSelect/smartSelect.i18n.json
deleted file mode 100644
index a3e220c30e0..00000000000
--- a/i18n/cht/src/vs/editor/contrib/smartSelect/smartSelect.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"smartSelect.grow": "展開選取",
-	"smartSelect.shrink": "縮小選取"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/editor/contrib/snippet/snippetVariables.i18n.json b/i18n/cht/src/vs/editor/contrib/snippet/snippetVariables.i18n.json
deleted file mode 100644
index 54de5e0d2da..00000000000
--- a/i18n/cht/src/vs/editor/contrib/snippet/snippetVariables.i18n.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"Sunday": "星期日",
-	"Monday": "星期一",
-	"Tuesday": "星期二",
-	"Wednesday": "星期三",
-	"Thursday": "星期四",
-	"Friday": "星期五",
-	"Saturday": "星期六",
-	"SundayShort": "週日",
-	"MondayShort": "週一",
-	"TuesdayShort": "週二",
-	"WednesdayShort": "週三",
-	"ThursdayShort": "週四",
-	"FridayShort": "週五",
-	"SaturdayShort": "週六",
-	"January": "1月",
-	"February": "2月",
-	"March": "3月",
-	"April": "4月",
-	"May": "5月",
-	"June": "6月",
-	"July": "7月",
-	"August": "8月",
-	"September": "9月",
-	"October": "10月",
-	"November": "11月",
-	"December": "12月",
-	"JanuaryShort": "1月",
-	"FebruaryShort": "2月",
-	"MarchShort": "3月",
-	"AprilShort": "4月",
-	"MayShort": "5月",
-	"JuneShort": "6月",
-	"JulyShort": "7月",
-	"AugustShort": "8月",
-	"SeptemberShort": "9月",
-	"OctoberShort": "10月",
-	"NovemberShort": "11月",
-	"DecemberShort": "12月"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/editor/contrib/suggest/browser/suggestController.i18n.json b/i18n/cht/src/vs/editor/contrib/suggest/browser/suggestController.i18n.json
deleted file mode 100644
index 87e19ea32a1..00000000000
--- a/i18n/cht/src/vs/editor/contrib/suggest/browser/suggestController.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"arai.alert.snippet": "接受 '{0}' 時接受了插入下列文字: {1}",
-	"suggest.trigger.label": "觸發建議"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/editor/contrib/suggest/browser/suggestWidget.i18n.json b/i18n/cht/src/vs/editor/contrib/suggest/browser/suggestWidget.i18n.json
deleted file mode 100644
index beb2f4690fc..00000000000
--- a/i18n/cht/src/vs/editor/contrib/suggest/browser/suggestWidget.i18n.json
+++ /dev/null
@@ -1,21 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"editorSuggestWidgetBackground": "建議小工具的背景色彩。",
-	"editorSuggestWidgetBorder": "建議小工具的邊界色彩。",
-	"editorSuggestWidgetForeground": "建議小工具的前景色彩。",
-	"editorSuggestWidgetSelectedBackground": "建議小工具中所選項目的背景色彩。",
-	"editorSuggestWidgetHighlightForeground": "建議小工具中相符醒目提示的色彩。",
-	"readMore": "進一步了解...{0}",
-	"suggestionWithDetailsAriaLabel": "{0}，建議，有詳細資料",
-	"suggestionAriaLabel": "{0}，建議",
-	"readLess": "簡易說明...{0}",
-	"suggestWidget.loading": "正在載入...",
-	"suggestWidget.noSuggestions": "無建議。",
-	"suggestionAriaAccepted": "{0}，接受",
-	"ariaCurrentSuggestionWithDetails": "{0}，建議，有詳細資料",
-	"ariaCurrentSuggestion": "{0}，建議"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/editor/contrib/suggest/suggestController.i18n.json b/i18n/cht/src/vs/editor/contrib/suggest/suggestController.i18n.json
deleted file mode 100644
index 8a8d6d87484..00000000000
--- a/i18n/cht/src/vs/editor/contrib/suggest/suggestController.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"arai.alert.snippet": "接受 '{0}' 時接受了插入下列文字: {1}",
-	"suggest.trigger.label": "觸發建議"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/editor/contrib/suggest/suggestWidget.i18n.json b/i18n/cht/src/vs/editor/contrib/suggest/suggestWidget.i18n.json
deleted file mode 100644
index 89096d2e777..00000000000
--- a/i18n/cht/src/vs/editor/contrib/suggest/suggestWidget.i18n.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"editorSuggestWidgetBackground": "建議小工具的背景色彩。",
-	"editorSuggestWidgetBorder": "建議小工具的邊界色彩。",
-	"editorSuggestWidgetForeground": "建議小工具的前景色彩。",
-	"editorSuggestWidgetSelectedBackground": "建議小工具中所選項目的背景色彩。",
-	"editorSuggestWidgetHighlightForeground": "建議小工具中相符醒目提示的色彩。",
-	"readMore": "進一步了解...{0}",
-	"suggestionWithDetailsAriaLabel": "{0}，建議，有詳細資料",
-	"suggestionAriaLabel": "{0}，建議",
-	"readLess": "簡易說明...{0}",
-	"suggestWidget.loading": "正在載入...",
-	"suggestWidget.noSuggestions": "無建議。",
-	"suggestionAriaAccepted": "{0}，接受",
-	"ariaCurrentSuggestionWithDetails": "{0}，建議，有詳細資料",
-	"ariaCurrentSuggestion": "{0}，建議"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/editor/contrib/toggleTabFocusMode/common/toggleTabFocusMode.i18n.json b/i18n/cht/src/vs/editor/contrib/toggleTabFocusMode/common/toggleTabFocusMode.i18n.json
deleted file mode 100644
index d60c7e9a6f3..00000000000
--- a/i18n/cht/src/vs/editor/contrib/toggleTabFocusMode/common/toggleTabFocusMode.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"toggle.tabMovesFocus": "切換 TAB 鍵移動焦點"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/editor/contrib/toggleTabFocusMode/toggleTabFocusMode.i18n.json b/i18n/cht/src/vs/editor/contrib/toggleTabFocusMode/toggleTabFocusMode.i18n.json
deleted file mode 100644
index dab69755fc5..00000000000
--- a/i18n/cht/src/vs/editor/contrib/toggleTabFocusMode/toggleTabFocusMode.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggle.tabMovesFocus": "切換 TAB 鍵移動焦點"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/editor/contrib/wordHighlighter/common/wordHighlighter.i18n.json b/i18n/cht/src/vs/editor/contrib/wordHighlighter/common/wordHighlighter.i18n.json
deleted file mode 100644
index 97c113d82f0..00000000000
--- a/i18n/cht/src/vs/editor/contrib/wordHighlighter/common/wordHighlighter.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"wordHighlight": "讀取存取期間 (例如讀取變數時) 符號的背景色彩。",
-	"wordHighlightStrong": "寫入存取期間 (例如寫入變數時) 符號的背景色彩。",
-	"overviewRulerWordHighlightForeground": "符號醒目提示的概觀尺規標記色彩。",
-	"overviewRulerWordHighlightStrongForeground": "寫入權限符號醒目提示的概觀尺規標記色彩。",
-	"wordHighlight.next.label": "移至下一個反白符號",
-	"wordHighlight.previous.label": "移至上一個反白符號"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json b/i18n/cht/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
deleted file mode 100644
index 1018aa75dc7..00000000000
--- a/i18n/cht/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"wordHighlight": "讀取存取符號時的背景顏色，如讀取變數。不能使用非透明的顏色來隱藏底層的樣式。",
-	"wordHighlightStrong": "寫入存取符號時的背景顏色，如寫入變數。不能使用非透明的顏色來隱藏底層的樣式。",
-	"wordHighlightBorder": "讀取存取期間 (例如讀取變數時) 符號的邊框顏色。",
-	"wordHighlightStrongBorder": "寫入存取期間 (例如寫入變數時) 符號的邊框顏色。 ",
-	"overviewRulerWordHighlightForeground": "概述反白符號的尺規標記顏色。不能使用非透明的顏色來隱藏底層的樣式。",
-	"overviewRulerWordHighlightStrongForeground": "概述反白寫入權限符號的尺規標記顏色。不能使用非透明的顏色來隱藏底層的樣式。",
-	"wordHighlight.next.label": "移至下一個反白符號",
-	"wordHighlight.previous.label": "移至上一個反白符號"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/editor/contrib/zoneWidget/browser/peekViewWidget.i18n.json b/i18n/cht/src/vs/editor/contrib/zoneWidget/browser/peekViewWidget.i18n.json
deleted file mode 100644
index 8b7662c4c93..00000000000
--- a/i18n/cht/src/vs/editor/contrib/zoneWidget/browser/peekViewWidget.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"label.close": "關閉"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/editor/electron-browser/textMate/TMSyntax.i18n.json b/i18n/cht/src/vs/editor/electron-browser/textMate/TMSyntax.i18n.json
deleted file mode 100644
index 78c107af05e..00000000000
--- a/i18n/cht/src/vs/editor/electron-browser/textMate/TMSyntax.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"invalid.language": "`contributes.{0}.language` 中的不明語言。提供的值: {1}",
-	"invalid.scopeName": "`contributes.{0}.scopeName` 中的預期字串。提供的值: {1}",
-	"invalid.path.0": "Expected string in `contributes.{0}.path`. Provided value: {1}",
-	"invalid.injectTo": "`contributes.{0}.injectTo` 中的值無效。必須是語言範圍名稱的陣列。提供的值: {1}",
-	"invalid.embeddedLanguages": "`contributes.{0}.embeddedLanguages` 中的值無效。必須是從範圍名稱到語言的物件對應。提供的值: {1}",
-	"invalid.path.1": "要包含在擴充功能資料夾 ({2}) 中的預期 `contributes.{0}.path` ({1})。這可能會使擴充功能無法移植。",
-	"no-tm-grammar": "此語言未註冊任何 TM 文法。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/editor/node/languageConfigurationExtensionPoint.i18n.json b/i18n/cht/src/vs/editor/node/languageConfigurationExtensionPoint.i18n.json
deleted file mode 100644
index bf2bf87414c..00000000000
--- a/i18n/cht/src/vs/editor/node/languageConfigurationExtensionPoint.i18n.json
+++ /dev/null
@@ -1,23 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"parseErrors": "剖析 {0} 時發生錯誤: {1}",
-	"schema.openBracket": "左括弧字元或字串順序。",
-	"schema.closeBracket": "右括弧字元或字串順序。",
-	"schema.comments": "定義註解符號",
-	"schema.blockComments": "定義標記區塊註解的方式。",
-	"schema.blockComment.begin": "區塊註解開頭的字元順序。",
-	"schema.blockComment.end": "區塊註解結尾的字元順序。",
-	"schema.lineComment": "行註解開頭的字元順序。",
-	"schema.brackets": "定義增加或減少縮排的括弧符號。",
-	"schema.autoClosingPairs": "定義成對括弧。輸入左括弧時，即自動插入右括弧。",
-	"schema.autoClosingPairs.notIn": "定義停用自動配對的範圍清單。",
-	"schema.surroundingPairs": "定義可用以括住所選字串的成對括弧。",
-	"schema.wordPattern": "定義語言的文字",
-	"schema.wordPattern.pattern": "使用正規表示式進行文字比對",
-	"schema.wordPattern.flags": "使用正規表示式標記進行文字比對",
-	"schema.wordPattern.flags.errorMessage": "必須符合樣式 `/^([gimuy]+)$/`"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/editor/node/textMate/TMGrammars.i18n.json b/i18n/cht/src/vs/editor/node/textMate/TMGrammars.i18n.json
deleted file mode 100644
index 7cf9de41c76..00000000000
--- a/i18n/cht/src/vs/editor/node/textMate/TMGrammars.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"vscode.extension.contributes.grammars": "提供 textmate 權杖化工具。",
-	"vscode.extension.contributes.grammars.language": "要提供此語法的目標語言識別碼。",
-	"vscode.extension.contributes.grammars.scopeName": "tmLanguage 檔案所使用的 textmate 範圍名稱。",
-	"vscode.extension.contributes.grammars.path": "tmLanguage 檔案的路徑。此路徑是擴充功能資料夾的相對路徑，而且一般會以 './syntaxes/' 開頭。",
-	"vscode.extension.contributes.grammars.embeddedLanguages": "如果此文法包含內嵌語言，即為範圍名稱到語言識別碼的對應。",
-	"vscode.extension.contributes.grammars.injectTo": "要插入此文法的語言範圍名稱清單。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/platform/actions/browser/menuItemActionItem.i18n.json b/i18n/cht/src/vs/platform/actions/browser/menuItemActionItem.i18n.json
deleted file mode 100644
index 0d4e76110bb..00000000000
--- a/i18n/cht/src/vs/platform/actions/browser/menuItemActionItem.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"titleAndKb": "{0} ({1})"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json b/i18n/cht/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
deleted file mode 100644
index 16528bb0fea..00000000000
--- a/i18n/cht/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"requirearray": "功能表項目必須為陣列",
-	"requirestring": "屬性 '{0}' 為強制項目且必須屬於 `string` 類型",
-	"optstring": "屬性 `{0}` 可以省略或必須屬於 `string` 類型",
-	"vscode.extension.contributes.menuItem.command": "所要執行命令的識別碼。命令必須在 'commands' 區段中宣告",
-	"vscode.extension.contributes.menuItem.alt": "所要執行替代命令的識別碼。命令必須在 'commands' 區段中宣告",
-	"vscode.extension.contributes.menuItem.when": "必須為 true 以顯示此項目的條件",
-	"vscode.extension.contributes.menuItem.group": "此命令所屬群組",
-	"vscode.extension.contributes.menus": "將功能表項目提供給編輯器",
-	"menus.commandPalette": "命令選擇區",
-	"menus.touchBar": "Touch Bar (macOS)",
-	"menus.editorTitle": "編輯器標題功能表",
-	"menus.editorContext": "編輯器操作功能表",
-	"menus.explorerContext": "檔案總管操作功能表",
-	"menus.editorTabContext": "編輯器索引標籤操作功能表",
-	"menus.debugCallstackContext": "偵錯呼叫堆疊操作功能表",
-	"menus.scmTitle": "原始檔控制標題功能表",
-	"menus.scmSourceControl": "原始檔控制功能表",
-	"menus.resourceGroupContext": "原始檔控制資源群組操作功能表",
-	"menus.resourceStateContext": "原始檔控制資源群組狀態操作功能表",
-	"view.viewTitle": "這有助於查看標題功能表",
-	"view.itemContext": "這有助於查看項目內容功能表",
-	"nonempty": "必須是非空白值。",
-	"opticon": "屬性 `icon` 可以省略，否則必須為字串或類似 `{dark, light}` 的常值",
-	"requireStringOrObject": "'{0}' 為必要屬性，且其類型必須是 'string' 或 'object'",
-	"requirestrings": "'{0}' 與 '{1}' 為必要屬性，且其類型必須是 'string'",
-	"vscode.extension.contributes.commandType.command": "所要執行命令的識別碼",
-	"vscode.extension.contributes.commandType.title": "UI 中用以代表命令的標題",
-	"vscode.extension.contributes.commandType.category": "(選用) UI 中用以將命令分組的分類字串",
-	"vscode.extension.contributes.commandType.icon": "(選用) UI 中用以代表命令的圖示。會是檔案路徑或可設定佈景主題的組態",
-	"vscode.extension.contributes.commandType.icon.light": "使用淺色佈景主題時的圖示路徑",
-	"vscode.extension.contributes.commandType.icon.dark": "使用深色佈景主題時的圖示路徑",
-	"vscode.extension.contributes.commands": "將命令提供給命令選擇區。",
-	"dup": "命令 `{0}` 在 `commands` 區段中出現多次。",
-	"menuId.invalid": "`{0}` 不是有效的功能表識別碼",
-	"missing.command": "功能表項目參考了 'commands' 區段中未定義的命令 `{0}`。",
-	"missing.altCommand": "功能表項目參考了 'commands' 區段中未定義的替代命令 `{0}`。",
-	"dupe.command": "功能表項目參考了與預設相同的命令和替代命令"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/platform/configuration/common/configurationRegistry.i18n.json b/i18n/cht/src/vs/platform/configuration/common/configurationRegistry.i18n.json
deleted file mode 100644
index 5e5189758dc..00000000000
--- a/i18n/cht/src/vs/platform/configuration/common/configurationRegistry.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"defaultConfigurations.title": "預設組態覆寫",
-	"overrideSettings.description": "設定要針對 {0} 語言覆寫的編輯器設定。",
-	"overrideSettings.defaultDescription": "設定要針對語言覆寫的編輯器設定。",
-	"config.property.languageDefault": "無法註冊 '{0}'。這符合用於描述語言專用編輯器設定的屬性模式 '\\\\[.*\\\\]$'。請使用 'configurationDefaults' 貢獻。",
-	"config.property.duplicate": "無法註冊 '{0}'。此屬性已經註冊。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/platform/dialogs/common/dialogs.i18n.json b/i18n/cht/src/vs/platform/dialogs/common/dialogs.i18n.json
deleted file mode 100644
index 3b2a2f318b6..00000000000
--- a/i18n/cht/src/vs/platform/dialogs/common/dialogs.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"moreFile": "...另外 1 個檔案未顯示",
-	"moreFiles": "...另外 {0} 個檔案未顯示"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/platform/dialogs/node/dialogService.i18n.json b/i18n/cht/src/vs/platform/dialogs/node/dialogService.i18n.json
deleted file mode 100644
index 7667b941599..00000000000
--- a/i18n/cht/src/vs/platform/dialogs/node/dialogService.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"cancel": "取消"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/platform/environment/node/argv.i18n.json b/i18n/cht/src/vs/platform/environment/node/argv.i18n.json
deleted file mode 100644
index d8400672648..00000000000
--- a/i18n/cht/src/vs/platform/environment/node/argv.i18n.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"gotoValidation": "`--goto` 模式中的引數格式應為 `FILE(:LINE(:CHARACTER))`。",
-	"diff": "互相比較兩個檔案。",
-	"add": "將資料夾新增至上一個使用中的視窗。",
-	"goto": "在路徑上的指定行與字元位置開啟檔案。",
-	"newWindow": "強制開啟新視窗。",
-	"reuseWindow": "強制在上一個使用中的視窗開啟檔案或資料夾。",
-	"wait": "等候檔案在傳回前關閉。",
-	"locale": "要使用的地區設定 (例如 en-US 或 zh-TW)。",
-	"userDataDir": "指定用於保存使用者資料的目錄。可用於開啟多個相異的 Code 執行個體。",
-	"version": "列印版本。",
-	"help": "列印使用方式。",
-	"extensionHomePath": "設定擴充功能的根路徑。",
-	"listExtensions": "列出已安裝的擴充功能。",
-	"showVersions": "使用 --list-extension 時，顯示安裝的擴充功能版本。",
-	"installExtension": "安裝擴充功能。",
-	"uninstallExtension": "解除安裝擴充功能。",
-	"experimentalApis": "啟用延伸模組的建議 API 功能。",
-	"verbose": "列印詳細資訊輸出 (表示 --wait)。",
-	"log": "使用的日誌級別。預設為\"訊息\"。允許的值是 \"關鍵\"、\"錯誤\"、\"警告\"、\"訊息\"、\"偵錯\"、\"追蹤\"、\"關閉\"。",
-	"status": "列印進程使用方式和診斷資訊。",
-	"performance": "在已啟用 'Developer: Startup Performance' 命令的情況下開始。",
-	"prof-startup": "啟動時執行 CPU 分析工具",
-	"disableExtensions": "停用所有已安裝的擴充功能。",
-	"inspect-extensions": "允許延伸模組的偵錯與分析。如需連線 URI，請查看開發人員工具。",
-	"inspect-brk-extensions": "允許對延伸主機在啟動後暫停擴充功能進行偵錯和分析。如需連線 URI，請查看開發人員工具。",
-	"disableGPU": "停用 GPU 硬體加速。",
-	"uploadLogs": "上傳目前的工作階段紀錄至安全的端點。",
-	"maxMemory": "視窗的最大記憶體大小 (以 MB 為單位)。",
-	"usage": "使用方式",
-	"options": "選項",
-	"paths": "路徑",
-	"stdinWindows": "從其他程式讀取輸出並附加 '-' (例: 'echo Hello World | {0} -')",
-	"stdinUnix": "從 stdin 讀取並附加 '-' (例: 'ps aux | grep code | {0} -')",
-	"optionsUpperCase": "選項",
-	"extensionsManagement": "擴充功能管理",
-	"troubleshooting": "疑難排解"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/platform/extensionManagement/common/extensionEnablementService.i18n.json b/i18n/cht/src/vs/platform/extensionManagement/common/extensionEnablementService.i18n.json
deleted file mode 100644
index 02ad40ca5d6..00000000000
--- a/i18n/cht/src/vs/platform/extensionManagement/common/extensionEnablementService.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noWorkspace": "沒有任何工作區。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/platform/extensionManagement/common/extensionManagement.i18n.json b/i18n/cht/src/vs/platform/extensionManagement/common/extensionManagement.i18n.json
deleted file mode 100644
index 5466fa9f786..00000000000
--- a/i18n/cht/src/vs/platform/extensionManagement/common/extensionManagement.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"extensions": "延伸模組",
-	"preferences": "喜好設定"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/platform/extensionManagement/node/extensionGalleryService.i18n.json b/i18n/cht/src/vs/platform/extensionManagement/node/extensionGalleryService.i18n.json
deleted file mode 100644
index 8f2ba936f12..00000000000
--- a/i18n/cht/src/vs/platform/extensionManagement/node/extensionGalleryService.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"notCompatibleDownload": "無法安裝，因為找不到相容於 VS Code 目前版本 '{0}' 的擴充功能。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json b/i18n/cht/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
deleted file mode 100644
index a2cc538e14e..00000000000
--- a/i18n/cht/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"invalidManifest": "擴充功能無效: package.json 不是 JSON 檔案。",
-	"incompatible": "因為延伸模組 '{0}' 與程式碼 '{1}' 不相容，所以無法安裝。",
-	"restartCode": "請先重新啟動 Code，再重新安裝 {0}。",
-	"installingOutdatedExtension": "已安裝此擴充功能的較新版本。是否要使用舊版本覆蓋此項？",
-	"override": "覆寫",
-	"cancel": "取消",
-	"errorInstallingDependencies": "安裝相依套件時發生錯誤。{0}",
-	"MarketPlaceDisabled": "未啟用市集",
-	"removeError": "移除擴充功能: {0} 時發生錯誤。重新嘗試前請離開並再次啟動 VS Code。",
-	"Not a Marketplace extension": "只有市集擴充功能可以重新安裝",
-	"notFoundCompatible": "無法安裝 '{0}'；沒有任何與 VS Code 相容的可用版本 '{1}'。",
-	"malicious extension": "因為有使用者回報該延伸模組有問題，所以無法安裝延伸模組。",
-	"notFoundCompatibleDependency": "無法安裝，因為找不到相容於 VS Code 目前版本 '{1}' 的相依擴充功能 '{0}'。",
-	"quitCode": "無法安裝擴充功能。重新安裝以前請重啟 VS Code。",
-	"exitCode": "無法安裝擴充功能。重新安裝以前請離開並再次啟動 VS Code。",
-	"renameError": "將 {0} 重新命名為 {1} 時發生未知錯誤",
-	"uninstallDependeciesConfirmation": "只要將 '{0}' 解除安裝，或要包含其相依性?",
-	"uninstallOnly": "僅擴充功能",
-	"uninstallAll": "全部解除安裝",
-	"singleDependentError": "無法將延伸模組 '{0}' 解除安裝。其為延伸模組 '{1}' 的相依對象。",
-	"twoDependentsError": "無法將延伸模組 '{0}' 解除安裝。其為延伸模組 '{1}' 及 '{2}' 的相依對象。",
-	"multipleDependentsError": "無法將延伸模組 '{0}' 解除安裝。其為 '{1}'、'{2}' 及其他延伸模組的相依對象。",
-	"notExists": "找不到擴充功能"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/platform/extensions/common/abstractExtensionService.i18n.json b/i18n/cht/src/vs/platform/extensions/common/abstractExtensionService.i18n.json
deleted file mode 100644
index 99e2a181c4d..00000000000
--- a/i18n/cht/src/vs/platform/extensions/common/abstractExtensionService.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"unknownDep": "擴充功能 `{1}` 無法啟動。原因: 未知的相依性 `{0}`。",
-	"failedDep1": "擴充功能 `{1}` 無法啟動。原因: 相依性 `{0}` 無法啟動。",
-	"failedDep2": "擴充功能 `{0}` 無法啟動。原因: 相依性超過 10 個層級 (很可能是相依性迴圈)。",
-	"activationError": "啟動擴充功能 `{0}` 失敗: {1}。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/platform/extensions/common/extensionsRegistry.i18n.json b/i18n/cht/src/vs/platform/extensions/common/extensionsRegistry.i18n.json
deleted file mode 100644
index 66c72f5e62f..00000000000
--- a/i18n/cht/src/vs/platform/extensions/common/extensionsRegistry.i18n.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.engines.vscode": "若是 VS Code 延伸模組，則指定與延伸模組相容的 VS Code 版本。不得為 *。例如: ^0.10.5 表示與最低 VS Code 版本 0.10.5 相容。",
-	"vscode.extension.publisher": "VS Code 擴充功能的發行者。",
-	"vscode.extension.displayName": "VS Code 資源庫中使用的擴充功能顯示名稱。",
-	"vscode.extension.categories": "VS Code 資源庫用來將擴充功能歸類的分類。",
-	"vscode.extension.galleryBanner": "用於 VS Code Marketplace 的橫幅。",
-	"vscode.extension.galleryBanner.color": "VS Code Marketplace 頁首的橫幅色彩。",
-	"vscode.extension.galleryBanner.theme": "橫幅中使用的字型色彩佈景主題。",
-	"vscode.extension.contributes": "此封裝所代表的所有 VS Code 擴充功能比重。",
-	"vscode.extension.preview": "將延伸模組設為在 Marketplace 中標幟為 [預覽]。",
-	"vscode.extension.activationEvents": "VS Code 擴充功能的啟動事件。",
-	"vscode.extension.activationEvents.onLanguage": "當指定語言檔案開啟時激發該事件",
-	"vscode.extension.activationEvents.onCommand": "當指定的命令被調用時激發該事件",
-	"vscode.extension.activationEvents.onDebug": "當使用者正要開始偵錯或是設定偵錯組態時激發該事件",
-	"vscode.extension.activationEvents.onDebugInitialConfigurations": "需要建立 \"launch.json\" 來觸發啟動事件 (並且需要呼叫所有 provideDebugConfigurations 方法)。",
-	"vscode.extension.activationEvents.onDebugResolve": "需要特定類型偵錯工作階段啟動來觸發啟動事件 (並且呼叫相對應 resolveDebugConfiguration 方法)",
-	"vscode.extension.activationEvents.workspaceContains": "當開啟指定的文件夾包含glob模式匹配的文件時激發該事件",
-	"vscode.extension.activationEvents.onView": "當指定的檢視被擴展時激發該事件",
-	"vscode.extension.activationEvents.star": "當VS Code啟動時激發該事件,為了確保最好的使用者體驗,當您的擴充功能沒有其他組合作業時,請激活此事件.",
-	"vscode.extension.badges": "要顯示於 Marketplace 擴充頁面資訊看板的徽章陣列。",
-	"vscode.extension.badges.url": "徽章映像 URL。",
-	"vscode.extension.badges.href": "徽章連結。",
-	"vscode.extension.badges.description": "徽章描述。",
-	"vscode.extension.extensionDependencies": "其它擴充功能的相依性。擴充功能的識別碼一律為 ${publisher}.${name}。例如: vscode.csharp。",
-	"vscode.extension.scripts.prepublish": "在封裝作為 VS Code 擴充功能發行前所執行的指令碼。",
-	"vscode.extension.icon": "128 x 128 像素圖示的路徑。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/platform/extensions/node/extensionValidator.i18n.json b/i18n/cht/src/vs/platform/extensions/node/extensionValidator.i18n.json
deleted file mode 100644
index 3c3d0f5631d..00000000000
--- a/i18n/cht/src/vs/platform/extensions/node/extensionValidator.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"versionSyntax": "無法解析 'engines.vscode` 值 {0}。請使用範例：^1.22.0, ^1.22.x, 等。",
-	"versionSpecificity1": "在 `engines.vscode` ({0}) 中指定的版本不夠具體。對於 1.0.0 之前的 vscode 版本，請至少定義所需的主要和次要版本。 例如 ^0.10.0、0.10.x、0.11.0 等。",
-	"versionSpecificity2": "在 `engines.vscode` ({0}) 中指定的版本不夠具體。對於 1.0.0 之後的 vscode 版本，請至少定義所需的主要和次要版本。 例如 ^1.10.0、1.10.x、1.x.x、2.x.x 等。",
-	"versionMismatch": "擴充功能與 Code {0} 不相容。擴充功能需要: {1}。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/platform/history/electron-main/historyMainService.i18n.json b/i18n/cht/src/vs/platform/history/electron-main/historyMainService.i18n.json
deleted file mode 100644
index e92cc96c4b4..00000000000
--- a/i18n/cht/src/vs/platform/history/electron-main/historyMainService.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"newWindow": "開新視窗",
-	"newWindowDesc": "開啟新視窗",
-	"recentFolders": "最近使用的工作區",
-	"folderDesc": "{0} {1}",
-	"codeWorkspace": "Code 工作區"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/platform/integrity/node/integrityServiceImpl.i18n.json b/i18n/cht/src/vs/platform/integrity/node/integrityServiceImpl.i18n.json
deleted file mode 100644
index f4431d41910..00000000000
--- a/i18n/cht/src/vs/platform/integrity/node/integrityServiceImpl.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"integrity.prompt": "您的 {0} 安裝似乎已損毀。請重新安裝。",
-	"integrity.moreInformation": "詳細資訊",
-	"integrity.dontShowAgain": "不要再顯示"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/platform/issue/electron-main/issueService.i18n.json b/i18n/cht/src/vs/platform/issue/electron-main/issueService.i18n.json
deleted file mode 100644
index 855fc34813b..00000000000
--- a/i18n/cht/src/vs/platform/issue/electron-main/issueService.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"issueReporter": "問題回報程式",
-	"processExplorer": "處理序總管"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/platform/jsonschemas/common/jsonValidationExtensionPoint.i18n.json b/i18n/cht/src/vs/platform/jsonschemas/common/jsonValidationExtensionPoint.i18n.json
deleted file mode 100644
index 8381e015a80..00000000000
--- a/i18n/cht/src/vs/platform/jsonschemas/common/jsonValidationExtensionPoint.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"contributes.jsonValidation": "提供 JSON 結構描述組態。",
-	"contributes.jsonValidation.fileMatch": "要比對的檔案模式，例如 \"package.json\" 或 \"*.launch\"。",
-	"contributes.jsonValidation.url": "結構描述 URL ('http:'、'https:') 或擴充功能資料夾的相對路徑 ('./')。",
-	"invalid.jsonValidation": "'configuration.jsonValidation' 必須是陣列",
-	"invalid.fileMatch": "必須定義 'configuration.jsonValidation.fileMatch'",
-	"invalid.url": "'configuration.jsonValidation.url' 必須是 URL 或相對路徑",
-	"invalid.url.fileschema": "'configuration.jsonValidation.url' 是無效的相對 URL: {0}",
-	"invalid.url.schema": "'configuration.jsonValidation.url' 必須以 'http:'、'https:' 或 './' 開頭，以參考位於擴充功能中的結構描述"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/platform/keybinding/common/abstractKeybindingService.i18n.json b/i18n/cht/src/vs/platform/keybinding/common/abstractKeybindingService.i18n.json
deleted file mode 100644
index a8078cfb9ee..00000000000
--- a/i18n/cht/src/vs/platform/keybinding/common/abstractKeybindingService.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"first.chord": "已按下 ({0})。請等待第二個套索鍵...",
-	"missing.chord": "按鍵組合 ({0}, {1}) 不是命令。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/platform/keybinding/common/keybindingLabels.i18n.json b/i18n/cht/src/vs/platform/keybinding/common/keybindingLabels.i18n.json
deleted file mode 100644
index 0e97d8b37c3..00000000000
--- a/i18n/cht/src/vs/platform/keybinding/common/keybindingLabels.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"ctrlKey": "Ctrl",
-	"shiftKey": "Shift",
-	"altKey": "Alt",
-	"windowsKey": "Windows",
-	"ctrlKey.long": "Control",
-	"shiftKey.long": "Shift",
-	"altKey.long": "Alt",
-	"cmdKey.long": "Command",
-	"windowsKey.long": "Windows"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/platform/list/browser/listService.i18n.json b/i18n/cht/src/vs/platform/list/browser/listService.i18n.json
deleted file mode 100644
index 16ce88704c4..00000000000
--- a/i18n/cht/src/vs/platform/list/browser/listService.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"workbenchConfigurationTitle": "工作台",
-	"multiSelectModifier.ctrlCmd": "對應Windows和Linux的'Control'與對應 macOS 的'Command'。",
-	"multiSelectModifier.alt": "對應Windows和Linux的'Alt'與對應macOS的'Option'。",
-	"multiSelectModifier": "透過滑鼠多選，用於在樹狀目錄與清單中新增項目的輔助按鍵 (例如在總管中開啟 [編輯器] 及 [SCM] 檢視)。在 Windows 及 Linux 上，`ctrlCmd` 對應 `Control`，在 macOS 上則對應 `Command`。[在側邊開啟] 滑鼠手勢 (若支援) 將會適應以避免和多選輔助按鍵衝突。",
-	"openMode.singleClick": "以滑鼠按一下開啟項目。",
-	"openMode.doubleClick": "以滑鼠按兩下開啟項目。",
-	"openModeModifier": "控制如何使用滑鼠在樹狀目錄與清單中開啟項目 (若有支援)。設為 `singleClick` 可以滑鼠按一下開啟物件，設為 `doubleClick` 則只能透過按兩下滑鼠開啟物件。對於樹狀目錄中具子系的父系而言，此設定會控制應以滑鼠按一下或按兩下展開父系。注意，某些樹狀目錄或清單若不適用此設定則會予以忽略。",
-	"horizontalScrolling setting": "控制是否支援工作台中的水平滾動。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/platform/localizations/common/localizations.i18n.json b/i18n/cht/src/vs/platform/localizations/common/localizations.i18n.json
deleted file mode 100644
index f88a7f93a63..00000000000
--- a/i18n/cht/src/vs/platform/localizations/common/localizations.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.contributes.localizations": "提供在地化服務給編輯者",
-	"vscode.extension.contributes.localizations.languageId": "顯示已翻譯字串的語言 Id",
-	"vscode.extension.contributes.localizations.languageName": "語言名稱 (英文)。",
-	"vscode.extension.contributes.localizations.languageNameLocalized": "語言名稱 (提供的語言)。",
-	"vscode.extension.contributes.localizations.translations": "與該語言相關的翻譯清單。",
-	"vscode.extension.contributes.localizations.translations.id": "此翻譯提供之目標的 VS Code 或延伸模組識別碼。VS Code 的識別碼一律為 `vscode`，且延伸模組的格式應為 `publisherId.extensionName`。",
-	"vscode.extension.contributes.localizations.translations.id.pattern": "轉譯 VS 程式碼或延伸模組時，識別碼應分別使用 `vscode` 或 `publisherId.extensionName` 的格式。",
-	"vscode.extension.contributes.localizations.translations.path": "包含語言翻譯的檔案相對路徑。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/platform/markers/common/markers.i18n.json b/i18n/cht/src/vs/platform/markers/common/markers.i18n.json
deleted file mode 100644
index cd4eb5c86cf..00000000000
--- a/i18n/cht/src/vs/platform/markers/common/markers.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"sev.error": "錯誤",
-	"sev.warning": "警告",
-	"sev.info": "資訊"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/platform/markers/common/problemMatcher.i18n.json b/i18n/cht/src/vs/platform/markers/common/problemMatcher.i18n.json
deleted file mode 100644
index 7d943c8cccf..00000000000
--- a/i18n/cht/src/vs/platform/markers/common/problemMatcher.i18n.json
+++ /dev/null
@@ -1,72 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"ProblemPatternParser.loopProperty.notLast": "只有最後一行比對器才支援迴圈屬性。",
-	"ProblemPatternParser.problemPattern.missingRegExp": "此問題模式缺少規則運算式。",
-	"ProblemPatternParser.problemPattern.missingProperty": "問題模式無效。其必須至少有一個檔案、訊息以及行或位置符合群組。",
-	"ProblemPatternParser.invalidRegexp": "錯誤: 字串 {0} 不是有效的規則運算式。\n",
-	"ProblemPatternSchema.regexp": "規則運算式，用來在輸出中尋找錯誤、警告或資訊。",
-	"ProblemPatternSchema.file": "檔案名稱的符合群組索引。如果省略，則會使用 1。",
-	"ProblemPatternSchema.location": "問題之位置的符合群組索引。有效的位置模式為: (line)、(line,column) 和 (startLine,startColumn,endLine,endColumn)。如果省略，則會假設 (line,column)。",
-	"ProblemPatternSchema.line": "問題之行的符合群組索引。預設為 2",
-	"ProblemPatternSchema.column": "問題行中字元的符合群組索引。預設為 3",
-	"ProblemPatternSchema.endLine": "問題之結尾行的符合群組索引。預設為未定義",
-	"ProblemPatternSchema.endColumn": "問題之結尾行字元的符合群組索引。預設為未定義",
-	"ProblemPatternSchema.severity": "問題之嚴重性的符合群組索引。預設為未定義",
-	"ProblemPatternSchema.code": "問題之代碼的符合群組索引。預設為未定義",
-	"ProblemPatternSchema.message": "訊息的符合群組索引。如果省略並指定位置，預設為 4。否則預設為 5。",
-	"ProblemPatternSchema.loop": "在多行比對器迴圈中，指出此模式是否只要相符就會以迴圈執行。只能在多行模式中的最後一個模式指定。",
-	"NamedProblemPatternSchema.name": "問題模式的名稱。",
-	"NamedMultiLineProblemPatternSchema.name": "多行問題模式的名稱。",
-	"NamedMultiLineProblemPatternSchema.patterns": "實際的模式。",
-	"ProblemPatternExtPoint": "提供問題模式",
-	"ProblemPatternRegistry.error": "問題模式無效。此模式將予忽略。",
-	"ProblemMatcherParser.noProblemMatcher": "錯誤: 無法將描述轉換成問題比對器:\n{0}\n",
-	"ProblemMatcherParser.noProblemPattern": "錯誤: 描述未定義有效的問題樣式:\n{0}\n",
-	"ProblemMatcherParser.noOwner": "錯誤: 描述未定義擁有者:\n{0}\n",
-	"ProblemMatcherParser.noFileLocation": "錯誤: 描述未定義檔案位置:\n{0}\n",
-	"ProblemMatcherParser.unknownSeverity": "資訊: 嚴重性 {0} 不明。有效值為錯誤、警告和資訊。\n",
-	"ProblemMatcherParser.noDefinedPatter": "錯誤: 沒有識別碼為 {0} 的樣式。",
-	"ProblemMatcherParser.noIdentifier": "錯誤: 樣式屬性參考了空的識別碼。",
-	"ProblemMatcherParser.noValidIdentifier": "錯誤: 樣式屬性 {0} 不是有效的樣式變數名稱。",
-	"ProblemMatcherParser.problemPattern.watchingMatcher": "問題比對器必須同時定義監控的開始模式和結束模式。",
-	"ProblemMatcherParser.invalidRegexp": "錯誤: 字串 {0} 不是有效的規則運算式。\n",
-	"WatchingPatternSchema.regexp": "用來查看偵測背景工作開始或結束的正規表達式.",
-	"WatchingPatternSchema.file": "檔案名稱的符合群組索引。可以省略。",
-	"PatternTypeSchema.name": "所提供或預先定義之模式的名稱",
-	"PatternTypeSchema.description": "問題模式或所提供或預先定義之問題模式的名稱。如有指定基底，即可發出。",
-	"ProblemMatcherSchema.base": "要使用之基底問題比對器的名稱。",
-	"ProblemMatcherSchema.owner": "Code 內的問題擁有者。如果指定基底，則可以省略。如果省略且未指定基底，預設為 [外部]。",
-	"ProblemMatcherSchema.severity": "擷取項目問題的預設嚴重性。如果模式未定義嚴重性的符合群組，就會加以使用。",
-	"ProblemMatcherSchema.applyTo": "控制文字文件上所回報的問題僅會套用至開啟的文件、關閉的文件或所有文件。",
-	"ProblemMatcherSchema.fileLocation": "定義問題模式中所回報檔案名稱的解譯方式。",
-	"ProblemMatcherSchema.background": "偵測後台任務中匹配程序模式的開始與結束.",
-	"ProblemMatcherSchema.background.activeOnStart": "如果設置為 True，背景監控程式在工作啟動時處於主動模式。這相當於符合起始樣式的行。",
-	"ProblemMatcherSchema.background.beginsPattern": "如果於輸出中相符，則會指示背景程式開始。",
-	"ProblemMatcherSchema.background.endsPattern": "如果於輸出中相符，則會指示背景程式結束。",
-	"ProblemMatcherSchema.watching.deprecated": "關注屬性已被淘汰，請改用背景取代。",
-	"ProblemMatcherSchema.watching": "追蹤匹配程序的開始與結束。",
-	"ProblemMatcherSchema.watching.activeOnStart": "如果設定為 True，監控程式在工作啟動時處於主動模式。這相當於發出符合 beginPattern 的行",
-	"ProblemMatcherSchema.watching.beginsPattern": "如果在輸出中相符，則會指示監看工作開始。",
-	"ProblemMatcherSchema.watching.endsPattern": "如果在輸出中相符，則會指示監看工作結束。",
-	"LegacyProblemMatcherSchema.watchedBegin.deprecated": "此屬性即將淘汰。請改用關注的屬性。",
-	"LegacyProblemMatcherSchema.watchedBegin": "規則運算式，指示監看的工作開始執行 (透過檔案監看觸發)。",
-	"LegacyProblemMatcherSchema.watchedEnd.deprecated": "此屬性即將淘汰。請改用關注的屬性。",
-	"LegacyProblemMatcherSchema.watchedEnd": "規則運算式，指示監看的工作結束執行。",
-	"NamedProblemMatcherSchema.name": "用來參考其問題比對器的名稱。",
-	"NamedProblemMatcherSchema.label": "易讀的問題比對器標籤。",
-	"ProblemMatcherExtPoint": "提供問題比對器",
-	"msCompile": "Microsoft  編譯器問題 ",
-	"lessCompile": "較少的問題",
-	"gulp-tsc": "Gulp TSC 問題",
-	"jshint": "JSHint 問題",
-	"jshint-stylish": "JSHint 樣式問題",
-	"eslint-compact": "ESLint 壓縮問題",
-	"eslint-stylish": "ESLint 樣式問題",
-	"go": "前往問題"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/platform/message/common/message.i18n.json b/i18n/cht/src/vs/platform/message/common/message.i18n.json
deleted file mode 100644
index 34830e4a0c1..00000000000
--- a/i18n/cht/src/vs/platform/message/common/message.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"close": "關閉",
-	"later": "稍後",
-	"cancel": "取消",
-	"moreFile": "...另外 1 個檔案未顯示",
-	"moreFiles": "...另外 {0} 個檔案未顯示"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/platform/node/minimalTranslations.i18n.json b/i18n/cht/src/vs/platform/node/minimalTranslations.i18n.json
deleted file mode 100644
index 971b2c94970..00000000000
--- a/i18n/cht/src/vs/platform/node/minimalTranslations.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"showLanguagePackExtensions": "VS Code 可在 {0} 中使用。在 Marketplace 中搜尋語言套件以開始使用。",
-	"searchMarketplace": "搜尋市集",
-	"installAndRestartMessage": "VS Code 可在 {0} 中使用。安裝語言套件以開始使用。必須重新啟動。 ",
-	"installAndRestart": "安裝並重新啟動"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/platform/request/node/request.i18n.json b/i18n/cht/src/vs/platform/request/node/request.i18n.json
deleted file mode 100644
index d62704e07b9..00000000000
--- a/i18n/cht/src/vs/platform/request/node/request.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"httpConfigurationTitle": "HTTP",
-	"proxy": "要使用的 Proxy 設定。如果未設定，會從 http_proxy 與 https_proxy 環境變數取得設定。",
-	"strictSSL": "是否應該針對提供的 CA 清單驗證 Proxy 伺服器憑證。",
-	"proxyAuthorization": "要傳送作為每個網路要求 'Proxy-Authorization' 標頭的值。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/platform/telemetry/common/telemetryService.i18n.json b/i18n/cht/src/vs/platform/telemetry/common/telemetryService.i18n.json
deleted file mode 100644
index 1c88d9228af..00000000000
--- a/i18n/cht/src/vs/platform/telemetry/common/telemetryService.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"telemetryConfigurationTitle": "遙測",
-	"telemetry.enableTelemetry": "允許將使用狀況資料和錯誤傳送給 Microsoft。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/platform/theme/common/colorExtensionPoint.i18n.json b/i18n/cht/src/vs/platform/theme/common/colorExtensionPoint.i18n.json
deleted file mode 100644
index 5687ca535c6..00000000000
--- a/i18n/cht/src/vs/platform/theme/common/colorExtensionPoint.i18n.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"contributes.color": "提供延伸模組定義的可設定佈景主題色彩",
-	"contributes.color.id": "可設定佈景主題色彩的識別碼 ",
-	"contributes.color.id.format": "識別碼的格式應為 aa[.bb]*",
-	"contributes.color.description": "可設定佈景主題色彩的描述 ",
-	"contributes.defaults.light": "淺色佈景主題的預設色彩。應為十六進位 (#RRGGBB[AA]) 的色彩值，或提供預設的可設定佈景主題色彩。",
-	"contributes.defaults.dark": "深色佈景主題的預設色彩。應為十六進位 (#RRGGBB[AA]) 的色彩值，或提供預設的可設定佈景主題色彩。 ",
-	"contributes.defaults.highContrast": "高對比佈景主題的預設色彩。應為十六進位 (#RRGGBB[AA]) 的色彩值，或提供預設的可設定佈景主題色彩。",
-	"invalid.colorConfiguration": "'configuration.colors' 必須是陣列",
-	"invalid.default.colorType": "{0} 必須是十六進位 (#RRGGBB[AA] or #RGB[A]) 的色彩值，或是提供預設的可設定佈景主題色彩之識別碼。",
-	"invalid.id": "'configuration.colors.id' 必須定義且不得為空白",
-	"invalid.id.format": "'configuration.colors.id' 必須依照 word[.word]*",
-	"invalid.description": "'configuration.colors.description' 必須定義且不得為空白",
-	"invalid.defaults": "'configuration.colors.defaults' 必須定義，且必須包含 'light'、'dark' 及 'highContrast'"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/platform/theme/common/colorRegistry.i18n.json b/i18n/cht/src/vs/platform/theme/common/colorRegistry.i18n.json
deleted file mode 100644
index 790929bd611..00000000000
--- a/i18n/cht/src/vs/platform/theme/common/colorRegistry.i18n.json
+++ /dev/null
@@ -1,101 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"schema.colors": "工作台中使用的色彩。",
-	"foreground": "整體的前景色彩。僅當未被任何元件覆疊時，才會使用此色彩。",
-	"errorForeground": "整體錯誤訊息的前景色彩。僅當未被任何元件覆蓋時，才會使用此色彩。",
-	"descriptionForeground": "提供附加訊息的前景顏色,例如標籤",
-	"focusBorder": "焦點項目的整體框線色彩。只在沒有任何元件覆寫此色彩時，才會加以使用。",
-	"contrastBorder": "項目周圍的額外框線，可將項目從其他項目中區隔出來以提高對比。",
-	"activeContrastBorder": "使用中項目周圍的額外邊界，可將項目從其他項目中區隔出來以提高對比。",
-	"selectionBackground": "作業區域選取的背景顏色(例如輸入或文字區域)。請注意，這不適用於編輯器中的選取。",
-	"textSeparatorForeground": "文字分隔符號的顏色。",
-	"textLinkForeground": "內文連結的前景色彩",
-	"textLinkActiveForeground": "當滑鼠點擊或懸停時，文字中連結的前景色彩。",
-	"textPreformatForeground": "提示及建議文字的前景色彩。",
-	"textBlockQuoteBackground": "文內引用區塊背景色彩。",
-	"textBlockQuoteBorder": "引用文字的框線顏色。",
-	"textCodeBlockBackground": "文字區塊的背景顏色。",
-	"widgetShadow": "小工具的陰影色彩，例如編輯器中的尋找/取代。",
-	"inputBoxBackground": "輸入方塊的背景。",
-	"inputBoxForeground": "輸入方塊的前景。",
-	"inputBoxBorder": "輸入方塊的框線。",
-	"inputBoxActiveOptionBorder": "輸入欄位中可使用之項目的框線色彩。",
-	"inputPlaceholderForeground": "文字輸入替代字符的前景顏色。",
-	"inputValidationInfoBackground": "資訊嚴重性的輸入驗證背景色彩。",
-	"inputValidationInfoBorder": "資訊嚴重性的輸入驗證邊界色彩。",
-	"inputValidationWarningBackground": "警告嚴重性的輸入驗證背景色彩。",
-	"inputValidationWarningBorder": "警告嚴重性的輸入驗證邊界色彩。",
-	"inputValidationErrorBackground": "錯誤嚴重性的輸入驗證背景色彩。",
-	"inputValidationErrorBorder": "錯誤嚴重性的輸入驗證邊界色彩。",
-	"dropdownBackground": "下拉式清單的背景。",
-	"dropdownListBackground": "下拉式清單的背景。",
-	"dropdownForeground": "下拉式清單的前景。",
-	"dropdownBorder": "下拉式清單的框線。",
-	"listFocusBackground": "當清單/樹狀為使用中狀態時，焦點項目的清單/樹狀背景色彩。使用中的清單/樹狀有鍵盤焦點，非使用中者則沒有。",
-	"listFocusForeground": "當清單/樹狀為使用中狀態時，焦點項目的清單/樹狀前景色彩。使用中的清單/樹狀有鍵盤焦點，非使用中者則沒有。",
-	"listActiveSelectionBackground": "當清單/樹狀為使用中狀態時，所選項目的清單/樹狀背景色彩。使用中的清單/樹狀有鍵盤焦點，非使用中者則沒有。",
-	"listActiveSelectionForeground": "當清單/樹狀為使用中狀態時，所選項目的清單/樹狀前景色彩。使用中的清單/樹狀有鍵盤焦點，非使用中者則沒有。",
-	"listInactiveSelectionBackground": "當清單/樹狀為非使用中狀態時，所選項目的清單/樹狀背景色彩。使用中的清單/樹狀有鍵盤焦點，非使用中者則沒有。",
-	"listInactiveSelectionForeground": "當清單/樹狀為使用中狀態時，所選項目的清單/樹狀前景色彩。使用中的清單/樹狀有鍵盤焦點，非使用中則沒有。",
-	"listHoverBackground": "使用滑鼠暫留在項目時的清單/樹狀背景。",
-	"listHoverForeground": "滑鼠暫留在項目時的清單/樹狀前景。",
-	"listDropBackground": "使用滑鼠四處移動項目時的清單/樹狀拖放背景。",
-	"highlight": "在清單/樹狀內搜尋時，相符醒目提示的清單/樹狀前景色彩。",
-	"invalidItemForeground": "列表/樹狀 無效項目的前景色彩，例如在瀏覽視窗無法解析的根目錄",
-	"listErrorForeground": "包含錯誤清單項目的前景色彩",
-	"listWarningForeground": "包含警告清單項目的前景色彩",
-	"pickerGroupForeground": "分組標籤的快速選擇器色彩。",
-	"pickerGroupBorder": "分組邊界的快速選擇器色彩。",
-	"buttonForeground": "按鈕前景色彩。",
-	"buttonBackground": "按鈕背景色彩。",
-	"buttonHoverBackground": "暫留時的按鈕背景色彩。",
-	"badgeBackground": "標記的背景顏色。標記為小型的訊息標籤,例如搜尋結果的數量。",
-	"badgeForeground": "標記的前景顏色。標記為小型的訊息標籤,例如搜尋結果的數量。",
-	"scrollbarShadow": "指出在捲動該檢視的捲軸陰影。",
-	"scrollbarSliderBackground": "捲軸滑桿的背景顏色。",
-	"scrollbarSliderHoverBackground": "動態顯示時捲軸滑桿的背景顏色。",
-	"scrollbarSliderActiveBackground": "當點擊時捲軸滑桿的背景顏色。",
-	"progressBarBackground": "長時間運行進度條的背景色彩.",
-	"editorBackground": "編輯器的背景色彩。",
-	"editorForeground": "編輯器的預設前景色彩。",
-	"editorWidgetBackground": "編輯器小工具的背景色彩，例如尋找/取代。",
-	"editorWidgetBorder": "編輯器小工具的邊界色彩。小工具選擇擁有邊界或色彩未被小工具覆寫時，才會使用色彩。",
-	"editorSelectionBackground": "編輯器選取範圍的色彩。",
-	"editorSelectionForeground": "為選取的文字顏色高對比化",
-	"editorInactiveSelection": "在非使用中的編輯器的選取項目顏色。不能使用非透明的顏色來隱藏底層的樣式。",
-	"editorSelectionHighlight": "與選取項目相同的區域顏色。不能使用非透明的顏色來隱藏底層的樣式。",
-	"editorSelectionHighlightBorder": "選取時，內容相同之區域的框線色彩。",
-	"editorFindMatch": "符合目前搜尋的色彩。",
-	"findMatchHighlight": "符合搜尋條件的其他項目的顏色。不能使用非透明的顏色來隱藏底層的樣式。",
-	"findRangeHighlight": "限制搜索的範圍色彩。不能使用非透明的色彩來隱藏基礎樣式。",
-	"editorFindMatchBorder": "符合目前搜尋的框線色彩。",
-	"findMatchHighlightBorder": "符合其他搜尋的框線色彩。",
-	"findRangeHighlightBorder": "限制搜尋範圍的邊框色彩。不能使用非透明的色彩來隱藏基礎樣式。",
-	"findWidgetResizeBorder": "尋找小工具的調整列的邊框顏色。",
-	"hoverHighlight": "突顯懸停顯示的文字。不能使用非透明的顏色來隱藏底層的樣式。",
-	"hoverBackground": "編輯器動態顯示的背景色彩。",
-	"hoverBorder": "編輯器動態顯示的框線色彩。",
-	"activeLinkForeground": "使用中之連結的色彩。",
-	"diffEditorInserted": "插入文字的背景顏色。不能使用非透明的顏色來隱藏底層的樣式。 ",
-	"diffEditorRemoved": "移除文字的背景顏色。不能使用非透明的顏色來隱藏底層的樣式。 ",
-	"diffEditorInsertedOutline": "插入的文字外框色彩。",
-	"diffEditorRemovedOutline": "移除的文字外框色彩。",
-	"mergeCurrentHeaderBackground": "目前內嵌合併衝突中的深色標題背景。不能使用非透明的顏色來隱藏底層的樣式。",
-	"mergeCurrentContentBackground": "目前內嵌合併衝突中的內容背景。不能使用非透明的顏色來隱藏底層的樣式。",
-	"mergeIncomingHeaderBackground": "傳入內嵌合併衝突中的深色標題背景。不能使用非透明的顏色來隱藏底層的樣式。",
-	"mergeIncomingContentBackground": "傳入內嵌合併衝突中的內容背景。不能使用非透明的顏色來隱藏底層的樣式。",
-	"mergeCommonHeaderBackground": "內嵌合併衝突中的共同始祖標題背景。不能使用非透明的顏色來隱藏底層的樣式。",
-	"mergeCommonContentBackground": "內嵌合併衝突中的共同始祖內容背景。不能使用非透明的顏色來隱藏基礎樣式。",
-	"mergeBorder": "內嵌合併衝突中標頭及分隔器的邊界色彩。",
-	"overviewRulerCurrentContentForeground": "目前內嵌合併衝突的概觀尺規前景。",
-	"overviewRulerIncomingContentForeground": "傳入內嵌合併衝突的概觀尺規前景。",
-	"overviewRulerCommonContentForeground": "內嵌合併衝突中的共同上階概觀尺規前景。",
-	"overviewRulerFindMatchForeground": "概述符合尋找條件的尺規標記顏色。不能使用非透明的顏色來隱藏底層的樣式。",
-	"overviewRulerSelectionHighlightForeground": "概述反白選擇的尺規標記顏色。不能使用非透明的顏色來隱藏底層的樣式。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/platform/update/node/update.config.contribution.i18n.json b/i18n/cht/src/vs/platform/update/node/update.config.contribution.i18n.json
deleted file mode 100644
index 51a22fee254..00000000000
--- a/i18n/cht/src/vs/platform/update/node/update.config.contribution.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"updateConfigurationTitle": "更新",
-	"updateChannel": "設定是否要從更新頻道接收自動更新。變更後需要重新啟動。",
-	"enableWindowsBackgroundUpdates": "啟用 Windows 背景更新"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/platform/url/electron-browser/inactiveExtensionUrlHandler.i18n.json b/i18n/cht/src/vs/platform/url/electron-browser/inactiveExtensionUrlHandler.i18n.json
deleted file mode 100644
index 16f83c3f147..00000000000
--- a/i18n/cht/src/vs/platform/url/electron-browser/inactiveExtensionUrlHandler.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"confirmUrl": "允許擴充功能打開此 URL 嗎？"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/platform/windows/electron-main/windowsService.i18n.json b/i18n/cht/src/vs/platform/windows/electron-main/windowsService.i18n.json
deleted file mode 100644
index b1c7685178d..00000000000
--- a/i18n/cht/src/vs/platform/windows/electron-main/windowsService.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"aboutDetail": "版本 {0}\n認可 {1}\n日期 {2}\nShell {3}\n轉譯器 {4}\nNode {5}\n架構 {6}",
-	"okButton": "確定",
-	"copy": "複製(&&C)"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/platform/workspaces/common/workspaces.i18n.json b/i18n/cht/src/vs/platform/workspaces/common/workspaces.i18n.json
deleted file mode 100644
index ecd817ca0cb..00000000000
--- a/i18n/cht/src/vs/platform/workspaces/common/workspaces.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"codeWorkspace": "Code 工作區",
-	"untitledWorkspace": "未命名 (工作區)",
-	"workspaceNameVerbose": "{0} (工作區)",
-	"workspaceName": "{0} (工作區)"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/api/browser/localizationsExtensionPoint.i18n.json b/i18n/cht/src/vs/workbench/api/browser/localizationsExtensionPoint.i18n.json
deleted file mode 100644
index 2e91f30cc67..00000000000
--- a/i18n/cht/src/vs/workbench/api/browser/localizationsExtensionPoint.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"requirearray": "在地化資料必須為陣列",
-	"requirestring": "屬性 '{0}' 為強制項目且必須屬於 `string` 類型",
-	"optstring": "屬性 `{0}` 可以省略或必須屬於 `string` 類型",
-	"vscode.extension.contributes.localizations": "提供在地化服務給編輯者",
-	"vscode.extension.contributes.localizations.languageId": "顯示已翻譯字串的語言 Id",
-	"vscode.extension.contributes.localizations.languageName": "顯示已翻譯字串的語言名稱",
-	"vscode.extension.contributes.localizations.translations": "檔案的相對路徑，其中該資料包含夾貢獻語言所有翻譯檔案。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/api/browser/viewsContainersExtensionPoint.i18n.json b/i18n/cht/src/vs/workbench/api/browser/viewsContainersExtensionPoint.i18n.json
deleted file mode 100644
index c34b476a9e9..00000000000
--- a/i18n/cht/src/vs/workbench/api/browser/viewsContainersExtensionPoint.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.contributes.views.containers.id": "用於識別可透過使用 'views' 參與點參與檢視之容器的唯一識別碼",
-	"vscode.extension.contributes.views.containers.title": "用於轉譯容器的易讀字串",
-	"vscode.extension.contributes.views.containers.icon": "容器圖示的路徑。圖示為置於 50x40 區塊中央，且以 'rgb(215, 218, 224)' 或 '#d7dae0' 填滿顏色的 24x24 影像。雖然接受所有影像檔案類型，但建議使用 SVG 作為圖示格式。",
-	"vscode.extension.contributes.viewsContainers": "提供檢視容器給編輯者",
-	"views.container.activitybar": "提供檢視容器給活動列",
-	"test": "測試",
-	"requirearray": "檢視容器必須為陣列",
-	"requireidstring": "屬性 ‵{0}` 為必要項且必須為類型 `string`。僅允許英數字元、'_' 與 '-'。",
-	"requirestring": "屬性 '{0}' 為強制項目且必須屬於 `string` 類型",
-	"showViewlet": "顯示 {0}",
-	"view": "檢視"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json b/i18n/cht/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json
deleted file mode 100644
index 982167897cd..00000000000
--- a/i18n/cht/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"requirearray": "項目必須為陣列",
-	"requirestring": "屬性 '{0}' 為強制項目且必須屬於 `string` 類型",
-	"optstring": "屬性 `{0}` 可以省略或必須屬於 `string` 類型",
-	"vscode.extension.contributes.view.id": "檢視的識別碼。請使用此識別碼透過 `vscode.window.registerTreeDataProviderForView` API 登錄資料提供者。並藉由將 `onView:${id}` 事件登錄至 `activationEvents` 以觸發啟用您的延伸模組。",
-	"vscode.extension.contributes.view.name": "使用人性化顯示名稱.",
-	"vscode.extension.contributes.view.when": "必須為 true 以顯示此檢視的條件",
-	"vscode.extension.contributes.views": "提供意見給編輯者",
-	"views.explorer": "提供檢視給活動列中的總管容器",
-	"views.debug": "提供檢視給活動列中的偵錯容器",
-	"views.scm": "提供檢視給活動列中的 SCM 容器",
-	"views.test": "提供檢視給活動列中的測試容器",
-	"views.contributed": "提供檢視給參與檢視容器",
-	"ViewContainerDoesnotExist": "檢視容器 '{0}' 不存在，且所有向其註冊的檢視都會新增至 'Explorer'。",
-	"duplicateView1": "無法在位置 '{1}' 使用相同的識別碼 '{0}' 註冊多個檢視",
-	"duplicateView2": "識別碼為 '{0}' 的檢視已在位置 '{1}' 註冊"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/api/electron-browser/mainThreadExtensionService.i18n.json b/i18n/cht/src/vs/workbench/api/electron-browser/mainThreadExtensionService.i18n.json
deleted file mode 100644
index 36b2b7b357e..00000000000
--- a/i18n/cht/src/vs/workbench/api/electron-browser/mainThreadExtensionService.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"overwritingExtension": "正在以 {1} 覆寫延伸模組 {0}。",
-	"extensionUnderDevelopment": "正在載入位於 {0} 的開發延伸模組"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/api/electron-browser/mainThreadMessageService.i18n.json b/i18n/cht/src/vs/workbench/api/electron-browser/mainThreadMessageService.i18n.json
deleted file mode 100644
index 37f45309144..00000000000
--- a/i18n/cht/src/vs/workbench/api/electron-browser/mainThreadMessageService.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"extensionSource": "{0} (延伸模組)",
-	"defaultSource": "擴充功能",
-	"manageExtension": "管理延伸模組",
-	"cancel": "取消",
-	"ok": "確定"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json b/i18n/cht/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
deleted file mode 100644
index 074f6b2402f..00000000000
--- a/i18n/cht/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"timeout.formatOnSave": "在 {0} 毫秒後儲存時中止格式",
-	"codeActionsOnSave.didTimeout": "在 {0} 毫秒後中止了 codeActionsOnSave",
-	"timeout.onWillSave": "在 1750 亳秒後中止 onWillSaveTextDocument 事件",
-	"saveParticipants": "執行儲存參與者..."
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json b/i18n/cht/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json
deleted file mode 100644
index ee8688cdc85..00000000000
--- a/i18n/cht/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"task.label": "{0}: {1}"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/api/electron-browser/mainThreadWebview.i18n.json b/i18n/cht/src/vs/workbench/api/electron-browser/mainThreadWebview.i18n.json
deleted file mode 100644
index 55b794aa4c0..00000000000
--- a/i18n/cht/src/vs/workbench/api/electron-browser/mainThreadWebview.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"errorMessage": "還原 view:{0} 時發生錯誤"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/api/electron-browser/mainThreadWorkspace.i18n.json b/i18n/cht/src/vs/workbench/api/electron-browser/mainThreadWorkspace.i18n.json
deleted file mode 100644
index 0af06011ae7..00000000000
--- a/i18n/cht/src/vs/workbench/api/electron-browser/mainThreadWorkspace.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"folderStatusMessageAddSingleFolder": "延伸模組 '{0}' 在工作區新增了 1 個資料夾",
-	"folderStatusMessageAddMultipleFolders": "延伸模組 '{0}' 在工作區中新增了 {1} 個資料夾",
-	"folderStatusMessageRemoveSingleFolder": "延伸模組 '{0}' 從工作區移除了 1 個資料夾",
-	"folderStatusMessageRemoveMultipleFolders": "延伸模組 '{0}' 從工作區移除了 {1} 個資料夾",
-	"folderStatusChangeFolder": "延伸模組 '{0}' 變更了工作區的資料夾"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/api/node/extHostDiagnostics.i18n.json b/i18n/cht/src/vs/workbench/api/node/extHostDiagnostics.i18n.json
deleted file mode 100644
index 63dbe1661cd..00000000000
--- a/i18n/cht/src/vs/workbench/api/node/extHostDiagnostics.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"limitHit": "未顯示另外 {0} 個錯誤與警告。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/api/node/extHostExplorerView.i18n.json b/i18n/cht/src/vs/workbench/api/node/extHostExplorerView.i18n.json
deleted file mode 100644
index 24e5da79005..00000000000
--- a/i18n/cht/src/vs/workbench/api/node/extHostExplorerView.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"treeExplorer.notRegistered": "未註冊識別碼為 '{0}' 的 TreeExplorerNodeProvider。",
-	"treeExplorer.failedToProvideRootNode": "TreeExplorerNodeProvider '{0}' 無法提供根節點。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/api/node/extHostExtensionActivator.i18n.json b/i18n/cht/src/vs/workbench/api/node/extHostExtensionActivator.i18n.json
deleted file mode 100644
index bd63c2e9417..00000000000
--- a/i18n/cht/src/vs/workbench/api/node/extHostExtensionActivator.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"unknownDep": "擴充功能 '{1}' 無法啟動。原因: 未知的相依性 '{0}'。",
-	"failedDep1": "擴充功能 '{1}' 無法啟動。原因: 相依性 '{0}' 無法啟動。",
-	"failedDep2": "擴充功能 '{0}' 無法啟動。原因: 相依性超過 10 個層級 (很可能是相依性迴圈)。",
-	"activationError": "啟動擴充功能 '{0}' 失敗: {1}。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/api/node/extHostProgress.i18n.json b/i18n/cht/src/vs/workbench/api/node/extHostProgress.i18n.json
deleted file mode 100644
index 950340ccaf2..00000000000
--- a/i18n/cht/src/vs/workbench/api/node/extHostProgress.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"extensionSource": "{0} (延伸模組)"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/api/node/extHostTask.i18n.json b/i18n/cht/src/vs/workbench/api/node/extHostTask.i18n.json
deleted file mode 100644
index ee8688cdc85..00000000000
--- a/i18n/cht/src/vs/workbench/api/node/extHostTask.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"task.label": "{0}: {1}"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/api/node/extHostTreeExplorers.i18n.json b/i18n/cht/src/vs/workbench/api/node/extHostTreeExplorers.i18n.json
deleted file mode 100644
index fd728ace211..00000000000
--- a/i18n/cht/src/vs/workbench/api/node/extHostTreeExplorers.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"treeExplorer.notRegistered": "未註冊識別碼為 '{0}' 的 TreeExplorerNodeProvider。",
-	"treeExplorer.failedToProvideRootNode": "TreeExplorerNodeProvider '{0}' 無法提供根節點。",
-	"treeExplorer.failedToResolveChildren": "TreeExplorerNodeProvider '{0}' 無法 resolveChildren。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/api/node/extHostTreeView.i18n.json b/i18n/cht/src/vs/workbench/api/node/extHostTreeView.i18n.json
deleted file mode 100644
index 24e5da79005..00000000000
--- a/i18n/cht/src/vs/workbench/api/node/extHostTreeView.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"treeExplorer.notRegistered": "未註冊識別碼為 '{0}' 的 TreeExplorerNodeProvider。",
-	"treeExplorer.failedToProvideRootNode": "TreeExplorerNodeProvider '{0}' 無法提供根節點。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/api/node/extHostTreeViews.i18n.json b/i18n/cht/src/vs/workbench/api/node/extHostTreeViews.i18n.json
deleted file mode 100644
index abe4ed1d76a..00000000000
--- a/i18n/cht/src/vs/workbench/api/node/extHostTreeViews.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"treeView.notRegistered": "未註冊識別碼為 '{0}' 的樹狀檢視。",
-	"treeView.duplicateElement": "識別碼為 {0} 的元件已被註冊"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/api/node/extHostWorkspace.i18n.json b/i18n/cht/src/vs/workbench/api/node/extHostWorkspace.i18n.json
deleted file mode 100644
index e7689ba0400..00000000000
--- a/i18n/cht/src/vs/workbench/api/node/extHostWorkspace.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"updateerror": "延伸模組 '{0}' 無法更新工作區資料夾: {1}"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/api/node/mainThreadExtensionService.i18n.json b/i18n/cht/src/vs/workbench/api/node/mainThreadExtensionService.i18n.json
deleted file mode 100644
index 36b2b7b357e..00000000000
--- a/i18n/cht/src/vs/workbench/api/node/mainThreadExtensionService.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"overwritingExtension": "正在以 {1} 覆寫延伸模組 {0}。",
-	"extensionUnderDevelopment": "正在載入位於 {0} 的開發延伸模組"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/api/node/mainThreadMessageService.i18n.json b/i18n/cht/src/vs/workbench/api/node/mainThreadMessageService.i18n.json
deleted file mode 100644
index 4d3f09317ea..00000000000
--- a/i18n/cht/src/vs/workbench/api/node/mainThreadMessageService.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"close": "關閉",
-	"cancel": "取消",
-	"ok": "確定"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/browser/actions/configureLocale.i18n.json b/i18n/cht/src/vs/workbench/browser/actions/configureLocale.i18n.json
deleted file mode 100644
index 10a65101c17..00000000000
--- a/i18n/cht/src/vs/workbench/browser/actions/configureLocale.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"configureLocale": "設定語言",
-	"displayLanguage": "定義 VSCode 的顯示語言。",
-	"doc": "如需支援的語言清單，請參閱 {0}。",
-	"restart": "改變設定值後需要重新啟動 VSCode.",
-	"fail.createSettings": "無法建立 '{0}' ({1})。",
-	"JsonSchema.locale": "要使用的 UI 語言。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/browser/actions/fileActions.i18n.json b/i18n/cht/src/vs/workbench/browser/actions/fileActions.i18n.json
deleted file mode 100644
index 3c6ae2d7183..00000000000
--- a/i18n/cht/src/vs/workbench/browser/actions/fileActions.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"openFolder": "開啟資料夾...",
-	"openFileFolder": "開啟..."
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/browser/actions/toggleActivityBarVisibility.i18n.json b/i18n/cht/src/vs/workbench/browser/actions/toggleActivityBarVisibility.i18n.json
deleted file mode 100644
index 6f017eeea46..00000000000
--- a/i18n/cht/src/vs/workbench/browser/actions/toggleActivityBarVisibility.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleActivityBar": "切換活動列可見度",
-	"view": "檢視"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/browser/actions/toggleCenteredLayout.i18n.json b/i18n/cht/src/vs/workbench/browser/actions/toggleCenteredLayout.i18n.json
deleted file mode 100644
index 5c4abfbfa2b..00000000000
--- a/i18n/cht/src/vs/workbench/browser/actions/toggleCenteredLayout.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleCenteredLayout": "切換置中配置",
-	"view": "檢視"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/browser/actions/toggleEditorLayout.i18n.json b/i18n/cht/src/vs/workbench/browser/actions/toggleEditorLayout.i18n.json
deleted file mode 100644
index 20fce7cd1aa..00000000000
--- a/i18n/cht/src/vs/workbench/browser/actions/toggleEditorLayout.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleEditorGroupLayout": "切換編輯器群組垂直/水平配置",
-	"horizontalLayout": "水平編輯器群組配置",
-	"verticalLayout": "垂直編輯器群組配置",
-	"view": "檢視"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/browser/actions/toggleSidebarPosition.i18n.json b/i18n/cht/src/vs/workbench/browser/actions/toggleSidebarPosition.i18n.json
deleted file mode 100644
index e43d2cd1997..00000000000
--- a/i18n/cht/src/vs/workbench/browser/actions/toggleSidebarPosition.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleSidebarPosition": "切換提要欄位位置",
-	"view": "檢視"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/browser/actions/toggleSidebarVisibility.i18n.json b/i18n/cht/src/vs/workbench/browser/actions/toggleSidebarVisibility.i18n.json
deleted file mode 100644
index 41c23f61440..00000000000
--- a/i18n/cht/src/vs/workbench/browser/actions/toggleSidebarVisibility.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleSidebar": "切換提要欄位可見度",
-	"view": "檢視"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/browser/actions/toggleStatusbarVisibility.i18n.json b/i18n/cht/src/vs/workbench/browser/actions/toggleStatusbarVisibility.i18n.json
deleted file mode 100644
index ba827d41ec3..00000000000
--- a/i18n/cht/src/vs/workbench/browser/actions/toggleStatusbarVisibility.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleStatusbar": "切換狀態列可見度",
-	"view": "檢視"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/browser/actions/toggleTabsVisibility.i18n.json b/i18n/cht/src/vs/workbench/browser/actions/toggleTabsVisibility.i18n.json
deleted file mode 100644
index 3f265fbfad7..00000000000
--- a/i18n/cht/src/vs/workbench/browser/actions/toggleTabsVisibility.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleTabs": "切換標籤可見度",
-	"view": "檢視"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/browser/actions/toggleZenMode.i18n.json b/i18n/cht/src/vs/workbench/browser/actions/toggleZenMode.i18n.json
deleted file mode 100644
index 38061fa5ca5..00000000000
--- a/i18n/cht/src/vs/workbench/browser/actions/toggleZenMode.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleZenMode": "切換無干擾模式",
-	"view": "檢視"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/browser/actions/workspaceActions.i18n.json b/i18n/cht/src/vs/workbench/browser/actions/workspaceActions.i18n.json
deleted file mode 100644
index fb350c87bdc..00000000000
--- a/i18n/cht/src/vs/workbench/browser/actions/workspaceActions.i18n.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openFile": "開啟檔案...",
-	"openFolder": "開啟資料夾...",
-	"openFileFolder": "開啟...",
-	"globalRemoveFolderFromWorkspace": "將資料夾從工作區移除...",
-	"saveWorkspaceAsAction": "另存工作區為...",
-	"save": "儲存(&&S)",
-	"saveWorkspace": "儲存工作區",
-	"openWorkspaceAction": "開啟工作區...",
-	"openWorkspaceConfigFile": "開啟工作區組態檔",
-	"duplicateWorkspaceInNewWindow": "新視窗中的重覆工作區"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/browser/actions/workspaceCommands.i18n.json b/i18n/cht/src/vs/workbench/browser/actions/workspaceCommands.i18n.json
deleted file mode 100644
index 6d82e2865df..00000000000
--- a/i18n/cht/src/vs/workbench/browser/actions/workspaceCommands.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"addFolderToWorkspace": "將資料夾新增到工作區...",
-	"add": "新增",
-	"addFolderToWorkspaceTitle": "將資料夾新增到工作區",
-	"workspaceFolderPickerPlaceholder": "選取工作區資料夾"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/browser/parts/activitybar/activitybarActions.i18n.json b/i18n/cht/src/vs/workbench/browser/parts/activitybar/activitybarActions.i18n.json
deleted file mode 100644
index 28f1a55a24c..00000000000
--- a/i18n/cht/src/vs/workbench/browser/parts/activitybar/activitybarActions.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"badgeTitle": "{0} - {1}",
-	"titleKeybinding": "{0} ({1})",
-	"removeFromActivityBar": "從活動列隱藏",
-	"keepInActivityBar": "保留在活動列",
-	"additionalViews": "其他檢視",
-	"numberBadge": "{0} ({1})",
-	"manageExtension": "管理延伸模組",
-	"toggle": "切換釘選的檢視"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/browser/parts/activitybar/activitybarPart.i18n.json b/i18n/cht/src/vs/workbench/browser/parts/activitybar/activitybarPart.i18n.json
deleted file mode 100644
index d518bdd3574..00000000000
--- a/i18n/cht/src/vs/workbench/browser/parts/activitybar/activitybarPart.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hideActivitBar": "隱藏活動列",
-	"globalActions": "全域動作"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/browser/parts/compositePart.i18n.json b/i18n/cht/src/vs/workbench/browser/parts/compositePart.i18n.json
deleted file mode 100644
index befd83e6b45..00000000000
--- a/i18n/cht/src/vs/workbench/browser/parts/compositePart.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"ariaCompositeToolbarLabel": "{0} 個動作",
-	"titleTooltip": "{0} ({1})"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/browser/parts/compositebar/compositeBar.i18n.json b/i18n/cht/src/vs/workbench/browser/parts/compositebar/compositeBar.i18n.json
deleted file mode 100644
index 661c5edffe0..00000000000
--- a/i18n/cht/src/vs/workbench/browser/parts/compositebar/compositeBar.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"activityBarAriaLabel": "即時檢視切換器"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/browser/parts/compositebar/compositeBarActions.i18n.json b/i18n/cht/src/vs/workbench/browser/parts/compositebar/compositeBarActions.i18n.json
deleted file mode 100644
index 31e28bee8b2..00000000000
--- a/i18n/cht/src/vs/workbench/browser/parts/compositebar/compositeBarActions.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"largeNumberBadge": "10 k +",
-	"badgeTitle": "{0} - {1}",
-	"additionalViews": "其他檢視",
-	"numberBadge": "{0} ({1})",
-	"manageExtension": "管理延伸模組",
-	"titleKeybinding": "{0} ({1})",
-	"hide": "隱藏",
-	"keep": "保留",
-	"toggle": "切換釘選的檢視"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/browser/parts/editor/binaryDiffEditor.i18n.json b/i18n/cht/src/vs/workbench/browser/parts/editor/binaryDiffEditor.i18n.json
deleted file mode 100644
index ea1317f6659..00000000000
--- a/i18n/cht/src/vs/workbench/browser/parts/editor/binaryDiffEditor.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"metadataDiff": "{0} ↔ {1}"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/browser/parts/editor/binaryEditor.i18n.json b/i18n/cht/src/vs/workbench/browser/parts/editor/binaryEditor.i18n.json
deleted file mode 100644
index 12637f1a320..00000000000
--- a/i18n/cht/src/vs/workbench/browser/parts/editor/binaryEditor.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"binaryEditor": "二進位檢視器"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json b/i18n/cht/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json
deleted file mode 100644
index 57210caa274..00000000000
--- a/i18n/cht/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"textEditor": "文字編輯器",
-	"textDiffEditor": "文字 Diff 編輯器",
-	"binaryDiffEditor": "二進位 Diff 編輯器",
-	"sideBySideEditor": "並排編輯器",
-	"groupOnePicker": "在第一個群組顯示編輯器",
-	"groupTwoPicker": "在第二個群組顯示編輯器",
-	"groupThreePicker": "在第三個群組顯示編輯器",
-	"allEditorsPicker": "顯示所有開啟的編輯器",
-	"view": "檢視",
-	"file": "檔案",
-	"close": "關閉",
-	"closeOthers": "關閉其他",
-	"closeRight": "關到右側",
-	"closeAllSaved": "關閉已儲存項目",
-	"closeAll": "全部關閉",
-	"keepOpen": "保持開啟",
-	"toggleInlineView": "切換至內嵌檢視",
-	"showOpenedEditors": "顯示開啟的編輯器",
-	"keepEditor": "保留編輯器",
-	"closeEditorsInGroup": "關閉群組中的所有編輯器",
-	"closeSavedEditors": "關閉群組中的已儲存編輯器",
-	"closeOtherEditors": "關閉其他編輯器",
-	"closeRightEditors": "將編輯器關到右側"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/browser/parts/editor/editorActions.i18n.json b/i18n/cht/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
deleted file mode 100644
index 9af81e350d6..00000000000
--- a/i18n/cht/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
+++ /dev/null
@@ -1,58 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"splitEditor": "分割編輯器",
-	"joinTwoGroups": "聯結兩個群組的編輯器",
-	"navigateEditorGroups": "在編輯器群組間導覽",
-	"focusActiveEditorGroup": "聚焦使用中的編輯器群組",
-	"focusFirstEditorGroup": "聚焦第一個編輯器群組",
-	"focusSecondEditorGroup": "聚焦第二個編輯器群組",
-	"focusThirdEditorGroup": "聚焦第三個編輯器群組",
-	"focusPreviousGroup": "聚焦上一個群組",
-	"focusNextGroup": "聚焦下一個群組",
-	"openToSide": "開至側邊",
-	"closeEditor": "關閉編輯器",
-	"closeOneEditor": "關閉",
-	"revertAndCloseActiveEditor": "還原並關閉編輯器",
-	"closeEditorsToTheLeft": "將編輯器關到左側",
-	"closeAllEditors": "關閉所有編輯器",
-	"closeEditorsInOtherGroups": "關閉其他群組中的編輯器",
-	"moveActiveGroupLeft": "將編輯器群組向左移",
-	"moveActiveGroupRight": "將編輯器群組向右移",
-	"minimizeOtherEditorGroups": "將其他編輯器群組最小化",
-	"evenEditorGroups": "均分編輯器群組寬度",
-	"maximizeEditor": "將編輯器群組最大化並隱藏側邊欄",
-	"openNextEditor": "開啟下一個編輯器",
-	"openPreviousEditor": "開啟上一個編輯器",
-	"nextEditorInGroup": "開啟群組中下一個編輯器",
-	"openPreviousEditorInGroup": "開啟群組中上一個編輯器",
-	"lastEditorInGroup": "開啟群組中最後一個編輯器",
-	"navigateNext": "向前",
-	"navigatePrevious": "向後",
-	"navigateLast": "移至最後",
-	"reopenClosedEditor": "重新開啟已關閉的編輯器",
-	"clearRecentFiles": "清理最近開啟的",
-	"showEditorsInFirstGroup": "在第一個群組顯示編輯器",
-	"showEditorsInSecondGroup": "在第二個群組顯示編輯器",
-	"showEditorsInThirdGroup": "在第三個群組顯示編輯器",
-	"showAllEditors": "顯示所有編輯器",
-	"openPreviousRecentlyUsedEditorInGroup": "開啟群組中上一個最近使用的編輯器",
-	"openNextRecentlyUsedEditorInGroup": "開啟群組中下一個最近使用的編輯器",
-	"navigateEditorHistoryByInput": "從記錄中開啟上一個編輯器",
-	"openNextRecentlyUsedEditor": "開啟下一個最近使用的編輯器",
-	"openPreviousRecentlyUsedEditor": "開啟上一個最近使用的編輯器",
-	"clearEditorHistory": "清除編輯器記錄",
-	"focusLastEditorInStack": "開啟群組中最後一個編輯器",
-	"moveEditorLeft": "將編輯器左移",
-	"moveEditorRight": "將編輯器右移",
-	"moveEditorToPreviousGroup": "將編輯器移入上一個群組",
-	"moveEditorToNextGroup": "將編輯器移入下一個群組",
-	"moveEditorToFirstGroup": "將編輯器移動到第一個群組",
-	"moveEditorToSecondGroup": "將編輯器移動到第二個群組",
-	"moveEditorToThirdGroup": "將編輯器移動到第三個群組"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json b/i18n/cht/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json
deleted file mode 100644
index 70182509e57..00000000000
--- a/i18n/cht/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"editorCommand.activeEditorMove.description": "以 tab 或群組為單位移動使用中的編輯器",
-	"editorCommand.activeEditorMove.arg.name": "使用中編輯器的移動引數",
-	"editorCommand.activeEditorMove.arg.description": "引數屬性:\n\t* 'to': 提供移動目標位置的字串值。\n\t* 'by': 提供移動單位的字串值。\n\t* 'value': 提供移動單位的字串值。可依索引標籤或群組作為單位。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/browser/parts/editor/editorPart.i18n.json b/i18n/cht/src/vs/workbench/browser/parts/editor/editorPart.i18n.json
deleted file mode 100644
index 02927961972..00000000000
--- a/i18n/cht/src/vs/workbench/browser/parts/editor/editorPart.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"groupOneVertical": "左",
-	"groupTwoVertical": "置中",
-	"groupThreeVertical": "右",
-	"groupOneHorizontal": "上",
-	"groupTwoHorizontal": "置中",
-	"groupThreeHorizontal": "下",
-	"editorOpenError": "無法開啟 '{0}': {1}。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/browser/parts/editor/editorPicker.i18n.json b/i18n/cht/src/vs/workbench/browser/parts/editor/editorPicker.i18n.json
deleted file mode 100644
index 9d3af4c291b..00000000000
--- a/i18n/cht/src/vs/workbench/browser/parts/editor/editorPicker.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"entryAriaLabel": "{0}，編輯器群組選擇器",
-	"groupLabel": "群組: {0}",
-	"noResultsFoundInGroup": "在群組中找不到任何相符的已開啟編輯器",
-	"noOpenedEditors": "開啟的編輯器清單在群組中目前為空白",
-	"noResultsFound": "找不到任何相符的已開啟編輯器",
-	"noOpenedEditorsAllGroups": "開啟的編輯器清單目前為空白"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json b/i18n/cht/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json
deleted file mode 100644
index e388b64bded..00000000000
--- a/i18n/cht/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"singleSelectionRange": "第 {0} 行，第 {1} 欄 (已選取 {2})",
-	"singleSelection": "第 {0} 行，第 {1} 欄",
-	"multiSelectionRange": "{0} 個選取項目 (已選取 {1} 個字元)",
-	"multiSelection": "{0} 個選取項目",
-	"endOfLineLineFeed": "LF",
-	"endOfLineCarriageReturnLineFeed": "CRLF",
-	"tabFocusModeEnabled": "用 Tab 鍵移動焦點",
-	"screenReaderDetected": "已將螢幕助讀程式最佳化",
-	"screenReaderDetectedExtra": "若您不打算使用螢幕助讀程式，請將設定 `editor.accessibilitySupport` 變更為 \"off\"。",
-	"disableTabMode": "停用協助工具模式",
-	"gotoLine": "移至行",
-	"selectIndentation": "選擇縮排",
-	"selectEncoding": "選取編碼",
-	"selectEOL": "選取行尾順序",
-	"selectLanguageMode": "選取語言模式",
-	"fileInfo": "檔案資訊",
-	"spacesSize": "空格: {0}",
-	"tabSize": "定位點大小: {0}",
-	"showLanguageExtensions": "在 Marketplace 搜尋延伸模組 '{0}'...",
-	"changeMode": "變更語言模式",
-	"noEditor": "目前沒有使用中的文字編輯器",
-	"languageDescription": "({0}) - 設定的語言",
-	"languageDescriptionConfigured": "({0})",
-	"languagesPicks": "語言 (識別碼)",
-	"configureModeSettings": "進行以 '{0}' 語言為基礎的設定...",
-	"configureAssociationsExt": "為 '{0}' 設定檔案關聯...",
-	"autoDetect": "自動偵測",
-	"pickLanguage": "選取語言模式",
-	"currentAssociation": "目前的關聯",
-	"pickLanguageToConfigure": "選取要與 '{0}' 建立關聯的語言模式",
-	"changeIndentation": "變更縮排",
-	"noWritableCodeEditor": "使用中的程式碼編輯器為唯讀。",
-	"indentView": "變更檢視",
-	"indentConvert": "轉換檔案",
-	"pickAction": "選取動作",
-	"changeEndOfLine": "變更行尾順序",
-	"pickEndOfLine": "選取行尾順序",
-	"changeEncoding": "變更檔案的編碼",
-	"noFileEditor": "目前沒有使用中的檔案",
-	"saveWithEncoding": "以編碼儲存",
-	"reopenWithEncoding": "以編碼重新開啟",
-	"guessedEncoding": "已從內容猜測",
-	"pickEncodingForReopen": "選取檔案的編碼以重新開啟檔案",
-	"pickEncodingForSave": "選取用來儲存的檔案編碼",
-	"screenReaderDetectedExplanation.title": "已將螢幕助讀程式最佳化",
-	"screenReaderDetectedExplanation.question": "您正使用螢幕助讀程式來操作 VS Code 嗎?",
-	"screenReaderDetectedExplanation.answerYes": "是",
-	"screenReaderDetectedExplanation.answerNo": "否",
-	"screenReaderDetectedExplanation.body1": "已將 VS Code 最佳化，現在可搭配螢幕助讀程式使用。",
-	"screenReaderDetectedExplanation.body2": "某些編輯器功能會具有不同的行為: 例如文字換行、折疊等。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/browser/parts/editor/resourceViewer.i18n.json b/i18n/cht/src/vs/workbench/browser/parts/editor/resourceViewer.i18n.json
deleted file mode 100644
index e9f8dbb8b3e..00000000000
--- a/i18n/cht/src/vs/workbench/browser/parts/editor/resourceViewer.i18n.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"sizeB": "{0}B",
-	"sizeKB": "{0}KB",
-	"sizeMB": "{0}MB",
-	"sizeGB": "{0}GB",
-	"sizeTB": "{0}TB",
-	"largeImageError": "因為影像太大，所以未在編輯器中顯示 ({0})。",
-	"resourceOpenExternalButton": "要使用外部程式打開影像嗎?",
-	"nativeFileTooLargeError": "因為檔案太大，所以未在編輯器中顯示 ({0})。",
-	"nativeBinaryError": "因為檔案為二進位檔或使用了不支援的文字編碼，所以未在編輯器中顯示。",
-	"openAsText": "是否確定要開啟?",
-	"zoom.action.fit.label": "整個影像",
-	"imgMeta": "{0}x{1} {2}"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/browser/parts/editor/tabsTitleControl.i18n.json b/i18n/cht/src/vs/workbench/browser/parts/editor/tabsTitleControl.i18n.json
deleted file mode 100644
index 2048b322bf6..00000000000
--- a/i18n/cht/src/vs/workbench/browser/parts/editor/tabsTitleControl.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"araLabelTabActions": "索引標籤動作"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json b/i18n/cht/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json
deleted file mode 100644
index 98279e8e6e3..00000000000
--- a/i18n/cht/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"textDiffEditor": "文字 Diff 編輯器",
-	"readonlyEditorWithInputAriaLabel": "{0}。唯讀文字比較編輯器。",
-	"readonlyEditorAriaLabel": "唯讀文字比較編輯器。",
-	"editableEditorWithInputAriaLabel": "{0}。文字檔案比較編輯器。",
-	"editableEditorAriaLabel": "文字檔比較編輯器。",
-	"navigate.next.label": "下一個變更",
-	"navigate.prev.label": "上一個變更",
-	"toggleIgnoreTrimWhitespace.label": "忽略修剪空白字元"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/browser/parts/editor/textEditor.i18n.json b/i18n/cht/src/vs/workbench/browser/parts/editor/textEditor.i18n.json
deleted file mode 100644
index a06886a6072..00000000000
--- a/i18n/cht/src/vs/workbench/browser/parts/editor/textEditor.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"editorLabelWithGroup": "{0}，群組 {1}。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/browser/parts/editor/textResourceEditor.i18n.json b/i18n/cht/src/vs/workbench/browser/parts/editor/textResourceEditor.i18n.json
deleted file mode 100644
index 8e6ceee9200..00000000000
--- a/i18n/cht/src/vs/workbench/browser/parts/editor/textResourceEditor.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"textEditor": "文字編輯器",
-	"readonlyEditorWithInputAriaLabel": "{0}。唯讀文字編輯器。",
-	"readonlyEditorAriaLabel": "唯讀文字編輯器。",
-	"untitledFileEditorWithInputAriaLabel": "{0}。無標題檔案文字編輯器。",
-	"untitledFileEditorAriaLabel": "無標題檔案文字編輯器。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/browser/parts/editor/titleControl.i18n.json b/i18n/cht/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
deleted file mode 100644
index 47f703cf2f9..00000000000
--- a/i18n/cht/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"araLabelEditorActions": "編輯器動作"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/browser/parts/notifications/notificationsActions.i18n.json b/i18n/cht/src/vs/workbench/browser/parts/notifications/notificationsActions.i18n.json
deleted file mode 100644
index c7bb64eaec1..00000000000
--- a/i18n/cht/src/vs/workbench/browser/parts/notifications/notificationsActions.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"clearNotification": "清除通知",
-	"clearNotifications": "清除所有通知",
-	"hideNotificationsCenter": "隱藏通知",
-	"expandNotification": "展開通知",
-	"collapseNotification": "摺疊通知",
-	"configureNotification": "設定通知",
-	"copyNotification": "複製文字"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/browser/parts/notifications/notificationsAlerts.i18n.json b/i18n/cht/src/vs/workbench/browser/parts/notifications/notificationsAlerts.i18n.json
deleted file mode 100644
index 4b3808d2548..00000000000
--- a/i18n/cht/src/vs/workbench/browser/parts/notifications/notificationsAlerts.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"alertErrorMessage": "錯誤: {0}",
-	"alertWarningMessage": "警告: {0}",
-	"alertInfoMessage": "資訊: {0}"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json b/i18n/cht/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json
deleted file mode 100644
index 57cd7f56821..00000000000
--- a/i18n/cht/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"notificationsEmpty": "尚無新通知",
-	"notifications": "通知",
-	"notificationsToolbar": "通知中心動作",
-	"notificationsList": "通知列表"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/browser/parts/notifications/notificationsCommands.i18n.json b/i18n/cht/src/vs/workbench/browser/parts/notifications/notificationsCommands.i18n.json
deleted file mode 100644
index eb797e85b47..00000000000
--- a/i18n/cht/src/vs/workbench/browser/parts/notifications/notificationsCommands.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"notifications": "通知",
-	"showNotifications": "顯示通知",
-	"hideNotifications": "隱藏通知",
-	"clearAllNotifications": "清除所有通知"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/browser/parts/notifications/notificationsStatus.i18n.json b/i18n/cht/src/vs/workbench/browser/parts/notifications/notificationsStatus.i18n.json
deleted file mode 100644
index 822dc55b542..00000000000
--- a/i18n/cht/src/vs/workbench/browser/parts/notifications/notificationsStatus.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hideNotifications": "隱藏通知",
-	"zeroNotifications": "無通知",
-	"noNotifications": "無新通知",
-	"oneNotification": "1 則新通知",
-	"notifications": "{0} 則新通知"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/browser/parts/notifications/notificationsToasts.i18n.json b/i18n/cht/src/vs/workbench/browser/parts/notifications/notificationsToasts.i18n.json
deleted file mode 100644
index c70100eef61..00000000000
--- a/i18n/cht/src/vs/workbench/browser/parts/notifications/notificationsToasts.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"notificationsToast": "通知 Toast"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/browser/parts/notifications/notificationsViewer.i18n.json b/i18n/cht/src/vs/workbench/browser/parts/notifications/notificationsViewer.i18n.json
deleted file mode 100644
index 35c9610629e..00000000000
--- a/i18n/cht/src/vs/workbench/browser/parts/notifications/notificationsViewer.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"notificationActions": "通知動作",
-	"notificationSource": "來源: {0}"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/browser/parts/panel/panelActions.i18n.json b/i18n/cht/src/vs/workbench/browser/parts/panel/panelActions.i18n.json
deleted file mode 100644
index f31aedce3b1..00000000000
--- a/i18n/cht/src/vs/workbench/browser/parts/panel/panelActions.i18n.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"closePanel": "關閉面板",
-	"togglePanel": "切換面板",
-	"focusPanel": "將焦點移至面板",
-	"toggledPanelPosition": "切換面板位置",
-	"moveToRight": "向右移",
-	"moveToBottom": "向下移",
-	"toggleMaximizedPanel": "切換最大化面板",
-	"maximizePanel": "最大化面板大小",
-	"minimizePanel": "還原面板大小",
-	"view": "檢視"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/browser/parts/panel/panelPart.i18n.json b/i18n/cht/src/vs/workbench/browser/parts/panel/panelPart.i18n.json
deleted file mode 100644
index ac531363e04..00000000000
--- a/i18n/cht/src/vs/workbench/browser/parts/panel/panelPart.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hidePanel": "隱藏面板"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/browser/parts/quickinput/quickInput.i18n.json b/i18n/cht/src/vs/workbench/browser/parts/quickinput/quickInput.i18n.json
deleted file mode 100644
index 34f0faed819..00000000000
--- a/i18n/cht/src/vs/workbench/browser/parts/quickinput/quickInput.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"inputModeEntryDescription": "{0} (按 'Enter' 鍵確認或按 'Esc' 鍵取消)",
-	"inputModeEntry": "按 'Enter' 鍵確認您的輸入或按 'Esc' 鍵取消",
-	"quickInput.countSelected": "已選擇 {0}",
-	"ok": "確定"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/browser/parts/quickinput/quickInputBox.i18n.json b/i18n/cht/src/vs/workbench/browser/parts/quickinput/quickInputBox.i18n.json
deleted file mode 100644
index 28e300993c3..00000000000
--- a/i18n/cht/src/vs/workbench/browser/parts/quickinput/quickInputBox.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"quickInputBox.ariaLabel": "輸入以縮小結果範圍。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/browser/parts/quickopen/quickOpenController.i18n.json b/i18n/cht/src/vs/workbench/browser/parts/quickopen/quickOpenController.i18n.json
deleted file mode 100644
index f513513d555..00000000000
--- a/i18n/cht/src/vs/workbench/browser/parts/quickopen/quickOpenController.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"emptyPicks": "沒有可挑選的項目",
-	"quickOpenInput": "輸入 '?' 即可取得相關說明來了解您可以在這裡執行的動作",
-	"historyMatches": "最近開啟的",
-	"noResultsFound1": "找不到結果",
-	"canNotRunPlaceholder": "目前內容無法使用這個 Quick Open 處理常式",
-	"entryAriaLabel": "{0}，最近開啟的項目",
-	"removeFromEditorHistory": "從記錄中移除",
-	"pickHistory": "選取編輯器輸入即可從歷程記錄移除"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/browser/parts/quickopen/quickopen.contribution.i18n.json b/i18n/cht/src/vs/workbench/browser/parts/quickopen/quickopen.contribution.i18n.json
deleted file mode 100644
index 4e288801642..00000000000
--- a/i18n/cht/src/vs/workbench/browser/parts/quickopen/quickopen.contribution.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"quickOpen": "移至檔案...",
-	"quickNavigateNext": "在 Quick Open 中導覽至下一項",
-	"quickNavigatePrevious": "在 Quick Open 中導覽至上一項",
-	"quickSelectNext": "在 Quick Open 中選取下一個",
-	"quickSelectPrevious": "在 Quick Open 中選取上一個"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/browser/parts/quickopen/quickopen.i18n.json b/i18n/cht/src/vs/workbench/browser/parts/quickopen/quickopen.i18n.json
deleted file mode 100644
index e0d39de1024..00000000000
--- a/i18n/cht/src/vs/workbench/browser/parts/quickopen/quickopen.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"quickOpen": "移至檔案...",
-	"quickNavigateNext": "在 Quick Open 中導覽至下一項",
-	"quickNavigatePrevious": "在 Quick Open 中導覽至上一項",
-	"quickSelectNext": "在 Quick Open 中選取下一個",
-	"quickSelectPrevious": "在 Quick Open 中選取上一個"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/browser/parts/sidebar/sidebarPart.i18n.json b/i18n/cht/src/vs/workbench/browser/parts/sidebar/sidebarPart.i18n.json
deleted file mode 100644
index c06a79c75c8..00000000000
--- a/i18n/cht/src/vs/workbench/browser/parts/sidebar/sidebarPart.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"focusSideBar": "瀏覽至提要欄位",
-	"viewCategory": "檢視"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/browser/parts/statusbar/statusbarPart.i18n.json b/i18n/cht/src/vs/workbench/browser/parts/statusbar/statusbarPart.i18n.json
deleted file mode 100644
index 62ddd7801cf..00000000000
--- a/i18n/cht/src/vs/workbench/browser/parts/statusbar/statusbarPart.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"manageExtension": "管理延伸模組"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/browser/parts/titlebar/titlebarPart.i18n.json b/i18n/cht/src/vs/workbench/browser/parts/titlebar/titlebarPart.i18n.json
deleted file mode 100644
index 72ed57fe216..00000000000
--- a/i18n/cht/src/vs/workbench/browser/parts/titlebar/titlebarPart.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"patchedWindowTitle": "[不支援]",
-	"userIsAdmin": "[系統管理員]",
-	"userIsSudo": "[超級使用者]",
-	"devExtensionWindowTitlePrefix": "[Extension Development Host]"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/browser/parts/views/panelViewlet.i18n.json b/i18n/cht/src/vs/workbench/browser/parts/views/panelViewlet.i18n.json
deleted file mode 100644
index 4e472e3d470..00000000000
--- a/i18n/cht/src/vs/workbench/browser/parts/views/panelViewlet.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"viewToolbarAriaLabel": "{0} 個動作"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/browser/parts/views/views.i18n.json b/i18n/cht/src/vs/workbench/browser/parts/views/views.i18n.json
deleted file mode 100644
index d9eedec6006..00000000000
--- a/i18n/cht/src/vs/workbench/browser/parts/views/views.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"viewToolbarAriaLabel": "{0} 個動作",
-	"hideView": "從提要欄位隱藏"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/browser/parts/views/viewsRegistry.i18n.json b/i18n/cht/src/vs/workbench/browser/parts/views/viewsRegistry.i18n.json
deleted file mode 100644
index e29734f7644..00000000000
--- a/i18n/cht/src/vs/workbench/browser/parts/views/viewsRegistry.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"duplicateId": "識別碼為 '{0}' 的檢視已在位置 '{1}' 中註冊"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/browser/parts/views/viewsViewlet.i18n.json b/i18n/cht/src/vs/workbench/browser/parts/views/viewsViewlet.i18n.json
deleted file mode 100644
index 63edc3e56ba..00000000000
--- a/i18n/cht/src/vs/workbench/browser/parts/views/viewsViewlet.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"cannot toggle": "無法為此檢視 {0} 切換可見度",
-	"cannot show": "無法顯示此檢視 {0}，因為 'when' 條件而被隱藏",
-	"hideView": "隱藏"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/browser/quickopen.i18n.json b/i18n/cht/src/vs/workbench/browser/quickopen.i18n.json
deleted file mode 100644
index 1bf76566c74..00000000000
--- a/i18n/cht/src/vs/workbench/browser/quickopen.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noResultsMatching": "沒有相符的結果",
-	"noResultsFound2": "找不到結果"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/browser/viewlet.i18n.json b/i18n/cht/src/vs/workbench/browser/viewlet.i18n.json
deleted file mode 100644
index ceca1c6a401..00000000000
--- a/i18n/cht/src/vs/workbench/browser/viewlet.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"compositePart.hideSideBarLabel": "隱藏提要欄位",
-	"collapse": "全部摺疊"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/common/theme.i18n.json b/i18n/cht/src/vs/workbench/common/theme.i18n.json
deleted file mode 100644
index 41a6d8c801b..00000000000
--- a/i18n/cht/src/vs/workbench/common/theme.i18n.json
+++ /dev/null
@@ -1,72 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"tabActiveBackground": "使用中之索引標籤的背景色彩。索引標籤是編輯器在編輯器區域中的容器。同一個編輯器群組中的多個索引標籤可以同時開啟。可能會有多個編輯器群組。",
-	"tabInactiveBackground": "非使用中之索引標籤的背景色彩。索引標籤是編輯器在編輯器區域中的容器。同一個編輯器群組中的多個索引標籤可以同時開啟。可能會有多個編輯器群組。",
-	"tabHoverBackground": "當暫留索引標籤的背景色彩。索引標籤是編輯器在編輯器區域中的容器。同一個編輯器群組中的多個索引標籤可以同時開啟。可能會有多個編輯器群組。",
-	"tabUnfocusedHoverBackground": "當暫留非焦點群組中索引標籤的背景色彩。索引標籤是編輯器在編輯器區域中的容器。同一個編輯器群組中的多個索引標籤可以同時開啟。可能會有多個編輯器群組。 ",
-	"tabBorder": "用以分隔索引標籤彼此的框線。索引標籤是編輯器在編輯器區域中的容器。同一個編輯器群組中的多個索引標籤可以同時開啟。可能會有多個編輯器群組。",
-	"tabActiveBorder": "使用中索引標籤的底部邊框。索引標籤是編輯器在編輯器區域中的容器。同一個編輯器群組中的多個索引標籤可以同時開啟。可能會有多個編輯器群組。",
-	"tabActiveBorderTop": "使用中索引標籤的頂部邊框。索引標籤是編輯器在編輯器區域中的容器。同一個編輯器群組中的多個索引標籤可以同時開啟。可能會有多個編輯器群組。",
-	"tabActiveUnfocusedBorder": "非焦點群組內使用中索引標籤的底部邊框。索引標籤是編輯器在編輯器區域中的容器。同一個編輯器群組中的多個索引標籤可以同時開啟。可能會有多個編輯器群組。",
-	"tabActiveUnfocusedBorderTop": "非焦點群組內使用中索引標籤的頂部邊框。索引標籤是編輯器在編輯器區域中的容器。同一個編輯器群組中的多個索引標籤可以同時開啟。可能會有多個編輯器群組。",
-	"tabHoverBorder": "用以反白顯示暫留時索引標籤的框線。索引標籤是編輯器在編輯器區域中的容器。同一個編輯器群組中的多個索引標籤可以同時開啟。可能會有多個編輯器群組。",
-	"tabUnfocusedHoverBorder": "在非焦點群組中反白顯示暫留時索引標籤的框線。索引標籤是編輯器在編輯器區域中的容器。同一個編輯器群組中的多個索引標籤可以同時開啟。可能會有多個編輯器群組。 ",
-	"tabActiveForeground": "使用中的群組內，使用中之索引標籤的前景色彩。索引標籤是編輯器在編輯器區域中的容器。同一個編輯器群組中的多個索引標籤可以同時開啟。可能會有多個編輯器群組。",
-	"tabInactiveForeground": "使用中的群組內，非使用中之索引標籤的前景色彩。索引標籤是編輯器在編輯器區域中的容器。同一個編輯器群組中的多個索引標籤可以同時開啟。可能會有多個編輯器群組。",
-	"tabUnfocusedActiveForeground": "非焦點群組中的使用中索引標籤前景色彩。索引標籤是編輯器在編輯器區域中的容器。同一個編輯器群組中的多個索引標籤可以同時開啟。可能會有多個編輯器群組。",
-	"tabUnfocusedInactiveForeground": "非焦點群組中的非使用中索引標籤前景色彩。索引標籤是編輯器在編輯器區域中的容器。同一個編輯器群組中的多個索引標籤可以同時開啟。可能會有多個編輯器群組。",
-	"editorGroupBackground": "編輯器群組的背景色彩。編輯器群組是編輯器的容器。當拖曳編輯器群組時會顯示背景色彩。",
-	"tabsContainerBackground": "當索引標籤啟用的時候編輯器群組標題的背景色彩。編輯器群組是編輯器的容器。",
-	"tabsContainerBorder": "當索引標籤啟用時，編輯器群組標題的框線色彩。編輯器群組是編輯器的容器。",
-	"editorGroupHeaderBackground": "當索引標籤禁用的時候編輯器群組標題的背景顏色 (`\"workbench.editor.showTabs\": false`)。編輯器群組是編輯器的容器。",
-	"editorGroupBorder": "用以分隔多個編輯器群組彼此的色彩。編輯器群組是編輯器的容器。",
-	"editorDragAndDropBackground": "拖拉編輯器時的背景顏色,可設置透明度讓內容穿透顯示.",
-	"panelBackground": "面板的前景色彩。面板會顯示在編輯器區域的下方，其中包含諸如輸出與整合式終端機等檢視。",
-	"panelBorder": "用來區隔面板與編輯器的面板邊界色彩。面板會顯示於編輯器區域的下方，並會包含檢視，如輸出和整合終端機。",
-	"panelActiveTitleForeground": "使用中之面板標題的標題色彩。面板會顯示在編輯器區域的下方，其中包含諸如輸出與整合式終端機等檢視。",
-	"panelInactiveTitleForeground": "非使用中之面板標題的標題色彩。面板會顯示在編輯器區域的下方，其中包含諸如輸出與整合式終端機等檢視。",
-	"panelActiveTitleBorder": "使用中之面板標題的框線色彩。面板會顯示在編輯器區域的下方，其中包含諸如輸出與整合式終端機等檢視。",
-	"panelDragAndDropBackground": "拖放面板標題項目的意見反應色彩。色彩必須具有透明度，面板項目才能顯示。面板會顯示於編輯區域的底部，並會包含檢視，如輸出和整合終端機。",
-	"statusBarForeground": "當一個工作區被開啟時，狀態列的前景色彩。狀態列會顯示在視窗的底部。",
-	"statusBarNoFolderForeground": "當未開啟任何資料夾時，狀態列的前景色彩。狀態列會顯示在視窗的底部。",
-	"statusBarBackground": "當一個工作區被開啟時，狀態列的背景色彩。狀態列會顯示在視窗的底部。",
-	"statusBarNoFolderBackground": "當未開啟任何資料夾時，狀態列的背景色彩。狀態列會顯示在視窗的底部。",
-	"statusBarBorder": "用以分隔資訊看板與編輯器的狀態列框線色彩。狀態列會顯示在視窗的底部。",
-	"statusBarNoFolderBorder": "未開啟資料夾時，用以分隔資訊看板與編輯器的狀態列框線色彩。狀態列會顯示在視窗的底部。 ",
-	"statusBarItemActiveBackground": "按下滑鼠按鈕時，狀態列項目的背景色彩。狀態列會顯示在視窗的底部。",
-	"statusBarItemHoverBackground": "動態顯示時，狀態列項目的背景色彩。狀態列會顯示在視窗的底部。",
-	"statusBarProminentItemBackground": "狀態列突出項目的背景顏色。突出項目比狀態列的其他項目更顯眼，用於表示重要性更高。從命令選擇區變更模式 `切換 Tab 鍵移動焦點` 來檢視範例。狀態列會顯示在視窗的底部。",
-	"statusBarProminentItemHoverBackground": "當暫留狀態列突出項目的背景顏色。突出項目比狀態列的其他項目更顯眼，用於表示重要性更高。從命令選擇區變更模式 `切換 Tab 鍵移動焦點` 來檢視範例。狀態列會顯示在視窗的底部。",
-	"activityBarBackground": "活動列背景的色彩。活動列會顯示在最左側或最右側，並可切換不同的提要欄位檢視。",
-	"activityBarForeground": "活動列的前背景色彩(例如用於圖示)。此活動列會顯示在最左側或最右側，讓您可以切換提要欄位的不同檢視。",
-	"activityBarBorder": "用以分隔提要欄位的活動列框線色彩。此活動列會顯示在最左側或最右側，讓您可以切換提要欄位的不同檢視。",
-	"activityBarDragAndDropBackground": "拖拉活動徽章項目時的色彩.顏色可設置透明度讓原活動徽章可穿透顯示.活動徽章列表會出現在最左側或最右側並允許切換不同的檢視.",
-	"activityBarBadgeBackground": "活動通知徽章的背景色彩。此活動列會顯示在最左側或最右側，讓您可以切換提要欄位的不同檢視。",
-	"activityBarBadgeForeground": "活動通知徽章的前背景色彩。此活動列會顯示在最左側或最右側，讓您可以切換提要欄位的不同檢視。",
-	"sideBarBackground": "提要欄位的背景色彩。提要欄位是檢視 (例如 Explorer 與搜尋) 的容器。",
-	"sideBarForeground": "側欄的前景顏色.側欄包含Explorer與搜尋.",
-	"sideBarBorder": "用以分隔編輯器的側邊提要欄位框線色彩。該提要欄位是檢視 (例如 Explorer 及搜尋) 的容器。",
-	"sideBarTitleForeground": "提要欄位標題的前景色彩。提要欄位是檢視 (例如 Explorer 與搜尋) 的容器。",
-	"sideBarDragAndDropBackground": "拖放提要欄位區段的意見回應色彩。色彩應具透明度，以便讓提要欄位區段穿透顯示。提要欄位是總管和搜尋等檢視用的容器。",
-	"sideBarSectionHeaderBackground": "提要欄位區段標頭的背景色彩。提要欄位是檢視 (例如 Explorer 與搜尋) 的容器。",
-	"sideBarSectionHeaderForeground": "提要欄位區段標頭的前景色彩。提要欄位是檢視 (例如 Explorer 與搜尋) 的容器。",
-	"titleBarActiveForeground": "作用中視窗之標題列的前景。請注意，目前只有 macOS 支援此色彩。",
-	"titleBarInactiveForeground": "非作用中視窗之標題列的前景。請注意，目前只有 macOS 支援此色彩。",
-	"titleBarActiveBackground": "作用中視窗之標題列的背景。請注意，目前只有 macOS 支援此色彩。",
-	"titleBarInactiveBackground": "非作用中視窗之標題列的背景。請注意，目前只有 macOS 支援此色彩。",
-	"titleBarBorder": "標題列框線色彩。請注意，目前只有 macOS 支援此色彩。",
-	"notificationCenterBorder": "通知中央邊框色彩。通知會從視窗右下角滑入。",
-	"notificationToastBorder": "通知快顯通知邊框色彩。通知會從視窗右下角滑入。",
-	"notificationsForeground": "通知的前景顏色。通知從視窗的右下方滑入。",
-	"notificationsBackground": "通知的背景顏色。通知從視窗的右下方滑入。",
-	"notificationsLink": "通知的連結前景顏色。通知從視窗的右下方滑入。",
-	"notificationCenterHeaderForeground": "通知中心標題前景色彩。通知會從視窗右下角滑入。",
-	"notificationCenterHeaderBackground": "通知中心標題背景色彩。通知會從視窗右下角滑入。",
-	"notificationsBorder": "通知中心中，與其他通知分開的通知邊框色彩。通知會從視窗右下角滑入。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/common/views.i18n.json b/i18n/cht/src/vs/workbench/common/views.i18n.json
deleted file mode 100644
index fd56bed8349..00000000000
--- a/i18n/cht/src/vs/workbench/common/views.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"duplicateId": "識別碼為 '{0}' 的檢視已在位置 '{1}' 註冊"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/electron-browser/actions.i18n.json b/i18n/cht/src/vs/workbench/electron-browser/actions.i18n.json
deleted file mode 100644
index 8c04c44fd8a..00000000000
--- a/i18n/cht/src/vs/workbench/electron-browser/actions.i18n.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"closeWindow": "關閉視窗",
-	"closeWorkspace": "關閉工作區",
-	"noWorkspaceOpened": "此執行個體中目前沒有開啟的工作區可以關閉。",
-	"newWindow": "開新視窗",
-	"toggleFullScreen": "切換全螢幕",
-	"toggleMenuBar": "切換功能表列",
-	"toggleDevTools": "切換開發人員工具",
-	"zoomIn": "放大",
-	"zoomOut": "縮小",
-	"zoomReset": "重設縮放",
-	"appPerf": "啟動效能",
-	"reloadWindow": "重新載入視窗",
-	"reloadWindowWithExntesionsDisabled": "停用延伸模組並重新載入視窗",
-	"switchWindowPlaceHolder": "選取要切換的視窗",
-	"current": "目前視窗",
-	"close": "關閉視窗",
-	"switchWindow": "切換視窗...",
-	"quickSwitchWindow": "快速切換視窗...",
-	"workspaces": "工作區",
-	"files": "檔案",
-	"openRecentPlaceHolderMac": "選取以開啟 (按住 Cmd 鍵以在新視窗中開啟)",
-	"openRecentPlaceHolder": "選取以開啟 (按住 Ctrl 鍵以在新視窗中開啟)",
-	"remove": "從最近開啟的檔案中移除",
-	"openRecent": "開啟最近使用的檔案...",
-	"quickOpenRecent": "快速開啟最近使用的檔案...",
-	"reportIssueInEnglish": "回報問題",
-	"openProcessExplorer": "開啟處理序總管",
-	"reportPerformanceIssue": "回報效能問題",
-	"keybindingsReference": "鍵盤快速鍵參考",
-	"openDocumentationUrl": "文件",
-	"openIntroductoryVideosUrl": "簡介影片",
-	"openTipsAndTricksUrl": "秘訣與提示",
-	"toggleSharedProcess": "切換共用處理序",
-	"navigateLeft": "導覽至 [檢視左側]",
-	"navigateRight": "導覽至 [檢視右側]",
-	"navigateUp": "導覽至 [檢視上方]",
-	"navigateDown": "導覽至 [檢視下方]",
-	"increaseViewSize": "增加目前的檢視大小",
-	"decreaseViewSize": "縮小目前的檢視大小",
-	"showPreviousTab": "顯示前一個視窗索引標籤",
-	"showNextWindowTab": "顯示下一個視窗索引標籤",
-	"moveWindowTabToNewWindow": "將視窗索引標籤移至新的視窗",
-	"mergeAllWindowTabs": "合併所有視窗",
-	"toggleWindowTabsBar": "切換視窗索引標籤列",
-	"about": "關於 {0}",
-	"inspect context keys": "檢查功能表內容"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/electron-browser/commands.i18n.json b/i18n/cht/src/vs/workbench/electron-browser/commands.i18n.json
deleted file mode 100644
index 983899514ca..00000000000
--- a/i18n/cht/src/vs/workbench/electron-browser/commands.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"diffLeftRightLabel": "{0} ⟷ {1}"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/electron-browser/configureLocale.i18n.json b/i18n/cht/src/vs/workbench/electron-browser/configureLocale.i18n.json
deleted file mode 100644
index 10a65101c17..00000000000
--- a/i18n/cht/src/vs/workbench/electron-browser/configureLocale.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"configureLocale": "設定語言",
-	"displayLanguage": "定義 VSCode 的顯示語言。",
-	"doc": "如需支援的語言清單，請參閱 {0}。",
-	"restart": "改變設定值後需要重新啟動 VSCode.",
-	"fail.createSettings": "無法建立 '{0}' ({1})。",
-	"JsonSchema.locale": "要使用的 UI 語言。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/electron-browser/crashReporter.i18n.json b/i18n/cht/src/vs/workbench/electron-browser/crashReporter.i18n.json
deleted file mode 100644
index e3e021a4254..00000000000
--- a/i18n/cht/src/vs/workbench/electron-browser/crashReporter.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"telemetryConfigurationTitle": "遙測",
-	"telemetry.enableCrashReporting": "允許將損毀報告傳送給 Microsoft。\n此選項需要重新啟動才會生效。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/electron-browser/extensionHost.i18n.json b/i18n/cht/src/vs/workbench/electron-browser/extensionHost.i18n.json
deleted file mode 100644
index b0f61bde6b1..00000000000
--- a/i18n/cht/src/vs/workbench/electron-browser/extensionHost.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"extensionHostProcess.startupFailDebug": "延伸主機未於 10 秒內開始，可能在第一行就已停止，並需要偵錯工具才能繼續。",
-	"extensionHostProcess.startupFail": "延伸主機未在 10 秒內啟動，可能發生了問題。",
-	"extensionHostProcess.error": "延伸主機發生錯誤: {0}",
-	"devTools": "開發人員工具",
-	"extensionHostProcess.crash": "延伸主機意外終止。請重新載入視窗以復原。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/electron-browser/main.contribution.i18n.json b/i18n/cht/src/vs/workbench/electron-browser/main.contribution.i18n.json
deleted file mode 100644
index bf339c91e85..00000000000
--- a/i18n/cht/src/vs/workbench/electron-browser/main.contribution.i18n.json
+++ /dev/null
@@ -1,91 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"view": "檢視",
-	"help": "說明",
-	"file": "檔案",
-	"workspaces": "工作區",
-	"developer": "開發人員",
-	"workbenchConfigurationTitle": "工作台",
-	"showEditorTabs": "控制已開啟的編輯器是否應顯示在索引標籤中。",
-	"workbench.editor.labelFormat.default": "顯示檔案名稱。當啟用索引標籤，且同一個群組中有兩個檔案同名時，就會新增各個檔案路徑具有識別度的的區段。當停用索引標籤時，若編輯器在使用中，就會顯示與工作區資料夾相關的路徑。",
-	"workbench.editor.labelFormat.short": "顯示檔案的名稱，並在名稱後接著該檔案的目錄名稱。",
-	"workbench.editor.labelFormat.medium": "顯示檔案的名稱，並在名稱後接著該檔案與工作區資料夾的相對路徑。",
-	"workbench.editor.labelFormat.long": "顯示檔案的名稱，並在名稱後接著該檔案的絕對路徑。",
-	"tabDescription": "控制編輯器的標籤格式。變更此設定具有多項優點，例如可讓檔案的位置更加清楚:\n-簡短: 'parent'\n-中等: 'workspace/src/parent'\n-完整: '/home/user/workspace/src/parent'\n-預設: '.../parent'，當另一個索引標籤共用相同的標題，或若路徑停用，卻共用相關的工作區路徑時",
-	"editorTabCloseButton": "控制編輯器的索引標籤關閉按鈕位置，或在設為 'off' 時將其停用。",
-	"tabSizing": "控制編輯器索引標籤的大小調整。設定為 \"最適大小\" 可讓索引標籤永遠保持足夠空間來顯示完整的編輯器標籤。設定為 \"縮小\" 可在可用空間不足以同時顯示所有索引標籤時，縮小索引標籤。",
-	"showIcons": "控制開啟的編輯器是否搭配圖示顯示。這需要同時啟用圖示佈景主題。",
-	"enablePreview": "控制已開啟的編輯器是否顯示為預覽。預覽編輯器會重複使用到被保留 (例如按兩下或進行編輯) 並以斜體字型樣式顯示為止。",
-	"enablePreviewFromQuickOpen": "控制透過 Quick Open 所開啟的編輯器是否顯示為預覽。預覽編輯器會重複使用到被保留 (例如按兩下或進行編輯) 為止。",
-	"closeOnFileDelete": "控制顯示檔案的編輯器是否應在其他處理序刪除或重新命名該檔案時自動關閉。若停用此選項，當發生前述狀況時，編輯器會保持開啟，並呈現已變更的狀態。請注意，從應用程式內刪除一律會關閉編輯器，但已變更的檔案在資料未儲存前一律不會關閉。",
-	"editorOpenPositioning": "控制編輯器的開啟位置。選取 [左] 或 [右] 可在目前使用中的編輯器左方或右方加以開啟。選取 [第一個] 或 [最後一個] 則可從目前使用中的編輯器另外加以開啟。",
-	"revealIfOpen": "控制編輯器是否要在任何顯示的群組開啟時，在其中顯示。若啟用此選項，已經開啟的編輯器將會繼續顯示，而不會在目前使用中的編輯器群組中再開啟一次。請注意，有一些情況會忽略此設定，例如當強制編輯器在特定群組中開啟，或強制編輯器在目前使用中的群組旁開啟等情況。",
-	"swipeToNavigate": "利用三指水平撥動在開啟的檔案間瀏覽。",
-	"commandHistory": "控制最近使用之命令的數量，以保留命令選擇區的記錄。設為 0 可停用命令列記錄。",
-	"preserveInput": "控制下次開啟命令選擇區時，最後鍵入的輸入是否應該還原。",
-	"closeOnFocusLost": "控制是否在 Quick Open 失去焦點時自動關閉。",
-	"openDefaultSettings": "控制開啟設定時是否也會開啟顯示所有預設設定的編輯器。",
-	"sideBarLocation": "控制項資訊看板的位置。可顯示於 Workbench 的左方或右方。",
-	"panelDefaultLocation": "控制面板的預設位置。可顯示在 Workbench 的底部或是右方。",
-	"statusBarVisibility": "控制 Workbench 底端狀態列的可視性。",
-	"activityBarVisibility": "控制活動列在 workbench 中的可見度。",
-	"viewVisibility": "控制檢視標頭動作的可見度。檢視標頭動作可為總是可見，或在檢視為焦點或暫留時才可見。",
-	"fontAliasing": "控制工作台中的字型鋸齒化方法。\n- default: 子像素字型平滑化。在多數非 Retina 的顯示器上，這會使文字變得最鮮明\n- antialiased: 在像素層級上使字型平滑化，與子像素相對。能夠使字型整體顯示較亮\n- none: 停用字型平滑化。顯示的文字會帶有鋸齒狀銳利邊緣\n- auto: 根據顯示器的 DPI 自動套用 `default` 或 `antialiased`。",
-	"workbench.fontAliasing.default": "子像素字型平滑處理。在大部分非 Retina 顯示器上會顯示出最銳利的文字。",
-	"workbench.fontAliasing.antialiased": "相對於子像素，根據像素層級平滑字型。可以讓字型整體顯得較細。",
-	"workbench.fontAliasing.none": "禁用字體平滑.文字將會顯示鋸齒狀與鋒利的邊緣.",
-	"workbench.fontAliasing.auto": "根據顯示器的 DPI 自動套用 `default` 或 `antialiased`。",
-	"enableNaturalLanguageSettingsSearch": "控制是否啟用自然語言搜尋模式。",
-	"windowConfigurationTitle": "視窗",
-	"window.openFilesInNewWindow.on": "檔案會在新視窗中開啟",
-	"window.openFilesInNewWindow.off": "檔案會在開啟了檔案資料夾的視窗，或在上一個使用中的視窗中開啟",
-	"window.openFilesInNewWindow.defaultMac": "除非從擴充座或 Finder 中開啟，否則檔案會在開啟了檔案資料夾的視窗，或在上一個使用中的視窗中開啟",
-	"window.openFilesInNewWindow.default": "除非已從應用程式內挑選 (例如透過 [檔案] 功能表)，否則檔案會在新視窗中開啟",
-	"openFilesInNewWindowMac": "控制檔案是否應在新視窗中開啟。\n- default: 檔案會在視窗中隨檔案的資料夾開啟或在上一個使用中視窗開啟，除非透過擴充座或從尋找工具開啟\n- on: 檔案會在新視窗開啟\n- off: 檔案會在視窗中隨檔案的資料夾開啟或在上一個使用中視窗開啟\n請注意，在某些情況下會略過此設定 (例如，使用了 -new-window 或 -reuse-window 命令列選項時)。",
-	"openFilesInNewWindow": "控制是否在新視窗中打開檔案。\n- default: 檔案會在新視窗中開啟，除非從應用程式中選擇 (例如透過 \"檔案\" 功能表)\n- on: 檔案會在新視窗中開啟\n- off: 檔案會在視窗中隨檔案的資料夾開啟或在上一個使用中視窗開啟\n請注意，在某些情況下會略過此設定 (例如，使用 the -new-window 或 -reuse-window 命令列選項時)。",
-	"window.openFoldersInNewWindow.on": "資料夾會在新視窗中開啟",
-	"window.openFoldersInNewWindow.off": "資料夾會取代上一個使用中的視窗",
-	"window.openFoldersInNewWindow.default": "除非已從應用程式內挑選了資料夾 (例如透過 [檔案] 功能表)，否則資料夾會在新視窗中開啟",
-	"openFoldersInNewWindow": "控制資料夾應在新視窗中開啟或取代上一個使用中的視窗。\n- default: 除非已從應用程式內挑選資料夾 (例如，透過 [檔案] 功能表)，否則會在新視窗開啟\n- on: 資料夾會在新視窗開啟\n- off: 資料夾會取代上一個使用中視窗\n請注意，在某些情況下會略過此設定 (例如，使用了 -new-window 或 -reuse-window 命令列選項時)。",
-	"window.openWithoutArgumentsInNewWindow.on": "開啟新空白視窗",
-	"window.openWithoutArgumentsInNewWindow.off": "聚焦在上一個正在運行的執行個體",
-	"openWithoutArgumentsInNewWindow": "控制不以引數啟動第二個執行個體時是否要開啟新的空白視窗，或是應聚焦於上一個執行的執行個體。\n- on: 開啟新的空白視窗\n- off: 上一個使用中的執行中執行個體將會受到聚焦\n請注意：仍可能發生忽略此設定的情形 (例如，在使用 -new-window 或 -reuse-window 命令列選項時)。",
-	"window.reopenFolders.all": "重新開啟所有視窗。",
-	"window.reopenFolders.folders": "重新開啟所有資料夾。空白工作區將不會還原。",
-	"window.reopenFolders.one": "重新開啟上一個使用中的視窗。",
-	"window.reopenFolders.none": "一律不重新開啟視窗。永遠從空白的視窗開始。",
-	"restoreWindows": "控制重新啟動後視窗重新開啟的方式。選取 [無] 一律以空白工作區開始、選取 [一] 從上一個編輯的視窗重新開啟、選取 [資料夾] 重新開啟所有資料夾曾經開啟的視窗，或選取 [全部] 重新開啟上一個工作階段的所有視窗。",
-	"restoreFullscreen": "控制當視窗在全螢幕模式下結束後，下次是否仍以全螢幕模式開啟。",
-	"zoomLevel": "調整視窗的縮放比例。原始大小為 0，而且每個向上增量 (例如 1) 或向下增量 (例如 -1) 代表放大或縮小 20%。您也可以輸入小數，更細微地調整縮放比例。",
-	"title": "依據使用中的編輯器控制視窗標題。變數會依據內容替換:\n${activeEditorShort}: 檔案名稱 (例如 myFile.txt)\n${activeEditorMedium}: 與工作區資料夾相關的檔案路徑 (例如 myFolder/myFile.txt)\n${activeEditorLong}: 完整的檔案路徑 (例如 /Users/Development/myProject/myFolder/myFile.txt)\n${folderName}: 包含著資料夾之工作區資料夾的名稱 (例如 myFolder)\n${folderPath}: 包含著資料夾之工作區資料夾的檔案路徑 (例如 /Users/Development/myFolder)\n${rootName}: 工作區的名稱 (例如 myFolder 或 myWorkspace)\n${rootPath}: 工作區的檔案路徑 (例如 /Users/Development/myWorkspace)\n${appName}: 例如 VS Code\n${dirty}: 已變更指示 (若使用中編輯器已變更)\n${separator}: 僅在受具有值或靜態文字之變數括住時才顯示的條件式分隔符號 (\" - \")",
-	"window.newWindowDimensions.default": "在螢幕中央開啟新視窗。",
-	"window.newWindowDimensions.inherit": "以相同於上一個使用中之視窗的維度開啟新視窗。",
-	"window.newWindowDimensions.maximized": "開啟並最大化新視窗。",
-	"window.newWindowDimensions.fullscreen": "在全螢幕模式下開啟新視窗。",
-	"newWindowDimensions": "控制當至少一個視窗已打開的情況下開啟新視窗的維度。根據預設，新視窗會以小型維度在畫面中央開啟。設為 'inherit' 時，視窗的維度會和最後開啟的視窗相同。設為 'maximized' 時，視窗會開到最大，若設為 'fullscreen' 則全螢幕開啟。",
-	"closeWhenEmpty": "控制在關閉最後一個編輯器時，是否也應關閉視窗。此設定僅適用於未顯示資料夾的視窗。",
-	"window.menuBarVisibility.default": "只在全螢幕模式時隱藏功能表。",
-	"window.menuBarVisibility.visible": "一律顯示功能表，即使在全螢幕模式時亦然。",
-	"window.menuBarVisibility.toggle": "隱藏功能表，但可經由 Alt 鍵加以顯示。",
-	"window.menuBarVisibility.hidden": "一律隱藏功能表。",
-	"menuBarVisibility": "控制功能表列的可見度。[切換] 設定表示會隱藏功能表列，按一下 Alt 鍵則會顯示。除非視窗是全螢幕，否則預設會顯示功能表列。",
-	"enableMenuBarMnemonics": "啟用後可以利用Alt快捷鍵打開主選單.關閉記憶選單將Alt快捷鍵綁定至替代的命令區塊.",
-	"autoDetectHighContrast": "若啟用，如果 Windows 使用高對比佈景主題，就會自動變更為高對比佈景主題，切換掉 Windows 高對比佈景主題時則變更為深色佈景主題。",
-	"titleBarStyle": "調整視窗標題列的外觀。變更需要完整重新啟動才會套用。",
-	"window.nativeTabs": "啟用 macOS Sierra 視窗索引標籤。請注意需要完全重新啟動才能套用變更，並且完成設定後原始索引標籤將會停用自訂標題列樣式。",
-	"window.smoothScrollingWorkaround": "在還原最小化的 VS Code 視窗後，若捲動功能不再流暢，請啟用此因應措施。此因應措施適用於 Microsoft Surface 等具備精確軌跡板發生的捲動延遲問題 (https://github.com/Microsoft/vscode/issues/13612)。啟用此因應措施可能會在將視窗從最小化狀態還原後，導致版面稍微閃爍，但並不會造成任何傷害。",
-	"window.clickThroughInactive": "若已啟用，按一下非使用中的視窗將會啟動該視窗並觸發其下的元素 (如果可以案的話)。若已停用，按一下非使用中視窗的任一處則只會啟動該視窗，必須再按一下才會觸發元素。",
-	"zenModeConfigurationTitle": "Zen Mode",
-	"zenMode.fullScreen": "控制開啟 Zen Mode 是否也會將 Workbench 轉換為全螢幕模式。",
-	"zenMode.centerLayout": "控制開啟 Zen Mode 是否也會置中配置。",
-	"zenMode.hideTabs": "控制開啟 Zen Mode 是否也會隱藏 Workbench 索引標籤。",
-	"zenMode.hideStatusBar": "控制開啟 Zen Mode 是否也會隱藏 Workbench 底部的狀態列。",
-	"zenMode.hideActivityBar": "控制開啟 Zen Mode 是否也會隱藏 Workbench 左方的活動列。",
-	"zenMode.restore": "控制視窗如果在 Zen Mode 下結束，是否應還原為 Zen Mode。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/electron-browser/main.i18n.json b/i18n/cht/src/vs/workbench/electron-browser/main.i18n.json
deleted file mode 100644
index 3b241f304a4..00000000000
--- a/i18n/cht/src/vs/workbench/electron-browser/main.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"loaderError": "無法載入需要的檔案。可能是您已經沒有連線到網際網路，或是您連接的伺服器已離線。請重新整理瀏覽器，再試一次。",
-	"loaderErrorNative": "無法載入必要的檔案。請重新啟動該應用程式，然後再試一次。詳細資料: {0}"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/electron-browser/shell.i18n.json b/i18n/cht/src/vs/workbench/electron-browser/shell.i18n.json
deleted file mode 100644
index 5a00c198549..00000000000
--- a/i18n/cht/src/vs/workbench/electron-browser/shell.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"runningAsRoot": "建議不要以 'root' 身分執行 Code。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/electron-browser/window.i18n.json b/i18n/cht/src/vs/workbench/electron-browser/window.i18n.json
deleted file mode 100644
index a99eb9754bc..00000000000
--- a/i18n/cht/src/vs/workbench/electron-browser/window.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"undo": "復原",
-	"redo": "重做",
-	"cut": "剪下",
-	"copy": "複製",
-	"paste": "貼上",
-	"selectAll": "全選",
-	"runningAsRoot": "不建議以 root 身分執行 {0}。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/electron-browser/workbench.i18n.json b/i18n/cht/src/vs/workbench/electron-browser/workbench.i18n.json
deleted file mode 100644
index 9c464936024..00000000000
--- a/i18n/cht/src/vs/workbench/electron-browser/workbench.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"developer": "開發人員",
-	"file": "檔案"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/node/extensionHostMain.i18n.json b/i18n/cht/src/vs/workbench/node/extensionHostMain.i18n.json
deleted file mode 100644
index c8ca9184154..00000000000
--- a/i18n/cht/src/vs/workbench/node/extensionHostMain.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"extensionTestError": "路徑 {0} 並未指向有效的擴充功能測試執行器。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/node/extensionPoints.i18n.json b/i18n/cht/src/vs/workbench/node/extensionPoints.i18n.json
deleted file mode 100644
index f08aebf3331..00000000000
--- a/i18n/cht/src/vs/workbench/node/extensionPoints.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"jsonParseFail": "無法剖析 {0}: {1}。",
-	"fileReadFail": "無法讀取檔案 {0}: {1}。",
-	"jsonsParseFail": "無法剖析 {0} 或 {1}: {2}。",
-	"missingNLSKey": "找不到金鑰 {0} 的訊息。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/cli/electron-browser/cli.contribution.i18n.json b/i18n/cht/src/vs/workbench/parts/cli/electron-browser/cli.contribution.i18n.json
deleted file mode 100644
index 9bc584adaf6..00000000000
--- a/i18n/cht/src/vs/workbench/parts/cli/electron-browser/cli.contribution.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"install": "在 PATH 中安裝 '{0}' 命令",
-	"not available": "此命令無法使用",
-	"successIn": "已成功在 PATH 中安裝殼層命令 '{0}'。",
-	"ok": "確定",
-	"cancel2": "取消",
-	"warnEscalation": "Code 現在會提示輸入 'osascript' 取得系統管理員權限，以便安裝殼層命令。",
-	"cantCreateBinFolder": "無法建立 '/usr/local/bin'。",
-	"aborted": "已中止",
-	"uninstall": "從 PATH 將 '{0}' 命令解除安裝 ",
-	"successFrom": "已成功從 PATH 解除安裝殼層命令 '{0}'。",
-	"shellCommand": "殼層命令"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/codeEditor/electron-browser/accessibility.i18n.json b/i18n/cht/src/vs/workbench/parts/codeEditor/electron-browser/accessibility.i18n.json
deleted file mode 100644
index b1ca274d0c4..00000000000
--- a/i18n/cht/src/vs/workbench/parts/codeEditor/electron-browser/accessibility.i18n.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"emergencyConfOn": "現在請將設定 `editor.accessibilitySupport` 變更為 'on'。",
-	"openingDocs": "現在請開啟 VS Code 協助工具文件頁面。",
-	"introMsg": "感謝您試用 VS Code 的協助工具選項。",
-	"status": "狀態:",
-	"changeConfigToOnMac": "若要將編輯器為螢幕助讀程式的使用方式設定為永久地最佳化，現在請按 Command+E。",
-	"changeConfigToOnWinLinux": "若要將編輯器為螢幕助讀程式的使用方式設定為永久地最佳化，現在請按 Control+E。",
-	"auto_unknown": "編輯器已設定為使用平台 API 以偵測螢幕助讀程式附加，但是目前的執行階段不支援。",
-	"auto_on": "編輯器已自動偵測到螢幕助讀程式附加。",
-	"auto_off": "編輯器已設定為自動偵測螢幕助讀程式附加，但目前的實際狀況卻不是如此。",
-	"configuredOn": "編輯器已為螢幕助讀程式的使用方式設定為永久地更新 - 您可以藉由編輯設定 `editor.accessibilitySupport` 以變更這項設定。",
-	"configuredOff": "編輯器已設定為不會為螢幕助讀程式的使用方式進行最佳化。",
-	"tabFocusModeOnMsg": "在目前的編輯器中按 Tab 鍵會將焦點移至下一個可設定焦點的元素。按 {0} 可切換此行為。",
-	"tabFocusModeOnMsgNoKb": "在目前的編輯器中按 Tab 鍵會將焦點移至下一個可設定焦點的元素。命令 {0} 目前無法由按鍵繫結關係觸發。",
-	"tabFocusModeOffMsg": "在目前的編輯器中按 Tab 鍵會插入定位字元。按 {0} 可切換此行為。",
-	"tabFocusModeOffMsgNoKb": "在目前的編輯器中按 Tab 鍵會插入定位字元。命令 {0} 目前無法由按鍵繫結關係觸發。",
-	"openDocMac": "現在請按 Command+H 以開啟具有更多與協助工具相關 VS Code 資訊的瀏覽器視窗。",
-	"openDocWinLinux": "現在請按 Control+H 以開啟具有更多與協助工具相關 VS Code 資訊的瀏覽器視窗。",
-	"outroMsg": "您可以按 Esc 鍵或 Shift+Esc 鍵來解除此工具提示並返回編輯器。",
-	"ShowAccessibilityHelpAction": "顯示協助工具說明"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/codeEditor/electron-browser/inspectKeybindings.i18n.json b/i18n/cht/src/vs/workbench/parts/codeEditor/electron-browser/inspectKeybindings.i18n.json
deleted file mode 100644
index cd3fbd151a0..00000000000
--- a/i18n/cht/src/vs/workbench/parts/codeEditor/electron-browser/inspectKeybindings.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"workbench.action.inspectKeyMap": "開發人員: 檢查按鍵對應"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/codeEditor/electron-browser/inspectTMScopes.i18n.json b/i18n/cht/src/vs/workbench/parts/codeEditor/electron-browser/inspectTMScopes.i18n.json
deleted file mode 100644
index ef380d89f98..00000000000
--- a/i18n/cht/src/vs/workbench/parts/codeEditor/electron-browser/inspectTMScopes.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"inspectTMScopes": "開發人員: 檢查 TM 範圍",
-	"inspectTMScopesWidget.loading": "正在載入..."
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/codeEditor/electron-browser/languageConfiguration/languageConfigurationExtensionPoint.i18n.json b/i18n/cht/src/vs/workbench/parts/codeEditor/electron-browser/languageConfiguration/languageConfigurationExtensionPoint.i18n.json
deleted file mode 100644
index ee6ac61edbe..00000000000
--- a/i18n/cht/src/vs/workbench/parts/codeEditor/electron-browser/languageConfiguration/languageConfigurationExtensionPoint.i18n.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"parseErrors": "剖析 {0} 時發生錯誤: {1}",
-	"schema.openBracket": "左括弧字元或字串順序。",
-	"schema.closeBracket": "右括弧字元或字串順序。",
-	"schema.comments": "定義註解符號",
-	"schema.blockComments": "定義標記區塊註解的方式。",
-	"schema.blockComment.begin": "區塊註解開頭的字元順序。",
-	"schema.blockComment.end": "區塊註解結尾的字元順序。",
-	"schema.lineComment": "行註解開頭的字元順序。",
-	"schema.brackets": "定義增加或減少縮排的括弧符號。",
-	"schema.autoClosingPairs": "定義成對括弧。輸入左括弧時，即自動插入右括弧。",
-	"schema.autoClosingPairs.notIn": "定義停用自動配對的範圍清單。",
-	"schema.surroundingPairs": "定義可用以括住所選字串的成對括弧。",
-	"schema.wordPattern": "定義語言的文字",
-	"schema.wordPattern.pattern": "使用正規表示式進行文字比對",
-	"schema.wordPattern.flags": "使用正規表示式標記進行文字比對",
-	"schema.wordPattern.flags.errorMessage": "必須符合樣式 `/^([gimuy]+)$/`",
-	"schema.indentationRules": "語言的縮排設定。",
-	"schema.indentationRules.increaseIndentPattern": "若有符合此模式的行，則其後的所有行都應縮排一次，直到符合另一條規則為止。",
-	"schema.indentationRules.increaseIndentPattern.pattern": "適用於 increaseIndentPattern 的 RegExp 模式。",
-	"schema.indentationRules.increaseIndentPattern.flags": "適用於 increaseIndentPattern 的 RegExp 旗標。",
-	"schema.indentationRules.increaseIndentPattern.errorMessage": "必須符合樣式 `/^([gimuy]+)$/`",
-	"schema.indentationRules.decreaseIndentPattern": "若有符合此模式的行，則其後的所有行都應取消縮排一次，直到符合另一條規則為止。",
-	"schema.indentationRules.decreaseIndentPattern.pattern": "適用於 decreaseIndentPattern 的 RegExp 模式。",
-	"schema.indentationRules.decreaseIndentPattern.flags": "適用於 decreaseIndentPattern 的 RegExp 旗標。",
-	"schema.indentationRules.decreaseIndentPattern.errorMessage": "必須符合樣式 `/^([gimuy]+)$/`",
-	"schema.indentationRules.indentNextLinePattern": "若有符合此模式的行，則**僅有下一行**應縮排一次，直到符合另一條規則為止。",
-	"schema.indentationRules.indentNextLinePattern.pattern": "適用於 indentNextLinePattern 的 RegExp 模式。",
-	"schema.indentationRules.indentNextLinePattern.flags": "適用於 indentNextLinePattern 的 RegExp 旗標。",
-	"schema.indentationRules.indentNextLinePattern.errorMessage": "必須符合樣式 `/^([gimuy]+)$/`",
-	"schema.indentationRules.unIndentedLinePattern": "若有符合此模式的行，則不應該變更其縮排，並且不使用其他規則比對。",
-	"schema.indentationRules.unIndentedLinePattern.pattern": "適用於 unIndentedLinePattern 的 RegExp 模式。",
-	"schema.indentationRules.unIndentedLinePattern.flags": "適用於 unIndentedLinePattern 的 RegExp 旗標。",
-	"schema.indentationRules.unIndentedLinePattern.errorMessage": "必須符合樣式 `/^([gimuy]+)$/`",
-	"schema.folding": "語言的摺疊設定。",
-	"schema.folding.offSide": "若語言中的區塊由其縮排表示，則該語言會依循越位規則。若已設定，則空白行會屬於後續區塊。",
-	"schema.folding.markers": "語言的特定摺疊標記，例如 '#region' 和 '#endregion'。會針對所有行的內容測試起始和結尾 regex，而必須有效地設計起始和結尾 regex",
-	"schema.folding.markers.start": "開始標記的 RegExp 模式。regexp 必須以 '^' 作為開頭。",
-	"schema.folding.markers.end": "結束標記的 RegExp 模式。regexp 必須以 '^' 作為開頭。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/codeEditor/electron-browser/largeFileOptimizations.i18n.json b/i18n/cht/src/vs/workbench/parts/codeEditor/electron-browser/largeFileOptimizations.i18n.json
deleted file mode 100644
index b84306c506e..00000000000
--- a/i18n/cht/src/vs/workbench/parts/codeEditor/electron-browser/largeFileOptimizations.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"largeFile": "{0}: 為了減少記憶體使用量並避免凍結或毀損, 已關閉此大型檔的tokenization、包裝和摺疊功能。",
-	"neverShowAgain": "確定。不再顯示",
-	"removeOptimizations": "強制啟用功能",
-	"reopenFilePrompt": "請重新開啟檔案以便此設定生效。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/codeEditor/electron-browser/textMate/inspectTMScopes.i18n.json b/i18n/cht/src/vs/workbench/parts/codeEditor/electron-browser/textMate/inspectTMScopes.i18n.json
deleted file mode 100644
index 0019c4fd7a6..00000000000
--- a/i18n/cht/src/vs/workbench/parts/codeEditor/electron-browser/textMate/inspectTMScopes.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"inspectTMScopes": "開發人員: 檢查 TM 範圍",
-	"inspectTMScopesWidget.loading": "正在載入..."
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/codeEditor/electron-browser/toggleMinimap.i18n.json b/i18n/cht/src/vs/workbench/parts/codeEditor/electron-browser/toggleMinimap.i18n.json
deleted file mode 100644
index 14bbf4dc1d1..00000000000
--- a/i18n/cht/src/vs/workbench/parts/codeEditor/electron-browser/toggleMinimap.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleMinimap": "檢視: 切換迷你地圖"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/codeEditor/electron-browser/toggleMultiCursorModifier.i18n.json b/i18n/cht/src/vs/workbench/parts/codeEditor/electron-browser/toggleMultiCursorModifier.i18n.json
deleted file mode 100644
index 01c25a1a006..00000000000
--- a/i18n/cht/src/vs/workbench/parts/codeEditor/electron-browser/toggleMultiCursorModifier.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleLocation": "切換至多游標修改程式"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderControlCharacter.i18n.json b/i18n/cht/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderControlCharacter.i18n.json
deleted file mode 100644
index e6b78fd8a3e..00000000000
--- a/i18n/cht/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderControlCharacter.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleRenderControlCharacters": "檢視: 切換控制字元"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderWhitespace.i18n.json b/i18n/cht/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderWhitespace.i18n.json
deleted file mode 100644
index c846756f9dd..00000000000
--- a/i18n/cht/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderWhitespace.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleRenderWhitespace": "檢視: 切換轉譯空白字元"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/codeEditor/electron-browser/toggleWordWrap.i18n.json b/i18n/cht/src/vs/workbench/parts/codeEditor/electron-browser/toggleWordWrap.i18n.json
deleted file mode 100644
index 93ccc071834..00000000000
--- a/i18n/cht/src/vs/workbench/parts/codeEditor/electron-browser/toggleWordWrap.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggle.wordwrap": "檢視: 切換自動換行",
-	"wordWrap.notInDiffEditor": "無法在不同的編輯器中切換文字換行。",
-	"unwrapMinified": "停用此檔案的換行",
-	"wrapMinified": "啟用此檔案的換行"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/codeEditor/electron-browser/wordWrapMigration.i18n.json b/i18n/cht/src/vs/workbench/parts/codeEditor/electron-browser/wordWrapMigration.i18n.json
deleted file mode 100644
index 964671851a2..00000000000
--- a/i18n/cht/src/vs/workbench/parts/codeEditor/electron-browser/wordWrapMigration.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"wordWrapMigration.ok": "確定",
-	"wordWrapMigration.dontShowAgain": "不要再顯示",
-	"wordWrapMigration.openSettings": "開啟設定",
-	"wordWrapMigration.prompt": "設定 [editor.wrappingColumn] 已標示為即將淘汰，將改為 [editor.wordWrap]。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/debug/browser/breakpointWidget.i18n.json b/i18n/cht/src/vs/workbench/parts/debug/browser/breakpointWidget.i18n.json
deleted file mode 100644
index 47b06e030ba..00000000000
--- a/i18n/cht/src/vs/workbench/parts/debug/browser/breakpointWidget.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"breakpointWidgetExpressionPlaceholder": "在運算式評估為 true 時中斷。按 'Enter' 鍵接受，按 'esc' 鍵取消。",
-	"breakpointWidgetAriaLabel": "程式只有在此條件為 true 時才會在此停止。請按 Enter 鍵接受，或按 Esc 鍵取消。",
-	"breakpointWidgetHitCountPlaceholder": "符合叫用次數條件時中斷。按 'Enter' 鍵接受，按 'esc' 鍵取消。",
-	"breakpointWidgetHitCountAriaLabel": "程式只會在符合叫用次數時於此處停止。按 Enter 鍵接受，或按 Escape 鍵取消。",
-	"expression": "運算式",
-	"hitCount": "叫用次數"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json b/i18n/cht/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
deleted file mode 100644
index 5b3899db4ff..00000000000
--- a/i18n/cht/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"logPoint": "記錄點",
-	"breakpoint": "中斷點",
-	"editBreakpoint": "編輯 {0}...",
-	"removeBreakpoint": "移除 {0}",
-	"functionBreakpointsNotSupported": "此偵錯類型不支援函式中斷點",
-	"functionBreakpointPlaceholder": "要中斷的函式",
-	"functionBreakPointInputAriaLabel": "輸入函式中斷點",
-	"breakpointDisabledHover": "停用的中斷點",
-	"breakpointUnverifieddHover": "未驗證的中斷點",
-	"functionBreakpointUnsupported": "此偵錯類型不支援函式中斷點",
-	"breakpointDirtydHover": "未驗證的中斷點。檔案已修改，請重新啟動偵錯工作階段。",
-	"logBreakpointUnsupported": "此偵錯類型不支援記錄點",
-	"conditionalBreakpointUnsupported": "此偵錯類型不支援的條件式中斷點",
-	"hitBreakpointUnsupported": "此偵錯類型不支援點擊條件式中斷點"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/debug/browser/debugActionItems.i18n.json b/i18n/cht/src/vs/workbench/parts/debug/browser/debugActionItems.i18n.json
deleted file mode 100644
index 56556d70235..00000000000
--- a/i18n/cht/src/vs/workbench/parts/debug/browser/debugActionItems.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noConfigurations": "沒有組態",
-	"addConfigTo": "新增組態 ({0})...",
-	"addConfiguration": "新增組態..."
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/debug/browser/debugActions.i18n.json b/i18n/cht/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
deleted file mode 100644
index 621e10c3c70..00000000000
--- a/i18n/cht/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openLaunchJson": "開啟 {0}",
-	"launchJsonNeedsConfigurtion": "設定或修正 'launch.json'",
-	"noFolderDebugConfig": "請先打開一個資料夾以便設定進階偵錯組態。",
-	"startDebug": "開始偵錯",
-	"startWithoutDebugging": "開始但不偵錯",
-	"selectAndStartDebugging": "選取並開始偵錯",
-	"restartDebug": "重新啟動",
-	"reconnectDebug": "重新連接",
-	"stepOverDebug": "不進入函式",
-	"stepIntoDebug": "逐步執行",
-	"stepOutDebug": "跳離函式",
-	"stopDebug": "停止",
-	"disconnectDebug": "中斷連接",
-	"continueDebug": "繼續",
-	"pauseDebug": "暫停",
-	"terminateThread": "終止執行緒",
-	"restartFrame": "重新啟動框架",
-	"removeBreakpoint": "移除中斷點",
-	"removeAllBreakpoints": "移除所有中斷點",
-	"enableAllBreakpoints": "啟用所有中斷點",
-	"disableAllBreakpoints": "停用所有中斷點",
-	"activateBreakpoints": "啟動中斷點",
-	"deactivateBreakpoints": "停用中斷點",
-	"reapplyAllBreakpoints": "重新套用所有中斷點",
-	"addFunctionBreakpoint": "加入函式中斷點",
-	"setValue": "設定值",
-	"addWatchExpression": "加入運算式",
-	"editWatchExpression": "編輯運算式",
-	"addToWatchExpressions": "加入監看",
-	"removeWatchExpression": "移除運算式",
-	"removeAllWatchExpressions": "移除所有運算式",
-	"clearRepl": "清除主控台",
-	"debugConsoleAction": "偵錯主控台",
-	"unreadOutput": "偵錯主控台中的新輸出",
-	"debugFocusConsole": "焦點偵錯主控台",
-	"focusSession": "焦點工作階段",
-	"stepBackDebug": "倒退",
-	"reverseContinue": "反向"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/debug/browser/debugActionsWidget.i18n.json b/i18n/cht/src/vs/workbench/parts/debug/browser/debugActionsWidget.i18n.json
deleted file mode 100644
index 649599cad38..00000000000
--- a/i18n/cht/src/vs/workbench/parts/debug/browser/debugActionsWidget.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"debugToolBarBackground": "偵錯工具列背景色彩。",
-	"debugToolBarBorder": "偵錯工具列的邊框色彩"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/debug/browser/debugCommands.i18n.json b/i18n/cht/src/vs/workbench/parts/debug/browser/debugCommands.i18n.json
deleted file mode 100644
index d02842b0b34..00000000000
--- a/i18n/cht/src/vs/workbench/parts/debug/browser/debugCommands.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noFolderDebugConfig": "請先打開一個資料夾以便設定進階偵錯組態。",
-	"inlineBreakpoint": "內嵌中斷點",
-	"debug": "偵錯",
-	"addInlineBreakpoint": "新增內嵌中斷點"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/debug/browser/debugContentProvider.i18n.json b/i18n/cht/src/vs/workbench/parts/debug/browser/debugContentProvider.i18n.json
deleted file mode 100644
index e0e358fee3b..00000000000
--- a/i18n/cht/src/vs/workbench/parts/debug/browser/debugContentProvider.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"unable": "不使用偵錯工作階段無法解析此資源",
-	"canNotResolveSource": "無法解析資源 {0}，偵錯延伸模組無回應"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json b/i18n/cht/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
deleted file mode 100644
index d80f95667d4..00000000000
--- a/i18n/cht/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleBreakpointAction": "偵錯: 切換中斷點",
-	"conditionalBreakpointEditorAction": "偵錯: 新增條件中斷點...",
-	"logPointEditorAction": "偵錯: 新增記錄點...",
-	"runToCursor": "執行至游標處",
-	"debugEvaluate": "偵錯: 評估",
-	"debugAddToWatch": "偵錯: 加入監看",
-	"showDebugHover": "偵錯: 動態顯示",
-	"goToNextBreakpoint": "偵錯: 移至下一個中斷點",
-	"goToPreviousBreakpoint": "偵錯: 移至上一個中斷點"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/debug/browser/debugEditorModelManager.i18n.json b/i18n/cht/src/vs/workbench/parts/debug/browser/debugEditorModelManager.i18n.json
deleted file mode 100644
index de60646ad19..00000000000
--- a/i18n/cht/src/vs/workbench/parts/debug/browser/debugEditorModelManager.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"breakpointDisabledHover": "停用的中斷點",
-	"breakpointUnverifieddHover": "未驗證的中斷點",
-	"breakpointDirtydHover": "未驗證的中斷點。檔案已修改，請重新啟動偵錯工作階段。",
-	"breakpointUnsupported": "此偵錯類型不支援的條件式中斷點"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/debug/browser/debugQuickOpen.i18n.json b/i18n/cht/src/vs/workbench/parts/debug/browser/debugQuickOpen.i18n.json
deleted file mode 100644
index 3ac79e1e6bc..00000000000
--- a/i18n/cht/src/vs/workbench/parts/debug/browser/debugQuickOpen.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"entryAriaLabel": "{0}，偵錯",
-	"debugAriaLabel": "輸入要執行之啟動組態的名稱。",
-	"addConfigTo": "新增組態 ({0})...",
-	"addConfiguration": "新增組態...",
-	"noConfigurationsMatching": "沒有任何相符的偵錯組態",
-	"noConfigurationsFound": "找不到任何偵錯組態。請建立'launch.json' 檔案。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/debug/browser/debugStatus.i18n.json b/i18n/cht/src/vs/workbench/parts/debug/browser/debugStatus.i18n.json
deleted file mode 100644
index 878cdf5f606..00000000000
--- a/i18n/cht/src/vs/workbench/parts/debug/browser/debugStatus.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"selectAndStartDebug": "選取並啟動偵錯組態"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/debug/browser/debugViewlet.i18n.json b/i18n/cht/src/vs/workbench/parts/debug/browser/debugViewlet.i18n.json
deleted file mode 100644
index 31b1b7d2564..00000000000
--- a/i18n/cht/src/vs/workbench/parts/debug/browser/debugViewlet.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"startAdditionalSession": "啟動附加工作階段",
-	"debugFocusVariablesView": "焦點變數",
-	"debugFocusWatchView": "焦點監看",
-	"debugFocusCallStackView": "焦點呼叫堆疊",
-	"debugFocusBreakpointsView": "焦點中斷點"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/debug/browser/exceptionWidget.i18n.json b/i18n/cht/src/vs/workbench/parts/debug/browser/exceptionWidget.i18n.json
deleted file mode 100644
index 8bcc17f62e1..00000000000
--- a/i18n/cht/src/vs/workbench/parts/debug/browser/exceptionWidget.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"debugExceptionWidgetBorder": "例外狀況小工具的框線色彩。",
-	"debugExceptionWidgetBackground": "例外狀況小工具的背景色彩。",
-	"exceptionThrownWithId": "發生例外狀況: {0}",
-	"exceptionThrown": "發生了例外狀況"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/debug/browser/linkDetector.i18n.json b/i18n/cht/src/vs/workbench/parts/debug/browser/linkDetector.i18n.json
deleted file mode 100644
index 1730459f115..00000000000
--- a/i18n/cht/src/vs/workbench/parts/debug/browser/linkDetector.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"fileLinkMac": "按一下以追蹤 (Cmd + 按一下滑鼠左鍵開至側邊)",
-	"fileLink": "按一下以追蹤 (Ctrl + 按一下滑鼠左鍵開至側邊)"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/debug/browser/statusbarColorProvider.i18n.json b/i18n/cht/src/vs/workbench/parts/debug/browser/statusbarColorProvider.i18n.json
deleted file mode 100644
index f23815901af..00000000000
--- a/i18n/cht/src/vs/workbench/parts/debug/browser/statusbarColorProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"statusBarDebuggingBackground": "對程式執行偵錯時狀態列的背景色彩。狀態列會顯示在視窗的底部",
-	"statusBarDebuggingForeground": "對程式執行偵錯時狀態列的前景色彩。狀態列會顯示在視窗的底部",
-	"statusBarDebuggingBorder": "正在偵錯用以分隔資訊看板與編輯器的狀態列框線色彩。狀態列會顯示在視窗的底部。 "
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/debug/common/debug.i18n.json b/i18n/cht/src/vs/workbench/parts/debug/common/debug.i18n.json
deleted file mode 100644
index f518c9d6b24..00000000000
--- a/i18n/cht/src/vs/workbench/parts/debug/common/debug.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"internalConsoleOptions": "內部偵錯主控台的控制項行為。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/debug/common/debugModel.i18n.json b/i18n/cht/src/vs/workbench/parts/debug/common/debugModel.i18n.json
deleted file mode 100644
index 761390b9ae6..00000000000
--- a/i18n/cht/src/vs/workbench/parts/debug/common/debugModel.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"notAvailable": "無法使用",
-	"startDebugFirst": "請啟動偵錯工作階段進行評估"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/debug/common/debugSchemas.i18n.json b/i18n/cht/src/vs/workbench/parts/debug/common/debugSchemas.i18n.json
deleted file mode 100644
index 2e3cbf5ea4d..00000000000
--- a/i18n/cht/src/vs/workbench/parts/debug/common/debugSchemas.i18n.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.contributes.debuggers": "提供偵錯配接器。",
-	"vscode.extension.contributes.debuggers.type": "此偵錯配接器的唯一識別碼。",
-	"vscode.extension.contributes.debuggers.label": "此偵錯配接器的顯示名稱。",
-	"vscode.extension.contributes.debuggers.program": "偵錯配接器程式的路徑。可以是擴充功能資料夾的絕對或相對路徑。",
-	"vscode.extension.contributes.debuggers.args": "要傳遞至配接器的選擇性引數。",
-	"vscode.extension.contributes.debuggers.runtime": "程式屬性不是可執行檔但需要執行階段時的選擇性執行階段。",
-	"vscode.extension.contributes.debuggers.runtimeArgs": "選擇性執行階段引數。",
-	"vscode.extension.contributes.debuggers.variables": "從 `launch.json` 中的互動式變數 (例如 ${action.pickProcess}) 對應到命令。",
-	"vscode.extension.contributes.debuggers.initialConfigurations": "組態，用於產生初始 'launch.json'。",
-	"vscode.extension.contributes.debuggers.languages": "可將偵錯延伸模組視為「預設偵錯工具」的語言清單。",
-	"vscode.extension.contributes.debuggers.adapterExecutableCommand": "如有指定，VS Code 會呼叫此命令以決定偵錯配接器的可執行檔路徑及要傳遞的引數。",
-	"vscode.extension.contributes.debuggers.configurationSnippets": "用於在 'launch.json' 中新增組態的程式碼片段。",
-	"vscode.extension.contributes.debuggers.configurationAttributes": "JSON 結構描述組態，用於驗證 'launch.json'。",
-	"vscode.extension.contributes.debuggers.windows": "Windows 特定設定。",
-	"vscode.extension.contributes.debuggers.windows.runtime": "用於 Windows 的執行階段。",
-	"vscode.extension.contributes.debuggers.osx": "macOS 特定設定。",
-	"vscode.extension.contributes.debuggers.osx.runtime": "用於 macOS 的執行階段。",
-	"vscode.extension.contributes.debuggers.linux": "Linux 特定設定。",
-	"vscode.extension.contributes.debuggers.linux.runtime": "用於 Linux 的執行階段。",
-	"vscode.extension.contributes.breakpoints": "提供中斷點。",
-	"vscode.extension.contributes.breakpoints.language": "允許此語言使用中斷點。",
-	"app.launch.json.title": "啟動",
-	"app.launch.json.version": "此檔案格式的版本。",
-	"app.launch.json.configurations": "組態清單。請使用 IntelliSense 新增新的組態或編輯現有的組態。",
-	"app.launch.json.compounds": "複合的清單。每個複合都參考將會同時啟動的多重組態。",
-	"app.launch.json.compound.name": "複合的名稱。顯示於啟動組態下拉式功能表。",
-	"useUniqueNames": "請使用唯一的組態名稱。",
-	"app.launch.json.compound.folder": "複合所在的資料夾名稱。",
-	"app.launch.json.compounds.configurations": "將會作為此複合一部份而啟動之組態的名稱。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/debug/common/debugSource.i18n.json b/i18n/cht/src/vs/workbench/parts/debug/common/debugSource.i18n.json
deleted file mode 100644
index 6485497dcba..00000000000
--- a/i18n/cht/src/vs/workbench/parts/debug/common/debugSource.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"unknownSource": "未知的來源"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json b/i18n/cht/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
deleted file mode 100644
index 9c6da9e6ef9..00000000000
--- a/i18n/cht/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"breakpointWidgetLogMessagePlaceholder": "當命中中斷點時向記錄傳送訊息。會以內插值取代 {} 中的運算式。按一下 'Enter' 接受，或是按 'esc' 取消。",
-	"breakpointWidgetHitCountPlaceholder": "符合叫用次數條件時中斷。按 'Enter' 鍵接受，按 'esc' 鍵取消。",
-	"breakpointWidgetExpressionPlaceholder": "在運算式評估為 true 時中斷。按 'Enter' 鍵接受，按 'esc' 鍵取消。",
-	"expression": "運算式",
-	"hitCount": "叫用次數",
-	"logMessage": "日誌訊息"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/debug/electron-browser/breakpointsView.i18n.json b/i18n/cht/src/vs/workbench/parts/debug/electron-browser/breakpointsView.i18n.json
deleted file mode 100644
index 3b8f0f82d99..00000000000
--- a/i18n/cht/src/vs/workbench/parts/debug/electron-browser/breakpointsView.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"editConditionalBreakpoint": "編輯中斷點...",
-	"functionBreakpointsNotSupported": "此偵錯類型不支援函式中斷點",
-	"functionBreakpointPlaceholder": "要中斷的函式",
-	"functionBreakPointInputAriaLabel": "輸入函式中斷點"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/debug/electron-browser/callStackView.i18n.json b/i18n/cht/src/vs/workbench/parts/debug/electron-browser/callStackView.i18n.json
deleted file mode 100644
index 4273aa29f80..00000000000
--- a/i18n/cht/src/vs/workbench/parts/debug/electron-browser/callStackView.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"callstackSection": "呼叫堆疊區段",
-	"debugStopped": "於 {0} 暫停",
-	"callStackAriaLabel": "偵錯呼叫堆疊",
-	"session": "工作階段",
-	"paused": "已暫停",
-	"running": "正在執行",
-	"thread": "執行緒",
-	"pausedOn": "於 {0} 暫停",
-	"loadMoreStackFrames": "載入更多堆疊框架",
-	"threadAriaLabel": "執行緒 {0}，呼叫堆疊，偵錯",
-	"stackFrameAriaLabel": "堆疊框架 {0} 第 {1} {2} 行，呼叫堆疊，偵錯"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json b/i18n/cht/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
deleted file mode 100644
index f3039d0a00b..00000000000
--- a/i18n/cht/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleDebugViewlet": "顯示偵錯",
-	"toggleDebugPanel": "偵錯主控台",
-	"debug": "偵錯",
-	"debugPanel": "偵錯主控台",
-	"variables": "變數",
-	"watch": "監看",
-	"callStack": "呼叫堆疊",
-	"breakpoints": "中斷點",
-	"view": "檢視",
-	"debugCategory": "偵錯",
-	"debugCommands": "偵錯組態",
-	"debugConfigurationTitle": "偵錯",
-	"allowBreakpointsEverywhere": "允許在任何檔案設定中斷點",
-	"openExplorerOnEnd": "自動於偵錯工作階段結束時開啟總管檢視",
-	"inlineValues": "在偵錯時於編輯器以內嵌方式顯示變數值",
-	"toolBarLocation": "控制偵錯工具列的位置。在所有檢視中 \"floating\" (浮動)、在偵錯檢視中 \"docked\" (停駐)，或 \"hidden\" (隱藏)",
-	"never": "一律不在狀態列顯示偵錯",
-	"always": "遠用在狀態列中顯示偵錯",
-	"onFirstSessionStart": "只有第一次啟動偵錯後才在狀態列中顯示偵錯",
-	"showInStatusBar": "控制何時應該顯示偵錯狀態列",
-	"openDebug": "控制是否應於偵錯工作階段開始時開啟偵錯檢視。",
-	"enableAllHovers": "控制偵錯期間是否應啟用非偵錯暫留。若為 true，會呼叫暫留提供者提供暫留。即使此設定為 true，一般暫留也不會顯示。",
-	"launch": "全域偵錯啟動組態。應當做在工作區之間共用的 'launch.json' 替代方案使用"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/debug/electron-browser/debugCommands.i18n.json b/i18n/cht/src/vs/workbench/parts/debug/electron-browser/debugCommands.i18n.json
deleted file mode 100644
index 07fcd746553..00000000000
--- a/i18n/cht/src/vs/workbench/parts/debug/electron-browser/debugCommands.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noFolderDebugConfig": "請先打開一個資料夾以便設定進階偵錯組態。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json b/i18n/cht/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json
deleted file mode 100644
index ba46f891701..00000000000
--- a/i18n/cht/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"debugNoType": "偵錯器 'type' 無法省略，且必須為類型 'string'。",
-	"selectDebug": "選取環境",
-	"DebugConfig.failed": "無法在 '.vscode' 資料夾 ({0}) 中建立 'launch.json' 檔案。",
-	"workspace": "工作區",
-	"user settings": "使用者設定"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json b/i18n/cht/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
deleted file mode 100644
index 5ae66eaf38d..00000000000
--- a/i18n/cht/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"logPoint": "記錄點",
-	"breakpoint": "中斷點",
-	"removeBreakpoint": "移除 {0}",
-	"editBreakpoint": "編輯 {0}...",
-	"disableBreakpoint": "停用 {0}",
-	"enableBreakpoint": "啟用 {0}",
-	"removeBreakpoints": "移除中斷點",
-	"removeInlineBreakpointOnColumn": "移除資料行 {0} 的內嵌中斷點",
-	"removeLineBreakpoint": "移除行中斷點",
-	"editBreakpoints": "編輯中斷點",
-	"editInlineBreakpointOnColumn": "編輯資料行 {0} 的內嵌中斷點",
-	"editLineBrekapoint": "編輯行中斷點",
-	"enableDisableBreakpoints": "啟用/停用中斷點",
-	"disableInlineColumnBreakpoint": "停用資料行 {0} 的內嵌中斷點",
-	"disableBreakpointOnLine": "停用行中斷點",
-	"enableBreakpoints": "啟用資料行 {0} 的內嵌中斷點",
-	"enableBreakpointOnLine": "啟用行中斷點",
-	"addBreakpoint": "加入中斷點",
-	"addConditionalBreakpoint": "新增條件中斷點...",
-	"addLogPoint": "新增記錄點...",
-	"breakpointHasCondition": "此 {0} 具有會在移除時消失的 {1}。請考慮改為停用 {0}。",
-	"message": "訊息",
-	"condition": "條件",
-	"removeLogPoint": "移除 {0}",
-	"disableLogPoint": "停用 {0}",
-	"cancel": "取消",
-	"addConfiguration": "新增組態..."
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/debug/electron-browser/debugHover.i18n.json b/i18n/cht/src/vs/workbench/parts/debug/electron-browser/debugHover.i18n.json
deleted file mode 100644
index 63ebe83b229..00000000000
--- a/i18n/cht/src/vs/workbench/parts/debug/electron-browser/debugHover.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"treeAriaLabel": "偵錯暫留"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json b/i18n/cht/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
deleted file mode 100644
index a922616389e..00000000000
--- a/i18n/cht/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"snapshotObj": "只會顯示此物件的基本值。",
-	"debuggingPaused": "偵錯已暫停，原因 {0}，{1} {2}",
-	"debuggingStarted": "偵錯已開始。",
-	"debuggingStopped": "偵錯已停止。",
-	"breakpointAdded": "已新增中斷點，行 {0}，檔案 {1}",
-	"breakpointRemoved": "已移除中斷點，行 {0}，檔案 {1}",
-	"compoundMustHaveConfigurations": "複合必須設有 \"configurations\" 屬性，才能啟動多個組態。",
-	"noConfigurationNameInWorkspace": "無法在工作區中找到啟動組態 '{0}'。",
-	"multipleConfigurationNamesInWorkspace": "工作區中有多個啟動組態 '{0}'。請使用資料夾名稱以符合組態。",
-	"noFolderWithName": "在複合 '{2}' 的組態 '{1}' 中找不到名稱為 '{0}' 的資料夾。",
-	"configMissing": "'launch.json' 中遺漏組態 '{0}'。",
-	"launchJsonDoesNotExist": "'launch.json' 不存在。",
-	"debugRequestNotSupported": "在選取的偵錯組態中，屬性 '{0}' 具有不支援的值 '{1}'。",
-	"debugRequesMissing": "所選的偵錯組態遺漏屬性 '{0}'。",
-	"debugTypeNotSupported": "不支援設定的偵錯類型 '{0}'。",
-	"debugTypeMissing": "遺漏所選啟動設定的屬性 'type'。",
-	"debugAnyway": "仍要偵錯",
-	"preLaunchTaskErrors": "執行 preLaunchTask '{0}' 期間偵測到建置錯誤。",
-	"preLaunchTaskError": "執行 preLaunchTask '{0}' 期間偵測到建置錯誤。",
-	"preLaunchTaskExitCode": "preLaunchTask '{0}' 已終止，結束代碼為 {1}。",
-	"showErrors": "顯示錯誤",
-	"noFolderWorkspaceDebugError": "無法對使用中的檔案偵錯。請確認檔案已儲存在磁碟上，而且您已經為該檔案類型安裝偵錯延伸模組。",
-	"cancel": "取消",
-	"DebugTaskNotFound": "找不到工作 \"{0}\"。",
-	"taskNotTracked": "無法追蹤工作 '{0}'。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/debug/electron-browser/debugViewer.i18n.json b/i18n/cht/src/vs/workbench/parts/debug/electron-browser/debugViewer.i18n.json
deleted file mode 100644
index ebe863c304d..00000000000
--- a/i18n/cht/src/vs/workbench/parts/debug/electron-browser/debugViewer.i18n.json
+++ /dev/null
@@ -1,28 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"process": "處理序",
-	"paused": "已暫停",
-	"running": "正在執行",
-	"thread": "執行緒",
-	"pausedOn": "於 {0} 暫停",
-	"loadMoreStackFrames": "載入更多堆疊框架",
-	"threadAriaLabel": "執行緒 {0}，呼叫堆疊，偵錯",
-	"stackFrameAriaLabel": "堆疊框架 {0} 第 {1} {2} 行，呼叫堆疊，偵錯",
-	"variableValueAriaLabel": "輸入新的變數值",
-	"variableScopeAriaLabel": "範圍 {0}，變數，偵錯",
-	"variableAriaLabel": "{0} 值 {1}，變數，偵錯",
-	"watchExpressionPlaceholder": "要監看的運算式",
-	"watchExpressionInputAriaLabel": "輸入監看運算式",
-	"watchExpressionAriaLabel": "{0} 值 {1}，監看式，偵錯",
-	"watchVariableAriaLabel": "{0} 值 {1}，監看式，偵錯",
-	"functionBreakpointPlaceholder": "要中斷的函式",
-	"functionBreakPointInputAriaLabel": "輸入函式中斷點",
-	"functionBreakpointsNotSupported": "此偵錯類型不支援函式中斷點",
-	"breakpointAriaLabel": "中斷點第 {0} {1} 行，中斷點，偵錯",
-	"functionBreakpointAriaLabel": "函式中斷點 {0}，中斷點，偵錯",
-	"exceptionBreakpointAriaLabel": "例外狀況中斷點 {0}，中斷點，偵錯"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/debug/electron-browser/debugViews.i18n.json b/i18n/cht/src/vs/workbench/parts/debug/electron-browser/debugViews.i18n.json
deleted file mode 100644
index e6e2542dc0a..00000000000
--- a/i18n/cht/src/vs/workbench/parts/debug/electron-browser/debugViews.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"variablesSection": "變數區段",
-	"variablesAriaTreeLabel": "偵錯變數",
-	"expressionsSection": "運算式區段",
-	"watchAriaTreeLabel": "對監看運算式執行偵錯",
-	"callstackSection": "呼叫堆疊區段",
-	"debugStopped": "於 {0} 暫停",
-	"callStackAriaLabel": "偵錯呼叫堆疊",
-	"breakpointsSection": "中斷點區段",
-	"breakpointsAriaTreeLabel": "偵錯中斷點"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/debug/electron-browser/electronDebugActions.i18n.json b/i18n/cht/src/vs/workbench/parts/debug/electron-browser/electronDebugActions.i18n.json
deleted file mode 100644
index 159a3adffec..00000000000
--- a/i18n/cht/src/vs/workbench/parts/debug/electron-browser/electronDebugActions.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"copyValue": "複製值",
-	"copyAsExpression": "複製為運算式",
-	"copy": "複製",
-	"copyAll": "全部複製",
-	"copyStackTrace": "複製呼叫堆疊"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/debug/electron-browser/rawDebugSession.i18n.json b/i18n/cht/src/vs/workbench/parts/debug/electron-browser/rawDebugSession.i18n.json
deleted file mode 100644
index 00af2e04bbf..00000000000
--- a/i18n/cht/src/vs/workbench/parts/debug/electron-browser/rawDebugSession.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"moreInfo": "詳細資訊",
-	"debugAdapterCrash": "偵錯配接器處理序已意外終止"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/debug/electron-browser/repl.i18n.json b/i18n/cht/src/vs/workbench/parts/debug/electron-browser/repl.i18n.json
deleted file mode 100644
index 04f6d0459da..00000000000
--- a/i18n/cht/src/vs/workbench/parts/debug/electron-browser/repl.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"replAriaLabel": "「讀取、求值、輸出」迴圈面板",
-	"actions.repl.historyPrevious": "上一筆記錄",
-	"actions.repl.historyNext": "下一筆記錄",
-	"actions.repl.acceptInput": "REPL 接受輸入",
-	"actions.repl.copyAll": "偵錯: 主控台全部複製"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/debug/electron-browser/replViewer.i18n.json b/i18n/cht/src/vs/workbench/parts/debug/electron-browser/replViewer.i18n.json
deleted file mode 100644
index 2078f05bf9e..00000000000
--- a/i18n/cht/src/vs/workbench/parts/debug/electron-browser/replViewer.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"stateCapture": "第一次評估會擷取物件狀態",
-	"replVariableAriaLabel": "變數 {0} 具有值 {1}，「讀取、求值、輸出」迴圈，偵錯",
-	"replExpressionAriaLabel": "運算式 {0} 具有值 {1}，「讀取、求值、輸出」迴圈，偵錯",
-	"replValueOutputAriaLabel": "{0}，「讀取、求值、輸出」迴圈，偵錯",
-	"replRawObjectAriaLabel": "REPL 變數 {0} 具有值 {1}，「讀取、求值、輸出」迴圈 ，偵錯"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/debug/electron-browser/statusbarColorProvider.i18n.json b/i18n/cht/src/vs/workbench/parts/debug/electron-browser/statusbarColorProvider.i18n.json
deleted file mode 100644
index f23815901af..00000000000
--- a/i18n/cht/src/vs/workbench/parts/debug/electron-browser/statusbarColorProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"statusBarDebuggingBackground": "對程式執行偵錯時狀態列的背景色彩。狀態列會顯示在視窗的底部",
-	"statusBarDebuggingForeground": "對程式執行偵錯時狀態列的前景色彩。狀態列會顯示在視窗的底部",
-	"statusBarDebuggingBorder": "正在偵錯用以分隔資訊看板與編輯器的狀態列框線色彩。狀態列會顯示在視窗的底部。 "
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json b/i18n/cht/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json
deleted file mode 100644
index 0c85b37c8f1..00000000000
--- a/i18n/cht/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"debug.terminal.title": "偵錯項目"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/debug/electron-browser/variablesView.i18n.json b/i18n/cht/src/vs/workbench/parts/debug/electron-browser/variablesView.i18n.json
deleted file mode 100644
index 8827d25e04b..00000000000
--- a/i18n/cht/src/vs/workbench/parts/debug/electron-browser/variablesView.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"variablesSection": "變數區段",
-	"variablesAriaTreeLabel": "偵錯變數",
-	"variableValueAriaLabel": "輸入新的變數值",
-	"variableScopeAriaLabel": "範圍 {0}，變數，偵錯",
-	"variableAriaLabel": "{0} 值 {1}，變數，偵錯"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/debug/electron-browser/watchExpressionsView.i18n.json b/i18n/cht/src/vs/workbench/parts/debug/electron-browser/watchExpressionsView.i18n.json
deleted file mode 100644
index 987dc8b431e..00000000000
--- a/i18n/cht/src/vs/workbench/parts/debug/electron-browser/watchExpressionsView.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"expressionsSection": "運算式區段",
-	"watchAriaTreeLabel": "對監看運算式執行偵錯",
-	"watchExpressionPlaceholder": "要監看的運算式",
-	"watchExpressionInputAriaLabel": "輸入監看運算式",
-	"watchExpressionAriaLabel": "{0} 值 {1}，監看式，偵錯",
-	"watchVariableAriaLabel": "{0} 值 {1}，監看式，偵錯"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json b/i18n/cht/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
deleted file mode 100644
index b15f9a6ac6a..00000000000
--- a/i18n/cht/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"debugAdapterBinNotFound": "偵錯配接器可執行檔 '{0}' 不存在。",
-	"debugAdapterCannotDetermineExecutable": "無法判斷偵錯配接器 '{0}' 的可執行檔。",
-	"unableToLaunchDebugAdapter": "無法從 '{0}' 啟動偵錯配接器。",
-	"unableToLaunchDebugAdapterNoArgs": "無法啟動偵錯配接器。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/debug/node/debugger.i18n.json b/i18n/cht/src/vs/workbench/parts/debug/node/debugger.i18n.json
deleted file mode 100644
index 49c1a7df761..00000000000
--- a/i18n/cht/src/vs/workbench/parts/debug/node/debugger.i18n.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"launch.config.comment1": "使用 IntelliSense 以得知可用的屬性。",
-	"launch.config.comment2": "暫留以檢視現有屬性的描述。",
-	"launch.config.comment3": "如需詳細資訊，請瀏覽: {0}",
-	"debugType": "組態的類型。",
-	"debugTypeNotRecognised": "無法辨識此偵錯類型.請確認已有安裝並啟用相對應的偵錯擴充功能.",
-	"node2NotSupported": "\"node2\" 已不再支援，請改用 \"node\"，並將 \"protocol\" 屬性設為 \"inspector\"。",
-	"debugName": "組態的名稱; 出現在啟動組態下拉式功能表中。",
-	"debugRequest": "要求組態的類型。可以是 [啟動] 或 [附加]。",
-	"debugServer": "僅限偵錯延伸模組開發: 如果指定了連接埠，VS Code 會嘗試連線至以伺服器模式執行的偵錯配接器",
-	"debugPrelaunchTask": "偵錯工作階段啟動前要執行的工作。",
-	"debugPostDebugTask": "偵錯工作階段結束後要執行的工作。",
-	"debugWindowsConfiguration": "Windows 特定的啟動設定屬性。",
-	"debugOSXConfiguration": "OS X 特定的啟動設定屬性。",
-	"debugLinuxConfiguration": "Linux 特定的啟動設定屬性。",
-	"deprecatedVariables": "'env.'、'config.' 及 'command.' 已標示為即將淘汰，請改用 'env:'、'config:' 及 'command:'。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/debug/node/terminals.i18n.json b/i18n/cht/src/vs/workbench/parts/debug/node/terminals.i18n.json
deleted file mode 100644
index afdfcfb0e98..00000000000
--- a/i18n/cht/src/vs/workbench/parts/debug/node/terminals.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"console.title": "VS Code 主控台",
-	"mac.terminal.script.failed": "指令碼 '{0}' 失敗，結束代碼為 {1}",
-	"mac.terminal.type.not.supported": "不支援 '{0}'",
-	"press.any.key": "請按任意鍵繼續...",
-	"linux.term.failed": "'{0}' 失敗，結束代碼為 {1}"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/emmet/browser/actions/showEmmetCommands.i18n.json b/i18n/cht/src/vs/workbench/parts/emmet/browser/actions/showEmmetCommands.i18n.json
deleted file mode 100644
index 053e11ced5c..00000000000
--- a/i18n/cht/src/vs/workbench/parts/emmet/browser/actions/showEmmetCommands.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"showEmmetCommands": "顯示 Emmet 命令"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/emmet/electron-browser/actions/balance.i18n.json b/i18n/cht/src/vs/workbench/parts/emmet/electron-browser/actions/balance.i18n.json
deleted file mode 100644
index 71f6e49ff95..00000000000
--- a/i18n/cht/src/vs/workbench/parts/emmet/electron-browser/actions/balance.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"balanceInward": "Emmet: 平衡 (向內)",
-	"balanceOutward": "Emmet: 平衡 (向外)"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/emmet/electron-browser/actions/editPoints.i18n.json b/i18n/cht/src/vs/workbench/parts/emmet/electron-browser/actions/editPoints.i18n.json
deleted file mode 100644
index cc8a2f38620..00000000000
--- a/i18n/cht/src/vs/workbench/parts/emmet/electron-browser/actions/editPoints.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"previousEditPoint": "Emmet: 前往上一個編輯端點",
-	"nextEditPoint": "Emmet: 前往下一個編輯端點"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/emmet/electron-browser/actions/evaluateMath.i18n.json b/i18n/cht/src/vs/workbench/parts/emmet/electron-browser/actions/evaluateMath.i18n.json
deleted file mode 100644
index 2fd101d6104..00000000000
--- a/i18n/cht/src/vs/workbench/parts/emmet/electron-browser/actions/evaluateMath.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"evaluateMathExpression": "Emmet: 評估數學運算式"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/emmet/electron-browser/actions/expandAbbreviation.i18n.json b/i18n/cht/src/vs/workbench/parts/emmet/electron-browser/actions/expandAbbreviation.i18n.json
deleted file mode 100644
index 61ec011fe2c..00000000000
--- a/i18n/cht/src/vs/workbench/parts/emmet/electron-browser/actions/expandAbbreviation.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"expandAbbreviationAction": "Emmet: 展開縮寫"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/emmet/electron-browser/actions/incrementDecrement.i18n.json b/i18n/cht/src/vs/workbench/parts/emmet/electron-browser/actions/incrementDecrement.i18n.json
deleted file mode 100644
index 64cf880ae48..00000000000
--- a/i18n/cht/src/vs/workbench/parts/emmet/electron-browser/actions/incrementDecrement.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"incrementNumberByOneTenth": "Emmet: 依 0.1 遞增",
-	"incrementNumberByOne": "Emmet: 依 1 遞增",
-	"incrementNumberByTen": "Emmet: 依 10 遞增",
-	"decrementNumberByOneTenth": "Emmet: 依 0.1 遞減",
-	"decrementNumberByOne": "Emmet: 依 1 遞減",
-	"decrementNumberByTen": "Emmet: 依 10 遞減"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/emmet/electron-browser/actions/matchingPair.i18n.json b/i18n/cht/src/vs/workbench/parts/emmet/electron-browser/actions/matchingPair.i18n.json
deleted file mode 100644
index 211f58191fe..00000000000
--- a/i18n/cht/src/vs/workbench/parts/emmet/electron-browser/actions/matchingPair.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"matchingPair": "Emmet: 前往相符的配對"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/emmet/electron-browser/actions/mergeLines.i18n.json b/i18n/cht/src/vs/workbench/parts/emmet/electron-browser/actions/mergeLines.i18n.json
deleted file mode 100644
index 3e491126dc2..00000000000
--- a/i18n/cht/src/vs/workbench/parts/emmet/electron-browser/actions/mergeLines.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"mergeLines": "Emmet: 合併行"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/emmet/electron-browser/actions/reflectCssValue.i18n.json b/i18n/cht/src/vs/workbench/parts/emmet/electron-browser/actions/reflectCssValue.i18n.json
deleted file mode 100644
index 1dcfdd7b85c..00000000000
--- a/i18n/cht/src/vs/workbench/parts/emmet/electron-browser/actions/reflectCssValue.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"reflectCSSValue": "Emmet: 反射 CSS 值"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/emmet/electron-browser/actions/removeTag.i18n.json b/i18n/cht/src/vs/workbench/parts/emmet/electron-browser/actions/removeTag.i18n.json
deleted file mode 100644
index 0c12d23d41a..00000000000
--- a/i18n/cht/src/vs/workbench/parts/emmet/electron-browser/actions/removeTag.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"removeTag": "Emmet: 移除標記"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/emmet/electron-browser/actions/selectItem.i18n.json b/i18n/cht/src/vs/workbench/parts/emmet/electron-browser/actions/selectItem.i18n.json
deleted file mode 100644
index 2674e2efa4e..00000000000
--- a/i18n/cht/src/vs/workbench/parts/emmet/electron-browser/actions/selectItem.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"selectPreviousItem": "Emmet: 選取上一個項目",
-	"selectNextItem": "Emmet: 選取下一個項目"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/emmet/electron-browser/actions/splitJoinTag.i18n.json b/i18n/cht/src/vs/workbench/parts/emmet/electron-browser/actions/splitJoinTag.i18n.json
deleted file mode 100644
index b861468d52e..00000000000
--- a/i18n/cht/src/vs/workbench/parts/emmet/electron-browser/actions/splitJoinTag.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"splitJoinTag": "Emmet: 分割/聯結標記"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/emmet/electron-browser/actions/toggleComment.i18n.json b/i18n/cht/src/vs/workbench/parts/emmet/electron-browser/actions/toggleComment.i18n.json
deleted file mode 100644
index 9980a634fb8..00000000000
--- a/i18n/cht/src/vs/workbench/parts/emmet/electron-browser/actions/toggleComment.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"toggleComment": "Emmet: 切換註解"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/emmet/electron-browser/actions/updateImageSize.i18n.json b/i18n/cht/src/vs/workbench/parts/emmet/electron-browser/actions/updateImageSize.i18n.json
deleted file mode 100644
index 11fbb1e13ba..00000000000
--- a/i18n/cht/src/vs/workbench/parts/emmet/electron-browser/actions/updateImageSize.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"updateImageSize": "Emmet: 更新影像大小"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/emmet/electron-browser/actions/updateTag.i18n.json b/i18n/cht/src/vs/workbench/parts/emmet/electron-browser/actions/updateTag.i18n.json
deleted file mode 100644
index 659656b1b2b..00000000000
--- a/i18n/cht/src/vs/workbench/parts/emmet/electron-browser/actions/updateTag.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"updateTag": "Emmet: 更新標記",
-	"enterTag": "輸入標記",
-	"tag": "標記"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/emmet/electron-browser/actions/wrapWithAbbreviation.i18n.json b/i18n/cht/src/vs/workbench/parts/emmet/electron-browser/actions/wrapWithAbbreviation.i18n.json
deleted file mode 100644
index 78eafe156b1..00000000000
--- a/i18n/cht/src/vs/workbench/parts/emmet/electron-browser/actions/wrapWithAbbreviation.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"wrapWithAbbreviationAction": "Emmet: 以縮寫包裝",
-	"enterAbbreviation": "輸入縮寫",
-	"abbreviation": "縮寫"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/emmet/electron-browser/emmet.contribution.i18n.json b/i18n/cht/src/vs/workbench/parts/emmet/electron-browser/emmet.contribution.i18n.json
deleted file mode 100644
index af127333714..00000000000
--- a/i18n/cht/src/vs/workbench/parts/emmet/electron-browser/emmet.contribution.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"emmetConfigurationTitle": "Emmet",
-	"triggerExpansionOnTab": "啟用時，按下 TAB 即可展開 Emmet 縮寫。當 emmet.useNewemmet 設定為 true 時不適用。",
-	"emmetPreferences": "用以修改部分 Emmet 動作及解析程式之行為的喜好設定。emmet.useNewemmet 設定為 true 時不適用。",
-	"emmetSyntaxProfiles": "為指定的語法定義設定檔，或透過特定規則使用自己的設定檔。",
-	"emmetExclude": "不應展開 Emmet 縮寫的語言陣列。",
-	"emmetExtensionsPath": "包含 Emmet 設定檔、片段及喜好設定的資料夾路徑。emmet.useNewEmmet 設定為 true 時僅會從延伸模組路徑接受設定檔。",
-	"useNewEmmet": "試試所有 Emmet 功能的新 Emmet 模組 (最終會取代舊的單一 Emmet 程式庫)。"
-}
diff --git a/i18n/cht/src/vs/workbench/parts/emmet/node/actions/balance.i18n.json b/i18n/cht/src/vs/workbench/parts/emmet/node/actions/balance.i18n.json
deleted file mode 100644
index 71f6e49ff95..00000000000
--- a/i18n/cht/src/vs/workbench/parts/emmet/node/actions/balance.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"balanceInward": "Emmet: 平衡 (向內)",
-	"balanceOutward": "Emmet: 平衡 (向外)"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/emmet/node/actions/editPoints.i18n.json b/i18n/cht/src/vs/workbench/parts/emmet/node/actions/editPoints.i18n.json
deleted file mode 100644
index 9c79dedc0ca..00000000000
--- a/i18n/cht/src/vs/workbench/parts/emmet/node/actions/editPoints.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"previousEditPoint": "Emmet: 上一個編輯端點",
-	"nextEditPoint": "Emmet: 下一個編輯端點"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/emmet/node/actions/evaluateMath.i18n.json b/i18n/cht/src/vs/workbench/parts/emmet/node/actions/evaluateMath.i18n.json
deleted file mode 100644
index 2fd101d6104..00000000000
--- a/i18n/cht/src/vs/workbench/parts/emmet/node/actions/evaluateMath.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"evaluateMathExpression": "Emmet: 評估數學運算式"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/emmet/node/actions/expandAbbreviation.i18n.json b/i18n/cht/src/vs/workbench/parts/emmet/node/actions/expandAbbreviation.i18n.json
deleted file mode 100644
index e44c6de8d4a..00000000000
--- a/i18n/cht/src/vs/workbench/parts/emmet/node/actions/expandAbbreviation.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"expandAbbreviationAction": "Emmet: 展開縮寫"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/emmet/node/actions/incrementDecrement.i18n.json b/i18n/cht/src/vs/workbench/parts/emmet/node/actions/incrementDecrement.i18n.json
deleted file mode 100644
index 64cf880ae48..00000000000
--- a/i18n/cht/src/vs/workbench/parts/emmet/node/actions/incrementDecrement.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"incrementNumberByOneTenth": "Emmet: 依 0.1 遞增",
-	"incrementNumberByOne": "Emmet: 依 1 遞增",
-	"incrementNumberByTen": "Emmet: 依 10 遞增",
-	"decrementNumberByOneTenth": "Emmet: 依 0.1 遞減",
-	"decrementNumberByOne": "Emmet: 依 1 遞減",
-	"decrementNumberByTen": "Emmet: 依 10 遞減"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/emmet/node/actions/matchingPair.i18n.json b/i18n/cht/src/vs/workbench/parts/emmet/node/actions/matchingPair.i18n.json
deleted file mode 100644
index 211f58191fe..00000000000
--- a/i18n/cht/src/vs/workbench/parts/emmet/node/actions/matchingPair.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"matchingPair": "Emmet: 前往相符的配對"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/emmet/node/actions/mergeLines.i18n.json b/i18n/cht/src/vs/workbench/parts/emmet/node/actions/mergeLines.i18n.json
deleted file mode 100644
index 3e491126dc2..00000000000
--- a/i18n/cht/src/vs/workbench/parts/emmet/node/actions/mergeLines.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"mergeLines": "Emmet: 合併行"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/emmet/node/actions/reflectCssValue.i18n.json b/i18n/cht/src/vs/workbench/parts/emmet/node/actions/reflectCssValue.i18n.json
deleted file mode 100644
index 1dcfdd7b85c..00000000000
--- a/i18n/cht/src/vs/workbench/parts/emmet/node/actions/reflectCssValue.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"reflectCSSValue": "Emmet: 反射 CSS 值"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/emmet/node/actions/removeTag.i18n.json b/i18n/cht/src/vs/workbench/parts/emmet/node/actions/removeTag.i18n.json
deleted file mode 100644
index 0c12d23d41a..00000000000
--- a/i18n/cht/src/vs/workbench/parts/emmet/node/actions/removeTag.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"removeTag": "Emmet: 移除標記"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/emmet/node/actions/selectItem.i18n.json b/i18n/cht/src/vs/workbench/parts/emmet/node/actions/selectItem.i18n.json
deleted file mode 100644
index 2674e2efa4e..00000000000
--- a/i18n/cht/src/vs/workbench/parts/emmet/node/actions/selectItem.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"selectPreviousItem": "Emmet: 選取上一個項目",
-	"selectNextItem": "Emmet: 選取下一個項目"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/emmet/node/actions/splitJoinTag.i18n.json b/i18n/cht/src/vs/workbench/parts/emmet/node/actions/splitJoinTag.i18n.json
deleted file mode 100644
index b861468d52e..00000000000
--- a/i18n/cht/src/vs/workbench/parts/emmet/node/actions/splitJoinTag.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"splitJoinTag": "Emmet: 分割/聯結標記"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/emmet/node/actions/toggleComment.i18n.json b/i18n/cht/src/vs/workbench/parts/emmet/node/actions/toggleComment.i18n.json
deleted file mode 100644
index 9980a634fb8..00000000000
--- a/i18n/cht/src/vs/workbench/parts/emmet/node/actions/toggleComment.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"toggleComment": "Emmet: 切換註解"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/emmet/node/actions/updateImageSize.i18n.json b/i18n/cht/src/vs/workbench/parts/emmet/node/actions/updateImageSize.i18n.json
deleted file mode 100644
index 11fbb1e13ba..00000000000
--- a/i18n/cht/src/vs/workbench/parts/emmet/node/actions/updateImageSize.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"updateImageSize": "Emmet: 更新影像大小"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/emmet/node/actions/updateTag.i18n.json b/i18n/cht/src/vs/workbench/parts/emmet/node/actions/updateTag.i18n.json
deleted file mode 100644
index 659656b1b2b..00000000000
--- a/i18n/cht/src/vs/workbench/parts/emmet/node/actions/updateTag.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"updateTag": "Emmet: 更新標記",
-	"enterTag": "輸入標記",
-	"tag": "標記"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/emmet/node/actions/wrapWithAbbreviation.i18n.json b/i18n/cht/src/vs/workbench/parts/emmet/node/actions/wrapWithAbbreviation.i18n.json
deleted file mode 100644
index 78eafe156b1..00000000000
--- a/i18n/cht/src/vs/workbench/parts/emmet/node/actions/wrapWithAbbreviation.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"wrapWithAbbreviationAction": "Emmet: 以縮寫包裝",
-	"enterAbbreviation": "輸入縮寫",
-	"abbreviation": "縮寫"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/emmet/node/emmet.contribution.i18n.json b/i18n/cht/src/vs/workbench/parts/emmet/node/emmet.contribution.i18n.json
deleted file mode 100644
index fa22b35c419..00000000000
--- a/i18n/cht/src/vs/workbench/parts/emmet/node/emmet.contribution.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"emmetConfigurationTitle": "Emmet",
-	"triggerExpansionOnTab": "如有啟用，只要按 Tab 鍵就能展開 Emmet 縮寫。",
-	"emmetPreferences": "喜好設定，用以修改某些動作的行為及 Emmet 的解析程式。",
-	"emmetSyntaxProfiles": "為指定的語法定義設定檔，或透過特定規則使用自己的設定檔。",
-	"emmetExclude": "不應展開 Emmet 縮寫的語言陣列。",
-	"emmetExtensionsPath": "包含 Emmet 設定檔、程式碼片段及參考的資料夾路徑"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json b/i18n/cht/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
deleted file mode 100644
index 74bcaae504a..00000000000
--- a/i18n/cht/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"terminalConfigurationTitle": "外部終端機",
-	"explorer.openInTerminalKind": "自訂啟動的終端機類型。",
-	"terminal.external.windowsExec": "自訂要在 Windows 上執行的終端機。",
-	"terminal.external.osxExec": "自訂要在 OS X 上執行的終端機應用程式。",
-	"terminal.external.linuxExec": "自訂要在 Linux 上執行的終端機。",
-	"globalConsoleActionWin": "開啟新的命令提示字元",
-	"globalConsoleActionMacLinux": "開啟新的終端機",
-	"scopedConsoleActionWin": "在命令提示字元中開啟",
-	"scopedConsoleActionMacLinux": "在終端機中開啟"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/execution/electron-browser/terminal.contribution.i18n.json b/i18n/cht/src/vs/workbench/parts/execution/electron-browser/terminal.contribution.i18n.json
deleted file mode 100644
index 5004bbeee13..00000000000
--- a/i18n/cht/src/vs/workbench/parts/execution/electron-browser/terminal.contribution.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"terminalConfigurationTitle": "外部終端機",
-	"terminal.external.windowsExec": "自訂要在 Windows 上執行的終端機。",
-	"terminal.external.osxExec": "自訂要在 OS X 上執行的終端機應用程式。",
-	"terminal.external.linuxExec": "自訂要在 Linux 上執行的終端機。",
-	"globalConsoleActionWin": "開啟新的命令提示字元",
-	"globalConsoleActionMacLinux": "開啟新的終端機",
-	"scopedConsoleActionWin": "在命令提示字元中開啟",
-	"scopedConsoleActionMacLinux": "在終端機中開啟"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/execution/electron-browser/terminalService.i18n.json b/i18n/cht/src/vs/workbench/parts/execution/electron-browser/terminalService.i18n.json
deleted file mode 100644
index afdfcfb0e98..00000000000
--- a/i18n/cht/src/vs/workbench/parts/execution/electron-browser/terminalService.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"console.title": "VS Code 主控台",
-	"mac.terminal.script.failed": "指令碼 '{0}' 失敗，結束代碼為 {1}",
-	"mac.terminal.type.not.supported": "不支援 '{0}'",
-	"press.any.key": "請按任意鍵繼續...",
-	"linux.term.failed": "'{0}' 失敗，結束代碼為 {1}"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/explorers/browser/treeExplorer.contribution.i18n.json b/i18n/cht/src/vs/workbench/parts/explorers/browser/treeExplorer.contribution.i18n.json
deleted file mode 100644
index 71c9d68e192..00000000000
--- a/i18n/cht/src/vs/workbench/parts/explorers/browser/treeExplorer.contribution.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"vscode.extension.contributes.view": "提供自訂檢視",
-	"vscode.extension.contributes.view.id": "用以識別透過 vscode.workspace.createTreeView 建立之檢視的唯一識別碼",
-	"vscode.extension.contributes.view.label": "用以轉譯檢視的易讀字串",
-	"vscode.extension.contributes.view.icon": "連到檢視圖示的路徑",
-	"vscode.extension.contributes.views": "提供自訂檢視",
-	"showViewlet": "顯示 {0}",
-	"view": "檢視"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/explorers/browser/treeExplorerActions.i18n.json b/i18n/cht/src/vs/workbench/parts/explorers/browser/treeExplorerActions.i18n.json
deleted file mode 100644
index 194d609686e..00000000000
--- a/i18n/cht/src/vs/workbench/parts/explorers/browser/treeExplorerActions.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"refresh": "重新整理"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/explorers/browser/treeExplorerService.i18n.json b/i18n/cht/src/vs/workbench/parts/explorers/browser/treeExplorerService.i18n.json
deleted file mode 100644
index a2e994a5f21..00000000000
--- a/i18n/cht/src/vs/workbench/parts/explorers/browser/treeExplorerService.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"treeExplorer.noMatchingProviderId": "未註冊識別碼為 {providerId} 的 TreeExplorerNodeProvider。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/explorers/browser/views/treeExplorerView.i18n.json b/i18n/cht/src/vs/workbench/parts/explorers/browser/views/treeExplorerView.i18n.json
deleted file mode 100644
index e5633ee7ea7..00000000000
--- a/i18n/cht/src/vs/workbench/parts/explorers/browser/views/treeExplorerView.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"treeExplorerViewlet.tree": "Tree Explorer 區段"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/extensions/browser/dependenciesViewer.i18n.json b/i18n/cht/src/vs/workbench/parts/extensions/browser/dependenciesViewer.i18n.json
deleted file mode 100644
index 8909b1633bd..00000000000
--- a/i18n/cht/src/vs/workbench/parts/extensions/browser/dependenciesViewer.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"error": "錯誤",
-	"Unknown Dependency": "未知的相依性:"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json b/i18n/cht/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json
deleted file mode 100644
index 0f0a8bc1904..00000000000
--- a/i18n/cht/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"name": "延伸模組名稱",
-	"extension id": "延伸模組識別碼",
-	"preview": "預覽",
-	"builtin": "內建",
-	"publisher": "發行者名稱",
-	"install count": "安裝計數",
-	"rating": "評等",
-	"repository": "儲存庫",
-	"license": "授權",
-	"details": "詳細資料",
-	"contributions": "貢獻",
-	"changelog": "變更記錄",
-	"dependencies": "相依性",
-	"noReadme": "沒有可用的讀我檔案。",
-	"noChangelog": "沒有可用的 Changelog。",
-	"noContributions": "沒有比重",
-	"noDependencies": "沒有相依性",
-	"settings": "設定 ({0})",
-	"setting name": "名稱",
-	"description": "描述",
-	"default": "預設",
-	"debuggers": "偵錯工具 ({0})",
-	"debugger name": "名稱",
-	"debugger type": "型別",
-	"views": "瀏覽次數 ({0})",
-	"view id": "識別碼",
-	"view name": "名稱",
-	"view location": "位置",
-	"localizations": "當地語系化 ({0})",
-	"localizations language id": "語言識別碼",
-	"localizations language name": "語言名稱",
-	"localizations localized language name": "語言名稱 (在地化)",
-	"colorThemes": "色彩佈景主題 ({0})",
-	"iconThemes": "圖示佈景主題 ({0}) ",
-	"colors": "色彩 ({0})",
-	"colorId": "識別碼",
-	"defaultDark": "預設深色",
-	"defaultLight": "預設淺色",
-	"defaultHC": "預設高對比",
-	"JSON Validation": "JSON 驗證 ({0})",
-	"fileMatch": "檔案相符",
-	"schema": "結構描述",
-	"commands": "命令 ({0})",
-	"command name": "名稱",
-	"keyboard shortcuts": "鍵盤快速鍵(&&K)",
-	"menuContexts": "功能表內容",
-	"languages": "語言 ({0})",
-	"language id": "識別碼",
-	"language name": "名稱",
-	"file extensions": "副檔名",
-	"grammar": "文法",
-	"snippets": "程式碼片段"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json b/i18n/cht/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
deleted file mode 100644
index beddde6d10c..00000000000
--- a/i18n/cht/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
+++ /dev/null
@@ -1,81 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"download": "手動下載",
-	"install vsix": "下載完成後，請手動安裝下載之 '{0}' 的 VSIX。",
-	"installAction": "安裝",
-	"installing": "安裝中",
-	"failedToInstall": "無法安裝 '{0}'。",
-	"uninstallAction": "解除安裝",
-	"Uninstalling": "正在解除安裝",
-	"updateAction": "更新",
-	"updateTo": "更新至 {0}",
-	"failedToUpdate": "無法更新 '{0}'。",
-	"ManageExtensionAction.uninstallingTooltip": "正在解除安裝",
-	"enableForWorkspaceAction": "啟用 (工作區)",
-	"enableGloballyAction": "啟用",
-	"enableAction": "啟用",
-	"disableForWorkspaceAction": "停用 (工作區)",
-	"disableGloballyAction": "停用",
-	"disableAction": "停用",
-	"checkForUpdates": "查看是否有更新",
-	"enableAutoUpdate": "啟用自動更新延伸模組",
-	"disableAutoUpdate": "停用自動更新延伸模組",
-	"updateAll": "更新所有延伸模組",
-	"reloadAction": "重新載入",
-	"postUpdateTooltip": "重新載入以更新",
-	"postUpdateMessage": "要重新載入此視窗以啟動已更新的延伸模組 '{0}' 嗎?",
-	"postEnableTooltip": "重新載入以啟動",
-	"postEnableMessage": "要重新載入此視窗以啟動延伸模組 '{0}' 嗎?",
-	"postDisableTooltip": "重新載入以停用",
-	"postDisableMessage": "要重新載入此視窗以停用延伸模組 '{0}' 嗎?",
-	"postUninstallTooltip": "重新載入以停用",
-	"postUninstallMessage": "要重新載入此視窗以停用已解除安裝的延伸模組 '{0}' 嗎?",
-	"toggleExtensionsViewlet": "顯示擴充功能",
-	"installExtensions": "安裝擴充功能",
-	"showEnabledExtensions": "顯示啟用的延伸模組",
-	"showInstalledExtensions": "顯示安裝的擴充功能",
-	"showDisabledExtensions": "顯示停用的延伸模組",
-	"clearExtensionsInput": "清除擴充功能輸入",
-	"showBuiltInExtensions": "顯示內建擴充功能",
-	"showOutdatedExtensions": "顯示過期的擴充功能",
-	"showPopularExtensions": "顯示熱門擴充功能",
-	"showRecommendedExtensions": "顯示建議的擴充功能",
-	"installWorkspaceRecommendedExtensions": "安裝所有建議的工作區延伸模組",
-	"allExtensionsInstalled": "所有建議此工作區使用的延伸模組皆已安裝",
-	"installRecommendedExtension": "安裝建議的擴充功能",
-	"extensionInstalled": "建議的延伸模組已安裝",
-	"showRecommendedKeymapExtensionsShort": "按鍵對應",
-	"showLanguageExtensionsShort": "語言擴充功能",
-	"showAzureExtensionsShort": "Azure 延伸模組",
-	"OpenExtensionsFile.failed": "無法在 '.vscode' 資料夾 ({0}) 中建立 'extensions.json' 檔案。",
-	"configureWorkspaceRecommendedExtensions": "設定建議的延伸模組 (工作區)",
-	"configureWorkspaceFolderRecommendedExtensions": "設定建議的延伸模組 (工作區資料夾) ",
-	"malicious tooltip": "這個延伸模組曾經被回報是有問題的。",
-	"malicious": "惡意",
-	"disabled": "停用",
-	"disabled globally": "停用",
-	"disabled workspace": "在此工作區停用",
-	"disableAll": "停用所有已安裝的延伸模組",
-	"disableAllWorkspace": "停用此工作區的所有已安裝延伸模組",
-	"enableAll": "啟用所有擴充功能",
-	"enableAllWorkspace": "啟用此工作區的所有擴充功能",
-	"openExtensionsFolder": "開啟延伸模組資料夾",
-	"installVSIX": "從 VSIX 安裝...",
-	"installFromVSIX": "從 VSIX 安裝",
-	"installButton": "安裝(&&I)",
-	"InstallVSIXAction.success": "已成功安裝擴充功能。請重新載入以啟用。",
-	"InstallVSIXAction.reloadNow": "立即重新載入",
-	"reinstall": "重新安裝延伸模組...",
-	"selectExtension": "選取要重新安裝的延伸模組",
-	"ReinstallAction.success": "已成功重新安裝延伸模組。",
-	"ReinstallAction.reloadNow": "立即重新載入",
-	"extensionButtonProminentBackground": "突出的動作延伸模組按鈕背景色彩 (例如，[安裝] 按鈕)。",
-	"extensionButtonProminentForeground": "突出的動作延伸模組按鈕前景色彩 (例如，[安裝] 按鈕)。",
-	"extensionButtonProminentHoverBackground": "突出的動作延伸模組按鈕背景暫留色彩 (例如，[安裝] 按鈕)。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/extensions/browser/extensionsList.i18n.json b/i18n/cht/src/vs/workbench/parts/extensions/browser/extensionsList.i18n.json
deleted file mode 100644
index e3b6043c38d..00000000000
--- a/i18n/cht/src/vs/workbench/parts/extensions/browser/extensionsList.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"recommended": " 推薦項目"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/extensions/browser/extensionsQuickOpen.i18n.json b/i18n/cht/src/vs/workbench/parts/extensions/browser/extensionsQuickOpen.i18n.json
deleted file mode 100644
index 70882d7de81..00000000000
--- a/i18n/cht/src/vs/workbench/parts/extensions/browser/extensionsQuickOpen.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"manage": "按 Enter 即可管理您的擴充功能。",
-	"notfound": "在 Marketplace 中找不到延伸模組 '{0}'。",
-	"install": "按 Enter 即可從 Marketplace 安裝 '{0}'。",
-	"searchFor": "按 Enter 即可在 Marketplace 中搜尋 '{0}'。",
-	"noExtensionsToInstall": "輸入擴充功能名稱"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/extensions/browser/extensionsWidgets.i18n.json b/i18n/cht/src/vs/workbench/parts/extensions/browser/extensionsWidgets.i18n.json
deleted file mode 100644
index fd57ad3913f..00000000000
--- a/i18n/cht/src/vs/workbench/parts/extensions/browser/extensionsWidgets.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"ratedByUsers": "由 {0} 使用者評等",
-	"ratedBySingleUser": "由 1 位使用者評等"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/extensions/common/extensionsFileTemplate.i18n.json b/i18n/cht/src/vs/workbench/parts/extensions/common/extensionsFileTemplate.i18n.json
deleted file mode 100644
index b8ee8d0f36c..00000000000
--- a/i18n/cht/src/vs/workbench/parts/extensions/common/extensionsFileTemplate.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"app.extensions.json.title": "擴充功能",
-	"app.extensions.json.recommendations": "擴充功能的建議清單。擴充功能的識別碼一律為 '${publisher}.${name}'。例如: 'vscode.csharp'。",
-	"app.extension.identifier.errorMessage": "格式應為 '${publisher}.${name}'。範例: 'vscode.csharp'。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/extensions/common/extensionsInput.i18n.json b/i18n/cht/src/vs/workbench/parts/extensions/common/extensionsInput.i18n.json
deleted file mode 100644
index 8ea918bfc50..00000000000
--- a/i18n/cht/src/vs/workbench/parts/extensions/common/extensionsInput.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"extensionsInputName": "擴充功能: {0}"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json b/i18n/cht/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
deleted file mode 100644
index cab80f74c21..00000000000
--- a/i18n/cht/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
+++ /dev/null
@@ -1,69 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"name": "延伸模組名稱",
-	"extension id": "延伸模組識別碼",
-	"preview": "預覽",
-	"builtin": "內建",
-	"publisher": "發行者名稱",
-	"install count": "安裝計數",
-	"rating": "評等",
-	"repository": "儲存庫",
-	"license": "授權",
-	"details": "詳細資料",
-	"detailstooltip": "擴充功能詳細資訊，從擴充功能的 'README.md' 檔案中呈現。",
-	"contributions": "貢獻",
-	"contributionstooltip": "透過此擴充功能列出對 VS Code 的貢獻",
-	"changelog": "變更記錄",
-	"changelogtooltip": "擴充功能更新紀錄，從擴充功能 'CHANGELOG.md' 檔案中呈現",
-	"dependencies": "相依性",
-	"dependenciestooltip": "列出此擴充功能的相依項目",
-	"noReadme": "沒有可用的讀我檔案。",
-	"noChangelog": "沒有可用的 Changelog。",
-	"noContributions": "沒有比重",
-	"noDependencies": "沒有相依性",
-	"settings": "設定 ({0})",
-	"setting name": "名稱",
-	"description": "描述",
-	"default": "預設",
-	"debuggers": "偵錯工具 ({0})",
-	"debugger name": "名稱",
-	"debugger type": "型別",
-	"viewContainers": "檢視容器 ({0})",
-	"view container id": "識別碼",
-	"view container title": "標題",
-	"view container location": "位置",
-	"views": "瀏覽次數 ({0})",
-	"view id": "識別碼",
-	"view name": "名稱",
-	"view location": "位置",
-	"localizations": "當地語系化 ({0})",
-	"localizations language id": "語言識別碼",
-	"localizations language name": "語言名稱",
-	"localizations localized language name": "語言名稱 (已當地語系化)",
-	"colorThemes": "色彩佈景主題 ({0})",
-	"iconThemes": "圖示佈景主題 ({0}) ",
-	"colors": "色彩 ({0})",
-	"colorId": "識別碼",
-	"defaultDark": "預設深色",
-	"defaultLight": "預設淺色",
-	"defaultHC": "預設高對比",
-	"JSON Validation": "JSON 驗證 ({0})",
-	"fileMatch": "檔案相符",
-	"schema": "結構描述",
-	"commands": "命令 ({0})",
-	"command name": "名稱",
-	"keyboard shortcuts": "鍵盤快速鍵(&&K)",
-	"menuContexts": "功能表內容",
-	"languages": "語言 ({0})",
-	"language id": "識別碼",
-	"language name": "名稱",
-	"file extensions": "副檔名",
-	"grammar": "文法",
-	"snippets": "程式碼片段"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/extensions/electron-browser/extensionProfileService.i18n.json b/i18n/cht/src/vs/workbench/parts/extensions/electron-browser/extensionProfileService.i18n.json
deleted file mode 100644
index 428850cc74c..00000000000
--- a/i18n/cht/src/vs/workbench/parts/extensions/electron-browser/extensionProfileService.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"restart1": "記錄延伸模組",
-	"restart2": "若要記錄延伸模組，則必須重新啟動。您要立即重新啟動 '{0}' 嗎?",
-	"restart3": "重新啟動",
-	"cancel": "取消",
-	"selectAndStartDebug": "按一下以停止性能分析。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json b/i18n/cht/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
deleted file mode 100644
index 68a719930ef..00000000000
--- a/i18n/cht/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"neverShowAgain": "不要再顯示",
-	"searchMarketplace": "搜尋市集",
-	"dynamicWorkspaceRecommendation": "此擴充功能可能會讓您感興趣，因為它在 {0} 儲存庫的使用者中很熱門。",
-	"exeBasedRecommendation": "因為您已安裝 {0}，所以建議您使用此延伸模組。",
-	"fileBasedRecommendation": "根據您最近開啟的檔案，建議您使用此延伸模組。",
-	"workspaceRecommendation": "根據目前工作區的使用者，建議您使用此延伸模組。",
-	"reallyRecommended2": "建議對此檔案類型使用 '{0}' 延伸模組。",
-	"reallyRecommendedExtensionPack": "建議對此檔案類型使用 '{0}' 延伸模組套件。",
-	"install": "安裝",
-	"showRecommendations": "顯示建議",
-	"showLanguageExtensions": "市集有 '.{0}' 個文件的擴充功能可以提供協助",
-	"workspaceRecommended": "此工作區具有擴充功能建議。",
-	"installAll": "全部安裝",
-	"ignoreExtensionRecommendations": "是否略過所有的延伸模組建議?",
-	"ignoreAll": "是，略過全部",
-	"no": "否"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/extensions/electron-browser/extensions.contribution.i18n.json b/i18n/cht/src/vs/workbench/parts/extensions/electron-browser/extensions.contribution.i18n.json
deleted file mode 100644
index 70aaaac2426..00000000000
--- a/i18n/cht/src/vs/workbench/parts/extensions/electron-browser/extensions.contribution.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"extensionsCommands": "管理擴充功能",
-	"galleryExtensionsCommands": "安裝資源庫擴充功能",
-	"extension": "擴充功能",
-	"runtimeExtension": "正在執行擴充功能",
-	"extensions": "擴充功能",
-	"view": "檢視",
-	"developer": "開發人員",
-	"extensionsConfigurationTitle": "擴充功能",
-	"extensionsAutoUpdate": "自動更新擴充功能",
-	"extensionsIgnoreRecommendations": "如果設定為 true，擴充功能建議通知將停止顯示。",
-	"extensionsShowRecommendationsOnlyOnDemand": "若設置為 true，除非使用者特別要求，否則不會擷取或顯示建議。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.i18n.json b/i18n/cht/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.i18n.json
deleted file mode 100644
index 62bbf9c79c7..00000000000
--- a/i18n/cht/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openExtensionsFolder": "開啟延伸模組資料夾",
-	"installVSIX": "從 VSIX 安裝...",
-	"installFromVSIX": "從 VSIX 安裝",
-	"installButton": "安裝(&&I)",
-	"InstallVSIXAction.success": "已成功安裝擴充功能。請重新載入以啟用。",
-	"InstallVSIXAction.reloadNow": "立即重新載入"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/extensions/electron-browser/extensionsUtils.i18n.json b/i18n/cht/src/vs/workbench/parts/extensions/electron-browser/extensionsUtils.i18n.json
deleted file mode 100644
index c096eb60a7d..00000000000
--- a/i18n/cht/src/vs/workbench/parts/extensions/electron-browser/extensionsUtils.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"disableOtherKeymapsConfirmation": "要停用其他按鍵對應 ({0})，以避免按鍵繫結關係間的衝突嗎?",
-	"yes": "是",
-	"no": "否"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json b/i18n/cht/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
deleted file mode 100644
index 6233388a065..00000000000
--- a/i18n/cht/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"marketPlace": "市集",
-	"installedExtensions": "已安裝",
-	"searchInstalledExtensions": "已安裝",
-	"recommendedExtensions": " 推薦項目",
-	"otherRecommendedExtensions": "其他建議",
-	"workspaceRecommendedExtensions": "工作區建議",
-	"builtInExtensions": "功能",
-	"builtInThemesExtensions": "主題",
-	"builtInBasicsExtensions": "程式語言",
-	"searchExtensions": "在 Marketplace 中搜尋擴充功能",
-	"sort by installs": "排序依據: 安裝計數",
-	"sort by rating": "排序依據: 評等",
-	"sort by name": "排序依據: 名稱",
-	"suggestProxyError": "Marketplace 傳回 'ECONNREFUSED'。請檢查 'http.proxy' 設定。",
-	"extensions": "擴充功能",
-	"outdatedExtensions": "{0} 過期的擴充功能",
-	"malicious warning": "我們已經解除安裝被回報有問題的 '{0}' 。",
-	"reloadNow": "立即重新載入"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/extensions/electron-browser/extensionsViews.i18n.json b/i18n/cht/src/vs/workbench/parts/extensions/electron-browser/extensionsViews.i18n.json
deleted file mode 100644
index 149cc655b63..00000000000
--- a/i18n/cht/src/vs/workbench/parts/extensions/electron-browser/extensionsViews.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"extensions": "延伸模組",
-	"no extensions found": "找不到延伸模組。",
-	"suggestProxyError": "Marketplace 傳回 'ECONNREFUSED'。請檢查 'http.proxy' 設定。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/extensions/electron-browser/keymapExtensions.i18n.json b/i18n/cht/src/vs/workbench/parts/extensions/electron-browser/keymapExtensions.i18n.json
deleted file mode 100644
index 49a87dcf222..00000000000
--- a/i18n/cht/src/vs/workbench/parts/extensions/electron-browser/keymapExtensions.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"disableOtherKeymapsConfirmation": "要停用其他按鍵對應，以避免按鍵繫結關係發生衝突嗎?",
-	"yes": "是",
-	"no": "否"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/extensions/electron-browser/runtimeExtensionsEditor.i18n.json b/i18n/cht/src/vs/workbench/parts/extensions/electron-browser/runtimeExtensionsEditor.i18n.json
deleted file mode 100644
index 1995569a03e..00000000000
--- a/i18n/cht/src/vs/workbench/parts/extensions/electron-browser/runtimeExtensionsEditor.i18n.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"starActivation": "在開始時啟動",
-	"workspaceContainsGlobActivation": "已啟動，因為與 {0} 相符的檔案存在您的工作區中",
-	"workspaceContainsFileActivation": "已啟動，因為檔案 {0} 存在您的工作區中",
-	"languageActivation": "已啟動，因為您打開了 {0} 檔案",
-	"workspaceGenericActivation": "已在 {0} 上啟動",
-	"errors": "{0} 未攔截錯誤",
-	"extensionsInputName": "正在執行擴充功能",
-	"showRuntimeExtensions": "顯示正在執行的擴充功能",
-	"reportExtensionIssue": "回報問題",
-	"extensionHostProfileStart": "啟動延伸主機設定檔",
-	"extensionHostProfileStop": "停止延伸主機設定檔",
-	"saveExtensionHostProfile": "儲存延伸主機設定檔"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.i18n.json b/i18n/cht/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.i18n.json
deleted file mode 100644
index 7a7722874fd..00000000000
--- a/i18n/cht/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.i18n.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"installingVSIXExtension": "從 VSIX 安裝擴充功能...",
-	"malicious": "這個延伸模組被回報是有問題的。",
-	"installingMarketPlaceExtension": "從市集安裝擴充功能...",
-	"uninstallingExtension": "解除安裝擴充功能...",
-	"enableDependeciesConfirmation": "啟用擴充功能也會啟用其相依項目，仍要繼續嗎?",
-	"enable": "是",
-	"doNotEnable": "否",
-	"disableDependeciesConfirmation": "您也要停用擴充功能的相依項目？",
-	"yes": "是",
-	"no": "否",
-	"cancel": "取消",
-	"singleDependentError": "無法停用延伸模組 '{0}'。'{1}' 延伸模組相依於此項。",
-	"twoDependentsError": "無法停用延伸模組 '{0}'。'{1}' 及 '{2}' 延伸模組相依於此項。",
-	"multipleDependentsError": "無法停用延伸模組 '{0}'。'{1}'、'{2}' 及其他延伸模組相依於此項。",
-	"installConfirmation": "您要安裝 '{0}' 延伸模組嗎?",
-	"install": "安裝"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json b/i18n/cht/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json
deleted file mode 100644
index f5a2db16545..00000000000
--- a/i18n/cht/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"workbenchConfigurationTitle": "工作台",
-	"feedbackVisibility": "控制工作台底部狀態列中的 Twitter 回饋 (笑臉) 的可見度。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/feedback/electron-browser/feedback.i18n.json b/i18n/cht/src/vs/workbench/parts/feedback/electron-browser/feedback.i18n.json
deleted file mode 100644
index e97ab971132..00000000000
--- a/i18n/cht/src/vs/workbench/parts/feedback/electron-browser/feedback.i18n.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"sendFeedback": "推文意見反應",
-	"label.sendASmile": "請將您的意見反應推文提供給我們。",
-	"patchedVersion1": "您的安裝已損毀。",
-	"patchedVersion2": "如果您要提交 Bug，請指定此項。",
-	"sentiment": "您的使用經驗如何?",
-	"smileCaption": "快樂",
-	"frownCaption": "傷心",
-	"other ways to contact us": "其他與我們連絡的方式",
-	"submit a bug": "提交 Bug",
-	"request a missing feature": "要求遺漏的功能",
-	"tell us why?": "請告訴我們原因",
-	"commentsHeader": "註解",
-	"showFeedback": "顯示狀態列中的回饋笑臉",
-	"tweet": "推文",
-	"character left": "剩餘字元",
-	"characters left": "剩餘字元",
-	"feedbackSending": "正在傳送",
-	"feedbackSent": "謝謝",
-	"feedbackSendingError": "請再試一次"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json b/i18n/cht/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json
deleted file mode 100644
index 570b71dc6f4..00000000000
--- a/i18n/cht/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hide": "隱藏"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/files/browser/editors/binaryFileEditor.i18n.json b/i18n/cht/src/vs/workbench/parts/files/browser/editors/binaryFileEditor.i18n.json
deleted file mode 100644
index 298fede185f..00000000000
--- a/i18n/cht/src/vs/workbench/parts/files/browser/editors/binaryFileEditor.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"binaryFileEditor": "二進位檔案檢視器"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/files/browser/editors/textFileEditor.i18n.json b/i18n/cht/src/vs/workbench/parts/files/browser/editors/textFileEditor.i18n.json
deleted file mode 100644
index e1655af8772..00000000000
--- a/i18n/cht/src/vs/workbench/parts/files/browser/editors/textFileEditor.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"textFileEditor": "文字檔編輯器",
-	"createFile": "建立檔案",
-	"relaunchWithIncreasedMemoryLimit": "以 {0} MB 重新啟動",
-	"configureMemoryLimit": "設定記憶體限制",
-	"fileEditorWithInputAriaLabel": "{0}。文字檔編輯器。",
-	"fileEditorAriaLabel": "文字檔編輯器。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/files/browser/explorerViewlet.i18n.json b/i18n/cht/src/vs/workbench/parts/files/browser/explorerViewlet.i18n.json
deleted file mode 100644
index 6b1bbe9a3d6..00000000000
--- a/i18n/cht/src/vs/workbench/parts/files/browser/explorerViewlet.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"folders": "資料夾"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/files/browser/fileActions.contribution.i18n.json b/i18n/cht/src/vs/workbench/parts/files/browser/fileActions.contribution.i18n.json
deleted file mode 100644
index 8edf8023225..00000000000
--- a/i18n/cht/src/vs/workbench/parts/files/browser/fileActions.contribution.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"filesCategory": "檔案",
-	"revealInSideBar": "在提要欄位中顯示",
-	"acceptLocalChanges": "使用您的變更並覆寫磁碟內容 ",
-	"revertLocalChanges": "捨棄您的變更並還原成磁碟上的內容"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/files/browser/fileActions.i18n.json b/i18n/cht/src/vs/workbench/parts/files/browser/fileActions.i18n.json
deleted file mode 100644
index c32641ccebc..00000000000
--- a/i18n/cht/src/vs/workbench/parts/files/browser/fileActions.i18n.json
+++ /dev/null
@@ -1,75 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"retry": "重試",
-	"rename": "重新命名",
-	"newFile": "新增檔案",
-	"newFolder": "新增資料夾",
-	"openFolderFirst": "先開啟資料夾，以在其中建立檔案或資料夾。",
-	"newUntitledFile": "新增未命名檔案",
-	"createNewFile": "新增檔案",
-	"createNewFolder": "新增資料夾",
-	"deleteButtonLabelRecycleBin": "移至資源回收筒(&&M)",
-	"deleteButtonLabelTrash": "移至垃圾筒(&&M)",
-	"deleteButtonLabel": "刪除(&&D)",
-	"dirtyMessageFolderOneDelete": "您要刪除的資料夾中 1 個檔案有未儲存的變更。要繼續嗎?",
-	"dirtyMessageFolderDelete": "您要刪除的資料夾中 {0} 個檔案有未儲存的變更。要繼續嗎?",
-	"dirtyMessageFileDelete": "您要刪除的檔案有未儲存的變更。要繼續嗎?",
-	"dirtyWarning": "如果您不儲存變更，這些變更將會遺失。",
-	"confirmMoveTrashMessageFolder": "您確定要刪除 '{0}' 及其內容嗎?",
-	"confirmMoveTrashMessageFile": "您確定要刪除 '{0}' 嗎?",
-	"undoBin": "您可以從資源回收筒還原。",
-	"undoTrash": "您可以從垃圾筒還原。",
-	"doNotAskAgain": "不要再詢問我",
-	"confirmDeleteMessageFolder": "您確定要永久刪除 '{0}' 和其中的內容嗎?",
-	"confirmDeleteMessageFile": "您確定要永久刪除 '{0}' 嗎?",
-	"irreversible": "此動作無法回復!",
-	"permDelete": "永久刪除",
-	"delete": "刪除",
-	"importFiles": "匯入檔案",
-	"confirmOverwrite": "目的資料夾中已有同名的檔案或資料夾。要取代它嗎?",
-	"replaceButtonLabel": "取代(&&R)",
-	"copyFile": "複製",
-	"pasteFile": "貼上",
-	"duplicateFile": "複製",
-	"openToSide": "開至側邊",
-	"compareSource": "選取用以比較",
-	"globalCompareFile": "使用中檔案的比較對象...",
-	"openFileToCompare": "先開啟檔案以與其他檔案進行比較",
-	"compareWith": "比較 '{0}' 與 '{1}'",
-	"compareFiles": "比較檔案",
-	"refresh": "重新整理",
-	"save": "儲存",
-	"saveAs": "另存新檔...",
-	"saveAll": "全部儲存",
-	"saveAllInGroup": "全部儲存在群組中",
-	"saveFiles": "儲存所有檔案",
-	"revert": "還原檔案",
-	"focusOpenEditors": "聚焦在 [開放式編輯器] 檢視",
-	"focusFilesExplorer": "將焦點設在檔案總管上",
-	"showInExplorer": "在提要欄位中顯示使用中的檔案",
-	"openFileToShow": "先開啟檔案，以在總管中加以顯示",
-	"collapseExplorerFolders": "摺疊 Explorer 中的資料夾",
-	"refreshExplorer": "重新整理 Explorer",
-	"openFileInNewWindow": "在新視窗中開啟使用中的檔案",
-	"openFileToShowInNewWindow": "先開啟檔案以在新視窗中開啟",
-	"revealInWindows": "在檔案總管中顯示",
-	"revealInMac": "在 Finder 中顯示",
-	"openContainer": "開啟收納資料夾",
-	"revealActiveFileInWindows": "在 Windows 檔案總管中顯示使用中的檔案",
-	"revealActiveFileInMac": "在 Finder 中顯示使用中的檔案",
-	"openActiveFileContainer": "開啟使用中檔案的收納資料夾",
-	"copyPath": "複製路徑",
-	"copyPathOfActive": "複製使用中檔案的路徑",
-	"emptyFileNameError": "必須提供檔案或資料夾名稱。",
-	"fileNameExistsError": "這個位置已存在檔案或資料夾 **{0}**。請選擇不同的名稱。",
-	"invalidFileNameError": "名稱 **{0}** 不能作為檔案或資料夾名稱。請選擇不同的名稱。",
-	"filePathTooLongError": "名稱 **{0}** 導致路徑太長。請選擇較短的名稱。",
-	"compareWithSaved": "比較使用中的檔案和已儲存的檔案",
-	"modifiedLabel": "{0} (在磁碟上) ↔ {1}",
-	"compareWithClipboard": "比較使用中的檔案和剪貼簿的檔案",
-	"clipboardComparisonLabel": "剪貼簿 ↔ {0}"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/files/browser/fileCommands.i18n.json b/i18n/cht/src/vs/workbench/parts/files/browser/fileCommands.i18n.json
deleted file mode 100644
index 75bdd951541..00000000000
--- a/i18n/cht/src/vs/workbench/parts/files/browser/fileCommands.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"openFileToCopy": "先開啟檔案以複製其路徑",
-	"openFileToReveal": "先開啟檔案以顯示"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/files/browser/files.contribution.i18n.json b/i18n/cht/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
deleted file mode 100644
index 867d603ca56..00000000000
--- a/i18n/cht/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
+++ /dev/null
@@ -1,53 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"showExplorerViewlet": "顯示檔案總管",
-	"explore": "檔案總管",
-	"view": "檢視",
-	"textFileEditor": "文字檔編輯器",
-	"binaryFileEditor": "二進位檔案編輯器",
-	"filesConfigurationTitle": "檔案",
-	"exclude": "設定 Glob 模式，以排除檔案及資料夾。例如，檔案總管會根據此項設定，判斷何種檔案和資料夾該顯示或隱藏。",
-	"files.exclude.boolean": "要符合檔案路徑的 Glob 模式。設為 True 或 False 可啟用或停用模式。",
-	"files.exclude.when": "在相符檔案同層級上額外的檢查。請使用 $(basename) 作為相符檔案名稱的變數。",
-	"associations": "將檔案關聯設定為語言 (例如 \"*.extension\": \"html\")。這些語言優先於已安裝語言的預設關聯。",
-	"encoding": "在讀取和寫入檔案時要使用的預設字元集編碼。此項設定也可根據每個語言加以設定。",
-	"autoGuessEncoding": "當啟用此功能時，會嘗試在開啟檔案時推測字元集編碼。此項設定也可根據每個語言加以設定。",
-	"eol": "預設結尾斷行字元.LF使用 \\n , CRLF使用\\r\\n  ",
-	"trimTrailingWhitespace": "若啟用，將在儲存檔案時修剪尾端空白。",
-	"insertFinalNewline": "啟用時，請在儲存檔案時在其結尾插入最後一個新行。",
-	"trimFinalNewlines": "若啟用，則會在儲存檔案時，修剪檔案末新行尾的所有新行。",
-	"files.autoSave.off": "已變更的檔案一律不會自動儲存。",
-	"files.autoSave.afterDelay": "已變更的檔案會在設定的 'files.autoSaveDelay' 之後自動儲存。",
-	"files.autoSave.onFocusChange": "已變更的檔案會在編輯器失去焦點時自動儲存。",
-	"files.autoSave.onWindowChange": "已變更的檔案會在視窗失去焦點時自動儲存。",
-	"autoSave": "控制已變更之檔案的自動儲存。接受的值: '{0}'、'{1}、'{2}' (編輯器失去焦點)、'{3}' (視窗失去焦點)。若設為 '{4}'，可以在 \"files.autoSaveDelay\" 中設定延遲。",
-	"autoSaveDelay": "控制要自動儲存已變更之檔案前必須經過的延遲時間 (毫秒)。僅當 'files.autoSave' 設為 \"{0}\" 時才適用。",
-	"watcherExclude": "設定檔案路徑的 Glob 模式已將其自檔案監看排除。模式必須符合絕對路徑 (例如使用 ** 或完整路徑前置詞以正確相符)。必須先重新開機才能變更這項設定。若是發生 Code 在啟動時取用大量 CPU 時間的情況，可以排除較大的資料夾以降低起始負載。",
-	"hotExit.off": "停用 Hot Exit。",
-	"hotExit.onExit": "Hot Exit 將會在關閉應用程式時觸發，也就是在 Windows/Linux 上關閉上一個視窗，或是觸發 workbench.action.quit 命令 (命令選擇區、按鍵繫結關係、功能表) 時觸發。具有備份的所有視窗都會在下次啟動時還原。",
-	"hotExit.onExitAndWindowClose": "當應用程式關閉時會觸發 Hot Exit，也就是說，當在 Windows/Linux 上關閉最後一個視窗，或是觸發 workbench.action.quit 命令 (命令選擇區、按鍵繫結關係及功能表) 時會觸發，同時也針對所有開啟資料夾的視窗，不論其是否為最後一個視窗也會觸發。下次啟動時會還原所有未開啟資料夾的視窗。若要將資料夾視窗還原到關機前的狀態，請將 \"window.restoreWindows\" 設定為 \"all\"。",
-	"hotExit": "控制是否讓不同工作階段記住未儲存的檔案，並允許在結束編輯器時跳過儲存提示。",
-	"useExperimentalFileWatcher": "使用新的實驗性檔案監看員。",
-	"defaultLanguage": "指派給新檔案的預設語言模式。",
-	"editorConfigurationTitle": "編輯器",
-	"formatOnSave": "在儲存時設定檔案格式。格式器必須處於可用狀態、檔案不得自動儲存，且編輯器不得關機。",
-	"explorerConfigurationTitle": "檔案總管",
-	"openEditorsVisible": "[開放式編輯器] 窗格中顯示的編輯器數目。將其設定為 0 以隱藏窗格。",
-	"dynamicHeight": "控制 [開放式編輯器] 區段的高度是否應依元素數目動態調整。",
-	"autoReveal": "控制總管是否在開啟檔案時自動加以顯示及選取。",
-	"enableDragAndDrop": "控制總管是否應該允許透過拖放功能移動檔案和資料夾。",
-	"confirmDragAndDrop": "控制總管是否須要求確認，以透過拖放來移動檔案和資料夾。",
-	"confirmDelete": "控制總管是否須在透過垃圾桶刪除檔案時要求確認。",
-	"sortOrder.default": "檔案與資料夾會依照名稱以字母順序排序。資料夾會顯示在檔案前。",
-	"sortOrder.mixed": "檔案與資料夾會依照名稱以字母順序排序。檔案與資料夾會交錯排列。",
-	"sortOrder.filesFirst": "檔案與資料夾會依照名稱以字母順序排序。檔案會顯示在資料夾前。",
-	"sortOrder.type": "檔案與資料夾會依照延伸模組以字母順序排序。資料夾會顯示在檔案前。",
-	"sortOrder.modified": "檔案與資料夾會依照最後修改日期以字母順序排序。資料夾會顯示在檔案前。",
-	"sortOrder": "控制檔案與資料夾在總管中的排列順序。除了預設排序外，您也可以將順序設定為 'mixed' (檔案與資料夾)、'type' (依檔案類型)、'modified' (依最後修改日期) 或 'filesFirst' (將檔案排序在資料夾前)。",
-	"explorer.decorations.colors": "控制檔案裝飾是否須使用色彩。",
-	"explorer.decorations.badges": "控制檔案裝飾是否須使用徽章。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/files/browser/saveErrorHandler.i18n.json b/i18n/cht/src/vs/workbench/parts/files/browser/saveErrorHandler.i18n.json
deleted file mode 100644
index 7a6f0b075f7..00000000000
--- a/i18n/cht/src/vs/workbench/parts/files/browser/saveErrorHandler.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"userGuide": "在右方使用編輯器工具列中的動作來 **復原** 您的變更，或以您的變更 **覆寫** 磁碟上的內容",
-	"discard": "捨棄",
-	"overwrite": "覆寫",
-	"retry": "重試",
-	"readonlySaveError": "無法儲存 '{0}': 檔案有防寫保護。請選取 [覆寫] 以移除保護。",
-	"genericSaveError": "無法儲存 '{0}': {1}",
-	"staleSaveError": "無法儲存 '{0}': 磁碟上的內容較新。請按一下 [比較]，比較您的版本與磁碟上的版本。",
-	"compareChanges": "比較",
-	"saveConflictDiffLabel": "{0} (位於磁碟) ↔ {1} (在 {2} 中) - 解決儲存衝突"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/files/browser/views/emptyView.i18n.json b/i18n/cht/src/vs/workbench/parts/files/browser/views/emptyView.i18n.json
deleted file mode 100644
index 39ac1f09ad1..00000000000
--- a/i18n/cht/src/vs/workbench/parts/files/browser/views/emptyView.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"noWorkspace": "沒有開啟的資料夾",
-	"explorerSection": "檔案總管區段",
-	"noWorkspaceHelp": "您尚未將資料夾新增至工作區。",
-	"addFolder": "新增資料夾",
-	"noFolderHelp": "您尚未開啟資料夾。",
-	"openFolder": "開啟資料夾"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/files/browser/views/explorerDecorationsProvider.i18n.json b/i18n/cht/src/vs/workbench/parts/files/browser/views/explorerDecorationsProvider.i18n.json
deleted file mode 100644
index a90bd78ed07..00000000000
--- a/i18n/cht/src/vs/workbench/parts/files/browser/views/explorerDecorationsProvider.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"label": "檔案總管",
-	"canNotResolve": "無法解析工作區資料夾"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/files/browser/views/explorerView.i18n.json b/i18n/cht/src/vs/workbench/parts/files/browser/views/explorerView.i18n.json
deleted file mode 100644
index 9b7a2b36138..00000000000
--- a/i18n/cht/src/vs/workbench/parts/files/browser/views/explorerView.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"explorerSection": "檔案總管區段",
-	"treeAriaLabel": "檔案總管"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/files/browser/views/explorerViewer.i18n.json b/i18n/cht/src/vs/workbench/parts/files/browser/views/explorerViewer.i18n.json
deleted file mode 100644
index bc42ca6193f..00000000000
--- a/i18n/cht/src/vs/workbench/parts/files/browser/views/explorerViewer.i18n.json
+++ /dev/null
@@ -1,19 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"fileInputAriaLabel": "輸入檔案名稱。請按 Enter 鍵確認或按 Esc 鍵取消。",
-	"filesExplorerViewerAriaLabel": "{0}，檔案總管",
-	"dropFolders": "要在工作區新增資料夾嗎?",
-	"dropFolder": "要在工作區新增資料夾嗎?",
-	"addFolders": "新增資料夾(&A)",
-	"addFolder": "新增資料夾(&A)",
-	"confirmMove": "確定要移動 '{0}' 嗎?",
-	"doNotAskAgain": "不要再詢問我",
-	"moveButtonLabel": "移動(&&M)",
-	"confirmOverwriteMessage": "目的資料夾中已存在 '{0}'。要取代它嗎?",
-	"irreversible": "此動作無法回復!",
-	"replaceButtonLabel": "取代(&&R)"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/files/browser/views/openEditorsView.i18n.json b/i18n/cht/src/vs/workbench/parts/files/browser/views/openEditorsView.i18n.json
deleted file mode 100644
index 4279cc7e911..00000000000
--- a/i18n/cht/src/vs/workbench/parts/files/browser/views/openEditorsView.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"openEditors": "已開啟的編輯器",
-	"openEditosrSection": "開放式編輯器區段",
-	"treeAriaLabel": "開啟的編輯器: 使用中檔案的清單",
-	"dirtyCounter": "{0} 未儲存"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/files/browser/views/openEditorsViewer.i18n.json b/i18n/cht/src/vs/workbench/parts/files/browser/views/openEditorsViewer.i18n.json
deleted file mode 100644
index f93f9a1f277..00000000000
--- a/i18n/cht/src/vs/workbench/parts/files/browser/views/openEditorsViewer.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"editorGroupAriaLabel": "{0}，編輯器群組",
-	"openEditorAriaLabel": "{0}，開啟編輯器",
-	"saveAll": "全部儲存",
-	"closeAllUnmodified": "關閉未變更的檔案",
-	"closeAll": "全部關閉",
-	"compareWithSaved": "與已儲存的檔案比較",
-	"close": "關閉",
-	"closeOthers": "關閉其他"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/files/common/dirtyFilesTracker.i18n.json b/i18n/cht/src/vs/workbench/parts/files/common/dirtyFilesTracker.i18n.json
deleted file mode 100644
index 89450055273..00000000000
--- a/i18n/cht/src/vs/workbench/parts/files/common/dirtyFilesTracker.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"dirtyFile": "1 個未儲存的檔案",
-	"dirtyFiles": "{0} 個未儲存的檔案"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/files/common/editors/fileEditorInput.i18n.json b/i18n/cht/src/vs/workbench/parts/files/common/editors/fileEditorInput.i18n.json
deleted file mode 100644
index a6f396bbe8c..00000000000
--- a/i18n/cht/src/vs/workbench/parts/files/common/editors/fileEditorInput.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"orphanedFile": "{0} (deleted from disk)"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/files/electron-browser/explorerViewlet.i18n.json b/i18n/cht/src/vs/workbench/parts/files/electron-browser/explorerViewlet.i18n.json
deleted file mode 100644
index c8becf86248..00000000000
--- a/i18n/cht/src/vs/workbench/parts/files/electron-browser/explorerViewlet.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"folders": "資料夾"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json b/i18n/cht/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
deleted file mode 100644
index 7db983f67d1..00000000000
--- a/i18n/cht/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"filesCategory": "檔案",
-	"revealInSideBar": "在提要欄位中顯示",
-	"acceptLocalChanges": "使用您的變更並覆寫磁碟內容 ",
-	"revertLocalChanges": "捨棄您的變更並還原成磁碟上的內容",
-	"copyPathOfActive": "複製使用中檔案的路徑",
-	"saveAllInGroup": "全部儲存在群組中",
-	"saveFiles": "儲存所有檔案",
-	"revert": "還原檔案",
-	"compareActiveWithSaved": "比較使用中的檔案和已儲存的檔案",
-	"closeEditor": "關閉編輯器",
-	"view": "檢視",
-	"openToSide": "開至側邊",
-	"revealInWindows": "在檔案總管中顯示",
-	"revealInMac": "在 Finder 中顯示",
-	"openContainer": "開啟收納資料夾",
-	"copyPath": "複製路徑",
-	"saveAll": "全部儲存",
-	"compareWithSaved": "與已儲存的檔案比較",
-	"compareWithSelected": "與選取的比較",
-	"compareSource": "選取用以比較",
-	"compareSelected": "比較已選取",
-	"close": "關閉",
-	"closeOthers": "關閉其他",
-	"closeSaved": "關閉已儲存項目",
-	"closeAll": "全部關閉",
-	"deleteFile": "永久刪除"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json b/i18n/cht/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
deleted file mode 100644
index 17eb85d0cba..00000000000
--- a/i18n/cht/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
+++ /dev/null
@@ -1,72 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"newFile": "新增檔案",
-	"newFolder": "新增資料夾",
-	"rename": "重新命名",
-	"delete": "刪除",
-	"copyFile": "複製",
-	"pasteFile": "貼上",
-	"retry": "重試",
-	"renameWhenSourcePathIsParentOfTargetError": "請使用 'New Folder' 或 'New File' 命令將子系新增至現有的資料夾",
-	"newUntitledFile": "新增未命名檔案",
-	"createNewFile": "新增檔案",
-	"createNewFolder": "新增資料夾",
-	"deleteButtonLabelRecycleBin": "移至資源回收筒(&&M)",
-	"deleteButtonLabelTrash": "移至垃圾筒(&&M)",
-	"deleteButtonLabel": "刪除(&&D)",
-	"dirtyMessageFilesDelete": "您要刪除的檔案有未儲存的變更。要繼續嗎?",
-	"dirtyMessageFolderOneDelete": "您要刪除的資料夾中 1 個檔案有未儲存的變更。要繼續嗎?",
-	"dirtyMessageFolderDelete": "您要刪除的資料夾中 {0} 個檔案有未儲存的變更。要繼續嗎?",
-	"dirtyMessageFileDelete": "您要刪除的檔案有未儲存的變更。要繼續嗎?",
-	"dirtyWarning": "如果您不儲存變更，這些變更將會遺失。",
-	"undoBin": "您可以從資源回收筒還原。",
-	"undoTrash": "您可以從垃圾筒還原。",
-	"doNotAskAgain": "不要再詢問我",
-	"irreversible": "此動作無法回復!",
-	"binFailed": "無法使用資源回收筒刪除。您要改為永久刪除嗎？ ",
-	"trashFailed": "無法使用垃圾筒刪除。您要改為永久刪除嗎？",
-	"deletePermanentlyButtonLabel": "永久刪除(&&D)",
-	"retryButtonLabel": "重試(&&R)",
-	"confirmMoveTrashMessageFilesAndDirectories": "確定要刪除下列 {0} 個檔案/目錄及其內容嗎?",
-	"confirmMoveTrashMessageMultipleDirectories": "確定要刪除下列 {0} 個目錄及其內容嗎?",
-	"confirmMoveTrashMessageMultiple": "確定要刪除以下 {0} 個檔案嗎？",
-	"confirmMoveTrashMessageFolder": "您確定要刪除 '{0}' 及其內容嗎?",
-	"confirmMoveTrashMessageFile": "您確定要刪除 '{0}' 嗎?",
-	"confirmDeleteMessageFilesAndDirectories": "確定要永久刪除下列 {0} 個檔案/目錄及其內容嗎?",
-	"confirmDeleteMessageMultipleDirectories": "確定要永久刪除下列 {0} 個目錄及其內容嗎?",
-	"confirmDeleteMessageMultiple": "確定要永久地刪除以下 {0} 個檔案嗎？",
-	"confirmDeleteMessageFolder": "您確定要永久刪除 '{0}' 和其中的內容嗎?",
-	"confirmDeleteMessageFile": "您確定要永久刪除 '{0}' 嗎?",
-	"addFiles": "新增檔案",
-	"confirmOverwrite": "目的資料夾中已有同名的檔案或資料夾。要取代它嗎?",
-	"replaceButtonLabel": "取代(&&R)",
-	"fileIsAncestor": "要貼上的檔案是在目地資料夾的上層 ",
-	"fileDeleted": "要貼上的檔案被刪除或移動",
-	"duplicateFile": "複製",
-	"globalCompareFile": "使用中檔案的比較對象...",
-	"openFileToCompare": "先開啟檔案以與其他檔案進行比較",
-	"refresh": "重新整理",
-	"saveAllInGroup": "全部儲存在群組中",
-	"focusOpenEditors": "聚焦在 [開放式編輯器] 檢視",
-	"focusFilesExplorer": "將焦點設在檔案總管上",
-	"showInExplorer": "在提要欄位中顯示使用中的檔案",
-	"openFileToShow": "先開啟檔案，以在總管中加以顯示",
-	"collapseExplorerFolders": "摺疊 Explorer 中的資料夾",
-	"refreshExplorer": "重新整理 Explorer",
-	"openFileInNewWindow": "在新視窗中開啟使用中的檔案",
-	"openFileToShowInNewWindow": "先開啟檔案以在新視窗中開啟",
-	"copyPath": "複製路徑",
-	"emptyFileNameError": "必須提供檔案或資料夾名稱。",
-	"fileNameStartsWithSlashError": "檔案或資料夾名稱不得以斜線開頭。",
-	"fileNameExistsError": "這個位置已存在檔案或資料夾 **{0}**。請選擇不同的名稱。",
-	"invalidFileNameError": "名稱 **{0}** 不能作為檔案或資料夾名稱。請選擇不同的名稱。",
-	"filePathTooLongError": "名稱 **{0}** 導致路徑太長。請選擇較短的名稱。",
-	"compareWithClipboard": "比較使用中的檔案和剪貼簿的檔案",
-	"clipboardComparisonLabel": "剪貼簿 ↔ {0}"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json b/i18n/cht/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
deleted file mode 100644
index 4f037a10904..00000000000
--- a/i18n/cht/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"revealInWindows": "在檔案總管中顯示",
-	"revealInMac": "在 Finder 中顯示",
-	"openContainer": "開啟收納資料夾",
-	"saveAs": "另存新檔...",
-	"save": "儲存",
-	"saveAll": "全部儲存",
-	"removeFolderFromWorkspace": "將資料夾從工作區移除",
-	"genericRevertError": "無法還原 '{0}': {1}",
-	"modifiedLabel": "{0} (在磁碟上) ↔ {1}",
-	"openFileToReveal": "先開啟檔案以顯示",
-	"openFileToCopy": "先開啟檔案以複製其路徑"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json b/i18n/cht/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
deleted file mode 100644
index be3fbea1a57..00000000000
--- a/i18n/cht/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"showExplorerViewlet": "顯示檔案總管",
-	"explore": "檔案總管",
-	"view": "檢視",
-	"textFileEditor": "文字檔編輯器",
-	"binaryFileEditor": "二進位檔案編輯器",
-	"filesConfigurationTitle": "檔案",
-	"exclude": "設定 Glob 模式，以排除檔案及資料夾。例如，檔案總管會根據此項設定，判斷何種檔案和資料夾該顯示或隱藏。",
-	"files.exclude.boolean": "要符合檔案路徑的 Glob 模式。設為 True 或 False 可啟用或停用模式。",
-	"files.exclude.when": "在相符檔案同層級上額外的檢查。請使用 $(basename) 作為相符檔案名稱的變數。",
-	"associations": "將檔案關聯設定為語言 (例如 \"*.extension\": \"html\")。這些語言優先於已安裝語言的預設關聯。",
-	"encoding": "在讀取和寫入檔案時要使用的預設字元集編碼。此項設定也可根據每個語言加以設定。",
-	"autoGuessEncoding": "當啟用此功能時，會嘗試在開啟檔案時推測字元集編碼。此項設定也可根據每個語言加以設定。",
-	"eol": "預設結尾斷行字元.LF使用 \\n , CRLF使用\\r\\n  ",
-	"trimTrailingWhitespace": "若啟用，將在儲存檔案時修剪尾端空白。",
-	"insertFinalNewline": "啟用時，請在儲存檔案時在其結尾插入最後一個新行。",
-	"trimFinalNewlines": "若啟用，則會在儲存檔案時，修剪檔案末新行尾的所有新行。",
-	"files.autoSave.off": "已變更的檔案一律不會自動儲存。",
-	"files.autoSave.afterDelay": "已變更的檔案會在設定的 'files.autoSaveDelay' 之後自動儲存。",
-	"files.autoSave.onFocusChange": "已變更的檔案會在編輯器失去焦點時自動儲存。",
-	"files.autoSave.onWindowChange": "已變更的檔案會在視窗失去焦點時自動儲存。",
-	"autoSave": "控制已變更之檔案的自動儲存。接受的值: '{0}'、'{1}、'{2}' (編輯器失去焦點)、'{3}' (視窗失去焦點)。若設為 '{4}'，可以在 \"files.autoSaveDelay\" 中設定延遲。",
-	"autoSaveDelay": "控制要自動儲存已變更之檔案前必須經過的延遲時間 (毫秒)。僅當 'files.autoSave' 設為 \"{0}\" 時才適用。",
-	"watcherExclude": "設定檔案路徑的 Glob 模式已將其自檔案監看排除。模式必須符合絕對路徑 (例如使用 ** 或完整路徑前置詞以正確相符)。必須先重新開機才能變更這項設定。若是發生 Code 在啟動時取用大量 CPU 時間的情況，可以排除較大的資料夾以降低起始負載。",
-	"hotExit.off": "停用 Hot Exit。",
-	"hotExit.onExit": "Hot Exit 將會在關閉應用程式時觸發，也就是在 Windows/Linux 上關閉上一個視窗，或是觸發 workbench.action.quit 命令 (命令選擇區、按鍵繫結關係、功能表) 時觸發。具有備份的所有視窗都會在下次啟動時還原。",
-	"hotExit.onExitAndWindowClose": "當應用程式關閉時會觸發 Hot Exit，也就是說，當在 Windows/Linux 上關閉最後一個視窗，或是觸發 workbench.action.quit 命令 (命令選擇區、按鍵繫結關係及功能表) 時會觸發，同時也針對所有開啟資料夾的視窗，不論其是否為最後一個視窗也會觸發。下次啟動時會還原所有未開啟資料夾的視窗。若要將資料夾視窗還原到關機前的狀態，請將 \"window.restoreWindows\" 設定為 \"all\"。",
-	"hotExit": "控制是否讓不同工作階段記住未儲存的檔案，並允許在結束編輯器時跳過儲存提示。",
-	"useExperimentalFileWatcher": "使用新的實驗性檔案監看員。",
-	"defaultLanguage": "指派給新檔案的預設語言模式。",
-	"maxMemoryForLargeFilesMB": "控制 VS Code 在重新啟動後常是開啟大型檔案時，可使用多少記憶體。在命令列上指定 --max-memory=NEWSIZE 也能達到相同效果。",
-	"editorConfigurationTitle": "編輯器",
-	"formatOnSave": "在儲存時設定檔案格式。格式器必須處於可用狀態、檔案不得自動儲存，且編輯器不得關機。",
-	"formatOnSaveTimeout": "儲存時格式化超時。指定 formatOnSave 命令的時間限制 (以毫秒為單位)。超過指定超時時間的命令將被取消。",
-	"explorerConfigurationTitle": "檔案總管",
-	"openEditorsVisible": "[開放式編輯器] 窗格中顯示的編輯器數目。",
-	"autoReveal": "控制總管是否在開啟檔案時自動加以顯示及選取。",
-	"enableDragAndDrop": "控制總管是否應該允許透過拖放功能移動檔案和資料夾。",
-	"confirmDragAndDrop": "控制總管是否須要求確認，以透過拖放來移動檔案和資料夾。",
-	"confirmDelete": "控制總管是否須在透過垃圾桶刪除檔案時要求確認。",
-	"sortOrder.default": "檔案與資料夾會依照名稱以字母順序排序。資料夾會顯示在檔案前。",
-	"sortOrder.mixed": "檔案與資料夾會依照名稱以字母順序排序。檔案與資料夾會交錯排列。",
-	"sortOrder.filesFirst": "檔案與資料夾會依照名稱以字母順序排序。檔案會顯示在資料夾前。",
-	"sortOrder.type": "檔案與資料夾會依照延伸模組以字母順序排序。資料夾會顯示在檔案前。",
-	"sortOrder.modified": "檔案與資料夾會依照最後修改日期以字母順序排序。資料夾會顯示在檔案前。",
-	"sortOrder": "控制檔案與資料夾在總管中的排列順序。除了預設排序外，您也可以將順序設定為 'mixed' (檔案與資料夾)、'type' (依檔案類型)、'modified' (依最後修改日期) 或 'filesFirst' (將檔案排序在資料夾前)。",
-	"explorer.decorations.colors": "控制檔案裝飾是否須使用色彩。",
-	"explorer.decorations.badges": "控制檔案裝飾是否須使用徽章。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json b/i18n/cht/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json
deleted file mode 100644
index eef73b3e6bc..00000000000
--- a/i18n/cht/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"userGuide": "使用編輯器工具列中的動作來復原您的變更，或以您的變更覆寫磁碟上的內容。",
-	"staleSaveError": "無法儲存 '{0}': 磁碟上的內容較新。請比較您的版本與磁碟上的版本。",
-	"retry": "重試",
-	"discard": "捨棄",
-	"readonlySaveErrorAdmin": "無法儲存 '{0}': 檔案有防寫保護。請選取 [以系統管理者身分覆寫] 來做為系統管理者身分重試。 ",
-	"readonlySaveError": "無法儲存 '{0}': 檔案有防寫保護。請選取 [覆寫] 以嚐試移除保護。 ",
-	"permissionDeniedSaveError": "無法儲存 '{0}': 權限不足。請選取 [以系統管理者身分重試] 做為系統管理者身分重試。 ",
-	"genericSaveError": "無法儲存 '{0}': {1}",
-	"learnMore": "深入了解",
-	"dontShowAgain": "不要再顯示",
-	"compareChanges": "比較",
-	"saveConflictDiffLabel": "{0} (位於磁碟) ↔ {1} (在 {2} 中) - 解決儲存衝突",
-	"overwriteElevated": "以系統管理者身分覆寫...",
-	"saveElevated": "以系統管理者身分重試",
-	"overwrite": "覆寫"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/files/electron-browser/views/emptyView.i18n.json b/i18n/cht/src/vs/workbench/parts/files/electron-browser/views/emptyView.i18n.json
deleted file mode 100644
index a7f4bbf560b..00000000000
--- a/i18n/cht/src/vs/workbench/parts/files/electron-browser/views/emptyView.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noWorkspace": "沒有開啟的資料夾",
-	"explorerSection": "檔案總管區段",
-	"noWorkspaceHelp": "您尚未將資料夾新增至工作區。",
-	"addFolder": "新增資料夾",
-	"noFolderHelp": "您尚未開啟資料夾。",
-	"openFolder": "開啟資料夾"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/files/electron-browser/views/explorerDecorationsProvider.i18n.json b/i18n/cht/src/vs/workbench/parts/files/electron-browser/views/explorerDecorationsProvider.i18n.json
deleted file mode 100644
index 9d4c22e5183..00000000000
--- a/i18n/cht/src/vs/workbench/parts/files/electron-browser/views/explorerDecorationsProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"label": "檔案總管",
-	"canNotResolve": "無法解析工作區資料夾",
-	"symbolicLlink": "符號鏈接"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/files/electron-browser/views/explorerView.i18n.json b/i18n/cht/src/vs/workbench/parts/files/electron-browser/views/explorerView.i18n.json
deleted file mode 100644
index 2a5a1e2c168..00000000000
--- a/i18n/cht/src/vs/workbench/parts/files/electron-browser/views/explorerView.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"explorerSection": "檔案總管區段",
-	"treeAriaLabel": "檔案總管"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json b/i18n/cht/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
deleted file mode 100644
index 7e6437084b5..00000000000
--- a/i18n/cht/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"fileInputAriaLabel": "輸入檔案名稱。請按 Enter 鍵確認或按 Esc 鍵取消。",
-	"createFileFromExplorerInfoMessage": "在 **{1}** 中建立檔案 **{0}**",
-	"renameFileFromExplorerInfoMessage": "移至 **{0}** 並重新命名",
-	"createFolderFromExplorerInfoMessage": "在 **{1}** 中建立資料夾 **{0}**",
-	"filesExplorerViewerAriaLabel": "{0}，檔案總管",
-	"dropFolders": "要在工作區新增資料夾嗎?",
-	"dropFolder": "要在工作區新增資料夾嗎?",
-	"addFolders": "新增資料夾(&A)",
-	"addFolder": "新增資料夾(&A)",
-	"confirmRootsMove": "您確定要變更工作區中多個根資料夾的順序嗎？",
-	"confirmMultiMove": "確定要移動以下 {0} 個文件嗎？",
-	"confirmRootMove": "您確定要變更工作區中根資料夾 '{0}' 的順序嗎？ ",
-	"confirmMove": "確定要移動 '{0}' 嗎?",
-	"doNotAskAgain": "不要再詢問我",
-	"moveButtonLabel": "移動(&&M)",
-	"confirmOverwriteMessage": "目的資料夾中已存在 '{0}'。要取代它嗎?",
-	"irreversible": "此動作無法回復!",
-	"replaceButtonLabel": "取代(&&R)"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json b/i18n/cht/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json
deleted file mode 100644
index 35ea5e6b125..00000000000
--- a/i18n/cht/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openEditors": "已開啟的編輯器",
-	"openEditosrSection": "開放式編輯器區段",
-	"dirtyCounter": "{0} 未儲存"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/files/electron-browser/views/openEditorsViewer.i18n.json b/i18n/cht/src/vs/workbench/parts/files/electron-browser/views/openEditorsViewer.i18n.json
deleted file mode 100644
index f93f9a1f277..00000000000
--- a/i18n/cht/src/vs/workbench/parts/files/electron-browser/views/openEditorsViewer.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"editorGroupAriaLabel": "{0}，編輯器群組",
-	"openEditorAriaLabel": "{0}，開啟編輯器",
-	"saveAll": "全部儲存",
-	"closeAllUnmodified": "關閉未變更的檔案",
-	"closeAll": "全部關閉",
-	"compareWithSaved": "與已儲存的檔案比較",
-	"close": "關閉",
-	"closeOthers": "關閉其他"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/git/browser/gitActions.contribution.i18n.json b/i18n/cht/src/vs/workbench/parts/git/browser/gitActions.contribution.i18n.json
deleted file mode 100644
index 6be41fd4063..00000000000
--- a/i18n/cht/src/vs/workbench/parts/git/browser/gitActions.contribution.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"switchToChangesView": "切換至變更檢視",
-	"openInEditor": "切換至編輯器檢視",
-	"workbenchStage": "分段",
-	"workbenchUnstage": "取消分段",
-	"stageSelectedLines": "將選取的行分段",
-	"unstageSelectedLines": "取消分段選取的資料行",
-	"revertSelectedLines": "還原選取的行",
-	"confirmRevertMessage": "確定要還原選取的變更嗎?",
-	"irreversible": "此動作無法回復!",
-	"revertChangesLabel": "還原變更(&&R)",
-	"openChange": "開啟變更",
-	"openFile": "開啟檔案",
-	"git": "Git"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/git/browser/gitActions.i18n.json b/i18n/cht/src/vs/workbench/parts/git/browser/gitActions.i18n.json
deleted file mode 100644
index 218e2f8471c..00000000000
--- a/i18n/cht/src/vs/workbench/parts/git/browser/gitActions.i18n.json
+++ /dev/null
@@ -1,46 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"openChange": "開啟變更",
-	"openFile": "開啟檔案",
-	"init": "Init",
-	"refresh": "重新整理",
-	"stageChanges": "分段",
-	"stageAllChanges": "全部分段",
-	"confirmUndoMessage": "確定要清除所有變更嗎?",
-	"confirmUndoAllOne": "{0} 個檔案中有取消暫存的變更。\n\n此動作無法回復!",
-	"confirmUndoAllMultiple": "{0} 個檔案中有取消暫存的變更。\n\n此動作無法回復!",
-	"cleanChangesLabel": "清除變更(&&C)",
-	"confirmUndo": "確定要清除 '{0}' 中的變更嗎?",
-	"irreversible": "此動作無法回復!",
-	"undoChanges": "清除",
-	"undoAllChanges": "全部清除",
-	"unstage": "取消分段",
-	"unstageAllChanges": "全部取消分段",
-	"dirtyTreeCheckout": "無法簽出。請先認可或隱藏您的工作。",
-	"commitStaged": "認可暫存",
-	"commitStagedAmend": "認可暫存 (修改)",
-	"commitStagedSignedOff": "認可暫存 (已登出)",
-	"commit": "Commit",
-	"commitMessage": "認可訊息",
-	"commitAll": "全部認可",
-	"commitAllSignedOff": "全部認可 (已登出)",
-	"commitAll2": "全部認可",
-	"commitStaged2": "認可暫存",
-	"dirtyTreePull": "無法提取。請先認可或隱藏您的工作。",
-	"authFailed": "Git 遠端的驗證失敗。",
-	"pushToRemote": "推送至...",
-	"pushToRemotePickMessage": "挑選遠端作為分支 '{0}' 的發送目標:",
-	"publish": "發行",
-	"confirmPublishMessage": "確定要將 '{0}' 發行至 '{1}' 嗎?",
-	"confirmPublishMessageButton": "發行(&&P)",
-	"publishPickMessage": "挑選要發行分支 '{0}' 的目標遠端:",
-	"sync is unpredictable": "此動作會將認可發送至 '{0}' 及從中提取認可。",
-	"ok": "確定",
-	"cancel": "取消",
-	"never again": "確定，不要再顯示",
-	"undoLastCommit": "復原上次認可"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/git/browser/gitQuickOpen.i18n.json b/i18n/cht/src/vs/workbench/parts/git/browser/gitQuickOpen.i18n.json
deleted file mode 100644
index 79e64cb8b44..00000000000
--- a/i18n/cht/src/vs/workbench/parts/git/browser/gitQuickOpen.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"refAriaLabel": "{0}，Git",
-	"checkoutBranch": "位於 {0} 的分支",
-	"checkoutRemoteBranch": "位於 {0} 的遠端分支",
-	"checkoutTag": "位於 {0} 的標記",
-	"alreadyCheckedOut": "分支 {0} 已是目前的分支",
-	"branchAriaLabel": "{0}，Git 分支",
-	"createBranch": "建立分支 {0}",
-	"noBranches": "沒有其他分支",
-	"notValidBranchName": "請提供有效的分支名稱"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/git/browser/gitServices.i18n.json b/i18n/cht/src/vs/workbench/parts/git/browser/gitServices.i18n.json
deleted file mode 100644
index 2fc5843d988..00000000000
--- a/i18n/cht/src/vs/workbench/parts/git/browser/gitServices.i18n.json
+++ /dev/null
@@ -1,30 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"cantOpen": "無法開啟這個 Git 資源。",
-	"gitIndexChanges": "{0} (index) ↔ {1}",
-	"gitIndexChangesDesc": "{0} - 索引上的變更",
-	"gitIndexChangesRenamed": "{0} ← {1}",
-	"gitIndexChangesRenamedDesc": "{0} - 已重新命名 - 索引上的變更",
-	"workingTreeChanges": "{0} (HEAD) ↔ {1}",
-	"workingTreeChangesDesc": "{0} - 工作樹狀上的變更",
-	"gitMergeChanges": "{0} (merge) ↔ {1}",
-	"gitMergeChangesDesc": "{0} - 合併變更",
-	"updateGit": "您似乎已經安裝 GIT {0}。Code 搭配 GIT >=2.0.0 的成效最佳。",
-	"download": "下載",
-	"neverShowAgain": "不要再顯示",
-	"configureUsernameEmail": "請設定您的 Git 使用者名稱及電子郵件。",
-	"badConfigFile": "Git {0}",
-	"unmergedChanges": "您在認可變更前應先解決未合併的變更。",
-	"showOutput": "顯示輸出",
-	"cancel": "取消",
-	"checkNativeConsole": "執行 Git 作業時發生問題。請檢閱輸出或使用主控台來查看儲存機制的狀態。",
-	"changesFromIndex": "{0} (index)",
-	"changesFromIndexDesc": "{0} - 索引上的變更",
-	"changesFromTree": "{0} ({1})",
-	"changesFromTreeDesc": "{0} - {1} 上的變更",
-	"cantOpenResource": "無法開啟這個 Git 資源。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/git/browser/gitWidgets.i18n.json b/i18n/cht/src/vs/workbench/parts/git/browser/gitWidgets.i18n.json
deleted file mode 100644
index 0f49293980b..00000000000
--- a/i18n/cht/src/vs/workbench/parts/git/browser/gitWidgets.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"publishBranch": "發行分支",
-	"syncBranch": "同步處理變更",
-	"gitNotEnabled": "此工作區中未啟用 Git。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/git/browser/gitWorkbenchContributions.i18n.json b/i18n/cht/src/vs/workbench/parts/git/browser/gitWorkbenchContributions.i18n.json
deleted file mode 100644
index dffab494e2c..00000000000
--- a/i18n/cht/src/vs/workbench/parts/git/browser/gitWorkbenchContributions.i18n.json
+++ /dev/null
@@ -1,23 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"gitProgressBadge": "正在執行 Git 狀態",
-	"gitPendingChangesBadge": "{0} 個暫止的變更",
-	"toggleGitViewlet": "顯示 Git",
-	"git": "Git",
-	"view": "檢視",
-	"gitCommands": "Git 命令",
-	"gitConfigurationTitle": "Git",
-	"gitEnabled": "已啟用 Git",
-	"gitPath": "Git 可執行檔的路徑",
-	"gitAutoRefresh": "是否啟用自動重新整理",
-	"gitAutoFetch": "是否啟用自動擷取。",
-	"gitLongCommit": "是否對長認可訊息發出警告。",
-	"gitLargeRepos": "一律允許 Code 管理大型儲存機制。",
-	"confirmSync": "請先確認再同步處理 GIT 存放庫。",
-	"countBadge": "控制 GIT 徽章計數器。",
-	"checkoutType": "控制要列出哪種類型的分支。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/git/browser/views/changes/changesView.i18n.json b/i18n/cht/src/vs/workbench/parts/git/browser/views/changes/changesView.i18n.json
deleted file mode 100644
index 2d997fe4fcb..00000000000
--- a/i18n/cht/src/vs/workbench/parts/git/browser/views/changes/changesView.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"needMessage": "請提供認可訊息。您可以隨時按下 **[{0}]** 來認可變更。如有任何已分段的變更，將只有那些分段的變更會獲得認可，否則，所有變更都會獲得認可。",
-	"nothingToCommit": "一旦有些變更要進行認可，請在認可訊息中輸入，或者按下 **[{0}]** 來認可變更。如有任何已分段的變更，將只有那些分段的變更會獲得認可，否則，所有變更都會獲得認可。",
-	"longCommit": "建議讓認可訊息的第一行文字少於 50 個字元。但您可在額外的資訊中使用多行文字。",
-	"commitMessage": "訊息 (按 {0} 認可)",
-	"commitMessageAriaLabel": "Git: 輸入認可訊息並按 {0} 認可",
-	"treeAriaLabel": "Git 變更檢視",
-	"showOutput": "顯示 Git 輸出"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/git/browser/views/changes/changesViewer.i18n.json b/i18n/cht/src/vs/workbench/parts/git/browser/views/changes/changesViewer.i18n.json
deleted file mode 100644
index 150ff5c82c4..00000000000
--- a/i18n/cht/src/vs/workbench/parts/git/browser/views/changes/changesViewer.i18n.json
+++ /dev/null
@@ -1,38 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"stagedChanges": "已分段的變更",
-	"allChanges": "變更",
-	"mergeChanges": "合併變更",
-	"outsideOfWorkspace": "此檔案位於目前的工作區外。",
-	"modified-char": "M",
-	"added-char": "A",
-	"deleted-char": "D",
-	"renamed-char": "R",
-	"copied-char": "C",
-	"untracked-char": "U",
-	"ignored-char": "!",
-	"title-index-modified": "已在索引中修改",
-	"title-modified": "已修改",
-	"title-index-added": "已新增至索引",
-	"title-index-deleted": "已在索引中刪除",
-	"title-deleted": "已刪除",
-	"title-index-renamed": "已在索引中重新命名",
-	"title-index-copied": "已在索引中複製",
-	"title-untracked": "已取消追蹤",
-	"title-ignored": "已忽略",
-	"title-conflict-both-deleted": "衝突: 兩者皆刪除",
-	"title-conflict-added-by-us": "衝突: 由我們新增",
-	"title-conflict-deleted-by-them": "衝突: 由他們刪除",
-	"title-conflict-added-by-them": "衝突: 由他們新增",
-	"title-conflict-deleted-by-us": "衝突: 由我們刪除",
-	"title-conflict-both-added": "衝突: 兩者皆新增",
-	"title-conflict-both-modified": "衝突: 兩者皆修改",
-	"fileStatusAriaLabel": "資料夾 {1} 中的檔案 {0} 具有狀態: {2}，Git",
-	"ariaLabelStagedChanges": "暫存的變更，Git",
-	"ariaLabelChanges": "變更，Git",
-	"ariaLabelMerge": "合併，Git"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/git/browser/views/disabled/disabledView.i18n.json b/i18n/cht/src/vs/workbench/parts/git/browser/views/disabled/disabledView.i18n.json
deleted file mode 100644
index d96b1bcb224..00000000000
--- a/i18n/cht/src/vs/workbench/parts/git/browser/views/disabled/disabledView.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"disabled": "已停用設定中的 Git。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/git/browser/views/empty/emptyView.i18n.json b/i18n/cht/src/vs/workbench/parts/git/browser/views/empty/emptyView.i18n.json
deleted file mode 100644
index fb8cb2a495c..00000000000
--- a/i18n/cht/src/vs/workbench/parts/git/browser/views/empty/emptyView.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"noGit": "此工作區尚未受 Git 原始檔控制。",
-	"gitinit": "將 Git 存放庫初始化"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/git/browser/views/gitless/gitlessView.i18n.json b/i18n/cht/src/vs/workbench/parts/git/browser/views/gitless/gitlessView.i18n.json
deleted file mode 100644
index 3f2d74b04f7..00000000000
--- a/i18n/cht/src/vs/workbench/parts/git/browser/views/gitless/gitlessView.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"macInstallWith": "您可以使用 {0} 進行安裝、從 {1} 下載，或直接在終端機提示時輸入 {3}，以安裝 {2} 命令列開發人員工具。",
-	"winInstallWith": "您可以使用 {0} 進行安裝或從 {1} 下載。",
-	"linuxDownloadFrom": "您可以從 {0} 下載。",
-	"downloadFrom": "您可以從 {0} 下載。",
-	"looksLike": "您的系統上似乎未安裝 Git。",
-	"pleaseRestart": "安裝 Git 之後，請重新啟動 VSCode。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/git/browser/views/huge/hugeView.i18n.json b/i18n/cht/src/vs/workbench/parts/git/browser/views/huge/hugeView.i18n.json
deleted file mode 100644
index a1a4c782629..00000000000
--- a/i18n/cht/src/vs/workbench/parts/git/browser/views/huge/hugeView.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"huge": "您的存放庫似乎有多個進行中的變更。\n會造成 Code 的速度非常緩慢。",
-	"setting": "您可以使用下列設定永久停用此警告:",
-	"allo": "允許大型存放庫"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/git/browser/views/notroot/notrootView.i18n.json b/i18n/cht/src/vs/workbench/parts/git/browser/views/notroot/notrootView.i18n.json
deleted file mode 100644
index 2c257f629c5..00000000000
--- a/i18n/cht/src/vs/workbench/parts/git/browser/views/notroot/notrootView.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"wrongRoot": "此目錄似乎包含在 Git 儲存機制中。",
-	"pleaseRestart": "開啟儲存機制的根目錄，以便存取 Git 功能。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/git/browser/views/noworkspace/noworkspaceView.i18n.json b/i18n/cht/src/vs/workbench/parts/git/browser/views/noworkspace/noworkspaceView.i18n.json
deleted file mode 100644
index 5157032079a..00000000000
--- a/i18n/cht/src/vs/workbench/parts/git/browser/views/noworkspace/noworkspaceView.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"noWorkspaceHelp": "您尚未開啟資料夾。",
-	"pleaseRestart": "以 Git 儲存機制開啟資料夾，以便存取 Git 功能。",
-	"openFolder": "開啟資料夾"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/git/electron-browser/git.contribution.i18n.json b/i18n/cht/src/vs/workbench/parts/git/electron-browser/git.contribution.i18n.json
deleted file mode 100644
index 24ddecb20c1..00000000000
--- a/i18n/cht/src/vs/workbench/parts/git/electron-browser/git.contribution.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"toggleSCMViewlet": "顯示 SCM",
-	"git": "Git"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/git/electron-browser/gitActions.i18n.json b/i18n/cht/src/vs/workbench/parts/git/electron-browser/gitActions.i18n.json
deleted file mode 100644
index f94784b77e2..00000000000
--- a/i18n/cht/src/vs/workbench/parts/git/electron-browser/gitActions.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"valid": "請提供有效的 Git 存放庫 URL",
-	"url": "存放庫 URL",
-	"directory": "目的地複製目錄",
-	"cloning": "正在複製存放庫 '{0}'...",
-	"already exists": "目的地存放庫已存在，請選擇另一個目錄作為複製目標。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/git/electron-main/askpassService.i18n.json b/i18n/cht/src/vs/workbench/parts/git/electron-main/askpassService.i18n.json
deleted file mode 100644
index 06ad0299d48..00000000000
--- a/i18n/cht/src/vs/workbench/parts/git/electron-main/askpassService.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"git": "Git"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/git/node/git.lib.i18n.json b/i18n/cht/src/vs/workbench/parts/git/node/git.lib.i18n.json
deleted file mode 100644
index 4c4883aa515..00000000000
--- a/i18n/cht/src/vs/workbench/parts/git/node/git.lib.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"errorBuffer": "無法從 git 開啟檔案",
-	"fileBinaryError": "檔案似乎是二進位檔，因此無法當做文字開啟"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/html/browser/html.contribution.i18n.json b/i18n/cht/src/vs/workbench/parts/html/browser/html.contribution.i18n.json
deleted file mode 100644
index b4173cd7e58..00000000000
--- a/i18n/cht/src/vs/workbench/parts/html/browser/html.contribution.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"html.editor.label": "HTML 預覽"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/html/browser/htmlPreviewPart.i18n.json b/i18n/cht/src/vs/workbench/parts/html/browser/htmlPreviewPart.i18n.json
deleted file mode 100644
index 99f3827f916..00000000000
--- a/i18n/cht/src/vs/workbench/parts/html/browser/htmlPreviewPart.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"html.voidInput": "編輯器輸入無效。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/html/browser/webview.contribution.i18n.json b/i18n/cht/src/vs/workbench/parts/html/browser/webview.contribution.i18n.json
deleted file mode 100644
index 8e9c4235dcd..00000000000
--- a/i18n/cht/src/vs/workbench/parts/html/browser/webview.contribution.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"developer": "開發人員"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/html/browser/webview.i18n.json b/i18n/cht/src/vs/workbench/parts/html/browser/webview.i18n.json
deleted file mode 100644
index b9d72346c44..00000000000
--- a/i18n/cht/src/vs/workbench/parts/html/browser/webview.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"devtools.webview": "開發人員: Webview 工具"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/html/browser/webviewCommands.i18n.json b/i18n/cht/src/vs/workbench/parts/html/browser/webviewCommands.i18n.json
deleted file mode 100644
index 5efe5cd3261..00000000000
--- a/i18n/cht/src/vs/workbench/parts/html/browser/webviewCommands.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"editor.action.webvieweditor.showFind": "焦點尋找小工具",
-	"openToolsLabel": "開啟 Webview Developer 工具",
-	"refreshWebviewLabel": "重新載入 Webviews"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json b/i18n/cht/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json
deleted file mode 100644
index b4173cd7e58..00000000000
--- a/i18n/cht/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"html.editor.label": "HTML 預覽"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json b/i18n/cht/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json
deleted file mode 100644
index 99f3827f916..00000000000
--- a/i18n/cht/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"html.voidInput": "編輯器輸入無效。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json b/i18n/cht/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json
deleted file mode 100644
index 8e9c4235dcd..00000000000
--- a/i18n/cht/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"developer": "開發人員"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json b/i18n/cht/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json
deleted file mode 100644
index da7857bbdcf..00000000000
--- a/i18n/cht/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openToolsLabel": "開啟 Webview Developer 工具",
-	"refreshWebviewLabel": "重新載入 Webviews"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json b/i18n/cht/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
deleted file mode 100644
index 42320096aec..00000000000
--- a/i18n/cht/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"updateLocale": "您想要變更 VS Code 的 UI 語言為 {0} 並重新啟動嗎?",
-	"yes": "是",
-	"no": "否",
-	"neverAgain": "不要再顯示",
-	"JsonSchema.locale": "要使用的 UI 語言。",
-	"vscode.extension.contributes.localizations": "提供在地化服務給編輯者",
-	"vscode.extension.contributes.localizations.languageId": "顯示已翻譯字串的語言 Id",
-	"vscode.extension.contributes.localizations.languageName": "語言名稱 (英文)。",
-	"vscode.extension.contributes.localizations.languageNameLocalized": "語言名稱 (提供的語言)。",
-	"vscode.extension.contributes.localizations.translations": "與該語言相關的翻譯列表。",
-	"vscode.extension.contributes.localizations.translations.id": "此翻譯提供之目標的 VS Code 或延伸模組識別碼。VS Code 的識別碼一律為 `vscode`，且延伸模組的格式應為 `publisherId.extensionName`。",
-	"vscode.extension.contributes.localizations.translations.id.pattern": "轉譯 VS 程式碼或延伸模組時，識別碼應分別使用 `vscode` 或 `publisherId.extensionName` 的格式。",
-	"vscode.extension.contributes.localizations.translations.path": "包含語言翻譯的檔案相對路徑。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/localizations/browser/localizationsActions.i18n.json b/i18n/cht/src/vs/workbench/parts/localizations/browser/localizationsActions.i18n.json
deleted file mode 100644
index a5e6bfeb6f1..00000000000
--- a/i18n/cht/src/vs/workbench/parts/localizations/browser/localizationsActions.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"configureLocale": "設定語言",
-	"displayLanguage": "定義 VSCode 的顯示語言。",
-	"doc": "如需支援的語言清單，請參閱 {0}。",
-	"restart": "改變設定值後需要重新啟動 VSCode.",
-	"fail.createSettings": "無法建立 '{0}' ({1})。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/localizations/electron-browser/localizations.contribution.i18n.json b/i18n/cht/src/vs/workbench/parts/localizations/electron-browser/localizations.contribution.i18n.json
deleted file mode 100644
index 3eecc274cd4..00000000000
--- a/i18n/cht/src/vs/workbench/parts/localizations/electron-browser/localizations.contribution.i18n.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"updateLocale": "您想要變更 VS Code 的 UI 語言為 {0} 並重新啟動嗎?",
-	"activateLanguagePack": "您是否要重新啟動 VS Coode 以啟動剛剛安裝的語套件?",
-	"yes": "是",
-	"no": "否",
-	"neverAgain": "不要再顯示",
-	"install language pack": "在不久之後，VS Code 將只支援格式為 Marketplace 延伸模組的語言套件。請安裝 '{0}' 延伸模組以繼續使用目前設定的語言。",
-	"install": "安裝",
-	"more information": "詳細資訊...",
-	"JsonSchema.locale": "要使用的 UI 語言。",
-	"vscode.extension.contributes.localizations": "提供在地化服務給編輯者",
-	"vscode.extension.contributes.localizations.languageId": "顯示已翻譯字串的語言 Id",
-	"vscode.extension.contributes.localizations.languageName": "語言名稱 (英文)。",
-	"vscode.extension.contributes.localizations.languageNameLocalized": "語言名稱 (提供的語言)。",
-	"vscode.extension.contributes.localizations.translations": "與該語言相關的翻譯列表。",
-	"vscode.extension.contributes.localizations.translations.id": "此翻譯提供之目標的 VS Code 或延伸模組識別碼。VS Code 的識別碼一律為 `vscode`，且延伸模組的格式應為 `publisherId.extensionName`。",
-	"vscode.extension.contributes.localizations.translations.id.pattern": "轉譯 VS 程式碼或延伸模組時，識別碼應分別使用 `vscode` 或 `publisherId.extensionName` 的格式。",
-	"vscode.extension.contributes.localizations.translations.path": "包含語言翻譯的檔案相對路徑。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/localizations/electron-browser/localizationsActions.i18n.json b/i18n/cht/src/vs/workbench/parts/localizations/electron-browser/localizationsActions.i18n.json
deleted file mode 100644
index ce8ab888f1f..00000000000
--- a/i18n/cht/src/vs/workbench/parts/localizations/electron-browser/localizationsActions.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"configureLocale": "設定顯示語言",
-	"displayLanguage": "定義 VSCode 的顯示語言。",
-	"doc": "如需支援的語言清單，請參閱 {0}。",
-	"restart": "改變設定值後需要重新啟動 VSCode.",
-	"fail.createSettings": "無法建立 '{0}' ({1})。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json b/i18n/cht/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json
deleted file mode 100644
index 6437a50222a..00000000000
--- a/i18n/cht/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"mainLog": "紀錄 (主要) ",
-	"sharedLog": "紀錄 (共享) ",
-	"rendererLog": "紀錄 (視窗)",
-	"extensionsLog": "紀錄 (延伸主機) ",
-	"developer": "開發人員"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json b/i18n/cht/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json
deleted file mode 100644
index 5ba4662a596..00000000000
--- a/i18n/cht/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openLogsFolder": "開啟紀錄資料夾",
-	"showLogs": "顯示紀錄...。",
-	"rendererProcess": "視窗 ({0})",
-	"emptyWindow": "視窗",
-	"extensionHost": "延伸主機",
-	"sharedProcess": "共享",
-	"mainProcess": "主要",
-	"selectProcess": "選取程序的記錄",
-	"openLogFile": "開啟紀錄檔案...",
-	"setLogLevel": "設定紀錄層級",
-	"trace": "追蹤",
-	"debug": "偵錯",
-	"info": "資訊",
-	"warn": "警告",
-	"err": "錯誤",
-	"critical": "嚴重",
-	"off": "關閉",
-	"selectLogLevel": "選擇紀錄層級",
-	"default and current": "預設與目前",
-	"default": "預設",
-	"current": "目前"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/markers/browser/markersFileDecorations.i18n.json b/i18n/cht/src/vs/workbench/parts/markers/browser/markersFileDecorations.i18n.json
deleted file mode 100644
index 6a593deff2f..00000000000
--- a/i18n/cht/src/vs/workbench/parts/markers/browser/markersFileDecorations.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"label": "問題",
-	"tooltip.1": "此檔案發生 1 個問題",
-	"tooltip.N": "此檔案發生 {0} 個問題",
-	"markers.showOnFile": "在檔案和資料夾上顯示錯誤和警告。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/markers/browser/markersPanel.i18n.json b/i18n/cht/src/vs/workbench/parts/markers/browser/markersPanel.i18n.json
deleted file mode 100644
index 8e9b2618050..00000000000
--- a/i18n/cht/src/vs/workbench/parts/markers/browser/markersPanel.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"totalProblems": "共 {0} 項問題",
-	"filteredProblems": "顯示 {1} 的 {0} 問題"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/markers/common/markers.i18n.json b/i18n/cht/src/vs/workbench/parts/markers/common/markers.i18n.json
deleted file mode 100644
index 8e9b2618050..00000000000
--- a/i18n/cht/src/vs/workbench/parts/markers/common/markers.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"totalProblems": "共 {0} 項問題",
-	"filteredProblems": "顯示 {1} 的 {0} 問題"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/markers/common/messages.i18n.json b/i18n/cht/src/vs/workbench/parts/markers/common/messages.i18n.json
deleted file mode 100644
index 277304218a0..00000000000
--- a/i18n/cht/src/vs/workbench/parts/markers/common/messages.i18n.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"viewCategory": "檢視",
-	"problems.view.toggle.label": "切換至問題(錯誤, 警告, 資訊)",
-	"problems.view.focus.label": "聚焦於問題(錯誤, 警告, 資訊)",
-	"problems.panel.configuration.title": "[問題] 檢視",
-	"problems.panel.configuration.autoreveal": "控制 [問題] 檢視是否應自動在開啟檔案時加以顯示",
-	"markers.panel.title.problems": "問題",
-	"markers.panel.aria.label.problems.tree": "依檔案分組的問題",
-	"markers.panel.no.problems.build": "目前在工作區中未偵測到任何問題。",
-	"markers.panel.no.problems.filters": "使用提供的篩選準則找不到任何結果",
-	"markers.panel.action.filter": "篩選問題",
-	"markers.panel.filter.placeholder": "依類型或文字篩選",
-	"markers.panel.filter.errors": "錯誤",
-	"markers.panel.filter.warnings": "警告",
-	"markers.panel.filter.infos": "資訊",
-	"markers.panel.single.error.label": "1 個錯誤",
-	"markers.panel.multiple.errors.label": "{0} 個錯誤",
-	"markers.panel.single.warning.label": "1 個警告",
-	"markers.panel.multiple.warnings.label": "{0} 個警告",
-	"markers.panel.single.info.label": "1 個資訊",
-	"markers.panel.multiple.infos.label": "{0} 個資訊",
-	"markers.panel.single.unknown.label": "1 個未知",
-	"markers.panel.multiple.unknowns.label": "{0} 個未知",
-	"markers.panel.at.ln.col.number": "({0}, {1})",
-	"problems.tree.aria.label.resource": "發生 {1} 個問題的 {0}",
-	"problems.tree.aria.label.error.marker": "{0} 產生的錯誤: 在行 {2} 與字元 {3} 的 {1}",
-	"problems.tree.aria.label.error.marker.nosource": "錯誤: 在行 {1} 與字元 {2} 的 {0}",
-	"problems.tree.aria.label.warning.marker": "{0} 產生的警告: 在行 {2} 與字元 {3} 的 {1}",
-	"problems.tree.aria.label.warning.marker.nosource": "警告: 在行 {1} 與字元 {2} 的 {0}",
-	"problems.tree.aria.label.info.marker": "{0} 產生的資訊: 在行 {2} 與字元 {3} 的 {1}",
-	"problems.tree.aria.label.info.marker.nosource": "資訊: 在行 {1} 與字元 {2} 的 {0}",
-	"problems.tree.aria.label.marker": "{0} 產生的問題: 在行 {2} 與字元 {3} 的 {1}",
-	"problems.tree.aria.label.marker.nosource": "問題: 在行 {1} 與字元 {2} 的 {0}",
-	"errors.warnings.show.label": "顯示錯誤和警告"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json b/i18n/cht/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json
deleted file mode 100644
index 505303ab7e3..00000000000
--- a/i18n/cht/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"copyMarker": "複製",
-	"copyMessage": "複製訊息"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/markers/electron-browser/markers.i18n.json b/i18n/cht/src/vs/workbench/parts/markers/electron-browser/markers.i18n.json
deleted file mode 100644
index 9459b771c76..00000000000
--- a/i18n/cht/src/vs/workbench/parts/markers/electron-browser/markers.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"totalProblems": "共 {0} 項問題"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/markers/electron-browser/markersElectronContributions.i18n.json b/i18n/cht/src/vs/workbench/parts/markers/electron-browser/markersElectronContributions.i18n.json
deleted file mode 100644
index 88fd157d4b8..00000000000
--- a/i18n/cht/src/vs/workbench/parts/markers/electron-browser/markersElectronContributions.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"copyMarker": "複製",
-	"copyMarkerMessage": "複製訊息"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.i18n.json b/i18n/cht/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.i18n.json
deleted file mode 100644
index 6a593deff2f..00000000000
--- a/i18n/cht/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"label": "問題",
-	"tooltip.1": "此檔案發生 1 個問題",
-	"tooltip.N": "此檔案發生 {0} 個問題",
-	"markers.showOnFile": "在檔案和資料夾上顯示錯誤和警告。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/markers/electron-browser/markersPanel.i18n.json b/i18n/cht/src/vs/workbench/parts/markers/electron-browser/markersPanel.i18n.json
deleted file mode 100644
index cbdc55dae55..00000000000
--- a/i18n/cht/src/vs/workbench/parts/markers/electron-browser/markersPanel.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"disableFilesExclude": "停用檔案排除篩選。",
-	"clearFilter": "清除篩選。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/markers/electron-browser/markersPanelActions.i18n.json b/i18n/cht/src/vs/workbench/parts/markers/electron-browser/markersPanelActions.i18n.json
deleted file mode 100644
index 44d1178263c..00000000000
--- a/i18n/cht/src/vs/workbench/parts/markers/electron-browser/markersPanelActions.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"showing filtered problems": "顯示 {0} 個 (共 {1} 個)"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json b/i18n/cht/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
deleted file mode 100644
index 45f0712eab0..00000000000
--- a/i18n/cht/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"viewCategory": "檢視",
-	"problems.view.toggle.label": "切換至問題(錯誤, 警告, 資訊)",
-	"problems.view.focus.label": "聚焦於問題(錯誤, 警告, 資訊)",
-	"problems.panel.configuration.title": "[問題] 檢視",
-	"problems.panel.configuration.autoreveal": "控制 [問題] 檢視是否應自動在開啟檔案時加以顯示",
-	"markers.panel.title.problems": "問題",
-	"markers.panel.aria.label.problems.tree": "依檔案分組的問題",
-	"markers.panel.no.problems.build": "目前在工作區中未偵測到任何問題。",
-	"markers.panel.no.problems.filters": "使用提供的篩選準則找不到任何結果。",
-	"markers.panel.no.problems.file.exclusions": "因為已啟用檔案排除篩選，所以所有問題皆已隱藏。",
-	"markers.panel.action.useFilesExclude": "使用檔案排除設定進行篩選",
-	"markers.panel.action.donotUseFilesExclude": "不使用檔案排除設定",
-	"markers.panel.action.filter": "篩選問題",
-	"markers.panel.filter.ariaLabel": "篩選問題",
-	"markers.panel.filter.placeholder": "篩選。例如: 文字、**/*.ts、!**/node_modules/**",
-	"markers.panel.filter.errors": "錯誤",
-	"markers.panel.filter.warnings": "警告",
-	"markers.panel.filter.infos": "資訊",
-	"markers.panel.single.error.label": "1 個錯誤",
-	"markers.panel.multiple.errors.label": "{0} 個錯誤",
-	"markers.panel.single.warning.label": "1 個警告",
-	"markers.panel.multiple.warnings.label": "{0} 個警告",
-	"markers.panel.single.info.label": "1 個資訊",
-	"markers.panel.multiple.infos.label": "{0} 個資訊",
-	"markers.panel.single.unknown.label": "1 個未知",
-	"markers.panel.multiple.unknowns.label": "{0} 個未知",
-	"markers.panel.at.ln.col.number": "({0}, {1})",
-	"problems.tree.aria.label.resource": "發生 {1} 個問題的 {0}",
-	"problems.tree.aria.label.marker.relatedInformation": "此問題在 {0} 個位置有參考。",
-	"problems.tree.aria.label.error.marker": "{0} 產生的錯誤: 在行 {2} 與字元 {3} 的 {1}。{4} ",
-	"problems.tree.aria.label.error.marker.nosource": "錯誤: {0} 在行 {1} 和字元 {2}.{3}",
-	"problems.tree.aria.label.warning.marker": "{0} 產生的警告: 在行 {2} 與字元 {3} 的 {1}。{4} ",
-	"problems.tree.aria.label.warning.marker.nosource": "警告: 在行 {1} 與字元 {2} 的 {0}。{3}",
-	"problems.tree.aria.label.info.marker": "{0} 產生的資訊: 在行 {2} 與字元 {3} 的 {1}。{4}",
-	"problems.tree.aria.label.info.marker.nosource": "資訊: 在行 {1} 與字元 {2} 的 {0}。{3} ",
-	"problems.tree.aria.label.marker": "{0} 產生的問題: 在行 {2} 與字元 {3} 的 {1}。{4} ",
-	"problems.tree.aria.label.marker.nosource": "問題: 在行 {1} 與字元 {2} 的 {0}。{3} ",
-	"problems.tree.aria.label.relatedinfo.message": "在第 {1} 行的 {0}，以及在 {3} 的 {2} 字元",
-	"errors.warnings.show.label": "顯示錯誤和警告"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/nps/electron-browser/nps.contribution.i18n.json b/i18n/cht/src/vs/workbench/parts/nps/electron-browser/nps.contribution.i18n.json
deleted file mode 100644
index 260deed4c1d..00000000000
--- a/i18n/cht/src/vs/workbench/parts/nps/electron-browser/nps.contribution.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"surveyQuestion": "您願意填寫簡短的意見反應問卷嗎?",
-	"takeSurvey": "填寫問卷",
-	"remindLater": "稍後再提醒我",
-	"neverAgain": "不要再顯示"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/outline/electron-browser/outline.contribution.i18n.json b/i18n/cht/src/vs/workbench/parts/outline/electron-browser/outline.contribution.i18n.json
deleted file mode 100644
index 469303ff358..00000000000
--- a/i18n/cht/src/vs/workbench/parts/outline/electron-browser/outline.contribution.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"name": "大綱",
-	"category.focus": "檔案",
-	"label.focus": "聚焦大鋼"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/outline/electron-browser/outlinePanel.i18n.json b/i18n/cht/src/vs/workbench/parts/outline/electron-browser/outlinePanel.i18n.json
deleted file mode 100644
index a1342b6a247..00000000000
--- a/i18n/cht/src/vs/workbench/parts/outline/electron-browser/outlinePanel.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"filter": "篩選",
-	"collapse": "全部摺疊",
-	"sortByPosition": "排序依據: 位置",
-	"sortByName": "排序依據: 名稱",
-	"sortByKind": "排序依據: 類型",
-	"live": "追蹤游標",
-	"no-editor": "沒有開啟的編輯器可提供大網資訊。",
-	"too-many-symbols": "我們很抱歉, 但此檔案太大無法顯示大綱。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/outline/electron-browser/outlineTree.i18n.json b/i18n/cht/src/vs/workbench/parts/outline/electron-browser/outlineTree.i18n.json
deleted file mode 100644
index bbc5b26f1a5..00000000000
--- a/i18n/cht/src/vs/workbench/parts/outline/electron-browser/outlineTree.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"outline.title": "在 {1} 的行 {0}"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/output/browser/output.contribution.i18n.json b/i18n/cht/src/vs/workbench/parts/output/browser/output.contribution.i18n.json
deleted file mode 100644
index 223611af94e..00000000000
--- a/i18n/cht/src/vs/workbench/parts/output/browser/output.contribution.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"output": "輸出",
-	"viewCategory": "檢視",
-	"clearOutput.label": "清除輸出"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/output/browser/outputActions.i18n.json b/i18n/cht/src/vs/workbench/parts/output/browser/outputActions.i18n.json
deleted file mode 100644
index f5bbc727caf..00000000000
--- a/i18n/cht/src/vs/workbench/parts/output/browser/outputActions.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleOutput": "切換輸出",
-	"clearOutput": "清除輸出",
-	"toggleOutputScrollLock": "切換輸出 SCROLL LOCK",
-	"switchToOutput.label": "切換至輸出",
-	"openInLogViewer": "開啟日誌檔案"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/output/browser/outputPanel.i18n.json b/i18n/cht/src/vs/workbench/parts/output/browser/outputPanel.i18n.json
deleted file mode 100644
index 549c2d7f9dd..00000000000
--- a/i18n/cht/src/vs/workbench/parts/output/browser/outputPanel.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"output": "輸出",
-	"outputPanelWithInputAriaLabel": "{0}，輸出面板",
-	"outputPanelAriaLabel": "輸出面板"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/output/common/output.i18n.json b/i18n/cht/src/vs/workbench/parts/output/common/output.i18n.json
deleted file mode 100644
index fc01171bacd..00000000000
--- a/i18n/cht/src/vs/workbench/parts/output/common/output.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"output": "輸出",
-	"channel": "針對 '{0}'"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json b/i18n/cht/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
deleted file mode 100644
index d1554edfa0a..00000000000
--- a/i18n/cht/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"output": "輸出",
-	"logViewer": "紀錄檢視器",
-	"viewCategory": "檢視",
-	"clearOutput.label": "清除輸出",
-	"openActiveLogOutputFile": "檢視: 開啟活動日誌輸出檔案"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json b/i18n/cht/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json
deleted file mode 100644
index 650a7d28396..00000000000
--- a/i18n/cht/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"output": "{0} - 輸出",
-	"channel": "'{0}' 的輸出通道"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/performance/electron-browser/performance.contribution.i18n.json b/i18n/cht/src/vs/workbench/parts/performance/electron-browser/performance.contribution.i18n.json
deleted file mode 100644
index 7f9c895661a..00000000000
--- a/i18n/cht/src/vs/workbench/parts/performance/electron-browser/performance.contribution.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"prof.message": "已成功建立設定檔。",
-	"prof.detail": "請建立問題，並手動附加下列檔案:\n{0}",
-	"prof.restartAndFileIssue": "建立問題並重新啟動",
-	"prof.restart": "重新啟動",
-	"prof.thanks": "感謝您的協助",
-	"prof.detail.restart": "需要重新啟動才能夠繼續使用'{0}‘.再次感謝您的回饋."
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/performance/electron-browser/startupProfiler.i18n.json b/i18n/cht/src/vs/workbench/parts/performance/electron-browser/startupProfiler.i18n.json
deleted file mode 100644
index 7b6b69f1c75..00000000000
--- a/i18n/cht/src/vs/workbench/parts/performance/electron-browser/startupProfiler.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"prof.message": "已成功建立設定檔。",
-	"prof.detail": "請建立問題，並手動附加下列檔案:\n{0}",
-	"prof.restartAndFileIssue": "建立問題並重新啟動",
-	"prof.restart": "重新啟動",
-	"prof.thanks": "感謝您的協助",
-	"prof.detail.restart": "需要重新啟動才能夠繼續使用'{0}‘.再次感謝您的回饋."
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/preferences/browser/keybindingWidgets.i18n.json b/i18n/cht/src/vs/workbench/parts/preferences/browser/keybindingWidgets.i18n.json
deleted file mode 100644
index 3b54f3003a9..00000000000
--- a/i18n/cht/src/vs/workbench/parts/preferences/browser/keybindingWidgets.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"defineKeybinding.oneExists": "1 個現有命令有此按鍵繫結",
-	"defineKeybinding.existing": "{0} 個現有命令有此按鍵繫結",
-	"defineKeybinding.initial": "按下所需按鍵組合，然後按 ENTER。",
-	"defineKeybinding.chordsTo": "同步到"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json b/i18n/cht/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
deleted file mode 100644
index fc90fe51e84..00000000000
--- a/i18n/cht/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"showDefaultKeybindings": "顯示預設按鍵繫結",
-	"showUserKeybindings": "顯示使用者按鍵繫結",
-	"SearchKeybindings.AriaLabel": "搜尋按鍵繫結關係",
-	"SearchKeybindings.Placeholder": "搜尋按鍵繫結關係",
-	"sortByPrecedene": "依優先順序排序",
-	"header-message": "開啟及編輯進階自訂項目時使用",
-	"keybindings-file-name": "keybindings.json",
-	"keybindingsLabel": "按鍵繫結關係",
-	"changeLabel": "變更按鍵繫結關係",
-	"addLabel": "新增按鍵繫結關係",
-	"removeLabel": "移除按鍵繫結關係",
-	"resetLabel": "重設按鍵繫結關係",
-	"showSameKeybindings": "顯示相同的按鍵繫結關係",
-	"copyLabel": "複製",
-	"copyCommandLabel": "複製命令",
-	"error": "編輯按鍵繫結關係時發生錯誤 '{0}'。請開啟 'keybindings.json' 檔案並檢查錯誤。",
-	"command": "Command",
-	"keybinding": "按鍵繫結關係",
-	"source": "來源",
-	"when": "當",
-	"editKeybindingLabelWithKey": "變更按鍵繫結關係{0}",
-	"editKeybindingLabel": "變更按鍵繫結關係",
-	"addKeybindingLabelWithKey": "新增按鍵繫結關係 {0}",
-	"addKeybindingLabel": "新增按鍵繫結關係",
-	"title": "{0} ({1})",
-	"commandAriaLabel": "命令為 {0}。",
-	"keybindingAriaLabel": "按鍵繫結關係為 {0}。",
-	"noKeybinding": "未指派任何按鍵繫結關係。",
-	"sourceAriaLabel": "來源為 {0}。",
-	"whenAriaLabel": "時間為 {0}。",
-	"noWhen": "沒有時間內容。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/preferences/browser/keybindingsEditorContribution.i18n.json b/i18n/cht/src/vs/workbench/parts/preferences/browser/keybindingsEditorContribution.i18n.json
deleted file mode 100644
index 2b0ca9f8a83..00000000000
--- a/i18n/cht/src/vs/workbench/parts/preferences/browser/keybindingsEditorContribution.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"defineKeybinding.start": "定義按鍵繫結關係",
-	"defineKeybinding.kbLayoutErrorMessage": "您無法在目前的鍵盤配置下產生此按鍵組合。",
-	"defineKeybinding.kbLayoutLocalAndUSMessage": "**{0}**針對您目前的按鍵配置(**{1}**為美國標準)",
-	"defineKeybinding.kbLayoutLocalMessage": "**{0}**針對您目前的鍵盤配置"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/preferences/browser/preferences.contribution.i18n.json b/i18n/cht/src/vs/workbench/parts/preferences/browser/preferences.contribution.i18n.json
deleted file mode 100644
index 978ee42a36c..00000000000
--- a/i18n/cht/src/vs/workbench/parts/preferences/browser/preferences.contribution.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"defaultPreferencesEditor": "預設喜好設定編輯器",
-	"keybindingsEditor": "按鍵繫結關係編輯器",
-	"preferences": "喜好設定"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json b/i18n/cht/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
deleted file mode 100644
index 7de2fa4801f..00000000000
--- a/i18n/cht/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openRawDefaultSettings": "開啟原始預設設置",
-	"openSettings2": "開啟設定 (預覽)",
-	"openSettings": "開啟設定",
-	"openGlobalSettings": "開啟使用者設定",
-	"openGlobalKeybindings": "開啟鍵盤快速鍵",
-	"openGlobalKeybindingsFile": "開啟鍵盤快速鍵檔案",
-	"openWorkspaceSettings": "開啟工作區設定",
-	"openFolderSettings": "開啟資料夾設定",
-	"configureLanguageBasedSettings": "設定語言專屬設定...",
-	"languageDescriptionConfigured": "({0})",
-	"pickLanguage": "選取語言"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json b/i18n/cht/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
deleted file mode 100644
index 566a9672a3c..00000000000
--- a/i18n/cht/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"SearchSettingsWidget.AriaLabel": "搜尋設定",
-	"SearchSettingsWidget.Placeholder": "搜尋設定",
-	"noSettingsFound": "沒有結果",
-	"oneSettingFound": "找到 1 項設定",
-	"settingsFound": "找到 {0} 項設置",
-	"totalSettingsMessage": "共 {0} 項設定",
-	"nlpResult": "自然語言結果",
-	"filterResult": "篩選結果",
-	"defaultSettings": "預設設定",
-	"defaultUserSettings": "預設使用者設定",
-	"defaultWorkspaceSettings": "預設工作區設定",
-	"defaultFolderSettings": "預設資料夾設定",
-	"defaultEditorReadonly": "在右方編輯器中編輯以覆寫預設。",
-	"preferencesAriaLabel": "預設喜好設定。唯讀文字編輯器。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json b/i18n/cht/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
deleted file mode 100644
index 912f924cec9..00000000000
--- a/i18n/cht/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"emptyUserSettingsHeader": "將您的設定放置在此以覆寫預設設定。",
-	"emptyWorkspaceSettingsHeader": "將您的設定放置在此以覆寫使用者設定。",
-	"emptyFolderSettingsHeader": "將您的資料夾設定放置在此以覆寫工作區設定的資料夾設定。",
-	"reportSettingsSearchIssue": "回報問題",
-	"newExtensionLabel": "顯示擴充功能 \"{0}\"",
-	"editTtile": "編輯",
-	"replaceDefaultValue": "在設定中取代",
-	"copyDefaultValue": "複製到設定"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/preferences/browser/preferencesService.i18n.json b/i18n/cht/src/vs/workbench/parts/preferences/browser/preferencesService.i18n.json
deleted file mode 100644
index bf6c80d40da..00000000000
--- a/i18n/cht/src/vs/workbench/parts/preferences/browser/preferencesService.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openFolderFirst": "先開啟資料夾以建立工作區設定",
-	"emptyKeybindingsHeader": "將您的按鍵組合放入此檔案中以覆寫預設值",
-	"defaultKeybindings": "預設按鍵繫結關係",
-	"folderSettingsName": "{0} (資料夾設定)",
-	"fail.createSettings": "無法建立 '{0}' ({1})。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json b/i18n/cht/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
deleted file mode 100644
index 17bda120dbd..00000000000
--- a/i18n/cht/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"defaultSettings": "將您的設定放置於右方編輯器中以覆寫。",
-	"noSettingsFound": "找不到任何設定。",
-	"settingsSwitcherBarAriaLabel": "設定切換器",
-	"userSettings": "使用者設定",
-	"workspaceSettings": "工作區設定",
-	"folderSettings": "資料夾設定"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/preferences/browser/settingsEditor2.i18n.json b/i18n/cht/src/vs/workbench/parts/preferences/browser/settingsEditor2.i18n.json
deleted file mode 100644
index 6ff162cdce5..00000000000
--- a/i18n/cht/src/vs/workbench/parts/preferences/browser/settingsEditor2.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"previewWarning": "預覽",
-	"previewLabel": "這是我們新的設定編輯器預覽版本",
-	"SearchSettings.AriaLabel": "搜尋設定",
-	"SearchSettings.Placeholder": "搜尋設定",
-	"advancedCustomizationLabel": "開啟及編輯進階自訂項目時使用",
-	"openSettingsLabel": "settings.json",
-	"showOverriddenOnly": "僅顯示已修改的",
-	"treeAriaLabel": "設定",
-	"feedbackButtonLabel": "提供意見反應"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/preferences/browser/settingsTree.i18n.json b/i18n/cht/src/vs/workbench/parts/preferences/browser/settingsTree.i18n.json
deleted file mode 100644
index cf834438852..00000000000
--- a/i18n/cht/src/vs/workbench/parts/preferences/browser/settingsTree.i18n.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"modifiedItemForeground": "已修改設定的前景色彩。",
-	"workspace": "工作區",
-	"user": "使用者",
-	"resetButtonTitle": "重設",
-	"configured": "已修改",
-	"alsoConfiguredIn": "也修改於",
-	"configuredIn": "已修改於",
-	"editInSettingsJson": "在 settings.json 內編輯",
-	"settingRowAriaLabel": "{0} {1}, 設定",
-	"groupRowAriaLabel": "{0}, 群組 "
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/preferences/common/keybindingsEditorModel.i18n.json b/i18n/cht/src/vs/workbench/parts/preferences/common/keybindingsEditorModel.i18n.json
deleted file mode 100644
index 74b863145f3..00000000000
--- a/i18n/cht/src/vs/workbench/parts/preferences/common/keybindingsEditorModel.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"default": "預設",
-	"user": "使用者",
-	"meta": "中繼",
-	"option": "選項"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/preferences/common/preferences.i18n.json b/i18n/cht/src/vs/workbench/parts/preferences/common/preferences.i18n.json
deleted file mode 100644
index cd606489d79..00000000000
--- a/i18n/cht/src/vs/workbench/parts/preferences/common/preferences.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"userSettingsTarget": "使用者設定",
-	"workspaceSettingsTarget": "工作區設定"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json b/i18n/cht/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json
deleted file mode 100644
index 8733c537f59..00000000000
--- a/i18n/cht/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"commonlyUsed": "經常使用的",
-	"defaultKeybindingsHeader": "將按鍵組合放入您的按鍵組合檔案中加以覆寫。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/preferences/electron-browser/preferences.contribution.i18n.json b/i18n/cht/src/vs/workbench/parts/preferences/electron-browser/preferences.contribution.i18n.json
deleted file mode 100644
index 70bddd5c3a2..00000000000
--- a/i18n/cht/src/vs/workbench/parts/preferences/electron-browser/preferences.contribution.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"defaultPreferencesEditor": "預設喜好設定編輯器",
-	"settingsEditor2": "設定編輯器 2",
-	"keybindingsEditor": "按鍵繫結關係編輯器",
-	"preferences": "喜好設定"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/quickopen/browser/commandsHandler.i18n.json b/i18n/cht/src/vs/workbench/parts/quickopen/browser/commandsHandler.i18n.json
deleted file mode 100644
index 0e99f3c931d..00000000000
--- a/i18n/cht/src/vs/workbench/parts/quickopen/browser/commandsHandler.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"showTriggerActions": "顯示所有命令",
-	"clearCommandHistory": "清除命令歷程記錄",
-	"showCommands.label": "命令選擇區...",
-	"entryAriaLabelWithKey": "{0}、{1}、命令",
-	"entryAriaLabel": "{0}，命令",
-	"actionNotEnabled": "目前內容中未啟用命令 '{0}'。",
-	"canNotRun": "命令 '{0}' 導致錯誤。",
-	"recentlyUsed": "最近使用的",
-	"morecCommands": "其他命令",
-	"cat.title": "{0}: {1}",
-	"noCommandsMatching": "沒有相符的命令"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/quickopen/browser/gotoLineHandler.i18n.json b/i18n/cht/src/vs/workbench/parts/quickopen/browser/gotoLineHandler.i18n.json
deleted file mode 100644
index 03039eb3ceb..00000000000
--- a/i18n/cht/src/vs/workbench/parts/quickopen/browser/gotoLineHandler.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"gotoLine": "移至行...",
-	"gotoLineLabelEmptyWithLimit": "輸入介於 1 到 {0} 之間要瀏覽的行號",
-	"gotoLineLabelEmpty": "輸入要瀏覽的行號",
-	"gotoLineColumnLabel": "移至行 {0} 和字元 {1}",
-	"gotoLineLabel": "移至第 {0} 行",
-	"gotoLineHandlerAriaLabel": "輸入要瀏覽的行號。",
-	"cannotRunGotoLine": "先開啟文字檔以移至某一行"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/quickopen/browser/gotoSymbolHandler.i18n.json b/i18n/cht/src/vs/workbench/parts/quickopen/browser/gotoSymbolHandler.i18n.json
deleted file mode 100644
index 1b5be79395f..00000000000
--- a/i18n/cht/src/vs/workbench/parts/quickopen/browser/gotoSymbolHandler.i18n.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"gotoSymbol": "前往檔案中的符號...",
-	"symbols": "符號 ({0})",
-	"method": "方法 ({0})",
-	"function": "函式 ({0})",
-	"_constructor": "建構函式 ({0})",
-	"variable": "變數 ({0})",
-	"class": "類別 ({0})",
-	"interface": "介面 ({0})",
-	"namespace": "命名空間 ({0})",
-	"package": "封裝 ({0})",
-	"modules": "模組 ({0})",
-	"property": "屬性 ({0})",
-	"enum": "列舉 ({0})",
-	"string": "字串 ({0})",
-	"rule": "規則 ({0})",
-	"file": "檔案 ({0})",
-	"array": "陣列 ({0})",
-	"number": "數字 ({0})",
-	"boolean": "布林值 ({0})",
-	"object": "物件 ({0})",
-	"key": "索引鍵 ({0})",
-	"entryAriaLabel": "{0}，符號",
-	"noSymbolsMatching": "沒有相符的符號",
-	"noSymbolsFound": "找不到符號",
-	"gotoSymbolHandlerAriaLabel": "輸入以縮小目前使用中編輯器的符號範圍。",
-	"cannotRunGotoSymbolInFile": "檔案沒有任何符號資訊",
-	"cannotRunGotoSymbol": "先開啟文字檔以移至某一個符號"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/quickopen/browser/helpHandler.i18n.json b/i18n/cht/src/vs/workbench/parts/quickopen/browser/helpHandler.i18n.json
deleted file mode 100644
index a49ad26f819..00000000000
--- a/i18n/cht/src/vs/workbench/parts/quickopen/browser/helpHandler.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"entryAriaLabel": "{0}，選擇器說明",
-	"globalCommands": "全域命令",
-	"editorCommands": "編輯器命令"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json b/i18n/cht/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json
deleted file mode 100644
index ec7b2f0037c..00000000000
--- a/i18n/cht/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"view": "檢視",
-	"commandsHandlerDescriptionDefault": "顯示並執行命令",
-	"gotoLineDescriptionMac": "移至行",
-	"gotoLineDescriptionWin": "移至行",
-	"gotoSymbolDescription": "前往檔案中的符號",
-	"gotoSymbolDescriptionScoped": "前往檔案中的符號 (依分類)",
-	"helpDescription": "顯示說明",
-	"viewPickerDescription": "開啟檢視"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/quickopen/browser/viewPickerHandler.i18n.json b/i18n/cht/src/vs/workbench/parts/quickopen/browser/viewPickerHandler.i18n.json
deleted file mode 100644
index 729f91d2d2a..00000000000
--- a/i18n/cht/src/vs/workbench/parts/quickopen/browser/viewPickerHandler.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"entryAriaLabel": "{0}，檢視選擇器",
-	"views": "檢視",
-	"panels": "面板",
-	"terminals": "終端機",
-	"terminalTitle": "{0}: {1}",
-	"channels": "輸出",
-	"openView": "開啟檢視",
-	"quickOpenView": "Quick Open 檢視"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.i18n.json b/i18n/cht/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.i18n.json
deleted file mode 100644
index 9b318b09ce0..00000000000
--- a/i18n/cht/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"relaunchSettingMessage": "設定已經變更，必須重新啟動才會生效。",
-	"relaunchSettingDetail": "請按 [重新啟動] 按鈕以重新啟動 {0} 並啟用設定。",
-	"restart": "重新啟動(&&R)"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.i18n.json b/i18n/cht/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.i18n.json
deleted file mode 100644
index a561a356071..00000000000
--- a/i18n/cht/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.i18n.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"changes": "{0}/{1} 已變更 ",
-	"change": "{0}/{1} 已變更 ",
-	"show previous change": "顯示上一個變更",
-	"show next change": "顯示下一個變更",
-	"move to previous change": "移至上一個變更",
-	"move to next change": "移至下一個變更",
-	"editorGutterModifiedBackground": "修改中的行於編輯器邊框的背景色彩",
-	"editorGutterAddedBackground": "新增後的行於編輯器邊框的背景色彩",
-	"editorGutterDeletedBackground": "刪除後的行於編輯器邊框的背景色彩",
-	"overviewRulerModifiedForeground": "已修改內容的概觀尺規色彩。",
-	"overviewRulerAddedForeground": "已新增內容的的概觀尺規色彩。",
-	"overviewRulerDeletedForeground": "已刪除內容的的概觀尺規色彩。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json b/i18n/cht/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
deleted file mode 100644
index a47e720b85b..00000000000
--- a/i18n/cht/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleGitViewlet": "顯示 Git",
-	"source control": "原始檔控制",
-	"toggleSCMViewlet": "顯示 SCM",
-	"view": "檢視",
-	"scmConfigurationTitle": "原始碼管理 (SCM)",
-	"alwaysShowProviders": "是否總是顯示原始檔控制提供者區段",
-	"diffDecorations": "控制差異裝飾於編輯器中",
-	"diffGutterWidth": "控制邊框中差異裝飾的寬度 (px) (增加和修改)。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/scm/electron-browser/scmActivity.i18n.json b/i18n/cht/src/vs/workbench/parts/scm/electron-browser/scmActivity.i18n.json
deleted file mode 100644
index b490a58a53e..00000000000
--- a/i18n/cht/src/vs/workbench/parts/scm/electron-browser/scmActivity.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"scmPendingChangesBadge": "{0} 個暫止的變更"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/scm/electron-browser/scmMenus.i18n.json b/i18n/cht/src/vs/workbench/parts/scm/electron-browser/scmMenus.i18n.json
deleted file mode 100644
index 5450727934a..00000000000
--- a/i18n/cht/src/vs/workbench/parts/scm/electron-browser/scmMenus.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"installAdditionalSCMProviders": "安裝額外SCM提供者...",
-	"switch provider": "切換 SCM 提供者..."
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json b/i18n/cht/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
deleted file mode 100644
index 4bf0fb57a82..00000000000
--- a/i18n/cht/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"scm providers": "原始檔控制提供者",
-	"hideRepository": "隱藏",
-	"installAdditionalSCMProviders": "安裝額外SCM提供者...",
-	"no open repo": "沒有使用中的原始檔控制提供者。",
-	"source control": "原始檔控制",
-	"viewletTitle": "{0}: {1}",
-	"hideView": "隱藏"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/search/browser/openAnythingHandler.i18n.json b/i18n/cht/src/vs/workbench/parts/search/browser/openAnythingHandler.i18n.json
deleted file mode 100644
index 63e2d3ada38..00000000000
--- a/i18n/cht/src/vs/workbench/parts/search/browser/openAnythingHandler.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"fileAndTypeResults": "檔案和符號結果",
-	"fileResults": "檔案結果"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/search/browser/openFileHandler.i18n.json b/i18n/cht/src/vs/workbench/parts/search/browser/openFileHandler.i18n.json
deleted file mode 100644
index 01f10d3f7dd..00000000000
--- a/i18n/cht/src/vs/workbench/parts/search/browser/openFileHandler.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"entryAriaLabel": "{0}，檔案選擇器",
-	"searchResults": "搜尋結果"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/search/browser/openSymbolHandler.i18n.json b/i18n/cht/src/vs/workbench/parts/search/browser/openSymbolHandler.i18n.json
deleted file mode 100644
index b089e16faf4..00000000000
--- a/i18n/cht/src/vs/workbench/parts/search/browser/openSymbolHandler.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"entryAriaLabel": "{0}，符號選擇器",
-	"symbols": "符號結果",
-	"noSymbolsMatching": "沒有相符的符號",
-	"noSymbolsWithoutInput": "輸入以搜尋符號"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/search/browser/patternInputWidget.i18n.json b/i18n/cht/src/vs/workbench/parts/search/browser/patternInputWidget.i18n.json
deleted file mode 100644
index c8ac33bc93c..00000000000
--- a/i18n/cht/src/vs/workbench/parts/search/browser/patternInputWidget.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"defaultLabel": "輸入",
-	"useExcludesAndIgnoreFilesDescription": "使用排除設定與忽略檔案"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/search/browser/replaceService.i18n.json b/i18n/cht/src/vs/workbench/parts/search/browser/replaceService.i18n.json
deleted file mode 100644
index 9d1480f139a..00000000000
--- a/i18n/cht/src/vs/workbench/parts/search/browser/replaceService.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"fileReplaceChanges": "{0} ↔ {1} (Replace Preview)"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/search/browser/search.contribution.i18n.json b/i18n/cht/src/vs/workbench/parts/search/browser/search.contribution.i18n.json
deleted file mode 100644
index 2737e83ab4e..00000000000
--- a/i18n/cht/src/vs/workbench/parts/search/browser/search.contribution.i18n.json
+++ /dev/null
@@ -1,22 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"showTriggerActions": "前往工作區中的符號...",
-	"name": "搜尋",
-	"search": "搜尋",
-	"view": "檢視",
-	"openAnythingHandlerDescription": "前往檔案",
-	"openSymbolDescriptionNormal": "前往工作區中的符號",
-	"searchOutputChannelTitle": "搜尋",
-	"searchConfigurationTitle": "搜尋",
-	"exclude": "設定 Glob 模式，以排除不要搜尋的檔案及資料夾。請從 file.exclude 設定繼承所有的 Glob 模式。",
-	"exclude.boolean": "要符合檔案路徑的 Glob 模式。設為 True 或 False 可啟用或停用模式。",
-	"exclude.when": "在相符檔案同層級上額外的檢查。請使用 $(basename) 作為相符檔案名稱的變數。",
-	"useRipgrep": "控制是否要在文字和檔案搜尋中使用 ripgrep",
-	"useIgnoreFiles": "控制在搜尋檔案時，是否要使用 .gitignore 及 .ignore 檔案。 ",
-	"search.quickOpen.includeSymbols": "設定以將全域符號搜尋的結果納入 Quick Open 的檔案結果中。",
-	"search.followSymlinks": "控制是否要在搜尋時遵循 symlink。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/search/browser/searchActions.i18n.json b/i18n/cht/src/vs/workbench/parts/search/browser/searchActions.i18n.json
deleted file mode 100644
index ba1fd77bc20..00000000000
--- a/i18n/cht/src/vs/workbench/parts/search/browser/searchActions.i18n.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"nextSearchIncludePattern": "顯示下一個搜尋包含模式",
-	"previousSearchIncludePattern": "顯示上一個搜尋包含模式",
-	"nextSearchExcludePattern": "顯示下一個搜尋排除模式",
-	"previousSearchExcludePattern": "顯示上一個搜尋排除模式",
-	"nextSearchTerm": "顯示下一個搜尋字詞",
-	"previousSearchTerm": "顯示上一個搜尋字詞",
-	"nextReplaceTerm": "顯示下一個搜尋取代字詞",
-	"previousReplaceTerm": "顯示上一個搜尋取代字詞",
-	"findInFiles": "在檔案中尋找",
-	"replaceInFiles": "檔案中取代",
-	"RefreshAction.label": "重新整理",
-	"CollapseDeepestExpandedLevelAction.label": "全部摺疊",
-	"ClearSearchResultsAction.label": "清除",
-	"CancelSearchAction.label": "取消搜索",
-	"FocusNextSearchResult.label": "聚焦於下一個搜尋結果",
-	"FocusPreviousSearchResult.label": "聚焦於上一個搜尋結果",
-	"RemoveAction.label": "關閉",
-	"file.replaceAll.label": "全部取代",
-	"match.replace.label": "取代"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/search/browser/searchResultsView.i18n.json b/i18n/cht/src/vs/workbench/parts/search/browser/searchResultsView.i18n.json
deleted file mode 100644
index f9a4b46d6b9..00000000000
--- a/i18n/cht/src/vs/workbench/parts/search/browser/searchResultsView.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"searchFolderMatch.other.label": "其他檔案",
-	"searchFileMatches": "找到 {0} 個檔案",
-	"searchFileMatch": "找到 {0} 個檔案",
-	"searchMatches": "找到 {0} 個相符",
-	"searchMatch": "找到 {0} 個相符",
-	"folderMatchAriaLabel": "資料夾根目錄 {1} 中有 {0} 個相符，搜尋結果",
-	"fileMatchAriaLabel": "資料夾 {2} 的檔案 {1} 中有 {0} 個相符，搜尋結果",
-	"replacePreviewResultAria": "根據文字({3})在({2})欄位列表中將({1})替代為文字{{0}}",
-	"searchResultAria": "根據文字({2})並在({1})欄位列表中找到符合({0})的項目"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/search/browser/searchView.i18n.json b/i18n/cht/src/vs/workbench/parts/search/browser/searchView.i18n.json
deleted file mode 100644
index 4578dbafa9e..00000000000
--- a/i18n/cht/src/vs/workbench/parts/search/browser/searchView.i18n.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"moreSearch": "切換搜尋詳細資料",
-	"searchScope.includes": "要包含的檔案",
-	"label.includes": "搜尋包含模式",
-	"searchScope.excludes": "要排除的檔案",
-	"label.excludes": "搜尋排除模式",
-	"replaceAll.confirmation.title": "全部取代",
-	"replaceAll.confirm.button": "取代(&&R)",
-	"replaceAll.occurrence.file.message": "已將 {1} 個檔案中的 {0} 個相符項目取代為 '{2}'。",
-	"removeAll.occurrence.file.message": "已取代 {1} 個檔案中的 {0} 個相符項目。",
-	"replaceAll.occurrence.files.message": "已將 {1} 個檔案中的 {0} 個相符項目取代為 '{2}'。",
-	"removeAll.occurrence.files.message": "已取代 {1} 個檔案中的 {0} 個相符項目。",
-	"replaceAll.occurrences.file.message": "已將 {1} 個檔案中的 {0} 個相符項目取代為 '{2}'。",
-	"removeAll.occurrences.file.message": "已取代 {1} 個檔案中的 {0} 個相符項目。",
-	"replaceAll.occurrences.files.message": "已將 {1} 個檔案中的 {0} 個相符項目取代為 '{2}'。",
-	"removeAll.occurrences.files.message": "已取代 {1} 個檔案中的 {0} 個相符項目。",
-	"removeAll.occurrence.file.confirmation.message": "要將 {1} 個檔案中的 {0} 個相符項目取代為 '{2}' 嗎?",
-	"replaceAll.occurrence.file.confirmation.message": "要取代 {1} 個檔案中的 {0} 個相符項目嗎?",
-	"removeAll.occurrence.files.confirmation.message": "要將 {1} 個檔案中的 {0} 個相符項目取代為 '{2}' 嗎?",
-	"replaceAll.occurrence.files.confirmation.message": "要取代 {1} 個檔案中的 {0} 個相符項目嗎?",
-	"removeAll.occurrences.file.confirmation.message": "要將 {1} 個檔案中的 {0} 個相符項目取代為 '{2}' 嗎?",
-	"replaceAll.occurrences.file.confirmation.message": "要取代 {1} 個檔案中的 {0} 個相符項目嗎?",
-	"removeAll.occurrences.files.confirmation.message": "要將 {1} 個檔案中的 {0} 個相符項目取代為 '{2}' 嗎?",
-	"replaceAll.occurrences.files.confirmation.message": "要取代 {1} 個檔案中的 {0} 個相符項目嗎?",
-	"treeAriaLabel": "搜尋結果",
-	"searchPathNotFoundError": "找不到搜尋路徑: {0}",
-	"searchMaxResultsWarning": "結果集只包含所有符合項的子集。請提供更具體的搜尋條件以縮小結果範圍。",
-	"searchCanceled": "在可能找到任何結果之前已取消搜尋 - ",
-	"noResultsIncludesExcludes": "在 '{0}' 中找不到排除 '{1}' 的結果 - ",
-	"noResultsIncludes": "在 '{0}' 中找不到結果 - ",
-	"noResultsExcludes": "找不到排除 '{0}' 的結果 - ",
-	"noResultsFound": "找不到結果。請檢閱所設定的排除和忽略檔案之設定 - ",
-	"rerunSearch.message": "再次搜尋",
-	"rerunSearchInAll.message": "在所有檔案中再次搜尋",
-	"openSettings.message": "開啟設定",
-	"openSettings.learnMore": "深入了解",
-	"ariaSearchResultsStatus": "搜尋傳回 {1} 個檔案中的 {0} 個結果",
-	"search.file.result": "{1} 個檔案中有 {0} 個結果",
-	"search.files.result": "{1} 個檔案中有 {0} 個結果",
-	"search.file.results": "{1} 個檔案中有 {0} 個結果",
-	"search.files.results": "{1} 個檔案中有 {0} 個結果",
-	"searchWithoutFolder": "您尚未開啟資料夾。只會開啟目前搜尋的檔案 - ",
-	"openFolder": "開啟資料夾"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json b/i18n/cht/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
deleted file mode 100644
index 4578dbafa9e..00000000000
--- a/i18n/cht/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"moreSearch": "切換搜尋詳細資料",
-	"searchScope.includes": "要包含的檔案",
-	"label.includes": "搜尋包含模式",
-	"searchScope.excludes": "要排除的檔案",
-	"label.excludes": "搜尋排除模式",
-	"replaceAll.confirmation.title": "全部取代",
-	"replaceAll.confirm.button": "取代(&&R)",
-	"replaceAll.occurrence.file.message": "已將 {1} 個檔案中的 {0} 個相符項目取代為 '{2}'。",
-	"removeAll.occurrence.file.message": "已取代 {1} 個檔案中的 {0} 個相符項目。",
-	"replaceAll.occurrence.files.message": "已將 {1} 個檔案中的 {0} 個相符項目取代為 '{2}'。",
-	"removeAll.occurrence.files.message": "已取代 {1} 個檔案中的 {0} 個相符項目。",
-	"replaceAll.occurrences.file.message": "已將 {1} 個檔案中的 {0} 個相符項目取代為 '{2}'。",
-	"removeAll.occurrences.file.message": "已取代 {1} 個檔案中的 {0} 個相符項目。",
-	"replaceAll.occurrences.files.message": "已將 {1} 個檔案中的 {0} 個相符項目取代為 '{2}'。",
-	"removeAll.occurrences.files.message": "已取代 {1} 個檔案中的 {0} 個相符項目。",
-	"removeAll.occurrence.file.confirmation.message": "要將 {1} 個檔案中的 {0} 個相符項目取代為 '{2}' 嗎?",
-	"replaceAll.occurrence.file.confirmation.message": "要取代 {1} 個檔案中的 {0} 個相符項目嗎?",
-	"removeAll.occurrence.files.confirmation.message": "要將 {1} 個檔案中的 {0} 個相符項目取代為 '{2}' 嗎?",
-	"replaceAll.occurrence.files.confirmation.message": "要取代 {1} 個檔案中的 {0} 個相符項目嗎?",
-	"removeAll.occurrences.file.confirmation.message": "要將 {1} 個檔案中的 {0} 個相符項目取代為 '{2}' 嗎?",
-	"replaceAll.occurrences.file.confirmation.message": "要取代 {1} 個檔案中的 {0} 個相符項目嗎?",
-	"removeAll.occurrences.files.confirmation.message": "要將 {1} 個檔案中的 {0} 個相符項目取代為 '{2}' 嗎?",
-	"replaceAll.occurrences.files.confirmation.message": "要取代 {1} 個檔案中的 {0} 個相符項目嗎?",
-	"treeAriaLabel": "搜尋結果",
-	"searchPathNotFoundError": "找不到搜尋路徑: {0}",
-	"searchMaxResultsWarning": "結果集只包含所有符合項的子集。請提供更具體的搜尋條件以縮小結果範圍。",
-	"searchCanceled": "在可能找到任何結果之前已取消搜尋 - ",
-	"noResultsIncludesExcludes": "在 '{0}' 中找不到排除 '{1}' 的結果 - ",
-	"noResultsIncludes": "在 '{0}' 中找不到結果 - ",
-	"noResultsExcludes": "找不到排除 '{0}' 的結果 - ",
-	"noResultsFound": "找不到結果。請檢閱所設定的排除和忽略檔案之設定 - ",
-	"rerunSearch.message": "再次搜尋",
-	"rerunSearchInAll.message": "在所有檔案中再次搜尋",
-	"openSettings.message": "開啟設定",
-	"openSettings.learnMore": "深入了解",
-	"ariaSearchResultsStatus": "搜尋傳回 {1} 個檔案中的 {0} 個結果",
-	"search.file.result": "{1} 個檔案中有 {0} 個結果",
-	"search.files.result": "{1} 個檔案中有 {0} 個結果",
-	"search.file.results": "{1} 個檔案中有 {0} 個結果",
-	"search.files.results": "{1} 個檔案中有 {0} 個結果",
-	"searchWithoutFolder": "您尚未開啟資料夾。只會開啟目前搜尋的檔案 - ",
-	"openFolder": "開啟資料夾"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/search/browser/searchWidget.i18n.json b/i18n/cht/src/vs/workbench/parts/search/browser/searchWidget.i18n.json
deleted file mode 100644
index 9f58470dad6..00000000000
--- a/i18n/cht/src/vs/workbench/parts/search/browser/searchWidget.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"search.action.replaceAll.disabled.label": "全部取代 (提交搜尋以啟用)",
-	"search.action.replaceAll.enabled.label": "全部取代",
-	"search.replace.toggle.button.title": "切換取代",
-	"label.Search": "搜尋: 輸入搜尋字詞，然後按 Enter 鍵搜尋或按 Esc 鍵取消",
-	"search.placeHolder": "搜尋",
-	"label.Replace": "取代: 輸入取代字詞後按下 Enter 以預覽，或按 Escape 取消",
-	"search.replace.placeHolder": "取代",
-	"regexp.validationFailure": "運算式符合所有項目",
-	"regexp.backreferenceValidationFailure": "不支援反向參考"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/search/common/queryBuilder.i18n.json b/i18n/cht/src/vs/workbench/parts/search/common/queryBuilder.i18n.json
deleted file mode 100644
index 20778d3fe33..00000000000
--- a/i18n/cht/src/vs/workbench/parts/search/common/queryBuilder.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"search.noWorkspaceWithName": "工作區內無此名稱資料夾: {0}"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json b/i18n/cht/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
deleted file mode 100644
index ebc27f353b3..00000000000
--- a/i18n/cht/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"search": "搜尋",
-	"copyMatchLabel": "複製",
-	"copyPathLabel": "複製路徑",
-	"copyAllLabel": "全部複製",
-	"clearSearchHistoryLabel": "清除搜尋歷程記錄",
-	"toggleSearchViewPositionLabel": "切換搜尋檢視位置",
-	"findInFolder": "在資料夾中尋找...",
-	"findInWorkspace": "在工作區中尋找...",
-	"showTriggerActions": "前往工作區中的符號...",
-	"name": "搜尋",
-	"showSearchViewl": "顯示搜尋",
-	"view": "檢視",
-	"findInFiles": "在檔案中尋找",
-	"openAnythingHandlerDescription": "前往檔案",
-	"openSymbolDescriptionNormal": "前往工作區中的符號",
-	"searchConfigurationTitle": "搜尋",
-	"exclude": "設定 Glob 模式，以排除不要搜尋的檔案及資料夾。請從 file.exclude 設定繼承所有的 Glob 模式。",
-	"exclude.boolean": "要符合檔案路徑的 Glob 模式。設為 True 或 False 可啟用或停用模式。",
-	"exclude.when": "在相符檔案同層級上額外的檢查。請使用 $(basename) 作為相符檔案名稱的變數。",
-	"useRipgrep": "控制是否要在文字和檔案搜尋中使用 ripgrep",
-	"useIgnoreFiles": "控制在搜尋檔案時，是否要使用 .gitignore 及 .ignore 檔案。 ",
-	"search.quickOpen.includeSymbols": "設定以將全域符號搜尋的結果納入 Quick Open 的檔案結果中。",
-	"search.followSymlinks": "控制是否要在搜尋時遵循 symlink。",
-	"search.smartCase": "如果搜尋式為全部小寫，則用不分大小寫的搜尋，否則用分大小寫的搜尋",
-	"search.globalFindClipboard": "控制搜尋檢視是否應讀取或修改 macOS 上的共用尋找剪貼簿 (shared find clipboard)",
-	"search.location": "控制搜尋是否以檢視方式在側邊欄顯示，或以面板方式在面板區域顯示以取得更多水平空間。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/search/electron-browser/searchActions.i18n.json b/i18n/cht/src/vs/workbench/parts/search/electron-browser/searchActions.i18n.json
deleted file mode 100644
index 9ad25ceb576..00000000000
--- a/i18n/cht/src/vs/workbench/parts/search/electron-browser/searchActions.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"findInFolder": "在資料夾中尋找...",
-	"findInWorkspace": "在工作區中尋找..."
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/snippets/electron-browser/TMSnippets.i18n.json b/i18n/cht/src/vs/workbench/parts/snippets/electron-browser/TMSnippets.i18n.json
deleted file mode 100644
index 2789a5e845e..00000000000
--- a/i18n/cht/src/vs/workbench/parts/snippets/electron-browser/TMSnippets.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"vscode.extension.contributes.snippets": "提供程式碼片段。",
-	"vscode.extension.contributes.snippets-language": "要予以提供此程式碼片段的語言識別碼。",
-	"vscode.extension.contributes.snippets-path": "程式碼片段檔案的路徑。此路徑是擴充功能資料夾的相對路徑，而且一般會以 './snippets/' 開頭。",
-	"invalid.language": "`contributes.{0}.language` 中的不明語言。提供的值: {1}",
-	"invalid.path.0": "`contributes.{0}.path` 中的預期字串。提供的值: {1}",
-	"invalid.path.1": "要包含在擴充功能資料夾 ({2}) 中的預期 `contributes.{0}.path` ({1})。這可能會使擴充功能無法移植。",
-	"badVariableUse": "程式碼片段 \"{0}\" 很可能會混淆 snippet-variables 及 snippet-placeholders。如需詳細資料，請參閱 https://code.visualstudio.com/docs/editor/userdefinedsnippets#_snippet-syntax。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json b/i18n/cht/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json
deleted file mode 100644
index eee83ac59d3..00000000000
--- a/i18n/cht/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"global.scope": "(全域)",
-	"global.1": "({0})",
-	"new.global": "新增全域程式碼片段檔案...",
-	"group.global": "現有程式碼片段",
-	"new.global.sep": "新增程式碼片段",
-	"openSnippet.pickLanguage": "選取程式碼片段檔案或建立程式碼片段",
-	"openSnippet.label": "設定使用者程式碼片段",
-	"preferences": "喜好設定"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/snippets/electron-browser/insertSnippet.i18n.json b/i18n/cht/src/vs/workbench/parts/snippets/electron-browser/insertSnippet.i18n.json
deleted file mode 100644
index 6a89d5934ff..00000000000
--- a/i18n/cht/src/vs/workbench/parts/snippets/electron-browser/insertSnippet.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"snippet.suggestions.label": "插入程式碼片段",
-	"sep.userSnippet": "使用者程式碼片段",
-	"sep.extSnippet": "延伸模組程式碼片段"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json b/i18n/cht/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json
deleted file mode 100644
index 179e7258b66..00000000000
--- a/i18n/cht/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"snippetSchema.json.default": "空白程式碼片段",
-	"snippetSchema.json": "使用者程式碼片段組態",
-	"snippetSchema.json.prefix": "在 Intellisense 中選取程式碼片段時要使用的前置詞",
-	"snippetSchema.json.body": "程式碼片段內容。請使用 '$1', '${1:defaultText}' 以定義游標位置，並使用 '$0' 定義最終游標位置。將 '${varName}' and '${varName:defaultText}' 插入變數值，例如 'This is file: $TM_FILENAME'。",
-	"snippetSchema.json.description": "程式碼片段描述。",
-	"snippetSchema.json.scope": "適用此程式碼片段的程式語言列表，如：'typescript,javascript'。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json b/i18n/cht/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json
deleted file mode 100644
index 41c38916afd..00000000000
--- a/i18n/cht/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"source.snippetGlobal": "全域使用者程式碼片段",
-	"source.snippet": "使用者程式碼片段"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json b/i18n/cht/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
deleted file mode 100644
index 763c92b7367..00000000000
--- a/i18n/cht/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"invalid.path.0": "'contributes.{0}.path' 中應有字串。提供的值: {1}",
-	"invalid.language.0": "省略語言時，`contributes.{0}.path` 的值必須是 `.code-snippets`-file。您目前提供的值：{1}",
-	"invalid.language": "`contributes.{0}.language` 中的不明語言。提供的值: {1}",
-	"invalid.path.1": "擴充功能資料夾 ({2}) 應包含 'contributes.{0}.path' ({1})。這可能會導致擴充功能無法移植。",
-	"vscode.extension.contributes.snippets": "提供程式碼片段。",
-	"vscode.extension.contributes.snippets-language": "要予以提供此程式碼片段的語言識別碼。",
-	"vscode.extension.contributes.snippets-path": "程式碼片段檔案的路徑。此路徑是擴充功能資料夾的相對路徑，而且一般會以 './snippets/' 開頭。",
-	"badVariableUse": "來自延伸模組 '{0}' 的一或多個程式碼片段很可能會混淆程式碼片段變數和程式碼片段預留位置 (如需更多詳細資料，請參閱 https://code.visualstudio.com/docs/editor/userdefinedsnippets#_snippet-syntax)",
-	"badFile": "無法讀取程式碼片段檔案 \"{0}\"。",
-	"detail.snippet": "{0} ({1})",
-	"snippetSuggest.longLabel": "{0}，{1}"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/snippets/electron-browser/tabCompletion.i18n.json b/i18n/cht/src/vs/workbench/parts/snippets/electron-browser/tabCompletion.i18n.json
deleted file mode 100644
index 040ef0a44eb..00000000000
--- a/i18n/cht/src/vs/workbench/parts/snippets/electron-browser/tabCompletion.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"tabCompletion": "在前置詞相符時插入程式碼片段。最適用於未啟用 'quickSuggestions' 時。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/surveys/electron-browser/languageSurveys.contribution.i18n.json b/i18n/cht/src/vs/workbench/parts/surveys/electron-browser/languageSurveys.contribution.i18n.json
deleted file mode 100644
index 0d09e32233d..00000000000
--- a/i18n/cht/src/vs/workbench/parts/surveys/electron-browser/languageSurveys.contribution.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"helpUs": "協助我們改善{0}",
-	"takeShortSurvey": "填寫簡短調查問卷",
-	"remindLater": "稍後再提醒我",
-	"neverAgain": "不要再顯示"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/surveys/electron-browser/nps.contribution.i18n.json b/i18n/cht/src/vs/workbench/parts/surveys/electron-browser/nps.contribution.i18n.json
deleted file mode 100644
index 4b75935cfb3..00000000000
--- a/i18n/cht/src/vs/workbench/parts/surveys/electron-browser/nps.contribution.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"surveyQuestion": "您願意填寫簡短的意見反應問卷嗎?",
-	"takeSurvey": "填寫問卷",
-	"remindLater": "稍後再提醒我",
-	"neverAgain": "不要再顯示"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/tasks/browser/buildQuickOpen.i18n.json b/i18n/cht/src/vs/workbench/parts/tasks/browser/buildQuickOpen.i18n.json
deleted file mode 100644
index 8ccb1a38284..00000000000
--- a/i18n/cht/src/vs/workbench/parts/tasks/browser/buildQuickOpen.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"noTasksMatching": "沒有工作相符"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/tasks/browser/quickOpen.i18n.json b/i18n/cht/src/vs/workbench/parts/tasks/browser/quickOpen.i18n.json
deleted file mode 100644
index 849b8f4c346..00000000000
--- a/i18n/cht/src/vs/workbench/parts/tasks/browser/quickOpen.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"entryAriaLabel": "{0}，工作",
-	"recentlyUsed": "最近使用的工作",
-	"configured": "設定的工作",
-	"detected": "偵測到的工作",
-	"customizeTask": "設定工作"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/tasks/browser/restartQuickOpen.i18n.json b/i18n/cht/src/vs/workbench/parts/tasks/browser/restartQuickOpen.i18n.json
deleted file mode 100644
index b0cd09ce051..00000000000
--- a/i18n/cht/src/vs/workbench/parts/tasks/browser/restartQuickOpen.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"tasksAriaLabel": "請鍵入要重新啟動的工作名稱",
-	"noTasksMatching": "沒有工作相符",
-	"noTasksFound": "找不到工作可重新啟動"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/tasks/browser/taskQuickOpen.i18n.json b/i18n/cht/src/vs/workbench/parts/tasks/browser/taskQuickOpen.i18n.json
deleted file mode 100644
index 832cb6e4582..00000000000
--- a/i18n/cht/src/vs/workbench/parts/tasks/browser/taskQuickOpen.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"tasksAriaLabel": "輸入要執行的工作名稱",
-	"noTasksMatching": "No tasks matching",
-	"noTasksFound": "找不到工作"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/tasks/browser/terminateQuickOpen.i18n.json b/i18n/cht/src/vs/workbench/parts/tasks/browser/terminateQuickOpen.i18n.json
deleted file mode 100644
index 082d82831c9..00000000000
--- a/i18n/cht/src/vs/workbench/parts/tasks/browser/terminateQuickOpen.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"tasksAriaLabel": "Type the name of a task to terminate",
-	"noTasksMatching": "沒有相符的工作",
-	"noTasksFound": "No tasks to terminate found"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/tasks/browser/testQuickOpen.i18n.json b/i18n/cht/src/vs/workbench/parts/tasks/browser/testQuickOpen.i18n.json
deleted file mode 100644
index 8ccb1a38284..00000000000
--- a/i18n/cht/src/vs/workbench/parts/tasks/browser/testQuickOpen.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"noTasksMatching": "沒有工作相符"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json b/i18n/cht/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json
deleted file mode 100644
index bd7d5bfc2f7..00000000000
--- a/i18n/cht/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json
+++ /dev/null
@@ -1,76 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"ProblemPatternParser.loopProperty.notLast": "只有最後一行比對器才支援迴圈屬性。",
-	"ProblemPatternParser.problemPattern.kindProperty.notFirst": "問題模式無效。 這類屬性只能在第一個元素中提供",
-	"ProblemPatternParser.problemPattern.missingRegExp": "此問題模式缺少規則運算式。",
-	"ProblemPatternParser.problemPattern.missingProperty": "問題模式無效。其必須至少有一個檔案及訊息。",
-	"ProblemPatternParser.problemPattern.missingLocation": "問題模式無效。其必須有任一類型: \"檔案\" 或者是有行或位置符合群組。 ",
-	"ProblemPatternParser.invalidRegexp": "錯誤: 字串 {0} 不是有效的規則運算式。\n",
-	"ProblemPatternSchema.regexp": "規則運算式，用來在輸出中尋找錯誤、警告或資訊。",
-	"ProblemPatternSchema.kind": "該模式是否符合位置 (檔案和行) 或僅符合檔案。",
-	"ProblemPatternSchema.file": "檔案名稱的符合群組索引。如果省略，則會使用 1。",
-	"ProblemPatternSchema.location": "問題之位置的符合群組索引。有效的位置模式為: (line)、(line,column) 和 (startLine,startColumn,endLine,endColumn)。如果省略，則會假設 (line,column)。",
-	"ProblemPatternSchema.line": "問題之行的符合群組索引。預設為 2",
-	"ProblemPatternSchema.column": "問題行中字元的符合群組索引。預設為 3",
-	"ProblemPatternSchema.endLine": "問題之結尾行的符合群組索引。預設為未定義",
-	"ProblemPatternSchema.endColumn": "問題之結尾行字元的符合群組索引。預設為未定義",
-	"ProblemPatternSchema.severity": "問題之嚴重性的符合群組索引。預設為未定義",
-	"ProblemPatternSchema.code": "問題之代碼的符合群組索引。預設為未定義",
-	"ProblemPatternSchema.message": "訊息的符合群組索引。如果省略並指定位置，預設為 4。否則預設為 5。",
-	"ProblemPatternSchema.loop": "在多行比對器迴圈中，指出此模式是否只要相符就會以迴圈執行。只能在多行模式中的最後一個模式指定。",
-	"NamedProblemPatternSchema.name": "問題模式的名稱。",
-	"NamedMultiLineProblemPatternSchema.name": "多行問題模式的名稱。",
-	"NamedMultiLineProblemPatternSchema.patterns": "實際的模式。",
-	"ProblemPatternExtPoint": "提供問題模式",
-	"ProblemPatternRegistry.error": "問題模式無效。此模式將予忽略。",
-	"ProblemMatcherParser.noProblemMatcher": "錯誤: 無法將描述轉換成問題比對器:\n{0}\n",
-	"ProblemMatcherParser.noProblemPattern": "錯誤: 描述未定義有效的問題樣式:\n{0}\n",
-	"ProblemMatcherParser.noOwner": "錯誤: 描述未定義擁有者:\n{0}\n",
-	"ProblemMatcherParser.noFileLocation": "錯誤: 描述未定義檔案位置:\n{0}\n",
-	"ProblemMatcherParser.unknownSeverity": "資訊: 嚴重性 {0} 不明。有效值為錯誤、警告和資訊。\n",
-	"ProblemMatcherParser.noDefinedPatter": "錯誤: 沒有識別碼為 {0} 的樣式。",
-	"ProblemMatcherParser.noIdentifier": "錯誤: 樣式屬性參考了空的識別碼。",
-	"ProblemMatcherParser.noValidIdentifier": "錯誤: 樣式屬性 {0} 不是有效的樣式變數名稱。",
-	"ProblemMatcherParser.problemPattern.watchingMatcher": "問題比對器必須同時定義監控的開始模式和結束模式。",
-	"ProblemMatcherParser.invalidRegexp": "錯誤: 字串 {0} 不是有效的規則運算式。\n",
-	"WatchingPatternSchema.regexp": "用來查看偵測背景工作開始或結束的正規表達式.",
-	"WatchingPatternSchema.file": "檔案名稱的符合群組索引。可以省略。",
-	"PatternTypeSchema.name": "所提供或預先定義之模式的名稱",
-	"PatternTypeSchema.description": "問題模式或所提供或預先定義之問題模式的名稱。如有指定基底，即可發出。",
-	"ProblemMatcherSchema.base": "要使用之基底問題比對器的名稱。",
-	"ProblemMatcherSchema.owner": "Code 內的問題擁有者。如果指定基底，則可以省略。如果省略且未指定基底，預設為 [外部]。",
-	"ProblemMatcherSchema.source": "可供人們閱讀的診斷描述來源，例如 'typescript' 或 'super lint'。",
-	"ProblemMatcherSchema.severity": "擷取項目問題的預設嚴重性。如果模式未定義嚴重性的符合群組，就會加以使用。",
-	"ProblemMatcherSchema.applyTo": "控制文字文件上所回報的問題僅會套用至開啟的文件、關閉的文件或所有文件。",
-	"ProblemMatcherSchema.fileLocation": "定義問題模式中所回報檔案名稱的解譯方式。",
-	"ProblemMatcherSchema.background": "偵測後台任務中匹配程序模式的開始與結束.",
-	"ProblemMatcherSchema.background.activeOnStart": "如果設置為 True，背景監控程式在工作啟動時處於主動模式。這相當於符合起始樣式的行。",
-	"ProblemMatcherSchema.background.beginsPattern": "如果於輸出中相符，則會指示背景程式開始。",
-	"ProblemMatcherSchema.background.endsPattern": "如果於輸出中相符，則會指示背景程式結束。",
-	"ProblemMatcherSchema.watching.deprecated": "關注屬性已被淘汰，請改用背景取代。",
-	"ProblemMatcherSchema.watching": "追蹤匹配程序的開始與結束。",
-	"ProblemMatcherSchema.watching.activeOnStart": "如果設定為 True，監控程式在工作啟動時處於主動模式。這相當於發出符合 beginPattern 的行",
-	"ProblemMatcherSchema.watching.beginsPattern": "如果在輸出中相符，則會指示監看工作開始。",
-	"ProblemMatcherSchema.watching.endsPattern": "如果在輸出中相符，則會指示監看工作結束。",
-	"LegacyProblemMatcherSchema.watchedBegin.deprecated": "此屬性即將淘汰。請改用關注的屬性。",
-	"LegacyProblemMatcherSchema.watchedBegin": "規則運算式，指示監看的工作開始執行 (透過檔案監看觸發)。",
-	"LegacyProblemMatcherSchema.watchedEnd.deprecated": "此屬性即將淘汰。請改用關注的屬性。",
-	"LegacyProblemMatcherSchema.watchedEnd": "規則運算式，指示監看的工作結束執行。",
-	"NamedProblemMatcherSchema.name": "用來參考其問題比對器的名稱。",
-	"NamedProblemMatcherSchema.label": "易讀的問題比對器標籤。",
-	"ProblemMatcherExtPoint": "提供問題比對器",
-	"msCompile": "Microsoft  編譯器問題 ",
-	"lessCompile": "較少的問題",
-	"gulp-tsc": "Gulp TSC 問題",
-	"jshint": "JSHint 問題",
-	"jshint-stylish": "JSHint 樣式問題",
-	"eslint-compact": "ESLint 壓縮問題",
-	"eslint-stylish": "ESLint 樣式問題",
-	"go": "前往問題"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/tasks/common/taskConfiguration.i18n.json b/i18n/cht/src/vs/workbench/parts/tasks/common/taskConfiguration.i18n.json
deleted file mode 100644
index 9320c66c86f..00000000000
--- a/i18n/cht/src/vs/workbench/parts/tasks/common/taskConfiguration.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"ConfigurationParser.invalidCWD": "警告: options.cwd 必須屬於字串類型。即將忽略值 {0}。",
-	"ConfigurationParser.noargs": "錯誤: 命令引數必須是字串陣列。提供的值為:\n{0}",
-	"ConfigurationParser.noShell": "警告: 只有在終端機中執行工作時才支援殼層組態。",
-	"ConfigurationParser.noName": "錯誤: 宣告範圍中的問題比對器必須有名稱:\n{0}\n",
-	"ConfigurationParser.unknownMatcherKind": "警告: 定義的問題比對器未知。支援的類型為 string | ProblemMatcher | (string | ProblemMatcher)[]。\n{0}\n",
-	"ConfigurationParser.invalidVaraibleReference": "錯誤: problemMatcher 參考無效: {0}\n",
-	"ConfigurationParser.noTaskName": "錯誤: 工作必須提供 taskName 屬性。即將忽略此工作。\n{0}\n",
-	"taskConfiguration.shellArgs": "警告: 工作 '{0}' 是殼層命令，但命令名稱或其中一個引數有的未逸出的空格。若要確保命令列正確引述，請將引數合併到命令中。",
-	"taskConfiguration.noCommandOrDependsOn": "錯誤: 工作 '{0}' 未指定命令與 dependsOn 屬性。將會略過該工作。其定義為: \n{1}",
-	"taskConfiguration.noCommand": "錯誤: 工作 '{0}' 未定義命令。即將略過該工作。其定義為:\n{1}"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/tasks/common/taskDefinitionRegistry.i18n.json b/i18n/cht/src/vs/workbench/parts/tasks/common/taskDefinitionRegistry.i18n.json
deleted file mode 100644
index d2490129cbf..00000000000
--- a/i18n/cht/src/vs/workbench/parts/tasks/common/taskDefinitionRegistry.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"TaskDefinition.description": "實際工作類型。請注意以 '$' 作為開頭的類型皆為內部使用保留。",
-	"TaskDefinition.properties": "工作類型的其他屬性",
-	"TaskTypeConfiguration.noType": "工作類型組態遺失需要的 'taskType' 屬性",
-	"TaskDefinitionExtPoint": "提供工作種類"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/tasks/common/taskTemplates.i18n.json b/i18n/cht/src/vs/workbench/parts/tasks/common/taskTemplates.i18n.json
deleted file mode 100644
index 70aec8182bb..00000000000
--- a/i18n/cht/src/vs/workbench/parts/tasks/common/taskTemplates.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"dotnetCore": "執行 .NET Core 建置命令",
-	"msbuild": "執行建置目標",
-	"externalCommand": "執行任意外部命令的範例",
-	"Maven": "執行一般 maven 命令"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/tasks/common/taskTypeRegistry.i18n.json b/i18n/cht/src/vs/workbench/parts/tasks/common/taskTypeRegistry.i18n.json
deleted file mode 100644
index 8b6ad71cd4e..00000000000
--- a/i18n/cht/src/vs/workbench/parts/tasks/common/taskTypeRegistry.i18n.json
+++ /dev/null
@@ -1,6 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/tasks/electron-browser/jsonSchemaCommon.i18n.json b/i18n/cht/src/vs/workbench/parts/tasks/electron-browser/jsonSchemaCommon.i18n.json
deleted file mode 100644
index 5d4d51107a4..00000000000
--- a/i18n/cht/src/vs/workbench/parts/tasks/electron-browser/jsonSchemaCommon.i18n.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"JsonSchema.options": "其他命令選項",
-	"JsonSchema.options.cwd": "所執行程式或指令碼的目前工作目錄。如果省略，則會使用 Code 的目前工作區根目錄。",
-	"JsonSchema.options.env": "所執行程式或殼層的環境。如果省略，則會使用父處理序的環境。",
-	"JsonSchema.shellConfiguration": "設定要使用的殼層。",
-	"JsonSchema.shell.executable": "要使用的殼層。",
-	"JsonSchema.shell.args": "殼層引數。",
-	"JsonSchema.command": "要執行的命令。可以是外部程式或殼層命令。",
-	"JsonSchema.tasks.args": "叫用此工作時，傳遞至命令的引數。",
-	"JsonSchema.tasks.taskName": "工作的名稱",
-	"JsonSchema.tasks.windows": "Windows 特定命令組態",
-	"JsonSchema.tasks.mac": "Mac 特定命令組態",
-	"JsonSchema.tasks.linux": "Linux 特定命令組態",
-	"JsonSchema.tasks.suppressTaskName": "控制是否將工作名稱當做引數加入命令中。如果省略，則會使用全域定義的值。",
-	"JsonSchema.tasks.showOutput": "控制是否顯示執行中工作的輸出。如果省略，則會使用全域定義的值。",
-	"JsonSchema.echoCommand": "控制是否將執行的命令傳到輸出。預設為 False。",
-	"JsonSchema.tasks.watching.deprecation": "已被取代。請改用 isBackground。",
-	"JsonSchema.tasks.watching": "執行的工作是否保持運作且正在監看檔案系統。",
-	"JsonSchema.tasks.background": "執行的工作是否保持運作且正在背景執行。",
-	"JsonSchema.tasks.promptOnClose": "是否在 VS Code 有執行中工作的狀態下關閉時提示使用者。",
-	"JsonSchema.tasks.build": "將此工作對應至 Code 的預設建置命令。",
-	"JsonSchema.tasks.test": "將此工作對應至 Code 的預設測試命令。",
-	"JsonSchema.tasks.matchers": "要使用的問題比對器。可以是字串或問題比對器定義，或是字串和問題比對器陣列。",
-	"JsonSchema.args": "傳遞至命令的其他引數。",
-	"JsonSchema.showOutput": "控制是否顯示執行中工作的輸出。如果省略，則會使用 [永遠]。",
-	"JsonSchema.watching.deprecation": "已被取代。請改用 isBackground。",
-	"JsonSchema.watching": "執行的工作是否保持運作且正在監看檔案系統。",
-	"JsonSchema.background": "執行的工作是否保持運作且正在背景執行。",
-	"JsonSchema.promptOnClose": "是否在 VSCode 以執行中的背景工作關閉時提示使用者。",
-	"JsonSchema.suppressTaskName": "控制是否將工作名稱當做引數加入命令中。預設為 False。",
-	"JsonSchema.taskSelector": "前置詞，表示引數是工作。",
-	"JsonSchema.matchers": "要使用的問題比對器。可以是字串或問題比對器定義，或是字串和問題比對器陣列。",
-	"JsonSchema.tasks": "工作組態。這些通常是在外部工作執行器中已定義的工作擴充。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v1.i18n.json b/i18n/cht/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v1.i18n.json
deleted file mode 100644
index 096a88f4c0e..00000000000
--- a/i18n/cht/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v1.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"JsonSchema.version": "組態的版本號碼",
-	"JsonSchema._runner": "執行器已結束支援.請參考官方執行器屬性",
-	"JsonSchema.runner": "定義工作是否作為處理序執行，以及輸出會顯示在輸出視窗或終端機內。",
-	"JsonSchema.windows": "Windows 特定命令組態",
-	"JsonSchema.mac": "Mac 特定命令組態",
-	"JsonSchema.linux": "Linux 特定命令組態",
-	"JsonSchema.shell": "指定此命令是殼層命令或外部程式。如果省略，預設為 False。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json b/i18n/cht/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
deleted file mode 100644
index 9a7f1ae5245..00000000000
--- a/i18n/cht/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"JsonSchema.shell": "指定此命令是殼層命令或外部程式。如果省略，預設為 False。",
-	"JsonSchema.tasks.isShellCommand.deprecated": "已淘汰屬性 isShellCommand。請改為在 [選項] 中使用型別屬性及殼層屬性。此外也請參閱 1.14 版本資訊。",
-	"JsonSchema.tasks.dependsOn.string": "此工作相依的另一個工作。",
-	"JsonSchema.tasks.dependsOn.array": "此工作相依的其他工作。",
-	"JsonSchema.tasks.presentation": "設定面板，用於呈現工作的輸出並讀取其輸入。",
-	"JsonSchema.tasks.presentation.echo": "控制是否會將執行的命令回應給面板。預設為 true。",
-	"JsonSchema.tasks.presentation.focus": "控制面板是否要接受焦點。預設為 true。若設定為 true，也會使顯示面板。",
-	"JsonSchema.tasks.presentation.reveal.always": "執行此工作時，一律顯示終端機。",
-	"JsonSchema.tasks.presentation.reveal.silent": "沒有與工作相關的問題比對器，且執行未發生錯誤時，才顯示終端機。",
-	"JsonSchema.tasks.presentation.reveal.never": "執行此工作時，永不顯示終端機。",
-	"JsonSchema.tasks.presentation.reveals": "控制是否要顯示執行工作的面板。預設為 [永遠]。",
-	"JsonSchema.tasks.presentation.instance": "控制面板是否會在工作之間共用、專屬於此工作或是在每個回合建立一個新的面板。",
-	"JsonSchema.tasks.terminal": "已淘汰終端機屬性。請改用簡報",
-	"JsonSchema.tasks.group.kind": "該工作的執行群組。",
-	"JsonSchema.tasks.group.isDefault": "定義此工作在群組中是否為預設工作。",
-	"JsonSchema.tasks.group.defaultBuild": "將工作標記為預設組建工作。",
-	"JsonSchema.tasks.group.defaultTest": "將工作標記為預設測試工作。",
-	"JsonSchema.tasks.group.build": "將工作標記為組建工作，並且能使用 [執行組建工作] 命令存取。",
-	"JsonSchema.tasks.group.test": "將工作標記為組建工作，並且能使用 [執行測試工作] 命令存取。",
-	"JsonSchema.tasks.group.none": "指派工作到沒有群組",
-	"JsonSchema.tasks.group": "定義工作屬於哪個執行群組。支援將 「組建」新增到組建群組，以及將「測試」新增到測試群組。",
-	"JsonSchema.tasks.type": "定義工作在殼層中會作為處理序或命令來執行。",
-	"JsonSchema.commandArray": "要執行的 shell 命令。陣列項目會以空白字元連接",
-	"JsonSchema.command.quotedString.value": "實際命令值",
-	"JsonSchema.tasks.quoting.escape": "使用殼層逸出字元的逸出字元 (例如  ` under PowerShell 與 \\ under bash)。",
-	"JsonSchema.tasks.quoting.strong": "使用殼層的強式引號字元將引數括住 (例如 PowerShell 及 Bash 下的 \")。",
-	"JsonSchema.tasks.quoting.weak": "使用殼層的弱式引號字元將引數括住 (例如 PowerShell 及 Bash 下的 ')",
-	"JsonSchema.command.quotesString.quote": "如何引用命令值。",
-	"JsonSchema.command": "要執行的命令。可以是外部程式或殼層命令。",
-	"JsonSchema.args.quotedString.value": "實際參數值",
-	"JsonSchema.args.quotesString.quote": "如何引用參數值。",
-	"JsonSchema.tasks.args": "叫用此工作時，傳遞至命令的引數。",
-	"JsonSchema.tasks.label": "工作的使用者介面標籤",
-	"JsonSchema.version": "組態版本號碼",
-	"JsonSchema.tasks.identifier": "用以參考在 launch.json 或 dependsOn 子句中工作的使用者定義識別碼。",
-	"JsonSchema.tasks.taskLabel": "工作的標籤",
-	"JsonSchema.tasks.taskName": "工作的名稱",
-	"JsonSchema.tasks.taskName.deprecated": "已淘汰工作的名稱屬性。請改用標籤屬性。",
-	"JsonSchema.tasks.background": "執行的工作是否保持運作且正在背景執行。",
-	"JsonSchema.tasks.promptOnClose": "是否在 VS Code 有執行中工作的狀態下關閉時提示使用者。",
-	"JsonSchema.tasks.matchers": "要使用的問題比對器。可以是字串或問題比對器定義，或是字串和問題比對器陣列。",
-	"JsonSchema.customizations.customizes.type": "要自訂的工作類型",
-	"JsonSchema.tasks.customize.deprecated": "已淘汰自訂屬性。請參閱 1.14 版本資訊，以了解如何遷移到新的工作自訂方法",
-	"JsonSchema.tasks.showOputput.deprecated": "已淘汰屬性 showOutput。請改用簡報屬性中的顯示屬性。此外也請參閱 1.14 版本資訊。",
-	"JsonSchema.tasks.echoCommand.deprecated": "已淘汰屬性 echoCommand。請改用簡報屬性中的回應屬性。此外也請參閱 1.14 版本資訊。 ",
-	"JsonSchema.tasks.suppressTaskName.deprecated": "屬性 suppressTaskName 已淘汰。請改為將命令與其引數內嵌至工作。另請參閱 1.14 版本資訊。",
-	"JsonSchema.tasks.isBuildCommand.deprecated": "已淘汰屬性 isBuildCommand。請改用群組屬性。此外也請參閱 1.14 版本資訊。",
-	"JsonSchema.tasks.isTestCommand.deprecated": "已淘汰屬性 isTestCommand。請改用群組屬性。此外也請參閱 1.14 版本資訊。",
-	"JsonSchema.tasks.taskSelector.deprecated": "屬性 taskSelector 已淘汰。請改為將命令與其引數內嵌至工作。另請參閱 1.14 版本資訊。 ",
-	"JsonSchema.windows": "Windows 特定命令組態",
-	"JsonSchema.mac": "Mac 特定命令組態",
-	"JsonSchema.linux": "Linux 特定命令組態"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json b/i18n/cht/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
deleted file mode 100644
index a13d5229d23..00000000000
--- a/i18n/cht/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
+++ /dev/null
@@ -1,89 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"tasksCategory": "工作",
-	"ConfigureTaskRunnerAction.label": "設定工作",
-	"totalErrors": "{0} 個錯誤",
-	"totalWarnings": "{0} 個警告",
-	"totalInfos": "{0} 個資訊",
-	"problems": "問題",
-	"building": "建置中...",
-	"manyProblems": "10K+",
-	"runningTasks": "顯示執行中的工作",
-	"tasks": "工作",
-	"TaskSystem.noHotSwap": "必須重新載入視窗才可變更執行使用中工作的工作執行引擎",
-	"reloadWindow": "重新載入視窗",
-	"TaskServer.folderIgnored": "因為資料夾 {0} 使用工作版本 0.1.0，所以已將其忽略",
-	"TaskService.noBuildTask1": "未定義任何建置工作。請使用 'isBuildCommand' 標記 tasks.json 檔案中的工作。",
-	"TaskService.noBuildTask2": "未定義任何組建工作，請在 tasks.json 檔案中將工作標記為 'build' 群組。",
-	"TaskService.noTestTask1": "未定義任何建置工作。請使用 'isTestCommand' 標記 tasks.json 檔案中的工作。",
-	"TaskService.noTestTask2": "未定義任何測試工作，請在 tasks.json 檔案中將工作標記為 'test' 群組。",
-	"TaskServer.noTask": "找不到所要求要執行的工作 {0}。",
-	"TaskService.associate": "建立關聯",
-	"TaskService.attachProblemMatcher.continueWithout": "在不掃描工作輸出的情況下繼續",
-	"TaskService.attachProblemMatcher.never": "永不掃描工作輸出",
-	"TaskService.attachProblemMatcher.learnMoreAbout": "深入了解掃描工作輸出",
-	"selectProblemMatcher": "選取錯誤和警告的種類以掃描工作輸出",
-	"customizeParseErrors": "當前的工作組態存在錯誤.請更正錯誤再執行工作.",
-	"moreThanOneBuildTask": "定義了很多建置工作於tasks.json.執行第一個.",
-	"TaskSystem.activeSame.background": "工作 '{0}' 已在使用中並且處於背景模式。",
-	"TaskSystem.activeSame.noBackground": "工作 '{0}' 已在使用中。",
-	"terminateTask": "終止工作",
-	"restartTask": "重新啟動工作",
-	"TaskSystem.active": "已有工作在執行。請先終止該工作，然後再執行其他工作。",
-	"TaskSystem.restartFailed": "無法終止再重新啟動工作 {0}",
-	"TaskService.noConfiguration": "錯誤: {0} 工作偵測未替下列組態提供工作:\n{1}\n將會忽略該工作。\n",
-	"TaskSystem.configurationErrors": "錯誤: 提供的工作組態具有驗證錯誤而無法使用。請先更正這些錯誤。",
-	"taskService.ignoreingFolder": "略過工作區資料夾 {0} 的工作組態。所有的資料夾都必須使用工作版本 2.0.0 才可使用多資料夾工作區工作支援\n",
-	"TaskSystem.invalidTaskJson": "錯誤: tasks.json 檔案的內容具有語法錯誤。請更正錯誤，再執行工作\n",
-	"TaskSystem.runningTask": "有一個工作正在執行。要終止工作嗎?",
-	"TaskSystem.terminateTask": "終止工作(&&T)",
-	"TaskSystem.noProcess": "啟動的工作已不存在。如果工作繁衍的背景處理序結束，VS Code 可能會產生孤立的處理序。若要避免此情況，請啟動有等候旗標的最後一個背景處理序。",
-	"TaskSystem.exitAnyways": "仍要結束(&&E)",
-	"TerminateAction.label": "終止工作",
-	"TaskSystem.unknownError": "執行工作時發生錯誤。如需詳細資訊，請參閱工作記錄檔。",
-	"TaskService.noWorkspace": "這些工作只會出現在工作區資料夾中。",
-	"recentlyUsed": "最近使用的工作",
-	"configured": "設定的工作",
-	"detected": "偵測到的工作",
-	"TaskService.ignoredFolder": "因為下列工作區資料夾使用工作版本 0.1.0，所以已略過: {0}",
-	"TaskService.notAgain": "不要再顯示",
-	"TaskService.pickRunTask": "請選取要執行的工作",
-	"TaslService.noEntryToRun": "找不到任何要執行的工作。請設定工作...",
-	"TaskService.fetchingBuildTasks": "正在擷取組建工作...",
-	"TaskService.pickBuildTask": "請選取要執行的組建工作",
-	"TaskService.noBuildTask": "找不到任何要執行的組建工作。請設定建置工作...",
-	"TaskService.fetchingTestTasks": "正在擷取測試工作...",
-	"TaskService.pickTestTask": "請選取要執行的測試工作",
-	"TaskService.noTestTaskTerminal": "找不到任何要執行的測試工作。請設定工作...",
-	"TaskService.tastToTerminate": "請選取要終止的工作",
-	"TaskService.noTaskRunning": "目前未執行任何工作",
-	"TerminateAction.noProcess": "啟動的處理序已不存在。如果工作繁衍的背景工作結束，VS Code 可能會產生孤立的處理序。",
-	"TerminateAction.failed": "無法終止執行中的工作",
-	"TaskService.tastToRestart": "請選取要重新啟動的工作",
-	"TaskService.noTaskToRestart": "沒有要重新啟動的工作",
-	"TaskService.template": "選取工作範本",
-	"TaskService.createJsonFile": "從範本建立 tasks.json 檔案",
-	"TaskService.openJsonFile": "開啟 tasks.json 檔案",
-	"TaskService.pickTask": "選取要設定的工作",
-	"TaskService.defaultBuildTaskExists": "已經將 {0} 標記為預設組建工作",
-	"TaskService.pickDefaultBuildTask": "請選取要用作預設組建工作的工作",
-	"TaskService.defaultTestTaskExists": "已經將 {0} 標記為預設測試工作。",
-	"TaskService.pickDefaultTestTask": "請選取要用作預設測試工作的工作",
-	"TaskService.pickShowTask": "選取要顯示輸出的工作",
-	"TaskService.noTaskIsRunning": "未執行任何工作",
-	"ShowLogAction.label": "顯示工作記錄檔",
-	"RunTaskAction.label": "執行工作",
-	"RestartTaskAction.label": "重新開始執行工作",
-	"ShowTasksAction.label": "顯示執行中的工作",
-	"BuildAction.label": "執行建置工作",
-	"TestAction.label": "執行測試工作",
-	"ConfigureDefaultBuildTask.label": "設定預設組建工作",
-	"ConfigureDefaultTestTask.label": "設定預設測試工作",
-	"quickOpen.task": "執行工作"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/tasks/electron-browser/taskPanel.i18n.json b/i18n/cht/src/vs/workbench/parts/tasks/electron-browser/taskPanel.i18n.json
deleted file mode 100644
index 664ea3c3e65..00000000000
--- a/i18n/cht/src/vs/workbench/parts/tasks/electron-browser/taskPanel.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"tasks": "工作"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.i18n.json b/i18n/cht/src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.i18n.json
deleted file mode 100644
index d74a43297d8..00000000000
--- a/i18n/cht/src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"TerminalTaskSystem.unknownError": "執行工作時發生不明錯誤。如需詳細資訊，請參閱工作輸出記錄檔。",
-	"dependencyFailed": "無法解決在工作區資料夾 '{1}' 中的相依工作 '{0}'",
-	"TerminalTaskSystem.terminalName": "工作 - {0}",
-	"closeTerminal": "按任意鍵關閉終端機。",
-	"reuseTerminal": "工作將被重新啟用.按任意鍵關閉.",
-	"TerminalTaskSystem": "無法使用 cmd.exe 在 UNC 磁碟機上執行 shell 命令。",
-	"unkownProblemMatcher": "問題比對器 {0} 無法解析，比對器將予忽略。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/tasks/node/processRunnerDetector.i18n.json b/i18n/cht/src/vs/workbench/parts/tasks/node/processRunnerDetector.i18n.json
deleted file mode 100644
index 11c40f3fbe1..00000000000
--- a/i18n/cht/src/vs/workbench/parts/tasks/node/processRunnerDetector.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"TaskSystemDetector.noGulpTasks": "執行 Gulp --tasks-simple 未列出任何工作。是否已執行 npm 安裝?",
-	"TaskSystemDetector.noJakeTasks": "執行 Jake --tasks 未列出任何工作。是否已執行 npm 安裝?",
-	"TaskSystemDetector.noGulpProgram": "您的系統尚未安裝 Gulp。請執行 npm install -g gulp 進行安裝。",
-	"TaskSystemDetector.noJakeProgram": "您的系統尚未安裝 Jake。請執行 npm install -g jake 進行安裝。",
-	"TaskSystemDetector.noGruntProgram": "您的系統尚未安裝 Grunt。請執行 npm install -g grunt 進行安裝。",
-	"TaskSystemDetector.noProgram": "找不到程式 {0}。訊息為 {1}",
-	"TaskSystemDetector.buildTaskDetected": "偵測到名為 '{0}' 的建置工作。",
-	"TaskSystemDetector.testTaskDetected": "偵測到名為 '{0}' 的測試工作。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/tasks/node/processTaskSystem.i18n.json b/i18n/cht/src/vs/workbench/parts/tasks/node/processTaskSystem.i18n.json
deleted file mode 100644
index fab8a54604b..00000000000
--- a/i18n/cht/src/vs/workbench/parts/tasks/node/processTaskSystem.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"TaskRunnerSystem.unknownError": "執行工作時發生不明錯誤。如需詳細資訊，請參閱工作輸出記錄檔。",
-	"TaskRunnerSystem.watchingBuildTaskFinished": "\n監看建置工作已完成。",
-	"TaskRunnerSystem.childProcessError": "Failed to launch external program {0} {1}.",
-	"TaskRunnerSystem.cancelRequested": "\n根據使用者要求已終止工作 '{0}'。",
-	"unkownProblemMatcher": "問題比對器 {0} 無法解析，比對器將予忽略。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json b/i18n/cht/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
deleted file mode 100644
index b9d0cc54748..00000000000
--- a/i18n/cht/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"ConfigurationParser.invalidCWD": "警告: options.cwd 必須屬於字串類型。即將忽略值 {0}。",
-	"ConfigurationParser.inValidArg": "錯誤: 命令參數必須是字串或帶引號的字串。提供的值為:\n{0}",
-	"ConfigurationParser.noargs": "錯誤: 命令引數必須是字串陣列。提供的值為:\n{0}",
-	"ConfigurationParser.noShell": "警告: 只有在終端機中執行工作時才支援殼層組態。",
-	"ConfigurationParser.noName": "錯誤: 宣告範圍中的問題比對器必須有名稱:\n{0}\n",
-	"ConfigurationParser.unknownMatcherKind": "警告: 定義的問題比對器未知。支援的類型為 string | ProblemMatcher | (string | ProblemMatcher)[]。\n{0}\n",
-	"ConfigurationParser.invalidVaraibleReference": "錯誤: problemMatcher 參考無效: {0}\n",
-	"ConfigurationParser.noTaskType": "錯誤: 工作組態必須具有型別屬性。將會忽略該組態。\n{0}\n",
-	"ConfigurationParser.noTypeDefinition": "錯誤: 沒有已註冊工作類型 '{0}'。您是否忘記安裝提供相應工作提供者的延伸模組?",
-	"ConfigurationParser.missingRequiredProperty": "錯誤: 工作組態 '{0}' 缺少要求的屬性 '{1}'。會略過工作組態。",
-	"ConfigurationParser.notCustom": "錯誤: 未將工作宣告為自訂工作。將會忽略該組態。\n{0}\n",
-	"ConfigurationParser.noTaskName": "錯誤: 一項工作必須提供標籤屬性。即將忽略此工作。\n{0}\n",
-	"taskConfiguration.noCommandOrDependsOn": "錯誤: 工作 '{0}' 未指定命令與 dependsOn 屬性。將會略過該工作。其定義為: \n{1}",
-	"taskConfiguration.noCommand": "錯誤: 工作 '{0}' 未定義命令。即將略過該工作。其定義為:\n{1}",
-	"TaskParse.noOsSpecificGlobalTasks": "工作版本 2.0.0 不支援全域 OS 特定工作。請使用 OS 特定命令來轉換這些工作。受影響的工作為:\n{0}"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.i18n.json b/i18n/cht/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.i18n.json
deleted file mode 100644
index 7c11d510d10..00000000000
--- a/i18n/cht/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"termEntryAriaLabel": "{0} , 終端機選擇器",
-	"termCreateEntryAriaLabel": "{0}，建立新的終端機",
-	"workbench.action.terminal.newplus": "$(plus) 建立新的整合式終端機",
-	"noTerminalsMatching": "無相符的終端機",
-	"noTerminalsFound": "無開啟的終端機"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/terminal/common/terminalColorRegistry.i18n.json b/i18n/cht/src/vs/workbench/parts/terminal/common/terminalColorRegistry.i18n.json
deleted file mode 100644
index 2657899133e..00000000000
--- a/i18n/cht/src/vs/workbench/parts/terminal/common/terminalColorRegistry.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"terminal.background": "終端機的背景色彩，允許終端機和面板的色彩不同。",
-	"terminal.foreground": "終端機的前景色彩。",
-	"terminalCursor.foreground": "終端機游標的前景色彩。",
-	"terminalCursor.background": "終端機游標的背景色彩。允許區塊游標重疊於自訂字元色彩。",
-	"terminal.selectionBackground": "終端機的選取項目背景色彩。",
-	"terminal.border": "在終端機內將窗格分割之邊界的色彩。預設為 panel.border。",
-	"terminal.ansiColor": "終端機中的 '{0}' ANSI 色彩。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json b/i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
deleted file mode 100644
index dc4a98ed786..00000000000
--- a/i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"quickOpen.terminal": "顯示所有已開啟的終端機",
-	"terminal": "終端機",
-	"terminalIntegratedConfigurationTitle": "整合式終端機",
-	"terminal.integrated.shell.linux": "終端機在 Linux 上使用的殼層路徑。",
-	"terminal.integrated.shellArgs.linux": "在 Linux 終端機要使用的命令列引數。",
-	"terminal.integrated.shell.osx": "終端機在 OS X 上使用的殼層路徑。",
-	"terminal.integrated.shellArgs.osx": "在 OS X 終端機要使用的命令列引數。",
-	"terminal.integrated.shell.windows": "終端機在 Windows 上使用的殼層路徑。使用隨附於 Windows 的殼層 (cmd、PowerShell 或 Bash on Ubuntu) 時。",
-	"terminal.integrated.shellArgs.windows": "在 Windows 終端機上時要使用的命令列引數。",
-	"terminal.integrated.macOptionIsMeta": "將選項鍵視為 macOS 終端機中的 meta 鍵。",
-	"terminal.integrated.copyOnSelection": "當設定時，在終端機中選擇的文字將會被複製至剪貼簿",
-	"terminal.integrated.fontFamily": "控制終端機的字型家族，預設為 editor.fontFamily 的值。",
-	"terminal.integrated.fontSize": "控制終端機的字型大小 (以像素為單位)。",
-	"terminal.integrated.letterSpacing": "控制終端機的字元間距，這是一個整數值，用於呈現增加在字元間額外的像素量。",
-	"terminal.integrated.lineHeight": "控制終端機的行高，此數字會乘上終端機字型大小，以取得以像素為單位的實際行高。",
-	"terminal.integrated.fontWeight": "在終端機內使用非粗體文字的字體寬度。",
-	"terminal.integrated.fontWeightBold": "在終端機內使用粗體文字的字體寬度。",
-	"terminal.integrated.cursorBlinking": "控制終端機資料指標是否閃爍。",
-	"terminal.integrated.cursorStyle": "控制終端機資料指標的樣式。",
-	"terminal.integrated.scrollback": "控制終端機保留在其緩衝區中的行數上限。",
-	"terminal.integrated.setLocaleVariables": "控制是否在終端機啟動時設定地區設定變數，這在 OS X 上預設為 true，在其他平台則為 false。",
-	"terminal.integrated.rendererType": "控制終端的呈現方式, 選項為 \"canvas\" 為標準 (快速) 畫布轉譯器, \"dom\" 退回以 DOM-based 轉譯器, 或 \"auto\" 讓 VS Code 猜測哪個最好。此設置需要 VS Code 重新載入才能生效。",
-	"terminal.integrated.rightClickBehavior": "控制終端機對右鍵點擊反應方式，可為 \"default\", \"copyPaste\" 和 \"selectWord\"。 \"default\" 將顯示操作功能表，\"copyPaste\" 會在有選擇時複製，否則為貼上，\"selectWord\" 將選擇指標下的單字並顯示操作功能表。",
-	"terminal.integrated.cwd": "終端機啟動位置的明確起始路徑，這會用作殼層處理序的目前工作目錄 (cwd)。當根目錄不是方便的 cwd 時，這在工作區設定中特別好用。",
-	"terminal.integrated.confirmOnExit": "當有使用中的終端機工作階段時，是否要在結束時確認。",
-	"terminal.integrated.enableBell": "是否啟用終端機警告聲。",
-	"terminal.integrated.commandsToSkipShell": "一組命令識別碼，其按鍵繫結關係將不會傳送到殼層，而會一律由 Code 處理。這讓通常由殼層取用的按鍵繫結關係，在使用上與未聚焦於終端機時行為相同，例如 Ctrl+P 可啟動 Quick Open。",
-	"terminal.integrated.env.osx": "OS X 上的終端機要使用之具有將新增至 VS Code 流程之環境變數的物件",
-	"terminal.integrated.env.linux": "Linux 上的終端機要使用之具有將新增至 VS Code 流程之環境變數的物件",
-	"terminal.integrated.env.windows": "Windows 上的終端機要使用之具有將新增至 VS Code 流程之環境變數的物件",
-	"terminal.integrated.showExitAlert": "當結束代碼非 0，顯示警告訊息 '終端處理序已終止並回傳結束代碼'",
-	"terminal.integrated.experimentalRestore": "啟動 VS Code 是否會自動還原工作區的終端機工作階段。此設定處於實驗階段，可能會出現 Bug 或在之後有所變更。",
-	"terminalCategory": "終端機",
-	"viewCategory": "檢視"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json b/i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
deleted file mode 100644
index b65af1ec722..00000000000
--- a/i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
+++ /dev/null
@@ -1,63 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"workbench.action.terminal.toggleTerminal": "切換整合式終端機",
-	"workbench.action.terminal.kill": "終止使用中的終端機執行個體",
-	"workbench.action.terminal.kill.short": "終止終端機",
-	"workbench.action.terminal.quickKill": "終止終端機執行個體",
-	"workbench.action.terminal.copySelection": "複製選取項目",
-	"workbench.action.terminal.selectAll": "全選",
-	"workbench.action.terminal.deleteWordLeft": "刪除左方文字",
-	"workbench.action.terminal.deleteWordRight": "刪除右方文字",
-	"workbench.action.terminal.moveToLineStart": "移至行開端",
-	"workbench.action.terminal.moveToLineEnd": "移至行尾端",
-	"workbench.action.terminal.new": "建立新的整合式終端機",
-	"workbench.action.terminal.new.short": "新增終端機",
-	"workbench.action.terminal.newWorkspacePlaceholder": "為新的終端機選擇目前的工作目錄",
-	"workbench.action.terminal.newInActiveWorkspace": "建立新的整合式終端機 (於目前工作區)",
-	"workbench.action.terminal.split": "分割終端機",
-	"workbench.action.terminal.splitInActiveWorkspace": "分割終端機 (於使用中的工作區)",
-	"workbench.action.terminal.focusPreviousPane": "聚焦上一個窗格",
-	"workbench.action.terminal.focusNextPane": "聚焦下一個窗格",
-	"workbench.action.terminal.resizePaneLeft": "調整窗格左側",
-	"workbench.action.terminal.resizePaneRight": "調整窗格右側",
-	"workbench.action.terminal.resizePaneUp": "調整窗格上方",
-	"workbench.action.terminal.resizePaneDown": "調整窗格下方",
-	"workbench.action.terminal.focus": "聚焦終端機",
-	"workbench.action.terminal.focusNext": "聚焦下一個終端機",
-	"workbench.action.terminal.focusPrevious": "聚焦上一個終端機",
-	"workbench.action.terminal.paste": "貼入使用中的終端機",
-	"workbench.action.terminal.DefaultShell": "選取預設殼層",
-	"workbench.action.terminal.runSelectedText": "在使用中的終端機執行選取的文字",
-	"workbench.action.terminal.runActiveFile": "在使用中的終端機執行使用中的檔案",
-	"workbench.action.terminal.runActiveFile.noFile": "只有磁碟上的檔案可在終端機執行",
-	"workbench.action.terminal.switchTerminal": "切換終端機",
-	"workbench.action.terminal.scrollDown": "向下捲動 (行)",
-	"workbench.action.terminal.scrollDownPage": "向下捲動 (頁)",
-	"workbench.action.terminal.scrollToBottom": "捲動至底端",
-	"workbench.action.terminal.scrollUp": "向上捲動 (行)",
-	"workbench.action.terminal.scrollUpPage": "向上捲動 (頁)",
-	"workbench.action.terminal.scrollToTop": "捲動至頂端",
-	"workbench.action.terminal.clear": "清除",
-	"workbench.action.terminal.clearSelection": "清除選取項目",
-	"workbench.action.terminal.allowWorkspaceShell": "允許工作區外觀配置",
-	"workbench.action.terminal.disallowWorkspaceShell": "不允許工作區外觀設置",
-	"workbench.action.terminal.rename": "重新命名",
-	"workbench.action.terminal.rename.prompt": "輸入終端機名稱",
-	"workbench.action.terminal.focusFindWidget": "焦點尋找小工具",
-	"workbench.action.terminal.hideFindWidget": "隱藏尋找小工具",
-	"nextTerminalFindTerm": "顯示下一個尋找字詞",
-	"previousTerminalFindTerm": "顯示上一個尋找字詞",
-	"quickOpenTerm": "切換使用中的終端機 ",
-	"workbench.action.terminal.scrollToPreviousCommand": "捲動至上一個命令",
-	"workbench.action.terminal.scrollToNextCommand": "捲動至下一個命令",
-	"workbench.action.terminal.selectToPreviousCommand": "選取上一個命令",
-	"workbench.action.terminal.selectToNextCommand": "選取下一個命令",
-	"workbench.action.terminal.selectToPreviousLine": "選擇上一行",
-	"workbench.action.terminal.selectToNextLine": "選擇下一行"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json b/i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
deleted file mode 100644
index 2657899133e..00000000000
--- a/i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"terminal.background": "終端機的背景色彩，允許終端機和面板的色彩不同。",
-	"terminal.foreground": "終端機的前景色彩。",
-	"terminalCursor.foreground": "終端機游標的前景色彩。",
-	"terminalCursor.background": "終端機游標的背景色彩。允許區塊游標重疊於自訂字元色彩。",
-	"terminal.selectionBackground": "終端機的選取項目背景色彩。",
-	"terminal.border": "在終端機內將窗格分割之邊界的色彩。預設為 panel.border。",
-	"terminal.ansiColor": "終端機中的 '{0}' ANSI 色彩。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalConfigHelper.i18n.json b/i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalConfigHelper.i18n.json
deleted file mode 100644
index bd7b50f5243..00000000000
--- a/i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalConfigHelper.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"terminal.integrated.allowWorkspaceShell": "要允許 {0} (定義為工作區設定) 在終端機中啟動嗎?",
-	"allow": "Allow",
-	"disallow": "Disallow"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalFindWidget.i18n.json b/i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalFindWidget.i18n.json
deleted file mode 100644
index f2ff92bce07..00000000000
--- a/i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalFindWidget.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"label.find": "尋找",
-	"placeholder.find": "尋找",
-	"label.previousMatchButton": "上一個符合項",
-	"label.nextMatchButton": "下一個相符項",
-	"label.closeButton": "關閉"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json b/i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json
deleted file mode 100644
index 2737137686c..00000000000
--- a/i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"terminal.integrated.a11yBlankLine": "空白行",
-	"terminal.integrated.a11yPromptLabel": "終端機輸入",
-	"terminal.integrated.a11yTooMuchOutput": "要宣告的輸出過多，請手動讀取瀏覽至資料列",
-	"yes": "是",
-	"terminal.rendererInAllNewTerminals": "所有新建立的終端將使用非 GPU 的轉譯器。",
-	"no": "否",
-	"dontShowAgain": "不要再顯示",
-	"terminal.slowRendering": "整合終端的標準轉譯器在您的電腦上似乎很慢。 您是否想要切換以 Dom-based 轉譯器以提高效能? [閱讀更多有關終端設定的資訊] (https://code.visualstudio.com/docs/editor/integrated-terminal#_changing-how-the-terminal-is-rendered).",
-	"terminal.integrated.copySelection.noSelection": "終端機沒有任何選取項目可以複製",
-	"terminal.integrated.exitedWithCode": "終端機處理序已終止，結束代碼為: {0}",
-	"terminal.integrated.waitOnExit": "按任意鍵關閉終端機",
-	"terminal.integrated.launchFailed": "無法啟動終端機處理序命令 '{0}{1}' (結束代碼: {2})",
-	"terminal.integrated.launchFailedExtHost": "終端機處理序無法啟動 (結束代碼: {0})"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalLinkHandler.i18n.json b/i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalLinkHandler.i18n.json
deleted file mode 100644
index f4857902aa5..00000000000
--- a/i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalLinkHandler.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"terminalLinkHandler.followLinkAlt": "按住Alt並點擊以追蹤連結",
-	"terminalLinkHandler.followLinkCmd": "按住 Cmd 並按一下滑鼠按鈕可連入連結",
-	"terminalLinkHandler.followLinkCtrl": "按住 Ctrl 並按一下滑鼠按鈕可連入連結"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json b/i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json
deleted file mode 100644
index 062e848be34..00000000000
--- a/i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"terminal.useMonospace": "使用 'monospace'",
-	"terminal.monospaceOnly": "終端機僅支援等距字體。",
-	"copy": "複製",
-	"split": "分割",
-	"paste": "貼上",
-	"selectAll": "全選",
-	"clear": "清除"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json b/i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
deleted file mode 100644
index 55ce4576943..00000000000
--- a/i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"terminal.integrated.chooseWindowsShellInfo": "您可以選取 [自訂] 按鈕變更預設的終端機殼層。",
-	"customize": "自訂",
-	"never again": "不要再顯示",
-	"terminal.integrated.chooseWindowsShell": "請選取所需的終端機殼層。您之後可以在設定中變更此選擇",
-	"terminalService.terminalCloseConfirmationSingular": "仍有一個使用中的終端機工作階段。要予以終止嗎?",
-	"terminalService.terminalCloseConfirmationPlural": "目前共有 {0} 個使用中的終端機工作階段。要予以終止嗎?"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/themes/electron-browser/themes.contribution.i18n.json b/i18n/cht/src/vs/workbench/parts/themes/electron-browser/themes.contribution.i18n.json
deleted file mode 100644
index 40c930f8fa9..00000000000
--- a/i18n/cht/src/vs/workbench/parts/themes/electron-browser/themes.contribution.i18n.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"selectTheme.label": "色彩佈景主題",
-	"themes.category.light": "淺色主題",
-	"themes.category.dark": "深色主題",
-	"themes.category.hc": "高對比主題",
-	"installColorThemes": "安裝其他的色彩佈景主題...",
-	"themes.selectTheme": "選取色彩主題(上/下鍵預覽)",
-	"selectIconTheme.label": "檔案圖示佈景主題",
-	"noIconThemeLabel": "無",
-	"noIconThemeDesc": "停用檔案圖示",
-	"installIconThemes": "安裝其他的檔案圖示主題...",
-	"themes.selectIconTheme": "選取檔案圖示佈景主題",
-	"generateColorTheme.label": "依目前的設定產生色彩佈景主題",
-	"preferences": "喜好設定",
-	"developer": "開發人員"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/trust/electron-browser/unsupportedWorkspaceSettings.contribution.i18n.json b/i18n/cht/src/vs/workbench/parts/trust/electron-browser/unsupportedWorkspaceSettings.contribution.i18n.json
deleted file mode 100644
index 0b5ee94a971..00000000000
--- a/i18n/cht/src/vs/workbench/parts/trust/electron-browser/unsupportedWorkspaceSettings.contribution.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openWorkspaceSettings": "開啟工作區設定",
-	"dontShowAgain": "不要再顯示",
-	"unsupportedWorkspaceSettings": "此工作區包含只能在 [使用者設定] 中進行的設定 ({0})。點擊 [這裡]({1}) 了解更多。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json b/i18n/cht/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json
deleted file mode 100644
index bc0754d2c3e..00000000000
--- a/i18n/cht/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"releaseNotesInputName": "版本資訊: {0}",
-	"unassigned": "未指派"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/update/electron-browser/releaseNotesInput.i18n.json b/i18n/cht/src/vs/workbench/parts/update/electron-browser/releaseNotesInput.i18n.json
deleted file mode 100644
index d20ba6a7d71..00000000000
--- a/i18n/cht/src/vs/workbench/parts/update/electron-browser/releaseNotesInput.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"releaseNotesInputName": "版本資訊: {0}"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/update/electron-browser/update.contribution.i18n.json b/i18n/cht/src/vs/workbench/parts/update/electron-browser/update.contribution.i18n.json
deleted file mode 100644
index e732df6bd2d..00000000000
--- a/i18n/cht/src/vs/workbench/parts/update/electron-browser/update.contribution.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"release notes": "版本資訊"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/update/electron-browser/update.i18n.json b/i18n/cht/src/vs/workbench/parts/update/electron-browser/update.i18n.json
deleted file mode 100644
index 3fdd15bb8f2..00000000000
--- a/i18n/cht/src/vs/workbench/parts/update/electron-browser/update.i18n.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"releaseNotes": "版本資訊",
-	"showReleaseNotes": "顯示版本資訊",
-	"read the release notes": "歡迎使用 {0} v{1}! 您要閱讀版本資訊嗎?",
-	"licenseChanged": "我們的授權條款已變更，請按一下[這裡]({0})查看變更項目。",
-	"neveragain": "不要再顯示",
-	"64bitisavailable": "適用於 64 位元 Windows 的 {0} 已正式推出! 若要深入了解，請按一下[這裡]({1})。",
-	"updateIsReady": "新的 {0} 更新已可用。",
-	"noUpdatesAvailable": "目前沒有任何可用的更新。",
-	"ok": "確定",
-	"thereIsUpdateAvailable": "已有更新可用。",
-	"download now": "立即下載",
-	"later": "稍後",
-	"updateAvailable": "已有可用的更新：{0} {1}",
-	"installUpdate": "安裝更新",
-	"updateInstalling": "{0} {1} 正在背景安裝，我們會在安裝完成時通知您。",
-	"updateAvailableAfterRestart": "重啟 {0} 以套用最新的更新。",
-	"updateNow": "立即更新",
-	"commandPalette": "命令選擇區...",
-	"settings": "設定",
-	"keyboardShortcuts": "鍵盤快速鍵(&&K)",
-	"showExtensions": "管理擴充功能",
-	"userSnippets": "使用者程式碼片段",
-	"selectTheme.label": "色彩佈景主題",
-	"themes.selectIconTheme.label": "檔案圖示佈景主題",
-	"checkForUpdates": "查看是否有更新...",
-	"checkingForUpdates": "正在查看是否有更新...",
-	"DownloadingUpdate": "正在下載更新...",
-	"installUpdate...": "安裝更新...",
-	"installingUpdate": "正在安裝更新...",
-	"restartToUpdate": "請重新啟動以更新..."
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/url/electron-browser/url.contribution.i18n.json b/i18n/cht/src/vs/workbench/parts/url/electron-browser/url.contribution.i18n.json
deleted file mode 100644
index 7eacd141c36..00000000000
--- a/i18n/cht/src/vs/workbench/parts/url/electron-browser/url.contribution.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openUrl": "開啟 URL",
-	"developer": "開發人員"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/views/browser/views.i18n.json b/i18n/cht/src/vs/workbench/parts/views/browser/views.i18n.json
deleted file mode 100644
index d9eedec6006..00000000000
--- a/i18n/cht/src/vs/workbench/parts/views/browser/views.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"viewToolbarAriaLabel": "{0} 個動作",
-	"hideView": "從提要欄位隱藏"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/views/browser/viewsExtensionPoint.i18n.json b/i18n/cht/src/vs/workbench/parts/views/browser/viewsExtensionPoint.i18n.json
deleted file mode 100644
index 98b2d3ba1ce..00000000000
--- a/i18n/cht/src/vs/workbench/parts/views/browser/viewsExtensionPoint.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"requirearray": "項目必須為陣列",
-	"requirestring": "屬性 '{0}' 為強制項目且必須屬於 `string` 類型",
-	"optstring": "屬性 `{0}` 可以省略或必須屬於 `string` 類型",
-	"vscode.extension.contributes.view.id": "檢視的識別碼。請使用此識別碼透過 `vscode.window.registerTreeDataProviderForView` API 登錄資料提供者。並藉由將 `onView:${id}` 事件登錄至 `activationEvents` 以觸發啟用您的延伸模組。",
-	"vscode.extension.contributes.view.name": "使用人性化顯示名稱.",
-	"vscode.extension.contributes.view.when": "必須為 true 以顯示此檢視的條件",
-	"vscode.extension.contributes.views": "提供意見給編輯者",
-	"views.explorer": "檔案總管檢視",
-	"views.debug": "偵錯檢視",
-	"locationId.invalid": "`{0}`不是有效的識別位置"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/watermark/electron-browser/watermark.i18n.json b/i18n/cht/src/vs/workbench/parts/watermark/electron-browser/watermark.i18n.json
deleted file mode 100644
index df6102aad5c..00000000000
--- a/i18n/cht/src/vs/workbench/parts/watermark/electron-browser/watermark.i18n.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"watermark.showCommands": "顯示所有命令",
-	"watermark.quickOpen": "前往檔案",
-	"watermark.openFile": "開啟檔案",
-	"watermark.openFolder": "開啟資料夾",
-	"watermark.openFileFolder": "開啟檔案或資料夾",
-	"watermark.openRecent": "開啟最近使用的檔案",
-	"watermark.newUntitledFile": "新增未命名檔案",
-	"watermark.toggleTerminal": "切換終端機",
-	"watermark.findInFiles": "在檔案中尋找",
-	"watermark.startDebugging": "開始偵錯",
-	"watermark.unboundCommand": "未繫結",
-	"workbenchConfigurationTitle": "工作台",
-	"tips.enabled": "如有啟用，將會在編輯器未開啟時以浮水印方式顯示提示。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json b/i18n/cht/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json
deleted file mode 100644
index b50b4d83e7d..00000000000
--- a/i18n/cht/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"webview.editor.label": "webview 編輯器",
-	"developer": "開發人員"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/webview/electron-browser/webviewCommands.i18n.json b/i18n/cht/src/vs/workbench/parts/webview/electron-browser/webviewCommands.i18n.json
deleted file mode 100644
index da7857bbdcf..00000000000
--- a/i18n/cht/src/vs/workbench/parts/webview/electron-browser/webviewCommands.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openToolsLabel": "開啟 Webview Developer 工具",
-	"refreshWebviewLabel": "重新載入 Webviews"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json b/i18n/cht/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json
deleted file mode 100644
index c089b63f259..00000000000
--- a/i18n/cht/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"telemetryOptOut.optOutNotice": "允許 Microsoft 收集使用率資料來協助改進 VS Code。閱讀我們的 [隱私權聲明] ({0}) 以及學習如何 [選擇退出] ({1})。",
-	"telemetryOptOut.optInNotice": "允許 Microsoft 收集使用率資料來協助改進 VS Code。閱讀我們的 [隱私權聲明] ({0}) 以及學習如何 [選擇參加] ({1})。",
-	"telemetryOptOut.readMore": "閱讀其他資訊"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/welcome/overlay/browser/welcomeOverlay.i18n.json b/i18n/cht/src/vs/workbench/parts/welcome/overlay/browser/welcomeOverlay.i18n.json
deleted file mode 100644
index 4167cd11d5f..00000000000
--- a/i18n/cht/src/vs/workbench/parts/welcome/overlay/browser/welcomeOverlay.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"welcomeOverlay.explorer": "檔案總管",
-	"welcomeOverlay.search": "跨檔案搜尋",
-	"welcomeOverlay.git": "原始程式碼管理",
-	"welcomeOverlay.debug": "啟動並偵錯",
-	"welcomeOverlay.extensions": "管理延伸模組",
-	"welcomeOverlay.problems": "檢視錯誤和警告",
-	"welcomeOverlay.commandPalette": "尋找及執行所有命令",
-	"welcomeOverlay.notifications": "顯示通知",
-	"welcomeOverlay": "使用者介面概觀",
-	"hideWelcomeOverlay": "隱藏介面概觀",
-	"help": "說明"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json b/i18n/cht/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
deleted file mode 100644
index bdcaab4106d..00000000000
--- a/i18n/cht/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"welcomePage.vscode": "Visual Studio Code",
-	"welcomePage.editingEvolved": "編輯進化了",
-	"welcomePage.start": "開始",
-	"welcomePage.newFile": "新增檔案",
-	"welcomePage.openFolder": "開啟資料夾...",
-	"welcomePage.addWorkspaceFolder": "新增工作區資料夾...",
-	"welcomePage.recent": "最近使用",
-	"welcomePage.moreRecent": "更多...",
-	"welcomePage.noRecentFolders": "沒有最近使用的資料夾",
-	"welcomePage.help": "說明",
-	"welcomePage.keybindingsCheatsheet": "閱覽鍵盤快速鍵",
-	"welcomePage.introductoryVideos": "簡介影片",
-	"welcomePage.tipsAndTricks": "秘訣與提示",
-	"welcomePage.productDocumentation": "產品文件",
-	"welcomePage.gitHubRepository": "GitHub 存放庫",
-	"welcomePage.stackOverflow": "Stack Overflow",
-	"welcomePage.showOnStartup": "啟動時顯示歡迎頁面",
-	"welcomePage.customize": "自訂",
-	"welcomePage.installExtensionPacks": "工具與語言",
-	"welcomePage.installExtensionPacksDescription": "安裝{0}與{1}的支援功能。",
-	"welcomePage.moreExtensions": "更多",
-	"welcomePage.installKeymapDescription": "設定及按鍵對應",
-	"welcomePage.installKeymapExtension": "安裝 {0} 和 {1} 的設定及鍵盤快速鍵",
-	"welcomePage.others": "其他",
-	"welcomePage.colorTheme": "彩色佈景主題",
-	"welcomePage.colorThemeDescription": "將編輯器及您的程式碼設定成您喜愛的外觀",
-	"welcomePage.learn": "深入了解",
-	"welcomePage.showCommands": "尋找及執行所有命令",
-	"welcomePage.showCommandsDescription": "從命令選擇區快速存取及搜尋命令 ({0})",
-	"welcomePage.interfaceOverview": "介面概觀",
-	"welcomePage.interfaceOverviewDescription": "使用視覺覆疊效果強調顯示 UI 的主要元件",
-	"welcomePage.interactivePlayground": "Interactive Playground",
-	"welcomePage.interactivePlaygroundDescription": "嘗試使用逐步解說短片中的一些基本編輯器功能"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.contribution.i18n.json b/i18n/cht/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.contribution.i18n.json
deleted file mode 100644
index 0f84b941828..00000000000
--- a/i18n/cht/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.contribution.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"workbenchConfigurationTitle": "工作台",
-	"workbench.startupEditor.none": "不使用編輯器開始。",
-	"workbench.startupEditor.welcomePage": "開啟歡迎頁面 (預設)。",
-	"workbench.startupEditor.newUntitledFile": "開啟新的無標題檔案。",
-	"workbench.startupEditor": "若未從之前的工作階段還原任何編輯器，會控制啟動時要顯示的編輯器。選取 'none' 不使用編輯器啟動，選取 'welcomePage' 開啟歡迎頁面 (預設)，選取 'newUntitledFile' 開啟新的無標題檔案 (僅正在開啟空白工作區適用)。",
-	"help": "說明"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json b/i18n/cht/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json
deleted file mode 100644
index b19266dd080..00000000000
--- a/i18n/cht/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"welcomePage": "歡迎使用",
-	"welcomePage.javaScript": "JavaScript",
-	"welcomePage.typeScript": "TypeScript",
-	"welcomePage.python": "Python",
-	"welcomePage.php": "PHP",
-	"welcomePage.azure": "Azure",
-	"welcomePage.showAzureExtensions": "顯示 Azure 擴充功能",
-	"welcomePage.docker": "Docker",
-	"welcomePage.vim": "Vim",
-	"welcomePage.sublime": "Sublime",
-	"welcomePage.atom": "Atom",
-	"welcomePage.extensionPackAlreadyInstalled": "支援功能{0}已被安裝。",
-	"welcomePage.willReloadAfterInstallingExtensionPack": "{0} 的其他支援安裝完成後，將會重新載入此視窗。",
-	"welcomePage.installingExtensionPack": "正在安裝 {0} 的其他支援...",
-	"welcomePage.extensionPackNotFound": "找不到ID為{1}的{0}支援功能.",
-	"welcomePage.keymapAlreadyInstalled": "已安裝 {0} 鍵盤快速鍵。",
-	"welcomePage.willReloadAfterInstallingKeymap": "{0} 鍵盤快速鍵安裝完成後，將會重新載入此視窗。",
-	"welcomePage.installingKeymap": "正在安裝 {0} 鍵盤快速鍵...",
-	"welcomePage.keymapNotFound": "找不到識別碼為 {1} 的 {0} 鍵盤快速鍵。",
-	"welcome.title": "歡迎使用",
-	"welcomePage.openFolderWithPath": "透過路徑 {1} 開啟資料夾 {0}",
-	"welcomePage.extensionListSeparator": ",",
-	"welcomePage.installKeymap": "安裝 {0} 按鍵對應",
-	"welcomePage.installExtensionPack": "安裝 {0} 的其他支援",
-	"welcomePage.installedKeymap": "已安裝 {0} 按鍵對應",
-	"welcomePage.installedExtensionPack": "已安裝 {0} 支援",
-	"ok": "確定",
-	"details": "詳細資料",
-	"welcomePage.buttonBackground": "起始頁面按鈕的背景色彩.",
-	"welcomePage.buttonHoverBackground": "起始頁面暫留於按鈕的背景色彩"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/welcome/walkThrough/electron-browser/editor/editorWalkThrough.i18n.json b/i18n/cht/src/vs/workbench/parts/welcome/walkThrough/electron-browser/editor/editorWalkThrough.i18n.json
deleted file mode 100644
index a8999c1feed..00000000000
--- a/i18n/cht/src/vs/workbench/parts/welcome/walkThrough/electron-browser/editor/editorWalkThrough.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"editorWalkThrough.title": "Interactive Playground",
-	"editorWalkThrough": "Interactive Playground"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThrough.contribution.i18n.json b/i18n/cht/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThrough.contribution.i18n.json
deleted file mode 100644
index 79d28de975c..00000000000
--- a/i18n/cht/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThrough.contribution.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"walkThrough.editor.label": "Interactive Playground",
-	"help": "說明"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughActions.i18n.json b/i18n/cht/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughActions.i18n.json
deleted file mode 100644
index f8fe392e49f..00000000000
--- a/i18n/cht/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughActions.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"editorWalkThrough.arrowUp": "向上捲動 (行)",
-	"editorWalkThrough.arrowDown": "向下捲動 (行)",
-	"editorWalkThrough.pageUp": "向上捲動 (頁)",
-	"editorWalkThrough.pageDown": "向下捲動 (頁)"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughPart.i18n.json b/i18n/cht/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughPart.i18n.json
deleted file mode 100644
index c82864e4cbe..00000000000
--- a/i18n/cht/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughPart.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"walkThrough.unboundCommand": "未繫結",
-	"walkThrough.gitNotFound": "您的系統上似乎未安裝 Git。",
-	"walkThrough.embeddedEditorBackground": "編輯器互動區塊的背景色彩."
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/services/actions/electron-browser/menusExtensionPoint.i18n.json b/i18n/cht/src/vs/workbench/services/actions/electron-browser/menusExtensionPoint.i18n.json
deleted file mode 100644
index 16528bb0fea..00000000000
--- a/i18n/cht/src/vs/workbench/services/actions/electron-browser/menusExtensionPoint.i18n.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"requirearray": "功能表項目必須為陣列",
-	"requirestring": "屬性 '{0}' 為強制項目且必須屬於 `string` 類型",
-	"optstring": "屬性 `{0}` 可以省略或必須屬於 `string` 類型",
-	"vscode.extension.contributes.menuItem.command": "所要執行命令的識別碼。命令必須在 'commands' 區段中宣告",
-	"vscode.extension.contributes.menuItem.alt": "所要執行替代命令的識別碼。命令必須在 'commands' 區段中宣告",
-	"vscode.extension.contributes.menuItem.when": "必須為 true 以顯示此項目的條件",
-	"vscode.extension.contributes.menuItem.group": "此命令所屬群組",
-	"vscode.extension.contributes.menus": "將功能表項目提供給編輯器",
-	"menus.commandPalette": "命令選擇區",
-	"menus.touchBar": "Touch Bar (macOS)",
-	"menus.editorTitle": "編輯器標題功能表",
-	"menus.editorContext": "編輯器操作功能表",
-	"menus.explorerContext": "檔案總管操作功能表",
-	"menus.editorTabContext": "編輯器索引標籤操作功能表",
-	"menus.debugCallstackContext": "偵錯呼叫堆疊操作功能表",
-	"menus.scmTitle": "原始檔控制標題功能表",
-	"menus.scmSourceControl": "原始檔控制功能表",
-	"menus.resourceGroupContext": "原始檔控制資源群組操作功能表",
-	"menus.resourceStateContext": "原始檔控制資源群組狀態操作功能表",
-	"view.viewTitle": "這有助於查看標題功能表",
-	"view.itemContext": "這有助於查看項目內容功能表",
-	"nonempty": "必須是非空白值。",
-	"opticon": "屬性 `icon` 可以省略，否則必須為字串或類似 `{dark, light}` 的常值",
-	"requireStringOrObject": "'{0}' 為必要屬性，且其類型必須是 'string' 或 'object'",
-	"requirestrings": "'{0}' 與 '{1}' 為必要屬性，且其類型必須是 'string'",
-	"vscode.extension.contributes.commandType.command": "所要執行命令的識別碼",
-	"vscode.extension.contributes.commandType.title": "UI 中用以代表命令的標題",
-	"vscode.extension.contributes.commandType.category": "(選用) UI 中用以將命令分組的分類字串",
-	"vscode.extension.contributes.commandType.icon": "(選用) UI 中用以代表命令的圖示。會是檔案路徑或可設定佈景主題的組態",
-	"vscode.extension.contributes.commandType.icon.light": "使用淺色佈景主題時的圖示路徑",
-	"vscode.extension.contributes.commandType.icon.dark": "使用深色佈景主題時的圖示路徑",
-	"vscode.extension.contributes.commands": "將命令提供給命令選擇區。",
-	"dup": "命令 `{0}` 在 `commands` 區段中出現多次。",
-	"menuId.invalid": "`{0}` 不是有效的功能表識別碼",
-	"missing.command": "功能表項目參考了 'commands' 區段中未定義的命令 `{0}`。",
-	"missing.altCommand": "功能表項目參考了 'commands' 區段中未定義的替代命令 `{0}`。",
-	"dupe.command": "功能表項目參考了與預設相同的命令和替代命令"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/services/bulkEdit/electron-browser/bulkEditService.i18n.json b/i18n/cht/src/vs/workbench/services/bulkEdit/electron-browser/bulkEditService.i18n.json
deleted file mode 100644
index 6b06734150d..00000000000
--- a/i18n/cht/src/vs/workbench/services/bulkEdit/electron-browser/bulkEditService.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"summary.0": "未進行任何編輯",
-	"summary.nm": "在 {1} 個檔案中進行了 {0} 項文字編輯",
-	"summary.n0": "在一個檔案中進行了 {0} 項文字編輯",
-	"conflict": "這些檔案已同時變更: {0}"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/services/configuration/common/configurationExtensionPoint.i18n.json b/i18n/cht/src/vs/workbench/services/configuration/common/configurationExtensionPoint.i18n.json
deleted file mode 100644
index 8c069814406..00000000000
--- a/i18n/cht/src/vs/workbench/services/configuration/common/configurationExtensionPoint.i18n.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.contributes.configuration.title": "設定的摘要。此標籤將會在設定檔中作為分隔註解使用。",
-	"vscode.extension.contributes.configuration.properties": "組態屬性的描述。",
-	"scope.application.description": "應用程式特定設置，只能在使用者設定中進行設置。",
-	"scope.window.description": "視窗特定組態，可在使用者或工作區設定中予以設定。",
-	"scope.resource.description": "資源特定設定，可在使用者、工作區或資料夾設定中予以設定。",
-	"scope.description": "組態適用的範圍。可用的範圍為「視窗」和「資源」。",
-	"vscode.extension.contributes.defaultConfiguration": "依語言貢獻預設編輯器組態設定。",
-	"vscode.extension.contributes.configuration": "提供組態設定。",
-	"invalid.title": "'configuration.title' 必須是字串",
-	"invalid.properties": "'configuration.properties' 必須是物件",
-	"invalid.property": "'configuration.property' 必須是物件",
-	"invalid.allOf": "'configuration.allOf' 已取代而不應再使用。請改為將多個組態區段作為陣列，傳遞至「組態」貢獻點。",
-	"workspaceConfig.folders.description": "要載入工作區之資料夾的清單。",
-	"workspaceConfig.path.description": "檔案路徑，例如 `/root/folderA` 或 `./folderA` 即為會對工作區檔案位置解析的相關路徑。",
-	"workspaceConfig.name.description": "資料夾的選用名稱。",
-	"workspaceConfig.uri.description": "資料夾的 URI",
-	"workspaceConfig.settings.description": "工作區設定",
-	"workspaceConfig.launch.description": "工作區啟動配置",
-	"workspaceConfig.extensions.description": "工作區延伸模組",
-	"unknownWorkspaceProperty": "未知的工作區組態屬性"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/services/configuration/node/configuration.i18n.json b/i18n/cht/src/vs/workbench/services/configuration/node/configuration.i18n.json
deleted file mode 100644
index 2bc73e75628..00000000000
--- a/i18n/cht/src/vs/workbench/services/configuration/node/configuration.i18n.json
+++ /dev/null
@@ -1,24 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"vscode.extension.contributes.configuration.title": "設定的摘要。此標籤將會在設定檔中作為分隔註解使用。",
-	"vscode.extension.contributes.configuration.properties": "組態屬性的描述。",
-	"scope.window.description": "視窗特定組態，可在使用者或工作區設定中予以設定。",
-	"scope.resource.description": "資源特定設定，可在使用者、工作區或資料夾設定中予以設定。",
-	"scope.description": "組態適用的範圍。可用的範圍為「視窗」和「資源」。",
-	"vscode.extension.contributes.configuration": "提供組態設定。",
-	"invalid.title": "'configuration.title' 必須是字串",
-	"vscode.extension.contributes.defaultConfiguration": "依語言貢獻預設編輯器組態設定。",
-	"invalid.properties": "'configuration.properties' 必須是物件",
-	"invalid.allOf": "'configuration.allOf' 已取代而不應再使用。請改為將多個組態區段作為陣列，傳遞至「組態」貢獻點。",
-	"workspaceConfig.folders.description": "要載入工作區之資料夾的清單。",
-	"workspaceConfig.path.description": "檔案路徑，例如 `/root/folderA` 或 `./folderA` 即為會對工作區檔案位置解析的相關路徑。",
-	"workspaceConfig.name.description": "資料夾的選用名稱。",
-	"workspaceConfig.uri.description": "資料夾的 URI",
-	"workspaceConfig.settings.description": "工作區設定",
-	"workspaceConfig.extensions.description": "工作區延伸模組",
-	"unknownWorkspaceProperty": "未知的工作區組態屬性"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json b/i18n/cht/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
deleted file mode 100644
index d8a57b177d1..00000000000
--- a/i18n/cht/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openTasksConfiguration": "開啟工作組態",
-	"openLaunchConfiguration": "開啟啟動組態",
-	"open": "開啟設定",
-	"saveAndRetry": "儲存並重試",
-	"errorUnknownKey": "因為 {1} 非已註冊的組態，所以無法寫入至 {0}。",
-	"errorInvalidWorkspaceConfigurationApplication": "無法寫入 {0} 至工作區設定。此設定只能寫入使用者設定中。",
-	"errorInvalidFolderConfiguration": "因為 {0} 不支援資料夾資源範圍，所以無法寫入至資料夾設定。",
-	"errorInvalidUserTarget": "因為 {0} 不支援全域範圍，所以無法寫入至使用者設定。",
-	"errorInvalidWorkspaceTarget": "因為 {0} 不支援多資料夾工作區中使用工作區範圍，所以無法寫入工作區設定。",
-	"errorInvalidFolderTarget": "因為未提供資源，所以無法寫入至資料夾設定。",
-	"errorNoWorkspaceOpened": "因為未開啟工作區，所以無法寫入至 {0}。請先開啟工作區，再試一次。",
-	"errorInvalidTaskConfiguration": "無法寫入工作組態檔。請開啟它以更正其中的錯誤/警告，然後再試一次。 ",
-	"errorInvalidLaunchConfiguration": "無法寫入啟動組態檔。請開啟它以更正其中的錯誤/警告，然後再試一次。 ",
-	"errorInvalidConfiguration": "無法寫入使用者設定。請開啟它以更正其中的錯誤/警告，然後再試一次。 ",
-	"errorInvalidConfigurationWorkspace": "無法寫入工作區設定。請開啟工作區設定檔案以修正其中的錯誤/警告，然後重試一次。",
-	"errorInvalidConfigurationFolder": "無法寫入資料夾設定。請開啟 '{0}' 資料夾設定以修正其中的錯誤/警告，然後重試一次。",
-	"errorTasksConfigurationFileDirty": "因為檔案已變更，無法寫入工作組態檔。請先儲存，然後再試一次。",
-	"errorLaunchConfigurationFileDirty": "因為檔案已變更，無法寫入啟動組態檔。請先儲存，然後再試一次。",
-	"errorConfigurationFileDirty": "因為檔案已變更，所以無法寫入使用者設定。請儲存使用者設定檔案，然後再試一次。",
-	"errorConfigurationFileDirtyWorkspace": "因為檔案已變更，所以無法寫入工作區設定。請儲存工作區設定檔案，然後再試一次。",
-	"errorConfigurationFileDirtyFolder": "因為檔案已變更，所以無法寫入資料夾設定。請儲存 '{0}' 資料夾設定檔案，然後再試一次。",
-	"userTarget": "使用者設定",
-	"workspaceTarget": "工作區設定",
-	"folderTarget": "資料夾設定"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/services/configuration/node/configurationService.i18n.json b/i18n/cht/src/vs/workbench/services/configuration/node/configurationService.i18n.json
deleted file mode 100644
index 98e383c286e..00000000000
--- a/i18n/cht/src/vs/workbench/services/configuration/node/configurationService.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"unsupportedApplicationSetting": "此設定只能在使用者設定中套用",
-	"unsupportedWindowSetting": "目前無法套用此設定。要在您直接開啟此資料夾時才會套用。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/services/configuration/node/jsonEditingService.i18n.json b/i18n/cht/src/vs/workbench/services/configuration/node/jsonEditingService.i18n.json
deleted file mode 100644
index 4f5f6e7a02c..00000000000
--- a/i18n/cht/src/vs/workbench/services/configuration/node/jsonEditingService.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"errorInvalidFile": "無法寫入檔案.請開啟檔案並修正錯誤/警告後再試一次.",
-	"errorFileDirty": "無法寫入檔案,因為檔案已變更.請儲存檔案後再試一次"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json b/i18n/cht/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
deleted file mode 100644
index d67fb8af8d5..00000000000
--- a/i18n/cht/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"stringsOnlySupported": "命令 {0} 未回傳字串結果。僅支援字串作為變數替換的命令結果。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/services/configurationResolver/node/variableResolver.i18n.json b/i18n/cht/src/vs/workbench/services/configurationResolver/node/variableResolver.i18n.json
deleted file mode 100644
index a50b47db620..00000000000
--- a/i18n/cht/src/vs/workbench/services/configurationResolver/node/variableResolver.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"missingEnvVarName": "因為未指定任何環境變數名稱，所以無法解析 '{0}'。",
-	"configNotFound": "因為找不到設定 '{1}'，所以無法解析 '{0}'。",
-	"configNoString": "因為 '{1}' 為結構化值，所以無法解析 '{0}'。",
-	"missingConfigName": "因為未指定任何設定名稱，所以無法解析 '{0}'。",
-	"noValueForCommand": "因為命令沒有任何值，所以無法解析 '{0}'。",
-	"canNotFindFolder": "無法解析 '{0}'。沒有該等資料夾 '{1}'。",
-	"canNotResolveWorkspaceFolderMultiRoot": "無法在多個資料夾工作區內解析 '{0}'。請使用 ':' 和工作區資料夾名稱定義此變數的範圍。",
-	"canNotResolveWorkspaceFolder": "無法解析 '{0}'。請開啟資料夾。",
-	"canNotResolveFile": "無法解析 '{0}'。請開啟編輯器。",
-	"canNotResolveLineNumber": "無法解析 '{0}'。請確認已在使用中編輯器中選取了行。",
-	"canNotResolveSelectedText": "無法解析 '{0}'。請確認在使用中編輯器內選取了部分文字。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/services/crashReporter/common/crashReporterService.i18n.json b/i18n/cht/src/vs/workbench/services/crashReporter/common/crashReporterService.i18n.json
deleted file mode 100644
index e3e021a4254..00000000000
--- a/i18n/cht/src/vs/workbench/services/crashReporter/common/crashReporterService.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"telemetryConfigurationTitle": "遙測",
-	"telemetry.enableCrashReporting": "允許將損毀報告傳送給 Microsoft。\n此選項需要重新啟動才會生效。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/services/crashReporter/electron-browser/crashReporterService.i18n.json b/i18n/cht/src/vs/workbench/services/crashReporter/electron-browser/crashReporterService.i18n.json
deleted file mode 100644
index 1d764efac73..00000000000
--- a/i18n/cht/src/vs/workbench/services/crashReporter/electron-browser/crashReporterService.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"telemetryConfigurationTitle": "遙測",
-	"telemetry.enableCrashReporting": "允許將損毀報告傳送給 Microsoft。\n此選項需要重新啟動才會生效。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/services/decorations/browser/decorationsService.i18n.json b/i18n/cht/src/vs/workbench/services/decorations/browser/decorationsService.i18n.json
deleted file mode 100644
index 98abedaa506..00000000000
--- a/i18n/cht/src/vs/workbench/services/decorations/browser/decorationsService.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"bubbleTitle": "包含強調項目"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json b/i18n/cht/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json
deleted file mode 100644
index e3294fd3329..00000000000
--- a/i18n/cht/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"yesButton": "是(&&Y)",
-	"cancelButton": "取消"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/services/dialogs/electron-browser/dialogs.i18n.json b/i18n/cht/src/vs/workbench/services/dialogs/electron-browser/dialogs.i18n.json
deleted file mode 100644
index c2a0c15998b..00000000000
--- a/i18n/cht/src/vs/workbench/services/dialogs/electron-browser/dialogs.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"yesButton": "是(&&Y)",
-	"cancelButton": "取消",
-	"moreFile": "...另外 1 個檔案未顯示",
-	"moreFiles": "...另外 {0} 個檔案未顯示"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/services/editor/browser/editorService.i18n.json b/i18n/cht/src/vs/workbench/services/editor/browser/editorService.i18n.json
deleted file mode 100644
index 50e968f8ee3..00000000000
--- a/i18n/cht/src/vs/workbench/services/editor/browser/editorService.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"compareLabels": "{0} ↔ {1}"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/services/editor/common/editorService.i18n.json b/i18n/cht/src/vs/workbench/services/editor/common/editorService.i18n.json
deleted file mode 100644
index ca1ee0161c1..00000000000
--- a/i18n/cht/src/vs/workbench/services/editor/common/editorService.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"compareLabels": "{0} ↔ {1}"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/services/extensions/common/extensionsRegistry.i18n.json b/i18n/cht/src/vs/workbench/services/extensions/common/extensionsRegistry.i18n.json
deleted file mode 100644
index 0046c67d6ff..00000000000
--- a/i18n/cht/src/vs/workbench/services/extensions/common/extensionsRegistry.i18n.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.engines": "引擎相容性。",
-	"vscode.extension.engines.vscode": "若是 VS Code 延伸模組，則指定與延伸模組相容的 VS Code 版本。不得為 *。例如: ^0.10.5 表示與最低 VS Code 版本 0.10.5 相容。",
-	"vscode.extension.publisher": "VS Code 擴充功能的發行者。",
-	"vscode.extension.displayName": "VS Code 資源庫中使用的擴充功能顯示名稱。",
-	"vscode.extension.categories": "VS Code 資源庫用來將擴充功能歸類的分類。",
-	"vscode.extension.category.languages.deprecated": "使用 '程式語言' 代替",
-	"vscode.extension.galleryBanner": "用於 VS Code Marketplace 的橫幅。",
-	"vscode.extension.galleryBanner.color": "VS Code Marketplace 頁首的橫幅色彩。",
-	"vscode.extension.galleryBanner.theme": "橫幅中使用的字型色彩佈景主題。",
-	"vscode.extension.contributes": "此封裝所代表的所有 VS Code 擴充功能比重。",
-	"vscode.extension.preview": "將延伸模組設為在 Marketplace 中標幟為 [預覽]。",
-	"vscode.extension.activationEvents": "VS Code 擴充功能的啟動事件。",
-	"vscode.extension.activationEvents.onLanguage": "當指定語言檔案開啟時激發該事件",
-	"vscode.extension.activationEvents.onCommand": "當指定的命令被調用時激發該事件",
-	"vscode.extension.activationEvents.onDebug": "當使用者正要開始偵錯或是設定偵錯組態時激發該事件",
-	"vscode.extension.activationEvents.onDebugInitialConfigurations": "需要建立 \"launch.json\" 來觸發啟動事件 (並且需要呼叫所有 provideDebugConfigurations 方法)。",
-	"vscode.extension.activationEvents.onDebugResolve": "需要特定類型偵錯工作階段啟動來觸發啟動事件 (並且呼叫相對應 resolveDebugConfiguration 方法)",
-	"vscode.extension.activationEvents.workspaceContains": "當開啟指定的文件夾包含glob模式匹配的文件時激發該事件",
-	"vscode.extension.activationEvents.onView": "當指定的檢視被擴展時激發該事件",
-	"vscode.extension.activationEvents.onUri": "每當指向此延伸模組的全系統 URI 開啟時，都會發出啟動事件。",
-	"vscode.extension.activationEvents.star": "當VS Code啟動時激發該事件,為了確保最好的使用者體驗,當您的擴充功能沒有其他組合作業時,請激活此事件.",
-	"vscode.extension.badges": "要顯示於 Marketplace 擴充頁面資訊看板的徽章陣列。",
-	"vscode.extension.badges.url": "徽章映像 URL。",
-	"vscode.extension.badges.href": "徽章連結。",
-	"vscode.extension.badges.description": "徽章描述。",
-	"vscode.extension.markdown": "控制使用市集中的 Markdown 轉譯引擎。可為 github (預設) 或標準。",
-	"vscode.extension.qna": "控制市集中 Q & A 的連結。設定為 marketplace 來啟用預設市集 Q & A 網站。設定字串以提供自訂的 Q & A 網站 URL。設定為 false 則禁用 Q & A。",
-	"vscode.extension.extensionDependencies": "其它擴充功能的相依性。擴充功能的識別碼一律為 ${publisher}.${name}。例如: vscode.csharp。",
-	"vscode.extension.scripts.prepublish": "在封裝作為 VS Code 擴充功能發行前所執行的指令碼。",
-	"vscode.extension.scripts.uninstall": "VS Code 延伸模組的解除安裝勾點。當延伸模組完全從 VS Code 解除安裝時，會在延伸模組解除安裝並重新啟動 (關機並啟動) 時執行的程式碼。僅支援 Node 指令碼。",
-	"vscode.extension.icon": "128 x 128 像素圖示的路徑。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/services/extensions/electron-browser/extensionHost.i18n.json b/i18n/cht/src/vs/workbench/services/extensions/electron-browser/extensionHost.i18n.json
deleted file mode 100644
index b6236ca3b0f..00000000000
--- a/i18n/cht/src/vs/workbench/services/extensions/electron-browser/extensionHost.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"extensionHostProcess.startupFailDebug": "延伸主機未於 10 秒內開始，可能在第一行就已停止，並需要偵錯工具才能繼續。",
-	"extensionHostProcess.startupFail": "延伸主機未在 10 秒內啟動，可能發生了問題。",
-	"reloadWindow": "重新載入視窗",
-	"extensionHostProcess.error": "延伸主機發生錯誤: {0}"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/services/extensions/electron-browser/extensionHostProfiler.i18n.json b/i18n/cht/src/vs/workbench/services/extensions/electron-browser/extensionHostProfiler.i18n.json
deleted file mode 100644
index b05708497f7..00000000000
--- a/i18n/cht/src/vs/workbench/services/extensions/electron-browser/extensionHostProfiler.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"message": "$(zap) 分析延伸主機..."
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/services/extensions/electron-browser/extensionPoints.i18n.json b/i18n/cht/src/vs/workbench/services/extensions/electron-browser/extensionPoints.i18n.json
deleted file mode 100644
index d78d215f84d..00000000000
--- a/i18n/cht/src/vs/workbench/services/extensions/electron-browser/extensionPoints.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"jsonParseFail": "無法剖析 {0}: {1}。",
-	"fileReadFail": "無法讀取檔案 {0}: {1}。",
-	"jsonsParseReportErrors": "無法剖析 {0}: {1}。",
-	"missingNLSKey": "找不到金鑰 {0} 的訊息。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json b/i18n/cht/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json
deleted file mode 100644
index 1b176d67b9e..00000000000
--- a/i18n/cht/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"extensionsDisabled": "所有擴充功能已停用。",
-	"extensionHostProcess.crash": "延伸主機意外終止。",
-	"extensionHostProcess.unresponsiveCrash": "因為延伸主機沒有回應，所以意外終止。",
-	"devTools": "開啟開發人員工具",
-	"restart": "重新啟動延伸主機",
-	"overwritingExtension": "正在以 {1} 覆寫延伸模組 {0}。",
-	"extensionUnderDevelopment": "正在載入位於 {0} 的開發延伸模組",
-	"extensionCache.invalid": "擴充功能在磁碟上已修改。請重新載入視窗。",
-	"reloadWindow": "重新載入視窗"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/services/extensions/node/extensionPoints.i18n.json b/i18n/cht/src/vs/workbench/services/extensions/node/extensionPoints.i18n.json
deleted file mode 100644
index c7b31f7bc6a..00000000000
--- a/i18n/cht/src/vs/workbench/services/extensions/node/extensionPoints.i18n.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"jsonParseFail": "無法剖析 {0}: {1}。",
-	"fileReadFail": "無法讀取檔案 {0}: {1}。",
-	"jsonsParseReportErrors": "無法剖析 {0}: {1}。",
-	"missingNLSKey": "找不到金鑰 {0} 的訊息。",
-	"notSemver": "擴充功能版本與 semver 不相容。",
-	"extensionDescription.empty": "得到空白擴充功能描述",
-	"extensionDescription.publisher": "屬性 '{0}' 為強制項目且必須屬於 `string` 類型",
-	"extensionDescription.name": "屬性 '{0}' 為強制項目且必須屬於 `string` 類型",
-	"extensionDescription.version": "屬性 '{0}' 為強制項目且必須屬於 `string` 類型",
-	"extensionDescription.engines": "屬性 '{0}' 為強制項目且必須屬於 `object` 類型",
-	"extensionDescription.engines.vscode": "屬性 '{0}' 為強制項目且必須屬於 `string` 類型",
-	"extensionDescription.extensionDependencies": "屬性 `{0}` 可以省略或必須屬於 `string[]` 類型",
-	"extensionDescription.activationEvents1": "屬性 `{0}` 可以省略或必須屬於 `string[]` 類型",
-	"extensionDescription.activationEvents2": "屬性 `{0}` 和 `{1}` 必須同時指定或同時忽略",
-	"extensionDescription.main1": "屬性 `{0}` 可以省略或必須屬於 `string` 類型",
-	"extensionDescription.main2": "`main` ({0}) 必須包含在擴充功能的資料夾 ({1}) 中。這可能會使擴充功能無法移植。",
-	"extensionDescription.main3": "屬性 `{0}` 和 `{1}` 必須同時指定或同時忽略"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/services/files/electron-browser/fileService.i18n.json b/i18n/cht/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
deleted file mode 100644
index fc04da73b94..00000000000
--- a/i18n/cht/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"netVersionError": "需要 Microsoft .NET Framework 4.5。請連入此連結進行安裝。",
-	"installNet": "下載 .NET Framework 4.5",
-	"neverShowAgain": "不要再顯示",
-	"enospcError": "{0} 無法監看此大型工作區中的檔案變更。請按照連結中的說明來解決此問題。",
-	"learnMore": "說明",
-	"fileInvalidPath": "檔案資源 ({0}) 無效",
-	"fileIsDirectoryError": "檔案是目錄",
-	"fileNotModifiedError": "未修改檔案的時間",
-	"fileTooLargeForHeapError": " 欲開啟此大小的檔案，需要重啟 VS Code，並且允許可使用更多記憶體",
-	"fileTooLargeError": "檔案太大無法開啟",
-	"fileNotFoundError": "找不到檔案 ({0})",
-	"fileBinaryError": "檔案似乎是二進位檔，因此無法當做文字開啟",
-	"filePermission": "寫至檔案 ({0}) 的權限遭拒",
-	"fileExists": "要建立的檔案已存在 ({0})",
-	"fileModifiedError": "修改檔案的時間",
-	"fileReadOnlyError": "檔案為唯讀",
-	"fileMoveConflict": "無法移動/複製。目的地已存在檔案。",
-	"unableToMoveCopyError": "無法移動/複製。檔案會取代其所在的資料夾。",
-	"binFailed": "無法將 '{0}' 移至資源回收筒",
-	"trashFailed": "無法將 '{0}' 移動至垃圾"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json b/i18n/cht/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
deleted file mode 100644
index 7d5350b520b..00000000000
--- a/i18n/cht/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"invalidPath": "資源 '{0}' 路徑必須為絕對路徑",
-	"fileNotFoundError": "找不到檔案 ({0})",
-	"fileIsDirectoryError": "檔案是目錄",
-	"fileNotModifiedError": "未修改檔案的時間",
-	"fileBinaryError": "檔案似乎是二進位檔，因此無法當做文字開啟",
-	"err.create": "無法建立檔案 {0}",
-	"fileMoveConflict": "無法移動/複製。目的地已存在檔案。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/services/files/node/fileService.i18n.json b/i18n/cht/src/vs/workbench/services/files/node/fileService.i18n.json
deleted file mode 100644
index ad99e777e96..00000000000
--- a/i18n/cht/src/vs/workbench/services/files/node/fileService.i18n.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"fileInvalidPath": "檔案資源 ({0}) 無效",
-	"fileIsDirectoryError": "檔案是目錄",
-	"fileNotModifiedError": "未修改檔案的時間",
-	"fileTooLargeError": "檔案太大無法開啟",
-	"fileNotFoundError": "找不到檔案 ({0})",
-	"fileBinaryError": "檔案似乎是二進位檔，因此無法當做文字開啟",
-	"filePermission": "寫至檔案 ({0}) 的權限遭拒",
-	"fileExists": "要建立的檔案已存在 ({0})",
-	"fileMoveConflict": "無法移動/複製。目的地已存在檔案。",
-	"unableToMoveCopyError": "無法移動/複製。檔案會取代其所在的資料夾。",
-	"foldersCopyError": "資料夾不能複製到工作區。請選取個別檔案進行複製。",
-	"fileModifiedError": "修改檔案的時間",
-	"fileReadOnlyError": "檔案為唯讀"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/services/jsonschemas/common/jsonValidationExtensionPoint.i18n.json b/i18n/cht/src/vs/workbench/services/jsonschemas/common/jsonValidationExtensionPoint.i18n.json
deleted file mode 100644
index 8381e015a80..00000000000
--- a/i18n/cht/src/vs/workbench/services/jsonschemas/common/jsonValidationExtensionPoint.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"contributes.jsonValidation": "提供 JSON 結構描述組態。",
-	"contributes.jsonValidation.fileMatch": "要比對的檔案模式，例如 \"package.json\" 或 \"*.launch\"。",
-	"contributes.jsonValidation.url": "結構描述 URL ('http:'、'https:') 或擴充功能資料夾的相對路徑 ('./')。",
-	"invalid.jsonValidation": "'configuration.jsonValidation' 必須是陣列",
-	"invalid.fileMatch": "必須定義 'configuration.jsonValidation.fileMatch'",
-	"invalid.url": "'configuration.jsonValidation.url' 必須是 URL 或相對路徑",
-	"invalid.url.fileschema": "'configuration.jsonValidation.url' 是無效的相對 URL: {0}",
-	"invalid.url.schema": "'configuration.jsonValidation.url' 必須以 'http:'、'https:' 或 './' 開頭，以參考位於擴充功能中的結構描述"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/services/keybinding/common/keybindingEditing.i18n.json b/i18n/cht/src/vs/workbench/services/keybinding/common/keybindingEditing.i18n.json
deleted file mode 100644
index d8f03c8e08c..00000000000
--- a/i18n/cht/src/vs/workbench/services/keybinding/common/keybindingEditing.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"errorKeybindingsFileDirty": "因為按鍵繫結關係組態檔已變更，所以無法寫入。請先儲存，然後再試一次。",
-	"parseErrors": "無法寫入按鍵繫結關係組態檔。請開啟檔案修正錯誤/警示並再試一次。",
-	"errorInvalidConfiguration": "無法寫入按鍵繫結關係組態檔。其具有類型非 Array 的物件。請開啟檔案予以清除並再試一次。",
-	"emptyKeybindingsHeader": "將您的按鍵組合放入此檔案中以覆寫預設值"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/services/keybinding/electron-browser/keybindingService.i18n.json b/i18n/cht/src/vs/workbench/services/keybinding/electron-browser/keybindingService.i18n.json
deleted file mode 100644
index c0103b25c22..00000000000
--- a/i18n/cht/src/vs/workbench/services/keybinding/electron-browser/keybindingService.i18n.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"nonempty": "必須是非空白值。",
-	"requirestring": "屬性 '{0}' 為強制項目且必須屬於 `string` 類型",
-	"optstring": "屬性 `{0}` 可以省略或必須屬於 `string` 類型",
-	"vscode.extension.contributes.keybindings.command": "觸發按鍵繫結關係時所要執行命令的識別碼。",
-	"vscode.extension.contributes.keybindings.key": "按鍵或按鍵順序 (以加號分隔按鍵並以空格分隔順序，例如 Ctrl+O 及 Ctrl+L L 進行同步選取)。",
-	"vscode.extension.contributes.keybindings.mac": "Mac 特定按鍵或按鍵順序。",
-	"vscode.extension.contributes.keybindings.linux": "Linux 特定按鍵或按鍵順序。",
-	"vscode.extension.contributes.keybindings.win": "Windows 特定按鍵或按鍵順序。",
-	"vscode.extension.contributes.keybindings.when": "按鍵為使用中時的條件。",
-	"vscode.extension.contributes.keybindings": "提供按鍵繫結關係。",
-	"invalid.keybindings": "`contributes.{0}` 無效: {1}",
-	"unboundCommands": "其他可用命令如下: ",
-	"keybindings.json.title": "按鍵繫結關係組態",
-	"keybindings.json.key": "按鍵或按鍵順序 (以空格分隔)",
-	"keybindings.json.command": "所要執行命令的名稱",
-	"keybindings.json.when": "按鍵為使用中時的條件。",
-	"keybindings.json.args": "要傳遞至命令加以執行的引數。",
-	"keyboardConfigurationTitle": "鍵盤",
-	"dispatch": "控制按下按鍵時的分派邏輯 (使用 'code' (建議使用) 或 'keyCode')。",
-	"touchbar.enabled": "啟用鍵盤上的 macOS 觸摸板按鈕 (如果可用)。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/services/message/browser/messageList.i18n.json b/i18n/cht/src/vs/workbench/services/message/browser/messageList.i18n.json
deleted file mode 100644
index 71c0b924f66..00000000000
--- a/i18n/cht/src/vs/workbench/services/message/browser/messageList.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"alertErrorMessage": "錯誤: {0}",
-	"alertWarningMessage": "警告: {0}",
-	"alertInfoMessage": "資訊: {0}",
-	"error": "錯誤",
-	"warning": "警告",
-	"info": "資訊",
-	"close": "關閉"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/services/message/electron-browser/messageService.i18n.json b/i18n/cht/src/vs/workbench/services/message/electron-browser/messageService.i18n.json
deleted file mode 100644
index e3294fd3329..00000000000
--- a/i18n/cht/src/vs/workbench/services/message/electron-browser/messageService.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"yesButton": "是(&&Y)",
-	"cancelButton": "取消"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/services/mode/common/workbenchModeService.i18n.json b/i18n/cht/src/vs/workbench/services/mode/common/workbenchModeService.i18n.json
deleted file mode 100644
index 9aad9719a83..00000000000
--- a/i18n/cht/src/vs/workbench/services/mode/common/workbenchModeService.i18n.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.contributes.languages": "提供語言宣告。",
-	"vscode.extension.contributes.languages.id": "語言的識別碼。",
-	"vscode.extension.contributes.languages.aliases": "語言的別名名稱。",
-	"vscode.extension.contributes.languages.extensions": "與語言相關聯的副檔名。",
-	"vscode.extension.contributes.languages.filenames": "與語言相關聯的檔案名稱。",
-	"vscode.extension.contributes.languages.filenamePatterns": "與語言相關聯的檔案名稱 Glob 模式。",
-	"vscode.extension.contributes.languages.mimetypes": "與語言相關聯的 MIME 類型。",
-	"vscode.extension.contributes.languages.firstLine": "規則運算式，符合語言檔案的第一行。",
-	"vscode.extension.contributes.languages.configuration": "檔案的相對路徑，其中該檔案包含語言組態選項。",
-	"invalid": "`contributes.{0}` 無效。必須是陣列。",
-	"invalid.empty": "`contributes.{0}` 值為空值",
-	"require.id": "屬性 '{0}' 為強制項目且必須屬於 `string` 類型",
-	"opt.extensions": "屬性 '{0}' 可以省略且必須屬於 `string[]` 類型",
-	"opt.filenames": "屬性 '{0}' 可以省略且必須屬於 `string[]` 類型",
-	"opt.firstLine": "屬性 '{0}' 可以省略且必須屬於 `string` 類型",
-	"opt.configuration": "屬性 '{0}' 可以省略且必須屬於 `string` 類型",
-	"opt.aliases": "屬性 '{0}' 可以省略且必須屬於 `string[]` 類型",
-	"opt.mimetypes": "屬性 '{0}' 可以省略且必須屬於 `string[]` 類型"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/services/progress/browser/progressService2.i18n.json b/i18n/cht/src/vs/workbench/services/progress/browser/progressService2.i18n.json
deleted file mode 100644
index 2ac63294841..00000000000
--- a/i18n/cht/src/vs/workbench/services/progress/browser/progressService2.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"progress.subtitle": "{0} - {1}",
-	"progress.title": "{0}: {1}",
-	"cancel": "取消"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/services/textMate/electron-browser/TMGrammars.i18n.json b/i18n/cht/src/vs/workbench/services/textMate/electron-browser/TMGrammars.i18n.json
deleted file mode 100644
index 9579a990fa8..00000000000
--- a/i18n/cht/src/vs/workbench/services/textMate/electron-browser/TMGrammars.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.contributes.grammars": "提供 textmate 權杖化工具。",
-	"vscode.extension.contributes.grammars.language": "要提供此語法的目標語言識別碼。",
-	"vscode.extension.contributes.grammars.scopeName": "tmLanguage 檔案所使用的 textmate 範圍名稱。",
-	"vscode.extension.contributes.grammars.path": "tmLanguage 檔案的路徑。此路徑是擴充功能資料夾的相對路徑，而且一般會以 './syntaxes/' 開頭。",
-	"vscode.extension.contributes.grammars.embeddedLanguages": "如果此文法包含內嵌語言，即為範圍名稱到語言識別碼的對應。",
-	"vscode.extension.contributes.grammars.tokenTypes": "範圍名稱到象徵類型的對應。",
-	"vscode.extension.contributes.grammars.injectTo": "要插入此文法的語言範圍名稱清單。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/services/textMate/electron-browser/TMSyntax.i18n.json b/i18n/cht/src/vs/workbench/services/textMate/electron-browser/TMSyntax.i18n.json
deleted file mode 100644
index 2f6acd42b1f..00000000000
--- a/i18n/cht/src/vs/workbench/services/textMate/electron-browser/TMSyntax.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"invalid.language": "`contributes.{0}.language` 中的不明語言。提供的值: {1}",
-	"invalid.scopeName": "`contributes.{0}.scopeName` 中的預期字串。提供的值: {1}",
-	"invalid.path.0": "'contributes.{0}.path' 中應有字串。提供的值: {1}",
-	"invalid.injectTo": "`contributes.{0}.injectTo` 中的值無效。必須是語言範圍名稱的陣列。提供的值: {1}",
-	"invalid.embeddedLanguages": "`contributes.{0}.embeddedLanguages` 中的值無效。必須是從範圍名稱到語言的物件對應。提供的值: {1}",
-	"invalid.tokenTypes": "`contributes.{0}.tokenTypes` 的值無效。必須是從範圍名稱到象徵類型的物件對應。提供的值: {1} ",
-	"invalid.path.1": "擴充功能資料夾 ({2}) 應包含 'contributes.{0}.path' ({1})。這可能會導致擴充功能無法移植。",
-	"no-tm-grammar": "此語言未註冊任何 TM 文法。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/services/textfile/common/textFileEditorModel.i18n.json b/i18n/cht/src/vs/workbench/services/textfile/common/textFileEditorModel.i18n.json
deleted file mode 100644
index 03133d3158d..00000000000
--- a/i18n/cht/src/vs/workbench/services/textfile/common/textFileEditorModel.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"saveFileFirst": "檔案已變更。請先儲存，再以其他編碼重新開啟。",
-	"genericSaveError": "無法儲存 '{0}': {1}"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/services/textfile/common/textFileService.i18n.json b/i18n/cht/src/vs/workbench/services/textfile/common/textFileService.i18n.json
deleted file mode 100644
index 849aba14eaa..00000000000
--- a/i18n/cht/src/vs/workbench/services/textfile/common/textFileService.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"files.backup.failSave": "檔案變更無法寫入備份區域 (錯誤: {0})。請嘗試儲存您的檔案後結束。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json b/i18n/cht/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json
deleted file mode 100644
index cc9ac892518..00000000000
--- a/i18n/cht/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"saveChangesMessage": "要儲存對 {0} 所做的變更嗎?",
-	"saveChangesMessages": "要儲存對下列 {0} 個檔案所做的變更嗎?",
-	"saveAll": "全部儲存(&&S)",
-	"save": "儲存(&&S)",
-	"dontSave": "不要儲存(&&N)",
-	"cancel": "取消",
-	"saveChangesDetail": "如果您不儲存變更，這些變更將會遺失。",
-	"allFiles": "所有檔案",
-	"noExt": "無擴充功能"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/services/themes/common/colorExtensionPoint.i18n.json b/i18n/cht/src/vs/workbench/services/themes/common/colorExtensionPoint.i18n.json
deleted file mode 100644
index 5687ca535c6..00000000000
--- a/i18n/cht/src/vs/workbench/services/themes/common/colorExtensionPoint.i18n.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"contributes.color": "提供延伸模組定義的可設定佈景主題色彩",
-	"contributes.color.id": "可設定佈景主題色彩的識別碼 ",
-	"contributes.color.id.format": "識別碼的格式應為 aa[.bb]*",
-	"contributes.color.description": "可設定佈景主題色彩的描述 ",
-	"contributes.defaults.light": "淺色佈景主題的預設色彩。應為十六進位 (#RRGGBB[AA]) 的色彩值，或提供預設的可設定佈景主題色彩。",
-	"contributes.defaults.dark": "深色佈景主題的預設色彩。應為十六進位 (#RRGGBB[AA]) 的色彩值，或提供預設的可設定佈景主題色彩。 ",
-	"contributes.defaults.highContrast": "高對比佈景主題的預設色彩。應為十六進位 (#RRGGBB[AA]) 的色彩值，或提供預設的可設定佈景主題色彩。",
-	"invalid.colorConfiguration": "'configuration.colors' 必須是陣列",
-	"invalid.default.colorType": "{0} 必須是十六進位 (#RRGGBB[AA] or #RGB[A]) 的色彩值，或是提供預設的可設定佈景主題色彩之識別碼。",
-	"invalid.id": "'configuration.colors.id' 必須定義且不得為空白",
-	"invalid.id.format": "'configuration.colors.id' 必須依照 word[.word]*",
-	"invalid.description": "'configuration.colors.description' 必須定義且不得為空白",
-	"invalid.defaults": "'configuration.colors.defaults' 必須定義，且必須包含 'light'、'dark' 及 'highContrast'"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/services/themes/common/colorThemeSchema.i18n.json b/i18n/cht/src/vs/workbench/services/themes/common/colorThemeSchema.i18n.json
deleted file mode 100644
index 56b196ad36b..00000000000
--- a/i18n/cht/src/vs/workbench/services/themes/common/colorThemeSchema.i18n.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"schema.token.settings": "權杖的色彩與樣式。",
-	"schema.token.foreground": "權杖的前景色彩。",
-	"schema.token.background.warning": "目前不支援權杖背景色彩。",
-	"schema.token.fontStyle": "字體格式規則: 'italic', 'bold' 或 'underline' 或是組合。空白字串取消繼承設定。",
-	"schema.fontStyle.error": "字體格式必需是 'italic', 'bold' 或 'underline' 或是組合，或是空白字串。",
-	"schema.token.fontStyle.none": "None (清除繼承格式)",
-	"schema.properties.name": "規則的描述。",
-	"schema.properties.scope": "針對此規則符合的範圍選取器。",
-	"schema.tokenColors.path": "tmTheme 檔案的路徑 (相對於目前檔案)。",
-	"schema.colors": "反白顯示語法時的色彩"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/services/themes/common/fileIconThemeSchema.i18n.json b/i18n/cht/src/vs/workbench/services/themes/common/fileIconThemeSchema.i18n.json
deleted file mode 100644
index 93b15989326..00000000000
--- a/i18n/cht/src/vs/workbench/services/themes/common/fileIconThemeSchema.i18n.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"schema.folderExpanded": "展開資料夾的資料夾圖示。展開資料夾圖示是選擇性的。如果未設定，即顯示為資料夾定義的圖示。",
-	"schema.folder": "摺疊資料夾的資料夾圖示，如果未設定 folderExpanded，就也是展開資料夾的圖示。",
-	"schema.file": "預設檔案圖示，顯示於所有不符合任何副檔名、檔案名稱或語言識別碼的檔案。",
-	"schema.folderNames": "建立資料夾名稱與圖示的關聯。物件索引鍵為資料夾名稱，但不包括任何路徑區段。不允許任何圖樣或萬用字元。資料夾名稱比對不區分大小寫。",
-	"schema.folderName": "關聯的圖示定義識別碼。",
-	"schema.folderNamesExpanded": "針對展開的資料夾建立資料夾名稱與圖示的關聯。物件索引鍵為資料夾名稱，但不包括任何路徑區段。不允許任何圖樣或萬用字元。資料夾名稱比對不區分大小寫。",
-	"schema.folderNameExpanded": "關聯的圖示定義識別碼。",
-	"schema.fileExtensions": "建立副檔名與圖示的關聯。物件索引鍵為副檔名。副檔名為檔案名稱的最後一個區段，在最後一個點之後 (不包括點) 。比較副檔名時不區分大小寫。",
-	"schema.fileExtension": "關聯的圖示定義識別碼。",
-	"schema.fileNames": "建立檔案名稱與圖示的關聯。物件索引鍵為完整檔案名稱，但不包括任何路徑區段。檔案名稱可以包含點和副檔名。不允許任何圖樣或萬用字元。檔案名稱比對不區分大小寫。",
-	"schema.fileName": "關聯的圖示定義識別碼。",
-	"schema.languageIds": "關聯語言與圖示。物件索引鍵為語言貢獻點中定義的語言識別碼。",
-	"schema.languageId": "關聯的圖示定義識別碼。",
-	"schema.fonts": "用在圖示定義中的字型。",
-	"schema.id": "字型識別碼。",
-	"schema.src": "字型的位置。",
-	"schema.font-path": "字型路徑，相對於目前的圖示佈景主題檔案。",
-	"schema.font-format": "字型格式。",
-	"schema.font-weight": "字型粗細。",
-	"schema.font-sstyle": "字型樣式。",
-	"schema.font-size": "字型預設大小。",
-	"schema.iconDefinitions": "建立檔案與圖示關聯時可使用的所有圖示描述。",
-	"schema.iconDefinition": "圖示定義。物件索引鍵為定義識別碼。",
-	"schema.iconPath": "使用 SVG 或 PNG 時: 影像路徑。路徑相對於圖示集檔案。",
-	"schema.fontCharacter": "使用字符字型時: 字型中要使用的字元。",
-	"schema.fontColor": "使用字符字型時: 要使用的色彩。",
-	"schema.fontSize": "使用字型時: 文字字型的字型大小 (百分比)。如果未設定，預設為字型定義中的大小。",
-	"schema.fontId": "使用字型時: 字型識別碼。如果未設定，預設為第一個字型定義。",
-	"schema.light": "以淺色色彩佈景主題顯示檔案圖示的選擇性關聯。",
-	"schema.highContrast": "以高對比色彩佈景主題顯示檔案圖示的選擇性關聯。",
-	"schema.hidesExplorerArrows": "設定當此佈景主題在使用中時，是否該隱藏檔案總管的箭號。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/services/themes/electron-browser/colorThemeData.i18n.json b/i18n/cht/src/vs/workbench/services/themes/electron-browser/colorThemeData.i18n.json
deleted file mode 100644
index 67d1d983a27..00000000000
--- a/i18n/cht/src/vs/workbench/services/themes/electron-browser/colorThemeData.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"error.cannotparsejson": "剖析 JSON 佈景主題檔案時發生問題: {0}",
-	"error.invalidformat.colors": "剖析彩色佈景主題檔案 {0} 時出現問題。屬性 'settings' 不是 'object' 類型。",
-	"error.invalidformat.tokenColors": "剖析色彩佈景主題檔案 {0} 時發生問題。屬性 'tokenColors' 應是指定色彩的陣列或是 TextMate 佈景主題檔案的路徑。",
-	"error.plist.invalidformat": "剖析 tmTheme 檔案 {0} 時出現問題。'settings' 不是陣列。",
-	"error.cannotparse": "剖析 tmTheme 檔案 {0} 時發生問題",
-	"error.cannotload": "載入 tmTheme 檔案 {0} 時發生問題: {1}"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/services/themes/electron-browser/colorThemeStore.i18n.json b/i18n/cht/src/vs/workbench/services/themes/electron-browser/colorThemeStore.i18n.json
deleted file mode 100644
index daef9d96dda..00000000000
--- a/i18n/cht/src/vs/workbench/services/themes/electron-browser/colorThemeStore.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.contributes.themes": "提供 Textmate 彩色佈景主題。",
-	"vscode.extension.contributes.themes.id": "用在使用者設定中的圖示佈景主題識別碼。",
-	"vscode.extension.contributes.themes.label": "如 UI 中所示的彩色佈景主題標籤。",
-	"vscode.extension.contributes.themes.uiTheme": "基底佈景主題定義編輯器的色彩: 'vs' 是淺色佈景主題，'vs-dark' 是深色佈景主題。'hc-black' 是深色高對比佈景主題。",
-	"vscode.extension.contributes.themes.path": "tmTheme 檔案的路徑。此路徑是擴充功能資料夾的相對路徑，通常為 './themes/themeFile.tmTheme'。",
-	"reqarray": "擴充點 '{0}' 必須是陣列。",
-	"reqpath": "'contributes.{0}.path' 中應有字串。提供的值: {1}",
-	"invalid.path.1": "擴充功能資料夾 ({2}) 應包含 'contributes.{0}.path' ({1})。這可能會導致擴充功能無法移植。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/services/themes/electron-browser/fileIconThemeData.i18n.json b/i18n/cht/src/vs/workbench/services/themes/electron-browser/fileIconThemeData.i18n.json
deleted file mode 100644
index 2a7c4cd0f81..00000000000
--- a/i18n/cht/src/vs/workbench/services/themes/electron-browser/fileIconThemeData.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"error.cannotparseicontheme": "剖析檔案的圖示檔時發生問題: {0}"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/services/themes/electron-browser/fileIconThemeStore.i18n.json b/i18n/cht/src/vs/workbench/services/themes/electron-browser/fileIconThemeStore.i18n.json
deleted file mode 100644
index 6541819eaeb..00000000000
--- a/i18n/cht/src/vs/workbench/services/themes/electron-browser/fileIconThemeStore.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.contributes.iconThemes": "貢獻檔案圖示佈景主題。",
-	"vscode.extension.contributes.iconThemes.id": "用在使用者設定中的圖示佈景主題識別碼。",
-	"vscode.extension.contributes.iconThemes.label": "以 UI 顯示的圖示佈景主題標籤。",
-	"vscode.extension.contributes.iconThemes.path": "圖示佈景主題定義檔案。路徑相對於擴充功能資料夾，通常為 './icons/awesome-icon-theme.json'。",
-	"reqarray": "擴充點 '{0}' 必須是陣列。",
-	"reqpath": "'contributes.{0}.path' 中應有字串。提供的值: {1}",
-	"reqid": "`contributes.{0}.id` 中應有字串。提供的值: {1}",
-	"invalid.path.1": "擴充功能資料夾 ({2}) 應包含 'contributes.{0}.path' ({1})。這可能會導致擴充功能無法移植。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json b/i18n/cht/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
deleted file mode 100644
index 80a488e2a3e..00000000000
--- a/i18n/cht/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"error.cannotloadtheme": "Unable to load {0}: {1}",
-	"colorTheme": "Specifies the color theme used in the workbench.",
-	"colorThemeError": "Theme is unknown or not installed.",
-	"iconTheme": "指定在工作台中使用的圖示主題，或設定為 'null' 不顯示任何檔案圖示。",
-	"noIconThemeDesc": "No file icons",
-	"iconThemeError": "File icon theme is unknown or not installed.",
-	"workbenchColors": "依目前選擇的彩色佈景主題覆寫顏色",
-	"editorColors.comments": "設定註解的色彩與樣式",
-	"editorColors.strings": "設定字串常值的色彩與樣式。",
-	"editorColors.keywords": "設定關鍵字的色彩與樣式。",
-	"editorColors.numbers": "設定數字常值的色彩與樣式。",
-	"editorColors.types": "設定型別宣告與參考的色彩與樣式。",
-	"editorColors.functions": "設定函式宣告與參考的色彩與樣式。",
-	"editorColors.variables": "設定變數宣告與參考的色彩與樣式。",
-	"editorColors.textMateRules": "使用 TextMate 佈景主題規則設定色彩與樣式 (進階)。",
-	"editorColors": "依目前選取的色彩佈景主題覆寫編輯器色彩與字型樣式。"
-}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json b/i18n/cht/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json
deleted file mode 100644
index 4d4e5f4f69d..00000000000
--- a/i18n/cht/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"errorInvalidTaskConfiguration": "無法寫入工作區組態檔。請開啟檔案更正其中的錯誤/警告，然後再試一次。 ",
-	"errorWorkspaceConfigurationFileDirty": "因為檔案已變更，所以無法寫入工作區組態檔。請將其儲存，然後再試一次。",
-	"openWorkspaceConfigurationFile": "開啟工作區組態設定"
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/azure-account/out/azure-account.i18n.json b/i18n/deu/extensions/azure-account/out/azure-account.i18n.json
deleted file mode 100644
index f949c193bfe..00000000000
--- a/i18n/deu/extensions/azure-account/out/azure-account.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"azure-account.copyAndOpen": "Kopieren & Öffnen",
-	"azure-account.close": "Schließen",
-	"azure-account.login": "Anmelden",
-	"azure-account.loginFirst": "Nicht angemeldet, bitte zuerst anmelden.",
-	"azure-account.userCodeFailed": "Fehler beim Erfassen von Benutzercode.",
-	"azure-account.tokenFailed": "Token wird mit Gerätecode erfasst",
-	"azure-account.tokenFromRefreshTokenFailed": "Token wird mit Aktualisierungstoken erfasst"
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/azure-account/out/extension.i18n.json b/i18n/deu/extensions/azure-account/out/extension.i18n.json
deleted file mode 100644
index 1b7d65fb173..00000000000
--- a/i18n/deu/extensions/azure-account/out/extension.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"azure-account.loggingIn": "Azure: Melde an...",
-	"azure-account.loggedIn": "Azure: {0}"
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/bat/package.i18n.json b/i18n/deu/extensions/bat/package.i18n.json
deleted file mode 100644
index ac462418b13..00000000000
--- a/i18n/deu/extensions/bat/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Windows-Bat-Sprachgrundlagen",
-	"description": "Bietet Ausschnitte, Syntaxhervorhebung, Klammernpaare und Falten in Windows-Batch-Dateien. "
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/clojure/package.i18n.json b/i18n/deu/extensions/clojure/package.i18n.json
deleted file mode 100644
index af73ae50c29..00000000000
--- a/i18n/deu/extensions/clojure/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Clojure-Sprachgrundlagen",
-	"description": "Bietet Syntaxhervorhebung und Klammernpaare in Clojure-Dateien."
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/coffeescript/package.i18n.json b/i18n/deu/extensions/coffeescript/package.i18n.json
deleted file mode 100644
index 03ef115d9f6..00000000000
--- a/i18n/deu/extensions/coffeescript/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "CoffeeScript-Sprachgrundlagen",
-	"description": "Bietet Ausschnitte, Syntaxhervorhebung, Klammernpaare und Falten in CoffeeScript-Dateien."
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/configuration-editing/out/extension.i18n.json b/i18n/deu/extensions/configuration-editing/out/extension.i18n.json
deleted file mode 100644
index ba0a7a9a2b0..00000000000
--- a/i18n/deu/extensions/configuration-editing/out/extension.i18n.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"workspaceFolder": "Pfad des in VS Code geöffneten Ordners",
-	"workspaceFolderBasename": "Name des in VS Code geöffneten Ordners ohne Schrägstriche (/)",
-	"relativeFile": "Die aktuelle geöffnete Datei bezogen auf ${WorkspaceFolder}",
-	"file": "Die aktuelle geöffnete Datei",
-	"cwd": "Das aktuelle Arbeitsverzeichnis der Aufgabenausführung beim Start",
-	"lineNumber": "Die aktuelle ausgewählte Zeilennummer in der aktiven Datei",
-	"selectedText": "Der aktuelle ausgewählte Text in der aktiven Datei",
-	"fileDirname": "Der Verzeichnisname der aktuellen geöffneten Datei",
-	"fileExtname": "Die Erweiterung der aktuellen geöffneten Datei",
-	"fileBasename": "Der Basisname der aktuellen geöffneten Datei",
-	"fileBasenameNoExtension": "Der Basisname der aktuellen geöffneten Datei ohne Erweiterung",
-	"exampleExtension": "Beispiel"
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json b/i18n/deu/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json
deleted file mode 100644
index e156208991d..00000000000
--- a/i18n/deu/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"activeEditorShort": "Der Dateiname (z.B. meineDatei.txt)",
-	"activeEditorMedium": "der Pfad der Datei relativ zum Workspace-Ordner (z.B. myFolder/myFile.txt)",
-	"activeEditorLong": "Der vollständige Pfad der Datei (z.B. /Benutzer/Entwicklung/meinProjekt/meinOrdner/meineDatei.txt)",
-	"rootName": "Name des Arbeitsbereichs (z.B. meinOrdner oder meinArbeitsberech)",
-	"rootPath": "Dateipfad des Arbeitsbereichs (z.B. /Benutzer/Entwicklung/meinArbeitsbereich)",
-	"folderName": "Name des Workspace-Ordners, der die Datei enthält (z.B. MeinOrdner)",
-	"folderPath": "Dateipfad des Workspace-Ordners, der die Datei enthält (z.B. /Benutzer/Entwicklung/MeinOrdner)",
-	"appName": "z. B. VS Code",
-	"dirty": "Ein geänderter Indikator, wenn der aktive Editor geändert wurde",
-	"separator": "Ein bedingtes Trennzeichen (' - '), das nur in der Umgebung von Variablen mit Werten angezeigt wird",
-	"assocLabelFile": "Dateien mit Erweiterung",
-	"assocDescriptionFile": "Ordnet alle Dateien, deren Dateinamen mit dem Globmuster übereinstimmen, der Sprache mit dem angegebenen Bezeichner zu.",
-	"assocLabelPath": "Dateien mit Pfad",
-	"assocDescriptionPath": "Ordnet alle Dateien, die mit dem absoluten Pfad des Globmusters in ihrem Pfad übereinstimmen, der Sprache mit dem angegebenen Bezeichner zu.",
-	"fileLabel": "Dateien nach Erweiterung",
-	"fileDescription": "Ordnet alle Dateien mit einer bestimmten Erweiterung zu.",
-	"filesLabel": "Dateien mit mehreren Erweiterungen",
-	"filesDescription": "Ordnet alle Dateien mit einer der Dateierweiterungen zu.",
-	"derivedLabel": "Dateien mit gleichgeordneten Elementen nach Name",
-	"derivedDescription": "Ordnet Dateien zu, die gleichgeordnete Elemente mit dem gleichen Namen und einer anderen Erweiterung besitzen.",
-	"topFolderLabel": "Ordner nach Name (oberste Ebene)",
-	"topFolderDescription": "Ordnet einen Ordner auf oberster Ebene einem bestimmten Namen zu.",
-	"topFoldersLabel": "Ordner mit mehreren Namen (oberste Ebene)",
-	"topFoldersDescription": "Ordnet mehrere Ordner auf oberster Ebene zu.",
-	"folderLabel": "Ordner nach Name (beliebiger Speicherort)",
-	"folderDescription": "Zuordnen eines Ordners mit einem bestimmten Namen an einem beliebigen Speicherort.",
-	"falseDescription": "Deaktiviert das Muster.",
-	"trueDescription": "Aktiviert das Muster.",
-	"siblingsDescription": "Ordnet Dateien zu, die gleichgeordnete Elemente mit dem gleichen Namen und einer anderen Erweiterung besitzen.",
-	"languageSpecificEditorSettings": "Sprachspezifische Editor-Einstellungen",
-	"languageSpecificEditorSettingsDescription": "Editor-Einstellungen für Sprache überschreiben"
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/configuration-editing/package.i18n.json b/i18n/deu/extensions/configuration-editing/package.i18n.json
deleted file mode 100644
index 6c6bea97941..00000000000
--- a/i18n/deu/extensions/configuration-editing/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Konfigurationsänderung",
-	"description": "Bietet Funktionen (erweitertes IntelliSense, automatische Korrektur) in Konfigurationsdateien wie Einstellungen, Startdateien und Erweiterungsmpfehlungen."
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/cpp/package.i18n.json b/i18n/deu/extensions/cpp/package.i18n.json
deleted file mode 100644
index 273b9c01841..00000000000
--- a/i18n/deu/extensions/cpp/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "C/C++-Sprachgrundlagen",
-	"description": "Bietet Ausschnitte, Syntaxhervorhebung, Klammernpaare und Falten in C/C++-Dateien."
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/csharp/package.i18n.json b/i18n/deu/extensions/csharp/package.i18n.json
deleted file mode 100644
index c36fa80a0fa..00000000000
--- a/i18n/deu/extensions/csharp/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "C# Sprachgrundlagen",
-	"description": "Bietet Ausschnitte, Syntaxhervorhebung, Klammernpaare und Falten in C#-Dateien."
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/css-language-features/client/out/cssMain.i18n.json b/i18n/deu/extensions/css-language-features/client/out/cssMain.i18n.json
deleted file mode 100644
index 05ec8e77798..00000000000
--- a/i18n/deu/extensions/css-language-features/client/out/cssMain.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"cssserver.name": "CSS-Sprachserver",
-	"folding.start": "Regionsanfang wird gefaltet",
-	"folding.end": "Regionsende wird gefaltet"
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/css-language-features/package.i18n.json b/i18n/deu/extensions/css-language-features/package.i18n.json
deleted file mode 100644
index 6c525265ecf..00000000000
--- a/i18n/deu/extensions/css-language-features/package.i18n.json
+++ /dev/null
@@ -1,81 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "CSS Sprachfeatures",
-	"description": "Bietet umfangreiche Sprachunterstützung für CSS-, LESS- und SCSS-Dateien.",
-	"css.title": "CSS",
-	"css.lint.argumentsInColorFunction.desc": "Ungültige Parameteranzahl.",
-	"css.lint.boxModel.desc": "Verwenden Sie width oder height nicht beim Festlegen von padding oder border",
-	"css.lint.compatibleVendorPrefixes.desc": "Stellen Sie beim Verwenden vom anbieterspezifischen Präfix sicher, dass alle anderen anbieterspezifischen Eigenschaften miteinbezogen werden",
-	"css.lint.duplicateProperties.desc": "Keine doppelten Formatvorlagendefinitionen verwenden",
-	"css.lint.emptyRules.desc": "Keine leeren Regelsätze verwenden",
-	"css.lint.float.desc": "Die Verwendung von \"float\" vermeiden. float-Eigenschaften führen zu anfälligem CSS, das schnell nicht mehr funktioniert, wenn sich ein Aspekt des Layouts ändert.",
-	"css.lint.fontFaceProperties.desc": "@font-face-Regel muss die Eigenschaften \"src\" und \"font-family\" definieren.",
-	"css.lint.hexColorLength.desc": "Hexfarben müssen aus drei oder sechs Hexzahlen bestehen",
-	"css.lint.idSelector.desc": "Selektoren sollten keine IDs enthalten, da diese Regeln zu eng mit HTML verknüpft sind.",
-	"css.lint.ieHack.desc": "IE-Hacks sind nur für die Unterstützung von IE7 und älter erforderlich",
-	"css.lint.important.desc": "Verwendung von „!important“ vermeiden. Damit wird angegeben, dass die Spezifität vom gesamten CSS außer Kontrolle geraten ist und umgestaltet werden muss.",
-	"css.lint.importStatement.desc": "Importanweisungen können nicht parallel geladen werden.",
-	"css.lint.propertyIgnoredDueToDisplay.desc": "Die Eigenschaft wird aufgrund der Anzeige ignoriert. Mit \"display: inline\" besitzen die width-, height-, margin-top-, margin-bottom- und float-Eigenschaften z. B. keine Auswirkung.",
-	"css.lint.universalSelector.desc": "Es ist bekannt, dass der Universalselektor (*) langsam ist.",
-	"css.lint.unknownProperties.desc": "Unbekannte Eigenschaft.",
-	"css.lint.unknownVendorSpecificProperties.desc": "Unbekannte anbieterspezifische Eigenschaft.",
-	"css.lint.vendorPrefix.desc": "Beim Verwenden von anbieterspezifischen Präfix auch die Standardeigenschaft miteinbeziehen",
-	"css.lint.zeroUnits.desc": "Keine Einheit für Null erforderlich",
-	"css.trace.server.desc": "Verfolgt die Kommunikation zwischen VS Code und dem CSS-Sprachserver.",
-	"css.validate.title": "Steuert die CSS-Validierung und Problemschweregrade.",
-	"css.validate.desc": "Aktiviert oder deaktiviert alle Überprüfungen.",
-	"less.title": "LESS",
-	"less.lint.argumentsInColorFunction.desc": "Ungültige Parameteranzahl.",
-	"less.lint.boxModel.desc": "Verwenden Sie width oder height nicht beim Festlegen von padding oder border",
-	"less.lint.compatibleVendorPrefixes.desc": "Stellen Sie beim Verwenden vom anbieterspezifischen Präfix sicher, dass alle anderen anbieterspezifischen Eigenschaften miteinbezogen werden",
-	"less.lint.duplicateProperties.desc": "Keine doppelten Formatvorlagendefinitionen verwenden",
-	"less.lint.emptyRules.desc": "Keine leeren Regelsätze verwenden",
-	"less.lint.float.desc": "Die Verwendung von \"float\" vermeiden. float-Eigenschaften führen zu anfälligem CSS, das schnell nicht mehr funktioniert, wenn sich ein Aspekt des Layouts ändert.",
-	"less.lint.fontFaceProperties.desc": "@font-face-Regel muss die Eigenschaften \"src\" und \"font-family\" definieren.",
-	"less.lint.hexColorLength.desc": "Hexfarben müssen aus drei oder sechs Hexzahlen bestehen",
-	"less.lint.idSelector.desc": "Selektoren sollten keine IDs enthalten, da diese Regeln zu eng mit HTML verknüpft sind.",
-	"less.lint.ieHack.desc": "IE-Hacks sind nur für die Unterstützung von IE7 und älter erforderlich",
-	"less.lint.important.desc": "Verwendung von „!important“ vermeiden. Damit wird angegeben, dass die Spezifität vom gesamten CSS außer Kontrolle geraten ist und umgestaltet werden muss.",
-	"less.lint.importStatement.desc": "Importanweisungen können nicht parallel geladen werden.",
-	"less.lint.propertyIgnoredDueToDisplay.desc": "Die Eigenschaft wird aufgrund der Anzeige ignoriert. Mit \"display: inline\" besitzen die width-, height-, margin-top-, margin-bottom- und float-Eigenschaften z. B. keine Auswirkung.",
-	"less.lint.universalSelector.desc": "Es ist bekannt, dass der Universalselektor (*) langsam ist.",
-	"less.lint.unknownProperties.desc": "Unbekannte Eigenschaft.",
-	"less.lint.unknownVendorSpecificProperties.desc": "Unbekannte anbieterspezifische Eigenschaft.",
-	"less.lint.vendorPrefix.desc": "Beim Verwenden von anbieterspezifischen Präfix auch die Standardeigenschaft miteinbeziehen",
-	"less.lint.zeroUnits.desc": "Keine Einheit für Null erforderlich",
-	"less.validate.title": "Steuert die LESS-Validierung und Problemschweregrade.",
-	"less.validate.desc": "Aktiviert oder deaktiviert alle Überprüfungen.",
-	"scss.title": "SCSS (SASS)",
-	"scss.lint.argumentsInColorFunction.desc": "Ungültige Parameteranzahl.",
-	"scss.lint.boxModel.desc": "Verwenden Sie width oder height nicht beim Festlegen von padding oder border",
-	"scss.lint.compatibleVendorPrefixes.desc": "Stellen Sie beim Verwenden vom anbieterspezifischen Präfix sicher, dass alle anderen anbieterspezifischen Eigenschaften miteinbezogen werden",
-	"scss.lint.duplicateProperties.desc": "Keine doppelten Formatvorlagendefinitionen verwenden",
-	"scss.lint.emptyRules.desc": "Keine leeren Regelsätze verwenden",
-	"scss.lint.float.desc": "Die Verwendung von \"float\" vermeiden. float-Eigenschaften führen zu anfälligem CSS, das schnell nicht mehr funktioniert, wenn sich ein Aspekt des Layouts ändert.",
-	"scss.lint.fontFaceProperties.desc": "@font-face-Regel muss die Eigenschaften \"src\" und \"font-family\" definieren.",
-	"scss.lint.hexColorLength.desc": "Hexfarben müssen aus drei oder sechs Hexzahlen bestehen",
-	"scss.lint.idSelector.desc": "Selektoren sollten keine IDs enthalten, da diese Regeln zu eng mit HTML verknüpft sind.",
-	"scss.lint.ieHack.desc": "IE-Hacks sind nur für die Unterstützung von IE7 und älter erforderlich",
-	"scss.lint.important.desc": "Verwendung von „!important“ vermeiden. Damit wird angegeben, dass die Spezifität vom gesamten CSS außer Kontrolle geraten ist und umgestaltet werden muss.",
-	"scss.lint.importStatement.desc": "Importanweisungen können nicht parallel geladen werden.",
-	"scss.lint.propertyIgnoredDueToDisplay.desc": "Die Eigenschaft wird aufgrund der Anzeige ignoriert. Mit \"display: inline\" besitzen die width-, height-, margin-top-, margin-bottom- und float-Eigenschaften z. B. keine Auswirkung.",
-	"scss.lint.universalSelector.desc": "Es ist bekannt, dass der Universalselektor (*) langsam ist.",
-	"scss.lint.unknownProperties.desc": "Unbekannte Eigenschaft.",
-	"scss.lint.unknownVendorSpecificProperties.desc": "Unbekannte anbieterspezifische Eigenschaft.",
-	"scss.lint.vendorPrefix.desc": "Beim Verwenden von anbieterspezifischen Präfix auch die Standardeigenschaft miteinbeziehen",
-	"scss.lint.zeroUnits.desc": "Keine Einheit für Null erforderlich",
-	"scss.validate.title": "Steuert die SCSS-Überprüfung und Problemschweregrade.",
-	"scss.validate.desc": "Aktiviert oder deaktiviert alle Überprüfungen.",
-	"less.colorDecorators.enable.desc": "Aktiviert oder deaktiviert Farb-Decorators",
-	"scss.colorDecorators.enable.desc": "Aktiviert oder deaktiviert Farb-Decorators",
-	"css.colorDecorators.enable.desc": "Aktiviert oder deaktiviert Farb-Decorators",
-	"css.colorDecorators.enable.deprecationMessage": "Die Einstellung \"css.colorDecorators.enable\" ist veraltet und wurde durch \"editor.colorDecorators\" ersetzt.",
-	"scss.colorDecorators.enable.deprecationMessage": "Die Einstellung \"scss.colorDecorators.enable\" ist veraltet und wurde durch \"editor.colorDecorators\" ersetzt.",
-	"less.colorDecorators.enable.deprecationMessage": "Die Einstellung \"less.colorDecorators.enable\" ist veraltet und wurde durch \"editor.colorDecorators\" ersetzt."
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/css/client/out/cssMain.i18n.json b/i18n/deu/extensions/css/client/out/cssMain.i18n.json
deleted file mode 100644
index 05ec8e77798..00000000000
--- a/i18n/deu/extensions/css/client/out/cssMain.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"cssserver.name": "CSS-Sprachserver",
-	"folding.start": "Regionsanfang wird gefaltet",
-	"folding.end": "Regionsende wird gefaltet"
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/css/package.i18n.json b/i18n/deu/extensions/css/package.i18n.json
deleted file mode 100644
index aed34432417..00000000000
--- a/i18n/deu/extensions/css/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "CSS-Sprachgrundlagen",
-	"description": "Bietet Syntax-Highlighting und Bracket-Matching für CSS, LESS und SCSS Dateien."
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/diff/package.i18n.json b/i18n/deu/extensions/diff/package.i18n.json
deleted file mode 100644
index 35229bd6699..00000000000
--- a/i18n/deu/extensions/diff/package.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	]
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/docker/package.i18n.json b/i18n/deu/extensions/docker/package.i18n.json
deleted file mode 100644
index 39876eea478..00000000000
--- a/i18n/deu/extensions/docker/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Docker-Sprachgrundlagen",
-	"description": "Bietet Syntaxhervorhebung und Klammernpaare in Docker-Dateien."
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/emmet/package.i18n.json b/i18n/deu/extensions/emmet/package.i18n.json
deleted file mode 100644
index 76a0f1cf2f4..00000000000
--- a/i18n/deu/extensions/emmet/package.i18n.json
+++ /dev/null
@@ -1,65 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"description": "Emmet-Unterstützung für VS Code",
-	"command.wrapWithAbbreviation": "Mit Abkürzung umschließen",
-	"command.wrapIndividualLinesWithAbbreviation": "Einzelne Zeilen mit Abkürzung umschließen",
-	"command.removeTag": "Tag entfernen",
-	"command.updateTag": "Tag aktualisieren",
-	"command.matchTag": "Gehe zu übereinstimmendem Paar",
-	"command.balanceIn": "Ausgleichen (einwärts)",
-	"command.balanceOut": "Ausgleichen (auswärts)",
-	"command.prevEditPoint": "Gehe zum vorherigen Bearbeitungspunkt",
-	"command.nextEditPoint": "Gehe zum nächsten Bearbeitungspunkt",
-	"command.mergeLines": "Zeilen mergen",
-	"command.selectPrevItem": "Vorheriges Element auswählen",
-	"command.selectNextItem": "Nächstes Element auswählen",
-	"command.splitJoinTag": "Tag teilen/verknüpfen",
-	"command.toggleComment": "Kommentar ein-/ausschalten",
-	"command.evaluateMathExpression": "Mathematischen Ausdruck auswerten",
-	"command.updateImageSize": "Bildgröße aktualisieren",
-	"command.reflectCSSValue": "CSS-Wert reflektieren",
-	"command.incrementNumberByOne": "Um 1 erhöhen",
-	"command.decrementNumberByOne": "Um 1 verringern",
-	"command.incrementNumberByOneTenth": "Um 0,1 erhöhen",
-	"command.decrementNumberByOneTenth": "Um 0,1 verringern",
-	"command.incrementNumberByTen": "Um 10 erhöhen",
-	"command.decrementNumberByTen": "Um 10 verringern",
-	"emmetSyntaxProfiles": "Definieren Sie das Profil für die angegebene Syntax, oder verwenden Sie Ihr eigenes Profil mit bestimmten Regeln.",
-	"emmetExclude": "Ein Array von Sprachen, in dem Emmet-Abkürzungen nicht erweitert werden sollten.",
-	"emmetExtensionsPath": "Pfad zu einem Ordner mit Emmet-Profilen und Ausschnitten.",
-	"emmetShowExpandedAbbreviation": "Zeigt erweiterte Emmet-Abkürzungen als Vorschläge an.\nDie Option inMarkupAndStylesheetFilesOnly gilt für HTML, HAML, Jade, Slim, XML, XSL, CSS, SCSS, Sass, Less und Stylus.\nDie Option \"always\" gilt unabhängig vom Markup/CSS für alle Teile der Datei.",
-	"emmetShowAbbreviationSuggestions": "Zeigt mögliche Emmet-Abkürzungen als Vorschläge an. Diese Option gilt nicht in Stylesheets oder wenn emmet.showExpandedAbbreviation auf \"never\" festgelegt ist.",
-	"emmetIncludeLanguages": "Aktivieren Sie Emmet-Abkürzungen in Sprachen, die nicht standardmäßig unterstützt werden. Fügen Sie hier eine Zuordnung zwischen der Sprache und der von Emmet unterstützten Sprache hinzu.\nBeispiel: {\"vue-html\": \"html\", \"javascript\": \"javascriptreact\"}",
-	"emmetVariables": "In Emmet-Ausschnitten zu verwendende Codeausschnitte",
-	"emmetTriggerExpansionOnTab": "Wenn aktiviert, werden Emmet-Abkürzungen beim Drücken der TAB-Taste erweitert.",
-	"emmetPreferences": "Einstellungen, die zum Ändern des Verhaltens einiger Aktionen und Konfliktlöser von Emmet verwendet werden.",
-	"emmetPreferencesIntUnit": "Standardeinheit für Integerwerte",
-	"emmetPreferencesFloatUnit": "Standardeinheit für Floatwerte",
-	"emmetPreferencesCssAfter": "Symbol, das beim Erweitern von CSS-Abkürzungen am Ende der CSS-Eigenschaft eingefügt werden soll",
-	"emmetPreferencesSassAfter": "Symbol, das beim Erweitern von CSS-Abkürzungen in Sass-Dateien am Ende der CSS-Eigenschaft eingefügt werden soll",
-	"emmetPreferencesStylusAfter": "Symbol, das beim Erweitern von CSS-Abkürzungen in Stylus-Dateien am Ende der CSS-Eigenschaft eingefügt werden soll",
-	"emmetPreferencesCssBetween": "Symbol, das beim Erweitern von CSS-Abkürzungen zwischen der CSS-Eigenschaft und dem Wert eingefügt werden soll",
-	"emmetPreferencesSassBetween": "Symbol, das beim Erweitern von CSS-Abkürzungen in Sass-Dateien zwischen der CSS-Eigenschaft und dem Wert eingefügt werden soll",
-	"emmetPreferencesStylusBetween": "Symbol, das beim Erweitern von CSS-Abkürzungen in Stylus-Dateien zwischen der CSS-Eigenschaft und dem Wert eingefügt werden soll",
-	"emmetShowSuggestionsAsSnippets": "Bei TRUE werden die Emmet-Vorschläge als Ausschnitte angezeigt, mit denen Sie sie der editor.snippetSuggestions-Einstellung entsprechend anordnen können.",
-	"emmetPreferencesBemElementSeparator": "Elementtrennzeichen für Klassen unter Verwendung des BEM-Filters",
-	"emmetPreferencesBemModifierSeparator": "Modifizierertrennzeichen für Klassen unter Verwendung des BEM-Filters",
-	"emmetPreferencesFilterCommentBefore": "Eine Kommentardefinition, die vor dem abgeglichenen Element platziert werden muss, wenn ein Kommentarfilter angewendet wird.",
-	"emmetPreferencesFilterCommentAfter": "Eine Kommentardefinition, die nach dem abgeglichenen Element platziert werden muss, wenn ein Kommentarfilter angewendet wird.",
-	"emmetPreferencesFilterCommentTrigger": "Eine durch Trennzeichen getrennte Liste von Attributnamen, die in abgekürzter Form vorliegen müssen, damit der Kommentarfilter angewendet werden kann",
-	"emmetPreferencesFormatNoIndentTags": "Ein Array von Tagnamen, die keinen inneren Einzug erhalten",
-	"emmetPreferencesFormatForceIndentTags": "Ein Array von Tagnamen, die immer einen inneren Einzug erhalten",
-	"emmetPreferencesAllowCompactBoolean": "Bei TRUE wird eine kompakte Notation boolescher Attribute erzeugt",
-	"emmetPreferencesCssWebkitProperties": "Durch Trennzeichen getrennte CSS-Eigenschaften, die das \"webkit\"-Herstellerpräfix erhalten, wenn sie in einer Emmet-Abkürzung verwendet werden, die mit \"-\" beginnt. Legen Sie eine leere Zeichenfolge fest, um das \"webkit\"-Präfix immer zu vermeiden.",
-	"emmetPreferencesCssMozProperties": "Durch Trennzeichen getrennte CSS-Eigenschaften, die das \"moz\"-Herstellerpräfix erhalten, wenn sie in einer Emmet-Abkürzung verwendet werden, die mit \"-\" beginnt. Legen Sie eine leere Zeichenfolge fest, um das \"moz\"-Präfix immer zu vermeiden.",
-	"emmetPreferencesCssOProperties": "Durch Trennzeichen getrennte CSS-Eigenschaften, die das \"o\"-Herstellerpräfix erhalten, wenn sie in einer Emmet-Abkürzung verwendet werden, die mit \"-\" beginnt. Legen Sie eine leere Zeichenfolge fest, um das \"o\"-Präfix immer zu vermeiden.",
-	"emmetPreferencesCssMsProperties": "Durch Trennzeichen getrennte CSS-Eigenschaften, die das \"ms\"-Herstellerpräfix erhalten, wenn sie in einer Emmet-Abkürzung verwendet werden, die mit \"-\" beginnt. Legen Sie eine leere Zeichenfolge fest, um das \"ms\"-Präfix immer zu vermeiden.",
-	"emmetPreferencesCssFuzzySearchMinScore": "Das Mindestergebnis (zwischen 0 und 1), das die Abkürzung mit Fuzzyübereinstimmung erreichen muss. Niedrigere Werte führen zu vielen falsch positiven Übereinstimmungen, höhere Werte verringern unter Umständen die möglichen Übereinstimmungen.",
-	"emmetOptimizeStylesheetParsing": "Bei der Einstellung FALSE wird die gesamte Datei analysiert, um zu bestimmten, ob die aktuelle Position zum Erweitern von Emmet-Abkürzungen gültig ist. Bei der Einstellung TRUE wird nur der Inhalt um die die aktuelle Position in CSS-/SCSS-/LESS-Dateien analysiert."
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/extension-editing/out/extensionLinter.i18n.json b/i18n/deu/extensions/extension-editing/out/extensionLinter.i18n.json
deleted file mode 100644
index 36866190f3e..00000000000
--- a/i18n/deu/extensions/extension-editing/out/extensionLinter.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"httpsRequired": "Für Bilder muss das HTTPS-Protokoll verwendet werden.",
-	"svgsNotValid": "SVGs sind keine gültige Bildquelle.",
-	"embeddedSvgsNotValid": "Eingebettete SVGs sind keine gültige Bildquelle.",
-	"dataUrlsNotValid": "Daten-URLs sind keine gültige Bildquelle.",
-	"relativeUrlRequiresHttpsRepository": "Relative Bild-URLs erfordern die Angabe eines Repositorys mit dem HTTPS-Protokoll in der Datei \"package.json\".",
-	"relativeIconUrlRequiresHttpsRepository": "Ein Symbol erfordert die Angabe eines Repositorys mit dem HTTPS-Protokoll in dieser Datei \"package.json\".",
-	"relativeBadgeUrlRequiresHttpsRepository": "Relative Badge-URLs erfordern die Angabe eines Repositorys mit dem HTTPS-Protokoll in dieser Datei \"package.json\"."
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/extension-editing/out/packageDocumentHelper.i18n.json b/i18n/deu/extensions/extension-editing/out/packageDocumentHelper.i18n.json
deleted file mode 100644
index e71a3918327..00000000000
--- a/i18n/deu/extensions/extension-editing/out/packageDocumentHelper.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"languageSpecificEditorSettings": "Sprachspezifische Editor-Einstellungen",
-	"languageSpecificEditorSettingsDescription": "Editor-Einstellungen für Sprache überschreiben"
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/extension-editing/package.i18n.json b/i18n/deu/extensions/extension-editing/package.i18n.json
deleted file mode 100644
index ee917a1444c..00000000000
--- a/i18n/deu/extensions/extension-editing/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Paketbearbeitung",
-	"description": "Bietet Intellisense für VS Code-Erweiterungspunkte und Bereinigungsfunktionen in Dateien vom Typ \"package.json\"."
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/fsharp/package.i18n.json b/i18n/deu/extensions/fsharp/package.i18n.json
deleted file mode 100644
index bd6db3cff25..00000000000
--- a/i18n/deu/extensions/fsharp/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "F#-Sprachgrundlagen",
-	"description": "Bietet Ausschnitte, Syntaxhervorhebung, Klammernpaare und Falten in F#-Dateien."
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/git/out/askpass-main.i18n.json b/i18n/deu/extensions/git/out/askpass-main.i18n.json
deleted file mode 100644
index c8a3e8f056c..00000000000
--- a/i18n/deu/extensions/git/out/askpass-main.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"missOrInvalid": "Fehlende oder ungültige Anmeldeinformationen."
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/git/out/autofetch.i18n.json b/i18n/deu/extensions/git/out/autofetch.i18n.json
deleted file mode 100644
index 57d1be570fc..00000000000
--- a/i18n/deu/extensions/git/out/autofetch.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"yes": "Ja",
-	"no": "Nein",
-	"not now": "Erneut nachfragen",
-	"suggest auto fetch": "Möchten Sie Code [regelmäßig \"git fetch\" ausführen lassen] ({0})?"
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/git/out/commands.i18n.json b/i18n/deu/extensions/git/out/commands.i18n.json
deleted file mode 100644
index 1abad5f86ec..00000000000
--- a/i18n/deu/extensions/git/out/commands.i18n.json
+++ /dev/null
@@ -1,91 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"tag at": "Tag bei {0}",
-	"remote branch at": "Remotebranch unter {0}",
-	"create branch": "$(plus) Neuen Branch erstellen",
-	"repourl": "Repository-URL",
-	"selectFolder": "Repositoryspeicherort auswählen",
-	"cloning": "Das Git-Repository \"{0}\" wird geklont …",
-	"proposeopen": "Möchten Sie das geklonte Repository öffnen?",
-	"openrepo": "Repository öffnen",
-	"add": "Zum Arbeitsbereich hinzufügen",
-	"proposeopen2": "Möchten Sie das geklonte Repository öffnen oder es zum aktuellen Arbeitsbereich hinzufügen?",
-	"init": "Arbeitsbereichsordner auswählen, in dem das Git-Repository initialisiert wird",
-	"init repo": "Repository initialisieren",
-	"create repo": "Repository initialisieren",
-	"are you sure": "Erstellt ein Git-Repository unter '{0}'. Sind Sie sicher das Sie weiterfahren möchten?",
-	"HEAD not available": "Es ist keine HEAD-Version von \"{0}\" verfügbar.",
-	"confirm stage files with merge conflicts": "Möchten Sie {0} Dateien mit Mergingkonflikten bereitstellen?",
-	"confirm stage file with merge conflicts": "Möchten Sie {0} mit Mergingkonflikten bereitstellen?",
-	"yes": "Ja",
-	"confirm revert": "Möchten Sie ausgewählten Änderungen in {0} wirklich zurücksetzen?",
-	"revert": "Änderungen zurücksetzen",
-	"discard": "Änderungen verwerfen",
-	"confirm delete": "Möchten Sie \"{0}\" wirklich LÖSCHEN?",
-	"delete file": "Datei löschen",
-	"confirm discard": "Möchten Sie die Änderungen in {0} wirklich verwerfen?",
-	"confirm discard multiple": "Möchten Sie wirklich Änderungen in {0} Dateien verwerfen?",
-	"warn untracked": "Dies wird {0} nicht verfolgte Dateien LÖSCHEN!",
-	"confirm discard all single": "Möchten Sie die Änderungen in {0} wirklich verwerfen?",
-	"confirm discard all": "Möchten Sie ALLE Änderungen in {0} Dateien verwerfen?\nDies kann NICHT rückgängig gemacht werden.\nIhr aktueller Arbeitssatz geht dadurch DAUERHAFT verloren.",
-	"discardAll multiple": "Eine Datei verwerfen",
-	"discardAll": "Alle {0} Dateien verwerfen",
-	"confirm delete multiple": "Möchten Sie {0} Dateien LÖSCHEN?",
-	"delete files": "Dateien löschen",
-	"there are untracked files single": "Die folgende nicht verfolgte Datei wird VOM DATENTRÄGER GELÖSCHT, wenn sie verworfen wird: {0}.",
-	"there are untracked files": "Es sind {0} nicht verfolgte Dateien vorhanden, die VOM DATENTRÄGER GELÖSCHT werden, wenn sie verworfen werden.",
-	"confirm discard all 2": "{0}\n\nDies kann NICHT rückgängig gemacht werden, und Ihr aktueller Arbeitssatz geht DAUERHAFT verloren.",
-	"yes discard tracked": "1 verfolgte Datei verwerfen",
-	"yes discard tracked multiple": "{0} verfolgte Dateien verwerfen",
-	"unsaved files single": "Die folgende Datei ist nicht gespeichert: {0}.\n\nMöchten Sie diese vor dem Committen speichern?",
-	"unsaved files": "{0} Dateien sind nicht gespeichert.\n\nMöchten Sie diese vor dem Committen speichern?",
-	"save and commit": "Alles speichern und committen",
-	"commit": "Trotzdem committen",
-	"no staged changes": "Es sind keine Änderungen bereitgestellt.\n\nMöchten Sie alle Ihre Änderungen automatisch bereitstellen und direkt committen?",
-	"always": "Immer",
-	"no changes": "Keine Änderungen zum Speichern vorhanden.",
-	"commit message": "Commit-Nachricht",
-	"provide commit message": "Geben Sie eine Commit-Nachricht ein.",
-	"select a ref to checkout": "Referenz zum Auschecken auswählen",
-	"branch name": "Branchname",
-	"provide branch name": "Geben Sie einen Branchnamen an.",
-	"select branch to delete": "Wählen Sie einen Branch zum Löschen aus",
-	"confirm force delete branch": "Der Branch '{0}' ist noch nicht vollständig zusammengeführt. Trotzdem löschen?",
-	"delete branch": "Branch löschen",
-	"invalid branch name": "Ungültiger Branchname",
-	"branch already exists": "Ein Branch namens \"{0}\" bereits vorhanden.",
-	"select a branch to merge from": "Branch für die Zusammenführung auswählen",
-	"merge conflicts": "Es liegen Zusammenführungskonflikte vor. Beheben Sie die Konflikte vor dem Committen.",
-	"tag name": "Tag-Name",
-	"provide tag name": "Geben Sie einen Tagnamen an.",
-	"tag message": "Nachricht",
-	"provide tag message": "Geben Sie eine Meldung ein, um das Tag mit einer Anmerkung zu versehen.",
-	"no remotes to fetch": "In diesem Repository wurden keine Remoteelemente konfiguriert, aus denen ein Abrufen erfolgt.",
-	"no remotes to pull": "In Ihrem Repository wurden keine Remoteelemente für den Pull konfiguriert.",
-	"pick remote pull repo": "Remoteelement zum Pullen des Branch auswählen",
-	"no remotes to push": "In Ihrem Repository wurden keine Remoteelemente für den Push konfiguriert.",
-	"nobranch": "Wählen Sie ein Branch für den Push zu einem Remoteelement aus.",
-	"confirm publish branch": "Der Branch \"{0}\" verfügt über keinen Upstreambranch. Möchten Sie diesen Branch veröffentlichen?",
-	"ok": "OK",
-	"push with tags success": "Push mit Tags erfolgreich ausgeführt.",
-	"pick remote": "Remotespeicherort auswählen, an dem der Branch \"{0}\" veröffentlicht wird:",
-	"sync is unpredictable": "Mit dieser Aktion werden Commits per Push und Pull an und von \"{0}/{1}\" übertragen.",
-	"never again": "OK, nicht mehr anzeigen",
-	"no remotes to publish": "In Ihrem Repository wurden keine Remoteelemente für die Veröffentlichung konfiguriert.",
-	"no changes stash": "Es sind keine Änderungen vorhanden, für die ein Stash ausgeführt werden kann.",
-	"provide stash message": "Geben Sie optional eine Stash-Nachricht ein.",
-	"stash message": "Stash-Nachricht",
-	"no stashes": "Es ist kein Stash zum Wiederherstellen vorhanden.",
-	"pick stash to pop": "Wählen Sie einen Stash aus, für den ein Pop ausgeführt werden soll.",
-	"clean repo": "Bereinigen Sie Ihre Repository-Arbeitsstruktur vor Auftragsabschluss.",
-	"cant push": "Verweise können nicht per Push an einen Remotespeicherort übertragen werden. Führen Sie zuerst \"Pull\" aus, um Ihre Änderungen zu integrieren.",
-	"git error details": "Git: {0}",
-	"git error": "Git-Fehler",
-	"open git log": "Git-Protokoll öffnen"
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/git/out/main.i18n.json b/i18n/deu/extensions/git/out/main.i18n.json
deleted file mode 100644
index f9fdc4a6212..00000000000
--- a/i18n/deu/extensions/git/out/main.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"looking": "Suchen nach Git in: {0}",
-	"using git": "Verwenden von Git {0} von {1}",
-	"downloadgit": "Git herunterladen",
-	"neverShowAgain": "Nicht mehr anzeigen",
-	"notfound": "Git nicht gefunden. Installieren Sie es, oder konfigurieren Sie es mithilfe der Einstellung \"git.path\".",
-	"updateGit": "Git aktualisieren",
-	"git20": "Sie haben anscheinend Git {0} installiert. Code funktioniert am besten mit Git 2 oder neuer"
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/git/out/model.i18n.json b/i18n/deu/extensions/git/out/model.i18n.json
deleted file mode 100644
index 9a6612eb540..00000000000
--- a/i18n/deu/extensions/git/out/model.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"too many submodules": "Das Repository \"{0}\" enthält {1} Submodule, die nicht automatisch geöffnet werden. Sie könne Sie einzeln öffnen, indem Sie darin erhaltene Datei öffnen.",
-	"no repositories": "Es sind keine verfügbaren Repositorys vorhanden.",
-	"pick repo": "Repository auswählen"
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/git/out/repository.i18n.json b/i18n/deu/extensions/git/out/repository.i18n.json
deleted file mode 100644
index 19de752d125..00000000000
--- a/i18n/deu/extensions/git/out/repository.i18n.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"open": "Öffnen",
-	"index modified": "Index geändert",
-	"modified": "Geändert am",
-	"index added": "Index hinzugefügt",
-	"index deleted": "Index gelöscht",
-	"deleted": "Gelöscht",
-	"index renamed": "Index umbenannt",
-	"index copied": "Index kopiert",
-	"untracked": "Nicht verfolgt",
-	"ignored": "Ignoriert",
-	"both deleted": "Beide gelöscht",
-	"added by us": "Hinzugefügt von uns",
-	"deleted by them": "Gelöscht von anderen",
-	"added by them": "Hinzugefügt von anderen",
-	"deleted by us": "Gelöscht von uns",
-	"both added": "Beide hinzugefügt",
-	"both modified": "Beide geändert",
-	"commitMessage": "Message (press {0} to commit)",
-	"commit": "Commit",
-	"merge changes": "Änderungen zusammenführen",
-	"staged changes": "Bereitgestellte Änderungen",
-	"changes": "Änderungen",
-	"commitMessageCountdown": "{0} Zeichen in der aktuellen Zeile verbleibend",
-	"commitMessageWarning": "{0} Zeichen über {1} in der aktuellen Zeile",
-	"neveragain": "Nicht mehr anzeigen",
-	"huge": "Das Git-Repository unter {0} umfasst zu viele aktive Änderungen. Nur ein Teil der Git-Features wird aktiviert."
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/git/out/scmProvider.i18n.json b/i18n/deu/extensions/git/out/scmProvider.i18n.json
deleted file mode 100644
index 7fded37328a..00000000000
--- a/i18n/deu/extensions/git/out/scmProvider.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"commit": "Commit"
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/git/out/statusbar.i18n.json b/i18n/deu/extensions/git/out/statusbar.i18n.json
deleted file mode 100644
index e38a70fdd7f..00000000000
--- a/i18n/deu/extensions/git/out/statusbar.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"checkout": "Auschecken...",
-	"sync changes": "Änderungen synchronisieren",
-	"publish changes": "Änderungen veröffentlichen",
-	"syncing changes": "Änderungen werden synchronisiert..."
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/git/package.i18n.json b/i18n/deu/extensions/git/package.i18n.json
deleted file mode 100644
index 70e0819e8ad..00000000000
--- a/i18n/deu/extensions/git/package.i18n.json
+++ /dev/null
@@ -1,87 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Git",
-	"description": "Git SCM-Integration",
-	"command.clone": "Klonen",
-	"command.init": "Repository initialisieren",
-	"command.close": "Repository schließen",
-	"command.refresh": "Aktualisieren",
-	"command.openChange": "Änderungen öffnen",
-	"command.openFile": "Datei öffnen",
-	"command.openHEADFile": "Datei öffnen (HEAD)",
-	"command.stage": "Änderungen bereitstellen",
-	"command.stageAll": "Alle Änderungen bereitstellen",
-	"command.stageSelectedRanges": "Gewählte Bereiche bereitstellen",
-	"command.revertSelectedRanges": "Ausgewählte Bereiche zurücksetzen",
-	"command.stageChange": "Änderung bereitstellen",
-	"command.revertChange": "Änderung zurücksetzen",
-	"command.unstage": "Bereitstellung der Änderungen aufheben",
-	"command.unstageAll": "Bereitstellung aller Änderungen aufheben",
-	"command.unstageSelectedRanges": "Bereitstellung gewählter Bereiche aufheben",
-	"command.clean": "Änderungen verwerfen",
-	"command.cleanAll": "Alle Änderungen verwerfen",
-	"command.commit": "Commit",
-	"command.commitStaged": "Commit bereitgestellt",
-	"command.commitStagedSigned": "Bereitgestelltes committen (unterzeichnet)",
-	"command.commitStagedAmend": "Gestaffelt committen (Ändern)",
-	"command.commitAll": "Commit für alle ausführen",
-	"command.commitAllSigned": "Alle committen (unterzeichnet)",
-	"command.commitAllAmend": "Commit für alle ausführen (Ändern)",
-	"command.undoCommit": "Letzten Commit rückgängig machen",
-	"command.checkout": "Auschecken an...",
-	"command.branch": "Branch erstellen...",
-	"command.deleteBranch": "Branch löschen...",
-	"command.renameBranch": "Branch umbenennen...",
-	"command.merge": "Branch zusammenführen...",
-	"command.createTag": "Tag erstellen",
-	"command.fetch": "Abrufen",
-	"command.pull": "Pull",
-	"command.pullRebase": "Pull (Rebase)",
-	"command.pullFrom": "Pullen von...",
-	"command.push": "Push",
-	"command.pushTo": "Push zu...",
-	"command.pushWithTags": "Push mit Tags ausführen",
-	"command.sync": "Synchronisierung",
-	"command.syncRebase": "Sync (Rebase)",
-	"command.publish": "Branch veröffentlichen",
-	"command.showOutput": "Git-Ausgabe anzeigen",
-	"command.ignore": "Datei zu .gitignore hinzufügen",
-	"command.stashIncludeUntracked": "Stash (einschließlich nicht verfolgt)",
-	"command.stash": "Stash ausführen",
-	"command.stashPop": "Pop für Stash ausführen...",
-	"command.stashPopLatest": "Pop für letzten Stash ausführen",
-	"config.enabled": "Gibt an, ob Git aktiviert ist.",
-	"config.path": "Der Pfad zur ausführbaren Git-Datei.",
-	"config.autoRepositoryDetection": "Ob Repositorien automatisch erkannt werden sollen",
-	"config.autorefresh": "Gibt an, ob die automatische Aktualisierung aktiviert ist.",
-	"config.autofetch": "Gibt an, ob automatischer Abruf aktiviert ist.",
-	"config.enableLongCommitWarning": "Gibt an, ob Warnungen zu langen Commitnachrichten erfolgen sollen.",
-	"config.confirmSync": "Vor dem Synchronisieren von Git-Repositorys bestätigen.",
-	"config.countBadge": "Steuert die Git-Badgeanzahl. \"Alle\" zählt alle Änderungen. \"tracked\" (Nachverfolgt) zählt nur die nachverfolgten Änderungen. \"off\" (Aus) deaktiviert dies.",
-	"config.checkoutType": "Steuert, welcher Branchtyp beim Ausführen von \"Auschecken an...\" aufgelistet wird. \"alle\" zeigt alle Verweise an, \"lokal\" nur die lokalen Branches, \"Tags\" zeigt nur Tags an, und \"remote\" zeigt nur Remotebranches an.",
-	"config.ignoreLegacyWarning": "Ignoriert die Legacy-Git-Warnung.",
-	"config.ignoreMissingGitWarning": "Ignoriert die Warnung, wenn Git fehlt",
-	"config.ignoreLimitWarning": "Ignoriert Warnung bei zu hoher Anzahl von Änderungen in einem Repository",
-	"config.defaultCloneDirectory": "Das Standard-Verzeichnis für einen Klon eines Git-Repositorys",
-	"config.enableSmartCommit": "Alle Änderungen committen, wenn keine bereitgestellten Änderungen vorhanden sind.",
-	"config.enableCommitSigning": "Aktiviert das Signieren von Commits per GPG.",
-	"config.discardAllScope": "Legt fest, welche Änderungen vom Befehl \"Alle Änderungen verwerfen\" verworfen werden. \"all\" verwirft alle Änderungen. \"tracked\" verwirft nur verfolgte Dateien. \"prompt\" zeigt immer eine Eingabeaufforderung an, wenn die Aktion ausgeführt wird.",
-	"config.decorations.enabled": "Steuert, ob Git Farben und Badges für die Explorer-Ansicht und die Ansicht \"Geöffnete Editoren\" beiträgt.",
-	"config.promptToSaveFilesBeforeCommit": "Legt fest, ob Git vor dem einchecken nach nicht gespeicherten Dateien suchen soll.",
-	"config.showInlineOpenFileAction": "Steuert, ob eine Inlineaktion zum Öffnen der Datei in der Ansicht \"Git-Änderungen\" angezeigt wird.",
-	"config.inputValidation": "Steuert, wann die Commit-Meldung der Eingabevalidierung angezeigt wird.",
-	"config.detectSubmodules": "Steuert, ob Git-Submodule automatisch erkannt werden.",
-	"config.detectSubmodulesLimit": "Steuert die Begrenzung der Git-Submodule.",
-	"colors.modified": "Farbe für geänderte Ressourcen.",
-	"colors.deleted": "Farbe für gelöschten Ressourcen.",
-	"colors.untracked": "Farbe für nicht verfolgte Ressourcen.",
-	"colors.ignored": "Farbe für ignorierte Ressourcen.",
-	"colors.conflict": "Farbe für Ressourcen mit Konflikten.",
-	"colors.submodule": "Farbe für Submodul-Ressourcen."
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/go/package.i18n.json b/i18n/deu/extensions/go/package.i18n.json
deleted file mode 100644
index 0c7545c4f9e..00000000000
--- a/i18n/deu/extensions/go/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Go-Sprachgrundlagen",
-	"description": "Bietet Syntaxhervorhebung und Klammernpaare in Go-Dateien."
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/groovy/package.i18n.json b/i18n/deu/extensions/groovy/package.i18n.json
deleted file mode 100644
index 0098e67a8e7..00000000000
--- a/i18n/deu/extensions/groovy/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Groovy-Sprachgrundlagen",
-	"description": "Bietet Ausschnitte, Syntaxhervorhebung und Klammernpaare in Groovy-Dateien."
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/grunt/out/main.i18n.json b/i18n/deu/extensions/grunt/out/main.i18n.json
deleted file mode 100644
index aeff8901e65..00000000000
--- a/i18n/deu/extensions/grunt/out/main.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"execFailed": "Fehler bei der automatischen Grunt-Erkennung für den Ordner {0}.  Fehlermeldung: {1}"
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/grunt/package.i18n.json b/i18n/deu/extensions/grunt/package.i18n.json
deleted file mode 100644
index 5b9f39ef76d..00000000000
--- a/i18n/deu/extensions/grunt/package.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"description": "Erweiterung zum Hinzufügen von Grunt-Funktionen in VSCode.",
-	"displayName": "Grunt-Unterstützung für VSCode",
-	"config.grunt.autoDetect": "Steuert, ob die automatische Erkennung von Grunt-Tasks aktiviert oder deaktiviert ist. Standardmäßig ist die Funktion aktiviert.",
-	"grunt.taskDefinition.type.description": "Die anzupassende Grunt-Aufgabe.",
-	"grunt.taskDefinition.file.description": "Die Grunt-Datei zum Bereitstellen der Aufgabe. Kann ausgelassen werden."
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/gulp/out/main.i18n.json b/i18n/deu/extensions/gulp/out/main.i18n.json
deleted file mode 100644
index df81773e889..00000000000
--- a/i18n/deu/extensions/gulp/out/main.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"execFailed": "Fehler bei der automatischen Gulp-Erkennung für den Ordner {0}.  Fehlermeldung: {1}"
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/gulp/package.i18n.json b/i18n/deu/extensions/gulp/package.i18n.json
deleted file mode 100644
index 1aafc3b92eb..00000000000
--- a/i18n/deu/extensions/gulp/package.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"description": "Erweiterung zum Hinzufügen von Gulp-Funktionen in VSCode.",
-	"displayName": "Gulp-Unterstützung für VSCode",
-	"config.gulp.autoDetect": "Steuert, ob die automatische Erkennung von Gulp-Tasks aktiviert oder deaktiviert ist. Standardmäßig ist die Funktion aktiviert.",
-	"gulp.taskDefinition.type.description": "Die anzupassende Gulp-Aufgabe.",
-	"gulp.taskDefinition.file.description": "Die Gulp-Datei zum Bereitstellen der Aufgabe. Kann ausgelassen werden."
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/handlebars/package.i18n.json b/i18n/deu/extensions/handlebars/package.i18n.json
deleted file mode 100644
index 15975d75178..00000000000
--- a/i18n/deu/extensions/handlebars/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Handlebars-Sprachgrundlagen",
-	"description": "Bietet Syntaxhervorhebung und Klammernpaare in Handlebars-Dateien."
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/hlsl/package.i18n.json b/i18n/deu/extensions/hlsl/package.i18n.json
deleted file mode 100644
index c7195a8a24c..00000000000
--- a/i18n/deu/extensions/hlsl/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "HLSL-Sprachgrundlagen",
-	"description": "Bietet Syntaxhervorhebung und Klammernpaare in HLSL-Dateien."
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/html-language-features/client/out/htmlMain.i18n.json b/i18n/deu/extensions/html-language-features/client/out/htmlMain.i18n.json
deleted file mode 100644
index 6a6d9025074..00000000000
--- a/i18n/deu/extensions/html-language-features/client/out/htmlMain.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"htmlserver.name": "HTML-Sprachserver",
-	"folding.start": "Regionsanfang wird gefaltet",
-	"folding.end": "Regionsende wird gefaltet"
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/html-language-features/package.i18n.json b/i18n/deu/extensions/html-language-features/package.i18n.json
deleted file mode 100644
index a18d59eb263..00000000000
--- a/i18n/deu/extensions/html-language-features/package.i18n.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "HTML-Sprachfeatures",
-	"description": "Bietet umfangreiche Sprachunterstützung für HTML-, Razor- und Handlebar-Dateien.",
-	"html.format.enable.desc": "Standard-HTML-Formatierer aktivieren/deaktivieren",
-	"html.format.wrapLineLength.desc": "Die maximale Anzahl von Zeichen pro Zeile (0 = deaktiviert).",
-	"html.format.unformatted.desc": "Die Liste der Tags (durch Kommas getrennt), die nicht erneut formatiert werden sollen. \"null\" bezieht sich standardmäßig auf alle Tags, die unter https://www.w3.org/TR/html5/dom.html#phrasing-content aufgeführt werden.",
-	"html.format.contentUnformatted.desc": "Liste der Tags (durch Trennzeichen getrennt), in der der Inhalt nicht neu formatiert werden muss. \"null\" entspricht standardmäßig dem Tag \"pre\".",
-	"html.format.indentInnerHtml.desc": "Nimmt einen Einzug für <head>- und <body>-Abschnitte vor.",
-	"html.format.preserveNewLines.desc": "Gibt an, ob vorhandene Zeilenumbrüche vor Elemente beibehalten werden sollen. Funktioniert nur vor Elementen, nicht in Tags oder für Text.",
-	"html.format.maxPreserveNewLines.desc": "Die maximale Anzahl von Zeilenumbrüchen, die in einem Block beibehalten werden soll. Verwenden Sie \"null\" für eine unbegrenzte Anzahl.",
-	"html.format.indentHandlebars.desc": "Formatiert {{#foo}} und {{/foo}} und nimmt einen Einzug vor.",
-	"html.format.endWithNewline.desc": "Endet mit einer neuen Zeile.",
-	"html.format.extraLiners.desc": "Die Liste der Tags (durch Kommas getrennt), vor denen eine zusätzliche neue Zeile eingefügt werden soll. \"null\" verwendet standardmäßig \"head, body, /HTML\".",
-	"html.format.wrapAttributes.desc": "Attribute umschließen.",
-	"html.format.wrapAttributes.auto": "Attribute nur dann umschließen, wenn die Zeilenlänge überschritten wird.",
-	"html.format.wrapAttributes.force": "Jedes Attribut mit Ausnahme des ersten umschließen.",
-	"html.format.wrapAttributes.forcealign": "Jedes Attribut mit Ausnahme des ersten umschließen und Ausrichtung beibehalten.",
-	"html.format.wrapAttributes.forcemultiline": "Jedes Attribut umschließen.",
-	"html.suggest.angular1.desc": "Konfiguriert, ob die integrierte HTML-Sprachuntersützung Angular V1-Tags und -Eigenschaften vorschlägt.",
-	"html.suggest.ionic.desc": "Konfiguriert, ob die integrierte HTML-Sprachuntersützung Ionic-Tags, -Eigenschaften und -Werte vorschlägt.",
-	"html.suggest.html5.desc": "Konfiguriert, ob die integrierte HTML-Sprachuntersützung HTML5-Tags, -Eigenschaften und -Werte vorschlägt.",
-	"html.trace.server.desc": "Verfolgt die Kommunikation zwischen VS Code und dem HTML-Sprachserver.",
-	"html.validate.scripts": "Konfiguriert, ob die integrierte HTML-Sprachunterstützung eingebettete Skripts unterstützt.",
-	"html.validate.styles": "Konfiguriert, ob die integrierte HTML-Sprachunterstützung eingebettete Skripts validiert.",
-	"html.autoClosingTags": "Automatisches Schließen von HTML-Tags aktivieren/deaktivieren."
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/html/client/out/htmlMain.i18n.json b/i18n/deu/extensions/html/client/out/htmlMain.i18n.json
deleted file mode 100644
index 6a6d9025074..00000000000
--- a/i18n/deu/extensions/html/client/out/htmlMain.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"htmlserver.name": "HTML-Sprachserver",
-	"folding.start": "Regionsanfang wird gefaltet",
-	"folding.end": "Regionsende wird gefaltet"
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/html/package.i18n.json b/i18n/deu/extensions/html/package.i18n.json
deleted file mode 100644
index 9ce5789f793..00000000000
--- a/i18n/deu/extensions/html/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "HTML-Sprachgrundlagen",
-	"description": "Bietet Syntaxhervorhebung, Klammernpaare und Ausschnitte in HTML-Dateien."
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/ini/package.i18n.json b/i18n/deu/extensions/ini/package.i18n.json
deleted file mode 100644
index 7034b514623..00000000000
--- a/i18n/deu/extensions/ini/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Ini-Sprachgrundlagen",
-	"description": "Bietet Syntaxhervorhebung und Klammernpaare in Ini-Dateien."
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/jake/out/main.i18n.json b/i18n/deu/extensions/jake/out/main.i18n.json
deleted file mode 100644
index 9a2edd93c48..00000000000
--- a/i18n/deu/extensions/jake/out/main.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"execFailed": "Fehler bei der automatischen Jake-Erkennung für den Ordner {0}. Fehlermeldung: {1}"
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/jake/package.i18n.json b/i18n/deu/extensions/jake/package.i18n.json
deleted file mode 100644
index a00dbd961ab..00000000000
--- a/i18n/deu/extensions/jake/package.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"description": "Erweiterung zum Hinzufügen von Jake-Funktionen in VSCode.",
-	"displayName": "Jake-Unterstützung für VSCode",
-	"jake.taskDefinition.type.description": "Die anzupassende Jake-Aufgabe.",
-	"jake.taskDefinition.file.description": "Die Jake-Datei zum Bereitstellen der Aufgabe. Kann ausgelassen werden.",
-	"config.jake.autoDetect": "Steuert, ob die automatische Erkennung von Jake-Tasks aktiviert oder deaktiviert ist. Standardmäßig ist die Funktion aktiviert."
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/java/package.i18n.json b/i18n/deu/extensions/java/package.i18n.json
deleted file mode 100644
index b2577147cc1..00000000000
--- a/i18n/deu/extensions/java/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Java-Sprachgrundlagen",
-	"description": "Bietet Ausschnitte, Syntaxhervorhebung, Klammernpaare und Falten in Java-Dateien."
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/javascript/out/features/bowerJSONContribution.i18n.json b/i18n/deu/extensions/javascript/out/features/bowerJSONContribution.i18n.json
deleted file mode 100644
index 79e7ee10328..00000000000
--- a/i18n/deu/extensions/javascript/out/features/bowerJSONContribution.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"json.bower.default": "Standarddatei \"bower.json\"",
-	"json.bower.error.repoaccess": "Fehler bei der Anforderung des Bower-Repositorys: {0}",
-	"json.bower.latest.version": "Neueste"
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/javascript/out/features/packageJSONContribution.i18n.json b/i18n/deu/extensions/javascript/out/features/packageJSONContribution.i18n.json
deleted file mode 100644
index c5faf13ad73..00000000000
--- a/i18n/deu/extensions/javascript/out/features/packageJSONContribution.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"json.package.default": "Standarddatei \"package.json\"",
-	"json.npm.error.repoaccess": "Fehler bei der Anforderung des NPM-Repositorys: {0}",
-	"json.npm.latestversion": "Die zurzeit neueste Version des Pakets.",
-	"json.npm.majorversion": "Ordnet die aktuelle Hauptversion (1.x.x) zu.",
-	"json.npm.minorversion": "Ordnet die aktuelle Nebenversion (1.2.x) zu.",
-	"json.npm.version.hover": "Aktuelle Version: {0}"
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/javascript/package.i18n.json b/i18n/deu/extensions/javascript/package.i18n.json
deleted file mode 100644
index 34d40c989a0..00000000000
--- a/i18n/deu/extensions/javascript/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "JavaScript-Sprachgrundlagen",
-	"description": "Bietet Ausschnitte, Syntaxhervorhebung, Klammernpaare und Falten in JavaScript-Dateien."
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/json-language-features/client/out/jsonMain.i18n.json b/i18n/deu/extensions/json-language-features/client/out/jsonMain.i18n.json
deleted file mode 100644
index fa24cd1104c..00000000000
--- a/i18n/deu/extensions/json-language-features/client/out/jsonMain.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"jsonserver.name": "JSON-Sprachserver"
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/json-language-features/package.i18n.json b/i18n/deu/extensions/json-language-features/package.i18n.json
deleted file mode 100644
index 422563eeb75..00000000000
--- a/i18n/deu/extensions/json-language-features/package.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "JSON-Sprachfeatures",
-	"description": "Bietet umfangreiche Sprachunterstützung für JSON-Dateien.",
-	"json.schemas.desc": "Schemas zu JSON-Dateien im aktuellen Projekt zuordnen",
-	"json.schemas.url.desc": "Eine URL zu einem Schema oder ein relativer Pfad zu einem Schema im aktuellen Verzeichnis",
-	"json.schemas.fileMatch.desc": "Ein Array von Dateimustern, mit dem beim Auflösen von JSON-Dateien zu Schemas ein Abgleich erfolgt.",
-	"json.schemas.fileMatch.item.desc": "Ein Dateimuster, das \"*\" enthalten kann, mit dem beim Auflösen von JSON-Dateien zu Schemas ein Abgleich erfolgt.",
-	"json.schemas.schema.desc": "Die Schemadefinition für die angegebene URL. Das Schema muss nur angegeben werden, um Zugriffe auf die Schema-URL zu vermeiden.",
-	"json.format.enable.desc": "Standard-JSON-Formatierer aktivieren/deaktivieren (Neustart erforderlich)",
-	"json.tracing.desc": "Verfolgt die Kommunikation zwischen VS Code und JSON-Sprachserver nach.",
-	"json.colorDecorators.enable.desc": "Aktiviert oder deaktiviert Farb-Decorators",
-	"json.colorDecorators.enable.deprecationMessage": "Die Einstellung \"json.colorDecorators.enable\" ist veraltet und wurde durch \"editor.colorDecorators\" ersetzt."
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/json/client/out/jsonMain.i18n.json b/i18n/deu/extensions/json/client/out/jsonMain.i18n.json
deleted file mode 100644
index fa24cd1104c..00000000000
--- a/i18n/deu/extensions/json/client/out/jsonMain.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"jsonserver.name": "JSON-Sprachserver"
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/json/package.i18n.json b/i18n/deu/extensions/json/package.i18n.json
deleted file mode 100644
index b9be795e738..00000000000
--- a/i18n/deu/extensions/json/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "JSON-Sprachgrundlagen",
-	"description": "Bietet Syntaxhervorhebung und Klammernpaare in JSON-Dateien."
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/less/package.i18n.json b/i18n/deu/extensions/less/package.i18n.json
deleted file mode 100644
index 1a90a02d386..00000000000
--- a/i18n/deu/extensions/less/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Less-Sprachgrundlagen",
-	"description": "Bietet Syntaxhervorhebung, Klammernpaare und Falten in Less-Dateien."
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/log/package.i18n.json b/i18n/deu/extensions/log/package.i18n.json
deleted file mode 100644
index 8fa2c2ecd4a..00000000000
--- a/i18n/deu/extensions/log/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Protokoll",
-	"description": "Bietet Syntaxhervorhebung für Dateien mit .log-Erweiterung."
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/lua/package.i18n.json b/i18n/deu/extensions/lua/package.i18n.json
deleted file mode 100644
index 45169b35b23..00000000000
--- a/i18n/deu/extensions/lua/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Lua-Sprachgrundlagen",
-	"description": "Bietet Syntaxhervorhebung und Klammernpaare in Lua-Dateien."
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/make/package.i18n.json b/i18n/deu/extensions/make/package.i18n.json
deleted file mode 100644
index a4d0d8075d1..00000000000
--- a/i18n/deu/extensions/make/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Make-Sprachgrundlagen",
-	"description": "Bietet Syntaxhervorhebung und Klammernpaare in Make-Dateien."
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/markdown-basics/package.i18n.json b/i18n/deu/extensions/markdown-basics/package.i18n.json
deleted file mode 100644
index 2cf88a1e68c..00000000000
--- a/i18n/deu/extensions/markdown-basics/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Markdown-Sprachgrundlagen",
-	"description": "Bietet Ausschnitte und Syntaxhervorhebung für Markdown."
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json b/i18n/deu/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json
deleted file mode 100644
index fdc135e8bec..00000000000
--- a/i18n/deu/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"onPreviewStyleLoadError": "'markdown.styles' konnte nicht geladen werden: {0}"
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/markdown-language-features/out/features/preview.i18n.json b/i18n/deu/extensions/markdown-language-features/out/features/preview.i18n.json
deleted file mode 100644
index 145213b7b2e..00000000000
--- a/i18n/deu/extensions/markdown-language-features/out/features/preview.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"lockedPreviewTitle": "[Vorschau] {0}",
-	"previewTitle": "Vorschau von {0}"
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/markdown-language-features/out/features/previewContentProvider.i18n.json b/i18n/deu/extensions/markdown-language-features/out/features/previewContentProvider.i18n.json
deleted file mode 100644
index 1793456fe9d..00000000000
--- a/i18n/deu/extensions/markdown-language-features/out/features/previewContentProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"preview.securityMessage.text": "In diesem Dokument wurden einige Inhalte deaktiviert.",
-	"preview.securityMessage.title": "Potenziell unsichere Inhalte wurden in der Markdown-Vorschau deaktiviert. Ändern Sie die Sicherheitseinstellung der Markdown-Vorschau, um unsichere Inhalte zuzulassen oder Skripts zu aktivieren.",
-	"preview.securityMessage.label": "Sicherheitswarnung – Inhalt deaktiviert"
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/markdown-language-features/out/security.i18n.json b/i18n/deu/extensions/markdown-language-features/out/security.i18n.json
deleted file mode 100644
index c59e06479c0..00000000000
--- a/i18n/deu/extensions/markdown-language-features/out/security.i18n.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"strict.title": "Strict",
-	"strict.description": "Nur sicheren Inhalt laden",
-	"insecureLocalContent.title": "Unsichere lokale Inhalte zulassen",
-	"insecureLocalContent.description": "Laden von Inhalten über HTTP von localhost aktivieren",
-	"insecureContent.title": "Unsicheren Inhalt zulassen",
-	"insecureContent.description": "Laden von Inhalten über HTTP aktivieren",
-	"disable.title": "Deaktivieren",
-	"disable.description": "Alle Inhalte und Skriptausführung zulassen. Nicht empfohlen.",
-	"moreInfo.title": "Weitere Informationen",
-	"enableSecurityWarning.title": "Vorschau von Sicherheitswarnungen in diesem Arbeitsbereich aktivieren",
-	"disableSecurityWarning.title": "Vorschau von Sicherheitswarnungen in diesem Arbeitsbereich deaktivieren ",
-	"toggleSecurityWarning.description": "Hat keinen Einfluss auf die Inhaltssicherheitsebene",
-	"preview.showPreviewSecuritySelector.title": "Sicherheitseinstellungen für die Markdown-Vorschau in diesem Arbeitsbereich auswählen"
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/markdown-language-features/package.i18n.json b/i18n/deu/extensions/markdown-language-features/package.i18n.json
deleted file mode 100644
index 8a886edcb00..00000000000
--- a/i18n/deu/extensions/markdown-language-features/package.i18n.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Markdown-Sprachfeatures",
-	"description": "Bietet umfangreiche Sprachunterstützung für Markdown.",
-	"markdown.preview.breaks.desc": "Legt fest, wie Zeilenumbrüche in der Markdown-Vorschau gerendert werden. Die Einstellung 'true' erzeugt ein <br> für jede neue Zeile.",
-	"markdown.preview.linkify": "Aktiviert oder deaktiviert die Konvertierung von URL-ähnlichem Text in Links in der Markdown-Vorschau.",
-	"markdown.preview.doubleClickToSwitchToEditor.desc": "Doppelklicken Sie in die Markdown-Vorschau, um zum Editor zu wechseln.",
-	"markdown.preview.fontFamily.desc": "Steuert die Schriftfamilie, die in der Markdownvorschau verwendet wird.",
-	"markdown.preview.fontSize.desc": "Steuert den Schriftgrad in Pixeln, der in der Markdownvorschau verwendet wird.",
-	"markdown.preview.lineHeight.desc": "Steuert die Zeilenhöhe, die in der Markdownvorschau verwendet wird. Diese Zahl ist relativ zum Schriftgrad.",
-	"markdown.preview.markEditorSelection.desc": "Markieren Sie die aktuelle Editor-Auswahl in der Markdown-Vorschau.",
-	"markdown.preview.scrollEditorWithPreview.desc": "Wenn für eine Markdown-Vorschau ein Bildlauf durchgeführt wird, die Ansicht des Editors aktualisieren.",
-	"markdown.preview.scrollPreviewWithEditor.desc": "Wenn für die Markdown-Vorschau ein Bildlauf durchgeführt wird, aktualisieren Sie die Ansicht der Vorschau.",
-	"markdown.preview.scrollPreviewWithEditorSelection.desc": "[Veraltet] Führt einen Bildlauf für die Markdown-Vorschau durch, um die aktuell ausgewählte Zeile im Editor anzuzeigen.",
-	"markdown.preview.scrollPreviewWithEditorSelection.deprecationMessage": "Diese Einstellung wurde durch \"markdown.preview.scrollPreviewWithEditor\" ersetzt und ist nicht mehr wirksam.",
-	"markdown.preview.title": "Vorschau öffnen",
-	"markdown.previewFrontMatter.dec": "Legt fest, wie die YAML-Titelei in der Markdownvorschau gerendert werden soll. Durch \"hide\" wird die Titelei entfernt. Andernfalls wird die Titelei wie Markdowninhalt verarbeitet.",
-	"markdown.previewSide.title": "Vorschau an der Seite öffnen",
-	"markdown.showLockedPreviewToSide.title": "Gesperrte Vorschau an der Seite öffnen",
-	"markdown.showSource.title": "Quelle anzeigen",
-	"markdown.styles.dec": "Eine Liste von URLs oder lokalen Pfaden zu CSS-Stylesheets aus der Markdownvorschau, die verwendet werden sollen. Relative Pfade werden relativ zu dem Ordner interpretiert, der im Explorer geöffnet ist. Wenn kein Ordner geöffnet ist, werden sie relativ zum Speicherort der Markdowndatei interpretiert. Alle '\\' müssen als '\\\\' geschrieben werden.",
-	"markdown.showPreviewSecuritySelector.title": "Sicherheitseinstellungen für Vorschau ändern",
-	"markdown.trace.desc": "Aktiviert die Debugprotokollierung für die Markdown-Erweiterung.",
-	"markdown.preview.refresh.title": "Vorschau aktualisieren",
-	"markdown.preview.toggleLock.title": "Vorschausperre umschalten"
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/markdown/out/commands.i18n.json b/i18n/deu/extensions/markdown/out/commands.i18n.json
deleted file mode 100644
index f42b71b7720..00000000000
--- a/i18n/deu/extensions/markdown/out/commands.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"previewTitle": "Vorschau von {0}",
-	"onPreviewStyleLoadError": "'markdown.styles' konnte nicht geladen werden: {0}"
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/markdown/out/commands/onPreviewStyleLoadError.i18n.json b/i18n/deu/extensions/markdown/out/commands/onPreviewStyleLoadError.i18n.json
deleted file mode 100644
index fdc135e8bec..00000000000
--- a/i18n/deu/extensions/markdown/out/commands/onPreviewStyleLoadError.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"onPreviewStyleLoadError": "'markdown.styles' konnte nicht geladen werden: {0}"
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/markdown/out/extension.i18n.json b/i18n/deu/extensions/markdown/out/extension.i18n.json
deleted file mode 100644
index 9c9948137e9..00000000000
--- a/i18n/deu/extensions/markdown/out/extension.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"onPreviewStyleLoadError": "'markdown.styles' konnte nicht geladen werden: {0}",
-	"previewTitle": "Vorschau von {0}"
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/markdown/out/features/preview.i18n.json b/i18n/deu/extensions/markdown/out/features/preview.i18n.json
deleted file mode 100644
index 145213b7b2e..00000000000
--- a/i18n/deu/extensions/markdown/out/features/preview.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"lockedPreviewTitle": "[Vorschau] {0}",
-	"previewTitle": "Vorschau von {0}"
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/markdown/out/features/previewContentProvider.i18n.json b/i18n/deu/extensions/markdown/out/features/previewContentProvider.i18n.json
deleted file mode 100644
index 1793456fe9d..00000000000
--- a/i18n/deu/extensions/markdown/out/features/previewContentProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"preview.securityMessage.text": "In diesem Dokument wurden einige Inhalte deaktiviert.",
-	"preview.securityMessage.title": "Potenziell unsichere Inhalte wurden in der Markdown-Vorschau deaktiviert. Ändern Sie die Sicherheitseinstellung der Markdown-Vorschau, um unsichere Inhalte zuzulassen oder Skripts zu aktivieren.",
-	"preview.securityMessage.label": "Sicherheitswarnung – Inhalt deaktiviert"
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/markdown/out/previewContentProvider.i18n.json b/i18n/deu/extensions/markdown/out/previewContentProvider.i18n.json
deleted file mode 100644
index 5a04ed5447d..00000000000
--- a/i18n/deu/extensions/markdown/out/previewContentProvider.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"preview.securityMessage.text": "In diesem Dokument wurden einige Inhalte deaktiviert.",
-	"preview.securityMessage.title": "Potenziell unsichere Inhalte wurden in der Markdown-Vorschau deaktiviert. Ändern Sie die Sicherheitseinstellung der Markdown-Vorschau, um unsichere Inhalte zuzulassen oder Skripts zu aktivieren.",
-	"preview.securityMessage.label": "Sicherheitswarnung – Inhalt deaktiviert"
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/markdown/out/security.i18n.json b/i18n/deu/extensions/markdown/out/security.i18n.json
deleted file mode 100644
index 828b182b8ed..00000000000
--- a/i18n/deu/extensions/markdown/out/security.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"strict.title": "Strict",
-	"strict.description": "Nur sicheren Inhalt laden",
-	"insecureContent.title": "Unsicheren Inhalt zulassen",
-	"insecureContent.description": "Laden von Inhalten über HTTP aktivieren",
-	"disable.title": "Deaktivieren",
-	"disable.description": "Alle Inhalte und Skriptausführung zulassen. Nicht empfohlen.",
-	"moreInfo.title": "Weitere Informationen",
-	"enableSecurityWarning.title": "Vorschau von Sicherheitswarnungen in diesem Arbeitsbereich aktivieren",
-	"disableSecurityWarning.title": "Vorschau von Sicherheitswarnungen in diesem Arbeitsbereich deaktivieren ",
-	"toggleSecurityWarning.description": "Hat keinen Einfluss auf die Inhaltssicherheitsebene",
-	"preview.showPreviewSecuritySelector.title": "Sicherheitseinstellungen für die Markdown-Vorschau in diesem Arbeitsbereich auswählen"
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/markdown/package.i18n.json b/i18n/deu/extensions/markdown/package.i18n.json
deleted file mode 100644
index b88fe3c002a..00000000000
--- a/i18n/deu/extensions/markdown/package.i18n.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Markdown-Sprachfeatures",
-	"description": "Bietet umfangreiche Sprachunterstützung für Markdown.",
-	"markdown.preview.breaks.desc": "Legt fest, wie Zeilenumbrüche in der Markdown-Vorschau gerendert werden. Die Einstellung 'true' erzeugt ein <br> für jede neue Zeile.",
-	"markdown.preview.linkify": "Aktiviert oder deaktiviert die Konvertierung von URL-ähnlichem Text in Links in der Markdown-Vorschau.",
-	"markdown.preview.doubleClickToSwitchToEditor.desc": "Doppelklicken Sie in die Markdown-Vorschau, um zum Editor zu wechseln.",
-	"markdown.preview.fontFamily.desc": "Steuert die Schriftfamilie, die in der Markdownvorschau verwendet wird.",
-	"markdown.preview.fontSize.desc": "Steuert den Schriftgrad in Pixeln, der in der Markdownvorschau verwendet wird.",
-	"markdown.preview.lineHeight.desc": "Steuert die Zeilenhöhe, die in der Markdownvorschau verwendet wird. Diese Zahl ist relativ zum Schriftgrad.",
-	"markdown.preview.markEditorSelection.desc": "Markieren Sie die aktuelle Editor-Auswahl in der Markdown-Vorschau.",
-	"markdown.preview.scrollEditorWithPreview.desc": "Wenn eine Markdown-Vorschau gescrollt wird, aktualisieren Sie die Ansicht des Editors.",
-	"markdown.preview.scrollPreviewWithEditor.desc": "Wenn für die Markdown-Vorschau ein Bildlauf durchgeführt wird, aktualisieren Sie die Ansicht der Vorschau.",
-	"markdown.preview.scrollPreviewWithEditorSelection.desc": "[Veraltet] Führt einen Bildlauf für die Markdown-Vorschau durch, um die aktuell ausgewählte Zeile im Editor anzuzeigen.",
-	"markdown.preview.scrollPreviewWithEditorSelection.deprecationMessage": "Diese Einstellung wurde durch \"markdown.preview.scrollPreviewWithEditor\" ersetzt und ist nicht mehr wirksam.",
-	"markdown.preview.title": "Vorschau öffnen",
-	"markdown.previewFrontMatter.dec": "Legt fest, wie die YAML-Titelei in der Markdownvorschau gerendert werden soll. Durch \"hide\" wird die Titelei entfernt. Andernfalls wird die Titelei wie Markdowninhalt verarbeitet.",
-	"markdown.previewSide.title": "Vorschau an der Seite öffnen",
-	"markdown.showLockedPreviewToSide.title": "Gesperrte Vorschau an der Seite öffnen",
-	"markdown.showSource.title": "Quelle anzeigen",
-	"markdown.styles.dec": "Eine Liste von URLs oder lokalen Pfaden zu CSS-Stylesheets aus der Markdownvorschau, die verwendet werden sollen. Relative Pfade werden relativ zu dem Ordner interpretiert, der im Explorer geöffnet ist. Wenn kein Ordner geöffnet ist, werden sie relativ zum Speicherort der Markdowndatei interpretiert. Alle '\\' müssen als '\\\\' geschrieben werden.",
-	"markdown.showPreviewSecuritySelector.title": "Sicherheitseinstellungen für Vorschau ändern",
-	"markdown.trace.desc": "Aktiviert die Debugprotokollierung für die Markdown-Erweiterung.",
-	"markdown.preview.refresh.title": "Vorschau aktualisieren",
-	"markdown.preview.toggleLock.title": "Vorschausperre umschalten"
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/merge-conflict/out/codelensProvider.i18n.json b/i18n/deu/extensions/merge-conflict/out/codelensProvider.i18n.json
deleted file mode 100644
index 0c592ac19f0..00000000000
--- a/i18n/deu/extensions/merge-conflict/out/codelensProvider.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"acceptCurrentChange": "Aktuelle Änderung akzeptieren",
-	"acceptIncomingChange": "Eingehende Änderung akzeptieren",
-	"acceptBothChanges": "Beide Änderungen akzeptieren",
-	"compareChanges": "Änderungen vergleichen"
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/merge-conflict/out/commandHandler.i18n.json b/i18n/deu/extensions/merge-conflict/out/commandHandler.i18n.json
deleted file mode 100644
index e4084b5ff14..00000000000
--- a/i18n/deu/extensions/merge-conflict/out/commandHandler.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"cursorNotInConflict": "Der Editor-Cursor ist nicht innerhalb eines Mergingkonflikts",
-	"compareChangesTitle": "{0}: Aktuelle Änderungen ⟷ Eingehende Änderungen",
-	"cursorOnCommonAncestorsRange": "Der Editor-Cursor ist innerhalb des Blocks gemeinsamer Vorgänger, verschieben Sie ihn entweder in den Block \"aktuell\" oder \"eingehend\". ",
-	"cursorOnSplitterRange": "Der Editor-Cursor ist innerhalb der Mergingkonfliktaufteilung, verschieben Sie ihn entweder in den Block \"aktuell\" oder \"eingehend\".",
-	"noConflicts": "Keine Merge-Konflikte in dieser Datei gefunden",
-	"noOtherConflictsInThisFile": "Keine weiteren Merge-Konflikte in dieser Datei"
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/merge-conflict/out/mergeDecorator.i18n.json b/i18n/deu/extensions/merge-conflict/out/mergeDecorator.i18n.json
deleted file mode 100644
index fb40df97438..00000000000
--- a/i18n/deu/extensions/merge-conflict/out/mergeDecorator.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"currentChange": "(Aktuelle Änderung)",
-	"incomingChange": "(Eingehende Änderung)"
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/merge-conflict/package.i18n.json b/i18n/deu/extensions/merge-conflict/package.i18n.json
deleted file mode 100644
index fd5e8e62af9..00000000000
--- a/i18n/deu/extensions/merge-conflict/package.i18n.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Merge-Konflikt",
-	"description": "Hervorhebung und Befehle für Inline-Mergingkonflikte.",
-	"command.category": "Merge-Konflikt",
-	"command.accept.all-current": "Alle aktuellen akzeptieren",
-	"command.accept.all-incoming": "Alle eingehenden akzeptieren",
-	"command.accept.all-both": "Alle beide akzeptieren",
-	"command.accept.current": "Aktuelles akzeptieren",
-	"command.accept.incoming": "Eingehendes akzeptieren",
-	"command.accept.selection": "Auswahl akzeptieren",
-	"command.accept.both": "Beides akzeptieren",
-	"command.next": "Nächster Konflikt",
-	"command.previous": "Vorheriger Konflikt",
-	"command.compare": "Aktuellen Konflikt vergleichen",
-	"config.title": "Merge-Konflikt",
-	"config.codeLensEnabled": "CodeLens-Mergingkonfliktblock im Editor aktivieren/deaktivieren",
-	"config.decoratorsEnabled": "Mergingkonflikt-Decorators im Editor aktivieren/deaktivieren"
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/npm/out/features/bowerJSONContribution.i18n.json b/i18n/deu/extensions/npm/out/features/bowerJSONContribution.i18n.json
deleted file mode 100644
index 79e7ee10328..00000000000
--- a/i18n/deu/extensions/npm/out/features/bowerJSONContribution.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"json.bower.default": "Standarddatei \"bower.json\"",
-	"json.bower.error.repoaccess": "Fehler bei der Anforderung des Bower-Repositorys: {0}",
-	"json.bower.latest.version": "Neueste"
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/npm/out/features/packageJSONContribution.i18n.json b/i18n/deu/extensions/npm/out/features/packageJSONContribution.i18n.json
deleted file mode 100644
index c5faf13ad73..00000000000
--- a/i18n/deu/extensions/npm/out/features/packageJSONContribution.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"json.package.default": "Standarddatei \"package.json\"",
-	"json.npm.error.repoaccess": "Fehler bei der Anforderung des NPM-Repositorys: {0}",
-	"json.npm.latestversion": "Die zurzeit neueste Version des Pakets.",
-	"json.npm.majorversion": "Ordnet die aktuelle Hauptversion (1.x.x) zu.",
-	"json.npm.minorversion": "Ordnet die aktuelle Nebenversion (1.2.x) zu.",
-	"json.npm.version.hover": "Aktuelle Version: {0}"
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/npm/out/main.i18n.json b/i18n/deu/extensions/npm/out/main.i18n.json
deleted file mode 100644
index a918970a630..00000000000
--- a/i18n/deu/extensions/npm/out/main.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"npm.parseError": "NPM-Aufgabenerkennung: Fehler beim Analysieren der Datei {0}"
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/npm/out/npmView.i18n.json b/i18n/deu/extensions/npm/out/npmView.i18n.json
deleted file mode 100644
index d672afcae9e..00000000000
--- a/i18n/deu/extensions/npm/out/npmView.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noScripts": "Keine Skripte gefunden.",
-	"noDebugOptions": "\"{0}\" konnte nicht zum Debuggen gestartet werden, da die Skripte keine Node-Debugging-Option enthalten wie z. B. \"--inspect-brk\".",
-	"learnMore": "Weitere Informationen",
-	"ok": "OK",
-	"scriptInvalid": "Das Skript \"{0}\" wurde nicht gefunden. Versuchen Sie, die Ansicht zu aktualisieren."
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/npm/out/tasks.i18n.json b/i18n/deu/extensions/npm/out/tasks.i18n.json
deleted file mode 100644
index a918970a630..00000000000
--- a/i18n/deu/extensions/npm/out/tasks.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"npm.parseError": "NPM-Aufgabenerkennung: Fehler beim Analysieren der Datei {0}"
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/npm/package.i18n.json b/i18n/deu/extensions/npm/package.i18n.json
deleted file mode 100644
index 8df75704426..00000000000
--- a/i18n/deu/extensions/npm/package.i18n.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"description": "Erweiterung zum Hinzufügen von Aufgabenunterstützung für NPM-Skripts.",
-	"displayName": "NPM-Unterstützung für VSCode",
-	"config.npm.autoDetect": "Steuert, ob die automatische Erkennung von NPM-Skripts aktiviert oder deaktiviert ist. Standardmäßig ist die Funktion aktiviert.",
-	"config.npm.runSilent": "npm-Befehle mit der Option \"--silent\" ausführen.",
-	"config.npm.packageManager": "Der zu verwendende Paket-Manager, um Skripte auszuführen.",
-	"config.npm.exclude": "Konfigurieren Sie Globmuster für Ordner, die von der automatischen Skripterkennung ausgeschlossen werden sollen.",
-	"config.npm.enableScriptExplorer": "Aktiviert eine Exploreransicht für npm-Skripts.",
-	"config.npm.scriptExplorerAction": "Die im Skript-Explorer verwendete Standardaktion für Klicks. Mögliche Werte sind \"open\" (Standard) und \"run\".",
-	"npm.parseError": "NPM-Aufgabenerkennung: Fehler beim Analysieren der Datei {0}",
-	"taskdef.script": "Das anzupassende NPM-Skript.",
-	"taskdef.path": "Der Pfad zum Ordner der package.json-Datei, die das Skript bereitstellt. Kann weggelassen werden.",
-	"view.name": "npm-Skripts",
-	"command.refresh": "Aktualisieren",
-	"command.run": "Ausführen",
-	"command.debug": "Debuggen",
-	"command.openScript": "Öffnen",
-	"command.runInstall": "Installation ausführen"
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/objective-c/package.i18n.json b/i18n/deu/extensions/objective-c/package.i18n.json
deleted file mode 100644
index 803c6626fcb..00000000000
--- a/i18n/deu/extensions/objective-c/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Objective-C-Sprachgrundlagen",
-	"description": "Bietet Syntaxhervorhebung und Klammernpaare in Objective-C-Dateien."
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/package-json/out/features/bowerJSONContribution.i18n.json b/i18n/deu/extensions/package-json/out/features/bowerJSONContribution.i18n.json
deleted file mode 100644
index 79e7ee10328..00000000000
--- a/i18n/deu/extensions/package-json/out/features/bowerJSONContribution.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"json.bower.default": "Standarddatei \"bower.json\"",
-	"json.bower.error.repoaccess": "Fehler bei der Anforderung des Bower-Repositorys: {0}",
-	"json.bower.latest.version": "Neueste"
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/package-json/out/features/packageJSONContribution.i18n.json b/i18n/deu/extensions/package-json/out/features/packageJSONContribution.i18n.json
deleted file mode 100644
index c5faf13ad73..00000000000
--- a/i18n/deu/extensions/package-json/out/features/packageJSONContribution.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"json.package.default": "Standarddatei \"package.json\"",
-	"json.npm.error.repoaccess": "Fehler bei der Anforderung des NPM-Repositorys: {0}",
-	"json.npm.latestversion": "Die zurzeit neueste Version des Pakets.",
-	"json.npm.majorversion": "Ordnet die aktuelle Hauptversion (1.x.x) zu.",
-	"json.npm.minorversion": "Ordnet die aktuelle Nebenversion (1.2.x) zu.",
-	"json.npm.version.hover": "Aktuelle Version: {0}"
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/package-json/package.i18n.json b/i18n/deu/extensions/package-json/package.i18n.json
deleted file mode 100644
index 35229bd6699..00000000000
--- a/i18n/deu/extensions/package-json/package.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	]
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/perl/package.i18n.json b/i18n/deu/extensions/perl/package.i18n.json
deleted file mode 100644
index 92e43d3d5c0..00000000000
--- a/i18n/deu/extensions/perl/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Perl-Sprachgrundlagen",
-	"description": "Bietet Syntaxhervorhebung und Klammernpaare und Falten in Perl-Dateien."
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/php-language-features/out/features/validationProvider.i18n.json b/i18n/deu/extensions/php-language-features/out/features/validationProvider.i18n.json
deleted file mode 100644
index 5805f86da6e..00000000000
--- a/i18n/deu/extensions/php-language-features/out/features/validationProvider.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"php.useExecutablePath": "Möchten Sie zulassen, dass {0} (als Arbeitsbereichseinstellung definiert) zum Bereinigen von PHP-Dateien ausgeführt wird?",
-	"php.yes": "Zulassen",
-	"php.no": "Nicht zulassen",
-	"wrongExecutable": "Eine Überprüfung ist nicht möglich, da {0} keine gültige ausführbare PHP-Datei ist. Verwenden Sie die Einstellung \"'php.validate.executablePath\", um die ausführbare PHP-Datei zu konfigurieren.",
-	"noExecutable": "Eine Überprüfung ist nicht möglich, da keine ausführbare PHP-Datei festgelegt ist. Verwenden Sie die Einstellung \"php.validate.executablePath\", um die ausführbare PHP-Datei zu konfigurieren.",
-	"unknownReason": "Fehler beim Ausführen von PHP mithilfe des Pfads \"{0}\". Die Ursache ist unbekannt."
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/php-language-features/package.i18n.json b/i18n/deu/extensions/php-language-features/package.i18n.json
deleted file mode 100644
index 7124411caa7..00000000000
--- a/i18n/deu/extensions/php-language-features/package.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"configuration.suggest.basic": "Konfiguriert, ob die integrierten PHP-Sprachvorschläge aktiviert sind. Die Unterstützung schlägt globale und variable PHP-Elemente vor.",
-	"configuration.validate.enable": "Integrierte PHP-Überprüfung aktivieren/deaktivieren.",
-	"configuration.validate.executablePath": "Zeigt auf die ausführbare PHP-Datei.",
-	"configuration.validate.run": "Gibt an, ob der Linter beim Speichern oder bei der Eingabe ausgeführt wird.",
-	"configuration.title": "PHP",
-	"commands.categroy.php": "PHP",
-	"command.untrustValidationExecutable": "Ausführbare Datei für PHP-Überprüfung nicht zulassen (als Arbeitsbereicheinstellung definiert)",
-	"displayName": "PHP-Sprachfeatures",
-	"description": "Bietet umfangreiche Sprachunterstützung für PHP-Dateien."
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/php/out/features/validationProvider.i18n.json b/i18n/deu/extensions/php/out/features/validationProvider.i18n.json
deleted file mode 100644
index 5805f86da6e..00000000000
--- a/i18n/deu/extensions/php/out/features/validationProvider.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"php.useExecutablePath": "Möchten Sie zulassen, dass {0} (als Arbeitsbereichseinstellung definiert) zum Bereinigen von PHP-Dateien ausgeführt wird?",
-	"php.yes": "Zulassen",
-	"php.no": "Nicht zulassen",
-	"wrongExecutable": "Eine Überprüfung ist nicht möglich, da {0} keine gültige ausführbare PHP-Datei ist. Verwenden Sie die Einstellung \"'php.validate.executablePath\", um die ausführbare PHP-Datei zu konfigurieren.",
-	"noExecutable": "Eine Überprüfung ist nicht möglich, da keine ausführbare PHP-Datei festgelegt ist. Verwenden Sie die Einstellung \"php.validate.executablePath\", um die ausführbare PHP-Datei zu konfigurieren.",
-	"unknownReason": "Fehler beim Ausführen von PHP mithilfe des Pfads \"{0}\". Die Ursache ist unbekannt."
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/php/package.i18n.json b/i18n/deu/extensions/php/package.i18n.json
deleted file mode 100644
index 5c068410d3d..00000000000
--- a/i18n/deu/extensions/php/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "PHP-Sprachgrundlagen",
-	"description": "Bietet Syntaxhervorhebung und Klammernpaare für PHP-Dateien."
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/powershell/package.i18n.json b/i18n/deu/extensions/powershell/package.i18n.json
deleted file mode 100644
index 102e43ed1ec..00000000000
--- a/i18n/deu/extensions/powershell/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Powershell-Sprachgrundlagen",
-	"description": "Bietet Ausschnitte, Syntaxhervorhebung, Klammernpaare und Falten in Powershell-Dateien."
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/pug/package.i18n.json b/i18n/deu/extensions/pug/package.i18n.json
deleted file mode 100644
index 019fd771baa..00000000000
--- a/i18n/deu/extensions/pug/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Pung-Sprachgrundlagen",
-	"description": "Bietet Syntaxhervorhebung und Klammernpaare in Pug-Dateien."
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/python/package.i18n.json b/i18n/deu/extensions/python/package.i18n.json
deleted file mode 100644
index 3324ec85b7a..00000000000
--- a/i18n/deu/extensions/python/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Python-Sprachgrundlagen",
-	"description": "Bietet Syntaxhervorhebung, Klammernpaare und Falten in Python-Dateien."
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/r/package.i18n.json b/i18n/deu/extensions/r/package.i18n.json
deleted file mode 100644
index 5240a6ae7b3..00000000000
--- a/i18n/deu/extensions/r/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "R-Sprachgrundlagen",
-	"description": "Bietet Syntaxhervorhebung und Klammernpaare in R-Dateien."
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/razor/package.i18n.json b/i18n/deu/extensions/razor/package.i18n.json
deleted file mode 100644
index 8773e3367da..00000000000
--- a/i18n/deu/extensions/razor/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Razor-Sprachgrundlagen",
-	"description": "Bietet Syntaxhervorhebung, Klammernpaare und Falten in Razor-Dateien."
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/ruby/package.i18n.json b/i18n/deu/extensions/ruby/package.i18n.json
deleted file mode 100644
index 1380b382534..00000000000
--- a/i18n/deu/extensions/ruby/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Ruby-Sprachgrundlagen",
-	"description": "Bietet Syntaxhervorhebung und Klammernpaare in Ruby-Dateien."
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/rust/package.i18n.json b/i18n/deu/extensions/rust/package.i18n.json
deleted file mode 100644
index 1a4145efcf9..00000000000
--- a/i18n/deu/extensions/rust/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Rust-Sprachgrundlagen",
-	"description": "Bietet Syntaxhervorhebung und Klammernpaare in Rust-Dateien."
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/scss/package.i18n.json b/i18n/deu/extensions/scss/package.i18n.json
deleted file mode 100644
index a7ce627586e..00000000000
--- a/i18n/deu/extensions/scss/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "SCSS-Sprachgrundlagen",
-	"description": "Bietet Syntaxhervorhebung, Klammernpaare und Falten in SCSS-Dateien."
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/search-rg/package.i18n.json b/i18n/deu/extensions/search-rg/package.i18n.json
deleted file mode 100644
index 6f2200bf6eb..00000000000
--- a/i18n/deu/extensions/search-rg/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Suchen (Ripgrep)",
-	"description": "Erlaubt die Suche mit ripgrep."
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/shaderlab/package.i18n.json b/i18n/deu/extensions/shaderlab/package.i18n.json
deleted file mode 100644
index c1b584b95bc..00000000000
--- a/i18n/deu/extensions/shaderlab/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Shaderlab-Sprachgrundlagen",
-	"description": "Bietet Syntaxhervorhebung und Klammernpaare in Shaderlab-Dateien."
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/shellscript/package.i18n.json b/i18n/deu/extensions/shellscript/package.i18n.json
deleted file mode 100644
index 76735ed2d29..00000000000
--- a/i18n/deu/extensions/shellscript/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Shell-Skript-Sprachgrundlagen",
-	"description": "Bietet Syntaxhervorhebung und Klammernpaare in Shell Script-Dateien."
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/sql/package.i18n.json b/i18n/deu/extensions/sql/package.i18n.json
deleted file mode 100644
index 33ae383c0ab..00000000000
--- a/i18n/deu/extensions/sql/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "SQL-Sprachgrundlagen",
-	"description": "Bietet Syntaxhervorhebung und Klammernpaare in SQL-Dateien."
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/swift/package.i18n.json b/i18n/deu/extensions/swift/package.i18n.json
deleted file mode 100644
index 700d9e648e8..00000000000
--- a/i18n/deu/extensions/swift/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Swift-Sprachgrundlagen",
-	"description": "Bietet Ausschnitte, Syntaxhervorhebung und Klammernpaare in Swift-Dateien."
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/theme-abyss/package.i18n.json b/i18n/deu/extensions/theme-abyss/package.i18n.json
deleted file mode 100644
index 9101331a949..00000000000
--- a/i18n/deu/extensions/theme-abyss/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Abyss-Design",
-	"description": "Abyss-Design für Visual Studio Code"
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/theme-defaults/package.i18n.json b/i18n/deu/extensions/theme-defaults/package.i18n.json
deleted file mode 100644
index f4cb4297839..00000000000
--- a/i18n/deu/extensions/theme-defaults/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Standarddesigns",
-	"description": "Die hellen und dunklen Standarddesigns (Plus und Visual Studio)"
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/theme-kimbie-dark/package.i18n.json b/i18n/deu/extensions/theme-kimbie-dark/package.i18n.json
deleted file mode 100644
index 2430e8b2e4f..00000000000
--- a/i18n/deu/extensions/theme-kimbie-dark/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Dunkles Kimbie-Design",
-	"description": "Dunkles Kimbie-Design für Visual Studio Code"
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/theme-monokai-dimmed/package.i18n.json b/i18n/deu/extensions/theme-monokai-dimmed/package.i18n.json
deleted file mode 100644
index 56b1421d70d..00000000000
--- a/i18n/deu/extensions/theme-monokai-dimmed/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Abgedunkeltes Monokai-Design",
-	"description": "Abgedunkeltes Monokai-Design für Visual Studio Code"
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/theme-monokai/package.i18n.json b/i18n/deu/extensions/theme-monokai/package.i18n.json
deleted file mode 100644
index 5b32cfd54d8..00000000000
--- a/i18n/deu/extensions/theme-monokai/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Monokai-Design",
-	"description": "Monokai-Design für Visual Studio Code"
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/theme-quietlight/package.i18n.json b/i18n/deu/extensions/theme-quietlight/package.i18n.json
deleted file mode 100644
index 54eac86273b..00000000000
--- a/i18n/deu/extensions/theme-quietlight/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Stilles, helles Design",
-	"description": "Stilles helles Design für Visual Studio Code"
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/theme-red/package.i18n.json b/i18n/deu/extensions/theme-red/package.i18n.json
deleted file mode 100644
index c016130c04d..00000000000
--- a/i18n/deu/extensions/theme-red/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Rotes Design",
-	"description": "Rotes Design für Visual Studio Code"
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/theme-seti/package.i18n.json b/i18n/deu/extensions/theme-seti/package.i18n.json
deleted file mode 100644
index 79e4c3c6366..00000000000
--- a/i18n/deu/extensions/theme-seti/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Seti-Dateisymboldesign",
-	"description": "Ein Dateisymboldesign aus den Dateisymbolen der Seti-Benutzeroberfläche"
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/theme-solarized-dark/package.i18n.json b/i18n/deu/extensions/theme-solarized-dark/package.i18n.json
deleted file mode 100644
index 137df859db2..00000000000
--- a/i18n/deu/extensions/theme-solarized-dark/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Dunkles Solarisationsdesign",
-	"description": "Dunkles Solarisationsdesign für Visual Studio Code"
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/theme-solarized-light/package.i18n.json b/i18n/deu/extensions/theme-solarized-light/package.i18n.json
deleted file mode 100644
index c5b02c9b40e..00000000000
--- a/i18n/deu/extensions/theme-solarized-light/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Helles Solarisationsdesign",
-	"description": "Helles Solarisationsdesign für Visual Studio Code"
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/theme-tomorrow-night-blue/package.i18n.json b/i18n/deu/extensions/theme-tomorrow-night-blue/package.i18n.json
deleted file mode 100644
index f2489b2b99e..00000000000
--- a/i18n/deu/extensions/theme-tomorrow-night-blue/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Nachtblaues Tomorrow-Design",
-	"description": "Nachtblaues Tomorrow-Design für Visual Studio Code"
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/typescript-basics/package.i18n.json b/i18n/deu/extensions/typescript-basics/package.i18n.json
deleted file mode 100644
index d0f65a96aec..00000000000
--- a/i18n/deu/extensions/typescript-basics/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "JavaScript-Sprachgrundlagen",
-	"description": "Bietet Ausschnitte, Syntaxhervorhebung, Klammernpaare und Falten in TypeScript-Dateien."
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/typescript-language-features/out/commands.i18n.json b/i18n/deu/extensions/typescript-language-features/out/commands.i18n.json
deleted file mode 100644
index cdebacc88db..00000000000
--- a/i18n/deu/extensions/typescript-language-features/out/commands.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"typescript.projectConfigNoWorkspace": "Öffnen Sie einen Ordner in VS Code, um ein TypeScript- oder JavaScript-Projekt zu verwenden.",
-	"typescript.projectConfigUnsupportedFile": "TypeScript- oder JavaScript-Projekt konnte nicht ermittelt werden. Nicht unterstützter Dateityp.",
-	"typescript.projectConfigCouldNotGetInfo": "TypeScript- oder JavaScript-Projekt konnte nicht ermittelt werden.",
-	"typescript.noTypeScriptProjectConfig": "Datei ist nicht Teil eines TypeScript-Projekt. Klicken Sie [hier]({0}), um mehr zu erfahren.",
-	"typescript.noJavaScriptProjectConfig": "Datei ist nicht Teil eines JavaScript-Projekt. Klicken Sie [hier]({0}), um mehr zu erfahren.",
-	"typescript.configureTsconfigQuickPick": "tsconfig.json konfigurieren",
-	"typescript.configureJsconfigQuickPick": "jsconfig.json konfigurieren"
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/typescript-language-features/out/features/completionItemProvider.i18n.json b/i18n/deu/extensions/typescript-language-features/out/features/completionItemProvider.i18n.json
deleted file mode 100644
index c1be716a2f8..00000000000
--- a/i18n/deu/extensions/typescript-language-features/out/features/completionItemProvider.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"selectCodeAction": "Anzuwendende Codeaktion auswählen",
-	"acquiringTypingsLabel": "Eingaben werden abgerufen...",
-	"acquiringTypingsDetail": "Eingabedefinitionen für IntelliSense werden abgerufen.",
-	"autoImportLabel": "Automatischer Import von {0}"
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/typescript-language-features/out/features/directiveCommentCompletionProvider.i18n.json b/i18n/deu/extensions/typescript-language-features/out/features/directiveCommentCompletionProvider.i18n.json
deleted file mode 100644
index ab837c60f37..00000000000
--- a/i18n/deu/extensions/typescript-language-features/out/features/directiveCommentCompletionProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"ts-check": "Aktiviert die Semantiküberprüfung in einer JavaScript-Datei. Muss sich oben in einer Datei befinden.",
-	"ts-nocheck": "Deaktiviert die Semantiküberprüfung in einer JavaScript-Datei. Muss sich oben in einer Datei befinden.",
-	"ts-ignore": "Unterdrückt @ts-check-Fehler in der nächsten Zeile einer Datei."
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/typescript-language-features/out/features/implementationsCodeLensProvider.i18n.json b/i18n/deu/extensions/typescript-language-features/out/features/implementationsCodeLensProvider.i18n.json
deleted file mode 100644
index 2dd478f8590..00000000000
--- a/i18n/deu/extensions/typescript-language-features/out/features/implementationsCodeLensProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"oneImplementationLabel": "1 Implementierung",
-	"manyImplementationLabel": "{0}-Implementierungen",
-	"implementationsErrorLabel": "Implementierungen konnten nicht bestimmt werden"
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/typescript-language-features/out/features/jsDocCompletionProvider.i18n.json b/i18n/deu/extensions/typescript-language-features/out/features/jsDocCompletionProvider.i18n.json
deleted file mode 100644
index e5e06fc03c8..00000000000
--- a/i18n/deu/extensions/typescript-language-features/out/features/jsDocCompletionProvider.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"typescript.jsDocCompletionItem.documentation": "JSDoc-Kommentar"
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/typescript-language-features/out/features/organizeImports.i18n.json b/i18n/deu/extensions/typescript-language-features/out/features/organizeImports.i18n.json
deleted file mode 100644
index 9df063abf44..00000000000
--- a/i18n/deu/extensions/typescript-language-features/out/features/organizeImports.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"oraganizeImportsAction.title": "Importe organisieren"
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/typescript-language-features/out/features/quickFixProvider.i18n.json b/i18n/deu/extensions/typescript-language-features/out/features/quickFixProvider.i18n.json
deleted file mode 100644
index e0e88f5e50e..00000000000
--- a/i18n/deu/extensions/typescript-language-features/out/features/quickFixProvider.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"fixAllInFileLabel": "{0} (Behebe alle in Datei)"
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/typescript-language-features/out/features/referencesCodeLensProvider.i18n.json b/i18n/deu/extensions/typescript-language-features/out/features/referencesCodeLensProvider.i18n.json
deleted file mode 100644
index 73d84e6a380..00000000000
--- a/i18n/deu/extensions/typescript-language-features/out/features/referencesCodeLensProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"oneReferenceLabel": "1 Verweis",
-	"manyReferenceLabel": "{0} Verweise",
-	"referenceErrorLabel": "Verweise konnten nicht bestimmt werden"
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/typescript-language-features/out/features/taskProvider.i18n.json b/i18n/deu/extensions/typescript-language-features/out/features/taskProvider.i18n.json
deleted file mode 100644
index 8d79b969dfa..00000000000
--- a/i18n/deu/extensions/typescript-language-features/out/features/taskProvider.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"buildTscLabel": "Erstellen – {0}",
-	"buildAndWatchTscLabel": "Überwachen – {0}"
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/typescript-language-features/out/features/updatePathsOnRename.i18n.json b/i18n/deu/extensions/typescript-language-features/out/features/updatePathsOnRename.i18n.json
deleted file mode 100644
index c15eeca8a42..00000000000
--- a/i18n/deu/extensions/typescript-language-features/out/features/updatePathsOnRename.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"prompt": "Sollen Importe für verschobene Datei \"{0}\" automatisch aktualisiert werden?",
-	"reject.title": "Nein",
-	"accept.title": "Ja",
-	"always.title": "Ja, Importe immer aktualisieren",
-	"never.title": "Nein, Importe nie aktualisieren"
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/typescript-language-features/out/typescriptServiceClient.i18n.json b/i18n/deu/extensions/typescript-language-features/out/typescriptServiceClient.i18n.json
deleted file mode 100644
index eb955bb9c06..00000000000
--- a/i18n/deu/extensions/typescript-language-features/out/typescriptServiceClient.i18n.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noServerFound": "Der Pfad \"{0}\" zeigt nicht auf eine gültige tsserver-Installation. Fallback auf gebündelte TypeScript-Version wird durchgeführt.",
-	"serverCouldNotBeStarted": "Der TypeScript-Sprachserver konnte nicht gestartet werden. Fehlermeldung: {0}",
-	"typescript.openTsServerLog.notSupported": "Die TS Server-Protokollierung erfordert TS 2.2.2+.",
-	"typescript.openTsServerLog.loggingNotEnabled": "Die TS Server-Protokollierung ist deaktiviert. Legen Sie \"typescript.tsserver.log\" fest, und laden Sie VS Code erneut, um die Protokollierung zu aktivieren.",
-	"typescript.openTsServerLog.enableAndReloadOption": "Aktiviert die Protokollierung und startet den TS-Server neu.",
-	"typescript.openTsServerLog.noLogFile": "TS Server hat noch nicht mit der Protokollierung begonnen.",
-	"openTsServerLog.openFileFailedFailed": "Die TS-Server-Protokolldatei konnte nicht geöffnet werden.",
-	"serverDiedAfterStart": "Der TypeScript-Sprachdienst wurde direkt nach seinem Start fünfmal beendet. Der Dienst wird nicht neu gestartet.",
-	"serverDiedReportIssue": "Problem melden",
-	"serverDied": "Der TypeScript-Sprachdienst wurde während der letzten fünf Minuten fünfmal unerwartet beendet."
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/typescript-language-features/out/utils/api.i18n.json b/i18n/deu/extensions/typescript-language-features/out/utils/api.i18n.json
deleted file mode 100644
index e381d6d3b73..00000000000
--- a/i18n/deu/extensions/typescript-language-features/out/utils/api.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"invalidVersion": "Ungültige Version"
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/typescript-language-features/out/utils/logger.i18n.json b/i18n/deu/extensions/typescript-language-features/out/utils/logger.i18n.json
deleted file mode 100644
index 8f5ef5415b9..00000000000
--- a/i18n/deu/extensions/typescript-language-features/out/utils/logger.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"channelName": "TypeScript"
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/typescript-language-features/out/utils/projectStatus.i18n.json b/i18n/deu/extensions/typescript-language-features/out/utils/projectStatus.i18n.json
deleted file mode 100644
index b36d5e0aec6..00000000000
--- a/i18n/deu/extensions/typescript-language-features/out/utils/projectStatus.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hintExclude": "Um die JavaScript/TypeScript-Sprachfunktionen für das gesamte Projekt zu aktivieren, schließen Sie Ordner mit vielen Dateien aus. Beispiel: {0}",
-	"hintExclude.generic": "Um JavaScript/TypeScript-Sprachfunktionen für das gesamte Projekt zu aktivieren, schließen Sie große Ordner mit Quelldateien aus, an denen Sie nicht arbeiten.",
-	"large.label": "Auszuschließende Elemente konfigurieren",
-	"hintExclude.tooltip": "Um JavaScript/TypeScript-Sprachfunktionen für das gesamte Projekt zu aktivieren, schließen Sie große Ordner mit Quelldateien aus, an denen Sie nicht arbeiten."
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/typescript-language-features/out/utils/typingsStatus.i18n.json b/i18n/deu/extensions/typescript-language-features/out/utils/typingsStatus.i18n.json
deleted file mode 100644
index 797c586cb35..00000000000
--- a/i18n/deu/extensions/typescript-language-features/out/utils/typingsStatus.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"installingPackages": "Daten werden zum Optimieren von TypeScript IntelliSense abgerufen",
-	"typesInstallerInitializationFailed.title": "Typisierungsdateien für JavaScript-Sprachfunktionen konnten nicht installiert werden. Stellen Sie sicher, das NPM installiert ist, oder konfigurieren Sie \"typescript.npm\" in Ihren Benutzereinstellungen. Klicken Sie [hier]({0}), um mehr zu erfahren.",
-	"typesInstallerInitializationFailed.doNotCheckAgain": "Nicht mehr anzeigen"
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/typescript-language-features/out/utils/versionPicker.i18n.json b/i18n/deu/extensions/typescript-language-features/out/utils/versionPicker.i18n.json
deleted file mode 100644
index 9414ff7601e..00000000000
--- a/i18n/deu/extensions/typescript-language-features/out/utils/versionPicker.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"useVSCodeVersionOption": "Version von VS Code verwenden",
-	"useWorkspaceVersionOption": "Arbeitsbereichsversion verwenden",
-	"learnMore": "Weitere Informationen",
-	"selectTsVersion": "Wählen Sie die für die JavaScript- und TypeScript-Sprachfunktionen verwendete TypeScript-Version aus."
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/typescript-language-features/out/utils/versionProvider.i18n.json b/i18n/deu/extensions/typescript-language-features/out/utils/versionProvider.i18n.json
deleted file mode 100644
index 4d94a01dc62..00000000000
--- a/i18n/deu/extensions/typescript-language-features/out/utils/versionProvider.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"couldNotLoadTsVersion": "Die TypeScript-Version konnte unter diesem Pfad nicht geladen werden.",
-	"noBundledServerFound": "Der tsserver von VS Code wurde von einer anderen Anwendung wie etwa einem fehlerhaften Tool zur Viruserkennung gelöscht. Führen Sie eine Neuinstallation von VS Code durch."
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/typescript-language-features/package.i18n.json b/i18n/deu/extensions/typescript-language-features/package.i18n.json
deleted file mode 100644
index b4c912aea2b..00000000000
--- a/i18n/deu/extensions/typescript-language-features/package.i18n.json
+++ /dev/null
@@ -1,67 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "TypeScript- und JavaScript-Sprachfeatures",
-	"description": "Bietet umfangreiche Sprachunterstützung für JavaScript und TypeScript.",
-	"reloadProjects.title": "Projekt erneut laden",
-	"configuration.typescript": "TypeScript",
-	"typescript.useCodeSnippetsOnMethodSuggest.dec": "Vervollständigen Sie Funktionen mit deren Parametersignatur.",
-	"typescript.tsdk.desc": "Gibt den Ordnerpfad mit den zu verwendenden tsserver- und lib*.d.ts-Dateien an.",
-	"typescript.disableAutomaticTypeAcquisition": "Deaktiviert die automatische Typerfassung. Erfordert TypeScript >= 2.0.6.",
-	"typescript.tsserver.log": "Aktiviert die Protokollierung des TS-Servers in eine Datei. Mithilfe der Protokolldatei lassen sich Probleme beim TS-Server diagnostizieren. Die Protokolldatei kann Dateipfade, Quellcode und weitere potenziell sensible Informationen aus Ihrem Projekt enthalten.",
-	"typescript.tsserver.pluginPaths": "Zusätzliche Pfade zum Suchen von Typescript Language Service-Plug-Ins. Erfordert TypeScript 2.3.0 oder höher. ",
-	"typescript.tsserver.pluginPaths.item": "Ein absoluter oder relativer Pfad. Ein relativer Pfad wird in Bezug auf die Arbeitsbereichsordner aufgelöst.",
-	"typescript.tsserver.trace": "Aktiviert die Ablaufverfolgung von an den TS-Server gesendeten Nachrichten. Mithilfe der Ablaufverfolgung lassen sich Probleme beim TS-Server diagnostizieren. Die Ablaufverfolgung kann Dateipfade, Quellcode und weitere potenziell sensible Informationen aus Ihrem Projekt enthalten.",
-	"typescript.validate.enable": "TypeScript-Überprüfung aktivieren/deaktivieren.",
-	"typescript.format.enable": "Standardmäßigen TypeScript-Formatierer aktivieren/deaktivieren.",
-	"javascript.format.enable": "Standardmäßigen JavaScript-Formatierer aktivieren/deaktivieren.",
-	"format.insertSpaceAfterCommaDelimiter": "Definiert die Verarbeitung von Leerzeichen nach einem Kommatrennzeichen.",
-	"format.insertSpaceAfterConstructor": "Definiert die Verarbeitung von Leerzeichen nach dem Konstruktor-Schlüsselwort. Erfordert TypeScript 2.3.0 oder höher.",
-	"format.insertSpaceAfterSemicolonInForStatements": " Definiert die Verarbeitung von Leerzeichen nach einem Semikolon in einer for-Anweisung.",
-	"format.insertSpaceBeforeAndAfterBinaryOperators": "Definiert die Verarbeitung von Leerzeichen nach einem binären Operator.",
-	"format.insertSpaceAfterKeywordsInControlFlowStatements": "Definiert die Verarbeitung von Leerzeichen nach Schlüsselwörtern in einer Flusssteuerungsanweisung.",
-	"format.insertSpaceAfterFunctionKeywordForAnonymousFunctions": "Definiert die Verarbeitung von Leerzeichen nach einem Funktionsschlüsselwort für anonyme Funktionen.",
-	"format.insertSpaceBeforeFunctionParenthesis": "Definiert die Verarbeitung von Leerzeichen vor Funktionsargumentklammern. Erfordert TypeScript >= 2.1.5.",
-	"format.insertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis": "Definiert die Verarbeitung von Leerzeichen nach öffnenden und vor schließenden nicht leeren runden Klammern.",
-	"format.insertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets": "Definiert die Verarbeitung von Leerzeichen nach öffnenden und vor schließenden nicht leeren eckigen Klammern.",
-	"format.insertSpaceAfterOpeningAndBeforeClosingNonemptyBraces": "Definiert die Verarbeitung von Leerzeichen nach öffnenden und vor schließenden nicht leeren geschweiften Klammern. Erfordert TypeScript 2.3.0 oder höher.",
-	"format.insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces": "Definiert die Verarbeitung von Leerzeichen nach öffnenden und vor schließenden geschweiften Klammern für Vorlagenzeichenfolgen. Erfordert TypeScript >= 2.0.6.",
-	"format.insertSpaceAfterOpeningAndBeforeClosingJsxExpressionBraces": "Definiert die Verarbeitung von Leerzeichen nach öffnenden und vor schließenden geschweiften Klammern für JSX-Ausdrücke. Erfordert TypeScript >= 2.0.6.",
-	"format.insertSpaceAfterTypeAssertion": "Definiert die Verarbeitung von Leerzeichen nach Typassertionen in TypeScript. Erfordert TypeScript >= 2.4.",
-	"format.placeOpenBraceOnNewLineForFunctions": "Definiert, ob eine öffnende geschweifte Klammer für Funktionen in eine neue Zeile eingefügt wird.",
-	"format.placeOpenBraceOnNewLineForControlBlocks": "Definiert, ob eine öffnende geschweifte Klammer für Kontrollblöcke in eine neue Zeile eingefügt wird.",
-	"javascript.validate.enable": "JavaScript-Überprüfung aktivieren/deaktivieren.",
-	"goToProjectConfig.title": "Zur Projektkonfiguration wechseln",
-	"javascript.referencesCodeLens.enabled": "Aktiviert oder deaktiviert CodeLens-Verweise in JavaScript Dateien. Erfordert TypeScript 2.0.6 oder höher.",
-	"typescript.referencesCodeLens.enabled": "Aktiviert oder deaktiviert CodeLens-Verweise in TypeScript Dateien. Erfordert TypeScript 2.0.6 oder höher.",
-	"typescript.implementationsCodeLens.enabled": "Aktiviert oder deaktiviert CodeLens-Implementierungen. Erfordert TypeScript 2.2.0 oder höher.",
-	"typescript.openTsServerLog.title": "TS Server-Protokolldatei öffnen",
-	"typescript.restartTsServer": "TS Server neu starten",
-	"typescript.selectTypeScriptVersion.title": "TypeScript-Version wählen",
-	"typescript.reportStyleChecksAsWarnings": "Formatvorlagenprüfungen als Warnungen melden",
-	"jsDocCompletion.enabled": "Automatische JSDoc-Kommentare aktivieren/deaktivieren",
-	"javascript.implicitProjectConfig.checkJs": "Aktiviert/deaktiviert die Semantikprüfung bei JavaScript-Dateien. Diese Einstellung wird von vorhandenen \"jsconfig.json\"- oder \"tsconfig.json\"-Dateien außer Kraft gesetzt. Erfordert TypeScript 2.3.1 oder höher.",
-	"typescript.npm": "Gibt den Pfad zur ausführbaren NPM-Datei an, die für die automatische Typerfassung verwendet wird. Hierfür ist TypeScript 2.3.4 oder höher erforderlich.",
-	"typescript.check.npmIsInstalled": "Überprüfen Sie, ob NPM für die automatische Typerfassung installiert ist.",
-	"javascript.nameSuggestions": "Das Einbeziehen eindeutiger Namen von der Datei in der JavaScript-Vorschlagsliste aktivieren/deaktivieren.",
-	"typescript.tsc.autoDetect": "Steuert die automatische Erkennung von TSC-Aufgaben. \"Aus\" deaktiviert diese Funktion. \"Build\" erstellt nur Kompilierungsaufgaben mit einer Ausführung. \"Überwachen\" erstellt nur Kompilierungs- und Überwachungsaufgaben. \"Ein\" erstellt sowohl Build- als auch Überwachungsaufgaben. Der Standardwert ist \"Ein\".",
-	"typescript.problemMatchers.tsc.label": "TypeScript-Probleme",
-	"typescript.problemMatchers.tscWatch.label": "TypeScript-Probleme (Überwachungsmodus)",
-	"typescript.quickSuggestionsForPaths": "Aktiviert oder deaktiviert Schnellvorschläge, wenn Sie einen Importpfad ausschreiben.",
-	"typescript.locale": "Legt das zum Melden von JavaScript- und TypeScript-Fehlern verwendete Gebietsschema fest. Erfordert TypeScript 2.6.0 oder höher. Beim Der Standardwert \"null\" wird das Gebietsschema von VS Code verwendet.",
-	"javascript.implicitProjectConfig.experimentalDecorators": "Aktiviert oder deaktiviert \"experimentalDecorators\" für JavaScript-Dateien, die nicht Teil eines Projekts sind. Vorhandene jsconfig.json- oder tsconfig.json-Dateien setzen diese Einstellung außer Kraft. Erfordert TypeScript 2.3.1 oder höher.",
-	"typescript.autoImportSuggestions.enabled": "Aktiviert oder deaktiviert Vorschläge für den automatischen Import. Erfordert TypeScript 2.6.1 oder höher.",
-	"typescript.experimental.syntaxFolding": "Aktiviert bzw. deaktiviert die syntaxabhängigen Faltungsmarkierungen.",
-	"taskDefinition.tsconfig.description": "Die \"tsconfig\"-Datei, die den TS-Build definiert.",
-	"javascript.suggestionActions.enabled": "Aktiviert/deaktiviert Vorschlagsdiagnosen für JavaScript-Dateien im Editor. Erfordert TypeScript 2.8 oder höher.",
-	"typescript.suggestionActions.enabled": "Aktiviert bzw. deaktiviert Vorschlagsdiagnosen für TypeScript-Dateien im Editor. Erfordert TypeScript 2.8 oder höher.",
-	"typescript.preferences.quoteStyle": "Der bevorzugte Stil für Anführungszeichen bei schnellen Problembehebungen. Mögliche Werte sind \"single\" (einfache Anführungszeichen), \"double\" (doppelte Anführungszeichen) und \"auto\" (hierbei wird der Stil für Anführungszeichen aus bestehenden Importen abgeleitet). Erfordert TypeScript 2.9 oder höher.",
-	"typescript.preferences.importModuleSpecifier": "Bevorzugter Pfadstil für den automatischen Import. Mögliche Werte sind:\n- \"relative\" (relativ zum Dateispeicherort)\n- \"non-relative\" (nicht-relativ, d. h. auf Grundlage des in der Datei \"jsconfig.json\" oder \"tsconfig.json\" konfigurierten Werts für \"baseUrl\")\n- \"auto\" (ermittelt den jeweils kürzeren Pfadtyp)\nErfordert TypeScript 2.9 oder höher.",
-	"typescript.showUnused": "Aktiviert bzw. deaktiviert das Hervorheben unbenutzter Variablen im Code. Erforderlich TypeScript 2.9 oder höher.",
-	"typescript.updateImportsOnFileMove.enabled": "Aktiviert bzw. deaktiviert die automatische Änderungen von Importpfaden, wenn Sie eine Datei in VS Code umbenennen oder verschieben. Mögliche Werte sind \"prompt\" (fordert bei jeder Umbenennung zur Auswahl auf), \"always\" (aktualisiert Pfade automatisch\" und \"never\" (Pfade werden nie geändert). Erfordert TypeScript 2.9 oder höher."
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/typescript/out/commands.i18n.json b/i18n/deu/extensions/typescript/out/commands.i18n.json
deleted file mode 100644
index cdebacc88db..00000000000
--- a/i18n/deu/extensions/typescript/out/commands.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"typescript.projectConfigNoWorkspace": "Öffnen Sie einen Ordner in VS Code, um ein TypeScript- oder JavaScript-Projekt zu verwenden.",
-	"typescript.projectConfigUnsupportedFile": "TypeScript- oder JavaScript-Projekt konnte nicht ermittelt werden. Nicht unterstützter Dateityp.",
-	"typescript.projectConfigCouldNotGetInfo": "TypeScript- oder JavaScript-Projekt konnte nicht ermittelt werden.",
-	"typescript.noTypeScriptProjectConfig": "Datei ist nicht Teil eines TypeScript-Projekt. Klicken Sie [hier]({0}), um mehr zu erfahren.",
-	"typescript.noJavaScriptProjectConfig": "Datei ist nicht Teil eines JavaScript-Projekt. Klicken Sie [hier]({0}), um mehr zu erfahren.",
-	"typescript.configureTsconfigQuickPick": "tsconfig.json konfigurieren",
-	"typescript.configureJsconfigQuickPick": "jsconfig.json konfigurieren"
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/typescript/out/features/bufferSyncSupport.i18n.json b/i18n/deu/extensions/typescript/out/features/bufferSyncSupport.i18n.json
deleted file mode 100644
index 676910e08b5..00000000000
--- a/i18n/deu/extensions/typescript/out/features/bufferSyncSupport.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"versionMismatch": "TypeScript ({1)} wird für Editor-Funktionen verwenden. TypeScript ({0}) ist global auf Ihrem Computer installiert. Fehler in VS Code können sich von TSC-Fehlern unterscheiden",
-	"moreInformation": "Weitere Informationen",
-	"doNotCheckAgain": "Nicht erneut überprüfen",
-	"close": "Schließen",
-	"updateTscCheck": "Die Benutzereinstellung \"typescript.check.tscVersion\" wurde zu FALSE aktualisiert."
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/typescript/out/features/completionItemProvider.i18n.json b/i18n/deu/extensions/typescript/out/features/completionItemProvider.i18n.json
deleted file mode 100644
index c1be716a2f8..00000000000
--- a/i18n/deu/extensions/typescript/out/features/completionItemProvider.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"selectCodeAction": "Anzuwendende Codeaktion auswählen",
-	"acquiringTypingsLabel": "Eingaben werden abgerufen...",
-	"acquiringTypingsDetail": "Eingabedefinitionen für IntelliSense werden abgerufen.",
-	"autoImportLabel": "Automatischer Import von {0}"
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/typescript/out/features/directiveCommentCompletionProvider.i18n.json b/i18n/deu/extensions/typescript/out/features/directiveCommentCompletionProvider.i18n.json
deleted file mode 100644
index ab837c60f37..00000000000
--- a/i18n/deu/extensions/typescript/out/features/directiveCommentCompletionProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"ts-check": "Aktiviert die Semantiküberprüfung in einer JavaScript-Datei. Muss sich oben in einer Datei befinden.",
-	"ts-nocheck": "Deaktiviert die Semantiküberprüfung in einer JavaScript-Datei. Muss sich oben in einer Datei befinden.",
-	"ts-ignore": "Unterdrückt @ts-check-Fehler in der nächsten Zeile einer Datei."
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/typescript/out/features/implementationsCodeLensProvider.i18n.json b/i18n/deu/extensions/typescript/out/features/implementationsCodeLensProvider.i18n.json
deleted file mode 100644
index 2dd478f8590..00000000000
--- a/i18n/deu/extensions/typescript/out/features/implementationsCodeLensProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"oneImplementationLabel": "1 Implementierung",
-	"manyImplementationLabel": "{0}-Implementierungen",
-	"implementationsErrorLabel": "Implementierungen konnten nicht bestimmt werden"
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/typescript/out/features/jsDocCompletionProvider.i18n.json b/i18n/deu/extensions/typescript/out/features/jsDocCompletionProvider.i18n.json
deleted file mode 100644
index e5e06fc03c8..00000000000
--- a/i18n/deu/extensions/typescript/out/features/jsDocCompletionProvider.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"typescript.jsDocCompletionItem.documentation": "JSDoc-Kommentar"
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/typescript/out/features/quickFixProvider.i18n.json b/i18n/deu/extensions/typescript/out/features/quickFixProvider.i18n.json
deleted file mode 100644
index e0e88f5e50e..00000000000
--- a/i18n/deu/extensions/typescript/out/features/quickFixProvider.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"fixAllInFileLabel": "{0} (Behebe alle in Datei)"
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/typescript/out/features/referencesCodeLensProvider.i18n.json b/i18n/deu/extensions/typescript/out/features/referencesCodeLensProvider.i18n.json
deleted file mode 100644
index 73d84e6a380..00000000000
--- a/i18n/deu/extensions/typescript/out/features/referencesCodeLensProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"oneReferenceLabel": "1 Verweis",
-	"manyReferenceLabel": "{0} Verweise",
-	"referenceErrorLabel": "Verweise konnten nicht bestimmt werden"
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/typescript/out/features/taskProvider.i18n.json b/i18n/deu/extensions/typescript/out/features/taskProvider.i18n.json
deleted file mode 100644
index 8d79b969dfa..00000000000
--- a/i18n/deu/extensions/typescript/out/features/taskProvider.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"buildTscLabel": "Erstellen – {0}",
-	"buildAndWatchTscLabel": "Überwachen – {0}"
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/typescript/out/typescriptMain.i18n.json b/i18n/deu/extensions/typescript/out/typescriptMain.i18n.json
deleted file mode 100644
index abb5c164718..00000000000
--- a/i18n/deu/extensions/typescript/out/typescriptMain.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"typescript.projectConfigNoWorkspace": "Öffnen Sie einen Ordner in VS Code, um ein TypeScript- oder JavaScript-Projekt zu verwenden.",
-	"typescript.projectConfigUnsupportedFile": "TypeScript- oder JavaScript-Projekt konnte nicht ermittelt werden. Nicht unterstützter Dateityp.",
-	"typescript.projectConfigCouldNotGetInfo": "TypeScript- oder JavaScript-Projekt konnte nicht ermittelt werden.",
-	"typescript.noTypeScriptProjectConfig": "Datei ist nicht Teil eines TypeScript-Projekts.",
-	"typescript.noJavaScriptProjectConfig": "Datei ist nicht Teil eines JavaScript-Projekts.",
-	"typescript.configureTsconfigQuickPick": "tsconfig.json konfigurieren",
-	"typescript.configureJsconfigQuickPick": "jsconfig.json konfigurieren",
-	"typescript.projectConfigLearnMore": "Weitere Informationen"
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/typescript/out/typescriptServiceClient.i18n.json b/i18n/deu/extensions/typescript/out/typescriptServiceClient.i18n.json
deleted file mode 100644
index eb955bb9c06..00000000000
--- a/i18n/deu/extensions/typescript/out/typescriptServiceClient.i18n.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noServerFound": "Der Pfad \"{0}\" zeigt nicht auf eine gültige tsserver-Installation. Fallback auf gebündelte TypeScript-Version wird durchgeführt.",
-	"serverCouldNotBeStarted": "Der TypeScript-Sprachserver konnte nicht gestartet werden. Fehlermeldung: {0}",
-	"typescript.openTsServerLog.notSupported": "Die TS Server-Protokollierung erfordert TS 2.2.2+.",
-	"typescript.openTsServerLog.loggingNotEnabled": "Die TS Server-Protokollierung ist deaktiviert. Legen Sie \"typescript.tsserver.log\" fest, und laden Sie VS Code erneut, um die Protokollierung zu aktivieren.",
-	"typescript.openTsServerLog.enableAndReloadOption": "Aktiviert die Protokollierung und startet den TS-Server neu.",
-	"typescript.openTsServerLog.noLogFile": "TS Server hat noch nicht mit der Protokollierung begonnen.",
-	"openTsServerLog.openFileFailedFailed": "Die TS-Server-Protokolldatei konnte nicht geöffnet werden.",
-	"serverDiedAfterStart": "Der TypeScript-Sprachdienst wurde direkt nach seinem Start fünfmal beendet. Der Dienst wird nicht neu gestartet.",
-	"serverDiedReportIssue": "Problem melden",
-	"serverDied": "Der TypeScript-Sprachdienst wurde während der letzten fünf Minuten fünfmal unerwartet beendet."
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/typescript/out/utils/api.i18n.json b/i18n/deu/extensions/typescript/out/utils/api.i18n.json
deleted file mode 100644
index e381d6d3b73..00000000000
--- a/i18n/deu/extensions/typescript/out/utils/api.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"invalidVersion": "Ungültige Version"
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/typescript/out/utils/logger.i18n.json b/i18n/deu/extensions/typescript/out/utils/logger.i18n.json
deleted file mode 100644
index 8f5ef5415b9..00000000000
--- a/i18n/deu/extensions/typescript/out/utils/logger.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"channelName": "TypeScript"
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/typescript/out/utils/projectStatus.i18n.json b/i18n/deu/extensions/typescript/out/utils/projectStatus.i18n.json
deleted file mode 100644
index b36d5e0aec6..00000000000
--- a/i18n/deu/extensions/typescript/out/utils/projectStatus.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hintExclude": "Um die JavaScript/TypeScript-Sprachfunktionen für das gesamte Projekt zu aktivieren, schließen Sie Ordner mit vielen Dateien aus. Beispiel: {0}",
-	"hintExclude.generic": "Um JavaScript/TypeScript-Sprachfunktionen für das gesamte Projekt zu aktivieren, schließen Sie große Ordner mit Quelldateien aus, an denen Sie nicht arbeiten.",
-	"large.label": "Auszuschließende Elemente konfigurieren",
-	"hintExclude.tooltip": "Um JavaScript/TypeScript-Sprachfunktionen für das gesamte Projekt zu aktivieren, schließen Sie große Ordner mit Quelldateien aus, an denen Sie nicht arbeiten."
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/typescript/out/utils/typingsStatus.i18n.json b/i18n/deu/extensions/typescript/out/utils/typingsStatus.i18n.json
deleted file mode 100644
index 797c586cb35..00000000000
--- a/i18n/deu/extensions/typescript/out/utils/typingsStatus.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"installingPackages": "Daten werden zum Optimieren von TypeScript IntelliSense abgerufen",
-	"typesInstallerInitializationFailed.title": "Typisierungsdateien für JavaScript-Sprachfunktionen konnten nicht installiert werden. Stellen Sie sicher, das NPM installiert ist, oder konfigurieren Sie \"typescript.npm\" in Ihren Benutzereinstellungen. Klicken Sie [hier]({0}), um mehr zu erfahren.",
-	"typesInstallerInitializationFailed.doNotCheckAgain": "Nicht mehr anzeigen"
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/typescript/out/utils/versionPicker.i18n.json b/i18n/deu/extensions/typescript/out/utils/versionPicker.i18n.json
deleted file mode 100644
index 9414ff7601e..00000000000
--- a/i18n/deu/extensions/typescript/out/utils/versionPicker.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"useVSCodeVersionOption": "Version von VS Code verwenden",
-	"useWorkspaceVersionOption": "Arbeitsbereichsversion verwenden",
-	"learnMore": "Weitere Informationen",
-	"selectTsVersion": "Wählen Sie die für die JavaScript- und TypeScript-Sprachfunktionen verwendete TypeScript-Version aus."
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/typescript/out/utils/versionProvider.i18n.json b/i18n/deu/extensions/typescript/out/utils/versionProvider.i18n.json
deleted file mode 100644
index 4d94a01dc62..00000000000
--- a/i18n/deu/extensions/typescript/out/utils/versionProvider.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"couldNotLoadTsVersion": "Die TypeScript-Version konnte unter diesem Pfad nicht geladen werden.",
-	"noBundledServerFound": "Der tsserver von VS Code wurde von einer anderen Anwendung wie etwa einem fehlerhaften Tool zur Viruserkennung gelöscht. Führen Sie eine Neuinstallation von VS Code durch."
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/typescript/package.i18n.json b/i18n/deu/extensions/typescript/package.i18n.json
deleted file mode 100644
index 6f8bb4fea94..00000000000
--- a/i18n/deu/extensions/typescript/package.i18n.json
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "TypeScript- und JavaScript-Sprachfeatures",
-	"description": "Bietet umfangreiche Sprachunterstützung für JavaScript und TypeScript.",
-	"typescript.reloadProjects.title": "Projekt erneut laden",
-	"javascript.reloadProjects.title": "Projekt erneut laden",
-	"configuration.typescript": "TypeScript",
-	"typescript.useCodeSnippetsOnMethodSuggest.dec": "Vervollständigen Sie Funktionen mit deren Parametersignatur.",
-	"typescript.tsdk.desc": "Gibt den Ordnerpfad mit den zu verwendenden tsserver- und lib*.d.ts-Dateien an.",
-	"typescript.disableAutomaticTypeAcquisition": "Deaktiviert die automatische Typerfassung. Erfordert TypeScript >= 2.0.6.",
-	"typescript.tsserver.log": "Aktiviert die Protokollierung des TS-Servers in eine Datei. Mithilfe der Protokolldatei lassen sich Probleme beim TS-Server diagnostizieren. Die Protokolldatei kann Dateipfade, Quellcode und weitere potenziell sensible Informationen aus Ihrem Projekt enthalten.",
-	"typescript.tsserver.trace": "Aktiviert die Ablaufverfolgung von an den TS-Server gesendeten Nachrichten. Mithilfe der Ablaufverfolgung lassen sich Probleme beim TS-Server diagnostizieren. Die Ablaufverfolgung kann Dateipfade, Quellcode und weitere potenziell sensible Informationen aus Ihrem Projekt enthalten.",
-	"typescript.validate.enable": "TypeScript-Überprüfung aktivieren/deaktivieren.",
-	"typescript.format.enable": "Standardmäßigen TypeScript-Formatierer aktivieren/deaktivieren.",
-	"javascript.format.enable": "Standardmäßigen JavaScript-Formatierer aktivieren/deaktivieren.",
-	"format.insertSpaceAfterCommaDelimiter": "Definiert die Verarbeitung von Leerzeichen nach einem Kommatrennzeichen.",
-	"format.insertSpaceAfterConstructor": "Definiert die Verarbeitung von Leerzeichen nach dem Konstruktor-Schlüsselwort. Erfordert TypeScript 2.3.0 oder höher.",
-	"format.insertSpaceAfterSemicolonInForStatements": " Definiert die Verarbeitung von Leerzeichen nach einem Semikolon in einer for-Anweisung.",
-	"format.insertSpaceBeforeAndAfterBinaryOperators": "Definiert die Verarbeitung von Leerzeichen nach einem binären Operator.",
-	"format.insertSpaceAfterKeywordsInControlFlowStatements": "Definiert die Verarbeitung von Leerzeichen nach Schlüsselwörtern in einer Flusssteuerungsanweisung.",
-	"format.insertSpaceAfterFunctionKeywordForAnonymousFunctions": "Definiert die Verarbeitung von Leerzeichen nach einem Funktionsschlüsselwort für anonyme Funktionen.",
-	"format.insertSpaceBeforeFunctionParenthesis": "Definiert die Verarbeitung von Leerzeichen vor Funktionsargumentklammern. Erfordert TypeScript >= 2.1.5.",
-	"format.insertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis": "Definiert die Verarbeitung von Leerzeichen nach öffnenden und vor schließenden nicht leeren runden Klammern.",
-	"format.insertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets": "Definiert die Verarbeitung von Leerzeichen nach öffnenden und vor schließenden nicht leeren eckigen Klammern.",
-	"format.insertSpaceAfterOpeningAndBeforeClosingNonemptyBraces": "Definiert die Verarbeitung von Leerzeichen nach öffnenden und vor schließenden geschweiften Klammern. Erfordert TypeScript 2.3.0 oder höher.",
-	"format.insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces": "Definiert die Verarbeitung von Leerzeichen nach öffnenden und vor schließenden geschweiften Klammern für Vorlagenzeichenfolgen. Erfordert TypeScript >= 2.0.6.",
-	"format.insertSpaceAfterOpeningAndBeforeClosingJsxExpressionBraces": "Definiert die Verarbeitung von Leerzeichen nach öffnenden und vor schließenden geschweiften Klammern für JSX-Ausdrücke. Erfordert TypeScript >= 2.0.6.",
-	"format.insertSpaceAfterTypeAssertion": "Definiert die Verarbeitung von Leerzeichen nach Typassertionen in TypeScript. Erfordert TypeScript >= 2.4.",
-	"format.placeOpenBraceOnNewLineForFunctions": "Definiert, ob eine öffnende geschweifte Klammer für Funktionen in eine neue Zeile eingefügt wird.",
-	"format.placeOpenBraceOnNewLineForControlBlocks": "Definiert, ob eine öffnende geschweifte Klammer für Kontrollblöcke in eine neue Zeile eingefügt wird.",
-	"javascript.validate.enable": "JavaScript-Überprüfung aktivieren/deaktivieren.",
-	"typescript.goToProjectConfig.title": "Zur Projektkonfiguration wechseln",
-	"javascript.goToProjectConfig.title": "Zur Projektkonfiguration wechseln",
-	"javascript.referencesCodeLens.enabled": "Aktiviert oder deaktiviert CodeLens-Verweise in JavaScript Dateien. Erfordert TypeScript 2.0.6 oder höher.",
-	"typescript.referencesCodeLens.enabled": "Aktiviert oder deaktiviert CodeLens-Verweise in TypeScript Dateien. Erfordert TypeScript 2.0.6 oder höher.",
-	"typescript.implementationsCodeLens.enabled": "Aktiviert oder deaktiviert CodeLens-Implementierungen. Erfordert TypeScript 2.2.0 oder höher.",
-	"typescript.openTsServerLog.title": "TS Server-Protokolldatei öffnen",
-	"typescript.restartTsServer": "TS Server neu starten",
-	"typescript.selectTypeScriptVersion.title": "TypeScript-Version wählen",
-	"typescript.reportStyleChecksAsWarnings": "Formatvorlagenprüfungen als Warnungen melden",
-	"jsDocCompletion.enabled": "Automatische JSDoc-Kommentare aktivieren/deaktivieren",
-	"javascript.implicitProjectConfig.checkJs": "Aktiviert/deaktiviert die Semantikprüfung bei JavaScript-Dateien. Diese Einstellung wird von vorhandenen \"jsconfig.json\"- oder \"tsconfig.json\"-Dateien außer Kraft gesetzt. Erfordert TypeScript 2.3.1 oder höher.",
-	"typescript.npm": "Gibt den Pfad zur ausführbaren NPM-Datei an, die für die automatische Typerfassung verwendet wird. Hierfür ist TypeScript 2.3.4 oder höher erforderlich.",
-	"typescript.check.npmIsInstalled": "Überprüfen Sie, ob NPM für die automatische Typerfassung installiert ist.",
-	"javascript.nameSuggestions": "Das Einbeziehen eindeutiger Namen von der Datei in der JavaScript-Vorschlagsliste aktivieren/deaktivieren.",
-	"typescript.tsc.autoDetect": "Steuert die automatische Erkennung von TSC-Aufgaben. \"Aus\" deaktiviert diese Funktion. \"Build\" erstellt nur Kompilierungsaufgaben mit einer Ausführung. \"Überwachen\" erstellt nur Kompilierungs- und Überwachungsaufgaben. \"Ein\" erstellt sowohl Build- als auch Überwachungsaufgaben. Der Standardwert ist \"Ein\".",
-	"typescript.problemMatchers.tsc.label": "TypeScript-Probleme",
-	"typescript.problemMatchers.tscWatch.label": "TypeScript-Probleme (Überwachungsmodus)",
-	"typescript.quickSuggestionsForPaths": "Aktiviert oder deaktiviert Schnellvorschläge, wenn Sie einen Importpfad ausschreiben.",
-	"typescript.locale": "Legt das zum Melden von TypeScript-Fehlern verwendete Gebietsschema fest. Erfordert TypeScript 2.6.0 oder höher. Der Standardwert \"null\" verwendet für TypeScript-Fehler das Gebietsschema von VS Code.",
-	"javascript.implicitProjectConfig.experimentalDecorators": "Aktiviert oder deaktiviert \"experimentalDecorators\" für JavaScript-Dateien, die nicht Teil eines Projekts sind. Vorhandene jsconfig.json- oder tsconfig.json-Dateien setzen diese Einstellung außer Kraft. Erfordert TypeScript 2.3.1 oder höher.",
-	"typescript.autoImportSuggestions.enabled": "Aktiviert oder deaktiviert Vorschläge für den automatischen Import. Erfordert TypeScript 2.6.1 oder höher.",
-	"typescript.experimental.syntaxFolding": "Aktiviert bzw. deaktiviert die syntaxabhängigen Faltungsmarkierungen.",
-	"taskDefinition.tsconfig.description": "Die \"tsconfig\"-Datei, die den TS-Build definiert."
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/vb/package.i18n.json b/i18n/deu/extensions/vb/package.i18n.json
deleted file mode 100644
index 2ec82806e37..00000000000
--- a/i18n/deu/extensions/vb/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Visual Basic-Sprachgrundlagen",
-	"description": "Bietet Ausschnitte, Syntaxhervorhebung, Klammernpaare und Falten in Visual Basic-Dateien."
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/xml/package.i18n.json b/i18n/deu/extensions/xml/package.i18n.json
deleted file mode 100644
index d776e7125b8..00000000000
--- a/i18n/deu/extensions/xml/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "XML-Sprachgrundlagen",
-	"description": "Bietet Syntaxhervorhebung und Klammernpaare in XML-Dateien."
-}
\ No newline at end of file
diff --git a/i18n/deu/extensions/yaml/package.i18n.json b/i18n/deu/extensions/yaml/package.i18n.json
deleted file mode 100644
index ffee0240330..00000000000
--- a/i18n/deu/extensions/yaml/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "YAML-Sprachgrundlagen",
-	"description": "Bietet Syntaxhervorhebung und Klammernpaare in YAML-Dateien."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/base/browser/ui/actionbar/actionbar.i18n.json b/i18n/deu/src/vs/base/browser/ui/actionbar/actionbar.i18n.json
deleted file mode 100644
index 309631273fe..00000000000
--- a/i18n/deu/src/vs/base/browser/ui/actionbar/actionbar.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"titleLabel": "{0} ({1})"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/base/browser/ui/aria/aria.i18n.json b/i18n/deu/src/vs/base/browser/ui/aria/aria.i18n.json
deleted file mode 100644
index afa7f4916b9..00000000000
--- a/i18n/deu/src/vs/base/browser/ui/aria/aria.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"repeated": "{0} (erneut aufgetreten)"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/base/browser/ui/findinput/findInput.i18n.json b/i18n/deu/src/vs/base/browser/ui/findinput/findInput.i18n.json
deleted file mode 100644
index 2fd184ddbb0..00000000000
--- a/i18n/deu/src/vs/base/browser/ui/findinput/findInput.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"defaultLabel": "Eingabe"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/base/browser/ui/findinput/findInputCheckboxes.i18n.json b/i18n/deu/src/vs/base/browser/ui/findinput/findInputCheckboxes.i18n.json
deleted file mode 100644
index 75d7ac41cb1..00000000000
--- a/i18n/deu/src/vs/base/browser/ui/findinput/findInputCheckboxes.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"caseDescription": "Groß-/Kleinschreibung beachten",
-	"wordsDescription": "Nur ganzes Wort suchen",
-	"regexDescription": "Regulären Ausdruck verwenden"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/base/browser/ui/inputbox/inputBox.i18n.json b/i18n/deu/src/vs/base/browser/ui/inputbox/inputBox.i18n.json
deleted file mode 100644
index 4efc4666073..00000000000
--- a/i18n/deu/src/vs/base/browser/ui/inputbox/inputBox.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"alertErrorMessage": "Fehler: {0}",
-	"alertWarningMessage": "Warnung: {0}",
-	"alertInfoMessage": "Info: {0}"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/base/browser/ui/resourceviewer/resourceViewer.i18n.json b/i18n/deu/src/vs/base/browser/ui/resourceviewer/resourceViewer.i18n.json
deleted file mode 100644
index df638eddc25..00000000000
--- a/i18n/deu/src/vs/base/browser/ui/resourceviewer/resourceViewer.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"imgMeta": "{0}x{1} {2}",
-	"largeImageError": "Das Bild ist zu groß für den Editor. ",
-	"resourceOpenExternalButton": "Bild mit externem Programm öffnen?",
-	"nativeBinaryError": "Die Datei wird nicht im Editor angezeigt, weil sie binär oder sehr groß ist oder eine nicht unterstützte Textcodierung verwendet.",
-	"sizeB": "{0} B",
-	"sizeKB": "{0} KB",
-	"sizeMB": "{0} MB",
-	"sizeGB": "{0} GB",
-	"sizeTB": "{0} TB"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json b/i18n/deu/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json
deleted file mode 100644
index 750d811d866..00000000000
--- a/i18n/deu/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"selectAriaOption": "{0}"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/base/browser/ui/toolbar/toolbar.i18n.json b/i18n/deu/src/vs/base/browser/ui/toolbar/toolbar.i18n.json
deleted file mode 100644
index 984d7607f7e..00000000000
--- a/i18n/deu/src/vs/base/browser/ui/toolbar/toolbar.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"more": "Weitere Informationen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/base/common/errorMessage.i18n.json b/i18n/deu/src/vs/base/common/errorMessage.i18n.json
deleted file mode 100644
index d9f640614a3..00000000000
--- a/i18n/deu/src/vs/base/common/errorMessage.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"stackTrace.format": "{0}: {1}",
-	"error.defaultMessage": "Ein unbekannter Fehler ist aufgetreten. Weitere Details dazu finden Sie im Protokoll.",
-	"nodeExceptionMessage": "Systemfehler ({0})",
-	"error.moreErrors": "{0} ({1} Fehler gesamt)"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/base/common/json.i18n.json b/i18n/deu/src/vs/base/common/json.i18n.json
deleted file mode 100644
index e4b0b451c6c..00000000000
--- a/i18n/deu/src/vs/base/common/json.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"error.invalidSymbol": "Ungültiges Symbol",
-	"error.invalidNumberFormat": "Ungültiges Zahlenformat.",
-	"error.propertyNameExpected": "Ein Eigenschaftenname wurde erwartet.",
-	"error.valueExpected": "Ein Wert wurde erwartet.",
-	"error.colonExpected": "Ein Doppelpunkt wurde erwartet.",
-	"error.commaExpected": "Ein Komma wurde erwartet.",
-	"error.closeBraceExpected": "Eine schließende geschweifte Klammer wurde erwartet.",
-	"error.closeBracketExpected": "Eine schließende Klammer wurde erwartet.",
-	"error.endOfFileExpected": "Das Dateiende wurde erwartet."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/base/common/jsonErrorMessages.i18n.json b/i18n/deu/src/vs/base/common/jsonErrorMessages.i18n.json
deleted file mode 100644
index 7f226f3cfff..00000000000
--- a/i18n/deu/src/vs/base/common/jsonErrorMessages.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"error.invalidSymbol": "Ungültiges Symbol",
-	"error.invalidNumberFormat": "Ungültiges Zahlenformat.",
-	"error.propertyNameExpected": "Ein Eigenschaftenname wurde erwartet.",
-	"error.valueExpected": "Ein Wert wurde erwartet.",
-	"error.colonExpected": "Ein Doppelpunkt wurde erwartet.",
-	"error.commaExpected": "Ein Komma wurde erwartet.",
-	"error.closeBraceExpected": "Eine schließende geschweifte Klammer wurde erwartet.",
-	"error.closeBracketExpected": "Eine schließende Klammer wurde erwartet.",
-	"error.endOfFileExpected": "Das Dateiende wurde erwartet."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/base/common/keybindingLabels.i18n.json b/i18n/deu/src/vs/base/common/keybindingLabels.i18n.json
deleted file mode 100644
index a54cc64fc56..00000000000
--- a/i18n/deu/src/vs/base/common/keybindingLabels.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"ctrlKey": "STRG",
-	"shiftKey": "UMSCHALTTASTE",
-	"altKey": "ALT",
-	"windowsKey": "Windows",
-	"ctrlKey.long": "STRG",
-	"shiftKey.long": "UMSCHALTTASTE",
-	"altKey.long": "ALT",
-	"cmdKey.long": "Befehlstaste",
-	"windowsKey.long": "Windows"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/base/common/processes.i18n.json b/i18n/deu/src/vs/base/common/processes.i18n.json
deleted file mode 100644
index e89e9d9c3e8..00000000000
--- a/i18n/deu/src/vs/base/common/processes.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"ExecutableParser.commandMissing": "Fehler: Die Informationen zur ausführbaren Datei müssen einen Befehl vom Typ \"string\" definieren.",
-	"ExecutableParser.isShellCommand": "Warnung: \"isShellCommand\" muss vom Typ \"boolean\" sein. Der Wert {0} wird ignoriert.",
-	"ExecutableParser.args": "Warnung: \"args\" muss vom Typ \"string[]\" sein. Der Wert {0} wird ignoriert.",
-	"ExecutableParser.invalidCWD": "Warnung: \"options.cwd\" muss vom Typ \"string\" sein. Der Wert {0} wird ignoriert."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/base/common/severity.i18n.json b/i18n/deu/src/vs/base/common/severity.i18n.json
deleted file mode 100644
index e5b40fe4a67..00000000000
--- a/i18n/deu/src/vs/base/common/severity.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"sev.error": "Fehler",
-	"sev.warning": "Warnung",
-	"sev.info": "Info"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/base/node/processes.i18n.json b/i18n/deu/src/vs/base/node/processes.i18n.json
deleted file mode 100644
index 04fbcbe033d..00000000000
--- a/i18n/deu/src/vs/base/node/processes.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"TaskRunner.UNC": "Ein Shell-Befehl kann nicht auf einem UNC-Laufwerk ausgeführt werden."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/base/node/ps.i18n.json b/i18n/deu/src/vs/base/node/ps.i18n.json
deleted file mode 100644
index 6cb92990648..00000000000
--- a/i18n/deu/src/vs/base/node/ps.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"collecting": "Sammeln von CPU- und Speicherinformationen. Dies kann einige Sekunden dauern."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/base/node/zip.i18n.json b/i18n/deu/src/vs/base/node/zip.i18n.json
deleted file mode 100644
index 558084d9d00..00000000000
--- a/i18n/deu/src/vs/base/node/zip.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"incompleteExtract": "Unvollständig. {0} von {1} Einträgen gefunden",
-	"notFound": "{0} wurde im ZIP nicht gefunden."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/base/parts/quickopen/browser/quickOpenModel.i18n.json b/i18n/deu/src/vs/base/parts/quickopen/browser/quickOpenModel.i18n.json
deleted file mode 100644
index e202acc45ab..00000000000
--- a/i18n/deu/src/vs/base/parts/quickopen/browser/quickOpenModel.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"quickOpenAriaLabelEntry": "{0}, Auswahl",
-	"quickOpenAriaLabel": "Auswahl"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/base/parts/quickopen/browser/quickOpenWidget.i18n.json b/i18n/deu/src/vs/base/parts/quickopen/browser/quickOpenWidget.i18n.json
deleted file mode 100644
index a53c588de74..00000000000
--- a/i18n/deu/src/vs/base/parts/quickopen/browser/quickOpenWidget.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"quickOpenAriaLabel": "Schnellauswahl. Nehmen Sie eine Eingabe vor, um die Ergebnisse einzugrenzen.",
-	"treeAriaLabel": "Schnellauswahl"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/base/parts/tree/browser/treeDefaults.i18n.json b/i18n/deu/src/vs/base/parts/tree/browser/treeDefaults.i18n.json
deleted file mode 100644
index 2a94df2e193..00000000000
--- a/i18n/deu/src/vs/base/parts/tree/browser/treeDefaults.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"collapse": "Zuklappen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json b/i18n/deu/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
deleted file mode 100644
index 5bc9127f7c6..00000000000
--- a/i18n/deu/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hide": "Ausblenden",
-	"show": "Anzeigen",
-	"previewOnGitHub": "Vorschau in GitHub",
-	"loadingData": "Daten werden geladen …",
-	"rateLimited": "GitHub-Abfragebeschränkung überschritten. Bitte warten.",
-	"similarIssues": "Ähnliche Probleme",
-	"open": "Öffnen",
-	"closed": "Geschlossen",
-	"noSimilarIssues": "Keine ähnlichen Probleme gefunden",
-	"settingsSearchIssue": "Fehler in Einstellungssuche ",
-	"bugReporter": "Fehlerbericht",
-	"featureRequest": "Featureanforderung",
-	"performanceIssue": "Leistungsproblem",
-	"stepsToReproduce": "Zu reproduzierende Schritte",
-	"bugDescription": "Geben Sie an, welche Schritte ausgeführt werden müssen, um das Problem zuverlässig zu reproduzieren. Was sollte geschehen, und was ist stattdessen geschehen? Wir unterstützen GitHub Flavored Markdown. Sie können während der Vorschau in GitHub Ihr Problem bearbeiten und Screenshots hinzufügen.",
-	"performanceIssueDesciption": "Wann ist dieses Leistungsproblem aufgetreten? Tritt es beispielsweise beim Start oder nach einer bestimmten Reihe von Aktionen auf? Wir unterstützen GitHub Flavored Markdown. Sie können während der Vorschau in GitHub Ihr Problem bearbeiten und Screenshots hinzufügen.",
-	"description": "Beschreibung",
-	"featureRequestDescription": "Bitte beschreiben Sie die Funktion, die Sie sehen möchten. Wir unterstützen GitHub-Markdown. Sie können in der GitHub-Preview ihr Problem bearbeiten und Screenshots hinzufügen.",
-	"expectedResults": "Erwartete Ergebnisse",
-	"settingsSearchResultsDescription": "Bitte führen Sie die Ergebnisse auf, die Sie bei der Suche mit dieser Abfrage erwartet haben. Wir unterstützen GitHub-Markdown. Sie können in der GitHub-Preview ihr Problem bearbeiten und Screenshots hinzufügen.",
-	"pasteData": "Wir haben die erforderlichen Daten in die Zwischenablage geschrieben, da sie zu groß zum Senden waren. Bitte fügen Sie sie ein.",
-	"disabledExtensions": "Erweiterungen sind deaktiviert"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json b/i18n/deu/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
deleted file mode 100644
index b2207b414ad..00000000000
--- a/i18n/deu/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"completeInEnglish": "Füllen Sie das Formular auf Englisch aus.",
-	"issueTypeLabel": "Dies ist",
-	"issueSourceLabel": "Datei auf",
-	"vscode": "Visual Studio Code",
-	"extension": "Eine Erweiterung",
-	"disableExtensionsLabelText": "Versuchen Sie, das Problem nach {0} zu reproduzieren. Wenn das Problem nur bei aktiven Erweiterungen reproduziert werden kann, besteht wahrscheinlich ein Problem bei einer Erweiterung.",
-	"disableExtensions": "Alle Erweiterungen werden deaktiviert, und das Fenster wird neu geladen",
-	"chooseExtension": "Erweiterung",
-	"issueTitleLabel": "Titel",
-	"issueTitleRequired": "Geben Sie einen Titel ein.",
-	"titleLengthValidation": "Der Titel ist zu lang.",
-	"details": "Geben Sie Details ein.",
-	"sendSystemInfo": "Meine Systeminformationen einschließen ({0})",
-	"show": "Anzeigen",
-	"sendProcessInfo": "Meine derzeit ausgeführten Prozesse einschließen ({0})",
-	"sendWorkspaceInfo": "Metadaten zu meinem Arbeitsbereich einschließen ({0})",
-	"sendExtensions": "Meine aktivierten Erweiterungen einschließen ({0})",
-	"sendSearchedExtensions": "Gesuchte Erweiterungen senden ({0})",
-	"sendSettingsSearchDetails": "Details der Einstellungssuche senden ({0})"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/code/electron-browser/processExplorer/processExplorerMain.i18n.json b/i18n/deu/src/vs/code/electron-browser/processExplorer/processExplorerMain.i18n.json
deleted file mode 100644
index b9932f0e517..00000000000
--- a/i18n/deu/src/vs/code/electron-browser/processExplorer/processExplorerMain.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"cpu": "CPU (%)",
-	"memory": "Arbeitsspeicher (MB)",
-	"pid": "PID",
-	"name": "Name",
-	"killProcess": "Prozess beenden",
-	"forceKillProcess": "Beenden des Prozesses erzwingen",
-	"copy": "Kopieren",
-	"copyAll": "Alles kopieren"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/code/electron-main/auth.i18n.json b/i18n/deu/src/vs/code/electron-main/auth.i18n.json
deleted file mode 100644
index fa26814a783..00000000000
--- a/i18n/deu/src/vs/code/electron-main/auth.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"authRequire": "Proxyauthentifizierung erforderlich",
-	"proxyauth": "Der Proxy {0} erfordert eine Authentifizierung."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/code/electron-main/logUploader.i18n.json b/i18n/deu/src/vs/code/electron-main/logUploader.i18n.json
deleted file mode 100644
index 7a0072f18e2..00000000000
--- a/i18n/deu/src/vs/code/electron-main/logUploader.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"invalidEndpoint": "Ungültiger Protokolluploader-Endpunkt",
-	"beginUploading": "Wird hochgeladen …",
-	"didUploadLogs": "Upload erfolgreich! Protokolldatei-ID: {0}",
-	"logUploadPromptHeader": "Sie sind im Begriff, Ihre Sitzungsprotokolle auf einen sicheren Microsoft-Endpunkt hochzuladen, auf den nur Mitglieder des Microsoft VS Code-Teams zugreifen können.",
-	"logUploadPromptBody": "Sitzungsprotokolle können persönliche Informationen wie vollständige Pfade oder Inhalt der Datei enthalten. Bitte lesen und schwärzen Sie Ihre Sitzungsprotokolle hier: \"{0}\"",
-	"logUploadPromptBodyDetails": "Indem Sie fortfahren, bestätigen Sie, dass Sie Ihre Sitzungsprotokolle gelesen und geschwärzt haben und dass Microsoft diese benutzen kann, um VS Code zu debuggen.",
-	"logUploadPromptAcceptInstructions": "Führen Sie Code mit \"--upload-logs={0}\" aus, um den Upload fortzusetzen.",
-	"postError": "Fehler beim Veröffentlichen von Protokollen: {0}",
-	"responseError": "Fehler beim Veröffentlichen von Protokollen. Abgerufen: {0} – {1}",
-	"parseError": "Fehler beim Analysieren der Antwort",
-	"zipError": "Fehler beim Zippen der Protokolle: {0}"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/code/electron-main/main.i18n.json b/i18n/deu/src/vs/code/electron-main/main.i18n.json
deleted file mode 100644
index ae74a8461bc..00000000000
--- a/i18n/deu/src/vs/code/electron-main/main.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"secondInstanceNoResponse": "Eine andere Instanz von {0} läuft, reagiert aber nicht",
-	"secondInstanceNoResponseDetail": "Bitte schließen Sie alle anderen Instanzen, und versuchen Sie es erneut.",
-	"secondInstanceAdmin": "Eine zweite Instanz von {0} wird bereits als Administrator ausgeführt.",
-	"secondInstanceAdminDetail": "Bitte schließen Sie die andere Instanz, und versuchen Sie es erneut.",
-	"close": "&&Schließen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/code/electron-main/menus.i18n.json b/i18n/deu/src/vs/code/electron-main/menus.i18n.json
deleted file mode 100644
index 2c62aec3f22..00000000000
--- a/i18n/deu/src/vs/code/electron-main/menus.i18n.json
+++ /dev/null
@@ -1,193 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"mFile": "&&Datei",
-	"mEdit": "&&Bearbeiten",
-	"mSelection": "&&Auswahl",
-	"mView": "&&Anzeigen",
-	"mGoto": "Los",
-	"mDebug": "&&Debuggen",
-	"mWindow": "Fenster",
-	"mHelp": "&&Hilfe",
-	"mTask": "&&Aufgaben",
-	"miNewWindow": "Neues &&Fenster",
-	"mAbout": "Informationen zu {0}",
-	"mServices": "Dienste",
-	"mHide": "{0} ausblenden",
-	"mHideOthers": "Andere ausblenden",
-	"mShowAll": "Alle anzeigen",
-	"miQuit": "{0} beenden",
-	"miNewFile": "&&Neue Datei",
-	"miOpen": "&&Öffnen...",
-	"miOpenWorkspace": "Ar&&beitsbereich öffnen...",
-	"miOpenFolder": "&&Ordner öffnen...",
-	"miOpenFile": "Datei &&öffnen...",
-	"miOpenRecent": "&&Zuletzt verwendete öffnen",
-	"miSaveWorkspaceAs": "Arbeitsbereich speichern unter...",
-	"miAddFolderToWorkspace": "Or&&dner zu Arbeitsbereich hinzufügen...",
-	"miSave": "&&Speichern",
-	"miSaveAs": "Speichern &&unter...",
-	"miSaveAll": "A&&lles speichern",
-	"miAutoSave": "Automatisch speichern",
-	"miRevert": "D&&atei wiederherstellen",
-	"miCloseWindow": "&&Fenster schließen",
-	"miCloseWorkspace": "A&&rbeitsbereich schließen",
-	"miCloseFolder": "&&Ordner schließen",
-	"miCloseEditor": "Editor s&&chließen",
-	"miExit": "Beenden",
-	"miOpenSettings": "&&Einstellungen",
-	"miOpenKeymap": "&&Tastenkombinationen",
-	"miOpenKeymapExtensions": "&&Erweiterte Tastenzuordnungen",
-	"miOpenSnippets": "&&Benutzercodeausschnitte",
-	"miSelectColorTheme": "&&Farbdesign",
-	"miSelectIconTheme": "Datei-&&Symboldesign",
-	"miPreferences": "&&Einstellungen",
-	"miReopenClosedEditor": "&&Geschlossenen Editor erneut öffnen",
-	"miMore": "&&Mehr...",
-	"miClearRecentOpen": "Zul&&etzt geöffnete löschen",
-	"miUndo": "&&Rückgängig",
-	"miRedo": "&&Wiederholen",
-	"miCut": "Ausschneiden",
-	"miCopy": "&&Kopieren",
-	"miPaste": "&&Einfügen",
-	"miFind": "&&Suchen",
-	"miReplace": "&&Ersetzen",
-	"miFindInFiles": "&&In Dateien suchen",
-	"miReplaceInFiles": "&&In Dateien ersetzen",
-	"miEmmetExpandAbbreviation": "Emmet: Abkür&&zung erweitern",
-	"miShowEmmetCommands": "E&&mmet...",
-	"miToggleLineComment": "Zeilenkommen&&tar umschalten",
-	"miToggleBlockComment": "&&Blockkommentar umschalten",
-	"miMultiCursorAlt": "Für Multi-Cursor zu ALT+Mausklick wechseln",
-	"miMultiCursorCmd": "Für Multi-Cursor zu Befehlstaste+Mausklick wechseln",
-	"miMultiCursorCtrl": "Für Multi-Cursor zu STRG+Mausklick wechseln",
-	"miInsertCursorAbove": "Cursor oberh&&alb hinzufügen",
-	"miInsertCursorBelow": "Cursor unterhal&&b hinzufügen",
-	"miInsertCursorAtEndOfEachLineSelected": "C&&ursor an Zeilenenden hinzufügen",
-	"miAddSelectionToNextFindMatch": "&&Nächstes Vorkommen hinzufügen",
-	"miAddSelectionToPreviousFindMatch": "Vo&&rheriges Vorkommen hinzufügen",
-	"miSelectHighlights": "Alle V&&orkommen auswählen",
-	"miCopyLinesUp": "Zeile nach oben &&kopieren",
-	"miCopyLinesDown": "Zeile nach unten ko&&pieren",
-	"miMoveLinesUp": "Zeile nach oben &&verschieben",
-	"miMoveLinesDown": "Zeile nach &&unten verschieben",
-	"miSelectAll": "&&Alles auswählen",
-	"miSmartSelectGrow": "Auswahl &&erweitern",
-	"miSmartSelectShrink": "Au&&swahl verkleinern",
-	"miViewExplorer": "&&Explorer",
-	"miViewSearch": "&&Suchen",
-	"miViewSCM": "S&&CM",
-	"miViewDebug": "&&Debuggen",
-	"miViewExtensions": "E&&xtensions",
-	"miToggleOutput": "&&Ausgabe",
-	"miToggleDebugConsole": "De&&bugkonsole",
-	"miToggleIntegratedTerminal": "&&Integriertes Terminal",
-	"miMarker": "&&Probleme",
-	"miCommandPalette": "&&Befehlspalette...",
-	"miOpenView": "&&Ansicht öffnen …",
-	"miToggleFullScreen": "&&Vollbild umschalten",
-	"miToggleZenMode": "Zen-Modus umschalten",
-	"miToggleCenteredLayout": "Zentriertes Layout umschalten",
-	"miToggleMenuBar": "Men&&üleiste umschalten",
-	"miSplitEditor": "&&Editor teilen",
-	"miToggleEditorLayout": "&&Layout für Editor-Gruppe umschalten",
-	"miToggleSidebar": "&&Randleiste umschalten",
-	"miMoveSidebarRight": "&&Seitenleiste nach rechts verschieben",
-	"miMoveSidebarLeft": "&&Seitenleiste nach links verschieben",
-	"miTogglePanel": "&&Bereich umschalten",
-	"miHideStatusbar": "&&Statusleiste ausblenden",
-	"miShowStatusbar": "&&Statusleiste anzeigen",
-	"miHideActivityBar": "&&Aktivitätsleiste ausblenden",
-	"miShowActivityBar": "&&Aktivitätsleiste anzeigen",
-	"miToggleWordWrap": "&&Zeilenumbruch umschalten",
-	"miToggleMinimap": "&&Minikarte umschalten",
-	"miToggleRenderWhitespace": "&&Rendern von Leerzeichen umschalten",
-	"miToggleRenderControlCharacters": "&&Steuerzeichen umschalten",
-	"miZoomIn": "&&Vergrößern",
-	"miZoomOut": "Ver&&kleinern",
-	"miZoomReset": "&&Zoom zurücksetzen",
-	"miBack": "&&Zurück",
-	"miForward": "&&Vorwärts",
-	"miNextEditor": "&&Nächster Editor",
-	"miPreviousEditor": "&&Vorheriger Editor",
-	"miNextEditorInGroup": "&&Nächster verwendeter Editor in der Gruppe",
-	"miPreviousEditorInGroup": "&&Zuvor verwendeter Editor in der Gruppe",
-	"miSwitchEditor": "&&Editor wechseln",
-	"miFocusFirstGroup": "&&Erste Gruppe",
-	"miFocusSecondGroup": "&&Zweite Gruppe",
-	"miFocusThirdGroup": "&&Dritte Gruppe",
-	"miNextGroup": "&&Nächste Gruppe",
-	"miPreviousGroup": "&&Vorherige Gruppe",
-	"miSwitchGroup": "&&Gruppe wechseln",
-	"miGotoFile": "Gehe zu &&Datei...",
-	"miGotoSymbolInFile": "Gehe zu &&Symbol in Datei...",
-	"miGotoSymbolInWorkspace": "Zu Symbol im &&Arbeitsbereich wechseln...",
-	"miGotoDefinition": "Gehe &&zu Definition",
-	"miGotoTypeDefinition": "Wechsle zu &&Typdefinition",
-	"miGotoImplementation": "Wechsle zur &&Implementierung",
-	"miGotoLine": "Gehe zu &&Zeile...",
-	"miStartDebugging": "&&Debugging starten",
-	"miStartWithoutDebugging": "&&Ohne Debugging starten",
-	"miStopDebugging": "&&Debugging beenden",
-	"miRestart Debugging": "&&Debugging erneut starten",
-	"miOpenConfigurations": "&&Konfigurationen öffnen",
-	"miAddConfiguration": "Konfiguration hinzufügen...",
-	"miStepOver": "Prozedur&&schritt",
-	"miStepInto": "Einzelschr&&itt",
-	"miStepOut": "Rückspr&&ung",
-	"miContinue": "&&Fortfahren",
-	"miToggleBreakpoint": "Haltepunkt &&umschalten",
-	"miConditionalBreakpoint": "&&Bedingter Haltepunkt...",
-	"miInlineBreakpoint": "Inlinehaltep&&unkt",
-	"miFunctionBreakpoint": "&&Funktionshaltepunkt...",
-	"miLogPoint": "&&Protokollpunkt …",
-	"miNewBreakpoint": "&&Neuer Haltepunkt",
-	"miEnableAllBreakpoints": "Alle Haltepunkte aktivieren",
-	"miDisableAllBreakpoints": "A&&lle Haltepunkte deaktivieren",
-	"miRemoveAllBreakpoints": "&&Alle Haltepunkte entfernen",
-	"miInstallAdditionalDebuggers": "&&Zusätzliche Debugger installieren...",
-	"mMinimize": "Minimieren",
-	"mZoom": "Zoom",
-	"mBringToFront": "Alle in den Vordergrund",
-	"miSwitchWindow": "Fenster &&wechseln...",
-	"mShowPreviousTab": "Vorherige Registerkarte anzeigen",
-	"mShowNextTab": "Nächste Registerkarte anzeigen",
-	"mMoveTabToNewWindow": "Registerkarte in neues Fenster verschieben",
-	"mMergeAllWindows": "Alle Fenster zusammenführen",
-	"miToggleDevTools": "&&Entwicklertools umschalten",
-	"miAccessibilityOptions": "&&Optionen für erleichterte Bedienung",
-	"miOpenProcessExplorerer": "&&Prozess-Explorer öffnen",
-	"miReportIssue": "&&Problem melden",
-	"miWelcome": "&&Willkommen",
-	"miInteractivePlayground": "&&Interactive Spielwiese",
-	"miDocumentation": "&&Dokumentation",
-	"miReleaseNotes": "&&Anmerkungen zu dieser Version",
-	"miKeyboardShortcuts": "&&Referenz für Tastenkombinationen",
-	"miIntroductoryVideos": "&&Einführungsvideos",
-	"miTipsAndTricks": "&&Tipps und Tricks",
-	"miTwitter": "&&Twitter",
-	"miUserVoice": "&&Featureanforderungen suchen",
-	"miLicense": "&&Lizenz anzeigen",
-	"miPrivacyStatement": "&&Datenschutzerklärung",
-	"miAbout": "&&Info",
-	"miRunTask": "Aufgabe ausfüh&&ren...",
-	"miBuildTask": "&&Buildaufgabe ausführen...",
-	"miRunningTask": "Aktive Auf&&gaben anzeigen...",
-	"miRestartTask": "Aktuell&&e Aufgabe neu starten...",
-	"miTerminateTask": "&&Aufgabe beenden...",
-	"miConfigureTask": "Aufgaben &&konfigurieren...",
-	"miConfigureBuildTask": "Standardbuildaufgabe kon&&figurieren...",
-	"accessibilityOptionsWindowTitle": "Optionen für erleichterte Bedienung",
-	"miCheckForUpdates": "Nach Aktualisierungen suchen...",
-	"miCheckingForUpdates": "Überprüfen auf Updates...",
-	"miDownloadUpdate": "Verfügbares Update herunterladen",
-	"miDownloadingUpdate": "Das Update wird heruntergeladen...",
-	"miInstallUpdate": "Update installieren …",
-	"miInstallingUpdate": "Update wird installiert...",
-	"miRestartToUpdate": "Zum Aktualisieren neu starten..."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/code/electron-main/window.i18n.json b/i18n/deu/src/vs/code/electron-main/window.i18n.json
deleted file mode 100644
index f0b7a08f1f3..00000000000
--- a/i18n/deu/src/vs/code/electron-main/window.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hiddenMenuBar": "Sie können über die Alt-Taste weiterhin auf die Menüleiste zugreifen."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/code/electron-main/windows.i18n.json b/i18n/deu/src/vs/code/electron-main/windows.i18n.json
deleted file mode 100644
index 9d74eacc42f..00000000000
--- a/i18n/deu/src/vs/code/electron-main/windows.i18n.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"ok": "OK",
-	"pathNotExistTitle": "Der Pfad ist nicht vorhanden.",
-	"pathNotExistDetail": "Der Pfad \"{0}\" scheint auf dem Datenträger nicht mehr vorhanden zu sein.",
-	"reopen": "&&Erneut öffnen",
-	"wait": "&&Bitte warten",
-	"close": "&&Schließen",
-	"appStalled": "Das Fenster reagiert nicht mehr.",
-	"appStalledDetail": "Sie können das Fenster erneut öffnen oder schließen oder weiterhin warten.",
-	"appCrashed": "Das Fenster ist abgestürzt.",
-	"appCrashedDetail": "Bitte entschuldigen Sie die Unannehmlichkeiten. Sie können das Fenster erneut öffnen und dort weitermachen, wo Sie aufgehört haben.",
-	"open": "Öffnen",
-	"openFolder": "Ordner öffnen",
-	"openFile": "Datei öffnen",
-	"workspaceOpenedMessage": "Der Arbeitsbereich \"{0}\" kann nicht gespeichert werden.",
-	"workspaceOpenedDetail": "Der Arbeitsbereich ist bereits in einem anderen Fenster geöffnet. Schließen Sie zuerst das andere Fenster, und versuchen Sie anschließend noch mal.",
-	"openWorkspace": "&&Öffnen",
-	"openWorkspaceTitle": "Arbeitsbereich öffnen",
-	"save": "&&Speichern",
-	"doNotSave": "&&Nicht speichern",
-	"cancel": "Abbrechen",
-	"saveWorkspaceMessage": "Möchten Sie Ihre Arbeitsbereichskonfiguration als Datei speichern?",
-	"saveWorkspaceDetail": "Speichern Sie Ihren Arbeitsbereich, wenn Sie ihn erneut öffnen möchten.",
-	"saveWorkspace": "Arbeitsbereich speichern"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/code/node/cliProcessMain.i18n.json b/i18n/deu/src/vs/code/node/cliProcessMain.i18n.json
deleted file mode 100644
index 760b5040577..00000000000
--- a/i18n/deu/src/vs/code/node/cliProcessMain.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"notFound": "Die Erweiterung '{0}' wurde nicht gefunden.",
-	"notInstalled": "Die Erweiterung \"{0}\" ist nicht installiert.",
-	"useId": "Stellen Sie sicher, dass Sie die vollständige Erweiterungs-ID (einschließlich des Herausgebers) verwenden. Beispiel: {0}",
-	"successVsixInstall": "Die Erweiterung \"{0}\" wurde erfolgreich installiert.",
-	"cancelVsixInstall": "Installation der Erweiterung \"{0}\" abgebrochen.",
-	"alreadyInstalled": "Die Erweiterung \"{0}\" ist bereits installiert.",
-	"foundExtension": "\"{0}\" wurde in Marketplace gefunden.",
-	"installing": "Wird installiert...",
-	"successInstall": "Die Erweiterung \"{0}\" v{1} wurde erfolgreich installiert.",
-	"uninstalling": "{0} wird deinstalliert...",
-	"successUninstall": "Die Erweiterung \"{0}\" wurde erfolgreich deinstalliert."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/editor/browser/services/bulkEdit.i18n.json b/i18n/deu/src/vs/editor/browser/services/bulkEdit.i18n.json
deleted file mode 100644
index e2cea319b36..00000000000
--- a/i18n/deu/src/vs/editor/browser/services/bulkEdit.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"summary.0": "Keine Änderungen vorgenommen",
-	"summary.nm": "{0} Änderungen am Text in {1} Dateien vorgenommen",
-	"summary.n0": "{0} Änderungen am Text in einer Datei vorgenommen",
-	"conflict": "Die folgenden Dateien wurden in der Zwischenzeit geändert: {0}"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/editor/browser/widget/codeEditorWidget.i18n.json b/i18n/deu/src/vs/editor/browser/widget/codeEditorWidget.i18n.json
deleted file mode 100644
index ebc919fd7a6..00000000000
--- a/i18n/deu/src/vs/editor/browser/widget/codeEditorWidget.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"cursors.maximum": "Die Anzahl der Cursors wurde auf {0} beschränkt."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/editor/browser/widget/diffEditorWidget.i18n.json b/i18n/deu/src/vs/editor/browser/widget/diffEditorWidget.i18n.json
deleted file mode 100644
index ac5ede63bda..00000000000
--- a/i18n/deu/src/vs/editor/browser/widget/diffEditorWidget.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"diff.tooLarge": "Kann die Dateien nicht vergleichen, da eine Datei zu groß ist."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/editor/browser/widget/diffReview.i18n.json b/i18n/deu/src/vs/editor/browser/widget/diffReview.i18n.json
deleted file mode 100644
index c4864c872da..00000000000
--- a/i18n/deu/src/vs/editor/browser/widget/diffReview.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"label.close": "Schließen",
-	"no_lines": "keine Zeilen",
-	"one_line": "1 Zeile",
-	"more_lines": "{0} Zeilen",
-	"header": "Unterschied von {0} zu {1}: Original: {2}, {3}, geändert: {4}, {5}",
-	"blankLine": "leer",
-	"equalLine": "Original {0}, geändert {1}: {2}",
-	"insertLine": "+ geändert {0}: {1}",
-	"deleteLine": "- Original {0}: {1}",
-	"editor.action.diffReview.next": "Zum nächsten Unterschied wechseln",
-	"editor.action.diffReview.prev": "Zum vorherigen Unterschied wechseln"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/editor/common/commonCodeEditor.i18n.json b/i18n/deu/src/vs/editor/common/commonCodeEditor.i18n.json
deleted file mode 100644
index ebc919fd7a6..00000000000
--- a/i18n/deu/src/vs/editor/common/commonCodeEditor.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"cursors.maximum": "Die Anzahl der Cursors wurde auf {0} beschränkt."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/editor/common/config/commonEditorConfig.i18n.json b/i18n/deu/src/vs/editor/common/config/commonEditorConfig.i18n.json
deleted file mode 100644
index 0cb95fccc47..00000000000
--- a/i18n/deu/src/vs/editor/common/config/commonEditorConfig.i18n.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"editorConfigurationTitle": "Editor",
-	"fontFamily": "Steuert die Schriftfamilie.",
-	"fontWeight": "Steuert die Schriftbreite.",
-	"fontSize": "Steuert den Schriftgrad in Pixeln.",
-	"lineHeight": "Steuert die Zeilenhöhe. Verwenden Sie 0, um LineHeight aus der FontSize-Angabe zu berechnen.",
-	"letterSpacing": "Steuert den Zeichenabstand in Pixeln.",
-	"lineNumbers.off": "Zeilennummern werden nicht dargestellt.",
-	"lineNumbers.on": "Zeilennummern werden als absolute Zahl dargestellt.",
-	"lineNumbers.relative": "Zeilennummern werden als Abstand in Zeilen an Cursorposition dargestellt.",
-	"lineNumbers.interval": "Zeilennummern werden alle 10 Zeilen dargestellt.",
-	"lineNumbers": "Steuert die Anzeige von Zeilennummern.",
-	"rulers": "Vertikale Linien nach einer bestimmten Anzahl von Monospace Zeichen zeichnen. Verwenden Sie mehrere Werte für mehrere Linien. Keine Linie wird gezeichnet, wenn das Array leer ist.",
-	"wordSeparators": "Zeichen, die als Worttrennzeichen verwendet werden, wenn wortbezogene Navigationen oder Vorgänge ausgeführt werden.",
-	"tabSize": "Die Anzahl der Leerzeichen, denen ein Tabstopp entspricht. Diese Einstellung wird basierend auf dem Inhalt der Datei überschrieben, wenn \"editor.detectIndentation\" aktiviert ist.",
-	"tabSize.errorMessage": "\"number\" wurde erwartet. Beachten Sie, dass der Wert \"auto\" durch die Einstellung \"editor.detectIndentation\" ersetzt wurde.",
-	"insertSpaces": "Fügt beim Drücken der TAB-TASTE Leerzeichen ein. Diese Einstellung wird basierend auf dem Inhalt der Datei überschrieben, wenn \"editor.detectIndentation\" aktiviert ist.",
-	"insertSpaces.errorMessage": "\"boolean\" wurde erwartet. Beachten Sie, dass der Wert \"auto\" durch die Einstellung \"editor.detectIndentation\" ersetzt wurde.",
-	"detectIndentation": "Beim Öffnen einer Datei werden \"editor.tabSize\" und \"editor.insertSpaces\" basierend auf den Dateiinhalten erkannt.",
-	"roundedSelection": "Steuert, ob die Auswahl runde Ecken aufweist.",
-	"scrollBeyondLastLine": "Legt fest, ob der Editor Bildläufe über die letzte Zeile hinaus ausführt.",
-	"scrollBeyondLastColumn": "Steuert die Anzahl der zusätzlichen Zeichen, nach denen der Editor horizontal scrollt.",
-	"smoothScrolling": "Legt fest, ob der Editor Bildläufe animiert ausführt.",
-	"minimap.enabled": "Steuert, ob die Minikarte angezeigt wird",
-	"minimap.side": "Steuert die Seite, wo die Minikarte gerendert wird.",
-	"minimap.showSlider": "Steuert, ob der Minimap-Schieberegler automatisch ausgeblendet wird.",
-	"minimap.renderCharacters": "Die tatsächlichen Zeichen in einer Zeile rendern (im Gegensatz zu Farbblöcken)",
-	"minimap.maxColumn": "Breite der Minikarte beschränken, um höchstens eine bestimmte Anzahl von Spalten zu rendern",
-	"find.seedSearchStringFromSelection": "Steuert, ob wir für die Suchzeichenfolge im Suchwidget aus der Editorauswahl ein Seeding ausführen.",
-	"find.autoFindInSelection": "Steuert, ob die Kennzeichnung \"In Auswahl suchen\" aktiviert ist, wenn mehrere Zeichen oder Textzeilen im Editor ausgewählt wurden.",
-	"find.globalFindClipboard": "Steuert, ob das Widget Suchen lesen oder die gemeinsame Such-Zwischenablage im MacOS ändern soll.",
-	"wordWrap.off": "Zeilenumbrüche erfolgen nie.",
-	"wordWrap.on": "Der Zeilenumbruch erfolgt an der Breite des Anzeigebereichs.",
-	"wordWrap.wordWrapColumn": "Der Zeilenbereich erfolgt bei \"editor.wordWrapColumn\".",
-	"wordWrap.bounded": "Der Zeilenumbruch erfolgt beim Mindestanzeigebereich und \"editor.wordWrapColumn\".",
-	"wordWrap": "Steuert den Zeilenumbruch. Mögliche Einstellungen sind:\n - \"off\" (Umbruch deaktivieren),\n - \"on\" (Anzeigebereichsumbruch),\n - \"wordWrapColumn\" (Umbruch bei \"editor.wordWrapColumn\") oder\n - \"bounded\" (der Zeilenumbruch erfolgt beim Mindestanzeigebereich und \"editor.wordWrapColumn\").",
-	"wordWrapColumn": "Steuert die Umbruchspalte des Editors, wenn für \"editor.wordWrap\" die Option \"wordWrapColumn\" oder \"bounded\" festgelegt ist.",
-	"wrappingIndent": "Steuert den Einzug umbrochener Zeilen. Der Wert kann „none“, „same“, „indent“ oder „deepIndent“ sein.",
-	"mouseWheelScrollSensitivity": "Ein Multiplikator, der für die Mausrad-Bildlaufereignisse \"deltaX\" und \"deltaY\" verwendet werden soll.",
-	"multiCursorModifier.ctrlCmd": "Ist unter Windows und Linux der Taste \"STRG\" und unter macOSX der Befehlstaste zugeordnet.",
-	"multiCursorModifier.alt": "Ist unter Windows und Linux der Taste \"Alt\" und unter macOSX der Wahltaste zugeordnet. ",
-	"multiCursorModifier": "Der Modifizierer, der zum Hinzufügen mehrerer Cursor mit der Maus verwendet wird. \"ctrlCmd\" wird unter Windows und Linux der Taste \"STRG\" und unter macOSX der Befehlstaste zugeordnet. Die Mausbewegungen \"Gehe zu Definition\" und \"Link öffnen\" werden so angepasst, dass kein Konflikt mit dem Multi-Cursor-Modifizierer entsteht.",
-	"multiCursorMergeOverlapping": "Mehrere Cursor zusammenführen, wenn sie sich überlappen.",
-	"quickSuggestions.strings": "Schnellvorschläge innerhalb von Zeichenfolgen aktivieren.",
-	"quickSuggestions.comments": "Schnellvorschläge innerhalb von Kommentaren aktivieren.",
-	"quickSuggestions.other": "Schnellvorschläge außerhalb von Zeichenfolgen und Kommentaren aktivieren.",
-	"quickSuggestions": "Steuert, ob Vorschläge während der Eingabe automatisch angezeigt werden sollen.",
-	"quickSuggestionsDelay": "Steuert die Verzögerung in ms für die Anzeige der Schnellvorschläge.",
-	"parameterHints": "Aktiviert ein Pop-Up, das Parameter-Dokumentation und Typ-Information während des Tippens anzeigt",
-	"autoClosingBrackets": "Steuert, ob der Editor Klammern automatisch nach dem Öffnen schließt.",
-	"formatOnType": "Steuert, ob der Editor Zeilen automatisch nach der Eingabe formatiert.",
-	"formatOnPaste": "Steuert, ob der Editor den eingefügten Inhalt automatisch formatiert.",
-	"autoIndent": "Steuert, ob der Editor die Einzüge automatisch anpasst, wenn Benutzer Text eingeben oder Zeilen einfügen oder verschieben. Einzugsregeln der Sprache müssen verfügbar sein. ",
-	"suggestOnTriggerCharacters": "Steuert, ob Vorschläge automatisch bei der Eingabe von Triggerzeichen angezeigt werden.",
-	"acceptSuggestionOnEnter": "Steuert, ob Vorschläge über die Eingabetaste (zusätzlich zur TAB-Taste) angenommen werden sollen. Vermeidet Mehrdeutigkeit zwischen dem Einfügen neuer Zeilen oder dem Annehmen von Vorschlägen. Der Wert \"smart\" bedeutet, dass ein Vorschlag nur über die Eingabetaste akzeptiert wird, wenn eine Textänderung vorgenommen wird.",
-	"acceptSuggestionOnCommitCharacter": "Steuert, ob Vorschläge über Commitzeichen angenommen werden sollen. In JavaScript kann ein Semikolon (\";\") beispielsweise ein Commitzeichen sein, das einen Vorschlag annimmt und dieses Zeichen eingibt.",
-	"snippetSuggestions.top": "Zeige Snippet Vorschläge über den anderen Vorschlägen.",
-	"snippetSuggestions.bottom": "Snippet Vorschläge unter anderen Vorschlägen anzeigen.",
-	"snippetSuggestions.inline": "Zeige Snippet Vorschläge mit anderen Vorschlägen.",
-	"snippetSuggestions.none": "Snippet Vorschläge nicht anzeigen.",
-	"snippetSuggestions": "Steuert, ob Codeausschnitte mit anderen Vorschlägen angezeigt und wie diese sortiert werden.",
-	"emptySelectionClipboard": "Steuert, ob ein Kopiervorgang ohne Auswahl die aktuelle Zeile kopiert.",
-	"wordBasedSuggestions": "Steuert, ob Vervollständigungen auf Grundlage der Wörter im Dokument berechnet werden sollen.",
-	"suggestSelection.first": "Immer den ersten Vorschlag auswählen.",
-	"suggestSelection.recentlyUsed": "Zuletzt verwendete Vorschläge auswählen, sofern keiner durch eine weitere Eingabe ausgewählt wird. Beispiel: \"console.l\" -> \"console.log\", da \"log\" vor Kurzem vervollständigt wurde.",
-	"suggestSelection.recentlyUsedByPrefix": "Vorschläge auf Grundlage vorheriger Präfixe auswählen, die diese Vorschläge vervollständigt haben. Beispiel: \"co\" -> \"console\" und \"con\" -> \"const\".",
-	"suggestSelection": "Steuert, wie Vorschläge bei Anzeige der Vorschlagsliste vorab ausgewählt werden.",
-	"suggestFontSize": "Schriftgröße für Vorschlagswidget",
-	"suggestLineHeight": "Zeilenhöhe für Vorschlagswidget",
-	"selectionHighlight": "Steuert, ob der Editor der Auswahl ähnelnde Übereinstimmungen hervorheben soll.",
-	"occurrencesHighlight": "Steuert, ob der Editor das Vorkommen semantischer Symbole markieren soll.",
-	"overviewRulerLanes": "Steuert die Anzahl von Dekorationen, die an derselben Position im Übersichtslineal angezeigt werden.",
-	"overviewRulerBorder": "Steuert, ob um das Übersichtslineal ein Rahmen gezeichnet werden soll.",
-	"cursorBlinking": "Steuert den Cursoranimationsstil.",
-	"mouseWheelZoom": "Schriftart des Editors vergrößern, wenn das Mausrad verwendet und die STRG-TASTE gedrückt wird",
-	"cursorStyle": "Steuert den Cursorstil. Gültige Werte sind  \"block\", \"block-outline\", \"line\", \"line-thin\", \"underline\" und \"underline-thin\".",
-	"cursorWidth": "Steuert die Breite des Cursors, falls editor.cursorStyle auf \"line\" gestellt ist.",
-	"fontLigatures": "Aktiviert Schriftartligaturen.",
-	"hideCursorInOverviewRuler": "Steuert die Sichtbarkeit des Cursors im Übersichtslineal.",
-	"renderWhitespace": "Steuert, wie der Editor Leerzeichen rendert. Mögliche Optionen: \"none\", \"boundary\" und \"all\". Die Option \"boundary\" rendert keine einzelnen Leerzeichen zwischen Wörtern.",
-	"renderControlCharacters": "Steuert, ob der Editor Steuerzeichen rendern soll.",
-	"renderIndentGuides": "Steuert, ob der Editor Einzugsführungslinien rendern soll.",
-	"renderLineHighlight": "Steuert, wie der Editor die aktuelle Zeilenhervorhebung rendern soll. Mögliche Werte sind \"none\", \"gutter\", \"line\" und \"all\".",
-	"codeLens": "Steuert, ob der Editor CodeLens anzeigt.",
-	"folding": "Steuert, ob für den Editor Codefaltung aktiviert ist.",
-	"foldingStrategyAuto": "Falls vorhanden, eine sprachspezifische Strategie für das Codefaltung verwenden, ansonsten wird die einrückungsbasierte Strategie genutzt.",
-	"foldingStrategyIndentation": "Immer die einrückungsbasierte Strategie zur Codefaltung nutzen",
-	"foldingStrategy": "Steuert die Art und Weise, wie Faltungsbereiche berechnet werden. \"auto\" verwendet eine sprachspezifische Strategie für die Codefaltung, sofern verfügbar. \"indentation\" erzwingt eine einrückungsbasierte Strategie zur Codefaltung.",
-	"showFoldingControls": "Steuert, ob die Falt-Steuerelemente an der Leiste automatisch ausgeblendet werden.",
-	"matchBrackets": "Übereinstimmende Klammern hervorheben, wenn eine davon ausgewählt wird.",
-	"glyphMargin": "Steuert, ob der Editor den vertikalen Glyphenrand rendert. Der Glyphenrand wird hauptsächlich zum Debuggen verwendet.",
-	"useTabStops": "Das Einfügen und Löschen von Leerzeichen folgt auf Tabstopps.",
-	"trimAutoWhitespace": "Nachfolgendes automatisch eingefügtes Leerzeichen entfernen",
-	"stablePeek": "Peek-Editoren geöffnet lassen, auch wenn auf ihren Inhalt doppelgeklickt oder die ESC-TASTE gedrückt wird.",
-	"dragAndDrop": "Steuert, ob der Editor das Verschieben einer Auswahl per Drag and Drop zulässt.",
-	"accessibilitySupport.auto": "Der Editor verwendet Plattform-APIs, um zu erkennen, wenn eine Sprachausgabe angefügt wird.",
-	"accessibilitySupport.on": "Der Editor wird durchgehend für die Verwendung mit einer Sprachausgabe optimiert.",
-	"accessibilitySupport.off": "Der Editor wird nie für die Verwendung mit einer Sprachausgabe optimiert. ",
-	"accessibilitySupport": "Steuert, ob der Editor in einem Modus ausgeführt werden soll, in dem er für die Sprachausgabe optimiert wird.",
-	"links": "Steuert, ob der Editor Links erkennen und anklickbar machen soll",
-	"colorDecorators": "Steuert, ob der Editor die Inline-Farbdecorators und die Farbauswahl rendern soll.",
-	"codeActions": "Ermöglicht die Code-Aktion \"lightbulb\"",
-	"codeActionsOnSave.organizeImports": "Ein Organisieren der Importe beim Speichern ausführen?",
-	"codeActionsOnSave": "Arten von Codeaktionen, die beim Speichern ausgeführt werden sollen.",
-	"codeActionsOnSaveTimeout": "Timeout für Codeaktionen, die beim Speichern ausgeführt werden.",
-	"selectionClipboard": "Steuert, ob die primäre Linux-Zwischenablage unterstützt werden soll.",
-	"sideBySide": "Steuert, ob der Diff-Editor das Diff nebeneinander oder inline anzeigt.",
-	"ignoreTrimWhitespace": "Steuert, ob der Diff-Editor Änderungen in führenden oder nachgestellten Leerzeichen als Diffs anzeigt.",
-	"largeFileOptimizations": "Spezielle Behandlung für große Dateien zum Deaktivieren bestimmter speicherintensiver Funktionen.",
-	"renderIndicators": "Steuert, ob der Diff-Editor die Indikatoren \"+\" und \"-\" für hinzugefügte/entfernte Änderungen anzeigt."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/editor/common/config/defaultConfig.i18n.json b/i18n/deu/src/vs/editor/common/config/defaultConfig.i18n.json
deleted file mode 100644
index 2e06d6b808a..00000000000
--- a/i18n/deu/src/vs/editor/common/config/defaultConfig.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"editorViewAccessibleLabel": "Editor-Inhalt"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/editor/common/config/editorOptions.i18n.json b/i18n/deu/src/vs/editor/common/config/editorOptions.i18n.json
deleted file mode 100644
index b6fa0c077d7..00000000000
--- a/i18n/deu/src/vs/editor/common/config/editorOptions.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"accessibilityOffAriaLabel": "Der Editor ist zurzeit nicht verfügbar. Drücken Sie Alt+F1 für Optionen.",
-	"editorViewAccessibleLabel": "Editor-Inhalt"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/editor/common/controller/cursor.i18n.json b/i18n/deu/src/vs/editor/common/controller/cursor.i18n.json
deleted file mode 100644
index 16f03ef537c..00000000000
--- a/i18n/deu/src/vs/editor/common/controller/cursor.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"corrupt.commands": "Unerwartete Ausnahme beim Ausführen des Befehls."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/editor/common/model/textModelWithTokens.i18n.json b/i18n/deu/src/vs/editor/common/model/textModelWithTokens.i18n.json
deleted file mode 100644
index 9facc3bb9ad..00000000000
--- a/i18n/deu/src/vs/editor/common/model/textModelWithTokens.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"mode.tokenizationSupportFailed": "Fehler des Modus bei der Tokenumwandlung der Eingabe."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/editor/common/modes/modesRegistry.i18n.json b/i18n/deu/src/vs/editor/common/modes/modesRegistry.i18n.json
deleted file mode 100644
index 4d909521ec7..00000000000
--- a/i18n/deu/src/vs/editor/common/modes/modesRegistry.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"plainText.alias": "Nur-Text"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/editor/common/services/bulkEdit.i18n.json b/i18n/deu/src/vs/editor/common/services/bulkEdit.i18n.json
deleted file mode 100644
index d7541e30bc7..00000000000
--- a/i18n/deu/src/vs/editor/common/services/bulkEdit.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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": "Die folgenden Dateien wurden in der Zwischenzeit geändert: {0}",
-	"summary.0": "Keine Änderungen vorgenommen",
-	"summary.nm": "{0} Änderungen am Text in {1} Dateien vorgenommen",
-	"summary.n0": "{0} Änderungen am Text in einer Datei vorgenommen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/editor/common/services/modeServiceImpl.i18n.json b/i18n/deu/src/vs/editor/common/services/modeServiceImpl.i18n.json
deleted file mode 100644
index 137142bcd8d..00000000000
--- a/i18n/deu/src/vs/editor/common/services/modeServiceImpl.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"vscode.extension.contributes.languages": "Contributes-Sprachdeklarationen",
-	"vscode.extension.contributes.languages.id": "Die ID der Sprache.",
-	"vscode.extension.contributes.languages.aliases": "Namealiase für die Sprache.",
-	"vscode.extension.contributes.languages.extensions": "Dateierweiterungen, die der Sprache zugeordnet sind.",
-	"vscode.extension.contributes.languages.filenames": "Dateinamen, die der Sprache zugeordnet sind.",
-	"vscode.extension.contributes.languages.filenamePatterns": "Dateinamen-Globmuster, die Sprache zugeordnet sind.",
-	"vscode.extension.contributes.languages.mimetypes": "MIME-Typen, die der Sprache zugeordnet sind.",
-	"vscode.extension.contributes.languages.firstLine": "Ein regulärer Ausdruck, der mit der ersten Zeile einer Datei der Sprache übereinstimmt.",
-	"vscode.extension.contributes.languages.configuration": "Ein relativer Pfad zu einer Datei mit Konfigurationsoptionen für die Sprache."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/editor/common/services/modelServiceImpl.i18n.json b/i18n/deu/src/vs/editor/common/services/modelServiceImpl.i18n.json
deleted file mode 100644
index e12a9398484..00000000000
--- a/i18n/deu/src/vs/editor/common/services/modelServiceImpl.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"diagAndSourceMultiline": "[{0}]\n{1}",
-	"diagAndSource": "[{0}] {1}"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/editor/common/view/editorColorRegistry.i18n.json b/i18n/deu/src/vs/editor/common/view/editorColorRegistry.i18n.json
deleted file mode 100644
index 7bcd160f251..00000000000
--- a/i18n/deu/src/vs/editor/common/view/editorColorRegistry.i18n.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"lineHighlight": "Hintergrundfarbe zur Hervorhebung der Zeile an der Cursorposition.",
-	"lineHighlightBorderBox": "Hintergrundfarbe für den Rahmen um die Zeile an der Cursorposition.",
-	"rangeHighlight": "Hintergrundfarbe hervorgehobener Bereiche, beispielsweise durch Features wie Quick Open und Suche. Die Farbe muss durchsichtig sein, um dahinterliegende Dekorationen nicht zu verbergen. ",
-	"rangeHighlightBorder": "Hintergrundfarbe für den Rahmen um hervorgehobene Bereiche.",
-	"caret": "Farbe des Cursors im Editor.",
-	"editorCursorBackground": "Hintergrundfarbe vom Editor-Cursor. Erlaubt die Anpassung der Farbe von einem Zeichen, welches von einem Block-Cursor überdeckt wird.",
-	"editorWhitespaces": "Farbe der Leerzeichen im Editor.",
-	"editorIndentGuides": "Farbe der Führungslinien für Einzüge im Editor.",
-	"editorActiveIndentGuide": "Farbe der Führungslinien für Einzüge im aktiven Editor.",
-	"editorLineNumbers": "Zeilennummernfarbe im Editor.",
-	"editorActiveLineNumber": "Zeilennummernfarbe der aktiven Editorzeile.",
-	"deprecatedEditorActiveLineNumber": "ID ist veraltet. Verwenden Sie stattdessen \"editorLineNumber.activeForeground\".",
-	"editorRuler": "Farbe des Editor-Lineals.",
-	"editorCodeLensForeground": "Vordergrundfarbe der CodeLens-Links im Editor",
-	"editorBracketMatchBackground": "Hintergrundfarbe für zusammengehörige Klammern",
-	"editorBracketMatchBorder": "Farbe für zusammengehörige Klammern",
-	"editorOverviewRulerBorder": "Farbe des Rahmens für das Übersicht-Lineal.",
-	"editorGutter": "Hintergrundfarbe der Editorleiste. Die Leiste enthält die Glyphenränder und die Zeilennummern.",
-	"errorForeground": "Vordergrundfarbe von Fehlerunterstreichungen im Editor.",
-	"errorBorder": "Rahmenfarbe von Fehlerunterstreichungen im Editor.",
-	"warningForeground": "Vordergrundfarbe von Warnungsunterstreichungen im Editor.",
-	"warningBorder": "Rahmenfarbe von Warnungsunterstreichungen im Editor.",
-	"infoForeground": "Vordergrundfarbe von Informationsunterstreichungen im Editor.",
-	"infoBorder": "Rahmenfarbe von Informationsunterstreichungen im Editor.",
-	"hintForeground": "Vordergrundfarbe der Hinweisunterstreichungen im Editor.",
-	"hintBorder": "Rahmenfarbe der Hinweisunterstreichungen im Editor.",
-	"unnecessaryForeground": "Vordergrundfarbe für nicht benötigten Code im Editor.",
-	"overviewRulerRangeHighlight": "Übersichtslineal-Markierungsfarbe für Bereichshervorhebungen. Die Farbe muss durchsichtig sein, um dahinterliegende Dekorationen nicht zu verbergen.",
-	"overviewRuleError": "Übersichtslineal-Markierungsfarbe für Fehler.",
-	"overviewRuleWarning": "Übersichtslineal-Markierungsfarbe für Warnungen.",
-	"overviewRuleInfo": "Übersichtslineal-Markierungsfarbe für Informationen."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/editor/contrib/accessibility/browser/accessibility.i18n.json b/i18n/deu/src/vs/editor/contrib/accessibility/browser/accessibility.i18n.json
deleted file mode 100644
index db6ed16593d..00000000000
--- a/i18n/deu/src/vs/editor/contrib/accessibility/browser/accessibility.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"introMsg": "Vielen Dank, dass Sie die Optionen für Barrierefreiheit von VS Code testen.",
-	"status": "Status:",
-	"tabFocusModeOnMsg": "Durch Drücken der TAB-TASTE im aktuellen Editor wird der Fokus in das nächste Element verschoben, das den Fokus erhalten kann. Schalten Sie dieses Verhalten um, indem Sie {0} drücken.",
-	"tabFocusModeOnMsgNoKb": "Durch Drücken der TAB-TASTE im aktuellen Editor wird der Fokus in das nächste Element verschoben, das den Fokus erhalten kann. Der {0}-Befehl kann zurzeit nicht durch eine Tastenzuordnung ausgelöst werden.",
-	"tabFocusModeOffMsg": "Durch Drücken der TAB-TASTE im aktuellen Editor wird das Tabstoppzeichen eingefügt. Schalten Sie dieses Verhalten um, indem Sie {0} drücken.",
-	"tabFocusModeOffMsgNoKb": "Durch Drücken der TAB-TASTE im aktuellen Editor wird das Tabstoppzeichen eingefügt. Der {0}-Befehl kann zurzeit nicht durch eine Tastenzuordnung ausgelöst werden.",
-	"outroMsg": "Sie können diese QuickInfo schließen und durch Drücken von ESC zum Editor zurückkehren.",
-	"ShowAccessibilityHelpAction": "Hilfe zur Barrierefreiheit anzeigen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/editor/contrib/bracketMatching/bracketMatching.i18n.json b/i18n/deu/src/vs/editor/contrib/bracketMatching/bracketMatching.i18n.json
deleted file mode 100644
index 8450469b056..00000000000
--- a/i18n/deu/src/vs/editor/contrib/bracketMatching/bracketMatching.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"overviewRulerBracketMatchForeground": "Übersichtslineal-Markierungsfarbe für zusammengehörige Klammern.",
-	"smartSelect.jumpBracket": "Gehe zu Klammer",
-	"smartSelect.selectToBracket": "Auswählen bis Klammer"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/editor/contrib/bracketMatching/common/bracketMatching.i18n.json b/i18n/deu/src/vs/editor/contrib/bracketMatching/common/bracketMatching.i18n.json
deleted file mode 100644
index d357fb74a7c..00000000000
--- a/i18n/deu/src/vs/editor/contrib/bracketMatching/common/bracketMatching.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"smartSelect.jumpBracket": "Gehe zu Klammer"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/editor/contrib/caretOperations/caretOperations.i18n.json b/i18n/deu/src/vs/editor/contrib/caretOperations/caretOperations.i18n.json
deleted file mode 100644
index 9e7603cd24b..00000000000
--- a/i18n/deu/src/vs/editor/contrib/caretOperations/caretOperations.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"caret.moveLeft": "Caretzeichen nach links verschieben",
-	"caret.moveRight": "Caretzeichen nach rechts verschieben"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/editor/contrib/caretOperations/common/caretOperations.i18n.json b/i18n/deu/src/vs/editor/contrib/caretOperations/common/caretOperations.i18n.json
deleted file mode 100644
index e7167388d84..00000000000
--- a/i18n/deu/src/vs/editor/contrib/caretOperations/common/caretOperations.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"caret.moveLeft": "Caretzeichen nach links verschieben",
-	"caret.moveRight": "Caretzeichen nach rechts verschieben"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/editor/contrib/caretOperations/common/transpose.i18n.json b/i18n/deu/src/vs/editor/contrib/caretOperations/common/transpose.i18n.json
deleted file mode 100644
index 45360f52384..00000000000
--- a/i18n/deu/src/vs/editor/contrib/caretOperations/common/transpose.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"transposeLetters.label": "Buchstaben austauschen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/editor/contrib/caretOperations/transpose.i18n.json b/i18n/deu/src/vs/editor/contrib/caretOperations/transpose.i18n.json
deleted file mode 100644
index a1954837fda..00000000000
--- a/i18n/deu/src/vs/editor/contrib/caretOperations/transpose.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"transposeLetters.label": "Buchstaben austauschen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/editor/contrib/clipboard/browser/clipboard.i18n.json b/i18n/deu/src/vs/editor/contrib/clipboard/browser/clipboard.i18n.json
deleted file mode 100644
index 922dc8181a6..00000000000
--- a/i18n/deu/src/vs/editor/contrib/clipboard/browser/clipboard.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"actions.clipboard.cutLabel": "Ausschneiden",
-	"actions.clipboard.copyLabel": "Kopieren",
-	"actions.clipboard.pasteLabel": "Einfügen",
-	"actions.clipboard.copyWithSyntaxHighlightingLabel": "Mit Syntaxhervorhebung kopieren"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/editor/contrib/clipboard/clipboard.i18n.json b/i18n/deu/src/vs/editor/contrib/clipboard/clipboard.i18n.json
deleted file mode 100644
index 3c7b48eb085..00000000000
--- a/i18n/deu/src/vs/editor/contrib/clipboard/clipboard.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"actions.clipboard.cutLabel": "Ausschneiden",
-	"actions.clipboard.copyLabel": "Kopieren",
-	"actions.clipboard.pasteLabel": "Einfügen",
-	"actions.clipboard.copyWithSyntaxHighlightingLabel": "Mit Syntaxhervorhebung kopieren"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/editor/contrib/codeAction/codeActionCommands.i18n.json b/i18n/deu/src/vs/editor/contrib/codeAction/codeActionCommands.i18n.json
deleted file mode 100644
index 87a58e790f1..00000000000
--- a/i18n/deu/src/vs/editor/contrib/codeAction/codeActionCommands.i18n.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"quickFixWithKb": "Korrekturen anzeigen ({0})",
-	"quickFix": "Korrekturen anzeigen",
-	"quickfix.trigger.label": "Schnelle Problembehebung …",
-	"editor.action.quickFix.noneMessage": "Keine Codeaktionen verfügbar",
-	"refactor.label": "Refactoring durchführen...",
-	"editor.action.refactor.noneMessage": "Keine Refactorings verfügbar",
-	"source.label": "Quellaktion…",
-	"editor.action.source.noneMessage": "Keine Quellaktionen verfügbar",
-	"organizeImports.label": "Importe organisieren",
-	"editor.action.organize.noneMessage": "Keine Aktion zum Organisieren von Importen verfügbar"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/editor/contrib/comment/comment.i18n.json b/i18n/deu/src/vs/editor/contrib/comment/comment.i18n.json
deleted file mode 100644
index 31ec1234b35..00000000000
--- a/i18n/deu/src/vs/editor/contrib/comment/comment.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"comment.line": "Zeilenkommentar umschalten",
-	"comment.line.add": "Zeilenkommentar hinzufügen",
-	"comment.line.remove": "Zeilenkommentar entfernen",
-	"comment.block": "Blockkommentar umschalten"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/editor/contrib/comment/common/comment.i18n.json b/i18n/deu/src/vs/editor/contrib/comment/common/comment.i18n.json
deleted file mode 100644
index 70898acfa34..00000000000
--- a/i18n/deu/src/vs/editor/contrib/comment/common/comment.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"comment.line": "Zeilenkommentar umschalten",
-	"comment.line.add": "Zeilenkommentar hinzufügen",
-	"comment.line.remove": "Zeilenkommentar entfernen",
-	"comment.block": "Blockkommentar umschalten"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/editor/contrib/contextmenu/browser/contextmenu.i18n.json b/i18n/deu/src/vs/editor/contrib/contextmenu/browser/contextmenu.i18n.json
deleted file mode 100644
index 2b06743ac4a..00000000000
--- a/i18n/deu/src/vs/editor/contrib/contextmenu/browser/contextmenu.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"action.showContextMenu.label": "Editor-Kontextmenü anzeigen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/editor/contrib/contextmenu/contextmenu.i18n.json b/i18n/deu/src/vs/editor/contrib/contextmenu/contextmenu.i18n.json
deleted file mode 100644
index 43da0fcc89b..00000000000
--- a/i18n/deu/src/vs/editor/contrib/contextmenu/contextmenu.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"action.showContextMenu.label": "Editor-Kontextmenü anzeigen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/editor/contrib/find/browser/findWidget.i18n.json b/i18n/deu/src/vs/editor/contrib/find/browser/findWidget.i18n.json
deleted file mode 100644
index 62d72aaf355..00000000000
--- a/i18n/deu/src/vs/editor/contrib/find/browser/findWidget.i18n.json
+++ /dev/null
@@ -1,21 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"label.find": "Suchen",
-	"placeholder.find": "Suchen",
-	"label.previousMatchButton": "Vorherige Übereinstimmung",
-	"label.nextMatchButton": "Nächste Übereinstimmung",
-	"label.toggleSelectionFind": "In Auswahl suchen",
-	"label.closeButton": "Schließen",
-	"label.replace": "Ersetzen",
-	"placeholder.replace": "Ersetzen",
-	"label.replaceButton": "Ersetzen",
-	"label.replaceAllButton": "Alle ersetzen",
-	"label.toggleReplaceButton": "Ersetzen-Modus wechseln",
-	"title.matchesCountLimit": "Nur die ersten {0} Ergebnisse wurden hervorgehoben, aber alle Suchoperationen werden auf dem gesamten Text durchgeführt.",
-	"label.matchesLocation": "{0} von {1}",
-	"label.noResults": "Keine Ergebnisse"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/editor/contrib/find/browser/simpleFindWidget.i18n.json b/i18n/deu/src/vs/editor/contrib/find/browser/simpleFindWidget.i18n.json
deleted file mode 100644
index 32db8ee0bd6..00000000000
--- a/i18n/deu/src/vs/editor/contrib/find/browser/simpleFindWidget.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"label.find": "Suchen",
-	"placeholder.find": "Suchen",
-	"label.previousMatchButton": "Vorherige Übereinstimmung",
-	"label.nextMatchButton": "Nächste Übereinstimmung",
-	"label.closeButton": "Schließen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/editor/contrib/find/common/findController.i18n.json b/i18n/deu/src/vs/editor/contrib/find/common/findController.i18n.json
deleted file mode 100644
index 966c9eafe93..00000000000
--- a/i18n/deu/src/vs/editor/contrib/find/common/findController.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"startFindAction": "Suchen",
-	"findNextMatchAction": "Nächstes Element suchen",
-	"findPreviousMatchAction": "Vorheriges Element suchen",
-	"nextSelectionMatchFindAction": "Nächste Auswahl suchen",
-	"previousSelectionMatchFindAction": "Vorherige Auswahl suchen",
-	"startReplace": "Ersetzen",
-	"showNextFindTermAction": "Nächsten Suchbegriff anzeigen",
-	"showPreviousFindTermAction": "Vorherigen Suchbegriff anzeigen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/editor/contrib/find/findController.i18n.json b/i18n/deu/src/vs/editor/contrib/find/findController.i18n.json
deleted file mode 100644
index a7f9cc22ac0..00000000000
--- a/i18n/deu/src/vs/editor/contrib/find/findController.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"startFindAction": "Suchen",
-	"startFindWithSelectionAction": "Mit Auswahl suchen",
-	"findNextMatchAction": "Nächstes Element suchen",
-	"findPreviousMatchAction": "Vorheriges Element suchen",
-	"nextSelectionMatchFindAction": "Nächste Auswahl suchen",
-	"previousSelectionMatchFindAction": "Vorherige Auswahl suchen",
-	"startReplace": "Ersetzen",
-	"showNextFindTermAction": "Nächsten Suchbegriff anzeigen",
-	"showPreviousFindTermAction": "Vorherigen Suchbegriff anzeigen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/editor/contrib/find/findWidget.i18n.json b/i18n/deu/src/vs/editor/contrib/find/findWidget.i18n.json
deleted file mode 100644
index e921421f513..00000000000
--- a/i18n/deu/src/vs/editor/contrib/find/findWidget.i18n.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"label.find": "Suchen",
-	"placeholder.find": "Suchen",
-	"label.previousMatchButton": "Vorherige Übereinstimmung",
-	"label.nextMatchButton": "Nächste Übereinstimmung",
-	"label.toggleSelectionFind": "In Auswahl suchen",
-	"label.closeButton": "Schließen",
-	"label.replace": "Ersetzen",
-	"placeholder.replace": "Ersetzen",
-	"label.replaceButton": "Ersetzen",
-	"label.replaceAllButton": "Alle ersetzen",
-	"label.toggleReplaceButton": "Ersetzen-Modus wechseln",
-	"title.matchesCountLimit": "Nur die ersten {0} Ergebnisse wurden hervorgehoben, aber alle Suchoperationen werden auf dem gesamten Text durchgeführt.",
-	"label.matchesLocation": "{0} von {1}",
-	"label.noResults": "Keine Ergebnisse"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/editor/contrib/find/simpleFindWidget.i18n.json b/i18n/deu/src/vs/editor/contrib/find/simpleFindWidget.i18n.json
deleted file mode 100644
index 7015452e86f..00000000000
--- a/i18n/deu/src/vs/editor/contrib/find/simpleFindWidget.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"label.find": "Suchen",
-	"placeholder.find": "Suchen",
-	"label.previousMatchButton": "Vorherige Übereinstimmung",
-	"label.nextMatchButton": "Nächste Übereinstimmung",
-	"label.closeButton": "Schließen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/editor/contrib/folding/browser/folding.i18n.json b/i18n/deu/src/vs/editor/contrib/folding/browser/folding.i18n.json
deleted file mode 100644
index 1f466539372..00000000000
--- a/i18n/deu/src/vs/editor/contrib/folding/browser/folding.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"unfoldAction.label": "Auffalten",
-	"unFoldRecursivelyAction.label": "Faltung rekursiv aufheben",
-	"foldAction.label": "Falten",
-	"foldRecursivelyAction.label": "Rekursiv falten",
-	"foldAllAction.label": "Alle falten",
-	"unfoldAllAction.label": "Alle auffalten",
-	"foldLevelAction.label": "Faltebene {0}"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/editor/contrib/folding/folding.i18n.json b/i18n/deu/src/vs/editor/contrib/folding/folding.i18n.json
deleted file mode 100644
index 6be29bca2c2..00000000000
--- a/i18n/deu/src/vs/editor/contrib/folding/folding.i18n.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"unfoldAction.label": "Auffalten",
-	"unFoldRecursivelyAction.label": "Faltung rekursiv aufheben",
-	"foldAction.label": "Falten",
-	"foldRecursivelyAction.label": "Rekursiv falten",
-	"foldAllBlockComments.label": "Alle Blockkommentare falten",
-	"foldAllMarkerRegions.label": "Alle Regionen falten",
-	"unfoldAllMarkerRegions.label": "Alle Regionen auffalten",
-	"foldAllAction.label": "Alle falten",
-	"unfoldAllAction.label": "Alle auffalten",
-	"foldLevelAction.label": "Faltebene {0}"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/editor/contrib/fontZoom/fontZoom.i18n.json b/i18n/deu/src/vs/editor/contrib/fontZoom/fontZoom.i18n.json
deleted file mode 100644
index 4050df46d2d..00000000000
--- a/i18n/deu/src/vs/editor/contrib/fontZoom/fontZoom.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"EditorFontZoomIn.label": "Editorschriftart vergrößern",
-	"EditorFontZoomOut.label": "Editorschriftart verkleinern",
-	"EditorFontZoomReset.label": "Editor Schriftart Vergrößerung zurücksetzen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/editor/contrib/format/browser/formatActions.i18n.json b/i18n/deu/src/vs/editor/contrib/format/browser/formatActions.i18n.json
deleted file mode 100644
index 9ead4227c99..00000000000
--- a/i18n/deu/src/vs/editor/contrib/format/browser/formatActions.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"hint11": "1 Formatierung in Zeile {0} vorgenommen",
-	"hintn1": "{0} Formatierungen in Zeile {1} vorgenommen",
-	"hint1n": "1 Formatierung zwischen Zeilen {0} und {1} vorgenommen",
-	"hintnn": "{0} Formatierungen zwischen Zeilen {1} und {2} vorgenommen",
-	"no.provider": "Tut mir leid, aber es gibt keine Formatierer für \"{0}\"-Dateien installiert.",
-	"formatDocument.label": "Dokument formatieren",
-	"formatSelection.label": "Auswahl formatieren"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/editor/contrib/format/formatActions.i18n.json b/i18n/deu/src/vs/editor/contrib/format/formatActions.i18n.json
deleted file mode 100644
index c75efebe28c..00000000000
--- a/i18n/deu/src/vs/editor/contrib/format/formatActions.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hint11": "1 Formatierung in Zeile {0} vorgenommen",
-	"hintn1": "{0} Formatierungen in Zeile {1} vorgenommen",
-	"hint1n": "1 Formatierung zwischen Zeilen {0} und {1} vorgenommen",
-	"hintnn": "{0} Formatierungen zwischen Zeilen {1} und {2} vorgenommen",
-	"no.provider": "Es ist kein Formatierer für \"{0}\"-Dateien installiert. ",
-	"formatDocument.label": "Dokument formatieren",
-	"no.documentprovider": "Es ist kein Dokumentformatierer für \"{0}\"-Dateien installiert.",
-	"formatSelection.label": "Auswahl formatieren",
-	"no.selectionprovider": "Es ist kein Auswahl-Formatierer für \"{0}\"-Dateien installiert. "
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.i18n.json b/i18n/deu/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.i18n.json
deleted file mode 100644
index a884dc5b4b1..00000000000
--- a/i18n/deu/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.i18n.json
+++ /dev/null
@@ -1,24 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"noResultWord": "Keine Definition gefunden für \"{0}\".",
-	"generic.noResults": "Keine Definition gefunden",
-	"meta.title": " – {0} Definitionen",
-	"actions.goToDecl.label": "Gehe zu Definition",
-	"actions.goToDeclToSide.label": "Definition an der Seite öffnen",
-	"actions.previewDecl.label": "Peek-Definition",
-	"goToImplementation.noResultWord": "Keine Implementierung gefunden für \"{0}\"",
-	"goToImplementation.generic.noResults": "Keine Implementierung gefunden",
-	"meta.implementations.title": "{0} Implementierungen",
-	"actions.goToImplementation.label": "Zur Implementierung wechseln",
-	"actions.peekImplementation.label": "Vorschau der Implementierung anzeigen",
-	"goToTypeDefinition.noResultWord": "Keine Typendefinition gefunden für \"{0}\"",
-	"goToTypeDefinition.generic.noResults": "Keine Typendefinition gefunden",
-	"meta.typeDefinitions.title": "{0} Typdefinitionen",
-	"actions.goToTypeDefinition.label": "Zur Typdefinition wechseln",
-	"actions.peekTypeDefinition.label": "Vorschau der Typdefinition anzeigen",
-	"multipleResults": "Klicken Sie, um {0} Definitionen anzuzeigen."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/editor/contrib/goToDeclaration/browser/goToDeclarationCommands.i18n.json b/i18n/deu/src/vs/editor/contrib/goToDeclaration/browser/goToDeclarationCommands.i18n.json
deleted file mode 100644
index ffee2c2fa36..00000000000
--- a/i18n/deu/src/vs/editor/contrib/goToDeclaration/browser/goToDeclarationCommands.i18n.json
+++ /dev/null
@@ -1,23 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"noResultWord": "Keine Definition gefunden für \"{0}\".",
-	"generic.noResults": "Keine Definition gefunden",
-	"meta.title": " – {0} Definitionen",
-	"actions.goToDecl.label": "Gehe zu Definition",
-	"actions.goToDeclToSide.label": "Definition an der Seite öffnen",
-	"actions.previewDecl.label": "Peek-Definition",
-	"goToImplementation.noResultWord": "Keine Implementierung gefunden für \"{0}\"",
-	"goToImplementation.generic.noResults": "Keine Implementierung gefunden",
-	"meta.implementations.title": "{0} Implementierungen",
-	"actions.goToImplementation.label": "Zur Implementierung wechseln",
-	"actions.peekImplementation.label": "Vorschau der Implementierung anzeigen",
-	"goToTypeDefinition.noResultWord": "Keine Typendefinition gefunden für \"{0}\"",
-	"goToTypeDefinition.generic.noResults": "Keine Typendefinition gefunden",
-	"meta.typeDefinitions.title": "{0} Typdefinitionen",
-	"actions.goToTypeDefinition.label": "Zur Typdefinition wechseln",
-	"actions.peekTypeDefinition.label": "Vorschau der Typdefinition anzeigen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/editor/contrib/goToDeclaration/browser/goToDeclarationMouse.i18n.json b/i18n/deu/src/vs/editor/contrib/goToDeclaration/browser/goToDeclarationMouse.i18n.json
deleted file mode 100644
index 2d5f00609a8..00000000000
--- a/i18n/deu/src/vs/editor/contrib/goToDeclaration/browser/goToDeclarationMouse.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"multipleResults": "Klicken Sie, um {0} Definitionen anzuzeigen."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/editor/contrib/goToDeclaration/goToDeclarationCommands.i18n.json b/i18n/deu/src/vs/editor/contrib/goToDeclaration/goToDeclarationCommands.i18n.json
deleted file mode 100644
index 598bbb23928..00000000000
--- a/i18n/deu/src/vs/editor/contrib/goToDeclaration/goToDeclarationCommands.i18n.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noResultWord": "Keine Definition gefunden für \"{0}\".",
-	"generic.noResults": "Keine Definition gefunden",
-	"meta.title": " – {0} Definitionen",
-	"actions.goToDecl.label": "Gehe zu Definition",
-	"actions.goToDeclToSide.label": "Definition an der Seite öffnen",
-	"actions.previewDecl.label": "Peek-Definition",
-	"goToImplementation.noResultWord": "Keine Implementierung gefunden für \"{0}\"",
-	"goToImplementation.generic.noResults": "Keine Implementierung gefunden",
-	"meta.implementations.title": "{0} Implementierungen",
-	"actions.goToImplementation.label": "Zur Implementierung wechseln",
-	"actions.peekImplementation.label": "Vorschau der Implementierung anzeigen",
-	"goToTypeDefinition.noResultWord": "Keine Typendefinition gefunden für \"{0}\"",
-	"goToTypeDefinition.generic.noResults": "Keine Typendefinition gefunden",
-	"meta.typeDefinitions.title": "{0} Typdefinitionen",
-	"actions.goToTypeDefinition.label": "Zur Typdefinition wechseln",
-	"actions.peekTypeDefinition.label": "Vorschau der Typdefinition anzeigen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/editor/contrib/goToDeclaration/goToDeclarationMouse.i18n.json b/i18n/deu/src/vs/editor/contrib/goToDeclaration/goToDeclarationMouse.i18n.json
deleted file mode 100644
index 6214a657591..00000000000
--- a/i18n/deu/src/vs/editor/contrib/goToDeclaration/goToDeclarationMouse.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"multipleResults": "Klicken Sie, um {0} Definitionen anzuzeigen."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/editor/contrib/goToDefinition/goToDefinitionCommands.i18n.json b/i18n/deu/src/vs/editor/contrib/goToDefinition/goToDefinitionCommands.i18n.json
deleted file mode 100644
index 598bbb23928..00000000000
--- a/i18n/deu/src/vs/editor/contrib/goToDefinition/goToDefinitionCommands.i18n.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noResultWord": "Keine Definition gefunden für \"{0}\".",
-	"generic.noResults": "Keine Definition gefunden",
-	"meta.title": " – {0} Definitionen",
-	"actions.goToDecl.label": "Gehe zu Definition",
-	"actions.goToDeclToSide.label": "Definition an der Seite öffnen",
-	"actions.previewDecl.label": "Peek-Definition",
-	"goToImplementation.noResultWord": "Keine Implementierung gefunden für \"{0}\"",
-	"goToImplementation.generic.noResults": "Keine Implementierung gefunden",
-	"meta.implementations.title": "{0} Implementierungen",
-	"actions.goToImplementation.label": "Zur Implementierung wechseln",
-	"actions.peekImplementation.label": "Vorschau der Implementierung anzeigen",
-	"goToTypeDefinition.noResultWord": "Keine Typendefinition gefunden für \"{0}\"",
-	"goToTypeDefinition.generic.noResults": "Keine Typendefinition gefunden",
-	"meta.typeDefinitions.title": "{0} Typdefinitionen",
-	"actions.goToTypeDefinition.label": "Zur Typdefinition wechseln",
-	"actions.peekTypeDefinition.label": "Vorschau der Typdefinition anzeigen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/editor/contrib/goToDefinition/goToDefinitionMouse.i18n.json b/i18n/deu/src/vs/editor/contrib/goToDefinition/goToDefinitionMouse.i18n.json
deleted file mode 100644
index 6214a657591..00000000000
--- a/i18n/deu/src/vs/editor/contrib/goToDefinition/goToDefinitionMouse.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"multipleResults": "Klicken Sie, um {0} Definitionen anzuzeigen."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/editor/contrib/gotoError/browser/gotoError.i18n.json b/i18n/deu/src/vs/editor/contrib/gotoError/browser/gotoError.i18n.json
deleted file mode 100644
index 02553773e89..00000000000
--- a/i18n/deu/src/vs/editor/contrib/gotoError/browser/gotoError.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"title.wo_source": "({0}/{1})",
-	"markerAction.next.label": "Gehe zum nächsten Fehler oder zur nächsten Warnung",
-	"markerAction.previous.label": "Gehe zum vorherigen Fehler oder zur vorherigen Warnung",
-	"editorMarkerNavigationError": "Editormarkierung: Farbe bei Fehler des Navigationswidgets.",
-	"editorMarkerNavigationWarning": "Editormarkierung: Farbe bei Warnung des Navigationswidgets.",
-	"editorMarkerNavigationInfo": "Editormarkierung: Farbe bei Warnung des Navigationswidgets.",
-	"editorMarkerNavigationBackground": "Editormarkierung: Hintergrund des Navigationswidgets."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/editor/contrib/gotoError/gotoError.i18n.json b/i18n/deu/src/vs/editor/contrib/gotoError/gotoError.i18n.json
deleted file mode 100644
index 1bf59098e6b..00000000000
--- a/i18n/deu/src/vs/editor/contrib/gotoError/gotoError.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"markerAction.next.label": "Gehe zu nächstem Problem (Fehler, Warnung, Information)",
-	"markerAction.previous.label": "Gehe zu vorigem Problem (Fehler, Warnung, Information)",
-	"markerAction.nextInFiles.label": "Gehe zu dem nächsten Problem in den Dateien (Fehler, Warnung, Info) ",
-	"markerAction.previousInFiles.label": "Gehe zu dem vorherigen Problem in den Dateien (Fehler, Warnung, Info) "
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json b/i18n/deu/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json
deleted file mode 100644
index a710ee11dcf..00000000000
--- a/i18n/deu/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"title.wo_source": "({0}/{1})",
-	"editorMarkerNavigationError": "Editormarkierung: Farbe bei Fehler des Navigationswidgets.",
-	"editorMarkerNavigationWarning": "Editormarkierung: Farbe bei Warnung des Navigationswidgets.",
-	"editorMarkerNavigationInfo": "Editormarkierung: Farbe bei Warnung des Navigationswidgets.",
-	"editorMarkerNavigationBackground": "Editormarkierung: Hintergrund des Navigationswidgets."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/editor/contrib/hover/browser/hover.i18n.json b/i18n/deu/src/vs/editor/contrib/hover/browser/hover.i18n.json
deleted file mode 100644
index 44bcefc0805..00000000000
--- a/i18n/deu/src/vs/editor/contrib/hover/browser/hover.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"showHover": "Hovern anzeigen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/editor/contrib/hover/browser/modesContentHover.i18n.json b/i18n/deu/src/vs/editor/contrib/hover/browser/modesContentHover.i18n.json
deleted file mode 100644
index f77f3adae72..00000000000
--- a/i18n/deu/src/vs/editor/contrib/hover/browser/modesContentHover.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"modesContentHover.loading": "Wird geladen..."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/editor/contrib/hover/hover.i18n.json b/i18n/deu/src/vs/editor/contrib/hover/hover.i18n.json
deleted file mode 100644
index d570cf4e789..00000000000
--- a/i18n/deu/src/vs/editor/contrib/hover/hover.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"showHover": "Hovern anzeigen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/editor/contrib/hover/modesContentHover.i18n.json b/i18n/deu/src/vs/editor/contrib/hover/modesContentHover.i18n.json
deleted file mode 100644
index 9dd3af2ee05..00000000000
--- a/i18n/deu/src/vs/editor/contrib/hover/modesContentHover.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"modesContentHover.loading": "Wird geladen..."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/editor/contrib/inPlaceReplace/common/inPlaceReplace.i18n.json b/i18n/deu/src/vs/editor/contrib/inPlaceReplace/common/inPlaceReplace.i18n.json
deleted file mode 100644
index d29adae9acc..00000000000
--- a/i18n/deu/src/vs/editor/contrib/inPlaceReplace/common/inPlaceReplace.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"InPlaceReplaceAction.previous.label": "Durch vorherigen Wert ersetzen",
-	"InPlaceReplaceAction.next.label": "Durch nächsten Wert ersetzen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/editor/contrib/inPlaceReplace/inPlaceReplace.i18n.json b/i18n/deu/src/vs/editor/contrib/inPlaceReplace/inPlaceReplace.i18n.json
deleted file mode 100644
index b2adcd9cb8e..00000000000
--- a/i18n/deu/src/vs/editor/contrib/inPlaceReplace/inPlaceReplace.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"InPlaceReplaceAction.previous.label": "Durch vorherigen Wert ersetzen",
-	"InPlaceReplaceAction.next.label": "Durch nächsten Wert ersetzen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/editor/contrib/indentation/common/indentation.i18n.json b/i18n/deu/src/vs/editor/contrib/indentation/common/indentation.i18n.json
deleted file mode 100644
index e7136cd509f..00000000000
--- a/i18n/deu/src/vs/editor/contrib/indentation/common/indentation.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"indentationToSpaces": "Einzug in Leerzeichen konvertieren",
-	"indentationToTabs": "Einzug in Tabstopps konvertieren",
-	"configuredTabSize": "Konfigurierte Tabulatorgröße",
-	"selectTabWidth": "Tabulatorgröße für aktuelle Datei auswählen",
-	"indentUsingTabs": "Einzug mithilfe von Tabstopps",
-	"indentUsingSpaces": "Einzug mithilfe von Leerzeichen",
-	"detectIndentation": "Einzug aus Inhalt erkennen",
-	"editor.reindentlines": "Neuen Einzug für Zeilen festlegen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/editor/contrib/indentation/indentation.i18n.json b/i18n/deu/src/vs/editor/contrib/indentation/indentation.i18n.json
deleted file mode 100644
index 5be79a2ba11..00000000000
--- a/i18n/deu/src/vs/editor/contrib/indentation/indentation.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"indentationToSpaces": "Einzug in Leerzeichen konvertieren",
-	"indentationToTabs": "Einzug in Tabstopps konvertieren",
-	"configuredTabSize": "Konfigurierte Tabulatorgröße",
-	"selectTabWidth": "Tabulatorgröße für aktuelle Datei auswählen",
-	"indentUsingTabs": "Einzug mithilfe von Tabstopps",
-	"indentUsingSpaces": "Einzug mithilfe von Leerzeichen",
-	"detectIndentation": "Einzug aus Inhalt erkennen",
-	"editor.reindentlines": "Neuen Einzug für Zeilen festlegen",
-	"editor.reindentselectedlines": "Gewählte Zeilen zurückziehen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/editor/contrib/inspectTMScopes/electron-browser/inspectTMScopes.i18n.json b/i18n/deu/src/vs/editor/contrib/inspectTMScopes/electron-browser/inspectTMScopes.i18n.json
deleted file mode 100644
index 18e736ab987..00000000000
--- a/i18n/deu/src/vs/editor/contrib/inspectTMScopes/electron-browser/inspectTMScopes.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"inspectTMScopes": "Entwickler: TM-Bereiche untersuchen",
-	"inspectTMScopesWidget.loading": "Wird geladen..."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/editor/contrib/linesOperations/common/linesOperations.i18n.json b/i18n/deu/src/vs/editor/contrib/linesOperations/common/linesOperations.i18n.json
deleted file mode 100644
index 53bb9f3fd90..00000000000
--- a/i18n/deu/src/vs/editor/contrib/linesOperations/common/linesOperations.i18n.json
+++ /dev/null
@@ -1,25 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"lines.copyUp": "Zeile nach oben kopieren",
-	"lines.copyDown": "Zeile nach unten kopieren",
-	"lines.moveUp": "Zeile nach oben verschieben",
-	"lines.moveDown": "Zeile nach unten verschieben",
-	"lines.sortAscending": "Zeilen aufsteigend sortieren",
-	"lines.sortDescending": "Zeilen absteigend sortieren",
-	"lines.trimTrailingWhitespace": "Nachgestelltes Leerzeichen kürzen",
-	"lines.delete": "Zeile löschen",
-	"lines.indent": "Zeileneinzug",
-	"lines.outdent": "Zeile ausrücken",
-	"lines.insertBefore": "Zeile oben einfügen",
-	"lines.insertAfter": "Zeile unten einfügen",
-	"lines.deleteAllLeft": "Alle übrigen löschen",
-	"lines.deleteAllRight": "Alle rechts löschen",
-	"lines.joinLines": "Zeilen verknüpfen",
-	"editor.transpose": "Zeichen um den Cursor herum transponieren",
-	"editor.transformToUppercase": "In Großbuchstaben umwandeln",
-	"editor.transformToLowercase": "In Kleinbuchstaben umwandeln"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/editor/contrib/linesOperations/linesOperations.i18n.json b/i18n/deu/src/vs/editor/contrib/linesOperations/linesOperations.i18n.json
deleted file mode 100644
index af0982e7739..00000000000
--- a/i18n/deu/src/vs/editor/contrib/linesOperations/linesOperations.i18n.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"lines.copyUp": "Zeile nach oben kopieren",
-	"lines.copyDown": "Zeile nach unten kopieren",
-	"lines.moveUp": "Zeile nach oben verschieben",
-	"lines.moveDown": "Zeile nach unten verschieben",
-	"lines.sortAscending": "Zeilen aufsteigend sortieren",
-	"lines.sortDescending": "Zeilen absteigend sortieren",
-	"lines.trimTrailingWhitespace": "Nachgestelltes Leerzeichen kürzen",
-	"lines.delete": "Zeile löschen",
-	"lines.indent": "Zeileneinzug",
-	"lines.outdent": "Zeile ausrücken",
-	"lines.insertBefore": "Zeile oben einfügen",
-	"lines.insertAfter": "Zeile unten einfügen",
-	"lines.deleteAllLeft": "Alle übrigen löschen",
-	"lines.deleteAllRight": "Alle rechts löschen",
-	"lines.joinLines": "Zeilen verknüpfen",
-	"editor.transpose": "Zeichen um den Cursor herum transponieren",
-	"editor.transformToUppercase": "In Großbuchstaben umwandeln",
-	"editor.transformToLowercase": "In Kleinbuchstaben umwandeln"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/editor/contrib/links/browser/links.i18n.json b/i18n/deu/src/vs/editor/contrib/links/browser/links.i18n.json
deleted file mode 100644
index e9f6f2ae5ad..00000000000
--- a/i18n/deu/src/vs/editor/contrib/links/browser/links.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"links.navigate.mac": "BEFEHLSTASTE + Mausklick zum Aufrufen des Links",
-	"links.navigate": "STRG + Mausklick zum Aufrufen des Links",
-	"links.command.mac": "Cmd + Klick um Befehl auszuführen",
-	"links.command": "Ctrl + Klick um Befehl auszuführen.",
-	"links.navigate.al": "ALT + Mausklick zum Aufrufen des Links",
-	"links.command.al": "Alt + Klick um Befehl auszuführen.",
-	"invalid.url": "Fehler beim Öffnen dieses Links, weil er nicht wohlgeformt ist: {0}",
-	"missing.url": "Fehler beim Öffnen dieses Links, weil das Ziel fehlt.",
-	"label": "Link öffnen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/editor/contrib/links/links.i18n.json b/i18n/deu/src/vs/editor/contrib/links/links.i18n.json
deleted file mode 100644
index 050c34c0463..00000000000
--- a/i18n/deu/src/vs/editor/contrib/links/links.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"links.navigate.mac": "BEFEHLSTASTE + Mausklick zum Aufrufen des Links",
-	"links.navigate": "STRG + Mausklick zum Aufrufen des Links",
-	"links.command.mac": "Cmd + Klick um Befehl auszuführen",
-	"links.command": "Ctrl + Klick um Befehl auszuführen.",
-	"links.navigate.al.mac": "WAHLTASTE + Klicken, um Link zu folgen",
-	"links.navigate.al": "ALT + Mausklick zum Aufrufen des Links",
-	"links.command.al.mac": "WAHLTASTE + Klicken, um Befehl auszuführen",
-	"links.command.al": "Alt + Klick um Befehl auszuführen.",
-	"invalid.url": "Fehler beim Öffnen dieses Links, weil er nicht wohlgeformt ist: {0}",
-	"missing.url": "Fehler beim Öffnen dieses Links, weil das Ziel fehlt.",
-	"label": "Link öffnen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/editor/contrib/message/messageController.i18n.json b/i18n/deu/src/vs/editor/contrib/message/messageController.i18n.json
deleted file mode 100644
index bd19b6b417d..00000000000
--- a/i18n/deu/src/vs/editor/contrib/message/messageController.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"editor.readonly": "Ein Bearbeiten ist im schreibgeschützten Editor nicht möglich"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/editor/contrib/multicursor/common/multicursor.i18n.json b/i18n/deu/src/vs/editor/contrib/multicursor/common/multicursor.i18n.json
deleted file mode 100644
index 66385866668..00000000000
--- a/i18n/deu/src/vs/editor/contrib/multicursor/common/multicursor.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"mutlicursor.insertAbove": "Cursor oberhalb hinzufügen",
-	"mutlicursor.insertBelow": "Cursor unterhalb hinzufügen",
-	"mutlicursor.insertAtEndOfEachLineSelected": "Cursor an Zeilenenden hinzufügen",
-	"addSelectionToNextFindMatch": "Auswahl zur nächsten Übereinstimmungssuche hinzufügen",
-	"addSelectionToPreviousFindMatch": "Letzte Auswahl zu vorheriger Übereinstimmungssuche hinzufügen",
-	"moveSelectionToNextFindMatch": "Letzte Auswahl in nächste Übereinstimmungssuche verschieben",
-	"moveSelectionToPreviousFindMatch": "Letzte Auswahl in vorherige Übereinstimmungssuche verschieben",
-	"selectAllOccurrencesOfFindMatch": "Alle Vorkommen auswählen und Übereinstimmung suchen",
-	"changeAll.label": "Alle Vorkommen ändern"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/editor/contrib/multicursor/multicursor.i18n.json b/i18n/deu/src/vs/editor/contrib/multicursor/multicursor.i18n.json
deleted file mode 100644
index 5344bf3c50f..00000000000
--- a/i18n/deu/src/vs/editor/contrib/multicursor/multicursor.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"mutlicursor.insertAbove": "Cursor oberhalb hinzufügen",
-	"mutlicursor.insertBelow": "Cursor unterhalb hinzufügen",
-	"mutlicursor.insertAtEndOfEachLineSelected": "Cursor an Zeilenenden hinzufügen",
-	"addSelectionToNextFindMatch": "Auswahl zur nächsten Übereinstimmungssuche hinzufügen",
-	"addSelectionToPreviousFindMatch": "Letzte Auswahl zu vorheriger Übereinstimmungssuche hinzufügen",
-	"moveSelectionToNextFindMatch": "Letzte Auswahl in nächste Übereinstimmungssuche verschieben",
-	"moveSelectionToPreviousFindMatch": "Letzte Auswahl in vorherige Übereinstimmungssuche verschieben",
-	"selectAllOccurrencesOfFindMatch": "Alle Vorkommen auswählen und Übereinstimmung suchen",
-	"changeAll.label": "Alle Vorkommen ändern"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/editor/contrib/parameterHints/browser/parameterHints.i18n.json b/i18n/deu/src/vs/editor/contrib/parameterHints/browser/parameterHints.i18n.json
deleted file mode 100644
index 1ac221c353c..00000000000
--- a/i18n/deu/src/vs/editor/contrib/parameterHints/browser/parameterHints.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"parameterHints.trigger.label": "Parameterhinweise auslösen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/editor/contrib/parameterHints/browser/parameterHintsWidget.i18n.json b/i18n/deu/src/vs/editor/contrib/parameterHints/browser/parameterHintsWidget.i18n.json
deleted file mode 100644
index 7979e4c0834..00000000000
--- a/i18n/deu/src/vs/editor/contrib/parameterHints/browser/parameterHintsWidget.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"hint": "{0}, Hinweis"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/editor/contrib/parameterHints/parameterHints.i18n.json b/i18n/deu/src/vs/editor/contrib/parameterHints/parameterHints.i18n.json
deleted file mode 100644
index 7d903a1dba7..00000000000
--- a/i18n/deu/src/vs/editor/contrib/parameterHints/parameterHints.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"parameterHints.trigger.label": "Parameterhinweise auslösen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/editor/contrib/parameterHints/parameterHintsWidget.i18n.json b/i18n/deu/src/vs/editor/contrib/parameterHints/parameterHintsWidget.i18n.json
deleted file mode 100644
index 19d8777c18a..00000000000
--- a/i18n/deu/src/vs/editor/contrib/parameterHints/parameterHintsWidget.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hint": "{0}, Hinweis"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/editor/contrib/quickFix/browser/quickFixCommands.i18n.json b/i18n/deu/src/vs/editor/contrib/quickFix/browser/quickFixCommands.i18n.json
deleted file mode 100644
index f55e5785517..00000000000
--- a/i18n/deu/src/vs/editor/contrib/quickFix/browser/quickFixCommands.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"quickFixWithKb": "Korrekturen anzeigen ({0})",
-	"quickFix": "Korrekturen anzeigen",
-	"quickfix.trigger.label": "Schnelle Problembehebung"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/editor/contrib/quickFix/quickFixCommands.i18n.json b/i18n/deu/src/vs/editor/contrib/quickFix/quickFixCommands.i18n.json
deleted file mode 100644
index 174b4efc082..00000000000
--- a/i18n/deu/src/vs/editor/contrib/quickFix/quickFixCommands.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"quickFixWithKb": "Korrekturen anzeigen ({0})",
-	"quickFix": "Korrekturen anzeigen",
-	"quickfix.trigger.label": "Schnelle Problembehebung",
-	"refactor.label": "Umgestalten"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/editor/contrib/referenceSearch/browser/peekViewWidget.i18n.json b/i18n/deu/src/vs/editor/contrib/referenceSearch/browser/peekViewWidget.i18n.json
deleted file mode 100644
index d057bbcc407..00000000000
--- a/i18n/deu/src/vs/editor/contrib/referenceSearch/browser/peekViewWidget.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"label.close": "Schließen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/editor/contrib/referenceSearch/browser/referenceSearch.i18n.json b/i18n/deu/src/vs/editor/contrib/referenceSearch/browser/referenceSearch.i18n.json
deleted file mode 100644
index 479f89ba296..00000000000
--- a/i18n/deu/src/vs/editor/contrib/referenceSearch/browser/referenceSearch.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"meta.titleReference": " – {0} Verweise",
-	"references.action.label": "Alle Verweise suchen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/editor/contrib/referenceSearch/browser/referencesController.i18n.json b/i18n/deu/src/vs/editor/contrib/referenceSearch/browser/referencesController.i18n.json
deleted file mode 100644
index fab6f765b34..00000000000
--- a/i18n/deu/src/vs/editor/contrib/referenceSearch/browser/referencesController.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"labelLoading": "Wird geladen..."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/editor/contrib/referenceSearch/browser/referencesModel.i18n.json b/i18n/deu/src/vs/editor/contrib/referenceSearch/browser/referencesModel.i18n.json
deleted file mode 100644
index 76ca2b446f4..00000000000
--- a/i18n/deu/src/vs/editor/contrib/referenceSearch/browser/referencesModel.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"aria.oneReference": "Symbol in {0} in Zeile {1}, Spalte {2}",
-	"aria.fileReferences.1": "1 Symbol in {0}, vollständiger Pfad {1}",
-	"aria.fileReferences.N": "{0} Symbole in {1}, vollständiger Pfad {2}",
-	"aria.result.0": "Es wurden keine Ergebnisse gefunden.",
-	"aria.result.1": "1 Symbol in {0} gefunden",
-	"aria.result.n1": "{0} Symbole in {1} gefunden",
-	"aria.result.nm": "{0} Symbole in {1} Dateien gefunden"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/editor/contrib/referenceSearch/browser/referencesWidget.i18n.json b/i18n/deu/src/vs/editor/contrib/referenceSearch/browser/referencesWidget.i18n.json
deleted file mode 100644
index 358b448e65f..00000000000
--- a/i18n/deu/src/vs/editor/contrib/referenceSearch/browser/referencesWidget.i18n.json
+++ /dev/null
@@ -1,27 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"referencesFailre": "Fehler beim Auflösen der Datei.",
-	"referencesCount": "{0} Verweise",
-	"referenceCount": "{0} Verweis",
-	"missingPreviewMessage": "Keine Vorschau verfügbar.",
-	"treeAriaLabel": "Verweise",
-	"noResults": "Keine Ergebnisse",
-	"peekView.alternateTitle": "Verweise",
-	"peekViewTitleBackground": "Hintergrundfarbe des Titelbereichs der Peek-Ansicht.",
-	"peekViewTitleForeground": "Farbe des Titels in der Peek-Ansicht.",
-	"peekViewTitleInfoForeground": "Farbe der Titelinformationen in der Peek-Ansicht.",
-	"peekViewBorder": "Farbe der Peek-Ansichtsränder und des Pfeils.",
-	"peekViewResultsBackground": "Hintergrundfarbe der Ergebnisliste in der Peek-Ansicht.",
-	"peekViewResultsMatchForeground": "Vordergrundfarbe für Zeilenknoten in der Ergebnisliste der Peek-Ansicht.",
-	"peekViewResultsFileForeground": "Vordergrundfarbe für Dateiknoten in der Ergebnisliste der Peek-Ansicht.",
-	"peekViewResultsSelectionBackground": "Hintergrundfarbe des ausgewählten Eintrags in der Ergebnisliste der Peek-Ansicht.",
-	"peekViewResultsSelectionForeground": "Vordergrundfarbe des ausgewählten Eintrags in der Ergebnisliste der Peek-Ansicht.",
-	"peekViewEditorBackground": "Hintergrundfarbe des Peek-Editors.",
-	"peekViewEditorGutterBackground": "Hintergrundfarbe der Leiste im Peek-Editor.",
-	"peekViewResultsMatchHighlight": "Farbe für Übereinstimmungsmarkierungen in der Ergebnisliste der Peek-Ansicht.",
-	"peekViewEditorMatchHighlight": "Farbe für Übereinstimmungsmarkierungen im Peek-Editor."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/editor/contrib/referenceSearch/peekViewWidget.i18n.json b/i18n/deu/src/vs/editor/contrib/referenceSearch/peekViewWidget.i18n.json
deleted file mode 100644
index 30a183c32d2..00000000000
--- a/i18n/deu/src/vs/editor/contrib/referenceSearch/peekViewWidget.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"label.close": "Schließen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/editor/contrib/referenceSearch/referenceSearch.i18n.json b/i18n/deu/src/vs/editor/contrib/referenceSearch/referenceSearch.i18n.json
deleted file mode 100644
index 6f6fe8bda55..00000000000
--- a/i18n/deu/src/vs/editor/contrib/referenceSearch/referenceSearch.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"meta.titleReference": " – {0} Verweise",
-	"references.action.label": "Alle Verweise suchen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/editor/contrib/referenceSearch/referencesController.i18n.json b/i18n/deu/src/vs/editor/contrib/referenceSearch/referencesController.i18n.json
deleted file mode 100644
index 51f58785f80..00000000000
--- a/i18n/deu/src/vs/editor/contrib/referenceSearch/referencesController.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"labelLoading": "Wird geladen..."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/editor/contrib/referenceSearch/referencesModel.i18n.json b/i18n/deu/src/vs/editor/contrib/referenceSearch/referencesModel.i18n.json
deleted file mode 100644
index 92e61ea9080..00000000000
--- a/i18n/deu/src/vs/editor/contrib/referenceSearch/referencesModel.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"aria.oneReference": "Symbol in {0} in Zeile {1}, Spalte {2}",
-	"aria.fileReferences.1": "1 Symbol in {0}, vollständiger Pfad {1}",
-	"aria.fileReferences.N": "{0} Symbole in {1}, vollständiger Pfad {2}",
-	"aria.result.0": "Es wurden keine Ergebnisse gefunden.",
-	"aria.result.1": "1 Symbol in {0} gefunden",
-	"aria.result.n1": "{0} Symbole in {1} gefunden",
-	"aria.result.nm": "{0} Symbole in {1} Dateien gefunden"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/editor/contrib/referenceSearch/referencesWidget.i18n.json b/i18n/deu/src/vs/editor/contrib/referenceSearch/referencesWidget.i18n.json
deleted file mode 100644
index 423b26f70a7..00000000000
--- a/i18n/deu/src/vs/editor/contrib/referenceSearch/referencesWidget.i18n.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"referencesFailre": "Fehler beim Auflösen der Datei.",
-	"referencesCount": "{0} Verweise",
-	"referenceCount": "{0} Verweis",
-	"missingPreviewMessage": "Keine Vorschau verfügbar.",
-	"treeAriaLabel": "Verweise",
-	"noResults": "Keine Ergebnisse",
-	"peekView.alternateTitle": "Verweise",
-	"peekViewTitleBackground": "Hintergrundfarbe des Titelbereichs der Peek-Ansicht.",
-	"peekViewTitleForeground": "Farbe des Titels in der Peek-Ansicht.",
-	"peekViewTitleInfoForeground": "Farbe der Titelinformationen in der Peek-Ansicht.",
-	"peekViewBorder": "Farbe der Peek-Ansichtsränder und des Pfeils.",
-	"peekViewResultsBackground": "Hintergrundfarbe der Ergebnisliste in der Peek-Ansicht.",
-	"peekViewResultsMatchForeground": "Vordergrundfarbe für Zeilenknoten in der Ergebnisliste der Peek-Ansicht.",
-	"peekViewResultsFileForeground": "Vordergrundfarbe für Dateiknoten in der Ergebnisliste der Peek-Ansicht.",
-	"peekViewResultsSelectionBackground": "Hintergrundfarbe des ausgewählten Eintrags in der Ergebnisliste der Peek-Ansicht.",
-	"peekViewResultsSelectionForeground": "Vordergrundfarbe des ausgewählten Eintrags in der Ergebnisliste der Peek-Ansicht.",
-	"peekViewEditorBackground": "Hintergrundfarbe des Peek-Editors.",
-	"peekViewEditorGutterBackground": "Hintergrundfarbe der Leiste im Peek-Editor.",
-	"peekViewResultsMatchHighlight": "Farbe für Übereinstimmungsmarkierungen in der Ergebnisliste der Peek-Ansicht.",
-	"peekViewEditorMatchHighlight": "Farbe für Übereinstimmungsmarkierungen im Peek-Editor.",
-	"peekViewEditorMatchHighlightBorder": "Rahmen für Übereinstimmungsmarkierungen im Peek-Editor."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/editor/contrib/rename/browser/rename.i18n.json b/i18n/deu/src/vs/editor/contrib/rename/browser/rename.i18n.json
deleted file mode 100644
index 0a095a2aa5e..00000000000
--- a/i18n/deu/src/vs/editor/contrib/rename/browser/rename.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"no result": "Kein Ergebnis.",
-	"aria": "\"{0}\" erfolgreich in \"{1}\" umbenannt. Zusammenfassung: {2}",
-	"rename.failed": "Fehler bei der Ausführung der Umbenennung.",
-	"rename.label": "Symbol umbenennen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/editor/contrib/rename/browser/renameInputField.i18n.json b/i18n/deu/src/vs/editor/contrib/rename/browser/renameInputField.i18n.json
deleted file mode 100644
index 0c2f7ec3617..00000000000
--- a/i18n/deu/src/vs/editor/contrib/rename/browser/renameInputField.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"renameAriaLabel": "Benennen Sie die Eingabe um. Geben Sie einen neuen Namen ein, und drücken Sie die EINGABETASTE, um den Commit auszuführen."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/editor/contrib/rename/rename.i18n.json b/i18n/deu/src/vs/editor/contrib/rename/rename.i18n.json
deleted file mode 100644
index 7c05a6252e1..00000000000
--- a/i18n/deu/src/vs/editor/contrib/rename/rename.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"no result": "Kein Ergebnis.",
-	"aria": "\"{0}\" erfolgreich in \"{1}\" umbenannt. Zusammenfassung: {2}",
-	"rename.failed": "Fehler beim Ausführen der Umbenennung.",
-	"rename.label": "Symbol umbenennen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/editor/contrib/rename/renameInputField.i18n.json b/i18n/deu/src/vs/editor/contrib/rename/renameInputField.i18n.json
deleted file mode 100644
index bf0f7ac4807..00000000000
--- a/i18n/deu/src/vs/editor/contrib/rename/renameInputField.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"renameAriaLabel": "Benennen Sie die Eingabe um. Geben Sie einen neuen Namen ein, und drücken Sie die EINGABETASTE, um den Commit auszuführen."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/editor/contrib/smartSelect/common/smartSelect.i18n.json b/i18n/deu/src/vs/editor/contrib/smartSelect/common/smartSelect.i18n.json
deleted file mode 100644
index cfef202b040..00000000000
--- a/i18n/deu/src/vs/editor/contrib/smartSelect/common/smartSelect.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"smartSelect.grow": "Auswahl erweitern",
-	"smartSelect.shrink": "Auswahl verkleinern"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/editor/contrib/smartSelect/smartSelect.i18n.json b/i18n/deu/src/vs/editor/contrib/smartSelect/smartSelect.i18n.json
deleted file mode 100644
index 30cba9d47ae..00000000000
--- a/i18n/deu/src/vs/editor/contrib/smartSelect/smartSelect.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"smartSelect.grow": "Auswahl erweitern",
-	"smartSelect.shrink": "Auswahl verkleinern"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/editor/contrib/snippet/snippetVariables.i18n.json b/i18n/deu/src/vs/editor/contrib/snippet/snippetVariables.i18n.json
deleted file mode 100644
index bc7ae23d394..00000000000
--- a/i18n/deu/src/vs/editor/contrib/snippet/snippetVariables.i18n.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"Sunday": "Sonntag",
-	"Monday": "Montag",
-	"Tuesday": "Dienstag",
-	"Wednesday": "Mittwoch",
-	"Thursday": "Donnerstag",
-	"Friday": "Freitag",
-	"Saturday": "Samstag",
-	"SundayShort": "So",
-	"MondayShort": "Mo",
-	"TuesdayShort": "Di",
-	"WednesdayShort": "Mi",
-	"ThursdayShort": "Do",
-	"FridayShort": "Fr",
-	"SaturdayShort": "Sa",
-	"January": "Januar",
-	"February": "Februar",
-	"March": "März",
-	"April": "April",
-	"May": "Mai",
-	"June": "Juni",
-	"July": "Juli",
-	"August": "August",
-	"September": "September",
-	"October": "Oktober",
-	"November": "November",
-	"December": "Dezember",
-	"JanuaryShort": "Jan",
-	"FebruaryShort": "Feb",
-	"MarchShort": "Mar",
-	"AprilShort": "Apr",
-	"MayShort": "Mai",
-	"JuneShort": "Jun",
-	"JulyShort": "Jul",
-	"AugustShort": "Aug",
-	"SeptemberShort": "Sep",
-	"OctoberShort": "Okt",
-	"NovemberShort": "Nov",
-	"DecemberShort": "Dez"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/editor/contrib/suggest/browser/suggestController.i18n.json b/i18n/deu/src/vs/editor/contrib/suggest/browser/suggestController.i18n.json
deleted file mode 100644
index 634627ef2a5..00000000000
--- a/i18n/deu/src/vs/editor/contrib/suggest/browser/suggestController.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"arai.alert.snippet": "Durch Annahme von \"{0}\" wurde folgender Text eingefügt: {1}",
-	"suggest.trigger.label": "Vorschlag auslösen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/editor/contrib/suggest/browser/suggestWidget.i18n.json b/i18n/deu/src/vs/editor/contrib/suggest/browser/suggestWidget.i18n.json
deleted file mode 100644
index df507c729f9..00000000000
--- a/i18n/deu/src/vs/editor/contrib/suggest/browser/suggestWidget.i18n.json
+++ /dev/null
@@ -1,21 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"editorSuggestWidgetBackground": "Hintergrundfarbe des Vorschlagswidgets.",
-	"editorSuggestWidgetBorder": "Rahmenfarbe des Vorschlagswidgets.",
-	"editorSuggestWidgetForeground": "Vordergrundfarbe des Vorschlagswidgets.",
-	"editorSuggestWidgetSelectedBackground": "Hintergrundfarbe des ausgewählten Eintrags im Vorschlagswidget.",
-	"editorSuggestWidgetHighlightForeground": "Farbe der Trefferhervorhebung im Vorschlagswidget.",
-	"readMore": "Mehr anzeigen...{0}",
-	"suggestionWithDetailsAriaLabel": "{0}, Vorschlag, hat Details",
-	"suggestionAriaLabel": "{0}, Vorschlag",
-	"readLess": "Weniger anzeigen...{0}",
-	"suggestWidget.loading": "Wird geladen...",
-	"suggestWidget.noSuggestions": "Keine Vorschläge.",
-	"suggestionAriaAccepted": "{0}, angenommen",
-	"ariaCurrentSuggestionWithDetails": "{0}, Vorschlag, hat Details",
-	"ariaCurrentSuggestion": "{0}, Vorschlag"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/editor/contrib/suggest/suggestController.i18n.json b/i18n/deu/src/vs/editor/contrib/suggest/suggestController.i18n.json
deleted file mode 100644
index d36ec02a97b..00000000000
--- a/i18n/deu/src/vs/editor/contrib/suggest/suggestController.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"arai.alert.snippet": "Durch Annahme von \"{0}\" wurde folgender Text eingefügt: {1}",
-	"suggest.trigger.label": "Vorschlag auslösen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/editor/contrib/suggest/suggestWidget.i18n.json b/i18n/deu/src/vs/editor/contrib/suggest/suggestWidget.i18n.json
deleted file mode 100644
index e416c3c7bb7..00000000000
--- a/i18n/deu/src/vs/editor/contrib/suggest/suggestWidget.i18n.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"editorSuggestWidgetBackground": "Hintergrundfarbe des Vorschlagswidgets.",
-	"editorSuggestWidgetBorder": "Rahmenfarbe des Vorschlagswidgets.",
-	"editorSuggestWidgetForeground": "Vordergrundfarbe des Vorschlagswidgets.",
-	"editorSuggestWidgetSelectedBackground": "Hintergrundfarbe des ausgewählten Eintrags im Vorschlagswidget.",
-	"editorSuggestWidgetHighlightForeground": "Farbe der Trefferhervorhebung im Vorschlagswidget.",
-	"readMore": "Mehr anzeigen...{0}",
-	"suggestionWithDetailsAriaLabel": "{0}, Vorschlag, hat Details",
-	"suggestionAriaLabel": "{0}, Vorschlag",
-	"readLess": "Weniger anzeigen...{0}",
-	"suggestWidget.loading": "Wird geladen...",
-	"suggestWidget.noSuggestions": "Keine Vorschläge.",
-	"suggestionAriaAccepted": "{0}, angenommen",
-	"ariaCurrentSuggestionWithDetails": "{0}, Vorschlag, hat Details",
-	"ariaCurrentSuggestion": "{0}, Vorschlag"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/editor/contrib/toggleTabFocusMode/common/toggleTabFocusMode.i18n.json b/i18n/deu/src/vs/editor/contrib/toggleTabFocusMode/common/toggleTabFocusMode.i18n.json
deleted file mode 100644
index 8dfd4e19548..00000000000
--- a/i18n/deu/src/vs/editor/contrib/toggleTabFocusMode/common/toggleTabFocusMode.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"toggle.tabMovesFocus": "TAB-Umschalttaste verschiebt Fokus"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/editor/contrib/toggleTabFocusMode/toggleTabFocusMode.i18n.json b/i18n/deu/src/vs/editor/contrib/toggleTabFocusMode/toggleTabFocusMode.i18n.json
deleted file mode 100644
index c30a0b5978d..00000000000
--- a/i18n/deu/src/vs/editor/contrib/toggleTabFocusMode/toggleTabFocusMode.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggle.tabMovesFocus": "TAB-Umschalttaste verschiebt Fokus"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/editor/contrib/wordHighlighter/common/wordHighlighter.i18n.json b/i18n/deu/src/vs/editor/contrib/wordHighlighter/common/wordHighlighter.i18n.json
deleted file mode 100644
index d706ff2e9b2..00000000000
--- a/i18n/deu/src/vs/editor/contrib/wordHighlighter/common/wordHighlighter.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"wordHighlight": "Hintergrundfarbe eines Symbols beim Lesezugriff (beispielsweise beim Lesen einer Variablen).",
-	"wordHighlightStrong": "Hintergrundfarbe eines Symbols beim Schreibzugriff (beispielsweise beim Schreiben in eine Variable).",
-	"overviewRulerWordHighlightForeground": "Übersichtslineal-Markierungsfarbe für Symbolhervorhebungen.",
-	"overviewRulerWordHighlightStrongForeground": "Übersichtslineal-Markierungsfarbe für Schreibzugriffs-Symbolhervorhebungen.",
-	"wordHighlight.next.label": "Gehe zur nächsten Symbolhervorhebungen",
-	"wordHighlight.previous.label": "Gehe zur vorherigen Symbolhervorhebungen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json b/i18n/deu/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
deleted file mode 100644
index d79e05a3c24..00000000000
--- a/i18n/deu/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"wordHighlight": "Hintergrundfarbe eines Symbols bei Lesezugriff, beispielsweise dem Lesen einer Variable. Die Farbe muss durchsichtig sein, um nicht dahinterliegende Dekorationen zu verbergen.",
-	"wordHighlightStrong": "Hintergrundfarbe eines Symbols bei Schreibzugriff, beispielsweise dem Schreiben einer Variable. Die Farbe muss durchsichtig sein, um nicht dahinterliegende Dekorationen zu verbergen.",
-	"wordHighlightBorder": "Randfarbe eines Symbols beim Lesezugriff, wie etwa beim Lesen einer Variablen.",
-	"wordHighlightStrongBorder": "Randfarbe eines Symbols beim Schreibzugriff, wie etwa beim Schreiben einer Variablen.",
-	"overviewRulerWordHighlightForeground": "Übersichtslineal-Markierungsfarbe für Symbolhervorhebungen. Die Farbe muss durchsichtig sein, um dahinterliegende Dekorationen nicht zu verbergen.",
-	"overviewRulerWordHighlightStrongForeground": "Übersichtslineal-Markierungsfarbe für Schreibzugriffs-Symbolhervorhebungen. Die Farbe muss durchsichtig sein, um dahinterliegende Dekorationen nicht zu verbergen.",
-	"wordHighlight.next.label": "Gehe zur nächsten Symbolhervorhebungen",
-	"wordHighlight.previous.label": "Gehe zur vorherigen Symbolhervorhebungen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/editor/contrib/zoneWidget/browser/peekViewWidget.i18n.json b/i18n/deu/src/vs/editor/contrib/zoneWidget/browser/peekViewWidget.i18n.json
deleted file mode 100644
index d057bbcc407..00000000000
--- a/i18n/deu/src/vs/editor/contrib/zoneWidget/browser/peekViewWidget.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"label.close": "Schließen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/editor/electron-browser/textMate/TMSyntax.i18n.json b/i18n/deu/src/vs/editor/electron-browser/textMate/TMSyntax.i18n.json
deleted file mode 100644
index 29b3f9261d6..00000000000
--- a/i18n/deu/src/vs/editor/electron-browser/textMate/TMSyntax.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"invalid.language": "Unbekannte Sprache in \"contributes.{0}.language\". Bereitgestellter Wert: {1}",
-	"invalid.scopeName": "In \"contributes.{0}.scopeName\" wurde eine Zeichenfolge erwartet. Bereitgestellter Wert: {1}",
-	"invalid.path.0": "Expected string in `contributes.{0}.path`. Provided value: {1}",
-	"invalid.injectTo": "Ungültiger Wert in \"contributes.{0}.injectTo\". Es muss sich um ein Array von Sprachbereichsnamen handeln. Bereitgestellter Wert: {1}",
-	"invalid.embeddedLanguages": "Ungültiger Wert in \"contributes.{0}.embeddedLanguages\". Muss eine Objektzuordnung von Bereichsname zu Sprache sein. Angegebener Wert: {1}",
-	"invalid.path.1": "Es wurde erwartet, dass \"contributes.{0}.path\" ({1}) im Ordner ({2}) der Extension enthalten ist. Dies führt ggf. dazu, dass die Extension nicht portierbar ist.",
-	"no-tm-grammar": "Keine TM-Grammatik für diese Sprache registriert."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/editor/node/languageConfigurationExtensionPoint.i18n.json b/i18n/deu/src/vs/editor/node/languageConfigurationExtensionPoint.i18n.json
deleted file mode 100644
index 91b2f0a1b1a..00000000000
--- a/i18n/deu/src/vs/editor/node/languageConfigurationExtensionPoint.i18n.json
+++ /dev/null
@@ -1,23 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"parseErrors": "Fehler beim Analysieren von {0}: {1}",
-	"schema.openBracket": "Das öffnende Klammerzeichen oder die Zeichenfolgensequenz.",
-	"schema.closeBracket": "Das schließende Klammerzeichen oder die Zeichenfolgensequenz.",
-	"schema.comments": "Definiert die Kommentarsymbole.",
-	"schema.blockComments": "Definiert, wie Blockkommentare markiert werden.",
-	"schema.blockComment.begin": "Die Zeichenfolge, mit der ein Blockkommentar beginnt.",
-	"schema.blockComment.end": "Die Zeichenfolge, die einen Blockkommentar beendet.",
-	"schema.lineComment": "Die Zeichenfolge, mit der ein Zeilenkommentar beginnt.",
-	"schema.brackets": "Definiert die Klammersymbole, die den Einzug vergrößern oder verkleinern.",
-	"schema.autoClosingPairs": "Definiert die Klammerpaare. Wenn eine öffnende Klammer eingegeben wird, wird die schließende Klammer automatisch eingefügt.",
-	"schema.autoClosingPairs.notIn": "Definiert eine Liste von Bereichen, in denen die automatischen Paare deaktiviert sind.",
-	"schema.surroundingPairs": "Definiert die Klammerpaare, in die eine ausgewählte Zeichenfolge eingeschlossen werden kann.",
-	"schema.wordPattern": "Die Worddefinition für die Sprache.",
-	"schema.wordPattern.pattern": "RegExp Muster für Wortübereinstimmungen.",
-	"schema.wordPattern.flags": "RegExp Kennzeichen für Wortübereinstimmungen",
-	"schema.wordPattern.flags.errorMessage": "Muss mit dem Muster `/^([gimuy]+)$/` übereinstimmen."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/editor/node/textMate/TMGrammars.i18n.json b/i18n/deu/src/vs/editor/node/textMate/TMGrammars.i18n.json
deleted file mode 100644
index 4701a601dee..00000000000
--- a/i18n/deu/src/vs/editor/node/textMate/TMGrammars.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"vscode.extension.contributes.grammars": "Trägt TextMate-Tokenizer bei.",
-	"vscode.extension.contributes.grammars.language": "Der Sprachbezeichner, für den diese Syntax beigetragen wird.",
-	"vscode.extension.contributes.grammars.scopeName": "Der TextMate-Bereichsname, der von der tmLanguage-Datei verwendet wird.",
-	"vscode.extension.contributes.grammars.path": "Der Pfad der tmLanguage-Datei. Der Pfad ist relativ zum Extensionordner und beginnt normalerweise mit \". /syntaxes/\".",
-	"vscode.extension.contributes.grammars.embeddedLanguages": "Eine Zuordnung zwischen Bereichsname und Sprach-ID, wenn diese Grammatik eingebettete Sprachen enthält.",
-	"vscode.extension.contributes.grammars.injectTo": "Die Liste der Sprachbereichsnamen, in die diese Grammatik injiziert wird."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/platform/actions/browser/menuItemActionItem.i18n.json b/i18n/deu/src/vs/platform/actions/browser/menuItemActionItem.i18n.json
deleted file mode 100644
index 0d4e76110bb..00000000000
--- a/i18n/deu/src/vs/platform/actions/browser/menuItemActionItem.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"titleAndKb": "{0} ({1})"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json b/i18n/deu/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
deleted file mode 100644
index 5dc1bba0ffa..00000000000
--- a/i18n/deu/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"requirearray": "Menüelemente müssen ein Array sein.",
-	"requirestring": "Die Eigenschaft \"{0}\" ist erforderlich. Sie muss vom Typ \"string\" sein.",
-	"optstring": "Die Eigenschaft \"{0}\" kann ausgelassen werden oder muss vom Typ \"string\" sein.",
-	"vscode.extension.contributes.menuItem.command": "Der Bezeichner des auszuführenden Befehls. Der Befehl muss im Abschnitt \"commands\" deklariert werden.",
-	"vscode.extension.contributes.menuItem.alt": "Der Bezeichner eines alternativ auszuführenden Befehls. Der Befehl muss im Abschnitt \"commands\" deklariert werden.",
-	"vscode.extension.contributes.menuItem.when": "Eine Bedingung, die TRUE sein muss, damit dieses Element angezeigt wird.",
-	"vscode.extension.contributes.menuItem.group": "Die Gruppe, zu der dieser Befehl gehört.",
-	"vscode.extension.contributes.menus": "Trägt Menüelemente zum Editor bei.",
-	"menus.commandPalette": "Die Befehlspalette ",
-	"menus.touchBar": "Die Touch Bar (nur macOS)",
-	"menus.editorTitle": "Das Editor-Titelmenü.",
-	"menus.editorContext": "Das Editor-Kontextmenü.",
-	"menus.explorerContext": "Das Kontextmenü des Datei-Explorers.",
-	"menus.editorTabContext": "Das Kontextmenü für die Editor-Registerkarten",
-	"menus.debugCallstackContext": "Das Kontextmenü für den Debug-Callstack",
-	"menus.scmTitle": "Das Titelmenü der Quellcodeverwaltung",
-	"menus.scmSourceControl": "Das Menü \"Quellcodeverwaltung\"",
-	"menus.resourceGroupContext": "Das Ressourcengruppen-Kontextmenü der Quellcodeverwaltung",
-	"menus.resourceStateContext": "Das Ressourcenstatus-Kontextmenü der Quellcodeverwaltung",
-	"view.viewTitle": "Das beigetragene Editor-Titelmenü.",
-	"view.itemContext": "Das beigetragene Anzeigeelement-Kontextmenü.",
-	"nonempty": "Es wurde ein nicht leerer Wert erwartet.",
-	"opticon": "Die Eigenschaft \"icon\" kann ausgelassen werden oder muss eine Zeichenfolge oder ein Literal wie \"{dark, light}\" sein.",
-	"requireStringOrObject": "Die Eigenschaft \"{0}\" ist obligatorisch und muss vom Typ \"Zeichenfolge\" oder \"Objekt\" sein.",
-	"requirestrings": "Die Eigenschaften \"{0}\" und \"{1}\" sind obligatorisch und müssen vom Typ \"Zeichenfolge\" sein.",
-	"vscode.extension.contributes.commandType.command": "Der Bezeichner des auszuführenden Befehls.",
-	"vscode.extension.contributes.commandType.title": "Der Titel, durch den der Befehl in der Benutzeroberfläche dargestellt wird.",
-	"vscode.extension.contributes.commandType.category": "(Optionale) Kategoriezeichenfolge, nach der der Befehl in der Benutzeroberfläche gruppiert wird.",
-	"vscode.extension.contributes.commandType.icon": "(Optional) Das Symbol, das verwendet wird, um den Befehl in der Benutzeroberfläche darzustellen. Es handelt sich um einen Dateipfad oder eine designfähige Konfiguration.",
-	"vscode.extension.contributes.commandType.icon.light": "Der Symbolpfad, wenn ein helles Design verwendet wird.",
-	"vscode.extension.contributes.commandType.icon.dark": "Der Symbolpfad, wenn ein dunkles Design verwendet wird.",
-	"vscode.extension.contributes.commands": "Trägt Befehle zur Befehlspalette bei.",
-	"dup": "Der Befehl \"{0}\" ist mehrmals im Abschnitt \"commands\" vorhanden.",
-	"menuId.invalid": "\"{0}\" ist kein gültiger Menübezeichner.",
-	"missing.command": "Das Menüelement verweist auf einen Befehl \"{0}\", der im Abschnitt \"commands\" nicht definiert ist.",
-	"missing.altCommand": "Das Menüelement verweist auf einen Alternativbefehl \"{0}\", der im Abschnitt \"commands\" nicht definiert ist.",
-	"dupe.command": "Das Menüelement verweist auf den gleichen Befehl wie der Standard- und der Alternativbefehl."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/platform/configuration/common/configurationRegistry.i18n.json b/i18n/deu/src/vs/platform/configuration/common/configurationRegistry.i18n.json
deleted file mode 100644
index af76fa9d219..00000000000
--- a/i18n/deu/src/vs/platform/configuration/common/configurationRegistry.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"defaultConfigurations.title": "Standard-Konfiguration überschreibt",
-	"overrideSettings.description": "Zu überschreibende Einstellungen für Sprache {0} konfigurieren.",
-	"overrideSettings.defaultDescription": "Zu überschreibende Editor-Einstellungen für eine Sprache konfigurieren.",
-	"config.property.languageDefault": "\"{0}\" kann nicht registriert werden. Die Eigenschaft stimmt mit dem Eigenschaftsmuster '\\\\[.*\\\\]$' zum Beschreiben sprachspezifischer Editor-Einstellungen überein. Verwenden Sie den Beitrag \"configurationDefaults\".",
-	"config.property.duplicate": "\"{0}\" kann nicht registriert werden. Diese Eigenschaft ist bereits registriert."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/platform/dialogs/common/dialogs.i18n.json b/i18n/deu/src/vs/platform/dialogs/common/dialogs.i18n.json
deleted file mode 100644
index 86e0a5c4225..00000000000
--- a/i18n/deu/src/vs/platform/dialogs/common/dialogs.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"moreFile": "...1 weitere Datei wird nicht angezeigt",
-	"moreFiles": "...{0} weitere Dateien werden nicht angezeigt"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/platform/dialogs/node/dialogService.i18n.json b/i18n/deu/src/vs/platform/dialogs/node/dialogService.i18n.json
deleted file mode 100644
index 73350e0c953..00000000000
--- a/i18n/deu/src/vs/platform/dialogs/node/dialogService.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"cancel": "Abbrechen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/platform/environment/node/argv.i18n.json b/i18n/deu/src/vs/platform/environment/node/argv.i18n.json
deleted file mode 100644
index f6bdb031026..00000000000
--- a/i18n/deu/src/vs/platform/environment/node/argv.i18n.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"gotoValidation": "Argumente im Modus \"--goto\" müssen im Format \"DATEI(:ZEILE(:ZEICHEN))\" vorliegen.",
-	"diff": "Vergleicht zwei Dateien.",
-	"add": "Fügt einen oder mehrere Ordner zum letzten aktiven Fenster hinzu.",
-	"goto": "Öffnet eine Datei im Pfad in der angegebenen Zeile und an der Zeichenposition.",
-	"newWindow": "Öffnen eines neuen Fensters erzwingen.",
-	"reuseWindow": "Öffnen einer Datei oder eines Ordners im letzten aktiven Fenster erzwingen.",
-	"wait": "Warten Sie, bis die Dateien geschlossen sind, bevor Sie zurück gehen können.",
-	"locale": "Das zu verwendende Gebietsschema (z. B. en-US oder zh-TW).",
-	"userDataDir": "Gibt das Verzeichnis an, in dem Benutzerdaten gespeichert werden. Kann zum Öffnen mehrerer verschiedener Codeinstanzen verwendet werden.",
-	"version": "Gibt die Version aus.",
-	"help": "Gibt die Syntax aus.",
-	"extensionHomePath": "Legen Sie den Stammpfad für Extensions fest.",
-	"listExtensions": "Listet die installierten Extensions auf.",
-	"showVersions": "Zeigt Versionen der installierten Erweiterungen an, wenn \"--list-extension\" verwendet wird.",
-	"installExtension": "Installiert eine Extension.",
-	"uninstallExtension": "Deinstalliert eine Extension.",
-	"experimentalApis": "Aktiviert vorgeschlagene API-Features für eine Erweiterung.",
-	"verbose": "Ausführliche Ausgabe (impliziert \"-wait\").",
-	"log": "Log-Level zu verwenden. Standardwert ist \"Info\". Zulässige Werte sind \"kritisch\", \"Fehler\", \"warnen\", \"Info\", \"debug\", \"verfolgen\", \"aus\".",
-	"status": "Prozessnutzungs- und Diagnose-Informationen ausgeben.",
-	"performance": "Startet mit aktiviertem Befehl \"Developer: Startup Performance\".",
-	"prof-startup": "CPU-Profiler beim Start ausführen",
-	"disableExtensions": "Deaktiviert alle installierten Extensions.",
-	"inspect-extensions": "Erlaubt Debuggen und Profilerstellung für Erweiterungen. Überprüfen Sie die Entwicklertools für die Verbindungs-URI.",
-	"inspect-brk-extensions": "Erlaubt Debuggen und Profilerstellung für Erweiterungen, wobei der Erweiterungs-Host nach dem Start angehalten wird. Überprüfen Sie die Entwicklertools für die Verbindungs-URI.",
-	"disableGPU": "Deaktiviert die GPU-Hardwarebeschleunigung.",
-	"uploadLogs": "Lädt die Logs der aktuellen Sitzung an einem sicheren Endpunkt hoch.",
-	"maxMemory": "Maximale Speichergröße für ein Fenster (in Mbyte).",
-	"usage": "Verwendung",
-	"options": "Optionen",
-	"paths": "Pfade",
-	"stdinWindows": "Zum Einlesen von Ausgaben eines anderen Programms hängen Sie '-' an (z.B. 'echo Hello World | {0} -')",
-	"stdinUnix": "Zum Einlesen von stdin hängen Sie '-' an (z.B. 'ps aux | grep code | {0} -')",
-	"optionsUpperCase": "Optionen",
-	"extensionsManagement": "Erweiterungsverwaltung",
-	"troubleshooting": "Problembehandlung"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/platform/extensionManagement/common/extensionEnablementService.i18n.json b/i18n/deu/src/vs/platform/extensionManagement/common/extensionEnablementService.i18n.json
deleted file mode 100644
index ad5c9b0a0d3..00000000000
--- a/i18n/deu/src/vs/platform/extensionManagement/common/extensionEnablementService.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noWorkspace": "Kein Arbeitsbereich."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/platform/extensionManagement/common/extensionManagement.i18n.json b/i18n/deu/src/vs/platform/extensionManagement/common/extensionManagement.i18n.json
deleted file mode 100644
index 75e517edd5a..00000000000
--- a/i18n/deu/src/vs/platform/extensionManagement/common/extensionManagement.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"extensions": "Extensions",
-	"preferences": "Einstellungen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/platform/extensionManagement/node/extensionGalleryService.i18n.json b/i18n/deu/src/vs/platform/extensionManagement/node/extensionGalleryService.i18n.json
deleted file mode 100644
index aa245a4beed..00000000000
--- a/i18n/deu/src/vs/platform/extensionManagement/node/extensionGalleryService.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"notCompatibleDownload": "Kann nicht heruntergeladen werden, da die Erweiterung, die mit der aktuellen VS Code Version '{0}' kompatibel ist, nicht gefunden werden kann. "
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json b/i18n/deu/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
deleted file mode 100644
index efdaa6c50b1..00000000000
--- a/i18n/deu/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"invalidManifest": "Die Erweiterung ist ungültig: \"package.json\" ist keine JSON-Datei.",
-	"incompatible": "Die Erweiterung \"{0}\" kann nicht installiert werden, die sie nicht mit dem Code \"{1}\" kompatibel ist.",
-	"restartCode": "Bitte starten Sie Code vor der Neuinstallation von {0} neu.",
-	"installingOutdatedExtension": "Eine neuere Version dieser Erweiterung ist bereits installiert. Möchten Sie diese mit der älteren Version überschreiben?",
-	"override": "Überschreiben",
-	"cancel": "Abbrechen",
-	"errorInstallingDependencies": "Fehler während Installation der Abhängigkeiten. {0}",
-	"MarketPlaceDisabled": "Marketplace ist nicht aktiviert.",
-	"removeError": "Fehler beim Entfernen der Erweiterung: {0}. Bitte beenden Sie und starten Sie VS Code neu bevor Sie erneut versuchen die Erweiterung zu installieren.",
-	"Not a Marketplace extension": "Nur Marktplatz-Erweiterungen können neu installiert werden",
-	"notFoundCompatible": "'{0}' kann nicht installiert werden: Es gibt keine mit VS Code '{1}' kompatible Version.",
-	"malicious extension": "Die Erweiterung kann nicht installiert werden, da sie als problematisch gemeldet wurde.",
-	"notFoundCompatibleDependency": "Kann nicht installiert werden, da die abhängige Erweiterung '{0}', die mit der aktuellen VS Code Version '{1}' kompatibel ist, nicht gefunden werden kann. ",
-	"quitCode": "Fehler bei der Installation der Erweiterung. Beenden und starten Sie VS Code vor der erneuten Installation neu.",
-	"exitCode": "Fehler bei der Installation der Erweiterung. Beenden und starten Sie VS Code vor der erneuten Installation neu.",
-	"renameError": "Unbekannter Fehler beim Umbenennen von {0} in {1}",
-	"uninstallDependeciesConfirmation": "Möchten Sie nur \"{0}\" oder auch die zugehörigen Abhängigkeiten deinstallieren?",
-	"uninstallOnly": "Nur Erweiterung",
-	"uninstallAll": "Alle deinstallieren",
-	"singleDependentError": "Die Erweiterung \"{0}\" kann nicht deinstalliert werden. Die Erweiterung \"{1}\" hängt von dieser Erweiterung ab.",
-	"twoDependentsError": "Die Erweiterung \"{0}\" kann nicht deinstalliert werden. Die Erweiterungen \"{1}\" und \"{2}\" hängen von dieser Erweiterung ab.",
-	"multipleDependentsError": "Die Erweiterung \"{0}\" kann nicht deinstalliert werden. Die Erweiterungen \"{1}\" und \"{2}\" sowie weitere hängen von dieser Erweiterung ab.",
-	"notExists": "Die Erweiterung wurde nicht gefunden."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/platform/extensions/common/abstractExtensionService.i18n.json b/i18n/deu/src/vs/platform/extensions/common/abstractExtensionService.i18n.json
deleted file mode 100644
index 76ebdf6051e..00000000000
--- a/i18n/deu/src/vs/platform/extensions/common/abstractExtensionService.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"unknownDep": "Fehler beim Aktivieren der Extension \"{1}\". Ursache: unbekannte Abhängigkeit \"{0}\".",
-	"failedDep1": "Fehler beim Aktivieren der Extension \"{1}\". Ursache: Fehler beim Aktivieren der Extension \"{0}\".",
-	"failedDep2": "Fehler beim Aktivieren der Extension \"{0}\". Ursache: mehr als 10 Ebenen von Abhängigkeiten (wahrscheinlich eine Abhängigkeitsschleife).",
-	"activationError": "Fehler beim Aktivieren der Extension \"{0}\": {1}."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/platform/extensions/common/extensionsRegistry.i18n.json b/i18n/deu/src/vs/platform/extensions/common/extensionsRegistry.i18n.json
deleted file mode 100644
index e9e4a6887bc..00000000000
--- a/i18n/deu/src/vs/platform/extensions/common/extensionsRegistry.i18n.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.engines.vscode": "Gibt für VS Code-Erweiterungen die VS Code-Version an, mit der die Erweiterung kompatibel ist. Darf nicht \"*\" sein. Beispiel: ^0.10.5 gibt die Kompatibilität mit mindestens VS Code-Version 0.10.5 an.",
-	"vscode.extension.publisher": "Der Herausgeber der VS Code-Extension.",
-	"vscode.extension.displayName": "Der Anzeigename für die Extension, der im VS Code-Katalog verwendet wird.",
-	"vscode.extension.categories": "Die vom VS Code-Katalog zum Kategorisieren der Extension verwendeten Kategorien.",
-	"vscode.extension.galleryBanner": "Das in VS Code Marketplace verwendete Banner.",
-	"vscode.extension.galleryBanner.color": "Die Bannerfarbe für die Kopfzeile der VS Code Marketplace-Seite.",
-	"vscode.extension.galleryBanner.theme": "Das Farbdesign für die Schriftart, die im Banner verwendet wird.",
-	"vscode.extension.contributes": "Alle Beiträge der VS Code-Extension, die durch dieses Paket dargestellt werden.",
-	"vscode.extension.preview": "Legt die Erweiterung fest, die im Marketplace als Vorschau gekennzeichnet werden soll.",
-	"vscode.extension.activationEvents": "Aktivierungsereignisse für die VS Code-Extension.",
-	"vscode.extension.activationEvents.onLanguage": "Ein Aktivierungsereignis wird beim Öffnen einer Datei ausgegeben, die in die angegebene Sprache aufgelöst wird.",
-	"vscode.extension.activationEvents.onCommand": "Ein Aktivierungsereignis wird beim Aufrufen des angegebenen Befehls ausgegeben.",
-	"vscode.extension.activationEvents.onDebug": "Ein Aktivierungsereignis wird ausgesandt, wenn ein Benutzer eine Debugging startet, oder eine Debug-Konfiguration erstellt.",
-	"vscode.extension.activationEvents.onDebugInitialConfigurations": "Ein Aktivierungsereignis ausgegeben, wenn ein \"launch.json\" erstellt werden muss (und alle provideDebugConfigurations Methoden aufgerufen werden müssen).",
-	"vscode.extension.activationEvents.onDebugResolve": "Ein Aktivierungsereignis ausgegeben, wenn eine Debug-Sitzung mit dem spezifischen Typ gestartet wird (und eine entsprechende resolveDebugConfiguration-Methode aufgerufen werden muss).",
-	"vscode.extension.activationEvents.workspaceContains": "Ein Aktivierungsereignis wird beim Öffnen eines Ordners ausgegeben, der mindestens eine Datei enthält, die mit dem angegebenen Globmuster übereinstimmt.",
-	"vscode.extension.activationEvents.onView": "Ein Aktivierungsereignis wird beim Erweitern der angegebenen Ansicht ausgegeben.",
-	"vscode.extension.activationEvents.star": "Ein Aktivierungsereignis wird beim Start von VS Code ausgegeben. Damit für die Endbenutzer eine bestmögliche Benutzerfreundlichkeit sichergestellt ist, verwenden Sie dieses Aktivierungsereignis in Ihrer Erweiterung nur dann, wenn in Ihrem Anwendungsfall keine andere Kombination an Aktivierungsereignissen funktioniert.",
-	"vscode.extension.badges": "Array aus Badges, die im Marketplace in der Seitenleiste auf der Seite mit den Erweiterungen angezeigt werden.",
-	"vscode.extension.badges.url": "Die Bild-URL für den Badge.",
-	"vscode.extension.badges.href": "Der Link für den Badge.",
-	"vscode.extension.badges.description": "Eine Beschreibung für den Badge.",
-	"vscode.extension.extensionDependencies": "Abhängigkeiten von anderen Erweiterungen. Der Bezeichner einer Erweiterung ist immer ${publisher}.${name}, beispielsweise \"vscode.csharp\".",
-	"vscode.extension.scripts.prepublish": "Ein Skript, das ausgeführt wird, bevor das Paket als VS Code-Extension veröffentlicht wird.",
-	"vscode.extension.icon": "Der Pfad zu einem 128x128-Pixel-Symbol."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/platform/extensions/node/extensionValidator.i18n.json b/i18n/deu/src/vs/platform/extensions/node/extensionValidator.i18n.json
deleted file mode 100644
index 97dee45e12c..00000000000
--- a/i18n/deu/src/vs/platform/extensions/node/extensionValidator.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"versionSyntax": "`engines.vscode`-Wert {0} konnte nicht analysiert werden. Bitte z. B. folgende verwenden: ^1.22.0, ^1.22.x usw.",
-	"versionSpecificity1": "Die in \"engines.vscode\" ({0}) angegebene Version ist nicht spezifisch genug. Definieren Sie für VS Code-Versionen vor Version 1.0.0 bitte mindestens die gewünschte Haupt- und Nebenversion, z. B. ^0.10.0, 0.10.x, 0.11.0 usw.",
-	"versionSpecificity2": "Die in \"engines.vscode\" ({0}) angegebene Version ist nicht spezifisch genug. Definieren Sie für VS Code-Versionen nach Version 1.0.0 bitte mindestens die gewünschte Hauptversion, z. B. ^1.10.0, 1.10.x, 1.x.x, 2.x.x usw.",
-	"versionMismatch": "Die Extension ist nicht mit dem Code {0} kompatibel. Die Extension erfordert {1}."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/platform/history/electron-main/historyMainService.i18n.json b/i18n/deu/src/vs/platform/history/electron-main/historyMainService.i18n.json
deleted file mode 100644
index 45518a8f052..00000000000
--- a/i18n/deu/src/vs/platform/history/electron-main/historyMainService.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"newWindow": "Neues Fenster",
-	"newWindowDesc": "Öffnet ein neues Fenster.",
-	"recentFolders": "Aktueller Arbeitsbereich",
-	"folderDesc": "{0} {1}",
-	"codeWorkspace": "Codearbeitsbereich"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/platform/integrity/node/integrityServiceImpl.i18n.json b/i18n/deu/src/vs/platform/integrity/node/integrityServiceImpl.i18n.json
deleted file mode 100644
index 2a32b38a4e3..00000000000
--- a/i18n/deu/src/vs/platform/integrity/node/integrityServiceImpl.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"integrity.prompt": "Ihre {0}-Installation ist offenbar beschädigt. Führen Sie eine Neuinstallation durch.",
-	"integrity.moreInformation": "Weitere Informationen",
-	"integrity.dontShowAgain": "Nicht mehr anzeigen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/platform/issue/electron-main/issueService.i18n.json b/i18n/deu/src/vs/platform/issue/electron-main/issueService.i18n.json
deleted file mode 100644
index e05db0db192..00000000000
--- a/i18n/deu/src/vs/platform/issue/electron-main/issueService.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"issueReporter": "Problembericht",
-	"processExplorer": "Prozess-Explorer"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/platform/jsonschemas/common/jsonValidationExtensionPoint.i18n.json b/i18n/deu/src/vs/platform/jsonschemas/common/jsonValidationExtensionPoint.i18n.json
deleted file mode 100644
index b8898654138..00000000000
--- a/i18n/deu/src/vs/platform/jsonschemas/common/jsonValidationExtensionPoint.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"contributes.jsonValidation": "Trägt zur JSON-Schemakonfiguration bei.",
-	"contributes.jsonValidation.fileMatch": "Das Dateimuster, mit dem eine Übereinstimmung vorliegen soll, z. B. \"package.json\" oder \"*.launch\".",
-	"contributes.jsonValidation.url": "Eine Schema-URL (\"http:\", \"Https:\") oder der relative Pfad zum Extensionordner (\". /\").",
-	"invalid.jsonValidation": "configuration.jsonValidation muss ein Array sein.",
-	"invalid.fileMatch": "configuration.jsonValidation.fileMatch muss definiert sein.",
-	"invalid.url": "configuration.jsonValidation.url muss eine URL oder ein relativer Pfad sein.",
-	"invalid.url.fileschema": "configuration.jsonValidation.url ist eine ungültige relative URL: {0}",
-	"invalid.url.schema": "\"configuration.jsonValidation.url\" muss mit \"http:\", \"https:\" oder \"./\" starten, um auf Schemas zu verweisen, die in der Extension gespeichert sind."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/platform/keybinding/common/abstractKeybindingService.i18n.json b/i18n/deu/src/vs/platform/keybinding/common/abstractKeybindingService.i18n.json
deleted file mode 100644
index f971e9d99da..00000000000
--- a/i18n/deu/src/vs/platform/keybinding/common/abstractKeybindingService.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"first.chord": "({0}) wurde gedrückt. Es wird auf die zweite Taste der Kombination gewartet...",
-	"missing.chord": "Die Tastenkombination ({0}, {1}) ist kein Befehl."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/platform/keybinding/common/keybindingLabels.i18n.json b/i18n/deu/src/vs/platform/keybinding/common/keybindingLabels.i18n.json
deleted file mode 100644
index d7a218d2a95..00000000000
--- a/i18n/deu/src/vs/platform/keybinding/common/keybindingLabels.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"ctrlKey": "STRG",
-	"shiftKey": "UMSCHALTTASTE",
-	"altKey": "ALT",
-	"windowsKey": "Windows",
-	"ctrlKey.long": "STRG",
-	"shiftKey.long": "UMSCHALTTASTE",
-	"altKey.long": "ALT",
-	"cmdKey.long": "Befehlstaste",
-	"windowsKey.long": "Windows"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/platform/list/browser/listService.i18n.json b/i18n/deu/src/vs/platform/list/browser/listService.i18n.json
deleted file mode 100644
index d3f2996964a..00000000000
--- a/i18n/deu/src/vs/platform/list/browser/listService.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"workbenchConfigurationTitle": "Workbench",
-	"multiSelectModifier.ctrlCmd": "Ist unter Windows und Linux der Taste \"STRG\" und unter macOSX der Befehlstaste zugeordnet.",
-	"multiSelectModifier.alt": "Ist unter Windows und Linux der Taste \"Alt\" und unter macOSX der Wahltaste zugeordnet. ",
-	"multiSelectModifier": "Der Modifizierer zum Hinzufügen eines Elements in Bäumen und Listen zu einer Mehrfachauswahl mit der Maus (zum Beispiel im Explorer, in geöffneten Editoren und in der SCM-Ansicht). \"ctrlCmd\" wird unter Windows und Linux der Taste \"STRG\" und unter macOSX der Befehlstaste zugeordnet. Die Mausbewegung \"Seitlich öffnen\" wird – sofern unterstützt – so angepasst, dass kein Konflikt mit dem Modifizierer zur Mehrfachauswahl entsteht.",
-	"openMode.singleClick": "Öffnet Elemente mit einem einzelnen Mausklick.",
-	"openMode.doubleClick": "Öffnet Elemente mit einem doppelten Mausklick.",
-	"openModeModifier": "Steuert, wie Elemente in Bäumen und Listen mithilfe der Maus geöffnet werden (sofern unterstützt). Legen Sie \"singleClick\" fest, um Elemente mit einem einzelnen Mausklick zu öffnen, und \"doubleClick\", damit sie nur mit einem doppelten Mausklick geöffnet werden. Bei übergeordneten Elementen, deren untergeordnete Elemente sich in Bäumen befinden, steuert diese Einstellung, ob ein Einfachklick oder ein Doppelklick das übergeordnete Elemente erweitert. Beachten Sie, dass einige Bäume und Listen diese Einstellung ggf. ignorieren, wenn sie nicht zutrifft.",
-	"horizontalScrolling setting": "Steuert, ob Bäume horizontales Scrollen in der Workbench unterstützen."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/platform/localizations/common/localizations.i18n.json b/i18n/deu/src/vs/platform/localizations/common/localizations.i18n.json
deleted file mode 100644
index ec17b7e0321..00000000000
--- a/i18n/deu/src/vs/platform/localizations/common/localizations.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.contributes.localizations": "Trägt Lokalisierungen zum Editor bei",
-	"vscode.extension.contributes.localizations.languageId": "ID der Sprache, in die Anzeigezeichenfolgen übersetzt werden.",
-	"vscode.extension.contributes.localizations.languageName": "Name der Sprache in Englisch.",
-	"vscode.extension.contributes.localizations.languageNameLocalized": "Name der Sprache in beigetragener Sprache.",
-	"vscode.extension.contributes.localizations.translations": "Liste der Übersetzungen, die der Sprache zugeordnet sind.",
-	"vscode.extension.contributes.localizations.translations.id": "ID von VS Code oder der Erweiterung, für die diese Übersetzung beigetragen wird. Die ID von VS Code ist immer \"vscode\", und die ID einer Erweiterung muss im Format \"publisherId.extensionName\" vorliegen.",
-	"vscode.extension.contributes.localizations.translations.id.pattern": "Die ID muss \"vscode\" sein oder im Format \"publisherId.extensionName\" vorliegen, um VS Code bzw. eine Erweiterung zu übersetzen.",
-	"vscode.extension.contributes.localizations.translations.path": "Ein relativer Pfad zu einer Datei mit Übersetzungen für die Sprache."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/platform/markers/common/markers.i18n.json b/i18n/deu/src/vs/platform/markers/common/markers.i18n.json
deleted file mode 100644
index e5b40fe4a67..00000000000
--- a/i18n/deu/src/vs/platform/markers/common/markers.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"sev.error": "Fehler",
-	"sev.warning": "Warnung",
-	"sev.info": "Info"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/platform/markers/common/problemMatcher.i18n.json b/i18n/deu/src/vs/platform/markers/common/problemMatcher.i18n.json
deleted file mode 100644
index 4e3ccae983b..00000000000
--- a/i18n/deu/src/vs/platform/markers/common/problemMatcher.i18n.json
+++ /dev/null
@@ -1,72 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"ProblemPatternParser.loopProperty.notLast": "Die loop-Eigenschaft wird nur für Matcher für die letzte Zeile unterstützt.",
-	"ProblemPatternParser.problemPattern.missingRegExp": "Im Problemmuster fehlt ein regulärer Ausdruck.",
-	"ProblemPatternParser.problemPattern.missingProperty": "Das Problemmuster ist ungültig. Es muss mindestens eine Datei, Nachricht und Zeile oder eine Speicherort-Übereinstimmungsgruppe aufweisen.",
-	"ProblemPatternParser.invalidRegexp": "Fehler: Die Zeichenfolge {0} ist kein gültiger regulärer Ausdruck.\n",
-	"ProblemPatternSchema.regexp": "Der reguläre Ausdruck zum Ermitteln eines Fehlers, einer Warnung oder von Informationen in der Ausgabe.",
-	"ProblemPatternSchema.file": "Der Übereinstimmungsgruppenindex des Dateinamens. Wenn keine Angabe erfolgt, wird 1 verwendet.",
-	"ProblemPatternSchema.location": "Der Übereinstimmungsgruppenindex der Position des Problems. Gültige Positionsmuster: (line), (line,column) und (startLine,startColumn,endLine,endColumn). Wenn keine Angabe erfolgt, wird (line,column) angenommen.",
-	"ProblemPatternSchema.line": "Der Übereinstimmungsgruppenindex der Zeile des Problems. Der Standardwert ist 2.",
-	"ProblemPatternSchema.column": "Der Übereinstimmungsgruppenindex des Zeilenzeichens des Problems. Der Standardwert ist 3.",
-	"ProblemPatternSchema.endLine": "Der Übereinstimmungsgruppenindex der Endzeile des Problems. Der Standardwert ist undefiniert.",
-	"ProblemPatternSchema.endColumn": "Der Übereinstimmungsgruppenindex des Zeilenendezeichens des Problems. Der Standardwert ist undefiniert.",
-	"ProblemPatternSchema.severity": "Der Übereinstimmungsgruppenindex des Schweregrads des Problems. Der Standardwert ist undefiniert.",
-	"ProblemPatternSchema.code": "Der Übereinstimmungsgruppenindex des Codes des Problems. Der Standardwert ist undefiniert.",
-	"ProblemPatternSchema.message": "Der Übereinstimmungsgruppenindex der Nachricht. Wenn keine Angabe erfolgt, ist der Standardwert 4, wenn die Position angegeben wird. Andernfalls ist der Standardwert 5.",
-	"ProblemPatternSchema.loop": "Gibt in einer mehrzeiligen Abgleichschleife an, ob dieses Muster in einer Schleife ausgeführt wird, wenn es übereinstimmt. Kann nur für ein letztes Muster in einem mehrzeiligen Muster angegeben werden.",
-	"NamedProblemPatternSchema.name": "Der Name des Problemmusters.",
-	"NamedMultiLineProblemPatternSchema.name": "Der Name des mehrzeiligen Problemmusters.",
-	"NamedMultiLineProblemPatternSchema.patterns": "Die aktuellen Muster.",
-	"ProblemPatternExtPoint": "Trägt Problemmuster bei",
-	"ProblemPatternRegistry.error": "Ungültiges Problemmuster. Das Muster wird ignoriert.",
-	"ProblemMatcherParser.noProblemMatcher": "Fehler: Die Beschreibung kann nicht in einen Problemabgleich konvertiert werden:\n{0}\n",
-	"ProblemMatcherParser.noProblemPattern": "Fehler: Die Beschreibung definiert kein gültiges Problemmuster:\n{0}\n",
-	"ProblemMatcherParser.noOwner": "Fehler: Die Beschreibung definiert keinen Besitzer:\n{0}\n",
-	"ProblemMatcherParser.noFileLocation": "Fehler: Die Beschreibung definiert keinen Dateispeicherort:\n{0}\n",
-	"ProblemMatcherParser.unknownSeverity": "Info: unbekannter Schweregrad {0}. Gültige Werte sind Fehler, Warnung und Info.\n",
-	"ProblemMatcherParser.noDefinedPatter": "Fehler: Das Muster mit dem Bezeichner {0} ist nicht vorhanden.",
-	"ProblemMatcherParser.noIdentifier": "Fehler: Die Mustereigenschaft verweist auf einen leeren Bezeichner.",
-	"ProblemMatcherParser.noValidIdentifier": "Fehler: Die Mustereigenschaft {0} ist kein gültiger Name für eine Mustervariable.",
-	"ProblemMatcherParser.problemPattern.watchingMatcher": "Ein Problemmatcher muss ein Anfangsmuster und ein Endmuster für die Überwachung definieren.",
-	"ProblemMatcherParser.invalidRegexp": "Fehler: Die Zeichenfolge {0} ist kein gültiger regulärer Ausdruck.\n",
-	"WatchingPatternSchema.regexp": "Der reguläre Ausdruck zum Erkennen des Anfangs oder Endes eines Hintergrundtasks.",
-	"WatchingPatternSchema.file": "Der Übereinstimmungsgruppenindex des Dateinamens. Kann ausgelassen werden.",
-	"PatternTypeSchema.name": "Der Name eines beigetragenen oder vordefinierten Musters",
-	"PatternTypeSchema.description": "Ein Problemmuster oder der Name eines beigetragenen oder vordefinierten Problemmusters. Kann ausgelassen werden, wenn die Basis angegeben ist.",
-	"ProblemMatcherSchema.base": "Der Name eines zu verwendenden Basisproblemabgleichers.",
-	"ProblemMatcherSchema.owner": "Der Besitzer des Problems im Code. Kann ausgelassen werden, wenn \"base\" angegeben wird. Der Standardwert ist \"external\", wenn keine Angabe erfolgt und \"base\" nicht angegeben wird.",
-	"ProblemMatcherSchema.severity": "Der Standardschweregrad für Erfassungsprobleme. Dieser wird verwendet, wenn das Muster keine Übereinstimmungsgruppe für den Schweregrad definiert.",
-	"ProblemMatcherSchema.applyTo": "Steuert, ob ein für ein Textdokument gemeldetes Problem nur auf geöffnete, geschlossene oder alle Dokumente angewendet wird.",
-	"ProblemMatcherSchema.fileLocation": "Definiert, wie Dateinamen interpretiert werden sollen, die in einem Problemmuster gemeldet werden.",
-	"ProblemMatcherSchema.background": "Muster zum Nachverfolgen des Beginns und Endes eines Abgleichers, der für eine Hintergrundaufgabe aktiv ist.",
-	"ProblemMatcherSchema.background.activeOnStart": "Wenn dieser Wert auf \"true\" festgelegt wird, befindet sich die Hintergrundüberwachung im aktiven Modus, wenn die Aufgabe gestartet wird. Dies entspricht dem Ausgeben einer Zeile, die mit dem \"beginPattern\" übereinstimmt.",
-	"ProblemMatcherSchema.background.beginsPattern": "Wenn eine Übereinstimmung mit der Ausgabe vorliegt, wird der Start einer Hintergrundaufgabe signalisiert.",
-	"ProblemMatcherSchema.background.endsPattern": "Wenn eine Übereinstimmung mit der Ausgabe vorliegt, wird das Ende einer Hintergrundaufgabe signalisiert.",
-	"ProblemMatcherSchema.watching.deprecated": "Die Überwachungseigenschaft ist veraltet. Verwenden Sie stattdessen den Hintergrund.",
-	"ProblemMatcherSchema.watching": "Muster zum Nachverfolgen des Beginns und Endes eines Problemabgleicher.",
-	"ProblemMatcherSchema.watching.activeOnStart": "Wenn dieser Wert auf \"true\" festgelegt wird, befindet sich die Überwachung im aktiven Modus, wenn der Task gestartet wird. Dies entspricht dem Ausgeben einer Zeile, die mit dem \"beginPattern\" übereinstimmt.",
-	"ProblemMatcherSchema.watching.beginsPattern": "Wenn eine Übereinstimmung mit der Ausgabe vorliegt, wird der Start eines Überwachungstasks signalisiert.",
-	"ProblemMatcherSchema.watching.endsPattern": "Wenn eine Übereinstimmung mit der Ausgabe vorliegt, wird das Ende eines Überwachungstasks signalisiert.",
-	"LegacyProblemMatcherSchema.watchedBegin.deprecated": "Diese Eigenschaft ist veraltet. Verwenden Sie stattdessen die Überwachungseigenschaft.",
-	"LegacyProblemMatcherSchema.watchedBegin": "Ein regulärer Ausdruck, der signalisiert, dass die Ausführung eines überwachten Tasks (ausgelöst durch die Dateiüberwachung) beginnt.",
-	"LegacyProblemMatcherSchema.watchedEnd.deprecated": "Diese Eigenschaft ist veraltet. Verwenden Sie stattdessen die Überwachungseigenschaft.",
-	"LegacyProblemMatcherSchema.watchedEnd": "Ein regulärer Ausdruck, der signalisiert, dass die Ausführung eines überwachten Tasks beendet wird.",
-	"NamedProblemMatcherSchema.name": "Der Name des Problemabgleichers, anhand dessen auf ihn verwiesen wird.",
-	"NamedProblemMatcherSchema.label": "Eine lesbare Bezeichnung für den Problemabgleicher.",
-	"ProblemMatcherExtPoint": "Trägt Problemabgleicher bei",
-	"msCompile": "Microsoft-Compilerprobleme",
-	"lessCompile": "LESS Probleme",
-	"gulp-tsc": "Gulp-TSC-Probleme",
-	"jshint": "JSHint-Probleme",
-	"jshint-stylish": "JSHint-Stilprobleme",
-	"eslint-compact": "ESLint-Komprimierungsprobleme",
-	"eslint-stylish": "ESLint-Stilprobleme",
-	"go": "Go Probleme"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/platform/message/common/message.i18n.json b/i18n/deu/src/vs/platform/message/common/message.i18n.json
deleted file mode 100644
index f09fe4a631b..00000000000
--- a/i18n/deu/src/vs/platform/message/common/message.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"close": "Schließen",
-	"later": "Später",
-	"cancel": "Abbrechen",
-	"moreFile": "...1 weitere Datei wird nicht angezeigt",
-	"moreFiles": "...{0} weitere Dateien werden nicht angezeigt"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/platform/node/minimalTranslations.i18n.json b/i18n/deu/src/vs/platform/node/minimalTranslations.i18n.json
deleted file mode 100644
index 7cd9c11ca05..00000000000
--- a/i18n/deu/src/vs/platform/node/minimalTranslations.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"showLanguagePackExtensions": "VS Code ist auf {0} erhältlich. Auf dem Marketplace finden Sie Language Packs für den Einstieg.",
-	"searchMarketplace": "Marketplace durchsuchen",
-	"installAndRestartMessage": "VS Code ist auf {0} erhältlich. Installieren Sie das Language Pack, und legen Sie los. Hierzu ist ein Neustart erforderlich.",
-	"installAndRestart": "Installieren und neu starten"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/platform/request/node/request.i18n.json b/i18n/deu/src/vs/platform/request/node/request.i18n.json
deleted file mode 100644
index 337800e1610..00000000000
--- a/i18n/deu/src/vs/platform/request/node/request.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"httpConfigurationTitle": "HTTP",
-	"proxy": "Die zu verwendende Proxyeinstellung. Wenn diese Option nicht festgelegt wird, wird der Wert aus den Umgebungsvariablen \"http_proxy\" und \"https_proxy\" übernommen.",
-	"strictSSL": "Gibt an, ob das Proxyserverzertifikat anhand der Liste der bereitgestellten Zertifizierungsstellen überprüft werden soll.",
-	"proxyAuthorization": "Der Wert, der als Proxy-Authorization-Header für jede Netzwerkanforderung gesendet werden soll."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/platform/telemetry/common/telemetryService.i18n.json b/i18n/deu/src/vs/platform/telemetry/common/telemetryService.i18n.json
deleted file mode 100644
index 0c06b3d4d30..00000000000
--- a/i18n/deu/src/vs/platform/telemetry/common/telemetryService.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"telemetryConfigurationTitle": "Telemetrie",
-	"telemetry.enableTelemetry": "Aktivieren Sie das Senden von Nutzungsdaten und Fehlern an Microsoft."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/platform/theme/common/colorExtensionPoint.i18n.json b/i18n/deu/src/vs/platform/theme/common/colorExtensionPoint.i18n.json
deleted file mode 100644
index ee2ed63656e..00000000000
--- a/i18n/deu/src/vs/platform/theme/common/colorExtensionPoint.i18n.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"contributes.color": "Fügt in Erweiterung definierte verwendbare Farben hinzu",
-	"contributes.color.id": "Der Bezeichner der verwendbaren Farbe",
-	"contributes.color.id.format": "Bezeichner sollten in folgendem Format vorliegen: aa [.bb] *",
-	"contributes.color.description": "Die Beschreibung der verwendbaren Farbe",
-	"contributes.defaults.light": "Die Standardfarbe für helle Themen. Entweder eine Farbe als Hex-Code (#RRGGBB[AA]) oder der Bezeichner einer verwendbaren Farbe, der eine Standardeinstellung bereitstellt.",
-	"contributes.defaults.dark": "Die Standardfarbe für dunkle Themen. Entweder eine Farbe als Hex-Code (#RRGGBB[AA]) oder der Bezeichner einer verwendbaren Farbe, der eine Standardeinstellung bereitstellt.",
-	"contributes.defaults.highContrast": "Die Standardfarbe für Themen mit hohem Kontrast. Entweder eine Farbe als Hex-Code (#RRGGBB[AA]) oder der Bezeichner einer verwendbaren Farbe, der eine Standardeinstellung bereitstellt.",
-	"invalid.colorConfiguration": "\"configuration.colors\" muss ein Array sein.",
-	"invalid.default.colorType": "{0} muss entweder eine Farbe als Hex-Code (#RRGGBB[AA] oder #RGB[A]) sein oder der Bezeichner einer verwendbaren Farbe, der eine Standardeinstellung bereitstellt.",
-	"invalid.id": "\"configuration.colors.id\" muss definiert und nicht leer sein",
-	"invalid.id.format": "\"configuration.colors.id\" muss auf das Wort[.word]* folgen",
-	"invalid.description": "\"configuration.colors.description\" muss definiert und darf nicht leer sein",
-	"invalid.defaults": "\"configuration.colors.defaults\" muss definiert sein, und \"light\", \"dark\" und \"highContrast\" enthalten"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/platform/theme/common/colorRegistry.i18n.json b/i18n/deu/src/vs/platform/theme/common/colorRegistry.i18n.json
deleted file mode 100644
index b32f03c31fd..00000000000
--- a/i18n/deu/src/vs/platform/theme/common/colorRegistry.i18n.json
+++ /dev/null
@@ -1,101 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"schema.colors": "In der Workbench verwendete Farben.",
-	"foreground": "Allgemeine Vordergrundfarbe. Diese Farbe wird nur verwendet, wenn sie nicht durch eine Komponente überschrieben wird.",
-	"errorForeground": "Allgemeine Vordergrundfarbe. Diese Farbe wird nur verwendet, wenn sie nicht durch eine Komponente überschrieben wird.",
-	"descriptionForeground": "Vordergrundfarbe für Beschreibungstexte, die weitere Informationen anzeigen, z. B. für ein Label.",
-	"focusBorder": "Allgemeine Rahmenfarbe für fokussierte Elemente. Diese Farbe wird nur verwendet, wenn sie nicht durch eine Komponente überschrieben wird.",
-	"contrastBorder": "Ein zusätzlicher Rahmen um Elemente, mit dem diese von anderen getrennt werden, um einen größeren Kontrast zu erreichen.",
-	"activeContrastBorder": "Ein zusätzlicher Rahmen um aktive Elemente, mit dem diese von anderen getrennt werden, um einen größeren Kontrast zu erreichen.",
-	"selectionBackground": "Hintergrundfarbe der Textauswahl in der Workbench (z. B. für Eingabefelder oder Textbereiche). Diese Farbe gilt nicht für die Auswahl im Editor. ",
-	"textSeparatorForeground": "Farbe für Text-Trennzeichen.",
-	"textLinkForeground": "Vordergrundfarbe für Links im Text.",
-	"textLinkActiveForeground": "Vordergrundfarbe für angeklickte Links im Text und beim Zeigen darauf mit der Maus.",
-	"textPreformatForeground": "Vordergrundfarbe für vorformatierte Textsegmente.",
-	"textBlockQuoteBackground": "Hintergrundfarbe für block quotes im Text.",
-	"textBlockQuoteBorder": "Rahmenfarbe für block quotes im Text.",
-	"textCodeBlockBackground": "Hintergrundfarbe für Code-Blöcke im Text.",
-	"widgetShadow": "Schattenfarbe von Widgets wie zum Beispiel Suchen/Ersetzen innerhalb des Editors.",
-	"inputBoxBackground": "Hintergrund für Eingabefeld.",
-	"inputBoxForeground": "Vordergrund für Eingabefeld.",
-	"inputBoxBorder": "Rahmen für Eingabefeld.",
-	"inputBoxActiveOptionBorder": "Rahmenfarbe für aktivierte Optionen in Eingabefeldern.",
-	"inputPlaceholderForeground": "Input box - Vordergrundfarbe für Platzhalter-Text.",
-	"inputValidationInfoBackground": "Hintergrundfarbe bei der Eingabevalidierung für den Schweregrad der Information.",
-	"inputValidationInfoBorder": "Rahmenfarbe bei der Eingabevalidierung für den Schweregrad der Information.",
-	"inputValidationWarningBackground": "Hintergrundfarbe bei der Eingabevalidierung für den Schweregrad der Warnung.",
-	"inputValidationWarningBorder": "Rahmenfarbe bei der Eingabevalidierung für den Schweregrad der Warnung.",
-	"inputValidationErrorBackground": "Hintergrundfarbe bei der Eingabevalidierung für den Schweregrad des Fehlers.",
-	"inputValidationErrorBorder": "Rahmenfarbe bei der Eingabevalidierung für den Schweregrad des Fehlers.",
-	"dropdownBackground": "Hintergrund für Dropdown.",
-	"dropdownListBackground": "Hintergrund für Dropdownliste.",
-	"dropdownForeground": "Vordergrund für Dropdown.",
-	"dropdownBorder": "Rahmen für Dropdown.",
-	"listFocusBackground": "Hintergrundfarbe der Liste/Struktur für das fokussierte Element, wenn die Liste/Struktur aktiv ist. Eine aktive Liste/Struktur hat Tastaturfokus, eine inaktive hingegen nicht.",
-	"listFocusForeground": "Vordergrundfarbe der Liste/Struktur für das fokussierte Element, wenn die Liste/Struktur aktiv ist. Eine aktive Liste/Struktur hat Tastaturfokus, eine inaktive hingegen nicht.",
-	"listActiveSelectionBackground": "Hintergrundfarbe der Liste/Struktur für das ausgewählte Element, wenn die Liste/Struktur aktiv ist. Eine aktive Liste/Struktur hat Tastaturfokus, eine inaktive hingegen nicht.",
-	"listActiveSelectionForeground": "Vordergrundfarbe der Liste/Struktur für das ausgewählte Element, wenn die Liste/Struktur aktiv ist. Eine aktive Liste/Struktur hat Tastaturfokus, eine inaktive hingegen nicht.",
-	"listInactiveSelectionBackground": "Hintergrundfarbe der Liste/Struktur für das ausgewählte Element, wenn die Liste/Struktur inaktiv ist. Eine aktive Liste/Struktur hat Tastaturfokus, eine inaktive hingegen nicht.",
-	"listInactiveSelectionForeground": "Liste/Baumstruktur - Vordergrundfarbe für das ausgewählte Element, wenn die Liste/Baumstruktur inaktiv ist. Eine aktive Liste/Baumstruktur hat Tastaturfokus, eine inaktive hingegen nicht.",
-	"listHoverBackground": "Hintergrund der Liste/Struktur, wenn mit der Maus auf Elemente gezeigt wird.",
-	"listHoverForeground": "Vordergrund der Liste/Struktur, wenn mit der Maus auf Elemente gezeigt wird.",
-	"listDropBackground": "Drag & Drop-Hintergrund der Liste/Struktur, wenn Elemente mithilfe der Maus verschoben werden.",
-	"highlight": "Vordergrundfarbe der Liste/Struktur zur Trefferhervorhebung beim Suchen innerhalb der Liste/Struktur.",
-	"invalidItemForeground": "Liste/Baum Vordergrundfarbe für ungültige Elemente, z. B. eine ungelöste Wurzel im Explorer.",
-	"listErrorForeground": "Vordergrundfarbe für Listenelemente, die Fehler enthalten.",
-	"listWarningForeground": "Vordergrundfarbe für Listenelemente, die Warnungen enthalten.",
-	"pickerGroupForeground": "Schnellauswahlfarbe für das Gruppieren von Bezeichnungen.",
-	"pickerGroupBorder": "Schnellauswahlfarbe für das Gruppieren von Rahmen.",
-	"buttonForeground": "Vordergrundfarbe der Schaltfläche.",
-	"buttonBackground": "Hintergrundfarbe der Schaltfläche.",
-	"buttonHoverBackground": "Hintergrundfarbe der Schaltfläche, wenn darauf gezeigt wird.",
-	"badgeBackground": "Badge - Hintergrundfarbe. Badges sind kurze Info-Texte, z. B. für Anzahl Suchergebnisse.",
-	"badgeForeground": "Badge - Vordergrundfarbe. Badges sind kurze Info-Texte, z. B. für Anzahl Suchergebnisse.",
-	"scrollbarShadow": "Schatten der Scrollleiste, um anzuzeigen, dass die Ansicht gescrollt wird.",
-	"scrollbarSliderBackground": "Hintergrundfarbe vom Scrollbar-Schieber",
-	"scrollbarSliderHoverBackground": "Hintergrundfarbe des Schiebereglers, wenn darauf gezeigt wird.",
-	"scrollbarSliderActiveBackground": "Hintergrundfarbe des Schiebereglers, wenn darauf geklickt wird.",
-	"progressBarBackground": "Hintergrundfarbe des Fortschrittbalkens, der für lang ausgeführte Vorgänge angezeigt werden kann.",
-	"editorBackground": "Hintergrundfarbe des Editors.",
-	"editorForeground": "Standardvordergrundfarbe des Editors.",
-	"editorWidgetBackground": "Hintergrundfarbe von Editor-Widgets wie zum Beispiel Suchen/Ersetzen.",
-	"editorWidgetBorder": "Rahmenfarbe von Editorwigdets. Die Farbe wird nur verwendet, wenn für das Widget ein Rahmen verwendet wird und die Farbe nicht von einem Widget überschrieben wird.",
-	"editorSelectionBackground": "Farbe der Editor-Auswahl.",
-	"editorSelectionForeground": "Farbe des gewählten Text für einen hohen Kontrast",
-	"editorInactiveSelection": "Farbe der Auswahl in einem inaktiven Editor. Die Farbe muss durchsichtig sein, um dahinterliegende Dekorationen nicht zu verbergen. ",
-	"editorSelectionHighlight": "Farbe für Bereiche, deren Inhalt der Auswahl entspricht. Die Farbe muss durchsichtig sein, um dahinterliegende Dekorationen nicht zu verbergen.",
-	"editorSelectionHighlightBorder": "Randfarbe für Bereiche, deren Inhalt der Auswahl entspricht.",
-	"editorFindMatch": "Farbe des aktuellen Suchergebnisses.",
-	"findMatchHighlight": "Farbe der anderen Suchergebnisse. Die Farbe muss durchsichtig sein, um dahinterliegende Dekorationen nicht zu verbergen. ",
-	"findRangeHighlight": "Farbe des Bereichs zur Einschränkung der Suche. Die Farbe muss durchsichtig sein, um dahinterliegende Dekorationen nicht zu verbergen.",
-	"editorFindMatchBorder": "Randfarbe des aktuellen Suchergebnisses.",
-	"findMatchHighlightBorder": "Randfarbe der anderen Suchtreffer.",
-	"findRangeHighlightBorder": "Rahmenfarbe des Bereichs zur Einschränkung der Suche. Die Farbe muss durchsichtig sein, um dahinterliegende Dekorationen nicht zu verbergen.",
-	"findWidgetResizeBorder": "Rahmenfarbe der Größenänderungsleiste im Suchwidget.",
-	"hoverHighlight": "Hervorhebung eines Worts, unter dem ein Mauszeiger angezeigt wird. Die Farbe muss durchsichtig sein, um dahinterliegende Dekorationen nicht zu verbergen. ",
-	"hoverBackground": "Background color of the editor hover.",
-	"hoverBorder": "Rahmenfarbe des Editor-Mauszeigers.",
-	"activeLinkForeground": "Farbe der aktiven Links.",
-	"diffEditorInserted": "Hintergrundfarbe für eingefügten Text. Die Farbe muss durchsichtig sein, um dahinterliegende Dekorationen nicht zu verbergen. ",
-	"diffEditorRemoved": "Hintergrundfarbe für entfernten Text. Die Farbe muss durchsichtig sein, um dahinterliegende Dekorationen nicht zu verbergen. ",
-	"diffEditorInsertedOutline": "Konturfarbe für eingefügten Text.",
-	"diffEditorRemovedOutline": "Konturfarbe für entfernten Text.",
-	"mergeCurrentHeaderBackground": "Aktueller Kopfzeilenhintergrund in Inline-Mergingkonflikten. Die Farbe muss durchsichtig sein, um dahinterliegende Dekorationen nicht zu verbergen.",
-	"mergeCurrentContentBackground": "Aktueller Inhaltshintergrund in Inline-Mergingkonflikten. Die Farbe muss durchsichtig sein, um dahinterliegende Dekorationen nicht zu verbergen. ",
-	"mergeIncomingHeaderBackground": "Hintergrund für eingehende Kopfzeile in Inline-Mergingkonflikten. Die Farbe muss durchsichtig sein, um dahinterliegende Dekorationen nicht zu verbergen. ",
-	"mergeIncomingContentBackground": "Hintergrund für eingehenden Inhalt in Inline-Mergingkonflikten. Die Farbe muss durchsichtig sein, um dahinterliegende Dekorationen nicht zu verbergen. ",
-	"mergeCommonHeaderBackground": "Inhaltshintergrund des gemeinsamen übergeordneten Elements bei Inline-Mergingkonflikten. Die Farbe muss durchsichtig sein, um dahinterliegende Dekorationen nicht zu verbergen.",
-	"mergeCommonContentBackground": "Inhaltshintergrund des gemeinsamen übergeordneten Elements bei Inline-Mergingkonflikten. Die Farbe muss durchsichtig sein, um dahinterliegende Dekorationen nicht zu verbergen.",
-	"mergeBorder": "Rahmenfarbe für Kopfzeilen und die Aufteilung in Inline-Mergingkonflikten.",
-	"overviewRulerCurrentContentForeground": "Aktueller Übersichtslineal-Vordergrund für Inline-Mergingkonflikte.",
-	"overviewRulerIncomingContentForeground": "Eingehender Übersichtslineal-Vordergrund für Inline-Mergingkonflikte. ",
-	"overviewRulerCommonContentForeground": "Hintergrund des Übersichtslineals des gemeinsamen übergeordneten Elements bei Inlinezusammenführungskonflikten.",
-	"overviewRulerFindMatchForeground": "Übersichtslineal-Markierungsfarbe für Suchübereinstimmungen. Die Farbe muss durchsichtig sein, um dahinterliegende Dekorationen nicht zu verbergen.",
-	"overviewRulerSelectionHighlightForeground": "Übersichtslineal-Markierungsfarbe für Auswahlhervorhebungen. Die Farbe muss durchsichtig sein, um dahinterliegende Dekorationen nicht zu verbergen."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/platform/update/node/update.config.contribution.i18n.json b/i18n/deu/src/vs/platform/update/node/update.config.contribution.i18n.json
deleted file mode 100644
index 34bc5adaa6a..00000000000
--- a/i18n/deu/src/vs/platform/update/node/update.config.contribution.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"updateConfigurationTitle": "Aktualisieren",
-	"updateChannel": "Konfiguriert, ob automatische Updates aus einem Updatekanal empfangen werden sollen. Erfordert einen Neustart nach der Änderung.",
-	"enableWindowsBackgroundUpdates": "Aktiviert Windows-Hintergrundaktualisierungen."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/platform/url/electron-browser/inactiveExtensionUrlHandler.i18n.json b/i18n/deu/src/vs/platform/url/electron-browser/inactiveExtensionUrlHandler.i18n.json
deleted file mode 100644
index 963c535d992..00000000000
--- a/i18n/deu/src/vs/platform/url/electron-browser/inactiveExtensionUrlHandler.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"confirmUrl": "Darf eine Erweiterung diese URL öffnen?"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/platform/windows/electron-main/windowsService.i18n.json b/i18n/deu/src/vs/platform/windows/electron-main/windowsService.i18n.json
deleted file mode 100644
index 80bc78667c0..00000000000
--- a/i18n/deu/src/vs/platform/windows/electron-main/windowsService.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"aboutDetail": "Version {0}\nCommit {1}\nDatum {2}\nShell {3}\nRenderer {4}\nNode {5}\nArchitektur {6}",
-	"okButton": "OK",
-	"copy": "&&Kopieren"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/platform/workspaces/common/workspaces.i18n.json b/i18n/deu/src/vs/platform/workspaces/common/workspaces.i18n.json
deleted file mode 100644
index 9267e4f1762..00000000000
--- a/i18n/deu/src/vs/platform/workspaces/common/workspaces.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"codeWorkspace": "Codearbeitsbereich",
-	"untitledWorkspace": "Ohne Titel (Arbeitsbereich)",
-	"workspaceNameVerbose": "{0} (Arbeitsbereich)",
-	"workspaceName": "{0} (Arbeitsbereich)"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/api/browser/localizationsExtensionPoint.i18n.json b/i18n/deu/src/vs/workbench/api/browser/localizationsExtensionPoint.i18n.json
deleted file mode 100644
index 48e278c8a8d..00000000000
--- a/i18n/deu/src/vs/workbench/api/browser/localizationsExtensionPoint.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"requirestring": "Die Eigenschaft \"{0}\" ist erforderlich. Sie muss vom Typ \"string\" sein.",
-	"optstring": "Die Eigenschaft \"{0}\" kann ausgelassen werden oder muss vom Typ \"string\" sein."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/api/browser/viewsContainersExtensionPoint.i18n.json b/i18n/deu/src/vs/workbench/api/browser/viewsContainersExtensionPoint.i18n.json
deleted file mode 100644
index f7f318e7188..00000000000
--- a/i18n/deu/src/vs/workbench/api/browser/viewsContainersExtensionPoint.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.contributes.views.containers.id": "Eindeutige ID, die zum Bestimmen des Containers verwendet wird, in dem Ansichten mithilfe des Beitragspunkts \"views\" beigetragen werden können.",
-	"vscode.extension.contributes.views.containers.title": "Visuell lesbare Zeichenfolge zum Rendern des Containers",
-	"vscode.extension.contributes.views.containers.icon": "Pfad zum Containersymbol. Symbole sind 24×24 groß und in einem Rechteck (50×40) zentriert. Die Füllfarbe ist \"rgb(215, 218, 224)\" bzw. \"#d7dae0\". Zwar werden alle Bilddateitypen akzeptiert, es werden jedoch SVG-Symbole empfohlen.",
-	"vscode.extension.contributes.viewsContainers": "Trägt Ansichtencontainer zum Editor bei",
-	"views.container.activitybar": "Trägt Ansichtencontainer zur Aktivitätsleiste bei",
-	"test": "Test",
-	"requirearray": "Ansichtencontainer müssen ein Array sein",
-	"requireidstring": "Die Eigenschaft \"{0}\" ist erforderlich. Sie muss vom Typ \"string\" sein. Nur alphanumerische Buchstaben sowie \"_\" und \"-\" sind zulässig.",
-	"requirestring": "Die Eigenschaft \"{0}\" ist erforderlich. Sie muss vom Typ \"string\" sein.",
-	"showViewlet": "{0} anzeigen",
-	"view": "Anzeigen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json b/i18n/deu/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json
deleted file mode 100644
index 03df43c789f..00000000000
--- a/i18n/deu/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"requirearray": "Ansichten müssen ein Array sein.",
-	"requirestring": "Die Eigenschaft \"{0}\" ist erforderlich. Sie muss vom Typ \"string\" sein.",
-	"optstring": "Die Eigenschaft \"{0}\" kann ausgelassen werden oder muss vom Typ \"string\" sein.",
-	"vscode.extension.contributes.view.id": "Bezeichner der Ansicht. Damit können Sie einen Datenanbieter über die API \"vscode.window.registerTreeDataProviderForView\" registrieren. Er dient auch zum Aktivieren Ihrer Erweiterung, indem Sie das Ereignis \"onView:${id}\" für \"activationEvents\" registrieren.",
-	"vscode.extension.contributes.view.name": "Der visuell lesbare Name der Ansicht. Wird angezeigt",
-	"vscode.extension.contributes.view.when": "Bedingung, die zum Anzeigen dieser Ansicht erfüllt sein muss",
-	"vscode.extension.contributes.views": "Trägt Ansichten zum Editor bei.",
-	"views.explorer": "Trägt Ansichten zum Explorer-Container in der Aktivitätsleiste bei",
-	"views.debug": "Trägt Ansichten zum Debugging-Container in der Aktivitätsleiste bei",
-	"views.scm": "Trägt Ansichten zum SCM-Container in der Aktivitätsleiste bei",
-	"views.test": "Trägt Ansichten zum Testcontainer in der Aktivitätsleiste bei",
-	"views.contributed": "Trägt Ansichten zum Container mit beigetragenen Ansichten bei",
-	"ViewContainerDoesnotExist": "Der Ansichtencontainer \"{0}\" ist nicht vorhanden, und alle für ihn registrierten Ansichten werden zu \"Explorer\" hinzugefügt.",
-	"duplicateView1": "Mehrere Ansichten können nicht mit derselben ID \"{0}\" am Speicherort \"{1}\" registriert werden.",
-	"duplicateView2": "Eine Ansicht mit der ID \"{0}\" ist am Speicherort \"{1}\" bereits registriert."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/api/electron-browser/mainThreadExtensionService.i18n.json b/i18n/deu/src/vs/workbench/api/electron-browser/mainThreadExtensionService.i18n.json
deleted file mode 100644
index 1d3dbda78ae..00000000000
--- a/i18n/deu/src/vs/workbench/api/electron-browser/mainThreadExtensionService.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"overwritingExtension": "Die Erweiterung \"{0}\" wird mit \"{1}\" überschrieben.",
-	"extensionUnderDevelopment": "Die Entwicklungserweiterung unter \"{0}\" wird geladen."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/api/electron-browser/mainThreadMessageService.i18n.json b/i18n/deu/src/vs/workbench/api/electron-browser/mainThreadMessageService.i18n.json
deleted file mode 100644
index 31d5f89b909..00000000000
--- a/i18n/deu/src/vs/workbench/api/electron-browser/mainThreadMessageService.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"extensionSource": "{0} (Erweiterung)",
-	"defaultSource": "Erweiterung",
-	"manageExtension": "Erweiterung verwalten",
-	"cancel": "Abbrechen",
-	"ok": "OK"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json b/i18n/deu/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
deleted file mode 100644
index 75b29940522..00000000000
--- a/i18n/deu/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"timeout.formatOnSave": "Formatieren beim Speichern nach {0} ms abgebrochen",
-	"codeActionsOnSave.didTimeout": "codeActionsOnSave nach {0} ms abgebrochen",
-	"timeout.onWillSave": "Bei onWillSaveTextDocument-Ereignis nach 1750 ms abgebrochen",
-	"saveParticipants": "Speichern von Teilnehmern wird ausgeführt …"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json b/i18n/deu/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json
deleted file mode 100644
index ee8688cdc85..00000000000
--- a/i18n/deu/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"task.label": "{0}: {1}"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/api/electron-browser/mainThreadWebview.i18n.json b/i18n/deu/src/vs/workbench/api/electron-browser/mainThreadWebview.i18n.json
deleted file mode 100644
index 522ad6a6e3b..00000000000
--- a/i18n/deu/src/vs/workbench/api/electron-browser/mainThreadWebview.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"errorMessage": "Ein Fehler ist aufgetreten beim Wiederherstellen der Ansicht: {0}"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/api/electron-browser/mainThreadWorkspace.i18n.json b/i18n/deu/src/vs/workbench/api/electron-browser/mainThreadWorkspace.i18n.json
deleted file mode 100644
index e0a6dee0eee..00000000000
--- a/i18n/deu/src/vs/workbench/api/electron-browser/mainThreadWorkspace.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"folderStatusMessageAddSingleFolder": "Die Erweiterung \"{0}\" hat 1 Ordner zum Arbeitsbereich hinzugefügt",
-	"folderStatusMessageAddMultipleFolders": "Die Erweiterung \"{0}\" hat {1} Ordner zum Arbeitsbereich hinzugefügt",
-	"folderStatusMessageRemoveSingleFolder": "Die Erweiterung \"{0}\" hat 1 Ordner aus dem Arbeitsbereich entfernt",
-	"folderStatusMessageRemoveMultipleFolders": "Die Erweiterung \"{0}\" hat {1} Ordner aus dem Arbeitsbereich entfernt",
-	"folderStatusChangeFolder": "Die Erweiterung \"{0}\" hat Ordner des Arbeitsbereichs geändert"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/api/node/extHostDiagnostics.i18n.json b/i18n/deu/src/vs/workbench/api/node/extHostDiagnostics.i18n.json
deleted file mode 100644
index 716a1e02afa..00000000000
--- a/i18n/deu/src/vs/workbench/api/node/extHostDiagnostics.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"limitHit": "{0} weitere Fehler und Warnungen werden nicht angezeigt."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/api/node/extHostExplorerView.i18n.json b/i18n/deu/src/vs/workbench/api/node/extHostExplorerView.i18n.json
deleted file mode 100644
index c6eed83d999..00000000000
--- a/i18n/deu/src/vs/workbench/api/node/extHostExplorerView.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"treeExplorer.notRegistered": "Es ist kein TreeExplorerNodeProvider mit ID \"{0}\" registriert.",
-	"treeExplorer.failedToProvideRootNode": "TreeExplorerNodeProvider \"{0}\" hat keinen Stammknoten bereitgestellt."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/api/node/extHostExtensionActivator.i18n.json b/i18n/deu/src/vs/workbench/api/node/extHostExtensionActivator.i18n.json
deleted file mode 100644
index 409eb14cc60..00000000000
--- a/i18n/deu/src/vs/workbench/api/node/extHostExtensionActivator.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"unknownDep": "Fehler beim Aktivieren der Erweiterung \"{1}\". Ursache: unbekannte Abhängigkeit \"{0}\".",
-	"failedDep1": "Fehler beim Aktivieren der Erweiterung \"{1}\". Ursache: Fehler beim Aktivieren der Erweiterung \"{0}\".",
-	"failedDep2": "Fehler beim Aktivieren der Erweiterung \"{0}\". Ursache: mehr als 10 Ebenen von Abhängigkeiten (wahrscheinlich eine Abhängigkeitsschleife).",
-	"activationError": "Fehler beim Aktivieren der Erweiterung \"{0}\": {1}."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/api/node/extHostProgress.i18n.json b/i18n/deu/src/vs/workbench/api/node/extHostProgress.i18n.json
deleted file mode 100644
index a933ea1e428..00000000000
--- a/i18n/deu/src/vs/workbench/api/node/extHostProgress.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"extensionSource": "{0} (Erweiterung)"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/api/node/extHostTask.i18n.json b/i18n/deu/src/vs/workbench/api/node/extHostTask.i18n.json
deleted file mode 100644
index ee8688cdc85..00000000000
--- a/i18n/deu/src/vs/workbench/api/node/extHostTask.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"task.label": "{0}: {1}"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/api/node/extHostTreeExplorers.i18n.json b/i18n/deu/src/vs/workbench/api/node/extHostTreeExplorers.i18n.json
deleted file mode 100644
index de9318e6926..00000000000
--- a/i18n/deu/src/vs/workbench/api/node/extHostTreeExplorers.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"treeExplorer.notRegistered": "Es ist kein TreeExplorerNodeProvider mit ID \"{0}\" registriert.",
-	"treeExplorer.failedToProvideRootNode": "TreeExplorerNodeProvider \"{0}\" hat keinen Stammknoten bereitgestellt.",
-	"treeExplorer.failedToResolveChildren": "TreeExplorerNodeProvider \"{0}\" hat \"resolveChildren\" nicht ausgeführt."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/api/node/extHostTreeView.i18n.json b/i18n/deu/src/vs/workbench/api/node/extHostTreeView.i18n.json
deleted file mode 100644
index c6eed83d999..00000000000
--- a/i18n/deu/src/vs/workbench/api/node/extHostTreeView.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"treeExplorer.notRegistered": "Es ist kein TreeExplorerNodeProvider mit ID \"{0}\" registriert.",
-	"treeExplorer.failedToProvideRootNode": "TreeExplorerNodeProvider \"{0}\" hat keinen Stammknoten bereitgestellt."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/api/node/extHostTreeViews.i18n.json b/i18n/deu/src/vs/workbench/api/node/extHostTreeViews.i18n.json
deleted file mode 100644
index 41189883731..00000000000
--- a/i18n/deu/src/vs/workbench/api/node/extHostTreeViews.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"treeView.notRegistered": "Kein Treeviw mit der id '{0}' registriert.",
-	"treeView.duplicateElement": "Das Element mit der ID {0} ist bereits registriert"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/api/node/extHostWorkspace.i18n.json b/i18n/deu/src/vs/workbench/api/node/extHostWorkspace.i18n.json
deleted file mode 100644
index c79dfb308b8..00000000000
--- a/i18n/deu/src/vs/workbench/api/node/extHostWorkspace.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"updateerror": "Die Erweiterung \"{0}\" konnte die Arbeitsbereichsordner nicht aktualisieren: {1}"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/api/node/mainThreadExtensionService.i18n.json b/i18n/deu/src/vs/workbench/api/node/mainThreadExtensionService.i18n.json
deleted file mode 100644
index 1d3dbda78ae..00000000000
--- a/i18n/deu/src/vs/workbench/api/node/mainThreadExtensionService.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"overwritingExtension": "Die Erweiterung \"{0}\" wird mit \"{1}\" überschrieben.",
-	"extensionUnderDevelopment": "Die Entwicklungserweiterung unter \"{0}\" wird geladen."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/api/node/mainThreadMessageService.i18n.json b/i18n/deu/src/vs/workbench/api/node/mainThreadMessageService.i18n.json
deleted file mode 100644
index d76b48e30db..00000000000
--- a/i18n/deu/src/vs/workbench/api/node/mainThreadMessageService.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"close": "Schließen",
-	"cancel": "Abbrechen",
-	"ok": "OK"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/browser/actions/configureLocale.i18n.json b/i18n/deu/src/vs/workbench/browser/actions/configureLocale.i18n.json
deleted file mode 100644
index f17cc2cd8aa..00000000000
--- a/i18n/deu/src/vs/workbench/browser/actions/configureLocale.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"configureLocale": "Sprache konfigurieren",
-	"displayLanguage": "Definiert die Anzeigesprache von VSCode.",
-	"doc": "Unter {0} finden Sie eine Liste der unterstützten Sprachen.",
-	"restart": "Das Ändern dieses Wertes erfordert einen Neustart von VSCode.",
-	"fail.createSettings": "{0} ({1}) kann nicht erstellt werden.",
-	"JsonSchema.locale": "Die zu verwendende Sprache der Benutzeroberfläche."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/browser/actions/fileActions.i18n.json b/i18n/deu/src/vs/workbench/browser/actions/fileActions.i18n.json
deleted file mode 100644
index ca445767e16..00000000000
--- a/i18n/deu/src/vs/workbench/browser/actions/fileActions.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"openFolder": "Ordner öffnen...",
-	"openFileFolder": "Öffnen..."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/browser/actions/toggleActivityBarVisibility.i18n.json b/i18n/deu/src/vs/workbench/browser/actions/toggleActivityBarVisibility.i18n.json
deleted file mode 100644
index bdd75cadd1a..00000000000
--- a/i18n/deu/src/vs/workbench/browser/actions/toggleActivityBarVisibility.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleActivityBar": "Sichtbarkeit der Aktivitätsleiste umschalten",
-	"view": "Anzeigen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/browser/actions/toggleCenteredLayout.i18n.json b/i18n/deu/src/vs/workbench/browser/actions/toggleCenteredLayout.i18n.json
deleted file mode 100644
index dcbbc2577af..00000000000
--- a/i18n/deu/src/vs/workbench/browser/actions/toggleCenteredLayout.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleCenteredLayout": "Zentriertes Layout umschalten",
-	"view": "Anzeigen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/browser/actions/toggleEditorLayout.i18n.json b/i18n/deu/src/vs/workbench/browser/actions/toggleEditorLayout.i18n.json
deleted file mode 100644
index 3ae82e6cd90..00000000000
--- a/i18n/deu/src/vs/workbench/browser/actions/toggleEditorLayout.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleEditorGroupLayout": "Horizontales/Vertikales Layout für Editor-Gruppe umschalten",
-	"horizontalLayout": "Horizontales Layout für Editor-Gruppe",
-	"verticalLayout": "Vertikales Layout für Editor-Gruppe",
-	"view": "Anzeigen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/browser/actions/toggleSidebarPosition.i18n.json b/i18n/deu/src/vs/workbench/browser/actions/toggleSidebarPosition.i18n.json
deleted file mode 100644
index c57365ae862..00000000000
--- a/i18n/deu/src/vs/workbench/browser/actions/toggleSidebarPosition.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleSidebarPosition": "Position der Seitenleiste umschalten",
-	"view": "Anzeigen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/browser/actions/toggleSidebarVisibility.i18n.json b/i18n/deu/src/vs/workbench/browser/actions/toggleSidebarVisibility.i18n.json
deleted file mode 100644
index b8a9e08a051..00000000000
--- a/i18n/deu/src/vs/workbench/browser/actions/toggleSidebarVisibility.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleSidebar": "Randleistensichtbarkeit umschalten",
-	"view": "Anzeigen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/browser/actions/toggleStatusbarVisibility.i18n.json b/i18n/deu/src/vs/workbench/browser/actions/toggleStatusbarVisibility.i18n.json
deleted file mode 100644
index fe3c543e1d4..00000000000
--- a/i18n/deu/src/vs/workbench/browser/actions/toggleStatusbarVisibility.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleStatusbar": "Sichtbarkeit der Statusleiste umschalten",
-	"view": "Anzeigen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/browser/actions/toggleTabsVisibility.i18n.json b/i18n/deu/src/vs/workbench/browser/actions/toggleTabsVisibility.i18n.json
deleted file mode 100644
index ba921c208d6..00000000000
--- a/i18n/deu/src/vs/workbench/browser/actions/toggleTabsVisibility.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleTabs": "Registerkartensichtbarkeit umschalten",
-	"view": "Anzeigen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/browser/actions/toggleZenMode.i18n.json b/i18n/deu/src/vs/workbench/browser/actions/toggleZenMode.i18n.json
deleted file mode 100644
index 8c9971a9aad..00000000000
--- a/i18n/deu/src/vs/workbench/browser/actions/toggleZenMode.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleZenMode": "Zen-Modus umschalten",
-	"view": "Anzeigen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/browser/actions/workspaceActions.i18n.json b/i18n/deu/src/vs/workbench/browser/actions/workspaceActions.i18n.json
deleted file mode 100644
index 108a8fac6be..00000000000
--- a/i18n/deu/src/vs/workbench/browser/actions/workspaceActions.i18n.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openFile": "Datei öffnen...",
-	"openFolder": "Ordner öffnen...",
-	"openFileFolder": "Öffnen...",
-	"globalRemoveFolderFromWorkspace": "Ordner aus dem Arbeitsbereich entfernen...",
-	"saveWorkspaceAsAction": "Arbeitsbereich speichern unter...",
-	"save": "&&Speichern",
-	"saveWorkspace": "Arbeitsbereich speichern",
-	"openWorkspaceAction": "Arbeitsbereich öffnen...",
-	"openWorkspaceConfigFile": "Konfigurationsdatei des Arbeitsbereichs öffnen",
-	"duplicateWorkspaceInNewWindow": "Duplikat des Arbeitsbereichs in neuem Fenster erstellen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/browser/actions/workspaceCommands.i18n.json b/i18n/deu/src/vs/workbench/browser/actions/workspaceCommands.i18n.json
deleted file mode 100644
index 09731afa67a..00000000000
--- a/i18n/deu/src/vs/workbench/browser/actions/workspaceCommands.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"addFolderToWorkspace": "Ordner zum Arbeitsbereich hinzufügen...",
-	"add": "&&Hinzufügen",
-	"addFolderToWorkspaceTitle": "Ordner zum Arbeitsbereich hinzufügen",
-	"workspaceFolderPickerPlaceholder": "Arbeitsbereichsordner auswählen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/browser/parts/activitybar/activitybarActions.i18n.json b/i18n/deu/src/vs/workbench/browser/parts/activitybar/activitybarActions.i18n.json
deleted file mode 100644
index 9ce0dd879da..00000000000
--- a/i18n/deu/src/vs/workbench/browser/parts/activitybar/activitybarActions.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"badgeTitle": "{0} - {1}",
-	"titleKeybinding": "{0} ({1})",
-	"removeFromActivityBar": "Auf Aktivitätsleiste ausblenden",
-	"keepInActivityBar": "In Aktivitätsleiste behalten",
-	"additionalViews": "Zusätzliche Ansichten",
-	"numberBadge": "{0} ({1})",
-	"manageExtension": "Erweiterung verwalten",
-	"toggle": "Ansichtsfixierung umschalten"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/browser/parts/activitybar/activitybarPart.i18n.json b/i18n/deu/src/vs/workbench/browser/parts/activitybar/activitybarPart.i18n.json
deleted file mode 100644
index 900e15af436..00000000000
--- a/i18n/deu/src/vs/workbench/browser/parts/activitybar/activitybarPart.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hideActivitBar": "Aktivitätsleiste ausblenden",
-	"globalActions": "Globale Aktionen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/browser/parts/compositePart.i18n.json b/i18n/deu/src/vs/workbench/browser/parts/compositePart.i18n.json
deleted file mode 100644
index eda0b8b793f..00000000000
--- a/i18n/deu/src/vs/workbench/browser/parts/compositePart.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"ariaCompositeToolbarLabel": "{0}-Aktionen",
-	"titleTooltip": "{0} ({1})"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/browser/parts/compositebar/compositeBar.i18n.json b/i18n/deu/src/vs/workbench/browser/parts/compositebar/compositeBar.i18n.json
deleted file mode 100644
index 4bc0dc4c674..00000000000
--- a/i18n/deu/src/vs/workbench/browser/parts/compositebar/compositeBar.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"activityBarAriaLabel": "Umschaltung der aktiven Ansicht"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/browser/parts/compositebar/compositeBarActions.i18n.json b/i18n/deu/src/vs/workbench/browser/parts/compositebar/compositeBarActions.i18n.json
deleted file mode 100644
index 073096f1735..00000000000
--- a/i18n/deu/src/vs/workbench/browser/parts/compositebar/compositeBarActions.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"largeNumberBadge": "10k+",
-	"badgeTitle": "{0} - {1}",
-	"additionalViews": "Zusätzliche Ansichten",
-	"numberBadge": "{0} ({1})",
-	"manageExtension": "Erweiterung verwalten",
-	"titleKeybinding": "{0} ({1})",
-	"hide": "Ausblenden",
-	"keep": "Beibehalten",
-	"toggle": "Ansichtsfixierung umschalten"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/browser/parts/editor/binaryDiffEditor.i18n.json b/i18n/deu/src/vs/workbench/browser/parts/editor/binaryDiffEditor.i18n.json
deleted file mode 100644
index ea1317f6659..00000000000
--- a/i18n/deu/src/vs/workbench/browser/parts/editor/binaryDiffEditor.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"metadataDiff": "{0} ↔ {1}"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/browser/parts/editor/binaryEditor.i18n.json b/i18n/deu/src/vs/workbench/browser/parts/editor/binaryEditor.i18n.json
deleted file mode 100644
index 247a0c2411b..00000000000
--- a/i18n/deu/src/vs/workbench/browser/parts/editor/binaryEditor.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"binaryEditor": "Binärdateien-Viewer"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json b/i18n/deu/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json
deleted file mode 100644
index 12e4c96abba..00000000000
--- a/i18n/deu/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"textEditor": "Text-Editor",
-	"textDiffEditor": "Textdiff-Editor",
-	"binaryDiffEditor": "Binärdiff-Editor",
-	"sideBySideEditor": "Editor mit Ansicht \"Nebeneinander\"",
-	"groupOnePicker": "Editoren in erster Gruppe anzeigen",
-	"groupTwoPicker": "Editoren in zweiter Gruppe anzeigen",
-	"groupThreePicker": "Editoren in dritter Gruppe anzeigen",
-	"allEditorsPicker": "Alle geöffneten Editoren anzeigen",
-	"view": "Anzeigen",
-	"file": "Datei",
-	"close": "Schließen",
-	"closeOthers": "Andere schließen",
-	"closeRight": "Rechts schließen",
-	"closeAllSaved": "Gespeicherte schließen",
-	"closeAll": "Alle schließen",
-	"keepOpen": "Geöffnet lassen",
-	"toggleInlineView": "Inlineansicht umschalten",
-	"showOpenedEditors": "Geöffnete Editoren anzeigen",
-	"keepEditor": "Editor beibehalten",
-	"closeEditorsInGroup": "Alle Editoren in der Gruppe schließen",
-	"closeSavedEditors": "Gespeicherte Editoren in Gruppe schließen",
-	"closeOtherEditors": "Andere Editoren schließen",
-	"closeRightEditors": "Editoren rechts schließen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/browser/parts/editor/editorActions.i18n.json b/i18n/deu/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
deleted file mode 100644
index bfd72770d07..00000000000
--- a/i18n/deu/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
+++ /dev/null
@@ -1,58 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"splitEditor": "Editor teilen",
-	"joinTwoGroups": "Editors von zwei Gruppen verknüpfen",
-	"navigateEditorGroups": "Zwischen Editor-Gruppen navigieren",
-	"focusActiveEditorGroup": "Fokus in aktiver Editor-Gruppe",
-	"focusFirstEditorGroup": "Fokus in erster Editor-Gruppe",
-	"focusSecondEditorGroup": "Fokus in zweiter Editor-Gruppe",
-	"focusThirdEditorGroup": "Fokus in dritter Editor-Gruppe",
-	"focusPreviousGroup": "Fokus in vorheriger Gruppe",
-	"focusNextGroup": "Fokus in nächster Gruppe",
-	"openToSide": "Zur Seite öffnen",
-	"closeEditor": "Editor schließen",
-	"closeOneEditor": "Schließen",
-	"revertAndCloseActiveEditor": "Wiederherstellen und Editor schließen",
-	"closeEditorsToTheLeft": "Editoren links schließen",
-	"closeAllEditors": "Alle Editoren schließen",
-	"closeEditorsInOtherGroups": "Editoren in anderen Gruppen schließen",
-	"moveActiveGroupLeft": "Editor-Gruppe nach links verschieben",
-	"moveActiveGroupRight": "Editor-Gruppe nach rechts verschieben",
-	"minimizeOtherEditorGroups": "Andere Editor-Gruppen minimieren",
-	"evenEditorGroups": "Gleichmäßige Breite der Editor-Gruppe",
-	"maximizeEditor": "Editor-Gruppe maximieren und Randleiste ausblenden",
-	"openNextEditor": "Nächsten Editor öffnen",
-	"openPreviousEditor": "Vorherigen Editor öffnen",
-	"nextEditorInGroup": "Nächsten Editor in der Gruppe öffnen",
-	"openPreviousEditorInGroup": "Vorherigen Editor in der Gruppe öffnen",
-	"lastEditorInGroup": "Letzten Editor in der Gruppe öffnen",
-	"navigateNext": "Weiter",
-	"navigatePrevious": "Zurück",
-	"navigateLast": "Zum Ende gehen",
-	"reopenClosedEditor": "Geschlossenen Editor erneut öffnen",
-	"clearRecentFiles": "Zuletzt geöffnete löschen",
-	"showEditorsInFirstGroup": "Editoren in erster Gruppe anzeigen",
-	"showEditorsInSecondGroup": "Editoren in zweiter Gruppe anzeigen",
-	"showEditorsInThirdGroup": "Editoren in dritter Gruppe anzeigen",
-	"showAllEditors": "Alle Editoren anzeigen",
-	"openPreviousRecentlyUsedEditorInGroup": "Vorherigen zuletzt verwendeten Editor in der Gruppe öffnen",
-	"openNextRecentlyUsedEditorInGroup": "Nächsten zuletzt verwendeten Editor in der Gruppe öffnen",
-	"navigateEditorHistoryByInput": "Vorherigen Editor aus Verlauf öffnen",
-	"openNextRecentlyUsedEditor": "Nächsten zuletzt verwendeten Editor öffnen",
-	"openPreviousRecentlyUsedEditor": "Vorherigen zuletzt verwendeten Editor öffnen",
-	"clearEditorHistory": "Editor-Verlauf löschen",
-	"focusLastEditorInStack": "Letzten Editor in der Gruppe öffnen",
-	"moveEditorLeft": "Editor nach links verschieben",
-	"moveEditorRight": "Editor nach rechts verschieben",
-	"moveEditorToPreviousGroup": "Editor in vorherige Gruppe verschieben",
-	"moveEditorToNextGroup": "Editor in nächste Gruppe verschieben",
-	"moveEditorToFirstGroup": "Editor in die erste Gruppe verschieben",
-	"moveEditorToSecondGroup": "Editor in die zweite Gruppe verschieben",
-	"moveEditorToThirdGroup": "Editor in die dritte Gruppe verschieben"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json b/i18n/deu/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json
deleted file mode 100644
index ad42a8f37c9..00000000000
--- a/i18n/deu/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"editorCommand.activeEditorMove.description": "Aktiven Editor nach Tabstopps oder Gruppen verschieben",
-	"editorCommand.activeEditorMove.arg.name": "Argument zum Verschieben des aktiven Editors",
-	"editorCommand.activeEditorMove.arg.description": "Argumenteigenschaften:\n\t* \"to\": Ein Zeichenfolgenwert, der das Ziel des Verschiebungsvorgangs angibt.\n\t* \"by\": Ein Zeichenfolgenwert, der die Einheit für die Verschiebung angibt (nach Registerkarte oder nach Gruppe).\n\t* \"value\": Ein Zahlenwert, der angibt, um wie viele Positionen verschoben wird. Es kann auch die absolute Position für die Verschiebung angegeben werden.\n"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/browser/parts/editor/editorPart.i18n.json b/i18n/deu/src/vs/workbench/browser/parts/editor/editorPart.i18n.json
deleted file mode 100644
index 7e606c7aec9..00000000000
--- a/i18n/deu/src/vs/workbench/browser/parts/editor/editorPart.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"groupOneVertical": "Links",
-	"groupTwoVertical": "Zentriert",
-	"groupThreeVertical": "Rechts",
-	"groupOneHorizontal": "Oben",
-	"groupTwoHorizontal": "Zentriert",
-	"groupThreeHorizontal": "Unten",
-	"editorOpenError": "{0} kann nicht geöffnet werden: {1}"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/browser/parts/editor/editorPicker.i18n.json b/i18n/deu/src/vs/workbench/browser/parts/editor/editorPicker.i18n.json
deleted file mode 100644
index 88da57dea31..00000000000
--- a/i18n/deu/src/vs/workbench/browser/parts/editor/editorPicker.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"entryAriaLabel": "{0}, Editor-Gruppenauswahl",
-	"groupLabel": "Gruppe: {0}",
-	"noResultsFoundInGroup": "Es wurde kein übereinstimmender geöffneter Editor in der Gruppe gefunden.",
-	"noOpenedEditors": "Die Liste der geöffneten Editoren in der Gruppe ist zurzeit leer.",
-	"noResultsFound": "Es wurde kein übereinstimmender geöffneter Editor gefunden.",
-	"noOpenedEditorsAllGroups": "Die Liste der geöffneten Editoren ist zurzeit leer."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json b/i18n/deu/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json
deleted file mode 100644
index 66f3a1eebbd..00000000000
--- a/i18n/deu/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"singleSelectionRange": "Zeile {0}, Spalte {1} ({2} ausgewählt)",
-	"singleSelection": "Zeile {0}, Spalte {1}",
-	"multiSelectionRange": "{0} Auswahlen ({1} Zeichen ausgewählt)",
-	"multiSelection": "{0} Auswahlen",
-	"endOfLineLineFeed": "LF",
-	"endOfLineCarriageReturnLineFeed": "CRLF",
-	"tabFocusModeEnabled": "TAB-TASTE verschiebt Fokus",
-	"screenReaderDetected": "Für Sprachausgabe optimiert",
-	"screenReaderDetectedExtra": "Wenn Sie keine Sprachausgabe verwenden, ändern Sie die Einstellung \"editor.accessibilitySupport\" in \"Aus\".",
-	"disableTabMode": "Barrierefreiheitsmodus deaktivieren",
-	"gotoLine": "Gehe zu Zeile",
-	"selectIndentation": "Einzug auswählen",
-	"selectEncoding": "Codierung auswählen",
-	"selectEOL": "Zeilenendesequenz auswählen",
-	"selectLanguageMode": "Sprachmodus auswählen",
-	"fileInfo": "Dateiinformationen",
-	"spacesSize": "Leerzeichen: {0}",
-	"tabSize": "Tabulatorgröße: {0}",
-	"showLanguageExtensions": "Marketplace-Erweiterungen für \"{0}\" durchsuchen...",
-	"changeMode": "Sprachmodus ändern",
-	"noEditor": "Zurzeit ist kein Text-Editor aktiv.",
-	"languageDescription": "({0}): konfigurierte Sprache",
-	"languageDescriptionConfigured": "({0})",
-	"languagesPicks": "Sprachen (Bezeichner)",
-	"configureModeSettings": "\"{0}\" sprachbasierte Einstellungen konfigurieren...",
-	"configureAssociationsExt": "Dateizuordnung für \"{0}\" konfigurieren...",
-	"autoDetect": "Automatische Erkennung",
-	"pickLanguage": "Sprachmodus auswählen",
-	"currentAssociation": "Aktuelle Zuordnung",
-	"pickLanguageToConfigure": "Sprachmodus auswählen, der \"{0}\" zugeordnet werden soll",
-	"changeIndentation": "Einzug ändern",
-	"noWritableCodeEditor": "Der aktive Code-Editor ist schreibgeschützt.",
-	"indentView": "Ansicht wechseln",
-	"indentConvert": "Datei konvertieren",
-	"pickAction": "Aktion auswählen",
-	"changeEndOfLine": "Zeilenendesequenz ändern",
-	"pickEndOfLine": "Zeilenendesequenz auswählen",
-	"changeEncoding": "Dateicodierung ändern",
-	"noFileEditor": "Zurzeit ist keine Datei aktiv.",
-	"saveWithEncoding": "Mit Codierung speichern",
-	"reopenWithEncoding": "Mit Codierung erneut öffnen",
-	"guessedEncoding": "Vom Inhalt abgeleitet",
-	"pickEncodingForReopen": "Dateicodierung zum erneuten Öffnen der Datei auswählen",
-	"pickEncodingForSave": "Dateicodierung auswählen, mit der gespeichert werden soll",
-	"screenReaderDetectedExplanation.title": "Für Sprachausgabe optimiert",
-	"screenReaderDetectedExplanation.question": "Verwenden Sie eine Sprachausgabe zum Bedienen von VS Code?",
-	"screenReaderDetectedExplanation.answerYes": "Ja",
-	"screenReaderDetectedExplanation.answerNo": "Nein",
-	"screenReaderDetectedExplanation.body1": "VS Code ist jetzt für die Verwendung mit einer Sprachausgabe optimiert. ",
-	"screenReaderDetectedExplanation.body2": "Einige Editorfunktionen weisen ein anderes Verhalten auf, z. B. in Bezug auf den Zeilenumbruch, die Faltung usw."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/browser/parts/editor/resourceViewer.i18n.json b/i18n/deu/src/vs/workbench/browser/parts/editor/resourceViewer.i18n.json
deleted file mode 100644
index 85e1ded2f40..00000000000
--- a/i18n/deu/src/vs/workbench/browser/parts/editor/resourceViewer.i18n.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"sizeB": "{0} B",
-	"sizeKB": "{0} KB",
-	"sizeMB": "{0} MB",
-	"sizeGB": "{0} GB",
-	"sizeTB": "{0} TB",
-	"largeImageError": "Das Bild wird im Editor nicht angezeigt, weil es zu groß ist ({0}).",
-	"resourceOpenExternalButton": "Bild mit externem Programm öffnen?",
-	"nativeFileTooLargeError": "Die Datei wird im Editor nicht angezeigt, weil sie zu groß ist ({0}).",
-	"nativeBinaryError": "Die Datei wird im Editor nicht angezeigt, weil sie entweder binär ist oder eine nicht unterstützte Textcodierung verwendet.",
-	"openAsText": "Dennoch öffnen?",
-	"zoom.action.fit.label": "Ganzes Bild",
-	"imgMeta": "{0}x{1} {2}"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/browser/parts/editor/tabsTitleControl.i18n.json b/i18n/deu/src/vs/workbench/browser/parts/editor/tabsTitleControl.i18n.json
deleted file mode 100644
index 8ad28ecd10e..00000000000
--- a/i18n/deu/src/vs/workbench/browser/parts/editor/tabsTitleControl.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"araLabelTabActions": "Registerkartenaktionen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json b/i18n/deu/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json
deleted file mode 100644
index 66a620287b3..00000000000
--- a/i18n/deu/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"textDiffEditor": "Textdiff-Editor",
-	"readonlyEditorWithInputAriaLabel": "{0}. Schreibgeschützter Textvergleichs-Editor.",
-	"readonlyEditorAriaLabel": "Schreibgeschützter Textvergleichs-Editor.",
-	"editableEditorWithInputAriaLabel": "{0}. Textdateivergleichs-Editor.",
-	"editableEditorAriaLabel": "Textdateivergleichs-Editor",
-	"navigate.next.label": "Nächste Änderung",
-	"navigate.prev.label": "Vorherige Änderung",
-	"toggleIgnoreTrimWhitespace.label": "Keine Leerzeichen entfernen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/browser/parts/editor/textEditor.i18n.json b/i18n/deu/src/vs/workbench/browser/parts/editor/textEditor.i18n.json
deleted file mode 100644
index ee428b5f6cb..00000000000
--- a/i18n/deu/src/vs/workbench/browser/parts/editor/textEditor.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"editorLabelWithGroup": "{0} Gruppe {1}."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/browser/parts/editor/textResourceEditor.i18n.json b/i18n/deu/src/vs/workbench/browser/parts/editor/textResourceEditor.i18n.json
deleted file mode 100644
index ed8fba3a3ab..00000000000
--- a/i18n/deu/src/vs/workbench/browser/parts/editor/textResourceEditor.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"textEditor": "Text-Editor",
-	"readonlyEditorWithInputAriaLabel": "{0}. Schreibgeschützter Text-Editor.",
-	"readonlyEditorAriaLabel": "Schreibgeschützter Text-Editor.",
-	"untitledFileEditorWithInputAriaLabel": "{0}. Unbenannter Dateitext-Editor.",
-	"untitledFileEditorAriaLabel": "Unbenannter Dateitext-Editor."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/browser/parts/editor/titleControl.i18n.json b/i18n/deu/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
deleted file mode 100644
index 6054596bd29..00000000000
--- a/i18n/deu/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"araLabelEditorActions": "Editor-Aktionen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/browser/parts/notifications/notificationsActions.i18n.json b/i18n/deu/src/vs/workbench/browser/parts/notifications/notificationsActions.i18n.json
deleted file mode 100644
index 8433b81b641..00000000000
--- a/i18n/deu/src/vs/workbench/browser/parts/notifications/notificationsActions.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"clearNotification": "Benachrichtigung löschen",
-	"clearNotifications": "Alle Benachrichtigungen löschen",
-	"hideNotificationsCenter": "Benachrichtigungen verbergen",
-	"expandNotification": "Benachrichtigung erweitern",
-	"collapseNotification": "Benachrichtigung schließen",
-	"configureNotification": "Benachrichtigung konfigurieren",
-	"copyNotification": "Text kopieren"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/browser/parts/notifications/notificationsAlerts.i18n.json b/i18n/deu/src/vs/workbench/browser/parts/notifications/notificationsAlerts.i18n.json
deleted file mode 100644
index 4efc4666073..00000000000
--- a/i18n/deu/src/vs/workbench/browser/parts/notifications/notificationsAlerts.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"alertErrorMessage": "Fehler: {0}",
-	"alertWarningMessage": "Warnung: {0}",
-	"alertInfoMessage": "Info: {0}"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json b/i18n/deu/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json
deleted file mode 100644
index 25fb0b63c30..00000000000
--- a/i18n/deu/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"notificationsEmpty": "Keine neuen Benachrichtigungen",
-	"notifications": "Benachrichtigungen",
-	"notificationsToolbar": "Aktionen der Benachrichtigungszentrale",
-	"notificationsList": "Benachrichtigungsliste"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/browser/parts/notifications/notificationsCommands.i18n.json b/i18n/deu/src/vs/workbench/browser/parts/notifications/notificationsCommands.i18n.json
deleted file mode 100644
index b0f0419d3bf..00000000000
--- a/i18n/deu/src/vs/workbench/browser/parts/notifications/notificationsCommands.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"notifications": "Benachrichtigungen",
-	"showNotifications": "Benachrichtigungen anzeigen",
-	"hideNotifications": "Benachrichtigungen verbergen",
-	"clearAllNotifications": "Alle Benachrichtigungen löschen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/browser/parts/notifications/notificationsStatus.i18n.json b/i18n/deu/src/vs/workbench/browser/parts/notifications/notificationsStatus.i18n.json
deleted file mode 100644
index 296ad5cd3fc..00000000000
--- a/i18n/deu/src/vs/workbench/browser/parts/notifications/notificationsStatus.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hideNotifications": "Benachrichtigungen ausblenden",
-	"zeroNotifications": "Keine Benachrichtigungen",
-	"noNotifications": "Keine neuen Benachrichtigungen",
-	"oneNotification": "1 neue Benachrichtigung",
-	"notifications": "{0} neue Benachrichtigungen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/browser/parts/notifications/notificationsToasts.i18n.json b/i18n/deu/src/vs/workbench/browser/parts/notifications/notificationsToasts.i18n.json
deleted file mode 100644
index d9a2e8723ad..00000000000
--- a/i18n/deu/src/vs/workbench/browser/parts/notifications/notificationsToasts.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"notificationsToast": "Popupbenachrichtigung"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/browser/parts/notifications/notificationsViewer.i18n.json b/i18n/deu/src/vs/workbench/browser/parts/notifications/notificationsViewer.i18n.json
deleted file mode 100644
index bbd61d63a4e..00000000000
--- a/i18n/deu/src/vs/workbench/browser/parts/notifications/notificationsViewer.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"notificationActions": "Benachrichtigungsaktionen",
-	"notificationSource": "Quelle: {0}"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/browser/parts/panel/panelActions.i18n.json b/i18n/deu/src/vs/workbench/browser/parts/panel/panelActions.i18n.json
deleted file mode 100644
index a862b85106d..00000000000
--- a/i18n/deu/src/vs/workbench/browser/parts/panel/panelActions.i18n.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"closePanel": "Bereich schließen",
-	"togglePanel": "Bereich umschalten",
-	"focusPanel": "Fokus im Bereich",
-	"toggledPanelPosition": "Bereichsposition umschalten",
-	"moveToRight": "Verschieben nach rechts",
-	"moveToBottom": "Nach unten verschieben",
-	"toggleMaximizedPanel": "Maximierten Bereich umschalten",
-	"maximizePanel": "Panelgröße maximieren",
-	"minimizePanel": "Panelgröße wiederherstellen",
-	"view": "Anzeigen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/browser/parts/panel/panelPart.i18n.json b/i18n/deu/src/vs/workbench/browser/parts/panel/panelPart.i18n.json
deleted file mode 100644
index 782f9ecbd3e..00000000000
--- a/i18n/deu/src/vs/workbench/browser/parts/panel/panelPart.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hidePanel": "Bereich ausblenden"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/browser/parts/quickinput/quickInput.i18n.json b/i18n/deu/src/vs/workbench/browser/parts/quickinput/quickInput.i18n.json
deleted file mode 100644
index c40d49b3c7b..00000000000
--- a/i18n/deu/src/vs/workbench/browser/parts/quickinput/quickInput.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"inputModeEntryDescription": "{0} (Drücken Sie die EINGABETASTE zur Bestätigung oder ESC, um den Vorgang abzubrechen.)",
-	"inputModeEntry": "Drücken Sie die EINGABETASTE, um Ihre Eingabe zu bestätigen, oder ESC, um den Vorgang abzubrechen.",
-	"quickInput.countSelected": "{0} ausgewählt",
-	"ok": "OK"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/browser/parts/quickinput/quickInputBox.i18n.json b/i18n/deu/src/vs/workbench/browser/parts/quickinput/quickInputBox.i18n.json
deleted file mode 100644
index 7eb6fe22c93..00000000000
--- a/i18n/deu/src/vs/workbench/browser/parts/quickinput/quickInputBox.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"quickInputBox.ariaLabel": "Nehmen Sie eine Eingabe vor, um die Ergebnisse einzugrenzen."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/browser/parts/quickopen/quickOpenController.i18n.json b/i18n/deu/src/vs/workbench/browser/parts/quickopen/quickOpenController.i18n.json
deleted file mode 100644
index 90b4595d627..00000000000
--- a/i18n/deu/src/vs/workbench/browser/parts/quickopen/quickOpenController.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"emptyPicks": "Es sind keine Einträge zur Auswahl verfügbar.",
-	"quickOpenInput": "Geben Sie \"?\" ein, um Hilfe zu den Aktionen zu erhalten, die hier zur Verfügung stehen.",
-	"historyMatches": "zuletzt geöffnet",
-	"noResultsFound1": "Es wurden keine Ergebnisse gefunden.",
-	"canNotRunPlaceholder": "Dieser Quick Open-Handler kann im aktuellen Kontext nicht verwendet werden.",
-	"entryAriaLabel": "{0}, zuletzt geöffnet",
-	"removeFromEditorHistory": "Aus Verlauf entfernen",
-	"pickHistory": "Editor-Eintrag auswählen, der aus dem Verlauf entfernt werden soll"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/browser/parts/quickopen/quickopen.contribution.i18n.json b/i18n/deu/src/vs/workbench/browser/parts/quickopen/quickopen.contribution.i18n.json
deleted file mode 100644
index 51845025d41..00000000000
--- a/i18n/deu/src/vs/workbench/browser/parts/quickopen/quickopen.contribution.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"quickOpen": "Gehe zu Datei...",
-	"quickNavigateNext": "Zum nächsten Element in Quick Open navigieren",
-	"quickNavigatePrevious": "Zum vorherigen Element in Quick Open navigieren",
-	"quickSelectNext": "Nächstes Element in Quick Open auswählen",
-	"quickSelectPrevious": "Vorheriges Element in Quick Open auswählen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/browser/parts/quickopen/quickopen.i18n.json b/i18n/deu/src/vs/workbench/browser/parts/quickopen/quickopen.i18n.json
deleted file mode 100644
index efa8bd3161b..00000000000
--- a/i18n/deu/src/vs/workbench/browser/parts/quickopen/quickopen.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"quickOpen": "Gehe zu Datei...",
-	"quickNavigateNext": "Zum nächsten Element in Quick Open navigieren",
-	"quickNavigatePrevious": "Zum vorherigen Element in Quick Open navigieren",
-	"quickSelectNext": "Nächstes Element in Quick Open auswählen",
-	"quickSelectPrevious": "Vorheriges Element in Quick Open auswählen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/browser/parts/sidebar/sidebarPart.i18n.json b/i18n/deu/src/vs/workbench/browser/parts/sidebar/sidebarPart.i18n.json
deleted file mode 100644
index 5aff102ff6f..00000000000
--- a/i18n/deu/src/vs/workbench/browser/parts/sidebar/sidebarPart.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"focusSideBar": "Fokus in Randleiste",
-	"viewCategory": "Anzeigen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/browser/parts/statusbar/statusbarPart.i18n.json b/i18n/deu/src/vs/workbench/browser/parts/statusbar/statusbarPart.i18n.json
deleted file mode 100644
index 875d2be7c37..00000000000
--- a/i18n/deu/src/vs/workbench/browser/parts/statusbar/statusbarPart.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"manageExtension": "Erweiterung verwalten"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/browser/parts/titlebar/titlebarPart.i18n.json b/i18n/deu/src/vs/workbench/browser/parts/titlebar/titlebarPart.i18n.json
deleted file mode 100644
index f4bb553343e..00000000000
--- a/i18n/deu/src/vs/workbench/browser/parts/titlebar/titlebarPart.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"patchedWindowTitle": "[Nicht unterstützt]",
-	"userIsAdmin": "[Administrator]",
-	"userIsSudo": "[Superuser]",
-	"devExtensionWindowTitlePrefix": "[Erweiterungsentwicklungshost]"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/browser/parts/views/panelViewlet.i18n.json b/i18n/deu/src/vs/workbench/browser/parts/views/panelViewlet.i18n.json
deleted file mode 100644
index b88fba7b9fd..00000000000
--- a/i18n/deu/src/vs/workbench/browser/parts/views/panelViewlet.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"viewToolbarAriaLabel": "{0}-Aktionen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/browser/parts/views/views.i18n.json b/i18n/deu/src/vs/workbench/browser/parts/views/views.i18n.json
deleted file mode 100644
index 17abacb1d8c..00000000000
--- a/i18n/deu/src/vs/workbench/browser/parts/views/views.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"viewToolbarAriaLabel": "{0}-Aktionen",
-	"hideView": "Auf Randleiste ausblenden"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/browser/parts/views/viewsRegistry.i18n.json b/i18n/deu/src/vs/workbench/browser/parts/views/viewsRegistry.i18n.json
deleted file mode 100644
index a36d97eb0e0..00000000000
--- a/i18n/deu/src/vs/workbench/browser/parts/views/viewsRegistry.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"duplicateId": "Eine Ansicht mit der ID \"{0}\" ist am Speicherort \"{1}\" bereits registriert."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/browser/parts/views/viewsViewlet.i18n.json b/i18n/deu/src/vs/workbench/browser/parts/views/viewsViewlet.i18n.json
deleted file mode 100644
index 700e6b13da4..00000000000
--- a/i18n/deu/src/vs/workbench/browser/parts/views/viewsViewlet.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"cannot toggle": "Für diese Sicht {0} kann die Sichtbarkeit nicht umgeschaltet werden.",
-	"cannot show": "Für diese Sicht \"{0}\" kann die Sichtbarkeit nicht umgeschaltet werden, weil sie aufgrund ihrer \"when\"-Bedingung ausgeblendet ist.",
-	"hideView": "Ausblenden"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/browser/quickopen.i18n.json b/i18n/deu/src/vs/workbench/browser/quickopen.i18n.json
deleted file mode 100644
index 04241a9fe1f..00000000000
--- a/i18n/deu/src/vs/workbench/browser/quickopen.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noResultsMatching": "Keine übereinstimmenden Ergebnisse.",
-	"noResultsFound2": "Es wurden keine Ergebnisse gefunden."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/browser/viewlet.i18n.json b/i18n/deu/src/vs/workbench/browser/viewlet.i18n.json
deleted file mode 100644
index 3e4a3037506..00000000000
--- a/i18n/deu/src/vs/workbench/browser/viewlet.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"compositePart.hideSideBarLabel": "Randleiste ausblenden",
-	"collapse": "Alle zuklappen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/common/theme.i18n.json b/i18n/deu/src/vs/workbench/common/theme.i18n.json
deleted file mode 100644
index 7230e04365d..00000000000
--- a/i18n/deu/src/vs/workbench/common/theme.i18n.json
+++ /dev/null
@@ -1,72 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"tabActiveBackground": "Hintergrundfarbe der aktiven Registerkarte. Registerkarten sind die Container für Editors im Editorbereich. In einer Editorgruppe können mehrere Registerkarten geöffnet werden. Mehrere Editorgruppen können vorhanden sein.",
-	"tabInactiveBackground": "Hintergrundfarbe der inaktiven Registerkarte. Registerkarten sind die Container für Editors im Editorbereich. In einer Editorgruppe können mehrere Registerkarten geöffnet werden. Mehrere Editorgruppen können vorhanden sein.",
-	"tabHoverBackground": "Hintergrundfarbe der Registerkarte beim Daraufzeigen. Registerkarten sind die Container für Editoren im Editorbereich. In einer Editorgruppe können mehrere Registerkarten geöffnet werden. Mehrere Editorgruppen können vorhanden sein.",
-	"tabUnfocusedHoverBackground": "Hintergrundfarbe für Registerkarten in einer unfokussierten Gruppe beim Daraufzeigen. Registerkarten sind die Container für Editoren im Editor-Bereich. In einer Editor-Gruppe können mehrere Registerkarten geöffnet werden. Mehrere Editor-Gruppen sind möglich.",
-	"tabBorder": "Rahmen zum Trennen von Registerkarten. Registerkarten sind die Container für Editoren im Editor-Bereich. In einer Editor-Gruppe können mehrere Registerkarten geöffnet werden. Mehrere Editor-Gruppen sind möglich.",
-	"tabActiveBorder": "Rahmen am unteren Rand einer aktiven Registerkarte. Registerkarten sind die Container für Editoren im Editor-Bereich. In einer Editor-Gruppe können mehrere Registerkarten geöffnet werden. Mehrere Editor-Gruppen sind möglich.",
-	"tabActiveBorderTop": "Rahmen am oberen Rand einer aktiven Registerkarte. Registerkarten sind die Container für Editoren im Editor-Bereich. In einer Editor-Gruppe können mehrere Registerkarten geöffnet werden. Mehrere Editor-Gruppen sind möglich.",
-	"tabActiveUnfocusedBorder": "Rahmen am unteren Rand einer aktiven Registerkarte in einer unfokussierten Gruppe. Registerkarten sind die Container für Editoren im Editor-Bereich. In einer Editor-Gruppe können mehrere Registerkarten geöffnet werden. Mehrere Editor-Gruppen sind möglich.",
-	"tabActiveUnfocusedBorderTop": "Rahmen am oberen Rand einer aktiven Registerkarte in einer unfokussierten Gruppe. Registerkarten sind die Container für Editoren im Editor-Bereich. In einer Editor-Gruppe können mehrere Registerkarten geöffnet werden. Mehrere Editor-Gruppen sind möglich.",
-	"tabHoverBorder": "Rahmen zum Hervorheben von Registerkarten beim Daraufzeigen. Registerkarten sind die Container für Editoren im Editor-Bereich. In einer Editor-Gruppe können mehrere Registerkarten geöffnet werden. Mehrere Editor-Gruppen sind möglich.",
-	"tabUnfocusedHoverBorder": "Rahmen zum Hervorheben von Registerkarten in einer unfokussierten Gruppe beim Daraufzeigen. Registerkarten sind die Container für Editoren im Editor-Bereich. In einer Editor-Gruppe können mehrere Registerkarten geöffnet werden. Mehrere Editor-Gruppen sind möglich.",
-	"tabActiveForeground": "Vordergrundfarbe der aktiven Registerkarte in einer aktiven Gruppe. Registerkarten sind die Container für Editors im Editorbereich. In einer Editorgruppe können mehrere Registerkarten geöffnet werden. Mehrere Editorgruppen können vorhanden sein.",
-	"tabInactiveForeground": "Vordergrundfarbe der inaktiven Registerkarte in einer aktiven Gruppe. Registerkarten sind die Container für Editors im Editorbereich. In einer Editorgruppe können mehrere Registerkarten geöffnet werden. Mehrere Editorgruppen können vorhanden sein.",
-	"tabUnfocusedActiveForeground": "Vordergrundfarbe für aktive Registerkarten in einer unfokussierten Gruppe. Registerkarten sind die Container für Editoren im Editor-Bereich. In einer Editor-Gruppe können mehrere Registerkarten geöffnet werden. Mehrere Editor-Gruppen sind möglich.",
-	"tabUnfocusedInactiveForeground": "Vordergrundfarbe für inaktive Registerkarten in einer unfokussierten Gruppe. Registerkarten sind die Container für Editoren im Editor-Bereich. In einer Editor-Gruppe können mehrere Registerkarten geöffnet werden. Mehrere Editor-Gruppen sind möglich.",
-	"editorGroupBackground": "Hintergrundfarbe einer Editor-Gruppe. Editor-Gruppen sind die Container der Editoren. Die Hintergrundfarbe wird beim Ziehen von Editoren angezeigt.",
-	"tabsContainerBackground": "Hintergrundfarbe der Titelüberschrift der Editor-Gruppe, wenn die Registerkarten deaktiviert sind. Editor-Gruppen sind die Container der Editoren.",
-	"tabsContainerBorder": "Rahmenfarbe der Titelüberschrift der Editor-Gruppe, wenn die Registerkarten deaktiviert sind. Editor-Gruppen sind die Container der Editoren.",
-	"editorGroupHeaderBackground": "Hintergrundfarbe der Editorgruppen-Titelüberschrift, wenn Registerkarten deaktiviert sind (`\"workbench.editor.showTabs\": false`). Editor-Gruppen sind die Container für Editoren.",
-	"editorGroupBorder": "Farbe zum Trennen mehrerer Editor-Gruppen. Editor-Gruppen sind die Container der Editoren.",
-	"editorDragAndDropBackground": " Hintergrundfarbe beim Ziehen von Editoren. Die Farbe muss transparent sein, damit der Editor-Inhalt noch sichtbar sind.",
-	"panelBackground": "Hintergrundfarbe des Panels. Panels werden unter dem Editorbereich angezeigt und enthalten Ansichten wie die Ausgabe und das integrierte Terminal.",
-	"panelBorder": "Farbe des Panelrahmens, der das Panel vom Editor abtrennt. Panels werden unter dem Editorbereich angezeigt und enthalten Ansichten wie die Ausgabe und das integrierte Terminal.",
-	"panelActiveTitleForeground": "Titelfarbe für den aktiven Bereich. Bereiche werden unter dem Editorbereich angezeigt und enthalten Ansichten wie Ausgabe und integriertes Terminal.",
-	"panelInactiveTitleForeground": "Titelfarbe für den inaktiven Bereich. Bereiche werden unter dem Editorbereich angezeigt und enthalten Ansichten wie Ausgabe und integriertes Terminal.",
-	"panelActiveTitleBorder": "Rahmenfarbe für den Titel des aktiven Bereichs. Bereiche werden unter dem Editorbereich angezeigt und enthalten Ansichten wie Ausgabe und integriertes Terminal.",
-	"panelDragAndDropBackground": "Drag & Drop-Feedbackfarbe für die Paneltitelelemente. Die Farbe muss transparent sein, damit die Paneleinträge noch sichtbar sind. Panels werden unter dem Editorbereich angezeigt und enthalten Ansichten wie die Ausgabe und das integrierte Terminal.",
-	"statusBarForeground": "Vordergrundfarbe der Statusleiste beim Öffnen eines Arbeitsbereichs. Die Statusleiste wird unten im Fenster angezeigt.",
-	"statusBarNoFolderForeground": "Vordergrundfarbe der Statusleiste, wenn kein Ordner geöffnet ist. Die Statusleiste wird unten im Fenster angezeigt.",
-	"statusBarBackground": "Hintergrundfarbe der Statusleiste beim Öffnen eines Arbeitsbereichs. Die Statusleiste wird unten im Fenster angezeigt.",
-	"statusBarNoFolderBackground": "Hintergrundfarbe der Statusleiste, wenn kein Ordner geöffnet ist. Die Statusleiste wird unten im Fenster angezeigt.",
-	"statusBarBorder": "Rahmenfarbe der Statusleiste für die Abtrennung von der Seitenleiste und dem Editor. Die Statusleiste wird unten im Fenster angezeigt.",
-	"statusBarNoFolderBorder": "Rahmenfarbe der Statusleiste zur Abtrennung von der Randleiste und dem Editor, wenn kein Ordner geöffnet ist. Die Statusleiste wird unten im Fenster angezeigt.",
-	"statusBarItemActiveBackground": "Hintergrundfarbe für Statusleistenelemente beim Klicken. Die Statusleiste wird am unteren Rand des Fensters angezeigt.",
-	"statusBarItemHoverBackground": "Hintergrundfarbe der Statusleistenelemente beim Daraufzeigen. Die Statusleiste wird am unteren Seitenrand angezeigt.",
-	"statusBarProminentItemBackground": "Hintergrundfarbe für markante Elemente der Statusleiste. Markante Elemente sind im Vergleich zu anderen Statusleisteneinträgen hervorgehoben, um auf ihre Bedeutung hinzuweisen. Ändern Sie den Modus mithilfe von \"TAB-Umschalttaste verschiebt Fokus\" auf der Befehlspalette, um ein Beispiel anzuzeigen. Die Statusleiste wird unten im Fenster angezeigt.",
-	"statusBarProminentItemHoverBackground": "Hintergrundfarbe für markante Elemente der Statusleiste, wenn auf diese gezeigt wird. Markante Elemente sind im Vergleich zu anderen Statusleisteneinträgen hervorgehoben, um auf ihre Bedeutung hinzuweisen. Ändern Sie den Modus mithilfe von \"TAB-Umschalttaste verschiebt Fokus\" auf der Befehlspalette, um ein Beispiel anzuzeigen. Die Statusleiste wird unten im Fenster angezeigt.",
-	"activityBarBackground": "Hintergrundfarbe der Aktivitätsleiste. Die Aktivitätsleiste wird ganz links oder rechts angezeigt und ermöglicht das Wechseln zwischen verschiedenen Ansichten der Seitenleiste.",
-	"activityBarForeground": "Vordergrundfarbe der Aktivitätsleiste (z. B. für Symbole). Die Aktivitätsleiste wird ganz links oder rechts angezeigt und ermöglicht das Wechseln zwischen verschiedenen Ansichten der Seitenleiste.",
-	"activityBarBorder": "Rahmenfarbe der Aktivitätsleiste für die Abtrennung von der Seitenleiste. Die Aktivitätsleiste wird ganz links oder rechts angezeigt und ermöglicht das Wechseln zwischen verschiedenen Ansichten der Seitenleiste.",
-	"activityBarDragAndDropBackground": "Drag & Drop-Feedbackfarbe für Elemente der Aktivitätsleiste. Die Farbe muss transparent sein, damit die Einträge der Aktivitätsleiste noch sichtbar sind. Die Aktivitätsleiste wird ganz links oder ganz rechts angezeigt und ermöglicht den Wechsel zwischen Ansichten der Seitenleiste.",
-	"activityBarBadgeBackground": "Hintergrundfarbe für Aktivitätsinfobadge. Die Aktivitätsleiste wird ganz links oder ganz rechts angezeigt und ermöglicht den Wechsel zwischen Ansichten der Seitenleiste.",
-	"activityBarBadgeForeground": "Vordergrundfarbe für Aktivitätsinfobadge. Die Aktivitätsleiste wird ganz links oder ganz rechts angezeigt und ermöglicht den Wechsel zwischen Ansichten der Seitenleiste.",
-	"sideBarBackground": "Hintergrundfarbe der Seitenleiste. Die Seitenleiste ist der Container für Ansichten wie den Explorer und die Suche.",
-	"sideBarForeground": "Vordergrundfarbe der Seitenleiste. Die Seitenleiste ist der Container für Ansichten wie den Explorer und die Suche.",
-	"sideBarBorder": "Rahmenfarbe der Seitenleiste zum Abtrennen an der Seite zum Editor. Die Seitenleiste ist der Container für Ansichten wie den Explorer und die Suche.",
-	"sideBarTitleForeground": "Vordergrundfarbe der Seitenleiste. Die Seitenleiste ist der Container für Ansichten wie den Explorer und die Suche.",
-	"sideBarDragAndDropBackground": "Drag & Drop-Feedbackfarbe für die Abschnitte der Randleiste. Die Farbe muss transparent sein, damit die Abschnitte der Randleiste noch sichtbar sind. Die Randleiste ist der Container für Ansichten wie den Explorer und die Suche. ",
-	"sideBarSectionHeaderBackground": "Hintergrundfarbe der Abschnittsüberschrift der Seitenleiste. Die Seitenleiste ist der Container für Ansichten wie den Explorer und die Suche.",
-	"sideBarSectionHeaderForeground": "Vordergrundfarbe der Abschnittsüberschrift der Seitenleiste. Die Seitenleiste ist der Container für Ansichten wie den Explorer und die Suche.",
-	"titleBarActiveForeground": "Vordergrund der Titelleiste, wenn das Fenster aktiv ist. Diese Farbe wird derzeit nur von MacOS unterstützt.",
-	"titleBarInactiveForeground": "Vordergrund der Titelleiste, wenn das Fenster inaktiv ist. Diese Farbe wird derzeit nur von MacOS unterstützt.",
-	"titleBarActiveBackground": "Hintergrund der Titelleiste, wenn das Fenster aktiv ist. Diese Farbe wird derzeit nur von MacOS unterstützt.",
-	"titleBarInactiveBackground": "Hintergrund der Titelleiste, wenn das Fenster inaktiv ist. Diese Farbe wird derzeit nur von MacOS unterstützt.",
-	"titleBarBorder": "Rahmenfarbe der Titelleiste. Diese Farbe wird derzeit nur unter MacOS unterstützt.",
-	"notificationCenterBorder": "Rahmenfarbe der Benachrichtigungszentrale. Benachrichtigungen werden unten rechts eingeblendet.",
-	"notificationToastBorder": "Rahmenfarbe der Popupbenachrichtigung. Benachrichtigungen werden unten rechts eingeblendet.",
-	"notificationsForeground": "Vordergrundfarbe für Benachrichtigungen. Benachrichtigungen werden unten rechts eingeblendet.",
-	"notificationsBackground": "Hintergrundfarbe für Benachrichtigungen. Benachrichtigungen werden unten rechts eingeblendet.",
-	"notificationsLink": "Vordergrundfarbe für Benachrichtigungslinks. Benachrichtigungen werden unten rechts eingeblendet.",
-	"notificationCenterHeaderForeground": "Vordergrundfarbe für Kopfzeile der Benachrichtigungszentrale. Benachrichtigungen werden unten rechts eingeblendet.",
-	"notificationCenterHeaderBackground": "Hintergrundfarbe für Kopfzeile der Benachrichtigungszentrale. Benachrichtigungen werden unten rechts eingeblendet.",
-	"notificationsBorder": "Rahmenfarbe für Benachrichtigungen zum Trennen von anderen Benachrichtigungen in der Benachrichtigungszentrale. Benachrichtigungen werden unten rechts eingeblendet."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/common/views.i18n.json b/i18n/deu/src/vs/workbench/common/views.i18n.json
deleted file mode 100644
index 53cde5ce487..00000000000
--- a/i18n/deu/src/vs/workbench/common/views.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"duplicateId": "Eine Ansicht mit der ID \"{0}\" ist bereits am Speicherort \"{1}\" registriert."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/electron-browser/actions.i18n.json b/i18n/deu/src/vs/workbench/electron-browser/actions.i18n.json
deleted file mode 100644
index 1609e7c9271..00000000000
--- a/i18n/deu/src/vs/workbench/electron-browser/actions.i18n.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"closeWindow": "Fenster schließen",
-	"closeWorkspace": "Arbeitsbereich schließen",
-	"noWorkspaceOpened": "Zurzeit ist kein Arbeitsbereich in dieser Instanz geöffnet, der geschlossen werden kann.",
-	"newWindow": "Neues Fenster",
-	"toggleFullScreen": "Vollbild umschalten",
-	"toggleMenuBar": "Menüleiste umschalten",
-	"toggleDevTools": "Entwicklertools umschalten",
-	"zoomIn": "Vergrößern",
-	"zoomOut": "Verkleinern",
-	"zoomReset": "Zoom zurücksetzen",
-	"appPerf": "Startleistung",
-	"reloadWindow": "Fenster erneut laden",
-	"reloadWindowWithExntesionsDisabled": "Fenster mit deaktivierten Erweiterungen erneut laden",
-	"switchWindowPlaceHolder": "Fenster auswählen, zu dem Sie wechseln möchten",
-	"current": "Aktuelles Fenster",
-	"close": "Fenster schließen",
-	"switchWindow": "Fenster wechseln...",
-	"quickSwitchWindow": "Fenster schnell wechseln...",
-	"workspaces": "Arbeitsbereiche",
-	"files": "Dateien",
-	"openRecentPlaceHolderMac": "Zum Öffnen auswählen (zum Öffnen in einem neuen Fenster die BEFEHLSTASTE gedrückt halten)",
-	"openRecentPlaceHolder": "Zum Öffnen auswählen (zum Öffnen in einem neuen Fenster die STRG-TASTE gedrückt halten)",
-	"remove": "Aus zuletzt geöffneten entfernen",
-	"openRecent": "Zuletzt benutzt...",
-	"quickOpenRecent": "Zuletzt benutzte schnell öffnen...",
-	"reportIssueInEnglish": "Problem melden",
-	"openProcessExplorer": "Prozess-Explorer öffnen",
-	"reportPerformanceIssue": "Leistungsproblem melden",
-	"keybindingsReference": "Referenz für Tastenkombinationen",
-	"openDocumentationUrl": "Dokumentation",
-	"openIntroductoryVideosUrl": "Einführungsvideos",
-	"openTipsAndTricksUrl": "Tipps und Tricks",
-	"toggleSharedProcess": "Freigegebenen Prozess umschalten",
-	"navigateLeft": "Zur Ansicht auf der linken Seite navigieren",
-	"navigateRight": "Zur Ansicht auf der rechten Seite navigieren",
-	"navigateUp": "Zur Ansicht darüber navigieren",
-	"navigateDown": "Zur Ansicht darunter navigieren",
-	"increaseViewSize": "Aktuelle Ansicht vergrößern",
-	"decreaseViewSize": "Aktuelle Ansicht verkleinern",
-	"showPreviousTab": "Vorherige Fensterregisterkarte anzeigen",
-	"showNextWindowTab": "Nächste Fensterregisterkarte anzeigen",
-	"moveWindowTabToNewWindow": "Fensterregisterkarte in neues Fenster verschieben",
-	"mergeAllWindowTabs": "Alle Fenster zusammenführen",
-	"toggleWindowTabsBar": "Fensterregisterkarten-Leiste umschalten",
-	"about": "Informationen zu {0}",
-	"inspect context keys": "Kontextschlüssel prüfen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/electron-browser/commands.i18n.json b/i18n/deu/src/vs/workbench/electron-browser/commands.i18n.json
deleted file mode 100644
index 983899514ca..00000000000
--- a/i18n/deu/src/vs/workbench/electron-browser/commands.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"diffLeftRightLabel": "{0} ⟷ {1}"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/electron-browser/configureLocale.i18n.json b/i18n/deu/src/vs/workbench/electron-browser/configureLocale.i18n.json
deleted file mode 100644
index f17cc2cd8aa..00000000000
--- a/i18n/deu/src/vs/workbench/electron-browser/configureLocale.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"configureLocale": "Sprache konfigurieren",
-	"displayLanguage": "Definiert die Anzeigesprache von VSCode.",
-	"doc": "Unter {0} finden Sie eine Liste der unterstützten Sprachen.",
-	"restart": "Das Ändern dieses Wertes erfordert einen Neustart von VSCode.",
-	"fail.createSettings": "{0} ({1}) kann nicht erstellt werden.",
-	"JsonSchema.locale": "Die zu verwendende Sprache der Benutzeroberfläche."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/electron-browser/crashReporter.i18n.json b/i18n/deu/src/vs/workbench/electron-browser/crashReporter.i18n.json
deleted file mode 100644
index f7a2d1f0c3f..00000000000
--- a/i18n/deu/src/vs/workbench/electron-browser/crashReporter.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"telemetryConfigurationTitle": "Telemetrie",
-	"telemetry.enableCrashReporting": "Aktiviert Absturzberichte, die an Microsoft gesendet werden.\nDiese Option erfordert einen Neustart, damit sie wirksam wird."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/electron-browser/extensionHost.i18n.json b/i18n/deu/src/vs/workbench/electron-browser/extensionHost.i18n.json
deleted file mode 100644
index 9a7af044bcf..00000000000
--- a/i18n/deu/src/vs/workbench/electron-browser/extensionHost.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"extensionHostProcess.startupFailDebug": "Der Erweiterungshost wurde nicht innerhalb von 10 Sekunden gestartet. Möglicherweise wurde er in der ersten Zeile beendet und benötigt einen Debugger, um die Ausführung fortzusetzen.",
-	"extensionHostProcess.startupFail": "Der Erweiterungshost wurde nicht innerhalb von 10 Sekunden gestartet. Dies stellt ggf. ein Problem dar.",
-	"extensionHostProcess.error": "Fehler vom Erweiterungshost: {0}",
-	"devTools": "Entwicklertools",
-	"extensionHostProcess.crash": "Der Erweiterungshost wurde unerwartet beendet. Bitte laden Sie das Fenster erneut, um ihn wiederherzustellen."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/electron-browser/main.contribution.i18n.json b/i18n/deu/src/vs/workbench/electron-browser/main.contribution.i18n.json
deleted file mode 100644
index fc92fd39225..00000000000
--- a/i18n/deu/src/vs/workbench/electron-browser/main.contribution.i18n.json
+++ /dev/null
@@ -1,91 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"view": "Anzeigen",
-	"help": "Hilfe",
-	"file": "Datei",
-	"workspaces": "Arbeitsbereiche",
-	"developer": "Entwickler",
-	"workbenchConfigurationTitle": "Workbench",
-	"showEditorTabs": "Steuert, ob geöffnete Editoren auf Registerkarten angezeigt werden sollen.",
-	"workbench.editor.labelFormat.default": "Zeigt den Namen der Datei. Wenn Registerkarten aktiviert sind und zwei Dateien in einer Gruppe den gleichen Namen haben, werden die unterscheidenden Abschnitte der Pfade jeder Datei hinzugefügt. Wenn die Registerkarten deaktiviert sind, wird der Pfad relativ zum Arbeitsbereich-Ordner angezeigt, wenn der Editor aktiv ist. ",
-	"workbench.editor.labelFormat.short": "Den Namen der Datei anzeigen, gefolgt von dessen Verzeichnisnamen.",
-	"workbench.editor.labelFormat.medium": "Zeigt den Namen der Datei, gefolgt von dessen Pfad relativ zum Arbeitsbereich-Ordner.",
-	"workbench.editor.labelFormat.long": "Zeigt den Namen der Datei an, gefolgt von ihrem absoluten Pfad.",
-	"tabDescription": "Steuert das Format der Beschriftung für einen Editor. Wenn Sie diese Einstellung ändern, ist beispielsweise der Speicherort einer Datei besser ersichtlich:\n- kurz: \"parent\"\n- mittel: \"workspace/src/parent\"\n- lang: \"/home/user/workspace/src/parent\"\n- Standard: \".../parent\", wenn eine andere Registerkarte denselben Titel hat, oder den relativen Arbeitsbereichspfad, wenn Registerkarten deaktiviert sind.",
-	"editorTabCloseButton": "Steuert die Position der Schließen-Schaltflächen der Editor-Registerkarten oder deaktiviert sie bei der Einstellung \"off\".",
-	"tabSizing": "Steuert die Größe von Editor-Registerkarten. Bei \"Anpassen\" sind die Registerkarten immer groß genug, damit die gesamte Editor-Bezeichnung angezeigt wird. Mit \"Verkleinern\" werden die Registerkarten kleiner, wenn der verfügbare Platz nicht ausreicht, um alle Registerkarten gleichzeitig anzuzeigen.",
-	"showIcons": "Steuert, ob geöffnete Editoren mit einem Symbol angezeigt werden sollen. Hierzu muss auch ein Symboldesign aktiviert werden.",
-	"enablePreview": "Steuert, ob geöffnete Editoren als Vorschau angezeigt werden. Vorschau-Editoren werden wiederverwendet, bis sie gespeichert werden (z. B. über Doppelklicken oder Bearbeiten), und sie werden mit kursivem Schriftschnitt angezeigt.",
-	"enablePreviewFromQuickOpen": "Steuert, ob geöffnete Editoren aus Quick Open als Vorschau angezeigt werden. Vorschau-Editoren werden wiederverwendet, bis sie gespeichert werden (z. B. über Doppelklicken oder Bearbeiten).",
-	"closeOnFileDelete": "Steuert, ob Editoren, die eine Datei anzeigen, automatisch geschlossen werden sollen, wenn die Datei von einem anderen Prozess umbenannt oder gelöscht wird. Wenn Sie diese Option deaktivieren, bleibt der Editor bei einem solchen Ereignis als geändert offen. Bei Löschvorgängen innerhalb der Anwendung wird der Editor immer geschlossen, und geänderte Dateien werden nie geschlossen, damit Ihre Daten nicht verloren gehen.",
-	"editorOpenPositioning": "Steuert, wo Editoren geöffnet werden. Wählen Sie \"links\" oder \"rechts\", um Editoren links oder rechts neben dem derzeit aktiven Editor zu öffnen. Wählen Sie \"erster\" oder \"letzter\", um Editoren unabhängig vom derzeit aktiven Editor zu öffnen.",
-	"revealIfOpen": "Steuert, ob ein geöffneter Editor in einer der sichtbaren Gruppen angezeigt wird. Ist diese Option deaktiviert, wird ein Editor vorzugsweise in der aktuell aktiven Editorgruppe geöffnet. Ist diese Option aktiviert, wird ein bereits geöffneter Editor angezeigt und nicht in der aktuell aktiven Editorgruppe erneut geöffnet. In einigen Fällen wird diese Einstellung ignoriert, z. B. wenn das Öffnen eines Editors in einer bestimmten Gruppe oder neben der aktuell aktiven Gruppe erzwungen wird.",
-	"swipeToNavigate": "Hiermit navigieren Sie per waagrechtem Wischen mit drei Fingen zwischen geöffneten Dateien.",
-	"commandHistory": "Steuert, ob die Anzahl zuletzt verwendeter Befehle im Verlauf für die Befehlspalette gespeichert wird. Legen Sie diese Option auf 0 fest, um den Befehlsverlauf zu deaktivieren.",
-	"preserveInput": "Steuert, ob die letzte typisierte Eingabe in die Befehlspalette beim nächsten Öffnen wiederhergestellt wird.",
-	"closeOnFocusLost": "Steuert, ob Quick Open automatisch geschlossen werden soll, sobald das Feature den Fokus verliert.",
-	"openDefaultSettings": "Steuert, ob beim Öffnen der Einstellungen auch ein Editor geöffnet wird, der alle Standardeinstellungen anzeigt.",
-	"sideBarLocation": "Steuert die Position der Seitenleiste. Diese kann entweder links oder rechts von der Workbench angezeigt werden.",
-	"panelDefaultLocation": "Steuert die Standardposition des Panels. Dieses kann entweder unterhalb oder rechts von der Workbench angezeigt werden.",
-	"statusBarVisibility": "Steuert die Sichtbarkeit der Statusleiste im unteren Bereich der Workbench.",
-	"activityBarVisibility": "Steuert die Sichtbarkeit der Aktivitätsleiste in der Workbench.",
-	"viewVisibility": "Steuert die Sichtbarkeit von Headeraktionen. Headeraktionen können immer sichtbar sein oder nur sichtbar sein, wenn diese Ansicht fokussiert ist oder mit der Maus darauf gezeigt wird.",
-	"fontAliasing": "Steuert die Schriftartaliasingmethode in der Workbench.\n - default: Subpixel-Schriftartglättung. Auf den meisten Nicht-Retina-Displays wird Text bei dieser Einstellung am schärfsten dargestellt. \n- antialiased: Glättet die Schriftart auf der Pixelebene (im Gegensatz zur Subpixelebene). Bei dieser Einstellung kann die Schriftart insgesamt heller wirken.\n- none: Deaktiviert die Schriftartglättung. Text wird mit gezackten scharfen Kanten dargestellt.\n- auto: Wendet ausgehend vom DPI der Anzeige automatisch \"default\" oder \"antialiased\" an.",
-	"workbench.fontAliasing.default": "Subpixel-Schriftartglättung. Auf den meisten Nicht-Retina-Displays wird Text bei dieser Einstellung am schärfsten dargestellt.",
-	"workbench.fontAliasing.antialiased": "Glättet die Schriftart auf der Pixelebene (im Gegensatz zur Subpixelebene). Bei dieser Einstellung kann die Schriftart insgesamt heller wirken.",
-	"workbench.fontAliasing.none": "Deaktiviert die Schriftartglättung. Text wird mit gezackten scharfen Kanten dargestellt.",
-	"workbench.fontAliasing.auto": "Wendet ausgehend vom DPI der Anzeige automatisch \"default\" oder \"antialiased\" an.",
-	"enableNaturalLanguageSettingsSearch": "Steuert, ob der Suchmodus mit natürlicher Sprache für die Einstellungen aktiviert werden soll.",
-	"windowConfigurationTitle": "Fenster",
-	"window.openFilesInNewWindow.on": "Dateien werden in einem neuen Fenster geöffnet.",
-	"window.openFilesInNewWindow.off": "Dateien werden im Fenster mit dem geöffneten Dateiordner oder im letzten aktiven Fenster geöffnet.",
-	"window.openFilesInNewWindow.defaultMac": "Dateien werden im Fenster mit dem geöffneten Dateiordner oder im letzten aktiven Fenster geöffnet, sofern sie nicht über das Dock oder den Finder geöffnet werden.",
-	"window.openFilesInNewWindow.default": "Dateien werden in einem neuen Fenster geöffnet, sofern sie nicht innerhalb der Anwendung ausgewählt werden (z. B. über das Dateimenü).",
-	"openFilesInNewWindowMac": "Steuert, ob Dateien in einem neuen Fenster geöffnet werden.\n- default: Die Dateien werden im Fenster mit dem geöffneten Dateiordner oder im letzten aktiven Fenster geöffnet, sofern sie nicht über das Dock oder den Finder geöffnet werden.\n- on: Die Dateien werden in einem neuen Fenster geöffnet.\n- off: Die Dateien werden im Fenster mit dem geöffneten Dateiordner oder im letzten aktiven Fenster geöffnet.\nIn einigen Fällen wird diese Einstellung unter Umständen ignoriert (z. B. bei der Befehlszeilenoption \"-new-window\" oder \"-reuse-window\").",
-	"openFilesInNewWindow": "Steuert, ob Dateien in einem neuen Fenster geöffnet werden.\n- default: Die Dateien werden in einem neuen Fenster geöffnet, sofern sie nicht innerhalb der Anwendung ausgewählt werden (z. B. über das Dateimenü).\n- on: Die Dateien werden in einem neuen Fenster geöffnet.\n- off: Die Dateien werden im Fenster mit dem geöffneten Dateiordner oder im letzten aktiven Fenster geöffnet.\nIn einigen Fällen wird diese Einstellung unter Umständen ignoriert (z. B. bei der Befehlszeilenoption \"-new-window\" oder \"-reuse-window\").",
-	"window.openFoldersInNewWindow.on": "Ordner werden in einem neuen Fenster geöffnet.",
-	"window.openFoldersInNewWindow.off": "Ordner ersetzen das letzte aktive Fenster.",
-	"window.openFoldersInNewWindow.default": "Ordner werden in einem neuen Fenster geöffnet, sofern kein Ordner innerhalb der Anwendung ausgewählt wird (z. B. über das Dateimenü).",
-	"openFoldersInNewWindow": "Steuert, ob Ordner in einem neuen Fenster geöffnet werden oder das letzte aktive Fenster ersetzen.\n- default: Die Ordner werden in einem neuen Fenster geöffnet, sofern kein Ordner innerhalb der Anwendung ausgewählt wird (z. B. über das Dateimenü).\n- on: Die Ordner werden in einem neuen Fenster geöffnet.\n- off: Die Ordner ersetzen das letzte aktive Fenster.\nIn einigen Fällen wird diese Einstellung unter Umständen ignoriert (z. B. bei der Befehlszeilenoption \"-new-window\" oder \"-reuse-window\").",
-	"window.openWithoutArgumentsInNewWindow.on": "Neues leeres Fenster öffnen",
-	"window.openWithoutArgumentsInNewWindow.off": "Fokus auf die zuletzt aktive ausgeführte Instanz",
-	"openWithoutArgumentsInNewWindow": "Steuert, ob ein neues leeres Fenster geöffnet wird, wenn eine zweite Instanz ohne Argumente gestartet wird oder wenn für die zuletzt ausgeführt Instanz ein Fokus erforderlich ist.\n- on: Öffnet ein neues leeres Fenster.\n- off: Die zuletzt aktive ausgeführte Instanz erhält den Fokus.\nIn einigen Fällen wird diese Einstellung unter Umständen ignoriert (z. B. bei der Befehlszeilenoption \"-new-window\" oder \"-reuse-window\").",
-	"window.reopenFolders.all": "Alle Fenster erneut öffnen.",
-	"window.reopenFolders.folders": "Alle Ordner erneut öffnen. Leere Arbeitsbereiche werden nicht wiederhergestellt.",
-	"window.reopenFolders.one": "Das letzte aktive Fenster erneut öffnen. ",
-	"window.reopenFolders.none": "Fenster nie erneut öffnen und immer mit einem leeren Fenster beginnen.",
-	"restoreWindows": "Steuert, wie Fenster nach einem Neustart erneut geöffnet werden. Wählen Sie \"none\", um immer mit einem leeren Arbeitsbereich zu beginnen, \"one\", um das zuletzt verwendete Fenster erneut zu öffnen, \"folders\", um alle Fenster, in denen Ordner geöffnet waren, erneut zu öffnen, oder \"all\", um alle Fenster der letzten Sitzung erneut zu öffnen.",
-	"restoreFullscreen": "Steuert, ob ein Fenster im Vollbildmodus wiederhergestellt wird, wenn es im Vollbildmodus beendet wurde.",
-	"zoomLevel": "Passen Sie den Zoomfaktor des Fensters an. Die ursprüngliche Größe ist 0. Jede Inkrementierung nach oben (z. B. 1) oder unten (z. B. -1) stellt eine Vergrößerung bzw. Verkleinerung um 20 % dar. Sie können auch Dezimalwerte eingeben, um den Zoomfaktor genauer anzupassen.",
-	"title": "Steuert den Fenstertitel basierend auf dem aktiven Editor. Variablen werden abhängig vom Kontext ersetzt:\n${activeEditorShort}: der Dateiname (z. B. myFile.txt)\n${activeEditorMedium}: der Pfad der Datei, relativ zum Arbeitsbereichsordner (z. B. myFolder/myFile.txt)\n${activeEditorLong}: der vollständige Pfad der Datei (z. B. /Users/Development/myProject/myFolder/myFile.txt)\n${folderName}: Name des Arbeitsbereichsordners, der die Datei enthält (z. B. myFolder) \n${folderPath}: Dateipfad des Arbeitsbereichsordners, der die Datei enthält (z. B. /Users/Development/myFolder)\n${rootName}: Name des Arbeitsbereichs (z. B. myFolder oder myWorkspace)\n${rootPath}: Dateipfad des Arbeitsbereichs (z. B. /Users/Development/myWorkspace)\n${appName}: z. B. VS Code\n${dirty}: ein Änderungsindikator, wenn der aktive Editor geändert wurde\n${separator}: ein bedingtes Trennzeichen (\" - \"), das nur angezeigt wird, wenn es zwischen Variablen mit Werten steht",
-	"window.newWindowDimensions.default": "Öffnet neue Fenster in der Mitte des Bildschirms.",
-	"window.newWindowDimensions.inherit": "Öffnet neue Fenster mit den gleichen Abmessungen wie das letzte aktive Fenster.",
-	"window.newWindowDimensions.maximized": "Öffnet neue Fenster maximiert.",
-	"window.newWindowDimensions.fullscreen": "Öffnet neue Fenster im Vollbildmodus.",
-	"newWindowDimensions": "Steuert die Abmessungen beim Öffnen eines neuen Fensters. Standardmäßig wird in der Mitte des Bildschirms ein neues Fenster mit kleinen Abmessungen geöffnet. Bei der Einstellung \"inherit\" erhält das Fenster die gleichen Abmessungen wie das letzte aktive Fenster. Bei der Einstellung \"maximized\" wird das Fenster maximiert geöffnet, und bei \"fullscreen\" wird es im Vollbildmodus geöffnet. Die Einstellung hat keine Auswirkungen auf das zuerst geöffnete Fenster. Größe und Position des ersten Fensters werden immer so wiederhergestellt, wie sie vor dem Schließen waren.",
-	"closeWhenEmpty": "Steuert, ob das Fenster beim Schließen des letzten Editors geschlossen wird. Diese Einstellung gilt nur für Fenster, in denen keine Ordner angezeigt werden.",
-	"window.menuBarVisibility.default": "Das Menü ist nur im Vollbildmodus ausgeblendet.",
-	"window.menuBarVisibility.visible": "Das Menu wird immer angezeigt, auch im Vollbildmodus.",
-	"window.menuBarVisibility.toggle": "Das Menu ist ausgeblendet, kann aber mit der Alt-Taste angezeigt werden.",
-	"window.menuBarVisibility.hidden": "Das Menü ist immer ausgeblendet.",
-	"menuBarVisibility": "Steuert die Sichtbarkeit der Menüleiste. Die Einstellung \"Umschalten\" bedeutet, dass die Menüleiste durch einfaches Betätigen der ALT-Taste angezeigt und ausgeblendet wird. Die Menüleite wird standardmäßig angezeigt, sofern sich das Fenster nicht im Vollbildmodus befindet.",
-	"enableMenuBarMnemonics": "Ist dies aktiviert, können die Hauptmenüs mithilfe von Tastenkombinationen mit der Alt-Taste geöffnet werden. Wenn mnemonische Zeichen deaktiviert werden, können diese Tastenkombinationen mit der Alt-Taste stattdessen an Editor-Befehle gebunden werden.",
-	"autoDetectHighContrast": "Ist diese Option aktiviert, erfolgt automatisch ein Wechsel zu einem Design mit hohem Kontrast, wenn Windows ein Design mit hohem Kontrast verwendet, und zu einem dunklen Design, wenn Sie für Windows kein Design mit hohem Kontrast mehr verwenden.",
-	"titleBarStyle": "Passt das Aussehen der Titelleiste des Fensters an. Zum Anwenden der Änderungen ist ein vollständiger Neustart erforderlich.",
-	"window.nativeTabs": "Aktiviert MacOS Sierra-Fensterregisterkarten. Beachten Sie, dass zum Übernehmen von Änderungen ein vollständiger Neustart erforderlich ist und durch ggf. konfigurierte native Registerkarten ein benutzerdefinierter Titelleistenstil deaktiviert wird.",
-	"window.smoothScrollingWorkaround": "Aktivieren Sie diese Problemumgehung, wenn der Bildlauf nach der Wiederherstellung eines minimierten VS Code-Fensters nicht mehr reibungslos funktioniert. Dies ist eine Problemumgehung für ein Problem (https://github.com/Microsoft/vscode/issues/13612), bei dem der Bildlauf auf Geräten mit präzisen Trackpads wie etwa den Surface-Geräten von Microsoft verzögert ist. Wenn Sie diese Problemumgehung aktivieren, flackert die Anzeige nach dem Wiederherstellen eines Fensters aus dem minimierten Zustand unter Umständen ein wenig, ansonsten treten jedoch keine Probleme auf.",
-	"window.clickThroughInactive": "Ist dies aktiviert, wird beim Klicken auf ein inaktives Fenster das Fenster aktiviert, und das Element unter der Maus wird ausgelöst, wenn es angeklickt werden kann. Wenn es deaktiviert ist, wird durch Klicken auf eine beliebige Stelle in einem inaktiven Fenster nur das Fenster aktiviert, und Sie müssen das Element zusätzlich anklicken.",
-	"zenModeConfigurationTitle": "Zen-Modus",
-	"zenMode.fullScreen": "Steuert, ob die Workbench durch das Aktivieren des Zen-Modus in den Vollbildmodus wechselt.",
-	"zenMode.centerLayout": "Steuert, ob das Layout durch Aktivieren des Zen-Modus ebenfalls zentriert wird.",
-	"zenMode.hideTabs": "Steuert, ob die Workbench-Registerkarten durch Aktivieren des Zen-Modus ebenfalls ausgeblendet werden.",
-	"zenMode.hideStatusBar": "Steuert, ob die Statusleiste im unteren Bereich der Workbench durch Aktivieren des Zen-Modus ebenfalls ausgeblendet wird.",
-	"zenMode.hideActivityBar": "Steuert, ob die Aktivitätsleiste im linken Bereich der Workbench durch Aktivieren des Zen-Modus ebenfalls ausgeblendet wird.",
-	"zenMode.restore": "Steuert, ob ein Fenster im Zen-Modus wiederhergestellt werden soll, wenn es im Zen-Modus beendet wurde."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/electron-browser/main.i18n.json b/i18n/deu/src/vs/workbench/electron-browser/main.i18n.json
deleted file mode 100644
index 8a1c7d521c7..00000000000
--- a/i18n/deu/src/vs/workbench/electron-browser/main.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"loaderError": "Eine erforderliche Datei konnte nicht geladen werden. Entweder sind Sie nicht mehr mit dem Internet verbunden oder der verbundene Server ist offline. Aktualisieren Sie den Browser, und wiederholen Sie den Vorgang.",
-	"loaderErrorNative": "Fehler beim Laden einer erforderlichen Datei. Bitte starten Sie die Anwendung neu, und versuchen Sie es dann erneut. Details: {0}"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/electron-browser/shell.i18n.json b/i18n/deu/src/vs/workbench/electron-browser/shell.i18n.json
deleted file mode 100644
index b225b8a0012..00000000000
--- a/i18n/deu/src/vs/workbench/electron-browser/shell.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"runningAsRoot": "Es wird empfohlen, Code nicht als \"root\" auszuführen."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/electron-browser/window.i18n.json b/i18n/deu/src/vs/workbench/electron-browser/window.i18n.json
deleted file mode 100644
index 4c4d3d858c1..00000000000
--- a/i18n/deu/src/vs/workbench/electron-browser/window.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"undo": "Rückgängig",
-	"redo": "Wiederholen",
-	"cut": "Ausschneiden",
-	"copy": "Kopieren",
-	"paste": "Einfügen",
-	"selectAll": "Alles auswählen",
-	"runningAsRoot": "Es wird nicht empfohlen, {0} als Root-Benutzer auszuführen."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/electron-browser/workbench.i18n.json b/i18n/deu/src/vs/workbench/electron-browser/workbench.i18n.json
deleted file mode 100644
index cd68e74672e..00000000000
--- a/i18n/deu/src/vs/workbench/electron-browser/workbench.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"developer": "Entwickler",
-	"file": "Datei"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/node/extensionHostMain.i18n.json b/i18n/deu/src/vs/workbench/node/extensionHostMain.i18n.json
deleted file mode 100644
index 95de9aa4401..00000000000
--- a/i18n/deu/src/vs/workbench/node/extensionHostMain.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"extensionTestError": "Der Pfad \"{0}\" verweist nicht auf einen gültigen Test Runner für eine Erweiterung."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/node/extensionPoints.i18n.json b/i18n/deu/src/vs/workbench/node/extensionPoints.i18n.json
deleted file mode 100644
index fc6d616a745..00000000000
--- a/i18n/deu/src/vs/workbench/node/extensionPoints.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"jsonParseFail": "Fehler beim Analysieren von {0}: {1}.",
-	"fileReadFail": "Die Datei \"{0}\" kann nicht gelesen werden: {1}",
-	"jsonsParseFail": "Fehler beim Analysieren von {0} oder {1}: {2}.",
-	"missingNLSKey": "Die Nachricht für den Schlüssel {0} wurde nicht gefunden."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/cli/electron-browser/cli.contribution.i18n.json b/i18n/deu/src/vs/workbench/parts/cli/electron-browser/cli.contribution.i18n.json
deleted file mode 100644
index 992f79b7e46..00000000000
--- a/i18n/deu/src/vs/workbench/parts/cli/electron-browser/cli.contribution.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"install": "Befehl \"{0}\" in \"PATH\" installieren",
-	"not available": "Dieser Befehl ist nicht verfügbar.",
-	"successIn": "Der Shellbefehl \"{0}\" wurde erfolgreich in \"PATH\" installiert.",
-	"ok": "OK",
-	"cancel2": "Abbrechen",
-	"warnEscalation": "Der Code fordert nun mit \"osascript\" zur Eingabe von Administratorberechtigungen auf, um den Shellbefehl zu installieren.",
-	"cantCreateBinFolder": "/usr/local/bin kann nicht erstellt werden.",
-	"aborted": "Abgebrochen",
-	"uninstall": "Befehl \"{0}\" aus \"PATH\" deinstallieren",
-	"successFrom": "Der Shellbefehl \"{0}\" wurde erfolgreich aus \"PATH\" deinstalliert.",
-	"shellCommand": "Shellbefehl"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/codeEditor/electron-browser/accessibility.i18n.json b/i18n/deu/src/vs/workbench/parts/codeEditor/electron-browser/accessibility.i18n.json
deleted file mode 100644
index ad2941f2d0b..00000000000
--- a/i18n/deu/src/vs/workbench/parts/codeEditor/electron-browser/accessibility.i18n.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"emergencyConfOn": "Die Einstellung \"editor.accessibilitySupport\" wird in \"Ein\" geändert.",
-	"openingDocs": "Die Dokumentationsseite zur Barrierefreiheit von VS Code wird jetzt geöffnet.",
-	"introMsg": "Vielen Dank, dass Sie die Optionen für Barrierefreiheit von VS Code testen.",
-	"status": "Status:",
-	"changeConfigToOnMac": "Betätigen Sie jetzt die Befehlstaste+E, um den Editor zu konfigurieren, sodass er permanent für die Verwendung mit einer Sprachausgabe optimiert wird.",
-	"changeConfigToOnWinLinux": "Betätigen Sie jetzt die Befehlstaste+E, um den Editor zu konfigurieren, sodass er permanent für die Verwendung mit einer Sprachausgabe optimiert wird.",
-	"auto_unknown": "Der Editor ist für die Verwendung von Plattform-APIs konfiguriert, um zu erkennen, wenn eine Sprachausgabe angefügt wird, die aktuelle Laufzeit unterstützt dies jedoch nicht.",
-	"auto_on": "Der Editor hat automatisch erkannt, dass eine Sprachausgabe angefügt wurde.",
-	"auto_off": "Der Editor ist so konfiguriert, dass er automatisch erkennt, wenn eine Sprachausgabe angefügt wird, was momentan nicht der Fall ist.",
-	"configuredOn": "Der Editor ist so konfiguriert, dass er für die Verwendung mit einer Sprachausgabe durchgehend optimiert wird – Sie können dies ändern, indem Sie die Einstellung \"editor.accessibilitySupport\" bearbeiten.",
-	"configuredOff": "Der Editor ist so konfiguriert, dass er für die Verwendung mit einer Sprachausgabe nie optimiert wird.",
-	"tabFocusModeOnMsg": "Durch Drücken der TAB-TASTE im aktuellen Editor wird der Fokus in das nächste Element verschoben, das den Fokus erhalten kann. Schalten Sie dieses Verhalten um, indem Sie {0} drücken.",
-	"tabFocusModeOnMsgNoKb": "Durch Drücken der TAB-TASTE im aktuellen Editor wird der Fokus in das nächste Element verschoben, das den Fokus erhalten kann. Der {0}-Befehl kann zurzeit nicht durch eine Tastenzuordnung ausgelöst werden.",
-	"tabFocusModeOffMsg": "Durch Drücken der TAB-TASTE im aktuellen Editor wird das Tabstoppzeichen eingefügt. Schalten Sie dieses Verhalten um, indem Sie {0} drücken.",
-	"tabFocusModeOffMsgNoKb": "Durch Drücken der TAB-TASTE im aktuellen Editor wird das Tabstoppzeichen eingefügt. Der {0}-Befehl kann zurzeit nicht durch eine Tastenzuordnung ausgelöst werden.",
-	"openDocMac": "Drücken Sie die Befehlstaste+H, um ein Browserfenster mit zusätzlichen VS Code-Informationen zur Barrierefreiheit zu öffnen.",
-	"openDocWinLinux": "Drücken Sie STRG+H, um ein Browserfenster mit zusätzlichen VS Code-Informationen zur Barrierefreiheit zu öffnen.",
-	"outroMsg": "Sie können diese QuickInfo schließen und durch Drücken von ESC oder UMSCHALT+ESC zum Editor zurückkehren.",
-	"ShowAccessibilityHelpAction": "Hilfe zur Barrierefreiheit anzeigen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/codeEditor/electron-browser/inspectKeybindings.i18n.json b/i18n/deu/src/vs/workbench/parts/codeEditor/electron-browser/inspectKeybindings.i18n.json
deleted file mode 100644
index 0ed41a3d07a..00000000000
--- a/i18n/deu/src/vs/workbench/parts/codeEditor/electron-browser/inspectKeybindings.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"workbench.action.inspectKeyMap": "Entwickler: Wichtige Zuordnungen prüfen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/codeEditor/electron-browser/inspectTMScopes.i18n.json b/i18n/deu/src/vs/workbench/parts/codeEditor/electron-browser/inspectTMScopes.i18n.json
deleted file mode 100644
index 18e736ab987..00000000000
--- a/i18n/deu/src/vs/workbench/parts/codeEditor/electron-browser/inspectTMScopes.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"inspectTMScopes": "Entwickler: TM-Bereiche untersuchen",
-	"inspectTMScopesWidget.loading": "Wird geladen..."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/codeEditor/electron-browser/languageConfiguration/languageConfigurationExtensionPoint.i18n.json b/i18n/deu/src/vs/workbench/parts/codeEditor/electron-browser/languageConfiguration/languageConfigurationExtensionPoint.i18n.json
deleted file mode 100644
index 6b55fb36e6c..00000000000
--- a/i18n/deu/src/vs/workbench/parts/codeEditor/electron-browser/languageConfiguration/languageConfigurationExtensionPoint.i18n.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"parseErrors": "Fehler beim Analysieren von {0}: {1}",
-	"schema.openBracket": "Das öffnende Klammerzeichen oder die Zeichenfolgensequenz.",
-	"schema.closeBracket": "Das schließende Klammerzeichen oder die Zeichenfolgensequenz.",
-	"schema.comments": "Definiert die Kommentarsymbole.",
-	"schema.blockComments": "Definiert, wie Blockkommentare markiert werden.",
-	"schema.blockComment.begin": "Die Zeichenfolge, mit der ein Blockkommentar beginnt.",
-	"schema.blockComment.end": "Die Zeichenfolge, die einen Blockkommentar beendet.",
-	"schema.lineComment": "Die Zeichenfolge, mit der ein Zeilenkommentar beginnt.",
-	"schema.brackets": "Definiert die Klammersymbole, die den Einzug vergrößern oder verkleinern.",
-	"schema.autoClosingPairs": "Definiert die Klammerpaare. Wenn eine öffnende Klammer eingegeben wird, wird die schließende Klammer automatisch eingefügt.",
-	"schema.autoClosingPairs.notIn": "Definiert eine Liste von Bereichen, in denen die automatischen Paare deaktiviert sind.",
-	"schema.surroundingPairs": "Definiert die Klammerpaare, in die eine ausgewählte Zeichenfolge eingeschlossen werden kann.",
-	"schema.wordPattern": "Die Worddefinition für die Sprache.",
-	"schema.wordPattern.pattern": "RegExp Muster für Wortübereinstimmungen.",
-	"schema.wordPattern.flags": "RegExp Kennzeichen für Wortübereinstimmungen",
-	"schema.wordPattern.flags.errorMessage": "Muss mit dem Muster `/^([gimuy]+)$/` übereinstimmen.",
-	"schema.indentationRules": "Die Einzugseinstellungen der Sprache.",
-	"schema.indentationRules.increaseIndentPattern": "Wenn eine Zeile diesem Muster entspricht, sollten alle Zeilen nach dieser Zeile einmal eingerückt werden (bis eine andere Regel übereinstimmt).",
-	"schema.indentationRules.increaseIndentPattern.pattern": "Das RegExp-Muster für increaseIndentPattern.",
-	"schema.indentationRules.increaseIndentPattern.flags": "Die RegExp-Flags für increaseIndentPattern.",
-	"schema.indentationRules.increaseIndentPattern.errorMessage": "Muss mit dem Muster `/^([gimuy]+)$/` übereinstimmen.",
-	"schema.indentationRules.decreaseIndentPattern": "Wenn eine Zeile diesem Muster entspricht, sollte der Einzug aller Zeilen nach dieser Zeile einmal aufgehoben werden (bis eine andere Regel übereinstimmt).",
-	"schema.indentationRules.decreaseIndentPattern.pattern": "Das RegExp-Muster für decreaseIndentPattern.",
-	"schema.indentationRules.decreaseIndentPattern.flags": "Die RegExp-Flags für decreaseIndentPattern.",
-	"schema.indentationRules.decreaseIndentPattern.errorMessage": "Muss mit dem Muster `/^([gimuy]+)$/` übereinstimmen.",
-	"schema.indentationRules.indentNextLinePattern": "Wenn eine Zeile diesem Muster entspricht, sollte **nur die nächste Zeile** nach dieser Zeile einmal eingerückt werden.",
-	"schema.indentationRules.indentNextLinePattern.pattern": "Das RegExp-Muster für indentNextLinePattern.",
-	"schema.indentationRules.indentNextLinePattern.flags": "Die RegExp-Flags für indentNextLinePattern.",
-	"schema.indentationRules.indentNextLinePattern.errorMessage": "Muss mit dem Muster `/^([gimuy]+)$/` übereinstimmen.",
-	"schema.indentationRules.unIndentedLinePattern": "Wenn eine Zeile diesem Muster entspricht, sollte ihr Einzug nicht geändert und die Zeile nicht mit den anderen Regeln ausgewertet werden.",
-	"schema.indentationRules.unIndentedLinePattern.pattern": "Das RegExp-Muster für unIndentedLinePattern.",
-	"schema.indentationRules.unIndentedLinePattern.flags": "Die RegExp-Flags für unIndentedLinePattern.",
-	"schema.indentationRules.unIndentedLinePattern.errorMessage": "Muss mit dem Muster `/^([gimuy]+)$/` übereinstimmen.",
-	"schema.folding": "Die Faltungseinstellungen der Sprache.",
-	"schema.folding.offSide": "Für eine Sprache gilt die Abseitsregel, wenn Blöcke in dieser Sprache durch die Einrücktiefe ausgedrückt werden. Wenn dies festgelegt ist, gehören leere Zeilen zum nächsten Block.",
-	"schema.folding.markers": "Sprachspezifische Faltungsmarkierungen wie \"#region\" und \"#endregion\". Die regulären Anfangs- und Endausdrücke werden im Hinblick auf den Inhalt aller Zeilen getestet und müssen effizient erstellt werden.",
-	"schema.folding.markers.start": "Das RegExp-Muster für die Startmarkierung. Das Regexp muss mit \"^\" beginnen.",
-	"schema.folding.markers.end": "Das RegExp-Muster für die Endmarkierung. Das Regexp muss mit \"^\" beginnen."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/codeEditor/electron-browser/largeFileOptimizations.i18n.json b/i18n/deu/src/vs/workbench/parts/codeEditor/electron-browser/largeFileOptimizations.i18n.json
deleted file mode 100644
index badefe674fe..00000000000
--- a/i18n/deu/src/vs/workbench/parts/codeEditor/electron-browser/largeFileOptimizations.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"largeFile": "{0}: Tokenisierung, Umbruch und Faltung wurden für diese große Datei deaktiviert, um die Speicherauslastung zu verringern und ein Einfrieren oder einen Absturz zu vermeiden.",
-	"neverShowAgain": "Verstanden, nicht mehr anzeigen",
-	"removeOptimizations": "Aktivieren von Funktionen erzwingen",
-	"reopenFilePrompt": "Bitte öffnen Sie die Datei erneut, damit diese Einstellung wirksam wird."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/codeEditor/electron-browser/textMate/inspectTMScopes.i18n.json b/i18n/deu/src/vs/workbench/parts/codeEditor/electron-browser/textMate/inspectTMScopes.i18n.json
deleted file mode 100644
index a72b7f0492c..00000000000
--- a/i18n/deu/src/vs/workbench/parts/codeEditor/electron-browser/textMate/inspectTMScopes.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"inspectTMScopes": "Entwickler: TM-Bereiche untersuchen",
-	"inspectTMScopesWidget.loading": "Wird geladen..."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/codeEditor/electron-browser/toggleMinimap.i18n.json b/i18n/deu/src/vs/workbench/parts/codeEditor/electron-browser/toggleMinimap.i18n.json
deleted file mode 100644
index f4b4719cc7d..00000000000
--- a/i18n/deu/src/vs/workbench/parts/codeEditor/electron-browser/toggleMinimap.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleMinimap": "Ansicht: Minikarte umschalten"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/codeEditor/electron-browser/toggleMultiCursorModifier.i18n.json b/i18n/deu/src/vs/workbench/parts/codeEditor/electron-browser/toggleMultiCursorModifier.i18n.json
deleted file mode 100644
index 929a014508e..00000000000
--- a/i18n/deu/src/vs/workbench/parts/codeEditor/electron-browser/toggleMultiCursorModifier.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleLocation": "Multi-Curosor-Modifizierer umschalten"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderControlCharacter.i18n.json b/i18n/deu/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderControlCharacter.i18n.json
deleted file mode 100644
index cf06278fb8e..00000000000
--- a/i18n/deu/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderControlCharacter.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleRenderControlCharacters": "Ansicht: Steuerzeichen umschalten"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderWhitespace.i18n.json b/i18n/deu/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderWhitespace.i18n.json
deleted file mode 100644
index 07f7b4a3cf3..00000000000
--- a/i18n/deu/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderWhitespace.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleRenderWhitespace": "Ansicht: Rendern von Leerzeichen umschalten"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/codeEditor/electron-browser/toggleWordWrap.i18n.json b/i18n/deu/src/vs/workbench/parts/codeEditor/electron-browser/toggleWordWrap.i18n.json
deleted file mode 100644
index 8fcc1c2f95b..00000000000
--- a/i18n/deu/src/vs/workbench/parts/codeEditor/electron-browser/toggleWordWrap.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggle.wordwrap": "Ansicht: Zeilenumbruch umschalten",
-	"wordWrap.notInDiffEditor": "In einem Diff-Editor kann der Zeilenumbruch nicht umgeschaltet werden.",
-	"unwrapMinified": "Umbruch für diese Datei deaktivieren",
-	"wrapMinified": "Umbruch für diese Datei aktivieren"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/codeEditor/electron-browser/wordWrapMigration.i18n.json b/i18n/deu/src/vs/workbench/parts/codeEditor/electron-browser/wordWrapMigration.i18n.json
deleted file mode 100644
index fb282a87bf9..00000000000
--- a/i18n/deu/src/vs/workbench/parts/codeEditor/electron-browser/wordWrapMigration.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"wordWrapMigration.ok": "OK",
-	"wordWrapMigration.dontShowAgain": "Nicht mehr anzeigen",
-	"wordWrapMigration.openSettings": "Einstellungen öffnen",
-	"wordWrapMigration.prompt": "Die Einstellung \"editor.wrappingColumn\" ist veraltet und wurde durch \"editor.wordWrap\" ersetzt."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/debug/browser/breakpointWidget.i18n.json b/i18n/deu/src/vs/workbench/parts/debug/browser/breakpointWidget.i18n.json
deleted file mode 100644
index ec3a4eb5ff8..00000000000
--- a/i18n/deu/src/vs/workbench/parts/debug/browser/breakpointWidget.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"breakpointWidgetExpressionPlaceholder": "Unterbrechen, wenn der Ausdruck als TRUE ausgewertet wird. EINGABETASTE zum Akzeptieren, ESC-TASTE zum Abbrechen.",
-	"breakpointWidgetAriaLabel": "Das Programm wird nur angehalten, wenn diese Bedingung erfüllt ist. Drücken Sie zum Akzeptieren die EINGABETASTE oder ESC, um den Vorgang abzubrechen.",
-	"breakpointWidgetHitCountPlaceholder": "Unterbrechen, wenn die Bedingung für die Trefferanzahl erfüllt ist. EINGABETASTE zum Akzeptieren, ESC-TASTE zum Abbrechen.",
-	"breakpointWidgetHitCountAriaLabel": "Das Programm wird nur angehalten, wenn die Bedingung für die Trefferanzahl erfüllt ist. Drücken Sie zum Akzeptieren die EINGABETASTE oder ESC, um den Vorgang abzubrechen.",
-	"expression": "Ausdruck",
-	"hitCount": "Trefferanzahl"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json b/i18n/deu/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
deleted file mode 100644
index b4980d90513..00000000000
--- a/i18n/deu/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"logPoint": "Protokollpunkt",
-	"breakpoint": "Haltepunkt",
-	"editBreakpoint": "{0} bearbeiten …",
-	"removeBreakpoint": "{0} entfernen",
-	"functionBreakpointsNotSupported": "Funktionshaltepunkte werden von diesem Debugtyp nicht unterstützt.",
-	"functionBreakpointPlaceholder": "Funktion mit Haltepunkt",
-	"functionBreakPointInputAriaLabel": "Geben Sie den Funktionshaltepunkt ein.",
-	"breakpointDisabledHover": "Deaktivierter Haltepunkt",
-	"breakpointUnverifieddHover": "Nicht überprüfter Haltepunkt",
-	"functionBreakpointUnsupported": "Funktionshaltepunkte werden von diesem Debugtyp nicht unterstützt.",
-	"breakpointDirtydHover": "Nicht überprüfter Haltepunkt. Die Datei wurde geändert. Bitte starten Sie die Debugsitzung neu.",
-	"logBreakpointUnsupported": "Protokollpunkte werden für diesen Debugtyp nicht unterstützt",
-	"conditionalBreakpointUnsupported": "Bedingte Haltepunkte werden für diesen Debugtyp nicht unterstützt.",
-	"hitBreakpointUnsupported": "Bedingte Trefferhaltepunkte werden für diesen Debugtyp nicht unterstützt."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/debug/browser/debugActionItems.i18n.json b/i18n/deu/src/vs/workbench/parts/debug/browser/debugActionItems.i18n.json
deleted file mode 100644
index ddda783ca84..00000000000
--- a/i18n/deu/src/vs/workbench/parts/debug/browser/debugActionItems.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noConfigurations": "Keine Konfigurationen",
-	"addConfigTo": "Konfiguration hinzufügen ({0})...",
-	"addConfiguration": "Konfiguration hinzufügen..."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/debug/browser/debugActions.i18n.json b/i18n/deu/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
deleted file mode 100644
index b11a3acca25..00000000000
--- a/i18n/deu/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openLaunchJson": "{0} öffnen",
-	"launchJsonNeedsConfigurtion": "Konfigurieren oder reparieren Sie \"launch.json\".",
-	"noFolderDebugConfig": "Öffnen Sie bitte einen Ordner, um erweitertes Debuggen zu konfigurieren.",
-	"startDebug": "Debuggen starten",
-	"startWithoutDebugging": "Ohne Debuggen starten",
-	"selectAndStartDebugging": "Debugging auswählen und starten",
-	"restartDebug": "Neu starten",
-	"reconnectDebug": "Erneut verbinden",
-	"stepOverDebug": "Prozedurschritt",
-	"stepIntoDebug": "Einzelschritt",
-	"stepOutDebug": "Prozedurschritt",
-	"stopDebug": "Beenden",
-	"disconnectDebug": "Trennen",
-	"continueDebug": "Weiter",
-	"pauseDebug": "Anhalten",
-	"terminateThread": "Thread beenden",
-	"restartFrame": "Frame neu starten",
-	"removeBreakpoint": "Haltepunkt entfernen",
-	"removeAllBreakpoints": "Alle Haltepunkte entfernen",
-	"enableAllBreakpoints": "Alle Haltepunkte aktivieren",
-	"disableAllBreakpoints": "Alle Haltepunkte deaktivieren",
-	"activateBreakpoints": "Haltepunkte aktivieren",
-	"deactivateBreakpoints": "Haltepunkte deaktivieren",
-	"reapplyAllBreakpoints": "Alle Haltepunkte erneut anwenden",
-	"addFunctionBreakpoint": "Funktionshaltepunkt hinzufügen",
-	"setValue": "Wert festlegen",
-	"addWatchExpression": "Ausdruck hinzufügen",
-	"editWatchExpression": "Ausdruck bearbeiten",
-	"addToWatchExpressions": "Zur Überwachung hinzufügen",
-	"removeWatchExpression": "Ausdruck entfernen",
-	"removeAllWatchExpressions": "Alle Ausdrücke entfernen",
-	"clearRepl": "Konsole löschen",
-	"debugConsoleAction": "Debugging-Konsole",
-	"unreadOutput": "Neue Ausgabe in Debugging-Konsole",
-	"debugFocusConsole": "Focus-Debugging-Konsole",
-	"focusSession": "Fokus auf Sitzung",
-	"stepBackDebug": "Schritt zurück",
-	"reverseContinue": "Umkehren"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/debug/browser/debugActionsWidget.i18n.json b/i18n/deu/src/vs/workbench/parts/debug/browser/debugActionsWidget.i18n.json
deleted file mode 100644
index 8ec09261787..00000000000
--- a/i18n/deu/src/vs/workbench/parts/debug/browser/debugActionsWidget.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"debugToolBarBackground": "Hintergrundfarbe der Debug-Symbolleiste.",
-	"debugToolBarBorder": "Rahmenfarbe der Debug-Symbolleiste."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/debug/browser/debugCommands.i18n.json b/i18n/deu/src/vs/workbench/parts/debug/browser/debugCommands.i18n.json
deleted file mode 100644
index 3e3e238e2d9..00000000000
--- a/i18n/deu/src/vs/workbench/parts/debug/browser/debugCommands.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noFolderDebugConfig": "Öffnen Sie bitte einen Ordner, um erweitertes Debuggen zu konfigurieren.",
-	"inlineBreakpoint": "Inlinehaltepunkt",
-	"debug": "Debuggen",
-	"addInlineBreakpoint": "Inlinehaltepunkt hinzufügen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/debug/browser/debugContentProvider.i18n.json b/i18n/deu/src/vs/workbench/parts/debug/browser/debugContentProvider.i18n.json
deleted file mode 100644
index 17a45e18038..00000000000
--- a/i18n/deu/src/vs/workbench/parts/debug/browser/debugContentProvider.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"unable": "Die Ressource konnte ohne eine Debugsitzung nicht aufgelöst werden.",
-	"canNotResolveSource": "Ressource {0} konnte nicht aufgelöst werden. Keine Antwort von der Debugerweiterung."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json b/i18n/deu/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
deleted file mode 100644
index 61e2a86a93e..00000000000
--- a/i18n/deu/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleBreakpointAction": "Debuggen: Haltepunkt umschalten",
-	"conditionalBreakpointEditorAction": "Debuggen: Bedingten Haltepunkt hinzufügen...",
-	"logPointEditorAction": "Debuggen: Protokollpunkt hinzufügen …",
-	"runToCursor": "Ausführen bis Cursor",
-	"debugEvaluate": "Debuggen: Auswerten",
-	"debugAddToWatch": "Debuggen: Zur Überwachung hinzufügen",
-	"showDebugHover": "Debuggen: Hover anzeigen",
-	"goToNextBreakpoint": "Debuggen: Zum nächsten Haltepunkt wechseln",
-	"goToPreviousBreakpoint": "Debuggen: Zum vorherigen Haltepunkt wechseln"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/debug/browser/debugEditorModelManager.i18n.json b/i18n/deu/src/vs/workbench/parts/debug/browser/debugEditorModelManager.i18n.json
deleted file mode 100644
index 17a2b28ddbb..00000000000
--- a/i18n/deu/src/vs/workbench/parts/debug/browser/debugEditorModelManager.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"breakpointDisabledHover": "Deaktivierter Haltepunkt",
-	"breakpointUnverifieddHover": "Nicht überprüfter Haltepunkt",
-	"breakpointDirtydHover": "Nicht überprüfter Haltepunkt. Die Datei wurde geändert. Bitte starten Sie die Debugsitzung neu.",
-	"breakpointUnsupported": "Bedingte Haltepunkte werden für diesen Debugtyp nicht unterstützt."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/debug/browser/debugQuickOpen.i18n.json b/i18n/deu/src/vs/workbench/parts/debug/browser/debugQuickOpen.i18n.json
deleted file mode 100644
index 50aa489c19a..00000000000
--- a/i18n/deu/src/vs/workbench/parts/debug/browser/debugQuickOpen.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"entryAriaLabel": "{0}, Debugging",
-	"debugAriaLabel": "Geben Sie den Namen einer auszuführenden Startkonfiguration ein.",
-	"addConfigTo": "Konfiguration hinzufügen ({0})...",
-	"addConfiguration": "Konfiguration hinzufügen...",
-	"noConfigurationsMatching": "Keine übereinstimmenden Debugkonfigurationen",
-	"noConfigurationsFound": "Keine Debugkonfiguration gefunden. Erstellen Sie die Datei \"launch.json\"."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/debug/browser/debugStatus.i18n.json b/i18n/deu/src/vs/workbench/parts/debug/browser/debugStatus.i18n.json
deleted file mode 100644
index b84eccf398b..00000000000
--- a/i18n/deu/src/vs/workbench/parts/debug/browser/debugStatus.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"selectAndStartDebug": "Debug Konfiguration auswählen und starten"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/debug/browser/debugViewlet.i18n.json b/i18n/deu/src/vs/workbench/parts/debug/browser/debugViewlet.i18n.json
deleted file mode 100644
index f0bef41ec09..00000000000
--- a/i18n/deu/src/vs/workbench/parts/debug/browser/debugViewlet.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"startAdditionalSession": "Zusätzliche Session starten",
-	"debugFocusVariablesView": "Fokus-Variablen",
-	"debugFocusWatchView": "Fokus-Watch",
-	"debugFocusCallStackView": "Fokus-CallStack",
-	"debugFocusBreakpointsView": "Fokus-Haltepunkte"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/debug/browser/exceptionWidget.i18n.json b/i18n/deu/src/vs/workbench/parts/debug/browser/exceptionWidget.i18n.json
deleted file mode 100644
index 0cfeae39b2e..00000000000
--- a/i18n/deu/src/vs/workbench/parts/debug/browser/exceptionWidget.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"debugExceptionWidgetBorder": "Widget-Rahmenfarbe bei einer Ausnahme. ",
-	"debugExceptionWidgetBackground": "Widget-Hintergrundfarbe bei einer Ausnahme. ",
-	"exceptionThrownWithId": "Ausnahme: {0}",
-	"exceptionThrown": "Ausnahme aufgetreten."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/debug/browser/linkDetector.i18n.json b/i18n/deu/src/vs/workbench/parts/debug/browser/linkDetector.i18n.json
deleted file mode 100644
index 8f55e25ffee..00000000000
--- a/i18n/deu/src/vs/workbench/parts/debug/browser/linkDetector.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"fileLinkMac": "Zum Öffnen klicken (CMD+KLICKEN für seitliche Anzeige)",
-	"fileLink": "Zum Öffnen klicken (STRG+KLICKEN für seitliche Anzeige)"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/debug/browser/statusbarColorProvider.i18n.json b/i18n/deu/src/vs/workbench/parts/debug/browser/statusbarColorProvider.i18n.json
deleted file mode 100644
index d4395810a2f..00000000000
--- a/i18n/deu/src/vs/workbench/parts/debug/browser/statusbarColorProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"statusBarDebuggingBackground": "Hintergrundfarbe der Statusleiste beim Debuggen eines Programms. Die Statusleiste wird unten im Fenster angezeigt.",
-	"statusBarDebuggingForeground": "Vordergrundfarbe der Statusleiste beim Debuggen eines Programms. Die Statusleiste wird unten im Fenster angezeigt.",
-	"statusBarDebuggingBorder": "Rahmenfarbe der Statusleiste zur Abtrennung von der Randleiste und dem Editor, wenn ein Programm debuggt wird. Die Statusleiste wird unten im Fenster angezeigt."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/debug/common/debug.i18n.json b/i18n/deu/src/vs/workbench/parts/debug/common/debug.i18n.json
deleted file mode 100644
index 6f9d2440914..00000000000
--- a/i18n/deu/src/vs/workbench/parts/debug/common/debug.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"internalConsoleOptions": "Steuert das Verhalten der internen Debugging-Konsole."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/debug/common/debugModel.i18n.json b/i18n/deu/src/vs/workbench/parts/debug/common/debugModel.i18n.json
deleted file mode 100644
index f6d10a9483e..00000000000
--- a/i18n/deu/src/vs/workbench/parts/debug/common/debugModel.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"notAvailable": "Nicht verfügbar",
-	"startDebugFirst": "Bitte starten Sie eine Debugsitzung, um die Auswertung vorzunehmen."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/debug/common/debugSchemas.i18n.json b/i18n/deu/src/vs/workbench/parts/debug/common/debugSchemas.i18n.json
deleted file mode 100644
index 896264443ae..00000000000
--- a/i18n/deu/src/vs/workbench/parts/debug/common/debugSchemas.i18n.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.contributes.debuggers": "Trägt Debugadapter bei.",
-	"vscode.extension.contributes.debuggers.type": "Der eindeutige Bezeichner für diese Debugadapter.",
-	"vscode.extension.contributes.debuggers.label": "Der Anzeigename für diese Debugadapter.",
-	"vscode.extension.contributes.debuggers.program": "Der Pfad zum Debugadapterprogramm. Der Pfad ist absolut oder relativ zum Erweiterungsordner.",
-	"vscode.extension.contributes.debuggers.args": "Optionale Argumente, die an den Adapter übergeben werden sollen.",
-	"vscode.extension.contributes.debuggers.runtime": "Optionale Laufzeit für den Fall, dass das Programmattribut keine ausführbare Datei ist und eine Laufzeit erfordert.",
-	"vscode.extension.contributes.debuggers.runtimeArgs": "Optionale Laufzeitargumente.",
-	"vscode.extension.contributes.debuggers.variables": "Eine Zuordnung von interaktiven Variablen (z. B. \"${action.pickProcess}\") in \"launch.json\" zu einem Befehl.",
-	"vscode.extension.contributes.debuggers.initialConfigurations": "Konfigurationen zum Generieren der anfänglichen Datei \"launch.json\".",
-	"vscode.extension.contributes.debuggers.languages": "Liste der Sprachen, für die die Debugerweiterung als \"Standarddebugger\" angesehen werden kann",
-	"vscode.extension.contributes.debuggers.adapterExecutableCommand": "Wenn dies festgelegt ist, ruft der VS Code diesen Befehl auf, um den ausführbaren Pfad des Debugadapters und die zu übergebenden Argumente zu bestimmen.",
-	"vscode.extension.contributes.debuggers.configurationSnippets": "Snippets zum Hinzufügen neuer Konfigurationen in \"launch.json\".",
-	"vscode.extension.contributes.debuggers.configurationAttributes": "JSON-Schemakonfigurationen zum Überprüfen von \"launch.json\".",
-	"vscode.extension.contributes.debuggers.windows": "Windows-spezifische Einstellungen.",
-	"vscode.extension.contributes.debuggers.windows.runtime": "Die für Windows verwendete Laufzeit.",
-	"vscode.extension.contributes.debuggers.osx": "macOS-spezifische Einstellungen.",
-	"vscode.extension.contributes.debuggers.osx.runtime": "Für macOS verwendete Laufzeit.",
-	"vscode.extension.contributes.debuggers.linux": "Linux-spezifische Einstellungen.",
-	"vscode.extension.contributes.debuggers.linux.runtime": "Die für Linux verwendete Laufzeit.",
-	"vscode.extension.contributes.breakpoints": "Trägt Haltepunkte bei.",
-	"vscode.extension.contributes.breakpoints.language": "Lässt Haltepunkte für diese Sprache zu.",
-	"app.launch.json.title": "Starten",
-	"app.launch.json.version": "Die Version dieses Dateiformats.",
-	"app.launch.json.configurations": "Die Liste der Konfigurationen. Fügen Sie neue Konfigurationen hinzu, oder bearbeiten Sie vorhandene Konfigurationen mit IntelliSense.",
-	"app.launch.json.compounds": "Liste der Verbundelemente. Jeder Verbund verweist auf mehrere Konfigurationen, die zusammen gestartet werden.",
-	"app.launch.json.compound.name": "Name des Verbunds. Wird im Dropdownmenü der Startkonfiguration angezeigt.",
-	"useUniqueNames": "Verwenden Sie eindeutige Konfigurationsnamen.",
-	"app.launch.json.compound.folder": "Name des Ordners, in dem sich der Verbund befindet.",
-	"app.launch.json.compounds.configurations": "Namen von Konfigurationen, die als Bestandteil dieses Verbunds gestartet werden."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/debug/common/debugSource.i18n.json b/i18n/deu/src/vs/workbench/parts/debug/common/debugSource.i18n.json
deleted file mode 100644
index 3f94516cae0..00000000000
--- a/i18n/deu/src/vs/workbench/parts/debug/common/debugSource.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"unknownSource": "Unbekannte Quelle"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json b/i18n/deu/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
deleted file mode 100644
index 7cc2728b73c..00000000000
--- a/i18n/deu/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"breakpointWidgetLogMessagePlaceholder": "Zu protokollierende Nachricht, wenn der Haltepunkt erreicht wird. Ausdrücke innerhalb von {} werden interpoliert. Betätigen Sie die EINGABETASTE, um dies zu akzeptieren, oder ECS, um den Vorgang abzubrechen.",
-	"breakpointWidgetHitCountPlaceholder": "Unterbrechen, wenn die Bedingung für die Trefferanzahl erfüllt ist. EINGABETASTE zum Akzeptieren, ESC-TASTE zum Abbrechen.",
-	"breakpointWidgetExpressionPlaceholder": "Unterbrechen, wenn der Ausdruck als TRUE ausgewertet wird. EINGABETASTE zum Akzeptieren, ESC-TASTE zum Abbrechen.",
-	"expression": "Ausdruck",
-	"hitCount": "Trefferanzahl",
-	"logMessage": "Protokollmeldung"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/debug/electron-browser/breakpointsView.i18n.json b/i18n/deu/src/vs/workbench/parts/debug/electron-browser/breakpointsView.i18n.json
deleted file mode 100644
index ab1d06d7648..00000000000
--- a/i18n/deu/src/vs/workbench/parts/debug/electron-browser/breakpointsView.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"editConditionalBreakpoint": "Haltepunkt bearbeiten...",
-	"functionBreakpointsNotSupported": "Funktionshaltepunkte werden von diesem Debugtyp nicht unterstützt.",
-	"functionBreakpointPlaceholder": "Funktion mit Haltepunkt",
-	"functionBreakPointInputAriaLabel": "Geben Sie den Funktionshaltepunkt ein."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/debug/electron-browser/callStackView.i18n.json b/i18n/deu/src/vs/workbench/parts/debug/electron-browser/callStackView.i18n.json
deleted file mode 100644
index 7d6a36f18f2..00000000000
--- a/i18n/deu/src/vs/workbench/parts/debug/electron-browser/callStackView.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"callstackSection": "Aufruflistenabschnitt",
-	"debugStopped": "Angehalten bei {0}",
-	"callStackAriaLabel": "Aufrufliste debuggen",
-	"session": "Sitzung",
-	"paused": "Angehalten",
-	"running": "Wird ausgeführt",
-	"thread": "Thread",
-	"pausedOn": "Angehalten bei {0}",
-	"loadMoreStackFrames": "Weitere Stapelrahmen laden",
-	"threadAriaLabel": "Thread {0}, Aufrufliste, Debuggen",
-	"stackFrameAriaLabel": "Stapelrahmen {0} Zeile {1} {2}, Aufrufliste, Debuggen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json b/i18n/deu/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
deleted file mode 100644
index 72a2c9e811a..00000000000
--- a/i18n/deu/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleDebugViewlet": "Debuggen anzeigen",
-	"toggleDebugPanel": "Debugging-Konsole",
-	"debug": "Debuggen",
-	"debugPanel": "Debugging-Konsole",
-	"variables": "Variablen",
-	"watch": "Überwachen",
-	"callStack": "Aufrufliste",
-	"breakpoints": "Haltepunkte",
-	"view": "Anzeigen",
-	"debugCategory": "Debuggen",
-	"debugCommands": "Debugkonfiguration",
-	"debugConfigurationTitle": "Debuggen",
-	"allowBreakpointsEverywhere": "Ermöglicht das Festlegen von Haltepunkten für alle Dateien.",
-	"openExplorerOnEnd": "Hiermit wird am Ende einer Debugsitzung automatisch eine Explorer-Ansicht geöffnet.",
-	"inlineValues": "Variablenwerte beim Debuggen in Editor eingebunden anzeigen",
-	"toolBarLocation": "Steuert die Position der Debugsymbolleiste. Mögliche Werte sind \"floating\" (schwebend in allen Ansichten), \"docked\" (verankert in der Debugansicht) oder \"hidden\" (ausgeblendet).",
-	"never": "Debuggen nie in Statusleiste anzeigen",
-	"always": "Debuggen immer in Statusleiste anzeigen",
-	"onFirstSessionStart": "Debuggen nur in Statusleiste anzeigen, nachdem das Debuggen erstmals gestartet wurde",
-	"showInStatusBar": "Steuert, wann die Debug-Statusleiste angezeigt werden soll",
-	"openDebug": "Steuert, ob das Debug-Menü beim Start der Debugsitzung offen ist.",
-	"enableAllHovers": "Legt fest, ob Nicht-Debughover beim Debuggen aktiviert sind. Bei \"true\" werden die Hoveranbieter aufgerufen, um einen Hover bereitstellen. Reguläre Hover werden auch bei der Einstellung \"true\" nicht angezeigt.",
-	"launch": "Startkonfiguration für globales Debuggen. Sollte als Alternative zu \"launch.json\" verwendet werden, das übergreifend von mehreren Arbeitsbereichen genutzt wird"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/debug/electron-browser/debugCommands.i18n.json b/i18n/deu/src/vs/workbench/parts/debug/electron-browser/debugCommands.i18n.json
deleted file mode 100644
index a490400ed2d..00000000000
--- a/i18n/deu/src/vs/workbench/parts/debug/electron-browser/debugCommands.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noFolderDebugConfig": "Öffnen Sie bitte einen Ordner, um erweitertes Debuggen zu konfigurieren."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json b/i18n/deu/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json
deleted file mode 100644
index 7c5d10d550d..00000000000
--- a/i18n/deu/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"debugNoType": "Der Debugger \"type\" darf nicht ausgelassen werden und muss den Typ \"string\" aufweisen.",
-	"selectDebug": "Umgebung auswählen",
-	"DebugConfig.failed": "Die Datei \"launch.json\" kann nicht im Ordner \".vscode\" erstellt werden ({0}).",
-	"workspace": "Arbeitsbereich",
-	"user settings": "Benutzereinstellungen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json b/i18n/deu/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
deleted file mode 100644
index 7acc6509b24..00000000000
--- a/i18n/deu/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"logPoint": "Protokollpunkt",
-	"breakpoint": "Haltepunkt",
-	"removeBreakpoint": "{0} entfernen",
-	"editBreakpoint": "{0} bearbeiten …",
-	"disableBreakpoint": "{0} deaktivieren",
-	"enableBreakpoint": "{0} aktivieren",
-	"removeBreakpoints": "Haltepunkte entfernen",
-	"removeInlineBreakpointOnColumn": "Inlinehaltepunkt in Spalte {0} entfernen",
-	"removeLineBreakpoint": "Zeilenhaltepunkt entfernen",
-	"editBreakpoints": "Haltepunkte bearbeiten",
-	"editInlineBreakpointOnColumn": "Inlinehaltepunkt in Spalte {0} bearbeiten",
-	"editLineBrekapoint": "Zeilenhaltepunkt bearbeiten",
-	"enableDisableBreakpoints": "Haltepunkte aktivieren/deaktivieren",
-	"disableInlineColumnBreakpoint": "Inlinehaltepunkt in Spalte {0} deaktivieren",
-	"disableBreakpointOnLine": "Zeilenhaltepunkt deaktivieren",
-	"enableBreakpoints": "Inlinehaltepunkt in Spalte {0} aktivieren",
-	"enableBreakpointOnLine": "Zeilenhaltepunkt aktivieren",
-	"addBreakpoint": "Haltepunkt hinzufügen",
-	"addConditionalBreakpoint": "Bedingten Haltepunkt hinzufügen...",
-	"addLogPoint": "Protokollpunkt hinzufügen …",
-	"breakpointHasCondition": "Dieser {0} hat eine {1}, die beim Entfernen verloren geht. Deaktivieren Sie stattdessen ggf. den {0}.",
-	"message": "Nachricht",
-	"condition": "Bedingung",
-	"removeLogPoint": "{0} entfernen",
-	"disableLogPoint": "{0} deaktivieren",
-	"cancel": "Abbrechen",
-	"addConfiguration": "Konfiguration hinzufügen..."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/debug/electron-browser/debugHover.i18n.json b/i18n/deu/src/vs/workbench/parts/debug/electron-browser/debugHover.i18n.json
deleted file mode 100644
index b5366a0a894..00000000000
--- a/i18n/deu/src/vs/workbench/parts/debug/electron-browser/debugHover.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"treeAriaLabel": "Debughover"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json b/i18n/deu/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
deleted file mode 100644
index d6cc1170dbf..00000000000
--- a/i18n/deu/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"snapshotObj": "Nur primitive Werte werden für dieses Objekt angezeigt.",
-	"debuggingPaused": "Das Debuggen wurde angehalten. Ursache {0}, {1}{2}",
-	"debuggingStarted": "Das Debuggen wurde gestartet.",
-	"debuggingStopped": "Das Debuggen wurde beendet.",
-	"breakpointAdded": "Der Haltepunkt wurde hinzugefügt. Zeile {0}, Datei \"{1}\".",
-	"breakpointRemoved": "Der Haltepunkt wurde entfernt. Zeile {0}, Datei \"{1}\".",
-	"compoundMustHaveConfigurations": "Für den Verbund muss das Attribut \"configurations\" festgelegt werden, damit mehrere Konfigurationen gestartet werden können.",
-	"noConfigurationNameInWorkspace": "Die Startkonfiguration \"{0}\" wurde im Arbeitsbereich nicht gefunden.",
-	"multipleConfigurationNamesInWorkspace": "Im Arbeitsbereich sind mehrere Startkonfigurationen \"{0}\" vorhanden. Verwenden Sie den Ordnernamen, um die Konfiguration zu qualifizieren.",
-	"noFolderWithName": "Der Ordner mit dem Namen \"{0}\" für die Konfiguration \"{1}\" wurde im Verbund \"{2}\" nicht gefunden.",
-	"configMissing": "Konfiguration \"{0}\" fehlt in \"launch.json\".",
-	"launchJsonDoesNotExist": "\"launch.json\" ist nicht vorhanden.",
-	"debugRequestNotSupported": "Das Attribut \"{0}\" weist in der ausgewählten Debugkonfiguration den nicht unterstützten Wert \"{1}\" auf.",
-	"debugRequesMissing": "Das Attribut \"{0}\" fehlt in der ausgewählten Debugkonfiguration.",
-	"debugTypeNotSupported": "Der konfigurierte Debugtyp \"{0}\" wird nicht unterstützt.",
-	"debugTypeMissing": "Fehlende Eigenschaft \"type\" für die ausgewählte Startkonfiguration.",
-	"debugAnyway": "Trotzdem debuggen",
-	"preLaunchTaskErrors": "Buildfehler während preLaunchTask \"{0}\".",
-	"preLaunchTaskError": "Buildfehler während preLaunchTask \"{0}\".",
-	"preLaunchTaskExitCode": "Der preLaunchTask \"{0}\" wurde mit dem Exitcode {1} beendet.",
-	"showErrors": "Fehler anzeigen",
-	"noFolderWorkspaceDebugError": "Debuggen der aktiven Datei ist nicht möglich. Stellen Sie sicher, dass sie auf einem Datenträger gespeichert ist und dass Sie die Debugerweiterung für diesen Dateityp installiert haben.",
-	"cancel": "Abbrechen",
-	"DebugTaskNotFound": "Der Task \"{0}\" konnte nicht gefunden werden.",
-	"taskNotTracked": "Der Task \"{0}\" kann nicht nachverfolgt werden."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/debug/electron-browser/debugViewer.i18n.json b/i18n/deu/src/vs/workbench/parts/debug/electron-browser/debugViewer.i18n.json
deleted file mode 100644
index d20392f385e..00000000000
--- a/i18n/deu/src/vs/workbench/parts/debug/electron-browser/debugViewer.i18n.json
+++ /dev/null
@@ -1,28 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"process": "Prozess",
-	"paused": "Angehalten",
-	"running": "Wird ausgeführt",
-	"thread": "Thread",
-	"pausedOn": "Angehalten bei {0}",
-	"loadMoreStackFrames": "Weitere Stapelrahmen laden",
-	"threadAriaLabel": "Thread {0}, Aufrufliste, Debuggen",
-	"stackFrameAriaLabel": "Stapelrahmen {0} Zeile {1} {2}, Aufrufliste, Debuggen",
-	"variableValueAriaLabel": "Geben Sie einen neuen Variablenwert ein.",
-	"variableScopeAriaLabel": "Bereich {0}, Variablen, Debuggen",
-	"variableAriaLabel": "{0} Wert {1}, Variablen, Debuggen",
-	"watchExpressionPlaceholder": "Zu überwachender Ausdruck",
-	"watchExpressionInputAriaLabel": "Geben Sie den Überwachungsausdruck ein.",
-	"watchExpressionAriaLabel": "{0} Wert {1}, Überwachen, Debuggen",
-	"watchVariableAriaLabel": "{0} Wert {1}, Überwachen, Debuggen",
-	"functionBreakpointPlaceholder": "Funktion mit Haltepunkt",
-	"functionBreakPointInputAriaLabel": "Geben Sie den Funktionshaltepunkt ein.",
-	"functionBreakpointsNotSupported": "Funktionshaltepunkte werden von diesem Debugtyp nicht unterstützt.",
-	"breakpointAriaLabel": "Haltepunktzeile {0} {1}, Haltepunkte, Debuggen",
-	"functionBreakpointAriaLabel": "Funktionshaltepunkt {0}, Haltepunkte, Debuggen",
-	"exceptionBreakpointAriaLabel": "Ausnahmehaltepunkt {0}, Haltepunkte, Debuggen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/debug/electron-browser/debugViews.i18n.json b/i18n/deu/src/vs/workbench/parts/debug/electron-browser/debugViews.i18n.json
deleted file mode 100644
index 55c6c83a6c0..00000000000
--- a/i18n/deu/src/vs/workbench/parts/debug/electron-browser/debugViews.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"variablesSection": "Variablenabschnitt",
-	"variablesAriaTreeLabel": "Variablen debuggen",
-	"expressionsSection": "Ausdrucksabschnitt",
-	"watchAriaTreeLabel": "Überwachungsausdrücke debuggen",
-	"callstackSection": "Aufruflistenabschnitt",
-	"debugStopped": "Angehalten bei {0}",
-	"callStackAriaLabel": "Aufrufliste debuggen",
-	"breakpointsSection": "Haltepunkteabschnitt",
-	"breakpointsAriaTreeLabel": "Haltepunkte debuggen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/debug/electron-browser/electronDebugActions.i18n.json b/i18n/deu/src/vs/workbench/parts/debug/electron-browser/electronDebugActions.i18n.json
deleted file mode 100644
index 6703205a4d2..00000000000
--- a/i18n/deu/src/vs/workbench/parts/debug/electron-browser/electronDebugActions.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"copyValue": "Wert kopieren",
-	"copyAsExpression": "Als Ausdruck kopieren",
-	"copy": "Kopieren",
-	"copyAll": "Alles kopieren",
-	"copyStackTrace": "Aufrufliste kopieren"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/debug/electron-browser/rawDebugSession.i18n.json b/i18n/deu/src/vs/workbench/parts/debug/electron-browser/rawDebugSession.i18n.json
deleted file mode 100644
index 153ffe94777..00000000000
--- a/i18n/deu/src/vs/workbench/parts/debug/electron-browser/rawDebugSession.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"moreInfo": "Weitere Informationen",
-	"debugAdapterCrash": "Der Debugadapterprozess wurde unerwartet beendet."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/debug/electron-browser/repl.i18n.json b/i18n/deu/src/vs/workbench/parts/debug/electron-browser/repl.i18n.json
deleted file mode 100644
index d4b9af7f613..00000000000
--- a/i18n/deu/src/vs/workbench/parts/debug/electron-browser/repl.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"replAriaLabel": "REPL-Bereich (Read Eval Print-Loop)",
-	"actions.repl.historyPrevious": "Verlauf vorherige",
-	"actions.repl.historyNext": "Verlauf nächste",
-	"actions.repl.acceptInput": "REPL-Eingaben akzeptieren",
-	"actions.repl.copyAll": "Debuggen: Konsole – alle kopieren"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/debug/electron-browser/replViewer.i18n.json b/i18n/deu/src/vs/workbench/parts/debug/electron-browser/replViewer.i18n.json
deleted file mode 100644
index cdd266b61b4..00000000000
--- a/i18n/deu/src/vs/workbench/parts/debug/electron-browser/replViewer.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"stateCapture": "Der Objektstatus wird aus der ersten Auswertung erfasst.",
-	"replVariableAriaLabel": "Variable {0} besitzt den Wert {1}, Read Eval Print-Loop, Debuggen",
-	"replExpressionAriaLabel": "Ausdruck {0} besitzt den Wert {1}, Read Eval Print-Loop, Debuggen",
-	"replValueOutputAriaLabel": "{0}, Read Eval Print-Loop, Debuggen",
-	"replRawObjectAriaLabel": "Die REPL-Variable {0} besitzt den Wert {1}, Read Eval Print-Loop, Debuggen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/debug/electron-browser/statusbarColorProvider.i18n.json b/i18n/deu/src/vs/workbench/parts/debug/electron-browser/statusbarColorProvider.i18n.json
deleted file mode 100644
index d4395810a2f..00000000000
--- a/i18n/deu/src/vs/workbench/parts/debug/electron-browser/statusbarColorProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"statusBarDebuggingBackground": "Hintergrundfarbe der Statusleiste beim Debuggen eines Programms. Die Statusleiste wird unten im Fenster angezeigt.",
-	"statusBarDebuggingForeground": "Vordergrundfarbe der Statusleiste beim Debuggen eines Programms. Die Statusleiste wird unten im Fenster angezeigt.",
-	"statusBarDebuggingBorder": "Rahmenfarbe der Statusleiste zur Abtrennung von der Randleiste und dem Editor, wenn ein Programm debuggt wird. Die Statusleiste wird unten im Fenster angezeigt."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json b/i18n/deu/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json
deleted file mode 100644
index 6d4ddb24898..00000000000
--- a/i18n/deu/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"debug.terminal.title": "Zu debuggende Komponente"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/debug/electron-browser/variablesView.i18n.json b/i18n/deu/src/vs/workbench/parts/debug/electron-browser/variablesView.i18n.json
deleted file mode 100644
index 574e355ac8e..00000000000
--- a/i18n/deu/src/vs/workbench/parts/debug/electron-browser/variablesView.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"variablesSection": "Variablenabschnitt",
-	"variablesAriaTreeLabel": "Variablen debuggen",
-	"variableValueAriaLabel": "Geben Sie einen neuen Variablenwert ein.",
-	"variableScopeAriaLabel": "Bereich {0}, Variablen, Debuggen",
-	"variableAriaLabel": "{0} Wert {1}, Variablen, Debuggen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/debug/electron-browser/watchExpressionsView.i18n.json b/i18n/deu/src/vs/workbench/parts/debug/electron-browser/watchExpressionsView.i18n.json
deleted file mode 100644
index fd35fd63f20..00000000000
--- a/i18n/deu/src/vs/workbench/parts/debug/electron-browser/watchExpressionsView.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"expressionsSection": "Ausdrucksabschnitt",
-	"watchAriaTreeLabel": "Überwachungsausdrücke debuggen",
-	"watchExpressionPlaceholder": "Zu überwachender Ausdruck",
-	"watchExpressionInputAriaLabel": "Geben Sie den Überwachungsausdruck ein.",
-	"watchExpressionAriaLabel": "{0} Wert {1}, Überwachen, Debuggen",
-	"watchVariableAriaLabel": "{0} Wert {1}, Überwachen, Debuggen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json b/i18n/deu/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
deleted file mode 100644
index 9b039afb7e7..00000000000
--- a/i18n/deu/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"debugAdapterBinNotFound": "Die ausführbare Datei \"{0}\" des Debugadapters ist nicht vorhanden.",
-	"debugAdapterCannotDetermineExecutable": "Die ausführbare Datei \"{0}\" des Debugadapters kann nicht bestimmt werden.",
-	"unableToLaunchDebugAdapter": "Der Debugadapter kann nicht aus {0} gestartet werden.",
-	"unableToLaunchDebugAdapterNoArgs": "Debugadapter kann nicht gestartet werden."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/debug/node/debugger.i18n.json b/i18n/deu/src/vs/workbench/parts/debug/node/debugger.i18n.json
deleted file mode 100644
index 1bdbec328ab..00000000000
--- a/i18n/deu/src/vs/workbench/parts/debug/node/debugger.i18n.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"launch.config.comment1": "Verwendet IntelliSense zum Ermitteln möglicher Attribute.",
-	"launch.config.comment2": "Zeigen Sie auf vorhandene Attribute, um die zugehörigen Beschreibungen anzuzeigen.",
-	"launch.config.comment3": "Weitere Informationen finden Sie unter {0}",
-	"debugType": "Der Typ der Konfiguration.",
-	"debugTypeNotRecognised": "Dieser Debugging-Typ wurde nicht erkannt. Bitte installieren und aktivieren Sie die dazugehörige Debugging-Erweiterung.",
-	"node2NotSupported": "\"node2\" wird nicht mehr unterstützt, verwenden Sie stattdessen \"node\", und legen Sie das Attribut \"protocol\" auf \"inspector\" fest.",
-	"debugName": "Der Name der Konfiguration. Er wird im Dropdownmenü der Startkonfiguration angezeigt.",
-	"debugRequest": "Der Anforderungstyp der Konfiguration. Der Wert kann \"launch\" oder \"attach\" sein.",
-	"debugServer": "Nur für die Entwicklung von Debugerweiterungen: Wenn ein Port angegeben ist, versucht der VS-Code, eine Verbindung mit einem Debugadapter herzustellen, der im Servermodus ausgeführt wird.",
-	"debugPrelaunchTask": "Ein Task, der ausgeführt werden soll, bevor die Debugsitzung beginnt.",
-	"debugPostDebugTask": "Ein Task, der ausgeführt werden soll, nachdem die Debugsitzung endet.",
-	"debugWindowsConfiguration": "Windows-spezifische Startkonfigurationsattribute.",
-	"debugOSXConfiguration": "OS X-spezifische Startkonfigurationsattribute.",
-	"debugLinuxConfiguration": "Linux-spezifische Startkonfigurationsattribute.",
-	"deprecatedVariables": "\"env.\", \"config.\" und \"command.\" sind veraltet, verwenden Sie stattdessen \"env:\", \"config:\" und \"command:\"."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/debug/node/terminals.i18n.json b/i18n/deu/src/vs/workbench/parts/debug/node/terminals.i18n.json
deleted file mode 100644
index eb3d8920646..00000000000
--- a/i18n/deu/src/vs/workbench/parts/debug/node/terminals.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"console.title": "VS Code-Konsole",
-	"mac.terminal.script.failed": "Fehler bei Skript \"{0}\" mit Exitcode {1}.",
-	"mac.terminal.type.not.supported": "\"{0}\" wird nicht unterstützt.",
-	"press.any.key": "Drücken Sie eine beliebige Taste, um fortzufahren...",
-	"linux.term.failed": "Fehler bei \"{0}\" mit Exitcode {1}."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/emmet/browser/actions/showEmmetCommands.i18n.json b/i18n/deu/src/vs/workbench/parts/emmet/browser/actions/showEmmetCommands.i18n.json
deleted file mode 100644
index 7a62a676804..00000000000
--- a/i18n/deu/src/vs/workbench/parts/emmet/browser/actions/showEmmetCommands.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"showEmmetCommands": "Emmet-Befehle anzeigen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/emmet/electron-browser/actions/balance.i18n.json b/i18n/deu/src/vs/workbench/parts/emmet/electron-browser/actions/balance.i18n.json
deleted file mode 100644
index e0afee42485..00000000000
--- a/i18n/deu/src/vs/workbench/parts/emmet/electron-browser/actions/balance.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"balanceInward": "Emmet: Ausgleichen (einwärts)",
-	"balanceOutward": "Emmet: Ausgleichen (auswärts)"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/emmet/electron-browser/actions/editPoints.i18n.json b/i18n/deu/src/vs/workbench/parts/emmet/electron-browser/actions/editPoints.i18n.json
deleted file mode 100644
index de81c8b7743..00000000000
--- a/i18n/deu/src/vs/workbench/parts/emmet/electron-browser/actions/editPoints.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"previousEditPoint": "Emmet: Zum vorherigen Bearbeitungspunkt wechseln",
-	"nextEditPoint": "Emmet: Zum nächsten Bearbeitungspunkt wechseln"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/emmet/electron-browser/actions/evaluateMath.i18n.json b/i18n/deu/src/vs/workbench/parts/emmet/electron-browser/actions/evaluateMath.i18n.json
deleted file mode 100644
index a3f778d565a..00000000000
--- a/i18n/deu/src/vs/workbench/parts/emmet/electron-browser/actions/evaluateMath.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"evaluateMathExpression": "Emmet: Mathematischen Ausdruck auswerten"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/emmet/electron-browser/actions/expandAbbreviation.i18n.json b/i18n/deu/src/vs/workbench/parts/emmet/electron-browser/actions/expandAbbreviation.i18n.json
deleted file mode 100644
index ba5e1cc20c3..00000000000
--- a/i18n/deu/src/vs/workbench/parts/emmet/electron-browser/actions/expandAbbreviation.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"expandAbbreviationAction": "Emmet: Abkürzung erweitern"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/emmet/electron-browser/actions/incrementDecrement.i18n.json b/i18n/deu/src/vs/workbench/parts/emmet/electron-browser/actions/incrementDecrement.i18n.json
deleted file mode 100644
index 2aab3f2af7c..00000000000
--- a/i18n/deu/src/vs/workbench/parts/emmet/electron-browser/actions/incrementDecrement.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"incrementNumberByOneTenth": "Emmet: Um 0,1 inkrementieren",
-	"incrementNumberByOne": "Emmet: Um 1 inkrementieren",
-	"incrementNumberByTen": "Emmet: Um 10 inkrementieren",
-	"decrementNumberByOneTenth": "Emmet: Um 0,1 dekrementieren",
-	"decrementNumberByOne": "Emmet: Um 1 dekrementieren",
-	"decrementNumberByTen": "Emmet: Um 10 dekrementieren"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/emmet/electron-browser/actions/matchingPair.i18n.json b/i18n/deu/src/vs/workbench/parts/emmet/electron-browser/actions/matchingPair.i18n.json
deleted file mode 100644
index 158b074c05b..00000000000
--- a/i18n/deu/src/vs/workbench/parts/emmet/electron-browser/actions/matchingPair.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"matchingPair": "Emmet: Gehe zu übereinstimmendem Paar"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/emmet/electron-browser/actions/mergeLines.i18n.json b/i18n/deu/src/vs/workbench/parts/emmet/electron-browser/actions/mergeLines.i18n.json
deleted file mode 100644
index e6f2b3e1ba7..00000000000
--- a/i18n/deu/src/vs/workbench/parts/emmet/electron-browser/actions/mergeLines.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"mergeLines": "Emmet: Zeilen mergen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/emmet/electron-browser/actions/reflectCssValue.i18n.json b/i18n/deu/src/vs/workbench/parts/emmet/electron-browser/actions/reflectCssValue.i18n.json
deleted file mode 100644
index 1569d015669..00000000000
--- a/i18n/deu/src/vs/workbench/parts/emmet/electron-browser/actions/reflectCssValue.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"reflectCSSValue": "Emmet: CSS-Wert reflektieren"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/emmet/electron-browser/actions/removeTag.i18n.json b/i18n/deu/src/vs/workbench/parts/emmet/electron-browser/actions/removeTag.i18n.json
deleted file mode 100644
index bb2a97fd42e..00000000000
--- a/i18n/deu/src/vs/workbench/parts/emmet/electron-browser/actions/removeTag.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"removeTag": "Emmet: Tag entfernen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/emmet/electron-browser/actions/selectItem.i18n.json b/i18n/deu/src/vs/workbench/parts/emmet/electron-browser/actions/selectItem.i18n.json
deleted file mode 100644
index 0ddd0df478e..00000000000
--- a/i18n/deu/src/vs/workbench/parts/emmet/electron-browser/actions/selectItem.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"selectPreviousItem": "Emmet: Vorheriges Element auswählen",
-	"selectNextItem": "Emmet: Nächstes Element auswählen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/emmet/electron-browser/actions/splitJoinTag.i18n.json b/i18n/deu/src/vs/workbench/parts/emmet/electron-browser/actions/splitJoinTag.i18n.json
deleted file mode 100644
index a214ce3766a..00000000000
--- a/i18n/deu/src/vs/workbench/parts/emmet/electron-browser/actions/splitJoinTag.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"splitJoinTag": "Emmet: Tag teilen/verknüpfen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/emmet/electron-browser/actions/toggleComment.i18n.json b/i18n/deu/src/vs/workbench/parts/emmet/electron-browser/actions/toggleComment.i18n.json
deleted file mode 100644
index 118d88c7df8..00000000000
--- a/i18n/deu/src/vs/workbench/parts/emmet/electron-browser/actions/toggleComment.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"toggleComment": "Emmet: Kommentar umschalten"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/emmet/electron-browser/actions/updateImageSize.i18n.json b/i18n/deu/src/vs/workbench/parts/emmet/electron-browser/actions/updateImageSize.i18n.json
deleted file mode 100644
index b682f5d97c3..00000000000
--- a/i18n/deu/src/vs/workbench/parts/emmet/electron-browser/actions/updateImageSize.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"updateImageSize": "Emmet: Bildgröße aktualisieren"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/emmet/electron-browser/actions/updateTag.i18n.json b/i18n/deu/src/vs/workbench/parts/emmet/electron-browser/actions/updateTag.i18n.json
deleted file mode 100644
index bba2b0b703e..00000000000
--- a/i18n/deu/src/vs/workbench/parts/emmet/electron-browser/actions/updateTag.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"updateTag": "Emmet: Tag aktualisieren",
-	"enterTag": "Tag eingeben",
-	"tag": "Tag"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/emmet/electron-browser/actions/wrapWithAbbreviation.i18n.json b/i18n/deu/src/vs/workbench/parts/emmet/electron-browser/actions/wrapWithAbbreviation.i18n.json
deleted file mode 100644
index 45013796dd3..00000000000
--- a/i18n/deu/src/vs/workbench/parts/emmet/electron-browser/actions/wrapWithAbbreviation.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"wrapWithAbbreviationAction": "Emmet: Mit Abkürzung umschließen",
-	"enterAbbreviation": "Abkürzung eingeben",
-	"abbreviation": "Abkürzung"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/emmet/electron-browser/emmet.contribution.i18n.json b/i18n/deu/src/vs/workbench/parts/emmet/electron-browser/emmet.contribution.i18n.json
deleted file mode 100644
index c344b63f264..00000000000
--- a/i18n/deu/src/vs/workbench/parts/emmet/electron-browser/emmet.contribution.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"emmetConfigurationTitle": "Emmet",
-	"triggerExpansionOnTab": "Wenn diese Option aktiviert ist, werden Emmet-Abkürzungen beim Drücken der TAB-TASTE erweitert. Nicht zutreffend, wenn emmet.useNewemmet auf \"true\" festgelegt ist.",
-	"emmetPreferences": "Einstellungen, die zum Ändern des Verhaltens einiger Aktionen und Resolver von Emmet verwendet werden. Nicht zutreffend, wenn emmet.useNewemmet auf \"true\" festgelegt ist.",
-	"emmetSyntaxProfiles": "Definieren Sie das Profil für die angegebene Syntax, oder verwenden Sie Ihr eigenes Profil mit bestimmten Regeln.",
-	"emmetExclude": "Ein Array von Sprachen, in dem Emmet-Abkürzungen nicht erweitert werden sollen.",
-	"emmetExtensionsPath": "Pfad zu einem Ordner mit Emmet-Profilen, -Ausschnitten und -Einstellungen. Wenn emmet.useNewEmmet auf \"true\" festgelegt ist, werden nur Profile vom Erweiterungspfad berücksichtigt.",
-	"useNewEmmet": "Testen Sie die neuen Emmet-Module (die letztendlich die alte einzelne Emmet-Bibliothek ersetzen) für alle Emmet-Funktionen."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/emmet/node/actions/balance.i18n.json b/i18n/deu/src/vs/workbench/parts/emmet/node/actions/balance.i18n.json
deleted file mode 100644
index e0afee42485..00000000000
--- a/i18n/deu/src/vs/workbench/parts/emmet/node/actions/balance.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"balanceInward": "Emmet: Ausgleichen (einwärts)",
-	"balanceOutward": "Emmet: Ausgleichen (auswärts)"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/emmet/node/actions/editPoints.i18n.json b/i18n/deu/src/vs/workbench/parts/emmet/node/actions/editPoints.i18n.json
deleted file mode 100644
index 35ffc123f14..00000000000
--- a/i18n/deu/src/vs/workbench/parts/emmet/node/actions/editPoints.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"previousEditPoint": "Emmet: Vorheriger Bearbeitungspunkt",
-	"nextEditPoint": "Emmet: Nächster Bearbeitungspunkt"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/emmet/node/actions/evaluateMath.i18n.json b/i18n/deu/src/vs/workbench/parts/emmet/node/actions/evaluateMath.i18n.json
deleted file mode 100644
index a3f778d565a..00000000000
--- a/i18n/deu/src/vs/workbench/parts/emmet/node/actions/evaluateMath.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"evaluateMathExpression": "Emmet: Mathematischen Ausdruck auswerten"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/emmet/node/actions/expandAbbreviation.i18n.json b/i18n/deu/src/vs/workbench/parts/emmet/node/actions/expandAbbreviation.i18n.json
deleted file mode 100644
index 278d10a21dc..00000000000
--- a/i18n/deu/src/vs/workbench/parts/emmet/node/actions/expandAbbreviation.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"expandAbbreviationAction": "Emmet: Abkürzung erweitern"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/emmet/node/actions/incrementDecrement.i18n.json b/i18n/deu/src/vs/workbench/parts/emmet/node/actions/incrementDecrement.i18n.json
deleted file mode 100644
index 2aab3f2af7c..00000000000
--- a/i18n/deu/src/vs/workbench/parts/emmet/node/actions/incrementDecrement.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"incrementNumberByOneTenth": "Emmet: Um 0,1 inkrementieren",
-	"incrementNumberByOne": "Emmet: Um 1 inkrementieren",
-	"incrementNumberByTen": "Emmet: Um 10 inkrementieren",
-	"decrementNumberByOneTenth": "Emmet: Um 0,1 dekrementieren",
-	"decrementNumberByOne": "Emmet: Um 1 dekrementieren",
-	"decrementNumberByTen": "Emmet: Um 10 dekrementieren"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/emmet/node/actions/matchingPair.i18n.json b/i18n/deu/src/vs/workbench/parts/emmet/node/actions/matchingPair.i18n.json
deleted file mode 100644
index 158b074c05b..00000000000
--- a/i18n/deu/src/vs/workbench/parts/emmet/node/actions/matchingPair.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"matchingPair": "Emmet: Gehe zu übereinstimmendem Paar"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/emmet/node/actions/mergeLines.i18n.json b/i18n/deu/src/vs/workbench/parts/emmet/node/actions/mergeLines.i18n.json
deleted file mode 100644
index e6f2b3e1ba7..00000000000
--- a/i18n/deu/src/vs/workbench/parts/emmet/node/actions/mergeLines.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"mergeLines": "Emmet: Zeilen mergen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/emmet/node/actions/reflectCssValue.i18n.json b/i18n/deu/src/vs/workbench/parts/emmet/node/actions/reflectCssValue.i18n.json
deleted file mode 100644
index 1569d015669..00000000000
--- a/i18n/deu/src/vs/workbench/parts/emmet/node/actions/reflectCssValue.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"reflectCSSValue": "Emmet: CSS-Wert reflektieren"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/emmet/node/actions/removeTag.i18n.json b/i18n/deu/src/vs/workbench/parts/emmet/node/actions/removeTag.i18n.json
deleted file mode 100644
index bb2a97fd42e..00000000000
--- a/i18n/deu/src/vs/workbench/parts/emmet/node/actions/removeTag.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"removeTag": "Emmet: Tag entfernen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/emmet/node/actions/selectItem.i18n.json b/i18n/deu/src/vs/workbench/parts/emmet/node/actions/selectItem.i18n.json
deleted file mode 100644
index 0ddd0df478e..00000000000
--- a/i18n/deu/src/vs/workbench/parts/emmet/node/actions/selectItem.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"selectPreviousItem": "Emmet: Vorheriges Element auswählen",
-	"selectNextItem": "Emmet: Nächstes Element auswählen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/emmet/node/actions/splitJoinTag.i18n.json b/i18n/deu/src/vs/workbench/parts/emmet/node/actions/splitJoinTag.i18n.json
deleted file mode 100644
index a214ce3766a..00000000000
--- a/i18n/deu/src/vs/workbench/parts/emmet/node/actions/splitJoinTag.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"splitJoinTag": "Emmet: Tag teilen/verknüpfen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/emmet/node/actions/toggleComment.i18n.json b/i18n/deu/src/vs/workbench/parts/emmet/node/actions/toggleComment.i18n.json
deleted file mode 100644
index 118d88c7df8..00000000000
--- a/i18n/deu/src/vs/workbench/parts/emmet/node/actions/toggleComment.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"toggleComment": "Emmet: Kommentar umschalten"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/emmet/node/actions/updateImageSize.i18n.json b/i18n/deu/src/vs/workbench/parts/emmet/node/actions/updateImageSize.i18n.json
deleted file mode 100644
index b682f5d97c3..00000000000
--- a/i18n/deu/src/vs/workbench/parts/emmet/node/actions/updateImageSize.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"updateImageSize": "Emmet: Bildgröße aktualisieren"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/emmet/node/actions/updateTag.i18n.json b/i18n/deu/src/vs/workbench/parts/emmet/node/actions/updateTag.i18n.json
deleted file mode 100644
index bba2b0b703e..00000000000
--- a/i18n/deu/src/vs/workbench/parts/emmet/node/actions/updateTag.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"updateTag": "Emmet: Tag aktualisieren",
-	"enterTag": "Tag eingeben",
-	"tag": "Tag"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/emmet/node/actions/wrapWithAbbreviation.i18n.json b/i18n/deu/src/vs/workbench/parts/emmet/node/actions/wrapWithAbbreviation.i18n.json
deleted file mode 100644
index 45013796dd3..00000000000
--- a/i18n/deu/src/vs/workbench/parts/emmet/node/actions/wrapWithAbbreviation.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"wrapWithAbbreviationAction": "Emmet: Mit Abkürzung umschließen",
-	"enterAbbreviation": "Abkürzung eingeben",
-	"abbreviation": "Abkürzung"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/emmet/node/emmet.contribution.i18n.json b/i18n/deu/src/vs/workbench/parts/emmet/node/emmet.contribution.i18n.json
deleted file mode 100644
index 5beaa142e9f..00000000000
--- a/i18n/deu/src/vs/workbench/parts/emmet/node/emmet.contribution.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"emmetConfigurationTitle": "Emmet",
-	"triggerExpansionOnTab": "Wenn aktiviert, werden Emmet-Abkürzungen beim Drücken der TAB-TASTE erweitert.",
-	"emmetPreferences": "Einstellungen, die zum Ändern des Verhaltens einiger Aktionen und Konfliktlöser von Emmet verwendet werden.",
-	"emmetSyntaxProfiles": "Definieren Sie das Profil für die angegebene Syntax, oder verwenden Sie Ihr eigenes Profil mit bestimmten Regeln.",
-	"emmetExclude": "Ein Array von Sprachen, in dem Emmet-Abkürzungen nicht erweitert werden sollen.",
-	"emmetExtensionsPath": "Pfad zu einem Ordner mit Emmet-Profilen, Ausschnitten und Voreinstellungen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json b/i18n/deu/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
deleted file mode 100644
index ffcb91c35c3..00000000000
--- a/i18n/deu/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"terminalConfigurationTitle": "Externes Terminal",
-	"explorer.openInTerminalKind": "Passt an, welches Terminal ausgeführt werden soll.",
-	"terminal.external.windowsExec": "Passt an, welches Terminal für Windows ausgeführt werden soll.",
-	"terminal.external.osxExec": "Passt an, welche Terminalanwendung unter OS X ausgeführt werden soll.",
-	"terminal.external.linuxExec": "Passt an, welches Terminal unter Linux ausgeführt werden soll.",
-	"globalConsoleActionWin": "Neue Eingabeaufforderung öffnen",
-	"globalConsoleActionMacLinux": "Neues Terminal öffnen",
-	"scopedConsoleActionWin": "In Eingabeaufforderung öffnen",
-	"scopedConsoleActionMacLinux": "In Terminal öffnen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/execution/electron-browser/terminal.contribution.i18n.json b/i18n/deu/src/vs/workbench/parts/execution/electron-browser/terminal.contribution.i18n.json
deleted file mode 100644
index 565a6e91d16..00000000000
--- a/i18n/deu/src/vs/workbench/parts/execution/electron-browser/terminal.contribution.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"terminalConfigurationTitle": "Externes Terminal",
-	"terminal.external.windowsExec": "Passt an, welches Terminal für Windows ausgeführt werden soll.",
-	"terminal.external.osxExec": "Passt an, welche Terminalanwendung unter OS X ausgeführt werden soll.",
-	"terminal.external.linuxExec": "Passt an, welches Terminal unter Linux ausgeführt werden soll.",
-	"globalConsoleActionWin": "Neue Eingabeaufforderung öffnen",
-	"globalConsoleActionMacLinux": "Neues Terminal öffnen",
-	"scopedConsoleActionWin": "In Eingabeaufforderung öffnen",
-	"scopedConsoleActionMacLinux": "In Terminal öffnen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/execution/electron-browser/terminalService.i18n.json b/i18n/deu/src/vs/workbench/parts/execution/electron-browser/terminalService.i18n.json
deleted file mode 100644
index eb3d8920646..00000000000
--- a/i18n/deu/src/vs/workbench/parts/execution/electron-browser/terminalService.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"console.title": "VS Code-Konsole",
-	"mac.terminal.script.failed": "Fehler bei Skript \"{0}\" mit Exitcode {1}.",
-	"mac.terminal.type.not.supported": "\"{0}\" wird nicht unterstützt.",
-	"press.any.key": "Drücken Sie eine beliebige Taste, um fortzufahren...",
-	"linux.term.failed": "Fehler bei \"{0}\" mit Exitcode {1}."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/explorers/browser/treeExplorer.contribution.i18n.json b/i18n/deu/src/vs/workbench/parts/explorers/browser/treeExplorer.contribution.i18n.json
deleted file mode 100644
index 88f9247b746..00000000000
--- a/i18n/deu/src/vs/workbench/parts/explorers/browser/treeExplorer.contribution.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"vscode.extension.contributes.view": "Trägt eine benutzerdefinierte Ansicht bei",
-	"vscode.extension.contributes.view.id": "Eindeutige ID zum Identifizieren der über vscode.workspace.createTreeView erstellten Ansicht",
-	"vscode.extension.contributes.view.label": "Visuell lesbare Zeichenfolge zum Rendern der Ansicht",
-	"vscode.extension.contributes.view.icon": "Pfad zum Ansichtssymbol",
-	"vscode.extension.contributes.views": "Trägt benutzerdefinierte Ansichten bei",
-	"showViewlet": "{0} anzeigen",
-	"view": "Anzeigen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/explorers/browser/treeExplorerActions.i18n.json b/i18n/deu/src/vs/workbench/parts/explorers/browser/treeExplorerActions.i18n.json
deleted file mode 100644
index b3a9b658868..00000000000
--- a/i18n/deu/src/vs/workbench/parts/explorers/browser/treeExplorerActions.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"refresh": "Aktualisieren"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/explorers/browser/treeExplorerService.i18n.json b/i18n/deu/src/vs/workbench/parts/explorers/browser/treeExplorerService.i18n.json
deleted file mode 100644
index f0e1bdb921d..00000000000
--- a/i18n/deu/src/vs/workbench/parts/explorers/browser/treeExplorerService.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"treeExplorer.noMatchingProviderId": "Es ist kein TreeExplorerNodeProvider mit ID \"{providerId}\" registriert."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/explorers/browser/views/treeExplorerView.i18n.json b/i18n/deu/src/vs/workbench/parts/explorers/browser/views/treeExplorerView.i18n.json
deleted file mode 100644
index ffa6db16e56..00000000000
--- a/i18n/deu/src/vs/workbench/parts/explorers/browser/views/treeExplorerView.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"treeExplorerViewlet.tree": "Tree Explorer-Abschnitt"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/extensions/browser/dependenciesViewer.i18n.json b/i18n/deu/src/vs/workbench/parts/extensions/browser/dependenciesViewer.i18n.json
deleted file mode 100644
index d99d419b792..00000000000
--- a/i18n/deu/src/vs/workbench/parts/extensions/browser/dependenciesViewer.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"error": "Fehler",
-	"Unknown Dependency": "Unbekannte Abhängigkeit:"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json b/i18n/deu/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json
deleted file mode 100644
index 0e47ff84d42..00000000000
--- a/i18n/deu/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"name": "Erweiterungsname",
-	"extension id": "Erweiterungsbezeichner",
-	"preview": "Vorschau",
-	"builtin": "Integriert",
-	"publisher": "Name des Herausgebers",
-	"install count": "Installationsanzahl",
-	"rating": "Bewertung",
-	"repository": "Repository",
-	"license": "Lizenz",
-	"details": "Details",
-	"contributions": "Beiträge",
-	"changelog": "ChangeLog",
-	"dependencies": "Abhängigkeiten",
-	"noReadme": "Keine INFODATEI verfügbar.",
-	"noChangelog": "Es ist kein ChangeLog verfügbar.",
-	"noContributions": "Keine Beiträge",
-	"noDependencies": "Keine Abhängigkeiten",
-	"settings": "Einstellungen ({0})",
-	"setting name": "Name",
-	"description": "Beschreibung",
-	"default": "Standard",
-	"debuggers": "Debugger ({0})",
-	"debugger name": "Name",
-	"debugger type": "Typ",
-	"views": "Ansichten ({0})",
-	"view id": "ID",
-	"view name": "Name",
-	"view location": "Wo",
-	"localizations": "Lokalisierungen ({0})",
-	"localizations language id": "Sprach-ID",
-	"localizations language name": "Sprachname",
-	"localizations localized language name": "Sprachname (lokalisiert)",
-	"colorThemes": "Farbdesigns ({0})",
-	"iconThemes": "Symboldesigns ({0})",
-	"colors": "Farben ({0})",
-	"colorId": "ID",
-	"defaultDark": "Standard, dunkel",
-	"defaultLight": "Standard, hell",
-	"defaultHC": "Standard, hoher Kontrast",
-	"JSON Validation": "JSON-Validierung ({0})",
-	"fileMatch": "Dateiübereinstimmung",
-	"schema": "Schema",
-	"commands": "Befehle ({0})",
-	"command name": "Name",
-	"keyboard shortcuts": "Tastenkombinationen",
-	"menuContexts": "Menükontexte",
-	"languages": "Sprachen ({0})",
-	"language id": "ID",
-	"language name": "Name",
-	"file extensions": "Dateierweiterungen",
-	"grammar": "Grammatik",
-	"snippets": "Codeausschnitte"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json b/i18n/deu/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
deleted file mode 100644
index cf7a07fdcb5..00000000000
--- a/i18n/deu/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
+++ /dev/null
@@ -1,81 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"download": "Manuell herunterladen",
-	"install vsix": "Installieren Sie nach dem Herunterladen das heruntergeladene VSIX von \"{0}\" manuell.",
-	"installAction": "Installieren",
-	"installing": "Wird installiert.",
-	"failedToInstall": "Fehler beim Installieren von \"{0}\".",
-	"uninstallAction": "Deinstallieren",
-	"Uninstalling": "Wird deinstalliert",
-	"updateAction": "Aktualisieren",
-	"updateTo": "Auf \"{0}\" aktualisieren",
-	"failedToUpdate": "Fehler beim Aktualisieren von \"{0}\".",
-	"ManageExtensionAction.uninstallingTooltip": "Wird deinstalliert",
-	"enableForWorkspaceAction": "Aktivieren (Arbeitsbereich)",
-	"enableGloballyAction": "Aktivieren",
-	"enableAction": "Aktivieren",
-	"disableForWorkspaceAction": "Deaktivieren (Arbeitsbereich)",
-	"disableGloballyAction": "Deaktivieren",
-	"disableAction": "Deaktivieren",
-	"checkForUpdates": "Nach Updates suchen",
-	"enableAutoUpdate": "Aktivere die automatische Aktualisierung von Erweiterungen",
-	"disableAutoUpdate": "Deaktivere die automatische Aktualisierung von Erweiterungen",
-	"updateAll": "Alle Erweiterungen aktualisieren",
-	"reloadAction": "Neu starten",
-	"postUpdateTooltip": "Zum Aktualisieren erneut laden",
-	"postUpdateMessage": "Dieses Fenster erneut laden, um die aktualisierte Erweiterung \"{0}\" zu aktivieren?",
-	"postEnableTooltip": "Zum Aktivieren erneut laden",
-	"postEnableMessage": "Dieses Fenster erneut laden, um die Erweiterung \"{0}\" zu aktivieren?",
-	"postDisableTooltip": "Zum Deaktivieren erneut laden",
-	"postDisableMessage": "Dieses Fenster erneut laden, um die Erweiterung \"{0}\" zu deaktivieren?",
-	"postUninstallTooltip": "Zum Deaktivieren erneut laden",
-	"postUninstallMessage": "Dieses Fenster erneut laden, um die deinstallierte Erweiterung \"{0}\" zu deaktivieren?",
-	"toggleExtensionsViewlet": "Erweiterungen anzeigen",
-	"installExtensions": "Erweiterungen installieren",
-	"showEnabledExtensions": "Aktivierte Erweiterungen anzeigen",
-	"showInstalledExtensions": "Installierte Erweiterungen anzeigen",
-	"showDisabledExtensions": "Deaktivierte Erweiterungen anzeigen",
-	"clearExtensionsInput": "Extensioneingabe löschen",
-	"showBuiltInExtensions": "Integrierte Erweiterungen anzeigen",
-	"showOutdatedExtensions": "Veraltete Erweiterungen anzeigen",
-	"showPopularExtensions": "Beliebte Erweiterungen anzeigen",
-	"showRecommendedExtensions": "Empfohlene Erweiterungen anzeigen",
-	"installWorkspaceRecommendedExtensions": "Installieren Sie alle empfohlenen Erweiterungen für Ihren Arbeitsbereich",
-	"allExtensionsInstalled": "Alle für diesen Arbeitsbereich empfohlenen Erweiterungen wurden bereits installiert.",
-	"installRecommendedExtension": "Empfohlene Erweiterung installieren",
-	"extensionInstalled": "Die empfohlene Erweiterung wurde bereits installiert.",
-	"showRecommendedKeymapExtensionsShort": "Tastenzuordnungen",
-	"showLanguageExtensionsShort": "Spracherweiterungen",
-	"showAzureExtensionsShort": "Azure-Erweiterungen",
-	"OpenExtensionsFile.failed": "Die Datei \"extensions.json\" kann nicht im Ordner \".vscode\" erstellt werden ({0}).",
-	"configureWorkspaceRecommendedExtensions": "Empfohlene Erweiterungen konfigurieren (Arbeitsbereich)",
-	"configureWorkspaceFolderRecommendedExtensions": "Empfohlene Erweiterungen konfigurieren (Arbeitsbereichsordner)",
-	"malicious tooltip": "Die Erweiterung wurde als problematisch gemeldet.",
-	"malicious": "Böswillig",
-	"disabled": "Deaktiviert",
-	"disabled globally": "Deaktiviert",
-	"disabled workspace": "Für diesen Arbeitsbereich deaktiviert",
-	"disableAll": "Alle installierten Erweiterungen deaktivieren",
-	"disableAllWorkspace": "Alle installierten Erweiterungen für diesen Arbeitsbereich deaktivieren",
-	"enableAll": "Alle Erweiterungen aktivieren",
-	"enableAllWorkspace": "Alle Erweiterungen für diesen Arbeitsbereich aktivieren",
-	"openExtensionsFolder": "Erweiterungsordner öffnen",
-	"installVSIX": "Aus VSIX installieren...",
-	"installFromVSIX": "Aus VSIX installieren",
-	"installButton": "&&Installieren",
-	"InstallVSIXAction.success": "Die Erweiterung wurde erfolgreich installiert. Aktivieren Sie sie durch erneutes Laden.",
-	"InstallVSIXAction.reloadNow": "Jetzt erneut laden",
-	"reinstall": "Erweiterung erneut installieren…",
-	"selectExtension": "Erweiterung für die erneute Installation auswählen",
-	"ReinstallAction.success": "Die Erweiterung wurde erneut installiert.",
-	"ReinstallAction.reloadNow": "Jetzt erneut laden",
-	"extensionButtonProminentBackground": "Hintergrundfarbe für markante Aktionenerweiterungen (z. B. die Schaltfläche zum Installieren).",
-	"extensionButtonProminentForeground": "Vordergrundfarbe für markante Aktionenerweiterungen (z. B. die Schaltfläche zum Installieren).",
-	"extensionButtonProminentHoverBackground": "Hoverhintergrundfarbe für markante Aktionenerweiterungen (z. B. die Schaltfläche zum Installieren)."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/extensions/browser/extensionsList.i18n.json b/i18n/deu/src/vs/workbench/parts/extensions/browser/extensionsList.i18n.json
deleted file mode 100644
index b13de0b2ad0..00000000000
--- a/i18n/deu/src/vs/workbench/parts/extensions/browser/extensionsList.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"recommended": "Empfohlen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/extensions/browser/extensionsQuickOpen.i18n.json b/i18n/deu/src/vs/workbench/parts/extensions/browser/extensionsQuickOpen.i18n.json
deleted file mode 100644
index 38670d8d001..00000000000
--- a/i18n/deu/src/vs/workbench/parts/extensions/browser/extensionsQuickOpen.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"manage": "Drücken Sie die EINGABETASTE, um Ihre Erweiterungen zu verwalten.",
-	"notfound": "\"{0}\" wurde nicht im Marketplace gefunden.",
-	"install": "Drücken Sie die EINGABETASTE, um \"{0}\" vom Marketplace zu installieren.",
-	"searchFor": "Drücken Sie die EINGABETASTE, um nach \"{0}\" in Marketplace zu suchen.",
-	"noExtensionsToInstall": "Geben Sie einen Erweiterungsnamen ein."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/extensions/browser/extensionsWidgets.i18n.json b/i18n/deu/src/vs/workbench/parts/extensions/browser/extensionsWidgets.i18n.json
deleted file mode 100644
index 38b5316ee38..00000000000
--- a/i18n/deu/src/vs/workbench/parts/extensions/browser/extensionsWidgets.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"ratedByUsers": "Von {0} Benutzern bewertet",
-	"ratedBySingleUser": "Von 1 Benutzer bewertet"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/extensions/common/extensionsFileTemplate.i18n.json b/i18n/deu/src/vs/workbench/parts/extensions/common/extensionsFileTemplate.i18n.json
deleted file mode 100644
index a939a7c0686..00000000000
--- a/i18n/deu/src/vs/workbench/parts/extensions/common/extensionsFileTemplate.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"app.extensions.json.title": "Erweiterungen",
-	"app.extensions.json.recommendations": "Liste der Erweiterungsempfehlungen. Der Bezeichner einer Erweiterung lautet immer \"${publisher}.${name}\". Beispiel: \"vscode.csharp\".",
-	"app.extension.identifier.errorMessage": "Erwartetes Format: \"${publisher}.${name}\". Beispiel: \"vscode.csharp\"."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/extensions/common/extensionsInput.i18n.json b/i18n/deu/src/vs/workbench/parts/extensions/common/extensionsInput.i18n.json
deleted file mode 100644
index ce72456211b..00000000000
--- a/i18n/deu/src/vs/workbench/parts/extensions/common/extensionsInput.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"extensionsInputName": "Erweiterung: {0}"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json b/i18n/deu/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
deleted file mode 100644
index 34a1a3d6da4..00000000000
--- a/i18n/deu/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
+++ /dev/null
@@ -1,69 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"name": "Erweiterungsname",
-	"extension id": "Erweiterungsbezeichner",
-	"preview": "Vorschau",
-	"builtin": "Integriert",
-	"publisher": "Name des Herausgebers",
-	"install count": "Installationsanzahl",
-	"rating": "Bewertung",
-	"repository": "Repository",
-	"license": "Lizenz",
-	"details": "Details",
-	"detailstooltip": "Details zur Erweiterung, die aus der Datei \"README.md\" der Erweiterung gerendert wurden",
-	"contributions": "Beiträge",
-	"contributionstooltip": "Listet Beiträge zu VS Code durch diese Erweiterung auf",
-	"changelog": "ChangeLog",
-	"changelogtooltip": "Updateverlauf der Erweiterung, der aus der Datei \"CHANGELOG.md\" der Erweiterung gerendert wurde",
-	"dependencies": "Abhängigkeiten",
-	"dependenciestooltip": "Listet Erweiterungen auf, von denen diese Erweiterung abhängig ist",
-	"noReadme": "Keine INFODATEI verfügbar.",
-	"noChangelog": "Es ist kein ChangeLog verfügbar.",
-	"noContributions": "Keine Beiträge",
-	"noDependencies": "Keine Abhängigkeiten",
-	"settings": "Einstellungen ({0})",
-	"setting name": "Name",
-	"description": "Beschreibung",
-	"default": "Standard",
-	"debuggers": "Debugger ({0})",
-	"debugger name": "Name",
-	"debugger type": "Typ",
-	"viewContainers": "Container anzeigen ({0})",
-	"view container id": "ID",
-	"view container title": "Titel",
-	"view container location": "Wo",
-	"views": "Ansichten ({0})",
-	"view id": "ID",
-	"view name": "Name",
-	"view location": "Wo",
-	"localizations": "Lokalisierungen ({0})",
-	"localizations language id": "Sprach-ID",
-	"localizations language name": "Name der Sprache",
-	"localizations localized language name": "Name der Sprache (lokalisiert)",
-	"colorThemes": "Farbdesigns ({0})",
-	"iconThemes": "Symboldesigns ({0})",
-	"colors": "Farben ({0})",
-	"colorId": "ID",
-	"defaultDark": "Standard, dunkel",
-	"defaultLight": "Standard, hell",
-	"defaultHC": "Standard, hoher Kontrast",
-	"JSON Validation": "JSON-Validierung ({0})",
-	"fileMatch": "Dateiübereinstimmung",
-	"schema": "Schema",
-	"commands": "Befehle ({0})",
-	"command name": "Name",
-	"keyboard shortcuts": "Tastenkombinationen",
-	"menuContexts": "Menükontexte",
-	"languages": "Sprachen ({0})",
-	"language id": "ID",
-	"language name": "Name",
-	"file extensions": "Dateierweiterungen",
-	"grammar": "Grammatik",
-	"snippets": "Codeausschnitte"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/extensions/electron-browser/extensionProfileService.i18n.json b/i18n/deu/src/vs/workbench/parts/extensions/electron-browser/extensionProfileService.i18n.json
deleted file mode 100644
index aac1ac14a6d..00000000000
--- a/i18n/deu/src/vs/workbench/parts/extensions/electron-browser/extensionProfileService.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"restart1": "Profilerweiterungen",
-	"restart2": "Zum Erstellen von Profilerweiterungen ist ein Neustart erforderlich. Möchten Sie \"{0}\" jetzt neu starten?",
-	"restart3": "Neu starten",
-	"cancel": "Abbrechen",
-	"selectAndStartDebug": "Klicken Sie, um die Profilerstellung zu beenden."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json b/i18n/deu/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
deleted file mode 100644
index 5272d4afb1f..00000000000
--- a/i18n/deu/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"neverShowAgain": "Nicht mehr anzeigen",
-	"searchMarketplace": "Marketplace durchsuchen",
-	"dynamicWorkspaceRecommendation": "Diese Erweiterung ist für Sie möglicherweise interessant, da sie von vielen anderen Benutzern des Repositorys {0} verwendet wird.",
-	"exeBasedRecommendation": "Diese Erweiterung wird empfohlen, da Sie {0} installiert haben.",
-	"fileBasedRecommendation": "Ausgehend von den kürzlich geöffneten Dateien wird diese Erweiterung empfohlen.",
-	"workspaceRecommendation": "Diese Erweiterung wird von Benutzern des aktuellen Arbeitsbereichs empfohlen.",
-	"reallyRecommended2": "Für diesen Dateityp wird die Erweiterung \"{0}\" empfohlen.",
-	"reallyRecommendedExtensionPack": "Für diesen Dateityp wird das Erweiterungspaket \"{0}\" empfohlen.",
-	"install": "Installieren",
-	"showRecommendations": "Empfehlungen anzeigen",
-	"showLanguageExtensions": "Der Marketplace enthält Erweiterungen, die bei \".{0}\"-Dateien behilflich sind.",
-	"workspaceRecommended": "Für diesen Arbeitsbereich sind Erweiterungsempfehlungen verfügbar.",
-	"installAll": "Alle installieren",
-	"ignoreExtensionRecommendations": "Möchten Sie alle Erweiterungsempfehlungen ignorieren?",
-	"ignoreAll": "Ja, alles ignorieren",
-	"no": "Nein"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/extensions/electron-browser/extensions.contribution.i18n.json b/i18n/deu/src/vs/workbench/parts/extensions/electron-browser/extensions.contribution.i18n.json
deleted file mode 100644
index eec3ca6a8c6..00000000000
--- a/i18n/deu/src/vs/workbench/parts/extensions/electron-browser/extensions.contribution.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"extensionsCommands": "Erweiterungen verwalten",
-	"galleryExtensionsCommands": "Katalogerweiterungen installieren",
-	"extension": "Erweiterung",
-	"runtimeExtension": "Laufende Erweiterungen",
-	"extensions": "Erweiterungen",
-	"view": "Anzeigen",
-	"developer": "Entwickler",
-	"extensionsConfigurationTitle": "Erweiterungen",
-	"extensionsAutoUpdate": "Erweiterungen automatisch aktualisieren",
-	"extensionsIgnoreRecommendations": "Bei TRUE werden Benachrichtigungen für Erweiterungsempfehlungen nicht mehr angezeigt.",
-	"extensionsShowRecommendationsOnlyOnDemand": "Wenn Sie \"True\" festlegen, werden Empfehlungen nur auf Anforderung vom Benutzer abgerufen oder angezeigt."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.i18n.json b/i18n/deu/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.i18n.json
deleted file mode 100644
index e7da14c93af..00000000000
--- a/i18n/deu/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openExtensionsFolder": "Erweiterungsordner öffnen",
-	"installVSIX": "Aus VSIX installieren...",
-	"installFromVSIX": "Aus VSIX installieren",
-	"installButton": "&&Installieren",
-	"InstallVSIXAction.reloadNow": "Jetzt erneut laden"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/extensions/electron-browser/extensionsUtils.i18n.json b/i18n/deu/src/vs/workbench/parts/extensions/electron-browser/extensionsUtils.i18n.json
deleted file mode 100644
index b0cd80e83a4..00000000000
--- a/i18n/deu/src/vs/workbench/parts/extensions/electron-browser/extensionsUtils.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"disableOtherKeymapsConfirmation": "Deaktivere Tastenzuordnungen ({0}) um Konfilkte mit anderen zu vermeiden?",
-	"yes": "Ja",
-	"no": "Nein"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json b/i18n/deu/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
deleted file mode 100644
index 7344b01b4a3..00000000000
--- a/i18n/deu/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"marketPlace": "Marketplace",
-	"installedExtensions": "Installiert",
-	"searchInstalledExtensions": "Installiert",
-	"recommendedExtensions": "Empfohlen",
-	"otherRecommendedExtensions": "Weitere Empfehlungen",
-	"workspaceRecommendedExtensions": "Arbeitsbereich-Empfehlungen",
-	"builtInExtensions": "Features",
-	"builtInThemesExtensions": "Designs",
-	"builtInBasicsExtensions": "Programmiersprachen",
-	"searchExtensions": "Nach Erweiterungen im Marketplace suchen",
-	"sort by installs": "Sortieren nach: Installationsanzahl",
-	"sort by rating": "Sortieren nach: Bewertung",
-	"sort by name": "Sortieren nach: Name",
-	"suggestProxyError": "Marketplace hat \"ECONNREFUSED\" zurückgegeben. Überprüfen Sie die Einstellung \"http.proxy\".",
-	"extensions": "Erweiterungen",
-	"outdatedExtensions": "{0} veraltete Erweiterungen",
-	"malicious warning": "\"{0}\" wurde als problematisch gemeldet und wurde daher deinstalliert.",
-	"reloadNow": "Jetzt erneut laden"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/extensions/electron-browser/extensionsViews.i18n.json b/i18n/deu/src/vs/workbench/parts/extensions/electron-browser/extensionsViews.i18n.json
deleted file mode 100644
index 413f2466a14..00000000000
--- a/i18n/deu/src/vs/workbench/parts/extensions/electron-browser/extensionsViews.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"extensions": "Erweiterungen",
-	"no extensions found": "Es wurden keine Erweiterungen gefunden.",
-	"suggestProxyError": "Marketplace hat \"ECONNREFUSED\" zurückgegeben. Überprüfen Sie die Einstellung \"http.proxy\"."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/extensions/electron-browser/keymapExtensions.i18n.json b/i18n/deu/src/vs/workbench/parts/extensions/electron-browser/keymapExtensions.i18n.json
deleted file mode 100644
index 5c79e379437..00000000000
--- a/i18n/deu/src/vs/workbench/parts/extensions/electron-browser/keymapExtensions.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"disableOtherKeymapsConfirmation": "Andere Tastenzuordnungen deaktivieren, um Konflikte zwischen Tastenzuordnungen zu vermeiden?",
-	"yes": "Ja",
-	"no": "Nein"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/extensions/electron-browser/runtimeExtensionsEditor.i18n.json b/i18n/deu/src/vs/workbench/parts/extensions/electron-browser/runtimeExtensionsEditor.i18n.json
deleted file mode 100644
index ac090661048..00000000000
--- a/i18n/deu/src/vs/workbench/parts/extensions/electron-browser/runtimeExtensionsEditor.i18n.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"starActivation": "Beim Start aktiviert",
-	"workspaceContainsGlobActivation": "Aktiviert, da eine mit {0} übereinstimmende Datei in Ihrem Arbeitsbereich vorhanden ist",
-	"workspaceContainsFileActivation": "Aktiviert, da die Datei {0} in Ihrem Arbeitsbereich vorhanden ist",
-	"languageActivation": "Aktiviert, da Sie eine {0}-Datei geöffnet haben",
-	"workspaceGenericActivation": "Aktiviert am {0}",
-	"errors": "{0} nicht abgefangene Fehler",
-	"extensionsInputName": "Ausgeführte Erweiterungen",
-	"showRuntimeExtensions": "Ausgeführte Erweiterungen anzeigen",
-	"reportExtensionIssue": "Problem melden",
-	"extensionHostProfileStart": "Erweiterungshostprofil starten",
-	"extensionHostProfileStop": "Erweiterungshostprofil beenden",
-	"saveExtensionHostProfile": "Erweiterungshostprofil speichern"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.i18n.json b/i18n/deu/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.i18n.json
deleted file mode 100644
index 9c84dc579d6..00000000000
--- a/i18n/deu/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.i18n.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"installingVSIXExtension": "Die Erweiterung wird aus VSIX installiert …",
-	"malicious": "Diese Erweiterung wird als problematisch gemeldet.",
-	"installingMarketPlaceExtension": "Die Erweiterung wird aus dem Marketplace installiert …",
-	"uninstallingExtension": "Die Erweiterung wird deinstalliert …",
-	"enableDependeciesConfirmation": "Durch das Aktivieren einer Erweiterung werden auch deren Abhängigkeiten aktiviert. Möchten Sie den Vorgang fortsetzen?",
-	"enable": "Ja",
-	"doNotEnable": "Nein",
-	"disableDependeciesConfirmation": "Möchten Sie die Abhängigkeiten der Erweiterungen ebenfalls deaktivieren?",
-	"yes": "Ja",
-	"no": "Nein",
-	"cancel": "Abbrechen",
-	"singleDependentError": "Die Erweiterung \"{0}\" kann nicht deaktiviert werden. Die Erweiterung \"{1}\" ist davon abhängig.",
-	"twoDependentsError": "Die Erweiterung \"{0}\" kann nicht deaktiviert werden. Die Erweiterungen \"{1}\" und \"{2}\" sind davon abhängig.",
-	"multipleDependentsError": "Die Erweiterung \"{0}\" kann nicht deaktiviert werden. Die Erweiterungen \"{1}\", \"{2}\" und andere sind davon abhängig.",
-	"installConfirmation": "Möchten sie die Erweiterung \"{0}\" installieren?",
-	"install": "Installieren"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json b/i18n/deu/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json
deleted file mode 100644
index 9164d64820a..00000000000
--- a/i18n/deu/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"workbenchConfigurationTitle": "Workbench",
-	"feedbackVisibility": "Steuert die Sichtbarkeit des Twitter-Feedbacks (Smiley) in der Statusleiste am unteren Rand der Workbench."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/feedback/electron-browser/feedback.i18n.json b/i18n/deu/src/vs/workbench/parts/feedback/electron-browser/feedback.i18n.json
deleted file mode 100644
index 4155c1298c2..00000000000
--- a/i18n/deu/src/vs/workbench/parts/feedback/electron-browser/feedback.i18n.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"sendFeedback": "Feedback als Tweet senden",
-	"label.sendASmile": "Senden Sie uns Ihr Feedback als Tweet.",
-	"patchedVersion1": "Ihre Installation ist beschädigt.",
-	"patchedVersion2": "Geben Sie diese Information an, wenn Sie einen Fehler melden.",
-	"sentiment": "Welche Erfahrungen haben Sie gemacht?",
-	"smileCaption": "Glücklich",
-	"frownCaption": "Traurig",
-	"other ways to contact us": "Weitere Möglichkeiten der Kontaktaufnahme",
-	"submit a bug": "Fehler senden",
-	"request a missing feature": "Fehlendes Feature anfordern",
-	"tell us why?": "Warum?",
-	"commentsHeader": "Kommentare",
-	"showFeedback": "Feedbacksmiley in der Statusleiste anzeigen",
-	"tweet": "Tweet",
-	"character left": "verbleibende Zeichen",
-	"characters left": "verbleibende Zeichen",
-	"feedbackSending": "Wird gesendet.",
-	"feedbackSent": "Vielen Dank",
-	"feedbackSendingError": "Wiederholen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json b/i18n/deu/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json
deleted file mode 100644
index c4df2826046..00000000000
--- a/i18n/deu/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hide": "Ausblenden"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/files/browser/editors/binaryFileEditor.i18n.json b/i18n/deu/src/vs/workbench/parts/files/browser/editors/binaryFileEditor.i18n.json
deleted file mode 100644
index c374589c611..00000000000
--- a/i18n/deu/src/vs/workbench/parts/files/browser/editors/binaryFileEditor.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"binaryFileEditor": "Binärdateianzeige"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/files/browser/editors/textFileEditor.i18n.json b/i18n/deu/src/vs/workbench/parts/files/browser/editors/textFileEditor.i18n.json
deleted file mode 100644
index 58ca31c36dc..00000000000
--- a/i18n/deu/src/vs/workbench/parts/files/browser/editors/textFileEditor.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"textFileEditor": "Textdatei-Editor",
-	"createFile": "Datei erstellen",
-	"relaunchWithIncreasedMemoryLimit": "Mit {0} MB neu starten",
-	"configureMemoryLimit": "Arbeitsspeicherbeschränkung konfigurieren",
-	"fileEditorWithInputAriaLabel": "{0}. Textdatei-Editor.",
-	"fileEditorAriaLabel": "Textdatei-Editor"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/files/browser/explorerViewlet.i18n.json b/i18n/deu/src/vs/workbench/parts/files/browser/explorerViewlet.i18n.json
deleted file mode 100644
index 77d792d6a70..00000000000
--- a/i18n/deu/src/vs/workbench/parts/files/browser/explorerViewlet.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"folders": "Ordner"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/files/browser/fileActions.contribution.i18n.json b/i18n/deu/src/vs/workbench/parts/files/browser/fileActions.contribution.i18n.json
deleted file mode 100644
index 46de1e8541a..00000000000
--- a/i18n/deu/src/vs/workbench/parts/files/browser/fileActions.contribution.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"filesCategory": "Datei",
-	"revealInSideBar": "In Seitenleiste anzeigen",
-	"acceptLocalChanges": "Änderungen verwenden und Datenträgerinhalte überschreiben",
-	"revertLocalChanges": "Änderungen verwerfen und Datenträgerinhalte wiederherstellen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/files/browser/fileActions.i18n.json b/i18n/deu/src/vs/workbench/parts/files/browser/fileActions.i18n.json
deleted file mode 100644
index 146bfaf2e06..00000000000
--- a/i18n/deu/src/vs/workbench/parts/files/browser/fileActions.i18n.json
+++ /dev/null
@@ -1,73 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"retry": "Wiederholen",
-	"rename": "Umbenennen",
-	"newFile": "Neue Datei",
-	"newFolder": "Neuer Ordner",
-	"openFolderFirst": "Öffnet zuerst einen Ordner, in dem Dateien oder Ordner erstellt werden.",
-	"newUntitledFile": "Neue unbenannte Datei",
-	"createNewFile": "Neue Datei",
-	"createNewFolder": "Neuer Ordner",
-	"deleteButtonLabelRecycleBin": "&&In Papierkorb verschieben",
-	"deleteButtonLabelTrash": "&&In Papierkorb verschieben",
-	"deleteButtonLabel": "&&Löschen",
-	"dirtyMessageFolderOneDelete": "Sie löschen einen Ordner mit nicht gespeicherten Änderungen in einer Datei. Möchten Sie den Vorgang fortsetzen?",
-	"dirtyMessageFolderDelete": "Sie löschen einen Ordner mit nicht gespeicherten Änderungen in {0} Dateien. Möchten Sie den Vorgang fortsetzen?",
-	"dirtyMessageFileDelete": "Sie löschen eine Datei mit nicht gespeicherten Änderungen. Möchten Sie den Vorgang fortsetzen?",
-	"dirtyWarning": "Ihre Änderungen gehen verloren, wenn Sie diese nicht speichern.",
-	"confirmMoveTrashMessageFolder": "Möchten Sie \"{0}\" samt Inhalt wirklich löschen?",
-	"confirmMoveTrashMessageFile": "Möchten Sie \"{0}\" wirklich löschen?",
-	"undoBin": "Die Wiederherstellung kann aus dem Papierkorb erfolgen.",
-	"undoTrash": "Die Wiederherstellung kann aus dem Papierkorb erfolgen.",
-	"doNotAskAgain": "Nicht erneut fragen",
-	"confirmDeleteMessageFolder": "Möchten Sie \"{0}\" samt Inhalt wirklich endgültig löschen?",
-	"confirmDeleteMessageFile": "Möchten Sie \"{0}\" wirklich endgültig löschen?",
-	"irreversible": "Diese Aktion kann nicht rückgängig gemacht werden.",
-	"permDelete": "Endgültig löschen",
-	"delete": "Löschen",
-	"importFiles": "Dateien importieren",
-	"confirmOverwrite": "Im Zielordner ist bereits eine Datei oder ein Ordner mit dem gleichen Namen vorhanden. Möchten Sie sie bzw. ihn ersetzen?",
-	"replaceButtonLabel": "&&Ersetzen",
-	"copyFile": "Kopieren",
-	"pasteFile": "Einfügen",
-	"duplicateFile": "Duplikat",
-	"openToSide": "Zur Seite öffnen",
-	"compareSource": "Für Vergleich auswählen",
-	"globalCompareFile": "Aktive Datei vergleichen mit...",
-	"openFileToCompare": "Zuerst eine Datei öffnen, um diese mit einer anderen Datei zu vergleichen",
-	"compareWith": "'{0}' mit '{1}' vergleichen",
-	"compareFiles": "Dateien vergleichen",
-	"refresh": "Aktualisieren",
-	"save": "Speichern",
-	"saveAs": "Speichern unter...",
-	"saveAll": "Alle speichern",
-	"saveAllInGroup": "Alle in der Gruppe speichern",
-	"saveFiles": "Alle Dateien speichern",
-	"revert": "Datei wiederherstellen",
-	"focusOpenEditors": "Fokus auf Ansicht \"Geöffnete Editoren\"",
-	"focusFilesExplorer": "Fokus auf Datei-Explorer",
-	"showInExplorer": "Aktive Datei in Seitenleiste anzeigen",
-	"openFileToShow": "Öffnet zuerst eine Datei, um sie im Explorer anzuzeigen.",
-	"collapseExplorerFolders": "Ordner im Explorer zuklappen",
-	"refreshExplorer": "Explorer aktualisieren",
-	"openFileInNewWindow": "Aktive Datei in neuem Fenster öffnen",
-	"openFileToShowInNewWindow": "Datei zuerst öffnen, um sie in einem neuen Fenster zu öffnen",
-	"revealInWindows": "Im Explorer anzeigen",
-	"revealInMac": "Im Finder anzeigen",
-	"openContainer": "Enthaltenden Ordner öffnen",
-	"revealActiveFileInWindows": "Aktive Datei im Windows-Explorer anzeigen",
-	"revealActiveFileInMac": "Aktive Datei im Finder anzeigen",
-	"openActiveFileContainer": "Enthaltenden Ordner der aktiven Datei öffnen",
-	"copyPath": "Pfad kopieren",
-	"copyPathOfActive": "Pfad der aktiven Datei kopieren",
-	"emptyFileNameError": "Es muss ein Datei- oder Ordnername angegeben werden.",
-	"fileNameExistsError": "Eine Datei oder ein Ordner **{0}** ist an diesem Ort bereits vorhanden. Wählen Sie einen anderen Namen.",
-	"invalidFileNameError": "Der Name **{0}** ist als Datei- oder Ordnername ungültig. Bitte wählen Sie einen anderen Namen aus.",
-	"filePathTooLongError": "Der Name **{0}** führt zu einem Pfad, der zu lang ist. Wählen Sie einen kürzeren Namen.",
-	"compareWithSaved": "Aktive Datei mit gespeicherter Datei vergleichen",
-	"modifiedLabel": "{0} (auf Datenträger) ↔ {1}"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/files/browser/fileCommands.i18n.json b/i18n/deu/src/vs/workbench/parts/files/browser/fileCommands.i18n.json
deleted file mode 100644
index c248ffc5682..00000000000
--- a/i18n/deu/src/vs/workbench/parts/files/browser/fileCommands.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"openFileToCopy": "Datei zuerst öffnen, um ihren Pfad zu kopieren",
-	"openFileToReveal": "Datei zuerst öffnen, um sie anzuzeigen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/files/browser/files.contribution.i18n.json b/i18n/deu/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
deleted file mode 100644
index 00a2164ceaa..00000000000
--- a/i18n/deu/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
+++ /dev/null
@@ -1,53 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"showExplorerViewlet": "Explorer anzeigen",
-	"explore": "Explorer",
-	"view": "Anzeigen",
-	"textFileEditor": "Textdatei-Editor",
-	"binaryFileEditor": "Binärdatei-Editor",
-	"filesConfigurationTitle": "Dateien",
-	"exclude": "Konfigurieren Sie Globmuster zum Ausschließen von Dateien und Ordnern. Zum Beispiel entscheidet Explorer welche Dateien und Ordner gezeigt oder ausgeblendet werden anhand dieser Einstellung.",
-	"files.exclude.boolean": "Das Globmuster, mit dem Dateipfade verglichen werden sollen. Legen Sie diesen Wert auf \"true\" oder \"false\" fest, um das Muster zu aktivieren bzw. zu deaktivieren.",
-	"files.exclude.when": "Zusätzliche Überprüfung der gleichgeordneten Elemente einer entsprechenden Datei. Verwenden Sie \"$(basename)\" als Variable für den entsprechenden Dateinamen.",
-	"associations": "Konfigurieren Sie Dateizuordnungen zu Sprachen (beispielsweise \"*.extension\": \"html\"). Diese besitzen Vorrang vor den Standardzuordnungen der installierten Sprachen.",
-	"encoding": "Die Standardzeichensatz-Codierung, die beim Lesen und Schreiben von Dateien verwendet werden soll. Diese Einstellung kann auch pro Sprache konfiguriert werden.",
-	"autoGuessEncoding": "Wenn diese Option aktiviert ist, wird beim Öffnen von Dateien versucht, die Zeichensatzcodierung automatisch zu ermitteln. Diese Einstellung kann auch pro Sprache konfiguriert werden.",
-	"eol": "Das Zeilenende-Standardzeichen. Verwenden Sie \\n für LF und \\r\\n für CRLF.",
-	"trimTrailingWhitespace": "Bei Aktivierung werden nachgestellte Leerzeichen beim Speichern einer Datei gekürzt.",
-	"insertFinalNewline": "Bei Aktivierung wird beim Speichern einer Datei eine abschließende neue Zeile am Dateiende eingefügt.",
-	"trimFinalNewlines": "Wenn diese Option aktiviert ist, werden beim Speichern alle neuen Zeilen nach der abschließenden neuen Zeile am Dateiende gekürzt.",
-	"files.autoSave.off": "Eine geänderte Datei wird nie automatisch gespeichert.",
-	"files.autoSave.afterDelay": "Eine geänderte Datei wird automatisch nach der konfigurierten \"files.autoSaveDelay\" gespeichert.",
-	"files.autoSave.onFocusChange": "Eine geänderte Datei wird automatisch gespeichert, wenn der Editor den Fokus verliert.",
-	"files.autoSave.onWindowChange": "Eine geänderte Datei wird automatisch gespeichert, wenn das Fenster den Fokus verliert.",
-	"autoSave": "Steuert die automatische Speicherung geänderter Dateien. Zulässige Werte: \"{0}\", \"{1}\", \"{2}\" (Editor verliert den Fokus), \"{3}\" (Fenster verliert den Fokus). Wenn diese Angabe auf \"{4}\" festgelegt ist, können Sie die Verzögerung in \"files.autoSaveDelay\" konfigurieren.",
-	"autoSaveDelay": "Steuert die Verzögerung in Millisekunden, nach der eine geänderte Datei automatisch gespeichert wird. Nur gültig, wenn \"files.autoSave\" auf \"{0}\" festgelegt ist.",
-	"watcherExclude": "Konfigurieren Sie Globmuster von Dateipfaden, die von der Dateiüberwachung ausgeschlossen werden sollen. Muster müssen in absoluten Pfaden übereinstimmen (d. h. für eine korrekte Überstimmung muss das Präfix ** oder der vollständige Pfad verwendet werden). Das Ändern dieser Einstellung erfordert einen Neustart. Wenn Ihr Code beim Start viel CPU-Zeit beansprucht, können Sie große Ordner ausschließen, um die anfängliche Last zu verringern.",
-	"hotExit.off": "Hot Exit deaktivieren.",
-	"hotExit.onExit": "Hot Exit wird beim Schließen der Anwendung ausgelöst, d. h. wenn unter Windows/Linux das letzte Fenster geschlossen wird oder wenn der Befehl \"workbench.action.quit\" ausgelöst wird (Befehlspalette, Tastenzuordnung, Menü). Alle Fenster mit Sicherungen werden beim nächsten Start wiederhergestellt.",
-	"hotExit.onExitAndWindowClose": "Hot Exit wird beim Schließen der Anwendung, d. h. wenn unter Windows/Linux das letzte Fenster geschlossen wird, oder beim Auslösen des Befehls \"workbench.action.quit\" (Befehlspalette, Tastenzuordnung, Menü) sowie für jedes Fenster mit einem geöffneten Ordner ausgelöst, unabhängig davon, ob es das letzte Fenster ist. Alle Fenster ohne geöffnete Ordner werden beim nächsten Start wiederhergestellt. Legen Sie window.restoreWindows auf \"all\" fest, um Ordnerfenster im Zustand vor dem Herunterfahren wiederherzustellen. ",
-	"hotExit": "Steuert, ob nicht gespeicherten Dateien zwischen den Sitzungen beibehlten werden, die Aufforderung zum Speichern wird beim Beenden des Editors übersprungen.",
-	"useExperimentalFileWatcher": "Verwenden Sie die neue experimentelle Dateiüberwachung.",
-	"defaultLanguage": "Der Standardsprachmodus, der neuen Dateien zugewiesen wird.",
-	"editorConfigurationTitle": "Editor",
-	"formatOnSave": "Hiermit wird eine Datei beim Speichern formatiert. Es muss ein Formatierer vorhanden sein, die Datei darf nicht automatisch gespeichert werden, und der Editor darf nicht geschlossen werden.",
-	"explorerConfigurationTitle": "Datei-Explorer",
-	"openEditorsVisible": "Die Anzahl der Editoren, die im Bereich \"Geöffnete Editoren\" angezeigt werden. Legen Sie diesen Wert auf 0 fest, um den Bereich auszublenden.",
-	"dynamicHeight": "Steuert, ob sich die Höhe des Abschnitts \"Geöffnete Editoren\" dynamisch an die Anzahl der Elemente anpassen soll.",
-	"autoReveal": "Steuert, ob der Explorer Dateien beim Öffnen automatisch anzeigen und auswählen soll.",
-	"enableDragAndDrop": "Steuert, ob der Explorer das Verschieben von Dateien und Ordnern mithilfe von Drag  Drop zulassen soll.",
-	"confirmDragAndDrop": "Steuert, ob der Explorer um Bestätigung bittet, um Dateien und Ordner per Drag & Drop zu verschieben.",
-	"confirmDelete": "Steuert, ob der Explorer um Bestätigung bitten soll, wenn Sie eine Datei über den Papierkorb löschen.",
-	"sortOrder.default": "Dateien und Ordner werden nach ihren Namen in alphabetischer Reihenfolge sortiert. Ordner werden vor Dateien angezeigt. ",
-	"sortOrder.mixed": "Dateien und Ordner werden nach ihren Namen in alphabetischer Reihenfolge sortiert. Dateien und Ordner werden vermischt angezeigt.",
-	"sortOrder.filesFirst": "Dateien und Ordner werden nach ihren Namen in alphabetischer Reihenfolge sortiert. Dateien werden vor Ordnern angezeigt.",
-	"sortOrder.type": "Dateien und Ordner werden nach ihren Erweiterungen in alphabetischer Reihenfolge sortiert. Ordner werden vor Dateien angezeigt.",
-	"sortOrder.modified": "Dateien und Ordner werden nach dem letzten Änderungsdatum in absteigender Reihenfolge sortiert. Ordner werden vor Dateien angezeigt.",
-	"sortOrder": "Steuert die Sortierreihenfolge von Dateien und Ordnern im Explorer. Zusätzlich zur Standardsortierreihenfolge können Sie die Reihenfolge auf \"mixed\" (kombinierte Sortierung von Dateien und Ordnern), \"type\" (nach Dateityp), \"modified\" (nach letztem Änderungsdatum) oder \"filesFirst\" (Dateien vor Ordnern anzeigen) festlegen.",
-	"explorer.decorations.colors": "Steuert, ob Dateidekorationen Farben verwenden.",
-	"explorer.decorations.badges": "Steuert, ob Dateidekorationen Badges verwenden."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/files/browser/saveErrorHandler.i18n.json b/i18n/deu/src/vs/workbench/parts/files/browser/saveErrorHandler.i18n.json
deleted file mode 100644
index 55ed6344bee..00000000000
--- a/i18n/deu/src/vs/workbench/parts/files/browser/saveErrorHandler.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"userGuide": "Verwenden Sie die Aktionen auf der Editor-Symbolleiste auf der rechten Seite, um Ihre Änderungen **rückgängig zu machen** oder den Inhalt auf dem Datenträger mit Ihren Änderungen zu **überschreiben**.",
-	"discard": "Verwerfen",
-	"overwrite": "Überschreiben",
-	"retry": "Wiederholen",
-	"readonlySaveError": "Fehler beim Speichern von \"{0}\": Die Datei ist schreibgeschützt. Wählen Sie 'Überschreiben' aus, um den Schutz aufzuheben.",
-	"genericSaveError": "Fehler beim Speichern von \"{0}\": {1}.",
-	"staleSaveError": "Fehler beim Speichern von \"{0}\": Der Inhalt auf dem Datenträger ist neuer. Klicken Sie auf **Vergleichen**, um Ihre Version mit der Version auf dem Datenträger zu vergleichen.",
-	"compareChanges": "Vergleichen",
-	"saveConflictDiffLabel": "{0} (auf Datenträger) ↔ {1} (in {2}): Speicherkonflikt lösen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/files/browser/views/emptyView.i18n.json b/i18n/deu/src/vs/workbench/parts/files/browser/views/emptyView.i18n.json
deleted file mode 100644
index e3de54fe532..00000000000
--- a/i18n/deu/src/vs/workbench/parts/files/browser/views/emptyView.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"noWorkspace": "Es ist kein Ordner geöffnet.",
-	"explorerSection": "Datei-Explorer-Abschnitt",
-	"noWorkspaceHelp": "Sie haben noch keinen Ordner zum Arbeitsbereich hinzugefügt.",
-	"addFolder": "Ordner hinzufügen",
-	"noFolderHelp": "Sie haben noch keinen Ordner geöffnet.",
-	"openFolder": "Ordner öffnen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/files/browser/views/explorerDecorationsProvider.i18n.json b/i18n/deu/src/vs/workbench/parts/files/browser/views/explorerDecorationsProvider.i18n.json
deleted file mode 100644
index e516583e880..00000000000
--- a/i18n/deu/src/vs/workbench/parts/files/browser/views/explorerDecorationsProvider.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"label": "Explorer",
-	"canNotResolve": "Arbeitsbereichsordner kann nicht aufgelöst werden."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/files/browser/views/explorerView.i18n.json b/i18n/deu/src/vs/workbench/parts/files/browser/views/explorerView.i18n.json
deleted file mode 100644
index 7846976127c..00000000000
--- a/i18n/deu/src/vs/workbench/parts/files/browser/views/explorerView.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"explorerSection": "Datei-Explorer-Abschnitt",
-	"treeAriaLabel": "Datei-Explorer"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/files/browser/views/explorerViewer.i18n.json b/i18n/deu/src/vs/workbench/parts/files/browser/views/explorerViewer.i18n.json
deleted file mode 100644
index 4b59346e4d2..00000000000
--- a/i18n/deu/src/vs/workbench/parts/files/browser/views/explorerViewer.i18n.json
+++ /dev/null
@@ -1,19 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"fileInputAriaLabel": "Geben Sie den Dateinamen ein. Drücken Sie zur Bestätigung die EINGABETASTE oder ESC, um den Vorgang abzubrechen.",
-	"filesExplorerViewerAriaLabel": "{0}, Datei-Explorer",
-	"dropFolders": "Möchten Sie die Ordner zum Arbeitsbereich hinzufügen?",
-	"dropFolder": "Möchten Sie den Ordner zum Arbeitsbereich hinzufügen?",
-	"addFolders": "&&Ordner hinzufügen",
-	"addFolder": "&&Ordner hinzufügen",
-	"confirmMove": "Sind Sie sicher, dass Sie \"{0}\" verschieben möchten?",
-	"doNotAskAgain": "Nicht erneut fragen",
-	"moveButtonLabel": "&&Verschieben",
-	"confirmOverwriteMessage": "{0} ist im Zielordner bereits vorhanden. Möchten Sie das Element ersetzen?",
-	"irreversible": "Diese Aktion kann nicht rückgängig gemacht werden.",
-	"replaceButtonLabel": "&&Ersetzen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/files/browser/views/openEditorsView.i18n.json b/i18n/deu/src/vs/workbench/parts/files/browser/views/openEditorsView.i18n.json
deleted file mode 100644
index ac1fd2f5acb..00000000000
--- a/i18n/deu/src/vs/workbench/parts/files/browser/views/openEditorsView.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"openEditors": "Geöffnete Editoren",
-	"openEditosrSection": "Abschnitt \"Geöffnete Editoren\"",
-	"treeAriaLabel": "Geöffnete Editoren: Liste der aktiven Dateien",
-	"dirtyCounter": "{0} nicht gespeichert"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/files/browser/views/openEditorsViewer.i18n.json b/i18n/deu/src/vs/workbench/parts/files/browser/views/openEditorsViewer.i18n.json
deleted file mode 100644
index aebc7895072..00000000000
--- a/i18n/deu/src/vs/workbench/parts/files/browser/views/openEditorsViewer.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"editorGroupAriaLabel": "{0}, Editor-Gruppe",
-	"openEditorAriaLabel": "{0}, geöffnete Editoren",
-	"saveAll": "Alle speichern",
-	"closeAllUnmodified": "Nicht geänderte schließen",
-	"closeAll": "Alle schließen",
-	"compareWithSaved": "Mit gespeicherter Datei vergleichen",
-	"close": "Schließen",
-	"closeOthers": "Andere schließen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/files/common/dirtyFilesTracker.i18n.json b/i18n/deu/src/vs/workbench/parts/files/common/dirtyFilesTracker.i18n.json
deleted file mode 100644
index 29dbec49f42..00000000000
--- a/i18n/deu/src/vs/workbench/parts/files/common/dirtyFilesTracker.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"dirtyFile": "1 nicht gespeicherte Datei",
-	"dirtyFiles": "{0} nicht gespeicherte Dateien"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/files/common/editors/fileEditorInput.i18n.json b/i18n/deu/src/vs/workbench/parts/files/common/editors/fileEditorInput.i18n.json
deleted file mode 100644
index a6f396bbe8c..00000000000
--- a/i18n/deu/src/vs/workbench/parts/files/common/editors/fileEditorInput.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"orphanedFile": "{0} (deleted from disk)"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/files/electron-browser/explorerViewlet.i18n.json b/i18n/deu/src/vs/workbench/parts/files/electron-browser/explorerViewlet.i18n.json
deleted file mode 100644
index d13d06d65a8..00000000000
--- a/i18n/deu/src/vs/workbench/parts/files/electron-browser/explorerViewlet.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"folders": "Ordner"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json b/i18n/deu/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
deleted file mode 100644
index da62e80408d..00000000000
--- a/i18n/deu/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"filesCategory": "Datei",
-	"revealInSideBar": "In Seitenleiste anzeigen",
-	"acceptLocalChanges": "Änderungen verwenden und Datenträgerinhalte überschreiben",
-	"revertLocalChanges": "Änderungen verwerfen und Datenträgerinhalte wiederherstellen",
-	"copyPathOfActive": "Pfad der aktiven Datei kopieren",
-	"saveAllInGroup": "Alle in der Gruppe speichern",
-	"saveFiles": "Alle Dateien speichern",
-	"revert": "Datei wiederherstellen",
-	"compareActiveWithSaved": "Aktive Datei mit gespeicherter Datei vergleichen",
-	"closeEditor": "Editor schließen",
-	"view": "Anzeigen",
-	"openToSide": "Zur Seite öffnen",
-	"revealInWindows": "Im Explorer anzeigen",
-	"revealInMac": "Im Finder anzeigen",
-	"openContainer": "Enthaltenden Ordner öffnen",
-	"copyPath": "Pfad kopieren",
-	"saveAll": "Alle speichern",
-	"compareWithSaved": "Mit gespeicherter Datei vergleichen",
-	"compareWithSelected": "Mit Auswahl vergleichen",
-	"compareSource": "Für Vergleich auswählen",
-	"compareSelected": "Auswahl vergleichen",
-	"close": "Schließen",
-	"closeOthers": "Andere schließen",
-	"closeSaved": "Gespeicherte schließen",
-	"closeAll": "Alle schließen",
-	"deleteFile": "Endgültig löschen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json b/i18n/deu/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
deleted file mode 100644
index e5540f79064..00000000000
--- a/i18n/deu/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
+++ /dev/null
@@ -1,72 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"newFile": "Neue Datei",
-	"newFolder": "Neuer Ordner",
-	"rename": "Umbenennen",
-	"delete": "Löschen",
-	"copyFile": "Kopieren",
-	"pasteFile": "Einfügen",
-	"retry": "Wiederholen",
-	"renameWhenSourcePathIsParentOfTargetError": "Verwenden Sie den Befehl \"Neuer Ordner\" oder \"Neue Datei\", um untergeordnete Elemente zu einem vorhandenen Ordner hinzuzufügen",
-	"newUntitledFile": "Neue unbenannte Datei",
-	"createNewFile": "Neue Datei",
-	"createNewFolder": "Neuer Ordner",
-	"deleteButtonLabelRecycleBin": "&&In Papierkorb verschieben",
-	"deleteButtonLabelTrash": "&&In Papierkorb verschieben",
-	"deleteButtonLabel": "&&Löschen",
-	"dirtyMessageFilesDelete": "Sie löschen Dateien mit nicht gespeicherten Änderungen. Möchten Sie den Vorgang fortsetzen?",
-	"dirtyMessageFolderOneDelete": "Sie löschen einen Ordner mit nicht gespeicherten Änderungen in einer Datei. Möchten Sie den Vorgang fortsetzen?",
-	"dirtyMessageFolderDelete": "Sie löschen einen Ordner mit nicht gespeicherten Änderungen in {0} Dateien. Möchten Sie den Vorgang fortsetzen?",
-	"dirtyMessageFileDelete": "Sie löschen eine Datei mit nicht gespeicherten Änderungen. Möchten Sie den Vorgang fortsetzen?",
-	"dirtyWarning": "Ihre Änderungen gehen verloren, wenn Sie diese nicht speichern.",
-	"undoBin": "Die Wiederherstellung kann aus dem Papierkorb erfolgen.",
-	"undoTrash": "Die Wiederherstellung kann aus dem Papierkorb erfolgen.",
-	"doNotAskAgain": "Nicht erneut fragen",
-	"irreversible": "Diese Aktion kann nicht rückgängig gemacht werden.",
-	"binFailed": "Fehler beim Löschen über den Papierkorb. Möchten Sie den Löschvorgang stattdessen dauerhaft ausführen?",
-	"trashFailed": "Fehler beim Löschen über den Papierkorb. Möchten Sie den Löschvorgang stattdessen dauerhaft ausführen?",
-	"deletePermanentlyButtonLabel": "En&&dgültig löschen",
-	"retryButtonLabel": "Wiede&&rholen",
-	"confirmMoveTrashMessageFilesAndDirectories": "Möchten Sie die folgenden {0} Dateien/Verzeichnisse und ihren Inhalt löschen?",
-	"confirmMoveTrashMessageMultipleDirectories": "Möchten Sie die folgenden {0} Verzeichnisse und ihren Inhalt löschen?",
-	"confirmMoveTrashMessageMultiple": "Möchten Sie die folgenden {0} Dateien löschen?",
-	"confirmMoveTrashMessageFolder": "Möchten Sie \"{0}\" samt Inhalt wirklich löschen?",
-	"confirmMoveTrashMessageFile": "Möchten Sie \"{0}\" wirklich löschen?",
-	"confirmDeleteMessageFilesAndDirectories": "Möchten Sie die folgenden {0} Dateien/Verzeichnisse und ihren Inhalt dauerhaft löschen?",
-	"confirmDeleteMessageMultipleDirectories": "Möchten Sie die folgenden {0} Verzeichnisse und ihren Inhalt dauerhaft löschen?",
-	"confirmDeleteMessageMultiple": "Möchten Sie die folgenden {0} Dateien endgültig löschen?",
-	"confirmDeleteMessageFolder": "Möchten Sie \"{0}\" samt Inhalt wirklich endgültig löschen?",
-	"confirmDeleteMessageFile": "Möchten Sie \"{0}\" wirklich endgültig löschen?",
-	"addFiles": "Dateien hinzufügen",
-	"confirmOverwrite": "Im Zielordner ist bereits eine Datei oder ein Ordner mit dem gleichen Namen vorhanden. Möchten Sie sie bzw. ihn ersetzen?",
-	"replaceButtonLabel": "&&Ersetzen",
-	"fileIsAncestor": "Die einzufügende Datei ist ein Vorgänger des Zielordners",
-	"fileDeleted": "Die einzufügende Datei wurde zwischenzeitlich gelöscht oder verschoben.",
-	"duplicateFile": "Duplikat",
-	"globalCompareFile": "Aktive Datei vergleichen mit...",
-	"openFileToCompare": "Zuerst eine Datei öffnen, um diese mit einer anderen Datei zu vergleichen",
-	"refresh": "Aktualisieren",
-	"saveAllInGroup": "Alle in der Gruppe speichern",
-	"focusOpenEditors": "Fokus auf Ansicht \"Geöffnete Editoren\"",
-	"focusFilesExplorer": "Fokus auf Datei-Explorer",
-	"showInExplorer": "Aktive Datei in Seitenleiste anzeigen",
-	"openFileToShow": "Öffnet zuerst eine Datei, um sie im Explorer anzuzeigen.",
-	"collapseExplorerFolders": "Ordner im Explorer zuklappen",
-	"refreshExplorer": "Explorer aktualisieren",
-	"openFileInNewWindow": "Aktive Datei in neuem Fenster öffnen",
-	"openFileToShowInNewWindow": "Datei zuerst öffnen, um sie in einem neuen Fenster zu öffnen",
-	"copyPath": "Pfad kopieren",
-	"emptyFileNameError": "Es muss ein Datei- oder Ordnername angegeben werden.",
-	"fileNameStartsWithSlashError": "Ein Datei- oder Ordnername darf nicht mit einem Schrägstrich beginnen.",
-	"fileNameExistsError": "Eine Datei oder ein Ordner **{0}** ist an diesem Ort bereits vorhanden. Wählen Sie einen anderen Namen.",
-	"invalidFileNameError": "Der Name **{0}** ist als Datei- oder Ordnername ungültig. Bitte wählen Sie einen anderen Namen aus.",
-	"filePathTooLongError": "Der Name **{0}** führt zu einem Pfad, der zu lang ist. Wählen Sie einen kürzeren Namen.",
-	"compareWithClipboard": "Aktive Datei mit Zwischenablage vergleichen",
-	"clipboardComparisonLabel": "Zwischenablage ↔ {0}"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json b/i18n/deu/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
deleted file mode 100644
index 129fede53cc..00000000000
--- a/i18n/deu/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"revealInWindows": "Im Explorer anzeigen",
-	"revealInMac": "Im Finder anzeigen",
-	"openContainer": "Enthaltenden Ordner öffnen",
-	"saveAs": "Speichern unter...",
-	"save": "Speichern",
-	"saveAll": "Alle speichern",
-	"removeFolderFromWorkspace": "Ordner aus dem Arbeitsbereich entfernen",
-	"genericRevertError": "Fehler beim Zurücksetzen von '{0}': {1}",
-	"modifiedLabel": "{0} (auf Datenträger) ↔ {1}",
-	"openFileToReveal": "Datei zuerst öffnen, um sie anzuzeigen",
-	"openFileToCopy": "Datei zuerst öffnen, um ihren Pfad zu kopieren"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json b/i18n/deu/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
deleted file mode 100644
index 99f2be77fbb..00000000000
--- a/i18n/deu/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"showExplorerViewlet": "Explorer anzeigen",
-	"explore": "Explorer",
-	"view": "Anzeigen",
-	"textFileEditor": "Textdatei-Editor",
-	"binaryFileEditor": "Binärdatei-Editor",
-	"filesConfigurationTitle": "Dateien",
-	"exclude": "Konfigurieren Sie Globmuster zum Ausschließen von Dateien und Ordnern. Zum Beispiel entscheidet Explorer welche Dateien und Ordner gezeigt oder ausgeblendet werden anhand dieser Einstellung.",
-	"files.exclude.boolean": "Das Globmuster, mit dem Dateipfade verglichen werden sollen. Legen Sie diesen Wert auf \"true\" oder \"false\" fest, um das Muster zu aktivieren bzw. zu deaktivieren.",
-	"files.exclude.when": "Zusätzliche Überprüfung der gleichgeordneten Elemente einer entsprechenden Datei. Verwenden Sie \"$(basename)\" als Variable für den entsprechenden Dateinamen.",
-	"associations": "Konfigurieren Sie Dateizuordnungen zu Sprachen (beispielsweise \"*.extension\": \"html\"). Diese besitzen Vorrang vor den Standardzuordnungen der installierten Sprachen.",
-	"encoding": "Die Standardzeichensatz-Codierung, die beim Lesen und Schreiben von Dateien verwendet werden soll. Diese Einstellung kann auch pro Sprache konfiguriert werden.",
-	"autoGuessEncoding": "Wenn diese Option aktiviert ist, wird beim Öffnen von Dateien versucht, die Zeichensatzcodierung automatisch zu ermitteln. Diese Einstellung kann auch pro Sprache konfiguriert werden.",
-	"eol": "Das Zeilenende-Standardzeichen. Verwenden Sie \\n für LF und \\r\\n für CRLF.",
-	"trimTrailingWhitespace": "Bei Aktivierung werden nachgestellte Leerzeichen beim Speichern einer Datei gekürzt.",
-	"insertFinalNewline": "Bei Aktivierung wird beim Speichern einer Datei eine abschließende neue Zeile am Dateiende eingefügt.",
-	"trimFinalNewlines": "Wenn diese Option aktiviert ist, werden beim Speichern alle neuen Zeilen nach der abschließenden neuen Zeile am Dateiende gekürzt.",
-	"files.autoSave.off": "Eine geänderte Datei wird nie automatisch gespeichert.",
-	"files.autoSave.afterDelay": "Eine geänderte Datei wird automatisch nach der konfigurierten \"files.autoSaveDelay\" gespeichert.",
-	"files.autoSave.onFocusChange": "Eine geänderte Datei wird automatisch gespeichert, wenn der Editor den Fokus verliert.",
-	"files.autoSave.onWindowChange": "Eine geänderte Datei wird automatisch gespeichert, wenn das Fenster den Fokus verliert.",
-	"autoSave": "Steuert die automatische Speicherung geänderter Dateien. Zulässige Werte: \"{0}\", \"{1}\", \"{2}\" (Editor verliert den Fokus), \"{3}\" (Fenster verliert den Fokus). Wenn diese Angabe auf \"{4}\" festgelegt ist, können Sie die Verzögerung in \"files.autoSaveDelay\" konfigurieren.",
-	"autoSaveDelay": "Steuert die Verzögerung in Millisekunden, nach der eine geänderte Datei automatisch gespeichert wird. Nur gültig, wenn \"files.autoSave\" auf \"{0}\" festgelegt ist.",
-	"watcherExclude": "Konfigurieren Sie Globmuster von Dateipfaden, die von der Dateiüberwachung ausgeschlossen werden sollen. Muster müssen in absoluten Pfaden übereinstimmen (d. h. für eine korrekte Überstimmung muss das Präfix ** oder der vollständige Pfad verwendet werden). Das Ändern dieser Einstellung erfordert einen Neustart. Wenn Ihr Code beim Start viel CPU-Zeit beansprucht, können Sie große Ordner ausschließen, um die anfängliche Last zu verringern.",
-	"hotExit.off": "Hot Exit deaktivieren.",
-	"hotExit.onExit": "Hot Exit wird beim Schließen der Anwendung ausgelöst, d. h. wenn unter Windows/Linux das letzte Fenster geschlossen wird oder wenn der Befehl \"workbench.action.quit\" ausgelöst wird (Befehlspalette, Tastenzuordnung, Menü). Alle Fenster mit Sicherungen werden beim nächsten Start wiederhergestellt.",
-	"hotExit.onExitAndWindowClose": "Hot Exit wird beim Schließen der Anwendung, d. h. wenn unter Windows/Linux das letzte Fenster geschlossen wird, oder beim Auslösen des Befehls \"workbench.action.quit\" (Befehlspalette, Tastenzuordnung, Menü) sowie für jedes Fenster mit einem geöffneten Ordner ausgelöst, unabhängig davon, ob es das letzte Fenster ist. Alle Fenster ohne geöffnete Ordner werden beim nächsten Start wiederhergestellt. Legen Sie window.restoreWindows auf \"all\" fest, um Ordnerfenster im Zustand vor dem Herunterfahren wiederherzustellen. ",
-	"hotExit": "Steuert, ob nicht gespeicherten Dateien zwischen den Sitzungen beibehlten werden, die Aufforderung zum Speichern wird beim Beenden des Editors übersprungen.",
-	"useExperimentalFileWatcher": "Verwenden Sie die neue experimentelle Dateiüberwachung.",
-	"defaultLanguage": "Der Standardsprachmodus, der neuen Dateien zugewiesen wird.",
-	"maxMemoryForLargeFilesMB": "Steuert den für VS Code verfügbaren Arbeitsspeicher nach einem Neustart beim Versuch, große Dateien zu öffnen. Gleiche Auswirkung wie beim Festlegen von --max-memory=NEWSIZE in der Befehlszeile.",
-	"editorConfigurationTitle": "Editor",
-	"formatOnSave": "Hiermit wird eine Datei beim Speichern formatiert. Es muss ein Formatierer vorhanden sein, die Datei darf nicht automatisch gespeichert werden, und der Editor darf nicht geschlossen werden.",
-	"formatOnSaveTimeout": "Zeitüberschreitung beim Formatieren während des Speicherns. Legt eine Zeitbegrenzung in Millisekunden für formatOnSave-Befehle fest. Befehle, die länger dauern als die festgelegte Zeitüberschreitung, werden abgebrochen. ",
-	"explorerConfigurationTitle": "Datei-Explorer",
-	"openEditorsVisible": "Die Anzahl der Editoren, die im Bereich \"Geöffnete Editoren\" angezeigt werden.",
-	"autoReveal": "Steuert, ob der Explorer Dateien beim Öffnen automatisch anzeigen und auswählen soll.",
-	"enableDragAndDrop": "Steuert, ob der Explorer das Verschieben von Dateien und Ordnern mithilfe von Drag  Drop zulassen soll.",
-	"confirmDragAndDrop": "Steuert, ob der Explorer um Bestätigung bittet, um Dateien und Ordner per Drag & Drop zu verschieben.",
-	"confirmDelete": "Steuert, ob der Explorer um Bestätigung bitten soll, wenn Sie eine Datei über den Papierkorb löschen.",
-	"sortOrder.default": "Dateien und Ordner werden nach ihren Namen in alphabetischer Reihenfolge sortiert. Ordner werden vor Dateien angezeigt. ",
-	"sortOrder.mixed": "Dateien und Ordner werden nach ihren Namen in alphabetischer Reihenfolge sortiert. Dateien und Ordner werden vermischt angezeigt.",
-	"sortOrder.filesFirst": "Dateien und Ordner werden nach ihren Namen in alphabetischer Reihenfolge sortiert. Dateien werden vor Ordnern angezeigt.",
-	"sortOrder.type": "Dateien und Ordner werden nach ihren Erweiterungen in alphabetischer Reihenfolge sortiert. Ordner werden vor Dateien angezeigt.",
-	"sortOrder.modified": "Dateien und Ordner werden nach dem letzten Änderungsdatum in absteigender Reihenfolge sortiert. Ordner werden vor Dateien angezeigt.",
-	"sortOrder": "Steuert die Sortierreihenfolge von Dateien und Ordnern im Explorer. Zusätzlich zur Standardsortierreihenfolge können Sie die Reihenfolge auf \"mixed\" (kombinierte Sortierung von Dateien und Ordnern), \"type\" (nach Dateityp), \"modified\" (nach letztem Änderungsdatum) oder \"filesFirst\" (Dateien vor Ordnern anzeigen) festlegen.",
-	"explorer.decorations.colors": "Steuert, ob Dateidekorationen Farben verwenden.",
-	"explorer.decorations.badges": "Steuert, ob Dateidekorationen Badges verwenden."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json b/i18n/deu/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json
deleted file mode 100644
index fa18bc6bf78..00000000000
--- a/i18n/deu/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"userGuide": "Verwenden Sie die Aktionen in der Editor-Symbolleiste, um Ihre Änderungen rückgängig zu machen oder den Inhalt auf dem Datenträger mit Ihren Änderungen zu überschreiben.",
-	"staleSaveError": "Fehler beim Speichern von \"{0}\": Der Inhalt auf dem Datenträger ist neuer. Vergleichen Sie Ihre Version mit der Version auf dem Datenträger.",
-	"retry": "Wiederholen",
-	"discard": "Verwerfen",
-	"readonlySaveErrorAdmin": "Fehler beim Speichern von '{0}': Datei ist schreibgeschützt. 'Als Admin überschreiben' auswählen, um den Vorgang als Administrator zu wiederholen. ",
-	"readonlySaveError": "Fehler beim Speichern von '{0}': Datei ist schreibgeschützt. Wählen Sie 'Überschreiben' aus, um den Schutz aufzuheben.",
-	"permissionDeniedSaveError": "Fehler beim Speichern von '{0}': Unzureichende Zugriffsrechte. Wählen Sie 'Als Admin wiederholen' aus, um den Vorgang als Admin zu wiederholen.",
-	"genericSaveError": "Fehler beim Speichern von \"{0}\": {1}.",
-	"learnMore": "Weitere Informationen",
-	"dontShowAgain": "Nicht mehr anzeigen",
-	"compareChanges": "Vergleichen",
-	"saveConflictDiffLabel": "{0} (auf Datenträger) ↔ {1} (in {2}): Speicherkonflikt lösen",
-	"overwriteElevated": "Als Admin überschreiben...",
-	"saveElevated": "Als Admin wiederholen...",
-	"overwrite": "Überschreiben"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/files/electron-browser/views/emptyView.i18n.json b/i18n/deu/src/vs/workbench/parts/files/electron-browser/views/emptyView.i18n.json
deleted file mode 100644
index 57a8728afc2..00000000000
--- a/i18n/deu/src/vs/workbench/parts/files/electron-browser/views/emptyView.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noWorkspace": "Es ist kein Ordner geöffnet.",
-	"explorerSection": "Datei-Explorer-Abschnitt",
-	"noWorkspaceHelp": "Sie haben noch keinen Ordner zum Arbeitsbereich hinzugefügt.",
-	"addFolder": "Ordner hinzufügen",
-	"noFolderHelp": "Sie haben noch keinen Ordner geöffnet.",
-	"openFolder": "Ordner öffnen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/files/electron-browser/views/explorerDecorationsProvider.i18n.json b/i18n/deu/src/vs/workbench/parts/files/electron-browser/views/explorerDecorationsProvider.i18n.json
deleted file mode 100644
index 11569de2aad..00000000000
--- a/i18n/deu/src/vs/workbench/parts/files/electron-browser/views/explorerDecorationsProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"label": "Explorer",
-	"canNotResolve": "Arbeitsbereichsordner kann nicht aufgelöst werden.",
-	"symbolicLlink": "Symbolischer Link"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/files/electron-browser/views/explorerView.i18n.json b/i18n/deu/src/vs/workbench/parts/files/electron-browser/views/explorerView.i18n.json
deleted file mode 100644
index 66f34911f73..00000000000
--- a/i18n/deu/src/vs/workbench/parts/files/electron-browser/views/explorerView.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"explorerSection": "Datei-Explorer-Abschnitt",
-	"treeAriaLabel": "Datei-Explorer"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json b/i18n/deu/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
deleted file mode 100644
index 89c8d9fa907..00000000000
--- a/i18n/deu/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"fileInputAriaLabel": "Geben Sie den Dateinamen ein. Drücken Sie zur Bestätigung die EINGABETASTE oder ESC, um den Vorgang abzubrechen.",
-	"createFileFromExplorerInfoMessage": "Datei **{0}** in **{1}** erstellen",
-	"renameFileFromExplorerInfoMessage": "Verschieben und in **{0}** umbenennen",
-	"createFolderFromExplorerInfoMessage": "Ordner **{0}** in **{1}** erstellen",
-	"filesExplorerViewerAriaLabel": "{0}, Datei-Explorer",
-	"dropFolders": "Möchten Sie die Ordner zum Arbeitsbereich hinzufügen?",
-	"dropFolder": "Möchten Sie den Ordner zum Arbeitsbereich hinzufügen?",
-	"addFolders": "&&Ordner hinzufügen",
-	"addFolder": "&&Ordner hinzufügen",
-	"confirmRootsMove": "Möchten Sie die Reihenfolge mehrerer Stammordner in Ihrem Arbeitsbereich ändern?",
-	"confirmMultiMove": "Möchten Sie die folgenden {0} Dateien verschieben?",
-	"confirmRootMove": "Möchten Sie die Reihenfolge des Stammordners \"{0}\" in Ihrem Arbeitsbereich ändern?",
-	"confirmMove": "Möchten Sie \"{0}\" wirklich verschieben?",
-	"doNotAskAgain": "Nicht erneut fragen",
-	"moveButtonLabel": "&&Verschieben",
-	"confirmOverwriteMessage": "{0} ist im Zielordner bereits vorhanden. Möchten Sie das Element ersetzen?",
-	"irreversible": "Diese Aktion kann nicht rückgängig gemacht werden.",
-	"replaceButtonLabel": "&&Ersetzen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json b/i18n/deu/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json
deleted file mode 100644
index 518f83fa0bd..00000000000
--- a/i18n/deu/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openEditors": "Geöffnete Editoren",
-	"openEditosrSection": "Abschnitt \"Geöffnete Editoren\"",
-	"dirtyCounter": "{0} nicht gespeichert"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/files/electron-browser/views/openEditorsViewer.i18n.json b/i18n/deu/src/vs/workbench/parts/files/electron-browser/views/openEditorsViewer.i18n.json
deleted file mode 100644
index aebc7895072..00000000000
--- a/i18n/deu/src/vs/workbench/parts/files/electron-browser/views/openEditorsViewer.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"editorGroupAriaLabel": "{0}, Editor-Gruppe",
-	"openEditorAriaLabel": "{0}, geöffnete Editoren",
-	"saveAll": "Alle speichern",
-	"closeAllUnmodified": "Nicht geänderte schließen",
-	"closeAll": "Alle schließen",
-	"compareWithSaved": "Mit gespeicherter Datei vergleichen",
-	"close": "Schließen",
-	"closeOthers": "Andere schließen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/git/browser/gitActions.contribution.i18n.json b/i18n/deu/src/vs/workbench/parts/git/browser/gitActions.contribution.i18n.json
deleted file mode 100644
index c909bfa8df3..00000000000
--- a/i18n/deu/src/vs/workbench/parts/git/browser/gitActions.contribution.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"switchToChangesView": "Zur Änderungsansicht wechseln",
-	"openInEditor": "Zur Editor-Ansicht wechseln",
-	"workbenchStage": "Phase",
-	"workbenchUnstage": "Bereitstellung aufheben",
-	"stageSelectedLines": "Ausgewählte Zeilen bereitstellen",
-	"unstageSelectedLines": "Bereitstellung ausgewählter Zeilen aufheben",
-	"revertSelectedLines": "Gewählte Zeilen zurücksetzen",
-	"confirmRevertMessage": "Möchten Sie die ausgewählten Änderungen wirklich zurücksetzen?",
-	"irreversible": "Diese Aktion kann nicht rückgängig gemacht werden.",
-	"revertChangesLabel": "&&Änderungen zurücksetzen",
-	"openChange": "Änderung öffnen",
-	"openFile": "Datei öffnen",
-	"git": "Git"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/git/browser/gitActions.i18n.json b/i18n/deu/src/vs/workbench/parts/git/browser/gitActions.i18n.json
deleted file mode 100644
index a1d1ecd21e0..00000000000
--- a/i18n/deu/src/vs/workbench/parts/git/browser/gitActions.i18n.json
+++ /dev/null
@@ -1,46 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"openChange": "Änderung öffnen",
-	"openFile": "Datei öffnen",
-	"init": "Init",
-	"refresh": "Aktualisieren",
-	"stageChanges": "Phase",
-	"stageAllChanges": "Alle bereitstellen",
-	"confirmUndoMessage": "Möchten Sie alle Änderungen bereinigen?",
-	"confirmUndoAllOne": "Es sind nicht bereitgestellte Änderungen in {0} Datei vorhanden.\n\nDiese Aktion kann nicht rückgängig gemacht werden.",
-	"confirmUndoAllMultiple": "Es sind Änderungen in {0} Dateien vorhanden, deren Bereitstellung nicht aufgehoben wurde.\n\nDiese Aktion kann nicht rückgängig gemacht werden.",
-	"cleanChangesLabel": "&&Änderungen bereinigen",
-	"confirmUndo": "Sollen die Änderungen in \"{0}\" bereinigt werden?",
-	"irreversible": "Diese Aktion kann nicht rückgängig gemacht werden.",
-	"undoChanges": "Bereinigen",
-	"undoAllChanges": "Alle bereinigen",
-	"unstage": "Bereitstellung aufheben",
-	"unstageAllChanges": "Bereitstellung für alle aufheben",
-	"dirtyTreeCheckout": "Auschecken nicht möglich. Sie müssen für Ihre Arbeit zunächst einen Commit oder einen Stash ausführen.",
-	"commitStaged": "Commit bereitgestellt",
-	"commitStagedAmend": "Gestaffelt committen (Ändern)",
-	"commitStagedSignedOff": "Gestaffelt committen (abgemeldet)",
-	"commit": "Commit",
-	"commitMessage": "Commit der Nachricht",
-	"commitAll": "Commit für alle ausführen",
-	"commitAllSignedOff": "Alle committen (abgemeldet)",
-	"commitAll2": "Commit für alle ausführen",
-	"commitStaged2": "Commit bereitgestellt",
-	"dirtyTreePull": "Pull nicht möglich. Sie müssen für Ihre Arbeit zunächst einen Commit oder einen Stash ausführen.",
-	"authFailed": "Fehler bei der Authentifizierung für den Git-Remotespeicherort.",
-	"pushToRemote": "Push zu...",
-	"pushToRemotePickMessage": "Remoteauswahl zum Pushen des Branches \"{0}\":",
-	"publish": "Veröffentlichen",
-	"confirmPublishMessage": "Möchten Sie \"{0}\" unter \"{1}\" veröffentlichen?",
-	"confirmPublishMessageButton": "&&Veröffentlichen",
-	"publishPickMessage": "Remotespeicherort auswählen, an dem der Branch \"{0}\" veröffentlicht wird:",
-	"sync is unpredictable": "Mit dieser Aktion werden Commits per Push und Pull an und von \"{0}\" übertragen.",
-	"ok": "OK",
-	"cancel": "Abbrechen",
-	"never again": "OK, nicht mehr anzeigen",
-	"undoLastCommit": "Letzten Commit rückgängig machen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/git/browser/gitQuickOpen.i18n.json b/i18n/deu/src/vs/workbench/parts/git/browser/gitQuickOpen.i18n.json
deleted file mode 100644
index 6cca126b03b..00000000000
--- a/i18n/deu/src/vs/workbench/parts/git/browser/gitQuickOpen.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"refAriaLabel": "{0}, Git",
-	"checkoutBranch": "Branch unter {0}",
-	"checkoutRemoteBranch": "Remotebranch unter {0}",
-	"checkoutTag": "Tag bei {0}",
-	"alreadyCheckedOut": "Branch {0} ist bereits der aktuelle Branch.",
-	"branchAriaLabel": "{0}, Git-Branch",
-	"createBranch": "Branch {0} erstellen",
-	"noBranches": "Keine anderen Branches",
-	"notValidBranchName": "Bitte geben Sie einen gültigen Branchnamen an."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/git/browser/gitServices.i18n.json b/i18n/deu/src/vs/workbench/parts/git/browser/gitServices.i18n.json
deleted file mode 100644
index 979b622a66d..00000000000
--- a/i18n/deu/src/vs/workbench/parts/git/browser/gitServices.i18n.json
+++ /dev/null
@@ -1,30 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"cantOpen": "Diese Git-Ressource kann nicht geöffnet werden.",
-	"gitIndexChanges": "{0} (index) ↔ {1}",
-	"gitIndexChangesDesc": "{0} – Änderungen am Index",
-	"gitIndexChangesRenamed": "{0} ← {1}",
-	"gitIndexChangesRenamedDesc": "{0} – Umbenannt – Änderungen für Index",
-	"workingTreeChanges": "{0} (HEAD) ↔ {1}",
-	"workingTreeChangesDesc": "{0} – Änderungen am Arbeitsbaum",
-	"gitMergeChanges": "{0} (merge) ↔ {1}",
-	"gitMergeChangesDesc": "{0} – Änderungen mergen",
-	"updateGit": "Git {0} scheint installiert zu sein. Code funktioniert am besten mit Git >= 2.0.0.",
-	"download": "Herunterladen",
-	"neverShowAgain": "Nicht mehr anzeigen",
-	"configureUsernameEmail": "Konfigurieren Sie Ihren Git-Benutzernamen und Ihre E-Mail-Adresse.",
-	"badConfigFile": "Git {0}",
-	"unmergedChanges": "Sie müssen nicht zusammengeführte Änderungen lösen, bevor Sie Ihre Änderungen bestätigen.",
-	"showOutput": "Ausgabe anzeigen",
-	"cancel": "Abbrechen",
-	"checkNativeConsole": "Fehler beim Ausführen eines Git-Vorgangs. Bitte überprüfen Sie die Ausgabe, oder verwenden Sie eine Konsole, um den Repositorystatus zu überprüfen.",
-	"changesFromIndex": "{0} (index)",
-	"changesFromIndexDesc": "{0} – Änderungen am Index",
-	"changesFromTree": "{0} ({1})",
-	"changesFromTreeDesc": "{0} – Änderungen in {1}",
-	"cantOpenResource": "Diese Git-Ressource kann nicht geöffnet werden."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/git/browser/gitWidgets.i18n.json b/i18n/deu/src/vs/workbench/parts/git/browser/gitWidgets.i18n.json
deleted file mode 100644
index c6583f7eb7a..00000000000
--- a/i18n/deu/src/vs/workbench/parts/git/browser/gitWidgets.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"publishBranch": "Branch veröffentlichen",
-	"syncBranch": "Änderungen synchronisieren",
-	"gitNotEnabled": "Git ist in diesem Arbeitsbereich nicht aktiviert."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/git/browser/gitWorkbenchContributions.i18n.json b/i18n/deu/src/vs/workbench/parts/git/browser/gitWorkbenchContributions.i18n.json
deleted file mode 100644
index 37a9378230d..00000000000
--- a/i18n/deu/src/vs/workbench/parts/git/browser/gitWorkbenchContributions.i18n.json
+++ /dev/null
@@ -1,23 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"gitProgressBadge": "Ausführungsstatus Git",
-	"gitPendingChangesBadge": "{0} ausstehende Änderungen",
-	"toggleGitViewlet": "Git anzeigen",
-	"git": "Git",
-	"view": "Anzeigen",
-	"gitCommands": "Git-Befehle",
-	"gitConfigurationTitle": "Git",
-	"gitEnabled": "Ist für Git aktiviert",
-	"gitPath": "Der Pfad zur ausführbaren Git-Datei.",
-	"gitAutoRefresh": "Gibt an, ob die automatische Aktualisierung aktiviert ist.",
-	"gitAutoFetch": "Gibt an, ob automatischer Abruf aktiviert ist.",
-	"gitLongCommit": "Gibt an, ob Warnungen zu langen Commitnachrichten erfolgen sollen.",
-	"gitLargeRepos": "Die Verwaltung großer Repositorys durch Code immer zulassen.",
-	"confirmSync": "Vor dem Synchronisieren von Git-Repositorys bestätigen.",
-	"countBadge": "Steuert die Git-Badgeanzahl.",
-	"checkoutType": "Steuert, welcher Branchtyp aufgelistet wird."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/git/browser/views/changes/changesView.i18n.json b/i18n/deu/src/vs/workbench/parts/git/browser/views/changes/changesView.i18n.json
deleted file mode 100644
index fc1c72a417c..00000000000
--- a/i18n/deu/src/vs/workbench/parts/git/browser/views/changes/changesView.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"needMessage": "Geben Sie eine Commit-Meldung an. Sie können jederzeit **{0}** drücken, um einen Commit für die Änderungen auszuführen. Wenn bereitgestellte Änderungen vorliegen, wird nur für diese ein Commit ausgeführt; andernfalls für alle Änderungen.",
-	"nothingToCommit": "Sobald Änderungen für einen Commit vorliegen, geben Sie die Commit-Meldung ein, und drücken Sie **{0}**, um den Commit für die Änderungen auszuführen. Wenn bereitgestellte Änderungen vorliegen, wird nur für diese ein Commit ausgeführt; andernfalls für alle Änderungen.",
-	"longCommit": "Es wird empfohlen, dass die erste Zeile des Commits weniger als 50 Zeichen lang ist. Sie können weitere Zeilen für zusätzliche Informationen verwenden.",
-	"commitMessage": "Nachricht (drücken Sie {0}, um den Commit auszuführen)",
-	"commitMessageAriaLabel": "Git: Geben Sie die Commitnachricht ein, und drücken Sie {0}, um den Commit auszuführen.",
-	"treeAriaLabel": "Ansicht \"Git-Änderungen\"",
-	"showOutput": "Git-Ausgabe anzeigen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/git/browser/views/changes/changesViewer.i18n.json b/i18n/deu/src/vs/workbench/parts/git/browser/views/changes/changesViewer.i18n.json
deleted file mode 100644
index 23ab58d89a2..00000000000
--- a/i18n/deu/src/vs/workbench/parts/git/browser/views/changes/changesViewer.i18n.json
+++ /dev/null
@@ -1,38 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"stagedChanges": "Bereitgestellte Änderungen",
-	"allChanges": "Änderungen",
-	"mergeChanges": "Änderungen zusammenführen",
-	"outsideOfWorkspace": "Diese Datei befindet sich außerhalb des aktuellen Arbeitsbereichs.",
-	"modified-char": "M",
-	"added-char": "A",
-	"deleted-char": "D",
-	"renamed-char": "R",
-	"copied-char": "C",
-	"untracked-char": "U",
-	"ignored-char": "!",
-	"title-index-modified": "Im Index geändert",
-	"title-modified": "Geändert am",
-	"title-index-added": "Zum Index hinzugefügt",
-	"title-index-deleted": "Aus dem Index gelöscht",
-	"title-deleted": "Gelöscht",
-	"title-index-renamed": "Im Index umbenannt",
-	"title-index-copied": "In den Index kopiert",
-	"title-untracked": "Nicht verfolgt",
-	"title-ignored": "Ignoriert",
-	"title-conflict-both-deleted": "Konflikt: beide gelöscht",
-	"title-conflict-added-by-us": "Konflikt: hinzugefügt von uns",
-	"title-conflict-deleted-by-them": "Konflikt: gelöscht von diesen",
-	"title-conflict-added-by-them": "Konflikt: hinzugefügt von diesen",
-	"title-conflict-deleted-by-us": "Konflikt: gelöscht von uns",
-	"title-conflict-both-added": "Konflikt: beide hinzugefügt",
-	"title-conflict-both-modified": "Konflikt: beide geändert",
-	"fileStatusAriaLabel": "Die Datei \"{0}\" im Ordner \"{1}\" weist den Status {2} auf, Git.",
-	"ariaLabelStagedChanges": "Gestaffelte Änderungen, Git",
-	"ariaLabelChanges": "Änderungen, Git",
-	"ariaLabelMerge": "Mergen, Git"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/git/browser/views/disabled/disabledView.i18n.json b/i18n/deu/src/vs/workbench/parts/git/browser/views/disabled/disabledView.i18n.json
deleted file mode 100644
index 345c56202bb..00000000000
--- a/i18n/deu/src/vs/workbench/parts/git/browser/views/disabled/disabledView.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"disabled": "Git ist in den Einstellungen deaktiviert."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/git/browser/views/empty/emptyView.i18n.json b/i18n/deu/src/vs/workbench/parts/git/browser/views/empty/emptyView.i18n.json
deleted file mode 100644
index 8be23c59531..00000000000
--- a/i18n/deu/src/vs/workbench/parts/git/browser/views/empty/emptyView.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"noGit": "Dieser Arbeitsbereich unterliegt noch nicht der Git-Quellcodeverwaltung.",
-	"gitinit": "Git-Repository initialisieren"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/git/browser/views/gitless/gitlessView.i18n.json b/i18n/deu/src/vs/workbench/parts/git/browser/views/gitless/gitlessView.i18n.json
deleted file mode 100644
index 16be50d3b81..00000000000
--- a/i18n/deu/src/vs/workbench/parts/git/browser/views/gitless/gitlessView.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"macInstallWith": "Sie können die Anwendung mit {0} installieren, von {1} herunterladen oder die Befehlszeilen-Entwicklertools von {2} installieren, indem Sie einfach {3} in einer Terminaleingabeaufforderung eingeben.",
-	"winInstallWith": "Sie können die Anwendung mit {0} installieren oder von {1} herunterladen.",
-	"linuxDownloadFrom": "Sie können die Anwendung von {0} herunterladen.",
-	"downloadFrom": "Sie können die Anwendung von {0} herunterladen.",
-	"looksLike": "Git scheint auf Ihrem System nicht installiert zu sein.",
-	"pleaseRestart": "Starten Sie VSCode nach der Installation von Git neu."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/git/browser/views/huge/hugeView.i18n.json b/i18n/deu/src/vs/workbench/parts/git/browser/views/huge/hugeView.i18n.json
deleted file mode 100644
index 249154a9fc3..00000000000
--- a/i18n/deu/src/vs/workbench/parts/git/browser/views/huge/hugeView.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"huge": "Das Repository scheint viele aktive Änderungen aufzuweisen.\nDies kann bewirken, dass Code sehr langsam wird.",
-	"setting": "Sie können diese Warnung mit der folgenden Einstellung dauerhaft deaktivieren:",
-	"allo": "Große Repositorys zulassen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/git/browser/views/notroot/notrootView.i18n.json b/i18n/deu/src/vs/workbench/parts/git/browser/views/notroot/notrootView.i18n.json
deleted file mode 100644
index 52846e587c7..00000000000
--- a/i18n/deu/src/vs/workbench/parts/git/browser/views/notroot/notrootView.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"wrongRoot": "Dieses Verzeichnis scheint in einem Git-Repository enthalten zu sein.",
-	"pleaseRestart": "Öffnen Sie das Stammverzeichnis des Repositorys, um auf Git-Features zuzugreifen."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/git/browser/views/noworkspace/noworkspaceView.i18n.json b/i18n/deu/src/vs/workbench/parts/git/browser/views/noworkspace/noworkspaceView.i18n.json
deleted file mode 100644
index 4a8db28973c..00000000000
--- a/i18n/deu/src/vs/workbench/parts/git/browser/views/noworkspace/noworkspaceView.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"noWorkspaceHelp": "Sie haben noch keinen Ordner geöffnet.",
-	"pleaseRestart": "Öffnen Sie einen Ordner mit einem Git-Repository, um auf Git-Features zuzugreifen.",
-	"openFolder": "Ordner öffnen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/git/electron-browser/git.contribution.i18n.json b/i18n/deu/src/vs/workbench/parts/git/electron-browser/git.contribution.i18n.json
deleted file mode 100644
index 1dc845e2017..00000000000
--- a/i18n/deu/src/vs/workbench/parts/git/electron-browser/git.contribution.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"toggleSCMViewlet": "SCM anzeigen",
-	"git": "Git"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/git/electron-browser/gitActions.i18n.json b/i18n/deu/src/vs/workbench/parts/git/electron-browser/gitActions.i18n.json
deleted file mode 100644
index 40a209d8c04..00000000000
--- a/i18n/deu/src/vs/workbench/parts/git/electron-browser/gitActions.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"valid": "Geben Sie eine gültige URL für das Git-Repository an.",
-	"url": "Repository-URL",
-	"directory": "Zielklonverzeichnis",
-	"cloning": "Das Repository \"{0}\" wird geklont...",
-	"already exists": "Das Zielverzeichnis ist bereits vorhanden, wählen Sie ein anderes Verzeichnis für den Klonvorgang aus."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/git/electron-main/askpassService.i18n.json b/i18n/deu/src/vs/workbench/parts/git/electron-main/askpassService.i18n.json
deleted file mode 100644
index 06ad0299d48..00000000000
--- a/i18n/deu/src/vs/workbench/parts/git/electron-main/askpassService.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"git": "Git"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/git/node/git.lib.i18n.json b/i18n/deu/src/vs/workbench/parts/git/node/git.lib.i18n.json
deleted file mode 100644
index ccf03ee449d..00000000000
--- a/i18n/deu/src/vs/workbench/parts/git/node/git.lib.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"errorBuffer": "Datei aus Git kann nicht geöffnet werden.",
-	"fileBinaryError": "Die Datei scheint eine Binärdatei zu sein und kann nicht als Text geöffnet werden."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/html/browser/html.contribution.i18n.json b/i18n/deu/src/vs/workbench/parts/html/browser/html.contribution.i18n.json
deleted file mode 100644
index 755aaf46f80..00000000000
--- a/i18n/deu/src/vs/workbench/parts/html/browser/html.contribution.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"html.editor.label": "HTML-Vorschau"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/html/browser/htmlPreviewPart.i18n.json b/i18n/deu/src/vs/workbench/parts/html/browser/htmlPreviewPart.i18n.json
deleted file mode 100644
index 4a857815246..00000000000
--- a/i18n/deu/src/vs/workbench/parts/html/browser/htmlPreviewPart.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"html.voidInput": "Ungültige Editor-Eingabe."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/html/browser/webview.contribution.i18n.json b/i18n/deu/src/vs/workbench/parts/html/browser/webview.contribution.i18n.json
deleted file mode 100644
index 0c1f5497f13..00000000000
--- a/i18n/deu/src/vs/workbench/parts/html/browser/webview.contribution.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"developer": "Entwickler"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/html/browser/webview.i18n.json b/i18n/deu/src/vs/workbench/parts/html/browser/webview.i18n.json
deleted file mode 100644
index 62c53cd0661..00000000000
--- a/i18n/deu/src/vs/workbench/parts/html/browser/webview.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"devtools.webview": "Developer: Webview-Tools"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/html/browser/webviewCommands.i18n.json b/i18n/deu/src/vs/workbench/parts/html/browser/webviewCommands.i18n.json
deleted file mode 100644
index 80462854694..00000000000
--- a/i18n/deu/src/vs/workbench/parts/html/browser/webviewCommands.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"editor.action.webvieweditor.showFind": "Widget zum Anzeigen der Suche mit Fokus",
-	"openToolsLabel": "Webview-Entwicklertools öffnen",
-	"refreshWebviewLabel": "Webviews erneut laden"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json b/i18n/deu/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json
deleted file mode 100644
index 755aaf46f80..00000000000
--- a/i18n/deu/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"html.editor.label": "HTML-Vorschau"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json b/i18n/deu/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json
deleted file mode 100644
index 4a857815246..00000000000
--- a/i18n/deu/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"html.voidInput": "Ungültige Editor-Eingabe."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json b/i18n/deu/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json
deleted file mode 100644
index 0c1f5497f13..00000000000
--- a/i18n/deu/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"developer": "Entwickler"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json b/i18n/deu/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json
deleted file mode 100644
index 1492a37abd0..00000000000
--- a/i18n/deu/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openToolsLabel": "Webview-Entwicklertools öffnen",
-	"refreshWebviewLabel": "Webviews erneut laden"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json b/i18n/deu/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
deleted file mode 100644
index 6f978d7eda1..00000000000
--- a/i18n/deu/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"updateLocale": "Möchten Sie die Sprache der Benutzeroberfläche von VS Code in {0} ändern und einen Neustart durchführen?",
-	"yes": "Ja",
-	"no": "Nein",
-	"neverAgain": "Nicht mehr anzeigen",
-	"JsonSchema.locale": "Die zu verwendende Sprache der Benutzeroberfläche.",
-	"vscode.extension.contributes.localizations": "Trägt Lokalisierungen zum Editor bei",
-	"vscode.extension.contributes.localizations.languageId": "ID der Sprache, in die Anzeigezeichenfolgen übersetzt werden.",
-	"vscode.extension.contributes.localizations.languageName": "Englischer Name der Sprache.",
-	"vscode.extension.contributes.localizations.languageNameLocalized": "Name der Sprache in beigetragener Sprache.",
-	"vscode.extension.contributes.localizations.translations": "Liste der Übersetzungen, die der Sprache zugeordnet sind.",
-	"vscode.extension.contributes.localizations.translations.id": "ID von VS Code oder der Erweiterung, für die diese Übersetzung beigetragen wird. Die ID von VS Code ist immer \"vscode\", und die ID einer Erweiterung muss im Format \"publisherId.extensionName\" vorliegen.",
-	"vscode.extension.contributes.localizations.translations.id.pattern": "Die ID muss \"vscode\" sein oder im Format \"publisherId.extensionName\" vorliegen, um VS Code bzw. eine Erweiterung zu übersetzen.",
-	"vscode.extension.contributes.localizations.translations.path": "Ein relativer Pfad zu einer Datei mit Übersetzungen für die Sprache."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/localizations/browser/localizationsActions.i18n.json b/i18n/deu/src/vs/workbench/parts/localizations/browser/localizationsActions.i18n.json
deleted file mode 100644
index ecb522366f2..00000000000
--- a/i18n/deu/src/vs/workbench/parts/localizations/browser/localizationsActions.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"configureLocale": "Sprache konfigurieren",
-	"displayLanguage": "Definiert die Anzeigesprache von VSCode.",
-	"doc": "Unter {0} finden Sie eine Liste der unterstützten Sprachen.",
-	"restart": "Das Ändern dieses Wertes erfordert einen Neustart von VSCode.",
-	"fail.createSettings": "{0} ({1}) kann nicht erstellt werden."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/localizations/electron-browser/localizations.contribution.i18n.json b/i18n/deu/src/vs/workbench/parts/localizations/electron-browser/localizations.contribution.i18n.json
deleted file mode 100644
index a450d3a29c2..00000000000
--- a/i18n/deu/src/vs/workbench/parts/localizations/electron-browser/localizations.contribution.i18n.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"updateLocale": "Möchten Sie die Sprache der Benutzeroberfläche von VS Code in {0} ändern und einen Neustart durchführen?",
-	"activateLanguagePack": "Möchten Sie VS Code neu starten, um das soeben installierte Language Pack zu aktivieren?",
-	"yes": "Ja",
-	"no": "Nein",
-	"neverAgain": "Nicht mehr anzeigen",
-	"install language pack": "In naher Zukunft wird VS Code nur Sprachpakete in Form von Marketplace-Erweiterungen unterstützen. Installieren Sie die Erweiterung \"{0}\", damit Sie die derzeit konfigurierte Sprache weiter verwenden können.",
-	"install": "Installieren",
-	"more information": "Weitere Informationen …",
-	"JsonSchema.locale": "Die zu verwendende Sprache der Benutzeroberfläche.",
-	"vscode.extension.contributes.localizations": "Trägt Lokalisierungen zum Editor bei",
-	"vscode.extension.contributes.localizations.languageId": "ID der Sprache, in die Anzeigezeichenfolgen übersetzt werden.",
-	"vscode.extension.contributes.localizations.languageName": "Englischer Name der Sprache.",
-	"vscode.extension.contributes.localizations.languageNameLocalized": "Name der Sprache in beigetragener Sprache.",
-	"vscode.extension.contributes.localizations.translations": "Liste der Übersetzungen, die der Sprache zugeordnet sind.",
-	"vscode.extension.contributes.localizations.translations.id": "ID von VS Code oder der Erweiterung, für die diese Übersetzung beigetragen wird. Die ID von VS Code ist immer \"vscode\", und die ID einer Erweiterung muss im Format \"publisherId.extensionName\" vorliegen.",
-	"vscode.extension.contributes.localizations.translations.id.pattern": "Die ID muss \"vscode\" sein oder im Format \"publisherId.extensionName\" vorliegen, um VS Code bzw. eine Erweiterung zu übersetzen.",
-	"vscode.extension.contributes.localizations.translations.path": "Ein relativer Pfad zu einer Datei mit Übersetzungen für die Sprache."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/localizations/electron-browser/localizationsActions.i18n.json b/i18n/deu/src/vs/workbench/parts/localizations/electron-browser/localizationsActions.i18n.json
deleted file mode 100644
index e54226aa424..00000000000
--- a/i18n/deu/src/vs/workbench/parts/localizations/electron-browser/localizationsActions.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"configureLocale": "Anzeigesprache konfigurieren",
-	"displayLanguage": "Definiert die Anzeigesprache von VSCode.",
-	"doc": "Unter {0} finden Sie eine Liste der unterstützten Sprachen.",
-	"restart": "Das Ändern dieses Wertes erfordert einen Neustart von VSCode.",
-	"fail.createSettings": "{0} ({1}) kann nicht erstellt werden."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json b/i18n/deu/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json
deleted file mode 100644
index 2d9f1d89efa..00000000000
--- a/i18n/deu/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"mainLog": "Protokoll (Haupt)",
-	"sharedLog": "Protokoll (freigegeben)",
-	"rendererLog": "Protokoll (Fenster)",
-	"extensionsLog": "Protokoll (Erweiterungshost)",
-	"developer": "Entwickler"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json b/i18n/deu/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json
deleted file mode 100644
index 0b0f4d7c9c6..00000000000
--- a/i18n/deu/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openLogsFolder": "Protokollordner öffnen",
-	"showLogs": "Protokolle anzeigen...",
-	"rendererProcess": "Fenster ({0})",
-	"emptyWindow": "Fenster",
-	"extensionHost": "Erweiterungshost",
-	"sharedProcess": "Freigegeben",
-	"mainProcess": "Haupt",
-	"selectProcess": "Protokoll für Prozess auswählen",
-	"openLogFile": "Protokolldatei öffnen …",
-	"setLogLevel": "Protokollstufe festlegen…",
-	"trace": "Nachverfolgen",
-	"debug": "Debuggen",
-	"info": "Info",
-	"warn": "Warnung",
-	"err": "Fehler",
-	"critical": "Kritisch",
-	"off": "Aus",
-	"selectLogLevel": "Protokollstufe auswählen",
-	"default and current": "Standard und aktuell",
-	"default": "Standard",
-	"current": "Aktuell"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/markers/browser/markersFileDecorations.i18n.json b/i18n/deu/src/vs/workbench/parts/markers/browser/markersFileDecorations.i18n.json
deleted file mode 100644
index 8a10d218183..00000000000
--- a/i18n/deu/src/vs/workbench/parts/markers/browser/markersFileDecorations.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"label": "Probleme",
-	"tooltip.1": "1 Problem in dieser Datei",
-	"tooltip.N": "{0} Probleme in dieser Datei",
-	"markers.showOnFile": "Fehler & Warnungen auf Dateien und Ordnern anzeigen."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/markers/browser/markersPanel.i18n.json b/i18n/deu/src/vs/workbench/parts/markers/browser/markersPanel.i18n.json
deleted file mode 100644
index 3926e145e99..00000000000
--- a/i18n/deu/src/vs/workbench/parts/markers/browser/markersPanel.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"totalProblems": "Insgesamt {0} Probleme",
-	"filteredProblems": "Zeigt {0} von {1} Problemen an"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/markers/common/markers.i18n.json b/i18n/deu/src/vs/workbench/parts/markers/common/markers.i18n.json
deleted file mode 100644
index 3926e145e99..00000000000
--- a/i18n/deu/src/vs/workbench/parts/markers/common/markers.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"totalProblems": "Insgesamt {0} Probleme",
-	"filteredProblems": "Zeigt {0} von {1} Problemen an"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/markers/common/messages.i18n.json b/i18n/deu/src/vs/workbench/parts/markers/common/messages.i18n.json
deleted file mode 100644
index 08feefc0086..00000000000
--- a/i18n/deu/src/vs/workbench/parts/markers/common/messages.i18n.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"viewCategory": "Anzeigen",
-	"problems.view.toggle.label": "Probleme umschalten (Fehler, Warnungen, Informationen)",
-	"problems.view.focus.label": "Probleme fokussieren (Fehler, Warnungen, Informationen)",
-	"problems.panel.configuration.title": "Ansicht \"Probleme\"",
-	"problems.panel.configuration.autoreveal": "Steuert, ob die Ansicht \"Probleme\" automatisch Dateien anzeigen sollte, wenn diese geöffnet werden.",
-	"markers.panel.title.problems": "Probleme",
-	"markers.panel.aria.label.problems.tree": "Probleme nach Dateien gruppiert",
-	"markers.panel.no.problems.build": "Es wurden bisher keine Probleme im Arbeitsbereich erkannt.",
-	"markers.panel.no.problems.filters": "Es wurden keine Ergebnisse mit den angegebenen Filterkriterien gefunden.",
-	"markers.panel.action.filter": "Probleme filtern",
-	"markers.panel.filter.placeholder": "Nach Typ oder Text filtern",
-	"markers.panel.filter.errors": "Fehler",
-	"markers.panel.filter.warnings": "Warnungen",
-	"markers.panel.filter.infos": "Informationen",
-	"markers.panel.single.error.label": "1 Fehler",
-	"markers.panel.multiple.errors.label": "{0} Fehler",
-	"markers.panel.single.warning.label": "1 Warnung",
-	"markers.panel.multiple.warnings.label": "{0} Warnungen",
-	"markers.panel.single.info.label": "1 Information",
-	"markers.panel.multiple.infos.label": "{0}-Informationen",
-	"markers.panel.single.unknown.label": "1 Unbekannte",
-	"markers.panel.multiple.unknowns.label": "{0} Unbekannte",
-	"markers.panel.at.ln.col.number": "({0}, {1})",
-	"problems.tree.aria.label.resource": "{0} mit {1} Problemen",
-	"problems.tree.aria.label.error.marker": "Von \"{0}\" generierter Fehler: \"{1}\" in Zeile {2} bei Zeichen {3}",
-	"problems.tree.aria.label.error.marker.nosource": "Fehler: \"{0}\" in Zeile {1} bei Zeichen {2}",
-	"problems.tree.aria.label.warning.marker": "Von \"{0}\" generierte Warnung: \"{1}\" in Zeile {2} bei Zeichen {3}",
-	"problems.tree.aria.label.warning.marker.nosource": "Warnung: \"{0}\" in Zeile {1} bei Zeichen {2}",
-	"problems.tree.aria.label.info.marker": "Von \"{0}\" generierte Informationen: \"{1}\" in Zeile {2} bei Zeichen {3}",
-	"problems.tree.aria.label.info.marker.nosource": "Informationen: \"{0}\" in Zeile {1} bei Zeichen {2}",
-	"problems.tree.aria.label.marker": "Von \"{0}\" generiertes Problem: \"{1}\" in Zeile {2} bei Zeichen {3}",
-	"problems.tree.aria.label.marker.nosource": "Problem: \"{0}\" in Zeile {1} bei Zeichen {2}",
-	"errors.warnings.show.label": "Fehler und Warnungen anzeigen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json b/i18n/deu/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json
deleted file mode 100644
index ed217d3a918..00000000000
--- a/i18n/deu/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"copyMarker": "Kopieren",
-	"copyMessage": "Nachricht kopieren"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/markers/electron-browser/markers.i18n.json b/i18n/deu/src/vs/workbench/parts/markers/electron-browser/markers.i18n.json
deleted file mode 100644
index 68d40f09248..00000000000
--- a/i18n/deu/src/vs/workbench/parts/markers/electron-browser/markers.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"totalProblems": "Insgesamt {0} Probleme"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/markers/electron-browser/markersElectronContributions.i18n.json b/i18n/deu/src/vs/workbench/parts/markers/electron-browser/markersElectronContributions.i18n.json
deleted file mode 100644
index 2d89a6d6d42..00000000000
--- a/i18n/deu/src/vs/workbench/parts/markers/electron-browser/markersElectronContributions.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"copyMarker": "Kopieren",
-	"copyMarkerMessage": "Nachricht kopieren"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.i18n.json b/i18n/deu/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.i18n.json
deleted file mode 100644
index 8a10d218183..00000000000
--- a/i18n/deu/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"label": "Probleme",
-	"tooltip.1": "1 Problem in dieser Datei",
-	"tooltip.N": "{0} Probleme in dieser Datei",
-	"markers.showOnFile": "Fehler & Warnungen auf Dateien und Ordnern anzeigen."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/markers/electron-browser/markersPanel.i18n.json b/i18n/deu/src/vs/workbench/parts/markers/electron-browser/markersPanel.i18n.json
deleted file mode 100644
index 44bcb5c161d..00000000000
--- a/i18n/deu/src/vs/workbench/parts/markers/electron-browser/markersPanel.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"disableFilesExclude": "Dateiausschlussfilter deaktivieren.",
-	"clearFilter": "Filter löschen."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/markers/electron-browser/markersPanelActions.i18n.json b/i18n/deu/src/vs/workbench/parts/markers/electron-browser/markersPanelActions.i18n.json
deleted file mode 100644
index 74b775239c0..00000000000
--- a/i18n/deu/src/vs/workbench/parts/markers/electron-browser/markersPanelActions.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"showing filtered problems": "Zeigt {0} von {1} an"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json b/i18n/deu/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
deleted file mode 100644
index 68082d2d7bd..00000000000
--- a/i18n/deu/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"viewCategory": "Anzeigen",
-	"problems.view.toggle.label": "Probleme umschalten (Fehler, Warnungen, Informationen)",
-	"problems.view.focus.label": "Probleme fokussieren (Fehler, Warnungen, Informationen)",
-	"problems.panel.configuration.title": "Ansicht \"Probleme\"",
-	"problems.panel.configuration.autoreveal": "Steuert, ob die Ansicht \"Probleme\" automatisch Dateien anzeigen sollte, wenn diese geöffnet werden.",
-	"markers.panel.title.problems": "Probleme",
-	"markers.panel.aria.label.problems.tree": "Probleme nach Dateien gruppiert",
-	"markers.panel.no.problems.build": "Es wurden bisher keine Probleme im Arbeitsbereich erkannt.",
-	"markers.panel.no.problems.filters": "Es wurden keine Ergebnisse mit den angegebenen Filterkriterien gefunden.",
-	"markers.panel.no.problems.file.exclusions": "Alle Probleme sind ausgeblendet, weil der Filter zum Ausschließen von Dateien aktiviert ist.",
-	"markers.panel.action.useFilesExclude": "Filtern mithilfe der Dateiausschlusseinstellungen",
-	"markers.panel.action.donotUseFilesExclude": "Dateiausschlusseinstellung nicht verwenden",
-	"markers.panel.action.filter": "Probleme filtern",
-	"markers.panel.filter.ariaLabel": "Probleme filtern",
-	"markers.panel.filter.placeholder": "Filter. Z. B.: text, **/*.ts, !**/node_modules/**",
-	"markers.panel.filter.errors": "Fehler",
-	"markers.panel.filter.warnings": "Warnungen",
-	"markers.panel.filter.infos": "Informationen",
-	"markers.panel.single.error.label": "1 Fehler",
-	"markers.panel.multiple.errors.label": "{0} Fehler",
-	"markers.panel.single.warning.label": "1 Warnung",
-	"markers.panel.multiple.warnings.label": "{0} Warnungen",
-	"markers.panel.single.info.label": "1 Information",
-	"markers.panel.multiple.infos.label": "{0}-Informationen",
-	"markers.panel.single.unknown.label": "1 Unbekannte",
-	"markers.panel.multiple.unknowns.label": "{0} Unbekannte",
-	"markers.panel.at.ln.col.number": "({0}, {1})",
-	"problems.tree.aria.label.resource": "{0} mit {1} Problemen",
-	"problems.tree.aria.label.marker.relatedInformation": "Dieses Problem verweist auf {0} Speicherorte.",
-	"problems.tree.aria.label.error.marker": "Von {0} generierter Fehler: {1} in Zeile {2} bei Zeichen {3}.{4}",
-	"problems.tree.aria.label.error.marker.nosource": "Fehler: {0} in Zeile {1} bei Zeichen {2}.{3}",
-	"problems.tree.aria.label.warning.marker": "Von {0} generierte Warnung: {1} in Zeile {2} bei Zeichen {3}.{4}",
-	"problems.tree.aria.label.warning.marker.nosource": "Warnung: {0} in Zeile {1} bei Zeichen {2}.{3}",
-	"problems.tree.aria.label.info.marker": "Von {0} generierte Informationen: {1} in Zeile {2} bei Zeichen {3}.{4}",
-	"problems.tree.aria.label.info.marker.nosource": "Informationen: {0} in Zeile {1} bei Zeichen {2}.{3}",
-	"problems.tree.aria.label.marker": "Von {0} generiertes Problem: {1} in Zeile {2} bei Zeichen {3}.{4}",
-	"problems.tree.aria.label.marker.nosource": "Problem: {0} in Zeile {1} bei Zeichen {2}.{3}",
-	"problems.tree.aria.label.relatedinfo.message": "{0} in Zeile {1} bei Zeichen {2} in {3}",
-	"errors.warnings.show.label": "Fehler und Warnungen anzeigen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/nps/electron-browser/nps.contribution.i18n.json b/i18n/deu/src/vs/workbench/parts/nps/electron-browser/nps.contribution.i18n.json
deleted file mode 100644
index 5082c06fc4a..00000000000
--- a/i18n/deu/src/vs/workbench/parts/nps/electron-browser/nps.contribution.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"surveyQuestion": "Wir würden uns freuen, wenn Sie an einer schnellen Umfrage teilnehmen.",
-	"takeSurvey": "An Umfrage teilnehmen",
-	"remindLater": "Später erinnern",
-	"neverAgain": "Nicht mehr anzeigen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/outline/electron-browser/outline.contribution.i18n.json b/i18n/deu/src/vs/workbench/parts/outline/electron-browser/outline.contribution.i18n.json
deleted file mode 100644
index 7e236e69502..00000000000
--- a/i18n/deu/src/vs/workbench/parts/outline/electron-browser/outline.contribution.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"name": "Gliederung",
-	"category.focus": "Datei",
-	"label.focus": "Fokus auf Gliederung"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/outline/electron-browser/outlinePanel.i18n.json b/i18n/deu/src/vs/workbench/parts/outline/electron-browser/outlinePanel.i18n.json
deleted file mode 100644
index beeeade9c29..00000000000
--- a/i18n/deu/src/vs/workbench/parts/outline/electron-browser/outlinePanel.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"filter": "Filter",
-	"collapse": "Alle zuklappen",
-	"sortByPosition": "Sortieren nach: Position",
-	"sortByName": "Sortieren nach: Name",
-	"sortByKind": "Sortieren nach: Typ",
-	"live": "Cursor folgen",
-	"no-editor": "Es gibt keine Editoren geöffnet, die Informationen über die Gliederung geben können.",
-	"too-many-symbols": "Leider ist diese Datei zu groß, um eine Gliederung anzeigen zu können."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/outline/electron-browser/outlineTree.i18n.json b/i18n/deu/src/vs/workbench/parts/outline/electron-browser/outlineTree.i18n.json
deleted file mode 100644
index e35f2bd06e3..00000000000
--- a/i18n/deu/src/vs/workbench/parts/outline/electron-browser/outlineTree.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"outline.title": "Zeile {0} in {1}"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/output/browser/output.contribution.i18n.json b/i18n/deu/src/vs/workbench/parts/output/browser/output.contribution.i18n.json
deleted file mode 100644
index a49f4a37242..00000000000
--- a/i18n/deu/src/vs/workbench/parts/output/browser/output.contribution.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"output": "Ausgabe",
-	"viewCategory": "Anzeigen",
-	"clearOutput.label": "Ausgabe löschen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/output/browser/outputActions.i18n.json b/i18n/deu/src/vs/workbench/parts/output/browser/outputActions.i18n.json
deleted file mode 100644
index d5aa2275e15..00000000000
--- a/i18n/deu/src/vs/workbench/parts/output/browser/outputActions.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleOutput": "Ausgabe umschalten",
-	"clearOutput": "Ausgabe löschen",
-	"toggleOutputScrollLock": "Ausgabe-Bildlaufsperre umschalten",
-	"switchToOutput.label": "Zur Ausgabe wechseln",
-	"openInLogViewer": "Protokolldatei öffnen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/output/browser/outputPanel.i18n.json b/i18n/deu/src/vs/workbench/parts/output/browser/outputPanel.i18n.json
deleted file mode 100644
index dc104506745..00000000000
--- a/i18n/deu/src/vs/workbench/parts/output/browser/outputPanel.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"output": "Ausgabe",
-	"outputPanelWithInputAriaLabel": "{0}, Ausgabebereich",
-	"outputPanelAriaLabel": "Ausgabebereich"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/output/common/output.i18n.json b/i18n/deu/src/vs/workbench/parts/output/common/output.i18n.json
deleted file mode 100644
index 07106c8aec3..00000000000
--- a/i18n/deu/src/vs/workbench/parts/output/common/output.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"output": "Ausgabe",
-	"channel": "für \"{0}\""
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json b/i18n/deu/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
deleted file mode 100644
index 900a7f7ac3b..00000000000
--- a/i18n/deu/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"output": "Ausgabe",
-	"logViewer": "Protokollanzeige",
-	"viewCategory": "Anzeigen",
-	"clearOutput.label": "Ausgabe löschen",
-	"openActiveLogOutputFile": "Ansicht: Aktive Protokollausgabedatei öffnen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json b/i18n/deu/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json
deleted file mode 100644
index 69740f1779c..00000000000
--- a/i18n/deu/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"output": "{0} - Ausgabe",
-	"channel": "Ausgabekanal für '{0}'"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/performance/electron-browser/performance.contribution.i18n.json b/i18n/deu/src/vs/workbench/parts/performance/electron-browser/performance.contribution.i18n.json
deleted file mode 100644
index 4aa1862f5cc..00000000000
--- a/i18n/deu/src/vs/workbench/parts/performance/electron-browser/performance.contribution.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"prof.message": "Profile wurden erfolgreich erstellt.",
-	"prof.detail": "Erstellen Sie ein Problem, und fügen Sie die folgenden Dateien manuell an:\n{0}",
-	"prof.restartAndFileIssue": "Problem erstellen und neu starten",
-	"prof.restart": "Neu starten",
-	"prof.thanks": "Danke für Ihre Hilfe.",
-	"prof.detail.restart": "Ein abschließender Neustart ist erforderlich um '{0}' nutzen zu können. Danke für Ihre Hilfe."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/performance/electron-browser/startupProfiler.i18n.json b/i18n/deu/src/vs/workbench/parts/performance/electron-browser/startupProfiler.i18n.json
deleted file mode 100644
index 73ebce404b8..00000000000
--- a/i18n/deu/src/vs/workbench/parts/performance/electron-browser/startupProfiler.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"prof.message": "Profile wurden erfolgreich erstellt.",
-	"prof.detail": "Erstellen Sie ein Problem, und fügen Sie die folgenden Dateien manuell an:\n{0}",
-	"prof.restartAndFileIssue": "Problem erstellen und neu starten",
-	"prof.restart": "Neu starten",
-	"prof.thanks": "Danke für Ihre Hilfe.",
-	"prof.detail.restart": "Ein abschließender Neustart ist erforderlich um '{0}' nutzen zu können. Danke für Ihre Hilfe."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/preferences/browser/keybindingWidgets.i18n.json b/i18n/deu/src/vs/workbench/parts/preferences/browser/keybindingWidgets.i18n.json
deleted file mode 100644
index 78e46017147..00000000000
--- a/i18n/deu/src/vs/workbench/parts/preferences/browser/keybindingWidgets.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"defineKeybinding.oneExists": "Diese Tastenzordnung ist 1 vorhandenen Befehl zugewiesen",
-	"defineKeybinding.existing": "Diese Tastenzordnung ist {0} vorhandenen Befehlen zugewiesen ",
-	"defineKeybinding.initial": "Drücken Sie die gewünschte Tastenkombination, und betätigen Sie anschließend die EINGABETASTE.",
-	"defineKeybinding.chordsTo": "Tastenkombination zu"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json b/i18n/deu/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
deleted file mode 100644
index 737a3d57cf8..00000000000
--- a/i18n/deu/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"showDefaultKeybindings": "Standard-Tastaturbelegungen anzeigen",
-	"showUserKeybindings": "Benutzer-Tastaturbelegungen anzeigen",
-	"SearchKeybindings.AriaLabel": "Tastenzuordnungen suchen",
-	"SearchKeybindings.Placeholder": "Tastenzuordnungen suchen",
-	"sortByPrecedene": "Nach Priorität sortieren",
-	"header-message": "Öffnen und bearbeiten Sie die folgende Datei, um erweiterte Anpassungen vorzunehmen:",
-	"keybindings-file-name": "keybindings.json",
-	"keybindingsLabel": "Tastenzuordnungen",
-	"changeLabel": "Tastenzuordnung ändern",
-	"addLabel": "Tastenzuordnung hinzufügen",
-	"removeLabel": "Tastenzuordnung entfernen",
-	"resetLabel": "Tastenbindung zurücksetzen",
-	"showSameKeybindings": "Die gleichen Tastenzuordnung anzeigen",
-	"copyLabel": "Kopieren",
-	"copyCommandLabel": "Befehl kopieren",
-	"error": "Fehler \"{0}\" beim Bearbeiten der Tastenzuordnung. Überprüfen Sie die Datei \"keybindings.json\" auf Fehler.",
-	"command": "Befehlstaste",
-	"keybinding": "Tastenzuordnung",
-	"source": "Quelle",
-	"when": "Zeitpunkt",
-	"editKeybindingLabelWithKey": "Tastenbindung ändern {0}",
-	"editKeybindingLabel": "Tastenzuordnung ändern",
-	"addKeybindingLabelWithKey": "Tastenbindung hinzufügen {0}",
-	"addKeybindingLabel": "Tastenzuordnung hinzufügen",
-	"title": "{0} ({1})",
-	"commandAriaLabel": "Befehl: {0}.",
-	"keybindingAriaLabel": "Tastenzuordnung: {0}.",
-	"noKeybinding": "Keine Tastenzuordnung zugewiesen.",
-	"sourceAriaLabel": "Quelle: {0}.",
-	"whenAriaLabel": "When: {0}.",
-	"noWhen": "Kein when-Kontext."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/preferences/browser/keybindingsEditorContribution.i18n.json b/i18n/deu/src/vs/workbench/parts/preferences/browser/keybindingsEditorContribution.i18n.json
deleted file mode 100644
index bf2210e5eba..00000000000
--- a/i18n/deu/src/vs/workbench/parts/preferences/browser/keybindingsEditorContribution.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"defineKeybinding.start": "Tastenbindung definieren",
-	"defineKeybinding.kbLayoutErrorMessage": "Sie können diese Tastenkombination mit Ihrem aktuellen Tastaturlayout nicht generieren.",
-	"defineKeybinding.kbLayoutLocalAndUSMessage": "**{0}** für Ihr aktuelles Tastaturlayout (**{1}** für USA, Standard).",
-	"defineKeybinding.kbLayoutLocalMessage": "**{0}** für Ihr aktuelles Tastaturlayout."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/preferences/browser/preferences.contribution.i18n.json b/i18n/deu/src/vs/workbench/parts/preferences/browser/preferences.contribution.i18n.json
deleted file mode 100644
index e0f0a6f36c4..00000000000
--- a/i18n/deu/src/vs/workbench/parts/preferences/browser/preferences.contribution.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"defaultPreferencesEditor": "Standardeditor für Einstellungen",
-	"keybindingsEditor": "Editor für Tastenzuordnungen",
-	"preferences": "Einstellungen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json b/i18n/deu/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
deleted file mode 100644
index 69766a391fe..00000000000
--- a/i18n/deu/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openRawDefaultSettings": "Raw-Standardeinstellungen öffnen",
-	"openSettings2": "Einstellungen öffnen (Vorschau)",
-	"openSettings": "Einstellungen öffnen",
-	"openGlobalSettings": "Benutzereinstellungen öffnen",
-	"openGlobalKeybindings": "Tastaturkurzbefehle öffnen",
-	"openGlobalKeybindingsFile": "Datei mit Tastaturkurzbefehlen öffnen",
-	"openWorkspaceSettings": "Arbeitsbereichseinstellungen öffnen",
-	"openFolderSettings": "Ordnereinstellungen öffnen",
-	"configureLanguageBasedSettings": "Sprachspezifische Einstellungen konfigurieren...",
-	"languageDescriptionConfigured": "({0})",
-	"pickLanguage": "Sprache auswählen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json b/i18n/deu/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
deleted file mode 100644
index 3d77216b1a1..00000000000
--- a/i18n/deu/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"SearchSettingsWidget.AriaLabel": "Einstellungen suchen",
-	"SearchSettingsWidget.Placeholder": "Einstellungen suchen",
-	"noSettingsFound": "Keine Ergebnisse",
-	"oneSettingFound": "1 Einstellung gefunden",
-	"settingsFound": "{0} Einstellungen gefunden",
-	"totalSettingsMessage": "Insgesamt {0} Einstellungen",
-	"nlpResult": "Ergebnisse in natürlicher Sprache",
-	"filterResult": "Gefilterte Ergebnisse",
-	"defaultSettings": "Standardeinstellungen",
-	"defaultUserSettings": "Standardbenutzereinstellungen",
-	"defaultWorkspaceSettings": "Standard-Arbeitsbereichseinstellungen",
-	"defaultFolderSettings": "Standardordnereinstellungen",
-	"defaultEditorReadonly": "Nehmen Sie im Editor auf der rechten Seite Änderungen vor, um Standardwerte zu überschreiben.",
-	"preferencesAriaLabel": "Standardeinstellungen. Schreibgeschützter Text-Editor."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json b/i18n/deu/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
deleted file mode 100644
index 93e401bd692..00000000000
--- a/i18n/deu/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"emptyUserSettingsHeader": "Platzieren Sie Ihre Einstellungen hier, um die Standardeinstellungen zu überschreiben.",
-	"emptyWorkspaceSettingsHeader": "Platzieren Sie Ihre Einstellungen hier, um die Benutzereinstellungen zu überschreiben.",
-	"emptyFolderSettingsHeader": "Platzieren Sie Ihre Ordnereinstellungen hier, um die Einstellungen in den Arbeitsbereichseinstellungen zu überschreiben.",
-	"reportSettingsSearchIssue": "Problem melden",
-	"newExtensionLabel": "Erweiterung \"{0}\" anzeigen",
-	"editTtile": "Bearbeiten",
-	"replaceDefaultValue": "In Einstellungen ersetzen",
-	"copyDefaultValue": "In Einstellungen kopieren"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/preferences/browser/preferencesService.i18n.json b/i18n/deu/src/vs/workbench/parts/preferences/browser/preferencesService.i18n.json
deleted file mode 100644
index 13bbcc4e6f2..00000000000
--- a/i18n/deu/src/vs/workbench/parts/preferences/browser/preferencesService.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openFolderFirst": "Zuerst einen Ordner öffnen, um Arbeitsbereicheinstellungen zu erstellen",
-	"emptyKeybindingsHeader": "Platzieren Sie Ihre Tastenzuordnungen in dieser Datei, um die Standardwerte zu überschreiben.",
-	"defaultKeybindings": "Standardtastenzuordnungen",
-	"folderSettingsName": "{0} (Ordnereinstellungen)",
-	"fail.createSettings": "{0} ({1}) kann nicht erstellt werden."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json b/i18n/deu/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
deleted file mode 100644
index cfd3784b251..00000000000
--- a/i18n/deu/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"defaultSettings": "Platzieren Sie Ihre Einstellungen zum Überschreiben im Editor auf der rechten Seite.",
-	"noSettingsFound": "Keine Einstellungen gefunden.",
-	"settingsSwitcherBarAriaLabel": "Einstellungsumschaltung",
-	"userSettings": "Benutzereinstellungen",
-	"workspaceSettings": "Arbeitsbereichseinstellungen",
-	"folderSettings": "Ordnereinstellungen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/preferences/browser/settingsEditor2.i18n.json b/i18n/deu/src/vs/workbench/parts/preferences/browser/settingsEditor2.i18n.json
deleted file mode 100644
index 6e71ffcfae9..00000000000
--- a/i18n/deu/src/vs/workbench/parts/preferences/browser/settingsEditor2.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"previewWarning": "Vorschau",
-	"previewLabel": "Dies ist eine Vorschau unseres neuen Einstellungs-Editors",
-	"SearchSettings.AriaLabel": "Einstellungen suchen",
-	"SearchSettings.Placeholder": "Einstellungen suchen",
-	"advancedCustomizationLabel": "Öffnen und bearbeiten Sie die folgende Datei, um erweiterte Anpassungen vorzunehmen:",
-	"openSettingsLabel": "settings.json",
-	"showOverriddenOnly": "Nur geänderte anzeigen",
-	"treeAriaLabel": "Einstellungen",
-	"feedbackButtonLabel": "Feedback geben"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/preferences/browser/settingsTree.i18n.json b/i18n/deu/src/vs/workbench/parts/preferences/browser/settingsTree.i18n.json
deleted file mode 100644
index 995e0dc2c71..00000000000
--- a/i18n/deu/src/vs/workbench/parts/preferences/browser/settingsTree.i18n.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"modifiedItemForeground": "Die Vordergrundfarbe für eine geänderte Einstellung.",
-	"workspace": "Arbeitsbereich",
-	"user": "Benutzer",
-	"resetButtonTitle": "Zurücksetzen",
-	"configured": "Geändert am",
-	"alsoConfiguredIn": "Auch geändert in",
-	"configuredIn": "Geändert in",
-	"editInSettingsJson": "In \"settings.json\" bearbeiten",
-	"settingRowAriaLabel": "{0} {1}, Einstellung",
-	"groupRowAriaLabel": "{0}, Gruppe"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/preferences/common/keybindingsEditorModel.i18n.json b/i18n/deu/src/vs/workbench/parts/preferences/common/keybindingsEditorModel.i18n.json
deleted file mode 100644
index 1e5f6b49d34..00000000000
--- a/i18n/deu/src/vs/workbench/parts/preferences/common/keybindingsEditorModel.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"default": "Standard",
-	"user": "Benutzer",
-	"meta": "meta",
-	"option": "option"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/preferences/common/preferences.i18n.json b/i18n/deu/src/vs/workbench/parts/preferences/common/preferences.i18n.json
deleted file mode 100644
index ff19d72440b..00000000000
--- a/i18n/deu/src/vs/workbench/parts/preferences/common/preferences.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"userSettingsTarget": "Benutzereinstellungen",
-	"workspaceSettingsTarget": "Arbeitsbereichseinstellungen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json b/i18n/deu/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json
deleted file mode 100644
index db93b66f34f..00000000000
--- a/i18n/deu/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"commonlyUsed": "Am häufigsten verwendet",
-	"defaultKeybindingsHeader": "Überschreiben Sie Tastenzuordnungen, indem Sie sie in die Tastenzuordnungsdatei einfügen."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/preferences/electron-browser/preferences.contribution.i18n.json b/i18n/deu/src/vs/workbench/parts/preferences/electron-browser/preferences.contribution.i18n.json
deleted file mode 100644
index 3210de8a1ef..00000000000
--- a/i18n/deu/src/vs/workbench/parts/preferences/electron-browser/preferences.contribution.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"defaultPreferencesEditor": "Standardeditor für Einstellungen",
-	"settingsEditor2": "Einstellungs-Editor 2",
-	"keybindingsEditor": "Editor für Tastenzuordnungen",
-	"preferences": "Einstellungen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/quickopen/browser/commandsHandler.i18n.json b/i18n/deu/src/vs/workbench/parts/quickopen/browser/commandsHandler.i18n.json
deleted file mode 100644
index 7897df0e505..00000000000
--- a/i18n/deu/src/vs/workbench/parts/quickopen/browser/commandsHandler.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"showTriggerActions": "Alle Befehle anzeigen",
-	"clearCommandHistory": "Befehlsverlauf löschen",
-	"showCommands.label": "Befehlspalette...",
-	"entryAriaLabelWithKey": "{0}, {1}, Befehle",
-	"entryAriaLabel": "{0}, Befehle",
-	"actionNotEnabled": "Der Befehl \"{0}\" ist im aktuellen Kontext nicht aktiviert.",
-	"canNotRun": "Der Befehl \"{0}\" hat zu einem Fehler geführt.",
-	"recentlyUsed": "zuletzt verwendet",
-	"morecCommands": "andere Befehle",
-	"cat.title": "{0}: {1}",
-	"noCommandsMatching": "Keine übereinstimmenden Befehle."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/quickopen/browser/gotoLineHandler.i18n.json b/i18n/deu/src/vs/workbench/parts/quickopen/browser/gotoLineHandler.i18n.json
deleted file mode 100644
index d2966090d2b..00000000000
--- a/i18n/deu/src/vs/workbench/parts/quickopen/browser/gotoLineHandler.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"gotoLine": "Gehe zu Zeile...",
-	"gotoLineLabelEmptyWithLimit": "Zeilennummer zwischen 1 und {0} eingeben, zu der navigiert werden soll",
-	"gotoLineLabelEmpty": "Zeilennummer eingeben, zu der navigiert werden soll",
-	"gotoLineColumnLabel": "Zu Zeile {0} und Zeichen {1} wechseln",
-	"gotoLineLabel": "Gehe zu Zeile {0}",
-	"gotoLineHandlerAriaLabel": "Geben Sie eine Zeilennummer ein, zu der navigiert werden soll.",
-	"cannotRunGotoLine": "Zuerst eine Textdatei öffnen, um zu einer Zeile zu navigieren"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/quickopen/browser/gotoSymbolHandler.i18n.json b/i18n/deu/src/vs/workbench/parts/quickopen/browser/gotoSymbolHandler.i18n.json
deleted file mode 100644
index a58aecd9947..00000000000
--- a/i18n/deu/src/vs/workbench/parts/quickopen/browser/gotoSymbolHandler.i18n.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"gotoSymbol": "Zu Symbol in Datei wechseln...",
-	"symbols": "Symbole ({0})",
-	"method": "Methoden ({0})",
-	"function": "Funktionen ({0})",
-	"_constructor": "Konstruktoren ({0})",
-	"variable": "Variablen ({0})",
-	"class": "Klassen ({0})",
-	"interface": "Schnittstellen ({0})",
-	"namespace": "Namespaces ({0})",
-	"package": "Pakete ({0})",
-	"modules": "Module ({0})",
-	"property": "Eigenschaften ({0})",
-	"enum": "Enumerationen ({0})",
-	"string": "Zeichenfolgen ({0})",
-	"rule": "Regeln ({0})",
-	"file": "Dateien ({0})",
-	"array": "Arrays ({0})",
-	"number": "Zahlen ({0})",
-	"boolean": "Boolesche Werte ({0})",
-	"object": "Objekte ({0})",
-	"key": "Schlüssel ({0})",
-	"entryAriaLabel": "{0}, Symbole",
-	"noSymbolsMatching": "Keine übereinstimmenden Symbole",
-	"noSymbolsFound": "Es wurden keine Symbole gefunden.",
-	"gotoSymbolHandlerAriaLabel": "Nehmen Sie eine Eingabe vor, um Symbole des aktuell aktiven Editors einzuschränken.",
-	"cannotRunGotoSymbolInFile": "Keine Symbolinformationen für die Datei vorhanden.",
-	"cannotRunGotoSymbol": "Zuerst eine Textdatei öffnen, um zu einem Symbol zu navigieren"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/quickopen/browser/helpHandler.i18n.json b/i18n/deu/src/vs/workbench/parts/quickopen/browser/helpHandler.i18n.json
deleted file mode 100644
index af08e6c694a..00000000000
--- a/i18n/deu/src/vs/workbench/parts/quickopen/browser/helpHandler.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"entryAriaLabel": "{0}, Auswahlhilfe",
-	"globalCommands": "Globale Befehle",
-	"editorCommands": "Editor-Befehle"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json b/i18n/deu/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json
deleted file mode 100644
index fef34355ad7..00000000000
--- a/i18n/deu/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"view": "Anzeigen",
-	"commandsHandlerDescriptionDefault": "Befehle anzeigen und ausführen",
-	"gotoLineDescriptionMac": "Gehe zu Zeile",
-	"gotoLineDescriptionWin": "Gehe zu Zeile",
-	"gotoSymbolDescription": "Gehe zu Symbol in Datei",
-	"gotoSymbolDescriptionScoped": "Gehe zu Symbol in Datei nach Kategorie",
-	"helpDescription": "Hilfe anzeigen",
-	"viewPickerDescription": "Ansicht öffnen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/quickopen/browser/viewPickerHandler.i18n.json b/i18n/deu/src/vs/workbench/parts/quickopen/browser/viewPickerHandler.i18n.json
deleted file mode 100644
index 3c04978430f..00000000000
--- a/i18n/deu/src/vs/workbench/parts/quickopen/browser/viewPickerHandler.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"entryAriaLabel": "{0}, Ansichtsauswahl",
-	"views": "Ansichten",
-	"panels": "Bereiche",
-	"terminals": "Terminal",
-	"terminalTitle": "{0}: {1}",
-	"channels": "Ausgabe",
-	"openView": "Ansicht öffnen",
-	"quickOpenView": "Schnellansicht öffnen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.i18n.json b/i18n/deu/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.i18n.json
deleted file mode 100644
index 944c8644290..00000000000
--- a/i18n/deu/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"relaunchSettingMessage": "Eine Einstellung wurde geändert, welche einen Neustart benötigt.",
-	"relaunchSettingDetail": "Drücke den Neu starten-Button, um {0} neuzustarten und die Einstellung zu aktivieren.",
-	"restart": "&&Neu starten"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.i18n.json b/i18n/deu/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.i18n.json
deleted file mode 100644
index e0b0a9a0758..00000000000
--- a/i18n/deu/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.i18n.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"changes": "{0} von {1} Änderungen",
-	"change": "{0} von {1} Änderung",
-	"show previous change": "Vorherige Änderung anzeigen",
-	"show next change": "Nächste Änderung anzeigen",
-	"move to previous change": "Zur vorherigen Änderung",
-	"move to next change": "Zur nächsten Änderung",
-	"editorGutterModifiedBackground": "Hintergrundfarbe für die Editor-Leiste für Zeilen, die geändert wurden.",
-	"editorGutterAddedBackground": "Hintergrundfarbe für die Editor-Leiste für Zeilen, die hinzugefügt wurden.",
-	"editorGutterDeletedBackground": "Hintergrundfarbe für die Editor-Leiste für Zeilen, die gelöscht wurden.",
-	"overviewRulerModifiedForeground": "Übersichtslineal-Markierungsfarbe für geänderte Inhalte.",
-	"overviewRulerAddedForeground": "Übersichtslineal-Markierungsfarbe für hinzugefügte Inhalte.",
-	"overviewRulerDeletedForeground": "Übersichtslineal-Markierungsfarbe für gelöschte Inhalte."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json b/i18n/deu/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
deleted file mode 100644
index eb263d7ae8b..00000000000
--- a/i18n/deu/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleGitViewlet": "Git anzeigen",
-	"source control": "Quellcodeverwaltung",
-	"toggleSCMViewlet": "SCM anzeigen",
-	"view": "Anzeigen",
-	"scmConfigurationTitle": "SCM",
-	"alwaysShowProviders": "Ob der Quellcodeverwaltungsanbieter-Abschnitt immer angezeigt wird.",
-	"diffDecorations": "Steuert die Diff-Dekorationen im Editor.",
-	"diffGutterWidth": "Steuert die Breite (px) der Diff-Dekorationen in der Liste (hinzugefügt und verändert)."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/scm/electron-browser/scmActivity.i18n.json b/i18n/deu/src/vs/workbench/parts/scm/electron-browser/scmActivity.i18n.json
deleted file mode 100644
index a3c2934f8ee..00000000000
--- a/i18n/deu/src/vs/workbench/parts/scm/electron-browser/scmActivity.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"scmPendingChangesBadge": "{0} ausstehende Änderungen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/scm/electron-browser/scmMenus.i18n.json b/i18n/deu/src/vs/workbench/parts/scm/electron-browser/scmMenus.i18n.json
deleted file mode 100644
index d2a2095a234..00000000000
--- a/i18n/deu/src/vs/workbench/parts/scm/electron-browser/scmMenus.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"installAdditionalSCMProviders": "Installiere weiter SCM Provider...",
-	"switch provider": "SCM-Anbieter wechseln..."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json b/i18n/deu/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
deleted file mode 100644
index c287ce1399d..00000000000
--- a/i18n/deu/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"scm providers": "Quellcodeanbieter",
-	"hideRepository": "Ausblenden",
-	"installAdditionalSCMProviders": "Installiere weiter SCM Provider...",
-	"no open repo": "Es gibt keine aktiven Quellcodeanbieter.",
-	"source control": "Quellcodeverwaltung",
-	"viewletTitle": "{0}: {1}",
-	"hideView": "Ausblenden"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/search/browser/openAnythingHandler.i18n.json b/i18n/deu/src/vs/workbench/parts/search/browser/openAnythingHandler.i18n.json
deleted file mode 100644
index cb74abf972e..00000000000
--- a/i18n/deu/src/vs/workbench/parts/search/browser/openAnythingHandler.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"fileAndTypeResults": "Datei- und Symbolergebnisse",
-	"fileResults": "Dateiergebnisse"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/search/browser/openFileHandler.i18n.json b/i18n/deu/src/vs/workbench/parts/search/browser/openFileHandler.i18n.json
deleted file mode 100644
index 192c465e73c..00000000000
--- a/i18n/deu/src/vs/workbench/parts/search/browser/openFileHandler.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"entryAriaLabel": "{0}, Dateiauswahl",
-	"searchResults": "Suchergebnisse"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/search/browser/openSymbolHandler.i18n.json b/i18n/deu/src/vs/workbench/parts/search/browser/openSymbolHandler.i18n.json
deleted file mode 100644
index 12f9f4f9de2..00000000000
--- a/i18n/deu/src/vs/workbench/parts/search/browser/openSymbolHandler.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"entryAriaLabel": "{0}, Symbolauswahl",
-	"symbols": "Symbolergebnisse",
-	"noSymbolsMatching": "Keine übereinstimmenden Symbole",
-	"noSymbolsWithoutInput": "Nehmen Sie eine Eingabe vor, um nach Symbolen zu suchen."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/search/browser/patternInputWidget.i18n.json b/i18n/deu/src/vs/workbench/parts/search/browser/patternInputWidget.i18n.json
deleted file mode 100644
index 61ec1f313d7..00000000000
--- a/i18n/deu/src/vs/workbench/parts/search/browser/patternInputWidget.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"defaultLabel": "Eingabe",
-	"useExcludesAndIgnoreFilesDescription": "Ausschlusseinstellungen und Ignorieren von Dateien verwenden"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/search/browser/replaceService.i18n.json b/i18n/deu/src/vs/workbench/parts/search/browser/replaceService.i18n.json
deleted file mode 100644
index 9d1480f139a..00000000000
--- a/i18n/deu/src/vs/workbench/parts/search/browser/replaceService.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"fileReplaceChanges": "{0} ↔ {1} (Replace Preview)"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/search/browser/search.contribution.i18n.json b/i18n/deu/src/vs/workbench/parts/search/browser/search.contribution.i18n.json
deleted file mode 100644
index a765a1ac06f..00000000000
--- a/i18n/deu/src/vs/workbench/parts/search/browser/search.contribution.i18n.json
+++ /dev/null
@@ -1,22 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"showTriggerActions": "Zu Symbol im Arbeitsbereich wechseln...",
-	"name": "Suchen",
-	"search": "Suchen",
-	"view": "Anzeigen",
-	"openAnythingHandlerDescription": "Zu Datei wechseln",
-	"openSymbolDescriptionNormal": "Zu Symbol im Arbeitsbereich wechseln",
-	"searchOutputChannelTitle": "Suchen",
-	"searchConfigurationTitle": "Suchen",
-	"exclude": "Konfigurieren Sie Globmuster zum Ausschließen von Dateien und Ordnern in Suchvorgängen. Alle Globmuster werden von der files.exclude-Einstellung geerbt.",
-	"exclude.boolean": "Das Globmuster, mit dem Dateipfade verglichen werden sollen. Legen Sie diesen Wert auf \"true\" oder \"false\" fest, um das Muster zu aktivieren bzw. zu deaktivieren.",
-	"exclude.when": "Zusätzliche Überprüfung der gleichgeordneten Elemente einer entsprechenden Datei. Verwenden Sie \"$(basename)\" als Variable für den entsprechenden Dateinamen.",
-	"useRipgrep": "Steuert, ob \"ripgrep\" in der Text- und Dateisuche verwendet wird.",
-	"useIgnoreFiles": "Steuert, ob bei der Suche nach Dateien GITIGNORE- und IGNORE-Dateien verwendet werden.",
-	"search.quickOpen.includeSymbols": "Konfigurieren Sie diese Option, um Ergebnisse aus einer globalen Symbolsuche in die Dateiergebnisse für Quick Open einzuschließen.",
-	"search.followSymlinks": "Steuert, ob Symlinks während der Suche gefolgt werden."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/search/browser/searchActions.i18n.json b/i18n/deu/src/vs/workbench/parts/search/browser/searchActions.i18n.json
deleted file mode 100644
index 1dcdaff9277..00000000000
--- a/i18n/deu/src/vs/workbench/parts/search/browser/searchActions.i18n.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"nextSearchIncludePattern": "Nächstes Sucheinschlussmuster anzeigen",
-	"previousSearchIncludePattern": "Vorheriges Sucheinschlussmuster anzeigen",
-	"nextSearchExcludePattern": "Nächstes Suchausschlussmuster anzeigen",
-	"previousSearchExcludePattern": "Vorheriges Suchausschlussmuster anzeigen",
-	"nextSearchTerm": "Nächsten Suchbegriff anzeigen",
-	"previousSearchTerm": "Vorherigen Suchbegriff anzeigen",
-	"nextReplaceTerm": "Nächsten Such-/Ersetzungsbegriff anzeigen",
-	"previousReplaceTerm": "Vorherigen Such-/Ersetzungsbegriff anzeigen ",
-	"findInFiles": "In Dateien suchen",
-	"replaceInFiles": "In Dateien ersetzen",
-	"RefreshAction.label": "Aktualisieren",
-	"CollapseDeepestExpandedLevelAction.label": "Alle zuklappen",
-	"ClearSearchResultsAction.label": "Löschen",
-	"CancelSearchAction.label": "Suche abbrechen",
-	"FocusNextSearchResult.label": "Fokus auf nächstes Suchergebnis",
-	"FocusPreviousSearchResult.label": "Fokus auf vorheriges Suchergebnis",
-	"RemoveAction.label": "Schließen",
-	"file.replaceAll.label": "Alle ersetzen",
-	"match.replace.label": "Ersetzen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/search/browser/searchResultsView.i18n.json b/i18n/deu/src/vs/workbench/parts/search/browser/searchResultsView.i18n.json
deleted file mode 100644
index 7fc53a6c4ee..00000000000
--- a/i18n/deu/src/vs/workbench/parts/search/browser/searchResultsView.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"searchFolderMatch.other.label": "Andere Dateien",
-	"searchFileMatches": "{0} Dateien gefunden",
-	"searchFileMatch": "{0} Datei gefunden",
-	"searchMatches": "{0} Übereinstimmungen gefunden",
-	"searchMatch": "{0} Übereinstimmung gefunden",
-	"folderMatchAriaLabel": "{0} Übereinstimmungen im Ordnerstamm {1}, Suchergebnis",
-	"fileMatchAriaLabel": "{0} Übereinstimmungen in der Datei \"{1}\" des Ordners \"{2}\", Suchergebnis",
-	"replacePreviewResultAria": "Ersetze Term {0} mit {1} an Spaltenposition {2} in Zeile mit Text {3}",
-	"searchResultAria": "Term {0} an Spaltenposition {1} in Zeile mit Text {2} gefunden"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/search/browser/searchView.i18n.json b/i18n/deu/src/vs/workbench/parts/search/browser/searchView.i18n.json
deleted file mode 100644
index f2f216a0a04..00000000000
--- a/i18n/deu/src/vs/workbench/parts/search/browser/searchView.i18n.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"moreSearch": "Suchdetails umschalten",
-	"searchScope.includes": "Einzuschließende Dateien",
-	"label.includes": "Sucheinschlussmuster",
-	"searchScope.excludes": "Auszuschließende Dateien",
-	"label.excludes": "Suchausschlussmuster",
-	"replaceAll.confirmation.title": "Alle ersetzen",
-	"replaceAll.confirm.button": "&&Ersetzen",
-	"replaceAll.occurrence.file.message": "{0} Vorkommen in {1} Datei durch \"{2}\" ersetzt.",
-	"removeAll.occurrence.file.message": "{0} Vorkommen in {1} Datei ersetzt.",
-	"replaceAll.occurrence.files.message": "{0} Vorkommen in {1} Dateien durch \"{2}\" ersetzt.",
-	"removeAll.occurrence.files.message": "{0} Vorkommen in {1} Dateien ersetzt.",
-	"replaceAll.occurrences.file.message": "{0} Vorkommen in {1} Datei durch \"{2}\" ersetzt.",
-	"removeAll.occurrences.file.message": "{0} Vorkommen in {1} Datei ersetzt.",
-	"replaceAll.occurrences.files.message": "{0} Vorkommen in {1} Dateien wurden durch \"{2}\" ersetzt.",
-	"removeAll.occurrences.files.message": "{0} Vorkommen in {1} Dateien ersetzt.",
-	"removeAll.occurrence.file.confirmation.message": "{0} Vorkommen in {1} Datei durch \"{2}\" ersetzen?",
-	"replaceAll.occurrence.file.confirmation.message": "{0} Vorkommen in {1} Datei ersetzen?",
-	"removeAll.occurrence.files.confirmation.message": "{0} Vorkommen in {1} Dateien durch \"{2}\" ersetzen?",
-	"replaceAll.occurrence.files.confirmation.message": "{0} Vorkommen in {1} Dateien ersetzen?",
-	"removeAll.occurrences.file.confirmation.message": "{0} Vorkommen in {1} Datei durch \"{2}\" ersetzen?",
-	"replaceAll.occurrences.file.confirmation.message": "{0} Vorkommen in {1} Datei ersetzen?",
-	"removeAll.occurrences.files.confirmation.message": "{0} Vorkommen in {1} Dateien durch \"{2}\" ersetzen?",
-	"replaceAll.occurrences.files.confirmation.message": "{0} Vorkommen in {1} Dateien ersetzen?",
-	"treeAriaLabel": "Suchergebnisse",
-	"searchPathNotFoundError": "Der Suchpfad wurde nicht gefunden: {0}.",
-	"searchMaxResultsWarning": "Das Resultset enthält nur eine Teilmenge aller Übereinstimmungen. Verfeinern Sie Ihre Suche, um die Ergebnisse einzugrenzen.",
-	"searchCanceled": "Die Suche wurde abgebrochen, bevor Ergebnisse gefunden werden konnten – ",
-	"noResultsIncludesExcludes": "Keine Ergebnisse in \"{0}\" unter Ausschluss von \"{1}\" gefunden – ",
-	"noResultsIncludes": "Keine Ergebnisse in \"{0}\" gefunden – ",
-	"noResultsExcludes": "Keine Ergebnisse gefunden, die \"{0}\" ausschließen – ",
-	"noResultsFound": "Es wurden keine Ergebnisse gefunden. Überprüfen Sie Ihre Einstellungen für konfigurierte Ausschlüsse und das Ignorieren von Dateien –",
-	"rerunSearch.message": "Erneut suchen",
-	"rerunSearchInAll.message": "Erneut in allen Dateien suchen",
-	"openSettings.message": "Einstellungen öffnen",
-	"openSettings.learnMore": "Weitere Informationen",
-	"ariaSearchResultsStatus": "Die Suche hat {0} Ergebnisse in {1} Dateien zurückgegeben.",
-	"search.file.result": "{0} Ergebnis in {1} Datei",
-	"search.files.result": "{0} Ergebnis in {1} Dateien",
-	"search.file.results": "{0} Ergebnisse in {1} Datei",
-	"search.files.results": "{0} Ergebnisse in {1} Dateien",
-	"searchWithoutFolder": "Sie haben noch keinen Ordner geöffnet. Nur offene Dateien werden momentan durchsucht - ",
-	"openFolder": "Ordner öffnen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json b/i18n/deu/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
deleted file mode 100644
index f2f216a0a04..00000000000
--- a/i18n/deu/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"moreSearch": "Suchdetails umschalten",
-	"searchScope.includes": "Einzuschließende Dateien",
-	"label.includes": "Sucheinschlussmuster",
-	"searchScope.excludes": "Auszuschließende Dateien",
-	"label.excludes": "Suchausschlussmuster",
-	"replaceAll.confirmation.title": "Alle ersetzen",
-	"replaceAll.confirm.button": "&&Ersetzen",
-	"replaceAll.occurrence.file.message": "{0} Vorkommen in {1} Datei durch \"{2}\" ersetzt.",
-	"removeAll.occurrence.file.message": "{0} Vorkommen in {1} Datei ersetzt.",
-	"replaceAll.occurrence.files.message": "{0} Vorkommen in {1} Dateien durch \"{2}\" ersetzt.",
-	"removeAll.occurrence.files.message": "{0} Vorkommen in {1} Dateien ersetzt.",
-	"replaceAll.occurrences.file.message": "{0} Vorkommen in {1} Datei durch \"{2}\" ersetzt.",
-	"removeAll.occurrences.file.message": "{0} Vorkommen in {1} Datei ersetzt.",
-	"replaceAll.occurrences.files.message": "{0} Vorkommen in {1} Dateien wurden durch \"{2}\" ersetzt.",
-	"removeAll.occurrences.files.message": "{0} Vorkommen in {1} Dateien ersetzt.",
-	"removeAll.occurrence.file.confirmation.message": "{0} Vorkommen in {1} Datei durch \"{2}\" ersetzen?",
-	"replaceAll.occurrence.file.confirmation.message": "{0} Vorkommen in {1} Datei ersetzen?",
-	"removeAll.occurrence.files.confirmation.message": "{0} Vorkommen in {1} Dateien durch \"{2}\" ersetzen?",
-	"replaceAll.occurrence.files.confirmation.message": "{0} Vorkommen in {1} Dateien ersetzen?",
-	"removeAll.occurrences.file.confirmation.message": "{0} Vorkommen in {1} Datei durch \"{2}\" ersetzen?",
-	"replaceAll.occurrences.file.confirmation.message": "{0} Vorkommen in {1} Datei ersetzen?",
-	"removeAll.occurrences.files.confirmation.message": "{0} Vorkommen in {1} Dateien durch \"{2}\" ersetzen?",
-	"replaceAll.occurrences.files.confirmation.message": "{0} Vorkommen in {1} Dateien ersetzen?",
-	"treeAriaLabel": "Suchergebnisse",
-	"searchPathNotFoundError": "Der Suchpfad wurde nicht gefunden: {0}.",
-	"searchMaxResultsWarning": "Das Resultset enthält nur eine Teilmenge aller Übereinstimmungen. Verfeinern Sie Ihre Suche, um die Ergebnisse einzugrenzen.",
-	"searchCanceled": "Die Suche wurde abgebrochen, bevor Ergebnisse gefunden werden konnten – ",
-	"noResultsIncludesExcludes": "Keine Ergebnisse in \"{0}\" unter Ausschluss von \"{1}\" gefunden – ",
-	"noResultsIncludes": "Keine Ergebnisse in \"{0}\" gefunden – ",
-	"noResultsExcludes": "Keine Ergebnisse gefunden, die \"{0}\" ausschließen – ",
-	"noResultsFound": "Es wurden keine Ergebnisse gefunden. Überprüfen Sie Ihre Einstellungen für konfigurierte Ausschlüsse und das Ignorieren von Dateien –",
-	"rerunSearch.message": "Erneut suchen",
-	"rerunSearchInAll.message": "Erneut in allen Dateien suchen",
-	"openSettings.message": "Einstellungen öffnen",
-	"openSettings.learnMore": "Weitere Informationen",
-	"ariaSearchResultsStatus": "Die Suche hat {0} Ergebnisse in {1} Dateien zurückgegeben.",
-	"search.file.result": "{0} Ergebnis in {1} Datei",
-	"search.files.result": "{0} Ergebnis in {1} Dateien",
-	"search.file.results": "{0} Ergebnisse in {1} Datei",
-	"search.files.results": "{0} Ergebnisse in {1} Dateien",
-	"searchWithoutFolder": "Sie haben noch keinen Ordner geöffnet. Nur offene Dateien werden momentan durchsucht - ",
-	"openFolder": "Ordner öffnen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/search/browser/searchWidget.i18n.json b/i18n/deu/src/vs/workbench/parts/search/browser/searchWidget.i18n.json
deleted file mode 100644
index 717069a96ed..00000000000
--- a/i18n/deu/src/vs/workbench/parts/search/browser/searchWidget.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"search.action.replaceAll.disabled.label": "Alle ersetzen (Suche zum Aktivieren übermitteln)",
-	"search.action.replaceAll.enabled.label": "Alle ersetzen",
-	"search.replace.toggle.button.title": "Ersetzung umschalten",
-	"label.Search": "Suche: Geben Sie den Suchbegriff ein, und drücken Sie die EINGABETASTE, um zu suchen, oder ESC, um den Vorgang abzubrechen.",
-	"search.placeHolder": "Suchen",
-	"label.Replace": "Ersetzen: Geben Sie den Begriff ein, der zum Ersetzen verwendet werden soll, und drücken Sie die EINGABETASTE, um eine Vorschau anzuzeigen, oder ESC, um den Vorgang abzubrechen.",
-	"search.replace.placeHolder": "Ersetzen",
-	"regexp.validationFailure": "Der Ausdruck stimmt mit allem überein.",
-	"regexp.backreferenceValidationFailure": "Rückverweise werden nicht unterstützt."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/search/common/queryBuilder.i18n.json b/i18n/deu/src/vs/workbench/parts/search/common/queryBuilder.i18n.json
deleted file mode 100644
index b7b4d0a3f1c..00000000000
--- a/i18n/deu/src/vs/workbench/parts/search/common/queryBuilder.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"search.noWorkspaceWithName": "Kein Ordner im Arbeitsbereich mit Namen: {0}"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json b/i18n/deu/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
deleted file mode 100644
index 24b953a60a6..00000000000
--- a/i18n/deu/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"search": "Suchen",
-	"copyMatchLabel": "Kopieren",
-	"copyPathLabel": "Pfad kopieren",
-	"copyAllLabel": "Alles kopieren",
-	"clearSearchHistoryLabel": "Suchverlauf löschen",
-	"toggleSearchViewPositionLabel": "Position der Suchansicht umschalten",
-	"findInFolder": "In Ordner suchen...",
-	"findInWorkspace": "In Arbeitsbereich suchen...",
-	"showTriggerActions": "Zu Symbol im Arbeitsbereich wechseln...",
-	"name": "Suchen",
-	"showSearchViewl": "Suche anzeigen",
-	"view": "Anzeigen",
-	"findInFiles": "In Dateien suchen",
-	"openAnythingHandlerDescription": "Zu Datei wechseln",
-	"openSymbolDescriptionNormal": "Zu Symbol im Arbeitsbereich wechseln",
-	"searchConfigurationTitle": "Suchen",
-	"exclude": "Konfigurieren Sie Globmuster zum Ausschließen von Dateien und Ordnern in Suchvorgängen. Alle Globmuster werden von der files.exclude-Einstellung geerbt.",
-	"exclude.boolean": "Das Globmuster, mit dem Dateipfade verglichen werden sollen. Legen Sie diesen Wert auf \"true\" oder \"false\" fest, um das Muster zu aktivieren bzw. zu deaktivieren.",
-	"exclude.when": "Zusätzliche Überprüfung der gleichgeordneten Elemente einer entsprechenden Datei. Verwenden Sie \"$(basename)\" als Variable für den entsprechenden Dateinamen.",
-	"useRipgrep": "Steuert, ob \"ripgrep\" in der Text- und Dateisuche verwendet wird.",
-	"useIgnoreFiles": "Steuert, ob bei der Suche nach Dateien GITIGNORE- und IGNORE-Dateien verwendet werden.",
-	"search.quickOpen.includeSymbols": "Konfigurieren Sie diese Option, um Ergebnisse aus einer globalen Symbolsuche in die Dateiergebnisse für Quick Open einzuschließen.",
-	"search.followSymlinks": "Steuert, ob Symlinks während der Suche gefolgt werden.",
-	"search.smartCase": "Sucht ohne Berücksichtigung von Groß-/Kleinschreibung, wenn das Muster kleingeschrieben ist, andernfalls wird mit Berücksichtigung von Groß-/Kleinschreibung gesucht.",
-	"search.globalFindClipboard": "Steuert, ob die Suchansicht die freigegebene Suchzwischenablage auf macOS lesen oder verändern soll",
-	"search.location": "Steuert, ob die Suche als Ansicht in der Seitenleiste oder als Bereich angezeigt wird (die zweite Variante bietet mehr Platz in der Horizontalen)."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/search/electron-browser/searchActions.i18n.json b/i18n/deu/src/vs/workbench/parts/search/electron-browser/searchActions.i18n.json
deleted file mode 100644
index b9ef9877508..00000000000
--- a/i18n/deu/src/vs/workbench/parts/search/electron-browser/searchActions.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"findInFolder": "In Ordner suchen...",
-	"findInWorkspace": "In Arbeitsbereich suchen..."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/snippets/electron-browser/TMSnippets.i18n.json b/i18n/deu/src/vs/workbench/parts/snippets/electron-browser/TMSnippets.i18n.json
deleted file mode 100644
index 18717d8b12c..00000000000
--- a/i18n/deu/src/vs/workbench/parts/snippets/electron-browser/TMSnippets.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"vscode.extension.contributes.snippets": "Trägt Codeausschnitte bei.",
-	"vscode.extension.contributes.snippets-language": "Der Sprachbezeichner, für den dieser Codeausschnitt beigetragen wird.",
-	"vscode.extension.contributes.snippets-path": "Der Pfad der Codeausschnittdatei. Der Pfad ist relativ zum Erweiterungsordner und beginnt normalerweise mit \". /snippets/\".",
-	"invalid.language": "Unbekannte Sprache in \"contributes.{0}.language\". Bereitgestellter Wert: {1}",
-	"invalid.path.0": "In \"contributes.{0}.path\" wurde eine Zeichenfolge erwartet. Bereitgestellter Wert: {1}",
-	"invalid.path.1": "Es wurde erwartet, dass \"contributes.{0}.path\" ({1}) im Ordner ({2}) der Erweiterung enthalten ist. Dies führt ggf. dazu, dass die Erweiterung nicht portierbar ist.",
-	"badVariableUse": "Das \"{0}\"-Snippet verwirrt wahrscheinlich Snippet-Variablen und Snippet-Paltzhalter. Schaue https://code.visualstudio.com/docs/editor/userdefinedsnippets#_snippet-syntax für weitere Informationen."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json b/i18n/deu/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json
deleted file mode 100644
index e92da46ec50..00000000000
--- a/i18n/deu/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"global.scope": "(global)",
-	"global.1": "({0})",
-	"new.global": "Neue globale Codeausschnittsdatei …",
-	"group.global": "Vorhandene Codeausschnitte",
-	"new.global.sep": "Neue Codeausschnitte",
-	"openSnippet.pickLanguage": "Codeausschnittsdatei auswählen oder Codeausschnitte erstellen",
-	"openSnippet.label": "Benutzercodeausschnitte konfigurieren",
-	"preferences": "Einstellungen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/snippets/electron-browser/insertSnippet.i18n.json b/i18n/deu/src/vs/workbench/parts/snippets/electron-browser/insertSnippet.i18n.json
deleted file mode 100644
index 0b1aa06f384..00000000000
--- a/i18n/deu/src/vs/workbench/parts/snippets/electron-browser/insertSnippet.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"snippet.suggestions.label": "Codeausschnitt einfügen",
-	"sep.userSnippet": "Benutzercodeausschnitte",
-	"sep.extSnippet": "Erweiterungscodeausschnitte"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json b/i18n/deu/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json
deleted file mode 100644
index a09996ad139..00000000000
--- a/i18n/deu/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"snippetSchema.json.default": "Leerer Codeausschnitt",
-	"snippetSchema.json": "Benutzerkonfiguration des Codeausschnitts",
-	"snippetSchema.json.prefix": "Das Präfix, das beim Auswählen des Codeausschnitts in IntelliSense verwendet werden soll.",
-	"snippetSchema.json.body": "Der Inhalt des Codeausschnitts. Verwenden Sie \"$1\", \"${1:defaultText}\", um Cursorpositionen zu definieren, und \"$0\" für die finale Cursorposition. Fügen Sie mit \"${varName}\" und \"${varName:defaultText}\" Variablenwerte ein, z. B. \"This is file: $TM_FILENAME\".",
-	"snippetSchema.json.description": "Die Beschreibung des Codeausschnitts.",
-	"snippetSchema.json.scope": "Eine Liste von Sprachnamen, für die dieser Codeausschnitt gilt. Beispiel: \"typescript,javascript\"."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json b/i18n/deu/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json
deleted file mode 100644
index ddf2fdf01ab..00000000000
--- a/i18n/deu/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"source.snippetGlobal": "Globaler Benutzercodeausschnitt",
-	"source.snippet": "Benutzercodeausschnitt"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json b/i18n/deu/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
deleted file mode 100644
index da21c5deaa2..00000000000
--- a/i18n/deu/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"invalid.path.0": "Expected string in `contributes.{0}.path`. Provided value: {1}",
-	"invalid.language.0": "Beim Auslassen der Sprache muss der Wert von \"contributes.{0}.path\" eine \".code-snippets\"-Datei sein. Angegebener Wert: {1}",
-	"invalid.language": "Unbekannte Sprache in \"contributes.{0}.language\". Bereitgestellter Wert: {1}",
-	"invalid.path.1": "Es wurde erwartet, dass \"contributes.{0}.path\" ({1}) im Ordner ({2}) der Erweiterung enthalten ist. Dies führt ggf. dazu, dass die Erweiterung nicht portierbar ist.",
-	"vscode.extension.contributes.snippets": "Trägt Codeausschnitte bei.",
-	"vscode.extension.contributes.snippets-language": "Der Sprachbezeichner, für den dieser Codeausschnitt beigetragen wird.",
-	"vscode.extension.contributes.snippets-path": "Der Pfad der Codeausschnittdatei. Der Pfad ist relativ zum Erweiterungsordner und beginnt normalerweise mit \". /snippets/\".",
-	"badVariableUse": "Bei mindestens einem Ausschnitt von der Erweiterung \"{0}\" sind Ausschnittsvariablen und Ausschnittsplatzhalter vertauscht (weitere Informationen finden Sie unter https://code.visualstudio.com/docs/editor/userdefinedsnippets#_snippet-syntax).",
-	"badFile": "Die Ausschnittsdatei \"{0}\" konnte nicht gelesen werden.",
-	"detail.snippet": "{0} ({1})",
-	"snippetSuggest.longLabel": "{0}, {1}"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/snippets/electron-browser/tabCompletion.i18n.json b/i18n/deu/src/vs/workbench/parts/snippets/electron-browser/tabCompletion.i18n.json
deleted file mode 100644
index f6f359f47ad..00000000000
--- a/i18n/deu/src/vs/workbench/parts/snippets/electron-browser/tabCompletion.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"tabCompletion": "Fügt Codeausschnitte ein, wenn ihr Präfix übereinstimmt. Funktioniert am besten, wenn \"quickSuggestions\" nicht aktiviert sind."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/surveys/electron-browser/languageSurveys.contribution.i18n.json b/i18n/deu/src/vs/workbench/parts/surveys/electron-browser/languageSurveys.contribution.i18n.json
deleted file mode 100644
index 4f5c93b0864..00000000000
--- a/i18n/deu/src/vs/workbench/parts/surveys/electron-browser/languageSurveys.contribution.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"helpUs": "Helfen Sie uns die Unterstützung für {0} zu verbessern",
-	"takeShortSurvey": "An kurzer Umfrage teilnehmen",
-	"remindLater": "Später erinnern",
-	"neverAgain": "Nicht mehr anzeigen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/surveys/electron-browser/nps.contribution.i18n.json b/i18n/deu/src/vs/workbench/parts/surveys/electron-browser/nps.contribution.i18n.json
deleted file mode 100644
index 3acd207c608..00000000000
--- a/i18n/deu/src/vs/workbench/parts/surveys/electron-browser/nps.contribution.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"surveyQuestion": "Wir würden uns freuen, wenn Sie an einer schnellen Umfrage teilnehmen.",
-	"takeSurvey": "An Umfrage teilnehmen",
-	"remindLater": "Später erinnern",
-	"neverAgain": "Nicht mehr anzeigen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/tasks/browser/buildQuickOpen.i18n.json b/i18n/deu/src/vs/workbench/parts/tasks/browser/buildQuickOpen.i18n.json
deleted file mode 100644
index b8a1db0f78f..00000000000
--- a/i18n/deu/src/vs/workbench/parts/tasks/browser/buildQuickOpen.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"noTasksMatching": "Keine übereinstimmenden Aufgaben"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/tasks/browser/quickOpen.i18n.json b/i18n/deu/src/vs/workbench/parts/tasks/browser/quickOpen.i18n.json
deleted file mode 100644
index bdd5e5bb31d..00000000000
--- a/i18n/deu/src/vs/workbench/parts/tasks/browser/quickOpen.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"entryAriaLabel": "{0}, tasks",
-	"recentlyUsed": "zuletzt verwendete Aufgaben",
-	"configured": "konfigurierte Aufgaben",
-	"detected": "erkannte Aufgaben",
-	"customizeTask": "Aufgabe konfigurieren"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/tasks/browser/restartQuickOpen.i18n.json b/i18n/deu/src/vs/workbench/parts/tasks/browser/restartQuickOpen.i18n.json
deleted file mode 100644
index 5c23eff8b3c..00000000000
--- a/i18n/deu/src/vs/workbench/parts/tasks/browser/restartQuickOpen.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"tasksAriaLabel": "Name einer neu zu startenden Aufgabe eingeben",
-	"noTasksMatching": "Keine übereinstimmenden Aufgaben",
-	"noTasksFound": "Keine neu zu startenden Aufgaben gefunden."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/tasks/browser/taskQuickOpen.i18n.json b/i18n/deu/src/vs/workbench/parts/tasks/browser/taskQuickOpen.i18n.json
deleted file mode 100644
index 8a9f0ed4666..00000000000
--- a/i18n/deu/src/vs/workbench/parts/tasks/browser/taskQuickOpen.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"tasksAriaLabel": "Geben Sie den Namen des auszuführenden Tasks ein.",
-	"noTasksMatching": "Keine übereinstimmenden Tasks",
-	"noTasksFound": "Es wurden keine Tasks gefunden."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/tasks/browser/terminateQuickOpen.i18n.json b/i18n/deu/src/vs/workbench/parts/tasks/browser/terminateQuickOpen.i18n.json
deleted file mode 100644
index 21abcbf4e40..00000000000
--- a/i18n/deu/src/vs/workbench/parts/tasks/browser/terminateQuickOpen.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"tasksAriaLabel": "Type the name of a task to terminate",
-	"noTasksMatching": "Keine übereinstimmenden Tasks",
-	"noTasksFound": "No tasks to terminate found"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/tasks/browser/testQuickOpen.i18n.json b/i18n/deu/src/vs/workbench/parts/tasks/browser/testQuickOpen.i18n.json
deleted file mode 100644
index b8a1db0f78f..00000000000
--- a/i18n/deu/src/vs/workbench/parts/tasks/browser/testQuickOpen.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"noTasksMatching": "Keine übereinstimmenden Aufgaben"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json b/i18n/deu/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json
deleted file mode 100644
index 4bee31d66e2..00000000000
--- a/i18n/deu/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json
+++ /dev/null
@@ -1,76 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"ProblemPatternParser.loopProperty.notLast": "Die loop-Eigenschaft wird nur für Matcher für die letzte Zeile unterstützt.",
-	"ProblemPatternParser.problemPattern.kindProperty.notFirst": "Das Problemmuster ist ungültig. Die Eigenschaft darf nur im ersten Element angegeben werden.",
-	"ProblemPatternParser.problemPattern.missingRegExp": "Im Problemmuster fehlt ein regulärer Ausdruck.",
-	"ProblemPatternParser.problemPattern.missingProperty": "Das Problemmuster ist ungültig. Es muss mindestens eine Datei und eine Nachricht aufweisen.",
-	"ProblemPatternParser.problemPattern.missingLocation": "Das Problemmuster ist ungültig. Es muss die Art \"Datei\" oder eine Zeile oder eine Speicherort-Übereinstimmungsgruppe aufweisen.",
-	"ProblemPatternParser.invalidRegexp": "Fehler: Die Zeichenfolge {0} ist kein gültiger regulärer Ausdruck.\n",
-	"ProblemPatternSchema.regexp": "Der reguläre Ausdruck zum Ermitteln eines Fehlers, einer Warnung oder von Informationen in der Ausgabe.",
-	"ProblemPatternSchema.kind": "Ob das Muster einen Speicherort (Datei und Zeile) oder nur eine Datei enthält.",
-	"ProblemPatternSchema.file": "Der Übereinstimmungsgruppenindex des Dateinamens. Wenn keine Angabe erfolgt, wird 1 verwendet.",
-	"ProblemPatternSchema.location": "Der Übereinstimmungsgruppenindex der Position des Problems. Gültige Positionsmuster: (line), (line,column) und (startLine,startColumn,endLine,endColumn). Wenn keine Angabe erfolgt, wird (line,column) angenommen.",
-	"ProblemPatternSchema.line": "Der Übereinstimmungsgruppenindex der Zeile des Problems. Der Standardwert ist 2.",
-	"ProblemPatternSchema.column": "Der Übereinstimmungsgruppenindex des Zeilenzeichens des Problems. Der Standardwert ist 3.",
-	"ProblemPatternSchema.endLine": "Der Übereinstimmungsgruppenindex der Endzeile des Problems. Der Standardwert ist undefiniert.",
-	"ProblemPatternSchema.endColumn": "Der Übereinstimmungsgruppenindex des Zeilenendezeichens des Problems. Der Standardwert ist undefiniert.",
-	"ProblemPatternSchema.severity": "Der Übereinstimmungsgruppenindex des Schweregrads des Problems. Der Standardwert ist undefiniert.",
-	"ProblemPatternSchema.code": "Der Übereinstimmungsgruppenindex des Codes des Problems. Der Standardwert ist undefiniert.",
-	"ProblemPatternSchema.message": "Der Übereinstimmungsgruppenindex der Nachricht. Wenn keine Angabe erfolgt, ist der Standardwert 4, wenn die Position angegeben wird. Andernfalls ist der Standardwert 5.",
-	"ProblemPatternSchema.loop": "Gibt in einer mehrzeiligen Abgleichschleife an, ob dieses Muster in einer Schleife ausgeführt wird, wenn es übereinstimmt. Kann nur für ein letztes Muster in einem mehrzeiligen Muster angegeben werden.",
-	"NamedProblemPatternSchema.name": "Der Name des Problemmusters.",
-	"NamedMultiLineProblemPatternSchema.name": "Der Name des mehrzeiligen Problemmusters.",
-	"NamedMultiLineProblemPatternSchema.patterns": "Die aktuellen Muster.",
-	"ProblemPatternExtPoint": "Trägt Problemmuster bei",
-	"ProblemPatternRegistry.error": "Ungültiges Problemmuster. Das Muster wird ignoriert.",
-	"ProblemMatcherParser.noProblemMatcher": "Fehler: Die Beschreibung kann nicht in einen Problemabgleich konvertiert werden:\n{0}\n",
-	"ProblemMatcherParser.noProblemPattern": "Fehler: Die Beschreibung definiert kein gültiges Problemmuster:\n{0}\n",
-	"ProblemMatcherParser.noOwner": "Fehler: Die Beschreibung definiert keinen Besitzer:\n{0}\n",
-	"ProblemMatcherParser.noFileLocation": "Fehler: Die Beschreibung definiert keinen Dateispeicherort:\n{0}\n",
-	"ProblemMatcherParser.unknownSeverity": "Info: unbekannter Schweregrad {0}. Gültige Werte sind Fehler, Warnung und Info.\n",
-	"ProblemMatcherParser.noDefinedPatter": "Fehler: Das Muster mit dem Bezeichner {0} ist nicht vorhanden.",
-	"ProblemMatcherParser.noIdentifier": "Fehler: Die Mustereigenschaft verweist auf einen leeren Bezeichner.",
-	"ProblemMatcherParser.noValidIdentifier": "Fehler: Die Mustereigenschaft {0} ist kein gültiger Name für eine Mustervariable.",
-	"ProblemMatcherParser.problemPattern.watchingMatcher": "Ein Problemmatcher muss ein Anfangsmuster und ein Endmuster für die Überwachung definieren.",
-	"ProblemMatcherParser.invalidRegexp": "Fehler: Die Zeichenfolge {0} ist kein gültiger regulärer Ausdruck.\n",
-	"WatchingPatternSchema.regexp": "Der reguläre Ausdruck zum Erkennen des Anfangs oder Endes eines Hintergrundtasks.",
-	"WatchingPatternSchema.file": "Der Übereinstimmungsgruppenindex des Dateinamens. Kann ausgelassen werden.",
-	"PatternTypeSchema.name": "Der Name eines beigetragenen oder vordefinierten Musters",
-	"PatternTypeSchema.description": "Ein Problemmuster oder der Name eines beigetragenen oder vordefinierten Problemmusters. Kann ausgelassen werden, wenn die Basis angegeben ist.",
-	"ProblemMatcherSchema.base": "Der Name eines zu verwendenden Basisproblemabgleichers.",
-	"ProblemMatcherSchema.owner": "Der Besitzer des Problems im Code. Kann ausgelassen werden, wenn \"base\" angegeben wird. Der Standardwert ist \"external\", wenn keine Angabe erfolgt und \"base\" nicht angegeben wird.",
-	"ProblemMatcherSchema.source": "Eine visuell lesbare Zeichenfolge, die die Quelle dieser Diagnose beschreibt, z. B. \"typescript\" oder \"super lint\".",
-	"ProblemMatcherSchema.severity": "Der Standardschweregrad für Erfassungsprobleme. Dieser wird verwendet, wenn das Muster keine Übereinstimmungsgruppe für den Schweregrad definiert.",
-	"ProblemMatcherSchema.applyTo": "Steuert, ob ein für ein Textdokument gemeldetes Problem nur auf geöffnete, geschlossene oder alle Dokumente angewendet wird.",
-	"ProblemMatcherSchema.fileLocation": "Definiert, wie Dateinamen interpretiert werden sollen, die in einem Problemmuster gemeldet werden.",
-	"ProblemMatcherSchema.background": "Muster zum Nachverfolgen des Beginns und Endes eines Abgleichers, der für eine Hintergrundaufgabe aktiv ist.",
-	"ProblemMatcherSchema.background.activeOnStart": "Wenn dieser Wert auf \"true\" festgelegt wird, befindet sich die Hintergrundüberwachung im aktiven Modus, wenn die Aufgabe gestartet wird. Dies entspricht dem Ausgeben einer Zeile, die mit dem \"beginPattern\" übereinstimmt.",
-	"ProblemMatcherSchema.background.beginsPattern": "Wenn eine Übereinstimmung mit der Ausgabe vorliegt, wird der Start einer Hintergrundaufgabe signalisiert.",
-	"ProblemMatcherSchema.background.endsPattern": "Wenn eine Übereinstimmung mit der Ausgabe vorliegt, wird das Ende einer Hintergrundaufgabe signalisiert.",
-	"ProblemMatcherSchema.watching.deprecated": "Die Überwachungseigenschaft ist veraltet. Verwenden Sie stattdessen den Hintergrund.",
-	"ProblemMatcherSchema.watching": "Muster zum Nachverfolgen des Beginns und Endes eines Problemabgleicher.",
-	"ProblemMatcherSchema.watching.activeOnStart": "Wenn dieser Wert auf \"true\" festgelegt wird, befindet sich die Überwachung im aktiven Modus, wenn der Task gestartet wird. Dies entspricht dem Ausgeben einer Zeile, die mit dem \"beginPattern\" übereinstimmt.",
-	"ProblemMatcherSchema.watching.beginsPattern": "Wenn eine Übereinstimmung mit der Ausgabe vorliegt, wird der Start eines Überwachungstasks signalisiert.",
-	"ProblemMatcherSchema.watching.endsPattern": "Wenn eine Übereinstimmung mit der Ausgabe vorliegt, wird das Ende eines Überwachungstasks signalisiert.",
-	"LegacyProblemMatcherSchema.watchedBegin.deprecated": "Diese Eigenschaft ist veraltet. Verwenden Sie stattdessen die Überwachungseigenschaft.",
-	"LegacyProblemMatcherSchema.watchedBegin": "Ein regulärer Ausdruck, der signalisiert, dass die Ausführung eines überwachten Tasks (ausgelöst durch die Dateiüberwachung) beginnt.",
-	"LegacyProblemMatcherSchema.watchedEnd.deprecated": "Diese Eigenschaft ist veraltet. Verwenden Sie stattdessen die Überwachungseigenschaft.",
-	"LegacyProblemMatcherSchema.watchedEnd": "Ein regulärer Ausdruck, der signalisiert, dass die Ausführung eines überwachten Tasks beendet wird.",
-	"NamedProblemMatcherSchema.name": "Der Name des Problemabgleichers, anhand dessen auf ihn verwiesen wird.",
-	"NamedProblemMatcherSchema.label": "Eine lesbare Bezeichnung für den Problemabgleicher.",
-	"ProblemMatcherExtPoint": "Trägt Problemabgleicher bei",
-	"msCompile": "Microsoft-Compilerprobleme",
-	"lessCompile": "LESS Probleme",
-	"gulp-tsc": "Gulp-TSC-Probleme",
-	"jshint": "JSHint-Probleme",
-	"jshint-stylish": "JSHint-Stilprobleme",
-	"eslint-compact": "ESLint-Komprimierungsprobleme",
-	"eslint-stylish": "ESLint-Stilprobleme",
-	"go": "Go Probleme"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/tasks/common/taskConfiguration.i18n.json b/i18n/deu/src/vs/workbench/parts/tasks/common/taskConfiguration.i18n.json
deleted file mode 100644
index b78817aed4c..00000000000
--- a/i18n/deu/src/vs/workbench/parts/tasks/common/taskConfiguration.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"ConfigurationParser.invalidCWD": "Warnung: \"options.cwd\" muss vom Typ \"string\" sein. Der Wert {0} wird ignoriert.\n",
-	"ConfigurationParser.noargs": "Fehler: Befehlsargumente müssen ein Array aus Zeichenfolgen sein. Angegebener Wert:\n{0}",
-	"ConfigurationParser.noShell": "Warnung: Die Shell-Konfiguration wird nur beim Ausführen von Tasks im Terminal unterstützt.",
-	"ConfigurationParser.noName": "Fehler: Der Problemabgleich im Deklarationsbereich muss einen Namen besitzen:\n{0}\n",
-	"ConfigurationParser.unknownMatcherKind": "Warnung: Der definierte Problemabgleich ist unbekannt. Die folgenden Typen werden unterstützt: string | ProblemMatcher | (string | ProblemMatcher)[].\n{0}\n",
-	"ConfigurationParser.invalidVaraibleReference": "Fehler: Ungültiger ProblemMatcher-Verweis: {0}\n",
-	"ConfigurationParser.noTaskName": "Fehler: Tasks müssen eine Eigenschaft \"TaskName\" angeben. Der Task wird ignoriert.\n{0}\n",
-	"taskConfiguration.shellArgs": "Warnung: Die Aufgabe \"{0}\" ist ein Shellbefehl, und der Befehlsname oder eines seiner Argumente enthält Leerzeichen ohne Escapezeichen. Führen Sie Argumente im Befehl zusammen, um eine korrekte Angabe der Befehlszeile sicherzustellen.",
-	"taskConfiguration.noCommandOrDependsOn": "Fehler: Aufgabe \"{0}\" definiert keinen Befehl bzw. keine depondsOn-Eigenschaft. Die Aufgabe wird ignoriert. Die Definition lautet:\n{1}",
-	"taskConfiguration.noCommand": "Fehler: Aufgabe \"{0}\" definiert keinen Befehl. Die Aufgabe wird ignoriert. Die Definition lautet:\n{1}"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/tasks/common/taskDefinitionRegistry.i18n.json b/i18n/deu/src/vs/workbench/parts/tasks/common/taskDefinitionRegistry.i18n.json
deleted file mode 100644
index 9800162f868..00000000000
--- a/i18n/deu/src/vs/workbench/parts/tasks/common/taskDefinitionRegistry.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"TaskDefinition.description": "Der tatsächliche Aufgabentyp. Typen, die mit \"$\" beginnen, sind für den internen Gebrauch reserviert.",
-	"TaskDefinition.properties": "Zusätzliche Eigenschaften des Aufgabentyps",
-	"TaskTypeConfiguration.noType": "In der Konfiguration des Aufgabentyps fehlt die erforderliche taskType-Eigenschaft.",
-	"TaskDefinitionExtPoint": "Trägt Aufgabenarten bei"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/tasks/common/taskTemplates.i18n.json b/i18n/deu/src/vs/workbench/parts/tasks/common/taskTemplates.i18n.json
deleted file mode 100644
index 6ca1830012d..00000000000
--- a/i18n/deu/src/vs/workbench/parts/tasks/common/taskTemplates.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"dotnetCore": "Führt den .NET Core-Buildbefehl aus.",
-	"msbuild": "Führt das Buildziel aus.",
-	"externalCommand": "Ein Beispiel für das Ausführen eines beliebigen externen Befehls.",
-	"Maven": "Führt allgemeine Maven-Befehle aus."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/tasks/common/taskTypeRegistry.i18n.json b/i18n/deu/src/vs/workbench/parts/tasks/common/taskTypeRegistry.i18n.json
deleted file mode 100644
index 8b6ad71cd4e..00000000000
--- a/i18n/deu/src/vs/workbench/parts/tasks/common/taskTypeRegistry.i18n.json
+++ /dev/null
@@ -1,6 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/tasks/electron-browser/jsonSchemaCommon.i18n.json b/i18n/deu/src/vs/workbench/parts/tasks/electron-browser/jsonSchemaCommon.i18n.json
deleted file mode 100644
index a1ab9369583..00000000000
--- a/i18n/deu/src/vs/workbench/parts/tasks/electron-browser/jsonSchemaCommon.i18n.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"JsonSchema.options": "Weitere Befehlsoptionen",
-	"JsonSchema.options.cwd": "Das aktuelle Arbeitsverzeichnis des ausgeführten Programms oder Skripts. Wenn keine Angabe erfolgt, wird das aktuelle Arbeitsbereich-Stammverzeichnis des Codes verwendet.",
-	"JsonSchema.options.env": "Die Umgebung des ausgeführten Programms oder der Shell. Wenn keine Angabe erfolgt, wird Umgebung des übergeordneten Prozesses verwendet.",
-	"JsonSchema.shellConfiguration": "Konfiguriert die zu verwendende Shell.",
-	"JsonSchema.shell.executable": "Die zu verwendende Shell.",
-	"JsonSchema.shell.args": "Die Shell-Argumente.",
-	"JsonSchema.command": "Der auszuführende Befehl. Es kann sich um ein externes Programm oder einen Shellbefehl handeln.",
-	"JsonSchema.tasks.args": "Argumente, die an den Befehl übergeben werden, wenn diese Aufgabe aufgerufen wird.",
-	"JsonSchema.tasks.taskName": "Der Name des Tasks.",
-	"JsonSchema.tasks.windows": "Windows-spezifische Befehlskonfiguration",
-	"JsonSchema.tasks.mac": "Mac-spezifische Befehlskonfiguration",
-	"JsonSchema.tasks.linux": "Linux-spezifische Befehlskonfiguration",
-	"JsonSchema.tasks.suppressTaskName": "Steuert, ob der Taskname dem Befehl als Argument hinzugefügt wird. Wenn keine Angabe erfolgt, wird der global definierte Wert verwendet.",
-	"JsonSchema.tasks.showOutput": "Steuert, ob die Ausgabe des aktuell ausgeführten Tasks angezeigt wird. Wenn keine Angabe erfolgt, wird der global definierte Wert verwendet.",
-	"JsonSchema.echoCommand": "Steuert, ob der ausgeführte Befehl in der Ausgabe angezeigt wird. Der Standardwert ist \"false\".",
-	"JsonSchema.tasks.watching.deprecation": "Veraltet. Verwenden Sie stattdessen \"isBackground\".",
-	"JsonSchema.tasks.watching": "Gibt an, ob der ausgeführte Task aktiv bleibt, und überwacht das Dateisystem.",
-	"JsonSchema.tasks.background": "Ob die ausgeführte Aufgabe weiterhin besteht und im Hintergrund ausgeführt wird.",
-	"JsonSchema.tasks.promptOnClose": "Ob der Benutzer aufgefordert wird, wenn VS Code bei einer aktuell ausgeführten Aufgabe geschlossen wird.",
-	"JsonSchema.tasks.build": "Ordnet diesen Task dem Standardbuildbefehl des Codes zu.",
-	"JsonSchema.tasks.test": "Ordnet diesen Task dem Standardtestbefehl des Codes zu.",
-	"JsonSchema.tasks.matchers": "Die zu verwendenden Problemabgleicher. Es kann sich um eine Zeichenfolge, eine Problemabgleicherdefinition oder ein Array aus Zeichenfolgen und Problemabgleichern handeln.",
-	"JsonSchema.args": "Weitere Argumente, die an den Befehl übergeben werden.",
-	"JsonSchema.showOutput": "Steuert, ob die Ausgabe des aktuell ausgeführten Tasks angezeigt wird. Wenn keine Angabe erfolgt, wird \"always\" verwendet.",
-	"JsonSchema.watching.deprecation": "Veraltet. Verwenden Sie stattdessen \"isBackground\".",
-	"JsonSchema.watching": "Gibt an, ob der ausgeführte Task aktiv bleibt, und überwacht das Dateisystem.",
-	"JsonSchema.background": "Ob die ausgeführte Aufgabe weiterhin besteht und im Hintergrund ausgeführt wird.",
-	"JsonSchema.promptOnClose": "Gibt an, ob dem Benutzer eine Eingabeaufforderung angezeigt wird, wenn VS Code mit einem aktuell ausgeführten Hintergrundtask geschlossen wird.",
-	"JsonSchema.suppressTaskName": "Steuert, ob der Taskname dem Befehl als Argument hinzugefügt wird. Der Standardwert ist \"false\".",
-	"JsonSchema.taskSelector": "Ein Präfix zum Angeben, dass ein Argument ein Task ist.",
-	"JsonSchema.matchers": "Die zu verwendenden Problemabgleicher. Es kann sich um eine Zeichenfolge, eine Problemabgleicherdefinition oder ein Array aus Zeichenfolgen und Problemabgleichern handeln.",
-	"JsonSchema.tasks": "Die Taskkonfigurationen. Normalerweise sind diese Erweiterungen der bereits in der externen Taskausführung definierten Tasks."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v1.i18n.json b/i18n/deu/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v1.i18n.json
deleted file mode 100644
index b16ab6e2140..00000000000
--- a/i18n/deu/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v1.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"JsonSchema.version": "Die Versionsnummer der Konfiguration.",
-	"JsonSchema._runner": "Die Ausführung ist abgestuft. Verwenden Sie die offizielle Ausführungseigenschaft.",
-	"JsonSchema.runner": "Definiert, ob die Aufgabe als Prozess ausgeführt wird, und die Ausgabe wird im Ausgabefenster oder innerhalb des Terminals angezeigt.",
-	"JsonSchema.windows": "Windows-spezifische Befehlskonfiguration",
-	"JsonSchema.mac": "Mac-spezifische Befehlskonfiguration",
-	"JsonSchema.linux": "Linux-spezifische Befehlskonfiguration",
-	"JsonSchema.shell": "Gibt an, ob der Befehl ein Shellbefehl oder ein externes Programm ist. Wenn keine Angabe erfolgt, ist der Standardwert \"false\"."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json b/i18n/deu/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
deleted file mode 100644
index b3a9bfb6f09..00000000000
--- a/i18n/deu/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"JsonSchema.shell": "Gibt an, ob der Befehl ein Shellbefehl oder ein externes Programm ist. Wenn keine Angabe erfolgt, ist der Standardwert \"false\".",
-	"JsonSchema.tasks.isShellCommand.deprecated": "Die isShellCommand-Eigenschaft ist veraltet. Verwenden Sie stattdessen die type-Eigenschaft der Aufgabe und die Shell-Eigenschaft in den Optionen. Weitere Informationen finden Sie auch in den Anmerkungen zur Version 1.14. ",
-	"JsonSchema.tasks.dependsOn.string": "Eine weitere Aufgabe, von der diese Aufgabe abhängt.",
-	"JsonSchema.tasks.dependsOn.array": "Die anderen Aufgaben, von denen diese Aufgabe abhängt.",
-	"JsonSchema.tasks.presentation": "Konfiguriert das zum Darstellen der Aufgabenausgabe verwendete Panel und liest die Eingabe.",
-	"JsonSchema.tasks.presentation.echo": "Steuert, ob der ausgeführte Befehl im Panel angezeigt wird. Der Standardwert ist \"true\". ",
-	"JsonSchema.tasks.presentation.focus": "Steuert, ob das Panel den Fokus hat. der Standardwert ist \"false\". Bei Einstellung auf \"true\" wird das Panel ebenfalls angezeigt.",
-	"JsonSchema.tasks.presentation.reveal.always": "Zeigt immer das Terminal an, wenn diese Aufgabe ausgeführt wird.",
-	"JsonSchema.tasks.presentation.reveal.silent": "Zeigt das Terminal nur an, wenn der Aufgabe kein Problemabgleicher zugeordnet ist und bei der Ausführung Fehler auftreten.",
-	"JsonSchema.tasks.presentation.reveal.never": "Zeigt das Terminal beim Ausführen dieser Aufgabe nie an.",
-	"JsonSchema.tasks.presentation.reveals": "Steuert, ob das Panel, das die Aufgabe ausführt, angezeigt wird. Der Standardwert ist \"always\".",
-	"JsonSchema.tasks.presentation.instance": "Steuert, ob das Panel von Aufgaben gemeinsam genutzt wird, ob es dieser Aufgabe zugewiesen wird oder ob bei jeder Ausführung ein neues Panel erstellt wird.",
-	"JsonSchema.tasks.terminal": "Die terminal-Eigenschaft ist veraltet. Verwenden Sie stattdessen \"presentation\". ",
-	"JsonSchema.tasks.group.kind": "Die Ausführungsgruppe der Aufgabe.",
-	"JsonSchema.tasks.group.isDefault": "Definiert, ob diese Aufgabe die Standardaufgabe in der Gruppe ist.",
-	"JsonSchema.tasks.group.defaultBuild": "Markiert die Aufgabe als Standardbuildaufgabe.",
-	"JsonSchema.tasks.group.defaultTest": "Markiert die Aufgabe als Standardtestaufgabe.",
-	"JsonSchema.tasks.group.build": "Markiert die Aufgabe als Buildaufgabe, auf die über den Befehl \"Buildtask ausführen\" zugegriffen werden kann.",
-	"JsonSchema.tasks.group.test": "Markiert die Aufgaben als Testaufgabe, auf die über den Befehl \"Testtask ausführen\" zugegriffen werden kann.",
-	"JsonSchema.tasks.group.none": "Weist die Aufgabe keiner Gruppe zu.",
-	"JsonSchema.tasks.group": "Definiert die Ausführungsgruppe, zu der diese Aufgabe gehört. Zum Hinzufügen der Aufgabe zur Buildgruppe wird \"build\" unterstützt und zum Hinzufügen zur Testgruppe \"test\".",
-	"JsonSchema.tasks.type": "Definiert, ob die Aufgabe als Prozess oder als Befehl innerhalb einer Shell ausgeführt wird.",
-	"JsonSchema.commandArray": "Der auszuführende Shell-Befehl. Arrayelemente werden mit einem Leerzeichen verknüpft.",
-	"JsonSchema.command.quotedString.value": "Der tatsächliche Sollwert",
-	"JsonSchema.tasks.quoting.escape": "Fügt mithilfe des Escapezeichens der Shell vor Zeichen Escapezeichen ein (z. B. `  bei PowerShell und \\ bei Bash).",
-	"JsonSchema.tasks.quoting.strong": "Setzt das Argument mithilfe des starken Anführungszeichens der Shell in Anführungszeichen (z. B. \" bei PowerShell und Bash).",
-	"JsonSchema.tasks.quoting.weak": "Setzt das Argument mithilfe des schwachen Anführungszeichens der Shell in Anführungszeichen (z. B. ' bei PowerShell und Bash).",
-	"JsonSchema.command.quotesString.quote": "In welche Anführungszeichen der Befehlswert gesetzt wird.",
-	"JsonSchema.command": "Der auszuführende Befehl. Es kann sich um ein externes Programm oder einen Shellbefehl handeln.",
-	"JsonSchema.args.quotedString.value": "Der tatsächliche Argumentwert",
-	"JsonSchema.args.quotesString.quote": "In welche Anführungszeichen der Argumentwert gesetzt wird.",
-	"JsonSchema.tasks.args": "Argumente, die an den Befehl übergeben werden, wenn diese Aufgabe aufgerufen wird.",
-	"JsonSchema.tasks.label": "Die Bezeichnung der Aufgabe der Benutzerschnittstelle",
-	"JsonSchema.version": "Die Versionsnummer der Konfiguration.",
-	"JsonSchema.tasks.identifier": "Ein vom Benutzer definierter Bezeichner, mit dem in \"launch.json\" oder in einer dependsOn-Klausel auf die Aufgabe verwiesen wird.",
-	"JsonSchema.tasks.taskLabel": "Die Bezeichnung der Aufgabe",
-	"JsonSchema.tasks.taskName": "Der Name des Tasks.",
-	"JsonSchema.tasks.taskName.deprecated": "Die name-Eigenschaft der Aufgabe ist veraltet. Verwenden Sie stattdessen die label-Eigenschaft.",
-	"JsonSchema.tasks.background": "Ob die ausgeführte Aufgabe weiterhin besteht und im Hintergrund ausgeführt wird.",
-	"JsonSchema.tasks.promptOnClose": "Ob der Benutzer aufgefordert wird, wenn VS Code bei einer aktuell ausgeführten Aufgabe geschlossen wird.",
-	"JsonSchema.tasks.matchers": "Die zu verwendenden Problemabgleicher. Es kann sich um eine Zeichenfolge, eine Problemabgleicherdefinition oder ein Array aus Zeichenfolgen und Problemabgleichern handeln.",
-	"JsonSchema.customizations.customizes.type": "Der anzupassende Aufgabentyp",
-	"JsonSchema.tasks.customize.deprecated": "Die customize-Eigenschaft ist veraltet. Informationen zur Migration zum neuen Ansatz für die Aufgabenanpassung finden Sie in den Anmerkungen zur Version 1.14.",
-	"JsonSchema.tasks.showOputput.deprecated": "Die showOutput-Eigenschaft ist veraltet. Verwenden Sie stattdessen die reveal-Eigenschaft innerhalb der presentation-Eigenschaft. Weitere Informationen finden Sie auch in den Anmerkungen zur Version 1.14.",
-	"JsonSchema.tasks.echoCommand.deprecated": "Die echoCommand-Eigenschaft ist veraltet. Verwenden Sie stattdessen die echo-Eigenschaft innerhalb der presentation-Eigenschaft. Weitere Informationen finden Sie auch in den Anmerkungen zur Version 1.14. ",
-	"JsonSchema.tasks.suppressTaskName.deprecated": "Die suppressTaskName-Eigenschaft ist veraltet. Binden Sie den Befehl mit den zugehörigen Argumenten stattdessen in die Aufgabe ein. Weitere Informationen finden Sie auch in den Anmerkungen zur Version 1.14.",
-	"JsonSchema.tasks.isBuildCommand.deprecated": "Die isBuildCommand-Eigenschaft ist veraltet. Verwenden Sie stattdessen die group-Eigenschaft. Weitere Informationen finden Sie auch in den Anmerkungen zur Version 1.14. ",
-	"JsonSchema.tasks.isTestCommand.deprecated": "Die isTestCommand-Eigenschaft ist veraltet. Verwenden Sie stattdessen die group-Eigenschaft. Weitere Informationen finden Sie auch in den Anmerkungen zur Version 1.14.",
-	"JsonSchema.tasks.taskSelector.deprecated": "Die taskSelector-Eigenschaft ist veraltet. Binden Sie den Befehl mit den zugehörigen Argumenten stattdessen in die Aufgabe ein. Weitere Informationen finden Sie auch in den Anmerkungen zur Version 1.14.",
-	"JsonSchema.windows": "Windows-spezifische Befehlskonfiguration",
-	"JsonSchema.mac": "Mac-spezifische Befehlskonfiguration",
-	"JsonSchema.linux": "Linux-spezifische Befehlskonfiguration"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json b/i18n/deu/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
deleted file mode 100644
index 5e860baf0d8..00000000000
--- a/i18n/deu/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
+++ /dev/null
@@ -1,89 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"tasksCategory": "Aufgaben",
-	"ConfigureTaskRunnerAction.label": "Aufgabe konfigurieren",
-	"totalErrors": "{0} Fehler",
-	"totalWarnings": "{0} Warnungen",
-	"totalInfos": "{0}-Informationen",
-	"problems": "Probleme",
-	"building": "Wird gebaut...",
-	"manyProblems": "Über 10.000",
-	"runningTasks": "Aktive Aufgaben anzeigen",
-	"tasks": "Aufgaben",
-	"TaskSystem.noHotSwap": "Zum Ändern des Aufgabenausführungsmoduls mit einem aktiven Task muss das Fenster erneut geladen werden.",
-	"reloadWindow": "Fenster erneut laden",
-	"TaskServer.folderIgnored": "Der Ordner {0} wird ignoriert, da er Aufgabenversion 0.1.0 verwendet",
-	"TaskService.noBuildTask1": "Keine Buildaufgabe definiert. Markieren Sie eine Aufgabe mit 'isBuildCommand' in der tasks.json-Datei.",
-	"TaskService.noBuildTask2": "Es ist keine Buildaufgabe definiert. Markieren Sie eine Aufgabe in der Datei \"tasks.json\" als \"Buildgruppe\". ",
-	"TaskService.noTestTask1": "Keine Testaufgabe definiert. Markieren Sie eine Aufgabe mit 'isTestCommand' in der tasks.json-Datei.",
-	"TaskService.noTestTask2": "Es ist keine Testaufgabe definiert. Markieren Sie eine Aufgabe in der Datei \"tasks.json\" als \"Testgruppe\". ",
-	"TaskServer.noTask": "Die angeforderte auszuführende Aufgabe {0} wurde nicht gefunden.",
-	"TaskService.associate": "assoziieren",
-	"TaskService.attachProblemMatcher.continueWithout": "Ohne Überprüfung der Aufgabenausgabe fortsetzen",
-	"TaskService.attachProblemMatcher.never": "Aufgabenausgabe nie überprüfen",
-	"TaskService.attachProblemMatcher.learnMoreAbout": "Weitere Informationen zur Überprüfung der Aufgabenausgabe",
-	"selectProblemMatcher": "Fehler- und Warnungsarten auswählen, auf die die Aufgabenausgabe überprüft werden soll",
-	"customizeParseErrors": "Die aktuelle Aufgabenkonfiguration weist Fehler auf. Beheben Sie die Fehler, bevor Sie eine Aufgabe anpassen.",
-	"moreThanOneBuildTask": "In \"tasks.json\" sind mehrere Buildaufgaben definiert. Die erste wird ausgeführt.\n",
-	"TaskSystem.activeSame.background": "Die Aufgabe \"{0}\" ist bereits aktiv und befindet sich im Hintergrundmodus.",
-	"TaskSystem.activeSame.noBackground": "Die Aufgabe \"{0}\" ist bereits aktiv.",
-	"terminateTask": "Aufgabe beenden",
-	"restartTask": "Aufgabe neu starten",
-	"TaskSystem.active": "Eine aktive Aufgabe wird bereits ausgeführt. Beenden Sie diese, bevor Sie eine andere Aufgabe ausführen.",
-	"TaskSystem.restartFailed": "Fehler beim Beenden und Neustarten der Aufgabe \"{0}\".",
-	"TaskService.noConfiguration": "Fehler: Die Aufgabenerkennung {0} hat für die folgende Konfiguration keine Aufgabe beigetragen:\n {1}\nDie Aufgabe wird ignoriert.\n",
-	"TaskSystem.configurationErrors": "Fehler: Die angegebene Aufgabenkonfiguration weist Validierungsfehler auf und kann nicht verwendet werden. Beheben Sie zuerst die Fehler.",
-	"taskService.ignoreingFolder": "Die Aufgabenkonfigurationen für den Arbeitsbereichsordner {0} werden ignoriert.  Für die Aufgabenunterstützung von Arbeitsbereichen mit mehreren Ordner müssen alle Ordner die Aufgabenversion 2.0.0 verwenden.\n",
-	"TaskSystem.invalidTaskJson": "Fehler: Der Inhalt der Datei \"tasks.json\" weist Syntaxfehler auf. Bitte korrigieren sie diese, bevor Sie einen Task ausführen.\n",
-	"TaskSystem.runningTask": "Es wird ein Task ausgeführt wird. Möchten Sie ihn beenden?",
-	"TaskSystem.terminateTask": "&&Task beenden",
-	"TaskSystem.noProcess": "Der gestartete Task ist nicht mehr vorhanden. Wenn der Task Hintergrundprozesse erzeugt hat, kann das Beenden von VS Code ggf. zu verwaisten Prozessen führen. Starten Sie den letzten Hintergrundprozess mit einer wait-Kennzeichnung, um dies zu vermeiden.",
-	"TaskSystem.exitAnyways": "&&Trotzdem beenden",
-	"TerminateAction.label": "Aufgabe beenden",
-	"TaskSystem.unknownError": "Fehler beim Ausführen eines Tasks. Details finden Sie im Taskprotokoll.",
-	"TaskService.noWorkspace": "Aufgaben sind nur für einen Arbeitsbereichsordner verfügbar.",
-	"recentlyUsed": "zuletzt verwendete Aufgaben",
-	"configured": "konfigurierte Aufgaben",
-	"detected": "erkannte Aufgaben",
-	"TaskService.ignoredFolder": "Die folgenden Arbeitsbereichsordner werden ignoriert, da sie Aufgabenversion 0.1.0 verwenden: {0}",
-	"TaskService.notAgain": "Nicht mehr anzeigen",
-	"TaskService.pickRunTask": "Auszuführende Aufgabe auswählen",
-	"TaslService.noEntryToRun": "Es wurde keine auszuführende Aufgabe gefunden. Aufgaben konfigurieren...",
-	"TaskService.fetchingBuildTasks": "Buildaufgaben werden abgerufen...",
-	"TaskService.pickBuildTask": "Auszuführende Buildaufgabe auswählen",
-	"TaskService.noBuildTask": "Keine auszuführende Buildaufgabe gefunden. Buildaufgabe konfigurieren...",
-	"TaskService.fetchingTestTasks": "Testaufgaben werden abgerufen...",
-	"TaskService.pickTestTask": "Auszuführende Testaufgabe auswählen",
-	"TaskService.noTestTaskTerminal": "Es wurde keine auszuführende Testaufgabe gefunden. Aufgaben konfigurieren...",
-	"TaskService.tastToTerminate": "Zu beendende Aufgabe auswählen",
-	"TaskService.noTaskRunning": "Zurzeit wird keine Aufgabe ausgeführt.",
-	"TerminateAction.noProcess": "Der gestartete Prozess ist nicht mehr vorhanden. Wenn der Task Hintergrundtasks erzeugt hat, kann das Beenden von VS Code ggf. zu verwaisten Prozessen führen.",
-	"TerminateAction.failed": "Fehler beim Beenden des ausgeführten Tasks.",
-	"TaskService.tastToRestart": "Neu zu startende Aufgabe auswählen",
-	"TaskService.noTaskToRestart": "Es ist keine neu zu startende Aufgabe vorhanden.",
-	"TaskService.template": "Aufgabenvorlage auswählen",
-	"TaskService.createJsonFile": "Datei \"tasks.json\" aus Vorlage erstellen",
-	"TaskService.openJsonFile": "Datei \"tasks.json\" öffnen",
-	"TaskService.pickTask": "Zu konfigurierende Aufgabe auswählen",
-	"TaskService.defaultBuildTaskExists": "{0} ist bereits als Standardbuildaufgabe markiert.",
-	"TaskService.pickDefaultBuildTask": "Als Standardbuildaufgabe zu verwendende Aufgabe auswählen",
-	"TaskService.defaultTestTaskExists": "{0} ist bereits als Standardtestaufgabe markiert.",
-	"TaskService.pickDefaultTestTask": "Als Standardtestaufgabe zu verwendende Aufgabe auswählen",
-	"TaskService.pickShowTask": "Aufgabe zum Anzeigen der Ausgabe auswählen",
-	"TaskService.noTaskIsRunning": "Es wird keine Aufgabe ausgeführt.",
-	"ShowLogAction.label": "Taskprotokoll anzeigen",
-	"RunTaskAction.label": "Task ausführen",
-	"RestartTaskAction.label": "Ausgeführte Aufgabe neu starten",
-	"ShowTasksAction.label": "Aktive Aufgaben anzeigen",
-	"BuildAction.label": "Buildtask ausführen",
-	"TestAction.label": "Testtask ausführen",
-	"ConfigureDefaultBuildTask.label": "Standardbuildaufgabe konfigurieren ",
-	"ConfigureDefaultTestTask.label": "Standardtestaufgabe konfigurieren",
-	"quickOpen.task": "Task ausführen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/tasks/electron-browser/taskPanel.i18n.json b/i18n/deu/src/vs/workbench/parts/tasks/electron-browser/taskPanel.i18n.json
deleted file mode 100644
index 4e81718d2e4..00000000000
--- a/i18n/deu/src/vs/workbench/parts/tasks/electron-browser/taskPanel.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"tasks": "Aufgaben"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.i18n.json b/i18n/deu/src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.i18n.json
deleted file mode 100644
index dd6cd0fe365..00000000000
--- a/i18n/deu/src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"TerminalTaskSystem.unknownError": "Unbekannter Fehler beim Ausführen eines Tasks. Details finden Sie im Taskausgabeprotokoll.",
-	"dependencyFailed": "Die abhängige Aufgabe \"{0}\" im Arbeitsbereichsordner \"{1}\" konnte nicht aufgelöst werden.",
-	"TerminalTaskSystem.terminalName": "Aufgabe - {0}",
-	"closeTerminal": "Betätigen Sie eine beliebige Taste, um das Terminal zu schließen.",
-	"reuseTerminal": "Das Terminal wird von Aufgaben wiederverwendet, drücken Sie zum Schließen eine beliebige Taste.",
-	"TerminalTaskSystem": "Ein Shell-Befehl kann nicht mithilfe von cmd.exe auf einem UNC-Laufwerk ausgeführt werden.",
-	"unkownProblemMatcher": "Der Problemabgleicher {0} kann nicht aufgelöst werden. Der Abgleicher wird ignoriert."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/tasks/node/processRunnerDetector.i18n.json b/i18n/deu/src/vs/workbench/parts/tasks/node/processRunnerDetector.i18n.json
deleted file mode 100644
index 98f2e7ace3a..00000000000
--- a/i18n/deu/src/vs/workbench/parts/tasks/node/processRunnerDetector.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"TaskSystemDetector.noGulpTasks": "Die Ausführung von \"gulp -tasks-simple\" hat keine Tasks aufgelistet. Haben Sie \"npm install\" ausgeführt?",
-	"TaskSystemDetector.noJakeTasks": "Die Ausführung von \"jake -tasks\" hat keine Tasks aufgelistet. Haben Sie \"npm install\" ausgeführt?",
-	"TaskSystemDetector.noGulpProgram": "Gulp ist auf Ihrem System nicht installiert. Führen Sie \"npm install -g gulp\" aus, um die Anwendung zu installieren.",
-	"TaskSystemDetector.noJakeProgram": "Jake ist auf Ihrem System nicht installiert. Führen Sie \"npm install -g jake\" aus, um die Anwendung zu installieren.",
-	"TaskSystemDetector.noGruntProgram": "Grunt ist auf Ihrem System nicht installiert. Führen Sie \"npm install -g grunt\" aus, um die Anwendung zu installieren.",
-	"TaskSystemDetector.noProgram": "Das Programm {0} wurde nicht gefunden. Die Meldung lautet: {1}",
-	"TaskSystemDetector.buildTaskDetected": "Ein Buildtask namens \"{0}\" wurde erkannt.",
-	"TaskSystemDetector.testTaskDetected": "Ein Testtask namens \"{0}\" wurde erkannt."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/tasks/node/processTaskSystem.i18n.json b/i18n/deu/src/vs/workbench/parts/tasks/node/processTaskSystem.i18n.json
deleted file mode 100644
index 206c3e8098f..00000000000
--- a/i18n/deu/src/vs/workbench/parts/tasks/node/processTaskSystem.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"TaskRunnerSystem.unknownError": "Unbekannter Fehler beim Ausführen eines Tasks. Details finden Sie im Taskausgabeprotokoll.",
-	"TaskRunnerSystem.watchingBuildTaskFinished": "\nDie Überwachung der Buildtasks wurde beendet.",
-	"TaskRunnerSystem.childProcessError": "Failed to launch external program {0} {1}.",
-	"TaskRunnerSystem.cancelRequested": "\nDer Task \"{0}\" wurde durch eine Benutzeranforderung beendet.",
-	"unkownProblemMatcher": "Der Problemabgleicher {0} kann nicht aufgelöst werden. Der Abgleicher wird ignoriert."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json b/i18n/deu/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
deleted file mode 100644
index 4f46618a812..00000000000
--- a/i18n/deu/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"ConfigurationParser.invalidCWD": "Warnung: \"options.cwd\" muss vom Typ \"string\" sein. Der Wert {0} wird ignoriert.\n",
-	"ConfigurationParser.inValidArg": "Fehler: Befehlsargumente müssen Zeichenfolgen oder Zeichenfolgen in Anführungszeichen sein. Der angegebene Wert ist:\n{0}",
-	"ConfigurationParser.noargs": "Fehler: Befehlsargumente müssen ein Array aus Zeichenfolgen sein. Angegebener Wert:\n{0}",
-	"ConfigurationParser.noShell": "Warnung: Die Shell-Konfiguration wird nur beim Ausführen von Tasks im Terminal unterstützt.",
-	"ConfigurationParser.noName": "Fehler: Der Problemabgleich im Deklarationsbereich muss einen Namen besitzen:\n{0}\n",
-	"ConfigurationParser.unknownMatcherKind": "Warnung: Der definierte Problemabgleich ist unbekannt. Die folgenden Typen werden unterstützt: string | ProblemMatcher | (string | ProblemMatcher)[].\n{0}\n",
-	"ConfigurationParser.invalidVaraibleReference": "Fehler: Ungültiger ProblemMatcher-Verweis: {0}\n",
-	"ConfigurationParser.noTaskType": "Fehler: Die Aufgabenkonfiguration muss eine type-Eigenschaft enthalten. Die Konfiguration wird ignoriert.\n{0}\n",
-	"ConfigurationParser.noTypeDefinition": "Fehler: Der registrierte Aufgabentyp \"{0}\" ist nicht vorhanden. Wurde möglicherweise eine Erweiterung nicht installiert, die den entsprechenden Aufgabenanbieter bereitstellt?",
-	"ConfigurationParser.missingRequiredProperty": "Fehler: Die Aufgabenkonfiguration \"{0}\" enthält die erforderlich Eigenschaft \"{1}\" nicht. Die Aufgabenkonfiguration wird ignoriert.",
-	"ConfigurationParser.notCustom": "Fehler: Die Aufgabe ist nicht als benutzerdefinierte Aufgabe deklariert. Die Konfiguration wird ignoriert.\n{0}\n",
-	"ConfigurationParser.noTaskName": "Fehler: Eine Aufgabe muss eine label-Eigenschaft angeben. Die Aufgabe wird ignoriert.\n{0}\n",
-	"taskConfiguration.noCommandOrDependsOn": "Fehler: Aufgabe \"{0}\" definiert keinen Befehl bzw. keine depondsOn-Eigenschaft. Die Aufgabe wird ignoriert. Die Definition lautet:\n{1}",
-	"taskConfiguration.noCommand": "Fehler: Aufgabe \"{0}\" definiert keinen Befehl. Die Aufgabe wird ignoriert. Die Definition lautet:\n{1}",
-	"TaskParse.noOsSpecificGlobalTasks": "Die Aufgabenversion 2.0.0 unterstützt globale betriebssystemspezifische Aufgaben nicht. Konvertieren Sie sie in eine Aufgabe mit einem betriebssystemspezifischen Befehl. Folgende Aufgaben sind hiervon betroffen:\n{0}"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.i18n.json b/i18n/deu/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.i18n.json
deleted file mode 100644
index baf84ca2434..00000000000
--- a/i18n/deu/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"termEntryAriaLabel": "{0}, Terminalauswahl",
-	"termCreateEntryAriaLabel": "{0}, neues Terminal erstellen",
-	"workbench.action.terminal.newplus": "$(plus) Neues integriertes Terminal erstellen",
-	"noTerminalsMatching": "Keine übereinstimmenden Terminals",
-	"noTerminalsFound": "Keine geöffneten Terminals"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/terminal/common/terminalColorRegistry.i18n.json b/i18n/deu/src/vs/workbench/parts/terminal/common/terminalColorRegistry.i18n.json
deleted file mode 100644
index 84fc7fe0d67..00000000000
--- a/i18n/deu/src/vs/workbench/parts/terminal/common/terminalColorRegistry.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"terminal.background": "Die Hintergrundfarbe des Terminals, dies ermöglicht eine unterschiedliche Färbung des Terminals im Panel.",
-	"terminal.foreground": "Die Vordergrundfarbe des Terminal.",
-	"terminalCursor.foreground": "Die Vordergrundfarbe des Terminalcursors.",
-	"terminalCursor.background": "Die Hintergrundfarbe des Terminalcursors. Ermöglicht das Anpassen der Farbe eines Zeichens, das von einem Blockcursor überdeckt wird.",
-	"terminal.selectionBackground": "Die Auswahlvordergrundfarbe des Terminals.",
-	"terminal.border": "Die Farbe des Rahmens, der Bereiche innerhalb des Terminals teilt. Der Standardwert ist panel.border.",
-	"terminal.ansiColor": "\"{0}\" ANSI-Farbe im Terminal"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json b/i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
deleted file mode 100644
index e7e17f13a86..00000000000
--- a/i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"quickOpen.terminal": "Alle geöffneten Terminals anzeigen",
-	"terminal": "Terminal",
-	"terminalIntegratedConfigurationTitle": "Integriertes Terminal",
-	"terminal.integrated.shell.linux": "Der Pfad der Shell, den das Terminal unter Linux verwendet.",
-	"terminal.integrated.shellArgs.linux": "Die Befehlszeilenargumente, die für das Linux-Terminal verwendet werden sollen.",
-	"terminal.integrated.shell.osx": "Der Pfad der Shell, den das Terminal unter OS X verwendet.",
-	"terminal.integrated.shellArgs.osx": "Die Befehlszeilenargumente, die für das OS X-Terminal verwendet werden sollen.",
-	"terminal.integrated.shell.windows": "Der Pfad der Shell, den das Terminal unter Windows verwendet, wenn in Windows enthaltene Terminals verwendet werden  (cmd, PowerShell oder Bash unter Ubuntu).",
-	"terminal.integrated.shellArgs.windows": "Die Befehlszeilenargumente, die im Windows-Terminal verwendet werden sollen.",
-	"terminal.integrated.macOptionIsMeta": "Optionsschlüssel als Metaschlüssel im Terminal auf macOS behandeln.",
-	"terminal.integrated.copyOnSelection": "Wenn gesetzt, wird der im Terminal ausgewählte Text in die Zwischenablage kopiert.",
-	"terminal.integrated.fontFamily": "Steuert die Schriftartfamilie des Terminals. Der Standardwert ist \"editor.fontFamily\".",
-	"terminal.integrated.fontSize": "Steuert den Schriftgrad des Terminals in Pixeln.",
-	"terminal.integrated.letterSpacing": "Steuert den Buchstabenabstand im Terminal. Dies ist ein Integerwert, der die Anzahl der zusätzlichen Pixel zwischen den einzelnen Zeichen darstellt.",
-	"terminal.integrated.lineHeight": "Steuert die Zeilenhöhe für das Terminal. Dieser Wert wird mit dem Schriftgrad des Terminals multipliziert, um die tatsächliche Zeilenhöhe in Pixeln zu erhalten.",
-	"terminal.integrated.fontWeight": "Die innerhalb des Terminals zu verwendende Schriftbreite für nicht fetten Text.",
-	"terminal.integrated.fontWeightBold": "Die innerhalb des Terminals zu verwendende Schriftbreite für fetten Text.",
-	"terminal.integrated.cursorBlinking": "Steuert, ob der Terminalcursor blinkt.",
-	"terminal.integrated.cursorStyle": "Steuert den Stil des Terminalcursors.",
-	"terminal.integrated.scrollback": "Steuert die maximale Anzahl von Zeilen, die das Terminal im Puffer beibehält.",
-	"terminal.integrated.setLocaleVariables": "Steuert, ob Gebietsschemavariablen beim Start des Terminals festgelegt werden. Der Standardwert ist unter OS X TRUE und FALSE auf anderen Plattformen.",
-	"terminal.integrated.rendererType": "Hiermit wird gesteuert, wie das Terminal gerendert wird. Mögliche Werte sind \"canvas\" für den (schnellen) Standardbereichsrenderer, \"dom\" für den als Ersatz gedachten DOM-basierten Renderer oder \"auto\" (hierbei bestimmt VS Code den geeignetsten Renderer automatisch). VS Code muss neu geladen werden, damit Änderungen wirksam werden.",
-	"terminal.integrated.rightClickBehavior": "Steuert, wie das Terminal auf Rechtsklicks reagiert. Mögliche Werte sind \"default\", \"copyPaste\" und \"selectWord\". Bei \"default\" wird das Kontextmenü angezeigt. Bei \"copyPaste\" wird, wenn eine Auswahl getroffen wurde, diese in die Zwischenablage kopiert oder, wenn keine Auswahl getroffen wurde, der Inhalt der Zwischenablage eingefügt. Bei \"selectWord\" schließlich wird das Wort unter dem Cursor ausgewählt und das Kontextmenü angezeigt.",
-	"terminal.integrated.cwd": "Ein expliziter Startpfad zum Starten des Terminals, dies dient als das aktuelle Arbeitsverzeichnis (CWD) für den Shellprozess. Dies ist insbesondere in Arbeitsbereichseinstellungen praktisch, wenn das Stammverzeichnis kein passendes CWD ist.",
-	"terminal.integrated.confirmOnExit": "Ob aktive Terminalsitzungen beim Beenden bestätigt werden sollen.",
-	"terminal.integrated.enableBell": "Gibt an, ob die Terminalglocke aktiviert ist.",
-	"terminal.integrated.commandsToSkipShell": "Eine Sammlung von Befehls-IDs, deren Tastenzuordnungen nicht an die Shell gesendet und die stattdessen immer durch Code verarbeitet werden. Dies ermöglicht die Verwendung von Tastenzuordnungen, die normalerweise von der Shell verwendet würden, um das gleiche Verhalten wie bei einem Terminal ohne Fokus zu erzielen, z. B. STRG+P zum Starten von Quick Open.",
-	"terminal.integrated.env.osx": "Objekt mit Umgebungsvariablen, das dem unter OS X vom Terminal zu verwendenden VS Code-Prozess hinzugefügt wird",
-	"terminal.integrated.env.linux": "Objekt mit Umgebungsvariablen, das dem unter Linux vom Terminal zu verwendenden VS Code-Prozess hinzugefügt wird",
-	"terminal.integrated.env.windows": "Objekt mit Umgebungsvariablen, das dem unter Windows vom Terminal zu verwendenden VS Code-Prozess hinzugefügt wird",
-	"terminal.integrated.showExitAlert": "Warnung \"Der Terminalprozess wurde mit folgendem Exitcode beendet\" anzeigen, wenn der Exitcode nicht Null ist.",
-	"terminal.integrated.experimentalRestore": "Ob aktive Terminalsitzungen für den Arbeitsbereich beim Starten von VS Code automatisch wiederhergestellt werden sollen. Diese Einstellung ist in der Testphase, kann fehlerhaft sein und in Zukunft geändert werden.",
-	"terminalCategory": "Terminal",
-	"viewCategory": "Anzeigen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json b/i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
deleted file mode 100644
index 17f468b874b..00000000000
--- a/i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
+++ /dev/null
@@ -1,63 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"workbench.action.terminal.toggleTerminal": "Integriertes Terminal umschalten",
-	"workbench.action.terminal.kill": "Aktive Terminalinstanz beenden",
-	"workbench.action.terminal.kill.short": "Terminal beenden",
-	"workbench.action.terminal.quickKill": "Terminalinstanz beenden",
-	"workbench.action.terminal.copySelection": "Auswahl kopieren",
-	"workbench.action.terminal.selectAll": "Alles auswählen",
-	"workbench.action.terminal.deleteWordLeft": "Wort links löschen",
-	"workbench.action.terminal.deleteWordRight": "Wort rechts löschen",
-	"workbench.action.terminal.moveToLineStart": "Zum Zeilenanfang",
-	"workbench.action.terminal.moveToLineEnd": "Zum Zeilenende",
-	"workbench.action.terminal.new": "Neues integriertes Terminal erstellen",
-	"workbench.action.terminal.new.short": "Neues Terminal",
-	"workbench.action.terminal.newWorkspacePlaceholder": "Aktuelles Arbeitsverzeichnis für neues Terminal auswählen",
-	"workbench.action.terminal.newInActiveWorkspace": "Neues integriertes Terminal erstellen (in aktivem Arbeitsbereich)",
-	"workbench.action.terminal.split": "Terminal verdoppeln",
-	"workbench.action.terminal.splitInActiveWorkspace": "Terminal teilen (in aktivem Arbeitsbereich)",
-	"workbench.action.terminal.focusPreviousPane": "Fokus in vorherigem Bereich",
-	"workbench.action.terminal.focusNextPane": "Fokus in nächstem Bereich",
-	"workbench.action.terminal.resizePaneLeft": "Größe des linken Bereichs ändern",
-	"workbench.action.terminal.resizePaneRight": "Größe des rechten Bereichs ändern",
-	"workbench.action.terminal.resizePaneUp": "Größe des oberen Bereichs ändern",
-	"workbench.action.terminal.resizePaneDown": "Größe des unteren Bereichs ändern",
-	"workbench.action.terminal.focus": "Fokus im Terminal",
-	"workbench.action.terminal.focusNext": "Fokus im nächsten Terminal",
-	"workbench.action.terminal.focusPrevious": "Fokus im vorherigen Terminal",
-	"workbench.action.terminal.paste": "In aktives Terminal einfügen",
-	"workbench.action.terminal.DefaultShell": "Standardshell auswählen",
-	"workbench.action.terminal.runSelectedText": "Ausgewählten Text im aktiven Terminal ausführen",
-	"workbench.action.terminal.runActiveFile": "Aktive Datei im aktiven Terminal ausführen",
-	"workbench.action.terminal.runActiveFile.noFile": "Nur Dateien auf der Festplatte können im Terminal ausgeführt werden.",
-	"workbench.action.terminal.switchTerminal": "Terminal wechseln",
-	"workbench.action.terminal.scrollDown": "Nach unten scrollen (Zeile)",
-	"workbench.action.terminal.scrollDownPage": "Nach unten scrollen (Seite)",
-	"workbench.action.terminal.scrollToBottom": "Bildlauf nach unten",
-	"workbench.action.terminal.scrollUp": "Nach oben scrollen (Zeile)",
-	"workbench.action.terminal.scrollUpPage": "Nach oben scrollen (Seite)",
-	"workbench.action.terminal.scrollToTop": "Bildlauf nach oben",
-	"workbench.action.terminal.clear": "Löschen",
-	"workbench.action.terminal.clearSelection": "Auswahl löschen",
-	"workbench.action.terminal.allowWorkspaceShell": "Shell-Konfiguration des Arbeitsbereichs zulassen",
-	"workbench.action.terminal.disallowWorkspaceShell": "Verbiete Workspace Shell Konfiguration",
-	"workbench.action.terminal.rename": "Umbenennen",
-	"workbench.action.terminal.rename.prompt": "Terminalnamen eingeben",
-	"workbench.action.terminal.focusFindWidget": "Widget zum Anzeigen der Suche mit Fokus",
-	"workbench.action.terminal.hideFindWidget": "Widget zum Ausblenden der Suche",
-	"nextTerminalFindTerm": "Nächsten Suchbegriff anzeigen",
-	"previousTerminalFindTerm": "Vorherigen Suchbegriff anzeigen",
-	"quickOpenTerm": "Aktives Terminal wechseln",
-	"workbench.action.terminal.scrollToPreviousCommand": "Zu vorherigem Befehl scrollen",
-	"workbench.action.terminal.scrollToNextCommand": "Zu nächstem Befehl scrollen",
-	"workbench.action.terminal.selectToPreviousCommand": "Auswählen bis zu vorherigem Befehl",
-	"workbench.action.terminal.selectToNextCommand": "Auswählen bis zu nächstem Befehl",
-	"workbench.action.terminal.selectToPreviousLine": " Auswählen bis zur vorherigen Zeile ",
-	"workbench.action.terminal.selectToNextLine": "Auswählen bis zur nächsten Zeile"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json b/i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
deleted file mode 100644
index 84fc7fe0d67..00000000000
--- a/i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"terminal.background": "Die Hintergrundfarbe des Terminals, dies ermöglicht eine unterschiedliche Färbung des Terminals im Panel.",
-	"terminal.foreground": "Die Vordergrundfarbe des Terminal.",
-	"terminalCursor.foreground": "Die Vordergrundfarbe des Terminalcursors.",
-	"terminalCursor.background": "Die Hintergrundfarbe des Terminalcursors. Ermöglicht das Anpassen der Farbe eines Zeichens, das von einem Blockcursor überdeckt wird.",
-	"terminal.selectionBackground": "Die Auswahlvordergrundfarbe des Terminals.",
-	"terminal.border": "Die Farbe des Rahmens, der Bereiche innerhalb des Terminals teilt. Der Standardwert ist panel.border.",
-	"terminal.ansiColor": "\"{0}\" ANSI-Farbe im Terminal"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalConfigHelper.i18n.json b/i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalConfigHelper.i18n.json
deleted file mode 100644
index e119f512d7a..00000000000
--- a/i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalConfigHelper.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"terminal.integrated.allowWorkspaceShell": "Möchten Sie zulassen, dass {0} (als Arbeitsbereichseinstellung definiert) im Terminal gestartet wird?",
-	"allow": "Allow",
-	"disallow": "Disallow"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalFindWidget.i18n.json b/i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalFindWidget.i18n.json
deleted file mode 100644
index 32db8ee0bd6..00000000000
--- a/i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalFindWidget.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"label.find": "Suchen",
-	"placeholder.find": "Suchen",
-	"label.previousMatchButton": "Vorherige Übereinstimmung",
-	"label.nextMatchButton": "Nächste Übereinstimmung",
-	"label.closeButton": "Schließen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json b/i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json
deleted file mode 100644
index aa2b4267c11..00000000000
--- a/i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"terminal.integrated.a11yBlankLine": "Leere Zeile",
-	"terminal.integrated.a11yPromptLabel": "Terminaleingabe",
-	"terminal.integrated.a11yTooMuchOutput": "Zu viele Ausgaben zum Anzeigen, navigieren Sie manuell zu den Zeilen, um sie zu lesen",
-	"yes": "Ja",
-	"terminal.rendererInAllNewTerminals": "Alle neu erstellten Terminals verwenden den Nicht-GPU-Renderer.",
-	"no": "Nein",
-	"dontShowAgain": "Nicht mehr anzeigen",
-	"terminal.slowRendering": "Der Standardrenderer für das integrierte Terminal ist auf Ihrem Computer offenbar langsam. Möchten Sie zum alternativen DOM-basierten Renderer wechseln? Hierdurch kann die Leistung verbessert werden. [Weitere Informationen zu Terminaleinstellungen](https://code.visualstudio.com/docs/editor/integrated-terminal#_changing-how-the-terminal-is-rendered)",
-	"terminal.integrated.copySelection.noSelection": "Das Terminal enthält keine Auswahl zum Kopieren.",
-	"terminal.integrated.exitedWithCode": "Der Terminalprozess wurde mit folgendem Exitcode beendet: {0}",
-	"terminal.integrated.waitOnExit": "Betätigen Sie eine beliebige Taste, um das Terminal zu schließen.",
-	"terminal.integrated.launchFailed": "Fehler beim Starten des Terminalprozessbefehls \"{0}{1}\" (Exitcode: {2}).",
-	"terminal.integrated.launchFailedExtHost": "Der Terminalprozess konnte nicht gestartet werden (Exitcode: {0})"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalLinkHandler.i18n.json b/i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalLinkHandler.i18n.json
deleted file mode 100644
index 3f1bdc69b0c..00000000000
--- a/i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalLinkHandler.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"terminalLinkHandler.followLinkAlt": "ALT + Mausklick zum Aufrufen des Links",
-	"terminalLinkHandler.followLinkCmd": "BEFEHLSTASTE + Mausklick zum Aufrufen des Links",
-	"terminalLinkHandler.followLinkCtrl": "STRG + Mausklick zum Aufrufen des Links"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json b/i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json
deleted file mode 100644
index 96d60628b01..00000000000
--- a/i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"terminal.useMonospace": "\"monospace\" verwenden",
-	"terminal.monospaceOnly": "Das Terminal unterstützt nur Monospace-Schriftarten.",
-	"copy": "Kopieren",
-	"split": "Teilen",
-	"paste": "Einfügen",
-	"selectAll": "Alles auswählen",
-	"clear": "Löschen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json b/i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
deleted file mode 100644
index 19d73404686..00000000000
--- a/i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"terminal.integrated.chooseWindowsShellInfo": "Sie können die Standardterminalshell über die Schaltfläche \"Anpassen\" ändern.",
-	"customize": "Anpassen",
-	"never again": "Nicht mehr anzeigen",
-	"terminal.integrated.chooseWindowsShell": "Wählen Sie Ihre bevorzugte Terminalshell. Sie können diese später in Ihren Einstellungen ändern.",
-	"terminalService.terminalCloseConfirmationSingular": "Eine aktive Terminalsitzung ist vorhanden. Möchten Sie sie beenden?",
-	"terminalService.terminalCloseConfirmationPlural": "{0} aktive Terminalsitzungen sind vorhanden. Möchten Sie sie beenden?"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/themes/electron-browser/themes.contribution.i18n.json b/i18n/deu/src/vs/workbench/parts/themes/electron-browser/themes.contribution.i18n.json
deleted file mode 100644
index 24c1b53c3b9..00000000000
--- a/i18n/deu/src/vs/workbench/parts/themes/electron-browser/themes.contribution.i18n.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"selectTheme.label": "Farbdesign",
-	"themes.category.light": "Light Themen",
-	"themes.category.dark": "Dunkle Themen",
-	"themes.category.hc": "Hohe Kontrast Themen",
-	"installColorThemes": "Zusätzliche Farbschemas installieren...",
-	"themes.selectTheme": "Farbdesign auswählen (eine Vorschau wird mit den Tasten NACH OBEN/NACH UNTEN angezeigt)",
-	"selectIconTheme.label": "Dateisymboldesign",
-	"noIconThemeLabel": "Keine",
-	"noIconThemeDesc": "Dateisymbole deaktivieren",
-	"installIconThemes": "Zusätzliche Dateisymbolschemas installieren...",
-	"themes.selectIconTheme": "Dateisymboldesign auswählen",
-	"generateColorTheme.label": "Farbdesign aus aktuellen Einstellungen erstellen",
-	"preferences": "Einstellungen",
-	"developer": "Entwickler"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/trust/electron-browser/unsupportedWorkspaceSettings.contribution.i18n.json b/i18n/deu/src/vs/workbench/parts/trust/electron-browser/unsupportedWorkspaceSettings.contribution.i18n.json
deleted file mode 100644
index fd696a9b61a..00000000000
--- a/i18n/deu/src/vs/workbench/parts/trust/electron-browser/unsupportedWorkspaceSettings.contribution.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openWorkspaceSettings": "Arbeitsbereichseinstellungen öffnen",
-	"dontShowAgain": "Nicht mehr anzeigen",
-	"unsupportedWorkspaceSettings": "Dieser Arbeitsbereich enthält Einstellungen, die nur in den Benutzereinstellungen festgelegt werden können ({0}). Klicken Sie [hier]({1}), um mehr zu erfahren."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json b/i18n/deu/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json
deleted file mode 100644
index e9c3a683375..00000000000
--- a/i18n/deu/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"releaseNotesInputName": "Anmerkungen zu dieser Version: {0}",
-	"unassigned": "Nicht zugewiesen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/update/electron-browser/releaseNotesInput.i18n.json b/i18n/deu/src/vs/workbench/parts/update/electron-browser/releaseNotesInput.i18n.json
deleted file mode 100644
index f7b2e85e3d5..00000000000
--- a/i18n/deu/src/vs/workbench/parts/update/electron-browser/releaseNotesInput.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"releaseNotesInputName": "Anmerkungen zu dieser Version: {0}"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/update/electron-browser/update.contribution.i18n.json b/i18n/deu/src/vs/workbench/parts/update/electron-browser/update.contribution.i18n.json
deleted file mode 100644
index d38fff48236..00000000000
--- a/i18n/deu/src/vs/workbench/parts/update/electron-browser/update.contribution.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"release notes": "Anmerkungen zu dieser Version"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/update/electron-browser/update.i18n.json b/i18n/deu/src/vs/workbench/parts/update/electron-browser/update.i18n.json
deleted file mode 100644
index dca9f597357..00000000000
--- a/i18n/deu/src/vs/workbench/parts/update/electron-browser/update.i18n.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"releaseNotes": "Anmerkungen zu dieser Version",
-	"showReleaseNotes": "Anmerkungen zu dieser Version anzeigen",
-	"read the release notes": "Willkommen bei {0} v{1}! Möchten Sie die Hinweise zu dieser Version lesen?",
-	"licenseChanged": "Unsere Lizenzbedingungen haben sich geändert. Bitte klicken Sie [hier]({0}), um die neuen Bedingungen zu lesen.",
-	"neveragain": "Nicht mehr anzeigen",
-	"64bitisavailable": "{0} für 64-Bit-Windows ist jetzt verfügbar! Klicken Sie [hier]({1}), um mehr zu erfahren.",
-	"updateIsReady": "Neues {0}-Update verfügbar.",
-	"noUpdatesAvailable": "Zurzeit sind keine Updates verfügbar.",
-	"ok": "OK",
-	"thereIsUpdateAvailable": "Ein Update ist verfügbar.",
-	"download now": "Jetzt herunterladen",
-	"later": "Später",
-	"updateAvailable": "Ein Update ist verfügbar: {0} {1}",
-	"installUpdate": "Update installieren",
-	"updateInstalling": "{0} {1} wird im Hintergrund installiert. Wir informieren Sie, wenn der Vorgng abgeschlossen ist.",
-	"updateAvailableAfterRestart": "Starten Sie {0} neu, um das neueste Update zu installieren.",
-	"updateNow": "Jetzt aktualisieren",
-	"commandPalette": "Befehlspalette...",
-	"settings": "Einstellungen",
-	"keyboardShortcuts": "Tastenkombinationen",
-	"showExtensions": "Erweiterungen verwalten",
-	"userSnippets": "Benutzercodeausschnitte",
-	"selectTheme.label": "Farbdesign",
-	"themes.selectIconTheme.label": "Dateisymboldesign",
-	"checkForUpdates": "Nach Aktualisierungen suchen...",
-	"checkingForUpdates": "Überprüfen auf Updates...",
-	"DownloadingUpdate": "Das Update wird heruntergeladen...",
-	"installUpdate...": "Update installieren …",
-	"installingUpdate": "Update wird installiert...",
-	"restartToUpdate": "Für Update neu starten..."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/url/electron-browser/url.contribution.i18n.json b/i18n/deu/src/vs/workbench/parts/url/electron-browser/url.contribution.i18n.json
deleted file mode 100644
index d59e6ff3eb2..00000000000
--- a/i18n/deu/src/vs/workbench/parts/url/electron-browser/url.contribution.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openUrl": "URL öffnen",
-	"developer": "Entwickler"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/views/browser/views.i18n.json b/i18n/deu/src/vs/workbench/parts/views/browser/views.i18n.json
deleted file mode 100644
index 17abacb1d8c..00000000000
--- a/i18n/deu/src/vs/workbench/parts/views/browser/views.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"viewToolbarAriaLabel": "{0}-Aktionen",
-	"hideView": "Auf Randleiste ausblenden"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/views/browser/viewsExtensionPoint.i18n.json b/i18n/deu/src/vs/workbench/parts/views/browser/viewsExtensionPoint.i18n.json
deleted file mode 100644
index 79702d24961..00000000000
--- a/i18n/deu/src/vs/workbench/parts/views/browser/viewsExtensionPoint.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"requirearray": "Ansichten müssen ein Array sein.",
-	"requirestring": "Die Eigenschaft \"{0}\" ist erforderlich. Sie muss vom Typ \"string\" sein.",
-	"optstring": "Die Eigenschaft \"{0}\" kann ausgelassen werden oder muss vom Typ \"string\" sein.",
-	"vscode.extension.contributes.view.id": "Bezeichner der Ansicht. Damit können Sie einen Datenanbieter über die API \"vscode.window.registerTreeDataProviderForView\" registrieren. Er dient auch zum Aktivieren Ihrer Erweiterung, indem Sie das Ereignis \"onView:${id}\" für \"activationEvents\" registrieren.",
-	"vscode.extension.contributes.view.name": "Der visuell lesbare Name der Ansicht. Wird angezeigt",
-	"vscode.extension.contributes.view.when": "Bedingung, die zum Anzeigen dieser Ansicht erfüllt sein muss",
-	"vscode.extension.contributes.views": "Trägt Ansichten zum Editor bei.",
-	"views.explorer": "Explorer-Ansicht",
-	"views.debug": "Debugansicht",
-	"locationId.invalid": "{0}\" ist kein gültiger Ansichtenspeicherort"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/watermark/electron-browser/watermark.i18n.json b/i18n/deu/src/vs/workbench/parts/watermark/electron-browser/watermark.i18n.json
deleted file mode 100644
index 75dd72a0490..00000000000
--- a/i18n/deu/src/vs/workbench/parts/watermark/electron-browser/watermark.i18n.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"watermark.showCommands": "Alle Befehle anzeigen",
-	"watermark.quickOpen": "Zu Datei wechseln",
-	"watermark.openFile": "Datei öffnen",
-	"watermark.openFolder": "Ordner öffnen",
-	"watermark.openFileFolder": "Datei oder Ordner öffnen",
-	"watermark.openRecent": "Zuletzt verwendete öffnen",
-	"watermark.newUntitledFile": "Neue unbenannte Datei",
-	"watermark.toggleTerminal": "Terminal umschalten",
-	"watermark.findInFiles": "In Dateien suchen",
-	"watermark.startDebugging": "Debuggen starten",
-	"watermark.unboundCommand": "Ungebunden",
-	"workbenchConfigurationTitle": "Workbench",
-	"tips.enabled": "Wenn diese Option aktiviert ist, werden Tipps zu Wasserzeichen angezeigt, wenn kein Editor geöffnet ist."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json b/i18n/deu/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json
deleted file mode 100644
index 129a60d789e..00000000000
--- a/i18n/deu/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"webview.editor.label": "Webview-Editor",
-	"developer": "Entwickler"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/webview/electron-browser/webviewCommands.i18n.json b/i18n/deu/src/vs/workbench/parts/webview/electron-browser/webviewCommands.i18n.json
deleted file mode 100644
index 1492a37abd0..00000000000
--- a/i18n/deu/src/vs/workbench/parts/webview/electron-browser/webviewCommands.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openToolsLabel": "Webview-Entwicklertools öffnen",
-	"refreshWebviewLabel": "Webviews erneut laden"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json b/i18n/deu/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json
deleted file mode 100644
index 343d4b1d7ec..00000000000
--- a/i18n/deu/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"telemetryOptOut.optOutNotice": "Tragen Sie zur Verbesserung von VS Code bei, und lassen Sie zu, dass Microsoft Nutzungsdaten erfasst. Lesen Sie unsere  [Datenschutzvereinbarung]({0}), und erfahren Sie, wie Sie dies [deaktivieren]({1}).",
-	"telemetryOptOut.optInNotice": "Tragen Sie zur Verbesserung von VS Code bei, und lassen Sie zu, dass Microsoft Nutzungsdaten erfasst. Lesen Sie unsere [Datenschutzvereinbarung]({0}), und erfahren Sie, wie Sie dies [aktivieren]({1}).",
-	"telemetryOptOut.readMore": "Weitere Informationen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/welcome/overlay/browser/welcomeOverlay.i18n.json b/i18n/deu/src/vs/workbench/parts/welcome/overlay/browser/welcomeOverlay.i18n.json
deleted file mode 100644
index 9032ed4ba00..00000000000
--- a/i18n/deu/src/vs/workbench/parts/welcome/overlay/browser/welcomeOverlay.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"welcomeOverlay.explorer": "Datei-Explorer",
-	"welcomeOverlay.search": "In Dateien suchen",
-	"welcomeOverlay.git": "Quellcodeverwaltung",
-	"welcomeOverlay.debug": "Starten und debuggen",
-	"welcomeOverlay.extensions": "Erweiterungen verwalten",
-	"welcomeOverlay.problems": "Fehler und Warnungen anzeigen",
-	"welcomeOverlay.commandPalette": "Alle Befehle suchen und ausführen",
-	"welcomeOverlay.notifications": "Benachrichtigungen anzeigen",
-	"welcomeOverlay": "Benutzeroberflächenüberblick",
-	"hideWelcomeOverlay": "Schnittstellenüberblick ausblenden",
-	"help": "Hilfe"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json b/i18n/deu/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
deleted file mode 100644
index 32b9b62035b..00000000000
--- a/i18n/deu/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"welcomePage.vscode": "Visual Studio Code",
-	"welcomePage.editingEvolved": "Editing evolved",
-	"welcomePage.start": "Starten",
-	"welcomePage.newFile": "Neue Datei",
-	"welcomePage.openFolder": "Ordner öffnen...",
-	"welcomePage.addWorkspaceFolder": "Arbeitsbereichsordner hinzufügen...",
-	"welcomePage.recent": "Zuletzt verwendet",
-	"welcomePage.moreRecent": "Weitere Informationen...",
-	"welcomePage.noRecentFolders": "Keine kürzlich verwendeten Ordner",
-	"welcomePage.help": "Hilfe",
-	"welcomePage.keybindingsCheatsheet": "Druckbare Tastaturübersicht",
-	"welcomePage.introductoryVideos": "Einführungsvideos",
-	"welcomePage.tipsAndTricks": "Tipps und Tricks",
-	"welcomePage.productDocumentation": "Produktdokumentation",
-	"welcomePage.gitHubRepository": "GitHub-Repository",
-	"welcomePage.stackOverflow": "Stack Overflow",
-	"welcomePage.showOnStartup": "Willkommensseite beim Start anzeigen",
-	"welcomePage.customize": "Anpassen",
-	"welcomePage.installExtensionPacks": "Tools und Sprachen",
-	"welcomePage.installExtensionPacksDescription": "Unterstützung für {0} und {1} installieren",
-	"welcomePage.moreExtensions": "mehr",
-	"welcomePage.installKeymapDescription": "Einstellungen und Tastenzuordnungen",
-	"welcomePage.installKeymapExtension": "Installieren Sie die Einstellungen und Tastenkombinationen von {0} und {1}.",
-	"welcomePage.others": "Andere",
-	"welcomePage.colorTheme": "Farbdesign",
-	"welcomePage.colorThemeDescription": "Passen Sie das Aussehen des Editors und Ihres Codes an Ihre Wünsche an.",
-	"welcomePage.learn": "Lernen",
-	"welcomePage.showCommands": "Alle Befehle suchen und ausführen",
-	"welcomePage.showCommandsDescription": "Über die Befehlspalette ({0}) schnell auf Befehle zugreifen und nach Befehlen suchen",
-	"welcomePage.interfaceOverview": "Überblick über die Schnittstelle",
-	"welcomePage.interfaceOverviewDescription": "Erhalten Sie eine visuelle Überlagerung, die die wichtigsten Komponenten der Benutzeroberfläche hervorhebt.",
-	"welcomePage.interactivePlayground": "Interaktiver Playground",
-	"welcomePage.interactivePlaygroundDescription": "Testen Sie die wichtigsten Editorfunktionen in einer kurzen exemplarischen Vorgehensweise."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.contribution.i18n.json b/i18n/deu/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.contribution.i18n.json
deleted file mode 100644
index bbdcf9ec8ce..00000000000
--- a/i18n/deu/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.contribution.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"workbenchConfigurationTitle": "Workbench",
-	"workbench.startupEditor.none": "Ohne Editor starten.",
-	"workbench.startupEditor.welcomePage": "Willkommensseite öffnen (Standard).",
-	"workbench.startupEditor.newUntitledFile": "Eine neue unbenannte Datei öffnen.",
-	"workbench.startupEditor": "Steuert, welcher Editor beim Start angezeigt wird, sofern kein Editor aus der vorherigen Sitzung wiederhergestellt wird. Wählen Sie \"none\" zum Starten ohne Editor, \"welcomePage\" zum Öffnen der Startseite (Standard) oder \"newUntitledFile\" zum Öffnen einer neuen unbenannten Datei (nur beim Öffnen eines leeren Arbeitsbereichs).",
-	"help": "Hilfe"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json b/i18n/deu/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json
deleted file mode 100644
index 35d2fc1d012..00000000000
--- a/i18n/deu/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"welcomePage": "Willkommen",
-	"welcomePage.javaScript": "JavaScript",
-	"welcomePage.typeScript": "TypeScript",
-	"welcomePage.python": "Python",
-	"welcomePage.php": "PHP",
-	"welcomePage.azure": "Azure",
-	"welcomePage.showAzureExtensions": "Azure-Erweiterungen anzeigen",
-	"welcomePage.docker": "Docker",
-	"welcomePage.vim": "Vim",
-	"welcomePage.sublime": "Sublime",
-	"welcomePage.atom": "Atom",
-	"welcomePage.extensionPackAlreadyInstalled": "Unterstützung für {0} ist bereits installiert.",
-	"welcomePage.willReloadAfterInstallingExtensionPack": "Nach dem Installieren zusätzlicher Unterstützung für {0} wird das Fenster neu geladen.",
-	"welcomePage.installingExtensionPack": "Zusätzliche Unterstützung für {0} wird installiert...",
-	"welcomePage.extensionPackNotFound": "Unterstützung für {0} mit der ID {1} wurde nicht gefunden.",
-	"welcomePage.keymapAlreadyInstalled": "Die {0} Tastenkombinationen sind bereits installiert.",
-	"welcomePage.willReloadAfterInstallingKeymap": "Das Fenster wird nach der Installation der {0}-Tastaturbefehle neu geladen.",
-	"welcomePage.installingKeymap": "Die {0}-Tastenkombinationen werden installiert...",
-	"welcomePage.keymapNotFound": "Die {0} Tastenkombinationen mit der ID {1} wurden nicht gefunden.",
-	"welcome.title": "Willkommen",
-	"welcomePage.openFolderWithPath": "Ordner {0}  mit Pfad {1} öffnen",
-	"welcomePage.extensionListSeparator": ",",
-	"welcomePage.installKeymap": "Tastenzuordnung {0} öffnen",
-	"welcomePage.installExtensionPack": "Zusätzliche Unterstützung für {0} installieren",
-	"welcomePage.installedKeymap": "Die Tastaturzuordnung {0} ist bereits installiert.",
-	"welcomePage.installedExtensionPack": "Unterstützung für {0} ist bereits installiert.",
-	"ok": "OK",
-	"details": "Details",
-	"welcomePage.buttonBackground": "Hintergrundfarbe für die Schaltflächen auf der Willkommensseite.",
-	"welcomePage.buttonHoverBackground": "Hoverhintergrundfarbe für die Schaltflächen auf der Willkommensseite."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/welcome/walkThrough/electron-browser/editor/editorWalkThrough.i18n.json b/i18n/deu/src/vs/workbench/parts/welcome/walkThrough/electron-browser/editor/editorWalkThrough.i18n.json
deleted file mode 100644
index 60e8cb1b465..00000000000
--- a/i18n/deu/src/vs/workbench/parts/welcome/walkThrough/electron-browser/editor/editorWalkThrough.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"editorWalkThrough.title": "Interaktiver Playground",
-	"editorWalkThrough": "Interaktiver Playground"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThrough.contribution.i18n.json b/i18n/deu/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThrough.contribution.i18n.json
deleted file mode 100644
index 568878c3f22..00000000000
--- a/i18n/deu/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThrough.contribution.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"walkThrough.editor.label": "Interaktiver Playground",
-	"help": "Hilfe"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughActions.i18n.json b/i18n/deu/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughActions.i18n.json
deleted file mode 100644
index 1d1128cf2bf..00000000000
--- a/i18n/deu/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughActions.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"editorWalkThrough.arrowUp": "Nach oben scrollen (Zeile)",
-	"editorWalkThrough.arrowDown": "Nach unten scrollen (Zeile)",
-	"editorWalkThrough.pageUp": "Nach oben scrollen (Seite)",
-	"editorWalkThrough.pageDown": "Nach unten scrollen (Seite)"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughPart.i18n.json b/i18n/deu/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughPart.i18n.json
deleted file mode 100644
index ee17c235517..00000000000
--- a/i18n/deu/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughPart.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"walkThrough.unboundCommand": "Ungebunden",
-	"walkThrough.gitNotFound": "Git scheint auf Ihrem System nicht installiert zu sein.",
-	"walkThrough.embeddedEditorBackground": "Hintergrundfarbe für die eingebetteten Editoren im Interaktiven Playground."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/services/actions/electron-browser/menusExtensionPoint.i18n.json b/i18n/deu/src/vs/workbench/services/actions/electron-browser/menusExtensionPoint.i18n.json
deleted file mode 100644
index 5dc1bba0ffa..00000000000
--- a/i18n/deu/src/vs/workbench/services/actions/electron-browser/menusExtensionPoint.i18n.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"requirearray": "Menüelemente müssen ein Array sein.",
-	"requirestring": "Die Eigenschaft \"{0}\" ist erforderlich. Sie muss vom Typ \"string\" sein.",
-	"optstring": "Die Eigenschaft \"{0}\" kann ausgelassen werden oder muss vom Typ \"string\" sein.",
-	"vscode.extension.contributes.menuItem.command": "Der Bezeichner des auszuführenden Befehls. Der Befehl muss im Abschnitt \"commands\" deklariert werden.",
-	"vscode.extension.contributes.menuItem.alt": "Der Bezeichner eines alternativ auszuführenden Befehls. Der Befehl muss im Abschnitt \"commands\" deklariert werden.",
-	"vscode.extension.contributes.menuItem.when": "Eine Bedingung, die TRUE sein muss, damit dieses Element angezeigt wird.",
-	"vscode.extension.contributes.menuItem.group": "Die Gruppe, zu der dieser Befehl gehört.",
-	"vscode.extension.contributes.menus": "Trägt Menüelemente zum Editor bei.",
-	"menus.commandPalette": "Die Befehlspalette ",
-	"menus.touchBar": "Die Touch Bar (nur macOS)",
-	"menus.editorTitle": "Das Editor-Titelmenü.",
-	"menus.editorContext": "Das Editor-Kontextmenü.",
-	"menus.explorerContext": "Das Kontextmenü des Datei-Explorers.",
-	"menus.editorTabContext": "Das Kontextmenü für die Editor-Registerkarten",
-	"menus.debugCallstackContext": "Das Kontextmenü für den Debug-Callstack",
-	"menus.scmTitle": "Das Titelmenü der Quellcodeverwaltung",
-	"menus.scmSourceControl": "Das Menü \"Quellcodeverwaltung\"",
-	"menus.resourceGroupContext": "Das Ressourcengruppen-Kontextmenü der Quellcodeverwaltung",
-	"menus.resourceStateContext": "Das Ressourcenstatus-Kontextmenü der Quellcodeverwaltung",
-	"view.viewTitle": "Das beigetragene Editor-Titelmenü.",
-	"view.itemContext": "Das beigetragene Anzeigeelement-Kontextmenü.",
-	"nonempty": "Es wurde ein nicht leerer Wert erwartet.",
-	"opticon": "Die Eigenschaft \"icon\" kann ausgelassen werden oder muss eine Zeichenfolge oder ein Literal wie \"{dark, light}\" sein.",
-	"requireStringOrObject": "Die Eigenschaft \"{0}\" ist obligatorisch und muss vom Typ \"Zeichenfolge\" oder \"Objekt\" sein.",
-	"requirestrings": "Die Eigenschaften \"{0}\" und \"{1}\" sind obligatorisch und müssen vom Typ \"Zeichenfolge\" sein.",
-	"vscode.extension.contributes.commandType.command": "Der Bezeichner des auszuführenden Befehls.",
-	"vscode.extension.contributes.commandType.title": "Der Titel, durch den der Befehl in der Benutzeroberfläche dargestellt wird.",
-	"vscode.extension.contributes.commandType.category": "(Optionale) Kategoriezeichenfolge, nach der der Befehl in der Benutzeroberfläche gruppiert wird.",
-	"vscode.extension.contributes.commandType.icon": "(Optional) Das Symbol, das verwendet wird, um den Befehl in der Benutzeroberfläche darzustellen. Es handelt sich um einen Dateipfad oder eine designfähige Konfiguration.",
-	"vscode.extension.contributes.commandType.icon.light": "Der Symbolpfad, wenn ein helles Design verwendet wird.",
-	"vscode.extension.contributes.commandType.icon.dark": "Der Symbolpfad, wenn ein dunkles Design verwendet wird.",
-	"vscode.extension.contributes.commands": "Trägt Befehle zur Befehlspalette bei.",
-	"dup": "Der Befehl \"{0}\" ist mehrmals im Abschnitt \"commands\" vorhanden.",
-	"menuId.invalid": "\"{0}\" ist kein gültiger Menübezeichner.",
-	"missing.command": "Das Menüelement verweist auf einen Befehl \"{0}\", der im Abschnitt \"commands\" nicht definiert ist.",
-	"missing.altCommand": "Das Menüelement verweist auf einen Alternativbefehl \"{0}\", der im Abschnitt \"commands\" nicht definiert ist.",
-	"dupe.command": "Das Menüelement verweist auf den gleichen Befehl wie der Standard- und der Alternativbefehl."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/services/bulkEdit/electron-browser/bulkEditService.i18n.json b/i18n/deu/src/vs/workbench/services/bulkEdit/electron-browser/bulkEditService.i18n.json
deleted file mode 100644
index e2cea319b36..00000000000
--- a/i18n/deu/src/vs/workbench/services/bulkEdit/electron-browser/bulkEditService.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"summary.0": "Keine Änderungen vorgenommen",
-	"summary.nm": "{0} Änderungen am Text in {1} Dateien vorgenommen",
-	"summary.n0": "{0} Änderungen am Text in einer Datei vorgenommen",
-	"conflict": "Die folgenden Dateien wurden in der Zwischenzeit geändert: {0}"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/services/configuration/common/configurationExtensionPoint.i18n.json b/i18n/deu/src/vs/workbench/services/configuration/common/configurationExtensionPoint.i18n.json
deleted file mode 100644
index 6dfaa8e09e1..00000000000
--- a/i18n/deu/src/vs/workbench/services/configuration/common/configurationExtensionPoint.i18n.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.contributes.configuration.title": "Eine Zusammenfassung der Einstellungen. Diese Bezeichnung wird in der Einstellungsdatei als trennender Kommentar verwendet.",
-	"vscode.extension.contributes.configuration.properties": "Die Beschreibung der Konfigurationseigenschaften.",
-	"scope.application.description": "Anwendungsspezifische Konfiguration, die nur in den Benutzereinstellungen konfiguriert werden kann.",
-	"scope.window.description": "Fensterspezifische Konfiguration, die in den Benutzer- oder Arbeitsbereichseinstellungen konfiguriert werden kann.",
-	"scope.resource.description": "Ressourcenspezifische Konfiguration, die in den Benutzer-, Arbeitsbereichs- oder Ordnereinstellungen konfiguriert werden kann.",
-	"scope.description": "Bereich, in dem die Konfiguration gültig ist. Verfügbare Gültigkeitsbereiche sind \"window\" und \"resource\".",
-	"vscode.extension.contributes.defaultConfiguration": "Trägt zu Konfigurationeinstellungen des Standard-Editors für die jeweilige Sprache bei.",
-	"vscode.extension.contributes.configuration": "Trägt Konfigurationseigenschaften bei.",
-	"invalid.title": "configuration.title muss eine Zeichenfolge sein.",
-	"invalid.properties": "\"configuration.properties\" muss ein Objekt sein.",
-	"invalid.property": "\"configuration.property\" muss ein Objekt sein.",
-	"invalid.allOf": "\"configuration.allOf\" ist veraltet und sollte nicht mehr verwendet werden. Übergeben Sie stattdessen mehrere Konfigurationsabschnitte als Array an den Beitragspunkt \"configuration\".",
-	"workspaceConfig.folders.description": "Liste von Ordnern, die in den Arbeitsbereich geladen werden.",
-	"workspaceConfig.path.description": "Ein Dateipfad, z. B. \" /root/folderA\" oder \"./folderA\" bei einem relativen Pfad, der in Bezug auf den Speicherort der Arbeitsbereichsdatei  aufgelöst wird.",
-	"workspaceConfig.name.description": "Ein optionaler Name für den Ordner.",
-	"workspaceConfig.uri.description": "URI des Ordners",
-	"workspaceConfig.settings.description": "Arbeitsbereichseinstellungen",
-	"workspaceConfig.launch.description": "Arbeitsbereichs-Startkonfigurationen",
-	"workspaceConfig.extensions.description": "Arbeitsbereichserweiterungen",
-	"unknownWorkspaceProperty": "Unbekannte Arbeitsbereichs-Konfigurationseigenschaft"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/services/configuration/node/configuration.i18n.json b/i18n/deu/src/vs/workbench/services/configuration/node/configuration.i18n.json
deleted file mode 100644
index d6a37d8334e..00000000000
--- a/i18n/deu/src/vs/workbench/services/configuration/node/configuration.i18n.json
+++ /dev/null
@@ -1,24 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"vscode.extension.contributes.configuration.title": "Eine Zusammenfassung der Einstellungen. Diese Bezeichnung wird in der Einstellungsdatei als trennender Kommentar verwendet.",
-	"vscode.extension.contributes.configuration.properties": "Die Beschreibung der Konfigurationseigenschaften.",
-	"scope.window.description": "Fensterspezifische Konfiguration, die in den Benutzer- oder Arbeitsbereichseinstellungen konfiguriert werden kann.",
-	"scope.resource.description": "Ressourcenspezifische Konfiguration, die in den Benutzer-, Arbeitsbereichs- oder Ordnereinstellungen konfiguriert werden kann.",
-	"scope.description": "Bereich, in dem die Konfiguration gültig ist. Verfügbare Gültigkeitsbereiche sind \"window\" und \"resource\".",
-	"vscode.extension.contributes.configuration": "Trägt Konfigurationseigenschaften bei.",
-	"invalid.title": "configuration.title muss eine Zeichenfolge sein.",
-	"vscode.extension.contributes.defaultConfiguration": "Trägt zu Konfigurationeinstellungen des Standard-Editors für die jeweilige Sprache bei.",
-	"invalid.properties": "\"configuration.properties\" muss ein Objekt sein.",
-	"invalid.allOf": "\"configuration.allOf\" ist veraltet und sollte nicht mehr verwendet werden. Übergeben Sie stattdessen mehrere Konfigurationsabschnitte als Array an den Beitragspunkt \"configuration\".",
-	"workspaceConfig.folders.description": "Liste von Ordnern, die in den Arbeitsbereich geladen werden.",
-	"workspaceConfig.path.description": "Ein Dateipfad, z. B. \" /root/folderA\" oder \"./folderA\" bei einem relativen Pfad, der in Bezug auf den Speicherort der Arbeitsbereichsdatei  aufgelöst wird.",
-	"workspaceConfig.name.description": "Ein optionaler Name für den Ordner.",
-	"workspaceConfig.uri.description": "URI des Ordners",
-	"workspaceConfig.settings.description": "Arbeitsbereichseinstellungen",
-	"workspaceConfig.extensions.description": "Arbeitsbereichserweiterungen",
-	"unknownWorkspaceProperty": "Unbekannte Arbeitsbereichs-Konfigurationseigenschaft"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json b/i18n/deu/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
deleted file mode 100644
index 6e51d0a62d6..00000000000
--- a/i18n/deu/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openTasksConfiguration": "Aufgabenkonfiguration öffnen",
-	"openLaunchConfiguration": "Startkonfiguration öffnen",
-	"open": "Einstellungen öffnen",
-	"saveAndRetry": "Speichern und wiederholen",
-	"errorUnknownKey": "In {0} kann nicht geschrieben werden, weil {1} keine registrierte Konfiguration ist.",
-	"errorInvalidWorkspaceConfigurationApplication": "{0} kann nicht in die Arbeitsbereichseinstellungen geschrieben werden. Diese Einstellung kann nur in den Benutzereinstellungen geschrieben werden.",
-	"errorInvalidFolderConfiguration": "In die Ordnereinstellungen kann nicht geschrieben werden, weil {0} den Gültigkeitsbereich für Ordnerressourcen nicht unterstützt.",
-	"errorInvalidUserTarget": "In die Benutzereinstellungen kann nicht geschrieben werden, weil {0} den globalen Gültigkeitsbereich nicht unterstützt.",
-	"errorInvalidWorkspaceTarget": "In die Arbeitsbereichseinstellungen kann nicht geschrieben werden, da {0} den Arbeitsbereichsumfang in einem Arbeitsbereich mit mehreren Ordnern nicht unterstützt.",
-	"errorInvalidFolderTarget": "In die Ordnereinstellungen kann nicht geschrieben werden, weil keine Ressource angegeben ist.",
-	"errorNoWorkspaceOpened": "In {0} kann nicht geschrieben werden, weil kein Arbeitsbereich geöffnet ist. Öffnen Sie zuerst einen Arbeitsbereich, und versuchen Sie es noch mal.",
-	"errorInvalidTaskConfiguration": "In die Konfigurationsdatei der Aufgabe kann nicht geschrieben werden. Öffnen Sie die Datei, um Fehler/Warnungen darin zu beheben, und versuchen Sie es noch mal.",
-	"errorInvalidLaunchConfiguration": "In die Startkonfigurationsdatei kann nicht geschrieben werden. Öffnen Sie die Datei, um Fehler/Warnungen darin zu beheben, und versuchen Sie es noch mal.",
-	"errorInvalidConfiguration": "In die Benutzereinstellungen kann nicht geschrieben werden. Öffnen Sie die Benutzereinstellungen, um Fehler/Warnungen in der Datei zu korrigieren, und versuchen Sie es noch mal.",
-	"errorInvalidConfigurationWorkspace": "In die Konfigurationseinstellungen kann nicht geschrieben werden. Öffnen Sie die Arbeitsbereichseinstellungen, um Fehler/Warnungen in der Datei zu korrigieren, und versuchen Sie es noch mal.",
-	"errorInvalidConfigurationFolder": "In die Ordnereinstellungen kann nicht geschrieben werden. Öffnen Sie die Ordnereinstellungen \"{0}'\", um Fehler/Warnungen in der Datei zu korrigieren, und versuchen Sie es noch mal.",
-	"errorTasksConfigurationFileDirty": "In die Konfigurationsdatei der Aufgabe kann nicht geschrieben werden, weil sie geändert wurde. Speichern Sie die Datei, und versuchen Sie es noch mal.",
-	"errorLaunchConfigurationFileDirty": "In die Startkonfigurationsdatei kann nicht geschrieben werden, weil sie geändert wurde. Speichern Sie die Datei, und versuchen Sie es noch mal.",
-	"errorConfigurationFileDirty": "In die Benutzereinstellungen kann nicht geschrieben werden, weil die Datei geändert wurde. Speichern Sie die Datei mit den Benutzereinstellungen, und versuchen Sie es noch mal.",
-	"errorConfigurationFileDirtyWorkspace": "In die Arbeitsbereichseinstellungen kann nicht geschrieben werden, weil die Datei geändert wurde. Speichern Sie die Datei mit den Arbeitsbereichseinstellungen, und versuchen Sie es noch mal.",
-	"errorConfigurationFileDirtyFolder": "In die Ordnereinstellungen kann nicht geschrieben werden, da die Datei geändert wurde. Speichern Sie die Datei mit den Ordnereinstellungen \"{0}\" und versuchen Sie es noch mal.",
-	"userTarget": "Benutzereinstellungen",
-	"workspaceTarget": "Arbeitsbereichseinstellungen",
-	"folderTarget": "Ordnereinstellungen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/services/configuration/node/configurationService.i18n.json b/i18n/deu/src/vs/workbench/services/configuration/node/configurationService.i18n.json
deleted file mode 100644
index 0508efb20d2..00000000000
--- a/i18n/deu/src/vs/workbench/services/configuration/node/configurationService.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"unsupportedApplicationSetting": "Diese Einstellung kann nur in den Benutzereinstellungen angewendet werden",
-	"unsupportedWindowSetting": "Diese Einstellung kann jetzt nicht angewendet werden. Sie wird angewendet, wenn Sie den Ordner direkt öffnen."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/services/configuration/node/jsonEditingService.i18n.json b/i18n/deu/src/vs/workbench/services/configuration/node/jsonEditingService.i18n.json
deleted file mode 100644
index 559afa0a359..00000000000
--- a/i18n/deu/src/vs/workbench/services/configuration/node/jsonEditingService.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"errorInvalidFile": "In die Datei kann nicht geschrieben werden. Öffnen Sie die Datei, um Fehler/Warnungen in der Datei zu beheben, und versuchen Sie es noch mal.",
-	"errorFileDirty": "In die Datei kann nicht geschrieben werden, weil sie geändert wurde. Speichern Sie die Datei, und versuchen Sie es noch mal."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json b/i18n/deu/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
deleted file mode 100644
index bfc2bc1f146..00000000000
--- a/i18n/deu/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"stringsOnlySupported": "Der Befehl {0} hat keine Zeichenfolge als Ergebnis zurückgegeben. Als Ergebnisse für Befehle, die zur Variablenersetzung verwendet werden, werden nur Zeichenfolgen unterstützt."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/services/configurationResolver/node/variableResolver.i18n.json b/i18n/deu/src/vs/workbench/services/configurationResolver/node/variableResolver.i18n.json
deleted file mode 100644
index d691ed2871d..00000000000
--- a/i18n/deu/src/vs/workbench/services/configurationResolver/node/variableResolver.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"missingEnvVarName": "\"{0}\" kann nicht aufgelöst werden, da kein Umgebungsvariablenname angegeben ist.",
-	"configNotFound": "\"{0}\" kann nicht aufgelöst werden, da die Einstellung \"{1}\" nicht gefunden wurde.",
-	"configNoString": "\"{0}\" kann nicht aufgelöst werden, da \"{1}\" ein strukturierter Wert ist.",
-	"missingConfigName": "\"{0}\" kann nicht aufgelöst werden, da kein Einstellungsname angegeben ist.",
-	"noValueForCommand": "\"{0}\" kann nicht aufgelöst werden, da der Befehl keinen Wert hat.",
-	"canNotFindFolder": "\"{0}\" kann nicht aufgelöst werden. Es ist kein Ordner \"{1}\" vorhanden.",
-	"canNotResolveWorkspaceFolderMultiRoot": "\"{0}\" kann nicht in einem Arbeitsbereich mit mehreren Ordnern aufgelöst werden. Legen Sie mithilfe von \":\" und einem Arbeitsbereichs-Ordnernamen einen Bereich für diese Variable fest.",
-	"canNotResolveWorkspaceFolder": "\"{0}\" kann nicht aufgelöst werden. Öffnen Sie einen Ordner.",
-	"canNotResolveFile": "\"{0}\" kann nicht aufgelöst werden. Öffnen Sie einen Editor.",
-	"canNotResolveLineNumber": "\"{0}\" kann nicht aufgelöst werden. Im aktiven Editor muss eine Zeile ausgewählt sein.",
-	"canNotResolveSelectedText": "\"{0}\" kann nicht aufgelöst werden. Im aktiven Editor muss Text ausgewählt sein."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/services/crashReporter/common/crashReporterService.i18n.json b/i18n/deu/src/vs/workbench/services/crashReporter/common/crashReporterService.i18n.json
deleted file mode 100644
index f7a2d1f0c3f..00000000000
--- a/i18n/deu/src/vs/workbench/services/crashReporter/common/crashReporterService.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"telemetryConfigurationTitle": "Telemetrie",
-	"telemetry.enableCrashReporting": "Aktiviert Absturzberichte, die an Microsoft gesendet werden.\nDiese Option erfordert einen Neustart, damit sie wirksam wird."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/services/crashReporter/electron-browser/crashReporterService.i18n.json b/i18n/deu/src/vs/workbench/services/crashReporter/electron-browser/crashReporterService.i18n.json
deleted file mode 100644
index 1db826a3914..00000000000
--- a/i18n/deu/src/vs/workbench/services/crashReporter/electron-browser/crashReporterService.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"telemetryConfigurationTitle": "Telemetrie",
-	"telemetry.enableCrashReporting": "Aktiviert Absturzberichte, die an Microsoft gesendet werden.\nDiese Option erfordert einen Neustart, damit sie wirksam wird."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/services/decorations/browser/decorationsService.i18n.json b/i18n/deu/src/vs/workbench/services/decorations/browser/decorationsService.i18n.json
deleted file mode 100644
index 97095dac5b7..00000000000
--- a/i18n/deu/src/vs/workbench/services/decorations/browser/decorationsService.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"bubbleTitle": "Enthält hervorgehobene Elemente"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json b/i18n/deu/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json
deleted file mode 100644
index 4a29a1c902d..00000000000
--- a/i18n/deu/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"yesButton": "&&Ja",
-	"cancelButton": "Abbrechen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/services/dialogs/electron-browser/dialogs.i18n.json b/i18n/deu/src/vs/workbench/services/dialogs/electron-browser/dialogs.i18n.json
deleted file mode 100644
index 48aa51b8455..00000000000
--- a/i18n/deu/src/vs/workbench/services/dialogs/electron-browser/dialogs.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"yesButton": "&&Ja",
-	"cancelButton": "Abbrechen",
-	"moreFile": "...1 weitere Datei wird nicht angezeigt",
-	"moreFiles": "...{0} weitere Dateien werden nicht angezeigt"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/services/editor/browser/editorService.i18n.json b/i18n/deu/src/vs/workbench/services/editor/browser/editorService.i18n.json
deleted file mode 100644
index 50e968f8ee3..00000000000
--- a/i18n/deu/src/vs/workbench/services/editor/browser/editorService.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"compareLabels": "{0} ↔ {1}"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/services/editor/common/editorService.i18n.json b/i18n/deu/src/vs/workbench/services/editor/common/editorService.i18n.json
deleted file mode 100644
index ca1ee0161c1..00000000000
--- a/i18n/deu/src/vs/workbench/services/editor/common/editorService.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"compareLabels": "{0} ↔ {1}"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/services/extensions/common/extensionsRegistry.i18n.json b/i18n/deu/src/vs/workbench/services/extensions/common/extensionsRegistry.i18n.json
deleted file mode 100644
index f9c60fd53e4..00000000000
--- a/i18n/deu/src/vs/workbench/services/extensions/common/extensionsRegistry.i18n.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.engines": "Modulkompatibilität.",
-	"vscode.extension.engines.vscode": "Gibt für VS Code-Erweiterungen die VS Code-Version an, mit der die Erweiterung kompatibel ist. Darf nicht \"*\" sein. Beispiel: ^0.10.5 gibt die Kompatibilität mit mindestens VS Code-Version 0.10.5 an.",
-	"vscode.extension.publisher": "Der Herausgeber der VS Code-Extension.",
-	"vscode.extension.displayName": "Der Anzeigename für die Extension, der im VS Code-Katalog verwendet wird.",
-	"vscode.extension.categories": "Die vom VS Code-Katalog zum Kategorisieren der Extension verwendeten Kategorien.",
-	"vscode.extension.category.languages.deprecated": "Stattdessen \"Programmiersprachen\" verwenden",
-	"vscode.extension.galleryBanner": "Das in VS Code Marketplace verwendete Banner.",
-	"vscode.extension.galleryBanner.color": "Die Bannerfarbe für die Kopfzeile der VS Code Marketplace-Seite.",
-	"vscode.extension.galleryBanner.theme": "Das Farbdesign für die Schriftart, die im Banner verwendet wird.",
-	"vscode.extension.contributes": "Alle Beiträge der VS Code-Extension, die durch dieses Paket dargestellt werden.",
-	"vscode.extension.preview": "Legt die Erweiterung fest, die im Marketplace als Vorschau gekennzeichnet werden soll.",
-	"vscode.extension.activationEvents": "Aktivierungsereignisse für die VS Code-Extension.",
-	"vscode.extension.activationEvents.onLanguage": "Ein Aktivierungsereignis wird beim Öffnen einer Datei ausgegeben, die in die angegebene Sprache aufgelöst wird.",
-	"vscode.extension.activationEvents.onCommand": "Ein Aktivierungsereignis wird beim Aufrufen des angegebenen Befehls ausgegeben.",
-	"vscode.extension.activationEvents.onDebug": "Ein Aktivierungsereignis wird ausgesandt, wenn ein Benutzer eine Debugging startet, oder eine Debug-Konfiguration erstellt.",
-	"vscode.extension.activationEvents.onDebugInitialConfigurations": "Ein Aktivierungsereignis ausgegeben, wenn ein \"launch.json\" erstellt werden muss (und alle provideDebugConfigurations Methoden aufgerufen werden müssen).",
-	"vscode.extension.activationEvents.onDebugResolve": "Ein Aktivierungsereignis ausgegeben, wenn eine Debug-Sitzung mit dem spezifischen Typ gestartet wird (und eine entsprechende resolveDebugConfiguration-Methode aufgerufen werden muss).",
-	"vscode.extension.activationEvents.workspaceContains": "Ein Aktivierungsereignis wird beim Öffnen eines Ordners ausgegeben, der mindestens eine Datei enthält, die mit dem angegebenen Globmuster übereinstimmt.",
-	"vscode.extension.activationEvents.onView": "Ein Aktivierungsereignis wird beim Erweitern der angegebenen Ansicht ausgegeben.",
-	"vscode.extension.activationEvents.onUri": "Ein Aktivierungsereignis wird ausgegeben, wenn ein systemweiter URI, der auf diese Erweiterung ausgerichtet ist, geöffnet ist.",
-	"vscode.extension.activationEvents.star": "Ein Aktivierungsereignis wird beim Start von VS Code ausgegeben. Damit für die Endbenutzer eine bestmögliche Benutzerfreundlichkeit sichergestellt ist, verwenden Sie dieses Aktivierungsereignis in Ihrer Erweiterung nur dann, wenn in Ihrem Anwendungsfall keine andere Kombination an Aktivierungsereignissen funktioniert.",
-	"vscode.extension.badges": "Array aus Badges, die im Marketplace in der Seitenleiste auf der Seite mit den Erweiterungen angezeigt werden.",
-	"vscode.extension.badges.url": "Die Bild-URL für den Badge.",
-	"vscode.extension.badges.href": "Der Link für den Badge.",
-	"vscode.extension.badges.description": "Eine Beschreibung für den Badge.",
-	"vscode.extension.markdown": "Steuert das im Marketplace verwendete Markdown-Renderingmodul. Entweder GitHub (Standardeinstellung) oder Standard",
-	"vscode.extension.qna": "Steuert den Q&A-Link im Marketplace. Auf Marketplace festlegen, um die standardmäßige Q&A-Marketplace-Site zu aktivieren. Auf eine Zeichenfolge festlegen, um die URL einer benutzerdefinierten Q&A-Site anzugeben. Auf FALSE festlegen, um Q&A komplett zu deaktivieren.",
-	"vscode.extension.extensionDependencies": "Abhängigkeiten von anderen Erweiterungen. Der Bezeichner einer Erweiterung ist immer ${publisher}.${name}, beispielsweise \"vscode.csharp\".",
-	"vscode.extension.scripts.prepublish": "Ein Skript, das ausgeführt wird, bevor das Paket als VS Code-Extension veröffentlicht wird.",
-	"vscode.extension.scripts.uninstall": "Uninstall-Hook für VS Code-Erweiterung: Skript, das ausgeführt wird, wenn die Erweiterung vollständig aus VS Code deinstalliert wurde. Dies ist der Fall, wenn VS Code nach der Deinstallation der Erweiterung neu gestartet wurde (Herunterfahren und Starten). Nur Node-Skripts werden unterstützt. ",
-	"vscode.extension.icon": "Der Pfad zu einem 128x128-Pixel-Symbol."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/services/extensions/electron-browser/extensionHost.i18n.json b/i18n/deu/src/vs/workbench/services/extensions/electron-browser/extensionHost.i18n.json
deleted file mode 100644
index 6e6b0e17357..00000000000
--- a/i18n/deu/src/vs/workbench/services/extensions/electron-browser/extensionHost.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"extensionHostProcess.startupFailDebug": "Der Erweiterungshost wurde nicht innerhalb von 10 Sekunden gestartet. Möglicherweise wurde er in der ersten Zeile beendet und benötigt einen Debugger, um die Ausführung fortzusetzen.",
-	"extensionHostProcess.startupFail": "Der Erweiterungshost wurde nicht innerhalb von 10 Sekunden gestartet. Dies stellt ggf. ein Problem dar.",
-	"reloadWindow": "Fenster erneut laden",
-	"extensionHostProcess.error": "Fehler vom Erweiterungshost: {0}"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/services/extensions/electron-browser/extensionHostProfiler.i18n.json b/i18n/deu/src/vs/workbench/services/extensions/electron-browser/extensionHostProfiler.i18n.json
deleted file mode 100644
index 90d0c7f49d8..00000000000
--- a/i18n/deu/src/vs/workbench/services/extensions/electron-browser/extensionHostProfiler.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"message": "$(zap) Profilieren des Erweiterungshost..."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/services/extensions/electron-browser/extensionPoints.i18n.json b/i18n/deu/src/vs/workbench/services/extensions/electron-browser/extensionPoints.i18n.json
deleted file mode 100644
index 061b5acc586..00000000000
--- a/i18n/deu/src/vs/workbench/services/extensions/electron-browser/extensionPoints.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"jsonParseFail": "Fehler beim Analysieren von {0}: {1}.",
-	"fileReadFail": "Die Datei \"{0}\" kann nicht gelesen werden: {1}",
-	"jsonsParseReportErrors": "Fehler beim Analysieren von {0}: {1}.",
-	"missingNLSKey": "Die Nachricht für den Schlüssel {0} wurde nicht gefunden."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json b/i18n/deu/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json
deleted file mode 100644
index 9e2433b45a9..00000000000
--- a/i18n/deu/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"extensionsDisabled": "Alle Erweiterungen sind deaktiviert.",
-	"extensionHostProcess.crash": "Der Erweiterungshost wurde unerwartet beendet.",
-	"extensionHostProcess.unresponsiveCrash": "Der Erweiterungshost wurde beendet, weil er nicht reagiert hat.",
-	"devTools": "Entwicklertools öffnen",
-	"restart": "Erweiterungshost neu starten",
-	"overwritingExtension": "Die Erweiterung \"{0}\" wird mit \"{1}\" überschrieben.",
-	"extensionUnderDevelopment": "Die Entwicklungserweiterung unter \"{0}\" wird geladen.",
-	"extensionCache.invalid": "Erweiterungen wurden auf der Festplatte geändert. Bitte laden Sie das Fenster erneut.",
-	"reloadWindow": "Fenster erneut laden"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/services/extensions/node/extensionPoints.i18n.json b/i18n/deu/src/vs/workbench/services/extensions/node/extensionPoints.i18n.json
deleted file mode 100644
index 42e82aa022a..00000000000
--- a/i18n/deu/src/vs/workbench/services/extensions/node/extensionPoints.i18n.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"jsonParseFail": "Fehler beim Analysieren von {0}: {1}.",
-	"fileReadFail": "Die Datei \"{0}\" kann nicht gelesen werden: {1}",
-	"jsonsParseReportErrors": "Fehler beim Analysieren von {0}: {1}.",
-	"missingNLSKey": "Die Nachricht für den Schlüssel {0} wurde nicht gefunden.",
-	"notSemver": "Die Extensionversion ist nicht mit \"semver\" kompatibel.",
-	"extensionDescription.empty": "Es wurde eine leere Extensionbeschreibung abgerufen.",
-	"extensionDescription.publisher": "Die Eigenschaft \"{0}\" ist erforderlich. Sie muss vom Typ \"string\" sein.",
-	"extensionDescription.name": "Die Eigenschaft \"{0}\" ist erforderlich. Sie muss vom Typ \"string\" sein.",
-	"extensionDescription.version": "Die Eigenschaft \"{0}\" ist erforderlich. Sie muss vom Typ \"string\" sein.",
-	"extensionDescription.engines": "Die Eigenschaft \"{0}\" ist erforderlich und muss vom Typ \"object\" sein.",
-	"extensionDescription.engines.vscode": "Die Eigenschaft \"{0}\" ist erforderlich. Sie muss vom Typ \"string\" sein.",
-	"extensionDescription.extensionDependencies": "Die Eigenschaft \"{0}\" kann ausgelassen werden oder muss vom Typ \"string[]\" sein.",
-	"extensionDescription.activationEvents1": "Die Eigenschaft \"{0}\" kann ausgelassen werden oder muss vom Typ \"string[]\" sein.",
-	"extensionDescription.activationEvents2": "Die Eigenschaften \"{0}\" und \"{1}\" müssen beide angegeben oder beide ausgelassen werden.",
-	"extensionDescription.main1": "Die Eigenschaft \"{0}\" kann ausgelassen werden oder muss vom Typ \"string\" sein.",
-	"extensionDescription.main2": "Es wurde erwartet, dass \"main\" ({0}) im Ordner ({1}) der Extension enthalten ist. Dies führt ggf. dazu, dass die Extension nicht portierbar ist.",
-	"extensionDescription.main3": "Die Eigenschaften \"{0}\" und \"{1}\" müssen beide angegeben oder beide ausgelassen werden."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/services/files/electron-browser/fileService.i18n.json b/i18n/deu/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
deleted file mode 100644
index 846beeace7a..00000000000
--- a/i18n/deu/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"netVersionError": "Microsoft .NET Framework 4.5 ist erforderlich. Klicken Sie auf den Link, um die Anwendung zu installieren.",
-	"installNet": ".NET Framework 4.5 herunterladen",
-	"neverShowAgain": "Nicht mehr anzeigen",
-	"enospcError": "{0} kann keine Dateiänderungen in diesem großen Workspace überwachen. Folgen Sie dem Anwendungslink, um das Problem zu beheben.",
-	"learnMore": "Anweisungen",
-	"fileInvalidPath": "Ungültige Dateiressource ({0})",
-	"fileIsDirectoryError": "Die Datei ist ein Verzeichnis",
-	"fileNotModifiedError": "Datei nicht geändert seit",
-	"fileTooLargeForHeapError": "Zum Öffnen einer Datei dieser Größe müssen Sie VS Code neu starten und die Verwendung von mehr Arbeitsspeicher zulassen",
-	"fileTooLargeError": "Die Datei ist zu groß, um sie zu öffnen.",
-	"fileNotFoundError": "Die Datei wurde nicht gefunden ({0}).",
-	"fileBinaryError": "Die Datei scheint eine Binärdatei zu sein und kann nicht als Text geöffnet werden.",
-	"filePermission": "Schreibzugriff auf Datei ({0}) verweigert",
-	"fileExists": "Die zu erstellende Datei ist bereits vorhanden ({0}). ",
-	"fileModifiedError": "Datei geändert seit",
-	"fileReadOnlyError": "Die Datei ist schreibgeschützt.",
-	"fileMoveConflict": "Verschieben/Kopieren kann nicht ausgeführt werden. Die Datei ist am Ziel bereits vorhanden.",
-	"unableToMoveCopyError": "Der Verschiebe-/Kopiervorgang kann nicht ausgeführt werden. Die Datei würde den Ordner ersetzen, in dem sie enthalten ist.",
-	"binFailed": "Fehler beim Verschieben von \"{0}\" in den Papierkorb.",
-	"trashFailed": "Fehler beim Verschieben von \"{0}\" in den Papierkorb."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json b/i18n/deu/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
deleted file mode 100644
index f971f5bb684..00000000000
--- a/i18n/deu/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"invalidPath": "Der Pfad der Ressource \"{0}\" muss ein absoluter Pfad sein.",
-	"fileNotFoundError": "Die Datei wurde nicht gefunden ({0}).",
-	"fileIsDirectoryError": "Die Datei ist ein Verzeichnis",
-	"fileNotModifiedError": "Datei nicht geändert seit",
-	"fileBinaryError": "Die Datei scheint eine Binärdatei zu sein und kann nicht als Text geöffnet werden.",
-	"err.create": "Fehler beim Erstellen der Datei {0}.",
-	"fileMoveConflict": "Verschieben/Kopieren kann nicht ausgeführt werden. Die Datei ist am Ziel bereits vorhanden."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/services/files/node/fileService.i18n.json b/i18n/deu/src/vs/workbench/services/files/node/fileService.i18n.json
deleted file mode 100644
index a2229be0cee..00000000000
--- a/i18n/deu/src/vs/workbench/services/files/node/fileService.i18n.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"fileInvalidPath": "Ungültige Dateiressource ({0})",
-	"fileIsDirectoryError": "Die Datei ist ein Verzeichnis",
-	"fileNotModifiedError": "Datei nicht geändert seit",
-	"fileTooLargeError": "Die Datei ist zu groß, um sie zu öffnen.",
-	"fileNotFoundError": "Die Datei wurde nicht gefunden ({0}).",
-	"fileBinaryError": "Die Datei scheint eine Binärdatei zu sein und kann nicht als Text geöffnet werden.",
-	"filePermission": "Schreibzugriff auf Datei ({0}) verweigert",
-	"fileExists": "Die zu erstellende Datei ist bereits vorhanden ({0}). ",
-	"fileMoveConflict": "Verschieben/Kopieren kann nicht ausgeführt werden. Die Datei ist am Ziel bereits vorhanden.",
-	"unableToMoveCopyError": "Der Verschiebe-/Kopiervorgang kann nicht ausgeführt werden. Die Datei würde den Ordner ersetzen, in dem sie enthalten ist.",
-	"foldersCopyError": "Ordner können nicht in den Arbeitsbereich kopiert werden. Bitte wählen Sie einzelne Dateien aus, um sie zu kopieren.",
-	"fileModifiedError": "Datei geändert seit",
-	"fileReadOnlyError": "Die Datei ist schreibgeschützt."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/services/jsonschemas/common/jsonValidationExtensionPoint.i18n.json b/i18n/deu/src/vs/workbench/services/jsonschemas/common/jsonValidationExtensionPoint.i18n.json
deleted file mode 100644
index b8898654138..00000000000
--- a/i18n/deu/src/vs/workbench/services/jsonschemas/common/jsonValidationExtensionPoint.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"contributes.jsonValidation": "Trägt zur JSON-Schemakonfiguration bei.",
-	"contributes.jsonValidation.fileMatch": "Das Dateimuster, mit dem eine Übereinstimmung vorliegen soll, z. B. \"package.json\" oder \"*.launch\".",
-	"contributes.jsonValidation.url": "Eine Schema-URL (\"http:\", \"Https:\") oder der relative Pfad zum Extensionordner (\". /\").",
-	"invalid.jsonValidation": "configuration.jsonValidation muss ein Array sein.",
-	"invalid.fileMatch": "configuration.jsonValidation.fileMatch muss definiert sein.",
-	"invalid.url": "configuration.jsonValidation.url muss eine URL oder ein relativer Pfad sein.",
-	"invalid.url.fileschema": "configuration.jsonValidation.url ist eine ungültige relative URL: {0}",
-	"invalid.url.schema": "\"configuration.jsonValidation.url\" muss mit \"http:\", \"https:\" oder \"./\" starten, um auf Schemas zu verweisen, die in der Extension gespeichert sind."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/services/keybinding/common/keybindingEditing.i18n.json b/i18n/deu/src/vs/workbench/services/keybinding/common/keybindingEditing.i18n.json
deleted file mode 100644
index 2f8ca4e179e..00000000000
--- a/i18n/deu/src/vs/workbench/services/keybinding/common/keybindingEditing.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"errorKeybindingsFileDirty": "Schreiben nicht möglich, da die Tastenbindungskonfiguration geändert wurde. Speichern Sie die Datei, und versuchen Sie es noch mal.",
-	"parseErrors": "In die configuration\n\nIn die Tastenbindungskonfigurationsdatei kann nicht geschrieben werden. Öffnen Sie die Datei, um Fehler/Warnungen darin zu beheben, und versuchen Sie es noch mal.",
-	"errorInvalidConfiguration": "In die Tastenbindungskonfigurationsdatei kann nicht geschrieben werden. Sie enthält ein Objekt, bei dem es sich nicht um ein Array handelt. Öffnen Sie die Datei, um das Problem zu beheben, und versuchen Sie es dann nochmal.",
-	"emptyKeybindingsHeader": "Platzieren Sie Ihre Tastenzuordnungen in dieser Datei, um die Standardwerte zu überschreiben."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/services/keybinding/electron-browser/keybindingService.i18n.json b/i18n/deu/src/vs/workbench/services/keybinding/electron-browser/keybindingService.i18n.json
deleted file mode 100644
index a6064ca5ef8..00000000000
--- a/i18n/deu/src/vs/workbench/services/keybinding/electron-browser/keybindingService.i18n.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"nonempty": "Es wurde ein nicht leerer Wert erwartet.",
-	"requirestring": "Die Eigenschaft \"{0}\" ist erforderlich. Sie muss vom Typ \"string\" sein.",
-	"optstring": "Die Eigenschaft \"{0}\" kann ausgelassen werden oder muss vom Typ \"string\" sein.",
-	"vscode.extension.contributes.keybindings.command": "Der Bezeichner des Befehls, der ausgeführt werden soll, wenn die Tastenbindung ausgelöst wird.",
-	"vscode.extension.contributes.keybindings.key": "Der Schlüssel oder die Schlüsselsequenz (separate Schlüssel mit Pluszeichen und Sequenzen mit Leerzeichen, z. B. STRG+O und STRG+L L für einen Akkord).",
-	"vscode.extension.contributes.keybindings.mac": "Der Mac-spezifische Schlüssel oder die Schlüsselsequenz.",
-	"vscode.extension.contributes.keybindings.linux": "Der Linux-spezifische Schlüssel oder die Schlüsselsequenz.",
-	"vscode.extension.contributes.keybindings.win": "Der Windows-spezifische Schlüssel oder die Schlüsselsequenz.",
-	"vscode.extension.contributes.keybindings.when": "Die Bedingung, wann der Schlüssel aktiv ist.",
-	"vscode.extension.contributes.keybindings": "Trägt Tastenbindungen bei.",
-	"invalid.keybindings": "Ungültige Angabe \"contributes.{0}\": {1}",
-	"unboundCommands": "Die folgenden weiteren Befehle sind verfügbar: ",
-	"keybindings.json.title": "Tastenbindungskonfiguration",
-	"keybindings.json.key": "Der Schlüssel oder die Schlüsselsequenz (durch Leerzeichen getrennt)",
-	"keybindings.json.command": "Der Name des auszuführenden Befehls.",
-	"keybindings.json.when": "Die Bedingung, wann der Schlüssel aktiv ist.",
-	"keybindings.json.args": "Argumente, die an den auszuführenden Befehl übergeben werden sollen.",
-	"keyboardConfigurationTitle": "Tastatur",
-	"dispatch": "Steuert die Abgangslogik, sodass bei einem Tastendruck entweder \"code\" (empfohlen) oder \"keyCode\" verwendet wird.",
-	"touchbar.enabled": "Aktiviert die macOS-Touchbar-Schaltflächen der Tastatur, sofern verfügbar."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/services/message/browser/messageList.i18n.json b/i18n/deu/src/vs/workbench/services/message/browser/messageList.i18n.json
deleted file mode 100644
index 0b8983f0eb8..00000000000
--- a/i18n/deu/src/vs/workbench/services/message/browser/messageList.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"alertErrorMessage": "Fehler: {0}",
-	"alertWarningMessage": "Warnung: {0}",
-	"alertInfoMessage": "Info: {0}",
-	"error": "Fehler",
-	"warning": "Warnung",
-	"info": "Info",
-	"close": "Schließen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/services/message/electron-browser/messageService.i18n.json b/i18n/deu/src/vs/workbench/services/message/electron-browser/messageService.i18n.json
deleted file mode 100644
index 4a29a1c902d..00000000000
--- a/i18n/deu/src/vs/workbench/services/message/electron-browser/messageService.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"yesButton": "&&Ja",
-	"cancelButton": "Abbrechen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/services/mode/common/workbenchModeService.i18n.json b/i18n/deu/src/vs/workbench/services/mode/common/workbenchModeService.i18n.json
deleted file mode 100644
index fbeac1f6a5f..00000000000
--- a/i18n/deu/src/vs/workbench/services/mode/common/workbenchModeService.i18n.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.contributes.languages": "Contributes-Sprachdeklarationen",
-	"vscode.extension.contributes.languages.id": "Die ID der Sprache.",
-	"vscode.extension.contributes.languages.aliases": "Namealiase für die Sprache.",
-	"vscode.extension.contributes.languages.extensions": "Dateierweiterungen, die der Sprache zugeordnet sind.",
-	"vscode.extension.contributes.languages.filenames": "Dateinamen, die der Sprache zugeordnet sind.",
-	"vscode.extension.contributes.languages.filenamePatterns": "Dateinamen-Globmuster, die Sprache zugeordnet sind.",
-	"vscode.extension.contributes.languages.mimetypes": "MIME-Typen, die der Sprache zugeordnet sind.",
-	"vscode.extension.contributes.languages.firstLine": "Ein regulärer Ausdruck, der mit der ersten Zeile einer Datei der Sprache übereinstimmt.",
-	"vscode.extension.contributes.languages.configuration": "Ein relativer Pfad zu einer Datei mit Konfigurationsoptionen für die Sprache.",
-	"invalid": "Ungültige Angabe \"contributes.{0}\". Es wurde ein Array erwartet.",
-	"invalid.empty": "Leerer Wert für \"contributes.{0}\".",
-	"require.id": "Die Eigenschaft \"{0}\" ist erforderlich. Sie muss vom Typ \"string\" sein.",
-	"opt.extensions": "Die Eigenschaft \"{0}\" kann ausgelassen werden. Sie muss vom Typ \"string[]\" sein.",
-	"opt.filenames": "Die Eigenschaft \"{0}\" kann ausgelassen werden. Sie muss vom Typ \"string[]\" sein.",
-	"opt.firstLine": "Die Eigenschaft \"{0}\" kann ausgelassen werden. Sie muss vom Typ \"string\" sein.",
-	"opt.configuration": "Die Eigenschaft \"{0}\" kann ausgelassen werden. Sie muss vom Typ \"string\" sein.",
-	"opt.aliases": "Die Eigenschaft \"{0}\" kann ausgelassen werden. Sie muss vom Typ \"string[]\" sein.",
-	"opt.mimetypes": "Die Eigenschaft \"{0}\" kann ausgelassen werden. Sie muss vom Typ \"string[]\" sein."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/services/progress/browser/progressService2.i18n.json b/i18n/deu/src/vs/workbench/services/progress/browser/progressService2.i18n.json
deleted file mode 100644
index 56b19fa3a5a..00000000000
--- a/i18n/deu/src/vs/workbench/services/progress/browser/progressService2.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"progress.subtitle": "{0} - {1}",
-	"progress.title": "{0}: {1}",
-	"cancel": "Abbrechen"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/services/textMate/electron-browser/TMGrammars.i18n.json b/i18n/deu/src/vs/workbench/services/textMate/electron-browser/TMGrammars.i18n.json
deleted file mode 100644
index c9b03adcbae..00000000000
--- a/i18n/deu/src/vs/workbench/services/textMate/electron-browser/TMGrammars.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.contributes.grammars": "Trägt TextMate-Tokenizer bei.",
-	"vscode.extension.contributes.grammars.language": "Der Sprachbezeichner, für den diese Syntax beigetragen wird.",
-	"vscode.extension.contributes.grammars.scopeName": "Der TextMate-Bereichsname, der von der tmLanguage-Datei verwendet wird.",
-	"vscode.extension.contributes.grammars.path": "Der Pfad der tmLanguage-Datei. Der Pfad ist relativ zum Extensionordner und beginnt normalerweise mit \". /syntaxes/\".",
-	"vscode.extension.contributes.grammars.embeddedLanguages": "Eine Zuordnung zwischen Bereichsname und Sprach-ID, wenn diese Grammatik eingebettete Sprachen enthält.",
-	"vscode.extension.contributes.grammars.tokenTypes": "Eine Zuordnung von Bereichsnamen zu Tokentypen.",
-	"vscode.extension.contributes.grammars.injectTo": "Die Liste der Sprachbereichsnamen, in die diese Grammatik injiziert wird."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/services/textMate/electron-browser/TMSyntax.i18n.json b/i18n/deu/src/vs/workbench/services/textMate/electron-browser/TMSyntax.i18n.json
deleted file mode 100644
index 033bdbfd918..00000000000
--- a/i18n/deu/src/vs/workbench/services/textMate/electron-browser/TMSyntax.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"invalid.language": "Unbekannte Sprache in \"contributes.{0}.language\". Bereitgestellter Wert: {1}",
-	"invalid.scopeName": "In \"contributes.{0}.scopeName\" wurde eine Zeichenfolge erwartet. Bereitgestellter Wert: {1}",
-	"invalid.path.0": "Expected string in `contributes.{0}.path`. Provided value: {1}",
-	"invalid.injectTo": "Ungültiger Wert in \"contributes.{0}.injectTo\". Es muss sich um ein Array von Sprachbereichsnamen handeln. Bereitgestellter Wert: {1}",
-	"invalid.embeddedLanguages": "Ungültiger Wert in \"contributes.{0}.embeddedLanguages\". Muss eine Objektzuordnung von Bereichsname zu Sprache sein. Angegebener Wert: {1}",
-	"invalid.tokenTypes": "Ungültiger Wert in \"contributes.{0}.tokenTypes\". Muss eine Objektzuordnung von Bereichsname zu Tokentyp sein. Angegebener Wert: {1}",
-	"invalid.path.1": "Es wurde erwartet, dass \"contributes.{0}.path\" ({1}) im Ordner ({2}) der Erweiterung enthalten ist. Dies führt ggf. dazu, dass die Erweiterung nicht portierbar ist.",
-	"no-tm-grammar": "Keine TM-Grammatik für diese Sprache registriert."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/services/textfile/common/textFileEditorModel.i18n.json b/i18n/deu/src/vs/workbench/services/textfile/common/textFileEditorModel.i18n.json
deleted file mode 100644
index 9f3a37a776f..00000000000
--- a/i18n/deu/src/vs/workbench/services/textfile/common/textFileEditorModel.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"saveFileFirst": "Die Datei wurde geändert. Speichern Sie sie zuerst, bevor Sie sie mit einer anderen Codierung erneut öffnen.",
-	"genericSaveError": "Fehler beim Speichern von \"{0}\": {1}."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/services/textfile/common/textFileService.i18n.json b/i18n/deu/src/vs/workbench/services/textfile/common/textFileService.i18n.json
deleted file mode 100644
index 6cb15c9710e..00000000000
--- a/i18n/deu/src/vs/workbench/services/textfile/common/textFileService.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"files.backup.failSave": "Dateien, die geändert wurden, konnten nicht in den Sicherungsspeicherort geschrieben werden (Fehler: {0}). Speichern Sie zuerst Ihre Dateien, und beenden Sie dann den Vorgang."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json b/i18n/deu/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json
deleted file mode 100644
index 829895898c4..00000000000
--- a/i18n/deu/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"saveChangesMessage": "Möchten Sie die Änderungen speichern, die Sie an \"{0}\" vorgenommen haben?",
-	"saveChangesMessages": "Möchten Sie die an den folgenden {0}-Dateien vorgenommenen Änderungen speichern?",
-	"saveAll": "&&Alle speichern",
-	"save": "&&Speichern",
-	"dontSave": "&&Nicht speichern",
-	"cancel": "Abbrechen",
-	"saveChangesDetail": "Ihre Änderungen gehen verloren, wenn Sie diese nicht speichern.",
-	"allFiles": "Alle Dateien",
-	"noExt": "Keine Erweiterung"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/services/themes/common/colorExtensionPoint.i18n.json b/i18n/deu/src/vs/workbench/services/themes/common/colorExtensionPoint.i18n.json
deleted file mode 100644
index ee2ed63656e..00000000000
--- a/i18n/deu/src/vs/workbench/services/themes/common/colorExtensionPoint.i18n.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"contributes.color": "Fügt in Erweiterung definierte verwendbare Farben hinzu",
-	"contributes.color.id": "Der Bezeichner der verwendbaren Farbe",
-	"contributes.color.id.format": "Bezeichner sollten in folgendem Format vorliegen: aa [.bb] *",
-	"contributes.color.description": "Die Beschreibung der verwendbaren Farbe",
-	"contributes.defaults.light": "Die Standardfarbe für helle Themen. Entweder eine Farbe als Hex-Code (#RRGGBB[AA]) oder der Bezeichner einer verwendbaren Farbe, der eine Standardeinstellung bereitstellt.",
-	"contributes.defaults.dark": "Die Standardfarbe für dunkle Themen. Entweder eine Farbe als Hex-Code (#RRGGBB[AA]) oder der Bezeichner einer verwendbaren Farbe, der eine Standardeinstellung bereitstellt.",
-	"contributes.defaults.highContrast": "Die Standardfarbe für Themen mit hohem Kontrast. Entweder eine Farbe als Hex-Code (#RRGGBB[AA]) oder der Bezeichner einer verwendbaren Farbe, der eine Standardeinstellung bereitstellt.",
-	"invalid.colorConfiguration": "\"configuration.colors\" muss ein Array sein.",
-	"invalid.default.colorType": "{0} muss entweder eine Farbe als Hex-Code (#RRGGBB[AA] oder #RGB[A]) sein oder der Bezeichner einer verwendbaren Farbe, der eine Standardeinstellung bereitstellt.",
-	"invalid.id": "\"configuration.colors.id\" muss definiert und nicht leer sein",
-	"invalid.id.format": "\"configuration.colors.id\" muss auf das Wort[.word]* folgen",
-	"invalid.description": "\"configuration.colors.description\" muss definiert und darf nicht leer sein",
-	"invalid.defaults": "\"configuration.colors.defaults\" muss definiert sein, und \"light\", \"dark\" und \"highContrast\" enthalten"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/services/themes/common/colorThemeSchema.i18n.json b/i18n/deu/src/vs/workbench/services/themes/common/colorThemeSchema.i18n.json
deleted file mode 100644
index 8d8aab58b0c..00000000000
--- a/i18n/deu/src/vs/workbench/services/themes/common/colorThemeSchema.i18n.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"schema.token.settings": "Farben und Stile für das Token.",
-	"schema.token.foreground": "Vordergrundfarbe für das Token.",
-	"schema.token.background.warning": "Token Hintergrundfarben werden derzeit nicht unterstützt.",
-	"schema.token.fontStyle": "Schriftschnitt der Regel: kursiv, fett und unterstrichen (einzeln oder in Kombination). Die leere Zeichenfolge setzt geerbte Einstellungen zurück.",
-	"schema.fontStyle.error": "Die Schriftart muss \"kursiv\", \"fett\" oder \"unterstrichen\", eine Kombination daraus oder eine leere Zeichenfolge sein.",
-	"schema.token.fontStyle.none": "Keine (geerbten Stil löschen)",
-	"schema.properties.name": "Beschreibung der Regel.",
-	"schema.properties.scope": "Bereichsauswahl, mit der diese Regel einen Abgleich ausführt.",
-	"schema.tokenColors.path": "Pfad zu einer tmTheme-Designdatei (relativ zur aktuellen Datei).",
-	"schema.colors": "Farben für die Syntaxhervorhebung"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/services/themes/common/fileIconThemeSchema.i18n.json b/i18n/deu/src/vs/workbench/services/themes/common/fileIconThemeSchema.i18n.json
deleted file mode 100644
index 1bf320d1ae9..00000000000
--- a/i18n/deu/src/vs/workbench/services/themes/common/fileIconThemeSchema.i18n.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"schema.folderExpanded": "Das Ordnersymbol für aufgeklappte Ordner. Das Symbol für aufgeklappte Ordner ist optional. Wenn diese Angabe nicht festgelegt wird, wird das für Ordner definierte Symbol angezeigt.",
-	"schema.folder": "Das Ordnersymbol für zugeklappte Ordner. Gilt, wenn folderExpanded nicht festgelegt ist, auch für aufgeklappte Ordner.",
-	"schema.file": "Das Standarddateisymbol, das für alle Dateien angezeigt wird, die nicht mit einer Erweiterung, einem Dateinamen oder einer Sprach-ID übereinstimmen.",
-	"schema.folderNames": "Ordnet Ordnernamen Symbolen zu. Der Objektschlüssel ist der Ordnername ohne jedes Pfadsegment. Muster oder Platzhalter sind unzulässig. Bei der Zuordnung von Ordnernamens wird nicht zwischen Groß-/Kleinschreibung unterschieden.",
-	"schema.folderName": "Die ID der Symboldefinition für die Zuordnung.",
-	"schema.folderNamesExpanded": "Ordnet Ordnernamen Symbolen für aufgeklappte Ordner zu. Der Objektschlüssel ist der Ordnername ohne jedes Pfadsegment. Muster oder Platzhalter sind unzulässig. Bei der Zuordnung von Ordnernamens wird nicht zwischen Groß-/Kleinschreibung unterschieden.",
-	"schema.folderNameExpanded": "Die ID der Symboldefinition für die Zuordnung.",
-	"schema.fileExtensions": "Ordnet Dateierweiterungen Symbolen zu. Der Objektschlüssel ist der Name der Dateierweiterung. Der Erweiterungsname ist das letzte Segment eines Dateinamen nach dem letzten Punkt (ohne den Punkt). Erweiterungen werden ohne Berücksichtigung von Groß-/Kleinschreibung verglichen.",
-	"schema.fileExtension": "Die ID der Symboldefinition für die Zuordnung.",
-	"schema.fileNames": "Ordnet Dateinamen Symbolen zu. Der Objektschlüssel ist der vollständige Dateiname ohne Pfadsegmente. Der Dateiname kann Punkte und eine mögliche Dateierweiterung enthalten. Muster oder Platzhalter sind unzulässig. Bei der Dateinamenzuordnung wird nicht zwischen Groß-/Kleinschreibung unterschieden.",
-	"schema.fileName": "Die ID der Symboldefinition für die Zuordnung.",
-	"schema.languageIds": "Ordnet Sprachen Symbolen zu. Der Objektschlüssel ist die Sprach-ID wie im Sprachbeitragspunkt definiert.",
-	"schema.languageId": "Die ID der Symboldefinition für die Zuordnung.",
-	"schema.fonts": "Schriftarten, die in den Symboldefinitionen verwendet werden.",
-	"schema.id": "Die ID der Schriftart.",
-	"schema.src": "Der Speicherort der Schriftart.",
-	"schema.font-path": "Der Schriftartpfad relativ zur aktuellen Symboldesigndatei.",
-	"schema.font-format": "Das Format der Schriftart.",
-	"schema.font-weight": "Die Gewichtung der Schriftart.",
-	"schema.font-sstyle": "Der Stil der Schriftart.",
-	"schema.font-size": "Die Standardgröße der Schriftart.",
-	"schema.iconDefinitions": "Beschreibung aller Symbole, die beim Zuordnen von Dateien zu Symbolen verwendet werden können.",
-	"schema.iconDefinition": "Eine Symboldefinition. Der Objektschlüssel ist die ID der Definition.",
-	"schema.iconPath": "Bei Verwendung eines SVG- oder PNG-Datei: der Pfad zum Bild. Der Pfad ist relativ zur Symbolsammlungsdatei.",
-	"schema.fontCharacter": "Bei Verwendung einer Glyphenschriftart: das zu verwendende Zeichen in der Schriftart.",
-	"schema.fontColor": "Bei Verwendung einer Glyphenschriftart: die zu verwendende Farbe.",
-	"schema.fontSize": "Wenn eine Schriftart verwendet wird: der Schriftgrad als Prozentsatz der Textschriftart. Wenn diese Angabe nicht festgelegt wird, wird standardmäßig die Größe in der Schriftartdefinition verwendet.",
-	"schema.fontId": "Bei Verwendung einer Schriftart: die ID der Schriftart. Wenn diese Angabe nicht festgelegt wird, wird standardmäßig die erste Schriftartdefinition verwendet.",
-	"schema.light": "Optionale Zuordnungen für Dateisymbole in hellen Farbdesigns.",
-	"schema.highContrast": "Optionale Zuordnungen für Dateisymbole in Farbdesigns mit hohem Kontrast.",
-	"schema.hidesExplorerArrows": "Konfiguriert, ob die Datei-Explorer Pfeile ausgeblendet werden sollen, wenn dieses Motiv aktiv ist."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/services/themes/electron-browser/colorThemeData.i18n.json b/i18n/deu/src/vs/workbench/services/themes/electron-browser/colorThemeData.i18n.json
deleted file mode 100644
index 540c217df1b..00000000000
--- a/i18n/deu/src/vs/workbench/services/themes/electron-browser/colorThemeData.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"error.cannotparsejson": "Probleme beim Analysieren der JSON-Designdatei: {0}",
-	"error.invalidformat.colors": "Probleme beim Analysieren der Farbdesigndatei: {0}. Die Eigenschaft \"colors\" ist nicht vom Typ \"object\".",
-	"error.invalidformat.tokenColors": "Problem beim Analysieren der Farbdesigndatei: {0}. Die Eigenschaft \"tokenColors\" muss entweder ein Array sein, das Farben festlegt, oder ein Pfad zu einer TextMate-Designdatei.",
-	"error.plist.invalidformat": "Probleme beim Analysieren der tmTheme-Designdatei: {0}. \"settings\" ist kein Array",
-	"error.cannotparse": "Probleme beim Analysieren der tmTheme-Designdatei: {0}",
-	"error.cannotload": "Probleme beim Laden der tmTheme-Designdatei {0}: {1}"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/services/themes/electron-browser/colorThemeStore.i18n.json b/i18n/deu/src/vs/workbench/services/themes/electron-browser/colorThemeStore.i18n.json
deleted file mode 100644
index 3b455cbb9a1..00000000000
--- a/i18n/deu/src/vs/workbench/services/themes/electron-browser/colorThemeStore.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.contributes.themes": "Contributes textmate color themes.",
-	"vscode.extension.contributes.themes.id": "Die ID des Symboldesigns wie in den Benutzereinstellungen verwendet.",
-	"vscode.extension.contributes.themes.label": "Die Bezeichnung des Farbdesigns wie in der Benutzeroberfläche angezeigt.",
-	"vscode.extension.contributes.themes.uiTheme": "Das Basisdesign, das die Farben um den Editor definiert: \"vs\" ist das helle Farbdesign, \"vs-dark\" das dunkle Farbdesign. \"hc-black\" ist das dunkle Design mit hohem Kontrast.",
-	"vscode.extension.contributes.themes.path": "Der Pfad der TMTHEME-Datei. Der Pfad ist relativ zum Erweiterungsordner und lautet normalerweise \"./themes/themeFile.tmTheme\".",
-	"reqarray": "Extension point `{0}` must be an array.",
-	"reqpath": "Expected string in `contributes.{0}.path`. Provided value: {1}",
-	"invalid.path.1": "Es wurde erwartet, dass \"contributes.{0}.path\" ({1}) im Ordner ({2}) der Erweiterung enthalten ist. Dies führt ggf. dazu, dass die Erweiterung nicht portierbar ist."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/services/themes/electron-browser/fileIconThemeData.i18n.json b/i18n/deu/src/vs/workbench/services/themes/electron-browser/fileIconThemeData.i18n.json
deleted file mode 100644
index 8582255d004..00000000000
--- a/i18n/deu/src/vs/workbench/services/themes/electron-browser/fileIconThemeData.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"error.cannotparseicontheme": "Problems parsing file icons file: {0}"
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/services/themes/electron-browser/fileIconThemeStore.i18n.json b/i18n/deu/src/vs/workbench/services/themes/electron-browser/fileIconThemeStore.i18n.json
deleted file mode 100644
index 1183eeb7186..00000000000
--- a/i18n/deu/src/vs/workbench/services/themes/electron-browser/fileIconThemeStore.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.contributes.iconThemes": "Contributes file icon themes.",
-	"vscode.extension.contributes.iconThemes.id": "Die ID des Symboldesigns wie in den Benutzereinstellungen verwendet.",
-	"vscode.extension.contributes.iconThemes.label": "Die Bezeichnung des Symboldesigns wie in der Benutzeroberfläche angezeigt.",
-	"vscode.extension.contributes.iconThemes.path": "Der Pfad der Symboldesign-Definitionsdatei. Der Pfad ist relativ zum Erweiterungsordner und lautet normalerweise \"./icons/awesome-icon-theme.json\".",
-	"reqarray": "Extension point `{0}` must be an array.",
-	"reqpath": "Expected string in `contributes.{0}.path`. Provided value: {1}",
-	"reqid": "In \"contributes.{0}.id\" wurde eine Zeichenfolge erwartet. Bereitgestellter Wert: {1}",
-	"invalid.path.1": "Es wurde erwartet, dass \"contributes.{0}.path\" ({1}) im Ordner ({2}) der Erweiterung enthalten ist. Dies führt ggf. dazu, dass die Erweiterung nicht portierbar ist."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json b/i18n/deu/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
deleted file mode 100644
index 66c124a9d5a..00000000000
--- a/i18n/deu/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"error.cannotloadtheme": "Unable to load {0}: {1}",
-	"colorTheme": "Specifies the color theme used in the workbench.",
-	"colorThemeError": "Theme is unknown or not installed.",
-	"iconTheme": "Gibt das in der Workbench verwendete Symboldesign oder \"null\", um keine Dateisymbole anzuzeigen, an.",
-	"noIconThemeDesc": "No file icons",
-	"iconThemeError": "File icon theme is unknown or not installed.",
-	"workbenchColors": "Überschreibt Farben aus dem derzeit ausgewählte Farbdesign.",
-	"editorColors.comments": "Legt die Farben und Stile für Kommentare fest.",
-	"editorColors.strings": "Legt die Farben und Stile für Zeichenfolgenliterale fest.",
-	"editorColors.keywords": "Legt die Farben und Stile für Schlüsselwörter fest.",
-	"editorColors.numbers": "Legt die Farben und Stile für Nummernliterale fest.",
-	"editorColors.types": "Legt die Farben und Stile für Typdeklarationen und Verweise fest.",
-	"editorColors.functions": "Legt die Farben und Stile für Funktionsdeklarationen und Verweise fest.",
-	"editorColors.variables": "Legt die Farben und Stile für Variablendeklarationen und Verweise fest.",
-	"editorColors.textMateRules": "Legt Farben und Stile mithilfe von Textmate-Designregeln fest (erweitert).",
-	"editorColors": "Überschreibt Editorfarben und den Schriftschnitt aus dem momentan ausgewählten Farbdesign."
-}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json b/i18n/deu/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json
deleted file mode 100644
index e86a18877a7..00000000000
--- a/i18n/deu/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"errorInvalidTaskConfiguration": "In die Konfigurationsdatei des Arbeitsbereichs kann nicht geschrieben werden. Öffnen Sie die Datei, um Fehler/Warnungen darin zu beheben, und versuchen Sie es noch mal.",
-	"errorWorkspaceConfigurationFileDirty": "In die Konfigurationsdatei des Arbeitsbereichs kann nicht geschrieben werden, weil sie geändert wurde. Speichern Sie die Datei, und versuchen Sie es noch mal.",
-	"openWorkspaceConfigurationFile": "Konfiguration des Arbeitsbereichs öffnen"
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/azure-account/out/azure-account.i18n.json b/i18n/esn/extensions/azure-account/out/azure-account.i18n.json
deleted file mode 100644
index 787c5816b1d..00000000000
--- a/i18n/esn/extensions/azure-account/out/azure-account.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"azure-account.copyAndOpen": "Copiar y abrir",
-	"azure-account.close": "Cerrar",
-	"azure-account.login": "Iniciar sesión",
-	"azure-account.loginFirst": "No ha iniciado sesión, inicie sesión primero.",
-	"azure-account.userCodeFailed": "Error adquiriendo el código de usuario",
-	"azure-account.tokenFailed": "Adquiriendo token con el código de dispositivo",
-	"azure-account.tokenFromRefreshTokenFailed": "Adquiriendo token con token de actualización"
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/azure-account/out/extension.i18n.json b/i18n/esn/extensions/azure-account/out/extension.i18n.json
deleted file mode 100644
index 33e171e85c5..00000000000
--- a/i18n/esn/extensions/azure-account/out/extension.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"azure-account.loggingIn": "Azure: Iniciando sesión...",
-	"azure-account.loggedIn": "Azure: {0}"
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/bat/package.i18n.json b/i18n/esn/extensions/bat/package.i18n.json
deleted file mode 100644
index cbcaa78ee2d..00000000000
--- a/i18n/esn/extensions/bat/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Conceptos básicos del lenguaje Windows Bat",
-	"description": "Proporciona fragmentos de código, resaltado de sintaxis, correspondencia de corchetes y plegado de código en archivos por lotes de Windows."
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/clojure/package.i18n.json b/i18n/esn/extensions/clojure/package.i18n.json
deleted file mode 100644
index e81462551ed..00000000000
--- a/i18n/esn/extensions/clojure/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Conceptos básicos del lenguaje Clojure",
-	"description": "Proporciona resaltado de sintaxis y correspondencia de corchetes en archivos de Clojure."
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/coffeescript/package.i18n.json b/i18n/esn/extensions/coffeescript/package.i18n.json
deleted file mode 100644
index 3bae8327b6c..00000000000
--- a/i18n/esn/extensions/coffeescript/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Conceptos básicos del lenguaje CoffeeScript",
-	"description": "Proporciona fragmentos de código, resaltado de sintaxis, correspondencia de corchetes y plegado de código en archivos de CoffeeScript."
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/configuration-editing/out/extension.i18n.json b/i18n/esn/extensions/configuration-editing/out/extension.i18n.json
deleted file mode 100644
index 05c7b5c0d77..00000000000
--- a/i18n/esn/extensions/configuration-editing/out/extension.i18n.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"workspaceFolder": "La ruta de la carpeta abierta en VS Code",
-	"workspaceFolderBasename": "El nombre de la carpeta abierta en VS Code sin ninguna barra diagonal (/)",
-	"relativeFile": "El archivo abierto actualmente relativo a ${workspaceFolder}",
-	"file": "El archivo abierto actualmente",
-	"cwd": "El directorio de trabajo del ejecutor de tarea en el arranque",
-	"lineNumber": "El número de línea seleccionado actual en el archivo activo",
-	"selectedText": "El texto actual seleccionado en el archivo activo ",
-	"fileDirname": "Nombre del directorio del archivo abierto actual",
-	"fileExtname": "Extensión de archivo abierto actual",
-	"fileBasename": "Nombre base del archivo abierto actual ",
-	"fileBasenameNoExtension": "Nombre base del archivo abierto actual sin extensión de archivo ",
-	"exampleExtension": "Ejemplo"
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json b/i18n/esn/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json
deleted file mode 100644
index 7b5e909f1c4..00000000000
--- a/i18n/esn/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"activeEditorShort": "el nombre del archivo (por ejemplo miarchivo.txt)",
-	"activeEditorMedium": "la ruta de acceso del archivo relativa a la carpeta del espacio de trabajo (p. ej. miCarpeta/miArchivo.txt)",
-	"activeEditorLong": "la ruta de acceso completa del archivo (por ejemplo, /Users/Development/myProject/myFolder/myFile.txt)",
-	"rootName": "nombre del área de trabajo  (p. ej. myFolder o myWorkspace)",
-	"rootPath": "ruta del archivo del área de trabajo (p. ej. /Users/Development/myWorkspace)",
-	"folderName": "nombre de la carpeta del área de trabajo en la que el archivo está contenido (p. ej. myFolder)",
-	"folderPath": "ruta de acceso de archivo de la carpeta del área de trabajo en la que el archivo está contenido (p. ej. /Users/Development/myFolder)",
-	"appName": "p. ej. VS Code",
-	"dirty": "un indicador con modificaciones si el editor activo tiene modificaciones",
-	"separator": "un separador condicional (\"-\") que aparece solo cuando está rodeado de variables con valores",
-	"assocLabelFile": "Archivos con extensión",
-	"assocDescriptionFile": "Asigna todos los archivos cuyo nombre coincide con el patrón global al lenguaje con el identificador especificado.",
-	"assocLabelPath": "Archivos con ruta de acceso",
-	"assocDescriptionPath": "Asigna todos los archivos cuya ruta de acceso al lenguaje con el identificador especificado coincide con el patrón global de ruta de acceso absoluta.",
-	"fileLabel": "Archivos por extensión",
-	"fileDescription": "Hacer coincidir todos los archivos que tengan una extensión de archivo determinada.",
-	"filesLabel": "Archivos con varias extensiones",
-	"filesDescription": "Hacer coincidir todos los archivos con cualquiera de las extensiones de archivo.",
-	"derivedLabel": "Archivos con elementos del mismo nivel por nombre",
-	"derivedDescription": "Hacer coincidir archivos que tienen elementos del mismo nivel con el mismo nombre pero con extensión diferente.",
-	"topFolderLabel": "Carpeta por nombre (nivel superior)",
-	"topFolderDescription": "Hacer coincidir una carpeta de nivel superior con un nombre específico.",
-	"topFoldersLabel": "Carpetas con varios nombres (nivel superior)",
-	"topFoldersDescription": "Hacer coincidir varias carpetas de nivel superior.",
-	"folderLabel": "Carpeta por nombre (cualquier ubicación)",
-	"folderDescription": "Hacer coincidir una carpeta con un nombre determinado en cualquier ubicación.",
-	"falseDescription": "Deshabilitar el patrón.",
-	"trueDescription": "Habilitar el patrón.",
-	"siblingsDescription": "Hacer coincidir archivos que tienen elementos del mismo nivel con el mismo nombre pero con extensión diferente.",
-	"languageSpecificEditorSettings": "Configuración del editor específica del lenguaje",
-	"languageSpecificEditorSettingsDescription": "Reemplazar configuración del editor para lenguaje"
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/configuration-editing/package.i18n.json b/i18n/esn/extensions/configuration-editing/package.i18n.json
deleted file mode 100644
index 6c2337da1a4..00000000000
--- a/i18n/esn/extensions/configuration-editing/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Edición de configuración",
-	"description": "Proporciona características (IntelliSense avanzado, corrección automática) en archivos de configuración, como archivos de parámetros, de inicio y de recomendación de extensiones."
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/cpp/package.i18n.json b/i18n/esn/extensions/cpp/package.i18n.json
deleted file mode 100644
index b624bdfdca9..00000000000
--- a/i18n/esn/extensions/cpp/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Conceptos básicos del lenguaje C y C++",
-	"description": "Proporciona fragmentos de código, resaltado de sintaxis, correspondencia de corchetes y plegado de código en archivos de C/C++."
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/csharp/package.i18n.json b/i18n/esn/extensions/csharp/package.i18n.json
deleted file mode 100644
index dbdc811109d..00000000000
--- a/i18n/esn/extensions/csharp/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Conceptos básicos del lenguaje C#",
-	"description": "Proporciona fragmentos de código, resaltado de sintaxis, correspondencia de corchetes y plegado de código en archivos de C#."
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/css-language-features/client/out/cssMain.i18n.json b/i18n/esn/extensions/css-language-features/client/out/cssMain.i18n.json
deleted file mode 100644
index 0100d5fd5a7..00000000000
--- a/i18n/esn/extensions/css-language-features/client/out/cssMain.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"cssserver.name": "Servidor de lenguaje CSS",
-	"folding.start": "Inicio de la región plegable",
-	"folding.end": "Fin de la región plegable"
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/css-language-features/package.i18n.json b/i18n/esn/extensions/css-language-features/package.i18n.json
deleted file mode 100644
index 91d31339c05..00000000000
--- a/i18n/esn/extensions/css-language-features/package.i18n.json
+++ /dev/null
@@ -1,81 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Características del lenguaje CSS",
-	"description": "Proporciona un potente soporte de lenguaje para archivos CSS, LESS y SCSS.",
-	"css.title": "CSS",
-	"css.lint.argumentsInColorFunction.desc": "Número de parámetros no válido",
-	"css.lint.boxModel.desc": "No use ancho o alto con el relleno o los bordes.",
-	"css.lint.compatibleVendorPrefixes.desc": "Cuando use un prefijo específico del proveedor, compruebe que también haya incluido el resto de propiedades específicas del proveedor.",
-	"css.lint.duplicateProperties.desc": "No use definiciones de estilo duplicadas",
-	"css.lint.emptyRules.desc": "No use conjuntos de reglas vacíos",
-	"css.lint.float.desc": "Le recomendamos no usar 'float'. Los floats producen CSS frágiles, fáciles de corromper si cambia cualquier aspecto del diseño.",
-	"css.lint.fontFaceProperties.desc": "La regla @font-face debe definir las propiedades \"src\" y \"font-family\"",
-	"css.lint.hexColorLength.desc": "Los colores hexadecimales deben estar formados por tres o seis números hexadecimales.",
-	"css.lint.idSelector.desc": "Los selectores no deben contener identificadores porque estas reglas están estrechamente ligadas a HTML.",
-	"css.lint.ieHack.desc": "Las modificaciones de IE solo son necesarias cuando admiten IE7 y anteriores",
-	"css.lint.important.desc": "Le recomendamos no usar !important. Esto indica que la especificidad de todo el CSS está fuera de control y que debe refactorizarse.",
-	"css.lint.importStatement.desc": "Las instrucciones Import no se cargan en paralelo",
-	"css.lint.propertyIgnoredDueToDisplay.desc": "La propiedad se ignora a causa de la pantalla. Por ejemplo, con 'display: inline', el ancho, el alto, el margen superior e inferior y las propiedades de float no tienen efecto.",
-	"css.lint.universalSelector.desc": "Se sabe que el selector universal (*) es lento",
-	"css.lint.unknownProperties.desc": "Propiedad desconocida.",
-	"css.lint.unknownVendorSpecificProperties.desc": "Propiedad específica del proveedor desconocida.",
-	"css.lint.vendorPrefix.desc": "Cuando use un prefijo específico del proveedor, incluya también la propiedad estándar.",
-	"css.lint.zeroUnits.desc": "No se necesita una unidad para cero",
-	"css.trace.server.desc": "Hace un seguimiento de la comunicación entre VSCode y el servidor de lenguaje CSS.",
-	"css.validate.title": "Controla la validación de CSS y la gravedad de los problemas.",
-	"css.validate.desc": "Habilita o deshabilita todas las validaciones",
-	"less.title": "LESS",
-	"less.lint.argumentsInColorFunction.desc": "Número de parámetros no válido",
-	"less.lint.boxModel.desc": "No use ancho o alto con el relleno o los bordes.",
-	"less.lint.compatibleVendorPrefixes.desc": "Cuando use un prefijo específico del proveedor, compruebe que también haya incluido el resto de propiedades específicas del proveedor.",
-	"less.lint.duplicateProperties.desc": "No use definiciones de estilo duplicadas",
-	"less.lint.emptyRules.desc": "No use conjuntos de reglas vacíos",
-	"less.lint.float.desc": "Le recomendamos no usar 'float'. Los floats producen CSS frágiles, fáciles de corromper si cambia cualquier aspecto del diseño.",
-	"less.lint.fontFaceProperties.desc": "La regla @font-face debe definir las propiedades \"src\" y \"font-family\"",
-	"less.lint.hexColorLength.desc": "Los colores hexadecimales deben estar formados por tres o seis números hexadecimales.",
-	"less.lint.idSelector.desc": "Los selectores no deben contener identificadores porque estas reglas están estrechamente ligadas a HTML.",
-	"less.lint.ieHack.desc": "Las modificaciones de IE solo son necesarias cuando admiten IE7 y anteriores",
-	"less.lint.important.desc": "Le recomendamos no usar !important. Esto indica que la especificidad de todo el CSS está fuera de control y que debe refactorizarse.",
-	"less.lint.importStatement.desc": "Las instrucciones Import no se cargan en paralelo",
-	"less.lint.propertyIgnoredDueToDisplay.desc": "La propiedad se ignora a causa de la pantalla. Por ejemplo, con 'display: inline', el ancho, el alto, el margen superior e inferior y las propiedades de float no tienen efecto.",
-	"less.lint.universalSelector.desc": "Se sabe que el selector universal (*) es lento",
-	"less.lint.unknownProperties.desc": "Propiedad desconocida.",
-	"less.lint.unknownVendorSpecificProperties.desc": "Propiedad específica del proveedor desconocida.",
-	"less.lint.vendorPrefix.desc": "Cuando use un prefijo específico del proveedor, incluya también la propiedad estándar.",
-	"less.lint.zeroUnits.desc": "No se necesita una unidad para cero",
-	"less.validate.title": "Controla la validación de LESS y la gravedad de los problemas.",
-	"less.validate.desc": "Habilita o deshabilita todas las validaciones",
-	"scss.title": "SCSS (Sass)",
-	"scss.lint.argumentsInColorFunction.desc": "Número de parámetros no válido",
-	"scss.lint.boxModel.desc": "No use ancho o alto con el relleno o los bordes.",
-	"scss.lint.compatibleVendorPrefixes.desc": "Cuando use un prefijo específico del proveedor, compruebe que también haya incluido el resto de propiedades específicas del proveedor.",
-	"scss.lint.duplicateProperties.desc": "No use definiciones de estilo duplicadas",
-	"scss.lint.emptyRules.desc": "No use conjuntos de reglas vacíos",
-	"scss.lint.float.desc": "Le recomendamos no usar 'float'. Los floats producen CSS frágiles, fáciles de corromper si cambia cualquier aspecto del diseño.",
-	"scss.lint.fontFaceProperties.desc": "La regla @font-face debe definir las propiedades \"src\" y \"font-family\"",
-	"scss.lint.hexColorLength.desc": "Los colores hexadecimales deben estar formados por tres o seis números hexadecimales.",
-	"scss.lint.idSelector.desc": "Los selectores no deben contener identificadores porque estas reglas están estrechamente ligadas a HTML.",
-	"scss.lint.ieHack.desc": "Las modificaciones de IE solo son necesarias cuando admiten IE7 y anteriores",
-	"scss.lint.important.desc": "Le recomendamos no usar !important. Esto indica que la especificidad de todo el CSS está fuera de control y que debe refactorizarse.",
-	"scss.lint.importStatement.desc": "Las instrucciones Import no se cargan en paralelo",
-	"scss.lint.propertyIgnoredDueToDisplay.desc": "La propiedad se ignora a causa de la pantalla. Por ejemplo, con 'display: inline', el ancho, el alto, el margen superior e inferior y las propiedades de float no tienen efecto.",
-	"scss.lint.universalSelector.desc": "Se sabe que el selector universal (*) es lento",
-	"scss.lint.unknownProperties.desc": "Propiedad desconocida.",
-	"scss.lint.unknownVendorSpecificProperties.desc": "Propiedad específica del proveedor desconocida.",
-	"scss.lint.vendorPrefix.desc": "Cuando use un prefijo específico del proveedor, incluya también la propiedad estándar.",
-	"scss.lint.zeroUnits.desc": "No se necesita una unidad para cero",
-	"scss.validate.title": "Controla la validación de SCSS y la gravedad de los problemas.",
-	"scss.validate.desc": "Habilita o deshabilita todas las validaciones",
-	"less.colorDecorators.enable.desc": "Habilita o deshabilita decoradores de color",
-	"scss.colorDecorators.enable.desc": "Habilita o deshabilita decoradores de color",
-	"css.colorDecorators.enable.desc": "Habilita o deshabilita decoradores de color",
-	"css.colorDecorators.enable.deprecationMessage": "El valor \"css.colorDecorators.enable\" está en desuso en favor de \"editor.colorDecorators\".",
-	"scss.colorDecorators.enable.deprecationMessage": "El valor \"scss.colorDecorators.enable\" está en desuso en favor de \"editor.colorDecorators\".",
-	"less.colorDecorators.enable.deprecationMessage": "El valor \"less.colorDecorators.enable\" está en desuso en favor de \"editor.colorDecorators\"."
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/css/client/out/cssMain.i18n.json b/i18n/esn/extensions/css/client/out/cssMain.i18n.json
deleted file mode 100644
index 0100d5fd5a7..00000000000
--- a/i18n/esn/extensions/css/client/out/cssMain.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"cssserver.name": "Servidor de lenguaje CSS",
-	"folding.start": "Inicio de la región plegable",
-	"folding.end": "Fin de la región plegable"
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/css/package.i18n.json b/i18n/esn/extensions/css/package.i18n.json
deleted file mode 100644
index 8b817c2ddd4..00000000000
--- a/i18n/esn/extensions/css/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Básicos de CSS",
-	"description": "Proporciona resaltado de sintaxis y correspondencia de corchetes en archivos CSS, LESS y SCSS."
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/diff/package.i18n.json b/i18n/esn/extensions/diff/package.i18n.json
deleted file mode 100644
index b03cedad937..00000000000
--- a/i18n/esn/extensions/diff/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Características del lenguaje para archivos Diff",
-	"description": "Proporciona resaltado de sintaxis, corchetes angulares de cierre y otras características del lenguaje en archivos Diff"
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/docker/package.i18n.json b/i18n/esn/extensions/docker/package.i18n.json
deleted file mode 100644
index 0a04c7921e8..00000000000
--- a/i18n/esn/extensions/docker/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Conceptos básicos del lenguaje Docker",
-	"description": "Proporciona resaltado de sintaxis y correspondencia de corchetes en archivos de Docker."
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/emmet/package.i18n.json b/i18n/esn/extensions/emmet/package.i18n.json
deleted file mode 100644
index d6c05800c1e..00000000000
--- a/i18n/esn/extensions/emmet/package.i18n.json
+++ /dev/null
@@ -1,65 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"description": "Soporte de Emmet para VS Code",
-	"command.wrapWithAbbreviation": "Encapsular con abreviatura",
-	"command.wrapIndividualLinesWithAbbreviation": "Encapsular las líneas individuales con abreviatura",
-	"command.removeTag": "Quitar etiqueta",
-	"command.updateTag": "Actualizar etiqueta",
-	"command.matchTag": "Ir al par coincidente",
-	"command.balanceIn": "Equilibrio (entrante)",
-	"command.balanceOut": "Equilibrio (saliente)",
-	"command.prevEditPoint": "Ir al punto de edición anterior",
-	"command.nextEditPoint": "Ir al siguiente punto de edición",
-	"command.mergeLines": "Combinar líneas",
-	"command.selectPrevItem": "Seleccionar el elemento anterior",
-	"command.selectNextItem": "Seleccionar el siguiente elemento",
-	"command.splitJoinTag": "Dividir/Combinar etiqueta",
-	"command.toggleComment": "Alternar comentario",
-	"command.evaluateMathExpression": "Evaluar expresión matemática",
-	"command.updateImageSize": "Actualizar tamaño de imagen",
-	"command.reflectCSSValue": "Reflejar valor CSS",
-	"command.incrementNumberByOne": "Aumentar por 1",
-	"command.decrementNumberByOne": "Disminuir por 1",
-	"command.incrementNumberByOneTenth": "Aumentar por 0.1",
-	"command.decrementNumberByOneTenth": "Disminuir por 0.1",
-	"command.incrementNumberByTen": "Aumentar por 10",
-	"command.decrementNumberByTen": "Disminuir por 10",
-	"emmetSyntaxProfiles": "Defina el perfil de la sintaxis especificada o use su propio perfil con reglas específicas.",
-	"emmetExclude": "Una serie de idiomas donde no deben ampliar las abreviaturas de Emmet.",
-	"emmetExtensionsPath": "Ruta de acceso a una carpeta que contiene los perfiles y fragmentos de Emmet.",
-	"emmetShowExpandedAbbreviation": "Muestra abreviaciones Emmet expandidas como sugerencias. La opción \"inMarkupAndStylesheetFilesOnly\" se aplica a HTML, HAML, Jade, Slim, XML, XSL, CSS, SCSS, SASS, LESS y Stylus. La opción \"always\" se aplica a todas las partes del archivo, independientemente de que sea de marcado o CSS. ",
-	"emmetShowAbbreviationSuggestions": "Muestra posibles abreviaciones Emmet como sugerencias. No se aplica a hojas de estilos ni cuando emmet.showExpandedAbbreviation está establecido en \"never\". ",
-	"emmetIncludeLanguages": "Habilite las abreviaturas de Emmet en idiomas que no sean compatibles de forma predeterminada. Añada una asignación aquí entre el idioma y el idioma admitido por Emmet.\n Ej.: { \"Vue-HTML \": \"HTML \", \"JavaScript \": \"javascriptreact \"}",
-	"emmetVariables": "Variables para ser utilizadas en fragmentos de código de Emmet",
-	"emmetTriggerExpansionOnTab": "Cuando se habilita, se expande la abreviación Emmet al presionar la tecla TAB. ",
-	"emmetPreferences": "Preferencias usadas para modificar el comportamiento de algunas acciones y resoluciones de Emmet.",
-	"emmetPreferencesIntUnit": "Unidad predeterminada para valores enteros",
-	"emmetPreferencesFloatUnit": "Unidad predeterminada para valores float",
-	"emmetPreferencesCssAfter": "Símbolo que debe colocarse al final de una propiedad CSS cuando se expanden abreviaturas CSS",
-	"emmetPreferencesSassAfter": "Símbolo que debe colocarse al final de una propiedad CSS cuando se expanden abreviaturas CSS en archivos SASS",
-	"emmetPreferencesStylusAfter": "Símbolo que debe colocarse al final de una propiedad CSS cuando se expanden abreviaturas CSS en archivos Stylus",
-	"emmetPreferencesCssBetween": "Símbolo que debe colocarse entre una propiedad CSS y un valor cuando se expanden abreviaturas CSS",
-	"emmetPreferencesSassBetween": "Símbolo que debe colocarse entre una propiedad CSS y un valor cuando se expanden abreviaturas CSS en archivos SASS",
-	"emmetPreferencesStylusBetween": "Símbolo que debe colocarse entre una propiedad CSS y un valor cuando se expanden abreviaturas CSS en archivos Stylus",
-	"emmetShowSuggestionsAsSnippets": "Si es \"true\", las sugerencias Emmet se muestran como fragmentos de código, de modo que puede ordenarlas por el valor editor.snippetSuggestions. ",
-	"emmetPreferencesBemElementSeparator": "Separador de elemento utilizado para las clases cuando se utiliza el filtro BEM",
-	"emmetPreferencesBemModifierSeparator": "Separador de modificador utilizado para las clases cuando se utiliza el filtro BEM",
-	"emmetPreferencesFilterCommentBefore": "Una definición de comentario que debe ser colocado antes de elemento emparejado cuando se aplica el filtro de comentarios.",
-	"emmetPreferencesFilterCommentAfter": "Una definición de comentario que debe colocarse después de elemento emparejado cuando se aplica el filtro de comentarios.",
-	"emmetPreferencesFilterCommentTrigger": "Una lista separada por comas de nombres de atributos que debe existir en la abreviatura para el filtro de comentarios ser aplicado",
-	"emmetPreferencesFormatNoIndentTags": "Una matriz de nombres de etiqueta que no debería recibir una sangría interna",
-	"emmetPreferencesFormatForceIndentTags": "Una matriz de nombres de etiqueta que siempre debería recibir una sangría interna",
-	"emmetPreferencesAllowCompactBoolean": "Si es 'true', se produce una anotación compacta de atributos booleanos",
-	"emmetPreferencesCssWebkitProperties": "Propiedades CSS separadas por comas que obtienen el prefijo de proveedor 'webkit' cuando se utilizan en la abreviatura Emmet que comienza con '-'. Establecer en la cadena vacía para evitar siempre el prefijo 'webkit'.",
-	"emmetPreferencesCssMozProperties": "Propiedades CSS separadas por comas que obtienen el prefijo de proveedor 'moz' cuando se utilizan en la abreviatura Emmet que comienza con '-'. Establecer en la cadena vacía para evitar siempre el prefijo 'moz'.",
-	"emmetPreferencesCssOProperties": "Propiedades CSS separadas por comas que obtienen el prefijo de proveedor 'o' cuando se utilizan en la abreviatura Emmet que comienza con '-'. Establecer en la cadena vacía para evitar siempre el prefijo 'o'.",
-	"emmetPreferencesCssMsProperties": "Propiedades CSS separadas por comas que obtienen el prefijo de proveedor 'ms' cuando se utilizan en la abreviatura Emmet que comienza con '-'. Establecer en la cadena vacía para evitar siempre el prefijo 'ms'.",
-	"emmetPreferencesCssFuzzySearchMinScore": "La mínima puntuación (de 0 a 1) que se debe alcanzar en la comparación difusa de abreviación. Los valores más bajos pueden producir muchos resultados falsos positivos, los valores más altos pueden reducir posibles coincidencias.",
-	"emmetOptimizeStylesheetParsing": "Cuando se establece en falso, se analiza el archivo entero para determinar si la posición actual es válida para la expansión de abreviaturas de Emmet. Cuando se establece en verdadero, sólo el contenido alrededor de la posición actual en archivos css, scss/less es analizado."
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/extension-editing/out/extensionLinter.i18n.json b/i18n/esn/extensions/extension-editing/out/extensionLinter.i18n.json
deleted file mode 100644
index be1c632d33a..00000000000
--- a/i18n/esn/extensions/extension-editing/out/extensionLinter.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"httpsRequired": "Las imágenes deben utilizar el protocolo HTTPS.",
-	"svgsNotValid": "Los SVG no son un origen de imagen válido.",
-	"embeddedSvgsNotValid": "Los SGV insertados no son un origen de imagen válido.",
-	"dataUrlsNotValid": "Las direcciones URL de datos no son un origen de imagen válido.",
-	"relativeUrlRequiresHttpsRepository": "Las direcciones URL relativas de imágenes requieren un repositorio con el protocolo HTTPS especificado en el archivo package.json.",
-	"relativeIconUrlRequiresHttpsRepository": "Un icono requiere un repositorio con el protocolo HTTPS especificado en este archivo package.json.",
-	"relativeBadgeUrlRequiresHttpsRepository": "Las direcciones URL relativas de distintivos requieren un repositorio con el protocolo HTTPS especificado en este archivo package.json."
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/extension-editing/out/packageDocumentHelper.i18n.json b/i18n/esn/extensions/extension-editing/out/packageDocumentHelper.i18n.json
deleted file mode 100644
index e59184ef142..00000000000
--- a/i18n/esn/extensions/extension-editing/out/packageDocumentHelper.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"languageSpecificEditorSettings": "Configuración del editor específica del lenguaje",
-	"languageSpecificEditorSettingsDescription": "Reemplazar configuración del editor para lenguaje"
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/extension-editing/package.i18n.json b/i18n/esn/extensions/extension-editing/package.i18n.json
deleted file mode 100644
index 2cb914f2d03..00000000000
--- a/i18n/esn/extensions/extension-editing/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Edición de archivos de paquetes",
-	"description": "Proporciona IntelliSense para puntos de extensión de VS Code y linting en archivos de package.json."
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/fsharp/package.i18n.json b/i18n/esn/extensions/fsharp/package.i18n.json
deleted file mode 100644
index 8da11780fb4..00000000000
--- a/i18n/esn/extensions/fsharp/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Conceptos básicos del lenguaje F#",
-	"description": "Proporciona fragmentos de código, resaltado de sintaxis, correspondencia de corchetes y plegado de código en archivos de F#."
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/git/out/askpass-main.i18n.json b/i18n/esn/extensions/git/out/askpass-main.i18n.json
deleted file mode 100644
index 8a54a52011a..00000000000
--- a/i18n/esn/extensions/git/out/askpass-main.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"missOrInvalid": "Faltan las credenciales o no son válidas."
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/git/out/autofetch.i18n.json b/i18n/esn/extensions/git/out/autofetch.i18n.json
deleted file mode 100644
index 8ad760617c8..00000000000
--- a/i18n/esn/extensions/git/out/autofetch.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"yes": "Sí",
-	"no": "No",
-	"not now": "Preguntarme luego",
-	"suggest auto fetch": "¿Te gustaría que Code [ejecute 'git fetch' periódicamente]({0})?"
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/git/out/commands.i18n.json b/i18n/esn/extensions/git/out/commands.i18n.json
deleted file mode 100644
index 022bf20d57e..00000000000
--- a/i18n/esn/extensions/git/out/commands.i18n.json
+++ /dev/null
@@ -1,91 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"tag at": "Etiqueta en {0}",
-	"remote branch at": "Rama remota en {0}",
-	"create branch": "$(plus) crear nueva rama",
-	"repourl": "URL del repositorio",
-	"selectFolder": "Seleccione la ubicación del repositorio",
-	"cloning": "Clonación del repositorio git ' {0} '...",
-	"proposeopen": "¿Desea abrir el repositorio clonado?",
-	"openrepo": "Abrir repositorio",
-	"add": "Añadir a espacio de trabajo",
-	"proposeopen2": "¿Desea abrir el repositorio clonado, o añadir al espacio de trabajo actual?",
-	"init": "Seleccione una carpeta de área de trabajo en la que inicializar el repositorio de git",
-	"init repo": "Inicializar el repositorio",
-	"create repo": "Inicializar el repositorio",
-	"are you sure": "Esto creará un repositorio Git en '{0}'. ¿Está seguro de que desea continuar?",
-	"HEAD not available": "La versión HEAD de '{0}' no está disponible.",
-	"confirm stage files with merge conflicts": "¿Está seguro de que quiere hacer una copia intermedia de {0} archivos con conflictos de fusión mediante combinación?",
-	"confirm stage file with merge conflicts": "¿Está seguro de que quiere hacer una copia intermedia de {0} con conflictos de fusión mediante combinación? ",
-	"yes": "Sí",
-	"confirm revert": "¿Está seguro de que desea revertir los cambios seleccionados en {0}?",
-	"revert": "Revertir cambios",
-	"discard": "Descartar cambios",
-	"confirm delete": "¿Está seguro de que desea eliminar '{0}'? ",
-	"delete file": "Eliminar archivo",
-	"confirm discard": "¿Está seguro de que quiere descartar los cambios de {0}?",
-	"confirm discard multiple": "¿Está seguro de que quiere descartar los cambios de {0} archivos?",
-	"warn untracked": "¡Esto ELIMINARÁ {0} archivos sin seguimiento!",
-	"confirm discard all single": "¿Está seguro de que quiere descartar los cambios de {0}?",
-	"confirm discard all": "¿Está seguro de que quiere descartar TODOS los cambios en {0} archivos?\nEsta acción es IRREVERSIBLE.\nSu espacio de trabajo actual SE PERDERÁ PARA SIEMPRE.",
-	"discardAll multiple": "Descartar un archivo",
-	"discardAll": "Descartar todos los archivos ({0})",
-	"confirm delete multiple": "¿Está seguro de que quiere ELIMINAR {0} archivos?",
-	"delete files": "Eliminar archivos",
-	"there are untracked files single": "El siguiente archivo sin seguimiento se ELIMINARÁ DEL DISCO si se descarta: {0}.",
-	"there are untracked files": "Hay {0} archivos sin seguimiento que se ELIMINARÁN DEL DISCO si se descartan.",
-	"confirm discard all 2": "{0}\n\nEsta acción es IRREVERSIBLE. Su espacio de trabajo actual SE PERDERÁ PARA SIEMPRE.",
-	"yes discard tracked": "Descartar un archivo con seguimiento",
-	"yes discard tracked multiple": "Descartar {0} archivos con seguimiento",
-	"unsaved files single": "El siguiente archivo no está guardado: {0}.\n¿Desea guardarlo antes de confirmarlo? ",
-	"unsaved files": "Hay {0} archivos sin guardar.\n¿Desea guardarlos antes de confirmar?",
-	"save and commit": "Guardar todo y confirmar",
-	"commit": "Confirmar de todas formas",
-	"no staged changes": "No hay elementos almacenados provisionalmente.\n\n¿Desea almacenar de forma provisional todos sus cambios y confirmarlos directamente?",
-	"always": "Siempre",
-	"no changes": "No hay cambios para confirmar.",
-	"commit message": "Mensaje de confirmación",
-	"provide commit message": "Proporcione un mensaje de confirmación",
-	"select a ref to checkout": "Seleccione una referencia para desproteger",
-	"branch name": "Nombre de rama",
-	"provide branch name": "Especifique un nombre para la rama",
-	"select branch to delete": "Seleccione una rama para borrar",
-	"confirm force delete branch": "La rama '{0}' no está completamente fusionada. ¿Borrarla de todas formas?",
-	"delete branch": "Borrar rama...",
-	"invalid branch name": "Nombre de rama no válido",
-	"branch already exists": "Ya existe una rama como '{0}'",
-	"select a branch to merge from": "Seleccione una rama desde la que fusionar",
-	"merge conflicts": "Hay conflictos de fusión. Resuelvalos antes de confirmar.",
-	"tag name": "Nombre de etiqueta",
-	"provide tag name": "Por favor proporcione un nombre para la etiqueta ",
-	"tag message": "Mensaje ",
-	"provide tag message": "Por favor, especifique un mensaje para anotar la etiqueta",
-	"no remotes to fetch": "El repositorio no tiene remotos configurados de los que extraer.",
-	"no remotes to pull": "El repositorio no tiene remotos configurados de los que extraer.",
-	"pick remote pull repo": "Seleccione un origen remoto desde el que extraer la rama",
-	"no remotes to push": "El repositorio no tiene remotos configurados en los que insertar.",
-	"nobranch": "Extraiga del repositorio una rama para insertar un remoto.",
-	"confirm publish branch": "La rama ' {0} ' no tiene ninguna rama ascendente. ¿desea publicar esta rama?",
-	"ok": "Aceptar",
-	"push with tags success": "Insertado con etiquetas correctamente.",
-	"pick remote": "Seleccionar un elemento remoto para publicar la rama '{0}':",
-	"sync is unpredictable": "Esta acción insertará e incorporará cambios en y desde '{0}/{1}'.",
-	"never again": "No volver a mostrar ",
-	"no remotes to publish": "El repositorio no tiene remotos configurados en los que publicar.",
-	"no changes stash": "No existen cambios para el guardado provisional.",
-	"provide stash message": "Opcionalmente, proporcionar un mensaje para el guardado provisional",
-	"stash message": "Mensaje para el guardado provisional",
-	"no stashes": "No hay cambios guardados provisionalmente para restaurar.",
-	"pick stash to pop": "Elija un cambio guardado provisionalmente para aplicarlo y quitarlo",
-	"clean repo": "Limpie el árbol de trabajo del repositorio antes de la desprotección.",
-	"cant push": "No se pueden enviar referencias al remoto. Intenta ejecutar 'Pull' primero para integrar tus cambios.",
-	"git error details": "GIT: {0}",
-	"git error": "Error de GIT",
-	"open git log": "Abrir registro de GIT"
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/git/out/main.i18n.json b/i18n/esn/extensions/git/out/main.i18n.json
deleted file mode 100644
index 43b001246df..00000000000
--- a/i18n/esn/extensions/git/out/main.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"looking": "Buscando git en: {0}",
-	"using git": "Usando GIT {0} desde {1}",
-	"downloadgit": "Descargar Git",
-	"neverShowAgain": "No volver a mostrar",
-	"notfound": "Git no encontrado. Instálalo o configúralo usando la configuración 'git.path'.",
-	"updateGit": "Actualizar GIT",
-	"git20": "Parece que tiene instalado GIT {0}. El código funciona mejor con GIT >= 2"
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/git/out/model.i18n.json b/i18n/esn/extensions/git/out/model.i18n.json
deleted file mode 100644
index b82caa9b99f..00000000000
--- a/i18n/esn/extensions/git/out/model.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"too many submodules": "El repositorio ' {0} ' tiene {1} submódulos que no se abrirán automáticamente. Usted todavía puede abrir cada archivo individualmente.",
-	"no repositories": "No hay repositorios disponibles",
-	"pick repo": "Elija un repositorio"
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/git/out/repository.i18n.json b/i18n/esn/extensions/git/out/repository.i18n.json
deleted file mode 100644
index 17b0873d4bc..00000000000
--- a/i18n/esn/extensions/git/out/repository.i18n.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"open": "Abrir",
-	"index modified": "Índice modificado",
-	"modified": "Modificado",
-	"index added": "Índice añadido",
-	"index deleted": "Índice Eliminado",
-	"deleted": "Eliminado",
-	"index renamed": "Nombre de Índice Cambiado",
-	"index copied": "Índice copiado",
-	"untracked": "Sin seguimiento",
-	"ignored": "Omitido",
-	"both deleted": "Ambos eliminados",
-	"added by us": "Agregado por nosotros",
-	"deleted by them": "Eliminado por ellos",
-	"added by them": "Agregado por ellos",
-	"deleted by us": "Borrado por nosotros",
-	"both added": "Ambos añadidos",
-	"both modified": "Ambos modificados",
-	"commitMessage": "Message (press {0} to commit)",
-	"commit": "Confirmar",
-	"merge changes": "Fusionar cambios mediante combinación",
-	"staged changes": "Cambios almacenados provisionalmente",
-	"changes": "Cambios",
-	"commitMessageCountdown": "quedan {0} caracteres en la línea actual",
-	"commitMessageWarning": "{0} caracteres sobre {1} en la línea actual",
-	"neveragain": "No volver a mostrar",
-	"huge": "El repositorio Git '{0}' contiene muchos cambios activos, solamente un subconjunto de las características de Git serán habilitadas."
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/git/out/scmProvider.i18n.json b/i18n/esn/extensions/git/out/scmProvider.i18n.json
deleted file mode 100644
index 490dda3603e..00000000000
--- a/i18n/esn/extensions/git/out/scmProvider.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"commit": "Confirmar"
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/git/out/statusbar.i18n.json b/i18n/esn/extensions/git/out/statusbar.i18n.json
deleted file mode 100644
index 70365ed5c3a..00000000000
--- a/i18n/esn/extensions/git/out/statusbar.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"checkout": "Extraer del repositorio...",
-	"sync changes": "Sincronizar cambios",
-	"publish changes": "Publicar cambios",
-	"syncing changes": "Sincronizando cambios..."
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/git/package.i18n.json b/i18n/esn/extensions/git/package.i18n.json
deleted file mode 100644
index 87a73cba8a7..00000000000
--- a/i18n/esn/extensions/git/package.i18n.json
+++ /dev/null
@@ -1,87 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "GIT",
-	"description": "Integración Git SCM",
-	"command.clone": "Clonar",
-	"command.init": "Inicializar el repositorio",
-	"command.close": "Cerrar repositorio",
-	"command.refresh": "Actualizar",
-	"command.openChange": "Abrir cambios",
-	"command.openFile": "Abrir archivo",
-	"command.openHEADFile": "Abrir archivo (HEAD)",
-	"command.stage": "Almacenar cambios provisionalmente",
-	"command.stageAll": "Almacenar todos los cambios",
-	"command.stageSelectedRanges": "Realizar copia intermedia de los intervalos seleccionados",
-	"command.revertSelectedRanges": "Revertir los intervalos seleccionados",
-	"command.stageChange": "Cambio de la etapa",
-	"command.revertChange": "Revertir el cambio",
-	"command.unstage": "Cancelar almacenamiento provisional de los cambios",
-	"command.unstageAll": "Cancelar almacenamiento provisional de todos los cambios",
-	"command.unstageSelectedRanges": "Cancelar almacenamiento provisional de los intervalos seleccionados",
-	"command.clean": "Descartar cambios",
-	"command.cleanAll": "Descartar todos los cambios",
-	"command.commit": "Confirmar",
-	"command.commitStaged": "Confirmar almacenados provisionalmente",
-	"command.commitStagedSigned": "Confirmar por etapas (Aprobado)",
-	"command.commitStagedAmend": "Confirmar almacenados provisionalmente (modificar)",
-	"command.commitAll": "Confirmar todo",
-	"command.commitAllSigned": "Confirmar todo (aprobado)",
-	"command.commitAllAmend": "Confirmar todo (modificar)",
-	"command.undoCommit": "Deshacer última confirmación",
-	"command.checkout": "Desproteger en...",
-	"command.branch": "Crear rama...",
-	"command.deleteBranch": "Borrar rama...",
-	"command.renameBranch": "Renombrar Rama...",
-	"command.merge": "Fusionar rama...",
-	"command.createTag": "Crear etiqueta",
-	"command.fetch": "Buscar",
-	"command.pull": "Incorporación de cambios",
-	"command.pullRebase": "Incorporación de cambios (fusionar mediante cambio de base)",
-	"command.pullFrom": "Extraer de...",
-	"command.push": "Insertar",
-	"command.pushTo": "Insertar en...",
-	"command.pushWithTags": "Insertar con etiquetas",
-	"command.sync": "Sincronizar",
-	"command.syncRebase": "Sincronizar (Rebase)",
-	"command.publish": "Publicar rama",
-	"command.showOutput": "Mostrar salida de GIT",
-	"command.ignore": "Agregar archivo a .gitignore",
-	"command.stashIncludeUntracked": "Guardar provisionalmente (Incluir sin seguimiento)",
-	"command.stash": "Guardar provisionalmente",
-	"command.stashPop": "Aplicar y quitar cambios guardados provisionalmente...",
-	"command.stashPopLatest": "Aplicar y quitar últimos cambios guardados provisionalmente...",
-	"config.enabled": "Si GIT está habilitado",
-	"config.path": "Ruta de acceso del ejecutable de GIT",
-	"config.autoRepositoryDetection": "Si se deben detectar automáticamente los repositories ",
-	"config.autorefresh": "Indica si la actualización automática está habilitada",
-	"config.autofetch": "Si la búsqueda automática está habilitada",
-	"config.enableLongCommitWarning": "Si se debe advertir sobre los mensajes de confirmación largos",
-	"config.confirmSync": "Confirmar antes de sincronizar repositorios GIT",
-	"config.countBadge": "Controla el contador de insignia de Git. \"Todo\" cuenta todos los cambios. \"Seguimiento\" solamente cuenta los cambios realizados. \"Desactivado\" lo desconecta.",
-	"config.checkoutType": "Controla el tipo de ramas listadas cuando ejecuta \"Desproteger\". \"Todo\" muetra todas las referencias, \"local\" solamente las ramas locales y \"remoto\" las ramas remotas.",
-	"config.ignoreLegacyWarning": "Ignora las advertencias hereradas de Git",
-	"config.ignoreMissingGitWarning": "Ignora la advertencia cuando falta Git",
-	"config.ignoreLimitWarning": "\nIgnora advertencias cuando se encuentran muchos cambios en un repositorio.",
-	"config.defaultCloneDirectory": "La ubicación predeterminada en la que se clona un repositorio git",
-	"config.enableSmartCommit": "Confirmar todos los cambios cuando no hay elementos almacenados provisionalmente.",
-	"config.enableCommitSigning": "Habilitar confirmar firma con GPG.",
-	"config.discardAllScope": "Controla qué cambios son descartados por el comando 'Descartar todos los cambios'. 'all' descarta todos los cambios. 'tracked' descarta sólo los ficheros en seguimiento. 'prompt' muestra un cuadro de diálogo para confirmar cada vez la acción ejecutada.",
-	"config.decorations.enabled": "Controla si Git contribuye los colores y distintivos al explorador y a los editores abiertos.",
-	"config.promptToSaveFilesBeforeCommit": "Controla si Git debe comprobar los archivos no guardados antes de confirmar las actualizaciones. ",
-	"config.showInlineOpenFileAction": "Controla si se debe mostrar una acción de archivo abierto en la vista de cambios en Git",
-	"config.inputValidation": "Controla cuándo mostrar el mensaje de validación de entrada en el contador de entrada.",
-	"config.detectSubmodules": "Controla si se detectan automáticamente los submódulos Git. ",
-	"config.detectSubmodulesLimit": "Controla el límite de submódulos de git detectados.",
-	"colors.modified": "Color para recursos modificados.",
-	"colors.deleted": "Color para los recursos eliminados.",
-	"colors.untracked": "Color para los recursos a los que no se les hace seguimiento.",
-	"colors.ignored": "Color para los recursos ignorados.",
-	"colors.conflict": "Color para los recursos con conflictos.",
-	"colors.submodule": "Color para los recursos de submódulos."
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/go/package.i18n.json b/i18n/esn/extensions/go/package.i18n.json
deleted file mode 100644
index 6466924b63a..00000000000
--- a/i18n/esn/extensions/go/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Elementos básicos del lenguaje Go",
-	"description": "Proporciona resaltado de sintaxis y correspondencia de corchetes en archivos de Go."
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/groovy/package.i18n.json b/i18n/esn/extensions/groovy/package.i18n.json
deleted file mode 100644
index 53e2b819ca3..00000000000
--- a/i18n/esn/extensions/groovy/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Conceptos básicos del lenguaje Groovy",
-	"description": "Proporciona fragmentos de código, resaltado de sintaxis y correspondencia de corchetes en archivos de Groovy."
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/grunt/out/main.i18n.json b/i18n/esn/extensions/grunt/out/main.i18n.json
deleted file mode 100644
index 3fa18fd6f4c..00000000000
--- a/i18n/esn/extensions/grunt/out/main.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"execFailed": "La detección automática de Grunt para la carpeta {0} falló con el error: {1}"
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/grunt/package.i18n.json b/i18n/esn/extensions/grunt/package.i18n.json
deleted file mode 100644
index 686f3a3bf20..00000000000
--- a/i18n/esn/extensions/grunt/package.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"description": "Extensión para añadir funcionalidad de Grunt a VSCode.",
-	"displayName": "Soporte de Grunt para VSCode",
-	"config.grunt.autoDetect": "Controla si la detección automática de tareas Grunt está activada o desactivada. Por defecto está activada.",
-	"grunt.taskDefinition.type.description": "La tarea de Grunt que se va a personalizar.",
-	"grunt.taskDefinition.file.description": "El archivo de Grunt que proporciona la tarea. Se puede omitir."
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/gulp/out/main.i18n.json b/i18n/esn/extensions/gulp/out/main.i18n.json
deleted file mode 100644
index f3c2b826274..00000000000
--- a/i18n/esn/extensions/gulp/out/main.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"execFailed": "La detección automática de gulp para la carpeta {0} falló con el error: {1}"
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/gulp/package.i18n.json b/i18n/esn/extensions/gulp/package.i18n.json
deleted file mode 100644
index 9992a1ae875..00000000000
--- a/i18n/esn/extensions/gulp/package.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"description": "Extensión para añadir funcionalidad de Gulp a VSCode.",
-	"displayName": "Soporte de Gulp para VSCode",
-	"config.gulp.autoDetect": "Controla si la detección automática de tareas Gulp esta activada/desactivada. El valor predeterminado es \"activada\".",
-	"gulp.taskDefinition.type.description": "La tarea de Gulp que se va a personalizar.",
-	"gulp.taskDefinition.file.description": "El archivo de Gulp que proporciona la tarea. Se puede omitir."
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/handlebars/package.i18n.json b/i18n/esn/extensions/handlebars/package.i18n.json
deleted file mode 100644
index 6879f92b20e..00000000000
--- a/i18n/esn/extensions/handlebars/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Conceptos básicos del lenguaje Handlebars ",
-	"description": "Proporciona resaltado de sintaxis y correspondencia de corchetes en archivos de Handlebars."
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/hlsl/package.i18n.json b/i18n/esn/extensions/hlsl/package.i18n.json
deleted file mode 100644
index b4913dbf60f..00000000000
--- a/i18n/esn/extensions/hlsl/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Conceptos básicos del lenguaje HLSL",
-	"description": "Proporciona resaltado de sintaxis y correspondencia de corchetes en archivos de  HLSL."
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/html-language-features/client/out/htmlMain.i18n.json b/i18n/esn/extensions/html-language-features/client/out/htmlMain.i18n.json
deleted file mode 100644
index 9900526f77a..00000000000
--- a/i18n/esn/extensions/html-language-features/client/out/htmlMain.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"htmlserver.name": "Servidor de lenguaje HTML",
-	"folding.start": "Inicio de la región plegable",
-	"folding.end": "Fin de la región plegable"
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/html-language-features/package.i18n.json b/i18n/esn/extensions/html-language-features/package.i18n.json
deleted file mode 100644
index 44cb8a85815..00000000000
--- a/i18n/esn/extensions/html-language-features/package.i18n.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Características del lenguaje HTML",
-	"description": "Proporciona un potente soporte del lenguaje para archivos HTML, Razor y Handlebar.",
-	"html.format.enable.desc": "Habilitar o deshabilitar el formateador HTML predeterminado",
-	"html.format.wrapLineLength.desc": "Cantidad máxima de caracteres por línea (0 = deshabilitar).",
-	"html.format.unformatted.desc": "Lista de etiquetas, separadas por comas, a las que no se debe volver a aplicar formato. El valor predeterminado de \"null\" son todas las etiquetas mostradas en https://www.w3.org/TR/html5/dom.html#phrasing-content.",
-	"html.format.contentUnformatted.desc": "Lista de etiquetas, separadas por comas, en las que el contenido no debe volver a formatearse. \"null\" se establece de manera predeterminada en la etiqueta \"pre\".",
-	"html.format.indentInnerHtml.desc": "Aplicar sangría a las secciones <head> y <body>.",
-	"html.format.preserveNewLines.desc": "Indica si los saltos de línea existentes delante de los elementos deben conservarse. Solo funciona delante de los elementos, no dentro de las etiquetas o con texto.",
-	"html.format.maxPreserveNewLines.desc": "Número máximo de saltos de línea que deben conservarse en un fragmento. Use \"null\" para que el número sea ilimitado.",
-	"html.format.indentHandlebars.desc": "Formato y sangría {{#foo}} y {{/foo}}.",
-	"html.format.endWithNewline.desc": "Finalizar con una nueva línea.",
-	"html.format.extraLiners.desc": "Lista de etiquetas, separadas por comas, que deben tener una nueva línea adicional delante. \"null\" tiene como valores predeterminados \"head, body, /html\".",
-	"html.format.wrapAttributes.desc": "Ajustar atributos.",
-	"html.format.wrapAttributes.auto": "Ajustar atributos solo cuando se supera la longitud de la línea.",
-	"html.format.wrapAttributes.force": "Ajustar todos los atributos excepto el primero.",
-	"html.format.wrapAttributes.forcealign": "Ajustar todos los atributos excepto el primero y mantener la alineación.",
-	"html.format.wrapAttributes.forcemultiline": "Ajustar todos los atributos.",
-	"html.suggest.angular1.desc": "Configura si la compatibilidad con el lenguaje HTML integrada sugiere etiquetas y propiedades de Angular V1.",
-	"html.suggest.ionic.desc": "Configura si la compatibilidad con el lenguaje HTML integrada sugiere etiquetas, propiedades y valores de Ionic.",
-	"html.suggest.html5.desc": "Configura si la compatibilidad con el lenguaje HTML integrada sugiere etiquetas, propiedades y valores de HTML5.",
-	"html.trace.server.desc": "Hace un seguimiento de la comunicación entre VSCode y el servidor de lenguaje HTML.",
-	"html.validate.scripts": "Configura si la compatibilidad con el lenguaje HTML incorporado valida los scripts insertados.",
-	"html.validate.styles": "Configura si la compatibilidad con el lenguaje HTML incorporado valida los estilos insertados.",
-	"html.autoClosingTags": "Habilita o deshabilita el cierre automático de las etiquetas HTML."
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/html/client/out/htmlMain.i18n.json b/i18n/esn/extensions/html/client/out/htmlMain.i18n.json
deleted file mode 100644
index 9900526f77a..00000000000
--- a/i18n/esn/extensions/html/client/out/htmlMain.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"htmlserver.name": "Servidor de lenguaje HTML",
-	"folding.start": "Inicio de la región plegable",
-	"folding.end": "Fin de la región plegable"
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/html/package.i18n.json b/i18n/esn/extensions/html/package.i18n.json
deleted file mode 100644
index 3a6ffcc4e4e..00000000000
--- a/i18n/esn/extensions/html/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Conceptos básicos de lenguaje HTML",
-	"description": "Proporciona resaltado de sintaxis, correspondencia de corchetes y fragmentos de código en archivos HTML."
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/ini/package.i18n.json b/i18n/esn/extensions/ini/package.i18n.json
deleted file mode 100644
index ad6b4870465..00000000000
--- a/i18n/esn/extensions/ini/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Conceptos básicos del lenguaje Ini",
-	"description": "Proporciona resaltado de sintaxis y correspondencia de corchetes en archivos Ini."
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/jake/out/main.i18n.json b/i18n/esn/extensions/jake/out/main.i18n.json
deleted file mode 100644
index 48b0bb9fd58..00000000000
--- a/i18n/esn/extensions/jake/out/main.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"execFailed": "La detección automática de Jake para la carpeta {0} falló con el error: {1}"
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/jake/package.i18n.json b/i18n/esn/extensions/jake/package.i18n.json
deleted file mode 100644
index 239e0f4e7e7..00000000000
--- a/i18n/esn/extensions/jake/package.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"description": "Extensión para añadir funcionalidad de Jake a VSCode.",
-	"displayName": "Soporte de Jake para VSCode",
-	"jake.taskDefinition.type.description": "La tarea de Jake que se va a personalizar.",
-	"jake.taskDefinition.file.description": "EL archivo de Jake que proporciona la tarea. Se puede omitir.",
-	"config.jake.autoDetect": "Controla si la detección automática de tareas Jake estan activada/desactivada. El valor predeterminado es \"activada\"."
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/java/package.i18n.json b/i18n/esn/extensions/java/package.i18n.json
deleted file mode 100644
index 3485279d8e9..00000000000
--- a/i18n/esn/extensions/java/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Conceptos básicos del lenguaje Java",
-	"description": "Proporciona fragmentos de código, resaltado de sintaxis, correspondencia de corchetes y plegado de código en archivos de Java."
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/javascript/out/features/bowerJSONContribution.i18n.json b/i18n/esn/extensions/javascript/out/features/bowerJSONContribution.i18n.json
deleted file mode 100644
index 70d26e8c0f6..00000000000
--- a/i18n/esn/extensions/javascript/out/features/bowerJSONContribution.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"json.bower.default": "bower.json predeterminado",
-	"json.bower.error.repoaccess": "No se pudo ejecutar la solicitud del repositorio de Bower: {0}",
-	"json.bower.latest.version": "más reciente"
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/javascript/out/features/packageJSONContribution.i18n.json b/i18n/esn/extensions/javascript/out/features/packageJSONContribution.i18n.json
deleted file mode 100644
index 2a3a809744c..00000000000
--- a/i18n/esn/extensions/javascript/out/features/packageJSONContribution.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"json.package.default": "package.json predeterminado",
-	"json.npm.error.repoaccess": "No se pudo ejecutar la solicitud del repositorio de NPM: {0}",
-	"json.npm.latestversion": "Última versión del paquete en este momento",
-	"json.npm.majorversion": "Coincide con la versión principal más reciente (1.x.x)",
-	"json.npm.minorversion": "Coincide con la versión secundaria más reciente (1.2.x)",
-	"json.npm.version.hover": "Última versión: {0}"
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/javascript/package.i18n.json b/i18n/esn/extensions/javascript/package.i18n.json
deleted file mode 100644
index bf6fd4af88f..00000000000
--- a/i18n/esn/extensions/javascript/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Conceptos básicos del lenguaje JavaScript",
-	"description": "Proporciona fragmentos de código, resaltado de sintaxis, correspondencia de corchetes y plegado de código en archivos de JavaScript."
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/json-language-features/client/out/jsonMain.i18n.json b/i18n/esn/extensions/json-language-features/client/out/jsonMain.i18n.json
deleted file mode 100644
index 253bfb394d3..00000000000
--- a/i18n/esn/extensions/json-language-features/client/out/jsonMain.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"jsonserver.name": "Servidor de lenguaje JSON"
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/json-language-features/package.i18n.json b/i18n/esn/extensions/json-language-features/package.i18n.json
deleted file mode 100644
index d18d8b81bc3..00000000000
--- a/i18n/esn/extensions/json-language-features/package.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Características del lenguaje JSON",
-	"description": "Proporciona un potente soporte de lenguaje para archivos JSON.",
-	"json.schemas.desc": "Asociar esquemas a archivos JSON en el proyecto actual",
-	"json.schemas.url.desc": "Una dirección URL a un esquema o una ruta de acceso relativa a un esquema en el directorio actual",
-	"json.schemas.fileMatch.desc": "Una matriz de patrones de archivo con los cuales coincidir cuando los archivos JSON se resuelvan en esquemas.",
-	"json.schemas.fileMatch.item.desc": "Un patrón de archivo que puede contener \"*\" con el cual coincidir cuando los archivos JSON se resuelvan en esquemas.",
-	"json.schemas.schema.desc": "La definición de esquema de la dirección URL determinada. Solo se necesita proporcionar el esquema para evitar los accesos a la dirección URL del esquema.",
-	"json.format.enable.desc": "Habilitar/deshabilitar formateador JSON predeterminado (requiere reiniciar)",
-	"json.tracing.desc": "Realiza el seguimiento de la comunicación entre VS Code y el servidor de lenguaje JSON.",
-	"json.colorDecorators.enable.desc": "Habilita o deshabilita decoradores de color",
-	"json.colorDecorators.enable.deprecationMessage": "El valor \"json.colorDecorators.enable\" está en desuso en favor de \"editor.colorDecorators\"."
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/json/client/out/jsonMain.i18n.json b/i18n/esn/extensions/json/client/out/jsonMain.i18n.json
deleted file mode 100644
index 253bfb394d3..00000000000
--- a/i18n/esn/extensions/json/client/out/jsonMain.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"jsonserver.name": "Servidor de lenguaje JSON"
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/json/package.i18n.json b/i18n/esn/extensions/json/package.i18n.json
deleted file mode 100644
index 4586ba0848a..00000000000
--- a/i18n/esn/extensions/json/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Conceptos básicos de lenguaje JSON",
-	"description": "Proporciona resaltado de sintaxis y correspondencia de corchetes en archivos JSON."
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/less/package.i18n.json b/i18n/esn/extensions/less/package.i18n.json
deleted file mode 100644
index 8735f5ab0ab..00000000000
--- a/i18n/esn/extensions/less/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Conceptos básicos del lenguaje Less",
-	"description": "Proporciona resaltado de sintaxis, correspondencia de corchetes y plegado de código en archivos de Less."
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/log/package.i18n.json b/i18n/esn/extensions/log/package.i18n.json
deleted file mode 100644
index 25c856f856c..00000000000
--- a/i18n/esn/extensions/log/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Registro",
-	"description": "Proporciona resaltado de sintaxis para archivos con la extensión .log."
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/lua/package.i18n.json b/i18n/esn/extensions/lua/package.i18n.json
deleted file mode 100644
index 9a226d4f38c..00000000000
--- a/i18n/esn/extensions/lua/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Conceptos básicos del lenguaje Lua",
-	"description": "Proporciona resaltado de sintaxis y correspondencia de corchetes en archivos de Lua."
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/make/package.i18n.json b/i18n/esn/extensions/make/package.i18n.json
deleted file mode 100644
index bea3ffacd7d..00000000000
--- a/i18n/esn/extensions/make/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Conceptos básicos del lenguaje  Make",
-	"description": "Proporciona resaltado de sintaxis y correspondencia de corchetes en archivos Make."
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/markdown-basics/package.i18n.json b/i18n/esn/extensions/markdown-basics/package.i18n.json
deleted file mode 100644
index ae1623cce0f..00000000000
--- a/i18n/esn/extensions/markdown-basics/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Conceptos básicos del lenguaje Markdown",
-	"description": "Proporciona fragmentos de código y resaltado de sintaxis para Markdown."
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json b/i18n/esn/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json
deleted file mode 100644
index a97aa29723b..00000000000
--- a/i18n/esn/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"onPreviewStyleLoadError": "No se pudo cargar 'markdown.styles': {0}"
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/markdown-language-features/out/features/preview.i18n.json b/i18n/esn/extensions/markdown-language-features/out/features/preview.i18n.json
deleted file mode 100644
index 0743f600836..00000000000
--- a/i18n/esn/extensions/markdown-language-features/out/features/preview.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"lockedPreviewTitle": "[Vista previa] {0}",
-	"previewTitle": "Vista Previa {0}"
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/markdown-language-features/out/features/previewContentProvider.i18n.json b/i18n/esn/extensions/markdown-language-features/out/features/previewContentProvider.i18n.json
deleted file mode 100644
index ef0bed92441..00000000000
--- a/i18n/esn/extensions/markdown-language-features/out/features/previewContentProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"preview.securityMessage.text": "Se ha deshabilitado parte del contenido de este documento",
-	"preview.securityMessage.title": "Se ha deshabilitado el contenido potencialmente inseguro en la previsualización de Markdown. Para permitir el contenido inseguro o habilitar scripts cambie la configuración de la previsualización de Markdown",
-	"preview.securityMessage.label": "Alerta de seguridad de contenido deshabilitado"
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/markdown-language-features/out/security.i18n.json b/i18n/esn/extensions/markdown-language-features/out/security.i18n.json
deleted file mode 100644
index 6d04884c962..00000000000
--- a/i18n/esn/extensions/markdown-language-features/out/security.i18n.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"strict.title": "Strict",
-	"strict.description": "Cargar solo el contenido seguro",
-	"insecureLocalContent.title": "Permitir contenido local inseguro ",
-	"insecureLocalContent.description": "Habilitar la carga del contenido sobre http desde localhost",
-	"insecureContent.title": "Permitir contenido no seguro",
-	"insecureContent.description": "Habilitar el contenido de carga sobre http",
-	"disable.title": "Deshabilitar",
-	"disable.description": "Permitir todo el contenido y la ejecución de scripts. No se recomienda.",
-	"moreInfo.title": "Más información",
-	"enableSecurityWarning.title": "Habilitar advertencias de seguridad de vista previa en este espacio de trabajo",
-	"disableSecurityWarning.title": "Deshabilitar advertencias de seguridad de vista previa en este espacio de trabajo",
-	"toggleSecurityWarning.description": "No afecta al nivel de seguridad de contenido",
-	"preview.showPreviewSecuritySelector.title": "Seleccione configuración de seguridad para las previsualizaciones de Markdown en esta área de trabajo"
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/markdown-language-features/package.i18n.json b/i18n/esn/extensions/markdown-language-features/package.i18n.json
deleted file mode 100644
index 0e6d8a1f74f..00000000000
--- a/i18n/esn/extensions/markdown-language-features/package.i18n.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Características del lenguaje Markdown",
-	"description": "Proporciona un potente soporte de lenguaje para archivos Markdown.",
-	"markdown.preview.breaks.desc": "Establece cómo los saltos de línea son representados en la vista previa de markdown. Estableciendolo en 'true' crea un <br> para cada nueva línea.",
-	"markdown.preview.linkify": "Habilitar o deshabilitar la conversión de texto de tipo URL a enlaces en la vista previa de markdown.",
-	"markdown.preview.doubleClickToSwitchToEditor.desc": "Haga doble clic en la vista previa de Markdown para cambiar al editor.",
-	"markdown.preview.fontFamily.desc": "Controla la familia de la fuente utilizada en la previsualización del descuento.",
-	"markdown.preview.fontSize.desc": "Controla el tamaño de la fuente en píxeles utilizado en la previsualización del descuento.",
-	"markdown.preview.lineHeight.desc": "Controla la altura de línea utilizada en la previsualización del descuento. Este número es relativo al tamaño de la fuente.",
-	"markdown.preview.markEditorSelection.desc": "Marca la selección del editor actual en la vista previa de Markdown.",
-	"markdown.preview.scrollEditorWithPreview.desc": "Al desplazarse en la vista previa de Markdown, se actualiza la vista del editor.",
-	"markdown.preview.scrollPreviewWithEditor.desc": "Al desplazarse en el editor de Markdown, se actualiza la vista de la previsualización .",
-	"markdown.preview.scrollPreviewWithEditorSelection.desc": "[Desestimado] Desplaza la vista previa de Markdown para revelar la línea del editor seleccionada actualmente.",
-	"markdown.preview.scrollPreviewWithEditorSelection.deprecationMessage": "Este valor se ha reemplazado por \"markdown.preview.scrollPreviewWithEditor\" y ya no tiene ningún efecto.",
-	"markdown.preview.title": "Abrir vista previa",
-	"markdown.previewFrontMatter.dec": "Establece cómo se debe representar el asunto de la parte delantera de YAML en la vista previa del descuento. 'hide' quita el asunto de la parte delantera. De lo contrario, el asunto de la parte delantera se trata como contenido del descuento.",
-	"markdown.previewSide.title": "Abrir vista previa en el lateral",
-	"markdown.showLockedPreviewToSide.title": "Abrir vista previa fija en el lateral",
-	"markdown.showSource.title": "Mostrar origen",
-	"markdown.styles.dec": "Una lista de direcciones URL o rutas de acceso locales a hojas de estilo CSS que utilizar desde la vista previa del descuento. Las tutas de acceso relativas se interpretan en relación con la carpeta abierta en el explorador. Si no hay ninguna carpeta abierta, se interpretan en relación con la ubicación del archivo del descuento. Todos los '\\' deben escribirse como '\\\\'.",
-	"markdown.showPreviewSecuritySelector.title": "Cambiar configuración de seguridad de vista previa",
-	"markdown.trace.desc": "Habilitar registro de depuración para las extensiones de Markdown. ",
-	"markdown.preview.refresh.title": "Actualizar vista previa",
-	"markdown.preview.toggleLock.title": "Cambiar fijación de la vista previa "
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/markdown/out/commands.i18n.json b/i18n/esn/extensions/markdown/out/commands.i18n.json
deleted file mode 100644
index de2da81ae06..00000000000
--- a/i18n/esn/extensions/markdown/out/commands.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"previewTitle": "Vista Previa {0}",
-	"onPreviewStyleLoadError": "No se pudo cargar 'markdown.styles': {0}"
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/markdown/out/commands/onPreviewStyleLoadError.i18n.json b/i18n/esn/extensions/markdown/out/commands/onPreviewStyleLoadError.i18n.json
deleted file mode 100644
index a97aa29723b..00000000000
--- a/i18n/esn/extensions/markdown/out/commands/onPreviewStyleLoadError.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"onPreviewStyleLoadError": "No se pudo cargar 'markdown.styles': {0}"
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/markdown/out/extension.i18n.json b/i18n/esn/extensions/markdown/out/extension.i18n.json
deleted file mode 100644
index 68d14e083b9..00000000000
--- a/i18n/esn/extensions/markdown/out/extension.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"onPreviewStyleLoadError": "No se pudo cargar 'markdown.styles': {0}",
-	"previewTitle": "Vista Previa {0}"
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/markdown/out/features/preview.i18n.json b/i18n/esn/extensions/markdown/out/features/preview.i18n.json
deleted file mode 100644
index 0743f600836..00000000000
--- a/i18n/esn/extensions/markdown/out/features/preview.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"lockedPreviewTitle": "[Vista previa] {0}",
-	"previewTitle": "Vista Previa {0}"
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/markdown/out/features/previewContentProvider.i18n.json b/i18n/esn/extensions/markdown/out/features/previewContentProvider.i18n.json
deleted file mode 100644
index ef0bed92441..00000000000
--- a/i18n/esn/extensions/markdown/out/features/previewContentProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"preview.securityMessage.text": "Se ha deshabilitado parte del contenido de este documento",
-	"preview.securityMessage.title": "Se ha deshabilitado el contenido potencialmente inseguro en la previsualización de Markdown. Para permitir el contenido inseguro o habilitar scripts cambie la configuración de la previsualización de Markdown",
-	"preview.securityMessage.label": "Alerta de seguridad de contenido deshabilitado"
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/markdown/out/previewContentProvider.i18n.json b/i18n/esn/extensions/markdown/out/previewContentProvider.i18n.json
deleted file mode 100644
index dc058764af6..00000000000
--- a/i18n/esn/extensions/markdown/out/previewContentProvider.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"preview.securityMessage.text": "Se ha deshabilitado parte del contenido de este documento",
-	"preview.securityMessage.title": "Se ha deshabilitado el contenido potencialmente inseguro en la previsualización de Markdown. Para permitir el contenido inseguro o habilitar scripts cambie la configuración de la previsualización de Markdown",
-	"preview.securityMessage.label": "Alerta de seguridad de contenido deshabilitado"
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/markdown/out/security.i18n.json b/i18n/esn/extensions/markdown/out/security.i18n.json
deleted file mode 100644
index cd6b70bb3a2..00000000000
--- a/i18n/esn/extensions/markdown/out/security.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"strict.title": "Strict",
-	"strict.description": "Cargar solo el contenido seguro",
-	"insecureContent.title": "Permitir contenido no seguro",
-	"insecureContent.description": "Habilitar el contenido de carga sobre http",
-	"disable.title": "Deshabilitar",
-	"disable.description": "Permitir todo el contenido y la ejecución de scripts. No se recomienda.",
-	"moreInfo.title": "Más información",
-	"enableSecurityWarning.title": "Habilitar advertencias de seguridad de vista previa en este espacio de trabajo",
-	"disableSecurityWarning.title": "Deshabilitar advertencias de seguridad de vista previa en este espacio de trabajo",
-	"toggleSecurityWarning.description": "No afecta el nivel de seguridad de contenido",
-	"preview.showPreviewSecuritySelector.title": "Seleccione configuración de seguridad para las previsualizaciones de Markdown en esta área de trabajo"
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/markdown/package.i18n.json b/i18n/esn/extensions/markdown/package.i18n.json
deleted file mode 100644
index 0e6d8a1f74f..00000000000
--- a/i18n/esn/extensions/markdown/package.i18n.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Características del lenguaje Markdown",
-	"description": "Proporciona un potente soporte de lenguaje para archivos Markdown.",
-	"markdown.preview.breaks.desc": "Establece cómo los saltos de línea son representados en la vista previa de markdown. Estableciendolo en 'true' crea un <br> para cada nueva línea.",
-	"markdown.preview.linkify": "Habilitar o deshabilitar la conversión de texto de tipo URL a enlaces en la vista previa de markdown.",
-	"markdown.preview.doubleClickToSwitchToEditor.desc": "Haga doble clic en la vista previa de Markdown para cambiar al editor.",
-	"markdown.preview.fontFamily.desc": "Controla la familia de la fuente utilizada en la previsualización del descuento.",
-	"markdown.preview.fontSize.desc": "Controla el tamaño de la fuente en píxeles utilizado en la previsualización del descuento.",
-	"markdown.preview.lineHeight.desc": "Controla la altura de línea utilizada en la previsualización del descuento. Este número es relativo al tamaño de la fuente.",
-	"markdown.preview.markEditorSelection.desc": "Marca la selección del editor actual en la vista previa de Markdown.",
-	"markdown.preview.scrollEditorWithPreview.desc": "Al desplazarse en la vista previa de Markdown, se actualiza la vista del editor.",
-	"markdown.preview.scrollPreviewWithEditor.desc": "Al desplazarse en el editor de Markdown, se actualiza la vista de la previsualización .",
-	"markdown.preview.scrollPreviewWithEditorSelection.desc": "[Desestimado] Desplaza la vista previa de Markdown para revelar la línea del editor seleccionada actualmente.",
-	"markdown.preview.scrollPreviewWithEditorSelection.deprecationMessage": "Este valor se ha reemplazado por \"markdown.preview.scrollPreviewWithEditor\" y ya no tiene ningún efecto.",
-	"markdown.preview.title": "Abrir vista previa",
-	"markdown.previewFrontMatter.dec": "Establece cómo se debe representar el asunto de la parte delantera de YAML en la vista previa del descuento. 'hide' quita el asunto de la parte delantera. De lo contrario, el asunto de la parte delantera se trata como contenido del descuento.",
-	"markdown.previewSide.title": "Abrir vista previa en el lateral",
-	"markdown.showLockedPreviewToSide.title": "Abrir vista previa fija en el lateral",
-	"markdown.showSource.title": "Mostrar origen",
-	"markdown.styles.dec": "Una lista de direcciones URL o rutas de acceso locales a hojas de estilo CSS que utilizar desde la vista previa del descuento. Las tutas de acceso relativas se interpretan en relación con la carpeta abierta en el explorador. Si no hay ninguna carpeta abierta, se interpretan en relación con la ubicación del archivo del descuento. Todos los '\\' deben escribirse como '\\\\'.",
-	"markdown.showPreviewSecuritySelector.title": "Cambiar configuración de seguridad de vista previa",
-	"markdown.trace.desc": "Habilitar registro de depuración para las extensiones de Markdown. ",
-	"markdown.preview.refresh.title": "Actualizar vista previa",
-	"markdown.preview.toggleLock.title": "Cambiar fijación de la vista previa "
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/merge-conflict/out/codelensProvider.i18n.json b/i18n/esn/extensions/merge-conflict/out/codelensProvider.i18n.json
deleted file mode 100644
index b29756ff139..00000000000
--- a/i18n/esn/extensions/merge-conflict/out/codelensProvider.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"acceptCurrentChange": "Aceptar cambio actual",
-	"acceptIncomingChange": "Aceptar cambio entrante",
-	"acceptBothChanges": "Aceptar ambos cambios",
-	"compareChanges": "Comparar cambios"
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/merge-conflict/out/commandHandler.i18n.json b/i18n/esn/extensions/merge-conflict/out/commandHandler.i18n.json
deleted file mode 100644
index 81c3d05e168..00000000000
--- a/i18n/esn/extensions/merge-conflict/out/commandHandler.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"cursorNotInConflict": "El cursor de edición no se encuentra en un conflicto de fusión",
-	"compareChangesTitle": "{0}: Cambios actuales ⟷ Cambios entrantes",
-	"cursorOnCommonAncestorsRange": "El cursor del editor está dentro del bloque de ancestros comunes, por favor muévalo al bloque \"actual\" o al \"entrante\"",
-	"cursorOnSplitterRange": "El cursor del editor está dentro del separador de conflictos de fusión, muévalo al bloque \"actual\" o al \"entrante\" ",
-	"noConflicts": "No se encontraron conflictos en este archivo",
-	"noOtherConflictsInThisFile": "No hay más conflictos en este archivo"
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/merge-conflict/out/mergeDecorator.i18n.json b/i18n/esn/extensions/merge-conflict/out/mergeDecorator.i18n.json
deleted file mode 100644
index 88dc7a9a23a..00000000000
--- a/i18n/esn/extensions/merge-conflict/out/mergeDecorator.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"currentChange": "(Cambio actual)",
-	"incomingChange": "(Cambio entrante)"
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/merge-conflict/package.i18n.json b/i18n/esn/extensions/merge-conflict/package.i18n.json
deleted file mode 100644
index 0ca0776dd5a..00000000000
--- a/i18n/esn/extensions/merge-conflict/package.i18n.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Fusionar conflicto",
-	"description": "Resaltado y comandos para conflictos de fusión insertada.",
-	"command.category": "Fusionar conflicto",
-	"command.accept.all-current": "Aceptar todo actual",
-	"command.accept.all-incoming": "Aceptar todos los entrantes",
-	"command.accept.all-both": "Aceptar ambos",
-	"command.accept.current": "Aceptar actuales",
-	"command.accept.incoming": "Aceptar entrantes",
-	"command.accept.selection": "Aceptar selección",
-	"command.accept.both": "Aceptar ambos",
-	"command.next": "Siguiente conflicto",
-	"command.previous": "Conflicto anterior",
-	"command.compare": "Comparar conflicto actual",
-	"config.title": "Fusionar conflicto",
-	"config.codeLensEnabled": "Habilitar/deshabilitar CodeLens de fusionar bloque de conflictos en el editor",
-	"config.decoratorsEnabled": "Habilitar/deshabilitar decoradores de conflictos de fusión en el editor"
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/npm/out/features/bowerJSONContribution.i18n.json b/i18n/esn/extensions/npm/out/features/bowerJSONContribution.i18n.json
deleted file mode 100644
index 70d26e8c0f6..00000000000
--- a/i18n/esn/extensions/npm/out/features/bowerJSONContribution.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"json.bower.default": "bower.json predeterminado",
-	"json.bower.error.repoaccess": "No se pudo ejecutar la solicitud del repositorio de Bower: {0}",
-	"json.bower.latest.version": "más reciente"
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/npm/out/features/packageJSONContribution.i18n.json b/i18n/esn/extensions/npm/out/features/packageJSONContribution.i18n.json
deleted file mode 100644
index 2a3a809744c..00000000000
--- a/i18n/esn/extensions/npm/out/features/packageJSONContribution.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"json.package.default": "package.json predeterminado",
-	"json.npm.error.repoaccess": "No se pudo ejecutar la solicitud del repositorio de NPM: {0}",
-	"json.npm.latestversion": "Última versión del paquete en este momento",
-	"json.npm.majorversion": "Coincide con la versión principal más reciente (1.x.x)",
-	"json.npm.minorversion": "Coincide con la versión secundaria más reciente (1.2.x)",
-	"json.npm.version.hover": "Última versión: {0}"
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/npm/out/main.i18n.json b/i18n/esn/extensions/npm/out/main.i18n.json
deleted file mode 100644
index 888ecbd58c8..00000000000
--- a/i18n/esn/extensions/npm/out/main.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"npm.parseError": "Detección de tareas de la NMP: error al analizar el archivo {0}"
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/npm/out/npmView.i18n.json b/i18n/esn/extensions/npm/out/npmView.i18n.json
deleted file mode 100644
index 7b8986ac973..00000000000
--- a/i18n/esn/extensions/npm/out/npmView.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noScripts": "No se encontraron scripts",
-	"noDebugOptions": "No se pudo iniciar \"{0} \" para la depuración porque las secuencias de comandos carecen de una opción de depuración de nodo, por ejemplo \"--inspect-brk\".",
-	"learnMore": "Más información",
-	"ok": "Aceptar",
-	"scriptInvalid": "No se pudo encontrar la secuencia de comandos \"{0}\". Trate de actualizar la vista."
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/npm/out/tasks.i18n.json b/i18n/esn/extensions/npm/out/tasks.i18n.json
deleted file mode 100644
index 888ecbd58c8..00000000000
--- a/i18n/esn/extensions/npm/out/tasks.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"npm.parseError": "Detección de tareas de la NMP: error al analizar el archivo {0}"
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/npm/package.i18n.json b/i18n/esn/extensions/npm/package.i18n.json
deleted file mode 100644
index 7e73e482c8e..00000000000
--- a/i18n/esn/extensions/npm/package.i18n.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"description": "Extensión para agregar soporte a las tareas de secuencias de comandos NPM.",
-	"displayName": "Soporte de npm para VSCode",
-	"config.npm.autoDetect": "Controla si la detección automática de scripts npm está activada o desactivada. Por defecto está activada.",
-	"config.npm.runSilent": "Ejecutar comandos de npm con la opción '--silent'",
-	"config.npm.packageManager": "El administrador de paquetes utilizado para ejecutar secuencias de comandos. ",
-	"config.npm.exclude": "Configura patrones globales para carpetas que deben excluirse de la detección automática de scripts. ",
-	"config.npm.enableScriptExplorer": "Habilitar una vista de explorador para scripts de npm.",
-	"config.npm.scriptExplorerAction": "La acción de clic predeterminada utilizada en el explorador de secuencias de comandos: 'abrir' o 'ejecutar', el valor predeterminado es 'abrir'.",
-	"npm.parseError": "Detección de tareas de nueva gestión pública: no se pudo analizar el archivo {0}",
-	"taskdef.script": "Script npm que debe personalizarse.",
-	"taskdef.path": "La ruta de la carpeta del archivo package.json que proporciona la secuencia de comandos. Se puede omitir.",
-	"view.name": "Scripts Npm ",
-	"command.refresh": "Actualizar",
-	"command.run": "Ejecutar",
-	"command.debug": "Depurar",
-	"command.openScript": "Abrir",
-	"command.runInstall": "Ejecutar instalación"
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/objective-c/package.i18n.json b/i18n/esn/extensions/objective-c/package.i18n.json
deleted file mode 100644
index 5f058f75d8c..00000000000
--- a/i18n/esn/extensions/objective-c/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Conceptos básicos del lenguaje Objective-C",
-	"description": "Proporciona resaltado de sintaxis y correspondencia de corchetes en archivos de Objective-C."
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/package-json/out/features/bowerJSONContribution.i18n.json b/i18n/esn/extensions/package-json/out/features/bowerJSONContribution.i18n.json
deleted file mode 100644
index 70d26e8c0f6..00000000000
--- a/i18n/esn/extensions/package-json/out/features/bowerJSONContribution.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"json.bower.default": "bower.json predeterminado",
-	"json.bower.error.repoaccess": "No se pudo ejecutar la solicitud del repositorio de Bower: {0}",
-	"json.bower.latest.version": "más reciente"
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/package-json/out/features/packageJSONContribution.i18n.json b/i18n/esn/extensions/package-json/out/features/packageJSONContribution.i18n.json
deleted file mode 100644
index 2a3a809744c..00000000000
--- a/i18n/esn/extensions/package-json/out/features/packageJSONContribution.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"json.package.default": "package.json predeterminado",
-	"json.npm.error.repoaccess": "No se pudo ejecutar la solicitud del repositorio de NPM: {0}",
-	"json.npm.latestversion": "Última versión del paquete en este momento",
-	"json.npm.majorversion": "Coincide con la versión principal más reciente (1.x.x)",
-	"json.npm.minorversion": "Coincide con la versión secundaria más reciente (1.2.x)",
-	"json.npm.version.hover": "Última versión: {0}"
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/package-json/package.i18n.json b/i18n/esn/extensions/package-json/package.i18n.json
deleted file mode 100644
index 30c4de056c7..00000000000
--- a/i18n/esn/extensions/package-json/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Soporte para Package.json",
-	"description": "Añade características de edición para package.json."
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/perl/package.i18n.json b/i18n/esn/extensions/perl/package.i18n.json
deleted file mode 100644
index a67e06d50ce..00000000000
--- a/i18n/esn/extensions/perl/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Conceptos básicos del lenguaje Perl",
-	"description": "Proporciona resaltado de sintaxis y correspondencia de corchetes en archivos de Perl."
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/php-language-features/out/features/validationProvider.i18n.json b/i18n/esn/extensions/php-language-features/out/features/validationProvider.i18n.json
deleted file mode 100644
index a2041159412..00000000000
--- a/i18n/esn/extensions/php-language-features/out/features/validationProvider.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"php.useExecutablePath": "¿Permite la ejecución de {0} (definido como valor del área de trabajo) para detectar errores en archivos PHP?",
-	"php.yes": "Permitir",
-	"php.no": "No permitir",
-	"wrongExecutable": "No se puede validar porque {0} no es un ejecutable PHP válido. Use el ajuste \"php.validate.executablePath\" para configurar el ejecutable PHP.",
-	"noExecutable": "No se puede validar porque no hay ningún ejecutable PHP establecido. Use el ajuste \"php.validate.executablePath\" para configurar el ejecutable de PHP.",
-	"unknownReason": "No se pudo ejecutar el archivo PHP con la ruta de acceso: {0}. Se desconoce el motivo."
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/php-language-features/package.i18n.json b/i18n/esn/extensions/php-language-features/package.i18n.json
deleted file mode 100644
index 0b5e90ed32d..00000000000
--- a/i18n/esn/extensions/php-language-features/package.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"configuration.suggest.basic": "Configura si se habilitan las sugerencias del lenguaje PHP integradas. La asistencia sugiere variables y opciones globales de PHP.",
-	"configuration.validate.enable": "Habilita o deshabilita la validación integrada de PHP.",
-	"configuration.validate.executablePath": "Señala al ejecutable PHP.",
-	"configuration.validate.run": "Indica si linter se ejecuta al guardar o al escribir.",
-	"configuration.title": "PHP",
-	"commands.categroy.php": "PHP",
-	"command.untrustValidationExecutable": "No permitir el ejecutable de validación de PHP (como configuración de área de trabajo)",
-	"displayName": "Características del lenguaje PHP",
-	"description": "Proporciona un potente soporte de lenguaje para archivos PHP."
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/php/out/features/validationProvider.i18n.json b/i18n/esn/extensions/php/out/features/validationProvider.i18n.json
deleted file mode 100644
index a2041159412..00000000000
--- a/i18n/esn/extensions/php/out/features/validationProvider.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"php.useExecutablePath": "¿Permite la ejecución de {0} (definido como valor del área de trabajo) para detectar errores en archivos PHP?",
-	"php.yes": "Permitir",
-	"php.no": "No permitir",
-	"wrongExecutable": "No se puede validar porque {0} no es un ejecutable PHP válido. Use el ajuste \"php.validate.executablePath\" para configurar el ejecutable PHP.",
-	"noExecutable": "No se puede validar porque no hay ningún ejecutable PHP establecido. Use el ajuste \"php.validate.executablePath\" para configurar el ejecutable de PHP.",
-	"unknownReason": "No se pudo ejecutar el archivo PHP con la ruta de acceso: {0}. Se desconoce el motivo."
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/php/package.i18n.json b/i18n/esn/extensions/php/package.i18n.json
deleted file mode 100644
index edf1d540da8..00000000000
--- a/i18n/esn/extensions/php/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Conceptos básicos del lenguaje PHP",
-	"description": "Proporciona resaltado de sintaxis y correspondencia de corchetes en archivos PHP."
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/powershell/package.i18n.json b/i18n/esn/extensions/powershell/package.i18n.json
deleted file mode 100644
index 9c2129b530a..00000000000
--- a/i18n/esn/extensions/powershell/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Conceptos básicos del lenguaje Powershell",
-	"description": "Proporciona fragmentos de código, resaltado de sintaxis, correspondencia de corchetes y plegado de código en archivos de Powershell."
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/pug/package.i18n.json b/i18n/esn/extensions/pug/package.i18n.json
deleted file mode 100644
index d503c1e53f6..00000000000
--- a/i18n/esn/extensions/pug/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Conceptos básicos del lenguaje Pug",
-	"description": "Proporciona resaltado de sintaxis y correspondencia de corchetes en archivos de Pug."
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/python/package.i18n.json b/i18n/esn/extensions/python/package.i18n.json
deleted file mode 100644
index bb3030cc7dd..00000000000
--- a/i18n/esn/extensions/python/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Conceptos básicos del lenguaje Python",
-	"description": "Proporciona resaltado de sintaxis, correspondencia de corchetes y plegado de código en archivos de Python."
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/r/package.i18n.json b/i18n/esn/extensions/r/package.i18n.json
deleted file mode 100644
index c80f566c2dc..00000000000
--- a/i18n/esn/extensions/r/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Conceptos básicos del lenguaje R",
-	"description": "Proporciona resaltado de sintaxis y correspondencia de corchetes en archivos de R."
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/razor/package.i18n.json b/i18n/esn/extensions/razor/package.i18n.json
deleted file mode 100644
index a188d3ad536..00000000000
--- a/i18n/esn/extensions/razor/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Conceptos básicos del lenguaje Razor",
-	"description": "Proporciona resaltado de sintaxis, correspondencia de corchetes y plegado de código en archivos de Razor."
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/ruby/package.i18n.json b/i18n/esn/extensions/ruby/package.i18n.json
deleted file mode 100644
index c29bac30292..00000000000
--- a/i18n/esn/extensions/ruby/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Conceptos básicos del lenguaje Ruby",
-	"description": "Proporciona resaltado de sintaxis y correspondencia de corchetes en archivos de Ruby."
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/rust/package.i18n.json b/i18n/esn/extensions/rust/package.i18n.json
deleted file mode 100644
index d931e577db0..00000000000
--- a/i18n/esn/extensions/rust/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Conceptos básicos del lenguaje Rust",
-	"description": "Proporciona resaltado de sintaxis y correspondencia de corchetes en archivos de Rust."
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/scss/package.i18n.json b/i18n/esn/extensions/scss/package.i18n.json
deleted file mode 100644
index f4c0be3071f..00000000000
--- a/i18n/esn/extensions/scss/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Conceptos básicos del lenguaje SCSS",
-	"description": "Proporciona resaltado de sintaxis, correspondencia de corchetes y plegado de código en archivos de SCSS."
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/search-rg/package.i18n.json b/i18n/esn/extensions/search-rg/package.i18n.json
deleted file mode 100644
index 25dc2888675..00000000000
--- a/i18n/esn/extensions/search-rg/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Búsqueda (ripgrep)",
-	"description": "Proporciona búsqueda mediante Ripgrep."
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/shaderlab/package.i18n.json b/i18n/esn/extensions/shaderlab/package.i18n.json
deleted file mode 100644
index b25f108cec4..00000000000
--- a/i18n/esn/extensions/shaderlab/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Conceptos básicos del lenguaje Shaderlab",
-	"description": "Proporciona resaltado de sintaxis y correspondencia de corchetes en archivos de Shaderlab."
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/shellscript/package.i18n.json b/i18n/esn/extensions/shellscript/package.i18n.json
deleted file mode 100644
index 1a7dc83f3a2..00000000000
--- a/i18n/esn/extensions/shellscript/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Conceptos básicos del lenguaje Shell Script",
-	"description": "Proporciona resaltado de sintaxis y correspondencia de corchetes en archivos de script de shell."
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/sql/package.i18n.json b/i18n/esn/extensions/sql/package.i18n.json
deleted file mode 100644
index 428b841f761..00000000000
--- a/i18n/esn/extensions/sql/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Conceptos básicos del lenguaje SQL",
-	"description": "Proporciona resaltado de sintaxis y correspondencia de corchetes en archivos de SQL."
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/swift/package.i18n.json b/i18n/esn/extensions/swift/package.i18n.json
deleted file mode 100644
index c487b83e00f..00000000000
--- a/i18n/esn/extensions/swift/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Conceptos básicos del lenguaje Swift",
-	"description": "Proporciona fragmentos de código, resaltado de sintaxis y correspondencia de corchetes en archivos de Swift."
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/theme-abyss/package.i18n.json b/i18n/esn/extensions/theme-abyss/package.i18n.json
deleted file mode 100644
index 9621e1a2005..00000000000
--- a/i18n/esn/extensions/theme-abyss/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Tema Abyss",
-	"description": "Tema Abyss para Visual Studio Code"
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/theme-defaults/package.i18n.json b/i18n/esn/extensions/theme-defaults/package.i18n.json
deleted file mode 100644
index bf8335635e4..00000000000
--- a/i18n/esn/extensions/theme-defaults/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Temas por defecto",
-	"description": "Temas claros y oscuros predeterminados (Plus y Visual Studio)"
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/theme-kimbie-dark/package.i18n.json b/i18n/esn/extensions/theme-kimbie-dark/package.i18n.json
deleted file mode 100644
index 466ba01fdda..00000000000
--- a/i18n/esn/extensions/theme-kimbie-dark/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Tema Kimbie Oscuro",
-	"description": "Tema Kinbie Dark para Visual Studio Code"
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/theme-monokai-dimmed/package.i18n.json b/i18n/esn/extensions/theme-monokai-dimmed/package.i18n.json
deleted file mode 100644
index aa17012b485..00000000000
--- a/i18n/esn/extensions/theme-monokai-dimmed/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Tema Monokai atenuado",
-	"description": "Tema atenuado Monokai para VS Code"
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/theme-monokai/package.i18n.json b/i18n/esn/extensions/theme-monokai/package.i18n.json
deleted file mode 100644
index a58a7a393a0..00000000000
--- a/i18n/esn/extensions/theme-monokai/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Tema Monokai",
-	"description": "Tema Monokai para Visual Studio Code"
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/theme-quietlight/package.i18n.json b/i18n/esn/extensions/theme-quietlight/package.i18n.json
deleted file mode 100644
index be3f9d0a621..00000000000
--- a/i18n/esn/extensions/theme-quietlight/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Tema Quiet Light",
-	"description": "Tema Quiet Light para Visual Studio Code"
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/theme-red/package.i18n.json b/i18n/esn/extensions/theme-red/package.i18n.json
deleted file mode 100644
index 3fdd25312a1..00000000000
--- a/i18n/esn/extensions/theme-red/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Tema rojo",
-	"description": "Tema rojo para Visual Studio Code"
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/theme-seti/package.i18n.json b/i18n/esn/extensions/theme-seti/package.i18n.json
deleted file mode 100644
index f964fdb545f..00000000000
--- a/i18n/esn/extensions/theme-seti/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Tema del icono de archivo Seti",
-	"description": "Un tema de icono de archivo basados en Seti IU"
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/theme-solarized-dark/package.i18n.json b/i18n/esn/extensions/theme-solarized-dark/package.i18n.json
deleted file mode 100644
index 56219a79e96..00000000000
--- a/i18n/esn/extensions/theme-solarized-dark/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Tema oscuro Solarized ",
-	"description": "Tema oscuro Solarized para VS Code"
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/theme-solarized-light/package.i18n.json b/i18n/esn/extensions/theme-solarized-light/package.i18n.json
deleted file mode 100644
index 19d3d07fd50..00000000000
--- a/i18n/esn/extensions/theme-solarized-light/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Tema claro Solarized ",
-	"description": "Tema claro Solarized para VS Code"
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/theme-tomorrow-night-blue/package.i18n.json b/i18n/esn/extensions/theme-tomorrow-night-blue/package.i18n.json
deleted file mode 100644
index c3ba1ddea2d..00000000000
--- a/i18n/esn/extensions/theme-tomorrow-night-blue/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Tema Tomorrow Night Blue",
-	"description": "Tema Tomorrow Night Blue para VS Code"
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/typescript-basics/package.i18n.json b/i18n/esn/extensions/typescript-basics/package.i18n.json
deleted file mode 100644
index 392dbd4121e..00000000000
--- a/i18n/esn/extensions/typescript-basics/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Elementos básicos del lenguaje TypeScript",
-	"description": "Proporciona fragmentos de código, resaltado de sintaxis, correspondencia de corchetes y plegado de código en archivos de TypeScript."
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/typescript-language-features/out/commands.i18n.json b/i18n/esn/extensions/typescript-language-features/out/commands.i18n.json
deleted file mode 100644
index 0406f029ae5..00000000000
--- a/i18n/esn/extensions/typescript-language-features/out/commands.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"typescript.projectConfigNoWorkspace": "Abra una carpeta en VS Code para usar un proyecto de TypeScript o JavaScript",
-	"typescript.projectConfigUnsupportedFile": "No se pudo determinar el proyecto de TypeScript o JavaScript. Tipo de archivo no compatible",
-	"typescript.projectConfigCouldNotGetInfo": "No se pudo determinar el proyecto de TypeScript o JavaScript",
-	"typescript.noTypeScriptProjectConfig": "El archivo no forma parte de un proyecto de TypeScript. Haga clic [aquí]({0}) para obtener más información.",
-	"typescript.noJavaScriptProjectConfig": "El archivo no forma parte de un proyecto de JavaScript. Haga clic [aquí]({0}) para obtener más información.",
-	"typescript.configureTsconfigQuickPick": "Configurar tsconfig.json",
-	"typescript.configureJsconfigQuickPick": "Configurar jsconfig.json"
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/typescript-language-features/out/features/completionItemProvider.i18n.json b/i18n/esn/extensions/typescript-language-features/out/features/completionItemProvider.i18n.json
deleted file mode 100644
index 20f05236719..00000000000
--- a/i18n/esn/extensions/typescript-language-features/out/features/completionItemProvider.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"selectCodeAction": "Seleccione acción de código para aplicar",
-	"acquiringTypingsLabel": "Adquiriendo typings...",
-	"acquiringTypingsDetail": "Adquiriendo definiciones de typings para IntelliSense.",
-	"autoImportLabel": "Importar automáticamente desde {0}"
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/typescript-language-features/out/features/directiveCommentCompletionProvider.i18n.json b/i18n/esn/extensions/typescript-language-features/out/features/directiveCommentCompletionProvider.i18n.json
deleted file mode 100644
index c51828607c1..00000000000
--- a/i18n/esn/extensions/typescript-language-features/out/features/directiveCommentCompletionProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"ts-check": "Habilita la verificación semántica en un archivo de JavaScript. Debe estar al principio del archivo.",
-	"ts-nocheck": "Deshabilita la verificación semántica en un archivo de JavaScript. Debe estar al principio del archivo.",
-	"ts-ignore": "Suprime los errores @ts-check en la siguiente línea de un archivo. "
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/typescript-language-features/out/features/implementationsCodeLensProvider.i18n.json b/i18n/esn/extensions/typescript-language-features/out/features/implementationsCodeLensProvider.i18n.json
deleted file mode 100644
index 5cab0f0f878..00000000000
--- a/i18n/esn/extensions/typescript-language-features/out/features/implementationsCodeLensProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"oneImplementationLabel": "1 implementación",
-	"manyImplementationLabel": "{0} implementaciones",
-	"implementationsErrorLabel": "No se pueden determinar las implementaciones"
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/typescript-language-features/out/features/jsDocCompletionProvider.i18n.json b/i18n/esn/extensions/typescript-language-features/out/features/jsDocCompletionProvider.i18n.json
deleted file mode 100644
index 7579ba46bb3..00000000000
--- a/i18n/esn/extensions/typescript-language-features/out/features/jsDocCompletionProvider.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"typescript.jsDocCompletionItem.documentation": "Comentario de JSDoc"
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/typescript-language-features/out/features/organizeImports.i18n.json b/i18n/esn/extensions/typescript-language-features/out/features/organizeImports.i18n.json
deleted file mode 100644
index 8e782983225..00000000000
--- a/i18n/esn/extensions/typescript-language-features/out/features/organizeImports.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"oraganizeImportsAction.title": "Organizar Importaciones"
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/typescript-language-features/out/features/quickFixProvider.i18n.json b/i18n/esn/extensions/typescript-language-features/out/features/quickFixProvider.i18n.json
deleted file mode 100644
index a3699d251e4..00000000000
--- a/i18n/esn/extensions/typescript-language-features/out/features/quickFixProvider.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"fixAllInFileLabel": "{0} (Corregir todo en el archivo)"
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/typescript-language-features/out/features/referencesCodeLensProvider.i18n.json b/i18n/esn/extensions/typescript-language-features/out/features/referencesCodeLensProvider.i18n.json
deleted file mode 100644
index 028c2af8de2..00000000000
--- a/i18n/esn/extensions/typescript-language-features/out/features/referencesCodeLensProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"oneReferenceLabel": "1 referencia",
-	"manyReferenceLabel": "{0} referencias",
-	"referenceErrorLabel": "No se pudieron determinar las referencias"
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/typescript-language-features/out/features/taskProvider.i18n.json b/i18n/esn/extensions/typescript-language-features/out/features/taskProvider.i18n.json
deleted file mode 100644
index 2737725617d..00000000000
--- a/i18n/esn/extensions/typescript-language-features/out/features/taskProvider.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"buildTscLabel": "construir - {0}",
-	"buildAndWatchTscLabel": "seguir - {0}"
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/typescript-language-features/out/features/updatePathsOnRename.i18n.json b/i18n/esn/extensions/typescript-language-features/out/features/updatePathsOnRename.i18n.json
deleted file mode 100644
index 2b03dcbd255..00000000000
--- a/i18n/esn/extensions/typescript-language-features/out/features/updatePathsOnRename.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"prompt": "¿Actualizar automáticamente las importaciones del archivo movido: ' {0} '?",
-	"reject.title": "No",
-	"accept.title": "Sí",
-	"always.title": "Sí, siempre actualizar las importaciones",
-	"never.title": "No, nunca actualizar las importaciones"
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/typescript-language-features/out/typescriptServiceClient.i18n.json b/i18n/esn/extensions/typescript-language-features/out/typescriptServiceClient.i18n.json
deleted file mode 100644
index 12d95cb7073..00000000000
--- a/i18n/esn/extensions/typescript-language-features/out/typescriptServiceClient.i18n.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noServerFound": "La ruta de acceso {0} no apunta a una instalación válida de tsserver. Se usará la versión de TypeScript del paquete.",
-	"serverCouldNotBeStarted": "El servidor de lenguaje TypeScript no se pudo iniciar. El mensaje de error es: {0}",
-	"typescript.openTsServerLog.notSupported": "El registro del servidor de TS requiere TS 2.2.2+",
-	"typescript.openTsServerLog.loggingNotEnabled": "Los registros del servidor TS están desconectados. Establezca \"typescript.tsserver.log\" y reinicie el servidor TS para activar los registros.",
-	"typescript.openTsServerLog.enableAndReloadOption": "Habilite el registro y reinicie el servidor TS",
-	"typescript.openTsServerLog.noLogFile": "El servidor de TS no ha iniciado el registro.",
-	"openTsServerLog.openFileFailedFailed": "No se puede abrir el archivo de registro del servidor de TS",
-	"serverDiedAfterStart": "El servicio de lenguaje TypeScript finalizó de forma inesperada cinco veces después de haberse iniciado y no se reiniciará.",
-	"serverDiedReportIssue": "Notificar problema",
-	"serverDied": "El servicio de lenguaje Typescript finalizó de forma inesperada cinco veces en los últimos cinco minutos."
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/typescript-language-features/out/utils/api.i18n.json b/i18n/esn/extensions/typescript-language-features/out/utils/api.i18n.json
deleted file mode 100644
index ea0f0a445e5..00000000000
--- a/i18n/esn/extensions/typescript-language-features/out/utils/api.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"invalidVersion": "versión inválida"
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/typescript-language-features/out/utils/logger.i18n.json b/i18n/esn/extensions/typescript-language-features/out/utils/logger.i18n.json
deleted file mode 100644
index 8f5ef5415b9..00000000000
--- a/i18n/esn/extensions/typescript-language-features/out/utils/logger.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"channelName": "TypeScript"
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/typescript-language-features/out/utils/projectStatus.i18n.json b/i18n/esn/extensions/typescript-language-features/out/utils/projectStatus.i18n.json
deleted file mode 100644
index 6b1caf7be01..00000000000
--- a/i18n/esn/extensions/typescript-language-features/out/utils/projectStatus.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hintExclude": "Para habilitar las características de lenguaje de JavaScript/TypeScript en todo el proyecto, excluya las carpetas con muchos archivos, como: {0}",
-	"hintExclude.generic": "Para habilitar las características de idioma de JavaScript/TypeScript IntelliSense en todo el proyecto, excluya las carpetas de tamaño grande con archivos de origen en los que no trabaje.",
-	"large.label": "Configurar exclusiones",
-	"hintExclude.tooltip": "Para habilitar las características de idioma de JavaScript/TypeScript IntelliSense en todo el proyecto, excluya las carpetas de tamaño grande con archivos de origen en los que no trabaje."
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/typescript-language-features/out/utils/typingsStatus.i18n.json b/i18n/esn/extensions/typescript-language-features/out/utils/typingsStatus.i18n.json
deleted file mode 100644
index 290207978aa..00000000000
--- a/i18n/esn/extensions/typescript-language-features/out/utils/typingsStatus.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"installingPackages": "Recuperando cambios en los datos para un mejor rendimiento de TypeScript IntelliSense",
-	"typesInstallerInitializationFailed.title": "No se pudieron instalar archivos de términos para las características de lenguaje de JavaScript. Asegúrese de que NPM está instalado o configure \"typescript.npm\" en la configuración de usuario. Haga clic [aquí]({0}) para obtener más información.",
-	"typesInstallerInitializationFailed.doNotCheckAgain": "No volver a mostrar"
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/typescript-language-features/out/utils/versionPicker.i18n.json b/i18n/esn/extensions/typescript-language-features/out/utils/versionPicker.i18n.json
deleted file mode 100644
index 2cac579a218..00000000000
--- a/i18n/esn/extensions/typescript-language-features/out/utils/versionPicker.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"useVSCodeVersionOption": "Utilizar la versión de VS Code",
-	"useWorkspaceVersionOption": "Usar versión del área de trabajo",
-	"learnMore": "Más información",
-	"selectTsVersion": "Seleccionar la versión de TypeScript usada para las características del lenguaje de JavaScript y TypeScript"
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/typescript-language-features/out/utils/versionProvider.i18n.json b/i18n/esn/extensions/typescript-language-features/out/utils/versionProvider.i18n.json
deleted file mode 100644
index 2fa648a3e7e..00000000000
--- a/i18n/esn/extensions/typescript-language-features/out/utils/versionProvider.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"couldNotLoadTsVersion": "No se pudo cargar la versión de TypeScript en esta ruta",
-	"noBundledServerFound": "Otra aplicación (por ejemplo, una herramienta de detección de virus con un comportamiento erróneo) eliminó el tsserver de VSCode. Debe reinstalar el VS Code."
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/typescript-language-features/package.i18n.json b/i18n/esn/extensions/typescript-language-features/package.i18n.json
deleted file mode 100644
index 9f1ce1dc889..00000000000
--- a/i18n/esn/extensions/typescript-language-features/package.i18n.json
+++ /dev/null
@@ -1,67 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Características del lenguaje JavaScript y TypeScript",
-	"description": "Proporciona soporte de lenguaje enriquecido para JavaScript y TypeScript.",
-	"reloadProjects.title": "Volver a cargar el proyecto",
-	"configuration.typescript": "TypeScript",
-	"typescript.useCodeSnippetsOnMethodSuggest.dec": "Complete las funciones con la signatura de parámetro.",
-	"typescript.tsdk.desc": "Especifica la ruta de acceso de carpeta que contiene los archivos lib*.d.ts y tsserver que se van a usar.",
-	"typescript.disableAutomaticTypeAcquisition": "Desactiva la adquisición automática de tipos. Requiere TypeScript >= 2.0.6.",
-	"typescript.tsserver.log": "votes Habilita los registros del servidor TS a un archivo. Este registro se puede utilizar para diagnosticar problemas en el servidor TS. Este registro puede contener rutas de acceso, código fuente y posiblemente otra información sensitiva acerca del proyecto.",
-	"typescript.tsserver.pluginPaths": "Rutas adicionales para descubrir plugins de servicio del lenguaje Typescript. Requiere TypeScript >= 2.3.0.",
-	"typescript.tsserver.pluginPaths.item": "Ruta relativa o absoluta. La ruta de acceso relativa se resolverá contra las carpetas del espacio de trabajo.",
-	"typescript.tsserver.trace": "Habilita el seguimiento de mensajes al servidor TS. Este seguimiento se puede utilizar para diagnosticar problemas en el servidor TS. Este seguimiento puede contener rutas de acceso, código fuente y posiblemente otra información sensitiva acerca del proyecto.",
-	"typescript.validate.enable": "Habilita o deshabilita la validación de TypeScript.",
-	"typescript.format.enable": "Habilita o deshabilita el formateador predeterminado de TypeScript.",
-	"javascript.format.enable": "Habilita o deshabilita el formateador predeterminado de JavaScript.",
-	"format.insertSpaceAfterCommaDelimiter": "Define el tratamiento del espacio después de un delimitador de coma.",
-	"format.insertSpaceAfterConstructor": "Define el manejo del espacio después de la palabra clave constructor. Requiere TypeScript >= 2.3.0",
-	"format.insertSpaceAfterSemicolonInForStatements": " Define el tratamiento del espacio después de punto y coma en una instrucción for.",
-	"format.insertSpaceBeforeAndAfterBinaryOperators": "Define el tratamiento del espacio después de un operador binario.",
-	"format.insertSpaceAfterKeywordsInControlFlowStatements": "Define el tratamiento del espacio después de las palabras clave en una instrucción de flujo de control.",
-	"format.insertSpaceAfterFunctionKeywordForAnonymousFunctions": "Define el tratamiento del espacio después de la palabra clave function para las funciones anónimas.",
-	"format.insertSpaceBeforeFunctionParenthesis": "Define el tratamiento del espacio delante de los paréntesis de los argumentos de las funciones. Requiere TypeScript >= 2.1.5.",
-	"format.insertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis": "Define el manejo del espacio después de abrir y antes de cerrar paréntesis no vacíos.",
-	"format.insertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets": "Define el manejo del espacio después de abrir y antes de cerrar los soportes no vacíos.",
-	"format.insertSpaceAfterOpeningAndBeforeClosingNonemptyBraces": "Define el manejo del espacio después de abrir y antes de cerrar llaves no vacías. Requiere TypeScript > = 2.3.0.",
-	"format.insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces": "Define el tratamiento del espacio después de la llave de apertura y antes de la llave de cierre de cadenas de plantilla. Requiere TypeScript >= 2.0.6.",
-	"format.insertSpaceAfterOpeningAndBeforeClosingJsxExpressionBraces": "Define el tratamiento del espacio después de la llave de apertura y antes de la llave de cierre de las expresiones JSX. Requiere TypeScript >= 2.0.6.",
-	"format.insertSpaceAfterTypeAssertion": "Define el control del espacio después de las aserciones de tipos en TypeScript. Requiere TypeScript >= 2.4",
-	"format.placeOpenBraceOnNewLineForFunctions": "Define si una llave de apertura se incluye en una nueva línea para las funciones o no.",
-	"format.placeOpenBraceOnNewLineForControlBlocks": "Define si una llave de apertura se incluye en una nueva línea para los bloques de control o no.",
-	"javascript.validate.enable": "Habilita o deshabilita la validación de JavaScript.",
-	"goToProjectConfig.title": "Ir a configuración del proyecto",
-	"javascript.referencesCodeLens.enabled": "Habilitar/deshabilitar las referencias de CodeLens en los archivos de JavaScript.",
-	"typescript.referencesCodeLens.enabled": "Habilitar/deshabilitar las referencias de CodeLens en los archivos de TypeScript. Requiere TypeScript  >= 2.0.6.",
-	"typescript.implementationsCodeLens.enabled": "Habilita o deshabilita implementaciones de CodeLens. Requiere TypeScript >= 2.2.0.",
-	"typescript.openTsServerLog.title": "Abrir registro del servidor de TS",
-	"typescript.restartTsServer": "Reiniciar servidor TS",
-	"typescript.selectTypeScriptVersion.title": "Seleccionar versión de TypeScript",
-	"typescript.reportStyleChecksAsWarnings": "Notificar comprobaciones de estilo como advertencias",
-	"jsDocCompletion.enabled": "Habilita o deshabilita comentarios automaticos de JSDoc",
-	"javascript.implicitProjectConfig.checkJs": "Habilita/deshabilita la comprobación semántica de los archivos JavaScript. Los archivos jsconfig.json o tsconfig.json reemplazan esta configuración. Se requiere TypeScript >=2.3.1.",
-	"typescript.npm": "Especifica la ruta de acceso al archivo ejecutable de NPM usada para la adquisición automática de tipos. Requiere TypeScript >= 2.3.4.",
-	"typescript.check.npmIsInstalled": "Compruebe si NPM está instalado para la adquisición automática de tipos.",
-	"javascript.nameSuggestions": "Habilitar/deshabilitar nombres únicos de la lista de sugerencias en los archivos de JavaScript. ",
-	"typescript.tsc.autoDetect": "Controla la auto detección de tareas del CAC. 'off' inhabilita esta función. 'build' crea una ejecución de compilación de tareas. 'watch' sólo crea compilación y 'watch tasks' 'on' crea tanto construir y ver tareas. Por defecto = 'on'. ",
-	"typescript.problemMatchers.tsc.label": "Problemas de TypeScript",
-	"typescript.problemMatchers.tscWatch.label": "Problemas de TypeScript (modo de inspección)",
-	"typescript.quickSuggestionsForPaths": "Activar o desactiva las sugerencias rápidas al escribir una ruta de importación.",
-	"typescript.locale": "Establece la configuración regional utilizada para reportar errores de JavaScript y TypeScript. Requiere TypeScript > = 2.6.0. El valor predeterminado es 'null' y utiliza la configuración regional de VS Code.",
-	"javascript.implicitProjectConfig.experimentalDecorators": "Activar/desactivar 'experimentalDecorators' para los archivos JavaScript que no son parte de un proyecto. Los archivos jsconfig.json o tsconfig.json reemplazan esta configuración. Requiere inicio > = 2.3.1.",
-	"typescript.autoImportSuggestions.enabled": "Activar o desactivar sugerencias de importación automática. Requiere TypeScript > = 2.6.1 ",
-	"typescript.experimental.syntaxFolding": "Habilita/deshabilita los marcadores de plegado sensibles a la sintaxis.",
-	"taskDefinition.tsconfig.description": "Archivo tsconfig que define la compilación de TS.",
-	"javascript.suggestionActions.enabled": "Habilitar/deshabilitar sugerencias de diagnóstico para los archivos JavaScript en el editor. Requiere TypeScript > = 2.8 ",
-	"typescript.suggestionActions.enabled": "Habilitar/deshabilitar diagnosticos de sugerencia para los archivos TypeScript en el editor. Requiere TypeScript > = 2.8 ",
-	"typescript.preferences.quoteStyle": "Estilo de cita preferido para utilizar en soluciones rápidas: comilla 'simple', comilla 'doble' o 'auto' deduce el tipo comilla de importaciones vigentes. Requiere TypeScript > = 2.9",
-	"typescript.preferences.importModuleSpecifier": "Estilo preferido de ruta para las importaciones automáticas: \n'relativa' a la ubicación del archivo\n'no-relativa' basado en el ' baseUrl ' configurado en su ' jsconfig.json'/' tsconfig.json '.\n'auto' deduce el tipo de ruta más corto. \nRequiere TypeScript > = 2.9",
-	"typescript.showUnused": "Activar o desactivar el resaltado de variables no utilizadas en el código. Requiere TypeScript > = 2.9",
-	"typescript.updateImportsOnFileMove.enabled": "Habilitar/deshabilitar la actualización automática de las rutas de importación cuando cambie el nombre o mueva un archivo en VS Code. Los valores posibles son: ' preguntar' en cada cambio de nombre, ' siempre ' actualizar rutas automáticamente, y ' nunca ' cambiar el nombre de rutas y no preguntar. Requiere TypeScript >= 2.9"
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/typescript/out/commands.i18n.json b/i18n/esn/extensions/typescript/out/commands.i18n.json
deleted file mode 100644
index 0406f029ae5..00000000000
--- a/i18n/esn/extensions/typescript/out/commands.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"typescript.projectConfigNoWorkspace": "Abra una carpeta en VS Code para usar un proyecto de TypeScript o JavaScript",
-	"typescript.projectConfigUnsupportedFile": "No se pudo determinar el proyecto de TypeScript o JavaScript. Tipo de archivo no compatible",
-	"typescript.projectConfigCouldNotGetInfo": "No se pudo determinar el proyecto de TypeScript o JavaScript",
-	"typescript.noTypeScriptProjectConfig": "El archivo no forma parte de un proyecto de TypeScript. Haga clic [aquí]({0}) para obtener más información.",
-	"typescript.noJavaScriptProjectConfig": "El archivo no forma parte de un proyecto de JavaScript. Haga clic [aquí]({0}) para obtener más información.",
-	"typescript.configureTsconfigQuickPick": "Configurar tsconfig.json",
-	"typescript.configureJsconfigQuickPick": "Configurar jsconfig.json"
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/typescript/out/features/bufferSyncSupport.i18n.json b/i18n/esn/extensions/typescript/out/features/bufferSyncSupport.i18n.json
deleted file mode 100644
index d7310fe0e46..00000000000
--- a/i18n/esn/extensions/typescript/out/features/bufferSyncSupport.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"versionMismatch": "Usando TypeScript ({1}) para las características del editor. TypeScript ({0}) es instalado globalmente en su máquina. Los errores en VS Code pueden diferir de los de TSC",
-	"moreInformation": "Más información",
-	"doNotCheckAgain": "No volver a comprobar",
-	"close": "Cerrar",
-	"updateTscCheck": "La configuración del usuario de \"typescript.check.tscVersion\" se actualizó a false."
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/typescript/out/features/completionItemProvider.i18n.json b/i18n/esn/extensions/typescript/out/features/completionItemProvider.i18n.json
deleted file mode 100644
index 20f05236719..00000000000
--- a/i18n/esn/extensions/typescript/out/features/completionItemProvider.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"selectCodeAction": "Seleccione acción de código para aplicar",
-	"acquiringTypingsLabel": "Adquiriendo typings...",
-	"acquiringTypingsDetail": "Adquiriendo definiciones de typings para IntelliSense.",
-	"autoImportLabel": "Importar automáticamente desde {0}"
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/typescript/out/features/directiveCommentCompletionProvider.i18n.json b/i18n/esn/extensions/typescript/out/features/directiveCommentCompletionProvider.i18n.json
deleted file mode 100644
index c51828607c1..00000000000
--- a/i18n/esn/extensions/typescript/out/features/directiveCommentCompletionProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"ts-check": "Habilita la verificación semántica en un archivo de JavaScript. Debe estar al principio del archivo.",
-	"ts-nocheck": "Deshabilita la verificación semántica en un archivo de JavaScript. Debe estar al principio del archivo.",
-	"ts-ignore": "Suprime los errores @ts-check en la siguiente línea de un archivo. "
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/typescript/out/features/implementationsCodeLensProvider.i18n.json b/i18n/esn/extensions/typescript/out/features/implementationsCodeLensProvider.i18n.json
deleted file mode 100644
index 5cab0f0f878..00000000000
--- a/i18n/esn/extensions/typescript/out/features/implementationsCodeLensProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"oneImplementationLabel": "1 implementación",
-	"manyImplementationLabel": "{0} implementaciones",
-	"implementationsErrorLabel": "No se pueden determinar las implementaciones"
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/typescript/out/features/jsDocCompletionProvider.i18n.json b/i18n/esn/extensions/typescript/out/features/jsDocCompletionProvider.i18n.json
deleted file mode 100644
index 7579ba46bb3..00000000000
--- a/i18n/esn/extensions/typescript/out/features/jsDocCompletionProvider.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"typescript.jsDocCompletionItem.documentation": "Comentario de JSDoc"
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/typescript/out/features/quickFixProvider.i18n.json b/i18n/esn/extensions/typescript/out/features/quickFixProvider.i18n.json
deleted file mode 100644
index a3699d251e4..00000000000
--- a/i18n/esn/extensions/typescript/out/features/quickFixProvider.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"fixAllInFileLabel": "{0} (Corregir todo en el archivo)"
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/typescript/out/features/referencesCodeLensProvider.i18n.json b/i18n/esn/extensions/typescript/out/features/referencesCodeLensProvider.i18n.json
deleted file mode 100644
index 028c2af8de2..00000000000
--- a/i18n/esn/extensions/typescript/out/features/referencesCodeLensProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"oneReferenceLabel": "1 referencia",
-	"manyReferenceLabel": "{0} referencias",
-	"referenceErrorLabel": "No se pudieron determinar las referencias"
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/typescript/out/features/taskProvider.i18n.json b/i18n/esn/extensions/typescript/out/features/taskProvider.i18n.json
deleted file mode 100644
index 2737725617d..00000000000
--- a/i18n/esn/extensions/typescript/out/features/taskProvider.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"buildTscLabel": "construir - {0}",
-	"buildAndWatchTscLabel": "seguir - {0}"
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/typescript/out/typescriptMain.i18n.json b/i18n/esn/extensions/typescript/out/typescriptMain.i18n.json
deleted file mode 100644
index cfccf2b7bf9..00000000000
--- a/i18n/esn/extensions/typescript/out/typescriptMain.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"typescript.projectConfigNoWorkspace": "Abra una carpeta en VS Code para usar un proyecto de TypeScript o JavaScript",
-	"typescript.projectConfigUnsupportedFile": "No se pudo determinar el proyecto de TypeScript o JavaScript. Tipo de archivo no compatible",
-	"typescript.projectConfigCouldNotGetInfo": "No se pudo determinar el proyecto de TypeScript o JavaScript",
-	"typescript.noTypeScriptProjectConfig": "El archivo no forma parte de un proyecto de TypeScript",
-	"typescript.noJavaScriptProjectConfig": "El archivo no forma parte de un proyecto de JavaScript",
-	"typescript.configureTsconfigQuickPick": "Configurar tsconfig.json",
-	"typescript.configureJsconfigQuickPick": "Configurar jsconfig.json",
-	"typescript.projectConfigLearnMore": "Más información"
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/typescript/out/typescriptServiceClient.i18n.json b/i18n/esn/extensions/typescript/out/typescriptServiceClient.i18n.json
deleted file mode 100644
index 12d95cb7073..00000000000
--- a/i18n/esn/extensions/typescript/out/typescriptServiceClient.i18n.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noServerFound": "La ruta de acceso {0} no apunta a una instalación válida de tsserver. Se usará la versión de TypeScript del paquete.",
-	"serverCouldNotBeStarted": "El servidor de lenguaje TypeScript no se pudo iniciar. El mensaje de error es: {0}",
-	"typescript.openTsServerLog.notSupported": "El registro del servidor de TS requiere TS 2.2.2+",
-	"typescript.openTsServerLog.loggingNotEnabled": "Los registros del servidor TS están desconectados. Establezca \"typescript.tsserver.log\" y reinicie el servidor TS para activar los registros.",
-	"typescript.openTsServerLog.enableAndReloadOption": "Habilite el registro y reinicie el servidor TS",
-	"typescript.openTsServerLog.noLogFile": "El servidor de TS no ha iniciado el registro.",
-	"openTsServerLog.openFileFailedFailed": "No se puede abrir el archivo de registro del servidor de TS",
-	"serverDiedAfterStart": "El servicio de lenguaje TypeScript finalizó de forma inesperada cinco veces después de haberse iniciado y no se reiniciará.",
-	"serverDiedReportIssue": "Notificar problema",
-	"serverDied": "El servicio de lenguaje Typescript finalizó de forma inesperada cinco veces en los últimos cinco minutos."
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/typescript/out/utils/api.i18n.json b/i18n/esn/extensions/typescript/out/utils/api.i18n.json
deleted file mode 100644
index ea0f0a445e5..00000000000
--- a/i18n/esn/extensions/typescript/out/utils/api.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"invalidVersion": "versión inválida"
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/typescript/out/utils/logger.i18n.json b/i18n/esn/extensions/typescript/out/utils/logger.i18n.json
deleted file mode 100644
index 8f5ef5415b9..00000000000
--- a/i18n/esn/extensions/typescript/out/utils/logger.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"channelName": "TypeScript"
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/typescript/out/utils/projectStatus.i18n.json b/i18n/esn/extensions/typescript/out/utils/projectStatus.i18n.json
deleted file mode 100644
index 6b1caf7be01..00000000000
--- a/i18n/esn/extensions/typescript/out/utils/projectStatus.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hintExclude": "Para habilitar las características de lenguaje de JavaScript/TypeScript en todo el proyecto, excluya las carpetas con muchos archivos, como: {0}",
-	"hintExclude.generic": "Para habilitar las características de idioma de JavaScript/TypeScript IntelliSense en todo el proyecto, excluya las carpetas de tamaño grande con archivos de origen en los que no trabaje.",
-	"large.label": "Configurar exclusiones",
-	"hintExclude.tooltip": "Para habilitar las características de idioma de JavaScript/TypeScript IntelliSense en todo el proyecto, excluya las carpetas de tamaño grande con archivos de origen en los que no trabaje."
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/typescript/out/utils/typingsStatus.i18n.json b/i18n/esn/extensions/typescript/out/utils/typingsStatus.i18n.json
deleted file mode 100644
index 290207978aa..00000000000
--- a/i18n/esn/extensions/typescript/out/utils/typingsStatus.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"installingPackages": "Recuperando cambios en los datos para un mejor rendimiento de TypeScript IntelliSense",
-	"typesInstallerInitializationFailed.title": "No se pudieron instalar archivos de términos para las características de lenguaje de JavaScript. Asegúrese de que NPM está instalado o configure \"typescript.npm\" en la configuración de usuario. Haga clic [aquí]({0}) para obtener más información.",
-	"typesInstallerInitializationFailed.doNotCheckAgain": "No volver a mostrar"
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/typescript/out/utils/versionPicker.i18n.json b/i18n/esn/extensions/typescript/out/utils/versionPicker.i18n.json
deleted file mode 100644
index 2cac579a218..00000000000
--- a/i18n/esn/extensions/typescript/out/utils/versionPicker.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"useVSCodeVersionOption": "Utilizar la versión de VS Code",
-	"useWorkspaceVersionOption": "Usar versión del área de trabajo",
-	"learnMore": "Más información",
-	"selectTsVersion": "Seleccionar la versión de TypeScript usada para las características del lenguaje de JavaScript y TypeScript"
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/typescript/out/utils/versionProvider.i18n.json b/i18n/esn/extensions/typescript/out/utils/versionProvider.i18n.json
deleted file mode 100644
index 2fa648a3e7e..00000000000
--- a/i18n/esn/extensions/typescript/out/utils/versionProvider.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"couldNotLoadTsVersion": "No se pudo cargar la versión de TypeScript en esta ruta",
-	"noBundledServerFound": "Otra aplicación (por ejemplo, una herramienta de detección de virus con un comportamiento erróneo) eliminó el tsserver de VSCode. Debe reinstalar el VS Code."
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/typescript/package.i18n.json b/i18n/esn/extensions/typescript/package.i18n.json
deleted file mode 100644
index 622b6fc5881..00000000000
--- a/i18n/esn/extensions/typescript/package.i18n.json
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Características del lenguaje JavaScript y TypeScript",
-	"description": "Proporciona soporte de lenguaje enriquecido para JavaScript y TypeScript.",
-	"typescript.reloadProjects.title": "Volver a cargar el proyecto",
-	"javascript.reloadProjects.title": "Volver a cargar el proyecto",
-	"configuration.typescript": "TypeScript",
-	"typescript.useCodeSnippetsOnMethodSuggest.dec": "Complete las funciones con la signatura de parámetro.",
-	"typescript.tsdk.desc": "Especifica la ruta de acceso de carpeta que contiene los archivos lib*.d.ts y tsserver que se van a usar.",
-	"typescript.disableAutomaticTypeAcquisition": "Desactiva la adquisición automática de tipos. Requiere TypeScript >= 2.0.6.",
-	"typescript.tsserver.log": "votes Habilita los registros del servidor TS a un archivo. Este registro se puede utilizar para diagnosticar problemas en el servidor TS. Este registro puede contener rutas de acceso, código fuente y posiblemente otra información sensitiva acerca del proyecto.",
-	"typescript.tsserver.trace": "Habilita el seguimiento de mensajes al servidor TS. Este seguimiento se puede utilizar para diagnosticar problemas en el servidor TS. Este seguimiento puede contener rutas de acceso, código fuente y posiblemente otra información sensitiva acerca del proyecto.",
-	"typescript.validate.enable": "Habilita o deshabilita la validación de TypeScript.",
-	"typescript.format.enable": "Habilita o deshabilita el formateador predeterminado de TypeScript.",
-	"javascript.format.enable": "Habilita o deshabilita el formateador predeterminado de JavaScript.",
-	"format.insertSpaceAfterCommaDelimiter": "Define el tratamiento del espacio después de un delimitador de coma.",
-	"format.insertSpaceAfterConstructor": "Define el manejo del espacio después de la palabra clave constructor. Requiere TypeScript >= 2.3.0",
-	"format.insertSpaceAfterSemicolonInForStatements": " Define el tratamiento del espacio después de punto y coma en una instrucción for.",
-	"format.insertSpaceBeforeAndAfterBinaryOperators": "Define el tratamiento del espacio después de un operador binario.",
-	"format.insertSpaceAfterKeywordsInControlFlowStatements": "Define el tratamiento del espacio después de las palabras clave en una instrucción de flujo de control.",
-	"format.insertSpaceAfterFunctionKeywordForAnonymousFunctions": "Define el tratamiento del espacio después de la palabra clave function para las funciones anónimas.",
-	"format.insertSpaceBeforeFunctionParenthesis": "Define el tratamiento del espacio delante de los paréntesis de los argumentos de las funciones. Requiere TypeScript >= 2.1.5.",
-	"format.insertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis": "Define el tratamiento del espacio después de los paréntesis de apertura y antes de los paréntesis de cierre con contenido.",
-	"format.insertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets": "Define el tratamiento del espacio después de los corchetes de apertura y antes de los corchetes de cierre con contenido.",
-	"format.insertSpaceAfterOpeningAndBeforeClosingNonemptyBraces": "Define el tratamiento del espacio después de la llave de apertura y antes de la llave de cierre. Requiere TypeScript >= 2.0.6.",
-	"format.insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces": "Define el tratamiento del espacio después de la llave de apertura y antes de la llave de cierre de cadenas de plantilla. Requiere TypeScript >= 2.0.6.",
-	"format.insertSpaceAfterOpeningAndBeforeClosingJsxExpressionBraces": "Define el tratamiento del espacio después de la llave de apertura y antes de la llave de cierre de las expresiones JSX. Requiere TypeScript >= 2.0.6.",
-	"format.insertSpaceAfterTypeAssertion": "Define el control del espacio después de las aserciones de tipos en TypeScript. Requiere TypeScript >= 2.4",
-	"format.placeOpenBraceOnNewLineForFunctions": "Define si una llave de apertura se incluye en una nueva línea para las funciones o no.",
-	"format.placeOpenBraceOnNewLineForControlBlocks": "Define si una llave de apertura se incluye en una nueva línea para los bloques de control o no.",
-	"javascript.validate.enable": "Habilita o deshabilita la validación de JavaScript.",
-	"typescript.goToProjectConfig.title": "Ir a configuración del proyecto",
-	"javascript.goToProjectConfig.title": "Ir a configuración del proyecto",
-	"javascript.referencesCodeLens.enabled": "Habilitar/deshabilitar las referencias de CodeLens en los archivos de JavaScript.",
-	"typescript.referencesCodeLens.enabled": "Habilitar/deshabilitar las referencias de CodeLens en los archivos de TypeScript. Requiere TypeScript  >= 2.0.6.",
-	"typescript.implementationsCodeLens.enabled": "Habilita o deshabilita implementaciones de CodeLens. Requiere TypeScript >= 2.2.0.",
-	"typescript.openTsServerLog.title": "Abrir registro del servidor de TS",
-	"typescript.restartTsServer": "Reiniciar servidor TS",
-	"typescript.selectTypeScriptVersion.title": "Seleccionar versión de TypeScript",
-	"typescript.reportStyleChecksAsWarnings": "Notificar comprobaciones de estilo como advertencias",
-	"jsDocCompletion.enabled": "Habilita o deshabilita comentarios automaticos de JSDoc",
-	"javascript.implicitProjectConfig.checkJs": "Habilita/deshabilita la comprobación semántica de los archivos JavaScript. Los archivos jsconfig.json o tsconfig.json reemplazan esta configuración. Se requiere TypeScript >=2.3.1.",
-	"typescript.npm": "Especifica la ruta de acceso al archivo ejecutable de NPM usada para la adquisición automática de tipos. Requiere TypeScript >= 2.3.4.",
-	"typescript.check.npmIsInstalled": "Compruebe si NPM está instalado para la adquisición automática de tipos.",
-	"javascript.nameSuggestions": "Habilitar/deshabilitar nombres únicos de la lista de sugerencias en los archivos de JavaScript. ",
-	"typescript.tsc.autoDetect": "Controla la auto detección de tareas del CAC. 'off' inhabilita esta función. 'build' crea una ejecución de compilación de tareas. 'watch' sólo crea compilación y 'watch tasks' 'on' crea tanto construir y ver tareas. Por defecto = 'on'. ",
-	"typescript.problemMatchers.tsc.label": "Problemas de TypeScript",
-	"typescript.problemMatchers.tscWatch.label": "Problemas de TypeScript (modo de inspección)",
-	"typescript.quickSuggestionsForPaths": "Activar o desactivar rápidas sugerencias al escribir una ruta de importación.",
-	"typescript.locale": "Establece la configuración regional para reportar errores de TypeScript. Requiere TypeScript > = 2.6.0. Por defecto, utiliza el valor 'null'  de VS Code para errores de TypeScript.",
-	"javascript.implicitProjectConfig.experimentalDecorators": "Activar/desactivar 'experimentalDecorators' para los archivos JavaScript que no son parte de un proyecto. Los archivos jsconfig.json o tsconfig.json reemplazan esta configuración. Requiere inicio > = 2.3.1. ",
-	"typescript.autoImportSuggestions.enabled": "Habilita o deshabilita sugerencias de importación automática.  Requiere TypeScript >= 2.6.1.",
-	"typescript.experimental.syntaxFolding": "Habilita/deshabilita los marcadores de plegado sensibles a la sintaxis.",
-	"taskDefinition.tsconfig.description": "Archivo tsconfig que define la compilación de TS."
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/vb/package.i18n.json b/i18n/esn/extensions/vb/package.i18n.json
deleted file mode 100644
index f1d50c0faa9..00000000000
--- a/i18n/esn/extensions/vb/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Conceptos básicos del lenguaje VB",
-	"description": "Proporciona fragmentos de código, resaltado de sintaxis, correspondencia de corchetes y plegado de código en archivos de Visual Basic."
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/xml/package.i18n.json b/i18n/esn/extensions/xml/package.i18n.json
deleted file mode 100644
index d4e84bb60dc..00000000000
--- a/i18n/esn/extensions/xml/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Conceptos básicos del lenguaje XML",
-	"description": "Proporciona resaltado de sintaxis y correspondencia de corchetes en archivos XML."
-}
\ No newline at end of file
diff --git a/i18n/esn/extensions/yaml/package.i18n.json b/i18n/esn/extensions/yaml/package.i18n.json
deleted file mode 100644
index 41e8524f44e..00000000000
--- a/i18n/esn/extensions/yaml/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Conceptos básicos del lenguaje YAML",
-	"description": "Proporciona resaltado de sintaxis y correspondencia de corchetes en archivos de YAML."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/base/browser/ui/actionbar/actionbar.i18n.json b/i18n/esn/src/vs/base/browser/ui/actionbar/actionbar.i18n.json
deleted file mode 100644
index 309631273fe..00000000000
--- a/i18n/esn/src/vs/base/browser/ui/actionbar/actionbar.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"titleLabel": "{0} ({1})"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/base/browser/ui/aria/aria.i18n.json b/i18n/esn/src/vs/base/browser/ui/aria/aria.i18n.json
deleted file mode 100644
index 6435cff03a7..00000000000
--- a/i18n/esn/src/vs/base/browser/ui/aria/aria.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"repeated": "{0} (ocurrió de nuevo)"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/base/browser/ui/findinput/findInput.i18n.json b/i18n/esn/src/vs/base/browser/ui/findinput/findInput.i18n.json
deleted file mode 100644
index 8cccc6aacb5..00000000000
--- a/i18n/esn/src/vs/base/browser/ui/findinput/findInput.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"defaultLabel": "entrada"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/base/browser/ui/findinput/findInputCheckboxes.i18n.json b/i18n/esn/src/vs/base/browser/ui/findinput/findInputCheckboxes.i18n.json
deleted file mode 100644
index 97fa0bff782..00000000000
--- a/i18n/esn/src/vs/base/browser/ui/findinput/findInputCheckboxes.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"caseDescription": "Coincidir mayúsculas y minúsculas",
-	"wordsDescription": "Solo palabras completas",
-	"regexDescription": "Usar expresión regular"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/base/browser/ui/inputbox/inputBox.i18n.json b/i18n/esn/src/vs/base/browser/ui/inputbox/inputBox.i18n.json
deleted file mode 100644
index f03aa8f50b3..00000000000
--- a/i18n/esn/src/vs/base/browser/ui/inputbox/inputBox.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"alertErrorMessage": "Error: {0}",
-	"alertWarningMessage": "Advertencia: {0}",
-	"alertInfoMessage": "Información: {0}"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/base/browser/ui/resourceviewer/resourceViewer.i18n.json b/i18n/esn/src/vs/base/browser/ui/resourceviewer/resourceViewer.i18n.json
deleted file mode 100644
index 12aeb156370..00000000000
--- a/i18n/esn/src/vs/base/browser/ui/resourceviewer/resourceViewer.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"imgMeta": "{0} x {1} {2}",
-	"largeImageError": "La imagen es muy grande para mostrar en el editor",
-	"resourceOpenExternalButton": "¿Abrir la imagen mediante un programa externo?",
-	"nativeBinaryError": "El archivo no se mostrará en el editor porque es binario, muy grande o usa una codificación de texto no compatible.",
-	"sizeB": "{0} B",
-	"sizeKB": "{0} KB",
-	"sizeMB": "{0} MB",
-	"sizeGB": "{0} GB",
-	"sizeTB": "{0} TB"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json b/i18n/esn/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json
deleted file mode 100644
index 750d811d866..00000000000
--- a/i18n/esn/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"selectAriaOption": "{0}"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/base/browser/ui/toolbar/toolbar.i18n.json b/i18n/esn/src/vs/base/browser/ui/toolbar/toolbar.i18n.json
deleted file mode 100644
index 72545893fe3..00000000000
--- a/i18n/esn/src/vs/base/browser/ui/toolbar/toolbar.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"more": "Más"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/base/common/errorMessage.i18n.json b/i18n/esn/src/vs/base/common/errorMessage.i18n.json
deleted file mode 100644
index 48197cbd9df..00000000000
--- a/i18n/esn/src/vs/base/common/errorMessage.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"stackTrace.format": "{0}: {1}",
-	"error.defaultMessage": "Se ha producido un error desconocido. Consulte el registro para obtener más detalles.",
-	"nodeExceptionMessage": "Error del sistema ({0})",
-	"error.moreErrors": "{0} ({1} errores en total)"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/base/common/json.i18n.json b/i18n/esn/src/vs/base/common/json.i18n.json
deleted file mode 100644
index a9b302bfa97..00000000000
--- a/i18n/esn/src/vs/base/common/json.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"error.invalidSymbol": "Símbolo no válido",
-	"error.invalidNumberFormat": "Formato de número no válido",
-	"error.propertyNameExpected": "Se esperaba el nombre de la propiedad",
-	"error.valueExpected": "Se esperaba un valor",
-	"error.colonExpected": "Se esperaban dos puntos",
-	"error.commaExpected": "Se esperaba una coma",
-	"error.closeBraceExpected": "Se esperaba una llave de cierre",
-	"error.closeBracketExpected": "Se esperaba un corchete de cierre",
-	"error.endOfFileExpected": "Se esperaba un fin de archivo"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/base/common/jsonErrorMessages.i18n.json b/i18n/esn/src/vs/base/common/jsonErrorMessages.i18n.json
deleted file mode 100644
index 34a7bb3fb16..00000000000
--- a/i18n/esn/src/vs/base/common/jsonErrorMessages.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"error.invalidSymbol": "Símbolo no válido",
-	"error.invalidNumberFormat": "Formato de número no válido",
-	"error.propertyNameExpected": "Se esperaba el nombre de la propiedad",
-	"error.valueExpected": "Se esperaba un valor",
-	"error.colonExpected": "Se esperaban dos puntos",
-	"error.commaExpected": "Se esperaba una coma",
-	"error.closeBraceExpected": "Se esperaba una llave de cierre",
-	"error.closeBracketExpected": "Se esperaba un corchete de cierre",
-	"error.endOfFileExpected": "Se esperaba un fin de archivo"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/base/common/keybindingLabels.i18n.json b/i18n/esn/src/vs/base/common/keybindingLabels.i18n.json
deleted file mode 100644
index a5eafda6bf3..00000000000
--- a/i18n/esn/src/vs/base/common/keybindingLabels.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"ctrlKey": "Ctrl",
-	"shiftKey": "Mayús",
-	"altKey": "Alt",
-	"windowsKey": "Windows",
-	"ctrlKey.long": "Control",
-	"shiftKey.long": "Mayús",
-	"altKey.long": "Alt",
-	"cmdKey.long": "Comando",
-	"windowsKey.long": "Windows"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/base/common/processes.i18n.json b/i18n/esn/src/vs/base/common/processes.i18n.json
deleted file mode 100644
index fb90a087907..00000000000
--- a/i18n/esn/src/vs/base/common/processes.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"ExecutableParser.commandMissing": "Error: La información del ejecutable debe definir un comando de tipo cadena.",
-	"ExecutableParser.isShellCommand": "Advertencia: isShellCommand debe ser de tipo booleano. Se ignora el valor {0}.",
-	"ExecutableParser.args": "Advertencia: Los argumentos deben ser de tipo \"string[]\". Se ignora el valor {0}.",
-	"ExecutableParser.invalidCWD": "Advertencia: options.cwd debe ser de tipo cadena. Se ignora el valor {0}."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/base/common/severity.i18n.json b/i18n/esn/src/vs/base/common/severity.i18n.json
deleted file mode 100644
index 2229fecdaf4..00000000000
--- a/i18n/esn/src/vs/base/common/severity.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"sev.error": "Error",
-	"sev.warning": "Advertencia",
-	"sev.info": "Información"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/base/node/processes.i18n.json b/i18n/esn/src/vs/base/node/processes.i18n.json
deleted file mode 100644
index 8b8b8a887e4..00000000000
--- a/i18n/esn/src/vs/base/node/processes.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"TaskRunner.UNC": "No se puede ejecutar un comando shell en una unidad UNC. "
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/base/node/ps.i18n.json b/i18n/esn/src/vs/base/node/ps.i18n.json
deleted file mode 100644
index d646706d441..00000000000
--- a/i18n/esn/src/vs/base/node/ps.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"collecting": "Recopilando información de memoria y CPU. Esto puede tardar unos segundos. "
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/base/node/zip.i18n.json b/i18n/esn/src/vs/base/node/zip.i18n.json
deleted file mode 100644
index 1688391f20e..00000000000
--- a/i18n/esn/src/vs/base/node/zip.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"incompleteExtract": "Incompleta. Se encontró {0} de {1} entradas",
-	"notFound": "{0} no se encontró dentro del archivo zip."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/base/parts/quickopen/browser/quickOpenModel.i18n.json b/i18n/esn/src/vs/base/parts/quickopen/browser/quickOpenModel.i18n.json
deleted file mode 100644
index a001b857740..00000000000
--- a/i18n/esn/src/vs/base/parts/quickopen/browser/quickOpenModel.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"quickOpenAriaLabelEntry": "{0}, selector",
-	"quickOpenAriaLabel": "selector"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/base/parts/quickopen/browser/quickOpenWidget.i18n.json b/i18n/esn/src/vs/base/parts/quickopen/browser/quickOpenWidget.i18n.json
deleted file mode 100644
index 9c76253ed55..00000000000
--- a/i18n/esn/src/vs/base/parts/quickopen/browser/quickOpenWidget.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"quickOpenAriaLabel": "Selector rápido. Escriba para restringir los resultados.",
-	"treeAriaLabel": "Selector rápido"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/base/parts/tree/browser/treeDefaults.i18n.json b/i18n/esn/src/vs/base/parts/tree/browser/treeDefaults.i18n.json
deleted file mode 100644
index d3f63786d29..00000000000
--- a/i18n/esn/src/vs/base/parts/tree/browser/treeDefaults.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"collapse": "Contraer"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json b/i18n/esn/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
deleted file mode 100644
index c55f03b5326..00000000000
--- a/i18n/esn/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hide": "ocultar",
-	"show": "Mostrar",
-	"previewOnGitHub": "Visualizar en GitHub",
-	"loadingData": "Cargando datos...",
-	"rateLimited": "Límite de consulta de GitHub excedido. Espera.",
-	"similarIssues": "Problemas similares",
-	"open": "Abrir",
-	"closed": "Cerrado",
-	"noSimilarIssues": "No se han encontrado problemas similares",
-	"settingsSearchIssue": "Problema de búsqueda de configuración",
-	"bugReporter": "Informe de errores",
-	"featureRequest": "Solicitud de característica",
-	"performanceIssue": "Problema de rendimiento",
-	"stepsToReproduce": "Pasos para reproducir",
-	"bugDescription": "Indique los pasos necesarios para reproducir el problema. Debe incluir el resultado real y el resultado esperado. Admitimos Markdown al estilo de GitHub. Podrá editar el problema y agregar capturas de pantalla cuando veamos una vista previa en GitHub.",
-	"performanceIssueDesciption": "¿Cuándo ocurrió este problema de rendimiento? ¿Se produce al inicio o después de realizar una serie específica de acciones? Admitimos Markdown al estilo de GitHub. Podrá editar el problema y agregar capturas de pantalla cuando veamos una vista previa en GitHub.",
-	"description": "Descripción",
-	"featureRequestDescription": "Describa la característica que le gustaría ver. Admitimos Markdown al estilo de GitHub. Podrá editar esta información y agregar capturas de pantalla cuando veamos una vista previa en GitHub.",
-	"expectedResults": "Resultados esperados",
-	"settingsSearchResultsDescription": "Indique los resultados que esperaba encontrar cuando usó esta consulta para la búsqueda. Admitimos Markdown al estilo de GitHub. Podrá editar el problema y agregar capturas de pantalla cuando veamos una vista previa en GitHub.",
-	"pasteData": "Hemos escrito los datos necesarios en su Portapapeles porque eran demasiado grandes para enviarlos. Ahora debe pegarlos.",
-	"disabledExtensions": "Las extensiones están deshabilitadas"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json b/i18n/esn/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
deleted file mode 100644
index 9333872d13a..00000000000
--- a/i18n/esn/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"completeInEnglish": "Por favor complete el formulario en inglés.",
-	"issueTypeLabel": "Esto es un",
-	"issueSourceLabel": "Archivo en",
-	"vscode": "Visual Studio Code",
-	"extension": "Una extensión",
-	"disableExtensionsLabelText": "Intente reproducir el problema después de {0}. Si el problema sólo se reproduce cuando las extensiones están activas, puede que haya un problema con una extensión.",
-	"disableExtensions": "Deshabilitar todas las extensiones y volver a cargar la ventana",
-	"chooseExtension": "Extensión",
-	"issueTitleLabel": "Título",
-	"issueTitleRequired": "Por favor, introduzca un título.",
-	"titleLengthValidation": "El título es demasiado largo.",
-	"details": "Especifique los detalles.",
-	"sendSystemInfo": "Incluir la información de mi sistema ({0})",
-	"show": "mostrar",
-	"sendProcessInfo": "Incluir mis procesos actualmente en ejecución ({0})",
-	"sendWorkspaceInfo": "Incluir los metadatos de mi espacio de trabajo ({0})",
-	"sendExtensions": "Incluir mis extensiones habilitadas ({0})",
-	"sendSearchedExtensions": "Enviar extensiones examinadas ({0})",
-	"sendSettingsSearchDetails": "Enviar configuración detalles de búsqueda ({0})"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/code/electron-browser/processExplorer/processExplorerMain.i18n.json b/i18n/esn/src/vs/code/electron-browser/processExplorer/processExplorerMain.i18n.json
deleted file mode 100644
index 655b2ff1f23..00000000000
--- a/i18n/esn/src/vs/code/electron-browser/processExplorer/processExplorerMain.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"cpu": "CPU %",
-	"memory": "Memoria (MB)",
-	"pid": "pid",
-	"name": "Nombre",
-	"killProcess": "Terminar proceso",
-	"forceKillProcess": "Forzar matar proceso",
-	"copy": "Copiar",
-	"copyAll": "Copiar todo"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/code/electron-main/auth.i18n.json b/i18n/esn/src/vs/code/electron-main/auth.i18n.json
deleted file mode 100644
index b61d578e201..00000000000
--- a/i18n/esn/src/vs/code/electron-main/auth.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"authRequire": "Autenticación de proxy requerida",
-	"proxyauth": "El proxy {0} requiere autenticación."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/code/electron-main/logUploader.i18n.json b/i18n/esn/src/vs/code/electron-main/logUploader.i18n.json
deleted file mode 100644
index 4af98bb7924..00000000000
--- a/i18n/esn/src/vs/code/electron-main/logUploader.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"invalidEndpoint": "Punto final del registro Uploader no válido",
-	"beginUploading": "Cargando ",
-	"didUploadLogs": "Carga exitosa. ID. del archivo de registro: {0}",
-	"logUploadPromptHeader": "Va a cargar los registros de sesión en un punto de conexión seguro de Microsoft al que solo tienen acceso miembros del equipo de VS Code de Microsoft.",
-	"logUploadPromptBody": "Los registros de sesión pueden contener información personal, como rutas de acceso completas o contenido de archivos. Revise y redacte sus archivos de registro de sesión aquí: \"{0}\"",
-	"logUploadPromptBodyDetails": "Si continúa, confirma que ha revisado y redactado sus archivos de registro de sesión y que consiente que Microsoft los utilice para depurar VS Code.",
-	"logUploadPromptAcceptInstructions": "Ejecute el código con \"--upload-logs={0}\" para continuar con la carga",
-	"postError": "Error al publicar los registros: {0}",
-	"responseError": "Error al publicar los registros. Consiguió {0} - {1} ",
-	"parseError": "Error al analizar la respuesta",
-	"zipError": "Error al comprimir los registros: {0}\n\n"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/code/electron-main/main.i18n.json b/i18n/esn/src/vs/code/electron-main/main.i18n.json
deleted file mode 100644
index 1240f1e7720..00000000000
--- a/i18n/esn/src/vs/code/electron-main/main.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"secondInstanceNoResponse": "Se está ejecutando otra instancia de {0} pero no responde",
-	"secondInstanceNoResponseDetail": "Cierre todas las demás instancias y vuelva a intentarlo.",
-	"secondInstanceAdmin": "Ya se está ejecutando una segunda instancia de {0} como administrador.",
-	"secondInstanceAdminDetail": "Cierre la otra instancia y vuelva a intentarlo.",
-	"close": "&&Cerrar"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/code/electron-main/menus.i18n.json b/i18n/esn/src/vs/code/electron-main/menus.i18n.json
deleted file mode 100644
index 2173ae65d3e..00000000000
--- a/i18n/esn/src/vs/code/electron-main/menus.i18n.json
+++ /dev/null
@@ -1,193 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"mFile": "Archivo",
-	"mEdit": "Editar",
-	"mSelection": "Selección",
-	"mView": "Ver",
-	"mGoto": "Ir",
-	"mDebug": "&&Depurar",
-	"mWindow": "Ventana",
-	"mHelp": "Ayuda",
-	"mTask": "&&Tareas",
-	"miNewWindow": "&&Nueva ventana",
-	"mAbout": "Acerca de {0}",
-	"mServices": "Servicios",
-	"mHide": "Ocultar {0}",
-	"mHideOthers": "Ocultar otros",
-	"mShowAll": "Mostrar todo",
-	"miQuit": "Salir de {0}",
-	"miNewFile": "&&Nuevo archivo",
-	"miOpen": "Abrir...",
-	"miOpenWorkspace": "Abrir área de trabajo...",
-	"miOpenFolder": "Abrir &&carpeta...",
-	"miOpenFile": "&&Abrir archivo...",
-	"miOpenRecent": "Abrir &&reciente",
-	"miSaveWorkspaceAs": "Guardar área de trabajo como...",
-	"miAddFolderToWorkspace": "Agregar carpeta al área de trabajo...",
-	"miSave": "&&Guardar",
-	"miSaveAs": "Guardar &&como...",
-	"miSaveAll": "Guardar t&&odo",
-	"miAutoSave": "Guardado automático",
-	"miRevert": "Revertir a&&rchivo",
-	"miCloseWindow": "C&&errar ventana",
-	"miCloseWorkspace": "Cerrar &&área de trabajo",
-	"miCloseFolder": "Cerrar &&carpeta",
-	"miCloseEditor": "&&Cerrar editor",
-	"miExit": "Salir",
-	"miOpenSettings": "Configuración",
-	"miOpenKeymap": "&&Métodos abreviados de teclado",
-	"miOpenKeymapExtensions": "&&Extensiones de distribución de teclado",
-	"miOpenSnippets": "&&Fragmento de código del usuario",
-	"miSelectColorTheme": "&&Tema de color",
-	"miSelectIconTheme": "&&Tema de icono de archivo",
-	"miPreferences": "&&Preferencias",
-	"miReopenClosedEditor": "&&Volver a abrir el editor cerrado",
-	"miMore": "&&Más...",
-	"miClearRecentOpen": "&&Borrar abiertos recientemente",
-	"miUndo": "&&Deshacer",
-	"miRedo": "&&Rehacer",
-	"miCut": "Cortar",
-	"miCopy": "&&Copiar",
-	"miPaste": "&&Pegar",
-	"miFind": "&&Buscar",
-	"miReplace": "&&Reemplazar",
-	"miFindInFiles": "Buscar &&en archivos",
-	"miReplaceInFiles": "Reemplazar &&en archivos",
-	"miEmmetExpandAbbreviation": "Emmet: E&&xpandir abreviatura",
-	"miShowEmmetCommands": "E&&mmet...",
-	"miToggleLineComment": "&&Alternar comentario de línea",
-	"miToggleBlockComment": "Alternar &&Bloquear comentario",
-	"miMultiCursorAlt": "Cambiar a Alt+Clic para cursor múltiple",
-	"miMultiCursorCmd": "Cambiar a Cmd+Clic para cursor múltiple",
-	"miMultiCursorCtrl": "Cambiar a Ctrl+Clic para cursor múltiple",
-	"miInsertCursorAbove": "&&Agregar cursor arriba",
-	"miInsertCursorBelow": "A&&gregar cursor abajo",
-	"miInsertCursorAtEndOfEachLineSelected": "Agregar c&&ursores a extremos de línea",
-	"miAddSelectionToNextFindMatch": "Agregar &&siguiente repetición",
-	"miAddSelectionToPreviousFindMatch": "Agregar r&&epetición anterior",
-	"miSelectHighlights": "Seleccionar todas las &&repeticiones",
-	"miCopyLinesUp": "&&Copiar línea arriba",
-	"miCopyLinesDown": "Co&&piar línea abajo",
-	"miMoveLinesUp": "Mo&&ver línea arriba",
-	"miMoveLinesDown": "Mover &&línea abajo",
-	"miSelectAll": "&&Seleccionar todo",
-	"miSmartSelectGrow": "&&Expandir selección",
-	"miSmartSelectShrink": "&&Reducir selección",
-	"miViewExplorer": "&&Explorador",
-	"miViewSearch": "&&Buscar",
-	"miViewSCM": "S&&CM",
-	"miViewDebug": "&&Depurar",
-	"miViewExtensions": "E&&xtensiones",
-	"miToggleOutput": "&&Salida",
-	"miToggleDebugConsole": "Consola de de&&puración",
-	"miToggleIntegratedTerminal": "&&Terminal integrado",
-	"miMarker": "&&Problemas",
-	"miCommandPalette": "&&Paleta de comandos...",
-	"miOpenView": "&& Vista abierta...",
-	"miToggleFullScreen": "Alternar &&pantalla completa",
-	"miToggleZenMode": "Alternar modo zen",
-	"miToggleCenteredLayout": "Alternar diseño centrado",
-	"miToggleMenuBar": "Alternar &&barra de menús",
-	"miSplitEditor": "Dividir &&editor",
-	"miToggleEditorLayout": "Alternar diseño del grupo de &&editores",
-	"miToggleSidebar": "&&Alternar barra lateral",
-	"miMoveSidebarRight": "&&Mover barra lateral a la derecha",
-	"miMoveSidebarLeft": "&&Mover barra lateral a la izquierda",
-	"miTogglePanel": "Alternar &&panel",
-	"miHideStatusbar": "&&Ocultar barra de estado",
-	"miShowStatusbar": "&&Mostrar barra de estado",
-	"miHideActivityBar": "Ocultar &&barra de actividades",
-	"miShowActivityBar": "Mostrar &&barra de actividades",
-	"miToggleWordWrap": "Alternar &&ajuste automático de línea",
-	"miToggleMinimap": "Alternar &&minimapa",
-	"miToggleRenderWhitespace": "Alternar &&representación de espacio en blanco",
-	"miToggleRenderControlCharacters": "Alternar caracteres de control &&",
-	"miZoomIn": "&&Ampliar",
-	"miZoomOut": "Redu&&cir",
-	"miZoomReset": "&&Restablecer zoom",
-	"miBack": "Atrás",
-	"miForward": "&&Reenviar",
-	"miNextEditor": "&&Editor siguiente",
-	"miPreviousEditor": "&&Editor anterior",
-	"miNextEditorInGroup": "&&Editor siguiente usado del grupo",
-	"miPreviousEditorInGroup": "&&Editor anterior usado del grupo",
-	"miSwitchEditor": "Cambiar &&editor",
-	"miFocusFirstGroup": "&&Primer grupo",
-	"miFocusSecondGroup": "&&Segundo grupo",
-	"miFocusThirdGroup": "&&Tercer grupo",
-	"miNextGroup": "&&Grupo siguiente",
-	"miPreviousGroup": "&&Grupo anterior",
-	"miSwitchGroup": "Cambiar &&grupo",
-	"miGotoFile": "Ir a &&archivo...",
-	"miGotoSymbolInFile": "Ir al &&símbolo en el archivo...",
-	"miGotoSymbolInWorkspace": "Ir al símbolo en el área de &&trabajo...",
-	"miGotoDefinition": "Ir a &&definición",
-	"miGotoTypeDefinition": "Ir a la definición de &&Tipo",
-	"miGotoImplementation": "Ir a la &&Implementación",
-	"miGotoLine": "Ir a la &&línea...",
-	"miStartDebugging": "I&&niciar depuración",
-	"miStartWithoutDebugging": "Iniciar &&sin depurar",
-	"miStopDebugging": "&&Detener depuración",
-	"miRestart Debugging": "&&Reiniciar depuración",
-	"miOpenConfigurations": "Abrir &&configuraciones",
-	"miAddConfiguration": "Agregar configuración...",
-	"miStepOver": "Depurar paso a paso por proce&&dimientos",
-	"miStepInto": "&&Depurar paso a paso por instrucciones",
-	"miStepOut": "Depurar paso a paso para &&salir",
-	"miContinue": "&&Continuar",
-	"miToggleBreakpoint": "Alter&&nar punto de interrupción",
-	"miConditionalBreakpoint": "Punto de interrupción &&condicional...",
-	"miInlineBreakpoint": "Punt&&o de interrupción en línea",
-	"miFunctionBreakpoint": "Punto de interrupción de &&función...",
-	"miLogPoint": "&&Punto de registro",
-	"miNewBreakpoint": "&&Nuevo punto de interrupción",
-	"miEnableAllBreakpoints": "Habilitar todos los puntos de interrupción",
-	"miDisableAllBreakpoints": "&&Deshabilitar todos los puntos de interrupción",
-	"miRemoveAllBreakpoints": "Quitar &&todos los puntos de interrupción",
-	"miInstallAdditionalDebuggers": "&&Instalar los depuradores adicionales...",
-	"mMinimize": "Minimizar",
-	"mZoom": "Zoom",
-	"mBringToFront": "Traer todo al frente",
-	"miSwitchWindow": "Cambiar &&Ventana...",
-	"mShowPreviousTab": "Mostrar pestaña anterior",
-	"mShowNextTab": "Mostrar siguiente pestaña",
-	"mMoveTabToNewWindow": "Mover pestaña a una nueva ventana",
-	"mMergeAllWindows": "Fusionar todas las ventanas",
-	"miToggleDevTools": "&&Alternar herramientas de desarrollo",
-	"miAccessibilityOptions": "&&Opciones de accesibilidad",
-	"miOpenProcessExplorerer": "Abrir Explorador de &&Procesos",
-	"miReportIssue": "&&Notificar problema",
-	"miWelcome": "&&Bienvenido",
-	"miInteractivePlayground": "Área de juegos &&interactiva",
-	"miDocumentation": "&&Documentación",
-	"miReleaseNotes": "&&Notas de la versión",
-	"miKeyboardShortcuts": "&&Referencia de métodos abreviados de teclado",
-	"miIntroductoryVideos": "&&Vídeos de introducción",
-	"miTipsAndTricks": "&&Sugerencias y trucos",
-	"miTwitter": "&&Síganos en Twitter",
-	"miUserVoice": "&&Buscar solicitudes de características",
-	"miLicense": "Ver &&licencia",
-	"miPrivacyStatement": "&&Declaración de privacidad",
-	"miAbout": "&&Acerca de",
-	"miRunTask": "&&Ejecutar tarea... ",
-	"miBuildTask": "Ejecutar &&tarea de compilación...",
-	"miRunningTask": "Mostrar las &&tareas en ejecución",
-	"miRestartTask": "R&&einiciar tarea en ejecución...",
-	"miTerminateTask": "&&Finalizar tarea...",
-	"miConfigureTask": "&&Configurar Tareas...",
-	"miConfigureBuildTask": "Configurar Tarea de Compilación &&Predeterminada...",
-	"accessibilityOptionsWindowTitle": "Opciones de accesibilidad",
-	"miCheckForUpdates": "Buscar actualizaciones...",
-	"miCheckingForUpdates": "Buscando actualizaciones...",
-	"miDownloadUpdate": "Descargar actualización disponible",
-	"miDownloadingUpdate": "Descargando actualización...",
-	"miInstallUpdate": "Instalar actualización...",
-	"miInstallingUpdate": "Instalando actualización...",
-	"miRestartToUpdate": "Reiniciar para actualizar..."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/code/electron-main/window.i18n.json b/i18n/esn/src/vs/code/electron-main/window.i18n.json
deleted file mode 100644
index bd72eedfb57..00000000000
--- a/i18n/esn/src/vs/code/electron-main/window.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hiddenMenuBar": "Aún puede acceder a la barra de menús presionando la tecla Alt."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/code/electron-main/windows.i18n.json b/i18n/esn/src/vs/code/electron-main/windows.i18n.json
deleted file mode 100644
index d39f314a257..00000000000
--- a/i18n/esn/src/vs/code/electron-main/windows.i18n.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"ok": "Aceptar",
-	"pathNotExistTitle": "La ruta no existe",
-	"pathNotExistDetail": "Parece que la ruta '{0}' ya no existe en el disco.",
-	"reopen": "&& Abrir",
-	"wait": "&& Mantener la espera",
-	"close": "&& Cerrar",
-	"appStalled": "La ventana ha dejado de responder.",
-	"appStalledDetail": "Puede volver a abrir la ventana, cerrarla o seguir esperando.",
-	"appCrashed": "La ventana se bloqueó",
-	"appCrashedDetail": "Sentimos las molestias. Puede volver a abrir la ventana para continuar donde se detuvo.",
-	"open": "Abrir",
-	"openFolder": "Abrir carpeta",
-	"openFile": "Abrir archivo",
-	"workspaceOpenedMessage": "No se puede guardar el espacio de trabajo '{0}'",
-	"workspaceOpenedDetail": "El espacio de trabajo ya está abierto en otra ventana. Por favor, cierre primero la ventana y vuelta a intentarlo de nuevo.",
-	"openWorkspace": "&&Abrir...",
-	"openWorkspaceTitle": "Abrir área de trabajo",
-	"save": "&&Guardar",
-	"doNotSave": "&&No guardar",
-	"cancel": "Cancelar",
-	"saveWorkspaceMessage": "¿Quiere guardar la configuración del área de trabajo como un archivo?",
-	"saveWorkspaceDetail": "Guarde el área de trabajo si tiene pensado volverla a abrir.",
-	"saveWorkspace": "Guardar área de trabajo"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/code/node/cliProcessMain.i18n.json b/i18n/esn/src/vs/code/node/cliProcessMain.i18n.json
deleted file mode 100644
index bc66e0c14ce..00000000000
--- a/i18n/esn/src/vs/code/node/cliProcessMain.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"notFound": "La extensión '{0}' no se encontró.",
-	"notInstalled": "La extensión '{0}' no está instalada.",
-	"useId": "Asegúrese de usar el identificador de extensión completo, incluido el publicador, por ejemplo: {0}.",
-	"successVsixInstall": "La extensión '{0}' se ha instalado correctamente.",
-	"cancelVsixInstall": "Cancelar instalación de extensión '{0}'.",
-	"alreadyInstalled": "La extensión '{0}' ya está instalada.",
-	"foundExtension": "Se encontró '{0}' en Marketplace.",
-	"installing": "Instalando...",
-	"successInstall": "La extensión '{0}' v{1} se instaló correctamente.",
-	"uninstalling": "Desinstalando {0}...",
-	"successUninstall": "La extensión '{0}' se desinstaló correctamente."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/editor/browser/services/bulkEdit.i18n.json b/i18n/esn/src/vs/editor/browser/services/bulkEdit.i18n.json
deleted file mode 100644
index 2aba6b00756..00000000000
--- a/i18n/esn/src/vs/editor/browser/services/bulkEdit.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"summary.0": "No se realizaron ediciones",
-	"summary.nm": "{0} ediciones de texto en {1} archivos",
-	"summary.n0": "{0} ediciones de texto en un archivo",
-	"conflict": "Estos archivos han cambiado durante el proceso: {0}"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/editor/browser/widget/codeEditorWidget.i18n.json b/i18n/esn/src/vs/editor/browser/widget/codeEditorWidget.i18n.json
deleted file mode 100644
index d60d995d489..00000000000
--- a/i18n/esn/src/vs/editor/browser/widget/codeEditorWidget.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"cursors.maximum": "El número de cursores se ha limitado a {0}."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/editor/browser/widget/diffEditorWidget.i18n.json b/i18n/esn/src/vs/editor/browser/widget/diffEditorWidget.i18n.json
deleted file mode 100644
index 69dc12270e8..00000000000
--- a/i18n/esn/src/vs/editor/browser/widget/diffEditorWidget.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"diff.tooLarge": "Los archivos no se pueden comparar porque uno de ellos es demasiado grande."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/editor/browser/widget/diffReview.i18n.json b/i18n/esn/src/vs/editor/browser/widget/diffReview.i18n.json
deleted file mode 100644
index 945fa71e9e6..00000000000
--- a/i18n/esn/src/vs/editor/browser/widget/diffReview.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"label.close": "Cerrar",
-	"no_lines": "sin líneas",
-	"one_line": "1 línea",
-	"more_lines": "{0} líneas",
-	"header": "Diferencia {0} de {1}: original {2}, {3}, modificado {4}, {5}",
-	"blankLine": "vacío",
-	"equalLine": "original {0}, modificado {1}: {2}",
-	"insertLine": "+ modificado {0}: {1}",
-	"deleteLine": "- original {0}: {1}",
-	"editor.action.diffReview.next": "Ir a la siguiente diferencia",
-	"editor.action.diffReview.prev": "Ir a la diferencia anterior"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/editor/common/commonCodeEditor.i18n.json b/i18n/esn/src/vs/editor/common/commonCodeEditor.i18n.json
deleted file mode 100644
index d60d995d489..00000000000
--- a/i18n/esn/src/vs/editor/common/commonCodeEditor.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"cursors.maximum": "El número de cursores se ha limitado a {0}."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/editor/common/config/commonEditorConfig.i18n.json b/i18n/esn/src/vs/editor/common/config/commonEditorConfig.i18n.json
deleted file mode 100644
index 6ad3e3ebd5e..00000000000
--- a/i18n/esn/src/vs/editor/common/config/commonEditorConfig.i18n.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"editorConfigurationTitle": "Editor",
-	"fontFamily": "Controla la familia de fuentes.",
-	"fontWeight": "Controla el grosor de la fuente.",
-	"fontSize": "Controla el tamaño de fuente en píxeles.",
-	"lineHeight": "Controla la altura de línea. Utilice 0 para calcular el valor de lineHeight a partir de fontSize.",
-	"letterSpacing": "Controla el espacio entre letras en pixels.",
-	"lineNumbers.off": "Los números de línea no se muestran.",
-	"lineNumbers.on": "Los números de línea se muestran como un número absoluto.",
-	"lineNumbers.relative": "Los números de línea se muestran como distancia en líneas a la posición del cursor.",
-	"lineNumbers.interval": "Los números de línea se muestran cada 10 líneas.",
-	"lineNumbers": "Controla la visualización de los números de línea.",
-	"rulers": "Representar reglas verticales después de un cierto número de caracteres monoespacio. Usar multiples valores para multiples reglas. No se dibuja ninguna regla si la matriz esta vacía.",
-	"wordSeparators": "Caracteres que se usarán como separadores de palabras al realizar operaciones o navegaciones relacionadas con palabras.",
-	"tabSize": "El número de espacios a los que equivale una tabulación. Este valor se invalida según el contenido del archivo cuando `editor.detectIndentation` está activado.",
-	"tabSize.errorMessage": "Se esperaba \"number\". Tenga en cuenta que el ajuste \"editor.detectIndentation\" ha reemplazado al valor \"auto\".",
-	"insertSpaces": "Insertar espacios al presionar TAB. Este valor se invalida en función del contenido del archivo cuando \"editor.detectIndentation\" está activado.",
-	"insertSpaces.errorMessage": "Se esperaba \"boolean\". Tenga en cuenta que el ajuste \"editor.detectIndentation\" ha reemplazado al valor \"auto\".",
-	"detectIndentation": "Al abrir un archivo, se detectarán `editor.tabSize` y `editor.insertSpaces` en función del contenido del archivo.",
-	"roundedSelection": "Controla si las selecciones tienen esquinas redondeadas",
-	"scrollBeyondLastLine": "Controla si el editor se seguirá desplazando después de la última línea",
-	"scrollBeyondLastColumn": "Controla el número de caracteres adicionales a partir del cual el editor se desplazará horizontalmente",
-	"smoothScrolling": "Controla si el editor se desplaza con una animación",
-	"minimap.enabled": "Controla si se muestra el minimapa",
-	"minimap.side": "Controla en qué lado se muestra el minimapa.",
-	"minimap.showSlider": "Controla si el control deslizante del minimapa es ocultado automáticamente.",
-	"minimap.renderCharacters": "Presentar los caracteres reales en una línea (por oposición a bloques de color)",
-	"minimap.maxColumn": "Limitar el ancho del minimapa para presentar como mucho un número de columnas determinado",
-	"find.seedSearchStringFromSelection": "Controla si se inicializa la cadena de búsqueda en Buscar widget en la selección del editor",
-	"find.autoFindInSelection": "Controla si el indicador Buscar en selección se activa cuando se seleccionan varios caracteres o líneas de texto en el editor",
-	"find.globalFindClipboard": "Controla si el widget de búsqueda debería leer o modificar el portapapeles de busqueda compartido en macOS",
-	"wordWrap.off": "Las líneas no se ajustarán nunca.",
-	"wordWrap.on": "Las líneas se ajustarán en el ancho de la ventanilla.",
-	"wordWrap.wordWrapColumn": "Las líneas se ajustarán en \"editor.wordWrapColumn\".",
-	"wordWrap.bounded": "Las líneas se ajustarán al valor que sea inferior: el tamaño de la ventanilla o el valor de \"editor.wordWrapColumn\".",
-	"wordWrap": "Controla cómo se deben ajustar las líneas. Pueden ser:\n - \"off\" (deshabilitar ajuste),\n - \"on\" (ajuste de ventanilla),\n - \"wordWrapColumn\" (ajustar en \"editor.wordWrapColumn\") o\n - \"bounded\" (ajustar en la parte mínima de la ventanilla y \"editor.wordWrapColumn\").",
-	"wordWrapColumn": "Controls the wrapping column of the editor when `editor.wordWrap` is 'wordWrapColumn' or 'bounded'.",
-	"wrappingIndent": "Controla el sangrado de las líneas ajustadas. Puede ser uno de 'none', ' same ', ' indent' o ' deepIndent '.",
-	"mouseWheelScrollSensitivity": "Se utilizará un multiplicador en los eventos de desplazamiento de la rueda del mouse `deltaX` y `deltaY`",
-	"multiCursorModifier.ctrlCmd": "Se asigna a \"Control\" en Windows y Linux y a \"Comando\" en macOS.",
-	"multiCursorModifier.alt": "Se asigna a \"Alt\" en Windows y Linux y a \"Opción\" en macOS.",
-	"multiCursorModifier": "El modificador que se usará para agregar varios cursores con el mouse. \"ctrlCmd\" se asigna a \"Control\" en Windows y Linux y a \"Comando\" en macOS. Los gestos del mouse \"Ir a la definición\" y \"Abrir vínculo\" se adaptarán de modo que no entren en conflicto con el modificador multicurso",
-	"multiCursorMergeOverlapping": "Combinar varios cursores cuando se solapan.",
-	"quickSuggestions.strings": "Habilita sugerencias rápidas en las cadenas.",
-	"quickSuggestions.comments": "Habilita sugerencias rápidas en los comentarios.",
-	"quickSuggestions.other": "Habilita sugerencias rápidas fuera de las cadenas y los comentarios.",
-	"quickSuggestions": "Controla si las sugerencias deben mostrarse automáticamente mientras se escribe",
-	"quickSuggestionsDelay": "Controla el retardo en ms tras el cual aparecerán sugerencias rápidas",
-	"parameterHints": "Habilita el desplegable que muestra documentación de los parámetros e información de los tipos mientras escribe",
-	"autoClosingBrackets": "Controla si el editor debe cerrar automáticamente los corchetes después de abrirlos",
-	"formatOnType": "Controla si el editor debe dar formato automáticamente a la línea después de escribirla",
-	"formatOnPaste": "Controla si el editor debe formatear automáticamente el contenido pegado. Debe haber disponible un formateador capaz de aplicar formato a un intervalo dentro de un documento.",
-	"autoIndent": "Controla si el editor debería ajustar automáticamente la sangría cuando los usuarios escriben, pegan o mueven líneas. Las reglas de sangría del idioma deben estar disponibles",
-	"suggestOnTriggerCharacters": "Controla si las sugerencias deben aparecer de forma automática al escribir caracteres desencadenadores",
-	"acceptSuggestionOnEnter": "Controla si las sugerencias deben aceptarse en \"Entrar\" (además de \"TAB\"). Ayuda a evitar la ambigüedad entre insertar nuevas líneas o aceptar sugerencias. El valor \"smart\" significa que solo se acepta una sugerencia con Entrar cuando se realiza un cambio textual.",
-	"acceptSuggestionOnCommitCharacter": "Controla si se deben aceptar sugerencias en los caracteres de confirmación. Por ejemplo, en Javascript, el punto y coma (\";\") puede ser un carácter de confirmación que acepta una sugerencia y escribe ese carácter.",
-	"snippetSuggestions.top": "Mostrar sugerencias de fragmentos de código por encima de otras sugerencias.",
-	"snippetSuggestions.bottom": "Mostrar sugerencias de fragmentos de código por debajo de otras sugerencias.",
-	"snippetSuggestions.inline": "Mostrar sugerencias de fragmentos de código con otras sugerencias.",
-	"snippetSuggestions.none": "No mostrar sugerencias de fragmentos de código.",
-	"snippetSuggestions": "Controla si se muestran los fragmentos de código con otras sugerencias y cómo se ordenan.",
-	"emptySelectionClipboard": "Controla si al copiar sin selección se copia la línea actual.",
-	"wordBasedSuggestions": "Habilita sugerencias basadas en palabras.",
-	"suggestSelection.first": "Siempre seleccione la primera sugerencia.",
-	"suggestSelection.recentlyUsed": "Seleccione sugerencias recientes a menos que escriba una nueva opción, por ejemplo ' Console. | -> Console. log ' porque ' log ' se ha completado recientemente.",
-	"suggestSelection.recentlyUsedByPrefix": "Seleccione sugerencias basadas en prefijos anteriores que han completado esas sugerencias, por ejemplo, ' Co-> Console ' y ' con-> const '.",
-	"suggestSelection": "Controla cómo se preseleccionan las sugerencias cuando se muestra la lista,",
-	"suggestFontSize": "Tamaño de fuente para el widget de sugerencias",
-	"suggestLineHeight": "Alto de línea para el widget de sugerencias",
-	"selectionHighlight": "Controla si el editor debería destacar coincidencias similares a la selección",
-	"occurrencesHighlight": "Controla si el editor debe resaltar los símbolos semánticos.",
-	"overviewRulerLanes": "Controla el número de decoraciones que pueden aparecer en la misma posición en la regla de visión general",
-	"overviewRulerBorder": "Controla si debe dibujarse un borde alrededor de la regla de información general.",
-	"cursorBlinking": "Controla el estilo de animación del cursor.",
-	"mouseWheelZoom": "Ampliar la fuente del editor cuando se use la rueda del mouse mientras se presiona Ctrl",
-	"cursorStyle": "Controla el estilo del cursor. Los valores aceptados son \"block\", \"block-outline\", \"line\", \"line-thin\", \"underline\" y \"underline-thin\"",
-	"cursorWidth": "Controla el ancho del cursor cuando editor.cursorStyle se establece a 'line'",
-	"fontLigatures": "Habilita las ligaduras tipográficas.",
-	"hideCursorInOverviewRuler": "Controla si el cursor debe ocultarse en la regla de visión general.",
-	"renderWhitespace": "Controla cómo debe representar el editor los espacios en blanco. Las posibilidades son \"none\", \"boundary\" y \"all\". La opción \"boundary\" no representa los espacios individuales entre palabras.",
-	"renderControlCharacters": "Controla si el editor debe representar caracteres de control",
-	"renderIndentGuides": "Controla si el editor debe representar guías de sangría.",
-	"renderLineHighlight": "Controla cómo el editor debe presentar el resaltado de línea. Las posibilidades son \"ninguno\", \"margen\", \"línea\" y \"todo\".",
-	"codeLens": "Controla si el editor muestra CodeLens",
-	"folding": "Controla si el editor tiene habilitado el plegado de código.",
-	"foldingStrategyAuto": "Si está disponible, utilice una estrategia de plegado específica del idioma, de lo contrario volverá a la estrategia basada en sangría.",
-	"foldingStrategyIndentation": "Utilice siempre la estrategia de plegado basado en sangría.",
-	"foldingStrategy": "Controla la forma en que se calculan las gamas plegables. Las selecciones ' auto' utilizan una estrategia de plegado específica del idioma, si está disponible. 'Sangría' obliga a utilizar la estrategia de plegado con sangría.",
-	"showFoldingControls": "Controla cuándo los controles de plegado del margen son ocultados automáticamente.",
-	"matchBrackets": "Resaltar corchetes coincidentes cuando se seleccione uno de ellos.",
-	"glyphMargin": "Controla si el editor debe representar el margen de glifo vertical. El margen de glifo se usa, principalmente, para depuración.",
-	"useTabStops": "La inserción y eliminación del espacio en blanco sigue a las tabulaciones.",
-	"trimAutoWhitespace": "Quitar espacio en blanco final autoinsertado",
-	"stablePeek": "Mantiene abierto el editor interactivo incluso al hacer doble clic en su contenido o presionar Escape.",
-	"dragAndDrop": "Controla si el editor debe permitir mover selecciones mediante arrastrar y colocar.",
-	"accessibilitySupport.auto": "El editor usará API de plataforma para detectar cuándo está conectado un lector de pantalla.",
-	"accessibilitySupport.on": "El editor se optimizará de forma permanente para su uso con un editor de pantalla.",
-	"accessibilitySupport.off": "El editor nunca se optimizará para su uso con un lector de pantalla.",
-	"accessibilitySupport": "Controla si el editor se debe ejecutar en un modo optimizado para lectores de pantalla.",
-	"links": "Controla si el editor debe detectar enlaces y hacerlos cliqueables",
-	"colorDecorators": "Controla si el editor debe representar el Selector de colores y los elementos Decorator de color en línea.",
-	"codeActions": "Permite que el foco de acción del código",
-	"codeActionsOnSave.organizeImports": "¿organizar importaciones en guardar?",
-	"codeActionsOnSave": "Tipos de acción de código que se ejecutarán en guardar.",
-	"codeActionsOnSaveTimeout": "Tiempo de espera para ejecutar acciones de código en guardar.",
-	"selectionClipboard": "Controla si el portapapeles principal de Linux debe admitirse.",
-	"sideBySide": "Controla si el editor de diferencias muestra las diferencias en paralelo o alineadas.",
-	"ignoreTrimWhitespace": "Controla si el editor de diferencias muestra los cambios de espacio inicial o espacio final como diferencias.",
-	"largeFileOptimizations": "Manejo especial para archivos grandes para desactivar ciertas funciones de memoria intensiva.",
-	"renderIndicators": "Controla si el editor de diff muestra indicadores +/- para cambios agregados/quitados"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/editor/common/config/defaultConfig.i18n.json b/i18n/esn/src/vs/editor/common/config/defaultConfig.i18n.json
deleted file mode 100644
index b1da401aa98..00000000000
--- a/i18n/esn/src/vs/editor/common/config/defaultConfig.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"editorViewAccessibleLabel": "Contenido del editor"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/editor/common/config/editorOptions.i18n.json b/i18n/esn/src/vs/editor/common/config/editorOptions.i18n.json
deleted file mode 100644
index de029e8fa26..00000000000
--- a/i18n/esn/src/vs/editor/common/config/editorOptions.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"accessibilityOffAriaLabel": "No se puede acceder al editor en este momento. Presione Alt+F1 para ver opciones.",
-	"editorViewAccessibleLabel": "Contenido del editor"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/editor/common/controller/cursor.i18n.json b/i18n/esn/src/vs/editor/common/controller/cursor.i18n.json
deleted file mode 100644
index f5662e5f53b..00000000000
--- a/i18n/esn/src/vs/editor/common/controller/cursor.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"corrupt.commands": "Excepción inesperada al ejecutar el comando."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/editor/common/model/textModelWithTokens.i18n.json b/i18n/esn/src/vs/editor/common/model/textModelWithTokens.i18n.json
deleted file mode 100644
index 2e260b1f343..00000000000
--- a/i18n/esn/src/vs/editor/common/model/textModelWithTokens.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"mode.tokenizationSupportFailed": "Error en el modo al convertir la entrada en tokens."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/editor/common/modes/modesRegistry.i18n.json b/i18n/esn/src/vs/editor/common/modes/modesRegistry.i18n.json
deleted file mode 100644
index da5b9ceaf8f..00000000000
--- a/i18n/esn/src/vs/editor/common/modes/modesRegistry.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"plainText.alias": "Texto sin formato"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/editor/common/services/bulkEdit.i18n.json b/i18n/esn/src/vs/editor/common/services/bulkEdit.i18n.json
deleted file mode 100644
index 73e3dfa4ecd..00000000000
--- a/i18n/esn/src/vs/editor/common/services/bulkEdit.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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": "Estos archivos han cambiado durante el proceso: {0}",
-	"summary.0": "No se realizaron ediciones",
-	"summary.nm": "{0} ediciones de texto en {1} archivos",
-	"summary.n0": "{0} ediciones de texto en un archivo"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/editor/common/services/modeServiceImpl.i18n.json b/i18n/esn/src/vs/editor/common/services/modeServiceImpl.i18n.json
deleted file mode 100644
index e7cc7df6fed..00000000000
--- a/i18n/esn/src/vs/editor/common/services/modeServiceImpl.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"vscode.extension.contributes.languages": "Aporta declaraciones de lenguaje.",
-	"vscode.extension.contributes.languages.id": "Identificador del lenguaje.",
-	"vscode.extension.contributes.languages.aliases": "Alias de nombre para el lenguaje.",
-	"vscode.extension.contributes.languages.extensions": "Extensiones de archivo asociadas al lenguaje.",
-	"vscode.extension.contributes.languages.filenames": "Nombres de archivo asociados al lenguaje.",
-	"vscode.extension.contributes.languages.filenamePatterns": "Patrones globales de nombre de archivo asociados al lenguaje.",
-	"vscode.extension.contributes.languages.mimetypes": "Tipos MIME asociados al lenguaje.",
-	"vscode.extension.contributes.languages.firstLine": "Expresión regular que coincide con la primera línea de un archivo del lenguaje.",
-	"vscode.extension.contributes.languages.configuration": "Ruta de acceso relativa a un archivo que contiene opciones de configuración para el lenguaje."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/editor/common/services/modelServiceImpl.i18n.json b/i18n/esn/src/vs/editor/common/services/modelServiceImpl.i18n.json
deleted file mode 100644
index e12a9398484..00000000000
--- a/i18n/esn/src/vs/editor/common/services/modelServiceImpl.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"diagAndSourceMultiline": "[{0}]\n{1}",
-	"diagAndSource": "[{0}] {1}"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/editor/common/view/editorColorRegistry.i18n.json b/i18n/esn/src/vs/editor/common/view/editorColorRegistry.i18n.json
deleted file mode 100644
index e90f2798b35..00000000000
--- a/i18n/esn/src/vs/editor/common/view/editorColorRegistry.i18n.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"lineHighlight": "Color de fondo para la línea resaltada en la posición del cursor.",
-	"lineHighlightBorderBox": "Color de fondo del borde alrededor de la línea en la posición del cursor.",
-	"rangeHighlight": "Color de fondo de los rangos resaltados, como por ejemplo las características de abrir rápidamente y encontrar. El color no debe ser opaco para no ocultar las decoraciones subyacentes.",
-	"rangeHighlightBorder": "Color de fondo del borde alrededor de los intervalos resaltados.",
-	"caret": "Color del cursor del editor.",
-	"editorCursorBackground": "Color de fondo del cursor de edición. Permite personalizar el color del caracter solapado por el bloque del cursor.",
-	"editorWhitespaces": "Color de los caracteres de espacio en blanco del editor.",
-	"editorIndentGuides": "Color de las guías de sangría del editor.",
-	"editorActiveIndentGuide": "Color de las guías de sangría activas del editor.",
-	"editorLineNumbers": "Color de números de línea del editor.",
-	"editorActiveLineNumber": "Color del número de línea activa en el editor",
-	"deprecatedEditorActiveLineNumber": "ID es obsoleto. Usar en lugar 'editorLineNumber.activeForeground'. ",
-	"editorRuler": "Color de las reglas del editor",
-	"editorCodeLensForeground": "Color principal de lentes de código en el editor",
-	"editorBracketMatchBackground": "Color de fondo tras corchetes coincidentes",
-	"editorBracketMatchBorder": "Color de bloques con corchetes coincidentes",
-	"editorOverviewRulerBorder": "Color del borde de la regla de visión general.",
-	"editorGutter": "Color de fondo del margen del editor. Este espacio contiene los márgenes de glifos y los números de línea.",
-	"errorForeground": "Color de primer plano de squigglies de error en el editor.",
-	"errorBorder": "Color de borde de squigglies de error en el editor.",
-	"warningForeground": "Color de primer plano de squigglies de advertencia en el editor.",
-	"warningBorder": "Color de borde de squigglies de advertencia en el editor.",
-	"infoForeground": "Color de primer plano de los subrayados ondulados informativos en el editor.",
-	"infoBorder": "Color del borde de los subrayados ondulados informativos en el editor.",
-	"hintForeground": "Color de primer plano de pista squigglies en el editor.",
-	"hintBorder": "Color de borde de pista squigglies en el editor.",
-	"unnecessaryForeground": "Color de primer plano de código innecesario en el editor.",
-	"overviewRulerRangeHighlight": "Resumen de color de marcador para destacar rangos. El color no debe ser opaco para no ocultar las decoraciones subyacentes.",
-	"overviewRuleError": "Color de marcador de regla de información general para errores. ",
-	"overviewRuleWarning": "Color de marcador de regla de información general para advertencias.",
-	"overviewRuleInfo": "Color de marcador de regla de información general para mensajes informativos. "
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/editor/contrib/accessibility/browser/accessibility.i18n.json b/i18n/esn/src/vs/editor/contrib/accessibility/browser/accessibility.i18n.json
deleted file mode 100644
index 1d9dcd1809c..00000000000
--- a/i18n/esn/src/vs/editor/contrib/accessibility/browser/accessibility.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"introMsg": "Gracias por probar las opciones de accesibilidad de VS Code.",
-	"status": "Estado:",
-	"tabFocusModeOnMsg": "Al presionar TAB en el editor actual, el foco se mueve al siguiente elemento activable. Presione {0} para activar o desactivar este comportamiento.",
-	"tabFocusModeOnMsgNoKb": "Al presionar TAB en el editor actual, el foco se mueve al siguiente elemento activable. El comando {0} no se puede desencadenar actualmente mediante un enlace de teclado.",
-	"tabFocusModeOffMsg": "Al presionar TAB en el editor actual, se insertará el carácter de tabulación. Presione {0} para activar o desactivar este comportamiento.",
-	"tabFocusModeOffMsgNoKb": "Al presionar TAB en el editor actual, se insertará el carácter de tabulación. El comando {0} no se puede desencadenar actualmente mediante un enlace de teclado.",
-	"outroMsg": "Para descartar esta información sobre herramientas y volver al editor, presione Esc.",
-	"ShowAccessibilityHelpAction": "Mostrar ayuda de accesibilidad"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/editor/contrib/bracketMatching/bracketMatching.i18n.json b/i18n/esn/src/vs/editor/contrib/bracketMatching/bracketMatching.i18n.json
deleted file mode 100644
index bb06f8067e0..00000000000
--- a/i18n/esn/src/vs/editor/contrib/bracketMatching/bracketMatching.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"overviewRulerBracketMatchForeground": "Resumen color de marcador de regla para corchetes.",
-	"smartSelect.jumpBracket": "Ir al corchete",
-	"smartSelect.selectToBracket": "Seleccione esta opción para soporte"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/editor/contrib/bracketMatching/common/bracketMatching.i18n.json b/i18n/esn/src/vs/editor/contrib/bracketMatching/common/bracketMatching.i18n.json
deleted file mode 100644
index 8c194fd8751..00000000000
--- a/i18n/esn/src/vs/editor/contrib/bracketMatching/common/bracketMatching.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"smartSelect.jumpBracket": "Ir al corchete"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/editor/contrib/caretOperations/caretOperations.i18n.json b/i18n/esn/src/vs/editor/contrib/caretOperations/caretOperations.i18n.json
deleted file mode 100644
index 6d7f6a61e91..00000000000
--- a/i18n/esn/src/vs/editor/contrib/caretOperations/caretOperations.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"caret.moveLeft": "Mover símbolo de inserción a la izquierda",
-	"caret.moveRight": "Mover símbolo de inserción a la derecha"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/editor/contrib/caretOperations/common/caretOperations.i18n.json b/i18n/esn/src/vs/editor/contrib/caretOperations/common/caretOperations.i18n.json
deleted file mode 100644
index ab2cb66648b..00000000000
--- a/i18n/esn/src/vs/editor/contrib/caretOperations/common/caretOperations.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"caret.moveLeft": "Mover símbolo de inserción a la izquierda",
-	"caret.moveRight": "Mover símbolo de inserción a la derecha"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/editor/contrib/caretOperations/common/transpose.i18n.json b/i18n/esn/src/vs/editor/contrib/caretOperations/common/transpose.i18n.json
deleted file mode 100644
index ccd3a5c6ff4..00000000000
--- a/i18n/esn/src/vs/editor/contrib/caretOperations/common/transpose.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"transposeLetters.label": "Transponer letras"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/editor/contrib/caretOperations/transpose.i18n.json b/i18n/esn/src/vs/editor/contrib/caretOperations/transpose.i18n.json
deleted file mode 100644
index 85ec88254c4..00000000000
--- a/i18n/esn/src/vs/editor/contrib/caretOperations/transpose.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"transposeLetters.label": "Transponer letras"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/editor/contrib/clipboard/browser/clipboard.i18n.json b/i18n/esn/src/vs/editor/contrib/clipboard/browser/clipboard.i18n.json
deleted file mode 100644
index 3e8a4d5d783..00000000000
--- a/i18n/esn/src/vs/editor/contrib/clipboard/browser/clipboard.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"actions.clipboard.cutLabel": "Cortar",
-	"actions.clipboard.copyLabel": "Copiar",
-	"actions.clipboard.pasteLabel": "Pegar",
-	"actions.clipboard.copyWithSyntaxHighlightingLabel": "Copiar con resaltado de sintaxis"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/editor/contrib/clipboard/clipboard.i18n.json b/i18n/esn/src/vs/editor/contrib/clipboard/clipboard.i18n.json
deleted file mode 100644
index 7220c628b3c..00000000000
--- a/i18n/esn/src/vs/editor/contrib/clipboard/clipboard.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"actions.clipboard.cutLabel": "Cortar",
-	"actions.clipboard.copyLabel": "Copiar",
-	"actions.clipboard.pasteLabel": "Pegar",
-	"actions.clipboard.copyWithSyntaxHighlightingLabel": "Copiar con resaltado de sintaxis"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/editor/contrib/codeAction/codeActionCommands.i18n.json b/i18n/esn/src/vs/editor/contrib/codeAction/codeActionCommands.i18n.json
deleted file mode 100644
index de3b9342e2b..00000000000
--- a/i18n/esn/src/vs/editor/contrib/codeAction/codeActionCommands.i18n.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"quickFixWithKb": "Mostrar correcciones ({0})",
-	"quickFix": "Mostrar correcciones",
-	"quickfix.trigger.label": "Corrección Rápida",
-	"editor.action.quickFix.noneMessage": "No hay acciones de código disponibles",
-	"refactor.label": "Refactorizar...",
-	"editor.action.refactor.noneMessage": "No hay refactorizaciones disponibles",
-	"source.label": "Acción de Origen...",
-	"editor.action.source.noneMessage": "No hay acciones de origen disponibles",
-	"organizeImports.label": "Organizar Importaciones",
-	"editor.action.organize.noneMessage": "No hay acciones de importación disponibles"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/editor/contrib/comment/comment.i18n.json b/i18n/esn/src/vs/editor/contrib/comment/comment.i18n.json
deleted file mode 100644
index 97fc146b825..00000000000
--- a/i18n/esn/src/vs/editor/contrib/comment/comment.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"comment.line": "Alternar comentario de línea",
-	"comment.line.add": "Agregar comentario de línea",
-	"comment.line.remove": "Quitar comentario de línea",
-	"comment.block": "Alternar comentario de bloque"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/editor/contrib/comment/common/comment.i18n.json b/i18n/esn/src/vs/editor/contrib/comment/common/comment.i18n.json
deleted file mode 100644
index 39d1b07ecab..00000000000
--- a/i18n/esn/src/vs/editor/contrib/comment/common/comment.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"comment.line": "Alternar comentario de línea",
-	"comment.line.add": "Agregar comentario de línea",
-	"comment.line.remove": "Quitar comentario de línea",
-	"comment.block": "Alternar comentario de bloque"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/editor/contrib/contextmenu/browser/contextmenu.i18n.json b/i18n/esn/src/vs/editor/contrib/contextmenu/browser/contextmenu.i18n.json
deleted file mode 100644
index 7dee35d6d96..00000000000
--- a/i18n/esn/src/vs/editor/contrib/contextmenu/browser/contextmenu.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"action.showContextMenu.label": "Mostrar menú contextual del editor"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/editor/contrib/contextmenu/contextmenu.i18n.json b/i18n/esn/src/vs/editor/contrib/contextmenu/contextmenu.i18n.json
deleted file mode 100644
index 6e369bf8be4..00000000000
--- a/i18n/esn/src/vs/editor/contrib/contextmenu/contextmenu.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"action.showContextMenu.label": "Mostrar menú contextual del editor"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/editor/contrib/find/browser/findWidget.i18n.json b/i18n/esn/src/vs/editor/contrib/find/browser/findWidget.i18n.json
deleted file mode 100644
index a2385b5b922..00000000000
--- a/i18n/esn/src/vs/editor/contrib/find/browser/findWidget.i18n.json
+++ /dev/null
@@ -1,21 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"label.find": "Buscar",
-	"placeholder.find": "Buscar",
-	"label.previousMatchButton": "Coincidencia anterior",
-	"label.nextMatchButton": "Coincidencia siguiente",
-	"label.toggleSelectionFind": "Buscar en selección",
-	"label.closeButton": "Cerrar",
-	"label.replace": "Reemplazar",
-	"placeholder.replace": "Reemplazar",
-	"label.replaceButton": "Reemplazar",
-	"label.replaceAllButton": "Reemplazar todo",
-	"label.toggleReplaceButton": "Alternar modo de reemplazar",
-	"title.matchesCountLimit": "Sólo los primeros {0} resultados son resaltados, pero todas las operaciones de búsqueda trabajan en todo el texto.",
-	"label.matchesLocation": "{0} de {1}",
-	"label.noResults": "Sin resultados"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/editor/contrib/find/browser/simpleFindWidget.i18n.json b/i18n/esn/src/vs/editor/contrib/find/browser/simpleFindWidget.i18n.json
deleted file mode 100644
index 213a60a3c4f..00000000000
--- a/i18n/esn/src/vs/editor/contrib/find/browser/simpleFindWidget.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"label.find": "Buscar",
-	"placeholder.find": "Buscar",
-	"label.previousMatchButton": "Coincidencia anterior",
-	"label.nextMatchButton": "Coincidencia siguiente",
-	"label.closeButton": "Cerrar"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/editor/contrib/find/common/findController.i18n.json b/i18n/esn/src/vs/editor/contrib/find/common/findController.i18n.json
deleted file mode 100644
index 27d384a1b68..00000000000
--- a/i18n/esn/src/vs/editor/contrib/find/common/findController.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"startFindAction": "Buscar",
-	"findNextMatchAction": "Buscar siguiente",
-	"findPreviousMatchAction": "Buscar anterior",
-	"nextSelectionMatchFindAction": "Buscar selección siguiente",
-	"previousSelectionMatchFindAction": "Buscar selección anterior",
-	"startReplace": "Reemplazar",
-	"showNextFindTermAction": "Mostrar el siguiente término de búsqueda",
-	"showPreviousFindTermAction": "Mostrar término de búsqueda anterior"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/editor/contrib/find/findController.i18n.json b/i18n/esn/src/vs/editor/contrib/find/findController.i18n.json
deleted file mode 100644
index 0a2f41c1bae..00000000000
--- a/i18n/esn/src/vs/editor/contrib/find/findController.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"startFindAction": "Buscar",
-	"startFindWithSelectionAction": "Buscar con selección",
-	"findNextMatchAction": "Buscar siguiente",
-	"findPreviousMatchAction": "Buscar anterior",
-	"nextSelectionMatchFindAction": "Buscar selección siguiente",
-	"previousSelectionMatchFindAction": "Buscar selección anterior",
-	"startReplace": "Reemplazar",
-	"showNextFindTermAction": "Mostrar siguiente término de búsqueda",
-	"showPreviousFindTermAction": "Mostrar término de búsqueda anterior"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/editor/contrib/find/findWidget.i18n.json b/i18n/esn/src/vs/editor/contrib/find/findWidget.i18n.json
deleted file mode 100644
index b402aa4006f..00000000000
--- a/i18n/esn/src/vs/editor/contrib/find/findWidget.i18n.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"label.find": "Buscar",
-	"placeholder.find": "Buscar",
-	"label.previousMatchButton": "Coincidencia anterior",
-	"label.nextMatchButton": "Coincidencia siguiente",
-	"label.toggleSelectionFind": "Buscar en selección",
-	"label.closeButton": "Cerrar",
-	"label.replace": "Reemplazar",
-	"placeholder.replace": "Reemplazar",
-	"label.replaceButton": "Reemplazar",
-	"label.replaceAllButton": "Reemplazar todo",
-	"label.toggleReplaceButton": "Alternar modo de reemplazar",
-	"title.matchesCountLimit": "Sólo los primeros {0} resultados son resaltados, pero todas las operaciones de búsqueda trabajan en todo el texto.",
-	"label.matchesLocation": "{0} de {1}",
-	"label.noResults": "Sin resultados"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/editor/contrib/find/simpleFindWidget.i18n.json b/i18n/esn/src/vs/editor/contrib/find/simpleFindWidget.i18n.json
deleted file mode 100644
index bc700896c59..00000000000
--- a/i18n/esn/src/vs/editor/contrib/find/simpleFindWidget.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"label.find": "Buscar",
-	"placeholder.find": "Buscar",
-	"label.previousMatchButton": "Coincidencia anterior",
-	"label.nextMatchButton": "Coincidencia siguiente",
-	"label.closeButton": "Cerrar"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/editor/contrib/folding/browser/folding.i18n.json b/i18n/esn/src/vs/editor/contrib/folding/browser/folding.i18n.json
deleted file mode 100644
index b61ee6efe9c..00000000000
--- a/i18n/esn/src/vs/editor/contrib/folding/browser/folding.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"unfoldAction.label": "Desplegar",
-	"unFoldRecursivelyAction.label": "Desplegar de forma recursiva",
-	"foldAction.label": "Plegar",
-	"foldRecursivelyAction.label": "Plegar de forma recursiva",
-	"foldAllAction.label": "Plegar todo",
-	"unfoldAllAction.label": "Desplegar todo",
-	"foldLevelAction.label": "Nivel de plegamiento {0}"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/editor/contrib/folding/folding.i18n.json b/i18n/esn/src/vs/editor/contrib/folding/folding.i18n.json
deleted file mode 100644
index f4c68c13425..00000000000
--- a/i18n/esn/src/vs/editor/contrib/folding/folding.i18n.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"unfoldAction.label": "Desplegar",
-	"unFoldRecursivelyAction.label": "Desplegar de forma recursiva",
-	"foldAction.label": "Plegar",
-	"foldRecursivelyAction.label": "Plegar de forma recursiva",
-	"foldAllBlockComments.label": "Cerrar todos los comentarios de bloqueo",
-	"foldAllMarkerRegions.label": "Plegar todas las regiones",
-	"unfoldAllMarkerRegions.label": "Desplegar Todas las Regiones",
-	"foldAllAction.label": "Plegar todo",
-	"unfoldAllAction.label": "Desplegar todo",
-	"foldLevelAction.label": "Nivel de plegamiento {0}"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/editor/contrib/fontZoom/fontZoom.i18n.json b/i18n/esn/src/vs/editor/contrib/fontZoom/fontZoom.i18n.json
deleted file mode 100644
index 491ee23a000..00000000000
--- a/i18n/esn/src/vs/editor/contrib/fontZoom/fontZoom.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"EditorFontZoomIn.label": "Acercarse a la tipografía del editor",
-	"EditorFontZoomOut.label": "Alejarse de la tipografía del editor",
-	"EditorFontZoomReset.label": "Restablecer alejamiento de la tipografía del editor"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/editor/contrib/format/browser/formatActions.i18n.json b/i18n/esn/src/vs/editor/contrib/format/browser/formatActions.i18n.json
deleted file mode 100644
index 6260d665365..00000000000
--- a/i18n/esn/src/vs/editor/contrib/format/browser/formatActions.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"hint11": "1 edición de formato en la línea {0}",
-	"hintn1": "{0} ediciones de formato en la línea {1}",
-	"hint1n": "1 edición de formato entre las líneas {0} y {1}",
-	"hintnn": "{0} ediciones de formato entre las líneas {1} y {2}",
-	"no.provider": "Lo sentimos, pero no hay ningún formateador para los '{0}' archivos instalados.",
-	"formatDocument.label": "Dar formato al documento",
-	"formatSelection.label": "Dar formato a la selección"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/editor/contrib/format/formatActions.i18n.json b/i18n/esn/src/vs/editor/contrib/format/formatActions.i18n.json
deleted file mode 100644
index d811487bd46..00000000000
--- a/i18n/esn/src/vs/editor/contrib/format/formatActions.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hint11": "1 edición de formato en la línea {0}",
-	"hintn1": "{0} ediciones de formato en la línea {1}",
-	"hint1n": "1 edición de formato entre las líneas {0} y {1}",
-	"hintnn": "{0} ediciones de formato entre las líneas {1} y {2}",
-	"no.provider": "No hay formateador para los archivos ' {0} ' instalados.",
-	"formatDocument.label": "Dar formato al documento",
-	"no.documentprovider": "No hay formateador de documentos para los archivos ' {0} ' instalados.",
-	"formatSelection.label": "Dar formato a la selección",
-	"no.selectionprovider": "No hay formateador de selección para los archivos ' {0} ' instalados."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.i18n.json b/i18n/esn/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.i18n.json
deleted file mode 100644
index da10467643c..00000000000
--- a/i18n/esn/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.i18n.json
+++ /dev/null
@@ -1,24 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"noResultWord": "No se encontró ninguna definición para \"{0}\"",
-	"generic.noResults": "No se encontró ninguna definición",
-	"meta.title": " – {0} definiciones",
-	"actions.goToDecl.label": "Ir a definición",
-	"actions.goToDeclToSide.label": "Abrir definición en el lateral",
-	"actions.previewDecl.label": "Ver la definición",
-	"goToImplementation.noResultWord": "No se encontró ninguna implementación para \"{0}\"",
-	"goToImplementation.generic.noResults": "No se encontró ninguna implementación",
-	"meta.implementations.title": "{0} implementaciones",
-	"actions.goToImplementation.label": "Ir a implementación",
-	"actions.peekImplementation.label": "Inspeccionar implementación",
-	"goToTypeDefinition.noResultWord": "No se encontró ninguna definición de tipo para \"{0}\"",
-	"goToTypeDefinition.generic.noResults": "No se encontró ninguna definición de tipo",
-	"meta.typeDefinitions.title": " – {0} definiciones de tipo",
-	"actions.goToTypeDefinition.label": "Ir a la definición de tipo",
-	"actions.peekTypeDefinition.label": "Inspeccionar definición de tipo",
-	"multipleResults": "Haga clic para mostrar {0} definiciones."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/editor/contrib/goToDeclaration/browser/goToDeclarationCommands.i18n.json b/i18n/esn/src/vs/editor/contrib/goToDeclaration/browser/goToDeclarationCommands.i18n.json
deleted file mode 100644
index d9243b76135..00000000000
--- a/i18n/esn/src/vs/editor/contrib/goToDeclaration/browser/goToDeclarationCommands.i18n.json
+++ /dev/null
@@ -1,23 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"noResultWord": "No se encontró ninguna definición para \"{0}\"",
-	"generic.noResults": "No se encontró ninguna definición",
-	"meta.title": " – {0} definiciones",
-	"actions.goToDecl.label": "Ir a definición",
-	"actions.goToDeclToSide.label": "Abrir definición en el lateral",
-	"actions.previewDecl.label": "Ver la definición",
-	"goToImplementation.noResultWord": "No se encontró ninguna implementación para \"{0}\"",
-	"goToImplementation.generic.noResults": "No se encontró ninguna implementación",
-	"meta.implementations.title": "{0} implementaciones",
-	"actions.goToImplementation.label": "Ir a implementación",
-	"actions.peekImplementation.label": "Inspeccionar implementación",
-	"goToTypeDefinition.noResultWord": "No se encontró ninguna definición de tipo para \"{0}\"",
-	"goToTypeDefinition.generic.noResults": "No se encontró ninguna definición de tipo",
-	"meta.typeDefinitions.title": " – {0} definiciones de tipo",
-	"actions.goToTypeDefinition.label": "Ir a la definición de tipo",
-	"actions.peekTypeDefinition.label": "Inspeccionar definición de tipo"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/editor/contrib/goToDeclaration/browser/goToDeclarationMouse.i18n.json b/i18n/esn/src/vs/editor/contrib/goToDeclaration/browser/goToDeclarationMouse.i18n.json
deleted file mode 100644
index d35f93e7fae..00000000000
--- a/i18n/esn/src/vs/editor/contrib/goToDeclaration/browser/goToDeclarationMouse.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"multipleResults": "Haga clic para mostrar {0} definiciones."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/editor/contrib/goToDeclaration/goToDeclarationCommands.i18n.json b/i18n/esn/src/vs/editor/contrib/goToDeclaration/goToDeclarationCommands.i18n.json
deleted file mode 100644
index f2342ad1ffa..00000000000
--- a/i18n/esn/src/vs/editor/contrib/goToDeclaration/goToDeclarationCommands.i18n.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noResultWord": "No se encontró ninguna definición para \"{0}\"",
-	"generic.noResults": "No se encontró ninguna definición",
-	"meta.title": " – {0} definiciones",
-	"actions.goToDecl.label": "Ir a definición",
-	"actions.goToDeclToSide.label": "Abrir definición en el lateral",
-	"actions.previewDecl.label": "Ver la definición",
-	"goToImplementation.noResultWord": "No se encontró ninguna implementación para \"{0}\"",
-	"goToImplementation.generic.noResults": "No se encontró ninguna implementación",
-	"meta.implementations.title": "{0} implementaciones",
-	"actions.goToImplementation.label": "Ir a implementación",
-	"actions.peekImplementation.label": "Inspeccionar implementación",
-	"goToTypeDefinition.noResultWord": "No se encontró ninguna definición de tipo para \"{0}\"",
-	"goToTypeDefinition.generic.noResults": "No se encontró ninguna definición de tipo",
-	"meta.typeDefinitions.title": " – {0} definiciones de tipo",
-	"actions.goToTypeDefinition.label": "Ir a la definición de tipo",
-	"actions.peekTypeDefinition.label": "Inspeccionar definición de tipo"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/editor/contrib/goToDeclaration/goToDeclarationMouse.i18n.json b/i18n/esn/src/vs/editor/contrib/goToDeclaration/goToDeclarationMouse.i18n.json
deleted file mode 100644
index 65fc038b92d..00000000000
--- a/i18n/esn/src/vs/editor/contrib/goToDeclaration/goToDeclarationMouse.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"multipleResults": "Haga clic para mostrar {0} definiciones."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/editor/contrib/goToDefinition/goToDefinitionCommands.i18n.json b/i18n/esn/src/vs/editor/contrib/goToDefinition/goToDefinitionCommands.i18n.json
deleted file mode 100644
index f2342ad1ffa..00000000000
--- a/i18n/esn/src/vs/editor/contrib/goToDefinition/goToDefinitionCommands.i18n.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noResultWord": "No se encontró ninguna definición para \"{0}\"",
-	"generic.noResults": "No se encontró ninguna definición",
-	"meta.title": " – {0} definiciones",
-	"actions.goToDecl.label": "Ir a definición",
-	"actions.goToDeclToSide.label": "Abrir definición en el lateral",
-	"actions.previewDecl.label": "Ver la definición",
-	"goToImplementation.noResultWord": "No se encontró ninguna implementación para \"{0}\"",
-	"goToImplementation.generic.noResults": "No se encontró ninguna implementación",
-	"meta.implementations.title": "{0} implementaciones",
-	"actions.goToImplementation.label": "Ir a implementación",
-	"actions.peekImplementation.label": "Inspeccionar implementación",
-	"goToTypeDefinition.noResultWord": "No se encontró ninguna definición de tipo para \"{0}\"",
-	"goToTypeDefinition.generic.noResults": "No se encontró ninguna definición de tipo",
-	"meta.typeDefinitions.title": " – {0} definiciones de tipo",
-	"actions.goToTypeDefinition.label": "Ir a la definición de tipo",
-	"actions.peekTypeDefinition.label": "Inspeccionar definición de tipo"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/editor/contrib/goToDefinition/goToDefinitionMouse.i18n.json b/i18n/esn/src/vs/editor/contrib/goToDefinition/goToDefinitionMouse.i18n.json
deleted file mode 100644
index 65fc038b92d..00000000000
--- a/i18n/esn/src/vs/editor/contrib/goToDefinition/goToDefinitionMouse.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"multipleResults": "Haga clic para mostrar {0} definiciones."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/editor/contrib/gotoError/browser/gotoError.i18n.json b/i18n/esn/src/vs/editor/contrib/gotoError/browser/gotoError.i18n.json
deleted file mode 100644
index a46ce2aad76..00000000000
--- a/i18n/esn/src/vs/editor/contrib/gotoError/browser/gotoError.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"title.wo_source": "({0}/{1})",
-	"markerAction.next.label": "Ir al error o la advertencia siguiente",
-	"markerAction.previous.label": "Ir al error o la advertencia anterior",
-	"editorMarkerNavigationError": "Color de los errores del widget de navegación de marcadores del editor.",
-	"editorMarkerNavigationWarning": "Color de las advertencias del widget de navegación de marcadores del editor.",
-	"editorMarkerNavigationInfo": "Color del widget informativo marcador de navegación en el editor.",
-	"editorMarkerNavigationBackground": "Fondo del widget de navegación de marcadores del editor."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/editor/contrib/gotoError/gotoError.i18n.json b/i18n/esn/src/vs/editor/contrib/gotoError/gotoError.i18n.json
deleted file mode 100644
index 5c079ae0936..00000000000
--- a/i18n/esn/src/vs/editor/contrib/gotoError/gotoError.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"markerAction.next.label": "Ir al siguiente problema (Error, Advertencia, Información)",
-	"markerAction.previous.label": "Ir al problema anterior (Error, Advertencia, Información)",
-	"markerAction.nextInFiles.label": "Ir al siguiente problema en Archivos (Error, Advertencia, Información)",
-	"markerAction.previousInFiles.label": "Ir al problema anterior en Archivos (Error, Advertencia, Información)"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json b/i18n/esn/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json
deleted file mode 100644
index 862620a88d9..00000000000
--- a/i18n/esn/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"title.wo_source": "({0}/{1})",
-	"editorMarkerNavigationError": "Color de los errores del widget de navegación de marcadores del editor.",
-	"editorMarkerNavigationWarning": "Color de las advertencias del widget de navegación de marcadores del editor.",
-	"editorMarkerNavigationInfo": "Color del widget informativo marcador de navegación en el editor.",
-	"editorMarkerNavigationBackground": "Fondo del widget de navegación de marcadores del editor."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/editor/contrib/hover/browser/hover.i18n.json b/i18n/esn/src/vs/editor/contrib/hover/browser/hover.i18n.json
deleted file mode 100644
index c190af1321d..00000000000
--- a/i18n/esn/src/vs/editor/contrib/hover/browser/hover.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"showHover": "Mostrar al mantener el puntero"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/editor/contrib/hover/browser/modesContentHover.i18n.json b/i18n/esn/src/vs/editor/contrib/hover/browser/modesContentHover.i18n.json
deleted file mode 100644
index cee5631f417..00000000000
--- a/i18n/esn/src/vs/editor/contrib/hover/browser/modesContentHover.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"modesContentHover.loading": "Cargando..."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/editor/contrib/hover/hover.i18n.json b/i18n/esn/src/vs/editor/contrib/hover/hover.i18n.json
deleted file mode 100644
index b7b3c5ff235..00000000000
--- a/i18n/esn/src/vs/editor/contrib/hover/hover.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"showHover": "Mostrar al mantener el puntero"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/editor/contrib/hover/modesContentHover.i18n.json b/i18n/esn/src/vs/editor/contrib/hover/modesContentHover.i18n.json
deleted file mode 100644
index b84a82d9676..00000000000
--- a/i18n/esn/src/vs/editor/contrib/hover/modesContentHover.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"modesContentHover.loading": "Cargando..."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/editor/contrib/inPlaceReplace/common/inPlaceReplace.i18n.json b/i18n/esn/src/vs/editor/contrib/inPlaceReplace/common/inPlaceReplace.i18n.json
deleted file mode 100644
index c249b2caf4f..00000000000
--- a/i18n/esn/src/vs/editor/contrib/inPlaceReplace/common/inPlaceReplace.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"InPlaceReplaceAction.previous.label": "Reemplazar con el valor anterior",
-	"InPlaceReplaceAction.next.label": "Reemplazar con el valor siguiente"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/editor/contrib/inPlaceReplace/inPlaceReplace.i18n.json b/i18n/esn/src/vs/editor/contrib/inPlaceReplace/inPlaceReplace.i18n.json
deleted file mode 100644
index f91219e6e7d..00000000000
--- a/i18n/esn/src/vs/editor/contrib/inPlaceReplace/inPlaceReplace.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"InPlaceReplaceAction.previous.label": "Reemplazar con el valor anterior",
-	"InPlaceReplaceAction.next.label": "Reemplazar con el valor siguiente"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/editor/contrib/indentation/common/indentation.i18n.json b/i18n/esn/src/vs/editor/contrib/indentation/common/indentation.i18n.json
deleted file mode 100644
index e4b2111a110..00000000000
--- a/i18n/esn/src/vs/editor/contrib/indentation/common/indentation.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"indentationToSpaces": "Convertir sangría en espacios",
-	"indentationToTabs": "Convertir sangría en tabulaciones",
-	"configuredTabSize": "Tamaño de tabulación configurado",
-	"selectTabWidth": "Seleccionar tamaño de tabulación para el archivo actual",
-	"indentUsingTabs": "Aplicar sangría con tabulaciones",
-	"indentUsingSpaces": "Aplicar sangría con espacios",
-	"detectIndentation": "Detectar sangría del contenido",
-	"editor.reindentlines": "Volver a aplicar sangría a líneas"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/editor/contrib/indentation/indentation.i18n.json b/i18n/esn/src/vs/editor/contrib/indentation/indentation.i18n.json
deleted file mode 100644
index e2c7a23b785..00000000000
--- a/i18n/esn/src/vs/editor/contrib/indentation/indentation.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"indentationToSpaces": "Convertir sangría en espacios",
-	"indentationToTabs": "Convertir sangría en tabulaciones",
-	"configuredTabSize": "Tamaño de tabulación configurado",
-	"selectTabWidth": "Seleccionar tamaño de tabulación para el archivo actual",
-	"indentUsingTabs": "Aplicar sangría con tabulaciones",
-	"indentUsingSpaces": "Aplicar sangría con espacios",
-	"detectIndentation": "Detectar sangría del contenido",
-	"editor.reindentlines": "Volver a aplicar sangría a líneas",
-	"editor.reindentselectedlines": "Volver a aplicar sangría a líneas seleccionadas"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/editor/contrib/inspectTMScopes/electron-browser/inspectTMScopes.i18n.json b/i18n/esn/src/vs/editor/contrib/inspectTMScopes/electron-browser/inspectTMScopes.i18n.json
deleted file mode 100644
index 3c11c7eb062..00000000000
--- a/i18n/esn/src/vs/editor/contrib/inspectTMScopes/electron-browser/inspectTMScopes.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"inspectTMScopes": "Desarrollador: Inspeccionar ámbitos de TM",
-	"inspectTMScopesWidget.loading": "Cargando..."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/editor/contrib/linesOperations/common/linesOperations.i18n.json b/i18n/esn/src/vs/editor/contrib/linesOperations/common/linesOperations.i18n.json
deleted file mode 100644
index 904c8cba9ed..00000000000
--- a/i18n/esn/src/vs/editor/contrib/linesOperations/common/linesOperations.i18n.json
+++ /dev/null
@@ -1,25 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"lines.copyUp": "Copiar línea arriba",
-	"lines.copyDown": "Copiar línea abajo",
-	"lines.moveUp": "Mover línea hacia arriba",
-	"lines.moveDown": "Mover línea hacia abajo",
-	"lines.sortAscending": "Ordenar líneas en orden ascendente",
-	"lines.sortDescending": "Ordenar líneas en orden descendente",
-	"lines.trimTrailingWhitespace": "Recortar espacio final",
-	"lines.delete": "Eliminar línea",
-	"lines.indent": "Sangría de línea",
-	"lines.outdent": "Anular sangría de línea",
-	"lines.insertBefore": "Insertar línea arriba",
-	"lines.insertAfter": "Insertar línea debajo",
-	"lines.deleteAllLeft": "Eliminar todo a la izquierda",
-	"lines.deleteAllRight": "Eliminar todo lo que está a la derecha",
-	"lines.joinLines": "Unir líneas",
-	"editor.transpose": "Transponer caracteres alrededor del cursor",
-	"editor.transformToUppercase": "Transformar a mayúsculas",
-	"editor.transformToLowercase": "Transformar a minúsculas"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/editor/contrib/linesOperations/linesOperations.i18n.json b/i18n/esn/src/vs/editor/contrib/linesOperations/linesOperations.i18n.json
deleted file mode 100644
index d78ec3a1de4..00000000000
--- a/i18n/esn/src/vs/editor/contrib/linesOperations/linesOperations.i18n.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"lines.copyUp": "Copiar línea arriba",
-	"lines.copyDown": "Copiar línea abajo",
-	"lines.moveUp": "Mover línea hacia arriba",
-	"lines.moveDown": "Mover línea hacia abajo",
-	"lines.sortAscending": "Ordenar líneas en orden ascendente",
-	"lines.sortDescending": "Ordenar líneas en orden descendente",
-	"lines.trimTrailingWhitespace": "Recortar espacio final",
-	"lines.delete": "Eliminar línea",
-	"lines.indent": "Sangría de línea",
-	"lines.outdent": "Anular sangría de línea",
-	"lines.insertBefore": "Insertar línea arriba",
-	"lines.insertAfter": "Insertar línea debajo",
-	"lines.deleteAllLeft": "Eliminar todo a la izquierda",
-	"lines.deleteAllRight": "Eliminar todo lo que está a la derecha",
-	"lines.joinLines": "Unir líneas",
-	"editor.transpose": "Transponer caracteres alrededor del cursor",
-	"editor.transformToUppercase": "Transformar a mayúsculas",
-	"editor.transformToLowercase": "Transformar a minúsculas"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/editor/contrib/links/browser/links.i18n.json b/i18n/esn/src/vs/editor/contrib/links/browser/links.i18n.json
deleted file mode 100644
index 22ba27230b5..00000000000
--- a/i18n/esn/src/vs/editor/contrib/links/browser/links.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"links.navigate.mac": "Cmd + clic para abrir el vínculo",
-	"links.navigate": "Ctrl + clic para abrir el vínculo",
-	"links.command.mac": "CMD + click para ejecutar el comando",
-	"links.command": "Ctrl + click para ejecutar el comando",
-	"links.navigate.al": "Alt + clic para seguir el vínculo",
-	"links.command.al": "Alt + clic para ejecutar el comando",
-	"invalid.url": "No se pudo abrir este vínculo porque no tiene un formato correcto: {0}",
-	"missing.url": "No se pudo abrir este vínculo porque falta el destino.",
-	"label": "Abrir vínculo"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/editor/contrib/links/links.i18n.json b/i18n/esn/src/vs/editor/contrib/links/links.i18n.json
deleted file mode 100644
index a7200dfc8a2..00000000000
--- a/i18n/esn/src/vs/editor/contrib/links/links.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"links.navigate.mac": "Cmd + clic para abrir el vínculo",
-	"links.navigate": "Ctrl + clic para abrir el vínculo",
-	"links.command.mac": "Cmd + click para ejecutar el comando",
-	"links.command": "Ctrl + click para ejecutar el comando",
-	"links.navigate.al.mac": "Opción + clic para seguir el enlace",
-	"links.navigate.al": "Alt + clic para seguir el vínculo",
-	"links.command.al.mac": "Opción + click para ejecutar el comando",
-	"links.command.al": "Alt + clic para ejecutar el comando",
-	"invalid.url": "No se pudo abrir este vínculo porque no tiene un formato correcto: {0}",
-	"missing.url": "No se pudo abrir este vínculo porque falta el destino.",
-	"label": "Abrir vínculo"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/editor/contrib/message/messageController.i18n.json b/i18n/esn/src/vs/editor/contrib/message/messageController.i18n.json
deleted file mode 100644
index e94c4a50a77..00000000000
--- a/i18n/esn/src/vs/editor/contrib/message/messageController.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"editor.readonly": "No se puede editar en un editor de sólo lectura"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/editor/contrib/multicursor/common/multicursor.i18n.json b/i18n/esn/src/vs/editor/contrib/multicursor/common/multicursor.i18n.json
deleted file mode 100644
index d5994146753..00000000000
--- a/i18n/esn/src/vs/editor/contrib/multicursor/common/multicursor.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"mutlicursor.insertAbove": "Agregar cursor arriba",
-	"mutlicursor.insertBelow": "Agregar cursor debajo",
-	"mutlicursor.insertAtEndOfEachLineSelected": "Añadir cursores a finales de línea",
-	"addSelectionToNextFindMatch": "Agregar selección hasta la siguiente coincidencia de búsqueda",
-	"addSelectionToPreviousFindMatch": "Agregar selección hasta la anterior coincidencia de búsqueda",
-	"moveSelectionToNextFindMatch": "Mover última selección hasta la siguiente coincidencia de búsqueda",
-	"moveSelectionToPreviousFindMatch": "Mover última selección hasta la anterior coincidencia de búsqueda",
-	"selectAllOccurrencesOfFindMatch": "Seleccionar todas las repeticiones de coincidencia de búsqueda",
-	"changeAll.label": "Cambiar todas las ocurrencias"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/editor/contrib/multicursor/multicursor.i18n.json b/i18n/esn/src/vs/editor/contrib/multicursor/multicursor.i18n.json
deleted file mode 100644
index 32eb1b8f998..00000000000
--- a/i18n/esn/src/vs/editor/contrib/multicursor/multicursor.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"mutlicursor.insertAbove": "Agregar cursor arriba",
-	"mutlicursor.insertBelow": "Agregar cursor debajo",
-	"mutlicursor.insertAtEndOfEachLineSelected": "Añadir cursores a finales de línea",
-	"addSelectionToNextFindMatch": "Agregar selección hasta la siguiente coincidencia de búsqueda",
-	"addSelectionToPreviousFindMatch": "Agregar selección hasta la anterior coincidencia de búsqueda",
-	"moveSelectionToNextFindMatch": "Mover última selección hasta la siguiente coincidencia de búsqueda",
-	"moveSelectionToPreviousFindMatch": "Mover última selección hasta la anterior coincidencia de búsqueda",
-	"selectAllOccurrencesOfFindMatch": "Seleccionar todas las repeticiones de coincidencia de búsqueda",
-	"changeAll.label": "Cambiar todas las ocurrencias"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/editor/contrib/parameterHints/browser/parameterHints.i18n.json b/i18n/esn/src/vs/editor/contrib/parameterHints/browser/parameterHints.i18n.json
deleted file mode 100644
index 4cd04b2e243..00000000000
--- a/i18n/esn/src/vs/editor/contrib/parameterHints/browser/parameterHints.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"parameterHints.trigger.label": "Sugerencias para parámetros Trigger"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/editor/contrib/parameterHints/browser/parameterHintsWidget.i18n.json b/i18n/esn/src/vs/editor/contrib/parameterHints/browser/parameterHintsWidget.i18n.json
deleted file mode 100644
index bd2e55282cd..00000000000
--- a/i18n/esn/src/vs/editor/contrib/parameterHints/browser/parameterHintsWidget.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"hint": "{0}, sugerencia"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/editor/contrib/parameterHints/parameterHints.i18n.json b/i18n/esn/src/vs/editor/contrib/parameterHints/parameterHints.i18n.json
deleted file mode 100644
index 46246394f82..00000000000
--- a/i18n/esn/src/vs/editor/contrib/parameterHints/parameterHints.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"parameterHints.trigger.label": "Sugerencias para parámetros Trigger"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/editor/contrib/parameterHints/parameterHintsWidget.i18n.json b/i18n/esn/src/vs/editor/contrib/parameterHints/parameterHintsWidget.i18n.json
deleted file mode 100644
index 2f6c7a0a6f3..00000000000
--- a/i18n/esn/src/vs/editor/contrib/parameterHints/parameterHintsWidget.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hint": "{0}, sugerencia"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/editor/contrib/quickFix/browser/quickFixCommands.i18n.json b/i18n/esn/src/vs/editor/contrib/quickFix/browser/quickFixCommands.i18n.json
deleted file mode 100644
index 6b4f1302755..00000000000
--- a/i18n/esn/src/vs/editor/contrib/quickFix/browser/quickFixCommands.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"quickFixWithKb": "Mostrar correcciones ({0})",
-	"quickFix": "Mostrar correcciones",
-	"quickfix.trigger.label": "Corrección rápida"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/editor/contrib/quickFix/quickFixCommands.i18n.json b/i18n/esn/src/vs/editor/contrib/quickFix/quickFixCommands.i18n.json
deleted file mode 100644
index 46db7e51be9..00000000000
--- a/i18n/esn/src/vs/editor/contrib/quickFix/quickFixCommands.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"quickFixWithKb": "Mostrar correcciones ({0})",
-	"quickFix": "Mostrar correcciones",
-	"quickfix.trigger.label": "Corrección rápida",
-	"refactor.label": "Refactorizar"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/editor/contrib/referenceSearch/browser/peekViewWidget.i18n.json b/i18n/esn/src/vs/editor/contrib/referenceSearch/browser/peekViewWidget.i18n.json
deleted file mode 100644
index 067249df5b1..00000000000
--- a/i18n/esn/src/vs/editor/contrib/referenceSearch/browser/peekViewWidget.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"label.close": "Cerrar"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/editor/contrib/referenceSearch/browser/referenceSearch.i18n.json b/i18n/esn/src/vs/editor/contrib/referenceSearch/browser/referenceSearch.i18n.json
deleted file mode 100644
index c2ee1b57887..00000000000
--- a/i18n/esn/src/vs/editor/contrib/referenceSearch/browser/referenceSearch.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"meta.titleReference": " – {0} referencias",
-	"references.action.label": "Buscar todas las referencias"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/editor/contrib/referenceSearch/browser/referencesController.i18n.json b/i18n/esn/src/vs/editor/contrib/referenceSearch/browser/referencesController.i18n.json
deleted file mode 100644
index 06859105445..00000000000
--- a/i18n/esn/src/vs/editor/contrib/referenceSearch/browser/referencesController.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"labelLoading": "Cargando..."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/editor/contrib/referenceSearch/browser/referencesModel.i18n.json b/i18n/esn/src/vs/editor/contrib/referenceSearch/browser/referencesModel.i18n.json
deleted file mode 100644
index 63882c346cc..00000000000
--- a/i18n/esn/src/vs/editor/contrib/referenceSearch/browser/referencesModel.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"aria.oneReference": "símbolo en {0} linea {1} en la columna {2}",
-	"aria.fileReferences.1": "1 símbolo en {0}, ruta de acceso completa {1}",
-	"aria.fileReferences.N": "{0} símbolos en {1}, ruta de acceso completa {2}",
-	"aria.result.0": "No se encontraron resultados",
-	"aria.result.1": "Encontró 1 símbolo en {0}",
-	"aria.result.n1": "Encontró {0} símbolos en {1}",
-	"aria.result.nm": "Encontró {0} símbolos en {1} archivos"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/editor/contrib/referenceSearch/browser/referencesWidget.i18n.json b/i18n/esn/src/vs/editor/contrib/referenceSearch/browser/referencesWidget.i18n.json
deleted file mode 100644
index 1e3309b1cf6..00000000000
--- a/i18n/esn/src/vs/editor/contrib/referenceSearch/browser/referencesWidget.i18n.json
+++ /dev/null
@@ -1,27 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"referencesFailre": "Error al resolver el archivo.",
-	"referencesCount": "{0} referencias",
-	"referenceCount": "{0} referencia",
-	"missingPreviewMessage": "vista previa no disponible",
-	"treeAriaLabel": "Referencias",
-	"noResults": "No hay resultados.",
-	"peekView.alternateTitle": "Referencias",
-	"peekViewTitleBackground": "Color de fondo del área de título de la vista de inspección.",
-	"peekViewTitleForeground": "Color del título de la vista de inpección.",
-	"peekViewTitleInfoForeground": "Color de la información del título de la vista de inspección.",
-	"peekViewBorder": "Color de los bordes y la flecha de la vista de inspección.",
-	"peekViewResultsBackground": "Color de fondo de la lista de resultados de vista de inspección.",
-	"peekViewResultsMatchForeground": "Color de primer plano de los nodos de inspección en la lista de resultados.",
-	"peekViewResultsFileForeground": "Color de primer plano de los archivos de inspección en la lista de resultados.",
-	"peekViewResultsSelectionBackground": "Color de fondo de la entrada seleccionada en la lista de resultados de vista de inspección.",
-	"peekViewResultsSelectionForeground": "Color de primer plano de la entrada seleccionada en la lista de resultados de vista de inspección.",
-	"peekViewEditorBackground": "Color de fondo del editor de vista de inspección.",
-	"peekViewEditorGutterBackground": "Color de fondo del margen en el editor de vista de inspección.",
-	"peekViewResultsMatchHighlight": "Buscar coincidencia con el color de resaltado de la lista de resultados de vista de inspección.",
-	"peekViewEditorMatchHighlight": "Buscar coincidencia del color de resultado del editor de vista de inspección."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/editor/contrib/referenceSearch/peekViewWidget.i18n.json b/i18n/esn/src/vs/editor/contrib/referenceSearch/peekViewWidget.i18n.json
deleted file mode 100644
index e0bfe1e3ec6..00000000000
--- a/i18n/esn/src/vs/editor/contrib/referenceSearch/peekViewWidget.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"label.close": "Cerrar"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/editor/contrib/referenceSearch/referenceSearch.i18n.json b/i18n/esn/src/vs/editor/contrib/referenceSearch/referenceSearch.i18n.json
deleted file mode 100644
index 4e50283f72a..00000000000
--- a/i18n/esn/src/vs/editor/contrib/referenceSearch/referenceSearch.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"meta.titleReference": " – {0} referencias",
-	"references.action.label": "Buscar todas las referencias"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/editor/contrib/referenceSearch/referencesController.i18n.json b/i18n/esn/src/vs/editor/contrib/referenceSearch/referencesController.i18n.json
deleted file mode 100644
index a727398ebc2..00000000000
--- a/i18n/esn/src/vs/editor/contrib/referenceSearch/referencesController.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"labelLoading": "Cargando..."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/editor/contrib/referenceSearch/referencesModel.i18n.json b/i18n/esn/src/vs/editor/contrib/referenceSearch/referencesModel.i18n.json
deleted file mode 100644
index a16ad06b60c..00000000000
--- a/i18n/esn/src/vs/editor/contrib/referenceSearch/referencesModel.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"aria.oneReference": "símbolo en {0} linea {1} en la columna {2}",
-	"aria.fileReferences.1": "1 símbolo en {0}, ruta de acceso completa {1}",
-	"aria.fileReferences.N": "{0} símbolos en {1}, ruta de acceso completa {2}",
-	"aria.result.0": "No se encontraron resultados",
-	"aria.result.1": "Encontró 1 símbolo en {0}",
-	"aria.result.n1": "Encontró {0} símbolos en {1}",
-	"aria.result.nm": "Encontró {0} símbolos en {1} archivos"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/editor/contrib/referenceSearch/referencesWidget.i18n.json b/i18n/esn/src/vs/editor/contrib/referenceSearch/referencesWidget.i18n.json
deleted file mode 100644
index 918112214f9..00000000000
--- a/i18n/esn/src/vs/editor/contrib/referenceSearch/referencesWidget.i18n.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"referencesFailre": "Error al resolver el archivo.",
-	"referencesCount": "{0} referencias",
-	"referenceCount": "{0} referencia",
-	"missingPreviewMessage": "vista previa no disponible",
-	"treeAriaLabel": "Referencias",
-	"noResults": "No hay resultados.",
-	"peekView.alternateTitle": "Referencias",
-	"peekViewTitleBackground": "Color de fondo del área de título de la vista de inspección.",
-	"peekViewTitleForeground": "Color del título de la vista de inpección.",
-	"peekViewTitleInfoForeground": "Color de la información del título de la vista de inspección.",
-	"peekViewBorder": "Color de los bordes y la flecha de la vista de inspección.",
-	"peekViewResultsBackground": "Color de fondo de la lista de resultados de vista de inspección.",
-	"peekViewResultsMatchForeground": "Color de primer plano de los nodos de inspección en la lista de resultados.",
-	"peekViewResultsFileForeground": "Color de primer plano de los archivos de inspección en la lista de resultados.",
-	"peekViewResultsSelectionBackground": "Color de fondo de la entrada seleccionada en la lista de resultados de vista de inspección.",
-	"peekViewResultsSelectionForeground": "Color de primer plano de la entrada seleccionada en la lista de resultados de vista de inspección.",
-	"peekViewEditorBackground": "Color de fondo del editor de vista de inspección.",
-	"peekViewEditorGutterBackground": "Color de fondo del margen en el editor de vista de inspección.",
-	"peekViewResultsMatchHighlight": "Buscar coincidencia con el color de resaltado de la lista de resultados de vista de inspección.",
-	"peekViewEditorMatchHighlight": "Buscar coincidencia del color de resultado del editor de vista de inspección.",
-	"peekViewEditorMatchHighlightBorder": "Hacer coincidir el borde resaltado en el editor de vista previa."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/editor/contrib/rename/browser/rename.i18n.json b/i18n/esn/src/vs/editor/contrib/rename/browser/rename.i18n.json
deleted file mode 100644
index 00a7dc4990e..00000000000
--- a/i18n/esn/src/vs/editor/contrib/rename/browser/rename.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"no result": "No hay ningún resultado.",
-	"aria": "Nombre cambiado correctamente de '{0}' a '{1}'. Resumen: {2}",
-	"rename.failed": "No se pudo cambiar el nombre.",
-	"rename.label": "Cambiar el nombre del símbolo"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/editor/contrib/rename/browser/renameInputField.i18n.json b/i18n/esn/src/vs/editor/contrib/rename/browser/renameInputField.i18n.json
deleted file mode 100644
index 86b4308b9d3..00000000000
--- a/i18n/esn/src/vs/editor/contrib/rename/browser/renameInputField.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"renameAriaLabel": "Cambie el nombre de la entrada. Escriba el nuevo nombre y presione Entrar para confirmar."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/editor/contrib/rename/rename.i18n.json b/i18n/esn/src/vs/editor/contrib/rename/rename.i18n.json
deleted file mode 100644
index 631896537a8..00000000000
--- a/i18n/esn/src/vs/editor/contrib/rename/rename.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"no result": "No hay ningún resultado.",
-	"aria": "Nombre cambiado correctamente de '{0}' a '{1}'. Resumen: {2}",
-	"rename.failed": "No se pudo cambiar el nombre.",
-	"rename.label": "Cambiar el nombre del símbolo"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/editor/contrib/rename/renameInputField.i18n.json b/i18n/esn/src/vs/editor/contrib/rename/renameInputField.i18n.json
deleted file mode 100644
index 001ff558f2a..00000000000
--- a/i18n/esn/src/vs/editor/contrib/rename/renameInputField.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"renameAriaLabel": "Cambie el nombre de la entrada. Escriba el nuevo nombre y presione Entrar para confirmar."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/editor/contrib/smartSelect/common/smartSelect.i18n.json b/i18n/esn/src/vs/editor/contrib/smartSelect/common/smartSelect.i18n.json
deleted file mode 100644
index e5a3dca5e22..00000000000
--- a/i18n/esn/src/vs/editor/contrib/smartSelect/common/smartSelect.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"smartSelect.grow": "Expandir selección",
-	"smartSelect.shrink": "Reducir selección"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/editor/contrib/smartSelect/smartSelect.i18n.json b/i18n/esn/src/vs/editor/contrib/smartSelect/smartSelect.i18n.json
deleted file mode 100644
index f6d7c333617..00000000000
--- a/i18n/esn/src/vs/editor/contrib/smartSelect/smartSelect.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"smartSelect.grow": "Expandir selección",
-	"smartSelect.shrink": "Reducir selección"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/editor/contrib/snippet/snippetVariables.i18n.json b/i18n/esn/src/vs/editor/contrib/snippet/snippetVariables.i18n.json
deleted file mode 100644
index 22631072b43..00000000000
--- a/i18n/esn/src/vs/editor/contrib/snippet/snippetVariables.i18n.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"Sunday": "Domingo",
-	"Monday": "Lunes",
-	"Tuesday": "Martes",
-	"Wednesday": "Miércoles",
-	"Thursday": "Jueves",
-	"Friday": "Viernes",
-	"Saturday": "Sábado",
-	"SundayShort": "Dom",
-	"MondayShort": "Lun",
-	"TuesdayShort": "Mar",
-	"WednesdayShort": "Mié",
-	"ThursdayShort": "Jue",
-	"FridayShort": "Vie",
-	"SaturdayShort": "Sáb",
-	"January": "Enero",
-	"February": "Febrero",
-	"March": "Marzo",
-	"April": "Abril",
-	"May": "Mayo",
-	"June": "Junio",
-	"July": "Julio",
-	"August": "Agosto",
-	"September": "Septiembre",
-	"October": "Octubre",
-	"November": "Noviembre",
-	"December": "Diciembre",
-	"JanuaryShort": "Ene",
-	"FebruaryShort": "Feb",
-	"MarchShort": "Mar",
-	"AprilShort": "Abr",
-	"MayShort": "May",
-	"JuneShort": "Jun",
-	"JulyShort": "Jul",
-	"AugustShort": "Ago",
-	"SeptemberShort": "Sep",
-	"OctoberShort": "Oct",
-	"NovemberShort": "Noviembre",
-	"DecemberShort": "Dic"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/editor/contrib/suggest/browser/suggestController.i18n.json b/i18n/esn/src/vs/editor/contrib/suggest/browser/suggestController.i18n.json
deleted file mode 100644
index e651f27c586..00000000000
--- a/i18n/esn/src/vs/editor/contrib/suggest/browser/suggestController.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"arai.alert.snippet": "Aceptando '{0}' Insertó el siguente texto : {1}",
-	"suggest.trigger.label": "Sugerencias para Trigger"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/editor/contrib/suggest/browser/suggestWidget.i18n.json b/i18n/esn/src/vs/editor/contrib/suggest/browser/suggestWidget.i18n.json
deleted file mode 100644
index bf3d8015426..00000000000
--- a/i18n/esn/src/vs/editor/contrib/suggest/browser/suggestWidget.i18n.json
+++ /dev/null
@@ -1,21 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"editorSuggestWidgetBackground": "Color de fondo del widget sugerido.",
-	"editorSuggestWidgetBorder": "Color de borde del widget sugerido.",
-	"editorSuggestWidgetForeground": "Color de primer plano del widget sugerido.",
-	"editorSuggestWidgetSelectedBackground": "Color de fondo de la entrada seleccionada del widget sugerido.",
-	"editorSuggestWidgetHighlightForeground": "Color del resaltado coincidido en el widget sugerido.",
-	"readMore": "Leer más...{0}",
-	"suggestionWithDetailsAriaLabel": "{0}, sugerencia, con detalles",
-	"suggestionAriaLabel": "{0}, sugerencia",
-	"readLess": "Leer menos...{0}",
-	"suggestWidget.loading": "Cargando...",
-	"suggestWidget.noSuggestions": "No hay sugerencias.",
-	"suggestionAriaAccepted": "{0}, aceptada",
-	"ariaCurrentSuggestionWithDetails": "{0}, sugerencia, con detalles",
-	"ariaCurrentSuggestion": "{0}, sugerencia"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/editor/contrib/suggest/suggestController.i18n.json b/i18n/esn/src/vs/editor/contrib/suggest/suggestController.i18n.json
deleted file mode 100644
index 4f546aeab35..00000000000
--- a/i18n/esn/src/vs/editor/contrib/suggest/suggestController.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"arai.alert.snippet": "Aceptando '{0}' Insertó el siguente texto : {1}",
-	"suggest.trigger.label": "Sugerencias para Trigger"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/editor/contrib/suggest/suggestWidget.i18n.json b/i18n/esn/src/vs/editor/contrib/suggest/suggestWidget.i18n.json
deleted file mode 100644
index b6f6680c099..00000000000
--- a/i18n/esn/src/vs/editor/contrib/suggest/suggestWidget.i18n.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"editorSuggestWidgetBackground": "Color de fondo del widget sugerido.",
-	"editorSuggestWidgetBorder": "Color de borde del widget sugerido.",
-	"editorSuggestWidgetForeground": "Color de primer plano del widget sugerido.",
-	"editorSuggestWidgetSelectedBackground": "Color de fondo de la entrada seleccionada del widget sugerido.",
-	"editorSuggestWidgetHighlightForeground": "Color del resaltado coincidido en el widget sugerido.",
-	"readMore": "Leer más...{0}",
-	"suggestionWithDetailsAriaLabel": "{0}, sugerencia, con detalles",
-	"suggestionAriaLabel": "{0}, sugerencia",
-	"readLess": "Leer menos...{0}",
-	"suggestWidget.loading": "Cargando...",
-	"suggestWidget.noSuggestions": "No hay sugerencias.",
-	"suggestionAriaAccepted": "{0}, aceptada",
-	"ariaCurrentSuggestionWithDetails": "{0}, sugerencia, con detalles",
-	"ariaCurrentSuggestion": "{0}, sugerencia"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/editor/contrib/toggleTabFocusMode/common/toggleTabFocusMode.i18n.json b/i18n/esn/src/vs/editor/contrib/toggleTabFocusMode/common/toggleTabFocusMode.i18n.json
deleted file mode 100644
index 2349a0a8514..00000000000
--- a/i18n/esn/src/vs/editor/contrib/toggleTabFocusMode/common/toggleTabFocusMode.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"toggle.tabMovesFocus": "Alternar tecla de tabulación para mover el punto de atención"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/editor/contrib/toggleTabFocusMode/toggleTabFocusMode.i18n.json b/i18n/esn/src/vs/editor/contrib/toggleTabFocusMode/toggleTabFocusMode.i18n.json
deleted file mode 100644
index c54f5a0a63b..00000000000
--- a/i18n/esn/src/vs/editor/contrib/toggleTabFocusMode/toggleTabFocusMode.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggle.tabMovesFocus": "Alternar tecla de tabulación para mover el punto de atención"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/editor/contrib/wordHighlighter/common/wordHighlighter.i18n.json b/i18n/esn/src/vs/editor/contrib/wordHighlighter/common/wordHighlighter.i18n.json
deleted file mode 100644
index ce1db0c57f2..00000000000
--- a/i18n/esn/src/vs/editor/contrib/wordHighlighter/common/wordHighlighter.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"wordHighlight": "Color de fondo de un símbolo durante el acceso de lectura; por ejemplo, cuando se lee una variable.",
-	"wordHighlightStrong": "Color de fondo de un símbolo durante el acceso de escritura; por ejemplo, cuando se escribe una variable.",
-	"overviewRulerWordHighlightForeground": "Color de marcador de regla de información general para símbolos resaltados.",
-	"overviewRulerWordHighlightStrongForeground": "Color de marcador de regla de información general para símbolos de acceso de escritura resaltados. ",
-	"wordHighlight.next.label": "Ir al siguiente símbolo destacado",
-	"wordHighlight.previous.label": "Ir al símbolo destacado anterior"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json b/i18n/esn/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
deleted file mode 100644
index 502886a6ec8..00000000000
--- a/i18n/esn/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"wordHighlight": "Color de fondo de un símbolo durante el acceso de lectura, como leer una variable. El color no debe ser opaco para no ocultar las decoraciones subyacentes.",
-	"wordHighlightStrong": "Color de fondo de un símbolo durante el acceso de escritura, como escribir en una variable. El color no debe ser opaco para no ocultar las decoraciones subyacentes.",
-	"wordHighlightBorder": "Color de fondo de un símbolo durante el acceso de lectura; por ejemplo, cuando se lee una variable.",
-	"wordHighlightStrongBorder": "Color de fondo de un símbolo durante el acceso de escritura; por ejemplo, cuando se escribe una variable.",
-	"overviewRulerWordHighlightForeground": "Destaca el color del marcador para los puntos del símbolo. El color no debe ser opaco para no ocultar las decoraciones subyacentes.",
-	"overviewRulerWordHighlightStrongForeground": "Destaca el color del marcador de acceso de escritura. El color no debe ser opaco para no ocultar las decoraciones subyacentes.",
-	"wordHighlight.next.label": "Ir al siguiente símbolo destacado",
-	"wordHighlight.previous.label": "Ir al símbolo destacado anterior"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/editor/contrib/zoneWidget/browser/peekViewWidget.i18n.json b/i18n/esn/src/vs/editor/contrib/zoneWidget/browser/peekViewWidget.i18n.json
deleted file mode 100644
index 067249df5b1..00000000000
--- a/i18n/esn/src/vs/editor/contrib/zoneWidget/browser/peekViewWidget.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"label.close": "Cerrar"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/editor/electron-browser/textMate/TMSyntax.i18n.json b/i18n/esn/src/vs/editor/electron-browser/textMate/TMSyntax.i18n.json
deleted file mode 100644
index 431db97694e..00000000000
--- a/i18n/esn/src/vs/editor/electron-browser/textMate/TMSyntax.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"invalid.language": "Lenguaje desconocido en \"contributes.{0}.language\". Valor proporcionado: {1}",
-	"invalid.scopeName": "Se esperaba una cadena en \"contributes.{0}.scopeName\". Valor proporcionado: {1}",
-	"invalid.path.0": "Se esperaba una cadena en \"contributes.{0}.path\". Valor proporcionado: {1}",
-	"invalid.injectTo": "Valor no válido en `contributes.{0}.injectTo`. Debe ser una matriz de nombres de ámbito de lenguaje. Valor proporcionado: {1}",
-	"invalid.embeddedLanguages": "Valor no válido en \"contributes.{0}.embeddedLanguages\". Debe ser una asignación de objeto del nombre del ámbito al lenguaje. Valor proporcionado: {1}",
-	"invalid.path.1": "Se esperaba que \"contributes.{0}.path\" ({1}) se incluyera en la carpeta de la extensión ({2}). Esto puede hacer que la extensión no sea portátil.",
-	"no-tm-grammar": "No hay ninguna gramática de TM registrada para este lenguaje."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/editor/node/languageConfigurationExtensionPoint.i18n.json b/i18n/esn/src/vs/editor/node/languageConfigurationExtensionPoint.i18n.json
deleted file mode 100644
index 43ec87cbde1..00000000000
--- a/i18n/esn/src/vs/editor/node/languageConfigurationExtensionPoint.i18n.json
+++ /dev/null
@@ -1,23 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"parseErrors": "Errores al analizar {0}: {1}",
-	"schema.openBracket": "Secuencia de cadena o corchete de apertura.",
-	"schema.closeBracket": "Secuencia de cadena o corchete de cierre.",
-	"schema.comments": "Define los símbolos de comentario",
-	"schema.blockComments": "Define cómo se marcan los comentarios de bloque.",
-	"schema.blockComment.begin": "Secuencia de caracteres que inicia un comentario de bloque.",
-	"schema.blockComment.end": "Secuencia de caracteres que finaliza un comentario de bloque.",
-	"schema.lineComment": "Secuencia de caracteres que inicia un comentario de línea.",
-	"schema.brackets": "Define los corchetes que aumentan o reducen la sangría.",
-	"schema.autoClosingPairs": "Define el par de corchetes. Cuando se escribe un corchete de apertura, se inserta automáticamente el corchete de cierre.",
-	"schema.autoClosingPairs.notIn": "Define una lista de ámbitos donde los pares automáticos están deshabilitados.",
-	"schema.surroundingPairs": "Define los pares de corchetes que se pueden usar para encerrar una cadena seleccionada.",
-	"schema.wordPattern": " La definición de la palabra en el idioma.",
-	"schema.wordPattern.pattern": "El patrón de expresión regular utilizado para localizar palabras.",
-	"schema.wordPattern.flags": "Los flags de expresión regular utilizados para localizar palabras.",
-	"schema.wordPattern.flags.errorMessage": "Debe coincidir con el patrón `/^([gimuy]+)$/`."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/editor/node/textMate/TMGrammars.i18n.json b/i18n/esn/src/vs/editor/node/textMate/TMGrammars.i18n.json
deleted file mode 100644
index bca2124994e..00000000000
--- a/i18n/esn/src/vs/editor/node/textMate/TMGrammars.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"vscode.extension.contributes.grammars": "Aporta tokenizadores de TextMate.",
-	"vscode.extension.contributes.grammars.language": "Identificador del lenguaje para el que se aporta esta sintaxis.",
-	"vscode.extension.contributes.grammars.scopeName": "Nombre del ámbito de TextMate que usa el archivo tmLanguage.",
-	"vscode.extension.contributes.grammars.path": "Ruta de acceso del archivo tmLanguage. La ruta es relativa a la carpeta de extensión y normalmente empieza por \"./syntaxes/\".",
-	"vscode.extension.contributes.grammars.embeddedLanguages": "Asignación de un nombre de ámbito al identificador de lenguaje si esta gramática contiene lenguajes incrustados.",
-	"vscode.extension.contributes.grammars.injectTo": "Lista de nombres de ámbito de lenguaje al que se inyecta esta gramática."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/platform/actions/browser/menuItemActionItem.i18n.json b/i18n/esn/src/vs/platform/actions/browser/menuItemActionItem.i18n.json
deleted file mode 100644
index 0d4e76110bb..00000000000
--- a/i18n/esn/src/vs/platform/actions/browser/menuItemActionItem.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"titleAndKb": "{0} ({1})"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json b/i18n/esn/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
deleted file mode 100644
index ebca59c681c..00000000000
--- a/i18n/esn/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"requirearray": "los elementos de menú deben ser una colección",
-	"requirestring": "la propiedad `{0}` es obligatoria y debe ser de tipo \"string\"",
-	"optstring": "la propiedad `{0}` se puede omitir o debe ser de tipo \"string\"",
-	"vscode.extension.contributes.menuItem.command": "El identificador del comando que se ejecutará. El comando se debe declarar en la sección 'commands'",
-	"vscode.extension.contributes.menuItem.alt": "El identificador de un comando alternativo que se usará. El comando se debe declarar en la sección 'commands'",
-	"vscode.extension.contributes.menuItem.when": "Condición que se debe cumplir para mostrar este elemento",
-	"vscode.extension.contributes.menuItem.group": "Grupo al que pertenece este comando",
-	"vscode.extension.contributes.menus": "Contribuye con elementos de menú al editor",
-	"menus.commandPalette": "La paleta de comandos",
-	"menus.touchBar": "Barra táctil (sólo macOS)",
-	"menus.editorTitle": "El menú de título del editor",
-	"menus.editorContext": "El menú contextual del editor",
-	"menus.explorerContext": "El menú contextual del explorador de archivos",
-	"menus.editorTabContext": "El menú contextual de pestañas del editor",
-	"menus.debugCallstackContext": "El menú contextual de la pila de llamadas de depuración",
-	"menus.scmTitle": "El menú del título Control de código fuente",
-	"menus.scmSourceControl": "El menú de Control de código fuente",
-	"menus.resourceGroupContext": "El menú contextual del grupo de recursos de Control de código fuente",
-	"menus.resourceStateContext": "El menú contextual de estado de recursos de Control de código fuente",
-	"view.viewTitle": "El menú de título de vista contribuida",
-	"view.itemContext": "El menú contextual del elemento de vista contribuida",
-	"nonempty": "se esperaba un valor no vacío.",
-	"opticon": "la propiedad `icon` se puede omitir o debe ser una cadena o un literal como `{dark, light}`",
-	"requireStringOrObject": "La propiedad \"{0}\" es obligatoria y debe ser de tipo \"string\" u \"object\"",
-	"requirestrings": "Las propiedades \"{0}\" y \"{1}\" son obligatorias y deben ser de tipo \"string\"",
-	"vscode.extension.contributes.commandType.command": "Identificador del comando que se va a ejecutar",
-	"vscode.extension.contributes.commandType.title": "Título con el que se representa el comando en la interfaz de usuario",
-	"vscode.extension.contributes.commandType.category": "(Opcional) la cadena de categoría se agrupa por el comando en la interfaz de usuario",
-	"vscode.extension.contributes.commandType.icon": "(Opcional) El icono que se usa para representar el comando en la UI. Ya sea una ruta de acceso al archivo o una configuración con temas",
-	"vscode.extension.contributes.commandType.icon.light": "Ruta del icono cuando se usa un tema claro",
-	"vscode.extension.contributes.commandType.icon.dark": "Ruta del icono cuando se usa un tema oscuro",
-	"vscode.extension.contributes.commands": "Aporta comandos a la paleta de comandos.",
-	"dup": "El comando `{0}` aparece varias veces en la sección 'commands'.",
-	"menuId.invalid": "`{0}` no es un identificador de menú válido",
-	"missing.command": "El elemento de menú hace referencia a un comando `{0}` que no está definido en la sección 'commands'.",
-	"missing.altCommand": "El elemento de menú hace referencia a un comando alternativo `{0}` que no está definido en la sección 'commands'.",
-	"dupe.command": "El elemento de menú hace referencia al mismo comando que el comando predeterminado y el comando alternativo"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/platform/configuration/common/configurationRegistry.i18n.json b/i18n/esn/src/vs/platform/configuration/common/configurationRegistry.i18n.json
deleted file mode 100644
index cacd12ff69a..00000000000
--- a/i18n/esn/src/vs/platform/configuration/common/configurationRegistry.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"defaultConfigurations.title": "La configuración predeterminada se reemplaza",
-	"overrideSettings.description": "Establecer los valores de configuración que se reemplazarán para el lenguaje {0}.",
-	"overrideSettings.defaultDescription": "Establecer los valores de configuración que se reemplazarán para un lenguaje.",
-	"config.property.languageDefault": "No se puede registrar \"{0}\". Coincide con el patrón de propiedad '\\\\[.*\\\\]$' para describir la configuración del editor específica del lenguaje. Utilice la contribución \"configurationDefaults\".",
-	"config.property.duplicate": "No se puede registrar \"{0}\". Esta propiedad ya está registrada."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/platform/dialogs/common/dialogs.i18n.json b/i18n/esn/src/vs/platform/dialogs/common/dialogs.i18n.json
deleted file mode 100644
index cf1d1d7ad84..00000000000
--- a/i18n/esn/src/vs/platform/dialogs/common/dialogs.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"moreFile": "...1 archivo más que no se muestra",
-	"moreFiles": "...{0} archivos más que no se muestran"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/platform/dialogs/node/dialogService.i18n.json b/i18n/esn/src/vs/platform/dialogs/node/dialogService.i18n.json
deleted file mode 100644
index 4a277edc564..00000000000
--- a/i18n/esn/src/vs/platform/dialogs/node/dialogService.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"cancel": "Cancelar"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/platform/environment/node/argv.i18n.json b/i18n/esn/src/vs/platform/environment/node/argv.i18n.json
deleted file mode 100644
index b4899e15c5b..00000000000
--- a/i18n/esn/src/vs/platform/environment/node/argv.i18n.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"gotoValidation": "Los argumentos del modo \"--goto\" deben tener el formato \"ARCHIVO(:LÍNEA(:CARÁCTER))\".",
-	"diff": "Comparar dos archivos entre sí.",
-	"add": "Agregar carpetas a la última ventana activa.",
-	"goto": "Abrir un archivo en la ruta de acceso de la línea y posición de carácter especificadas.",
-	"newWindow": "Fuerza para abrir una nueva ventana.",
-	"reuseWindow": "Forzar para abrir un archivo o carpeta en la última ventana activa.",
-	"wait": "Espere a que los archivos sean cerrados antes de volver.",
-	"locale": "La configuración regional que se usará (por ejemplo, en-US o zh-TW).",
-	"userDataDir": "Especifica el directorio donde se guardan los datos del usuario. Se puede utilizar para abrir varias instancias de código distintas.",
-	"version": "Versión de impresión.",
-	"help": "Imprima el uso.",
-	"extensionHomePath": "Establezca la ruta de acceso raíz para las extensiones.",
-	"listExtensions": "Enumere las extensiones instaladas.",
-	"showVersions": "Muestra las versiones de las extensiones instaladas cuando se usa --list-extension.",
-	"installExtension": "Instala una extensión.",
-	"uninstallExtension": "Desinstala una extensión.",
-	"experimentalApis": "Permite las funciones de API propuestas para una extensión.",
-	"verbose": "Imprima salidas detalladas (implica --wait).",
-	"log": "Nivel de registro a utilizar. Por defecto es 'info'. Los valores permitidos son 'critical', 'error', 'warn', 'info', 'debug', 'trace', 'off'.",
-	"status": "Imprimir el uso del proceso y la información de diagnóstico.",
-	"performance": "Comience con el comando 'Developer: Startup Performance' habilitado.",
-	"prof-startup": "Ejecutar generador de perfiles de CPU durante el inicio",
-	"disableExtensions": "Deshabilite todas las extensiones instaladas.",
-	"inspect-extensions": "Permite perfilar y depurar las extensiones. Revise las herramientas de desarrollador para la conexión URI.",
-	"inspect-brk-extensions": "Permite perfilar y depurar las extensiones con el host de la extensión pausado después de iniciar. Revise las herramientas de desarrollador para la conexión URI. ",
-	"disableGPU": "Deshabilita la aceleración de hardware de GPU.",
-	"uploadLogs": "Carga los registros de la sesión actual a un extremo.",
-	"maxMemory": "Tamaño máximo de memoria para una ventana (en Mbytes).",
-	"usage": "Uso",
-	"options": "opciones",
-	"paths": "rutas de acceso",
-	"stdinWindows": "Para leer la salida de otro programa, añadir '-' (por ejemplo, ' echo Hello World | {0}-')",
-	"stdinUnix": "Para leer de stdin, añadir '-' (por ejemplo, ' ps aux | grep código | {0}-')",
-	"optionsUpperCase": "Opciones",
-	"extensionsManagement": "Gestión de extensiones",
-	"troubleshooting": "Solución de problemas"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/platform/extensionManagement/common/extensionEnablementService.i18n.json b/i18n/esn/src/vs/platform/extensionManagement/common/extensionEnablementService.i18n.json
deleted file mode 100644
index ed5e7e55589..00000000000
--- a/i18n/esn/src/vs/platform/extensionManagement/common/extensionEnablementService.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noWorkspace": "No hay ningún área de trabajo."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/platform/extensionManagement/common/extensionManagement.i18n.json b/i18n/esn/src/vs/platform/extensionManagement/common/extensionManagement.i18n.json
deleted file mode 100644
index 158bbbe7573..00000000000
--- a/i18n/esn/src/vs/platform/extensionManagement/common/extensionManagement.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"extensions": "Extensiones",
-	"preferences": "Preferencias"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/platform/extensionManagement/node/extensionGalleryService.i18n.json b/i18n/esn/src/vs/platform/extensionManagement/node/extensionGalleryService.i18n.json
deleted file mode 100644
index fedd8a0a642..00000000000
--- a/i18n/esn/src/vs/platform/extensionManagement/node/extensionGalleryService.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"notCompatibleDownload": "No se puede descargar porque no se encuentra la extensión compatible con la versión actual '{0}' de VS Code."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json b/i18n/esn/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
deleted file mode 100644
index 862953cea1c..00000000000
--- a/i18n/esn/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"invalidManifest": "Extensión no válida: package.json no es un archivo JSON.",
-	"incompatible": "No se puede instalar la extensión ' {0} ', ya que no es compatible con el código ' {1} '.",
-	"restartCode": "Reinicie Code antes de volver a instalar {0}.",
-	"installingOutdatedExtension": "Una versión más nueva de esta extensión ya está instalada. ¿Desea anular esto con la versión anterior?",
-	"override": "Anular",
-	"cancel": "Cancelar",
-	"errorInstallingDependencies": "Error instalando dependencias. {0}",
-	"MarketPlaceDisabled": "Marketplace no está habilitado",
-	"removeError": "Error al quitar la extensión: {0}. Salga e inicie VS Code antes de intentarlo de nuevo.",
-	"Not a Marketplace extension": "Sólo se pueden reinstalar Extensiones del Marketplace",
-	"notFoundCompatible": "No se pueden instalar '{0}'; no hay ninguna versión disponible compatible con VS Code '{1}'. ",
-	"malicious extension": "No se puede instalar la extensión ya que se informó que era problemático.",
-	"notFoundCompatibleDependency": "No se puede instalar porque no se encuentra la extensión dependiente '{0}' compatible con la versión actual '{1}' del VS Code.",
-	"quitCode": "No se puede instalar la extensión. Por favor, salga e inicie VS Code antes de reinstalarlo. ",
-	"exitCode": "No se puede instalar la extensión. Por favor, salga e inicie VS Code antes de reinstalarlo. ",
-	"renameError": "Error desconocido al cambiar el nombre de {0} a {1}",
-	"uninstallDependeciesConfirmation": "¿Quiere desinstalar solo '{0}' o también sus dependencias?",
-	"uninstallOnly": "Sólo extensión",
-	"uninstallAll": "Desinstalar todo",
-	"singleDependentError": "No se puede desinstalar la extensión '{0}'. La extensión '{1}' depende de esta.",
-	"twoDependentsError": "No se puede desinstalar la extensión '{0}'. Las extensiones '{1}' y '{2}' dependen de esta.",
-	"multipleDependentsError": "No se puede desinstalar la extensión '{0}'. Las extensiones '{1}' y '{2}', entre otras, dependen de esta.",
-	"notExists": "No se encontró la extensión."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/platform/extensions/common/abstractExtensionService.i18n.json b/i18n/esn/src/vs/platform/extensions/common/abstractExtensionService.i18n.json
deleted file mode 100644
index 2f9d0b3805c..00000000000
--- a/i18n/esn/src/vs/platform/extensions/common/abstractExtensionService.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"unknownDep": "La extensión `{1}` no se pudo activar. Motivo: dependencia `{0}` desconocida.",
-	"failedDep1": "La extensión `{1}` no se pudo activar. Motivo: La dependencia `{0}` no se pudo activar.",
-	"failedDep2": "La extensión `{0}` no se pudo activar. Motivo: más de 10 niveles de dependencias (probablemente sea un bucle de dependencias).",
-	"activationError": "Error al activar la extensión `{0}`: {1}."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/platform/extensions/common/extensionsRegistry.i18n.json b/i18n/esn/src/vs/platform/extensions/common/extensionsRegistry.i18n.json
deleted file mode 100644
index c6e20a5fff0..00000000000
--- a/i18n/esn/src/vs/platform/extensions/common/extensionsRegistry.i18n.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.engines.vscode": "Para las extensiones de VS Code, especifica la versión de VS Code con la que la extensión es compatible. No puede ser *. Por ejemplo: ^0.10.5 indica compatibilidad con una versión de VS Code mínima de 0.10.5.",
-	"vscode.extension.publisher": "El publicador de la extensión VS Code.",
-	"vscode.extension.displayName": "Nombre para mostrar de la extensión que se usa en la galería de VS Code.",
-	"vscode.extension.categories": "Categorías que usa la galería de VS Code para clasificar la extensión.",
-	"vscode.extension.galleryBanner": "Banner usado en VS Code Marketplace.",
-	"vscode.extension.galleryBanner.color": "Color del banner en el encabezado de página de VS Code Marketplace.",
-	"vscode.extension.galleryBanner.theme": "Tema de color de la fuente que se usa en el banner.",
-	"vscode.extension.contributes": "Todas las contribuciones de la extensión VS Code representadas por este paquete.",
-	"vscode.extension.preview": "Establece la extensión que debe marcarse como versión preliminar en Marketplace.",
-	"vscode.extension.activationEvents": "Eventos de activación de la extensión VS Code.",
-	"vscode.extension.activationEvents.onLanguage": "Un evento de activación emitido cada vez que se abre un archivo que se resuelve en el idioma especificado.",
-	"vscode.extension.activationEvents.onCommand": "Un evento de activación emitido cada vez que se invoca el comando especificado.",
-	"vscode.extension.activationEvents.onDebug": "Un evento de activación emitido cada vez que un usuario está a punto de iniciar la depuración o cada vez que está a punto de configurar las opciones de depuración.",
-	"vscode.extension.activationEvents.onDebugInitialConfigurations": "Un evento de activación emitido cada vez que se necesite crear un \"launch.json\" (y se necesite llamar a todos los métodos provideDebugConfigurations).",
-	"vscode.extension.activationEvents.onDebugResolve": "Un evento de activación emitido cada vez que esté a punto de ser iniciada una sesión de depuración con el tipo específico (y se necesite llamar al método resolveDebugConfiguration correspondiente).",
-	"vscode.extension.activationEvents.workspaceContains": "Un evento de activación emitido cada vez que se abre una carpeta que contiene al menos un archivo que coincide con el patrón global especificado.",
-	"vscode.extension.activationEvents.onView": "Un evento de activación emitido cada vez que se expande la vista especificada.",
-	"vscode.extension.activationEvents.star": "Un evento de activación emitido al inicio de VS Code. Para garantizar una buena experiencia para el usuario final, use este evento de activación en su extensión solo cuando no le sirva ninguna otra combinación de eventos de activación en su caso.",
-	"vscode.extension.badges": "Matriz de distintivos que se muestran en la barra lateral de la página de extensiones de Marketplace.",
-	"vscode.extension.badges.url": "URL de la imagen del distintivo.",
-	"vscode.extension.badges.href": "Vínculo del distintivo.",
-	"vscode.extension.badges.description": "Descripción del distintivo.",
-	"vscode.extension.extensionDependencies": "Dependencias a otras extensiones. El identificador de una extensión siempre es ${publisher}.${name}. Por ejemplo: vscode.csharp.",
-	"vscode.extension.scripts.prepublish": "Script que se ejecuta antes de publicar el paquete como extensión VS Code.",
-	"vscode.extension.icon": "Ruta de acceso a un icono de 128 x 128 píxeles."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/platform/extensions/node/extensionValidator.i18n.json b/i18n/esn/src/vs/platform/extensions/node/extensionValidator.i18n.json
deleted file mode 100644
index c38e957e55c..00000000000
--- a/i18n/esn/src/vs/platform/extensions/node/extensionValidator.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"versionSyntax": "No se pudo analizar el valor de ' engines.vscode ' {0}. Utilice, por ejemplo: ^ 1.22.0, ^ 1.22. x, etc.",
-	"versionSpecificity1": "La versión indicada en \"engines.vscode\" ({0}) no es suficientemente específica. Para las versiones de vscode anteriores a la 1.0.0, defina como mínimo la versión principal y secundaria deseadas. Por ejemplo: ^0.10.0, 0.10.x, 0.11.0, etc.",
-	"versionSpecificity2": "La versión indicada en \"engines.vscode\" ({0}) no es suficientemente específica. Para las versiones de vscode posteriores a la 1.0.0, defina como mínimo la versión principal deseada. Por ejemplo: ^1.10.0, 1.10.x, 1.x.x, 2.x.x, etc.",
-	"versionMismatch": "La extensión no es compatible con {0} de Code y requiere: {1}."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/platform/history/electron-main/historyMainService.i18n.json b/i18n/esn/src/vs/platform/history/electron-main/historyMainService.i18n.json
deleted file mode 100644
index 8c46100b7dc..00000000000
--- a/i18n/esn/src/vs/platform/history/electron-main/historyMainService.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"newWindow": "Nueva ventana",
-	"newWindowDesc": "Abre una ventana nueva.",
-	"recentFolders": "áreas de trabajo recientes",
-	"folderDesc": "{0} {1}",
-	"codeWorkspace": "Código de área de trabajo"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/platform/integrity/node/integrityServiceImpl.i18n.json b/i18n/esn/src/vs/platform/integrity/node/integrityServiceImpl.i18n.json
deleted file mode 100644
index 97c37f2a269..00000000000
--- a/i18n/esn/src/vs/platform/integrity/node/integrityServiceImpl.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"integrity.prompt": "La instalación de {0} parece estar dañada. Vuelva a instalar.",
-	"integrity.moreInformation": "Más información",
-	"integrity.dontShowAgain": "No volver a mostrar"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/platform/issue/electron-main/issueService.i18n.json b/i18n/esn/src/vs/platform/issue/electron-main/issueService.i18n.json
deleted file mode 100644
index 4d4a5d77f97..00000000000
--- a/i18n/esn/src/vs/platform/issue/electron-main/issueService.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"issueReporter": "Reportero de tema",
-	"processExplorer": "Explorador de Procesos"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/platform/jsonschemas/common/jsonValidationExtensionPoint.i18n.json b/i18n/esn/src/vs/platform/jsonschemas/common/jsonValidationExtensionPoint.i18n.json
deleted file mode 100644
index 526cfc2561e..00000000000
--- a/i18n/esn/src/vs/platform/jsonschemas/common/jsonValidationExtensionPoint.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"contributes.jsonValidation": "Aporta la configuración del esquema JSON.",
-	"contributes.jsonValidation.fileMatch": "Patrón de archivo para buscar coincidencias, por ejemplo, \"package.json\" o \"*.launch\".",
-	"contributes.jsonValidation.url": "Dirección URL de esquema ('http:', 'https:') o ruta de acceso relativa a la carpeta de extensión ('./').",
-	"invalid.jsonValidation": "configuration.jsonValidation debe ser una matriz",
-	"invalid.fileMatch": "configuration.jsonValidation.fileMatch debe haberse definido",
-	"invalid.url": "configuration.jsonValidation.url debe ser una dirección URL o una ruta de acceso relativa",
-	"invalid.url.fileschema": "configuration.jsonValidation.url es una dirección URL relativa no válida: {0}",
-	"invalid.url.schema": "configuration.jsonValidation.url debe empezar por \"http:\", \"https:\" o \"./\" para hacer referencia a los esquemas ubicados en la extensión"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/platform/keybinding/common/abstractKeybindingService.i18n.json b/i18n/esn/src/vs/platform/keybinding/common/abstractKeybindingService.i18n.json
deleted file mode 100644
index 6e18d6ddb14..00000000000
--- a/i18n/esn/src/vs/platform/keybinding/common/abstractKeybindingService.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"first.chord": "Se presionó ({0}). Esperando la siguiente tecla...",
-	"missing.chord": "La combinación de teclas ({0}, {1}) no es ningún comando."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/platform/keybinding/common/keybindingLabels.i18n.json b/i18n/esn/src/vs/platform/keybinding/common/keybindingLabels.i18n.json
deleted file mode 100644
index 0a7ced2a792..00000000000
--- a/i18n/esn/src/vs/platform/keybinding/common/keybindingLabels.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"ctrlKey": "Ctrl",
-	"shiftKey": "Mayús",
-	"altKey": "Alt",
-	"windowsKey": "Windows",
-	"ctrlKey.long": "Control",
-	"shiftKey.long": "Mayús",
-	"altKey.long": "Alt",
-	"cmdKey.long": "Comando",
-	"windowsKey.long": "Windows"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/platform/list/browser/listService.i18n.json b/i18n/esn/src/vs/platform/list/browser/listService.i18n.json
deleted file mode 100644
index fd8a2daed6a..00000000000
--- a/i18n/esn/src/vs/platform/list/browser/listService.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"workbenchConfigurationTitle": "Área de trabajo",
-	"multiSelectModifier.ctrlCmd": "Se asigna a \"Control\" en Windows y Linux y a \"Comando\" en macOS.",
-	"multiSelectModifier.alt": "Se asigna a \"Alt\" en Windows y Linux y a \"Opción\" en macOS.",
-	"multiSelectModifier": "El modificador que se usará para agregar un elemento en árboles y listas a una selección múltiple con el mouse (por ejemplo en el explorador, los editores abiertos y la vista SCM). ' ctrlCmd ' se asigna a ' control ' en Windows y Linux y a ' Command ' en macOS. Los gestos de ratón \"abrir a lado\", si se admiten, se adaptarán de tal manera que no estén en conflicto con el modificador multiselección.",
-	"openMode.singleClick": "Abre elementos en solo clic de ratón.",
-	"openMode.doubleClick": "Abre elementos en doble clic del ratón. ",
-	"openModeModifier": "Controla cómo abrir elementos en árboles y listas con el ratón (si está soportado). Establecer en ' singleClick ' para abrir elementos con un solo clic del ratón y ' DoubleClick ' para abrir sólo a través del doble clic del ratón. Para los elementos padres con hijos en los árboles, este ajuste controlará si un solo clic expande el padre o un doble clic. Tenga en cuenta que algunos árboles y listas pueden optar por ignorar esta configuración si no es aplicable",
-	"horizontalScrolling setting": "Controla el esplazamiento horizontal de los árboles en la mesa de trabajo."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/platform/localizations/common/localizations.i18n.json b/i18n/esn/src/vs/platform/localizations/common/localizations.i18n.json
deleted file mode 100644
index d3e09c156a2..00000000000
--- a/i18n/esn/src/vs/platform/localizations/common/localizations.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.contributes.localizations": "Contribuye a la localización del editor",
-	"vscode.extension.contributes.localizations.languageId": "Identificador del idioma en el que se traducen las cadenas de visualización.",
-	"vscode.extension.contributes.localizations.languageName": "Nombre del idioma en inglés.",
-	"vscode.extension.contributes.localizations.languageNameLocalized": "Nombre de la lengua en el idioma contribuido.",
-	"vscode.extension.contributes.localizations.translations": "Lista de asociados a la lengua de las traducciones.",
-	"vscode.extension.contributes.localizations.translations.id": "ID de VS Code o extensión a la que se ha contribuido esta traducción. ID de código vs es siempre ' vscode ' y de extensión debe ser en formato ' publisherID. extensionName '.",
-	"vscode.extension.contributes.localizations.translations.id.pattern": "ID debe ser ' vscode ' o en formato ' publisherId.extensionName ' para traducer VS Code o una extensión respectivamente.",
-	"vscode.extension.contributes.localizations.translations.path": "Una ruta de acceso relativa a un archivo que contiene traducciones para el idioma."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/platform/markers/common/markers.i18n.json b/i18n/esn/src/vs/platform/markers/common/markers.i18n.json
deleted file mode 100644
index 2229fecdaf4..00000000000
--- a/i18n/esn/src/vs/platform/markers/common/markers.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"sev.error": "Error",
-	"sev.warning": "Advertencia",
-	"sev.info": "Información"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/platform/markers/common/problemMatcher.i18n.json b/i18n/esn/src/vs/platform/markers/common/problemMatcher.i18n.json
deleted file mode 100644
index 4c1814e9ce5..00000000000
--- a/i18n/esn/src/vs/platform/markers/common/problemMatcher.i18n.json
+++ /dev/null
@@ -1,72 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"ProblemPatternParser.loopProperty.notLast": "La propiedad loop solo se admite en el buscador de coincidencias de la última línea.",
-	"ProblemPatternParser.problemPattern.missingRegExp": "Falta una expresión regular en el patrón de problema.",
-	"ProblemPatternParser.problemPattern.missingProperty": "El patrón de problema no es válido. Debe tener al menos un archivo, un mensaje y un grupo de coincidencias de ubicación o línea.",
-	"ProblemPatternParser.invalidRegexp": "Error: La cadena {0} no es una expresión regular válida.\n",
-	"ProblemPatternSchema.regexp": "Expresión regular para encontrar un error, una advertencia o información en la salida.",
-	"ProblemPatternSchema.file": "Índice de grupo de coincidencias del nombre de archivo. Si se omite, se usa 1.",
-	"ProblemPatternSchema.location": "Índice de grupo de coincidencias de la ubicación del problema. Los patrones de ubicación válidos son: (line), (line,column) y (startLine,startColumn,endLine,endColumn). Si se omite, se asume el uso de (line,column).",
-	"ProblemPatternSchema.line": "Índice de grupo de coincidencias de la línea del problema. Valor predeterminado: 2.",
-	"ProblemPatternSchema.column": "Índice de grupo de coincidencias del carácter de línea del problema. Valor predeterminado: 3",
-	"ProblemPatternSchema.endLine": "Índice de grupo de coincidencias de la línea final del problema. Valor predeterminado como no definido.",
-	"ProblemPatternSchema.endColumn": "Índice de grupo de coincidencias del carácter de línea final del problema. Valor predeterminado como no definido",
-	"ProblemPatternSchema.severity": "Índice de grupo de coincidencias de la gravedad del problema. Valor predeterminado como no definido.",
-	"ProblemPatternSchema.code": "Índice de grupo de coincidencias del código del problema. Valor predeterminado como no definido.",
-	"ProblemPatternSchema.message": "Índice de grupo de coincidencias del mensaje. Si se omite, el valor predeterminado es 4 en caso de definirse la ubicación. De lo contrario, el valor predeterminado es 5.",
-	"ProblemPatternSchema.loop": "En un bucle de buscador de coincidencias multilínea, indica si este patrón se ejecuta en un bucle siempre que haya coincidencias. Solo puede especificarse en el último patrón de un patrón multilínea.",
-	"NamedProblemPatternSchema.name": "Nombre del patrón de problema.",
-	"NamedMultiLineProblemPatternSchema.name": "Nombre del patrón de problema de varias líneas.",
-	"NamedMultiLineProblemPatternSchema.patterns": "The actual patterns.",
-	"ProblemPatternExtPoint": "Aporta patrones de problemas",
-	"ProblemPatternRegistry.error": "Patrón de problema no válido. Se omitirá.",
-	"ProblemMatcherParser.noProblemMatcher": "Error: La descripción no se puede convertir en un buscador de coincidencias de problemas:\n{0}\n",
-	"ProblemMatcherParser.noProblemPattern": "Error: La descripción no define un patrón de problema válido:\n{0}\n",
-	"ProblemMatcherParser.noOwner": "Error: La descripción no define un propietario:\n{0}\n",
-	"ProblemMatcherParser.noFileLocation": "Error: La descripción no define una ubicación de archivo:\n{0}\n",
-	"ProblemMatcherParser.unknownSeverity": "Información: Gravedad {0} desconocida. Los valores válidos son \"error\", \"advertencia\" e \"información\".\n",
-	"ProblemMatcherParser.noDefinedPatter": "Error: El patrón con el identificador {0} no existe.",
-	"ProblemMatcherParser.noIdentifier": "Error: La propiedad pattern hace referencia a un identificador vacío.",
-	"ProblemMatcherParser.noValidIdentifier": "Error: La propiedad pattern {0} no es un nombre de variable de patrón válido.",
-	"ProblemMatcherParser.problemPattern.watchingMatcher": "Un buscador de coincidencias de problemas debe definir tanto un patrón de inicio como un patrón de finalización para la inspección.",
-	"ProblemMatcherParser.invalidRegexp": "Error: La cadena {0} no es una expresión regular válida.\n",
-	"WatchingPatternSchema.regexp": "Expresión regular para detectar el principio o el final de una tarea en segundo plano.",
-	"WatchingPatternSchema.file": "Índice de grupo de coincidencias del nombre de archivo. Se puede omitir.",
-	"PatternTypeSchema.name": "Nombre de un patrón aportado o predefinido",
-	"PatternTypeSchema.description": "Patrón de problema o nombre de un patrón de problema que se ha aportado o predefinido. Se puede omitir si se especifica la base.",
-	"ProblemMatcherSchema.base": "Nombre de un buscador de coincidencias de problemas base que se va a usar.",
-	"ProblemMatcherSchema.owner": "Propietario del problema dentro de Code. Se puede omitir si se especifica \"base\". Si se omite y no se especifica \"base\", el valor predeterminado es \"external\".",
-	"ProblemMatcherSchema.severity": "Gravedad predeterminada para los problemas de capturas. Se usa si el patrón no define un grupo de coincidencias para \"severity\".",
-	"ProblemMatcherSchema.applyTo": "Controla si un problema notificado en un documento de texto se aplica solamente a los documentos abiertos, cerrados o a todos los documentos.",
-	"ProblemMatcherSchema.fileLocation": "Define cómo deben interpretarse los nombres de archivo notificados en un patrón de problema.",
-	"ProblemMatcherSchema.background": "Patrones para hacer seguimiento del comienzo y el final en un comprobador activo de la tarea en segundo plano.",
-	"ProblemMatcherSchema.background.activeOnStart": "Si se establece en True, el monitor está en modo activo cuando la tarea empieza. Esto es equivalente a emitir una línea que coincide con beginPattern",
-	"ProblemMatcherSchema.background.beginsPattern": "Si se encuentran coincidencias en la salida, se señala el inicio de una tarea en segundo plano.",
-	"ProblemMatcherSchema.background.endsPattern": "Si se encuentran coincidencias en la salida, se señala el fin de una tarea en segundo plano.",
-	"ProblemMatcherSchema.watching.deprecated": "Esta propiedad está en desuso. Use la propiedad en segundo plano.",
-	"ProblemMatcherSchema.watching": "Patrones para hacer un seguimiento del comienzo y el final de un patrón de supervisión.",
-	"ProblemMatcherSchema.watching.activeOnStart": "Si se establece en true, el monitor está en modo activo cuando la tarea empieza. Esto es equivalente a emitir una línea que coincide con beginPattern",
-	"ProblemMatcherSchema.watching.beginsPattern": "Si se encuentran coincidencias en la salida, se señala el inicio de una tarea de inspección.",
-	"ProblemMatcherSchema.watching.endsPattern": "Si se encuentran coincidencias en la salida, se señala el fin de una tarea de inspección",
-	"LegacyProblemMatcherSchema.watchedBegin.deprecated": "This property is deprecated. Use the watching property instead.",
-	"LegacyProblemMatcherSchema.watchedBegin": "Expresión regular que señala que una tarea inspeccionada comienza a ejecutarse desencadenada a través de la inspección de archivos.",
-	"LegacyProblemMatcherSchema.watchedEnd.deprecated": "This property is deprecated. Use the watching property instead.",
-	"LegacyProblemMatcherSchema.watchedEnd": "Expresión regular que señala que una tarea inspeccionada termina de ejecutarse.",
-	"NamedProblemMatcherSchema.name": "Nombre del buscador de coincidencias de problemas usado para referirse a él.",
-	"NamedProblemMatcherSchema.label": "Etiqueta en lenguaje natural del buscador de coincidencias de problemas. ",
-	"ProblemMatcherExtPoint": "Aporta buscadores de coincidencias de problemas",
-	"msCompile": "Problemas del compilador de Microsoft",
-	"lessCompile": "Menos problemas",
-	"gulp-tsc": "Problemas de Gulp TSC",
-	"jshint": "Problemas de JSHint",
-	"jshint-stylish": "Problemas de estilismo de JSHint",
-	"eslint-compact": "Problemas de compactación de ESLint",
-	"eslint-stylish": "Problemas de estilismo de ESLint",
-	"go": "Ir a problemas"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/platform/message/common/message.i18n.json b/i18n/esn/src/vs/platform/message/common/message.i18n.json
deleted file mode 100644
index 0d10d99e276..00000000000
--- a/i18n/esn/src/vs/platform/message/common/message.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"close": "Cerrar",
-	"later": "Más tarde",
-	"cancel": "Cancelar",
-	"moreFile": "...1 archivo más que no se muestra",
-	"moreFiles": "...{0} archivos más que no se muestran"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/platform/node/minimalTranslations.i18n.json b/i18n/esn/src/vs/platform/node/minimalTranslations.i18n.json
deleted file mode 100644
index 907113b973d..00000000000
--- a/i18n/esn/src/vs/platform/node/minimalTranslations.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"showLanguagePackExtensions": "VS Code está disponible en {0}. Busque los paquetes de idiomas en el Marketplace para empezar.",
-	"searchMarketplace": "Buscar en Marketplace ",
-	"installAndRestartMessage": "VS Code está disponible en {0}. Instale el paquete de idioma para empezar. Se requiere un reinicio.",
-	"installAndRestart": "Instalar y Reiniciar"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/platform/request/node/request.i18n.json b/i18n/esn/src/vs/platform/request/node/request.i18n.json
deleted file mode 100644
index f938c2c0b51..00000000000
--- a/i18n/esn/src/vs/platform/request/node/request.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"httpConfigurationTitle": "HTTP",
-	"proxy": "El valor del proxy que se debe utilizar. Si no se establece, se tomará de las variables de entorno http_proxy y https_proxy",
-	"strictSSL": "Indica si el certificado del servidor proxy debe comprobarse en la lista de entidades de certificación proporcionada.",
-	"proxyAuthorization": "Valor que debe enviarse como encabezado de 'Proxy-Authorization' para cada solicitud de red."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/platform/telemetry/common/telemetryService.i18n.json b/i18n/esn/src/vs/platform/telemetry/common/telemetryService.i18n.json
deleted file mode 100644
index e866201778b..00000000000
--- a/i18n/esn/src/vs/platform/telemetry/common/telemetryService.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"telemetryConfigurationTitle": "Telemetría",
-	"telemetry.enableTelemetry": "Habilite los datos de uso y los errores para enviarlos a Microsoft."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/platform/theme/common/colorExtensionPoint.i18n.json b/i18n/esn/src/vs/platform/theme/common/colorExtensionPoint.i18n.json
deleted file mode 100644
index 9ff13a2b8bf..00000000000
--- a/i18n/esn/src/vs/platform/theme/common/colorExtensionPoint.i18n.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"contributes.color": "Contribuye a la extensión definida para los colores de los temas",
-	"contributes.color.id": "El identificador de los colores de los temas",
-	"contributes.color.id.format": "Los identificadores deben estar en la forma aa [.bb] *",
-	"contributes.color.description": "La descripción de los colores de los temas",
-	"contributes.defaults.light": "El color predeterminado para los temas claros. Un valor de color en hexadecimal (#RRGGBB [AA]) o el identificador de un color para los temas que proporciona el valor predeterminado.",
-	"contributes.defaults.dark": "El color predeterminado para los temas oscuros. Un valor de color en hexadecimal (#RRGGBB [AA]) o el identificador de un color para los temas que proporciona el valor predeterminado.",
-	"contributes.defaults.highContrast": "El color predeterminado para los temas con constraste. Un valor de color en hexadecimal (#RRGGBB [AA]) o el identificador de un color para los temas que proporciona el valor predeterminado.",
-	"invalid.colorConfiguration": "'configuration.colors' debe ser una matriz",
-	"invalid.default.colorType": "{0} debe ser un valor de color en hexadecimal (#RRGGBB [AA] o #RGB [A]) o el identificador de un color para los temas que puede ser el valor predeterminado.",
-	"invalid.id": "'configuration.colors.id' debe definirse y no puede estar vacío",
-	"invalid.id.format": "'configuration.colors.id' debe seguir la palabra [.word]*",
-	"invalid.description": "'configuration.colors.description' debe definirse y no puede estar vacío",
-	"invalid.defaults": "'configuration.colors.defaults' debe ser definida y contener 'light', 'dark' y 'highContrast'"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/platform/theme/common/colorRegistry.i18n.json b/i18n/esn/src/vs/platform/theme/common/colorRegistry.i18n.json
deleted file mode 100644
index df47f2d2522..00000000000
--- a/i18n/esn/src/vs/platform/theme/common/colorRegistry.i18n.json
+++ /dev/null
@@ -1,101 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"schema.colors": "Colores usados en el área de trabajo.",
-	"foreground": "Color de primer plano general. Este color solo se usa si un componente no lo invalida.",
-	"errorForeground": "Color de primer plano general para los mensajes de erroe. Este color solo se usa si un componente no lo invalida.",
-	"descriptionForeground": "Color de primer plano para el texto descriptivo que proporciona información adicional, por ejemplo para una etiqueta.",
-	"focusBorder": "Color de borde de los elementos con foco. Este color solo se usa si un componente no lo invalida.",
-	"contrastBorder": "Un borde adicional alrededor de los elementos para separarlos unos de otros y así mejorar el contraste.",
-	"activeContrastBorder": "Un borde adicional alrededor de los elementos activos para separarlos unos de otros y así mejorar el contraste.",
-	"selectionBackground": "El color de fondo del texto seleccionado en el área de trabajo (por ejemplo, campos de entrada o áreas de texto). Esto no se aplica a las selecciones dentro del editor.",
-	"textSeparatorForeground": "Color para los separadores de texto.",
-	"textLinkForeground": "Color de primer plano para los vínculos en el texto.",
-	"textLinkActiveForeground": "Color de primer plano para los enlaces de texto, al hacer clic o pasar el mouse sobre ellos.",
-	"textPreformatForeground": "Color de primer plano para los segmentos de texto con formato previo.",
-	"textBlockQuoteBackground": "Color de fondo para los bloques en texto.",
-	"textBlockQuoteBorder": "Color de borde para los bloques en texto.",
-	"textCodeBlockBackground": "Color de fondo para los bloques de código en el texto.",
-	"widgetShadow": "Color de sombra de los widgets  dentro del editor, como buscar/reemplazar",
-	"inputBoxBackground": "Fondo de cuadro de entrada.",
-	"inputBoxForeground": "Primer plano de cuadro de entrada.",
-	"inputBoxBorder": "Borde de cuadro de entrada.",
-	"inputBoxActiveOptionBorder": "Color de borde de opciones activadas en campos de entrada.",
-	"inputPlaceholderForeground": "Color de primer plano para el marcador de posición de texto",
-	"inputValidationInfoBackground": "Color de fondo de validación de entrada para gravedad de información.",
-	"inputValidationInfoBorder": "Color de borde de validación de entrada para gravedad de información.",
-	"inputValidationWarningBackground": "Color de fondo de validación de entrada para gravedad de advertencia.",
-	"inputValidationWarningBorder": "Color de borde de validación de entrada para gravedad de advertencia.",
-	"inputValidationErrorBackground": "Color de fondo de validación de entrada para gravedad de error.",
-	"inputValidationErrorBorder": "Color de borde de valdación de entrada para gravedad de error.",
-	"dropdownBackground": "Fondo de lista desplegable.",
-	"dropdownListBackground": "Fondo de la lista desplegable.",
-	"dropdownForeground": "Primer plano de lista desplegable.",
-	"dropdownBorder": "Borde de lista desplegable.",
-	"listFocusBackground": "Color de fondo de la lista o el árbol del elemento con el foco cuando la lista o el árbol están activos. Una lista o un árbol tienen el foco del teclado cuando están activos, cuando están inactivos no.",
-	"listFocusForeground": "Color de fondo de la lista o el árbol del elemento con el foco cuando la lista o el árbol están activos. Una lista o un árbol tienen el foco del teclado cuando están activos, cuando están inactivos no.",
-	"listActiveSelectionBackground": "Color de fondo de la lista o el árbol del elemento seleccionado cuando la lista o el árbol están activos. Una lista o un árbol tienen el foco del teclado cuando están activos, cuando están inactivos no.",
-	"listActiveSelectionForeground": "Color de primer plano de la lista o el árbol del elemento con el foco cuando la lista o el árbol están activos. Una lista o un árbol tienen el foco del teclado cuando están activos, cuando están inactivos no.",
-	"listInactiveSelectionBackground": "Color de fondo de la lista o el árbol del elemento seleccionado cuando la lista o el árbol están inactivos. Una lista o un árbol tienen el foco del teclado cuando están activos, cuando están inactivos no.",
-	"listInactiveSelectionForeground": "Color de primer plano de la lista o el árbol del elemento con el foco cuando la lista o el árbol esta inactiva. Una lista o un árbol tiene el foco del teclado cuando está activo, cuando esta inactiva no.",
-	"listHoverBackground": "Fondo de la lista o el árbol al mantener el mouse sobre los elementos.",
-	"listHoverForeground": "Color de primer plano de la lista o el árbol al pasar por encima de los elementos con el ratón.",
-	"listDropBackground": "Fondo de arrastrar y colocar la lista o el árbol al mover los elementos con el mouse.",
-	"highlight": "Color de primer plano de la lista o el árbol de las coincidencias resaltadas al buscar dentro de la lista o el ábol.",
-	"invalidItemForeground": "Color de primer plano de una lista o árbol para los elementos inválidos, por ejemplo una raiz sin resolver en el explorador.",
-	"listErrorForeground": "Color del primer plano de elementos de lista que contienen errores.",
-	"listWarningForeground": "Color del primer plano de elementos de lista que contienen advertencias.",
-	"pickerGroupForeground": "Selector de color rápido para la agrupación de etiquetas.",
-	"pickerGroupBorder": "Selector de color rápido para la agrupación de bordes.",
-	"buttonForeground": "Color de primer plano del botón.",
-	"buttonBackground": "Color de fondo del botón.",
-	"buttonHoverBackground": "Color de fondo del botón al mantener el puntero.",
-	"badgeBackground": "Color de fondo de la insignia. Las insignias son pequeñas etiquetas de información, por ejemplo los resultados de un número de resultados.",
-	"badgeForeground": "Color de fondo de la insignia. Las insignias son pequeñas etiquetas de información, por ejemplo los resultados de un número de resultados.",
-	"scrollbarShadow": "Sombra de la barra de desplazamiento indica que la vista se ha despazado.",
-	"scrollbarSliderBackground": "Color de fondo de control deslizante de barra de desplazamiento.",
-	"scrollbarSliderHoverBackground": "Color de fondo de barra de desplazamiento cursor cuando se pasar sobre el control.",
-	"scrollbarSliderActiveBackground": "Color de fondo de la barra de desplazamiento al hacer clic.",
-	"progressBarBackground": "Color de fondo para la barra de progreso que se puede mostrar para las operaciones de larga duración.",
-	"editorBackground": "Color de fondo del editor.",
-	"editorForeground": "Color de primer plano predeterminado del editor.",
-	"editorWidgetBackground": "Color de fondo del editor de widgets como buscar/reemplazar",
-	"editorWidgetBorder": "Color de borde de los widgets del editor. El color solo se usa si el widget elige tener un borde y no invalida el color.",
-	"editorSelectionBackground": "Color de la selección del editor.",
-	"editorSelectionForeground": "Color del texto seleccionado para alto contraste.",
-	"editorInactiveSelection": "Color de la selección en un editor inactivo. El color no debe ser opaco para no ocultar las decoraciones subyacentes.",
-	"editorSelectionHighlight": "Color para regiones con el mismo contenido que la selección. El color no debe ser opaco para no ocultar las decoraciones subyacentes.",
-	"editorSelectionHighlightBorder": "Color de borde de las regiones con el mismo contenido que la selección.",
-	"editorFindMatch": "Color de la coincidencia de búsqueda actual.",
-	"findMatchHighlight": "Color de las otras coincidencias de búsqueda. El color no debe ser opaco para no ocultar las decoraciones subyacentes.",
-	"findRangeHighlight": "Color de la gama que limita la búsqueda. El color no debe ser opaco para no ocultar las decoraciones subyacentes.",
-	"editorFindMatchBorder": "Color de borde de la coincidencia de búsqueda actual.",
-	"findMatchHighlightBorder": "Color de borde de otra búsqueda que coincide.",
-	"findRangeHighlightBorder": "Color de borde de la gama que limita la búsqueda. El color no debe ser opaco para no ocultar las decoraciones subyacentes.",
-	"findWidgetResizeBorder": "Color del borde de la barra de tamaño del widget de búsqueda.",
-	"hoverHighlight": "Resalte debajo de la palabra para la cual se muestra un Hover. El color no debe ser opaco para no ocultar las decoraciones subyacentes.",
-	"hoverBackground": "Color de fondo al mantener el puntero en el editor.",
-	"hoverBorder": "Color del borde al mantener el puntero en el editor.",
-	"activeLinkForeground": "Color de los vínculos activos.",
-	"diffEditorInserted": "Color de fondo del texto que se insertó. El color no debe ser opaco para no ocultar las decoraciones subyacentes.",
-	"diffEditorRemoved": "Color de fondo del texto que se eliminó. El color no debe ser opaco para no ocultar las decoraciones subyacentes.",
-	"diffEditorInsertedOutline": "Color de contorno para el texto insertado.",
-	"diffEditorRemovedOutline": "Color de contorno para el texto quitado.",
-	"mergeCurrentHeaderBackground": "Fondo de encabezado actual en conflictos de fusión en línea. El color no debe ser opaco para no ocultar las decoraciones subyacentes.",
-	"mergeCurrentContentBackground": "Fondo de contenido actual en conflictos de fusión en línea. El color no debe ser opaco para no ocultar las decoraciones subyacentes.",
-	"mergeIncomingHeaderBackground": "Fondo de encabezado entrante en conflictos de fusión en línea. El color no debe ser opaco para no ocultar las decoraciones subyacentes.",
-	"mergeIncomingContentBackground": "Fondo de contenido entrante en conflictos de fusión en línea. El color no debe ser opaco para no ocultar las decoraciones subyacentes.",
-	"mergeCommonHeaderBackground": "Fondo de encabezado de ancestro común en conflictos de fusión en línea. El color no debe ser opaco para no ocultar las decoraciones subyacentes.",
-	"mergeCommonContentBackground": "Fondo de contenido común de ancestro en conflictos de fusión en línea. El color no debe ser opaco para no ocultar las decoraciones subyacentes.",
-	"mergeBorder": "Color del borde en los encabezados y el divisor en conflictos de combinación alineados.",
-	"overviewRulerCurrentContentForeground": "Primer plano de la regla de visión general actual para conflictos de combinación alineados.",
-	"overviewRulerIncomingContentForeground": "Primer plano de regla de visión general de entrada para conflictos de combinación alineados.",
-	"overviewRulerCommonContentForeground": "Primer plano de la regla de visión general de ancestros comunes para conflictos de combinación alineados.",
-	"overviewRulerFindMatchForeground": "Destaca el color del marcador de regla para las coincidencias de búsqueda. El color no debe ser opaco para no ocultar las decoraciones subyacentes.",
-	"overviewRulerSelectionHighlightForeground": "Destaca el color del marcador de regla para los puntos de selección . El color no debe ser opaco para no ocultar las decoraciones subyacentes."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/platform/update/node/update.config.contribution.i18n.json b/i18n/esn/src/vs/platform/update/node/update.config.contribution.i18n.json
deleted file mode 100644
index 52a8127979d..00000000000
--- a/i18n/esn/src/vs/platform/update/node/update.config.contribution.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"updateConfigurationTitle": "Actualizar",
-	"updateChannel": "Configure si recibirá actualizaciones automáticas de un canal de actualización. Es necesario reiniciar tras el cambio.",
-	"enableWindowsBackgroundUpdates": "Habilita las actualizaciones de fondo en Windows."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/platform/url/electron-browser/inactiveExtensionUrlHandler.i18n.json b/i18n/esn/src/vs/platform/url/electron-browser/inactiveExtensionUrlHandler.i18n.json
deleted file mode 100644
index 5b939de4c5f..00000000000
--- a/i18n/esn/src/vs/platform/url/electron-browser/inactiveExtensionUrlHandler.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"confirmUrl": "¿Permitir a una extensión abrir esta URL?"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/platform/windows/electron-main/windowsService.i18n.json b/i18n/esn/src/vs/platform/windows/electron-main/windowsService.i18n.json
deleted file mode 100644
index 04c7d210a14..00000000000
--- a/i18n/esn/src/vs/platform/windows/electron-main/windowsService.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"aboutDetail": "Versión: {0}\nConfirmación: {1}\nFecha: {2}\nShell: {3}\nRepresentador: {4}\nNodo {5}\nArquitectura {6}",
-	"okButton": "Aceptar",
-	"copy": "&&Copiar"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/platform/workspaces/common/workspaces.i18n.json b/i18n/esn/src/vs/platform/workspaces/common/workspaces.i18n.json
deleted file mode 100644
index 9fccfc5be29..00000000000
--- a/i18n/esn/src/vs/platform/workspaces/common/workspaces.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"codeWorkspace": "Espacio de trabajo de código",
-	"untitledWorkspace": "Sin título (Espacio de trabajo)",
-	"workspaceNameVerbose": "{0} (espacio de trabajo)",
-	"workspaceName": "{0} (espacio de trabajo)"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/api/browser/localizationsExtensionPoint.i18n.json b/i18n/esn/src/vs/workbench/api/browser/localizationsExtensionPoint.i18n.json
deleted file mode 100644
index e2901fc55c9..00000000000
--- a/i18n/esn/src/vs/workbench/api/browser/localizationsExtensionPoint.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"requirearray": "las localizaciones deben ser una matriz",
-	"requirestring": "la propiedad `{0}` es obligatoria y debe ser de tipo \"string\"",
-	"optstring": "la propiedad `{0}` se puede omitir o debe ser de tipo \"string\"",
-	"vscode.extension.contributes.localizations": "Contribuye a la localización del editor",
-	"vscode.extension.contributes.localizations.languageId": "Identificador del idioma en el que se traducen las cadenas de visualización.",
-	"vscode.extension.contributes.localizations.languageName": "Nombre del idioma en el que se traducen las cadenas visualizadas.",
-	"vscode.extension.contributes.localizations.translations": "Una ruta relativa a la carpeta que contiene todos los archivos de traducción para el idioma."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/api/browser/viewsContainersExtensionPoint.i18n.json b/i18n/esn/src/vs/workbench/api/browser/viewsContainersExtensionPoint.i18n.json
deleted file mode 100644
index f7ce4059252..00000000000
--- a/i18n/esn/src/vs/workbench/api/browser/viewsContainersExtensionPoint.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.contributes.views.containers.id": "Identificador único utilizado para identificar el contenedor en el que se pueden aportar vistas mediante el punto de contribución \"vistas\"",
-	"vscode.extension.contributes.views.containers.title": "Cadena de texto en lenguaje natural usada para mostrar el contenedor. ",
-	"vscode.extension.contributes.views.containers.icon": "Ruta para el icono del contenedor. Los iconos son de 24 x 24 centrados en un bloque de 50 x 40 y tienen un color de relleno de 'rgb (215, 218, 224)' o '#d7dae0'. Se recomienda que los iconos sean en SVG, aunque se acepta cualquier tipo de archivo de imagen. ",
-	"vscode.extension.contributes.viewsContainers": "Contribuye con vistas de contenedores al editor ",
-	"views.container.activitybar": "Contribuir vistas de contenedores a la barra de actividades",
-	"test": "Prueba",
-	"requirearray": "contenedores de vistas deben ser una matriz",
-	"requireidstring": "la propiedad `{0}` is mandatoria y debe ser del tipo `cadena`. Solo son permitidos carácteres alfanuméricos, '_' y '-'.",
-	"requirestring": "la propiedad `{0}` es obligatoria y debe ser de tipo \"string\"",
-	"showViewlet": "Mostrar {0}",
-	"view": "Ver"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json b/i18n/esn/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json
deleted file mode 100644
index 6ab80fb8ae1..00000000000
--- a/i18n/esn/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"requirearray": "Las vistas deben ser una matriz",
-	"requirestring": "la propiedad `{0}` es obligatoria y debe ser de tipo \"string\"",
-	"optstring": "la propiedad `{0}` se puede omitir o debe ser de tipo \"string\"",
-	"vscode.extension.contributes.view.id": "Identificador de la vista. Úselo para registrar un proveedor de datos mediante la API \"vscode.window.registerTreeDataProviderForView\". También para desencadenar la activación de su extensión al registrar el evento \"onView:${id}\" en \"activationEvents\".",
-	"vscode.extension.contributes.view.name": "Nombre de la vista en lenguaje natural. Será mostrado",
-	"vscode.extension.contributes.view.when": "Condición que se debe cumplir para mostrar esta vista",
-	"vscode.extension.contributes.views": "Aporta vistas al editor",
-	"views.explorer": "Aporta vistas al contenedor del explorador en la barra de actividades",
-	"views.debug": "Contribuye vistas al contenedor de depuración en la barra de actividades",
-	"views.scm": "Contribuye vistas al contenedor SCM en la barra de actividades",
-	"views.test": "Contribuye vistas al contenedor de pruebas en la barra de actividades",
-	"views.contributed": "Contribuye vistas al contenedor de vistas aportadas",
-	"ViewContainerDoesnotExist": "Contenedor de vistas ' {0} ' no existe y todas las vistas registradas se agregarán al 'Explorer'.",
-	"duplicateView1": "No se pueden registrar múltiples vistas con el mismo identificador '{0}' en la ubicación '{1}'",
-	"duplicateView2": "Una vista con el identificador '{0}' ya está registrada en la ubicación '{1}'"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/api/electron-browser/mainThreadExtensionService.i18n.json b/i18n/esn/src/vs/workbench/api/electron-browser/mainThreadExtensionService.i18n.json
deleted file mode 100644
index c8303dca7e8..00000000000
--- a/i18n/esn/src/vs/workbench/api/electron-browser/mainThreadExtensionService.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"overwritingExtension": "Sobrescribiendo la extensión {0} con {1}.",
-	"extensionUnderDevelopment": "Cargando la extensión de desarrollo en {0}"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/api/electron-browser/mainThreadMessageService.i18n.json b/i18n/esn/src/vs/workbench/api/electron-browser/mainThreadMessageService.i18n.json
deleted file mode 100644
index 9f5ae6237d2..00000000000
--- a/i18n/esn/src/vs/workbench/api/electron-browser/mainThreadMessageService.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"extensionSource": "{0} (extensión)",
-	"defaultSource": "Extensión",
-	"manageExtension": "Administrar extensión",
-	"cancel": "Cancelar",
-	"ok": "Aceptar"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json b/i18n/esn/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
deleted file mode 100644
index 40e2044209f..00000000000
--- a/i18n/esn/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"timeout.formatOnSave": "Anular la aplicación de formato al guardar después de {0} ms",
-	"codeActionsOnSave.didTimeout": "codeActionsOnSave anulado después de {0} ms",
-	"timeout.onWillSave": "Se anuló onWillSaveTextDocument-event después de 1750 ms",
-	"saveParticipants": "Ejecutando Guardar Participantes..."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json b/i18n/esn/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json
deleted file mode 100644
index ee8688cdc85..00000000000
--- a/i18n/esn/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"task.label": "{0}: {1}"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/api/electron-browser/mainThreadWebview.i18n.json b/i18n/esn/src/vs/workbench/api/electron-browser/mainThreadWebview.i18n.json
deleted file mode 100644
index c6974979361..00000000000
--- a/i18n/esn/src/vs/workbench/api/electron-browser/mainThreadWebview.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"errorMessage": "Ha ocurrido un error mientras se restauraba la vista: {0}"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/api/electron-browser/mainThreadWorkspace.i18n.json b/i18n/esn/src/vs/workbench/api/electron-browser/mainThreadWorkspace.i18n.json
deleted file mode 100644
index e45fa0afa61..00000000000
--- a/i18n/esn/src/vs/workbench/api/electron-browser/mainThreadWorkspace.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"folderStatusMessageAddSingleFolder": "La extensión ' {0} ' agregó 1 carpeta al espacio de trabajo ",
-	"folderStatusMessageAddMultipleFolders": "La extensión ' {0} ' agregó {1} carpetas al espacio de trabajo",
-	"folderStatusMessageRemoveSingleFolder": "Extensión ' {0} ' eliminó 1 carpeta del espacio de trabajo ",
-	"folderStatusMessageRemoveMultipleFolders": "La extensión ' {0} ' eliminó las carpetas {1} del espacio de trabajo ",
-	"folderStatusChangeFolder": "La extensión ' {0} ' cambió las carpetas del espacio de trabajo"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/api/node/extHostDiagnostics.i18n.json b/i18n/esn/src/vs/workbench/api/node/extHostDiagnostics.i18n.json
deleted file mode 100644
index 892f88021d1..00000000000
--- a/i18n/esn/src/vs/workbench/api/node/extHostDiagnostics.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"limitHit": "No se mostrarán {0} errores y advertencias adicionales."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/api/node/extHostExplorerView.i18n.json b/i18n/esn/src/vs/workbench/api/node/extHostExplorerView.i18n.json
deleted file mode 100644
index 7d556561528..00000000000
--- a/i18n/esn/src/vs/workbench/api/node/extHostExplorerView.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"treeExplorer.notRegistered": "No hay registrado ningún TreeExplorerNodeProvider con el identificador \"{0}\".",
-	"treeExplorer.failedToProvideRootNode": "TreeExplorerNodeProvider \"{0}\" no pudo proporcionar el nodo raíz."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/api/node/extHostExtensionActivator.i18n.json b/i18n/esn/src/vs/workbench/api/node/extHostExtensionActivator.i18n.json
deleted file mode 100644
index 0566852f130..00000000000
--- a/i18n/esn/src/vs/workbench/api/node/extHostExtensionActivator.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"unknownDep": "No se pudo activar la extensión \"{1}\" debido a una dependencia desconocida: \"{0}\".",
-	"failedDep1": "No se pudo activar la extensión \"{1}\" porque no se pudo activar la dependencia \"{0}\".",
-	"failedDep2": "No se pudo activar la extensión \"{0}\" porque hay más de 10 niveles de dependencias (lo más probable es que sea un bucle de dependencia).",
-	"activationError": "No se pudo activar la extensión \"{0}\": {1}."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/api/node/extHostProgress.i18n.json b/i18n/esn/src/vs/workbench/api/node/extHostProgress.i18n.json
deleted file mode 100644
index 651918c67b7..00000000000
--- a/i18n/esn/src/vs/workbench/api/node/extHostProgress.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"extensionSource": "{0} (extensión)"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/api/node/extHostTask.i18n.json b/i18n/esn/src/vs/workbench/api/node/extHostTask.i18n.json
deleted file mode 100644
index ee8688cdc85..00000000000
--- a/i18n/esn/src/vs/workbench/api/node/extHostTask.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"task.label": "{0}: {1}"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/api/node/extHostTreeExplorers.i18n.json b/i18n/esn/src/vs/workbench/api/node/extHostTreeExplorers.i18n.json
deleted file mode 100644
index f749e9e6bdf..00000000000
--- a/i18n/esn/src/vs/workbench/api/node/extHostTreeExplorers.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"treeExplorer.notRegistered": "No hay registrado ningún TreeExplorerNodeProvider con el identificador \"{0}\".",
-	"treeExplorer.failedToProvideRootNode": "TreeExplorerNodeProvider \"{0}\" no pudo proporcionar el nodo raíz.",
-	"treeExplorer.failedToResolveChildren": "TreeExplorerNodeProvider \"{0}\" no pudo resolver los elementos secundarios."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/api/node/extHostTreeView.i18n.json b/i18n/esn/src/vs/workbench/api/node/extHostTreeView.i18n.json
deleted file mode 100644
index 7d556561528..00000000000
--- a/i18n/esn/src/vs/workbench/api/node/extHostTreeView.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"treeExplorer.notRegistered": "No hay registrado ningún TreeExplorerNodeProvider con el identificador \"{0}\".",
-	"treeExplorer.failedToProvideRootNode": "TreeExplorerNodeProvider \"{0}\" no pudo proporcionar el nodo raíz."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/api/node/extHostTreeViews.i18n.json b/i18n/esn/src/vs/workbench/api/node/extHostTreeViews.i18n.json
deleted file mode 100644
index a3395d69a3e..00000000000
--- a/i18n/esn/src/vs/workbench/api/node/extHostTreeViews.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"treeView.notRegistered": "No se ha registrado ninga vista del árbol con id '{0}'.",
-	"treeView.duplicateElement": "El elemento con id {0} está ya registrado"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/api/node/extHostWorkspace.i18n.json b/i18n/esn/src/vs/workbench/api/node/extHostWorkspace.i18n.json
deleted file mode 100644
index e0b45695e7b..00000000000
--- a/i18n/esn/src/vs/workbench/api/node/extHostWorkspace.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"updateerror": "La extensión ' {0} ' no pudo actualizar las carpetas del área de trabajo: {1}"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/api/node/mainThreadExtensionService.i18n.json b/i18n/esn/src/vs/workbench/api/node/mainThreadExtensionService.i18n.json
deleted file mode 100644
index c8303dca7e8..00000000000
--- a/i18n/esn/src/vs/workbench/api/node/mainThreadExtensionService.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"overwritingExtension": "Sobrescribiendo la extensión {0} con {1}.",
-	"extensionUnderDevelopment": "Cargando la extensión de desarrollo en {0}"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/api/node/mainThreadMessageService.i18n.json b/i18n/esn/src/vs/workbench/api/node/mainThreadMessageService.i18n.json
deleted file mode 100644
index 68632e8f819..00000000000
--- a/i18n/esn/src/vs/workbench/api/node/mainThreadMessageService.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"close": "Cerrar",
-	"cancel": "Cancelar",
-	"ok": "Aceptar"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/browser/actions/configureLocale.i18n.json b/i18n/esn/src/vs/workbench/browser/actions/configureLocale.i18n.json
deleted file mode 100644
index 949ae20646f..00000000000
--- a/i18n/esn/src/vs/workbench/browser/actions/configureLocale.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"configureLocale": "Configurar idioma",
-	"displayLanguage": "Define el lenguaje para mostrar de VSCode.",
-	"doc": "Consulte {0} para obtener una lista de idiomas compatibles.",
-	"restart": "Al cambiar el valor se requiere reiniciar VSCode.",
-	"fail.createSettings": "No se puede crear '{0}' ({1}).",
-	"JsonSchema.locale": "Idioma de la interfaz de usuario que debe usarse."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/browser/actions/fileActions.i18n.json b/i18n/esn/src/vs/workbench/browser/actions/fileActions.i18n.json
deleted file mode 100644
index f6c0c05c223..00000000000
--- a/i18n/esn/src/vs/workbench/browser/actions/fileActions.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"openFolder": "Abrir carpeta...",
-	"openFileFolder": "Abrir..."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/browser/actions/toggleActivityBarVisibility.i18n.json b/i18n/esn/src/vs/workbench/browser/actions/toggleActivityBarVisibility.i18n.json
deleted file mode 100644
index c2202f8b258..00000000000
--- a/i18n/esn/src/vs/workbench/browser/actions/toggleActivityBarVisibility.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleActivityBar": "Alternar visibilidad de la barra de actividades",
-	"view": "Ver"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/browser/actions/toggleCenteredLayout.i18n.json b/i18n/esn/src/vs/workbench/browser/actions/toggleCenteredLayout.i18n.json
deleted file mode 100644
index dfb57784d13..00000000000
--- a/i18n/esn/src/vs/workbench/browser/actions/toggleCenteredLayout.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleCenteredLayout": "Alternar diseño centrado",
-	"view": "Ver"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/browser/actions/toggleEditorLayout.i18n.json b/i18n/esn/src/vs/workbench/browser/actions/toggleEditorLayout.i18n.json
deleted file mode 100644
index 0181de0f426..00000000000
--- a/i18n/esn/src/vs/workbench/browser/actions/toggleEditorLayout.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleEditorGroupLayout": "Alternar diseño vertical/horizontal del grupo de editores",
-	"horizontalLayout": "Diseño horizontal del grupo de editores",
-	"verticalLayout": "Diseño vertical del grupo de editores",
-	"view": "Ver"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/browser/actions/toggleSidebarPosition.i18n.json b/i18n/esn/src/vs/workbench/browser/actions/toggleSidebarPosition.i18n.json
deleted file mode 100644
index 261be7ea1f2..00000000000
--- a/i18n/esn/src/vs/workbench/browser/actions/toggleSidebarPosition.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleSidebarPosition": "Alternar posición de la barra lateral",
-	"view": "Ver"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/browser/actions/toggleSidebarVisibility.i18n.json b/i18n/esn/src/vs/workbench/browser/actions/toggleSidebarVisibility.i18n.json
deleted file mode 100644
index 29fafb6de64..00000000000
--- a/i18n/esn/src/vs/workbench/browser/actions/toggleSidebarVisibility.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleSidebar": "Alternar visibilidad de la barra lateral",
-	"view": "Ver"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/browser/actions/toggleStatusbarVisibility.i18n.json b/i18n/esn/src/vs/workbench/browser/actions/toggleStatusbarVisibility.i18n.json
deleted file mode 100644
index 939d9a9a515..00000000000
--- a/i18n/esn/src/vs/workbench/browser/actions/toggleStatusbarVisibility.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleStatusbar": "Alternar visibilidad de la barra de estado",
-	"view": "Ver"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/browser/actions/toggleTabsVisibility.i18n.json b/i18n/esn/src/vs/workbench/browser/actions/toggleTabsVisibility.i18n.json
deleted file mode 100644
index bb066c7fac1..00000000000
--- a/i18n/esn/src/vs/workbench/browser/actions/toggleTabsVisibility.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleTabs": "Alternar visibilidad de la pestaña",
-	"view": "Ver"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/browser/actions/toggleZenMode.i18n.json b/i18n/esn/src/vs/workbench/browser/actions/toggleZenMode.i18n.json
deleted file mode 100644
index 625d947c4d3..00000000000
--- a/i18n/esn/src/vs/workbench/browser/actions/toggleZenMode.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleZenMode": "Alternar modo zen",
-	"view": "Ver"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/browser/actions/workspaceActions.i18n.json b/i18n/esn/src/vs/workbench/browser/actions/workspaceActions.i18n.json
deleted file mode 100644
index c48bc588385..00000000000
--- a/i18n/esn/src/vs/workbench/browser/actions/workspaceActions.i18n.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openFile": "Abrir archivo...",
-	"openFolder": "Abrir carpeta...",
-	"openFileFolder": "Abrir...",
-	"globalRemoveFolderFromWorkspace": "Quitar carpeta del Área de trabajo...",
-	"saveWorkspaceAsAction": "Guardar área de trabajo como...",
-	"save": "&&Guardar",
-	"saveWorkspace": "Guardar área de trabajo",
-	"openWorkspaceAction": "Abrir área de trabajo...",
-	"openWorkspaceConfigFile": "Abrir archivo de configuración del área de trabajo",
-	"duplicateWorkspaceInNewWindow": "Duplicar el área de trabajo en una ventana nueva"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/browser/actions/workspaceCommands.i18n.json b/i18n/esn/src/vs/workbench/browser/actions/workspaceCommands.i18n.json
deleted file mode 100644
index 1375d8b899c..00000000000
--- a/i18n/esn/src/vs/workbench/browser/actions/workspaceCommands.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"addFolderToWorkspace": "Agregar carpeta al área de trabajo...",
-	"add": "&&Añadir",
-	"addFolderToWorkspaceTitle": "Agregar carpeta al área de trabajo",
-	"workspaceFolderPickerPlaceholder": "Seleccionar la carpeta del área de trabajo"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/browser/parts/activitybar/activitybarActions.i18n.json b/i18n/esn/src/vs/workbench/browser/parts/activitybar/activitybarActions.i18n.json
deleted file mode 100644
index 7b9e720af09..00000000000
--- a/i18n/esn/src/vs/workbench/browser/parts/activitybar/activitybarActions.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"badgeTitle": "{0} - {1} ",
-	"titleKeybinding": "{0} ({1})",
-	"removeFromActivityBar": "Ocultar de la barra de la actividad",
-	"keepInActivityBar": "Guardar en la barra de la actividad",
-	"additionalViews": "Vistas adicionales",
-	"numberBadge": "{0} ({1})",
-	"manageExtension": "Administrar extensión",
-	"toggle": "Alternar vista fijada"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/browser/parts/activitybar/activitybarPart.i18n.json b/i18n/esn/src/vs/workbench/browser/parts/activitybar/activitybarPart.i18n.json
deleted file mode 100644
index 5262a61155e..00000000000
--- a/i18n/esn/src/vs/workbench/browser/parts/activitybar/activitybarPart.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hideActivitBar": "Ocultar barra de actividades",
-	"globalActions": "Acciones globales"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/browser/parts/compositePart.i18n.json b/i18n/esn/src/vs/workbench/browser/parts/compositePart.i18n.json
deleted file mode 100644
index 4dbc208de48..00000000000
--- a/i18n/esn/src/vs/workbench/browser/parts/compositePart.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"ariaCompositeToolbarLabel": "{0} acciones",
-	"titleTooltip": "{0} ({1})"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/browser/parts/compositebar/compositeBar.i18n.json b/i18n/esn/src/vs/workbench/browser/parts/compositebar/compositeBar.i18n.json
deleted file mode 100644
index 74e3e82564b..00000000000
--- a/i18n/esn/src/vs/workbench/browser/parts/compositebar/compositeBar.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"activityBarAriaLabel": "Modificador de vista activa"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/browser/parts/compositebar/compositeBarActions.i18n.json b/i18n/esn/src/vs/workbench/browser/parts/compositebar/compositeBarActions.i18n.json
deleted file mode 100644
index f47b81f5d3e..00000000000
--- a/i18n/esn/src/vs/workbench/browser/parts/compositebar/compositeBarActions.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"largeNumberBadge": "10k+",
-	"badgeTitle": "{0} - {1} ",
-	"additionalViews": "Vistas adicionales",
-	"numberBadge": "{0} ({1})",
-	"manageExtension": "Administrar extensión",
-	"titleKeybinding": "{0} ({1})",
-	"hide": "Ocultar",
-	"keep": "Mantener",
-	"toggle": "Alternar vista fijada"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/browser/parts/editor/binaryDiffEditor.i18n.json b/i18n/esn/src/vs/workbench/browser/parts/editor/binaryDiffEditor.i18n.json
deleted file mode 100644
index ea1317f6659..00000000000
--- a/i18n/esn/src/vs/workbench/browser/parts/editor/binaryDiffEditor.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"metadataDiff": "{0} ↔ {1}"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/browser/parts/editor/binaryEditor.i18n.json b/i18n/esn/src/vs/workbench/browser/parts/editor/binaryEditor.i18n.json
deleted file mode 100644
index 633e0696053..00000000000
--- a/i18n/esn/src/vs/workbench/browser/parts/editor/binaryEditor.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"binaryEditor": "Visor binario"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json b/i18n/esn/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json
deleted file mode 100644
index 0c66b08e50d..00000000000
--- a/i18n/esn/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"textEditor": "Editor de texto",
-	"textDiffEditor": "Editor de diferencias de texto",
-	"binaryDiffEditor": "Editor de diferencias binario",
-	"sideBySideEditor": "Editor de lado a lado",
-	"groupOnePicker": "Mostrar editores del primer grupo",
-	"groupTwoPicker": "Mostrar editores del segundo grupo",
-	"groupThreePicker": "Mostrar editores del tercer grupo",
-	"allEditorsPicker": "Mostrar todos los editores abiertos",
-	"view": "Ver",
-	"file": "Archivo",
-	"close": "Cerrar",
-	"closeOthers": "Cerrar otros",
-	"closeRight": "Cerrar a la derecha",
-	"closeAllSaved": "Cerrar guardados",
-	"closeAll": "Cerrar todo",
-	"keepOpen": "Mantener abierto",
-	"toggleInlineView": "Cambiar vista en línea",
-	"showOpenedEditors": "Mostrar editores abiertos",
-	"keepEditor": "Mantener editor",
-	"closeEditorsInGroup": "Cerrar todos los editores del grupo",
-	"closeSavedEditors": "Cerrar los editores guardados del grupo",
-	"closeOtherEditors": "Cerrar otros editores",
-	"closeRightEditors": "Cerrar los editores a la derecha"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/browser/parts/editor/editorActions.i18n.json b/i18n/esn/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
deleted file mode 100644
index e35e95658e0..00000000000
--- a/i18n/esn/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
+++ /dev/null
@@ -1,58 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"splitEditor": "Dividir editor",
-	"joinTwoGroups": "Combinar editores de dos grupos",
-	"navigateEditorGroups": "Navegar entre los grupos de editores",
-	"focusActiveEditorGroup": "Enfocar grupo de editores activo",
-	"focusFirstEditorGroup": "Enfocar primer grupo de editores",
-	"focusSecondEditorGroup": "Enfocar segundo grupo de editores",
-	"focusThirdEditorGroup": "Enfocar tercer grupo de editores",
-	"focusPreviousGroup": "Enfocar el grupo anterior",
-	"focusNextGroup": "Enfocar el grupo siguiente",
-	"openToSide": "Abrir en el lateral",
-	"closeEditor": "Cerrar editor",
-	"closeOneEditor": "Cerrar",
-	"revertAndCloseActiveEditor": "Revertir y cerrar el editor",
-	"closeEditorsToTheLeft": "Cerrar los editores a la izquierda",
-	"closeAllEditors": "Cerrar todos los editores",
-	"closeEditorsInOtherGroups": "Cerrar los editores de otros grupos",
-	"moveActiveGroupLeft": "Mover el grupo de editores a la izquierda",
-	"moveActiveGroupRight": "Mover el grupo de editores a la derecha",
-	"minimizeOtherEditorGroups": "Minimizar otros grupos de editores",
-	"evenEditorGroups": "Uniformar anchos del grupo de editores",
-	"maximizeEditor": "Maximizar el grupo de editores y ocultar la barra lateral",
-	"openNextEditor": "Abrir el editor siguiente",
-	"openPreviousEditor": "Abrir el editor anterior",
-	"nextEditorInGroup": "Abrir el siguiente editor del grupo",
-	"openPreviousEditorInGroup": "Abrir el editor anterior en el grupo",
-	"lastEditorInGroup": "Abrir el último editor del grupo",
-	"navigateNext": "Hacia delante",
-	"navigatePrevious": "Hacia atrás",
-	"navigateLast": "Vaya al último",
-	"reopenClosedEditor": "Volver a abrir el editor cerrado",
-	"clearRecentFiles": "Borrar abiertos recientemente",
-	"showEditorsInFirstGroup": "Mostrar editores del primer grupo",
-	"showEditorsInSecondGroup": "Mostrar editores del segundo grupo",
-	"showEditorsInThirdGroup": "Mostrar editores del tercer grupo",
-	"showAllEditors": "Mostrar todos los editores",
-	"openPreviousRecentlyUsedEditorInGroup": "Abrir el editor recientemente usado anterior en el grupo",
-	"openNextRecentlyUsedEditorInGroup": "Abrir el siguiente editor recientemente usado en el grupo",
-	"navigateEditorHistoryByInput": "Abrir el editor anterior desde el historial",
-	"openNextRecentlyUsedEditor": "Abrir el siguiente editor recientemente usado",
-	"openPreviousRecentlyUsedEditor": "Abrir el anterior editor recientemente usado",
-	"clearEditorHistory": "Borrar historial del editor",
-	"focusLastEditorInStack": "Abrir el último editor del grupo",
-	"moveEditorLeft": "Mover el editor a la izquierda",
-	"moveEditorRight": "Mover el editor a la derecha",
-	"moveEditorToPreviousGroup": "Mover editor al grupo anterior",
-	"moveEditorToNextGroup": "Mover editor al grupo siguiente",
-	"moveEditorToFirstGroup": "Mover el Editor al Primer Grupo",
-	"moveEditorToSecondGroup": "Mover el Editor al Segundo Grupo",
-	"moveEditorToThirdGroup": "Mover el Editor al Tercer Grupo"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json b/i18n/esn/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json
deleted file mode 100644
index 41dbe686914..00000000000
--- a/i18n/esn/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"editorCommand.activeEditorMove.description": "Mover el editor activo por tabulaciones o grupos",
-	"editorCommand.activeEditorMove.arg.name": "Argumento para mover el editor activo",
-	"editorCommand.activeEditorMove.arg.description": "Propiedades del argumento:\n * 'to': cadena de valor que proporciona dónde moverse.\n\t* 'by': cadena de valor que proporciona la unidad de medida para moverse. Por pestaña o por grupo.\n\t* 'value': valor numérico que proporciona cuantas posiciones o una posición absoluta para mover."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/browser/parts/editor/editorPart.i18n.json b/i18n/esn/src/vs/workbench/browser/parts/editor/editorPart.i18n.json
deleted file mode 100644
index 43a3e449dbf..00000000000
--- a/i18n/esn/src/vs/workbench/browser/parts/editor/editorPart.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"groupOneVertical": "Izquierda",
-	"groupTwoVertical": "Centro",
-	"groupThreeVertical": "Derecha",
-	"groupOneHorizontal": "Superior",
-	"groupTwoHorizontal": "Centro",
-	"groupThreeHorizontal": "Inferior",
-	"editorOpenError": "No se puede abrir '{0}': {1}."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/browser/parts/editor/editorPicker.i18n.json b/i18n/esn/src/vs/workbench/browser/parts/editor/editorPicker.i18n.json
deleted file mode 100644
index ba164ea8dbf..00000000000
--- a/i18n/esn/src/vs/workbench/browser/parts/editor/editorPicker.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"entryAriaLabel": "{0}, selector del grupo de editores",
-	"groupLabel": "Grupo: {0}",
-	"noResultsFoundInGroup": "No se encontró un editor abierto coincidente en el grupo",
-	"noOpenedEditors": "La lista de editores abiertos está vacía actualmente en el grupo.",
-	"noResultsFound": "No se encontró un editor abierto coincidente",
-	"noOpenedEditorsAllGroups": "La lista de editores abiertos está vacía actualmente."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json b/i18n/esn/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json
deleted file mode 100644
index 29cf10b5371..00000000000
--- a/i18n/esn/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"singleSelectionRange": "Lín. {0}, Col. {1} ({2} seleccionada)",
-	"singleSelection": "Lín. {0}, Col. {1}",
-	"multiSelectionRange": "{0} selecciones ({1} caracteres seleccionados)",
-	"multiSelection": "{0} selecciones",
-	"endOfLineLineFeed": "LF",
-	"endOfLineCarriageReturnLineFeed": "CRLF",
-	"tabFocusModeEnabled": "Tabulación Mueve el Foco",
-	"screenReaderDetected": "Lector de pantalla optimizado",
-	"screenReaderDetectedExtra": "Si no va a usar un lector de pantalla, cambie el valor de configuración \"editor.accessibilitySupport\" a \"desactivado\".",
-	"disableTabMode": "Deshabilitar modo de accesibilidad",
-	"gotoLine": "Ir a la línea",
-	"selectIndentation": "Seleccione la sangría",
-	"selectEncoding": "Seleccionar Encoding",
-	"selectEOL": "Seleccionar secuencia de fin de línea",
-	"selectLanguageMode": "Seleccionar modo de lenguaje",
-	"fileInfo": "Información del archivo",
-	"spacesSize": "Espacios: {0}",
-	"tabSize": "Tamaño de tabulación: {0}",
-	"showLanguageExtensions": "Buscar extensiones de Marketplace para '{0}'...",
-	"changeMode": "Cambiar modo de lenguaje",
-	"noEditor": "No hay ningún editor de texto activo en este momento.",
-	"languageDescription": "({0}): lenguaje configurado",
-	"languageDescriptionConfigured": "({0})",
-	"languagesPicks": "lenguajes (identificador)",
-	"configureModeSettings": "Configurar los parámetros basados en el lenguaje \"{0}\"...",
-	"configureAssociationsExt": "Configurar asociación de archivos para '{0}'...",
-	"autoDetect": "Detectar automáticamente",
-	"pickLanguage": "Seleccionar modo de lenguaje",
-	"currentAssociation": "Asociación actual",
-	"pickLanguageToConfigure": "Seleccionar modo de lenguaje para asociar con '{0}'",
-	"changeIndentation": "Cambiar sangría",
-	"noWritableCodeEditor": "El editor de código activo es de solo lectura.",
-	"indentView": "cambiar vista",
-	"indentConvert": "convertir archivo",
-	"pickAction": "Seleccionar acción",
-	"changeEndOfLine": "Cambiar secuencia de fin de línea",
-	"pickEndOfLine": "Seleccionar secuencia de fin de línea",
-	"changeEncoding": "Cambiar codificación de archivo",
-	"noFileEditor": "No hay ningún archivo activo en este momento.",
-	"saveWithEncoding": "Guardar con Encoding",
-	"reopenWithEncoding": "Volver a abrir con Encoding",
-	"guessedEncoding": "Adivinado por el contenido",
-	"pickEncodingForReopen": "Seleccionar codificación de archivo para reabrir archivo",
-	"pickEncodingForSave": "Seleccionar codificación de archivo para guardar",
-	"screenReaderDetectedExplanation.title": "Lector de pantalla optimizado",
-	"screenReaderDetectedExplanation.question": "¿Está usando un lector de pantalla con VS Code?",
-	"screenReaderDetectedExplanation.answerYes": "Sí",
-	"screenReaderDetectedExplanation.answerNo": "No",
-	"screenReaderDetectedExplanation.body1": "VS Code se ha optimizado para ser utilizado con un lector de pantalla",
-	"screenReaderDetectedExplanation.body2": "Algunas características del editor tendrán comportamientos diferentes: p. ej. ajuste de línea, plegado, etc."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/browser/parts/editor/resourceViewer.i18n.json b/i18n/esn/src/vs/workbench/browser/parts/editor/resourceViewer.i18n.json
deleted file mode 100644
index 0ca704a5b8d..00000000000
--- a/i18n/esn/src/vs/workbench/browser/parts/editor/resourceViewer.i18n.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"sizeB": "{0} B",
-	"sizeKB": "{0} KB",
-	"sizeMB": "{0} MB",
-	"sizeGB": "{0} GB",
-	"sizeTB": "{0} TB",
-	"largeImageError": "La imagen no se muestra en el editor porque es demasiado grande ({0}). ",
-	"resourceOpenExternalButton": "¿Abrir la imagen mediante un programa externo?",
-	"nativeFileTooLargeError": "El archivo no se muestra en el editor porque es demasiado grande ({0}). ",
-	"nativeBinaryError": "El archivo no se muestra en el editor porque es binario o utiliza una codificación de texto no soportada. ",
-	"openAsText": "¿Desea abrirlo de todas formas?",
-	"zoom.action.fit.label": "Imagen completa",
-	"imgMeta": "{0} x {1} {2}"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/browser/parts/editor/tabsTitleControl.i18n.json b/i18n/esn/src/vs/workbench/browser/parts/editor/tabsTitleControl.i18n.json
deleted file mode 100644
index d27feb44d65..00000000000
--- a/i18n/esn/src/vs/workbench/browser/parts/editor/tabsTitleControl.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"araLabelTabActions": "Acciones de pestaña"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json b/i18n/esn/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json
deleted file mode 100644
index bdfe340e058..00000000000
--- a/i18n/esn/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"textDiffEditor": "Editor de diferencias de texto",
-	"readonlyEditorWithInputAriaLabel": "{0}. Editor de comparación de textos de solo lectura.",
-	"readonlyEditorAriaLabel": "Editor de comparación de textos de solo lectura.",
-	"editableEditorWithInputAriaLabel": "{0}. Editor de comparación de archivos de texto.",
-	"editableEditorAriaLabel": "Editor de comparación de archivos de texto.",
-	"navigate.next.label": "Cambio siguiente",
-	"navigate.prev.label": "Cambio anterior",
-	"toggleIgnoreTrimWhitespace.label": "Ignorar espacios en blanco al principio y final"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/browser/parts/editor/textEditor.i18n.json b/i18n/esn/src/vs/workbench/browser/parts/editor/textEditor.i18n.json
deleted file mode 100644
index 2149e3bd82b..00000000000
--- a/i18n/esn/src/vs/workbench/browser/parts/editor/textEditor.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"editorLabelWithGroup": "{0}, Grupo {1}."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/browser/parts/editor/textResourceEditor.i18n.json b/i18n/esn/src/vs/workbench/browser/parts/editor/textResourceEditor.i18n.json
deleted file mode 100644
index 2b34e6e4410..00000000000
--- a/i18n/esn/src/vs/workbench/browser/parts/editor/textResourceEditor.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"textEditor": "Editor de texto",
-	"readonlyEditorWithInputAriaLabel": "{0}. Editor de texto de solo lectura.",
-	"readonlyEditorAriaLabel": "Editor de texto de solo lectura.",
-	"untitledFileEditorWithInputAriaLabel": "{0}. Editor de texto de archivos sin título.",
-	"untitledFileEditorAriaLabel": "Editor de texto de archivos sin título."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/browser/parts/editor/titleControl.i18n.json b/i18n/esn/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
deleted file mode 100644
index 9310ecec997..00000000000
--- a/i18n/esn/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"araLabelEditorActions": "Acciones del editor"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/browser/parts/notifications/notificationsActions.i18n.json b/i18n/esn/src/vs/workbench/browser/parts/notifications/notificationsActions.i18n.json
deleted file mode 100644
index 7e874dd6baf..00000000000
--- a/i18n/esn/src/vs/workbench/browser/parts/notifications/notificationsActions.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"clearNotification": "Borrar notificación",
-	"clearNotifications": "Borrar todas las notificaciones",
-	"hideNotificationsCenter": "Ocultar notificaciones",
-	"expandNotification": "Expandir notificación",
-	"collapseNotification": "Contraer notificación",
-	"configureNotification": "Configurar la Notificación",
-	"copyNotification": "Copiar texto"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/browser/parts/notifications/notificationsAlerts.i18n.json b/i18n/esn/src/vs/workbench/browser/parts/notifications/notificationsAlerts.i18n.json
deleted file mode 100644
index f03aa8f50b3..00000000000
--- a/i18n/esn/src/vs/workbench/browser/parts/notifications/notificationsAlerts.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"alertErrorMessage": "Error: {0}",
-	"alertWarningMessage": "Advertencia: {0}",
-	"alertInfoMessage": "Información: {0}"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json b/i18n/esn/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json
deleted file mode 100644
index 94aeba068ee..00000000000
--- a/i18n/esn/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"notificationsEmpty": "No hay notificaciones nuevas",
-	"notifications": "Notificaciones",
-	"notificationsToolbar": "Acciones del centro de notificaciones",
-	"notificationsList": "Lista de notificaciones"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/browser/parts/notifications/notificationsCommands.i18n.json b/i18n/esn/src/vs/workbench/browser/parts/notifications/notificationsCommands.i18n.json
deleted file mode 100644
index 246b8dbe2c2..00000000000
--- a/i18n/esn/src/vs/workbench/browser/parts/notifications/notificationsCommands.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"notifications": "Notificaciones",
-	"showNotifications": "Mostrar notificaciones",
-	"hideNotifications": "Ocultar notificaciones",
-	"clearAllNotifications": "Limpiar todas las notificaciones"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/browser/parts/notifications/notificationsStatus.i18n.json b/i18n/esn/src/vs/workbench/browser/parts/notifications/notificationsStatus.i18n.json
deleted file mode 100644
index e924b15c5c8..00000000000
--- a/i18n/esn/src/vs/workbench/browser/parts/notifications/notificationsStatus.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hideNotifications": "Ocultar notificaciones",
-	"zeroNotifications": "No hay notificaciones",
-	"noNotifications": "No hay nuevas notificaciones",
-	"oneNotification": "1 notificación nueva",
-	"notifications": "{0} notificaciones nuevas"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/browser/parts/notifications/notificationsToasts.i18n.json b/i18n/esn/src/vs/workbench/browser/parts/notifications/notificationsToasts.i18n.json
deleted file mode 100644
index 51c8e4e7237..00000000000
--- a/i18n/esn/src/vs/workbench/browser/parts/notifications/notificationsToasts.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"notificationsToast": "Notificación del sistema"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/browser/parts/notifications/notificationsViewer.i18n.json b/i18n/esn/src/vs/workbench/browser/parts/notifications/notificationsViewer.i18n.json
deleted file mode 100644
index 85c1c2fba14..00000000000
--- a/i18n/esn/src/vs/workbench/browser/parts/notifications/notificationsViewer.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"notificationActions": "Acciones de notificaciones",
-	"notificationSource": "Origen: {0}."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/browser/parts/panel/panelActions.i18n.json b/i18n/esn/src/vs/workbench/browser/parts/panel/panelActions.i18n.json
deleted file mode 100644
index 9c99791b708..00000000000
--- a/i18n/esn/src/vs/workbench/browser/parts/panel/panelActions.i18n.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"closePanel": "Cerrar panel",
-	"togglePanel": "Alternar panel",
-	"focusPanel": "Centrarse en el panel",
-	"toggledPanelPosition": "Posición de la palanca",
-	"moveToRight": "Mover a la derecha",
-	"moveToBottom": "Mover hacia abajo",
-	"toggleMaximizedPanel": "Alternar el panel maximizado",
-	"maximizePanel": "Maximizar el tamaño del panel",
-	"minimizePanel": "Restaurar el tamaño del panel",
-	"view": "Ver"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/browser/parts/panel/panelPart.i18n.json b/i18n/esn/src/vs/workbench/browser/parts/panel/panelPart.i18n.json
deleted file mode 100644
index f2c84bc783e..00000000000
--- a/i18n/esn/src/vs/workbench/browser/parts/panel/panelPart.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hidePanel": "Ocultar panel"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/browser/parts/quickinput/quickInput.i18n.json b/i18n/esn/src/vs/workbench/browser/parts/quickinput/quickInput.i18n.json
deleted file mode 100644
index 8a0f29393fc..00000000000
--- a/i18n/esn/src/vs/workbench/browser/parts/quickinput/quickInput.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"inputModeEntryDescription": "{0} (Presione \"Entrar\" para confirmar o \"Esc\" para cancelar)",
-	"inputModeEntry": "Presione \"Entrar\" para confirmar su entrada o \"Esc\" para cancelar",
-	"quickInput.countSelected": "{0} seleccionadas",
-	"ok": "Aceptar"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/browser/parts/quickinput/quickInputBox.i18n.json b/i18n/esn/src/vs/workbench/browser/parts/quickinput/quickInputBox.i18n.json
deleted file mode 100644
index c9120e6b4eb..00000000000
--- a/i18n/esn/src/vs/workbench/browser/parts/quickinput/quickInputBox.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"quickInputBox.ariaLabel": "Escriba para restringir los resultados."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/browser/parts/quickopen/quickOpenController.i18n.json b/i18n/esn/src/vs/workbench/browser/parts/quickopen/quickOpenController.i18n.json
deleted file mode 100644
index bf5e54155ed..00000000000
--- a/i18n/esn/src/vs/workbench/browser/parts/quickopen/quickOpenController.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"emptyPicks": "No hay entradas para seleccionar",
-	"quickOpenInput": "Escriba '?' para obtener ayuda con las acciones que puede realizar desde aquí",
-	"historyMatches": "abiertos recientemente",
-	"noResultsFound1": "No se encontraron resultados",
-	"canNotRunPlaceholder": "Este controlador de Quick Open no se puede usar en el contexto actual",
-	"entryAriaLabel": "{0}, abiertos recientemente",
-	"removeFromEditorHistory": "Quitar del historial",
-	"pickHistory": "Seleccione una entrada del editor para quitarla del historial"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/browser/parts/quickopen/quickopen.contribution.i18n.json b/i18n/esn/src/vs/workbench/browser/parts/quickopen/quickopen.contribution.i18n.json
deleted file mode 100644
index 7a95e7a0c69..00000000000
--- a/i18n/esn/src/vs/workbench/browser/parts/quickopen/quickopen.contribution.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"quickOpen": "Ir al archivo...",
-	"quickNavigateNext": "Navegar a siguiente en Quick Open",
-	"quickNavigatePrevious": "Navegar a anterior en Quick Open",
-	"quickSelectNext": "Seleccionar Siguiente en Quick Open",
-	"quickSelectPrevious": "Seleccionar Anterior en Quick Open"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/browser/parts/quickopen/quickopen.i18n.json b/i18n/esn/src/vs/workbench/browser/parts/quickopen/quickopen.i18n.json
deleted file mode 100644
index 8c7b929eb2c..00000000000
--- a/i18n/esn/src/vs/workbench/browser/parts/quickopen/quickopen.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"quickOpen": "Ir al archivo...",
-	"quickNavigateNext": "Navegar a siguiente en Quick Open",
-	"quickNavigatePrevious": "Navegar a anterior en Quick Open",
-	"quickSelectNext": "Seleccionar Siguiente en Quick Open",
-	"quickSelectPrevious": "Seleccionar Anterior en Quick Open"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/browser/parts/sidebar/sidebarPart.i18n.json b/i18n/esn/src/vs/workbench/browser/parts/sidebar/sidebarPart.i18n.json
deleted file mode 100644
index 9813cd2ca32..00000000000
--- a/i18n/esn/src/vs/workbench/browser/parts/sidebar/sidebarPart.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"focusSideBar": "Enfocar la barra lateral",
-	"viewCategory": "Ver"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/browser/parts/statusbar/statusbarPart.i18n.json b/i18n/esn/src/vs/workbench/browser/parts/statusbar/statusbarPart.i18n.json
deleted file mode 100644
index 865cb4bfc53..00000000000
--- a/i18n/esn/src/vs/workbench/browser/parts/statusbar/statusbarPart.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"manageExtension": "Administrar extensión"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/browser/parts/titlebar/titlebarPart.i18n.json b/i18n/esn/src/vs/workbench/browser/parts/titlebar/titlebarPart.i18n.json
deleted file mode 100644
index 8fdcbb58997..00000000000
--- a/i18n/esn/src/vs/workbench/browser/parts/titlebar/titlebarPart.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"patchedWindowTitle": " [No se admite]",
-	"userIsAdmin": "[Administrador]",
-	"userIsSudo": "[Superusuario]",
-	"devExtensionWindowTitlePrefix": "[Host de desarrollo de la extensión]"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/browser/parts/views/panelViewlet.i18n.json b/i18n/esn/src/vs/workbench/browser/parts/views/panelViewlet.i18n.json
deleted file mode 100644
index 87bd6297987..00000000000
--- a/i18n/esn/src/vs/workbench/browser/parts/views/panelViewlet.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"viewToolbarAriaLabel": "{0} acciones"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/browser/parts/views/views.i18n.json b/i18n/esn/src/vs/workbench/browser/parts/views/views.i18n.json
deleted file mode 100644
index f2487840d97..00000000000
--- a/i18n/esn/src/vs/workbench/browser/parts/views/views.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"viewToolbarAriaLabel": "{0} acciones",
-	"hideView": "Ocultar en la barra lateral"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/browser/parts/views/viewsRegistry.i18n.json b/i18n/esn/src/vs/workbench/browser/parts/views/viewsRegistry.i18n.json
deleted file mode 100644
index f22e31a7e45..00000000000
--- a/i18n/esn/src/vs/workbench/browser/parts/views/viewsRegistry.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"duplicateId": "Ya existe una vista registrada con el identificador '{0}' en la ubicación '{1}'"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/browser/parts/views/viewsViewlet.i18n.json b/i18n/esn/src/vs/workbench/browser/parts/views/viewsViewlet.i18n.json
deleted file mode 100644
index c918718f826..00000000000
--- a/i18n/esn/src/vs/workbench/browser/parts/views/viewsViewlet.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"cannot toggle": "La visibilidad no puede ser fijada para esta vista {0} ",
-	"cannot show": "Esta vista {0} no puede ser visualizada porque está oculta por su condición 'when'",
-	"hideView": "Ocultar"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/browser/quickopen.i18n.json b/i18n/esn/src/vs/workbench/browser/quickopen.i18n.json
deleted file mode 100644
index 05114e1ee35..00000000000
--- a/i18n/esn/src/vs/workbench/browser/quickopen.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noResultsMatching": "No hay resultados coincidentes",
-	"noResultsFound2": "No se encontraron resultados"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/browser/viewlet.i18n.json b/i18n/esn/src/vs/workbench/browser/viewlet.i18n.json
deleted file mode 100644
index 60af804b0fb..00000000000
--- a/i18n/esn/src/vs/workbench/browser/viewlet.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"compositePart.hideSideBarLabel": "Ocultar barra lateral",
-	"collapse": "Contraer todo"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/common/theme.i18n.json b/i18n/esn/src/vs/workbench/common/theme.i18n.json
deleted file mode 100644
index a12ae1a7d50..00000000000
--- a/i18n/esn/src/vs/workbench/common/theme.i18n.json
+++ /dev/null
@@ -1,72 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"tabActiveBackground": "Color de fondo de la pestaña activa. Las pestañas son los contenedores de los editores en el área de editores. Se pueden abrir varias pestañas en un grupo de editores. Puede haber varios grupos de editores.",
-	"tabInactiveBackground": "Color de fondo de la pestaña inactiva. Las pestañas son los contenedores de los editores en el área de editores. Se pueden abrir varias pestañas en un grupo de editores. Puede haber varios grupos de editores.",
-	"tabHoverBackground": "Color de fondo de la pestaña activa. Las pestañas son los contenedores de los editores en el área de editores. Se pueden abrir varias pestañas en un grupo de editores. Puede haber varios grupos de editores. ",
-	"tabUnfocusedHoverBackground": "Color de fondo de tabulación en un grupo no enfocado cuando se pasa. Las fichas son los contenedores para los editores en el área del editor. Se pueden abrir varias fichas en un grupo de editores. Puede haber varios grupos de editores.",
-	"tabBorder": "Borde para separar las pestañas entre sí. Las pestañas son contenedores de editores en el área de editores. Se pueden abrir varias pestañas en un grupo de editores. Puede haber varios grupos de editores.",
-	"tabActiveBorder": "Borde en la parte inferior de una ficha activa. Las fichas son los contenedores para los editores en el área de edición. Múltiple pestañas pueden abrirse en un grupo de editor. Puede haber múltiples grupos de editor. ",
-	"tabActiveBorderTop": "Borde a la parte superior de una pestaña activa. Las pestañas son los contenedores para los editores en el área del editor. Se pueden abrir múltiples pestañas en un grupo de editores. Puede haber múltiples grupos de editores.",
-	"tabActiveUnfocusedBorder": "Borde en la parte inferior de una pestaña activa para un grupo no seleccionado. Las pestañas son los contenedores para los editores en el área del editor. Se pueden abrir múltiples pestañas en un grupo de editores. Puede haber múltiples grupos de editores.",
-	"tabActiveUnfocusedBorderTop": "Borde en la parte superior de una pestaña activa para un grupo no seleccionado. Las pestañas son los contenedores para los editores en el área del editor. Se pueden abrir múltiples pestañas en un grupo de editores. Puede haber múltiples grupos de editores.",
-	"tabHoverBorder": "Borde para resaltar tabulaciones cuando se activan. Las fichas son los contenedores para los editores en el área del editor. Se pueden abrir varias fichas en un grupo de editores. Puede haber varios grupos de editores. ",
-	"tabUnfocusedHoverBorder": "Borde para resaltar tabulaciones cuando se activan. Las fichas son los contenedores para los editores en el área del editor. Se pueden abrir varias fichas en un grupo de editores. Puede haber varios grupos de editores. ",
-	"tabActiveForeground": "Color de primer plano de la pestaña activa en un grupo activo. Las pestañas son los contenedores de los editores en el área de editores. Se pueden abrir varias pestañas en un grupo de editores. Puede haber varios grupos de editores.",
-	"tabInactiveForeground": "Color de primer plano de la pestaña inactiva en un grupo activo. Las pestañas son los contenedores de los editores en el área de editores. Se pueden abrir varias pestañas en un grupo de editores. Puede haber varios grupos de editores.",
-	"tabUnfocusedActiveForeground": "Color de primer plano de la ficha activa en un grupo que no tiene el foco. Las fichas son los contenedores de los editores en el área de editores. Se pueden abrir varias fichas en un grupo de editores. Puede haber varios grupos de editores. ",
-	"tabUnfocusedInactiveForeground": "Color de primer plano de las fichas inactivas en un grupo que no tiene el foco. Las fichas son los contenedores de los editores en el área de editores. Se pueden abrir varias fichas en un grupo de editores. Puede haber varios grupos de editores. ",
-	"editorGroupBackground": "Color de fondo de un grupo de editores. Los grupos de editores son los contenedores de los editores. El color de fondo se ve cuando se mueven arrastrando los grupos de editores.",
-	"tabsContainerBackground": "Color de fondo del encabezado del título del grupo de editores cuando las fichas están habilitadas. Los grupos de editores son contenedores de editores.",
-	"tabsContainerBorder": "Color de borde del encabezado del título del grupo de editores cuando las fichas están habilitadas. Los grupos de editores son contenedores de editores.",
-	"editorGroupHeaderBackground": "Color de fondo del encabezado de título del grupo editor cuando las tabulaciones están deshabilitadas (' \"Workbench. Editor. showTabs \": false '). Los grupos editor son los contenedores de los editores.",
-	"editorGroupBorder": "Color para separar varios grupos de editores entre sí. Los grupos de editores son los contenedores de los editores.",
-	"editorDragAndDropBackground": "Color de fondo cuando se arrastran los editores. El color debería tener transparencia para que el contenido del editor pueda brillar a su través.",
-	"panelBackground": "Color de fondo del panel. Los paneles se muestran debajo del área de editores y contienen vistas, como Salida y Terminal integrado.",
-	"panelBorder": "El color del borde superior del panel que lo separa del editor. Los paneles se muestran debajo del área de editores y contienen vistas, como la salida y la terminal integrada.",
-	"panelActiveTitleForeground": "Color del título del panel activo. Los paneles se muestran debajo del área del editor y contienen vistas como Salida y Terminal integrado.",
-	"panelInactiveTitleForeground": "Color del título del panel inactivo. Los paneles se muestran debajo del área del editor y contienen vistas como Salida y Terminal integrado.",
-	"panelActiveTitleBorder": "Color de borde del título del panel activo. Los paneles se muestran debajo del área del editor y contienen vistas como Salida y Terminal integrado.",
-	"panelDragAndDropBackground": "Arrastre y suelte color comentarios para los artículos de título del panel. El color debe tener transparencia para que las entradas del panel todavía pueden brillar a través. Los paneles se muestran debajo de la zona de editor y contienen vistas como salida y el terminal integrado.",
-	"statusBarForeground": "Color de primer plano de la barra de estado cuando se abre un espacio de trabajo. La barra de estado se muestra en la parte inferior de la ventana.",
-	"statusBarNoFolderForeground": "Color de primer plano de la barra de estado cuando no hay ninguna carpeta abierta. La barra de estado se muestra en la parte inferior de la ventana.",
-	"statusBarBackground": "Color de fondo de la barra de estado cuando se abre un espacio de trabajo. La barra de estado se muestra en la parte inferior de la ventana.",
-	"statusBarNoFolderBackground": "Color de fondo de la barra de estado cuando no hay ninguna carpeta abierta. La barra de estado se muestra en la parte inferior de la ventana.",
-	"statusBarBorder": "Color de borde de la barra de estado que separa la barra lateral y el editor. La barra de estado se muestra en la parte inferior de la ventana.",
-	"statusBarNoFolderBorder": "Color de borde de la barra de estado que separa la barra lateral y el editor cuando no hay ninguna carpeta abierta. La barra de estado se muestra en la parte inferior de la ventana.",
-	"statusBarItemActiveBackground": "Color de fondo de un elemento de la barra de estado al hacer clic. La barra de estado se muestra en la parte inferior de la ventana.",
-	"statusBarItemHoverBackground": "Color de fondo de un elemento de la barra de estado al mantener el puntero. La barra de estado se muestra en la parte inferior de la ventana.",
-	"statusBarProminentItemBackground": "Barra de estado elementos prominentes color de fondo. Los artículos prominentes se destacan de otras entradas de la barra de estado para indicar importancia, Cambiar el modo de  'Toggle Tab Key Moves Focus' de la paleta de comandos para ver un ejemplo. La barra de estado se muestra en la parte inferior de la ventana.",
-	"statusBarProminentItemHoverBackground": "Barra de estado elementos prominentes color de fondo cuando se activa. Los artículos prominentes se destacan de otras entradas de la barra de estado para indicar importancia. Cambiar el modo de 'Toggle Tab Key Moves Focus' de la paleta de comandos para ver un ejemplo. La barra de estado se muestra en la parte inferior de la ventana.",
-	"activityBarBackground": "Color de fondo de la barra de actividad, que se muestra en el lado izquierdo o derecho y que permite cambiar entre diferentes vistas de la barra lateral.",
-	"activityBarForeground": "Color de fondo de la barra de actividad (por ejemplo utilizado por los iconos). La barra de actividad muestra en el lado izquierdo o derecho y permite cambiar entre diferentes vistas de la barra lateral.",
-	"activityBarBorder": "Color de borde de la barra de actividad que separa la barra lateral. La barra de actividad se muestra en el extremo derecho o izquierdo y permite cambiar entre las vistas de la barra lateral.",
-	"activityBarDragAndDropBackground": "Arrastre y suelte el color de las sugerencias para los elementos de la barra de actividad. El color debería tener transparencias, de forma que los elementos de la barra continúen siendo visibles a través de él. La barra de actividad se muestra en el extremo izquierdo o derecho y permite cambiar entre distintas vistas de la barra lateral.",
-	"activityBarBadgeBackground": "Color de fondo de distintivo de notificación de actividad. La barra de actividad se muestra en el extremo izquierdo o derecho y permite cambiar entre vistas de la barra lateral.",
-	"activityBarBadgeForeground": "Color de primer plano de distintivo de notificación de actividad. La barra de actividad se muestra en el extremo izquierdo o derecho y permite cambiar entre vistas de la barra lateral.",
-	"sideBarBackground": "Color de fondo de la barra lateral, que es el contenedor de vistas como Explorador y Búsqueda.",
-	"sideBarForeground": "Color de primer plano de la barra lateral, que es el contenedor de vistas como Explorador y Búsqueda.",
-	"sideBarBorder": "Color de borde de la barra lateral en el lado que separa el editor. La barra lateral es el contenedor de vistas como Explorador y Búsqueda.",
-	"sideBarTitleForeground": "Color de primer plano del título de la barra lateral, que es el contenedor de vistas como Explorador y Búsqueda.",
-	"sideBarDragAndDropBackground": "Color de arrastrar y colocar comentarios para las secciones de la barra lateral. El color debe tener transparencia para permitir que se vean las secciones de la barra lateral, que es el contenedor para vistas como la del explorador o la de búsqueda.",
-	"sideBarSectionHeaderBackground": "Color de fondo del encabezado de sección de la barra lateral, que es el contenedor de vistas como Explorador y Búsqueda.",
-	"sideBarSectionHeaderForeground": "Color de primer plano del encabezado de sección de la barra lateral, que es el contenedor de vistas como Explorador y Búsqueda.",
-	"titleBarActiveForeground": "Color de primer plano de la barra de título cuando la ventana está activa. Tenga en cuenta que, actualmente, este clor solo se admite en macOS.",
-	"titleBarInactiveForeground": "Color de primer plano de la barra de título cuando la ventana está inactiva. Tenga en cuenta que, actualmente, este color solo se admite en macOS.",
-	"titleBarActiveBackground": "Fondo de la barra de título cuando la ventana está activa. Tenga en cuenta que, actualmente, este color solo se admite en macOS.",
-	"titleBarInactiveBackground": "Color de fondo de la barra de título cuando la ventana está inactiva. Tenga en cuenta que, actualmente, este color solo se admite en macOS.",
-	"titleBarBorder": "Color de borde de la barra de título. Tenga en cuenta que, actualmente, este color se admite solo en macOS.",
-	"notificationCenterBorder": "Color del borde del centro de notificaciones. Las notificaciones se deslizan desde la parte inferior derecha de la ventana.",
-	"notificationToastBorder": "Color del borde de las notificaciones del sistema. Las notificaciones se deslizan desde la parte inferior derecha de la ventana.",
-	"notificationsForeground": "Color de primer plano de las notificaciones. Las notificaciones se deslizan desde la parte inferior derecha de la ventana.",
-	"notificationsBackground": "Color de fondo de las notificaciones. Las notificaciones se deslizan desde la parte inferior derecha de la ventana.",
-	"notificationsLink": "Color de primer plano de los vínculos de las notificaciones. Las notificaciones se deslizan desde la parte inferior derecha de la ventana.",
-	"notificationCenterHeaderForeground": "Color de primer plano del encabezado del centro de notificaciones. Las notificaciones se deslizan desde la parte inferior derecha de la ventana.",
-	"notificationCenterHeaderBackground": "Color de fondo del encabezado del centro de notificaciones. Las notificaciones se deslizan desde la parte inferior derecha de la ventana.",
-	"notificationsBorder": "Color de borde que separa las notificaciones en el centro de notificaciones. Las notificaciones se deslizan desde la parte inferior derecha de la ventana."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/common/views.i18n.json b/i18n/esn/src/vs/workbench/common/views.i18n.json
deleted file mode 100644
index 9bb6104842d..00000000000
--- a/i18n/esn/src/vs/workbench/common/views.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"duplicateId": "La vista con id '{0}' ya se encuentra registrada en la ubicación '{1}' "
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/electron-browser/actions.i18n.json b/i18n/esn/src/vs/workbench/electron-browser/actions.i18n.json
deleted file mode 100644
index 89fe344b57b..00000000000
--- a/i18n/esn/src/vs/workbench/electron-browser/actions.i18n.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"closeWindow": "Cerrar ventana",
-	"closeWorkspace": "Cerrar área de trabajo",
-	"noWorkspaceOpened": "No hay ninguna área de trabajo abierta en esta instancia para cerrarla.",
-	"newWindow": "Nueva ventana",
-	"toggleFullScreen": "Alternar pantalla completa",
-	"toggleMenuBar": "Alternar barra de menús",
-	"toggleDevTools": "Alternar herramientas de desarrollo",
-	"zoomIn": "Acercar",
-	"zoomOut": "Alejar",
-	"zoomReset": "Restablecer zoom",
-	"appPerf": "Rendimiento de inicio",
-	"reloadWindow": "Recargar ventana",
-	"reloadWindowWithExntesionsDisabled": "Recargar la ventana con las extensiones deshabilitadas",
-	"switchWindowPlaceHolder": "Seleccionar una ventana a la que cambiar",
-	"current": "Ventana actual",
-	"close": "Cerrar ventana",
-	"switchWindow": "Cambiar de Ventana...",
-	"quickSwitchWindow": "Cambio Rápido de Ventana...",
-	"workspaces": "áreas de trabajo",
-	"files": "archivos",
-	"openRecentPlaceHolderMac": "Seleccione para abrir (mantenga presionada la tecla Comando para abrir en una ventana nueva)",
-	"openRecentPlaceHolder": "Seleccione para abrir (mantenga presionada la tecla Ctrl para abrir en una ventana nueva)",
-	"remove": "Quitar de abiertos recientemente",
-	"openRecent": "Abrir Reciente...",
-	"quickOpenRecent": "Abrir Reciente Rapidamente...",
-	"reportIssueInEnglish": "Notificar problema",
-	"openProcessExplorer": "Abrir Explorador de Procesos",
-	"reportPerformanceIssue": "Notificar problema de rendimiento",
-	"keybindingsReference": "Referencia de métodos abreviados de teclado",
-	"openDocumentationUrl": "Documentación",
-	"openIntroductoryVideosUrl": "Vídeos de introducción",
-	"openTipsAndTricksUrl": "Sugerencias y trucos",
-	"toggleSharedProcess": "Alternar proceso compartido",
-	"navigateLeft": "Navegar a la Vista de la Izquierda",
-	"navigateRight": "Navegar a la Vista de la Derecha",
-	"navigateUp": "Navegar a la Vista Superior",
-	"navigateDown": "Navegar a la Vista Inferior",
-	"increaseViewSize": "Aumentar tamaño de vista actual",
-	"decreaseViewSize": "Reducir tamaño de vista actual",
-	"showPreviousTab": "Mostrar pestaña de ventana anterior",
-	"showNextWindowTab": "Mostrar siguiente pestaña de ventana",
-	"moveWindowTabToNewWindow": "Mover pestaña de ventana a una nueva ventana",
-	"mergeAllWindowTabs": "Fusionar todas las ventanas",
-	"toggleWindowTabsBar": "Alternar barra de pestañas de ventana",
-	"about": "Acerca de {0}",
-	"inspect context keys": "Inspeccionar claves de contexto"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/electron-browser/commands.i18n.json b/i18n/esn/src/vs/workbench/electron-browser/commands.i18n.json
deleted file mode 100644
index 983899514ca..00000000000
--- a/i18n/esn/src/vs/workbench/electron-browser/commands.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"diffLeftRightLabel": "{0} ⟷ {1}"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/electron-browser/configureLocale.i18n.json b/i18n/esn/src/vs/workbench/electron-browser/configureLocale.i18n.json
deleted file mode 100644
index 949ae20646f..00000000000
--- a/i18n/esn/src/vs/workbench/electron-browser/configureLocale.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"configureLocale": "Configurar idioma",
-	"displayLanguage": "Define el lenguaje para mostrar de VSCode.",
-	"doc": "Consulte {0} para obtener una lista de idiomas compatibles.",
-	"restart": "Al cambiar el valor se requiere reiniciar VSCode.",
-	"fail.createSettings": "No se puede crear '{0}' ({1}).",
-	"JsonSchema.locale": "Idioma de la interfaz de usuario que debe usarse."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/electron-browser/crashReporter.i18n.json b/i18n/esn/src/vs/workbench/electron-browser/crashReporter.i18n.json
deleted file mode 100644
index fb3b052d7b4..00000000000
--- a/i18n/esn/src/vs/workbench/electron-browser/crashReporter.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"telemetryConfigurationTitle": "Telemetría",
-	"telemetry.enableCrashReporting": "Habilite los informes de bloqueo para enviarlos a Microsoft. Esta opción requiere reiniciar para que tenga efecto."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/electron-browser/extensionHost.i18n.json b/i18n/esn/src/vs/workbench/electron-browser/extensionHost.i18n.json
deleted file mode 100644
index 6fbb60d36bd..00000000000
--- a/i18n/esn/src/vs/workbench/electron-browser/extensionHost.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"extensionHostProcess.startupFailDebug": "El host de extensiones no se inició en 10 segundos, puede que se detenga en la primera línea y necesita un depurador para continuar.",
-	"extensionHostProcess.startupFail": "El host de extensiones no se inició en 10 segundos, lo cual puede ser un problema.",
-	"extensionHostProcess.error": "Error del host de extensiones: {0}",
-	"devTools": "Herramientas de desarrollo",
-	"extensionHostProcess.crash": "El host de extensiones finalizó inesperadamente. Recargue la ventana para recuperarlo."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/electron-browser/main.contribution.i18n.json b/i18n/esn/src/vs/workbench/electron-browser/main.contribution.i18n.json
deleted file mode 100644
index 57d447a0a0b..00000000000
--- a/i18n/esn/src/vs/workbench/electron-browser/main.contribution.i18n.json
+++ /dev/null
@@ -1,91 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"view": "Ver",
-	"help": "Ayuda",
-	"file": "Archivo",
-	"workspaces": "Áreas de trabajo",
-	"developer": "Desarrollador",
-	"workbenchConfigurationTitle": "Área de trabajo",
-	"showEditorTabs": "Controla si los editores abiertos se deben mostrar o no en pestañas.",
-	"workbench.editor.labelFormat.default": "Mostrar el nombre del archivo. Cuando están habilitadas las pestañas y dos archivos tienen el mismo nombre en un grupo se agregan las secciones de distinguinshing de ruta de cada archivo. Cuando se desactivan las pestañas, se muestra la ruta de acceso relativa a la carpeta de trabajo si el editor está activo.",
-	"workbench.editor.labelFormat.short": "Mostrar el nombre del archivo seguido de su nombre de directorio.",
-	"workbench.editor.labelFormat.medium": "Mostrar el nombre del archivo seguido de la ruta de acceso relativa a la carpeta de espacio de trabajo.",
-	"workbench.editor.labelFormat.long": "Mostrar el nombre del archivo seguido de la ruta de acceso absoluta.",
-	"tabDescription": "Controla el formato de la etiqueta para un editor. Modificar este ajuste puede hacer, por ejemplo, que sea más fácil entender la ubicación de un archivo: - corta: 'parent' - media: 'workspace/src/parent' - larga: '/home/user/workspace/src/parect' - por defecto: '.../parent', cuando otra pestaña comparte el mismo título, o la ruta de acceso relativa del espacio de trabajo si las pestañas están deshabilitadas",
-	"editorTabCloseButton": "Controla la posición de los botones de cierre de pestañas del editor o los deshabilita si se establece en \"off\".",
-	"tabSizing": "Controla el tamaño de las pestañas del editor. Configurado para 'fit' para mantener las pestañas siempre lo suficientemente grandes para mostrar la etiqueta completa del editor. Establezca 'shrink' para permitir que las pestañas se vuelvan más pequeñas cuando el espacio disponible no sea suficiente para mostrar todas las pestañas juntas.",
-	"showIcons": "Controla si los editores abiertos deben mostrarse o no con un icono. Requiere que también se habilite un tema de icono.",
-	"enablePreview": "Controla si los editores abiertos se muestran en vista previa. Los editores en vista previa se reutilizan hasta que se guardan (por ejemplo, mediante doble clic o editándolos) y se muestran en cursiva.",
-	"enablePreviewFromQuickOpen": "Controla si los editores abiertos mediante Quick Open se muestran en modo de vista previa. Los editores en modo de vista previa se reutilizan hasta que se conservan (por ejemplo, mediante doble clic o editándolos).",
-	"closeOnFileDelete": "Controla si los editores que muestran un archivo deben cerrarse automáticamente cuando otro proceso elimina el archivo o le cambia el nombre. Si se deshabilita esta opción y se da alguna de estas circunstancias, se mantiene el editor abierto con modificaciones. Tenga en cuenta que, cuando se eliminan archivos desde la aplicación, siempre se cierra el editor y que los archivos con modificaciones no se cierran nunca para preservar los datos.",
-	"editorOpenPositioning": "Controla dónde se abren los editores. Seleccione 'izquierda' o 'derecha' para abrir los editores situados a la izquierda o la derecha del que está actualmente activo. Seleccione 'primero' o 'último' para abrir los editores con independencia del que esté actualmente activo. ",
-	"revealIfOpen": "Controla si un editor se muestra en alguno de los grupos visibles cuando se abre. Si se deshabilita esta opción, un editor preferirá abrirse en el grupo de editores activo en ese momento. Si se habilita, un editor ya abierto se mostrará en lugar de volver a abrirse en el grupo de editores activo. Tenga en cuenta que hay casos en los que esta opción se omite; por ejemplo, cuando se fuerza la apertura de un editor en un grupo específico o junto al grupo activo actual.",
-	"swipeToNavigate": "Navegar entre achivos abiertos utlizando la pulsación de tres dedos para deslizar horizontalmante.",
-	"commandHistory": "Controla el número de comandos utilizados recientemente que se mantendrán en el historial de la paleta de comandos. Establezca el valor a 0 para desactivar el historial de comandos.",
-	"preserveInput": "Controla si la última entrada introducida en la paleta de comandos debería ser restaurada cuando sea abierta la próxima vez.",
-	"closeOnFocusLost": "Controla si Quick Open debe cerrarse automáticamente cuando pierde el foco.",
-	"openDefaultSettings": "Controla si la configuración de apertura también abre un editor que muestra todos los valores predeterminados.",
-	"sideBarLocation": "Controla la ubicación de la barra lateral. Puede mostrarse a la izquierda o a la derecha del área de trabajo.",
-	"panelDefaultLocation": "Controla la ubicación predeterminada del panel. Puede mostrarse en la parte inferior o a la derecha de la mesa de banco.",
-	"statusBarVisibility": "Controla la visibilidad de la barra de estado en la parte inferior del área de trabajo.",
-	"activityBarVisibility": "Controla la visibilidad de la barra de actividades en el área de trabajo.",
-	"viewVisibility": "Controla la visibilidad de las acciones en el encabezado de la vista. Las acciones en el encabezado de la vista pueden ser siempre visibles, o solo cuando la vista es enfocada o apuntada.",
-	"fontAliasing": "Controla el método de suavizado de fuentes en la mesa de trabajo.\n-por defecto: subpíxel suavizado de fuentes. En la mayoría las pantallas retina no dará el texto más agudo - alisado: suavizar la fuente a nivel del píxel, a diferencia de los subpíxeles. Puede hacer que la fuente aparezca más general - ninguno: desactiva el suavizado de fuentes. Texto se mostrará con dentados filos - auto: se aplica el 'default' o 'antialiasing' automáticamente en función de la DPI de la muestra.",
-	"workbench.fontAliasing.default": "Suavizado de fuentes en subpíxeles. En la mayoría de las pantallas que no son Retina, esta opción muestra el texto más nítido.",
-	"workbench.fontAliasing.antialiased": "Suaviza las fuentes en píxeles, en lugar de subpíxeles. Puede hacer que las fuentes se vean más claras en general.",
-	"workbench.fontAliasing.none": "Deshabilita el suavizado de fuentes. El texto se muestra con bordes nítidos irregulares.",
-	"workbench.fontAliasing.auto": "Aplica ' default ' o ' antialiased ' automáticamente basándose en la DPI de las pantallas.",
-	"enableNaturalLanguageSettingsSearch": "Controla si habilita el modo de búsqueda de lenguaje natural para la configuración.",
-	"windowConfigurationTitle": "Ventana",
-	"window.openFilesInNewWindow.on": "Los archivos se abrirán en una nueva ventana",
-	"window.openFilesInNewWindow.off": "Los archivos se abrirán en la ventana con la carpeta de archivos abierta o en la última ventana activa",
-	"window.openFilesInNewWindow.defaultMac": "Los archivos se abrirán en la ventana con la carpeta de archivos abierta o en la última ventana activa, a menos que se abran con Dock o desde Finder.",
-	"window.openFilesInNewWindow.default": "Los archivos se abrirán en una nueva ventana hasta que sean llamados dentro de la aplicación (ej.: via menú Archivo)",
-	"openFilesInNewWindowMac": "Controla si los archivos deben abrirse en una ventana nueva.\n- default: los archivos se abrirán en la ventana con la carpeta de archivos abierta o en la última ventana activa, a menos que se abran con Dock o desde Finder.\n- on: los archivos se abrirán en una ventana nueva.\n- off: los archivos se abrirán en la ventana con la carpeta de archivos abierta o en la última ventana activa.\nTenga en cuenta que puede haber casos en los que se omita esta configuración (por ejemplo, cuando se utilizan las opciones de la línea de comandos -new-window o -reuse-window). ",
-	"openFilesInNewWindow": "Controla si los archivos deben abrirse en una ventana nueva.\n- default: los archivos se abrirán en una ventana nueva a menos que se seleccionen desde la aplicación (por ejemplo, desde el menú Archivo).\n- on: los archivos se abrirán en una ventana nueva.\n- off: los archivos se abrirán en la ventana con la carpeta de archivos abierta o en la última ventana activa.\nTenga en cuenta que puede haber casos en los que se omita esta configuración (por ejemplo, cuando se utilizan las opciones de la línea de comandos -new-window o -reuse-window).",
-	"window.openFoldersInNewWindow.on": "Las carpetas se abrirán en una nueva ventana",
-	"window.openFoldersInNewWindow.off": "Las carpetas reemplazarán la ventana activa más reciente",
-	"window.openFoldersInNewWindow.default": "Las carpetas se abrirán en una nueva ventana a menos que se seleccione una carpeta desde la aplicación (p. ej. mediante el menú Archivo)",
-	"openFoldersInNewWindow": "Controla si las carpetas deben abrirse en una ventana nueva o reemplazar la última ventana activa.\n- default: las carpetas se abrirán en una ventana nueva, a menos que se seleccione una carpeta desde la aplicación (por ejemplo, desde el menú Archivo)\n- on: las carpetas se abrirán en una ventana nueva\n- off: las carpetas reemplazarán la última ventana activa\nTenga en cuenta que aún puede haber casos en los que este parámetro se ignore (por ejemplo, al usar la opción de la línea de comandos -new-window o -reuse-window).",
-	"window.openWithoutArgumentsInNewWindow.on": "Abrir una nueva ventana vacía",
-	"window.openWithoutArgumentsInNewWindow.off": "Aplicar el foco a la última instancia en ejecución activa",
-	"openWithoutArgumentsInNewWindow": "Controla si debe abrirse una ventana nueva vacía cuando se inicia una segunda instancia sin argumentos o si la última instancia en ejecución debe obtener el foco.\n- on: se abre una ventana nueva vacía.\n- off: la última instancia en ejecución activa obtiene el foco.\nTenga en cuenta que puede haber casos en los que se omita esta configuración (por ejemplo, cuando se utilizan las opciones de la línea de comandos -new-window o -reuse-window).",
-	"window.reopenFolders.all": "Reabrir todas las ventanas.",
-	"window.reopenFolders.folders": "Reabrir todas las carpetas. Las áreas de trabajo vacías no se restaurarán.",
-	"window.reopenFolders.one": "Reabrir la última ventana activa.",
-	"window.reopenFolders.none": "Nunca reabrir una ventana. Empezar siempre con una vacía.",
-	"restoreWindows": "Controla cómo se vuelven a abrir las ventanas tras un reinicio. Seleccione \"none\" para comenzar siempre con un área de trabajo vacía, \"one\" para volver a abrir la última ventana en la que trabajó, \"folders\" para volver a abrir todas las ventanas que tenían carpetas abiertas o \"all\" para volver a abrir todas las ventanas de la última sesión.",
-	"restoreFullscreen": "Controla si una ventana se debe restaurar al modo de pantalla completa si se salió de ella en dicho modo.",
-	"zoomLevel": "Ajuste el nivel de zoom de la ventana. El tamaño original es 0 y cada incremento (por ejemplo, 1) o disminución (por ejemplo, -1) representa una aplicación de zoom un 20 % más grande o más pequeño. También puede especificar decimales para ajustar el nivel de zoom con una granularidad más precisa.",
-	"title": "Controla el título de la ventana en función del editor activo. Las variables se reemplazan según el contexto:\n${activeEditorShort}: nombre del archivo (por ejemplo, miArchivo.txt).\n${activeEditorMedium}: ruta de acceso del archivo relativa a la carpeta del área de trabajo (por ejemplo, miCarpeta/miArchivo.txt).\n${activeEditorLong}: ruta de acceso completa del archivo (por ejemplo, /Usuarios/Desarrollo/miProyecto/miCarpeta/miArchivo.txt).\n${folderName}: nombre de la carpeta del área de trabajo que contiene el archivo (por ejemplo, miCarpeta).\n${folderPath}: ruta de acceso de la carpeta del área de trabajo que contiene el archivo (por ejemplo, /Usuarios/Desarrollo/miCarpeta).\n${rootName}: nombre del área de trabajo (por ejemplo, miCarpeta o miÁreaDeTrabajo).\n${rootPath}: ruta de acceso del área de trabajo (por ejemplo, /Usuarios/Desarrollo/miÁreaDeTrabajo).\n${appName}: nombre de la aplicación (por ejemplo, VS Code).\n${dirty}: indicador de modificaciones si se han realizado cambios en el editor activo.\n${separator}: separador condicional (\" - \") que solo se muestra cuando está rodeado de variables con valores o texto estático.",
-	"window.newWindowDimensions.default": "Abrir las nuevas ventanas en el centro de la pantalla.",
-	"window.newWindowDimensions.inherit": "Abrir las nuevas ventanas con la misma dimensión que la última activa.",
-	"window.newWindowDimensions.maximized": "Abrir las nuevas ventanas maximizadas.",
-	"window.newWindowDimensions.fullscreen": "Abrir las nuevas ventanas en modo de pantalla completa.",
-	"newWindowDimensions": "Controla las dimensiones de la nueva ventana cuando ya existe alguna ventana abierta. Por defecto, una nueva ventana se abrirá en el centro de la pantalla con dimensiones pequeñas. Cuando se establece como 'heredar', la ventana tomará las dimensiones de la última ventana activa. Cuando se establece a 'maximizar', la ventana se abrirá maximizada, y a pantalla completa si fue configurada como 'pantalla completa'. Tenga en cuenta que esta configuración no afecta a la primera ventana abierta. La primera ventana siempre restaurará el tamaño y posición en la que quedó antes de ser cerrada.",
-	"closeWhenEmpty": "Controla si, al cerrar el último editor, debe cerrarse también la ventana. Esta configuración se aplica solo a ventanas que no muestran carpetas.",
-	"window.menuBarVisibility.default": "El menú solo está oculto en modo de pantalla completa.",
-	"window.menuBarVisibility.visible": "El menú está siempre visible incluso en modo de pantalla completa.",
-	"window.menuBarVisibility.toggle": "El menú está oculto pero se puede mostrar mediante la tecla Alt.",
-	"window.menuBarVisibility.hidden": "El menú está siempre oculto.",
-	"menuBarVisibility": "Controla la visibilidad de la barra de menús. El valor \"alternar\" significa que la barra de menús está oculta y que se mostrará al presionar una sola vez la tecla Alt. La barra de menús estará visible de forma predeterminada, a menos que se use el modo de pantalla completa para la ventana.",
-	"enableMenuBarMnemonics": "Si se activa, los menús principales se pueden abrir por mediación de los métodos abreviados Alt-tecla. Desactivar los mnemónicos permite vincular estos métodos Alt-tecla a comandos del editor.",
-	"autoDetectHighContrast": "Si está habilitado, se cambiará automáticamente al tema de contraste alto si Windows utiliza un tema de contraste alto, y al tema oscuro si cambia desde un tema de contraste alto de Windows.",
-	"titleBarStyle": "Ajuste la apariencia de la barra de título de la ventana. Se debe realizar un reinicio completo para aplicar los cambios.",
-	"window.nativeTabs": "Habilita las fichas de ventana en macOS Sierra. Note que los cambios requieren que reinicie el equipo y las fichas nativas deshabilitan cualquier estilo personalizado que haya configurado.",
-	"window.smoothScrollingWorkaround": "Habilite esta solución alternativa si el desplazamiento deja de ser homogéneo después de restaurar una ventana de VS Code minimizada. Esta es una solución para un problema (https://github.com/Microsoft/vscode/issues/13612) en el que el desplazamiento comienza a sufrir interrupciones en dispositivos con panel táctil de precisión, como los dispositivos Surface de Microsoft. Al habilitar esta solución alternativa, puede parpadear ligeramente la distribución después de restaurar la ventana minimizada, pero no afecta a nada más.",
-	"window.clickThroughInactive": "Si está habilitado, haciendo clic en una ventana inactiva, activará dicha ventana y disparará el elemento bajo el cursor del ratón si éste es clicable. Si está deshabilitado, haciendo clic en cualquier lugar en una ventana inactiva, solo activará la misma y será necesario un segundo clic en el elemento. ",
-	"zenModeConfigurationTitle": "Modo zen",
-	"zenMode.fullScreen": "Controla si activar el modo Zen pone también el trabajo en modo de pantalla completa.",
-	"zenMode.centerLayout": "Controla si al encender el Modo Zen también se centra el diseño.",
-	"zenMode.hideTabs": "Controla si la activación del modo zen también oculta las pestañas del área de trabajo.",
-	"zenMode.hideStatusBar": "Controla si la activación del modo zen oculta también la barra de estado en la parte inferior del área de trabajo.",
-	"zenMode.hideActivityBar": "Controla si la activación del modo zen oculta también la barra de estado en la parte izquierda del área de trabajo.",
-	"zenMode.restore": "Controla si una ventana debe restaurarse a modo zen si se cerró en modo zen."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/electron-browser/main.i18n.json b/i18n/esn/src/vs/workbench/electron-browser/main.i18n.json
deleted file mode 100644
index c6d1ac38216..00000000000
--- a/i18n/esn/src/vs/workbench/electron-browser/main.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"loaderError": "No se pudo cargar un archivo necesario. O bien no está conectado a Internet o el servidor al que se había conectado está sin conexión. Actualice el explorador y vuelva a intentarlo.",
-	"loaderErrorNative": "No se pudo cargar un archivo requerido. Reinicie la aplicación para intentarlo de nuevo. Detalles: {0}"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/electron-browser/shell.i18n.json b/i18n/esn/src/vs/workbench/electron-browser/shell.i18n.json
deleted file mode 100644
index 403b7012cbe..00000000000
--- a/i18n/esn/src/vs/workbench/electron-browser/shell.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"runningAsRoot": "Se recomienda no ejecutar Code como 'root'."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/electron-browser/window.i18n.json b/i18n/esn/src/vs/workbench/electron-browser/window.i18n.json
deleted file mode 100644
index e8aa1b0f0ad..00000000000
--- a/i18n/esn/src/vs/workbench/electron-browser/window.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"undo": "Deshacer",
-	"redo": "Rehacer",
-	"cut": "Cortar",
-	"copy": "Copiar",
-	"paste": "Pegar",
-	"selectAll": "Seleccionar todo",
-	"runningAsRoot": "No se recomienda ejecutar {0} como usuario root."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/electron-browser/workbench.i18n.json b/i18n/esn/src/vs/workbench/electron-browser/workbench.i18n.json
deleted file mode 100644
index 6adfbee5c0c..00000000000
--- a/i18n/esn/src/vs/workbench/electron-browser/workbench.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"developer": "Desarrollador",
-	"file": "Archivo"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/node/extensionHostMain.i18n.json b/i18n/esn/src/vs/workbench/node/extensionHostMain.i18n.json
deleted file mode 100644
index 41d75fe9e75..00000000000
--- a/i18n/esn/src/vs/workbench/node/extensionHostMain.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"extensionTestError": "La ruta de acceso {0} no apunta a un ejecutor de pruebas de extensión."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/node/extensionPoints.i18n.json b/i18n/esn/src/vs/workbench/node/extensionPoints.i18n.json
deleted file mode 100644
index 32947c0a2b0..00000000000
--- a/i18n/esn/src/vs/workbench/node/extensionPoints.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"jsonParseFail": "No se pudo analizar {0}: {1}.",
-	"fileReadFail": "No se puede leer el archivo {0}: {1}.",
-	"jsonsParseFail": "No se pudo analizar {0} o {1}:{2}.",
-	"missingNLSKey": "No se encontró un mensaje para la clave {0}."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/cli/electron-browser/cli.contribution.i18n.json b/i18n/esn/src/vs/workbench/parts/cli/electron-browser/cli.contribution.i18n.json
deleted file mode 100644
index 280fd922895..00000000000
--- a/i18n/esn/src/vs/workbench/parts/cli/electron-browser/cli.contribution.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"install": "Instalar el comando '{0}' en PATH",
-	"not available": "Este comando no está disponible",
-	"successIn": "El comando shell '{0}' se instaló correctamente en PATH.",
-	"ok": "Aceptar",
-	"cancel2": "Cancelar",
-	"warnEscalation": "Ahora el código solicitará privilegios de administrador con \"osascript\" para instalar el comando shell.",
-	"cantCreateBinFolder": "No se puede crear \"/usr/local/bin\".",
-	"aborted": "Anulado",
-	"uninstall": "Desinstalar el comando '{0}' de PATH",
-	"successFrom": "El comando shell '{0}' se desinstaló correctamente de PATH.",
-	"shellCommand": "Comando shell"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/codeEditor/electron-browser/accessibility.i18n.json b/i18n/esn/src/vs/workbench/parts/codeEditor/electron-browser/accessibility.i18n.json
deleted file mode 100644
index b6dfdf83bc4..00000000000
--- a/i18n/esn/src/vs/workbench/parts/codeEditor/electron-browser/accessibility.i18n.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"emergencyConfOn": "Se cambiará ahora el valor de configuración \"editor.accessibilitySupport\" a \"activado\".",
-	"openingDocs": "Se abrirá ahora la página de documentación de accesibilidad de VS Code.",
-	"introMsg": "Gracias por probar las opciones de accesibilidad de VS Code.",
-	"status": "Estado:",
-	"changeConfigToOnMac": "Para configurar el editor de forma que esté optimizado de permanentemente para su uso con un lector de pantalla, presione ahora Comando+E.",
-	"changeConfigToOnWinLinux": "Para configurar el editor de forma que esté optimizado permanentemente para su uso con un lector de pantalla, presione ahora Control+E.",
-	"auto_unknown": "El editor está configurado para usar API de plataforma para detectar cuándo está conectado un lector de pantalla, pero el entorno actual de tiempo de ejecución no admite esta característica.",
-	"auto_on": "El editor ha detectado automáticamente un lector de pantalla conectado.",
-	"auto_off": "El editor está configurado para detectar automáticamente cuándo está conectado un lector de pantalla, lo que no es el caso en este momento.",
-	"configuredOn": "El editor está configurado para optimizarse permanentemente para su uso con un lector de pantalla; para cambiar este comportamiento, edite el valor de configuración \"editor.accessibilitySupport\".",
-	"configuredOff": "El editor está configurado de forma que no esté nunca optimizado para su uso con un lector de pantalla.",
-	"tabFocusModeOnMsg": "Al presionar TAB en el editor actual, el foco se mueve al siguiente elemento activable. Presione {0} para activar o desactivar este comportamiento.",
-	"tabFocusModeOnMsgNoKb": "Al presionar TAB en el editor actual, el foco se mueve al siguiente elemento activable. El comando {0} no se puede desencadenar actualmente mediante un enlace de teclado.",
-	"tabFocusModeOffMsg": "Al presionar TAB en el editor actual, se insertará el carácter de tabulación. Presione {0} para activar o desactivar este comportamiento.",
-	"tabFocusModeOffMsgNoKb": "Al presionar TAB en el editor actual, se insertará el carácter de tabulación. El comando {0} no se puede desencadenar actualmente mediante un enlace de teclado.",
-	"openDocMac": "Presione Comando+H ahora para abrir una ventana de explorador con más información de VS Code relacionada con la accesibilidad.",
-	"openDocWinLinux": "Presione Control+H ahora para abrir una ventana de explorador con más información de VS Code relacionada con la accesibilidad.",
-	"outroMsg": "Para descartar esta información sobre herramientas y volver al editor, presione Esc o Mayús+Escape.",
-	"ShowAccessibilityHelpAction": "Mostrar ayuda de accesibilidad"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/codeEditor/electron-browser/inspectKeybindings.i18n.json b/i18n/esn/src/vs/workbench/parts/codeEditor/electron-browser/inspectKeybindings.i18n.json
deleted file mode 100644
index 03953f0e013..00000000000
--- a/i18n/esn/src/vs/workbench/parts/codeEditor/electron-browser/inspectKeybindings.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"workbench.action.inspectKeyMap": "Desarrollador: inspeccionar asignaciones de teclas "
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/codeEditor/electron-browser/inspectTMScopes.i18n.json b/i18n/esn/src/vs/workbench/parts/codeEditor/electron-browser/inspectTMScopes.i18n.json
deleted file mode 100644
index 3c11c7eb062..00000000000
--- a/i18n/esn/src/vs/workbench/parts/codeEditor/electron-browser/inspectTMScopes.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"inspectTMScopes": "Desarrollador: Inspeccionar ámbitos de TM",
-	"inspectTMScopesWidget.loading": "Cargando..."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/codeEditor/electron-browser/languageConfiguration/languageConfigurationExtensionPoint.i18n.json b/i18n/esn/src/vs/workbench/parts/codeEditor/electron-browser/languageConfiguration/languageConfigurationExtensionPoint.i18n.json
deleted file mode 100644
index 6a27fe695c2..00000000000
--- a/i18n/esn/src/vs/workbench/parts/codeEditor/electron-browser/languageConfiguration/languageConfigurationExtensionPoint.i18n.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"parseErrors": "Errores al analizar {0}: {1}",
-	"schema.openBracket": "Secuencia de cadena o corchete de apertura.",
-	"schema.closeBracket": "Secuencia de cadena o corchete de cierre.",
-	"schema.comments": "Define los símbolos de comentario",
-	"schema.blockComments": "Define cómo se marcan los comentarios de bloque.",
-	"schema.blockComment.begin": "Secuencia de caracteres que inicia un comentario de bloque.",
-	"schema.blockComment.end": "Secuencia de caracteres que finaliza un comentario de bloque.",
-	"schema.lineComment": "Secuencia de caracteres que inicia un comentario de línea.",
-	"schema.brackets": "Define los corchetes que aumentan o reducen la sangría.",
-	"schema.autoClosingPairs": "Define el par de corchetes. Cuando se escribe un corchete de apertura, se inserta automáticamente el corchete de cierre.",
-	"schema.autoClosingPairs.notIn": "Define una lista de ámbitos donde los pares automáticos están deshabilitados.",
-	"schema.surroundingPairs": "Define los pares de corchetes que se pueden usar para encerrar una cadena seleccionada.",
-	"schema.wordPattern": " La definición de la palabra en el idioma.",
-	"schema.wordPattern.pattern": "El patrón de expresión regular utilizado para localizar palabras.",
-	"schema.wordPattern.flags": "Los flags de expresión regular utilizados para localizar palabras.",
-	"schema.wordPattern.flags.errorMessage": "Debe coincidir con el patrón `/^([gimuy]+)$/`.",
-	"schema.indentationRules": "Configuración de sangría del idioma.",
-	"schema.indentationRules.increaseIndentPattern": "Si una línea coincide con este patrón, todas las líneas después de ella deben sangrarse una vez (hasta que otra regla coincida). ",
-	"schema.indentationRules.increaseIndentPattern.pattern": "El patrón de RegExp para increaseIndentPattern.",
-	"schema.indentationRules.increaseIndentPattern.flags": "Las marcas de RegExp para increaseIndentPattern.",
-	"schema.indentationRules.increaseIndentPattern.errorMessage": "Debe coincidir con el patrón `/^([gimuy]+)$/`.",
-	"schema.indentationRules.decreaseIndentPattern": "Si una línea coincide con este patrón, se deben quitar la sangría de todas las líneas después de ella una vez (hasta que otra regla coincida).",
-	"schema.indentationRules.decreaseIndentPattern.pattern": "El patrón de RegExp para decreaseIndentPattern.",
-	"schema.indentationRules.decreaseIndentPattern.flags": "Las marcas de RegExp para decreaseIndentPattern.",
-	"schema.indentationRules.decreaseIndentPattern.errorMessage": "Debe coincidir con el patrón `/^([gimuy]+)$/`.",
-	"schema.indentationRules.indentNextLinePattern": "Si una línea coincide con este patrón **solo la línea siguiente** después de ella se debe sangrar una vez.",
-	"schema.indentationRules.indentNextLinePattern.pattern": "El patrón de RegExp para indentNextLinePattern.",
-	"schema.indentationRules.indentNextLinePattern.flags": "El patrón de RegExp para indentNextLinePattern.",
-	"schema.indentationRules.indentNextLinePattern.errorMessage": "Debe coincidir con el patrón `/^([gimuy]+)$/`.",
-	"schema.indentationRules.unIndentedLinePattern": "Si una línea coincide con este patrón, su sangría no se debe cambiar y no se debe evaluar utilizando las otras reglas.",
-	"schema.indentationRules.unIndentedLinePattern.pattern": "El patrón de RegExp para unIndentedLinePattern.",
-	"schema.indentationRules.unIndentedLinePattern.flags": "Las marcas de RegExp para unIndentedLinePattern.",
-	"schema.indentationRules.unIndentedLinePattern.errorMessage": "Debe coincidir con el patrón `/^([gimuy]+)$/`.",
-	"schema.folding": "Configuración del plegamiento de idioma.",
-	"schema.folding.offSide": "Un idioma se adhiere a la regla del fuera de juego si los bloques en ese idioma se expresan por su sangría. Si se establece, las líneas vacías pertenecen al bloque posterior.",
-	"schema.folding.markers": "Marcadores de plegado específicos de un idioma, como \"'#region\" o \"#endregion\". Se probarán los valores regex en relación con el contenido de todas las líneas, y deben estar diseñados de manera eficiente.",
-	"schema.folding.markers.start": "El patrón de expresión regular para el marcador de inicio. La expresión regular debe comenzar con '^'.",
-	"schema.folding.markers.end": "El patrón de expresión regular para el marcador de fin. La expresión regular debe comenzar con '^'."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/codeEditor/electron-browser/largeFileOptimizations.i18n.json b/i18n/esn/src/vs/workbench/parts/codeEditor/electron-browser/largeFileOptimizations.i18n.json
deleted file mode 100644
index a2543152c8a..00000000000
--- a/i18n/esn/src/vs/workbench/parts/codeEditor/electron-browser/largeFileOptimizations.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"largeFile": "{0}: la tokenización, ajuste y plegado han sido desactivadas para este archivo de gran tamaño con el fin de reducir el uso de memoria y evitar su cierre o bloqueo.",
-	"neverShowAgain": "De acuerdo. No volver a mostrar.",
-	"removeOptimizations": "Forzar la activación de características",
-	"reopenFilePrompt": "Vuelva a abrir el archivo para que esta configuración surta efecto."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/codeEditor/electron-browser/textMate/inspectTMScopes.i18n.json b/i18n/esn/src/vs/workbench/parts/codeEditor/electron-browser/textMate/inspectTMScopes.i18n.json
deleted file mode 100644
index f9a25639281..00000000000
--- a/i18n/esn/src/vs/workbench/parts/codeEditor/electron-browser/textMate/inspectTMScopes.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"inspectTMScopes": "Desarrollador: Inspeccionar ámbitos de TM",
-	"inspectTMScopesWidget.loading": "Cargando..."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/codeEditor/electron-browser/toggleMinimap.i18n.json b/i18n/esn/src/vs/workbench/parts/codeEditor/electron-browser/toggleMinimap.i18n.json
deleted file mode 100644
index 5748eeef865..00000000000
--- a/i18n/esn/src/vs/workbench/parts/codeEditor/electron-browser/toggleMinimap.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleMinimap": "Ver: Alternar minimapa"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/codeEditor/electron-browser/toggleMultiCursorModifier.i18n.json b/i18n/esn/src/vs/workbench/parts/codeEditor/electron-browser/toggleMultiCursorModifier.i18n.json
deleted file mode 100644
index 8146c26f96e..00000000000
--- a/i18n/esn/src/vs/workbench/parts/codeEditor/electron-browser/toggleMultiCursorModifier.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleLocation": "Alternar modificador multicursor"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderControlCharacter.i18n.json b/i18n/esn/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderControlCharacter.i18n.json
deleted file mode 100644
index c2a66591e49..00000000000
--- a/i18n/esn/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderControlCharacter.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleRenderControlCharacters": "Ver: Alternar caracteres de control"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderWhitespace.i18n.json b/i18n/esn/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderWhitespace.i18n.json
deleted file mode 100644
index 42cfbca9ac2..00000000000
--- a/i18n/esn/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderWhitespace.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleRenderWhitespace": "Ver: Alternar representación de espacio en blanco"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/codeEditor/electron-browser/toggleWordWrap.i18n.json b/i18n/esn/src/vs/workbench/parts/codeEditor/electron-browser/toggleWordWrap.i18n.json
deleted file mode 100644
index d6294bf00ef..00000000000
--- a/i18n/esn/src/vs/workbench/parts/codeEditor/electron-browser/toggleWordWrap.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggle.wordwrap": "Ver: Alternar ajuste de línea",
-	"wordWrap.notInDiffEditor": "No se puede alternar ajuste de línea en un editor de diferencias.",
-	"unwrapMinified": "Deshabilitar ajuste para este archivo",
-	"wrapMinified": "Habilitar ajuste para este archivo"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/codeEditor/electron-browser/wordWrapMigration.i18n.json b/i18n/esn/src/vs/workbench/parts/codeEditor/electron-browser/wordWrapMigration.i18n.json
deleted file mode 100644
index a679d3a2e83..00000000000
--- a/i18n/esn/src/vs/workbench/parts/codeEditor/electron-browser/wordWrapMigration.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"wordWrapMigration.ok": "Aceptar",
-	"wordWrapMigration.dontShowAgain": "No volver a mostrar",
-	"wordWrapMigration.openSettings": "Abrir configuración",
-	"wordWrapMigration.prompt": "El valor de configuración \"editor.wrappingColumn\" se ha dejado de usar en favor de \"editor.wordWrap\"."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/debug/browser/breakpointWidget.i18n.json b/i18n/esn/src/vs/workbench/parts/debug/browser/breakpointWidget.i18n.json
deleted file mode 100644
index 49142c09760..00000000000
--- a/i18n/esn/src/vs/workbench/parts/debug/browser/breakpointWidget.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"breakpointWidgetExpressionPlaceholder": "Interrumpir cuando la expresión se evalúa como true. Presione \"ENTRAR\" para aceptar o \"Esc\" para cancelar.",
-	"breakpointWidgetAriaLabel": "El programa solo se detendrá aquí si esta condición es true. Presione ENTRAR para aceptar o Esc para cancelar.",
-	"breakpointWidgetHitCountPlaceholder": "Interrumpir cuando se alcance el número de llamadas. Presione \"ENTRAR\" para aceptar o \"Esc\" para cancelar.",
-	"breakpointWidgetHitCountAriaLabel": "El programa solo se detendrá aquí si se alcanza el número de llamadas. Presione ENTRAR para aceptar o Esc para cancelar.",
-	"expression": "Expresión",
-	"hitCount": "Número de llamadas"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json b/i18n/esn/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
deleted file mode 100644
index b7d4e9cddd0..00000000000
--- a/i18n/esn/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"logPoint": "Punto de registro",
-	"breakpoint": "Punto de interrupción",
-	"editBreakpoint": "Editar {0}...",
-	"removeBreakpoint": "Quitar {0}",
-	"functionBreakpointsNotSupported": "Este tipo de depuración no admite puntos de interrupción en funciones",
-	"functionBreakpointPlaceholder": "Función donde interrumpir",
-	"functionBreakPointInputAriaLabel": "Escribir punto de interrupción de función",
-	"breakpointDisabledHover": "Punto de interrupción deshabilitado",
-	"breakpointUnverifieddHover": "Punto de interrupción no comprobado",
-	"functionBreakpointUnsupported": "Este tipo de depuración no admite puntos de interrupción en funciones",
-	"breakpointDirtydHover": "Punto de interrupción no comprobado. El archivo se ha modificado, reinicie la sesión de depuración.",
-	"logBreakpointUnsupported": "Logpoints no son compatible con este tipo de depuración",
-	"conditionalBreakpointUnsupported": "Este tipo de depuración no es compatible con los puntos de interrupción condicionales.",
-	"hitBreakpointUnsupported": "Este tipo de depuración no admite el uso de puntos de interrupción condicionales"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/debug/browser/debugActionItems.i18n.json b/i18n/esn/src/vs/workbench/parts/debug/browser/debugActionItems.i18n.json
deleted file mode 100644
index f7ca04589cb..00000000000
--- a/i18n/esn/src/vs/workbench/parts/debug/browser/debugActionItems.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noConfigurations": "No hay configuraciones",
-	"addConfigTo": "Agregar configuración ({0})...",
-	"addConfiguration": "Agregar configuración..."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/debug/browser/debugActions.i18n.json b/i18n/esn/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
deleted file mode 100644
index 101c6add143..00000000000
--- a/i18n/esn/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openLaunchJson": "Abrir {0}",
-	"launchJsonNeedsConfigurtion": "Configurar o reparar 'launch.json'",
-	"noFolderDebugConfig": "Abra una carpeta para trabajar con la configuración avanzada de depuración.",
-	"startDebug": "Iniciar depuración",
-	"startWithoutDebugging": "Iniciar sin depurar",
-	"selectAndStartDebugging": "Seleccionar e iniciar la depuración",
-	"restartDebug": "Reiniciar",
-	"reconnectDebug": "Volver a conectar",
-	"stepOverDebug": "Depurar paso a paso por procedimientos",
-	"stepIntoDebug": "Depurar paso a paso por instrucciones",
-	"stepOutDebug": "Salir de la depuración",
-	"stopDebug": "Detener",
-	"disconnectDebug": "Desconectar",
-	"continueDebug": "Continuar",
-	"pauseDebug": "Pausar",
-	"terminateThread": "Terminar hilo de ejecución",
-	"restartFrame": "Reiniciar marco",
-	"removeBreakpoint": "Quitar punto de interrupción",
-	"removeAllBreakpoints": "Quitar todos los puntos de interrupción",
-	"enableAllBreakpoints": "Habilitar todos los puntos de interrupción",
-	"disableAllBreakpoints": "Deshabilitar todos los puntos de interrupción",
-	"activateBreakpoints": "Activar puntos de interrupción",
-	"deactivateBreakpoints": "Desactivar puntos de interrupción",
-	"reapplyAllBreakpoints": "Volver a aplicar todos los puntos de interrupción",
-	"addFunctionBreakpoint": "Agregar punto de interrupción de función",
-	"setValue": "Establecer valor",
-	"addWatchExpression": "Agregar expresión",
-	"editWatchExpression": "Editar expresión",
-	"addToWatchExpressions": "Agregar a inspección",
-	"removeWatchExpression": "Quitar expresión",
-	"removeAllWatchExpressions": "Quitar todas las expresiones",
-	"clearRepl": "Borrar consola",
-	"debugConsoleAction": "Consola de depuración",
-	"unreadOutput": "Nueva salida en la consola de depuración",
-	"debugFocusConsole": "Enfocar consola de depuración",
-	"focusSession": "Sesión de foco",
-	"stepBackDebug": "Retroceder",
-	"reverseContinue": "Invertir"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/debug/browser/debugActionsWidget.i18n.json b/i18n/esn/src/vs/workbench/parts/debug/browser/debugActionsWidget.i18n.json
deleted file mode 100644
index 707d1667ca7..00000000000
--- a/i18n/esn/src/vs/workbench/parts/debug/browser/debugActionsWidget.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"debugToolBarBackground": "Color de fondo de la barra de herramientas de depuración",
-	"debugToolBarBorder": "Color de borde de la barra de herramientas de depuración "
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/debug/browser/debugCommands.i18n.json b/i18n/esn/src/vs/workbench/parts/debug/browser/debugCommands.i18n.json
deleted file mode 100644
index bc73c2e0690..00000000000
--- a/i18n/esn/src/vs/workbench/parts/debug/browser/debugCommands.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noFolderDebugConfig": "Abra una carpeta para trabajar con la configuración avanzada de depuración.",
-	"inlineBreakpoint": "Punto de interrupción insertado",
-	"debug": "Depurar",
-	"addInlineBreakpoint": "Agregar punto de interrupción insertado"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/debug/browser/debugContentProvider.i18n.json b/i18n/esn/src/vs/workbench/parts/debug/browser/debugContentProvider.i18n.json
deleted file mode 100644
index 82d1a899997..00000000000
--- a/i18n/esn/src/vs/workbench/parts/debug/browser/debugContentProvider.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"unable": "No se puede resolver el recurso sin una sesión de depuración",
-	"canNotResolveSource": "No se puede resolver el recurso {0}, no hay respuesta de la extensión de depuración."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json b/i18n/esn/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
deleted file mode 100644
index 712a034280e..00000000000
--- a/i18n/esn/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleBreakpointAction": "Depuración: Alternar punto de interrupción",
-	"conditionalBreakpointEditorAction": "Depuración: agregar punto de interrupción condicional...",
-	"logPointEditorAction": "Depuración: Agregar punto de registro...",
-	"runToCursor": "Ejecutar hasta el cursor",
-	"debugEvaluate": "Depuración: Evaluar",
-	"debugAddToWatch": "Depuración: Agregar a inspección",
-	"showDebugHover": "Depuración: Mostrar al mantener el puntero",
-	"goToNextBreakpoint": "Depuración: Ir al siguiente punto de interrupción",
-	"goToPreviousBreakpoint": "Depuración: Ir al punto de interrupción anterior"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/debug/browser/debugEditorModelManager.i18n.json b/i18n/esn/src/vs/workbench/parts/debug/browser/debugEditorModelManager.i18n.json
deleted file mode 100644
index 80c79a95e69..00000000000
--- a/i18n/esn/src/vs/workbench/parts/debug/browser/debugEditorModelManager.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"breakpointDisabledHover": "Punto de interrupción deshabilitado",
-	"breakpointUnverifieddHover": "Punto de interrupción no comprobado",
-	"breakpointDirtydHover": "Punto de interrupción no comprobado. El archivo se ha modificado, reinicie la sesión de depuración.",
-	"breakpointUnsupported": "Este tipo de depuración no es compatible con los puntos de interrupción condicionales."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/debug/browser/debugQuickOpen.i18n.json b/i18n/esn/src/vs/workbench/parts/debug/browser/debugQuickOpen.i18n.json
deleted file mode 100644
index 22f564913b1..00000000000
--- a/i18n/esn/src/vs/workbench/parts/debug/browser/debugQuickOpen.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"entryAriaLabel": "{0}, depurar",
-	"debugAriaLabel": "Escriba un nombre de una configuración de inicio para ejecutar.",
-	"addConfigTo": "Agregar configuración ({0})...",
-	"addConfiguration": "Agregar configuración...",
-	"noConfigurationsMatching": "No hay ninguna configuración de depuración coincidente",
-	"noConfigurationsFound": "No se encontró ninguna configuración de inicio. Cree un archivo \"launch.json\"."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/debug/browser/debugStatus.i18n.json b/i18n/esn/src/vs/workbench/parts/debug/browser/debugStatus.i18n.json
deleted file mode 100644
index 065c0919852..00000000000
--- a/i18n/esn/src/vs/workbench/parts/debug/browser/debugStatus.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"selectAndStartDebug": "Seleccionar e iniciar la configuración de depuración"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/debug/browser/debugViewlet.i18n.json b/i18n/esn/src/vs/workbench/parts/debug/browser/debugViewlet.i18n.json
deleted file mode 100644
index 57da62e9618..00000000000
--- a/i18n/esn/src/vs/workbench/parts/debug/browser/debugViewlet.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"startAdditionalSession": "Iniciar otra sesión",
-	"debugFocusVariablesView": "Variables de Enfoque ",
-	"debugFocusWatchView": "Reloj de enfoque",
-	"debugFocusCallStackView": "Pila de Enfoque ",
-	"debugFocusBreakpointsView": "Puntos de interrupción de enfoque"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/debug/browser/exceptionWidget.i18n.json b/i18n/esn/src/vs/workbench/parts/debug/browser/exceptionWidget.i18n.json
deleted file mode 100644
index 59dee8db3e7..00000000000
--- a/i18n/esn/src/vs/workbench/parts/debug/browser/exceptionWidget.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"debugExceptionWidgetBorder": "Color de borde del widget de excepciones.",
-	"debugExceptionWidgetBackground": "Color de fondo del widget de excepciones.",
-	"exceptionThrownWithId": "Se produjo una excepción: {0}",
-	"exceptionThrown": "Se produjo una excepción."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/debug/browser/linkDetector.i18n.json b/i18n/esn/src/vs/workbench/parts/debug/browser/linkDetector.i18n.json
deleted file mode 100644
index 44b94b11392..00000000000
--- a/i18n/esn/src/vs/workbench/parts/debug/browser/linkDetector.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"fileLinkMac": "Clic para seguir (Cmd + clic se abre en el lateral)",
-	"fileLink": "Clic para seguir (Ctrl + clic se abre en el lateral)"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/debug/browser/statusbarColorProvider.i18n.json b/i18n/esn/src/vs/workbench/parts/debug/browser/statusbarColorProvider.i18n.json
deleted file mode 100644
index decfe5f17ec..00000000000
--- a/i18n/esn/src/vs/workbench/parts/debug/browser/statusbarColorProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"statusBarDebuggingBackground": "Color de fondo de la barra de estado cuando se está depurando un programa. La barra de estado se muestra en la parte inferior de la ventana",
-	"statusBarDebuggingForeground": "Color de primer plano de la barra de estado cuando se está depurando un programa. La barra de estado se muestra en la parte inferior de la ventana",
-	"statusBarDebuggingBorder": "Color de borde de la barra de estado que separa la barra lateral y el editor cuando se está depurando un programa. La barra de estado se muestra en la parte inferior de la ventana."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/debug/common/debug.i18n.json b/i18n/esn/src/vs/workbench/parts/debug/common/debug.i18n.json
deleted file mode 100644
index 5ac11c695f8..00000000000
--- a/i18n/esn/src/vs/workbench/parts/debug/common/debug.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"internalConsoleOptions": "Controla el comportamiento de la consola de depuración interna."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/debug/common/debugModel.i18n.json b/i18n/esn/src/vs/workbench/parts/debug/common/debugModel.i18n.json
deleted file mode 100644
index b91c2c6431f..00000000000
--- a/i18n/esn/src/vs/workbench/parts/debug/common/debugModel.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"notAvailable": "no disponible",
-	"startDebugFirst": "Inicie una sesión de depuración para evaluar"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/debug/common/debugSchemas.i18n.json b/i18n/esn/src/vs/workbench/parts/debug/common/debugSchemas.i18n.json
deleted file mode 100644
index 7ea3ee38079..00000000000
--- a/i18n/esn/src/vs/workbench/parts/debug/common/debugSchemas.i18n.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.contributes.debuggers": "Aporta adaptadores de depuración.",
-	"vscode.extension.contributes.debuggers.type": "Identificador único de este adaptador de depuración.",
-	"vscode.extension.contributes.debuggers.label": "Nombre para mostrar del adaptador de depuración.",
-	"vscode.extension.contributes.debuggers.program": "Ruta de acceso al programa de adaptadores de depuración, que puede ser absoluta o relativa respecto a la carpeta de extensión.",
-	"vscode.extension.contributes.debuggers.args": "Argumentos opcionales que se pasarán al adaptador.",
-	"vscode.extension.contributes.debuggers.runtime": "Entorno de ejecución opcional en caso de que el atributo del programa no sea un ejecutable pero requiera un entorno de ejecución.",
-	"vscode.extension.contributes.debuggers.runtimeArgs": "Argumentos de entorno de ejecución opcionales.",
-	"vscode.extension.contributes.debuggers.variables": "Asignación de variables interactivas (por ejemplo, ${action.pickProcess}) en `launch.json` a un comando.",
-	"vscode.extension.contributes.debuggers.initialConfigurations": "Configuraciones para generar el archivo \"launch.json\" inicial.",
-	"vscode.extension.contributes.debuggers.languages": "Lista de lenguajes para los que la extensión de depuración podría considerarse el \"depurador predeterminado\".",
-	"vscode.extension.contributes.debuggers.adapterExecutableCommand": "Si se especifica, VS Code llamará a este comando para determinar la ruta de acceso ejecutable del adaptador de depuración y los argumentos que se deben pasar.",
-	"vscode.extension.contributes.debuggers.configurationSnippets": "Fragmentos de código para agregar nuevas configuraciones a \"launch.json\".",
-	"vscode.extension.contributes.debuggers.configurationAttributes": "Configuraciones de esquema JSON para validar \"launch.json\".",
-	"vscode.extension.contributes.debuggers.windows": "Configuración específica de Windows.",
-	"vscode.extension.contributes.debuggers.windows.runtime": "Entorno de ejecución que se usa para Windows.",
-	"vscode.extension.contributes.debuggers.osx": "Configuración específica de macOS",
-	"vscode.extension.contributes.debuggers.osx.runtime": "Entorno de ejecución utilizado para macOS.",
-	"vscode.extension.contributes.debuggers.linux": "Configuración específica de Linux.",
-	"vscode.extension.contributes.debuggers.linux.runtime": "Entorno de ejecución que se usa para Linux.",
-	"vscode.extension.contributes.breakpoints": "Aporta puntos de interrupción.",
-	"vscode.extension.contributes.breakpoints.language": "Permite puntos de interrupción para este lenguaje.",
-	"app.launch.json.title": "Iniciar",
-	"app.launch.json.version": "Versión de este formato de archivo.",
-	"app.launch.json.configurations": "Lista de configuraciones. Agregue configuraciones nuevas o edite las ya existentes con IntelliSense.",
-	"app.launch.json.compounds": "Lista de elementos compuestos. Cada elemento compuesto hace referencia a varias configuraciones, que se iniciarán conjuntamente.",
-	"app.launch.json.compound.name": "Nombre del elemento compuesto. Aparece en el menú desplegable de la configuración de inicio.",
-	"useUniqueNames": "Por favor utilice nombres de configuración exclusivos.",
-	"app.launch.json.compound.folder": "Nombre de la carpeta en la que se encuentra el compuesto.",
-	"app.launch.json.compounds.configurations": "Nombres de las configuraciones que se iniciarán como parte de este elemento compuesto."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/debug/common/debugSource.i18n.json b/i18n/esn/src/vs/workbench/parts/debug/common/debugSource.i18n.json
deleted file mode 100644
index abb25915918..00000000000
--- a/i18n/esn/src/vs/workbench/parts/debug/common/debugSource.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"unknownSource": "Origen desconocido"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json b/i18n/esn/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
deleted file mode 100644
index b238709d15f..00000000000
--- a/i18n/esn/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"breakpointWidgetLogMessagePlaceholder": "Mensaje para registrar cuando se alcanza el punto de interrupción. Las expresiones entre {} son interpoladas. 'Enter' para aceptar, 'esc' para cancelar. ",
-	"breakpointWidgetHitCountPlaceholder": "Interrumpir cuando se alcance el número de llamadas. Presione \"ENTRAR\" para aceptar o \"Esc\" para cancelar.",
-	"breakpointWidgetExpressionPlaceholder": "Interrumpir cuando la expresión se evalúa como true. Presione \"ENTRAR\" para aceptar o \"Esc\" para cancelar.",
-	"expression": "Expresión",
-	"hitCount": "Número de llamadas",
-	"logMessage": "Mensaje de registro"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/debug/electron-browser/breakpointsView.i18n.json b/i18n/esn/src/vs/workbench/parts/debug/electron-browser/breakpointsView.i18n.json
deleted file mode 100644
index c6d889287a1..00000000000
--- a/i18n/esn/src/vs/workbench/parts/debug/electron-browser/breakpointsView.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"editConditionalBreakpoint": "Editar punto de interrupción...",
-	"functionBreakpointsNotSupported": "Este tipo de depuración no admite puntos de interrupción en funciones",
-	"functionBreakpointPlaceholder": "Función donde interrumpir",
-	"functionBreakPointInputAriaLabel": "Escribir punto de interrupción de función"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/debug/electron-browser/callStackView.i18n.json b/i18n/esn/src/vs/workbench/parts/debug/electron-browser/callStackView.i18n.json
deleted file mode 100644
index 96d97d2bfed..00000000000
--- a/i18n/esn/src/vs/workbench/parts/debug/electron-browser/callStackView.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"callstackSection": "Sección de la pila de llamadas",
-	"debugStopped": "En pausa en {0}",
-	"callStackAriaLabel": "Pila de llamadas de la depuración",
-	"session": "Sesión",
-	"paused": "En pausa",
-	"running": "En ejecución",
-	"thread": "Subproceso",
-	"pausedOn": "En pausa en {0}",
-	"loadMoreStackFrames": "Cargar más marcos de pila",
-	"threadAriaLabel": "Subproceso {0}, pila de llamadas, depuración",
-	"stackFrameAriaLabel": "Marco de pila {0} línea {1} {2}, pila de llamadas, depuración"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json b/i18n/esn/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
deleted file mode 100644
index 876a90b705c..00000000000
--- a/i18n/esn/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleDebugViewlet": "Mostrar depuración",
-	"toggleDebugPanel": "Consola de depuración",
-	"debug": "Depurar",
-	"debugPanel": "Consola de depuración",
-	"variables": "Variables",
-	"watch": "Inspección",
-	"callStack": "Pila de llamadas",
-	"breakpoints": "Puntos de interrupción",
-	"view": "Ver",
-	"debugCategory": "Depurar",
-	"debugCommands": "Configuración de depuración",
-	"debugConfigurationTitle": "Depurar",
-	"allowBreakpointsEverywhere": "Permite establecer un punto de interrupción en cualquier archivo.",
-	"openExplorerOnEnd": "Abrir automáticamente la vista del explorador al final de una sesión de depuración",
-	"inlineValues": "Mostrar valores de variable en línea en el editor durante la depuración",
-	"toolBarLocation": "Controla la ubicación de la barra de herramientas de depuración: \"floating\" (flotante) en todas las vistas, \"docked\" (acoplada) en la vista de depuración o \"hidden\" (oculta).",
-	"never": "Nunca mostrar debug en la barra de estado",
-	"always": "Siempre mostrar debug en la barra de estado",
-	"onFirstSessionStart": "Mostrar debug en la barra de estado solamente después del primero uso de debug",
-	"showInStatusBar": "Controla cuando se debe mostrar la barra de estado de depuración",
-	"openDebug": "Controla si debe abrirse la vista de depuración al iniciar una sesión de depuración.",
-	"enableAllHovers": "Controla si el indicador de no depuración debe estar habilitado durante la depuración. Si es cierto, se llamará a los proveedores de flotadores para que proporcionen un flotador. No se mostrarán los flotadores regulares incluso si este ajuste es verdadero.",
-	"launch": "Configuración de lanzamiento para depuración global. Debe utilizarse como una alternativa a “launch.json” en espacios de trabajo compartidos."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/debug/electron-browser/debugCommands.i18n.json b/i18n/esn/src/vs/workbench/parts/debug/electron-browser/debugCommands.i18n.json
deleted file mode 100644
index 4b3bdf11899..00000000000
--- a/i18n/esn/src/vs/workbench/parts/debug/electron-browser/debugCommands.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noFolderDebugConfig": "Abra una carpeta para trabajar con la configuración avanzada de depuración."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json b/i18n/esn/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json
deleted file mode 100644
index a41188f042e..00000000000
--- a/i18n/esn/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"debugNoType": "El 'tipo' de depurador no se puede omitir y debe ser de tipo 'cadena'. ",
-	"selectDebug": "Seleccionar entorno",
-	"DebugConfig.failed": "No se puede crear el archivo \"launch.json\" dentro de la carpeta \".vscode\" ({0}).",
-	"workspace": "espacio de trabajo",
-	"user settings": "configuración de usuario"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json b/i18n/esn/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
deleted file mode 100644
index fcf6be03f04..00000000000
--- a/i18n/esn/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"logPoint": "Punto de registro",
-	"breakpoint": "Punto de interrupción",
-	"removeBreakpoint": "Quitar {0}",
-	"editBreakpoint": "Editar {0}...",
-	"disableBreakpoint": "Deshabilitar {0}",
-	"enableBreakpoint": "Activar {0}",
-	"removeBreakpoints": "Quitar puntos de interrupción",
-	"removeInlineBreakpointOnColumn": "Quitar el punto de interrupción insertado en la columna {0}",
-	"removeLineBreakpoint": "Quitar punto de interrupción de línea",
-	"editBreakpoints": "Editar puntos de interrupción",
-	"editInlineBreakpointOnColumn": "Editar el punto de interrupción insertado en la columna {0}",
-	"editLineBrekapoint": "Editar punto de interrupción de línea",
-	"enableDisableBreakpoints": "Habilitar o deshabilitar puntos de interrupción",
-	"disableInlineColumnBreakpoint": "Deshabilitar el punto de interrupción insertado en la columna {0}",
-	"disableBreakpointOnLine": "Deshabilitar punto de interrupción de línea",
-	"enableBreakpoints": "Habilitar el punto de interrupción insertado en la columna {0}",
-	"enableBreakpointOnLine": "Habilitar punto de interrupción de línea",
-	"addBreakpoint": "Agregar punto de interrupción",
-	"addConditionalBreakpoint": "Agregar punto de interrupción condicional...",
-	"addLogPoint": "Agregar punto de registro",
-	"breakpointHasCondition": "Este {0} tiene una {1} que se perderá al quitarla. Considere la posibilidad de desactivar el {0} en su lugar.",
-	"message": "mensaje",
-	"condition": "condición",
-	"removeLogPoint": "Quitar {0}",
-	"disableLogPoint": "Deshabilitar {0}",
-	"cancel": "Cancelar",
-	"addConfiguration": "Agregar configuración..."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/debug/electron-browser/debugHover.i18n.json b/i18n/esn/src/vs/workbench/parts/debug/electron-browser/debugHover.i18n.json
deleted file mode 100644
index c17eae51668..00000000000
--- a/i18n/esn/src/vs/workbench/parts/debug/electron-browser/debugHover.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"treeAriaLabel": "Mantener puntero durante depuración"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json b/i18n/esn/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
deleted file mode 100644
index d28e2c7b8c0..00000000000
--- a/i18n/esn/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"snapshotObj": "Solo se muestran valores primitivos para este objeto.",
-	"debuggingPaused": "La depuración se ha pausado. Motivo: {0}, {1} {2}",
-	"debuggingStarted": "La depuración se ha iniciado.",
-	"debuggingStopped": "La depuración se ha detenido.",
-	"breakpointAdded": "Punto de interrupción agregado, línea {0}, archivo {1}",
-	"breakpointRemoved": "Punto de interrupción quitado, línea {0}, archivo {1}",
-	"compoundMustHaveConfigurations": "El compuesto debe tener configurado el atributo \"configurations\" a fin de iniciar varias configuraciones.",
-	"noConfigurationNameInWorkspace": "No se pudo encontrar la configuración de inicio ' {0} ' en el espacio de trabajo.",
-	"multipleConfigurationNamesInWorkspace": "Hay varias configuraciones de inicio \"{0}\" en el área de trabajo. Use el nombre de la carpeta para calificar la configuración.",
-	"noFolderWithName": "No se puede encontrar la carpeta con el nombre ' {0} ' para la configuración ' {1} ' en el compuesto ' {2} '.",
-	"configMissing": "La configuración \"{0}\" falta en \"launch.json\".",
-	"launchJsonDoesNotExist": "'launch.json' no existe.",
-	"debugRequestNotSupported": "El atributo \"{0}\" tiene un valor no admitido ({1}) en la configuración de depuración elegida.",
-	"debugRequesMissing": "El atributo '{0}' está ausente en la configuración de depuración elegida. ",
-	"debugTypeNotSupported": "El tipo de depuración '{0}' configurado no es compatible.",
-	"debugTypeMissing": "Falta la propiedad \"type\" en la configuración de inicio seleccionada.",
-	"debugAnyway": "Depurar de todos modos",
-	"preLaunchTaskErrors": "Errores de compilación durante la tarea preLaunchTask '{0}'.",
-	"preLaunchTaskError": "Error de compilación durante la tarea preLaunchTask '{0}'.",
-	"preLaunchTaskExitCode": "La tarea preLaunchTask '{0}' finalizó con el código de salida {1}.",
-	"showErrors": "Mostrar errores",
-	"noFolderWorkspaceDebugError": "El archivo activo no se puede depurar. Compruebe que se ha guardado en el disco y que tiene una extensión de depuración instalada para ese tipo de archivo.",
-	"cancel": "Cancelar",
-	"DebugTaskNotFound": "No se pudo encontrar la tarea '{0}'.",
-	"taskNotTracked": "La tarea '{0}' no puede rastrearse."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/debug/electron-browser/debugViewer.i18n.json b/i18n/esn/src/vs/workbench/parts/debug/electron-browser/debugViewer.i18n.json
deleted file mode 100644
index 8c2d0a54166..00000000000
--- a/i18n/esn/src/vs/workbench/parts/debug/electron-browser/debugViewer.i18n.json
+++ /dev/null
@@ -1,28 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"process": "Proceso",
-	"paused": "En pausa",
-	"running": "En ejecución",
-	"thread": "Subproceso",
-	"pausedOn": "En pausa en {0}",
-	"loadMoreStackFrames": "Cargar más marcos de pila",
-	"threadAriaLabel": "Subproceso {0}, pila de llamadas, depuración",
-	"stackFrameAriaLabel": "Marco de pila {0} línea {1} {2}, pila de llamadas, depuración",
-	"variableValueAriaLabel": "Escribir un nuevo valor de variable",
-	"variableScopeAriaLabel": "Ámbito {0}, variables, depuración",
-	"variableAriaLabel": "{0} valor {1}, variables, depuración",
-	"watchExpressionPlaceholder": "Expresión para inspeccionar",
-	"watchExpressionInputAriaLabel": "Escribir expresión de inspección",
-	"watchExpressionAriaLabel": "{0} valor {1}, inspección, depuración",
-	"watchVariableAriaLabel": "{0} valor {1}, inspección, depuración",
-	"functionBreakpointPlaceholder": "Función donde interrumpir",
-	"functionBreakPointInputAriaLabel": "Escribir punto de interrupción de función",
-	"functionBreakpointsNotSupported": "Este tipo de depuración no admite puntos de interrupción en funciones",
-	"breakpointAriaLabel": "Línea de punto de interrupción {0} {1}, puntos de interrupción, depuración",
-	"functionBreakpointAriaLabel": "Punto de interrupción de función {0}, puntos de interrupción, depuración",
-	"exceptionBreakpointAriaLabel": "Punto de interrupción de excepción {0}, puntos de interrupción, depuración"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/debug/electron-browser/debugViews.i18n.json b/i18n/esn/src/vs/workbench/parts/debug/electron-browser/debugViews.i18n.json
deleted file mode 100644
index 7b12765e51e..00000000000
--- a/i18n/esn/src/vs/workbench/parts/debug/electron-browser/debugViews.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"variablesSection": "Sección de variables",
-	"variablesAriaTreeLabel": "Variables de depuración",
-	"expressionsSection": "Sección de expresiones",
-	"watchAriaTreeLabel": "Expresiones de inspección de la depuración",
-	"callstackSection": "Sección de la pila de llamadas",
-	"debugStopped": "En pausa en {0}",
-	"callStackAriaLabel": "Pila de llamadas de la depuración",
-	"breakpointsSection": "Sección de puntos de interrupción",
-	"breakpointsAriaTreeLabel": "Puntos de interrupción de la depuración"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/debug/electron-browser/electronDebugActions.i18n.json b/i18n/esn/src/vs/workbench/parts/debug/electron-browser/electronDebugActions.i18n.json
deleted file mode 100644
index e9747f31c44..00000000000
--- a/i18n/esn/src/vs/workbench/parts/debug/electron-browser/electronDebugActions.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"copyValue": "Copiar valor",
-	"copyAsExpression": "Copiar como expresión",
-	"copy": "Copiar",
-	"copyAll": "Copiar todo",
-	"copyStackTrace": "Copiar pila de llamadas"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/debug/electron-browser/rawDebugSession.i18n.json b/i18n/esn/src/vs/workbench/parts/debug/electron-browser/rawDebugSession.i18n.json
deleted file mode 100644
index f5edde234b9..00000000000
--- a/i18n/esn/src/vs/workbench/parts/debug/electron-browser/rawDebugSession.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"moreInfo": "Más información",
-	"debugAdapterCrash": "El proceso de adaptación del depurador finalizó inesperadamente"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/debug/electron-browser/repl.i18n.json b/i18n/esn/src/vs/workbench/parts/debug/electron-browser/repl.i18n.json
deleted file mode 100644
index 99cb8a2feeb..00000000000
--- a/i18n/esn/src/vs/workbench/parts/debug/electron-browser/repl.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"replAriaLabel": "Panel de read–eval–print loop",
-	"actions.repl.historyPrevious": "Historial anterior",
-	"actions.repl.historyNext": "Historial siguiente",
-	"actions.repl.acceptInput": "REPL - Aceptar entrada",
-	"actions.repl.copyAll": "Depuración: Consola Copiar Todo"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/debug/electron-browser/replViewer.i18n.json b/i18n/esn/src/vs/workbench/parts/debug/electron-browser/replViewer.i18n.json
deleted file mode 100644
index d93ac6eb4b9..00000000000
--- a/i18n/esn/src/vs/workbench/parts/debug/electron-browser/replViewer.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"stateCapture": "El estado del objeto se captura desde la primera evaluación",
-	"replVariableAriaLabel": "La variable {0} tiene el valor {1}, read–eval–print loop, depuración",
-	"replExpressionAriaLabel": "La expresión {0} tiene el valor {1}, read–eval–print loop, depuración",
-	"replValueOutputAriaLabel": "{0}, read–eval–print loop, depuración",
-	"replRawObjectAriaLabel": "La variable {0} tiene el valor {1}, read–eval–print loop, debug"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/debug/electron-browser/statusbarColorProvider.i18n.json b/i18n/esn/src/vs/workbench/parts/debug/electron-browser/statusbarColorProvider.i18n.json
deleted file mode 100644
index decfe5f17ec..00000000000
--- a/i18n/esn/src/vs/workbench/parts/debug/electron-browser/statusbarColorProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"statusBarDebuggingBackground": "Color de fondo de la barra de estado cuando se está depurando un programa. La barra de estado se muestra en la parte inferior de la ventana",
-	"statusBarDebuggingForeground": "Color de primer plano de la barra de estado cuando se está depurando un programa. La barra de estado se muestra en la parte inferior de la ventana",
-	"statusBarDebuggingBorder": "Color de borde de la barra de estado que separa la barra lateral y el editor cuando se está depurando un programa. La barra de estado se muestra en la parte inferior de la ventana."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json b/i18n/esn/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json
deleted file mode 100644
index 53b616809b4..00000000000
--- a/i18n/esn/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"debug.terminal.title": "depurado"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/debug/electron-browser/variablesView.i18n.json b/i18n/esn/src/vs/workbench/parts/debug/electron-browser/variablesView.i18n.json
deleted file mode 100644
index 31ee62f98ad..00000000000
--- a/i18n/esn/src/vs/workbench/parts/debug/electron-browser/variablesView.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"variablesSection": "Sección de variables",
-	"variablesAriaTreeLabel": "Variables de depuración",
-	"variableValueAriaLabel": "Escribir un nuevo valor de variable",
-	"variableScopeAriaLabel": "Ámbito {0}, variables, depuración",
-	"variableAriaLabel": "{0} valor {1}, variables, depuración"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/debug/electron-browser/watchExpressionsView.i18n.json b/i18n/esn/src/vs/workbench/parts/debug/electron-browser/watchExpressionsView.i18n.json
deleted file mode 100644
index 13764ca16a9..00000000000
--- a/i18n/esn/src/vs/workbench/parts/debug/electron-browser/watchExpressionsView.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"expressionsSection": "Sección de expresiones",
-	"watchAriaTreeLabel": "Expresiones de inspección de la depuración",
-	"watchExpressionPlaceholder": "Expresión para inspeccionar",
-	"watchExpressionInputAriaLabel": "Escribir expresión de inspección",
-	"watchExpressionAriaLabel": "{0} valor {1}, inspección, depuración",
-	"watchVariableAriaLabel": "{0} valor {1}, inspección, depuración"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json b/i18n/esn/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
deleted file mode 100644
index 3055932755f..00000000000
--- a/i18n/esn/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"debugAdapterBinNotFound": "El ejecutable del adaptador de depuración \"{0}\" no existe.",
-	"debugAdapterCannotDetermineExecutable": "No se puede determinar el ejecutable para el adaptador de depuración \"{0}\".",
-	"unableToLaunchDebugAdapter": "No se puede iniciar el adaptador de depuración desde '{0}'.",
-	"unableToLaunchDebugAdapterNoArgs": "No se puede iniciar el adaptador de depuración."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/debug/node/debugger.i18n.json b/i18n/esn/src/vs/workbench/parts/debug/node/debugger.i18n.json
deleted file mode 100644
index ea147e6e5a8..00000000000
--- a/i18n/esn/src/vs/workbench/parts/debug/node/debugger.i18n.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"launch.config.comment1": "Use IntelliSense para saber los atributos posibles.",
-	"launch.config.comment2": "Mantenga el puntero para ver las descripciones de los existentes atributos ",
-	"launch.config.comment3": "Para más información, visite: {0}",
-	"debugType": "Tipo de configuración.",
-	"debugTypeNotRecognised": "Este tipo de depuración no se reconoce. Compruebe que tiene instalada la correspondiente extensión de depuración y que está habilitada.",
-	"node2NotSupported": "\"node2\" ya no se admite; use \"node\" en su lugar y establezca el atributo \"protocol\" en \"inspector\".",
-	"debugName": "Nombre de la configuración. Aparece en el menú desplegable de la configuración de inicio.",
-	"debugRequest": "Tipo de solicitud de la configuración. Puede ser \"launch\" o \"attach\".",
-	"debugServer": "Solo para el desarrollo de extensiones de depuración: si se especifica un puerto, VS Code intenta conectarse a un adaptador de depuración que se ejecuta en modo servidor",
-	"debugPrelaunchTask": "Tarea que se va a ejecutar antes de iniciarse la sesión de depuración.",
-	"debugPostDebugTask": "Tarea que se ejecutará después de terminar la sesión de depuración.",
-	"debugWindowsConfiguration": "Atributos de configuración de inicio específicos de Windows.",
-	"debugOSXConfiguration": "Atributos de configuración de inicio específicos de OS X.",
-	"debugLinuxConfiguration": "Atributos de configuración de inicio específicos de Linux.",
-	"deprecatedVariables": "\"env.\", \"config.\" y \"command.\" están en desuso, utilice en su lugar \"env:\", \"config:\" y \"command:\"."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/debug/node/terminals.i18n.json b/i18n/esn/src/vs/workbench/parts/debug/node/terminals.i18n.json
deleted file mode 100644
index ec6803b438e..00000000000
--- a/i18n/esn/src/vs/workbench/parts/debug/node/terminals.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"console.title": "Consola de VS Code",
-	"mac.terminal.script.failed": "No se pudo ejecutar el script '{0}'. Código de salida: {1}.",
-	"mac.terminal.type.not.supported": "No se admite '{0}'",
-	"press.any.key": "Presione cualquier tecla para continuar...",
-	"linux.term.failed": "Error de '{0}' con el código de salida {1}"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/emmet/browser/actions/showEmmetCommands.i18n.json b/i18n/esn/src/vs/workbench/parts/emmet/browser/actions/showEmmetCommands.i18n.json
deleted file mode 100644
index e8eb77764d5..00000000000
--- a/i18n/esn/src/vs/workbench/parts/emmet/browser/actions/showEmmetCommands.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"showEmmetCommands": "Mostrar los comandos de Emmet"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/emmet/electron-browser/actions/balance.i18n.json b/i18n/esn/src/vs/workbench/parts/emmet/electron-browser/actions/balance.i18n.json
deleted file mode 100644
index 80bd75c0a09..00000000000
--- a/i18n/esn/src/vs/workbench/parts/emmet/electron-browser/actions/balance.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"balanceInward": "Emmet: Equilibrio (entrante)",
-	"balanceOutward": "Emmet: Equilibrio (saliente)"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/emmet/electron-browser/actions/editPoints.i18n.json b/i18n/esn/src/vs/workbench/parts/emmet/electron-browser/actions/editPoints.i18n.json
deleted file mode 100644
index a06b5c267dd..00000000000
--- a/i18n/esn/src/vs/workbench/parts/emmet/electron-browser/actions/editPoints.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"previousEditPoint": "Emmet: Ir al punto de edición anterior",
-	"nextEditPoint": "Emmet: Ir al punto de edición siguiente"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/emmet/electron-browser/actions/evaluateMath.i18n.json b/i18n/esn/src/vs/workbench/parts/emmet/electron-browser/actions/evaluateMath.i18n.json
deleted file mode 100644
index 0cc657ddc14..00000000000
--- a/i18n/esn/src/vs/workbench/parts/emmet/electron-browser/actions/evaluateMath.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"evaluateMathExpression": "Emmet: Evaluar expresión matemática"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/emmet/electron-browser/actions/expandAbbreviation.i18n.json b/i18n/esn/src/vs/workbench/parts/emmet/electron-browser/actions/expandAbbreviation.i18n.json
deleted file mode 100644
index f16c336ba9b..00000000000
--- a/i18n/esn/src/vs/workbench/parts/emmet/electron-browser/actions/expandAbbreviation.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"expandAbbreviationAction": "Emmet: Expandir abreviatura"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/emmet/electron-browser/actions/incrementDecrement.i18n.json b/i18n/esn/src/vs/workbench/parts/emmet/electron-browser/actions/incrementDecrement.i18n.json
deleted file mode 100644
index ad86576118f..00000000000
--- a/i18n/esn/src/vs/workbench/parts/emmet/electron-browser/actions/incrementDecrement.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"incrementNumberByOneTenth": "Emmet: Aumentar por 0.1",
-	"incrementNumberByOne": "Emmet: Aumentar por 1",
-	"incrementNumberByTen": "Emmet: Aumentar por 10",
-	"decrementNumberByOneTenth": "Emmet: Disminuir por 0.1",
-	"decrementNumberByOne": "Emmet: Disminuir por 1",
-	"decrementNumberByTen": "Emmet: Disminuir por 10"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/emmet/electron-browser/actions/matchingPair.i18n.json b/i18n/esn/src/vs/workbench/parts/emmet/electron-browser/actions/matchingPair.i18n.json
deleted file mode 100644
index d87b661b4e8..00000000000
--- a/i18n/esn/src/vs/workbench/parts/emmet/electron-browser/actions/matchingPair.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"matchingPair": "Emmet: Ir al par coincidente"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/emmet/electron-browser/actions/mergeLines.i18n.json b/i18n/esn/src/vs/workbench/parts/emmet/electron-browser/actions/mergeLines.i18n.json
deleted file mode 100644
index c0708b46d94..00000000000
--- a/i18n/esn/src/vs/workbench/parts/emmet/electron-browser/actions/mergeLines.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"mergeLines": "Emmet: Combinar líneas"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/emmet/electron-browser/actions/reflectCssValue.i18n.json b/i18n/esn/src/vs/workbench/parts/emmet/electron-browser/actions/reflectCssValue.i18n.json
deleted file mode 100644
index 13ab5650e82..00000000000
--- a/i18n/esn/src/vs/workbench/parts/emmet/electron-browser/actions/reflectCssValue.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"reflectCSSValue": "Emmet: Reflejar valor CSS"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/emmet/electron-browser/actions/removeTag.i18n.json b/i18n/esn/src/vs/workbench/parts/emmet/electron-browser/actions/removeTag.i18n.json
deleted file mode 100644
index 376b817f89e..00000000000
--- a/i18n/esn/src/vs/workbench/parts/emmet/electron-browser/actions/removeTag.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"removeTag": "Emmet: Quitar etiqueta"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/emmet/electron-browser/actions/selectItem.i18n.json b/i18n/esn/src/vs/workbench/parts/emmet/electron-browser/actions/selectItem.i18n.json
deleted file mode 100644
index 632ec2d3325..00000000000
--- a/i18n/esn/src/vs/workbench/parts/emmet/electron-browser/actions/selectItem.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"selectPreviousItem": "Emmet: Seleccionar elemento anterior",
-	"selectNextItem": "Emmet: Seleccionar elemento siguiente"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/emmet/electron-browser/actions/splitJoinTag.i18n.json b/i18n/esn/src/vs/workbench/parts/emmet/electron-browser/actions/splitJoinTag.i18n.json
deleted file mode 100644
index 7daa5503951..00000000000
--- a/i18n/esn/src/vs/workbench/parts/emmet/electron-browser/actions/splitJoinTag.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"splitJoinTag": "Emmet: Dividir/combinar etiqueta"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/emmet/electron-browser/actions/toggleComment.i18n.json b/i18n/esn/src/vs/workbench/parts/emmet/electron-browser/actions/toggleComment.i18n.json
deleted file mode 100644
index 4c135de0f9c..00000000000
--- a/i18n/esn/src/vs/workbench/parts/emmet/electron-browser/actions/toggleComment.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"toggleComment": "Emmet: Alternar comentario"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/emmet/electron-browser/actions/updateImageSize.i18n.json b/i18n/esn/src/vs/workbench/parts/emmet/electron-browser/actions/updateImageSize.i18n.json
deleted file mode 100644
index 7e29db17919..00000000000
--- a/i18n/esn/src/vs/workbench/parts/emmet/electron-browser/actions/updateImageSize.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"updateImageSize": "Emmet: Actualizar tamaño de la imagen"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/emmet/electron-browser/actions/updateTag.i18n.json b/i18n/esn/src/vs/workbench/parts/emmet/electron-browser/actions/updateTag.i18n.json
deleted file mode 100644
index b09f7caa8be..00000000000
--- a/i18n/esn/src/vs/workbench/parts/emmet/electron-browser/actions/updateTag.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"updateTag": "Emmet: Actualizar etiqueta",
-	"enterTag": "Ingresar etiqueta",
-	"tag": "Etiqueta"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/emmet/electron-browser/actions/wrapWithAbbreviation.i18n.json b/i18n/esn/src/vs/workbench/parts/emmet/electron-browser/actions/wrapWithAbbreviation.i18n.json
deleted file mode 100644
index 5b686426df5..00000000000
--- a/i18n/esn/src/vs/workbench/parts/emmet/electron-browser/actions/wrapWithAbbreviation.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"wrapWithAbbreviationAction": "Emmet: Encapsular con abreviatura",
-	"enterAbbreviation": "Ingresar abreviatura",
-	"abbreviation": "Abreviatura"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/emmet/electron-browser/emmet.contribution.i18n.json b/i18n/esn/src/vs/workbench/parts/emmet/electron-browser/emmet.contribution.i18n.json
deleted file mode 100644
index fd22c3cec4d..00000000000
--- a/i18n/esn/src/vs/workbench/parts/emmet/electron-browser/emmet.contribution.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"emmetConfigurationTitle": "Emmet",
-	"triggerExpansionOnTab": "Cuando se habilita, se expanden las abreviaciones Emmet al presionar la tecla TAB. No disponible cuando emmet.useNewemmet se establece en true.",
-	"emmetPreferences": "Preferencias usadas para modificar el comportamiento de algunas acciones y resoluciones de Emmet. No aplicable cuando emmet.useNewemmet se establece en true.",
-	"emmetSyntaxProfiles": "Defina el perfil de la sintaxis especificada o use su propio perfil con reglas específicas.",
-	"emmetExclude": "Matriz de lenguajes donde no deben expandirse la abreviación Emmet.",
-	"emmetExtensionsPath": "Ruta de acceso a una carpeta que contiene perfiles de Emmet, fragmentos de código y preferencias. Solo se respetan los perfiles de la ruta de acceso de extensiones cuando emmet.useNewEmmet se establece en true.",
-	"useNewEmmet": "Pruebe los nuevos módulos de Emmet (que finalmente sustituirán a la biblioteca anterior de Emmet) para conocer todas las características de Emmet."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/emmet/node/actions/balance.i18n.json b/i18n/esn/src/vs/workbench/parts/emmet/node/actions/balance.i18n.json
deleted file mode 100644
index 80bd75c0a09..00000000000
--- a/i18n/esn/src/vs/workbench/parts/emmet/node/actions/balance.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"balanceInward": "Emmet: Equilibrio (entrante)",
-	"balanceOutward": "Emmet: Equilibrio (saliente)"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/emmet/node/actions/editPoints.i18n.json b/i18n/esn/src/vs/workbench/parts/emmet/node/actions/editPoints.i18n.json
deleted file mode 100644
index 328583915c4..00000000000
--- a/i18n/esn/src/vs/workbench/parts/emmet/node/actions/editPoints.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"previousEditPoint": "Emmet: Punto de edición anterior",
-	"nextEditPoint": "Emmet: Punto de edición siguiente"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/emmet/node/actions/evaluateMath.i18n.json b/i18n/esn/src/vs/workbench/parts/emmet/node/actions/evaluateMath.i18n.json
deleted file mode 100644
index 0cc657ddc14..00000000000
--- a/i18n/esn/src/vs/workbench/parts/emmet/node/actions/evaluateMath.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"evaluateMathExpression": "Emmet: Evaluar expresión matemática"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/emmet/node/actions/expandAbbreviation.i18n.json b/i18n/esn/src/vs/workbench/parts/emmet/node/actions/expandAbbreviation.i18n.json
deleted file mode 100644
index 89f65c5221b..00000000000
--- a/i18n/esn/src/vs/workbench/parts/emmet/node/actions/expandAbbreviation.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"expandAbbreviationAction": "Emmet: Expandir abreviatura"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/emmet/node/actions/incrementDecrement.i18n.json b/i18n/esn/src/vs/workbench/parts/emmet/node/actions/incrementDecrement.i18n.json
deleted file mode 100644
index ad86576118f..00000000000
--- a/i18n/esn/src/vs/workbench/parts/emmet/node/actions/incrementDecrement.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"incrementNumberByOneTenth": "Emmet: Aumentar por 0.1",
-	"incrementNumberByOne": "Emmet: Aumentar por 1",
-	"incrementNumberByTen": "Emmet: Aumentar por 10",
-	"decrementNumberByOneTenth": "Emmet: Disminuir por 0.1",
-	"decrementNumberByOne": "Emmet: Disminuir por 1",
-	"decrementNumberByTen": "Emmet: Disminuir por 10"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/emmet/node/actions/matchingPair.i18n.json b/i18n/esn/src/vs/workbench/parts/emmet/node/actions/matchingPair.i18n.json
deleted file mode 100644
index d87b661b4e8..00000000000
--- a/i18n/esn/src/vs/workbench/parts/emmet/node/actions/matchingPair.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"matchingPair": "Emmet: Ir al par coincidente"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/emmet/node/actions/mergeLines.i18n.json b/i18n/esn/src/vs/workbench/parts/emmet/node/actions/mergeLines.i18n.json
deleted file mode 100644
index c0708b46d94..00000000000
--- a/i18n/esn/src/vs/workbench/parts/emmet/node/actions/mergeLines.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"mergeLines": "Emmet: Combinar líneas"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/emmet/node/actions/reflectCssValue.i18n.json b/i18n/esn/src/vs/workbench/parts/emmet/node/actions/reflectCssValue.i18n.json
deleted file mode 100644
index 13ab5650e82..00000000000
--- a/i18n/esn/src/vs/workbench/parts/emmet/node/actions/reflectCssValue.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"reflectCSSValue": "Emmet: Reflejar valor CSS"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/emmet/node/actions/removeTag.i18n.json b/i18n/esn/src/vs/workbench/parts/emmet/node/actions/removeTag.i18n.json
deleted file mode 100644
index 376b817f89e..00000000000
--- a/i18n/esn/src/vs/workbench/parts/emmet/node/actions/removeTag.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"removeTag": "Emmet: Quitar etiqueta"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/emmet/node/actions/selectItem.i18n.json b/i18n/esn/src/vs/workbench/parts/emmet/node/actions/selectItem.i18n.json
deleted file mode 100644
index 632ec2d3325..00000000000
--- a/i18n/esn/src/vs/workbench/parts/emmet/node/actions/selectItem.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"selectPreviousItem": "Emmet: Seleccionar elemento anterior",
-	"selectNextItem": "Emmet: Seleccionar elemento siguiente"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/emmet/node/actions/splitJoinTag.i18n.json b/i18n/esn/src/vs/workbench/parts/emmet/node/actions/splitJoinTag.i18n.json
deleted file mode 100644
index 7daa5503951..00000000000
--- a/i18n/esn/src/vs/workbench/parts/emmet/node/actions/splitJoinTag.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"splitJoinTag": "Emmet: Dividir/combinar etiqueta"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/emmet/node/actions/toggleComment.i18n.json b/i18n/esn/src/vs/workbench/parts/emmet/node/actions/toggleComment.i18n.json
deleted file mode 100644
index 4c135de0f9c..00000000000
--- a/i18n/esn/src/vs/workbench/parts/emmet/node/actions/toggleComment.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"toggleComment": "Emmet: Alternar comentario"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/emmet/node/actions/updateImageSize.i18n.json b/i18n/esn/src/vs/workbench/parts/emmet/node/actions/updateImageSize.i18n.json
deleted file mode 100644
index 7e29db17919..00000000000
--- a/i18n/esn/src/vs/workbench/parts/emmet/node/actions/updateImageSize.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"updateImageSize": "Emmet: Actualizar tamaño de la imagen"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/emmet/node/actions/updateTag.i18n.json b/i18n/esn/src/vs/workbench/parts/emmet/node/actions/updateTag.i18n.json
deleted file mode 100644
index b09f7caa8be..00000000000
--- a/i18n/esn/src/vs/workbench/parts/emmet/node/actions/updateTag.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"updateTag": "Emmet: Actualizar etiqueta",
-	"enterTag": "Ingresar etiqueta",
-	"tag": "Etiqueta"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/emmet/node/actions/wrapWithAbbreviation.i18n.json b/i18n/esn/src/vs/workbench/parts/emmet/node/actions/wrapWithAbbreviation.i18n.json
deleted file mode 100644
index 5b686426df5..00000000000
--- a/i18n/esn/src/vs/workbench/parts/emmet/node/actions/wrapWithAbbreviation.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"wrapWithAbbreviationAction": "Emmet: Encapsular con abreviatura",
-	"enterAbbreviation": "Ingresar abreviatura",
-	"abbreviation": "Abreviatura"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/emmet/node/emmet.contribution.i18n.json b/i18n/esn/src/vs/workbench/parts/emmet/node/emmet.contribution.i18n.json
deleted file mode 100644
index 176ecb884a1..00000000000
--- a/i18n/esn/src/vs/workbench/parts/emmet/node/emmet.contribution.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"emmetConfigurationTitle": "Emmet",
-	"triggerExpansionOnTab": "Cuando se habilita, se expande la abreviación Emmet al presionar la tecla TAB.",
-	"emmetPreferences": "Preferencias usadas para modificar el comportamiento de algunas acciones y resoluciones de Emmet.",
-	"emmetSyntaxProfiles": "Defina el perfil de la sintaxis especificada o use su propio perfil con reglas específicas.",
-	"emmetExclude": "Matriz de lenguajes donde no deben expandirse la abreviación Emmet.",
-	"emmetExtensionsPath": "Ruta de acceso a una carpeta que contiene perfiles de Emmet, fragmentos de código y preferencias"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json b/i18n/esn/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
deleted file mode 100644
index e802eea53ea..00000000000
--- a/i18n/esn/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"terminalConfigurationTitle": "Terminal externo",
-	"explorer.openInTerminalKind": "Personaliza el tipo de terminal para iniciar.",
-	"terminal.external.windowsExec": "Personaliza qué terminal debe ejecutarse en Windows.",
-	"terminal.external.osxExec": "Personaliza qué aplicación terminal se ejecutará en OS X.",
-	"terminal.external.linuxExec": "Personaliza qué terminal debe ejecutarse en Linux.",
-	"globalConsoleActionWin": "Abrir nuevo símbolo del sistema",
-	"globalConsoleActionMacLinux": "Abrir nuevo terminal",
-	"scopedConsoleActionWin": "Abrir en símbolo del sistema",
-	"scopedConsoleActionMacLinux": "Abrir en terminal"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/execution/electron-browser/terminal.contribution.i18n.json b/i18n/esn/src/vs/workbench/parts/execution/electron-browser/terminal.contribution.i18n.json
deleted file mode 100644
index 8641ca0336b..00000000000
--- a/i18n/esn/src/vs/workbench/parts/execution/electron-browser/terminal.contribution.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"terminalConfigurationTitle": "Terminal externo",
-	"terminal.external.windowsExec": "Personaliza qué terminal debe ejecutarse en Windows.",
-	"terminal.external.osxExec": "Personaliza qué aplicación terminal se ejecutará en OS X.",
-	"terminal.external.linuxExec": "Personaliza qué terminal debe ejecutarse en Linux.",
-	"globalConsoleActionWin": "Abrir nuevo símbolo del sistema",
-	"globalConsoleActionMacLinux": "Abrir nuevo terminal",
-	"scopedConsoleActionWin": "Abrir en símbolo del sistema",
-	"scopedConsoleActionMacLinux": "Abrir en terminal"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/execution/electron-browser/terminalService.i18n.json b/i18n/esn/src/vs/workbench/parts/execution/electron-browser/terminalService.i18n.json
deleted file mode 100644
index ec6803b438e..00000000000
--- a/i18n/esn/src/vs/workbench/parts/execution/electron-browser/terminalService.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"console.title": "Consola de VS Code",
-	"mac.terminal.script.failed": "No se pudo ejecutar el script '{0}'. Código de salida: {1}.",
-	"mac.terminal.type.not.supported": "No se admite '{0}'",
-	"press.any.key": "Presione cualquier tecla para continuar...",
-	"linux.term.failed": "Error de '{0}' con el código de salida {1}"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/explorers/browser/treeExplorer.contribution.i18n.json b/i18n/esn/src/vs/workbench/parts/explorers/browser/treeExplorer.contribution.i18n.json
deleted file mode 100644
index 37239ff3cca..00000000000
--- a/i18n/esn/src/vs/workbench/parts/explorers/browser/treeExplorer.contribution.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"vscode.extension.contributes.view": "Aporta una vista personalizada",
-	"vscode.extension.contributes.view.id": "Identificador único usado para identificar la vista creada a través de vscode.workspace.createTreeView",
-	"vscode.extension.contributes.view.label": "Cadena en lenguaje natural usada para representar la vista.",
-	"vscode.extension.contributes.view.icon": "Ruta de acceso al icono de la vista",
-	"vscode.extension.contributes.views": "Aporta vistas personalizada",
-	"showViewlet": "Mostrar {0}",
-	"view": "Ver"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/explorers/browser/treeExplorerActions.i18n.json b/i18n/esn/src/vs/workbench/parts/explorers/browser/treeExplorerActions.i18n.json
deleted file mode 100644
index a0ef846bf72..00000000000
--- a/i18n/esn/src/vs/workbench/parts/explorers/browser/treeExplorerActions.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"refresh": "Actualizar"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/explorers/browser/treeExplorerService.i18n.json b/i18n/esn/src/vs/workbench/parts/explorers/browser/treeExplorerService.i18n.json
deleted file mode 100644
index 0de2a1a20fd..00000000000
--- a/i18n/esn/src/vs/workbench/parts/explorers/browser/treeExplorerService.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"treeExplorer.noMatchingProviderId": "No hay registrado ningún TreeExplorerNodeProvider con el identificador {providerId}."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/explorers/browser/views/treeExplorerView.i18n.json b/i18n/esn/src/vs/workbench/parts/explorers/browser/views/treeExplorerView.i18n.json
deleted file mode 100644
index 92653a24518..00000000000
--- a/i18n/esn/src/vs/workbench/parts/explorers/browser/views/treeExplorerView.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"treeExplorerViewlet.tree": "Sección de Tree Explorer"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/extensions/browser/dependenciesViewer.i18n.json b/i18n/esn/src/vs/workbench/parts/extensions/browser/dependenciesViewer.i18n.json
deleted file mode 100644
index cdec8cbeeb9..00000000000
--- a/i18n/esn/src/vs/workbench/parts/extensions/browser/dependenciesViewer.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"error": "Error",
-	"Unknown Dependency": "Dependencia desconocida:"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json b/i18n/esn/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json
deleted file mode 100644
index 8661e63bcbe..00000000000
--- a/i18n/esn/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"name": "Nombre de la extensión",
-	"extension id": "Identificador de la extensión",
-	"preview": "Vista Previa",
-	"builtin": "Integrada",
-	"publisher": "Nombre del editor",
-	"install count": "Número de instalaciones",
-	"rating": "Clasificación",
-	"repository": "Repositorio",
-	"license": "Licencia",
-	"details": "Detalles",
-	"contributions": "Contribuciones",
-	"changelog": "Registro de cambios",
-	"dependencies": "Dependencias",
-	"noReadme": "No hay ningún archivo LÉAME disponible.",
-	"noChangelog": "No hay ningún objeto CHANGELOG disponible.",
-	"noContributions": "No hay contribuciones.",
-	"noDependencies": "No hay dependencias.",
-	"settings": "Configuración ({0})",
-	"setting name": "Nombre",
-	"description": "Descripción",
-	"default": "Predeterminado",
-	"debuggers": "Depuradores ({0})",
-	"debugger name": "Nombre",
-	"debugger type": "Tipo",
-	"views": "Vistas ({0})",
-	"view id": "Id.",
-	"view name": "Nombre",
-	"view location": "Donde",
-	"localizations": "Localizaciones ({0}) ",
-	"localizations language id": "ID. de idioma",
-	"localizations language name": "Nombre de idioma",
-	"localizations localized language name": "Nombre de idioma (localizado)",
-	"colorThemes": "Temas de color ({0})",
-	"iconThemes": "Temas del icono ({0})",
-	"colors": "Colores ({0})",
-	"colorId": "ID",
-	"defaultDark": "Oscuro por defecto",
-	"defaultLight": "Claro por defecto",
-	"defaultHC": "Contraste alto por defecto",
-	"JSON Validation": "Validación JSON ({0})",
-	"fileMatch": "Coincidencia de archivo",
-	"schema": "Esquema",
-	"commands": "Comandos ({0})",
-	"command name": "Nombre",
-	"keyboard shortcuts": "Métodos abreviados de teclado",
-	"menuContexts": "Contextos de menú",
-	"languages": "Lenguajes ({0})",
-	"language id": "Id.",
-	"language name": "Nombre",
-	"file extensions": "Extensiones de archivo",
-	"grammar": "Gramática",
-	"snippets": "Fragmentos"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json b/i18n/esn/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
deleted file mode 100644
index 695af76fade..00000000000
--- a/i18n/esn/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
+++ /dev/null
@@ -1,81 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"download": "Descargar manualmente",
-	"install vsix": "Una vez descargado el VSIX de \"{0}\", instálelo manualmente.",
-	"installAction": "Instalar",
-	"installing": "Instalando",
-	"failedToInstall": "No se pudo instalar \"{0}\".",
-	"uninstallAction": "Desinstalación",
-	"Uninstalling": "Desinstalando",
-	"updateAction": "Actualizar",
-	"updateTo": "Actualizar a {0}",
-	"failedToUpdate": "No se pudo actualizar \"{0}\".",
-	"ManageExtensionAction.uninstallingTooltip": "Desinstalando",
-	"enableForWorkspaceAction": "Habilitar (área de trabajo)",
-	"enableGloballyAction": "Habilitar",
-	"enableAction": "Habilitar",
-	"disableForWorkspaceAction": "Deshabilitar (área de trabajo)",
-	"disableGloballyAction": "Deshabilitar",
-	"disableAction": "Deshabilitar",
-	"checkForUpdates": "Buscar actualizaciones",
-	"enableAutoUpdate": "Habilitar extensiones de actualización automática",
-	"disableAutoUpdate": "Deshabilitar extensiones de actualización automática",
-	"updateAll": "Actualizar todas las extensiones",
-	"reloadAction": "Recargar",
-	"postUpdateTooltip": "Recargar para actualizar",
-	"postUpdateMessage": "¿Quiere recargar esta ventana para activar la extensión actualizada '{0}'?",
-	"postEnableTooltip": "Recargar para activar",
-	"postEnableMessage": "¿Quiere recargar esta ventana para activar la extensión '{0}'?",
-	"postDisableTooltip": "Recargar para desactivar",
-	"postDisableMessage": "¿Quiere recargar esta ventana para desactivar la extensión '{0}'?",
-	"postUninstallTooltip": "Recargar para desactivar",
-	"postUninstallMessage": "¿Quiere recargar esta ventana para desactivar la extensión desinstalada '{0}'?",
-	"toggleExtensionsViewlet": "Mostrar extensiones",
-	"installExtensions": "Instalar extensiones",
-	"showEnabledExtensions": "Mostrar extensiones habilitadas",
-	"showInstalledExtensions": "Mostrar extensiones instaladas",
-	"showDisabledExtensions": "Mostrar extensiones deshabilitadas",
-	"clearExtensionsInput": "Borrar entrada de extensiones",
-	"showBuiltInExtensions": "Mostrar extensiones incorporadas",
-	"showOutdatedExtensions": "Mostrar extensiones obsoletas",
-	"showPopularExtensions": "Mostrar extensiones conocidas",
-	"showRecommendedExtensions": "Mostrar extensiones recomendadas",
-	"installWorkspaceRecommendedExtensions": "Instalar todo trabajo recomienda extensiones",
-	"allExtensionsInstalled": "Ya se han instalado todas las extensiones recomendadas para esta área de trabajo",
-	"installRecommendedExtension": "Instalar extensión recomendada",
-	"extensionInstalled": "La extensión recomendada ya ha sido instalada",
-	"showRecommendedKeymapExtensionsShort": "Asignaciones de teclado",
-	"showLanguageExtensionsShort": "Extensiones del lenguaje",
-	"showAzureExtensionsShort": "Extensiones de Azure",
-	"OpenExtensionsFile.failed": "No se puede crear el archivo \"extensions.json\" dentro de la carpeta \".vscode\" ({0}).",
-	"configureWorkspaceRecommendedExtensions": "Configurar extensiones recomendadas (área de trabajo)",
-	"configureWorkspaceFolderRecommendedExtensions": "Configurar extensiones recomendadas (Carpeta del área de trabajo)",
-	"malicious tooltip": "Se informó de que esta extensión era problemática.",
-	"malicious": "Malintencionado",
-	"disabled": "Deshabilitado",
-	"disabled globally": "Deshabilitado",
-	"disabled workspace": "Deshabilitado para esta área de trabajo",
-	"disableAll": "Deshabilitar todas las extensiones instaladas",
-	"disableAllWorkspace": "Deshabilitar todas las extensiones instaladas para esta área de trabajo",
-	"enableAll": "Habilitar todas las extensiones",
-	"enableAllWorkspace": "Habilitar todas las extensiones para esta área de trabajo",
-	"openExtensionsFolder": "Abrir carpeta de extensiones",
-	"installVSIX": "Instalar desde VSIX...",
-	"installFromVSIX": "Instalar desde VSIX",
-	"installButton": "&&Instalar",
-	"InstallVSIXAction.success": "La extensión se instaló correctamente. Reinicie para habilitarla.",
-	"InstallVSIXAction.reloadNow": "Recargar ahora",
-	"reinstall": "Reinstalar extensión...",
-	"selectExtension": "Seleccione una extensión para reinstalarla",
-	"ReinstallAction.success": "La extensión se reinstaló correctamente.",
-	"ReinstallAction.reloadNow": "Recargar ahora",
-	"extensionButtonProminentBackground": "Color de fondo del botón para la extensión de acciones que se destacan (por ejemplo, el botón de instalación).",
-	"extensionButtonProminentForeground": "Color de primer plano del botón para la extensión de acciones que se destacan (por ejemplo, botón de instalación).",
-	"extensionButtonProminentHoverBackground": "Color de fondo del botón al mantener el mouse para la extensión de acciones que se destacan (por ejemplo, el botón de instalación)."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/extensions/browser/extensionsList.i18n.json b/i18n/esn/src/vs/workbench/parts/extensions/browser/extensionsList.i18n.json
deleted file mode 100644
index eb6f8e39a71..00000000000
--- a/i18n/esn/src/vs/workbench/parts/extensions/browser/extensionsList.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"recommended": "Recomendado"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/extensions/browser/extensionsQuickOpen.i18n.json b/i18n/esn/src/vs/workbench/parts/extensions/browser/extensionsQuickOpen.i18n.json
deleted file mode 100644
index db4b7abf05e..00000000000
--- a/i18n/esn/src/vs/workbench/parts/extensions/browser/extensionsQuickOpen.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"manage": "Presione ENTRAR para administrar sus extensiones.",
-	"notfound": "No se encontró '{0}' en Marketplace. ",
-	"install": "Presione Intro para instalar '{0}' desde el Marketplace. ",
-	"searchFor": "Presione ENTRAR para buscar '{0}' en el catálogo de soluciones.",
-	"noExtensionsToInstall": "Escriba un nombre de extensión"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/extensions/browser/extensionsWidgets.i18n.json b/i18n/esn/src/vs/workbench/parts/extensions/browser/extensionsWidgets.i18n.json
deleted file mode 100644
index 90539039629..00000000000
--- a/i18n/esn/src/vs/workbench/parts/extensions/browser/extensionsWidgets.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"ratedByUsers": "Calificado por {0} usuarios",
-	"ratedBySingleUser": "Calificado por 1 usuario"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/extensions/common/extensionsFileTemplate.i18n.json b/i18n/esn/src/vs/workbench/parts/extensions/common/extensionsFileTemplate.i18n.json
deleted file mode 100644
index a69ed7b1b5c..00000000000
--- a/i18n/esn/src/vs/workbench/parts/extensions/common/extensionsFileTemplate.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"app.extensions.json.title": "Extensiones",
-	"app.extensions.json.recommendations": "Lista de recomendaciones de extensiones. El identificador de una extensión es siempre '${publisher}.${name}'. Por ejemplo: 'vscode.csharp'.",
-	"app.extension.identifier.errorMessage": "Se esperaba el formato '${publisher}.${name}'. Ejemplo: 'vscode.csharp'."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/extensions/common/extensionsInput.i18n.json b/i18n/esn/src/vs/workbench/parts/extensions/common/extensionsInput.i18n.json
deleted file mode 100644
index b6d14210499..00000000000
--- a/i18n/esn/src/vs/workbench/parts/extensions/common/extensionsInput.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"extensionsInputName": "Extensión: {0}"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json b/i18n/esn/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
deleted file mode 100644
index c17e1a95935..00000000000
--- a/i18n/esn/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
+++ /dev/null
@@ -1,69 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"name": "Nombre de la extensión",
-	"extension id": "Identificador de la extensión",
-	"preview": "Vista Previa",
-	"builtin": "Integrada",
-	"publisher": "Nombre del editor",
-	"install count": "Número de instalaciones",
-	"rating": "Clasificación",
-	"repository": "Repositorio",
-	"license": "Licencia",
-	"details": "Detalles",
-	"detailstooltip": "Detalles de la extensión, mostrados en el archivo 'README.md' de la extensión",
-	"contributions": "Contribuciones",
-	"contributionstooltip": "Enumera las contribuciones de esta extensión a VS Code",
-	"changelog": "Registro de cambios",
-	"changelogtooltip": "Historial de actualización de extensiones renderizado desde el archivo 'changelog.MD' ",
-	"dependencies": "Dependencias",
-	"dependenciestooltip": "Enumera las extensiones de las que depende esta extensión",
-	"noReadme": "No hay ningún archivo LÉAME disponible.",
-	"noChangelog": "No hay ningún objeto CHANGELOG disponible.",
-	"noContributions": "No hay contribuciones.",
-	"noDependencies": "No hay dependencias.",
-	"settings": "Configuración ({0})",
-	"setting name": "Nombre",
-	"description": "Descripción",
-	"default": "Predeterminado",
-	"debuggers": "Depuradores ({0})",
-	"debugger name": "Nombre",
-	"debugger type": "Tipo",
-	"viewContainers": "Ver contenedores ({0})",
-	"view container id": "Id.",
-	"view container title": "Título",
-	"view container location": "Donde",
-	"views": "Vistas ({0})",
-	"view id": "Id.",
-	"view name": "Nombre",
-	"view location": "Donde",
-	"localizations": "Localizaciones ({0}) ",
-	"localizations language id": "ID. de idioma",
-	"localizations language name": "Nombre de idioma",
-	"localizations localized language name": "Nombre de idioma (localizado)",
-	"colorThemes": "Temas de color ({0})",
-	"iconThemes": "Temas de icono ({0})",
-	"colors": "Colores ({0})",
-	"colorId": "Id",
-	"defaultDark": "Oscuro por defecto",
-	"defaultLight": "Claro por defecto",
-	"defaultHC": "Contraste alto por defecto",
-	"JSON Validation": "Validación JSON ({0})",
-	"fileMatch": "Coincidencia de archivo",
-	"schema": "Esquema",
-	"commands": "Comandos ({0})",
-	"command name": "Nombre",
-	"keyboard shortcuts": "Métodos abreviados de teclado",
-	"menuContexts": "Contextos de menú",
-	"languages": "Lenguajes ({0})",
-	"language id": "Id.",
-	"language name": "Nombre",
-	"file extensions": "Extensiones de archivo",
-	"grammar": "Gramática",
-	"snippets": "Fragmentos"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/extensions/electron-browser/extensionProfileService.i18n.json b/i18n/esn/src/vs/workbench/parts/extensions/electron-browser/extensionProfileService.i18n.json
deleted file mode 100644
index b5e53f1bf34..00000000000
--- a/i18n/esn/src/vs/workbench/parts/extensions/electron-browser/extensionProfileService.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"restart1": "Generar perfil de extensiones",
-	"restart2": "Para generar el perfil de las extensiones, es necesario reiniciar el sistema. ¿Desea reiniciar \"{0}\" ahora?",
-	"restart3": "Reiniciar",
-	"cancel": "Cancelar",
-	"selectAndStartDebug": "Haga clic aquí para detener la generación de perfiles."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json b/i18n/esn/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
deleted file mode 100644
index 99cc3686e65..00000000000
--- a/i18n/esn/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"neverShowAgain": "No volver a mostrar",
-	"searchMarketplace": "Buscar en Marketplace ",
-	"dynamicWorkspaceRecommendation": "Esta extensión podría interesarle porque muchos otros usuarios del repositorio {0} la utilizan.",
-	"exeBasedRecommendation": "Se recomienda esta extensión porque tiene instalado {0} . ",
-	"fileBasedRecommendation": "Esta extensión se recomienda basado en los archivos que abrió recientemente.",
-	"workspaceRecommendation": "Esta extensión es recomendada por los usuarios del espacio de trabajo actual.",
-	"reallyRecommended2": "La extension recomendada para este tipo de archivo es {0}",
-	"reallyRecommendedExtensionPack": "Para este tipo de fichero, se recomienda el paquete de extensión '{0}'.",
-	"install": "Instalar",
-	"showRecommendations": "Mostrar recomendaciones",
-	"showLanguageExtensions": "El Marketplace tiene extensiones que pueden ayudar con '. {0} ' archivos ",
-	"workspaceRecommended": "Esta área de trabajo tiene recomendaciones de extensión.",
-	"installAll": "Instalar todo",
-	"ignoreExtensionRecommendations": "¿Desea ignorar todas las recomendaciones de la extensión?",
-	"ignoreAll": "Sí, despreciar todas.",
-	"no": "No"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/extensions/electron-browser/extensions.contribution.i18n.json b/i18n/esn/src/vs/workbench/parts/extensions/electron-browser/extensions.contribution.i18n.json
deleted file mode 100644
index 3d583673d8e..00000000000
--- a/i18n/esn/src/vs/workbench/parts/extensions/electron-browser/extensions.contribution.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"extensionsCommands": "Administrar extensiones",
-	"galleryExtensionsCommands": "Instalar extensiones de la galería",
-	"extension": "Extensión",
-	"runtimeExtension": "Extensiones en ejecución",
-	"extensions": "Extensiones",
-	"view": "Ver",
-	"developer": "Desarrollador",
-	"extensionsConfigurationTitle": "Extensiones",
-	"extensionsAutoUpdate": "Actualizar extensiones automáticamente",
-	"extensionsIgnoreRecommendations": "Si se pone en true, las notificaciones para las recomendaciones de la extensión dejarán de aparecer.",
-	"extensionsShowRecommendationsOnlyOnDemand": "Si se activa esta opcíón, las recomendaciones no se obtendrán ni se mostrarán a menos que el usuario lo solicite específicamente."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.i18n.json b/i18n/esn/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.i18n.json
deleted file mode 100644
index e1053fd55c5..00000000000
--- a/i18n/esn/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openExtensionsFolder": "Abrir carpeta de extensiones",
-	"installVSIX": "Instalar desde VSIX...",
-	"installFromVSIX": "Instalar de VSIX",
-	"installButton": "&& Instalar",
-	"InstallVSIXAction.success": "La extensión se instaló correctamente. Reinicie para habilitarla.",
-	"InstallVSIXAction.reloadNow": "Recargar ahora"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/extensions/electron-browser/extensionsUtils.i18n.json b/i18n/esn/src/vs/workbench/parts/extensions/electron-browser/extensionsUtils.i18n.json
deleted file mode 100644
index a14a5510a07..00000000000
--- a/i18n/esn/src/vs/workbench/parts/extensions/electron-browser/extensionsUtils.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"disableOtherKeymapsConfirmation": "¿Quiere deshabilitar otras asignaciones de teclas ({0}) para evitar conflictos entre enlaces de teclado?",
-	"yes": "Sí",
-	"no": "No"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json b/i18n/esn/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
deleted file mode 100644
index a44cd55d9ca..00000000000
--- a/i18n/esn/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"marketPlace": "Marketplace",
-	"installedExtensions": "Instalado",
-	"searchInstalledExtensions": "Instalado",
-	"recommendedExtensions": "Recomendado",
-	"otherRecommendedExtensions": "Otras recomendaciones",
-	"workspaceRecommendedExtensions": "Recomendaciones de espacio de trabajo",
-	"builtInExtensions": "Características",
-	"builtInThemesExtensions": "Temas",
-	"builtInBasicsExtensions": "Lenguajes de programación",
-	"searchExtensions": "Buscar extensiones en Marketplace",
-	"sort by installs": "Criterio de ordenación: Número de instalaciones",
-	"sort by rating": "Criterio de ordenación: Clasificación",
-	"sort by name": "Ordenar por: Nombre",
-	"suggestProxyError": "Marketplace devolvió 'ECONNREFUSED'. Compruebe la configuración de 'http.proxy'.",
-	"extensions": "Extensiones",
-	"outdatedExtensions": "{0} extensiones obsoletas",
-	"malicious warning": "Hemos desinstalado ' {0} ' porque se informó que era problemático.",
-	"reloadNow": "Recargar ahora"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/extensions/electron-browser/extensionsViews.i18n.json b/i18n/esn/src/vs/workbench/parts/extensions/electron-browser/extensionsViews.i18n.json
deleted file mode 100644
index cf004adc2df..00000000000
--- a/i18n/esn/src/vs/workbench/parts/extensions/electron-browser/extensionsViews.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"extensions": "Extensiones",
-	"no extensions found": "No se encontraron extensiones.",
-	"suggestProxyError": "Marketplace devolvió 'ECONNREFUSED'. Compruebe la configuración de 'http.proxy'."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/extensions/electron-browser/keymapExtensions.i18n.json b/i18n/esn/src/vs/workbench/parts/extensions/electron-browser/keymapExtensions.i18n.json
deleted file mode 100644
index 2b42d7a0c5b..00000000000
--- a/i18n/esn/src/vs/workbench/parts/extensions/electron-browser/keymapExtensions.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"disableOtherKeymapsConfirmation": "¿Quiere deshabilitar otras asignaciones de teclado para evitar conflictos entre los enlaces de teclado?",
-	"yes": "Sí",
-	"no": "No"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/extensions/electron-browser/runtimeExtensionsEditor.i18n.json b/i18n/esn/src/vs/workbench/parts/extensions/electron-browser/runtimeExtensionsEditor.i18n.json
deleted file mode 100644
index 369a0416d0d..00000000000
--- a/i18n/esn/src/vs/workbench/parts/extensions/electron-browser/runtimeExtensionsEditor.i18n.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"starActivation": "Activado al inicio",
-	"workspaceContainsGlobActivation": "Activado porque un archivo que coincide con {0} existe en su área de trabajo",
-	"workspaceContainsFileActivation": "Activado porque el archivo {0} existe en su área de trabajo",
-	"languageActivation": "Activado porque abrió un archivo {0}",
-	"workspaceGenericActivation": "Activado en {0}",
-	"errors": "{0} errores no detectados",
-	"extensionsInputName": "Extensiones en ejecución",
-	"showRuntimeExtensions": "Mostrar extensiones en ejecución",
-	"reportExtensionIssue": "Notificar problema",
-	"extensionHostProfileStart": "Iniciar perfil del host de extensiones",
-	"extensionHostProfileStop": "Detener perfil del host de extensiones",
-	"saveExtensionHostProfile": "Guardar perfil del host de extensiones"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.i18n.json b/i18n/esn/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.i18n.json
deleted file mode 100644
index b19291c5e78..00000000000
--- a/i18n/esn/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.i18n.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"installingVSIXExtension": "Instalando  la extensión desde VSIX...",
-	"malicious": "Se reporta que esta extensión es problemática.",
-	"installingMarketPlaceExtension": "Instalando Extension desde Marketplace...",
-	"uninstallingExtension": "Desinstalando la extensión....",
-	"enableDependeciesConfirmation": "Habilitando una extensión también se habilitan sus dependencias. ¿Desea continuar?",
-	"enable": "Sí",
-	"doNotEnable": "No",
-	"disableDependeciesConfirmation": "¿Desea deshabilitar las dependencias de las extensiones?",
-	"yes": "Sí",
-	"no": "No",
-	"cancel": "Cancelar",
-	"singleDependentError": "No se puede deshabilitar la extensión \"{0}\". La extensión \"{1}\" depende de ella.",
-	"twoDependentsError": "No se puede deshabilitar la extensión \"{0}\". Las extensiones \"{1}\" y \"{2}\" dependen de ella.",
-	"multipleDependentsError": "No se puede deshabilitar la extensión \"{0}\". Las extensiones \"{1}\", \"{2}\" y otras dependen de ella.",
-	"installConfirmation": "Desea instalar la extensión '{0}' ?",
-	"install": "Instalar"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json b/i18n/esn/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json
deleted file mode 100644
index 435b23b45a1..00000000000
--- a/i18n/esn/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"workbenchConfigurationTitle": "Área de trabajo",
-	"feedbackVisibility": "Controla la visibilidad de los comentarios de Twitter (smiley) en la barra de estado en la parte inferior del área de trabajo."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/feedback/electron-browser/feedback.i18n.json b/i18n/esn/src/vs/workbench/parts/feedback/electron-browser/feedback.i18n.json
deleted file mode 100644
index e96188d0e7e..00000000000
--- a/i18n/esn/src/vs/workbench/parts/feedback/electron-browser/feedback.i18n.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"sendFeedback": "Enviar tweet con comentarios",
-	"label.sendASmile": "Envíanos un tweet con tus comentarios.",
-	"patchedVersion1": "La instalación está dañada.",
-	"patchedVersion2": "Especifique este dato si envía un error.",
-	"sentiment": "¿Cómo fue su experiencia?",
-	"smileCaption": "Feliz",
-	"frownCaption": "Triste",
-	"other ways to contact us": "Otras formas de ponerse en contacto con nosotros",
-	"submit a bug": "Enviar un error",
-	"request a missing feature": "Solicitar una característica que falta",
-	"tell us why?": "Indícanos por qué",
-	"commentsHeader": "Comentarios",
-	"showFeedback": "Mostrar comentarios de emoticono en la barra de estado",
-	"tweet": "Tweet",
-	"character left": "carácter restante",
-	"characters left": "caracteres restantes",
-	"feedbackSending": "Enviando",
-	"feedbackSent": "Gracias",
-	"feedbackSendingError": "Intentar de nuevo"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json b/i18n/esn/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json
deleted file mode 100644
index ad2caa896d3..00000000000
--- a/i18n/esn/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hide": "Ocultar"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/files/browser/editors/binaryFileEditor.i18n.json b/i18n/esn/src/vs/workbench/parts/files/browser/editors/binaryFileEditor.i18n.json
deleted file mode 100644
index 8be4c5efa50..00000000000
--- a/i18n/esn/src/vs/workbench/parts/files/browser/editors/binaryFileEditor.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"binaryFileEditor": "Visor de archivos binarios"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/files/browser/editors/textFileEditor.i18n.json b/i18n/esn/src/vs/workbench/parts/files/browser/editors/textFileEditor.i18n.json
deleted file mode 100644
index 6a743b771b9..00000000000
--- a/i18n/esn/src/vs/workbench/parts/files/browser/editors/textFileEditor.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"textFileEditor": "Editor de archivos de texto",
-	"createFile": "Crear archivo",
-	"relaunchWithIncreasedMemoryLimit": "Reiniciar con {0} MB",
-	"configureMemoryLimit": "Configurar límite de memoria",
-	"fileEditorWithInputAriaLabel": "{0}. Editor de archivos de texto.",
-	"fileEditorAriaLabel": "Editor de archivos de texto."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/files/browser/explorerViewlet.i18n.json b/i18n/esn/src/vs/workbench/parts/files/browser/explorerViewlet.i18n.json
deleted file mode 100644
index 79a138bf53b..00000000000
--- a/i18n/esn/src/vs/workbench/parts/files/browser/explorerViewlet.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"folders": "Carpetas"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/files/browser/fileActions.contribution.i18n.json b/i18n/esn/src/vs/workbench/parts/files/browser/fileActions.contribution.i18n.json
deleted file mode 100644
index 5b4f1d9a867..00000000000
--- a/i18n/esn/src/vs/workbench/parts/files/browser/fileActions.contribution.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"filesCategory": "Archivo",
-	"revealInSideBar": "Mostrar en barra lateral",
-	"acceptLocalChanges": "Usar los cambios y sobrescribir el contenido del disco",
-	"revertLocalChanges": "Descartar los cambios y volver al contenido del disco"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/files/browser/fileActions.i18n.json b/i18n/esn/src/vs/workbench/parts/files/browser/fileActions.i18n.json
deleted file mode 100644
index 6ceeb1cae46..00000000000
--- a/i18n/esn/src/vs/workbench/parts/files/browser/fileActions.i18n.json
+++ /dev/null
@@ -1,75 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"retry": "Reintentar",
-	"rename": "Cambiar nombre",
-	"newFile": "Nuevo archivo",
-	"newFolder": "Nueva carpeta",
-	"openFolderFirst": "Abra primero una carpeta para crear archivos o carpetas en ella.",
-	"newUntitledFile": "Nuevo archivo sin título",
-	"createNewFile": "Nuevo archivo",
-	"createNewFolder": "Nueva carpeta",
-	"deleteButtonLabelRecycleBin": "&&Mover a la papelera de reciclaje",
-	"deleteButtonLabelTrash": "&&Mover a la papelera",
-	"deleteButtonLabel": "&&Eliminar",
-	"dirtyMessageFolderOneDelete": "Va a eliminar una carpeta con cambios sin guardar en 1 archivo. ¿Desea continuar?",
-	"dirtyMessageFolderDelete": "Va a eliminar una carpeta con cambios sin guardar en {0} archivos. ¿Desea continuar?",
-	"dirtyMessageFileDelete": "Va a eliminar un archivo con cambios sin guardar. ¿Desea continuar?",
-	"dirtyWarning": "Los cambios se perderán si no se guardan.",
-	"confirmMoveTrashMessageFolder": "¿Está seguro de que desea eliminar '{0}' y su contenido?",
-	"confirmMoveTrashMessageFile": "¿Está seguro de que desea eliminar '{0}'?",
-	"undoBin": "Puede restaurar desde la papelera de reciclaje.",
-	"undoTrash": "Puede restaurar desde la papelera.",
-	"doNotAskAgain": "No volver a preguntarme",
-	"confirmDeleteMessageFolder": "¿Está seguro de que desea eliminar '{0}' y su contenido de forma permanente?",
-	"confirmDeleteMessageFile": "¿Está seguro de que desea eliminar '{0}' de forma permanente?",
-	"irreversible": "Esta acción es irreversible.",
-	"permDelete": "Eliminar permanentemente",
-	"delete": "Eliminar",
-	"importFiles": "Importar archivos",
-	"confirmOverwrite": "Ya existe un archivo o carpeta con el mismo nombre en la carpeta de destino. ¿Quiere reemplazarlo?",
-	"replaceButtonLabel": "&&Reemplazar",
-	"copyFile": "Copiar",
-	"pasteFile": "Pegar",
-	"duplicateFile": "Duplicado",
-	"openToSide": "Abrir en el lateral",
-	"compareSource": "Seleccionar para comparar",
-	"globalCompareFile": "Comparar archivo activo con...",
-	"openFileToCompare": "Abrir un archivo antes para compararlo con otro archivo.",
-	"compareWith": "Comparar \"{0}\" con \"{1}\"",
-	"compareFiles": "Comparar archivos",
-	"refresh": "Actualizar",
-	"save": "Guardar",
-	"saveAs": "Guardar como...",
-	"saveAll": "Guardar todos",
-	"saveAllInGroup": "Guardar todo en el grupo",
-	"saveFiles": "Guardar todos los archivos",
-	"revert": "Revertir archivo",
-	"focusOpenEditors": "Foco sobre la vista de editores abiertos",
-	"focusFilesExplorer": "Enfocar Explorador de archivos",
-	"showInExplorer": "Mostrar el archivo activo en la barra lateral",
-	"openFileToShow": "Abra primero un archivo para mostrarlo en el explorador.",
-	"collapseExplorerFolders": "Contraer carpetas en el Explorador",
-	"refreshExplorer": "Actualizar Explorador",
-	"openFileInNewWindow": "Abrir archivo activo en nueva ventana",
-	"openFileToShowInNewWindow": "Abrir un archivo antes para abrirlo en una nueva ventana",
-	"revealInWindows": "Mostrar en el Explorador",
-	"revealInMac": "Mostrar en Finder",
-	"openContainer": "Abrir carpeta contenedora",
-	"revealActiveFileInWindows": "Mostrar archivo activo en el Explorador de Windows",
-	"revealActiveFileInMac": "Mostrar archivo activo en Finder",
-	"openActiveFileContainer": "Abrir carpeta contenedora del archivo activo",
-	"copyPath": "Copiar ruta de acceso",
-	"copyPathOfActive": "Copiar ruta del archivo activo",
-	"emptyFileNameError": "Debe especificarse un nombre de archivo o carpeta.",
-	"fileNameExistsError": "Ya existe el archivo o carpeta **{0}** en esta ubicación. Elija un nombre diferente.",
-	"invalidFileNameError": "El nombre **{0}** no es válido para el archivo o la carpeta. Elija un nombre diferente.",
-	"filePathTooLongError": "El nombre **{0}** da como resultado una ruta de acceso demasiado larga. Elija un nombre más corto.",
-	"compareWithSaved": "Comparar el archivo activo con el guardado",
-	"modifiedLabel": "{0} (en disco) ↔ {1}",
-	"compareWithClipboard": "Comparar archivo activo con portapapeles",
-	"clipboardComparisonLabel": "Portapapeles ↔ {0}"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/files/browser/fileCommands.i18n.json b/i18n/esn/src/vs/workbench/parts/files/browser/fileCommands.i18n.json
deleted file mode 100644
index f417c4b11aa..00000000000
--- a/i18n/esn/src/vs/workbench/parts/files/browser/fileCommands.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"openFileToCopy": "Abrir un archivo antes para copiar su ruta de acceso",
-	"openFileToReveal": "Abrir un archivo antes para mostrarlo"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/files/browser/files.contribution.i18n.json b/i18n/esn/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
deleted file mode 100644
index 6b7926d2bf7..00000000000
--- a/i18n/esn/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
+++ /dev/null
@@ -1,53 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"showExplorerViewlet": "Mostrar explorador",
-	"explore": "Explorador",
-	"view": "Ver",
-	"textFileEditor": "Editor de archivos de texto",
-	"binaryFileEditor": "Editor de archivos binarios",
-	"filesConfigurationTitle": "Archivos",
-	"exclude": "Configurar los patrones globales para excluir archivos y carpetas. Por ejemplo, el explorador de archivos decide que archivos y carpetas mostrar u ocultar según esta configuración.",
-	"files.exclude.boolean": "El patrón global con el que se harán coincidir las rutas de acceso de los archivos. Establézcalo en true o false para habilitarlo o deshabilitarlo.",
-	"files.exclude.when": "Comprobación adicional de los elementos del mismo nivel de un archivo coincidente. Use $(nombreBase) como variable para el nombre de archivo que coincide.",
-	"associations": "Configure asociaciones de archivo para los lenguajes (por ejemplo, \"*.extension\": \"html\"). Estas asociaciones tienen prioridad sobre las asociaciones predeterminadas de los lenguajes instalados.",
-	"encoding": "La codificación del juego de caracteres predeterminada que debe utilizarse al leer y escribir archivos. Este ajuste puede configurarse también por idioma.",
-	"autoGuessEncoding": "Cuando está activada, intentará adivinar la codificación del juego de caracteres al abrir archivos. Este ajuste puede configurarse también por idioma.",
-	"eol": "Carácter predeterminado de final de línea. Utilice \\n para LF y \\r\\n para CRLF.",
-	"trimTrailingWhitespace": "Si se habilita, se recortará el espacio final cuando se guarde un archivo.",
-	"insertFinalNewline": "Si se habilita, inserte una nueva línea final al final del archivo cuando lo guarde.",
-	"trimFinalNewlines": "Cuando se habilita, recorta todas las nuevas líneas después de la última nueva línea al final del archivo al guardarlo",
-	"files.autoSave.off": "Un archivo con modificaciones no se guarda nunca automáticamente.",
-	"files.autoSave.afterDelay": "Un archivo con modificaciones se guarda automáticamente tras la propiedad \"files.autoSaveDelay\" configurada.",
-	"files.autoSave.onFocusChange": "Un archivo con modificaciones se guarda automáticamente cuando el editor deja de fijarse en él.",
-	"files.autoSave.onWindowChange": "Un archivo con modificaciones se guarda automáticamente cuando la ventana deja de fijarse en él.",
-	"autoSave": "Controla el guardado automático de los archivos modificados. Valores aceptados: \"{0}\", \"{1}\", \"{2}\" (el editor pierde el foco), \"{3}\" (la ventana pierde el foco) . Si se establece en \"{4}\", puede configurar el retraso en \"files.autoSaveDelay\".",
-	"autoSaveDelay": "Controla el retraso en MS tras el cual un archivo con modificaciones se guarda automáticamente. Solo se aplica si \"files.autoSave\" está establecido en \"{0}\"",
-	"watcherExclude": "Configure patrones globales de las rutas de acceso de archivo que se van a excluir de la inspección de archivos. Los patrones deben coincidir con rutas de acceso absolutas (por ejemplo, prefijo ** o la ruta de acceso completa para que la coincidencia sea correcta). Al cambiar esta configuración, es necesario reiniciar. Si observa que Code consume mucho tiempo de CPU al iniciarse, puede excluir las carpetas grandes para reducir la carga inicial. ",
-	"hotExit.off": "Deshabilita la salida rápida.",
-	"hotExit.onExit": "hotExit se desencadena al cerrar la aplicación, es decir, al cerrarse la última ventana en Windows/Linux o cuando se desencadena el comando workbench.action.quit (paleta de comandos, enlace de teclado, menú). Todas las ventanas con copias de seguridad se restaurarán la próxima vez que se inicie.",
-	"hotExit.onExitAndWindowClose": "La salida rápida se desencadena al cerrar la aplicación, es decir, al cerrarse la última ventana en Windows/Linux o cuando se desencadena el comando workbench.action.quit (paleta de comandos, enlace de teclado, menú), y también para cualquier ventana que tenga una carpeta abierta, independientemente de que sea o no la última ventana. Todas las ventanas sin carpetas abiertas se restaurarán la próxima vez que se inicie. Para restaurar las ventanas con carpetas tal cual estaban antes de cerrarse, establezca \"window.restoreWindows\" a \"all\".",
-	"hotExit": "Controla si los archivos no guardados se recuerdan entre las sesiones, lo que permite omitir el mensaje para guardar al salir del editor.",
-	"useExperimentalFileWatcher": "Utilice el nuevo monitor de archivo experimental.",
-	"defaultLanguage": "El modo de lenguaje predeterminado que se asigna a nuevos archivos.",
-	"editorConfigurationTitle": "Editor",
-	"formatOnSave": "Formatea un archivo al guardarlo. Debe haber un formateador disponible, el archivo no debe guardarse automáticamente y el editor no debe estar cerrándose.",
-	"explorerConfigurationTitle": "Explorador de archivos",
-	"openEditorsVisible": "Número de editores mostrados en el panel Editores abiertos. Establezca este valor en 0 para ocultar el panel.",
-	"dynamicHeight": "Controla si la altura de la sección de editores abiertos debería adaptarse o no de forma dinámica al número de elementos.",
-	"autoReveal": "Controla si el explorador debe mostrar y seleccionar automáticamente los archivos al abrirlos.",
-	"enableDragAndDrop": "Controla si el explorador debe permitir mover archivos y carpetas mediante la función arrastrar y colocar.",
-	"confirmDragAndDrop": "Controla si el explorador debe pedir la confirmación al reubicar archivos o carpetas a través de arrastrar y soltar.",
-	"confirmDelete": "Controla si el explorador debe pedir la confirmación al borrar un archivo utilizando la papelera.",
-	"sortOrder.default": "Los archivos y las carpetas se ordenan por nombre alfabéticamente. Las carpetas se muestran antes que los archivos.",
-	"sortOrder.mixed": "Los archivos y las carpetas se ordenan por nombre alfabéticamente. Los archivos se entrelazan con las carpetas.",
-	"sortOrder.filesFirst": "Los archivos y las carpetas se ordenan por nombre alfabéticamente. Los archivos se muestran antes que las carpetas.",
-	"sortOrder.type": "Los archivos y las carpetas se ordenan por extensión. Las carpetas se muestran antes que los archivos.",
-	"sortOrder.modified": "Los archivos y las carpetas se ordenan por fecha de última modificación. Las carpetas se muestran antes que los archivos.",
-	"sortOrder": "Controla el criterio de ordenación de los archivos y las carpetas en el explorador. Además del orden \"default\", puede establecer el orden en \"mixed\" (los archivos y las carpetas se ordenan combinados), \"type\" (por tipo de archivo), \"modified\" (por fecha de última modificación) o \"filesFirst\" (los archivos se colocan antes que las carpetas).",
-	"explorer.decorations.colors": "Controla si las decoraciones de archivo deben utilizar colores. ",
-	"explorer.decorations.badges": "Controla si las decoraciones de archivo deben utilizar insignias"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/files/browser/saveErrorHandler.i18n.json b/i18n/esn/src/vs/workbench/parts/files/browser/saveErrorHandler.i18n.json
deleted file mode 100644
index 186f5cdaa42..00000000000
--- a/i18n/esn/src/vs/workbench/parts/files/browser/saveErrorHandler.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"userGuide": "Use las acciones de la barra de herramientas del editor situada a la derecha para **deshacer** los cambios o **sobrescribir** el contenido del disco con sus cambios",
-	"discard": "Descartar",
-	"overwrite": "Sobrescribir",
-	"retry": "Reintentar",
-	"readonlySaveError": "No se pudo guardar '{0}': El archivo está protegido contra escritura. Seleccione \"Sobrescribir\" para quitar la protección.",
-	"genericSaveError": "No se pudo guardar '{0}': {1}",
-	"staleSaveError": "No se pudo guardar '{0}': El contenido del disco es más reciente. Haga clic en **Comparar** para comparar su versión con la que hay en el disco.",
-	"compareChanges": "Comparar",
-	"saveConflictDiffLabel": "0} (on disk) ↔ {1} (in {2}) - Resolver conflicto guardado"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/files/browser/views/emptyView.i18n.json b/i18n/esn/src/vs/workbench/parts/files/browser/views/emptyView.i18n.json
deleted file mode 100644
index bed30ddc028..00000000000
--- a/i18n/esn/src/vs/workbench/parts/files/browser/views/emptyView.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"noWorkspace": "No hay ninguna carpeta abierta",
-	"explorerSection": "Sección del Explorador de archivos",
-	"noWorkspaceHelp": "Todavía no ha agregado una carpeta al espacio de trabajo.",
-	"addFolder": "Agregar Carpeta",
-	"noFolderHelp": "Todavía no ha abierto ninguna carpeta.",
-	"openFolder": "Abrir carpeta"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/files/browser/views/explorerDecorationsProvider.i18n.json b/i18n/esn/src/vs/workbench/parts/files/browser/views/explorerDecorationsProvider.i18n.json
deleted file mode 100644
index e05ecb0ff0e..00000000000
--- a/i18n/esn/src/vs/workbench/parts/files/browser/views/explorerDecorationsProvider.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"label": "Explorador",
-	"canNotResolve": "No se puede resolver la carpeta de trabajo"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/files/browser/views/explorerView.i18n.json b/i18n/esn/src/vs/workbench/parts/files/browser/views/explorerView.i18n.json
deleted file mode 100644
index 3c7ee5abd0c..00000000000
--- a/i18n/esn/src/vs/workbench/parts/files/browser/views/explorerView.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"explorerSection": "Sección del Explorador de archivos",
-	"treeAriaLabel": "Explorador de archivos"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/files/browser/views/explorerViewer.i18n.json b/i18n/esn/src/vs/workbench/parts/files/browser/views/explorerViewer.i18n.json
deleted file mode 100644
index f1bacff5d9e..00000000000
--- a/i18n/esn/src/vs/workbench/parts/files/browser/views/explorerViewer.i18n.json
+++ /dev/null
@@ -1,19 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"fileInputAriaLabel": "Escriba el nombre de archivo. Presione ENTRAR para confirmar o Esc para cancelar",
-	"filesExplorerViewerAriaLabel": "{0}, Explorador de archivos",
-	"dropFolders": "¿Quiere agregar las carpetas al área de trabajo?",
-	"dropFolder": "¿Quiere agregar la carpeta al área de trabajo?",
-	"addFolders": "&&Agregar carpetas",
-	"addFolder": "&&Agregar carpeta",
-	"confirmMove": "¿Está seguro de que desea mover '{0}'?",
-	"doNotAskAgain": "No volver a preguntarme",
-	"moveButtonLabel": "&&Mover",
-	"confirmOverwriteMessage": "'{0}' ya existe en la carpeta de destino. ¿Desea reemplazarlo?",
-	"irreversible": "Esta acción es irreversible.",
-	"replaceButtonLabel": "Reemplazar"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/files/browser/views/openEditorsView.i18n.json b/i18n/esn/src/vs/workbench/parts/files/browser/views/openEditorsView.i18n.json
deleted file mode 100644
index 30c064adf3d..00000000000
--- a/i18n/esn/src/vs/workbench/parts/files/browser/views/openEditorsView.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"openEditors": "Editores abiertos",
-	"openEditosrSection": "Sección Editores abiertos",
-	"treeAriaLabel": "Editores abiertos: lista de archivos activos",
-	"dirtyCounter": "{0} sin guardar"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/files/browser/views/openEditorsViewer.i18n.json b/i18n/esn/src/vs/workbench/parts/files/browser/views/openEditorsViewer.i18n.json
deleted file mode 100644
index f43443fbdd0..00000000000
--- a/i18n/esn/src/vs/workbench/parts/files/browser/views/openEditorsViewer.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"editorGroupAriaLabel": "{0}, grupo de editores",
-	"openEditorAriaLabel": "{0}, abrir editor",
-	"saveAll": "Guardar todos",
-	"closeAllUnmodified": "Cerrar los que no se han modificado",
-	"closeAll": "Cerrar todo",
-	"compareWithSaved": "Comparar con el guardado",
-	"close": "Cerrar",
-	"closeOthers": "Cerrar otros"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/files/common/dirtyFilesTracker.i18n.json b/i18n/esn/src/vs/workbench/parts/files/common/dirtyFilesTracker.i18n.json
deleted file mode 100644
index f2d7b0e9131..00000000000
--- a/i18n/esn/src/vs/workbench/parts/files/common/dirtyFilesTracker.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"dirtyFile": "1 archivo no guardado",
-	"dirtyFiles": "{0} archivos no guardados"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/files/common/editors/fileEditorInput.i18n.json b/i18n/esn/src/vs/workbench/parts/files/common/editors/fileEditorInput.i18n.json
deleted file mode 100644
index a6f396bbe8c..00000000000
--- a/i18n/esn/src/vs/workbench/parts/files/common/editors/fileEditorInput.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"orphanedFile": "{0} (deleted from disk)"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/files/electron-browser/explorerViewlet.i18n.json b/i18n/esn/src/vs/workbench/parts/files/electron-browser/explorerViewlet.i18n.json
deleted file mode 100644
index 8a88adffa89..00000000000
--- a/i18n/esn/src/vs/workbench/parts/files/electron-browser/explorerViewlet.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"folders": "Carpetas"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json b/i18n/esn/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
deleted file mode 100644
index 1dbea27e453..00000000000
--- a/i18n/esn/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"filesCategory": "Archivo",
-	"revealInSideBar": "Mostrar en barra lateral",
-	"acceptLocalChanges": "Usar los cambios y sobrescribir el contenido del disco",
-	"revertLocalChanges": "Descartar los cambios y volver al contenido del disco",
-	"copyPathOfActive": "Copiar ruta del archivo activo",
-	"saveAllInGroup": "Guardar todo en el grupo",
-	"saveFiles": "Guardar todos los archivos",
-	"revert": "Revertir archivo",
-	"compareActiveWithSaved": "Comparar el archivo activo con el guardado",
-	"closeEditor": "Cerrar editor",
-	"view": "Ver",
-	"openToSide": "Abrir en el lateral",
-	"revealInWindows": "Mostrar en el Explorador",
-	"revealInMac": "Mostrar en Finder",
-	"openContainer": "Abrir carpeta contenedora",
-	"copyPath": "Copiar ruta de acceso",
-	"saveAll": "Guardar todos",
-	"compareWithSaved": "Comparar con el guardado",
-	"compareWithSelected": "Comparar con seleccionados",
-	"compareSource": "Seleccionar para comparar",
-	"compareSelected": "Comparar seleccionados",
-	"close": "Cerrar",
-	"closeOthers": "Cerrar otros",
-	"closeSaved": "Cerrar guardados",
-	"closeAll": "Cerrar todo",
-	"deleteFile": "Eliminar permanentemente"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json b/i18n/esn/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
deleted file mode 100644
index 1e23db714d1..00000000000
--- a/i18n/esn/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
+++ /dev/null
@@ -1,72 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"newFile": "Nuevo archivo",
-	"newFolder": "Nueva carpeta",
-	"rename": "Cambiar nombre",
-	"delete": "Eliminar",
-	"copyFile": "Copiar",
-	"pasteFile": "Pegar",
-	"retry": "Reintentar",
-	"renameWhenSourcePathIsParentOfTargetError": "Utilice el comando 'Nueva carpeta' o 'Nuevo archivo' para agregar elementos a una carpeta existente ",
-	"newUntitledFile": "Nuevo archivo sin título",
-	"createNewFile": "Nuevo archivo",
-	"createNewFolder": "Nueva carpeta",
-	"deleteButtonLabelRecycleBin": "&&Mover a la papelera de reciclaje",
-	"deleteButtonLabelTrash": "&&Mover a la papelera",
-	"deleteButtonLabel": "&&Eliminar",
-	"dirtyMessageFilesDelete": "Va a eliminar un archivo con cambios sin guardar. ¿Desea continuar?",
-	"dirtyMessageFolderOneDelete": "Va a eliminar una carpeta con cambios sin guardar en 1 archivo. ¿Desea continuar?",
-	"dirtyMessageFolderDelete": "Va a eliminar una carpeta con cambios sin guardar en {0} archivos. ¿Desea continuar?",
-	"dirtyMessageFileDelete": "Va a eliminar un archivo con cambios sin guardar. ¿Desea continuar?",
-	"dirtyWarning": "Los cambios se perderán si no se guardan.",
-	"undoBin": "Se puede restaurar de la papelera de reciclaje.",
-	"undoTrash": "Se puede restaurar de la papelera.",
-	"doNotAskAgain": "No volver a preguntarme",
-	"irreversible": "Esta acción es irreversible.",
-	"binFailed": "Error al eliminar usando la papelera de reciclaje. ¿Desea eliminar de forma permanente en su lugar?",
-	"trashFailed": "No se pudo eliminar usando la papelera. ¿Desea eliminar de forma permanente?",
-	"deletePermanentlyButtonLabel": "&&Eliminar de forma permanente",
-	"retryButtonLabel": "&&Reintentar",
-	"confirmMoveTrashMessageFilesAndDirectories": "¿Está seguro de que desea eliminar los {0} archivos o directorios siguientes y su contenido?",
-	"confirmMoveTrashMessageMultipleDirectories": "¿Está seguro de que desea eliminar los {0} directorios siguientes y su contenido? ",
-	"confirmMoveTrashMessageMultiple": "¿Está seguro de que desea eliminar los siguientes archivos {0}?",
-	"confirmMoveTrashMessageFolder": "¿Está seguro de que desea eliminar '{0}' y su contenido?",
-	"confirmMoveTrashMessageFile": "¿Está seguro de que desea eliminar '{0}'?",
-	"confirmDeleteMessageFilesAndDirectories": "¿Está seguro de que desea eliminar los {0} archivos o directorios siguientes y su contenido de forma permanente?",
-	"confirmDeleteMessageMultipleDirectories": "¿Está seguro de que desea eliminar los {0} directorios siguientes y su contenido de forma permanente? ",
-	"confirmDeleteMessageMultiple": "¿Está seguro de que desea eliminar de forma permanente los siguientes archivos {0}?",
-	"confirmDeleteMessageFolder": "¿Está seguro de que desea eliminar '{0}' y su contenido de forma permanente?",
-	"confirmDeleteMessageFile": "¿Está seguro de que desea eliminar '{0}' de forma permanente?",
-	"addFiles": "Agregar archivos",
-	"confirmOverwrite": "Ya existe un archivo o carpeta con el mismo nombre en la carpeta de destino. ¿Quiere reemplazarlo?",
-	"replaceButtonLabel": "&&Reemplazar",
-	"fileIsAncestor": "El archivo que se va a pegar es un antecesor de la carpeta de destino",
-	"fileDeleted": "El archivo que se iba a pegar se ha eliminado o movido mientras tanto",
-	"duplicateFile": "Duplicado",
-	"globalCompareFile": "Comparar archivo activo con...",
-	"openFileToCompare": "Abrir un archivo antes para compararlo con otro archivo.",
-	"refresh": "Actualizar",
-	"saveAllInGroup": "Guardar todo en el grupo",
-	"focusOpenEditors": "Foco sobre la vista de editores abiertos",
-	"focusFilesExplorer": "Enfocar Explorador de archivos",
-	"showInExplorer": "Mostrar el archivo activo en la barra lateral",
-	"openFileToShow": "Abra primero un archivo para mostrarlo en el explorador.",
-	"collapseExplorerFolders": "Contraer carpetas en el Explorador",
-	"refreshExplorer": "Actualizar Explorador",
-	"openFileInNewWindow": "Abrir archivo activo en nueva ventana",
-	"openFileToShowInNewWindow": "Abrir un archivo antes para abrirlo en una nueva ventana",
-	"copyPath": "Copiar ruta de acceso",
-	"emptyFileNameError": "Debe especificarse un nombre de archivo o carpeta.",
-	"fileNameStartsWithSlashError": "El nombre de archivo o carpeta no puede comenzar con el carácter barra. ",
-	"fileNameExistsError": "Ya existe el archivo o carpeta **{0}** en esta ubicación. Elija un nombre diferente.",
-	"invalidFileNameError": "El nombre **{0}** no es válido para el archivo o la carpeta. Elija un nombre diferente.",
-	"filePathTooLongError": "El nombre **{0}** da como resultado una ruta de acceso demasiado larga. Elija un nombre más corto.",
-	"compareWithClipboard": "Comparar archivo activo con portapapeles",
-	"clipboardComparisonLabel": "Clipboard ↔ {0}"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json b/i18n/esn/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
deleted file mode 100644
index c49256b3f49..00000000000
--- a/i18n/esn/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"revealInWindows": "Mostrar en el Explorador",
-	"revealInMac": "Mostrar en Finder",
-	"openContainer": "Abrir carpeta contenedora",
-	"saveAs": "Guardar como...",
-	"save": "Guardar",
-	"saveAll": "Guardar todos",
-	"removeFolderFromWorkspace": "Quitar carpeta del área de trabajo",
-	"genericRevertError": "No se pudo revertir ' {0} ': {1}",
-	"modifiedLabel": "{0} (en el disco) ↔ {1}",
-	"openFileToReveal": "Abrir un archivo antes para mostrarlo",
-	"openFileToCopy": "Abrir un archivo antes para copiar su ruta de acceso"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json b/i18n/esn/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
deleted file mode 100644
index 530360de300..00000000000
--- a/i18n/esn/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"showExplorerViewlet": "Mostrar explorador",
-	"explore": "Explorador",
-	"view": "Ver",
-	"textFileEditor": "Editor de archivos de texto",
-	"binaryFileEditor": "Editor de archivos binarios",
-	"filesConfigurationTitle": "Archivos",
-	"exclude": "Configurar los patrones globales para excluir archivos y carpetas. Por ejemplo, el explorador de archivos decide que archivos y carpetas mostrar u ocultar según esta configuración.",
-	"files.exclude.boolean": "El patrón global con el que se harán coincidir las rutas de acceso de los archivos. Establézcalo en true o false para habilitarlo o deshabilitarlo.",
-	"files.exclude.when": "Comprobación adicional de los elementos del mismo nivel de un archivo coincidente. Use $(nombreBase) como variable para el nombre de archivo que coincide.",
-	"associations": "Configure asociaciones de archivo para los lenguajes (por ejemplo, \"*.extension\": \"html\"). Estas asociaciones tienen prioridad sobre las asociaciones predeterminadas de los lenguajes instalados.",
-	"encoding": "La codificación del juego de caracteres predeterminada que debe utilizarse al leer y escribir archivos. Este ajuste puede configurarse también por idioma.",
-	"autoGuessEncoding": "Cuando está activada, intentará adivinar la codificación del juego de caracteres al abrir archivos. Este ajuste puede configurarse también por idioma.",
-	"eol": "Carácter predeterminado de final de línea. Utilice \\n para LF y \\r\\n para CRLF.",
-	"trimTrailingWhitespace": "Si se habilita, se recortará el espacio final cuando se guarde un archivo.",
-	"insertFinalNewline": "Si se habilita, inserte una nueva línea final al final del archivo cuando lo guarde.",
-	"trimFinalNewlines": "Cuando se habilita, recorta todas las nuevas líneas después de la última nueva línea al final del archivo al guardarlo",
-	"files.autoSave.off": "Un archivo con modificaciones no se guarda nunca automáticamente.",
-	"files.autoSave.afterDelay": "Un archivo con modificaciones se guarda automáticamente tras la propiedad \"files.autoSaveDelay\" configurada.",
-	"files.autoSave.onFocusChange": "Un archivo con modificaciones se guarda automáticamente cuando el editor deja de fijarse en él.",
-	"files.autoSave.onWindowChange": "Un archivo con modificaciones se guarda automáticamente cuando la ventana deja de fijarse en él.",
-	"autoSave": "Controla el guardado automático de los archivos modificados. Valores aceptados: \"{0}\", \"{1}\", \"{2}\" (el editor pierde el foco), \"{3}\" (la ventana pierde el foco) . Si se establece en \"{4}\", puede configurar el retraso en \"files.autoSaveDelay\".",
-	"autoSaveDelay": "Controla el retraso en MS tras el cual un archivo con modificaciones se guarda automáticamente. Solo se aplica si \"files.autoSave\" está establecido en \"{0}\"",
-	"watcherExclude": "Configure patrones globales de las rutas de acceso de archivo que se van a excluir de la inspección de archivos. Los patrones deben coincidir con rutas de acceso absolutas (por ejemplo, prefijo ** o la ruta de acceso completa para que la coincidencia sea correcta). Al cambiar esta configuración, es necesario reiniciar. Si observa que Code consume mucho tiempo de CPU al iniciarse, puede excluir las carpetas grandes para reducir la carga inicial. ",
-	"hotExit.off": "Deshabilita la salida rápida.",
-	"hotExit.onExit": "hotExit se desencadena al cerrar la aplicación, es decir, al cerrarse la última ventana en Windows/Linux o cuando se desencadena el comando workbench.action.quit (paleta de comandos, enlace de teclado, menú). Todas las ventanas con copias de seguridad se restaurarán la próxima vez que se inicie.",
-	"hotExit.onExitAndWindowClose": "La salida rápida se desencadena al cerrar la aplicación, es decir, al cerrarse la última ventana en Windows/Linux o cuando se desencadena el comando workbench.action.quit (paleta de comandos, enlace de teclado, menú), y también para cualquier ventana que tenga una carpeta abierta, independientemente de que sea o no la última ventana. Todas las ventanas sin carpetas abiertas se restaurarán la próxima vez que se inicie. Para restaurar las ventanas con carpetas tal cual estaban antes de cerrarse, establezca \"window.restoreWindows\" a \"all\".",
-	"hotExit": "Controla si los archivos no guardados se recuerdan entre las sesiones, lo que permite omitir el mensaje para guardar al salir del editor.",
-	"useExperimentalFileWatcher": "Utilice el nuevo monitor de archivo experimental.",
-	"defaultLanguage": "El modo de lenguaje predeterminado que se asigna a nuevos archivos.",
-	"maxMemoryForLargeFilesMB": "Controla la memoria disponible para VS Code después de reiniciar, cuando se intenta abrir archivos de gran tamaño. Afecta de la misma manera si se especifica --max-memory = NUEVOTAMAÑO en la línea de comandos. ",
-	"editorConfigurationTitle": "Editor",
-	"formatOnSave": "Formatea un archivo al guardarlo. Debe haber un formateador disponible, el archivo no debe guardarse automáticamente y el editor no debe estar cerrándose.",
-	"formatOnSaveTimeout": "Tiempo de espera de aplicación de formato al guardar. Especifica un límite de tiempo en milisegundos para los comandos formatOnSave. Los comandos que tarden más del tiempo de espera especificado se cancelarán.",
-	"explorerConfigurationTitle": "Explorador de archivos",
-	"openEditorsVisible": "Número de editores mostrados en el panel de editores abiertos.",
-	"autoReveal": "Controla si el explorador debe mostrar y seleccionar automáticamente los archivos al abrirlos.",
-	"enableDragAndDrop": "Controla si el explorador debe permitir mover archivos y carpetas mediante la función arrastrar y colocar.",
-	"confirmDragAndDrop": "Controla si el explorador debe pedir la confirmación al reubicar archivos o carpetas a través de arrastrar y soltar.",
-	"confirmDelete": "Controla si el explorador debe pedir la confirmación al borrar un archivo utilizando la papelera.",
-	"sortOrder.default": "Los archivos y las carpetas se ordenan por nombre alfabéticamente. Las carpetas se muestran antes que los archivos.",
-	"sortOrder.mixed": "Los archivos y las carpetas se ordenan por nombre alfabéticamente. Los archivos se entrelazan con las carpetas.",
-	"sortOrder.filesFirst": "Los archivos y las carpetas se ordenan por nombre alfabéticamente. Los archivos se muestran antes que las carpetas.",
-	"sortOrder.type": "Los archivos y las carpetas se ordenan por extensión. Las carpetas se muestran antes que los archivos.",
-	"sortOrder.modified": "Los archivos y las carpetas se ordenan por fecha de última modificación. Las carpetas se muestran antes que los archivos.",
-	"sortOrder": "Controla el criterio de ordenación de los archivos y las carpetas en el explorador. Además del orden \"default\", puede establecer el orden en \"mixed\" (los archivos y las carpetas se ordenan combinados), \"type\" (por tipo de archivo), \"modified\" (por fecha de última modificación) o \"filesFirst\" (los archivos se colocan antes que las carpetas).",
-	"explorer.decorations.colors": "Controla si las decoraciones de archivo deben utilizar colores. ",
-	"explorer.decorations.badges": "Controla si las decoraciones de archivo deben utilizar insignias"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json b/i18n/esn/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json
deleted file mode 100644
index c8225196607..00000000000
--- a/i18n/esn/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"userGuide": "Use las acciones de la barra de herramientas del editor para deshacer los cambios o sobrescribir el contenido del disco con los cambios.",
-	"staleSaveError": "No se pudo guardar \"{0}\". El contenido del disco es más reciente. Compare su versión con la del disco.",
-	"retry": "Reintentar",
-	"discard": "Descartar",
-	"readonlySaveErrorAdmin": "No se pudo guardar '{0}': El archivo está protegido contra escritura. Seleccione 'Sobrescribir como Admin' para volverlo a intentar como administrador.",
-	"readonlySaveError": "No se pudo guardar '{0}': El archivo está protegido contra escritura. Seleccione 'Sobrescribir' para intentar quitar la protección.",
-	"permissionDeniedSaveError": "No se pudo guardar '{0}': Permisos insuficientes. Seleccione 'Reintentar como Admin' para volverlo a intentar como administrador.",
-	"genericSaveError": "No se pudo guardar '{0}': {1}",
-	"learnMore": "Más información",
-	"dontShowAgain": "No volver a mostrar",
-	"compareChanges": "Comparar",
-	"saveConflictDiffLabel": "0} (on disk) ↔ {1} (in {2}) - Resolver conflicto guardado",
-	"overwriteElevated": "Sobrescribir como Admin...",
-	"saveElevated": "Reintentar como Admin...",
-	"overwrite": "Sobrescribir"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/files/electron-browser/views/emptyView.i18n.json b/i18n/esn/src/vs/workbench/parts/files/electron-browser/views/emptyView.i18n.json
deleted file mode 100644
index 183908cb8d5..00000000000
--- a/i18n/esn/src/vs/workbench/parts/files/electron-browser/views/emptyView.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noWorkspace": "No hay ninguna carpeta abierta",
-	"explorerSection": "Sección del Explorador de archivos",
-	"noWorkspaceHelp": "Todavía no ha agregado una carpeta al espacio de trabajo.",
-	"addFolder": "Agregar Carpeta",
-	"noFolderHelp": "Todavía no ha abierto ninguna carpeta.",
-	"openFolder": "Abrir carpeta"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/files/electron-browser/views/explorerDecorationsProvider.i18n.json b/i18n/esn/src/vs/workbench/parts/files/electron-browser/views/explorerDecorationsProvider.i18n.json
deleted file mode 100644
index e3d585e8769..00000000000
--- a/i18n/esn/src/vs/workbench/parts/files/electron-browser/views/explorerDecorationsProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"label": "Explorador",
-	"canNotResolve": "No se puede resolver la carpeta de trabajo",
-	"symbolicLlink": "Vínculo simbólico"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/files/electron-browser/views/explorerView.i18n.json b/i18n/esn/src/vs/workbench/parts/files/electron-browser/views/explorerView.i18n.json
deleted file mode 100644
index 39ab0a0b935..00000000000
--- a/i18n/esn/src/vs/workbench/parts/files/electron-browser/views/explorerView.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"explorerSection": "Sección del Explorador de archivos",
-	"treeAriaLabel": "Explorador de archivos"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json b/i18n/esn/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
deleted file mode 100644
index c8dca1d775b..00000000000
--- a/i18n/esn/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"fileInputAriaLabel": "Escriba el nombre de archivo. Presione ENTRAR para confirmar o Esc para cancelar",
-	"createFileFromExplorerInfoMessage": "Crear el archivo **{0}** en **{1}**",
-	"renameFileFromExplorerInfoMessage": "Mover y cambiar nombre a **{0}**",
-	"createFolderFromExplorerInfoMessage": "Crear la carpeta **{0}** en **{1}**",
-	"filesExplorerViewerAriaLabel": "{0}, Explorador de archivos",
-	"dropFolders": "¿Quiere agregar las carpetas al área de trabajo?",
-	"dropFolder": "¿Quiere agregar la carpeta al área de trabajo?",
-	"addFolders": "&&Agregar carpetas",
-	"addFolder": "&&Agregar carpeta",
-	"confirmRootsMove": "¿Está seguro de que quiere cambiar el orden de varias carpetas raíz en el área de trabajo?",
-	"confirmMultiMove": "¿Está seguro de que desea mover los siguientes archivos {0}?",
-	"confirmRootMove": "¿Está seguro de que quiere cambiar el orden de la carpeta raíz \"{0}\" en el área de trabajo?",
-	"confirmMove": "¿Está seguro de que desea mover '{0}'?",
-	"doNotAskAgain": "No volver a preguntarme",
-	"moveButtonLabel": "&&Mover",
-	"confirmOverwriteMessage": "'{0}' ya existe en la carpeta de destino. ¿Desea reemplazarlo?",
-	"irreversible": "Esta acción es irreversible.",
-	"replaceButtonLabel": "&&Reemplazar"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json b/i18n/esn/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json
deleted file mode 100644
index 5fbf86be80c..00000000000
--- a/i18n/esn/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openEditors": "Editores abiertos",
-	"openEditosrSection": "Sección Editores abiertos",
-	"dirtyCounter": "{0} sin guardar"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/files/electron-browser/views/openEditorsViewer.i18n.json b/i18n/esn/src/vs/workbench/parts/files/electron-browser/views/openEditorsViewer.i18n.json
deleted file mode 100644
index f43443fbdd0..00000000000
--- a/i18n/esn/src/vs/workbench/parts/files/electron-browser/views/openEditorsViewer.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"editorGroupAriaLabel": "{0}, grupo de editores",
-	"openEditorAriaLabel": "{0}, abrir editor",
-	"saveAll": "Guardar todos",
-	"closeAllUnmodified": "Cerrar los que no se han modificado",
-	"closeAll": "Cerrar todo",
-	"compareWithSaved": "Comparar con el guardado",
-	"close": "Cerrar",
-	"closeOthers": "Cerrar otros"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/git/browser/gitActions.contribution.i18n.json b/i18n/esn/src/vs/workbench/parts/git/browser/gitActions.contribution.i18n.json
deleted file mode 100644
index 5246565d98f..00000000000
--- a/i18n/esn/src/vs/workbench/parts/git/browser/gitActions.contribution.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"switchToChangesView": "Cambiar a la vista de cambios",
-	"openInEditor": "Cambiar a la vista de editor",
-	"workbenchStage": "Almacenar provisionalmente",
-	"workbenchUnstage": "Cancelar almacenamiento provisional",
-	"stageSelectedLines": "Almacenar provisionalmente las líneas seleccionadas",
-	"unstageSelectedLines": "Deshacer la preparación de las líneas seleccionadas",
-	"revertSelectedLines": "Revertir líneas seleccionadas",
-	"confirmRevertMessage": "¿Seguro que desea revertir los cambios seleccionados?",
-	"irreversible": "Esta acción es irreversible.",
-	"revertChangesLabel": "&&Revertir cambios",
-	"openChange": "Abrir cambio",
-	"openFile": "Abrir archivo",
-	"git": "GIT"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/git/browser/gitActions.i18n.json b/i18n/esn/src/vs/workbench/parts/git/browser/gitActions.i18n.json
deleted file mode 100644
index 7b98450846a..00000000000
--- a/i18n/esn/src/vs/workbench/parts/git/browser/gitActions.i18n.json
+++ /dev/null
@@ -1,46 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"openChange": "Abrir cambio",
-	"openFile": "Abrir archivo",
-	"init": "Iniciar",
-	"refresh": "Actualizar",
-	"stageChanges": "Almacenar provisionalmente",
-	"stageAllChanges": "Almacenar todo provisionalmente",
-	"confirmUndoMessage": "¿Seguro que quiere limpiar todos los cambios?",
-	"confirmUndoAllOne": "Hay cambios que no se almacenaron provisionalmente en {0} archivo. Esta acción es irreversible.",
-	"confirmUndoAllMultiple": "Hay cambios que no se almacenaron provisionalmente en {0} archivos. Esta acción es irreversible.",
-	"cleanChangesLabel": "&&Limpiar cambios",
-	"confirmUndo": "¿Seguro que quiere limpiar los cambios de '{0}'?",
-	"irreversible": "Esta acción es irreversible.",
-	"undoChanges": "Limpiar",
-	"undoAllChanges": "Limpiar todo",
-	"unstage": "Cancelar almacenamiento provisional",
-	"unstageAllChanges": "Cancelar almacenamiento provisional de todo",
-	"dirtyTreeCheckout": "No se puede desproteger. Confirme o guarde provisionalmente su trabajo primero.",
-	"commitStaged": "Confirmar almacenados provisionalmente",
-	"commitStagedAmend": "Confirmar almacenados provisionalmente (modificar)",
-	"commitStagedSignedOff": "Confirmar por etapas (Aprobado)",
-	"commit": "Confirmar",
-	"commitMessage": "Mensaje de confirmación",
-	"commitAll": "Confirmar todo",
-	"commitAllSignedOff": "Confirmar todo (aprobado)",
-	"commitAll2": "Confirmar todo",
-	"commitStaged2": "Confirmar almacenados provisionalmente",
-	"dirtyTreePull": "No se puede extraer. Confirme o guarde provisionalmente su trabajo primero.",
-	"authFailed": "Error de autenticación en GIT remoto.",
-	"pushToRemote": "Insertar en...",
-	"pushToRemotePickMessage": "Elija un origen remoto donde insertar la rama '{0}':",
-	"publish": "Publicar",
-	"confirmPublishMessage": "¿Seguro que quiere publicar '{0}' en '{1}'?",
-	"confirmPublishMessageButton": "&&Publicar",
-	"publishPickMessage": "Seleccionar un elemento remoto para publicar la rama '{0}':",
-	"sync is unpredictable": "Esta acción insertará y extraerá confirmaciones en '{0}'.",
-	"ok": "Aceptar",
-	"cancel": "Cancelar",
-	"never again": "De acuerdo, no volver a mostrar este mensaje",
-	"undoLastCommit": "Deshacer última confirmación"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/git/browser/gitQuickOpen.i18n.json b/i18n/esn/src/vs/workbench/parts/git/browser/gitQuickOpen.i18n.json
deleted file mode 100644
index 05d389d43e5..00000000000
--- a/i18n/esn/src/vs/workbench/parts/git/browser/gitQuickOpen.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"refAriaLabel": "{0}, GIT",
-	"checkoutBranch": "Rama en {0}",
-	"checkoutRemoteBranch": "Rama remota en {0}",
-	"checkoutTag": "Etiqueta en {0}",
-	"alreadyCheckedOut": "{0} ya es la rama actual",
-	"branchAriaLabel": "{0}, rama de GIT",
-	"createBranch": "Crear la rama {0}",
-	"noBranches": "No hay otras ramas",
-	"notValidBranchName": "Proporcione un nombre de rama válido"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/git/browser/gitServices.i18n.json b/i18n/esn/src/vs/workbench/parts/git/browser/gitServices.i18n.json
deleted file mode 100644
index 228d1e94072..00000000000
--- a/i18n/esn/src/vs/workbench/parts/git/browser/gitServices.i18n.json
+++ /dev/null
@@ -1,30 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"cantOpen": "No se puede abrir este recurso de Git.",
-	"gitIndexChanges": "{0} (index) ↔ {1}",
-	"gitIndexChangesDesc": "{0} - Cambios del índice",
-	"gitIndexChangesRenamed": "{0} ← {1}",
-	"gitIndexChangesRenamedDesc": "{0} - Cambiado de nombre - Cambios en el índice",
-	"workingTreeChanges": "{0} (HEAD) ↔ {1}",
-	"workingTreeChangesDesc": "{0} - Cambios del árbol de trabajo",
-	"gitMergeChanges": "{0} (merge) ↔ {1}",
-	"gitMergeChangesDesc": "{0} - Combinar cambios",
-	"updateGit": "Parece que tiene GIT {0} instalado. Code funciona mejor con GIT >=2.0.0.",
-	"download": "Descargar",
-	"neverShowAgain": "No volver a mostrar",
-	"configureUsernameEmail": "Configure su nombre de usuario de GIT y su correo electrónico.",
-	"badConfigFile": "Git {0}",
-	"unmergedChanges": "Debe resolver los cambios sin combinar antes de confirmar sus cambios.",
-	"showOutput": "Mostrar salida",
-	"cancel": "Cancelar",
-	"checkNativeConsole": "Se ha producido un problema al ejecutar la operación GIT. Revise la salida o use una consola para comprobar el estado del repositorio.",
-	"changesFromIndex": "{0} (index)",
-	"changesFromIndexDesc": "{0} - Cambios del índice",
-	"changesFromTree": "{0} ({1})",
-	"changesFromTreeDesc": "{0} - Cambios de {1}",
-	"cantOpenResource": "No se puede abrir este recurso de Git."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/git/browser/gitWidgets.i18n.json b/i18n/esn/src/vs/workbench/parts/git/browser/gitWidgets.i18n.json
deleted file mode 100644
index 670f46da63a..00000000000
--- a/i18n/esn/src/vs/workbench/parts/git/browser/gitWidgets.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"publishBranch": "Publicar rama",
-	"syncBranch": "Sincronizar cambios",
-	"gitNotEnabled": "Git no está habilitado en esta área de trabajo."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/git/browser/gitWorkbenchContributions.i18n.json b/i18n/esn/src/vs/workbench/parts/git/browser/gitWorkbenchContributions.i18n.json
deleted file mode 100644
index 6db5cf213b2..00000000000
--- a/i18n/esn/src/vs/workbench/parts/git/browser/gitWorkbenchContributions.i18n.json
+++ /dev/null
@@ -1,23 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"gitProgressBadge": "Estado del Git en ejecución",
-	"gitPendingChangesBadge": "{0} cambios pendientes",
-	"toggleGitViewlet": "Mostrar GIT",
-	"git": "GIT",
-	"view": "Ver",
-	"gitCommands": "Comandos Git",
-	"gitConfigurationTitle": "GIT",
-	"gitEnabled": "Habilitado para GIT",
-	"gitPath": "Ruta de acceso del ejecutable de GIT",
-	"gitAutoRefresh": "Indica si la actualización automática está habilitada",
-	"gitAutoFetch": "Si la búsqueda automática está habilitada.",
-	"gitLongCommit": "Si se debe advertir sobre los mensajes de confirmación largos.",
-	"gitLargeRepos": "Permitir siempre que Code administre grandes repositorios.",
-	"confirmSync": "Confirmar antes de sincronizar repositorios GIT.",
-	"countBadge": "Controla el contador de señales git.",
-	"checkoutType": "Controla qué tipo de ramas figuran en la lista."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/git/browser/views/changes/changesView.i18n.json b/i18n/esn/src/vs/workbench/parts/git/browser/views/changes/changesView.i18n.json
deleted file mode 100644
index 8a421f9c63e..00000000000
--- a/i18n/esn/src/vs/workbench/parts/git/browser/views/changes/changesView.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"needMessage": "Especifique un mensaje de confirmación. Siempre puede presionar **{0}** para confirmar los cambios. Si hay cambios almacenados provisionalmente, solo se confirmarán dichos cambios; de lo contrario, se confirmarán todos los cambios.",
-	"nothingToCommit": "Cuando haya cambios para confirmar, escriba el mensaje de confirmación y presione **{0}** para confirmarlos. Si hay cambios almacenados provisionalmente, solo se confirmarán estos cambios; de lo contrario, se confirmarán todos los cambios.",
-	"longCommit": "Se recomienda mantener la primera línea de la confirmación por debajo de 50 caracteres. Puede usar más líneas para información adicional.",
-	"commitMessage": "Message (press {0} to commit)",
-	"commitMessageAriaLabel": "GIT: Escriba un mensaje de confirmación y presione {0} para confirmar",
-	"treeAriaLabel": "Vista de cambios de GIT",
-	"showOutput": "Mostrar salida de GIT"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/git/browser/views/changes/changesViewer.i18n.json b/i18n/esn/src/vs/workbench/parts/git/browser/views/changes/changesViewer.i18n.json
deleted file mode 100644
index 09abcf4efbf..00000000000
--- a/i18n/esn/src/vs/workbench/parts/git/browser/views/changes/changesViewer.i18n.json
+++ /dev/null
@@ -1,38 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"stagedChanges": "Cambios almacenados provisionalmente",
-	"allChanges": "Cambios",
-	"mergeChanges": "Fusionar cambios mediante combinación",
-	"outsideOfWorkspace": "Este archivo se encuentra fuera del área de trabajo actual.",
-	"modified-char": "M",
-	"added-char": "A",
-	"deleted-char": "D",
-	"renamed-char": "R",
-	"copied-char": "C",
-	"untracked-char": "U",
-	"ignored-char": "!",
-	"title-index-modified": "Modificado en índice",
-	"title-modified": "Modificado",
-	"title-index-added": "Agregado a índice",
-	"title-index-deleted": "Eliminado de índice",
-	"title-deleted": "Eliminado",
-	"title-index-renamed": "Nombre modificado en índice",
-	"title-index-copied": "Copiado en índice",
-	"title-untracked": "Sin seguimiento",
-	"title-ignored": "Omitido",
-	"title-conflict-both-deleted": "Conflicto: eliminado por los dos",
-	"title-conflict-added-by-us": "Conflicto: agregado por nosotros",
-	"title-conflict-deleted-by-them": "Conflicto: eliminado por ellos",
-	"title-conflict-added-by-them": "Conflicto: agregado por ellos",
-	"title-conflict-deleted-by-us": "Conflicto: eliminado por nosotros",
-	"title-conflict-both-added": "Conflicto: agregado por los dos",
-	"title-conflict-both-modified": "Conflicto: modificado por los dos",
-	"fileStatusAriaLabel": "El archivo {0} de la carpeta {1} tiene el estado: {2}, GIT",
-	"ariaLabelStagedChanges": "Cambios almacenados provisionalmente, GIT",
-	"ariaLabelChanges": "Cambios, GIT",
-	"ariaLabelMerge": "Fusión mediante combinación, GIT"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/git/browser/views/disabled/disabledView.i18n.json b/i18n/esn/src/vs/workbench/parts/git/browser/views/disabled/disabledView.i18n.json
deleted file mode 100644
index aa3c48555a5..00000000000
--- a/i18n/esn/src/vs/workbench/parts/git/browser/views/disabled/disabledView.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"disabled": "GIT está deshabilitado en la configuración."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/git/browser/views/empty/emptyView.i18n.json b/i18n/esn/src/vs/workbench/parts/git/browser/views/empty/emptyView.i18n.json
deleted file mode 100644
index 0efb5da60ce..00000000000
--- a/i18n/esn/src/vs/workbench/parts/git/browser/views/empty/emptyView.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"noGit": "Esta área de trabajo aún no está bajo el control de código fuente de Git.",
-	"gitinit": "Inicializar repositorio de GIT"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/git/browser/views/gitless/gitlessView.i18n.json b/i18n/esn/src/vs/workbench/parts/git/browser/views/gitless/gitlessView.i18n.json
deleted file mode 100644
index a2d0d4b5e8b..00000000000
--- a/i18n/esn/src/vs/workbench/parts/git/browser/views/gitless/gitlessView.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"macInstallWith": "Puede instalarlo con {0}, descargarlo de {1} o instalar las herramientas de desarrollo de la línea de comandos de {2} con solo escribir {3} en el símbolo del sistema de un terminal.",
-	"winInstallWith": "Puede instalarlo con {0} o descargarlo desde {1}.",
-	"linuxDownloadFrom": "Se puede descargar de {0}.",
-	"downloadFrom": "Se puede descargar de {0}.",
-	"looksLike": "Parece que GIT no está instalado en el sistema.",
-	"pleaseRestart": "Una vez instalado GIT, reinicie VSCode."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/git/browser/views/huge/hugeView.i18n.json b/i18n/esn/src/vs/workbench/parts/git/browser/views/huge/hugeView.i18n.json
deleted file mode 100644
index feb7d558bf7..00000000000
--- a/i18n/esn/src/vs/workbench/parts/git/browser/views/huge/hugeView.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"huge": "El repositorio parece tener muchos cambios activos. Esto puede hacer que Code se ejecute muy lento.",
-	"setting": "Puede deshabilitar permanentemente esta advertencia con el valor siguiente:",
-	"allo": "Permitir repositorios de gran tamaño"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/git/browser/views/notroot/notrootView.i18n.json b/i18n/esn/src/vs/workbench/parts/git/browser/views/notroot/notrootView.i18n.json
deleted file mode 100644
index bd3a9c69924..00000000000
--- a/i18n/esn/src/vs/workbench/parts/git/browser/views/notroot/notrootView.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"wrongRoot": "Este directorio parece estar incluido en un repositorio GIT.",
-	"pleaseRestart": "Abra el directorio raíz del repositorio para acceder a las características de GIT."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/git/browser/views/noworkspace/noworkspaceView.i18n.json b/i18n/esn/src/vs/workbench/parts/git/browser/views/noworkspace/noworkspaceView.i18n.json
deleted file mode 100644
index 5b119228d42..00000000000
--- a/i18n/esn/src/vs/workbench/parts/git/browser/views/noworkspace/noworkspaceView.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"noWorkspaceHelp": "Todavía no ha abierto ninguna carpeta.",
-	"pleaseRestart": "Abra una carpeta que tenga un repositorio GIT para acceder a las características de GIT.",
-	"openFolder": "Abrir carpeta"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/git/electron-browser/git.contribution.i18n.json b/i18n/esn/src/vs/workbench/parts/git/electron-browser/git.contribution.i18n.json
deleted file mode 100644
index b2e924f4d37..00000000000
--- a/i18n/esn/src/vs/workbench/parts/git/electron-browser/git.contribution.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"toggleSCMViewlet": "Mostrar SCM",
-	"git": "GIT"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/git/electron-browser/gitActions.i18n.json b/i18n/esn/src/vs/workbench/parts/git/electron-browser/gitActions.i18n.json
deleted file mode 100644
index 42a5e9264e8..00000000000
--- a/i18n/esn/src/vs/workbench/parts/git/electron-browser/gitActions.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"valid": "Proporcione una dirección URL válida de un repositorio de GIT",
-	"url": "URL del repositorio",
-	"directory": "Directorio de destino de la clonación",
-	"cloning": "Clonando el repositorio '{0}'...",
-	"already exists": "El repositorio de destino ya existe. Elija otro directorio para la clonación."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/git/electron-main/askpassService.i18n.json b/i18n/esn/src/vs/workbench/parts/git/electron-main/askpassService.i18n.json
deleted file mode 100644
index fa15e3b391d..00000000000
--- a/i18n/esn/src/vs/workbench/parts/git/electron-main/askpassService.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"git": "GIT"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/git/node/git.lib.i18n.json b/i18n/esn/src/vs/workbench/parts/git/node/git.lib.i18n.json
deleted file mode 100644
index 9abed089c1b..00000000000
--- a/i18n/esn/src/vs/workbench/parts/git/node/git.lib.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"errorBuffer": "No se puede abrir el archivo de GIT",
-	"fileBinaryError": "El archivo parece ser binario y no se puede abrir como texto"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/html/browser/html.contribution.i18n.json b/i18n/esn/src/vs/workbench/parts/html/browser/html.contribution.i18n.json
deleted file mode 100644
index d73134b9c52..00000000000
--- a/i18n/esn/src/vs/workbench/parts/html/browser/html.contribution.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"html.editor.label": "Vista previa de HTML"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/html/browser/htmlPreviewPart.i18n.json b/i18n/esn/src/vs/workbench/parts/html/browser/htmlPreviewPart.i18n.json
deleted file mode 100644
index 1709fee8d03..00000000000
--- a/i18n/esn/src/vs/workbench/parts/html/browser/htmlPreviewPart.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"html.voidInput": "Entrada del editor no válida."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/html/browser/webview.contribution.i18n.json b/i18n/esn/src/vs/workbench/parts/html/browser/webview.contribution.i18n.json
deleted file mode 100644
index 70152293951..00000000000
--- a/i18n/esn/src/vs/workbench/parts/html/browser/webview.contribution.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"developer": "Desarrollador"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/html/browser/webview.i18n.json b/i18n/esn/src/vs/workbench/parts/html/browser/webview.i18n.json
deleted file mode 100644
index fb46f7bfaa7..00000000000
--- a/i18n/esn/src/vs/workbench/parts/html/browser/webview.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"devtools.webview": "Desarrollador: Herramientas Webview"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/html/browser/webviewCommands.i18n.json b/i18n/esn/src/vs/workbench/parts/html/browser/webviewCommands.i18n.json
deleted file mode 100644
index 38469956531..00000000000
--- a/i18n/esn/src/vs/workbench/parts/html/browser/webviewCommands.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"editor.action.webvieweditor.showFind": "Foco Encontrar Widget",
-	"openToolsLabel": "Abrir herramientas de desarrollo de vistas web",
-	"refreshWebviewLabel": "Recargar vistas web"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json b/i18n/esn/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json
deleted file mode 100644
index d73134b9c52..00000000000
--- a/i18n/esn/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"html.editor.label": "Vista previa de HTML"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json b/i18n/esn/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json
deleted file mode 100644
index 1709fee8d03..00000000000
--- a/i18n/esn/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"html.voidInput": "Entrada del editor no válida."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json b/i18n/esn/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json
deleted file mode 100644
index 70152293951..00000000000
--- a/i18n/esn/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"developer": "Desarrollador"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json b/i18n/esn/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json
deleted file mode 100644
index 760d6b600cd..00000000000
--- a/i18n/esn/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openToolsLabel": "Abrir herramientas de desarrollo de vistas web",
-	"refreshWebviewLabel": "Recargar vistas web"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json b/i18n/esn/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
deleted file mode 100644
index 6fd49793b66..00000000000
--- a/i18n/esn/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"updateLocale": "¿Desea cambiar el idioma de la interfaz de usuario de VS Code a {0} y reiniciar la aplicación?",
-	"yes": "Sí",
-	"no": "No",
-	"neverAgain": "No volver a mostrar",
-	"JsonSchema.locale": "Idioma de la interfaz de usuario que debe usarse.",
-	"vscode.extension.contributes.localizations": "Contribuye a la localización del editor",
-	"vscode.extension.contributes.localizations.languageId": "Identificador del idioma en el que se traducen las cadenas de visualización.",
-	"vscode.extension.contributes.localizations.languageName": "Nombre del idioma en Inglés.",
-	"vscode.extension.contributes.localizations.languageNameLocalized": "Nombre de la lengua en el idioma contribuido.",
-	"vscode.extension.contributes.localizations.translations": "Lista de traducciones asociadas al idioma.",
-	"vscode.extension.contributes.localizations.translations.id": "ID de VS Code o extensión a la que se ha contribuido esta traducción. ID de código vs es siempre ' vscode ' y de extensión debe ser en formato ' publisherID. extensionName '.",
-	"vscode.extension.contributes.localizations.translations.id.pattern": "ID debe ser ' vscode ' o en formato ' publisherId.extensionName ' para traducer VS Code o una extensión respectivamente.",
-	"vscode.extension.contributes.localizations.translations.path": "Una ruta de acceso relativa a un archivo que contiene traducciones para el idioma."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/localizations/browser/localizationsActions.i18n.json b/i18n/esn/src/vs/workbench/parts/localizations/browser/localizationsActions.i18n.json
deleted file mode 100644
index e5e5ab4cfb0..00000000000
--- a/i18n/esn/src/vs/workbench/parts/localizations/browser/localizationsActions.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"configureLocale": "Configurar idioma",
-	"displayLanguage": "Define el lenguaje para mostrar de VSCode.",
-	"doc": "Consulte {0} para obtener una lista de idiomas compatibles.",
-	"restart": "Al cambiar el valor se requiere reiniciar VSCode.",
-	"fail.createSettings": "No se puede crear '{0}' ({1})."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/localizations/electron-browser/localizations.contribution.i18n.json b/i18n/esn/src/vs/workbench/parts/localizations/electron-browser/localizations.contribution.i18n.json
deleted file mode 100644
index ec042cfefb5..00000000000
--- a/i18n/esn/src/vs/workbench/parts/localizations/electron-browser/localizations.contribution.i18n.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"updateLocale": "¿Desea cambiar el idioma de la interfaz de usuario de VS Code a {0} y reiniciar la aplicación?",
-	"activateLanguagePack": "¿Desea reiniciar VS Code para activar el paquete de idioma que acaba de instalar?",
-	"yes": "Sí",
-	"no": "No",
-	"neverAgain": "No volver a mostrar",
-	"install language pack": "En un futuro próximo, VS Code sólo soportará paquetes de idiomas en forma de extensiones de Marketplace. Instale la extensión ' {0} ' para continuar utilizando el idioma configurado actualmente. ",
-	"install": "Instalar",
-	"more information": "Más información...",
-	"JsonSchema.locale": "Idioma de la interfaz de usuario que debe usarse.",
-	"vscode.extension.contributes.localizations": "Contribuye a la localización del editor",
-	"vscode.extension.contributes.localizations.languageId": "Identificador del idioma en el que se traducen las cadenas de visualización.",
-	"vscode.extension.contributes.localizations.languageName": "Nombre del idioma en Inglés.",
-	"vscode.extension.contributes.localizations.languageNameLocalized": "Nombre de la lengua en el idioma contribuido.",
-	"vscode.extension.contributes.localizations.translations": "Lista de traducciones asociadas al idioma.",
-	"vscode.extension.contributes.localizations.translations.id": "ID de VS Code o extensión a la que se ha contribuido esta traducción. ID de código vs es siempre ' vscode ' y de extensión debe ser en formato ' publisherID. extensionName '.",
-	"vscode.extension.contributes.localizations.translations.id.pattern": "ID debe ser ' vscode ' o en formato ' publisherId.extensionName ' para traducer VS Code o una extensión respectivamente.",
-	"vscode.extension.contributes.localizations.translations.path": "Una ruta de acceso relativa a un archivo que contiene traducciones para el idioma."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/localizations/electron-browser/localizationsActions.i18n.json b/i18n/esn/src/vs/workbench/parts/localizations/electron-browser/localizationsActions.i18n.json
deleted file mode 100644
index 179fc6bda42..00000000000
--- a/i18n/esn/src/vs/workbench/parts/localizations/electron-browser/localizationsActions.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"configureLocale": "Configurar idioma de pantalla",
-	"displayLanguage": "Define el lenguaje para mostrar de VSCode.",
-	"doc": "Consulte {0} para obtener una lista de idiomas compatibles.",
-	"restart": "Al cambiar el valor se requiere reiniciar VSCode.",
-	"fail.createSettings": "No se puede crear '{0}' ({1})."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json b/i18n/esn/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json
deleted file mode 100644
index aed691191cb..00000000000
--- a/i18n/esn/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"mainLog": "Log (Principal)",
-	"sharedLog": "Log (Compartido)",
-	"rendererLog": "Log (Ventana)",
-	"extensionsLog": "Log (Extensión del Host)",
-	"developer": "Desarrollador"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json b/i18n/esn/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json
deleted file mode 100644
index 6d6dfbb8c77..00000000000
--- a/i18n/esn/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openLogsFolder": "Abrir carpeta de registros",
-	"showLogs": "Mostrar registros...",
-	"rendererProcess": "Ventana ({0})",
-	"emptyWindow": "Ventana",
-	"extensionHost": "Host de extensión",
-	"sharedProcess": "Compartido",
-	"mainProcess": "Principal",
-	"selectProcess": "Seleccionar un registro para procesar",
-	"openLogFile": "Abrir archivo de log...",
-	"setLogLevel": "Establecer nivel de registro...",
-	"trace": "Seguimiento",
-	"debug": "Depurar",
-	"info": "Información",
-	"warn": "Advertencia",
-	"err": "Error",
-	"critical": "Crítico",
-	"off": "Apagado",
-	"selectLogLevel": "Seleccionar nivel de log",
-	"default and current": "Predeterminado y actual ",
-	"default": "Predeterminado",
-	"current": "Actual\n"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/markers/browser/markersFileDecorations.i18n.json b/i18n/esn/src/vs/workbench/parts/markers/browser/markersFileDecorations.i18n.json
deleted file mode 100644
index 5f229151f6c..00000000000
--- a/i18n/esn/src/vs/workbench/parts/markers/browser/markersFileDecorations.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"label": "Problemas",
-	"tooltip.1": "1 problema en este fichero",
-	"tooltip.N": "{0} problemas en este fichero",
-	"markers.showOnFile": "Mostrar Errores y Advertencias en la carpeta y ficheros."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/markers/browser/markersPanel.i18n.json b/i18n/esn/src/vs/workbench/parts/markers/browser/markersPanel.i18n.json
deleted file mode 100644
index 4e534a88b7c..00000000000
--- a/i18n/esn/src/vs/workbench/parts/markers/browser/markersPanel.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"totalProblems": "Total {0} Problemas",
-	"filteredProblems": "Mostrando {0} de {1} problemas"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/markers/common/markers.i18n.json b/i18n/esn/src/vs/workbench/parts/markers/common/markers.i18n.json
deleted file mode 100644
index 4e534a88b7c..00000000000
--- a/i18n/esn/src/vs/workbench/parts/markers/common/markers.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"totalProblems": "Total {0} Problemas",
-	"filteredProblems": "Mostrando {0} de {1} problemas"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/markers/common/messages.i18n.json b/i18n/esn/src/vs/workbench/parts/markers/common/messages.i18n.json
deleted file mode 100644
index b9a7c1d4a86..00000000000
--- a/i18n/esn/src/vs/workbench/parts/markers/common/messages.i18n.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"viewCategory": "Ver",
-	"problems.view.toggle.label": "Alternar problemas (errores, advertencias, información)",
-	"problems.view.focus.label": "Problemas de enfoque (errores, advertencias, información)",
-	"problems.panel.configuration.title": "Vista Problemas",
-	"problems.panel.configuration.autoreveal": "Controla si la vista Problemas debe revelar automáticamente los archivos cuando los abre",
-	"markers.panel.title.problems": "Problemas",
-	"markers.panel.aria.label.problems.tree": "Problemas agrupados por archivos",
-	"markers.panel.no.problems.build": "Hasta el momento, no se encontraron problemas en el área de trabajo.",
-	"markers.panel.no.problems.filters": "No se encontraron resultados con los criterios de filtro proporcionados",
-	"markers.panel.action.filter": "Filtrar problemas",
-	"markers.panel.filter.placeholder": "Filtrar por tipo o texto",
-	"markers.panel.filter.errors": "errores",
-	"markers.panel.filter.warnings": "advertencias",
-	"markers.panel.filter.infos": "informaciones",
-	"markers.panel.single.error.label": "1 error",
-	"markers.panel.multiple.errors.label": "{0} errores",
-	"markers.panel.single.warning.label": "1 advertencia",
-	"markers.panel.multiple.warnings.label": "{0} advertencias",
-	"markers.panel.single.info.label": "1 información",
-	"markers.panel.multiple.infos.label": "{0} informaciones",
-	"markers.panel.single.unknown.label": "1 desconocido",
-	"markers.panel.multiple.unknowns.label": "{0} desconocidos",
-	"markers.panel.at.ln.col.number": "({0}, {1})",
-	"problems.tree.aria.label.resource": "{0} con {1} problemas",
-	"problems.tree.aria.label.error.marker": "Se generó un error en {0}: {1} en la línea {2} y el carácter {3}",
-	"problems.tree.aria.label.error.marker.nosource": "Error: {0} en la línea {1} y el carácter {2}",
-	"problems.tree.aria.label.warning.marker": "Se generó una advertencia en {0}: {1} en la línea {2} y el carácter {3}",
-	"problems.tree.aria.label.warning.marker.nosource": "Advertencia: {0} en la línea {1} y el carácter {2}",
-	"problems.tree.aria.label.info.marker": "Se generó información en {0}: {1} en la línea {2} y el carácter {3}",
-	"problems.tree.aria.label.info.marker.nosource": "Información: {0} en la línea {1} y el carácter {2}",
-	"problems.tree.aria.label.marker": "Se generó un problema en {0}: {1} en la línea {2} y el carácter {3}",
-	"problems.tree.aria.label.marker.nosource": "Problema: {0} en la línea {1} y el carácter{2}",
-	"errors.warnings.show.label": "Mostrar errores y advertencias"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json b/i18n/esn/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json
deleted file mode 100644
index 57024a086ac..00000000000
--- a/i18n/esn/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"copyMarker": "Copiar",
-	"copyMessage": "Copiar mensaje"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/markers/electron-browser/markers.i18n.json b/i18n/esn/src/vs/workbench/parts/markers/electron-browser/markers.i18n.json
deleted file mode 100644
index 8323facb36a..00000000000
--- a/i18n/esn/src/vs/workbench/parts/markers/electron-browser/markers.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"totalProblems": "Total {0} Problemas"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/markers/electron-browser/markersElectronContributions.i18n.json b/i18n/esn/src/vs/workbench/parts/markers/electron-browser/markersElectronContributions.i18n.json
deleted file mode 100644
index 710a643d6e8..00000000000
--- a/i18n/esn/src/vs/workbench/parts/markers/electron-browser/markersElectronContributions.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"copyMarker": "Copiar",
-	"copyMarkerMessage": "Copiar mensaje"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.i18n.json b/i18n/esn/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.i18n.json
deleted file mode 100644
index 5f229151f6c..00000000000
--- a/i18n/esn/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"label": "Problemas",
-	"tooltip.1": "1 problema en este fichero",
-	"tooltip.N": "{0} problemas en este fichero",
-	"markers.showOnFile": "Mostrar Errores y Advertencias en la carpeta y ficheros."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/markers/electron-browser/markersPanel.i18n.json b/i18n/esn/src/vs/workbench/parts/markers/electron-browser/markersPanel.i18n.json
deleted file mode 100644
index 62fe295a776..00000000000
--- a/i18n/esn/src/vs/workbench/parts/markers/electron-browser/markersPanel.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"disableFilesExclude": "Deshabilitar el filtro de exclusión de archivos.",
-	"clearFilter": "Borrar el filtro."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/markers/electron-browser/markersPanelActions.i18n.json b/i18n/esn/src/vs/workbench/parts/markers/electron-browser/markersPanelActions.i18n.json
deleted file mode 100644
index 6c7f0c66ec7..00000000000
--- a/i18n/esn/src/vs/workbench/parts/markers/electron-browser/markersPanelActions.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"showing filtered problems": "Se muestran {0} de {1}"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json b/i18n/esn/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
deleted file mode 100644
index 90352e08b0c..00000000000
--- a/i18n/esn/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"viewCategory": "Ver",
-	"problems.view.toggle.label": "Alternar problemas (errores, advertencias, información)",
-	"problems.view.focus.label": "Problemas de enfoque (errores, advertencias, información)",
-	"problems.panel.configuration.title": "Vista Problemas",
-	"problems.panel.configuration.autoreveal": "Controla si la vista Problemas debe revelar automáticamente los archivos cuando los abre",
-	"markers.panel.title.problems": "Problemas",
-	"markers.panel.aria.label.problems.tree": "Problemas agrupados por archivos",
-	"markers.panel.no.problems.build": "Hasta el momento, no se encontraron problemas en el área de trabajo.",
-	"markers.panel.no.problems.filters": "No se encontraron resultados con los criterios de filtro proporcionados.",
-	"markers.panel.no.problems.file.exclusions": "Todos los problemas se ocultan porque el filtro de exclusión de archivos  está habilitado.",
-	"markers.panel.action.useFilesExclude": "Filtrar usando la configuración para excluir archivos",
-	"markers.panel.action.donotUseFilesExclude": "No utilice opción para excluir archivos",
-	"markers.panel.action.filter": "Filtrar problemas",
-	"markers.panel.filter.ariaLabel": "Filtrar problemas",
-	"markers.panel.filter.placeholder": "Filtro. Por ejemplo: text, **/*.ts, !**/node_modules/**",
-	"markers.panel.filter.errors": "errores",
-	"markers.panel.filter.warnings": "advertencias",
-	"markers.panel.filter.infos": "informaciones",
-	"markers.panel.single.error.label": "1 error",
-	"markers.panel.multiple.errors.label": "{0} errores",
-	"markers.panel.single.warning.label": "1 advertencia",
-	"markers.panel.multiple.warnings.label": "{0} advertencias",
-	"markers.panel.single.info.label": "1 información",
-	"markers.panel.multiple.infos.label": "{0} informaciones",
-	"markers.panel.single.unknown.label": "1 desconocido",
-	"markers.panel.multiple.unknowns.label": "{0} desconocidos",
-	"markers.panel.at.ln.col.number": "({0}, {1})",
-	"problems.tree.aria.label.resource": "{0} con {1} problemas",
-	"problems.tree.aria.label.marker.relatedInformation": " Este problema tiene referencias a ubicaciones de {0}.",
-	"problems.tree.aria.label.error.marker": "Error generado por {0}: {1} en la línea {2} y el carácter {3}.{4}",
-	"problems.tree.aria.label.error.marker.nosource": "Error: {0} en la línea {1} y el carácter {2}.{3}",
-	"problems.tree.aria.label.warning.marker": "Advertencia generada por {0}: {1} en la línea {2} y el carácter {3}.{4}",
-	"problems.tree.aria.label.warning.marker.nosource": "Advertencia: {0} en la línea {1} y el carácter {2}.{3}",
-	"problems.tree.aria.label.info.marker": "Información generada por {0}: {1} en la línea {2} y el carácter {3}.{4}",
-	"problems.tree.aria.label.info.marker.nosource": "Información: {0} en la línea {1} y el carácter {2}.{3}",
-	"problems.tree.aria.label.marker": "Problema generado por {0}: {1} en la línea {2} y el carácter {3}.{4}",
-	"problems.tree.aria.label.marker.nosource": "Problema: {0} en la línea {1} y el carácter {2}.{3}",
-	"problems.tree.aria.label.relatedinfo.message": "{0} en la línea {1} y el carácter {2} en {3}",
-	"errors.warnings.show.label": "Mostrar errores y advertencias"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/nps/electron-browser/nps.contribution.i18n.json b/i18n/esn/src/vs/workbench/parts/nps/electron-browser/nps.contribution.i18n.json
deleted file mode 100644
index 2e4d1ea682f..00000000000
--- a/i18n/esn/src/vs/workbench/parts/nps/electron-browser/nps.contribution.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"surveyQuestion": "¿Le importaría realizar una breve encuesta de opinión?",
-	"takeSurvey": "Realizar encuesta",
-	"remindLater": "Recordármelo más tarde",
-	"neverAgain": "No volver a mostrar"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/outline/electron-browser/outline.contribution.i18n.json b/i18n/esn/src/vs/workbench/parts/outline/electron-browser/outline.contribution.i18n.json
deleted file mode 100644
index 839ec8ac0d0..00000000000
--- a/i18n/esn/src/vs/workbench/parts/outline/electron-browser/outline.contribution.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"name": "Esquema",
-	"category.focus": "Archivo",
-	"label.focus": "Foco en el esquema"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/outline/electron-browser/outlinePanel.i18n.json b/i18n/esn/src/vs/workbench/parts/outline/electron-browser/outlinePanel.i18n.json
deleted file mode 100644
index 41671fe33aa..00000000000
--- a/i18n/esn/src/vs/workbench/parts/outline/electron-browser/outlinePanel.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"filter": "Filtro",
-	"collapse": "Contraer todo",
-	"sortByPosition": "Ordenar por: posición",
-	"sortByName": "Ordenar por: Nombre",
-	"sortByKind": "Ordenar por: tipo",
-	"live": "Seguir el Cursor",
-	"no-editor": "No hay editores abiertos que pueden proporcionar información del esquema.",
-	"too-many-symbols": "Lamentablemente, este archivo es demasiado grande para mostrar un esquema."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/outline/electron-browser/outlineTree.i18n.json b/i18n/esn/src/vs/workbench/parts/outline/electron-browser/outlineTree.i18n.json
deleted file mode 100644
index 460ddbc0312..00000000000
--- a/i18n/esn/src/vs/workbench/parts/outline/electron-browser/outlineTree.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"outline.title": "línea {0} en {1} "
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/output/browser/output.contribution.i18n.json b/i18n/esn/src/vs/workbench/parts/output/browser/output.contribution.i18n.json
deleted file mode 100644
index c75638715f9..00000000000
--- a/i18n/esn/src/vs/workbench/parts/output/browser/output.contribution.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"output": "Salida",
-	"viewCategory": "Ver",
-	"clearOutput.label": "Borrar salida"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/output/browser/outputActions.i18n.json b/i18n/esn/src/vs/workbench/parts/output/browser/outputActions.i18n.json
deleted file mode 100644
index 0c741775e1f..00000000000
--- a/i18n/esn/src/vs/workbench/parts/output/browser/outputActions.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleOutput": "Alternar salida",
-	"clearOutput": "Borrar salida",
-	"toggleOutputScrollLock": "Alternar Bloq Despl salida",
-	"switchToOutput.label": "Cambiar a salida",
-	"openInLogViewer": "Abrir archivo de registro"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/output/browser/outputPanel.i18n.json b/i18n/esn/src/vs/workbench/parts/output/browser/outputPanel.i18n.json
deleted file mode 100644
index 138581bc272..00000000000
--- a/i18n/esn/src/vs/workbench/parts/output/browser/outputPanel.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"output": "Salida",
-	"outputPanelWithInputAriaLabel": "{0}, panel de salida",
-	"outputPanelAriaLabel": "Panel de salida"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/output/common/output.i18n.json b/i18n/esn/src/vs/workbench/parts/output/common/output.i18n.json
deleted file mode 100644
index f477b58e3a6..00000000000
--- a/i18n/esn/src/vs/workbench/parts/output/common/output.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"output": "Salida",
-	"channel": "para \"{0}\""
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json b/i18n/esn/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
deleted file mode 100644
index 1ce77e76c3f..00000000000
--- a/i18n/esn/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"output": "Salida",
-	"logViewer": "Visor de registros",
-	"viewCategory": "Ver",
-	"clearOutput.label": "Borrar salida",
-	"openActiveLogOutputFile": "Ver: abrir el archivo de salida del registro activo"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json b/i18n/esn/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json
deleted file mode 100644
index 49cc2385856..00000000000
--- a/i18n/esn/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"output": "{0} - Output",
-	"channel": "Canal de output para '{0}' "
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/performance/electron-browser/performance.contribution.i18n.json b/i18n/esn/src/vs/workbench/parts/performance/electron-browser/performance.contribution.i18n.json
deleted file mode 100644
index 8aa6eb775be..00000000000
--- a/i18n/esn/src/vs/workbench/parts/performance/electron-browser/performance.contribution.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"prof.message": "Los perfiles se crearon correctamente.",
-	"prof.detail": "Cree un problema y asóciele manualmente los siguientes archivos: {0}",
-	"prof.restartAndFileIssue": "Crear problema y reiniciar",
-	"prof.restart": "Reiniciar",
-	"prof.thanks": "Gracias por ayudarnos.",
-	"prof.detail.restart": "Se necesita un reinicio final para continuar utilizando '{0}'. De nuevo, gracias por su aportación."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/performance/electron-browser/startupProfiler.i18n.json b/i18n/esn/src/vs/workbench/parts/performance/electron-browser/startupProfiler.i18n.json
deleted file mode 100644
index 7e74fe19f03..00000000000
--- a/i18n/esn/src/vs/workbench/parts/performance/electron-browser/startupProfiler.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"prof.message": "Los perfiles se crearon correctamente.",
-	"prof.detail": "Cree un problema y asóciele manualmente los siguientes archivos: {0}",
-	"prof.restartAndFileIssue": "Crear problema y reiniciar",
-	"prof.restart": "Reiniciar",
-	"prof.thanks": "Gracias por ayudarnos.",
-	"prof.detail.restart": "Se necesita un reinicio final para continuar utilizando '{0}'. De nuevo, gracias por su aportación."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/preferences/browser/keybindingWidgets.i18n.json b/i18n/esn/src/vs/workbench/parts/preferences/browser/keybindingWidgets.i18n.json
deleted file mode 100644
index e3199ffc033..00000000000
--- a/i18n/esn/src/vs/workbench/parts/preferences/browser/keybindingWidgets.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"defineKeybinding.oneExists": "1 comando existente tiene esta combinación de teclas",
-	"defineKeybinding.existing": "{0} comandos tienen este enlace de teclado",
-	"defineKeybinding.initial": "Presione la combinación de teclas deseada y ENTRAR",
-	"defineKeybinding.chordsTo": "chord to"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json b/i18n/esn/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
deleted file mode 100644
index 634545e1c6f..00000000000
--- a/i18n/esn/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"showDefaultKeybindings": "Mostrar enlaces de teclado predeterminados",
-	"showUserKeybindings": "Mostrar enlaces de teclado del usuario",
-	"SearchKeybindings.AriaLabel": "Buscar enlaces de teclado",
-	"SearchKeybindings.Placeholder": "Buscar enlaces de teclado",
-	"sortByPrecedene": "Ordenar por procedimiento",
-	"header-message": "Para personalizaciones avanzadas, abra y edite el archivo ",
-	"keybindings-file-name": "keybindings.json",
-	"keybindingsLabel": "Enlaces de teclado",
-	"changeLabel": "Cambiar enlace de teclado",
-	"addLabel": "Agregar enlace de teclado",
-	"removeLabel": "Quitar enlace de teclado",
-	"resetLabel": "Restablecer enlaces de teclado",
-	"showSameKeybindings": "Mostrar mismo KeyBindings ",
-	"copyLabel": "Copiar",
-	"copyCommandLabel": "Comando Copiar",
-	"error": "Error \"{0}\" al editar el enlace de teclado. Abra el archivo \"keybindings.json\" y compruebe si tiene errores.",
-	"command": "Comando",
-	"keybinding": "Enlace de teclado",
-	"source": "Origen",
-	"when": "Cuando",
-	"editKeybindingLabelWithKey": "Cambiar enlace de teclado {0}",
-	"editKeybindingLabel": "Cambiar enlace de teclado",
-	"addKeybindingLabelWithKey": "Agregar enlace de teclado {0}",
-	"addKeybindingLabel": "Agregar enlace de teclado",
-	"title": "{0} ({1})",
-	"commandAriaLabel": "El comando es {0}.",
-	"keybindingAriaLabel": "El enlace de teclado es {0}.",
-	"noKeybinding": "No se ha asignado ningún enlace de teclado.",
-	"sourceAriaLabel": "El origen es {0}.",
-	"whenAriaLabel": "Cuando es {0}.",
-	"noWhen": "No, cuando hay contexto."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/preferences/browser/keybindingsEditorContribution.i18n.json b/i18n/esn/src/vs/workbench/parts/preferences/browser/keybindingsEditorContribution.i18n.json
deleted file mode 100644
index ae8303c1126..00000000000
--- a/i18n/esn/src/vs/workbench/parts/preferences/browser/keybindingsEditorContribution.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"defineKeybinding.start": "Definir enlace de teclado",
-	"defineKeybinding.kbLayoutErrorMessage": "La distribución del teclado actual no permite reproducir esta combinación de teclas.",
-	"defineKeybinding.kbLayoutLocalAndUSMessage": "**{0}** para su distribución de teclado actual (**{1}** para EE. UU. estándar).",
-	"defineKeybinding.kbLayoutLocalMessage": "**{0}** para su distribución de teclado actual."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/preferences/browser/preferences.contribution.i18n.json b/i18n/esn/src/vs/workbench/parts/preferences/browser/preferences.contribution.i18n.json
deleted file mode 100644
index dd7480cb534..00000000000
--- a/i18n/esn/src/vs/workbench/parts/preferences/browser/preferences.contribution.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"defaultPreferencesEditor": "Editor de preferencias predeterminado",
-	"keybindingsEditor": "Editor de enlaces de teclado",
-	"preferences": "Preferencias"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json b/i18n/esn/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
deleted file mode 100644
index 43c2c3d02aa..00000000000
--- a/i18n/esn/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openRawDefaultSettings": "Abrir Configuración Predeterminada Raw",
-	"openSettings2": "Abrir configuración (versión preliminar)",
-	"openSettings": "Abrir configuración",
-	"openGlobalSettings": "Abrir configuración de usuario",
-	"openGlobalKeybindings": "Abrir métodos abreviados de teclado",
-	"openGlobalKeybindingsFile": "Abrir el archivo de métodos abreviados de teclado",
-	"openWorkspaceSettings": "Abrir configuración del área de trabajo",
-	"openFolderSettings": "Abrir Configuración de carpeta",
-	"configureLanguageBasedSettings": "Configurar opciones específicas del lenguaje...",
-	"languageDescriptionConfigured": "({0})",
-	"pickLanguage": "Seleccionar lenguaje"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json b/i18n/esn/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
deleted file mode 100644
index 2c40cb00195..00000000000
--- a/i18n/esn/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"SearchSettingsWidget.AriaLabel": "Buscar configuración",
-	"SearchSettingsWidget.Placeholder": "Buscar configuración",
-	"noSettingsFound": "Sin resultados",
-	"oneSettingFound": "1 configuración encontrada",
-	"settingsFound": "{0} Configuraciones encontradas",
-	"totalSettingsMessage": "{0} configuraciones en total",
-	"nlpResult": "Resultados en lenguaje natural",
-	"filterResult": "Resultados filtrados",
-	"defaultSettings": "Configuración predeterminada",
-	"defaultUserSettings": "Configuración predeterminada de usuario",
-	"defaultWorkspaceSettings": "Configuración de espacio de trabajo predeterminado",
-	"defaultFolderSettings": "Configuración de carpeta predeterminada",
-	"defaultEditorReadonly": "Editar en el editor de lado de mano derecha para reemplazar valores predeterminados.",
-	"preferencesAriaLabel": "Preferencias predeterminadas. Editor de texto de solo lectura."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json b/i18n/esn/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
deleted file mode 100644
index 98610852f74..00000000000
--- a/i18n/esn/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"emptyUserSettingsHeader": "Coloque aquí su configuración para sobrescribir la configuración predeterminada.",
-	"emptyWorkspaceSettingsHeader": "Coloque aquí su configuración para sobrescribir la configuración de usuario.",
-	"emptyFolderSettingsHeader": "Coloque aquí su configuración de carpeta para sobrescribir la que se especifica en la configuración de área de trabajo.",
-	"reportSettingsSearchIssue": "Notificar problema",
-	"newExtensionLabel": "Mostrar extensión \"{0}\"",
-	"editTtile": "Editar",
-	"replaceDefaultValue": "Reemplazar en Configuración",
-	"copyDefaultValue": "Copiar en Configuración"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/preferences/browser/preferencesService.i18n.json b/i18n/esn/src/vs/workbench/parts/preferences/browser/preferencesService.i18n.json
deleted file mode 100644
index 15749e4075a..00000000000
--- a/i18n/esn/src/vs/workbench/parts/preferences/browser/preferencesService.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openFolderFirst": "Abrir una carpeta antes de crear la configuración del área de trabajo",
-	"emptyKeybindingsHeader": "Coloque sus enlaces de teclado en este archivo para sobrescribir los valores predeterminados.",
-	"defaultKeybindings": "Enlaces de teclado predeterminados",
-	"folderSettingsName": "{0} (Configuración de carpeta)",
-	"fail.createSettings": "No se puede crear '{0}' ({1})."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json b/i18n/esn/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
deleted file mode 100644
index ab7d7822445..00000000000
--- a/i18n/esn/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"defaultSettings": "Colocar la configuración en el editor de lado de mano derecha para anular.",
-	"noSettingsFound": "No se encontró ninguna configuración.",
-	"settingsSwitcherBarAriaLabel": "Conmutador de configuración",
-	"userSettings": "Configuración de usuario",
-	"workspaceSettings": "Configuración de área de trabajo",
-	"folderSettings": "Configuración de Carpeta"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/preferences/browser/settingsEditor2.i18n.json b/i18n/esn/src/vs/workbench/parts/preferences/browser/settingsEditor2.i18n.json
deleted file mode 100644
index d92e80e75a6..00000000000
--- a/i18n/esn/src/vs/workbench/parts/preferences/browser/settingsEditor2.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"previewWarning": "Vista Previa",
-	"previewLabel": "Esta es una versión preliminar del nuevo editor de configuración",
-	"SearchSettings.AriaLabel": "Buscar configuración",
-	"SearchSettings.Placeholder": "Buscar configuración",
-	"advancedCustomizationLabel": "Para personalizaciones avanzadas, abra y edite el archivo ",
-	"openSettingsLabel": "settings.json",
-	"showOverriddenOnly": "Mostrar solo lo que se ha modificado",
-	"treeAriaLabel": "Configuración",
-	"feedbackButtonLabel": "Proporcionar comentarios"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/preferences/browser/settingsTree.i18n.json b/i18n/esn/src/vs/workbench/parts/preferences/browser/settingsTree.i18n.json
deleted file mode 100644
index a5ec14b6bc4..00000000000
--- a/i18n/esn/src/vs/workbench/parts/preferences/browser/settingsTree.i18n.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"modifiedItemForeground": "Color de primer plano para un ajuste modificado.",
-	"workspace": "Área de trabajo",
-	"user": "Usuario",
-	"resetButtonTitle": "restablecer",
-	"configured": "Modificado",
-	"alsoConfiguredIn": "Modificado también en",
-	"configuredIn": "Modificado en",
-	"editInSettingsJson": "Editar en settings.json",
-	"settingRowAriaLabel": "{0} {1}, Configuración",
-	"groupRowAriaLabel": "{0}, grupo"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/preferences/common/keybindingsEditorModel.i18n.json b/i18n/esn/src/vs/workbench/parts/preferences/common/keybindingsEditorModel.i18n.json
deleted file mode 100644
index 3b8f425ab88..00000000000
--- a/i18n/esn/src/vs/workbench/parts/preferences/common/keybindingsEditorModel.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"default": "Predeterminado",
-	"user": "Usuario",
-	"meta": "meta",
-	"option": "opción"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/preferences/common/preferences.i18n.json b/i18n/esn/src/vs/workbench/parts/preferences/common/preferences.i18n.json
deleted file mode 100644
index 0fe233e5a77..00000000000
--- a/i18n/esn/src/vs/workbench/parts/preferences/common/preferences.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"userSettingsTarget": "Configuración de usuario",
-	"workspaceSettingsTarget": "Configuración de área de trabajo"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json b/i18n/esn/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json
deleted file mode 100644
index 38c1319f3c1..00000000000
--- a/i18n/esn/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"commonlyUsed": "Más utilizada",
-	"defaultKeybindingsHeader": "Coloque los enlaces de teclado en el archivo de enlaces de teclado para sobrescribirlos."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/preferences/electron-browser/preferences.contribution.i18n.json b/i18n/esn/src/vs/workbench/parts/preferences/electron-browser/preferences.contribution.i18n.json
deleted file mode 100644
index 7bc1cd827ae..00000000000
--- a/i18n/esn/src/vs/workbench/parts/preferences/electron-browser/preferences.contribution.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"defaultPreferencesEditor": "Editor de preferencias predeterminado",
-	"settingsEditor2": "Editor de configuración 2",
-	"keybindingsEditor": "Editor de enlaces de teclado",
-	"preferences": "Preferencias"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/quickopen/browser/commandsHandler.i18n.json b/i18n/esn/src/vs/workbench/parts/quickopen/browser/commandsHandler.i18n.json
deleted file mode 100644
index 9411cebaec2..00000000000
--- a/i18n/esn/src/vs/workbench/parts/quickopen/browser/commandsHandler.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"showTriggerActions": "Mostrar todos los comandos",
-	"clearCommandHistory": "Borrar historial de comandos",
-	"showCommands.label": "Paleta de comandos...",
-	"entryAriaLabelWithKey": "{0}, {1}, comandos",
-	"entryAriaLabel": "{0}, comandos",
-	"actionNotEnabled": "El comando '{0}' no está habilitado en el contexto actual.",
-	"canNotRun": "El comando \"{0}\" dio error.",
-	"recentlyUsed": "usado recientemente",
-	"morecCommands": "otros comandos",
-	"cat.title": "{0}: {1}",
-	"noCommandsMatching": "No hay comandos coincidentes"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/quickopen/browser/gotoLineHandler.i18n.json b/i18n/esn/src/vs/workbench/parts/quickopen/browser/gotoLineHandler.i18n.json
deleted file mode 100644
index 322801883ec..00000000000
--- a/i18n/esn/src/vs/workbench/parts/quickopen/browser/gotoLineHandler.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"gotoLine": "Ir a la línea...",
-	"gotoLineLabelEmptyWithLimit": "Escriba un número de línea comprendido entre 1 y {0} a la cual quiera navegar.",
-	"gotoLineLabelEmpty": "Escriba el número de línea a la cual quiera navegar.",
-	"gotoLineColumnLabel": "Ir a la línea {0} y al carácter {1}",
-	"gotoLineLabel": "Ir a la línea {0}",
-	"gotoLineHandlerAriaLabel": "Escriba el número de la línea a la que quiere navegar.",
-	"cannotRunGotoLine": "Abrir un archivo de texto antes de ir a una línea"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/quickopen/browser/gotoSymbolHandler.i18n.json b/i18n/esn/src/vs/workbench/parts/quickopen/browser/gotoSymbolHandler.i18n.json
deleted file mode 100644
index 5f24196ac97..00000000000
--- a/i18n/esn/src/vs/workbench/parts/quickopen/browser/gotoSymbolHandler.i18n.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"gotoSymbol": "Ir al símbolo en el archivo...",
-	"symbols": "símbolos ({0})",
-	"method": "métodos ({0})",
-	"function": "funciones ({0})",
-	"_constructor": "constructores ({0})",
-	"variable": "variables ({0})",
-	"class": "clases ({0})",
-	"interface": "interfaces ({0})",
-	"namespace": "espacios de nombres ({0})",
-	"package": "paquetes ({0})",
-	"modules": "módulos ({0})",
-	"property": "propiedades ({0})",
-	"enum": "enumeraciones ({0})",
-	"string": "cadenas ({0})",
-	"rule": "reglas ({0})",
-	"file": "archivos ({0})",
-	"array": "matrices ({0})",
-	"number": "números ({0})",
-	"boolean": "booleanos ({0})",
-	"object": "objetos ({0})",
-	"key": "claves ({0})",
-	"entryAriaLabel": "{0}, símbolos",
-	"noSymbolsMatching": "No hay símbolos coincidentes",
-	"noSymbolsFound": "No se encontraron símbolos",
-	"gotoSymbolHandlerAriaLabel": "Escriba para restringir los símbolos del editor activo.",
-	"cannotRunGotoSymbolInFile": "No hay información de símbolos para el archivo.",
-	"cannotRunGotoSymbol": "Abrir un archivo de texto antes de ir a un símbolo"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/quickopen/browser/helpHandler.i18n.json b/i18n/esn/src/vs/workbench/parts/quickopen/browser/helpHandler.i18n.json
deleted file mode 100644
index 77d8a10d8cf..00000000000
--- a/i18n/esn/src/vs/workbench/parts/quickopen/browser/helpHandler.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"entryAriaLabel": "{0}, ayuda del selector",
-	"globalCommands": "comandos globales",
-	"editorCommands": "comandos del editor"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json b/i18n/esn/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json
deleted file mode 100644
index 09eabb34439..00000000000
--- a/i18n/esn/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"view": "Ver",
-	"commandsHandlerDescriptionDefault": "Mostrar y ejecutar comandos",
-	"gotoLineDescriptionMac": "Ir a la línea",
-	"gotoLineDescriptionWin": "Ir a la línea",
-	"gotoSymbolDescription": "Ir al símbolo en el archivo",
-	"gotoSymbolDescriptionScoped": "Ir al símbolo en el archivo por categoría",
-	"helpDescription": "Mostrar Ayuda",
-	"viewPickerDescription": "Abrir vista"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/quickopen/browser/viewPickerHandler.i18n.json b/i18n/esn/src/vs/workbench/parts/quickopen/browser/viewPickerHandler.i18n.json
deleted file mode 100644
index aaaf6281e54..00000000000
--- a/i18n/esn/src/vs/workbench/parts/quickopen/browser/viewPickerHandler.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"entryAriaLabel": "{0}, selector de vista",
-	"views": "Vistas",
-	"panels": "Paneles",
-	"terminals": "Terminal",
-	"terminalTitle": "{0}: {1}",
-	"channels": "Salida",
-	"openView": "Abrir vista",
-	"quickOpenView": "Abrir vista rápidamente"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.i18n.json b/i18n/esn/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.i18n.json
deleted file mode 100644
index 2b0101fb6ca..00000000000
--- a/i18n/esn/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"relaunchSettingMessage": "Ha cambiado un ajuste que requiere un reinicio para ser efectivo.",
-	"relaunchSettingDetail": "Pulse el botón de reinicio para reiniciar {0} y habilitar el ajuste.",
-	"restart": "&& Reiniciar"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.i18n.json b/i18n/esn/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.i18n.json
deleted file mode 100644
index a665e6376a5..00000000000
--- a/i18n/esn/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.i18n.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"changes": "{0} de {1} cambios",
-	"change": "{0} de {1} cambio",
-	"show previous change": "Mostrar el cambio anterior",
-	"show next change": "Mostrar el cambio siguiente",
-	"move to previous change": "Moverse al cambio anterior",
-	"move to next change": "Moverse al cambio siguiente",
-	"editorGutterModifiedBackground": "Color de fondo del medianil del editor para las líneas modificadas.",
-	"editorGutterAddedBackground": "Color de fondo del medianil del editor para las líneas agregadas.",
-	"editorGutterDeletedBackground": "Color de fondo del medianil del editor para las líneas eliminadas.",
-	"overviewRulerModifiedForeground": "Color de marcador de regla de información general para contenido modificado.",
-	"overviewRulerAddedForeground": "Color de marcador de regla de información general para contenido agregado.",
-	"overviewRulerDeletedForeground": "Color de marcador de regla de información general para contenido eliminado."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json b/i18n/esn/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
deleted file mode 100644
index dcde42ae5b9..00000000000
--- a/i18n/esn/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleGitViewlet": "Mostrar GIT",
-	"source control": "Control de código fuente",
-	"toggleSCMViewlet": "Mostrar SCM",
-	"view": "Ver",
-	"scmConfigurationTitle": "SCM",
-	"alwaysShowProviders": "Si desea mostrar siempre la sección proveedor de control de código fuente.",
-	"diffDecorations": "Controla las decoraciones de diff en el editor.",
-	"diffGutterWidth": "Controla el ancho (px) de las decoraciones de diferencias en el medianil (agregadas y modificadas)."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/scm/electron-browser/scmActivity.i18n.json b/i18n/esn/src/vs/workbench/parts/scm/electron-browser/scmActivity.i18n.json
deleted file mode 100644
index 93306288a75..00000000000
--- a/i18n/esn/src/vs/workbench/parts/scm/electron-browser/scmActivity.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"scmPendingChangesBadge": "{0} cambios pendientes"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/scm/electron-browser/scmMenus.i18n.json b/i18n/esn/src/vs/workbench/parts/scm/electron-browser/scmMenus.i18n.json
deleted file mode 100644
index 048db5a28d0..00000000000
--- a/i18n/esn/src/vs/workbench/parts/scm/electron-browser/scmMenus.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"installAdditionalSCMProviders": "Instalar proveedores  adicionales de SCM...",
-	"switch provider": "Cambiar proveedor de SCM..."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json b/i18n/esn/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
deleted file mode 100644
index 67ddbe8f8cd..00000000000
--- a/i18n/esn/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"scm providers": "Proveedores de Control de Código fuente",
-	"hideRepository": "Ocultar",
-	"installAdditionalSCMProviders": "Instalar proveedores  adicionales de SCM...",
-	"no open repo": "No hay proveedores de control de código fuente activos.",
-	"source control": "Control de código fuente",
-	"viewletTitle": "{0}: {1}",
-	"hideView": "Ocultar"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/search/browser/openAnythingHandler.i18n.json b/i18n/esn/src/vs/workbench/parts/search/browser/openAnythingHandler.i18n.json
deleted file mode 100644
index 9ad0cef90f0..00000000000
--- a/i18n/esn/src/vs/workbench/parts/search/browser/openAnythingHandler.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"fileAndTypeResults": "resultados de archivos y símbolos",
-	"fileResults": "resultados de archivos"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/search/browser/openFileHandler.i18n.json b/i18n/esn/src/vs/workbench/parts/search/browser/openFileHandler.i18n.json
deleted file mode 100644
index 0b373671bd4..00000000000
--- a/i18n/esn/src/vs/workbench/parts/search/browser/openFileHandler.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"entryAriaLabel": "{0}, selector de archivos",
-	"searchResults": "resultados de búsqueda"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/search/browser/openSymbolHandler.i18n.json b/i18n/esn/src/vs/workbench/parts/search/browser/openSymbolHandler.i18n.json
deleted file mode 100644
index 33fdeb933b2..00000000000
--- a/i18n/esn/src/vs/workbench/parts/search/browser/openSymbolHandler.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"entryAriaLabel": "{0}, selector de símbolos",
-	"symbols": "resultados de símbolos",
-	"noSymbolsMatching": "No hay símbolos coincidentes",
-	"noSymbolsWithoutInput": "Escribir para buscar símbolos"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/search/browser/patternInputWidget.i18n.json b/i18n/esn/src/vs/workbench/parts/search/browser/patternInputWidget.i18n.json
deleted file mode 100644
index a6543c33ee4..00000000000
--- a/i18n/esn/src/vs/workbench/parts/search/browser/patternInputWidget.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"defaultLabel": "entrada",
-	"useExcludesAndIgnoreFilesDescription": "Usar la Configuración de Exclusión e Ignorar Archivos"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/search/browser/replaceService.i18n.json b/i18n/esn/src/vs/workbench/parts/search/browser/replaceService.i18n.json
deleted file mode 100644
index a3759731df1..00000000000
--- a/i18n/esn/src/vs/workbench/parts/search/browser/replaceService.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"fileReplaceChanges": "{0} ↔ {1} (Reemplazar vista previa) "
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/search/browser/search.contribution.i18n.json b/i18n/esn/src/vs/workbench/parts/search/browser/search.contribution.i18n.json
deleted file mode 100644
index ffd95f2732d..00000000000
--- a/i18n/esn/src/vs/workbench/parts/search/browser/search.contribution.i18n.json
+++ /dev/null
@@ -1,22 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"showTriggerActions": "Ir al símbolo en el área de trabajo...",
-	"name": "Buscar",
-	"search": "Buscar",
-	"view": "Ver",
-	"openAnythingHandlerDescription": "Ir al archivo",
-	"openSymbolDescriptionNormal": "Ir al símbolo en el área de trabajo",
-	"searchOutputChannelTitle": "Buscar",
-	"searchConfigurationTitle": "Buscar",
-	"exclude": "Configure patrones globales para excluir archivos y carpetas de las búsquedas. Hereda todos los patrones globales de la configuración files.exclude.",
-	"exclude.boolean": "El patrón global con el que se harán coincidir las rutas de acceso de los archivos. Establézcalo en true o false para habilitarlo o deshabilitarlo.",
-	"exclude.when": "Comprobación adicional de los elementos del mismo nivel de un archivo coincidente. Use $(nombreBase) como variable para el nombre de archivo que coincide.",
-	"useRipgrep": "Controla si se utiliza ripgrep en la búsqueda de texto y ficheros",
-	"useIgnoreFiles": "Controla si se utilizan los archivos .gitignore e .ignore al buscar archivos.",
-	"search.quickOpen.includeSymbols": "Configurar para incluir los resultados de una búsqueda global de símbolos en los resultados de archivos de Quick Open.",
-	"search.followSymlinks": "Controla si va a seguir enlaces simbólicos durante la búsqueda."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/search/browser/searchActions.i18n.json b/i18n/esn/src/vs/workbench/parts/search/browser/searchActions.i18n.json
deleted file mode 100644
index 08f95963fe8..00000000000
--- a/i18n/esn/src/vs/workbench/parts/search/browser/searchActions.i18n.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"nextSearchIncludePattern": "Mostrar siguiente búsqueda de patrón include",
-	"previousSearchIncludePattern": "Mostrar búsqueda anterior de patrón include ",
-	"nextSearchExcludePattern": "Mostrar siguiente búsqueda de patrón exclude ",
-	"previousSearchExcludePattern": "Mostrar búsqueda anterior de patrón exclude ",
-	"nextSearchTerm": "Mostrar siguiente término de búsqueda",
-	"previousSearchTerm": "Mostrar anterior término de búsqueda",
-	"nextReplaceTerm": "Mostrar siguiente término de Reemplazo de búsqueda",
-	"previousReplaceTerm": "Mostrar la búsqueda anterior de Reemplazar término",
-	"findInFiles": "Buscar en archivos",
-	"replaceInFiles": "Reemplazar en archivos",
-	"RefreshAction.label": "Actualizar",
-	"CollapseDeepestExpandedLevelAction.label": "Contraer todo",
-	"ClearSearchResultsAction.label": "Borrar",
-	"CancelSearchAction.label": "Cancelar búsqueda",
-	"FocusNextSearchResult.label": "Centrarse en el siguiente resultado de la búsqueda",
-	"FocusPreviousSearchResult.label": "Centrarse en el anterior resultado de la búsqueda",
-	"RemoveAction.label": "Despedir",
-	"file.replaceAll.label": "Reemplazar todo",
-	"match.replace.label": "Reemplazar"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/search/browser/searchResultsView.i18n.json b/i18n/esn/src/vs/workbench/parts/search/browser/searchResultsView.i18n.json
deleted file mode 100644
index 819a6285c14..00000000000
--- a/i18n/esn/src/vs/workbench/parts/search/browser/searchResultsView.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"searchFolderMatch.other.label": "Otros archivos",
-	"searchFileMatches": "{0} archivos encontrados",
-	"searchFileMatch": "{0} archivo encontrado",
-	"searchMatches": "{0} coincidencias encontradas",
-	"searchMatch": "{0} coincidencia encontrada",
-	"folderMatchAriaLabel": "{0} coincidencias en la carpeta raíz {1}, resultados de la búsqueda",
-	"fileMatchAriaLabel": "{0} coincidencias en el archivo {1} de la carpeta {2}, resultados de la búsqueda",
-	"replacePreviewResultAria": "Reemplazar el termino {0} con {1} en la columna con posición {2} en la línea de texto {3}",
-	"searchResultAria": "Encontró el término {0} en la columna de posición {1} en la línea con el texto {2}."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/search/browser/searchView.i18n.json b/i18n/esn/src/vs/workbench/parts/search/browser/searchView.i18n.json
deleted file mode 100644
index 0c3d29ae593..00000000000
--- a/i18n/esn/src/vs/workbench/parts/search/browser/searchView.i18n.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"moreSearch": "Alternar detalles de la búsqueda",
-	"searchScope.includes": "archivos para incluir",
-	"label.includes": "Buscar patrones de inclusión",
-	"searchScope.excludes": "archivos para excluir",
-	"label.excludes": "Buscar patrones de exclusión",
-	"replaceAll.confirmation.title": "Reemplazar todo",
-	"replaceAll.confirm.button": "&&Reemplazar",
-	"replaceAll.occurrence.file.message": "{0} aparición reemplazada en {1} archivo por \"{2}\".",
-	"removeAll.occurrence.file.message": "{0} aparición reemplazada en {1} archivo.",
-	"replaceAll.occurrence.files.message": "{0} aparición reemplazada en {1} archivos por \"{2}\".",
-	"removeAll.occurrence.files.message": "{0} aparición reemplazada en {1} archivos.",
-	"replaceAll.occurrences.file.message": "{0} apariciones reemplazadas en {1} archivo por \"{2}\".",
-	"removeAll.occurrences.file.message": "{0} apariciones reemplazadas en {1} archivo.",
-	"replaceAll.occurrences.files.message": "{0} apariciones reemplazadas en {1} archivos por \"{2}\".",
-	"removeAll.occurrences.files.message": "{0} apariciones reemplazadas en {1} archivos.",
-	"removeAll.occurrence.file.confirmation.message": "¿Reemplazar {0} aparición en {1} archivo por \"{2}\"?",
-	"replaceAll.occurrence.file.confirmation.message": "¿Reemplazar {0} aparición en {1} archivo?",
-	"removeAll.occurrence.files.confirmation.message": "¿Reemplazar {0} aparición en {1} archivos por \"{2}\"?",
-	"replaceAll.occurrence.files.confirmation.message": "¿Reemplazar {0} aparición en {1} archivos?",
-	"removeAll.occurrences.file.confirmation.message": "¿Reemplazar {0} apariciones en {1} archivo por \"{2}\"?",
-	"replaceAll.occurrences.file.confirmation.message": "¿Reemplazar {0} apariciones en {1} archivo?",
-	"removeAll.occurrences.files.confirmation.message": "¿Reemplazar {0} apariciones en {1} archivos por \"{2}\"?",
-	"replaceAll.occurrences.files.confirmation.message": "¿Reemplazar {0} apariciones en {1} archivos?",
-	"treeAriaLabel": "Resultados de la búsqueda",
-	"searchPathNotFoundError": "No se encuentra la ruta de búsqueda: {0}",
-	"searchMaxResultsWarning": "El conjunto de resultados solo contiene un subconjunto de todas las coincidencias. Sea más específico en la búsqueda para acotar los resultados.",
-	"searchCanceled": "La búsqueda se canceló antes de poder encontrar resultados - ",
-	"noResultsIncludesExcludes": "No se encontraron resultados en '{0}' con exclusión de '{1}' - ",
-	"noResultsIncludes": "No se encontraron resultados en '{0}' - ",
-	"noResultsExcludes": "No se encontraron resultados con exclusión de '{0}' - ",
-	"noResultsFound": "No se encontraron resultados. Revise la configuración de exclusiones y archivos omitidos - ",
-	"rerunSearch.message": "Buscar de nuevo",
-	"rerunSearchInAll.message": "Buscar de nuevo en todos los archivos",
-	"openSettings.message": "Abrir configuración",
-	"openSettings.learnMore": "Más información",
-	"ariaSearchResultsStatus": "La búsqueda devolvió {0} resultados en {1} archivos",
-	"search.file.result": "{0} resultado en {1} archivo",
-	"search.files.result": "{0} resultado en {1} archivos",
-	"search.file.results": "{0} resultados en {1} archivo",
-	"search.files.results": "{0} resultados en {1} archivos",
-	"searchWithoutFolder": "Aún no ha abierto una carpeta. Solo se busca en los archivos abiertos en este momento - ",
-	"openFolder": "Abrir carpeta"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json b/i18n/esn/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
deleted file mode 100644
index 0c3d29ae593..00000000000
--- a/i18n/esn/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"moreSearch": "Alternar detalles de la búsqueda",
-	"searchScope.includes": "archivos para incluir",
-	"label.includes": "Buscar patrones de inclusión",
-	"searchScope.excludes": "archivos para excluir",
-	"label.excludes": "Buscar patrones de exclusión",
-	"replaceAll.confirmation.title": "Reemplazar todo",
-	"replaceAll.confirm.button": "&&Reemplazar",
-	"replaceAll.occurrence.file.message": "{0} aparición reemplazada en {1} archivo por \"{2}\".",
-	"removeAll.occurrence.file.message": "{0} aparición reemplazada en {1} archivo.",
-	"replaceAll.occurrence.files.message": "{0} aparición reemplazada en {1} archivos por \"{2}\".",
-	"removeAll.occurrence.files.message": "{0} aparición reemplazada en {1} archivos.",
-	"replaceAll.occurrences.file.message": "{0} apariciones reemplazadas en {1} archivo por \"{2}\".",
-	"removeAll.occurrences.file.message": "{0} apariciones reemplazadas en {1} archivo.",
-	"replaceAll.occurrences.files.message": "{0} apariciones reemplazadas en {1} archivos por \"{2}\".",
-	"removeAll.occurrences.files.message": "{0} apariciones reemplazadas en {1} archivos.",
-	"removeAll.occurrence.file.confirmation.message": "¿Reemplazar {0} aparición en {1} archivo por \"{2}\"?",
-	"replaceAll.occurrence.file.confirmation.message": "¿Reemplazar {0} aparición en {1} archivo?",
-	"removeAll.occurrence.files.confirmation.message": "¿Reemplazar {0} aparición en {1} archivos por \"{2}\"?",
-	"replaceAll.occurrence.files.confirmation.message": "¿Reemplazar {0} aparición en {1} archivos?",
-	"removeAll.occurrences.file.confirmation.message": "¿Reemplazar {0} apariciones en {1} archivo por \"{2}\"?",
-	"replaceAll.occurrences.file.confirmation.message": "¿Reemplazar {0} apariciones en {1} archivo?",
-	"removeAll.occurrences.files.confirmation.message": "¿Reemplazar {0} apariciones en {1} archivos por \"{2}\"?",
-	"replaceAll.occurrences.files.confirmation.message": "¿Reemplazar {0} apariciones en {1} archivos?",
-	"treeAriaLabel": "Resultados de la búsqueda",
-	"searchPathNotFoundError": "No se encuentra la ruta de búsqueda: {0}",
-	"searchMaxResultsWarning": "El conjunto de resultados solo contiene un subconjunto de todas las coincidencias. Sea más específico en la búsqueda para acotar los resultados.",
-	"searchCanceled": "La búsqueda se canceló antes de poder encontrar resultados - ",
-	"noResultsIncludesExcludes": "No se encontraron resultados en '{0}' con exclusión de '{1}' - ",
-	"noResultsIncludes": "No se encontraron resultados en '{0}' - ",
-	"noResultsExcludes": "No se encontraron resultados con exclusión de '{0}' - ",
-	"noResultsFound": "No se encontraron resultados. Revise la configuración de exclusiones y archivos omitidos - ",
-	"rerunSearch.message": "Buscar de nuevo",
-	"rerunSearchInAll.message": "Buscar de nuevo en todos los archivos",
-	"openSettings.message": "Abrir configuración",
-	"openSettings.learnMore": "Más información",
-	"ariaSearchResultsStatus": "La búsqueda devolvió {0} resultados en {1} archivos",
-	"search.file.result": "{0} resultado en {1} archivo",
-	"search.files.result": "{0} resultado en {1} archivos",
-	"search.file.results": "{0} resultados en {1} archivo",
-	"search.files.results": "{0} resultados en {1} archivos",
-	"searchWithoutFolder": "Aún no ha abierto una carpeta. Solo se busca en los archivos abiertos en este momento - ",
-	"openFolder": "Abrir carpeta"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/search/browser/searchWidget.i18n.json b/i18n/esn/src/vs/workbench/parts/search/browser/searchWidget.i18n.json
deleted file mode 100644
index 594d13a2b1d..00000000000
--- a/i18n/esn/src/vs/workbench/parts/search/browser/searchWidget.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"search.action.replaceAll.disabled.label": "Reemplazar todo (Enviar búsqueda para habilitar)",
-	"search.action.replaceAll.enabled.label": "Reemplazar todo",
-	"search.replace.toggle.button.title": "Alternar reemplazar",
-	"label.Search": "Búsqueda: Escriba el término de búsqueda y presione Entrar para buscar o Esc para cancelar",
-	"search.placeHolder": "Buscar",
-	"label.Replace": "Reemplazar: Escriba el término de reemplazo y presione Intro para obtener una vista previa o Escape para cancelar la acción",
-	"search.replace.placeHolder": "Reemplazar",
-	"regexp.validationFailure": "La expresión coincide con todo",
-	"regexp.backreferenceValidationFailure": "No se admiten referencias inversas"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/search/common/queryBuilder.i18n.json b/i18n/esn/src/vs/workbench/parts/search/common/queryBuilder.i18n.json
deleted file mode 100644
index 86d5fc851c6..00000000000
--- a/i18n/esn/src/vs/workbench/parts/search/common/queryBuilder.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"search.noWorkspaceWithName": "Ninguna carpeta en el espacio de trabajo tiene el nombre: {0}"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json b/i18n/esn/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
deleted file mode 100644
index d7550e4cd76..00000000000
--- a/i18n/esn/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"search": "Buscar",
-	"copyMatchLabel": "Copiar",
-	"copyPathLabel": "Copiar ruta de acceso",
-	"copyAllLabel": "Copiar todo",
-	"clearSearchHistoryLabel": "Borrar historial de búsqueda",
-	"toggleSearchViewPositionLabel": "Alternar la posición de vista de búsqueda",
-	"findInFolder": "Buscar en carpeta...",
-	"findInWorkspace": "Buscar en área de trabajo...",
-	"showTriggerActions": "Ir al símbolo en el área de trabajo...",
-	"name": "Buscar",
-	"showSearchViewl": "Mostrar búsqueda",
-	"view": "Ver",
-	"findInFiles": "Buscar en archivos",
-	"openAnythingHandlerDescription": "Ir al archivo",
-	"openSymbolDescriptionNormal": "Ir al símbolo en el área de trabajo",
-	"searchConfigurationTitle": "Buscar",
-	"exclude": "Configure patrones globales para excluir archivos y carpetas de las búsquedas. Hereda todos los patrones globales de la configuración files.exclude.",
-	"exclude.boolean": "El patrón global con el que se harán coincidir las rutas de acceso de los archivos. Establézcalo en true o false para habilitarlo o deshabilitarlo.",
-	"exclude.when": "Comprobación adicional de los elementos del mismo nivel de un archivo coincidente. Use $(nombreBase) como variable para el nombre de archivo que coincide.",
-	"useRipgrep": "Controla si se utiliza ripgrep en la búsqueda de texto y ficheros",
-	"useIgnoreFiles": "Controla si se utilizan los archivos .gitignore e .ignore al buscar archivos.",
-	"search.quickOpen.includeSymbols": "Configurar para incluir los resultados de una búsqueda global de símbolos en los resultados de archivos de Quick Open.",
-	"search.followSymlinks": "Controla si debe seguir enlaces simbólicos durante la búsqueda.",
-	"search.smartCase": "Proporciona busquedas de mayúsculas y minúsculas si el patrón es todo en minúsculas, de lo contrario, busca en mayúsculas y minúsculas",
-	"search.globalFindClipboard": "Controla si la vista de búsqueda debe leer o modificar el portapapeles de búsqueda compartido en macOS",
-	"search.location": "Controla si la búsqueda se muestra como una vista en la barra lateral o como un panel en el área de paneles para disponer de más espacio horizontal."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/search/electron-browser/searchActions.i18n.json b/i18n/esn/src/vs/workbench/parts/search/electron-browser/searchActions.i18n.json
deleted file mode 100644
index 824168d9089..00000000000
--- a/i18n/esn/src/vs/workbench/parts/search/electron-browser/searchActions.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"findInFolder": "Buscar en carpeta...",
-	"findInWorkspace": "Buscar en área de trabajo..."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/snippets/electron-browser/TMSnippets.i18n.json b/i18n/esn/src/vs/workbench/parts/snippets/electron-browser/TMSnippets.i18n.json
deleted file mode 100644
index 08084e88498..00000000000
--- a/i18n/esn/src/vs/workbench/parts/snippets/electron-browser/TMSnippets.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"vscode.extension.contributes.snippets": "Aporta fragmentos de código.",
-	"vscode.extension.contributes.snippets-language": "Identificador del lenguaje al que se aporta este fragmento de código.",
-	"vscode.extension.contributes.snippets-path": "Ruta de acceso del archivo de fragmentos de código. La ruta es relativa a la carpeta de extensión y normalmente empieza por \"./snippets/\".",
-	"invalid.language": "Lenguaje desconocido en \"contributes.{0}.language\". Valor proporcionado: {1}",
-	"invalid.path.0": "Se esperaba una cadena en \"contributes.{0}.path\". Valor proporcionado: {1}",
-	"invalid.path.1": "Se esperaba que \"contributes.{0}.path\" ({1}) se incluyera en la carpeta de la extensión ({2}). Esto puede hacer que la extensión no sea portátil.",
-	"badVariableUse": "Es muy probable que el fragmento de código \"{0}\" confunda las variables de fragmento de código y los marcadores de posición de fragmento de código. Consulte https://code.visualstudio.com/docs/editor/userdefinedsnippets#_snippet-syntax para más informacion."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json b/i18n/esn/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json
deleted file mode 100644
index b2b344c8a84..00000000000
--- a/i18n/esn/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"global.scope": "(global)",
-	"global.1": "({0})",
-	"new.global": "Nuevo archivo de fragmentos globales...",
-	"group.global": "Fragmentos existentes",
-	"new.global.sep": "Nuevos fragmentos de código",
-	"openSnippet.pickLanguage": "Seleccione Archivo de fragmentos o Crear fragmentos de código",
-	"openSnippet.label": "Configurar fragmentos de usuario ",
-	"preferences": "Preferencias"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/snippets/electron-browser/insertSnippet.i18n.json b/i18n/esn/src/vs/workbench/parts/snippets/electron-browser/insertSnippet.i18n.json
deleted file mode 100644
index 2a1dbd9b60e..00000000000
--- a/i18n/esn/src/vs/workbench/parts/snippets/electron-browser/insertSnippet.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"snippet.suggestions.label": "Insertar fragmento de código",
-	"sep.userSnippet": "Fragmentos de código de usuario",
-	"sep.extSnippet": "Fragmentos de código de extensión"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json b/i18n/esn/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json
deleted file mode 100644
index c162d3a8658..00000000000
--- a/i18n/esn/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"snippetSchema.json.default": "Fragmento de código vacío",
-	"snippetSchema.json": "Configuración de fragmento de código del usuario",
-	"snippetSchema.json.prefix": "El prefijo que se debe usar al seleccionar el fragmento de código en Intellisense",
-	"snippetSchema.json.body": "El contenido del fragmento de código. Use \"$1', \"${1:defaultText}\" para definir las posiciones del cursor, use \"$0\" para la posición final del cursor. Inserte valores de variable con \"${varName}\" y \"${varName:defaultText}\", por ejemplo, \"This is file: $TM_FILENAME\".",
-	"snippetSchema.json.description": "La descripción del fragmento de código.",
-	"snippetSchema.json.scope": "Una lista de nombres de idioma a los que se aplica este fragmento de código, por ejemplo ' mecanografiado, JavaScript '."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json b/i18n/esn/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json
deleted file mode 100644
index 4e9dde048d3..00000000000
--- a/i18n/esn/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"source.snippetGlobal": "Fragmento del usuario global",
-	"source.snippet": "Fragmento de código del usuario"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json b/i18n/esn/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
deleted file mode 100644
index 336485742eb..00000000000
--- a/i18n/esn/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"invalid.path.0": "Se esperaba una cadena en \"contributes.{0}.path\". Valor proporcionado: {1}",
-	"invalid.language.0": "Al omitir el lenguaje, el valor de 'contributes. {0}. Path' debe ser un archivo '. Code-snippets'. Valor proporcionado: {1}",
-	"invalid.language": "Lenguaje desconocido en \"contributes.{0}.language\". Valor proporcionado: {1}",
-	"invalid.path.1": "Se esperaba que \"contributes.{0}.path\" ({1}) se incluyera en la carpeta de la extensión ({2}). Esto puede hacer que la extensión no sea portátil.",
-	"vscode.extension.contributes.snippets": "Aporta fragmentos de código.",
-	"vscode.extension.contributes.snippets-language": "Identificador del lenguaje al que se aporta este fragmento de código.",
-	"vscode.extension.contributes.snippets-path": "Ruta de acceso del archivo de fragmentos de código. La ruta es relativa a la carpeta de extensión y normalmente empieza por \"./snippets/\".",
-	"badVariableUse": "Uno o más fragmentos de la extensión '{0}' muy probable confunden variables de fragmento y fragmento-marcadores de posición (véase https://code.visualstudio.com/docs/editor/userdefinedsnippets#_snippet-syntax para más detalles)",
-	"badFile": "No se pudo leer el archivo del fragmento \"{0}\".",
-	"detail.snippet": "{0} ({1})",
-	"snippetSuggest.longLabel": "{0}, {1}"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/snippets/electron-browser/tabCompletion.i18n.json b/i18n/esn/src/vs/workbench/parts/snippets/electron-browser/tabCompletion.i18n.json
deleted file mode 100644
index bd730e8a796..00000000000
--- a/i18n/esn/src/vs/workbench/parts/snippets/electron-browser/tabCompletion.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"tabCompletion": "Inserta fragmentos de código cuando el prefijo coincide. Funciona mejor si la opción 'quickSuggestions' no está habilitada."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/surveys/electron-browser/languageSurveys.contribution.i18n.json b/i18n/esn/src/vs/workbench/parts/surveys/electron-browser/languageSurveys.contribution.i18n.json
deleted file mode 100644
index e9c92ac0b0e..00000000000
--- a/i18n/esn/src/vs/workbench/parts/surveys/electron-browser/languageSurveys.contribution.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"helpUs": "Ayúdenos a mejorar nuestro soporte para {0}",
-	"takeShortSurvey": "Realizar una breve encuesta",
-	"remindLater": "Recordármelo más tarde",
-	"neverAgain": "No volver a mostrar"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/surveys/electron-browser/nps.contribution.i18n.json b/i18n/esn/src/vs/workbench/parts/surveys/electron-browser/nps.contribution.i18n.json
deleted file mode 100644
index 33ec507b93f..00000000000
--- a/i18n/esn/src/vs/workbench/parts/surveys/electron-browser/nps.contribution.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"surveyQuestion": "¿Le importaría realizar una breve encuesta de opinión?",
-	"takeSurvey": "Realizar encuesta",
-	"remindLater": "Recordármelo más tarde",
-	"neverAgain": "No volver a mostrar"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/tasks/browser/buildQuickOpen.i18n.json b/i18n/esn/src/vs/workbench/parts/tasks/browser/buildQuickOpen.i18n.json
deleted file mode 100644
index 2c1bc4f27d2..00000000000
--- a/i18n/esn/src/vs/workbench/parts/tasks/browser/buildQuickOpen.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"tasksAriaLabel": "Escribir el nombre de una tarea de compilación",
-	"noTasksMatching": "No tasks matching",
-	"noTasksFound": "No se encontraron tareas de compilación"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/tasks/browser/quickOpen.i18n.json b/i18n/esn/src/vs/workbench/parts/tasks/browser/quickOpen.i18n.json
deleted file mode 100644
index bb7a48a28af..00000000000
--- a/i18n/esn/src/vs/workbench/parts/tasks/browser/quickOpen.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"entryAriaLabel": "{0}, tareas",
-	"recentlyUsed": "Tareas usadas recientemente",
-	"configured": "tareas configuradas",
-	"detected": "tareas detectadas",
-	"customizeTask": "Configurar tarea"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/tasks/browser/restartQuickOpen.i18n.json b/i18n/esn/src/vs/workbench/parts/tasks/browser/restartQuickOpen.i18n.json
deleted file mode 100644
index 743e9be299c..00000000000
--- a/i18n/esn/src/vs/workbench/parts/tasks/browser/restartQuickOpen.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"tasksAriaLabel": "Escriba el nombre de una tarea para reiniciar",
-	"noTasksMatching": "No tasks matching",
-	"noTasksFound": "No se encontró ninguna tarea para reiniciar"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/tasks/browser/taskQuickOpen.i18n.json b/i18n/esn/src/vs/workbench/parts/tasks/browser/taskQuickOpen.i18n.json
deleted file mode 100644
index 760cf10d4cc..00000000000
--- a/i18n/esn/src/vs/workbench/parts/tasks/browser/taskQuickOpen.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"tasksAriaLabel": "Escribir el nombre de una tarea para ejecutar",
-	"noTasksMatching": "No tasks matching",
-	"noTasksFound": "No se encontraron tareas"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/tasks/browser/terminateQuickOpen.i18n.json b/i18n/esn/src/vs/workbench/parts/tasks/browser/terminateQuickOpen.i18n.json
deleted file mode 100644
index 96e5576de10..00000000000
--- a/i18n/esn/src/vs/workbench/parts/tasks/browser/terminateQuickOpen.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"tasksAriaLabel": "Type the name of a task to terminate",
-	"noTasksMatching": "No tasks matching",
-	"noTasksFound": "No tasks to terminate found"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/tasks/browser/testQuickOpen.i18n.json b/i18n/esn/src/vs/workbench/parts/tasks/browser/testQuickOpen.i18n.json
deleted file mode 100644
index d7102735ae7..00000000000
--- a/i18n/esn/src/vs/workbench/parts/tasks/browser/testQuickOpen.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"tasksAriaLabel": "Escribir el nombre de una tarea de prueba",
-	"noTasksMatching": "No tasks matching",
-	"noTasksFound": "No se encontraron tareas de prueba"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json b/i18n/esn/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json
deleted file mode 100644
index c4a0654df75..00000000000
--- a/i18n/esn/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json
+++ /dev/null
@@ -1,76 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"ProblemPatternParser.loopProperty.notLast": "La propiedad loop solo se admite en el buscador de coincidencias de la última línea.",
-	"ProblemPatternParser.problemPattern.kindProperty.notFirst": "El patrón de problema no es válido. El tipo de propiedad debe proporcionarse solo en el primer elemento.",
-	"ProblemPatternParser.problemPattern.missingRegExp": "Falta una expresión regular en el patrón de problema.",
-	"ProblemPatternParser.problemPattern.missingProperty": "El patrón de problema no es válido. Debe tener al menos un archivo y un mensaje.",
-	"ProblemPatternParser.problemPattern.missingLocation": "El patrón de problema no es válido. Debe tener el tipo \"file\" o un grupo de coincidencias de línea o ubicación.",
-	"ProblemPatternParser.invalidRegexp": "Error: La cadena {0} no es una expresión regular válida.\n",
-	"ProblemPatternSchema.regexp": "Expresión regular para encontrar un error, una advertencia o información en la salida.",
-	"ProblemPatternSchema.kind": "Indica si el patrón coincide con una ubicación (archivo y línea) o solo un archivo.",
-	"ProblemPatternSchema.file": "Índice de grupo de coincidencias del nombre de archivo. Si se omite, se usa 1.",
-	"ProblemPatternSchema.location": "Índice de grupo de coincidencias de la ubicación del problema. Los patrones de ubicación válidos son: (line), (line,column) y (startLine,startColumn,endLine,endColumn). Si se omite, se asume el uso de (line,column).",
-	"ProblemPatternSchema.line": "Índice de grupo de coincidencias de la línea del problema. Valor predeterminado: 2.",
-	"ProblemPatternSchema.column": "Índice de grupo de coincidencias del carácter de línea del problema. Valor predeterminado: 3",
-	"ProblemPatternSchema.endLine": "Índice de grupo de coincidencias de la línea final del problema. Valor predeterminado como no definido.",
-	"ProblemPatternSchema.endColumn": "Índice de grupo de coincidencias del carácter de línea final del problema. Valor predeterminado como no definido",
-	"ProblemPatternSchema.severity": "Índice de grupo de coincidencias de la gravedad del problema. Valor predeterminado como no definido.",
-	"ProblemPatternSchema.code": "Índice de grupo de coincidencias del código del problema. Valor predeterminado como no definido.",
-	"ProblemPatternSchema.message": "Índice de grupo de coincidencias del mensaje. Si se omite, el valor predeterminado es 4 en caso de definirse la ubicación. De lo contrario, el valor predeterminado es 5.",
-	"ProblemPatternSchema.loop": "En un bucle de buscador de coincidencias multilínea, indica si este patrón se ejecuta en un bucle siempre que haya coincidencias. Solo puede especificarse en el último patrón de un patrón multilínea.",
-	"NamedProblemPatternSchema.name": "Nombre del patrón de problema.",
-	"NamedMultiLineProblemPatternSchema.name": "Nombre del patrón de problema de varias líneas.",
-	"NamedMultiLineProblemPatternSchema.patterns": "Patrones reales.",
-	"ProblemPatternExtPoint": "Aporta patrones de problemas",
-	"ProblemPatternRegistry.error": "Patrón de problema no válido. Se omitirá.",
-	"ProblemMatcherParser.noProblemMatcher": "Error: La descripción no se puede convertir en un buscador de coincidencias de problemas:\n{0}\n",
-	"ProblemMatcherParser.noProblemPattern": "Error: La descripción no define un patrón de problema válido:\n{0}\n",
-	"ProblemMatcherParser.noOwner": "Error: La descripción no define un propietario:\n{0}\n",
-	"ProblemMatcherParser.noFileLocation": "Error: La descripción no define una ubicación de archivo:\n{0}\n",
-	"ProblemMatcherParser.unknownSeverity": "Información: Gravedad {0} desconocida. Los valores válidos son \"error\", \"advertencia\" e \"información\".\n",
-	"ProblemMatcherParser.noDefinedPatter": "Error: el patrón con el identificador {0} no existe.",
-	"ProblemMatcherParser.noIdentifier": "Error: La propiedad pattern hace referencia a un identificador vacío.",
-	"ProblemMatcherParser.noValidIdentifier": "Error: La propiedad pattern {0} no es un nombre de variable de patrón válido.",
-	"ProblemMatcherParser.problemPattern.watchingMatcher": "Un buscador de coincidencias de problemas debe definir tanto un patrón de inicio como un patrón de finalización para la inspección.",
-	"ProblemMatcherParser.invalidRegexp": "Error: La cadena {0} no es una expresión regular válida.\n",
-	"WatchingPatternSchema.regexp": "Expresión regular para detectar el principio o el final de una tarea en segundo plano.",
-	"WatchingPatternSchema.file": "Índice de grupo de coincidencias del nombre de archivo. Se puede omitir.",
-	"PatternTypeSchema.name": "Nombre de un patrón aportado o predefinido",
-	"PatternTypeSchema.description": "Patrón de problema o nombre de un patrón de problema que se ha aportado o predefinido. Se puede omitir si se especifica la base.",
-	"ProblemMatcherSchema.base": "Nombre de un buscador de coincidencias de problemas base que se va a usar.",
-	"ProblemMatcherSchema.owner": "Propietario del problema dentro de Code. Se puede omitir si se especifica \"base\". Si se omite y no se especifica \"base\", el valor predeterminado es \"external\".",
-	"ProblemMatcherSchema.source": "Una cadena legible que describe la fuente de este diagnóstico, por ejemplo 'Inicio' o 'super pelusa'.",
-	"ProblemMatcherSchema.severity": "Gravedad predeterminada para los problemas de capturas. Se usa si el patrón no define un grupo de coincidencias para \"severity\".",
-	"ProblemMatcherSchema.applyTo": "Controla si un problema notificado en un documento de texto se aplica solamente a los documentos abiertos, cerrados o a todos los documentos.",
-	"ProblemMatcherSchema.fileLocation": "Define cómo deben interpretarse los nombres de archivo notificados en un patrón de problema.",
-	"ProblemMatcherSchema.background": "Patrones para hacer seguimiento del comienzo y el final en un comprobador activo de la tarea en segundo plano.",
-	"ProblemMatcherSchema.background.activeOnStart": "Si se establece en True, el monitor está en modo activo cuando la tarea empieza. Esto es equivalente a emitir una línea que coincide con beginPattern",
-	"ProblemMatcherSchema.background.beginsPattern": "Si se encuentran coincidencias en la salida, se señala el inicio de una tarea en segundo plano.",
-	"ProblemMatcherSchema.background.endsPattern": "Si se encuentran coincidencias en la salida, se señala el fin de una tarea en segundo plano.",
-	"ProblemMatcherSchema.watching.deprecated": "Esta propiedad está en desuso. Use la propiedad en segundo plano.",
-	"ProblemMatcherSchema.watching": "Patrones para hacer un seguimiento del comienzo y el final de un patrón de supervisión.",
-	"ProblemMatcherSchema.watching.activeOnStart": "Si se establece en true, el monitor está en modo activo cuando la tarea empieza. Esto es equivalente a emitir una línea que coincide con beginPattern",
-	"ProblemMatcherSchema.watching.beginsPattern": "Si se encuentran coincidencias en la salida, se señala el inicio de una tarea de inspección.",
-	"ProblemMatcherSchema.watching.endsPattern": "Si se encuentran coincidencias en la salida, se señala el fin de una tarea de inspección",
-	"LegacyProblemMatcherSchema.watchedBegin.deprecated": "Esta propiedad está en desuso. Use la propiedad watching.",
-	"LegacyProblemMatcherSchema.watchedBegin": "Expresión regular que señala que una tarea inspeccionada comienza a ejecutarse desencadenada a través de la inspección de archivos.",
-	"LegacyProblemMatcherSchema.watchedEnd.deprecated": "Esta propiedad está en desuso. Use la propiedad watching.",
-	"LegacyProblemMatcherSchema.watchedEnd": "Expresión regular que señala que una tarea inspeccionada termina de ejecutarse.",
-	"NamedProblemMatcherSchema.name": "Nombre del buscador de coincidencias de problemas usado para referirse a él.",
-	"NamedProblemMatcherSchema.label": "Etiqueta en lenguaje natural del buscador de coincidencias de problemas. ",
-	"ProblemMatcherExtPoint": "Aporta buscadores de coincidencias de problemas",
-	"msCompile": "Problemas del compilador de Microsoft",
-	"lessCompile": "Menos problemas",
-	"gulp-tsc": "Problemas de Gulp TSC",
-	"jshint": "Problemas de JSHint",
-	"jshint-stylish": "Problemas de estilismo de JSHint",
-	"eslint-compact": "Problemas de compactación de ESLint",
-	"eslint-stylish": "Problemas de estilismo de ESLint",
-	"go": "Ir a problemas"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/tasks/common/taskConfiguration.i18n.json b/i18n/esn/src/vs/workbench/parts/tasks/common/taskConfiguration.i18n.json
deleted file mode 100644
index 71a6380a7ab..00000000000
--- a/i18n/esn/src/vs/workbench/parts/tasks/common/taskConfiguration.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"ConfigurationParser.invalidCWD": "Advertencia: options.cwd debe ser de tipo cadena. Se ignora el valor {0}.",
-	"ConfigurationParser.noargs": "Error: Los argumentos de comando deben ser una matriz de cadenas. El valor proporcionado es: {0}",
-	"ConfigurationParser.noShell": "Advertencia: La configuración del shell solo se admite al ejecutar tareas en el terminal.",
-	"ConfigurationParser.noName": "Error: El buscador de coincidencias de problemas del ámbito de declaración debe tener un nombre: {0}",
-	"ConfigurationParser.unknownMatcherKind": "Advertencia: El buscador de coincidencias de problemas definido se desconoce. Los tipos admitidos son string | ProblemMatcher | (string | ProblemMatcher). {0}",
-	"ConfigurationParser.invalidVaraibleReference": "Error: Referencia a problemMatcher no válida: {0}",
-	"ConfigurationParser.noTaskName": "Error: Las tareas deben proporcionar una propiedad taskName. La tarea se ignorará. {0}",
-	"taskConfiguration.shellArgs": "Advertencia: La tarea \"{0}\" es un comando de shell y su nombre de comando o uno de sus argumentos tiene espacios sin escape. Para asegurarse de que la línea de comandos se cite correctamente, combine mediante fusión los argumentos en el comando.",
-	"taskConfiguration.noCommandOrDependsOn": "Error: La tarea \"{0}\" no especifica un comando ni una propiedad dependsOn. La tarea se ignorará. Su definición es: \n{1}",
-	"taskConfiguration.noCommand": "Error: La tarea \"{0}\" no define un comando. La tarea se ignorará. Su definición es: {1}"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/tasks/common/taskDefinitionRegistry.i18n.json b/i18n/esn/src/vs/workbench/parts/tasks/common/taskDefinitionRegistry.i18n.json
deleted file mode 100644
index 9da03cb11e7..00000000000
--- a/i18n/esn/src/vs/workbench/parts/tasks/common/taskDefinitionRegistry.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"TaskDefinition.description": "Tenga en cuenta que los tipos que empiezan con ' $ ' están reservados para uso interno.",
-	"TaskDefinition.properties": "Propiedades adicionales del tipo de tarea",
-	"TaskTypeConfiguration.noType": "La configuración del tipo de tarea no tiene la propiedad \"taskType\" requerida.",
-	"TaskDefinitionExtPoint": "Aporta tipos de tarea"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/tasks/common/taskTemplates.i18n.json b/i18n/esn/src/vs/workbench/parts/tasks/common/taskTemplates.i18n.json
deleted file mode 100644
index 034ad294875..00000000000
--- a/i18n/esn/src/vs/workbench/parts/tasks/common/taskTemplates.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"dotnetCore": "Ejecuta el comando de compilación de .NET Core",
-	"msbuild": "Ejecuta el destino de compilación",
-	"externalCommand": "Ejemplo para ejecutar un comando arbitrario externo",
-	"Maven": "Ejecuta los comandos comunes de Maven."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/tasks/common/taskTypeRegistry.i18n.json b/i18n/esn/src/vs/workbench/parts/tasks/common/taskTypeRegistry.i18n.json
deleted file mode 100644
index 8b6ad71cd4e..00000000000
--- a/i18n/esn/src/vs/workbench/parts/tasks/common/taskTypeRegistry.i18n.json
+++ /dev/null
@@ -1,6 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/tasks/electron-browser/jsonSchemaCommon.i18n.json b/i18n/esn/src/vs/workbench/parts/tasks/electron-browser/jsonSchemaCommon.i18n.json
deleted file mode 100644
index fee0ec825e1..00000000000
--- a/i18n/esn/src/vs/workbench/parts/tasks/electron-browser/jsonSchemaCommon.i18n.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"JsonSchema.options": "Opciones de comando adicionales",
-	"JsonSchema.options.cwd": "Directorio de trabajo actual del script o el programa ejecutado. Si se omite, se usa la raíz del área de trabajo actual de Code.",
-	"JsonSchema.options.env": "Entorno del shell o el programa ejecutado. Si se omite, se usa el entorno del proceso primario.",
-	"JsonSchema.shellConfiguration": "Configura el shell que se usará.",
-	"JsonSchema.shell.executable": "Shell que se va a usar.",
-	"JsonSchema.shell.args": "Argumentos de shell.",
-	"JsonSchema.command": "El comando que se va a ejecutar. Puede ser un programa externo o un comando shell.",
-	"JsonSchema.tasks.args": "Argumentos que se pasan al comando cuando se invoca esta tarea.",
-	"JsonSchema.tasks.taskName": "Nombre de la tarea",
-	"JsonSchema.tasks.windows": "Configuración de comando específico de Windows",
-	"JsonSchema.tasks.mac": "Configuración de comando específico de Mac",
-	"JsonSchema.tasks.linux": "Configuración de comando específico de Linux",
-	"JsonSchema.tasks.suppressTaskName": "Controla si el nombre de la tarea se agrega como argumento al comando. Si se omite, se usa el valor definido globalmente.",
-	"JsonSchema.tasks.showOutput": "Controla si la salida de la tarea en ejecución se muestra o no. Si se omite, se usa el valor definido globalmente.",
-	"JsonSchema.echoCommand": "Controla si el comando ejecutado se muestra en la salida. El valor predeterminado es false.",
-	"JsonSchema.tasks.watching.deprecation": "En desuso. Utilice isBackground en su lugar.",
-	"JsonSchema.tasks.watching": "Indica si la tarea ejecutada se mantiene activa e inspecciona el sistema de archivos.",
-	"JsonSchema.tasks.background": "Indica si la tarea ejecutada se mantiene y está en ejecución en segundo plano.",
-	"JsonSchema.tasks.promptOnClose": "Indica si se pregunta al usuario cuando VS Code se cierra con una tarea en ejecución.",
-	"JsonSchema.tasks.build": "Asigna esta tarea al comando de compilación predeterminado de Code.",
-	"JsonSchema.tasks.test": "Asigna esta tarea al comando de prueba predeterminado de Code.",
-	"JsonSchema.tasks.matchers": "Buscadores de coincidencias de problemas que se van a usar. Puede ser una definición de cadena o de buscador de coincidencias de problemas, o bien una matriz de cadenas y de buscadores de coincidencias de problemas.",
-	"JsonSchema.args": "Argumentos adicionales que se pasan al comando.",
-	"JsonSchema.showOutput": "Controla si la salida de la tarea en ejecución se muestra o no. Si se omite, se usa \"always\".",
-	"JsonSchema.watching.deprecation": "En desuso. Utilice isBackground en su lugar.",
-	"JsonSchema.watching": "Indica si la tarea ejecutada se mantiene activa e inspecciona el sistema de archivos.",
-	"JsonSchema.background": "Indica si la tarea ejecutada se mantiene y está en ejecución en segundo plano.",
-	"JsonSchema.promptOnClose": "Indica si se pregunta al usuario cuando VS Code se cierra con una tarea en ejecución en segundo plano.",
-	"JsonSchema.suppressTaskName": "Controla si el nombre de la tarea se agrega como argumento al comando. El valor predeterminado es false.",
-	"JsonSchema.taskSelector": "Prefijo para indicar que un argumento es una tarea.",
-	"JsonSchema.matchers": "Buscadores de coincidencias de problemas que se van a usar. Puede ser una definición de cadena o de buscador de coincidencias de problemas, o bien una matriz de cadenas y de buscadores de coincidencias de problemas.",
-	"JsonSchema.tasks": "Configuraciones de tarea. Suele enriquecerse una tarea ya definida en el ejecutor de tareas externo."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v1.i18n.json b/i18n/esn/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v1.i18n.json
deleted file mode 100644
index e54d5391ec1..00000000000
--- a/i18n/esn/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v1.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"JsonSchema.version": "Número de versión de la configuración",
-	"JsonSchema._runner": "El ejecutador se ha graduado. Use el ejecutador oficial correctamente",
-	"JsonSchema.runner": "Define si la tarea se ejecuta como un proceso y la salida se muestra en la ventana de salida o dentro del terminal.",
-	"JsonSchema.windows": "Configuración de comando específico de Windows",
-	"JsonSchema.mac": "Configuración de comando específico de Mac",
-	"JsonSchema.linux": "Configuración de comando específico de Linux",
-	"JsonSchema.shell": "Especifica si el comando es un comando shell o un programa externo. Si se omite, el valor predeterminado es false."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json b/i18n/esn/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
deleted file mode 100644
index 7367d0a39f1..00000000000
--- a/i18n/esn/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"JsonSchema.shell": "Especifica si el comando es un comando shell o un programa externo. Si se omite, el valor predeterminado es false.",
-	"JsonSchema.tasks.isShellCommand.deprecated": "La propiedad isShellCommand está en desuso. En su lugar, utilice la propiedad type de la tarea y la propiedad shell de las opciones. Vea también las notas de versión 1.14. ",
-	"JsonSchema.tasks.dependsOn.string": "Otra tarea de la que depende esta tarea.",
-	"JsonSchema.tasks.dependsOn.array": "Las otras tareas de las que depende esta tarea.",
-	"JsonSchema.tasks.presentation": "Configura el panel que se utiliza para presentar las salidas de la tarea y lee sus entradas.",
-	"JsonSchema.tasks.presentation.echo": "Controla si se presenta en el panel un eco del comando ejecutado. El valor predeterminado es verdadero.",
-	"JsonSchema.tasks.presentation.focus": "Controla si el panel recibe el foco. El valor predeterminado es falso. Si se establece a verdadero, el panel además se revela.",
-	"JsonSchema.tasks.presentation.reveal.always": "Revela siempre el terminal cuando se ejecuta esta tarea.",
-	"JsonSchema.tasks.presentation.reveal.silent": "Solo revela el terminal si no hay ningún buscador de coincidencias de problemas asociado con la tarea y se producen errores al ejecutarla.",
-	"JsonSchema.tasks.presentation.reveal.never": "No revela nunca el teminal cuando se ejecuta la tarea.",
-	"JsonSchema.tasks.presentation.reveals": "Controla si el panel que ejecuta la tarea se revela o no. El valor predeterminado es \"siempre\".",
-	"JsonSchema.tasks.presentation.instance": "Controla si el panel se comparte entre tareas, está dedicado a esta tarea, o se crea uno nuevo por cada ejecución.",
-	"JsonSchema.tasks.terminal": "La propiedad terminal está en desuso. En su lugar, utilice presentation.",
-	"JsonSchema.tasks.group.kind": "El grupo de ejecución de la tarea.",
-	"JsonSchema.tasks.group.isDefault": "Define si la tarea es la tarea predeterminada del grupo.",
-	"JsonSchema.tasks.group.defaultBuild": "Marca la tarea como la tarea de compilación predeterminada.",
-	"JsonSchema.tasks.group.defaultTest": "Marca la tarea como la tarea de prueba predeterminada.",
-	"JsonSchema.tasks.group.build": "Marca la tarea como una tarea de compilación accesible mediante el comando ' Ejecutar tarea de compilación'",
-	"JsonSchema.tasks.group.test": "Marca la tarea como una prueba tarea accesible mediante el comando 'Ejecutar tarea de prueba'.",
-	"JsonSchema.tasks.group.none": "No asigna la tarea a ningún grupo",
-	"JsonSchema.tasks.group": "Define a qué grupo de ejecución pertenece esta tarea. Admite \"compilación\" para agregarla al grupo de compilación y \"prueba\" para agregarla al grupo de prueba.",
-	"JsonSchema.tasks.type": "Define si la tarea se ejecuta como un proceso o como un comando dentro de in shell. ",
-	"JsonSchema.commandArray": "El comando Shell que se ejecutará. Los elementos de la matriz se ensamblarán mediante un carácter de espacio",
-	"JsonSchema.command.quotedString.value": "El valor actual del comando",
-	"JsonSchema.tasks.quoting.escape": "Carácteres de escape usan el carácter de escape de la linea de comandos (ej.: ' en PowerShell y \\ en Bash)",
-	"JsonSchema.tasks.quoting.strong": "Cita el argumento usando el carácter de citación doble de la linea de comandos (ej.: \" en PowerShell y Bash) ",
-	"JsonSchema.tasks.quoting.weak": "Cita el argumento usando el carácter de citación simple de la linea de comandos (ej.: ' en PowerShell y Bash) ",
-	"JsonSchema.command.quotesString.quote": "Cómo el valor del comando debería ser citado",
-	"JsonSchema.command": "El comando que se va a ejecutar. Puede ser un programa externo o un comando shell.",
-	"JsonSchema.args.quotedString.value": "El valor actual del argumento",
-	"JsonSchema.args.quotesString.quote": "Cómo el valor del argumento debería ser citado ",
-	"JsonSchema.tasks.args": "Argumentos que se pasan al comando cuando se invoca esta tarea.",
-	"JsonSchema.tasks.label": "Etiqueta de interfaz de usuario de la tarea",
-	"JsonSchema.version": "El número de versión de la configuración.",
-	"JsonSchema.tasks.identifier": "Un identificador definido por el usuario para hacer referencia a la tarea en launch.json o una cláusula dependsOn.",
-	"JsonSchema.tasks.taskLabel": "La etiqueta de la tarea",
-	"JsonSchema.tasks.taskName": "Nombre de la tarea",
-	"JsonSchema.tasks.taskName.deprecated": "La propiedad name de la tarea está en desuso. En su lugar, utilice la propiedad label. ",
-	"JsonSchema.tasks.background": "Indica si la tarea ejecutada se mantiene y está en ejecución en segundo plano.",
-	"JsonSchema.tasks.promptOnClose": "Indica si se pregunta al usuario cuando VS Code se cierra con una tarea en ejecución.",
-	"JsonSchema.tasks.matchers": "Buscadores de coincidencias de problemas que se van a usar. Puede ser una definición de cadena o de buscador de coincidencias de problemas, o bien una matriz de cadenas y de buscadores de coincidencias de problemas.",
-	"JsonSchema.customizations.customizes.type": "El tipo de tarea que se va a personalizar",
-	"JsonSchema.tasks.customize.deprecated": "La propiedad customize está en desuso. Consulte las notas de la versión 1.14 sobre cómo migrar al nuevo enfoque de personalización de tareas.",
-	"JsonSchema.tasks.showOputput.deprecated": "La propiedad showOutput está en desuso. Utilice la propiedad reveal dentro de la propiedad presentation en su lugar. Vea también las notas de la versión 1.14.",
-	"JsonSchema.tasks.echoCommand.deprecated": "La propiedad echoCommand está en desuso. Utilice la propiedad echo dentro de la propiedad presentation en su lugar. Vea también las notas de la versión 1.14.",
-	"JsonSchema.tasks.suppressTaskName.deprecated": "La propiedad suppressTaskName está en desuso. En lugar de usar esta propiedad, inserte el comando con los argumentos en la tarea. Vea también las notas de la versión 1.14.",
-	"JsonSchema.tasks.isBuildCommand.deprecated": "La propiedad isBuildCommand está en desuso. Utilice la propiedad group en su lugar. Vea también las notas de la versión 1.14.",
-	"JsonSchema.tasks.isTestCommand.deprecated": "La propiedad isTestCommand está en desuso. Utilice la propiedad group en su lugar. Vea también las notas de la versión 1.14.",
-	"JsonSchema.tasks.taskSelector.deprecated": "La propiedad taskSelector está en desuso. En lugar de usar esta propiedad, inserte el comando con los argumentos en la tarea. Vea también las notas de la versión 1.14.",
-	"JsonSchema.windows": "Configuración de comando específico de Windows",
-	"JsonSchema.mac": "Configuración de comando específico de Mac",
-	"JsonSchema.linux": "Configuración de comando específico de Linux"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json b/i18n/esn/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
deleted file mode 100644
index cf1ca0ef5c2..00000000000
--- a/i18n/esn/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
+++ /dev/null
@@ -1,89 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"tasksCategory": "Tareas",
-	"ConfigureTaskRunnerAction.label": "Configurar tarea",
-	"totalErrors": "{0} errores",
-	"totalWarnings": "{0} advertencias",
-	"totalInfos": "{0} informaciones",
-	"problems": "Problemas",
-	"building": "Compilando...",
-	"manyProblems": "+10Mil",
-	"runningTasks": "Mostrar tareas en ejecución",
-	"tasks": "Tareas",
-	"TaskSystem.noHotSwap": "Cambiar el motor de ejecución de tareas con una tarea activa ejecutandose, requiere recargar la ventana",
-	"reloadWindow": "Recargar ventana",
-	"TaskServer.folderIgnored": "La carpeta {0} se pasa por alto puesto que utiliza la versión 0.1.0 de las tareas",
-	"TaskService.noBuildTask1": "No se ha definido ninguna tarea de compilación. Marque una tarea con \"isBuildCommand\" en el archivo tasks.json.",
-	"TaskService.noBuildTask2": "No se ha definido ninguna tarea de compilación. Marque una tarea con un grupo \"build\" en el archivo tasks.json. ",
-	"TaskService.noTestTask1": "No se ha definido ninguna tarea de prueba. Marque una tarea con \"isTestCommand\" en el archivo tasks.json.",
-	"TaskService.noTestTask2": "No se ha definido ninguna tarea de prueba. Marque una tarea con \"test\" en el archivo tasks.json.",
-	"TaskServer.noTask": "No se encuentra la tarea {0} que se ha solicitado para ejecutarla.",
-	"TaskService.associate": "asociar",
-	"TaskService.attachProblemMatcher.continueWithout": "Continuar sin examinar la salida de la tarea",
-	"TaskService.attachProblemMatcher.never": "No examinar nunca la salida de la tarea",
-	"TaskService.attachProblemMatcher.learnMoreAbout": "Más información acerca del examen de la salida de la tarea",
-	"selectProblemMatcher": "Seleccione qué tipo de errores y advertencias deben buscarse durante el examen de la salida de la tarea",
-	"customizeParseErrors": "La configuración actual de tareas contiene errores. Antes de personalizar una tarea, corrija los errores.",
-	"moreThanOneBuildTask": "Hay muchas tareas de compilación definidas en el archivo tasks.json. Se ejecutará la primera.\n",
-	"TaskSystem.activeSame.background": "La tarea \"{0}\" ya está activa en segundo plano.",
-	"TaskSystem.activeSame.noBackground": "La tarea \"{0}\" ya está activa.",
-	"terminateTask": "Finalizar tarea",
-	"restartTask": "Reiniciar tarea",
-	"TaskSystem.active": "Ya hay una tarea en ejecución. Finalícela antes de ejecutar otra tarea.",
-	"TaskSystem.restartFailed": "No se pudo terminar y reiniciar la tarea {0}",
-	"TaskService.noConfiguration": "Error: La detección de tarea {0} no encontró una tarea para la siguiente configuración:\n{1}\nLa tarea será omitida.\n",
-	"TaskSystem.configurationErrors": "Error: La configuración de la tarea proporcionada tiene errores de validación y no se puede usar. Corrija los errores primero.",
-	"taskService.ignoreingFolder": "Ignorando las configuraciones de tarea para la carpeta del area de trabajo {0}. El soporte de tarea de area de trabajo multi carpeta requiere que todas las carpetas usen la versión de tarea 2.0.0 ",
-	"TaskSystem.invalidTaskJson": "Error: El contenido del archivo tasks.json tiene errores de sintaxis. Corríjalos antes de ejecutar una tarea.",
-	"TaskSystem.runningTask": "Hay una tarea en ejecución. ¿Quiere finalizarla?",
-	"TaskSystem.terminateTask": "&&Finalizar tarea",
-	"TaskSystem.noProcess": "La tarea iniciada ya no existe. Si la tarea generó procesos en segundo plano al salir de VS Code, puede dar lugar a procesos huérfanos. Para evitarlo, inicie el último proceso en segundo plano con una marca de espera.",
-	"TaskSystem.exitAnyways": "&&Salir de todos modos",
-	"TerminateAction.label": "Finalizar tarea",
-	"TaskSystem.unknownError": "Error durante la ejecución de una tarea. Consulte el registro de tareas para obtener más detalles.",
-	"TaskService.noWorkspace": "Las tareas solo están disponibles en una carpeta del área de trabajo.",
-	"recentlyUsed": "Tareas usadas recientemente",
-	"configured": "tareas configuradas",
-	"detected": "tareas detectadas",
-	"TaskService.ignoredFolder": "Las siguientes carpetas del área de trabajo se omitirán porque utilizan la versión 0.1.0 de la tarea: {0}",
-	"TaskService.notAgain": "No volver a mostrar",
-	"TaskService.pickRunTask": "Seleccione la tarea a ejecutar",
-	"TaslService.noEntryToRun": "No se encontraron tareas para ejecutar. Configurar tareas...",
-	"TaskService.fetchingBuildTasks": "Obteniendo tareas de compilación...",
-	"TaskService.pickBuildTask": "Seleccione la tarea de compilación para ejecutar",
-	"TaskService.noBuildTask": "No se encontraron tareas de compilación para ejecutar. Configurar tareas de compilación...",
-	"TaskService.fetchingTestTasks": "Capturando tareas de prueba...",
-	"TaskService.pickTestTask": "Seleccione la tarea de prueba para ejecutar",
-	"TaskService.noTestTaskTerminal": "No se encontraron tareas de prueba para ejecutar. Configurar tareas...",
-	"TaskService.tastToTerminate": "Seleccione la tarea para finalizar",
-	"TaskService.noTaskRunning": "Ninguna tarea se está ejecutando actualmente",
-	"TerminateAction.noProcess": "El proceso iniciado ya no existe. Si la tarea generó procesos en segundo plano al salir de VS Code, puede dar lugar a procesos huérfanos.",
-	"TerminateAction.failed": "No se pudo finalizar la tarea en ejecución",
-	"TaskService.tastToRestart": "Seleccione la tarea para reiniciar",
-	"TaskService.noTaskToRestart": "No hay tareas para reiniciar",
-	"TaskService.template": "Seleccione una plantilla de tarea",
-	"TaskService.createJsonFile": "Crear archivo tasks.json desde plantilla",
-	"TaskService.openJsonFile": "Abrir archivo tasks.json",
-	"TaskService.pickTask": "Seleccione una tarea para configurar",
-	"TaskService.defaultBuildTaskExists": "{0} está marcado ya como la tarea de compilación predeterminada",
-	"TaskService.pickDefaultBuildTask": "Seleccione la tarea que se va a utilizar como tarea de compilación predeterminada",
-	"TaskService.defaultTestTaskExists": "{0} ya se ha marcado como la tarea de prueba predeterminada.",
-	"TaskService.pickDefaultTestTask": "Seleccione la tarea que se va a usar como la tarea de prueba predeterminada ",
-	"TaskService.pickShowTask": "Seleccione la tarea de la que desea ver la salida",
-	"TaskService.noTaskIsRunning": "Ninguna tarea se está ejecutando",
-	"ShowLogAction.label": "Mostrar registro de tareas",
-	"RunTaskAction.label": "Ejecutar tarea",
-	"RestartTaskAction.label": "Reiniciar la tarea en ejecución",
-	"ShowTasksAction.label": "Mostrar tareas en ejecución",
-	"BuildAction.label": "Ejecutar tarea de compilación",
-	"TestAction.label": "Ejecutar tarea de prueba",
-	"ConfigureDefaultBuildTask.label": "Configurar tarea de compilación predeterminada",
-	"ConfigureDefaultTestTask.label": "Configurar tarea de prueba predeterminada",
-	"quickOpen.task": "Ejecutar tarea"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/tasks/electron-browser/taskPanel.i18n.json b/i18n/esn/src/vs/workbench/parts/tasks/electron-browser/taskPanel.i18n.json
deleted file mode 100644
index 6fd3032657e..00000000000
--- a/i18n/esn/src/vs/workbench/parts/tasks/electron-browser/taskPanel.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"tasks": "Tareas"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.i18n.json b/i18n/esn/src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.i18n.json
deleted file mode 100644
index 85eb01f4a35..00000000000
--- a/i18n/esn/src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"TerminalTaskSystem.unknownError": "Error desconocido durante la ejecución de una tarea. Vea el registro de resultados de la tarea para obtener más detalles.",
-	"dependencyFailed": "No se pudo resolver la tarea dependiente '{0}' en la carpeta del área de trabajo '{1}'",
-	"TerminalTaskSystem.terminalName": "Tarea - {0}",
-	"closeTerminal": "Pulse cualquier tecla para cerrar el terminal",
-	"reuseTerminal": "Las tareas reutilizarán el terminal, presione cualquier tecla para cerrarlo.",
-	"TerminalTaskSystem": "No se puede ejecutar un comando Shell en una unidad UNC mediante cmd.exe.",
-	"unkownProblemMatcher": "No puede resolver el comprobador de problemas {0}. Será omitido."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/tasks/node/processRunnerDetector.i18n.json b/i18n/esn/src/vs/workbench/parts/tasks/node/processRunnerDetector.i18n.json
deleted file mode 100644
index ef418112113..00000000000
--- a/i18n/esn/src/vs/workbench/parts/tasks/node/processRunnerDetector.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"TaskSystemDetector.noGulpTasks": "Al ejecutar --tasks-simple de Gulp no se enumera ninguna tarea. ¿Ha ejecutado \"npm install\"?",
-	"TaskSystemDetector.noJakeTasks": "Al ejecutar --tasks de jake no se enumera ninguna tarea. ¿Ha ejecutado \"npm install\"?",
-	"TaskSystemDetector.noGulpProgram": "Gulp no está instalado en el sistema. Ejecute \"npm install -g gulp\" para instalarlo.",
-	"TaskSystemDetector.noJakeProgram": "Jake no está instalado en el sistema. Ejecute \"npm install -g jake\" para instalarlo.",
-	"TaskSystemDetector.noGruntProgram": "Grunt no está instalado en el sistema. Ejecute \"npm install -g grunt\" para instalarlo.",
-	"TaskSystemDetector.noProgram": "El programa {0} no se encontró. El mensaje es {1}",
-	"TaskSystemDetector.buildTaskDetected": "Se detectó una tarea de compilación llamada '{0}'.",
-	"TaskSystemDetector.testTaskDetected": "Se detectó una tarea de prueba llamada '{0}'."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/tasks/node/processTaskSystem.i18n.json b/i18n/esn/src/vs/workbench/parts/tasks/node/processTaskSystem.i18n.json
deleted file mode 100644
index 8042e70eef4..00000000000
--- a/i18n/esn/src/vs/workbench/parts/tasks/node/processTaskSystem.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"TaskRunnerSystem.unknownError": "Error desconocido durante la ejecución de una tarea. Vea el registro de resultados de la tarea para obtener más detalles.",
-	"TaskRunnerSystem.watchingBuildTaskFinished": "La inspección de las tareas de compilación ha finalizado.",
-	"TaskRunnerSystem.childProcessError": "Failed to launch external program {0} {1}.",
-	"TaskRunnerSystem.cancelRequested": "La tarea '{0}' se finalizó por solicitud del usuario.",
-	"unkownProblemMatcher": "No puede resolver el comprobador de problemas {0}. Será omitido"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json b/i18n/esn/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
deleted file mode 100644
index c53edb70544..00000000000
--- a/i18n/esn/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"ConfigurationParser.invalidCWD": "Advertencia: options.cwd debe ser de tipo cadena. Se ignora el valor {0}.",
-	"ConfigurationParser.inValidArg": "Error: el argumento del comando debe ser una cadena de texto o una cadena de texto citada. El valor provisto es: [0]",
-	"ConfigurationParser.noargs": "Error: Los argumentos de comando deben ser una matriz de cadenas. El valor proporcionado es: {0}",
-	"ConfigurationParser.noShell": "Advertencia: La configuración del shell solo se admite al ejecutar tareas en el terminal.",
-	"ConfigurationParser.noName": "Error: El buscador de coincidencias de problemas del ámbito de declaración debe tener un nombre: {0}",
-	"ConfigurationParser.unknownMatcherKind": "Advertencia: El buscador de coincidencias de problemas definido se desconoce. Los tipos admitidos son string | ProblemMatcher | (string | ProblemMatcher). {0}",
-	"ConfigurationParser.invalidVaraibleReference": "Error: Referencia a problemMatcher no válida: {0}",
-	"ConfigurationParser.noTaskType": "Error: Las tareas deben tener una propiedad type. La configuración se omitirá.\n{0}\n",
-	"ConfigurationParser.noTypeDefinition": "Error: No hay ningún tipo de tarea \"{0}\" registrado. ¿Omitió la instalación de una extensión que proporciona un proveedor de tareas correspondiente?",
-	"ConfigurationParser.missingRequiredProperty": "Error: la configuración de la tarea '{0}' no contiene la propiedad requerida '{1}'. Se omitirá la configuración de la tarea.",
-	"ConfigurationParser.notCustom": "Error: Las tareas no se declaran como una tarea personalizada. La configuración se omitirá.\n{0}\n",
-	"ConfigurationParser.noTaskName": "Error: Las tareas deben proporcionar una propiedad label. La tarea se ignorará.\n{0}\n",
-	"taskConfiguration.noCommandOrDependsOn": "Error: La tarea \"{0}\" no especifica un comando ni una propiedad dependsOn. La tarea se ignorará. Su definición es: \n{1}",
-	"taskConfiguration.noCommand": "Error: La tarea \"{0}\" no define un comando. La tarea se ignorará. Su definición es: {1}",
-	"TaskParse.noOsSpecificGlobalTasks": "La versión de tarea 2.0.0 no admite tareas específicas de SO globales. Conviértalas en una tarea con un comando específico de SO. Estas son las tareas afectadas:\n{0}"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.i18n.json b/i18n/esn/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.i18n.json
deleted file mode 100644
index 2dd035c28fd..00000000000
--- a/i18n/esn/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"termEntryAriaLabel": "{0}, selector de terminal",
-	"termCreateEntryAriaLabel": "{0}, crear nueva terminal",
-	"workbench.action.terminal.newplus": "$(plus) Crear nueva terminal integrada",
-	"noTerminalsMatching": "No hay terminales coincidentes",
-	"noTerminalsFound": "No hay terminales abiertos"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/terminal/common/terminalColorRegistry.i18n.json b/i18n/esn/src/vs/workbench/parts/terminal/common/terminalColorRegistry.i18n.json
deleted file mode 100644
index 452c57e6943..00000000000
--- a/i18n/esn/src/vs/workbench/parts/terminal/common/terminalColorRegistry.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"terminal.background": "El color de fondo del terminal, esto permite colorear el terminal de forma diferente al panel.",
-	"terminal.foreground": "El color de primer plano del terminal.",
-	"terminalCursor.foreground": "Color de primer plano del cursor del terminal.",
-	"terminalCursor.background": "Color de fondo del cursor del terminal. Permite personalizar el color de un carácter solapado por un cursor de bloque.",
-	"terminal.selectionBackground": "Color de fondo de selección del terminal.",
-	"terminal.border": "Color del borde que separa paneles divididos en el terminal. El valor predeterminado es panel.border.",
-	"terminal.ansiColor": "color ANSI ' {0} ' en el terminal."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json b/i18n/esn/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
deleted file mode 100644
index 638d95e0778..00000000000
--- a/i18n/esn/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"quickOpen.terminal": "Mostrar todos los terminales abiertos",
-	"terminal": "Terminal",
-	"terminalIntegratedConfigurationTitle": "Terminal integrado",
-	"terminal.integrated.shell.linux": "La ruta de acceso del shell que el terminal usa en Linux.",
-	"terminal.integrated.shellArgs.linux": "Los argumentos de la línea de comandos que se usarán en el terminal de Linux.",
-	"terminal.integrated.shell.osx": "La ruta de acceso del shell que el terminal usa en OS X.",
-	"terminal.integrated.shellArgs.osx": "Los argumentos de la línea de comandos que se usarán en el terminal de OS X.",
-	"terminal.integrated.shell.windows": "Ruta de acceso del shell que el terminal utiliza en Windows. Cuando se usan shells distribuidos con Windows (cmd, PowerShell o Bash en Ubuntu).",
-	"terminal.integrated.shellArgs.windows": "Argumentos de la línea de comandos que se usan cuando se utiliza el terminal Windows.",
-	"terminal.integrated.macOptionIsMeta": "Trate la tecla de opción como la clave meta en el terminal en macOS.",
-	"terminal.integrated.copyOnSelection": "Cuando se establece, el texto seleccionado en el terminal se copiará en el portapapeles.",
-	"terminal.integrated.fontFamily": "Controla la familia de fuentes del terminal, que está establecida de manera predeterminada en el valor de editor.fontFamily.",
-	"terminal.integrated.fontSize": "Controla el tamaño de la fuente en píxeles del terminal.",
-	"terminal.integrated.letterSpacing": "Controla el espaciado de las letras del terminal, este es un valor entero que representa la cantidad de píxeles adicionales a añadir entre los caracteres.",
-	"terminal.integrated.lineHeight": "Controla el alto de línea del terminal. Este número se multiplica por el tamaño de fuente del terminal para obtener el alto de línea real en píxeles.",
-	"terminal.integrated.fontWeight": "Espesor de fuente que debe usarse en el terminal para el texto que no está en negrita.",
-	"terminal.integrated.fontWeightBold": "Espesor de fuente que debe usarse en el terminal para el texto en negrita.",
-	"terminal.integrated.cursorBlinking": "Controla si el cursor del terminal parpadea.",
-	"terminal.integrated.cursorStyle": "Controla el estilo de cursor del terminal.",
-	"terminal.integrated.scrollback": "Controla la cantidad máxima de líneas que mantiene el terminal en su búfer.",
-	"terminal.integrated.setLocaleVariables": "Controla si las variables de configuración regional se definen al inicio del terminal. El valor predeterminado es true en OS X y false en las demás plataformas.",
-	"terminal.integrated.rendererType": "Controla el modo en el que se representa el terminal. Las opciones son \"canvas\" para el representador de lienzo estándar (rápido), \"dom\" para el representador de reserva basado en DOM o \"auto\", que deja que VS Code determine cuál es mejor. Para que esta opción surta efecto, es necesario reiniciar VS Code.",
-	"terminal.integrated.rightClickBehavior": "Controla cómo reacciona el terminal al clic derecho, las posibilidades son \"default\", \"copyPaste\" y \"selectWord\". \"default\" mostrará el menú contextual, \"copyPaste\" copiará cuando haya una selección; de lo contrario, se pegará, \"selectWord\" seleccionará la palabra debajo del cursor y mostrará el menú contextual.",
-	"terminal.integrated.cwd": "Una ruta de acceso de inicio explícita en la que se iniciará el terminal; se utiliza como el directorio de trabajo actual (cwd) para el proceso de shell. Puede resultar especialmente útil en una configuración de área de trabajo si la raíz de directorio no es un cwd práctico.",
-	"terminal.integrated.confirmOnExit": "Indica si debe confirmarse a la salida si hay sesiones de terminal activas.",
-	"terminal.integrated.enableBell": "Si la campana terminal está activada o no.",
-	"terminal.integrated.commandsToSkipShell": "Conjunto de identificadores de comando cuyos enlaces de teclado no se enviarán al shell, sino que siempre se controlarán con Code. Esto permite el uso de enlaces de teclado que normalmente consumiría el shell para funcionar igual que cuando el terminal no tiene el foco; por ejemplo, Ctrl+P para iniciar Quick Open.",
-	"terminal.integrated.env.osx": "Objeto con variables de entorno que se agregarán al proceso de VS Code para que las use el terminal en OS X",
-	"terminal.integrated.env.linux": "Objeto con variables de entorno que se agregarán al proceso de VS Code para que las use el terminal en Linux",
-	"terminal.integrated.env.windows": "Objeto con variables de entorno que se agregarán al proceso de VS Code para que las use el terminal en Windows",
-	"terminal.integrated.showExitAlert": "Mostrar alerta 'El proceso de terminal terminó con el código de salida ' cuando el código de salida no es cero.",
-	"terminal.integrated.experimentalRestore": "Indica si se restauran automáticamente las sesiones del terminal para el área de trabajo cuando se inicia VS Code. Esta es una opción experimental; puede tener errores y podría cambiar en el futuro.",
-	"terminalCategory": "Terminal",
-	"viewCategory": "Ver"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json b/i18n/esn/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
deleted file mode 100644
index 21fcf5a4e9d..00000000000
--- a/i18n/esn/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
+++ /dev/null
@@ -1,63 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"workbench.action.terminal.toggleTerminal": "Alternar terminal integrado",
-	"workbench.action.terminal.kill": "Terminar la instancia del terminal activo",
-	"workbench.action.terminal.kill.short": "Terminar el terminal",
-	"workbench.action.terminal.quickKill": "Terminar la instancia del terminal",
-	"workbench.action.terminal.copySelection": "Copiar selección",
-	"workbench.action.terminal.selectAll": "Seleccionar todo",
-	"workbench.action.terminal.deleteWordLeft": "Eliminar una palabra a la izquierda",
-	"workbench.action.terminal.deleteWordRight": "Eliminar una palabra a la derecha",
-	"workbench.action.terminal.moveToLineStart": "Mover al principio de la línea",
-	"workbench.action.terminal.moveToLineEnd": "Mover al final de la línea",
-	"workbench.action.terminal.new": "Crear nuevo terminal integrado",
-	"workbench.action.terminal.new.short": "Nuevo terminal",
-	"workbench.action.terminal.newWorkspacePlaceholder": "Seleccione el directorio de trabajo actual para el nuevo terminal",
-	"workbench.action.terminal.newInActiveWorkspace": "Crear nuevo terminal integrado (en el espacio de trabajo activo)",
-	"workbench.action.terminal.split": "Dividir terminal",
-	"workbench.action.terminal.splitInActiveWorkspace": "Dividir Terminal (En el espacio de trabajo activo)",
-	"workbench.action.terminal.focusPreviousPane": "Aplicar el foco al panel anterior",
-	"workbench.action.terminal.focusNextPane": "Aplicar el foco al panel siguiente",
-	"workbench.action.terminal.resizePaneLeft": "Cambiar el tamaño del panel por la izquierda",
-	"workbench.action.terminal.resizePaneRight": "Cambiar el tamaño del panel por la derecha",
-	"workbench.action.terminal.resizePaneUp": "Cambiar el tamaño del panel por arriba",
-	"workbench.action.terminal.resizePaneDown": "Cambiar el tamaño del panel por abajo",
-	"workbench.action.terminal.focus": "Enfocar terminal",
-	"workbench.action.terminal.focusNext": "Enfocar terminal siguiente",
-	"workbench.action.terminal.focusPrevious": "Enfocar terminal anterior",
-	"workbench.action.terminal.paste": "Pegar en el terminal activo",
-	"workbench.action.terminal.DefaultShell": "Seleccionar el shell predeterminado",
-	"workbench.action.terminal.runSelectedText": "Ejecutar texto seleccionado en el terminal activo",
-	"workbench.action.terminal.runActiveFile": "Ejecutar el archivo activo en la terminal activa",
-	"workbench.action.terminal.runActiveFile.noFile": "Solo se pueden ejecutar en la terminal los archivos en disco",
-	"workbench.action.terminal.switchTerminal": "Cambiar terminal",
-	"workbench.action.terminal.scrollDown": "Desplazar hacia abajo (línea)",
-	"workbench.action.terminal.scrollDownPage": "Desplazar hacia abajo (página)",
-	"workbench.action.terminal.scrollToBottom": "Desplazar al final",
-	"workbench.action.terminal.scrollUp": "Desplazar hacia arriba (línea)",
-	"workbench.action.terminal.scrollUpPage": "Desplazar hacia arriba (página)",
-	"workbench.action.terminal.scrollToTop": "Desplazar al principio",
-	"workbench.action.terminal.clear": "Borrar",
-	"workbench.action.terminal.clearSelection": "Borrar selección",
-	"workbench.action.terminal.allowWorkspaceShell": "Permitir la configuración del área de trabajo Shell",
-	"workbench.action.terminal.disallowWorkspaceShell": "No permitir la configuración del área de trabajo Shell",
-	"workbench.action.terminal.rename": "Cambiar nombre",
-	"workbench.action.terminal.rename.prompt": "Introducir nombre del terminal",
-	"workbench.action.terminal.focusFindWidget": "Foco Encontrar Widget",
-	"workbench.action.terminal.hideFindWidget": "Ocultar Encontrar Widget",
-	"nextTerminalFindTerm": "Mostrar siguiente término de búsqueda",
-	"previousTerminalFindTerm": "Mostrar término de búsqueda anterior",
-	"quickOpenTerm": "Cambiar terminal activo",
-	"workbench.action.terminal.scrollToPreviousCommand": "Desplácese al comando anterior",
-	"workbench.action.terminal.scrollToNextCommand": "Desplácese al siguiente comando",
-	"workbench.action.terminal.selectToPreviousCommand": "Seleccionar hasta el comando anterior",
-	"workbench.action.terminal.selectToNextCommand": "Seleccionar hasta el comando siguiente",
-	"workbench.action.terminal.selectToPreviousLine": "Seleccione la línea anterior",
-	"workbench.action.terminal.selectToNextLine": "Seleccione la línea siguiente"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json b/i18n/esn/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
deleted file mode 100644
index 452c57e6943..00000000000
--- a/i18n/esn/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"terminal.background": "El color de fondo del terminal, esto permite colorear el terminal de forma diferente al panel.",
-	"terminal.foreground": "El color de primer plano del terminal.",
-	"terminalCursor.foreground": "Color de primer plano del cursor del terminal.",
-	"terminalCursor.background": "Color de fondo del cursor del terminal. Permite personalizar el color de un carácter solapado por un cursor de bloque.",
-	"terminal.selectionBackground": "Color de fondo de selección del terminal.",
-	"terminal.border": "Color del borde que separa paneles divididos en el terminal. El valor predeterminado es panel.border.",
-	"terminal.ansiColor": "color ANSI ' {0} ' en el terminal."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/terminal/electron-browser/terminalConfigHelper.i18n.json b/i18n/esn/src/vs/workbench/parts/terminal/electron-browser/terminalConfigHelper.i18n.json
deleted file mode 100644
index bba29b1852f..00000000000
--- a/i18n/esn/src/vs/workbench/parts/terminal/electron-browser/terminalConfigHelper.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"terminal.integrated.allowWorkspaceShell": "¿Permite {0} (definido como valor del área de trabajo) que sea lanzado en el terminal?",
-	"allow": "Allow",
-	"disallow": "Disallow"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/terminal/electron-browser/terminalFindWidget.i18n.json b/i18n/esn/src/vs/workbench/parts/terminal/electron-browser/terminalFindWidget.i18n.json
deleted file mode 100644
index 213a60a3c4f..00000000000
--- a/i18n/esn/src/vs/workbench/parts/terminal/electron-browser/terminalFindWidget.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"label.find": "Buscar",
-	"placeholder.find": "Buscar",
-	"label.previousMatchButton": "Coincidencia anterior",
-	"label.nextMatchButton": "Coincidencia siguiente",
-	"label.closeButton": "Cerrar"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json b/i18n/esn/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json
deleted file mode 100644
index acac8a721f3..00000000000
--- a/i18n/esn/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"terminal.integrated.a11yBlankLine": "Línea en blanco",
-	"terminal.integrated.a11yPromptLabel": "Entrada de terminal",
-	"terminal.integrated.a11yTooMuchOutput": "Demasiada salida para anunciarla. Vaya a las filas manualmente para leerlas.",
-	"yes": "Sí",
-	"terminal.rendererInAllNewTerminals": "Todos los terminales recién creados usarán el renderizador que no es GPU.",
-	"no": "No",
-	"dontShowAgain": "No volver a mostrar",
-	"terminal.slowRendering": "El representador estándar para el terminal integrado parece ser lento en su ordenador. ¿Le gustaría cambiar al representador alternativo basado en DOM el cual podría mejorar el rendimiento? [Obtenga más información sobre la configuración del terminal] (https://code.visualstudio.com/docs/editor/integrated-terminal#_changing-how-the-terminal-is-rendered).",
-	"terminal.integrated.copySelection.noSelection": "El terminal no tiene ninguna selección para copiar",
-	"terminal.integrated.exitedWithCode": "El proceso del terminal finalizó con el código de salida: {0}",
-	"terminal.integrated.waitOnExit": "Presione cualquier tecla para cerrar el terminar",
-	"terminal.integrated.launchFailed": "No se pudo iniciar el comando de proceso del terminal \"{0}{1}\" (código de salida: {2})",
-	"terminal.integrated.launchFailedExtHost": "El proceso terminal no pudo iniciarse (código de salida: {0})"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/terminal/electron-browser/terminalLinkHandler.i18n.json b/i18n/esn/src/vs/workbench/parts/terminal/electron-browser/terminalLinkHandler.i18n.json
deleted file mode 100644
index aa189f14eb4..00000000000
--- a/i18n/esn/src/vs/workbench/parts/terminal/electron-browser/terminalLinkHandler.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"terminalLinkHandler.followLinkAlt": "Alt + clic para seguir el vínculo",
-	"terminalLinkHandler.followLinkCmd": "Cmd + clic para abrir el vínculo",
-	"terminalLinkHandler.followLinkCtrl": "Ctrl + clic para abrir el vínculo"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json b/i18n/esn/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json
deleted file mode 100644
index d4fdd3d2e2d..00000000000
--- a/i18n/esn/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"terminal.useMonospace": "Use \"monospace\"",
-	"terminal.monospaceOnly": "El terminal solo admite fuentes monoespaciadas.",
-	"copy": "Copiar",
-	"split": "Dividir",
-	"paste": "Pegar",
-	"selectAll": "Seleccionar todo",
-	"clear": "Borrar"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json b/i18n/esn/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
deleted file mode 100644
index 689cce2491f..00000000000
--- a/i18n/esn/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"terminal.integrated.chooseWindowsShellInfo": "Para cambiar el shell de terminal predeterminado, seleccione el botón Personalizar.",
-	"customize": "Personalizar",
-	"never again": "No volver a mostrar",
-	"terminal.integrated.chooseWindowsShell": "Seleccione el shell de terminal que desee, puede cambiarlo más adelante en la configuración",
-	"terminalService.terminalCloseConfirmationSingular": "Hay una sesión de terminal activa, ¿quiere terminarla?",
-	"terminalService.terminalCloseConfirmationPlural": "Hay {0} sesiones de terminal activas, ¿quiere terminarlas?"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/themes/electron-browser/themes.contribution.i18n.json b/i18n/esn/src/vs/workbench/parts/themes/electron-browser/themes.contribution.i18n.json
deleted file mode 100644
index 2040b61c7cb..00000000000
--- a/i18n/esn/src/vs/workbench/parts/themes/electron-browser/themes.contribution.i18n.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"selectTheme.label": "Tema de color",
-	"themes.category.light": "temas claros",
-	"themes.category.dark": "temas oscuros",
-	"themes.category.hc": "temas de alto contraste",
-	"installColorThemes": "Instalar temas de color adicionales...",
-	"themes.selectTheme": "Seleccione el tema de color (flecha arriba/abajo para vista previa)",
-	"selectIconTheme.label": "Tema de icono de archivo",
-	"noIconThemeLabel": "Ninguno",
-	"noIconThemeDesc": "Deshabilitar iconos de archivo",
-	"installIconThemes": "Instalar temas de icono de archivo adicionles...",
-	"themes.selectIconTheme": "Seleccionar tema de icono de archivo",
-	"generateColorTheme.label": "General el tema de color desde la configuración actual",
-	"preferences": "Preferencias",
-	"developer": "Desarrollador"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/trust/electron-browser/unsupportedWorkspaceSettings.contribution.i18n.json b/i18n/esn/src/vs/workbench/parts/trust/electron-browser/unsupportedWorkspaceSettings.contribution.i18n.json
deleted file mode 100644
index 330fde9328b..00000000000
--- a/i18n/esn/src/vs/workbench/parts/trust/electron-browser/unsupportedWorkspaceSettings.contribution.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openWorkspaceSettings": "Abrir configuración del área de trabajo",
-	"dontShowAgain": "No volver a mostrar",
-	"unsupportedWorkspaceSettings": "Esta área de trabajo contiene valores de configuración que solo se pueden establecer en Configuración de usuario ({0}). Haga clic [aquí]({1}) para obtener más información."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json b/i18n/esn/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json
deleted file mode 100644
index 0378f2fc8d2..00000000000
--- a/i18n/esn/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"releaseNotesInputName": "Notas de la versión: {0}",
-	"unassigned": "sin asignar"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/update/electron-browser/releaseNotesInput.i18n.json b/i18n/esn/src/vs/workbench/parts/update/electron-browser/releaseNotesInput.i18n.json
deleted file mode 100644
index 2ca1d2d8a65..00000000000
--- a/i18n/esn/src/vs/workbench/parts/update/electron-browser/releaseNotesInput.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"releaseNotesInputName": "Notas de la versión: {0}"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/update/electron-browser/update.contribution.i18n.json b/i18n/esn/src/vs/workbench/parts/update/electron-browser/update.contribution.i18n.json
deleted file mode 100644
index 67e8b88f997..00000000000
--- a/i18n/esn/src/vs/workbench/parts/update/electron-browser/update.contribution.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"release notes": "Notas de la versión"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/update/electron-browser/update.i18n.json b/i18n/esn/src/vs/workbench/parts/update/electron-browser/update.i18n.json
deleted file mode 100644
index 2d994e36326..00000000000
--- a/i18n/esn/src/vs/workbench/parts/update/electron-browser/update.i18n.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"releaseNotes": "Notas de la versión",
-	"showReleaseNotes": "Mostrar las notas de la versión",
-	"read the release notes": "{0} v{1}. ¿Quiere leer las notas de la versión?",
-	"licenseChanged": "Los términos de licencia han cambiado. Haga clic [aquí]({0}) para revisarlos.",
-	"neveragain": "No volver a mostrar",
-	"64bitisavailable": "Ya está disponible {0} para Windows de 64 bits. Haga clic [aquí]({1}) para obtener más información.",
-	"updateIsReady": "Nueva actualización de {0} disponible.",
-	"noUpdatesAvailable": "Actualmente, no hay actualizaciones disponibles.",
-	"ok": "Aceptar",
-	"thereIsUpdateAvailable": "Hay una actualización disponible.",
-	"download now": "Descargar ahora",
-	"later": "Más tarde",
-	"updateAvailable": "Hay una actualización disponible: {0} {1}",
-	"installUpdate": "Instalar la actualización ",
-	"updateInstalling": "{0} {1} se está instalando en segundo plano; le avisaremos cuando esté hecho.",
-	"updateAvailableAfterRestart": "Reiniciar {0} para aplicar la última actualización.",
-	"updateNow": "Actualizar ahora",
-	"commandPalette": "Paleta de comandos...",
-	"settings": "Configuración",
-	"keyboardShortcuts": "Métodos abreviados de teclado",
-	"showExtensions": "Administrar extensiones",
-	"userSnippets": "Fragmentos de código de usuario",
-	"selectTheme.label": "Tema de color",
-	"themes.selectIconTheme.label": "Tema de icono de archivo",
-	"checkForUpdates": "Buscar actualizaciones...",
-	"checkingForUpdates": "Buscando actualizaciones...",
-	"DownloadingUpdate": "Descargando actualización...",
-	"installUpdate...": "Instalar la actualización de...",
-	"installingUpdate": "Instalando actualización...",
-	"restartToUpdate": "Reiniciar para actualizar..."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/url/electron-browser/url.contribution.i18n.json b/i18n/esn/src/vs/workbench/parts/url/electron-browser/url.contribution.i18n.json
deleted file mode 100644
index 5ce816dbcbe..00000000000
--- a/i18n/esn/src/vs/workbench/parts/url/electron-browser/url.contribution.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openUrl": "Abrir URL",
-	"developer": "Desarrollador"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/views/browser/views.i18n.json b/i18n/esn/src/vs/workbench/parts/views/browser/views.i18n.json
deleted file mode 100644
index f2487840d97..00000000000
--- a/i18n/esn/src/vs/workbench/parts/views/browser/views.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"viewToolbarAriaLabel": "{0} acciones",
-	"hideView": "Ocultar en la barra lateral"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/views/browser/viewsExtensionPoint.i18n.json b/i18n/esn/src/vs/workbench/parts/views/browser/viewsExtensionPoint.i18n.json
deleted file mode 100644
index e0975190eb1..00000000000
--- a/i18n/esn/src/vs/workbench/parts/views/browser/viewsExtensionPoint.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"requirearray": "views debe ser una mariz",
-	"requirestring": "la propiedad `{0}` es obligatoria y debe ser de tipo \"string\"",
-	"optstring": "la propiedad `{0}` se puede omitir o debe ser de tipo \"string\"",
-	"vscode.extension.contributes.view.id": "Identificador de la vista. Úselo para registrar un proveedor de datos mediante la API \"vscode.window.registerTreeDataProviderForView\". También para desencadenar la activación de su extensión al registrar el evento \"onView:${id}\" en \"activationEvents\".",
-	"vscode.extension.contributes.view.name": "Nombre de la vista en lenguaje natural. Será mostrado",
-	"vscode.extension.contributes.view.when": "Condición que se debe cumplir para mostrar esta vista",
-	"vscode.extension.contributes.views": "Aporta vistas al editor",
-	"views.explorer": "Vista del explorador",
-	"views.debug": "Vista de depuración",
-	"locationId.invalid": "`{0}` no es una ubicación de vista válida"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/watermark/electron-browser/watermark.i18n.json b/i18n/esn/src/vs/workbench/parts/watermark/electron-browser/watermark.i18n.json
deleted file mode 100644
index 74bc52bcd01..00000000000
--- a/i18n/esn/src/vs/workbench/parts/watermark/electron-browser/watermark.i18n.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"watermark.showCommands": "Mostrar todos los comandos",
-	"watermark.quickOpen": "Ir al archivo",
-	"watermark.openFile": "Abrir archivo",
-	"watermark.openFolder": "Abrir carpeta",
-	"watermark.openFileFolder": "Abrir archivo o carpeta",
-	"watermark.openRecent": "Abrir recientes",
-	"watermark.newUntitledFile": "Nuevo archivo sin título",
-	"watermark.toggleTerminal": "Alternar terminal",
-	"watermark.findInFiles": "Buscar en archivos",
-	"watermark.startDebugging": "Iniciar depuración",
-	"watermark.unboundCommand": "sin enlazar",
-	"workbenchConfigurationTitle": "Área de trabajo",
-	"tips.enabled": "Si esta opción está habilitada, se muestran sugerencias de marca de agua cuando no hay ningún editor abierto."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json b/i18n/esn/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json
deleted file mode 100644
index cfb3d21c72a..00000000000
--- a/i18n/esn/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"webview.editor.label": "Editor de vistas web",
-	"developer": "Desarrollador"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/webview/electron-browser/webviewCommands.i18n.json b/i18n/esn/src/vs/workbench/parts/webview/electron-browser/webviewCommands.i18n.json
deleted file mode 100644
index 760d6b600cd..00000000000
--- a/i18n/esn/src/vs/workbench/parts/webview/electron-browser/webviewCommands.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openToolsLabel": "Abrir herramientas de desarrollo de vistas web",
-	"refreshWebviewLabel": "Recargar vistas web"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json b/i18n/esn/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json
deleted file mode 100644
index 41dc2fce9fc..00000000000
--- a/i18n/esn/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"telemetryOptOut.optOutNotice": "Ayúdenos a mejorar VS Code permitiendo a Microsoft recopilar datos de uso. Lea nuestra [declaración de privacidad]({0}) y vea qué debe hacer para [no participar]({1}).",
-	"telemetryOptOut.optInNotice": "Ayúdenos a mejorar VS Code permitiendo a Microsoft recopilar datos de uso. Lea nuestra [declaración de privacidad]({0}) y vea qué debe hacer para [no participar]({1}).",
-	"telemetryOptOut.readMore": "Leer más"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/welcome/overlay/browser/welcomeOverlay.i18n.json b/i18n/esn/src/vs/workbench/parts/welcome/overlay/browser/welcomeOverlay.i18n.json
deleted file mode 100644
index 9df96460d57..00000000000
--- a/i18n/esn/src/vs/workbench/parts/welcome/overlay/browser/welcomeOverlay.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"welcomeOverlay.explorer": "Explorador de archivos",
-	"welcomeOverlay.search": "Buscar en todos los archivos",
-	"welcomeOverlay.git": "Administración de código fuente",
-	"welcomeOverlay.debug": "Iniciar y depurar",
-	"welcomeOverlay.extensions": "Administrar extensiones",
-	"welcomeOverlay.problems": "Ver errores y advertencias",
-	"welcomeOverlay.commandPalette": "Buscar y ejecutar todos los comandos",
-	"welcomeOverlay.notifications": "Mostrar notificaciones",
-	"welcomeOverlay": "Información general de la interfaz de usuario",
-	"hideWelcomeOverlay": "Ocultar información general de la interfaz",
-	"help": "Ayuda"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json b/i18n/esn/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
deleted file mode 100644
index 6b8a32ca0b9..00000000000
--- a/i18n/esn/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"welcomePage.vscode": "Visual Studio Code",
-	"welcomePage.editingEvolved": "Edición mejorada",
-	"welcomePage.start": "Iniciar",
-	"welcomePage.newFile": "Nuevo archivo",
-	"welcomePage.openFolder": "Abrir carpeta...",
-	"welcomePage.addWorkspaceFolder": "Agregar carpeta de espacio de trabajo...",
-	"welcomePage.recent": "Reciente",
-	"welcomePage.moreRecent": "Más...",
-	"welcomePage.noRecentFolders": "No hay ninguna carpeta reciente",
-	"welcomePage.help": "Ayuda",
-	"welcomePage.keybindingsCheatsheet": "Hoja imprimible con ayudas de teclado",
-	"welcomePage.introductoryVideos": "Vídeos de introducción",
-	"welcomePage.tipsAndTricks": "Sugerencias y trucos",
-	"welcomePage.productDocumentation": "Documentación del producto",
-	"welcomePage.gitHubRepository": "Repositorio de GitHub",
-	"welcomePage.stackOverflow": "Stack Overflow",
-	"welcomePage.showOnStartup": "Mostrar página principal al inicio",
-	"welcomePage.customize": "Personalizar",
-	"welcomePage.installExtensionPacks": "Herramientas y lenguajes",
-	"welcomePage.installExtensionPacksDescription": "Instalar soporte para {0} y {1}",
-	"welcomePage.moreExtensions": "más",
-	"welcomePage.installKeymapDescription": "Configuración y enlaces de teclado",
-	"welcomePage.installKeymapExtension": "Instalar la configuración y los métodos abreviados de teclado de {0} y {1}",
-	"welcomePage.others": "otros",
-	"welcomePage.colorTheme": "Tema de color",
-	"welcomePage.colorThemeDescription": "Modifique a su gusto la apariencia del editor y el código",
-	"welcomePage.learn": "Más información",
-	"welcomePage.showCommands": "Buscar y ejecutar todos los comandos",
-	"welcomePage.showCommandsDescription": "Acceda rápidamente y busque comandos desde la Paleta de Comandos ({0})",
-	"welcomePage.interfaceOverview": "Introducción a la interfaz",
-	"welcomePage.interfaceOverviewDescription": "Obtenga una superposición que resalta los componentes principales de la interfaz de usuario",
-	"welcomePage.interactivePlayground": "Área de juegos interactiva",
-	"welcomePage.interactivePlaygroundDescription": "Pruebe las características esenciales del editor en un tutorial corto"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.contribution.i18n.json b/i18n/esn/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.contribution.i18n.json
deleted file mode 100644
index dbd723b12f6..00000000000
--- a/i18n/esn/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.contribution.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"workbenchConfigurationTitle": "Área de trabajo",
-	"workbench.startupEditor.none": "Iniciar sin un editor.",
-	"workbench.startupEditor.welcomePage": "Abra la página de bienvenida (predeterminado).",
-	"workbench.startupEditor.newUntitledFile": "Abrir un nuevo archivo sin título.",
-	"workbench.startupEditor": "Controla qué editor se muestra al inicio, si no se restaura ninguno de la sesión anterior. Seleccione \"none\" para iniciar sin editor, \"welcomePage\" para abrir la página principal (opción predeterminada), \"newUntitledFile\" para abrir un archivo nuevo sin título (solo cuando se abre un área de trabajo vacía).",
-	"help": "Ayuda"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json b/i18n/esn/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json
deleted file mode 100644
index cafbdb24ad7..00000000000
--- a/i18n/esn/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"welcomePage": "Bienvenido",
-	"welcomePage.javaScript": "JavaScript",
-	"welcomePage.typeScript": "TypeScript",
-	"welcomePage.python": "Python",
-	"welcomePage.php": "PHP",
-	"welcomePage.azure": "Azure",
-	"welcomePage.showAzureExtensions": "Mostrar extensiones de Azure",
-	"welcomePage.docker": "Docker",
-	"welcomePage.vim": "Vim",
-	"welcomePage.sublime": "Sublime",
-	"welcomePage.atom": "Atom",
-	"welcomePage.extensionPackAlreadyInstalled": "El soporte para '{0}' ya está instalado.",
-	"welcomePage.willReloadAfterInstallingExtensionPack": "La ventana se volverá a cargar después de instalar compatibilidad adicional con {0}.",
-	"welcomePage.installingExtensionPack": "Instalando compatibilidad adicional con {0}...",
-	"welcomePage.extensionPackNotFound": "No se pudo encontrar el soporte para {0} con id {1}.",
-	"welcomePage.keymapAlreadyInstalled": "Los métodos abreviados de teclado {0} ya están instalados.",
-	"welcomePage.willReloadAfterInstallingKeymap": "La ventana se volverá a cargar después de instalar los métodos abreviados de teclado {0}.",
-	"welcomePage.installingKeymap": "Instalando los métodos abreviados de teclado de {0}...",
-	"welcomePage.keymapNotFound": "No se pudieron encontrar los métodos abreviados de teclado {0} con el identificador {1}.",
-	"welcome.title": "Bienvenido",
-	"welcomePage.openFolderWithPath": "Abrir la carpeta {0} con la ruta de acceso {1}",
-	"welcomePage.extensionListSeparator": ", ",
-	"welcomePage.installKeymap": "Instalar mapa de teclas de {0}",
-	"welcomePage.installExtensionPack": "Instalar compatibilidad adicional con {0}",
-	"welcomePage.installedKeymap": "El mapa de teclas de {0} ya está instalado",
-	"welcomePage.installedExtensionPack": "La compatibilidad con {0} ya está instalada",
-	"ok": "Aceptar",
-	"details": "Detalles",
-	"welcomePage.buttonBackground": "Color de fondo de los botones en la página principal.",
-	"welcomePage.buttonHoverBackground": "Color de fondo al mantener el mouse en los botones de la página principal."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/welcome/walkThrough/electron-browser/editor/editorWalkThrough.i18n.json b/i18n/esn/src/vs/workbench/parts/welcome/walkThrough/electron-browser/editor/editorWalkThrough.i18n.json
deleted file mode 100644
index 25444021c9d..00000000000
--- a/i18n/esn/src/vs/workbench/parts/welcome/walkThrough/electron-browser/editor/editorWalkThrough.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"editorWalkThrough.title": "Área de juegos interactiva",
-	"editorWalkThrough": "Área de juegos interactiva"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThrough.contribution.i18n.json b/i18n/esn/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThrough.contribution.i18n.json
deleted file mode 100644
index c3fe7cbdc74..00000000000
--- a/i18n/esn/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThrough.contribution.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"walkThrough.editor.label": "Área de juegos interactiva",
-	"help": "Ayuda"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughActions.i18n.json b/i18n/esn/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughActions.i18n.json
deleted file mode 100644
index 2df451c67ca..00000000000
--- a/i18n/esn/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughActions.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"editorWalkThrough.arrowUp": "Desplazar hacia arriba (línea)",
-	"editorWalkThrough.arrowDown": "Desplazar hacia abajo (línea)",
-	"editorWalkThrough.pageUp": "Desplazar hacia arriba (página)",
-	"editorWalkThrough.pageDown": "Desplazar hacia abajo (página)"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughPart.i18n.json b/i18n/esn/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughPart.i18n.json
deleted file mode 100644
index 7082f2fb973..00000000000
--- a/i18n/esn/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughPart.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"walkThrough.unboundCommand": "sin enlazar",
-	"walkThrough.gitNotFound": "Parece que GIT no está instalado en el sistema.",
-	"walkThrough.embeddedEditorBackground": "Color de fondo de los editores incrustrados en la área de juegos"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/services/actions/electron-browser/menusExtensionPoint.i18n.json b/i18n/esn/src/vs/workbench/services/actions/electron-browser/menusExtensionPoint.i18n.json
deleted file mode 100644
index 4f4bf42a65b..00000000000
--- a/i18n/esn/src/vs/workbench/services/actions/electron-browser/menusExtensionPoint.i18n.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"requirearray": "los elementos de menú deben ser una colección",
-	"requirestring": "la propiedad `{0}` es obligatoria y debe ser de tipo \"string\"",
-	"optstring": "la propiedad `{0}` se puede omitir o debe ser de tipo \"string\"",
-	"vscode.extension.contributes.menuItem.command": "El identificador del comando que se ejecutará. El comando se debe declarar en la sección 'commands'",
-	"vscode.extension.contributes.menuItem.alt": "El identificador de un comando alternativo que se usará. El comando se debe declarar en la sección 'commands'",
-	"vscode.extension.contributes.menuItem.when": "Condición que se debe cumplir para mostrar este elemento",
-	"vscode.extension.contributes.menuItem.group": "Grupo al que pertenece este comando",
-	"vscode.extension.contributes.menus": "Contribuye con elementos de menú al editor",
-	"menus.commandPalette": "La paleta de comandos",
-	"menus.touchBar": "Barra táctil (sólo macOS)",
-	"menus.editorTitle": "El menú de título del editor",
-	"menus.editorContext": "El menú contextual del editor",
-	"menus.explorerContext": "El menú contextual del explorador de archivos",
-	"menus.editorTabContext": "El menú contextual de pestañas del editor",
-	"menus.debugCallstackContext": "El menú contextual de la pila de llamadas de depuración",
-	"menus.scmTitle": "El menú del título Control de código fuente",
-	"menus.scmSourceControl": "El menú de control de código fuente",
-	"menus.resourceGroupContext": "El menú contextual del grupo de recursos de Control de código fuente",
-	"menus.resourceStateContext": "El menú contextual de estado de recursos de Control de código fuente",
-	"view.viewTitle": "El menú de título de vista contribuida",
-	"view.itemContext": "El menú contextual del elemento de vista contribuida",
-	"nonempty": "se esperaba un valor no vacío.",
-	"opticon": "la propiedad `icon` se puede omitir o debe ser una cadena o un literal como `{dark, light}`",
-	"requireStringOrObject": "La propiedad \"{0}\" es obligatoria y debe ser de tipo \"string\" u \"object\"",
-	"requirestrings": "Las propiedades \"{0}\" y \"{1}\" son obligatorias y deben ser de tipo \"string\"",
-	"vscode.extension.contributes.commandType.command": "Identificador del comando que se va a ejecutar",
-	"vscode.extension.contributes.commandType.title": "Título con el que se representa el comando en la interfaz de usuario",
-	"vscode.extension.contributes.commandType.category": "(Opcional) la cadena de categoría se agrupa por el comando en la interfaz de usuario",
-	"vscode.extension.contributes.commandType.icon": "(Opcional) El icono que se usa para representar el comando en la UI. Ya sea una ruta de acceso al archivo o una configuración con temas",
-	"vscode.extension.contributes.commandType.icon.light": "Ruta del icono cuando se usa un tema claro",
-	"vscode.extension.contributes.commandType.icon.dark": "Ruta del icono cuando se usa un tema oscuro",
-	"vscode.extension.contributes.commands": "Aporta comandos a la paleta de comandos.",
-	"dup": "El comando `{0}` aparece varias veces en la sección 'commands'.",
-	"menuId.invalid": "`{0}` no es un identificador de menú válido",
-	"missing.command": "El elemento de menú hace referencia a un comando `{0}` que no está definido en la sección 'commands'.",
-	"missing.altCommand": "El elemento de menú hace referencia a un comando alternativo `{0}` que no está definido en la sección 'commands'.",
-	"dupe.command": "El elemento de menú hace referencia al mismo comando que el comando predeterminado y el comando alternativo"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/services/bulkEdit/electron-browser/bulkEditService.i18n.json b/i18n/esn/src/vs/workbench/services/bulkEdit/electron-browser/bulkEditService.i18n.json
deleted file mode 100644
index 2aba6b00756..00000000000
--- a/i18n/esn/src/vs/workbench/services/bulkEdit/electron-browser/bulkEditService.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"summary.0": "No se realizaron ediciones",
-	"summary.nm": "{0} ediciones de texto en {1} archivos",
-	"summary.n0": "{0} ediciones de texto en un archivo",
-	"conflict": "Estos archivos han cambiado durante el proceso: {0}"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/services/configuration/common/configurationExtensionPoint.i18n.json b/i18n/esn/src/vs/workbench/services/configuration/common/configurationExtensionPoint.i18n.json
deleted file mode 100644
index a7a0c7035c6..00000000000
--- a/i18n/esn/src/vs/workbench/services/configuration/common/configurationExtensionPoint.i18n.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.contributes.configuration.title": "Resumen de la configuración. Esta etiqueta se usará en el archivo de configuración como comentario divisor.",
-	"vscode.extension.contributes.configuration.properties": "Descripción de las propiedades de configuración.",
-	"scope.application.description": "Configuración específica de la aplicación, que se establece en la Configuración de usuario.",
-	"scope.window.description": "Configuración específica para ventanas, que se puede definir en la configuración de usuario o de área de trabajo.",
-	"scope.resource.description": "Configuración específica para recursos, que se puede definir en la configuración de usuario, de área de trabajo o de carpeta.",
-	"scope.description": "Ámbito donde es aplicable la configuración. Los ámbitos disponibles son \"window\" y \"resource\".",
-	"vscode.extension.contributes.defaultConfiguration": "Contribuye a la configuración de los parámetros del editor predeterminados por lenguaje.",
-	"vscode.extension.contributes.configuration": "Aporta opciones de configuración.",
-	"invalid.title": "configuration.title debe ser una cadena",
-	"invalid.properties": "configuration.properties debe ser un objeto",
-	"invalid.property": "\"configuration.property\" debe ser un objeto",
-	"invalid.allOf": "'configuration.allOf' está en desuso y ya no debe ser utilizado. En cambio, pase varias secciones de configuración como un arreglo al punto de contribución 'configuration'.",
-	"workspaceConfig.folders.description": "Lista de carpetas para cargar en el área de trabajo. ",
-	"workspaceConfig.path.description": "Ruta de acceso de archivo; por ejemplo, \"/raíz/carpetaA\" o \"./carpetaA\" para una ruta de acceso de archivo que se resolverá respecto a la ubicación del archivo del área de trabajo.",
-	"workspaceConfig.name.description": "Un nombre opcional para la carpeta. ",
-	"workspaceConfig.uri.description": "URI de la carpeta",
-	"workspaceConfig.settings.description": "Configuración de área de trabajo",
-	"workspaceConfig.launch.description": "Configuraciones de lanzamiento del espacio de trabajo",
-	"workspaceConfig.extensions.description": "Extensiones del área de trabajo",
-	"unknownWorkspaceProperty": "Propiedad de configuración de espacio de trabajo desconocida"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/services/configuration/node/configuration.i18n.json b/i18n/esn/src/vs/workbench/services/configuration/node/configuration.i18n.json
deleted file mode 100644
index 7393d607455..00000000000
--- a/i18n/esn/src/vs/workbench/services/configuration/node/configuration.i18n.json
+++ /dev/null
@@ -1,24 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"vscode.extension.contributes.configuration.title": "Resumen de la configuración. Esta etiqueta se usará en el archivo de configuración como comentario divisor.",
-	"vscode.extension.contributes.configuration.properties": "Descripción de las propiedades de configuración.",
-	"scope.window.description": "Configuración específica para ventanas, que se puede definir en la configuración de usuario o de área de trabajo.",
-	"scope.resource.description": "Configuración específica para recursos, que se puede definir en la configuración de usuario, de área de trabajo o de carpeta.",
-	"scope.description": "Ámbito donde es aplicable la configuración. Los ámbitos disponibles son \"window\" y \"resource\".",
-	"vscode.extension.contributes.configuration": "Aporta opciones de configuración.",
-	"invalid.title": "configuration.title debe ser una cadena",
-	"vscode.extension.contributes.defaultConfiguration": "Contribuye a la configuración de los parámetros del editor predeterminados por lenguaje.",
-	"invalid.properties": "configuration.properties debe ser un objeto",
-	"invalid.allOf": "'configuration.allOf' está en desuso y ya no debe ser utilizado. En cambio, pasar varias secciones de configuración como una matriz al punto de contribución de 'configuración'.",
-	"workspaceConfig.folders.description": "Lista de carpetas para cargar en el área de trabajo. ",
-	"workspaceConfig.path.description": "Ruta de acceso de archivo; por ejemplo, \"/raíz/carpetaA\" o \"./carpetaA\" para una ruta de acceso de archivo que se resolverá respecto a la ubicación del archivo del área de trabajo.",
-	"workspaceConfig.name.description": "Un nombre opcional para la carpeta. ",
-	"workspaceConfig.uri.description": "URI de la carpeta",
-	"workspaceConfig.settings.description": "Configuración de área de trabajo",
-	"workspaceConfig.extensions.description": "Extensiones del área de trabajo",
-	"unknownWorkspaceProperty": "Propiedad de configuración de espacio de trabajo desconocida"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json b/i18n/esn/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
deleted file mode 100644
index 532a6558111..00000000000
--- a/i18n/esn/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openTasksConfiguration": "Abrir configuración de tareas",
-	"openLaunchConfiguration": "Abrir configuración de inicio",
-	"open": "Abrir configuración",
-	"saveAndRetry": "Guardar y reintentar",
-	"errorUnknownKey": "No se puede escribir en {0} porque {1} no es una configuración registrada.",
-	"errorInvalidWorkspaceConfigurationApplication": "No se puede escribir {0} en Configuración de área de trabajo; solo se puede escribir en Configuración de usuario.",
-	"errorInvalidFolderConfiguration": "No se puede escribir en Configuración de carpeta porque {0} no admite el ámbito del recurso de carpeta.",
-	"errorInvalidUserTarget": "No se puede escribir en Configuración de usuario porque {0} no admite el ámbito global.",
-	"errorInvalidWorkspaceTarget": "No se puede escribir a la configuración del espacio de trabajo porque {0} no soporta a un espacio de trabajo con multi carpetas.",
-	"errorInvalidFolderTarget": "No se puede escribir en Configuración de carpeta porque no se ha proporcionado ningún recurso.",
-	"errorNoWorkspaceOpened": "No se puede escribir en {0} porque no hay ninguna área de trabajo abierta. Abra un área de trabajo y vuelva a intentarlo.",
-	"errorInvalidTaskConfiguration": "No se puede escribir en el archivo de configuración de tareas. Por favor, ábralo para corregir sus errores/advertencias e inténtelo de nuevo.",
-	"errorInvalidLaunchConfiguration": "No se puede escribir en el archivo de configuración de inicio. Ábralo para corregir los posibles errores o advertencias que tenga y vuelva a intentarlo.",
-	"errorInvalidConfiguration": "No se puede escribir en la configuración de usuario. Ábrala para corregir los posibles errores o advertencias que tenga y vuelva a intentarlo.",
-	"errorInvalidConfigurationWorkspace": "No se puede escribir en la configuración del área de trabajo. Por favor, abra la configuración del área de trabajo para corregir los errores/advertencias en el archivo e inténtelo de nuevo.",
-	"errorInvalidConfigurationFolder": "No se puede escribir en la configuración de carpeta. Abra la configuración de la carpeta \"{0}\" para corregir los posibles errores o advertencias que tenga y vuelva a intentarlo.",
-	"errorTasksConfigurationFileDirty": "No se puede escribir en el archivo de configuración de tareas porque se ha modificado. Guarde primero el archivo y vuelva a intentarlo.",
-	"errorLaunchConfigurationFileDirty": "No se puede escribir en el archivo de configuración de inicio porque se ha modificado. Guarde primero el archivo y vuelva a intentarlo.",
-	"errorConfigurationFileDirty": "No se puede escribir en el archivo de configuración de usuario porque se ha modificado. Guarde primero el archivo y vuelva a intentarlo.",
-	"errorConfigurationFileDirtyWorkspace": "No se puede escribir en el archivo de configuración del área de trabajo porque se ha modificado. Guarde primero el archivo y vuelva a intentarlo.",
-	"errorConfigurationFileDirtyFolder": "No se puede escribir en el archivo de configuración de carpeta porque se ha modificado. Guarde primero el archivo de configuración de la carpeta \"{0}\" y vuelva a intentarlo.",
-	"userTarget": "Configuración de usuario",
-	"workspaceTarget": "Configuración de área de trabajo",
-	"folderTarget": "Configuración de carpeta"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/services/configuration/node/configurationService.i18n.json b/i18n/esn/src/vs/workbench/services/configuration/node/configurationService.i18n.json
deleted file mode 100644
index ffff1d2f783..00000000000
--- a/i18n/esn/src/vs/workbench/services/configuration/node/configurationService.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"unsupportedApplicationSetting": "Este valor solo puede aplicarse en Configuración de usuario",
-	"unsupportedWindowSetting": "Este valor no se puede aplicar ahora. Se aplicará cuando abra esta carpeta directamente."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/services/configuration/node/jsonEditingService.i18n.json b/i18n/esn/src/vs/workbench/services/configuration/node/jsonEditingService.i18n.json
deleted file mode 100644
index 55e16aec92f..00000000000
--- a/i18n/esn/src/vs/workbench/services/configuration/node/jsonEditingService.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"errorInvalidFile": "No se puede escribir en el archivo. Abra el archivo para corregir los errores o advertencias y vuelva a intentarlo.",
-	"errorFileDirty": "No se puede escribir en el archivo porque se ha modificado. Guarde el archivo y vuelva a intentarlo."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json b/i18n/esn/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
deleted file mode 100644
index 8e6bbb15ccc..00000000000
--- a/i18n/esn/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"stringsOnlySupported": "El comando {0} no devolvió un resultado de cadena. Sólo se admiten cadenas como resultados para los comandos utilizados para la sustitución de variables."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/services/configurationResolver/node/variableResolver.i18n.json b/i18n/esn/src/vs/workbench/services/configurationResolver/node/variableResolver.i18n.json
deleted file mode 100644
index e96af7d884a..00000000000
--- a/i18n/esn/src/vs/workbench/services/configurationResolver/node/variableResolver.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"missingEnvVarName": "'{0}' no puede resolverse porque no se asignó nombre de variable de entorno. ",
-	"configNotFound": "'{0}' puede no resolverse porque la configuración '{1}' no fué encontrada. ",
-	"configNoString": "\"{0}\" no se puede resolver porque \"{1}\" es un valor estructurado.",
-	"missingConfigName": "'{0}' no puede resolverse porque no tiene asignado un nombre de configuración . ",
-	"noValueForCommand": "{0} ' no se puede resolver porque el comando no tiene ningún valor.",
-	"canNotFindFolder": "' {0} ' no se puede resolver. No existe la carpeta ' {1} '.",
-	"canNotResolveWorkspaceFolderMultiRoot": "'{0}' no puede ser resuelto en un espacio de trabajo multicarpeta. Defina el alcance de esta variable utilizando ':' y un nombre de carpeta del espacio de trabajo. ",
-	"canNotResolveWorkspaceFolder": "\"{0}\" no se puede resolver. Abra una carpeta.",
-	"canNotResolveFile": "'{0}' no puede resolver. Por favor, abra un editor.",
-	"canNotResolveLineNumber": "' {0} ' no se puede resolver. Asegúrese de tener una línea seleccionada en el editor activo.",
-	"canNotResolveSelectedText": "' {0} ' no se puede resolver. Asegúrese de tener un texto seleccionado en el editor activo."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/services/crashReporter/common/crashReporterService.i18n.json b/i18n/esn/src/vs/workbench/services/crashReporter/common/crashReporterService.i18n.json
deleted file mode 100644
index fb3b052d7b4..00000000000
--- a/i18n/esn/src/vs/workbench/services/crashReporter/common/crashReporterService.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"telemetryConfigurationTitle": "Telemetría",
-	"telemetry.enableCrashReporting": "Habilite los informes de bloqueo para enviarlos a Microsoft. Esta opción requiere reiniciar para que tenga efecto."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/services/crashReporter/electron-browser/crashReporterService.i18n.json b/i18n/esn/src/vs/workbench/services/crashReporter/electron-browser/crashReporterService.i18n.json
deleted file mode 100644
index 7955e42fe6c..00000000000
--- a/i18n/esn/src/vs/workbench/services/crashReporter/electron-browser/crashReporterService.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"telemetryConfigurationTitle": "Telemetría",
-	"telemetry.enableCrashReporting": "Habilite los informes de bloqueo para enviarlos a Microsoft. Esta opción requiere reiniciar para que tenga efecto."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/services/decorations/browser/decorationsService.i18n.json b/i18n/esn/src/vs/workbench/services/decorations/browser/decorationsService.i18n.json
deleted file mode 100644
index 3534ad46494..00000000000
--- a/i18n/esn/src/vs/workbench/services/decorations/browser/decorationsService.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"bubbleTitle": "Contiene elementos resaltados"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json b/i18n/esn/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json
deleted file mode 100644
index f78002ce65e..00000000000
--- a/i18n/esn/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"yesButton": "&&Sí",
-	"cancelButton": "Cancelar"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/services/dialogs/electron-browser/dialogs.i18n.json b/i18n/esn/src/vs/workbench/services/dialogs/electron-browser/dialogs.i18n.json
deleted file mode 100644
index c28fe4eba7b..00000000000
--- a/i18n/esn/src/vs/workbench/services/dialogs/electron-browser/dialogs.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"yesButton": "&&Sí",
-	"cancelButton": "Cancelar",
-	"moreFile": "...1 archivo más que no se muestra",
-	"moreFiles": "...{0} archivos más que no se muestran"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/services/editor/browser/editorService.i18n.json b/i18n/esn/src/vs/workbench/services/editor/browser/editorService.i18n.json
deleted file mode 100644
index 50e968f8ee3..00000000000
--- a/i18n/esn/src/vs/workbench/services/editor/browser/editorService.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"compareLabels": "{0} ↔ {1}"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/services/editor/common/editorService.i18n.json b/i18n/esn/src/vs/workbench/services/editor/common/editorService.i18n.json
deleted file mode 100644
index ca1ee0161c1..00000000000
--- a/i18n/esn/src/vs/workbench/services/editor/common/editorService.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"compareLabels": "{0} ↔ {1}"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/services/extensions/common/extensionsRegistry.i18n.json b/i18n/esn/src/vs/workbench/services/extensions/common/extensionsRegistry.i18n.json
deleted file mode 100644
index 314e93bb520..00000000000
--- a/i18n/esn/src/vs/workbench/services/extensions/common/extensionsRegistry.i18n.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.engines": "Compatibilidad del motor.",
-	"vscode.extension.engines.vscode": "Para las extensiones de VS Code, especifica la versión de VS Code con la que la extensión es compatible. No puede ser *. Por ejemplo: ^0.10.5 indica compatibilidad con una versión de VS Code mínima de 0.10.5.",
-	"vscode.extension.publisher": "El publicador de la extensión VS Code.",
-	"vscode.extension.displayName": "Nombre para mostrar de la extensión que se usa en la galería de VS Code.",
-	"vscode.extension.categories": "Categorías que usa la galería de VS Code para clasificar la extensión.",
-	"vscode.extension.category.languages.deprecated": "Utilice 'Lenguajes de programación' en su lugar ",
-	"vscode.extension.galleryBanner": "Banner usado en VS Code Marketplace.",
-	"vscode.extension.galleryBanner.color": "Color del banner en el encabezado de página de VS Code Marketplace.",
-	"vscode.extension.galleryBanner.theme": "Tema de color de la fuente que se usa en el banner.",
-	"vscode.extension.contributes": "Todas las contribuciones de la extensión VS Code representadas por este paquete.",
-	"vscode.extension.preview": "Establece la extensión que debe marcarse como versión preliminar en Marketplace.",
-	"vscode.extension.activationEvents": "Eventos de activación de la extensión VS Code.",
-	"vscode.extension.activationEvents.onLanguage": "Un evento de activación emitido cada vez que se abre un archivo que se resuelve en el idioma especificado.",
-	"vscode.extension.activationEvents.onCommand": "Un evento de activación emitido cada vez que se invoca el comando especificado.",
-	"vscode.extension.activationEvents.onDebug": "Un evento de activación emitido cada vez que un usuario está a punto de iniciar la depuración o cada vez que está a punto de configurar las opciones de depuración.",
-	"vscode.extension.activationEvents.onDebugInitialConfigurations": "Un evento de activación emitido cada vez que se necesite crear un \"launch.json\" (y se necesite llamar a todos los métodos provideDebugConfigurations).",
-	"vscode.extension.activationEvents.onDebugResolve": "Un evento de activación emitido cada vez que esté a punto de ser iniciada una sesión de depuración con el tipo específico (y se necesite llamar al método resolveDebugConfiguration correspondiente).",
-	"vscode.extension.activationEvents.workspaceContains": "Un evento de activación emitido cada vez que se abre una carpeta que contiene al menos un archivo que coincide con el patrón global especificado.",
-	"vscode.extension.activationEvents.onView": "Un evento de activación emitido cada vez que se expande la vista especificada.",
-	"vscode.extension.activationEvents.onUri": "Se emite un evento de activación siempre cuando se abre un identificador URI de todo el sistema dirigido hacia esta extensión.",
-	"vscode.extension.activationEvents.star": "Un evento de activación emitido al inicio de VS Code. Para garantizar una buena experiencia para el usuario final, use este evento de activación en su extensión solo cuando no le sirva ninguna otra combinación de eventos de activación en su caso.",
-	"vscode.extension.badges": "Matriz de distintivos que se muestran en la barra lateral de la página de extensiones de Marketplace.",
-	"vscode.extension.badges.url": "URL de la imagen del distintivo.",
-	"vscode.extension.badges.href": "Vínculo del distintivo.",
-	"vscode.extension.badges.description": "Descripción del distintivo.",
-	"vscode.extension.markdown": "Controla el motor de renderizado de Markdown utilizado en el Marketplace. Github (por defecto) o estándar.",
-	"vscode.extension.qna": "Controla el enlace Q&A en el Marketplace. Establézcalo a marketplace para habilitar el sitio web Q&A de Marketplace. Establézcalo a una cadena para proporcionar la dirección URL de un sitio web Q&A personalizado. Establézcalo en falso para deshabilitar el Q&A totalmente. ",
-	"vscode.extension.extensionDependencies": "Dependencias a otras extensiones. El identificador de una extensión siempre es ${publisher}.${name}. Por ejemplo: vscode.csharp.",
-	"vscode.extension.scripts.prepublish": "Script que se ejecuta antes de publicar el paquete como extensión VS Code.",
-	"vscode.extension.scripts.uninstall": "Enlace de desinstalación para la extensión de VS Code. Script que se ejecuta cuando la extensión se ha desinstalado por completo de VS Code, que es cuando VS Code se reinicia (se cierra y se inicia) después de haberse desinstalado la extensión. Solo se admiten scripts de Node.",
-	"vscode.extension.icon": "Ruta de acceso a un icono de 128 x 128 píxeles."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/services/extensions/electron-browser/extensionHost.i18n.json b/i18n/esn/src/vs/workbench/services/extensions/electron-browser/extensionHost.i18n.json
deleted file mode 100644
index 1678dd22714..00000000000
--- a/i18n/esn/src/vs/workbench/services/extensions/electron-browser/extensionHost.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"extensionHostProcess.startupFailDebug": "El host de extensiones no se inició en 10 segundos, puede que se detenga en la primera línea y necesita un depurador para continuar.",
-	"extensionHostProcess.startupFail": "El host de extensiones no se inició en 10 segundos, lo cual puede ser un problema.",
-	"reloadWindow": "Recargar ventana",
-	"extensionHostProcess.error": "Error del host de extensiones: {0}"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/services/extensions/electron-browser/extensionHostProfiler.i18n.json b/i18n/esn/src/vs/workbench/services/extensions/electron-browser/extensionHostProfiler.i18n.json
deleted file mode 100644
index 00c836be4c5..00000000000
--- a/i18n/esn/src/vs/workbench/services/extensions/electron-browser/extensionHostProfiler.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"message": "Perfiles del Host de Extensiones $(zap)... "
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/services/extensions/electron-browser/extensionPoints.i18n.json b/i18n/esn/src/vs/workbench/services/extensions/electron-browser/extensionPoints.i18n.json
deleted file mode 100644
index 007b1debf5b..00000000000
--- a/i18n/esn/src/vs/workbench/services/extensions/electron-browser/extensionPoints.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"jsonParseFail": "No se pudo analizar {0}: {1}.",
-	"fileReadFail": "No se puede leer el archivo {0}: {1}.",
-	"jsonsParseReportErrors": "No se pudo analizar {0}: {1}.",
-	"missingNLSKey": "No se encontró un mensaje para la clave {0}."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json b/i18n/esn/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json
deleted file mode 100644
index e86398fcbf2..00000000000
--- a/i18n/esn/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"extensionsDisabled": "Todas las extensiones están deshabilitadas.",
-	"extensionHostProcess.crash": "El host de extensiones finalizó inesperadamente.",
-	"extensionHostProcess.unresponsiveCrash": "Se terminó el host de extensiones porque no respondía.",
-	"devTools": "Abrir herramientas de desarrollo",
-	"restart": "Reiniciar el host de extensiones",
-	"overwritingExtension": "Sobrescribiendo la extensión {0} con {1}.",
-	"extensionUnderDevelopment": "Cargando la extensión de desarrollo en {0}",
-	"extensionCache.invalid": "Las extensiones han sido modificadas en disco. Por favor, vuelva a cargar la ventana.",
-	"reloadWindow": "Recargar ventana"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/services/extensions/node/extensionPoints.i18n.json b/i18n/esn/src/vs/workbench/services/extensions/node/extensionPoints.i18n.json
deleted file mode 100644
index ccd38b37b43..00000000000
--- a/i18n/esn/src/vs/workbench/services/extensions/node/extensionPoints.i18n.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"jsonParseFail": "No se pudo analizar {0}: {1}.",
-	"fileReadFail": "No se puede leer el archivo {0}: {1}.",
-	"jsonsParseReportErrors": "No se pudo analizar {0}: {1}.",
-	"missingNLSKey": "No se encontró un mensaje para la clave {0}.",
-	"notSemver": "La versión de la extensión no es compatible con semver.",
-	"extensionDescription.empty": "Se obtuvo una descripción vacía de la extensión.",
-	"extensionDescription.publisher": "la propiedad `{0}` es obligatoria y debe ser de tipo \"string\"",
-	"extensionDescription.name": "la propiedad `{0}` es obligatoria y debe ser de tipo \"string\"",
-	"extensionDescription.version": "la propiedad `{0}` es obligatoria y debe ser de tipo \"string\"",
-	"extensionDescription.engines": "la propiedad `{0}` es obligatoria y debe ser de tipo \"object\"",
-	"extensionDescription.engines.vscode": "la propiedad `{0}` es obligatoria y debe ser de tipo \"string\"",
-	"extensionDescription.extensionDependencies": "la propiedad `{0}` se puede omitir o debe ser de tipo \"string[]\"",
-	"extensionDescription.activationEvents1": "la propiedad `{0}` se puede omitir o debe ser de tipo \"string[]\"",
-	"extensionDescription.activationEvents2": "las propiedades `{0}` y `{1}` deben especificarse u omitirse conjuntamente",
-	"extensionDescription.main1": "la propiedad `{0}` se puede omitir o debe ser de tipo \"string\"",
-	"extensionDescription.main2": "Se esperaba que \"main\" ({0}) se hubiera incluido en la carpeta de la extensión ({1}). Esto puede hacer que la extensión no sea portátil.",
-	"extensionDescription.main3": "las propiedades `{0}` y `{1}` deben especificarse u omitirse conjuntamente"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/services/files/electron-browser/fileService.i18n.json b/i18n/esn/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
deleted file mode 100644
index 36c012260a5..00000000000
--- a/i18n/esn/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"netVersionError": "Requiere Microsoft .NET Framework 4.5. Siga el vínculo para instalarlo.",
-	"installNet": "Descargar .NET Framework 4.5",
-	"neverShowAgain": "No volver a mostrar",
-	"enospcError": "{0} es incapaz de observar los cambios de los archivos en este espacio de trabajo tan grande. Por favor siga las instrucciones en el link para resolver este problema.",
-	"learnMore": "Instrucciones",
-	"fileInvalidPath": "Recurso de archivo no válido ({0})",
-	"fileIsDirectoryError": "El archivo es un directorio",
-	"fileNotModifiedError": "Archivo no modificado desde",
-	"fileTooLargeForHeapError": "Para abrir un archivo de este tamaño, es necesario reiniciar VS Code y permitirle utilizar más memoria",
-	"fileTooLargeError": "Archivo demasiado grande para abrirlo",
-	"fileNotFoundError": "Archivo no encontrado ({0})",
-	"fileBinaryError": "El archivo parece ser binario y no se puede abrir como texto",
-	"filePermission": "Permiso denegado al escribir en el archivo ({0})",
-	"fileExists": "El archivo a crear ya existe ({0})",
-	"fileModifiedError": "Archivo Modificado Desde",
-	"fileReadOnlyError": "El archivo es de solo lectura",
-	"fileMoveConflict": "No se puede mover o copiar. El archivo ya existe en la ubicación de destino. ",
-	"unableToMoveCopyError": "No se puede mover o copiar. El archivo reemplazaría a la carpeta que lo contiene.",
-	"binFailed": "No se pudo mover \"{0}\" a la papelera de reciclaje",
-	"trashFailed": "No se pudo mover '{0}' a la papelera"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json b/i18n/esn/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
deleted file mode 100644
index 4b86e7ab277..00000000000
--- a/i18n/esn/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"invalidPath": "La ruta de acceso del recurso \"{0}\" debe ser absoluta.",
-	"fileNotFoundError": "Archivo no encontrado ({0})",
-	"fileIsDirectoryError": "El archivo es un directorio",
-	"fileNotModifiedError": "Archivo no modificado desde",
-	"fileBinaryError": "El archivo parece ser binario y no se puede abrir como texto",
-	"err.create": "No se pudo crear el archivo {0}",
-	"fileMoveConflict": "No se puede mover o copiar. El archivo ya existe en la ubicación de destino. "
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/services/files/node/fileService.i18n.json b/i18n/esn/src/vs/workbench/services/files/node/fileService.i18n.json
deleted file mode 100644
index 69847e82751..00000000000
--- a/i18n/esn/src/vs/workbench/services/files/node/fileService.i18n.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"fileInvalidPath": "Recurso de archivo no válido ({0})",
-	"fileIsDirectoryError": "Archivo es el directorio",
-	"fileNotModifiedError": "Archivo no modificado desde",
-	"fileTooLargeError": "Archivo demasiado grande para abrirlo",
-	"fileNotFoundError": "Archivo no encontrado ({0})",
-	"fileBinaryError": "El archivo parece ser binario y no se puede abrir como texto",
-	"filePermission": "Permiso denegado al escribir en el archivo ({0})",
-	"fileExists": "El archivo a crear ya existe ({0})",
-	"fileMoveConflict": "No se puede mover o copiar. El archivo ya existe en la ubicación de destino. ",
-	"unableToMoveCopyError": "No se puede mover o copiar. El archivo reemplazaría a la carpeta que lo contiene.",
-	"foldersCopyError": "No se pueden copiar carpetas en el área de trabajo. Seleccione archivos individuales para copiarlos.",
-	"fileModifiedError": "Archivo Modificado Desde",
-	"fileReadOnlyError": "El archivo es de solo lectura"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/services/jsonschemas/common/jsonValidationExtensionPoint.i18n.json b/i18n/esn/src/vs/workbench/services/jsonschemas/common/jsonValidationExtensionPoint.i18n.json
deleted file mode 100644
index 526cfc2561e..00000000000
--- a/i18n/esn/src/vs/workbench/services/jsonschemas/common/jsonValidationExtensionPoint.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"contributes.jsonValidation": "Aporta la configuración del esquema JSON.",
-	"contributes.jsonValidation.fileMatch": "Patrón de archivo para buscar coincidencias, por ejemplo, \"package.json\" o \"*.launch\".",
-	"contributes.jsonValidation.url": "Dirección URL de esquema ('http:', 'https:') o ruta de acceso relativa a la carpeta de extensión ('./').",
-	"invalid.jsonValidation": "configuration.jsonValidation debe ser una matriz",
-	"invalid.fileMatch": "configuration.jsonValidation.fileMatch debe haberse definido",
-	"invalid.url": "configuration.jsonValidation.url debe ser una dirección URL o una ruta de acceso relativa",
-	"invalid.url.fileschema": "configuration.jsonValidation.url es una dirección URL relativa no válida: {0}",
-	"invalid.url.schema": "configuration.jsonValidation.url debe empezar por \"http:\", \"https:\" o \"./\" para hacer referencia a los esquemas ubicados en la extensión"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/services/keybinding/common/keybindingEditing.i18n.json b/i18n/esn/src/vs/workbench/services/keybinding/common/keybindingEditing.i18n.json
deleted file mode 100644
index e8771583d1c..00000000000
--- a/i18n/esn/src/vs/workbench/services/keybinding/common/keybindingEditing.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"errorKeybindingsFileDirty": "No se puede escribir porque el archivo de configuración KeyBindings se ha modificado. Guarde el archivo y vuelva a intentarlo.",
-	"parseErrors": "No se puede escribir en el archivo de configuración KeyBindings. Abra el archivo para corregir los errores/advertencias e inténtelo otra vez.",
-	"errorInvalidConfiguration": "No se puede escribir en el archivo de configuración KeyBindings. Tiene un objeto que no es de tipo Array. Abra el archivo para corregirlo y vuelva a intentarlo.",
-	"emptyKeybindingsHeader": "Coloque sus enlaces de teclado en este archivo para sobrescribir los valores predeterminados."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/services/keybinding/electron-browser/keybindingService.i18n.json b/i18n/esn/src/vs/workbench/services/keybinding/electron-browser/keybindingService.i18n.json
deleted file mode 100644
index 88e7b244001..00000000000
--- a/i18n/esn/src/vs/workbench/services/keybinding/electron-browser/keybindingService.i18n.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"nonempty": "se esperaba un valor no vacío.",
-	"requirestring": "la propiedad `{0}` es obligatoria y debe ser de tipo \"string\"",
-	"optstring": "la propiedad `{0}` se puede omitir o debe ser de tipo \"string\"",
-	"vscode.extension.contributes.keybindings.command": "Identificador del comando que se va a ejecutar cuando se desencadena el enlace de teclado.",
-	"vscode.extension.contributes.keybindings.key": "Tecla o secuencia de teclas (las teclas se separan con el signo más y las secuencias con un espacio, por ejemplo, Ctrl+O y Ctrl+L L para una presión simultánea).",
-	"vscode.extension.contributes.keybindings.mac": "Tecla o secuencia de teclas específica de Mac.",
-	"vscode.extension.contributes.keybindings.linux": "Tecla o secuencia de teclas específica de Linux.",
-	"vscode.extension.contributes.keybindings.win": "Tecla o secuencia de teclas específica de Windows.",
-	"vscode.extension.contributes.keybindings.when": "Condición cuando la tecla está activa.",
-	"vscode.extension.contributes.keybindings": "Aporta enlaces de teclado.",
-	"invalid.keybindings": "Valor de \"contributes.{0}\" no válido: {1}",
-	"unboundCommands": "Aquí hay otros comandos disponibles: ",
-	"keybindings.json.title": "Configuración de enlaces de teclado",
-	"keybindings.json.key": "Tecla o secuencia de teclas (separadas por un espacio)",
-	"keybindings.json.command": "Nombre del comando que se va a ejecutar",
-	"keybindings.json.when": "Condición cuando la tecla está activa.",
-	"keybindings.json.args": "Argumentos que se pasan al comando para ejecutar.",
-	"keyboardConfigurationTitle": "Teclado",
-	"dispatch": "Controla la lógica de distribución de las pulsaciones de teclas para usar `code` (recomendado) o `keyCode`.",
-	"touchbar.enabled": "Habilita los botones de macOS Touchbar en el teclado si están disponibles."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/services/message/browser/messageList.i18n.json b/i18n/esn/src/vs/workbench/services/message/browser/messageList.i18n.json
deleted file mode 100644
index 041273b2afb..00000000000
--- a/i18n/esn/src/vs/workbench/services/message/browser/messageList.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"alertErrorMessage": "Error: {0}",
-	"alertWarningMessage": "Advertencia: {0}",
-	"alertInfoMessage": "Información: {0}",
-	"error": "Error",
-	"warning": "Advertencia",
-	"info": "Información",
-	"close": "Cerrar"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/services/message/electron-browser/messageService.i18n.json b/i18n/esn/src/vs/workbench/services/message/electron-browser/messageService.i18n.json
deleted file mode 100644
index f78002ce65e..00000000000
--- a/i18n/esn/src/vs/workbench/services/message/electron-browser/messageService.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"yesButton": "&&Sí",
-	"cancelButton": "Cancelar"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/services/mode/common/workbenchModeService.i18n.json b/i18n/esn/src/vs/workbench/services/mode/common/workbenchModeService.i18n.json
deleted file mode 100644
index 8ba0b522320..00000000000
--- a/i18n/esn/src/vs/workbench/services/mode/common/workbenchModeService.i18n.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.contributes.languages": "Aporta declaraciones de lenguaje.",
-	"vscode.extension.contributes.languages.id": "Identificador del lenguaje.",
-	"vscode.extension.contributes.languages.aliases": "Alias de nombre para el lenguaje.",
-	"vscode.extension.contributes.languages.extensions": "Extensiones de archivo asociadas al lenguaje.",
-	"vscode.extension.contributes.languages.filenames": "Nombres de archivo asociados al lenguaje.",
-	"vscode.extension.contributes.languages.filenamePatterns": "Patrones globales de nombre de archivo asociados al lenguaje.",
-	"vscode.extension.contributes.languages.mimetypes": "Tipos MIME asociados al lenguaje.",
-	"vscode.extension.contributes.languages.firstLine": "Expresión regular que coincide con la primera línea de un archivo del lenguaje.",
-	"vscode.extension.contributes.languages.configuration": "Ruta de acceso relativa a un archivo que contiene opciones de configuración para el lenguaje.",
-	"invalid": "Elemento \"contributes.{0}\" no válido. Se esperaba una matriz.",
-	"invalid.empty": "Valor vacío para \"contributes.{0}\"",
-	"require.id": "la propiedad `{0}` es obligatoria y debe ser de tipo \"string\"",
-	"opt.extensions": "la propiedad `{0}` se puede omitir y debe ser de tipo \"string[]\"",
-	"opt.filenames": "la propiedad `{0}` se puede omitir y debe ser de tipo \"string[]\"",
-	"opt.firstLine": "la propiedad `{0}` se puede omitir y debe ser de tipo \"string\"",
-	"opt.configuration": "la propiedad `{0}` se puede omitir y debe ser de tipo \"string\"",
-	"opt.aliases": "la propiedad `{0}` se puede omitir y debe ser de tipo \"string[]\"",
-	"opt.mimetypes": "la propiedad `{0}` se puede omitir y debe ser de tipo \"string[]\""
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/services/progress/browser/progressService2.i18n.json b/i18n/esn/src/vs/workbench/services/progress/browser/progressService2.i18n.json
deleted file mode 100644
index 07bc99d803d..00000000000
--- a/i18n/esn/src/vs/workbench/services/progress/browser/progressService2.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"progress.subtitle": "{0} - {1} ",
-	"progress.title": "{0}: {1}",
-	"cancel": "Cancelar"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/services/textMate/electron-browser/TMGrammars.i18n.json b/i18n/esn/src/vs/workbench/services/textMate/electron-browser/TMGrammars.i18n.json
deleted file mode 100644
index bc5ecccc178..00000000000
--- a/i18n/esn/src/vs/workbench/services/textMate/electron-browser/TMGrammars.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.contributes.grammars": "Aporta tokenizadores de TextMate.",
-	"vscode.extension.contributes.grammars.language": "Identificador del lenguaje para el que se aporta esta sintaxis.",
-	"vscode.extension.contributes.grammars.scopeName": "Nombre del ámbito de TextMate que usa el archivo tmLanguage.",
-	"vscode.extension.contributes.grammars.path": "Ruta de acceso del archivo tmLanguage. La ruta es relativa a la carpeta de extensión y normalmente empieza por \"./syntaxes/\".",
-	"vscode.extension.contributes.grammars.embeddedLanguages": "Asignación de un nombre de ámbito al identificador de lenguaje si esta gramática contiene lenguajes incrustados.",
-	"vscode.extension.contributes.grammars.tokenTypes": "Asignación de nombre de ámbito a tipos de token.",
-	"vscode.extension.contributes.grammars.injectTo": "Lista de nombres de ámbito de lenguaje al que se inyecta esta gramática."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/services/textMate/electron-browser/TMSyntax.i18n.json b/i18n/esn/src/vs/workbench/services/textMate/electron-browser/TMSyntax.i18n.json
deleted file mode 100644
index 52477cab338..00000000000
--- a/i18n/esn/src/vs/workbench/services/textMate/electron-browser/TMSyntax.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"invalid.language": "Lenguaje desconocido en \"contributes.{0}.language\". Valor proporcionado: {1}",
-	"invalid.scopeName": "Se esperaba una cadena en \"contributes.{0}.scopeName\". Valor proporcionado: {1}",
-	"invalid.path.0": "Se esperaba una cadena en \"contributes.{0}.path\". Valor proporcionado: {1}",
-	"invalid.injectTo": "Valor no válido en `contributes.{0}.injectTo`. Debe ser una matriz de nombres de ámbito de lenguaje. Valor proporcionado: {1}",
-	"invalid.embeddedLanguages": "Valor no válido en \"contributes.{0}.embeddedLanguages\". Debe ser una asignación de objeto del nombre del ámbito al lenguaje. Valor proporcionado: {1}",
-	"invalid.tokenTypes": "Valor no válido en \"contributes.{0}.tokenTypes\". Debe ser una asignación de objeto del nombre del ámbito al tipo de token. Valor proporcionado: {1}",
-	"invalid.path.1": "Se esperaba que \"contributes.{0}.path\" ({1}) se incluyera en la carpeta de la extensión ({2}). Esto puede hacer que la extensión no sea portátil.",
-	"no-tm-grammar": "No hay ninguna gramática de TM registrada para este lenguaje."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/services/textfile/common/textFileEditorModel.i18n.json b/i18n/esn/src/vs/workbench/services/textfile/common/textFileEditorModel.i18n.json
deleted file mode 100644
index 24130da6a5a..00000000000
--- a/i18n/esn/src/vs/workbench/services/textfile/common/textFileEditorModel.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"saveFileFirst": "Este es un archivo con modificaciones. Guárdelo antes de volver a abrirlo con otra codificación.",
-	"genericSaveError": "No se pudo guardar '{0}': {1}"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/services/textfile/common/textFileService.i18n.json b/i18n/esn/src/vs/workbench/services/textfile/common/textFileService.i18n.json
deleted file mode 100644
index 074257e584a..00000000000
--- a/i18n/esn/src/vs/workbench/services/textfile/common/textFileService.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"files.backup.failSave": "No se pudo hacer una copia de seguridad de los archivos con modificaciones pendientes (Error: {0}). Intente guardar los archivos antes de salir."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json b/i18n/esn/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json
deleted file mode 100644
index fed00bd3268..00000000000
--- a/i18n/esn/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"saveChangesMessage": "¿Quiere guardar los cambios efectuados en {0}?",
-	"saveChangesMessages": "¿Desea guardar los cambios en los siguientes {0} archivos?",
-	"saveAll": "&&Guardar todo",
-	"save": "Guardar",
-	"dontSave": "&&No guardar",
-	"cancel": "Cancelar",
-	"saveChangesDetail": "Los cambios se perderán si no se guardan.",
-	"allFiles": "Todos los archivos",
-	"noExt": "Sin extensión"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/services/themes/common/colorExtensionPoint.i18n.json b/i18n/esn/src/vs/workbench/services/themes/common/colorExtensionPoint.i18n.json
deleted file mode 100644
index 1d022f4cd00..00000000000
--- a/i18n/esn/src/vs/workbench/services/themes/common/colorExtensionPoint.i18n.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"contributes.color": "Contribuye a la extensión definida para los colores de los temas",
-	"contributes.color.id": "El identificador de los colores de los temas",
-	"contributes.color.id.format": "Los identificadores deben estar en la forma aa [.bb] *",
-	"contributes.color.description": "La descripción de los colores de los temas",
-	"contributes.defaults.light": "El color predeterminado para los temas claros. Un valor de color en hexadecimal (#RRGGBB [AA]) o el identificador de un color para los temas que proporciona el valor predeterminado.",
-	"contributes.defaults.dark": "El color predeterminado para los temas oscuros. Un valor de color en hexadecimal (#RRGGBB [AA]) o el identificador de un color para los temas que proporciona el valor predeterminado.",
-	"contributes.defaults.highContrast": "El color predeterminado para los temas con constraste. Un valor de color en hexadecimal (#RRGGBB [AA]) o el identificador de un color para los temas que proporciona el valor predeterminado.",
-	"invalid.colorConfiguration": "'configuration.colors' debe ser una matriz",
-	"invalid.default.colorType": "{0} debe ser un valor de color en hexadecimal (#RRGGBB [AA] o #RGB [A]) o el identificador de un color para los temas que puede ser el valor predeterminado.",
-	"invalid.id": "'configuration.colors.id' debe ser definida y no puede estar vacía.",
-	"invalid.id.format": "'configuration.colors.id' debe seguir la palabra [.word]*",
-	"invalid.description": "'configuration.colors.description' debe ser definida y no puede estar vacía.",
-	"invalid.defaults": "'configuration.colors.defaults' debe ser definida y contener 'light', 'dark' y 'highContrast'"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/services/themes/common/colorThemeSchema.i18n.json b/i18n/esn/src/vs/workbench/services/themes/common/colorThemeSchema.i18n.json
deleted file mode 100644
index c5f8d60d0be..00000000000
--- a/i18n/esn/src/vs/workbench/services/themes/common/colorThemeSchema.i18n.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"schema.token.settings": "Colores y estilos para el token.",
-	"schema.token.foreground": "Color de primer plano para el token.",
-	"schema.token.background.warning": "En este momento los colores de fondo para Token no están soportados.",
-	"schema.token.fontStyle": "Estilo de fuente de la regla: 'cursiva', 'negrita' o 'subrayado' o una combinación. La cadena vacía desestablece la configuración heredada.",
-	"schema.fontStyle.error": "El estilo de fuente debe ser ' cursiva', ' negrita' o ' subrayado ' o una combinación o la cadena vacía.",
-	"schema.token.fontStyle.none": "Ninguno (borrar el estilo heredado)",
-	"schema.properties.name": "Descripción de la regla.",
-	"schema.properties.scope": "Selector de ámbito con el que se compara esta regla.",
-	"schema.tokenColors.path": "Ruta a un archivo tmTheme (relativa al archivo actual).",
-	"schema.colors": "Colores para resaltado de sintaxis"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/services/themes/common/fileIconThemeSchema.i18n.json b/i18n/esn/src/vs/workbench/services/themes/common/fileIconThemeSchema.i18n.json
deleted file mode 100644
index 8bc503baa32..00000000000
--- a/i18n/esn/src/vs/workbench/services/themes/common/fileIconThemeSchema.i18n.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"schema.folderExpanded": "Icono de las carpetas expandidas. El icono de carpeta expandida es opcional. Si no establece, se muestra el icono definido para la carpeta.",
-	"schema.folder": "Icono de las carpetas contraídas y, si folderExpanded no se ha establecido, también de las carpetas expandidas.",
-	"schema.file": "Icono de archivo predeterminado, que se muestra para todos los archivos que no coinciden con ninguna extensión, nombre de archivo o identificador de lenguaje.",
-	"schema.folderNames": "Asocia los nombres de carpeta a iconos. La clave del objeto es el nombre de la carpeta, sin incluir segmentos de ruta de acceso. No se admiten patrones ni comodines. La correspondencia de nombres de carpeta no distingue mayúsculas de minúsculas.",
-	"schema.folderName": "Identificador de la definición de icono para la asociación.",
-	"schema.folderNamesExpanded": "Asocia los nombres de carpeta a iconos para las carpetas expandidas. La clave del objeto es el nombre de la carpeta, sin incluir segmentos de ruta de acceso. No se admiten patrones ni comodines. La correspondencia de nombres de carpeta no distingue mayúsculas de minúsculas.",
-	"schema.folderNameExpanded": "Identificador de la definición de icono para la asociación.",
-	"schema.fileExtensions": "Asocia las extensiones de archivo a iconos. La clave del objeto es el nombre de la extensión de archivo. El nombre de la extensión es el último segmento de un nombre de archivo después del último punto (sin incluir el punto). Las extensiones se comparan sin distinguir mayúsculas de minúsculas.",
-	"schema.fileExtension": "Identificador de la definición de icono para la asociación.",
-	"schema.fileNames": "Asocia los nombres de archivo a iconos. La clave del objeto es el nombre de archivo completo, sin incluir segmentos de ruta de acceso. El nombre de archivo puede incluir puntos y una extensión de archivo posible. No se admiten patrones ni comodines. La correspondencia de nombres de archivo no distingue mayúsculas de minúsculas.",
-	"schema.fileName": "Identificador de la definición de icono para la asociación.",
-	"schema.languageIds": "Asocia los lenguajes a iconos. La clave del objeto es el identificador de lenguaje como se define en el punto de contribución del lenguaje.",
-	"schema.languageId": "Identificador de la definición de icono para la asociación.",
-	"schema.fonts": "Fuentes que se usan en las definiciones de icono.",
-	"schema.id": "Identificador de la fuente.",
-	"schema.src": "Ubicación de la fuente.",
-	"schema.font-path": "Ruta de acceso de la fuente, relativa al archivo de temas de icono actual.",
-	"schema.font-format": "Formato de la fuente.",
-	"schema.font-weight": "Espesor de la fuente.",
-	"schema.font-sstyle": "Estilo de la fuente.",
-	"schema.font-size": "Tamaño predeterminado de la fuente.",
-	"schema.iconDefinitions": "Descripción de todos los iconos que se pueden usar al asociar archivos a iconos.",
-	"schema.iconDefinition": "Definición de icono. La clave del objeto es el identificador de la definición.",
-	"schema.iconPath": "Cuando se usa SVG o PNG: la ruta de acceso a la imagen. La ruta es relativa al archivo del conjunto de iconos.",
-	"schema.fontCharacter": "Cuando se usa una fuente de glifo: el carácter de la fuente que se va a usar.",
-	"schema.fontColor": "Cuando se usa una fuente de glifo: el color que se va a usar.",
-	"schema.fontSize": "Cuando se usa una fuente: porcentaje del tamaño de fuente para la fuente del texto. Si no se ha establecido, el valor predeterminado es el tamaño de la definición de fuente.",
-	"schema.fontId": "Cuando se usa una fuente: el identificador de la fuente. Si no se ha establecido, el valor predeterminado es la primera definición de fuente.",
-	"schema.light": "Asociaciones opcionales para iconos de archivo en temas de colores claros.",
-	"schema.highContrast": "Asociaciones opcionales para iconos de archivo en temas de color de contraste alto.",
-	"schema.hidesExplorerArrows": "Configura si las flechas del explorador deben quedar ocultas cuando este tema esté activo."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/services/themes/electron-browser/colorThemeData.i18n.json b/i18n/esn/src/vs/workbench/services/themes/electron-browser/colorThemeData.i18n.json
deleted file mode 100644
index 87d444acd52..00000000000
--- a/i18n/esn/src/vs/workbench/services/themes/electron-browser/colorThemeData.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"error.cannotparsejson": "Problemas al analizar el archivo de tema JSON: {0}",
-	"error.invalidformat.colors": "Problema al analizar el archivo de tema: {0}. La propiedad \"colors\" no es tipo \"object\".",
-	"error.invalidformat.tokenColors": "Problema al analizar el archivo de tema de color: {0}. La propiedad 'tokenColors' debe ser un array especificando colores o una ruta a un archivo de tema de TextMate",
-	"error.plist.invalidformat": "Problema al analizar el archivo de tema: {0}. \"settings\" no es una matriz.",
-	"error.cannotparse": "Problemas al analizar el archivo de tema: {0}",
-	"error.cannotload": "Problemas al analizar el archivo de tema: {0}:{1}"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/services/themes/electron-browser/colorThemeStore.i18n.json b/i18n/esn/src/vs/workbench/services/themes/electron-browser/colorThemeStore.i18n.json
deleted file mode 100644
index 9bf95d3a452..00000000000
--- a/i18n/esn/src/vs/workbench/services/themes/electron-browser/colorThemeStore.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.contributes.themes": "Contributes textmate color themes.",
-	"vscode.extension.contributes.themes.id": "Identificador del tema de icono como se usa en la configuración de usuario.",
-	"vscode.extension.contributes.themes.label": "Etiqueta del tema de color tal como se muestra en la interfaz de usuario.",
-	"vscode.extension.contributes.themes.uiTheme": "Tema base que define los colores que se usan en el editor: 'vs' es el tema de color claro, 'vs-dark' es el tema de color oscuro, 'hc-black' es el tema oscuro de alto contraste.",
-	"vscode.extension.contributes.themes.path": "Ruta de acceso del archivo tmTheme. La ruta de acceso es relativa a la carpeta de extensión y suele ser './themes/themeFile.tmTheme'.",
-	"reqarray": "Extension point `{0}` must be an array.",
-	"reqpath": "Se esperaba una cadena en \"contributes.{0}.path\". Valor proporcionado: {1}",
-	"invalid.path.1": "Se esperaba que \"contributes.{0}.path\" ({1}) se incluyera en la carpeta de la extensión ({2}). Esto puede hacer que la extensión no sea portátil."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/services/themes/electron-browser/fileIconThemeData.i18n.json b/i18n/esn/src/vs/workbench/services/themes/electron-browser/fileIconThemeData.i18n.json
deleted file mode 100644
index 8582255d004..00000000000
--- a/i18n/esn/src/vs/workbench/services/themes/electron-browser/fileIconThemeData.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"error.cannotparseicontheme": "Problems parsing file icons file: {0}"
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/services/themes/electron-browser/fileIconThemeStore.i18n.json b/i18n/esn/src/vs/workbench/services/themes/electron-browser/fileIconThemeStore.i18n.json
deleted file mode 100644
index 1d8a584ad6a..00000000000
--- a/i18n/esn/src/vs/workbench/services/themes/electron-browser/fileIconThemeStore.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.contributes.iconThemes": "Contributes file icon themes.",
-	"vscode.extension.contributes.iconThemes.id": "Identificador del tema de icono como se usa en la configuración de usuario.",
-	"vscode.extension.contributes.iconThemes.label": "Etiqueta del tema de icono como se muestra en la interfaz de usuario.",
-	"vscode.extension.contributes.iconThemes.path": "Ruta de acceso del archivo de definición de temas de icono. La ruta de acceso es relativa a la carpeta de extensión y suele ser './icons/awesome-icon-theme.json'.",
-	"reqarray": "Extension point `{0}` must be an array.",
-	"reqpath": "Se esperaba una cadena en \"contributes.{0}.path\". Valor proporcionado: {1}",
-	"reqid": "Se esperaba una cadena en `contributes.{0}.id`. Valor proporcionado: {1}",
-	"invalid.path.1": "Se esperaba que \"contributes.{0}.path\" ({1}) se incluyera en la carpeta de la extensión ({2}). Esto puede hacer que la extensión no sea portátil."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json b/i18n/esn/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
deleted file mode 100644
index 5a34a01efe3..00000000000
--- a/i18n/esn/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"error.cannotloadtheme": "Unable to load {0}: {1}",
-	"colorTheme": "Specifies the color theme used in the workbench.",
-	"colorThemeError": "Theme is unknown or not installed.",
-	"iconTheme": "Especifica el tema de icono utilizado en el área de trabajo o \"null\" para no mostrar ningún icono de archivo.",
-	"noIconThemeDesc": "No file icons",
-	"iconThemeError": "File icon theme is unknown or not installed.",
-	"workbenchColors": "Reemplaza los colores del tema de color actual",
-	"editorColors.comments": "Establece los colores y estilos para los comentarios",
-	"editorColors.strings": "Establece los colores y estilos para los literales de cadena.",
-	"editorColors.keywords": "Establece los colores y estilos para las palabras clave.",
-	"editorColors.numbers": "Establece los colores y estilos para números literales.",
-	"editorColors.types": "Establece los colores y estilos para las declaraciones y referencias de tipos.",
-	"editorColors.functions": "Establece los colores y estilos para las declaraciones y referencias de funciones.",
-	"editorColors.variables": "Establece los colores y estilos para las declaraciones y referencias de variables.",
-	"editorColors.textMateRules": "Establece colores y estilos utilizando las reglas de la tematización de textmate (avanzadas).",
-	"editorColors": "Reemplaza los colores y el estilo de fuente del editor del tema de color seleccionado."
-}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json b/i18n/esn/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json
deleted file mode 100644
index 3fc80146a13..00000000000
--- a/i18n/esn/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"errorInvalidTaskConfiguration": "No se puede escribir en el archivo de configuración del espacio de trabajo. Por favor, abra el archivo para corregir sus errores/advertencias e inténtelo de nuevo.",
-	"errorWorkspaceConfigurationFileDirty": "No se puede escribir en el archivo de configuración de espacio de trabajo porque el archivo ha sido modificado. Por favor, guárdelo y vuelva a intentarlo.",
-	"openWorkspaceConfigurationFile": "Configuración del espacio de trabajo abierta"
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/azure-account/out/azure-account.i18n.json b/i18n/fra/extensions/azure-account/out/azure-account.i18n.json
deleted file mode 100644
index 7ee7c75a5ab..00000000000
--- a/i18n/fra/extensions/azure-account/out/azure-account.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"azure-account.copyAndOpen": "Copier & Ouvrir",
-	"azure-account.close": "Fermer",
-	"azure-account.login": "Connexion",
-	"azure-account.loginFirst": "Non connecté, se connecter d'abord.",
-	"azure-account.userCodeFailed": "L'acquisition de code utilisateur a échoué",
-	"azure-account.tokenFailed": "Acquisition du jeton avec le code de l’appareil",
-	"azure-account.tokenFromRefreshTokenFailed": "Acquisition de jeton avec le jeton d'actualisation"
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/azure-account/out/extension.i18n.json b/i18n/fra/extensions/azure-account/out/extension.i18n.json
deleted file mode 100644
index c9ceccea29e..00000000000
--- a/i18n/fra/extensions/azure-account/out/extension.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"azure-account.loggingIn": "Azure : Connexion en cours...",
-	"azure-account.loggedIn": "Azure : {0}"
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/bat/package.i18n.json b/i18n/fra/extensions/bat/package.i18n.json
deleted file mode 100644
index 423047efe72..00000000000
--- a/i18n/fra/extensions/bat/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Bases du langage Windows Bat",
-	"description": "Fournit des extraits de code, la coloration syntaxique, la correspondance des crochets et le repli dans les fichiers de commandes Windows."
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/clojure/package.i18n.json b/i18n/fra/extensions/clojure/package.i18n.json
deleted file mode 100644
index 1113e349fc9..00000000000
--- a/i18n/fra/extensions/clojure/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Bases du langage Clojure",
-	"description": "Fournit la coloration syntaxique et la correspondance des crochets dans les fichiers Clojure."
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/coffeescript/package.i18n.json b/i18n/fra/extensions/coffeescript/package.i18n.json
deleted file mode 100644
index 870afb5d5c3..00000000000
--- a/i18n/fra/extensions/coffeescript/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Bases du langage CoffeeScript",
-	"description": "Fournit des extraits de code, la coloration syntaxique, la correspondance des crochets et le repli dans les fichiers CoffeeScript."
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/configuration-editing/out/extension.i18n.json b/i18n/fra/extensions/configuration-editing/out/extension.i18n.json
deleted file mode 100644
index c1b3c437c86..00000000000
--- a/i18n/fra/extensions/configuration-editing/out/extension.i18n.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"workspaceFolder": "Chemin du dossier ouvert dans VS Code",
-	"workspaceFolderBasename": "Nom du dossier ouvert dans VS Code, sans barres obliques (/)",
-	"relativeFile": "Fichier ouvert actif relatif à ${workspaceFolder}",
-	"file": "Fichier ouvert actif",
-	"cwd": "Répertoire de travail actif de l'exécuteur de tâches au démarrage",
-	"lineNumber": "Numéro de la ligne sélectionnée dans le fichier actif",
-	"selectedText": "Texte sélectionné dans le fichier actif",
-	"fileDirname": "Nom de répertoire du fichier ouvert actif",
-	"fileExtname": "Extension du fichier ouvert actif",
-	"fileBasename": "Nom de base du fichier ouvert actif",
-	"fileBasenameNoExtension": "Nom de base du fichier ouvert actif, sans extension de fichier",
-	"exampleExtension": "Exemple"
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json b/i18n/fra/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json
deleted file mode 100644
index 5d2e240f3af..00000000000
--- a/i18n/fra/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"activeEditorShort": "le nom du fichier (ex: monfichier.txt)",
-	"activeEditorMedium": "le chemin d’accès du fichier relatif au dossier de l’espace de travail (ex: myFolder/myFile.txt)",
-	"activeEditorLong": "le chemin d’accès complet du fichier (ex: /Users/Development/myProject/myFolder/myFile.txt)",
-	"rootName": "nom de l’espace de travail (ex: monDossier ou monEspaceDeTravail)",
-	"rootPath": "chemin d’accès de l’espace de travail (ex: /Users/Development/myWorkspace)",
-	"folderName": "nom du dossier de l'espace de travail auquel le fichier appartient (ex: monDossier)",
-	"folderPath": "chemin d’accès du dossier de l'espace de travail auquel le fichier appartient (ex: /Users/Development/myFolder)",
-	"appName": "exemple : VS Code",
-	"dirty": "indicateur d'intégrité si l'intégrité de l'éditeur actif est compromise",
-	"separator": "séparateur conditionnel (' - ') qui s'affiche uniquement quand il est entouré de variables avec des valeurs",
-	"assocLabelFile": "Fichiers avec extension",
-	"assocDescriptionFile": "Mappez au langage ayant l'identificateur spécifié tous les fichiers dont le nom correspond au modèle Glob.",
-	"assocLabelPath": "Fichiers avec chemin",
-	"assocDescriptionPath": "Mappez au langage ayant l'identificateur spécifié tous les fichiers dont le chemin correspond au modèle Glob de chemin absolu.",
-	"fileLabel": "Fichiers par extension",
-	"fileDescription": "Faites correspondre tous les fichiers ayant une extension de fichier spécifique.",
-	"filesLabel": "Fichiers avec plusieurs extensions",
-	"filesDescription": "Faites correspondre tous les fichiers, indépendamment de leurs extensions.",
-	"derivedLabel": "Fichiers avec frères par nom",
-	"derivedDescription": "Faites correspondre les fichiers ayant des frères portant le même nom, mais avec une extension distincte.",
-	"topFolderLabel": "Dossier par nom (premier niveau)",
-	"topFolderDescription": "Faites correspondre un dossier de premier niveau portant un nom spécifique.",
-	"topFoldersLabel": "Dossiers avec plusieurs noms (premier niveau)",
-	"topFoldersDescription": "Faites correspondre plusieurs dossiers de premier niveau.",
-	"folderLabel": "Dossier par nom (tous les emplacements)",
-	"folderDescription": "Faites correspondre un dossier portant un nom spécifique, indépendamment de son emplacement.",
-	"falseDescription": "Désactivez le modèle.",
-	"trueDescription": "Activez le modèle.",
-	"siblingsDescription": "Faites correspondre les fichiers ayant des frères portant le même nom, mais avec une extension distincte.",
-	"languageSpecificEditorSettings": "Paramètres d'éditeur spécifiques au langage",
-	"languageSpecificEditorSettingsDescription": "Remplacer les paramètres de l'éditeur pour le langage"
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/configuration-editing/package.i18n.json b/i18n/fra/extensions/configuration-editing/package.i18n.json
deleted file mode 100644
index b1e0df5374a..00000000000
--- a/i18n/fra/extensions/configuration-editing/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Configuration de l'édition",
-	"description": "Fournit des fonctionnalités (IntelliSense avancé, correction automatique) dans les fichiers de configuration comme les fichiers de paramètres, de lancement et de recommandation d'extension."
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/cpp/package.i18n.json b/i18n/fra/extensions/cpp/package.i18n.json
deleted file mode 100644
index e451e349d6f..00000000000
--- a/i18n/fra/extensions/cpp/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Bases du langage C/C++",
-	"description": "Fournit des extraits de code, la coloration syntaxique, la correspondance des crochets et le repli dans les fichiers C/C++."
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/csharp/package.i18n.json b/i18n/fra/extensions/csharp/package.i18n.json
deleted file mode 100644
index f7664bed014..00000000000
--- a/i18n/fra/extensions/csharp/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Bases du langage C#",
-	"description": "Fournit les extraits de code, la coloration syntaxique, la correspondance des parenthèses et le repliement dans les fichiers C#."
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/css-language-features/client/out/cssMain.i18n.json b/i18n/fra/extensions/css-language-features/client/out/cssMain.i18n.json
deleted file mode 100644
index 56a7e4e867e..00000000000
--- a/i18n/fra/extensions/css-language-features/client/out/cssMain.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"cssserver.name": "Serveur de langage CSS",
-	"folding.start": "Début de la région repliable",
-	"folding.end": "Fin de la région repliable"
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/css-language-features/package.i18n.json b/i18n/fra/extensions/css-language-features/package.i18n.json
deleted file mode 100644
index 8ce650a48c0..00000000000
--- a/i18n/fra/extensions/css-language-features/package.i18n.json
+++ /dev/null
@@ -1,81 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Fonctionnalités de langage CSS",
-	"description": "Fournit une prise en charge riche de langage pour les fichiers CSS, LESS et SCSS",
-	"css.title": "CSS",
-	"css.lint.argumentsInColorFunction.desc": "Nombre de paramètres non valide",
-	"css.lint.boxModel.desc": "Ne pas utiliser la largeur ou la hauteur avec une marge intérieure ou une bordure",
-	"css.lint.compatibleVendorPrefixes.desc": "Lors de l'utilisation d'un préfixe spécifique à un fabricant, toujours inclure également toutes les propriétés spécifiques au fabricant",
-	"css.lint.duplicateProperties.desc": "Ne pas utiliser de définitions de style en double",
-	"css.lint.emptyRules.desc": "Ne pas utiliser d'ensembles de règles vides",
-	"css.lint.float.desc": "N'utilisez pas 'float'. Les éléments Float peuvent fragiliser le code CSS qui est ainsi plus vulnérable si un aspect de la disposition change.",
-	"css.lint.fontFaceProperties.desc": "la règle @font-face doit définir les propriétés 'src' et 'font-family'",
-	"css.lint.hexColorLength.desc": "Les couleurs Hex doivent contenir trois ou six chiffres hex",
-	"css.lint.idSelector.desc": "Les sélecteurs ne doivent pas contenir d'ID, car ces règles sont trop fortement couplées au code HTML.",
-	"css.lint.ieHack.desc": "Les hacks IE ne sont nécessaires que si IE7 et versions antérieures sont pris en charge",
-	"css.lint.important.desc": "N'utilisez pas !important. Cela indique que la spécificité de l'intégralité du code CSS est incorrecte et qu'il doit être refactorisé.",
-	"css.lint.importStatement.desc": "Les instructions d'importation ne sont pas chargées en parallèle",
-	"css.lint.propertyIgnoredDueToDisplay.desc": "Propriété ignorée en raison de l'affichage. Par exemple, avec 'display: inline', les propriétés width, height, margin-top, margin-bottom et float sont sans effet",
-	"css.lint.universalSelector.desc": "Le sélecteur universel (*) est connu pour sa lenteur",
-	"css.lint.unknownProperties.desc": "Propriété inconnue.",
-	"css.lint.unknownVendorSpecificProperties.desc": "Propriété spécifique à un fournisseur inconnue.",
-	"css.lint.vendorPrefix.desc": "Lors de l'utilisation d'un préfixe spécifique à un fournisseur, ajouter également la propriété standard",
-	"css.lint.zeroUnits.desc": "Aucune unité nécessaire pour zéro",
-	"css.trace.server.desc": "Trace la communication entre VS Code et le serveur de langage CSS.",
-	"css.validate.title": "Contrôle la validation CSS et la gravité des problèmes.",
-	"css.validate.desc": "Active ou désactive toutes les validations",
-	"less.title": "LESS",
-	"less.lint.argumentsInColorFunction.desc": "Nombre de paramètres non valide",
-	"less.lint.boxModel.desc": "Ne pas utiliser la largeur ou la hauteur avec une marge intérieure ou une bordure",
-	"less.lint.compatibleVendorPrefixes.desc": "Lors de l'utilisation d'un préfixe spécifique à un fabricant, toujours inclure également toutes les propriétés spécifiques au fabricant",
-	"less.lint.duplicateProperties.desc": "Ne pas utiliser de définitions de style en double",
-	"less.lint.emptyRules.desc": "Ne pas utiliser d'ensembles de règles vides",
-	"less.lint.float.desc": "N'utilisez pas 'float'. Les éléments Float peuvent fragiliser le code CSS qui est ainsi plus vulnérable si un aspect de la disposition change.",
-	"less.lint.fontFaceProperties.desc": "la règle @font-face doit définir les propriétés 'src' et 'font-family'",
-	"less.lint.hexColorLength.desc": "Les couleurs Hex doivent contenir trois ou six chiffres hex",
-	"less.lint.idSelector.desc": "Les sélecteurs ne doivent pas contenir d'ID, car ces règles sont trop fortement couplées au code HTML.",
-	"less.lint.ieHack.desc": "Les hacks IE ne sont nécessaires que si IE7 et versions antérieures sont pris en charge",
-	"less.lint.important.desc": "N'utilisez pas !important. Cela indique que la spécificité de l'intégralité du code CSS est incorrecte et qu'il doit être refactorisé.",
-	"less.lint.importStatement.desc": "Les instructions d'importation ne sont pas chargées en parallèle",
-	"less.lint.propertyIgnoredDueToDisplay.desc": "Propriété ignorée en raison de l'affichage. Par exemple, avec 'display: inline', les propriétés width, height, margin-top, margin-bottom et float sont sans effet",
-	"less.lint.universalSelector.desc": "Le sélecteur universel (*) est connu pour sa lenteur",
-	"less.lint.unknownProperties.desc": "Propriété inconnue.",
-	"less.lint.unknownVendorSpecificProperties.desc": "Propriété spécifique à un fournisseur inconnue.",
-	"less.lint.vendorPrefix.desc": "Lors de l'utilisation d'un préfixe spécifique à un fournisseur, ajouter également la propriété standard",
-	"less.lint.zeroUnits.desc": "Aucune unité nécessaire pour zéro",
-	"less.validate.title": "Contrôle la validation LESS et la gravité des problèmes.",
-	"less.validate.desc": "Active ou désactive toutes les validations",
-	"scss.title": "SCSS (Sass)",
-	"scss.lint.argumentsInColorFunction.desc": "Nombre de paramètres non valide",
-	"scss.lint.boxModel.desc": "Ne pas utiliser la largeur ou la hauteur avec une marge intérieure ou une bordure",
-	"scss.lint.compatibleVendorPrefixes.desc": "Lors de l'utilisation d'un préfixe spécifique à un fabricant, toujours inclure également toutes les propriétés spécifiques au fabricant",
-	"scss.lint.duplicateProperties.desc": "Ne pas utiliser de définitions de style en double",
-	"scss.lint.emptyRules.desc": "Ne pas utiliser d'ensembles de règles vides",
-	"scss.lint.float.desc": "N'utilisez pas 'float'. Les éléments Float peuvent fragiliser le code CSS qui est ainsi plus vulnérable si un aspect de la disposition change.",
-	"scss.lint.fontFaceProperties.desc": "la règle @font-face doit définir les propriétés 'src' et 'font-family'",
-	"scss.lint.hexColorLength.desc": "Les couleurs Hex doivent contenir trois ou six chiffres hex",
-	"scss.lint.idSelector.desc": "Les sélecteurs ne doivent pas contenir d'ID, car ces règles sont trop fortement couplées au code HTML.",
-	"scss.lint.ieHack.desc": "Les hacks IE ne sont nécessaires que si IE7 et versions antérieures sont pris en charge",
-	"scss.lint.important.desc": "N'utilisez pas !important. Cela indique que la spécificité de l'intégralité du code CSS est incorrecte et qu'il doit être refactorisé.",
-	"scss.lint.importStatement.desc": "Les instructions d'importation ne sont pas chargées en parallèle",
-	"scss.lint.propertyIgnoredDueToDisplay.desc": "Propriété ignorée en raison de l'affichage. Par exemple, avec 'display: inline', les propriétés width, height, margin-top, margin-bottom et float sont sans effet",
-	"scss.lint.universalSelector.desc": "Le sélecteur universel (*) est connu pour sa lenteur",
-	"scss.lint.unknownProperties.desc": "Propriété inconnue.",
-	"scss.lint.unknownVendorSpecificProperties.desc": "Propriété spécifique à un fournisseur inconnue.",
-	"scss.lint.vendorPrefix.desc": "Lors de l'utilisation d'un préfixe spécifique à un fournisseur, ajouter également la propriété standard",
-	"scss.lint.zeroUnits.desc": "Aucune unité nécessaire pour zéro",
-	"scss.validate.title": "Contrôle la validation SCSS et la gravité des problèmes.",
-	"scss.validate.desc": "Active ou désactive toutes les validations",
-	"less.colorDecorators.enable.desc": "Active ou désactive les éléments décoratifs de couleurs",
-	"scss.colorDecorators.enable.desc": "Active ou désactive les éléments décoratifs de couleurs",
-	"css.colorDecorators.enable.desc": "Active ou désactive les éléments décoratifs de couleurs",
-	"css.colorDecorators.enable.deprecationMessage": "Le paramètre 'css.colorDecorators.enable' a été déprécié en faveur de 'editor.colorDecorators'.",
-	"scss.colorDecorators.enable.deprecationMessage": "Le paramètre 'scss.colorDecorators.enable' a été déprécié en faveur de 'editor.colorDecorators'.",
-	"less.colorDecorators.enable.deprecationMessage": "Le paramètre 'less.colorDecorators.enable' a été déprécié en faveur de 'editor.colorDecorators'."
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/css/client/out/cssMain.i18n.json b/i18n/fra/extensions/css/client/out/cssMain.i18n.json
deleted file mode 100644
index 56a7e4e867e..00000000000
--- a/i18n/fra/extensions/css/client/out/cssMain.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"cssserver.name": "Serveur de langage CSS",
-	"folding.start": "Début de la région repliable",
-	"folding.end": "Fin de la région repliable"
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/css/package.i18n.json b/i18n/fra/extensions/css/package.i18n.json
deleted file mode 100644
index f80d3cb8bfc..00000000000
--- a/i18n/fra/extensions/css/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Bases du langage CSS",
-	"description": "Fournit la coloration syntaxique et la correspondance des parenthèses dans les fichiers CSS, LESS et SCSS."
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/diff/package.i18n.json b/i18n/fra/extensions/diff/package.i18n.json
deleted file mode 100644
index 35229bd6699..00000000000
--- a/i18n/fra/extensions/diff/package.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	]
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/docker/package.i18n.json b/i18n/fra/extensions/docker/package.i18n.json
deleted file mode 100644
index 150b17c9eaa..00000000000
--- a/i18n/fra/extensions/docker/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Bases du langage Docker",
-	"description": "Fournit la coloration syntaxique et la correspondance des crochets dans les fichiers Docker."
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/emmet/package.i18n.json b/i18n/fra/extensions/emmet/package.i18n.json
deleted file mode 100644
index 2b38d968d64..00000000000
--- a/i18n/fra/extensions/emmet/package.i18n.json
+++ /dev/null
@@ -1,65 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"description": "Prise en charge d'Emmet pour VS Code",
-	"command.wrapWithAbbreviation": "Envelopper avec une abréviation",
-	"command.wrapIndividualLinesWithAbbreviation": "Envelopper les lignes individuelles avec une abréviation",
-	"command.removeTag": "Supprimer le Tag",
-	"command.updateTag": "Mettre à jour le Tag",
-	"command.matchTag": "Aller à la paire correspondante",
-	"command.balanceIn": "Equilibrer (vers l'intérieur)",
-	"command.balanceOut": "Equilibrer (vers l'extérieur)",
-	"command.prevEditPoint": "Aller au Point d'édition précédent",
-	"command.nextEditPoint": "Aller au Point d’édition suivant",
-	"command.mergeLines": "Fusionner les lignes",
-	"command.selectPrevItem": "Sélectionner l’élément précédent",
-	"command.selectNextItem": "Sélectionner l’élément suivant",
-	"command.splitJoinTag": "Séparer / Joindre le Tag",
-	"command.toggleComment": "Activer/désactiver le commentaire",
-	"command.evaluateMathExpression": "Évaluer l’Expression mathématique",
-	"command.updateImageSize": "Mettre à jour la taille de l’image",
-	"command.reflectCSSValue": "Reflèter la valeur CSS",
-	"command.incrementNumberByOne": "Incrémenter de 1",
-	"command.decrementNumberByOne": "Décrémenter de 1",
-	"command.incrementNumberByOneTenth": "Incrémenter de 0,1",
-	"command.decrementNumberByOneTenth": "Décrémenter de 0,1",
-	"command.incrementNumberByTen": "Incrémenter de 10",
-	"command.decrementNumberByTen": "Décrémenter de 10",
-	"emmetSyntaxProfiles": "Définissez le profil pour la syntaxe spécifiée ou utilisez votre propre profil avec des règles spécifiques.",
-	"emmetExclude": "Un tableau des langages pour lesquels les abréviations Emmet ne devraient pas être développées.",
-	"emmetExtensionsPath": "Chemin d’accès au dossier contenant les profils Emmet et les extraits.",
-	"emmetShowExpandedAbbreviation": "Affiche les abréviations Emmet développées sous forme de suggestions.\nL’option \"inMarkupAndStylesheetFilesOnly\" s’applique à haml, jade, slim, xml, xsl, css, html, scss, sass, less et stylus.\nL’option\"always\" s’applique à toutes les parties du fichier indépendamment du balisage/css.",
-	"emmetShowAbbreviationSuggestions": "Affiche les abréviations Emmet possibles sous forme de suggestions. Non applicable dans les feuilles de style ou lorsque emmet.showExpandedAbbreviation est défini à \"never\".",
-	"emmetIncludeLanguages": "Activer les abréviations Emmet dans les langages qui ne sont pas pris en charge par défaut. Ajoutez un mappage ici entre la langue et le langage supporté par emmet.\n Par exemple : {\"vue-html\": \"html\", \"javascript\": \"javascriptreact\"}",
-	"emmetVariables": "Variables à utiliser dans les extraits de Emmet",
-	"emmetTriggerExpansionOnTab": "Lorsqu’activé, les abréviations Emmet sont développées lorsque vous appuyez sur TAB.",
-	"emmetPreferences": "Préférences utilisées pour modifier le comportement de certaines actions et résolveurs d'Emmet.",
-	"emmetPreferencesIntUnit": "Unité par défaut pour les valeurs entières",
-	"emmetPreferencesFloatUnit": "Unité par défaut pour les valeurs float",
-	"emmetPreferencesCssAfter": "Symbole à placer à la fin de la propriété CSS pendant le développement des abréviations CSS",
-	"emmetPreferencesSassAfter": "Symbole à placer à la fin de la propriété CSS pendant le développement des abréviations CSS dans les fichiers Sass",
-	"emmetPreferencesStylusAfter": "Symbole à placer à la fin de la propriété CSS pendant le développement des abréviations CSS dans les fichiers Stylus",
-	"emmetPreferencesCssBetween": "Symbole à placer entre la propriété CSS et la valeur pendant le développement des abréviations CSS",
-	"emmetPreferencesSassBetween": "Symbole à placer entre la propriété CSS et la valeur pendant le développement des abréviations CSS dans les fichiers Sass",
-	"emmetPreferencesStylusBetween": "Symbole à placer entre la propriété CSS et la valeur pendant le développement des abréviations CSS dans les fichiers Stylus",
-	"emmetShowSuggestionsAsSnippets": "Si true, alors les suggestions Emmet apparaîtront en tant qu’extraits vous permettant de les commander selon le paramètre editor.snippetSuggestions.",
-	"emmetPreferencesBemElementSeparator": "Séparateur d’éléments utilisé pour les classes lorsque le filtre BEM est utilisé",
-	"emmetPreferencesBemModifierSeparator": "Séparateur de modificateur utilisé pour les classes lorsque le filtre BEM est utilisé",
-	"emmetPreferencesFilterCommentBefore": "Une définition de commentaire qui doit être placée avant l’élément correspondant quand le filtre de commentaire est appliqué.",
-	"emmetPreferencesFilterCommentAfter": "Une définition de commentaire qui doit être placée après l’élément correspondant quand un filtre de commentaire est appliqué.",
-	"emmetPreferencesFilterCommentTrigger": "Une liste séparée par des virgules de noms d’attributs qui devraient exister en abrégé pour que le filtre de commentaire soit appliqué",
-	"emmetPreferencesFormatNoIndentTags": "Un tableau de noms de balises qui ne devraient pas être indentées",
-	"emmetPreferencesFormatForceIndentTags": "Un tableau de noms de balises qui devraient toujours être indentées",
-	"emmetPreferencesAllowCompactBoolean": "Si true, la notation compacte des attributs booléens est produite",
-	"emmetPreferencesCssWebkitProperties": "Les propriétés css séparées par des virgules qui ont un préfixe 'webkit' vendor lorsqu’elles sont utilisées dans une abréviation emmet qui commence par '-'. Mettre une chaîne vide pour éviter le préfixe 'webkit'.",
-	"emmetPreferencesCssMozProperties": "Les propriétés css séparées par des virgules qui ont un préfixe 'moz' vendor lorsqu’elles sont utilisées dans une abréviation emmet qui commence par '-'. Mettre une chaîne vide pour éviter le préfixe 'moz'.",
-	"emmetPreferencesCssOProperties": "Les propriétés css séparées par des virgules qui ont un préfixe 'o' vendor lorsqu’elles sont utilisées dans une abréviation emmet qui commence par '-'. Mettre une chaîne vide pour éviter le préfixe 'o'.",
-	"emmetPreferencesCssMsProperties": "Les propriétés css séparées par des virgules qui ont un préfixe 'ms' vendor lorsqu’elles sont utilisées dans une abréviation emmet qui commence par '-'. Mettre une chaîne vide pour éviter le préfixe 'ms'.",
-	"emmetPreferencesCssFuzzySearchMinScore": "La note minimale (de 0 à 1) que la correspondance de l'abréviation (fuzzy-matched) devrait atteindre. Des valeurs plus faibles peuvent produire de nombreuses correspondances de faux-positifs, des valeurs plus élevées peuvent réduire les correspondances possibles.",
-	"emmetOptimizeStylesheetParsing": "Si défini à false, la fichier entier est analysé pour déterminer si la position courante est valide pour l’expansion des abréviations Emmet. Si défini à true, seul le contenu autour de la position actuelle dans les fichiers css/scss/less est analysé."
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/extension-editing/out/extensionLinter.i18n.json b/i18n/fra/extensions/extension-editing/out/extensionLinter.i18n.json
deleted file mode 100644
index d3911a1e602..00000000000
--- a/i18n/fra/extensions/extension-editing/out/extensionLinter.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"httpsRequired": "Les images doivent utiliser le protocole HTTPS.",
-	"svgsNotValid": "Les SVG ne sont pas une source d'images valide.",
-	"embeddedSvgsNotValid": "Les SVG incorporés ne sont pas une source d'images valide.",
-	"dataUrlsNotValid": "Les URL de données ne sont pas une source d'images valide.",
-	"relativeUrlRequiresHttpsRepository": "Les URL d'image relatives nécessitent un dépôt avec le protocole HTTPS dans package.json.",
-	"relativeIconUrlRequiresHttpsRepository": "Une icône nécessite un référentiel avec le protocole HTTPS spécifié dans ce package.json.",
-	"relativeBadgeUrlRequiresHttpsRepository": "Les URL d'image relatives nécessitent un dépôt avec le protocole HTTPS dans package.json."
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/extension-editing/out/packageDocumentHelper.i18n.json b/i18n/fra/extensions/extension-editing/out/packageDocumentHelper.i18n.json
deleted file mode 100644
index 038f853f292..00000000000
--- a/i18n/fra/extensions/extension-editing/out/packageDocumentHelper.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"languageSpecificEditorSettings": "Paramètres d'éditeur spécifiques au langage",
-	"languageSpecificEditorSettingsDescription": "Remplacer les paramètres de l'éditeur pour le langage"
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/extension-editing/package.i18n.json b/i18n/fra/extensions/extension-editing/package.i18n.json
deleted file mode 100644
index eb3d8ff1ee7..00000000000
--- a/i18n/fra/extensions/extension-editing/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Edition de fichier Package",
-	"description": "Fournit IntelliSense pour les points d'extension VS Code et les fonctionnalités de linting dans les fichiers package.json."
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/fsharp/package.i18n.json b/i18n/fra/extensions/fsharp/package.i18n.json
deleted file mode 100644
index 049532caf2d..00000000000
--- a/i18n/fra/extensions/fsharp/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Bases du langage F#",
-	"description": "Fournit des extraits de code, la coloration syntaxique, la correspondance des crochets et le repli dans les fichiers F#."
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/git/out/askpass-main.i18n.json b/i18n/fra/extensions/git/out/askpass-main.i18n.json
deleted file mode 100644
index 4aa1850e846..00000000000
--- a/i18n/fra/extensions/git/out/askpass-main.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"missOrInvalid": "Informations d'identification manquantes ou non valides."
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/git/out/autofetch.i18n.json b/i18n/fra/extensions/git/out/autofetch.i18n.json
deleted file mode 100644
index 3f1feec0c84..00000000000
--- a/i18n/fra/extensions/git/out/autofetch.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"yes": "Oui",
-	"no": "Non",
-	"not now": "Me demander plus tard",
-	"suggest auto fetch": "Voulez-vous que Code exécute [périodiquement 'git fetch']({0}) ?"
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/git/out/commands.i18n.json b/i18n/fra/extensions/git/out/commands.i18n.json
deleted file mode 100644
index 95b33e9cb37..00000000000
--- a/i18n/fra/extensions/git/out/commands.i18n.json
+++ /dev/null
@@ -1,91 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"tag at": "Étiquette à {0}",
-	"remote branch at": "Branche distante à {0}",
-	"create branch": "$(plus) Créer nouvelle branche",
-	"repourl": "URL du dépôt",
-	"selectFolder": "Sélectionner l'emplacement du dépôt",
-	"cloning": "Clonage du dépôt Git '{0}'...",
-	"proposeopen": "Voulez-vous ouvrir le dépôt cloné ?",
-	"openrepo": "Ouvrir le dépôt",
-	"add": "Ajouter à l’espace de travail",
-	"proposeopen2": "Voulez-vous ouvrir le dépôt cloné ou l'ajouter à l'espace de travail actuel ?",
-	"init": "Choisir le dossier d’espace de travail dans lequel initialiser le dépôt git",
-	"init repo": "Initialiser le dépôt",
-	"create repo": "Initialiser le dépôt",
-	"are you sure": "Ceci va créer un dépôt Git dans '{0}'. Êtes-vous sûr de vouloir continuer ?",
-	"HEAD not available": "La version HEAD de '{0}' n'est pas disponible.",
-	"confirm stage files with merge conflicts": "Voulez-vous vraiment créer {0} fichiers avec des conflits de fusion ?",
-	"confirm stage file with merge conflicts": "Voulez-vous vraiment créer {0} avec des conflits de fusion ?",
-	"yes": "Oui",
-	"confirm revert": "Voulez-vous vraiment restaurer les changements sélectionnés dans {0} ?",
-	"revert": "Restaurer les modifications",
-	"discard": "Ignorer les modifications",
-	"confirm delete": "Êtes-vous sûr de vouloir SUPPRIMER {0} ?",
-	"delete file": "Supprimer le fichier",
-	"confirm discard": "Voulez-vous vraiment abandonner les changements apportés à {0} ?",
-	"confirm discard multiple": "Voulez-vous vraiment abandonner les changements apportés à {0} fichiers ?",
-	"warn untracked": "Ceci effacera les fichiers {0} non suivis !",
-	"confirm discard all single": "Voulez-vous vraiment abandonner les changements apportés à {0} ?",
-	"confirm discard all": "Voulez-vous vraiment ignorer TOUTES les modifications dans {0} fichiers ?\nCette opération est IRRÉVERSIBLE.\nVotre plage de travail actuelle sera DÉFINITIVEMENT PERDUE.",
-	"discardAll multiple": "Ignorer 1 fichier",
-	"discardAll": "Ignorer les {0} fichiers",
-	"confirm delete multiple": "Voulez-vous vraiment SUPPRIMER {0} fichiers ?",
-	"delete files": "Supprimer les fichiers",
-	"there are untracked files single": "Le fichier non suivi suivant sera SUPPRIMÉ DU DISQUE s'il est ignoré : {0}.",
-	"there are untracked files": "{0} fichiers non suivis seront SUPPRIMÉS DU DISQUE s'ils sont ignorés.",
-	"confirm discard all 2": "{0}\n\nCette opération est IRRÉVERSIBLE, votre plage de travail actuelle sera DÉFINITIVEMENT PERDUE.",
-	"yes discard tracked": "Ignorer 1 fichier suivi",
-	"yes discard tracked multiple": "Ignorer {0} fichiers suivis",
-	"unsaved files single": "Le fichier suivant n'est pas enregistré : {0}.\n\nVoulez-vous l'enregistrer avant d'effectuer le commit ?",
-	"unsaved files": "Il y a {0} fichiers non enregistrés.\n\nVoulez-vous l'enregistrer avant d'effectuer le commit ?",
-	"save and commit": "Tout enregistrer et Effectuer le commit",
-	"commit": "Effectuer le commit quand même",
-	"no staged changes": "Aucune modification en attente à valider.\n\nVoulez-vous automatiquement mettre en attente toutes vos modifications et les valider directement ?",
-	"always": "Toujours",
-	"no changes": "Il n'existe aucun changement à valider.",
-	"commit message": "Message de validation",
-	"provide commit message": "Indiquez un message de validation",
-	"select a ref to checkout": "Sélectionner une référence à extraire",
-	"branch name": "Nom de la branche",
-	"provide branch name": "Fournissez un nom de branche",
-	"select branch to delete": "Sélectionner une branche à supprimer",
-	"confirm force delete branch": "La branche '{0}' n'est pas complètement fusionnée. Supprimer quand même ?",
-	"delete branch": "Supprimer la branche",
-	"invalid branch name": "Nom de branche non valide",
-	"branch already exists": "Une branche nommée '0}' existe déjà",
-	"select a branch to merge from": "Sélectionner une branche à fusionner",
-	"merge conflicts": "Il existe des conflits de fusion. Corrigez-les avant la validation.",
-	"tag name": "Nom du Tag",
-	"provide tag name": "Spécifiez un nom de balise",
-	"tag message": "Message",
-	"provide tag message": "Spécifiez un message pour annoter la balise",
-	"no remotes to fetch": "Ce dépôt n'a aucun dépôt distant configuré pour rappatrier.",
-	"no remotes to pull": "Votre dépôt n'a aucun dépôt distant configuré pour un Pull.",
-	"pick remote pull repo": "Choisir un dépôt distant duquel extraire la branche",
-	"no remotes to push": "Votre dépôt n'a aucun dépôt distant configuré pour un Push.",
-	"nobranch": "Vous devez extraire une branche dont vous souhaitez effectuer le Push vers un emplacement distant.",
-	"confirm publish branch": "La branche '{0}' n'a pas de branche en amont. Voulez-vous publier cette branche ?",
-	"ok": "OK",
-	"push with tags success": "Envoyé (push) avec des balises.",
-	"pick remote": "Choisissez un dépôt distant où publier la branche '{0}' :",
-	"sync is unpredictable": "Cette action va effectuer un transfert (Push) et une récupération (Pull) des commits à destination et en provenance de '{0}/{1}'.",
-	"never again": "OK, Ne plus afficher",
-	"no remotes to publish": "Votre dépôt n'a aucun dépôt distant configuré pour une publication.",
-	"no changes stash": "Aucune modification à remiser (stash).",
-	"provide stash message": "Spécifier éventuellement un message pour la remise (stash)",
-	"stash message": "Message pour la remise (stash)",
-	"no stashes": "Aucune remise (stash) à restaurer.",
-	"pick stash to pop": "Choisir une remise (stash) à appliquer et supprimer",
-	"clean repo": "Nettoyez l'arborescence de travail de votre dépôt avant l'extraction.",
-	"cant push": "impossible de pousser les références vers la branche distante. Exécutez d'abord 'Récupérer' pour intégrer vos modifications.",
-	"git error details": "Git : {0}",
-	"git error": "Erreur Git",
-	"open git log": "Ouvrir le journal Git"
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/git/out/main.i18n.json b/i18n/fra/extensions/git/out/main.i18n.json
deleted file mode 100644
index 36a1131640b..00000000000
--- a/i18n/fra/extensions/git/out/main.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"looking": "Recherche de git dans : {0}",
-	"using git": "Utilisation de git {0} à partir de {1}",
-	"downloadgit": "Télécharger Git",
-	"neverShowAgain": "Ne plus afficher",
-	"notfound": "Git non trouvé. Installez-le et configurez-le en utilisant le paramètre 'git.path'.",
-	"updateGit": "Mettre à jour Git",
-	"git20": "Git {0} semble installé. Le code fonctionne mieux avec git >= 2"
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/git/out/model.i18n.json b/i18n/fra/extensions/git/out/model.i18n.json
deleted file mode 100644
index 045652b8553..00000000000
--- a/i18n/fra/extensions/git/out/model.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"too many submodules": "Le dépôt '{0}' a {1}  sous-modules qui ne vont pas être ouverts automatiquement. Vous pouvez ouvrir chacun individuellement en ouvrant un fichier à l'intérieur.",
-	"no repositories": "Aucun dépôt disponible",
-	"pick repo": "Choisir un dépôt"
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/git/out/repository.i18n.json b/i18n/fra/extensions/git/out/repository.i18n.json
deleted file mode 100644
index e8ff0723dff..00000000000
--- a/i18n/fra/extensions/git/out/repository.i18n.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"open": "Ouvrir",
-	"index modified": "Index modifié",
-	"modified": "Modifié",
-	"index added": "Index ajouté",
-	"index deleted": "Index supprimé",
-	"deleted": "Supprimé",
-	"index renamed": "Index renommé",
-	"index copied": "Index copié",
-	"untracked": "Non suivi",
-	"ignored": "Ignoré",
-	"both deleted": "Tous deux supprimés",
-	"added by us": "Ajouté par nous",
-	"deleted by them": "Supprimé par eux",
-	"added by them": "Ajouté par eux",
-	"deleted by us": "Supprimé par nous",
-	"both added": "Tous deux ajoutés",
-	"both modified": "Tous deux modifiés",
-	"commitMessage": "Message (press {0} to commit)",
-	"commit": "Commit",
-	"merge changes": "Fusionner les modifications",
-	"staged changes": "Modifications en zone de transit",
-	"changes": "Modifications",
-	"commitMessageCountdown": "{0} caractères restants sur la ligne actuelle",
-	"commitMessageWarning": "{0} caractères sur {1} sur la ligne actuelle",
-	"neveragain": "Ne plus afficher",
-	"huge": "Le dépôt Git dans '{0}' a trop de modifications actives, seul un sous-ensemble de fonctionnalités Git sera activé."
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/git/out/scmProvider.i18n.json b/i18n/fra/extensions/git/out/scmProvider.i18n.json
deleted file mode 100644
index 7fded37328a..00000000000
--- a/i18n/fra/extensions/git/out/scmProvider.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"commit": "Commit"
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/git/out/statusbar.i18n.json b/i18n/fra/extensions/git/out/statusbar.i18n.json
deleted file mode 100644
index 8b318664678..00000000000
--- a/i18n/fra/extensions/git/out/statusbar.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"checkout": "Extraire...",
-	"sync changes": "Synchroniser les modifications",
-	"publish changes": "Publier les modifications",
-	"syncing changes": "Synchronisation des modifications..."
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/git/package.i18n.json b/i18n/fra/extensions/git/package.i18n.json
deleted file mode 100644
index 6b9b77f8287..00000000000
--- a/i18n/fra/extensions/git/package.i18n.json
+++ /dev/null
@@ -1,87 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Git",
-	"description": "Intégration Git SCM",
-	"command.clone": "Cloner",
-	"command.init": "Initialiser le dépôt",
-	"command.close": "Fermer le dépôt",
-	"command.refresh": "Actualiser",
-	"command.openChange": "Ouvrir les modifications",
-	"command.openFile": "Ouvrir le fichier",
-	"command.openHEADFile": "Ouvrir le fichier (HEAD)",
-	"command.stage": "Mettre en attente les modifications",
-	"command.stageAll": "Mettre en attente toutes les modifications",
-	"command.stageSelectedRanges": "Mettre en attente les plages sélectionnées",
-	"command.revertSelectedRanges": "Restaurer les portées sélectionnées",
-	"command.stageChange": "Mettre en attente la modification",
-	"command.revertChange": "Restaurer la modification",
-	"command.unstage": "Annuler la mise en attente des modifications",
-	"command.unstageAll": "Annuler la mise en attente de toutes les modifications",
-	"command.unstageSelectedRanges": "Annuler la mise en attente des plages sélectionnées",
-	"command.clean": "Ignorer les modifications",
-	"command.cleanAll": "Ignorer toutes les modifications",
-	"command.commit": "Commit",
-	"command.commitStaged": "Valider le contenu en zone de transit",
-	"command.commitStagedSigned": "Valider les modifications en attente (signé)",
-	"command.commitStagedAmend": "Valider les modifications en attente (modifier)",
-	"command.commitAll": "Valider tout",
-	"command.commitAllSigned": "Valider tout (signé)",
-	"command.commitAllAmend": "Tout Valider (Modifier)",
-	"command.undoCommit": "Annuler la dernière validation",
-	"command.checkout": "Extraire vers...",
-	"command.branch": "Créer une branche...",
-	"command.deleteBranch": "Supprimer la branche...",
-	"command.renameBranch": "Renommer la branche...",
-	"command.merge": "Fusionner la branche...",
-	"command.createTag": "Créer une étiquette",
-	"command.fetch": "Rappatrier",
-	"command.pull": "Pull",
-	"command.pullRebase": "Pull (rebaser)",
-	"command.pullFrom": "Extraire de...",
-	"command.push": "Push",
-	"command.pushTo": "Transfert (Push) vers...",
-	"command.pushWithTags": "Envoyer avec les Tags",
-	"command.sync": "Synchroniser",
-	"command.syncRebase": "Synchroniser (Rebase)",
-	"command.publish": "Publier la branche",
-	"command.showOutput": "Afficher la sortie Git",
-	"command.ignore": "Ajouter un fichier à .gitignore",
-	"command.stashIncludeUntracked": "Remiser (Inclure les non-tracés)",
-	"command.stash": "Remiser (stash)",
-	"command.stashPop": "Appliquer et supprimer la remise...",
-	"command.stashPopLatest": "Appliquer et supprimer la dernière remise",
-	"config.enabled": "Indique si git est activé",
-	"config.path": "Chemin d'accès à l'exécutable git",
-	"config.autoRepositoryDetection": "Si les dépôts doivent être détectés automatiquement",
-	"config.autorefresh": "Indique si l'actualisation automatique est activée",
-	"config.autofetch": "Indique si la récupération automatique est activée",
-	"config.enableLongCommitWarning": "Indique si les longs messages de validation doivent faire l'objet d'un avertissement",
-	"config.confirmSync": "Confirmer avant de synchroniser des dépôts git",
-	"config.countBadge": "Contrôle le compteur de badges Git. La valeur 'toutes' compte toutes les modifications. La valeur 'suivies' compte uniquement les modifications suivies. La valeur 'désactivé' désactive le compteur.",
-	"config.checkoutType": "Contrôle quel type de branches sont répertoriées pendant l'exécution de 'Extraire vers...'. `all` affiche toutes les références, `local` affiche uniquement les branches locales, `tags` affiche uniquement les balises et la valeur `remote` montre uniquement les branches distantes.",
-	"config.ignoreLegacyWarning": "Ignore l'avertissement Git hérité",
-	"config.ignoreMissingGitWarning": "Ignore l'avertissement quand Git est manquant",
-	"config.ignoreLimitWarning": "Ignore l'avertissement quand il y a trop de modifications dans un dépôt",
-	"config.defaultCloneDirectory": "Emplacement par défaut où cloner un dépôt git",
-	"config.enableSmartCommit": "Validez toutes les modifications en l'absence de modifications en attente.",
-	"config.enableCommitSigning": "Permet de valider en signant avec GPG.",
-	"config.discardAllScope": "Contrôle les modifications ignorées par la commande 'Ignorer toutes les modifications'. 'all' ignore toutes les modifications. 'tracked' ignore uniquement les fichiers suivis. 'prompt' affiche un message d'invite chaque fois que l’action est exécutée.",
-	"config.decorations.enabled": "Contrôle si Git contribue aux couleurs et aux badges de l’Explorateur et à l'affichage des éditeurs ouverts.",
-	"config.promptToSaveFilesBeforeCommit": "Contrôle si Git doit vérifier les fichiers non sauvegardés avant d'effectuer le commit.",
-	"config.showInlineOpenFileAction": "Contrôle s’il faut afficher une action Ouvrir le fichier dans l’affichage des modifications de Git.",
-	"config.inputValidation": "Contrôle quand afficher la validation de la saisie du message de commit.",
-	"config.detectSubmodules": "Contrôle s’il faut détecter automatiquement les sous-modules git.",
-	"config.detectSubmodulesLimit": "Contrôle la limite de sous-modules git détectés.",
-	"colors.modified": "Couleur pour les ressources modifiées.",
-	"colors.deleted": "Couleur pour les ressources supprimées.",
-	"colors.untracked": "Couleur pour les ressources non tracées.",
-	"colors.ignored": "Couleur des ressources ignorées.",
-	"colors.conflict": "Couleur pour les ressources avec des conflits.",
-	"colors.submodule": "Couleur pour les ressources de sous-module."
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/go/package.i18n.json b/i18n/fra/extensions/go/package.i18n.json
deleted file mode 100644
index 784c0e68f27..00000000000
--- a/i18n/fra/extensions/go/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Bases du langage Go",
-	"description": "Fournit la coloration syntaxique et la correspondance de parenthèses dans les fichiers Go."
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/groovy/package.i18n.json b/i18n/fra/extensions/groovy/package.i18n.json
deleted file mode 100644
index 8741fad8c79..00000000000
--- a/i18n/fra/extensions/groovy/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Bases du langage Groovy",
-	"description": "Fournit des extraits de code, la coloration syntaxique et la correspondance des crochets dans les fichiers Groovy."
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/grunt/out/main.i18n.json b/i18n/fra/extensions/grunt/out/main.i18n.json
deleted file mode 100644
index b3ec4af7edf..00000000000
--- a/i18n/fra/extensions/grunt/out/main.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"execFailed": "L'auto détection de Grunt pour le dossier {0} a échoué avec l’erreur : {1}"
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/grunt/package.i18n.json b/i18n/fra/extensions/grunt/package.i18n.json
deleted file mode 100644
index 7ee6b076ee7..00000000000
--- a/i18n/fra/extensions/grunt/package.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"description": "Extension qui ajoute des fonctionnalités Grunt à VS Code.",
-	"displayName": "Prise en charge de Grunt pour VS Code",
-	"config.grunt.autoDetect": "Contrôle si la détection automatique des tâches Grunt est activée ou désactivée. La valeur par défaut est activée.",
-	"grunt.taskDefinition.type.description": "La tâche Grunt à personnaliser.",
-	"grunt.taskDefinition.file.description": "Le fichier Jake qui fournit la tâche. Peut être oublié."
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/gulp/out/main.i18n.json b/i18n/fra/extensions/gulp/out/main.i18n.json
deleted file mode 100644
index b8c3af0f1de..00000000000
--- a/i18n/fra/extensions/gulp/out/main.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"execFailed": "L'auto détection de gulp pour le dossier {0} a échoué avec l’erreur : {1}"
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/gulp/package.i18n.json b/i18n/fra/extensions/gulp/package.i18n.json
deleted file mode 100644
index 34a2cfe23d6..00000000000
--- a/i18n/fra/extensions/gulp/package.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"description": "Extension qui ajoute des fonctionnalités Gulp à VS Code.",
-	"displayName": "Prise en charge de Gulp pour VS Code",
-	"config.gulp.autoDetect": "Contrôle si la détection automatique des tâches Gulp est activée ou désactivée. La valeur par défaut est activée.",
-	"gulp.taskDefinition.type.description": "La tâche Gulp à personnaliser.",
-	"gulp.taskDefinition.file.description": "Le fichier Gulp qui fournit la tâche. Peut être oublié."
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/handlebars/package.i18n.json b/i18n/fra/extensions/handlebars/package.i18n.json
deleted file mode 100644
index 85c6638b8bd..00000000000
--- a/i18n/fra/extensions/handlebars/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Bases du langage Handlebars",
-	"description": "Fournit la coloration syntaxique et la correspondance des crochets dans les fichiers Handlebars."
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/hlsl/package.i18n.json b/i18n/fra/extensions/hlsl/package.i18n.json
deleted file mode 100644
index 4ed80f76a4f..00000000000
--- a/i18n/fra/extensions/hlsl/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Bases du langage HLSL",
-	"description": "Fournit la coloration syntaxique et la correspondance des crochets dans les fichiers HLSL."
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/html-language-features/client/out/htmlMain.i18n.json b/i18n/fra/extensions/html-language-features/client/out/htmlMain.i18n.json
deleted file mode 100644
index 9d334931d10..00000000000
--- a/i18n/fra/extensions/html-language-features/client/out/htmlMain.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"htmlserver.name": "Serveur de langage HTML",
-	"folding.start": "Début de la région repliable",
-	"folding.end": "Fin de la région repliable"
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/html-language-features/package.i18n.json b/i18n/fra/extensions/html-language-features/package.i18n.json
deleted file mode 100644
index d94c280aaad..00000000000
--- a/i18n/fra/extensions/html-language-features/package.i18n.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Fonctionnalités de langage HTML",
-	"description": "Fournit une prise en charge riche de langage pour HTML, Razor et les fichiers Handlebar.",
-	"html.format.enable.desc": "Activer/désactiver le formateur HTML par défaut.",
-	"html.format.wrapLineLength.desc": "Nombre maximal de caractères par ligne (0 = désactiver).",
-	"html.format.unformatted.desc": "Liste des balises, séparées par des virgules, qui ne doivent pas être remises en forme. 'null' correspond par défaut à toutes les balises répertoriées à l'adresse https://www.w3.org/TR/html5/dom.html#phrasing-content.",
-	"html.format.contentUnformatted.desc": "Liste des balises, séparées par des virgules, dont le contenu ne doit pas être remis en forme. 'null' correspond par défaut à toutes les balises 'pre'.",
-	"html.format.indentInnerHtml.desc": "Mettez en retrait les sections <head> et <body>.",
-	"html.format.preserveNewLines.desc": "Spécifie si les sauts de ligne existants qui précèdent les éléments doivent être conservés. Fonctionne uniquement devant les éléments, pas dans les balises, ni pour du texte.",
-	"html.format.maxPreserveNewLines.desc": "Nombre maximal de sauts de ligne à conserver dans un bloc. Utilisez 'null' pour indiquer une valeur illimitée.",
-	"html.format.indentHandlebars.desc": "Mettez en forme et en retrait {{#foo}}, ainsi que {{/foo}}.",
-	"html.format.endWithNewline.desc": "Finissez par un caractère de nouvelle ligne.",
-	"html.format.extraLiners.desc": "Liste de balises, séparées par une virgule, qui doivent être précédées d'une nouvelle ligne. 'null' prend par défaut la valeur \"head, body, /html\".",
-	"html.format.wrapAttributes.desc": "Retour à la ligne des attributs.",
-	"html.format.wrapAttributes.auto": "Retour automatique à la ligne des attributs uniquement en cas de dépassement de la longueur de la ligne.",
-	"html.format.wrapAttributes.force": "Retour automatique à la ligne de chaque attribut, sauf le premier.",
-	"html.format.wrapAttributes.forcealign": "Retour automatique à la ligne de chaque attribut, sauf le premier, avec maintien de l'alignement.",
-	"html.format.wrapAttributes.forcemultiline": "Retour automatique à la ligne de chaque attribut.",
-	"html.suggest.angular1.desc": "Permet de configurer la prise en charge intégrée du langage HTML pour suggérer des balises et propriétés Angular V1.",
-	"html.suggest.ionic.desc": "Permet de configurer la prise en charge intégrée du langage HTML pour suggérer des balises, des propriétés et des valeurs Ionic.",
-	"html.suggest.html5.desc": "Permet de configurer la prise en charge intégrée du langage HTML pour suggérer des balises, des propriétés et des valeurs HTML5.",
-	"html.trace.server.desc": "Trace la communication entre VS Code et le serveur de langage HTML.",
-	"html.validate.scripts": "Configure la validation des scripts incorporés par la prise en charge du langage HTML intégré.",
-	"html.validate.styles": "Configure la validation des styles incorporés par la prise en charge du langage HTML intégré.",
-	"html.autoClosingTags": "Activez/désactivez la fermeture automatique des balises HTML."
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/html/client/out/htmlMain.i18n.json b/i18n/fra/extensions/html/client/out/htmlMain.i18n.json
deleted file mode 100644
index 9d334931d10..00000000000
--- a/i18n/fra/extensions/html/client/out/htmlMain.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"htmlserver.name": "Serveur de langage HTML",
-	"folding.start": "Début de la région repliable",
-	"folding.end": "Fin de la région repliable"
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/html/package.i18n.json b/i18n/fra/extensions/html/package.i18n.json
deleted file mode 100644
index 23dcd2b8cfb..00000000000
--- a/i18n/fra/extensions/html/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Notions de base du langage HTML",
-	"description": "Fournit la coloration syntaxique, la correspondance des balises d'ouverture et de fermeture et des extraits de code dans les fichiers HTML."
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/ini/package.i18n.json b/i18n/fra/extensions/ini/package.i18n.json
deleted file mode 100644
index e41be7867e3..00000000000
--- a/i18n/fra/extensions/ini/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Bases du langage Ini",
-	"description": "Fournit la coloration syntaxique et la correspondance des crochets dans les fichiers Ini."
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/jake/out/main.i18n.json b/i18n/fra/extensions/jake/out/main.i18n.json
deleted file mode 100644
index 5a31ae14e22..00000000000
--- a/i18n/fra/extensions/jake/out/main.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"execFailed": "L'auto détection de Jake pour le dossier {0} a échoué avec l’erreur : {1}"
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/jake/package.i18n.json b/i18n/fra/extensions/jake/package.i18n.json
deleted file mode 100644
index 5ef899541cc..00000000000
--- a/i18n/fra/extensions/jake/package.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"description": "Extension qui ajoute des fonctionnalités Jake à VS Code.",
-	"displayName": "Prise en charge de Jake pour VS Code",
-	"jake.taskDefinition.type.description": "La tâche Jake à personnaliser.",
-	"jake.taskDefinition.file.description": "Le fichier Jake qui fournit la tâche. Peut être oublié.",
-	"config.jake.autoDetect": "Contrôle si la détection automatique des tâches Jake est activée ou désactivée. La valeur par défaut est activée."
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/java/package.i18n.json b/i18n/fra/extensions/java/package.i18n.json
deleted file mode 100644
index 041afb54852..00000000000
--- a/i18n/fra/extensions/java/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Bases du langage Java",
-	"description": "Fournit des extraits de code, la coloration syntaxique, la correspondance des crochets et le repli dans les fichiers Java."
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/javascript/out/features/bowerJSONContribution.i18n.json b/i18n/fra/extensions/javascript/out/features/bowerJSONContribution.i18n.json
deleted file mode 100644
index 2396b308fb6..00000000000
--- a/i18n/fra/extensions/javascript/out/features/bowerJSONContribution.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"json.bower.default": "Fichier bower.json par défaut",
-	"json.bower.error.repoaccess": "Échec de la requête destinée au dépôt bower : {0}",
-	"json.bower.latest.version": "dernière"
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/javascript/out/features/packageJSONContribution.i18n.json b/i18n/fra/extensions/javascript/out/features/packageJSONContribution.i18n.json
deleted file mode 100644
index a5bad7e965b..00000000000
--- a/i18n/fra/extensions/javascript/out/features/packageJSONContribution.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"json.package.default": "Fichier package.json par défaut",
-	"json.npm.error.repoaccess": "Échec de la requête destinée au dépôt NPM : {0}",
-	"json.npm.latestversion": "Dernière version du package",
-	"json.npm.majorversion": "Correspond à la version principale la plus récente (1.x.x)",
-	"json.npm.minorversion": "Correspond à la version mineure la plus récente (1.2.x)",
-	"json.npm.version.hover": "Dernière version : {0}"
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/javascript/package.i18n.json b/i18n/fra/extensions/javascript/package.i18n.json
deleted file mode 100644
index 34c0c122441..00000000000
--- a/i18n/fra/extensions/javascript/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Bases du langage JavaScript",
-	"description": "Fournit des extraits de code, la coloration syntaxique, la correspondance des crochets et le repli dans les fichiers JavaScript."
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/json-language-features/client/out/jsonMain.i18n.json b/i18n/fra/extensions/json-language-features/client/out/jsonMain.i18n.json
deleted file mode 100644
index bd80392eb07..00000000000
--- a/i18n/fra/extensions/json-language-features/client/out/jsonMain.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"jsonserver.name": "Serveur de langage JSON"
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/json-language-features/package.i18n.json b/i18n/fra/extensions/json-language-features/package.i18n.json
deleted file mode 100644
index 9b182858ced..00000000000
--- a/i18n/fra/extensions/json-language-features/package.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Fonctionnalités de langage JSON",
-	"description": "Fournit une prise en charge de langage pour les fichiers JSON",
-	"json.schemas.desc": "Associer les schémas aux fichiers JSON dans le projet actif",
-	"json.schemas.url.desc": "URL de schéma ou chemin relatif d'un schéma dans le répertoire actif",
-	"json.schemas.fileMatch.desc": "Tableau de modèles de fichiers pour la recherche de correspondances durant la résolution de fichiers JSON en schémas.",
-	"json.schemas.fileMatch.item.desc": "Modèle de fichier pouvant contenir '*' pour la recherche de correspondances durant la résolution de fichiers JSON en schémas.",
-	"json.schemas.schema.desc": "Définition de schéma pour l'URL indiquée. Le schéma doit être fourni uniquement pour éviter les accès à l'URL du schéma.",
-	"json.format.enable.desc": "Activer/désactiver le formateur JSON par défaut (nécessite un redémarrage)",
-	"json.tracing.desc": "Trace la communication entre VS Code et le serveur de langage JSON.",
-	"json.colorDecorators.enable.desc": "Active ou désactive les éléments décoratifs de couleurs",
-	"json.colorDecorators.enable.deprecationMessage": "Le paramètre 'json.colorDecorators.enable' a été déprécié en faveur de 'editor.colorDecorators'."
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/json/client/out/jsonMain.i18n.json b/i18n/fra/extensions/json/client/out/jsonMain.i18n.json
deleted file mode 100644
index bd80392eb07..00000000000
--- a/i18n/fra/extensions/json/client/out/jsonMain.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"jsonserver.name": "Serveur de langage JSON"
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/json/package.i18n.json b/i18n/fra/extensions/json/package.i18n.json
deleted file mode 100644
index 91f8d80320a..00000000000
--- a/i18n/fra/extensions/json/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Bases du langage JSON",
-	"description": "Fournit la coloration syntaxique et la correspondance des parenthèses dans les fichiers JSON."
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/less/package.i18n.json b/i18n/fra/extensions/less/package.i18n.json
deleted file mode 100644
index 3adba942a3f..00000000000
--- a/i18n/fra/extensions/less/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Bases du langage Less",
-	"description": "Fournit la coloration syntaxique, la correspondance des crochets et le repli dans les fichiers Less."
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/log/package.i18n.json b/i18n/fra/extensions/log/package.i18n.json
deleted file mode 100644
index ef0bb5a2006..00000000000
--- a/i18n/fra/extensions/log/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Log",
-	"description": "Fournit la coloration syntaxique pour les fichiers avec une extension .log."
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/lua/package.i18n.json b/i18n/fra/extensions/lua/package.i18n.json
deleted file mode 100644
index afeadcccc27..00000000000
--- a/i18n/fra/extensions/lua/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Bases du langage LUA",
-	"description": "Fournit la coloration syntaxique et la correspondance des crochets dans les fichiers Lua."
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/make/package.i18n.json b/i18n/fra/extensions/make/package.i18n.json
deleted file mode 100644
index 0005acb1f0e..00000000000
--- a/i18n/fra/extensions/make/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Bases du langage Make",
-	"description": "Fournit la coloration syntaxique et la correspondance des crochets dans les fichiers Make."
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/markdown-basics/package.i18n.json b/i18n/fra/extensions/markdown-basics/package.i18n.json
deleted file mode 100644
index cc2cb10952b..00000000000
--- a/i18n/fra/extensions/markdown-basics/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Concepts de base du langage Markdown",
-	"description": "Fournit des extraits de code et la coloration syntaxique pour Markdown."
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json b/i18n/fra/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json
deleted file mode 100644
index 69d5cb1c1f2..00000000000
--- a/i18n/fra/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"onPreviewStyleLoadError": "Impossible de charger 'markdown.styles' : {0}"
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/markdown-language-features/out/features/preview.i18n.json b/i18n/fra/extensions/markdown-language-features/out/features/preview.i18n.json
deleted file mode 100644
index 9e9f654e2f9..00000000000
--- a/i18n/fra/extensions/markdown-language-features/out/features/preview.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"lockedPreviewTitle": "[Aperçu] {0}",
-	"previewTitle": "Prévisualiser {0}"
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/markdown-language-features/out/features/previewContentProvider.i18n.json b/i18n/fra/extensions/markdown-language-features/out/features/previewContentProvider.i18n.json
deleted file mode 100644
index 38a6bf3c24e..00000000000
--- a/i18n/fra/extensions/markdown-language-features/out/features/previewContentProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"preview.securityMessage.text": "Du contenu a été désactivé dans ce document",
-	"preview.securityMessage.title": "Le contenu potentiellement dangereux ou précaire a été désactivé dans l’aperçu du format markdown. Modifier le paramètre de sécurité Aperçu Markdown afin d’autoriser les contenus non sécurisés ou activer les scripts",
-	"preview.securityMessage.label": "Avertissement de sécurité de contenu désactivé"
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/markdown-language-features/out/security.i18n.json b/i18n/fra/extensions/markdown-language-features/out/security.i18n.json
deleted file mode 100644
index a6eb76789ac..00000000000
--- a/i18n/fra/extensions/markdown-language-features/out/security.i18n.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"strict.title": "Strict",
-	"strict.description": "Charger uniquement le contenu sécurisé.",
-	"insecureLocalContent.title": "Autoriser le contenu local non sécurisé",
-	"insecureLocalContent.description": "Activer le chargement de contenu http servi par localhost",
-	"insecureContent.title": "Autoriser le contenu non sécurisé",
-	"insecureContent.description": "Activer le chargement de contenu sur http",
-	"disable.title": "Désactiver",
-	"disable.description": "Autorisez tout le contenu et l’exécution des scripts. Non recommandé",
-	"moreInfo.title": "Informations",
-	"enableSecurityWarning.title": "Activer l'aperçu d'avertissements de sécurité pour cet espace de travail",
-	"disableSecurityWarning.title": "Désactiver l'aperçu d'avertissements de sécurité pour cet espace de travail",
-	"toggleSecurityWarning.description": "N'affecte pas le niveau de sécurité de contenu",
-	"preview.showPreviewSecuritySelector.title": "Sélectionner les paramètres de sécurité pour les aperçus Markdown dans cet espace de travail"
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/markdown-language-features/package.i18n.json b/i18n/fra/extensions/markdown-language-features/package.i18n.json
deleted file mode 100644
index f5aede8507b..00000000000
--- a/i18n/fra/extensions/markdown-language-features/package.i18n.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Fonctionnalités de langage Markdown",
-	"description": "Fournit une prise en charge riche de langage pour Markdown",
-	"markdown.preview.breaks.desc": "Définit l'affichage des sauts de ligne dans l'aperçu Markdown. Si la valeur est 'true', crée un <br> pour chaque nouvelle ligne.",
-	"markdown.preview.linkify": "Activez ou désactivez la conversion de texte de type URL en liens dans l’aperçu Markdown.",
-	"markdown.preview.doubleClickToSwitchToEditor.desc": "Double-cliquez dans l'aperçu Markdown pour passer à l'éditeur.",
-	"markdown.preview.fontFamily.desc": "Contrôle la famille de polices utilisée dans l'aperçu Markdown.",
-	"markdown.preview.fontSize.desc": "Contrôle la taille de police en pixels utilisée dans l'aperçu Markdown.",
-	"markdown.preview.lineHeight.desc": "Contrôle la hauteur de ligne utilisée dans l'aperçu Markdown. Ce nombre est relatif à la taille de police.",
-	"markdown.preview.markEditorSelection.desc": "Permet de marquer la sélection actuelle de l'éditeur dans l'aperçu Markdown.",
-	"markdown.preview.scrollEditorWithPreview.desc": "Lors du défilement de l'aperçu markdown, actualiser l’affichage de l’éditeur.",
-	"markdown.preview.scrollPreviewWithEditor.desc": "Lors du défilement d’un éditeur markdow, actualiser l’affichage de l’aperçu.",
-	"markdown.preview.scrollPreviewWithEditorSelection.desc": "[Déprécié] Fait défiler l'aperçu Markdown pour révéler la ligne actuellement sélectionnée dans l'éditeur.",
-	"markdown.preview.scrollPreviewWithEditorSelection.deprecationMessage": "Ce paramètre a été remplacé par 'markdown.preview.scrollPreviewWithEditor' et n'a plus aucun effet.",
-	"markdown.preview.title": "Ouvrir l'aperçu",
-	"markdown.previewFrontMatter.dec": "Définit comment les pages liminaires YAML doivent être affichées dans l'aperçu Markdown. L'option 'hide' supprime les pages liminaires. Sinon, elles sont traitées comme du contenu Markdown.",
-	"markdown.previewSide.title": "Ouvrir l'aperçu sur le côté",
-	"markdown.showLockedPreviewToSide.title": "Ouvrir l'aperçu verrrouillé sur le côté",
-	"markdown.showSource.title": "Afficher la source",
-	"markdown.styles.dec": "Liste d'URL ou de chemins locaux de feuilles de style CSS à utiliser dans l'aperçu Markdown. Les chemins relatifs sont interprétés par rapport au dossier ouvert dans l'explorateur. S'il n'y a aucun dossier ouvert, ils sont interprétés par rapport à l'emplacement du fichier Markdown. Tous les signes '\\' doivent être écrits sous la forme '\\\\'.",
-	"markdown.showPreviewSecuritySelector.title": "Changer les paramètres de sécurité de l'aperçu",
-	"markdown.trace.desc": "Active la journalisation du débogage pour l'extension Markdown.",
-	"markdown.preview.refresh.title": "Actualiser l'aperçu",
-	"markdown.preview.toggleLock.title": "Activer/désactiver le verrouillage de l'aperçu"
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/markdown/out/commands.i18n.json b/i18n/fra/extensions/markdown/out/commands.i18n.json
deleted file mode 100644
index cb8bd2f9769..00000000000
--- a/i18n/fra/extensions/markdown/out/commands.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"previewTitle": "Prévisualiser {0}",
-	"onPreviewStyleLoadError": "Impossible de charger 'markdown.styles' : {0}"
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/markdown/out/commands/onPreviewStyleLoadError.i18n.json b/i18n/fra/extensions/markdown/out/commands/onPreviewStyleLoadError.i18n.json
deleted file mode 100644
index 69d5cb1c1f2..00000000000
--- a/i18n/fra/extensions/markdown/out/commands/onPreviewStyleLoadError.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"onPreviewStyleLoadError": "Impossible de charger 'markdown.styles' : {0}"
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/markdown/out/extension.i18n.json b/i18n/fra/extensions/markdown/out/extension.i18n.json
deleted file mode 100644
index a5db2a445e3..00000000000
--- a/i18n/fra/extensions/markdown/out/extension.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"onPreviewStyleLoadError": "Impossible de charger 'markdown.styles' : {0}",
-	"previewTitle": "Prévisualiser {0}"
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/markdown/out/features/preview.i18n.json b/i18n/fra/extensions/markdown/out/features/preview.i18n.json
deleted file mode 100644
index 9e9f654e2f9..00000000000
--- a/i18n/fra/extensions/markdown/out/features/preview.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"lockedPreviewTitle": "[Aperçu] {0}",
-	"previewTitle": "Prévisualiser {0}"
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/markdown/out/features/previewContentProvider.i18n.json b/i18n/fra/extensions/markdown/out/features/previewContentProvider.i18n.json
deleted file mode 100644
index 38a6bf3c24e..00000000000
--- a/i18n/fra/extensions/markdown/out/features/previewContentProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"preview.securityMessage.text": "Du contenu a été désactivé dans ce document",
-	"preview.securityMessage.title": "Le contenu potentiellement dangereux ou précaire a été désactivé dans l’aperçu du format markdown. Modifier le paramètre de sécurité Aperçu Markdown afin d’autoriser les contenus non sécurisés ou activer les scripts",
-	"preview.securityMessage.label": "Avertissement de sécurité de contenu désactivé"
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/markdown/out/previewContentProvider.i18n.json b/i18n/fra/extensions/markdown/out/previewContentProvider.i18n.json
deleted file mode 100644
index 2eb7c81389d..00000000000
--- a/i18n/fra/extensions/markdown/out/previewContentProvider.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"preview.securityMessage.text": "Du contenu a été désactivé dans ce document",
-	"preview.securityMessage.title": "Le contenu potentiellement dangereux ou précaire a été désactivé dans l’aperçu du format markdown. Modifier le paramètre de sécurité Aperçu Markdown afin d’autoriser les contenus non sécurisés ou activer les scripts",
-	"preview.securityMessage.label": "Avertissement de sécurité de contenu désactivé"
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/markdown/out/security.i18n.json b/i18n/fra/extensions/markdown/out/security.i18n.json
deleted file mode 100644
index b3c4ab567f3..00000000000
--- a/i18n/fra/extensions/markdown/out/security.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"strict.title": "Strict",
-	"strict.description": "Charger uniquement le contenu sécurisé.",
-	"insecureContent.title": "Autoriser le contenu non sécurisé",
-	"insecureContent.description": "Activer le chargement de contenu sur http",
-	"disable.title": "Désactiver",
-	"disable.description": "Autorisez tout le contenu et l’exécution des scripts. Non recommandé",
-	"moreInfo.title": "Informations",
-	"enableSecurityWarning.title": "Activer l'aperçu d'avertissements de sécurité pour cet espace de travail",
-	"disableSecurityWarning.title": "Désactiver l'aperçu d'avertissements de sécurité pour cet espace de travail",
-	"toggleSecurityWarning.description": "N’affecte pas le niveau de sécurité du contenu",
-	"preview.showPreviewSecuritySelector.title": "Sélectionner les paramètres de sécurité pour les aperçus Markdown dans cet espace de travail"
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/markdown/package.i18n.json b/i18n/fra/extensions/markdown/package.i18n.json
deleted file mode 100644
index f5aede8507b..00000000000
--- a/i18n/fra/extensions/markdown/package.i18n.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Fonctionnalités de langage Markdown",
-	"description": "Fournit une prise en charge riche de langage pour Markdown",
-	"markdown.preview.breaks.desc": "Définit l'affichage des sauts de ligne dans l'aperçu Markdown. Si la valeur est 'true', crée un <br> pour chaque nouvelle ligne.",
-	"markdown.preview.linkify": "Activez ou désactivez la conversion de texte de type URL en liens dans l’aperçu Markdown.",
-	"markdown.preview.doubleClickToSwitchToEditor.desc": "Double-cliquez dans l'aperçu Markdown pour passer à l'éditeur.",
-	"markdown.preview.fontFamily.desc": "Contrôle la famille de polices utilisée dans l'aperçu Markdown.",
-	"markdown.preview.fontSize.desc": "Contrôle la taille de police en pixels utilisée dans l'aperçu Markdown.",
-	"markdown.preview.lineHeight.desc": "Contrôle la hauteur de ligne utilisée dans l'aperçu Markdown. Ce nombre est relatif à la taille de police.",
-	"markdown.preview.markEditorSelection.desc": "Permet de marquer la sélection actuelle de l'éditeur dans l'aperçu Markdown.",
-	"markdown.preview.scrollEditorWithPreview.desc": "Lors du défilement de l'aperçu markdown, actualiser l’affichage de l’éditeur.",
-	"markdown.preview.scrollPreviewWithEditor.desc": "Lors du défilement d’un éditeur markdow, actualiser l’affichage de l’aperçu.",
-	"markdown.preview.scrollPreviewWithEditorSelection.desc": "[Déprécié] Fait défiler l'aperçu Markdown pour révéler la ligne actuellement sélectionnée dans l'éditeur.",
-	"markdown.preview.scrollPreviewWithEditorSelection.deprecationMessage": "Ce paramètre a été remplacé par 'markdown.preview.scrollPreviewWithEditor' et n'a plus aucun effet.",
-	"markdown.preview.title": "Ouvrir l'aperçu",
-	"markdown.previewFrontMatter.dec": "Définit comment les pages liminaires YAML doivent être affichées dans l'aperçu Markdown. L'option 'hide' supprime les pages liminaires. Sinon, elles sont traitées comme du contenu Markdown.",
-	"markdown.previewSide.title": "Ouvrir l'aperçu sur le côté",
-	"markdown.showLockedPreviewToSide.title": "Ouvrir l'aperçu verrrouillé sur le côté",
-	"markdown.showSource.title": "Afficher la source",
-	"markdown.styles.dec": "Liste d'URL ou de chemins locaux de feuilles de style CSS à utiliser dans l'aperçu Markdown. Les chemins relatifs sont interprétés par rapport au dossier ouvert dans l'explorateur. S'il n'y a aucun dossier ouvert, ils sont interprétés par rapport à l'emplacement du fichier Markdown. Tous les signes '\\' doivent être écrits sous la forme '\\\\'.",
-	"markdown.showPreviewSecuritySelector.title": "Changer les paramètres de sécurité de l'aperçu",
-	"markdown.trace.desc": "Active la journalisation du débogage pour l'extension Markdown.",
-	"markdown.preview.refresh.title": "Actualiser l'aperçu",
-	"markdown.preview.toggleLock.title": "Activer/désactiver le verrouillage de l'aperçu"
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/merge-conflict/out/codelensProvider.i18n.json b/i18n/fra/extensions/merge-conflict/out/codelensProvider.i18n.json
deleted file mode 100644
index 7eff1014004..00000000000
--- a/i18n/fra/extensions/merge-conflict/out/codelensProvider.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"acceptCurrentChange": "Accepter la modification actuelle",
-	"acceptIncomingChange": "Accepter la modification entrante",
-	"acceptBothChanges": "Accepter les deux modifications",
-	"compareChanges": "Comparer les modifications"
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/merge-conflict/out/commandHandler.i18n.json b/i18n/fra/extensions/merge-conflict/out/commandHandler.i18n.json
deleted file mode 100644
index e88dbfdbe8f..00000000000
--- a/i18n/fra/extensions/merge-conflict/out/commandHandler.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"cursorNotInConflict": "Le curseur de l'éditeur ne se trouve pas dans un conflit de fusion",
-	"compareChangesTitle": "{0} : Modifications actuelles ⟷ Modifications entrantes",
-	"cursorOnCommonAncestorsRange": "Le curseur de l'éditeur se trouve dans le bloc d'ancêtres commun, déplacez-le dans le bloc \"current\" ou \"incoming\"",
-	"cursorOnSplitterRange": "Le curseur de l'éditeur se trouve dans le séparateur du conflit de fusion, déplacez-le dans le bloc \"actuelles\" ou \"entrantes\"",
-	"noConflicts": "Aucun conflit de fusion dans ce fichier",
-	"noOtherConflictsInThisFile": "Aucun autre conflit de fusion dans ce fichier"
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/merge-conflict/out/mergeDecorator.i18n.json b/i18n/fra/extensions/merge-conflict/out/mergeDecorator.i18n.json
deleted file mode 100644
index 55e5f4f2002..00000000000
--- a/i18n/fra/extensions/merge-conflict/out/mergeDecorator.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"currentChange": "(Modification actuelle)",
-	"incomingChange": "(Modification entrante)"
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/merge-conflict/package.i18n.json b/i18n/fra/extensions/merge-conflict/package.i18n.json
deleted file mode 100644
index c2da2db9fb3..00000000000
--- a/i18n/fra/extensions/merge-conflict/package.i18n.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Conflit de fusion",
-	"description": "Mise en surbrillance et commandes pour les conflits de fusion inline.",
-	"command.category": "Conflit de fusion",
-	"command.accept.all-current": "Accepter les modifications actuelles",
-	"command.accept.all-incoming": "Accepter toutes les modifications entrantes",
-	"command.accept.all-both": "Accepter les deux",
-	"command.accept.current": "Accepter les modifications actuelles",
-	"command.accept.incoming": "Accepter les modifications entrantes",
-	"command.accept.selection": "Accepter la sélection",
-	"command.accept.both": "Accepter les deux",
-	"command.next": "Conflit suivant",
-	"command.previous": "Conflit précédent",
-	"command.compare": "Conflit de comparaison des modifications actuelles",
-	"config.title": "Conflit de fusion",
-	"config.codeLensEnabled": "Activer/désactiver le bloc CodeLens du conflit de fusion dans l'éditeur",
-	"config.decoratorsEnabled": "Activer/désactiver les éléments décoratifs du conflit de fusion dans l'éditeur"
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/npm/out/features/bowerJSONContribution.i18n.json b/i18n/fra/extensions/npm/out/features/bowerJSONContribution.i18n.json
deleted file mode 100644
index 2396b308fb6..00000000000
--- a/i18n/fra/extensions/npm/out/features/bowerJSONContribution.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"json.bower.default": "Fichier bower.json par défaut",
-	"json.bower.error.repoaccess": "Échec de la requête destinée au dépôt bower : {0}",
-	"json.bower.latest.version": "dernière"
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/npm/out/features/packageJSONContribution.i18n.json b/i18n/fra/extensions/npm/out/features/packageJSONContribution.i18n.json
deleted file mode 100644
index a5bad7e965b..00000000000
--- a/i18n/fra/extensions/npm/out/features/packageJSONContribution.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"json.package.default": "Fichier package.json par défaut",
-	"json.npm.error.repoaccess": "Échec de la requête destinée au dépôt NPM : {0}",
-	"json.npm.latestversion": "Dernière version du package",
-	"json.npm.majorversion": "Correspond à la version principale la plus récente (1.x.x)",
-	"json.npm.minorversion": "Correspond à la version mineure la plus récente (1.2.x)",
-	"json.npm.version.hover": "Dernière version : {0}"
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/npm/out/main.i18n.json b/i18n/fra/extensions/npm/out/main.i18n.json
deleted file mode 100644
index 18fa5992ad7..00000000000
--- a/i18n/fra/extensions/npm/out/main.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"npm.parseError": "Détection de tâche Npm : impossible d’analyser le fichier {0}"
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/npm/out/npmView.i18n.json b/i18n/fra/extensions/npm/out/npmView.i18n.json
deleted file mode 100644
index e6a36b84cbc..00000000000
--- a/i18n/fra/extensions/npm/out/npmView.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noScripts": "Aucun script",
-	"noDebugOptions": "Impossible de lancer \"{0}\" pour le débogage, car les scripts n'ont pas d'option de débogage de nœud, par exemple, \"--inspect-brk\".",
-	"learnMore": "En savoir plus",
-	"ok": "OK",
-	"scriptInvalid": "Script \"{0}\" introuvable. Essayez d'actualiser la vue."
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/npm/out/tasks.i18n.json b/i18n/fra/extensions/npm/out/tasks.i18n.json
deleted file mode 100644
index 18fa5992ad7..00000000000
--- a/i18n/fra/extensions/npm/out/tasks.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"npm.parseError": "Détection de tâche Npm : impossible d’analyser le fichier {0}"
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/npm/package.i18n.json b/i18n/fra/extensions/npm/package.i18n.json
deleted file mode 100644
index dab74867a9e..00000000000
--- a/i18n/fra/extensions/npm/package.i18n.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"description": "Extension pour ajouter une prise en charge des tâches pour les scripts npm.",
-	"displayName": "Prise en charge de Npm pour VS Code",
-	"config.npm.autoDetect": "Contrôle si la détection automatique des scripts npm est activée ou désactivée. La valeur par défaut est activée.",
-	"config.npm.runSilent": "Exécutez les commandes npm avec l'option `--silent`.",
-	"config.npm.packageManager": "Le gestionnaire de paquets utilisé pour exécuter des scripts.",
-	"config.npm.exclude": "Configurer les profils glob pour les dossiers qui doivent être exclus de la détection de script automatique.",
-	"config.npm.enableScriptExplorer": "Activez une vue Explorateur pour les scripts npm.",
-	"config.npm.scriptExplorerAction": "Action de clic par défaut utilisée dans l’explorateur de scripts :  'open' ou 'run', la valeur par défaut est 'open'.",
-	"npm.parseError": "Détection de tâche Npm : impossible d’analyser le fichier {0}",
-	"taskdef.script": "Le script npm à personnaliser.",
-	"taskdef.path": "Chemin de dossier du fichier package.json qui fournit le script. Peut être ignoré.",
-	"view.name": "Scripts npm",
-	"command.refresh": "Actualiser",
-	"command.run": "Exécuter",
-	"command.debug": "Déboguer",
-	"command.openScript": "Ouvrir",
-	"command.runInstall": "Exécuter Install"
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/objective-c/package.i18n.json b/i18n/fra/extensions/objective-c/package.i18n.json
deleted file mode 100644
index def0474c8d7..00000000000
--- a/i18n/fra/extensions/objective-c/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Bases du langage Objective-C",
-	"description": "Fournit la coloration syntaxique et la correspondance des crochets dans les fichiers Objective-C."
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/package-json/out/features/bowerJSONContribution.i18n.json b/i18n/fra/extensions/package-json/out/features/bowerJSONContribution.i18n.json
deleted file mode 100644
index 2396b308fb6..00000000000
--- a/i18n/fra/extensions/package-json/out/features/bowerJSONContribution.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"json.bower.default": "Fichier bower.json par défaut",
-	"json.bower.error.repoaccess": "Échec de la requête destinée au dépôt bower : {0}",
-	"json.bower.latest.version": "dernière"
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/package-json/out/features/packageJSONContribution.i18n.json b/i18n/fra/extensions/package-json/out/features/packageJSONContribution.i18n.json
deleted file mode 100644
index a5bad7e965b..00000000000
--- a/i18n/fra/extensions/package-json/out/features/packageJSONContribution.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"json.package.default": "Fichier package.json par défaut",
-	"json.npm.error.repoaccess": "Échec de la requête destinée au dépôt NPM : {0}",
-	"json.npm.latestversion": "Dernière version du package",
-	"json.npm.majorversion": "Correspond à la version principale la plus récente (1.x.x)",
-	"json.npm.minorversion": "Correspond à la version mineure la plus récente (1.2.x)",
-	"json.npm.version.hover": "Dernière version : {0}"
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/package-json/package.i18n.json b/i18n/fra/extensions/package-json/package.i18n.json
deleted file mode 100644
index 35229bd6699..00000000000
--- a/i18n/fra/extensions/package-json/package.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	]
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/perl/package.i18n.json b/i18n/fra/extensions/perl/package.i18n.json
deleted file mode 100644
index e5deaf4d2e4..00000000000
--- a/i18n/fra/extensions/perl/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Bases du langage Perl",
-	"description": "Fournit la coloration syntaxique et la correspondance des crochets dans les fichiers Perl."
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/php-language-features/out/features/validationProvider.i18n.json b/i18n/fra/extensions/php-language-features/out/features/validationProvider.i18n.json
deleted file mode 100644
index b20a0679e61..00000000000
--- a/i18n/fra/extensions/php-language-features/out/features/validationProvider.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"php.useExecutablePath": "Autorisez-vous l'exécution de {0} (défini en tant que paramètre d'espace de travail) pour effectuer une validation lint sur les fichiers PHP ?",
-	"php.yes": "Autoriser",
-	"php.no": "Interdire",
-	"wrongExecutable": "Impossible d'effectuer la validation, car {0} n'est pas un exécutable PHP valide. Utilisez le paramètre 'php.validate.executablePath' pour configurer l'exécutable PHP.",
-	"noExecutable": "Impossible d'effectuer la validation, car aucun exécutable PHP n'est défini. Utilisez le paramètre 'php.validate.executablePath' pour configurer l'exécutable PHP.",
-	"unknownReason": "Échec de l'exécution de php avec le chemin : {0}. Raison inconnue."
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/php-language-features/package.i18n.json b/i18n/fra/extensions/php-language-features/package.i18n.json
deleted file mode 100644
index 60709998959..00000000000
--- a/i18n/fra/extensions/php-language-features/package.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"configuration.suggest.basic": "Configure l'activation ou la désactivation des suggestions de langage PHP intégrées. La fonctionnalité de prise en charge suggère les variables globales et les variables de session PHP.",
-	"configuration.validate.enable": "Activez/désactivez la validation PHP intégrée.",
-	"configuration.validate.executablePath": "Pointe vers l'exécutable PHP.",
-	"configuration.validate.run": "Spécifie si linter est exécuté au moment de l'enregistrement ou de la saisie.",
-	"configuration.title": "PHP",
-	"commands.categroy.php": "PHP",
-	"command.untrustValidationExecutable": "Interdire l'exécutable de validation PHP (défini comme paramètre d'espace de travail)",
-	"displayName": "Fonctionnalités de langage PHP",
-	"description": "Fournit une prise en charge de langage riche pour les fichiers PHP."
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/php/out/features/validationProvider.i18n.json b/i18n/fra/extensions/php/out/features/validationProvider.i18n.json
deleted file mode 100644
index b20a0679e61..00000000000
--- a/i18n/fra/extensions/php/out/features/validationProvider.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"php.useExecutablePath": "Autorisez-vous l'exécution de {0} (défini en tant que paramètre d'espace de travail) pour effectuer une validation lint sur les fichiers PHP ?",
-	"php.yes": "Autoriser",
-	"php.no": "Interdire",
-	"wrongExecutable": "Impossible d'effectuer la validation, car {0} n'est pas un exécutable PHP valide. Utilisez le paramètre 'php.validate.executablePath' pour configurer l'exécutable PHP.",
-	"noExecutable": "Impossible d'effectuer la validation, car aucun exécutable PHP n'est défini. Utilisez le paramètre 'php.validate.executablePath' pour configurer l'exécutable PHP.",
-	"unknownReason": "Échec de l'exécution de php avec le chemin : {0}. Raison inconnue."
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/php/package.i18n.json b/i18n/fra/extensions/php/package.i18n.json
deleted file mode 100644
index 74329100595..00000000000
--- a/i18n/fra/extensions/php/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Concepts de base du langage PHP",
-	"description": "Fournit la coloration syntaxique et la correspondance des parenthèses dans les fichiers PHP."
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/powershell/package.i18n.json b/i18n/fra/extensions/powershell/package.i18n.json
deleted file mode 100644
index 84a10e53a7d..00000000000
--- a/i18n/fra/extensions/powershell/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Bases du langage PowerShell",
-	"description": "Fournit des extraits de code, la coloration syntaxique, la correspondance des crochets et le repli dans les fichiers PowerShell."
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/pug/package.i18n.json b/i18n/fra/extensions/pug/package.i18n.json
deleted file mode 100644
index a73e18d97c6..00000000000
--- a/i18n/fra/extensions/pug/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Bases du langage Pug",
-	"description": "Fournit la coloration syntaxique et la correspondance des crochets dans les fichiers Pug."
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/python/package.i18n.json b/i18n/fra/extensions/python/package.i18n.json
deleted file mode 100644
index a3eafdab2f1..00000000000
--- a/i18n/fra/extensions/python/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Bases du langage Python",
-	"description": "Fournit la coloration syntaxique, la correspondance des crochets et le repli dans les fichiers Python."
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/r/package.i18n.json b/i18n/fra/extensions/r/package.i18n.json
deleted file mode 100644
index 0c86f299095..00000000000
--- a/i18n/fra/extensions/r/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Bases du langage R",
-	"description": "Fournit la coloration syntaxique et la correspondance des crochets dans les fichiers R."
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/razor/package.i18n.json b/i18n/fra/extensions/razor/package.i18n.json
deleted file mode 100644
index c9d1398180c..00000000000
--- a/i18n/fra/extensions/razor/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Bases du langage Razor",
-	"description": "Fournit la coloration syntaxique, la correspondance des crochets et le repli dans les fichiers Razor."
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/ruby/package.i18n.json b/i18n/fra/extensions/ruby/package.i18n.json
deleted file mode 100644
index 0ee328c3806..00000000000
--- a/i18n/fra/extensions/ruby/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Bases du langage Ruby",
-	"description": "Fournit la coloration syntaxique et la correspondance des crochets dans les fichiers Ruby."
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/rust/package.i18n.json b/i18n/fra/extensions/rust/package.i18n.json
deleted file mode 100644
index bdea3047f49..00000000000
--- a/i18n/fra/extensions/rust/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Bases du langage Rust",
-	"description": "Fournit la coloration syntaxique et la correspondance des crochets dans les fichiers Rust."
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/scss/package.i18n.json b/i18n/fra/extensions/scss/package.i18n.json
deleted file mode 100644
index 6417970edaf..00000000000
--- a/i18n/fra/extensions/scss/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Bases du langage SCSS",
-	"description": "Fournit la coloration syntaxique, la correspondance des crochets et le repli dans les fichiers SCSS."
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/search-rg/package.i18n.json b/i18n/fra/extensions/search-rg/package.i18n.json
deleted file mode 100644
index 6548209ebc7..00000000000
--- a/i18n/fra/extensions/search-rg/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Recherche (ripgrep)",
-	"description": "Effectue une recherche à l'aide de Ripgrep."
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/shaderlab/package.i18n.json b/i18n/fra/extensions/shaderlab/package.i18n.json
deleted file mode 100644
index 69bd806ab9b..00000000000
--- a/i18n/fra/extensions/shaderlab/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Concepts de base du langage Shaderlab",
-	"description": "Fournit la coloration syntaxique et la correspondance des crochets dans les fichiers Shaderlab."
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/shellscript/package.i18n.json b/i18n/fra/extensions/shellscript/package.i18n.json
deleted file mode 100644
index 4c38e7d6c7d..00000000000
--- a/i18n/fra/extensions/shellscript/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Bases du langage Shell Script",
-	"description": "Fournit la coloration syntaxique et la correspondance des crochets dans les fichiers Shell Script."
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/sql/package.i18n.json b/i18n/fra/extensions/sql/package.i18n.json
deleted file mode 100644
index c63217a408b..00000000000
--- a/i18n/fra/extensions/sql/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Bases du langage SQL",
-	"description": "Fournit la coloration syntaxique et la correspondance des crochets dans les fichiers SQL."
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/swift/package.i18n.json b/i18n/fra/extensions/swift/package.i18n.json
deleted file mode 100644
index 5db65c48d13..00000000000
--- a/i18n/fra/extensions/swift/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Bases du langage Swift",
-	"description": "Fournit des extraits de code, la coloration syntaxique et la correspondance des crochets dans les fichiers Swift."
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/theme-abyss/package.i18n.json b/i18n/fra/extensions/theme-abyss/package.i18n.json
deleted file mode 100644
index ce756fafc1a..00000000000
--- a/i18n/fra/extensions/theme-abyss/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Thème Abyss",
-	"description": "Thème Abyss pour Visual Studio Code"
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/theme-defaults/package.i18n.json b/i18n/fra/extensions/theme-defaults/package.i18n.json
deleted file mode 100644
index a408cc18818..00000000000
--- a/i18n/fra/extensions/theme-defaults/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Thèmes par défaut",
-	"description": "Les thèmes clair et sombre par défaut (Plus et Visual Studio)"
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/theme-kimbie-dark/package.i18n.json b/i18n/fra/extensions/theme-kimbie-dark/package.i18n.json
deleted file mode 100644
index 95e551b7a17..00000000000
--- a/i18n/fra/extensions/theme-kimbie-dark/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Thème Kimble Dark",
-	"description": "Thème Kimble dark pour Visual Studio Code"
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/theme-monokai-dimmed/package.i18n.json b/i18n/fra/extensions/theme-monokai-dimmed/package.i18n.json
deleted file mode 100644
index 201ffd8833c..00000000000
--- a/i18n/fra/extensions/theme-monokai-dimmed/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Thème Monokai Dimmed",
-	"description": "Thème Monokai Dimmed pour Visual Studio Code"
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/theme-monokai/package.i18n.json b/i18n/fra/extensions/theme-monokai/package.i18n.json
deleted file mode 100644
index e639491e00c..00000000000
--- a/i18n/fra/extensions/theme-monokai/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Thème Monokai",
-	"description": "Thème Monokai pour Visual Studio Code"
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/theme-quietlight/package.i18n.json b/i18n/fra/extensions/theme-quietlight/package.i18n.json
deleted file mode 100644
index 8dfa3be42f8..00000000000
--- a/i18n/fra/extensions/theme-quietlight/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Thème Quiet Light",
-	"description": "Thème Quiet Light pour Visual Studio Code"
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/theme-red/package.i18n.json b/i18n/fra/extensions/theme-red/package.i18n.json
deleted file mode 100644
index 34a9bfbd394..00000000000
--- a/i18n/fra/extensions/theme-red/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Thème Red",
-	"description": "Thème Red pour Visual Studio Code"
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/theme-seti/package.i18n.json b/i18n/fra/extensions/theme-seti/package.i18n.json
deleted file mode 100644
index 503650a41a0..00000000000
--- a/i18n/fra/extensions/theme-seti/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Thème Seti pour les icônes de fichiers",
-	"description": "Un thème  pour les icônes de fichiers fait avec les icônes de fichiers Seti UI"
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/theme-solarized-dark/package.i18n.json b/i18n/fra/extensions/theme-solarized-dark/package.i18n.json
deleted file mode 100644
index 24cd0d5beac..00000000000
--- a/i18n/fra/extensions/theme-solarized-dark/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Thème Solarized Dark",
-	"description": "Thème Solarized Dark pour Visual Studio Code"
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/theme-solarized-light/package.i18n.json b/i18n/fra/extensions/theme-solarized-light/package.i18n.json
deleted file mode 100644
index ba099a32f92..00000000000
--- a/i18n/fra/extensions/theme-solarized-light/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Thème Solarized Light",
-	"description": "Thème Solarized Light pour Visual Studio Code"
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/theme-tomorrow-night-blue/package.i18n.json b/i18n/fra/extensions/theme-tomorrow-night-blue/package.i18n.json
deleted file mode 100644
index 364150da604..00000000000
--- a/i18n/fra/extensions/theme-tomorrow-night-blue/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Thème Tomorrow Night Blue",
-	"description": "Thème Tomorrow Night Blue pour Visual Studio Code"
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/typescript-basics/package.i18n.json b/i18n/fra/extensions/typescript-basics/package.i18n.json
deleted file mode 100644
index e9a0ef2fe1a..00000000000
--- a/i18n/fra/extensions/typescript-basics/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Bases du langage TypeScript",
-	"description": "Fournit des extraits de code, la coloration syntaxique, la correspondance des crochets et le repli dans les fichiers TypeScript."
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/typescript-language-features/out/commands.i18n.json b/i18n/fra/extensions/typescript-language-features/out/commands.i18n.json
deleted file mode 100644
index 1738a01dc86..00000000000
--- a/i18n/fra/extensions/typescript-language-features/out/commands.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"typescript.projectConfigNoWorkspace": "Ouvrez un dossier dans VS Code pour utiliser un projet TypeScript ou JavaScript",
-	"typescript.projectConfigUnsupportedFile": "Impossible de déterminer le projet TypeScript ou JavaScript. Type de fichier non pris en charge",
-	"typescript.projectConfigCouldNotGetInfo": "Impossible de déterminer le projet TypeScript ou JavaScript",
-	"typescript.noTypeScriptProjectConfig": "Le fichier ne fait pas partie d'un projet TypeScript. Cliquer [ici]({0}) pour en savoir plus.",
-	"typescript.noJavaScriptProjectConfig": "Le fichier ne fait pas partie d'un projet JavaScript. Cliquer [ici]({0}) pour en savoir plus.",
-	"typescript.configureTsconfigQuickPick": "Configurer tsconfig.json",
-	"typescript.configureJsconfigQuickPick": "Configurer jsconfig.json"
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/typescript-language-features/out/features/completionItemProvider.i18n.json b/i18n/fra/extensions/typescript-language-features/out/features/completionItemProvider.i18n.json
deleted file mode 100644
index a9b06927dc3..00000000000
--- a/i18n/fra/extensions/typescript-language-features/out/features/completionItemProvider.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"selectCodeAction": "Sélectionner l'action de code à appliquer",
-	"acquiringTypingsLabel": "Acquisition des typings...",
-	"acquiringTypingsDetail": "Acquisition des définitions typings pour IntelliSense.",
-	"autoImportLabel": "Importation automatique depuis {0}"
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/typescript-language-features/out/features/directiveCommentCompletionProvider.i18n.json b/i18n/fra/extensions/typescript-language-features/out/features/directiveCommentCompletionProvider.i18n.json
deleted file mode 100644
index 8096453313a..00000000000
--- a/i18n/fra/extensions/typescript-language-features/out/features/directiveCommentCompletionProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"ts-check": "Active la vérification sémantique dans un fichier JavaScript. Doit se trouver au début d'un fichier.",
-	"ts-nocheck": "Désactive la vérification sémantique dans un fichier JavaScript. Doit se trouver au début d'un fichier.",
-	"ts-ignore": "Supprime les erreurs @ts-check sur la ligne suivante d'un fichier."
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/typescript-language-features/out/features/implementationsCodeLensProvider.i18n.json b/i18n/fra/extensions/typescript-language-features/out/features/implementationsCodeLensProvider.i18n.json
deleted file mode 100644
index 2e7856eb1be..00000000000
--- a/i18n/fra/extensions/typescript-language-features/out/features/implementationsCodeLensProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"oneImplementationLabel": "1 implémentation",
-	"manyImplementationLabel": "{0} implémentations",
-	"implementationsErrorLabel": "Impossible de déterminer les implémentations"
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/typescript-language-features/out/features/jsDocCompletionProvider.i18n.json b/i18n/fra/extensions/typescript-language-features/out/features/jsDocCompletionProvider.i18n.json
deleted file mode 100644
index 7915d99dbd8..00000000000
--- a/i18n/fra/extensions/typescript-language-features/out/features/jsDocCompletionProvider.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"typescript.jsDocCompletionItem.documentation": "Commentaire JSDoc"
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/typescript-language-features/out/features/organizeImports.i18n.json b/i18n/fra/extensions/typescript-language-features/out/features/organizeImports.i18n.json
deleted file mode 100644
index 064e933aa67..00000000000
--- a/i18n/fra/extensions/typescript-language-features/out/features/organizeImports.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"oraganizeImportsAction.title": "Organiser les Imports"
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/typescript-language-features/out/features/quickFixProvider.i18n.json b/i18n/fra/extensions/typescript-language-features/out/features/quickFixProvider.i18n.json
deleted file mode 100644
index f10b35e9e5b..00000000000
--- a/i18n/fra/extensions/typescript-language-features/out/features/quickFixProvider.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"fixAllInFileLabel": "{0} (Corriger tout dans le fichier)"
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/typescript-language-features/out/features/referencesCodeLensProvider.i18n.json b/i18n/fra/extensions/typescript-language-features/out/features/referencesCodeLensProvider.i18n.json
deleted file mode 100644
index 927ba6cdb77..00000000000
--- a/i18n/fra/extensions/typescript-language-features/out/features/referencesCodeLensProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"oneReferenceLabel": "1 référence",
-	"manyReferenceLabel": "{0} références",
-	"referenceErrorLabel": "Impossible de déterminer les références"
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/typescript-language-features/out/features/taskProvider.i18n.json b/i18n/fra/extensions/typescript-language-features/out/features/taskProvider.i18n.json
deleted file mode 100644
index 451f7029bac..00000000000
--- a/i18n/fra/extensions/typescript-language-features/out/features/taskProvider.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"buildTscLabel": "build - {0}",
-	"buildAndWatchTscLabel": "watch - {0}"
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/typescript-language-features/out/features/updatePathsOnRename.i18n.json b/i18n/fra/extensions/typescript-language-features/out/features/updatePathsOnRename.i18n.json
deleted file mode 100644
index 0ddac6f5264..00000000000
--- a/i18n/fra/extensions/typescript-language-features/out/features/updatePathsOnRename.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"prompt": "Mettre à jour automatiquement les importations pour le fichier déplacé  : '{0}' ?",
-	"reject.title": "Non",
-	"accept.title": "Oui",
-	"always.title": "Oui, toujours mettre à jour les importations",
-	"never.title": "Non, ne jamais mettre à jour les importations"
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/typescript-language-features/out/typescriptServiceClient.i18n.json b/i18n/fra/extensions/typescript-language-features/out/typescriptServiceClient.i18n.json
deleted file mode 100644
index f31ff437ec4..00000000000
--- a/i18n/fra/extensions/typescript-language-features/out/typescriptServiceClient.i18n.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noServerFound": "Le chemin {0} ne pointe pas vers une installation tsserver valide. Utilisation par défaut de la version TypeScript groupée.",
-	"serverCouldNotBeStarted": "Impossible de démarrer le serveur de langage TypeScript. Message d'erreur : {0}",
-	"typescript.openTsServerLog.notSupported": "La journalisation du serveur TS nécessite TS 2.2.2+",
-	"typescript.openTsServerLog.loggingNotEnabled": "La journalisation du serveur TS est désactivée. Définissez 'typescript.tsserver.log' et redémarrez le serveur TS pour activer la journalisation",
-	"typescript.openTsServerLog.enableAndReloadOption": "Activer la journalisation et redémarrer le serveur TS",
-	"typescript.openTsServerLog.noLogFile": "Le serveur TS n'a pas démarré la journalisation.",
-	"openTsServerLog.openFileFailedFailed": "Impossible d'ouvrir le fichier journal du serveur TS",
-	"serverDiedAfterStart": "Le service de langage TypeScript s'est subitement arrêté 5 fois juste après avoir démarré. Il n'y aura pas d'autres redémarrages.",
-	"serverDiedReportIssue": "Signaler un problème",
-	"serverDied": "Le service de langage TypeScript s'est subitement arrêté 5 fois au cours des 5 dernières minutes."
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/typescript-language-features/out/utils/api.i18n.json b/i18n/fra/extensions/typescript-language-features/out/utils/api.i18n.json
deleted file mode 100644
index 61ed0b60124..00000000000
--- a/i18n/fra/extensions/typescript-language-features/out/utils/api.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"invalidVersion": "version non valide"
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/typescript-language-features/out/utils/logger.i18n.json b/i18n/fra/extensions/typescript-language-features/out/utils/logger.i18n.json
deleted file mode 100644
index 8f5ef5415b9..00000000000
--- a/i18n/fra/extensions/typescript-language-features/out/utils/logger.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"channelName": "TypeScript"
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/typescript-language-features/out/utils/projectStatus.i18n.json b/i18n/fra/extensions/typescript-language-features/out/utils/projectStatus.i18n.json
deleted file mode 100644
index b39c51e947e..00000000000
--- a/i18n/fra/extensions/typescript-language-features/out/utils/projectStatus.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hintExclude": "Pour activer les fonctionnalités de langage JavaScript/TypeScript à l'échelle du projet, excluez les dossiers contenant de nombreux fichiers, par exemple : {0}",
-	"hintExclude.generic": "Pour activer les fonctionnalités de langage JavaScript/TypeScript à l'échelle du projet, excluez les dossiers volumineux contenant des fichiers sources inutilisés.",
-	"large.label": "Configurer les exclusions",
-	"hintExclude.tooltip": "Pour activer les fonctionnalités de langage JavaScript/TypeScript à l'échelle du projet, excluez les dossiers volumineux contenant des fichiers sources inutilisés."
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/typescript-language-features/out/utils/typingsStatus.i18n.json b/i18n/fra/extensions/typescript-language-features/out/utils/typingsStatus.i18n.json
deleted file mode 100644
index 108ea8e9d3c..00000000000
--- a/i18n/fra/extensions/typescript-language-features/out/utils/typingsStatus.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"installingPackages": "Récupération (fetch) des données pour l'amélioration de TypeScript IntelliSense",
-	"typesInstallerInitializationFailed.title": "Impossible d'installer des fichiers de typages pour les fonctionnalités de langage JavaScript. Vérifiez que NPM est installé ou configurez 'typescript.npm' dans vos paramètres utilisateur. Cliquer [ici]({0}) pour en savoir plus.",
-	"typesInstallerInitializationFailed.doNotCheckAgain": "Ne plus afficher"
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/typescript-language-features/out/utils/versionPicker.i18n.json b/i18n/fra/extensions/typescript-language-features/out/utils/versionPicker.i18n.json
deleted file mode 100644
index c6da9b3843f..00000000000
--- a/i18n/fra/extensions/typescript-language-features/out/utils/versionPicker.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"useVSCodeVersionOption": "Utiliser la version de VS Code",
-	"useWorkspaceVersionOption": "Utiliser la version de l'espace de travail",
-	"learnMore": "En savoir plus",
-	"selectTsVersion": "Sélectionner la version TypeScript utilisée pour les fonctionnalités de langage JavaScript et TypeScript"
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/typescript-language-features/out/utils/versionProvider.i18n.json b/i18n/fra/extensions/typescript-language-features/out/utils/versionProvider.i18n.json
deleted file mode 100644
index 5c32ecfe106..00000000000
--- a/i18n/fra/extensions/typescript-language-features/out/utils/versionProvider.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"couldNotLoadTsVersion": "Impossible de charger la version TypeScript dans ce chemin",
-	"noBundledServerFound": "Le tsserver de VSCode a été supprimé par une autre application, par exemple, un outil de détection de virus mal configuré. Réinstallez VS Code."
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/typescript-language-features/package.i18n.json b/i18n/fra/extensions/typescript-language-features/package.i18n.json
deleted file mode 100644
index 12cad4e4a28..00000000000
--- a/i18n/fra/extensions/typescript-language-features/package.i18n.json
+++ /dev/null
@@ -1,67 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Fonctionnalités de langage TypeScript et JavaScript",
-	"description": "Fournit une prise en charge riche de langage pour JavaScript et TypeScript.",
-	"reloadProjects.title": "Recharger le projet",
-	"configuration.typescript": "TypeScript",
-	"typescript.useCodeSnippetsOnMethodSuggest.dec": "Fonctions complètes avec leur signature de paramètre.",
-	"typescript.tsdk.desc": "Spécifie le chemin de dossier contenant les fichiers tsserver et lib*.d.ts à utiliser.",
-	"typescript.disableAutomaticTypeAcquisition": "Désactive l'acquisition de type automatique. Nécessite TypeScript >= 2.0.6.",
-	"typescript.tsserver.log": "Active la journalisation du serveur TS dans un fichier. Ce journal peut être utilisé pour diagnostiquer les problèmes du serveur TS. Il peut contenir des chemins de fichier, du code source et d'autres informations potentiellement sensibles de votre projet.",
-	"typescript.tsserver.pluginPaths": "Chemins d’accès supplémentaires pour découvrir les plugins de Service de langage Typescript. Nécessite TypeScript > = 2.3.0.",
-	"typescript.tsserver.pluginPaths.item": "Un chemin absolu ou un chemin relatif. Le chemin d’accès relatif sera résolu en fonction des dossiers de l’espace de travail.",
-	"typescript.tsserver.trace": "Active le traçage des messages envoyés au serveur TS. Cette trace peut être utilisée pour diagnostiquer les problèmes du serveur TS. Elle peut contenir des chemins de fichier, du code source et d'autres informations potentiellement sensibles de votre projet.",
-	"typescript.validate.enable": "Activez/désactivez la validation TypeScript.",
-	"typescript.format.enable": "Activez/désactivez le formateur TypeScript par défaut.",
-	"javascript.format.enable": "Activez/désactivez le formateur JavaScript par défaut.",
-	"format.insertSpaceAfterCommaDelimiter": "Définit le traitement des espaces après une virgule de délimitation.",
-	"format.insertSpaceAfterConstructor": "Définit le traitement des espaces après le mot clé constructor. Nécessite TypeScript >= 2.3.0.",
-	"format.insertSpaceAfterSemicolonInForStatements": " Définit le traitement des espaces après un point-virgule dans une instruction for.",
-	"format.insertSpaceBeforeAndAfterBinaryOperators": "Définit le traitement des espaces après un opérateur binaire.",
-	"format.insertSpaceAfterKeywordsInControlFlowStatements": "Définit la gestion des espaces après les mots clés dans une instruction de flux de contrôle.",
-	"format.insertSpaceAfterFunctionKeywordForAnonymousFunctions": "Définit le traitement des espaces après le mot clé function pour les fonctions anonymes.",
-	"format.insertSpaceBeforeFunctionParenthesis": "Définit la gestion des espaces avant les parenthèses des arguments d'une fonction. Nécessite TypeScript >= 2.1.5.",
-	"format.insertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis": "Définit l’espace après ouverture et avant la fermeture de parenthèses non vides.",
-	"format.insertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets": "Définit l’espace après ouverture et avant la fermeture de crochets non vides.",
-	"format.insertSpaceAfterOpeningAndBeforeClosingNonemptyBraces": "Définit l’espace après ouverture et avant la fermeture d'accolades non vides. Nécessite le TypeScript >= 2.3.0.",
-	"format.insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces": "Définit la gestion de l'espace après l'ouverture et avant la fermeture des accolades de la chaîne de modèle. Nécessite TypeScript >= 2.0.6.",
-	"format.insertSpaceAfterOpeningAndBeforeClosingJsxExpressionBraces": "Définit la gestion de l'espace après l'ouverture et avant la fermeture des accolades de l'expression JSX. Nécessite TypeScript >= 2.0.6.",
-	"format.insertSpaceAfterTypeAssertion": "Définit le traitement des espaces après les assertions de type dans TypeScript. Nécessite TypeScript >= 2.4.",
-	"format.placeOpenBraceOnNewLineForFunctions": "Définit si une accolade ouvrante dans une fonction est placée ou non sur une nouvelle ligne.",
-	"format.placeOpenBraceOnNewLineForControlBlocks": "Définit si une accolade ouvrante dans un bloc de contrôle est placée ou non sur une nouvelle ligne.",
-	"javascript.validate.enable": "Activez/désactivez la validation JavaScript.",
-	"goToProjectConfig.title": "Accéder à la configuration du projet",
-	"javascript.referencesCodeLens.enabled": "Activez/désactivez les références CodeLens dans les fichiers JavaScript.",
-	"typescript.referencesCodeLens.enabled": "Activez/désactivez les références CodeLens dans les fichiers TypeScript. Nécessite TypeScript >= 2.0.6.",
-	"typescript.implementationsCodeLens.enabled": "Activer/désactiver CodeLens dans les implémentations. Nécessite TypeScript >= 2.2.0.",
-	"typescript.openTsServerLog.title": "Ouvrir le journal du serveur TS",
-	"typescript.restartTsServer": "Redémarrer le serveur TS",
-	"typescript.selectTypeScriptVersion.title": "Sélectionner la version de TypeScript",
-	"typescript.reportStyleChecksAsWarnings": "Rapporter les vérifications de style comme des avertissements",
-	"jsDocCompletion.enabled": "Activer/désactiver les commentaires JSDoc automatiques",
-	"javascript.implicitProjectConfig.checkJs": "Activez/désactivez la vérification sémantique des fichiers JavaScript. Les fichiers jsconfig.json ou tsconfig.json existants remplacent ce paramètre. Nécessite TypeScript >= 2.3.1.",
-	"typescript.npm": "Spécifie le chemin de l'exécutable NPM utilisé pour l'acquisition de type automatique. Nécessite TypeScript >= 2.3.4.",
-	"typescript.check.npmIsInstalled": "Vérifie si NPM est installé pour l'acquisition de type automatique.",
-	"javascript.nameSuggestions": "Activez/désactivez l'inclusion de noms uniques à partir du fichier dans les listes de suggestions JavaScript.",
-	"typescript.tsc.autoDetect": "Contrôle la détection automatique des tâches tsc. 'off' désactive cette fonctionnalité. 'build' crée uniquement des tâches de compilation à exécution unique. 'watch' crée uniquement des tâches de compilation et de watch. 'on' crée les deux les tâches build et watch. La valeur par défaut est 'on'.",
-	"typescript.problemMatchers.tsc.label": "Problèmes liés à TypeScript",
-	"typescript.problemMatchers.tscWatch.label": "Problèmes liés à TypeScript (mode espion)",
-	"typescript.quickSuggestionsForPaths": "Activer/désactiver les suggestions rapides lorsque vous saisissez un chemin d’import.",
-	"typescript.locale": "Définit les paramètres régionaux utilisés pour signaler les erreurs JavaScript et TypeScript. Nécessite TypeScript >= 2.6.0. La valeur par défaut 'null' utilise les paramètres régionaux de VS Code.",
-	"javascript.implicitProjectConfig.experimentalDecorators": "Activez/désactivez 'experimentalDecorators' pour les fichiers JavaScript qui n'appartiennent pas à un projet. Les fichiers jsconfig.json ou tsconfig.json existants remplacent ce paramètre. Nécessite TypeScript >= 2.3.1.",
-	"typescript.autoImportSuggestions.enabled": "Activez/désactivez les suggestions d'importation automatique. Nécessite TypeScript >= 2.6.1",
-	"typescript.experimental.syntaxFolding": "Active/désactive les marqueurs de réduction en fonction de la syntaxe.",
-	"taskDefinition.tsconfig.description": "Fichier tsconfig qui définit la build TS.",
-	"javascript.suggestionActions.enabled": "Activer/désactiver le diagnostic de suggestion des fichiers JavaScript dans l’éditeur. Nécessite TypeScript > = 2.8",
-	"typescript.suggestionActions.enabled": "Activez/désactivez le diagnostic des suggestions pour les fichiers TypeScript dans l'éditeur. Nécessite TypeScript >= 2.8",
-	"typescript.preferences.quoteStyle": "Style de guillemet par défaut à utiliser pour les corrections rapides : 'single' pour les guillemets simples, 'double' pour les guillemets doubles ou 'auto' pour déduire le type de guillemet à partir des importations existantes. Nécessite TypeScript >= 2.9",
-	"typescript.preferences.importModuleSpecifier": "Style de chemin par défaut pour les importations automatiques :\n- \"relative\" pour un chemin relatif à l'emplacement du fichier.\n- \"non-relative\" pour un chemin non relatif basé sur la valeur de 'baseUrl' configurée dans votre fichier 'jsconfig.json' / 'tsconfig.json'.\n- \"auto\" pour déduire automatiquement le type de chemin le plus court.\nNécessite TypeScript >= 2.9",
-	"typescript.showUnused": "Activez/désactivez la mise en surbrillance des variables inutilisées dans le code. Nécessite TypeScript >= 2.9",
-	"typescript.updateImportsOnFileMove.enabled": "Activez/désactivez la mise à jour automatique des chemins d'importation quand vous renommez ou déplacez un fichier dans VS Code. Les valeurs possibles sont : 'prompt' pour demander confirmation à chaque renommage, 'always' pour toujours mettre à jour les chemins automatiquement et 'never' pour ne jamais renommer les chemins et ne pas demander confirmation. Nécessite TypeScript >= 2.9"
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/typescript/out/commands.i18n.json b/i18n/fra/extensions/typescript/out/commands.i18n.json
deleted file mode 100644
index 1738a01dc86..00000000000
--- a/i18n/fra/extensions/typescript/out/commands.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"typescript.projectConfigNoWorkspace": "Ouvrez un dossier dans VS Code pour utiliser un projet TypeScript ou JavaScript",
-	"typescript.projectConfigUnsupportedFile": "Impossible de déterminer le projet TypeScript ou JavaScript. Type de fichier non pris en charge",
-	"typescript.projectConfigCouldNotGetInfo": "Impossible de déterminer le projet TypeScript ou JavaScript",
-	"typescript.noTypeScriptProjectConfig": "Le fichier ne fait pas partie d'un projet TypeScript. Cliquer [ici]({0}) pour en savoir plus.",
-	"typescript.noJavaScriptProjectConfig": "Le fichier ne fait pas partie d'un projet JavaScript. Cliquer [ici]({0}) pour en savoir plus.",
-	"typescript.configureTsconfigQuickPick": "Configurer tsconfig.json",
-	"typescript.configureJsconfigQuickPick": "Configurer jsconfig.json"
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/typescript/out/features/bufferSyncSupport.i18n.json b/i18n/fra/extensions/typescript/out/features/bufferSyncSupport.i18n.json
deleted file mode 100644
index 3187cd8f22f..00000000000
--- a/i18n/fra/extensions/typescript/out/features/bufferSyncSupport.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"moreInformation": "Informations",
-	"doNotCheckAgain": "Ne plus vérifier",
-	"close": "Fermer",
-	"updateTscCheck": "Mise à jour du paramètre utilisateur 'typescript.check.tscVersion' avec la valeur false"
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/typescript/out/features/completionItemProvider.i18n.json b/i18n/fra/extensions/typescript/out/features/completionItemProvider.i18n.json
deleted file mode 100644
index e11c85c6abb..00000000000
--- a/i18n/fra/extensions/typescript/out/features/completionItemProvider.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"selectCodeAction": "Sélectionner l'action de code à appliquer",
-	"acquiringTypingsLabel": "Acquisition des typings...",
-	"acquiringTypingsDetail": "Acquisition des définitions typings pour IntelliSense.",
-	"autoImportLabel": "Importation automatique de {0}"
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/typescript/out/features/directiveCommentCompletionProvider.i18n.json b/i18n/fra/extensions/typescript/out/features/directiveCommentCompletionProvider.i18n.json
deleted file mode 100644
index 8096453313a..00000000000
--- a/i18n/fra/extensions/typescript/out/features/directiveCommentCompletionProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"ts-check": "Active la vérification sémantique dans un fichier JavaScript. Doit se trouver au début d'un fichier.",
-	"ts-nocheck": "Désactive la vérification sémantique dans un fichier JavaScript. Doit se trouver au début d'un fichier.",
-	"ts-ignore": "Supprime les erreurs @ts-check sur la ligne suivante d'un fichier."
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/typescript/out/features/implementationsCodeLensProvider.i18n.json b/i18n/fra/extensions/typescript/out/features/implementationsCodeLensProvider.i18n.json
deleted file mode 100644
index 2e7856eb1be..00000000000
--- a/i18n/fra/extensions/typescript/out/features/implementationsCodeLensProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"oneImplementationLabel": "1 implémentation",
-	"manyImplementationLabel": "{0} implémentations",
-	"implementationsErrorLabel": "Impossible de déterminer les implémentations"
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/typescript/out/features/jsDocCompletionProvider.i18n.json b/i18n/fra/extensions/typescript/out/features/jsDocCompletionProvider.i18n.json
deleted file mode 100644
index 7915d99dbd8..00000000000
--- a/i18n/fra/extensions/typescript/out/features/jsDocCompletionProvider.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"typescript.jsDocCompletionItem.documentation": "Commentaire JSDoc"
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/typescript/out/features/quickFixProvider.i18n.json b/i18n/fra/extensions/typescript/out/features/quickFixProvider.i18n.json
deleted file mode 100644
index f10b35e9e5b..00000000000
--- a/i18n/fra/extensions/typescript/out/features/quickFixProvider.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"fixAllInFileLabel": "{0} (Corriger tout dans le fichier)"
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/typescript/out/features/referencesCodeLensProvider.i18n.json b/i18n/fra/extensions/typescript/out/features/referencesCodeLensProvider.i18n.json
deleted file mode 100644
index 927ba6cdb77..00000000000
--- a/i18n/fra/extensions/typescript/out/features/referencesCodeLensProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"oneReferenceLabel": "1 référence",
-	"manyReferenceLabel": "{0} références",
-	"referenceErrorLabel": "Impossible de déterminer les références"
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/typescript/out/features/taskProvider.i18n.json b/i18n/fra/extensions/typescript/out/features/taskProvider.i18n.json
deleted file mode 100644
index 451f7029bac..00000000000
--- a/i18n/fra/extensions/typescript/out/features/taskProvider.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"buildTscLabel": "build - {0}",
-	"buildAndWatchTscLabel": "watch - {0}"
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/typescript/out/typescriptMain.i18n.json b/i18n/fra/extensions/typescript/out/typescriptMain.i18n.json
deleted file mode 100644
index 6c1e268636a..00000000000
--- a/i18n/fra/extensions/typescript/out/typescriptMain.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"typescript.projectConfigNoWorkspace": "Ouvrez un dossier dans VS Code pour utiliser un projet TypeScript ou JavaScript",
-	"typescript.projectConfigUnsupportedFile": "Impossible de déterminer le projet TypeScript ou JavaScript. Type de fichier non pris en charge",
-	"typescript.projectConfigCouldNotGetInfo": "Impossible de déterminer le projet TypeScript ou JavaScript",
-	"typescript.noTypeScriptProjectConfig": "Le fichier ne fait pas partie d'un projet TypeScript",
-	"typescript.noJavaScriptProjectConfig": "Le fichier ne fait pas partie d'un projet JavaScript",
-	"typescript.configureTsconfigQuickPick": "Configurer tsconfig.json",
-	"typescript.configureJsconfigQuickPick": "Configurer jsconfig.json",
-	"typescript.projectConfigLearnMore": "En savoir plus"
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/typescript/out/typescriptServiceClient.i18n.json b/i18n/fra/extensions/typescript/out/typescriptServiceClient.i18n.json
deleted file mode 100644
index f31ff437ec4..00000000000
--- a/i18n/fra/extensions/typescript/out/typescriptServiceClient.i18n.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noServerFound": "Le chemin {0} ne pointe pas vers une installation tsserver valide. Utilisation par défaut de la version TypeScript groupée.",
-	"serverCouldNotBeStarted": "Impossible de démarrer le serveur de langage TypeScript. Message d'erreur : {0}",
-	"typescript.openTsServerLog.notSupported": "La journalisation du serveur TS nécessite TS 2.2.2+",
-	"typescript.openTsServerLog.loggingNotEnabled": "La journalisation du serveur TS est désactivée. Définissez 'typescript.tsserver.log' et redémarrez le serveur TS pour activer la journalisation",
-	"typescript.openTsServerLog.enableAndReloadOption": "Activer la journalisation et redémarrer le serveur TS",
-	"typescript.openTsServerLog.noLogFile": "Le serveur TS n'a pas démarré la journalisation.",
-	"openTsServerLog.openFileFailedFailed": "Impossible d'ouvrir le fichier journal du serveur TS",
-	"serverDiedAfterStart": "Le service de langage TypeScript s'est subitement arrêté 5 fois juste après avoir démarré. Il n'y aura pas d'autres redémarrages.",
-	"serverDiedReportIssue": "Signaler un problème",
-	"serverDied": "Le service de langage TypeScript s'est subitement arrêté 5 fois au cours des 5 dernières minutes."
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/typescript/out/utils/api.i18n.json b/i18n/fra/extensions/typescript/out/utils/api.i18n.json
deleted file mode 100644
index 61ed0b60124..00000000000
--- a/i18n/fra/extensions/typescript/out/utils/api.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"invalidVersion": "version non valide"
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/typescript/out/utils/logger.i18n.json b/i18n/fra/extensions/typescript/out/utils/logger.i18n.json
deleted file mode 100644
index 8f5ef5415b9..00000000000
--- a/i18n/fra/extensions/typescript/out/utils/logger.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"channelName": "TypeScript"
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/typescript/out/utils/projectStatus.i18n.json b/i18n/fra/extensions/typescript/out/utils/projectStatus.i18n.json
deleted file mode 100644
index b39c51e947e..00000000000
--- a/i18n/fra/extensions/typescript/out/utils/projectStatus.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hintExclude": "Pour activer les fonctionnalités de langage JavaScript/TypeScript à l'échelle du projet, excluez les dossiers contenant de nombreux fichiers, par exemple : {0}",
-	"hintExclude.generic": "Pour activer les fonctionnalités de langage JavaScript/TypeScript à l'échelle du projet, excluez les dossiers volumineux contenant des fichiers sources inutilisés.",
-	"large.label": "Configurer les exclusions",
-	"hintExclude.tooltip": "Pour activer les fonctionnalités de langage JavaScript/TypeScript à l'échelle du projet, excluez les dossiers volumineux contenant des fichiers sources inutilisés."
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/typescript/out/utils/typingsStatus.i18n.json b/i18n/fra/extensions/typescript/out/utils/typingsStatus.i18n.json
deleted file mode 100644
index 108ea8e9d3c..00000000000
--- a/i18n/fra/extensions/typescript/out/utils/typingsStatus.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"installingPackages": "Récupération (fetch) des données pour l'amélioration de TypeScript IntelliSense",
-	"typesInstallerInitializationFailed.title": "Impossible d'installer des fichiers de typages pour les fonctionnalités de langage JavaScript. Vérifiez que NPM est installé ou configurez 'typescript.npm' dans vos paramètres utilisateur. Cliquer [ici]({0}) pour en savoir plus.",
-	"typesInstallerInitializationFailed.doNotCheckAgain": "Ne plus afficher"
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/typescript/out/utils/versionPicker.i18n.json b/i18n/fra/extensions/typescript/out/utils/versionPicker.i18n.json
deleted file mode 100644
index c6da9b3843f..00000000000
--- a/i18n/fra/extensions/typescript/out/utils/versionPicker.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"useVSCodeVersionOption": "Utiliser la version de VS Code",
-	"useWorkspaceVersionOption": "Utiliser la version de l'espace de travail",
-	"learnMore": "En savoir plus",
-	"selectTsVersion": "Sélectionner la version TypeScript utilisée pour les fonctionnalités de langage JavaScript et TypeScript"
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/typescript/out/utils/versionProvider.i18n.json b/i18n/fra/extensions/typescript/out/utils/versionProvider.i18n.json
deleted file mode 100644
index 5c32ecfe106..00000000000
--- a/i18n/fra/extensions/typescript/out/utils/versionProvider.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"couldNotLoadTsVersion": "Impossible de charger la version TypeScript dans ce chemin",
-	"noBundledServerFound": "Le tsserver de VSCode a été supprimé par une autre application, par exemple, un outil de détection de virus mal configuré. Réinstallez VS Code."
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/typescript/package.i18n.json b/i18n/fra/extensions/typescript/package.i18n.json
deleted file mode 100644
index a8c7633468e..00000000000
--- a/i18n/fra/extensions/typescript/package.i18n.json
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Fonctionnalités de langage TypeScript et JavaScript",
-	"description": "Fournit une prise en charge riche de langage pour JavaScript et TypeScript.",
-	"typescript.reloadProjects.title": "Recharger le projet",
-	"javascript.reloadProjects.title": "Recharger le projet",
-	"configuration.typescript": "TypeScript",
-	"typescript.useCodeSnippetsOnMethodSuggest.dec": "Fonctions complètes avec leur signature de paramètre.",
-	"typescript.tsdk.desc": "Spécifie le chemin de dossier contenant les fichiers tsserver et lib*.d.ts à utiliser.",
-	"typescript.disableAutomaticTypeAcquisition": "Désactive l'acquisition de type automatique. Nécessite TypeScript >= 2.0.6.",
-	"typescript.tsserver.log": "Active la journalisation du serveur TS dans un fichier. Ce journal peut être utilisé pour diagnostiquer les problèmes du serveur TS. Il peut contenir des chemins de fichier, du code source et d'autres informations potentiellement sensibles de votre projet.",
-	"typescript.tsserver.trace": "Active le traçage des messages envoyés au serveur TS. Cette trace peut être utilisée pour diagnostiquer les problèmes du serveur TS. Elle peut contenir des chemins de fichier, du code source et d'autres informations potentiellement sensibles de votre projet.",
-	"typescript.validate.enable": "Activez/désactivez la validation TypeScript.",
-	"typescript.format.enable": "Activez/désactivez le formateur TypeScript par défaut.",
-	"javascript.format.enable": "Activez/désactivez le formateur JavaScript par défaut.",
-	"format.insertSpaceAfterCommaDelimiter": "Définit le traitement des espaces après une virgule de délimitation.",
-	"format.insertSpaceAfterConstructor": "Définit le traitement des espaces après le mot clé constructor. Nécessite TypeScript >= 2.3.0.",
-	"format.insertSpaceAfterSemicolonInForStatements": " Définit le traitement des espaces après un point-virgule dans une instruction for.",
-	"format.insertSpaceBeforeAndAfterBinaryOperators": "Définit le traitement des espaces après un opérateur binaire.",
-	"format.insertSpaceAfterKeywordsInControlFlowStatements": "Définit la gestion des espaces après les mots clés dans une instruction de flux de contrôle.",
-	"format.insertSpaceAfterFunctionKeywordForAnonymousFunctions": "Définit le traitement des espaces après le mot clé function pour les fonctions anonymes.",
-	"format.insertSpaceBeforeFunctionParenthesis": "Définit la gestion des espaces avant les parenthèses des arguments d'une fonction. Nécessite TypeScript >= 2.1.5.",
-	"format.insertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis": "Définit le traitement des espaces après l'ouverture et avant la fermeture de parenthèses non vides.",
-	"format.insertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets": "Définit le traitement des espaces après l'ouverture et avant la fermeture de crochets non vides.",
-	"format.insertSpaceAfterOpeningAndBeforeClosingNonemptyBraces": "Définit la gestion de l'espace après l'ouverture et avant la fermeture des accolades non vides. Nécessite TypeScript >= 2.3.0.",
-	"format.insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces": "Définit la gestion de l'espace après l'ouverture et avant la fermeture des accolades de la chaîne de modèle. Nécessite TypeScript >= 2.0.6.",
-	"format.insertSpaceAfterOpeningAndBeforeClosingJsxExpressionBraces": "Définit la gestion de l'espace après l'ouverture et avant la fermeture des accolades de l'expression JSX. Nécessite TypeScript >= 2.0.6.",
-	"format.insertSpaceAfterTypeAssertion": "Définit le traitement des espaces après les assertions de type dans TypeScript. Nécessite TypeScript >= 2.4.",
-	"format.placeOpenBraceOnNewLineForFunctions": "Définit si une accolade ouvrante dans une fonction est placée ou non sur une nouvelle ligne.",
-	"format.placeOpenBraceOnNewLineForControlBlocks": "Définit si une accolade ouvrante dans un bloc de contrôle est placée ou non sur une nouvelle ligne.",
-	"javascript.validate.enable": "Activez/désactivez la validation JavaScript.",
-	"typescript.goToProjectConfig.title": "Accéder à la configuration du projet",
-	"javascript.goToProjectConfig.title": "Accéder à la configuration du projet",
-	"javascript.referencesCodeLens.enabled": "Activez/désactivez les références CodeLens dans les fichiers JavaScript.",
-	"typescript.referencesCodeLens.enabled": "Activez/désactivez les références CodeLens dans les fichiers TypeScript. Nécessite TypeScript >= 2.0.6.",
-	"typescript.implementationsCodeLens.enabled": "Activer/désactiver CodeLens dans les implémentations. Nécessite TypeScript >= 2.2.0.",
-	"typescript.openTsServerLog.title": "Ouvrir le journal du serveur TS",
-	"typescript.restartTsServer": "Redémarrer le serveur TS",
-	"typescript.selectTypeScriptVersion.title": "Sélectionner la version de TypeScript",
-	"typescript.reportStyleChecksAsWarnings": "Rapporter les vérifications de style comme des avertissements",
-	"jsDocCompletion.enabled": "Activer/désactiver les commentaires JSDoc automatiques",
-	"javascript.implicitProjectConfig.checkJs": "Activer/désactiver la vérification sémantique des fichiers JavaScript. Les fichiers jsconfig.json ou tsconfig.json existants remplacent ce paramètre. Nécessite TypeScript >=2.3.1.",
-	"typescript.npm": "Spécifie le chemin de l'exécutable NPM utilisé pour l'acquisition de type automatique. Nécessite TypeScript >= 2.3.4.",
-	"typescript.check.npmIsInstalled": "Vérifie si NPM est installé pour l'acquisition de type automatique.",
-	"javascript.nameSuggestions": "Activez/désactivez l'inclusion de noms uniques à partir du fichier dans les listes de suggestions JavaScript.",
-	"typescript.tsc.autoDetect": "Contrôle la détection automatique des tâches tsc. 'off' désactive cette fonctionnalité. 'build' crée uniquement des tâches de compilation à exécution unique. 'watch' crée uniquement des tâches de compilation et de watch. 'on' crée les deux les tâches build et watch. La valeur par défaut est 'on'.",
-	"typescript.problemMatchers.tsc.label": "Problèmes liés à TypeScript",
-	"typescript.problemMatchers.tscWatch.label": "Problèmes liés à TypeScript (mode espion)",
-	"typescript.quickSuggestionsForPaths": "Activer/désactiver les suggestions rapides lorsque vous saisissez un chemin d’import.",
-	"typescript.locale": "Définit les paramètres locaux utilisés pour signaler les erreurs TypeScript . Nécessite TypeScript >= 2.6.0. Par défaut 'null' utilise les paramètres locaux de VS Code pour les erreurs TypeScript.",
-	"javascript.implicitProjectConfig.experimentalDecorators": "Activer/désactiver 'experimentalDecorators' pour les fichiers JavaScript qui ne font pas partie d'un projet. Les fichiers jsconfig.json ou tsconfig.json existants remplacent ce paramètre. Nécessite TypeScript >=2.3.1.",
-	"typescript.autoImportSuggestions.enabled": "Activer/désactiver les suggestions d'import automatiques. Nécessite TypeScript >= 2.6.1.",
-	"typescript.experimental.syntaxFolding": "Active/désactive les marqueurs de réduction en fonction de la syntaxe.",
-	"taskDefinition.tsconfig.description": "Fichier tsconfig qui définit la build TS."
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/vb/package.i18n.json b/i18n/fra/extensions/vb/package.i18n.json
deleted file mode 100644
index da63f559132..00000000000
--- a/i18n/fra/extensions/vb/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Bases du langage Visual Basic",
-	"description": "Fournit des extraits de code, la coloration syntaxique, la correspondance des crochets et le repli dans les fichiers Visual Basic."
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/xml/package.i18n.json b/i18n/fra/extensions/xml/package.i18n.json
deleted file mode 100644
index 34ebbb7050f..00000000000
--- a/i18n/fra/extensions/xml/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Bases du langage XML",
-	"description": "Fournit la coloration syntaxique et la correspondance des crochets dans les fichiers XML."
-}
\ No newline at end of file
diff --git a/i18n/fra/extensions/yaml/package.i18n.json b/i18n/fra/extensions/yaml/package.i18n.json
deleted file mode 100644
index baa637549d4..00000000000
--- a/i18n/fra/extensions/yaml/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Bases du langage YAML",
-	"description": "Fournit la coloration syntaxique et la correspondance des crochets dans les fichiers YAML."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/base/browser/ui/actionbar/actionbar.i18n.json b/i18n/fra/src/vs/base/browser/ui/actionbar/actionbar.i18n.json
deleted file mode 100644
index 309631273fe..00000000000
--- a/i18n/fra/src/vs/base/browser/ui/actionbar/actionbar.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"titleLabel": "{0} ({1})"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/base/browser/ui/aria/aria.i18n.json b/i18n/fra/src/vs/base/browser/ui/aria/aria.i18n.json
deleted file mode 100644
index 7e563279ca9..00000000000
--- a/i18n/fra/src/vs/base/browser/ui/aria/aria.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"repeated": "{0} (s'est reproduit)"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/base/browser/ui/findinput/findInput.i18n.json b/i18n/fra/src/vs/base/browser/ui/findinput/findInput.i18n.json
deleted file mode 100644
index 9e67126fd20..00000000000
--- a/i18n/fra/src/vs/base/browser/ui/findinput/findInput.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"defaultLabel": "entrée"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/base/browser/ui/findinput/findInputCheckboxes.i18n.json b/i18n/fra/src/vs/base/browser/ui/findinput/findInputCheckboxes.i18n.json
deleted file mode 100644
index a9566953423..00000000000
--- a/i18n/fra/src/vs/base/browser/ui/findinput/findInputCheckboxes.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"caseDescription": "Respecter la casse",
-	"wordsDescription": "Mot entier",
-	"regexDescription": "Utiliser une expression régulière"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/base/browser/ui/inputbox/inputBox.i18n.json b/i18n/fra/src/vs/base/browser/ui/inputbox/inputBox.i18n.json
deleted file mode 100644
index a8cb7bd5ff4..00000000000
--- a/i18n/fra/src/vs/base/browser/ui/inputbox/inputBox.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"alertErrorMessage": "Erreur : {0}",
-	"alertWarningMessage": "Avertissement : {0}",
-	"alertInfoMessage": "Information : {0}"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/base/browser/ui/resourceviewer/resourceViewer.i18n.json b/i18n/fra/src/vs/base/browser/ui/resourceviewer/resourceViewer.i18n.json
deleted file mode 100644
index 55195cc5a7f..00000000000
--- a/i18n/fra/src/vs/base/browser/ui/resourceviewer/resourceViewer.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"imgMeta": "{0}x{1} {2}",
-	"largeImageError": "L'image est trop grande pour être affichée dans l'éditeur. ",
-	"resourceOpenExternalButton": " Ouvrir l'image en utilisant un programme externe ?",
-	"nativeBinaryError": "Impossible d'afficher le fichier dans l'éditeur : soit il est binaire, soit il est très volumineux, soit il utilise un encodage de texte non pris en charge.",
-	"sizeB": "{0} o",
-	"sizeKB": "{0} Ko",
-	"sizeMB": "{0} Mo",
-	"sizeGB": "{0} Go",
-	"sizeTB": "{0} To"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json b/i18n/fra/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json
deleted file mode 100644
index 750d811d866..00000000000
--- a/i18n/fra/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"selectAriaOption": "{0}"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/base/browser/ui/toolbar/toolbar.i18n.json b/i18n/fra/src/vs/base/browser/ui/toolbar/toolbar.i18n.json
deleted file mode 100644
index f9d69d3cb6b..00000000000
--- a/i18n/fra/src/vs/base/browser/ui/toolbar/toolbar.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"more": "Plus"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/base/common/errorMessage.i18n.json b/i18n/fra/src/vs/base/common/errorMessage.i18n.json
deleted file mode 100644
index 6b073ae90db..00000000000
--- a/i18n/fra/src/vs/base/common/errorMessage.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"stackTrace.format": "{0} : {1}",
-	"error.defaultMessage": "Une erreur inconnue s’est produite. Veuillez consulter le journal pour plus de détails.",
-	"nodeExceptionMessage": "Une erreur système s'est produite ({0})",
-	"error.moreErrors": "{0} ({1} erreurs au total)"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/base/common/json.i18n.json b/i18n/fra/src/vs/base/common/json.i18n.json
deleted file mode 100644
index 5c2fcbf92b8..00000000000
--- a/i18n/fra/src/vs/base/common/json.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"error.invalidSymbol": "Symbole non valide",
-	"error.invalidNumberFormat": "Format de nombre non valide",
-	"error.propertyNameExpected": "Nom de propriété attendu",
-	"error.valueExpected": "Valeur attendue",
-	"error.colonExpected": "Signe des deux points attendu",
-	"error.commaExpected": "Virgule attendue",
-	"error.closeBraceExpected": "Accolade fermante attendue",
-	"error.closeBracketExpected": "Crochet fermant attendu",
-	"error.endOfFileExpected": "Fin de fichier attendue"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/base/common/jsonErrorMessages.i18n.json b/i18n/fra/src/vs/base/common/jsonErrorMessages.i18n.json
deleted file mode 100644
index cb1a94bdc87..00000000000
--- a/i18n/fra/src/vs/base/common/jsonErrorMessages.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"error.invalidSymbol": "Symbole non valide",
-	"error.invalidNumberFormat": "Format de nombre non valide",
-	"error.propertyNameExpected": "Nom de propriété attendu",
-	"error.valueExpected": "Valeur attendue",
-	"error.colonExpected": "Signe des deux points attendu",
-	"error.commaExpected": "Virgule attendue",
-	"error.closeBraceExpected": "Accolade fermante attendue",
-	"error.closeBracketExpected": "Crochet fermant attendu",
-	"error.endOfFileExpected": "Fin de fichier attendue"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/base/common/keybindingLabels.i18n.json b/i18n/fra/src/vs/base/common/keybindingLabels.i18n.json
deleted file mode 100644
index c4f0f3de2c4..00000000000
--- a/i18n/fra/src/vs/base/common/keybindingLabels.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"ctrlKey": "Ctrl",
-	"shiftKey": "Maj",
-	"altKey": "Alt",
-	"windowsKey": "Windows",
-	"ctrlKey.long": "Contrôle",
-	"shiftKey.long": "Maj",
-	"altKey.long": "Alt",
-	"cmdKey.long": "Commande",
-	"windowsKey.long": "Windows"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/base/common/processes.i18n.json b/i18n/fra/src/vs/base/common/processes.i18n.json
deleted file mode 100644
index b3007bde70a..00000000000
--- a/i18n/fra/src/vs/base/common/processes.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"ExecutableParser.commandMissing": "Erreur : les informations de l'exécutable doivent définir une commande de type chaîne.",
-	"ExecutableParser.isShellCommand": "Avertissement : isShellCommand doit être de type booléen. Valeur {0} ignorée.",
-	"ExecutableParser.args": "Avertissement : les arguments doivent être de type string[]. Valeur {0} ignorée.",
-	"ExecutableParser.invalidCWD": "Avertissement : options.cwd doit être de type chaîne. Valeur {0} ignorée."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/base/common/severity.i18n.json b/i18n/fra/src/vs/base/common/severity.i18n.json
deleted file mode 100644
index 634b6c772a7..00000000000
--- a/i18n/fra/src/vs/base/common/severity.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"sev.error": "Erreur",
-	"sev.warning": "Avertissement",
-	"sev.info": "Informations"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/base/node/processes.i18n.json b/i18n/fra/src/vs/base/node/processes.i18n.json
deleted file mode 100644
index ca243cc3f48..00000000000
--- a/i18n/fra/src/vs/base/node/processes.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"TaskRunner.UNC": "Impossible d’exécuter une commande shell sur un lecteur UNC."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/base/node/ps.i18n.json b/i18n/fra/src/vs/base/node/ps.i18n.json
deleted file mode 100644
index 35e988ef51f..00000000000
--- a/i18n/fra/src/vs/base/node/ps.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"collecting": "Récupération des informations processeur et mémoire. Cela peut prendre quelques secondes."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/base/node/zip.i18n.json b/i18n/fra/src/vs/base/node/zip.i18n.json
deleted file mode 100644
index 4a7a0bcd0ec..00000000000
--- a/i18n/fra/src/vs/base/node/zip.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"incompleteExtract": "Incomplet. Entrées trouvées : {0} sur {1} ",
-	"notFound": "{0} introuvable dans le zip."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/base/parts/quickopen/browser/quickOpenModel.i18n.json b/i18n/fra/src/vs/base/parts/quickopen/browser/quickOpenModel.i18n.json
deleted file mode 100644
index 5116386439c..00000000000
--- a/i18n/fra/src/vs/base/parts/quickopen/browser/quickOpenModel.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"quickOpenAriaLabelEntry": "{0}, sélecteur",
-	"quickOpenAriaLabel": "sélecteur"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/base/parts/quickopen/browser/quickOpenWidget.i18n.json b/i18n/fra/src/vs/base/parts/quickopen/browser/quickOpenWidget.i18n.json
deleted file mode 100644
index fea02729989..00000000000
--- a/i18n/fra/src/vs/base/parts/quickopen/browser/quickOpenWidget.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"quickOpenAriaLabel": "Sélecteur rapide. Tapez pour réduire les résultats.",
-	"treeAriaLabel": "Sélecteur rapide"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/base/parts/tree/browser/treeDefaults.i18n.json b/i18n/fra/src/vs/base/parts/tree/browser/treeDefaults.i18n.json
deleted file mode 100644
index a309b3faabb..00000000000
--- a/i18n/fra/src/vs/base/parts/tree/browser/treeDefaults.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"collapse": "Réduire"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json b/i18n/fra/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
deleted file mode 100644
index 59278815c77..00000000000
--- a/i18n/fra/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hide": "masquer",
-	"show": "afficher",
-	"previewOnGitHub": "Prévisualiser sur GitHub",
-	"loadingData": "Chargement des données en cours...",
-	"rateLimited": "Limite de requête GitHub dépassée. Veuillez patienter.",
-	"similarIssues": "Problèmes similaires",
-	"open": "Ouvrir",
-	"closed": "Fermé",
-	"noSimilarIssues": "Aucun problème similaire trouvé",
-	"settingsSearchIssue": "Problème de paramètres de recherche",
-	"bugReporter": "Rapporteur de bogue",
-	"featureRequest": "Demande de fonctionnalité",
-	"performanceIssue": "Problème de performance",
-	"stepsToReproduce": "Étapes à reproduire",
-	"bugDescription": "Partagez les étapes nécessaires pour reproduire fidèlement le problème. Veuillez inclure les résultats réels et prévus. Nous prenons en charge la syntaxe GitHub Markdown. Vous pourrez éditer votre problème et ajouter des captures d'écran lorsque nous le prévisualiserons sur GitHub.",
-	"performanceIssueDesciption": "Quand ce problème de performance s'est-il produit ? Se produit-il au démarrage ou après une série d'actions spécifiques ? Nous prenons en charge la syntaxe Markdown de GitHub. Vous pourrez éditer votre problème et ajouter des captures d'écran lorsque nous le prévisualiserons sur GitHub.",
-	"description": "Description",
-	"featureRequestDescription": "Veuillez décrire la fonctionnalité que vous voulez voir. Nous supportons la syntaxe GitHub Markdown. Vous pourrez modifier votre problème et ajouter des captures d’écran lorsque nous la prévisualiserons sur GitHub.",
-	"expectedResults": "Résultats attendus",
-	"settingsSearchResultsDescription": "Veuillez lister les résultats que vous vous attendiez à voir quand vous avez cherché cette requête. Nous supportons la syntaxe GitHub Markdown. Vous pourrez modifier votre question et ajouter des captures d’écran lorsque nous la prévisualiserons sur GitHub.",
-	"pasteData": "Nous avons écrit les données nécessaires dans votre presse-papiers, car elles étaient trop volumineuses à envoyer. Veuillez les coller.",
-	"disabledExtensions": "Les extensions sont désactivées"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json b/i18n/fra/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
deleted file mode 100644
index ffcda9c2285..00000000000
--- a/i18n/fra/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"completeInEnglish": "Veuillez remplir le formulaire en anglais.",
-	"issueTypeLabel": "Ceci est un ",
-	"issueSourceLabel": "Fichier sur",
-	"vscode": "Visual Studio Code",
-	"extension": "Une Extension",
-	"disableExtensionsLabelText": "Essayez de reproduire le problème après {0}. Si le problème se reproduit uniquement lorsque les extensions sont actives, c’est probablement un problème avec une extension.",
-	"disableExtensions": "en désactivant toutes les extensions et en rechargeant la fenêtre",
-	"chooseExtension": "Extension",
-	"issueTitleLabel": "Titre",
-	"issueTitleRequired": "Veuillez s’il vous plaît entrer un titre.",
-	"titleLengthValidation": "Le titre est trop long.",
-	"details": "Veuillez saisir les détails ",
-	"sendSystemInfo": "Inclure des informations sur mon système ({0})",
-	"show": "afficher",
-	"sendProcessInfo": "Inclure mes processus en cours d’exécution ({0})",
-	"sendWorkspaceInfo": "Inclure des metadonnées sur mon espace de travail ({0})",
-	"sendExtensions": "Inclure mes extensions activées ({0})",
-	"sendSearchedExtensions": "Envoyer les extensions recherchées ({0})",
-	"sendSettingsSearchDetails": " Envoyer les paramètres des critères de recherche ({0}) "
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/code/electron-browser/processExplorer/processExplorerMain.i18n.json b/i18n/fra/src/vs/code/electron-browser/processExplorer/processExplorerMain.i18n.json
deleted file mode 100644
index 627050125bc..00000000000
--- a/i18n/fra/src/vs/code/electron-browser/processExplorer/processExplorerMain.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"cpu": "% PROCESSEUR",
-	"memory": "Mémoire (Mo)",
-	"pid": "pid",
-	"name": "Nom",
-	"killProcess": "Tuer le processus",
-	"forceKillProcess": "Forcer la suppression du processus",
-	"copy": "Copier",
-	"copyAll": "Copier tout"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/code/electron-main/auth.i18n.json b/i18n/fra/src/vs/code/electron-main/auth.i18n.json
deleted file mode 100644
index b020bdf9dd2..00000000000
--- a/i18n/fra/src/vs/code/electron-main/auth.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"authRequire": "Authentification proxy requise",
-	"proxyauth": "Le proxy {0} nécessite une authentification."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/code/electron-main/logUploader.i18n.json b/i18n/fra/src/vs/code/electron-main/logUploader.i18n.json
deleted file mode 100644
index 4ad0b5e052b..00000000000
--- a/i18n/fra/src/vs/code/electron-main/logUploader.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"invalidEndpoint": "Point de terminaison d'upload de journal non valide",
-	"beginUploading": "Téléchargement (Upload) ...",
-	"didUploadLogs": "Téléchargement réussi ! ID du fichier de log : {0}",
-	"logUploadPromptHeader": "Vous êtes sur le point de téléverser vos journaux de session vers un terminal Microsoft sécurisé auquel seuls les membres de l'équipe VS Code peuvent accéder.",
-	"logUploadPromptBody": "Les journaux de session peuvent contenir des informations personnelles telles que les chemins d'accès complets ou le contenu des fichiers. Veuillez consulter et supprimer les fichiers journaux de session ici: '{0}'",
-	"logUploadPromptBodyDetails": "En continuant, vous confirmez que vous avez revu et édité vos fichiers journaux de session et que vous acceptez que Microsoft les utilise pour déboguer VS Code.",
-	"logUploadPromptAcceptInstructions": "Veuillez exécuter le code avec '--upload-logs={0}' pour réaliser l'upload",
-	"postError": "Erreur en postant les journaux : {0}",
-	"responseError": "Erreur en postant les journaux. Reçu {0} — {1}",
-	"parseError": "Erreur en analysant la réponse",
-	"zipError": "Erreur en compressant les journaux : {0}"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/code/electron-main/main.i18n.json b/i18n/fra/src/vs/code/electron-main/main.i18n.json
deleted file mode 100644
index 17c734e0460..00000000000
--- a/i18n/fra/src/vs/code/electron-main/main.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"secondInstanceNoResponse": "Une autre instance de {0} est déjà en cours d'exécution mais ne répond pas",
-	"secondInstanceNoResponseDetail": "Veuillez s'il vous plaît fermer toutes les autres instances et réessayer à nouveau.",
-	"secondInstanceAdmin": "Une seconde instance de {0} est déjà en cours d'exécution en tant qu'administrateur.",
-	"secondInstanceAdminDetail": "Veuillez s'il vous plaît fermer l'autre instance et réessayer à nouveau.",
-	"close": "&&Fermer"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/code/electron-main/menus.i18n.json b/i18n/fra/src/vs/code/electron-main/menus.i18n.json
deleted file mode 100644
index 16a57011e6f..00000000000
--- a/i18n/fra/src/vs/code/electron-main/menus.i18n.json
+++ /dev/null
@@ -1,193 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"mFile": "&&Fichier",
-	"mEdit": "&&Modifier",
-	"mSelection": "&&Sélection",
-	"mView": "&&Afficher",
-	"mGoto": "&&Accéder",
-	"mDebug": "&&Déboguer",
-	"mWindow": "Fenêtre",
-	"mHelp": "&&Aide",
-	"mTask": "&&Tâches",
-	"miNewWindow": "Nouvelle &&fenêtre",
-	"mAbout": "À propos de {0}",
-	"mServices": "Services",
-	"mHide": "Masquer {0}",
-	"mHideOthers": "Masquer les autres",
-	"mShowAll": "Afficher tout",
-	"miQuit": "Quitter {0}",
-	"miNewFile": "&&Nouveau fichier",
-	"miOpen": "&&Ouvrir...",
-	"miOpenWorkspace": "Ouvrir l'espace de travail...",
-	"miOpenFolder": "Ouvrir le &&dossier",
-	"miOpenFile": "&&Ouvrir un fichier...",
-	"miOpenRecent": "Ouvrir les éléments &&récents",
-	"miSaveWorkspaceAs": "Enregistrer l’espace de travail sous...",
-	"miAddFolderToWorkspace": "Ajouter un dossier à l'espace de travail...",
-	"miSave": "&&Enregistrer",
-	"miSaveAs": "Enregistrer &&sous...",
-	"miSaveAll": "Enregistrer to&&ut",
-	"miAutoSave": "Enregistrement automatique",
-	"miRevert": "Réta&&blir le fichier",
-	"miCloseWindow": "Ferm&&er la fenêtre",
-	"miCloseWorkspace": "&&Fermer l'espace de travail",
-	"miCloseFolder": "&&Fermer le dossier",
-	"miCloseEditor": "Fermer l'édit&&eur",
-	"miExit": "Q&&uitter",
-	"miOpenSettings": "&&Paramètres",
-	"miOpenKeymap": "Racco&&urcis clavier",
-	"miOpenKeymapExtensions": "&&Extensions de mappage de touches",
-	"miOpenSnippets": "E&&xtraits de code utilisateur",
-	"miSelectColorTheme": "Thème de &&couleur",
-	"miSelectIconTheme": "Thème d'&&icône de fichier",
-	"miPreferences": "&&Préférences",
-	"miReopenClosedEditor": "&&Rouvrir l'éditeur fermé",
-	"miMore": "&&Plus...",
-	"miClearRecentOpen": "Effacer les fichiers &&récents",
-	"miUndo": "&&Annuler",
-	"miRedo": "&&Rétablir",
-	"miCut": "Coupe&&r",
-	"miCopy": "&&Copier",
-	"miPaste": "&&Coller",
-	"miFind": "&&Rechercher",
-	"miReplace": "&&Remplacer",
-	"miFindInFiles": "Rechercher dans les f&&ichiers",
-	"miReplaceInFiles": "Remplacer &&dans les fichiers",
-	"miEmmetExpandAbbreviation": "Emmet : dé&&velopper l'abréviation",
-	"miShowEmmetCommands": "E&&mmet...",
-	"miToggleLineComment": "Afficher/masquer le commen&&taire de ligne",
-	"miToggleBlockComment": "Afficher/masquer le commentaire de &&bloc",
-	"miMultiCursorAlt": "Utiliser Alt+Clic pour l'option multicurseur",
-	"miMultiCursorCmd": "Utiliser Cmd+Clic pour l'option multicurseur",
-	"miMultiCursorCtrl": "Utiliser Ctrl+Clic pour l'option multicurseur",
-	"miInsertCursorAbove": "&&Ajouter un curseur au-dessus",
-	"miInsertCursorBelow": "Aj&&outer un curseur en dessous",
-	"miInsertCursorAtEndOfEachLineSelected": "Ajouter des c&&urseurs à la fin des lignes",
-	"miAddSelectionToNextFindMatch": "Ajouter l'occurrence suiva&&nte",
-	"miAddSelectionToPreviousFindMatch": "Ajouter l'occurrence p&&récédente",
-	"miSelectHighlights": "Sélectionner toutes les &&occurrences",
-	"miCopyLinesUp": "&&Copier la ligne en haut",
-	"miCopyLinesDown": "Co&&pier la ligne en bas",
-	"miMoveLinesUp": "Déplacer la ligne &&vers le haut",
-	"miMoveLinesDown": "Déplacer la &&ligne vers le bas",
-	"miSelectAll": "&&Sélectionner tout",
-	"miSmartSelectGrow": "Dév&&elopper la sélection",
-	"miSmartSelectShrink": "&&Réduire la sélection",
-	"miViewExplorer": "&&Explorateur",
-	"miViewSearch": "&&Rechercher",
-	"miViewSCM": "S&&CM",
-	"miViewDebug": "&&Déboguer",
-	"miViewExtensions": "E&&xtensions",
-	"miToggleOutput": "&&Sortie",
-	"miToggleDebugConsole": "Console de dé&&bogage",
-	"miToggleIntegratedTerminal": "&&Terminal intégré",
-	"miMarker": "&&Problèmes",
-	"miCommandPalette": "Palette de &&commandes...",
-	"miOpenView": "&&Ouvrir la vue...",
-	"miToggleFullScreen": "Plei&&n écran",
-	"miToggleZenMode": "Activer/désactiver le mode zen",
-	"miToggleCenteredLayout": "Activer/désactiver la disposition centrée",
-	"miToggleMenuBar": "Activer/désactiver la &&barre de menus",
-	"miSplitEditor": "Fractionner l'édit&&eur",
-	"miToggleEditorLayout": "Activer/désactiver la &&disposition du groupe d'éditeurs",
-	"miToggleSidebar": "Activer/désactiver la &&barre latérale",
-	"miMoveSidebarRight": "Déplacer la &&barre latérale vers la droite",
-	"miMoveSidebarLeft": "Déplacer la &&barre latérale vers la gauche",
-	"miTogglePanel": "Activer/désactiver le &&panneau",
-	"miHideStatusbar": "&&Masquer la barre d'état",
-	"miShowStatusbar": "Affic&&her la barre d'état",
-	"miHideActivityBar": "Masquer la &&Barre d'activités",
-	"miShowActivityBar": "Afficher la &&Barre d'activités",
-	"miToggleWordWrap": "Activer/désactiver le retour automatique à la &&ligne",
-	"miToggleMinimap": "Activer/désactiver la &&minicarte",
-	"miToggleRenderWhitespace": "Activer/désactiver &&Restituer l'espace",
-	"miToggleRenderControlCharacters": "Activer/désactiver les &&caractères de contrôle",
-	"miZoomIn": "&&Zoom avant",
-	"miZoomOut": "Zoo&&m arrière",
-	"miZoomReset": "&&Réinitialiser le zoom",
-	"miBack": "&&Précédent",
-	"miForward": "&&Suivant",
-	"miNextEditor": "Éditeur &&suivant",
-	"miPreviousEditor": "Éditeur pré&&cédent",
-	"miNextEditorInGroup": "Éditeur &&utilisé suivant dans le groupe",
-	"miPreviousEditorInGroup": "É&&diteur utilisé précédent dans le groupe",
-	"miSwitchEditor": "Changer d'é&&diteur",
-	"miFocusFirstGroup": "&&Premier groupe",
-	"miFocusSecondGroup": "&&Deuxième groupe",
-	"miFocusThirdGroup": "&&Troisième groupe",
-	"miNextGroup": "Groupe &&suivant",
-	"miPreviousGroup": "Groupe pré&&cédent",
-	"miSwitchGroup": "Changer de gr&&oupe",
-	"miGotoFile": "Atteindre le &&fichier...",
-	"miGotoSymbolInFile": "Atteindre le &&symbole dans le fichier...",
-	"miGotoSymbolInWorkspace": "Atteindre le symbole dans l'espace de &&travail...",
-	"miGotoDefinition": "Atteindre la &&définition",
-	"miGotoTypeDefinition": "Accéder à la définition de &&type",
-	"miGotoImplementation": "Accéder à l'&&implémentation",
-	"miGotoLine": "Atteindre la &&ligne...",
-	"miStartDebugging": "&&Démarrer le débogage",
-	"miStartWithoutDebugging": "Démarrer &&sans débogage",
-	"miStopDebugging": "&&Arrêter le débogage",
-	"miRestart Debugging": "&&Redémarrer le débogage",
-	"miOpenConfigurations": "Ouvrir les &&configurations",
-	"miAddConfiguration": "Ajouter une configuration...",
-	"miStepOver": "Effect&&uer un pas à pas principal",
-	"miStepInto": "Effectuer un pas à pas déta&&illé",
-	"miStepOut": "Effectuer un pas à pas s&&ortant",
-	"miContinue": "&&Continuer",
-	"miToggleBreakpoint": "Activer/désactiver le poi&&nt d'arrêt",
-	"miConditionalBreakpoint": "Point d'arrêt &&conditionnel...",
-	"miInlineBreakpoint": "P&&oint d'arrêt Inline",
-	"miFunctionBreakpoint": "Point d'arrêt sur &&fonction...",
-	"miLogPoint": "&&Point de journalisation...",
-	"miNewBreakpoint": "&&Nouveau point d'arrêt",
-	"miEnableAllBreakpoints": "Activer tous les points d'arrêt",
-	"miDisableAllBreakpoints": "Désacti&&ver tous les points d'arrêt",
-	"miRemoveAllBreakpoints": "Supprimer &&tous les points d'arrêt",
-	"miInstallAdditionalDebuggers": "&&Installer des débogueurs supplémentaires...",
-	"mMinimize": "Réduire",
-	"mZoom": "Zoom",
-	"mBringToFront": "Mettre tout au premier plan",
-	"miSwitchWindow": "Changer de &&fenêtre...",
-	"mShowPreviousTab": "Afficher l’onglet précédent",
-	"mShowNextTab": "Afficher l’onglet suivant",
-	"mMoveTabToNewWindow": "Déplacer l’onglet vers une nouvelle fenêtre",
-	"mMergeAllWindows": "Fusionner toutes les fenêtres",
-	"miToggleDevTools": "Activer/désactiver les ou&&tils de développement",
-	"miAccessibilityOptions": "&&Options d'accessibilité",
-	"miOpenProcessExplorerer": "Ouvrir l'Explorateur de &&Processus",
-	"miReportIssue": "Signaler un problème",
-	"miWelcome": "&&Bienvenue",
-	"miInteractivePlayground": "Terrain de jeu &&interactif",
-	"miDocumentation": "&&Documentation",
-	"miReleaseNotes": "Notes de pu&&blication",
-	"miKeyboardShortcuts": "Référence des racco&&urcis clavier",
-	"miIntroductoryVideos": "&&Vidéos d'introduction",
-	"miTipsAndTricks": "&&Conseils et astuces",
-	"miTwitter": "Re&&joignez-nous sur Twitter",
-	"miUserVoice": "&&Rechercher parmi les requêtes de fonctionnalités",
-	"miLicense": "Affic&&her la licence",
-	"miPrivacyStatement": "Déc&&laration de confidentialité",
-	"miAbout": "À pr&&opos de",
-	"miRunTask": "&&Exécuter la tâche...",
-	"miBuildTask": "Exécuter la &&tâche de génération...",
-	"miRunningTask": "Afficher les &&tâches en cours...",
-	"miRestartTask": "R&&edémarrer la tâche en cours d'exécution...",
-	"miTerminateTask": "&&Terminer la tâche...",
-	"miConfigureTask": "&&Configurer les tâches...",
-	"miConfigureBuildTask": "Configurer la tâche de génération par dé&&faut",
-	"accessibilityOptionsWindowTitle": "Options d'accessibilité",
-	"miCheckForUpdates": "Rechercher les mises à jour...",
-	"miCheckingForUpdates": "Recherche des mises à jour...",
-	"miDownloadUpdate": "Télécharger la mise à jour disponible",
-	"miDownloadingUpdate": "Téléchargement de la mise à jour...",
-	"miInstallUpdate": "Installer la mise à jour...",
-	"miInstallingUpdate": "Installation de la mise à jour...",
-	"miRestartToUpdate": "Redémarrer pour mettre à jour..."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/code/electron-main/window.i18n.json b/i18n/fra/src/vs/code/electron-main/window.i18n.json
deleted file mode 100644
index 8d909e9c36b..00000000000
--- a/i18n/fra/src/vs/code/electron-main/window.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hiddenMenuBar": "Vous pouvez toujours accéder à la barre de menus en appuyant sur la touche Alt."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/code/electron-main/windows.i18n.json b/i18n/fra/src/vs/code/electron-main/windows.i18n.json
deleted file mode 100644
index 1af9787d7a7..00000000000
--- a/i18n/fra/src/vs/code/electron-main/windows.i18n.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"ok": "OK",
-	"pathNotExistTitle": "Le chemin d'accès n'existe pas",
-	"pathNotExistDetail": "Le chemin d'accès '{0}' ne semble plus exister sur le disque.",
-	"reopen": "&&Rouvrir",
-	"wait": "&&Continuer à attendre",
-	"close": "&&Fermer",
-	"appStalled": "La fenêtre ne répond plus",
-	"appStalledDetail": "Vous pouvez rouvrir ou fermer la fenêtre, ou continuer à patienter.",
-	"appCrashed": "La fenêtre s'est bloquée",
-	"appCrashedDetail": "Nous vous prions de nous excuser pour ce désagrément. Vous pouvez rouvrir la fenêtre pour reprendre l'action au moment où elle a été interrompue.",
-	"open": "Ouvrir",
-	"openFolder": "Ouvrir le dossier",
-	"openFile": "Ouvrir le fichier",
-	"workspaceOpenedMessage": "Impossible d’enregistrer l’espace de travail '{0}'",
-	"workspaceOpenedDetail": "L’espace de travail est déjà ouvert dans une autre fenêtre. Veuillez s’il vous plaît d’abord fermer cette fenêtre et puis essayez à nouveau.",
-	"openWorkspace": "&&Ouvrir...",
-	"openWorkspaceTitle": "Ouvrir un espace de travail",
-	"save": "&&Enregistrer",
-	"doNotSave": "&&Ne pas enregistrer",
-	"cancel": "Annuler",
-	"saveWorkspaceMessage": "Voulez-vous enregistrer la configuration de votre espace de travail dans un fichier ?",
-	"saveWorkspaceDetail": "Enregistrez votre espace de travail si vous avez l’intention de le rouvrir.",
-	"saveWorkspace": "Enregistrer l’espace de travail"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/code/node/cliProcessMain.i18n.json b/i18n/fra/src/vs/code/node/cliProcessMain.i18n.json
deleted file mode 100644
index 906e5063deb..00000000000
--- a/i18n/fra/src/vs/code/node/cliProcessMain.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"notFound": "Extension '{0}' introuvable.",
-	"notInstalled": "L'extension '{0}' n'est pas installée.",
-	"useId": "Veillez à utiliser l'ID complet de l'extension (serveur de publication inclus). Exemple : {0}",
-	"successVsixInstall": "L'extension '{0}' a été installée correctement !",
-	"cancelVsixInstall": "Installation annulée de l'Extension '{0}'.",
-	"alreadyInstalled": "L'extension '{0}' est déjà installée.",
-	"foundExtension": "'{0}' trouvé dans le Marketplace.",
-	"installing": "Installation...",
-	"successInstall": "L'extension '{0}' v{1} a été correctement installée !",
-	"uninstalling": "Désinstallation de {0}...",
-	"successUninstall": "L'extension '{0}' a été correctement désinstallée !"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/editor/browser/services/bulkEdit.i18n.json b/i18n/fra/src/vs/editor/browser/services/bulkEdit.i18n.json
deleted file mode 100644
index 64f732e09e0..00000000000
--- a/i18n/fra/src/vs/editor/browser/services/bulkEdit.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"summary.0": "Aucune modification effectuée",
-	"summary.nm": "{0} modifications de texte effectuées dans {1} fichiers",
-	"summary.n0": "{0} modifications de texte effectuées dans un fichier",
-	"conflict": "Ces fichiers ont changé pendant ce temps : {0}"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/editor/browser/widget/codeEditorWidget.i18n.json b/i18n/fra/src/vs/editor/browser/widget/codeEditorWidget.i18n.json
deleted file mode 100644
index 973f68f5229..00000000000
--- a/i18n/fra/src/vs/editor/browser/widget/codeEditorWidget.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"cursors.maximum": "Le nombre de curseurs a été limité à {0}."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/editor/browser/widget/diffEditorWidget.i18n.json b/i18n/fra/src/vs/editor/browser/widget/diffEditorWidget.i18n.json
deleted file mode 100644
index bbe8d99b65b..00000000000
--- a/i18n/fra/src/vs/editor/browser/widget/diffEditorWidget.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"diff.tooLarge": "Impossible de comparer les fichiers car l'un d'eux est trop volumineux."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/editor/browser/widget/diffReview.i18n.json b/i18n/fra/src/vs/editor/browser/widget/diffReview.i18n.json
deleted file mode 100644
index 8aa1ed51f9e..00000000000
--- a/i18n/fra/src/vs/editor/browser/widget/diffReview.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"label.close": "Fermer",
-	"no_lines": "aucune ligne",
-	"one_line": "1 ligne",
-	"more_lines": "{0} lignes",
-	"header": "Différence {0} sur {1} : original {2}, {3}, modifié {4}, {5}",
-	"blankLine": "vide",
-	"equalLine": "{0} d'origine, {1} modifiées : {2}",
-	"insertLine": "+ {0} modifiées : {1}",
-	"deleteLine": "- {0} d'origine : {1}",
-	"editor.action.diffReview.next": "Accéder à la différence suivante",
-	"editor.action.diffReview.prev": "Accéder la différence précédente"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/editor/common/commonCodeEditor.i18n.json b/i18n/fra/src/vs/editor/common/commonCodeEditor.i18n.json
deleted file mode 100644
index 973f68f5229..00000000000
--- a/i18n/fra/src/vs/editor/common/commonCodeEditor.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"cursors.maximum": "Le nombre de curseurs a été limité à {0}."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/editor/common/config/commonEditorConfig.i18n.json b/i18n/fra/src/vs/editor/common/config/commonEditorConfig.i18n.json
deleted file mode 100644
index 1ad1b4ad7ba..00000000000
--- a/i18n/fra/src/vs/editor/common/config/commonEditorConfig.i18n.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"editorConfigurationTitle": "Éditeur",
-	"fontFamily": "Contrôle la famille de polices.",
-	"fontWeight": "Contrôle l'épaisseur de police.",
-	"fontSize": "Contrôle la taille de police en pixels.",
-	"lineHeight": "Contrôle la hauteur de ligne. Utilisez 0 pour calculer lineHeight à partir de fontSize.",
-	"letterSpacing": "Définit l'espacement des caractères en pixels.",
-	"lineNumbers.off": "Les numéros de ligne ne sont pas affichés.",
-	"lineNumbers.on": "Les numéros de ligne sont affichés en nombre absolu.",
-	"lineNumbers.relative": "Les numéros de ligne sont affichés sous la forme de distance en lignes à la position du curseur.",
-	"lineNumbers.interval": "Les numéros de ligne sont affichés toutes les 10 lignes.",
-	"lineNumbers": "Contrôle l’affichage des numéros de ligne.",
-	"rulers": "Afficher les règles verticales après un certain nombre de caractères à espacement fixe. Utiliser plusieurs valeurs pour plusieurs règles. Aucune règle n'est dessinée si le tableau est vide",
-	"wordSeparators": "Caractères utilisés comme séparateurs de mots durant la navigation ou les opérations basées sur les mots",
-	"tabSize": "Le nombre d'espaces correspondant à une tabulation. Ce paramètre est remplacé en fonction du contenu du fichier quand 'editor.detectIndentation' est activé.",
-	"tabSize.errorMessage": "'number' attendu. Notez que la valeur \"auto\" a été remplacée par le paramètre 'editor.detectIndentation'.",
-	"insertSpaces": "Espaces insérés quand vous appuyez sur la touche Tab. Ce paramètre est remplacé en fonction du contenu du fichier quand 'editor.detectIndentation' est activé.",
-	"insertSpaces.errorMessage": "'boolean' attendu. Notez que la valeur \"auto\" a été remplacée par le paramètre 'editor.detectIndentation'.",
-	"detectIndentation": "Quand vous ouvrez un fichier, 'editor.tabSize' et 'editor.insertSpaces' sont détectés en fonction du contenu du fichier.",
-	"roundedSelection": "Contrôle si les sélections ont des angles arrondis",
-	"scrollBeyondLastLine": "Contrôle si l'éditeur défile au-delà de la dernière ligne",
-	"scrollBeyondLastColumn": "Contrôle le nombre de caractères supplémentaires, au-delà duquel l’éditeur défilera horizontalement",
-	"smoothScrolling": "Contrôle si l'éditeur défilera en utilisant une animation",
-	"minimap.enabled": "Contrôle si la minicarte est affichée",
-	"minimap.side": "Contrôle le côté où afficher la minicarte.",
-	"minimap.showSlider": "Contrôle si le curseur de la minicarte est automatiquement masqué",
-	"minimap.renderCharacters": "Afficher les caractères réels sur une ligne (par opposition aux blocs de couleurs)",
-	"minimap.maxColumn": "Limiter la largeur de la minicarte pour afficher au maximum un certain nombre de colonnes",
-	"find.seedSearchStringFromSelection": "Contrôle si nous remplissons la chaîne à rechercher dans le Widget Recherche à partir de la sélection de l'éditeur",
-	"find.autoFindInSelection": "Contrôle si l'indicateur Rechercher dans la sélection est activé quand plusieurs caractères ou lignes de texte sont sélectionnés dans l'éditeur",
-	"find.globalFindClipboard": "Contrôle si le Widget Recherche doit lire ou modifier le presse-papiers partagé sur macOS",
-	"wordWrap.off": "Le retour automatique à la ligne n'est jamais effectué.",
-	"wordWrap.on": "Le retour automatique à la ligne s'effectue en fonction de la largeur de la fenêtre d'affichage.",
-	"wordWrap.wordWrapColumn": "Le retour automatique à la ligne s'effectue en fonction de 'editor.wordWrapColumn'.",
-	"wordWrap.bounded": "Retour automatique à la ligne au minimum en fonction de la fenêtre d'affichage et de 'editor.wordWrapColumn'.",
-	"wordWrap": "Contrôle le retour automatique à la ligne. Valeurs possibles :\n - 'off' (désactive le retour automatique à la ligne) ;\n - 'on' (retour automatique à la ligne dans la fenêtre d'affichage) ;\n - 'wordWrapColumn' (retour automatique à la ligne en fonction de 'editor.wordWrapColumn') ou ;\n - 'bounded' (retour automatique à la ligne au minimum en fonction de la fenêtre d'affichage et de 'editor.wordWrapColumn').",
-	"wordWrapColumn": "Contrôle la colonne de retour automatique à la ligne de l'éditeur quand 'editor.wordWrap' a la valeur 'wordWrapColumn' ou 'bounded'.",
-	"wrappingIndent": "Contrôle la mise en retrait des lignes enveloppées. Il peut s’agir de 'none', 'same', 'indent' ou 'deepIndent'.",
-	"mouseWheelScrollSensitivity": "Multiplicateur à utiliser pour le 'deltaX' et le 'deltaY' des événements de défilement de la roulette de la souris",
-	"multiCursorModifier.ctrlCmd": "Mappe vers 'Contrôle' dans Windows et Linux, et vers 'Commande' dans macOS.",
-	"multiCursorModifier.alt": "Mappe vers 'Alt' dans Windows et Linux, et vers 'Option' dans macOS.",
-	"multiCursorModifier": "Le modificateur à utiliser pour ajouter plusieurs curseurs avec la souris. 'ctrlCmd' mappe vers 'Contrôle' dans Windows et Linux, et vers 'Commande' dans macOS. Les mouvements de souris Accéder à la définition et Ouvrir le lien s'adaptent pour ne pas entrer en conflit avec le modificateur multicurseur.",
-	"multiCursorMergeOverlapping": "Fusionnez plusieurs curseurs quand ils se chevauchent.",
-	"quickSuggestions.strings": "Activez les suggestions rapides dans les chaînes.",
-	"quickSuggestions.comments": "Activez les suggestions rapides dans les commentaires.",
-	"quickSuggestions.other": "Activez les suggestions rapides en dehors des chaînes et des commentaires.",
-	"quickSuggestions": "Contrôle si les suggestions doivent s'afficher automatiquement en cours de frappe",
-	"quickSuggestionsDelay": "Contrôle le délai en ms au bout duquel les suggestions rapides s'affichent",
-	"parameterHints": "Active la pop up qui affiche la documentation des paramètres et écrit de l'information pendant que vous écrivez",
-	"autoClosingBrackets": "Contrôle si l'éditeur doit automatiquement fermer les crochets après les avoir ouverts",
-	"formatOnType": "Contrôle si l'éditeur doit automatiquement mettre en forme la ligne après la saisie",
-	"formatOnPaste": "Contrôle si l'éditeur doit automatiquement mettre en forme le contenu collé. Un formateur doit être disponible et doit pouvoir mettre en forme une plage dans un document.",
-	"autoIndent": "Contrôle si l’éditeur doit ajuster automatiquement la mise en retrait lorsque les utilisateurs tapent, collent ou déplacent des lignes. Les règles de mise en retrait du language doivent être disponibles.",
-	"suggestOnTriggerCharacters": "Contrôle si les suggestions doivent s'afficher automatiquement durant la saisie de caractères de déclenchement",
-	"acceptSuggestionOnEnter": "Contrôle si les suggestions doivent être acceptées avec 'Entrée', en plus de 'Tab'. Cela permet d'éviter toute ambiguïté entre l'insertion de nouvelles lignes et l'acceptation de suggestions. La valeur 'smart' signifie que vous acceptez uniquement une suggestion avec Entrée quand elle applique une modification de texte",
-	"acceptSuggestionOnCommitCharacter": "Contrôle si les suggestions doivent être acceptées avec des caractères de validation. Par exemple, en JavaScript, le point-virgule (';') peut être un caractère de validation qui permet d'accepter une suggestion et de taper ce caractère.",
-	"snippetSuggestions.top": "Afficher des suggestions d’extraits au-dessus d’autres suggestions.",
-	"snippetSuggestions.bottom": "Afficher des suggestions d’extraits en-dessous d’autres suggestions.",
-	"snippetSuggestions.inline": "Afficher des suggestions d’extraits avec d’autres suggestions.",
-	"snippetSuggestions.none": "Ne pas afficher de suggestions d’extrait de code.",
-	"snippetSuggestions": "Contrôle si les extraits de code s'affichent en même temps que d'autres suggestions, ainsi que leur mode de tri.",
-	"emptySelectionClipboard": "Contrôle si la copie sans sélection permet de copier la ligne actuelle.",
-	"wordBasedSuggestions": "Contrôle si la saisie semi-automatique doit être calculée en fonction des mots présents dans le document.",
-	"suggestSelection.first": "Sélectionnez toujours la première suggestion.",
-	"suggestSelection.recentlyUsed": "Sélectionnez les suggestions récentes à moins qu'une saisie ultérieure en sélectionne un, par exemple 'console.| -> console.log' parce que `log` a été complété récemment.",
-	"suggestSelection.recentlyUsedByPrefix": "Sélectionnez des suggestions basées sur des préfixes précédents qui ont complété ces suggestions, par exemple `co -> console` et `con -> const`.",
-	"suggestSelection": "Contrôle comment les suggestions sont pré-sélectionnés lors de l’affichage de la liste de suggestion.",
-	"suggestFontSize": "Taille de police du widget de suggestion",
-	"suggestLineHeight": "Hauteur de ligne du widget de suggestion",
-	"selectionHighlight": "Détermine si l'éditeur doit surligner les correspondances similaires à la sélection",
-	"occurrencesHighlight": "Contrôle si l'éditeur doit mettre en surbrillance les occurrences de symboles sémantiques",
-	"overviewRulerLanes": "Contrôle le nombre d'ornements pouvant s'afficher à la même position dans la règle d'aperçu",
-	"overviewRulerBorder": "Contrôle si une bordure doit être dessinée autour de la règle d'aperçu.",
-	"cursorBlinking": "Contrôler le style d’animation du curseur.",
-	"mouseWheelZoom": "Agrandir ou réduire la police de l'éditeur quand l'utilisateur fait tourner la roulette de la souris tout en maintenant la touche Ctrl enfoncée",
-	"cursorStyle": "Contrôle le style du curseur. Les valeurs acceptées sont 'block', 'block-outline', 'line', 'line-thin', 'underline' et 'underline-thin'",
-	"cursorWidth": "Contrôle la largeur du curseur quand editor.cursorStyle est à 'line'",
-	"fontLigatures": "Active les ligatures de police",
-	"hideCursorInOverviewRuler": "Contrôle si le curseur doit être masqué dans la règle d'aperçu.",
-	"renderWhitespace": "Contrôle la façon dont l'éditeur affiche les espaces blancs. Il existe trois options possibles : 'none', 'boundary' et 'all'. L'option 'boundary' n'affiche pas les espaces uniques qui séparent les mots.",
-	"renderControlCharacters": "Contrôle si l'éditeur doit afficher les caractères de contrôle",
-	"renderIndentGuides": "Contrôle si l'éditeur doit afficher les repères de mise en retrait",
-	"renderLineHighlight": "Contrôle la façon dont l'éditeur doit afficher la surbrillance de la ligne active. Les différentes possibilités sont 'none', 'gutter', 'line' et 'all'.",
-	"codeLens": "Contrôle si l’éditeur affiche CodeLens",
-	"folding": "Contrôle si le pliage de code est activé dans l'éditeur",
-	"foldingStrategyAuto": "Si disponible, utilisez une stratégie de présentation langage-spécifique, sinon la stratégie d'indentation s'applique.",
-	"foldingStrategyIndentation": "Utilisez toujours l'indentation basée sur la stratégie de présentation",
-	"foldingStrategy": "Contrôle la façon dont les repliages sont calculées. 'auto' utilise une stratégie repliage spécifique au langage, si disponible. 'indentation' force à ce que la stratégie de repliage basée sur l'indentation soit utilisée.",
-	"showFoldingControls": "Définit si les contrôles de réduction sur la bordure sont cachés automatiquement",
-	"matchBrackets": "Met en surbrillance les crochets correspondants quand l'un d'eux est sélectionné.",
-	"glyphMargin": "Contrôle si l'éditeur doit afficher la marge de glyphes verticale. La marge de glyphes sert principalement au débogage.",
-	"useTabStops": "L'insertion et la suppression d'un espace blanc suit les taquets de tabulation",
-	"trimAutoWhitespace": "Supprimer l'espace blanc de fin inséré automatiquement",
-	"stablePeek": "Garder les éditeurs d'aperçu ouverts même si l'utilisateur double-clique sur son contenu ou appuie sur la touche Échap.",
-	"dragAndDrop": "Contrôle si l'éditeur autorise le déplacement des sélections par glisser-déplacer.",
-	"accessibilitySupport.auto": "L'éditeur utilise les API de la plateforme pour détecter si un lecteur d'écran est attaché.",
-	"accessibilitySupport.on": "L'éditeur est optimisé en permanence pour une utilisation avec un lecteur d'écran.",
-	"accessibilitySupport.off": "L'éditeur n'est jamais optimisé pour une utilisation avec un lecteur d'écran.",
-	"accessibilitySupport": "Contrôle si l'éditeur doit s'exécuter dans un mode optimisé pour les lecteurs d'écran.",
-	"links": "Contrôle si l'éditeur doit détecter les liens et les rendre cliquables",
-	"colorDecorators": "Contrôle si l'éditeur doit afficher les éléments décoratifs de couleurs inline et le sélecteur de couleurs.",
-	"codeActions": "Active l'ampoule d'action de code",
-	"codeActionsOnSave.organizeImports": "Exécuter organiser les importations lors de l'enregistrement ?",
-	"codeActionsOnSave": "Types d'action de code à exécuter à l'enregistrement.",
-	"codeActionsOnSaveTimeout": "Délai d'attente pour les actions de code exécutées lors de l'enregistrement.",
-	"selectionClipboard": "Contrôle si le presse-papiers primaire Linux doit être pris en charge.",
-	"sideBySide": "Contrôle si l'éditeur de différences affiche les différences en mode côte à côte ou inline",
-	"ignoreTrimWhitespace": "Contrôle si l'éditeur de différences affiche les changements liés aux espaces blancs de début ou de fin comme des différences",
-	"largeFileOptimizations": "Traitement spécial des fichiers volumineux pour désactiver certaines fonctionnalités utilisant beaucoup de mémoire.",
-	"renderIndicators": "Contrôle si l'éditeur de différences affiche les indicateurs +/- pour les modifications ajoutées/supprimées"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/editor/common/config/defaultConfig.i18n.json b/i18n/fra/src/vs/editor/common/config/defaultConfig.i18n.json
deleted file mode 100644
index bf45d0601aa..00000000000
--- a/i18n/fra/src/vs/editor/common/config/defaultConfig.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"editorViewAccessibleLabel": "Contenu d'éditeur"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/editor/common/config/editorOptions.i18n.json b/i18n/fra/src/vs/editor/common/config/editorOptions.i18n.json
deleted file mode 100644
index ef45a498946..00000000000
--- a/i18n/fra/src/vs/editor/common/config/editorOptions.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"accessibilityOffAriaLabel": "L'éditeur n'est pas accessible pour le moment. Appuyez sur Alt+F1 pour connaître les options.",
-	"editorViewAccessibleLabel": "Contenu d'éditeur"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/editor/common/controller/cursor.i18n.json b/i18n/fra/src/vs/editor/common/controller/cursor.i18n.json
deleted file mode 100644
index f47090dd6d3..00000000000
--- a/i18n/fra/src/vs/editor/common/controller/cursor.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"corrupt.commands": "Exception inattendue pendant l'exécution de la commande."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/editor/common/model/textModelWithTokens.i18n.json b/i18n/fra/src/vs/editor/common/model/textModelWithTokens.i18n.json
deleted file mode 100644
index a9d6aa6864a..00000000000
--- a/i18n/fra/src/vs/editor/common/model/textModelWithTokens.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"mode.tokenizationSupportFailed": "Le mode a échoué lors de la création de jetons de l’entrée."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/editor/common/modes/modesRegistry.i18n.json b/i18n/fra/src/vs/editor/common/modes/modesRegistry.i18n.json
deleted file mode 100644
index 0580c06c578..00000000000
--- a/i18n/fra/src/vs/editor/common/modes/modesRegistry.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"plainText.alias": "Texte brut"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/editor/common/services/bulkEdit.i18n.json b/i18n/fra/src/vs/editor/common/services/bulkEdit.i18n.json
deleted file mode 100644
index 9a1e91ba2a5..00000000000
--- a/i18n/fra/src/vs/editor/common/services/bulkEdit.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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": "Ces fichiers ont changé pendant ce temps : {0}",
-	"summary.0": "Aucune modification effectuée",
-	"summary.nm": "{0} modifications de texte effectuées dans {1} fichiers",
-	"summary.n0": "{0} modifications de texte effectuées dans un fichier"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/editor/common/services/modeServiceImpl.i18n.json b/i18n/fra/src/vs/editor/common/services/modeServiceImpl.i18n.json
deleted file mode 100644
index 4fdf5a2ac4d..00000000000
--- a/i18n/fra/src/vs/editor/common/services/modeServiceImpl.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"vscode.extension.contributes.languages": "Ajoute des déclarations de langage.",
-	"vscode.extension.contributes.languages.id": "ID du langage.",
-	"vscode.extension.contributes.languages.aliases": "Alias de nom du langage.",
-	"vscode.extension.contributes.languages.extensions": "Extensions de fichier associées au langage.",
-	"vscode.extension.contributes.languages.filenames": "Noms de fichiers associés au langage.",
-	"vscode.extension.contributes.languages.filenamePatterns": "Modèles Glob de noms de fichiers associés au langage.",
-	"vscode.extension.contributes.languages.mimetypes": "Types MIME associés au langue.",
-	"vscode.extension.contributes.languages.firstLine": "Expression régulière correspondant à la première ligne d'un fichier du langage.",
-	"vscode.extension.contributes.languages.configuration": "Chemin relatif d'un fichier contenant les options de configuration du langage."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/editor/common/services/modelServiceImpl.i18n.json b/i18n/fra/src/vs/editor/common/services/modelServiceImpl.i18n.json
deleted file mode 100644
index e12a9398484..00000000000
--- a/i18n/fra/src/vs/editor/common/services/modelServiceImpl.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"diagAndSourceMultiline": "[{0}]\n{1}",
-	"diagAndSource": "[{0}] {1}"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/editor/common/view/editorColorRegistry.i18n.json b/i18n/fra/src/vs/editor/common/view/editorColorRegistry.i18n.json
deleted file mode 100644
index e3b7be89c46..00000000000
--- a/i18n/fra/src/vs/editor/common/view/editorColorRegistry.i18n.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"lineHighlight": "Couleur d'arrière-plan de la mise en surbrillance de la ligne à la position du curseur.",
-	"lineHighlightBorderBox": "Couleur d'arrière-plan de la bordure autour de la ligne à la position du curseur.",
-	"rangeHighlight": "Couleur d'arrière-plan des plages mises en surbrillance, par exemple par les fonctionnalités d'ouverture rapide et de recherche. La couleur ne doit pas être opaque pour ne pas masquer les décorations sous-jacentes.",
-	"rangeHighlightBorder": "Couleur d'arrière-plan de la bordure autour des plages mises en surbrillance.",
-	"caret": "Couleur du curseur de l'éditeur.",
-	"editorCursorBackground": "La couleur de fond du curseur de l'éditeur. Permet de personnaliser la couleur d'un caractère survolé par un curseur de bloc.",
-	"editorWhitespaces": "Couleur des espaces blancs dans l'éditeur.",
-	"editorIndentGuides": "Couleur des repères de retrait de l'éditeur.",
-	"editorActiveIndentGuide": "Couleur des guides d'indentation de l'éditeur actif",
-	"editorLineNumbers": "Couleur des numéros de ligne de l'éditeur.",
-	"editorActiveLineNumber": "Couleur des numéros de lignes actives de l'éditeur",
-	"deprecatedEditorActiveLineNumber": "Id est obsolète. Utilisez à la place 'editorLineNumber.activeForeground'. ",
-	"editorRuler": "Couleur des règles de l'éditeur",
-	"editorCodeLensForeground": "Couleur pour les indicateurs CodeLens",
-	"editorBracketMatchBackground": "Couleur d'arrière-plan pour les accolades associées",
-	"editorBracketMatchBorder": "Couleur pour le contour des accolades associées",
-	"editorOverviewRulerBorder": "Couleur de la bordure de la règle d'apperçu.",
-	"editorGutter": "Couleur de fond pour la bordure de l'éditeur. La bordure contient les marges pour les symboles et les numéros de ligne.",
-	"errorForeground": "Couleur de premier plan de la ligne ondulée marquant les erreurs dans l'éditeur.",
-	"errorBorder": "Couleur de bordure de la ligne ondulée marquant les erreurs dans l'éditeur.",
-	"warningForeground": "Couleur de premier plan de la ligne ondulée marquant les avertissements dans l'éditeur.",
-	"warningBorder": "Couleur de bordure de la ligne ondulée marquant les avertissements dans l'éditeur.",
-	"infoForeground": "Couleur de premier plan de la ligne ondulée marquant les informations dans l'éditeur.",
-	"infoBorder": "Couleur de bordure de la ligne ondulée marquant les informations dans l'éditeur.",
-	"hintForeground": "Couleur de premier plan de la ligne ondulée d'indication dans l'éditeur.",
-	"hintBorder": "Couleur de bordure de la ligne ondulée d'indication dans l'éditeur.",
-	"unnecessaryForeground": "Couleur de premier plan du code inutile dans l'éditeur.",
-	"overviewRulerRangeHighlight": "Couleur du marqueur de la règle d'aperçu pour des plages mises en surbrillance. La couleur doit ne pas être opaque pour ne pas masquer les décorations du dessous.",
-	"overviewRuleError": "Couleur du marqueur de la règle d'aperçu pour les erreurs.",
-	"overviewRuleWarning": "Couleur du marqueur de la règle d'aperçu pour les avertissements.",
-	"overviewRuleInfo": "Couleur du marqueur de la règle d'aperçu pour les informations."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/editor/contrib/accessibility/browser/accessibility.i18n.json b/i18n/fra/src/vs/editor/contrib/accessibility/browser/accessibility.i18n.json
deleted file mode 100644
index 49a5f917f76..00000000000
--- a/i18n/fra/src/vs/editor/contrib/accessibility/browser/accessibility.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"introMsg": "Nous vous remercions de tester les options d'accessibilité de VS Code.",
-	"status": "État :",
-	"tabFocusModeOnMsg": "Appuyez sur Tab dans l'éditeur pour déplacer le focus vers le prochain élément pouvant être désigné comme élément actif. Activez ou désactivez ce comportement en appuyant sur {0}.",
-	"tabFocusModeOnMsgNoKb": "Appuyez sur Tab dans l'éditeur pour déplacer le focus vers le prochain élément pouvant être désigné comme élément actif. La commande {0} ne peut pas être déclenchée par une combinaison de touches.",
-	"tabFocusModeOffMsg": "Appuyez sur Tab dans l'éditeur pour insérer le caractère de tabulation. Activez ou désactivez ce comportement en appuyant sur {0}.",
-	"tabFocusModeOffMsgNoKb": "Appuyez sur Tab dans l'éditeur pour insérer le caractère de tabulation. La commande {0} ne peut pas être déclenchée par une combinaison de touches.",
-	"outroMsg": "Vous pouvez masquer cette info-bulle et revenir à l'éditeur en appuyant sur Échap.",
-	"ShowAccessibilityHelpAction": "Afficher l'aide sur l'accessibilité"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/editor/contrib/bracketMatching/bracketMatching.i18n.json b/i18n/fra/src/vs/editor/contrib/bracketMatching/bracketMatching.i18n.json
deleted file mode 100644
index aaf27ea984b..00000000000
--- a/i18n/fra/src/vs/editor/contrib/bracketMatching/bracketMatching.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"overviewRulerBracketMatchForeground": "Couleur du marqueur de la règle d'aperçu pour rechercher des parenthèses.",
-	"smartSelect.jumpBracket": "Atteindre le crochet",
-	"smartSelect.selectToBracket": "Select to Bracket"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/editor/contrib/bracketMatching/common/bracketMatching.i18n.json b/i18n/fra/src/vs/editor/contrib/bracketMatching/common/bracketMatching.i18n.json
deleted file mode 100644
index 69adc446797..00000000000
--- a/i18n/fra/src/vs/editor/contrib/bracketMatching/common/bracketMatching.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"smartSelect.jumpBracket": "Atteindre le crochet"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/editor/contrib/caretOperations/caretOperations.i18n.json b/i18n/fra/src/vs/editor/contrib/caretOperations/caretOperations.i18n.json
deleted file mode 100644
index e97cb6cc34d..00000000000
--- a/i18n/fra/src/vs/editor/contrib/caretOperations/caretOperations.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"caret.moveLeft": "Déplacer le point d'insertion vers la gauche",
-	"caret.moveRight": "Déplacer le point d'insertion vers la droite"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/editor/contrib/caretOperations/common/caretOperations.i18n.json b/i18n/fra/src/vs/editor/contrib/caretOperations/common/caretOperations.i18n.json
deleted file mode 100644
index 7bc2bb19f59..00000000000
--- a/i18n/fra/src/vs/editor/contrib/caretOperations/common/caretOperations.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"caret.moveLeft": "Déplacer le point d'insertion vers la gauche",
-	"caret.moveRight": "Déplacer le point d'insertion vers la droite"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/editor/contrib/caretOperations/common/transpose.i18n.json b/i18n/fra/src/vs/editor/contrib/caretOperations/common/transpose.i18n.json
deleted file mode 100644
index 9eefe4333b5..00000000000
--- a/i18n/fra/src/vs/editor/contrib/caretOperations/common/transpose.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"transposeLetters.label": "Transposer les lettres"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/editor/contrib/caretOperations/transpose.i18n.json b/i18n/fra/src/vs/editor/contrib/caretOperations/transpose.i18n.json
deleted file mode 100644
index ec11f9ebf2d..00000000000
--- a/i18n/fra/src/vs/editor/contrib/caretOperations/transpose.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"transposeLetters.label": "Transposer les lettres"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/editor/contrib/clipboard/browser/clipboard.i18n.json b/i18n/fra/src/vs/editor/contrib/clipboard/browser/clipboard.i18n.json
deleted file mode 100644
index 80310013902..00000000000
--- a/i18n/fra/src/vs/editor/contrib/clipboard/browser/clipboard.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"actions.clipboard.cutLabel": "Couper",
-	"actions.clipboard.copyLabel": "Copier",
-	"actions.clipboard.pasteLabel": "Coller",
-	"actions.clipboard.copyWithSyntaxHighlightingLabel": "Copier avec la coloration syntaxique"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/editor/contrib/clipboard/clipboard.i18n.json b/i18n/fra/src/vs/editor/contrib/clipboard/clipboard.i18n.json
deleted file mode 100644
index c7ffa33a1df..00000000000
--- a/i18n/fra/src/vs/editor/contrib/clipboard/clipboard.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"actions.clipboard.cutLabel": "Couper",
-	"actions.clipboard.copyLabel": "Copier",
-	"actions.clipboard.pasteLabel": "Coller",
-	"actions.clipboard.copyWithSyntaxHighlightingLabel": "Copier avec la coloration syntaxique"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/editor/contrib/codeAction/codeActionCommands.i18n.json b/i18n/fra/src/vs/editor/contrib/codeAction/codeActionCommands.i18n.json
deleted file mode 100644
index f04b6d13162..00000000000
--- a/i18n/fra/src/vs/editor/contrib/codeAction/codeActionCommands.i18n.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"quickFixWithKb": "Afficher les correctifs ({0})",
-	"quickFix": "Afficher les correctifs",
-	"quickfix.trigger.label": "Correction rapide...",
-	"editor.action.quickFix.noneMessage": "Aucune action de code disponible",
-	"refactor.label": "Remanier...",
-	"editor.action.refactor.noneMessage": "Aucune refactorisation disponible",
-	"source.label": "Action de la source",
-	"editor.action.source.noneMessage": "Aucune action n'est disponible",
-	"organizeImports.label": "Organiser les Imports",
-	"editor.action.organize.noneMessage": "Aucune action organiser les imports disponible"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/editor/contrib/comment/comment.i18n.json b/i18n/fra/src/vs/editor/contrib/comment/comment.i18n.json
deleted file mode 100644
index a38a6f7334a..00000000000
--- a/i18n/fra/src/vs/editor/contrib/comment/comment.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"comment.line": "Activer/désactiver le commentaire de ligne",
-	"comment.line.add": "Ajouter le commentaire de ligne",
-	"comment.line.remove": "Supprimer le commentaire de ligne",
-	"comment.block": "Activer/désactiver le commentaire de bloc"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/editor/contrib/comment/common/comment.i18n.json b/i18n/fra/src/vs/editor/contrib/comment/common/comment.i18n.json
deleted file mode 100644
index d8e23e4d0d7..00000000000
--- a/i18n/fra/src/vs/editor/contrib/comment/common/comment.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"comment.line": "Activer/désactiver le commentaire de ligne",
-	"comment.line.add": "Ajouter le commentaire de ligne",
-	"comment.line.remove": "Supprimer le commentaire de ligne",
-	"comment.block": "Activer/désactiver le commentaire de bloc"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/editor/contrib/contextmenu/browser/contextmenu.i18n.json b/i18n/fra/src/vs/editor/contrib/contextmenu/browser/contextmenu.i18n.json
deleted file mode 100644
index 305f92b19f7..00000000000
--- a/i18n/fra/src/vs/editor/contrib/contextmenu/browser/contextmenu.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"action.showContextMenu.label": "Afficher le menu contextuel de l'éditeur"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/editor/contrib/contextmenu/contextmenu.i18n.json b/i18n/fra/src/vs/editor/contrib/contextmenu/contextmenu.i18n.json
deleted file mode 100644
index eb6cdecd056..00000000000
--- a/i18n/fra/src/vs/editor/contrib/contextmenu/contextmenu.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"action.showContextMenu.label": "Afficher le menu contextuel de l'éditeur"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/editor/contrib/find/browser/findWidget.i18n.json b/i18n/fra/src/vs/editor/contrib/find/browser/findWidget.i18n.json
deleted file mode 100644
index b38c8823721..00000000000
--- a/i18n/fra/src/vs/editor/contrib/find/browser/findWidget.i18n.json
+++ /dev/null
@@ -1,21 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"label.find": "Rechercher",
-	"placeholder.find": "Rechercher",
-	"label.previousMatchButton": "Correspondance précédente",
-	"label.nextMatchButton": "Correspondance suivante",
-	"label.toggleSelectionFind": "Rechercher dans la sélection",
-	"label.closeButton": "Fermer",
-	"label.replace": "Remplacer",
-	"placeholder.replace": "Remplacer",
-	"label.replaceButton": "Remplacer",
-	"label.replaceAllButton": "Tout remplacer",
-	"label.toggleReplaceButton": "Changer le mode de remplacement",
-	"title.matchesCountLimit": "Seuls les {0} premiers résultats sont mis en évidence, mais toutes les opérations de recherche fonctionnent sur l’ensemble du texte.",
-	"label.matchesLocation": "{0} sur {1}",
-	"label.noResults": "Aucun résultat"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/editor/contrib/find/browser/simpleFindWidget.i18n.json b/i18n/fra/src/vs/editor/contrib/find/browser/simpleFindWidget.i18n.json
deleted file mode 100644
index 6183484b59c..00000000000
--- a/i18n/fra/src/vs/editor/contrib/find/browser/simpleFindWidget.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"label.find": "Rechercher",
-	"placeholder.find": "Rechercher",
-	"label.previousMatchButton": "Correspondance précédente",
-	"label.nextMatchButton": "Correspondance suivante",
-	"label.closeButton": "Fermer"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/editor/contrib/find/common/findController.i18n.json b/i18n/fra/src/vs/editor/contrib/find/common/findController.i18n.json
deleted file mode 100644
index 21889b4123e..00000000000
--- a/i18n/fra/src/vs/editor/contrib/find/common/findController.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"startFindAction": "Rechercher",
-	"findNextMatchAction": "Rechercher suivant",
-	"findPreviousMatchAction": "Rechercher précédent",
-	"nextSelectionMatchFindAction": "Sélection suivante",
-	"previousSelectionMatchFindAction": "Sélection précédente",
-	"startReplace": "Remplacer",
-	"showNextFindTermAction": "Afficher le terme de recherche suivant",
-	"showPreviousFindTermAction": "Afficher le terme de recherche précédent"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/editor/contrib/find/findController.i18n.json b/i18n/fra/src/vs/editor/contrib/find/findController.i18n.json
deleted file mode 100644
index cc78fabc3db..00000000000
--- a/i18n/fra/src/vs/editor/contrib/find/findController.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"startFindAction": "Rechercher",
-	"startFindWithSelectionAction": "Rechercher dans la sélection",
-	"findNextMatchAction": "Rechercher suivant",
-	"findPreviousMatchAction": "Rechercher précédent",
-	"nextSelectionMatchFindAction": "Sélection suivante",
-	"previousSelectionMatchFindAction": "Sélection précédente",
-	"startReplace": "Remplacer",
-	"showNextFindTermAction": "Afficher le terme de recherche suivant",
-	"showPreviousFindTermAction": "Afficher le terme de recherche précédent"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/editor/contrib/find/findWidget.i18n.json b/i18n/fra/src/vs/editor/contrib/find/findWidget.i18n.json
deleted file mode 100644
index 30499c424ef..00000000000
--- a/i18n/fra/src/vs/editor/contrib/find/findWidget.i18n.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"label.find": "Rechercher",
-	"placeholder.find": "Rechercher",
-	"label.previousMatchButton": "Correspondance précédente",
-	"label.nextMatchButton": "Correspondance suivante",
-	"label.toggleSelectionFind": "Rechercher dans la sélection",
-	"label.closeButton": "Fermer",
-	"label.replace": "Remplacer",
-	"placeholder.replace": "Remplacer",
-	"label.replaceButton": "Remplacer",
-	"label.replaceAllButton": "Tout remplacer",
-	"label.toggleReplaceButton": "Changer le mode de remplacement",
-	"title.matchesCountLimit": "Seuls les {0} premiers résultats sont mis en évidence, mais toutes les opérations de recherche fonctionnent sur l’ensemble du texte.",
-	"label.matchesLocation": "{0} sur {1}",
-	"label.noResults": "Aucun résultat"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/editor/contrib/find/simpleFindWidget.i18n.json b/i18n/fra/src/vs/editor/contrib/find/simpleFindWidget.i18n.json
deleted file mode 100644
index a18deeb50a0..00000000000
--- a/i18n/fra/src/vs/editor/contrib/find/simpleFindWidget.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"label.find": "Rechercher",
-	"placeholder.find": "Rechercher",
-	"label.previousMatchButton": "Correspondance précédente",
-	"label.nextMatchButton": "Correspondance suivante",
-	"label.closeButton": "Fermer"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/editor/contrib/folding/browser/folding.i18n.json b/i18n/fra/src/vs/editor/contrib/folding/browser/folding.i18n.json
deleted file mode 100644
index 4909bb2e401..00000000000
--- a/i18n/fra/src/vs/editor/contrib/folding/browser/folding.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"unfoldAction.label": "Déplier",
-	"unFoldRecursivelyAction.label": "Déplier de manière récursive",
-	"foldAction.label": "Plier",
-	"foldRecursivelyAction.label": "Plier de manière récursive",
-	"foldAllAction.label": "Plier tout",
-	"unfoldAllAction.label": "Déplier tout",
-	"foldLevelAction.label": "Niveau de pliage {0}"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/editor/contrib/folding/folding.i18n.json b/i18n/fra/src/vs/editor/contrib/folding/folding.i18n.json
deleted file mode 100644
index 695d18c0962..00000000000
--- a/i18n/fra/src/vs/editor/contrib/folding/folding.i18n.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"unfoldAction.label": "Déplier",
-	"unFoldRecursivelyAction.label": "Déplier de manière récursive",
-	"foldAction.label": "Plier",
-	"foldRecursivelyAction.label": "Plier de manière récursive",
-	"foldAllBlockComments.label": "Replier tous les commentaires de bloc",
-	"foldAllMarkerRegions.label": "Replier toutes les régions",
-	"unfoldAllMarkerRegions.label": "Déplier toutes les régions",
-	"foldAllAction.label": "Plier tout",
-	"unfoldAllAction.label": "Déplier tout",
-	"foldLevelAction.label": "Niveau de pliage {0}"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/editor/contrib/fontZoom/fontZoom.i18n.json b/i18n/fra/src/vs/editor/contrib/fontZoom/fontZoom.i18n.json
deleted file mode 100644
index cec7a842f7d..00000000000
--- a/i18n/fra/src/vs/editor/contrib/fontZoom/fontZoom.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"EditorFontZoomIn.label": "Agrandissement de l'éditeur de polices de caractères",
-	"EditorFontZoomOut.label": "Rétrécissement de l'éditeur de polices de caractères",
-	"EditorFontZoomReset.label": "Remise à niveau du zoom de l'éditeur de polices de caractères"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/editor/contrib/format/browser/formatActions.i18n.json b/i18n/fra/src/vs/editor/contrib/format/browser/formatActions.i18n.json
deleted file mode 100644
index 5d10d9569e4..00000000000
--- a/i18n/fra/src/vs/editor/contrib/format/browser/formatActions.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"hint11": "1 modification de format effectuée à la ligne {0}",
-	"hintn1": "{0} modifications de format effectuées à la ligne {1}",
-	"hint1n": "1 modification de format effectuée entre les lignes {0} et {1}",
-	"hintnn": "{0} modifications de format effectuées entre les lignes {1} et {2}",
-	"no.provider": "Désolé, mais il n’y a aucun formateur installé pour les fichiers '{0}'.",
-	"formatDocument.label": "Mettre en forme le document",
-	"formatSelection.label": "Mettre en forme la sélection"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/editor/contrib/format/formatActions.i18n.json b/i18n/fra/src/vs/editor/contrib/format/formatActions.i18n.json
deleted file mode 100644
index 24bb87dbeb0..00000000000
--- a/i18n/fra/src/vs/editor/contrib/format/formatActions.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hint11": "1 modification de format effectuée à la ligne {0}",
-	"hintn1": "{0} modifications de format effectuées à la ligne {1}",
-	"hint1n": "1 modification de format effectuée entre les lignes {0} et {1}",
-	"hintnn": "{0} modifications de format effectuées entre les lignes {1} et {2}",
-	"no.provider": "Il n’y a aucun formateur installé pour les fichiers '{0}'.",
-	"formatDocument.label": "Mettre en forme le document",
-	"no.documentprovider": "Il n’y a aucun formateur de document installé pour les fichiers '{0}'.",
-	"formatSelection.label": "Mettre en forme la sélection",
-	"no.selectionprovider": "Il n’y a aucun formateur de sélection installé pour les fichiers '{0}'."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.i18n.json b/i18n/fra/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.i18n.json
deleted file mode 100644
index 5fee5001dd0..00000000000
--- a/i18n/fra/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.i18n.json
+++ /dev/null
@@ -1,24 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"noResultWord": "Définition introuvable pour '{0}'",
-	"generic.noResults": "Définition introuvable",
-	"meta.title": " – {0} définitions",
-	"actions.goToDecl.label": "Atteindre la définition",
-	"actions.goToDeclToSide.label": "Ouvrir la définition sur le côté",
-	"actions.previewDecl.label": "Apercu de définition",
-	"goToImplementation.noResultWord": "Implémentation introuvable pour '{0}'",
-	"goToImplementation.generic.noResults": "Implémentation introuvable",
-	"meta.implementations.title": "– Implémentations {0}",
-	"actions.goToImplementation.label": "Accéder à l'implémentation",
-	"actions.peekImplementation.label": "Aperçu de l'implémentation",
-	"goToTypeDefinition.noResultWord": "Définition de type introuvable pour '{0}'",
-	"goToTypeDefinition.generic.noResults": "Définition de type introuvable",
-	"meta.typeDefinitions.title": " – Définitions de type {0}",
-	"actions.goToTypeDefinition.label": "Atteindre la définition de type",
-	"actions.peekTypeDefinition.label": "Aperçu de la définition du type",
-	"multipleResults": "Cliquez pour afficher {0} définitions."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/editor/contrib/goToDeclaration/browser/goToDeclarationCommands.i18n.json b/i18n/fra/src/vs/editor/contrib/goToDeclaration/browser/goToDeclarationCommands.i18n.json
deleted file mode 100644
index bdf5cc7e425..00000000000
--- a/i18n/fra/src/vs/editor/contrib/goToDeclaration/browser/goToDeclarationCommands.i18n.json
+++ /dev/null
@@ -1,23 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"noResultWord": "Définition introuvable pour '{0}'",
-	"generic.noResults": "Définition introuvable",
-	"meta.title": " – {0} définitions",
-	"actions.goToDecl.label": "Atteindre la définition",
-	"actions.goToDeclToSide.label": "Ouvrir la définition sur le côté",
-	"actions.previewDecl.label": "Aperçu de définition",
-	"goToImplementation.noResultWord": "Implémentation introuvable pour '{0}'",
-	"goToImplementation.generic.noResults": "Implémentation introuvable",
-	"meta.implementations.title": "– Implémentations {0}",
-	"actions.goToImplementation.label": "Accéder à l'implémentation",
-	"actions.peekImplementation.label": "Aperçu de l'implémentation",
-	"goToTypeDefinition.noResultWord": "Définition de type introuvable pour '{0}'",
-	"goToTypeDefinition.generic.noResults": "Définition de type introuvable",
-	"meta.typeDefinitions.title": " – Définitions de type {0}",
-	"actions.goToTypeDefinition.label": "Atteindre la définition de type",
-	"actions.peekTypeDefinition.label": "Aperçu de la définition du type"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/editor/contrib/goToDeclaration/browser/goToDeclarationMouse.i18n.json b/i18n/fra/src/vs/editor/contrib/goToDeclaration/browser/goToDeclarationMouse.i18n.json
deleted file mode 100644
index 247bd9d24da..00000000000
--- a/i18n/fra/src/vs/editor/contrib/goToDeclaration/browser/goToDeclarationMouse.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"multipleResults": "Cliquez pour afficher {0} définitions."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/editor/contrib/goToDeclaration/goToDeclarationCommands.i18n.json b/i18n/fra/src/vs/editor/contrib/goToDeclaration/goToDeclarationCommands.i18n.json
deleted file mode 100644
index 0e4da1396fb..00000000000
--- a/i18n/fra/src/vs/editor/contrib/goToDeclaration/goToDeclarationCommands.i18n.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noResultWord": "Définition introuvable pour '{0}'",
-	"generic.noResults": "Définition introuvable",
-	"meta.title": " – {0} définitions",
-	"actions.goToDecl.label": "Atteindre la définition",
-	"actions.goToDeclToSide.label": "Ouvrir la définition sur le côté",
-	"actions.previewDecl.label": "Aperçu de définition",
-	"goToImplementation.noResultWord": "Implémentation introuvable pour '{0}'",
-	"goToImplementation.generic.noResults": "Implémentation introuvable",
-	"meta.implementations.title": "– Implémentations {0}",
-	"actions.goToImplementation.label": "Accéder à l'implémentation",
-	"actions.peekImplementation.label": "Aperçu de l'implémentation",
-	"goToTypeDefinition.noResultWord": "Définition de type introuvable pour '{0}'",
-	"goToTypeDefinition.generic.noResults": "Définition de type introuvable",
-	"meta.typeDefinitions.title": " – Définitions de type {0}",
-	"actions.goToTypeDefinition.label": "Atteindre la définition de type",
-	"actions.peekTypeDefinition.label": "Aperçu de la définition du type"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/editor/contrib/goToDeclaration/goToDeclarationMouse.i18n.json b/i18n/fra/src/vs/editor/contrib/goToDeclaration/goToDeclarationMouse.i18n.json
deleted file mode 100644
index d92af39bda7..00000000000
--- a/i18n/fra/src/vs/editor/contrib/goToDeclaration/goToDeclarationMouse.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"multipleResults": "Cliquez pour afficher {0} définitions."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/editor/contrib/goToDefinition/goToDefinitionCommands.i18n.json b/i18n/fra/src/vs/editor/contrib/goToDefinition/goToDefinitionCommands.i18n.json
deleted file mode 100644
index 0e4da1396fb..00000000000
--- a/i18n/fra/src/vs/editor/contrib/goToDefinition/goToDefinitionCommands.i18n.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noResultWord": "Définition introuvable pour '{0}'",
-	"generic.noResults": "Définition introuvable",
-	"meta.title": " – {0} définitions",
-	"actions.goToDecl.label": "Atteindre la définition",
-	"actions.goToDeclToSide.label": "Ouvrir la définition sur le côté",
-	"actions.previewDecl.label": "Aperçu de définition",
-	"goToImplementation.noResultWord": "Implémentation introuvable pour '{0}'",
-	"goToImplementation.generic.noResults": "Implémentation introuvable",
-	"meta.implementations.title": "– Implémentations {0}",
-	"actions.goToImplementation.label": "Accéder à l'implémentation",
-	"actions.peekImplementation.label": "Aperçu de l'implémentation",
-	"goToTypeDefinition.noResultWord": "Définition de type introuvable pour '{0}'",
-	"goToTypeDefinition.generic.noResults": "Définition de type introuvable",
-	"meta.typeDefinitions.title": " – Définitions de type {0}",
-	"actions.goToTypeDefinition.label": "Atteindre la définition de type",
-	"actions.peekTypeDefinition.label": "Aperçu de la définition du type"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/editor/contrib/goToDefinition/goToDefinitionMouse.i18n.json b/i18n/fra/src/vs/editor/contrib/goToDefinition/goToDefinitionMouse.i18n.json
deleted file mode 100644
index d92af39bda7..00000000000
--- a/i18n/fra/src/vs/editor/contrib/goToDefinition/goToDefinitionMouse.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"multipleResults": "Cliquez pour afficher {0} définitions."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/editor/contrib/gotoError/browser/gotoError.i18n.json b/i18n/fra/src/vs/editor/contrib/gotoError/browser/gotoError.i18n.json
deleted file mode 100644
index 2e7dbc5e1ee..00000000000
--- a/i18n/fra/src/vs/editor/contrib/gotoError/browser/gotoError.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"title.wo_source": "({0}/{1})",
-	"markerAction.next.label": "Accéder à l'erreur ou l'avertissement suivant",
-	"markerAction.previous.label": "Accéder à l'erreur ou l'avertissement précédent",
-	"editorMarkerNavigationError": "Couleur d'erreur du widget de navigation dans les marqueurs de l'éditeur.",
-	"editorMarkerNavigationWarning": "Couleur d'avertissement du widget de navigation dans les marqueurs de l'éditeur.",
-	"editorMarkerNavigationInfo": "Couleur d’information du widget de navigation du marqueur de l'éditeur.",
-	"editorMarkerNavigationBackground": "Arrière-plan du widget de navigation dans les marqueurs de l'éditeur."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/editor/contrib/gotoError/gotoError.i18n.json b/i18n/fra/src/vs/editor/contrib/gotoError/gotoError.i18n.json
deleted file mode 100644
index ea5476700aa..00000000000
--- a/i18n/fra/src/vs/editor/contrib/gotoError/gotoError.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"markerAction.next.label": "Aller au problème suivant (Erreur, Avertissement, Info)",
-	"markerAction.previous.label": "Aller au problème précédent (Erreur, Avertissement, Info)",
-	"markerAction.nextInFiles.label": "Aller au problème suivant dans Fichiers (Erreur, Avertissement, Info)",
-	"markerAction.previousInFiles.label": "Aller au problème précédent dans Fichiers (Erreur, Avertissement, Info)"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json b/i18n/fra/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json
deleted file mode 100644
index 9d9cfafff38..00000000000
--- a/i18n/fra/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"title.wo_source": "({0}/{1})",
-	"editorMarkerNavigationError": "Couleur d'erreur du widget de navigation dans les marqueurs de l'éditeur.",
-	"editorMarkerNavigationWarning": "Couleur d'avertissement du widget de navigation dans les marqueurs de l'éditeur.",
-	"editorMarkerNavigationInfo": "Couleur d’information du widget de navigation du marqueur de l'éditeur.",
-	"editorMarkerNavigationBackground": "Arrière-plan du widget de navigation dans les marqueurs de l'éditeur."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/editor/contrib/hover/browser/hover.i18n.json b/i18n/fra/src/vs/editor/contrib/hover/browser/hover.i18n.json
deleted file mode 100644
index f2c7ed17560..00000000000
--- a/i18n/fra/src/vs/editor/contrib/hover/browser/hover.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"showHover": "Afficher par pointage"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/editor/contrib/hover/browser/modesContentHover.i18n.json b/i18n/fra/src/vs/editor/contrib/hover/browser/modesContentHover.i18n.json
deleted file mode 100644
index 237cac764d0..00000000000
--- a/i18n/fra/src/vs/editor/contrib/hover/browser/modesContentHover.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"modesContentHover.loading": "Chargement..."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/editor/contrib/hover/hover.i18n.json b/i18n/fra/src/vs/editor/contrib/hover/hover.i18n.json
deleted file mode 100644
index c958d28a17b..00000000000
--- a/i18n/fra/src/vs/editor/contrib/hover/hover.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"showHover": "Afficher par pointage"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/editor/contrib/hover/modesContentHover.i18n.json b/i18n/fra/src/vs/editor/contrib/hover/modesContentHover.i18n.json
deleted file mode 100644
index 4e7ae807da9..00000000000
--- a/i18n/fra/src/vs/editor/contrib/hover/modesContentHover.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"modesContentHover.loading": "Chargement..."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/editor/contrib/inPlaceReplace/common/inPlaceReplace.i18n.json b/i18n/fra/src/vs/editor/contrib/inPlaceReplace/common/inPlaceReplace.i18n.json
deleted file mode 100644
index ec882a2ca36..00000000000
--- a/i18n/fra/src/vs/editor/contrib/inPlaceReplace/common/inPlaceReplace.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"InPlaceReplaceAction.previous.label": "Remplacer par la valeur précédente",
-	"InPlaceReplaceAction.next.label": "Remplacer par la valeur suivante"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/editor/contrib/inPlaceReplace/inPlaceReplace.i18n.json b/i18n/fra/src/vs/editor/contrib/inPlaceReplace/inPlaceReplace.i18n.json
deleted file mode 100644
index 07b0a13195c..00000000000
--- a/i18n/fra/src/vs/editor/contrib/inPlaceReplace/inPlaceReplace.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"InPlaceReplaceAction.previous.label": "Remplacer par la valeur précédente",
-	"InPlaceReplaceAction.next.label": "Remplacer par la valeur suivante"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/editor/contrib/indentation/common/indentation.i18n.json b/i18n/fra/src/vs/editor/contrib/indentation/common/indentation.i18n.json
deleted file mode 100644
index d9fe670d9f5..00000000000
--- a/i18n/fra/src/vs/editor/contrib/indentation/common/indentation.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"indentationToSpaces": "Convertir les retraits en espaces",
-	"indentationToTabs": "Convertir les retraits en tabulations",
-	"configuredTabSize": "Taille des tabulations configurée",
-	"selectTabWidth": "Sélectionner la taille des tabulations pour le fichier actuel",
-	"indentUsingTabs": "Mettre en retrait avec des tabulations",
-	"indentUsingSpaces": "Mettre en retrait avec des espaces",
-	"detectIndentation": "Détecter la mise en retrait à partir du contenu",
-	"editor.reindentlines": "Remettre en retrait les lignes"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/editor/contrib/indentation/indentation.i18n.json b/i18n/fra/src/vs/editor/contrib/indentation/indentation.i18n.json
deleted file mode 100644
index ae80001dbe7..00000000000
--- a/i18n/fra/src/vs/editor/contrib/indentation/indentation.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"indentationToSpaces": "Convertir les retraits en espaces",
-	"indentationToTabs": "Convertir les retraits en tabulations",
-	"configuredTabSize": "Taille des tabulations configurée",
-	"selectTabWidth": "Sélectionner la taille des tabulations pour le fichier actuel",
-	"indentUsingTabs": "Mettre en retrait avec des tabulations",
-	"indentUsingSpaces": "Mettre en retrait avec des espaces",
-	"detectIndentation": "Détecter la mise en retrait à partir du contenu",
-	"editor.reindentlines": "Remettre en retrait les lignes",
-	"editor.reindentselectedlines": "Réindenter les lignes sélectionnées"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/editor/contrib/inspectTMScopes/electron-browser/inspectTMScopes.i18n.json b/i18n/fra/src/vs/editor/contrib/inspectTMScopes/electron-browser/inspectTMScopes.i18n.json
deleted file mode 100644
index a204ab1b865..00000000000
--- a/i18n/fra/src/vs/editor/contrib/inspectTMScopes/electron-browser/inspectTMScopes.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"inspectTMScopes": "Développeur : inspecter les portées TextMate",
-	"inspectTMScopesWidget.loading": "Chargement..."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/editor/contrib/linesOperations/common/linesOperations.i18n.json b/i18n/fra/src/vs/editor/contrib/linesOperations/common/linesOperations.i18n.json
deleted file mode 100644
index ed7fa212566..00000000000
--- a/i18n/fra/src/vs/editor/contrib/linesOperations/common/linesOperations.i18n.json
+++ /dev/null
@@ -1,25 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"lines.copyUp": "Copier la ligne en haut",
-	"lines.copyDown": "Copier la ligne en bas",
-	"lines.moveUp": "Déplacer la ligne vers le haut",
-	"lines.moveDown": "Déplacer la ligne vers le bas",
-	"lines.sortAscending": "Trier les lignes dans l'ordre croissant",
-	"lines.sortDescending": "Trier les lignes dans l'ordre décroissant",
-	"lines.trimTrailingWhitespace": "Découper l'espace blanc de fin",
-	"lines.delete": "Supprimer la ligne",
-	"lines.indent": "Mettre en retrait la ligne",
-	"lines.outdent": "Ajouter un retrait négatif à la ligne",
-	"lines.insertBefore": "Insérer une ligne au-dessus",
-	"lines.insertAfter": "Insérer une ligne sous",
-	"lines.deleteAllLeft": "Supprimer tout ce qui est à gauche",
-	"lines.deleteAllRight": "Supprimer tout ce qui est à droite",
-	"lines.joinLines": "Joindre les lignes",
-	"editor.transpose": "Transposer les caractères autour du curseur",
-	"editor.transformToUppercase": "Transformer en majuscule",
-	"editor.transformToLowercase": "Transformer en minuscule"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/editor/contrib/linesOperations/linesOperations.i18n.json b/i18n/fra/src/vs/editor/contrib/linesOperations/linesOperations.i18n.json
deleted file mode 100644
index 6f1b364e545..00000000000
--- a/i18n/fra/src/vs/editor/contrib/linesOperations/linesOperations.i18n.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"lines.copyUp": "Copier la ligne en haut",
-	"lines.copyDown": "Copier la ligne en bas",
-	"lines.moveUp": "Déplacer la ligne vers le haut",
-	"lines.moveDown": "Déplacer la ligne vers le bas",
-	"lines.sortAscending": "Trier les lignes dans l'ordre croissant",
-	"lines.sortDescending": "Trier les lignes dans l'ordre décroissant",
-	"lines.trimTrailingWhitespace": "Découper l'espace blanc de fin",
-	"lines.delete": "Supprimer la ligne",
-	"lines.indent": "Mettre en retrait la ligne",
-	"lines.outdent": "Ajouter un retrait négatif à la ligne",
-	"lines.insertBefore": "Insérer une ligne au-dessus",
-	"lines.insertAfter": "Insérer une ligne sous",
-	"lines.deleteAllLeft": "Supprimer tout ce qui est à gauche",
-	"lines.deleteAllRight": "Supprimer tout ce qui est à droite",
-	"lines.joinLines": "Joindre les lignes",
-	"editor.transpose": "Transposer les caractères autour du curseur",
-	"editor.transformToUppercase": "Transformer en majuscule",
-	"editor.transformToLowercase": "Transformer en minuscule"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/editor/contrib/links/browser/links.i18n.json b/i18n/fra/src/vs/editor/contrib/links/browser/links.i18n.json
deleted file mode 100644
index d2926b0f956..00000000000
--- a/i18n/fra/src/vs/editor/contrib/links/browser/links.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"links.navigate.mac": "Commande + clic pour suivre le lien",
-	"links.navigate": "Ctrl + clic pour suivre le lien",
-	"links.command.mac": "Cmd + clic pour exécuter la commande",
-	"links.command": "Ctrl + clic pour exécuter la commande",
-	"links.navigate.al": "Alt + clic pour suivre le lien",
-	"links.command.al": "Alt + clic pour exécuter la commande",
-	"invalid.url": "Échec de l'ouverture de ce lien, car il n'est pas bien formé : {0}",
-	"missing.url": "Échec de l'ouverture de ce lien, car sa cible est manquante.",
-	"label": "Ouvrir le lien"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/editor/contrib/links/links.i18n.json b/i18n/fra/src/vs/editor/contrib/links/links.i18n.json
deleted file mode 100644
index 2837414f765..00000000000
--- a/i18n/fra/src/vs/editor/contrib/links/links.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"links.navigate.mac": "Commande + clic pour suivre le lien",
-	"links.navigate": "Ctrl + clic pour suivre le lien",
-	"links.command.mac": "Cmd + clic pour exécuter la commande",
-	"links.command": "Ctrl + clic pour exécuter la commande",
-	"links.navigate.al.mac": "Option + clic pour suivre le lien",
-	"links.navigate.al": "Alt + clic pour suivre le lien",
-	"links.command.al.mac": "Option + clic pour exécuter la commande",
-	"links.command.al": "Alt + clic pour exécuter la commande",
-	"invalid.url": "Échec de l'ouverture de ce lien, car il n'est pas bien formé : {0}",
-	"missing.url": "Échec de l'ouverture de ce lien, car sa cible est manquante.",
-	"label": "Ouvrir le lien"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/editor/contrib/message/messageController.i18n.json b/i18n/fra/src/vs/editor/contrib/message/messageController.i18n.json
deleted file mode 100644
index 8f37ab47ec7..00000000000
--- a/i18n/fra/src/vs/editor/contrib/message/messageController.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"editor.readonly": "Impossible de modifier dans l’éditeur en lecture seule"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/editor/contrib/multicursor/common/multicursor.i18n.json b/i18n/fra/src/vs/editor/contrib/multicursor/common/multicursor.i18n.json
deleted file mode 100644
index 04e943155da..00000000000
--- a/i18n/fra/src/vs/editor/contrib/multicursor/common/multicursor.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"mutlicursor.insertAbove": "Ajouter un curseur au-dessus",
-	"mutlicursor.insertBelow": "Ajouter un curseur en dessous",
-	"mutlicursor.insertAtEndOfEachLineSelected": "Ajouter des curseurs à la fin des lignes",
-	"addSelectionToNextFindMatch": "Ajouter la sélection à la correspondance de recherche suivante",
-	"addSelectionToPreviousFindMatch": "Ajouter la sélection à la correspondance de recherche précédente",
-	"moveSelectionToNextFindMatch": "Déplacer la dernière sélection vers la correspondance de recherche suivante",
-	"moveSelectionToPreviousFindMatch": "Déplacer la dernière sélection à la correspondance de recherche précédente",
-	"selectAllOccurrencesOfFindMatch": "Sélectionner toutes les occurrences des correspondances de la recherche",
-	"changeAll.label": "Modifier toutes les occurrences"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/editor/contrib/multicursor/multicursor.i18n.json b/i18n/fra/src/vs/editor/contrib/multicursor/multicursor.i18n.json
deleted file mode 100644
index b2f103033b3..00000000000
--- a/i18n/fra/src/vs/editor/contrib/multicursor/multicursor.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"mutlicursor.insertAbove": "Ajouter un curseur au-dessus",
-	"mutlicursor.insertBelow": "Ajouter un curseur en dessous",
-	"mutlicursor.insertAtEndOfEachLineSelected": "Ajouter des curseurs à la fin des lignes",
-	"addSelectionToNextFindMatch": "Ajouter la sélection à la correspondance de recherche suivante",
-	"addSelectionToPreviousFindMatch": "Ajouter la sélection à la correspondance de recherche précédente",
-	"moveSelectionToNextFindMatch": "Déplacer la dernière sélection vers la correspondance de recherche suivante",
-	"moveSelectionToPreviousFindMatch": "Déplacer la dernière sélection à la correspondance de recherche précédente",
-	"selectAllOccurrencesOfFindMatch": "Sélectionner toutes les occurrences des correspondances de la recherche",
-	"changeAll.label": "Modifier toutes les occurrences"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/editor/contrib/parameterHints/browser/parameterHints.i18n.json b/i18n/fra/src/vs/editor/contrib/parameterHints/browser/parameterHints.i18n.json
deleted file mode 100644
index b2cdf5bab5e..00000000000
--- a/i18n/fra/src/vs/editor/contrib/parameterHints/browser/parameterHints.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"parameterHints.trigger.label": "Indicateurs des paramètres Trigger"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/editor/contrib/parameterHints/browser/parameterHintsWidget.i18n.json b/i18n/fra/src/vs/editor/contrib/parameterHints/browser/parameterHintsWidget.i18n.json
deleted file mode 100644
index 6161b759db1..00000000000
--- a/i18n/fra/src/vs/editor/contrib/parameterHints/browser/parameterHintsWidget.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"hint": "{0}, conseil"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/editor/contrib/parameterHints/parameterHints.i18n.json b/i18n/fra/src/vs/editor/contrib/parameterHints/parameterHints.i18n.json
deleted file mode 100644
index f6b844f4785..00000000000
--- a/i18n/fra/src/vs/editor/contrib/parameterHints/parameterHints.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"parameterHints.trigger.label": "Indicateurs des paramètres Trigger"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/editor/contrib/parameterHints/parameterHintsWidget.i18n.json b/i18n/fra/src/vs/editor/contrib/parameterHints/parameterHintsWidget.i18n.json
deleted file mode 100644
index 3f458eb85ac..00000000000
--- a/i18n/fra/src/vs/editor/contrib/parameterHints/parameterHintsWidget.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hint": "{0}, conseil"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/editor/contrib/quickFix/browser/quickFixCommands.i18n.json b/i18n/fra/src/vs/editor/contrib/quickFix/browser/quickFixCommands.i18n.json
deleted file mode 100644
index d48220f8b63..00000000000
--- a/i18n/fra/src/vs/editor/contrib/quickFix/browser/quickFixCommands.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"quickFixWithKb": "Afficher les correctifs ({0})",
-	"quickFix": "Afficher les correctifs",
-	"quickfix.trigger.label": "Correctif rapide"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/editor/contrib/quickFix/quickFixCommands.i18n.json b/i18n/fra/src/vs/editor/contrib/quickFix/quickFixCommands.i18n.json
deleted file mode 100644
index 96b9a48c2ce..00000000000
--- a/i18n/fra/src/vs/editor/contrib/quickFix/quickFixCommands.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"quickFixWithKb": "Afficher les correctifs ({0})",
-	"quickFix": "Afficher les correctifs",
-	"quickfix.trigger.label": "Correctif rapide",
-	"refactor.label": "Refactoriser"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/editor/contrib/referenceSearch/browser/peekViewWidget.i18n.json b/i18n/fra/src/vs/editor/contrib/referenceSearch/browser/peekViewWidget.i18n.json
deleted file mode 100644
index e7284c958c2..00000000000
--- a/i18n/fra/src/vs/editor/contrib/referenceSearch/browser/peekViewWidget.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"label.close": "Fermer"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/editor/contrib/referenceSearch/browser/referenceSearch.i18n.json b/i18n/fra/src/vs/editor/contrib/referenceSearch/browser/referenceSearch.i18n.json
deleted file mode 100644
index e46a38e9ef2..00000000000
--- a/i18n/fra/src/vs/editor/contrib/referenceSearch/browser/referenceSearch.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"meta.titleReference": " – {0} références",
-	"references.action.label": "Rechercher toutes les références"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/editor/contrib/referenceSearch/browser/referencesController.i18n.json b/i18n/fra/src/vs/editor/contrib/referenceSearch/browser/referencesController.i18n.json
deleted file mode 100644
index 6aa11838980..00000000000
--- a/i18n/fra/src/vs/editor/contrib/referenceSearch/browser/referencesController.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"labelLoading": "Chargement..."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/editor/contrib/referenceSearch/browser/referencesModel.i18n.json b/i18n/fra/src/vs/editor/contrib/referenceSearch/browser/referencesModel.i18n.json
deleted file mode 100644
index 90937161254..00000000000
--- a/i18n/fra/src/vs/editor/contrib/referenceSearch/browser/referencesModel.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"aria.oneReference": "symbole dans {0} sur la ligne {1}, colonne {2}",
-	"aria.fileReferences.1": "1 symbole dans {0}, chemin complet {1}",
-	"aria.fileReferences.N": "{0} symboles dans {1}, chemin complet {2}",
-	"aria.result.0": "Résultats introuvables",
-	"aria.result.1": "1 symbole dans {0}",
-	"aria.result.n1": "{0} symboles dans {1}",
-	"aria.result.nm": "{0} symboles dans {1} fichiers"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/editor/contrib/referenceSearch/browser/referencesWidget.i18n.json b/i18n/fra/src/vs/editor/contrib/referenceSearch/browser/referencesWidget.i18n.json
deleted file mode 100644
index 498b3551c28..00000000000
--- a/i18n/fra/src/vs/editor/contrib/referenceSearch/browser/referencesWidget.i18n.json
+++ /dev/null
@@ -1,27 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"referencesFailre": "Échec de la résolution du fichier.",
-	"referencesCount": "{0} références",
-	"referenceCount": "{0} référence",
-	"missingPreviewMessage": "aperçu non disponible",
-	"treeAriaLabel": "Références",
-	"noResults": "Aucun résultat",
-	"peekView.alternateTitle": "Références",
-	"peekViewTitleBackground": "Couleur d'arrière-plan de la zone de titre de l'affichage d'aperçu.",
-	"peekViewTitleForeground": "Couleur du titre de l'affichage d'aperçu.",
-	"peekViewTitleInfoForeground": "Couleur des informations sur le titre de l'affichage d'aperçu.",
-	"peekViewBorder": "Couleur des bordures et de la flèche de l'affichage d'aperçu.",
-	"peekViewResultsBackground": "Couleur d'arrière-plan de la liste des résultats de l'affichage d'aperçu.",
-	"peekViewResultsMatchForeground": "Couleur de premier plan des noeuds de lignes dans la liste des résultats de l'affichage d'aperçu.",
-	"peekViewResultsFileForeground": "Couleur de premier plan des noeuds de fichiers dans la liste des résultats de l'affichage d'aperçu.",
-	"peekViewResultsSelectionBackground": "Couleur d'arrière-plan de l'entrée sélectionnée dans la liste des résultats de l'affichage d'aperçu.",
-	"peekViewResultsSelectionForeground": "Couleur de premier plan de l'entrée sélectionnée dans la liste des résultats de l'affichage d'aperçu.",
-	"peekViewEditorBackground": "Couleur d'arrière-plan de l'éditeur d'affichage d'aperçu.",
-	"peekViewEditorGutterBackground": "Couleur d'arrière-plan de la bordure de l'éditeur d'affichage d'aperçu.",
-	"peekViewResultsMatchHighlight": "Couleur de mise en surbrillance d'une correspondance dans la liste des résultats de l'affichage d'aperçu.",
-	"peekViewEditorMatchHighlight": "Couleur de mise en surbrillance d'une correspondance dans l'éditeur de l'affichage d'aperçu."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/editor/contrib/referenceSearch/peekViewWidget.i18n.json b/i18n/fra/src/vs/editor/contrib/referenceSearch/peekViewWidget.i18n.json
deleted file mode 100644
index 97ad32589e7..00000000000
--- a/i18n/fra/src/vs/editor/contrib/referenceSearch/peekViewWidget.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"label.close": "Fermer"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/editor/contrib/referenceSearch/referenceSearch.i18n.json b/i18n/fra/src/vs/editor/contrib/referenceSearch/referenceSearch.i18n.json
deleted file mode 100644
index edf8511f0d7..00000000000
--- a/i18n/fra/src/vs/editor/contrib/referenceSearch/referenceSearch.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"meta.titleReference": " – {0} références",
-	"references.action.label": "Rechercher toutes les références"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/editor/contrib/referenceSearch/referencesController.i18n.json b/i18n/fra/src/vs/editor/contrib/referenceSearch/referencesController.i18n.json
deleted file mode 100644
index 68592ef723b..00000000000
--- a/i18n/fra/src/vs/editor/contrib/referenceSearch/referencesController.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"labelLoading": "Chargement..."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/editor/contrib/referenceSearch/referencesModel.i18n.json b/i18n/fra/src/vs/editor/contrib/referenceSearch/referencesModel.i18n.json
deleted file mode 100644
index 4179575a10b..00000000000
--- a/i18n/fra/src/vs/editor/contrib/referenceSearch/referencesModel.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"aria.oneReference": "symbole dans {0} sur la ligne {1}, colonne {2}",
-	"aria.fileReferences.1": "1 symbole dans {0}, chemin complet {1}",
-	"aria.fileReferences.N": "{0} symboles dans {1}, chemin complet {2}",
-	"aria.result.0": "Résultats introuvables",
-	"aria.result.1": "1 symbole dans {0}",
-	"aria.result.n1": "{0} symboles dans {1}",
-	"aria.result.nm": "{0} symboles dans {1} fichiers"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/editor/contrib/referenceSearch/referencesWidget.i18n.json b/i18n/fra/src/vs/editor/contrib/referenceSearch/referencesWidget.i18n.json
deleted file mode 100644
index 247ec48b5dd..00000000000
--- a/i18n/fra/src/vs/editor/contrib/referenceSearch/referencesWidget.i18n.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"referencesFailre": "Échec de la résolution du fichier.",
-	"referencesCount": "{0} références",
-	"referenceCount": "{0} référence",
-	"missingPreviewMessage": "aperçu non disponible",
-	"treeAriaLabel": "Références",
-	"noResults": "Aucun résultat",
-	"peekView.alternateTitle": "Références",
-	"peekViewTitleBackground": "Couleur d'arrière-plan de la zone de titre de l'affichage d'aperçu.",
-	"peekViewTitleForeground": "Couleur du titre de l'affichage d'aperçu.",
-	"peekViewTitleInfoForeground": "Couleur des informations sur le titre de l'affichage d'aperçu.",
-	"peekViewBorder": "Couleur des bordures et de la flèche de l'affichage d'aperçu.",
-	"peekViewResultsBackground": "Couleur d'arrière-plan de la liste des résultats de l'affichage d'aperçu.",
-	"peekViewResultsMatchForeground": "Couleur de premier plan des noeuds de lignes dans la liste des résultats de l'affichage d'aperçu.",
-	"peekViewResultsFileForeground": "Couleur de premier plan des noeuds de fichiers dans la liste des résultats de l'affichage d'aperçu.",
-	"peekViewResultsSelectionBackground": "Couleur d'arrière-plan de l'entrée sélectionnée dans la liste des résultats de l'affichage d'aperçu.",
-	"peekViewResultsSelectionForeground": "Couleur de premier plan de l'entrée sélectionnée dans la liste des résultats de l'affichage d'aperçu.",
-	"peekViewEditorBackground": "Couleur d'arrière-plan de l'éditeur d'affichage d'aperçu.",
-	"peekViewEditorGutterBackground": "Couleur d'arrière-plan de la bordure de l'éditeur d'affichage d'aperçu.",
-	"peekViewResultsMatchHighlight": "Couleur de mise en surbrillance d'une correspondance dans la liste des résultats de l'affichage d'aperçu.",
-	"peekViewEditorMatchHighlight": "Couleur de mise en surbrillance d'une correspondance dans l'éditeur de l'affichage d'aperçu.",
-	"peekViewEditorMatchHighlightBorder": "Bordure de mise en surbrillance d'une correspondance dans l'éditeur de l'affichage d'aperçu."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/editor/contrib/rename/browser/rename.i18n.json b/i18n/fra/src/vs/editor/contrib/rename/browser/rename.i18n.json
deleted file mode 100644
index d6f02080b63..00000000000
--- a/i18n/fra/src/vs/editor/contrib/rename/browser/rename.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"no result": "Aucun résultat.",
-	"aria": "'{0}' renommé en '{1}'. Récapitulatif : {2}",
-	"rename.failed": "Échec de l'exécution du renommage.",
-	"rename.label": "Renommer le symbole"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/editor/contrib/rename/browser/renameInputField.i18n.json b/i18n/fra/src/vs/editor/contrib/rename/browser/renameInputField.i18n.json
deleted file mode 100644
index 171924e9bf2..00000000000
--- a/i18n/fra/src/vs/editor/contrib/rename/browser/renameInputField.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"renameAriaLabel": "Renommez l'entrée. Tapez le nouveau nom et appuyez sur Entrée pour valider."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/editor/contrib/rename/rename.i18n.json b/i18n/fra/src/vs/editor/contrib/rename/rename.i18n.json
deleted file mode 100644
index 143f5147bfa..00000000000
--- a/i18n/fra/src/vs/editor/contrib/rename/rename.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"no result": "Aucun résultat.",
-	"aria": "'{0}' renommé en '{1}'. Récapitulatif : {2}",
-	"rename.failed": "Échec de l'exécution du renommage.",
-	"rename.label": "Renommer le symbole"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/editor/contrib/rename/renameInputField.i18n.json b/i18n/fra/src/vs/editor/contrib/rename/renameInputField.i18n.json
deleted file mode 100644
index 646517d00ee..00000000000
--- a/i18n/fra/src/vs/editor/contrib/rename/renameInputField.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"renameAriaLabel": "Renommez l'entrée. Tapez le nouveau nom et appuyez sur Entrée pour valider."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/editor/contrib/smartSelect/common/smartSelect.i18n.json b/i18n/fra/src/vs/editor/contrib/smartSelect/common/smartSelect.i18n.json
deleted file mode 100644
index d815e36cd81..00000000000
--- a/i18n/fra/src/vs/editor/contrib/smartSelect/common/smartSelect.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"smartSelect.grow": "Développer la sélection",
-	"smartSelect.shrink": "Réduire la sélection"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/editor/contrib/smartSelect/smartSelect.i18n.json b/i18n/fra/src/vs/editor/contrib/smartSelect/smartSelect.i18n.json
deleted file mode 100644
index 8443e53dbfb..00000000000
--- a/i18n/fra/src/vs/editor/contrib/smartSelect/smartSelect.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"smartSelect.grow": "Développer la sélection",
-	"smartSelect.shrink": "Réduire la sélection"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/editor/contrib/snippet/snippetVariables.i18n.json b/i18n/fra/src/vs/editor/contrib/snippet/snippetVariables.i18n.json
deleted file mode 100644
index 5b27a515c99..00000000000
--- a/i18n/fra/src/vs/editor/contrib/snippet/snippetVariables.i18n.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"Sunday": "Dimanche",
-	"Monday": "Lundi",
-	"Tuesday": "Mardi",
-	"Wednesday": "Mercredi",
-	"Thursday": "Jeudi",
-	"Friday": "Vendredi",
-	"Saturday": "Samedi",
-	"SundayShort": "Dim",
-	"MondayShort": "Lun",
-	"TuesdayShort": "Mar",
-	"WednesdayShort": "Mer",
-	"ThursdayShort": "Jeu",
-	"FridayShort": "Ven",
-	"SaturdayShort": "Sam",
-	"January": "Janvier",
-	"February": "Février",
-	"March": "Mars",
-	"April": "Avril",
-	"May": "Mai",
-	"June": "Juin",
-	"July": "Juillet",
-	"August": "Août",
-	"September": "Septembre",
-	"October": "Octobre",
-	"November": "Novembre",
-	"December": "Décembre",
-	"JanuaryShort": "Jan",
-	"FebruaryShort": "Fév",
-	"MarchShort": "Mar",
-	"AprilShort": "Avr",
-	"MayShort": "Mai",
-	"JuneShort": "Jun",
-	"JulyShort": "Jul",
-	"AugustShort": "Aoû",
-	"SeptemberShort": "Sep",
-	"OctoberShort": "Oct",
-	"NovemberShort": "Nov",
-	"DecemberShort": "Déc"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/editor/contrib/suggest/browser/suggestController.i18n.json b/i18n/fra/src/vs/editor/contrib/suggest/browser/suggestController.i18n.json
deleted file mode 100644
index 6715662ea09..00000000000
--- a/i18n/fra/src/vs/editor/contrib/suggest/browser/suggestController.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"arai.alert.snippet": "L'acceptation de '{0}' a inséré le texte suivant : {1}",
-	"suggest.trigger.label": "Suggestions pour Trigger"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/editor/contrib/suggest/browser/suggestWidget.i18n.json b/i18n/fra/src/vs/editor/contrib/suggest/browser/suggestWidget.i18n.json
deleted file mode 100644
index 75285eb257e..00000000000
--- a/i18n/fra/src/vs/editor/contrib/suggest/browser/suggestWidget.i18n.json
+++ /dev/null
@@ -1,21 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"editorSuggestWidgetBackground": "Couleur d'arrière-plan du widget de suggestion.",
-	"editorSuggestWidgetBorder": "Couleur de bordure du widget de suggestion.",
-	"editorSuggestWidgetForeground": "Couleur de premier plan du widget de suggestion.",
-	"editorSuggestWidgetSelectedBackground": "Couleur d'arrière-plan de l'entrée sélectionnée dans le widget de suggestion.",
-	"editorSuggestWidgetHighlightForeground": "Couleur de la surbrillance des correspondances dans le widget de suggestion.",
-	"readMore": "En savoir plus...{0}",
-	"suggestionWithDetailsAriaLabel": "{0}, suggestion, avec détails",
-	"suggestionAriaLabel": "{0}, suggestion",
-	"readLess": "En savoir moins...{0}",
-	"suggestWidget.loading": "Chargement...",
-	"suggestWidget.noSuggestions": "Pas de suggestions.",
-	"suggestionAriaAccepted": "{0}, accepté",
-	"ariaCurrentSuggestionWithDetails": "{0}, suggestion, avec détails",
-	"ariaCurrentSuggestion": "{0}, suggestion"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/editor/contrib/suggest/suggestController.i18n.json b/i18n/fra/src/vs/editor/contrib/suggest/suggestController.i18n.json
deleted file mode 100644
index b5238a96f1b..00000000000
--- a/i18n/fra/src/vs/editor/contrib/suggest/suggestController.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"arai.alert.snippet": "L'acceptation de '{0}' a inséré le texte suivant : {1}",
-	"suggest.trigger.label": "Suggestions pour Trigger"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/editor/contrib/suggest/suggestWidget.i18n.json b/i18n/fra/src/vs/editor/contrib/suggest/suggestWidget.i18n.json
deleted file mode 100644
index a595ff8d12e..00000000000
--- a/i18n/fra/src/vs/editor/contrib/suggest/suggestWidget.i18n.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"editorSuggestWidgetBackground": "Couleur d'arrière-plan du widget de suggestion.",
-	"editorSuggestWidgetBorder": "Couleur de bordure du widget de suggestion.",
-	"editorSuggestWidgetForeground": "Couleur de premier plan du widget de suggestion.",
-	"editorSuggestWidgetSelectedBackground": "Couleur d'arrière-plan de l'entrée sélectionnée dans le widget de suggestion.",
-	"editorSuggestWidgetHighlightForeground": "Couleur de la surbrillance des correspondances dans le widget de suggestion.",
-	"readMore": "En savoir plus...{0}",
-	"suggestionWithDetailsAriaLabel": "{0}, suggestion, avec détails",
-	"suggestionAriaLabel": "{0}, suggestion",
-	"readLess": "En savoir moins...{0}",
-	"suggestWidget.loading": "Chargement...",
-	"suggestWidget.noSuggestions": "Pas de suggestions.",
-	"suggestionAriaAccepted": "{0}, accepté",
-	"ariaCurrentSuggestionWithDetails": "{0}, suggestion, avec détails",
-	"ariaCurrentSuggestion": "{0}, suggestion"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/editor/contrib/toggleTabFocusMode/common/toggleTabFocusMode.i18n.json b/i18n/fra/src/vs/editor/contrib/toggleTabFocusMode/common/toggleTabFocusMode.i18n.json
deleted file mode 100644
index e8ac83f2da8..00000000000
--- a/i18n/fra/src/vs/editor/contrib/toggleTabFocusMode/common/toggleTabFocusMode.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"toggle.tabMovesFocus": "Activer/désactiver l'utilisation de la touche Tab pour déplacer le focus"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/editor/contrib/toggleTabFocusMode/toggleTabFocusMode.i18n.json b/i18n/fra/src/vs/editor/contrib/toggleTabFocusMode/toggleTabFocusMode.i18n.json
deleted file mode 100644
index dd61b08c25f..00000000000
--- a/i18n/fra/src/vs/editor/contrib/toggleTabFocusMode/toggleTabFocusMode.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggle.tabMovesFocus": "Activer/désactiver l'utilisation de la touche Tab pour déplacer le focus"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/editor/contrib/wordHighlighter/common/wordHighlighter.i18n.json b/i18n/fra/src/vs/editor/contrib/wordHighlighter/common/wordHighlighter.i18n.json
deleted file mode 100644
index 45974daea0a..00000000000
--- a/i18n/fra/src/vs/editor/contrib/wordHighlighter/common/wordHighlighter.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"wordHighlight": "Couleur d'arrière-plan d'un symbole durant l'accès en lecture, par exemple la lecture d'une variable.",
-	"wordHighlightStrong": "Couleur d'arrière-plan d'un symbole durant l'accès en écriture, par exemple l'écriture dans une variable.",
-	"overviewRulerWordHighlightForeground": "Couleur du marqueur de la règle d'aperçu pour la mise en évidence de symbole.",
-	"overviewRulerWordHighlightStrongForeground": "Couleur du marqueur de la règle d'aperçu la mise en évidence de symbole d’accès en écriture.",
-	"wordHighlight.next.label": "Aller à la prochaine mise en évidence de symbole",
-	"wordHighlight.previous.label": "Aller à la mise en évidence de symbole précédente"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json b/i18n/fra/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
deleted file mode 100644
index 0eab06eb685..00000000000
--- a/i18n/fra/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"wordHighlight": "Couleur d'arrière-plan d'un symbole durant l'accès en lecture, par exemple la lecture d'une variable. La couleur ne doit pas être opaque pour ne pas masquer les décorations sous-jacentes.",
-	"wordHighlightStrong": "Couleur d'arrière-plan d'un symbole durant l'accès en écriture, par exemple l'écriture dans une variable. La couleur ne doit pas être opaque pour ne pas masquer les décorations sous-jacentes.",
-	"wordHighlightBorder": "Couleur de bordure d'un symbole durant l'accès en lecture, par exemple la lecture d'une variable.",
-	"wordHighlightStrongBorder": "Couleur de bordure d'un symbole durant l'accès en écriture, par exemple l'écriture dans une variable.",
-	"overviewRulerWordHighlightForeground": "Couleur du marqueur de la règle d'aperçu pour les mises en surbrillance de symbole. La couleur doit ne pas être opaque pour ne pas masquer les décorations du dessous.",
-	"overviewRulerWordHighlightStrongForeground": "Couleur du marqueur de la règle d'aperçu pour les mises en surbrillance de symbole d'accès en écriture. La couleur doit ne pas être opaque pour ne pas masquer les décorations du dessous.",
-	"wordHighlight.next.label": "Aller à la prochaine mise en évidence de symbole",
-	"wordHighlight.previous.label": "Aller à la mise en évidence de symbole précédente"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/editor/contrib/zoneWidget/browser/peekViewWidget.i18n.json b/i18n/fra/src/vs/editor/contrib/zoneWidget/browser/peekViewWidget.i18n.json
deleted file mode 100644
index e7284c958c2..00000000000
--- a/i18n/fra/src/vs/editor/contrib/zoneWidget/browser/peekViewWidget.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"label.close": "Fermer"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/editor/electron-browser/textMate/TMSyntax.i18n.json b/i18n/fra/src/vs/editor/electron-browser/textMate/TMSyntax.i18n.json
deleted file mode 100644
index 61da2f152d0..00000000000
--- a/i18n/fra/src/vs/editor/electron-browser/textMate/TMSyntax.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"invalid.language": "Langage inconnu dans 'contributes.{0}.language'. Valeur fournie : {1}",
-	"invalid.scopeName": "Chaîne attendue dans 'contributes.{0}.scopeName'. Valeur fournie : {1}",
-	"invalid.path.0": "Chaîne attendue dans 'contributes.{0}.path'. Valeur fournie : {1}",
-	"invalid.injectTo": "Valeur non valide dans 'contributes.{0}.injectTo'. Il doit s'agir d'un tableau de noms de portées de langage. Valeur fournie : {1}",
-	"invalid.embeddedLanguages": "Valeur non valide dans 'contributes.{0}.embeddedLanguages'. Il doit s'agir d'un mappage d'objets entre le nom de portée et le langage. Valeur fournie : {1}",
-	"invalid.path.1": "'contributes.{0}.path' ({1}) est censé être inclus dans le dossier ({2}) de l'extension. Cela risque de rendre l'extension non portable.",
-	"no-tm-grammar": "Aucune grammaire TM n'est inscrite pour ce langage."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/editor/node/languageConfigurationExtensionPoint.i18n.json b/i18n/fra/src/vs/editor/node/languageConfigurationExtensionPoint.i18n.json
deleted file mode 100644
index 1d2d1988d2f..00000000000
--- a/i18n/fra/src/vs/editor/node/languageConfigurationExtensionPoint.i18n.json
+++ /dev/null
@@ -1,23 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"parseErrors": "Erreurs durant l'analyse de {0} : {1}",
-	"schema.openBracket": "Séquence de chaînes ou de caractères de crochets ouvrants.",
-	"schema.closeBracket": "Séquence de chaînes ou de caractères de crochets fermants.",
-	"schema.comments": "Définit les symboles de commentaire",
-	"schema.blockComments": "Définit le marquage des commentaires de bloc.",
-	"schema.blockComment.begin": "Séquence de caractères au début d'un commentaire de bloc.",
-	"schema.blockComment.end": "Séquence de caractères à la fin d'un commentaire de bloc.",
-	"schema.lineComment": "Séquence de caractères au début d'un commentaire de ligne.",
-	"schema.brackets": "Définit les symboles de type crochet qui augmentent ou diminuent le retrait.",
-	"schema.autoClosingPairs": "Définit les paires de crochets. Quand vous entrez un crochet ouvrant, le crochet fermant est inséré automatiquement.",
-	"schema.autoClosingPairs.notIn": "Définit une liste d'étendues où les paires automatiques sont désactivées.",
-	"schema.surroundingPairs": "Définit les paires de crochets qui peuvent être utilisées pour entourer la chaîne sélectionnée.",
-	"schema.wordPattern": "La définition du mot dans le langage",
-	"schema.wordPattern.pattern": "L'expression régulière utilisée pour la recherche",
-	"schema.wordPattern.flags": "Les options d'expression régulière utilisées pour la recherche",
-	"schema.wordPattern.flags.errorMessage": "Doit valider l'expression régulière `/^([gimuy]+)$/`."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/editor/node/textMate/TMGrammars.i18n.json b/i18n/fra/src/vs/editor/node/textMate/TMGrammars.i18n.json
deleted file mode 100644
index a18ac142a7e..00000000000
--- a/i18n/fra/src/vs/editor/node/textMate/TMGrammars.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"vscode.extension.contributes.grammars": "Ajoute des générateurs de jetons TextMate.",
-	"vscode.extension.contributes.grammars.language": "Identificateur de langue pour lequel cette syntaxe est ajoutée.",
-	"vscode.extension.contributes.grammars.scopeName": "Nom de portée TextMate utilisé par le fichier tmLanguage.",
-	"vscode.extension.contributes.grammars.path": "Chemin du fichier tmLanguage. Le chemin est relatif au dossier d'extensions et commence généralement par './syntaxes/'.",
-	"vscode.extension.contributes.grammars.embeddedLanguages": "Mappage du nom de portée à l'ID de langage si cette grammaire contient des langages incorporés.",
-	"vscode.extension.contributes.grammars.injectTo": "Liste de noms des portées de langage auxquelles cette grammaire est injectée."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/platform/actions/browser/menuItemActionItem.i18n.json b/i18n/fra/src/vs/platform/actions/browser/menuItemActionItem.i18n.json
deleted file mode 100644
index 0d4e76110bb..00000000000
--- a/i18n/fra/src/vs/platform/actions/browser/menuItemActionItem.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"titleAndKb": "{0} ({1})"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json b/i18n/fra/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
deleted file mode 100644
index 8224c04d14f..00000000000
--- a/i18n/fra/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"requirearray": "les éléments de menu doivent figurer dans un tableau",
-	"requirestring": "la propriété '{0}' est obligatoire et doit être de type 'string'",
-	"optstring": "La propriété '{0}' peut être omise ou doit être de type 'string'",
-	"vscode.extension.contributes.menuItem.command": "Identificateur de la commande à exécuter. La commande doit être déclarée dans la section 'commands'",
-	"vscode.extension.contributes.menuItem.alt": "Identificateur d'une commande alternative à exécuter. La commande doit être déclarée dans la section 'commands'",
-	"vscode.extension.contributes.menuItem.when": "Condition qui doit être vraie pour afficher cet élément",
-	"vscode.extension.contributes.menuItem.group": "Groupe auquel cette commande appartient",
-	"vscode.extension.contributes.menus": "Contribue à fournir des éléments de menu à l'éditeur",
-	"menus.commandPalette": "Palette de commandes",
-	"menus.touchBar": "La touch bar (macOS uniquement)",
-	"menus.editorTitle": "Menu de titre de l'éditeur",
-	"menus.editorContext": "Menu contextuel de l'éditeur",
-	"menus.explorerContext": "Menu contextuel de l'Explorateur de fichiers",
-	"menus.editorTabContext": "Menu contextuel des onglets de l'éditeur",
-	"menus.debugCallstackContext": "Menu contextuel de la pile d'appels de débogage",
-	"menus.scmTitle": "Menu du titre du contrôle de code source",
-	"menus.scmSourceControl": "Le menu de contrôle de code source",
-	"menus.resourceGroupContext": "Menu contextuel du groupe de ressources du contrôle de code source",
-	"menus.resourceStateContext": "Menu contextuel de l'état des ressources du contrôle de code source",
-	"view.viewTitle": "Menu de titre de la vue ajoutée",
-	"view.itemContext": "Menu contextuel de l'élément de vue ajoutée",
-	"nonempty": "valeur non vide attendue.",
-	"opticon": "la propriété 'icon' peut être omise, ou bien elle doit être une chaîne ou un littéral tel que '{dark, light}'",
-	"requireStringOrObject": "la propriété `{0}` est obligatoire et doit être de type `string` ou `object`",
-	"requirestrings": "les propriétés `{0}` et `{1}` sont obligatoires et doivent être de type `string`",
-	"vscode.extension.contributes.commandType.command": "Identificateur de la commande à exécuter",
-	"vscode.extension.contributes.commandType.title": "Titre en fonction duquel la commande est représentée dans l'IU",
-	"vscode.extension.contributes.commandType.category": "(Facultatif) chaîne de catégorie en fonction de laquelle la commande est regroupée dans l'IU",
-	"vscode.extension.contributes.commandType.icon": "(Facultatif) Icône utilisée pour représenter la commande dans l'IU. Il s'agit d'un chemin de fichier ou d'une configuration dont le thème peut être changé",
-	"vscode.extension.contributes.commandType.icon.light": "Chemin d'icône quand un thème clair est utilisé",
-	"vscode.extension.contributes.commandType.icon.dark": "Chemin d'icône quand un thème sombre est utilisé",
-	"vscode.extension.contributes.commands": "Ajoute des commandes à la palette de commandes.",
-	"dup": "La commande '{0}' apparaît plusieurs fois dans la section 'commands'.",
-	"menuId.invalid": "'{0}' est un identificateur de menu non valide",
-	"missing.command": "L'élément de menu fait référence à une commande '{0}' qui n'est pas définie dans la section 'commands'.",
-	"missing.altCommand": "L'élément de menu fait référence à une commande alt '{0}' qui n'est pas définie dans la section 'commands'.",
-	"dupe.command": "L'élément de menu fait référence à la même commande que la commande par défaut et la commande alt"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/platform/configuration/common/configurationRegistry.i18n.json b/i18n/fra/src/vs/platform/configuration/common/configurationRegistry.i18n.json
deleted file mode 100644
index e0589d0223b..00000000000
--- a/i18n/fra/src/vs/platform/configuration/common/configurationRegistry.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"defaultConfigurations.title": "Substitutions de configuration par défaut",
-	"overrideSettings.description": "Configurez les paramètres d'éditeur à remplacer pour le langage {0}.",
-	"overrideSettings.defaultDescription": "Configurez les paramètres d'éditeur à remplacer pour un langage.",
-	"config.property.languageDefault": "Impossible d'inscrire '{0}'. Ceci correspond au modèle de propriété '\\\\[.*\\\\]$' permettant de décrire les paramètres d'éditeur spécifiques à un langage. Utilisez la contribution 'configurationDefaults'.",
-	"config.property.duplicate": "Impossible d'inscrire '{0}'. Cette propriété est déjà inscrite."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/platform/dialogs/common/dialogs.i18n.json b/i18n/fra/src/vs/platform/dialogs/common/dialogs.i18n.json
deleted file mode 100644
index 40bf02755c5..00000000000
--- a/i18n/fra/src/vs/platform/dialogs/common/dialogs.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"moreFile": "...1 fichier supplémentaire non affiché",
-	"moreFiles": "...{0} fichiers supplémentaires non affichés"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/platform/dialogs/node/dialogService.i18n.json b/i18n/fra/src/vs/platform/dialogs/node/dialogService.i18n.json
deleted file mode 100644
index 2f086ccc7a3..00000000000
--- a/i18n/fra/src/vs/platform/dialogs/node/dialogService.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"cancel": "Annuler"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/platform/environment/node/argv.i18n.json b/i18n/fra/src/vs/platform/environment/node/argv.i18n.json
deleted file mode 100644
index 3a6ec15a4d0..00000000000
--- a/i18n/fra/src/vs/platform/environment/node/argv.i18n.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"gotoValidation": "Les arguments en mode '--goto' doivent être au format 'FILE(:LINE(:CHARACTER))'.",
-	"diff": "Comparez deux fichiers entre eux.",
-	"add": "Ajoutez un ou plusieurs dossiers à la dernière fenêtre active.",
-	"goto": "Ouvrez un fichier dans le chemin, à la ligne et la position de caractère spécifiées.",
-	"newWindow": "Force à ouvrir une nouvelle fenêtre.",
-	"reuseWindow": "Force à ouvrir un fichier ou un dossier dans la dernière fenêtre active.",
-	"wait": "Attendre que les fichiers soient fermés avant de retourner.",
-	"locale": "Paramètres régionaux à utiliser (exemple : fr-FR ou en-US).",
-	"userDataDir": "Spécifie le répertoire de l’utilisateur dans lequel les données sont conservées. Peut être utilisé pour ouvrir plusieurs instances distinctes du Code.",
-	"version": "Affichez la version.",
-	"help": "Affichez le mode d'utilisation.",
-	"extensionHomePath": "Définissez le chemin racine des extensions.",
-	"listExtensions": "Listez les extensions installées.",
-	"showVersions": "Affichez les versions des extensions installées, quand --list-extension est utilisé.",
-	"installExtension": "Installe une extension.",
-	"uninstallExtension": "Désinstalle une extension.",
-	"experimentalApis": "Active les fonctionnalités de l’API proposées pour une extension.",
-	"verbose": "Affichez la sortie détaillée (implique --wait).",
-	"log": "Niveau de journalisation à utiliser. La valeur par défaut est 'info'. Les valeurs autorisées sont 'critical', 'error', 'warn', 'info', 'debug', 'trace', 'off.",
-	"status": "Imprimer l'utilisation de processus et l'information des diagnostics.",
-	"performance": "Démarrez avec la commande 'Développeur : performance de démarrage' activée.",
-	"prof-startup": "Exécuter le profileur d'UC au démarrage",
-	"disableExtensions": "Désactivez toutes les extensions installées.",
-	"inspect-extensions": "Permettre le débogage et le profilage d’extensions. Vérifier les outils de développement pour l'URI de connexion.",
-	"inspect-brk-extensions": "Permettre le débogage et le profilage d’extensions avec l’hôte de l’extension étant suspendu après le démarrage. Vérifier les outils de développement pour l'URI de connexion.",
-	"disableGPU": "Désactivez l'accélération matérielle du GPU.",
-	"uploadLogs": "Upload les logs depuis la session actuelle vers le endpoint sécurisé.",
-	"maxMemory": "Taille mémoire maximale pour une fenêtre (En Megaoctêts)",
-	"usage": "Utilisation",
-	"options": "options",
-	"paths": "chemins",
-	"stdinWindows": "Pour lire la sortie d’un autre programme, ajouter '-' (ex. 'echo Bonjour tout le monde | {0} -')",
-	"stdinUnix": "Pour lire depuis stdin, ajouter '-' (ex. 'ps aux | grep code | {0} -')",
-	"optionsUpperCase": "Options",
-	"extensionsManagement": "Gestion des extensions",
-	"troubleshooting": "Dépannage"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/platform/extensionManagement/common/extensionEnablementService.i18n.json b/i18n/fra/src/vs/platform/extensionManagement/common/extensionEnablementService.i18n.json
deleted file mode 100644
index b065a00ff5d..00000000000
--- a/i18n/fra/src/vs/platform/extensionManagement/common/extensionEnablementService.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noWorkspace": "Aucun espace de travail."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/platform/extensionManagement/common/extensionManagement.i18n.json b/i18n/fra/src/vs/platform/extensionManagement/common/extensionManagement.i18n.json
deleted file mode 100644
index 0d779b9336e..00000000000
--- a/i18n/fra/src/vs/platform/extensionManagement/common/extensionManagement.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"extensions": "Extensions",
-	"preferences": "Préférences"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/platform/extensionManagement/node/extensionGalleryService.i18n.json b/i18n/fra/src/vs/platform/extensionManagement/node/extensionGalleryService.i18n.json
deleted file mode 100644
index f3243e568d8..00000000000
--- a/i18n/fra/src/vs/platform/extensionManagement/node/extensionGalleryService.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"notCompatibleDownload": "Téléchargement impossible car l'extension compatible avec la version actuelle '{0}' de VS Code est introuvable."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json b/i18n/fra/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
deleted file mode 100644
index 6d87da3180e..00000000000
--- a/i18n/fra/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"invalidManifest": "Extension non valide : package.json n'est pas un fichier JSON.",
-	"incompatible": "Impossible d’installer l’Extension '{0}' car elle n’est pas compatible avec VS Code '{1}'.",
-	"restartCode": "Redémarrez Code avant de réinstaller {0}.",
-	"installingOutdatedExtension": "Une version plus récente de cette extension est déjà installée. Voulez-vous remplacer celle-ci avec l'ancienne version ?",
-	"override": "Remplacer",
-	"cancel": "Annuler",
-	"errorInstallingDependencies": "Erreur lors de l'installation des dépendances. {0}",
-	"MarketPlaceDisabled": "Le marketplace n’est pas activé",
-	"removeError": "Erreur lors de la suppression de l’extension : {0}. Veuillez quitter et relancer VS Code avant de réessayer.",
-	"Not a Marketplace extension": "Seules les Extensions de Marketplace peuvent être réinstallées",
-	"notFoundCompatible": "Impossible d’installer '{0}'; Il n’y a pas de version disponible compatible avec VS Code '{1}'.",
-	"malicious extension": "Impossible d’installer l'extension car elle a été signalée comme problématique.",
-	"notFoundCompatibleDependency": "Installation impossible car l'extension dépendante '{0}' compatible avec la version actuelle '{1}' de VS Code est introuvable.",
-	"quitCode": "Impossible d’installer l’extension. Veuillez s’il vous plaît quitter et redémarrer VS Code avant de le réinstaller.",
-	"exitCode": "Impossible d’installer l’extension. Veuillez s’il vous plaît sortir et redémarrer VS Code avant de le réinstaller.",
-	"renameError": "Erreur inconnue en renommant {0} en {1}",
-	"uninstallDependeciesConfirmation": "Voulez-vous désinstaller uniquement '{0}' ou également ses dépendances ?",
-	"uninstallOnly": "Extension uniquement",
-	"uninstallAll": "Tout désinstaller",
-	"singleDependentError": "Impossible de désinstaller l'extension '{0}'. L'extension '{1}' en dépend.",
-	"twoDependentsError": "Impossible de désinstaller l'extension '{0}'. Les extensions '{1}' et '{2}' en dépendent.",
-	"multipleDependentsError": "Impossible de désinstaller l'extension '{0}'. Les extensions '{1}', '{2}' et d'autres extensions en dépendent.",
-	"notExists": "Extension introuvable"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/platform/extensions/common/abstractExtensionService.i18n.json b/i18n/fra/src/vs/platform/extensions/common/abstractExtensionService.i18n.json
deleted file mode 100644
index 7c0c741150f..00000000000
--- a/i18n/fra/src/vs/platform/extensions/common/abstractExtensionService.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"unknownDep": "Échec de l'activation de l'extension '{1}'. Raison : dépendance '{0}' inconnue.",
-	"failedDep1": "Échec de l'activation de l'extension '{1}'. Raison : échec de l'activation de la dépendance '{0}'.",
-	"failedDep2": "Échec de l'activation de l'extension '{0}'. Raison : plus de 10 niveaux de dépendances (probablement une boucle de dépendance).",
-	"activationError": "Échec de l'activation de l'extension '{0}' : {1}."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/platform/extensions/common/extensionsRegistry.i18n.json b/i18n/fra/src/vs/platform/extensions/common/extensionsRegistry.i18n.json
deleted file mode 100644
index dadc42773a1..00000000000
--- a/i18n/fra/src/vs/platform/extensions/common/extensionsRegistry.i18n.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.engines.vscode": "Pour les extensions VS Code, spécifie la version de VS Code avec laquelle l'extension est compatible. Ne peut pas être *. Exemple : ^0.10.5 indique une compatibilité avec la version minimale 0.10.5 de VS Code.",
-	"vscode.extension.publisher": "Éditeur de l'extension VS Code.",
-	"vscode.extension.displayName": "Nom d'affichage de l'extension utilisée dans la galerie VS Code.",
-	"vscode.extension.categories": "Catégories utilisées par la galerie VS Code pour catégoriser l'extension.",
-	"vscode.extension.galleryBanner": "Bannière utilisée dans le marketplace VS Code.",
-	"vscode.extension.galleryBanner.color": "Couleur de la bannière de l'en-tête de page du marketplace VS Code.",
-	"vscode.extension.galleryBanner.theme": "Thème de couleur de la police utilisée dans la bannière.",
-	"vscode.extension.contributes": "Toutes les contributions de l'extension VS Code représentées par ce package.",
-	"vscode.extension.preview": "Définit l'extension à marquer en tant que préversion dans Marketplace.",
-	"vscode.extension.activationEvents": "Événements d'activation pour l'extension VS Code.",
-	"vscode.extension.activationEvents.onLanguage": "Événement d'activation envoyé quand un fichier résolu dans le langage spécifié est ouvert.",
-	"vscode.extension.activationEvents.onCommand": "Événement d'activation envoyé quand la commande spécifiée est appelée.",
-	"vscode.extension.activationEvents.onDebug": "Un événement d’activation émis chaque fois qu’un utilisateur est sur le point de démarrer le débogage ou sur le point de la déboguer des configurations.",
-	"vscode.extension.activationEvents.onDebugInitialConfigurations": "Événement d'activation envoyé chaque fois qu’un \"launch.json\" doit être créé (et toutes les méthodes de provideDebugConfigurations doivent être appelées).",
-	"vscode.extension.activationEvents.onDebugResolve": "Événement d'activation envoyé quand une session de débogage du type spécifié est sur le point d’être lancée (et une méthode resolveDebugConfiguration correspondante doit être appelée).",
-	"vscode.extension.activationEvents.workspaceContains": "Événement d'activation envoyé quand un dossier ouvert contient au moins un fichier correspondant au modèle glob spécifié.",
-	"vscode.extension.activationEvents.onView": "Événement d'activation envoyé quand la vue spécifiée est développée.",
-	"vscode.extension.activationEvents.star": "Événement d'activation envoyé au démarrage de VS Code. Pour garantir la qualité de l'expérience utilisateur, utilisez cet événement d'activation dans votre extension uniquement quand aucune autre combinaison d'événements d'activation ne fonctionne dans votre cas d'utilisation.",
-	"vscode.extension.badges": "Ensemble de badges à afficher dans la barre latérale de la page d'extensions de Marketplace.",
-	"vscode.extension.badges.url": "URL de l'image du badge.",
-	"vscode.extension.badges.href": "Lien du badge.",
-	"vscode.extension.badges.description": "Description du badge.",
-	"vscode.extension.extensionDependencies": "Dépendances envers d'autres extensions. L'identificateur d'une extension est toujours ${publisher}.${name}. Exemple : vscode.csharp.",
-	"vscode.extension.scripts.prepublish": "Le script exécuté avant le package est publié en tant qu'extension VS Code.",
-	"vscode.extension.icon": "Chemin d'une icône de 128 x 128 pixels."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/platform/extensions/node/extensionValidator.i18n.json b/i18n/fra/src/vs/platform/extensions/node/extensionValidator.i18n.json
deleted file mode 100644
index 164aece343f..00000000000
--- a/i18n/fra/src/vs/platform/extensions/node/extensionValidator.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"versionSyntax": "Impossible d'analyser la valeur {0} de `engines.vscode`. Veuillez utiliser, par exemple : ^1.22.0, ^1.22.x, ...",
-	"versionSpecificity1": "La version spécifiée dans 'engines.vscode' ({0}) n'est pas assez précise. Pour les versions de vscode antérieures à 1.0.0, définissez au minimum les versions majeure et mineure souhaitées. Par exemple : ^0.10.0, 0.10.x, 0.11.0, etc.",
-	"versionSpecificity2": "La version spécifiée dans 'engines.vscode' ({0}) n'est pas assez précise. Pour les versions de vscode ultérieures à 1.0.0, définissez au minimum la version majeure souhaitée. Par exemple : ^1.10.0, 1.10.x, 1.x.x, 2.x.x, etc.",
-	"versionMismatch": "L'extension n'est pas compatible avec le code {0}. L'extension nécessite {1}."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/platform/history/electron-main/historyMainService.i18n.json b/i18n/fra/src/vs/platform/history/electron-main/historyMainService.i18n.json
deleted file mode 100644
index ed0ad53f164..00000000000
--- a/i18n/fra/src/vs/platform/history/electron-main/historyMainService.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"newWindow": "Nouvelle fenêtre",
-	"newWindowDesc": "Ouvre une nouvelle fenêtre",
-	"recentFolders": "Espaces de travail récents",
-	"folderDesc": "{0} {1}",
-	"codeWorkspace": "Espace de travail de code"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/platform/integrity/node/integrityServiceImpl.i18n.json b/i18n/fra/src/vs/platform/integrity/node/integrityServiceImpl.i18n.json
deleted file mode 100644
index 63284727ee8..00000000000
--- a/i18n/fra/src/vs/platform/integrity/node/integrityServiceImpl.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"integrity.prompt": "Votre installation de {0} semble être endommagée. Effectuez une réinstallation.",
-	"integrity.moreInformation": "Informations",
-	"integrity.dontShowAgain": "Ne plus afficher"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/platform/issue/electron-main/issueService.i18n.json b/i18n/fra/src/vs/platform/issue/electron-main/issueService.i18n.json
deleted file mode 100644
index 615db052738..00000000000
--- a/i18n/fra/src/vs/platform/issue/electron-main/issueService.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"issueReporter": "Rapporteur du problème",
-	"processExplorer": "Explorateur de processus"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/platform/jsonschemas/common/jsonValidationExtensionPoint.i18n.json b/i18n/fra/src/vs/platform/jsonschemas/common/jsonValidationExtensionPoint.i18n.json
deleted file mode 100644
index 8607347b589..00000000000
--- a/i18n/fra/src/vs/platform/jsonschemas/common/jsonValidationExtensionPoint.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"contributes.jsonValidation": "Ajoute une configuration de schéma json.",
-	"contributes.jsonValidation.fileMatch": "Modèle de fichier correspondant recherché, par exemple \"package.json\" ou \"*.launch\".",
-	"contributes.jsonValidation.url": "URL de schéma ('http:', 'https:') ou chemin relatif du dossier d'extensions ('./').",
-	"invalid.jsonValidation": "'configuration.jsonValidation' doit être un tableau",
-	"invalid.fileMatch": "'configuration.jsonValidation.fileMatch' doit être défini",
-	"invalid.url": "'configuration.jsonValidation.url' doit être une URL ou un chemin relatif",
-	"invalid.url.fileschema": "'configuration.jsonValidation.url' est une URL relative non valide : {0}",
-	"invalid.url.schema": "'configuration.jsonValidation.url' doit commencer par 'http:', 'https:' ou './' pour référencer les schémas situés dans l'extension"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/platform/keybinding/common/abstractKeybindingService.i18n.json b/i18n/fra/src/vs/platform/keybinding/common/abstractKeybindingService.i18n.json
deleted file mode 100644
index d50808f9172..00000000000
--- a/i18n/fra/src/vs/platform/keybinding/common/abstractKeybindingService.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"first.chord": "Touche ({0}) utilisée. En attente de la seconde touche pour la pression simultanée...",
-	"missing.chord": "La combinaison de touches ({0}, {1}) n'est pas une commande."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/platform/keybinding/common/keybindingLabels.i18n.json b/i18n/fra/src/vs/platform/keybinding/common/keybindingLabels.i18n.json
deleted file mode 100644
index 7e3da801c82..00000000000
--- a/i18n/fra/src/vs/platform/keybinding/common/keybindingLabels.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"ctrlKey": "Ctrl",
-	"shiftKey": "Maj",
-	"altKey": "Alt",
-	"windowsKey": "Windows",
-	"ctrlKey.long": "Contrôle",
-	"shiftKey.long": "Maj",
-	"altKey.long": "Alt",
-	"cmdKey.long": "Commande",
-	"windowsKey.long": "Windows"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/platform/list/browser/listService.i18n.json b/i18n/fra/src/vs/platform/list/browser/listService.i18n.json
deleted file mode 100644
index 79767f92ca9..00000000000
--- a/i18n/fra/src/vs/platform/list/browser/listService.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"workbenchConfigurationTitle": "Banc d'essai",
-	"multiSelectModifier.ctrlCmd": "Mappe vers 'Contrôle' dans Windows et Linux, et vers 'Commande' dans macOS.",
-	"multiSelectModifier.alt": "Mappe vers 'Alt' dans Windows et Linux, et vers 'Option' dans macOS.",
-	"multiSelectModifier": "Le modificateur à utiliser pour ajouter un élément à une multi-sélection avec la souris (par exemple dans l’Explorateur, des éditeurs ouverts et scm view). 'ctrlCmd' mappe vers 'Contrôle' dans Windows et Linux, et vers 'Commande' dans macOS. Les mouvements de souris 'Ouvrir sur le côté', si supportés, s'adaptent pour ne pas entrer en conflit avec le modificateur multiselect.",
-	"openMode.singleClick": "Ouvre les éléments sur un simple clic de souris.",
-	"openMode.doubleClick": "Ouvre les éléments sur un double clic de souris.",
-	"openModeModifier": "Contrôle l’ouverture des éléments dans les arbres et listes à l’aide de la souris (si pris en charge). Mettre la valeur `singleClick` pour ouvrir des éléments avec un simple clic de souris et `doubleClick` pour ouvrir uniquement via un double-clic de souris. Pour les parents ayant des enfants dans les arbres, ce paramètre contrôle si un simple clic développe le parent ou un double-clic. Notez que certains arbres et listes peuvent choisir d’ignorer ce paramètre, si ce n’est pas applicable. ",
-	"horizontalScrolling setting": "Contrôle si les arborescences prennent en charge le défilement horizontal dans le plan de travail."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/platform/localizations/common/localizations.i18n.json b/i18n/fra/src/vs/platform/localizations/common/localizations.i18n.json
deleted file mode 100644
index 56aac124ab3..00000000000
--- a/i18n/fra/src/vs/platform/localizations/common/localizations.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.contributes.localizations": "Contribuer aux localisations de l’éditeur",
-	"vscode.extension.contributes.localizations.languageId": "Id de la langue dans laquelle les chaînes d’affichage sont traduites.",
-	"vscode.extension.contributes.localizations.languageName": "Nom de la langue en anglais.",
-	"vscode.extension.contributes.localizations.languageNameLocalized": "Nom de la langue dans la langue contribuée.",
-	"vscode.extension.contributes.localizations.translations": "Liste des traductions associées à la langue.",
-	"vscode.extension.contributes.localizations.translations.id": "Id de VS Code ou Extension pour lesquels cette traduction contribue. L'Id de VS Code est toujours `vscode` et d’extension doit être au format `publisherId.extensionName`.",
-	"vscode.extension.contributes.localizations.translations.id.pattern": "L’Id doit être `vscode` ou au format `publisherId.extensionName` pour traduire respectivement VS code ou une extension.",
-	"vscode.extension.contributes.localizations.translations.path": "Un chemin relatif vers un fichier contenant les traductions pour la langue."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/platform/markers/common/markers.i18n.json b/i18n/fra/src/vs/platform/markers/common/markers.i18n.json
deleted file mode 100644
index 634b6c772a7..00000000000
--- a/i18n/fra/src/vs/platform/markers/common/markers.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"sev.error": "Erreur",
-	"sev.warning": "Avertissement",
-	"sev.info": "Informations"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/platform/markers/common/problemMatcher.i18n.json b/i18n/fra/src/vs/platform/markers/common/problemMatcher.i18n.json
deleted file mode 100644
index d526d2a8dda..00000000000
--- a/i18n/fra/src/vs/platform/markers/common/problemMatcher.i18n.json
+++ /dev/null
@@ -1,72 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"ProblemPatternParser.loopProperty.notLast": "La propriété loop est uniquement prise en charge dans le détecteur de problèmes de correspondance de dernière ligne.",
-	"ProblemPatternParser.problemPattern.missingRegExp": "Il manque une expression régulière dans le modèle de problème.",
-	"ProblemPatternParser.problemPattern.missingProperty": "Le modèle de problème est non valide. Il doit contenir au moins un groupe de correspondance pour un fichier, un message et une ligne ou un emplacement.",
-	"ProblemPatternParser.invalidRegexp": "Erreur : la chaîne {0} est une expression régulière non valide.\n",
-	"ProblemPatternSchema.regexp": "Expression régulière permettant de trouver une erreur, un avertissement ou une information dans la sortie.",
-	"ProblemPatternSchema.file": "Index de groupe de correspondance du nom de fichier. En cas d'omission, 1 est utilisé.",
-	"ProblemPatternSchema.location": "Index de groupe de correspondance de l'emplacement du problème. Les modèles d'emplacement valides sont : (line), (line,column) et (startLine,startColumn,endLine,endColumn). En cas d'omission, (line,column) est choisi par défaut.",
-	"ProblemPatternSchema.line": "Index de groupe de correspondance de la ligne du problème. La valeur par défaut est 2",
-	"ProblemPatternSchema.column": "Index de groupe de correspondance du caractère de ligne du problème. La valeur par défaut est 3",
-	"ProblemPatternSchema.endLine": "Index de groupe de correspondance de la ligne de fin du problème. La valeur par défaut est non définie",
-	"ProblemPatternSchema.endColumn": "Index de groupe de correspondance du caractère de ligne de fin du problème. La valeur par défaut est non définie",
-	"ProblemPatternSchema.severity": "Index de groupe de correspondance de la gravité du problème. La valeur par défaut est non définie",
-	"ProblemPatternSchema.code": "Index de groupe de correspondance du code du problème. La valeur par défaut est non définie",
-	"ProblemPatternSchema.message": "Index de groupe de correspondance du message. En cas d'omission, la valeur par défaut est 4 si l'emplacement est spécifié. Sinon, la valeur par défaut est 5.",
-	"ProblemPatternSchema.loop": "Dans une boucle de détecteur de problèmes de correspondance multiligne, indique si le modèle est exécuté en boucle tant qu'il correspond. Peut uniquement être spécifié dans le dernier modèle d'un modèle multiligne.",
-	"NamedProblemPatternSchema.name": "Nom du modèle de problème.",
-	"NamedMultiLineProblemPatternSchema.name": "Nom du modèle de problème multiligne.",
-	"NamedMultiLineProblemPatternSchema.patterns": "Modèles réels.",
-	"ProblemPatternExtPoint": "Contribue aux modèles de problèmes",
-	"ProblemPatternRegistry.error": "Modèle de problème non valide. Le modèle va être ignoré.",
-	"ProblemMatcherParser.noProblemMatcher": "Erreur : impossible de convertir la description en détecteur de problèmes de correspondance :\n{0}\n",
-	"ProblemMatcherParser.noProblemPattern": "Erreur : la description ne définit pas un modèle de problème valide :\n{0}\n",
-	"ProblemMatcherParser.noOwner": "Erreur : la description ne définit pas un propriétaire :\n{0}\n",
-	"ProblemMatcherParser.noFileLocation": "Erreur : la description ne définit pas un emplacement de fichier :\n{0}\n",
-	"ProblemMatcherParser.unknownSeverity": "Information : gravité inconnue {0}. Les valeurs valides sont erreur, avertissement et information.\n",
-	"ProblemMatcherParser.noDefinedPatter": "Erreur : le modèle ayant pour identificateur {0} n'existe pas.",
-	"ProblemMatcherParser.noIdentifier": "Erreur : la propriété du modèle référence un identificateur vide.",
-	"ProblemMatcherParser.noValidIdentifier": "Erreur : la propriété de modèle {0} n'est pas un nom de variable de modèle valide.",
-	"ProblemMatcherParser.problemPattern.watchingMatcher": "Un détecteur de problèmes de correspondance doit définir un modèle de début et un modèle de fin à observer.",
-	"ProblemMatcherParser.invalidRegexp": "Erreur : la chaîne {0} est une expression régulière non valide.\n",
-	"WatchingPatternSchema.regexp": "Expression régulière permettant de détecter le début ou la fin d'une tâche en arrière-plan.",
-	"WatchingPatternSchema.file": "Index de groupe de correspondance du nom de fichier. Peut être omis.",
-	"PatternTypeSchema.name": "Nom d'un modèle faisant l'objet d'une contribution ou prédéfini",
-	"PatternTypeSchema.description": "Modèle de problème ou bien nom d'un modèle de problème faisant l'objet d'une contribution ou prédéfini. Peut être omis si base est spécifié.",
-	"ProblemMatcherSchema.base": "Nom d'un détecteur de problèmes de correspondance de base à utiliser.",
-	"ProblemMatcherSchema.owner": "Propriétaire du problème dans Code. Peut être omis si base est spécifié. Prend la valeur 'external' par défaut en cas d'omission et si base n'est pas spécifié.",
-	"ProblemMatcherSchema.severity": "Gravité par défaut des problèmes de capture. Est utilisé si le modèle ne définit aucun groupe de correspondance pour la gravité.",
-	"ProblemMatcherSchema.applyTo": "Contrôle si un problème signalé pour un document texte s'applique uniquement aux documents ouverts ou fermés, ou bien à l'ensemble des documents.",
-	"ProblemMatcherSchema.fileLocation": "Définit la façon dont les noms de fichiers signalés dans un modèle de problème doivent être interprétés.",
-	"ProblemMatcherSchema.background": "Modèles de suivi du début et de la fin d'un détecteur de problèmes de correspondance actif sur une tâche en arrière-plan.",
-	"ProblemMatcherSchema.background.activeOnStart": "Si la valeur est true, le moniteur d'arrière-plan est actif au démarrage de la tâche. Cela revient à envoyer une ligne qui correspond à beginPattern",
-	"ProblemMatcherSchema.background.beginsPattern": "En cas de correspondance dans la sortie, le début d'une tâche en arrière-plan est signalé.",
-	"ProblemMatcherSchema.background.endsPattern": "En cas de correspondance dans la sortie, la fin d'une tâche en arrière-plan est signalée.",
-	"ProblemMatcherSchema.watching.deprecated": "La propriété espion est déconseillée. Utilisez l'arrière-plan à la place.",
-	"ProblemMatcherSchema.watching": "Modèles de suivi du début et de la fin d'un détecteur de problèmes de correspondance espion.",
-	"ProblemMatcherSchema.watching.activeOnStart": "Si la valeur est true, le mode espion est actif au démarrage de la tâche. Cela revient à émettre une ligne qui correspond à beginPattern",
-	"ProblemMatcherSchema.watching.beginsPattern": "En cas de correspondance dans la sortie, le début d'une tâche de suivi est signalé.",
-	"ProblemMatcherSchema.watching.endsPattern": "En cas de correspondance dans la sortie, la fin d'une tâche de suivi est signalée.",
-	"LegacyProblemMatcherSchema.watchedBegin.deprecated": "Cette propriété est déconseillée. Utilisez la propriété espion à la place.",
-	"LegacyProblemMatcherSchema.watchedBegin": "Expression régulière signalant qu'une tâche faisant l'objet d'un suivi commence à s'exécuter via le suivi d'un fichier.",
-	"LegacyProblemMatcherSchema.watchedEnd.deprecated": "Cette propriété est déconseillée. Utilisez la propriété espion à la place.",
-	"LegacyProblemMatcherSchema.watchedEnd": "Expression régulière signalant qu'une tâche faisant l'objet d'un suivi a fini de s'exécuter.",
-	"NamedProblemMatcherSchema.name": "Nom du détecteur de problèmes de correspondance utilisé comme référence.",
-	"NamedProblemMatcherSchema.label": "Étiquette contrôlable de visu du détecteur de problèmes de correspondance.",
-	"ProblemMatcherExtPoint": "Contribue aux détecteurs de problèmes de correspondance",
-	"msCompile": "Problèmes du compilateur Microsoft",
-	"lessCompile": "Moins de problèmes",
-	"gulp-tsc": "Problèmes liés à Gulp TSC",
-	"jshint": "Problèmes liés à JSHint",
-	"jshint-stylish": "Problèmes liés au formateur stylish de JSHint",
-	"eslint-compact": "Problèmes liés au formateur compact d'ESLint",
-	"eslint-stylish": "Problèmes liés au formateur stylish d'ESLint",
-	"go": "Problèmes liés à Go"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/platform/message/common/message.i18n.json b/i18n/fra/src/vs/platform/message/common/message.i18n.json
deleted file mode 100644
index c755d6892fe..00000000000
--- a/i18n/fra/src/vs/platform/message/common/message.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"close": "Fermer",
-	"later": "Plus tard",
-	"cancel": "Annuler",
-	"moreFile": "...1 fichier supplémentaire non affiché",
-	"moreFiles": "...{0} fichiers supplémentaires non affichés"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/platform/node/minimalTranslations.i18n.json b/i18n/fra/src/vs/platform/node/minimalTranslations.i18n.json
deleted file mode 100644
index 50801671040..00000000000
--- a/i18n/fra/src/vs/platform/node/minimalTranslations.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"showLanguagePackExtensions": "VS Code est disponible en {0}. Recherchez des modules linguistiques dans le Marketplace pour commencer.",
-	"searchMarketplace": "Rechercher dans le Marketplace",
-	"installAndRestartMessage": "VS Code est disponible en {0}. Installez le module linguistique pour commencer. Un redémarrage est nécessaire.",
-	"installAndRestart": "Installer et Redémarrer"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/platform/request/node/request.i18n.json b/i18n/fra/src/vs/platform/request/node/request.i18n.json
deleted file mode 100644
index 4a6629aeecf..00000000000
--- a/i18n/fra/src/vs/platform/request/node/request.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"httpConfigurationTitle": "HTTP",
-	"proxy": "Paramètre de proxy à utiliser. S'il n'est pas défini, il est récupéré à partir des variables d'environnement http_proxy et https_proxy",
-	"strictSSL": "Spécifie si le certificat de serveur proxy doit être vérifié par rapport à la liste des autorités de certification fournies.",
-	"proxyAuthorization": "Valeur à envoyer en tant qu'en-tête 'Proxy-Authorization' pour chaque requête réseau."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/platform/telemetry/common/telemetryService.i18n.json b/i18n/fra/src/vs/platform/telemetry/common/telemetryService.i18n.json
deleted file mode 100644
index 22820c6a910..00000000000
--- a/i18n/fra/src/vs/platform/telemetry/common/telemetryService.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"telemetryConfigurationTitle": "Télémétrie",
-	"telemetry.enableTelemetry": "Activez l'envoi des données d'utilisation et d'erreurs à Microsoft."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/platform/theme/common/colorExtensionPoint.i18n.json b/i18n/fra/src/vs/platform/theme/common/colorExtensionPoint.i18n.json
deleted file mode 100644
index 12b054b670c..00000000000
--- a/i18n/fra/src/vs/platform/theme/common/colorExtensionPoint.i18n.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"contributes.color": "Contribue à des couleurs définies pour des extensions dont le thème peut être changé",
-	"contributes.color.id": "L’identifiant de la couleur dont le thème peut être changé",
-	"contributes.color.id.format": "Les identifiants doivent être sous la forme aa[.bb]*",
-	"contributes.color.description": "La description de la couleur dont le thème peut être changé",
-	"contributes.defaults.light": "La couleur par défaut pour les thèmes clairs. Soit une valeur de couleur en hexadécimal (#RRGGBB[AA]) ou l’identifiant d’une couleur dont le thème peut être changé qui fournit la valeur par défaut.",
-	"contributes.defaults.dark": "La couleur par défaut pour les thèmes sombres. Soit une valeur de couleur en hexadécimal (#RRGGBB[AA]) ou l’identifiant d’une couleur dont le thème peut être changé qui fournit la valeur par défaut.",
-	"contributes.defaults.highContrast": "La couleur par défaut pour les thèmes de contraste élevé. Soit une valeur de couleur en hexadécimal (#RRGGBB[AA]) ou l’identifiant d’une couleur dont le thème peut être changé qui fournit la valeur par défaut.",
-	"invalid.colorConfiguration": "'configuration.colors' doit être un tableau",
-	"invalid.default.colorType": "{0} doit être soit une valeur de couleur en hexadécimal (#RRGGBB[AA] ou #RGB[A]) ou l’identifiant d’une couleur dont le thème peut être changé qui fournit la valeur par défaut.",
-	"invalid.id": "'configuration.colors.id' doit être défini et ne peut pas être vide",
-	"invalid.id.format": "'configuration.colors.id' doit suivre le word[.word]*",
-	"invalid.description": "'configuration.colors.description' doit être défini et ne peut pas être vide",
-	"invalid.defaults": "'configuration.colors.defaults' doit être défini et doit contenir 'light', 'dark' et 'highContrast'"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/platform/theme/common/colorRegistry.i18n.json b/i18n/fra/src/vs/platform/theme/common/colorRegistry.i18n.json
deleted file mode 100644
index 30e1e919ce2..00000000000
--- a/i18n/fra/src/vs/platform/theme/common/colorRegistry.i18n.json
+++ /dev/null
@@ -1,101 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"schema.colors": "Couleurs utilisées dans le banc d'essai.",
-	"foreground": "Couleur de premier plan globale. Cette couleur est utilisée si elle n'est pas remplacée par un composant.",
-	"errorForeground": "Couleur principale de premier plan pour les messages d'erreur. Cette couleur est utilisée uniquement si elle n'est pas redéfinie par un composant.",
-	"descriptionForeground": "Couleur de premier plan du texte descriptif fournissant des informations supplémentaires, par exemple pour un label.",
-	"focusBorder": "Couleur de bordure globale des éléments ayant le focus. Cette couleur est utilisée si elle n'est pas remplacée par un composant.",
-	"contrastBorder": "Bordure supplémentaire autour des éléments pour les séparer des autres et obtenir un meilleur contraste.",
-	"activeContrastBorder": "Bordure supplémentaire autour des éléments actifs pour les séparer des autres et obtenir un meilleur contraste.",
-	"selectionBackground": "La couleur d'arrière-plan des sélections de texte dans le banc d'essai (par ex., pour les champs d'entrée ou les zones de texte). Notez que cette couleur ne s'applique pas aux sélections dans l'éditeur et le terminal.",
-	"textSeparatorForeground": "Couleur pour les séparateurs de texte.",
-	"textLinkForeground": "Couleur des liens dans le texte.",
-	"textLinkActiveForeground": "Couleur de premier plan pour les liens dans le texte lorsqu'ils sont cliqués ou survolés.",
-	"textPreformatForeground": "Couleur des segments de texte préformatés.",
-	"textBlockQuoteBackground": "Couleur d'arrière-plan des citations dans le texte.",
-	"textBlockQuoteBorder": "Couleur de bordure des citations dans le texte.",
-	"textCodeBlockBackground": "Couleur d'arrière-plan des blocs de code dans le texte.",
-	"widgetShadow": "Couleur de l'ombre des widgets, comme rechercher/remplacer, au sein de l'éditeur.",
-	"inputBoxBackground": "Arrière-plan de la zone d'entrée.",
-	"inputBoxForeground": "Premier plan de la zone d'entrée.",
-	"inputBoxBorder": "Bordure de la zone d'entrée.",
-	"inputBoxActiveOptionBorder": "Couleur de la bordure des options activées dans les champs d'entrée.",
-	"inputPlaceholderForeground": "Couleur de premier plan de la zone d'entrée pour le texte d'espace réservé.",
-	"inputValidationInfoBackground": "Couleur d'arrière-plan de la validation d'entrée pour la gravité des informations.",
-	"inputValidationInfoBorder": "Couleur de bordure de la validation d'entrée pour la gravité des informations.",
-	"inputValidationWarningBackground": "Couleur d'arrière-plan de la validation d'entrée pour la gravité de l'avertissement.",
-	"inputValidationWarningBorder": "Couleur de bordure de la validation d'entrée pour la gravité de l'avertissement.",
-	"inputValidationErrorBackground": "Couleur d'arrière-plan de la validation d'entrée pour la gravité de l'erreur.",
-	"inputValidationErrorBorder": "Couleur de bordure de la validation d'entrée pour la gravité de l'erreur. ",
-	"dropdownBackground": "Arrière-plan de la liste déroulante.",
-	"dropdownListBackground": "Arrière-plan de la liste déroulante.",
-	"dropdownForeground": "Premier plan de la liste déroulante.",
-	"dropdownBorder": "Bordure de la liste déroulante.",
-	"listFocusBackground": "Couleur d'arrière-plan de la liste/l'arborescence pour l'élément ayant le focus quand la liste/l'arborescence est active. Une liste/aborescence active peut être sélectionnée au clavier, elle ne l'est pas quand elle est inactive.",
-	"listFocusForeground": "Couleur de premier plan de la liste/l'arborescence pour l'élément ayant le focus quand la liste/l'arborescence est active. Une liste/aborescence active peut être sélectionnée au clavier, elle ne l'est pas quand elle est inactive.",
-	"listActiveSelectionBackground": "Couleur d'arrière-plan de la liste/l'arborescence de l'élément sélectionné quand la liste/l'arborescence est active. Une liste/arborescence active peut être sélectionnée au clavier, elle ne l'est pas quand elle est inactive.",
-	"listActiveSelectionForeground": "Couleur de premier plan de la liste/l'arborescence pour l'élément sélectionné quand la liste/l'arborescence est active. Une liste/aborescence active peut être sélectionnée au clavier, elle ne l'est pas quand elle est inactive.",
-	"listInactiveSelectionBackground": "Couleur d'arrière-plan de la liste/l'arborescence pour l'élément sélectionné quand la liste/l'arborescence est inactive. Une liste/aborescence active peut être sélectionnée au clavier, elle ne l'est pas quand elle est inactive.",
-	"listInactiveSelectionForeground": "Couleur de premier plan de la liste/l'arborescence pour l'élément sélectionné quand la liste/l'arborescence est active. Une liste/aborescence active peut être sélectionnée au clavier, elle ne l'est pas quand elle est inactive.",
-	"listHoverBackground": "Arrière-plan de la liste/l'arborescence pendant le pointage sur des éléments avec la souris.",
-	"listHoverForeground": "Premier plan de la liste/l'arborescence pendant le pointage sur des éléments avec la souris.",
-	"listDropBackground": "Arrière-plan de l'opération de glisser-déplacer dans une liste/arborescence pendant le déplacement d'éléments avec la souris.",
-	"highlight": "Couleur de premier plan dans la liste/l'arborescence pour la surbrillance des correspondances pendant la recherche dans une liste/arborescence.",
-	"invalidItemForeground": "Couleur de premier plan de liste/arbre pour les éléments non valides, par exemple une racine non résolue dans l’Explorateur.",
-	"listErrorForeground": "Couleur de premier plan des éléments de la liste contenant des erreurs.",
-	"listWarningForeground": "Couleur de premier plan des éléments de liste contenant des avertissements.",
-	"pickerGroupForeground": "Couleur du sélecteur rapide pour les étiquettes de regroupement.",
-	"pickerGroupBorder": "Couleur du sélecteur rapide pour les bordures de regroupement.",
-	"buttonForeground": "Couleur de premier plan du bouton.",
-	"buttonBackground": "Couleur d'arrière-plan du bouton.",
-	"buttonHoverBackground": "Couleur d'arrière-plan du bouton pendant le pointage.",
-	"badgeBackground": "Couleur de fond des badges. Les badges sont de courts libelés d'information, ex. le nombre de résultats de recherche.",
-	"badgeForeground": "Couleur des badges. Les badges sont de courts libelés d'information, ex. le nombre de résultats de recherche.",
-	"scrollbarShadow": "Ombre de la barre de défilement pour indiquer que la vue défile.",
-	"scrollbarSliderBackground": "Couleur de fond du curseur de la barre de défilement.",
-	"scrollbarSliderHoverBackground": "Couleur de fond du curseur de la barre de défilement lors du survol.",
-	"scrollbarSliderActiveBackground": "Couleur d’arrière-plan de la barre de défilement lorsqu'on clique dessus.",
-	"progressBarBackground": "Couleur de fond pour la barre de progression qui peut s'afficher lors d'opérations longues.",
-	"editorBackground": "Couleur d'arrière-plan de l'éditeur.",
-	"editorForeground": "Couleur de premier plan par défaut de l'éditeur.",
-	"editorWidgetBackground": "Couleur d'arrière-plan des gadgets de l'éditeur tels que rechercher/remplacer.",
-	"editorWidgetBorder": "Couleur de bordure des widgets de l'éditeur. La couleur est utilisée uniquement si le widget choisit d'avoir une bordure et si la couleur n'est pas remplacée par un widget.",
-	"editorSelectionBackground": "Couleur de la sélection de l'éditeur.",
-	"editorSelectionForeground": "Couleur du texte sélectionné pour le contraste élevé.",
-	"editorInactiveSelection": "Couleur de sélection dans un éditeur inactif. La couleur doit ne pas être opaque afin de ne pas masquer les décorations sous-jacentes.",
-	"editorSelectionHighlight": "Couleur des régions avec le même contenu que la sélection. La couleur doit ne pas être opaque afin de ne pas masquer les décorations sous-jacentes.",
-	"editorSelectionHighlightBorder": "Couleur de bordure des régions dont le contenu est identique à la sélection.",
-	"editorFindMatch": "Couleur du résultat de recherche actif.",
-	"findMatchHighlight": "Couleur des autres résultats de recherche correspondants. La couleur doit ne pas être opaque afin de ne pas masquer les décorations sous-jacentes.",
-	"findRangeHighlight": "Couleur de la plage limitant la recherche. La couleur ne doit pas être opaque pour ne pas masquer les décorations sous-jacentes.",
-	"editorFindMatchBorder": "Couleur de bordure du résultat de recherche actif.",
-	"findMatchHighlightBorder": "Couleur de bordure des autres résultats de recherche.",
-	"findRangeHighlightBorder": "Couleur de la bordure limitant la recherche. La couleur ne doit pas être opaque pour ne pas masquer les décorations sous-jacentes. ",
-	"findWidgetResizeBorder": "Couleur de la bordure de la barre de redimensionnement du widget de recherche.",
-	"hoverHighlight": "Mettre en surbrillance ci-dessous le mot pour lequel un survol est affiché. La couleur doit ne pas être opaque afin de ne pas masquer les décorations sous-jacentes.",
-	"hoverBackground": "Couleur d'arrière-plan du pointage de l'éditeur.",
-	"hoverBorder": "Couleur de bordure du pointage de l'éditeur.",
-	"activeLinkForeground": "Couleur des liens actifs.",
-	"diffEditorInserted": "Couleur de fond pour le texte qui est inséré. La couleur ne doit pas être opaque pour ne pas masquer les décorations du dessous.",
-	"diffEditorRemoved": "Couleur de fond pour le texte qui est retiré. La couleur doit ne pas être opaque pour ne pas masquer les décorations du dessous. ",
-	"diffEditorInsertedOutline": "Couleur de contour du texte inséré.",
-	"diffEditorRemovedOutline": "Couleur de contour du texte supprimé.",
-	"mergeCurrentHeaderBackground": "Arrière-plan de l'en-tête en cours dans les conflits de fusion inline. La couleur doit ne pas être opaque afin de ne pas masquer les décorations sous-jacentes.",
-	"mergeCurrentContentBackground": "Arrière-plan du contenu en cours dans les conflits de fusion inline. La couleur doit ne pas être opaque afin de ne pas masquer les décorations sous-jacentes.",
-	"mergeIncomingHeaderBackground": "Arrière-plan de l'en-tête qui arrive dans les conflits de fusion inline. La couleur doit ne pas être opaque afin de ne pas masquer les décorations sous-jacentes.",
-	"mergeIncomingContentBackground": "Arrière-plan du contenu qui arrive dans les conflits de fusion inline. La couleur doit ne pas être opaque afin de ne pas masquer les décorations sous-jacentes.",
-	"mergeCommonHeaderBackground": "Arrière-plan de l'en-tête de l'ancêtre commun dans les conflits de fusion inline. La couleur doit ne pas être opaque afin de ne pas masquer les décorations sous-jacentes.",
-	"mergeCommonContentBackground": "Arrière-plan du contenu de l'ancêtre commun dans les conflits de fusion inline. La couleur ne doit pas être opaque pour ne pas masquer les décorations sous-jacentes.",
-	"mergeBorder": "Couleur de bordure des en-têtes et du séparateur dans les conflits de fusion inline.",
-	"overviewRulerCurrentContentForeground": "Premier plan de la règle d'aperçu actuelle pour les conflits de fusion inline.",
-	"overviewRulerIncomingContentForeground": "Premier plan de la règle d'aperçu entrante pour les conflits de fusion inline.",
-	"overviewRulerCommonContentForeground": "Arrière-plan de la règle d'aperçu de l'ancêtre commun dans les conflits de fusion inline.",
-	"overviewRulerFindMatchForeground": "Couleur du marqueur de la règle d'aperçu pour les correspondances trouvées. La couleur doit ne pas être opaque pour ne pas masquer les décorations du dessous.",
-	"overviewRulerSelectionHighlightForeground": "Couleur du marqueur de la règle d'aperçu pour les mises en surbrillance de sélection. La couleur doit ne pas être opaque pour ne pas masquer les décorations du dessous."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/platform/update/node/update.config.contribution.i18n.json b/i18n/fra/src/vs/platform/update/node/update.config.contribution.i18n.json
deleted file mode 100644
index ed2a6b83cc6..00000000000
--- a/i18n/fra/src/vs/platform/update/node/update.config.contribution.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"updateConfigurationTitle": "Mettre à jour",
-	"updateChannel": "Indiquez si vous recevez des mises à jour automatiques en provenance d'un canal de mises à jour. Un redémarrage est nécessaire en cas de modification.",
-	"enableWindowsBackgroundUpdates": "Active les mises à jour Windows en arrière-plan."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/platform/url/electron-browser/inactiveExtensionUrlHandler.i18n.json b/i18n/fra/src/vs/platform/url/electron-browser/inactiveExtensionUrlHandler.i18n.json
deleted file mode 100644
index fa69bb7bd8f..00000000000
--- a/i18n/fra/src/vs/platform/url/electron-browser/inactiveExtensionUrlHandler.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"confirmUrl": "Autoriser une extension à ouvrir cette URL ?"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/platform/windows/electron-main/windowsService.i18n.json b/i18n/fra/src/vs/platform/windows/electron-main/windowsService.i18n.json
deleted file mode 100644
index ba5dcce293a..00000000000
--- a/i18n/fra/src/vs/platform/windows/electron-main/windowsService.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"aboutDetail": "Version {0}\nCommit {1}\nDate {2}\nShell {3}\nRenderer {4}\nNode {5}\nArchitecture {6}",
-	"okButton": "OK",
-	"copy": "&&Copier"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/platform/workspaces/common/workspaces.i18n.json b/i18n/fra/src/vs/platform/workspaces/common/workspaces.i18n.json
deleted file mode 100644
index c084a919382..00000000000
--- a/i18n/fra/src/vs/platform/workspaces/common/workspaces.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"codeWorkspace": "Espace de travail de code",
-	"untitledWorkspace": "Sans titre(Espace de travail)",
-	"workspaceNameVerbose": "{0} (Espace de travail)",
-	"workspaceName": "{0} (Espace de travail)"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/api/browser/localizationsExtensionPoint.i18n.json b/i18n/fra/src/vs/workbench/api/browser/localizationsExtensionPoint.i18n.json
deleted file mode 100644
index 4505d472797..00000000000
--- a/i18n/fra/src/vs/workbench/api/browser/localizationsExtensionPoint.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"requirearray": "Les localisations doivent être dans un tableau",
-	"requirestring": "la propriété '{0}' est obligatoire et doit être de type 'string'",
-	"optstring": "La propriété '{0}' peut être omise ou doit être de type 'string'"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/api/browser/viewsContainersExtensionPoint.i18n.json b/i18n/fra/src/vs/workbench/api/browser/viewsContainersExtensionPoint.i18n.json
deleted file mode 100644
index 60914e5d624..00000000000
--- a/i18n/fra/src/vs/workbench/api/browser/viewsContainersExtensionPoint.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.contributes.views.containers.id": "Identificateur unique utilisé pour identifier le conteneur dans lequel les vues peuvent être contribuées en utilisant le point de contribution 'views'.",
-	"vscode.extension.contributes.views.containers.title": "Chaîne lisible par un humain permettant d'afficher le conteneur",
-	"vscode.extension.contributes.views.containers.icon": "Chemin d’accès à l’icône de conteneur. Les icônes font 24x24, centrées sur un bloc de 50x40 et ont une couleur de remplissage de 'rgb (215, 218, 224)' ou '#d7dae0'. Il est recommandé que les icônes soient en SVG, même si n’importe quel type de fichier image est accepté.",
-	"vscode.extension.contributes.viewsContainers": "Contribue aux conteneurs de vues vers l’éditeur",
-	"views.container.activitybar": "Les conteneurs visuels contribuent à la barre d'activité",
-	"test": "Test",
-	"requirearray": "les conteneurs de vues doivent être un tableau",
-	"requireidstring": "la propriété '{0}' est obligatoire et doit être de type 'string'. Seuls les caractères alphanumériques , '_', et '-' sont autorisés.",
-	"requirestring": "la propriété '{0}' est obligatoire et doit être de type 'string'",
-	"showViewlet": "Afficher {0}",
-	"view": "Affichage"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json b/i18n/fra/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json
deleted file mode 100644
index fc507ea6db4..00000000000
--- a/i18n/fra/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"requirearray": "les vues doivent figurer dans un tableau",
-	"requirestring": "la propriété '{0}' est obligatoire et doit être de type 'string'",
-	"optstring": "La propriété '{0}' peut être omise ou doit être de type 'string'",
-	"vscode.extension.contributes.view.id": "Identificateur de la vue. Utilisez-le pour inscrire un fournisseur de données au moyen de l'API 'vscode.window.registerTreeDataProviderForView', ainsi que pour déclencher l'activation de votre extension en inscrivant l'événement 'onView:${id}' dans 'activationEvents'.",
-	"vscode.extension.contributes.view.name": "Nom de la vue, contrôlable de visu. Affiché",
-	"vscode.extension.contributes.view.when": "Condition qui doit être vraie pour afficher cette vue",
-	"vscode.extension.contributes.views": "Ajoute des vues à l'éditeur",
-	"views.explorer": "Les vues dans le conteneur \"Explorer\" contribuent à la barre d'activité",
-	"views.debug": "Les vues dans le conteneur de débogage contribuent à la barre d'activité",
-	"views.scm": "Les vues dans le conteneur \"SCM\" contribuent à la barre d'activité",
-	"views.test": "Fournit des vues du conteneur de test dans la barre d'activités",
-	"views.contributed": "Les vues contribuent au conteneur de vues contributives",
-	"ViewContainerDoesnotExist": "Le conteneur de vues '{0}' n'existe pas et toutes les vues inscrites dans ce conteneur sont ajoutées à l''Explorateur'.",
-	"duplicateView1": "Impossible d’enregistrer des vues multiples avec le même id '{0}'» dans l’emplacement '{1}'",
-	"duplicateView2": "Une vue avec l’id `{0}` est déjà enregistrée à l’emplacement `{1}`"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/api/electron-browser/mainThreadExtensionService.i18n.json b/i18n/fra/src/vs/workbench/api/electron-browser/mainThreadExtensionService.i18n.json
deleted file mode 100644
index 7e050bb0177..00000000000
--- a/i18n/fra/src/vs/workbench/api/electron-browser/mainThreadExtensionService.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"overwritingExtension": "Remplacement de l'extension {0} par {1}.",
-	"extensionUnderDevelopment": "Chargement de l'extension de développement sur {0}"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/api/electron-browser/mainThreadMessageService.i18n.json b/i18n/fra/src/vs/workbench/api/electron-browser/mainThreadMessageService.i18n.json
deleted file mode 100644
index 63a7e687fcb..00000000000
--- a/i18n/fra/src/vs/workbench/api/electron-browser/mainThreadMessageService.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"extensionSource": "{0} (Extension)",
-	"defaultSource": "Extension",
-	"manageExtension": "Gérer l'extension",
-	"cancel": "Annuler",
-	"ok": "OK"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json b/i18n/fra/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
deleted file mode 100644
index 8e1c626a771..00000000000
--- a/i18n/fra/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"timeout.formatOnSave": "Format avorté lors de l'enregistrement après {0} ms",
-	"codeActionsOnSave.didTimeout": "codeActionsOnSave abandonné au bout de {0} ms",
-	"timeout.onWillSave": "OnWillSaveTextDocument-event avorté après 1750 ms",
-	"saveParticipants": "Exécution de la sauvegarde des participants..."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json b/i18n/fra/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json
deleted file mode 100644
index 5f508cf00b5..00000000000
--- a/i18n/fra/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"task.label": "{0} : {1}"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/api/electron-browser/mainThreadWebview.i18n.json b/i18n/fra/src/vs/workbench/api/electron-browser/mainThreadWebview.i18n.json
deleted file mode 100644
index 38f0760c227..00000000000
--- a/i18n/fra/src/vs/workbench/api/electron-browser/mainThreadWebview.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"errorMessage": "Une erreur s’est produite lors de restauration de a vue : {0}"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/api/electron-browser/mainThreadWorkspace.i18n.json b/i18n/fra/src/vs/workbench/api/electron-browser/mainThreadWorkspace.i18n.json
deleted file mode 100644
index 7a21fce3aaa..00000000000
--- a/i18n/fra/src/vs/workbench/api/electron-browser/mainThreadWorkspace.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"folderStatusMessageAddSingleFolder": "L'extension '{0}' a ajouté 1 dossier à l’espace de travail",
-	"folderStatusMessageAddMultipleFolders": "L'extension '{0}' a ajouté {1} dossiers à l’espace de travail",
-	"folderStatusMessageRemoveSingleFolder": "L'extension '{0}' a supprimé 1 dossier de l’espace de travail",
-	"folderStatusMessageRemoveMultipleFolders": "L'extension '{0}' a supprimé {1} dossiers de l’espace de travail",
-	"folderStatusChangeFolder": "L'extension '{0}' a modifié des dossiers de l’espace de travail"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/api/node/extHostDiagnostics.i18n.json b/i18n/fra/src/vs/workbench/api/node/extHostDiagnostics.i18n.json
deleted file mode 100644
index 1e3755ad53e..00000000000
--- a/i18n/fra/src/vs/workbench/api/node/extHostDiagnostics.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"limitHit": "Les {0} erreurs et avertissements supplémentaires ne sont pas affichés."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/api/node/extHostExplorerView.i18n.json b/i18n/fra/src/vs/workbench/api/node/extHostExplorerView.i18n.json
deleted file mode 100644
index ff14373fbdc..00000000000
--- a/i18n/fra/src/vs/workbench/api/node/extHostExplorerView.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"treeExplorer.notRegistered": "Aucun TreeExplorerNodeProvider ayant l'ID '{0}' n'est inscrit.",
-	"treeExplorer.failedToProvideRootNode": "Le TreeExplorerNodeProvider '{0}' n'a pas pu fournir le nœud racine."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/api/node/extHostExtensionActivator.i18n.json b/i18n/fra/src/vs/workbench/api/node/extHostExtensionActivator.i18n.json
deleted file mode 100644
index dec88bd1e82..00000000000
--- a/i18n/fra/src/vs/workbench/api/node/extHostExtensionActivator.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"unknownDep": "Échec de l'activation de l'extension '{1}'. Raison : dépendance '{0}' inconnue.",
-	"failedDep1": "Échec de l'activation de l'extension '{1}'. Raison : échec de l'activation de la dépendance '{0}'.",
-	"failedDep2": "Échec de l'activation de l'extension '{0}'. Raison : plus de 10 niveaux de dépendances (probablement une boucle de dépendance).",
-	"activationError": "L'activation de l'extension '{0}' a échoué: {1}. "
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/api/node/extHostProgress.i18n.json b/i18n/fra/src/vs/workbench/api/node/extHostProgress.i18n.json
deleted file mode 100644
index ba3f3014580..00000000000
--- a/i18n/fra/src/vs/workbench/api/node/extHostProgress.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"extensionSource": "{0} (Extension)"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/api/node/extHostTask.i18n.json b/i18n/fra/src/vs/workbench/api/node/extHostTask.i18n.json
deleted file mode 100644
index 5f508cf00b5..00000000000
--- a/i18n/fra/src/vs/workbench/api/node/extHostTask.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"task.label": "{0} : {1}"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/api/node/extHostTreeExplorers.i18n.json b/i18n/fra/src/vs/workbench/api/node/extHostTreeExplorers.i18n.json
deleted file mode 100644
index c69278c0410..00000000000
--- a/i18n/fra/src/vs/workbench/api/node/extHostTreeExplorers.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"treeExplorer.notRegistered": "Aucun TreeExplorerNodeProvider ayant l'ID '{0}' n'est inscrit.",
-	"treeExplorer.failedToProvideRootNode": "Le TreeExplorerNodeProvider '{0}' n'a pas pu fournir le nœud racine.",
-	"treeExplorer.failedToResolveChildren": "Le TreeExplorerNodeProvider '{0}' n'a pas pu résoudre resolveChildren."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/api/node/extHostTreeView.i18n.json b/i18n/fra/src/vs/workbench/api/node/extHostTreeView.i18n.json
deleted file mode 100644
index ff14373fbdc..00000000000
--- a/i18n/fra/src/vs/workbench/api/node/extHostTreeView.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"treeExplorer.notRegistered": "Aucun TreeExplorerNodeProvider ayant l'ID '{0}' n'est inscrit.",
-	"treeExplorer.failedToProvideRootNode": "Le TreeExplorerNodeProvider '{0}' n'a pas pu fournir le nœud racine."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/api/node/extHostTreeViews.i18n.json b/i18n/fra/src/vs/workbench/api/node/extHostTreeViews.i18n.json
deleted file mode 100644
index 103c4bd542c..00000000000
--- a/i18n/fra/src/vs/workbench/api/node/extHostTreeViews.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"treeView.notRegistered": "Aucune arborescence avec l'ID '{0}' n'est inscrite.",
-	"treeView.duplicateElement": "L'élément avec l'id {0} est déjà inscrit"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/api/node/extHostWorkspace.i18n.json b/i18n/fra/src/vs/workbench/api/node/extHostWorkspace.i18n.json
deleted file mode 100644
index b0aeaf56f6a..00000000000
--- a/i18n/fra/src/vs/workbench/api/node/extHostWorkspace.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"updateerror": "L'extension '{0}' n’a pas pu mettre à jour les dossiers de l’espace de travail : {1}"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/api/node/mainThreadExtensionService.i18n.json b/i18n/fra/src/vs/workbench/api/node/mainThreadExtensionService.i18n.json
deleted file mode 100644
index 7e050bb0177..00000000000
--- a/i18n/fra/src/vs/workbench/api/node/mainThreadExtensionService.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"overwritingExtension": "Remplacement de l'extension {0} par {1}.",
-	"extensionUnderDevelopment": "Chargement de l'extension de développement sur {0}"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/api/node/mainThreadMessageService.i18n.json b/i18n/fra/src/vs/workbench/api/node/mainThreadMessageService.i18n.json
deleted file mode 100644
index 560eb4d7f26..00000000000
--- a/i18n/fra/src/vs/workbench/api/node/mainThreadMessageService.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"close": "Fermer",
-	"cancel": "Annuler",
-	"ok": "OK"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/browser/actions/configureLocale.i18n.json b/i18n/fra/src/vs/workbench/browser/actions/configureLocale.i18n.json
deleted file mode 100644
index a8e6e2e5147..00000000000
--- a/i18n/fra/src/vs/workbench/browser/actions/configureLocale.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"configureLocale": "Configurer la langue",
-	"displayLanguage": "Définit le langage affiché par VSCode.",
-	"doc": "Consultez {0} pour connaître la liste des langues prises en charge.",
-	"restart": "Le changement de la valeur nécessite le redémarrage de VS Code.",
-	"fail.createSettings": "Impossible de créer '{0}' ({1}).",
-	"JsonSchema.locale": "Langue d'interface utilisateur (IU) à utiliser."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/browser/actions/fileActions.i18n.json b/i18n/fra/src/vs/workbench/browser/actions/fileActions.i18n.json
deleted file mode 100644
index 057e0f35e0b..00000000000
--- a/i18n/fra/src/vs/workbench/browser/actions/fileActions.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"openFolder": "Ouvrir un dossier...",
-	"openFileFolder": "Ouvrir..."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/browser/actions/toggleActivityBarVisibility.i18n.json b/i18n/fra/src/vs/workbench/browser/actions/toggleActivityBarVisibility.i18n.json
deleted file mode 100644
index cfd7018ff32..00000000000
--- a/i18n/fra/src/vs/workbench/browser/actions/toggleActivityBarVisibility.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleActivityBar": "Activer/désactiver la visibilité de la barre d'activités",
-	"view": "Affichage"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/browser/actions/toggleCenteredLayout.i18n.json b/i18n/fra/src/vs/workbench/browser/actions/toggleCenteredLayout.i18n.json
deleted file mode 100644
index e4ea51efac9..00000000000
--- a/i18n/fra/src/vs/workbench/browser/actions/toggleCenteredLayout.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleCenteredLayout": "Activer/désactiver la disposition centrée",
-	"view": "Affichage"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/browser/actions/toggleEditorLayout.i18n.json b/i18n/fra/src/vs/workbench/browser/actions/toggleEditorLayout.i18n.json
deleted file mode 100644
index f4632336775..00000000000
--- a/i18n/fra/src/vs/workbench/browser/actions/toggleEditorLayout.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleEditorGroupLayout": "Activer/désactiver la disposition horizontale/verticale du groupe d'éditeurs",
-	"horizontalLayout": "Disposition horizontale du groupe d'éditeurs",
-	"verticalLayout": "Disposition verticale du groupe d'éditeurs",
-	"view": "Affichage"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/browser/actions/toggleSidebarPosition.i18n.json b/i18n/fra/src/vs/workbench/browser/actions/toggleSidebarPosition.i18n.json
deleted file mode 100644
index 9bb0a575b07..00000000000
--- a/i18n/fra/src/vs/workbench/browser/actions/toggleSidebarPosition.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleSidebarPosition": "Activer/désactiver la position de la barre latérale",
-	"view": "Affichage"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/browser/actions/toggleSidebarVisibility.i18n.json b/i18n/fra/src/vs/workbench/browser/actions/toggleSidebarVisibility.i18n.json
deleted file mode 100644
index 93de5c5aa5d..00000000000
--- a/i18n/fra/src/vs/workbench/browser/actions/toggleSidebarVisibility.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleSidebar": "Activer/désactiver la visibilité de la barre latérale",
-	"view": "Affichage"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/browser/actions/toggleStatusbarVisibility.i18n.json b/i18n/fra/src/vs/workbench/browser/actions/toggleStatusbarVisibility.i18n.json
deleted file mode 100644
index 3fa7f788125..00000000000
--- a/i18n/fra/src/vs/workbench/browser/actions/toggleStatusbarVisibility.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleStatusbar": "Activer/désactiver la visibilité de la barre d'état",
-	"view": "Affichage"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/browser/actions/toggleTabsVisibility.i18n.json b/i18n/fra/src/vs/workbench/browser/actions/toggleTabsVisibility.i18n.json
deleted file mode 100644
index b21494f8547..00000000000
--- a/i18n/fra/src/vs/workbench/browser/actions/toggleTabsVisibility.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleTabs": "Activer/désactiver la visibilité de l'onglet",
-	"view": "Affichage"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/browser/actions/toggleZenMode.i18n.json b/i18n/fra/src/vs/workbench/browser/actions/toggleZenMode.i18n.json
deleted file mode 100644
index 84ab877f44b..00000000000
--- a/i18n/fra/src/vs/workbench/browser/actions/toggleZenMode.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleZenMode": "Activer/désactiver le mode zen",
-	"view": "Affichage"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/browser/actions/workspaceActions.i18n.json b/i18n/fra/src/vs/workbench/browser/actions/workspaceActions.i18n.json
deleted file mode 100644
index 4522e0fd127..00000000000
--- a/i18n/fra/src/vs/workbench/browser/actions/workspaceActions.i18n.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openFile": "Ouvrir un fichier...",
-	"openFolder": "Ouvrir un dossier...",
-	"openFileFolder": "Ouvrir...",
-	"globalRemoveFolderFromWorkspace": "Supprimer le dossier d’espace de travail...",
-	"saveWorkspaceAsAction": "Enregistrer l’espace de travail sous...",
-	"save": "&&Enregistrer",
-	"saveWorkspace": "Enregistrer l’espace de travail",
-	"openWorkspaceAction": "Ouvrir un espace de travail...",
-	"openWorkspaceConfigFile": "Ouvrir le Fichier de Configuration d’espace de travail",
-	"duplicateWorkspaceInNewWindow": "Dupliquer l'espace de travail dans une Nouvelle fenêtre"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/browser/actions/workspaceCommands.i18n.json b/i18n/fra/src/vs/workbench/browser/actions/workspaceCommands.i18n.json
deleted file mode 100644
index 2128948d9da..00000000000
--- a/i18n/fra/src/vs/workbench/browser/actions/workspaceCommands.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"addFolderToWorkspace": "Ajouter un dossier à l'espace de travail...",
-	"add": "&&Ajouter",
-	"addFolderToWorkspaceTitle": "Ajouter un dossier à l'espace de travail",
-	"workspaceFolderPickerPlaceholder": "Sélectionner le dossier de l’espace de travail"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/browser/parts/activitybar/activitybarActions.i18n.json b/i18n/fra/src/vs/workbench/browser/parts/activitybar/activitybarActions.i18n.json
deleted file mode 100644
index 1bd02d3dbad..00000000000
--- a/i18n/fra/src/vs/workbench/browser/parts/activitybar/activitybarActions.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"badgeTitle": "{0} - {1}",
-	"titleKeybinding": "{0} ({1})",
-	"removeFromActivityBar": "Masquer de la barre d’activités",
-	"keepInActivityBar": "Conserver dans la barre d'activités",
-	"additionalViews": "Vues supplémentaires",
-	"numberBadge": "{0} ({1})",
-	"manageExtension": "Gérer l'extension",
-	"toggle": "Afficher/masquer la vue épinglée"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/browser/parts/activitybar/activitybarPart.i18n.json b/i18n/fra/src/vs/workbench/browser/parts/activitybar/activitybarPart.i18n.json
deleted file mode 100644
index 5144c637616..00000000000
--- a/i18n/fra/src/vs/workbench/browser/parts/activitybar/activitybarPart.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hideActivitBar": "Masquer la barre d'activités",
-	"globalActions": "Actions globales"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/browser/parts/compositePart.i18n.json b/i18n/fra/src/vs/workbench/browser/parts/compositePart.i18n.json
deleted file mode 100644
index 49dfacdf506..00000000000
--- a/i18n/fra/src/vs/workbench/browser/parts/compositePart.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"ariaCompositeToolbarLabel": "{0} actions",
-	"titleTooltip": "{0} ({1})"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/browser/parts/compositebar/compositeBar.i18n.json b/i18n/fra/src/vs/workbench/browser/parts/compositebar/compositeBar.i18n.json
deleted file mode 100644
index 1ed26202570..00000000000
--- a/i18n/fra/src/vs/workbench/browser/parts/compositebar/compositeBar.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"activityBarAriaLabel": "Sélecteur d'affichage actif"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/browser/parts/compositebar/compositeBarActions.i18n.json b/i18n/fra/src/vs/workbench/browser/parts/compositebar/compositeBarActions.i18n.json
deleted file mode 100644
index 7943bb6eb33..00000000000
--- a/i18n/fra/src/vs/workbench/browser/parts/compositebar/compositeBarActions.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"largeNumberBadge": "10k+",
-	"badgeTitle": "{0} - {1}",
-	"additionalViews": "Vues supplémentaires",
-	"numberBadge": "{0} ({1})",
-	"manageExtension": "Gérer l'extension",
-	"titleKeybinding": "{0} ({1})",
-	"hide": "Masquer",
-	"keep": "Garder",
-	"toggle": "Afficher/masquer la vue épinglée"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/browser/parts/editor/binaryDiffEditor.i18n.json b/i18n/fra/src/vs/workbench/browser/parts/editor/binaryDiffEditor.i18n.json
deleted file mode 100644
index ea1317f6659..00000000000
--- a/i18n/fra/src/vs/workbench/browser/parts/editor/binaryDiffEditor.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"metadataDiff": "{0} ↔ {1}"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/browser/parts/editor/binaryEditor.i18n.json b/i18n/fra/src/vs/workbench/browser/parts/editor/binaryEditor.i18n.json
deleted file mode 100644
index b0a48d0db04..00000000000
--- a/i18n/fra/src/vs/workbench/browser/parts/editor/binaryEditor.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"binaryEditor": "Visionneuse binaire"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json b/i18n/fra/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json
deleted file mode 100644
index c9bb8bcfa2e..00000000000
--- a/i18n/fra/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"textEditor": "Éditeur de texte",
-	"textDiffEditor": "Éditeur de différences textuelles",
-	"binaryDiffEditor": "Éditeur de différences binaires",
-	"sideBySideEditor": "Éditeur côte à côte",
-	"groupOnePicker": "Afficher les éditeurs du premier groupe",
-	"groupTwoPicker": "Afficher les éditeurs du deuxième groupe",
-	"groupThreePicker": "Afficher les éditeurs du troisième groupe",
-	"allEditorsPicker": "Afficher tous les éditeurs ouverts",
-	"view": "Affichage",
-	"file": "Fichier",
-	"close": "Fermer",
-	"closeOthers": "Fermer les autres",
-	"closeRight": "Fermer à droite",
-	"closeAllSaved": "Fermer la version sauvegardée",
-	"closeAll": "Tout fermer",
-	"keepOpen": "Garder ouvert",
-	"toggleInlineView": "Activer/désactiver l'affichage Inline",
-	"showOpenedEditors": "Afficher les éditeurs ouverts",
-	"keepEditor": "Conserver l'éditeur",
-	"closeEditorsInGroup": "Fermer tous les éditeurs du groupe",
-	"closeSavedEditors": "Fermer les éditeurs sauvegardés dans le groupe",
-	"closeOtherEditors": "Fermer les autres éditeurs",
-	"closeRightEditors": "Fermer les éditeurs situés à droite"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/browser/parts/editor/editorActions.i18n.json b/i18n/fra/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
deleted file mode 100644
index 1cdd98b12a7..00000000000
--- a/i18n/fra/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
+++ /dev/null
@@ -1,58 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"splitEditor": "Fractionner l'éditeur",
-	"joinTwoGroups": "Joindre les éditeurs de deux groupes",
-	"navigateEditorGroups": "Naviguer entre les groupes d'éditeurs",
-	"focusActiveEditorGroup": "Placer le focus sur le groupe d'éditeurs d'actifs",
-	"focusFirstEditorGroup": "Focus sur le premier groupe d'éditeurs",
-	"focusSecondEditorGroup": "Focus sur le deuxième groupe d'éditeurs",
-	"focusThirdEditorGroup": "Focus sur le troisième groupe d'éditeurs",
-	"focusPreviousGroup": "Focus sur le groupe précédent",
-	"focusNextGroup": "Focus sur le groupe suivant",
-	"openToSide": "Ouvrir sur le côté",
-	"closeEditor": "Fermer l'éditeur",
-	"closeOneEditor": "Fermer",
-	"revertAndCloseActiveEditor": "Restaurer et fermer l'éditeur",
-	"closeEditorsToTheLeft": "Fermer les éditeurs situés à gauche",
-	"closeAllEditors": "Fermer tous les éditeurs",
-	"closeEditorsInOtherGroups": "Fermer les éditeurs des autres groupes",
-	"moveActiveGroupLeft": "Déplacer le groupe d'éditeurs vers la gauche",
-	"moveActiveGroupRight": "Déplacer le groupe d'éditeurs vers la droite",
-	"minimizeOtherEditorGroups": "Réduire les autres groupes d'éditeurs",
-	"evenEditorGroups": "Même largeur pour le groupe d'éditeurs",
-	"maximizeEditor": "Agrandir le groupe d'éditeurs et masquer la barre latérale",
-	"openNextEditor": "Ouvrir l'éditeur suivant",
-	"openPreviousEditor": "Ouvrir l'éditeur précédent",
-	"nextEditorInGroup": "Ouvrir l'éditeur suivant du groupe",
-	"openPreviousEditorInGroup": "Ouvrir l'éditeur précédent du groupe",
-	"lastEditorInGroup": "Ouvrir le dernier éditeur du groupe",
-	"navigateNext": "Suivant",
-	"navigatePrevious": "Précédent",
-	"navigateLast": "Aller au dernier",
-	"reopenClosedEditor": "Rouvrir l'éditeur fermé",
-	"clearRecentFiles": "Effacer les fichiers récemment ouverts",
-	"showEditorsInFirstGroup": "Afficher les éditeurs du premier groupe",
-	"showEditorsInSecondGroup": "Afficher les éditeurs du deuxième groupe",
-	"showEditorsInThirdGroup": "Afficher les éditeurs du troisième groupe",
-	"showAllEditors": "Afficher tous les éditeurs",
-	"openPreviousRecentlyUsedEditorInGroup": "Ouvrir l'éditeur précédent du groupe",
-	"openNextRecentlyUsedEditorInGroup": "Ouvrir l'éditeur suivant du groupe",
-	"navigateEditorHistoryByInput": "Ouvrir l'éditeur précédent dans l'historique",
-	"openNextRecentlyUsedEditor": "Ouvrir l'éditeur suivant",
-	"openPreviousRecentlyUsedEditor": "Ouvrir l'éditeur précédent",
-	"clearEditorHistory": "Effacer l'historique de l'éditeur",
-	"focusLastEditorInStack": "Ouvrir le dernier éditeur du groupe",
-	"moveEditorLeft": "Déplacer l'éditeur vers la gauche",
-	"moveEditorRight": "Déplacer l'éditeur vers la droite",
-	"moveEditorToPreviousGroup": "Déplacer l'éditeur vers le groupe précédent",
-	"moveEditorToNextGroup": "Déplacer l'éditeur vers le groupe suivant",
-	"moveEditorToFirstGroup": "Déplacer l'éditeur vers le premier groupe",
-	"moveEditorToSecondGroup": "Déplacer l'éditeur vers le second groupe",
-	"moveEditorToThirdGroup": "Déplacer l'éditeur vers le troisième groupe"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json b/i18n/fra/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json
deleted file mode 100644
index fd29dc9390d..00000000000
--- a/i18n/fra/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"editorCommand.activeEditorMove.description": "Déplacer l'éditeur actif par onglets ou par groupes",
-	"editorCommand.activeEditorMove.arg.name": "Argument de déplacement de l'éditeur actif",
-	"editorCommand.activeEditorMove.arg.description": "Propriétés d’argument : * 'to' : Valeur de chaîne spécifiant où aller.\n\t* 'by' : Valeur de chaîne spécifiant l'unité à déplacer. Par tabulation ou par groupe.\n\t* 'value' : Valeur numérique spécifiant combien de positions ou une position absolue à déplacer."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/browser/parts/editor/editorPart.i18n.json b/i18n/fra/src/vs/workbench/browser/parts/editor/editorPart.i18n.json
deleted file mode 100644
index f5b9ba5b72f..00000000000
--- a/i18n/fra/src/vs/workbench/browser/parts/editor/editorPart.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"groupOneVertical": "Gauche",
-	"groupTwoVertical": "Centre",
-	"groupThreeVertical": "Droite",
-	"groupOneHorizontal": "Haut",
-	"groupTwoHorizontal": "Centre",
-	"groupThreeHorizontal": "Bas",
-	"editorOpenError": "Impossible d'ouvrir '{0}' : {1}."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/browser/parts/editor/editorPicker.i18n.json b/i18n/fra/src/vs/workbench/browser/parts/editor/editorPicker.i18n.json
deleted file mode 100644
index 605dde4634d..00000000000
--- a/i18n/fra/src/vs/workbench/browser/parts/editor/editorPicker.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"entryAriaLabel": "{0}, sélecteur de groupes d'éditeurs",
-	"groupLabel": "Groupe : {0}",
-	"noResultsFoundInGroup": "Éditeur ouvert correspondant introuvable dans le groupe",
-	"noOpenedEditors": "La liste des éditeurs ouverts dans le groupe est vide",
-	"noResultsFound": "Éditeur ouvert correspondant introuvable",
-	"noOpenedEditorsAllGroups": "La liste des éditeurs ouverts est vide"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json b/i18n/fra/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json
deleted file mode 100644
index d86bbe531c6..00000000000
--- a/i18n/fra/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"singleSelectionRange": "Li {0}, Col {1} ({2} sélectionné)",
-	"singleSelection": "Li {0}, Col {1}",
-	"multiSelectionRange": "{0} sélections ({1} caractères sélectionnés)",
-	"multiSelection": "{0} sélections",
-	"endOfLineLineFeed": "LF",
-	"endOfLineCarriageReturnLineFeed": "CRLF",
-	"tabFocusModeEnabled": "La touche Tab déplace le focus",
-	"screenReaderDetected": "Optimisé  pour un lecteur d’écran ",
-	"screenReaderDetectedExtra": "Si vous n'utilisez pas de lecteur d'écran, définissez le paramètre 'editor.accessibilitySupport' sur \"désactivé\".",
-	"disableTabMode": "Désactiver le mode d'accessibilité",
-	"gotoLine": "Atteindre la ligne",
-	"selectIndentation": "Sélectionner le retrait",
-	"selectEncoding": "Sélectionner l'encodage",
-	"selectEOL": "Sélectionner la séquence de fin de ligne",
-	"selectLanguageMode": "Sélectionner le mode de langage",
-	"fileInfo": "Informations sur le fichier",
-	"spacesSize": "Espaces : {0}",
-	"tabSize": "Taille des tabulations : {0}",
-	"showLanguageExtensions": "Rechercher '{0}' dans les extensions Marketplace...",
-	"changeMode": "Changer le mode de langage",
-	"noEditor": "Aucun éditeur de texte actif actuellement",
-	"languageDescription": "({0}) - Langage configuré",
-	"languageDescriptionConfigured": "({0})",
-	"languagesPicks": "langages (identificateur)",
-	"configureModeSettings": "Configurer les paramètres du langage '{0}'...",
-	"configureAssociationsExt": "Configurer l'association de fichier pour '{0}'...",
-	"autoDetect": "Détection automatique",
-	"pickLanguage": "Sélectionner le mode de langage",
-	"currentAssociation": "Association actuelle",
-	"pickLanguageToConfigure": "Sélectionnez le mode de langage à associer à '{0}'",
-	"changeIndentation": "Changer le retrait",
-	"noWritableCodeEditor": "L'éditeur de code actif est en lecture seule.",
-	"indentView": "modifier la vue",
-	"indentConvert": "convertir le fichier",
-	"pickAction": "Sélectionner une action",
-	"changeEndOfLine": "Changer la séquence de fin de ligne",
-	"pickEndOfLine": "Sélectionner la séquence de fin de ligne",
-	"changeEncoding": "Changer l'encodage des fichiers",
-	"noFileEditor": "Aucun fichier actif actuellement",
-	"saveWithEncoding": "Enregistrer avec l'encodage",
-	"reopenWithEncoding": "Rouvrir avec l'encodage",
-	"guessedEncoding": "Deviné à partir du contenu",
-	"pickEncodingForReopen": "Sélectionner l'encodage du fichier pour rouvrir le fichier",
-	"pickEncodingForSave": "Sélectionner l'encodage du fichier à utiliser pour l'enregistrement",
-	"screenReaderDetectedExplanation.title": "Optimisé pour un lecteur d’écran ",
-	"screenReaderDetectedExplanation.question": "Est-ce que vous utilisez un lecteur d’écran pour faire fonctionner VS Code ?",
-	"screenReaderDetectedExplanation.answerYes": "Oui",
-	"screenReaderDetectedExplanation.answerNo": "Non",
-	"screenReaderDetectedExplanation.body1": "VS Code est maintenant optimisé pour une utilisation avec un lecteur d’écran.",
-	"screenReaderDetectedExplanation.body2": "Certaines fonctionnalités de l’éditeur auront des comportements différents : par exemple encapsulation, repliage, etc.."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/browser/parts/editor/resourceViewer.i18n.json b/i18n/fra/src/vs/workbench/browser/parts/editor/resourceViewer.i18n.json
deleted file mode 100644
index a9163f8c71e..00000000000
--- a/i18n/fra/src/vs/workbench/browser/parts/editor/resourceViewer.i18n.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"sizeB": "{0} o",
-	"sizeKB": "{0} Ko",
-	"sizeMB": "{0} Mo",
-	"sizeGB": "{0} Go",
-	"sizeTB": "{0} To",
-	"largeImageError": "L’image n’est pas affichée dans l’éditeur parce qu’elle est trop grande ({0}).",
-	"resourceOpenExternalButton": " Ouvrir l'image en utilisant un programme externe ?",
-	"nativeFileTooLargeError": "Le fichier n’est pas affiché dans l’éditeur, parce qu’il est trop volumineux ({0}).",
-	"nativeBinaryError": "Le fichier n’est pas affiché dans l’éditeur parce que c’est un fichier binaire ou qu'il utilise un encodage de texte non pris en charge.",
-	"openAsText": "Vous voulez l'ouvrir quand même ?",
-	"zoom.action.fit.label": "Toute l’Image",
-	"imgMeta": "{0}x{1} {2}"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/browser/parts/editor/tabsTitleControl.i18n.json b/i18n/fra/src/vs/workbench/browser/parts/editor/tabsTitleControl.i18n.json
deleted file mode 100644
index 8bf7eb8dbbb..00000000000
--- a/i18n/fra/src/vs/workbench/browser/parts/editor/tabsTitleControl.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"araLabelTabActions": "Actions d'onglet"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json b/i18n/fra/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json
deleted file mode 100644
index 19f6bbbcc30..00000000000
--- a/i18n/fra/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"textDiffEditor": "Éditeur de différences textuelles",
-	"readonlyEditorWithInputAriaLabel": "{0}. Éditeur de comparaison de texte en lecture seule.",
-	"readonlyEditorAriaLabel": "Éditeur de comparaison de texte en lecture seule.",
-	"editableEditorWithInputAriaLabel": "{0}. Éditeur de comparaison de fichier texte.",
-	"editableEditorAriaLabel": "Éditeur de comparaison de fichier texte.",
-	"navigate.next.label": "Modification suivante",
-	"navigate.prev.label": "Modification précédente",
-	"toggleIgnoreTrimWhitespace.label": "Ignorer la suppression des espaces"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/browser/parts/editor/textEditor.i18n.json b/i18n/fra/src/vs/workbench/browser/parts/editor/textEditor.i18n.json
deleted file mode 100644
index 7af9199ed4d..00000000000
--- a/i18n/fra/src/vs/workbench/browser/parts/editor/textEditor.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"editorLabelWithGroup": "{0}, groupe {1}."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/browser/parts/editor/textResourceEditor.i18n.json b/i18n/fra/src/vs/workbench/browser/parts/editor/textResourceEditor.i18n.json
deleted file mode 100644
index 05eca33e28d..00000000000
--- a/i18n/fra/src/vs/workbench/browser/parts/editor/textResourceEditor.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"textEditor": "Éditeur de texte",
-	"readonlyEditorWithInputAriaLabel": "{0}. Éditeur de texte en lecture seule.",
-	"readonlyEditorAriaLabel": "Éditeur de texte en lecture seule.",
-	"untitledFileEditorWithInputAriaLabel": "{0}. Éditeur de texte de fichier sans titre.",
-	"untitledFileEditorAriaLabel": "Éditeur de texte de fichier sans titre."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/browser/parts/editor/titleControl.i18n.json b/i18n/fra/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
deleted file mode 100644
index 628561d4d2c..00000000000
--- a/i18n/fra/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"araLabelEditorActions": "Actions de l'éditeur"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/browser/parts/notifications/notificationsActions.i18n.json b/i18n/fra/src/vs/workbench/browser/parts/notifications/notificationsActions.i18n.json
deleted file mode 100644
index b8f8658aba4..00000000000
--- a/i18n/fra/src/vs/workbench/browser/parts/notifications/notificationsActions.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"clearNotification": "Effacer la notification",
-	"clearNotifications": "Effacer toutes les notifications",
-	"hideNotificationsCenter": "Masquer les notifications",
-	"expandNotification": "Développer la notification",
-	"collapseNotification": "Réduire la notification",
-	"configureNotification": "Configurer la notification",
-	"copyNotification": "Copier le texte"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/browser/parts/notifications/notificationsAlerts.i18n.json b/i18n/fra/src/vs/workbench/browser/parts/notifications/notificationsAlerts.i18n.json
deleted file mode 100644
index a8cb7bd5ff4..00000000000
--- a/i18n/fra/src/vs/workbench/browser/parts/notifications/notificationsAlerts.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"alertErrorMessage": "Erreur : {0}",
-	"alertWarningMessage": "Avertissement : {0}",
-	"alertInfoMessage": "Information : {0}"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json b/i18n/fra/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json
deleted file mode 100644
index 491f3b3f2fc..00000000000
--- a/i18n/fra/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"notificationsEmpty": "Aucune nouvelle notification",
-	"notifications": "Notifications",
-	"notificationsToolbar": "Actions du centre de notifications",
-	"notificationsList": "Liste des notifications"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/browser/parts/notifications/notificationsCommands.i18n.json b/i18n/fra/src/vs/workbench/browser/parts/notifications/notificationsCommands.i18n.json
deleted file mode 100644
index 24a551c29cc..00000000000
--- a/i18n/fra/src/vs/workbench/browser/parts/notifications/notificationsCommands.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"notifications": "Notifications",
-	"showNotifications": "Afficher les notifications",
-	"hideNotifications": "Masquer les notifications",
-	"clearAllNotifications": "Effacer toutes les notifications"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/browser/parts/notifications/notificationsStatus.i18n.json b/i18n/fra/src/vs/workbench/browser/parts/notifications/notificationsStatus.i18n.json
deleted file mode 100644
index f971622b8ff..00000000000
--- a/i18n/fra/src/vs/workbench/browser/parts/notifications/notificationsStatus.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hideNotifications": "Masquer les notifications",
-	"zeroNotifications": "Aucune notification",
-	"noNotifications": "Aucune nouvelle notification",
-	"oneNotification": "1 nouvelle notification",
-	"notifications": "{0} nouvelles notifications"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/browser/parts/notifications/notificationsToasts.i18n.json b/i18n/fra/src/vs/workbench/browser/parts/notifications/notificationsToasts.i18n.json
deleted file mode 100644
index 1c36f66b74a..00000000000
--- a/i18n/fra/src/vs/workbench/browser/parts/notifications/notificationsToasts.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"notificationsToast": "Toast de notification"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/browser/parts/notifications/notificationsViewer.i18n.json b/i18n/fra/src/vs/workbench/browser/parts/notifications/notificationsViewer.i18n.json
deleted file mode 100644
index 8ec8350eea2..00000000000
--- a/i18n/fra/src/vs/workbench/browser/parts/notifications/notificationsViewer.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"notificationActions": "Actions de notification",
-	"notificationSource": "Source : {0}"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/browser/parts/panel/panelActions.i18n.json b/i18n/fra/src/vs/workbench/browser/parts/panel/panelActions.i18n.json
deleted file mode 100644
index 6b1a46e0a6f..00000000000
--- a/i18n/fra/src/vs/workbench/browser/parts/panel/panelActions.i18n.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"closePanel": "Fermer le panneau",
-	"togglePanel": "Activer/désactiver le panneau",
-	"focusPanel": "Focus dans le panneau",
-	"toggledPanelPosition": "Basculer la position du panneau",
-	"moveToRight": "Déplacer à droite",
-	"moveToBottom": "Déplacer en bas",
-	"toggleMaximizedPanel": "Activer/désactiver le panneau agrandi",
-	"maximizePanel": "Agrandir la taille du panneau",
-	"minimizePanel": "Restaurer la taille du panneau",
-	"view": "Affichage"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/browser/parts/panel/panelPart.i18n.json b/i18n/fra/src/vs/workbench/browser/parts/panel/panelPart.i18n.json
deleted file mode 100644
index fa87e0ad602..00000000000
--- a/i18n/fra/src/vs/workbench/browser/parts/panel/panelPart.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hidePanel": "Masquer le panneau"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/browser/parts/quickinput/quickInput.i18n.json b/i18n/fra/src/vs/workbench/browser/parts/quickinput/quickInput.i18n.json
deleted file mode 100644
index 161084b3bea..00000000000
--- a/i18n/fra/src/vs/workbench/browser/parts/quickinput/quickInput.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"inputModeEntryDescription": "{0} (Appuyez sur 'Entrée' pour confirmer ou sur 'Échap' pour annuler)",
-	"inputModeEntry": "Appuyez sur 'Entrée' pour confirmer votre saisie, ou sur 'Échap' pour l'annuler",
-	"quickInput.countSelected": "{0} Sélectionnés",
-	"ok": "OK"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/browser/parts/quickinput/quickInputBox.i18n.json b/i18n/fra/src/vs/workbench/browser/parts/quickinput/quickInputBox.i18n.json
deleted file mode 100644
index e961aa1b883..00000000000
--- a/i18n/fra/src/vs/workbench/browser/parts/quickinput/quickInputBox.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"quickInputBox.ariaLabel": "Taper pour affiner les résultats."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/browser/parts/quickopen/quickOpenController.i18n.json b/i18n/fra/src/vs/workbench/browser/parts/quickopen/quickOpenController.i18n.json
deleted file mode 100644
index 1ba3f1bff32..00000000000
--- a/i18n/fra/src/vs/workbench/browser/parts/quickopen/quickOpenController.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"emptyPicks": "Aucune entrée à sélectionner",
-	"quickOpenInput": "Tapez '?' pour obtenir de l'aide sur les actions que vous pouvez effectuer ici",
-	"historyMatches": "récemment ouvert",
-	"noResultsFound1": "Résultats introuvables",
-	"canNotRunPlaceholder": "Ce gestionnaire Quick Open ne peut pas être utilisé dans le contexte actuel",
-	"entryAriaLabel": "{0}, ouvert récemment",
-	"removeFromEditorHistory": "Supprimer de l'historique",
-	"pickHistory": "Sélectionnez une entrée de l'éditeur à supprimer de l'historique"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/browser/parts/quickopen/quickopen.contribution.i18n.json b/i18n/fra/src/vs/workbench/browser/parts/quickopen/quickopen.contribution.i18n.json
deleted file mode 100644
index 4ae604a5c68..00000000000
--- a/i18n/fra/src/vs/workbench/browser/parts/quickopen/quickopen.contribution.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"quickOpen": "Atteindre le fichier...",
-	"quickNavigateNext": "Naviguer vers l'élément suivant dans Quick Open",
-	"quickNavigatePrevious": "Naviguer vers l'élément précédent dans Quick Open",
-	"quickSelectNext": "Sélectionner l'élément suivant dans Quick Open",
-	"quickSelectPrevious": "Sélectionner l'élément précédent dans Quick Open"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/browser/parts/quickopen/quickopen.i18n.json b/i18n/fra/src/vs/workbench/browser/parts/quickopen/quickopen.i18n.json
deleted file mode 100644
index a984af7f325..00000000000
--- a/i18n/fra/src/vs/workbench/browser/parts/quickopen/quickopen.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"quickOpen": "Atteindre le fichier...",
-	"quickNavigateNext": "Naviguer vers l'élément suivant dans Quick Open",
-	"quickNavigatePrevious": "Naviguer vers l'élément précédent dans Quick Open",
-	"quickSelectNext": "Sélectionner l'élément suivant dans Quick Open",
-	"quickSelectPrevious": "Sélectionner l'élément précédent dans Quick Open"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/browser/parts/sidebar/sidebarPart.i18n.json b/i18n/fra/src/vs/workbench/browser/parts/sidebar/sidebarPart.i18n.json
deleted file mode 100644
index 905c22110d5..00000000000
--- a/i18n/fra/src/vs/workbench/browser/parts/sidebar/sidebarPart.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"focusSideBar": "Focus sur la barre latérale",
-	"viewCategory": "Affichage"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/browser/parts/statusbar/statusbarPart.i18n.json b/i18n/fra/src/vs/workbench/browser/parts/statusbar/statusbarPart.i18n.json
deleted file mode 100644
index 9fb2adcc952..00000000000
--- a/i18n/fra/src/vs/workbench/browser/parts/statusbar/statusbarPart.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"manageExtension": "Gérer l'extension"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/browser/parts/titlebar/titlebarPart.i18n.json b/i18n/fra/src/vs/workbench/browser/parts/titlebar/titlebarPart.i18n.json
deleted file mode 100644
index 96af281136a..00000000000
--- a/i18n/fra/src/vs/workbench/browser/parts/titlebar/titlebarPart.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"patchedWindowTitle": "[Non prise en charge]",
-	"userIsAdmin": "[Administrator]",
-	"userIsSudo": "[Superuser]",
-	"devExtensionWindowTitlePrefix": "[Hôte de développement d'extension]"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/browser/parts/views/panelViewlet.i18n.json b/i18n/fra/src/vs/workbench/browser/parts/views/panelViewlet.i18n.json
deleted file mode 100644
index 7f2958b3fc1..00000000000
--- a/i18n/fra/src/vs/workbench/browser/parts/views/panelViewlet.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"viewToolbarAriaLabel": "{0} actions"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/browser/parts/views/views.i18n.json b/i18n/fra/src/vs/workbench/browser/parts/views/views.i18n.json
deleted file mode 100644
index fcd571da926..00000000000
--- a/i18n/fra/src/vs/workbench/browser/parts/views/views.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"viewToolbarAriaLabel": "{0} actions",
-	"hideView": "Masquer dans la barre latérale"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/browser/parts/views/viewsRegistry.i18n.json b/i18n/fra/src/vs/workbench/browser/parts/views/viewsRegistry.i18n.json
deleted file mode 100644
index e7ba8e9e54b..00000000000
--- a/i18n/fra/src/vs/workbench/browser/parts/views/viewsRegistry.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"duplicateId": "Une vue avec l’id `{0}` est déjà enregistrée à l’emplacement `{1}`"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/browser/parts/views/viewsViewlet.i18n.json b/i18n/fra/src/vs/workbench/browser/parts/views/viewsViewlet.i18n.json
deleted file mode 100644
index d869e84efd3..00000000000
--- a/i18n/fra/src/vs/workbench/browser/parts/views/viewsViewlet.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"cannot toggle": "La visibilité ne peut être activée/désactivée pour cette vue {0}",
-	"cannot show": "Cette vue {0} ne peut pas être affichée car elle est masquée par sa condition 'when'",
-	"hideView": "Masquer"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/browser/quickopen.i18n.json b/i18n/fra/src/vs/workbench/browser/quickopen.i18n.json
deleted file mode 100644
index 3bcebcb9969..00000000000
--- a/i18n/fra/src/vs/workbench/browser/quickopen.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noResultsMatching": "Aucun résultat correspondant",
-	"noResultsFound2": "Résultats introuvables"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/browser/viewlet.i18n.json b/i18n/fra/src/vs/workbench/browser/viewlet.i18n.json
deleted file mode 100644
index e1dacc88070..00000000000
--- a/i18n/fra/src/vs/workbench/browser/viewlet.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"compositePart.hideSideBarLabel": "Masquer la barre latérale",
-	"collapse": "Réduire tout"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/common/theme.i18n.json b/i18n/fra/src/vs/workbench/common/theme.i18n.json
deleted file mode 100644
index 67b5e93740c..00000000000
--- a/i18n/fra/src/vs/workbench/common/theme.i18n.json
+++ /dev/null
@@ -1,72 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"tabActiveBackground": "Couleur d'arrière-plan de l'onglet actif. Les onglets sont les conteneurs des éditeurs dans la zone d'éditeurs. Vous pouvez ouvrir plusieurs onglets dans un groupe d'éditeurs. Il peut exister plusieurs groupes d'éditeurs.",
-	"tabInactiveBackground": "Couleur d'arrière-plan de l'onglet inactif. Les onglets sont les conteneurs des éditeurs dans la zone d'éditeurs. Vous pouvez ouvrir plusieurs onglets dans un groupe d'éditeurs. Il peut exister plusieurs groupes d'éditeurs.",
-	"tabHoverBackground": "Couleur de l'onglet d’arrière-plan lors du survol. Les onglets sont les conteneurs pour les éditeurs dans la zone de l’éditeur. Plusieurs onglets peuvent être ouverts dans un groupe d'éditeur. Il peut y avoir plusieurs groupes d’éditeur.",
-	"tabUnfocusedHoverBackground": "Couleur de l'onglet d’arrière-plan dans un groupe n'ayant pas le focus lors du survol. Les onglets sont les conteneurs pour les éditeurs dans la zone de l’éditeur. Plusieurs onglets peuvent être ouverts dans un groupe d'éditeur. Il peut y avoir plusieurs groupes d’éditeur.",
-	"tabBorder": "Bordure séparant les onglets les uns des autres. Les onglets sont les conteneurs des éditeurs dans la zone d'éditeurs. Vous pouvez ouvrir plusieurs onglets dans un groupe d'éditeurs. Il peut exister plusieurs groupes d'éditeurs.",
-	"tabActiveBorder": "Bordure en bas d'un onglet actif. Les onglets sont les conteneurs des éditeurs dans la zone d'édition. Vous pouvez ouvrir plusieurs onglets dans un groupe d'éditeurs. Il peut exister plusieurs groupes d'éditeurs.",
-	"tabActiveBorderTop": "Bordure en haut d'un onglet actif. Les onglets sont les conteneurs des éditeurs dans la zone d'édition. Vous pouvez ouvrir plusieurs onglets dans un groupe d'éditeurs. Il peut exister plusieurs groupes d'éditeurs.",
-	"tabActiveUnfocusedBorder": "Bordure en bas d'un onglet actif dans un groupe n'ayant pas le focus. Les onglets sont les conteneurs des éditeurs dans la zone d'édition. Vous pouvez ouvrir plusieurs onglets dans un groupe d'éditeurs. Il peut exister plusieurs groupes d'éditeurs.",
-	"tabActiveUnfocusedBorderTop": "Bordure en haut d'un onglet actif dans un groupe n'ayant pas le focus. Les onglets sont les conteneurs des éditeurs dans la zone d'édition. Vous pouvez ouvrir plusieurs onglets dans un groupe d'éditeurs. Il peut exister plusieurs groupes d'éditeurs.",
-	"tabHoverBorder": "Bordure avec laquelle surligner les onglets lors du survol. Couleur de l'onglet d’arrière-plan dans un groupe n'ayant pas le focus lors du survol. Les onglets sont les conteneurs pour les éditeurs dans la zone de l’éditeur. Plusieurs onglets peuvent être ouverts dans un groupe d'éditeur. Il peut y avoir plusieurs groupes d’éditeur.",
-	"tabUnfocusedHoverBorder": "Bordure avec laquelle surligner les onglets lors du survol dans un groupe n'ayant pas le focus. Couleur de l'onglet d’arrière-plan dans un groupe n'ayant pas le focus lors du survol. Les onglets sont les conteneurs pour les éditeurs dans la zone de l’éditeur. Plusieurs onglets peuvent être ouverts dans un groupe d'éditeur. Il peut y avoir plusieurs groupes d’éditeur.",
-	"tabActiveForeground": "Couleur de premier plan de l'onglet actif dans un groupe actif. Les onglets sont les conteneurs des éditeurs dans la zone d'éditeurs. Vous pouvez ouvrir plusieurs onglets dans un groupe d'éditeurs. Il peut exister plusieurs groupes d'éditeurs.",
-	"tabInactiveForeground": "Couleur de premier plan de l'onglet inactif dans un groupe actif. Les onglets sont les conteneurs des éditeurs dans la zone d'éditeurs. Vous pouvez ouvrir plusieurs onglets dans un groupe d'éditeurs. Il peut exister plusieurs groupes d'éditeurs.",
-	"tabUnfocusedActiveForeground": "Couleur de premier plan de l'onglet actif dans un groupe inactif. Les onglets sont les conteneurs des éditeurs dans la zone d'éditeurs. Vous pouvez ouvrir plusieurs onglets dans un groupe d'éditeurs. Il peut exister plusieurs groupes d'éditeurs.",
-	"tabUnfocusedInactiveForeground": "Couleur de premier plan de l'onglet inactif dans un groupe inactif. Les onglets sont les conteneurs des éditeurs dans la zone d'éditeurs. Vous pouvez ouvrir plusieurs onglets dans un groupe d'éditeurs. Il peut exister plusieurs groupes d'éditeurs.",
-	"editorGroupBackground": "Couleur d'arrière-plan d'un groupe d'éditeurs. Les groupes d'éditeurs sont les conteneurs des éditeurs. La couleur d'arrière-plan s'affiche pendant le glissement de groupes d'éditeurs.",
-	"tabsContainerBackground": "Couleur d'arrière-plan de l'en-tête du titre du groupe d'éditeurs quand les onglets sont activés. Les groupes d'éditeurs sont les conteneurs des éditeurs.",
-	"tabsContainerBorder": "Couleur de bordure de l'en-tête du titre du groupe d'éditeurs quand les onglets sont activés. Les groupes d'éditeurs sont les conteneurs des éditeurs.",
-	"editorGroupHeaderBackground": "Couleur d'arrière-plan de l'en-tête du titre du groupe d'éditeurs quand les onglets sont désactivés (`\"workbench.editor.showTabs\": false`). Les groupes d'éditeurs sont les conteneurs des éditeurs.",
-	"editorGroupBorder": "Couleur séparant plusieurs groupes d'éditeurs les uns des autres. Les groupes d'éditeurs sont les conteneurs des éditeurs.",
-	"editorDragAndDropBackground": "Couleur d'arrière-plan lors du déplacement des éditeurs par glissement. La couleur doit avoir une transparence pour que le contenu de l'éditeur soit visible à travers.",
-	"panelBackground": "Couleur d'arrière-plan du panneau. Les panneaux s'affichent sous la zone d'éditeurs et contiennent des affichages tels que la sortie et le terminal intégré.",
-	"panelBorder": "Couleur de bordure du panneau pour séparer le panneau de l'éditeur. Les panneaux apparaissent sous la zone de l'éditeur et contiennent des vues comme la sortie et le terminal intégré.",
-	"panelActiveTitleForeground": "Couleur du titre du panneau actif. Les panneaux se situent sous la zone de l'éditeur et contiennent des affichages comme la sortie et le terminal intégré.",
-	"panelInactiveTitleForeground": "Couleur du titre du panneau inactif. Les panneaux se situent sous la zone de l'éditeur et contiennent des affichages comme la sortie et le terminal intégré.",
-	"panelActiveTitleBorder": "Couleur de la bordure du titre du panneau actif. Les panneaux se situent sous la zone de l'éditeur et contiennent des affichages comme la sortie et le terminal intégré.",
-	"panelDragAndDropBackground": "Glissez et déposez la couleur de vos commentaires pour les éléments de titre du panneau. La couleur devrait avoir de la transparence afin que les entrées du panneau puissent encore briller à travers. Les panneaux apparaissent sous la zone de l’éditeur et contiennent des vues comme la sortie et le terminal intégré.",
-	"statusBarForeground": "Couleur de premier plan de la barre d'état quand l'espace de travail est ouvert. La barre d'état est affichée en bas de la fenêtre.",
-	"statusBarNoFolderForeground": "Couleur de premier plan de la barre d'état quand aucun dossier n'est ouvert. La barre d'état est affichée en bas de la fenêtre.",
-	"statusBarBackground": "Couleur d'arrière-plan de la barre d'état quand l'espace de travail est ouvert. La barre d'état est affichée en bas de la fenêtre.",
-	"statusBarNoFolderBackground": "Couleur d'arrière-plan de la barre d'état quand aucun dossier n'est ouvert. La barre d'état est affichée en bas de la fenêtre.",
-	"statusBarBorder": "Couleur de bordure de la barre d'état faisant la séparation avec la barre latérale et l'éditeur. La barre d'état est affichée en bas de la fenêtre.",
-	"statusBarNoFolderBorder": "Couleur de la bordure qui sépare la barre latérale et l’éditeur lorsque aucun dossier ne s’ouvre la barre d’état. La barre d’état s’affiche en bas de la fenêtre.",
-	"statusBarItemActiveBackground": "Couleur d'arrière-plan de l'élément de la barre d'état durant un clic. La barre d'état est affichée en bas de la fenêtre.",
-	"statusBarItemHoverBackground": "Couleur d'arrière-plan de l'élément de la barre d'état durant un pointage. La barre d'état est affichée en bas de la fenêtre.",
-	"statusBarProminentItemBackground": "Couleur d'arrière-plan des éléments importants de la barre d'état. Les éléments importants se différencient des autres entrées de la barre d'état pour indiquer l'importance. Changer le mode `Appuyer sur la touche tabulation déplace le focus` depuis la palette de commandes pour voir un exemple. La barre d'état est affichée en bas de la fenêtre.",
-	"statusBarProminentItemHoverBackground": "Couleur d'arrière-plan des éléments importants de la barre d'état lors du survol. Les éléments importants se différencient des autres entrées de la barre d'état pour indiquer l'importance. Changer le mode `Appuyer sur la touche tabulation déplace le focus` depuis la palette de commandes pour voir un exemple. La barre d'état est affichée en bas de la fenêtre.",
-	"activityBarBackground": "Couleur d'arrière-plan de la barre d'activités. La barre d'activités s'affiche complètement à gauche ou à droite, et permet de naviguer entre les affichages de la barre latérale.",
-	"activityBarForeground": "Couleur de premier plan de la barre d'activités (par ex., utilisée pour les icônes). La barre d'activités s'affiche complètement à gauche ou à droite, et permet de parcourir les vues de la barre latérale.",
-	"activityBarBorder": "Couleur de bordure de la barre d'activités faisant la séparation avec la barre latérale. La barre d'activités, située à l'extrême droite ou gauche, permet de parcourir les vues de la barre latérale.",
-	"activityBarDragAndDropBackground": "Couleur des commentaires sur une opération de glisser-déplacer pour les éléments de la barre d'activités. La couleur doit avoir une transparence pour que les entrées de la barre d'activités soient visibles à travers. La barre d'activités, située à l'extrême droite ou gauche, permet de parcourir les vues de la barre latérale.",
-	"activityBarBadgeBackground": "Couleur d'arrière-plan du badge de notification d'activité. La barre d'activités, située à l'extrême gauche ou droite, permet de basculer entre les affichages de la barre latérale.",
-	"activityBarBadgeForeground": "Couleur de premier plan du badge de notification d'activité. La barre d'activités, située à l'extrême gauche ou droite, permet de basculer entre les affichages de la barre latérale.",
-	"sideBarBackground": "Couleur d'arrière-plan de la barre latérale. La barre latérale est le conteneur des affichages tels que ceux de l'exploration et la recherche.",
-	"sideBarForeground": "Couleur de premier plan de la barre latérale. La barre latérale est le conteneur des vues comme celles de l'explorateur et de la recherche.",
-	"sideBarBorder": "Couleur de bordure de la barre latérale faisant la séparation avec l'éditeur. La barre latérale est le conteneur des vues comme celles de l'explorateur et de la recherche.",
-	"sideBarTitleForeground": "Couleur de premier plan du titre de la barre latérale. La barre latérale est le conteneur des affichages tels que ceux de l'exploration et la recherche.",
-	"sideBarDragAndDropBackground": "Glisser-déposer la couleur pour les sections de barre latérale. La couleur devrait avoir de la transparence afin que les sections de barre latérale puissent encore briller à travers. La barre latérale est le conteneur des vues comme l'explorateur et la recherche.",
-	"sideBarSectionHeaderBackground": "Couleur d'arrière-plan de l'en-tête de section de la barre latérale. La barre latérale est le conteneur des vues comme celles de l'explorateur et la recherche.",
-	"sideBarSectionHeaderForeground": "Couleur de premier plan de l'en-tête de section de la barre latérale. La barre latérale est le conteneur des vues comme celles de l'explorateur et de la recherche.",
-	"titleBarActiveForeground": "Premier plan de la barre de titre quand la fenêtre est active. Notez que cette couleur est uniquement prise en charge sur macOS.",
-	"titleBarInactiveForeground": "Premier plan de la barre de titre quand la fenêtre est inactive. Notez que cette couleur est uniquement prise en charge sur macOS.",
-	"titleBarActiveBackground": "Arrière-plan de la barre de titre quand la fenêtre est active. Notez que cette couleur est uniquement prise en charge sur macOS.",
-	"titleBarInactiveBackground": "Arrière-plan de la barre de titre quand la fenêtre est inactive. Notez que cette couleur est uniquement prise en charge sur macOS.",
-	"titleBarBorder": "Couleur de bordure de la barre titre. Notez que cette couleur est actuellement uniquement pris en charge sur macOS.",
-	"notificationCenterBorder": "Couleur de bordure du centre de notifications. Les notifications défilent à partir du bas à droite de la fenêtre.",
-	"notificationToastBorder": "Couleur de bordure du toast des notifications. Les notifications défilent à partir du bas à droite de la fenêtre.",
-	"notificationsForeground": "Couleur de premier plan des notifications. Les notifications défilent à partir du bas à droite de la fenêtre.",
-	"notificationsBackground": "Couleur d'arrière plan des notifications. Les notifications défilent à partir du bas à droite de la fenêtre.",
-	"notificationsLink": "Couleur de premier plan des liens des notifications. Les notifications défilent à partir du bas à droite de la fenêtre.",
-	"notificationCenterHeaderForeground": "Couleur de premier plan de l'en-tête du centre de notifications. Les notifications défilent à partir du bas à droite de la fenêtre.",
-	"notificationCenterHeaderBackground": "Couleur d'arrière plan de l'en-tête du centre de notifications. Les notifications défilent à partir du bas à droite de la fenêtre.",
-	"notificationsBorder": "Couleur de bordure séparant des autres notifications dans le centre de notifications. Les notifications défilent à partir du bas à droite de la fenêtre."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/common/views.i18n.json b/i18n/fra/src/vs/workbench/common/views.i18n.json
deleted file mode 100644
index f67d84f0a4d..00000000000
--- a/i18n/fra/src/vs/workbench/common/views.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"duplicateId": "Une vue avec l’id `{0}` est déjà enregistrée à l’emplacement `{1}`"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/electron-browser/actions.i18n.json b/i18n/fra/src/vs/workbench/electron-browser/actions.i18n.json
deleted file mode 100644
index 8f9f7eb339d..00000000000
--- a/i18n/fra/src/vs/workbench/electron-browser/actions.i18n.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"closeWindow": "Fermer la fenêtre",
-	"closeWorkspace": "Fermer l’espace de travail",
-	"noWorkspaceOpened": "Il n’y a actuellement aucun espace de travail ouvert dans cette instance à fermer.",
-	"newWindow": "Nouvelle fenêtre",
-	"toggleFullScreen": "Plein écran",
-	"toggleMenuBar": "Activer/désactiver la barre de menus",
-	"toggleDevTools": "Activer/désactiver les outils de développement",
-	"zoomIn": "Zoom avant",
-	"zoomOut": "Zoom arrière",
-	"zoomReset": "Réinitialiser le zoom",
-	"appPerf": "Performance de démarrage",
-	"reloadWindow": "Recharger la fenêtre",
-	"reloadWindowWithExntesionsDisabled": "Recharger la fenêtre avec les extensions désactivées",
-	"switchWindowPlaceHolder": "Sélectionner une fenêtre vers laquelle basculer",
-	"current": "Fenêtre active",
-	"close": "Fermer la fenêtre",
-	"switchWindow": "Changer de fenêtre...",
-	"quickSwitchWindow": "Changement rapide de fenêtre...",
-	"workspaces": "espaces de travail",
-	"files": "fichiers",
-	"openRecentPlaceHolderMac": "Sélectionner pour ouvrir (maintenir Cmd-key pour ouvrir dans une nouvelle fenêtre)",
-	"openRecentPlaceHolder": "Sélectionner pour ouvrir (maintenir Ctrl-key pour ouvrir dans une nouvelle fenêtre)",
-	"remove": "Supprimer des récemment ouverts",
-	"openRecent": "Ouvrir les éléments récents...",
-	"quickOpenRecent": "Ouverture rapide des éléments récents...",
-	"reportIssueInEnglish": "Signaler un problème",
-	"openProcessExplorer": "Ouvrir l'explorateur de processus",
-	"reportPerformanceIssue": "Signaler un problème de performance",
-	"keybindingsReference": "Référence des raccourcis clavier",
-	"openDocumentationUrl": "Documentation",
-	"openIntroductoryVideosUrl": "Vidéos d'introduction",
-	"openTipsAndTricksUrl": "Conseils et astuces",
-	"toggleSharedProcess": "Activer/désactiver le processus partagé",
-	"navigateLeft": "Naviguer vers l'affichage à gauche",
-	"navigateRight": "Naviguer vers l'affichage à droite",
-	"navigateUp": "Naviguer vers l'affichage au-dessus",
-	"navigateDown": "Naviguer vers l'affichage en dessous",
-	"increaseViewSize": "Augmenter la taille de l'affichage actuel",
-	"decreaseViewSize": "Diminuer la taille de l'affichage actuel",
-	"showPreviousTab": "Afficher l’onglet de la fenêtre précédente",
-	"showNextWindowTab": "Afficher l’onglet de la fenêtre suivante",
-	"moveWindowTabToNewWindow": "Déplacer l’onglet de la fenêtre vers la nouvelle fenêtre",
-	"mergeAllWindowTabs": "Fusionner toutes les fenêtres",
-	"toggleWindowTabsBar": "Activer/désactiver la barre de fenêtres d’onglets",
-	"about": "À propos de {0}",
-	"inspect context keys": "Inspecter les clés de contexte"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/electron-browser/commands.i18n.json b/i18n/fra/src/vs/workbench/electron-browser/commands.i18n.json
deleted file mode 100644
index 983899514ca..00000000000
--- a/i18n/fra/src/vs/workbench/electron-browser/commands.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"diffLeftRightLabel": "{0} ⟷ {1}"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/electron-browser/configureLocale.i18n.json b/i18n/fra/src/vs/workbench/electron-browser/configureLocale.i18n.json
deleted file mode 100644
index a8e6e2e5147..00000000000
--- a/i18n/fra/src/vs/workbench/electron-browser/configureLocale.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"configureLocale": "Configurer la langue",
-	"displayLanguage": "Définit le langage affiché par VSCode.",
-	"doc": "Consultez {0} pour connaître la liste des langues prises en charge.",
-	"restart": "Le changement de la valeur nécessite le redémarrage de VS Code.",
-	"fail.createSettings": "Impossible de créer '{0}' ({1}).",
-	"JsonSchema.locale": "Langue d'interface utilisateur (IU) à utiliser."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/electron-browser/crashReporter.i18n.json b/i18n/fra/src/vs/workbench/electron-browser/crashReporter.i18n.json
deleted file mode 100644
index 42bafb09091..00000000000
--- a/i18n/fra/src/vs/workbench/electron-browser/crashReporter.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"telemetryConfigurationTitle": "Télémétrie",
-	"telemetry.enableCrashReporting": "Activez l'envoi de rapports d'incidents à Microsoft.\nCette option nécessite un redémarrage pour être prise en compte."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/electron-browser/extensionHost.i18n.json b/i18n/fra/src/vs/workbench/electron-browser/extensionHost.i18n.json
deleted file mode 100644
index efa314b09c6..00000000000
--- a/i18n/fra/src/vs/workbench/electron-browser/extensionHost.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"extensionHostProcess.startupFailDebug": "L'hôte d'extension n'a pas démarré en moins de 10 secondes. Il est peut-être arrêté à la première ligne et a besoin d'un débogueur pour continuer.",
-	"extensionHostProcess.startupFail": "L'hôte d'extension n'a pas démarré en moins de 10 secondes. Il existe peut-être un problème.",
-	"extensionHostProcess.error": "Erreur de l'hôte d'extension : {0}",
-	"devTools": "Outils de développement",
-	"extensionHostProcess.crash": "L'hôte d'extension s'est terminé de façon inattendue. Rechargez la fenêtre pour reprendre l'exécution."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/electron-browser/main.contribution.i18n.json b/i18n/fra/src/vs/workbench/electron-browser/main.contribution.i18n.json
deleted file mode 100644
index 1a663cb4405..00000000000
--- a/i18n/fra/src/vs/workbench/electron-browser/main.contribution.i18n.json
+++ /dev/null
@@ -1,91 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"view": "Affichage",
-	"help": "Aide",
-	"file": "Fichier",
-	"workspaces": "Espaces de travail",
-	"developer": "Développeur",
-	"workbenchConfigurationTitle": "Banc d'essai",
-	"showEditorTabs": "Contrôle si les éditeurs ouverts doivent s'afficher ou non sous des onglets.",
-	"workbench.editor.labelFormat.default": "Afficher le nom du fichier. Lorsque les onglets sont activés et que deux fichiers portent le même nom dans un groupe, les sections distinctes du chemin de chaque fichier sont ajoutées. Lorsque les onglets sont désactivées, le chemin d’accès relatif au dossier de l'espace de travail est affiché si l’éditeur est actif.",
-	"workbench.editor.labelFormat.short": "Indiquer le nom du fichier suivi de son nom de répertoire.",
-	"workbench.editor.labelFormat.medium": "Afficher le nom du fichier suivi de son chemin d’accès relatif au dossier de l'espace de travail.",
-	"workbench.editor.labelFormat.long": "Indiquer le nom du fichier suivi de son chemin d’accès absolu.",
-	"tabDescription": "Contrôle le format de l’étiquette d’un éditeur. La modification de ce paramètre peut par exemple rendre plus facile la compréhension de l’emplacement d’un fichier :\n- short:   'parent'\n- medium:  'workspace/src/parent'\n- long:    '/home/user/workspace/src/parent'\n- default: '.../parent',  quand un autre onglet partage le même titre, ou la chemin d’accès relatif à l'espace de travail si les onglets sont désactivés",
-	"editorTabCloseButton": "Contrôle la position des boutons de fermeture des onglets de l'éditeur, ou les désactive quand le paramètre a la valeur 'off'.",
-	"tabSizing": "Contrôle la taille des onglets de l'éditeur. Mettre à 'fit' pour garder les onglets toujours assez larges pour afficher le libellé complet de l'éditeur. Mettre à 'shrink' pour autoriser les onglets à être plus peties quand l'espace n'est pas suffisant pur afficher tous les onglets en même temps.",
-	"showIcons": "Contrôle si les éditeurs ouverts doivent s'afficher ou non avec une icône. Cela implique notamment l'activation d'un thème d'icône.",
-	"enablePreview": "Contrôle si les éditeurs ouverts s'affichent en mode aperçu. Les éditeurs en mode aperçu sont réutilisés jusqu'à ce qu'ils soient conservés (par exemple, après un double-clic ou une modification) et apparaissent avec un style de police en italique.",
-	"enablePreviewFromQuickOpen": "Contrôle si les éditeurs de Quick Open s'affichent en mode aperçu. Les éditeurs en mode aperçu sont réutilisés jusqu'à ce qu'ils soient conservés (par exemple, après un double-clic ou une modification).",
-	"closeOnFileDelete": "Contrôle si les éditeurs qui affichent un fichier doivent se fermer automatiquement quand ce fichier est supprimé ou renommé par un autre processus. Si vous désactivez cette option, l'éditeur reste ouvert dans un état indiquant une intégrité compromise. Notez que la suppression de fichiers à partir de l'application entraîne toujours la fermeture de l'éditeur, et que les fichiers à l'intégrité compromise ne sont jamais fermés pour permettre la conservation de vos données.",
-	"editorOpenPositioning": "Permet de définir à quel endroit les éditeurs s'ouvrent. Sélectionnez  'left' ou  'right' pour ouvrir les éditeurs à gauche ou à droite de celui actuellement actif. Sélectionnez 'first' ou 'last' pour ouvrir les éditeurs indépendamment de celui actuellement actif.",
-	"revealIfOpen": "Contrôle si un éditeur est affiché dans l'un des groupes visibles, s'il est ouvert. Si cette option est désactivée, l'éditeur s'ouvre de préférence dans le groupe d'éditeurs actif. Si cette option est activée, tout éditeur déjà ouvert est affiché au lieu d'être rouvert dans le groupe d'éditeurs actif. Notez que dans certains cas, ce paramètre est ignoré, par exemple quand vous forcez un éditeur à s'ouvrir dans un groupe spécifique ou à côté du groupe actif.",
-	"swipeToNavigate": "Parcourez les fichiers ouverts en faisant glisser trois doigts horizontalement. ",
-	"commandHistory": "Contrôle le nombre de commandes récemment utilisées à retenir dans l’historique de la palette de commande. Spécifier la valeur 0 pour désactiver l’historique des commandes.",
-	"preserveInput": "Contrôle si la dernière entrée tapée dans la palette de commandes doit être restaurée à la prochaine ouverture.",
-	"closeOnFocusLost": "Contrôle si Quick Open doit se fermer automatiquement, une fois qu'il a perdu le focus.",
-	"openDefaultSettings": "Contrôle si l'ouverture des paramètres entraîne également l'ouverture d'un éditeur qui affiche tous les paramètres par défaut.",
-	"sideBarLocation": "Contrôle l'emplacement de la barre latérale. Elle peut s'afficher à gauche ou à droite du banc d'essai.",
-	"panelDefaultLocation": "Contrôle l’emplacement par défaut du panneau. Il peut être affiché soit en bas ou à droite du banc d'essai.",
-	"statusBarVisibility": "Contrôle la visibilité de la barre d'état au bas du banc d'essai.",
-	"activityBarVisibility": "Contrôle la visibilité de la barre d'activités dans le banc d'essai.",
-	"viewVisibility": "Contrôle la visibilité des actions d'en-tête de vue. Les actions d'en-tête de vue peuvent être soit toujours visibles, ou uniquement visibles quand cette vue a le focus ou est survolée.",
-	"fontAliasing": "Contrôle la méthode de font aliasing dans le workbench.\n- default : Lissage des polices de sous-pixel. Sur la plupart des affichages non-ratina, cela vous donnera le texte le plus vif\n- antialiased : Lisse les polices au niveau du pixel, plutôt que les sous-pixels. Peut faire en sorte que la police apparaisse plus fine dans l’ensemble \n- none : Désactive le lissage des polices. Le texte s'affichera avec des bordures dentelées\n- auto: Applique `default` ou `antialiased` automatiquement en se basant sur la résolution de l'affichage.",
-	"workbench.fontAliasing.default": "Lissage de sous-pixel des polices. Sur la plupart des affichages non-retina, cela vous donnera le texte le plus vif.",
-	"workbench.fontAliasing.antialiased": "Lisser les polices au niveau du pixel, plutôt que les sous-pixels. Peut faire en sorte que la police apparaisse plus légère dans l’ensemble.",
-	"workbench.fontAliasing.none": "Désactive le lissage des polices. Le texte s'affichera avec des bordures dentelées.",
-	"workbench.fontAliasing.auto": "Applique `default` ou `antialiased`automatiquement en se basant sur la résolution de l'affichage.",
-	"enableNaturalLanguageSettingsSearch": "Contrôle s’il faut activer le mode de recherche en langage naturel pour les paramètres.",
-	"windowConfigurationTitle": "Fenêtre",
-	"window.openFilesInNewWindow.on": "Les fichiers s'ouvrent dans une nouvelle fenêtre",
-	"window.openFilesInNewWindow.off": "Les fichiers s'ouvrent dans la fenêtre du dossier conteneur ouvert ou dans la dernière fenêtre active",
-	"window.openFilesInNewWindow.defaultMac": "Les fichiers s'ouvriront dans la fenêtre avec le dossier des fichiers ouvert ou la dernière fenêtre active, à moins qu'ils ne soient ouverts via le Dock ou depuis Finder.",
-	"window.openFilesInNewWindow.default": "Les fichiers s'ouvriront dans une nouvelle fenêtre, à moins qu'ils ne soient sélectionnés dans l'application (par ex. via le menu Fichier)",
-	"openFilesInNewWindowMac": "Contrôle si les fichiers doivent s'ouvrir dans une nouvelle fenêtre.\n- default : les fichiers s'ouvriront dans la fenêtre avec le dossier des fichiers ouvert ou la dernière fenêtre active à moins qu'ils ne soient ouverts via le Dock ou depuis le Finder\n- on : les fichiers s'ouvriront dans une nouvelle fenêtre\n- off : les fichiers s'ouvriront dans la fenêtre avec le dossier des fichiers ouvert ou la dernière fenêtre active\nNotez qu'il peut encore y avoir des cas où ce paramètre est ignoré (par exemple lorsque vous utilisez l'option de ligne de commande -new-window ou -reuse-window).",
-	"openFilesInNewWindow": "Contrôle si les fichiers doivent s'ouvrir dans une nouvelle fenêtre.\n- default : les fichiers s'ouvriront dans une nouvelle fenêtre à moins qu'ils ne soient sélectionnés dans l'application (par ex. via le menu Fichier)\n- on : les fichiers s'ouvriront dans une nouvelle fenêtre\n- off : les fichiers s'ouvriront dans la fenêtre avec le dossier des fichiers ouvert ou la dernière fenêtre active\nNotez qu'il peut encore y avoir des cas où ce paramètre est ignoré (par exemple lorsque vous utilisez l'option de ligne de commande -new-window ou -reuse-window).",
-	"window.openFoldersInNewWindow.on": "Les dossiers s'ouvrent dans une nouvelle fenêtre",
-	"window.openFoldersInNewWindow.off": "Les dossiers remplacent la dernière fenêtre active",
-	"window.openFoldersInNewWindow.default": "Les dossiers s'ouvrent dans une nouvelle fenêtre, sauf si un dossier est sélectionné depuis l'application (par exemple, via le menu Fichier)",
-	"openFoldersInNewWindow": "Contrôle si les dossiers doivent s'ouvrir dans une nouvelle fenêtre ou remplacer la dernière fenêtre active.\n- default : les dossiers s'ouvrent dans une nouvelle fenêtre, sauf si un dossier est sélectionné depuis l'application (par exemple, via le menu Fichier)\n- on : les dossiers s'ouvrent dans une nouvelle fenêtre\n- off : les dossiers remplacent la dernière fenêtre active\nNotez que dans certains cas, ce paramètre est ignoré (par exemple, quand vous utilisez l'option de ligne de commande -new-window ou -reuse-window).",
-	"window.openWithoutArgumentsInNewWindow.on": "Ouvrir une nouvelle fenêtre vide",
-	"window.openWithoutArgumentsInNewWindow.off": "Mettre le focus sur la dernière instance active du terminal",
-	"openWithoutArgumentsInNewWindow": "Contrôle si une nouvelle fenêtre vide doit s’ouvrir lors du démarrage d’une seconde instance sans argument, ou si la dernière instance en cours d’exécution doit obtenir le focus.\n- on : ouvrir une nouvelle fenêtre vide\n- off : la dernière instance en cours d’exécution active obtiendra le focus\nNote qu’il peut encore exister des cas où ce paramètre est ignoré (par exemple lorsque vous utilisez l'option de ligne de commande -new-window ou -reuse-window).",
-	"window.reopenFolders.all": "Rouvre toutes les fenêtres.",
-	"window.reopenFolders.folders": "Rouvrir tous les dossiers. Les espaces de travail vides ne seront pas restaurées.",
-	"window.reopenFolders.one": "Rouvre la dernière fenêtre active.",
-	"window.reopenFolders.none": "Ne jamais rouvrir de fenêtre. Toujours démarrer avec une fenêtre vide.",
-	"restoreWindows": "Contrôle comment les fenêtres seront rouvertes après un redémarrage. Sélectionner 'none' pour toujours démarrer avec un espace de travail vide, 'one' pour rouvrir la dernière fenêtre avec laquelle vous avez travaillé, 'folders' pour rouvrir toutes les fenêtres qui avaient des dossiers ouverts  ou 'all' pour rouvrir toutes les fenêtres de votre dernière session.",
-	"restoreFullscreen": "Contrôle si une fenêtre doit être restaurée en mode plein écran si elle a été fermée dans ce mode.",
-	"zoomLevel": "Modifiez le niveau de zoom de la fenêtre. La taille d'origine est 0. Chaque incrément supérieur (exemple : 1) ou inférieur (exemple : -1) représente un zoom 20 % plus gros ou plus petit. Vous pouvez également entrer des décimales pour changer le niveau de zoom avec une granularité plus fine.",
-	"title": "Contrôle le titre de la fenêtre basé sur l’éditeur actif. Les variables sont remplacées selon le contexte : \n${activeEditorShort} : le nom de fichier (p. ex. monfichier.txt)\n${activeEditorMedium} : le chemin d’accès du fichier par rapport au dossier  de l’espace de travail (par exemple, myFolder/myFile.txt) \n${activeEditorLong} : le chemin d’accès complet du fichier (par exemple / Users/Development/myProject/myFolder/myFile.txt) \n${folderName} : le nom du dossier de l'espace de travail dans lequel le fichier est contenu (p. ex. mondossier) \n${folderPath} : le chemin d’accès au dossier de l'espace de travail dans lequel le fichier est contenu (par exemple /Users/Development/myFolder) \n{$ rootName} : le nom de l’espace de travail (p. ex. myFolder ou myWorkspace) \n${rootPath} : le chemin d’accès de l’espace de travail (par exemple, /Users/Development/myWorkspace) \n${appName} : p. ex. VS Code\n${dirty} : un indicateur si l’éditeur actif est modifié\n${separator} : un séparateur conditionnel  (\" - \") qui ne s'affiche que quand ils sont entourés par des variables avec des valeurs ou du texte statique",
-	"window.newWindowDimensions.default": "Permet d'ouvrir les nouvelles fenêtres au centre de l'écran.",
-	"window.newWindowDimensions.inherit": "Permet d'ouvrir les nouvelles fenêtres avec la même dimension que la dernière fenêtre active.",
-	"window.newWindowDimensions.maximized": "Permet d'ouvrir les nouvelles fenêtres de manière agrandie.",
-	"window.newWindowDimensions.fullscreen": "Permet d'ouvrir les nouvelles fenêtres en mode plein écran.",
-	"newWindowDimensions": "Contrôle les dimensions d'ouverture d'une nouvelle fenêtre quand au moins une fenêtre est déjà ouverte. Par défaut, une nouvelle fenêtre s'ouvre au centre de l'écran avec des dimensions réduites. Quand la valeur est 'inherit', la fenêtre a les mêmes dimensions que la dernière fenêtre active. Quand la valeur est 'maximized', la fenêtre s'ouvre dans sa taille maximale et quand la valeur est 'fullscreen', elle s'ouvre en mode plein écran. Notez que ce paramètre n'a aucun impact sur la première fenêtre ouverte, laquelle est toujours restaurée à la taille et l'emplacement définis au moment de sa fermeture.",
-	"closeWhenEmpty": "Contrôle si le dernier éditeur de clôture devrait également fermer la fenêtre. Ce paramètre s’applique uniquement pour les fenêtres qui ne présentent pas de dossiers.",
-	"window.menuBarVisibility.default": "Le menu n'est masqué qu'en mode plein écran.",
-	"window.menuBarVisibility.visible": "Le menu est toujours visible même en mode plein écran.",
-	"window.menuBarVisibility.toggle": "Le menu est masqué mais il peut être affiché via la touche Alt.",
-	"window.menuBarVisibility.hidden": "Le menu est toujours masqué.",
-	"menuBarVisibility": "Contrôle la visibilité de la barre de menus. Le paramètre 'toggle' signifie que la barre de menus est masquée, et qu'une seule pression sur la touche Alt permet de l'afficher. Par défaut, la barre de menus est visible, sauf si la fenêtre est en mode plein écran.",
-	"enableMenuBarMnemonics": "S'ils sont activés, les menus principaux peuvent être ouverts via des raccourcis avec la touche Alt. La désactivation des mnémoniques permet plutôt de lier ces raccourcis avec la touche Alt aux commandes de l'éditeur.",
-	"autoDetectHighContrast": "Si cette option est activée, le thème à contraste élevé est automatiquement choisi quand Windows utilise un thème à contraste élevé. À l'inverse, le thème sombre est automatiquement choisi quand Windows n'utilise plus le thème à contraste élevé.",
-	"titleBarStyle": "Ajustez l'apparence de la barre de titre de la fenêtre. Vous devez effectuer un redémarrage complet pour que les changements soient appliqués.",
-	"window.nativeTabs": "Active les onglets macOS Sierra. Notez que vous devez redémarrer l'ordinateur pour appliquer les modifications et que les onglets natifs désactivent tout style de barre de titre personnalisé configuré, le cas échéant.",
-	"window.smoothScrollingWorkaround": "Activez cette solution de contournement si le défilement n’est plus lissé après la restauration d’une fenêtre de VS Code réduite. Il s’agit d’une solution de contournement pour un problème (https://github.com/Microsoft/vscode/issues/13612) où le défilement commence à laguer sur les périphériques dotés de pavés de précision comme les appareils Surface de Microsoft. Activer cette solution de contournement peut provoquer un peu de scintillement de mise en page après la restauration de la fenêtre depuis l’état minimisé mais est sans danger.",
-	"window.clickThroughInactive": "Si activée, cliquer sur une fenêtre inactive activera la fenêtre et déclenchera l’élément sous la souris, si elle est cliquable. Si désactivé, cliquer n’importe où sur une fenêtre inactive va seulement l'activer et un second clic sur l’élément sera nécessaire.",
-	"zenModeConfigurationTitle": "Mode Zen",
-	"zenMode.fullScreen": "Contrôle si l'activation de Zen Mode met également le banc d'essai en mode plein écran.",
-	"zenMode.centerLayout": "Contrôle si l'activation du mode Zen centre également la disposition.",
-	"zenMode.hideTabs": "Contrôle si l'activation du mode Zen masque également les onglets du banc d'essai.",
-	"zenMode.hideStatusBar": "Contrôle si l'activation du mode Zen masque également la barre d'état au bas du banc d'essai.",
-	"zenMode.hideActivityBar": "Contrôle si l'activation du mode Zen masque également la barre d'activités à gauche du banc d'essai.",
-	"zenMode.restore": "Contrôle si une fenêtre doit être restaurée en mode zen, si elle a été fermée en mode zen."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/electron-browser/main.i18n.json b/i18n/fra/src/vs/workbench/electron-browser/main.i18n.json
deleted file mode 100644
index 90dbc158347..00000000000
--- a/i18n/fra/src/vs/workbench/electron-browser/main.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"loaderError": "Échec du chargement d'un fichier requis. Soit vous n'êtes plus connecté à Internet, soit le serveur auquel vous êtes connecté est hors connexion. Actualisez le navigateur pour réessayer.",
-	"loaderErrorNative": "Échec du chargement d'un fichier obligatoire. Redémarrez l'application pour réessayer. Détails : {0}"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/electron-browser/shell.i18n.json b/i18n/fra/src/vs/workbench/electron-browser/shell.i18n.json
deleted file mode 100644
index a24bedcde3d..00000000000
--- a/i18n/fra/src/vs/workbench/electron-browser/shell.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"runningAsRoot": "Il est déconseillé d'exécuter du code en tant qu'utilisateur 'root'."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/electron-browser/window.i18n.json b/i18n/fra/src/vs/workbench/electron-browser/window.i18n.json
deleted file mode 100644
index 6e669b2258d..00000000000
--- a/i18n/fra/src/vs/workbench/electron-browser/window.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"undo": "Annuler",
-	"redo": "Rétablir",
-	"cut": "Couper",
-	"copy": "Copier",
-	"paste": "Coller",
-	"selectAll": "Tout Sélectionner",
-	"runningAsRoot": "Il est déconseillé d’exécuter {0} en tant qu’utilisateur root."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/electron-browser/workbench.i18n.json b/i18n/fra/src/vs/workbench/electron-browser/workbench.i18n.json
deleted file mode 100644
index 2da2586c1f4..00000000000
--- a/i18n/fra/src/vs/workbench/electron-browser/workbench.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"developer": "Développeur",
-	"file": "Fichier"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/node/extensionHostMain.i18n.json b/i18n/fra/src/vs/workbench/node/extensionHostMain.i18n.json
deleted file mode 100644
index 53e58047ea7..00000000000
--- a/i18n/fra/src/vs/workbench/node/extensionHostMain.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"extensionTestError": "Le chemin {0} ne pointe pas vers un Test Runner d'extension valide."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/node/extensionPoints.i18n.json b/i18n/fra/src/vs/workbench/node/extensionPoints.i18n.json
deleted file mode 100644
index 20c3f21a455..00000000000
--- a/i18n/fra/src/vs/workbench/node/extensionPoints.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"jsonParseFail": "Échec de l'analyse de {0} : {1}.",
-	"fileReadFail": "Impossible de lire le fichier {0} : {1}.",
-	"jsonsParseFail": "Échec de l'analyse de {0} ou de {1} : {2}.",
-	"missingNLSKey": "Le message est introuvable pour la clé {0}."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/cli/electron-browser/cli.contribution.i18n.json b/i18n/fra/src/vs/workbench/parts/cli/electron-browser/cli.contribution.i18n.json
deleted file mode 100644
index 33d0113db95..00000000000
--- a/i18n/fra/src/vs/workbench/parts/cli/electron-browser/cli.contribution.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"install": "Installer la commande '{0}' dans PATH",
-	"not available": "Cette commande n'est pas disponible",
-	"successIn": "La commande d'interpréteur de commandes '{0}' a été correctement installée dans PATH.",
-	"ok": "OK",
-	"cancel2": "Annuler",
-	"warnEscalation": "Code va maintenant demander avec 'osascript' des privilèges d'administrateur pour installer la commande d'interpréteur de commandes.",
-	"cantCreateBinFolder": "Impossible de créer '/usr/local/bin'.",
-	"aborted": "Abandonné",
-	"uninstall": "Désinstaller la commande '{0}' de PATH",
-	"successFrom": "La commande d'interpréteur de commandes '{0}' a été correctement désinstallée à partir de PATH.",
-	"shellCommand": "Commande d'interpréteur de commandes"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/codeEditor/electron-browser/accessibility.i18n.json b/i18n/fra/src/vs/workbench/parts/codeEditor/electron-browser/accessibility.i18n.json
deleted file mode 100644
index fb8c8013fcd..00000000000
--- a/i18n/fra/src/vs/workbench/parts/codeEditor/electron-browser/accessibility.i18n.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"emergencyConfOn": "Définition du paramètre 'editor.accessibilitySupport' sur 'activé'.",
-	"openingDocs": "Ouverture de la page de documentation sur l'accessibilité dans VS Code.",
-	"introMsg": "Nous vous remercions de tester les options d'accessibilité de VS Code.",
-	"status": "État :",
-	"changeConfigToOnMac": "Pour configurer l'éditeur de sorte qu'il soit optimisé en permanence pour une utilisation avec un lecteur d'écran, appuyez sur Commande+E.",
-	"changeConfigToOnWinLinux": "Pour configurer l'éditeur de sorte qu'il soit optimisé en permanence pour une utilisation avec un lecteur d'écran, appuyez sur Ctrl+E.",
-	"auto_unknown": "L'éditeur est configuré pour utiliser les API de la plateforme afin de détecter si un lecteur d'écran est attaché, mais le runtime actuel ne prend pas en charge cette configuration.",
-	"auto_on": "L'éditeur a automatiquement détecté qu'un lecteur d'écran est attaché.",
-	"auto_off": "L'éditeur est configuré pour détecter automatiquement si un lecteur d'écran est attaché, ce qui n'est pas le cas pour le moment.",
-	"configuredOn": "L'éditeur est configuré de sorte qu'il soit optimisé en permanence pour une utilisation avec un lecteur d'écran. Vous pouvez changer ce comportement en modifiant le paramètre 'editor.accessibilitySupport'.",
-	"configuredOff": "L'éditeur est configuré de sorte à ne jamais être optimisé pour une utilisation avec un lecteur d'écran.",
-	"tabFocusModeOnMsg": "Appuyez sur Tab dans l'éditeur pour déplacer le focus vers le prochain élément pouvant être désigné comme élément actif. Activez ou désactivez ce comportement en appuyant sur {0}.",
-	"tabFocusModeOnMsgNoKb": "Appuyez sur Tab dans l'éditeur pour déplacer le focus vers le prochain élément pouvant être désigné comme élément actif. La commande {0} ne peut pas être déclenchée par une combinaison de touches.",
-	"tabFocusModeOffMsg": "Appuyez sur Tab dans l'éditeur pour insérer le caractère de tabulation. Activez ou désactivez ce comportement en appuyant sur {0}.",
-	"tabFocusModeOffMsgNoKb": "Appuyez sur Tab dans l'éditeur pour insérer le caractère de tabulation. La commande {0} ne peut pas être déclenchée par une combinaison de touches.",
-	"openDocMac": "Appuyez sur Commande+H pour ouvrir une fenêtre de navigateur contenant plus d'informations sur l'accessibilité dans VS Code.",
-	"openDocWinLinux": "Appuyez sur Ctrl+H pour ouvrir une fenêtre de navigateur contenant plus d'informations sur l'accessibilité dans VS Code.",
-	"outroMsg": "Vous pouvez masquer cette info-bulle et revenir à l'éditeur en appuyant sur Échap ou Maj+Échap.",
-	"ShowAccessibilityHelpAction": "Afficher l'aide sur l'accessibilité"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/codeEditor/electron-browser/inspectKeybindings.i18n.json b/i18n/fra/src/vs/workbench/parts/codeEditor/electron-browser/inspectKeybindings.i18n.json
deleted file mode 100644
index 71322bcbbc3..00000000000
--- a/i18n/fra/src/vs/workbench/parts/codeEditor/electron-browser/inspectKeybindings.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"workbench.action.inspectKeyMap": "Développeur : Inspecter les mappages de touches"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/codeEditor/electron-browser/inspectTMScopes.i18n.json b/i18n/fra/src/vs/workbench/parts/codeEditor/electron-browser/inspectTMScopes.i18n.json
deleted file mode 100644
index a204ab1b865..00000000000
--- a/i18n/fra/src/vs/workbench/parts/codeEditor/electron-browser/inspectTMScopes.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"inspectTMScopes": "Développeur : inspecter les portées TextMate",
-	"inspectTMScopesWidget.loading": "Chargement..."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/codeEditor/electron-browser/languageConfiguration/languageConfigurationExtensionPoint.i18n.json b/i18n/fra/src/vs/workbench/parts/codeEditor/electron-browser/languageConfiguration/languageConfigurationExtensionPoint.i18n.json
deleted file mode 100644
index dbcc91af218..00000000000
--- a/i18n/fra/src/vs/workbench/parts/codeEditor/electron-browser/languageConfiguration/languageConfigurationExtensionPoint.i18n.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"parseErrors": "Erreurs durant l'analyse de {0} : {1}",
-	"schema.openBracket": "Séquence de chaînes ou de caractères de crochets ouvrants.",
-	"schema.closeBracket": "Séquence de chaînes ou de caractères de crochets fermants.",
-	"schema.comments": "Définit les symboles de commentaire",
-	"schema.blockComments": "Définit le marquage des commentaires de bloc.",
-	"schema.blockComment.begin": "Séquence de caractères au début d'un commentaire de bloc.",
-	"schema.blockComment.end": "Séquence de caractères à la fin d'un commentaire de bloc.",
-	"schema.lineComment": "Séquence de caractères au début d'un commentaire de ligne.",
-	"schema.brackets": "Définit les symboles de type crochet qui augmentent ou diminuent le retrait.",
-	"schema.autoClosingPairs": "Définit les paires de crochets. Quand vous entrez un crochet ouvrant, le crochet fermant est inséré automatiquement.",
-	"schema.autoClosingPairs.notIn": "Définit une liste d'étendues où les paires automatiques sont désactivées.",
-	"schema.surroundingPairs": "Définit les paires de crochets qui peuvent être utilisées pour entourer la chaîne sélectionnée.",
-	"schema.wordPattern": "La définition du mot dans le langage",
-	"schema.wordPattern.pattern": "L'expression régulière utilisée pour la recherche",
-	"schema.wordPattern.flags": "Les options d'expression régulière utilisées pour la recherche",
-	"schema.wordPattern.flags.errorMessage": "Doit valider l'expression régulière `/^([gimuy]+)$/`.",
-	"schema.indentationRules": "Paramètres de mise en retrait du langage.",
-	"schema.indentationRules.increaseIndentPattern": "Si une ligne correspond à ce modèle, toutes les lignes qui la suivent doivent être mises en retrait une fois (jusqu'à ce qu'une autre règle corresponde).",
-	"schema.indentationRules.increaseIndentPattern.pattern": "Modèle RegExp pour increaseIndentPattern.",
-	"schema.indentationRules.increaseIndentPattern.flags": "Indicateurs RegExp pour increaseIndentPattern.",
-	"schema.indentationRules.increaseIndentPattern.errorMessage": "Doit valider l'expression régulière `/^([gimuy]+)$/`.",
-	"schema.indentationRules.decreaseIndentPattern": "Si une ligne correspond à ce modèle, pour toutes les lignes qui la suivent le retrait doit être réduit une fois (jusqu'à ce qu'une autre règle corresponde).",
-	"schema.indentationRules.decreaseIndentPattern.pattern": "Modèle RegExp pour decreaseIndentPattern.",
-	"schema.indentationRules.decreaseIndentPattern.flags": "Indicateurs RegExp pour decreaseIndentPattern.",
-	"schema.indentationRules.decreaseIndentPattern.errorMessage": "Doit valider l'expression régulière `/^([gimuy]+)$/`.",
-	"schema.indentationRules.indentNextLinePattern": "Si une ligne correspond à ce modèle, **seule la ligne suivante** doit être mise en retrait une fois.",
-	"schema.indentationRules.indentNextLinePattern.pattern": "Modèle RegExp pour indentNextLinePattern.",
-	"schema.indentationRules.indentNextLinePattern.flags": "Indicateurs RegExp pour indentNextLinePattern.",
-	"schema.indentationRules.indentNextLinePattern.errorMessage": "Doit valider l'expression régulière `/^([gimuy]+)$/`.",
-	"schema.indentationRules.unIndentedLinePattern": "Si une ligne correspond à ce modèle, sa mise en retrait ne doit pas être changée et la ligne ne doit pas être évaluée par rapport aux autres règles.",
-	"schema.indentationRules.unIndentedLinePattern.pattern": "Modèle RegExp pour unIndentedLinePattern.",
-	"schema.indentationRules.unIndentedLinePattern.flags": "Indicateurs RegExp pour unIndentedLinePattern.",
-	"schema.indentationRules.unIndentedLinePattern.errorMessage": "Doit valider l'expression régulière `/^([gimuy]+)$/`.",
-	"schema.folding": "Paramètres de repliage de la langue.",
-	"schema.folding.offSide": "Un langage adhère à la règle du hors-champ si les blocs dans ce langage sont exprimées par leur indentation. Si spécifié, les lignes vides appartiennent au bloc suivant.",
-	"schema.folding.markers": "Les marqueurs de langage spécifiques de repliage tels que '#region' et '#endregion'. Les regex de début et la fin seront testés sur le contenu de toutes les lignes et doivent être conçues de manière efficace.",
-	"schema.folding.markers.start": "Le modèle de RegExp pour le marqueur de début. L’expression régulière doit commencer par '^'.",
-	"schema.folding.markers.end": "Le modèle de RegExp pour le marqueur de fin. L’expression régulière doit commencer par '^'."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/codeEditor/electron-browser/largeFileOptimizations.i18n.json b/i18n/fra/src/vs/workbench/parts/codeEditor/electron-browser/largeFileOptimizations.i18n.json
deleted file mode 100644
index 942d9f363e2..00000000000
--- a/i18n/fra/src/vs/workbench/parts/codeEditor/electron-browser/largeFileOptimizations.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"largeFile": "{0} : la tokenisation, l'entourage et le repliage ont été désactivés pour ce gros fichier afin de réduire l’utilisation de la mémoire et éviter de se figer ou de crasher.",
-	"neverShowAgain": "OK. Ne plus afficher",
-	"removeOptimizations": "Activer les fonctionnalités en forçant",
-	"reopenFilePrompt": "Veuillez rouvrir le dossier pour que ce paramètre soit effectif."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/codeEditor/electron-browser/textMate/inspectTMScopes.i18n.json b/i18n/fra/src/vs/workbench/parts/codeEditor/electron-browser/textMate/inspectTMScopes.i18n.json
deleted file mode 100644
index 74d55a1d77b..00000000000
--- a/i18n/fra/src/vs/workbench/parts/codeEditor/electron-browser/textMate/inspectTMScopes.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"inspectTMScopes": "Développeur : inspecter les portées TextMate",
-	"inspectTMScopesWidget.loading": "Chargement..."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/codeEditor/electron-browser/toggleMinimap.i18n.json b/i18n/fra/src/vs/workbench/parts/codeEditor/electron-browser/toggleMinimap.i18n.json
deleted file mode 100644
index de5d59cb084..00000000000
--- a/i18n/fra/src/vs/workbench/parts/codeEditor/electron-browser/toggleMinimap.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleMinimap": "Affichage : Activer/désactiver la minicarte"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/codeEditor/electron-browser/toggleMultiCursorModifier.i18n.json b/i18n/fra/src/vs/workbench/parts/codeEditor/electron-browser/toggleMultiCursorModifier.i18n.json
deleted file mode 100644
index 39a1f31ed00..00000000000
--- a/i18n/fra/src/vs/workbench/parts/codeEditor/electron-browser/toggleMultiCursorModifier.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleLocation": "Changer le modificateur multicurseur"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderControlCharacter.i18n.json b/i18n/fra/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderControlCharacter.i18n.json
deleted file mode 100644
index b1763757fe0..00000000000
--- a/i18n/fra/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderControlCharacter.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleRenderControlCharacters": "Affichage : Activer/désactiver les caractères de contrôle"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderWhitespace.i18n.json b/i18n/fra/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderWhitespace.i18n.json
deleted file mode 100644
index 96d37fe1585..00000000000
--- a/i18n/fra/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderWhitespace.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleRenderWhitespace": "Affichage : Activer/désactiver l'affichage des espaces"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/codeEditor/electron-browser/toggleWordWrap.i18n.json b/i18n/fra/src/vs/workbench/parts/codeEditor/electron-browser/toggleWordWrap.i18n.json
deleted file mode 100644
index 9f5d778dbea..00000000000
--- a/i18n/fra/src/vs/workbench/parts/codeEditor/electron-browser/toggleWordWrap.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggle.wordwrap": "Afficher : activer/désactiver le retour automatique à la ligne",
-	"wordWrap.notInDiffEditor": "Impossible d'activer/désactiver le retour automatique à la ligne dans un éditeur de différences.",
-	"unwrapMinified": "Désactiver le retour automatique à la ligne pour ce fichier",
-	"wrapMinified": "Activer le retour à la ligne pour ce fichier"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/codeEditor/electron-browser/wordWrapMigration.i18n.json b/i18n/fra/src/vs/workbench/parts/codeEditor/electron-browser/wordWrapMigration.i18n.json
deleted file mode 100644
index 10b510b8f50..00000000000
--- a/i18n/fra/src/vs/workbench/parts/codeEditor/electron-browser/wordWrapMigration.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"wordWrapMigration.ok": "OK",
-	"wordWrapMigration.dontShowAgain": "Ne plus afficher",
-	"wordWrapMigration.openSettings": "Ouvrir les paramètres",
-	"wordWrapMigration.prompt": "Le paramètre 'editor.wrappingColumn' est déconseillé et doit être remplacé par 'editor.wordWrap'."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/debug/browser/breakpointWidget.i18n.json b/i18n/fra/src/vs/workbench/parts/debug/browser/breakpointWidget.i18n.json
deleted file mode 100644
index 84640e3a0ff..00000000000
--- a/i18n/fra/src/vs/workbench/parts/debug/browser/breakpointWidget.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"breakpointWidgetExpressionPlaceholder": "Arrêt quand l'expression prend la valeur true. 'Entrée' pour accepter ou 'Échap' pour annuler.",
-	"breakpointWidgetAriaLabel": "Le programme s'arrête ici uniquement si cette condition a la valeur true. Appuyez sur Entrée pour accepter, ou sur Échap pour annuler.",
-	"breakpointWidgetHitCountPlaceholder": "Arrêt quand le nombre d'accès est atteint. 'Entrée' pour accepter ou 'Échap' pour annuler.",
-	"breakpointWidgetHitCountAriaLabel": "Le programme s'arrête ici uniquement si le nombre d'accès est atteint. Appuyez sur Entrée pour accepter, ou sur Échap pour annuler.",
-	"expression": "Expression",
-	"hitCount": "Nombre d'accès"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json b/i18n/fra/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
deleted file mode 100644
index ea17513fd0b..00000000000
--- a/i18n/fra/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"logPoint": "Point de journalisation",
-	"breakpoint": "Point d'arrêt",
-	"editBreakpoint": "Modifier {0}...",
-	"removeBreakpoint": "Supprimer {0}",
-	"functionBreakpointsNotSupported": "Les points d'arrêt de fonction ne sont pas pris en charge par ce type de débogage",
-	"functionBreakpointPlaceholder": "Fonction où effectuer un point d'arrêt",
-	"functionBreakPointInputAriaLabel": "Point d'arrêt sur fonction de type",
-	"breakpointDisabledHover": "Point d'arrêt désactivé",
-	"breakpointUnverifieddHover": "Point d'arrêt non vérifié",
-	"functionBreakpointUnsupported": "Les points d'arrêt de fonction ne sont pas pris en charge par ce type de débogage",
-	"breakpointDirtydHover": "Point d'arrêt non vérifié. Fichier modifié. Redémarrez la session de débogage.",
-	"logBreakpointUnsupported": "Les points de journalisation ne sont pas pris en charge par ce type de débogage",
-	"conditionalBreakpointUnsupported": "Les points d'arrêt conditionnels ne sont pas pris en charge par ce type de débogage",
-	"hitBreakpointUnsupported": "Les points d'arrêt conditionnels ne sont pas pris en charge par ce type de débogage"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/debug/browser/debugActionItems.i18n.json b/i18n/fra/src/vs/workbench/parts/debug/browser/debugActionItems.i18n.json
deleted file mode 100644
index 979233d172f..00000000000
--- a/i18n/fra/src/vs/workbench/parts/debug/browser/debugActionItems.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noConfigurations": "Aucune configuration",
-	"addConfigTo": "Ajouter une configuration ({0})...",
-	"addConfiguration": "Ajouter une configuration..."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/debug/browser/debugActions.i18n.json b/i18n/fra/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
deleted file mode 100644
index dc968d23980..00000000000
--- a/i18n/fra/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openLaunchJson": "Ouvrir {0}",
-	"launchJsonNeedsConfigurtion": "Configurer ou corriger 'launch.json'",
-	"noFolderDebugConfig": "Ouvrez d'abord un dossier pour effectuer une configuration de débogage avancée.",
-	"startDebug": "Démarrer le débogage",
-	"startWithoutDebugging": "Exécuter sans débogage",
-	"selectAndStartDebugging": "Sélectionner et démarrer le débogage",
-	"restartDebug": "Redémarrer",
-	"reconnectDebug": "Se reconnecter",
-	"stepOverDebug": "Pas à pas principal",
-	"stepIntoDebug": "Pas à pas détaillé",
-	"stepOutDebug": "Pas à pas sortant",
-	"stopDebug": "Arrêter",
-	"disconnectDebug": "Déconnecter",
-	"continueDebug": "Continuer",
-	"pauseDebug": "Suspendre",
-	"terminateThread": "Terminer le thread",
-	"restartFrame": "Redémarrer le frame",
-	"removeBreakpoint": "Supprimer un point d'arrêt",
-	"removeAllBreakpoints": "Supprimer tous les points d'arrêt",
-	"enableAllBreakpoints": "Activer tous les points d'arrêt",
-	"disableAllBreakpoints": "Désactiver tous les points d'arrêt",
-	"activateBreakpoints": "Activer les points d'arrêt",
-	"deactivateBreakpoints": "Désactiver les points d'arrêt",
-	"reapplyAllBreakpoints": "Réappliquer tous les points d'arrêt",
-	"addFunctionBreakpoint": "Ajouter un point d'arrêt sur fonction",
-	"setValue": "Définir la valeur",
-	"addWatchExpression": "Ajouter une expression",
-	"editWatchExpression": "Modifier l'expression",
-	"addToWatchExpressions": "Ajouter à la fenêtre Espion",
-	"removeWatchExpression": "Supprimer une expression",
-	"removeAllWatchExpressions": "Supprimer toutes les expressions",
-	"clearRepl": "Effacer la console",
-	"debugConsoleAction": "Console de débogage",
-	"unreadOutput": "Nouvelle sortie dans la console de débogage",
-	"debugFocusConsole": "Focus sur la console de débogage",
-	"focusSession": "Focus Session",
-	"stepBackDebug": "Revenir en arrière",
-	"reverseContinue": "Inverser"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/debug/browser/debugActionsWidget.i18n.json b/i18n/fra/src/vs/workbench/parts/debug/browser/debugActionsWidget.i18n.json
deleted file mode 100644
index d9e1ffa4814..00000000000
--- a/i18n/fra/src/vs/workbench/parts/debug/browser/debugActionsWidget.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"debugToolBarBackground": "Couleur d'arrière-plan de la barre d'outils de débogage.",
-	"debugToolBarBorder": "Couleur de bordure de la barre d'outils de débogage."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/debug/browser/debugCommands.i18n.json b/i18n/fra/src/vs/workbench/parts/debug/browser/debugCommands.i18n.json
deleted file mode 100644
index 6e1e801b395..00000000000
--- a/i18n/fra/src/vs/workbench/parts/debug/browser/debugCommands.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noFolderDebugConfig": "Ouvrez d'abord un dossier pour effectuer une configuration de débogage avancée.",
-	"inlineBreakpoint": "Point d’arrêt Inline",
-	"debug": "Déboguer",
-	"addInlineBreakpoint": "Ajouter un point d’arrêt Inline"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/debug/browser/debugContentProvider.i18n.json b/i18n/fra/src/vs/workbench/parts/debug/browser/debugContentProvider.i18n.json
deleted file mode 100644
index 254fa67c192..00000000000
--- a/i18n/fra/src/vs/workbench/parts/debug/browser/debugContentProvider.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"unable": "Impossible de résoudre la ressource sans session de débogage",
-	"canNotResolveSource": "Impossible de résoudre la ressource {0}, aucune réponse de l'extension de débogage."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json b/i18n/fra/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
deleted file mode 100644
index c60cc41768e..00000000000
--- a/i18n/fra/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleBreakpointAction": "Déboguer : activer/désactiver un point d'arrêt",
-	"conditionalBreakpointEditorAction": "Déboguer : ajouter un point d'arrêt conditionnel...",
-	"logPointEditorAction": "Débogage : Ajouter un point de journalisation...",
-	"runToCursor": "Exécuter jusqu'au curseur",
-	"debugEvaluate": "Déboguer : évaluer",
-	"debugAddToWatch": "Déboguer : ajouter à la fenêtre Espion",
-	"showDebugHover": "Déboguer : afficher par pointage",
-	"goToNextBreakpoint": "Débogage : Aller au prochain point d’arrêt",
-	"goToPreviousBreakpoint": "Débogage : Aller au point d’arrêt précédent"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/debug/browser/debugEditorModelManager.i18n.json b/i18n/fra/src/vs/workbench/parts/debug/browser/debugEditorModelManager.i18n.json
deleted file mode 100644
index 8e1eb384b48..00000000000
--- a/i18n/fra/src/vs/workbench/parts/debug/browser/debugEditorModelManager.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"breakpointDisabledHover": "Point d'arrêt désactivé",
-	"breakpointUnverifieddHover": "Point d'arrêt non vérifié",
-	"breakpointDirtydHover": "Point d'arrêt non vérifié. Fichier modifié. Redémarrez la session de débogage.",
-	"breakpointUnsupported": "Les points d'arrêt conditionnels ne sont pas pris en charge par ce type de débogage"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/debug/browser/debugQuickOpen.i18n.json b/i18n/fra/src/vs/workbench/parts/debug/browser/debugQuickOpen.i18n.json
deleted file mode 100644
index 30908bd7437..00000000000
--- a/i18n/fra/src/vs/workbench/parts/debug/browser/debugQuickOpen.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"entryAriaLabel": "{0}, débogage",
-	"debugAriaLabel": "Tapez le nom d'une configuration de lancement à exécuter.",
-	"addConfigTo": "Ajouter une configuration ({0})...",
-	"addConfiguration": "Ajouter une configuration...",
-	"noConfigurationsMatching": "Aucune configuration de débogage correspondante",
-	"noConfigurationsFound": "Configurations de débogage introuvables. Créez un fichier 'launch.json'."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/debug/browser/debugStatus.i18n.json b/i18n/fra/src/vs/workbench/parts/debug/browser/debugStatus.i18n.json
deleted file mode 100644
index 285e9d06017..00000000000
--- a/i18n/fra/src/vs/workbench/parts/debug/browser/debugStatus.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"selectAndStartDebug": "Sélectionner et démarrer la configuration de débogage"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/debug/browser/debugViewlet.i18n.json b/i18n/fra/src/vs/workbench/parts/debug/browser/debugViewlet.i18n.json
deleted file mode 100644
index e5593382cbc..00000000000
--- a/i18n/fra/src/vs/workbench/parts/debug/browser/debugViewlet.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"startAdditionalSession": "Démarrer une Session supplémentaire",
-	"debugFocusVariablesView": "Focus sur les Variables",
-	"debugFocusWatchView": "Focus sur Watch",
-	"debugFocusCallStackView": "Focus sur CallStack",
-	"debugFocusBreakpointsView": "Focus sur les points d'arrêts"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/debug/browser/exceptionWidget.i18n.json b/i18n/fra/src/vs/workbench/parts/debug/browser/exceptionWidget.i18n.json
deleted file mode 100644
index bb9c485a9f1..00000000000
--- a/i18n/fra/src/vs/workbench/parts/debug/browser/exceptionWidget.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"debugExceptionWidgetBorder": "Couleur de bordure du widget d'exception.",
-	"debugExceptionWidgetBackground": "Couleur d'arrière-plan du widget d'exception.",
-	"exceptionThrownWithId": "Une exception s'est produite : {0}",
-	"exceptionThrown": "Une exception s'est produite"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/debug/browser/linkDetector.i18n.json b/i18n/fra/src/vs/workbench/parts/debug/browser/linkDetector.i18n.json
deleted file mode 100644
index 0244b55056c..00000000000
--- a/i18n/fra/src/vs/workbench/parts/debug/browser/linkDetector.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"fileLinkMac": "Cliquez pour suivre (Commande + clic permet d'ouvrir sur le côté)",
-	"fileLink": "Cliquez pour suivre (Ctrl + clic permet d'ouvrir sur le côté)"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/debug/browser/statusbarColorProvider.i18n.json b/i18n/fra/src/vs/workbench/parts/debug/browser/statusbarColorProvider.i18n.json
deleted file mode 100644
index a15f1f9ca32..00000000000
--- a/i18n/fra/src/vs/workbench/parts/debug/browser/statusbarColorProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"statusBarDebuggingBackground": "Couleur d'arrière-plan de la barre d'état quand un programme est en cours de débogage. La barre d'état est affichée en bas de la fenêtre",
-	"statusBarDebuggingForeground": "Couleur de premier plan de la barre d'état quand un programme est en cours de débogage. La barre d'état est affichée en bas de la fenêtre",
-	"statusBarDebuggingBorder": "Couleur de la bordure qui sépare à l’éditeur et la barre latérale quand un programme est en cours de débogage. La barre d’état s’affiche en bas de la fenêtre"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/debug/common/debug.i18n.json b/i18n/fra/src/vs/workbench/parts/debug/common/debug.i18n.json
deleted file mode 100644
index 6041a2ce1de..00000000000
--- a/i18n/fra/src/vs/workbench/parts/debug/common/debug.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"internalConsoleOptions": "Contrôle le comportement de la console de débogage interne."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/debug/common/debugModel.i18n.json b/i18n/fra/src/vs/workbench/parts/debug/common/debugModel.i18n.json
deleted file mode 100644
index 597b3b3e3c0..00000000000
--- a/i18n/fra/src/vs/workbench/parts/debug/common/debugModel.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"notAvailable": "non disponible",
-	"startDebugFirst": "Démarrez une session de débogage pour évaluation"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/debug/common/debugSchemas.i18n.json b/i18n/fra/src/vs/workbench/parts/debug/common/debugSchemas.i18n.json
deleted file mode 100644
index 9c4e7d29a65..00000000000
--- a/i18n/fra/src/vs/workbench/parts/debug/common/debugSchemas.i18n.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.contributes.debuggers": "Ajoute des adaptateurs de débogage.",
-	"vscode.extension.contributes.debuggers.type": "Identificateur unique de cet adaptateur de débogage.",
-	"vscode.extension.contributes.debuggers.label": "Nom complet de cet adaptateur de débogage.",
-	"vscode.extension.contributes.debuggers.program": "Chemin du programme de l'adaptateur de débogage. Le chemin est absolu ou relatif par rapport au dossier d'extensions.",
-	"vscode.extension.contributes.debuggers.args": "Arguments facultatifs à passer à l'adaptateur.",
-	"vscode.extension.contributes.debuggers.runtime": "Runtime facultatif, si l'attribut de programme n'est pas un exécutable, mais qu'il nécessite un exécutable.",
-	"vscode.extension.contributes.debuggers.runtimeArgs": "Arguments du runtime facultatif.",
-	"vscode.extension.contributes.debuggers.variables": "Mappage à partir de variables interactives (par exemple, ${action.pickProcess}) dans 'launch.json' vers une commande.",
-	"vscode.extension.contributes.debuggers.initialConfigurations": "Configurations pour la génération du fichier 'launch.json' initial.",
-	"vscode.extension.contributes.debuggers.languages": "Liste de langages pour lesquels l'extension de débogage peut être considérée comme \"débogueur par défaut\".",
-	"vscode.extension.contributes.debuggers.adapterExecutableCommand": "Si l'extension VS Code spécifiée appelle cette commande pour déterminer le chemin de l'exécutable de l'adaptateur de débogage et les arguments à passer.",
-	"vscode.extension.contributes.debuggers.configurationSnippets": "Extraits pour l'ajout de nouvelles configurations à 'launch.json'.",
-	"vscode.extension.contributes.debuggers.configurationAttributes": "Configurations de schéma JSON pour la validation de 'launch.json'.",
-	"vscode.extension.contributes.debuggers.windows": "Paramètres spécifiques à Windows.",
-	"vscode.extension.contributes.debuggers.windows.runtime": "Runtime utilisé pour Windows.",
-	"vscode.extension.contributes.debuggers.osx": "Paramètres spécifiques à macOS.",
-	"vscode.extension.contributes.debuggers.osx.runtime": "Runtime utilisé pour macOS.",
-	"vscode.extension.contributes.debuggers.linux": "Paramètres spécifiques à Linux.",
-	"vscode.extension.contributes.debuggers.linux.runtime": "Runtime utilisé pour Linux.",
-	"vscode.extension.contributes.breakpoints": "Ajoute des points d'arrêt.",
-	"vscode.extension.contributes.breakpoints.language": "Autorisez les points d'arrêt pour ce langage.",
-	"app.launch.json.title": "Lancer",
-	"app.launch.json.version": "Version de ce format de fichier.",
-	"app.launch.json.configurations": "Liste des configurations. Ajoutez de nouvelles configurations, ou modifiez celles qui existent déjà à l'aide d'IntelliSense.",
-	"app.launch.json.compounds": "Liste des composés. Chaque composé référence plusieurs configurations qui sont lancées ensemble.",
-	"app.launch.json.compound.name": "Nom du composé. Apparaît dans le menu déroulant de la configuration de lancement.",
-	"useUniqueNames": "Veuillez utiliser des noms de configuration uniques.",
-	"app.launch.json.compound.folder": "Nom du dossier dans lequel le composé se trouve.",
-	"app.launch.json.compounds.configurations": "Noms des configurations qui sont lancées dans le cadre de ce composé."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/debug/common/debugSource.i18n.json b/i18n/fra/src/vs/workbench/parts/debug/common/debugSource.i18n.json
deleted file mode 100644
index 09aa5a8ba63..00000000000
--- a/i18n/fra/src/vs/workbench/parts/debug/common/debugSource.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"unknownSource": "Source inconnue"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json b/i18n/fra/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
deleted file mode 100644
index 44f7ce035b6..00000000000
--- a/i18n/fra/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"breakpointWidgetLogMessagePlaceholder": "Message à loguer lorsque le point d’arrêt est atteint. Les expressions entre {} sont interpolées. 'Entrée' pour accepter,'Echap' pour annuler.",
-	"breakpointWidgetHitCountPlaceholder": "Arrêt quand le nombre d'accès est atteint. 'Entrée' pour accepter ou 'Échap' pour annuler.",
-	"breakpointWidgetExpressionPlaceholder": "Arrêt quand l'expression prend la valeur true. 'Entrée' pour accepter ou 'Échap' pour annuler.",
-	"expression": "Expression",
-	"hitCount": "Nombre d'accès",
-	"logMessage": "Message de log"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/debug/electron-browser/breakpointsView.i18n.json b/i18n/fra/src/vs/workbench/parts/debug/electron-browser/breakpointsView.i18n.json
deleted file mode 100644
index abf177eee31..00000000000
--- a/i18n/fra/src/vs/workbench/parts/debug/electron-browser/breakpointsView.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"editConditionalBreakpoint": "Modifier un point d'arrêt...",
-	"functionBreakpointsNotSupported": "Les points d'arrêt de fonction ne sont pas pris en charge par ce type de débogage",
-	"functionBreakpointPlaceholder": "Fonction où effectuer un point d'arrêt",
-	"functionBreakPointInputAriaLabel": "Point d'arrêt sur fonction de type"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/debug/electron-browser/callStackView.i18n.json b/i18n/fra/src/vs/workbench/parts/debug/electron-browser/callStackView.i18n.json
deleted file mode 100644
index 6c41f08a3aa..00000000000
--- a/i18n/fra/src/vs/workbench/parts/debug/electron-browser/callStackView.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"callstackSection": "Section de pile des appels",
-	"debugStopped": "En pause sur {0}",
-	"callStackAriaLabel": "Déboguer la pile des appels",
-	"session": "Session",
-	"paused": "Suspendu",
-	"running": "En cours d'exécution",
-	"thread": "Thread",
-	"pausedOn": "En pause sur {0}",
-	"loadMoreStackFrames": "Charger plus de frames de pile",
-	"threadAriaLabel": "Thread {0}, pile des appels, débogage",
-	"stackFrameAriaLabel": "Frame de pile {0}, ligne {1} {2}, pile des appels, débogage"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json b/i18n/fra/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
deleted file mode 100644
index 7ccd41c32f9..00000000000
--- a/i18n/fra/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleDebugViewlet": "Afficher le débogage",
-	"toggleDebugPanel": "Console de débogage",
-	"debug": "Déboguer",
-	"debugPanel": "Console de débogage",
-	"variables": "Variables",
-	"watch": "Espion",
-	"callStack": "Pile des appels",
-	"breakpoints": "Points d'arrêt",
-	"view": "Affichage",
-	"debugCategory": "Déboguer",
-	"debugCommands": "Configuration de débogage",
-	"debugConfigurationTitle": "Déboguer",
-	"allowBreakpointsEverywhere": "Permet de définir un point d'arrêt dans un fichier",
-	"openExplorerOnEnd": "Ouvrir automatiquement le mode explorateur à la fin d'une session de débogage",
-	"inlineValues": "Afficher les valeurs des variables inline dans l'éditeur pendant le débogage",
-	"toolBarLocation": "Contrôle l’emplacement de la barre d’outils de débogage. Soit \"floating\" dans toutes les vues, \"docked\" dans l’affichage de débogage, ou \"hidden\"",
-	"never": "Ne jamais afficher debug dans la barre d'état",
-	"always": "Toujours afficher debug dans la barre d’état",
-	"onFirstSessionStart": "Afficher debug dans seule la barre d’état après que le débogage a été lancé pour la première fois",
-	"showInStatusBar": "Contrôle quand la barre d’état de débogage doit être visible",
-	"openDebug": "Contrôle si la vue de débogage doit être ouverte au démarrage de la session de débogage.",
-	"enableAllHovers": "Contrôle si les non debug hovers doivent être activés pendant le débogage. Si true les fournisseurs hover seront appellés pour assurer un hover. Les hovers ordinaires ne seront pas affichés même si ce paramètre est true.",
-	"launch": "Configuration du lancement du débogage global. Doit être utilisée comme alternative à 'launch.json' qui est partagé entre les espaces de travail"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/debug/electron-browser/debugCommands.i18n.json b/i18n/fra/src/vs/workbench/parts/debug/electron-browser/debugCommands.i18n.json
deleted file mode 100644
index aa4d85529fe..00000000000
--- a/i18n/fra/src/vs/workbench/parts/debug/electron-browser/debugCommands.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noFolderDebugConfig": "Ouvrez d'abord un dossier pour effectuer une configuration de débogage avancée."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json b/i18n/fra/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json
deleted file mode 100644
index f911756f646..00000000000
--- a/i18n/fra/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"debugNoType": "Le 'type' de débogueur ne peut pas être omis et doit être de type 'string'.",
-	"selectDebug": "Sélectionner l'environnement",
-	"DebugConfig.failed": "Impossible de créer le fichier 'launch.json' dans le dossier '.vscode' ({0}).",
-	"workspace": "espace de travail",
-	"user settings": "paramètres utilisateur"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json b/i18n/fra/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
deleted file mode 100644
index c72f6ed1393..00000000000
--- a/i18n/fra/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"logPoint": "Point de journalisation",
-	"breakpoint": "Point d'arrêt",
-	"removeBreakpoint": "Supprimer {0}",
-	"editBreakpoint": "Modifier {0}...",
-	"disableBreakpoint": "Désactiver {0}",
-	"enableBreakpoint": "Activer {0}",
-	"removeBreakpoints": "Supprimer les points d'arrêt",
-	"removeInlineBreakpointOnColumn": "Supprimer le point d’arrêt Inline sur la colonne {0}",
-	"removeLineBreakpoint": "Supprimer le point d'arrêt de la ligne",
-	"editBreakpoints": "Modifier les points d'arrêt",
-	"editInlineBreakpointOnColumn": "Modifier le point d’arrêt Inline sur la colonne {0}",
-	"editLineBrekapoint": "Modifier le point d'arrêt de la ligne",
-	"enableDisableBreakpoints": "Activer/désactiver les points d'arrêt",
-	"disableInlineColumnBreakpoint": "Désactiver le point d’arrêt Inline sur la colonne {0}",
-	"disableBreakpointOnLine": "Désactiver le point d'arrêt de la ligne",
-	"enableBreakpoints": "Activer le point d’arrêt Inline sur la colonne {0}",
-	"enableBreakpointOnLine": "Activer le point d'arrêt de la ligne",
-	"addBreakpoint": "Ajouter un point d'arrêt",
-	"addConditionalBreakpoint": "Ajouter un point d'arrêt conditionnel...",
-	"addLogPoint": "Ajouter un point de journalisation...",
-	"breakpointHasCondition": "Ce {0} a un {1} qui sera perdu en cas de suppression. Désactivez le {0} à la place.",
-	"message": "message",
-	"condition": "condition",
-	"removeLogPoint": "Supprimer {0}",
-	"disableLogPoint": "Désactiver {0}",
-	"cancel": "Annuler",
-	"addConfiguration": "Ajouter une configuration..."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/debug/electron-browser/debugHover.i18n.json b/i18n/fra/src/vs/workbench/parts/debug/electron-browser/debugHover.i18n.json
deleted file mode 100644
index bfdae198bd1..00000000000
--- a/i18n/fra/src/vs/workbench/parts/debug/electron-browser/debugHover.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"treeAriaLabel": "Déboguer par pointage"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json b/i18n/fra/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
deleted file mode 100644
index dc9d0f20d0f..00000000000
--- a/i18n/fra/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"snapshotObj": "Seules les valeurs primitives sont affichées pour cet objet.",
-	"debuggingPaused": "Débogage en pause. Raison : {0}, {1} {2}",
-	"debuggingStarted": "Débogage démarré.",
-	"debuggingStopped": "Débogage arrêté.",
-	"breakpointAdded": "Point d'arrêt ajouté, ligne {0}, fichier {1}",
-	"breakpointRemoved": "Point d'arrêt supprimé, ligne {0}, fichier {1}",
-	"compoundMustHaveConfigurations": "L'attribut \"configurations\" du composé doit être défini pour permettre le démarrage de plusieurs configurations.",
-	"noConfigurationNameInWorkspace": "La configuration de lancement '{0}' est introuvable dans l’espace de travail.",
-	"multipleConfigurationNamesInWorkspace": "Il y a plusieurs configurations de lancement `{0}` dans l’espace de travail. Utilisez le nom du dossier pour qualifier la configuration.",
-	"noFolderWithName": "Impossible de trouver le dossier avec le nom '{0}' pour la configuration '{1}' dans le composé '{2}'.",
-	"configMissing": "Il manque la configuration '{0}' dans 'launch.json'.",
-	"launchJsonDoesNotExist": "'launch.json' n’existe pas.",
-	"debugRequestNotSupported": "L’attribut '{0}' a une valeur '{1}' non prise en charge dans la configuration de débogage sélectionnée.",
-	"debugRequesMissing": "L’attribut '{0}' est introuvable dans la configuration de débogage choisie.",
-	"debugTypeNotSupported": "Le type de débogage '{0}' configuré n'est pas pris en charge.",
-	"debugTypeMissing": "Propriété 'type' manquante pour la configuration de lancement choisie.",
-	"debugAnyway": "Déboguer quand même",
-	"preLaunchTaskErrors": "Des erreurs de build ont été détectées durant le preLaunchTask '{0}'.",
-	"preLaunchTaskError": "Une erreur de build a été détectée durant le preLaunchTask '{0}'.",
-	"preLaunchTaskExitCode": "Le preLaunchTask '{0}' s'est terminé avec le code de sortie {1}.",
-	"showErrors": "Afficher les erreurs",
-	"noFolderWorkspaceDebugError": "Impossible de déboguer le fichier actif. Vérifiez qu'il est enregistré sur le disque et qu'une extension de débogage est installée pour ce type de fichier.",
-	"cancel": "Annuler",
-	"DebugTaskNotFound": "Tâche '{0}' introuvable.",
-	"taskNotTracked": "La tâche '{0}' ne peut pas être tracée."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/debug/electron-browser/debugViewer.i18n.json b/i18n/fra/src/vs/workbench/parts/debug/electron-browser/debugViewer.i18n.json
deleted file mode 100644
index 1365a2b4c90..00000000000
--- a/i18n/fra/src/vs/workbench/parts/debug/electron-browser/debugViewer.i18n.json
+++ /dev/null
@@ -1,28 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"process": "Processus",
-	"paused": "Suspendu",
-	"running": "En cours d'exécution",
-	"thread": "Thread",
-	"pausedOn": "En pause sur {0}",
-	"loadMoreStackFrames": "Charger plus de frames de pile",
-	"threadAriaLabel": "Thread {0}, pile des appels, débogage",
-	"stackFrameAriaLabel": "Frame de pile {0}, ligne {1} {2}, pile des appels, débogage",
-	"variableValueAriaLabel": "Tapez une nouvelle valeur de variable",
-	"variableScopeAriaLabel": "Portée {0}, variables, débogage",
-	"variableAriaLabel": "{0} valeur {1}, variables, débogage",
-	"watchExpressionPlaceholder": "Expression à espionner",
-	"watchExpressionInputAriaLabel": "Tapez l'expression à espionner",
-	"watchExpressionAriaLabel": "{0} valeur {1}, espion, débogage",
-	"watchVariableAriaLabel": "{0} valeur {1}, espion, débogage",
-	"functionBreakpointPlaceholder": "Fonction où effectuer un point d'arrêt",
-	"functionBreakPointInputAriaLabel": "Point d'arrêt sur fonction de type",
-	"functionBreakpointsNotSupported": "Les points d'arrêt de fonction ne sont pas pris en charge par ce type de débogage",
-	"breakpointAriaLabel": "Ligne de point d'arrêt {0} {1}, points d'arrêt, débogage",
-	"functionBreakpointAriaLabel": "Point d'arrêt sur fonction {0}, points d'arrêt, débogage",
-	"exceptionBreakpointAriaLabel": "Point d'arrêt d'exception {0}, points d'arrêt, débogage"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/debug/electron-browser/debugViews.i18n.json b/i18n/fra/src/vs/workbench/parts/debug/electron-browser/debugViews.i18n.json
deleted file mode 100644
index 66ff22521aa..00000000000
--- a/i18n/fra/src/vs/workbench/parts/debug/electron-browser/debugViews.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"variablesSection": "Section des variables",
-	"variablesAriaTreeLabel": "Déboguer les variables",
-	"expressionsSection": "Section des expressions",
-	"watchAriaTreeLabel": "Déboguer les expressions espionnées",
-	"callstackSection": "Section de pile des appels",
-	"debugStopped": "En pause sur {0}",
-	"callStackAriaLabel": "Déboguer la pile des appels",
-	"breakpointsSection": "Section des points d'arrêt",
-	"breakpointsAriaTreeLabel": "Déboguer les points d'arrêt"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/debug/electron-browser/electronDebugActions.i18n.json b/i18n/fra/src/vs/workbench/parts/debug/electron-browser/electronDebugActions.i18n.json
deleted file mode 100644
index 93be98f6e5b..00000000000
--- a/i18n/fra/src/vs/workbench/parts/debug/electron-browser/electronDebugActions.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"copyValue": "Copier la valeur",
-	"copyAsExpression": "Copier en tant qu'Expression",
-	"copy": "Copier",
-	"copyAll": "Copier tout",
-	"copyStackTrace": "Copier la pile des appels"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/debug/electron-browser/rawDebugSession.i18n.json b/i18n/fra/src/vs/workbench/parts/debug/electron-browser/rawDebugSession.i18n.json
deleted file mode 100644
index c3efb42b047..00000000000
--- a/i18n/fra/src/vs/workbench/parts/debug/electron-browser/rawDebugSession.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"moreInfo": "Informations",
-	"debugAdapterCrash": "Le processus de l'adaptateur de débogage s'est terminé de manière inattendue"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/debug/electron-browser/repl.i18n.json b/i18n/fra/src/vs/workbench/parts/debug/electron-browser/repl.i18n.json
deleted file mode 100644
index a72e683a8b6..00000000000
--- a/i18n/fra/src/vs/workbench/parts/debug/electron-browser/repl.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"replAriaLabel": "Panneau REPL (Read Eval Print Loop)",
-	"actions.repl.historyPrevious": "Historique précédent",
-	"actions.repl.historyNext": "Historique suivant",
-	"actions.repl.acceptInput": "Accepter l'entrée REPL",
-	"actions.repl.copyAll": "Débogage : Tout copier (console)"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/debug/electron-browser/replViewer.i18n.json b/i18n/fra/src/vs/workbench/parts/debug/electron-browser/replViewer.i18n.json
deleted file mode 100644
index 8bb4bec5cf4..00000000000
--- a/i18n/fra/src/vs/workbench/parts/debug/electron-browser/replViewer.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"stateCapture": "L'état de l'objet est capturé à partir de la première évaluation",
-	"replVariableAriaLabel": "La variable {0} a la valeur {1}, boucle REPL (Read Eval Print Loop), débogage",
-	"replExpressionAriaLabel": "L'expression {0} a la valeur {1}, boucle REPL (Read Eval Print Loop), débogage",
-	"replValueOutputAriaLabel": "{0}, boucle REPL (Read Eval Print Loop), débogage",
-	"replRawObjectAriaLabel": "La variable Repl {0} a la valeur {1}, read eval print loop, débogage"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/debug/electron-browser/statusbarColorProvider.i18n.json b/i18n/fra/src/vs/workbench/parts/debug/electron-browser/statusbarColorProvider.i18n.json
deleted file mode 100644
index a15f1f9ca32..00000000000
--- a/i18n/fra/src/vs/workbench/parts/debug/electron-browser/statusbarColorProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"statusBarDebuggingBackground": "Couleur d'arrière-plan de la barre d'état quand un programme est en cours de débogage. La barre d'état est affichée en bas de la fenêtre",
-	"statusBarDebuggingForeground": "Couleur de premier plan de la barre d'état quand un programme est en cours de débogage. La barre d'état est affichée en bas de la fenêtre",
-	"statusBarDebuggingBorder": "Couleur de la bordure qui sépare à l’éditeur et la barre latérale quand un programme est en cours de débogage. La barre d’état s’affiche en bas de la fenêtre"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json b/i18n/fra/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json
deleted file mode 100644
index d0bcb578d2b..00000000000
--- a/i18n/fra/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"debug.terminal.title": "élément débogué"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/debug/electron-browser/variablesView.i18n.json b/i18n/fra/src/vs/workbench/parts/debug/electron-browser/variablesView.i18n.json
deleted file mode 100644
index 985c73f5018..00000000000
--- a/i18n/fra/src/vs/workbench/parts/debug/electron-browser/variablesView.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"variablesSection": "Section des variables",
-	"variablesAriaTreeLabel": "Déboguer les variables",
-	"variableValueAriaLabel": "Tapez une nouvelle valeur de variable",
-	"variableScopeAriaLabel": "Portée {0}, variables, débogage",
-	"variableAriaLabel": "{0} valeur {1}, variables, débogage"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/debug/electron-browser/watchExpressionsView.i18n.json b/i18n/fra/src/vs/workbench/parts/debug/electron-browser/watchExpressionsView.i18n.json
deleted file mode 100644
index 41f7922bdd6..00000000000
--- a/i18n/fra/src/vs/workbench/parts/debug/electron-browser/watchExpressionsView.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"expressionsSection": "Section des expressions",
-	"watchAriaTreeLabel": "Déboguer les expressions espionnées",
-	"watchExpressionPlaceholder": "Expression à espionner",
-	"watchExpressionInputAriaLabel": "Tapez l'expression à espionner",
-	"watchExpressionAriaLabel": "{0} valeur {1}, espion, débogage",
-	"watchVariableAriaLabel": "{0} valeur {1}, espion, débogage"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json b/i18n/fra/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
deleted file mode 100644
index 11c71d149dc..00000000000
--- a/i18n/fra/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"debugAdapterBinNotFound": "L'exécutable d'adaptateur de débogage '{0}' n'existe pas.",
-	"debugAdapterCannotDetermineExecutable": "Impossible de déterminer l'exécutable pour l'adaptateur de débogage '{0}'.",
-	"unableToLaunchDebugAdapter": "Impossible de lancer l'adaptateur de débogage à partir de '{0}'.",
-	"unableToLaunchDebugAdapterNoArgs": "Impossible de lancer l'adaptateur de débogage."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/debug/node/debugger.i18n.json b/i18n/fra/src/vs/workbench/parts/debug/node/debugger.i18n.json
deleted file mode 100644
index 6d5a247318d..00000000000
--- a/i18n/fra/src/vs/workbench/parts/debug/node/debugger.i18n.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"launch.config.comment1": "Utilisez IntelliSense pour en savoir plus sur les attributs possibles.",
-	"launch.config.comment2": "Pointez pour afficher la description des attributs existants.",
-	"launch.config.comment3": "Pour plus d'informations, visitez : {0}",
-	"debugType": "Type de configuration.",
-	"debugTypeNotRecognised": "Le type de débogage n'est pas reconnu. Vérifiez que vous avez installé l'extension de débogage correspondante et qu'elle est activée.",
-	"node2NotSupported": "\"node2\" n'est plus pris en charge. Utilisez \"node\" à la place, et affectez la valeur \"inspector\" à l'attribut \"protocol\".",
-	"debugName": "Le nom de la configuration s'affiche dans le menu déroulant de la configuration de lancement.",
-	"debugRequest": "Type de requête de configuration. Il peut s'agir de \"launch\" ou \"attach\".",
-	"debugServer": "Pour le développement d'une extension de débogage uniquement : si un port est spécifié, VS Code tente de se connecter à un adaptateur de débogage s'exécutant en mode serveur",
-	"debugPrelaunchTask": "Tâche à exécuter avant le démarrage de la session de débogage.",
-	"debugPostDebugTask": "Tâche à exécuter après que le débogage se termine.",
-	"debugWindowsConfiguration": "Attributs de configuration de lancement spécifiques à Windows.",
-	"debugOSXConfiguration": "Attributs de configuration de lancement spécifiques à OS X.",
-	"debugLinuxConfiguration": "Attributs de configuration de lancement spécifiques à Linux.",
-	"deprecatedVariables": "env.', 'config.' et 'command.' sont déconseillés. Utilisez 'env:', 'config:' et 'command:' à la place."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/debug/node/terminals.i18n.json b/i18n/fra/src/vs/workbench/parts/debug/node/terminals.i18n.json
deleted file mode 100644
index d7245a4f2e5..00000000000
--- a/i18n/fra/src/vs/workbench/parts/debug/node/terminals.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"console.title": "Console VS Code",
-	"mac.terminal.script.failed": "Échec du script '{0}'. Code de sortie : {1}",
-	"mac.terminal.type.not.supported": "'{0}' non pris en charge",
-	"press.any.key": "Appuyez sur une touche pour continuer...",
-	"linux.term.failed": "Échec de '{0}'. Code de sortie : {1}"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/emmet/browser/actions/showEmmetCommands.i18n.json b/i18n/fra/src/vs/workbench/parts/emmet/browser/actions/showEmmetCommands.i18n.json
deleted file mode 100644
index 6f2965e28b1..00000000000
--- a/i18n/fra/src/vs/workbench/parts/emmet/browser/actions/showEmmetCommands.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"showEmmetCommands": "Afficher les commandes Emmet"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/emmet/electron-browser/actions/balance.i18n.json b/i18n/fra/src/vs/workbench/parts/emmet/electron-browser/actions/balance.i18n.json
deleted file mode 100644
index b64bb8a15cc..00000000000
--- a/i18n/fra/src/vs/workbench/parts/emmet/electron-browser/actions/balance.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"balanceInward": "Emmet : Balance (inward)",
-	"balanceOutward": "Emmet : Balance (outward)"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/emmet/electron-browser/actions/editPoints.i18n.json b/i18n/fra/src/vs/workbench/parts/emmet/electron-browser/actions/editPoints.i18n.json
deleted file mode 100644
index ad194859cdc..00000000000
--- a/i18n/fra/src/vs/workbench/parts/emmet/electron-browser/actions/editPoints.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"previousEditPoint": "Emmet : Go to Previous Edit Point",
-	"nextEditPoint": "Emmet : Go to Next Edit Point"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/emmet/electron-browser/actions/evaluateMath.i18n.json b/i18n/fra/src/vs/workbench/parts/emmet/electron-browser/actions/evaluateMath.i18n.json
deleted file mode 100644
index 4f8041f2fb1..00000000000
--- a/i18n/fra/src/vs/workbench/parts/emmet/electron-browser/actions/evaluateMath.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"evaluateMathExpression": "Emmet : Evaluate Math Expression"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/emmet/electron-browser/actions/expandAbbreviation.i18n.json b/i18n/fra/src/vs/workbench/parts/emmet/electron-browser/actions/expandAbbreviation.i18n.json
deleted file mode 100644
index 88dfc418e1b..00000000000
--- a/i18n/fra/src/vs/workbench/parts/emmet/electron-browser/actions/expandAbbreviation.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"expandAbbreviationAction": "Emmet : Expand Abbreviation"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/emmet/electron-browser/actions/incrementDecrement.i18n.json b/i18n/fra/src/vs/workbench/parts/emmet/electron-browser/actions/incrementDecrement.i18n.json
deleted file mode 100644
index 89cee185d4d..00000000000
--- a/i18n/fra/src/vs/workbench/parts/emmet/electron-browser/actions/incrementDecrement.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"incrementNumberByOneTenth": "Emmet : Increment by 0.1",
-	"incrementNumberByOne": "Emmet : Increment by 1",
-	"incrementNumberByTen": "Emmet : Increment by 10",
-	"decrementNumberByOneTenth": "Emmet : Decrement by 0.1",
-	"decrementNumberByOne": "Emmet : Decrement by 1",
-	"decrementNumberByTen": "Emmet : Decrement by 10"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/emmet/electron-browser/actions/matchingPair.i18n.json b/i18n/fra/src/vs/workbench/parts/emmet/electron-browser/actions/matchingPair.i18n.json
deleted file mode 100644
index fd27599315a..00000000000
--- a/i18n/fra/src/vs/workbench/parts/emmet/electron-browser/actions/matchingPair.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"matchingPair": "Emmet : Go to Matching Pair"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/emmet/electron-browser/actions/mergeLines.i18n.json b/i18n/fra/src/vs/workbench/parts/emmet/electron-browser/actions/mergeLines.i18n.json
deleted file mode 100644
index 172231ee72c..00000000000
--- a/i18n/fra/src/vs/workbench/parts/emmet/electron-browser/actions/mergeLines.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"mergeLines": "Emmet : Merge Lines"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/emmet/electron-browser/actions/reflectCssValue.i18n.json b/i18n/fra/src/vs/workbench/parts/emmet/electron-browser/actions/reflectCssValue.i18n.json
deleted file mode 100644
index e15d8ff52bc..00000000000
--- a/i18n/fra/src/vs/workbench/parts/emmet/electron-browser/actions/reflectCssValue.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"reflectCSSValue": "Emmet : Reflect CSS Value"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/emmet/electron-browser/actions/removeTag.i18n.json b/i18n/fra/src/vs/workbench/parts/emmet/electron-browser/actions/removeTag.i18n.json
deleted file mode 100644
index 1764345605f..00000000000
--- a/i18n/fra/src/vs/workbench/parts/emmet/electron-browser/actions/removeTag.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"removeTag": "Emmet : Remove Tag"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/emmet/electron-browser/actions/selectItem.i18n.json b/i18n/fra/src/vs/workbench/parts/emmet/electron-browser/actions/selectItem.i18n.json
deleted file mode 100644
index b53add87909..00000000000
--- a/i18n/fra/src/vs/workbench/parts/emmet/electron-browser/actions/selectItem.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"selectPreviousItem": "Emmet : Select Previous Item",
-	"selectNextItem": "Emmet : Select Next Item"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/emmet/electron-browser/actions/splitJoinTag.i18n.json b/i18n/fra/src/vs/workbench/parts/emmet/electron-browser/actions/splitJoinTag.i18n.json
deleted file mode 100644
index 701bd61f9b9..00000000000
--- a/i18n/fra/src/vs/workbench/parts/emmet/electron-browser/actions/splitJoinTag.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"splitJoinTag": "Emmet : Split/Join Tag"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/emmet/electron-browser/actions/toggleComment.i18n.json b/i18n/fra/src/vs/workbench/parts/emmet/electron-browser/actions/toggleComment.i18n.json
deleted file mode 100644
index 46ab423bdfc..00000000000
--- a/i18n/fra/src/vs/workbench/parts/emmet/electron-browser/actions/toggleComment.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"toggleComment": "Emmet : Toggle Comment"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/emmet/electron-browser/actions/updateImageSize.i18n.json b/i18n/fra/src/vs/workbench/parts/emmet/electron-browser/actions/updateImageSize.i18n.json
deleted file mode 100644
index ce110b0e82d..00000000000
--- a/i18n/fra/src/vs/workbench/parts/emmet/electron-browser/actions/updateImageSize.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"updateImageSize": "Emmet : Update Image Size"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/emmet/electron-browser/actions/updateTag.i18n.json b/i18n/fra/src/vs/workbench/parts/emmet/electron-browser/actions/updateTag.i18n.json
deleted file mode 100644
index 948679f37cf..00000000000
--- a/i18n/fra/src/vs/workbench/parts/emmet/electron-browser/actions/updateTag.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"updateTag": "Emmet : Update Tag",
-	"enterTag": "Entrer une balise",
-	"tag": "Balise"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/emmet/electron-browser/actions/wrapWithAbbreviation.i18n.json b/i18n/fra/src/vs/workbench/parts/emmet/electron-browser/actions/wrapWithAbbreviation.i18n.json
deleted file mode 100644
index 4e4c925168c..00000000000
--- a/i18n/fra/src/vs/workbench/parts/emmet/electron-browser/actions/wrapWithAbbreviation.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"wrapWithAbbreviationAction": "Emmet : Wrap with Abbreviation",
-	"enterAbbreviation": "Entrer une abréviation",
-	"abbreviation": "Abréviation"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/emmet/electron-browser/emmet.contribution.i18n.json b/i18n/fra/src/vs/workbench/parts/emmet/electron-browser/emmet.contribution.i18n.json
deleted file mode 100644
index 2d849d42acd..00000000000
--- a/i18n/fra/src/vs/workbench/parts/emmet/electron-browser/emmet.contribution.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"emmetConfigurationTitle": "Emmet",
-	"triggerExpansionOnTab": "Une fois les abréviations Emmet activées, elles se développent quand vous appuyez sur la touche Tab. Non applicable quand emmet.useNewemmet est défini sur true.",
-	"emmetPreferences": "Préférences utilisées pour modifier le comportement de certaines actions et résolutions d'Emmet. Non applicable quand emmet.useNewemmet est défini sur true.",
-	"emmetSyntaxProfiles": "Définissez le profil pour la syntaxe spécifiée ou utilisez votre propre profil avec des règles spécifiques.",
-	"emmetExclude": "Ensemble de langages où les abréviations emmet ne doivent pas être développées.",
-	"emmetExtensionsPath": "Chemin d'un dossier contenant les profils, extraits de code et préférences Emmet. Seuls les profils sont honorés à partir du chemin des extensions quand emmet.useNewEmmet est défini sur true.",
-	"useNewEmmet": "Essayez les nouveaux modules Emmet (qui remplaceront à terme l'ancienne bibliothèque Emmet) pour toutes les fonctionnalités Emmet."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/emmet/node/actions/balance.i18n.json b/i18n/fra/src/vs/workbench/parts/emmet/node/actions/balance.i18n.json
deleted file mode 100644
index b64bb8a15cc..00000000000
--- a/i18n/fra/src/vs/workbench/parts/emmet/node/actions/balance.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"balanceInward": "Emmet : Balance (inward)",
-	"balanceOutward": "Emmet : Balance (outward)"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/emmet/node/actions/editPoints.i18n.json b/i18n/fra/src/vs/workbench/parts/emmet/node/actions/editPoints.i18n.json
deleted file mode 100644
index a8c57987711..00000000000
--- a/i18n/fra/src/vs/workbench/parts/emmet/node/actions/editPoints.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"previousEditPoint": "Emmet : Previous Edit Point",
-	"nextEditPoint": "Emmet : Next Edit Point"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/emmet/node/actions/evaluateMath.i18n.json b/i18n/fra/src/vs/workbench/parts/emmet/node/actions/evaluateMath.i18n.json
deleted file mode 100644
index 4f8041f2fb1..00000000000
--- a/i18n/fra/src/vs/workbench/parts/emmet/node/actions/evaluateMath.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"evaluateMathExpression": "Emmet : Evaluate Math Expression"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/emmet/node/actions/expandAbbreviation.i18n.json b/i18n/fra/src/vs/workbench/parts/emmet/node/actions/expandAbbreviation.i18n.json
deleted file mode 100644
index 29b06df4dce..00000000000
--- a/i18n/fra/src/vs/workbench/parts/emmet/node/actions/expandAbbreviation.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"expandAbbreviationAction": "Emmet : Expand Abbreviation"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/emmet/node/actions/incrementDecrement.i18n.json b/i18n/fra/src/vs/workbench/parts/emmet/node/actions/incrementDecrement.i18n.json
deleted file mode 100644
index 89cee185d4d..00000000000
--- a/i18n/fra/src/vs/workbench/parts/emmet/node/actions/incrementDecrement.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"incrementNumberByOneTenth": "Emmet : Increment by 0.1",
-	"incrementNumberByOne": "Emmet : Increment by 1",
-	"incrementNumberByTen": "Emmet : Increment by 10",
-	"decrementNumberByOneTenth": "Emmet : Decrement by 0.1",
-	"decrementNumberByOne": "Emmet : Decrement by 1",
-	"decrementNumberByTen": "Emmet : Decrement by 10"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/emmet/node/actions/matchingPair.i18n.json b/i18n/fra/src/vs/workbench/parts/emmet/node/actions/matchingPair.i18n.json
deleted file mode 100644
index fd27599315a..00000000000
--- a/i18n/fra/src/vs/workbench/parts/emmet/node/actions/matchingPair.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"matchingPair": "Emmet : Go to Matching Pair"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/emmet/node/actions/mergeLines.i18n.json b/i18n/fra/src/vs/workbench/parts/emmet/node/actions/mergeLines.i18n.json
deleted file mode 100644
index 172231ee72c..00000000000
--- a/i18n/fra/src/vs/workbench/parts/emmet/node/actions/mergeLines.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"mergeLines": "Emmet : Merge Lines"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/emmet/node/actions/reflectCssValue.i18n.json b/i18n/fra/src/vs/workbench/parts/emmet/node/actions/reflectCssValue.i18n.json
deleted file mode 100644
index e15d8ff52bc..00000000000
--- a/i18n/fra/src/vs/workbench/parts/emmet/node/actions/reflectCssValue.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"reflectCSSValue": "Emmet : Reflect CSS Value"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/emmet/node/actions/removeTag.i18n.json b/i18n/fra/src/vs/workbench/parts/emmet/node/actions/removeTag.i18n.json
deleted file mode 100644
index 1764345605f..00000000000
--- a/i18n/fra/src/vs/workbench/parts/emmet/node/actions/removeTag.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"removeTag": "Emmet : Remove Tag"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/emmet/node/actions/selectItem.i18n.json b/i18n/fra/src/vs/workbench/parts/emmet/node/actions/selectItem.i18n.json
deleted file mode 100644
index b53add87909..00000000000
--- a/i18n/fra/src/vs/workbench/parts/emmet/node/actions/selectItem.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"selectPreviousItem": "Emmet : Select Previous Item",
-	"selectNextItem": "Emmet : Select Next Item"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/emmet/node/actions/splitJoinTag.i18n.json b/i18n/fra/src/vs/workbench/parts/emmet/node/actions/splitJoinTag.i18n.json
deleted file mode 100644
index 701bd61f9b9..00000000000
--- a/i18n/fra/src/vs/workbench/parts/emmet/node/actions/splitJoinTag.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"splitJoinTag": "Emmet : Split/Join Tag"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/emmet/node/actions/toggleComment.i18n.json b/i18n/fra/src/vs/workbench/parts/emmet/node/actions/toggleComment.i18n.json
deleted file mode 100644
index 46ab423bdfc..00000000000
--- a/i18n/fra/src/vs/workbench/parts/emmet/node/actions/toggleComment.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"toggleComment": "Emmet : Toggle Comment"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/emmet/node/actions/updateImageSize.i18n.json b/i18n/fra/src/vs/workbench/parts/emmet/node/actions/updateImageSize.i18n.json
deleted file mode 100644
index ce110b0e82d..00000000000
--- a/i18n/fra/src/vs/workbench/parts/emmet/node/actions/updateImageSize.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"updateImageSize": "Emmet : Update Image Size"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/emmet/node/actions/updateTag.i18n.json b/i18n/fra/src/vs/workbench/parts/emmet/node/actions/updateTag.i18n.json
deleted file mode 100644
index 948679f37cf..00000000000
--- a/i18n/fra/src/vs/workbench/parts/emmet/node/actions/updateTag.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"updateTag": "Emmet : Update Tag",
-	"enterTag": "Entrer une balise",
-	"tag": "Balise"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/emmet/node/actions/wrapWithAbbreviation.i18n.json b/i18n/fra/src/vs/workbench/parts/emmet/node/actions/wrapWithAbbreviation.i18n.json
deleted file mode 100644
index 4e4c925168c..00000000000
--- a/i18n/fra/src/vs/workbench/parts/emmet/node/actions/wrapWithAbbreviation.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"wrapWithAbbreviationAction": "Emmet : Wrap with Abbreviation",
-	"enterAbbreviation": "Entrer une abréviation",
-	"abbreviation": "Abréviation"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/emmet/node/emmet.contribution.i18n.json b/i18n/fra/src/vs/workbench/parts/emmet/node/emmet.contribution.i18n.json
deleted file mode 100644
index 33db3866d0c..00000000000
--- a/i18n/fra/src/vs/workbench/parts/emmet/node/emmet.contribution.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"emmetConfigurationTitle": "Emmet",
-	"triggerExpansionOnTab": "Une fois les abréviations Emmet activées, elles se développent quand vous appuyez sur la touche Tab.",
-	"emmetPreferences": "Préférences utilisées pour modifier le comportement de certaines actions et résolveurs d'Emmet.",
-	"emmetSyntaxProfiles": "Définissez le profil pour la syntaxe spécifiée ou utilisez votre propre profil avec des règles spécifiques.",
-	"emmetExclude": "Ensemble de langages où les abréviations emmet ne doivent pas être développées.",
-	"emmetExtensionsPath": "Chemin d'un dossier contenant les profils, extraits et préférences Emmet"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json b/i18n/fra/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
deleted file mode 100644
index 3551b5e0364..00000000000
--- a/i18n/fra/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"terminalConfigurationTitle": "Terminal externe",
-	"explorer.openInTerminalKind": "Personnalise le type de terminal à lancer.",
-	"terminal.external.windowsExec": "Personnalise le terminal à exécuter sur Windows.",
-	"terminal.external.osxExec": "Personnalise l'application de terminal à exécuter sur OS X.",
-	"terminal.external.linuxExec": "Personnalise le terminal à exécuter sur Linux.",
-	"globalConsoleActionWin": "Ouvrir une nouvelle invite de commandes",
-	"globalConsoleActionMacLinux": "Ouvrir un nouveau Terminal",
-	"scopedConsoleActionWin": "Ouvrir dans l'invite de commandes",
-	"scopedConsoleActionMacLinux": "Ouvrir dans Terminal"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/execution/electron-browser/terminal.contribution.i18n.json b/i18n/fra/src/vs/workbench/parts/execution/electron-browser/terminal.contribution.i18n.json
deleted file mode 100644
index 9f6de7684f3..00000000000
--- a/i18n/fra/src/vs/workbench/parts/execution/electron-browser/terminal.contribution.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"terminalConfigurationTitle": "Terminal externe",
-	"terminal.external.windowsExec": "Personnalise le terminal à exécuter sur Windows.",
-	"terminal.external.osxExec": "Personnalise l'application de terminal à exécuter sur OS X.",
-	"terminal.external.linuxExec": "Personnalise le terminal à exécuter sur Linux.",
-	"globalConsoleActionWin": "Ouvrir une nouvelle invite de commandes",
-	"globalConsoleActionMacLinux": "Ouvrir un nouveau Terminal",
-	"scopedConsoleActionWin": "Ouvrir dans l'invite de commandes",
-	"scopedConsoleActionMacLinux": "Ouvrir dans Terminal"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/execution/electron-browser/terminalService.i18n.json b/i18n/fra/src/vs/workbench/parts/execution/electron-browser/terminalService.i18n.json
deleted file mode 100644
index d7245a4f2e5..00000000000
--- a/i18n/fra/src/vs/workbench/parts/execution/electron-browser/terminalService.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"console.title": "Console VS Code",
-	"mac.terminal.script.failed": "Échec du script '{0}'. Code de sortie : {1}",
-	"mac.terminal.type.not.supported": "'{0}' non pris en charge",
-	"press.any.key": "Appuyez sur une touche pour continuer...",
-	"linux.term.failed": "Échec de '{0}'. Code de sortie : {1}"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/explorers/browser/treeExplorer.contribution.i18n.json b/i18n/fra/src/vs/workbench/parts/explorers/browser/treeExplorer.contribution.i18n.json
deleted file mode 100644
index 82bea9c4375..00000000000
--- a/i18n/fra/src/vs/workbench/parts/explorers/browser/treeExplorer.contribution.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"vscode.extension.contributes.view": "Ajoute une vue personnalisée",
-	"vscode.extension.contributes.view.id": "ID unique utilisé pour identifier la vue créée avec vscode.workspace.createTreeView",
-	"vscode.extension.contributes.view.label": "Chaîne contrôlable de visu permettant d'afficher la vue",
-	"vscode.extension.contributes.view.icon": "Chemin de l'icône de la vue",
-	"vscode.extension.contributes.views": "Ajoute des vues personnalisées",
-	"showViewlet": "Afficher {0}",
-	"view": "Affichage"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/explorers/browser/treeExplorerActions.i18n.json b/i18n/fra/src/vs/workbench/parts/explorers/browser/treeExplorerActions.i18n.json
deleted file mode 100644
index a6e6588d9c3..00000000000
--- a/i18n/fra/src/vs/workbench/parts/explorers/browser/treeExplorerActions.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"refresh": "Actualiser"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/explorers/browser/treeExplorerService.i18n.json b/i18n/fra/src/vs/workbench/parts/explorers/browser/treeExplorerService.i18n.json
deleted file mode 100644
index a248b7ddb83..00000000000
--- a/i18n/fra/src/vs/workbench/parts/explorers/browser/treeExplorerService.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"treeExplorer.noMatchingProviderId": "Aucun TreeExplorerNodeProvider ayant l'ID {providerId} n'est inscrit."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/explorers/browser/views/treeExplorerView.i18n.json b/i18n/fra/src/vs/workbench/parts/explorers/browser/views/treeExplorerView.i18n.json
deleted file mode 100644
index 78627d5d6f2..00000000000
--- a/i18n/fra/src/vs/workbench/parts/explorers/browser/views/treeExplorerView.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"treeExplorerViewlet.tree": "Section Tree Explorer"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/extensions/browser/dependenciesViewer.i18n.json b/i18n/fra/src/vs/workbench/parts/extensions/browser/dependenciesViewer.i18n.json
deleted file mode 100644
index 8bc4073212b..00000000000
--- a/i18n/fra/src/vs/workbench/parts/extensions/browser/dependenciesViewer.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"error": "Erreur",
-	"Unknown Dependency": "Dépendance inconnue :"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json b/i18n/fra/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json
deleted file mode 100644
index 7c8133234c3..00000000000
--- a/i18n/fra/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"name": "Nom de l'extension",
-	"extension id": "Identificateur d'extension",
-	"preview": "Aperçu",
-	"builtin": "Intégrée",
-	"publisher": "Nom de l'éditeur",
-	"install count": "Nombre d'installations",
-	"rating": "Évaluation",
-	"repository": "Dépôt",
-	"license": "Licence",
-	"details": "Détails",
-	"contributions": "Contributions",
-	"changelog": "Journal des modifications",
-	"dependencies": "Dépendances",
-	"noReadme": "Aucun fichier README disponible.",
-	"noChangelog": "Aucun Changelog disponible.",
-	"noContributions": "Aucune contribution",
-	"noDependencies": "Aucune dépendance",
-	"settings": "Paramètres ({0})",
-	"setting name": "Nom",
-	"description": "Description",
-	"default": "Par défaut",
-	"debuggers": "Débogueurs ({0})",
-	"debugger name": "Nom",
-	"debugger type": "Type",
-	"views": "Vues ({0})",
-	"view id": "ID",
-	"view name": "Nom",
-	"view location": "Emplacement",
-	"localizations": "Localisations ({0})",
-	"localizations language id": "Id de langue",
-	"localizations language name": "Nom de langue",
-	"localizations localized language name": "Nom de langue (localisé)",
-	"colorThemes": "Thèmes de couleurs ({0})",
-	"iconThemes": "Thèmes d’icônes ({0})",
-	"colors": "Couleurs ({0})",
-	"colorId": "Id",
-	"defaultDark": "Défaut pour le thème sombre",
-	"defaultLight": "Défaut pour le thème clair",
-	"defaultHC": "Défaut pour le thème de contraste élevé",
-	"JSON Validation": "Validation JSON ({0})",
-	"fileMatch": "Correspondance de fichier",
-	"schema": "Schéma",
-	"commands": "Commandes ({0})",
-	"command name": "Nom",
-	"keyboard shortcuts": "Raccourcis clavier",
-	"menuContexts": "Contextes de menu",
-	"languages": "Langages ({0})",
-	"language id": "ID",
-	"language name": "Nom",
-	"file extensions": "Extensions de fichier",
-	"grammar": "Grammaire",
-	"snippets": "Extraits"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json b/i18n/fra/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
deleted file mode 100644
index 0057e22b4a8..00000000000
--- a/i18n/fra/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
+++ /dev/null
@@ -1,81 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"download": "Télécharger manuellement",
-	"install vsix": "Une fois téléchargé, installez manuellement le VSIX de '{0}'.",
-	"installAction": "Installer",
-	"installing": "Installation",
-	"failedToInstall": "Échec d'installation de '{0}'.",
-	"uninstallAction": "Désinstaller",
-	"Uninstalling": "Désinstallation en cours",
-	"updateAction": "Mettre à jour",
-	"updateTo": "Mettre à jour vers {0}",
-	"failedToUpdate": "Échec de mise à jour de '{0}'.",
-	"ManageExtensionAction.uninstallingTooltip": "Désinstallation en cours",
-	"enableForWorkspaceAction": "Activer (espace de travail)",
-	"enableGloballyAction": "Activer",
-	"enableAction": "Activer",
-	"disableForWorkspaceAction": "Désactiver (espace de travail)",
-	"disableGloballyAction": "Désactiver",
-	"disableAction": "Désactiver",
-	"checkForUpdates": "Rechercher les mises à jour",
-	"enableAutoUpdate": "Activer la mise à jour automatique des extensions",
-	"disableAutoUpdate": "Désactiver la mise à jour automatique des extensions",
-	"updateAll": "Mettre à jour toutes les extensions",
-	"reloadAction": "Recharger",
-	"postUpdateTooltip": "Recharger pour mettre à jour",
-	"postUpdateMessage": "Recharger cette fenêtre pour activer l'extension mise à jour '{0}' ?",
-	"postEnableTooltip": "Recharger pour activer",
-	"postEnableMessage": "Recharger cette fenêtre pour activer l'extension '{0}' ?",
-	"postDisableTooltip": "Recharger pour désactiver",
-	"postDisableMessage": "Recharger cette fenêtre pour désactiver l'extension '{0}' ?",
-	"postUninstallTooltip": "Recharger pour désactiver",
-	"postUninstallMessage": "Recharger cette fenêtre pour désactiver l'extension désinstallée '{0}' ?",
-	"toggleExtensionsViewlet": "Afficher les extensions",
-	"installExtensions": "Installer les extensions",
-	"showEnabledExtensions": "Afficher les Extensions activées",
-	"showInstalledExtensions": "Afficher les extensions installées",
-	"showDisabledExtensions": "Afficher les extensions désactivées",
-	"clearExtensionsInput": "Effacer l'entrée des extensions",
-	"showBuiltInExtensions": "Afficher les extensions intégrées",
-	"showOutdatedExtensions": "Afficher les extensions obsolètes",
-	"showPopularExtensions": "Afficher les extensions les plus demandées",
-	"showRecommendedExtensions": "Afficher les extensions recommandées",
-	"installWorkspaceRecommendedExtensions": "Installer toutes les Extensions recommandées pour l'espace de travail",
-	"allExtensionsInstalled": "Toutes les extensions recommandées pour cet espace de travail ont déjà été installées",
-	"installRecommendedExtension": "Installer l'Extension Recommandée",
-	"extensionInstalled": "L’extension recommandée est déjà installée",
-	"showRecommendedKeymapExtensionsShort": "Mappages de touches",
-	"showLanguageExtensionsShort": "Extensions de langage",
-	"showAzureExtensionsShort": "Extensions Azure",
-	"OpenExtensionsFile.failed": "Impossible de créer le fichier 'extensions.json' dans le dossier '.vscode' ({0}).",
-	"configureWorkspaceRecommendedExtensions": "Configurer les extensions recommandées (espace de travail)",
-	"configureWorkspaceFolderRecommendedExtensions": "Configurer les extensions recommandées (Dossier d'espace de travail)",
-	"malicious tooltip": "Cette extension a été signalée comme problématique.",
-	"malicious": "Malveillant",
-	"disabled": "Désactivé",
-	"disabled globally": "Désactivé",
-	"disabled workspace": "Désactivé pour cet espace de travail",
-	"disableAll": "Désactiver toutes les extensions installées",
-	"disableAllWorkspace": "Désactiver toutes les extensions installées pour cet espace de travail",
-	"enableAll": "Activer toutes les extension",
-	"enableAllWorkspace": "Activer toutes les extensions pour cet espace de travail",
-	"openExtensionsFolder": "Ouvrir le dossier d'extensions",
-	"installVSIX": "Installer depuis un VSIX...",
-	"installFromVSIX": "Installer à partir d'un VSIX",
-	"installButton": "&&Installer",
-	"InstallVSIXAction.success": "Installation réussie de l'extension. Recharger pour l'activer.",
-	"InstallVSIXAction.reloadNow": "Recharger maintenant",
-	"reinstall": "Réinstallez l'extension...",
-	"selectExtension": "Sélectionner l'extension à réinstaller",
-	"ReinstallAction.success": "Extension réinstallée.",
-	"ReinstallAction.reloadNow": "Recharger maintenant",
-	"extensionButtonProminentBackground": "Couleur d'arrière-plan du bouton pour les extension d'actions importantes (par ex., le bouton d'installation).",
-	"extensionButtonProminentForeground": "Couleur d'arrière-plan du bouton pour l'extension d'actions importantes (par ex., le bouton d'installation).",
-	"extensionButtonProminentHoverBackground": "Couleur d'arrière-plan du pointage de bouton pour l'extension d'actions importantes (par ex., le bouton d'installation)."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/extensions/browser/extensionsList.i18n.json b/i18n/fra/src/vs/workbench/parts/extensions/browser/extensionsList.i18n.json
deleted file mode 100644
index c2bf78ba750..00000000000
--- a/i18n/fra/src/vs/workbench/parts/extensions/browser/extensionsList.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"recommended": "Recommandées"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/extensions/browser/extensionsQuickOpen.i18n.json b/i18n/fra/src/vs/workbench/parts/extensions/browser/extensionsQuickOpen.i18n.json
deleted file mode 100644
index 44ba55959e7..00000000000
--- a/i18n/fra/src/vs/workbench/parts/extensions/browser/extensionsQuickOpen.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"manage": "Appuyez sur Entrée pour gérer vos extensions.",
-	"notfound": "Extension '{0}' introuvable dans le Marketplace.",
-	"install": "Appuyez sur entrée pour installer '{0}' depuis le Marketplace.",
-	"searchFor": "Appuyez sur Entrée pour rechercher '{0}' dans le Marketplace.",
-	"noExtensionsToInstall": "Tapez un nom d'extension"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/extensions/browser/extensionsWidgets.i18n.json b/i18n/fra/src/vs/workbench/parts/extensions/browser/extensionsWidgets.i18n.json
deleted file mode 100644
index b7e49db4078..00000000000
--- a/i18n/fra/src/vs/workbench/parts/extensions/browser/extensionsWidgets.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"ratedByUsers": "Évaluée par {0} utilisateurs",
-	"ratedBySingleUser": "Évaluée par 1 utilisateur"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/extensions/common/extensionsFileTemplate.i18n.json b/i18n/fra/src/vs/workbench/parts/extensions/common/extensionsFileTemplate.i18n.json
deleted file mode 100644
index 3e49f8ca65c..00000000000
--- a/i18n/fra/src/vs/workbench/parts/extensions/common/extensionsFileTemplate.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"app.extensions.json.title": "Extensions",
-	"app.extensions.json.recommendations": "Liste des recommandations d'extensions. L'identificateur d'une extension est toujours '${publisher}.${name}'. Exemple : 'vscode.csharp'.",
-	"app.extension.identifier.errorMessage": "Format attendu : '${publisher}.${name}'. Exemple : 'vscode.csharp'."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/extensions/common/extensionsInput.i18n.json b/i18n/fra/src/vs/workbench/parts/extensions/common/extensionsInput.i18n.json
deleted file mode 100644
index c4b0a5b9f4f..00000000000
--- a/i18n/fra/src/vs/workbench/parts/extensions/common/extensionsInput.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"extensionsInputName": "Extension : {0}"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json b/i18n/fra/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
deleted file mode 100644
index 0c89b62126c..00000000000
--- a/i18n/fra/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
+++ /dev/null
@@ -1,69 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"name": "Nom de l'extension",
-	"extension id": "Identificateur d'extension",
-	"preview": "Aperçu",
-	"builtin": "Intégrée",
-	"publisher": "Nom de l'éditeur",
-	"install count": "Nombre d'installations",
-	"rating": "Évaluation",
-	"repository": "Dépôt",
-	"license": "Licence",
-	"details": "Détails",
-	"detailstooltip": "Détails de l’extension, affichés depuis le fichier 'README.md' de l’extension",
-	"contributions": "Contributions",
-	"contributionstooltip": "Listes des contributions à VS Code par cette extension",
-	"changelog": "Journal des modifications",
-	"changelogtooltip": "Historique de mise à jour de de l'extension, affiché depuis le fichier 'CHANGELOG.md' de l’extension",
-	"dependencies": "Dépendances",
-	"dependenciestooltip": "Répertorie les extensions dont dépend cette extension",
-	"noReadme": "Aucun fichier README disponible.",
-	"noChangelog": "Aucun Changelog disponible.",
-	"noContributions": "Aucune contribution",
-	"noDependencies": "Aucune dépendance",
-	"settings": "Paramètres ({0})",
-	"setting name": "Nom",
-	"description": "Description",
-	"default": "Par défaut",
-	"debuggers": "Débogueurs ({0})",
-	"debugger name": "Nom",
-	"debugger type": "Type",
-	"viewContainers": "Voir les conteneurs ({0})",
-	"view container id": "ID",
-	"view container title": "Titre",
-	"view container location": "Emplacement",
-	"views": "Vues ({0})",
-	"view id": "ID",
-	"view name": "Nom",
-	"view location": "Emplacement",
-	"localizations": "Localisations ({0})",
-	"localizations language id": "Id de langue",
-	"localizations language name": "Nom de la langue",
-	"localizations localized language name": "Nom de la langue (localisé)",
-	"colorThemes": "Thèmes de couleurs ({0})",
-	"iconThemes": "Thèmes d’icônes ({0})",
-	"colors": "Couleurs ({0})",
-	"colorId": "Id",
-	"defaultDark": "Défaut pour le thème sombre",
-	"defaultLight": "Défaut pour le thème clair",
-	"defaultHC": "Défaut pour le thème de contraste élevé",
-	"JSON Validation": "Validation JSON ({0})",
-	"fileMatch": "Correspondance de fichier",
-	"schema": "Schéma",
-	"commands": "Commandes ({0})",
-	"command name": "Nom",
-	"keyboard shortcuts": "Raccourcis clavier",
-	"menuContexts": "Contextes de menu",
-	"languages": "Langages ({0})",
-	"language id": "ID",
-	"language name": "Nom",
-	"file extensions": "Extensions de fichier",
-	"grammar": "Grammaire",
-	"snippets": "Extraits"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/extensions/electron-browser/extensionProfileService.i18n.json b/i18n/fra/src/vs/workbench/parts/extensions/electron-browser/extensionProfileService.i18n.json
deleted file mode 100644
index 8968ae34eb7..00000000000
--- a/i18n/fra/src/vs/workbench/parts/extensions/electron-browser/extensionProfileService.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"restart1": "Profiler les extensions",
-	"restart2": "Un redémarrage est nécessaire pour profiler les extensions. Voulez-vous redémarrer '{0}' maintenant ?",
-	"restart3": "Redémarrer",
-	"cancel": "Annuler",
-	"selectAndStartDebug": "Cliquer pour arrêter le profilage"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json b/i18n/fra/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
deleted file mode 100644
index 3c10fdb84d0..00000000000
--- a/i18n/fra/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"neverShowAgain": "Ne plus afficher",
-	"searchMarketplace": "Rechercher dans le Marketplace",
-	"dynamicWorkspaceRecommendation": "Cette extension peut vous intéresser car elle est populaire parmi les utilisateurs du dépôt {0}.",
-	"exeBasedRecommendation": "Cette extension est recommandée parce que {0} est installé.",
-	"fileBasedRecommendation": "Cette extension est recommandée basé sur les fichiers que vous avez ouverts récemment.",
-	"workspaceRecommendation": "Cette extension est recommandée par les utilisateurs de l’espace de travail actuel.",
-	"reallyRecommended2": "L'extension '{0}' est recommandée pour ce type de fichier.",
-	"reallyRecommendedExtensionPack": "Le pack d’extensions '{0}' est recommandé pour ce type de fichier.",
-	"install": "Installer",
-	"showRecommendations": "Afficher les recommandations",
-	"showLanguageExtensions": "Le Marketplace a des extensions qui peuvent aider avec les fichiers '.{0}'",
-	"workspaceRecommended": "Cet espace de travail a des recommandations d'extension.",
-	"installAll": "Tout installer",
-	"ignoreExtensionRecommendations": "Voulez-vous ignorer toutes les recommandations d’extensions ?",
-	"ignoreAll": "Oui, ignorer tout",
-	"no": "Non"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/extensions/electron-browser/extensions.contribution.i18n.json b/i18n/fra/src/vs/workbench/parts/extensions/electron-browser/extensions.contribution.i18n.json
deleted file mode 100644
index 18c2aa1a49c..00000000000
--- a/i18n/fra/src/vs/workbench/parts/extensions/electron-browser/extensions.contribution.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"extensionsCommands": "Gérer les extensions",
-	"galleryExtensionsCommands": "Installer les extensions de la galerie",
-	"extension": "Extension",
-	"runtimeExtension": "Extensions en cours d’exécution",
-	"extensions": "Extensions",
-	"view": "Affichage",
-	"developer": "Développeur",
-	"extensionsConfigurationTitle": "Extensions",
-	"extensionsAutoUpdate": "Mettre à jour automatiquement les extensions",
-	"extensionsIgnoreRecommendations": "Si la valeur est à true, les notifications de recommandations d'extension cessera d'apparaître.",
-	"extensionsShowRecommendationsOnlyOnDemand": "Si défini à true, les recommandations ne seront pas récupérées ou affichées à moins d'être spécifiquement demandées par l'utilisateur."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.i18n.json b/i18n/fra/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.i18n.json
deleted file mode 100644
index 9e78a6f6039..00000000000
--- a/i18n/fra/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openExtensionsFolder": "Ouvrir le dossier d'extensions",
-	"installVSIX": "Installer depuis un VSIX...",
-	"installFromVSIX": "Installer à partir d'un VSIX",
-	"installButton": "&&Installer",
-	"InstallVSIXAction.success": "Installation réussie de l'extension. Recharger pour l'activer.",
-	"InstallVSIXAction.reloadNow": "Recharger maintenant"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/extensions/electron-browser/extensionsUtils.i18n.json b/i18n/fra/src/vs/workbench/parts/extensions/electron-browser/extensionsUtils.i18n.json
deleted file mode 100644
index f36787aa87c..00000000000
--- a/i18n/fra/src/vs/workbench/parts/extensions/electron-browser/extensionsUtils.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"disableOtherKeymapsConfirmation": "Désactiver les autres mappages de touches ({0}) pour éviter les conflits de combinaisons de touches ?",
-	"yes": "Oui",
-	"no": "Non"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json b/i18n/fra/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
deleted file mode 100644
index f395ede0a04..00000000000
--- a/i18n/fra/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"marketPlace": "Marketplace",
-	"installedExtensions": "Installées",
-	"searchInstalledExtensions": "Installées",
-	"recommendedExtensions": "Recommandées",
-	"otherRecommendedExtensions": "Autres recommandations",
-	"workspaceRecommendedExtensions": "Recommandations de l’espace de travail",
-	"builtInExtensions": "Fonctionnalités",
-	"builtInThemesExtensions": "Thèmes",
-	"builtInBasicsExtensions": "Langages de programmation",
-	"searchExtensions": "Rechercher des extensions dans Marketplace",
-	"sort by installs": "Trier par : nombre d'installations",
-	"sort by rating": "Trier par : évaluation",
-	"sort by name": "Trier par : Nom",
-	"suggestProxyError": "Marketplace a retourné 'ECONNREFUSED'. Vérifiez le paramètre 'http.proxy'.",
-	"extensions": "Extensions",
-	"outdatedExtensions": "{0} extensions obsolètes",
-	"malicious warning": "Nous avons désinstallé '{0}' qui a été signalé comme problématique.",
-	"reloadNow": "Recharger maintenant"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/extensions/electron-browser/extensionsViews.i18n.json b/i18n/fra/src/vs/workbench/parts/extensions/electron-browser/extensionsViews.i18n.json
deleted file mode 100644
index ce30097f0a1..00000000000
--- a/i18n/fra/src/vs/workbench/parts/extensions/electron-browser/extensionsViews.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"extensions": "Extensions",
-	"no extensions found": "Extensions introuvables.",
-	"suggestProxyError": "Marketplace a retourné 'ECONNREFUSED'. Vérifiez le paramètre 'http.proxy'."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/extensions/electron-browser/keymapExtensions.i18n.json b/i18n/fra/src/vs/workbench/parts/extensions/electron-browser/keymapExtensions.i18n.json
deleted file mode 100644
index 5ddc77dfc5a..00000000000
--- a/i18n/fra/src/vs/workbench/parts/extensions/electron-browser/keymapExtensions.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"disableOtherKeymapsConfirmation": "Désactiver les autres mappages de touches pour éviter les conflits de combinaisons de touches ?",
-	"yes": "Oui",
-	"no": "Non"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/extensions/electron-browser/runtimeExtensionsEditor.i18n.json b/i18n/fra/src/vs/workbench/parts/extensions/electron-browser/runtimeExtensionsEditor.i18n.json
deleted file mode 100644
index 5d393a0792c..00000000000
--- a/i18n/fra/src/vs/workbench/parts/extensions/electron-browser/runtimeExtensionsEditor.i18n.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"starActivation": "Activées au démarrage",
-	"workspaceContainsGlobActivation": "Activées parce qu'il existe un fichier correspondant à {0} dans votre espace de travail",
-	"workspaceContainsFileActivation": "Activées parce que un fichier {0} existe dans votre espace de travail",
-	"languageActivation": "Activées parce que vous avez ouvert un fichier {0}",
-	"workspaceGenericActivation": "Activée le {0}",
-	"errors": " {0} erreurs non détectées",
-	"extensionsInputName": "Extensions en cours d’exécution",
-	"showRuntimeExtensions": "Afficher les extensions en cours d'exécution",
-	"reportExtensionIssue": "Signaler un problème",
-	"extensionHostProfileStart": "Démarrer le profilage d'hôte d'extension",
-	"extensionHostProfileStop": "Arrêter le profilage d'hôte d'extension",
-	"saveExtensionHostProfile": "Enregistrer le profilage d'hôte d'extension"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.i18n.json b/i18n/fra/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.i18n.json
deleted file mode 100644
index 2ff09c7e008..00000000000
--- a/i18n/fra/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.i18n.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"installingVSIXExtension": "Installation d'extension depuis un VSIX...",
-	"malicious": "Cette extension est signalée comme problématique.",
-	"installingMarketPlaceExtension": "Installation d’extension depuis le Marketplace...",
-	"uninstallingExtension": "Désinstallation d'extension...",
-	"enableDependeciesConfirmation": "Activer une extension active également ses dépendances. Souhaitez-vous continuer ?",
-	"enable": "Oui",
-	"doNotEnable": "Non",
-	"disableDependeciesConfirmation": "Souhaitez-vous désactiver les dépendances des extensions également ?",
-	"yes": "Oui",
-	"no": "Non",
-	"cancel": "Annuler",
-	"singleDependentError": "Impossible de désactiver l'extension '{0}'. L'extension '{1}' en dépend.",
-	"twoDependentsError": "Impossible de désactiver l'extension '{0}'. Les extensions '{1}' et '{2}' en dépendent.",
-	"multipleDependentsError": "Impossible de désactiver l'extension '{0}'. Les extensions '{1}', '{2}' et d'autres extensions en dépendent.",
-	"installConfirmation": "Voulez-vous installer l'extension '{0}' ?",
-	"install": "Installer"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json b/i18n/fra/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json
deleted file mode 100644
index 8906c9a1986..00000000000
--- a/i18n/fra/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"workbenchConfigurationTitle": "Banc d'essai",
-	"feedbackVisibility": "Contrôle la visibilité du feedback Twitter (smiley) dans la barre d'état au bas du banc d'essai."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/feedback/electron-browser/feedback.i18n.json b/i18n/fra/src/vs/workbench/parts/feedback/electron-browser/feedback.i18n.json
deleted file mode 100644
index 3d8e4b5d063..00000000000
--- a/i18n/fra/src/vs/workbench/parts/feedback/electron-browser/feedback.i18n.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"sendFeedback": "Tweeter des commentaires",
-	"label.sendASmile": "Tweetez-nous vos commentaires.",
-	"patchedVersion1": "Votre installation est endommagée.",
-	"patchedVersion2": "Spécifiez cela, si vous soumettez un bogue.",
-	"sentiment": "Quelles sont vos impressions ?",
-	"smileCaption": "Satisfait",
-	"frownCaption": "Déçu",
-	"other ways to contact us": "Autres façons de nous contacter",
-	"submit a bug": "Soumettre un bogue",
-	"request a missing feature": "Demander une fonctionnalité manquante",
-	"tell us why?": "Pourquoi ?",
-	"commentsHeader": "Commentaires",
-	"showFeedback": "Afficher le Smiley Feedback dans la barre d'état",
-	"tweet": "Tweet",
-	"character left": "caractère restant",
-	"characters left": "caractères restants",
-	"feedbackSending": "Envoi",
-	"feedbackSent": "Merci",
-	"feedbackSendingError": "Réessayer"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json b/i18n/fra/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json
deleted file mode 100644
index b737c209cdb..00000000000
--- a/i18n/fra/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hide": "Masquer"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/files/browser/editors/binaryFileEditor.i18n.json b/i18n/fra/src/vs/workbench/parts/files/browser/editors/binaryFileEditor.i18n.json
deleted file mode 100644
index c0f3249e82a..00000000000
--- a/i18n/fra/src/vs/workbench/parts/files/browser/editors/binaryFileEditor.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"binaryFileEditor": "Visionneuse de fichier binaire"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/files/browser/editors/textFileEditor.i18n.json b/i18n/fra/src/vs/workbench/parts/files/browser/editors/textFileEditor.i18n.json
deleted file mode 100644
index 3d2c988d730..00000000000
--- a/i18n/fra/src/vs/workbench/parts/files/browser/editors/textFileEditor.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"textFileEditor": "Éditeur de fichier texte",
-	"createFile": "Créer un fichier",
-	"relaunchWithIncreasedMemoryLimit": "Redémarrer avec {0} Mo",
-	"configureMemoryLimit": "Configurer la limite de mémoire",
-	"fileEditorWithInputAriaLabel": "{0}. Éditeur de fichier texte.",
-	"fileEditorAriaLabel": "Éditeur de fichier texte."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/files/browser/explorerViewlet.i18n.json b/i18n/fra/src/vs/workbench/parts/files/browser/explorerViewlet.i18n.json
deleted file mode 100644
index 0e07c8f0ec8..00000000000
--- a/i18n/fra/src/vs/workbench/parts/files/browser/explorerViewlet.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"folders": "Dossiers"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/files/browser/fileActions.contribution.i18n.json b/i18n/fra/src/vs/workbench/parts/files/browser/fileActions.contribution.i18n.json
deleted file mode 100644
index c0057e5215c..00000000000
--- a/i18n/fra/src/vs/workbench/parts/files/browser/fileActions.contribution.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"filesCategory": "Fichier",
-	"revealInSideBar": "Afficher dans la barre latérale",
-	"acceptLocalChanges": "Utiliser vos modifications et écraser les contenus du disque",
-	"revertLocalChanges": "Ignorer les modifications et revenir au contenu sur le disque"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/files/browser/fileActions.i18n.json b/i18n/fra/src/vs/workbench/parts/files/browser/fileActions.i18n.json
deleted file mode 100644
index ca93414c379..00000000000
--- a/i18n/fra/src/vs/workbench/parts/files/browser/fileActions.i18n.json
+++ /dev/null
@@ -1,75 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"retry": "Réessayer",
-	"rename": "Renommer",
-	"newFile": "Nouveau fichier",
-	"newFolder": "Nouveau dossier",
-	"openFolderFirst": "Ouvrez d'abord un dossier pour y créer des fichiers ou des dossiers.",
-	"newUntitledFile": "Nouveau fichier sans titre",
-	"createNewFile": "Nouveau fichier",
-	"createNewFolder": "Nouveau dossier",
-	"deleteButtonLabelRecycleBin": "&&Déplacer vers la Corbeille",
-	"deleteButtonLabelTrash": "&&Déplacer vers la Poubelle",
-	"deleteButtonLabel": "S&&upprimer",
-	"dirtyMessageFolderOneDelete": "Vous supprimez un dossier contenant 1 fichier dont les changements n'ont pas été enregistrés. Voulez-vous continuer ?",
-	"dirtyMessageFolderDelete": "Vous supprimez un dossier contenant {0} fichiers dont les changements n'ont pas été enregistrés. Voulez-vous continuer ?",
-	"dirtyMessageFileDelete": "Vous supprimez un fichier dont les changements n'ont pas été enregistrés. Voulez-vous continuer ?",
-	"dirtyWarning": "Vous perdrez vos modifications, si vous ne les enregistrez pas.",
-	"confirmMoveTrashMessageFolder": "Voulez-vous vraiment supprimer '{0}' et son contenu ?",
-	"confirmMoveTrashMessageFile": "Voulez-vous vraiment supprimer '{0}' ?",
-	"undoBin": "Vous pouvez effectuer une restauration à partir de la Corbeille.",
-	"undoTrash": "Vous pouvez effectuer une restauration à partir de la Poubelle.",
-	"doNotAskAgain": "Ne plus me demander",
-	"confirmDeleteMessageFolder": "Voulez-vous vraiment supprimer définitivement '{0}' et son contenu ?",
-	"confirmDeleteMessageFile": "Voulez-vous vraiment supprimer définitivement '{0}' ?",
-	"irreversible": "Cette action est irréversible !",
-	"permDelete": "Supprimer définitivement",
-	"delete": "Supprimer",
-	"importFiles": "Importer des fichiers",
-	"confirmOverwrite": "Un fichier ou dossier portant le même nom existe déjà dans le dossier de destination. Voulez-vous le remplacer ?",
-	"replaceButtonLabel": "&&Remplacer",
-	"copyFile": "Copier",
-	"pasteFile": "Coller",
-	"duplicateFile": "Doublon",
-	"openToSide": "Ouvrir sur le côté",
-	"compareSource": "Sélectionner pour comparer",
-	"globalCompareFile": "Comparer le fichier actif à...",
-	"openFileToCompare": "Ouvrez d'abord un fichier pour le comparer à un autre fichier.",
-	"compareWith": "Comparer '{0}' à '{1}'",
-	"compareFiles": "Comparer des fichiers",
-	"refresh": "Actualiser",
-	"save": "Enregistrer",
-	"saveAs": "Enregistrer sous...",
-	"saveAll": "Enregistrer tout",
-	"saveAllInGroup": "Enregistrer tout dans le groupe",
-	"saveFiles": "Enregistrer tous les fichiers",
-	"revert": "Rétablir le fichier",
-	"focusOpenEditors": "Mettre le focus sur la vue des éditeurs ouverts",
-	"focusFilesExplorer": "Focus sur l'Explorateur de fichiers",
-	"showInExplorer": "Révéler le fichier actif dans la barre latérale",
-	"openFileToShow": "Ouvrir d'abord un fichier pour l'afficher dans l'Explorateur",
-	"collapseExplorerFolders": "Réduire les dossiers dans l'explorateur",
-	"refreshExplorer": "Actualiser l'explorateur",
-	"openFileInNewWindow": "Ouvrir le fichier actif dans une nouvelle fenêtre",
-	"openFileToShowInNewWindow": "Ouvrir d'abord un fichier à ouvrir dans une nouvelle fenêtre",
-	"revealInWindows": "Révéler dans l'Explorateur",
-	"revealInMac": "Révéler dans le Finder",
-	"openContainer": "Ouvrir le dossier contenant",
-	"revealActiveFileInWindows": "Révéler le fichier actif dans l'Explorateur Windows",
-	"revealActiveFileInMac": "Révéler le fichier actif dans le Finder",
-	"openActiveFileContainer": "Ouvrir le dossier contenant le fichier actif",
-	"copyPath": "Copier le chemin",
-	"copyPathOfActive": "Copier le chemin du fichier actif",
-	"emptyFileNameError": "Un nom de fichier ou de dossier doit être fourni.",
-	"fileNameExistsError": "Un fichier ou dossier **{0}** existe déjà à cet emplacement. Choisissez un autre nom.",
-	"invalidFileNameError": "Le nom **{0}** est non valide en tant que nom de fichier ou de dossier. Choisissez un autre nom.",
-	"filePathTooLongError": "Le nom **{0}** correspond à un chemin d'accès trop long. Choisissez un nom plus court.",
-	"compareWithSaved": "Compare le fichier actif avec celui enregistré",
-	"modifiedLabel": "{0} (sur le disque) ↔ {1}",
-	"compareWithClipboard": "Comparer le fichier actif avec le presse-papier",
-	"clipboardComparisonLabel": "Presse-papier ↔ {0}"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/files/browser/fileCommands.i18n.json b/i18n/fra/src/vs/workbench/parts/files/browser/fileCommands.i18n.json
deleted file mode 100644
index ee5d441071a..00000000000
--- a/i18n/fra/src/vs/workbench/parts/files/browser/fileCommands.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"openFileToCopy": "Ouvrir d'abord un fichier pour copier son chemin",
-	"openFileToReveal": "Ouvrir d'abord un fichier à révéler"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/files/browser/files.contribution.i18n.json b/i18n/fra/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
deleted file mode 100644
index 9693ca31c50..00000000000
--- a/i18n/fra/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
+++ /dev/null
@@ -1,53 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"showExplorerViewlet": "Afficher l'Explorateur",
-	"explore": "Explorateur",
-	"view": "Affichage",
-	"textFileEditor": "Éditeur de fichier texte",
-	"binaryFileEditor": "Éditeur de fichier binaire",
-	"filesConfigurationTitle": "Fichiers",
-	"exclude": "Configurer des modèles glob pour exclure des fichiers et dossiers. Par exemple, l’explorateur de fichiers décide quels fichiers et dossiers afficher ou masquer en fonction de ce paramètre.",
-	"files.exclude.boolean": "Modèle Glob auquel les chemins de fichiers doivent correspondre. Affectez la valeur true ou false pour activer ou désactiver le modèle.",
-	"files.exclude.when": "Vérification supplémentaire des frères d'un fichier correspondant. Utilisez $(basename) comme variable pour le nom de fichier correspondant.",
-	"associations": "Configurez les associations entre les fichiers et les langages (par exemple, \"*.extension\": \"html\"). Celles-ci ont priorité sur les associations par défaut des langages installés.",
-	"encoding": "L'encodage du jeu de caractères par défaut à utiliser durant la lecture et l'écriture des fichiers. Ce paramètre peut également être configuré par langage.",
-	"autoGuessEncoding": "Quand cette option est activée, tente de deviner l'encodage du jeu de caractères à l'ouverture des fichiers. Ce paramètre peut également être configuré par langage.",
-	"eol": "Caractère de fin de ligne par défaut. Utilisez \\n pour LF et \\r\\n pour CRLF.",
-	"trimTrailingWhitespace": "Si l'option est activée, l'espace blanc de fin est supprimé au moment de l'enregistrement d'un fichier.",
-	"insertFinalNewline": "Quand l'option est activée, une nouvelle ligne finale est insérée à la fin du fichier au moment de son enregistrement.",
-	"trimFinalNewlines": "Si l'option est activée, va supprimer toutes les nouvelles lignes après la dernière ligne à la fin du fichier lors de l’enregistrement.",
-	"files.autoSave.off": "Un fichier dont l'intégrité est compromise n'est jamais enregistré automatiquement.",
-	"files.autoSave.afterDelay": "Un fichier dont l'intégrité est compromise est automatiquement enregistré après la configuration de 'files.autoSaveDelay'.",
-	"files.autoSave.onFocusChange": "Un fichier dont l'intégrité est compromise est automatiquement enregistré quand l'éditeur perd le focus.",
-	"files.autoSave.onWindowChange": "Un fichier dont l'intégrité est compromise est automatiquement enregistré quand la fenêtre perd le focus.",
-	"autoSave": "Contrôle l'enregistrement automatique des fichiers dont l'intégrité est compromise. Valeurs acceptées : '{0}', '{1}', '{2}' (l'éditeur perd le focus), '{3}' (la fenêtre perd le focus). Si la valeur est '{4}', vous pouvez configurer le délai dans 'files.autoSaveDelay'.",
-	"autoSaveDelay": "Contrôle le délai en ms au bout duquel un fichier à l'intégrité compromise est enregistré automatiquement. S'applique uniquement quand 'files.autoSave' a la valeur '{0}'",
-	"watcherExclude": "Configurez les modèles Glob des chemins de fichier à exclure de la surveillance des fichiers. Les modèles doivent correspondre à des chemins absolus (par ex., utilisez le préfixe ** ou le chemin complet pour une correspondance appropriée). Le changement de ce paramètre nécessite un redémarrage. Si vous constatez que le code consomme beaucoup de temps processeur au démarrage, excluez les dossiers volumineux pour réduire la charge initiale.",
-	"hotExit.off": "Désactivez la sortie à chaud.",
-	"hotExit.onExit": "La sortie à chaud se déclenche à la fermeture de l'application, c'est-à-dire quand la dernière fenêtre est fermée dans Windows/Linux, ou quand la commande workbench.action.quit est déclenchée (palette de commandes, combinaison de touches, menu). Toutes les fenêtres avec des sauvegardes sont restaurées au prochain lancement.",
-	"hotExit.onExitAndWindowClose": "La sortie à chaud est déclenchée à la fermeture de l'application, c'est-à-dire quand la dernière fenêtre est fermée sous Windows/Linux ou quand la commande  workbench.action.quit est déclenchée (palette de commandes, combinaison de touches, menu), ainsi que pour toute fenêtre avec un dossier ouvert, qu'il s'agisse de la dernière fenêtre ou non. Toutes les fenêtres sans dossier ouvert sont restaurées au prochain lancement. Pour restaurer une fenêtre de dossiers telle qu'elle était avant l'arrêt, définissez \"window.restoreWindows\" sur \"all\".",
-	"hotExit": "Contrôle si les fichiers non enregistrés sont mémorisés entre les sessions, ce qui permet d'ignorer la demande d'enregistrement à la sortie de l'éditeur.",
-	"useExperimentalFileWatcher": "Utilisez le nouvel observateur de fichiers expérimental.",
-	"defaultLanguage": "Mode de langage par défaut affecté aux nouveaux fichiers.",
-	"editorConfigurationTitle": "Éditeur",
-	"formatOnSave": "Met en forme un fichier au moment de l'enregistrement. Un formateur doit être disponible, le fichier ne doit pas être enregistré automatiquement, et l'éditeur ne doit pas être en cours d'arrêt.",
-	"explorerConfigurationTitle": "Explorateur de fichiers",
-	"openEditorsVisible": "Nombre d'éditeurs affichés dans le volet Éditeurs ouverts. Définissez la valeur 0 pour masquer le volet.",
-	"dynamicHeight": "Contrôle si la hauteur de la section des éditeurs ouverts doit s'adapter dynamiquement ou non au nombre d'éléments.",
-	"autoReveal": "Contrôle si l'Explorateur doit automatiquement afficher et sélectionner les fichiers à l'ouverture.",
-	"enableDragAndDrop": "Contrôle si l'explorateur doit autoriser le déplacement de fichiers et de dossiers par glisser-déplacer.",
-	"confirmDragAndDrop": "Contrôle si l’Explorateur doit demander confirmation lors du déplacement de fichiers ou de dossiers via glisser-déposer.",
-	"confirmDelete": "Contrôle si l’explorateur doit demander confirmation lorsque vous supprimez un fichier via la corbeille.",
-	"sortOrder.default": "Les fichiers et dossiers sont triés par nom, dans l’ordre alphabétique. Les dossiers sont affichés avant les fichiers.",
-	"sortOrder.mixed": "Les fichiers et dossiers sont triés par nom, dans l’ordre alphabétique. Les fichiers sont imbriqués dans les dossiers.",
-	"sortOrder.filesFirst": "Les fichiers et dossiers sont triés par nom, dans l’ordre alphabétique. Les fichiers sont affichés avant les dossiers.",
-	"sortOrder.type": "Les fichiers et dossiers sont triés par extension, dans l’ordre alphabétique. Les dossiers sont affichés avant les fichiers.",
-	"sortOrder.modified": "Les fichiers et dossiers sont triés par date de dernière modification, dans l’ordre décroissant. Les dossiers sont affichés avant les fichiers.",
-	"sortOrder": "Contrôle l'ordre de tri des fichiers et dossiers dans l'explorateur. En plus du tri par défaut, vous pouvez définir l'ordre sur 'mixed' (fichiers et dossiers triés combinés), 'type' (par type de fichier), 'modified' (par date de dernière modification) ou 'fileFirst' (trier les fichiers avant les dossiers).",
-	"explorer.decorations.colors": "Contrôle si les décorations de fichier doivent utiliser des couleurs.",
-	"explorer.decorations.badges": "Contrôle si les décorations de fichier doivent utiliser des badges."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/files/browser/saveErrorHandler.i18n.json b/i18n/fra/src/vs/workbench/parts/files/browser/saveErrorHandler.i18n.json
deleted file mode 100644
index f944e7fc14f..00000000000
--- a/i18n/fra/src/vs/workbench/parts/files/browser/saveErrorHandler.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"userGuide": "Utiliser les actions dans la barre d’outils de l’éditeur vers la droite pour soit **annuler** vos modifications ou **écraser** le contenu sur le disque avec vos modifications",
-	"discard": "Abandonner",
-	"overwrite": "Remplacer",
-	"retry": "Réessayer",
-	"readonlySaveError": "Échec de l'enregistrement de '{0}' : le fichier est protégé en écriture. Sélectionnez 'Remplacer' pour supprimer la protection.",
-	"genericSaveError": "Échec d'enregistrement de '{0}' ({1}).",
-	"staleSaveError": "Échec de l'enregistrement de '{0}' : le contenu sur disque est plus récent. Cliquez sur **Comparer** pour comparer votre version à celle située sur le disque.",
-	"compareChanges": "Comparer",
-	"saveConflictDiffLabel": "{0} (sur le disque) ↔ {1} (dans {2}) - Résoudre le conflit d'enregistrement"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/files/browser/views/emptyView.i18n.json b/i18n/fra/src/vs/workbench/parts/files/browser/views/emptyView.i18n.json
deleted file mode 100644
index a44dd00649c..00000000000
--- a/i18n/fra/src/vs/workbench/parts/files/browser/views/emptyView.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"noWorkspace": "Aucun dossier ouvert",
-	"explorerSection": "Section de l'Explorateur de fichiers",
-	"noWorkspaceHelp": "Vous n’avez pas encore ajouté un dossier à l’espace de travail.",
-	"addFolder": "Ajouter un dossier",
-	"noFolderHelp": "Vous n'avez pas encore ouvert de dossier.",
-	"openFolder": "Ouvrir le dossier"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/files/browser/views/explorerDecorationsProvider.i18n.json b/i18n/fra/src/vs/workbench/parts/files/browser/views/explorerDecorationsProvider.i18n.json
deleted file mode 100644
index 6881d56fd1c..00000000000
--- a/i18n/fra/src/vs/workbench/parts/files/browser/views/explorerDecorationsProvider.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"label": "Explorateur",
-	"canNotResolve": "Impossible de résoudre le dossier de l'espace de travail"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/files/browser/views/explorerView.i18n.json b/i18n/fra/src/vs/workbench/parts/files/browser/views/explorerView.i18n.json
deleted file mode 100644
index 0e3d37245db..00000000000
--- a/i18n/fra/src/vs/workbench/parts/files/browser/views/explorerView.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"explorerSection": "Section de l'Explorateur de fichiers",
-	"treeAriaLabel": "Explorateur de fichiers"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/files/browser/views/explorerViewer.i18n.json b/i18n/fra/src/vs/workbench/parts/files/browser/views/explorerViewer.i18n.json
deleted file mode 100644
index 631a14a1cef..00000000000
--- a/i18n/fra/src/vs/workbench/parts/files/browser/views/explorerViewer.i18n.json
+++ /dev/null
@@ -1,19 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"fileInputAriaLabel": "Tapez le nom du fichier. Appuyez sur Entrée pour confirmer ou sur Échap pour annuler.",
-	"filesExplorerViewerAriaLabel": "{0}, Explorateur de fichiers",
-	"dropFolders": "Voulez-vous ajouter les dossiers à l’espace de travail ?",
-	"dropFolder": "Voulez-vous ajouter le dossier à l’espace de travail ?",
-	"addFolders": "&&Ajouter les dossiers",
-	"addFolder": "&&Ajouter le dossier",
-	"confirmMove": "Êtes-vous certain de vouloir déplacer '{0}' ?",
-	"doNotAskAgain": "Ne plus me demander",
-	"moveButtonLabel": "&&Déplacer",
-	"confirmOverwriteMessage": "{0}' existe déjà dans le dossier de destination. Voulez-vous le remplacer ?",
-	"irreversible": "Cette action est irréversible !",
-	"replaceButtonLabel": "&&Remplacer"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/files/browser/views/openEditorsView.i18n.json b/i18n/fra/src/vs/workbench/parts/files/browser/views/openEditorsView.i18n.json
deleted file mode 100644
index edcca33816c..00000000000
--- a/i18n/fra/src/vs/workbench/parts/files/browser/views/openEditorsView.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"openEditors": "Éditeurs ouverts",
-	"openEditosrSection": "Section des éditeurs ouverts",
-	"treeAriaLabel": "Éditeurs ouverts : liste des fichiers actifs",
-	"dirtyCounter": "{0} non enregistré(s)"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/files/browser/views/openEditorsViewer.i18n.json b/i18n/fra/src/vs/workbench/parts/files/browser/views/openEditorsViewer.i18n.json
deleted file mode 100644
index 22721e1c8bc..00000000000
--- a/i18n/fra/src/vs/workbench/parts/files/browser/views/openEditorsViewer.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"editorGroupAriaLabel": "{0}, groupe d'éditeurs",
-	"openEditorAriaLabel": "{0}, Ouvrir l'éditeur",
-	"saveAll": "Enregistrer tout",
-	"closeAllUnmodified": "Fermer les éléments non modifiés",
-	"closeAll": "Tout fermer",
-	"compareWithSaved": "Comparer avec celui enregistré",
-	"close": "Fermer",
-	"closeOthers": "Fermer les autres"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/files/common/dirtyFilesTracker.i18n.json b/i18n/fra/src/vs/workbench/parts/files/common/dirtyFilesTracker.i18n.json
deleted file mode 100644
index 63b868580e1..00000000000
--- a/i18n/fra/src/vs/workbench/parts/files/common/dirtyFilesTracker.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"dirtyFile": "1 fichier non enregistré",
-	"dirtyFiles": "{0} fichiers non enregistrés"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/files/common/editors/fileEditorInput.i18n.json b/i18n/fra/src/vs/workbench/parts/files/common/editors/fileEditorInput.i18n.json
deleted file mode 100644
index a6f396bbe8c..00000000000
--- a/i18n/fra/src/vs/workbench/parts/files/common/editors/fileEditorInput.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"orphanedFile": "{0} (deleted from disk)"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/files/electron-browser/explorerViewlet.i18n.json b/i18n/fra/src/vs/workbench/parts/files/electron-browser/explorerViewlet.i18n.json
deleted file mode 100644
index ef60b072a34..00000000000
--- a/i18n/fra/src/vs/workbench/parts/files/electron-browser/explorerViewlet.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"folders": "Dossiers"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json b/i18n/fra/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
deleted file mode 100644
index 722fad1246b..00000000000
--- a/i18n/fra/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"filesCategory": "Fichier",
-	"revealInSideBar": "Afficher dans la barre latérale",
-	"acceptLocalChanges": "Utiliser vos modifications et écraser les contenus du disque",
-	"revertLocalChanges": "Ignorer les modifications locales et restaurer le contenu sur disque",
-	"copyPathOfActive": "Copier le chemin du fichier actif",
-	"saveAllInGroup": "Enregistrer tout dans le groupe",
-	"saveFiles": "Enregistrer tous les fichiers",
-	"revert": "Rétablir le fichier",
-	"compareActiveWithSaved": "Compare le fichier actif avec celui enregistré",
-	"closeEditor": "Fermer l'éditeur",
-	"view": "Affichage",
-	"openToSide": "Ouvrir sur le côté",
-	"revealInWindows": "Révéler dans l'Explorateur",
-	"revealInMac": "Révéler dans le Finder",
-	"openContainer": "Ouvrir le dossier contenant",
-	"copyPath": "Copier le chemin",
-	"saveAll": "Enregistrer tout",
-	"compareWithSaved": "Comparer avec celui enregistré",
-	"compareWithSelected": "Comparer avec ce qui est sélectionné",
-	"compareSource": "Sélectionner pour comparer",
-	"compareSelected": "Comparer le sélectionné",
-	"close": "Fermer",
-	"closeOthers": "Fermer les autres",
-	"closeSaved": "Fermer la version sauvegardée",
-	"closeAll": "Tout fermer",
-	"deleteFile": "Supprimer définitivement"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json b/i18n/fra/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
deleted file mode 100644
index fa117de3746..00000000000
--- a/i18n/fra/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
+++ /dev/null
@@ -1,72 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"newFile": "Nouveau fichier",
-	"newFolder": "Nouveau dossier",
-	"rename": "Renommer",
-	"delete": "Supprimer",
-	"copyFile": "Copier",
-	"pasteFile": "Coller",
-	"retry": "Réessayer",
-	"renameWhenSourcePathIsParentOfTargetError": "Veuillez utiliser la commande 'Nouveau dossier' ou 'Nouveau fichier\" pour ajouter des enfants à un dossier existant",
-	"newUntitledFile": "Nouveau fichier sans titre",
-	"createNewFile": "Nouveau fichier",
-	"createNewFolder": "Nouveau dossier",
-	"deleteButtonLabelRecycleBin": "&&Déplacer vers la Corbeille",
-	"deleteButtonLabelTrash": "&&Déplacer vers la Poubelle",
-	"deleteButtonLabel": "S&&upprimer",
-	"dirtyMessageFilesDelete": "Vous supprimez des fichiers dont les changements n'ont pas été enregistrés. Voulez-vous continuer ?",
-	"dirtyMessageFolderOneDelete": "Vous supprimez un dossier contenant 1 fichier dont les changements n'ont pas été enregistrés. Voulez-vous continuer ?",
-	"dirtyMessageFolderDelete": "Vous supprimez un dossier contenant {0} fichiers dont les changements n'ont pas été enregistrés. Voulez-vous continuer ?",
-	"dirtyMessageFileDelete": "Vous supprimez un fichier dont les changements n'ont pas été enregistrés. Voulez-vous continuer ?",
-	"dirtyWarning": "Vous perdrez vos modifications, si vous ne les enregistrez pas.",
-	"undoBin": "Vous pouvez restaurer à partir de la Corbeille.",
-	"undoTrash": "Vous pouvez restaurer à partir de la Poubelle.",
-	"doNotAskAgain": "Ne plus me demander",
-	"irreversible": "Cette action est irréversible !",
-	"binFailed": "Impossible de supprimer en utilisant la corbeille. Voulez-vous supprimer définitivement à la place ?",
-	"trashFailed": "Impossible de supprimer en utilisant la corbeille. Voulez-vous supprimer définitivement à la place?",
-	"deletePermanentlyButtonLabel": "Supprimer &&définitivement",
-	"retryButtonLabel": "&&Réessayer",
-	"confirmMoveTrashMessageFilesAndDirectories": "Voulez-vous vraiment supprimer les {0} fichiers/répertoires suivants et leur contenu ?",
-	"confirmMoveTrashMessageMultipleDirectories": "Voulez-vous vraiment supprimer les {0} répertoires suivants et leur contenu ?",
-	"confirmMoveTrashMessageMultiple": "Êtes-vous sûr de vouloir supprimer les fichiers {0} suivants ?",
-	"confirmMoveTrashMessageFolder": "Voulez-vous vraiment supprimer '{0}' et son contenu ?",
-	"confirmMoveTrashMessageFile": "Voulez-vous vraiment supprimer '{0}' ?",
-	"confirmDeleteMessageFilesAndDirectories": "Voulez-vous vraiment supprimer définitivement les {0} fichiers/répertoires suivants et leur contenu ?",
-	"confirmDeleteMessageMultipleDirectories": "Voulez-vous vraiment supprimer définitivement les {0} répertoires suivants et leur contenu ?",
-	"confirmDeleteMessageMultiple": "Êtes-vous sûr de vouloir supprimer définitivement les fichiers {0} suivants ?",
-	"confirmDeleteMessageFolder": "Voulez-vous vraiment supprimer définitivement '{0}' et son contenu ?",
-	"confirmDeleteMessageFile": "Voulez-vous vraiment supprimer définitivement '{0}' ?",
-	"addFiles": "Ajouter des fichiers",
-	"confirmOverwrite": "Un fichier ou dossier portant le même nom existe déjà dans le dossier de destination. Voulez-vous le remplacer ?",
-	"replaceButtonLabel": "&&Remplacer",
-	"fileIsAncestor": "Le fichier à copier est un ancêtre du dossier de destination",
-	"fileDeleted": "Le fichier à coller a été supprimé ou déplacé pendant ce temps",
-	"duplicateFile": "Doublon",
-	"globalCompareFile": "Comparer le fichier actif à...",
-	"openFileToCompare": "Ouvrez d'abord un fichier pour le comparer à un autre fichier.",
-	"refresh": "Actualiser",
-	"saveAllInGroup": "Enregistrer tout dans le groupe",
-	"focusOpenEditors": "Mettre le focus sur la vue des éditeurs ouverts",
-	"focusFilesExplorer": "Focus sur l'Explorateur de fichiers",
-	"showInExplorer": "Révéler le fichier actif dans la barre latérale",
-	"openFileToShow": "Ouvrir d'abord un fichier pour l'afficher dans l'Explorateur",
-	"collapseExplorerFolders": "Réduire les dossiers dans l'explorateur",
-	"refreshExplorer": "Actualiser l'explorateur",
-	"openFileInNewWindow": "Ouvrir le fichier actif dans une nouvelle fenêtre",
-	"openFileToShowInNewWindow": "Ouvrir d'abord un fichier à ouvrir dans une nouvelle fenêtre",
-	"copyPath": "Copier le chemin",
-	"emptyFileNameError": "Un nom de fichier ou de dossier doit être fourni.",
-	"fileNameStartsWithSlashError": "Un nom de fichier ou de dossier ne peut commencer par une barre oblique.",
-	"fileNameExistsError": "Un fichier ou dossier **{0}** existe déjà à cet emplacement. Choisissez un autre nom.",
-	"invalidFileNameError": "Le nom **{0}** est non valide en tant que nom de fichier ou de dossier. Choisissez un autre nom.",
-	"filePathTooLongError": "Le nom **{0}** correspond à un chemin d'accès trop long. Choisissez un nom plus court.",
-	"compareWithClipboard": "Compare le fichier actif avec le presse-papiers",
-	"clipboardComparisonLabel": "Presse-papier ↔ {0}"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json b/i18n/fra/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
deleted file mode 100644
index a0333b3b922..00000000000
--- a/i18n/fra/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"revealInWindows": "Révéler dans l'Explorateur",
-	"revealInMac": "Révéler dans le Finder",
-	"openContainer": "Ouvrir le dossier contenant",
-	"saveAs": "Enregistrer sous...",
-	"save": "Enregistrer",
-	"saveAll": "Enregistrer tout",
-	"removeFolderFromWorkspace": "Supprimer le dossier de l'espace de travail",
-	"genericRevertError": "Échec pour faire revenir '{0}' : {1}",
-	"modifiedLabel": "{0} (sur le disque) ↔ {1}",
-	"openFileToReveal": "Ouvrir d'abord un fichier à révéler",
-	"openFileToCopy": "Ouvrir d'abord un fichier pour copier son chemin"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json b/i18n/fra/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
deleted file mode 100644
index a75d38efac1..00000000000
--- a/i18n/fra/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"showExplorerViewlet": "Afficher l'Explorateur",
-	"explore": "Explorateur",
-	"view": "Affichage",
-	"textFileEditor": "Éditeur de fichier texte",
-	"binaryFileEditor": "Éditeur de fichier binaire",
-	"filesConfigurationTitle": "Fichiers",
-	"exclude": "Configurer des modèles glob pour exclure des fichiers et dossiers. Par exemple, l’explorateur de fichiers décide quels fichiers et dossiers afficher ou masquer en fonction de ce paramètre.",
-	"files.exclude.boolean": "Modèle Glob auquel les chemins de fichiers doivent correspondre. Affectez la valeur true ou false pour activer ou désactiver le modèle.",
-	"files.exclude.when": "Vérification supplémentaire des frères d'un fichier correspondant. Utilisez $(basename) comme variable pour le nom de fichier correspondant.",
-	"associations": "Configurez les associations entre les fichiers et les langages (par exemple, \"*.extension\": \"html\"). Celles-ci ont priorité sur les associations par défaut des langages installés.",
-	"encoding": "L'encodage du jeu de caractères par défaut à utiliser durant la lecture et l'écriture des fichiers. Ce paramètre peut également être configuré par langage.",
-	"autoGuessEncoding": "Quand cette option est activée, tente de deviner l'encodage du jeu de caractères à l'ouverture des fichiers. Ce paramètre peut également être configuré par langage.",
-	"eol": "Caractère de fin de ligne par défaut. Utilisez \\n pour LF et \\r\\n pour CRLF.",
-	"trimTrailingWhitespace": "Si l'option est activée, l'espace blanc de fin est supprimé au moment de l'enregistrement d'un fichier.",
-	"insertFinalNewline": "Quand l'option est activée, une nouvelle ligne finale est insérée à la fin du fichier au moment de son enregistrement.",
-	"trimFinalNewlines": "Si l'option est activée, va supprimer toutes les nouvelles lignes après la dernière ligne à la fin du fichier lors de l’enregistrement.",
-	"files.autoSave.off": "Un fichier dont l'intégrité est compromise n'est jamais enregistré automatiquement.",
-	"files.autoSave.afterDelay": "Un fichier dont l'intégrité est compromise est automatiquement enregistré après la configuration de 'files.autoSaveDelay'.",
-	"files.autoSave.onFocusChange": "Un fichier dont l'intégrité est compromise est automatiquement enregistré quand l'éditeur perd le focus.",
-	"files.autoSave.onWindowChange": "Un fichier dont l'intégrité est compromise est automatiquement enregistré quand la fenêtre perd le focus.",
-	"autoSave": "Contrôle l'enregistrement automatique des fichiers dont l'intégrité est compromise. Valeurs acceptées : '{0}', '{1}', '{2}' (l'éditeur perd le focus), '{3}' (la fenêtre perd le focus). Si la valeur est '{4}', vous pouvez configurer le délai dans 'files.autoSaveDelay'.",
-	"autoSaveDelay": "Contrôle le délai en ms au bout duquel un fichier à l'intégrité compromise est enregistré automatiquement. S'applique uniquement quand 'files.autoSave' a la valeur '{0}'",
-	"watcherExclude": "Configurez les modèles Glob des chemins de fichier à exclure de la surveillance des fichiers. Les modèles doivent correspondre à des chemins absolus (par ex., utilisez le préfixe ** ou le chemin complet pour une correspondance appropriée). Le changement de ce paramètre nécessite un redémarrage. Si vous constatez que le code consomme beaucoup de temps processeur au démarrage, excluez les dossiers volumineux pour réduire la charge initiale.",
-	"hotExit.off": "Désactivez la sortie à chaud.",
-	"hotExit.onExit": "La sortie à chaud se déclenche à la fermeture de l'application, c'est-à-dire quand la dernière fenêtre est fermée dans Windows/Linux, ou quand la commande workbench.action.quit est déclenchée (palette de commandes, combinaison de touches, menu). Toutes les fenêtres avec des sauvegardes sont restaurées au prochain lancement.",
-	"hotExit.onExitAndWindowClose": "La sortie à chaud est déclenchée à la fermeture de l'application, c'est-à-dire quand la dernière fenêtre est fermée sous Windows/Linux ou quand la commande  workbench.action.quit est déclenchée (palette de commandes, combinaison de touches, menu), ainsi que pour toute fenêtre avec un dossier ouvert, qu'il s'agisse de la dernière fenêtre ou non. Toutes les fenêtres sans dossier ouvert sont restaurées au prochain lancement. Pour restaurer une fenêtre de dossiers telle qu'elle était avant l'arrêt, définissez \"window.restoreWindows\" sur \"all\".",
-	"hotExit": "Contrôle si les fichiers non enregistrés sont mémorisés entre les sessions, ce qui permet d'ignorer la demande d'enregistrement à la sortie de l'éditeur.",
-	"useExperimentalFileWatcher": "Utilisez le nouvel observateur de fichiers expérimental.",
-	"defaultLanguage": "Mode de langage par défaut affecté aux nouveaux fichiers.",
-	"maxMemoryForLargeFilesMB": "Contrôle la mémoire disponible pour VS Code après redémarrage en essayant d’ouvrir les fichiers volumineux. Cela a le même effet que de spécifier --max-memory=NEWSIZE sur la ligne de commande.",
-	"editorConfigurationTitle": "Éditeur",
-	"formatOnSave": "Met en forme un fichier au moment de l'enregistrement. Un formateur doit être disponible, le fichier ne doit pas être enregistré automatiquement, et l'éditeur ne doit pas être en cours d'arrêt.",
-	"formatOnSaveTimeout": "Délai d’attente pour formater lors de l'enregistrement. Spécifie le délai en millisecondes pour les commandes formatOnSave. Les commandes prenant plus de temps que le délai d’attente spécifié seront annulées.",
-	"explorerConfigurationTitle": "Explorateur de fichiers",
-	"openEditorsVisible": "Nombre d'éditeurs affichés dans le volet Éditeurs ouverts.",
-	"autoReveal": "Contrôle si l'Explorateur doit automatiquement afficher et sélectionner les fichiers à l'ouverture.",
-	"enableDragAndDrop": "Contrôle si l'explorateur doit autoriser le déplacement de fichiers et de dossiers par glisser-déplacer.",
-	"confirmDragAndDrop": "Contrôle si l’Explorateur doit demander confirmation lors du déplacement de fichiers ou de dossiers via glisser-déposer.",
-	"confirmDelete": "Contrôle si l’explorateur doit demander confirmation lorsque vous supprimez un fichier via la corbeille.",
-	"sortOrder.default": "Les fichiers et dossiers sont triés par nom, dans l’ordre alphabétique. Les dossiers sont affichés avant les fichiers.",
-	"sortOrder.mixed": "Les fichiers et dossiers sont triés par nom, dans l’ordre alphabétique. Les fichiers sont imbriqués dans les dossiers.",
-	"sortOrder.filesFirst": "Les fichiers et dossiers sont triés par nom, dans l’ordre alphabétique. Les fichiers sont affichés avant les dossiers.",
-	"sortOrder.type": "Les fichiers et dossiers sont triés par extension, dans l’ordre alphabétique. Les dossiers sont affichés avant les fichiers.",
-	"sortOrder.modified": "Les fichiers et dossiers sont triés par date de dernière modification, dans l’ordre décroissant. Les dossiers sont affichés avant les fichiers.",
-	"sortOrder": "Contrôle l'ordre de tri des fichiers et dossiers dans l'explorateur. En plus du tri par défaut, vous pouvez définir l'ordre sur 'mixed' (fichiers et dossiers triés combinés), 'type' (par type de fichier), 'modified' (par date de dernière modification) ou 'fileFirst' (trier les fichiers avant les dossiers).",
-	"explorer.decorations.colors": "Contrôle si les décorations de fichier doivent utiliser des couleurs.",
-	"explorer.decorations.badges": "Contrôle si les décorations de fichier doivent utiliser des badges."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json b/i18n/fra/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json
deleted file mode 100644
index ad930cf9e96..00000000000
--- a/i18n/fra/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"userGuide": "Utilisez les actions de la barre d'outils de l'éditeur pour annuler vos modifications, ou pour remplacer le contenu sur le disque par vos modifications.",
-	"staleSaveError": "Échec de l'enregistrement de '{0}' : le contenu sur le disque est plus récent. Veuillez comparer votre version à celle située sur le disque.",
-	"retry": "Réessayer",
-	"discard": "Abandonner",
-	"readonlySaveErrorAdmin": "Échec de l'enregistrement de '{0}' : le fichier est protégé en écriture. Sélectionnez 'Remplacer' pour réessayer en tant qu'administrateur.",
-	"readonlySaveError": "Échec de l'enregistrement de '{0}' : le fichier est protégé en écriture. Sélectionnez 'Remplacer' pour essayer de supprimer la protection.",
-	"permissionDeniedSaveError": "Échec de l'enregistrement de '{0}' : Permissions insuffisantes. Sélectionnez 'Remplacer en tant qu'Admin' pour réessayer en tant qu'administrator.",
-	"genericSaveError": "Échec d'enregistrement de '{0}' ({1}).",
-	"learnMore": "En savoir plus",
-	"dontShowAgain": "Ne plus afficher",
-	"compareChanges": "Comparer",
-	"saveConflictDiffLabel": "{0} (sur le disque) ↔ {1} (dans {2}) - Résoudre le conflit d'enregistrement",
-	"overwriteElevated": "Remplacer en tant qu'Admin...",
-	"saveElevated": "Réessayer en tant qu'Admin...",
-	"overwrite": "Remplacer"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/files/electron-browser/views/emptyView.i18n.json b/i18n/fra/src/vs/workbench/parts/files/electron-browser/views/emptyView.i18n.json
deleted file mode 100644
index aad1775f57e..00000000000
--- a/i18n/fra/src/vs/workbench/parts/files/electron-browser/views/emptyView.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noWorkspace": "Aucun dossier ouvert",
-	"explorerSection": "Section de l'Explorateur de fichiers",
-	"noWorkspaceHelp": "Vous n'avez pas encore ajouter un dossier à l'espace de travail.",
-	"addFolder": "Ajouter un dossier",
-	"noFolderHelp": "Vous n'avez pas encore ouvert de dossier.",
-	"openFolder": "Ouvrir le dossier"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/files/electron-browser/views/explorerDecorationsProvider.i18n.json b/i18n/fra/src/vs/workbench/parts/files/electron-browser/views/explorerDecorationsProvider.i18n.json
deleted file mode 100644
index 8ed3cf5666b..00000000000
--- a/i18n/fra/src/vs/workbench/parts/files/electron-browser/views/explorerDecorationsProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"label": "Explorateur",
-	"canNotResolve": "Impossible de résoudre le dossier de l'espace de travail",
-	"symbolicLlink": "Lien symbolique"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/files/electron-browser/views/explorerView.i18n.json b/i18n/fra/src/vs/workbench/parts/files/electron-browser/views/explorerView.i18n.json
deleted file mode 100644
index afa62826540..00000000000
--- a/i18n/fra/src/vs/workbench/parts/files/electron-browser/views/explorerView.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"explorerSection": "Section de l'Explorateur de fichiers",
-	"treeAriaLabel": "Explorateur de fichiers"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json b/i18n/fra/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
deleted file mode 100644
index 41c3a1d6050..00000000000
--- a/i18n/fra/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"fileInputAriaLabel": "Tapez le nom du fichier. Appuyez sur Entrée pour confirmer ou sur Échap pour annuler.",
-	"createFileFromExplorerInfoMessage": "Créer le fichier **{0}** à **{1}**",
-	"renameFileFromExplorerInfoMessage": "Déplacer et renommer en **{0}**",
-	"createFolderFromExplorerInfoMessage": "Créer le dossier **{0}** en **{1}**",
-	"filesExplorerViewerAriaLabel": "{0}, Explorateur de fichiers",
-	"dropFolders": "Voulez-vous ajouter les dossiers à l’espace de travail ?",
-	"dropFolder": "Voulez-vous ajouter le dossier à l’espace de travail ?",
-	"addFolders": "&&Ajouter les dossiers",
-	"addFolder": "&&Ajouter le dossier",
-	"confirmRootsMove": "Êtes-vous sûr de vouloir modifier l’ordre de plusieurs dossiers de la racine dans votre espace de travail ?",
-	"confirmMultiMove": "Êtes-vous sûr de vouloir déplacer les fichiers '{0}' suivants ?",
-	"confirmRootMove": "Êtes-vous sûr de vouloir modifier l’ordre de dossier racine '{0}' dans votre espace de travail ?",
-	"confirmMove": "Êtes-vous certain de vouloir déplacer '{0}' ?",
-	"doNotAskAgain": "Ne plus me demander",
-	"moveButtonLabel": "&&Déplacer",
-	"confirmOverwriteMessage": "{0}' existe déjà dans le dossier de destination. Voulez-vous le remplacer ?",
-	"irreversible": "Cette action est irréversible !",
-	"replaceButtonLabel": "&&Remplacer"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json b/i18n/fra/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json
deleted file mode 100644
index 68bdf7d5c3b..00000000000
--- a/i18n/fra/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openEditors": "Éditeurs ouverts",
-	"openEditosrSection": "Section des éditeurs ouverts",
-	"dirtyCounter": "{0} non enregistré(s)"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/files/electron-browser/views/openEditorsViewer.i18n.json b/i18n/fra/src/vs/workbench/parts/files/electron-browser/views/openEditorsViewer.i18n.json
deleted file mode 100644
index 22721e1c8bc..00000000000
--- a/i18n/fra/src/vs/workbench/parts/files/electron-browser/views/openEditorsViewer.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"editorGroupAriaLabel": "{0}, groupe d'éditeurs",
-	"openEditorAriaLabel": "{0}, Ouvrir l'éditeur",
-	"saveAll": "Enregistrer tout",
-	"closeAllUnmodified": "Fermer les éléments non modifiés",
-	"closeAll": "Tout fermer",
-	"compareWithSaved": "Comparer avec celui enregistré",
-	"close": "Fermer",
-	"closeOthers": "Fermer les autres"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/git/browser/gitActions.contribution.i18n.json b/i18n/fra/src/vs/workbench/parts/git/browser/gitActions.contribution.i18n.json
deleted file mode 100644
index ce74671d263..00000000000
--- a/i18n/fra/src/vs/workbench/parts/git/browser/gitActions.contribution.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"switchToChangesView": "Basculer vers le mode Modifications",
-	"openInEditor": "Basculer vers le mode Éditeur",
-	"workbenchStage": "Indexer",
-	"workbenchUnstage": "Annuler le stockage en zone de transit",
-	"stageSelectedLines": "Stocker les lignes sélectionnées en zone de transit",
-	"unstageSelectedLines": "Désindexer les lignes sélectionnées",
-	"revertSelectedLines": "Restaurer les lignes sélectionnées",
-	"confirmRevertMessage": "Voulez-vous vraiment restaurer les changements sélectionnés ?",
-	"irreversible": "Cette action est irréversible !",
-	"revertChangesLabel": "&&Restaurer les modifications",
-	"openChange": "Ouvrir la modification",
-	"openFile": "Ouvrir le fichier",
-	"git": "Git"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/git/browser/gitActions.i18n.json b/i18n/fra/src/vs/workbench/parts/git/browser/gitActions.i18n.json
deleted file mode 100644
index 71f02b1e0ef..00000000000
--- a/i18n/fra/src/vs/workbench/parts/git/browser/gitActions.i18n.json
+++ /dev/null
@@ -1,46 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"openChange": "Ouvrir la modification",
-	"openFile": "Ouvrir le fichier",
-	"init": "Init",
-	"refresh": "Actualiser",
-	"stageChanges": "Indexer",
-	"stageAllChanges": "Stocker tout en zone de transit",
-	"confirmUndoMessage": "Voulez-vous vraiment supprimer toutes les modifications ?",
-	"confirmUndoAllOne": "Il existe des modifications non prêtes à être validées dans {0} fichier.\n\nCette action est irréversible !",
-	"confirmUndoAllMultiple": "Il existe des modifications non prêtes à être validées dans {0} fichiers.\n\nCette action est irréversible !",
-	"cleanChangesLabel": "&&Supprimer les modifications",
-	"confirmUndo": "Voulez-vous vraiment supprimer les modifications apportées à '{0}' ?",
-	"irreversible": "Cette action est irréversible !",
-	"undoChanges": "Nettoyer",
-	"undoAllChanges": "Nettoyer tout",
-	"unstage": "Annuler le stockage en zone de transit",
-	"unstageAllChanges": "Annuler tout le stockage en zone de transit",
-	"dirtyTreeCheckout": "Extraction impossible. Validez ou remisez (stash) d'abord votre travail.",
-	"commitStaged": "Valider le contenu en zone de transit",
-	"commitStagedAmend": "Valider les modifications en attente (modifier)",
-	"commitStagedSignedOff": "Valider les modifications en attente (signé)",
-	"commit": "Commit",
-	"commitMessage": "Valider le message",
-	"commitAll": "Valider tout",
-	"commitAllSignedOff": "Valider tout (signé)",
-	"commitAll2": "Valider tout",
-	"commitStaged2": "Valider le contenu en zone de transit",
-	"dirtyTreePull": "Extraction impossible. Validez ou remisez (stash) d'abord votre travail.",
-	"authFailed": "Échec de l'authentification durant l'opération git remote.",
-	"pushToRemote": "Transfert (Push) vers...",
-	"pushToRemotePickMessage": "Choisissez un dépôt distant où effectuer un transfert (Push) de la branche '{0}' :",
-	"publish": "Publier",
-	"confirmPublishMessage": "Voulez-vous vraiment publier '{0}' sur '{1}' ?",
-	"confirmPublishMessageButton": "&&Publier",
-	"publishPickMessage": "Choisissez un dépôt distant où publier la branche '{0}' :",
-	"sync is unpredictable": "Cette action effectue un transfert (Push) et un tirage (Pull) des validations à destination et en provenance de '{0}'.",
-	"ok": "OK",
-	"cancel": "Annuler",
-	"never again": "OK, ne plus afficher",
-	"undoLastCommit": "Annuler la dernière validation"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/git/browser/gitQuickOpen.i18n.json b/i18n/fra/src/vs/workbench/parts/git/browser/gitQuickOpen.i18n.json
deleted file mode 100644
index 37366b8eba2..00000000000
--- a/i18n/fra/src/vs/workbench/parts/git/browser/gitQuickOpen.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"refAriaLabel": "{0}, git",
-	"checkoutBranch": "Branche sur {0}",
-	"checkoutRemoteBranch": "Branche distante à {0}",
-	"checkoutTag": "Étiquette à {0}",
-	"alreadyCheckedOut": "La branche {0} est déjà la branche active",
-	"branchAriaLabel": "{0}, branche git",
-	"createBranch": "Créer une branche {0}",
-	"noBranches": "Aucune autre branche",
-	"notValidBranchName": "Fournissez un nom de branche valide"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/git/browser/gitServices.i18n.json b/i18n/fra/src/vs/workbench/parts/git/browser/gitServices.i18n.json
deleted file mode 100644
index 3f9d33853e4..00000000000
--- a/i18n/fra/src/vs/workbench/parts/git/browser/gitServices.i18n.json
+++ /dev/null
@@ -1,30 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"cantOpen": "Impossible d'ouvrir cette ressource git.",
-	"gitIndexChanges": "{0} (index) ↔ {1}",
-	"gitIndexChangesDesc": "{0} - Modifications de l'index",
-	"gitIndexChangesRenamed": "{0} ← {1}",
-	"gitIndexChangesRenamedDesc": "{0} - Renommé - Modifications de l'index",
-	"workingTreeChanges": "{0} (HEAD) ↔ {1}",
-	"workingTreeChangesDesc": "{0} - Modifications de l'arborescence de travail",
-	"gitMergeChanges": "{0} (merge) ↔ {1}",
-	"gitMergeChangesDesc": "{0} - Fusionner les modifications",
-	"updateGit": "Il semble que git {0} soit installé. Code fonctionne mieux avec git >=2.0.0.",
-	"download": "Télécharger",
-	"neverShowAgain": "Ne plus afficher",
-	"configureUsernameEmail": "Configurez votre nom d'utilisateur et votre adresse de messagerie git.",
-	"badConfigFile": "Git {0}",
-	"unmergedChanges": "Vous devez tout d'abord résoudre les modifications non fusionnées avant de valider vos modifications.",
-	"showOutput": "Afficher la sortie",
-	"cancel": "Annuler",
-	"checkNativeConsole": "Un problème s'est produit durant l'exécution d'une opération git. Examinez la sortie, ou utilisez une console pour vérifier l'état de votre dépôt.",
-	"changesFromIndex": "{0} (index)",
-	"changesFromIndexDesc": "{0} - Modifications de l'index",
-	"changesFromTree": "{0} ({1})",
-	"changesFromTreeDesc": "{0} - Modifications sur {1}",
-	"cantOpenResource": "Impossible d'ouvrir cette ressource git."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/git/browser/gitWidgets.i18n.json b/i18n/fra/src/vs/workbench/parts/git/browser/gitWidgets.i18n.json
deleted file mode 100644
index e9f89cb235d..00000000000
--- a/i18n/fra/src/vs/workbench/parts/git/browser/gitWidgets.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"publishBranch": "Publier la branche",
-	"syncBranch": "Synchroniser les modifications",
-	"gitNotEnabled": "Git n'est pas activé dans cet espace de travail."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/git/browser/gitWorkbenchContributions.i18n.json b/i18n/fra/src/vs/workbench/parts/git/browser/gitWorkbenchContributions.i18n.json
deleted file mode 100644
index 6397decbe69..00000000000
--- a/i18n/fra/src/vs/workbench/parts/git/browser/gitWorkbenchContributions.i18n.json
+++ /dev/null
@@ -1,23 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"gitProgressBadge": "État d'exécution de git",
-	"gitPendingChangesBadge": "{0} changements en attente",
-	"toggleGitViewlet": "Afficher Git",
-	"git": "Git",
-	"view": "Affichage",
-	"gitCommands": "Commandes Git",
-	"gitConfigurationTitle": "Git",
-	"gitEnabled": "Vérification de l'activation de git",
-	"gitPath": "Chemin d'accès à l'exécutable git",
-	"gitAutoRefresh": "Indique si l'actualisation automatique est activée",
-	"gitAutoFetch": "Indique si l'extraction automatique est activée.",
-	"gitLongCommit": "Si les messages de validation longs doivent faire l'objet d'un avertissement.",
-	"gitLargeRepos": "Toujours autoriser la gestion des grands référentiels par le code.",
-	"confirmSync": "Confirmez avant de synchroniser des dépôts git.",
-	"countBadge": "Contrôle le compteur de badges git.",
-	"checkoutType": "Contrôle le type des branches listées."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/git/browser/views/changes/changesView.i18n.json b/i18n/fra/src/vs/workbench/parts/git/browser/views/changes/changesView.i18n.json
deleted file mode 100644
index a46f2a73289..00000000000
--- a/i18n/fra/src/vs/workbench/parts/git/browser/views/changes/changesView.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"needMessage": "Indiquez un message de validation. Vous pouvez toujours appuyer sur **{0}** pour valider les modifications. S'il existe des modifications en zone de transit, seules ces dernières sont validées ; sinon, toutes les modifications sont validées.",
-	"nothingToCommit": "Quand il existe des modifications à valider, tapez le message de validation et appuyez sur **{0}** pour valider les modifications. S'il existe des modifications en zone de transit, seules ces dernières sont validées ; sinon, toutes les modifications sont validées.",
-	"longCommit": "Il est recommandé de limiter la première ligne de la validation à 50 caractères. N'hésitez pas à utiliser d'autres lignes pour ajouter des informations.",
-	"commitMessage": "Message (press {0} to commit)",
-	"commitMessageAriaLabel": "Git : tapez le message de validation, puis appuyez sur {0} pour valider",
-	"treeAriaLabel": "Affichage des modifications Git",
-	"showOutput": "Afficher la sortie Git"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/git/browser/views/changes/changesViewer.i18n.json b/i18n/fra/src/vs/workbench/parts/git/browser/views/changes/changesViewer.i18n.json
deleted file mode 100644
index 7c6c8c4b8a5..00000000000
--- a/i18n/fra/src/vs/workbench/parts/git/browser/views/changes/changesViewer.i18n.json
+++ /dev/null
@@ -1,38 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"stagedChanges": "Modifications en zone de transit",
-	"allChanges": "Modifications",
-	"mergeChanges": "Fusionner les modifications",
-	"outsideOfWorkspace": "Ce fichier se trouve en dehors de l'espace de travail actuel.",
-	"modified-char": "M",
-	"added-char": "A",
-	"deleted-char": "D",
-	"renamed-char": "R",
-	"copied-char": "C",
-	"untracked-char": "U",
-	"ignored-char": "!",
-	"title-index-modified": "Modifié dans l'index",
-	"title-modified": "Modifié",
-	"title-index-added": "Ajouté à l'index",
-	"title-index-deleted": "Supprimé dans l'index",
-	"title-deleted": "Supprimé",
-	"title-index-renamed": "Renommé dans l'index",
-	"title-index-copied": "Copié dans l'index",
-	"title-untracked": "Non suivi",
-	"title-ignored": "Ignoré",
-	"title-conflict-both-deleted": "Conflit : supprimé par eux et nous",
-	"title-conflict-added-by-us": "Conflit : ajouté par nous",
-	"title-conflict-deleted-by-them": "Conflit : supprimé par eux",
-	"title-conflict-added-by-them": "Conflit : ajouté par eux",
-	"title-conflict-deleted-by-us": "Conflit : supprimé par nous",
-	"title-conflict-both-added": "Conflit : ajouté par eux et nous",
-	"title-conflict-both-modified": "Conflit : modifié par eux et nous",
-	"fileStatusAriaLabel": "Le fichier {0} dans le dossier {1} est à l'état {2}, Git",
-	"ariaLabelStagedChanges": "Modifications en attente de validation, Git",
-	"ariaLabelChanges": "Modifications, Git",
-	"ariaLabelMerge": "Fusion, Git"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/git/browser/views/disabled/disabledView.i18n.json b/i18n/fra/src/vs/workbench/parts/git/browser/views/disabled/disabledView.i18n.json
deleted file mode 100644
index 138e178dc63..00000000000
--- a/i18n/fra/src/vs/workbench/parts/git/browser/views/disabled/disabledView.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"disabled": "Git est désactivé dans les paramètres."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/git/browser/views/empty/emptyView.i18n.json b/i18n/fra/src/vs/workbench/parts/git/browser/views/empty/emptyView.i18n.json
deleted file mode 100644
index a837e441867..00000000000
--- a/i18n/fra/src/vs/workbench/parts/git/browser/views/empty/emptyView.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"noGit": "Cet espace de travail n'est pas encore sous contrôle de code source git.",
-	"gitinit": "Initialiser le dépôt Git"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/git/browser/views/gitless/gitlessView.i18n.json b/i18n/fra/src/vs/workbench/parts/git/browser/views/gitless/gitlessView.i18n.json
deleted file mode 100644
index a7e0528633b..00000000000
--- a/i18n/fra/src/vs/workbench/parts/git/browser/views/gitless/gitlessView.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"macInstallWith": "Vous pouvez l'installer avec {0}, le télécharger à partir de {1} ou installer les outils de développement en ligne de commande {2}, en tapant simplement {3} à une invite de Terminal.",
-	"winInstallWith": "Vous pouvez l'installer avec {0} ou le télécharger à partir de {1}.",
-	"linuxDownloadFrom": "Vous pouvez le télécharger à partir de {0}.",
-	"downloadFrom": "Vous pouvez le télécharger à partir de {0}.",
-	"looksLike": "Il semble que git ne soit pas installé sur votre système.",
-	"pleaseRestart": "Une fois git installé, redémarrez VSCode."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/git/browser/views/huge/hugeView.i18n.json b/i18n/fra/src/vs/workbench/parts/git/browser/views/huge/hugeView.i18n.json
deleted file mode 100644
index 83eb048c7cd..00000000000
--- a/i18n/fra/src/vs/workbench/parts/git/browser/views/huge/hugeView.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"huge": "Votre dépôt semble comporter de nombreux changements actifs.\nCela peut entraîner un ralentissement important de Code.",
-	"setting": "Vous pouvez désactiver définitivement cet avertissement avec le paramètre suivant :",
-	"allo": "Autoriser les dépôts de grande taille"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/git/browser/views/notroot/notrootView.i18n.json b/i18n/fra/src/vs/workbench/parts/git/browser/views/notroot/notrootView.i18n.json
deleted file mode 100644
index ffa2b9108fd..00000000000
--- a/i18n/fra/src/vs/workbench/parts/git/browser/views/notroot/notrootView.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"wrongRoot": "Ce répertoire semble être contenu dans un dépôt git.",
-	"pleaseRestart": "Ouvrez le répertoire racine du dépôt pour accéder aux fonctionnalités Git."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/git/browser/views/noworkspace/noworkspaceView.i18n.json b/i18n/fra/src/vs/workbench/parts/git/browser/views/noworkspace/noworkspaceView.i18n.json
deleted file mode 100644
index c18c0d3d5d2..00000000000
--- a/i18n/fra/src/vs/workbench/parts/git/browser/views/noworkspace/noworkspaceView.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"noWorkspaceHelp": "Vous n'avez pas encore ouvert de dossier.",
-	"pleaseRestart": "Ouvrez un dossier avec un dépôt Git pour accéder aux fonctionnalités Git.",
-	"openFolder": "Ouvrir le dossier"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/git/electron-browser/git.contribution.i18n.json b/i18n/fra/src/vs/workbench/parts/git/electron-browser/git.contribution.i18n.json
deleted file mode 100644
index 64ab717584c..00000000000
--- a/i18n/fra/src/vs/workbench/parts/git/electron-browser/git.contribution.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"toggleSCMViewlet": "Afficher SCM",
-	"git": "Git"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/git/electron-browser/gitActions.i18n.json b/i18n/fra/src/vs/workbench/parts/git/electron-browser/gitActions.i18n.json
deleted file mode 100644
index 9be19a6f169..00000000000
--- a/i18n/fra/src/vs/workbench/parts/git/electron-browser/gitActions.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"valid": "Indiquez une URL de dépôt Git valide",
-	"url": "URL du dépôt",
-	"directory": "Répertoire du clone de destination",
-	"cloning": "Clonage du dépôt '{0}'...",
-	"already exists": "Le dépôt de destination existe déjà. Choisissez un autre répertoire dans lequel enregistrer le clone."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/git/electron-main/askpassService.i18n.json b/i18n/fra/src/vs/workbench/parts/git/electron-main/askpassService.i18n.json
deleted file mode 100644
index 06ad0299d48..00000000000
--- a/i18n/fra/src/vs/workbench/parts/git/electron-main/askpassService.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"git": "Git"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/git/node/git.lib.i18n.json b/i18n/fra/src/vs/workbench/parts/git/node/git.lib.i18n.json
deleted file mode 100644
index d44d0c870fd..00000000000
--- a/i18n/fra/src/vs/workbench/parts/git/node/git.lib.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"errorBuffer": "Impossible d'ouvrir le fichier à partir de git",
-	"fileBinaryError": "Il semble que le fichier soit binaire. Impossible de l'ouvrir en tant que texte"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/html/browser/html.contribution.i18n.json b/i18n/fra/src/vs/workbench/parts/html/browser/html.contribution.i18n.json
deleted file mode 100644
index 2af49cbd741..00000000000
--- a/i18n/fra/src/vs/workbench/parts/html/browser/html.contribution.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"html.editor.label": "Aperçu HTML"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/html/browser/htmlPreviewPart.i18n.json b/i18n/fra/src/vs/workbench/parts/html/browser/htmlPreviewPart.i18n.json
deleted file mode 100644
index eaf9eb82e46..00000000000
--- a/i18n/fra/src/vs/workbench/parts/html/browser/htmlPreviewPart.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"html.voidInput": "Entrée d'éditeur non valide."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/html/browser/webview.contribution.i18n.json b/i18n/fra/src/vs/workbench/parts/html/browser/webview.contribution.i18n.json
deleted file mode 100644
index dfefdfa0bf8..00000000000
--- a/i18n/fra/src/vs/workbench/parts/html/browser/webview.contribution.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"developer": "Développeur"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/html/browser/webview.i18n.json b/i18n/fra/src/vs/workbench/parts/html/browser/webview.i18n.json
deleted file mode 100644
index 149e3238d48..00000000000
--- a/i18n/fra/src/vs/workbench/parts/html/browser/webview.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"devtools.webview": "Développeur : outils Webview"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/html/browser/webviewCommands.i18n.json b/i18n/fra/src/vs/workbench/parts/html/browser/webviewCommands.i18n.json
deleted file mode 100644
index 992faa16f96..00000000000
--- a/i18n/fra/src/vs/workbench/parts/html/browser/webviewCommands.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"editor.action.webvieweditor.showFind": "Focus sur le widget de recherche",
-	"openToolsLabel": "Ouvrir les outils de développement Webview",
-	"refreshWebviewLabel": "Recharger les Webviews"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json b/i18n/fra/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json
deleted file mode 100644
index 2af49cbd741..00000000000
--- a/i18n/fra/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"html.editor.label": "Aperçu HTML"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json b/i18n/fra/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json
deleted file mode 100644
index eaf9eb82e46..00000000000
--- a/i18n/fra/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"html.voidInput": "Entrée d'éditeur non valide."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json b/i18n/fra/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json
deleted file mode 100644
index dfefdfa0bf8..00000000000
--- a/i18n/fra/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"developer": "Développeur"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json b/i18n/fra/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json
deleted file mode 100644
index 09dc4357050..00000000000
--- a/i18n/fra/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openToolsLabel": "Ouvrir les outils de développement Webview",
-	"refreshWebviewLabel": "Recharger les Webviews"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json b/i18n/fra/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
deleted file mode 100644
index 9139ee20000..00000000000
--- a/i18n/fra/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"updateLocale": "Souhaitez-vous changer la langue de l’interface de VS Code en {0} et redémarrer ?",
-	"yes": "Oui",
-	"no": "Non",
-	"neverAgain": "Ne plus afficher",
-	"JsonSchema.locale": "Langue d'interface utilisateur (IU) à utiliser.",
-	"vscode.extension.contributes.localizations": "Contribuer aux localisations de l’éditeur",
-	"vscode.extension.contributes.localizations.languageId": "Id de la langue dans laquelle les chaînes d’affichage sont traduites.",
-	"vscode.extension.contributes.localizations.languageName": "Nom de la langue en anglais.",
-	"vscode.extension.contributes.localizations.languageNameLocalized": "Nom de la langue dans la langue contribuée.",
-	"vscode.extension.contributes.localizations.translations": "Liste des traductions associées à la langue.",
-	"vscode.extension.contributes.localizations.translations.id": "Id de VS Code ou Extension pour lesquels cette traduction contribue. L'Id de VS Code est toujours `vscode` et d’extension doit être au format `publisherId.extensionName`.",
-	"vscode.extension.contributes.localizations.translations.id.pattern": "L’Id doit être `vscode` ou au format `publisherId.extensionName` pour traduire respectivement VS code ou une extension.",
-	"vscode.extension.contributes.localizations.translations.path": "Un chemin relatif vers un fichier contenant les traductions du langage."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/localizations/browser/localizationsActions.i18n.json b/i18n/fra/src/vs/workbench/parts/localizations/browser/localizationsActions.i18n.json
deleted file mode 100644
index 5144212e713..00000000000
--- a/i18n/fra/src/vs/workbench/parts/localizations/browser/localizationsActions.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"configureLocale": "Configurer la langue",
-	"displayLanguage": "Définit le langage affiché par VSCode.",
-	"doc": "Consultez {0} pour connaître la liste des langues prises en charge.",
-	"restart": "Le changement de la valeur nécessite le redémarrage de VS Code.",
-	"fail.createSettings": "Impossible de créer '{0}' ({1})."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/localizations/electron-browser/localizations.contribution.i18n.json b/i18n/fra/src/vs/workbench/parts/localizations/electron-browser/localizations.contribution.i18n.json
deleted file mode 100644
index ce1503b6dfa..00000000000
--- a/i18n/fra/src/vs/workbench/parts/localizations/electron-browser/localizations.contribution.i18n.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"updateLocale": "Souhaitez-vous changer la langue de l’interface de VS Code en {0} et redémarrer ?",
-	"activateLanguagePack": "Souhaitez-vous redémarrer VS Code pour activer le module linguistique qui vient d'être installé ?",
-	"yes": "Oui",
-	"no": "Non",
-	"neverAgain": "Ne plus afficher",
-	"install language pack": "Prochainement, VS Code prendra en charge uniquement les modules linguistiques sous forme d'extensions Marketplace. Installez l'extension '{0}' pour continuer à utiliser la langue actuellement configurée.",
-	"install": "Installer",
-	"more information": "Plus d'informations...",
-	"JsonSchema.locale": "Langue d'interface utilisateur (IU) à utiliser.",
-	"vscode.extension.contributes.localizations": "Contribuer aux localisations de l’éditeur",
-	"vscode.extension.contributes.localizations.languageId": "Id de la langue dans laquelle les chaînes d’affichage sont traduites.",
-	"vscode.extension.contributes.localizations.languageName": "Nom de la langue en anglais.",
-	"vscode.extension.contributes.localizations.languageNameLocalized": "Nom de la langue dans la langue contribuée.",
-	"vscode.extension.contributes.localizations.translations": "Liste des traductions associées à la langue.",
-	"vscode.extension.contributes.localizations.translations.id": "Id de VS Code ou Extension pour lesquels cette traduction contribue. L'Id de VS Code est toujours `vscode` et d’extension doit être au format `publisherId.extensionName`.",
-	"vscode.extension.contributes.localizations.translations.id.pattern": "L’Id doit être `vscode` ou au format `publisherId.extensionName` pour traduire respectivement VS code ou une extension.",
-	"vscode.extension.contributes.localizations.translations.path": "Un chemin relatif vers un fichier contenant les traductions du langage."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/localizations/electron-browser/localizationsActions.i18n.json b/i18n/fra/src/vs/workbench/parts/localizations/electron-browser/localizationsActions.i18n.json
deleted file mode 100644
index 465c23436b5..00000000000
--- a/i18n/fra/src/vs/workbench/parts/localizations/electron-browser/localizationsActions.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"configureLocale": "Configurer la langue d’affichage",
-	"displayLanguage": "Définit le langage affiché par VSCode.",
-	"doc": "Consultez {0} pour connaître la liste des langues prises en charge.",
-	"restart": "Le changement de la valeur nécessite le redémarrage de VS Code.",
-	"fail.createSettings": "Impossible de créer '{0}' ({1})."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json b/i18n/fra/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json
deleted file mode 100644
index 78c2e49a0fa..00000000000
--- a/i18n/fra/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"mainLog": "Journal (Principal)",
-	"sharedLog": "Journal (Partagé)",
-	"rendererLog": "Journal (Fenêtre)",
-	"extensionsLog": "Journal (Hôte d'extension)",
-	"developer": "Développeur"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json b/i18n/fra/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json
deleted file mode 100644
index a4b260b7b14..00000000000
--- a/i18n/fra/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openLogsFolder": "Ouvrir le dossier des journaux",
-	"showLogs": "Afficher les journaux...",
-	"rendererProcess": "Fenêtre ({0})",
-	"emptyWindow": "Fenêtre",
-	"extensionHost": "Hôte d'extension",
-	"sharedProcess": "Partagé",
-	"mainProcess": "Principal",
-	"selectProcess": "Sélectionnez le journal pour les processus",
-	"openLogFile": "Ouvrir le fichier de log...",
-	"setLogLevel": "Définir le niveau de journalisation (log) ...",
-	"trace": "Trace",
-	"debug": "Déboguer",
-	"info": "Informations",
-	"warn": "Avertissement",
-	"err": "Erreur",
-	"critical": "Critique",
-	"off": "Désactivé",
-	"selectLogLevel": "Sélectionner le niveau de journalisation (log)",
-	"default and current": "Par défaut & actuel",
-	"default": "Par défaut",
-	"current": "Actuel"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/markers/browser/markersFileDecorations.i18n.json b/i18n/fra/src/vs/workbench/parts/markers/browser/markersFileDecorations.i18n.json
deleted file mode 100644
index 37f685827c2..00000000000
--- a/i18n/fra/src/vs/workbench/parts/markers/browser/markersFileDecorations.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"label": "Problèmes",
-	"tooltip.1": "1 problème dans ce fichier",
-	"tooltip.N": "{0} problèmes dans ce fichier",
-	"markers.showOnFile": "Afficher les erreurs & les avertissements sur les fichiers et dossiers."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/markers/browser/markersPanel.i18n.json b/i18n/fra/src/vs/workbench/parts/markers/browser/markersPanel.i18n.json
deleted file mode 100644
index 556e096a283..00000000000
--- a/i18n/fra/src/vs/workbench/parts/markers/browser/markersPanel.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"totalProblems": "Total de {0} problèmes",
-	"filteredProblems": "Affichage de {0} sur {1} problèmes"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/markers/common/markers.i18n.json b/i18n/fra/src/vs/workbench/parts/markers/common/markers.i18n.json
deleted file mode 100644
index 556e096a283..00000000000
--- a/i18n/fra/src/vs/workbench/parts/markers/common/markers.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"totalProblems": "Total de {0} problèmes",
-	"filteredProblems": "Affichage de {0} sur {1} problèmes"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/markers/common/messages.i18n.json b/i18n/fra/src/vs/workbench/parts/markers/common/messages.i18n.json
deleted file mode 100644
index 26c532d9d00..00000000000
--- a/i18n/fra/src/vs/workbench/parts/markers/common/messages.i18n.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"viewCategory": "Affichage",
-	"problems.view.toggle.label": "Activer/désactiver les problèmes (Erreurs, Avertissements, Infos)",
-	"problems.view.focus.label": " Focus sur les problèmes (Erreurs, Avertissements, Infos)",
-	"problems.panel.configuration.title": "Affichage des problèmes",
-	"problems.panel.configuration.autoreveal": "Contrôle si l'affichage des problèmes doit automatiquement montrer les fichiers quand il les ouvre",
-	"markers.panel.title.problems": "Problèmes",
-	"markers.panel.aria.label.problems.tree": "Problèmes regroupés par fichiers",
-	"markers.panel.no.problems.build": "Aucun problème n'a été détecté dans l'espace de travail jusqu'à présent.",
-	"markers.panel.no.problems.filters": "Résultats introuvables avec les critères de filtre fournis",
-	"markers.panel.action.filter": "Filtrer les problèmes",
-	"markers.panel.filter.placeholder": "Filtrer par type ou texte",
-	"markers.panel.filter.errors": "erreurs",
-	"markers.panel.filter.warnings": "avertissements",
-	"markers.panel.filter.infos": "infos",
-	"markers.panel.single.error.label": "1 erreur",
-	"markers.panel.multiple.errors.label": "{0} erreurs",
-	"markers.panel.single.warning.label": "1 avertissement",
-	"markers.panel.multiple.warnings.label": "{0} avertissements",
-	"markers.panel.single.info.label": "1 info",
-	"markers.panel.multiple.infos.label": "{0} infos",
-	"markers.panel.single.unknown.label": "1 inconnu",
-	"markers.panel.multiple.unknowns.label": "{0} inconnus",
-	"markers.panel.at.ln.col.number": "({0}, {1})",
-	"problems.tree.aria.label.resource": "{0} avec {1} problèmes",
-	"problems.tree.aria.label.error.marker": "Erreur générée par {0} : {1} à la ligne {2} et au caractère {3}",
-	"problems.tree.aria.label.error.marker.nosource": "Erreur : {0} à la ligne {1} et au caractère {2}",
-	"problems.tree.aria.label.warning.marker": "Avertissement généré par {0} : {1} à la ligne {2} et au caractère {3}",
-	"problems.tree.aria.label.warning.marker.nosource": "Avertissement : {0} à la ligne {1} et au caractère {2}",
-	"problems.tree.aria.label.info.marker": "Information générée par {0} : {1} à la ligne {2} et au caractère {3}",
-	"problems.tree.aria.label.info.marker.nosource": "Information : {0} à la ligne {1} et au caractère {2}",
-	"problems.tree.aria.label.marker": "Problème généré par {0} : {1} à la ligne {2} et au caractère {3}",
-	"problems.tree.aria.label.marker.nosource": "Problème : {0} à la ligne {1} et au caractère {2}",
-	"errors.warnings.show.label": "Afficher les erreurs et les avertissements"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json b/i18n/fra/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json
deleted file mode 100644
index a615adefb9e..00000000000
--- a/i18n/fra/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"copyMarker": "Copier",
-	"copyMessage": "Copier le Message"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/markers/electron-browser/markers.i18n.json b/i18n/fra/src/vs/workbench/parts/markers/electron-browser/markers.i18n.json
deleted file mode 100644
index 6540dc70d56..00000000000
--- a/i18n/fra/src/vs/workbench/parts/markers/electron-browser/markers.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"totalProblems": "Total de {0} problèmes"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/markers/electron-browser/markersElectronContributions.i18n.json b/i18n/fra/src/vs/workbench/parts/markers/electron-browser/markersElectronContributions.i18n.json
deleted file mode 100644
index 680339bdc27..00000000000
--- a/i18n/fra/src/vs/workbench/parts/markers/electron-browser/markersElectronContributions.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"copyMarker": "Copier",
-	"copyMarkerMessage": "Copier le Message"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.i18n.json b/i18n/fra/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.i18n.json
deleted file mode 100644
index 37f685827c2..00000000000
--- a/i18n/fra/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"label": "Problèmes",
-	"tooltip.1": "1 problème dans ce fichier",
-	"tooltip.N": "{0} problèmes dans ce fichier",
-	"markers.showOnFile": "Afficher les erreurs & les avertissements sur les fichiers et dossiers."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/markers/electron-browser/markersPanel.i18n.json b/i18n/fra/src/vs/workbench/parts/markers/electron-browser/markersPanel.i18n.json
deleted file mode 100644
index cd138c0c0a8..00000000000
--- a/i18n/fra/src/vs/workbench/parts/markers/electron-browser/markersPanel.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"disableFilesExclude": "Désactivez le filtre d'exclusion de fichiers.",
-	"clearFilter": "Effacer le filtre."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/markers/electron-browser/markersPanelActions.i18n.json b/i18n/fra/src/vs/workbench/parts/markers/electron-browser/markersPanelActions.i18n.json
deleted file mode 100644
index 33b575eefc1..00000000000
--- a/i18n/fra/src/vs/workbench/parts/markers/electron-browser/markersPanelActions.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"showing filtered problems": "Afficher {0} sur {1}"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json b/i18n/fra/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
deleted file mode 100644
index f31962ae04c..00000000000
--- a/i18n/fra/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"viewCategory": "Affichage",
-	"problems.view.toggle.label": "Activer/désactiver les problèmes (Erreurs, Avertissements, Infos)",
-	"problems.view.focus.label": " Focus sur les problèmes (Erreurs, Avertissements, Infos)",
-	"problems.panel.configuration.title": "Affichage des problèmes",
-	"problems.panel.configuration.autoreveal": "Contrôle si l'affichage des problèmes doit automatiquement montrer les fichiers quand il les ouvre",
-	"markers.panel.title.problems": "Problèmes",
-	"markers.panel.aria.label.problems.tree": "Problèmes regroupés par fichiers",
-	"markers.panel.no.problems.build": "Aucun problème n'a été détecté dans l'espace de travail jusqu'à présent.",
-	"markers.panel.no.problems.filters": "Aucun résultat trouvé avec les critères de filtre fourni.",
-	"markers.panel.no.problems.file.exclusions": "Tous les problèmes sont masqués parce que le filtre d’exclusion de fichiers est activé.",
-	"markers.panel.action.useFilesExclude": "Filtrer en utilisant le paramètre d’exclusion de fichiers",
-	"markers.panel.action.donotUseFilesExclude": "Ne pas utiliser le paramètre d’exclusion de fichiers",
-	"markers.panel.action.filter": "Filtrer les problèmes",
-	"markers.panel.filter.ariaLabel": "Filtrer les problèmes",
-	"markers.panel.filter.placeholder": "Filtre. Par exemple : texte, **/*.ts, !**/node_modules/**",
-	"markers.panel.filter.errors": "erreurs",
-	"markers.panel.filter.warnings": "avertissements",
-	"markers.panel.filter.infos": "infos",
-	"markers.panel.single.error.label": "1 erreur",
-	"markers.panel.multiple.errors.label": "{0} erreurs",
-	"markers.panel.single.warning.label": "1 avertissement",
-	"markers.panel.multiple.warnings.label": "{0} avertissements",
-	"markers.panel.single.info.label": "1 info",
-	"markers.panel.multiple.infos.label": "{0} infos",
-	"markers.panel.single.unknown.label": "1 inconnu",
-	"markers.panel.multiple.unknowns.label": "{0} inconnus",
-	"markers.panel.at.ln.col.number": "({0}, {1})",
-	"problems.tree.aria.label.resource": "{0} avec {1} problèmes",
-	"problems.tree.aria.label.marker.relatedInformation": " Ce problème a des références à {0} emplacements.",
-	"problems.tree.aria.label.error.marker": "Erreur générée par {0} : {1} à la ligne {2} et au caractère {3}. {4}",
-	"problems.tree.aria.label.error.marker.nosource": "Erreur : {0} à la ligne {1} et au caractère {2}.{3}",
-	"problems.tree.aria.label.warning.marker": "Avertissement généré par {0} : {1} à la ligne {2} et au caractère {3}.{4}",
-	"problems.tree.aria.label.warning.marker.nosource": "Avertissement : {0} à la ligne {1} et au caractère {2}.{3}",
-	"problems.tree.aria.label.info.marker": "Information générée par {0} : {1} à la ligne {2} et au caractère {3}.{4}",
-	"problems.tree.aria.label.info.marker.nosource": "Information : {0} à la ligne {1} et au caractère {2}.{3}",
-	"problems.tree.aria.label.marker": "Problème généré par {0} : {1} à la ligne {2} et au caractère {3}.{4}",
-	"problems.tree.aria.label.marker.nosource": "Problème : {0} à la ligne {1} et au caractère {2}.{3}",
-	"problems.tree.aria.label.relatedinfo.message": "{0} à la ligne {1} et caractère {2} dans {3}",
-	"errors.warnings.show.label": "Afficher les erreurs et les avertissements"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/nps/electron-browser/nps.contribution.i18n.json b/i18n/fra/src/vs/workbench/parts/nps/electron-browser/nps.contribution.i18n.json
deleted file mode 100644
index 18c8f1427ff..00000000000
--- a/i18n/fra/src/vs/workbench/parts/nps/electron-browser/nps.contribution.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"surveyQuestion": "Acceptez-vous de répondre à une enquête rapide ?",
-	"takeSurvey": "Répondre à l'enquête",
-	"remindLater": "Me le rappeler plus tard",
-	"neverAgain": "Ne plus afficher"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/outline/electron-browser/outline.contribution.i18n.json b/i18n/fra/src/vs/workbench/parts/outline/electron-browser/outline.contribution.i18n.json
deleted file mode 100644
index 8f3cb53d9e6..00000000000
--- a/i18n/fra/src/vs/workbench/parts/outline/electron-browser/outline.contribution.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"name": "Contour",
-	"category.focus": "Fichier",
-	"label.focus": "Focus sur Outline"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/outline/electron-browser/outlinePanel.i18n.json b/i18n/fra/src/vs/workbench/parts/outline/electron-browser/outlinePanel.i18n.json
deleted file mode 100644
index 2bcba2947c4..00000000000
--- a/i18n/fra/src/vs/workbench/parts/outline/electron-browser/outlinePanel.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"filter": "Filtre",
-	"collapse": "Réduire tout",
-	"sortByPosition": "Trier par : Position",
-	"sortByName": "Trier par : Nom",
-	"sortByKind": "Trier par : Type",
-	"live": "Suivre le curseur",
-	"no-editor": "Aucun éditeur d'ouvert ne peut fournir des informations générales.",
-	"too-many-symbols": "Nous sommes désolés, mais ce fichier est trop volumineux pour afficher un résumé."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/outline/electron-browser/outlineTree.i18n.json b/i18n/fra/src/vs/workbench/parts/outline/electron-browser/outlineTree.i18n.json
deleted file mode 100644
index cf7406fddb8..00000000000
--- a/i18n/fra/src/vs/workbench/parts/outline/electron-browser/outlineTree.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"outline.title": "la ligne {0} dans {1}"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/output/browser/output.contribution.i18n.json b/i18n/fra/src/vs/workbench/parts/output/browser/output.contribution.i18n.json
deleted file mode 100644
index 1298d315d6c..00000000000
--- a/i18n/fra/src/vs/workbench/parts/output/browser/output.contribution.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"output": "Sortie",
-	"viewCategory": "Affichage",
-	"clearOutput.label": "Effacer la sortie"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/output/browser/outputActions.i18n.json b/i18n/fra/src/vs/workbench/parts/output/browser/outputActions.i18n.json
deleted file mode 100644
index e15ca824e07..00000000000
--- a/i18n/fra/src/vs/workbench/parts/output/browser/outputActions.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleOutput": "Activer/désactiver la sortie",
-	"clearOutput": "Effacer la sortie",
-	"toggleOutputScrollLock": "Activer/désactiver l'arrêt du défilement de la sortie",
-	"switchToOutput.label": "Passer à la sortie",
-	"openInLogViewer": "Ouvrir le fichier de log"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/output/browser/outputPanel.i18n.json b/i18n/fra/src/vs/workbench/parts/output/browser/outputPanel.i18n.json
deleted file mode 100644
index 0a44cdc6ae6..00000000000
--- a/i18n/fra/src/vs/workbench/parts/output/browser/outputPanel.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"output": "Sortie",
-	"outputPanelWithInputAriaLabel": "{0}, Panneau de sortie",
-	"outputPanelAriaLabel": "Panneau de sortie"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/output/common/output.i18n.json b/i18n/fra/src/vs/workbench/parts/output/common/output.i18n.json
deleted file mode 100644
index d1e0fba519e..00000000000
--- a/i18n/fra/src/vs/workbench/parts/output/common/output.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"output": "Sortie",
-	"channel": "pour '{0}'"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json b/i18n/fra/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
deleted file mode 100644
index 25674d1f305..00000000000
--- a/i18n/fra/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"output": "Sortie",
-	"logViewer": "Visualiseur de journal",
-	"viewCategory": "Affichage",
-	"clearOutput.label": "Effacer la sortie",
-	"openActiveLogOutputFile": "Affichage: Ouvrir le fichier de log de sortie actif"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json b/i18n/fra/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json
deleted file mode 100644
index c3e117dc72c..00000000000
--- a/i18n/fra/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"output": "{0} - Sortie",
-	"channel": "Canal de sortie pour '{0}'"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/performance/electron-browser/performance.contribution.i18n.json b/i18n/fra/src/vs/workbench/parts/performance/electron-browser/performance.contribution.i18n.json
deleted file mode 100644
index 0a6aa85c9e2..00000000000
--- a/i18n/fra/src/vs/workbench/parts/performance/electron-browser/performance.contribution.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"prof.message": "Création réussie des profils.",
-	"prof.detail": "Créez un problème et joignez manuellement les fichiers suivants :\n{0}",
-	"prof.restartAndFileIssue": "Créer le problème et redémarrer",
-	"prof.restart": "Redémarrer",
-	"prof.thanks": "Merci de votre aide.",
-	"prof.detail.restart": "Un redémarrage final est nécessaire pour continuer à utiliser '{0}'. Nous vous remercions une fois de plus pour votre contribution."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/performance/electron-browser/startupProfiler.i18n.json b/i18n/fra/src/vs/workbench/parts/performance/electron-browser/startupProfiler.i18n.json
deleted file mode 100644
index db7249ab0ca..00000000000
--- a/i18n/fra/src/vs/workbench/parts/performance/electron-browser/startupProfiler.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"prof.message": "Création réussie des profils.",
-	"prof.detail": "Créez un problème et joignez manuellement les fichiers suivants :\n{0}",
-	"prof.restartAndFileIssue": "Créer le problème et redémarrer",
-	"prof.restart": "Redémarrer",
-	"prof.thanks": "Merci de votre aide.",
-	"prof.detail.restart": "Un redémarrage final est nécessaire pour continuer à utiliser '{0}'. Nous vous remercions une fois de plus pour votre contribution."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/preferences/browser/keybindingWidgets.i18n.json b/i18n/fra/src/vs/workbench/parts/preferences/browser/keybindingWidgets.i18n.json
deleted file mode 100644
index 28ddefd0637..00000000000
--- a/i18n/fra/src/vs/workbench/parts/preferences/browser/keybindingWidgets.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"defineKeybinding.oneExists": "1 commande existante a cette combinaison de touche",
-	"defineKeybinding.existing": "{0} commandes existantes ont ce combinaison de touche",
-	"defineKeybinding.initial": "Appuyez sur la combinaison de touches souhaitée puis appuyez sur Entrée",
-	"defineKeybinding.chordsTo": "pression simultanée avec"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json b/i18n/fra/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
deleted file mode 100644
index 675ad6e2d50..00000000000
--- a/i18n/fra/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"showDefaultKeybindings": "Afficher les raccourcis clavier par défaut",
-	"showUserKeybindings": "Afficher les raccourcis clavier utilisateur",
-	"SearchKeybindings.AriaLabel": "Rechercher dans les combinaisons de touches",
-	"SearchKeybindings.Placeholder": "Rechercher dans les combinaisons de touches",
-	"sortByPrecedene": "Trier par priorité",
-	"header-message": "Pour des personnalisations avancées, ouvrez et modifiez",
-	"keybindings-file-name": "keybindings.json",
-	"keybindingsLabel": "Combinaisons de touches",
-	"changeLabel": "Changer de combinaison de touches",
-	"addLabel": "Ajouter une combinaison de touches",
-	"removeLabel": "Supprimer la combinaison de touches",
-	"resetLabel": "Définir une combinaison de touches",
-	"showSameKeybindings": "Afficher les mêmes raccourcis clavier",
-	"copyLabel": "Copier",
-	"copyCommandLabel": "Copier la Commande",
-	"error": "Erreur '{0}' durant la modification de la combinaison de touches. Ouvrez le fichier 'keybindings.json', puis corrigez les erreurs.",
-	"command": "Commande",
-	"keybinding": "Combinaison de touches",
-	"source": "Source",
-	"when": "Quand",
-	"editKeybindingLabelWithKey": "Changer de combinaison de touches {0}",
-	"editKeybindingLabel": "Changer de combinaison de touches",
-	"addKeybindingLabelWithKey": "Ajouter une combinaison de touches {0}",
-	"addKeybindingLabel": "Ajouter une combinaison de touches",
-	"title": "{0} ({1})",
-	"commandAriaLabel": "Commande : {0}.",
-	"keybindingAriaLabel": "Combinaison de touches : {0}.",
-	"noKeybinding": "Aucune combinaison de touches n'est affectée.",
-	"sourceAriaLabel": "Source : {0}.",
-	"whenAriaLabel": "When : {0}.",
-	"noWhen": "Pas de contexte when."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/preferences/browser/keybindingsEditorContribution.i18n.json b/i18n/fra/src/vs/workbench/parts/preferences/browser/keybindingsEditorContribution.i18n.json
deleted file mode 100644
index 9d8d43d0602..00000000000
--- a/i18n/fra/src/vs/workbench/parts/preferences/browser/keybindingsEditorContribution.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"defineKeybinding.start": "Définir une combinaison de touches",
-	"defineKeybinding.kbLayoutErrorMessage": "Vous ne pouvez pas produire cette combinaison de touches avec la disposition actuelle du clavier.",
-	"defineKeybinding.kbLayoutLocalAndUSMessage": "**{0}** pour votre disposition actuelle du clavier (**{1}** pour le clavier États-Unis standard).",
-	"defineKeybinding.kbLayoutLocalMessage": "**{0}** pour votre disposition actuelle du clavier."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/preferences/browser/preferences.contribution.i18n.json b/i18n/fra/src/vs/workbench/parts/preferences/browser/preferences.contribution.i18n.json
deleted file mode 100644
index b2640dffe87..00000000000
--- a/i18n/fra/src/vs/workbench/parts/preferences/browser/preferences.contribution.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"defaultPreferencesEditor": "Éditeur de préférences par défaut",
-	"keybindingsEditor": "Éditeur de combinaisons de touches",
-	"preferences": "Préférences"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json b/i18n/fra/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
deleted file mode 100644
index e838745aa51..00000000000
--- a/i18n/fra/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openRawDefaultSettings": "Ouvrir les paramètres bruts par défaut",
-	"openSettings2": "Afficher les paramètres (Aperçu)",
-	"openSettings": "Ouvrir les paramètres",
-	"openGlobalSettings": "Ouvrir les paramètres utilisateur",
-	"openGlobalKeybindings": "Ouvrir les raccourcis clavier",
-	"openGlobalKeybindingsFile": "Ouvrir le fichier des raccourcis clavier",
-	"openWorkspaceSettings": "Ouvrir les paramètres d'espace de travail",
-	"openFolderSettings": "Ouvrir le dossier Paramètres",
-	"configureLanguageBasedSettings": "Configurer les paramètres spécifiques au langage...",
-	"languageDescriptionConfigured": "({0})",
-	"pickLanguage": "Sélectionner un langage"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json b/i18n/fra/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
deleted file mode 100644
index 6dca29c55a8..00000000000
--- a/i18n/fra/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"SearchSettingsWidget.AriaLabel": "Paramètres de recherche",
-	"SearchSettingsWidget.Placeholder": "Paramètres de recherche",
-	"noSettingsFound": "Aucun résultat",
-	"oneSettingFound": "1 paramètre trouvé",
-	"settingsFound": "{0} paramètres trouvés",
-	"totalSettingsMessage": "Total de {0} paramètres",
-	"nlpResult": "Résultats en langage naturel",
-	"filterResult": "Résultats filtrés",
-	"defaultSettings": "Paramètres par défaut",
-	"defaultUserSettings": "Paramètres utilisateur par défaut",
-	"defaultWorkspaceSettings": "Paramètres de l'espace de travail par défaut",
-	"defaultFolderSettings": "Paramètres de dossier par défaut",
-	"defaultEditorReadonly": "Modifier dans l’éditeur du côté droit pour substituer les valeurs par défaut.",
-	"preferencesAriaLabel": "Préférences par défaut. Éditeur de texte en lecture seule."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json b/i18n/fra/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
deleted file mode 100644
index def18c92de6..00000000000
--- a/i18n/fra/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"emptyUserSettingsHeader": "Placer vos paramètres ici pour remplacer les paramètres par défaut.",
-	"emptyWorkspaceSettingsHeader": "Placer vos paramètres ici pour remplacer les paramètres utilisateur.",
-	"emptyFolderSettingsHeader": "Placer les paramètres de votre dossier ici pour remplacer ceux des paramètres de l’espace de travail.",
-	"reportSettingsSearchIssue": "Signaler un problème",
-	"newExtensionLabel": "Afficher l’Extension \"{0}\"",
-	"editTtile": "Modifier",
-	"replaceDefaultValue": "Remplacer dans les paramètres",
-	"copyDefaultValue": "Copier dans Paramètres"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/preferences/browser/preferencesService.i18n.json b/i18n/fra/src/vs/workbench/parts/preferences/browser/preferencesService.i18n.json
deleted file mode 100644
index 58fa7022cd8..00000000000
--- a/i18n/fra/src/vs/workbench/parts/preferences/browser/preferencesService.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openFolderFirst": "Ouvrir d'abord un dossier pour créer les paramètres d'espace de travail",
-	"emptyKeybindingsHeader": "Placez vos combinaisons de touches dans ce fichier pour remplacer les valeurs par défaut",
-	"defaultKeybindings": "Combinaisons de touches par défaut",
-	"folderSettingsName": "{0} (Paramètres du dossier)",
-	"fail.createSettings": "Impossible de créer '{0}' ({1})."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json b/i18n/fra/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
deleted file mode 100644
index 40cb14d81b2..00000000000
--- a/i18n/fra/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"defaultSettings": "Placez vos paramètres dans l’éditeur du côté droit pour substituer.",
-	"noSettingsFound": "Aucun paramètre.",
-	"settingsSwitcherBarAriaLabel": "Sélecteur de paramètres",
-	"userSettings": "Paramètres utilisateur",
-	"workspaceSettings": "Paramètres de l'espace de travail",
-	"folderSettings": "Paramètres de dossier"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/preferences/browser/settingsEditor2.i18n.json b/i18n/fra/src/vs/workbench/parts/preferences/browser/settingsEditor2.i18n.json
deleted file mode 100644
index 8b61efa5b2e..00000000000
--- a/i18n/fra/src/vs/workbench/parts/preferences/browser/settingsEditor2.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"previewWarning": "Aperçu",
-	"previewLabel": "Il s’agit d’un aperçu de notre nouvel éditeur de paramètres",
-	"SearchSettings.AriaLabel": "Paramètres de recherche",
-	"SearchSettings.Placeholder": "Paramètres de recherche",
-	"advancedCustomizationLabel": "Pour des personnalisations avancées, ouvrez et modifiez",
-	"openSettingsLabel": "settings.json",
-	"showOverriddenOnly": "Afficher les modifiés uniquement",
-	"treeAriaLabel": "Paramètres",
-	"feedbackButtonLabel": "Fournir un Feedback"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/preferences/browser/settingsTree.i18n.json b/i18n/fra/src/vs/workbench/parts/preferences/browser/settingsTree.i18n.json
deleted file mode 100644
index c9a7c449c43..00000000000
--- a/i18n/fra/src/vs/workbench/parts/preferences/browser/settingsTree.i18n.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"modifiedItemForeground": "Couleur de premier plan d'un paramètre modifié.",
-	"workspace": "Espace de travail",
-	"user": "Utilisateur",
-	"resetButtonTitle": "réinitialiser",
-	"configured": "Modifié",
-	"alsoConfiguredIn": "Également modifiés dans",
-	"configuredIn": "Modifié dans",
-	"editInSettingsJson": "Modifier dans settings.json",
-	"settingRowAriaLabel": "{0} {1}, Paramètre",
-	"groupRowAriaLabel": "{0}, groupe"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/preferences/common/keybindingsEditorModel.i18n.json b/i18n/fra/src/vs/workbench/parts/preferences/common/keybindingsEditorModel.i18n.json
deleted file mode 100644
index dfaafa780da..00000000000
--- a/i18n/fra/src/vs/workbench/parts/preferences/common/keybindingsEditorModel.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"default": "Par défaut",
-	"user": "Utilisateur",
-	"meta": "méta",
-	"option": "option"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/preferences/common/preferences.i18n.json b/i18n/fra/src/vs/workbench/parts/preferences/common/preferences.i18n.json
deleted file mode 100644
index f58552294f1..00000000000
--- a/i18n/fra/src/vs/workbench/parts/preferences/common/preferences.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"userSettingsTarget": "Paramètres utilisateur",
-	"workspaceSettingsTarget": "Paramètres de l'espace de travail"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json b/i18n/fra/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json
deleted file mode 100644
index e65303731cd..00000000000
--- a/i18n/fra/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"commonlyUsed": "Utilisés le plus souvent",
-	"defaultKeybindingsHeader": "Remplacez les combinaisons de touches dans votre fichier de combinaisons de touches."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/preferences/electron-browser/preferences.contribution.i18n.json b/i18n/fra/src/vs/workbench/parts/preferences/electron-browser/preferences.contribution.i18n.json
deleted file mode 100644
index afa10504ba6..00000000000
--- a/i18n/fra/src/vs/workbench/parts/preferences/electron-browser/preferences.contribution.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"defaultPreferencesEditor": "Éditeur de préférences par défaut",
-	"settingsEditor2": "Éditeur de paramètres 2",
-	"keybindingsEditor": "Éditeur de combinaisons de touches",
-	"preferences": "Préférences"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/quickopen/browser/commandsHandler.i18n.json b/i18n/fra/src/vs/workbench/parts/quickopen/browser/commandsHandler.i18n.json
deleted file mode 100644
index da4df82ffe7..00000000000
--- a/i18n/fra/src/vs/workbench/parts/quickopen/browser/commandsHandler.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"showTriggerActions": "Afficher toutes les commandes",
-	"clearCommandHistory": "Effacer l'historique de commandes",
-	"showCommands.label": "Palette de commandes...",
-	"entryAriaLabelWithKey": "{0}, {1}, commandes",
-	"entryAriaLabel": "{0}, commandes",
-	"actionNotEnabled": "La commande '{0}' n'est pas activée dans le contexte actuel.",
-	"canNotRun": "La commande '{0}' a abouti à une erreur.",
-	"recentlyUsed": "récemment utilisées",
-	"morecCommands": "autres commandes",
-	"cat.title": "{0} : {1}",
-	"noCommandsMatching": "Aucune commande correspondante"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/quickopen/browser/gotoLineHandler.i18n.json b/i18n/fra/src/vs/workbench/parts/quickopen/browser/gotoLineHandler.i18n.json
deleted file mode 100644
index 09cd1e711c8..00000000000
--- a/i18n/fra/src/vs/workbench/parts/quickopen/browser/gotoLineHandler.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"gotoLine": "Atteindre la ligne...",
-	"gotoLineLabelEmptyWithLimit": "Tapez un numéro de ligne à atteindre entre 1 et {0}",
-	"gotoLineLabelEmpty": "Tapez un numéro de ligne à atteindre.",
-	"gotoLineColumnLabel": "Atteindre la ligne {0} et le caractère {1}",
-	"gotoLineLabel": "Atteindre la ligne {0}",
-	"gotoLineHandlerAriaLabel": "Tapez un numéro de ligne à atteindre.",
-	"cannotRunGotoLine": "Ouvrir d'abord un fichier texte pour atteindre une ligne"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/quickopen/browser/gotoSymbolHandler.i18n.json b/i18n/fra/src/vs/workbench/parts/quickopen/browser/gotoSymbolHandler.i18n.json
deleted file mode 100644
index f571995be71..00000000000
--- a/i18n/fra/src/vs/workbench/parts/quickopen/browser/gotoSymbolHandler.i18n.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"gotoSymbol": "Atteindre le symbole dans le fichier...",
-	"symbols": "symboles ({0})",
-	"method": "méthodes ({0})",
-	"function": "fonctions ({0})",
-	"_constructor": "constructeurs ({0})",
-	"variable": "variables ({0})",
-	"class": "classes ({0})",
-	"interface": "interfaces ({0})",
-	"namespace": "espaces de noms ({0})",
-	"package": "packages ({0})",
-	"modules": "modules ({0})",
-	"property": "propriétés ({0})",
-	"enum": "énumérations ({0})",
-	"string": "chaînes ({0})",
-	"rule": "règles ({0})",
-	"file": "fichiers ({0})",
-	"array": "tableaux ({0})",
-	"number": "nombres ({0})",
-	"boolean": "booléens ({0})",
-	"object": "objets ({0})",
-	"key": "touches ({0})",
-	"entryAriaLabel": "{0}, symboles",
-	"noSymbolsMatching": "Aucun symbole correspondant",
-	"noSymbolsFound": "Symboles introuvables",
-	"gotoSymbolHandlerAriaLabel": "Tapez pour réduire le nombre de symboles de l'éditeur actif.",
-	"cannotRunGotoSymbolInFile": "Aucune information sur les symboles pour le fichier",
-	"cannotRunGotoSymbol": "Ouvrir d'abord un fichier texte pour atteindre un symbole"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/quickopen/browser/helpHandler.i18n.json b/i18n/fra/src/vs/workbench/parts/quickopen/browser/helpHandler.i18n.json
deleted file mode 100644
index 668f221fd4b..00000000000
--- a/i18n/fra/src/vs/workbench/parts/quickopen/browser/helpHandler.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"entryAriaLabel": "{0}, aide sur le sélecteur",
-	"globalCommands": "commandes globales",
-	"editorCommands": "commandes de l'éditeur"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json b/i18n/fra/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json
deleted file mode 100644
index 0dd64fdd2e2..00000000000
--- a/i18n/fra/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"view": "Affichage",
-	"commandsHandlerDescriptionDefault": "Commandes d'affichage et d'exécution",
-	"gotoLineDescriptionMac": "Atteindre la ligne",
-	"gotoLineDescriptionWin": "Atteindre la ligne",
-	"gotoSymbolDescription": "Atteindre le symbole dans le fichier",
-	"gotoSymbolDescriptionScoped": "Atteindre le symbole dans le fichier par catégorie",
-	"helpDescription": "Afficher l'aide",
-	"viewPickerDescription": "Ouvrir la vue"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/quickopen/browser/viewPickerHandler.i18n.json b/i18n/fra/src/vs/workbench/parts/quickopen/browser/viewPickerHandler.i18n.json
deleted file mode 100644
index 4ac1393f535..00000000000
--- a/i18n/fra/src/vs/workbench/parts/quickopen/browser/viewPickerHandler.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"entryAriaLabel": "{0}, sélecteur de vues",
-	"views": "Vues",
-	"panels": "Panneaux",
-	"terminals": "Terminal",
-	"terminalTitle": "{0} : {1}",
-	"channels": "Sortie",
-	"openView": "Ouvrir la vue",
-	"quickOpenView": "Mode Quick Open"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.i18n.json b/i18n/fra/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.i18n.json
deleted file mode 100644
index 31cb132ffd5..00000000000
--- a/i18n/fra/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"relaunchSettingMessage": "Un paramètre a changé et nécessite un redémarrage pour être appliqué.",
-	"relaunchSettingDetail": "Appuyez sur le bouton de redémarrage pour redémarrer {0} et activer le paramètre.",
-	"restart": "&&Redémarrer"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.i18n.json b/i18n/fra/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.i18n.json
deleted file mode 100644
index fa6244d3c20..00000000000
--- a/i18n/fra/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.i18n.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"changes": "{0} sur {1} modifications",
-	"change": "{0} sur {1} modification",
-	"show previous change": "Voir la modification précédente",
-	"show next change": "Voir la modification suivante",
-	"move to previous change": "Aller à la modification précédente",
-	"move to next change": "Aller à la modification suivante",
-	"editorGutterModifiedBackground": "Couleur d'arrière-plan de la reliure de l'éditeur pour les lignes modifiées.",
-	"editorGutterAddedBackground": "Couleur d'arrière-plan de la reliure de l'éditeur pour les lignes ajoutées.",
-	"editorGutterDeletedBackground": "Couleur d'arrière-plan de la reliure de l'éditeur pour les lignes supprimées.",
-	"overviewRulerModifiedForeground": "Couleur du marqueur de la règle d'aperçu pour le contenu modifié.",
-	"overviewRulerAddedForeground": "Couleur du marqueur de la règle d'aperçu pour le contenu ajouté.",
-	"overviewRulerDeletedForeground": "Couleur du marqueur de la règle d'aperçu pour le contenu supprimé."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json b/i18n/fra/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
deleted file mode 100644
index cff66834ecd..00000000000
--- a/i18n/fra/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleGitViewlet": "Afficher Git",
-	"source control": "Contrôle de code source",
-	"toggleSCMViewlet": "Afficher SCM",
-	"view": "Afficher",
-	"scmConfigurationTitle": "SCM",
-	"alwaysShowProviders": "S'il faut toujours afficher la section Fournisseur de contrôle de code source.",
-	"diffDecorations": "Contrôle les décorations diff dans l'éditeur",
-	"diffGutterWidth": "Contrôle la largeur (px) des décorations diff dans la gouttière (ajoutées et modifiées)"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/scm/electron-browser/scmActivity.i18n.json b/i18n/fra/src/vs/workbench/parts/scm/electron-browser/scmActivity.i18n.json
deleted file mode 100644
index 554d6816330..00000000000
--- a/i18n/fra/src/vs/workbench/parts/scm/electron-browser/scmActivity.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"scmPendingChangesBadge": "{0} changements en attente"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/scm/electron-browser/scmMenus.i18n.json b/i18n/fra/src/vs/workbench/parts/scm/electron-browser/scmMenus.i18n.json
deleted file mode 100644
index 90044a6bbbc..00000000000
--- a/i18n/fra/src/vs/workbench/parts/scm/electron-browser/scmMenus.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"installAdditionalSCMProviders": "Installer des fournisseurs SCM supplémentaires...",
-	"switch provider": "Changer de fournisseur GCL..."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json b/i18n/fra/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
deleted file mode 100644
index 4bae27c08c3..00000000000
--- a/i18n/fra/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"scm providers": "Fournisseurs de contrôle de code source",
-	"hideRepository": "Masquer",
-	"installAdditionalSCMProviders": "Installer des fournisseurs SCM supplémentaires...",
-	"no open repo": "Il n’y a aucun fournisseur de contrôle de code source actif.",
-	"source control": "Contrôle de code source",
-	"viewletTitle": "{0} : {1}",
-	"hideView": "Masquer"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/search/browser/openAnythingHandler.i18n.json b/i18n/fra/src/vs/workbench/parts/search/browser/openAnythingHandler.i18n.json
deleted file mode 100644
index 96c30c435f3..00000000000
--- a/i18n/fra/src/vs/workbench/parts/search/browser/openAnythingHandler.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"fileAndTypeResults": "Résultats des fichiers et des symboles",
-	"fileResults": "fichier de résultats"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/search/browser/openFileHandler.i18n.json b/i18n/fra/src/vs/workbench/parts/search/browser/openFileHandler.i18n.json
deleted file mode 100644
index b4bb697b751..00000000000
--- a/i18n/fra/src/vs/workbench/parts/search/browser/openFileHandler.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"entryAriaLabel": "{0}, sélecteur de fichiers",
-	"searchResults": "résultats de la recherche"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/search/browser/openSymbolHandler.i18n.json b/i18n/fra/src/vs/workbench/parts/search/browser/openSymbolHandler.i18n.json
deleted file mode 100644
index 15c43ff644f..00000000000
--- a/i18n/fra/src/vs/workbench/parts/search/browser/openSymbolHandler.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"entryAriaLabel": "{0}, sélecteur de symboles",
-	"symbols": "résultats des symboles",
-	"noSymbolsMatching": "Aucun symbole correspondant",
-	"noSymbolsWithoutInput": "Tapez pour rechercher des symboles"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/search/browser/patternInputWidget.i18n.json b/i18n/fra/src/vs/workbench/parts/search/browser/patternInputWidget.i18n.json
deleted file mode 100644
index 2676063257f..00000000000
--- a/i18n/fra/src/vs/workbench/parts/search/browser/patternInputWidget.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"defaultLabel": "entrée",
-	"useExcludesAndIgnoreFilesDescription": "Utiliser les paramètres d'exclusion et ignorer les fichiers"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/search/browser/replaceService.i18n.json b/i18n/fra/src/vs/workbench/parts/search/browser/replaceService.i18n.json
deleted file mode 100644
index 9d1480f139a..00000000000
--- a/i18n/fra/src/vs/workbench/parts/search/browser/replaceService.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"fileReplaceChanges": "{0} ↔ {1} (Replace Preview)"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/search/browser/search.contribution.i18n.json b/i18n/fra/src/vs/workbench/parts/search/browser/search.contribution.i18n.json
deleted file mode 100644
index e89ff759730..00000000000
--- a/i18n/fra/src/vs/workbench/parts/search/browser/search.contribution.i18n.json
+++ /dev/null
@@ -1,22 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"showTriggerActions": "Atteindre le symbole dans l'espace de travail...",
-	"name": "Rechercher",
-	"search": "Rechercher",
-	"view": "Affichage",
-	"openAnythingHandlerDescription": "Accéder au fichier",
-	"openSymbolDescriptionNormal": "Atteindre le symbole dans l'espace de travail",
-	"searchOutputChannelTitle": "Rechercher",
-	"searchConfigurationTitle": "Rechercher",
-	"exclude": "Configurez les modèles Glob pour exclure les fichiers et les dossiers des recherches. Hérite de tous les modèles Glob à partir du paramètre files.exclude.",
-	"exclude.boolean": "Modèle Glob auquel les chemins de fichiers doivent correspondre. Affectez la valeur true ou false pour activer ou désactiver le modèle.",
-	"exclude.when": "Vérification supplémentaire des frères d'un fichier correspondant. Utilisez $(basename) comme variable pour le nom de fichier correspondant.",
-	"useRipgrep": "Contrôle si ripgrep doit être utilisé dans la recherche de texte et de fichier",
-	"useIgnoreFiles": "Contrôle s'il faut utiliser les fichiers .gitignore et .ignore par défaut pendant la recherche de fichiers.",
-	"search.quickOpen.includeSymbols": "Configurez l'ajout des résultats d'une recherche de symboles globale dans le fichier de résultats pour Quick Open.",
-	"search.followSymlinks": "Détermine s’il faut suivre les liens symboliques lors de la recherche."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/search/browser/searchActions.i18n.json b/i18n/fra/src/vs/workbench/parts/search/browser/searchActions.i18n.json
deleted file mode 100644
index 7927ac428c9..00000000000
--- a/i18n/fra/src/vs/workbench/parts/search/browser/searchActions.i18n.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"nextSearchIncludePattern": "Afficher le prochain Include Pattern de recherche",
-	"previousSearchIncludePattern": "Afficher le précédent Include Pattern de recherche",
-	"nextSearchExcludePattern": "Afficher le prochain Exclude Pattern de recherche",
-	"previousSearchExcludePattern": "Afficher le précédent Exclude Pattern de recherche",
-	"nextSearchTerm": "Afficher le terme de recherche suivant",
-	"previousSearchTerm": "Afficher le terme de recherche précédent",
-	"nextReplaceTerm": "Voir le terme de recherche suivant à remplacer",
-	"previousReplaceTerm": "Voir le terme de recherche précédent à remplacer",
-	"findInFiles": "Chercher dans les fichiers",
-	"replaceInFiles": "Remplacer dans les fichiers",
-	"RefreshAction.label": "Actualiser",
-	"CollapseDeepestExpandedLevelAction.label": "Réduire tout",
-	"ClearSearchResultsAction.label": "Effacer",
-	"CancelSearchAction.label": "Annuler la recherche",
-	"FocusNextSearchResult.label": "Focus sur le résultat de la recherche suivant",
-	"FocusPreviousSearchResult.label": "Focus sur le résultat de la recherche précédent",
-	"RemoveAction.label": "Rejeter",
-	"file.replaceAll.label": "Tout remplacer",
-	"match.replace.label": "Remplacer"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/search/browser/searchResultsView.i18n.json b/i18n/fra/src/vs/workbench/parts/search/browser/searchResultsView.i18n.json
deleted file mode 100644
index a979901875e..00000000000
--- a/i18n/fra/src/vs/workbench/parts/search/browser/searchResultsView.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"searchFolderMatch.other.label": "Autres fichiers",
-	"searchFileMatches": "{0} fichiers trouvés",
-	"searchFileMatch": "{0} fichier trouvé",
-	"searchMatches": "{0} correspondances trouvées",
-	"searchMatch": "{0} correspondance trouvée",
-	"folderMatchAriaLabel": "{0} correspondances dans le dossier racine {1}, Résultat de la recherche",
-	"fileMatchAriaLabel": "{0} correspondances dans le fichier {1} du dossier {2}, Résultat de la recherche",
-	"replacePreviewResultAria": "Remplacer le terme {0} par {1} à la position de colonne {2} dans la ligne avec le texte {3}",
-	"searchResultAria": "Terme {0} trouvé à la position de colonne {1} dans la ligne avec le texte {2}"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/search/browser/searchView.i18n.json b/i18n/fra/src/vs/workbench/parts/search/browser/searchView.i18n.json
deleted file mode 100644
index 4cd20eea1e6..00000000000
--- a/i18n/fra/src/vs/workbench/parts/search/browser/searchView.i18n.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"moreSearch": "Activer/désactiver les détails de la recherche",
-	"searchScope.includes": "fichiers à inclure",
-	"label.includes": "Modèles d'inclusion de recherche",
-	"searchScope.excludes": "fichiers à exclure",
-	"label.excludes": "Modèles d'exclusion de recherche",
-	"replaceAll.confirmation.title": "Tout remplacer",
-	"replaceAll.confirm.button": "&&Remplacer",
-	"replaceAll.occurrence.file.message": "{0} occurrence remplacée dans {1} fichier par '{2}'.",
-	"removeAll.occurrence.file.message": "{0} occurrence remplacée dans {1} fichier.",
-	"replaceAll.occurrence.files.message": "{0} occurrence remplacée dans {1} fichiers par '{2}'.",
-	"removeAll.occurrence.files.message": "{0} occurrence remplacée dans {1} fichiers.",
-	"replaceAll.occurrences.file.message": "{0} occurrences remplacées dans {1} fichier par '{2}'.",
-	"removeAll.occurrences.file.message": "{0} occurrences remplacées dans {1} fichier.",
-	"replaceAll.occurrences.files.message": "{0} occurrences remplacées dans {1} fichiers par '{2}'.",
-	"removeAll.occurrences.files.message": "{0} occurrences remplacées dans {1} fichiers.",
-	"removeAll.occurrence.file.confirmation.message": "Remplacer {0} occurrence dans {1} fichier par '{2}' ?",
-	"replaceAll.occurrence.file.confirmation.message": "Remplacer {0} occurrence dans {1} fichier ?",
-	"removeAll.occurrence.files.confirmation.message": "Remplacer {0} occurrence dans {1} fichiers par '{2}' ?",
-	"replaceAll.occurrence.files.confirmation.message": "Remplacer {0} occurrence dans {1} fichiers ?",
-	"removeAll.occurrences.file.confirmation.message": "Remplacer {0} occurrences dans {1} fichier par '{2}' ?",
-	"replaceAll.occurrences.file.confirmation.message": "Remplacer {0} occurrences dans {1} fichier ?",
-	"removeAll.occurrences.files.confirmation.message": "Remplacer {0} occurrences dans {1} fichiers par '{2}' ?",
-	"replaceAll.occurrences.files.confirmation.message": "Remplacer {0} occurrences dans {1} fichiers ?",
-	"treeAriaLabel": "Résultats de la recherche",
-	"searchPathNotFoundError": "Chemin de recherche introuvable : {0}",
-	"searchMaxResultsWarning": "Le jeu de résultats contient uniquement un sous-ensemble de toutes les correspondances. Soyez plus précis dans votre recherche de façon à limiter les résultats retournés.",
-	"searchCanceled": "La recherche a été annulée avant l'obtention de résultats - ",
-	"noResultsIncludesExcludes": "Résultats introuvables pour '{0}' excluant '{1}' - ",
-	"noResultsIncludes": "Résultats introuvables dans '{0}' - ",
-	"noResultsExcludes": "Résultats introuvables avec l'exclusion de '{0}' - ",
-	"noResultsFound": "Aucun résultat trouvé. Vérifiez vos paramètres pour les exclusions configurées et les fichiers ignorés - ",
-	"rerunSearch.message": "Rechercher à nouveau",
-	"rerunSearchInAll.message": "Rechercher à nouveau dans tous les fichiers",
-	"openSettings.message": "Ouvrir les paramètres",
-	"openSettings.learnMore": "En savoir plus",
-	"ariaSearchResultsStatus": "La recherche a retourné {0} résultats dans {1} fichiers",
-	"search.file.result": "{0} résultat dans {1} fichier",
-	"search.files.result": "{0} résultat dans {1} fichiers",
-	"search.file.results": "{0} résultats dans {1} fichier",
-	"search.files.results": "{0} résultats dans {1} fichiers",
-	"searchWithoutFolder": "Vous n'avez pas encore ouvert de dossier. Seuls les fichiers ouverts font l'objet de recherches - ",
-	"openFolder": "Ouvrir le dossier"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json b/i18n/fra/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
deleted file mode 100644
index 4cd20eea1e6..00000000000
--- a/i18n/fra/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"moreSearch": "Activer/désactiver les détails de la recherche",
-	"searchScope.includes": "fichiers à inclure",
-	"label.includes": "Modèles d'inclusion de recherche",
-	"searchScope.excludes": "fichiers à exclure",
-	"label.excludes": "Modèles d'exclusion de recherche",
-	"replaceAll.confirmation.title": "Tout remplacer",
-	"replaceAll.confirm.button": "&&Remplacer",
-	"replaceAll.occurrence.file.message": "{0} occurrence remplacée dans {1} fichier par '{2}'.",
-	"removeAll.occurrence.file.message": "{0} occurrence remplacée dans {1} fichier.",
-	"replaceAll.occurrence.files.message": "{0} occurrence remplacée dans {1} fichiers par '{2}'.",
-	"removeAll.occurrence.files.message": "{0} occurrence remplacée dans {1} fichiers.",
-	"replaceAll.occurrences.file.message": "{0} occurrences remplacées dans {1} fichier par '{2}'.",
-	"removeAll.occurrences.file.message": "{0} occurrences remplacées dans {1} fichier.",
-	"replaceAll.occurrences.files.message": "{0} occurrences remplacées dans {1} fichiers par '{2}'.",
-	"removeAll.occurrences.files.message": "{0} occurrences remplacées dans {1} fichiers.",
-	"removeAll.occurrence.file.confirmation.message": "Remplacer {0} occurrence dans {1} fichier par '{2}' ?",
-	"replaceAll.occurrence.file.confirmation.message": "Remplacer {0} occurrence dans {1} fichier ?",
-	"removeAll.occurrence.files.confirmation.message": "Remplacer {0} occurrence dans {1} fichiers par '{2}' ?",
-	"replaceAll.occurrence.files.confirmation.message": "Remplacer {0} occurrence dans {1} fichiers ?",
-	"removeAll.occurrences.file.confirmation.message": "Remplacer {0} occurrences dans {1} fichier par '{2}' ?",
-	"replaceAll.occurrences.file.confirmation.message": "Remplacer {0} occurrences dans {1} fichier ?",
-	"removeAll.occurrences.files.confirmation.message": "Remplacer {0} occurrences dans {1} fichiers par '{2}' ?",
-	"replaceAll.occurrences.files.confirmation.message": "Remplacer {0} occurrences dans {1} fichiers ?",
-	"treeAriaLabel": "Résultats de la recherche",
-	"searchPathNotFoundError": "Chemin de recherche introuvable : {0}",
-	"searchMaxResultsWarning": "Le jeu de résultats contient uniquement un sous-ensemble de toutes les correspondances. Soyez plus précis dans votre recherche de façon à limiter les résultats retournés.",
-	"searchCanceled": "La recherche a été annulée avant l'obtention de résultats - ",
-	"noResultsIncludesExcludes": "Résultats introuvables pour '{0}' excluant '{1}' - ",
-	"noResultsIncludes": "Résultats introuvables dans '{0}' - ",
-	"noResultsExcludes": "Résultats introuvables avec l'exclusion de '{0}' - ",
-	"noResultsFound": "Aucun résultat trouvé. Vérifiez vos paramètres pour les exclusions configurées et les fichiers ignorés - ",
-	"rerunSearch.message": "Rechercher à nouveau",
-	"rerunSearchInAll.message": "Rechercher à nouveau dans tous les fichiers",
-	"openSettings.message": "Ouvrir les paramètres",
-	"openSettings.learnMore": "En savoir plus",
-	"ariaSearchResultsStatus": "La recherche a retourné {0} résultats dans {1} fichiers",
-	"search.file.result": "{0} résultat dans {1} fichier",
-	"search.files.result": "{0} résultat dans {1} fichiers",
-	"search.file.results": "{0} résultats dans {1} fichier",
-	"search.files.results": "{0} résultats dans {1} fichiers",
-	"searchWithoutFolder": "Vous n'avez pas encore ouvert de dossier. Seuls les fichiers ouverts font l'objet de recherches - ",
-	"openFolder": "Ouvrir le dossier"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/search/browser/searchWidget.i18n.json b/i18n/fra/src/vs/workbench/parts/search/browser/searchWidget.i18n.json
deleted file mode 100644
index f151052e1f0..00000000000
--- a/i18n/fra/src/vs/workbench/parts/search/browser/searchWidget.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"search.action.replaceAll.disabled.label": "Tout remplacer (soumettre la recherche pour activer)",
-	"search.action.replaceAll.enabled.label": "Tout remplacer",
-	"search.replace.toggle.button.title": "Activer/désactiver le remplacement",
-	"label.Search": "Rechercher : tapez le terme de recherche, puis appuyez sur Entrée pour lancer la recherche, ou sur Échap pour l'annuler",
-	"search.placeHolder": "Rechercher",
-	"label.Replace": "Remplacer : tapez le terme de remplacement, puis appuyez sur Entrée pour avoir un aperçu, ou sur Échap pour l'annuler",
-	"search.replace.placeHolder": "Remplacer",
-	"regexp.validationFailure": "L'expression correspond à tout",
-	"regexp.backreferenceValidationFailure": "Les références arrières (Backreferences) ne sont pas prises en charge"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/search/common/queryBuilder.i18n.json b/i18n/fra/src/vs/workbench/parts/search/common/queryBuilder.i18n.json
deleted file mode 100644
index a236bfe1de1..00000000000
--- a/i18n/fra/src/vs/workbench/parts/search/common/queryBuilder.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"search.noWorkspaceWithName": "Aucun dossier dans l’espace de travail avec le nom {0}"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json b/i18n/fra/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
deleted file mode 100644
index 043fb92d98d..00000000000
--- a/i18n/fra/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"search": "Rechercher",
-	"copyMatchLabel": "Copier",
-	"copyPathLabel": "Copier le chemin",
-	"copyAllLabel": "Copier tout",
-	"clearSearchHistoryLabel": "Effacer l'historique de recherche",
-	"toggleSearchViewPositionLabel": "Basculer la position de la vue de Recherche",
-	"findInFolder": "Rechercher dans le dossier...",
-	"findInWorkspace": "Trouver dans l’espace de travail...",
-	"showTriggerActions": "Atteindre le symbole dans l'espace de travail...",
-	"name": "Rechercher",
-	"showSearchViewl": "Afficher la zone de recherche",
-	"view": "Affichage",
-	"findInFiles": "Chercher dans les fichiers",
-	"openAnythingHandlerDescription": "Accéder au fichier",
-	"openSymbolDescriptionNormal": "Atteindre le symbole dans l'espace de travail",
-	"searchConfigurationTitle": "Rechercher",
-	"exclude": "Configurez les modèles Glob pour exclure les fichiers et les dossiers des recherches. Hérite de tous les modèles Glob à partir du paramètre files.exclude.",
-	"exclude.boolean": "Modèle Glob auquel les chemins de fichiers doivent correspondre. Affectez la valeur true ou false pour activer ou désactiver le modèle.",
-	"exclude.when": "Vérification supplémentaire des frères d'un fichier correspondant. Utilisez $(basename) comme variable pour le nom de fichier correspondant.",
-	"useRipgrep": "Contrôle si ripgrep doit être utilisé dans la recherche de texte et de fichier",
-	"useIgnoreFiles": "Contrôle s'il faut utiliser les fichiers .gitignore et .ignore par défaut pendant la recherche de fichiers.",
-	"search.quickOpen.includeSymbols": "Configurez l'ajout des résultats d'une recherche de symboles globale dans le fichier de résultats pour Quick Open.",
-	"search.followSymlinks": "Contrôle s'il faut suivre les symlinks pendant la recherche.",
-	"search.smartCase": "Recherches de manière non case-sensitive si le modèle est entièrement en minuscules, dans le cas contraire, recherche de manière case-sensitive",
-	"search.globalFindClipboard": "Contrôle si la vue de recherche doit lire ou modifier le presse-papiers partagé sur macOS",
-	"search.location": "Contrôle si la recherche s’affichera comme une vue dans la barre latérale ou comme un panneau dans la zone de panneau pour plus d'espace horizontal."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/search/electron-browser/searchActions.i18n.json b/i18n/fra/src/vs/workbench/parts/search/electron-browser/searchActions.i18n.json
deleted file mode 100644
index d98861f7c9f..00000000000
--- a/i18n/fra/src/vs/workbench/parts/search/electron-browser/searchActions.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"findInFolder": "Rechercher dans le dossier...",
-	"findInWorkspace": "Trouver dans l’espace de travail..."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/snippets/electron-browser/TMSnippets.i18n.json b/i18n/fra/src/vs/workbench/parts/snippets/electron-browser/TMSnippets.i18n.json
deleted file mode 100644
index ce5cfc94849..00000000000
--- a/i18n/fra/src/vs/workbench/parts/snippets/electron-browser/TMSnippets.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"vscode.extension.contributes.snippets": "Ajoute des extraits de code.",
-	"vscode.extension.contributes.snippets-language": "Identificateur de langage pour lequel cet extrait de code est ajouté.",
-	"vscode.extension.contributes.snippets-path": "Chemin du fichier d'extraits de code. Le chemin est relatif au dossier d'extensions et commence généralement par './snippets/'.",
-	"invalid.language": "Langage inconnu dans 'contributes.{0}.language'. Valeur fournie : {1}",
-	"invalid.path.0": "Chaîne attendue dans 'contributes.{0}.path'. Valeur fournie : {1}",
-	"invalid.path.1": "'contributes.{0}.path' ({1}) est censé être inclus dans le dossier ({2}) de l'extension. Cela risque de rendre l'extension non portable.",
-	"badVariableUse": "L'extrait de code \"{0}\" confond très probablement les variables et les espaces réservés d'extrait de code. Consultez https://code.visualstudio.com/docs/editor/userdefinedsnippets#_snippet-syntax pour plus d'informations."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json b/i18n/fra/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json
deleted file mode 100644
index c6029c79c7a..00000000000
--- a/i18n/fra/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"global.scope": "(global)",
-	"global.1": "({0})",
-	"new.global": "Nouveau fichier d'extraits globaux...",
-	"group.global": "Extraits existants",
-	"new.global.sep": "Nouveaux extraits",
-	"openSnippet.pickLanguage": "Sélectionner le fichier d'extraits ou créer des extraits",
-	"openSnippet.label": "Configurer les extraits de l’utilisateur",
-	"preferences": "Préférences"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/snippets/electron-browser/insertSnippet.i18n.json b/i18n/fra/src/vs/workbench/parts/snippets/electron-browser/insertSnippet.i18n.json
deleted file mode 100644
index 3c9e6afc0ef..00000000000
--- a/i18n/fra/src/vs/workbench/parts/snippets/electron-browser/insertSnippet.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"snippet.suggestions.label": "Insérer un extrait de code",
-	"sep.userSnippet": "Extraits de code de l'utilisateur",
-	"sep.extSnippet": "Extraits de code d’extension"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json b/i18n/fra/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json
deleted file mode 100644
index 41b673caee3..00000000000
--- a/i18n/fra/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"snippetSchema.json.default": "Extrait de code vide",
-	"snippetSchema.json": "Configuration de l'extrait de code utilisateur",
-	"snippetSchema.json.prefix": "Préfixe à utiliser durant la sélection de l'extrait de code dans IntelliSense",
-	"snippetSchema.json.body": "Contenu de l'extrait de code. Utilisez '$1', '${1:defaultText}' pour définir les positions du curseur, utilisez '$0' pour la position finale du curseur. Insérez les valeurs de variable avec '${varName}' et '${varName:defaultText}', par ex., 'Il s'agit du fichier : $TM_FILENAME'.",
-	"snippetSchema.json.description": "Description de l'extrait de code.",
-	"snippetSchema.json.scope": "Une liste des noms de langages auxquels s’applique cet extrait de code, par exemple 'typescript,javascript'."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json b/i18n/fra/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json
deleted file mode 100644
index 6d8d447dfa2..00000000000
--- a/i18n/fra/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"source.snippetGlobal": "Extrait de code global de l’utilisateur",
-	"source.snippet": "Extrait de code utilisateur"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json b/i18n/fra/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
deleted file mode 100644
index 6aff63f3b8e..00000000000
--- a/i18n/fra/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"invalid.path.0": "Chaîne attendue dans 'contributes.{0}.path'. Valeur fournie : {1}",
-	"invalid.language.0": "Si le langage est omis, la valeur de 'contributes.{0}.path' doit être un fichier `.code-snippets`. Valeur fournie : {1}",
-	"invalid.language": "Langage inconnu dans 'contributes.{0}.language'. Valeur fournie : {1}",
-	"invalid.path.1": "'contributes.{0}.path' ({1}) est censé être inclus dans le dossier ({2}) de l'extension. Cela risque de rendre l'extension non portable.",
-	"vscode.extension.contributes.snippets": "Ajoute des extraits de code.",
-	"vscode.extension.contributes.snippets-language": "Identificateur de langage pour lequel cet extrait de code est ajouté.",
-	"vscode.extension.contributes.snippets-path": "Chemin du fichier d'extraits de code. Le chemin est relatif au dossier d'extensions et commence généralement par './snippets/'.",
-	"badVariableUse": "Un ou plusieurs extraits de l’extension '{0}' confondent très probablement des snippet-variables et des snippet-placeholders (Voir https://code.visualstudio.com/docs/editor/userdefinedsnippets#_snippet-syntax pour plus de détails)",
-	"badFile": "Le fichier d’extrait \"{0}\" n’a pas pu être lu.",
-	"detail.snippet": "{0} ({1})",
-	"snippetSuggest.longLabel": "{0}, {1}"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/snippets/electron-browser/tabCompletion.i18n.json b/i18n/fra/src/vs/workbench/parts/snippets/electron-browser/tabCompletion.i18n.json
deleted file mode 100644
index 1c95657d6a5..00000000000
--- a/i18n/fra/src/vs/workbench/parts/snippets/electron-browser/tabCompletion.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"tabCompletion": "Insérez les extraits de code quand leurs préfixes correspondent. Fonctionne mieux quand la fonctionnalité 'quickSuggestions' n'est pas activée."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/surveys/electron-browser/languageSurveys.contribution.i18n.json b/i18n/fra/src/vs/workbench/parts/surveys/electron-browser/languageSurveys.contribution.i18n.json
deleted file mode 100644
index 19e27f8073a..00000000000
--- a/i18n/fra/src/vs/workbench/parts/surveys/electron-browser/languageSurveys.contribution.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"helpUs": "Aidez-nous à améliorer le support de {0}",
-	"takeShortSurvey": "Répondre à une enquête rapide",
-	"remindLater": "Me le rappeler plus tard",
-	"neverAgain": "Ne plus afficher"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/surveys/electron-browser/nps.contribution.i18n.json b/i18n/fra/src/vs/workbench/parts/surveys/electron-browser/nps.contribution.i18n.json
deleted file mode 100644
index 6f71b2a1bba..00000000000
--- a/i18n/fra/src/vs/workbench/parts/surveys/electron-browser/nps.contribution.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"surveyQuestion": "Acceptez-vous de répondre à une enquête rapide ?",
-	"takeSurvey": "Répondre à l'enquête",
-	"remindLater": "Me le rappeler plus tard",
-	"neverAgain": "Ne plus afficher"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/tasks/browser/buildQuickOpen.i18n.json b/i18n/fra/src/vs/workbench/parts/tasks/browser/buildQuickOpen.i18n.json
deleted file mode 100644
index c4f5420f096..00000000000
--- a/i18n/fra/src/vs/workbench/parts/tasks/browser/buildQuickOpen.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"noTasksMatching": "Aucune tâche correspondante"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/tasks/browser/quickOpen.i18n.json b/i18n/fra/src/vs/workbench/parts/tasks/browser/quickOpen.i18n.json
deleted file mode 100644
index 879136d6096..00000000000
--- a/i18n/fra/src/vs/workbench/parts/tasks/browser/quickOpen.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"entryAriaLabel": "{0}, tasks",
-	"recentlyUsed": "tâches récemment utilisées",
-	"configured": "tâches configurées",
-	"detected": "tâches détectées",
-	"customizeTask": "Configurer une tâche"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/tasks/browser/restartQuickOpen.i18n.json b/i18n/fra/src/vs/workbench/parts/tasks/browser/restartQuickOpen.i18n.json
deleted file mode 100644
index 03c80a19e00..00000000000
--- a/i18n/fra/src/vs/workbench/parts/tasks/browser/restartQuickOpen.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"tasksAriaLabel": "Tapez le nom d'une tâche à redémarrer",
-	"noTasksMatching": "Aucune tâche correspondante",
-	"noTasksFound": "Aucune tâche à recommencer n'a été trouvée"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/tasks/browser/taskQuickOpen.i18n.json b/i18n/fra/src/vs/workbench/parts/tasks/browser/taskQuickOpen.i18n.json
deleted file mode 100644
index 7caadde1ad7..00000000000
--- a/i18n/fra/src/vs/workbench/parts/tasks/browser/taskQuickOpen.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"tasksAriaLabel": "Tapez le nom d'une tâche à exécuter",
-	"noTasksMatching": "No tasks matching",
-	"noTasksFound": "Tâches introuvables"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/tasks/browser/terminateQuickOpen.i18n.json b/i18n/fra/src/vs/workbench/parts/tasks/browser/terminateQuickOpen.i18n.json
deleted file mode 100644
index 354fe33a662..00000000000
--- a/i18n/fra/src/vs/workbench/parts/tasks/browser/terminateQuickOpen.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"tasksAriaLabel": "Type the name of a task to terminate",
-	"noTasksMatching": "Aucune tâche correspondante",
-	"noTasksFound": "No tasks to terminate found"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/tasks/browser/testQuickOpen.i18n.json b/i18n/fra/src/vs/workbench/parts/tasks/browser/testQuickOpen.i18n.json
deleted file mode 100644
index c4f5420f096..00000000000
--- a/i18n/fra/src/vs/workbench/parts/tasks/browser/testQuickOpen.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"noTasksMatching": "Aucune tâche correspondante"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json b/i18n/fra/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json
deleted file mode 100644
index cb12fed4c55..00000000000
--- a/i18n/fra/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json
+++ /dev/null
@@ -1,76 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"ProblemPatternParser.loopProperty.notLast": "La propriété loop est uniquement prise en charge dans le détecteur de problèmes de correspondance de dernière ligne.",
-	"ProblemPatternParser.problemPattern.kindProperty.notFirst": "Le modèle du problème est invalide. La propriété Type doit être uniquement fournie sur le premier élément",
-	"ProblemPatternParser.problemPattern.missingRegExp": "Il manque une expression régulière dans le modèle de problème.",
-	"ProblemPatternParser.problemPattern.missingProperty": "Le modèle du problème est invalide. Il doit avoir au moins un fichier et un message.",
-	"ProblemPatternParser.problemPattern.missingLocation": "Le modèle du problème est invalide. Il doit avoir au moins un type: \"fichier\" ou avoir une ligne ou un emplacement de groupe de correspondance. ",
-	"ProblemPatternParser.invalidRegexp": "Erreur : la chaîne {0} est une expression régulière non valide.\n",
-	"ProblemPatternSchema.regexp": "Expression régulière permettant de trouver une erreur, un avertissement ou une information dans la sortie.",
-	"ProblemPatternSchema.kind": "Si le modèle correspond à un emplacement (fichier ou ligne) ou seulement à un fichier.",
-	"ProblemPatternSchema.file": "Index de groupe de correspondance du nom de fichier. En cas d'omission, 1 est utilisé.",
-	"ProblemPatternSchema.location": "Index de groupe de correspondance de l'emplacement du problème. Les modèles d'emplacement valides sont : (line), (line,column) et (startLine,startColumn,endLine,endColumn). En cas d'omission, (line,column) est choisi par défaut.",
-	"ProblemPatternSchema.line": "Index de groupe de correspondance de la ligne du problème. La valeur par défaut est 2",
-	"ProblemPatternSchema.column": "Index de groupe de correspondance du caractère de ligne du problème. La valeur par défaut est 3",
-	"ProblemPatternSchema.endLine": "Index de groupe de correspondance de la ligne de fin du problème. La valeur par défaut est non définie",
-	"ProblemPatternSchema.endColumn": "Index de groupe de correspondance du caractère de ligne de fin du problème. La valeur par défaut est non définie",
-	"ProblemPatternSchema.severity": "Index de groupe de correspondance de la gravité du problème. La valeur par défaut est non définie",
-	"ProblemPatternSchema.code": "Index de groupe de correspondance du code du problème. La valeur par défaut est non définie",
-	"ProblemPatternSchema.message": "Index de groupe de correspondance du message. En cas d'omission, la valeur par défaut est 4 si l'emplacement est spécifié. Sinon, la valeur par défaut est 5.",
-	"ProblemPatternSchema.loop": "Dans une boucle de détecteur de problèmes de correspondance multiligne, indique si le modèle est exécuté en boucle tant qu'il correspond. Peut uniquement être spécifié dans le dernier modèle d'un modèle multiligne.",
-	"NamedProblemPatternSchema.name": "Nom du modèle de problème.",
-	"NamedMultiLineProblemPatternSchema.name": "Nom du modèle de problème multiligne.",
-	"NamedMultiLineProblemPatternSchema.patterns": "Modèles réels.",
-	"ProblemPatternExtPoint": "Contribue aux modèles de problèmes",
-	"ProblemPatternRegistry.error": "Modèle de problème non valide. Le modèle va être ignoré.",
-	"ProblemMatcherParser.noProblemMatcher": "Erreur : impossible de convertir la description en détecteur de problèmes de correspondance :\n{0}\n",
-	"ProblemMatcherParser.noProblemPattern": "Erreur : la description ne définit pas un modèle de problème valide :\n{0}\n",
-	"ProblemMatcherParser.noOwner": "Erreur : la description ne définit pas un propriétaire :\n{0}\n",
-	"ProblemMatcherParser.noFileLocation": "Erreur : la description ne définit pas un emplacement de fichier :\n{0}\n",
-	"ProblemMatcherParser.unknownSeverity": "Information : gravité inconnue {0}. Les valeurs valides sont erreur, avertissement et information.\n",
-	"ProblemMatcherParser.noDefinedPatter": "Erreur : le modèle ayant pour identificateur {0} n'existe pas.",
-	"ProblemMatcherParser.noIdentifier": "Erreur : la propriété du modèle référence un identificateur vide.",
-	"ProblemMatcherParser.noValidIdentifier": "Erreur : la propriété de modèle {0} n'est pas un nom de variable de modèle valide.",
-	"ProblemMatcherParser.problemPattern.watchingMatcher": "Un détecteur de problèmes de correspondance doit définir un modèle de début et un modèle de fin à observer.",
-	"ProblemMatcherParser.invalidRegexp": "Erreur : la chaîne {0} est une expression régulière non valide.\n",
-	"WatchingPatternSchema.regexp": "Expression régulière permettant de détecter le début ou la fin d'une tâche en arrière-plan.",
-	"WatchingPatternSchema.file": "Index de groupe de correspondance du nom de fichier. Peut être omis.",
-	"PatternTypeSchema.name": "Nom d'un modèle faisant l'objet d'une contribution ou prédéfini",
-	"PatternTypeSchema.description": "Modèle de problème ou bien nom d'un modèle de problème faisant l'objet d'une contribution ou prédéfini. Peut être omis si base est spécifié.",
-	"ProblemMatcherSchema.base": "Nom d'un détecteur de problèmes de correspondance de base à utiliser.",
-	"ProblemMatcherSchema.owner": "Propriétaire du problème dans Code. Peut être omis si base est spécifié. Prend la valeur 'external' par défaut en cas d'omission et si base n'est pas spécifié.",
-	"ProblemMatcherSchema.source": "Une chaîne lisible par humain qui décrit la source de ce diagnostic, par exemple 'typescript' ou 'super lint'.",
-	"ProblemMatcherSchema.severity": "Gravité par défaut des problèmes de capture. Est utilisé si le modèle ne définit aucun groupe de correspondance pour la gravité.",
-	"ProblemMatcherSchema.applyTo": "Contrôle si un problème signalé pour un document texte s'applique uniquement aux documents ouverts ou fermés, ou bien à l'ensemble des documents.",
-	"ProblemMatcherSchema.fileLocation": "Définit la façon dont les noms de fichiers signalés dans un modèle de problème doivent être interprétés.",
-	"ProblemMatcherSchema.background": "Modèles de suivi du début et de la fin d'un détecteur de problèmes de correspondance actif sur une tâche en arrière-plan.",
-	"ProblemMatcherSchema.background.activeOnStart": "Si la valeur est true, le moniteur d'arrière-plan est actif au démarrage de la tâche. Cela revient à envoyer une ligne qui correspond à beginPattern",
-	"ProblemMatcherSchema.background.beginsPattern": "En cas de correspondance dans la sortie, le début d'une tâche en arrière-plan est signalé.",
-	"ProblemMatcherSchema.background.endsPattern": "En cas de correspondance dans la sortie, la fin d'une tâche en arrière-plan est signalée.",
-	"ProblemMatcherSchema.watching.deprecated": "La propriété espion est déconseillée. Utilisez l'arrière-plan à la place.",
-	"ProblemMatcherSchema.watching": "Modèles de suivi du début et de la fin d'un détecteur de problèmes de correspondance espion.",
-	"ProblemMatcherSchema.watching.activeOnStart": "Si la valeur est true, le mode espion est actif au démarrage de la tâche. Cela revient à émettre une ligne qui correspond à beginPattern",
-	"ProblemMatcherSchema.watching.beginsPattern": "En cas de correspondance dans la sortie, le début d'une tâche de suivi est signalé.",
-	"ProblemMatcherSchema.watching.endsPattern": "En cas de correspondance dans la sortie, la fin d'une tâche de suivi est signalée.",
-	"LegacyProblemMatcherSchema.watchedBegin.deprecated": "Cette propriété est déconseillée. Utilisez la propriété espion à la place.",
-	"LegacyProblemMatcherSchema.watchedBegin": "Expression régulière signalant qu'une tâche faisant l'objet d'un suivi commence à s'exécuter via le suivi d'un fichier.",
-	"LegacyProblemMatcherSchema.watchedEnd.deprecated": "Cette propriété est déconseillée. Utilisez la propriété espion à la place.",
-	"LegacyProblemMatcherSchema.watchedEnd": "Expression régulière signalant qu'une tâche faisant l'objet d'un suivi a fini de s'exécuter.",
-	"NamedProblemMatcherSchema.name": "Nom du détecteur de problèmes de correspondance utilisé comme référence.",
-	"NamedProblemMatcherSchema.label": "Étiquette contrôlable de visu du détecteur de problèmes de correspondance.",
-	"ProblemMatcherExtPoint": "Contribue aux détecteurs de problèmes de correspondance",
-	"msCompile": "Problèmes du compilateur Microsoft",
-	"lessCompile": "Moins de problèmes",
-	"gulp-tsc": "Problèmes liés à Gulp TSC",
-	"jshint": "Problèmes liés à JSHint",
-	"jshint-stylish": "Problèmes liés au formateur stylish de JSHint",
-	"eslint-compact": "Problèmes liés au formateur compact d'ESLint",
-	"eslint-stylish": "Problèmes liés au formateur stylish d'ESLint",
-	"go": "Problèmes liés à Go"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/tasks/common/taskConfiguration.i18n.json b/i18n/fra/src/vs/workbench/parts/tasks/common/taskConfiguration.i18n.json
deleted file mode 100644
index cfdcd7341c0..00000000000
--- a/i18n/fra/src/vs/workbench/parts/tasks/common/taskConfiguration.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"ConfigurationParser.invalidCWD": "Warning: options.cwd must be of type string. Ignoring value {0}\n",
-	"ConfigurationParser.noargs": "Erreur : les arguments de commande doivent correspondre à un tableau de chaînes. La valeur fournie est :\n{0}",
-	"ConfigurationParser.noShell": "Avertissement : La configuration de l'interpréteur de commandes n'est prise en charge que durant l'exécution des tâches dans le terminal.",
-	"ConfigurationParser.noName": "Erreur : le détecteur de problèmes de correspondance dans la portée de déclaration doit avoir un nom :\n{0}\n",
-	"ConfigurationParser.unknownMatcherKind": "Avertissement : le détecteur de problèmes de correspondance défini est inconnu. Les types pris en charge sont string | ProblemMatcher | (string | ProblemMatcher)[].\n{0}\n",
-	"ConfigurationParser.invalidVaraibleReference": "Erreur : référence à problemMatcher non valide : {0}\n",
-	"ConfigurationParser.noTaskName": "Erreur : les tâches doivent fournir une propriété taskName. La tâche va être ignorée.\n{0}\n",
-	"taskConfiguration.shellArgs": "Avertissement : La tâche '{0}' est une commande d'interpréteur de commandes, et le nom de la commande ou l'un de ses arguments contient des espaces non précédés d'un caractère d'échappement. Pour garantir une ligne de commande correcte, fusionnez les arguments dans la commande.",
-	"taskConfiguration.noCommandOrDependsOn": "Erreur : La tâche '{0}' ne spécifie ni une commande, ni une propriété dependsOn. La tâche est ignorée. Sa définition est :\n{1}",
-	"taskConfiguration.noCommand": "Erreur : La tâche '{0}' ne définit aucune commande. La tâche va être ignorée. Sa définition est :\n{1}"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/tasks/common/taskDefinitionRegistry.i18n.json b/i18n/fra/src/vs/workbench/parts/tasks/common/taskDefinitionRegistry.i18n.json
deleted file mode 100644
index 8c60addc11a..00000000000
--- a/i18n/fra/src/vs/workbench/parts/tasks/common/taskDefinitionRegistry.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"TaskDefinition.description": "Type de tâche réel. Notez que les types commençant par '$' sont réservés à un usage interne.",
-	"TaskDefinition.properties": "Propriétés supplémentaires du type de tâche",
-	"TaskTypeConfiguration.noType": "La propriété 'taskType' obligatoire est manquante dans la configuration du type de tâche",
-	"TaskDefinitionExtPoint": "Ajoute des types de tâche"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/tasks/common/taskTemplates.i18n.json b/i18n/fra/src/vs/workbench/parts/tasks/common/taskTemplates.i18n.json
deleted file mode 100644
index 30761529018..00000000000
--- a/i18n/fra/src/vs/workbench/parts/tasks/common/taskTemplates.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"dotnetCore": "Exécute une commande de génération .NET Core",
-	"msbuild": "Exécute la cible de génération",
-	"externalCommand": "Exemple d'exécution d'une commande externe arbitraire",
-	"Maven": "Exécute les commandes Maven courantes"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/tasks/common/taskTypeRegistry.i18n.json b/i18n/fra/src/vs/workbench/parts/tasks/common/taskTypeRegistry.i18n.json
deleted file mode 100644
index 8b6ad71cd4e..00000000000
--- a/i18n/fra/src/vs/workbench/parts/tasks/common/taskTypeRegistry.i18n.json
+++ /dev/null
@@ -1,6 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/tasks/electron-browser/jsonSchemaCommon.i18n.json b/i18n/fra/src/vs/workbench/parts/tasks/electron-browser/jsonSchemaCommon.i18n.json
deleted file mode 100644
index 25967884477..00000000000
--- a/i18n/fra/src/vs/workbench/parts/tasks/electron-browser/jsonSchemaCommon.i18n.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"JsonSchema.options": "Options de commande supplémentaires",
-	"JsonSchema.options.cwd": "Répertoire de travail actif du programme ou script exécuté. En cas d'omission, la racine de l'espace de travail actif de Code est utilisée.",
-	"JsonSchema.options.env": "Environnement du programme ou de l'interpréteur de commandes exécuté. En cas d'omission, l'environnement du processus parent est utilisé.",
-	"JsonSchema.shellConfiguration": "Configure l'interpréteur de commandes à utiliser.",
-	"JsonSchema.shell.executable": "Interpréteur de commandes à utiliser.",
-	"JsonSchema.shell.args": "Arguments de l'interpréteur de commandes.",
-	"JsonSchema.command": "Commande à exécuter. Il peut s'agir d'un programme externe ou d'une commande d'interpréteur de commandes.",
-	"JsonSchema.tasks.args": "Arguments passés à la commande quand cette tâche est appelée.",
-	"JsonSchema.tasks.taskName": "Nom de la tâche",
-	"JsonSchema.tasks.windows": "Configuration de commande spécifique à Windows",
-	"JsonSchema.tasks.mac": "Configuration de commande spécifique à Mac",
-	"JsonSchema.tasks.linux": "Configuration de commande spécifique à Linux",
-	"JsonSchema.tasks.suppressTaskName": "Contrôle si le nom de la tâche est ajouté en tant qu'argument de la commande. En cas d'omission, la valeur définie globalement est utilisée.",
-	"JsonSchema.tasks.showOutput": "Contrôle si la sortie de la tâche en cours d'exécution est affichée ou non. En cas d'omission, la valeur définie globalement est utilisée.",
-	"JsonSchema.echoCommand": "Contrôle si la commande exécutée fait l'objet d'un écho dans la sortie. La valeur par défaut est false.",
-	"JsonSchema.tasks.watching.deprecation": "Déconseillé. Utilisez isBackground à la place.",
-	"JsonSchema.tasks.watching": "Spécifie si la tâche exécutée est persistante, et si elle surveille le système de fichiers.",
-	"JsonSchema.tasks.background": "Spécifie si la tâche exécutée est persistante, et si elle s'exécute en arrière-plan.",
-	"JsonSchema.tasks.promptOnClose": "Spécifie si l'utilisateur est prévenu quand VS Code se ferme avec une tâche en cours d'exécution.",
-	"JsonSchema.tasks.build": "Mappe cette tâche à la commande de génération par défaut de Code.",
-	"JsonSchema.tasks.test": "Mappe cette tâche à la commande de test par défaut de Code.",
-	"JsonSchema.tasks.matchers": "Détecteur(s) de problèmes de correspondance à utiliser. Il peut s'agir d'une chaîne ou d'une définition de détecteur de problèmes de correspondance, ou encore d'un tableau de chaînes et de détecteurs de problèmes de correspondance.",
-	"JsonSchema.args": "Arguments supplémentaires passés à la commande.",
-	"JsonSchema.showOutput": "Contrôle si la sortie de la tâche en cours d'exécution est affichée ou non. En cas d'omission, 'always' est utilisé.",
-	"JsonSchema.watching.deprecation": "Déconseillé. Utilisez isBackground à la place.",
-	"JsonSchema.watching": "Spécifie si la tâche exécutée est persistante, et si elle surveille le système de fichiers.",
-	"JsonSchema.background": "Spécifie si la tâche exécutée est persistante, et si elle s'exécute en arrière-plan.",
-	"JsonSchema.promptOnClose": "Spécifie si l'utilisateur est prévenu quand VS Code se ferme avec une tâche s'exécutant en arrière-plan.",
-	"JsonSchema.suppressTaskName": "Contrôle si le nom de la tâche est ajouté en tant qu'argument de la commande. La valeur par défaut est false.",
-	"JsonSchema.taskSelector": "Préfixe indiquant qu'un argument est une tâche.",
-	"JsonSchema.matchers": "Détecteur(s) de problèmes de correspondance à utiliser. Il peut s'agir d'une chaîne ou d'une définition de détecteur de problèmes de correspondance, ou encore d'un tableau de chaînes et de détecteurs de problèmes de correspondance.",
-	"JsonSchema.tasks": "Configurations de la tâche. Il s'agit généralement d'enrichissements d'une tâche déjà définie dans l'exécuteur de tâches externe."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v1.i18n.json b/i18n/fra/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v1.i18n.json
deleted file mode 100644
index 31eb0dc36fc..00000000000
--- a/i18n/fra/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v1.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"JsonSchema.version": "Numéro de version de la configuration",
-	"JsonSchema._runner": "Le runner est dégradé. Utiliser la propriété runner officielle",
-	"JsonSchema.runner": "Définit si la tâche est exécutée sous forme de processus, et si la sortie s'affiche dans la fenêtre de sortie ou dans le terminal.",
-	"JsonSchema.windows": "Configuration de commande spécifique à Windows",
-	"JsonSchema.mac": "Configuration de commande spécifique à Mac",
-	"JsonSchema.linux": "Configuration de commande spécifique à Linux",
-	"JsonSchema.shell": "Spécifie si la commande est une commande d'interpréteur de commandes ou un programme externe. La valeur par défaut est false, en cas d'omission."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json b/i18n/fra/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
deleted file mode 100644
index 673cb698c2a..00000000000
--- a/i18n/fra/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"JsonSchema.shell": "Spécifie si la commande est une commande d'interpréteur de commandes ou un programme externe. La valeur par défaut est false, en cas d'omission.",
-	"JsonSchema.tasks.isShellCommand.deprecated": "La propriété isShellCommand est dépréciée. Utilisez à la place la propriété de type de la tâche et la propriété d'interpréteur de commandes dans les options. Consultez également les notes de publication 1.14.",
-	"JsonSchema.tasks.dependsOn.string": "Autre tâche dont cette tâche dépend.",
-	"JsonSchema.tasks.dependsOn.array": "Autres tâches dont cette tâche dépend.",
-	"JsonSchema.tasks.presentation": "Configure le panneau utilisé pour présenter la sortie de la tâche et lit son entrée.",
-	"JsonSchema.tasks.presentation.echo": "Contrôle si la commande exécutée est répercutée dans le panneau. La valeur par défaut est true.",
-	"JsonSchema.tasks.presentation.focus": "Contrôle si le panneau reçoit le focus. La valeur par défaut est false. Si la valeur est true, le panneau est également affiché.",
-	"JsonSchema.tasks.presentation.reveal.always": "Toujours afficher le terminal quand cette tâche est exécutée.",
-	"JsonSchema.tasks.presentation.reveal.silent": "Afficher uniquement le terminal si aucun détecteur de problèmes de correspondance n’est associé à la tâche et qu'une erreur se produit pendant son exécution.",
-	"JsonSchema.tasks.presentation.reveal.never": "Ne jamais afficher le terminal quand cette tâche est exécutée.",
-	"JsonSchema.tasks.presentation.reveals": "Contrôle si le panneau qui exécute la tâche est affiché ou non. La valeur par défaut est \"always\".",
-	"JsonSchema.tasks.presentation.instance": "Contrôle si le panneau est partagé entre les tâches, dédié à cette tâche ou si un panneau est créé à chaque exécution.",
-	"JsonSchema.tasks.terminal": "La propriété de terminal est dépréciée. Utilisez la présentation à la place",
-	"JsonSchema.tasks.group.kind": "Groupe d'exécution de la tâche.",
-	"JsonSchema.tasks.group.isDefault": "Définit si cette tâche est la tâche par défaut du groupe.",
-	"JsonSchema.tasks.group.defaultBuild": "Marque la tâche comme tâche de génération par défaut.",
-	"JsonSchema.tasks.group.defaultTest": "Marque la tâche comme tâche de test par défaut.",
-	"JsonSchema.tasks.group.build": "Marque la tâche comme tâche de génération accessible par la commande 'Exécuter la tâche de génération'.",
-	"JsonSchema.tasks.group.test": "Marque la tâche comme tâche de test accessible par la commande 'Exécuter la tâche de test'.",
-	"JsonSchema.tasks.group.none": "N'assigne la tâche à aucun groupe",
-	"JsonSchema.tasks.group": "Définit le groupe d'exécution auquel la tâche appartient. Prend en charge \"build\" pour l'ajouter au groupe de génération et \"test\" pour l'ajouter au groupe de test.",
-	"JsonSchema.tasks.type": "Définit si la tâche est exécutée comme un processus ou comme une commande à l’intérieur d’un shell.",
-	"JsonSchema.commandArray": "La commande shell à exécuter. Les éléments du tableau seront joints en utilisant un caractère d’espacement",
-	"JsonSchema.command.quotedString.value": "La valeur réelle de la commande",
-	"JsonSchema.tasks.quoting.escape": "Echappe les caractères à l’aide du caractère d’échappement du shell (par exemple: ` sous PowerShell et \\ sous bash).",
-	"JsonSchema.tasks.quoting.strong": "Entoure l’argument en utilisant le caractère guillemet du shell (par exemple: \" sous PowerShell et bash).",
-	"JsonSchema.tasks.quoting.weak": "Entoure l’argument en utilisant le caractère apostrophe du shell (par exemple: ' sous PowerShell et bash).",
-	"JsonSchema.command.quotesString.quote": "Comment la valeur de la commande devrait être donnée.",
-	"JsonSchema.command": "Commande à exécuter. Il peut s'agir d'un programme externe ou d'une commande d'interpréteur de commandes.",
-	"JsonSchema.args.quotedString.value": "La valeur réelle de l’argument",
-	"JsonSchema.args.quotesString.quote": "Comment la valeur de l’argument devrait être donnée.",
-	"JsonSchema.tasks.args": "Arguments passés à la commande quand cette tâche est appelée.",
-	"JsonSchema.tasks.label": "L'étiquette de l’interface utilisateur de la tâche",
-	"JsonSchema.version": "Numéro de version de la configuration.",
-	"JsonSchema.tasks.identifier": "Identificateur défini par l'utilisateur pour référencer la tâche dans launch.json ou une clause dependsOn.",
-	"JsonSchema.tasks.taskLabel": "Étiquette de la tâche",
-	"JsonSchema.tasks.taskName": "Nom de la tâche",
-	"JsonSchema.tasks.taskName.deprecated": "La propriété de nom de la tâche est dépréciée. Utilisez la propriété d'étiquette à la place.",
-	"JsonSchema.tasks.background": "Spécifie si la tâche exécutée est persistante, et si elle s'exécute en arrière-plan.",
-	"JsonSchema.tasks.promptOnClose": "Spécifie si l'utilisateur est prévenu quand VS Code se ferme avec une tâche en cours d'exécution.",
-	"JsonSchema.tasks.matchers": "Détecteur(s) de problèmes de correspondance à utiliser. Il peut s'agir d'une chaîne ou d'une définition de détecteur de problèmes de correspondance, ou encore d'un tableau de chaînes et de détecteurs de problèmes de correspondance.",
-	"JsonSchema.customizations.customizes.type": "Type de tâche à personnaliser",
-	"JsonSchema.tasks.customize.deprecated": "La propriété de personnalisation est dépréciée. Consultez les notes de publication 1.14 pour savoir comment migrer vers la nouvelle approche de personnalisation des tâches",
-	"JsonSchema.tasks.showOputput.deprecated": "La propriété showOutput est dépréciée. Utilisez à la place la propriété d'affichage au sein de la propriété de présentation. Consultez également les notes de publication 1.14.",
-	"JsonSchema.tasks.echoCommand.deprecated": "La propriété echoCommand est dépréciée. Utilisez à la place la propriété d'écho au sein de la propriété de présentation. Consultez également les notes de publication 1.14.",
-	"JsonSchema.tasks.suppressTaskName.deprecated": "La propriété suppressTaskName est obsolète. Utiliser la ligne de commande avec ses arguments dans la tâche à la place. Voir aussi les notes de version 1.14.",
-	"JsonSchema.tasks.isBuildCommand.deprecated": "La propriété isBuildCommand est dépréciée. Utilisez la propriété de groupe à la place. Consultez également les notes de publication 1.14.",
-	"JsonSchema.tasks.isTestCommand.deprecated": "La propriété isTestCommand est dépréciée. Utilisez la propriété de groupe à la place. Consultez également les notes de publication 1.14.",
-	"JsonSchema.tasks.taskSelector.deprecated": "La propriété taskSelector est obsolète. Utiliser la ligne de commande avec ses arguments dans la tâche à la place. Voir aussi les notes de version 1.14.",
-	"JsonSchema.windows": "Configuration de commande spécifique à Windows",
-	"JsonSchema.mac": "Configuration de commande spécifique à Mac",
-	"JsonSchema.linux": "Configuration de commande spécifique à Linux"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json b/i18n/fra/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
deleted file mode 100644
index 87d639c304b..00000000000
--- a/i18n/fra/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
+++ /dev/null
@@ -1,89 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"tasksCategory": "Tâches",
-	"ConfigureTaskRunnerAction.label": "Configurer une tâche",
-	"totalErrors": "{0} erreurs",
-	"totalWarnings": "{0} avertissements",
-	"totalInfos": "{0} infos",
-	"problems": "Problèmes",
-	"building": "Génération...",
-	"manyProblems": "10K+",
-	"runningTasks": "Afficher les tâches en cours d'exécution",
-	"tasks": "Tâches",
-	"TaskSystem.noHotSwap": "Changer le moteur d’exécution de tâches avec une tâche active en cours d’exécution nécessite de recharger la fenêtre",
-	"reloadWindow": "Recharger la fenêtre",
-	"TaskServer.folderIgnored": "Le dossier {0} est ignoré car il utilise la version 0.1.0 de task",
-	"TaskService.noBuildTask1": "Aucune tâche de build définie. Marquez une tâche avec 'isBuildCommand' dans le fichier tasks.json.",
-	"TaskService.noBuildTask2": "Aucune tâche de génération définie. Marquez une tâche comme groupe 'build' dans le fichier tasks.json.",
-	"TaskService.noTestTask1": "Aucune tâche de test définie. Marquez une tâche avec 'isTestCommand' dans le fichier tasks.json.",
-	"TaskService.noTestTask2": "Aucune tâche de test définie. Marquez une tâche comme groupe 'test' dans le fichier tasks.json.",
-	"TaskServer.noTask": "La tâche {0} à exécuter est introuvable.",
-	"TaskService.associate": "associer",
-	"TaskService.attachProblemMatcher.continueWithout": "Continuer sans analyser la sortie de la tâche",
-	"TaskService.attachProblemMatcher.never": "Ne jamais vérifier la sortie de la tâche",
-	"TaskService.attachProblemMatcher.learnMoreAbout": "En savoir plus sur la sortie de la tâche de numérisation",
-	"selectProblemMatcher": "Sélectionner pour quel type d’erreurs et d’avertissements analyser la sortie de la tâche",
-	"customizeParseErrors": "La configuration de tâche actuelle contient des erreurs. Corrigez-les avant de personnaliser une tâche. ",
-	"moreThanOneBuildTask": "De nombreuses tâches de génération sont définies dans le fichier tasks.json. Exécution de la première.\n",
-	"TaskSystem.activeSame.background": "La tâche '{0}\" est déjà active et en mode arrière-plan.",
-	"TaskSystem.activeSame.noBackground": "La tâche '{0}' est déjà active.",
-	"terminateTask": "Terminer la tâche",
-	"restartTask": "Redémarrer la tâche",
-	"TaskSystem.active": "Une tâche est déjà en cours d'exécution. Terminez-la avant d'exécuter une autre tâche.",
-	"TaskSystem.restartFailed": "Échec de la fin de l'exécution de la tâche {0}",
-	"TaskService.noConfiguration": "Erreur : La détection de la tâche {0} n’a pas contribué à une tâche pour la configuration suivante : {1}, la tâche sera ignorée.\n",
-	"TaskSystem.configurationErrors": "Erreur : la configuration de tâche fournie comporte des erreurs de validation et ne peut pas être utilisée. Corrigez d'abord les erreurs.",
-	"taskService.ignoreingFolder": "Les configurations de tâche seront ignorées pour le dossier de l’espace de travail {0}. Le support de la tâche d'espace de travail multi-dossier requiert que tous les dossiers utilisent task version 2.0.0\n",
-	"TaskSystem.invalidTaskJson": "Erreur : le fichier tasks.json contient des erreurs de syntaxe. Corrigez-les avant d'exécuter une tâche.\n",
-	"TaskSystem.runningTask": "Une tâche est en cours d'exécution. Voulez-vous la terminer ?",
-	"TaskSystem.terminateTask": "&&Terminer la tâche",
-	"TaskSystem.noProcess": "La tâche lancée n'existe plus. Si la tâche a engendré des processus en arrière-plan, la sortie de VS Code risque de donner lieu à des processus orphelins. Pour éviter ce problème, démarrez le dernier processus en arrière-plan avec un indicateur d'attente.",
-	"TaskSystem.exitAnyways": "&&Quitter quand même",
-	"TerminateAction.label": "Terminer la tâche",
-	"TaskSystem.unknownError": "Une erreur s'est produite durant l'exécution d'une tâche. Pour plus d'informations, consultez le journal des tâches.",
-	"TaskService.noWorkspace": "Les tâches ne sont disponibles que dans un dossier d'espace de travail.",
-	"recentlyUsed": "tâches récemment utilisées",
-	"configured": "tâches configurées",
-	"detected": "tâches détectées",
-	"TaskService.ignoredFolder": "Les dossiers d’espace de travail suivants sont ignorés car ils utilisent task version 0.1.0 : ",
-	"TaskService.notAgain": "Ne plus afficher",
-	"TaskService.pickRunTask": "Sélectionner la tâche à exécuter",
-	"TaslService.noEntryToRun": "Aucune tâche à exécuter n'a été trouvée. Configurer les tâches...",
-	"TaskService.fetchingBuildTasks": "Récupération des tâches de génération...",
-	"TaskService.pickBuildTask": "Sélectionner la tâche de génération à exécuter",
-	"TaskService.noBuildTask": "Aucune tâche de génération à exécuter n'a été trouvée. Configurer la tâche de génération...",
-	"TaskService.fetchingTestTasks": "Récupération des tâches de test...",
-	"TaskService.pickTestTask": "Sélectionner la tâche de test à exécuter",
-	"TaskService.noTestTaskTerminal": "Aucune tâche de test à exécuter n'a été trouvée. Configurer les tâches...",
-	"TaskService.tastToTerminate": "Sélectionner une tâche à terminer",
-	"TaskService.noTaskRunning": "Aucune tâche en cours d’exécution",
-	"TerminateAction.noProcess": "Le processus lancé n'existe plus. Si la tâche a engendré des tâches en arrière-plan, la sortie de VS Code risque de donner lieu à des processus orphelins.",
-	"TerminateAction.failed": "Échec de la fin de l'exécution de la tâche",
-	"TaskService.tastToRestart": "Sélectionner la tâche à redémarrer",
-	"TaskService.noTaskToRestart": "Aucune tâche à redémarrer.",
-	"TaskService.template": "Sélectionner un modèle de tâche",
-	"TaskService.createJsonFile": "Créer le fichier tasks.json à partir d'un modèle",
-	"TaskService.openJsonFile": "Ouvrir le fichier tasks.json",
-	"TaskService.pickTask": "Sélectionner une tâche à configurer",
-	"TaskService.defaultBuildTaskExists": "{0} est déjà marquée comme la tâche de génération par défaut",
-	"TaskService.pickDefaultBuildTask": "Sélectionner la tâche à utiliser comme tâche de génération par défaut",
-	"TaskService.defaultTestTaskExists": "{0} est déjà marquée comme tâche de test par défaut.",
-	"TaskService.pickDefaultTestTask": "Sélectionner la tâche à utiliser comme tâche de test par défaut",
-	"TaskService.pickShowTask": "Sélectionner la tâche pour montrer sa sortie",
-	"TaskService.noTaskIsRunning": "Aucune tâche n’est en cours d’exécution",
-	"ShowLogAction.label": "Afficher le journal des tâches",
-	"RunTaskAction.label": "Exécuter la tâche",
-	"RestartTaskAction.label": "Redémarrer la tâche en cours d'exécution",
-	"ShowTasksAction.label": "Afficher les tâches en cours d'exécution",
-	"BuildAction.label": "Exécuter la tâche de génération",
-	"TestAction.label": "Exécuter la tâche de test",
-	"ConfigureDefaultBuildTask.label": "Configurer la tâche de génération par défaut",
-	"ConfigureDefaultTestTask.label": "Configurer la tâche de test par défaut",
-	"quickOpen.task": "Exécuter la tâche"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/tasks/electron-browser/taskPanel.i18n.json b/i18n/fra/src/vs/workbench/parts/tasks/electron-browser/taskPanel.i18n.json
deleted file mode 100644
index 32ce93b2176..00000000000
--- a/i18n/fra/src/vs/workbench/parts/tasks/electron-browser/taskPanel.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"tasks": "Tâches"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.i18n.json b/i18n/fra/src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.i18n.json
deleted file mode 100644
index bc05b3a98d5..00000000000
--- a/i18n/fra/src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"TerminalTaskSystem.unknownError": "Une erreur inconnue s'est produite durant l'exécution d'une tâche. Pour plus d'informations, consultez le journal de sortie des tâches.",
-	"dependencyFailed": "Impossible de résoudre la tâche dépendante '{0}' dans le dossier de l’espace de travail '{1}'",
-	"TerminalTaskSystem.terminalName": "Tâche - {0}",
-	"closeTerminal": "Appuyez sur n’importe quelle touche pour fermer le terminal.",
-	"reuseTerminal": "Le terminal sera réutilisé par les tâches, appuyez sur une touche pour le fermer.",
-	"TerminalTaskSystem": "Impossible d'exécuter une commande d'interpréteur de commandes sur un lecteur UNC à l'aide de cmd.exe.",
-	"unkownProblemMatcher": "Impossible de résoudre le détecteur de problèmes {0}. Le détecteur est ignoré"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/tasks/node/processRunnerDetector.i18n.json b/i18n/fra/src/vs/workbench/parts/tasks/node/processRunnerDetector.i18n.json
deleted file mode 100644
index 54f8333d842..00000000000
--- a/i18n/fra/src/vs/workbench/parts/tasks/node/processRunnerDetector.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"TaskSystemDetector.noGulpTasks": "L'exécution de gulp --tasks-simple n'a listé aucune tâche. Avez-vous exécuté npm install ?",
-	"TaskSystemDetector.noJakeTasks": "L'exécution de jake --tasks n'a listé aucune tâche. Avez-vous exécuté npm install ?",
-	"TaskSystemDetector.noGulpProgram": "Gulp n'est pas installé sur votre système. Exécutez npm install -g gulp pour l'installer.",
-	"TaskSystemDetector.noJakeProgram": "Jake n'est pas installé sur votre système. Exécutez npm install -g jake pour l'installer.",
-	"TaskSystemDetector.noGruntProgram": "Grunt n'est pas installé sur votre système. Exécutez npm install -g grunt pour l'installer.",
-	"TaskSystemDetector.noProgram": "Le programme {0} est introuvable. Message : {1}",
-	"TaskSystemDetector.buildTaskDetected": "La tâche de génération nommée '{0}' a été détectée.",
-	"TaskSystemDetector.testTaskDetected": "La tâche de test nommée '{0}' a été détectée."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/tasks/node/processTaskSystem.i18n.json b/i18n/fra/src/vs/workbench/parts/tasks/node/processTaskSystem.i18n.json
deleted file mode 100644
index 638e2e6cd94..00000000000
--- a/i18n/fra/src/vs/workbench/parts/tasks/node/processTaskSystem.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"TaskRunnerSystem.unknownError": "Une erreur inconnue s'est produite durant l'exécution d'une tâche. Pour plus d'informations, consultez le journal de sortie des tâches.",
-	"TaskRunnerSystem.watchingBuildTaskFinished": "\nFin du suivi des tâches de génération.",
-	"TaskRunnerSystem.childProcessError": "Failed to launch external program {0} {1}.",
-	"TaskRunnerSystem.cancelRequested": "\nThe task '{0}' was terminated per user request.",
-	"unkownProblemMatcher": "Impossible de résoudre le détecteur de problèmes {0}. Le détecteur est ignoré"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json b/i18n/fra/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
deleted file mode 100644
index 6d14510f43b..00000000000
--- a/i18n/fra/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"ConfigurationParser.invalidCWD": "Warning: options.cwd must be of type string. Ignoring value {0}\n",
-	"ConfigurationParser.inValidArg": "Erreur : l'argument de commande doit être une chaîne ou une chaîne entre apostrophes. La valeur fournie est : \n{0}",
-	"ConfigurationParser.noargs": "Erreur : les arguments de commande doivent correspondre à un tableau de chaînes. La valeur fournie est :\n{0}",
-	"ConfigurationParser.noShell": "Avertissement : La configuration de l'interpréteur de commandes n'est prise en charge que durant l'exécution des tâches dans le terminal.",
-	"ConfigurationParser.noName": "Erreur : le détecteur de problèmes de correspondance dans la portée de déclaration doit avoir un nom :\n{0}\n",
-	"ConfigurationParser.unknownMatcherKind": "Avertissement : le détecteur de problèmes de correspondance défini est inconnu. Les types pris en charge sont string | ProblemMatcher | (string | ProblemMatcher)[].\n{0}\n",
-	"ConfigurationParser.invalidVaraibleReference": "Erreur : référence à problemMatcher non valide : {0}\n",
-	"ConfigurationParser.noTaskType": "Erreur : la configuration des tâches doit avoir une propriété de type. La configuration est ignorée.\n{0}\n",
-	"ConfigurationParser.noTypeDefinition": "Erreur : aucun type de tâche '{0}' enregistré. Avez-vous oublié d'installer une extension incluant le fournisseur de tâches correspondant ?",
-	"ConfigurationParser.missingRequiredProperty": "Erreur : la configuration de la tâche '{0}' a besoin de la propriété '{1}'. La configuration de la tâche sera ignorée.",
-	"ConfigurationParser.notCustom": "Erreur : la tâche n'est pas déclarée comme une tâche personnalisée. La configuration est ignorée.\n{0}\n",
-	"ConfigurationParser.noTaskName": "Erreur : un tâche doit fournir une propriété label. La tâche va être ignorée.\n{0}\n",
-	"taskConfiguration.noCommandOrDependsOn": "Erreur : La tâche '{0}' ne spécifie ni une commande, ni une propriété dependsOn. La tâche est ignorée. Sa définition est :\n{1}",
-	"taskConfiguration.noCommand": "Erreur : La tâche '{0}' ne définit aucune commande. La tâche va être ignorée. Sa définition est :\n{1}",
-	"TaskParse.noOsSpecificGlobalTasks": "Task Version 2.0.0 ne supporte pas les tâches spécifiques globales du système d'exploitation. Convertissez-les en une tâche en une commande spécifique du système d'exploitation. Les tâches concernées sont : {0}"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.i18n.json b/i18n/fra/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.i18n.json
deleted file mode 100644
index e6b1283332b..00000000000
--- a/i18n/fra/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"termEntryAriaLabel": "{0}, sélecteur de terminaux",
-	"termCreateEntryAriaLabel": "{0}, créer un terminal",
-	"workbench.action.terminal.newplus": "$(plus) Créer un terminal intégré",
-	"noTerminalsMatching": "Aucun terminal correspondant",
-	"noTerminalsFound": "Aucun terminal ouvert"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/terminal/common/terminalColorRegistry.i18n.json b/i18n/fra/src/vs/workbench/parts/terminal/common/terminalColorRegistry.i18n.json
deleted file mode 100644
index e89604d8194..00000000000
--- a/i18n/fra/src/vs/workbench/parts/terminal/common/terminalColorRegistry.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"terminal.background": "Couleur d'arrière-plan du terminal, permet d'appliquer au terminal une couleur différente de celle du panneau.",
-	"terminal.foreground": "Couleur de premier plan du terminal.",
-	"terminalCursor.foreground": "La couleur de premier plan du curseur du terminal.",
-	"terminalCursor.background": "La couleur d’arrière-plan du curseur terminal. Permet de personnaliser la couleur d’un caractère recouvert par un curseur de bloc.",
-	"terminal.selectionBackground": "La couleur d’arrière-plan de sélection du terminal.",
-	"terminal.border": "Couleur de bordure qui sépare les volets de fractionnement dans le terminal. La valeur par défaut est panel.border.",
-	"terminal.ansiColor": "Couleur ansi '{0}' dans le terminal."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json b/i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
deleted file mode 100644
index c9b4f495f66..00000000000
--- a/i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"quickOpen.terminal": "Afficher tous les terminaux ouverts",
-	"terminal": "Terminal",
-	"terminalIntegratedConfigurationTitle": "Terminal intégré",
-	"terminal.integrated.shell.linux": "Chemin de l'interpréteur de commandes utilisé par le terminal sur Linux.",
-	"terminal.integrated.shellArgs.linux": "Arguments de ligne de commande à utiliser sur le terminal Linux.",
-	"terminal.integrated.shell.osx": "Chemin de l'interpréteur de commandes utilisé par le terminal sur OS X.",
-	"terminal.integrated.shellArgs.osx": "Arguments de ligne de commande à utiliser sur le terminal OS X.",
-	"terminal.integrated.shell.windows": "Le chemin du shell que le terminal utilise sous Windows. Lors de l’utilisation de shells fournies avec Windows (cmd, PowerShell ou Bash sur Ubuntu).",
-	"terminal.integrated.shellArgs.windows": "Arguments de ligne de commande à utiliser sur le terminal Windows.",
-	"terminal.integrated.macOptionIsMeta": "Traiter la clé option comme la clé meta dans le terminal sur macOS.",
-	"terminal.integrated.copyOnSelection": "Une fois le paramètre défini, le texte sélectionné dans le terminal sera copié dans le presse-papiers.",
-	"terminal.integrated.fontFamily": "Contrôle la famille de polices du terminal. La valeur par défaut est la valeur associée à editor.fontFamily.",
-	"terminal.integrated.fontSize": "Contrôle la taille de police en pixels du terminal.",
-	"terminal.integrated.letterSpacing": "Contrôle l'espacement de lettre du terminal, il s’agit d’une valeur entière qui représente la quantité de pixels supplémentaires à ajouter entre les caractères.",
-	"terminal.integrated.lineHeight": "Contrôle la hauteur de ligne du terminal. La multiplication de ce nombre par la taille de police du terminal permet d'obtenir la hauteur de ligne réelle en pixels.",
-	"terminal.integrated.fontWeight": "La police de caractères à utiliser dans le terminal pour le texte non gras.",
-	"terminal.integrated.fontWeightBold": "La police de caractères à utiliser dans le terminal pour le texte en gras.",
-	"terminal.integrated.cursorBlinking": "Contrôle si le curseur du terminal clignote.",
-	"terminal.integrated.cursorStyle": "Contrôle le style du curseur du terminal.",
-	"terminal.integrated.scrollback": "Contrôle la quantité maximale de lignes que le terminal conserve dans sa mémoire tampon.",
-	"terminal.integrated.setLocaleVariables": "Contrôle si les variables locales sont définies au démarrage du terminal. La valeur par défaut est true sur OS X, false sur les autres plateformes.",
-	"terminal.integrated.rendererType": "Contrôle la façon dont le terminal est affiché, les options sont \"canvas\" pour le moteur de rendu standard de canvas (rapide), \"dom\" pour le moteur de rendu de compatibilité basé sur DOM ou \"auto\" qui laisse VS Code deviner qui sera le meilleur. Ce paramètre nécessite que VS Code soit rechargé pour pouvoir être effectif.",
-	"terminal.integrated.rightClickBehavior": "Contrôle comment le terminal réagit au clic droit, les possibilités sont \"default\", \"copyPaste\" et \"selectWord\". \"default\" affichera le menu contextuel, \"copyPaste\" copiera lorsqu’il y a une sélection dans le cas contraire, \"selectWord\" sélectionne le mot sous le curseur et afficher le menu contextuel.",
-	"terminal.integrated.cwd": "Chemin explicite de lancement du terminal. Il est utilisé comme répertoire de travail actif du processus d'interpréteur de commandes. Cela peut être particulièrement utile dans les paramètres d'espace de travail, si le répertoire racine n'est pas un répertoire de travail actif adéquat.",
-	"terminal.integrated.confirmOnExit": "Indique s'il est nécessaire de confirmer l'existence de sessions de terminal actives au moment de quitter.",
-	"terminal.integrated.enableBell": "Si la cloche du terminal est activée ou non.",
-	"terminal.integrated.commandsToSkipShell": "Ensemble d'ID de commandes dont les combinaisons de touches sont gérées par Code au lieu d'être envoyées à l'interpréteur de commandes. Cela permet d'utiliser des combinaisons de touches qui sont normalement consommées par l'interpréteur de commandes et d'obtenir le même résultat quand le terminal n'a pas le focus, par exemple Ctrl+P pour lancer Quick Open.",
-	"terminal.integrated.env.osx": "Objet avec les variables d’environnement qui seront ajoutées au processus VS Code pour être utilisées par le terminal sous OS X",
-	"terminal.integrated.env.linux": "Objet avec les variables d’environnement qui seront ajoutées au processus VS Code pour être utilisées par le terminal sous Linux",
-	"terminal.integrated.env.windows": "Objet avec les variables d’environnement qui seront ajoutées au processus VS Code pour être utilisées par le terminal sous Windows",
-	"terminal.integrated.showExitAlert": "Afficher une alerte `Le processus terminal s’est arrêté avec le code de sortie` lorsque le code de sortie est différent de zéro.",
-	"terminal.integrated.experimentalRestore": "Si le fait de restaurer automatiquement les sessions du terminal pour l'espace de travail au lancement de VS Code. Il s'agit d'une fonctionnalité expérimentale; elle peut être boguée et peut changer dans le futur.",
-	"terminalCategory": "Terminal",
-	"viewCategory": "Affichage"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json b/i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
deleted file mode 100644
index 8f10773d1a2..00000000000
--- a/i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
+++ /dev/null
@@ -1,63 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"workbench.action.terminal.toggleTerminal": "Activer/désactiver le terminal intégré",
-	"workbench.action.terminal.kill": "Tuer l'instance active du terminal",
-	"workbench.action.terminal.kill.short": "Tuer le terminal",
-	"workbench.action.terminal.quickKill": "Tuer l'instance de terminal",
-	"workbench.action.terminal.copySelection": "Copier la sélection",
-	"workbench.action.terminal.selectAll": "Tout Sélectionner",
-	"workbench.action.terminal.deleteWordLeft": "Supprimer le mot à gauche",
-	"workbench.action.terminal.deleteWordRight": "Supprimer le mot à droite",
-	"workbench.action.terminal.moveToLineStart": "Aller au début de la ligne",
-	"workbench.action.terminal.moveToLineEnd": "Aller à la fin de la ligne",
-	"workbench.action.terminal.new": "Créer un terminal intégré",
-	"workbench.action.terminal.new.short": "Nouveau terminal",
-	"workbench.action.terminal.newWorkspacePlaceholder": "Sélectionner le répertoire de travail actuel pour le nouveau terminal",
-	"workbench.action.terminal.newInActiveWorkspace": "Créer un nouveau Terminal intégré (dans l'espace de travail actif)",
-	"workbench.action.terminal.split": "Diviser le terminal",
-	"workbench.action.terminal.splitInActiveWorkspace": "Diviser le Terminal (dans l'espace de travail actif)",
-	"workbench.action.terminal.focusPreviousPane": "Focus sur le panneau précédent",
-	"workbench.action.terminal.focusNextPane": "Focus sur le panneau suivant",
-	"workbench.action.terminal.resizePaneLeft": "Redimensionner le panneau vers la gauche",
-	"workbench.action.terminal.resizePaneRight": "Redimensionner le panneau vers la droite",
-	"workbench.action.terminal.resizePaneUp": "Redimensionner le panneau vers le haut",
-	"workbench.action.terminal.resizePaneDown": "Redimensionner le panneau vers le bas",
-	"workbench.action.terminal.focus": "Focus sur le terminal",
-	"workbench.action.terminal.focusNext": "Focus sur le terminal suivant",
-	"workbench.action.terminal.focusPrevious": "Focus sur le terminal précédent",
-	"workbench.action.terminal.paste": "Coller dans le terminal actif",
-	"workbench.action.terminal.DefaultShell": "Sélectionner l'interpréteur de commandes par défaut",
-	"workbench.action.terminal.runSelectedText": "Exécuter le texte sélectionné dans le terminal actif",
-	"workbench.action.terminal.runActiveFile": "Exécuter le fichier actif dans le terminal actif",
-	"workbench.action.terminal.runActiveFile.noFile": "Seuls les fichiers sur disque peuvent être exécutés dans le terminal",
-	"workbench.action.terminal.switchTerminal": "Changer de terminal",
-	"workbench.action.terminal.scrollDown": "Faire défiler vers le bas (ligne)",
-	"workbench.action.terminal.scrollDownPage": "Faire défiler vers le bas (page)",
-	"workbench.action.terminal.scrollToBottom": "Faire défiler jusqu'en bas",
-	"workbench.action.terminal.scrollUp": "Faire défiler vers le haut (ligne)",
-	"workbench.action.terminal.scrollUpPage": "Faire défiler vers le haut (page)",
-	"workbench.action.terminal.scrollToTop": "Faire défiler jusqu'en haut",
-	"workbench.action.terminal.clear": "Effacer",
-	"workbench.action.terminal.clearSelection": "Effacer la sélection",
-	"workbench.action.terminal.allowWorkspaceShell": "Autoriser la configuration de l'interpréteur de commandes de l'espace de travail",
-	"workbench.action.terminal.disallowWorkspaceShell": "Interdire la configuration de l'interpréteur de commandes de l'espace de travail",
-	"workbench.action.terminal.rename": "Renommer",
-	"workbench.action.terminal.rename.prompt": "Entrer le nom du terminal",
-	"workbench.action.terminal.focusFindWidget": "Focus sur le widget de recherche",
-	"workbench.action.terminal.hideFindWidget": "Masquer le widget de recherche",
-	"nextTerminalFindTerm": "Afficher le terme de recherche suivant",
-	"previousTerminalFindTerm": "Afficher le terme de recherche précédent",
-	"quickOpenTerm": "Changer de terminal actif",
-	"workbench.action.terminal.scrollToPreviousCommand": "Faire défiler jusqu'à la commande précédente",
-	"workbench.action.terminal.scrollToNextCommand": "Faire défiler jusqu'à la prochaine commande",
-	"workbench.action.terminal.selectToPreviousCommand": "Sélectionnez pour la commande précédente",
-	"workbench.action.terminal.selectToNextCommand": "Sélectionnez pour la commande suivante",
-	"workbench.action.terminal.selectToPreviousLine": "Sélectionner pour la ligne précédente",
-	"workbench.action.terminal.selectToNextLine": "Sélectionner pour la ligne suivante"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json b/i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
deleted file mode 100644
index e89604d8194..00000000000
--- a/i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"terminal.background": "Couleur d'arrière-plan du terminal, permet d'appliquer au terminal une couleur différente de celle du panneau.",
-	"terminal.foreground": "Couleur de premier plan du terminal.",
-	"terminalCursor.foreground": "La couleur de premier plan du curseur du terminal.",
-	"terminalCursor.background": "La couleur d’arrière-plan du curseur terminal. Permet de personnaliser la couleur d’un caractère recouvert par un curseur de bloc.",
-	"terminal.selectionBackground": "La couleur d’arrière-plan de sélection du terminal.",
-	"terminal.border": "Couleur de bordure qui sépare les volets de fractionnement dans le terminal. La valeur par défaut est panel.border.",
-	"terminal.ansiColor": "Couleur ansi '{0}' dans le terminal."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminalConfigHelper.i18n.json b/i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminalConfigHelper.i18n.json
deleted file mode 100644
index 476805ff364..00000000000
--- a/i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminalConfigHelper.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"terminal.integrated.allowWorkspaceShell": "Autorisez-vous le lancement de {0} (défini comme paramètre d'espace de travail) dans le terminal ?",
-	"allow": "Allow",
-	"disallow": "Disallow"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminalFindWidget.i18n.json b/i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminalFindWidget.i18n.json
deleted file mode 100644
index 6183484b59c..00000000000
--- a/i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminalFindWidget.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"label.find": "Rechercher",
-	"placeholder.find": "Rechercher",
-	"label.previousMatchButton": "Correspondance précédente",
-	"label.nextMatchButton": "Correspondance suivante",
-	"label.closeButton": "Fermer"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json b/i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json
deleted file mode 100644
index c976fd3fb9f..00000000000
--- a/i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"terminal.integrated.a11yBlankLine": "Ligne vide",
-	"terminal.integrated.a11yPromptLabel": "Entrée du terminal",
-	"terminal.integrated.a11yTooMuchOutput": "Trop de sorties à annoncer, naviguer dans les lignes manuellement pour lire",
-	"yes": "Oui",
-	"terminal.rendererInAllNewTerminals": "Tous les terminaux nouvellement créés utiliseront le moteur de rendu non-GPU.",
-	"no": "Non",
-	"dontShowAgain": "Ne plus afficher",
-	"terminal.slowRendering": "Le moteur de rendu standard pour le terminal intégré semble lent sur votre ordinateur. Souhaitez-vous basculer vers le moteur de rendu basé sur DOM  ce qui peut améliorer les performances ? [En savoir plus sur les paramètres de terminal] (https://code.visualstudio.com/docs/editor/integrated-terminal#_changing-how-the-terminal-is-rendered).",
-	"terminal.integrated.copySelection.noSelection": "Le terminal n'a aucune sélection à copier",
-	"terminal.integrated.exitedWithCode": "Le processus du terminal s'est achevé avec le code de sortie {0}",
-	"terminal.integrated.waitOnExit": "Appuyez sur une touche pour fermer le terminal",
-	"terminal.integrated.launchFailed": "Échec du lancement de la commande de traitement du terminal '{0}{1}' (code de sortie : {2})",
-	"terminal.integrated.launchFailedExtHost": "Impossible de démarrer le processus du terminal (code de sortie : {0})"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminalLinkHandler.i18n.json b/i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminalLinkHandler.i18n.json
deleted file mode 100644
index b4a09856d81..00000000000
--- a/i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminalLinkHandler.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"terminalLinkHandler.followLinkAlt": "Alt + clic pour suivre le lien",
-	"terminalLinkHandler.followLinkCmd": "Commande + clic pour suivre le lien",
-	"terminalLinkHandler.followLinkCtrl": "Ctrl + clic pour suivre le lien"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json b/i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json
deleted file mode 100644
index 7555b3f310d..00000000000
--- a/i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"terminal.useMonospace": "Utilisez 'monospace'",
-	"terminal.monospaceOnly": "Le terminal prend uniquement en charge les polices à espacement fixe.",
-	"copy": "Copier",
-	"split": "Diviser",
-	"paste": "Coller",
-	"selectAll": "Tout Sélectionner",
-	"clear": "Effacer"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json b/i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
deleted file mode 100644
index 866daa5d73f..00000000000
--- a/i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"terminal.integrated.chooseWindowsShellInfo": "Vous pouvez changer l'interpréteur de commandes par défaut du terminal en sélectionnant le bouton Personnaliser.",
-	"customize": "Personnaliser",
-	"never again": "Ne plus afficher",
-	"terminal.integrated.chooseWindowsShell": "Sélectionnez votre interpréteur de commandes de terminal favori. Vous pouvez le changer plus tard dans vos paramètres",
-	"terminalService.terminalCloseConfirmationSingular": "Il existe une session de terminal active. Voulez-vous la tuer ?",
-	"terminalService.terminalCloseConfirmationPlural": "Il existe {0} sessions de terminal actives. Voulez-vous les tuer ?"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/themes/electron-browser/themes.contribution.i18n.json b/i18n/fra/src/vs/workbench/parts/themes/electron-browser/themes.contribution.i18n.json
deleted file mode 100644
index 8e07c2d58b3..00000000000
--- a/i18n/fra/src/vs/workbench/parts/themes/electron-browser/themes.contribution.i18n.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"selectTheme.label": "Thème de couleur",
-	"themes.category.light": "thèmes clairs",
-	"themes.category.dark": "thèmes sombres",
-	"themes.category.hc": "thèmes à contraste élevé",
-	"installColorThemes": "Installer des thèmes de couleurs supplémentaires...",
-	"themes.selectTheme": "Sélectionner un thème de couleur (flèches bas/haut pour afficher l'aperçu)",
-	"selectIconTheme.label": "Thème d'icône de fichier",
-	"noIconThemeLabel": "Aucun",
-	"noIconThemeDesc": "Désactiver les icônes de fichiers",
-	"installIconThemes": "Installer des thèmes d'icônes de fichiers supplémentaires...",
-	"themes.selectIconTheme": "Sélectionner un thème d'icône de fichier",
-	"generateColorTheme.label": "Générer le thème de couleur à partir des paramètres actuels",
-	"preferences": "Préférences",
-	"developer": "Développeur"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/trust/electron-browser/unsupportedWorkspaceSettings.contribution.i18n.json b/i18n/fra/src/vs/workbench/parts/trust/electron-browser/unsupportedWorkspaceSettings.contribution.i18n.json
deleted file mode 100644
index a4dbf23f4f2..00000000000
--- a/i18n/fra/src/vs/workbench/parts/trust/electron-browser/unsupportedWorkspaceSettings.contribution.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openWorkspaceSettings": "Ouvrir les paramètres d'espace de travail",
-	"dontShowAgain": "Ne plus afficher",
-	"unsupportedWorkspaceSettings": "Cet espace de travail contient des paramètres qui ne peuvent être définis que dans les paramètres utilisateur ({0}). Cliquez [ici]({1}) pour en savoir plus."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json b/i18n/fra/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json
deleted file mode 100644
index 68cda1a5f01..00000000000
--- a/i18n/fra/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"releaseNotesInputName": "Notes de publication : {0}",
-	"unassigned": "non assigné"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/update/electron-browser/releaseNotesInput.i18n.json b/i18n/fra/src/vs/workbench/parts/update/electron-browser/releaseNotesInput.i18n.json
deleted file mode 100644
index fc0236f7ee7..00000000000
--- a/i18n/fra/src/vs/workbench/parts/update/electron-browser/releaseNotesInput.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"releaseNotesInputName": "Notes de publication : {0}"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/update/electron-browser/update.contribution.i18n.json b/i18n/fra/src/vs/workbench/parts/update/electron-browser/update.contribution.i18n.json
deleted file mode 100644
index 8829ec6d508..00000000000
--- a/i18n/fra/src/vs/workbench/parts/update/electron-browser/update.contribution.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"release notes": "Notes de publication"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/update/electron-browser/update.i18n.json b/i18n/fra/src/vs/workbench/parts/update/electron-browser/update.i18n.json
deleted file mode 100644
index 7338692978c..00000000000
--- a/i18n/fra/src/vs/workbench/parts/update/electron-browser/update.i18n.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"releaseNotes": "Notes de publication",
-	"showReleaseNotes": "Afficher les notes de publication",
-	"read the release notes": "Bienvenue dans {0} v{1} ! Voulez-vous lire les notes de publication ?",
-	"licenseChanged": "Nos termes du contrat de licence ont changé. Veuillez cliquer [ici]({0}) pour les consulter.",
-	"neveragain": "Ne plus afficher",
-	"64bitisavailable": "{0} pour Windows 64 bits est maintenant disponible ! Cliquez [ici]({0}) pour en savoir plus.",
-	"updateIsReady": "Nouvelle mise à jour de {0} disponible.",
-	"noUpdatesAvailable": "Aucune mise à jour n'est disponible actuellement.",
-	"ok": "OK",
-	"thereIsUpdateAvailable": "Une mise à jour est disponible.",
-	"download now": "Télécharger maintenant",
-	"later": "Plus tard",
-	"updateAvailable": "Il y a une mise à jour disponible : {0} {1}",
-	"installUpdate": "Installer la mise à jour",
-	"updateInstalling": "{0} {1} est installé en tâche de fond ; Nous vous ferons savoir quand c’est fini.",
-	"updateAvailableAfterRestart": "Redémarrer {0} pour appliquer la dernière mise à jour.",
-	"updateNow": "Mettre à jour maintenant",
-	"commandPalette": "Palette de commandes...",
-	"settings": "Paramètres",
-	"keyboardShortcuts": "Raccourcis clavier",
-	"showExtensions": "Gérer les extensions",
-	"userSnippets": "Extraits de code de l'utilisateur",
-	"selectTheme.label": "Thème de couleur",
-	"themes.selectIconTheme.label": "Thème d'icône de fichier",
-	"checkForUpdates": "Rechercher les mises à jour...",
-	"checkingForUpdates": "Recherche des mises à jour...",
-	"DownloadingUpdate": "Téléchargement de la mise à jour...",
-	"installUpdate...": "Installation de la mise à jour...",
-	"installingUpdate": "Installation de la mise à jour...",
-	"restartToUpdate": "Redémarrer pour mettre à jour..."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/url/electron-browser/url.contribution.i18n.json b/i18n/fra/src/vs/workbench/parts/url/electron-browser/url.contribution.i18n.json
deleted file mode 100644
index de2f45279f3..00000000000
--- a/i18n/fra/src/vs/workbench/parts/url/electron-browser/url.contribution.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openUrl": "Ouvrir le lien",
-	"developer": "Développeur"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/views/browser/views.i18n.json b/i18n/fra/src/vs/workbench/parts/views/browser/views.i18n.json
deleted file mode 100644
index fcd571da926..00000000000
--- a/i18n/fra/src/vs/workbench/parts/views/browser/views.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"viewToolbarAriaLabel": "{0} actions",
-	"hideView": "Masquer dans la barre latérale"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/views/browser/viewsExtensionPoint.i18n.json b/i18n/fra/src/vs/workbench/parts/views/browser/viewsExtensionPoint.i18n.json
deleted file mode 100644
index f29fc92b3e6..00000000000
--- a/i18n/fra/src/vs/workbench/parts/views/browser/viewsExtensionPoint.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"requirearray": "les vues doivent figurer dans un tableau",
-	"requirestring": "la propriété '{0}' est obligatoire et doit être de type 'string'",
-	"optstring": "La propriété '{0}' peut être omise ou doit être de type 'string'",
-	"vscode.extension.contributes.view.id": "Identificateur de la vue. Utilisez-le pour inscrire un fournisseur de données au moyen de l'API 'vscode.window.registerTreeDataProviderForView', ainsi que pour déclencher l'activation de votre extension en inscrivant l'événement 'onView:${id}' dans 'activationEvents'.",
-	"vscode.extension.contributes.view.name": "Nom de la vue, contrôlable de visu. Affiché",
-	"vscode.extension.contributes.view.when": "Condition qui doit être vraie pour afficher cette vue",
-	"vscode.extension.contributes.views": "Ajoute des vues à l'éditeur",
-	"views.explorer": "Mode Explorateur",
-	"views.debug": "Debug View",
-	"locationId.invalid": "'{0}' n'est pas un emplacement de vue valide"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/watermark/electron-browser/watermark.i18n.json b/i18n/fra/src/vs/workbench/parts/watermark/electron-browser/watermark.i18n.json
deleted file mode 100644
index 3e3e7dcd0a9..00000000000
--- a/i18n/fra/src/vs/workbench/parts/watermark/electron-browser/watermark.i18n.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"watermark.showCommands": "Afficher toutes les commandes",
-	"watermark.quickOpen": "Accéder au fichier",
-	"watermark.openFile": "Ouvrir le fichier",
-	"watermark.openFolder": "Ouvrir le dossier",
-	"watermark.openFileFolder": "Ouvrir un fichier ou un dossier",
-	"watermark.openRecent": "Ouvrir les éléments récents",
-	"watermark.newUntitledFile": "Nouveau fichier sans titre",
-	"watermark.toggleTerminal": "Activer/désactiver le terminal",
-	"watermark.findInFiles": "Chercher dans les fichiers",
-	"watermark.startDebugging": "Démarrer le débogage",
-	"watermark.unboundCommand": "indépendant",
-	"workbenchConfigurationTitle": "Banc d'essai",
-	"tips.enabled": "Si cette option est activée, les conseils en filigrane s'affichent quand aucun éditeur n'est ouvert."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json b/i18n/fra/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json
deleted file mode 100644
index da5ba7cccbd..00000000000
--- a/i18n/fra/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"webview.editor.label": "éditeur webview",
-	"developer": "Développeur"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/webview/electron-browser/webviewCommands.i18n.json b/i18n/fra/src/vs/workbench/parts/webview/electron-browser/webviewCommands.i18n.json
deleted file mode 100644
index 09dc4357050..00000000000
--- a/i18n/fra/src/vs/workbench/parts/webview/electron-browser/webviewCommands.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openToolsLabel": "Ouvrir les outils de développement Webview",
-	"refreshWebviewLabel": "Recharger les Webviews"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json b/i18n/fra/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json
deleted file mode 100644
index f34ed7abe61..00000000000
--- a/i18n/fra/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"telemetryOptOut.optOutNotice": "Aidez-nous à améliorer VS Code en permettant à Microsoft de recueillir des données d’utilisation. Lisez notre [déclaration sur la vie privée]({0}) et apprenez comment [se désengager]({1}).",
-	"telemetryOptOut.optInNotice": "Aidez-nous à améliorer VS Code en permettant à Microsoft de recueillir des données d’utilisation. Lisez notre [déclaration sur la vie privée]({0})  et apprenez comment [se désengager]({1}).",
-	"telemetryOptOut.readMore": "Lire la suite"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/welcome/overlay/browser/welcomeOverlay.i18n.json b/i18n/fra/src/vs/workbench/parts/welcome/overlay/browser/welcomeOverlay.i18n.json
deleted file mode 100644
index 6a31ba50230..00000000000
--- a/i18n/fra/src/vs/workbench/parts/welcome/overlay/browser/welcomeOverlay.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"welcomeOverlay.explorer": "Explorateur de fichiers",
-	"welcomeOverlay.search": "Rechercher dans les fichiers",
-	"welcomeOverlay.git": "Gestion du code source",
-	"welcomeOverlay.debug": "Lancer et déboguer",
-	"welcomeOverlay.extensions": "Gérer les extensions",
-	"welcomeOverlay.problems": "Afficher les erreurs et avertissements",
-	"welcomeOverlay.commandPalette": "Rechercher et exécuter toutes les commandes",
-	"welcomeOverlay.notifications": "Afficher les notifications",
-	"welcomeOverlay": "Vue d'ensemble de l'interface utilisateur",
-	"hideWelcomeOverlay": "Masquer la vue d'ensemble de l'interface",
-	"help": "Aide"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json b/i18n/fra/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
deleted file mode 100644
index 25e95767831..00000000000
--- a/i18n/fra/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"welcomePage.vscode": "Visual Studio Code",
-	"welcomePage.editingEvolved": "Édition évoluée",
-	"welcomePage.start": "Démarrer",
-	"welcomePage.newFile": "Nouveau fichier",
-	"welcomePage.openFolder": "Ouvrir un dossier...",
-	"welcomePage.addWorkspaceFolder": "Ajouter un dossier d’espace de travail...",
-	"welcomePage.recent": "Récent",
-	"welcomePage.moreRecent": "Plus...",
-	"welcomePage.noRecentFolders": "Aucun dossier récent",
-	"welcomePage.help": "Aide",
-	"welcomePage.keybindingsCheatsheet": "Fiche de révision du clavier imprimable",
-	"welcomePage.introductoryVideos": "Vidéos d'introduction",
-	"welcomePage.tipsAndTricks": "Conseils et astuces",
-	"welcomePage.productDocumentation": "Documentation du produit",
-	"welcomePage.gitHubRepository": "Dépôt GitHub",
-	"welcomePage.stackOverflow": "Stack Overflow",
-	"welcomePage.showOnStartup": "Afficher la page d'accueil au démarrage",
-	"welcomePage.customize": "Personnaliser",
-	"welcomePage.installExtensionPacks": "Outils et langages",
-	"welcomePage.installExtensionPacksDescription": "Installer un support pour {0} et {1}",
-	"welcomePage.moreExtensions": "plus",
-	"welcomePage.installKeymapDescription": "Paramètres et combinaisons de touches",
-	"welcomePage.installKeymapExtension": "Installer les paramètres et les raccourcis clavier de {0} et {1}",
-	"welcomePage.others": "autres",
-	"welcomePage.colorTheme": "Thème de couleur",
-	"welcomePage.colorThemeDescription": "Personnalisez l'apparence de l'éditeur et de votre code",
-	"welcomePage.learn": "Apprendre",
-	"welcomePage.showCommands": "Rechercher et exécuter toutes les commandes",
-	"welcomePage.showCommandsDescription": "La palette de commandes ({0}) permet d'accéder rapidement aux commandes pour en rechercher une",
-	"welcomePage.interfaceOverview": "Vue d'ensemble de l'interface",
-	"welcomePage.interfaceOverviewDescription": "Obtenez une superposition visuelle mettant en évidence les principaux composants de l'IU",
-	"welcomePage.interactivePlayground": "Terrain de jeu interactif",
-	"welcomePage.interactivePlaygroundDescription": "Essayez les fonctionnalités essentielles de l'éditeur en suivant une brève procédure pas à pas"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.contribution.i18n.json b/i18n/fra/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.contribution.i18n.json
deleted file mode 100644
index ec0065f2a04..00000000000
--- a/i18n/fra/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.contribution.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"workbenchConfigurationTitle": "Banc d'essai",
-	"workbench.startupEditor.none": "Démarrage sans éditeur.",
-	"workbench.startupEditor.welcomePage": "Ouvre la page de bienvenue (par défaut).",
-	"workbench.startupEditor.newUntitledFile": "Ouverture d'un nouveau fichier sans titre.",
-	"workbench.startupEditor": "Définit quel éditeur s’affiche au démarrage, si aucun n’est restauré à partir de la session précédente. Sélectionnez 'none' pour démarrer sans éditeur, 'welcomePage' pour ouvrir la page d’accueil (par défaut), 'newUntitledFile' pour ouvrir un nouveau fichier sans titre (seulement lors de l'ouverture d'un espace de travail vide).",
-	"help": "Aide"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json b/i18n/fra/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json
deleted file mode 100644
index ea5c592e201..00000000000
--- a/i18n/fra/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"welcomePage": "Bienvenue",
-	"welcomePage.javaScript": "JavaScript",
-	"welcomePage.typeScript": "TypeScript",
-	"welcomePage.python": "Python",
-	"welcomePage.php": "PHP",
-	"welcomePage.azure": "Azure",
-	"welcomePage.showAzureExtensions": "Afficher les extensions Azure",
-	"welcomePage.docker": "Docker",
-	"welcomePage.vim": "Vim",
-	"welcomePage.sublime": "Sublime",
-	"welcomePage.atom": "Atom",
-	"welcomePage.extensionPackAlreadyInstalled": "Le support pour {0} est déjà installé.",
-	"welcomePage.willReloadAfterInstallingExtensionPack": "La fenêtre se recharge après l'installation d'un support supplémentaire pour {0}.",
-	"welcomePage.installingExtensionPack": "Installation d'un support supplémentaire pour {0}...",
-	"welcomePage.extensionPackNotFound": "Le support pour {0} avec l'ID {1} est introuvable.",
-	"welcomePage.keymapAlreadyInstalled": "Les raccourcis clavier {0} sont déjà installés.",
-	"welcomePage.willReloadAfterInstallingKeymap": "La fenêtre se recharge après l'installation des raccourcis clavier {0}.",
-	"welcomePage.installingKeymap": "Installation des raccourcis clavier de {0}...",
-	"welcomePage.keymapNotFound": "Les raccourcis clavier {0} ayant l'ID {1} sont introuvables.",
-	"welcome.title": "Bienvenue",
-	"welcomePage.openFolderWithPath": "Ouvrir le dossier {0} avec le chemin {1}",
-	"welcomePage.extensionListSeparator": ", ",
-	"welcomePage.installKeymap": "Installer le mappage de touches {0}",
-	"welcomePage.installExtensionPack": "Installer un support supplémentaire pour {0} ",
-	"welcomePage.installedKeymap": "Le mappage de touches '{0}' est déjà installé",
-	"welcomePage.installedExtensionPack": "Le support {0} est déjà installé.",
-	"ok": "OK",
-	"details": "Détails",
-	"welcomePage.buttonBackground": "Couleur d'arrière-plan des boutons de la page d'accueil.",
-	"welcomePage.buttonHoverBackground": "Couleur d'arrière-plan du pointage des boutons de la page d'accueil."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/welcome/walkThrough/electron-browser/editor/editorWalkThrough.i18n.json b/i18n/fra/src/vs/workbench/parts/welcome/walkThrough/electron-browser/editor/editorWalkThrough.i18n.json
deleted file mode 100644
index 80f2b91000b..00000000000
--- a/i18n/fra/src/vs/workbench/parts/welcome/walkThrough/electron-browser/editor/editorWalkThrough.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"editorWalkThrough.title": "Terrain de jeu interactif",
-	"editorWalkThrough": "Terrain de jeu interactif"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThrough.contribution.i18n.json b/i18n/fra/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThrough.contribution.i18n.json
deleted file mode 100644
index aec138d554e..00000000000
--- a/i18n/fra/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThrough.contribution.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"walkThrough.editor.label": "Terrain de jeu interactif",
-	"help": "Aide"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughActions.i18n.json b/i18n/fra/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughActions.i18n.json
deleted file mode 100644
index 4505e0e5596..00000000000
--- a/i18n/fra/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughActions.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"editorWalkThrough.arrowUp": "Faire défiler vers le haut (ligne)",
-	"editorWalkThrough.arrowDown": "Faire défiler vers le bas (ligne)",
-	"editorWalkThrough.pageUp": "Faire défiler vers le haut (page)",
-	"editorWalkThrough.pageDown": "Faire défiler vers le bas (page)"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughPart.i18n.json b/i18n/fra/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughPart.i18n.json
deleted file mode 100644
index 79e0126c4f1..00000000000
--- a/i18n/fra/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughPart.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"walkThrough.unboundCommand": "indépendant",
-	"walkThrough.gitNotFound": "Git semble ne pas être installé sur votre système.",
-	"walkThrough.embeddedEditorBackground": "Couleur d'arrière-plan des éditeurs incorporés dans le terrain de jeu interactif."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/services/actions/electron-browser/menusExtensionPoint.i18n.json b/i18n/fra/src/vs/workbench/services/actions/electron-browser/menusExtensionPoint.i18n.json
deleted file mode 100644
index 8224c04d14f..00000000000
--- a/i18n/fra/src/vs/workbench/services/actions/electron-browser/menusExtensionPoint.i18n.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"requirearray": "les éléments de menu doivent figurer dans un tableau",
-	"requirestring": "la propriété '{0}' est obligatoire et doit être de type 'string'",
-	"optstring": "La propriété '{0}' peut être omise ou doit être de type 'string'",
-	"vscode.extension.contributes.menuItem.command": "Identificateur de la commande à exécuter. La commande doit être déclarée dans la section 'commands'",
-	"vscode.extension.contributes.menuItem.alt": "Identificateur d'une commande alternative à exécuter. La commande doit être déclarée dans la section 'commands'",
-	"vscode.extension.contributes.menuItem.when": "Condition qui doit être vraie pour afficher cet élément",
-	"vscode.extension.contributes.menuItem.group": "Groupe auquel cette commande appartient",
-	"vscode.extension.contributes.menus": "Contribue à fournir des éléments de menu à l'éditeur",
-	"menus.commandPalette": "Palette de commandes",
-	"menus.touchBar": "La touch bar (macOS uniquement)",
-	"menus.editorTitle": "Menu de titre de l'éditeur",
-	"menus.editorContext": "Menu contextuel de l'éditeur",
-	"menus.explorerContext": "Menu contextuel de l'Explorateur de fichiers",
-	"menus.editorTabContext": "Menu contextuel des onglets de l'éditeur",
-	"menus.debugCallstackContext": "Menu contextuel de la pile d'appels de débogage",
-	"menus.scmTitle": "Menu du titre du contrôle de code source",
-	"menus.scmSourceControl": "Le menu de contrôle de code source",
-	"menus.resourceGroupContext": "Menu contextuel du groupe de ressources du contrôle de code source",
-	"menus.resourceStateContext": "Menu contextuel de l'état des ressources du contrôle de code source",
-	"view.viewTitle": "Menu de titre de la vue ajoutée",
-	"view.itemContext": "Menu contextuel de l'élément de vue ajoutée",
-	"nonempty": "valeur non vide attendue.",
-	"opticon": "la propriété 'icon' peut être omise, ou bien elle doit être une chaîne ou un littéral tel que '{dark, light}'",
-	"requireStringOrObject": "la propriété `{0}` est obligatoire et doit être de type `string` ou `object`",
-	"requirestrings": "les propriétés `{0}` et `{1}` sont obligatoires et doivent être de type `string`",
-	"vscode.extension.contributes.commandType.command": "Identificateur de la commande à exécuter",
-	"vscode.extension.contributes.commandType.title": "Titre en fonction duquel la commande est représentée dans l'IU",
-	"vscode.extension.contributes.commandType.category": "(Facultatif) chaîne de catégorie en fonction de laquelle la commande est regroupée dans l'IU",
-	"vscode.extension.contributes.commandType.icon": "(Facultatif) Icône utilisée pour représenter la commande dans l'IU. Il s'agit d'un chemin de fichier ou d'une configuration dont le thème peut être changé",
-	"vscode.extension.contributes.commandType.icon.light": "Chemin d'icône quand un thème clair est utilisé",
-	"vscode.extension.contributes.commandType.icon.dark": "Chemin d'icône quand un thème sombre est utilisé",
-	"vscode.extension.contributes.commands": "Ajoute des commandes à la palette de commandes.",
-	"dup": "La commande '{0}' apparaît plusieurs fois dans la section 'commands'.",
-	"menuId.invalid": "'{0}' est un identificateur de menu non valide",
-	"missing.command": "L'élément de menu fait référence à une commande '{0}' qui n'est pas définie dans la section 'commands'.",
-	"missing.altCommand": "L'élément de menu fait référence à une commande alt '{0}' qui n'est pas définie dans la section 'commands'.",
-	"dupe.command": "L'élément de menu fait référence à la même commande que la commande par défaut et la commande alt"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/services/bulkEdit/electron-browser/bulkEditService.i18n.json b/i18n/fra/src/vs/workbench/services/bulkEdit/electron-browser/bulkEditService.i18n.json
deleted file mode 100644
index 64f732e09e0..00000000000
--- a/i18n/fra/src/vs/workbench/services/bulkEdit/electron-browser/bulkEditService.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"summary.0": "Aucune modification effectuée",
-	"summary.nm": "{0} modifications de texte effectuées dans {1} fichiers",
-	"summary.n0": "{0} modifications de texte effectuées dans un fichier",
-	"conflict": "Ces fichiers ont changé pendant ce temps : {0}"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/services/configuration/common/configurationExtensionPoint.i18n.json b/i18n/fra/src/vs/workbench/services/configuration/common/configurationExtensionPoint.i18n.json
deleted file mode 100644
index a9b8b259203..00000000000
--- a/i18n/fra/src/vs/workbench/services/configuration/common/configurationExtensionPoint.i18n.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.contributes.configuration.title": "Résumé des paramètres. Cette étiquette va être utilisée dans le fichier de paramètres en tant que commentaire de séparation.",
-	"vscode.extension.contributes.configuration.properties": "Description des propriétés de configuration.",
-	"scope.application.description": "Configuration spécifique de l'application, qui peut être configurée uniquement dans les paramètres utilisateur.",
-	"scope.window.description": "Configuration spécifique de la fenêtre, qui peut être configurée dans les paramètres utilisateur ou de l'espace de travail.",
-	"scope.resource.description": "Configuration spécifique de la ressource, qui peut être configurée dans les paramètres utilisateur, de l'espace de travail ou du dossier.",
-	"scope.description": "Portée dans laquelle la configuration s’applique. Les portées disponibles sont `window` et `resource`.",
-	"vscode.extension.contributes.defaultConfiguration": "Contribue aux paramètres de configuration d'éditeur par défaut en fonction du langage.",
-	"vscode.extension.contributes.configuration": "Ajoute des paramètres de configuration.",
-	"invalid.title": "'configuration.title' doit être une chaîne",
-	"invalid.properties": "'configuration.properties' doit être un objet",
-	"invalid.property": "'configuration.property' doit être un objet",
-	"invalid.allOf": "'configuration.allOf' est obsolète et ne doit plus être utilisé. Au lieu de cela, passez plusieurs sections de configuration sous forme de tableau au point de contribution 'configuration'.",
-	"workspaceConfig.folders.description": "Liste des dossiers à être chargés dans l’espace de travail.",
-	"workspaceConfig.path.description": "Un chemin de fichier, par exemple, '/root/folderA' ou './folderA' pour un chemin relatif résolu selon l’emplacement du fichier d’espace de travail.",
-	"workspaceConfig.name.description": "Un nom facultatif pour le dossier. ",
-	"workspaceConfig.uri.description": "URI du dossier",
-	"workspaceConfig.settings.description": "Paramètres de l’espace de travail",
-	"workspaceConfig.launch.description": "Configurations de lancement de l’espace de travail",
-	"workspaceConfig.extensions.description": "Extensions de l’espace de travail",
-	"unknownWorkspaceProperty": "Propriété de configuration d’espace de travail inconnue"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/services/configuration/node/configuration.i18n.json b/i18n/fra/src/vs/workbench/services/configuration/node/configuration.i18n.json
deleted file mode 100644
index 10bbc7a9e96..00000000000
--- a/i18n/fra/src/vs/workbench/services/configuration/node/configuration.i18n.json
+++ /dev/null
@@ -1,24 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"vscode.extension.contributes.configuration.title": "Résumé des paramètres. Cette étiquette va être utilisée dans le fichier de paramètres en tant que commentaire de séparation.",
-	"vscode.extension.contributes.configuration.properties": "Description des propriétés de configuration.",
-	"scope.window.description": "Configuration spécifique de la fenêtre, qui peut être configurée dans les paramètres utilisateur ou de l'espace de travail.",
-	"scope.resource.description": "Configuration spécifique de la ressource, qui peut être configurée dans les paramètres utilisateur, de l'espace de travail ou du dossier.",
-	"scope.description": "Portée dans laquelle la configuration s’applique. Les portées disponibles sont `window` et `resource`.",
-	"vscode.extension.contributes.configuration": "Ajoute des paramètres de configuration.",
-	"invalid.title": "'configuration.title' doit être une chaîne",
-	"vscode.extension.contributes.defaultConfiguration": "Contribue aux paramètres de configuration d'éditeur par défaut en fonction du langage.",
-	"invalid.properties": "'configuration.properties' doit être un objet",
-	"invalid.allOf": "'configuration.allOf' est obsolète et ne doit plus être utilisé. Au lieu de cela, passez plusieurs sections de configuration sous forme de tableau au point de contribution 'configuration'.",
-	"workspaceConfig.folders.description": "Liste des dossiers à être chargés dans l’espace de travail.",
-	"workspaceConfig.path.description": "Un chemin de fichier, par exemple, '/root/folderA' ou './folderA' pour un chemin relatif résolu selon l’emplacement du fichier d’espace de travail.",
-	"workspaceConfig.name.description": "Un nom facultatif pour le dossier. ",
-	"workspaceConfig.uri.description": "URI du dossier",
-	"workspaceConfig.settings.description": "Paramètres de l’espace de travail",
-	"workspaceConfig.extensions.description": "Extensions de l’espace de travail",
-	"unknownWorkspaceProperty": "Propriété de configuration d’espace de travail inconnue"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json b/i18n/fra/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
deleted file mode 100644
index 2993ced5122..00000000000
--- a/i18n/fra/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openTasksConfiguration": "Ouvrir la configuration des tâches",
-	"openLaunchConfiguration": "Ouvrir la configuration du lancement",
-	"open": "Ouvrir les paramètres",
-	"saveAndRetry": "Enregistrer et Réessayer",
-	"errorUnknownKey": "Impossible d’écrire dans {0} car {1} n’est pas une configuration recommandée.",
-	"errorInvalidWorkspaceConfigurationApplication": "Impossible d’écrire {0} dans les paramètres de l’espace de travail. Ce paramètre peut être écrit uniquement dans les paramètres de l’utilisateur.",
-	"errorInvalidFolderConfiguration": "Impossible d’écrire dans les paramètres de dossier parce que {0} ne supporte pas la portée de ressource de dossier.",
-	"errorInvalidUserTarget": "Impossible d’écrire dans les paramètres utilisateur parce que {0} ne supporte pas de portée globale.",
-	"errorInvalidWorkspaceTarget": "Impossible d’écrire dans les paramètres de l’espace de travail car {0} ne supporte pas de portée d’espace de travail dans un espace de travail multi dossiers.",
-	"errorInvalidFolderTarget": "Impossible d’écrire dans les paramètres de dossier car aucune ressource n’est fournie.",
-	"errorNoWorkspaceOpened": "Impossible d’écrire dans {0} car aucun espace de travail n’est ouvert. Veuillez ouvrir un espace de travail et essayer à nouveau.",
-	"errorInvalidTaskConfiguration": "Impossible d’écrire dans le fichier de configuration des tâches. Veuillez ouvrir le fichier pour y corriger les erreurs/avertissements et essayez à nouveau.",
-	"errorInvalidLaunchConfiguration": "Impossible d’écrire dans le fichier de configuration de lancement. Veuillez ouvrir le fichier pour y corriger les erreurs/avertissements et essayez à nouveau.",
-	"errorInvalidConfiguration": "Impossible d’écrire dans les paramètres de l’utilisateur. Veuillez s’il vous plaît ouvrir le fichier des paramètres de l’utilisateur pour y corriger les erreurs/avertissements et essayez à nouveau.",
-	"errorInvalidConfigurationWorkspace": "Impossible d’écrire dans les paramètres de l’espace de travail. Veuillez s’il vous plaît ouvrir le fichier des paramètres de l’espace de travail pour corriger les erreurs/avertissements dans le fichier et réessayez.",
-	"errorInvalidConfigurationFolder": "Impossible d’écrire dans les paramètres de dossier. Veuillez s’il vous plaît ouvrir le fichier des paramètres du dossier '{0}' pour y corriger les erreurs/avertissements et essayez à nouveau.",
-	"errorTasksConfigurationFileDirty": "Impossible d’écrire dans le fichier de configuration des tâches car le fichier a été modifié. Veuillez, s’il vous plaît, l'enregistrez et réessayez.",
-	"errorLaunchConfigurationFileDirty": "Impossible d’écrire dans le fichier de configuration de lancement car le fichier a été modifié. Veuillez l'enregistrer et réessayez.",
-	"errorConfigurationFileDirty": "Impossible d’écrire dans les paramètres de l'utilisateur car le fichier a été modifié. Veuillez s’il vous plaît enregistrer le fichier des paramètres de l'utilisateur et réessayez.",
-	"errorConfigurationFileDirtyWorkspace": "Impossible d’écrire dans les paramètres de l’espace de travail, car le fichier est en attente de sauvegarde. Veuillez s’il vous plaît enregistrer le fichier des paramètres de l’espace de travail et essayez à nouveau.",
-	"errorConfigurationFileDirtyFolder": "Impossible d’écrire dans les paramètres de dossier, car le fichier est en attente de sauvegarde. Veuillez s’il vous plaît enregistrer le fichier des paramètres du dossier '{0}' et essayez à nouveau.",
-	"userTarget": "Paramètres utilisateur",
-	"workspaceTarget": "Paramètres de l'espace de travail",
-	"folderTarget": "Paramètres de dossier"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/services/configuration/node/configurationService.i18n.json b/i18n/fra/src/vs/workbench/services/configuration/node/configurationService.i18n.json
deleted file mode 100644
index c28d44842af..00000000000
--- a/i18n/fra/src/vs/workbench/services/configuration/node/configurationService.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"unsupportedApplicationSetting": "Ce paramètre ne peut être appliqué que dans les paramètres utilisateur",
-	"unsupportedWindowSetting": "Ce paramètre ne peut pas être appliqué maintenant. Il est appliqué quand vous ouvrez ce dossier directement."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/services/configuration/node/jsonEditingService.i18n.json b/i18n/fra/src/vs/workbench/services/configuration/node/jsonEditingService.i18n.json
deleted file mode 100644
index 67780b76187..00000000000
--- a/i18n/fra/src/vs/workbench/services/configuration/node/jsonEditingService.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"errorInvalidFile": "Impossible d’écrire dans le fichier. Veuillez ouvrir le fichier pour corriger les erreurs/avertissements dans le fichier et réessayer.",
-	"errorFileDirty": "Impossible d’écrire dans le fichier parce que le fichier a été modifié. Veuillez enregistrer le fichier et réessayer."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json b/i18n/fra/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
deleted file mode 100644
index b142f6fc1d4..00000000000
--- a/i18n/fra/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"stringsOnlySupported": "La commande {0} n’a pas retourné un résultat de chaîne. Seules les chaînes sont prises en charge comme des résultats pour les commandes utilisées pour la substitution des variables."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/services/configurationResolver/node/variableResolver.i18n.json b/i18n/fra/src/vs/workbench/services/configurationResolver/node/variableResolver.i18n.json
deleted file mode 100644
index 26aac198556..00000000000
--- a/i18n/fra/src/vs/workbench/services/configurationResolver/node/variableResolver.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"missingEnvVarName": "'{0}' ne peut pas être résolu car aucun nom de variable d’environnement n’est donné.",
-	"configNotFound": "'{0}' ne peut pas être résolu car le paramètre '{1}' est introuvable.",
-	"configNoString": "'{0}' ne peut pas être résolu car '{1}' est une valeur structurée.",
-	"missingConfigName": "'{0}' ne peut pas être résolu car aucun nom de paramètre n'est donné.",
-	"noValueForCommand": "Impossible de résoudre '{0}', car la commande n'a pas de valeur.",
-	"canNotFindFolder": "'{0}' ne peut pas être résolu. Aucun dossier '{1}'.",
-	"canNotResolveWorkspaceFolderMultiRoot": "'{0}' ne peut pas être résolu dans un espace de travail de dossiers multiples. Gérer la portée cette variable en utilisant ':' et un nom de dossier d’espace de travail.",
-	"canNotResolveWorkspaceFolder": "'{0}' ne peut pas être résolu. Veuillez ouvrir un dossier.",
-	"canNotResolveFile": "'{0}' ne peut pas être résolu. Veuillez ouvrir un éditeur.",
-	"canNotResolveLineNumber": "'{0}' ne peut pas être résolu. Assurez-vous d’avoir une ligne sélectionnée dans l’éditeur actif.",
-	"canNotResolveSelectedText": "'{0}' ne peut pas être résolu. Assurez-vous que vous avez du texte sélectionné dans l’éditeur actif."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/services/crashReporter/common/crashReporterService.i18n.json b/i18n/fra/src/vs/workbench/services/crashReporter/common/crashReporterService.i18n.json
deleted file mode 100644
index 42bafb09091..00000000000
--- a/i18n/fra/src/vs/workbench/services/crashReporter/common/crashReporterService.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"telemetryConfigurationTitle": "Télémétrie",
-	"telemetry.enableCrashReporting": "Activez l'envoi de rapports d'incidents à Microsoft.\nCette option nécessite un redémarrage pour être prise en compte."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/services/crashReporter/electron-browser/crashReporterService.i18n.json b/i18n/fra/src/vs/workbench/services/crashReporter/electron-browser/crashReporterService.i18n.json
deleted file mode 100644
index a548f1dce05..00000000000
--- a/i18n/fra/src/vs/workbench/services/crashReporter/electron-browser/crashReporterService.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"telemetryConfigurationTitle": "Télémétrie",
-	"telemetry.enableCrashReporting": "Activez l'envoi de rapports d'incidents à Microsoft.\nCette option nécessite un redémarrage pour être prise en compte."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/services/decorations/browser/decorationsService.i18n.json b/i18n/fra/src/vs/workbench/services/decorations/browser/decorationsService.i18n.json
deleted file mode 100644
index 414a32a9d53..00000000000
--- a/i18n/fra/src/vs/workbench/services/decorations/browser/decorationsService.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"bubbleTitle": "Contient des éléments soulignés"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json b/i18n/fra/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json
deleted file mode 100644
index ad189dada97..00000000000
--- a/i18n/fra/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"yesButton": "&&Oui",
-	"cancelButton": "Annuler"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/services/dialogs/electron-browser/dialogs.i18n.json b/i18n/fra/src/vs/workbench/services/dialogs/electron-browser/dialogs.i18n.json
deleted file mode 100644
index 0a00e59b5a8..00000000000
--- a/i18n/fra/src/vs/workbench/services/dialogs/electron-browser/dialogs.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"yesButton": "&&Oui",
-	"cancelButton": "Annuler",
-	"moreFile": "...1 fichier supplémentaire non affiché",
-	"moreFiles": "...{0} fichiers supplémentaires non affichés"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/services/editor/browser/editorService.i18n.json b/i18n/fra/src/vs/workbench/services/editor/browser/editorService.i18n.json
deleted file mode 100644
index 50e968f8ee3..00000000000
--- a/i18n/fra/src/vs/workbench/services/editor/browser/editorService.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"compareLabels": "{0} ↔ {1}"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/services/editor/common/editorService.i18n.json b/i18n/fra/src/vs/workbench/services/editor/common/editorService.i18n.json
deleted file mode 100644
index ca1ee0161c1..00000000000
--- a/i18n/fra/src/vs/workbench/services/editor/common/editorService.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"compareLabels": "{0} ↔ {1}"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/services/extensions/common/extensionsRegistry.i18n.json b/i18n/fra/src/vs/workbench/services/extensions/common/extensionsRegistry.i18n.json
deleted file mode 100644
index b219305fb3c..00000000000
--- a/i18n/fra/src/vs/workbench/services/extensions/common/extensionsRegistry.i18n.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.engines": "Moteur de compatibilité.",
-	"vscode.extension.engines.vscode": "Pour les extensions VS Code, spécifie la version de VS Code avec laquelle l'extension est compatible. Ne peut pas être *. Exemple : ^0.10.5 indique une compatibilité avec la version minimale 0.10.5 de VS Code.",
-	"vscode.extension.publisher": "Éditeur de l'extension VS Code.",
-	"vscode.extension.displayName": "Nom d'affichage de l'extension utilisée dans la galerie VS Code.",
-	"vscode.extension.categories": "Catégories utilisées par la galerie VS Code pour catégoriser l'extension.",
-	"vscode.extension.category.languages.deprecated": "Utiliser 'Langages de programmation' à la place",
-	"vscode.extension.galleryBanner": "Bannière utilisée dans le marketplace VS Code.",
-	"vscode.extension.galleryBanner.color": "Couleur de la bannière de l'en-tête de page du marketplace VS Code.",
-	"vscode.extension.galleryBanner.theme": "Thème de couleur de la police utilisée dans la bannière.",
-	"vscode.extension.contributes": "Toutes les contributions de l'extension VS Code représentées par ce package.",
-	"vscode.extension.preview": "Définit l'extension à marquer en tant que préversion dans Marketplace.",
-	"vscode.extension.activationEvents": "Événements d'activation pour l'extension VS Code.",
-	"vscode.extension.activationEvents.onLanguage": "Événement d'activation envoyé quand un fichier résolu dans le langage spécifié est ouvert.",
-	"vscode.extension.activationEvents.onCommand": "Événement d'activation envoyé quand la commande spécifiée est appelée.",
-	"vscode.extension.activationEvents.onDebug": "Un événement d’activation émis chaque fois qu’un utilisateur est sur le point de démarrer le débogage ou sur le point de la déboguer des configurations.",
-	"vscode.extension.activationEvents.onDebugInitialConfigurations": "Événement d'activation envoyé chaque fois qu’un \"launch.json\" doit être créé (et toutes les méthodes de provideDebugConfigurations doivent être appelées).",
-	"vscode.extension.activationEvents.onDebugResolve": "Événement d'activation envoyé quand une session de débogage du type spécifié est sur le point d’être lancée (et une méthode resolveDebugConfiguration correspondante doit être appelée).",
-	"vscode.extension.activationEvents.workspaceContains": "Événement d'activation envoyé quand un dossier ouvert contient au moins un fichier correspondant au modèle glob spécifié.",
-	"vscode.extension.activationEvents.onView": "Événement d'activation envoyé quand la vue spécifiée est développée.",
-	"vscode.extension.activationEvents.onUri": "Événement d'activation envoyé quand un URI système dirigé vers cette extension est ouvert.",
-	"vscode.extension.activationEvents.star": "Événement d'activation envoyé au démarrage de VS Code. Pour garantir la qualité de l'expérience utilisateur, utilisez cet événement d'activation dans votre extension uniquement quand aucune autre combinaison d'événements d'activation ne fonctionne dans votre cas d'utilisation.",
-	"vscode.extension.badges": "Ensemble de badges à afficher dans la barre latérale de la page d'extensions de Marketplace.",
-	"vscode.extension.badges.url": "URL de l'image du badge.",
-	"vscode.extension.badges.href": "Lien du badge.",
-	"vscode.extension.badges.description": "Description du badge.",
-	"vscode.extension.markdown": "Contrôle le moteur de rendu de Markdown utilisé sur le marché. Github (par défaut) ou standard.",
-	"vscode.extension.qna": "Contrôle le lien Q&A sur le marché. Mettre à marketplace pour activer le site  de Q&A du Marketplace par défaut. Mettre une chaîne pour fournir l’URL d’un site personnalisé de Q&A. Mettre à false pour désactiver complètement les Q&A.",
-	"vscode.extension.extensionDependencies": "Dépendances envers d'autres extensions. L'identificateur d'une extension est toujours ${publisher}.${name}. Exemple : vscode.csharp.",
-	"vscode.extension.scripts.prepublish": "Le script exécuté avant le package est publié en tant qu'extension VS Code.",
-	"vscode.extension.scripts.uninstall": "Désinstallez le crochet pour l'extension VS Code. Script exécuté quand l'extension est complètement désinstallée dans VS Code et au redémarrage de VS Code (arrêt, puis démarrage). Seuls les scripts Node sont pris en charge.",
-	"vscode.extension.icon": "Chemin d'une icône de 128 x 128 pixels."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/services/extensions/electron-browser/extensionHost.i18n.json b/i18n/fra/src/vs/workbench/services/extensions/electron-browser/extensionHost.i18n.json
deleted file mode 100644
index ff11cb2ba24..00000000000
--- a/i18n/fra/src/vs/workbench/services/extensions/electron-browser/extensionHost.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"extensionHostProcess.startupFailDebug": "L'hôte d'extension n'a pas démarré en moins de 10 secondes. Il est peut-être arrêté à la première ligne et a besoin d'un débogueur pour continuer.",
-	"extensionHostProcess.startupFail": "L'hôte d'extension n'a pas démarré en moins de 10 secondes. Il existe peut-être un problème.",
-	"reloadWindow": "Recharger la fenêtre",
-	"extensionHostProcess.error": "Erreur de l'hôte d'extension : {0}"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/services/extensions/electron-browser/extensionHostProfiler.i18n.json b/i18n/fra/src/vs/workbench/services/extensions/electron-browser/extensionHostProfiler.i18n.json
deleted file mode 100644
index d1512a59ea4..00000000000
--- a/i18n/fra/src/vs/workbench/services/extensions/electron-browser/extensionHostProfiler.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"message": "$(zap) Profilage de l'hôte d'extension..."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/services/extensions/electron-browser/extensionPoints.i18n.json b/i18n/fra/src/vs/workbench/services/extensions/electron-browser/extensionPoints.i18n.json
deleted file mode 100644
index 66f94810fab..00000000000
--- a/i18n/fra/src/vs/workbench/services/extensions/electron-browser/extensionPoints.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"jsonParseFail": "Échec de l'analyse de {0} : {1}.",
-	"fileReadFail": "Impossible de lire le fichier {0} : {1}.",
-	"jsonsParseReportErrors": "Échec de l'analyse de {0} : {1}.",
-	"missingNLSKey": "Le message est introuvable pour la clé {0}."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json b/i18n/fra/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json
deleted file mode 100644
index 7604f9ffac7..00000000000
--- a/i18n/fra/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"extensionsDisabled": "Toutes les extensions sont désactivées.",
-	"extensionHostProcess.crash": "L'hôte d’extension s'est arrêté de manière inattendue.",
-	"extensionHostProcess.unresponsiveCrash": "L'hôte d'extension s'est arrêté, car il ne répondait pas.",
-	"devTools": "Ouvrir les outils de développement",
-	"restart": "Redémarrer l’hôte d'extension",
-	"overwritingExtension": "Remplacement de l'extension {0} par {1}.",
-	"extensionUnderDevelopment": "Chargement de l'extension de développement sur {0}",
-	"extensionCache.invalid": "Des extensions ont été modifiées sur le disque. Veuillez recharger la fenêtre.",
-	"reloadWindow": "Recharger la fenêtre"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/services/extensions/node/extensionPoints.i18n.json b/i18n/fra/src/vs/workbench/services/extensions/node/extensionPoints.i18n.json
deleted file mode 100644
index c4eb6fc89e7..00000000000
--- a/i18n/fra/src/vs/workbench/services/extensions/node/extensionPoints.i18n.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"jsonParseFail": "Échec de l'analyse de {0} : {1}.",
-	"fileReadFail": "Impossible de lire le fichier {0} : {1}.",
-	"jsonsParseReportErrors": "Échec de l'analyse de {0} : {1}.",
-	"missingNLSKey": "Le message est introuvable pour la clé {0}.",
-	"notSemver": "La version de l'extension n'est pas compatible avec SemVer.",
-	"extensionDescription.empty": "Description d'extension vide obtenue",
-	"extensionDescription.publisher": "la propriété '{0}' est obligatoire et doit être de type 'string'",
-	"extensionDescription.name": "la propriété '{0}' est obligatoire et doit être de type 'string'",
-	"extensionDescription.version": "la propriété '{0}' est obligatoire et doit être de type 'string'",
-	"extensionDescription.engines": "la propriété '{0}' est obligatoire et doit être de type 'object'",
-	"extensionDescription.engines.vscode": "la propriété '{0}' est obligatoire et doit être de type 'string'",
-	"extensionDescription.extensionDependencies": "la propriété '{0}' peut être omise ou doit être de type 'string[]'",
-	"extensionDescription.activationEvents1": "la propriété '{0}' peut être omise ou doit être de type 'string[]'",
-	"extensionDescription.activationEvents2": "les propriétés '{0}' et '{1}' doivent être toutes les deux spécifiées ou toutes les deux omises",
-	"extensionDescription.main1": "La propriété '{0}' peut être omise ou doit être de type 'string'",
-	"extensionDescription.main2": "'main' ({0}) est censé être inclus dans le dossier ({1}) de l'extension. Cela risque de rendre l'extension non portable.",
-	"extensionDescription.main3": "les propriétés '{0}' et '{1}' doivent être toutes les deux spécifiées ou toutes les deux omises"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/services/files/electron-browser/fileService.i18n.json b/i18n/fra/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
deleted file mode 100644
index bd1e8163634..00000000000
--- a/i18n/fra/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"netVersionError": "Microsoft .NET Framework 4.5 est obligatoire. Suivez le lien pour l'installer.",
-	"installNet": "Télécharger .NET Framework 4.5",
-	"neverShowAgain": "Ne plus afficher",
-	"enospcError": "{0} n’est pas en mesure de surveiller les modifications de fichiers dans ce grand espace de travail. Veuillez suivre le lien d'instructions pour résoudre ce problème.",
-	"learnMore": "Instructions",
-	"fileInvalidPath": "Ressource de fichier non valide ({0})",
-	"fileIsDirectoryError": "Le fichier est un répertoire",
-	"fileNotModifiedError": "Fichier non modifié depuis",
-	"fileTooLargeForHeapError": "Pour ouvrir un fichier de cette taille, vous devez redémarrer VS Code et lui permettre d’utiliser plus de mémoire",
-	"fileTooLargeError": "Fichier trop volumineux pour être ouvert",
-	"fileNotFoundError": "Fichier introuvable ({0})",
-	"fileBinaryError": "Il semble que le fichier soit binaire. Impossible de l'ouvrir en tant que texte",
-	"filePermission": "Autorisation refusée en écrivant dans le fichier ({0})",
-	"fileExists": "Le fichier à créer existe déjà ({0})",
-	"fileModifiedError": "Fichier modifié depuis",
-	"fileReadOnlyError": "Fichier en lecture seule",
-	"fileMoveConflict": "Déplacement/copie impossible. Le fichier existe déjà dans la destination.",
-	"unableToMoveCopyError": "Impossible de déplacer/copier. Le fichier remplace le dossier qui le contient.",
-	"binFailed": "Échec du déplacement de '{0}' vers la corbeille",
-	"trashFailed": "Échec du déplacement de '{0}' vers la corbeille"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json b/i18n/fra/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
deleted file mode 100644
index 765129d9a53..00000000000
--- a/i18n/fra/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"invalidPath": "Le chemin d’accès de la ressource '{0}' doit être absolu",
-	"fileNotFoundError": "Fichier introuvable ({0})",
-	"fileIsDirectoryError": "Le fichier est un répertoire",
-	"fileNotModifiedError": "Fichier non modifié depuis",
-	"fileBinaryError": "Il semble que le fichier soit binaire. Impossible de l'ouvrir en tant que texte",
-	"err.create": "Impossible de créer le fichier {0}",
-	"fileMoveConflict": "Déplacement/copie impossible. Le fichier existe déjà dans la destination."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/services/files/node/fileService.i18n.json b/i18n/fra/src/vs/workbench/services/files/node/fileService.i18n.json
deleted file mode 100644
index c9a4fd144cd..00000000000
--- a/i18n/fra/src/vs/workbench/services/files/node/fileService.i18n.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"fileInvalidPath": "Ressource de fichier non valide ({0})",
-	"fileIsDirectoryError": "Le fichier est un répertoire",
-	"fileNotModifiedError": "Fichier non modifié depuis",
-	"fileTooLargeError": "Fichier trop volumineux pour être ouvert",
-	"fileNotFoundError": "Fichier introuvable ({0})",
-	"fileBinaryError": "Il semble que le fichier soit binaire. Impossible de l'ouvrir en tant que texte",
-	"filePermission": "Autorisation refusée en écrivant dans le fichier ({0})",
-	"fileExists": "Le fichier à créer existe déjà ({0})",
-	"fileMoveConflict": "Déplacement/copie impossible. Le fichier existe déjà dans la destination.",
-	"unableToMoveCopyError": "Impossible de déplacer/copier. Le fichier remplace le dossier qui le contient.",
-	"foldersCopyError": "Impossible de copier des dossiers dans l'espace de travail. Sélectionnez les fichiers à copier individuellement.",
-	"fileModifiedError": "Fichier modifié depuis",
-	"fileReadOnlyError": "Fichier en lecture seule"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/services/jsonschemas/common/jsonValidationExtensionPoint.i18n.json b/i18n/fra/src/vs/workbench/services/jsonschemas/common/jsonValidationExtensionPoint.i18n.json
deleted file mode 100644
index 8607347b589..00000000000
--- a/i18n/fra/src/vs/workbench/services/jsonschemas/common/jsonValidationExtensionPoint.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"contributes.jsonValidation": "Ajoute une configuration de schéma json.",
-	"contributes.jsonValidation.fileMatch": "Modèle de fichier correspondant recherché, par exemple \"package.json\" ou \"*.launch\".",
-	"contributes.jsonValidation.url": "URL de schéma ('http:', 'https:') ou chemin relatif du dossier d'extensions ('./').",
-	"invalid.jsonValidation": "'configuration.jsonValidation' doit être un tableau",
-	"invalid.fileMatch": "'configuration.jsonValidation.fileMatch' doit être défini",
-	"invalid.url": "'configuration.jsonValidation.url' doit être une URL ou un chemin relatif",
-	"invalid.url.fileschema": "'configuration.jsonValidation.url' est une URL relative non valide : {0}",
-	"invalid.url.schema": "'configuration.jsonValidation.url' doit commencer par 'http:', 'https:' ou './' pour référencer les schémas situés dans l'extension"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/services/keybinding/common/keybindingEditing.i18n.json b/i18n/fra/src/vs/workbench/services/keybinding/common/keybindingEditing.i18n.json
deleted file mode 100644
index a13d49d4c35..00000000000
--- a/i18n/fra/src/vs/workbench/services/keybinding/common/keybindingEditing.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"errorKeybindingsFileDirty": "Impossible d’écrire parce que la configuration des combinaisons de touches a été modifiée. Veuillez enregistrer le fichier et réessayer.",
-	"parseErrors": "Impossible d’écrire dans le fichier de configuration des combinaisons de touches. Veuillez l'ouvrir pour corriger les erreurs/avertissements dans le fichier et réessayer.",
-	"errorInvalidConfiguration": "Impossible d’écrire dans le fichier de configuration des combinaisons de touches. Il y a un objet qui n'est pas de type Array. Veuillez ouvrir le fichier pour nettoyer et réessayer.",
-	"emptyKeybindingsHeader": "Placez vos combinaisons de touches dans ce fichier pour remplacer les valeurs par défaut"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/services/keybinding/electron-browser/keybindingService.i18n.json b/i18n/fra/src/vs/workbench/services/keybinding/electron-browser/keybindingService.i18n.json
deleted file mode 100644
index a2e34902ea4..00000000000
--- a/i18n/fra/src/vs/workbench/services/keybinding/electron-browser/keybindingService.i18n.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"nonempty": "Valeur non vide attendue.",
-	"requirestring": "la propriété '{0}' est obligatoire et doit être de type 'string'",
-	"optstring": "La propriété '{0}' peut être omise ou doit être de type 'string'",
-	"vscode.extension.contributes.keybindings.command": "Identificateur de la commande à exécuter quand la combinaison de touches est déclenchée.",
-	"vscode.extension.contributes.keybindings.key": "Touche ou séquence de touches (séparez les touches avec le signe plus et les séquences de touches avec un espace. Exemple : Ctrl+O et Ctrl+L L pour une pression simultanée).",
-	"vscode.extension.contributes.keybindings.mac": "Touche ou séquence de touches spécifique à Mac.",
-	"vscode.extension.contributes.keybindings.linux": "Touche ou séquence de touches spécifique à Linux.",
-	"vscode.extension.contributes.keybindings.win": "Touche ou séquence de touches spécifique à Windows.",
-	"vscode.extension.contributes.keybindings.when": "Condition quand la touche est active.",
-	"vscode.extension.contributes.keybindings": "Ajoute des combinaisons de touches.",
-	"invalid.keybindings": "'contributes.{0}' non valide : {1}",
-	"unboundCommands": "Voici d'autres commandes disponibles : ",
-	"keybindings.json.title": "Configuration des combinaisons de touches",
-	"keybindings.json.key": "Touche ou séquence de touches (séparées par un espace)",
-	"keybindings.json.command": "Nom de la commande à exécuter",
-	"keybindings.json.when": "Condition quand la touche est active.",
-	"keybindings.json.args": "Arguments à passer à la commande à exécuter.",
-	"keyboardConfigurationTitle": "Clavier",
-	"dispatch": "Contrôle la logique de distribution des appuis sur les touches pour utiliser soit 'code' (recommandé), soit 'keyCode'.",
-	"touchbar.enabled": "Active les boutons de la touchbar macOS sur le clavier si disponible."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/services/message/browser/messageList.i18n.json b/i18n/fra/src/vs/workbench/services/message/browser/messageList.i18n.json
deleted file mode 100644
index d3863d3a4da..00000000000
--- a/i18n/fra/src/vs/workbench/services/message/browser/messageList.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"alertErrorMessage": "Erreur : {0}",
-	"alertWarningMessage": "Avertissement : {0}",
-	"alertInfoMessage": "Information : {0}",
-	"error": "Erreur",
-	"warning": "Avertir",
-	"info": "Informations",
-	"close": "Fermer"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/services/message/electron-browser/messageService.i18n.json b/i18n/fra/src/vs/workbench/services/message/electron-browser/messageService.i18n.json
deleted file mode 100644
index ad189dada97..00000000000
--- a/i18n/fra/src/vs/workbench/services/message/electron-browser/messageService.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"yesButton": "&&Oui",
-	"cancelButton": "Annuler"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/services/mode/common/workbenchModeService.i18n.json b/i18n/fra/src/vs/workbench/services/mode/common/workbenchModeService.i18n.json
deleted file mode 100644
index 3e7a796f609..00000000000
--- a/i18n/fra/src/vs/workbench/services/mode/common/workbenchModeService.i18n.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.contributes.languages": "Ajoute des déclarations de langage.",
-	"vscode.extension.contributes.languages.id": "ID du langage.",
-	"vscode.extension.contributes.languages.aliases": "Alias de nom du langage.",
-	"vscode.extension.contributes.languages.extensions": "Extensions de fichier associées au langage.",
-	"vscode.extension.contributes.languages.filenames": "Noms de fichiers associés au langage.",
-	"vscode.extension.contributes.languages.filenamePatterns": "Modèles Glob de noms de fichiers associés au langage.",
-	"vscode.extension.contributes.languages.mimetypes": "Types MIME associés au langue.",
-	"vscode.extension.contributes.languages.firstLine": "Expression régulière correspondant à la première ligne d'un fichier du langage.",
-	"vscode.extension.contributes.languages.configuration": "Chemin relatif d'un fichier contenant les options de configuration du langage.",
-	"invalid": "'contributes.{0}' non valide. Tableau attendu.",
-	"invalid.empty": "Valeur vide pour 'contributes.{0}'",
-	"require.id": "la propriété '{0}' est obligatoire et doit être de type 'string'",
-	"opt.extensions": "la propriété '{0}' peut être omise et doit être de type 'string[]'",
-	"opt.filenames": "la propriété '{0}' peut être omise et doit être de type 'string[]'",
-	"opt.firstLine": "la propriété '{0}' peut être omise et doit être de type 'string'",
-	"opt.configuration": "la propriété '{0}' peut être omise et doit être de type 'string'",
-	"opt.aliases": "la propriété '{0}' peut être omise et doit être de type 'string[]'",
-	"opt.mimetypes": "la propriété '{0}' peut être omise et doit être de type 'string[]'"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/services/progress/browser/progressService2.i18n.json b/i18n/fra/src/vs/workbench/services/progress/browser/progressService2.i18n.json
deleted file mode 100644
index 85206812111..00000000000
--- a/i18n/fra/src/vs/workbench/services/progress/browser/progressService2.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"progress.subtitle": "{0} - {1}",
-	"progress.title": "{0} : {1}",
-	"cancel": "Annuler"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/services/textMate/electron-browser/TMGrammars.i18n.json b/i18n/fra/src/vs/workbench/services/textMate/electron-browser/TMGrammars.i18n.json
deleted file mode 100644
index e3c83da3c2d..00000000000
--- a/i18n/fra/src/vs/workbench/services/textMate/electron-browser/TMGrammars.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.contributes.grammars": "Ajoute des générateurs de jetons TextMate.",
-	"vscode.extension.contributes.grammars.language": "Identificateur de langue pour lequel cette syntaxe est ajoutée.",
-	"vscode.extension.contributes.grammars.scopeName": "Nom de portée TextMate utilisé par le fichier tmLanguage.",
-	"vscode.extension.contributes.grammars.path": "Chemin du fichier tmLanguage. Le chemin est relatif au dossier d'extensions et commence généralement par './syntaxes/'.",
-	"vscode.extension.contributes.grammars.embeddedLanguages": "Mappage du nom de portée à l'ID de langage si cette grammaire contient des langages incorporés.",
-	"vscode.extension.contributes.grammars.tokenTypes": "Un mappage entre un nom d'étendue et des types de token.",
-	"vscode.extension.contributes.grammars.injectTo": "Liste de noms des portées de langage auxquelles cette grammaire est injectée."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/services/textMate/electron-browser/TMSyntax.i18n.json b/i18n/fra/src/vs/workbench/services/textMate/electron-browser/TMSyntax.i18n.json
deleted file mode 100644
index 006e800804b..00000000000
--- a/i18n/fra/src/vs/workbench/services/textMate/electron-browser/TMSyntax.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"invalid.language": "Langage inconnu dans 'contributes.{0}.language'. Valeur fournie : {1}",
-	"invalid.scopeName": "Chaîne attendue dans 'contributes.{0}.scopeName'. Valeur fournie : {1}",
-	"invalid.path.0": "Chaîne attendue dans 'contributes.{0}.path'. Valeur fournie : {1}",
-	"invalid.injectTo": "Valeur non valide dans 'contributes.{0}.injectTo'. Il doit s'agir d'un tableau de noms de portées de langage. Valeur fournie : {1}",
-	"invalid.embeddedLanguages": "Valeur non valide dans 'contributes.{0}.embeddedLanguages'. Il doit s'agir d'un mappage d'objets entre le nom de portée et le langage. Valeur fournie : {1}",
-	"invalid.tokenTypes": "Valeur non valide dans 'contribue.{0}.tokenTypes'. Il doit s'agir d'un mappage d’objets entre un nom d’étendue et un type de jeton. Valeur fournie : {1}",
-	"invalid.path.1": "'contributes.{0}.path' ({1}) est censé être inclus dans le dossier ({2}) de l'extension. Cela risque de rendre l'extension non portable.",
-	"no-tm-grammar": "Aucune grammaire TM n'est inscrite pour ce langage."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/services/textfile/common/textFileEditorModel.i18n.json b/i18n/fra/src/vs/workbench/services/textfile/common/textFileEditorModel.i18n.json
deleted file mode 100644
index eed3c4956ee..00000000000
--- a/i18n/fra/src/vs/workbench/services/textfile/common/textFileEditorModel.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"saveFileFirst": "L'intégrité du fichier est compromise. Enregistrez-le avant de le rouvrir avec un autre encodage.",
-	"genericSaveError": "Échec d'enregistrement de '{0}' ({1})."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/services/textfile/common/textFileService.i18n.json b/i18n/fra/src/vs/workbench/services/textfile/common/textFileService.i18n.json
deleted file mode 100644
index 4604a68487b..00000000000
--- a/i18n/fra/src/vs/workbench/services/textfile/common/textFileService.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"files.backup.failSave": "Les fichiers qui sont modifiés ne peuvent pas être écrits à l’emplacement de sauvegarde (erreur : {0}). Essayez d’enregistrer vos fichiers d’abord, puis sortez."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json b/i18n/fra/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json
deleted file mode 100644
index ce3bee795d9..00000000000
--- a/i18n/fra/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"saveChangesMessage": "Voulez-vous enregistrer les modifications apportées à {0} ?",
-	"saveChangesMessages": "Voulez-vous enregistrer les modifications apportées aux {0} fichiers suivants ?",
-	"saveAll": "&&Enregistrer tout",
-	"save": "&&Enregistrer",
-	"dontSave": "&&Ne pas enregistrer",
-	"cancel": "Annuler",
-	"saveChangesDetail": "Vous perdrez vos modifications, si vous ne les enregistrez pas.",
-	"allFiles": "Tous les fichiers",
-	"noExt": "Aucune extension"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/services/themes/common/colorExtensionPoint.i18n.json b/i18n/fra/src/vs/workbench/services/themes/common/colorExtensionPoint.i18n.json
deleted file mode 100644
index 12b054b670c..00000000000
--- a/i18n/fra/src/vs/workbench/services/themes/common/colorExtensionPoint.i18n.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"contributes.color": "Contribue à des couleurs définies pour des extensions dont le thème peut être changé",
-	"contributes.color.id": "L’identifiant de la couleur dont le thème peut être changé",
-	"contributes.color.id.format": "Les identifiants doivent être sous la forme aa[.bb]*",
-	"contributes.color.description": "La description de la couleur dont le thème peut être changé",
-	"contributes.defaults.light": "La couleur par défaut pour les thèmes clairs. Soit une valeur de couleur en hexadécimal (#RRGGBB[AA]) ou l’identifiant d’une couleur dont le thème peut être changé qui fournit la valeur par défaut.",
-	"contributes.defaults.dark": "La couleur par défaut pour les thèmes sombres. Soit une valeur de couleur en hexadécimal (#RRGGBB[AA]) ou l’identifiant d’une couleur dont le thème peut être changé qui fournit la valeur par défaut.",
-	"contributes.defaults.highContrast": "La couleur par défaut pour les thèmes de contraste élevé. Soit une valeur de couleur en hexadécimal (#RRGGBB[AA]) ou l’identifiant d’une couleur dont le thème peut être changé qui fournit la valeur par défaut.",
-	"invalid.colorConfiguration": "'configuration.colors' doit être un tableau",
-	"invalid.default.colorType": "{0} doit être soit une valeur de couleur en hexadécimal (#RRGGBB[AA] ou #RGB[A]) ou l’identifiant d’une couleur dont le thème peut être changé qui fournit la valeur par défaut.",
-	"invalid.id": "'configuration.colors.id' doit être défini et ne peut pas être vide",
-	"invalid.id.format": "'configuration.colors.id' doit suivre le word[.word]*",
-	"invalid.description": "'configuration.colors.description' doit être défini et ne peut pas être vide",
-	"invalid.defaults": "'configuration.colors.defaults' doit être défini et doit contenir 'light', 'dark' et 'highContrast'"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/services/themes/common/colorThemeSchema.i18n.json b/i18n/fra/src/vs/workbench/services/themes/common/colorThemeSchema.i18n.json
deleted file mode 100644
index 8f707cb3e3d..00000000000
--- a/i18n/fra/src/vs/workbench/services/themes/common/colorThemeSchema.i18n.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"schema.token.settings": "Couleurs et styles du jeton.",
-	"schema.token.foreground": "Couleur de premier plan du jeton.",
-	"schema.token.background.warning": "Les couleurs d’arrière-plan des tokens ne sont actuellement pas pris en charge.",
-	"schema.token.fontStyle": "Style de police de la règle: 'italic', 'bold' ou 'underline' ou une combinaison. La chaîne vide défait les paramètres hérités.",
-	"schema.fontStyle.error": "Le style de polie doit être 'italic', 'bold' or 'underline' ou une combinaison ou la chaîne vide.",
-	"schema.token.fontStyle.none": "Aucun (vide le style hérité)",
-	"schema.properties.name": "Description de la règle.",
-	"schema.properties.scope": "Sélecteur de portée qui correspond à cette règle.",
-	"schema.tokenColors.path": "Chemin d'un ficher tmTheme (relatif au fichier actuel).",
-	"schema.colors": "Couleurs de la coloration syntaxique"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/services/themes/common/fileIconThemeSchema.i18n.json b/i18n/fra/src/vs/workbench/services/themes/common/fileIconThemeSchema.i18n.json
deleted file mode 100644
index 4152e348480..00000000000
--- a/i18n/fra/src/vs/workbench/services/themes/common/fileIconThemeSchema.i18n.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"schema.folderExpanded": "Icône de dossier des dossiers développés. L'icône du dossier développé est facultative. En l'absence de définition, l'icône définie pour le dossier est affichée.",
-	"schema.folder": "Icône de dossier des dossiers réduits. Si folderExpanded n'est pas défini, s'applique aussi aux dossiers développés.",
-	"schema.file": "Icône de fichier par défaut, affichée pour tous les fichiers qui ne correspondent à aucune extension, aucun nom de fichier ou aucun ID de langue.",
-	"schema.folderNames": "Associe des noms de dossiers à des icônes. La clé de l'objet est le nom de dossier, à l'exclusion des segments du chemin. Aucun modèle ou caractère générique n'est autorisé. La correspondance du nom de dossier ne respecte pas la casse.",
-	"schema.folderName": "ID de la définition d'icône de l'association.",
-	"schema.folderNamesExpanded": "Associe des noms de dossiers à des icônes pour les dossiers développés. La clé de l'objet est le nom de dossier, à l'exclusion des segments du chemin. Aucun modèle ou caractère générique n'est autorisé. La correspondance du nom de dossier ne respecte pas la casse.",
-	"schema.folderNameExpanded": "ID de la définition d'icône de l'association.",
-	"schema.fileExtensions": "Associe des extensions de fichier à des icônes. La clé de l'objet est le nom de l'extension de fichier. Le nom d'extension est le dernier segment d'un nom de fichier situé après le dernier point (à l'exclusion du point). Les extensions sont comparées sans respect de la casse.",
-	"schema.fileExtension": "ID de la définition d'icône de l'association.",
-	"schema.fileNames": "Associe des noms de fichiers à des icônes. La clé de l'objet est le nom de fichier complet, à l'exclusion des segments du chemin. Le nom de fichier peut inclure des points et une éventuelle extension de fichier. Aucun modèle ou caractère générique n'est autorisé. La correspondance du nom de fichier ne respecte pas la casse.",
-	"schema.fileName": "ID de la définition d'icône de l'association.",
-	"schema.languageIds": "Associe des langages à des icônes. La clé de l'objet est l'ID de langage défini dans le point de contribution du langage.",
-	"schema.languageId": "ID de la définition d'icône de l'association.",
-	"schema.fonts": "Polices utilisées dans les définitions d'icônes.",
-	"schema.id": "ID de la police.",
-	"schema.src": "L’emplacement de la police.",
-	"schema.font-path": "Chemin de la police, par rapport au fichier de thème d'icône actuel.",
-	"schema.font-format": "Format de la police.",
-	"schema.font-weight": "Poids de la police.",
-	"schema.font-sstyle": "Style de la police.",
-	"schema.font-size": "Taille par défaut de la police.",
-	"schema.iconDefinitions": "Description de toutes les icônes utilisables durant l'association de fichiers à des icônes.",
-	"schema.iconDefinition": "Définition d'icône. La clé de l'objet est l'ID de la définition.",
-	"schema.iconPath": "Quand le format SVG ou PNG est utilisé : chemin de l'image. Le chemin est relatif au fichier du jeu d'icônes.",
-	"schema.fontCharacter": "Quand une police de type glyphe est employée : caractère de police à utiliser.",
-	"schema.fontColor": "Quand une police de type glyphe est employée : couleur à utiliser.",
-	"schema.fontSize": "Quand une police est utilisée : taille de police en pourcentage par rapport à la police du texte. En l'absence de définition, la taille de la définition de police est utilisée par défaut.",
-	"schema.fontId": "Quand une police est employée : ID de la police. En l'absence de définition, la première définition de police est utilisée par défaut.",
-	"schema.light": "Associations facultatives des icônes de fichiers dans les thèmes de couleur claire.",
-	"schema.highContrast": "Associations facultatives des icônes de fichiers dans les thèmes de couleur à contraste élevé.",
-	"schema.hidesExplorerArrows": "Détermine si les flèches de l’Explorateur de fichier doivent être masquées lorsque ce thème est actif."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/services/themes/electron-browser/colorThemeData.i18n.json b/i18n/fra/src/vs/workbench/services/themes/electron-browser/colorThemeData.i18n.json
deleted file mode 100644
index 689d76aeb5f..00000000000
--- a/i18n/fra/src/vs/workbench/services/themes/electron-browser/colorThemeData.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"error.cannotparsejson": "Problèmes durant l'analyse du fichier de thème JSON : {0}",
-	"error.invalidformat.colors": "Problème pendant l'analyse du fichier de thème de couleur : {0}. La propriété 'colors' n'est pas de type 'object'.",
-	"error.invalidformat.tokenColors": "Problème pendant l'analyse du fichier de thème de couleur : {0}. La propriété 'tokenColors' doit être un tableau spécifiant des couleurs ou le chemin d'un fichier de thème TextMate",
-	"error.plist.invalidformat": "Problème pendant l'analyse du fichier tmTheme : {0}. 'settings' n'est pas un tableau.",
-	"error.cannotparse": "Problèmes pendant l'analyse du fichier tmTheme : {0}",
-	"error.cannotload": "Problèmes pendant le chargement du fichier tmTheme {0} : {1}"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/services/themes/electron-browser/colorThemeStore.i18n.json b/i18n/fra/src/vs/workbench/services/themes/electron-browser/colorThemeStore.i18n.json
deleted file mode 100644
index 69e6eefb14f..00000000000
--- a/i18n/fra/src/vs/workbench/services/themes/electron-browser/colorThemeStore.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.contributes.themes": "Contributes textmate color themes.",
-	"vscode.extension.contributes.themes.id": "ID du thème d'icône utilisé dans les paramètres utilisateur.",
-	"vscode.extension.contributes.themes.label": "Étiquette du thème de couleur comme indiqué dans l'interface utilisateur (IU).",
-	"vscode.extension.contributes.themes.uiTheme": "Thème de base définissant les couleurs autour de l'éditeur : 'vs' est le thème de couleur clair, 'vs-dark' est le thème de couleur sombre. 'hc-black' est le thème sombre à contraste élevé.",
-	"vscode.extension.contributes.themes.path": "Chemin du fichier tmTheme. Le chemin est relatif au dossier d'extensions et correspond généralement à './themes/themeFile.tmTheme'.",
-	"reqarray": "Extension point `{0}` must be an array.",
-	"reqpath": "Chaîne attendue dans 'contributes.{0}.path'. Valeur fournie : {1}",
-	"invalid.path.1": "'contributes.{0}.path' ({1}) est censé être inclus dans le dossier ({2}) de l'extension. Cela risque de rendre l'extension non portable."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/services/themes/electron-browser/fileIconThemeData.i18n.json b/i18n/fra/src/vs/workbench/services/themes/electron-browser/fileIconThemeData.i18n.json
deleted file mode 100644
index 8582255d004..00000000000
--- a/i18n/fra/src/vs/workbench/services/themes/electron-browser/fileIconThemeData.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"error.cannotparseicontheme": "Problems parsing file icons file: {0}"
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/services/themes/electron-browser/fileIconThemeStore.i18n.json b/i18n/fra/src/vs/workbench/services/themes/electron-browser/fileIconThemeStore.i18n.json
deleted file mode 100644
index 8b6741c3053..00000000000
--- a/i18n/fra/src/vs/workbench/services/themes/electron-browser/fileIconThemeStore.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.contributes.iconThemes": "Contributes file icon themes.",
-	"vscode.extension.contributes.iconThemes.id": "ID du thème d'icône utilisé dans les paramètres utilisateur.",
-	"vscode.extension.contributes.iconThemes.label": "Étiquette du thème d'icône indiqué dans l'IU (interface utilisateur).",
-	"vscode.extension.contributes.iconThemes.path": "Chemin du fichier de définitions de thèmes d'icônes. Le chemin est relatif au dossier d'extensions et correspond généralement à './icons/awesome-icon-theme.json'.",
-	"reqarray": "Extension point `{0}` must be an array.",
-	"reqpath": "Chaîne attendue dans 'contributes.{0}.path'. Valeur fournie : {1}",
-	"reqid": "Chaîne attendue dans 'contributes.{0}.id'. Valeur fournie : {1}",
-	"invalid.path.1": "'contributes.{0}.path' ({1}) est censé être inclus dans le dossier ({2}) de l'extension. Cela risque de rendre l'extension non portable."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json b/i18n/fra/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
deleted file mode 100644
index 7050924f08d..00000000000
--- a/i18n/fra/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"error.cannotloadtheme": "Unable to load {0}: {1}",
-	"colorTheme": "Specifies the color theme used in the workbench.",
-	"colorThemeError": "Theme is unknown or not installed.",
-	"iconTheme": "Spécifie le thème d'icône utilisé dans le banc d'essai ou 'null' pour n'afficher aucune icône de fichier.",
-	"noIconThemeDesc": "No file icons",
-	"iconThemeError": "File icon theme is unknown or not installed.",
-	"workbenchColors": "Remplace les couleurs du thème de couleur sélectionné.",
-	"editorColors.comments": "Définit les couleurs et les styles des commentaires",
-	"editorColors.strings": "Définit les couleurs et les styles des littéraux de chaînes.",
-	"editorColors.keywords": "Définit les couleurs et les styles des mots clés.",
-	"editorColors.numbers": "Définit les couleurs et les styles des littéraux de nombre.",
-	"editorColors.types": "Définit les couleurs et les styles des déclarations et références de type.",
-	"editorColors.functions": "Définit les couleurs et les styles des déclarations et références de fonctions.",
-	"editorColors.variables": "Définit les couleurs et les styles des déclarations et références de variables.",
-	"editorColors.textMateRules": "Définit les couleurs et les styles à l’aide de règles de thème textmate (avancé).",
-	"editorColors": "Remplace les couleurs et le style de la police de l’éditeur du thème par la couleur actuellement sélectionnée."
-}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json b/i18n/fra/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json
deleted file mode 100644
index dcd91092d25..00000000000
--- a/i18n/fra/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"errorInvalidTaskConfiguration": "Impossible d’écrire dans le fichier de configuration de l’espace de travail. Veuillez ouvrir le fichier pour y corriger les erreurs/avertissements et essayez à nouveau.",
-	"errorWorkspaceConfigurationFileDirty": "Impossible d’écrire dans le fichier de configuration de l’espace de travail, car le fichier a été modifié. Veuillez, s’il vous plaît, l'enregistrez et réessayez.",
-	"openWorkspaceConfigurationFile": "Ouvrir la Configuration de l’espace de travail"
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/azure-account/out/azure-account.i18n.json b/i18n/hun/extensions/azure-account/out/azure-account.i18n.json
deleted file mode 100644
index fce78b4ff62..00000000000
--- a/i18n/hun/extensions/azure-account/out/azure-account.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"azure-account.copyAndOpen": "Másolás és megnyitás",
-	"azure-account.close": "Bezárás",
-	"azure-account.login": "Bejelentkezés",
-	"azure-account.loginFirst": "Nincs bejelentkezve. Először jelentkezzen be.",
-	"azure-account.userCodeFailed": "Felhasználói kód lekérése nem sikerült",
-	"azure-account.tokenFailed": "Token lekérése eszközkóddal",
-	"azure-account.tokenFromRefreshTokenFailed": "Token lekérése frissítési tokennel"
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/azure-account/out/extension.i18n.json b/i18n/hun/extensions/azure-account/out/extension.i18n.json
deleted file mode 100644
index 3b2b1940bb6..00000000000
--- a/i18n/hun/extensions/azure-account/out/extension.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"azure-account.loggingIn": "Azure: Bejelentkezés...",
-	"azure-account.loggedIn": "Azure: {0}"
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/bat/package.i18n.json b/i18n/hun/extensions/bat/package.i18n.json
deleted file mode 100644
index 4a72e2ab0ad..00000000000
--- a/i18n/hun/extensions/bat/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Windows kötegfájl (batch) nyelvi alapok",
-	"description": "Kódtöredékeket és szintaktikai kiemelést szolgáltat, valamint kezeli az összetartozó zárójeleket és a kódrészek bezárását a Windows kötegfájlokban (batch)."
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/clojure/package.i18n.json b/i18n/hun/extensions/clojure/package.i18n.json
deleted file mode 100644
index f384aa1a280..00000000000
--- a/i18n/hun/extensions/clojure/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Clojure nyelvi alapok",
-	"description": "Szintaktikai kiemelést szolgáltat, valamint kezeli az összetartozó zárójeleket a Clojure-fájlokban."
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/coffeescript/package.i18n.json b/i18n/hun/extensions/coffeescript/package.i18n.json
deleted file mode 100644
index 4f89f37bf23..00000000000
--- a/i18n/hun/extensions/coffeescript/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "CoffeeScript nyelvi alapok",
-	"description": "Kódtöredékeket és szintaktikai kiemelést szolgáltat, valamint kezeli az összetartozó zárójeleket és a kódrészek bezárását a CoffeeScript-fájlokban."
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/configuration-editing/out/extension.i18n.json b/i18n/hun/extensions/configuration-editing/out/extension.i18n.json
deleted file mode 100644
index b8e893bdd3b..00000000000
--- a/i18n/hun/extensions/configuration-editing/out/extension.i18n.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"workspaceFolder": "A VS Code-ban megnyitott mappa elérési útja",
-	"workspaceFolderBasename": "A VS Code-ban megnyitott mappa neve perjelek (/) nélkül",
-	"relativeFile": "A jelenleg megnyitott fájl a ${workspaceFolder}-hez relatívan",
-	"file": "A jelenleg megnyitott fájl",
-	"cwd": "A feladatfuttató aktuális munkakönyvtára indításkor",
-	"lineNumber": "A jelenleg kiválasztott sor száma az aktív fájlban",
-	"selectedText": "A jelenleg kijelölt szöveg az aktív fájlban",
-	"fileDirname": "A jelenleg megnyitott fájl könyvtárának neve",
-	"fileExtname": "A jelenleg megnyitott fájl kiterjesztése",
-	"fileBasename": "A jelenleg kiválasztott fájl neve",
-	"fileBasenameNoExtension": "A jelenleg kiválasztott fájl neve kiterjesztés nélkül",
-	"exampleExtension": "Példa"
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json b/i18n/hun/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json
deleted file mode 100644
index 9fd42453d6e..00000000000
--- a/i18n/hun/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"activeEditorShort": "a fájl neve (pl. myFile.txt)",
-	"activeEditorMedium": "a fájl relatív elérési útja a munkaterület mappájához képest (pl. myFolder/myFile.txt)",
-	"activeEditorLong": "a fájl teljes elérési útja (pl. /Users/Development/myProject/myFolder/myFile.txt)",
-	"rootName": "a munkaterület neve (pl. myFolder vagy myWorkspace)",
-	"rootPath": "a munkaterület elérési útja (pl. /Users/Development/myWorkspace)",
-	"folderName": "azon munkaterületi mappa a neve, amelyben a fájl található (pl. myFolder)",
-	"folderPath": "azon munkaterületi mappa elérési útja, amelyben a fájl található (pl. /Users/Development/myFolder)",
-	"appName": "pl.: VS Code",
-	"dirty": "módosításjelző, ami akkor jelenik meg, ha az aktív szerkesztőablak tartalma módosítva lett",
-	"separator": "egy feltételes elválasztó (' - '), ami akkor jelenik meg, ha olyan változókkal van körülvéve, amelyeknek van értéke",
-	"assocLabelFile": "Fájlok kiterjesztésekkel",
-	"assocDescriptionFile": "A megadott azonosítójú nyelvhez tartozó glob mintának megfelelő fájlok feltérképezése.",
-	"assocLabelPath": "Fájlok elérési úttal",
-	"assocDescriptionPath": "A megadott azonosítójú nyelvhez tartozó abszolút elérési utas glob mintának megfelelő fájlok feltérképezése.",
-	"fileLabel": "Fájlok kiterjesztés szerint",
-	"fileDescription": "Adott kiterjesztéssel rendelkező fájlok keresése.",
-	"filesLabel": "Fájlok több kiterjesztés szerint",
-	"filesDescription": "A megadott kiterjesztések bármelyikével rendelkező fájlok keresése.",
-	"derivedLabel": "Testvérekkel rendelkező fájlok név szerint",
-	"derivedDescription": "Olyan fájlok keresése, amelyek azonos nevű, de különböző kiterjesztésű testvérekkel rendelkeznek.",
-	"topFolderLabel": "Mappák név szerint (legfelső szinten)",
-	"topFolderDescription": "Adott névvel rendelkező, legfelső szintű mappák keresése",
-	"topFoldersLabel": "Fájlok több név szerint (legfelső szinten)",
-	"topFoldersDescription": "Több legfelső szintű mappa keresése.",
-	"folderLabel": "Mappa név szerint (bármely helyen)",
-	"folderDescription": "Adott névvel rendelkező mappa keresése helytől függetlenül.",
-	"falseDescription": "A minta letiltása.",
-	"trueDescription": "A minta engedélyezése.",
-	"siblingsDescription": "Olyan fájlok keresése, amelyek azonos nevű, de különböző kiterjesztésű testvérekkel rendelkeznek.",
-	"languageSpecificEditorSettings": "Nyelvspecifikus szerkesztőbeállítások",
-	"languageSpecificEditorSettingsDescription": "A szerkesztő beállításainak felülírása az adott nyelvre vonatkozóan"
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/configuration-editing/package.i18n.json b/i18n/hun/extensions/configuration-editing/package.i18n.json
deleted file mode 100644
index 1f88a241142..00000000000
--- a/i18n/hun/extensions/configuration-editing/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Konfigurációszerkesztő",
-	"description": "Funkciók (fejlett IntelliSense, automatikus javítás) konfigurációt tartalmazó fájlokhoz, például a beállításokhoz, az indítási konfigurációkhoz és a kiegészítőjavaslatokat tartalmazó fájlokhoz."
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/cpp/package.i18n.json b/i18n/hun/extensions/cpp/package.i18n.json
deleted file mode 100644
index de969f62936..00000000000
--- a/i18n/hun/extensions/cpp/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "C/C++ nyelvi alapok",
-	"description": "Kódtöredékeket és szintaktikai kiemelést szolgáltat, valamint kezeli az összetartozó zárójeleket és a kódrészek bezárását a C/C++-fájlokban."
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/csharp/package.i18n.json b/i18n/hun/extensions/csharp/package.i18n.json
deleted file mode 100644
index dccdf9350f9..00000000000
--- a/i18n/hun/extensions/csharp/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "C# nyelvi alapok",
-	"description": "Kódtöredékeket és szintaktikai kiemelést szolgáltat, valamint kezeli az összetartozó zárójeleket és a kódrészek bezárását a C#-fájlokban."
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/css-language-features/client/out/cssMain.i18n.json b/i18n/hun/extensions/css-language-features/client/out/cssMain.i18n.json
deleted file mode 100644
index 762d665d83d..00000000000
--- a/i18n/hun/extensions/css-language-features/client/out/cssMain.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"cssserver.name": "CSS nyelvi szerver",
-	"folding.start": "Összecsukható tartomány kezdete",
-	"folding.end": "Összecsukható tartomány vége"
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/css-language-features/package.i18n.json b/i18n/hun/extensions/css-language-features/package.i18n.json
deleted file mode 100644
index aadc8f5c6ff..00000000000
--- a/i18n/hun/extensions/css-language-features/package.i18n.json
+++ /dev/null
@@ -1,81 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "CSS nyelvi funkciók",
-	"description": "Széleskörű nyelvi támogatás CSS-, LESS- és SCSS-fájlokhoz.",
-	"css.title": "CSS",
-	"css.lint.argumentsInColorFunction.desc": "Nem megfelelő számú paraméter",
-	"css.lint.boxModel.desc": "A width és a height tulajdonság kerülése a padding és a border tulajdonság használata esetén",
-	"css.lint.compatibleVendorPrefixes.desc": "Gyártóspecifikus előtag használata esetén minden más gyártóspecifikus tulajdonságot is meg kell adni",
-	"css.lint.duplicateProperties.desc": "Duplikált stílusdefiníciók kerülése",
-	"css.lint.emptyRules.desc": "Üres szabályhalmazok kerülése",
-	"css.lint.float.desc": "A float tulajdonságérték kerülése, mivel könnyen váratlan eredményt idézhet elő az elrendezés változásakor.",
-	"css.lint.fontFaceProperties.desc": "A @font-face szabályokban az src és a font-family tulajdonságot is definiálni kell",
-	"css.lint.hexColorLength.desc": "A hexadecimális formában megadott színeknek három vagy hat hexadecimális számjegyből kell állniuk",
-	"css.lint.idSelector.desc": "A szelektorok nem tartalmazhatnak azonosítókat, mivel az ilyen szabályok túl szorosan kötődnek a HTML-hez.",
-	"css.lint.ieHack.desc": "Az IE hangolása csak az IE7 vagy régebbi verziók támogatása esetén szükséges",
-	"css.lint.important.desc": "Az !important attribútum mellőzése. Az attribútum jelenléte arra utal, hogy a CSS-struktúra átláthatatlanná vált, és refaktorálásra szorul.",
-	"css.lint.importStatement.desc": "Ne töltődjenek párhuzamosan az importálási utasítások",
-	"css.lint.propertyIgnoredDueToDisplay.desc": "A megjelenítési mód miatt a megjelenítőkomponensek nem fogják figyelembe venni a tulajdonságot. Ha például a display tulajdonság értéke inline, akkor a megjelenítők figyelmen kívül hagyják a width, a height, a margin-top, a margin-bottom és a float tulajdonságot.",
-	"css.lint.universalSelector.desc": "Az univerzális szelektor (*) lassú működést eredményez",
-	"css.lint.unknownProperties.desc": "Ismeretlen tulajdonság.",
-	"css.lint.unknownVendorSpecificProperties.desc": "Ismeretlen gyártóspecifikus tulajdonság.",
-	"css.lint.vendorPrefix.desc": "Gyártóspecifikus előtagok használata esetén az adott tulajdonság szabványos változatát is meg kell adni",
-	"css.lint.zeroUnits.desc": "A 0 értékhez nem szükséges mértékegység",
-	"css.trace.server.desc": "A VS Code és a CSS nyelvi szerver közötti kommunikáció naplózása.",
-	"css.validate.title": "Meghatározza a CSS-validáció működését és a problémák súlyosságát.",
-	"css.validate.desc": "Összes validálás engedélyezése vagy letiltása",
-	"less.title": "LESS",
-	"less.lint.argumentsInColorFunction.desc": "Nem megfelelő számú paraméter",
-	"less.lint.boxModel.desc": "A width és a height tulajdonság kerülése a padding és a border tulajdonság használata esetén",
-	"less.lint.compatibleVendorPrefixes.desc": "Gyártóspecifikus előtag használata esetén minden más gyártóspecifikus tulajdonságot is meg kell adni",
-	"less.lint.duplicateProperties.desc": "Duplikált stílusdefiníciók kerülése",
-	"less.lint.emptyRules.desc": "Üres szabályhalmazok kerülése",
-	"less.lint.float.desc": "A float tulajdonságérték kerülése, mivel könnyen váratlan eredményt idézhet elő az elrendezés változásakor.",
-	"less.lint.fontFaceProperties.desc": "A @font-face szabályokban az src és a font-family tulajdonságot is definiálni kell",
-	"less.lint.hexColorLength.desc": "A hexadecimális formában megadott színeknek három vagy hat hexadecimális számjegyből kell állniuk",
-	"less.lint.idSelector.desc": "A szelektorok nem tartalmazhatnak azonosítókat, mivel az ilyen szabályok túl szorosan kötődnek a HTML-hez.",
-	"less.lint.ieHack.desc": "Az IE hangolása csak az IE7 vagy régebbi verziók támogatása esetén szükséges",
-	"less.lint.important.desc": "Az !important attribútum mellőzése. Az attribútum jelenléte arra utal, hogy a CSS-struktúra átláthatatlanná vált, és refaktorálásra szorul.",
-	"less.lint.importStatement.desc": "Ne töltődjenek párhuzamosan az importálási utasítások",
-	"less.lint.propertyIgnoredDueToDisplay.desc": "A megjelenítési mód miatt a megjelenítőkomponensek nem fogják figyelembe venni a tulajdonságot. Ha például a display tulajdonság értéke inline, akkor a megjelenítők figyelmen kívül hagyják a width, a height, a margin-top, a margin-bottom és a float tulajdonságot.",
-	"less.lint.universalSelector.desc": "Az univerzális szelektor (*) lassú működést eredményez",
-	"less.lint.unknownProperties.desc": "Ismeretlen tulajdonság.",
-	"less.lint.unknownVendorSpecificProperties.desc": "Ismeretlen gyártóspecifikus tulajdonság.",
-	"less.lint.vendorPrefix.desc": "Gyártóspecifikus előtagok használata esetén az adott tulajdonság szabványos változatát is meg kell adni",
-	"less.lint.zeroUnits.desc": "A 0 értékhez nem szükséges mértékegység",
-	"less.validate.title": "Meghatározza a LESS-validáció működését és a problémák súlyosságát.",
-	"less.validate.desc": "Összes validálás engedélyezése vagy letiltása",
-	"scss.title": "SCSS (Sass)",
-	"scss.lint.argumentsInColorFunction.desc": "Nem megfelelő számú paraméter",
-	"scss.lint.boxModel.desc": "A width és a height tulajdonság kerülése a padding és a border tulajdonság használata esetén",
-	"scss.lint.compatibleVendorPrefixes.desc": "Gyártóspecifikus előtag használata esetén minden más gyártóspecifikus tulajdonságot is meg kell adni",
-	"scss.lint.duplicateProperties.desc": "Duplikált stílusdefiníciók kerülése",
-	"scss.lint.emptyRules.desc": "Üres szabályhalmazok kerülése",
-	"scss.lint.float.desc": "A float tulajdonságérték kerülése, mivel könnyen váratlan eredményt idézhet elő az elrendezés változásakor.",
-	"scss.lint.fontFaceProperties.desc": "A @font-face szabályokban az src és a font-family tulajdonságot is definiálni kell",
-	"scss.lint.hexColorLength.desc": "A hexadecimális formában megadott színeknek három vagy hat hexadecimális számjegyből kell állniuk",
-	"scss.lint.idSelector.desc": "A szelektorok nem tartalmazhatnak azonosítókat, mivel az ilyen szabályok túl szorosan kötődnek a HTML-hez.",
-	"scss.lint.ieHack.desc": "Az IE hangolása csak az IE7 vagy régebbi verziók támogatása esetén szükséges",
-	"scss.lint.important.desc": "Az !important attribútum mellőzése. Az attribútum jelenléte arra utal, hogy a CSS-struktúra átláthatatlanná vált, és refaktorálásra szorul.",
-	"scss.lint.importStatement.desc": "Ne töltődjenek párhuzamosan az importálási utasítások",
-	"scss.lint.propertyIgnoredDueToDisplay.desc": "A megjelenítési mód miatt a megjelenítőkomponensek nem fogják figyelembe venni a tulajdonságot. Ha például a display tulajdonság értéke inline, akkor a megjelenítők figyelmen kívül hagyják a width, a height, a margin-top, a margin-bottom és a float tulajdonságot.",
-	"scss.lint.universalSelector.desc": "Az univerzális szelektor (*) lassú működést eredményez",
-	"scss.lint.unknownProperties.desc": "Ismeretlen tulajdonság.",
-	"scss.lint.unknownVendorSpecificProperties.desc": "Ismeretlen gyártóspecifikus tulajdonság.",
-	"scss.lint.vendorPrefix.desc": "Gyártóspecifikus előtagok használata esetén az adott tulajdonság szabványos változatát is meg kell adni",
-	"scss.lint.zeroUnits.desc": "A 0 értékhez nem szükséges mértékegység",
-	"scss.validate.title": "Meghatározza az SCSS-validáció működését és a problémák súlyosságát.",
-	"scss.validate.desc": "Összes validálás engedélyezése vagy letiltása",
-	"less.colorDecorators.enable.desc": "Színdekorátorok engedélyezése vagy letiltása",
-	"scss.colorDecorators.enable.desc": "Színdekorátorok engedélyezése vagy letiltása",
-	"css.colorDecorators.enable.desc": "Színdekorátorok engedélyezése vagy letiltása",
-	"css.colorDecorators.enable.deprecationMessage": "Az `css.colorDecorators.enable` beállítás elavult az `editor.colorDecorators` bevezetése miatt.",
-	"scss.colorDecorators.enable.deprecationMessage": "Az `scss.colorDecorators.enable` beállítás elavult az `editor.colorDecorators` bevezetése miatt.",
-	"less.colorDecorators.enable.deprecationMessage": "A `less.colorDecorators.enable` beállítás elavult az `editor.colorDecorators` bevezetése miatt."
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/css/client/out/cssMain.i18n.json b/i18n/hun/extensions/css/client/out/cssMain.i18n.json
deleted file mode 100644
index 762d665d83d..00000000000
--- a/i18n/hun/extensions/css/client/out/cssMain.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"cssserver.name": "CSS nyelvi szerver",
-	"folding.start": "Összecsukható tartomány kezdete",
-	"folding.end": "Összecsukható tartomány vége"
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/css/package.i18n.json b/i18n/hun/extensions/css/package.i18n.json
deleted file mode 100644
index 804a00791e0..00000000000
--- a/i18n/hun/extensions/css/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "CSS nyelvi alapok",
-	"description": "Szintaktikai kiemelést szolgáltat, valamint kezeli az összetartozó zárójeleket a CSS-, LESS- és SCSS-fájlokban."
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/diff/package.i18n.json b/i18n/hun/extensions/diff/package.i18n.json
deleted file mode 100644
index 2ad309f0bb4..00000000000
--- a/i18n/hun/extensions/diff/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Diff-fájl nyelvi funkciók",
-	"description": "Szintaktikai kiemelést, összetartozó zárójelek kezelését és további nyelvi funkciókat szolgáltat a Diff-fájlokhoz."
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/docker/package.i18n.json b/i18n/hun/extensions/docker/package.i18n.json
deleted file mode 100644
index 455c4836cc7..00000000000
--- a/i18n/hun/extensions/docker/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Docker nyelvi alapok",
-	"description": "Szintaktikai kiemelést szolgáltat, valamint kezeli az összetartozó zárójeleket a Docker-fájlokban."
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/emmet/package.i18n.json b/i18n/hun/extensions/emmet/package.i18n.json
deleted file mode 100644
index 4e87769482a..00000000000
--- a/i18n/hun/extensions/emmet/package.i18n.json
+++ /dev/null
@@ -1,65 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"description": "Emmet-támogatás a VS Code-hoz",
-	"command.wrapWithAbbreviation": "Becsomagolás rövidítéssel",
-	"command.wrapIndividualLinesWithAbbreviation": "Egyedi sorok becsomagolása rövidítéssel",
-	"command.removeTag": "Elem eltávolítása",
-	"command.updateTag": "Elem módosítása",
-	"command.matchTag": "Ugrás az illeszkedő párra",
-	"command.balanceIn": "Egyensúlyozás (belefé)",
-	"command.balanceOut": "Egyensúlyozás (kifelé)",
-	"command.prevEditPoint": "Ugrás az előző szerkesztési pontra",
-	"command.nextEditPoint": "Ugrás a következő szerkesztési pontra",
-	"command.mergeLines": "Sorok összeolvasztása",
-	"command.selectPrevItem": "Előző elem kiválasztása",
-	"command.selectNextItem": "Következő elem kiválasztása",
-	"command.splitJoinTag": "Elem szétbontása/összeolvasztása",
-	"command.toggleComment": "Megjegyzés ki-/bekapcsolása",
-	"command.evaluateMathExpression": "Matematikai kifejezés kiértékelése",
-	"command.updateImageSize": "Képméret módosítása",
-	"command.reflectCSSValue": "CSS-érték tükrözése",
-	"command.incrementNumberByOne": "Növelés 1-gyel",
-	"command.decrementNumberByOne": "Csökkentés 1-gyel",
-	"command.incrementNumberByOneTenth": "Növelés 0,1-gyel",
-	"command.decrementNumberByOneTenth": "Csökkentés 0,1-gyel",
-	"command.incrementNumberByTen": "Növelés 10-zel",
-	"command.decrementNumberByTen": "Csökkentés 10-zel",
-	"emmetSyntaxProfiles": "Konkrét szintaktika profiljának meghatározása vagy saját profil használata adott szabályokkal.",
-	"emmetExclude": "Azon nyelvek listája, ahol az Emmet-rövidítések ne legyenek kibontva.",
-	"emmetExtensionsPath": "Emmet-profilokat és -kódtöredékeket tartalmazó mappa elérési útja.",
-	"emmetShowExpandedAbbreviation": "Kibontott Emmet-rövidítések megjelenítése javaslatként. Az \"inMarkupAndStylesheetFilesOnly\" beállítás csak a html, haml, jade, slim, xml, xsl, css, scss, sass, less és stylus típusú tartalmat jelenti. Az \"always\" beállítás a fájl összes részére vonatkozik a jelölőnyelvtől/css-től függetlenül.",
-	"emmetShowAbbreviationSuggestions": "Lehetséges Emmet-rövidítések megjelenítése javaslatként. Nem használható a stíluslapokon vagy ha az emmet.showExpandedAbbreviation értéke \"never\".",
-	"emmetIncludeLanguages": "Emmet-rövidítések engedélyezése olyan nyelvek esetében, amelyek alapértelmezés szerint nem támogatottak. Egy megfeleltetést kell felvenni a nyelv és egy emmet által támogatott nyelv között.\nPl.: {\"vue-html\": \"html\", \"javascript\": \"javascriptreact\"}",
-	"emmetVariables": "Az Emmet-kódrészletekben használt változók",
-	"emmetTriggerExpansionOnTab": "Ha engedélyezve van, akkor az Emmet-rövidítések a Tab billentyű lenyomásával bonthatók ki.",
-	"emmetPreferences": "Beállítások, melyek módosítják az Emmet műveleteinek és feloldó algoritmusainak viselkedését.",
-	"emmetPreferencesIntUnit": "Az egész számok alapértelmezett mértékegysége",
-	"emmetPreferencesFloatUnit": "A lebegőpontos számok alapértelmezett mértékegysége",
-	"emmetPreferencesCssAfter": "A CSS-tulajdonság végére helyezett szimbólum CSS-rövidítések kibontásánál",
-	"emmetPreferencesSassAfter": "A CSS-tulajdonság végére helyezett szimbólum CSS-rövidítések kibontásánál Sass-fájlokban",
-	"emmetPreferencesStylusAfter": "A CSS-tulajdonság végére helyezett szimbólum CSS-rövidítések kibontásánál Stylus-fájlokban",
-	"emmetPreferencesCssBetween": "A CSS-tulajdonság és az érték közé helyezett szimbólum CSS-rövidítések kibontásánál",
-	"emmetPreferencesSassBetween": "A CSS-tulajdonság és az érték közé helyezett szimbólum CSS-rövidítések kibontásánál Sass-fájlokban",
-	"emmetPreferencesStylusBetween": "A CSS-tulajdonság és az érték közé helyezett szimbólum CSS-rövidítések kibontásánál Stylus-fájlokban",
-	"emmetShowSuggestionsAsSnippets": "Ha ez igaz, majd Emmet-javaslatok jelenik meg mint töredék, amely lehetővé teszi, annak érdekében, őket egy editor.snippetSuggestions beállítást.",
-	"emmetPreferencesBemElementSeparator": "Elemelválasztó osztályok megadásánál BEM-szűrő használata esetén",
-	"emmetPreferencesBemModifierSeparator": "Módosító elválasztó osztályok megadásánál BEM-szűrő használata esetén",
-	"emmetPreferencesFilterCommentBefore": "Annak a megjegyzésnek a definíciója, ami az illeszkedő elem elé kerül a megjegyzésszűrő alkalmazása esetén.",
-	"emmetPreferencesFilterCommentAfter": "Annak a megjegyzésnek a definíciója, ami az illeszkedő elem mögé kerül a megjegyzésszűrő alkalmazása esetén.",
-	"emmetPreferencesFilterCommentTrigger": "Attribútumnevek vesszővel elválasztott listája, amelyeknek léteznie kell a megjegyzésszűrő alkalmazásához.",
-	"emmetPreferencesFormatNoIndentTags": "Azon elemek neveit tartalmazó tömb, melyek nem kapnak belső indentálást",
-	"emmetPreferencesFormatForceIndentTags": "Azon elemek neveit tartalmazó tömb, melyek mindig kapnak belső indentálást",
-	"emmetPreferencesAllowCompactBoolean": "Ha az értéke true, a logikai értékeket tartalmazó attribútumok esetén a rövidített jelölés lesz használva",
-	"emmetPreferencesCssWebkitProperties": "CSS-tulajdonságok vesszővel ellátott listája, melyek 'webkit' gyártói előtagot kapnak azoknál az Emmet-rövidtéseknél, melyek `-` karakterrel kezdődnek. Állítsa üres szövegre, ha soha nem szeretne 'webkit' előtagot használni.",
-	"emmetPreferencesCssMozProperties": "CSS-tulajdonságok vesszővel ellátott listája, melyek 'moz' gyártói előtagot kapnak azoknál az Emmet-rövidtéseknél, melyek `-` karakterrel kezdődnek. Állítsa üres szövegre, ha soha nem szeretne 'moz' előtagot használni.",
-	"emmetPreferencesCssOProperties": "CSS-tulajdonságok vesszővel ellátott listája, melyek 'o' gyártói előtagot kapnak azoknál az Emmet-rövidtéseknél, melyek `-` karakterrel kezdődnek. Állítsa üres szövegre, ha soha nem szeretne 'o' előtagot használni.",
-	"emmetPreferencesCssMsProperties": "CSS-tulajdonságok vesszővel ellátott listája, melyek 'ms' gyártói előtagot kapnak azoknál az Emmet-rövidtéseknél, melyek `-` karakterrel kezdődnek. Állítsa üres szövegre, ha soha nem szeretne 'ms' előtagot használni.",
-	"emmetPreferencesCssFuzzySearchMinScore": "A minimális pontszám (0-tól 1-ig), amit egy fuzzy keresési találatnak el kell érnie. Az alacsonyabb értékek álpozitív találatokat eredményezhetnek, míg a magasabb értékek szűkítik a lehetséges találatok számát.",
-	"emmetOptimizeStylesheetParsing": "Ha az értéke false, az egész fájl fel lesz dolgozva annak meghatározásához, hogy az aktuális pozíció ércényes-e Emmet-rövidítések kibontásához. Ha az értéke true, csak az aktuális pozíció körüli tartalom lesz feldolgozva a CSS/SCSS/LESS-fájlokban."
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/extension-editing/out/extensionLinter.i18n.json b/i18n/hun/extensions/extension-editing/out/extensionLinter.i18n.json
deleted file mode 100644
index 5528d4e358b..00000000000
--- a/i18n/hun/extensions/extension-editing/out/extensionLinter.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"httpsRequired": "A képek csak HTTPS-protokollt használhatnak.",
-	"svgsNotValid": "Az SVG-k nem érvényes képforrások.",
-	"embeddedSvgsNotValid": "A beágyazott SVG-k nem érvényes képforrások.",
-	"dataUrlsNotValid": "A data URL-ek nem érvényes képforrások.",
-	"relativeUrlRequiresHttpsRepository": "A relatív kép URL-ekhez egy HTTPS-protokollal rendelkező forráskódtárat kell megadni a package.json-ban.",
-	"relativeIconUrlRequiresHttpsRepository": "Az ikonhoz egy HTTPS-protokollal rendelkező forráskódtárat kell megadni a package.json-ban.",
-	"relativeBadgeUrlRequiresHttpsRepository": "A relatív jelvény URL-ekhez egy HTTPS-protokollal rendelkező forráskódtárat kell megadni a package.json-ban."
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/extension-editing/out/packageDocumentHelper.i18n.json b/i18n/hun/extensions/extension-editing/out/packageDocumentHelper.i18n.json
deleted file mode 100644
index ec473b31120..00000000000
--- a/i18n/hun/extensions/extension-editing/out/packageDocumentHelper.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"languageSpecificEditorSettings": "Nyelvspecifikus szerkesztőbeállítások",
-	"languageSpecificEditorSettingsDescription": "A szerkesztő beállításainak felülírása az adott nyelvre vonatkozóan"
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/extension-editing/package.i18n.json b/i18n/hun/extensions/extension-editing/package.i18n.json
deleted file mode 100644
index adbf056f045..00000000000
--- a/i18n/hun/extensions/extension-editing/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Csomagfájl-szerkesztő",
-	"description": "IntelliSense-t szolgáltat a VS Code kiegészítési pontjaihoz, illetve lintelést a package.json-fájlokhoz."
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/fsharp/package.i18n.json b/i18n/hun/extensions/fsharp/package.i18n.json
deleted file mode 100644
index ea3427a1908..00000000000
--- a/i18n/hun/extensions/fsharp/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "F# nyelvi alapok",
-	"description": "Kódtöredékeket és szintaktikai kiemelést szolgáltat, valamint kezeli az összetartozó zárójeleket és a kódrészek bezárását az F#-fájlokban."
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/git/out/askpass-main.i18n.json b/i18n/hun/extensions/git/out/askpass-main.i18n.json
deleted file mode 100644
index d2d12d782b3..00000000000
--- a/i18n/hun/extensions/git/out/askpass-main.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"missOrInvalid": "Hiányzó vagy érvénytelen hitelesítési adatok."
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/git/out/autofetch.i18n.json b/i18n/hun/extensions/git/out/autofetch.i18n.json
deleted file mode 100644
index 7645777b08a..00000000000
--- a/i18n/hun/extensions/git/out/autofetch.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"yes": "Igen",
-	"no": "Nem",
-	"not now": "Kérdezzen rá később",
-	"suggest auto fetch": "Szeretné, hogy a Code [időszakosan futtassa a 'git fetch' parancsot]({0})?"
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/git/out/commands.i18n.json b/i18n/hun/extensions/git/out/commands.i18n.json
deleted file mode 100644
index affdd78fc14..00000000000
--- a/i18n/hun/extensions/git/out/commands.i18n.json
+++ /dev/null
@@ -1,91 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"tag at": "Címke, a következőre mutat: {0}",
-	"remote branch at": "Távoli ág, a következőre mutat: {0}",
-	"create branch": "$(plus) Új ág létrehozása",
-	"repourl": "Forráskódtár URL-címe",
-	"selectFolder": "Válassza ki a forráskódtár helyét!",
-	"cloning": "'{0}' git forráskódtár klónozása...",
-	"proposeopen": "Szeretné megnyitni a klónozott forráskódtárat?",
-	"openrepo": "Forráskódtár megnyitása",
-	"add": "Hozzáadás a munkaterülethez",
-	"proposeopen2": "Szeretné megnyitni a klónozott forráskódtára, vagy hozzáadni az aktuális munkaterülethez?",
-	"init": "Válasszon munkaterületi mappát a Git-forráskódtár inicializálásához!",
-	"init repo": "Forráskódtár előkészítése",
-	"create repo": "Forráskódtár előkészítése",
-	"are you sure": "A művelet egy Git forráskódtárat hoz létre a következő helyen: '{0}. Biztosan szeretné folytatni?",
-	"HEAD not available": "A(z) '{0}' HEAD-verziója nem elérhető.",
-	"confirm stage files with merge conflicts": "Biztosan elő szeretne jegyezni {0} ütközési konfliktussal rendelkező fájlt?",
-	"confirm stage file with merge conflicts": "Biztosan elő szeretne jegyezni a következő, ütközési konfliktussal rendelkező fájlt: {0}?",
-	"yes": "Igen",
-	"confirm revert": "Visszaállítja a kijelölt módosításokat a következő helyen: {0}?",
-	"revert": "Módosítások visszaállítása",
-	"discard": "Módosítások elvetése",
-	"confirm delete": "Biztosan TÖRLI a következőt: {0}?",
-	"delete file": "Fájl törlése",
-	"confirm discard": "Elveti a módosításokat a következő helyen: {0}?",
-	"confirm discard multiple": "Elveti {0} fájl módosításait?",
-	"warn untracked": "A művelet {0} nem követett fájl TÖRLÉSÉT fogja eredményezni!",
-	"confirm discard all single": "Elveti a módosításokat a következő helyen: {0}?",
-	"confirm discard all": "Elveti az ÖSSZES módosítást {0} fájlban?\nA művelet NEM VONHATÓ VISSZA!\nAz aktuális munka ÖRÖKRE EL FOG VESZNI.",
-	"discardAll multiple": "Egy fájl elvetése",
-	"discardAll": "Mind a(z) {0} fájl elvetése",
-	"confirm delete multiple": "Biztosan TÖRÖLNI akar {0} fájlt?",
-	"delete files": "Fájlok törlése",
-	"there are untracked files single": "A következő, nem követett fájl TÖRÖLVE LESZ A LEMEZRŐL, ha elvetésre kerül: {0}.",
-	"there are untracked files": "{0} nem követett fájl TÖRÖLVE LESZ A LEMEZRŐL, ha elvetésre kerülnek. ",
-	"confirm discard all 2": "{0}\n\nA művelet NEM VONHATÓ VISSZA, az aktuális munka ÖRÖKRE EL FOG VESZNI.",
-	"yes discard tracked": "Egy követett fájl elvetése",
-	"yes discard tracked multiple": "{0} követett fájl elvetése",
-	"unsaved files single": "A következő fájl nincs elmentve: {0}.\n\nSzeretné menteni a beadás előtt?",
-	"unsaved files": "{0} nem mentett fájl található.\n\nSzeretné menteni őket a beadás előtt?",
-	"save and commit": "Összes mentése és beadás",
-	"commit": "Beadás mindenképp",
-	"no staged changes": "Nincs beadáshoz (commithoz) előjegyzett módosítás. Szeretné automatikusan előjegyeztetni a módosításokat és közvetlenül beadni őket?",
-	"always": "Mindig",
-	"no changes": "Nincs beadandó módosítás.",
-	"commit message": "Beadási (commit) üzenet",
-	"provide commit message": "Adja meg a beadási (commit) üzenetet",
-	"select a ref to checkout": "Válassza ki a refet a checkouthoz",
-	"branch name": "Ág neve",
-	"provide branch name": "Adja meg az ág nevét",
-	"select branch to delete": "Válassza ki a törlendő ágat",
-	"confirm force delete branch": "A(z) '{0}' ág nincs teljesen beolvasztva. Mégis törli?",
-	"delete branch": "Ág törlése",
-	"invalid branch name": "Az ág neve érvénytelen",
-	"branch already exists": "Már van '{0}' nevű ág",
-	"select a branch to merge from": "Válassza ki az ágat, amit olvasztani szeretne",
-	"merge conflicts": "Összeolvasztási konfliktusok keletkeztek. Oldja fel őket a beadás (commit) előtt!",
-	"tag name": "Címke neve",
-	"provide tag name": "Adja meg a címke nevét",
-	"tag message": "Üzenet",
-	"provide tag message": "Adja meg a címke leírását tartalmazó üzenetet",
-	"no remotes to fetch": "A forráskódtárhoz nincsenek távoli szerverek konfigurálva, ahonnan le lehetne kérni.",
-	"no remotes to pull": "A forráskódtárhoz nincsenek távoli szerverek konfigurálva, ahonnan pullozni lehetne.",
-	"pick remote pull repo": "Válassza ki a távoli szervert, ahonnan pullozni szeretné az ágat",
-	"no remotes to push": "A forráskódtárhoz nincsenek távoli szerverek konfigurálva, ahová pusholni lehetne.",
-	"nobranch": "Válasszon egy ágat a távoli szerverre való pusholáshot!",
-	"confirm publish branch": "A(z) '{0}' ág nem létezik a távoli szerveren. Szeretné publikálni ezt az ágat?",
-	"ok": "OK",
-	"push with tags success": "A címkékkel együtt történő pusholás sikeresen befejeződött.",
-	"pick remote": "Válassza ki a távoli szervert, ahová publikálni szeretné a(z) '{0}' ágat:",
-	"sync is unpredictable": "Ez a művelet pusholja és pullozza a commitokat a következő helyről: '{0}/{1}'.",
-	"never again": "Rendben, ne jelenjen meg újra",
-	"no remotes to publish": "A forráskódtárhoz nincsenek távoli szerverek konfigurálva, ahová publikálni lehetne.",
-	"no changes stash": "Nincs elrakandó módosítás.",
-	"provide stash message": "Adja meg a stash-hez tartozó üzenet (nem kötelező)",
-	"stash message": "Stash-üzenet",
-	"no stashes": "Nincs visszaállítható stash.",
-	"pick stash to pop": "Válassza ki a visszaállítandó stash-t",
-	"clean repo": "Takarítsa ki a forráskódtár munkafáját, mielőtt checkoutolna!",
-	"cant push": "Nem lehet pusholni a távoli szerverre. Először próbálja meg futtatni a 'Pull' parancsot a módosításai integrálásához!",
-	"git error details": "Git: {0}",
-	"git error": "Git-hiba",
-	"open git log": "Git-napló megnyitása"
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/git/out/main.i18n.json b/i18n/hun/extensions/git/out/main.i18n.json
deleted file mode 100644
index 34ef76e258c..00000000000
--- a/i18n/hun/extensions/git/out/main.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"looking": "Git keresése a következő helyen: {0}",
-	"using git": "Git {0} használata a következő helyről: {1}",
-	"downloadgit": "Git letöltése",
-	"neverShowAgain": "Ne jelenítse meg újra",
-	"notfound": "A Git nem található. Telepítse vagy állítsa be az elérési útját a 'git.path' beállítással.",
-	"updateGit": "Git frissítése",
-	"git20": "Úgy tűnik, hogy a git {0} van telepítve. A Code a git >= 2 verzióival működik együtt a legjobban."
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/git/out/model.i18n.json b/i18n/hun/extensions/git/out/model.i18n.json
deleted file mode 100644
index db074aaa5c8..00000000000
--- a/i18n/hun/extensions/git/out/model.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"too many submodules": "A(z) '{0}' forráskódtárhoz {1} almodul tartozik, ami nem lesz megnyitva automatikusan. Bármelyik megnyitható külön-külön egy bennük lévő fájl megnyitásával.",
-	"no repositories": "Nem található forráskódtár.",
-	"pick repo": "Válasszon forráskódtárat!"
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/git/out/repository.i18n.json b/i18n/hun/extensions/git/out/repository.i18n.json
deleted file mode 100644
index cbcda0cc8b4..00000000000
--- a/i18n/hun/extensions/git/out/repository.i18n.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"open": "Megnyitás",
-	"index modified": "Index, módosítva",
-	"modified": "Módosítva",
-	"index added": "Index, hozzáadva",
-	"index deleted": "Index, törölve",
-	"deleted": "Törölve",
-	"index renamed": "Index, átnevezve",
-	"index copied": "Index, másolva",
-	"untracked": "Nem követett",
-	"ignored": "Figyelmen kívül hagyva",
-	"both deleted": "Mindkettő törölte",
-	"added by us": "Általunk hozzáadott",
-	"deleted by them": "Általuk törölt",
-	"added by them": "Általuk hozzáadott",
-	"deleted by us": "Általunk törölt",
-	"both added": "Mindkettő hozzáadta",
-	"both modified": "Mindkettő módosította",
-	"commitMessage": "Üzenet (nyomja meg a következőt a commithoz: {0})",
-	"commit": "Commit",
-	"merge changes": "Módosítások összeolvasztása",
-	"staged changes": "Beadásra előjegyzett módosítások",
-	"changes": "Módosítások",
-	"commitMessageCountdown": "{0} karakter maradt az aktuális sorban",
-	"commitMessageWarning": " {0} karakterrel több, mint {1} az aktuális sorban",
-	"neveragain": "Ne jelenítse meg újra",
-	"huge": "A(z) '{0}' forráskódtárban túl sok aktív módosítás van. A Git-funkciók csak egy része lesz engedélyezve."
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/git/out/scmProvider.i18n.json b/i18n/hun/extensions/git/out/scmProvider.i18n.json
deleted file mode 100644
index 7fded37328a..00000000000
--- a/i18n/hun/extensions/git/out/scmProvider.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"commit": "Commit"
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/git/out/statusbar.i18n.json b/i18n/hun/extensions/git/out/statusbar.i18n.json
deleted file mode 100644
index 7161f09b7b3..00000000000
--- a/i18n/hun/extensions/git/out/statusbar.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"checkout": "Checkout...",
-	"sync changes": "Módosítások szinkronizálása",
-	"publish changes": "Módosítások publikálása",
-	"syncing changes": "Módosítások szinkronizálása..."
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/git/package.i18n.json b/i18n/hun/extensions/git/package.i18n.json
deleted file mode 100644
index d2831b61da5..00000000000
--- a/i18n/hun/extensions/git/package.i18n.json
+++ /dev/null
@@ -1,87 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Git",
-	"description": "Git verziókezelő integráció",
-	"command.clone": "Klónozás",
-	"command.init": "Forráskódtár előkészítése",
-	"command.close": "Forráskódtár bezárása",
-	"command.refresh": "Frissítés",
-	"command.openChange": "Módosítások megnyitása",
-	"command.openFile": "Fájl megnyitása",
-	"command.openHEADFile": "Fájl megnyitása (HEAD)",
-	"command.stage": "Módosítások előjegyzése beadásra",
-	"command.stageAll": "Összes módosítás előjegyzése beadásra",
-	"command.stageSelectedRanges": "Kijelölt területek előjegyzése beadásra",
-	"command.revertSelectedRanges": "Kijelölt területek visszaállítása",
-	"command.stageChange": "Változás előjegyzése beadásra",
-	"command.revertChange": "Változtatás visszavonása",
-	"command.unstage": "Módosítások előjegyzésének törlése",
-	"command.unstageAll": "Minden módosítás előjegyzésének törlése",
-	"command.unstageSelectedRanges": "Kijelölt területek előjegyzésének törlése",
-	"command.clean": "Módosítások elvetése",
-	"command.cleanAll": "Összes módosítás elvetése",
-	"command.commit": "Commit",
-	"command.commitStaged": "Előjegyzettek beadása (commit)",
-	"command.commitStagedSigned": "Előjegyzettek beadása (commit) aláírással",
-	"command.commitStagedAmend": "Előjegyzettek beadása (commit) javítással (amend)",
-	"command.commitAll": "Összes beadása (commit)",
-	"command.commitAllSigned": "Összes beadása (commit) aláírással",
-	"command.commitAllAmend": "Összes beadása (commint) javítással",
-	"command.undoCommit": "Legutolsó beadás (commit) visszavonása",
-	"command.checkout": "Checkout adott helyre...",
-	"command.branch": "Ág létrehozása...",
-	"command.deleteBranch": "Új ág létrehozása",
-	"command.renameBranch": "Ág átnevezése...",
-	"command.merge": "Ág beolvasztása...",
-	"command.createTag": "Címke létrehozása",
-	"command.fetch": "Lekérés (fetch)",
-	"command.pull": "Pull",
-	"command.pullRebase": "Pull (Rebase)",
-	"command.pullFrom": "Pullozás...",
-	"command.push": "Push",
-	"command.pushTo": "Push adott helyre...",
-	"command.pushWithTags": "Push címkékkel",
-	"command.sync": "Szinkronizálás",
-	"command.syncRebase": "Szinkronizálás (rebase)",
-	"command.publish": "Ág publikálása",
-	"command.showOutput": "Git-kimenet megjelenítése",
-	"command.ignore": "Fájl hozzáadása a .gitignore-hoz",
-	"command.stashIncludeUntracked": "Stash (a nem követett fájlokkal együtt)",
-	"command.stash": "Stash",
-	"command.stashPop": "Stash visszaállítása...",
-	"command.stashPopLatest": "Legutóbbi stash visszaállítása",
-	"config.enabled": "Meghatározza, hogy a git engedélyezve van-e",
-	"config.path": "A git végrehajtható fájl elérési útja",
-	"config.autoRepositoryDetection": "Meghatározza, hogy a forráskódtárak automatikusan fel legyenek-e derítve",
-	"config.autorefresh": "Meghatározza, hogy engedélyezve van-e az automatikus frissítés",
-	"config.autofetch": "Meghatározza, hogy engedélyezve van-e az automatikus lekérés",
-	"config.enableLongCommitWarning": "Figyelmeztessen-e az alkalmazás hosszú beadási üzenet esetén",
-	"config.confirmSync": "Megerősítés kérése git forráskódtárak szinkronizálása előtt",
-	"config.countBadge": "Meghatározza a git jelvényen megjelenő számláló működését. Az `all` minden módosítást számol, a `tracked` csak a követkett változtatásokat. Az `off` kikapcsolja a jelvényt.",
-	"config.checkoutType": "Meghatározza, hogy milyen típusú ágak jelenjenek meg a `Checkout adott helyről... ` parancs futtatása esetén. Az  `all` esetén az összes ref megjelenik, `local` esetén csak a helyi ágak, `tags` esetén csak a címkék, `remote` esetén pedig csak a távoli ágak.",
-	"config.ignoreLegacyWarning": "Régi gittel kapcsolatos figyelmeztetés figyelmen kívül hagyása",
-	"config.ignoreMissingGitWarning": "Figyelmeztetés figyelmen kívül hagyása, ha a Git hiányzik",
-	"config.ignoreLimitWarning": "Túl sok módosítás esetén megjelenő figyelmeztetés figyelmen kívül hagyása",
-	"config.defaultCloneDirectory": "Git-forráskódtárak klónozásának alapértelmezett helye.",
-	"config.enableSmartCommit": "Összes módosítás beadása (commit), ha nincsenek előjegyzett módosítások.",
-	"config.enableCommitSigning": "Commit GPG-vel történő aláírásának engedélyezése.",
-	"config.discardAllScope": "Meghatározza, hogy milyen módosítások kerülnek elvetésre az \"Összes módosítás elvetése\" parancs kiadása esetén. `all` esetén minden módosítás elvetődik. `tracked` esetén csak a követett fájlok módosításai vetődnek el. `prompt` esetén a parancs minden futtatásánál felugrik egy párbeszédablak.",
-	"config.decorations.enabled": "Meghatározza, hogy a Git megjelölje-e színnel és jelvénnyekkel a fájlokat a fájlkezelőben és a nyitott szerkesztőablakok nézetben.",
-	"config.promptToSaveFilesBeforeCommit": "Meghatározza, hogy a Git ellenőrizze-e, hogy van-e mentetlen fájl beadás (commit) előtt.",
-	"config.showInlineOpenFileAction": "Meghatározza, hogy megjelenjen-e a sorok között egy 'Fájl megnyitása' művelet a git változások nézetén.",
-	"config.inputValidation": "Meghatározza, hogy mikor jelenjen meg a beadási üzenet validálása.",
-	"config.detectSubmodules": "Meghatározza, hogy automatikusan fel legyenek-e derítve a git almodulok.",
-	"config.detectSubmodulesLimit": "Korlátozza a felderített git almodulok számát.",
-	"colors.modified": "A módosított erőforrások színe.",
-	"colors.deleted": "A törölt erőforrások színe.",
-	"colors.untracked": "A nem követett erőforrások színe.",
-	"colors.ignored": "A figyelmen kívül hagyott erőforrások színe.",
-	"colors.conflict": "A konfliktusos erőforrások színe.",
-	"colors.submodule": "Az almodulokhoz tartozó erőforrások színe"
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/go/package.i18n.json b/i18n/hun/extensions/go/package.i18n.json
deleted file mode 100644
index 165670e7cda..00000000000
--- a/i18n/hun/extensions/go/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Go nyelvi alapok",
-	"description": "Szintaktikai kiemelést szolgáltat, valamint kezeli az összetartozó zárójeleket a Go-fájlokban."
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/groovy/package.i18n.json b/i18n/hun/extensions/groovy/package.i18n.json
deleted file mode 100644
index 66eda5f518f..00000000000
--- a/i18n/hun/extensions/groovy/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Groovy nyelvi alapok",
-	"description": "Kódtöredékeket és szintaktikai kiemelést szolgáltat, valamint kezeli az összetartozó zárójeleket a Groovy-fájlokban."
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/grunt/out/main.i18n.json b/i18n/hun/extensions/grunt/out/main.i18n.json
deleted file mode 100644
index aa32b2ae15a..00000000000
--- a/i18n/hun/extensions/grunt/out/main.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"execFailed": "A Grunt automatikus felderítése a(z) {0} mappához nem sikerült a következő hiba miatt: {1}"
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/grunt/package.i18n.json b/i18n/hun/extensions/grunt/package.i18n.json
deleted file mode 100644
index d8647cd3bd6..00000000000
--- a/i18n/hun/extensions/grunt/package.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"description": "Grunttal kapcsolatos funkciók VSCode-hoz.",
-	"displayName": "Grunt-támogatás a VSCode-hoz",
-	"config.grunt.autoDetect": "Meghatározza, hogy a Grunt feladatok automatikus felderításe be van-e kapcsolva. A beállítás alapértelmezetten aktív.",
-	"grunt.taskDefinition.type.description": "A testreszabott Grunt-feladat.",
-	"grunt.taskDefinition.file.description": "Azon Grunt-fájl neve, ami a feladatot szolgáltatja. Elhagyható."
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/gulp/out/main.i18n.json b/i18n/hun/extensions/gulp/out/main.i18n.json
deleted file mode 100644
index b4716f93ef9..00000000000
--- a/i18n/hun/extensions/gulp/out/main.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"execFailed": "A gulp automatikus felderítése a(z) {0} mappához nem sikerült a következő hiba miatt: {1}"
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/gulp/package.i18n.json b/i18n/hun/extensions/gulp/package.i18n.json
deleted file mode 100644
index bb358dcfaf2..00000000000
--- a/i18n/hun/extensions/gulp/package.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"description": "Gulppal kapcsolatos funkciók VSCode-hoz.",
-	"displayName": "Gulp-támogatás a VSCode-hoz",
-	"config.gulp.autoDetect": "Meghatározza, hogy a Gulp feladatok automatikus felderításe be van-e kapcsolva. A beállítás alapértelmezetten aktív.",
-	"gulp.taskDefinition.type.description": "A testreszabott Gulp-feladat.",
-	"gulp.taskDefinition.file.description": "Azon Gulp-fájl neve, ami a feladatot szolgáltatja. Elhagyható."
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/handlebars/package.i18n.json b/i18n/hun/extensions/handlebars/package.i18n.json
deleted file mode 100644
index 25c39aa2da3..00000000000
--- a/i18n/hun/extensions/handlebars/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Handlebars nyelvi alapok",
-	"description": "Szintaktikai kiemelést szolgáltat, valamint kezeli az összetartozó zárójeleket a Handlebars-fájlokban."
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/hlsl/package.i18n.json b/i18n/hun/extensions/hlsl/package.i18n.json
deleted file mode 100644
index eb39b4e6163..00000000000
--- a/i18n/hun/extensions/hlsl/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "HLSL nyelvi alapok",
-	"description": "Szintaktikai kiemelést szolgáltat, valamint kezeli az összetartozó zárójeleket a HLSL-fájlokban."
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/html-language-features/client/out/htmlMain.i18n.json b/i18n/hun/extensions/html-language-features/client/out/htmlMain.i18n.json
deleted file mode 100644
index 8b705a97409..00000000000
--- a/i18n/hun/extensions/html-language-features/client/out/htmlMain.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"htmlserver.name": "HTML nyelvi szerver",
-	"folding.start": "Összecsukható tartomány kezdete",
-	"folding.end": "Összecsukható tartomány vége"
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/html-language-features/package.i18n.json b/i18n/hun/extensions/html-language-features/package.i18n.json
deleted file mode 100644
index c4e070a679d..00000000000
--- a/i18n/hun/extensions/html-language-features/package.i18n.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "HTML nyelvi funkciók",
-	"description": "Széleskörű nyelvi támogatás HTML-, Razor- és Handlebar-fájlokhoz.",
-	"html.format.enable.desc": "Alapértelmezett HTML-formázó engedélyezése vagy letiltása.",
-	"html.format.wrapLineLength.desc": "Maximális karakterszám soronként (0 = letiltás)",
-	"html.format.unformatted.desc": "Azon elemek vesszővel elválasztott listája, melyek ne legyenek újraformázva. 'null' érték esetén a https://www.w3.org/TR/html5/dom.html#phrasing-content oldalon listázott elemek lesznek használva.",
-	"html.format.contentUnformatted.desc": "Azon elemek vesszővel elválasztott listája, melyek ne legyenek újraformázva. 'null' érték esetén a 'pre' tag lesz használva.",
-	"html.format.indentInnerHtml.desc": "<head>- és <body>-szakaszok indentálása.",
-	"html.format.preserveNewLines.desc": "Az elemek előtt lévő sortörések meg legyenek-e hagyva. Csak elemek előtt működik, elemek belsejében vagy szövegben nem.",
-	"html.format.maxPreserveNewLines.desc": "Az egymás után megőrzött sortörések maximális száma. Ha nem szeretné korlátozni, használja a 'null' értéket!",
-	"html.format.indentHandlebars.desc": "{{#foo}} és {{/foo}} formázása és indentálása.",
-	"html.format.endWithNewline.desc": "Lezárás új sorral.",
-	"html.format.extraLiners.desc": "Azon elemek veszővel elválasztott listája, amelyek előtt lennie kell egy extra új sornak. 'null' érték esetén a \"head,body,/html\" érték van használva.",
-	"html.format.wrapAttributes.desc": "Attribútumok tördelése.",
-	"html.format.wrapAttributes.auto": "Az attribútumok csak akkor vannak tördelve, ha a sorhossz túl lett lépve.",
-	"html.format.wrapAttributes.force": "Minden egyes attribútum tördelve van, kivéve az elsőt.",
-	"html.format.wrapAttributes.forcealign": "Minden egyes attribútum tördelve van, kivéve az elsőt, és igazítva vannak.",
-	"html.format.wrapAttributes.forcemultiline": "Minden egyes attribútum tördelve van.",
-	"html.suggest.angular1.desc": "Meghatározza, hogy a beépített HTML nyelvi támogatás ajánl-e Angular V1 elemeket és tulajdonságokat.",
-	"html.suggest.ionic.desc": "Meghatározza, hogy a beépített HTML nyelvi támogatás ajánl-e Ionic elemeket, tulajdonságokat és értékeket.",
-	"html.suggest.html5.desc": "Meghatározza, hogy a beépített HTML nyelvi támogatás ajánl-e HTML5-ös elemeket, tulajdonságokat és értékeket.",
-	"html.trace.server.desc": "A VS Code és a HTML nyelvi szerver közötti kommunikáció naplózása.",
-	"html.validate.scripts": "Meghatározza, hogy a beépített HTML nyelvi támogatás validálja-e a beágyazott parancsafájlokat.",
-	"html.validate.styles": "Meghatározza, hogy a beépített HTML nyelvi támogatás validálja-e a beágyazott stílusfájlokat.",
-	"html.autoClosingTags": "HTML-elemek automatikus lezárásának engedélyezése vagy tetiltása."
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/html/client/out/htmlMain.i18n.json b/i18n/hun/extensions/html/client/out/htmlMain.i18n.json
deleted file mode 100644
index 8b705a97409..00000000000
--- a/i18n/hun/extensions/html/client/out/htmlMain.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"htmlserver.name": "HTML nyelvi szerver",
-	"folding.start": "Összecsukható tartomány kezdete",
-	"folding.end": "Összecsukható tartomány vége"
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/html/package.i18n.json b/i18n/hun/extensions/html/package.i18n.json
deleted file mode 100644
index bb0ee17f709..00000000000
--- a/i18n/hun/extensions/html/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "HTML nyelvi alapok",
-	"description": "Szintaktikai kiemelést, összetartozó zárójelek kezelését és kódtöredékeket szolgáltat a HTML-fájlokhoz."
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/ini/package.i18n.json b/i18n/hun/extensions/ini/package.i18n.json
deleted file mode 100644
index d380b0043d4..00000000000
--- a/i18n/hun/extensions/ini/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Ini nyelvi alapok",
-	"description": "Szintaktikai kiemelést szolgáltat, valamint kezeli az összetartozó zárójeleket az Ini-fájlokban."
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/jake/out/main.i18n.json b/i18n/hun/extensions/jake/out/main.i18n.json
deleted file mode 100644
index 930f667a2b3..00000000000
--- a/i18n/hun/extensions/jake/out/main.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"execFailed": "A Jake automatikus felderítése a(z) {0} mappához nem sikerült a következő hiba miatt: {1}"
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/jake/package.i18n.json b/i18n/hun/extensions/jake/package.i18n.json
deleted file mode 100644
index 6791190c4cb..00000000000
--- a/i18n/hun/extensions/jake/package.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"description": "Jake-kel kapcsolatos funkciók VSCode-hoz.",
-	"displayName": "Jake-támogatás a VSCode-hoz",
-	"jake.taskDefinition.type.description": "A testreszabott Jake-feladat.",
-	"jake.taskDefinition.file.description": "Azon Jake-fájl neve, ami a feladatot szolgáltatja. Elhagyható.",
-	"config.jake.autoDetect": "Meghatározza, hogy a Jake-feladatok automatikus felderításe be van-e kapcsolva. A beállítás alapértelmezetten aktív."
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/java/package.i18n.json b/i18n/hun/extensions/java/package.i18n.json
deleted file mode 100644
index bf342f657aa..00000000000
--- a/i18n/hun/extensions/java/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Java nyelvi alapok",
-	"description": "Kódtöredékeket és szintaktikai kiemelést szolgáltat, valamint kezeli az összetartozó zárójeleket és a kódrészek bezárását a Java-fájlokban."
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/javascript/out/features/bowerJSONContribution.i18n.json b/i18n/hun/extensions/javascript/out/features/bowerJSONContribution.i18n.json
deleted file mode 100644
index e3632652380..00000000000
--- a/i18n/hun/extensions/javascript/out/features/bowerJSONContribution.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"json.bower.default": "Alapértelmezett bower.json",
-	"json.bower.error.repoaccess": "A bower-adattár lekérdezése nem sikerült: {0}",
-	"json.bower.latest.version": "legutóbbi"
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/javascript/out/features/packageJSONContribution.i18n.json b/i18n/hun/extensions/javascript/out/features/packageJSONContribution.i18n.json
deleted file mode 100644
index 3a9a8b3d561..00000000000
--- a/i18n/hun/extensions/javascript/out/features/packageJSONContribution.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"json.package.default": "Alapértelmezett package.json",
-	"json.npm.error.repoaccess": "Az NPM-adattár lekérdezése nem sikerült: {0}",
-	"json.npm.latestversion": "A csomag jelenlegi legújabb verziója",
-	"json.npm.majorversion": "A legfrissebb főverzió keresése (1.x.x)",
-	"json.npm.minorversion": "A legfrissebb alverzió keresése (1.2.x)",
-	"json.npm.version.hover": "Legújabb verzió: {0}"
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/javascript/package.i18n.json b/i18n/hun/extensions/javascript/package.i18n.json
deleted file mode 100644
index 33fe12968b7..00000000000
--- a/i18n/hun/extensions/javascript/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "JavaScript nyelvi alapok",
-	"description": "Kódtöredékeket és szintaktikai kiemelést szolgáltat, valamint kezeli az összetartozó zárójeleket és a kódrészek bezárását a JavaScript-fájlokban."
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/json-language-features/client/out/jsonMain.i18n.json b/i18n/hun/extensions/json-language-features/client/out/jsonMain.i18n.json
deleted file mode 100644
index 7651ab518e4..00000000000
--- a/i18n/hun/extensions/json-language-features/client/out/jsonMain.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"jsonserver.name": "JSON nyelvi szerver"
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/json-language-features/package.i18n.json b/i18n/hun/extensions/json-language-features/package.i18n.json
deleted file mode 100644
index ddfd0e82d10..00000000000
--- a/i18n/hun/extensions/json-language-features/package.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "JSON nyelvi funkciók",
-	"description": "Széleskörű nyelvi támogatás JSON-fájlokhoz.",
-	"json.schemas.desc": "Sémák hozzárendelése JSON-fájlokhoz a jelenlegi projektben",
-	"json.schemas.url.desc": "Egy séma URL-címe vagy egy séma relatív elérési útja az aktuális könyvtárban",
-	"json.schemas.fileMatch.desc": "Fájlminták tömbje, amely a JSON-fájlok sémákhoz való rendelésénél van használva.",
-	"json.schemas.fileMatch.item.desc": "Fájlminták tömbje, amely a JSON-fájlok sémákhoz való rendelésénél van használva. Tartalmazhat '*'-ot.",
-	"json.schemas.schema.desc": "Az adott URL-cím sémadefiníciója. A sémát csak a séma URL-címéhez való fölösleges lekérdezések megakadályozása érdekében kell megadni.",
-	"json.format.enable.desc": "Alapértelmezett JSON-formázó engedélyezése vagy letiltása (újraindítást igényel)",
-	"json.tracing.desc": "A VS Code és a JSON nyelvi szerver közötti kommunikáció naplózása.",
-	"json.colorDecorators.enable.desc": "Színdekorátorok engedélyezése vagy letiltása",
-	"json.colorDecorators.enable.deprecationMessage": "A `json.colorDecorators.enable` beállítás elavult az `editor.colorDecorators` bevezetése miatt."
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/json/client/out/jsonMain.i18n.json b/i18n/hun/extensions/json/client/out/jsonMain.i18n.json
deleted file mode 100644
index 7651ab518e4..00000000000
--- a/i18n/hun/extensions/json/client/out/jsonMain.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"jsonserver.name": "JSON nyelvi szerver"
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/json/package.i18n.json b/i18n/hun/extensions/json/package.i18n.json
deleted file mode 100644
index 55ffac6d3dd..00000000000
--- a/i18n/hun/extensions/json/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "JSON nyelvi alapok",
-	"description": "Szintaktikai kiemelést szolgáltat, valamint kezeli az összetartozó zárójeleket a JSON-fájlokban."
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/less/package.i18n.json b/i18n/hun/extensions/less/package.i18n.json
deleted file mode 100644
index 71ae3d80fad..00000000000
--- a/i18n/hun/extensions/less/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Less nyelvi alapok",
-	"description": "Szintaktikai kiemelést szolgáltat, valamint kezeli az összetartozó zárójeleket és a kódrészek bezárását a C/C++-fájlokban."
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/log/package.i18n.json b/i18n/hun/extensions/log/package.i18n.json
deleted file mode 100644
index 3e59a00375b..00000000000
--- a/i18n/hun/extensions/log/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Log",
-	"description": "Szintaktikai kiemelést szolgáltat a .log kiterjesztésű fájlokban."
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/lua/package.i18n.json b/i18n/hun/extensions/lua/package.i18n.json
deleted file mode 100644
index 2c5787544a6..00000000000
--- a/i18n/hun/extensions/lua/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Lua nyelvi alapok",
-	"description": "Szintaktikai kiemelést szolgáltat, valamint kezeli az összetartozó zárójeleket a Lua-fájlokban."
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/make/package.i18n.json b/i18n/hun/extensions/make/package.i18n.json
deleted file mode 100644
index bb050058481..00000000000
--- a/i18n/hun/extensions/make/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Make nyelvi alapok",
-	"description": "Szintaktikai kiemelést szolgáltat, valamint kezeli az összetartozó zárójeleket a Make-fájlokban."
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/markdown-basics/package.i18n.json b/i18n/hun/extensions/markdown-basics/package.i18n.json
deleted file mode 100644
index 25f466b5c0b..00000000000
--- a/i18n/hun/extensions/markdown-basics/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Markdown nyelvi alapok",
-	"description": "Kódtöredékeket és szintaktikai kiemelést szolgáltat a Markdown-fájlokban."
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json b/i18n/hun/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json
deleted file mode 100644
index 9eab0fec461..00000000000
--- a/i18n/hun/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"onPreviewStyleLoadError": "A 'markdown.styles' nem tölthető be: {0}"
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/markdown-language-features/out/features/preview.i18n.json b/i18n/hun/extensions/markdown-language-features/out/features/preview.i18n.json
deleted file mode 100644
index a7a0c887484..00000000000
--- a/i18n/hun/extensions/markdown-language-features/out/features/preview.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"lockedPreviewTitle": "[Előnézet] {0}",
-	"previewTitle": "{0} előnézete"
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/markdown-language-features/out/features/previewContentProvider.i18n.json b/i18n/hun/extensions/markdown-language-features/out/features/previewContentProvider.i18n.json
deleted file mode 100644
index 0a920063d63..00000000000
--- a/i18n/hun/extensions/markdown-language-features/out/features/previewContentProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"preview.securityMessage.text": "A tartalom egy része le van tiltva az aktuális dokumentumban",
-	"preview.securityMessage.title": "Potencionálisan veszélyes vagy nem biztonságos tartalom lett letiltva a markdown-előnézetben. Módosítsa a markdown-előnézet biztonsági beállításait a nem biztonságos tartalmak vagy parancsfájlok engedélyezéséhez!",
-	"preview.securityMessage.label": "Biztonsági figyelmeztetés: tartalom le van tiltva"
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/markdown-language-features/out/security.i18n.json b/i18n/hun/extensions/markdown-language-features/out/security.i18n.json
deleted file mode 100644
index 926e1ff93f9..00000000000
--- a/i18n/hun/extensions/markdown-language-features/out/security.i18n.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"strict.title": "Szigorú",
-	"strict.description": "Csak biztonságos tartalmak betöltése",
-	"insecureLocalContent.title": "Nem biztonságos helyi tartalom engedélyezése",
-	"insecureLocalContent.description": "Tartalom betöltésének engedélyezése HTTP-n keresztül localhostról.",
-	"insecureContent.title": "Nem biztonságos tartalom engedélyezése",
-	"insecureContent.description": "Tartalom betöltésének engedélyezése HTTP-n keresztül.",
-	"disable.title": "Letiltás",
-	"disable.description": "Minden tartalom és parancsfájl futtatásának engedélyezése. Nem ajánlott.",
-	"moreInfo.title": "További információ",
-	"enableSecurityWarning.title": "Előnézettel kapcsolatos biztonsági figyelmeztetések engedélyezése ezen a munkaterületen",
-	"disableSecurityWarning.title": "Előnézettel kapcsolatos biztonsági figyelmeztetések letiltása ezen a munkaterületen",
-	"toggleSecurityWarning.description": "Nem befolyásolja a tartalom biztonsági szintjét",
-	"preview.showPreviewSecuritySelector.title": "Válassza ki a munkaterület Markdown-előnézeteinek biztonsági beállítását!"
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/markdown-language-features/package.i18n.json b/i18n/hun/extensions/markdown-language-features/package.i18n.json
deleted file mode 100644
index 5e8a8541227..00000000000
--- a/i18n/hun/extensions/markdown-language-features/package.i18n.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Markdown nyelvi funkciók",
-	"description": "Széleskörű nyelvi támogatás Markdown-fájlokhoz.",
-	"markdown.preview.breaks.desc": "Meghatározza, hogy a sortörések hogyan vannak megjelenítve a markdown-előnézetben. Ha az értéke 'true', akkor minden egyes újsor esetén <br> jön létre.",
-	"markdown.preview.linkify": "URL-szerű szövegek hivatkozássá alakításának engedélyezése vagy letiltása a markdown-előnézetben.",
-	"markdown.preview.doubleClickToSwitchToEditor.desc": "Kattintson duplán a markdown-előnézetre a szerkesztőre való átváltáshoz.",
-	"markdown.preview.fontFamily.desc": "Meghatározza a markdown-előnézeten használt betűkészletet.",
-	"markdown.preview.fontSize.desc": "Meghatározza a markdown-előnézet betűméretét, pixelekben.",
-	"markdown.preview.lineHeight.desc": "Meghatározza a markdown-előnézeten használt sormagasságot. Az érték relatív a betűmérethez képest.",
-	"markdown.preview.markEditorSelection.desc": "Az aktuális kijelölés megjelölése a markdown-előnézeten",
-	"markdown.preview.scrollEditorWithPreview.desc": "Amikor a markdown-előnézetet görgetik, a szerkesztőnézet is aktualizálódik",
-	"markdown.preview.scrollPreviewWithEditor.desc": "Amikor a markdown-szerkesztőnézetet görgetik, az előnézet is aktualizálódik.",
-	"markdown.preview.scrollPreviewWithEditorSelection.desc": "[Elavult] A markdown-előnézetet úgy görgeti, hogy látni lehessen az aktuálisan kijelölt sort.",
-	"markdown.preview.scrollPreviewWithEditorSelection.deprecationMessage": "Ezt a beállítást leváltotta a 'markdown.preview.scrollPreviewWithEditor' beállítás, és már nincs hatása.",
-	"markdown.preview.title": "Előnézet megnyitása",
-	"markdown.previewFrontMatter.dec": "Meghatározza, hogy a YAML konfiguráció (front matter) hogyan legyen megjelenítve a markdown-előnézetben. A 'hide' elrejti a konfigurációt, minden más esetben a front matter markdown-tartalomként van kezelve.",
-	"markdown.previewSide.title": "Előnézet megnyitása oldalt",
-	"markdown.showLockedPreviewToSide.title": "Rögzített előnézet megnyitása oldalt",
-	"markdown.showSource.title": "Forrás megjelenítése",
-	"markdown.styles.dec": "CSS-stíluslapok URL-címeinek vagy helyi elérési útjainak listája, amelyek a markdown-előnézeten használva vannak. A relatív elérési utak az intézőben megnyitott mappához képest vannak relatívan értelmezve. Ha nincs mappa megnyitva, akkor a markdown-fájl elréséi útjához képest. Minden '\\' karaktert '\\\\' formában kell megadni.",
-	"markdown.showPreviewSecuritySelector.title": "Az előnézet biztonsági beállításainak módosítása",
-	"markdown.trace.desc": "Hibakeresési napló engedélyezése a markdown kiterjesztésben.",
-	"markdown.preview.refresh.title": "Előnézet frissítése",
-	"markdown.preview.toggleLock.title": "Előnézet rögzítésének be- és kikapcsolása"
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/markdown/out/commands.i18n.json b/i18n/hun/extensions/markdown/out/commands.i18n.json
deleted file mode 100644
index 8b19dff1723..00000000000
--- a/i18n/hun/extensions/markdown/out/commands.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"previewTitle": "{0} előnézete",
-	"onPreviewStyleLoadError": "A 'markdown.styles' nem tölthető be: {0}"
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/markdown/out/commands/onPreviewStyleLoadError.i18n.json b/i18n/hun/extensions/markdown/out/commands/onPreviewStyleLoadError.i18n.json
deleted file mode 100644
index 9eab0fec461..00000000000
--- a/i18n/hun/extensions/markdown/out/commands/onPreviewStyleLoadError.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"onPreviewStyleLoadError": "A 'markdown.styles' nem tölthető be: {0}"
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/markdown/out/extension.i18n.json b/i18n/hun/extensions/markdown/out/extension.i18n.json
deleted file mode 100644
index 8f10082f96b..00000000000
--- a/i18n/hun/extensions/markdown/out/extension.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"onPreviewStyleLoadError": "A 'markdown.styles' nem tölthető be: {0}",
-	"previewTitle": "{0} előnézete"
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/markdown/out/features/preview.i18n.json b/i18n/hun/extensions/markdown/out/features/preview.i18n.json
deleted file mode 100644
index a7a0c887484..00000000000
--- a/i18n/hun/extensions/markdown/out/features/preview.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"lockedPreviewTitle": "[Előnézet] {0}",
-	"previewTitle": "{0} előnézete"
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/markdown/out/features/previewContentProvider.i18n.json b/i18n/hun/extensions/markdown/out/features/previewContentProvider.i18n.json
deleted file mode 100644
index 0a920063d63..00000000000
--- a/i18n/hun/extensions/markdown/out/features/previewContentProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"preview.securityMessage.text": "A tartalom egy része le van tiltva az aktuális dokumentumban",
-	"preview.securityMessage.title": "Potencionálisan veszélyes vagy nem biztonságos tartalom lett letiltva a markdown-előnézetben. Módosítsa a markdown-előnézet biztonsági beállításait a nem biztonságos tartalmak vagy parancsfájlok engedélyezéséhez!",
-	"preview.securityMessage.label": "Biztonsági figyelmeztetés: tartalom le van tiltva"
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/markdown/out/previewContentProvider.i18n.json b/i18n/hun/extensions/markdown/out/previewContentProvider.i18n.json
deleted file mode 100644
index a99e0243419..00000000000
--- a/i18n/hun/extensions/markdown/out/previewContentProvider.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"preview.securityMessage.text": "A tartalom egy része le van tiltva az aktuális dokumentumban",
-	"preview.securityMessage.title": "Potencionálisan veszélyes vagy nem biztonságos tartalom lett letiltva a markdown-előnézetben. Módosítsa a markdown-előnézet biztonsági beállításait a nem biztonságos tartalmak vagy parancsfájlok engedélyezéséhez!",
-	"preview.securityMessage.label": "Biztonsági figyelmeztetés: tartalom le van tiltva"
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/markdown/out/security.i18n.json b/i18n/hun/extensions/markdown/out/security.i18n.json
deleted file mode 100644
index def0928c3a2..00000000000
--- a/i18n/hun/extensions/markdown/out/security.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"strict.title": "Szigorú",
-	"strict.description": "Csak biztonságos tartalmak betöltése",
-	"insecureContent.title": "Nem biztonságos tartalom engedélyezése",
-	"insecureContent.description": "Tartalom betöltésének engedélyezése HTTP-n keresztül.",
-	"disable.title": "Letiltás",
-	"disable.description": "Minden tartalom és parancsfájl futtatásának engedélyezése. Nem ajánlott.",
-	"moreInfo.title": "További információ",
-	"enableSecurityWarning.title": "Előnézettel kapcsolatos biztonsági figyelmeztetések engedélyezése ezen a munkaterületen",
-	"disableSecurityWarning.title": "Előnézettel kapcsolatos biztonsági figyelmeztetések letiltása ezen a munkaterületen",
-	"toggleSecurityWarning.description": "Nem befolyásolja a tartalom biztonsági szintjét",
-	"preview.showPreviewSecuritySelector.title": "Válassza ki a munkaterület Markdown-előnézeteinek biztonsági beállítását!"
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/markdown/package.i18n.json b/i18n/hun/extensions/markdown/package.i18n.json
deleted file mode 100644
index 5e8a8541227..00000000000
--- a/i18n/hun/extensions/markdown/package.i18n.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Markdown nyelvi funkciók",
-	"description": "Széleskörű nyelvi támogatás Markdown-fájlokhoz.",
-	"markdown.preview.breaks.desc": "Meghatározza, hogy a sortörések hogyan vannak megjelenítve a markdown-előnézetben. Ha az értéke 'true', akkor minden egyes újsor esetén <br> jön létre.",
-	"markdown.preview.linkify": "URL-szerű szövegek hivatkozássá alakításának engedélyezése vagy letiltása a markdown-előnézetben.",
-	"markdown.preview.doubleClickToSwitchToEditor.desc": "Kattintson duplán a markdown-előnézetre a szerkesztőre való átváltáshoz.",
-	"markdown.preview.fontFamily.desc": "Meghatározza a markdown-előnézeten használt betűkészletet.",
-	"markdown.preview.fontSize.desc": "Meghatározza a markdown-előnézet betűméretét, pixelekben.",
-	"markdown.preview.lineHeight.desc": "Meghatározza a markdown-előnézeten használt sormagasságot. Az érték relatív a betűmérethez képest.",
-	"markdown.preview.markEditorSelection.desc": "Az aktuális kijelölés megjelölése a markdown-előnézeten",
-	"markdown.preview.scrollEditorWithPreview.desc": "Amikor a markdown-előnézetet görgetik, a szerkesztőnézet is aktualizálódik",
-	"markdown.preview.scrollPreviewWithEditor.desc": "Amikor a markdown-szerkesztőnézetet görgetik, az előnézet is aktualizálódik.",
-	"markdown.preview.scrollPreviewWithEditorSelection.desc": "[Elavult] A markdown-előnézetet úgy görgeti, hogy látni lehessen az aktuálisan kijelölt sort.",
-	"markdown.preview.scrollPreviewWithEditorSelection.deprecationMessage": "Ezt a beállítást leváltotta a 'markdown.preview.scrollPreviewWithEditor' beállítás, és már nincs hatása.",
-	"markdown.preview.title": "Előnézet megnyitása",
-	"markdown.previewFrontMatter.dec": "Meghatározza, hogy a YAML konfiguráció (front matter) hogyan legyen megjelenítve a markdown-előnézetben. A 'hide' elrejti a konfigurációt, minden más esetben a front matter markdown-tartalomként van kezelve.",
-	"markdown.previewSide.title": "Előnézet megnyitása oldalt",
-	"markdown.showLockedPreviewToSide.title": "Rögzített előnézet megnyitása oldalt",
-	"markdown.showSource.title": "Forrás megjelenítése",
-	"markdown.styles.dec": "CSS-stíluslapok URL-címeinek vagy helyi elérési útjainak listája, amelyek a markdown-előnézeten használva vannak. A relatív elérési utak az intézőben megnyitott mappához képest vannak relatívan értelmezve. Ha nincs mappa megnyitva, akkor a markdown-fájl elréséi útjához képest. Minden '\\' karaktert '\\\\' formában kell megadni.",
-	"markdown.showPreviewSecuritySelector.title": "Az előnézet biztonsági beállításainak módosítása",
-	"markdown.trace.desc": "Hibakeresési napló engedélyezése a markdown kiterjesztésben.",
-	"markdown.preview.refresh.title": "Előnézet frissítése",
-	"markdown.preview.toggleLock.title": "Előnézet rögzítésének be- és kikapcsolása"
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/merge-conflict/out/codelensProvider.i18n.json b/i18n/hun/extensions/merge-conflict/out/codelensProvider.i18n.json
deleted file mode 100644
index f791cf08702..00000000000
--- a/i18n/hun/extensions/merge-conflict/out/codelensProvider.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"acceptCurrentChange": "Helyi változtatás elfogadása",
-	"acceptIncomingChange": "Beérkező változtatás elfogadása",
-	"acceptBothChanges": "Változtatások elfogadása mindkét oldalról",
-	"compareChanges": "Változtatások összehasonlítása"
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/merge-conflict/out/commandHandler.i18n.json b/i18n/hun/extensions/merge-conflict/out/commandHandler.i18n.json
deleted file mode 100644
index 269bf3b18d1..00000000000
--- a/i18n/hun/extensions/merge-conflict/out/commandHandler.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"cursorNotInConflict": "A szerkesztőablak kurzora nem egy összeolvasztási konfliktuson belül van.",
-	"compareChangesTitle": "{0}:  Helyi változtatások ⟷ Beérkező változtatások",
-	"cursorOnCommonAncestorsRange": "A szerkesztőablak kurzora a közös ős blokkján van. Vigye vagy a \"helyi\" vagy a \"beérkező\" blokkra.",
-	"cursorOnSplitterRange": "A szerkesztőablak kurzora az összeolvasztási konfliktus elválasztójánál van. Vigye vagy a \"helyi\" vagy a \"beérkező\" blokkra.",
-	"noConflicts": "Ebben a fájlban nincsenek összeolvasztási konfliktusok",
-	"noOtherConflictsInThisFile": "Ebben a fájlban nincsenek további összeolvasztási konfliktusok"
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/merge-conflict/out/mergeDecorator.i18n.json b/i18n/hun/extensions/merge-conflict/out/mergeDecorator.i18n.json
deleted file mode 100644
index 267ec1fda8c..00000000000
--- a/i18n/hun/extensions/merge-conflict/out/mergeDecorator.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"currentChange": "(Helyi változtatás)",
-	"incomingChange": "(Beérkező változtatás)"
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/merge-conflict/package.i18n.json b/i18n/hun/extensions/merge-conflict/package.i18n.json
deleted file mode 100644
index 7f0702ec131..00000000000
--- a/i18n/hun/extensions/merge-conflict/package.i18n.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Összeolvasztási konfliktus",
-	"description": "Kiemelés és parancsok a sorok között sorok között megjelenített összeolvasztási konfliktusok esetén.",
-	"command.category": "Összeolvasztási konfliktus",
-	"command.accept.all-current": "Összes aktuális elfogadása",
-	"command.accept.all-incoming": "Összes beérkező változás elfogadása",
-	"command.accept.all-both": "Változások elfogadása mindkét oldalról",
-	"command.accept.current": "Helyi változtatás elfogadása",
-	"command.accept.incoming": "Beérkező változtatás elfogadása",
-	"command.accept.selection": "Kijelölt változtatás elfogadása",
-	"command.accept.both": "Változás elfogadása mindkét oldalról",
-	"command.next": "Következő konfliktus",
-	"command.previous": "Előző konfliktus",
-	"command.compare": "Aktuális konfliktus összehasonlítása",
-	"config.title": "Összeolvasztási konfliktus",
-	"config.codeLensEnabled": "Összeolvasztási konfliktust jelző kódlencsék engedélyezése vagy letiltása a szerkesztőablakban.",
-	"config.decoratorsEnabled": "Összeolvasztási konfliktust jelző dekorátorok engedélyezése vagy letiltása a szerkesztőablakban."
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/npm/out/features/bowerJSONContribution.i18n.json b/i18n/hun/extensions/npm/out/features/bowerJSONContribution.i18n.json
deleted file mode 100644
index e3632652380..00000000000
--- a/i18n/hun/extensions/npm/out/features/bowerJSONContribution.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"json.bower.default": "Alapértelmezett bower.json",
-	"json.bower.error.repoaccess": "A bower-adattár lekérdezése nem sikerült: {0}",
-	"json.bower.latest.version": "legutóbbi"
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/npm/out/features/packageJSONContribution.i18n.json b/i18n/hun/extensions/npm/out/features/packageJSONContribution.i18n.json
deleted file mode 100644
index 3a9a8b3d561..00000000000
--- a/i18n/hun/extensions/npm/out/features/packageJSONContribution.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"json.package.default": "Alapértelmezett package.json",
-	"json.npm.error.repoaccess": "Az NPM-adattár lekérdezése nem sikerült: {0}",
-	"json.npm.latestversion": "A csomag jelenlegi legújabb verziója",
-	"json.npm.majorversion": "A legfrissebb főverzió keresése (1.x.x)",
-	"json.npm.minorversion": "A legfrissebb alverzió keresése (1.2.x)",
-	"json.npm.version.hover": "Legújabb verzió: {0}"
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/npm/out/main.i18n.json b/i18n/hun/extensions/npm/out/main.i18n.json
deleted file mode 100644
index 7c22848110f..00000000000
--- a/i18n/hun/extensions/npm/out/main.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"npm.parseError": "Npm-feladatok felderítése: nem sikerült beolvasni a következő fájlt: {0}"
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/npm/out/npmView.i18n.json b/i18n/hun/extensions/npm/out/npmView.i18n.json
deleted file mode 100644
index b872bf53966..00000000000
--- a/i18n/hun/extensions/npm/out/npmView.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noScripts": "Nem található parancsfájl",
-	"noDebugOptions": "A(z) „{0}” nem indítható el hibakereséshez, mert a parancsból hiányzik a node hibakeresési kapcsoló, pl. az „--inspect-brk”.",
-	"learnMore": "További információ",
-	"ok": "OK",
-	"scriptInvalid": "A(z) „{0}” parancs nem található. Frissítse a nézetet!"
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/npm/out/tasks.i18n.json b/i18n/hun/extensions/npm/out/tasks.i18n.json
deleted file mode 100644
index 7c22848110f..00000000000
--- a/i18n/hun/extensions/npm/out/tasks.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"npm.parseError": "Npm-feladatok felderítése: nem sikerült beolvasni a következő fájlt: {0}"
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/npm/package.i18n.json b/i18n/hun/extensions/npm/package.i18n.json
deleted file mode 100644
index 08255b5c470..00000000000
--- a/i18n/hun/extensions/npm/package.i18n.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"description": "Npm parancsfájlokból származó feladatok támogatása.",
-	"displayName": "Npm-támogatás a VSCode-hoz",
-	"config.npm.autoDetect": "Meghatározza, hogy az npm-parancsfájlok automatikus felderításe be van-e kapcsolva. A beállítás alapértelmezetten aktív.",
-	"config.npm.runSilent": "Az npm-parancsok a '--silent' kapcsolóval fussanak.",
-	"config.npm.packageManager": "A parancsfájlok futtatásához használt csomagkezelő.",
-	"config.npm.exclude": "Azokat a mappákat leíró globális minta, amelyek ne legyenek vizsgálva az automatikus parancsfájlkeresés közben.",
-	"config.npm.enableScriptExplorer": "Npm-parancsokat listázó nézet engedélyezése a Fájlkezelőben.",
-	"config.npm.scriptExplorerAction": "Az alapértelmezett művelet kattintás esetén a parancsnézeten: „open” a megnyitáshoz vagy „run” a futtatáshoz. Az alapértelmezett érték az „open”.",
-	"npm.parseError": "Npm-feladatok felderítése: nem sikerült beolvasni a következő fájlt: {0}",
-	"taskdef.script": "A testreszabott npm parancsfájl.",
-	"taskdef.path": "A parancsfájlt szolgáltató package.json-fájlt tartalmazó mappa elérési útja. Elhagyható.",
-	"view.name": "Npm-parancsok",
-	"command.refresh": "Frissítés",
-	"command.run": "Futtatás",
-	"command.debug": "Hibakeresés",
-	"command.openScript": "Megnyitás",
-	"command.runInstall": "Telepítés futtatása"
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/objective-c/package.i18n.json b/i18n/hun/extensions/objective-c/package.i18n.json
deleted file mode 100644
index 84612d5c83b..00000000000
--- a/i18n/hun/extensions/objective-c/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Objective-C nyelvi alapok",
-	"description": "Szintaktikai kiemelést szolgáltat, valamint kezeli az összetartozó zárójeleket az Objective-C-fájlokban."
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/package-json/out/features/bowerJSONContribution.i18n.json b/i18n/hun/extensions/package-json/out/features/bowerJSONContribution.i18n.json
deleted file mode 100644
index e3632652380..00000000000
--- a/i18n/hun/extensions/package-json/out/features/bowerJSONContribution.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"json.bower.default": "Alapértelmezett bower.json",
-	"json.bower.error.repoaccess": "A bower-adattár lekérdezése nem sikerült: {0}",
-	"json.bower.latest.version": "legutóbbi"
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/package-json/out/features/packageJSONContribution.i18n.json b/i18n/hun/extensions/package-json/out/features/packageJSONContribution.i18n.json
deleted file mode 100644
index 3a9a8b3d561..00000000000
--- a/i18n/hun/extensions/package-json/out/features/packageJSONContribution.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"json.package.default": "Alapértelmezett package.json",
-	"json.npm.error.repoaccess": "Az NPM-adattár lekérdezése nem sikerült: {0}",
-	"json.npm.latestversion": "A csomag jelenlegi legújabb verziója",
-	"json.npm.majorversion": "A legfrissebb főverzió keresése (1.x.x)",
-	"json.npm.minorversion": "A legfrissebb alverzió keresése (1.2.x)",
-	"json.npm.version.hover": "Legújabb verzió: {0}"
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/package-json/package.i18n.json b/i18n/hun/extensions/package-json/package.i18n.json
deleted file mode 100644
index 35229bd6699..00000000000
--- a/i18n/hun/extensions/package-json/package.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	]
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/perl/package.i18n.json b/i18n/hun/extensions/perl/package.i18n.json
deleted file mode 100644
index 1868dab6aa1..00000000000
--- a/i18n/hun/extensions/perl/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Perl nyelvi alapok",
-	"description": "Szintaktikai kiemelést szolgáltat, valamint kezeli az összetartozó zárójeleket a Perl-fájlokban."
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/php-language-features/out/features/validationProvider.i18n.json b/i18n/hun/extensions/php-language-features/out/features/validationProvider.i18n.json
deleted file mode 100644
index d4851192c11..00000000000
--- a/i18n/hun/extensions/php-language-features/out/features/validationProvider.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"php.useExecutablePath": "Engedélyezi a(z) {0} (munkaterületi beállításként megadott) végrehajtását a PHP-fájlok linteléséhez?",
-	"php.yes": "Engedélyezés",
-	"php.no": "Tiltás",
-	"wrongExecutable": "A validáció nem sikerült, mivel a(z) {0} nem egy érvényes php végrehajtható fájl. Használja a 'php.validate.executablePath' beállítást a PHP végrehajtható fájl konfigurálásához!",
-	"noExecutable": "A validáció nem sikerült, mivel nincs beállítva PHP végrehajtható fájl. Használja a 'php.validate.executablePath' beállítást a PHP végrehajtható fájl konfigurálásához!",
-	"unknownReason": "Nem sikerült futtatni a PHP-t a következő elérési út használatával: {0}. Az ok ismeretlen."
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/php-language-features/package.i18n.json b/i18n/hun/extensions/php-language-features/package.i18n.json
deleted file mode 100644
index 1d6ca7197bd..00000000000
--- a/i18n/hun/extensions/php-language-features/package.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"configuration.suggest.basic": "Meghatározza, hogy a beépített PHP nyelvi támogatás ajánl-e PHP globálisokat és változókat.",
-	"configuration.validate.enable": "Beépített PHP-validáció engedélyezése vagy letiltása",
-	"configuration.validate.executablePath": "A PHP végrehajtható fájljának elérési útja.",
-	"configuration.validate.run": "A linter mentéskor vagy gépeléskor fut-e.",
-	"configuration.title": "PHP",
-	"commands.categroy.php": "PHP",
-	"command.untrustValidationExecutable": "PHP-validációs végrehajtható fájl letiltása (munkaterületi beállításként megadva)",
-	"displayName": "PHP nyelvi funkciók",
-	"description": "Széleskörű nyelvi támogatás PHP-fájlokhoz."
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/php/out/features/validationProvider.i18n.json b/i18n/hun/extensions/php/out/features/validationProvider.i18n.json
deleted file mode 100644
index d4851192c11..00000000000
--- a/i18n/hun/extensions/php/out/features/validationProvider.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"php.useExecutablePath": "Engedélyezi a(z) {0} (munkaterületi beállításként megadott) végrehajtását a PHP-fájlok linteléséhez?",
-	"php.yes": "Engedélyezés",
-	"php.no": "Tiltás",
-	"wrongExecutable": "A validáció nem sikerült, mivel a(z) {0} nem egy érvényes php végrehajtható fájl. Használja a 'php.validate.executablePath' beállítást a PHP végrehajtható fájl konfigurálásához!",
-	"noExecutable": "A validáció nem sikerült, mivel nincs beállítva PHP végrehajtható fájl. Használja a 'php.validate.executablePath' beállítást a PHP végrehajtható fájl konfigurálásához!",
-	"unknownReason": "Nem sikerült futtatni a PHP-t a következő elérési út használatával: {0}. Az ok ismeretlen."
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/php/package.i18n.json b/i18n/hun/extensions/php/package.i18n.json
deleted file mode 100644
index 7a75a0d1d20..00000000000
--- a/i18n/hun/extensions/php/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "PHP nyelvi alapok",
-	"description": "Szintaktikai kiemelést szolgáltat, valamint kezeli az összetartozó zárójeleket a PHP-fájlokban."
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/powershell/package.i18n.json b/i18n/hun/extensions/powershell/package.i18n.json
deleted file mode 100644
index 1a9325f4dac..00000000000
--- a/i18n/hun/extensions/powershell/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Powershell nyelvi alapok",
-	"description": "Kódtöredékeket és szintaktikai kiemelést szolgáltat, valamint kezeli az összetartozó zárójeleket és a kódrészek bezárását a Powershell-fájlokban."
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/pug/package.i18n.json b/i18n/hun/extensions/pug/package.i18n.json
deleted file mode 100644
index 9103f4a31be..00000000000
--- a/i18n/hun/extensions/pug/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Pug nyelvi alapok",
-	"description": "Szintaktikai kiemelést szolgáltat, valamint kezeli az összetartozó zárójeleket a Pug-fájlokban."
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/python/package.i18n.json b/i18n/hun/extensions/python/package.i18n.json
deleted file mode 100644
index 3d42383d435..00000000000
--- a/i18n/hun/extensions/python/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Python nyelvi alapok",
-	"description": "Szintaktikai kiemelést szolgáltat, valamint kezeli az összetartozó zárójeleket és a kódrészek bezárását a Python-fájlokban."
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/r/package.i18n.json b/i18n/hun/extensions/r/package.i18n.json
deleted file mode 100644
index 37dccfe08e1..00000000000
--- a/i18n/hun/extensions/r/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "R nyelvi alapok",
-	"description": "Szintaktikai kiemelést szolgáltat, valamint kezeli az összetartozó zárójeleket az R-fájlokban."
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/razor/package.i18n.json b/i18n/hun/extensions/razor/package.i18n.json
deleted file mode 100644
index 6f6cbd8a9f6..00000000000
--- a/i18n/hun/extensions/razor/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Razor nyelvi alapok",
-	"description": "Szintaktikai kiemelést szolgáltat, valamint kezeli az összetartozó zárójeleket és a kódrészek bezárását a Razor-fájlokban."
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/ruby/package.i18n.json b/i18n/hun/extensions/ruby/package.i18n.json
deleted file mode 100644
index 8ce68a0be80..00000000000
--- a/i18n/hun/extensions/ruby/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Ruby nyelvi alapok",
-	"description": "Szintaktikai kiemelést szolgáltat, valamint kezeli az összetartozó zárójeleket a Ruby-fájlokban."
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/rust/package.i18n.json b/i18n/hun/extensions/rust/package.i18n.json
deleted file mode 100644
index 38748f59705..00000000000
--- a/i18n/hun/extensions/rust/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Rust nyelvi alapok",
-	"description": "Szintaktikai kiemelést szolgáltat, valamint kezeli az összetartozó zárójeleket a Rust-fájlokban."
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/scss/package.i18n.json b/i18n/hun/extensions/scss/package.i18n.json
deleted file mode 100644
index 4e54e6e1ef7..00000000000
--- a/i18n/hun/extensions/scss/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "SCSS nyelvi alapok",
-	"description": "Szintaktikai kiemelést szolgáltat, valamint kezeli az összetartozó zárójeleket és a kódrészek bezárását az SCSS-fájlokban."
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/search-rg/package.i18n.json b/i18n/hun/extensions/search-rg/package.i18n.json
deleted file mode 100644
index 9c012ece089..00000000000
--- a/i18n/hun/extensions/search-rg/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Keresés (ripgrep)",
-	"description": "Keresési funkciót szolgáltat a Ripgrep használatával."
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/shaderlab/package.i18n.json b/i18n/hun/extensions/shaderlab/package.i18n.json
deleted file mode 100644
index 18a9c7b9225..00000000000
--- a/i18n/hun/extensions/shaderlab/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Shaderlab nyelvi alapok",
-	"description": "Szintaktikai kiemelést szolgáltat, valamint kezeli az összetartozó zárójeleket a Shaderlab-fájlokban."
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/shellscript/package.i18n.json b/i18n/hun/extensions/shellscript/package.i18n.json
deleted file mode 100644
index 823c814187e..00000000000
--- a/i18n/hun/extensions/shellscript/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Shell Script nyelvi alapok",
-	"description": "Szintaktikai kiemelést szolgáltat, valamint kezeli az összetartozó zárójeleket a shell script-fájlokban."
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/sql/package.i18n.json b/i18n/hun/extensions/sql/package.i18n.json
deleted file mode 100644
index f5ff4be5ac7..00000000000
--- a/i18n/hun/extensions/sql/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "SQL nyelvi alapok",
-	"description": "Szintaktikai kiemelést szolgáltat, valamint kezeli az összetartozó zárójeleket az SQL-fájlokban."
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/swift/package.i18n.json b/i18n/hun/extensions/swift/package.i18n.json
deleted file mode 100644
index 948e51515f4..00000000000
--- a/i18n/hun/extensions/swift/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Swift nyelvi alapok",
-	"description": "Kódtöredékeket és szintaktikai kiemelést szolgáltat, valamint kezeli az összetartozó zárójeleket a Swift-fájlokban."
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/theme-abyss/package.i18n.json b/i18n/hun/extensions/theme-abyss/package.i18n.json
deleted file mode 100644
index 11035ed4e15..00000000000
--- a/i18n/hun/extensions/theme-abyss/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Abyss téma",
-	"description": "Abyss téma a Visual Studio Code-hoz"
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/theme-defaults/package.i18n.json b/i18n/hun/extensions/theme-defaults/package.i18n.json
deleted file mode 100644
index 08ff4677dd8..00000000000
--- a/i18n/hun/extensions/theme-defaults/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Alapértelmezett témák",
-	"description": "Az alapértelmezett világos és sötét témák (plusz és Visual Studio változatokkal)"
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/theme-kimbie-dark/package.i18n.json b/i18n/hun/extensions/theme-kimbie-dark/package.i18n.json
deleted file mode 100644
index 85f5c11635a..00000000000
--- a/i18n/hun/extensions/theme-kimbie-dark/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Kimble Dark téma",
-	"description": "Kimble Dark téma a Visual Studio Code-hoz"
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/theme-monokai-dimmed/package.i18n.json b/i18n/hun/extensions/theme-monokai-dimmed/package.i18n.json
deleted file mode 100644
index c988a2acbea..00000000000
--- a/i18n/hun/extensions/theme-monokai-dimmed/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Monokai Dimmed téma",
-	"description": "Monokai Dimmed téma a Visual Studio Code-hoz"
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/theme-monokai/package.i18n.json b/i18n/hun/extensions/theme-monokai/package.i18n.json
deleted file mode 100644
index 664fb42c8eb..00000000000
--- a/i18n/hun/extensions/theme-monokai/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Monokai téma",
-	"description": "Monokai téma a Visual Studio Code-hoz"
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/theme-quietlight/package.i18n.json b/i18n/hun/extensions/theme-quietlight/package.i18n.json
deleted file mode 100644
index 90d30f514ad..00000000000
--- a/i18n/hun/extensions/theme-quietlight/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Quiet Light téma",
-	"description": "Quiet Light téma a Visual Studio Code-hoz"
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/theme-red/package.i18n.json b/i18n/hun/extensions/theme-red/package.i18n.json
deleted file mode 100644
index 5e538fcdf9c..00000000000
--- a/i18n/hun/extensions/theme-red/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Red téma",
-	"description": "Red téma a Visual Studio Code-hoz"
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/theme-seti/package.i18n.json b/i18n/hun/extensions/theme-seti/package.i18n.json
deleted file mode 100644
index d6dbd473e1c..00000000000
--- a/i18n/hun/extensions/theme-seti/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Seti fájlikontéma",
-	"description": "A Seti UI fájlikonjaiból készült fájlikontéma"
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/theme-solarized-dark/package.i18n.json b/i18n/hun/extensions/theme-solarized-dark/package.i18n.json
deleted file mode 100644
index 1000df64908..00000000000
--- a/i18n/hun/extensions/theme-solarized-dark/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Solarized Dark téma",
-	"description": "Solarized Dark téma a Visual Studio Code-hoz"
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/theme-solarized-light/package.i18n.json b/i18n/hun/extensions/theme-solarized-light/package.i18n.json
deleted file mode 100644
index 4bd10af3553..00000000000
--- a/i18n/hun/extensions/theme-solarized-light/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Solarized Light téma",
-	"description": "Solarized Light téma a Visual Studio Code-hoz"
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/theme-tomorrow-night-blue/package.i18n.json b/i18n/hun/extensions/theme-tomorrow-night-blue/package.i18n.json
deleted file mode 100644
index 001ddc7d4c9..00000000000
--- a/i18n/hun/extensions/theme-tomorrow-night-blue/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Tomorrow Night Blue téma",
-	"description": "Tomorrow Night Blue téma a Visual Studio Code-hoz"
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/typescript-basics/package.i18n.json b/i18n/hun/extensions/typescript-basics/package.i18n.json
deleted file mode 100644
index 81f0aec5f27..00000000000
--- a/i18n/hun/extensions/typescript-basics/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "TypeScript nyelvi alapok",
-	"description": "Kódtöredékeket és szintaktikai kiemelést szolgáltat, valamint kezeli az összetartozó zárójeleket és a kódrészek bezárását a TypeScript-fájlokban."
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/typescript-language-features/out/commands.i18n.json b/i18n/hun/extensions/typescript-language-features/out/commands.i18n.json
deleted file mode 100644
index 2d667c10166..00000000000
--- a/i18n/hun/extensions/typescript-language-features/out/commands.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"typescript.projectConfigNoWorkspace": "Nyisson meg egy mappát a VS Code-ban typescriptes vagy javascriptes projekt használatához!",
-	"typescript.projectConfigUnsupportedFile": "Nem sikerült meghatározni a TypeScript- vagy JavaScript-projektet. Nem támogatott fájltípus",
-	"typescript.projectConfigCouldNotGetInfo": "Nem sikerült meghatározni a TypeScript- vagy JavaScript-projektet",
-	"typescript.noTypeScriptProjectConfig": "A fájl nem egy TypeScript-projekt része. További információkat [ide]({0}) kattintva tudhat meg.",
-	"typescript.noJavaScriptProjectConfig": "A fájl nem egy JavaScript-projekt része. További információkat [ide]({0}) kattintva tudhat meg.",
-	"typescript.configureTsconfigQuickPick": "tsconfig.json konfigurálása",
-	"typescript.configureJsconfigQuickPick": "jsconfig.json konfigurálása"
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/typescript-language-features/out/features/completionItemProvider.i18n.json b/i18n/hun/extensions/typescript-language-features/out/features/completionItemProvider.i18n.json
deleted file mode 100644
index 30437c7682c..00000000000
--- a/i18n/hun/extensions/typescript-language-features/out/features/completionItemProvider.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"selectCodeAction": "Válasszon végrehajtandó kódműveletet!",
-	"acquiringTypingsLabel": "Típusdefiníciók letöltése...",
-	"acquiringTypingsDetail": "Típusdefiníciók letöltése az IntelliSense-hez.",
-	"autoImportLabel": "Automatikus importálás a következő helyről: {0}"
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/typescript-language-features/out/features/directiveCommentCompletionProvider.i18n.json b/i18n/hun/extensions/typescript-language-features/out/features/directiveCommentCompletionProvider.i18n.json
deleted file mode 100644
index c7d2746fdb4..00000000000
--- a/i18n/hun/extensions/typescript-language-features/out/features/directiveCommentCompletionProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"ts-check": "Engedélyezi a JavaScript-fájlok szemantikai ellenőrzését. A fájl tetején kell szerepelnie.",
-	"ts-nocheck": "Letiltja a JavaScript-fájlok szemantikai ellenőrzését. A fájl tetején kell szerepelnie.",
-	"ts-ignore": "Elfedi a fájl következő sorában található @ts-check-hibákat."
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/typescript-language-features/out/features/implementationsCodeLensProvider.i18n.json b/i18n/hun/extensions/typescript-language-features/out/features/implementationsCodeLensProvider.i18n.json
deleted file mode 100644
index 7207bf3b210..00000000000
--- a/i18n/hun/extensions/typescript-language-features/out/features/implementationsCodeLensProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"oneImplementationLabel": "1 implementáció",
-	"manyImplementationLabel": "{0} implementáció",
-	"implementationsErrorLabel": "Nem sikerült meghatározni az implementációkat"
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/typescript-language-features/out/features/jsDocCompletionProvider.i18n.json b/i18n/hun/extensions/typescript-language-features/out/features/jsDocCompletionProvider.i18n.json
deleted file mode 100644
index d6bb7d7c26e..00000000000
--- a/i18n/hun/extensions/typescript-language-features/out/features/jsDocCompletionProvider.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"typescript.jsDocCompletionItem.documentation": "JSDoc-megjegyzés"
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/typescript-language-features/out/features/organizeImports.i18n.json b/i18n/hun/extensions/typescript-language-features/out/features/organizeImports.i18n.json
deleted file mode 100644
index 4573e2028b6..00000000000
--- a/i18n/hun/extensions/typescript-language-features/out/features/organizeImports.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"oraganizeImportsAction.title": "Importálások rendezése"
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/typescript-language-features/out/features/quickFixProvider.i18n.json b/i18n/hun/extensions/typescript-language-features/out/features/quickFixProvider.i18n.json
deleted file mode 100644
index e76bf145eff..00000000000
--- a/i18n/hun/extensions/typescript-language-features/out/features/quickFixProvider.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"fixAllInFileLabel": "{0} (összes javítása a fájlban)"
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/typescript-language-features/out/features/referencesCodeLensProvider.i18n.json b/i18n/hun/extensions/typescript-language-features/out/features/referencesCodeLensProvider.i18n.json
deleted file mode 100644
index ac0763b55e4..00000000000
--- a/i18n/hun/extensions/typescript-language-features/out/features/referencesCodeLensProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"oneReferenceLabel": "1 referencia",
-	"manyReferenceLabel": "{0} referencia",
-	"referenceErrorLabel": "Nem sikerült meghatározni a referenciákat"
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/typescript-language-features/out/features/taskProvider.i18n.json b/i18n/hun/extensions/typescript-language-features/out/features/taskProvider.i18n.json
deleted file mode 100644
index d7ad58409e7..00000000000
--- a/i18n/hun/extensions/typescript-language-features/out/features/taskProvider.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"buildTscLabel": "buildelés – {0}",
-	"buildAndWatchTscLabel": "figyelés – {0}"
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/typescript-language-features/out/features/updatePathsOnRename.i18n.json b/i18n/hun/extensions/typescript-language-features/out/features/updatePathsOnRename.i18n.json
deleted file mode 100644
index a9b1fe7fb2b..00000000000
--- a/i18n/hun/extensions/typescript-language-features/out/features/updatePathsOnRename.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"prompt": "Automatikusan aktualizálva legyenek az áthelyezett fájl importálásai: „{0}”?",
-	"reject.title": "Nem",
-	"accept.title": "Igen",
-	"always.title": "Igen, mindig aktualizálódjanak az importálások",
-	"never.title": "Nem, soha ne legyenek aktualizálva az importálások"
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/typescript-language-features/out/typescriptServiceClient.i18n.json b/i18n/hun/extensions/typescript-language-features/out/typescriptServiceClient.i18n.json
deleted file mode 100644
index 5c3b49a6031..00000000000
--- a/i18n/hun/extensions/typescript-language-features/out/typescriptServiceClient.i18n.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noServerFound": "A(z) {0} elérési út nem egy érvényes tsserver-telepítésre mutat. A beépített TypeScript-verzió lesz használva.",
-	"serverCouldNotBeStarted": "Nem sikerült elindítani a TypeScript nyelvi szervert. Hibaüzenet: {0}",
-	"typescript.openTsServerLog.notSupported": "A TS-szerver naplózáshoz TS 2.2.2+ szükséges",
-	"typescript.openTsServerLog.loggingNotEnabled": "A TS-szervernaplózás ki van kapcsolva. Állítsa be a `typescript.tsserver.log` beállítást, majd indítsa újra a TS-szervert a naplózás engedélyezéséhez!",
-	"typescript.openTsServerLog.enableAndReloadOption": "Naplózás engedélyezése és TS-szerver újraindítása",
-	"typescript.openTsServerLog.noLogFile": "A TS-szerver nem kezdett el naplózni",
-	"openTsServerLog.openFileFailedFailed": "A TS-szervernapló nem nyitható meg",
-	"serverDiedAfterStart": "A TypeScript nyelvi szolgáltatás öt alkalommal omlott össze rögtön azután, hogy el lett indítva. A szolgáltatás nem lesz újraindítva.",
-	"serverDiedReportIssue": "Probléma jelentése",
-	"serverDied": "A TypeScript nyelvi szolgáltatás öt alkalommal omlott össze az elmúlt öt percben."
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/typescript-language-features/out/utils/api.i18n.json b/i18n/hun/extensions/typescript-language-features/out/utils/api.i18n.json
deleted file mode 100644
index 93f5c9220fa..00000000000
--- a/i18n/hun/extensions/typescript-language-features/out/utils/api.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"invalidVersion": "érvénytelen verzió"
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/typescript-language-features/out/utils/logger.i18n.json b/i18n/hun/extensions/typescript-language-features/out/utils/logger.i18n.json
deleted file mode 100644
index 8f5ef5415b9..00000000000
--- a/i18n/hun/extensions/typescript-language-features/out/utils/logger.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"channelName": "TypeScript"
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/typescript-language-features/out/utils/projectStatus.i18n.json b/i18n/hun/extensions/typescript-language-features/out/utils/projectStatus.i18n.json
deleted file mode 100644
index 3e5d8de4e07..00000000000
--- a/i18n/hun/extensions/typescript-language-features/out/utils/projectStatus.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hintExclude": "A JavaScript/TypeScript funkciók teljes projektre való engedélyezéséhez zárja ki a sok fájlt tartalmazó mappákat. Például: {0}",
-	"hintExclude.generic": "A JavaScript/TypeScript funkciók teljes projektre való engedélyezéséhez zárja ki azokat a mappákat, amelyben olyan forrásfájlok találhatók, melyen nem dolgozik. ",
-	"large.label": "Kivételek konfigurálása",
-	"hintExclude.tooltip": "A JavaScript/TypeScript funkciók teljes projektre való engedélyezéséhez zárja ki azokat a mappákat, amelyben olyan forrásfájlok találhatók, melyen nem dolgozik. "
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/typescript-language-features/out/utils/typingsStatus.i18n.json b/i18n/hun/extensions/typescript-language-features/out/utils/typingsStatus.i18n.json
deleted file mode 100644
index 4e9549aeb04..00000000000
--- a/i18n/hun/extensions/typescript-language-features/out/utils/typingsStatus.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"installingPackages": "Adatok lekérése a jobb typescriptes IntelliSense-hez",
-	"typesInstallerInitializationFailed.title": "Nem sikerült telepíteni a típusdefiníciós fájlokat a javascriptes nyelvi funkciókhoz. Győződjön meg róla, hogy az NPM telepítve van vagy módosítsa a 'typescript.npm' beállítás értékét a felhasználói beállításokban. További információkat [ide]({0}) kattintva tudhat meg.",
-	"typesInstallerInitializationFailed.doNotCheckAgain": "Ne jelenítse meg újra"
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/typescript-language-features/out/utils/versionPicker.i18n.json b/i18n/hun/extensions/typescript-language-features/out/utils/versionPicker.i18n.json
deleted file mode 100644
index 919b1678312..00000000000
--- a/i18n/hun/extensions/typescript-language-features/out/utils/versionPicker.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"useVSCodeVersionOption": "A VSCode verziójának használata",
-	"useWorkspaceVersionOption": "A munkaterület verziójának használata",
-	"learnMore": "További információ",
-	"selectTsVersion": "Válassza ki a javascriptes és typescriptes nyelvi funkciókhoz használt TypeScript-verziót"
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/typescript-language-features/out/utils/versionProvider.i18n.json b/i18n/hun/extensions/typescript-language-features/out/utils/versionProvider.i18n.json
deleted file mode 100644
index 4e8b25cde58..00000000000
--- a/i18n/hun/extensions/typescript-language-features/out/utils/versionProvider.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"couldNotLoadTsVersion": "Nem sikerült meghatározni a TypeScript-verziót ezen az elérési úton",
-	"noBundledServerFound": "A VSCode beépített tsserverét törölte egy másik alkalmazás, például egy hibásan viselkedő víruskereső eszköz. Telepítse újra a VSCode-ot!"
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/typescript-language-features/package.i18n.json b/i18n/hun/extensions/typescript-language-features/package.i18n.json
deleted file mode 100644
index 06a84e6a3a3..00000000000
--- a/i18n/hun/extensions/typescript-language-features/package.i18n.json
+++ /dev/null
@@ -1,67 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "TypeScript és JavaScript nyelvi funkciók",
-	"description": "Széleskörű nyelvi támogatás JavaScripthez és TypeScripthez.",
-	"reloadProjects.title": "Projekt újratöltése",
-	"configuration.typescript": "TypeScript",
-	"typescript.useCodeSnippetsOnMethodSuggest.dec": "Függvények kiegészítése paraméterdefiníciójukkal.",
-	"typescript.tsdk.desc": "A tsservert és a lib*.d.ts fájlokat tartalmazó mappa elérési útja.",
-	"typescript.disableAutomaticTypeAcquisition": "Automatikus típusdefiníció-letöltés letiltása. Legalább 2.0.6-os TypeScriptet igényel.",
-	"typescript.tsserver.log": "Engedélyezi a TS-szerver naplózását egy fájlba. Ez a napló a TS-szerverrel kapcsolatos problémák diagnosztizálására használható. A napló tartalmazhat elérési utakat, forráskódot és más potenciálisan érzékeny, projekttel kapcsolatos adatot.",
-	"typescript.tsserver.pluginPaths": "További felderített elérési utak, amelyek TypeScript nyelvi szerver beépülőket tartalmaznak. TypeScript >=2.3.0-t igényel.",
-	"typescript.tsserver.pluginPaths.item": "Abszolút vagy relatív elérési út. A relatív elérési utak a munkaterületi mappákhoz relatívan lesznek feloldva.",
-	"typescript.tsserver.trace": "Engedélyezi a TS-szervernek küldött üzenetek naplózását. Ez a napló a TS-szerverrel kapcsolatos problémák diagnosztizálására használható. A napló tartalmazhat elérési utakat, forráskódot és más potenciálisan érzékeny, projekttel kapcsolatos adatot. ",
-	"typescript.validate.enable": "TypeScript-validálás engedélyezése vagy letiltása.",
-	"typescript.format.enable": "Alapértelmezett TypeScript-formázó engedélyezése vagy letiltása.",
-	"javascript.format.enable": "Alapértelmezett JavaScript-formázó engedélyezése vagy letiltása.",
-	"format.insertSpaceAfterCommaDelimiter": "Meghatározza a szóközök kezelését vessző elválasztókarakter után.",
-	"format.insertSpaceAfterConstructor": "Meghatározza a szóközök kezelését a constructor kulcsszó után. TypeScript >= 2.3.0-t igényel.",
-	"format.insertSpaceAfterSemicolonInForStatements": "Meghatározza a szóközök kezelését pontosvessző után a for ciklusban.",
-	"format.insertSpaceBeforeAndAfterBinaryOperators": "Meghatározza a szóközök kezelését bináris operátorok után.",
-	"format.insertSpaceAfterKeywordsInControlFlowStatements": "Meghatározza a szóközök kezelését vezérlési szerkezetek kulcsszavai után.",
-	"format.insertSpaceAfterFunctionKeywordForAnonymousFunctions": "Meghatározza a szóközök kezelését a névtelen függvényekben található function kulcsszó után.",
-	"format.insertSpaceBeforeFunctionParenthesis": "Meghatározza a szóközök kezelését a függvényargumentumokat tartalmazó zárójel előtt. TypeScript >= 2.1.5-öt igényel.",
-	"format.insertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis": "Meghatározza a szóközök kezelését nem üres zárójelek nyitása után és zárása előtt.",
-	"format.insertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets": "Meghatározza a szóközök kezelését nem üres szögletes zárójelek nyitása után és zárása előtt.",
-	"format.insertSpaceAfterOpeningAndBeforeClosingNonemptyBraces": "Meghatározza a szóközök kezelését nem üres kapcsos zárójelek nyitása után és zárása előtt. TypeScript >= 2.3.0-t igényel.",
-	"format.insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces": "Meghatározza a szóközök kezelését a sablonkarakterláncok (template stringek) kapcsos zárójeleinek nyitása után és zárása előtt. TypeScript >= 2.0.6-ot igényel.",
-	"format.insertSpaceAfterOpeningAndBeforeClosingJsxExpressionBraces": "Meghatározza a szóközök kezelését JSX-kifejezések kapcsos zárójeleinek nyitása után és zárása előtt. TypeScript >= 2.0.6-ot igényel.",
-	"format.insertSpaceAfterTypeAssertion": "Meghatározza a szóközök kezelését a típuskényszerítések utn. TypeScript >= 2.4-t igényel.",
-	"format.placeOpenBraceOnNewLineForFunctions": "Meghatározza, hogy a függvények nyitó kapcsos zárójelei új sorba kerüljenek-e vagy sem.",
-	"format.placeOpenBraceOnNewLineForControlBlocks": "Meghatározza, hogy a vezérlőblokkok nyitó kapcsos zárójelei új sorba kerüljenek-e vagy sem.",
-	"javascript.validate.enable": "JavaScript-validálás engedélyezése vagy letiltása.",
-	"goToProjectConfig.title": "Projektkonfiguráció megkeresése",
-	"javascript.referencesCodeLens.enabled": "Referencia kódlencsék engedélyezése vagy letiltása a JavaScript-fájlokban.",
-	"typescript.referencesCodeLens.enabled": "Referencia kódlencsék engedélyezése vagy letiltása a TypeScript-fájlokban. TypeScript >= 2.0.6-ot igényel.",
-	"typescript.implementationsCodeLens.enabled": "Implementációs kódlencsék engedélyezése vagy letiltása. TypeScript >= 2.2.0-t igényel.",
-	"typescript.openTsServerLog.title": "TS-szervernapló megnyitása",
-	"typescript.restartTsServer": "TS-szerver újraindítása",
-	"typescript.selectTypeScriptVersion.title": "TypeScript-verzió kiválasztása",
-	"typescript.reportStyleChecksAsWarnings": "Stílusellenőrzés során talált esetek figyelmeztetésként legyenek jelentve",
-	"jsDocCompletion.enabled": "Automatikus JSDoc-megjegyzések engedélyezése vagy letiltása",
-	"javascript.implicitProjectConfig.checkJs": "JavaScript-fájlok szemantikai ellenőrzésének engedélyezése vagy letiltása. A meglévő jsconfig.json vagy tsconfig.json fájlok felülírják ezt a beállítást. TypeScript >= 2.3.1-et igényel.",
-	"typescript.npm": "Az automatikus típusdefiníció-letöltéshez használt NPM végrehajtható fájl elérési útja. TypeScript 2.3.4-et igényel.",
-	"typescript.check.npmIsInstalled": "Ellenőrizze, hogy az NPM telepítve van-e az automatikus típusdefiníció-letöltéshez.",
-	"javascript.nameSuggestions": "Egyedi nevek listázásának engedélyezése a javascriptes javaslati listákban.",
-	"typescript.tsc.autoDetect": "Meghatározza a tsc-s feladatok automatikus felderítésének működését. 'off' érték esetén a funkció ki van kapcsolva. 'build' esetén egyszer lefutó, fordítást végző feladatok jönnek létre. 'watch' esetén csak fordítást és figyelést végző feladatok jönnek létre. 'on' esetén buildelési és figyelési feladatok is keletkeznek. Az alapértelmezett érték: 'on'.",
-	"typescript.problemMatchers.tsc.label": "TypeScript-problémák",
-	"typescript.problemMatchers.tscWatch.label": "TypeScript-problémák (figyelő módban)",
-	"typescript.quickSuggestionsForPaths": "Kiegészítési javaslatok engedélyezése importált elérési utak beírásakor.",
-	"typescript.locale": "Meghatározza a JavaScript- és TypeScript-hibák lokalizációját. TypeScript >= 2.6.0-t igényel. Az alapértelmezett 'null' érték esetén a VS Code-ban beállított nyelven jelennek meg a JavaScript- és TypeScript-hibák.",
-	"javascript.implicitProjectConfig.experimentalDecorators": " 'experimentalDecorators' beállítás engedélyezése azon JavaScript-fájlok esetében, amelyek nem részei a projektnek. A meglévő jsconfig.json vagy tsconfig.json fájlok felülírják ezt a beállítást. TypeScript >= 2.3.1-et igényel.",
-	"typescript.autoImportSuggestions.enabled": "Automatikus importálási ajánlatok engedélyezése vagy letiltása. TypeScript >= 2.6.1-t igényel.",
-	"typescript.experimental.syntaxFolding": "Szintaxisalapú becsukható kódrészletek engedélyezése vagy letiltása.",
-	"taskDefinition.tsconfig.description": "A tsconfig-fájl, ami meghatározza a TS-buildet.",
-	"javascript.suggestionActions.enabled": "Ajánlásokat tartalmazó diagnosztikák engedélyezése vagy letiltása a JavaScript-fájlokban. TypeScript >= 2.8-at igényel.",
-	"typescript.suggestionActions.enabled": "Ajánlásokat tartalmazó diagnosztikák engedélyezése vagy letiltása a TypeScript-fájlokban. TypeScript >= 2.8-at igényel.",
-	"typescript.preferences.quoteStyle": "A gyorsjavítások során előnyben részesített idézőjelstílus: „single” esetén aposztróf, „double” esetén idézőjel, „auto” esetén pedig a meglévő importálások alapján van meghatározva a stílus. TypeScript >= 2.9-et igényel.",
-	"typescript.preferences.importModuleSpecifier": "Az automatikus importálások során beszúrt elérési utak stílusa:\n- „relative” esetén relatív elérési út a fájlhoz képest\n- „non-relative” esetén a „jsconfig.json”-ban vagy a „tsconfig.json”-ban megadott „baseUrl” értéke alapján\n- „auto” a legrövidebb elérési utat jelenti.\nTypeScript >= 2.9-et igényel.",
-	"typescript.showUnused": "Nem használt változók megjelölése a kódban. TypeScript >= 2.9-et igényel.",
-	"typescript.updateImportsOnFileMove.enabled": "Importálási utak automatikus aktualizálása fájlok átnevezése vagy áthelyezése során. Lehetséges értékek: „prompt” esetén minden átnevezés esetén rákérdez az alkalmazás, „always” esetén az elérési utak automatikusan aktualizálódnak, „never” esetén pedig az elérési utak nem módosulnak, és nem is jelenik meg kérdés ezzel kapcsolatban. TypeScript >= 2.9-et igényel."
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/typescript/out/commands.i18n.json b/i18n/hun/extensions/typescript/out/commands.i18n.json
deleted file mode 100644
index 2d667c10166..00000000000
--- a/i18n/hun/extensions/typescript/out/commands.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"typescript.projectConfigNoWorkspace": "Nyisson meg egy mappát a VS Code-ban typescriptes vagy javascriptes projekt használatához!",
-	"typescript.projectConfigUnsupportedFile": "Nem sikerült meghatározni a TypeScript- vagy JavaScript-projektet. Nem támogatott fájltípus",
-	"typescript.projectConfigCouldNotGetInfo": "Nem sikerült meghatározni a TypeScript- vagy JavaScript-projektet",
-	"typescript.noTypeScriptProjectConfig": "A fájl nem egy TypeScript-projekt része. További információkat [ide]({0}) kattintva tudhat meg.",
-	"typescript.noJavaScriptProjectConfig": "A fájl nem egy JavaScript-projekt része. További információkat [ide]({0}) kattintva tudhat meg.",
-	"typescript.configureTsconfigQuickPick": "tsconfig.json konfigurálása",
-	"typescript.configureJsconfigQuickPick": "jsconfig.json konfigurálása"
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/typescript/out/features/bufferSyncSupport.i18n.json b/i18n/hun/extensions/typescript/out/features/bufferSyncSupport.i18n.json
deleted file mode 100644
index 36e9902ff5e..00000000000
--- a/i18n/hun/extensions/typescript/out/features/bufferSyncSupport.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"versionMismatch": "TypeScript ({1}) használata a szerkesztőfunkciókhoz. A számítógére TypeScript (01}) van globálisan telepítve. A VS Code-ban látható hibák eltérhetnek a TSC által visszaadott hibáktól.",
-	"moreInformation": "További információ",
-	"doNotCheckAgain": "Ne ellenőrizze újra",
-	"close": "Bezárás",
-	"updateTscCheck": "A 'typescript.check.tscVersion' felhasználói beállítás értéke módosítva false-ra"
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/typescript/out/features/completionItemProvider.i18n.json b/i18n/hun/extensions/typescript/out/features/completionItemProvider.i18n.json
deleted file mode 100644
index 30437c7682c..00000000000
--- a/i18n/hun/extensions/typescript/out/features/completionItemProvider.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"selectCodeAction": "Válasszon végrehajtandó kódműveletet!",
-	"acquiringTypingsLabel": "Típusdefiníciók letöltése...",
-	"acquiringTypingsDetail": "Típusdefiníciók letöltése az IntelliSense-hez.",
-	"autoImportLabel": "Automatikus importálás a következő helyről: {0}"
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/typescript/out/features/directiveCommentCompletionProvider.i18n.json b/i18n/hun/extensions/typescript/out/features/directiveCommentCompletionProvider.i18n.json
deleted file mode 100644
index c7d2746fdb4..00000000000
--- a/i18n/hun/extensions/typescript/out/features/directiveCommentCompletionProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"ts-check": "Engedélyezi a JavaScript-fájlok szemantikai ellenőrzését. A fájl tetején kell szerepelnie.",
-	"ts-nocheck": "Letiltja a JavaScript-fájlok szemantikai ellenőrzését. A fájl tetején kell szerepelnie.",
-	"ts-ignore": "Elfedi a fájl következő sorában található @ts-check-hibákat."
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/typescript/out/features/implementationsCodeLensProvider.i18n.json b/i18n/hun/extensions/typescript/out/features/implementationsCodeLensProvider.i18n.json
deleted file mode 100644
index 7207bf3b210..00000000000
--- a/i18n/hun/extensions/typescript/out/features/implementationsCodeLensProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"oneImplementationLabel": "1 implementáció",
-	"manyImplementationLabel": "{0} implementáció",
-	"implementationsErrorLabel": "Nem sikerült meghatározni az implementációkat"
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/typescript/out/features/jsDocCompletionProvider.i18n.json b/i18n/hun/extensions/typescript/out/features/jsDocCompletionProvider.i18n.json
deleted file mode 100644
index d6bb7d7c26e..00000000000
--- a/i18n/hun/extensions/typescript/out/features/jsDocCompletionProvider.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"typescript.jsDocCompletionItem.documentation": "JSDoc-megjegyzés"
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/typescript/out/features/quickFixProvider.i18n.json b/i18n/hun/extensions/typescript/out/features/quickFixProvider.i18n.json
deleted file mode 100644
index e76bf145eff..00000000000
--- a/i18n/hun/extensions/typescript/out/features/quickFixProvider.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"fixAllInFileLabel": "{0} (összes javítása a fájlban)"
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/typescript/out/features/referencesCodeLensProvider.i18n.json b/i18n/hun/extensions/typescript/out/features/referencesCodeLensProvider.i18n.json
deleted file mode 100644
index ac0763b55e4..00000000000
--- a/i18n/hun/extensions/typescript/out/features/referencesCodeLensProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"oneReferenceLabel": "1 referencia",
-	"manyReferenceLabel": "{0} referencia",
-	"referenceErrorLabel": "Nem sikerült meghatározni a referenciákat"
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/typescript/out/features/taskProvider.i18n.json b/i18n/hun/extensions/typescript/out/features/taskProvider.i18n.json
deleted file mode 100644
index d7ad58409e7..00000000000
--- a/i18n/hun/extensions/typescript/out/features/taskProvider.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"buildTscLabel": "buildelés – {0}",
-	"buildAndWatchTscLabel": "figyelés – {0}"
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/typescript/out/typescriptMain.i18n.json b/i18n/hun/extensions/typescript/out/typescriptMain.i18n.json
deleted file mode 100644
index c521fb331a6..00000000000
--- a/i18n/hun/extensions/typescript/out/typescriptMain.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"typescript.projectConfigNoWorkspace": "Nyisson meg egy mappát a VS Code-ban typescriptes vagy javascriptes projekt használatához!",
-	"typescript.projectConfigUnsupportedFile": "Nem sikerült meghatározni a TypeScript- vagy JavaScript-projektet. Nem támogatott fájltípus",
-	"typescript.projectConfigCouldNotGetInfo": "Nem sikerült meghatározni a TypeScript- vagy JavaScript-projektet",
-	"typescript.noTypeScriptProjectConfig": "A fájl nem része egy TypeScript-projektnek",
-	"typescript.noJavaScriptProjectConfig": "A fájl nem része egy JavaScript-projektnek",
-	"typescript.configureTsconfigQuickPick": "tsconfig.json konfigurálása",
-	"typescript.configureJsconfigQuickPick": "jsconfig.json konfigurálása",
-	"typescript.projectConfigLearnMore": "További információ"
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/typescript/out/typescriptServiceClient.i18n.json b/i18n/hun/extensions/typescript/out/typescriptServiceClient.i18n.json
deleted file mode 100644
index 5c3b49a6031..00000000000
--- a/i18n/hun/extensions/typescript/out/typescriptServiceClient.i18n.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noServerFound": "A(z) {0} elérési út nem egy érvényes tsserver-telepítésre mutat. A beépített TypeScript-verzió lesz használva.",
-	"serverCouldNotBeStarted": "Nem sikerült elindítani a TypeScript nyelvi szervert. Hibaüzenet: {0}",
-	"typescript.openTsServerLog.notSupported": "A TS-szerver naplózáshoz TS 2.2.2+ szükséges",
-	"typescript.openTsServerLog.loggingNotEnabled": "A TS-szervernaplózás ki van kapcsolva. Állítsa be a `typescript.tsserver.log` beállítást, majd indítsa újra a TS-szervert a naplózás engedélyezéséhez!",
-	"typescript.openTsServerLog.enableAndReloadOption": "Naplózás engedélyezése és TS-szerver újraindítása",
-	"typescript.openTsServerLog.noLogFile": "A TS-szerver nem kezdett el naplózni",
-	"openTsServerLog.openFileFailedFailed": "A TS-szervernapló nem nyitható meg",
-	"serverDiedAfterStart": "A TypeScript nyelvi szolgáltatás öt alkalommal omlott össze rögtön azután, hogy el lett indítva. A szolgáltatás nem lesz újraindítva.",
-	"serverDiedReportIssue": "Probléma jelentése",
-	"serverDied": "A TypeScript nyelvi szolgáltatás öt alkalommal omlott össze az elmúlt öt percben."
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/typescript/out/utils/api.i18n.json b/i18n/hun/extensions/typescript/out/utils/api.i18n.json
deleted file mode 100644
index 93f5c9220fa..00000000000
--- a/i18n/hun/extensions/typescript/out/utils/api.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"invalidVersion": "érvénytelen verzió"
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/typescript/out/utils/logger.i18n.json b/i18n/hun/extensions/typescript/out/utils/logger.i18n.json
deleted file mode 100644
index 8f5ef5415b9..00000000000
--- a/i18n/hun/extensions/typescript/out/utils/logger.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"channelName": "TypeScript"
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/typescript/out/utils/projectStatus.i18n.json b/i18n/hun/extensions/typescript/out/utils/projectStatus.i18n.json
deleted file mode 100644
index e69520c5b7d..00000000000
--- a/i18n/hun/extensions/typescript/out/utils/projectStatus.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hintExclude": "A JavaScript/TypeScript funkciók teljes projektre való engedélyezéséhez zárja ki a sok fájlt tartalmazó mappákat. Például: {0}",
-	"hintExclude.generic": "A JavaScript/TypeScript funkciók teljes projektre való engedélyezéséhez zárja ki azokat a mappákat, amelyben olyan forrásfájlok találhatók, melyen nem dolgozik.",
-	"large.label": "Kivételek konfigurálása",
-	"hintExclude.tooltip": "A JavaScript/TypeScript funkciók teljes projektre való engedélyezéséhez zárja ki azokat a mappákat, amelyben olyan forrásfájlok találhatók, melyen nem dolgozik. "
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/typescript/out/utils/typingsStatus.i18n.json b/i18n/hun/extensions/typescript/out/utils/typingsStatus.i18n.json
deleted file mode 100644
index 4e9549aeb04..00000000000
--- a/i18n/hun/extensions/typescript/out/utils/typingsStatus.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"installingPackages": "Adatok lekérése a jobb typescriptes IntelliSense-hez",
-	"typesInstallerInitializationFailed.title": "Nem sikerült telepíteni a típusdefiníciós fájlokat a javascriptes nyelvi funkciókhoz. Győződjön meg róla, hogy az NPM telepítve van vagy módosítsa a 'typescript.npm' beállítás értékét a felhasználói beállításokban. További információkat [ide]({0}) kattintva tudhat meg.",
-	"typesInstallerInitializationFailed.doNotCheckAgain": "Ne jelenítse meg újra"
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/typescript/out/utils/versionPicker.i18n.json b/i18n/hun/extensions/typescript/out/utils/versionPicker.i18n.json
deleted file mode 100644
index 919b1678312..00000000000
--- a/i18n/hun/extensions/typescript/out/utils/versionPicker.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"useVSCodeVersionOption": "A VSCode verziójának használata",
-	"useWorkspaceVersionOption": "A munkaterület verziójának használata",
-	"learnMore": "További információ",
-	"selectTsVersion": "Válassza ki a javascriptes és typescriptes nyelvi funkciókhoz használt TypeScript-verziót"
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/typescript/out/utils/versionProvider.i18n.json b/i18n/hun/extensions/typescript/out/utils/versionProvider.i18n.json
deleted file mode 100644
index 4e8b25cde58..00000000000
--- a/i18n/hun/extensions/typescript/out/utils/versionProvider.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"couldNotLoadTsVersion": "Nem sikerült meghatározni a TypeScript-verziót ezen az elérési úton",
-	"noBundledServerFound": "A VSCode beépített tsserverét törölte egy másik alkalmazás, például egy hibásan viselkedő víruskereső eszköz. Telepítse újra a VSCode-ot!"
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/typescript/package.i18n.json b/i18n/hun/extensions/typescript/package.i18n.json
deleted file mode 100644
index e19877c4360..00000000000
--- a/i18n/hun/extensions/typescript/package.i18n.json
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "TypeScript és JavaScript nyelvi funkciók",
-	"description": "Széleskörű nyelvi támogatás JavaScripthez és TypeScripthez.",
-	"typescript.reloadProjects.title": "Projekt újratöltése",
-	"javascript.reloadProjects.title": "Projekt újratöltése",
-	"configuration.typescript": "TypeScript",
-	"typescript.useCodeSnippetsOnMethodSuggest.dec": "Függvények kiegészítése paraméterdefiníciójukkal.",
-	"typescript.tsdk.desc": "A tsservert és a lib*.d.ts fájlokat tartalmazó mappa elérési útja.",
-	"typescript.disableAutomaticTypeAcquisition": "Automatikus típusdefiníció-letöltés letiltása. Legalább 2.0.6-os TypeScriptet igényel.",
-	"typescript.tsserver.log": "Engedélyezi a TS-szerver naplózását egy fájlba. Ez a napló a TS-szerverrel kapcsolatos problémák diagnosztizálására használható. A napló tartalmazhat elérési utakat, forráskódot és más potenciálisan érzékeny, projekttel kapcsolatos adatot.",
-	"typescript.tsserver.trace": "Engedélyezi a TS-szervernek küldött üzenetek naplózását. Ez a napló a TS-szerverrel kapcsolatos problémák diagnosztizálására használható. A napló tartalmazhat elérési utakat, forráskódot és más potenciálisan érzékeny, projekttel kapcsolatos adatot. ",
-	"typescript.validate.enable": "TypeScript-validálás engedélyezése vagy letiltása.",
-	"typescript.format.enable": "Alapértelmezett TypeScript-formázó engedélyezése vagy letiltása.",
-	"javascript.format.enable": "Alapértelmezett JavaScript-formázó engedélyezése vagy letiltása.",
-	"format.insertSpaceAfterCommaDelimiter": "Meghatározza a szóközök kezelését vessző elválasztókarakter után.",
-	"format.insertSpaceAfterConstructor": "Meghatározza a szóközök kezelését a constructor kulcsszó után. TypeScript >= 2.3.0-t igényel.",
-	"format.insertSpaceAfterSemicolonInForStatements": "Meghatározza a szóközök kezelését pontosvessző után a for ciklusban.",
-	"format.insertSpaceBeforeAndAfterBinaryOperators": "Meghatározza a szóközök kezelését bináris operátorok után.",
-	"format.insertSpaceAfterKeywordsInControlFlowStatements": "Meghatározza a szóközök kezelését vezérlési szerkezetek kulcsszavai után.",
-	"format.insertSpaceAfterFunctionKeywordForAnonymousFunctions": "Meghatározza a szóközök kezelését a névtelen függvényekben található function kulcsszó után.",
-	"format.insertSpaceBeforeFunctionParenthesis": "Meghatározza a szóközök kezelését a függvényargumentumokat tartalmazó zárójel előtt. TypeScript >= 2.1.5-öt igényel.",
-	"format.insertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis": "Meghatározza a szóközök kezelését nem üres zárójelek nyitása után és zárása előtt.",
-	"format.insertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets": "Meghatározza a szóközök kezelését nem üres szögletes zárójelek nyitása után és zárása előtt.",
-	"format.insertSpaceAfterOpeningAndBeforeClosingNonemptyBraces": "Meghatározza a szóközök kezelését nem üres kapcsos zárójelek nyitása után és zárása előtt. TypeScript >= 2.3.0-t igényel.",
-	"format.insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces": "Meghatározza a szóközök kezelését a sablonkarakterláncok (template stringek) kapcsos zárójeleinek nyitása után és zárása előtt. TypeScript >= 2.0.6-ot igényel.",
-	"format.insertSpaceAfterOpeningAndBeforeClosingJsxExpressionBraces": "Meghatározza a szóközök kezelését JSX-kifejezések kapcsos zárójeleinek nyitása után és zárása előtt. TypeScript >= 2.0.6-ot igényel.",
-	"format.insertSpaceAfterTypeAssertion": "Meghatározza a szóközök kezelését a típuskényszerítések utn. TypeScript >= 2.4-t igényel.",
-	"format.placeOpenBraceOnNewLineForFunctions": "Meghatározza, hogy a függvények nyitó kapcsos zárójelei új sorba kerüljenek-e vagy sem.",
-	"format.placeOpenBraceOnNewLineForControlBlocks": "Meghatározza, hogy a vezérlőblokkok nyitó kapcsos zárójelei új sorba kerüljenek-e vagy sem.",
-	"javascript.validate.enable": "JavaScript-validálás engedélyezése vagy letiltása.",
-	"typescript.goToProjectConfig.title": "Projektkonfiguráció megkeresése",
-	"javascript.goToProjectConfig.title": "Projektkonfiguráció megkeresése",
-	"javascript.referencesCodeLens.enabled": "Referencia kódlencsék engedélyezése vagy letiltása a JavaScript-fájlokban.",
-	"typescript.referencesCodeLens.enabled": "Referencia kódlencsék engedélyezése vagy letiltása a TypeScript-fájlokban. TypeScript >= 2.0.6-ot igényel.",
-	"typescript.implementationsCodeLens.enabled": "Implementációs kódlencsék engedélyezése vagy letiltása. TypeScript >= 2.2.0-t igényel.",
-	"typescript.openTsServerLog.title": "TS-szervernapló megnyitása",
-	"typescript.restartTsServer": "TS-szerver újraindítása",
-	"typescript.selectTypeScriptVersion.title": "TypeScript-verzió kiválasztása",
-	"typescript.reportStyleChecksAsWarnings": "Stílusellenőrzés során talált esetek figyelmeztetésként legyenek jelentve",
-	"jsDocCompletion.enabled": "Automatikus JSDoc-megjegyzések engedélyezése vagy letiltása",
-	"javascript.implicitProjectConfig.checkJs": "JavaScript-fájlok szemantikai ellenőrzésének engedélyezése vagy letiltása. A meglévő jsconfig.json vagy tsconfig.json fájlok felülírják ezt a beállítást. TypeScript >= 2.3.1-et igényel.",
-	"typescript.npm": "Az automatikus típusdefiníció-letöltéshez használt NPM végrehajtható fájl elérési útja. TypeScript 2.3.4-et igényel.",
-	"typescript.check.npmIsInstalled": "Ellenőrizze, hogy az NPM telepítve van-e az automatikus típusdefiníció-letöltéshez.",
-	"javascript.nameSuggestions": "Egyedi nevek listázásának engedélyezése a javascriptes javaslati listákban.",
-	"typescript.tsc.autoDetect": "Meghatározza a tsc-s feladatok automatikus felderítésének működését. 'off' érték esetén a funkció ki van kapcsolva. 'build' esetén egyszer lefutó, fordítást végző feladatok jönnek létre. 'watch' esetén csak fordítást és figyelést végző feladatok jönnek létre. 'on' esetén buildelési és figyelési feladatok is keletkeznek. Az alapértelmezett érték: 'on'.",
-	"typescript.problemMatchers.tsc.label": "TypeScript-problémák",
-	"typescript.problemMatchers.tscWatch.label": "TypeScript-problémák (figyelő módban)",
-	"typescript.quickSuggestionsForPaths": "Kiegészítési javaslatok engedélyezése importált elérési utak beírásakor.",
-	"typescript.locale": "Meghatározza a TypeScript-hibák jelentésénél használt lokalizációt. TypeScript >= 2.6.0-t igényel. Az alapértelmezett 'null' érték esetén a VS Code-ban beállított nyelven jelennek meg a TypeScript-hibák.",
-	"javascript.implicitProjectConfig.experimentalDecorators": " 'experimentalDecorators' beállítás engedélyezése azon JavaScript-fájlok esetében, amelyek nem részei a projektnek. A meglévő jsconfig.json vagy tsconfig.json fájlok felülírják ezt a beállítást. TypeScript >= 2.3.1-et igényel.",
-	"typescript.autoImportSuggestions.enabled": "Automatikus importálási ajánlatok engedélyezése vagy letiltása. TypeScript >= 2.6.1-t igényel.",
-	"typescript.experimental.syntaxFolding": "Szintaxisalapú becsukható kódrészletek engedélyezése vagy letiltása.",
-	"taskDefinition.tsconfig.description": "A tsconfig-fájl, ami meghatározza a TS-buildet."
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/vb/package.i18n.json b/i18n/hun/extensions/vb/package.i18n.json
deleted file mode 100644
index d65c1cd2fca..00000000000
--- a/i18n/hun/extensions/vb/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Visual Basic nyelvi alapok",
-	"description": "Kódtöredékeket és szintaktikai kiemelést szolgáltat, valamint kezeli az összetartozó zárójeleket és a kódrészek bezárását a Visual Basic-fájlokban."
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/xml/package.i18n.json b/i18n/hun/extensions/xml/package.i18n.json
deleted file mode 100644
index fcdce1d4ec8..00000000000
--- a/i18n/hun/extensions/xml/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "XML nyelvi alapok",
-	"description": "Szintaktikai kiemelést szolgáltat, valamint kezeli az összetartozó zárójeleket az XML-fájlokban."
-}
\ No newline at end of file
diff --git a/i18n/hun/extensions/yaml/package.i18n.json b/i18n/hun/extensions/yaml/package.i18n.json
deleted file mode 100644
index 528b7e23e9e..00000000000
--- a/i18n/hun/extensions/yaml/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "YAML nyelvi alapok",
-	"description": "Szintaktikai kiemelést szolgáltat, valamint kezeli az összetartozó zárójeleket a YAML-fájlokban."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/base/browser/ui/actionbar/actionbar.i18n.json b/i18n/hun/src/vs/base/browser/ui/actionbar/actionbar.i18n.json
deleted file mode 100644
index 309631273fe..00000000000
--- a/i18n/hun/src/vs/base/browser/ui/actionbar/actionbar.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"titleLabel": "{0} ({1})"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/base/browser/ui/aria/aria.i18n.json b/i18n/hun/src/vs/base/browser/ui/aria/aria.i18n.json
deleted file mode 100644
index f6a7efa5cad..00000000000
--- a/i18n/hun/src/vs/base/browser/ui/aria/aria.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"repeated": "{0} (ismét előfordult)"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/base/browser/ui/findinput/findInput.i18n.json b/i18n/hun/src/vs/base/browser/ui/findinput/findInput.i18n.json
deleted file mode 100644
index 67c890e5370..00000000000
--- a/i18n/hun/src/vs/base/browser/ui/findinput/findInput.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"defaultLabel": "bemeneti adat"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/base/browser/ui/findinput/findInputCheckboxes.i18n.json b/i18n/hun/src/vs/base/browser/ui/findinput/findInputCheckboxes.i18n.json
deleted file mode 100644
index e66e5704d8c..00000000000
--- a/i18n/hun/src/vs/base/browser/ui/findinput/findInputCheckboxes.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"caseDescription": "Kis- és nagybetűk megkülönböztetése",
-	"wordsDescription": "Teljes szavas egyezés vizsgálata",
-	"regexDescription": "Reguláris kifejezés használata"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/base/browser/ui/inputbox/inputBox.i18n.json b/i18n/hun/src/vs/base/browser/ui/inputbox/inputBox.i18n.json
deleted file mode 100644
index 47205584c4c..00000000000
--- a/i18n/hun/src/vs/base/browser/ui/inputbox/inputBox.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"alertErrorMessage": "Hiba: {0}",
-	"alertWarningMessage": "Figyelmeztetés: {0}",
-	"alertInfoMessage": "Információ: {0}"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/base/browser/ui/resourceviewer/resourceViewer.i18n.json b/i18n/hun/src/vs/base/browser/ui/resourceviewer/resourceViewer.i18n.json
deleted file mode 100644
index 085eacaa4c1..00000000000
--- a/i18n/hun/src/vs/base/browser/ui/resourceviewer/resourceViewer.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"imgMeta": "{0}x{1} {2}",
-	"largeImageError": "A kép túl nagy a szerkesztőben való megjelenítéshez.",
-	"resourceOpenExternalButton": "Kép megnyitása külső program használatával?",
-	"nativeBinaryError": "A fájl nem jeleníthető meg a szerkesztőben, mert bináris adatokat tartalmaz, túl nagy vagy nem támogatott szövegkódolást használ.",
-	"sizeB": "{0} B",
-	"sizeKB": "{0} KB",
-	"sizeMB": "{0} MB",
-	"sizeGB": "{0} GB",
-	"sizeTB": "{0} TB"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json b/i18n/hun/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json
deleted file mode 100644
index 750d811d866..00000000000
--- a/i18n/hun/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"selectAriaOption": "{0}"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/base/browser/ui/toolbar/toolbar.i18n.json b/i18n/hun/src/vs/base/browser/ui/toolbar/toolbar.i18n.json
deleted file mode 100644
index 0fc2cf56c80..00000000000
--- a/i18n/hun/src/vs/base/browser/ui/toolbar/toolbar.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"more": "Tovább"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/base/common/errorMessage.i18n.json b/i18n/hun/src/vs/base/common/errorMessage.i18n.json
deleted file mode 100644
index 4778d3e8fee..00000000000
--- a/i18n/hun/src/vs/base/common/errorMessage.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"stackTrace.format": "{0}: {1}",
-	"error.defaultMessage": "Ismeretlen hiba történt. Részleteket a naplóban találhat.",
-	"nodeExceptionMessage": "Rendszerhiba történt ({0})",
-	"error.moreErrors": "{0} (összesen {1} hiba)"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/base/common/jsonErrorMessages.i18n.json b/i18n/hun/src/vs/base/common/jsonErrorMessages.i18n.json
deleted file mode 100644
index b7ea235e4ab..00000000000
--- a/i18n/hun/src/vs/base/common/jsonErrorMessages.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"error.invalidSymbol": "Érvénytelen szimbólum",
-	"error.invalidNumberFormat": "Érvénytelen számformátum.",
-	"error.propertyNameExpected": "Hiányzó tulajdonságnév",
-	"error.valueExpected": "Hiányzó érték",
-	"error.colonExpected": "Hiányzó kettőspont",
-	"error.commaExpected": "Hiányzó vessző",
-	"error.closeBraceExpected": "Hiányzó záró kapcsos zárójel",
-	"error.closeBracketExpected": "Hiányzó záró szögletes zárójel",
-	"error.endOfFileExpected": "Hiányzó fájlvégjel"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/base/common/keybindingLabels.i18n.json b/i18n/hun/src/vs/base/common/keybindingLabels.i18n.json
deleted file mode 100644
index 60a654fdb80..00000000000
--- a/i18n/hun/src/vs/base/common/keybindingLabels.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"ctrlKey": "Ctrl",
-	"shiftKey": "Shift",
-	"altKey": "Alt",
-	"windowsKey": "Windows",
-	"ctrlKey.long": "Control",
-	"shiftKey.long": "Shift",
-	"altKey.long": "Alt",
-	"cmdKey.long": "Parancs",
-	"windowsKey.long": "Windows"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/base/common/processes.i18n.json b/i18n/hun/src/vs/base/common/processes.i18n.json
deleted file mode 100644
index d80423e4ca7..00000000000
--- a/i18n/hun/src/vs/base/common/processes.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"ExecutableParser.commandMissing": "Hiba: a végrehajtási információnak definiálnia kell egy karakterlánc típusú parancsot.",
-	"ExecutableParser.isShellCommand": "Figyelmeztetés: az isShellCommand értékének boolean típusúnak kell lennie. A következő érték figyelmen kívül van hagyva: {0}.",
-	"ExecutableParser.args": "Figyelmeztetés: az args értékének string[] típusúnak kell lennie. A következő érték figyelmen kívül van hagyva: {0}.",
-	"ExecutableParser.invalidCWD": "Figyelmeztetés: az options.cwd értékének string típusúnak kell lennie. A következő érték figyelmen kívül van hagyva: {0}."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/base/common/severity.i18n.json b/i18n/hun/src/vs/base/common/severity.i18n.json
deleted file mode 100644
index ba6e96532e0..00000000000
--- a/i18n/hun/src/vs/base/common/severity.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"sev.error": "Hiba",
-	"sev.warning": "Figyelmeztetés",
-	"sev.info": "Információ"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/base/node/processes.i18n.json b/i18n/hun/src/vs/base/node/processes.i18n.json
deleted file mode 100644
index 807d77dbcc0..00000000000
--- a/i18n/hun/src/vs/base/node/processes.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"TaskRunner.UNC": "Rendszerparancsok nem hajthatók végre UNC-meghajtókon."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/base/node/ps.i18n.json b/i18n/hun/src/vs/base/node/ps.i18n.json
deleted file mode 100644
index 8f727d4bf04..00000000000
--- a/i18n/hun/src/vs/base/node/ps.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"collecting": "Processzor- és memóriahasználattal kapcsolatos információk gyűjtése. A folyamat eltarthat néhány másodpercig."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/base/node/zip.i18n.json b/i18n/hun/src/vs/base/node/zip.i18n.json
deleted file mode 100644
index bf04a18c30d..00000000000
--- a/i18n/hun/src/vs/base/node/zip.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"incompleteExtract": "Hiányos. {0} találat a(z) {0} bejegyzésből",
-	"notFound": "{0} nem található a zipen belül."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/base/parts/quickopen/browser/quickOpenModel.i18n.json b/i18n/hun/src/vs/base/parts/quickopen/browser/quickOpenModel.i18n.json
deleted file mode 100644
index c901e5bf7ef..00000000000
--- a/i18n/hun/src/vs/base/parts/quickopen/browser/quickOpenModel.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"quickOpenAriaLabelEntry": "{0}, választó",
-	"quickOpenAriaLabel": "választó"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/base/parts/quickopen/browser/quickOpenWidget.i18n.json b/i18n/hun/src/vs/base/parts/quickopen/browser/quickOpenWidget.i18n.json
deleted file mode 100644
index 3b93cdc99d3..00000000000
--- a/i18n/hun/src/vs/base/parts/quickopen/browser/quickOpenWidget.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"quickOpenAriaLabel": "Gyorsválasztó. Kezdjen el gépelni a találati lista szűkítéséhez!",
-	"treeAriaLabel": "Gyorsválasztó"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/base/parts/tree/browser/treeDefaults.i18n.json b/i18n/hun/src/vs/base/parts/tree/browser/treeDefaults.i18n.json
deleted file mode 100644
index b5c4b3ce2cb..00000000000
--- a/i18n/hun/src/vs/base/parts/tree/browser/treeDefaults.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"collapse": "Összecsukás"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json b/i18n/hun/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
deleted file mode 100644
index e9b4725dad7..00000000000
--- a/i18n/hun/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hide": "elrejtés",
-	"show": "megjelenítés",
-	"previewOnGitHub": "Előnézet GitHubon",
-	"loadingData": "Adatok betöltése...",
-	"rateLimited": "GitHub lekérdezési korlát túllépve. Kérem, várjon!",
-	"similarIssues": "Hasonló problémák",
-	"open": "Nyitott",
-	"closed": "Lezárt",
-	"noSimilarIssues": "Nincs hasonló probléma",
-	"settingsSearchIssue": "Hiba a beállítások keresőjében",
-	"bugReporter": "hiba",
-	"featureRequest": "funkcióigény",
-	"performanceIssue": "teljesítményprobléma",
-	"stepsToReproduce": "A probléma előidézésének lépései",
-	"bugDescription": "Ossza meg a probléma megbízható előidézéséhez szükséges részleteket! Írja le a valós és az elvárt működést! A mezőben GitHub-stílusú markdown használható. A hibajelentés szerkeszthető lesz és képernyőfotók is csatolhatók a githubos előnézetnél.",
-	"performanceIssueDesciption": "Mikor fordult elő ez a teljesítménybeli probléma? Például előfordul indulásnál vagy végre kell hajtani bizonyos műveleteket? A mezőben GitHub-stílusú markdown használható. A hibajelentés szerkeszthető lesz és képernyőfotók is csatolhatók a githubos előnézetnél.",
-	"description": "Leírás",
-	"featureRequestDescription": "Írja körül a funkciót, amit látni szeretne! A mezőben GitHub-stílusú markdown használható. A hibajelentés szerkeszthető lesz és képernyőfotók is csatolhatók a githubos előnézetnél.",
-	"expectedResults": "Elvárt működés",
-	"settingsSearchResultsDescription": "Írja le, hogy milyen találatokat szeretett volna kapni, amikor ezzel a keresőkifejezéssel keresett! A mezőben GitHub-stílusú markdown használható. A hibajelentés szerkeszthető lesz és képernyőfotók is csatolhatók a githubos előnézetnél.",
-	"pasteData": "A szükséges adat túl nagy az elküldéshez, ezért a vágólapra másoltuk. Illessze be!",
-	"disabledExtensions": "A kiegészítők le vannak tiltva."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json b/i18n/hun/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
deleted file mode 100644
index bd8c9904ccb..00000000000
--- a/i18n/hun/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"completeInEnglish": "Kérjük, hogy angolul töltse ki az űrlapot!",
-	"issueTypeLabel": "Ez egy",
-	"issueSourceLabel": "Komponens",
-	"vscode": "Visual Studio Code",
-	"extension": "Egy kiegészítő",
-	"disableExtensionsLabelText": "Próbálja meg előidézni a hibát {0}! Ha a hiba csak aktív kiegészítőkkel idézhető elő, akkor nagy valószínűséggel a kiegészítőben van a hiba.",
-	"disableExtensions": "az összes kiegészítő letiltása és az ablak újratöltése után",
-	"chooseExtension": "Kiegészítő",
-	"issueTitleLabel": "Cím",
-	"issueTitleRequired": "Kérjük, adja meg a címet!",
-	"titleLengthValidation": "A cím túl hosszú.",
-	"details": "Írja le a részleteket!",
-	"sendSystemInfo": "Rendszerinformációk csatolása ({0})",
-	"show": "megjelenítés",
-	"sendProcessInfo": "Jelenleg futó folyamatok listájának csatolása ({0})",
-	"sendWorkspaceInfo": "Munkaterülettel kapcsolatos metaadatok csatolása ({0})",
-	"sendExtensions": "Engedélyezett kiegészítők listájának csatolása ({0})",
-	"sendSearchedExtensions": "Keresett kiegészítők elküldése ({0})",
-	"sendSettingsSearchDetails": "Beállításokban való keresés részleteinek elküldése ({0})"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/code/electron-browser/processExplorer/processExplorerMain.i18n.json b/i18n/hun/src/vs/code/electron-browser/processExplorer/processExplorerMain.i18n.json
deleted file mode 100644
index a1ec017727f..00000000000
--- a/i18n/hun/src/vs/code/electron-browser/processExplorer/processExplorerMain.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"cpu": "Processzor %",
-	"memory": "Memória (MB)",
-	"pid": "folyamatazonosító",
-	"name": "Név",
-	"killProcess": "Folyamat leállítása",
-	"forceKillProcess": "Folyamat kényszerített leállítása",
-	"copy": "Másolás",
-	"copyAll": "Összes másolása"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/code/electron-main/auth.i18n.json b/i18n/hun/src/vs/code/electron-main/auth.i18n.json
deleted file mode 100644
index 44cbdc16c7c..00000000000
--- a/i18n/hun/src/vs/code/electron-main/auth.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"authRequire": "A proxy hitelesítést igényel",
-	"proxyauth": "A(z) {0} proxy használatához hitelesítés szükséges."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/code/electron-main/logUploader.i18n.json b/i18n/hun/src/vs/code/electron-main/logUploader.i18n.json
deleted file mode 100644
index 835fafb4ef0..00000000000
--- a/i18n/hun/src/vs/code/electron-main/logUploader.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"invalidEndpoint": "Érvénytelen naplófájl-feltöltési végpont",
-	"beginUploading": "Feltöltés...",
-	"didUploadLogs": "Feltöltés sikeres! Naplófájl-azonosító: {0}",
-	"logUploadPromptHeader": "A munkamenetnaplóit egy olyan biztonságos végpontra készül feltölteni, amelyhez csak a VS Code csapat microsoftos tagjai férhetnek hozzá.",
-	"logUploadPromptBody": "A munkamenetnaplók személyes információkat tartalmazhatnak, például teljes elérési utakat és fájlok tartalmát. Tekintse át és távolítsa el a személyes adatokat a naplófájlokból a következő helyen: '{0}'!",
-	"logUploadPromptBodyDetails": "A folytatással megerősíti, hogy átnézte és eltávolította a személyes adatokat a munkamenetnaplót tartalmazó fájlokból, és beleegyezik, hogy a Microsoft felhasználja őket a VS Code-ban való hibakereséshez.",
-	"logUploadPromptAcceptInstructions": "A feltöltés folytatásához futtassa a Code-ot az '--upload-logs={0}' kapcsolóval!",
-	"postError": "Hiba a naplók beküldése közben: {0}",
-	"responseError": "Hiba a naplók beküldése közben: {0} – {1}",
-	"parseError": "Hiba a válasz feldolgozása közben",
-	"zipError": "Hiba a naplók tömörítése közben: {0}"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/code/electron-main/main.i18n.json b/i18n/hun/src/vs/code/electron-main/main.i18n.json
deleted file mode 100644
index 0196b675354..00000000000
--- a/i18n/hun/src/vs/code/electron-main/main.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"secondInstanceNoResponse": "Már fut a(z) {0} másik példánya, de nem válaszol.",
-	"secondInstanceNoResponseDetail": "Zárja be az összes példányt, majd próbálja újra!",
-	"secondInstanceAdmin": "Már fut a(z) {0} másik példánya adminisztrátorként.",
-	"secondInstanceAdminDetail": "Zárja be az összes példányt, majd próbálja újra!",
-	"close": "&&Bezárás"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/code/electron-main/menus.i18n.json b/i18n/hun/src/vs/code/electron-main/menus.i18n.json
deleted file mode 100644
index 9ee4bd446c9..00000000000
--- a/i18n/hun/src/vs/code/electron-main/menus.i18n.json
+++ /dev/null
@@ -1,193 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"mFile": "&&Fájl",
-	"mEdit": "Sz&&erkesztés",
-	"mSelection": "Kijelölé&&s",
-	"mView": "&&Nézet",
-	"mGoto": "U&&grás",
-	"mDebug": "Hi&&bakeresés",
-	"mWindow": "Ablak",
-	"mHelp": "&&Súgó",
-	"mTask": "&&Feladatok",
-	"miNewWindow": "Új &&ablak",
-	"mAbout": "A(z) {0} névjegye",
-	"mServices": "Szolgáltatások",
-	"mHide": "{0} elrejtése",
-	"mHideOthers": "Egyebek elrejtése",
-	"mShowAll": "Az összes megjelenítése",
-	"miQuit": "Kilépés innen: {0}",
-	"miNewFile": "Ú&&j fájl",
-	"miOpen": "&&Megnyitás",
-	"miOpenWorkspace": "&&Munkaterület megnyitása...",
-	"miOpenFolder": "Ma&&ppa megnyitása",
-	"miOpenFile": "&&Fájl megnyitása",
-	"miOpenRecent": "&&Legutóbbi megnyitása",
-	"miSaveWorkspaceAs": "Munkaterület mentése másként...",
-	"miAddFolderToWorkspace": "Mappa hozzáa&&dása a munkaterülethez...",
-	"miSave": "Menté&&s",
-	"miSaveAs": "M&&entés másként",
-	"miSaveAll": "Összes men&&tése",
-	"miAutoSave": "Automatikus mentés",
-	"miRevert": "Fájl &&visszaállítása",
-	"miCloseWindow": "Ablak be&&zárása",
-	"miCloseWorkspace": "Munkaterület be&&zárása",
-	"miCloseFolder": "Mappa &&bezárása",
-	"miCloseEditor": "Szer&&kesztőablak bezárása",
-	"miExit": "&&Kilépés",
-	"miOpenSettings": "&&Beállítások",
-	"miOpenKeymap": "&&Billentyűparancsok",
-	"miOpenKeymapExtensions": "Billentyűparancs-kiegészítő&&k",
-	"miOpenSnippets": "Felhasználói kód&&részletek",
-	"miSelectColorTheme": "Szín&&téma",
-	"miSelectIconTheme": "Fájl&&ikonok témája",
-	"miPreferences": "&&Beállítások",
-	"miReopenClosedEditor": "Bezárt szerkesztőablak ú&&jranyitása",
-	"miMore": "&&Továbbiak...",
-	"miClearRecentOpen": "Leg&&utóbb megnyitottak listájának ürítése",
-	"miUndo": "&&Visszavonás",
-	"miRedo": "Ú&&jra",
-	"miCut": "&&Kivágás",
-	"miCopy": "&&Másolás",
-	"miPaste": "&&Beillesztés",
-	"miFind": "K&&eresés",
-	"miReplace": "&&Csere",
-	"miFindInFiles": "Keresés a &&fájlokban",
-	"miReplaceInFiles": "Csere a fá&&jlokban",
-	"miEmmetExpandAbbreviation": "Emmet: Rövidítés k&&ibontása",
-	"miShowEmmetCommands": "E&&mmet...",
-	"miToggleLineComment": "&&Egysoros megjegyzés ki-/bekapcsolása",
-	"miToggleBlockComment": "Me&&gjegyzésblokk ki-/bekapcsolása",
-	"miMultiCursorAlt": "Váltás Alt+kattintásra több kurzorhoz",
-	"miMultiCursorCmd": "Váltás Cmd+kattintásra több kurzorhoz",
-	"miMultiCursorCtrl": "Váltás Ctrl+kattintásra több kurzorhoz",
-	"miInsertCursorAbove": "&&Kurzor beszúrása egy sorral feljebb",
-	"miInsertCursorBelow": "Ku&&rzor beszúrása egy sorral feljebb",
-	"miInsertCursorAtEndOfEachLineSelected": "K&&urzor beszúrása a sorok végére",
-	"miAddSelectionToNextFindMatch": "&&Következő találat kijelölése",
-	"miAddSelectionToPreviousFindMatch": "&&Előző találat kijelölése",
-	"miSelectHighlights": "Az összes keresési találat &&kijelölése",
-	"miCopyLinesUp": "Sor másolása eggyel &&feljebb",
-	"miCopyLinesDown": "Sor másolása eggyel &&lejjebb",
-	"miMoveLinesUp": "Sor feljebb &&helyezése",
-	"miMoveLinesDown": "Sor lejje&&bb helyezése",
-	"miSelectAll": "Az össze&&s kijelölése",
-	"miSmartSelectGrow": "Kijelölés &&bővítése",
-	"miSmartSelectShrink": "Ki&&jelölés szűkítése",
-	"miViewExplorer": "Fájlk&&ezelő",
-	"miViewSearch": "&&Keresés",
-	"miViewSCM": "&&Verziókezelés",
-	"miViewDebug": "&&Hibakeresés",
-	"miViewExtensions": "Kiegé&&szítők",
-	"miToggleOutput": "&&Kimenet",
-	"miToggleDebugConsole": "Hi&&bakeresési konzol",
-	"miToggleIntegratedTerminal": "Beépített term&&inál",
-	"miMarker": "&&Problémák",
-	"miCommandPalette": "Paran&&cskatalógus...",
-	"miOpenView": "&&Nézet megnyitása...",
-	"miToggleFullScreen": "&&Teljes képernyő be- és kikapcsolása",
-	"miToggleZenMode": "Zen mód be- és kikapcsolása",
-	"miToggleCenteredLayout": "Középre igazított elrendezés be- és kikapcsolása",
-	"miToggleMenuBar": "Menüsáv &&be- és kikapcsolása",
-	"miSplitEditor": "Szerkesztőablak k&&ettéosztása",
-	"miToggleEditorLayout": "Szerkesztőablak-csoport e&&lrendezésének váltása",
-	"miToggleSidebar": "&&Oldalsáv be- és kikapcsolása",
-	"miMoveSidebarRight": "Oldalsáv áthelyezése &&jobbra",
-	"miMoveSidebarLeft": "Oldalsáv áthelyezése &&balra",
-	"miTogglePanel": "&&Panel be- és kikapcsolása",
-	"miHideStatusbar": "Állapotsor &&elrejtése",
-	"miShowStatusbar": "Állapotsor &&megjelenítése",
-	"miHideActivityBar": "&&Tevékenységsáv elrejtése",
-	"miShowActivityBar": "&&Tevékenységsáv megjelenítése",
-	"miToggleWordWrap": "&&Sortörés be- és kikapcsolása",
-	"miToggleMinimap": "&&Kódtérkép be- és kikapcsolása",
-	"miToggleRenderWhitespace": "S&&zóközök kirajzolásának be- és kikapcsolása",
-	"miToggleRenderControlCharacters": "&&Vezérlőkarakterek kirajzolásának be- és kikapcsolása",
-	"miZoomIn": "&&Nagyítás",
-	"miZoomOut": "&&Kicsinyítés",
-	"miZoomReset": "&&Nagyítási szint alaphelyzetbe állítása",
-	"miBack": "&&Vissza",
-	"miForward": "&&Előre",
-	"miNextEditor": "&&Következő szerkesztőablak",
-	"miPreviousEditor": "&&Előző szerkesztőablak",
-	"miNextEditorInGroup": "Következő &&használt szerkesztőablak a csoportban",
-	"miPreviousEditorInGroup": "Következő h&&asznált szerkesztőablak a csoportban",
-	"miSwitchEditor": "Sz&&szerkesztőablak váltása",
-	"miFocusFirstGroup": "&&Első csoport",
-	"miFocusSecondGroup": "&&Második csoport",
-	"miFocusThirdGroup": "&&Harmadik csoport",
-	"miNextGroup": "&&Következő csoport",
-	"miPreviousGroup": "&&Előző csoport",
-	"miSwitchGroup": "Csoport &&váltása",
-	"miGotoFile": "Ugrás &&fájlhoz...",
-	"miGotoSymbolInFile": "Ugrás szim&&bólumhoz egy fájlban...",
-	"miGotoSymbolInWorkspace": "Ugrás szimbólumhoz a &&munkaterületen...",
-	"miGotoDefinition": "Ugrás a &&definícióhoz",
-	"miGotoTypeDefinition": "Ugrás a &&típusdefinícióhoz",
-	"miGotoImplementation": "Ugrás az &&implementációhoz",
-	"miGotoLine": "Ugrás adott &&sorhoz...",
-	"miStartDebugging": "Hibakeresés indítá&&sa",
-	"miStartWithoutDebugging": "Indítás hibakeresés &&nélkül",
-	"miStopDebugging": "Hibakeresés leállítá&&sa",
-	"miRestart Debugging": "Hibakeresés új&&raindítása",
-	"miOpenConfigurations": "&&Konfigurációk megnyitása",
-	"miAddConfiguration": "Konfiguráció hozzáadása...",
-	"miStepOver": "Á&&tugrás",
-	"miStepInto": "&&Belépés",
-	"miStepOut": "&&Kilépés",
-	"miContinue": "&&Folytatás",
-	"miToggleBreakpoint": "&&Töréspont be- és kikapcsolása",
-	"miConditionalBreakpoint": "Feltételes törés&&pont",
-	"miInlineBreakpoint": "S&&orbeli töréspont",
-	"miFunctionBreakpoint": "Töréspont&&funkció...",
-	"miLogPoint": "Nap&&lózási pont...",
-	"miNewBreakpoint": "Ú&&j töréspont",
-	"miEnableAllBreakpoints": "Összes töréspont engedélyezése",
-	"miDisableAllBreakpoints": "Összes töréspont leti&&ltása",
-	"miRemoveAllBreakpoints": "Összes töréspont eltávolítás&&a",
-	"miInstallAdditionalDebuggers": "Tovább&&i hibakeresők telepítése",
-	"mMinimize": "Kis méret",
-	"mZoom": "Nagyítás",
-	"mBringToFront": "Legyen az összes előtérben",
-	"miSwitchWindow": "&&Ablak váltása...",
-	"mShowPreviousTab": "Előző fül megjelenítése",
-	"mShowNextTab": "Következő fül megjelenítése",
-	"mMoveTabToNewWindow": "Fül átmozgatása új ablakba",
-	"mMergeAllWindows": "Összes ablak összeolvasztása",
-	"miToggleDevTools": "&&Fejlesztői eszközök be- és kikapcsolása",
-	"miAccessibilityOptions": "&&Kisegítő lehetőségek",
-	"miOpenProcessExplorerer": "&&Feladatkezelő megnyitása",
-	"miReportIssue": "H&&iba jelentése",
-	"miWelcome": "Üdvözlő&&oldal",
-	"miInteractivePlayground": "&&Interaktív játszótér",
-	"miDocumentation": "&&Dokumentáció",
-	"miReleaseNotes": "&&Kiadási jegyzék",
-	"miKeyboardShortcuts": "Billentyűparancs-&&referencia",
-	"miIntroductoryVideos": "Bemutató&&videók",
-	"miTipsAndTricks": "&&Tippek és trükkök",
-	"miTwitter": "&&Csatlakozzon hozzánk a Twitteren",
-	"miUserVoice": "Funkcióigények keresé&&se",
-	"miLicense": "&&Licenc megtekintése",
-	"miPrivacyStatement": "&&Adatvédelmi nyilatkozat",
-	"miAbout": "&&Névjegy",
-	"miRunTask": "&&Feladat futtatása...",
-	"miBuildTask": "&&Buildelési feladat futtatása...",
-	"miRunningTask": "&&Futó feladatok megjelenítése...",
-	"miRestartTask": "Futó f&&eladat újraindítása...",
-	"miTerminateTask": "Felada&&t megszakítása...",
-	"miConfigureTask": "Feladatok &&konfigurálása...",
-	"miConfigureBuildTask": "Alapértelmezett buildelési &&feladat beállítása...",
-	"accessibilityOptionsWindowTitle": "Kisegítő lehetőségek beállításai",
-	"miCheckForUpdates": "Frissítések keresése...",
-	"miCheckingForUpdates": "Frissítések keresése...",
-	"miDownloadUpdate": "Elérhető frissítés letöltése",
-	"miDownloadingUpdate": "Frissítés letöltése...",
-	"miInstallUpdate": "Frissítés telepítése...",
-	"miInstallingUpdate": "Frissítés telepítése...",
-	"miRestartToUpdate": "Újraindítás a frissítéshez..."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/code/electron-main/window.i18n.json b/i18n/hun/src/vs/code/electron-main/window.i18n.json
deleted file mode 100644
index 39ca6620e39..00000000000
--- a/i18n/hun/src/vs/code/electron-main/window.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hiddenMenuBar": "A menüsort továbbra is elérheti az Alt-billentyű megnyomásával."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/code/electron-main/windows.i18n.json b/i18n/hun/src/vs/code/electron-main/windows.i18n.json
deleted file mode 100644
index 6b542dd4e99..00000000000
--- a/i18n/hun/src/vs/code/electron-main/windows.i18n.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"ok": "OK",
-	"pathNotExistTitle": "Az elérési út nem létezik",
-	"pathNotExistDetail": "Úgy tűnik, hogy a(z) „{0}” elérési út már nem létezik a lemezen.",
-	"reopen": "Megnyitás új&&ra",
-	"wait": "Várakozás &&tovább",
-	"close": "&&Bezárás",
-	"appStalled": "Az ablak nem válaszol",
-	"appStalledDetail": "Bezárhatja vagy újranyithatja az ablakot vagy várakozhat tovább.",
-	"appCrashed": "Az ablak összeomlott",
-	"appCrashedDetail": "Elnézést kérünk az okozott kellemetlenségért. Nyissa újra az ablakot, ha onnan szeretné folytatni a munkát, ahol abbahagyta.",
-	"open": "Megnyitás",
-	"openFolder": "Mappa megnyitása",
-	"openFile": "Fájl megnyitása",
-	"workspaceOpenedMessage": "Nem sikerült menteni a(z) '{0}' munkaterületet",
-	"workspaceOpenedDetail": "A munkaterület már meg van nyitva egy másik ablakban. Zárja be azt az ablakot, majd próbálja újra!",
-	"openWorkspace": "&&Megnyitás",
-	"openWorkspaceTitle": "Munkaterület megnyitása",
-	"save": "Menté&&s",
-	"doNotSave": "&&Ne mentse",
-	"cancel": "Mégse",
-	"saveWorkspaceMessage": "Szeretné menteni a munkaterület konfigurációját egy fájlba?",
-	"saveWorkspaceDetail": "Mentse el a munkaterületet, ha meg szeretné nyitni újra!",
-	"saveWorkspace": "Munkaterület mentése"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/code/node/cliProcessMain.i18n.json b/i18n/hun/src/vs/code/node/cliProcessMain.i18n.json
deleted file mode 100644
index 01c2a742d62..00000000000
--- a/i18n/hun/src/vs/code/node/cliProcessMain.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"notFound": "A(z) '{0}' kiegészítő nem található.",
-	"notInstalled": "A(z) '{0}' kiegészítő nincs telepítve.",
-	"useId": "Bizonyosodjon meg róla, hogy a kiegészítő teljes azonosítóját használja, beleértve a kiadót, pl.: {0}",
-	"successVsixInstall": "A(z) '{0}' kiegszítő sikeresen telepítve lett.",
-	"cancelVsixInstall": "A(z) '{0}' kiegészítő telepítése meg lett szakítva.",
-	"alreadyInstalled": "A(z) '{0}' kiegészítő már telepítve van.",
-	"foundExtension": "A(z) '{0}' kiegészítő megtalálva a piactéren.",
-	"installing": "Telepítés...",
-	"successInstall": "A(z) '{0}' v{1} kiegészítő sikeresen telepítve lett.",
-	"uninstalling": "{0} eltávolítása...",
-	"successUninstall": "A(z) '{0}' kiegészítő sikeresen el lett távolítva."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/editor/browser/services/bulkEdit.i18n.json b/i18n/hun/src/vs/editor/browser/services/bulkEdit.i18n.json
deleted file mode 100644
index 970cf632d01..00000000000
--- a/i18n/hun/src/vs/editor/browser/services/bulkEdit.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"summary.0": "Nem történtek változtatások",
-	"summary.nm": "{0} változtatást végzett {0} fájlban",
-	"summary.n0": "{0} változtatást végzett egy fájlban",
-	"conflict": "A következő fájlok módosultak időközben: {0}"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/editor/browser/widget/codeEditorWidget.i18n.json b/i18n/hun/src/vs/editor/browser/widget/codeEditorWidget.i18n.json
deleted file mode 100644
index 6e1b7fcb7c8..00000000000
--- a/i18n/hun/src/vs/editor/browser/widget/codeEditorWidget.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"cursors.maximum": "A kurzorok száma legfeljebb {0} lehet."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/editor/browser/widget/diffEditorWidget.i18n.json b/i18n/hun/src/vs/editor/browser/widget/diffEditorWidget.i18n.json
deleted file mode 100644
index 6f248911e65..00000000000
--- a/i18n/hun/src/vs/editor/browser/widget/diffEditorWidget.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"diff.tooLarge": "A fájlok nem hasonlíthatók össze, mert az egyik fájl túl nagy."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/editor/browser/widget/diffReview.i18n.json b/i18n/hun/src/vs/editor/browser/widget/diffReview.i18n.json
deleted file mode 100644
index 66449b7bec5..00000000000
--- a/i18n/hun/src/vs/editor/browser/widget/diffReview.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"label.close": "Bezárás",
-	"no_lines": "nincsenek sorok",
-	"one_line": "1 sor",
-	"more_lines": "{0} sor",
-	"header": "{0}. eltérés, összesen: {1}. Eredeti: {2}, {3}, módosított: {4}, {5}",
-	"blankLine": "üres",
-	"equalLine": "eredeti {0}., módosított {1}.: {2}",
-	"insertLine": "+ módosított {0}.: {1}",
-	"deleteLine": "- eredeti {0}.: {1}",
-	"editor.action.diffReview.next": "Ugrás a következő eltérésre",
-	"editor.action.diffReview.prev": "Ugrás az előző eltérésre"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/editor/common/commonCodeEditor.i18n.json b/i18n/hun/src/vs/editor/common/commonCodeEditor.i18n.json
deleted file mode 100644
index 6e1b7fcb7c8..00000000000
--- a/i18n/hun/src/vs/editor/common/commonCodeEditor.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"cursors.maximum": "A kurzorok száma legfeljebb {0} lehet."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/editor/common/config/commonEditorConfig.i18n.json b/i18n/hun/src/vs/editor/common/config/commonEditorConfig.i18n.json
deleted file mode 100644
index 2379691d68b..00000000000
--- a/i18n/hun/src/vs/editor/common/config/commonEditorConfig.i18n.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"editorConfigurationTitle": "Szerkesztőablak",
-	"fontFamily": "Meghatározza a betűkészletet.",
-	"fontWeight": "Meghatározza a betűvastagságot.",
-	"fontSize": "Meghatározza a betű méretét, pixelekben.",
-	"lineHeight": "Meghatározza a sormagasságot. A 0 érték használata esetén a sormagasság a fontSize értékéből van számolva.",
-	"letterSpacing": "Meghatározza a betűközt, pixelekben.",
-	"lineNumbers.off": "A sorszámok nem jelennek meg.",
-	"lineNumbers.on": "A sorszámok abszolút értékként jelennek meg.",
-	"lineNumbers.relative": "A sorszámok a kurzortól való távolságuk alapján jelennek meg.",
-	"lineNumbers.interval": "A sorszámok minden 10. sorban jelennek meg.",
-	"lineNumbers": "Meghatározza a sorszámok megjelenítési módját.",
-	"rulers": "Függőleges vonalzók kirajzolása bizonyos számú fix szélességű karakter után. Több vonalzó használatához adjon meg több értéket. Nincs kirajzolva semmi, ha a tömb üres.",
-	"wordSeparators": "Azon karakterek listája, amelyek szóelválasztónak vannak tekintve szavakkal kapcsolatos navigáció vagy műveletek során.",
-	"tabSize": "Egy tabulátor hány szóköznek felel meg. Ez a beállítás felülírásra kerül a fájl tartalma alapján, ha az `editor.detectIndentation` beállítás aktív.",
-	"tabSize.errorMessage": "A várt érték 'number' típusú. Megjegyzés: az \"auto\" értéket az 'editor.detectIndentation' beállítás helyettesíti.",
-	"insertSpaces": "Szóközök beszúrása a tabulátor billentyű lenyomása esetén. Ez a beállítás felülíródik a fájl tartalma alapján, ha az `editor.detectIndentation` beállítás aktív.",
-	"insertSpaces.errorMessage": "A várt érték 'boolean' típusú. Megjegyzés: az \"auto\" értéket az 'editor.detectIndentation' beállítás helyettesíti.",
-	"detectIndentation": "Fájl megnyitásakor az `editor.tabSize` és az `editor.insertSpaces` értéke a fájl tartalma alapján lesz meghatározva.",
-	"roundedSelection": "Meghatározza, hogy a kijelölések sarkai le legyenek-e kerekítve.",
-	"scrollBeyondLastLine": "Meghatározza, hogy a szerkesztőablak görgethető-e az utolsó sor után.",
-	"scrollBeyondLastColumn": "Meghatározza, hogy hány extra karakterig görgethető a szerkesztőablak vízszintesen.",
-	"smoothScrolling": "Meghatározza, hogy a szerkesztőablak animálva van-e görgetve.",
-	"minimap.enabled": "Meghatározza, hogy megjelenjen-e a kódtérkép.",
-	"minimap.side": "Meghatározza, hogy melyik oldalon jelenjen meg a kódtérkép.",
-	"minimap.showSlider": "Meghatározza, hogy automatikusan el legyen-e rejtve a kódtérképes görgetősáv.",
-	"minimap.renderCharacters": "Meghatározza, hogy a tényleges karakterek legyenek-e megjelenítve (színes téglalapok helyett)",
-	"minimap.maxColumn": "Meghatározza, hogy a kódtérképen legfeljebb hány oszlop legyen kirajzolva.",
-	"find.seedSearchStringFromSelection": "Meghatározza, hogy a keresés modulba automatikusan bekerüljön-e a szerkesztőablakban kiválasztott szöveg.",
-	"find.autoFindInSelection": "Meghatározza, hogy a keresés a kijelölésben beállítás be van-e kapcsolva, ha több karakternyi vagy sornyi szöveg ki van jelölve a szerkesztőablakban.",
-	"find.globalFindClipboard": "Meghatározza, hogy a keresőmodul olvassa és módosítsa-e a megosztott keresési vágólapot macOS-en.",
-	"wordWrap.off": "A sorok soha nem lesznek tördelve.",
-	"wordWrap.on": "A sorok tördelve lesznek a nézetablak szélességénél.",
-	"wordWrap.wordWrapColumn": "A sorok tördelve lesznek az `editor.wordWrapColumn` oszlopnál.",
-	"wordWrap.bounded": "A sorok tördelve lesznek a nézetablak szélességének és az `editor.wordWrapColumn` értékének minimumánál.",
-	"wordWrap": "Ez a beállítás meghatározza, hogy a sorok hogyan legyenek tördelve. Lehetséges értékek:\n- 'off' (nincs sortörés)\n- 'on' (sortörés a nézetablakban)\n- 'wordWrapColumn' (sortörés az `editor.wordWrapColumn` oszlopnál) vagy\n- 'bounded' (sortörés az `editor.wordWrapColumn` és a nézetablak minimumánál)",
-	"wordWrapColumn": "Meghatározza a sortöréshez használt oszlopszámot a szerkesztőablakban, ha az `editor.wordWrap` értéke 'wordWrapColumn' vagy 'bounded'.",
-	"wrappingIndent": "Meghatározza a tördelt sorok behúzási szabályát. Értéke „none”, „same”, „indent” vagy „deepIndent” lehet.",
-	"mouseWheelScrollSensitivity": "Az egér görgetési eseményeinél keletkező `deltaX` és `deltaY` paraméterek szorzója",
-	"multiCursorModifier.ctrlCmd": "Windows és Linux alatt a `Control`, macOS alatt a `Command` billentyűt jelenti.",
-	"multiCursorModifier.alt": "Windows és Linux alatt az `Alt`, macOS alatt az `Option` billentyűt jelenti.",
-	"multiCursorModifier": "Több kurzor hozzáadásához használt módosítóbillentyű. A `ctrlCmd` Windows és Linux alatt a `Control`, macOS alatt a `Command` billentyűt jelenti. A Definíció megkeresése és Hivatkozás megnyitása egérgesztusok automatikusan úgy lesznek beállítva, hogy ne ütközzenek a többkurzorhoz tartozó módosítóval.",
-	"multiCursorMergeOverlapping": "Több kurzor összeolvasztása, ha azok fedik egymást.",
-	"quickSuggestions.strings": "Kiegészítési javaslatok engedélyezése karakterláncokban (stringekben)",
-	"quickSuggestions.comments": "Kiegészítési javaslatok engedélyezése megjegyzésekben",
-	"quickSuggestions.other": "Kiegészítési javaslatok engedélyezése karakterláncokon (stringeken) és megjegyzéseken kívül",
-	"quickSuggestions": "Meghatározza, hogy automatikusan megjelenjenek-e a javaslatok gépelés közben",
-	"quickSuggestionsDelay": "Meghatározza, hogy hány ezredmásodperc késleltetéssel jelenjenek meg a kiegészítési javaslatok",
-	"parameterHints": "Paraméterinformációkat és típusinformációkat tartalmazó felugró ablak engedélyezése gépelés közben",
-	"autoClosingBrackets": "Meghatározza, hogy a szerkesztő automatikusan beszúrja-e a nyitó zárójelek záró párját",
-	"formatOnType": "Meghatározza, hogy a szerkesztő automatikusan formázza-e a sort a gépelés után",
-	"formatOnPaste": "Meghatározza, hogy a szerkesztő automatikusan formázza-e a beillesztett tartalmat. Ehhez szükség van egy formázóra, illetve a formázónak tudnia kell a dokumentum egy részét formázni.",
-	"autoIndent": "Meghatározza, hogy a szerkesztőablak automatikusan állítsa-e az indentálást miközben a felhasználó gépel, beilleszt vagy mozgatja a sorokat. Az adott nyelv indentálási szabályainak rendelkezésre kell állnia.",
-	"suggestOnTriggerCharacters": "Meghatározza, hogy eseménykiváltó karakterek beírásakor automatikusan megjelenjenek-e a javaslatok",
-	"acceptSuggestionOnEnter": "Meghatározza, hogy a javaslatok az 'Enter' gomb leütésére is el legyenek fogadva a 'Tab' mellett. Segít feloldani a bizonytalanságot az új sorok beillesztése és a javaslatok elfogadása között. A 'smart' érték azt jelenti, hogy csak akkor fogadja el a javaslatot az Enter leütése esetén, ha az módosítja a szöveget.",
-	"acceptSuggestionOnCommitCharacter": "Meghatározza, hogy a javaslaok a zárókarakterek leütésére is el legyenek fogadva. A JavaScriptben például a pontosvessző (';') számít zárókarakternek, leütésére a javaslat elfogadásra kerül és beillesztődik az adott karakter. ",
-	"snippetSuggestions.top": "A javasolt kódrészletek a többi javaslat előtt jelenjenek meg.",
-	"snippetSuggestions.bottom": "A javasolt kódrészletek a többi javaslat után jelenjenek meg.",
-	"snippetSuggestions.inline": "A javasolt kódrészletek a többi javaslattal együtt jelenjenek meg.",
-	"snippetSuggestions.none": "Ne jelenjenek meg a javasolt kódrészletek.",
-	"snippetSuggestions": "Meghatározza, hogy a kódtöredékek megjelenjenek-e a javaslatok között, illetve hogy hogyan legyenek rendezve.",
-	"emptySelectionClipboard": "Meghatározza, hogy kijelölés nélküli másolás esetén a teljes sor legyen-e másolva.",
-	"wordBasedSuggestions": "Meghatározza, hogy a kiegészítések listája a dokumentumban lévő szövegek alapján legyen-e meghatározva.",
-	"suggestSelection.first": "Mindig válassza az első javaslatot.",
-	"suggestSelection.recentlyUsed": "Válasszon a legutóbbi ajánlatok közül, hacsak a további gépelés ki nem választ egyet, pl. `console.| -> console.log`, mert nem rég a `log`-ra lett kiegészítve.",
-	"suggestSelection.recentlyUsedByPrefix": "Olyan ajánlat választása, ami már korábban ki lett választva az adott előtag használata esetén, pl. `co -> console` és `con -> const`.",
-	"suggestSelection": "Meghatározza, mely javaslat van előre kiválasztva a javaslatok listájából.",
-	"suggestFontSize": "Az ajánlásokat tartalmazó modul betűmérete",
-	"suggestLineHeight": "Az ajánlásokat tartalmazó modul sormagassága",
-	"selectionHighlight": "Meghatározza, hogy a szerkesztőablakban ki legyenek-e emelve a kijelöléshez hasonló találatok",
-	"occurrencesHighlight": "Meghatározza, hogy a szerkesztőablakban ki legyenek-e emelve a szimbólum szemantikailag hozzá tartozó előfordulásai.",
-	"overviewRulerLanes": "Meghatározza, hogy hány dekoráció jelenhet meg azonos pozícióban az áttekintő sávon.",
-	"overviewRulerBorder": "Meghatározza, hogy legyen-e kerete az áttekintő sávnak.",
-	"cursorBlinking": "Meghatározza a kurzor animációjának stílusát.",
-	"mouseWheelZoom": "A szerkesztőablak betűtípusának nagyítása vagy kicsinyítése az egérgörgő Ctrl lenyomása mellett történő használata esetén",
-	"cursorStyle": "Meghatározza a kurzor stílusát. Lehetséges értékek: 'block', 'block-outline', 'line', 'line-thin', 'underline' vagy 'underline-thin'",
-	"cursorWidth": "Meghatározza a kurzor szélességét, ha az editor.cursorStyle értéke 'line'.",
-	"fontLigatures": "Engedélyezi a betűtípusban található ligatúrák használatát",
-	"hideCursorInOverviewRuler": "Meghatározza, hogy a kurzor pozíciója el legyen-e rejtve az áttekintő sávon.",
-	"renderWhitespace": "Meghatározza, hogy a szerkesztőablakban hogyan legyenek kirajzolva a szóköz karakterek. Lehetséges értékek: 'none', 'boundary', vagy 'all'. A 'boundary' beállítás esetén, ha szavak között egyetlen szóköz található, akkor az nem lesz kirajzolva.",
-	"renderControlCharacters": "Meghatározza, hogy a szerkesztőablakban ki legyenek-e rajzolva a vezérlőkarakterek.",
-	"renderIndentGuides": "Meghatározza, hogy a szerkesztőablakban ki legyenek-e rajzolva az indentálási segédvonalak.",
-	"renderLineHighlight": "Meghatározza, hogy a szerkesztőablakban hogyan legyen kirajzolva az aktuális sor kiemelése. Lehetséges értékek: 'none', 'gutter', 'line', vagy 'all'.",
-	"codeLens": "Meghatározza, hogy megjelenjenek-e a kódlencsék a szerkesztőablakban.",
-	"folding": "Meghatározza, hogy engedélyezve van-e a kódrészletek bezárása a szerkesztőablakban.",
-	"foldingStrategyAuto": "Nyelvspecifikus kódrész-bezárási stratégia használata, ha az rendelkezésre áll. Ha nem, akkor tartalékmegoldásként az indentálásalapú kódrész-bezárási stratégia használata.",
-	"foldingStrategyIndentation": "A kódrészek bezárása mindig az indentálásalapú kódrész-bezárási stratégia alapján történjen.",
-	"foldingStrategy": "Meghatározza, hogyan vannak meghatározva a bezárható kódrészek. Az 'auto' esetén a nyelvspecifikus kódbezárási stratégia van használva, ha az rendelkezésre áll. Az 'indentation' esetén minden esetben az indentálásalapú bezárási stratégia van használva.",
-	"showFoldingControls": "Meghatározza, hogy a kódrészletek bezárásához tartozó vezérlőelemek automatikusan el legyenek-e rejtve.",
-	"matchBrackets": "Zárójel kiválasztása esetén a hozzátartozó zárójel kiemelése.",
-	"glyphMargin": "Meghatározza, hogy legyen-e vertikális szimbólummargó a szerkesztőablakban. A szimbólummargó elsősorban hibakeresésnél van használva.",
-	"useTabStops": "Szóközök beillesztése és törlése során követve vannak a tabulátorok.",
-	"trimAutoWhitespace": "A sorok végén lévő, automatikusan beillesztett szóközök eltávolítása",
-	"stablePeek": "A betekintőablakok maradjanak nyitva akkor is, ha duplán kattintanak a tartalmára vagy megnyomják az Escape gombot.",
-	"dragAndDrop": "Meghatározza, hogy a szerkesztőablakban engedélyezett-e a kijelölt szövegrészletek áhelyezése húzással.",
-	"accessibilitySupport.auto": "A szerkesztő a platform által biztosított API-kat használja annak megállapításához, hogy van-e képernyőolvasó csatlakoztatva.",
-	"accessibilitySupport.on": "A szerkesztő folyamatos képernyőolvasóval való használatára van optimalizálva.",
-	"accessibilitySupport.off": "A szerkesztő soha nincs képernyőolvasó használatára optimalizálva.",
-	"accessibilitySupport": "Meghatározza, hogy a szerkesztő olyan módban fusson-e, ami optimalizálva van képernyőolvasóval való használathoz.",
-	"links": "Meghatározza, hogy a szerkesztőablak érzékelje-e a hivatkozásokat, és kattinthatóvá tegye-e őket.",
-	"colorDecorators": "Meghatározza, hogy a szerkesztőablakban ki legyenek-e rajzolva a színdekorátorok és színválasztók.",
-	"codeActions": "Engedélyezi a kódműveletek végrehajtásához használható villanykörtét",
-	"codeActionsOnSave.organizeImports": "Importálások rendezése mentés során",
-	"codeActionsOnSave": "A mentés során futtatott kódműveletek.",
-	"codeActionsOnSaveTimeout": "A mentés során futtatott kódműveletek futási időkorlátja.",
-	"selectionClipboard": "Meghatározza-e, hogy támogatva van-e az elsődleges vágólap Linux alatt",
-	"sideBySide": "Meghatározza, hogy a differenciaszerkesztő ablakban egymás mellett vagy a sorban jelenjenek meg az eltérések",
-	"ignoreTrimWhitespace": "Meghatározza, hogy a differenciaszerkesztő ablakban megjelenjenek-e a sor elején vagy végén a szóközökben talált különbségek",
-	"largeFileOptimizations": "Nagy fájlok megnyitása esetén néhány, sok memóriát használó funkció letiltása.",
-	"renderIndicators": "Meghatározza, hogy a differenciaszerkesztő ablakban megjelenjenek-e a +/- jelzők az hozzáadott/eltávolított változásoknál"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/editor/common/config/editorOptions.i18n.json b/i18n/hun/src/vs/editor/common/config/editorOptions.i18n.json
deleted file mode 100644
index 1bb41d69cef..00000000000
--- a/i18n/hun/src/vs/editor/common/config/editorOptions.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"accessibilityOffAriaLabel": "A szerkesztőablak jelenleg nem elérhető. Nyomja meg az Alt+F1-et a beállítási lehetőségek megjelenítéséhez!",
-	"editorViewAccessibleLabel": "Szerkesztőablak tartalma"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/editor/common/controller/cursor.i18n.json b/i18n/hun/src/vs/editor/common/controller/cursor.i18n.json
deleted file mode 100644
index dbbde3698d1..00000000000
--- a/i18n/hun/src/vs/editor/common/controller/cursor.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"corrupt.commands": "Váratlan kivétel történt a parancs végrehajtása közben."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/editor/common/model/textModelWithTokens.i18n.json b/i18n/hun/src/vs/editor/common/model/textModelWithTokens.i18n.json
deleted file mode 100644
index 41687561a2e..00000000000
--- a/i18n/hun/src/vs/editor/common/model/textModelWithTokens.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"mode.tokenizationSupportFailed": "Ebben az üzemmódban nem sikerült lexikális elemekre bontani a bemenetet."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/editor/common/modes/modesRegistry.i18n.json b/i18n/hun/src/vs/editor/common/modes/modesRegistry.i18n.json
deleted file mode 100644
index e71f71abb5a..00000000000
--- a/i18n/hun/src/vs/editor/common/modes/modesRegistry.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"plainText.alias": "Egyszerű szöveg"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/editor/common/services/bulkEdit.i18n.json b/i18n/hun/src/vs/editor/common/services/bulkEdit.i18n.json
deleted file mode 100644
index b0bbd29edb0..00000000000
--- a/i18n/hun/src/vs/editor/common/services/bulkEdit.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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": "A következő fájlok módosultak időközben: {0}",
-	"summary.0": "Nem történtek változtatások",
-	"summary.nm": "{0} változtatást végzett {0} fájlban",
-	"summary.n0": "{0} változtatást végzett egy fájlban"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/editor/common/services/modeServiceImpl.i18n.json b/i18n/hun/src/vs/editor/common/services/modeServiceImpl.i18n.json
deleted file mode 100644
index b85462146b6..00000000000
--- a/i18n/hun/src/vs/editor/common/services/modeServiceImpl.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"vscode.extension.contributes.languages": "Nyelvdeklarációkat szolgáltat.",
-	"vscode.extension.contributes.languages.id": "A nyelv azonosítója",
-	"vscode.extension.contributes.languages.aliases": "A nyelv kiegészítő nevei.",
-	"vscode.extension.contributes.languages.extensions": "A nyelvhez hozzárendelt fájlkiterjesztések.",
-	"vscode.extension.contributes.languages.filenames": "A nyelvhez hozzárendelt fájlnevek.",
-	"vscode.extension.contributes.languages.filenamePatterns": "A nyelvhez hozzárendelt globális minták.",
-	"vscode.extension.contributes.languages.mimetypes": "A nyelvhez hozzárendelt MIME-típusok.",
-	"vscode.extension.contributes.languages.firstLine": "Reguláris kifejezés, ami az adott nyelven írt fájl első sorára illeszkedik.",
-	"vscode.extension.contributes.languages.configuration": "A nyelvhez tartozó konfigurációkat tartalmazó fájl relatív elérési útja."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/editor/common/services/modelServiceImpl.i18n.json b/i18n/hun/src/vs/editor/common/services/modelServiceImpl.i18n.json
deleted file mode 100644
index e12a9398484..00000000000
--- a/i18n/hun/src/vs/editor/common/services/modelServiceImpl.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"diagAndSourceMultiline": "[{0}]\n{1}",
-	"diagAndSource": "[{0}] {1}"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/editor/common/view/editorColorRegistry.i18n.json b/i18n/hun/src/vs/editor/common/view/editorColorRegistry.i18n.json
deleted file mode 100644
index 4128ea8ed8c..00000000000
--- a/i18n/hun/src/vs/editor/common/view/editorColorRegistry.i18n.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"lineHighlight": "A kurzor pozícióján található sor kiemelési háttérszíne.",
-	"lineHighlightBorderBox": "A kurzor pozícióján található sor keretszíne.",
-	"rangeHighlight": "A kiemelt területek háttérszíne, pl. a gyors megnyitás és keresés funkcióknál. A színnek áttetszőnek kell lennie, hogy ne fedje el az alatta lévő dekorátorokat.",
-	"rangeHighlightBorder": "A kiemelt területek körüli keret háttérszíne.",
-	"caret": "A szerkesztőablak kurzorának színe.",
-	"editorCursorBackground": "A szerkesztőablak kurzorának háttérszíne. Lehetővé teszik az olyan karakterek színének módosítását, amelyek fölött egy blokk-típusú kurzor áll.",
-	"editorWhitespaces": "A szerkesztőablakban található szóköz karakterek színe.",
-	"editorIndentGuides": "A szerkesztőablak segédvonalainak színe.",
-	"editorActiveIndentGuide": "Az aktív szerkesztőablak segédvonalainak színe.",
-	"editorLineNumbers": "A szerkesztőablak sorszámainak színe.",
-	"editorActiveLineNumber": "A szerkesztőablak aktív sorához tartozó sorszám színe.",
-	"deprecatedEditorActiveLineNumber": "Az Id elavult. Használja helyette az 'editorLineNumber.activeForeground' beállítást!",
-	"editorRuler": "A szerkesztőablak sávjainak színe.",
-	"editorCodeLensForeground": "A szerkesztőablakban található kódlencsék előtérszíne",
-	"editorBracketMatchBackground": "Hozzátartozó zárójelek háttérszíne",
-	"editorBracketMatchBorder": "Az összetartozó zárójelek dobozának színe",
-	"editorOverviewRulerBorder": "Az áttekintő sáv keretszíne.",
-	"editorGutter": "A szerkesztőablag margójának háttérszíne. A margón található a szimbólummargó és a sorszámok.",
-	"errorForeground": "A hibákat jelző hullámvonal előtérszíne a szerkesztőablakban.",
-	"errorBorder": "A hibákat jelző hullámvonal keretszíne a szerkesztőablakban.",
-	"warningForeground": "A figyelmeztetéseket jelző hullámvonal előtérszíne a szerkesztőablakban.",
-	"warningBorder": "A figyelmeztetéseket jelző hullámvonal keretszíne a szerkesztőablakban.",
-	"infoForeground": "Az információkat jelző hullámvonal előtérszíne a szerkesztőablakban.",
-	"infoBorder": "Az információkat jelző hullámvonal keretszíne a szerkesztőablakban. ",
-	"hintForeground": "Az utalásokat jelző hullámvonal előtérszíne a szerkesztőablakban.",
-	"hintBorder": "Az utalásokat jelző hullámvonal keretszíne a szerkesztőablakban.",
-	"unnecessaryForeground": "A szükségtelen kódrészletek előtérszíne a szerkesztőablakban.",
-	"overviewRulerRangeHighlight": "A kiemelt területeket jelölő jelzések színe az áttekintősávon. A színnek áttetszőnek kell lennie, hogy ne fedje el az alatta lévő dekorátorokat.",
-	"overviewRuleError": "A hibákat jelölő jelzések színe az áttekintősávon.",
-	"overviewRuleWarning": "A figyelmeztetéseket jelölő jelzések színe az áttekintősávon.",
-	"overviewRuleInfo": "Az információkat jelölő jelzések színe az áttekintősávon."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/editor/contrib/bracketMatching/bracketMatching.i18n.json b/i18n/hun/src/vs/editor/contrib/bracketMatching/bracketMatching.i18n.json
deleted file mode 100644
index 97de1ae0872..00000000000
--- a/i18n/hun/src/vs/editor/contrib/bracketMatching/bracketMatching.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"overviewRulerBracketMatchForeground": "Kapcsolódó zárójeleket jelölő jelzések színe az áttekintősávon.",
-	"smartSelect.jumpBracket": "Ugrás a zárójelre",
-	"smartSelect.selectToBracket": "Kijelölés a zárójelig"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/editor/contrib/bracketMatching/common/bracketMatching.i18n.json b/i18n/hun/src/vs/editor/contrib/bracketMatching/common/bracketMatching.i18n.json
deleted file mode 100644
index 647a263affc..00000000000
--- a/i18n/hun/src/vs/editor/contrib/bracketMatching/common/bracketMatching.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"smartSelect.jumpBracket": "Ugrás a zárójelre"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/editor/contrib/caretOperations/caretOperations.i18n.json b/i18n/hun/src/vs/editor/contrib/caretOperations/caretOperations.i18n.json
deleted file mode 100644
index 90588c1d196..00000000000
--- a/i18n/hun/src/vs/editor/contrib/caretOperations/caretOperations.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"caret.moveLeft": "Kurzor mozgatása balra",
-	"caret.moveRight": "Kurzor mozgatása jobbra"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/editor/contrib/caretOperations/common/caretOperations.i18n.json b/i18n/hun/src/vs/editor/contrib/caretOperations/common/caretOperations.i18n.json
deleted file mode 100644
index 1fc37d07684..00000000000
--- a/i18n/hun/src/vs/editor/contrib/caretOperations/common/caretOperations.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"caret.moveLeft": "Kurzor mozgatása balra",
-	"caret.moveRight": "Kurzor mozgatása jobbra"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/editor/contrib/caretOperations/common/transpose.i18n.json b/i18n/hun/src/vs/editor/contrib/caretOperations/common/transpose.i18n.json
deleted file mode 100644
index e8cbbca5cf4..00000000000
--- a/i18n/hun/src/vs/editor/contrib/caretOperations/common/transpose.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"transposeLetters.label": "Betűk megcserélése"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/editor/contrib/caretOperations/transpose.i18n.json b/i18n/hun/src/vs/editor/contrib/caretOperations/transpose.i18n.json
deleted file mode 100644
index 1955ff2efa3..00000000000
--- a/i18n/hun/src/vs/editor/contrib/caretOperations/transpose.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"transposeLetters.label": "Betűk megcserélése"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/editor/contrib/clipboard/browser/clipboard.i18n.json b/i18n/hun/src/vs/editor/contrib/clipboard/browser/clipboard.i18n.json
deleted file mode 100644
index 09439c237cb..00000000000
--- a/i18n/hun/src/vs/editor/contrib/clipboard/browser/clipboard.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"actions.clipboard.cutLabel": "Kivágás",
-	"actions.clipboard.copyLabel": "Másolás",
-	"actions.clipboard.pasteLabel": "Beillesztés",
-	"actions.clipboard.copyWithSyntaxHighlightingLabel": "Másolás szintaktikai kiemeléssel"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/editor/contrib/clipboard/clipboard.i18n.json b/i18n/hun/src/vs/editor/contrib/clipboard/clipboard.i18n.json
deleted file mode 100644
index 7a0fc48d999..00000000000
--- a/i18n/hun/src/vs/editor/contrib/clipboard/clipboard.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"actions.clipboard.cutLabel": "Kivágás",
-	"actions.clipboard.copyLabel": "Másolás",
-	"actions.clipboard.pasteLabel": "Beillesztés",
-	"actions.clipboard.copyWithSyntaxHighlightingLabel": "Másolás szintaktikai kiemeléssel"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/editor/contrib/codeAction/codeActionCommands.i18n.json b/i18n/hun/src/vs/editor/contrib/codeAction/codeActionCommands.i18n.json
deleted file mode 100644
index 5132aa7d400..00000000000
--- a/i18n/hun/src/vs/editor/contrib/codeAction/codeActionCommands.i18n.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"quickFixWithKb": "Javítások megjelenítése ({0})",
-	"quickFix": "Javítások megjelenítése",
-	"quickfix.trigger.label": "Gyorsjavítás...",
-	"editor.action.quickFix.noneMessage": "Nem áll rendelkezésre kódművelet",
-	"refactor.label": "Refaktorálás...",
-	"editor.action.refactor.noneMessage": "Nem áll rendelkezésre refaktorálási lehetőség",
-	"source.label": "Forrásművelet...",
-	"editor.action.source.noneMessage": "Nem áll rendelkezésre forrásművelet",
-	"organizeImports.label": "Importálások rendezése",
-	"editor.action.organize.noneMessage": "Nem áll rendelkezésre importálások rendezésére szolgáló művelet"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/editor/contrib/comment/comment.i18n.json b/i18n/hun/src/vs/editor/contrib/comment/comment.i18n.json
deleted file mode 100644
index f47d6a6762f..00000000000
--- a/i18n/hun/src/vs/editor/contrib/comment/comment.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"comment.line": "Egysoros megjegyzés ki-/bekapcsolása",
-	"comment.line.add": "Egysoros megjegyzés hozzáadása",
-	"comment.line.remove": "Egysoros megjegyzés eltávolítása",
-	"comment.block": "Megjegyzésblokk ki-/bekapcsolása"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/editor/contrib/comment/common/comment.i18n.json b/i18n/hun/src/vs/editor/contrib/comment/common/comment.i18n.json
deleted file mode 100644
index 219553bdc4e..00000000000
--- a/i18n/hun/src/vs/editor/contrib/comment/common/comment.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"comment.line": "Egysoros megjegyzés ki-/bekapcsolása",
-	"comment.line.add": "Egysoros megjegyzés hozzáadása",
-	"comment.line.remove": "Egysoros megjegyzés eltávolítása",
-	"comment.block": "Megjegyzésblokk ki-/bekapcsolása"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/editor/contrib/contextmenu/browser/contextmenu.i18n.json b/i18n/hun/src/vs/editor/contrib/contextmenu/browser/contextmenu.i18n.json
deleted file mode 100644
index 78d9a20aae1..00000000000
--- a/i18n/hun/src/vs/editor/contrib/contextmenu/browser/contextmenu.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"action.showContextMenu.label": "Szerkesztőablak helyi menüjének megjelenítése"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/editor/contrib/contextmenu/contextmenu.i18n.json b/i18n/hun/src/vs/editor/contrib/contextmenu/contextmenu.i18n.json
deleted file mode 100644
index 68c9e4b2177..00000000000
--- a/i18n/hun/src/vs/editor/contrib/contextmenu/contextmenu.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"action.showContextMenu.label": "Szerkesztőablak helyi menüjének megjelenítése"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/editor/contrib/find/browser/findWidget.i18n.json b/i18n/hun/src/vs/editor/contrib/find/browser/findWidget.i18n.json
deleted file mode 100644
index 02c1e20d0be..00000000000
--- a/i18n/hun/src/vs/editor/contrib/find/browser/findWidget.i18n.json
+++ /dev/null
@@ -1,21 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"label.find": "Keresés",
-	"placeholder.find": "Keresés",
-	"label.previousMatchButton": "Előző találat",
-	"label.nextMatchButton": "Következő találat",
-	"label.toggleSelectionFind": "Keresés kijelölésben",
-	"label.closeButton": "Bezárás",
-	"label.replace": "Csere",
-	"placeholder.replace": "Csere",
-	"label.replaceButton": "Csere",
-	"label.replaceAllButton": "Az összes előfordulás cseréje",
-	"label.toggleReplaceButton": "Váltás csere módra",
-	"title.matchesCountLimit": "Csak az első {0} találat van kiemelve, de minden keresési művelet a teljes szöveggel dolgozik.",
-	"label.matchesLocation": "{0} (összesen {1})",
-	"label.noResults": "Nincs eredmény"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/editor/contrib/find/browser/simpleFindWidget.i18n.json b/i18n/hun/src/vs/editor/contrib/find/browser/simpleFindWidget.i18n.json
deleted file mode 100644
index 2d5b3af7ef7..00000000000
--- a/i18n/hun/src/vs/editor/contrib/find/browser/simpleFindWidget.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"label.find": "Keresés",
-	"placeholder.find": "Keresés",
-	"label.previousMatchButton": "Előző találat",
-	"label.nextMatchButton": "Következő találat",
-	"label.closeButton": "Bezárás"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/editor/contrib/find/common/findController.i18n.json b/i18n/hun/src/vs/editor/contrib/find/common/findController.i18n.json
deleted file mode 100644
index 6e1f33bceda..00000000000
--- a/i18n/hun/src/vs/editor/contrib/find/common/findController.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"startFindAction": "Keresés",
-	"findNextMatchAction": "Következő találat",
-	"findPreviousMatchAction": "Előző találat",
-	"nextSelectionMatchFindAction": "Következő kijelölés",
-	"previousSelectionMatchFindAction": "Előző kijelölés",
-	"startReplace": "Csere",
-	"showNextFindTermAction": "Következő keresési kifejezés megjelenítése",
-	"showPreviousFindTermAction": "Előző keresési kifejezés megjelenítése"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/editor/contrib/find/findController.i18n.json b/i18n/hun/src/vs/editor/contrib/find/findController.i18n.json
deleted file mode 100644
index 7615f069af8..00000000000
--- a/i18n/hun/src/vs/editor/contrib/find/findController.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"startFindAction": "Keresés",
-	"startFindWithSelectionAction": "Keresés kijelöléssel",
-	"findNextMatchAction": "Következő találat",
-	"findPreviousMatchAction": "Előző találat",
-	"nextSelectionMatchFindAction": "Következő kijelölés",
-	"previousSelectionMatchFindAction": "Előző kijelölés",
-	"startReplace": "Csere",
-	"showNextFindTermAction": "Következő keresési kifejezés megjelenítése",
-	"showPreviousFindTermAction": "Előző keresési kifejezés megjelenítése"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/editor/contrib/find/findWidget.i18n.json b/i18n/hun/src/vs/editor/contrib/find/findWidget.i18n.json
deleted file mode 100644
index 1931a84eaaf..00000000000
--- a/i18n/hun/src/vs/editor/contrib/find/findWidget.i18n.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"label.find": "Keresés",
-	"placeholder.find": "Keresés",
-	"label.previousMatchButton": "Előző találat",
-	"label.nextMatchButton": "Következő találat",
-	"label.toggleSelectionFind": "Keresés kijelölésben",
-	"label.closeButton": "Bezárás",
-	"label.replace": "Csere",
-	"placeholder.replace": "Csere",
-	"label.replaceButton": "Csere",
-	"label.replaceAllButton": "Összes cseréje",
-	"label.toggleReplaceButton": "Váltás csere módra",
-	"title.matchesCountLimit": "Csak az első {0} találat van kiemelve, de minden keresési művelet a teljes szöveggel dolgozik.",
-	"label.matchesLocation": "{0} (összesen {1})",
-	"label.noResults": "Nincs eredmény"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/editor/contrib/find/simpleFindWidget.i18n.json b/i18n/hun/src/vs/editor/contrib/find/simpleFindWidget.i18n.json
deleted file mode 100644
index a6550f6d5a9..00000000000
--- a/i18n/hun/src/vs/editor/contrib/find/simpleFindWidget.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"label.find": "Keresés",
-	"placeholder.find": "Keresés",
-	"label.previousMatchButton": "Előző találat",
-	"label.nextMatchButton": "Következő találat",
-	"label.closeButton": "Bezárás"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/editor/contrib/folding/browser/folding.i18n.json b/i18n/hun/src/vs/editor/contrib/folding/browser/folding.i18n.json
deleted file mode 100644
index 07da29ad41a..00000000000
--- a/i18n/hun/src/vs/editor/contrib/folding/browser/folding.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"unfoldAction.label": "Kibontás",
-	"unFoldRecursivelyAction.label": "Kibontás rekurzívan",
-	"foldAction.label": "Bezárás",
-	"foldRecursivelyAction.label": "Bezárás rekurzívan",
-	"foldAllAction.label": "Az összes bezárása",
-	"unfoldAllAction.label": "Az összes kinyitása",
-	"foldLevelAction.label": "{0} szintű blokkok bezárása"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/editor/contrib/folding/folding.i18n.json b/i18n/hun/src/vs/editor/contrib/folding/folding.i18n.json
deleted file mode 100644
index 9db50f44e4c..00000000000
--- a/i18n/hun/src/vs/editor/contrib/folding/folding.i18n.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"unfoldAction.label": "Kibontás",
-	"unFoldRecursivelyAction.label": "Kibontás rekurzívan",
-	"foldAction.label": "Bezárás",
-	"foldRecursivelyAction.label": "Bezárás rekurzívan",
-	"foldAllBlockComments.label": "Összes megjegyzésblokk bezárása",
-	"foldAllMarkerRegions.label": "Összes tartomány bezárása",
-	"unfoldAllMarkerRegions.label": "Összes régió kinyitása",
-	"foldAllAction.label": "Az összes bezárása",
-	"unfoldAllAction.label": "Az összes kinyitása",
-	"foldLevelAction.label": "{0} szintű blokkok bezárása"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/editor/contrib/fontZoom/fontZoom.i18n.json b/i18n/hun/src/vs/editor/contrib/fontZoom/fontZoom.i18n.json
deleted file mode 100644
index 1d9d72367ae..00000000000
--- a/i18n/hun/src/vs/editor/contrib/fontZoom/fontZoom.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"EditorFontZoomIn.label": "Szerkesztőablak betűtípusának nagyítása",
-	"EditorFontZoomOut.label": "Szerkesztőablak betűtípusának kicsinyítése",
-	"EditorFontZoomReset.label": "Szerkesztőablak betűtípusának visszaállítása"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/editor/contrib/format/browser/formatActions.i18n.json b/i18n/hun/src/vs/editor/contrib/format/browser/formatActions.i18n.json
deleted file mode 100644
index 7b8c9186b0f..00000000000
--- a/i18n/hun/src/vs/editor/contrib/format/browser/formatActions.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"hint11": "Egy formázást végzett a(z) {0}. sorban",
-	"hintn1": "{0} formázást végzett a(z) {1}. sorban",
-	"hint1n": "Egy formázást végzett a(z) {0}. és {1}. sorok között",
-	"hintnn": "{0} formázást végzett a(z) {1}. és {2}. sorok között",
-	"no.provider": "Sajnáljuk, de nincs formázó telepítve a(z) '{0}' típusú fájlokhoz.",
-	"formatDocument.label": "Dokumentum formázása",
-	"formatSelection.label": "Kijelölt tartalom formázása"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/editor/contrib/format/formatActions.i18n.json b/i18n/hun/src/vs/editor/contrib/format/formatActions.i18n.json
deleted file mode 100644
index 0fa3827f356..00000000000
--- a/i18n/hun/src/vs/editor/contrib/format/formatActions.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hint11": "Egy formázást végzett a(z) {0}. sorban",
-	"hintn1": "{0} formázást végzett a(z) {1}. sorban",
-	"hint1n": "Egy formázást végzett a(z) {0}. és {1}. sorok között",
-	"hintnn": "{0} formázást végzett a(z) {1}. és {2}. sorok között",
-	"no.provider": "Nincs formázó telepítve a(z) '{0}' típusú fájlokhoz.",
-	"formatDocument.label": "Dokumentum formázása",
-	"no.documentprovider": "Nincs dokumentumformázó telepítve a(z) '{0}' típusú fájlokhoz.",
-	"formatSelection.label": "Kijelölt tartalom formázása",
-	"no.selectionprovider": "Nincs kijelölésformázó telepítve a(z) '{0}' típusú fájlokhoz."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/editor/contrib/goToDeclaration/browser/goToDeclarationCommands.i18n.json b/i18n/hun/src/vs/editor/contrib/goToDeclaration/browser/goToDeclarationCommands.i18n.json
deleted file mode 100644
index 50e0679aba9..00000000000
--- a/i18n/hun/src/vs/editor/contrib/goToDeclaration/browser/goToDeclarationCommands.i18n.json
+++ /dev/null
@@ -1,23 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"noResultWord": "Nem található a(z) '{0}' definíciója",
-	"generic.noResults": "Definíció nem található",
-	"meta.title": " – {0} definíció",
-	"actions.goToDecl.label": "Ugrás a definícióra",
-	"actions.goToDeclToSide.label": "Definíció megnyitása oldalt",
-	"actions.previewDecl.label": "Betekintés a definícióba",
-	"goToImplementation.noResultWord": "Nem található a(z) '{0}' implementációja",
-	"goToImplementation.generic.noResults": "Implementáció nem található",
-	"meta.implementations.title": " – {0} implementáció",
-	"actions.goToImplementation.label": "Ugrás az implementációra",
-	"actions.peekImplementation.label": "Betekintés az implementációba",
-	"goToTypeDefinition.noResultWord": "Nem található a(z) '{0}' típusdefiníciója",
-	"goToTypeDefinition.generic.noResults": "Típusdefiníció nem található",
-	"meta.typeDefinitions.title": " – {0} típusdefiníció",
-	"actions.goToTypeDefinition.label": "Ugrás a típusdefinícióra",
-	"actions.peekTypeDefinition.label": "Betekintés a típusdefinícióba"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/editor/contrib/goToDeclaration/browser/goToDeclarationMouse.i18n.json b/i18n/hun/src/vs/editor/contrib/goToDeclaration/browser/goToDeclarationMouse.i18n.json
deleted file mode 100644
index 782190fef04..00000000000
--- a/i18n/hun/src/vs/editor/contrib/goToDeclaration/browser/goToDeclarationMouse.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"multipleResults": "Kattintson {0} definíció megjelenítéséhez."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/editor/contrib/goToDeclaration/goToDeclarationCommands.i18n.json b/i18n/hun/src/vs/editor/contrib/goToDeclaration/goToDeclarationCommands.i18n.json
deleted file mode 100644
index 5211668b117..00000000000
--- a/i18n/hun/src/vs/editor/contrib/goToDeclaration/goToDeclarationCommands.i18n.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noResultWord": "Nem található a(z) '{0}' definíciója",
-	"generic.noResults": "Definíció nem található",
-	"meta.title": " – {0} definíció",
-	"actions.goToDecl.label": "Ugrás a definícióra",
-	"actions.goToDeclToSide.label": "Definíció megnyitása oldalt",
-	"actions.previewDecl.label": "Betekintés a definícióba",
-	"goToImplementation.noResultWord": "Nem található a(z) '{0}' implementációja",
-	"goToImplementation.generic.noResults": "Implementáció nem található",
-	"meta.implementations.title": " – {0} implementáció",
-	"actions.goToImplementation.label": "Ugrás az implementációra",
-	"actions.peekImplementation.label": "Betekintés az implementációba",
-	"goToTypeDefinition.noResultWord": "Nem található a(z) '{0}' típusdefiníciója",
-	"goToTypeDefinition.generic.noResults": "Típusdefiníció nem található",
-	"meta.typeDefinitions.title": " – {0} típusdefiníció",
-	"actions.goToTypeDefinition.label": "Ugrás a típusdefinícióra",
-	"actions.peekTypeDefinition.label": "Betekintés a típusdefinícióba"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/editor/contrib/goToDeclaration/goToDeclarationMouse.i18n.json b/i18n/hun/src/vs/editor/contrib/goToDeclaration/goToDeclarationMouse.i18n.json
deleted file mode 100644
index 814c36ccbf9..00000000000
--- a/i18n/hun/src/vs/editor/contrib/goToDeclaration/goToDeclarationMouse.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"multipleResults": "Kattintson {0} definíció megjelenítéséhez."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/editor/contrib/goToDefinition/goToDefinitionCommands.i18n.json b/i18n/hun/src/vs/editor/contrib/goToDefinition/goToDefinitionCommands.i18n.json
deleted file mode 100644
index 5211668b117..00000000000
--- a/i18n/hun/src/vs/editor/contrib/goToDefinition/goToDefinitionCommands.i18n.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noResultWord": "Nem található a(z) '{0}' definíciója",
-	"generic.noResults": "Definíció nem található",
-	"meta.title": " – {0} definíció",
-	"actions.goToDecl.label": "Ugrás a definícióra",
-	"actions.goToDeclToSide.label": "Definíció megnyitása oldalt",
-	"actions.previewDecl.label": "Betekintés a definícióba",
-	"goToImplementation.noResultWord": "Nem található a(z) '{0}' implementációja",
-	"goToImplementation.generic.noResults": "Implementáció nem található",
-	"meta.implementations.title": " – {0} implementáció",
-	"actions.goToImplementation.label": "Ugrás az implementációra",
-	"actions.peekImplementation.label": "Betekintés az implementációba",
-	"goToTypeDefinition.noResultWord": "Nem található a(z) '{0}' típusdefiníciója",
-	"goToTypeDefinition.generic.noResults": "Típusdefiníció nem található",
-	"meta.typeDefinitions.title": " – {0} típusdefiníció",
-	"actions.goToTypeDefinition.label": "Ugrás a típusdefinícióra",
-	"actions.peekTypeDefinition.label": "Betekintés a típusdefinícióba"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/editor/contrib/goToDefinition/goToDefinitionMouse.i18n.json b/i18n/hun/src/vs/editor/contrib/goToDefinition/goToDefinitionMouse.i18n.json
deleted file mode 100644
index 814c36ccbf9..00000000000
--- a/i18n/hun/src/vs/editor/contrib/goToDefinition/goToDefinitionMouse.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"multipleResults": "Kattintson {0} definíció megjelenítéséhez."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/editor/contrib/gotoError/browser/gotoError.i18n.json b/i18n/hun/src/vs/editor/contrib/gotoError/browser/gotoError.i18n.json
deleted file mode 100644
index e3ec625549e..00000000000
--- a/i18n/hun/src/vs/editor/contrib/gotoError/browser/gotoError.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"title.wo_source": "({0}/{1})",
-	"markerAction.next.label": "Következő hiba vagy figyelmeztetés",
-	"markerAction.previous.label": "Előző hiba vagy figyelmeztetés",
-	"editorMarkerNavigationError": "A szerkesztőablak jelzőnavigációs moduljának színe hiba esetén.",
-	"editorMarkerNavigationWarning": "A szerkesztőablak jelzőnavigációs moduljának színe figyelmeztetés esetén.",
-	"editorMarkerNavigationInfo": "A szerkesztőablak jelzőnavigációs moduljának színe információ esetén.",
-	"editorMarkerNavigationBackground": "A szerkesztőablak jelzőnavigációs moduljának háttérszíne."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/editor/contrib/gotoError/gotoError.i18n.json b/i18n/hun/src/vs/editor/contrib/gotoError/gotoError.i18n.json
deleted file mode 100644
index 5f21b0406da..00000000000
--- a/i18n/hun/src/vs/editor/contrib/gotoError/gotoError.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"markerAction.next.label": "Következő probléma (hiba, figyelmeztetés, információ)",
-	"markerAction.previous.label": "Előző probléma (hiba, figyelmeztetés, információ)",
-	"markerAction.nextInFiles.label": "Következő probléma a fájlokban (hiba, figyelmeztetés, információ)",
-	"markerAction.previousInFiles.label": "Előző probléma a fájlokban (hiba, figyelmeztetés, információ)"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json b/i18n/hun/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json
deleted file mode 100644
index 60534d6d43e..00000000000
--- a/i18n/hun/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"title.wo_source": "({0}/{1})",
-	"editorMarkerNavigationError": "A szerkesztőablak jelzőnavigációs moduljának színe hiba esetén.",
-	"editorMarkerNavigationWarning": "A szerkesztőablak jelzőnavigációs moduljának színe figyelmeztetés esetén.",
-	"editorMarkerNavigationInfo": "A szerkesztőablak jelzőnavigációs moduljának színe információ esetén.",
-	"editorMarkerNavigationBackground": "A szerkesztőablak jelzőnavigációs moduljának háttérszíne."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/editor/contrib/hover/browser/hover.i18n.json b/i18n/hun/src/vs/editor/contrib/hover/browser/hover.i18n.json
deleted file mode 100644
index e9de48281ee..00000000000
--- a/i18n/hun/src/vs/editor/contrib/hover/browser/hover.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"showHover": "Súgószöveg megjelenítése"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/editor/contrib/hover/browser/modesContentHover.i18n.json b/i18n/hun/src/vs/editor/contrib/hover/browser/modesContentHover.i18n.json
deleted file mode 100644
index a9cab1dd0d5..00000000000
--- a/i18n/hun/src/vs/editor/contrib/hover/browser/modesContentHover.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"modesContentHover.loading": "Betöltés..."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/editor/contrib/hover/hover.i18n.json b/i18n/hun/src/vs/editor/contrib/hover/hover.i18n.json
deleted file mode 100644
index 491e9b5238b..00000000000
--- a/i18n/hun/src/vs/editor/contrib/hover/hover.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"showHover": "Súgószöveg megjelenítése"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/editor/contrib/hover/modesContentHover.i18n.json b/i18n/hun/src/vs/editor/contrib/hover/modesContentHover.i18n.json
deleted file mode 100644
index 5bac09f1036..00000000000
--- a/i18n/hun/src/vs/editor/contrib/hover/modesContentHover.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"modesContentHover.loading": "Betöltés..."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/editor/contrib/inPlaceReplace/common/inPlaceReplace.i18n.json b/i18n/hun/src/vs/editor/contrib/inPlaceReplace/common/inPlaceReplace.i18n.json
deleted file mode 100644
index 0339e509b33..00000000000
--- a/i18n/hun/src/vs/editor/contrib/inPlaceReplace/common/inPlaceReplace.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"InPlaceReplaceAction.previous.label": "Csere az előző értékre",
-	"InPlaceReplaceAction.next.label": "Csere a következő értékre"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/editor/contrib/inPlaceReplace/inPlaceReplace.i18n.json b/i18n/hun/src/vs/editor/contrib/inPlaceReplace/inPlaceReplace.i18n.json
deleted file mode 100644
index cca3d400789..00000000000
--- a/i18n/hun/src/vs/editor/contrib/inPlaceReplace/inPlaceReplace.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"InPlaceReplaceAction.previous.label": "Csere az előző értékre",
-	"InPlaceReplaceAction.next.label": "Csere a következő értékre"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/editor/contrib/indentation/common/indentation.i18n.json b/i18n/hun/src/vs/editor/contrib/indentation/common/indentation.i18n.json
deleted file mode 100644
index 4b8870d20ac..00000000000
--- a/i18n/hun/src/vs/editor/contrib/indentation/common/indentation.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"indentationToSpaces": "Indentálások átalakítása szóközökké",
-	"indentationToTabs": "Indentálások átalakítása tabulátorokká",
-	"configuredTabSize": "Beállított tabulátorméret",
-	"selectTabWidth": "Tabulátorméret kiválasztása az aktuális fájlhoz",
-	"indentUsingTabs": "Indentálás tabulátorral",
-	"indentUsingSpaces": "Indentálás szóközzel",
-	"detectIndentation": "Indentálás felismerése a tartalom alapján",
-	"editor.reindentlines": "Sorok újraindentálása"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/editor/contrib/indentation/indentation.i18n.json b/i18n/hun/src/vs/editor/contrib/indentation/indentation.i18n.json
deleted file mode 100644
index f6cc808dfc2..00000000000
--- a/i18n/hun/src/vs/editor/contrib/indentation/indentation.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"indentationToSpaces": "Indentálások átalakítása szóközökké",
-	"indentationToTabs": "Indentálások átalakítása tabulátorokká",
-	"configuredTabSize": "Beállított tabulátorméret",
-	"selectTabWidth": "Tabulátorméret kiválasztása az aktuális fájlhoz",
-	"indentUsingTabs": "Indentálás tabulátorral",
-	"indentUsingSpaces": "Indentálás szóközzel",
-	"detectIndentation": "Indentálás felismerése a tartalom alapján",
-	"editor.reindentlines": "Sorok újraindentálása",
-	"editor.reindentselectedlines": "Kijelölt sorok újraindentálása "
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/editor/contrib/linesOperations/common/linesOperations.i18n.json b/i18n/hun/src/vs/editor/contrib/linesOperations/common/linesOperations.i18n.json
deleted file mode 100644
index d5c935359b0..00000000000
--- a/i18n/hun/src/vs/editor/contrib/linesOperations/common/linesOperations.i18n.json
+++ /dev/null
@@ -1,25 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"lines.copyUp": "Sor másolása eggyel feljebb",
-	"lines.copyDown": "Sor másolása eggyel lejjebb",
-	"lines.moveUp": "Sor feljebb helyezése",
-	"lines.moveDown": "Sor lejjebb helyezése",
-	"lines.sortAscending": "Rendezés növekvő sorrendben",
-	"lines.sortDescending": "Rendezés csökkenő sorrendben",
-	"lines.trimTrailingWhitespace": "Sor végén található szóközök levágása",
-	"lines.delete": "Sor törlése",
-	"lines.indent": "Sor behúzása",
-	"lines.outdent": "Sor kihúzása",
-	"lines.insertBefore": "Sor beszúrása eggyel feljebb",
-	"lines.insertAfter": "Sor beszúrása eggyel lejjebb",
-	"lines.deleteAllLeft": "Balra lévő tartalom törlése",
-	"lines.deleteAllRight": "Jobbra lévő tartalom törlése",
-	"lines.joinLines": "Sorok egyesítése",
-	"editor.transpose": "A kurzor körüli karakterek felcserélése",
-	"editor.transformToUppercase": "Átalakítás nagybetűssé",
-	"editor.transformToLowercase": "Átalakítás kisbetűssé"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/editor/contrib/linesOperations/linesOperations.i18n.json b/i18n/hun/src/vs/editor/contrib/linesOperations/linesOperations.i18n.json
deleted file mode 100644
index fb6bfdcd9fe..00000000000
--- a/i18n/hun/src/vs/editor/contrib/linesOperations/linesOperations.i18n.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"lines.copyUp": "Sor másolása eggyel feljebb",
-	"lines.copyDown": "Sor másolása eggyel lejjebb",
-	"lines.moveUp": "Sor feljebb helyezése",
-	"lines.moveDown": "Sor lejjebb helyezése",
-	"lines.sortAscending": "Rendezés növekvő sorrendben",
-	"lines.sortDescending": "Rendezés csökkenő sorrendben",
-	"lines.trimTrailingWhitespace": "Sor végén található szóközök levágása",
-	"lines.delete": "Sor törlése",
-	"lines.indent": "Sor behúzása",
-	"lines.outdent": "Sor kihúzása",
-	"lines.insertBefore": "Sor beszúrása eggyel feljebb",
-	"lines.insertAfter": "Sor beszúrása eggyel lejjebb",
-	"lines.deleteAllLeft": "Balra lévő tartalom törlése",
-	"lines.deleteAllRight": "Jobbra lévő tartalom törlése",
-	"lines.joinLines": "Sorok egyesítése",
-	"editor.transpose": "A kurzor körüli karakterek felcserélése",
-	"editor.transformToUppercase": "Átalakítás nagybetűssé",
-	"editor.transformToLowercase": "Átalakítás kisbetűssé"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/editor/contrib/links/browser/links.i18n.json b/i18n/hun/src/vs/editor/contrib/links/browser/links.i18n.json
deleted file mode 100644
index 543b55fd2ed..00000000000
--- a/i18n/hun/src/vs/editor/contrib/links/browser/links.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"links.navigate.mac": "Hivatkozott oldal megnyitása Cmd + kattintás paranccsal",
-	"links.navigate": "Hivatkozott oldal megnyitása Ctrl + kattintás paranccsal",
-	"links.command.mac": "Cmd + kattintás a parancs végrehajtásához",
-	"links.command": "Ctrl + kattintás a parancs végrehajtásához",
-	"links.navigate.al": "Hivatkozás megnyitása Alt + kattintás paranccsal",
-	"links.command.al": "Alt + kattintás a parancs végrehajtásához",
-	"invalid.url": "A hivatkozást nem sikerült megnyitni, mert nem jól formázott: {0}",
-	"missing.url": "A hivatkozást nem sikerült megnyitni, hiányzik a célja.",
-	"label": "Hivatkozás megnyitása"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/editor/contrib/links/links.i18n.json b/i18n/hun/src/vs/editor/contrib/links/links.i18n.json
deleted file mode 100644
index 30783c4f104..00000000000
--- a/i18n/hun/src/vs/editor/contrib/links/links.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"links.navigate.mac": "Hivatkozás megnyitása Ctrl + kattintás paranccsal",
-	"links.navigate": "Hivatkozott oldal megnyitása Ctrl + kattintás paranccsal",
-	"links.command.mac": "Cmd + kattintás a parancs végrehajtásához",
-	"links.command": "Ctrl + kattintás a parancs végrehajtásához",
-	"links.navigate.al.mac": "Hivatkozás megnyitása az Option + kattintás paranccsal",
-	"links.navigate.al": "Hivatkozás megnyitása Alt + kattintás paranccsal",
-	"links.command.al.mac": "Option + kattintás a parancs végrehajtásához",
-	"links.command.al": "Alt + kattintás a parancs végrehajtásához",
-	"invalid.url": "A hivatkozást nem sikerült megnyitni, mert nem jól formázott: {0}",
-	"missing.url": "A hivatkozást nem sikerült megnyitni, hiányzik a célja.",
-	"label": "Hivatkozás megnyitása"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/editor/contrib/message/messageController.i18n.json b/i18n/hun/src/vs/editor/contrib/message/messageController.i18n.json
deleted file mode 100644
index 4b62af37a2b..00000000000
--- a/i18n/hun/src/vs/editor/contrib/message/messageController.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"editor.readonly": "Nem lehet szerkeszteni egy csak olvasható szerkesztőablakban"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/editor/contrib/multicursor/common/multicursor.i18n.json b/i18n/hun/src/vs/editor/contrib/multicursor/common/multicursor.i18n.json
deleted file mode 100644
index f50dc975843..00000000000
--- a/i18n/hun/src/vs/editor/contrib/multicursor/common/multicursor.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"mutlicursor.insertAbove": "Kurzor beszúrása egy sorral feljebb",
-	"mutlicursor.insertBelow": "Kurzor beszúrása egy sorral lejjebb",
-	"mutlicursor.insertAtEndOfEachLineSelected": "Kurzor beszúrása a sorok végére",
-	"addSelectionToNextFindMatch": "Kijelölés hozzáadása a következő keresési találathoz",
-	"addSelectionToPreviousFindMatch": "Kijelölés hozzáadása az előző keresési találathoz",
-	"moveSelectionToNextFindMatch": "Utolsó kijelölés áthelyezése a következő keresési találatra",
-	"moveSelectionToPreviousFindMatch": "Utolsó kijelölés áthelyezése az előző keresési találatra",
-	"selectAllOccurrencesOfFindMatch": "Az összes keresési találat kijelölése",
-	"changeAll.label": "Minden előfordulás módosítása"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/editor/contrib/multicursor/multicursor.i18n.json b/i18n/hun/src/vs/editor/contrib/multicursor/multicursor.i18n.json
deleted file mode 100644
index c76334be9d4..00000000000
--- a/i18n/hun/src/vs/editor/contrib/multicursor/multicursor.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"mutlicursor.insertAbove": "Kurzor beszúrása egy sorral feljebb",
-	"mutlicursor.insertBelow": "Kurzor beszúrása egy sorral lejjebb",
-	"mutlicursor.insertAtEndOfEachLineSelected": "Kurzor beszúrása a sorok végére",
-	"addSelectionToNextFindMatch": "Kijelölés hozzáadása a következő keresési találathoz",
-	"addSelectionToPreviousFindMatch": "Kijelölés hozzáadása az előző keresési találathoz",
-	"moveSelectionToNextFindMatch": "Utolsó kijelölés áthelyezése a következő keresési találatra",
-	"moveSelectionToPreviousFindMatch": "Utolsó kijelölés áthelyezése az előző keresési találatra",
-	"selectAllOccurrencesOfFindMatch": "Az összes keresési találat kijelölése",
-	"changeAll.label": "Minden előfordulás módosítása"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/editor/contrib/parameterHints/browser/parameterHints.i18n.json b/i18n/hun/src/vs/editor/contrib/parameterHints/browser/parameterHints.i18n.json
deleted file mode 100644
index 973e6d7ae91..00000000000
--- a/i18n/hun/src/vs/editor/contrib/parameterHints/browser/parameterHints.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"parameterHints.trigger.label": "Paraméterinformációk megjelenítése"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/editor/contrib/parameterHints/browser/parameterHintsWidget.i18n.json b/i18n/hun/src/vs/editor/contrib/parameterHints/browser/parameterHintsWidget.i18n.json
deleted file mode 100644
index f05a169d614..00000000000
--- a/i18n/hun/src/vs/editor/contrib/parameterHints/browser/parameterHintsWidget.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"hint": "{0}, információ"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/editor/contrib/parameterHints/parameterHints.i18n.json b/i18n/hun/src/vs/editor/contrib/parameterHints/parameterHints.i18n.json
deleted file mode 100644
index 4c582170062..00000000000
--- a/i18n/hun/src/vs/editor/contrib/parameterHints/parameterHints.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"parameterHints.trigger.label": "Paraméterinformációk megjelenítése"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/editor/contrib/parameterHints/parameterHintsWidget.i18n.json b/i18n/hun/src/vs/editor/contrib/parameterHints/parameterHintsWidget.i18n.json
deleted file mode 100644
index 8e003e036f6..00000000000
--- a/i18n/hun/src/vs/editor/contrib/parameterHints/parameterHintsWidget.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hint": "{0}, információ"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/editor/contrib/quickFix/browser/quickFixCommands.i18n.json b/i18n/hun/src/vs/editor/contrib/quickFix/browser/quickFixCommands.i18n.json
deleted file mode 100644
index 1fef02c03eb..00000000000
--- a/i18n/hun/src/vs/editor/contrib/quickFix/browser/quickFixCommands.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"quickFixWithKb": "Javítások megjelenítése ({0})",
-	"quickFix": "Javítások megjelenítése",
-	"quickfix.trigger.label": "Gyorsjavítás"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/editor/contrib/quickFix/quickFixCommands.i18n.json b/i18n/hun/src/vs/editor/contrib/quickFix/quickFixCommands.i18n.json
deleted file mode 100644
index 34a96fd50f4..00000000000
--- a/i18n/hun/src/vs/editor/contrib/quickFix/quickFixCommands.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"quickFixWithKb": "Javítások megjelenítése ({0})",
-	"quickFix": "Javítások megjelenítése",
-	"quickfix.trigger.label": "Gyorsjavítás",
-	"refactor.label": "Refaktorálás"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/editor/contrib/referenceSearch/browser/peekViewWidget.i18n.json b/i18n/hun/src/vs/editor/contrib/referenceSearch/browser/peekViewWidget.i18n.json
deleted file mode 100644
index a40829f1ae6..00000000000
--- a/i18n/hun/src/vs/editor/contrib/referenceSearch/browser/peekViewWidget.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"label.close": "Bezárás"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/editor/contrib/referenceSearch/browser/referenceSearch.i18n.json b/i18n/hun/src/vs/editor/contrib/referenceSearch/browser/referenceSearch.i18n.json
deleted file mode 100644
index bc4f4f5abd6..00000000000
--- a/i18n/hun/src/vs/editor/contrib/referenceSearch/browser/referenceSearch.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"meta.titleReference": " – {0} referencia",
-	"references.action.label": "Minden hivatkozás megkeresése"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/editor/contrib/referenceSearch/browser/referencesController.i18n.json b/i18n/hun/src/vs/editor/contrib/referenceSearch/browser/referencesController.i18n.json
deleted file mode 100644
index b93a507d5d9..00000000000
--- a/i18n/hun/src/vs/editor/contrib/referenceSearch/browser/referencesController.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"labelLoading": "Betöltés..."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/editor/contrib/referenceSearch/browser/referencesModel.i18n.json b/i18n/hun/src/vs/editor/contrib/referenceSearch/browser/referencesModel.i18n.json
deleted file mode 100644
index 4ab9002859c..00000000000
--- a/i18n/hun/src/vs/editor/contrib/referenceSearch/browser/referencesModel.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"aria.oneReference": "szimbólum a következő helyen: {0}, sor: {1}, oszlop: {2}",
-	"aria.fileReferences.1": "Egy szimbólum a következő helyen: {0}, teljes elérési út: {1}",
-	"aria.fileReferences.N": "{0} szimbólum a következő helyen: {1}, teljes elérési út: {2}",
-	"aria.result.0": "Nincs találat",
-	"aria.result.1": "Egy szimbólum a következő helyen: {0}",
-	"aria.result.n1": "{0} szimbólum a következő helyen: {1}",
-	"aria.result.nm": "{0} szimbólum {1} fájlban"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/editor/contrib/referenceSearch/browser/referencesWidget.i18n.json b/i18n/hun/src/vs/editor/contrib/referenceSearch/browser/referencesWidget.i18n.json
deleted file mode 100644
index 2701fadac42..00000000000
--- a/i18n/hun/src/vs/editor/contrib/referenceSearch/browser/referencesWidget.i18n.json
+++ /dev/null
@@ -1,27 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"referencesFailre": "Nem sikerült feloldani a fájlt.",
-	"referencesCount": "{0} referencia",
-	"referenceCount": "{0} referencia",
-	"missingPreviewMessage": "előnézet nem érhető el",
-	"treeAriaLabel": "Referenciák",
-	"noResults": "Nincs eredmény",
-	"peekView.alternateTitle": "Referenciák",
-	"peekViewTitleBackground": "A betekintőablak címsorának háttérszíne.",
-	"peekViewTitleForeground": "A betekintőablak címének színe.",
-	"peekViewTitleInfoForeground": "A betekintőablak címsorában található információ színe.",
-	"peekViewBorder": "A betekintőablak keretének és nyilainak színe.",
-	"peekViewResultsBackground": "A betekintőablak eredménylistájának háttérszíne.",
-	"peekViewResultsMatchForeground": "A betekintőablak eredménylistájában található sorhivatkozások előtérszíne.",
-	"peekViewResultsFileForeground": "A betekintőablak eredménylistájában található fájlhivatkozások előtérszíne.",
-	"peekViewResultsSelectionBackground": "A betekintőablak eredménylistájában kiválaszott elem háttérszíne.",
-	"peekViewResultsSelectionForeground": "A betekintőablak eredménylistájában kiválaszott elem előtérszíne.",
-	"peekViewEditorBackground": "A betekintőablak szerkesztőablakának háttérszíne.",
-	"peekViewEditorGutterBackground": "A betekintőablak szerkesztőablakában található margó háttérszíne.",
-	"peekViewResultsMatchHighlight": "Kiemelt keresési eredmények színe a betekintőablak eredménylistájában.",
-	"peekViewEditorMatchHighlight": "Kiemelt keresési eredmények színe a betekintőablak szerkesztőablakában."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/editor/contrib/referenceSearch/peekViewWidget.i18n.json b/i18n/hun/src/vs/editor/contrib/referenceSearch/peekViewWidget.i18n.json
deleted file mode 100644
index 6d936717c7d..00000000000
--- a/i18n/hun/src/vs/editor/contrib/referenceSearch/peekViewWidget.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"label.close": "Bezárás"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/editor/contrib/referenceSearch/referenceSearch.i18n.json b/i18n/hun/src/vs/editor/contrib/referenceSearch/referenceSearch.i18n.json
deleted file mode 100644
index 66d6183c157..00000000000
--- a/i18n/hun/src/vs/editor/contrib/referenceSearch/referenceSearch.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"meta.titleReference": " – {0} referencia",
-	"references.action.label": "Minden hivatkozás megkeresése"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/editor/contrib/referenceSearch/referencesController.i18n.json b/i18n/hun/src/vs/editor/contrib/referenceSearch/referencesController.i18n.json
deleted file mode 100644
index 666271d24b7..00000000000
--- a/i18n/hun/src/vs/editor/contrib/referenceSearch/referencesController.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"labelLoading": "Betöltés..."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/editor/contrib/referenceSearch/referencesModel.i18n.json b/i18n/hun/src/vs/editor/contrib/referenceSearch/referencesModel.i18n.json
deleted file mode 100644
index 6789a53909d..00000000000
--- a/i18n/hun/src/vs/editor/contrib/referenceSearch/referencesModel.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"aria.oneReference": "szimbólum a következő helyen: {0}, sor: {1}, oszlop: {2}",
-	"aria.fileReferences.1": "Egy szimbólum a következő helyen: {0}, teljes elérési út: {1}",
-	"aria.fileReferences.N": "{0} szimbólum a következő helyen: {1}, teljes elérési út: {2}",
-	"aria.result.0": "Nincs találat",
-	"aria.result.1": "Egy szimbólum a következő helyen: {0}",
-	"aria.result.n1": "{0} szimbólum a következő helyen: {1}",
-	"aria.result.nm": "{0} szimbólum {1} fájlban"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/editor/contrib/referenceSearch/referencesWidget.i18n.json b/i18n/hun/src/vs/editor/contrib/referenceSearch/referencesWidget.i18n.json
deleted file mode 100644
index 9c1a30c3bec..00000000000
--- a/i18n/hun/src/vs/editor/contrib/referenceSearch/referencesWidget.i18n.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"referencesFailre": "Nem sikerült feloldani a fájlt.",
-	"referencesCount": "{0} referencia",
-	"referenceCount": "{0} referencia",
-	"missingPreviewMessage": "előnézet nem érhető el",
-	"treeAriaLabel": "Referenciák",
-	"noResults": "Nincs eredmény",
-	"peekView.alternateTitle": "Referenciák",
-	"peekViewTitleBackground": "A betekintőablak címsorának háttérszíne.",
-	"peekViewTitleForeground": "A betekintőablak címének színe.",
-	"peekViewTitleInfoForeground": "A betekintőablak címsorában található információ színe.",
-	"peekViewBorder": "A betekintőablak keretének és nyilainak színe.",
-	"peekViewResultsBackground": "A betekintőablak eredménylistájának háttérszíne.",
-	"peekViewResultsMatchForeground": "A betekintőablak eredménylistájában található sorhivatkozások előtérszíne.",
-	"peekViewResultsFileForeground": "A betekintőablak eredménylistájában található fájlhivatkozások előtérszíne.",
-	"peekViewResultsSelectionBackground": "A betekintőablak eredménylistájában kiválaszott elem háttérszíne.",
-	"peekViewResultsSelectionForeground": "A betekintőablak eredménylistájában kiválaszott elem előtérszíne.",
-	"peekViewEditorBackground": "A betekintőablak szerkesztőablakának háttérszíne.",
-	"peekViewEditorGutterBackground": "A betekintőablak szerkesztőablakában található margó háttérszíne.",
-	"peekViewResultsMatchHighlight": "Kiemelt keresési eredmények színe a betekintőablak eredménylistájában.",
-	"peekViewEditorMatchHighlight": "Kiemelt keresési eredmények színe a betekintőablak szerkesztőablakában.",
-	"peekViewEditorMatchHighlightBorder": "Kiemelt keresési eredmények keretszíne a betekintőablak szerkesztőablakában."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/editor/contrib/rename/browser/rename.i18n.json b/i18n/hun/src/vs/editor/contrib/rename/browser/rename.i18n.json
deleted file mode 100644
index c6eac10add6..00000000000
--- a/i18n/hun/src/vs/editor/contrib/rename/browser/rename.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"no result": "Nincs eredmény.",
-	"aria": "'{0}' sikeresen át lett nevezve a következőre: '{1}'. Összefoglaló: {2}",
-	"rename.failed": "Az átnevezést nem sikerült végrehajtani.",
-	"rename.label": "Szimbólum átnevezése"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/editor/contrib/rename/browser/renameInputField.i18n.json b/i18n/hun/src/vs/editor/contrib/rename/browser/renameInputField.i18n.json
deleted file mode 100644
index cd26c078ae0..00000000000
--- a/i18n/hun/src/vs/editor/contrib/rename/browser/renameInputField.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"renameAriaLabel": "Átnevezésre szolgáló beviteli mező. Adja meg az új nevet, majd nyomja meg az Enter gombot a változtatások elvégzéséhez."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/editor/contrib/rename/rename.i18n.json b/i18n/hun/src/vs/editor/contrib/rename/rename.i18n.json
deleted file mode 100644
index 4cf78929525..00000000000
--- a/i18n/hun/src/vs/editor/contrib/rename/rename.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"no result": "Nincs eredmény.",
-	"aria": "'{0}' sikeresen át lett nevezve a következőre: '{1}'. Összefoglaló: {2}",
-	"rename.failed": "Az átnevezést nem sikerült végrehajtani.",
-	"rename.label": "Szimbólum átnevezése"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/editor/contrib/rename/renameInputField.i18n.json b/i18n/hun/src/vs/editor/contrib/rename/renameInputField.i18n.json
deleted file mode 100644
index 1a7b3ed04ae..00000000000
--- a/i18n/hun/src/vs/editor/contrib/rename/renameInputField.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"renameAriaLabel": "Átnevezésre szolgáló beviteli mező. Adja meg az új nevet, majd nyomja meg az Enter gombot a változtatások elvégzéséhez."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/editor/contrib/smartSelect/common/smartSelect.i18n.json b/i18n/hun/src/vs/editor/contrib/smartSelect/common/smartSelect.i18n.json
deleted file mode 100644
index 463be33cb03..00000000000
--- a/i18n/hun/src/vs/editor/contrib/smartSelect/common/smartSelect.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"smartSelect.grow": "Kijelölés bővítése",
-	"smartSelect.shrink": "Kijelölés szűkítése"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/editor/contrib/smartSelect/smartSelect.i18n.json b/i18n/hun/src/vs/editor/contrib/smartSelect/smartSelect.i18n.json
deleted file mode 100644
index f9312cfb399..00000000000
--- a/i18n/hun/src/vs/editor/contrib/smartSelect/smartSelect.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"smartSelect.grow": "Kijelölés bővítése",
-	"smartSelect.shrink": "Kijelölés szűkítése"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/editor/contrib/snippet/snippetVariables.i18n.json b/i18n/hun/src/vs/editor/contrib/snippet/snippetVariables.i18n.json
deleted file mode 100644
index 57dd858270a..00000000000
--- a/i18n/hun/src/vs/editor/contrib/snippet/snippetVariables.i18n.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"Sunday": "vasárnap",
-	"Monday": "hétfő",
-	"Tuesday": "kedd",
-	"Wednesday": "szerda",
-	"Thursday": "csütörtök",
-	"Friday": "péntek",
-	"Saturday": "szombat",
-	"SundayShort": "vas",
-	"MondayShort": "hét",
-	"TuesdayShort": "kedd",
-	"WednesdayShort": "sze",
-	"ThursdayShort": "csüt",
-	"FridayShort": "pén",
-	"SaturdayShort": "szo",
-	"January": "január",
-	"February": "február",
-	"March": "március",
-	"April": "április",
-	"May": "május",
-	"June": "június",
-	"July": "július",
-	"August": "augusztus",
-	"September": "szeptember",
-	"October": "október",
-	"November": "november",
-	"December": "december",
-	"JanuaryShort": "jan",
-	"FebruaryShort": "feb",
-	"MarchShort": "márc",
-	"AprilShort": "ápr",
-	"MayShort": "máj",
-	"JuneShort": "jún",
-	"JulyShort": "júl",
-	"AugustShort": "aug",
-	"SeptemberShort": "szept",
-	"OctoberShort": "okt",
-	"NovemberShort": "nov",
-	"DecemberShort": "dec"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/editor/contrib/suggest/browser/suggestController.i18n.json b/i18n/hun/src/vs/editor/contrib/suggest/browser/suggestController.i18n.json
deleted file mode 100644
index d7050253ff1..00000000000
--- a/i18n/hun/src/vs/editor/contrib/suggest/browser/suggestController.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"arai.alert.snippet": "A(z) '{0}' elfogadása a következő szöveg beszúrását eredményezte: {1}",
-	"suggest.trigger.label": "Javaslatok megjelenítése"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/editor/contrib/suggest/browser/suggestWidget.i18n.json b/i18n/hun/src/vs/editor/contrib/suggest/browser/suggestWidget.i18n.json
deleted file mode 100644
index 1ea907a2db0..00000000000
--- a/i18n/hun/src/vs/editor/contrib/suggest/browser/suggestWidget.i18n.json
+++ /dev/null
@@ -1,21 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"editorSuggestWidgetBackground": "A javaslatokat tartalmazó modul háttérszíne.",
-	"editorSuggestWidgetBorder": "A javaslatokat tartalmazó modul keretszíne.",
-	"editorSuggestWidgetForeground": "A javaslatokat tartalmazó modul előtérszíne.",
-	"editorSuggestWidgetSelectedBackground": "A javaslatokat tartalmazó modulban kiválasztott elem háttérszíne.",
-	"editorSuggestWidgetHighlightForeground": "Az illeszkedő szövegrészletek kiemelése a javaslatok modulban.",
-	"readMore": "További információk megjelenítése...{0}",
-	"suggestionWithDetailsAriaLabel": "{0}, javaslat, részletekkel",
-	"suggestionAriaLabel": "{0}, javaslat",
-	"readLess": "Kevesebb információ megjelenítése...{0}",
-	"suggestWidget.loading": "Betöltés...",
-	"suggestWidget.noSuggestions": "Nincsenek javaslatok.",
-	"suggestionAriaAccepted": "{0}, elfogadva",
-	"ariaCurrentSuggestionWithDetails": "{0}, javaslat, részletekkel",
-	"ariaCurrentSuggestion": "{0}, javaslat"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/editor/contrib/suggest/suggestController.i18n.json b/i18n/hun/src/vs/editor/contrib/suggest/suggestController.i18n.json
deleted file mode 100644
index 8fc789438ee..00000000000
--- a/i18n/hun/src/vs/editor/contrib/suggest/suggestController.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"arai.alert.snippet": "A(z) '{0}' elfogadása a következő szöveg beszúrását eredményezte: {1}",
-	"suggest.trigger.label": "Javaslatok megjelenítése"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/editor/contrib/suggest/suggestWidget.i18n.json b/i18n/hun/src/vs/editor/contrib/suggest/suggestWidget.i18n.json
deleted file mode 100644
index b04cfd2ee54..00000000000
--- a/i18n/hun/src/vs/editor/contrib/suggest/suggestWidget.i18n.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"editorSuggestWidgetBackground": "A javaslatokat tartalmazó modul háttérszíne.",
-	"editorSuggestWidgetBorder": "A javaslatokat tartalmazó modul keretszíne.",
-	"editorSuggestWidgetForeground": "A javaslatokat tartalmazó modul előtérszíne.",
-	"editorSuggestWidgetSelectedBackground": "A javaslatokat tartalmazó modulban kiválasztott elem háttérszíne.",
-	"editorSuggestWidgetHighlightForeground": "Az illeszkedő szövegrészletek kiemelése a javaslatok modulban.",
-	"readMore": "További információk megjelenítése...{0}",
-	"suggestionWithDetailsAriaLabel": "{0}, javaslat, részletekkel",
-	"suggestionAriaLabel": "{0}, javaslat",
-	"readLess": "Kevesebb információ megjelenítése...{0}",
-	"suggestWidget.loading": "Betöltés...",
-	"suggestWidget.noSuggestions": "Nincsenek javaslatok.",
-	"suggestionAriaAccepted": "{0}, elfogadva",
-	"ariaCurrentSuggestionWithDetails": "{0}, javaslat, részletekkel",
-	"ariaCurrentSuggestion": "{0}, javaslat"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/editor/contrib/toggleTabFocusMode/common/toggleTabFocusMode.i18n.json b/i18n/hun/src/vs/editor/contrib/toggleTabFocusMode/common/toggleTabFocusMode.i18n.json
deleted file mode 100644
index dc4360652cb..00000000000
--- a/i18n/hun/src/vs/editor/contrib/toggleTabFocusMode/common/toggleTabFocusMode.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"toggle.tabMovesFocus": "Tab billentyűvel mozgatott fókusz ki- és bekapcsolása"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/editor/contrib/toggleTabFocusMode/toggleTabFocusMode.i18n.json b/i18n/hun/src/vs/editor/contrib/toggleTabFocusMode/toggleTabFocusMode.i18n.json
deleted file mode 100644
index 6ff7a9e10f6..00000000000
--- a/i18n/hun/src/vs/editor/contrib/toggleTabFocusMode/toggleTabFocusMode.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggle.tabMovesFocus": "Tabulátor billentyűvel mozgatott fókusz ki- és bekapcsolása"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/editor/contrib/wordHighlighter/common/wordHighlighter.i18n.json b/i18n/hun/src/vs/editor/contrib/wordHighlighter/common/wordHighlighter.i18n.json
deleted file mode 100644
index fa7c3359075..00000000000
--- a/i18n/hun/src/vs/editor/contrib/wordHighlighter/common/wordHighlighter.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"wordHighlight": "Szimbólumok háttérszíne olvasási hozzáférés, páldául változó olvasása esetén.",
-	"wordHighlightStrong": "Szimbólumok háttérszíne írási hozzáférés, páldául változó írása esetén.",
-	"overviewRulerWordHighlightForeground": "A kiemelt szimbólumokat jelölő jelzések színe az áttekintősávon.",
-	"overviewRulerWordHighlightStrongForeground": "A kiemelt, írási hozzáférésű szimbólumokat jelölő jelzések színe az áttekintősávon.",
-	"wordHighlight.next.label": "Ugrás a következő kiemelt szimbólumhoz",
-	"wordHighlight.previous.label": "Ugrás az előző kiemelt szimbólumhoz"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json b/i18n/hun/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
deleted file mode 100644
index e66f795b53c..00000000000
--- a/i18n/hun/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"wordHighlight": "Szimbólumok háttérszíne olvasási hozzáférés, például változó olvasása esetén. A színnek áttetszőnek kell lennie, hogy ne fedje el az alatta lévő dekorátorokat.",
-	"wordHighlightStrong": "Szimbólumok háttérszíne írási hozzáférés, például változó írása esetén. A színnek áttetszőnek kell lennie, hogy ne fedje el az alatta lévő dekorátorokat.",
-	"wordHighlightBorder": "Szimbólumok háttérszíne olvasási hozzáférés, például változó olvasása esetén.",
-	"wordHighlightStrongBorder": "Szimbólumok háttérszíne írási hozzáférés, például változó írása esetén.",
-	"overviewRulerWordHighlightForeground": "A kiemelt szimbólumokat jelölő jelzések színe az áttekintősávon. A színnek áttetszőnek kell lennie, hogy ne fedje el az alatta lévő dekorátorokat.",
-	"overviewRulerWordHighlightStrongForeground": "Az írási hozzáféréssel rendelkező szimbólumokat jelölő jelzések színe az áttekintősávon. A színnek áttetszőnek kell lennie, hogy ne fedje el az alatta lévő dekorátorokat.",
-	"wordHighlight.next.label": "Ugrás a következő kiemelt szimbólumhoz",
-	"wordHighlight.previous.label": "Ugrás az előző kiemelt szimbólumhoz"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/editor/contrib/zoneWidget/browser/peekViewWidget.i18n.json b/i18n/hun/src/vs/editor/contrib/zoneWidget/browser/peekViewWidget.i18n.json
deleted file mode 100644
index a40829f1ae6..00000000000
--- a/i18n/hun/src/vs/editor/contrib/zoneWidget/browser/peekViewWidget.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"label.close": "Bezárás"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/editor/electron-browser/textMate/TMSyntax.i18n.json b/i18n/hun/src/vs/editor/electron-browser/textMate/TMSyntax.i18n.json
deleted file mode 100644
index be4ee2e7989..00000000000
--- a/i18n/hun/src/vs/editor/electron-browser/textMate/TMSyntax.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"invalid.language": "Ismeretlen nyelv található a következőben: `contributes.{0}.language`. A megadott érték: {1}",
-	"invalid.scopeName": "Hiányzó karakterlánc a `contributes.{0}.scopeName`-ben. A megadott érték: {1}",
-	"invalid.path.0": "Hiányzó karakterlánc a `contributes.{0}.path`-ban. A megadott érték: {1}",
-	"invalid.injectTo": "A `contributes.{0}.injectTo` értéke érvénytelen. Az értéke egy tömb lehet, ami nyelvhatókörök neveit tartalmazza. A megadott érték: {1}",
-	"invalid.embeddedLanguages": "A `contributes.{0}.embeddedLanguages` értéke érvénytelen. Az értéke egy hatókörnév-nyelv kulcs-érték párokat tartalmazó objektum lehet. A megadott érték: {1}",
-	"invalid.path.1": "A `contributes.{0}.path` ({1}) nem a kiegészítő mappáján belül található ({2}). Emiatt előfordulhat, hogy a kiegészítő nem lesz hordozható.",
-	"no-tm-grammar": "Nincs TM Grammar regisztrálva ehhez a nyelvhez."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/editor/node/languageConfigurationExtensionPoint.i18n.json b/i18n/hun/src/vs/editor/node/languageConfigurationExtensionPoint.i18n.json
deleted file mode 100644
index 45673b13e30..00000000000
--- a/i18n/hun/src/vs/editor/node/languageConfigurationExtensionPoint.i18n.json
+++ /dev/null
@@ -1,23 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"parseErrors": "Hiba a(z) {0} feldolgozása közben: {1}",
-	"schema.openBracket": "A nyitó zárójelet definiáló karakter vagy karaktersorozat",
-	"schema.closeBracket": "A záró zárójelet definiáló karakter vagy karaktersorozat",
-	"schema.comments": "Meghatározza a megjegyzésszimbólumokat",
-	"schema.blockComments": "Meghatározza, hogyan vannak jelölve a megjegyzésblokkok.",
-	"schema.blockComment.begin": "A megjegyzésblokk kezdetét definiáló karaktersorozat.",
-	"schema.blockComment.end": "A megjegyzésblokk végét definiáló karaktersorozat.",
-	"schema.lineComment": "A megjegyzéssor kezdetét definiáló karaktersorozat.",
-	"schema.brackets": "Meghatározza azokat a zárójelszimbólumokat, amelyek növeik vagy csökkentik az indentálást.",
-	"schema.autoClosingPairs": "Meghatározza a zárójelpárokat. Ha egy nyitó zárójelet írnak be a szerkesztőbe, a záró párja automatikusan be lesz illesztve.",
-	"schema.autoClosingPairs.notIn": "Azon hatókörök listája, ahol az automatikus zárójelek automatikus párosítása le van tiltve.",
-	"schema.surroundingPairs": "Meghatározza azok zárójelpárok listáját, melyek használhatók a kijelölt szöveg körbezárására.",
-	"schema.wordPattern": "A nyelvben található szavak definíciója.",
-	"schema.wordPattern.pattern": "A szavak illesztésére használt reguláris kifejezés.",
-	"schema.wordPattern.flags": "A szavak illesztésére használt reguláris kifejezés beállításai.",
-	"schema.wordPattern.flags.errorMessage": "Illeszkednie kell a következő mintára: `/^([gimuy]+)$/`."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/editor/node/textMate/TMGrammars.i18n.json b/i18n/hun/src/vs/editor/node/textMate/TMGrammars.i18n.json
deleted file mode 100644
index 4ae6117a727..00000000000
--- a/i18n/hun/src/vs/editor/node/textMate/TMGrammars.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"vscode.extension.contributes.grammars": "TextMate-tokenizálókat szolgáltat.",
-	"vscode.extension.contributes.grammars.language": "Annak a nyelvnek az azonosítója, amely számára szolgáltatva van ez a szintaxis.",
-	"vscode.extension.contributes.grammars.scopeName": "A tmLanguage-fájl által használt TextMate-hatókör neve.",
-	"vscode.extension.contributes.grammars.path": "A tmLanguage-fájl elérési útja. Az elérési út relatív a kiegészítő mappájához képest, és általában './syntaxes/'-zal kezdődik.",
-	"vscode.extension.contributes.grammars.embeddedLanguages": "Hatókörnév-nyelvazonosító kulcs-érték párokat tartalmazó objektum, ha a nyelvtan tartalmaz beágyazott nyelveket.",
-	"vscode.extension.contributes.grammars.injectTo": "Azon nyelvi hatókörök nevei, ahová be lesz ágyazva ez a nyelvtan."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/platform/actions/browser/menuItemActionItem.i18n.json b/i18n/hun/src/vs/platform/actions/browser/menuItemActionItem.i18n.json
deleted file mode 100644
index 0d4e76110bb..00000000000
--- a/i18n/hun/src/vs/platform/actions/browser/menuItemActionItem.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"titleAndKb": "{0} ({1})"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json b/i18n/hun/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
deleted file mode 100644
index e50c39417bf..00000000000
--- a/i18n/hun/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"requirearray": "a menüelemeket tömbként kell megadni",
-	"requirestring": "a(z) `{0}` tulajdonság kötelező és `string` típusúnak kell lennie",
-	"optstring": "a(z) `{0}` tulajdonság elhagyható vagy `string` típusúnak kell lennie",
-	"vscode.extension.contributes.menuItem.command": "A végrehajtandó parancs azonosítója. A parancsot a 'commands'-szakaszban kell deklarálni",
-	"vscode.extension.contributes.menuItem.alt": "Egy alternatív végrehajtandó parancs azonosítója. A parancsot a 'commands'-szakaszban kell deklarálni",
-	"vscode.extension.contributes.menuItem.when": "A feltételnek igaznak kell lennie az elem megjelenítéséhez",
-	"vscode.extension.contributes.menuItem.group": "A csoport, amibe a parancs tartozik",
-	"vscode.extension.contributes.menus": "Menüket szolgáltat a szerkesztőhöz",
-	"menus.commandPalette": "A parancskatalógus",
-	"menus.touchBar": "A Touch Bar (csak macOS-en)",
-	"menus.editorTitle": "A szerkesztőablak címsora menüje",
-	"menus.editorContext": "A szerkesztőablak helyi menüje",
-	"menus.explorerContext": "A fájlkezelő helyi menüje",
-	"menus.editorTabContext": "A szerkesztőablak füleinek helyi menüje",
-	"menus.debugCallstackContext": "A hibakeresési hívási verem helyi menüje",
-	"menus.scmTitle": "A verziókezelő címsorának menüje",
-	"menus.scmSourceControl": "A verziókezelő menüje",
-	"menus.resourceGroupContext": "A verziókezelő erőforráscsoportja helyi menüje",
-	"menus.resourceStateContext": "A verziókzeleő erőforrásállapot helyi menüje",
-	"view.viewTitle": "A szolgáltatott nézet címsorának menüje",
-	"view.itemContext": "A szolgáltatott nézet elemének helyi menüje",
-	"nonempty": "az érték nem lehet üres.",
-	"opticon": "a(z) `icon` tulajdonság elhagyható vagy ha van értéke, akkor string vagy literál (pl. `{dark, light}`) típusúnak kell lennie",
-	"requireStringOrObject": "a(z) `{0}` tulajdonság kötelező és `string` vagy `object` típusúnak kell lennie",
-	"requirestrings": "a(z) `{0}` és `{1}` tulajdonságok kötelezők és `string` típusúnak kell lenniük",
-	"vscode.extension.contributes.commandType.command": "A végrehajtandó parancs azonosítója",
-	"vscode.extension.contributes.commandType.title": "A cím, amivel a parancs meg fog jelenni a felhasználói felületen",
-	"vscode.extension.contributes.commandType.category": "(Nem kötelező) Kategória neve, amibe a felületen csoportosítva lesz a parancs",
-	"vscode.extension.contributes.commandType.icon": "(Nem kötelező) Ikon, ami reprezentálni fogja a parancsot a felhasználói felületen. Egy fájl elérési útja vagy egy színtéma-konfiguráció",
-	"vscode.extension.contributes.commandType.icon.light": "Az ikon elérési útja, ha világos téma van használatban",
-	"vscode.extension.contributes.commandType.icon.dark": "Az ikon elérési útja, ha sötét téma van használatban",
-	"vscode.extension.contributes.commands": "Parancsokat szolgáltat a parancskatalógushoz.",
-	"dup": "A(z) `{0}` parancs többször szerepel a `commands`-szakaszban.",
-	"menuId.invalid": "A(z) `{0}` nem érvényes menüazonosító",
-	"missing.command": "A menüpont a(z) `{0}` parancsra hivatkozik, ami nincs deklarálva a 'commands'-szakaszban.",
-	"missing.altCommand": "A menüpont a(z) `{0}` alternatív parancsra hivatkozik, ami nincs deklarálva a 'commands'-szakaszban.",
-	"dupe.command": "A menüpont ugyanazt a parancsot hivatkozza alapértelmezett és alternatív parancsként"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/platform/configuration/common/configurationRegistry.i18n.json b/i18n/hun/src/vs/platform/configuration/common/configurationRegistry.i18n.json
deleted file mode 100644
index 28120a0a18e..00000000000
--- a/i18n/hun/src/vs/platform/configuration/common/configurationRegistry.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"defaultConfigurations.title": "Felülírt alapértelmezett konfigurációk",
-	"overrideSettings.description": "A szerkesztő beállításainak felülírása a(z) {0} nyelvre vonatkozóan",
-	"overrideSettings.defaultDescription": "A szerkesztő beállításainak felülírása egy adott nyelvre vonatkozóan",
-	"config.property.languageDefault": "A(z) '{0}' nem regisztrálható. Ez a beállítás illeszkedik a '\\\\[.*\\\\]$' mintára, ami a nyelvspecifikus szerkesztőbeállításokhoz van használva. Használja a 'configurationDefaults' szolgáltatási lehetőséget.",
-	"config.property.duplicate": "A(z) '{0}' nem regisztrálható: ez a tulajdonság már regisztrálva van."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/platform/dialogs/common/dialogs.i18n.json b/i18n/hun/src/vs/platform/dialogs/common/dialogs.i18n.json
deleted file mode 100644
index 43e1fb70709..00000000000
--- a/i18n/hun/src/vs/platform/dialogs/common/dialogs.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"moreFile": "...1 további fájl nincs megjelenítve",
-	"moreFiles": "...{0} további fájl nincs megjelenítve"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/platform/dialogs/node/dialogService.i18n.json b/i18n/hun/src/vs/platform/dialogs/node/dialogService.i18n.json
deleted file mode 100644
index d1d33322cd8..00000000000
--- a/i18n/hun/src/vs/platform/dialogs/node/dialogService.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"cancel": "Mégse"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/platform/environment/node/argv.i18n.json b/i18n/hun/src/vs/platform/environment/node/argv.i18n.json
deleted file mode 100644
index 77c071af2b9..00000000000
--- a/i18n/hun/src/vs/platform/environment/node/argv.i18n.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"gotoValidation": "`--goto` mód esetén az argumentumokat a következő formában kell megadni: `FÁJL(:SOR(:OSZLOP))`.",
-	"diff": "Két fájl összehasonlítása egymással.",
-	"add": "Mappá(k) hozzáadása a legutolsó aktív ablakhoz.",
-	"goto": "Megnyitja a megadott elérési úton található fájlt a megadott sornál és oszlopnál.",
-	"newWindow": "Mindenképp új ablakban nyíljon meg",
-	"reuseWindow": "Fájl vagy mappa a legutolsó aktív ablakban nyíljon meg.",
-	"wait": "Várjon a fájlok bezárására a visszatérés előtt.",
-	"locale": "A használt lokalizáció (pl. en-US vagy zh-TW)",
-	"userDataDir": "Meghatározza azt a mappát, ahol a felhasználói adatok vannak tárolva. Egyszerre több megnyitott Code-példány is használhatja.",
-	"version": "Verzió kiírása.",
-	"help": "Használati útmutató kiírása.",
-	"extensionHomePath": "A kiegészítők gyökérkönyvtárának beállítása.",
-	"listExtensions": "Telepített kiegészítők listázása.",
-	"showVersions": "Telepített kiegészítők verziójának megjelenítése a --list-extension kapcsoló használata esetén.",
-	"installExtension": "Kiegészítő telepítése.",
-	"uninstallExtension": "Kiegészítő eltávolítása.",
-	"experimentalApis": "Tervezett API-funkciók engedélyezése a kiegészítők számára.",
-	"verbose": "Részletes kimenet kiírása (magába foglalja a --wait kapcsolót)",
-	"log": "A naplózott események szintje.Az 'info' az alapértelmezett értéke. Lehetséges értékek: 'critical', 'error', 'warn', 'info', 'debug', 'trace', 'off'.",
-	"status": "Folyamatok erőforrás-használati és diagnosztikai adatinak kiíratása.",
-	"performance": "Indítás a 'Developer: Startup Performance' parancs engedélyezésével.",
-	"prof-startup": "Processzorhasználat profilozása induláskor",
-	"disableExtensions": "Összes telepített kiegészítő letiltása.",
-	"inspect-extensions": "Hibakeresés és profilozás engedélyezése a kiegészítőkben. A csatlakozási URI-t a fejlesztői eszközöknél találja meg.",
-	"inspect-brk-extensions": "Hibakeresés és profilozás engedélyezése a kiegészítőkben, úgy, hogy a kiegészítő gazdafolyamata szüneteltetve lesz az indítás után. A csatlakozási URI-t a fejlesztői eszközöknél találja meg.",
-	"disableGPU": "Hardveres gyorsítás letiltása.",
-	"uploadLogs": "Az aktuális munkamenet naplóinak feltöltése egy biztonságos végpontra.",
-	"maxMemory": "Egy ablak maximális memóriamérete (megabájtban).",
-	"usage": "Használat",
-	"options": "beállítások",
-	"paths": "elérési utak",
-	"stdinWindows": "Más program bemenetének olvasásához fűzze a '-' karaktert a parancshoz (pl.: 'echo Hello World | {0} -')",
-	"stdinUnix": "Az stdin-ről történő olvasásához fűzze a '-' karaktert a parancshoz (pl.: 'ps aux | grep code | {0} -')",
-	"optionsUpperCase": "Beálítások",
-	"extensionsManagement": "Kiegészítők kezelése",
-	"troubleshooting": "Hibaelhárítás"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/platform/extensionManagement/common/extensionEnablementService.i18n.json b/i18n/hun/src/vs/platform/extensionManagement/common/extensionEnablementService.i18n.json
deleted file mode 100644
index b9cfc1b4cb0..00000000000
--- a/i18n/hun/src/vs/platform/extensionManagement/common/extensionEnablementService.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noWorkspace": "Nincs munkaterület."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/platform/extensionManagement/common/extensionManagement.i18n.json b/i18n/hun/src/vs/platform/extensionManagement/common/extensionManagement.i18n.json
deleted file mode 100644
index 7d2d4f65bd9..00000000000
--- a/i18n/hun/src/vs/platform/extensionManagement/common/extensionManagement.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"extensions": "Kiegészítők",
-	"preferences": "Beállítások"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/platform/extensionManagement/node/extensionGalleryService.i18n.json b/i18n/hun/src/vs/platform/extensionManagement/node/extensionGalleryService.i18n.json
deleted file mode 100644
index 305f261c150..00000000000
--- a/i18n/hun/src/vs/platform/extensionManagement/node/extensionGalleryService.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"notCompatibleDownload": "A letöltés nem sikerült, mert a kiegészítő VS Code '{0}' verziójával kompatibilis változata nem található. "
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json b/i18n/hun/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
deleted file mode 100644
index 4e39213a987..00000000000
--- a/i18n/hun/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"invalidManifest": "A kiegészítő érvénytelen: a package.json nem egy JSON-fájl.",
-	"incompatible": "A(z) '{0}' kiegészítő nem telepíthető, mivel nem kompatibilis a Code '{1}' verziójával.",
-	"restartCode": "Indítsa újra a Code-ot a(z) {0} újratelepítése előtt.",
-	"installingOutdatedExtension": "A kiegészítő egy újabb verziója már telepítve van. Szeretné felülírni a régebbi verzióval?",
-	"override": "Felülírás",
-	"cancel": "Mégse",
-	"errorInstallingDependencies": "Hiba a függőségek telepítése közben. {0}",
-	"MarketPlaceDisabled": "A piactér nincs engedélyezve",
-	"removeError": "Hiba történt a kiegészítő eltávolítása közben: {0}. Lépjen ki és indítsa el a VS Code-ot mielőtt újrapróbálná!",
-	"Not a Marketplace extension": "Csak a piactérről származó kiegészítőket lehet újratelepíteni",
-	"notFoundCompatible": "A(z) '{0}' nem telepíthető: nincs a VS Code '{1}' verziójával kompatibilis változat.",
-	"malicious extension": "A kiegészítő nem telepíthető, mert jelentették, hogy problémás.",
-	"notFoundCompatibleDependency": "A telepítés nem sikerült, mert a(z) '{0}' kiegészítő függőség VS Code '{1}' verziójával kompatibilis változata nem található. ",
-	"quitCode": "A kiegészítő telepítése nem sikerült. Lépjen ki és indítsa el a VS Code-ot az újratelepítés előtt!",
-	"exitCode": "A kiegészítő telepítése nem sikerült. Lépjen ki és indítsa el a VS Code-ot az újratelepítés előtt!",
-	"renameError": "Ismeretlen hiba történt a(z) {0} {1} névre való átnevezése közben",
-	"uninstallDependeciesConfirmation": "Csak a(z) '{0}' kiegészítőt szeretné eltávolítani vagy annak függőségeit is?",
-	"uninstallOnly": "Csak a kiegészítőt",
-	"uninstallAll": "Az összes eltávolítása",
-	"singleDependentError": "Nem sikerült eltávolítani a(z) '{0}' kiegészítőt: a(z) '{1}' kiegészítő függ tőle.",
-	"twoDependentsError": "Nem sikerült eltávolítani a(z) '{0}' kiegészítőt: a(z) '{1}' és '{2}' kiegészítők függnek tőle.",
-	"multipleDependentsError": "Nem sikerült eltávolítani a(z) '{0}' kiegészítőt: a(z) '{1}', '{2}' és más kiegészítők függnek tőle.",
-	"notExists": "Nem sikerült megtalálni a kiegészítőt"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/platform/extensions/common/abstractExtensionService.i18n.json b/i18n/hun/src/vs/platform/extensions/common/abstractExtensionService.i18n.json
deleted file mode 100644
index a4e5d9f9437..00000000000
--- a/i18n/hun/src/vs/platform/extensions/common/abstractExtensionService.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"unknownDep": "A(z) `{1}` kiegészítőt nem sikerült aktiválni. Oka: ismeretlen függőség: `{0}`.",
-	"failedDep1": "A(z) `{1}` kiegészítőt nem sikerült aktiválni. Oka: a(z) `{0}` függőséget nem sikerült aktiválni.",
-	"failedDep2": "A(z) `{0}` kiegészítőt nem sikerült aktiválni. Oka: több, mint 10  szintnyi függőség van (nagy valószínűséggel egy függőségi hurok miatt).",
-	"activationError": "A(z) `{0}` kiegészítő aktiválása nem sikerült: {1}."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/platform/extensions/common/extensionsRegistry.i18n.json b/i18n/hun/src/vs/platform/extensions/common/extensionsRegistry.i18n.json
deleted file mode 100644
index 4e89e008ebe..00000000000
--- a/i18n/hun/src/vs/platform/extensions/common/extensionsRegistry.i18n.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.engines.vscode": "VS Code kiegészítőkhöz. Meghatározza azt a VS Code-verziót, amivel a kiegészítő kompatibilis. Nem lehet *. Például a ^0.10.5 a VS Code minimum 0.10.5-ös verziójával való kompatibilitást jelzi.",
-	"vscode.extension.publisher": "A VS Code-kiegészítő kiadója.",
-	"vscode.extension.displayName": "A kiegészítő VS Code galériában megjelenített neve.",
-	"vscode.extension.categories": "A VS Code-galériában való kategorizálásra használt kategóriák.",
-	"vscode.extension.galleryBanner": "A VS Code piactéren használt szalagcím.",
-	"vscode.extension.galleryBanner.color": "A VS Code piactéren használt szalagcím színe.",
-	"vscode.extension.galleryBanner.theme": "A szalagcímben használt betűtípus színsémája.",
-	"vscode.extension.contributes": "A csomagban található összes szolgáltatás, amit ez a VS Code kiterjesztés tartalmaz.",
-	"vscode.extension.preview": "A kiegészítő előnézetesnek jelölése a piactéren.",
-	"vscode.extension.activationEvents": "A VS Code kiegészítő aktiválási eseményei.",
-	"vscode.extension.activationEvents.onLanguage": "Aktiváló esemény, ami akkor fut le, ha az adott nyelvhez társított fájl kerül megnyitásra.",
-	"vscode.extension.activationEvents.onCommand": "Aktiváló esemény, ami akkor fut le, amikor a megadott parancsot meghívják.",
-	"vscode.extension.activationEvents.onDebug": "Aktiváló esemény, ami akkor fut le, ha a felhasználó hibakeresést indít el vagy beállítani készül a hibakeresési konfigurációt.",
-	"vscode.extension.activationEvents.onDebugInitialConfigurations": "Aktivációs esemény, ami minden esetben kiváltódik, ha \"launch.json\"-t kell létrehozni (és az összes provideDebugConfigurations metódusokat meg kell hívni).",
-	"vscode.extension.activationEvents.onDebugResolve": "Aktiváló esemény, ami akkor fut, ha a megadott típusú hibakeresési munkamenetnek el kell indulnia (és a megfelelő resolveDebugConfiguration metódusokat meg kell hívni).",
-	"vscode.extension.activationEvents.workspaceContains": "Aktiváló esemény, ami akkor fut le, ha egy olyan mappa kerül megnyitásra, amiben legalább egy olyan fájl van, amely illeszkedik a megadott globális mintára.",
-	"vscode.extension.activationEvents.onView": "Aktiváló esemény, ami akkor fut le, amikor a megadott nézetet kiterjesztik.",
-	"vscode.extension.activationEvents.star": "Aktiváló esemény, ami a VS Code indításakor fut le. A jó felhasználói élmény érdekében csak akkor használja ezt az eseményt, ha más aktiváló események nem alkalmasak az adott kiegészítő esetében.",
-	"vscode.extension.badges": "A kiegészítő piactéren található oldalának oldalsávjában megjelenő jelvények listája.",
-	"vscode.extension.badges.url": "A jelvény kép URL-je.",
-	"vscode.extension.badges.href": "A jelvény hivatkozása.",
-	"vscode.extension.badges.description": "A jelvény leírása.",
-	"vscode.extension.extensionDependencies": "Más kiegészítők, melyek függőségei ennek a kiegészítőnek. A kiegészítők azonosítója mindig ${publisher}.${name} formájú. Például: vscode.csharp.",
-	"vscode.extension.scripts.prepublish": "A VS Code kiegészítő publikálása előtt végrehajtott parancsfájl.",
-	"vscode.extension.icon": "Egy 128x128 pixeles ikon elérési útja."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/platform/extensions/node/extensionValidator.i18n.json b/i18n/hun/src/vs/platform/extensions/node/extensionValidator.i18n.json
deleted file mode 100644
index 2b680ac3f88..00000000000
--- a/i18n/hun/src/vs/platform/extensions/node/extensionValidator.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"versionSyntax": "Nem sikerült feldolgozni az `engines.vscode` beállítás értékét ({0}). Használja például a következők egyikét: ^1.22.0, ^1.22.x stb.",
-	"versionSpecificity1": "Az `engines.vscode` beállításban megadott érték ({0}) nem elég konkrét. A vscode 1.0.0 előtti verzióihoz legalább a kívánt fő- és alverziót is meg kell adni. Pl.: ^0.10.0, 0.10.x, 0.11.0 stb.",
-	"versionSpecificity2": "Az `engines.vscode` beállításban megadott érték ({0}) nem elég konkrét. A vscode 1.0.0 utáni verzióihoz legalább a kívánt főverziót meg kell adni. Pl.: ^1.10.0, 1.10.x, 1.x.x, 2.x.x stb.",
-	"versionMismatch": "A kiegészítő nem kompatibilis a Code {0} verziójával. A következő szükséges hozzá: {1}."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/platform/history/electron-main/historyMainService.i18n.json b/i18n/hun/src/vs/platform/history/electron-main/historyMainService.i18n.json
deleted file mode 100644
index b252662a32a..00000000000
--- a/i18n/hun/src/vs/platform/history/electron-main/historyMainService.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"newWindow": "Új ablak",
-	"newWindowDesc": "Nyit egy új ablakot",
-	"recentFolders": "Legutóbbi munkaterületek",
-	"folderDesc": "{0} {1}",
-	"codeWorkspace": "Code-munkaterület"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/platform/integrity/node/integrityServiceImpl.i18n.json b/i18n/hun/src/vs/platform/integrity/node/integrityServiceImpl.i18n.json
deleted file mode 100644
index 358f998df03..00000000000
--- a/i18n/hun/src/vs/platform/integrity/node/integrityServiceImpl.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"integrity.prompt": "A feltelepített {0} hibásnak tűnik. Telepítse újra!",
-	"integrity.moreInformation": "További információ",
-	"integrity.dontShowAgain": "Ne jelenítse meg újra"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/platform/issue/electron-main/issueService.i18n.json b/i18n/hun/src/vs/platform/issue/electron-main/issueService.i18n.json
deleted file mode 100644
index 144cb0419cc..00000000000
--- a/i18n/hun/src/vs/platform/issue/electron-main/issueService.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"issueReporter": "Hibajelentő",
-	"processExplorer": "Feladatkezelő"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/platform/jsonschemas/common/jsonValidationExtensionPoint.i18n.json b/i18n/hun/src/vs/platform/jsonschemas/common/jsonValidationExtensionPoint.i18n.json
deleted file mode 100644
index 2ba8ba75d98..00000000000
--- a/i18n/hun/src/vs/platform/jsonschemas/common/jsonValidationExtensionPoint.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"contributes.jsonValidation": "JSON-sémakonfigurációkat szolgáltat.",
-	"contributes.jsonValidation.fileMatch": "Az illesztendő fájlok mintája, például \"package.json\" vagy \"*.launch\".",
-	"contributes.jsonValidation.url": "A séma URL-címe ('http:', 'https:') vagy relatív elérési útja a kiegészítő mappájához képest ('./').",
-	"invalid.jsonValidation": "a 'configuration.jsonValidation' értékét tömbként kell megadni",
-	"invalid.fileMatch": "a 'configuration.jsonValidation.fileMatch' tulajdonság kötelező",
-	"invalid.url": "a 'configuration.jsonValidation.url' értéke URL-cím vagy relatív elérési út lehet",
-	"invalid.url.fileschema": "a 'configuration.jsonValidation.url' érvénytelen relatív elérési utat tartalmaz: {0}",
-	"invalid.url.schema": "a 'configuration.jsonValidation.url' érténének 'http:'-tal, 'https:'-tal, vagy a kiegészítőben elhelyezett sémák hivatkozása esetén './'-rel kell kezdődnie."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/platform/keybinding/common/abstractKeybindingService.i18n.json b/i18n/hun/src/vs/platform/keybinding/common/abstractKeybindingService.i18n.json
deleted file mode 100644
index 36c0c154ad2..00000000000
--- a/i18n/hun/src/vs/platform/keybinding/common/abstractKeybindingService.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"first.chord": "Lenyomott billentyű: ({0}) Várakozás a kombináció második billentyűjére...",
-	"missing.chord": "A(z) ({0}, {1}) billentyűkombináció nem egy parancs."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/platform/list/browser/listService.i18n.json b/i18n/hun/src/vs/platform/list/browser/listService.i18n.json
deleted file mode 100644
index 23a85678ca5..00000000000
--- a/i18n/hun/src/vs/platform/list/browser/listService.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"workbenchConfigurationTitle": "Munkaterület",
-	"multiSelectModifier.ctrlCmd": "Windows és Linux alatt a `Control`, macOS alatt a `Command` billentyűt jelenti.",
-	"multiSelectModifier.alt": "Windows és Linux alatt az `Alt`, macOS alatt az `Option` billentyűt jelenti.",
-	"multiSelectModifier": "Több elem kijelölése esetén újabb elem hozzáadásához használt módosítóbillentyű a fanézetekben és listákban (például a fájlkezelőben, a megnyitott szerkesztőablakok listájában és a verziókezelő rendszer nézeten). A `ctrlCmd` Windows és Linux alatt a `Control`, macOS alatt a `Command` billentyűt jelenti. A 'Megnyitás oldalt\" egérgesztusok – ha támogatva vannak – automatikusan úgy lesznek beállítva, hogy ne ütközzenek a több elem kijelöléséhez tartozó módosító billentyűvel.",
-	"openMode.singleClick": "Elemek megnyitása egyetlen kattintásra.",
-	"openMode.doubleClick": "Elemek megnyitása dupla kattintásra.",
-	"openModeModifier": "Meghatározza, hogyan nyíljanak meg az elemek a fanézetekben és listákban egér használata esetén (ha támogatott). `singleClick` esetén egyetlen kattintásra megnyílnak az elemek, míg `doubleClick` esetén dupla kattintás szükséges. Fanézeteknél meghatározza, hogy a szülőelemek egyetlen vagy dupla kattintásra nyílnak ki. Megjegyzés: néhány fanézet és lista figyelmen kívül hagyja ezt a beállítást ott, ahol ez nem alkalmazható. ",
-	"horizontalScrolling setting": "Meghatározza, hogy a fák támogatják-e a vízszintes görgetést a munkaterületen."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/platform/localizations/common/localizations.i18n.json b/i18n/hun/src/vs/platform/localizations/common/localizations.i18n.json
deleted file mode 100644
index abad9f3e01b..00000000000
--- a/i18n/hun/src/vs/platform/localizations/common/localizations.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.contributes.localizations": "Lokalizációkat szolgáltat a szerkesztőhöz",
-	"vscode.extension.contributes.localizations.languageId": "Annak a nyelvnek az azonosítója, amelyre a megjelenített szövegek fordítva vannak.",
-	"vscode.extension.contributes.localizations.languageName": "A nyelv neve angolul.",
-	"vscode.extension.contributes.localizations.languageNameLocalized": "A nyelv neve a szolgáltatott nyelven.",
-	"vscode.extension.contributes.localizations.translations": "A nyelvhez rendelt fordítások listája.",
-	"vscode.extension.contributes.localizations.translations.id": "Azonosító, ami a VS Code-ra vagy arra a kiegészítőre hivatkozik, amihez a fordítás szolgáltatva van. A VS Code azonosítója mindig `vscode`, kiegészítők esetén pedig a `publisherId.extensionName` formátumban kell megadni.",
-	"vscode.extension.contributes.localizations.translations.id.pattern": "Az id értéke VS Code fordítása esetében `vscode`, egy kiegészítő esetében pedig `publisherId.extensionName` formátumú lehet.",
-	"vscode.extension.contributes.localizations.translations.path": "A nyelvhez tartozó fordításokat tartalmazó fájl relatív elérési útja."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/platform/markers/common/markers.i18n.json b/i18n/hun/src/vs/platform/markers/common/markers.i18n.json
deleted file mode 100644
index ba6e96532e0..00000000000
--- a/i18n/hun/src/vs/platform/markers/common/markers.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"sev.error": "Hiba",
-	"sev.warning": "Figyelmeztetés",
-	"sev.info": "Információ"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/platform/markers/common/problemMatcher.i18n.json b/i18n/hun/src/vs/platform/markers/common/problemMatcher.i18n.json
deleted file mode 100644
index d3f01f7cbfe..00000000000
--- a/i18n/hun/src/vs/platform/markers/common/problemMatcher.i18n.json
+++ /dev/null
@@ -1,72 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"ProblemPatternParser.loopProperty.notLast": "A loop tulajdonság csak az utolsó, sorra illesztő kifejezésnél támogatott.",
-	"ProblemPatternParser.problemPattern.missingRegExp": "A problémamintából hiányzik egy reguláris kifejezés.",
-	"ProblemPatternParser.problemPattern.missingProperty": "A probléma mintája érvénytelen. Mindenképp tartalmaznia kell egy fájlra, egy üzenetre és egy sorra vagy helyre illesztő csoportot.",
-	"ProblemPatternParser.invalidRegexp": "Hiba: A(z) {0} karakterlánc nem érvényes reguláris kifejezés.\n",
-	"ProblemPatternSchema.regexp": "A kimenetben található hibák, figyelmeztetések és információk megkeresésére használt reguláris kifejezés.",
-	"ProblemPatternSchema.file": "Annak az illesztési csoportnak az indexe, amely tartalmazza azt, hogy a probléma melyik fájlban található. Ha nincs megadva, akkor az alapértelmezett érték, 1 van használva.",
-	"ProblemPatternSchema.location": "Annak az illesztési csoportnak az indexe, amely tartalmazza a probléma helyét. Az érvényes minták helyek illesztésére: (line), (line,column) és (startLine,startColumn,endLine,endColumn). Ha nincs megadva, akkor a (line,column) van feltételezve.",
-	"ProblemPatternSchema.line": "Annak az illesztési csoportnak az indexe, amely tartalmazza azt, hogy a probléma hanyadik sorban található. Alapértelmezett értéke 2.",
-	"ProblemPatternSchema.column": "Annak az illesztési csoportnak az indexe, amely tartalmazza azt, hogy a probléma az adott soron belül mely oszlopban található. Alapértelmezett értéke 3.",
-	"ProblemPatternSchema.endLine": "Annak az illesztési csoportnak az indexe, amely tartalmazza azt, hogy a probléma mely sorban ér véget. Alapértelmezett értéke határozatlan.",
-	"ProblemPatternSchema.endColumn": "Annak az illesztési csoportnak az indexe, amely tartalmazza azt, hogy a probléma  vége a zárósoron belül mely oszlopban található. Alapértelmezett értéke határozatlan.",
-	"ProblemPatternSchema.severity": "Annak az illesztési csoportnak az indexe, amely tartalmazza a probléma súlyosságát. Alapértelmezett értéke határozatlan.",
-	"ProblemPatternSchema.code": "Annak az illesztési csoportnak az indexe, amely tartalmazza a problémás kódrészletet. Alapértelmezett értéke határozatlan.",
-	"ProblemPatternSchema.message": "Annak az illesztési csoportnak az indexe, amely tartalmazza az üzenetet. Ha nincs megadva, és a location paraméternek van értéke, akkor a 4, minden más esetben 5 az alapértelmezett érték.",
-	"ProblemPatternSchema.loop": "Több soros illesztés esetén meghatározza, hogy az aktuális minta mindaddig végre legyen-e hajtva, amíg eredményt talál. Csak többsoros minta esetén használható, utolsóként.",
-	"NamedProblemPatternSchema.name": "A problémaminta neve.",
-	"NamedMultiLineProblemPatternSchema.name": "A többsoros problémaminta neve.",
-	"NamedMultiLineProblemPatternSchema.patterns": "A konkrét minkák.",
-	"ProblemPatternExtPoint": "Problémamintákat szolgáltat.",
-	"ProblemPatternRegistry.error": "Érvénytelen problémaminta. A minta figyelmen kívül lesz hagyva.",
-	"ProblemMatcherParser.noProblemMatcher": "Hiba: a leírást nem sikerült problémaillesztővé alakítani:\n{0}\n",
-	"ProblemMatcherParser.noProblemPattern": "Hiba: a leírás nem definiál érvényes problémamintát:\n{0}\n",
-	"ProblemMatcherParser.noOwner": "Hiba: a leírás nem határoz meg tulajdonost:\n{0}\n",
-	"ProblemMatcherParser.noFileLocation": "Hiba: a leírás nem határoz meg fájlhelyszínt:\n{0}\n",
-	"ProblemMatcherParser.unknownSeverity": "Információ: ismeretlen súlyosság: {0}. Az érvényes értékek: error, warning és info.\n",
-	"ProblemMatcherParser.noDefinedPatter": "Hiba: nem létezik {0} azonosítóval rendelkező minta.",
-	"ProblemMatcherParser.noIdentifier": "Hiba: a minta tulajdonság egy üres azonosítóra hivatkozik.",
-	"ProblemMatcherParser.noValidIdentifier": "Hiba: a minta {0} tulajdonsága nem érvényes mintaváltozónév.",
-	"ProblemMatcherParser.problemPattern.watchingMatcher": "A problémaillesztőnek definiálnia kell a kezdőmintát és a zárómintát is a figyeléshez.",
-	"ProblemMatcherParser.invalidRegexp": "Hiba: A(z) {0} karakterlánc nem érvényes reguláris kifejezés.\n",
-	"WatchingPatternSchema.regexp": "Reguláris kifejezés a háttérben futó feladat indulásának vagy befejeződésének detektálására.",
-	"WatchingPatternSchema.file": "Annak az illesztési csoportnak az indexe, amely tartalmazza azt, hogy a probléma melyik fájlban található. Elhagyható.",
-	"PatternTypeSchema.name": "Egy szolgáltatott vagy elődefiniált minta neve",
-	"PatternTypeSchema.description": "Egy problémaminta vagy egy szolgáltatott vagy elődefiniált problémaminta neve. Elhagyható, ha az alapként használandó minta meg van adva.",
-	"ProblemMatcherSchema.base": "A alapként használni kívánt problémaillesztő neve.",
-	"ProblemMatcherSchema.owner": "A probléma tulajdonosa a Code-on belül. Elhagyható, ha az alapként használt minta meg van adva. Alapértelmezett értéke 'external', ha nem létezik és az alapként használt minta nincs meghatározva.",
-	"ProblemMatcherSchema.severity": "Az elkapott problémák alapértelmezett súlyossága. Ez az érték van használva, ha a minta nem definiál illesztési csoportot a súlyossághoz.",
-	"ProblemMatcherSchema.applyTo": "Meghatározza, hogy a szöveges dokumentumhoz jelentett probléma megnyitott, bezárt vagy minden dokumentumra legyen alkalmazva.",
-	"ProblemMatcherSchema.fileLocation": "Meghatározza, hogy a problémamintában talált fájlnevek hogyan legyenek értelmezve.",
-	"ProblemMatcherSchema.background": "Minták, melyekkel követhető egy háttérben futó feladaton aktív illesztő indulása és befejeződése.",
-	"ProblemMatcherSchema.background.activeOnStart": "Ha értéke igaz, akkor a háttérfeladat aktív módban van, amikor a feladat indul. Ez egyenlő egy olyan sor kimenetre történő kiírásával, ami illeszkedik a beginPatternre.",
-	"ProblemMatcherSchema.background.beginsPattern": "Ha illeszkedik a kimenetre, akkor a háttérben futó feladat elindulása lesz jelezve.",
-	"ProblemMatcherSchema.background.endsPattern": "Ha illeszkedik a kimenetre, akkor a háttérben futó feladat befejeződése lesz jelezve.",
-	"ProblemMatcherSchema.watching.deprecated": "A watching tulajdonság elavult. Használja a backgroundot helyette.",
-	"ProblemMatcherSchema.watching": "Minták, melyekkel következő a figyelő illesztők indulása és befejeződése.",
-	"ProblemMatcherSchema.watching.activeOnStart": "Ha értéke igaz, akkor a figyelő aktív módban van, amikor a feladat indul. Ez egyenlő egy olyan sor kimenetre történő kiírásával, ami illeszkedik a beginPatternre.",
-	"ProblemMatcherSchema.watching.beginsPattern": "Ha illeszkedik a kimenetre, akkor a figyelő feladat elindulása lesz jelezve.",
-	"ProblemMatcherSchema.watching.endsPattern": "Ha illeszkedik a kimenetre, akkor a figyelő feladat befejeződése lesz jelezve.",
-	"LegacyProblemMatcherSchema.watchedBegin.deprecated": "Ez a tulajdonság elavult. Használja a watching tulajdonságot helyette.",
-	"LegacyProblemMatcherSchema.watchedBegin": "Reguláris kifejezés, mely jelzi, hogy a figyeltő feladatok fájlmódosítás miatt éppen műveletet hajtanak végre.",
-	"LegacyProblemMatcherSchema.watchedEnd.deprecated": "Ez a tulajdonság elavult. Használja a watching tulajdonságot helyette.",
-	"LegacyProblemMatcherSchema.watchedEnd": "Reguláros kifejezés, ami jelzi, hogy a figyelő feladat befejezte a végrehajtást.",
-	"NamedProblemMatcherSchema.name": "A problémaillesztő neve, amivel hivatkozni lehet rá.",
-	"NamedProblemMatcherSchema.label": "A problémaillesztő leírása emberek számára.",
-	"ProblemMatcherExtPoint": "Problémaillesztőket szolgáltat.",
-	"msCompile": "Microsoft fordítói problémák",
-	"lessCompile": "Less-problémák",
-	"gulp-tsc": "Gulp TSC-problémák",
-	"jshint": "JSHint-problémák",
-	"jshint-stylish": "JSHint stylish-problémák",
-	"eslint-compact": "ESLint compact-problémák",
-	"eslint-stylish": "ESLint stylish-problémák",
-	"go": "Go-problémák"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/platform/message/common/message.i18n.json b/i18n/hun/src/vs/platform/message/common/message.i18n.json
deleted file mode 100644
index edfa6c97087..00000000000
--- a/i18n/hun/src/vs/platform/message/common/message.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"close": "Bezárás",
-	"later": "Később",
-	"cancel": "Mégse",
-	"moreFile": "...1 további fájl nincs megjelenítve",
-	"moreFiles": "...{0} további fájl nincs megjelenítve"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/platform/node/minimalTranslations.i18n.json b/i18n/hun/src/vs/platform/node/minimalTranslations.i18n.json
deleted file mode 100644
index 012bbf8dda2..00000000000
--- a/i18n/hun/src/vs/platform/node/minimalTranslations.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"showLanguagePackExtensions": "A VS Code elérhető {0} nyelven. Keresse meg a nyelvi csomagot a piactéren a használatához!",
-	"searchMarketplace": "Keresés a piactéren",
-	"installAndRestartMessage": "A VS Code elérhető {0} nyelven, melyet a nyelvi csomag telepítése után aktiválhat. A telepítés után újraindítás szükséges.",
-	"installAndRestart": "Telepítés és újraindítás"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/platform/request/node/request.i18n.json b/i18n/hun/src/vs/platform/request/node/request.i18n.json
deleted file mode 100644
index 80ac67c0f64..00000000000
--- a/i18n/hun/src/vs/platform/request/node/request.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"httpConfigurationTitle": "HTTP",
-	"proxy": "A használni kívánt proxybeállítás. Ha nincs beállítva, a http_proxy és a https_proxy környezeti változókból lesz átvéve",
-	"strictSSL": "A proxyszerver tanúsítványa hitelesítve legyen-e a megadott hitelesítésszolgáltatóknál.",
-	"proxyAuthorization": "Minden hálózati kérés 'Proxy-Authorization' fejlécében küldendő érték."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/platform/telemetry/common/telemetryService.i18n.json b/i18n/hun/src/vs/platform/telemetry/common/telemetryService.i18n.json
deleted file mode 100644
index 4b67a44ef8a..00000000000
--- a/i18n/hun/src/vs/platform/telemetry/common/telemetryService.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"telemetryConfigurationTitle": "Telemetria",
-	"telemetry.enableTelemetry": "Használati adatok és hibák küldésének engedélyezése a Microsoft felé."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/platform/theme/common/colorExtensionPoint.i18n.json b/i18n/hun/src/vs/platform/theme/common/colorExtensionPoint.i18n.json
deleted file mode 100644
index de7dfdd7463..00000000000
--- a/i18n/hun/src/vs/platform/theme/common/colorExtensionPoint.i18n.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"contributes.color": "Kiegészítők által definiált, témázható színeket szolgáltat.",
-	"contributes.color.id": "A témázható szín azonosítója.",
-	"contributes.color.id.format": "Az azonosítókat az aa[.bb]* formában kell megadni.",
-	"contributes.color.description": "A témázható szín leírása.",
-	"contributes.defaults.light": "Az alapértelmezett szín világos témák esetén. Vagy egy szín hex formátumban (#RRGGBB[AA]) vagy egy témázható szín azonosítója, ami meghatározza az alapértelmezett értéket.",
-	"contributes.defaults.dark": "Az alapértelmezett szín sötét témák esetén. Vagy egy szín hex formátumban (#RRGGBB[AA]) vagy egy témázható szín azonosítója, ami meghatározza az alapértelmezett értéket.",
-	"contributes.defaults.highContrast": "Az alapértelmezett szín nagy kontrasztú témák esetén. Vagy egy szín hex formátumban (#RRGGBB[AA]) vagy egy témázható szín azonosítója, ami meghatározza az alapértelmezett értéket.",
-	"invalid.colorConfiguration": "a 'configuration.colors' értékét tömbként kell megadni",
-	"invalid.default.colorType": "A(z) {0} értéke egy szín hex formátumban (#RRGGBB[AA]) vagy egy témázható szín azonosítója, ami meghatározza az alapértelmezett értéket.",
-	"invalid.id": "A 'configuration.colors.id' értékét meg kell adni, és nem lehet üres",
-	"invalid.id.format": "A 'configuration.colors.id' értékét a word[.word]* formátumban kell megadni.",
-	"invalid.description": "A 'configuration.colors.description' értékét meg kell adni, és nem lehet üres",
-	"invalid.defaults": "A 'configuration.colors.defaults' értékét meg kell adni, és tartalmaznia kell 'light', 'dark' és 'highContrast' tulajdonságokat"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/platform/theme/common/colorRegistry.i18n.json b/i18n/hun/src/vs/platform/theme/common/colorRegistry.i18n.json
deleted file mode 100644
index b9f948caca1..00000000000
--- a/i18n/hun/src/vs/platform/theme/common/colorRegistry.i18n.json
+++ /dev/null
@@ -1,101 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"schema.colors": "A munkaterületen használt színek.",
-	"foreground": "Általános előtérszín. Csak akkor van használva, ha nem írja felül az adott komponens.",
-	"errorForeground": "A hibaüzenetek általános előtérszíne. Csak akkor van használva, ha nem írja felül az adott komponens.",
-	"descriptionForeground": "A további információkat szolgáltató leíró szövegek, pl. a címkék előtérszíne.",
-	"focusBorder": "Fókuszált elemek keretének általános színe. Csak akkor van használva, ha nem írja felül az adott komponens.",
-	"contrastBorder": "Az elemek körüli extra keret, mely arra szolgál, hogy elválassza egymástól őket, így növelve a kontrasztot.",
-	"activeContrastBorder": "Az aktív elemek körüli extra keret, mely arra szolgál, hogy elválassza egymástól őket, így növelve a kontrasztot.",
-	"selectionBackground": "A munkaterületen kijelölt szövegek háttérszíne (pl. beviteli mezők vagy szövegmezők esetén). Ez a beállítás nem vonatkozik a szerkesztőablakban végzett kijelölésekre. ",
-	"textSeparatorForeground": "A szövegelválasztók színe.",
-	"textLinkForeground": "A szövegben található hivatkozások előtérszíne.",
-	"textLinkActiveForeground": "A szövegben található hivatkozások előtérszíne kattintás esetén és ha az egér fölötte van.",
-	"textPreformatForeground": "Az előformázott szövegrészek előtérszíne.",
-	"textBlockQuoteBackground": "A szövegben található idézetblokkok háttérszíne.",
-	"textBlockQuoteBorder": "A szövegben található idézetblokkok keretszíne.",
-	"textCodeBlockBackground": "A szövegben található kódblokkok háttérszíne.",
-	"widgetShadow": "A szerkesztőablakon belül található modulok, pl. a keresés/csere árnyékának színe.",
-	"inputBoxBackground": "A beviteli mezők háttérszíne.",
-	"inputBoxForeground": "A beviteli mezők előtérszíne.",
-	"inputBoxBorder": "A beviteli mezők kerete.",
-	"inputBoxActiveOptionBorder": "A beviteli mezőben található aktivált beállítások keretszíne.",
-	"inputPlaceholderForeground": "A beviteli mezőkben használt helykitöltő szövegek előtérszíne.",
-	"inputValidationInfoBackground": "Beviteli mezők háttérszíne információs szintű validációs állapot esetén.",
-	"inputValidationInfoBorder": "Beviteli mezők keretszíne információs szintű validációs állapot esetén.",
-	"inputValidationWarningBackground": "Beviteli mezők háttérszíne figyelmeztetés szintű validációs állapot esetén.",
-	"inputValidationWarningBorder": "Beviteli mezők keretszíne figyelmeztetés szintű validációs állapot esetén.",
-	"inputValidationErrorBackground": "Beviteli mezők háttérszíne hiba szintű validációs állapot esetén.",
-	"inputValidationErrorBorder": "Beviteli mezők keretszíne hiba szintű validációs állapot esetén.",
-	"dropdownBackground": "A legördülő menük háttérszíne.",
-	"dropdownListBackground": "A legördülő menük listájának háttérszíne.",
-	"dropdownForeground": "A legördülő menük előtérszíne.",
-	"dropdownBorder": "A legördülő menük kerete.",
-	"listFocusBackground": "Listák/fák fókuszált elemének háttérszine, amikor a lista aktív. Egy aktív listának/fának van billentyűfőkusza, míg egy inaktívnak nincs.",
-	"listFocusForeground": "Listák/fák fókuszált elemének előtérszíne, amikor a lista aktív. Egy aktív listának/fának van billentyűfőkusza, míg egy inaktívnak nincs.",
-	"listActiveSelectionBackground": "Listák/fák kiválasztott elemének háttérszíne, amikor a lista aktív. Egy aktív listának/fának van billentyűfőkusza, míg egy inaktívnak nincs.",
-	"listActiveSelectionForeground": "Listák/fák kiválasztott elemének előtérszíne, amikor a lista aktív. Egy aktív listának/fának van billentyűfőkusza, míg egy inaktívnak nincs.",
-	"listInactiveSelectionBackground": "Listák/fák kiválasztott elemének háttérszíne, amikor a lista inaktív. Egy aktív listának/fának van billentyűfőkusza, míg egy inaktívnak nincs.",
-	"listInactiveSelectionForeground": "Listák/fák kiválasztott elemének előtérszíne, amikor a lista inaktív. Egy aktív listának/fának van billentyűfőkusza, míg egy inaktívnak nincs.",
-	"listHoverBackground": "A lista/fa háttérszíne, amikor az egérkurzor egy adott elem fölé kerül.",
-	"listHoverForeground": "A lista/fa előtérszíne, amikor az egérkurzor egy adott elem fölé kerül.",
-	"listDropBackground": "A lista/fa háttérszíne, amikor az elemek az egérkurzorral vannak mozgatva egyik helyről a másikra.",
-	"highlight": "Kiemelt találatok előtérszíne a listában/fában való keresés esetén.",
-	"invalidItemForeground": "A lista/fa előtérszíne érvénytelen elemek esetén, például még nem feloldott gyökérelemek esetében a fájlkezelőben.",
-	"listErrorForeground": "A hibákat tartalmazó listaelemek előtérszíne.",
-	"listWarningForeground": "A figyelmeztetéseket tartalmazó listaelemek előtérszíne.",
-	"pickerGroupForeground": "Csoportcímkék színe a gyorsválasztóban.",
-	"pickerGroupBorder": "Csoportok keretszíne a gyorsválasztóban.",
-	"buttonForeground": "A gombok előtérszíne.",
-	"buttonBackground": "A gombok háttérszíne.",
-	"buttonHoverBackground": "A gomb háttérszine, ha az egérkurzor fölötte van.",
-	"badgeBackground": "A jelvények háttérszíne. A jelvények apró információs címkék, pl. a keresési eredmények számának jelzésére.",
-	"badgeForeground": "A jelvények előtérszíne. A jelvények apró információs címkék, pl. a keresési eredmények számának jelzésére.",
-	"scrollbarShadow": "A görgetősáv árnyéka, ami jelzi, hogy a nézet el van görgetve.",
-	"scrollbarSliderBackground": "A görgetősáv csúszkájának háttérszíne.",
-	"scrollbarSliderHoverBackground": "A görgetősáv csúszkájának háttérszíne, ha az egérkurzor fölötte van.",
-	"scrollbarSliderActiveBackground": "A görgetősáv csúszkájának háttérszíne, ha rákattintanak.",
-	"progressBarBackground": "A hosszú ideig tartó folyamatok esetén megjelenített folyamatjelző háttérszíne.",
-	"editorBackground": "A szerkesztőablak háttérszíne.",
-	"editorForeground": "A szerkesztőablak alapértelmezett előtérszíne.",
-	"editorWidgetBackground": "A szerkesztőablak moduljainak háttérszíne, pl. a keresés/cserének.",
-	"editorWidgetBorder": "A szerkesztőablak-modulok keretszíne. A szín csak akkor van használva, ha a modul beállítása alapján rendelkezik kerettel, és a színt nem írja felül a modul.",
-	"editorSelectionBackground": "A szerkesztőablak-szakasz színe.",
-	"editorSelectionForeground": "A kijelölt szöveg színe nagy kontrasztú téma esetén.",
-	"editorInactiveSelection": "Az inaktív szerkesztőablakban található kijelölések színe. A színnek áttetszőnek kell lennie, hogy ne fedje el az alatta lévő dekorátorokat.",
-	"editorSelectionHighlight": "A kijelöléssel megegyező tartalmú területek színe. A színnek áttetszőnek kell lennie, hogy ne fedje el az alatta lévő dekorátorokat.",
-	"editorSelectionHighlightBorder": "A kijelöléssel megegyező tartalmú területek keretszíne.",
-	"editorFindMatch": "A keresés jelenlegi találatának színe.",
-	"findMatchHighlight": "A keresés további találatainak színe. A színnek áttetszőnek kell lennie, hogy ne fedje el az alatta lévő dekorátorokat.",
-	"findRangeHighlight": "A keresést korlátozó terület színe. A színnek áttetszőnek kell lennie, hogy ne fedje el az alatta lévő dekorátorokat.",
-	"editorFindMatchBorder": "A keresés jelenlegi találatának keretszíne.",
-	"findMatchHighlightBorder": "A keresés további találatainak keretszíne.",
-	"findRangeHighlightBorder": "A keresést korlátozó terület keretszíne. A színnek áttetszőnek kell lennie, hogy ne fedje el az alatta lévő dekorátorokat.",
-	"findWidgetResizeBorder": "A keresőmodul átméretezősávjának keretszíne.",
-	"hoverHighlight": "Kiemelés azon szó alatt, amely fölött lebegő elem jelenik meg. A színnek áttetszőnek kell lennie, hogy ne fedje el az alatta lévő dekorátorokat.",
-	"hoverBackground": "A szerkesztőablakban lebegő elemek háttérszíne.",
-	"hoverBorder": "A szerkesztőablakban lebegő elemek keretszíne.",
-	"activeLinkForeground": "Az aktív hivatkozások háttérszíne.",
-	"diffEditorInserted": "A beszúrt szöveg háttérszíne. A színnek áttetszőnek kell lennie, hogy ne fedje el az alatta lévő dekorátorokat.",
-	"diffEditorRemoved": "Az eltávolított szöveg háttérszíne. A színnek áttetszőnek kell lennie, hogy ne fedje el az alatta lévő dekorátorokat.",
-	"diffEditorInsertedOutline": "A beillesztett szövegek körvonalának színe.",
-	"diffEditorRemovedOutline": "Az eltávolított szövegek körvonalának színe.",
-	"mergeCurrentHeaderBackground": "A helyi tartalom fejlécének háttérszíne sorok között megjelenített összeolvasztási konfliktusok esetén. A színnek áttetszőnek kell lennie, hogy ne fedje el az alatta lévő dekorátorokat.",
-	"mergeCurrentContentBackground": "A helyi tartalom háttérszíne sorok között megjelenített összeolvasztási konfliktusok esetén. A színnek áttetszőnek kell lennie, hogy ne fedje el az alatta lévő dekorátorokat.",
-	"mergeIncomingHeaderBackground": "A beérkező tartalom fejlécének háttérszíne sorok között megjelenített összeolvasztási konfliktusok esetén. A színnek áttetszőnek kell lennie, hogy ne fedje el az alatta lévő dekorátorokat.",
-	"mergeIncomingContentBackground": "A beérkező tartalom háttérszíne sorok között megjelenített összeolvasztási konfliktusok esetén. A színnek áttetszőnek kell lennie, hogy ne fedje el az alatta lévő dekorátorokat.",
-	"mergeCommonHeaderBackground": "A közös ős tartalom fejlécének háttérszíne sorok között megjelenített összeolvasztási konfliktusok esetén. A színnek áttetszőnek kell lennie, hogy ne fedje el az alatta lévő dekorátorokat.",
-	"mergeCommonContentBackground": "A közös ős tartalmának háttérszíne sorok között megjelenített összeolvasztási konfliktusok esetén. A színnek áttetszőnek kell lennie, hogy ne fedje el az alatta lévő dekorátorokat.",
-	"mergeBorder": "A fejlécek és az elválasztó sáv keretszíne a sorok között megjelenített összeolvasztási konfliktusok esetén.",
-	"overviewRulerCurrentContentForeground": "A helyi tartalom előtérszíne az áttekintő sávon összeolvasztási konfliktusok esetén.",
-	"overviewRulerIncomingContentForeground": "A beérkező tartalom előtérszíne az áttekintő sávon összeolvasztási konfliktusok esetén.",
-	"overviewRulerCommonContentForeground": "A közös ős tartalom előtérszíne az áttekintő sávon összeolvasztási konfliktusok esetén. ",
-	"overviewRulerFindMatchForeground": "A keresési találatokat jelölő jelzések színe az áttekintősávon. A színnek áttetszőnek kell lennie, hogy ne fedje el az alatta lévő dekorátorokat.",
-	"overviewRulerSelectionHighlightForeground": "A kijelölt területeket jelölő jelzések színe az áttekintősávon. A színnek áttetszőnek kell lennie, hogy ne fedje el az alatta lévő dekorátorokat."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/platform/update/node/update.config.contribution.i18n.json b/i18n/hun/src/vs/platform/update/node/update.config.contribution.i18n.json
deleted file mode 100644
index 539539fee3a..00000000000
--- a/i18n/hun/src/vs/platform/update/node/update.config.contribution.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"updateConfigurationTitle": "Frissítés",
-	"updateChannel": "Meghatározza, hogy érkeznek-e automatikus frissítések a frissítési csatornáról. A beállítás módosítása után újraindítás szükséges.",
-	"enableWindowsBackgroundUpdates": "Háttérben történő frissítés engedélyezése Windowson."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/platform/url/electron-browser/inactiveExtensionUrlHandler.i18n.json b/i18n/hun/src/vs/platform/url/electron-browser/inactiveExtensionUrlHandler.i18n.json
deleted file mode 100644
index 4669c26ac46..00000000000
--- a/i18n/hun/src/vs/platform/url/electron-browser/inactiveExtensionUrlHandler.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"confirmUrl": "Engedélyezi a hivatkozás megnyitásást egy kiegészítő számára?"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/platform/windows/electron-main/windowsService.i18n.json b/i18n/hun/src/vs/platform/windows/electron-main/windowsService.i18n.json
deleted file mode 100644
index 6b754ae6899..00000000000
--- a/i18n/hun/src/vs/platform/windows/electron-main/windowsService.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"aboutDetail": "\nVerzió: {0}\nCommit: {1}\nDátum: {2}\nShell: {3}\nRenderelő: {4}\nNode: {5}\nArchitektúra: {6}",
-	"okButton": "OK",
-	"copy": "&&Másolás"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/platform/workspaces/common/workspaces.i18n.json b/i18n/hun/src/vs/platform/workspaces/common/workspaces.i18n.json
deleted file mode 100644
index bcfb490cbc6..00000000000
--- a/i18n/hun/src/vs/platform/workspaces/common/workspaces.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"codeWorkspace": "Code-munkaterület",
-	"untitledWorkspace": "Névtelen (munkaterület)",
-	"workspaceNameVerbose": "{0} (munkaterület)",
-	"workspaceName": "{0} (munkaterület)"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/api/browser/localizationsExtensionPoint.i18n.json b/i18n/hun/src/vs/workbench/api/browser/localizationsExtensionPoint.i18n.json
deleted file mode 100644
index 562da69e9bd..00000000000
--- a/i18n/hun/src/vs/workbench/api/browser/localizationsExtensionPoint.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"requirearray": "a localizationst tömbként kell megadni",
-	"requirestring": "a(z) `{0}` tulajdonság kötelező és `string` típusúnak kell lennie",
-	"optstring": "a(z) `{0}` tulajdonság elhagyható vagy `string` típusúnak kell lennie",
-	"vscode.extension.contributes.localizations": "Lokalizációkat szolgáltat a szerkesztőhöz",
-	"vscode.extension.contributes.localizations.languageId": "Annak a nyelvnek az azonosítója, amelyre a megjelenített szövegek fordítva vannak.",
-	"vscode.extension.contributes.localizations.languageName": "Annak a nyelvnek a neve, amelyre a megjelenített szövegek fordítva vannak.",
-	"vscode.extension.contributes.localizations.translations": "A nyelvhez tartozó összes, fordítási fájlokat tartalmazó mappa relatív elérési útja."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/api/browser/viewsContainersExtensionPoint.i18n.json b/i18n/hun/src/vs/workbench/api/browser/viewsContainersExtensionPoint.i18n.json
deleted file mode 100644
index 1635f0d479a..00000000000
--- a/i18n/hun/src/vs/workbench/api/browser/viewsContainersExtensionPoint.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.contributes.views.containers.id": "A gyűjtemény egyedi azonosítója, mellyel nézetek rendelhetők hozzá a 'views' értékeivel.",
-	"vscode.extension.contributes.views.containers.title": "A gyűjtemény megjelenítésénél használt, emberek számára szánt neve",
-	"vscode.extension.contributes.views.containers.icon": "A gyűjtemény ikonjának elérési útja. Az ikonok 24x24 pixel méretűek, és középre vannak igazítva egy 50x40-es téglalapban. A kitöltési színük 'rgb(215, 218, 224)' vagy '#d7dae0'. Ajánlott az SVG-formátum használata, de bármely képfájltípus elfogadott.",
-	"vscode.extension.contributes.viewsContainers": "Nézetgyűjteményeket szolgáltat a szerkesztőhöz",
-	"views.container.activitybar": "Nézetgyűjteményeket szolgáltat a tevékenységsávra",
-	"test": "Teszt",
-	"requirearray": "a nézetgyűjteményeket tömbként kell megadni",
-	"requireidstring": "a(z) `{0}` tulajdonság kötelező és `string` típusúnak kell lennie. Csak alfanumerikus karaktereket, alulvonást és kötőjelet tartalmazhat.",
-	"requirestring": "a(z) `{0}` tulajdonság kötelező és `string` típusúnak kell lennie",
-	"showViewlet": "{0} megjelenítése",
-	"view": "Nézet"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json b/i18n/hun/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json
deleted file mode 100644
index 562dc2d0d3a..00000000000
--- a/i18n/hun/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"requirearray": "a nézeteket tömbként kell megadni",
-	"requirestring": "a(z) `{0}` tulajdonság kötelező és `string` típusúnak kell lennie",
-	"optstring": "a(z) `{0}` tulajdonság elhagyható vagy `string` típusúnak kell lennie",
-	"vscode.extension.contributes.view.id": "A nézet azonosítója. Ez használható az adatszolgáltató regisztrálásához a `vscode.window.registerTreeDataProviderForView` API-n keresztül. Ezen túl a kiegészítő aktiválásához regisztrálni kell az `onView:${id}` eseményt az `activationEvents`-nél.",
-	"vscode.extension.contributes.view.name": "A nézet emberek számára szánt neve. Megjelenik a felületen.",
-	"vscode.extension.contributes.view.when": "A nézet megjelenítésének feltétele",
-	"vscode.extension.contributes.views": "Nézeteket szolgáltat a szerkesztőhöz",
-	"views.explorer": "Nézeteket szolgáltat a tevékenységsávon található Fájlkezelő gyűjteményhez.",
-	"views.debug": "Nézeteket szolgáltat a tevékenységsávon található Hibakeresés gyűjteményhez.",
-	"views.scm": "Nézeteket szolgáltat a tevékenységsávon található Verziókezelő rendszer gyűjteményhez.",
-	"views.test": "Nézeteket szolgáltat a tevékenységsávon található Teszt gyűjteményhez.",
-	"views.contributed": "Nézeteket szolgáltat a szolgáltatott nézetek gyűjteményhez.",
-	"ViewContainerDoesnotExist": "Nem létezik '{0}' azonosítójú nézetgyűjtemény, és az összes oda regisztrált nézet a Fájlkezelőhöz lesz hozzáadva.",
-	"duplicateView1": "Nem regisztrálható több nézet `{0}` azonosítóval a következő helyen: `{1}`",
-	"duplicateView2": "Már van `{0}` azonosítójú nézet regisztrálva a következő helyen: `{1}`"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/api/electron-browser/mainThreadExtensionService.i18n.json b/i18n/hun/src/vs/workbench/api/electron-browser/mainThreadExtensionService.i18n.json
deleted file mode 100644
index c9ac5c4a126..00000000000
--- a/i18n/hun/src/vs/workbench/api/electron-browser/mainThreadExtensionService.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"overwritingExtension": "A(z) {0} kiegészítő felülírása a következővel: {1}.",
-	"extensionUnderDevelopment": "A(z) {0} elérési úton található fejlesztői kiegészítő betöltése"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/api/electron-browser/mainThreadMessageService.i18n.json b/i18n/hun/src/vs/workbench/api/electron-browser/mainThreadMessageService.i18n.json
deleted file mode 100644
index 0031ab4d4eb..00000000000
--- a/i18n/hun/src/vs/workbench/api/electron-browser/mainThreadMessageService.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"extensionSource": "{0} (kiegészítő)",
-	"defaultSource": "Kiegészítő",
-	"manageExtension": "Kiegészítő kezelése",
-	"cancel": "Mégse",
-	"ok": "OK"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json b/i18n/hun/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
deleted file mode 100644
index d0aa3c15e34..00000000000
--- a/i18n/hun/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"timeout.formatOnSave": "Mentéskor végzett formázás megszakítva {0}ms után",
-	"codeActionsOnSave.didTimeout": "codeActionsOnSave megszakítva {0}ms után",
-	"timeout.onWillSave": "OnWillSaveTextDocument-esemény megszakítva 1750ms után",
-	"saveParticipants": "Mentési események futtatása..."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json b/i18n/hun/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json
deleted file mode 100644
index ee8688cdc85..00000000000
--- a/i18n/hun/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"task.label": "{0}: {1}"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/api/electron-browser/mainThreadWebview.i18n.json b/i18n/hun/src/vs/workbench/api/electron-browser/mainThreadWebview.i18n.json
deleted file mode 100644
index 92725a915cc..00000000000
--- a/i18n/hun/src/vs/workbench/api/electron-browser/mainThreadWebview.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"errorMessage": "Hiba történt a nézet visszaállítása közben: {0}"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/api/electron-browser/mainThreadWorkspace.i18n.json b/i18n/hun/src/vs/workbench/api/electron-browser/mainThreadWorkspace.i18n.json
deleted file mode 100644
index 8a2823620d5..00000000000
--- a/i18n/hun/src/vs/workbench/api/electron-browser/mainThreadWorkspace.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"folderStatusMessageAddSingleFolder": "A(z) '{0}' kiegészítő egy mappát adott hozzá a munkaterülethez.",
-	"folderStatusMessageAddMultipleFolders": "A(z) '{0}' kiegészítő {0} mappát adott hozzá a munkaterülethez.",
-	"folderStatusMessageRemoveSingleFolder": "A(z) '{0}' kiegészítő eltávolított egy mappát a munkaterületről.",
-	"folderStatusMessageRemoveMultipleFolders": "A(z) '{0}' kiegészítő {1} mappát távolított el a munkaterületről.",
-	"folderStatusChangeFolder": "A(z) '{0}' kiegészítő módosította a munkaterület mappáit."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/api/node/extHostDiagnostics.i18n.json b/i18n/hun/src/vs/workbench/api/node/extHostDiagnostics.i18n.json
deleted file mode 100644
index fe39a7b9fd5..00000000000
--- a/i18n/hun/src/vs/workbench/api/node/extHostDiagnostics.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"limitHit": "{0} további hiba és figyelmeztetés nem jelenik meg."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/api/node/extHostExtensionActivator.i18n.json b/i18n/hun/src/vs/workbench/api/node/extHostExtensionActivator.i18n.json
deleted file mode 100644
index d9673b1c04f..00000000000
--- a/i18n/hun/src/vs/workbench/api/node/extHostExtensionActivator.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"unknownDep": "A(z) '{1}' kiegészítőt nem sikerült aktiválni. Oka: ismeretlen függőség: '{0}'.",
-	"failedDep1": "A(z) '{1}' kiegészítőt nem sikerült aktiválni. Oka: a(z) '{0}' függőséget nem sikerült aktiválni.",
-	"failedDep2": "A(z) '{0}' kiegészítőt nem sikerült aktiválni. Oka: több, mint 10  szintnyi függőség van (nagy valószínűséggel egy függőségi hurok miatt).",
-	"activationError": "Nem sikerült aktiválni a(z) `{0}` kiegészítőt: {1}."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/api/node/extHostProgress.i18n.json b/i18n/hun/src/vs/workbench/api/node/extHostProgress.i18n.json
deleted file mode 100644
index c073dbed804..00000000000
--- a/i18n/hun/src/vs/workbench/api/node/extHostProgress.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"extensionSource": "{0} (kiegészítő)"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/api/node/extHostTask.i18n.json b/i18n/hun/src/vs/workbench/api/node/extHostTask.i18n.json
deleted file mode 100644
index ee8688cdc85..00000000000
--- a/i18n/hun/src/vs/workbench/api/node/extHostTask.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"task.label": "{0}: {1}"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/api/node/extHostTreeViews.i18n.json b/i18n/hun/src/vs/workbench/api/node/extHostTreeViews.i18n.json
deleted file mode 100644
index ea4c6c99984..00000000000
--- a/i18n/hun/src/vs/workbench/api/node/extHostTreeViews.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"treeView.notRegistered": "Nincs '{0}' azonosítóval regisztrált fanézet.",
-	"treeView.duplicateElement": "Már van {0} azonosítójú elem regisztrálva"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/api/node/extHostWorkspace.i18n.json b/i18n/hun/src/vs/workbench/api/node/extHostWorkspace.i18n.json
deleted file mode 100644
index 9c6051394b9..00000000000
--- a/i18n/hun/src/vs/workbench/api/node/extHostWorkspace.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"updateerror": "A(z) '{0}' kiegészítőnek nem sikerült módosítani a munkaterület mappáit: {1}"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/browser/actions/configureLocale.i18n.json b/i18n/hun/src/vs/workbench/browser/actions/configureLocale.i18n.json
deleted file mode 100644
index fde77c79014..00000000000
--- a/i18n/hun/src/vs/workbench/browser/actions/configureLocale.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"configureLocale": "Nyelv beállítása",
-	"displayLanguage": "Meghatározza a VSCode felületének nyelvét.",
-	"doc": "Az elérhető nyelvek listája a következő címen tekinthető meg: {0}",
-	"restart": "Az érték módosítása után újra kell indítani a VSCode-ot.",
-	"fail.createSettings": "A(z) '{0}' nem hozható létre ({1})",
-	"JsonSchema.locale": "A felhasználói felületen használt nyelv."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/browser/actions/fileActions.i18n.json b/i18n/hun/src/vs/workbench/browser/actions/fileActions.i18n.json
deleted file mode 100644
index 3aa4638c367..00000000000
--- a/i18n/hun/src/vs/workbench/browser/actions/fileActions.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"openFolder": "Mappa megnyitása...",
-	"openFileFolder": "Megnyitás...",
-	"addFolderToWorkspace": "Mappa hozzáadása a munkaterülethez...",
-	"add": "Hozzáadás",
-	"addFolderToWorkspaceTitle": "Mappa hozzáadása a munkaterülethez",
-	"removeFolderFromWorkspace": "Mappa eltávolítása a munkaterületről"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/browser/actions/toggleActivityBarVisibility.i18n.json b/i18n/hun/src/vs/workbench/browser/actions/toggleActivityBarVisibility.i18n.json
deleted file mode 100644
index 3e675c19189..00000000000
--- a/i18n/hun/src/vs/workbench/browser/actions/toggleActivityBarVisibility.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleActivityBar": "Tevékenységsáv be- és kikapcsolása",
-	"view": "Nézet"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/browser/actions/toggleCenteredLayout.i18n.json b/i18n/hun/src/vs/workbench/browser/actions/toggleCenteredLayout.i18n.json
deleted file mode 100644
index 828e7dcc108..00000000000
--- a/i18n/hun/src/vs/workbench/browser/actions/toggleCenteredLayout.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleCenteredLayout": "Középre igazított elrendezés be- és kikapcsolása",
-	"view": "Nézet"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/browser/actions/toggleEditorLayout.i18n.json b/i18n/hun/src/vs/workbench/browser/actions/toggleEditorLayout.i18n.json
deleted file mode 100644
index 41e5ee51112..00000000000
--- a/i18n/hun/src/vs/workbench/browser/actions/toggleEditorLayout.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleEditorGroupLayout": "Szerkesztőablak-csoport vízszintes/függőleges elrendezésének váltása",
-	"horizontalLayout": "Szerkesztőablak-csoport elrendezése vízszintesen",
-	"verticalLayout": "Szerkesztőablak-csoport elrendezése függőlegesen",
-	"view": "Nézet"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/browser/actions/toggleSidebarPosition.i18n.json b/i18n/hun/src/vs/workbench/browser/actions/toggleSidebarPosition.i18n.json
deleted file mode 100644
index 4ea1b58573b..00000000000
--- a/i18n/hun/src/vs/workbench/browser/actions/toggleSidebarPosition.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleSidebarPosition": "Oldalsáv helyzetének váltása",
-	"view": "Nézet"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/browser/actions/toggleSidebarVisibility.i18n.json b/i18n/hun/src/vs/workbench/browser/actions/toggleSidebarVisibility.i18n.json
deleted file mode 100644
index 15fb8930eaf..00000000000
--- a/i18n/hun/src/vs/workbench/browser/actions/toggleSidebarVisibility.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleSidebar": "Oldalsáv be- és kikapcsolása",
-	"view": "Nézet"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/browser/actions/toggleStatusbarVisibility.i18n.json b/i18n/hun/src/vs/workbench/browser/actions/toggleStatusbarVisibility.i18n.json
deleted file mode 100644
index c5c6932161d..00000000000
--- a/i18n/hun/src/vs/workbench/browser/actions/toggleStatusbarVisibility.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleStatusbar": "Állapotsor be- és kikapcsolása",
-	"view": "Nézet"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/browser/actions/toggleTabsVisibility.i18n.json b/i18n/hun/src/vs/workbench/browser/actions/toggleTabsVisibility.i18n.json
deleted file mode 100644
index 67d8831c5f6..00000000000
--- a/i18n/hun/src/vs/workbench/browser/actions/toggleTabsVisibility.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleTabs": "Fül láthatóságának ki- és bekapcsolása",
-	"view": "Nézet"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/browser/actions/toggleZenMode.i18n.json b/i18n/hun/src/vs/workbench/browser/actions/toggleZenMode.i18n.json
deleted file mode 100644
index 876adaaac08..00000000000
--- a/i18n/hun/src/vs/workbench/browser/actions/toggleZenMode.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleZenMode": "Zen mód be- és kikapcsolása",
-	"view": "Nézet"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/browser/actions/workspaceActions.i18n.json b/i18n/hun/src/vs/workbench/browser/actions/workspaceActions.i18n.json
deleted file mode 100644
index 123987f7d72..00000000000
--- a/i18n/hun/src/vs/workbench/browser/actions/workspaceActions.i18n.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openFile": "Fájl megnyitása...",
-	"openFolder": "Mappa megnyitása...",
-	"openFileFolder": "Megnyitás...",
-	"globalRemoveFolderFromWorkspace": "Mappa eltávolítása a munkaterületről...",
-	"saveWorkspaceAsAction": "Munkaterület mentése másként...",
-	"save": "Menté&&s",
-	"saveWorkspace": "Munkaterület mentése",
-	"openWorkspaceAction": "Munkaterület megnyitása...",
-	"openWorkspaceConfigFile": "Munkaterület konfigurációs fájljának megnyitása",
-	"duplicateWorkspaceInNewWindow": "Munkaterület megnyitása egy új ablakban"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/browser/actions/workspaceCommands.i18n.json b/i18n/hun/src/vs/workbench/browser/actions/workspaceCommands.i18n.json
deleted file mode 100644
index 3ce627556d8..00000000000
--- a/i18n/hun/src/vs/workbench/browser/actions/workspaceCommands.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"addFolderToWorkspace": "Mappa hozzáadása a munkaterülethez...",
-	"add": "&&Hozzáadás",
-	"addFolderToWorkspaceTitle": "Mappa hozzáadása a munkaterülethez",
-	"workspaceFolderPickerPlaceholder": "Válasszon munkaterület-mappát!"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/browser/parts/activitybar/activitybarActions.i18n.json b/i18n/hun/src/vs/workbench/browser/parts/activitybar/activitybarActions.i18n.json
deleted file mode 100644
index 21034f249a0..00000000000
--- a/i18n/hun/src/vs/workbench/browser/parts/activitybar/activitybarActions.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"badgeTitle": "{0} – {1}",
-	"titleKeybinding": "{0} ({1})",
-	"removeFromActivityBar": "Elrejtés a tevékenységsávról",
-	"keepInActivityBar": "Megtartás a tevékenységsávon",
-	"additionalViews": "További nézetek",
-	"numberBadge": "{0} ({1})",
-	"manageExtension": "Kiegészítő kezelése",
-	"toggle": "Nézet rögzítésének be- és kikapcsolása"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/browser/parts/activitybar/activitybarPart.i18n.json b/i18n/hun/src/vs/workbench/browser/parts/activitybar/activitybarPart.i18n.json
deleted file mode 100644
index 4439cc68880..00000000000
--- a/i18n/hun/src/vs/workbench/browser/parts/activitybar/activitybarPart.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hideActivitBar": "Tevékenységsáv elrejtése",
-	"globalActions": "Globális műveletek"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/browser/parts/compositePart.i18n.json b/i18n/hun/src/vs/workbench/browser/parts/compositePart.i18n.json
deleted file mode 100644
index 3846ca52450..00000000000
--- a/i18n/hun/src/vs/workbench/browser/parts/compositePart.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"ariaCompositeToolbarLabel": "{0} művelet",
-	"titleTooltip": "{0} ({1})"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/browser/parts/compositebar/compositeBar.i18n.json b/i18n/hun/src/vs/workbench/browser/parts/compositebar/compositeBar.i18n.json
deleted file mode 100644
index eb261c7878b..00000000000
--- a/i18n/hun/src/vs/workbench/browser/parts/compositebar/compositeBar.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"activityBarAriaLabel": "Az aktív nézet váltása"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/browser/parts/compositebar/compositeBarActions.i18n.json b/i18n/hun/src/vs/workbench/browser/parts/compositebar/compositeBarActions.i18n.json
deleted file mode 100644
index 7abb94c4861..00000000000
--- a/i18n/hun/src/vs/workbench/browser/parts/compositebar/compositeBarActions.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"largeNumberBadge": "10k+",
-	"badgeTitle": "{0} – {1}",
-	"additionalViews": "További nézetek",
-	"numberBadge": "{0} ({1})",
-	"manageExtension": "Kiegészítő kezelése",
-	"titleKeybinding": "{0} ({1})",
-	"hide": "Elrejtés",
-	"keep": "Megtartás",
-	"toggle": "Nézet rögzítésének be- és kikapcsolása"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/browser/parts/editor/binaryDiffEditor.i18n.json b/i18n/hun/src/vs/workbench/browser/parts/editor/binaryDiffEditor.i18n.json
deleted file mode 100644
index ea1317f6659..00000000000
--- a/i18n/hun/src/vs/workbench/browser/parts/editor/binaryDiffEditor.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"metadataDiff": "{0} ↔ {1}"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/browser/parts/editor/binaryEditor.i18n.json b/i18n/hun/src/vs/workbench/browser/parts/editor/binaryEditor.i18n.json
deleted file mode 100644
index e968c306002..00000000000
--- a/i18n/hun/src/vs/workbench/browser/parts/editor/binaryEditor.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"binaryEditor": "Bináris megjelenítő"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json b/i18n/hun/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json
deleted file mode 100644
index 1aa06197ac8..00000000000
--- a/i18n/hun/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"textEditor": "Szövegszerkesztő",
-	"textDiffEditor": "Szöveges tartalmak differenciaszerkesztő ablaka",
-	"binaryDiffEditor": "Bináris tartalmak differenciaszerkesztő ablaka",
-	"sideBySideEditor": "Párhuzamos szerkesztőablakok",
-	"groupOnePicker": "Az első csoportban található szerkesztőablakok megjelenítése",
-	"groupTwoPicker": "A második csoportban található szerkesztőablakok megjelenítése",
-	"groupThreePicker": "A harmadik csoportban található szerkesztőablakok megjelenítése",
-	"allEditorsPicker": "Összes megnyitott szerkesztőablak megjelenítése",
-	"view": "Nézet",
-	"file": "Fájl",
-	"close": "Bezárás",
-	"closeOthers": "Többi bezárása",
-	"closeRight": "Jobbra lévők bezárása",
-	"closeAllSaved": "Mentettek bezárása",
-	"closeAll": "Összes bezárása",
-	"keepOpen": "Maradjon nyitva",
-	"toggleInlineView": "Sorok közötti nézet be- és kikapcsolása",
-	"showOpenedEditors": "Megnyitott szerkesztőablak megjelenítése",
-	"keepEditor": "Szerkesztőablak nyitva tartása",
-	"closeEditorsInGroup": "A csoportban lévő összes szerkesztőablak bezárása",
-	"closeSavedEditors": "A csoportban lévő mentett szerkesztőablakok bezárása",
-	"closeOtherEditors": "Többi szerkesztőablak bezárása",
-	"closeRightEditors": "Jobbra lévő szerkesztőablakok bezárása"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/browser/parts/editor/editorActions.i18n.json b/i18n/hun/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
deleted file mode 100644
index 2de10454592..00000000000
--- a/i18n/hun/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
+++ /dev/null
@@ -1,58 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"splitEditor": "Szerkesztő kettéosztása",
-	"joinTwoGroups": "Két szerkesztőcsoport összevonása",
-	"navigateEditorGroups": "Váltás szerkesztőcsoportok között",
-	"focusActiveEditorGroup": "Váltás az aktív szerkesztőcsoportra",
-	"focusFirstEditorGroup": "Váltás az első szerkesztőcsoportra",
-	"focusSecondEditorGroup": "Váltás a második szerkesztőcsoportra",
-	"focusThirdEditorGroup": "Váltás a harmadik szerkesztőcsoportra",
-	"focusPreviousGroup": "Váltás az előző csoportra",
-	"focusNextGroup": "Váltás a következő csoportra",
-	"openToSide": "Megnyitás oldalt",
-	"closeEditor": "Szerkesztőablak bezárása",
-	"closeOneEditor": "Bezárás",
-	"revertAndCloseActiveEditor": "Visszaállítás és szerkesztőablak bezárása",
-	"closeEditorsToTheLeft": "Balra lévő szerkesztőablakok bezárása",
-	"closeAllEditors": "Összes szerkesztőablak bezárása",
-	"closeEditorsInOtherGroups": "A többi csoport szerkesztőablakainak bezárása",
-	"moveActiveGroupLeft": "Szerkesztőablak-csoport mozgatása balra",
-	"moveActiveGroupRight": "Szerkesztőablak-csoport mozgatása jobbra",
-	"minimizeOtherEditorGroups": "Többi szerkesztőablak-csoport kis méretűvé tétele",
-	"evenEditorGroups": "Szerkesztőablak-csoportok egyenlő méretűvé tétele",
-	"maximizeEditor": "Szerkesztőablak-csoport nagy méretűvé tétele és oldalsáv elrejtése",
-	"openNextEditor": "Következő szerkesztőablak megnyitása",
-	"openPreviousEditor": "Előző szerkesztőablak megnyitása",
-	"nextEditorInGroup": "A csoport következő szerkesztőablakának megnyitása",
-	"openPreviousEditorInGroup": "A csoport előző szerkesztőablakának megnyitása",
-	"lastEditorInGroup": "Csoport utolsó szerkesztőablakának megnyitása",
-	"navigateNext": "Ugrás előre",
-	"navigatePrevious": "Ugrás vissza",
-	"navigateLast": "Ugrás az utolsóra",
-	"reopenClosedEditor": "Bezárt szerkesztőablak újranyitása",
-	"clearRecentFiles": "Legutóbb megnyitottak listájának ürítése",
-	"showEditorsInFirstGroup": "Az első csoportban található szerkesztőablakok megjelenítése",
-	"showEditorsInSecondGroup": "A második csoportban található szerkesztőablakok megjelenítése",
-	"showEditorsInThirdGroup": "A harmadik csoportban található szerkesztőablakok megjelenítése",
-	"showAllEditors": "Összes szerkesztőablak megjelenítése",
-	"openPreviousRecentlyUsedEditorInGroup": "A csoportban előző legutoljára használt szerksztőablak megnyitása",
-	"openNextRecentlyUsedEditorInGroup": "A csoportban következő legutoljára használt szerksztőablak megnyitása",
-	"navigateEditorHistoryByInput": "Előző szerkesztőablak menyitása az előzményekből",
-	"openNextRecentlyUsedEditor": "A következő legutoljára használt szerksztőablak megnyitása",
-	"openPreviousRecentlyUsedEditor": "Az előző legutoljára használt szerksztőablak megnyitása",
-	"clearEditorHistory": "Szerkesztőablak-előzmények törlése",
-	"focusLastEditorInStack": "Csoport utolsó szerkesztőablakának megnyitása",
-	"moveEditorLeft": "Szerkesztőablak mozgatása balra",
-	"moveEditorRight": "Szerkesztőablak mozgatása jobbra",
-	"moveEditorToPreviousGroup": "Szerkesztőablak mozgatása az előző csoportba",
-	"moveEditorToNextGroup": "Szerkesztőablak mozgatása a következő csoportba",
-	"moveEditorToFirstGroup": "Szerkesztőablak mozgatása az első csoportba",
-	"moveEditorToSecondGroup": "Szerkesztőablak mozgatása a második csoportba",
-	"moveEditorToThirdGroup": "Szerkesztőablak mozgatása a harmadik csoportba"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json b/i18n/hun/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json
deleted file mode 100644
index b85e766a1db..00000000000
--- a/i18n/hun/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"editorCommand.activeEditorMove.description": "Aktív szerkesztőablak mozgatása fülek vagy csoportok között",
-	"editorCommand.activeEditorMove.arg.name": "Aktív szerkesztőablak mozgatási argumentum",
-	"editorCommand.activeEditorMove.arg.description": "Argumentumtulajdonságok:\n\t* 'to': karakterlánc, a mozgatás célpontja.\n\t* 'by': karakterlánc, a mozgatás egysége. Fülek (tab) vagy csoportok (group) alapján.\n\t* 'value': szám, ami meghatározza, hogy hány pozíciót kell mozgatni, vagy egy abszolút pozíciót, ahová mozgatni kell."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/browser/parts/editor/editorPart.i18n.json b/i18n/hun/src/vs/workbench/browser/parts/editor/editorPart.i18n.json
deleted file mode 100644
index 01f39ddc508..00000000000
--- a/i18n/hun/src/vs/workbench/browser/parts/editor/editorPart.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"groupOneVertical": "Bal",
-	"groupTwoVertical": "Középső",
-	"groupThreeVertical": "Jobb",
-	"groupOneHorizontal": "Felső",
-	"groupTwoHorizontal": "Középső",
-	"groupThreeHorizontal": "Alsó",
-	"editorOpenError": "Nem sikerült megnyitni a(z) '{0}' fájlt: {1}."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/browser/parts/editor/editorPicker.i18n.json b/i18n/hun/src/vs/workbench/browser/parts/editor/editorPicker.i18n.json
deleted file mode 100644
index e6e8443d18b..00000000000
--- a/i18n/hun/src/vs/workbench/browser/parts/editor/editorPicker.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"entryAriaLabel": "{0}, szerkesztőcsoport-választó",
-	"groupLabel": "Csoport: {0}",
-	"noResultsFoundInGroup": "A csoportban nem található ilyen nyitott szerkesztőablak",
-	"noOpenedEditors": "A csoportban jelenleg nincs megnyitott szerkesztőablak",
-	"noResultsFound": "Nem található ilyen nyitott szerkesztőablak",
-	"noOpenedEditorsAllGroups": "Jelenleg nincs megnyitott szerkesztőablak"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json b/i18n/hun/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json
deleted file mode 100644
index 57ccef4bad8..00000000000
--- a/i18n/hun/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"singleSelectionRange": "{0}. sor, {1}. oszlop ({2} kijelölve)",
-	"singleSelection": "{0}. sor, {1}. oszlop",
-	"multiSelectionRange": "{0} kijelölés ({1} karakter kijelölve)",
-	"multiSelection": "{0} kijelölés",
-	"endOfLineLineFeed": "LF",
-	"endOfLineCarriageReturnLineFeed": "CRLF",
-	"tabFocusModeEnabled": "Tab fókuszt vált",
-	"screenReaderDetected": "Képernyőolvasóra optimalizálva",
-	"screenReaderDetectedExtra": "Ha nem használ képernyőolvasót, állítsa az `editor.accessibilitySupport` értékét \"off\"-ra.",
-	"disableTabMode": "Kisegítő mód letiltása",
-	"gotoLine": "Ugrás adott sorhoz",
-	"selectIndentation": "Indentálás kiválasztása",
-	"selectEncoding": "Kódolás kiválasztása",
-	"selectEOL": "Sorvégjel kiválasztása",
-	"selectLanguageMode": "Nyelvmód kiválasztása",
-	"fileInfo": "Fájlinformáció",
-	"spacesSize": "Szóközök: {0}",
-	"tabSize": "Tabulátorméret: {0}",
-	"showLanguageExtensions": "'{0}' kiegészítő keresése a piactéren...",
-	"changeMode": "Nyelvmód váltása",
-	"noEditor": "Jelenleg nincs aktív szerkesztőablak",
-	"languageDescription": "({0}) - Beállított nyelv",
-	"languageDescriptionConfigured": "({0})",
-	"languagesPicks": "nyelvek (azonosító)",
-	"configureModeSettings": "'{0}' nyelvi beállítások módosítása...",
-	"configureAssociationsExt": "'{0}' fájlhozzárendelések módosítása...",
-	"autoDetect": "Automatikus felderítés",
-	"pickLanguage": "Nyelvmód kiválasztása",
-	"currentAssociation": "Jelenlegi társítás",
-	"pickLanguageToConfigure": "A(z) '{0}' kiterjesztéshez társított nyelvmód kiválasztása",
-	"changeIndentation": "Indentálás módosítása",
-	"noWritableCodeEditor": "Az aktív kódszerkesztő-ablak írásvédett módban van.",
-	"indentView": "nézet váltása",
-	"indentConvert": "fájl konvertálása",
-	"pickAction": "Művelet kiválasztása",
-	"changeEndOfLine": "Sorvégjel módosítása",
-	"pickEndOfLine": "Sorvégjel kiválasztása",
-	"changeEncoding": "Fájlkódolás módosítása",
-	"noFileEditor": "Jelenleg nincs aktív fájl",
-	"saveWithEncoding": "Mentés adott kódolással",
-	"reopenWithEncoding": "Újranyitás adott kódolással",
-	"guessedEncoding": "Kitalálva a tartalomból",
-	"pickEncodingForReopen": "Válassza ki a kódolást a fájl újranyitásához",
-	"pickEncodingForSave": "Válassza ki a mentéshez használandó kódolást",
-	"screenReaderDetectedExplanation.title": "Képernyőolvasóra optimalizálva",
-	"screenReaderDetectedExplanation.question": "Képernyőolvasót használ a VS Code vezérléséhez?",
-	"screenReaderDetectedExplanation.answerYes": "Igen",
-	"screenReaderDetectedExplanation.answerNo": "Nem",
-	"screenReaderDetectedExplanation.body1": "A VS Code most már optimalizálva van képernyőolvasóval való használathoz.",
-	"screenReaderDetectedExplanation.body2": "A szerkesztőablakban néhány funkció, például a sortörés, kódrészletek bezárása stb. másképp működik."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/browser/parts/editor/resourceViewer.i18n.json b/i18n/hun/src/vs/workbench/browser/parts/editor/resourceViewer.i18n.json
deleted file mode 100644
index 4df3b505d36..00000000000
--- a/i18n/hun/src/vs/workbench/browser/parts/editor/resourceViewer.i18n.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"sizeB": "{0} B",
-	"sizeKB": "{0} KB",
-	"sizeMB": "{0} MB",
-	"sizeGB": "{0} GB",
-	"sizeTB": "{0} TB",
-	"largeImageError": "A kép nincs megjelenítve, mert túl nagy ({0}).",
-	"resourceOpenExternalButton": "Kép megnyitása külső program használatával?",
-	"nativeFileTooLargeError": "A fájl nem jeleníthető meg a szerkesztőben, mert túl nagy ({0}).",
-	"nativeBinaryError": "A fájl nem jeleníthető meg a szerkesztőben, mert bináris adatokat tartalmaz vagy nem támogatott szövegkódolást használ.",
-	"openAsText": "Mégis meg szeretné nyitni?",
-	"zoom.action.fit.label": "Teljes kép",
-	"imgMeta": "{0}x{1} {2}"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/browser/parts/editor/tabsTitleControl.i18n.json b/i18n/hun/src/vs/workbench/browser/parts/editor/tabsTitleControl.i18n.json
deleted file mode 100644
index 0b09df08015..00000000000
--- a/i18n/hun/src/vs/workbench/browser/parts/editor/tabsTitleControl.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"araLabelTabActions": "Fülműveletek"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json b/i18n/hun/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json
deleted file mode 100644
index 749328c186d..00000000000
--- a/i18n/hun/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"textDiffEditor": "Szöveges tartalmak differenciaszerkesztő ablaka",
-	"readonlyEditorWithInputAriaLabel": "{0}. Írásvédett szövegösszehasonlító.",
-	"readonlyEditorAriaLabel": "Írásvédett szövegösszehasonlító.",
-	"editableEditorWithInputAriaLabel": "{0}. Szövegfájl-összehasonlító.",
-	"editableEditorAriaLabel": "Szövegfájl-összehasonlító.",
-	"navigate.next.label": "Következő módosítás",
-	"navigate.prev.label": "Előző módosítás",
-	"toggleIgnoreTrimWhitespace.label": "Térközlevágás mellőzése"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/browser/parts/editor/textEditor.i18n.json b/i18n/hun/src/vs/workbench/browser/parts/editor/textEditor.i18n.json
deleted file mode 100644
index 4b83d2670b2..00000000000
--- a/i18n/hun/src/vs/workbench/browser/parts/editor/textEditor.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"editorLabelWithGroup": "{0}, {1}. csoport"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/browser/parts/editor/textResourceEditor.i18n.json b/i18n/hun/src/vs/workbench/browser/parts/editor/textResourceEditor.i18n.json
deleted file mode 100644
index 2afbe189325..00000000000
--- a/i18n/hun/src/vs/workbench/browser/parts/editor/textResourceEditor.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"textEditor": "Szövegszerkesztő",
-	"readonlyEditorWithInputAriaLabel": "{0}. Írásvédett szövegszerkesztő.",
-	"readonlyEditorAriaLabel": "Írásvédett szövegszerkesztő.",
-	"untitledFileEditorWithInputAriaLabel": "{0}. Névtelen szövegszerkesztő.",
-	"untitledFileEditorAriaLabel": "Névtelen szövegszerkesztő."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/browser/parts/editor/titleControl.i18n.json b/i18n/hun/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
deleted file mode 100644
index d823f6837d9..00000000000
--- a/i18n/hun/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"araLabelEditorActions": "Szerkesztőablak-műveletek"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/browser/parts/notifications/notificationsActions.i18n.json b/i18n/hun/src/vs/workbench/browser/parts/notifications/notificationsActions.i18n.json
deleted file mode 100644
index 7126a7b3998..00000000000
--- a/i18n/hun/src/vs/workbench/browser/parts/notifications/notificationsActions.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"clearNotification": "Értesítések törlése",
-	"clearNotifications": "Összes értesítés törlése",
-	"hideNotificationsCenter": "Értesítések elrejtése",
-	"expandNotification": "Értesítés kinyitása",
-	"collapseNotification": "Értesítés összecsukása",
-	"configureNotification": "Értesítés beállításai",
-	"copyNotification": "Szöveg másolása"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/browser/parts/notifications/notificationsAlerts.i18n.json b/i18n/hun/src/vs/workbench/browser/parts/notifications/notificationsAlerts.i18n.json
deleted file mode 100644
index 47205584c4c..00000000000
--- a/i18n/hun/src/vs/workbench/browser/parts/notifications/notificationsAlerts.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"alertErrorMessage": "Hiba: {0}",
-	"alertWarningMessage": "Figyelmeztetés: {0}",
-	"alertInfoMessage": "Információ: {0}"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json b/i18n/hun/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json
deleted file mode 100644
index a22a300f861..00000000000
--- a/i18n/hun/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"notificationsEmpty": "Nincs új értesítés",
-	"notifications": "Értesítések",
-	"notificationsToolbar": "Értesítésiközpont-műveletek",
-	"notificationsList": "Értesítések listája"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/browser/parts/notifications/notificationsCommands.i18n.json b/i18n/hun/src/vs/workbench/browser/parts/notifications/notificationsCommands.i18n.json
deleted file mode 100644
index c24b8c26a9c..00000000000
--- a/i18n/hun/src/vs/workbench/browser/parts/notifications/notificationsCommands.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"notifications": "Értesítések",
-	"showNotifications": "Értesítések megjelenítése",
-	"hideNotifications": "Értesítések elrejtése",
-	"clearAllNotifications": "Összes értesítés törlése"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/browser/parts/notifications/notificationsStatus.i18n.json b/i18n/hun/src/vs/workbench/browser/parts/notifications/notificationsStatus.i18n.json
deleted file mode 100644
index 959ad7f1643..00000000000
--- a/i18n/hun/src/vs/workbench/browser/parts/notifications/notificationsStatus.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hideNotifications": "Értesítések elrejtése",
-	"zeroNotifications": "Nincs értesítés",
-	"noNotifications": "Nincs új értesítés",
-	"oneNotification": "1 új értesítés",
-	"notifications": "{0} új értesítés"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/browser/parts/notifications/notificationsToasts.i18n.json b/i18n/hun/src/vs/workbench/browser/parts/notifications/notificationsToasts.i18n.json
deleted file mode 100644
index cbc2ef37e73..00000000000
--- a/i18n/hun/src/vs/workbench/browser/parts/notifications/notificationsToasts.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"notificationsToast": "Értesítési jelzés"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/browser/parts/notifications/notificationsViewer.i18n.json b/i18n/hun/src/vs/workbench/browser/parts/notifications/notificationsViewer.i18n.json
deleted file mode 100644
index 29500162f4e..00000000000
--- a/i18n/hun/src/vs/workbench/browser/parts/notifications/notificationsViewer.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"notificationActions": "Értesítési műveletek",
-	"notificationSource": "Forrás: {0}"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/browser/parts/panel/panelActions.i18n.json b/i18n/hun/src/vs/workbench/browser/parts/panel/panelActions.i18n.json
deleted file mode 100644
index 9d0c6428f40..00000000000
--- a/i18n/hun/src/vs/workbench/browser/parts/panel/panelActions.i18n.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"closePanel": "Panel bezárása",
-	"togglePanel": "Panel be- és kikapcsolása",
-	"focusPanel": "Váltás a panelra",
-	"toggledPanelPosition": "Panel helyzetének váltása",
-	"moveToRight": "Áthelyezés jobbra",
-	"moveToBottom": "Áthelyezés lentre",
-	"toggleMaximizedPanel": "Teljes méretű panel be- és kikapcsolása",
-	"maximizePanel": "Panel teljes méretűvé tétele",
-	"minimizePanel": "Panel méretének visszaállítása",
-	"view": "Nézet"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/browser/parts/panel/panelPart.i18n.json b/i18n/hun/src/vs/workbench/browser/parts/panel/panelPart.i18n.json
deleted file mode 100644
index 7c465c6891a..00000000000
--- a/i18n/hun/src/vs/workbench/browser/parts/panel/panelPart.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hidePanel": "Panel elrejtése"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/browser/parts/quickinput/quickInput.i18n.json b/i18n/hun/src/vs/workbench/browser/parts/quickinput/quickInput.i18n.json
deleted file mode 100644
index 614736ffe77..00000000000
--- a/i18n/hun/src/vs/workbench/browser/parts/quickinput/quickInput.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"inputModeEntryDescription": "{0} (Nyomjon 'Enter'-t a megerősítéshez vagy 'Escape'-et a megszakításhoz)",
-	"inputModeEntry": "Nyomjon 'Enter'-t a megerősítéshez vagy 'Escape'-et a megszakításhoz",
-	"quickInput.countSelected": "{0} kiválasztva",
-	"ok": "OK"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/browser/parts/quickinput/quickInputBox.i18n.json b/i18n/hun/src/vs/workbench/browser/parts/quickinput/quickInputBox.i18n.json
deleted file mode 100644
index f402e9c2fed..00000000000
--- a/i18n/hun/src/vs/workbench/browser/parts/quickinput/quickInputBox.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"quickInputBox.ariaLabel": "Kezdjen el gépelni a találati lista szűkítéséhez!"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/browser/parts/quickopen/quickOpenController.i18n.json b/i18n/hun/src/vs/workbench/browser/parts/quickopen/quickOpenController.i18n.json
deleted file mode 100644
index ff619e1acce..00000000000
--- a/i18n/hun/src/vs/workbench/browser/parts/quickopen/quickOpenController.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"emptyPicks": "Nincs választható elem",
-	"quickOpenInput": "A végrehajtható műveletek körét a ? karakter beírásával tekintheti meg",
-	"historyMatches": "legutóbb megnyitott",
-	"noResultsFound1": "Nincs találat",
-	"canNotRunPlaceholder": "A jelenlegi kontextusban nem használható a gyorsmegnyitási funkció",
-	"entryAriaLabel": "{0}, legutóbb megnyitott",
-	"removeFromEditorHistory": "Eltávolítás az előzményekből",
-	"pickHistory": "Válassza ki azt a szerkesztőablakot, amit el szeretne távolítani az előzményekből"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/browser/parts/quickopen/quickopen.i18n.json b/i18n/hun/src/vs/workbench/browser/parts/quickopen/quickopen.i18n.json
deleted file mode 100644
index 43188c1bc00..00000000000
--- a/i18n/hun/src/vs/workbench/browser/parts/quickopen/quickopen.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"quickOpen": "Ugrás fájlhoz...",
-	"quickNavigateNext": "Ugrás a következőre a fájlok gyors megnyitásánál",
-	"quickNavigatePrevious": "Ugrás az előzőre a fájlok gyors megnyitásánál",
-	"quickSelectNext": "Következő kiválasztása a fájlok gyors megnyitásánál",
-	"quickSelectPrevious": "Előző kiválasztása a fájlok gyors megnyitásánál"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/browser/parts/sidebar/sidebarPart.i18n.json b/i18n/hun/src/vs/workbench/browser/parts/sidebar/sidebarPart.i18n.json
deleted file mode 100644
index 2a2c07ac215..00000000000
--- a/i18n/hun/src/vs/workbench/browser/parts/sidebar/sidebarPart.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"focusSideBar": "Váltás az oldalsávra",
-	"viewCategory": "Nézet"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/browser/parts/statusbar/statusbarPart.i18n.json b/i18n/hun/src/vs/workbench/browser/parts/statusbar/statusbarPart.i18n.json
deleted file mode 100644
index 58f3f2a0c10..00000000000
--- a/i18n/hun/src/vs/workbench/browser/parts/statusbar/statusbarPart.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"manageExtension": "Kiegészítő kezelése"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/browser/parts/titlebar/titlebarPart.i18n.json b/i18n/hun/src/vs/workbench/browser/parts/titlebar/titlebarPart.i18n.json
deleted file mode 100644
index e551ece9506..00000000000
--- a/i18n/hun/src/vs/workbench/browser/parts/titlebar/titlebarPart.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"patchedWindowTitle": "[Nem támogatott]",
-	"userIsAdmin": "(Rendszergazda)",
-	"userIsSudo": "(Superuser)",
-	"devExtensionWindowTitlePrefix": "[Kiegészítő fejlesztői példány]"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/browser/parts/views/panelViewlet.i18n.json b/i18n/hun/src/vs/workbench/browser/parts/views/panelViewlet.i18n.json
deleted file mode 100644
index b60b102895b..00000000000
--- a/i18n/hun/src/vs/workbench/browser/parts/views/panelViewlet.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"viewToolbarAriaLabel": "{0} művelet"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/browser/parts/views/views.i18n.json b/i18n/hun/src/vs/workbench/browser/parts/views/views.i18n.json
deleted file mode 100644
index f00a5e742b6..00000000000
--- a/i18n/hun/src/vs/workbench/browser/parts/views/views.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"viewToolbarAriaLabel": "{0} művelet",
-	"hideView": "Elrejtés az oldalsávról"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/browser/parts/views/viewsRegistry.i18n.json b/i18n/hun/src/vs/workbench/browser/parts/views/viewsRegistry.i18n.json
deleted file mode 100644
index 52cc050953f..00000000000
--- a/i18n/hun/src/vs/workbench/browser/parts/views/viewsRegistry.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"duplicateId": "Már van `{0}` azonosítójú nézet regisztrálva a következő helyen: `{1}`"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/browser/parts/views/viewsViewlet.i18n.json b/i18n/hun/src/vs/workbench/browser/parts/views/viewsViewlet.i18n.json
deleted file mode 100644
index 546848a791a..00000000000
--- a/i18n/hun/src/vs/workbench/browser/parts/views/viewsViewlet.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"cannot toggle": "Nem módosítható a(z) {0} nézet láthatósága",
-	"cannot show": "A(z) {0} nézetet nem lehet megjeleníteni, mert el van rejtve a 'when' feltétele miatt.",
-	"hideView": "Elrejtés"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/browser/quickopen.i18n.json b/i18n/hun/src/vs/workbench/browser/quickopen.i18n.json
deleted file mode 100644
index 023d725968a..00000000000
--- a/i18n/hun/src/vs/workbench/browser/quickopen.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noResultsMatching": "Nincs eredmény",
-	"noResultsFound2": "Nincs találat"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/browser/viewlet.i18n.json b/i18n/hun/src/vs/workbench/browser/viewlet.i18n.json
deleted file mode 100644
index d7fb806f14c..00000000000
--- a/i18n/hun/src/vs/workbench/browser/viewlet.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"compositePart.hideSideBarLabel": "Oldalsáv elrejtése",
-	"collapse": "Összes bezárása"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/common/theme.i18n.json b/i18n/hun/src/vs/workbench/common/theme.i18n.json
deleted file mode 100644
index 3406c795c4b..00000000000
--- a/i18n/hun/src/vs/workbench/common/theme.i18n.json
+++ /dev/null
@@ -1,72 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"tabActiveBackground": "Az aktív fül háttérszíne. A fülek tartalmazzák a szerkesztőablakokat a szerkesztőterületen. Egy szerkesztőablak-csoportban több fül is megnyitható. Több szerkesztőablak-csoportot is létre lehet hozni.",
-	"tabInactiveBackground": "Az inaktív fülek háttérszíne. A fülek tartalmazzák a szerkesztőablakokat a szerkesztőterületen. Egy szerkesztőablak-csoportban több fül is megnyitható. Több szerkesztőablak-csoportot is létre lehet hozni.",
-	"tabHoverBackground": "A fülek háttérszíne amikor az egérkurzor fölöttük van. A fülek tartalmazzák a szerkesztőterületen lévő szerkesztőablakokat. Egy szerkesztőablak-csoportban több fül is megnyitható. Több szerkesztőablak-csoportot is létre lehet hozni.",
-	"tabUnfocusedHoverBackground": "A fülek háttérszíne egy fókusz nélküli csoportban, amikor az egérkurzor fölötte van. A fülek tartalmazzák a szerkesztőterületen lévő szerkesztőablakokat. Egy szerkesztőablak-csoportban több fül is megnyitható. Több szerkesztőablak-csoportot is létre lehet hozni.",
-	"tabBorder": "A füleket egymástól elválasztó keret színe. A fülek tartalmazzák a szerkesztőterületen lévő szerkesztőablakokat. Egy szerkesztőablak-csoportban több fül is megnyitható. Több szerkesztőablak-csoportot is létre lehet hozni.",
-	"tabActiveBorder": "Az aktív fülek aljának keretszíne. A fülek tartalmazzák a szerkesztőablakokat a szerkesztőterületen. Egy szerkesztőablak-csoportban több fül is megnyitható. Több szerkesztőablak-csoportot is létre lehet hozni.",
-	"tabActiveBorderTop": "Az aktív fülek tetejének keretszíne. A fülek tartalmazzák a szerkesztőablakokat a szerkesztőterületen. Egy szerkesztőablak-csoportban több fül is megnyitható. Több szerkesztőablak-csoportot is létre lehet hozni.",
-	"tabActiveUnfocusedBorder": "Az aktív fülek aljának keretszíne egy fókusz nélküli csoportban. A fülek tartalmazzák a szerkesztőablakokat a szerkesztőterületen. Egy szerkesztőablak-csoportban több fül is megnyitható. Több szerkesztőablak-csoportot is létre lehet hozni. ",
-	"tabActiveUnfocusedBorderTop": "Az aktív fülek tetejének keretszíne egy fókusz nélküli csoportban. A fülek tartalmazzák a szerkesztőablakokat a szerkesztőterületen. Egy szerkesztőablak-csoportban több fül is megnyitható. Több szerkesztőablak-csoportot is létre lehet hozni.",
-	"tabHoverBorder": "A fülek kiemelésére használt keret színe amikor az egérkurzor fölöttük van. A fülek tartalmazzák a szerkesztőterületen lévő szerkesztőablakokat. Egy szerkesztőablak-csoportban több fül is megnyitható. Több szerkesztőablak-csoportot is létre lehet hozni.",
-	"tabUnfocusedHoverBorder": "A fülek kiemelésére használt keret színe egy fókusz nélküli csoportban, amikor az egérkurzor fölöttük van. A fülek tartalmazzák a szerkesztőterületen lévő szerkesztőablakokat. Egy szerkesztőablak-csoportban több fül is megnyitható. Több szerkesztőablak-csoportot is létre lehet hozni.",
-	"tabActiveForeground": "Az aktív fül előtérszíne az aktív csoportban. A fülek tartalmazzák a szerkesztőterületen lévő szerkesztőablakokat. Egy szerkesztőablak-csoportban több fül is megnyitható. Több szerkesztőablak-csoportot is létre lehet hozni.",
-	"tabInactiveForeground": "Az inaktív fülek előtérszíne az aktív csoportban. A fülek tartalmazzák a szerkesztőterületen lévő szerkesztőablakokat. Egy szerkesztőablak-csoportban több fül is megnyitható. Több szerkesztőablak-csoportot is létre lehet hozni.",
-	"tabUnfocusedActiveForeground": "Az aktív fül előtérszíne egy fókusz nélküli csoportban. A fülek tartalmazzák a szerkesztőterületen lévő szerkesztőablakokat. Egy szerkesztőablak-csoportban több fül is megnyitható. Több szerkesztőablak-csoportot is létre lehet hozni.",
-	"tabUnfocusedInactiveForeground": "Az inaktív fülek előtérszíne egy fókusz nélküli csoportban. A fülek tartalmazzák a szerkesztőterületen lévő szerkesztőablakokat. Egy szerkesztőablak-csoportban több fül is megnyitható. Több szerkesztőablak-csoportot is létre lehet hozni.",
-	"editorGroupBackground": "A szerkesztőcsoportok háttérszíne. A szerkesztőcsoportok szerkesztőablakokat tartalmaznak. A háttérszín akkor jelenik meg, ha a szerkesztőcsoportok mozgatva vannak.",
-	"tabsContainerBackground": "A szerkesztőcsoport címsorának háttérszíne, ha a fülek engedélyezve vannak. A szerkesztőcsoportok szerkesztőablakokat tartalmaznak.",
-	"tabsContainerBorder": "A szerkesztőcsoport címsorának keretszíne, ha a fülek engedélyezve vannak. A szerkesztőcsoportok szerkesztőablakokat tartalmaznak.",
-	"editorGroupHeaderBackground": "A szerkesztőcsoportok címsorának keretszíne, ha a fülek le vannak tiltva (`\"workbench.editor.showTabs\": false`). A szerkesztőcsoportok szerkesztőablakokat tartalmaznak.",
-	"editorGroupBorder": "A szerkesztőcsoportokat elválasztó vonal színe. A szerkesztőcsoportok szerkesztőablakokat tartalmaznak.",
-	"editorDragAndDropBackground": "A szerkesztőablakok mozgatásánál használt háttérszín. Érdemes átlátszó színt választani, hogy a szerkesztőablak tartalma továbbra is látszódjon.",
-	"panelBackground": "A panelek háttérszíne. A panelek a szerkesztőterület alatt jelennek meg, és pl. itt található a kimenet és az integrált terminál.",
-	"panelBorder": "A panelek keretszíne, ami elválasztja őket a szerkesztőablakoktól. A panelek a szerkesztőterület alatt jelennek meg, és pl. itt található a kimenetet és az integrált terminál.",
-	"panelActiveTitleForeground": "Az aktív panel címsorának színe. A panelek a szerkesztőterület alatt jelennek meg, és pl. itt található a kimenet és az integrált terminál.",
-	"panelInactiveTitleForeground": "Az inaktív panelek címsorának színe. A panelek a szerkesztőterület alatt jelennek meg, és pl. itt található a kimenet és az integrált terminál.",
-	"panelActiveTitleBorder": "Az aktív panel címsorának keretszíne. A panelek a szerkesztőterület alatt jelennek meg, és pl. itt található a kimenet és az integrált terminál.",
-	"panelDragAndDropBackground": "A panel címsorában található elemek mozgatásánál használt visszajelzési szín. Érdemes átlátszó színt választani, hogy a panel elemei láthatóak maradjanak. A panelek a szerkesztőterület alatt jelennek meg, és pl. itt található a kimenet és az integrált terminál.",
-	"statusBarForeground": "Az állapotsor előtérszíne, ha egy munkaterület van megnyitva. Az állapotsor az ablak alján jelenik meg.",
-	"statusBarNoFolderForeground": "Az állapotsor előtérszíne, ha nincs mappa megnyitva. Az állapotsor az ablak alján jelenik meg.",
-	"statusBarBackground": "Az állapotsor háttérszíne, ha egy munkaterület van megnyitva. Az állapotsor az ablak alján jelenik meg.",
-	"statusBarNoFolderBackground": "Az állapotsor háttérszíne, ha nincs mappa megnyitva. Az állapotsor az ablak alján jelenik meg.",
-	"statusBarBorder": "Az állapotsort az oldalsávtól és a szerkesztőablakoktól elválasztó keret színe. Az állapotsor az ablak alján jelenik meg.",
-	"statusBarNoFolderBorder": "Az állapotsort az oldalsávtól és a szerkesztőablakoktól elválasztó keret színe, ha nincs mappa megnyitva. Az állapotsor az ablak alján jelenik meg. ",
-	"statusBarItemActiveBackground": "Az állapotsor elemének háttérszíne kattintás esetén. Az állapotsor az ablak alján jelenik meg.",
-	"statusBarItemHoverBackground": "Az állapotsor elemének háttérszíne, ha az egérkurzor fölötte van. Az állapotsor az ablak alján jelenik meg.",
-	"statusBarProminentItemBackground": "Az állapotsor kiemelt elemeinek háttérszíne. A kiemelt elemek kitűnnek az állapotsor többi eleme közül, így jelezve a fontosságukat. Kapcsolja be a `Tabulátor billentyűvel mozgatott fókusz` módot a parancskatalógusban egy példa megtekintéséhez! Az állapotsor az ablak alján jelenik meg.",
-	"statusBarProminentItemHoverBackground": "Az állapotsor kiemelt elemeinek háttérszíne, ha az egérkurzor fölöttük van. A kiemelt elemek kitűnnek az állapotsor többi eleme közül, így jelezve a fontosságukat. Kapcsolja be a `Tabulátor billentyűvel mozgatott fókusz` módot a parancskatalógusban egy példa megtekintéséhez! Az állapotsor az ablak alján jelenik meg.",
-	"activityBarBackground": "A tevékenységsáv háttérszíne. A tevékenységsáv az ablak legszélén jelenik meg bal vagy jobb oldalon, segítségével lehet váltani az oldalsáv nézetei között.",
-	"activityBarForeground": "A tevékenységsáv előtérszíne (pl. az ikonok színe). A tevékenységsáv az ablak legszélén jelenik meg bal vagy jobb oldalon, segítségével lehet váltani az oldalsáv nézetei között.",
-	"activityBarBorder": "A tevékenyésgsáv keretszíne, ami elválasztja az oldalsávtól. A tevékenységsáv az ablak legszélén jelenik meg bal vagy jobb oldalon, segítségével lehet váltani az oldalsáv nézetei között.",
-	"activityBarDragAndDropBackground": "A tevékenységsáv elemeinek mozgatásánál használt visszajelzési szín. Érdemes átlátszó színt választani, hogy a tevékenységsáv elemei láthatóak maradjanak. A tevékenységsáv az ablak legszélén jelenik meg bal vagy jobb oldalon, segítségével lehet váltani az oldalsáv nézetei között.",
-	"activityBarBadgeBackground": "A tevékenységsáv értesítési jelvényeinek háttérszíne. A tevékenységsáv az ablak legszélén jelenik meg bal vagy jobb oldalon, segítségével lehet váltani az oldalsáv nézetei között.",
-	"activityBarBadgeForeground": "A tevékenységsáv értesítési jelvényeinek előtérszíne. A tevékenységsáv az ablak legszélén jelenik meg bal vagy jobb oldalon, segítségével lehet váltani az oldalsáv nézetei között.",
-	"sideBarBackground": "Az oldalsáv háttérszíne. Az oldalsávon található például a fájlkezelő és a keresés nézet.",
-	"sideBarForeground": "Az oldalsáv előtérszíne. Az oldalsávon található például a fájlkezelő és a keresés nézet.",
-	"sideBarBorder": "Az oldalsáv keretszíne, ami elválasztja a szerkesztőablaktól. Az oldalsávon található például a fájlkezelő és a keresés nézet.",
-	"sideBarTitleForeground": "Az oldalsáv címsorának előtérszíne. Az oldalsávon található például a fájlkezelő és a keresés nézet.",
-	"sideBarDragAndDropBackground": "Az oldalsáv szakaszainak mozgatásánál használt visszajelzési szín. Érdemes átlátszó színt választani, hogy az oldalsáv szakaszai láthatóak maradjanak. Az oldalsávon található például a fájlkezelő és a keresés nézet.",
-	"sideBarSectionHeaderBackground": "Az oldalsáv szakaszfejlécének háttérszíne. Az oldalsávon található például a fájlkezelő és a keresés nézet.",
-	"sideBarSectionHeaderForeground": "Az oldalsáv szakaszfejlécének előtérszíne. Az oldalsávon található például a fájlkezelő és a keresés nézet.",
-	"titleBarActiveForeground": "A címsor előtérszíne, ha az ablak aktív. Megjegyzés: ez a beállítás jelenleg csak macOS-en támogatott.",
-	"titleBarInactiveForeground": "A címsor előtérszíne, ha az ablak inaktív. Megjegyzés: ez a beállítás jelenleg csak macOS-en támogatott.",
-	"titleBarActiveBackground": "A címsor háttérszíne, ha az ablak aktív. Megjegyzés: ez a beállítás jelenleg csak macOS-en támogatott.",
-	"titleBarInactiveBackground": "A címsor háttérszíne, ha az ablak inaktív. Megjegyzés: ez a beállítás jelenleg csak macOS-en támogatott.",
-	"titleBarBorder": "A címsor keretszíne, ha az ablak aktív. Megjegyzés: ez a beállítás jelenleg csak macOS-en támogatott.",
-	"notificationCenterBorder": "Az értesítési központ keretszíne. Az értesítések az ablak jobb alsó részén jelennek meg.",
-	"notificationToastBorder": "Az értesítések keretszíne. Az értesítések az ablak jobb alsó részén jelennek meg.",
-	"notificationsForeground": "Az értesítések előtérszíne. Az értesítések az ablak jobb alsó részén jelennek meg.",
-	"notificationsBackground": "Az értesítések háttérszíne. Az értesítések az ablak jobb alsó részén jelennek meg.",
-	"notificationsLink": "Az értesítésekben található hivatkozások előtérszíne. Az értesítések az ablak jobb alsó részén jelennek meg.",
-	"notificationCenterHeaderForeground": "Az értesítési központ fejlécének előtérszíne. Az értesítések az ablak jobb alsó részén jelennek meg.",
-	"notificationCenterHeaderBackground": "Az értesítési központ fejlécének háttérszíne. Az értesítések az ablak jobb alsó részén jelennek meg.",
-	"notificationsBorder": "Az értesítéseket egymástól elválasztó keret színe az értesítési központban. Az értesítések az ablak jobb alsó részén jelennek meg."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/common/views.i18n.json b/i18n/hun/src/vs/workbench/common/views.i18n.json
deleted file mode 100644
index 0b45e8b69a7..00000000000
--- a/i18n/hun/src/vs/workbench/common/views.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"duplicateId": "Már van '{0}' azonosítójú nézet regisztrálva a következő helyen: '{1}'"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/electron-browser/actions.i18n.json b/i18n/hun/src/vs/workbench/electron-browser/actions.i18n.json
deleted file mode 100644
index 37d0d251906..00000000000
--- a/i18n/hun/src/vs/workbench/electron-browser/actions.i18n.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"closeWindow": "Ablak bezárása",
-	"closeWorkspace": "Munkaterület bezárása",
-	"noWorkspaceOpened": "Az aktuális példányban nincs egyetlen munkaterület sem nyitva, amit be lehetne zárni.",
-	"newWindow": "Új ablak",
-	"toggleFullScreen": "Teljes képernyő be- és kikapcsolása",
-	"toggleMenuBar": "Menüsáv be- és kikapcsolása",
-	"toggleDevTools": "Fejlesztői eszközök be- és kikapcsolása",
-	"zoomIn": "Nagyítás",
-	"zoomOut": "Kicsinyítés",
-	"zoomReset": "Nagyítási szint alaphelyzetbe állítása",
-	"appPerf": "Indulási teljesítmény",
-	"reloadWindow": "Ablak újratöltése",
-	"reloadWindowWithExntesionsDisabled": "Ablak újratöltése letiltott kiegészítőkkel",
-	"switchWindowPlaceHolder": "Válassza ki az ablakot, amire váltani szeretne",
-	"current": "Aktuális ablak",
-	"close": "Ablak bezárása",
-	"switchWindow": "Ablak váltása...",
-	"quickSwitchWindow": "Gyors ablakváltás...",
-	"workspaces": "munkaterületek",
-	"files": "fájlok",
-	"openRecentPlaceHolderMac": "Válasszon a megnyitáshoz! (Nyomja le a Cmd-billentyűt az új ablakban való megnyitáshoz!)",
-	"openRecentPlaceHolder": "Válasszon a megnyitáshoz! (Nyomja le a Ctrl-billentyűt az új ablakban való megnyitáshoz!)",
-	"remove": "Eltávolítás a legutóbb megnyitottak listájáról",
-	"openRecent": "Legutóbbi megnyitása...",
-	"quickOpenRecent": "Legutóbbi gyors megnyitása...",
-	"reportIssueInEnglish": "Probléma jelentése",
-	"openProcessExplorer": "Feladatkezelő megnyitása",
-	"reportPerformanceIssue": "Teljesítményproblémák jelentése",
-	"keybindingsReference": "Billentyűparancs-referencia",
-	"openDocumentationUrl": "Dokumentáció",
-	"openIntroductoryVideosUrl": "Bemutatóvideók",
-	"openTipsAndTricksUrl": "Tippek és trükkök",
-	"toggleSharedProcess": "Megosztott folyamat be- és klikapcsolása",
-	"navigateLeft": "Navigálás a balra lévő nézetre",
-	"navigateRight": "Navigálás a jobbra lévő nézetre",
-	"navigateUp": "Navigálás a felül lévő nézetre",
-	"navigateDown": "Navigálás az alul lévő nézetre",
-	"increaseViewSize": "Jelenlegi nézet méretének növelése",
-	"decreaseViewSize": "Jelenlegi nézet méretének csökkentése",
-	"showPreviousTab": "Előző ablakfül megjelenítése",
-	"showNextWindowTab": "Következő ablakfül megjelenítése",
-	"moveWindowTabToNewWindow": "Ablakfül átmozgatása új ablakba",
-	"mergeAllWindowTabs": "Összes ablak összeolvasztása",
-	"toggleWindowTabsBar": "Ablakfülsáv be- és kikapcsolása",
-	"about": "A(z) {0} névjegye",
-	"inspect context keys": "Kontextuskulcsok vizsgálata"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/electron-browser/commands.i18n.json b/i18n/hun/src/vs/workbench/electron-browser/commands.i18n.json
deleted file mode 100644
index 983899514ca..00000000000
--- a/i18n/hun/src/vs/workbench/electron-browser/commands.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"diffLeftRightLabel": "{0} ⟷ {1}"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/electron-browser/configureLocale.i18n.json b/i18n/hun/src/vs/workbench/electron-browser/configureLocale.i18n.json
deleted file mode 100644
index deafef14508..00000000000
--- a/i18n/hun/src/vs/workbench/electron-browser/configureLocale.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"configureLocale": "Nyelv beállítása",
-	"displayLanguage": "Meghatározza a VSCode felületének nyelvét.",
-	"doc": "Az elérhető nyelvek listája a következő címen tekinthető meg: {0}",
-	"restart": "Az érték módosítása után újra kell indítani a VSCode-ot.",
-	"fail.createSettings": "Nem sikerült a(z) '{0}' létrehozás ({1}).",
-	"JsonSchema.locale": "A felhasználói felületen használt nyelv."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/electron-browser/extensionHost.i18n.json b/i18n/hun/src/vs/workbench/electron-browser/extensionHost.i18n.json
deleted file mode 100644
index 5968259f60f..00000000000
--- a/i18n/hun/src/vs/workbench/electron-browser/extensionHost.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"extensionHostProcess.startupFailDebug": "A kiegészítő gazdafolyamata nem idult el 10 másodperben belül. Elképzelhető, hogy megállt az első soron, és szüksége van a hibakeresőre a folytatáshoz.",
-	"extensionHostProcess.startupFail": "A kiegészítő gazdafolyamata nem idult el 10 másodperben belül. Ez probléma lehet.",
-	"extensionHostProcess.error": "A kiegészítő gazdafolyamatától hiba érkezett: {0}",
-	"devTools": "Fejlesztői eszközök",
-	"extensionHostProcess.crash": "A kiegészítő gazdafolyamata váratlanul leállt. Töltse újra az ablakot a visszaállításhoz."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/electron-browser/main.contribution.i18n.json b/i18n/hun/src/vs/workbench/electron-browser/main.contribution.i18n.json
deleted file mode 100644
index cc21f47e7a5..00000000000
--- a/i18n/hun/src/vs/workbench/electron-browser/main.contribution.i18n.json
+++ /dev/null
@@ -1,91 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"view": "Nézet",
-	"help": "Súgó",
-	"file": "Fájl",
-	"workspaces": "Munkaterületek",
-	"developer": "Fejlesztői",
-	"workbenchConfigurationTitle": "Munkaterület",
-	"showEditorTabs": "Meghatározza, hogy a megnyitott szerkesztőablakok telején megjelenjenek-e a fülek",
-	"workbench.editor.labelFormat.default": "Fájl nevének megjelenítése. Ha a fülek engedélyezve vannak, és két egyező nevű fájl van egy csoportban, az elérési útjuk eltérő része lesz hozzáfűzve a névhez. Ha a fülek le vannak tiltva, a fájl munkaterület könyvtárához képest relatív elérési útja jelenik meg, ha a szerkesztőablak aktív.",
-	"workbench.editor.labelFormat.short": "A fájl nevének megjelenítése a könyvtár nevével együtt.",
-	"workbench.editor.labelFormat.medium": "Fájl nevének megjelenítése a fájl munkaterület könyvtárához képest relatív elérési útjával együtt.",
-	"workbench.editor.labelFormat.long": "Fájl nevének megjelenítése a fájl abszolút elérési útjával együtt.",
-	"tabDescription": "Meghatározza a szerkesztőablakok címkéje formáját. A beállítás módosítása könnyebbé teheti a fájl helyének kiderítését:\n- short:   'parent'\n- medium:  'workspace/src/parent'\n- long:    '/home/user/workspace/src/parent'\n- default: '.../parent', ha egy másik fülnek ugyanaz a címe, vagy a relatív elérési út, ha a fülek le vannak tiltva",
-	"editorTabCloseButton": "Meghatározza a szerkesztőablakok fülein található bezárógomb pozícióját vagy eltávolítja őket, ha a beállítás értéke 'off'.",
-	"tabSizing": "Meghatározza a szerkesztőablak-fülek méretezését. Állítsa 'fit'-re, hogy mindig elég nagyok legyenek a szerkesztőablak teljes címének megjelenítéséhez. Állítsa 'shrink'-re, hogy a fülek mérete csökkenhessen abban az esetben, ha a rendelkezésre álló hely nem elég az összes fül megjelenítéséhez.",
-	"showIcons": "Meghatározza, hogy a megnyitott szerkesztőablakok ikonnal együtt jelenjenek-e meg. A működéshez szükséges egy ikontéma engedélyezése is.",
-	"enablePreview": "Meghatározza, hogy a megnyitott szerkesztőablakok előnézetként jelenjenek-e meg. Az előnézetként használt szerkesztőablakok újra vannak hasznosítva, amíg meg nem tartja őket a felhasználó (pl. dupla kattintás vagy szerkesztés esetén), és dőlt betűvel jelenik meg a címsoruk.",
-	"enablePreviewFromQuickOpen": "Meghatározza, hogy a gyors megnyitás során megnyitott szerkesztőablakok előnézetként jelenjenek-e meg. Az előnézetként használt szerkesztőablakok újra vannak hasznosítva, amíg meg nem tartja őket a felhasználó (pl. dupla kattintás vagy szerkesztés esetén).",
-	"closeOnFileDelete": "Meghatározza, hogy bezáródjanak-e azok a szerkesztőablakok, melyekben olyan fájl van megnyitva, amelyet töröl vagy átnevez egy másik folyamat. A beállítás letiltása esetén a szerkesztőablak nyitva marad módosított állapotban ilyen esemény után. Megjegyzés: az alkalmazáson belüli törlések esetén mindig bezáródik a szerkesztőablakok, a módosított fájlok pedig soha nem záródnak be, hogy az adatok megmaradjanak.",
-	"editorOpenPositioning": "Meghatározza, hogy hol nyíljanak meg a szerkesztőablakok. A 'left' vagy 'right' használata esetén az aktív szerkesztőablaktól jobbra vagy balra nyílnak meg az újak. 'first' vagy 'last' esetén a szerkesztőablakok a jelenleg aktív ablaktól függetlenül nyílnak meg.",
-	"revealIfOpen": "Meghatározza, hogy egy szerkesztőablak fel legyen-e fedve, ha már meg van nyitva a látható csoportok bármelyiképben. Ha le van tiltva, akkor egy új szerkesztőablak nyílik az aktív szerkesztőablak-csoportban. Ha engedélyezve van, akkor a már megnyitott szerkesztőablak lesz felfedve egy új megnyitása helyett. Megjegyzés: vannak esetek, amikor ez a beállítás figyelmen kívül van hagyva, pl. ha egy adott szerkesztőablak egy konkrét csoportban vagy a jelenleg aktív csoport mellett van menyitva.",
-	"swipeToNavigate": "Navigálás a nyitott fájlok között háromujjas, vízszintes húzással.",
-	"commandHistory": "Meghatározza, hogy hány legutóbb használt parancs jelenjen meg a parancskatalógus előzményeinek listájában. Az előzmények kikapcsolásához állítsa az értéket nullára.",
-	"preserveInput": "Meghatározza, hogy a legutóbb beírt parancs automatikusan helyre legyen-e állítva a parancskatalógus következő megnyitása során.",
-	"closeOnFocusLost": "Meghatározza, hogy a gyors megnyitás automatikusan bezáródjon-e amint elveszíti a fókuszt.",
-	"openDefaultSettings": "Meghatározza, hogy a beállítások megnyitásakor megnyíljon-e egy szerkesztő az összes alapértelmezett beállítással.",
-	"sideBarLocation": "Meghatározza az oldalsáv helyét. Az oldalsáv megjelenhet a munkaterület bal vagy jobb oldalán.",
-	"panelDefaultLocation": "Meghatározza a panel alapértelmezett pozícióját. A panel a munkaterület alján vagy jobb oldalán jelenhet meg.",
-	"statusBarVisibility": "Meghatározza, hogy megjelenjen-e az állapotsor a munkaterület alján.",
-	"activityBarVisibility": "Meghatározza, hogy megjelenjen-e a tevékenységsáv a munkaterületen.",
-	"viewVisibility": "Meghatározza a nézetek fejlécén található műveletek láthatóságát. A műveletek vagy mindig láthatók, vagy csak akkor jelennek meg, ha a nézeten van a fókusz vagy az egérkurzor fölötte van.",
-	"fontAliasing": "Meghatározza a munkaterületen megjelenő betűtípusok élsimítási módszerét.\n- default: Szubpixeles betűsimítás. A legtöbb nem-retina típusú kijelzőn ez adja a legélesebb szöveget.\n- antialiased: A betűket pixelek, és nem szubpixelek szintjén simítja. A betűtípus vékonyabbnak tűnhet összességében.\n- none: Letiltja a betűtípusok élsimítését. A szövegek egyenetlen, éles szélekkel jelennek meg.\n- auto: A `default` vagy `antialiased` beállítások automatikus alkalmazása a kijelzők DPI-je alapján.",
-	"workbench.fontAliasing.default": "Szubpixeles betűsimítás. A legtöbb nem-retina típusú kijelzőn ez adja a legélesebb szöveget.",
-	"workbench.fontAliasing.antialiased": "A betűket pixelek, és nem szubpixelek szintjén simítja. A betűtípus vékonyabbnak tűnhet összességében.",
-	"workbench.fontAliasing.none": "Letiltja a betűtípusok élsimítését. A szövegek egyenetlen, éles szélekkel jelennek meg.",
-	"workbench.fontAliasing.auto": " A `default` vagy `antialiased` beállítások automatikus alkalmazása a kijelzők DPI-je alapján.",
-	"enableNaturalLanguageSettingsSearch": "Meghatározza, hogy engedélyezve van-e a természetes nyelvi keresési mód a beállításoknál.",
-	"windowConfigurationTitle": "Ablak",
-	"window.openFilesInNewWindow.on": "A fájlok új ablakban nyílnak meg",
-	"window.openFilesInNewWindow.off": "A fájlok abban az ablakban nyílnak meg, ahol a mappájuk meg van nyitva vagy a legutoljára aktív ablakban",
-	"window.openFilesInNewWindow.defaultMac": "A fájlok abban az ablakban nyílnak meg, ahol a mappájuk meg van nyitva vagy a legutoljára aktív ablakban, kivéve, ha a dokkról vagy a Finderből lettek megnyitva",
-	"window.openFilesInNewWindow.default": "A fájlok új ablakban nyílnak meg, kivéve akkor, ha az alkalmazáson belül lettek kiválasztva (pl. a Fájl menüből)",
-	"openFilesInNewWindowMac": "Meghatározza, hogy a fájlok új ablakban legyenek-e megnyitva.\n- default: A fájlok abban az ablakban nyílnak meg, ahol a mappájuk meg van nyitva vagy a legutoljára aktív ablakban, kivéve, ha a dokkról vagy a Finderből lettek megnyitva\n- on: A fájlok új ablakban nyílnak meg.\n- off: A fájlok abban az ablakban nyílnak meg, ahol a mappájuk meg van nyitva vagy a legutoljára aktív ablakban\nMegjegyzés: vannak esetek, amikor ez a beállítás figyelmen kívül van hagyva (pl. a -new-window vagy a -reuse-window parancssori beállítás használata esetén).",
-	"openFilesInNewWindow": "Meghatározza, hogy a fájlok új ablakban legyenek-e megnyitva.\n- default: A fájlok új ablakban nyílnak meg, kivéve akkor, ha az alkalmazáson belül lettek kiválasztva (pl. a Fájl menüből).\n- on: A fájlok új ablakban nyílnak meg.\n- off: A fájlok abban az ablakban nyílnak meg, ahol a mappájuk meg van nyitva vagy a legutoljára aktív ablakban\nMegjegyzés: vannak esetek, amikor ez a beállítás figyelmen kívül van hagyva (pl. a -new-window vagy a -reuse-window parancssori beállítás használata esetén).",
-	"window.openFoldersInNewWindow.on": "A mappák új ablakban nyílnak meg",
-	"window.openFoldersInNewWindow.off": "A mappák lecserélik a legutoljára aktív ablakot",
-	"window.openFoldersInNewWindow.default": "A mappák új ablakban nyílnak meg, kivéve akkor, ha a mappát az alkalmazáson belül lett kiválasztva (pl. a Fájl menüből)",
-	"openFoldersInNewWindow": "Meghatározza, hogy a mappák új ablakban legyenek-e megnyitva.\n- alapértelmezett: A mappák új ablakban nyílnak meg, kivéve akkor, ha a mappát az alkalmazáson belül lett kiválasztva (pl. a Fájl menüből)\n- on: A mappák új ablakban nyílnak meg\n- off: A mappák lecserélik a legutoljára aktív ablakot\nMegjegyzés: vannak esetek, amikor ez a beállítás figyelmen kívül van hagyva (pl. a -new-window vagy a -reuse-window parancssori beállítás használata esetén).",
-	"window.openWithoutArgumentsInNewWindow.on": "Új, üres ablak megnyitása",
-	"window.openWithoutArgumentsInNewWindow.off": "Váltás a legutóbb aktív, futó példányra",
-	"openWithoutArgumentsInNewWindow": "Meghatározza, hogy egy új, üres ablak nyíljon-e meg, ha egy új példány indul paraméterek nélkül, vagy váltson a legutóbb aktív, futó példányra.\n- on: Új, üres ablak megnyitása.\n- off: váltás a legutóbb aktív, futó példányra\nMegjegyzés: vannak esetek, amikor ez a beállítás figyelmen kívül van hagyva (pl. a -new-window vagy a -reuse-window parancssori beállítás használata esetén).",
-	"window.reopenFolders.all": "Összes ablak újranyitása.",
-	"window.reopenFolders.folders": "Összes mappa újranyitása. Az üres munkaterületek nem lesznek helyreállítva.",
-	"window.reopenFolders.one": "A legutóbbi aktív ablak újranyitása.",
-	"window.reopenFolders.none": "Soha ne nyisson meg újra ablakot. Mindig üresen induljon.",
-	"restoreWindows": "Meghatározza, hogy újraindítás után hogyan vannak ismét megnyitva az ablakok. A 'none' választása esetén mindig üres munkaterület indul, 'one' esetén a legutóbb használt ablak nyílik meg újra, a 'folders' megnyitja az összes megnyitott mappát, míg az 'all' újranyitja az összes ablakot az előző munkamenetből.",
-	"restoreFullscreen": "Meghatározza, hogy az ablak teljesképernyős módban nyíljon-e meg, ha kilépéskor teljes képernyős módban volt.",
-	"zoomLevel": "Meghatározza az ablak nagyítási szintjét. Az eredei méret 0, és minden egyes plusz (pl. 1) vagy mínusz (pl. -1) 20%-kal nagyobb vagy kisebb nagyítási szintet jelent. Tizedestört megadása esetén a nagyítási szint finomabban állítható.",
-	"title": "Meghatározza az ablak címét az aktív szerkesztőablak alapján. A változók a környezet alapján vannak behelyettesítve:\n${activeEditorShort}: az aktív fájl neve (pl. myFile.txt)\n${activeEditorMedium}:  a fájl relatív elérési útja a munkaterület mappájához képest (pl. myFolder/myFile.txt)\n${activeEditorLong}: a fájl teljes elérési útja (pl. /Users/Development/myProject/myFolder/myFile.txt)\n${folderName}: azon munkaterületi mappa a neve, amelyben a fájl található (pl. myFolder)\n${folderPath}: azon munkaterületi mappa elérési útja, amelyben a fájl található (pl. /Users/Development/myFolder)\n${rootName}: a munkaterület neve (pl. myFolder vagy myWorkspace)\n${rootPath}: a munkaterület elérési útja (pl. /Users/Development/myWorkspace)\n${appName}: pl. VS Code\n${dirty}: módosításjelző, ami jelzi, ha az aktív szerkesztőablak tartalma módosítva lett\n${separator}: feltételes elválasztó (\" - \"), ami akkor jelenik meg, ha statikus szöveggek vagy olyan változókkal van körülvéve, amelyeknek van értéke\n",
-	"window.newWindowDimensions.default": "Az új ablakok a képernyő közepén nyílnak meg.",
-	"window.newWindowDimensions.inherit": "Az új ablakok ugyanolyan méretben és ugyanazon a helyen jelennek meg, mint a legutoljára aktív ablak.",
-	"window.newWindowDimensions.maximized": "Az új ablakok teljes méretben nyílnak meg.",
-	"window.newWindowDimensions.fullscreen": "Az új ablakok teljes képernyős módban nyílnak meg.",
-	"newWindowDimensions": "Meghatározza az új ablakok méretét és pozícióját, ha már legalább egy ablak meg van nyitva. Az új ablakok alapértlmezetten a képernyő közepén, kis mérettel nyílnak meg. Ha az értéke 'inherit', az ablak ugyanazon méretben és pozícióban nyílik meg, mint a legutoljára aktív. Ha az értéke 'maximized', teljes méretben, ha pedig 'fullscreen' akkor teljes képernyős módban nyílik meg. Megjegyzés: a beállítás nincs hatással az első megnyitott ablakra. Az első ablak mindig a bezárás előtti mérettel és pozícióban nyílik meg.",
-	"closeWhenEmpty": "Meghatározza, hogy az utolsó szerkesztőablak bezárása esetén az ablak is bezáródjon-e. Ez a beállítás csak az olyan ablakokra vonatkozik, amelyekben nincs mappa megnyitva.",
-	"window.menuBarVisibility.default": "A menü csak teljes képernyős mód esetén van elrejtve.",
-	"window.menuBarVisibility.visible": "A menü mindig látható, még teljes képernyő módban is.",
-	"window.menuBarVisibility.toggle": "A menü rejtett, de megjeleníthető az Alt billentyű lenyomásával.",
-	"window.menuBarVisibility.hidden": "A menü mindig el van rejtve.",
-	"menuBarVisibility": "Meghatározza a menüsáv láthatóságát. A 'toggle' érték azt jelenti, hogy a menüsáv rejtett, és az Alt billentyű lenyomására megjelenik. A menüsáv alapértelmezetten látható, kivéve, ha az ablak teljes képernyős módban van.",
-	"enableMenuBarMnemonics": "Ha engedélyezve van, a főmenük megnyithatók Alt-billentyűs billentyűparancsokkal. Letiltás esetén ezek az Alt-billentyűparancsok más parancsokhoz rendelhetők.",
-	"autoDetectHighContrast": "Ha engedélyezve van, az alkalmazás automatikusan átvált a nagy kontrasztos témára, ha a WIndows a nagy kontrasztos témát használ, és a sötét témára, ha a Windows átvált a nagy kontrasztos témáról.",
-	"titleBarStyle": "Módosítja az ablak címsorának megjelenését. A változtatás teljes újraindítást igényel.",
-	"window.nativeTabs": "Engedélyezi a macOS Sierra ablakfüleket. Megjegyzés: a változtatás teljes újraindítást igényel, és a natív fülek letiltják az egyedi címsorstílust, ha azok be vannak konfigurálva.",
-	"window.smoothScrollingWorkaround": "Akkor engedélyezze ezt a kerülőmegoldást, ha a görgetés nem egyenletes egy kis méretre rakott VS Code-ablak helyreállítása után. Ez egy kerülőmegoldás arra a problémára (https://github.com/Microsoft/vscode/issues/13612), amely a trackpadokkal rendelkező eszközöket érinti, például a Microsoft Surface készülékeit. A kerülőmegoldás engedélyezése a felület elrendezésének ugrálásával járhat az ablak kis méretből való helyreállítása után, de egyébként nem okoz más problémát.",
-	"window.clickThroughInactive": "Ha engedélyezve van, akkor egy inaktív ablakra való kattintás aktiválja az ablakot, valamint kattintási esemény keletkezik az egér alatt lévő elemen is, ha az kattintható. Ha le van tiltva, akkor az inaktív ablakra való kattintás csak az ablak aktiválását eredményezi, és egy újabb kattintás szükséges az elemen.",
-	"zenModeConfigurationTitle": "Zen-mód",
-	"zenMode.fullScreen": "Meghatározza, hogy zen-módban a munakterület teljes képernyős módba vált-e.",
-	"zenMode.centerLayout": "Meghatározza, hogy zen-módban középre igazított elrendezés van-e.",
-	"zenMode.hideTabs": "Meghatározza, hogy zen-módban el vannak-e rejtve a munkaterület fülei.",
-	"zenMode.hideStatusBar": "Meghatározza, hogy zen-módban el van-e rejtve a munkaterület alján található állapotsor.",
-	"zenMode.hideActivityBar": "Meghatározza, hogy zen-módban el van-e rejtve a munkaterület bal oldalán található tevékenységsáv.",
-	"zenMode.restore": "Meghatározza, hogy az ablak zen-módban induljon-e, ha kilépéskor zen-módban volt."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/electron-browser/main.i18n.json b/i18n/hun/src/vs/workbench/electron-browser/main.i18n.json
deleted file mode 100644
index f6b8107adaf..00000000000
--- a/i18n/hun/src/vs/workbench/electron-browser/main.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"loaderError": "Az egyik szükséges fájlt nem sikerült betölteni. Vagy megszakadt az internetkapcsolat, vagy a kiszolgáló vált offline-ná. Frissítse az oldalt a böngészőben, és próbálkozzon újra.",
-	"loaderErrorNative": "Egy szükséges fájl betöltése nem sikerült. Indítsa újra az alkalmazást, és próbálkozzon újra. Részletek: {0}"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/electron-browser/shell.i18n.json b/i18n/hun/src/vs/workbench/electron-browser/shell.i18n.json
deleted file mode 100644
index f9fefa3fe2d..00000000000
--- a/i18n/hun/src/vs/workbench/electron-browser/shell.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"runningAsRoot": "Nem ajánlott a Code-ot 'root'-ként futtatni."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/electron-browser/window.i18n.json b/i18n/hun/src/vs/workbench/electron-browser/window.i18n.json
deleted file mode 100644
index 0da8bd6c434..00000000000
--- a/i18n/hun/src/vs/workbench/electron-browser/window.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"undo": "Visszavonás",
-	"redo": "Újra",
-	"cut": "Kivágás",
-	"copy": "Másolás",
-	"paste": "Beillesztés",
-	"selectAll": "Összes kijelölése",
-	"runningAsRoot": "Nem ajánlott a {0} 'root'-két futtatása."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/electron-browser/workbench.i18n.json b/i18n/hun/src/vs/workbench/electron-browser/workbench.i18n.json
deleted file mode 100644
index e74532ea495..00000000000
--- a/i18n/hun/src/vs/workbench/electron-browser/workbench.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"developer": "Fejlesztői",
-	"file": "Fájl"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/node/extensionHostMain.i18n.json b/i18n/hun/src/vs/workbench/node/extensionHostMain.i18n.json
deleted file mode 100644
index eb1cdae4025..00000000000
--- a/i18n/hun/src/vs/workbench/node/extensionHostMain.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"extensionTestError": "Az {0} elérési út nem érvényes kiegészítő tesztfuttató alkalmazásra mutat."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/node/extensionPoints.i18n.json b/i18n/hun/src/vs/workbench/node/extensionPoints.i18n.json
deleted file mode 100644
index e9cae50ed45..00000000000
--- a/i18n/hun/src/vs/workbench/node/extensionPoints.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"jsonParseFail": "Hiba a(z) {0} feldolgozása közben: {1}.",
-	"fileReadFail": "A(z) ({0}) fájl nem olvasható: {1}.",
-	"jsonsParseFail": "Hiba a(z) {0} vagy {1} feldolgozása közben: {2}.",
-	"missingNLSKey": "A(z) {0} kulcshoz tartozó üzenet nem található."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/cli/electron-browser/cli.contribution.i18n.json b/i18n/hun/src/vs/workbench/parts/cli/electron-browser/cli.contribution.i18n.json
deleted file mode 100644
index a5bf83fe306..00000000000
--- a/i18n/hun/src/vs/workbench/parts/cli/electron-browser/cli.contribution.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"install": "'{0}' parancs telepítése a PATH-ba",
-	"not available": "Ez a parancs nem érhető el.",
-	"successIn": "A(z) '{0}' rendszerparancs sikeresen telepítve lett a PATH-ba.",
-	"ok": "OK",
-	"cancel2": "Mégse",
-	"warnEscalation": "A Code adminisztrátori jogosultságot fog kérni az 'osascript'-tel a rendszerparancs telepítéséhez.",
-	"cantCreateBinFolder": "Nem sikerült létrehozni az '/usr/local/bin' könyvtárat.",
-	"aborted": "Megszakítva",
-	"uninstall": "'{0}' parancs eltávolítása a PATH-ból",
-	"successFrom": "A(z) '{0}' rendszerparancs sikeresen el lett a PATH-ból.",
-	"shellCommand": "Rendszerparancs"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/codeEditor/electron-browser/accessibility.i18n.json b/i18n/hun/src/vs/workbench/parts/codeEditor/electron-browser/accessibility.i18n.json
deleted file mode 100644
index 414e0a2839c..00000000000
--- a/i18n/hun/src/vs/workbench/parts/codeEditor/electron-browser/accessibility.i18n.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"emergencyConfOn": "Az `editor.accessibilitySupport` beállítás értékének beállítása a következőre: 'on'.",
-	"openingDocs": "A VS Code kisegítő lehetőségei dokumentációjának megnyitása.",
-	"introMsg": "Köszönjük, hogy kipróbálta a VS Code kisegítő lehetőségeit.",
-	"status": "Állapot:",
-	"changeConfigToOnMac": "A szerkesztő folyamatos képernyőolvasóval való használatára optimalizálásához nyomja meg a Command+E gombot!",
-	"changeConfigToOnWinLinux": "A szerkesztő folyamatos képernyőolvasóval való használatára optimalizálásához nyomja meg a Control+E gombot!",
-	"auto_unknown": "A szerkesztő úgy van konfigurálva, hogy a platform által biztosított API-kat használja annak megállapításához, hogy van-e képernyőolvasó csatlakoztatva, azonban a jelenlegi futtatókörnyezet ezt nem támogatja.",
-	"auto_on": "A szerkesztő automatikusan észlelte a csatlakoztatott képernyőolvasót.",
-	"auto_off": "A szerkesztő úgy van konfigurálva, hogy automatikusan érzékelkje, ha képernyőolvasó van csatlakoztatva. Jelenleg nincs csatlakoztatva.",
-	"configuredOn": "A szerkesztő folyamatos képernyőolvasóval való használatára van optimalizálva – ez az `editor.accessibilitySupport` beállítás módosításával változtatható.",
-	"configuredOff": "A szerkesztő úgy van konfigurálva, hogy soha nincs képernyőolvasó használatára optimalizálva.",
-	"tabFocusModeOnMsg": "Az aktuális szerkesztőablakban a Tab billentyű lenyomása esetén a fókusz a következő fókuszálható elemre kerül. Ez a viselkedés a(z) {0} leütésével módosítható.",
-	"tabFocusModeOnMsgNoKb": "Az aktuális szerkesztőablakban a Tab billentyű lenyomása esetén a fókusz a következő fókuszálható elemre kerül. A(z) {0} parancs jelenleg nem aktiválható billentyűkombinációval.",
-	"tabFocusModeOffMsg": "Az aktuális szerkesztőablakban a Tab billentyű lenyomása esetén beszúrásra kerül egy tabulátor karakter. Ez a viselkedés a(z) {0} leütésével módosítható.",
-	"tabFocusModeOffMsgNoKb": "Az aktuális szerkesztőablakban a Tab billentyű lenyomása esetén beszúrásra kerül egy tabulátor karakter.  A(z) {0} parancs jelenleg nem aktiválható billentyűkombinációval.",
-	"openDocMac": "VS Code kisegítő lehetőségeivel kapcsolatos információk böngészőben való megjelenítéséhez nyomja meg a Command+H billentyűkombinációt!",
-	"openDocWinLinux": "VS Code kisegítő lehetőségeivel kapcsolatos információk böngészőben való megjelenítéséhez nyomja meg a Control+H billentyűkombinációt!",
-	"outroMsg": "A súgószöveg eltüntetéséhez és a szerkesztőablakba való visszatéréshez nyomja meg az Escape billentyűt vagy a Shift+Escape billentyűkombinációt!",
-	"ShowAccessibilityHelpAction": "Kisegítő lehetőségek súgó megjelenítése"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/codeEditor/electron-browser/inspectKeybindings.i18n.json b/i18n/hun/src/vs/workbench/parts/codeEditor/electron-browser/inspectKeybindings.i18n.json
deleted file mode 100644
index 42100c457d9..00000000000
--- a/i18n/hun/src/vs/workbench/parts/codeEditor/electron-browser/inspectKeybindings.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"workbench.action.inspectKeyMap": "Fejlesztői: Billentyűkiosztás vizsgálata"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/codeEditor/electron-browser/inspectTMScopes.i18n.json b/i18n/hun/src/vs/workbench/parts/codeEditor/electron-browser/inspectTMScopes.i18n.json
deleted file mode 100644
index 5c8dff0858d..00000000000
--- a/i18n/hun/src/vs/workbench/parts/codeEditor/electron-browser/inspectTMScopes.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"inspectTMScopes": "Fejlesztői: TM-hatókörök vizsgálata",
-	"inspectTMScopesWidget.loading": "Betöltés..."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/codeEditor/electron-browser/languageConfiguration/languageConfigurationExtensionPoint.i18n.json b/i18n/hun/src/vs/workbench/parts/codeEditor/electron-browser/languageConfiguration/languageConfigurationExtensionPoint.i18n.json
deleted file mode 100644
index 5c588d97e19..00000000000
--- a/i18n/hun/src/vs/workbench/parts/codeEditor/electron-browser/languageConfiguration/languageConfigurationExtensionPoint.i18n.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"parseErrors": "Hiba a(z) {0} feldolgozása közben: {1}",
-	"schema.openBracket": "A nyitó zárójelet definiáló karakter vagy karaktersorozat",
-	"schema.closeBracket": "A záró zárójelet definiáló karakter vagy karaktersorozat",
-	"schema.comments": "Meghatározza a megjegyzésszimbólumokat",
-	"schema.blockComments": "Meghatározza, hogyan vannak jelölve a megjegyzésblokkok.",
-	"schema.blockComment.begin": "A megjegyzésblokk kezdetét definiáló karaktersorozat.",
-	"schema.blockComment.end": "A megjegyzésblokk végét definiáló karaktersorozat.",
-	"schema.lineComment": "A megjegyzéssor kezdetét definiáló karaktersorozat.",
-	"schema.brackets": "Meghatározza azokat a zárójelszimbólumokat, amelyek növeik vagy csökkentik az indentálást.",
-	"schema.autoClosingPairs": "Meghatározza a zárójelpárokat. Ha egy nyitó zárójelet írnak be a szerkesztőbe, a záró párja automatikusan be lesz illesztve.",
-	"schema.autoClosingPairs.notIn": "Azon hatókörök listája, ahol az automatikus zárójelek automatikus párosítása le van tiltve.",
-	"schema.surroundingPairs": "Meghatározza azok zárójelpárok listáját, melyek használhatók a kijelölt szöveg körbezárására.",
-	"schema.wordPattern": "A nyelvben található szavak definíciója.",
-	"schema.wordPattern.pattern": "A szavak illesztésére használt reguláris kifejezés.",
-	"schema.wordPattern.flags": "A szavak illesztésére használt reguláris kifejezés beállításai.",
-	"schema.wordPattern.flags.errorMessage": "Illeszkednie kell a következő mintára: `/^([gimuy]+)$/`.",
-	"schema.indentationRules": "A nyelv indentálási beállításai.",
-	"schema.indentationRules.increaseIndentPattern": "Ha egy sor illeszkedik erre a mintára, akkor minden utána következő sor eggyel beljebb lesz indentálva (amíg egy újabb szabály nem illeszkedik).",
-	"schema.indentationRules.increaseIndentPattern.pattern": "Az increaseIndentPatternhöz tartozó reguláris kifejezés.",
-	"schema.indentationRules.increaseIndentPattern.flags": "Az increaseIndentPatternhöz tartozó reguláris kifejezés beállításai.",
-	"schema.indentationRules.increaseIndentPattern.errorMessage": "Illeszkednie kell a következő mintára: `/^([gimuy]+)$/`.",
-	"schema.indentationRules.decreaseIndentPattern": "Ha egy sor illeszkedik erre a mintára, akkor minden utána következő sor eggyel kijjebb lesz indentálva (amíg egy újabb szabály nem illeszkedik).",
-	"schema.indentationRules.decreaseIndentPattern.pattern": "A decreaseIndentPatternhöz tartozó reguláris kifejezés.",
-	"schema.indentationRules.decreaseIndentPattern.flags": "A decreaseIndentPatternhöz tartozó reguláris kifejezés beállításai.",
-	"schema.indentationRules.decreaseIndentPattern.errorMessage": "Illeszkednie kell a következő mintára: `/^([gimuy]+)$/`.",
-	"schema.indentationRules.indentNextLinePattern": "Ha egy sor illeszkedik erre a mintára, akkor **csak a következő sor** eggyel beljebb lesz indentálva.",
-	"schema.indentationRules.indentNextLinePattern.pattern": "Az indentNextLinePatternhöz tartozó reguláris kifejezés.",
-	"schema.indentationRules.indentNextLinePattern.flags": "Az indentNextLinePatternhöz tartozó reguláris kifejezés beállításai.",
-	"schema.indentationRules.indentNextLinePattern.errorMessage": "Illeszkednie kell a következő mintára: `/^([gimuy]+)$/`.",
-	"schema.indentationRules.unIndentedLinePattern": "Ha egy sor illeszkedik erre a mintára, akkor az indentálása nem változik, és nem lesz kiértékelve más szabályok alapján.",
-	"schema.indentationRules.unIndentedLinePattern.pattern": "Az unIndentedLinePatternhöz tartozó reguláris kifejezés.",
-	"schema.indentationRules.unIndentedLinePattern.flags": "Az unIndentedLinePatternhöz tartozó reguláris kifejezés beállításai.",
-	"schema.indentationRules.unIndentedLinePattern.errorMessage": "Illeszkednie kell a következő mintára: `/^([gimuy]+)$/`.",
-	"schema.folding": "A nyelv kódrészek bezárásával kapcsolatos beállításai.",
-	"schema.folding.offSide": "Egy nyelv követi az „off-side”-szabályt, ha a blokkokat az adott nyelvben az indentációjuk fejezi ki. Ha be van állítva, akkor az üres sorok a rákövetkező blokkhoz tartoznak.",
-	"schema.folding.markers": "Nyelvspecifikus, becsukható kódrészleteket határoló kifejezések. Például: '#region' és '#endregion'. A kezdő és záró reguláris kifejezések az összes soron tesztelve vannak, így hatékonyan kell őket megtervezni.",
-	"schema.folding.markers.start": "A kezdő határjelzőt leíró reguláris kifejezés. A reguláris kifejezésnek '^' karakterrel kell kezdődnie.",
-	"schema.folding.markers.end": "A záró határjelzőt leíró reguláris kifejezés. A reguláris kifejezésnek '^' karakterrel kell kezdődnie."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/codeEditor/electron-browser/largeFileOptimizations.i18n.json b/i18n/hun/src/vs/workbench/parts/codeEditor/electron-browser/largeFileOptimizations.i18n.json
deleted file mode 100644
index ee6f1bfb86d..00000000000
--- a/i18n/hun/src/vs/workbench/parts/codeEditor/electron-browser/largeFileOptimizations.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"largeFile": "{0}: ebben a nagy fájlban a memóriahasználat csökketése érdekében és a fagyások, valamint összeomlások megelőzése érdekében ki van kapcsolva a tokenizálás, a sortörés és a kódrészletek bezárása.",
-	"neverShowAgain": "Rendben. Soha ne jelenjen meg újra",
-	"removeOptimizations": "Funkciók engedélyezése mindenképp",
-	"reopenFilePrompt": "Nyissa meg újra a fájlt a beállítás érvénybe lépéséhez!"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/codeEditor/electron-browser/textMate/inspectTMScopes.i18n.json b/i18n/hun/src/vs/workbench/parts/codeEditor/electron-browser/textMate/inspectTMScopes.i18n.json
deleted file mode 100644
index f71dd48864a..00000000000
--- a/i18n/hun/src/vs/workbench/parts/codeEditor/electron-browser/textMate/inspectTMScopes.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"inspectTMScopes": "Fejlesztői: TM-hatókörök vizsgálata",
-	"inspectTMScopesWidget.loading": "Betöltés..."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/codeEditor/electron-browser/toggleMinimap.i18n.json b/i18n/hun/src/vs/workbench/parts/codeEditor/electron-browser/toggleMinimap.i18n.json
deleted file mode 100644
index 92aa0078bb8..00000000000
--- a/i18n/hun/src/vs/workbench/parts/codeEditor/electron-browser/toggleMinimap.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleMinimap": "Nézet: Kódtérkép be- és kikapcsolása"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/codeEditor/electron-browser/toggleMultiCursorModifier.i18n.json b/i18n/hun/src/vs/workbench/parts/codeEditor/electron-browser/toggleMultiCursorModifier.i18n.json
deleted file mode 100644
index 3f16eb9423a..00000000000
--- a/i18n/hun/src/vs/workbench/parts/codeEditor/electron-browser/toggleMultiCursorModifier.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleLocation": "Többkurzoros módosító be- és kikapcsolása"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderControlCharacter.i18n.json b/i18n/hun/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderControlCharacter.i18n.json
deleted file mode 100644
index 6cf74e0b4a8..00000000000
--- a/i18n/hun/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderControlCharacter.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleRenderControlCharacters": "Nézet: Vezérlőkarakterek be- és kikapcsolása"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderWhitespace.i18n.json b/i18n/hun/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderWhitespace.i18n.json
deleted file mode 100644
index 3ba14042af6..00000000000
--- a/i18n/hun/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderWhitespace.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleRenderWhitespace": "Nézet: Szóközök kirajzolásának be- és kikapcsolása"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/codeEditor/electron-browser/toggleWordWrap.i18n.json b/i18n/hun/src/vs/workbench/parts/codeEditor/electron-browser/toggleWordWrap.i18n.json
deleted file mode 100644
index bc2d87d7de2..00000000000
--- a/i18n/hun/src/vs/workbench/parts/codeEditor/electron-browser/toggleWordWrap.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggle.wordwrap": "Nézet: Sortörés be- és kikapcsolása",
-	"wordWrap.notInDiffEditor": "A sortörés nem kapcsolható be vagy ki differenciaszerkesztőben.",
-	"unwrapMinified": "Sortörés letiltása ebben a fájlban",
-	"wrapMinified": "Sortörés engedélyezése ebben a fájlban"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/codeEditor/electron-browser/wordWrapMigration.i18n.json b/i18n/hun/src/vs/workbench/parts/codeEditor/electron-browser/wordWrapMigration.i18n.json
deleted file mode 100644
index 325146a6001..00000000000
--- a/i18n/hun/src/vs/workbench/parts/codeEditor/electron-browser/wordWrapMigration.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"wordWrapMigration.ok": "OK",
-	"wordWrapMigration.dontShowAgain": "Ne jelenítse meg újra",
-	"wordWrapMigration.openSettings": "Beállítások megnyitása",
-	"wordWrapMigration.prompt": "Az `editor.wrappingColumn` beállítás elavult az `editor.wordWrap` bevezetése miatt."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/debug/browser/breakpointWidget.i18n.json b/i18n/hun/src/vs/workbench/parts/debug/browser/breakpointWidget.i18n.json
deleted file mode 100644
index c565710c71d..00000000000
--- a/i18n/hun/src/vs/workbench/parts/debug/browser/breakpointWidget.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"breakpointWidgetExpressionPlaceholder": "Futás megállítása, ha a kifejezés értéke igazra értékelődik ki. 'Enter' a megerősítéshez vagy 'Escape' a megszakításhoz.",
-	"breakpointWidgetAriaLabel": "A program csak akkor áll meg itt, ha a feltétel igaz. Nyomjon 'Enter'-t a megerősítéshez vagy 'Escape'-et a megszakításhoz.",
-	"breakpointWidgetHitCountPlaceholder": "Futás megállítása, ha adott alkalommal érintve lett. 'Enter' a megerősítéshez vagy 'Escape' a megszakításhoz.",
-	"breakpointWidgetHitCountAriaLabel": "A program akkor fog megállni itt, ha adott alkalommal érintette ezt a pontot. Nyomjon 'Enter'-t a megerősítéshez vagy 'Escape'-et a megszakításhoz.",
-	"expression": "Kifejezés",
-	"hitCount": "Érintések száma"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json b/i18n/hun/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
deleted file mode 100644
index 48dd335d261..00000000000
--- a/i18n/hun/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"logPoint": "Naplózási pont",
-	"breakpoint": "Töréspont",
-	"editBreakpoint": "{0} szerkesztése...",
-	"removeBreakpoint": "{0} eltávolítása",
-	"functionBreakpointsNotSupported": "Ez a hibakereső nem támogatja a függvénytöréspontokat",
-	"functionBreakpointPlaceholder": "A függvény, amin meg kell állni",
-	"functionBreakPointInputAriaLabel": "Adja meg a függvénytöréspontot",
-	"breakpointDisabledHover": "Letiltott töréspont",
-	"breakpointUnverifieddHover": "Nem megerősített töréspont",
-	"functionBreakpointUnsupported": "Ez a hibakereső nem támogatja a függvénytöréspontokat",
-	"breakpointDirtydHover": "Nem megerősített töréspont. A fájl módosult, indítsa újra a hibakeresési munkamenetet.",
-	"logBreakpointUnsupported": "Ez a hibakereső nem támogatja a naplózási pontokat",
-	"conditionalBreakpointUnsupported": "Ez a hibakereső nem támogatja a feltételes töréspontokat",
-	"hitBreakpointUnsupported": "Ez a hibakereső nem támogatja az érintési feltételes töréspontokat"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/debug/browser/debugActionItems.i18n.json b/i18n/hun/src/vs/workbench/parts/debug/browser/debugActionItems.i18n.json
deleted file mode 100644
index 546d71a4904..00000000000
--- a/i18n/hun/src/vs/workbench/parts/debug/browser/debugActionItems.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noConfigurations": "Nincs konfiguráció",
-	"addConfigTo": "Konfiguráció hozzáadása ({0})...",
-	"addConfiguration": "Konfiguráció hozzáadása..."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/debug/browser/debugActions.i18n.json b/i18n/hun/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
deleted file mode 100644
index 3eb04f88c4b..00000000000
--- a/i18n/hun/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openLaunchJson": "{0} megnyitása",
-	"launchJsonNeedsConfigurtion": "'launch.json' konfigurálása vagy javítása",
-	"noFolderDebugConfig": "Fejlettebb hibakeresési konfigurációk használatához nyisson meg egy mappát!",
-	"startDebug": "Hibakeresés indítása",
-	"startWithoutDebugging": "Indítás hibakeresés nélkül",
-	"selectAndStartDebugging": "Hibakeresés kiválasztása és indítása",
-	"restartDebug": "Újraindítás",
-	"reconnectDebug": "Újracsatlakozás",
-	"stepOverDebug": "Átugrás",
-	"stepIntoDebug": "Belépés",
-	"stepOutDebug": "Kilépés",
-	"stopDebug": "Leállítás",
-	"disconnectDebug": "Kapcsolat bontása",
-	"continueDebug": "Folytatás",
-	"pauseDebug": "Szüneteltetés",
-	"terminateThread": "Szál megszüntetése",
-	"restartFrame": "Keret újraindítása",
-	"removeBreakpoint": "Töréspont eltávolítása",
-	"removeAllBreakpoints": "Összes töréspont eltávolítása",
-	"enableAllBreakpoints": "Összes töréspont engedélyezése",
-	"disableAllBreakpoints": "Összes töréspont letiltása",
-	"activateBreakpoints": "Töréspontok aktiválása",
-	"deactivateBreakpoints": "Töréspontok deaktiválása",
-	"reapplyAllBreakpoints": "Töréspontok felvétele ismét",
-	"addFunctionBreakpoint": "Függvénytöréspont hozzáadása",
-	"setValue": "Érték beállítása",
-	"addWatchExpression": "Kifejezés hozzáadása",
-	"editWatchExpression": "Kifejezés szerkesztése",
-	"addToWatchExpressions": "Hozzáadás a figyelőlistához",
-	"removeWatchExpression": "Kifejezés eltávolítása",
-	"removeAllWatchExpressions": "Összes kifejezés eltávolítása",
-	"clearRepl": "Konzoltartalom törlése",
-	"debugConsoleAction": "Hibakeresési konzol",
-	"unreadOutput": "Új kimenet a hibakeresési konzolban",
-	"debugFocusConsole": "Váltás a hibakeresési konzolra",
-	"focusSession": "Váltás munkamenetre",
-	"stepBackDebug": "Visszalépés",
-	"reverseContinue": "Visszafordítás"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/debug/browser/debugActionsWidget.i18n.json b/i18n/hun/src/vs/workbench/parts/debug/browser/debugActionsWidget.i18n.json
deleted file mode 100644
index b12fa835fc2..00000000000
--- a/i18n/hun/src/vs/workbench/parts/debug/browser/debugActionsWidget.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"debugToolBarBackground": "A hibakeresési eszköztár háttérszíne.",
-	"debugToolBarBorder": "A hibakeresési eszköztár keretszíne."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/debug/browser/debugCommands.i18n.json b/i18n/hun/src/vs/workbench/parts/debug/browser/debugCommands.i18n.json
deleted file mode 100644
index 9bb54527f51..00000000000
--- a/i18n/hun/src/vs/workbench/parts/debug/browser/debugCommands.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noFolderDebugConfig": "Fejlettebb hibakeresési konfigurációk használatához nyisson meg egy mappát!",
-	"inlineBreakpoint": "Sorbeli töréspont",
-	"debug": "Hibakeresés",
-	"addInlineBreakpoint": "Sorbeli töréspont hozzáadása"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/debug/browser/debugContentProvider.i18n.json b/i18n/hun/src/vs/workbench/parts/debug/browser/debugContentProvider.i18n.json
deleted file mode 100644
index 6c3b97fc8c6..00000000000
--- a/i18n/hun/src/vs/workbench/parts/debug/browser/debugContentProvider.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"unable": "Az erőforrás nem oldható fel hibakeresési munkamenet nélkül",
-	"canNotResolveSource": "Nem sikerült feloldani a következő erőforrást: {0}. Nem érkezett válasz a hibakereső kiegészítőtől."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json b/i18n/hun/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
deleted file mode 100644
index 263d7526aca..00000000000
--- a/i18n/hun/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleBreakpointAction": "Hibakeresés: Töréspont be- és kikapcsolása",
-	"conditionalBreakpointEditorAction": "Hibakeresés: Feltételes töréspont...",
-	"logPointEditorAction": "Hibakeresés: Naplózási pont hozzáadása...",
-	"runToCursor": "Futtatás a kurzorig",
-	"debugEvaluate": "Hibakeresés: Kiértékelés",
-	"debugAddToWatch": "Hibakeresés: Hozzáadás a figyelőlistához",
-	"showDebugHover": "Hibakeresés: Súgószöveg megjelenítése",
-	"goToNextBreakpoint": "Hibakeresés: Ugrás a következő töréspontra",
-	"goToPreviousBreakpoint": "Hibakeresés: Ugrás az előző töréspontra"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/debug/browser/debugEditorModelManager.i18n.json b/i18n/hun/src/vs/workbench/parts/debug/browser/debugEditorModelManager.i18n.json
deleted file mode 100644
index 7f603176dfc..00000000000
--- a/i18n/hun/src/vs/workbench/parts/debug/browser/debugEditorModelManager.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"breakpointDisabledHover": "Letiltott töréspont",
-	"breakpointUnverifieddHover": "Nem megerősített töréspont",
-	"breakpointDirtydHover": "Nem megerősített töréspont. A fájl módosult, indítsa újra a hibakeresési munkamenetet.",
-	"breakpointUnsupported": "Ez a hibakereső nem támogatja a feltételes töréspontokat"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/debug/browser/debugQuickOpen.i18n.json b/i18n/hun/src/vs/workbench/parts/debug/browser/debugQuickOpen.i18n.json
deleted file mode 100644
index 7247cad3bd5..00000000000
--- a/i18n/hun/src/vs/workbench/parts/debug/browser/debugQuickOpen.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"entryAriaLabel": "{0}, hibakeresés",
-	"debugAriaLabel": "Írja be a futtatandó konfiguráció nevét.",
-	"addConfigTo": "Konfiguráció hozzáadása ({0})...",
-	"addConfiguration": "Konfiguráció hozzáadása...",
-	"noConfigurationsMatching": "Nincs illeszkedő hibakeresési konfiguráció",
-	"noConfigurationsFound": "Nem található hibakeresési konfiguráció. Készítsen egy 'launch.json' fájlt."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/debug/browser/debugStatus.i18n.json b/i18n/hun/src/vs/workbench/parts/debug/browser/debugStatus.i18n.json
deleted file mode 100644
index 72acb4dfe3e..00000000000
--- a/i18n/hun/src/vs/workbench/parts/debug/browser/debugStatus.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"selectAndStartDebug": "Hibakeresési konfiguráció kiválasztása és indítása"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/debug/browser/debugViewlet.i18n.json b/i18n/hun/src/vs/workbench/parts/debug/browser/debugViewlet.i18n.json
deleted file mode 100644
index ad1c08d100e..00000000000
--- a/i18n/hun/src/vs/workbench/parts/debug/browser/debugViewlet.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"startAdditionalSession": "Újabb munkamenet indítása",
-	"debugFocusVariablesView": "Váltás a változókra",
-	"debugFocusWatchView": "Váltás a figyelőlistára",
-	"debugFocusCallStackView": "Váltás a hívási veremre",
-	"debugFocusBreakpointsView": "Váltás a töréspontokra"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/debug/browser/exceptionWidget.i18n.json b/i18n/hun/src/vs/workbench/parts/debug/browser/exceptionWidget.i18n.json
deleted file mode 100644
index dee625b25b4..00000000000
--- a/i18n/hun/src/vs/workbench/parts/debug/browser/exceptionWidget.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"debugExceptionWidgetBorder": "A kivételmodul keretszíne.",
-	"debugExceptionWidgetBackground": "A kivételmodul háttérszíne.",
-	"exceptionThrownWithId": "Kivétel következett be: {0}",
-	"exceptionThrown": "Kivétel következett be."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/debug/browser/linkDetector.i18n.json b/i18n/hun/src/vs/workbench/parts/debug/browser/linkDetector.i18n.json
deleted file mode 100644
index 5390665131e..00000000000
--- a/i18n/hun/src/vs/workbench/parts/debug/browser/linkDetector.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"fileLinkMac": "Megnyitás kattintásra (Cmd + kattintásra oldalt nyitja meg)",
-	"fileLink": "Megnyitás kattintásra (Ctrl + kattintásra oldalt nyitja meg)"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/debug/browser/statusbarColorProvider.i18n.json b/i18n/hun/src/vs/workbench/parts/debug/browser/statusbarColorProvider.i18n.json
deleted file mode 100644
index d81fca21748..00000000000
--- a/i18n/hun/src/vs/workbench/parts/debug/browser/statusbarColorProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"statusBarDebuggingBackground": "Az állapotsor háttérszíne, ha a programon hibakeresés folyik. Az állapotsor az ablak alján jelenik meg.",
-	"statusBarDebuggingForeground": "Az állapotsor előtérszíne, ha a programon hibakeresés folyik. Az állapotsor az ablak alján jelenik meg.",
-	"statusBarDebuggingBorder": "Az állapotsort az oldalsávtól és a szerkesztőablakoktól elválasztó keret színe, ha egy programon hibakeresés történik. Az állapotsor az ablak alján jelenik meg."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/debug/common/debug.i18n.json b/i18n/hun/src/vs/workbench/parts/debug/common/debug.i18n.json
deleted file mode 100644
index 11bf07b9391..00000000000
--- a/i18n/hun/src/vs/workbench/parts/debug/common/debug.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"internalConsoleOptions": "Meghatározza a belső hibakeresési konzol viselkedését."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/debug/common/debugModel.i18n.json b/i18n/hun/src/vs/workbench/parts/debug/common/debugModel.i18n.json
deleted file mode 100644
index 37cbf5881fb..00000000000
--- a/i18n/hun/src/vs/workbench/parts/debug/common/debugModel.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"notAvailable": "nem elérhető",
-	"startDebugFirst": "Indítson egy hibakeresési folyamatot a kiértékeléshez"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/debug/common/debugSchemas.i18n.json b/i18n/hun/src/vs/workbench/parts/debug/common/debugSchemas.i18n.json
deleted file mode 100644
index 6d734793e9b..00000000000
--- a/i18n/hun/src/vs/workbench/parts/debug/common/debugSchemas.i18n.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.contributes.debuggers": "Hibakeresési illesztőket szolgáltat.",
-	"vscode.extension.contributes.debuggers.type": "A hibakeresési illesztő egyedi azonosítója.",
-	"vscode.extension.contributes.debuggers.label": "A hibakeresési illesztő megjelenített neve.",
-	"vscode.extension.contributes.debuggers.program": "A hibakeresési illesztő program elérési útja. Az elérési út lehet abszolút vagy relatív a kiegészítő mappájához képest.",
-	"vscode.extension.contributes.debuggers.args": "Az illesztő számára átadott argumentumok.",
-	"vscode.extension.contributes.debuggers.runtime": "Kiegészítő futtatókörnyezet arra az esetre, ha a program attribútum nem egy futtatható fájl, és futtatókörnyezetre van szüksége.",
-	"vscode.extension.contributes.debuggers.runtimeArgs": "Kiegészítő argumentumok a futtatókörnyezet számára.",
-	"vscode.extension.contributes.debuggers.variables": "A `launch.json`-ban található interaktív változók (pl. ${action.pickProcess}) hozzárendelése parancsokhoz.",
-	"vscode.extension.contributes.debuggers.initialConfigurations": "Konfigurációk a 'launch.json' első változatának elkészítéséhez.",
-	"vscode.extension.contributes.debuggers.languages": "Azon nyelvek listája, amelyeknél ez a hibakeresési kiegészítő alapértelmezett hibakeresőnek tekinthető.",
-	"vscode.extension.contributes.debuggers.adapterExecutableCommand": "Ha meg van adva, a VS Code ezt a parancsot fogja hívni a hibakeresési illesztő futtatható állománya elérési útjának és az átadandó argumentumok meghatározásához.",
-	"vscode.extension.contributes.debuggers.configurationSnippets": "Kódtöredékek új 'launch.json'-konfigurációk hozzáadásához.",
-	"vscode.extension.contributes.debuggers.configurationAttributes": "JSON-sémakonfigurációk a 'launch.json' validálásához.",
-	"vscode.extension.contributes.debuggers.windows": "Windows-specifikus beállítások.",
-	"vscode.extension.contributes.debuggers.windows.runtime": "A Windows által használt futtatókörnyezet.",
-	"vscode.extension.contributes.debuggers.osx": "macOS-specifikus beállítások.",
-	"vscode.extension.contributes.debuggers.osx.runtime": "A macOS által használt futtatókörnyezet.",
-	"vscode.extension.contributes.debuggers.linux": "Linux-specifikus beállítások.",
-	"vscode.extension.contributes.debuggers.linux.runtime": "A Linux által használt futtatókörnyezet.",
-	"vscode.extension.contributes.breakpoints": "Töréspontokat szolgáltat.",
-	"vscode.extension.contributes.breakpoints.language": "Töréspontok engedélyezése ennél a nyelvnél.",
-	"app.launch.json.title": "Indítás",
-	"app.launch.json.version": "A fájlformátum verziója.",
-	"app.launch.json.configurations": "A konfigurációk listája. Új konfigurációk hozzáadhatók vagy a meglévők szerkeszthetők az IntelliSense használatával.",
-	"app.launch.json.compounds": "A kombinációk listája. Minden kombináció több konfigurációt hivatkozik meg, melyek együtt indulnak el.",
-	"app.launch.json.compound.name": "A kombináció neve. Az indítási konfiguráció lenyíló menüjében jelenik meg.",
-	"useUniqueNames": "Használjon egyedi konfigurációs neveket!",
-	"app.launch.json.compound.folder": "A mappa neve, ahol az összetett konfiguráció található.",
-	"app.launch.json.compounds.configurations": "Azon konfigurációk neve, melyek elindulnak ezen kombináció részeként."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/debug/common/debugSource.i18n.json b/i18n/hun/src/vs/workbench/parts/debug/common/debugSource.i18n.json
deleted file mode 100644
index 44a083dcc82..00000000000
--- a/i18n/hun/src/vs/workbench/parts/debug/common/debugSource.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"unknownSource": "Ismeretlen forrás"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json b/i18n/hun/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
deleted file mode 100644
index b6de2b15184..00000000000
--- a/i18n/hun/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"breakpointWidgetLogMessagePlaceholder": "A töréspont érintése esetén naplózandó üzenet. A {} karakterek közötti kifejezések interpolálva lesznek. 'Enter' a megerősítéshez vagy 'Escape' a megszakításhoz.",
-	"breakpointWidgetHitCountPlaceholder": "Futás megállítása, ha adott alkalommal érintve lett. 'Enter' a megerősítéshez vagy 'Escape' a megszakításhoz.",
-	"breakpointWidgetExpressionPlaceholder": "Futás megállítása, ha a kifejezés értéke igazra értékelődik ki. 'Enter' a megerősítéshez vagy 'Escape' a megszakításhoz.",
-	"expression": "Kifejezés",
-	"hitCount": "Érintések száma",
-	"logMessage": "Üzenet naplózása"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/debug/electron-browser/breakpointsView.i18n.json b/i18n/hun/src/vs/workbench/parts/debug/electron-browser/breakpointsView.i18n.json
deleted file mode 100644
index f1ee0650abd..00000000000
--- a/i18n/hun/src/vs/workbench/parts/debug/electron-browser/breakpointsView.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"editConditionalBreakpoint": "Töréspont szerkesztése...",
-	"functionBreakpointsNotSupported": "Ez a hibakereső nem támogatja a függvénytöréspontokat",
-	"functionBreakpointPlaceholder": "A függvény, amin meg kell állni",
-	"functionBreakPointInputAriaLabel": "Adja meg a függvénytöréspontot"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/debug/electron-browser/callStackView.i18n.json b/i18n/hun/src/vs/workbench/parts/debug/electron-browser/callStackView.i18n.json
deleted file mode 100644
index de7dd719a14..00000000000
--- a/i18n/hun/src/vs/workbench/parts/debug/electron-browser/callStackView.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"callstackSection": "Hívási verem szakasz",
-	"debugStopped": "Szüneteltetve a következő helyen: {0}",
-	"callStackAriaLabel": "Hibakeresési hívási verem",
-	"session": "Munkamenet",
-	"paused": "Szüneteltetve",
-	"running": "Fut",
-	"thread": "Szál",
-	"pausedOn": "Szüneteltetve a következő helyen: {0}",
-	"loadMoreStackFrames": "További veremkeretek betöltése",
-	"threadAriaLabel": "Szál: {0}, hívási verem, hibakeresés",
-	"stackFrameAriaLabel": "{0} veremkeret, {0}. sor {1} {2}, hívási verem, hibakeresés"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json b/i18n/hun/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
deleted file mode 100644
index 7a8fcade9f1..00000000000
--- a/i18n/hun/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleDebugViewlet": "Hibakeresés megjelenítése",
-	"toggleDebugPanel": "Hibakeresési konzol",
-	"debug": "Hibakeresés",
-	"debugPanel": "Hibakeresési konzol",
-	"variables": "Változók",
-	"watch": "Figyelőlista",
-	"callStack": "Hívási verem",
-	"breakpoints": "Töréspontok",
-	"view": "Nézet",
-	"debugCategory": "Hibakeresés",
-	"debugCommands": "Hibakeresési konfiguráció",
-	"debugConfigurationTitle": "Hibakeresés",
-	"allowBreakpointsEverywhere": "Bármelyik fájlban helyezhető el töréspont",
-	"openExplorerOnEnd": "Hibakeresési munkamenet végén automatikusan nyíljon meg a fájlkezelő nézet",
-	"inlineValues": "Változók értékének megjelenítése a sorok között hibakeresés közben",
-	"toolBarLocation": "Meghatározza a hibakeresési eszköztár típusát: „float” esetén lebeg az összes nézet fölött, „docked” esetén rögzítve van a hibakeresési nézeten, „none” esetén pedig el van rejtve.",
-	"never": "Soha ne jelenjen meg a hibakeresés az állapotsoron",
-	"always": "Mindig jelenjen meg a hibakeresés az állapotsoron",
-	"onFirstSessionStart": "A hibakeresés csak akkor jelenjen meg az állapotsoron, miután először el lett indítva a hibakeresés",
-	"showInStatusBar": "Meghatározza, hogy megjelenjen-e a hibakeresési állapotsáv",
-	"openDebug": "Meghatározza, hogy megnyíljon-e a hibakeresési modul a hibakeresési munkamenet indulásakor.",
-	"enableAllHovers": "Meghatározza, hogy megjelenjenek-e a nem hibakereséshez tartozó súgószövegek hibakeresés közben. Ha az értéke igaz, a súgószöveg-szolgáltatóktól el lesznek kérve a súgószövegek. A sima súgószövegek még ebben az esetben sem jelennek meg.",
-	"launch": "Globális hibakeresés indítási konfiguráció. Használható a 'launch.json' alternatívájaként, ami meg van osztva több munkaterület között"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/debug/electron-browser/debugCommands.i18n.json b/i18n/hun/src/vs/workbench/parts/debug/electron-browser/debugCommands.i18n.json
deleted file mode 100644
index e41212b67a7..00000000000
--- a/i18n/hun/src/vs/workbench/parts/debug/electron-browser/debugCommands.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noFolderDebugConfig": "Fejlettebb hibakeresési konfigurációk használatához nyisson meg egy mappát!"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json b/i18n/hun/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json
deleted file mode 100644
index 4668cc13897..00000000000
--- a/i18n/hun/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"debugNoType": "A hibakereső 'type' tulajdonsága kötelező, és 'string' típusúnak kell lennie.",
-	"selectDebug": "Környezet kiválasztása",
-	"DebugConfig.failed": "Nem sikerült létrehozni a 'launch.json' fájlt a '.vscode' mappánan ({0}).",
-	"workspace": "munkaterület",
-	"user settings": "felhasználói beállítások"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json b/i18n/hun/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
deleted file mode 100644
index 9a21a85261e..00000000000
--- a/i18n/hun/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"logPoint": "Naplózási pont",
-	"breakpoint": "Töréspont",
-	"removeBreakpoint": "{0} eltávolítása",
-	"editBreakpoint": "{0} szerkesztése...",
-	"disableBreakpoint": "{0} letiltása",
-	"enableBreakpoint": "{0} engedélyezése",
-	"removeBreakpoints": "Töréspontok eltávolítása",
-	"removeInlineBreakpointOnColumn": "{0}. oszlopban található sorbeli töréspont eltávolítása",
-	"removeLineBreakpoint": "Sorra vonatkozó töréspont eltávolítása",
-	"editBreakpoints": "Töréspontok szerkesztése",
-	"editInlineBreakpointOnColumn": "{0}. oszlopban található sorbeli töréspont szerkesztése",
-	"editLineBrekapoint": "Sorra vonatkozó töréspont szerkesztése",
-	"enableDisableBreakpoints": "Töréspontok engedélyezése/letiltása",
-	"disableInlineColumnBreakpoint": "{0}. oszlopban található sorbeli töréspont letiltása",
-	"disableBreakpointOnLine": "Sorszintű töréspont letiltása",
-	"enableBreakpoints": "{0}. oszlopban található sorbeli töréspont engedélyezése",
-	"enableBreakpointOnLine": "Sorszintű töréspont engedélyezése",
-	"addBreakpoint": "Töréspont hozzáadása",
-	"addConditionalBreakpoint": "Feltételes töréspont hozzáadása...",
-	"addLogPoint": "Naplózási pont hozzáadása...",
-	"breakpointHasCondition": "Ez a(z) {0} {1} rendelkezik, ami elvész az eltávolítás során. Fontolja meg a(z) {0} letiltását!",
-	"message": "üzenettel",
-	"condition": "feltétellel",
-	"removeLogPoint": "{0} eltávolítása",
-	"disableLogPoint": "{0} letiltása",
-	"cancel": "Mégse",
-	"addConfiguration": "Konfiguráció hozzáadása..."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/debug/electron-browser/debugHover.i18n.json b/i18n/hun/src/vs/workbench/parts/debug/electron-browser/debugHover.i18n.json
deleted file mode 100644
index c23432c0ba3..00000000000
--- a/i18n/hun/src/vs/workbench/parts/debug/electron-browser/debugHover.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"treeAriaLabel": "Hibakeresési súgószöveg"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json b/i18n/hun/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
deleted file mode 100644
index d46bba56fc8..00000000000
--- a/i18n/hun/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"snapshotObj": "Ennél az objektumhoz csak a primitív értékek vannak megjelenítve.",
-	"debuggingPaused": "Hibakeresés szüneteltetve, oka: {0}, {1} {2}",
-	"debuggingStarted": "Hibakeresés elindítva.",
-	"debuggingStopped": "Hibakeresés leállítva.",
-	"breakpointAdded": "Töréspont hozzáadva, {0}. sor, fájl: {1}",
-	"breakpointRemoved": "Töréspont eltávoíltva, {0}. sor, fájl: {1}",
-	"compoundMustHaveConfigurations": "A kombinációk \"configurations\" tulajdonságát be kell állítani több konfiguráció elindításához.",
-	"noConfigurationNameInWorkspace": "A(z) '{0}' indítási konfiguráció nem található a munkaterületen.",
-	"multipleConfigurationNamesInWorkspace": "Több '{0}' névvel rendelkező indítási konfiguráció is van a munkaterületen. Használja a mappa nevét a konfiguráció pontos megadásához!",
-	"noFolderWithName": "Nem található '{0}' nevű mappa a(z) '{1}' konfigurációhoz a(z) '{2}' összetett konfigurációban.",
-	"configMissing": "A(z) '{0}' konfiguráció hiányzik a 'launch.json'-ból.",
-	"launchJsonDoesNotExist": "A 'launch.json' nem létezik.",
-	"debugRequestNotSupported": "A(z) '{0}' attribútumnak nem támogatott értéke van ('{1}') a kiválasztott hibakeresési konfigurációban.",
-	"debugRequesMissing": "A(z) '{0}' attribútum hiányzik a kiválasztott hibakeresési konfigurációból.",
-	"debugTypeNotSupported": "A megadott hibakeresési típus ('{0}') nem támogatott.",
-	"debugTypeMissing": "A kiválasztott indítási konfigurációnak hiányzik a 'type' tulajdonsága.",
-	"debugAnyway": "Hibakeresés indítása mindenképp",
-	"preLaunchTaskErrors": "Buildelési hibák léptek fel a(z) '{0}' preLaunchTask futása közben.",
-	"preLaunchTaskError": "Buildelési hiba lépett fel a(z) '{0}' preLaunchTask futása közben.",
-	"preLaunchTaskExitCode": "A(z) '{0}' preLaunchTask a következő hibakóddal fejeződött be: {1}.",
-	"showErrors": "Hibák megjelenítése",
-	"noFolderWorkspaceDebugError": "Az aktív fájlon nem lehet hibakeresést végezni. Bizonyosodjon meg róla, hogy el van mentve a lemezre, és hogy az adott fájltípushoz telepítve van a megfelelő hibakeresési kiegészítő.",
-	"cancel": "Mégse",
-	"DebugTaskNotFound": "A(z) '{0}' feladat nem található.",
-	"taskNotTracked": "A(z) '{0}' feladatot nem lehet követni."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/debug/electron-browser/debugViewer.i18n.json b/i18n/hun/src/vs/workbench/parts/debug/electron-browser/debugViewer.i18n.json
deleted file mode 100644
index b11dd377626..00000000000
--- a/i18n/hun/src/vs/workbench/parts/debug/electron-browser/debugViewer.i18n.json
+++ /dev/null
@@ -1,28 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"process": "Folyamat",
-	"paused": "Szüneteltetve",
-	"running": "Fut",
-	"thread": "Szál",
-	"pausedOn": "Szüneteltetve a következő helyen: {0}",
-	"loadMoreStackFrames": "További veremkeretek betöltése",
-	"threadAriaLabel": "Szál: {0}, hívási verem, hibakeresés",
-	"stackFrameAriaLabel": "{0} veremkeret, {0}. sor {1} {2}, hívási verem, hibakeresés",
-	"variableValueAriaLabel": "Adja meg a változó új nevét",
-	"variableScopeAriaLabel": "{0} hatókör, változók, hibakeresés",
-	"variableAriaLabel": "{0} értéke {1}, változók, hibakeresés",
-	"watchExpressionPlaceholder": "Figyelendő kifejezés",
-	"watchExpressionInputAriaLabel": "Adja meg a figyelendő kifejezést",
-	"watchExpressionAriaLabel": "{0} értéke {1}, figyelt, hibakeresés",
-	"watchVariableAriaLabel": "{0} értéke {1}, figyelt, hibakeresés",
-	"functionBreakpointPlaceholder": "A függvény, amin meg kell állni",
-	"functionBreakPointInputAriaLabel": "Adja meg a függvénytöréspontot",
-	"functionBreakpointsNotSupported": "Ez a hibakereső nem támogatja a függvénytöréspontokat",
-	"breakpointAriaLabel": "Töréspont a(z) {0}. sorban {1}, töréspontok, hibakeresés",
-	"functionBreakpointAriaLabel": "{0} függvénytöréspont, töréspontok, hibakeresés",
-	"exceptionBreakpointAriaLabel": "{0} kivételtöréspont, töréspontok, hibakeresés"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/debug/electron-browser/debugViews.i18n.json b/i18n/hun/src/vs/workbench/parts/debug/electron-browser/debugViews.i18n.json
deleted file mode 100644
index e7e17b09fd6..00000000000
--- a/i18n/hun/src/vs/workbench/parts/debug/electron-browser/debugViews.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"variablesSection": "Változók szakasz",
-	"variablesAriaTreeLabel": "Hibakeresési változók",
-	"expressionsSection": "Kifejezések szaszasz",
-	"watchAriaTreeLabel": "Hibakeresési figyelőkifejezések",
-	"callstackSection": "Hívási verem szakasz",
-	"debugStopped": "Szüneteltetve a következő helyen: {0}",
-	"callStackAriaLabel": "Hibakeresési hívási verem",
-	"breakpointsSection": "Töréspontok szakasz",
-	"breakpointsAriaTreeLabel": "Hibakeresési töréspontok"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/debug/electron-browser/electronDebugActions.i18n.json b/i18n/hun/src/vs/workbench/parts/debug/electron-browser/electronDebugActions.i18n.json
deleted file mode 100644
index efbf87bdb7f..00000000000
--- a/i18n/hun/src/vs/workbench/parts/debug/electron-browser/electronDebugActions.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"copyValue": "Érték másolása",
-	"copyAsExpression": "Kifejezés másolása",
-	"copy": "Másolás",
-	"copyAll": "Összes másolása",
-	"copyStackTrace": "Hívási verem másolása"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/debug/electron-browser/rawDebugSession.i18n.json b/i18n/hun/src/vs/workbench/parts/debug/electron-browser/rawDebugSession.i18n.json
deleted file mode 100644
index 906f14a1739..00000000000
--- a/i18n/hun/src/vs/workbench/parts/debug/electron-browser/rawDebugSession.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"moreInfo": "További információ",
-	"debugAdapterCrash": "A hibakeresési illesztő folyamata váratlanul leállt"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/debug/electron-browser/repl.i18n.json b/i18n/hun/src/vs/workbench/parts/debug/electron-browser/repl.i18n.json
deleted file mode 100644
index 51c5a29bb63..00000000000
--- a/i18n/hun/src/vs/workbench/parts/debug/electron-browser/repl.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"replAriaLabel": "REPL-panel",
-	"actions.repl.historyPrevious": "Előző az előzményekből",
-	"actions.repl.historyNext": "Következő az előzményekből",
-	"actions.repl.acceptInput": "REPL bemenet elfogadása",
-	"actions.repl.copyAll": "Hibakeresés: Összes másolása a konzolból"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/debug/electron-browser/replViewer.i18n.json b/i18n/hun/src/vs/workbench/parts/debug/electron-browser/replViewer.i18n.json
deleted file mode 100644
index bd610c00bf4..00000000000
--- a/i18n/hun/src/vs/workbench/parts/debug/electron-browser/replViewer.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"stateCapture": "Az objekum állapota az első kiértékelés idején",
-	"replVariableAriaLabel": "A(z) {0} változó értéke: {1}, REPL, hibakeresés",
-	"replExpressionAriaLabel": "A(z) {0} kifejezés értéke: {1}, REPL, hibakeresés",
-	"replValueOutputAriaLabel": "{0}, REPL, hibakeresés",
-	"replRawObjectAriaLabel": "{0} repl-változó értéke: {1}, REPL, hibakeresés"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/debug/electron-browser/statusbarColorProvider.i18n.json b/i18n/hun/src/vs/workbench/parts/debug/electron-browser/statusbarColorProvider.i18n.json
deleted file mode 100644
index d81fca21748..00000000000
--- a/i18n/hun/src/vs/workbench/parts/debug/electron-browser/statusbarColorProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"statusBarDebuggingBackground": "Az állapotsor háttérszíne, ha a programon hibakeresés folyik. Az állapotsor az ablak alján jelenik meg.",
-	"statusBarDebuggingForeground": "Az állapotsor előtérszíne, ha a programon hibakeresés folyik. Az állapotsor az ablak alján jelenik meg.",
-	"statusBarDebuggingBorder": "Az állapotsort az oldalsávtól és a szerkesztőablakoktól elválasztó keret színe, ha egy programon hibakeresés történik. Az állapotsor az ablak alján jelenik meg."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json b/i18n/hun/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json
deleted file mode 100644
index ff69b90fbc5..00000000000
--- a/i18n/hun/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"debug.terminal.title": "hibakereső"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/debug/electron-browser/variablesView.i18n.json b/i18n/hun/src/vs/workbench/parts/debug/electron-browser/variablesView.i18n.json
deleted file mode 100644
index 6a2885df763..00000000000
--- a/i18n/hun/src/vs/workbench/parts/debug/electron-browser/variablesView.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"variablesSection": "Változók szakasz",
-	"variablesAriaTreeLabel": "Hibakeresési változók",
-	"variableValueAriaLabel": "Adja meg a változó új nevét",
-	"variableScopeAriaLabel": "{0} hatókör, változók, hibakeresés",
-	"variableAriaLabel": "{0} értéke {1}, változók, hibakeresés"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/debug/electron-browser/watchExpressionsView.i18n.json b/i18n/hun/src/vs/workbench/parts/debug/electron-browser/watchExpressionsView.i18n.json
deleted file mode 100644
index 1d47a5b93a1..00000000000
--- a/i18n/hun/src/vs/workbench/parts/debug/electron-browser/watchExpressionsView.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"expressionsSection": "Kifejezések szaszasz",
-	"watchAriaTreeLabel": "Hibakeresési figyelőkifejezések",
-	"watchExpressionPlaceholder": "Figyelendő kifejezés",
-	"watchExpressionInputAriaLabel": "Adja meg a figyelendő kifejezést",
-	"watchExpressionAriaLabel": "{0} értéke {1}, figyelt, hibakeresés",
-	"watchVariableAriaLabel": "{0} értéke {1}, figyelt, hibakeresés"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json b/i18n/hun/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
deleted file mode 100644
index 27c4e8cd4a1..00000000000
--- a/i18n/hun/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"debugAdapterBinNotFound": "A hibakeresési illesztő futtatható állománya ('{0}') nem létezik.",
-	"debugAdapterCannotDetermineExecutable": "Nem határozható meg a(z) '{0}' hibakeresési illesztő futtatható állománya.",
-	"unableToLaunchDebugAdapter": "Nem sikerült elindítani a hibakeresési illesztőt a következő helyről: '{0}'.",
-	"unableToLaunchDebugAdapterNoArgs": "Nem sikerült elindítani a hibakeresési illesztőt."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/debug/node/debugger.i18n.json b/i18n/hun/src/vs/workbench/parts/debug/node/debugger.i18n.json
deleted file mode 100644
index b50ef5b76d2..00000000000
--- a/i18n/hun/src/vs/workbench/parts/debug/node/debugger.i18n.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"launch.config.comment1": "IntelliSense használata a lehetséges attribútumok listázásához",
-	"launch.config.comment2": "Húzza fölé az egeret a létező attribútumok leírásának megtekintéséhez!",
-	"launch.config.comment3": "További információért látogassa meg a következőt: {0}",
-	"debugType": "A konfiguráció típusa.",
-	"debugTypeNotRecognised": "Ez a hibakeresési típus nem ismert. Bizonyosodjon meg róla, hogy telepítve és engedélyezve van a megfelelő hibakeresési kiegészítő.",
-	"node2NotSupported": "A \"node2\" már nem támogatott. Használja helyette a \"node\"-ot, és állítsa a \"protocol\" attribútum értékét \"inspector\"-ra.",
-	"debugName": "A konfiguráció neve. Az indítási konfiguráció lenyíló menüjében jelenik meg.",
-	"debugRequest": "A konfiguráció kérési típusa. Lehet \"launch\" vagy \"attach\".",
-	"debugServer": "Csak hibakeresési kiegészítők fejlesztéséhez: ha a port meg van adva, akkor a VS Code egy szerver módban futó hibakeresési illesztőhöz próbál meg csatlakozni.",
-	"debugPrelaunchTask": "A hibakeresési folyamat előtt futtatandó feladat.",
-	"debugPostDebugTask": "A hibakeresési folyamat vége után futtatandó feladat.",
-	"debugWindowsConfiguration": "Windows-specifikus indítási konfigurációs attribútumok.",
-	"debugOSXConfiguration": "OS X-specifikus indítási konfigurációs attribútumok.",
-	"debugLinuxConfiguration": "Linux-specifikus indítási konfigurációs attribútumok.",
-	"deprecatedVariables": "Az 'env.', 'config.' és 'command.' tujdonságok elavultak, használja helyette az 'env:', 'config:' és 'command:' tulajdonságokat."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/debug/node/terminals.i18n.json b/i18n/hun/src/vs/workbench/parts/debug/node/terminals.i18n.json
deleted file mode 100644
index 63c2dd4d544..00000000000
--- a/i18n/hun/src/vs/workbench/parts/debug/node/terminals.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"console.title": "VS Code-konzol",
-	"mac.terminal.script.failed": "A(z) '{0}' parancsfájl a következő hibakóddal lépett ki: {1}",
-	"mac.terminal.type.not.supported": "A(z) '{0}' nem támogatott",
-	"press.any.key": "A folytatáshoz nyomjon meg egy billentyűt...",
-	"linux.term.failed": "A(z) '{0}' a következő hibakóddal lépett ki: {1}"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/emmet/browser/actions/showEmmetCommands.i18n.json b/i18n/hun/src/vs/workbench/parts/emmet/browser/actions/showEmmetCommands.i18n.json
deleted file mode 100644
index 8e36999281a..00000000000
--- a/i18n/hun/src/vs/workbench/parts/emmet/browser/actions/showEmmetCommands.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"showEmmetCommands": "Emmet-parancsok megjelenítése"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/emmet/electron-browser/actions/balance.i18n.json b/i18n/hun/src/vs/workbench/parts/emmet/electron-browser/actions/balance.i18n.json
deleted file mode 100644
index 1534d8b6077..00000000000
--- a/i18n/hun/src/vs/workbench/parts/emmet/electron-browser/actions/balance.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"balanceInward": "Emmet: Egyensúlyozás (belefé)",
-	"balanceOutward": "Emmet: Egyensúlyozás (kifelé)"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/emmet/electron-browser/actions/editPoints.i18n.json b/i18n/hun/src/vs/workbench/parts/emmet/electron-browser/actions/editPoints.i18n.json
deleted file mode 100644
index 219aad079bd..00000000000
--- a/i18n/hun/src/vs/workbench/parts/emmet/electron-browser/actions/editPoints.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"previousEditPoint": "Emmet: Ugrás az előző szerkesztési pontra",
-	"nextEditPoint": "Emmet: Ugrás a következő szerkesztési pontra"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/emmet/electron-browser/actions/evaluateMath.i18n.json b/i18n/hun/src/vs/workbench/parts/emmet/electron-browser/actions/evaluateMath.i18n.json
deleted file mode 100644
index ab60a0c6b09..00000000000
--- a/i18n/hun/src/vs/workbench/parts/emmet/electron-browser/actions/evaluateMath.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"evaluateMathExpression": "Emmet: Matematikai kifejezés kiértékelése"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/emmet/electron-browser/actions/expandAbbreviation.i18n.json b/i18n/hun/src/vs/workbench/parts/emmet/electron-browser/actions/expandAbbreviation.i18n.json
deleted file mode 100644
index c608818455b..00000000000
--- a/i18n/hun/src/vs/workbench/parts/emmet/electron-browser/actions/expandAbbreviation.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"expandAbbreviationAction": "Emmet: Rövidítés kibontása"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/emmet/electron-browser/actions/incrementDecrement.i18n.json b/i18n/hun/src/vs/workbench/parts/emmet/electron-browser/actions/incrementDecrement.i18n.json
deleted file mode 100644
index d9e318872d8..00000000000
--- a/i18n/hun/src/vs/workbench/parts/emmet/electron-browser/actions/incrementDecrement.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"incrementNumberByOneTenth": "Emmet: Növelés 0,1-gyel",
-	"incrementNumberByOne": "Emmet: Növelés 1-gyel",
-	"incrementNumberByTen": "Emmet: Növelés 10-zel",
-	"decrementNumberByOneTenth": "Emmet: Csökkentés 0,1-gyel",
-	"decrementNumberByOne": "Emmet: Csökkentés 1-gyel",
-	"decrementNumberByTen": "Emmet: Csökkentés 10-zel"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/emmet/electron-browser/actions/matchingPair.i18n.json b/i18n/hun/src/vs/workbench/parts/emmet/electron-browser/actions/matchingPair.i18n.json
deleted file mode 100644
index cec247d0e8f..00000000000
--- a/i18n/hun/src/vs/workbench/parts/emmet/electron-browser/actions/matchingPair.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"matchingPair": "Emmet: Ugrás az illeszkedő párra"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/emmet/electron-browser/actions/mergeLines.i18n.json b/i18n/hun/src/vs/workbench/parts/emmet/electron-browser/actions/mergeLines.i18n.json
deleted file mode 100644
index de85d11a136..00000000000
--- a/i18n/hun/src/vs/workbench/parts/emmet/electron-browser/actions/mergeLines.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"mergeLines": "Emmet: Sorok összeolvasztása"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/emmet/electron-browser/actions/reflectCssValue.i18n.json b/i18n/hun/src/vs/workbench/parts/emmet/electron-browser/actions/reflectCssValue.i18n.json
deleted file mode 100644
index f4fa17b2860..00000000000
--- a/i18n/hun/src/vs/workbench/parts/emmet/electron-browser/actions/reflectCssValue.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"reflectCSSValue": "Emmet: CSS-érték tükrözése"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/emmet/electron-browser/actions/removeTag.i18n.json b/i18n/hun/src/vs/workbench/parts/emmet/electron-browser/actions/removeTag.i18n.json
deleted file mode 100644
index ee23339dfca..00000000000
--- a/i18n/hun/src/vs/workbench/parts/emmet/electron-browser/actions/removeTag.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"removeTag": "Emmet: Elem eltávolítása"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/emmet/electron-browser/actions/selectItem.i18n.json b/i18n/hun/src/vs/workbench/parts/emmet/electron-browser/actions/selectItem.i18n.json
deleted file mode 100644
index 0d67ceb7a02..00000000000
--- a/i18n/hun/src/vs/workbench/parts/emmet/electron-browser/actions/selectItem.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"selectPreviousItem": "Emmet: Előző elem kiválasztása",
-	"selectNextItem": "Emmet: Következő elem kiválasztása"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/emmet/electron-browser/actions/splitJoinTag.i18n.json b/i18n/hun/src/vs/workbench/parts/emmet/electron-browser/actions/splitJoinTag.i18n.json
deleted file mode 100644
index 93c0cba54af..00000000000
--- a/i18n/hun/src/vs/workbench/parts/emmet/electron-browser/actions/splitJoinTag.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"splitJoinTag": "Emmet: Elem szétbontása/összeolvasztása"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/emmet/electron-browser/actions/toggleComment.i18n.json b/i18n/hun/src/vs/workbench/parts/emmet/electron-browser/actions/toggleComment.i18n.json
deleted file mode 100644
index cd5b4fc1fe3..00000000000
--- a/i18n/hun/src/vs/workbench/parts/emmet/electron-browser/actions/toggleComment.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"toggleComment": "Emmet: Megjegyzés be- és kikapcsolása"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/emmet/electron-browser/actions/updateImageSize.i18n.json b/i18n/hun/src/vs/workbench/parts/emmet/electron-browser/actions/updateImageSize.i18n.json
deleted file mode 100644
index 82dab2c362c..00000000000
--- a/i18n/hun/src/vs/workbench/parts/emmet/electron-browser/actions/updateImageSize.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"updateImageSize": "Emmet: Képméret frissítése"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/emmet/electron-browser/actions/updateTag.i18n.json b/i18n/hun/src/vs/workbench/parts/emmet/electron-browser/actions/updateTag.i18n.json
deleted file mode 100644
index 60dea6fbae0..00000000000
--- a/i18n/hun/src/vs/workbench/parts/emmet/electron-browser/actions/updateTag.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"updateTag": "Emmet: Elem frissítése",
-	"enterTag": "Adja meg az elemet",
-	"tag": "Elem"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/emmet/electron-browser/actions/wrapWithAbbreviation.i18n.json b/i18n/hun/src/vs/workbench/parts/emmet/electron-browser/actions/wrapWithAbbreviation.i18n.json
deleted file mode 100644
index 7a062455c62..00000000000
--- a/i18n/hun/src/vs/workbench/parts/emmet/electron-browser/actions/wrapWithAbbreviation.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"wrapWithAbbreviationAction": "Emmet: Becsomagolás rövidítéssel",
-	"enterAbbreviation": "Adja meg a rövidítést",
-	"abbreviation": "Rövidítés"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/emmet/electron-browser/emmet.contribution.i18n.json b/i18n/hun/src/vs/workbench/parts/emmet/electron-browser/emmet.contribution.i18n.json
deleted file mode 100644
index 66342aeada8..00000000000
--- a/i18n/hun/src/vs/workbench/parts/emmet/electron-browser/emmet.contribution.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"emmetConfigurationTitle": "Emmet",
-	"triggerExpansionOnTab": "Ha engedélyezve van, akkor az Emmet-rövidítések a Tab billentyű lenyomásával oldhatók fel. Nem használható, ha az emmet.useNewemmet beállítás értéke true.",
-	"emmetPreferences": "Beállítások, melyek módosítják az Emmet műveleteinek és feloldó algoritmusainak viselkedését. Nem használható, ha az emmet.useNewemmet beállítás értéke true.",
-	"emmetSyntaxProfiles": "Konkrét szintaktika profiljának meghatározása vagy saját profil használata adott szabályokkal.",
-	"emmetExclude": "Azon nyelvek listája, ahol az Emmet-rövidítések ne legyenek kibontva.",
-	"emmetExtensionsPath": "Az Emmet-profilokat, -kódtöredékeket és -beállításokat tartalmazó mappa. Csak a profilok vannak használva a kiegészítőben, ha az emmet.useNewEmmet beállítás értéke true.",
-	"useNewEmmet": "Új Emmet-modulok használata az összes Emmet-funkcióhoz (ami előbb-utóbb helyettesíteni fogja az egyedülálló Emmet-könyvtárat)."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json b/i18n/hun/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
deleted file mode 100644
index 11a68ca775f..00000000000
--- a/i18n/hun/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"terminalConfigurationTitle": "Külső terminál",
-	"explorer.openInTerminalKind": "Meghatározza, hogy milyen típusú terminál legyen indítva.",
-	"terminal.external.windowsExec": "Meghatározza, hogy mely terminál fusson Windowson.",
-	"terminal.external.osxExec": "Meghatározza, hogy mely terminál fusson OS X-en.",
-	"terminal.external.linuxExec": "Meghatározza, hogy mely terminál fusson Linuxon.",
-	"globalConsoleActionWin": "Új parancssor megnyitása",
-	"globalConsoleActionMacLinux": "Új terminál megnyitása",
-	"scopedConsoleActionWin": "Megnyitás a parancssorban",
-	"scopedConsoleActionMacLinux": "Megnyitás a terminálban"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/execution/electron-browser/terminal.contribution.i18n.json b/i18n/hun/src/vs/workbench/parts/execution/electron-browser/terminal.contribution.i18n.json
deleted file mode 100644
index 91f0c001e15..00000000000
--- a/i18n/hun/src/vs/workbench/parts/execution/electron-browser/terminal.contribution.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"terminalConfigurationTitle": "Külső terminál",
-	"terminal.external.windowsExec": "Meghatározza, hogy mely terminál fusson Windowson.",
-	"terminal.external.osxExec": "Meghatározza, hogy mely terminál fusson OS X-en.",
-	"terminal.external.linuxExec": "Meghatározza, hogy mely terminál fusson Linuxon.",
-	"globalConsoleActionWin": "Új parancssor megnyitása",
-	"globalConsoleActionMacLinux": "Új terminál megnyitása",
-	"scopedConsoleActionWin": "Megnyitás a parancssorban",
-	"scopedConsoleActionMacLinux": "Megnyitás a terminálban"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/execution/electron-browser/terminalService.i18n.json b/i18n/hun/src/vs/workbench/parts/execution/electron-browser/terminalService.i18n.json
deleted file mode 100644
index 63c2dd4d544..00000000000
--- a/i18n/hun/src/vs/workbench/parts/execution/electron-browser/terminalService.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"console.title": "VS Code-konzol",
-	"mac.terminal.script.failed": "A(z) '{0}' parancsfájl a következő hibakóddal lépett ki: {1}",
-	"mac.terminal.type.not.supported": "A(z) '{0}' nem támogatott",
-	"press.any.key": "A folytatáshoz nyomjon meg egy billentyűt...",
-	"linux.term.failed": "A(z) '{0}' a következő hibakóddal lépett ki: {1}"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/explorers/browser/treeExplorer.contribution.i18n.json b/i18n/hun/src/vs/workbench/parts/explorers/browser/treeExplorer.contribution.i18n.json
deleted file mode 100644
index e441ed0dd6d..00000000000
--- a/i18n/hun/src/vs/workbench/parts/explorers/browser/treeExplorer.contribution.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"vscode.extension.contributes.view": "Egyedi nézetet szolgáltat",
-	"vscode.extension.contributes.view.id": "A vscode.workspace.createTreeView-n keresztül létrehozott nézet azonosítására szolgáló egyedi azonosító",
-	"vscode.extension.contributes.view.label": "A nézet kirajzolásához használt, emberek által olvasható szöveg",
-	"vscode.extension.contributes.view.icon": "A nézet ikonjának elérési útja",
-	"vscode.extension.contributes.views": "Egyedi nézeteket szolgáltat",
-	"showViewlet": "{0} megjelenítése",
-	"view": "Nézet"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/explorers/browser/treeExplorerActions.i18n.json b/i18n/hun/src/vs/workbench/parts/explorers/browser/treeExplorerActions.i18n.json
deleted file mode 100644
index 982d3cebdfe..00000000000
--- a/i18n/hun/src/vs/workbench/parts/explorers/browser/treeExplorerActions.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"refresh": "Frissítés"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/explorers/browser/treeExplorerService.i18n.json b/i18n/hun/src/vs/workbench/parts/explorers/browser/treeExplorerService.i18n.json
deleted file mode 100644
index ccb7f253610..00000000000
--- a/i18n/hun/src/vs/workbench/parts/explorers/browser/treeExplorerService.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"treeExplorer.noMatchingProviderId": "Nincs {0} azonosítójú TreeExplorerNodeProvider regisztrálva"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/explorers/browser/views/treeExplorerView.i18n.json b/i18n/hun/src/vs/workbench/parts/explorers/browser/views/treeExplorerView.i18n.json
deleted file mode 100644
index 4c975404538..00000000000
--- a/i18n/hun/src/vs/workbench/parts/explorers/browser/views/treeExplorerView.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"treeExplorerViewlet.tree": "Fa-alapú kezelőszakasz"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/extensions/browser/dependenciesViewer.i18n.json b/i18n/hun/src/vs/workbench/parts/extensions/browser/dependenciesViewer.i18n.json
deleted file mode 100644
index 90dae6c74ab..00000000000
--- a/i18n/hun/src/vs/workbench/parts/extensions/browser/dependenciesViewer.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"error": "Hiba",
-	"Unknown Dependency": "Ismeretlen függőség:"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json b/i18n/hun/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json
deleted file mode 100644
index 823bbb73568..00000000000
--- a/i18n/hun/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"name": "Kiegészítő neve",
-	"extension id": "Kiegészítő azonosítója",
-	"preview": "Betekintő",
-	"builtin": "Beépített",
-	"publisher": "Kiadó neve",
-	"install count": "Telepítések száma",
-	"rating": "Értékelés",
-	"repository": "Forráskódtár",
-	"license": "Licenc",
-	"details": "Részletek",
-	"contributions": "Szolgáltatások",
-	"changelog": "Változtatási napló",
-	"dependencies": "Függőségek",
-	"noReadme": "Leírás nem található.",
-	"noChangelog": "Változtatási napló nem található.",
-	"noContributions": "Nincsenek szolgáltatások",
-	"noDependencies": "Nincsenek függőségek",
-	"settings": "Beállítások ({0})",
-	"setting name": "Név",
-	"description": "Leírás",
-	"default": "Alapértelmezett érték",
-	"debuggers": "Hibakeresők ({0})",
-	"debugger name": "Név",
-	"debugger type": "Típus",
-	"views": "Nézetek ({0})",
-	"view id": "Azonosító",
-	"view name": "Név",
-	"view location": "Hol?",
-	"localizations": "Lokalizációk ({0})",
-	"localizations language id": "Nyelv azonosítója",
-	"localizations language name": "Nyelv neve",
-	"localizations localized language name": "Nyelv neve (lokalizálva)",
-	"colorThemes": "Színtémák ({0})",
-	"iconThemes": "Ikontémák ({0})",
-	"colors": "Színek ({0})",
-	"colorId": "Azonosító",
-	"defaultDark": "Alapértelmezett sötét",
-	"defaultLight": "Alapértelmezett világos",
-	"defaultHC": "Alapértelmezett nagy kontrasztú",
-	"JSON Validation": "JSON-validációk ({0})",
-	"fileMatch": "Fájlegyezés",
-	"schema": "Séma",
-	"commands": "Parancsok ({0})",
-	"command name": "Név",
-	"keyboard shortcuts": "Billentyűparancsok",
-	"menuContexts": "Helyi menük",
-	"languages": "Nyelvek ({0})",
-	"language id": "Azonosító",
-	"language name": "Név",
-	"file extensions": "Fájlkiterjesztések",
-	"grammar": "Nyelvtan",
-	"snippets": "Kódtöredékek"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json b/i18n/hun/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
deleted file mode 100644
index 7a913054b25..00000000000
--- a/i18n/hun/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
+++ /dev/null
@@ -1,81 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"download": "Manuális letöltés",
-	"install vsix": "A letöltés után telepítse manuálisan a letöltött '{0}' VSIX-et.",
-	"installAction": "Telepítés",
-	"installing": "Telepítés...",
-	"failedToInstall": "Nem sikerült telepíteni a következőt: '{0}'.",
-	"uninstallAction": "Eltávolítás",
-	"Uninstalling": "Eltávolítás...",
-	"updateAction": "Frissítés",
-	"updateTo": "Frissítés ({0})",
-	"failedToUpdate": "Nem sikerült a következő frissítése: '{0}'.",
-	"ManageExtensionAction.uninstallingTooltip": "Eltávolítás",
-	"enableForWorkspaceAction": "Engedélyezés a munkaterületen",
-	"enableGloballyAction": "Engedélyezés",
-	"enableAction": "Engedélyezés",
-	"disableForWorkspaceAction": "Letiltás a munkaterületen",
-	"disableGloballyAction": "Letiltás",
-	"disableAction": "Letiltás",
-	"checkForUpdates": "Frissítések keresése",
-	"enableAutoUpdate": "Kiegészítők automatikus frissítésének engedélyezése",
-	"disableAutoUpdate": "Kiegészítők automatikus frissítésének letiltása",
-	"updateAll": "Összes kiegészítő frissítése",
-	"reloadAction": "Újratöltés",
-	"postUpdateTooltip": "Újratöltés a frissítéshez",
-	"postUpdateMessage": "Újratölti az ablakot a frissített kiegészítő ('{0}') aktiválásához?",
-	"postEnableTooltip": "Újratöltés az aktiváláshoz",
-	"postEnableMessage": "Újratölti az ablakot a kiegészítő ('{0}') aktiválásához?",
-	"postDisableTooltip": "Újratöltés a kikapcsoláshoz",
-	"postDisableMessage": "Újratölti az ablakot a kiegészítő ('{0}') kikapcsolásához?",
-	"postUninstallTooltip": "Újratöltés a kikapcsoláshoz",
-	"postUninstallMessage": "Újratölti az ablakot az eltávolított kiegészítő ('{0}') kikapcsolásához?",
-	"toggleExtensionsViewlet": "Kiegészítők megjelenítése",
-	"installExtensions": "Kiegészítők telepítése",
-	"showEnabledExtensions": "Engedélyezett kiegészítők megjelenítése",
-	"showInstalledExtensions": "Telepített kiegészítők megjelenítése",
-	"showDisabledExtensions": "Letiltott kiegészítők megjelenítése",
-	"clearExtensionsInput": "Kiegészítők beviteli mező tartalmának törlése",
-	"showBuiltInExtensions": "Beépített kiegészítők megjelenítése",
-	"showOutdatedExtensions": "Elavult kiegészítők megjelenítése",
-	"showPopularExtensions": "Népszerű kiegészítők megjelenítése",
-	"showRecommendedExtensions": "Ajánlott kiegészítők megjelenítése",
-	"installWorkspaceRecommendedExtensions": "Minden munkaterülethez ajánlott kiegészítő telepítése",
-	"allExtensionsInstalled": "Már az összes, munkaterülethez ajánlott kiegészítő telepítve van",
-	"installRecommendedExtension": "Ajánlott kiegészítő telepítése",
-	"extensionInstalled": "Ez az ajánlott kiegészítő már telepítve van.",
-	"showRecommendedKeymapExtensionsShort": "Billentyűkonfigurációk",
-	"showLanguageExtensionsShort": "Nyelvi kiegészítők",
-	"showAzureExtensionsShort": "Azure-kiegészítők",
-	"OpenExtensionsFile.failed": "Nem sikerült létrehozni az 'extensions.json' fájlt a '.vscode' mappánan ({0}).",
-	"configureWorkspaceRecommendedExtensions": "Ajánlott kiegészítők konfigurálása (munkaterületre vonatkozóan)",
-	"configureWorkspaceFolderRecommendedExtensions": "Ajánlott kiegészítők konfigurálása (munkaterület-mappára vonatkozóan)",
-	"malicious tooltip": "A kiegészítőt korábban problémásnak jelezték.",
-	"malicious": "Rosszindulatú",
-	"disabled": "Letiltva",
-	"disabled globally": "Letiltva",
-	"disabled workspace": "Letiltva ezen a munkaterületen",
-	"disableAll": "Összes telepített kiegészítő letiltása",
-	"disableAllWorkspace": "Összes telepített kiegészítő letiltása a munkaterületre vonatkozóan",
-	"enableAll": "Összes kiegészítő engedélyezése",
-	"enableAllWorkspace": "Összes kiegészítő engedélyezése ezen a munkaterületen",
-	"openExtensionsFolder": "Kiegészítők mappájának megnyitása",
-	"installVSIX": "Telepítés VSIX-ből...",
-	"installFromVSIX": "Telepítés VSIX-ből",
-	"installButton": "&&Telepítés",
-	"InstallVSIXAction.success": "A kiegészítő sikeresen fel lett telepítve. Töltse újra az engedélyezéshez!",
-	"InstallVSIXAction.reloadNow": "Újratöltés most",
-	"reinstall": "Kiegészítő újratelepítése...",
-	"selectExtension": "Válassza ki az újratelepítendő kiegészítőt",
-	"ReinstallAction.success": "Kiegészítő sikeresen újratelepítve.",
-	"ReinstallAction.reloadNow": "Újratöltés most",
-	"extensionButtonProminentBackground": "A kiegészítőkhöz tartozó kiemelt műveletgombok (pl. a Telepítés gomb) háttérszíne.",
-	"extensionButtonProminentForeground": "A kiegészítőkhöz tartozó kiemelt műveletgombok (pl. a Telepítés gomb) előtérszíne.",
-	"extensionButtonProminentHoverBackground": "A kiegészítőkhöz tartozó kiemelt műveletgombok (pl. a Telepítés gomb) háttérszíne, ha az egér fölötte van."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/extensions/browser/extensionsList.i18n.json b/i18n/hun/src/vs/workbench/parts/extensions/browser/extensionsList.i18n.json
deleted file mode 100644
index 8c7fafc8b58..00000000000
--- a/i18n/hun/src/vs/workbench/parts/extensions/browser/extensionsList.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"recommended": "Ajánlott"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/extensions/browser/extensionsQuickOpen.i18n.json b/i18n/hun/src/vs/workbench/parts/extensions/browser/extensionsQuickOpen.i18n.json
deleted file mode 100644
index 7a088c82202..00000000000
--- a/i18n/hun/src/vs/workbench/parts/extensions/browser/extensionsQuickOpen.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"manage": "Nyomjon Entert a kiegészítők kezeléséhez.",
-	"notfound": "A(z) '{0}' kiegészítő nem található a piactéren.",
-	"install": "Nyomja meg az Enter gombot a(z) '{0}' kiegészítő telepítéséhez a piactérről!",
-	"searchFor": "Nyomja meg az Enter gombot a(z) '{0}' kiegészítő kereséséhez a piactéren.",
-	"noExtensionsToInstall": "Adja meg a kiegészítő nevét"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/extensions/browser/extensionsWidgets.i18n.json b/i18n/hun/src/vs/workbench/parts/extensions/browser/extensionsWidgets.i18n.json
deleted file mode 100644
index 051204473d6..00000000000
--- a/i18n/hun/src/vs/workbench/parts/extensions/browser/extensionsWidgets.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"ratedByUsers": "{0} felhasználó értékelte",
-	"ratedBySingleUser": "1 felhasználó értékelte"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/extensions/common/extensionsFileTemplate.i18n.json b/i18n/hun/src/vs/workbench/parts/extensions/common/extensionsFileTemplate.i18n.json
deleted file mode 100644
index 4c0bf3d58bb..00000000000
--- a/i18n/hun/src/vs/workbench/parts/extensions/common/extensionsFileTemplate.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"app.extensions.json.title": "Kiegészítők",
-	"app.extensions.json.recommendations": "Ajánlott kiegészítők listája. A kiegészítők azonosítója mindig '${publisher}.${name}' formában van. Példa: 'vscode.csharp'.",
-	"app.extension.identifier.errorMessage": "Az elvárt formátum: '${publisher}.${name}'. Példa: 'vscode.csharp'."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/extensions/common/extensionsInput.i18n.json b/i18n/hun/src/vs/workbench/parts/extensions/common/extensionsInput.i18n.json
deleted file mode 100644
index a869db00d08..00000000000
--- a/i18n/hun/src/vs/workbench/parts/extensions/common/extensionsInput.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"extensionsInputName": "Kiegészítő: {0}"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json b/i18n/hun/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
deleted file mode 100644
index c93d639320c..00000000000
--- a/i18n/hun/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
+++ /dev/null
@@ -1,69 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"name": "Kiegészítő neve",
-	"extension id": "Kiegészítő azonosítója",
-	"preview": "Betekintő",
-	"builtin": "Beépített",
-	"publisher": "Kiadó neve",
-	"install count": "Telepítések száma",
-	"rating": "Értékelés",
-	"repository": "Forráskódtár",
-	"license": "Licenc",
-	"details": "Részletek",
-	"detailstooltip": "A kiegészítő leírása, a kiegészítő „README.md” fájljának tartalma alapján",
-	"contributions": "Szolgáltatások",
-	"contributionstooltip": "Listázza azokat a szolgáltatásokat, amelyekkel a kiegészítő bővíti a VS Code-ot",
-	"changelog": "Változtatási napló",
-	"changelogtooltip": "A kiegészítő frissítési előzményei, a kiegészítő „CHANGELOG.md” fájljának tartalma alapján",
-	"dependencies": "Függőségek",
-	"dependenciestooltip": "A kiegészítő függőségeinek listája",
-	"noReadme": "Leírás nem található.",
-	"noChangelog": "Változtatási napló nem található.",
-	"noContributions": "Nincsenek szolgáltatások",
-	"noDependencies": "Nincsenek függőségek",
-	"settings": "Beállítások ({0})",
-	"setting name": "Név",
-	"description": "Leírás",
-	"default": "Alapértelmezett",
-	"debuggers": "Hibakeresők ({0})",
-	"debugger name": "Név",
-	"debugger type": "Típus",
-	"viewContainers": "Nézetgyűjtemények ({0})",
-	"view container id": "Azonosító",
-	"view container title": "Cím",
-	"view container location": "Hol?",
-	"views": "Nézetek ({0})",
-	"view id": "Azonosító",
-	"view name": "Név",
-	"view location": "Hol?",
-	"localizations": "Lokalizációk ({0})",
-	"localizations language id": "Nyelv azonosítója",
-	"localizations language name": "Nyelv neve",
-	"localizations localized language name": "Nyelv neve (lokalizálva)",
-	"colorThemes": "Színtémák ({0})",
-	"iconThemes": "Ikontémák ({0})",
-	"colors": "Színek ({0})",
-	"colorId": "Azonosító",
-	"defaultDark": "Alapértelmezett sötét",
-	"defaultLight": "Alapértelmezett világos",
-	"defaultHC": "Alapértelmezett nagy kontrasztú",
-	"JSON Validation": "JSON-validációk ({0})",
-	"fileMatch": "Fájlegyezés",
-	"schema": "Séma",
-	"commands": "Parancsok ({0})",
-	"command name": "Név",
-	"keyboard shortcuts": "Billentyűparancsok",
-	"menuContexts": "Helyi menük",
-	"languages": "Nyelvek ({0})",
-	"language id": "Azonosító",
-	"language name": "Név",
-	"file extensions": "Fájlkiterjesztések",
-	"grammar": "Nyelvtan",
-	"snippets": "Kódtöredékek"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/extensions/electron-browser/extensionProfileService.i18n.json b/i18n/hun/src/vs/workbench/parts/extensions/electron-browser/extensionProfileService.i18n.json
deleted file mode 100644
index be33ca1c92f..00000000000
--- a/i18n/hun/src/vs/workbench/parts/extensions/electron-browser/extensionProfileService.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"restart1": "Kiegészítők profilozása",
-	"restart2": "Kiegészítők profilozásához újraindítás szükséges. Szeretné újraindítani az alkalmazást?",
-	"restart3": "Újraindítás",
-	"cancel": "Mégse",
-	"selectAndStartDebug": "Kattintson a profilozás leállításához!"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json b/i18n/hun/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
deleted file mode 100644
index 236476e89a2..00000000000
--- a/i18n/hun/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"neverShowAgain": "Ne jelenítse meg újra",
-	"searchMarketplace": "Keresés a piactéren",
-	"dynamicWorkspaceRecommendation": "Ez a kiegészítő lehet, hogy érdekelni fogja, mert népszerű a(z) {0} forráskódtár felhasználói körében.",
-	"exeBasedRecommendation": "Ez a kiegészítő azért ajánlott, mert a következő telepítve van: {0}.",
-	"fileBasedRecommendation": "Ez a kiegészítő a közelmúltban megnyitott fájlok alapján ajánlott.",
-	"workspaceRecommendation": "Ez a kiegészítő az aktuális munkaterület felhasználói által ajánlott.",
-	"reallyRecommended2": "Ehhez a fájltípushoz a(z) '{0}' kiegészítő ajánlott.",
-	"reallyRecommendedExtensionPack": "Ehhez a fájltípushoz a(z) '{0}' kiegészítőcsomag ajánlott.",
-	"install": "Telepítés",
-	"showRecommendations": "Ajánlatok megjelenítése",
-	"showLanguageExtensions": "A piactéren található olyan kiegészítő, ami segíthet a(z) '.{0}' fájloknál",
-	"workspaceRecommended": "A munkaterülethez vannak javasolt kiegészítők",
-	"installAll": "Összes telepítése",
-	"ignoreExtensionRecommendations": "Figyelmen kívül akarja hagyni az összes javasolt kiegészítőt?",
-	"ignoreAll": "Igen, az összes figyelmen kívül hagyása",
-	"no": "Nem"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/extensions/electron-browser/extensions.contribution.i18n.json b/i18n/hun/src/vs/workbench/parts/extensions/electron-browser/extensions.contribution.i18n.json
deleted file mode 100644
index 7fd3eb0dca5..00000000000
--- a/i18n/hun/src/vs/workbench/parts/extensions/electron-browser/extensions.contribution.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"extensionsCommands": "Kiegészítők kezelése",
-	"galleryExtensionsCommands": "Kiegészítők telepítése a galériából",
-	"extension": "Kiegészítő",
-	"runtimeExtension": "Futó kiegészítők",
-	"extensions": "Kiegészítők",
-	"view": "Nézet",
-	"developer": "Fejlesztői",
-	"extensionsConfigurationTitle": "Kiegészítők",
-	"extensionsAutoUpdate": "Kiegészítők automatikus frissítése",
-	"extensionsIgnoreRecommendations": "Ha az értéke true, nem jelenik meg több kiegészítőajánlást tartalmazó értesítés.",
-	"extensionsShowRecommendationsOnlyOnDemand": "Ha az értéke true, az ajánlatok csak akkor lesznek lekérve és megjelenítve, ha a felhasználó konkrétan kéri őket."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.i18n.json b/i18n/hun/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.i18n.json
deleted file mode 100644
index d4ef28abfb8..00000000000
--- a/i18n/hun/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openExtensionsFolder": "Kiegészítők mappájának megnyitása",
-	"installVSIX": "Telepítés VSIX-ből...",
-	"installFromVSIX": "Telepítés VSIX-ből",
-	"installButton": "&&Telepítés",
-	"InstallVSIXAction.success": "A kiegészítő sikeresen fel lett telepítve. Töltse újra az engedélyezéshez!",
-	"InstallVSIXAction.reloadNow": "Újratöltés most"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/extensions/electron-browser/extensionsUtils.i18n.json b/i18n/hun/src/vs/workbench/parts/extensions/electron-browser/extensionsUtils.i18n.json
deleted file mode 100644
index 716316b2449..00000000000
--- a/i18n/hun/src/vs/workbench/parts/extensions/electron-browser/extensionsUtils.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"disableOtherKeymapsConfirmation": "Letiltja a többi billentyűkonfigurációt ({0}) a billentyűparancsok közötti konfliktusok megelőzése érdekében?",
-	"yes": "Igen",
-	"no": "Nem"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json b/i18n/hun/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
deleted file mode 100644
index 1c51e825f0a..00000000000
--- a/i18n/hun/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"marketPlace": "Piactér",
-	"installedExtensions": "Telepítve",
-	"searchInstalledExtensions": "Telepítve",
-	"recommendedExtensions": "Ajánlott",
-	"otherRecommendedExtensions": "További ajánlatok",
-	"workspaceRecommendedExtensions": "Ajánlott a munkaterülethez",
-	"builtInExtensions": "Funkciók",
-	"builtInThemesExtensions": "Témák",
-	"builtInBasicsExtensions": "Programozási nyelvek",
-	"searchExtensions": "Kiegészítők keresése a piactéren",
-	"sort by installs": "Rendezés a telepítések száma szerint",
-	"sort by rating": "Rendezés értékelés szerint",
-	"sort by name": "Rendezés név szerint",
-	"suggestProxyError": "A piactér 'ECONNREFUSED' hibával tért vissza. Ellenőrizze a 'http.proxy' beállítást!",
-	"extensions": "Kiegészítők",
-	"outdatedExtensions": "{0} elavult kiegészítő",
-	"malicious warning": "Eltávolítottuk a(z) '{0}' kiegészítőt, mert jelezték, hogy problémás.",
-	"reloadNow": "Újratöltés most"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/extensions/electron-browser/extensionsViews.i18n.json b/i18n/hun/src/vs/workbench/parts/extensions/electron-browser/extensionsViews.i18n.json
deleted file mode 100644
index dee17a14ef5..00000000000
--- a/i18n/hun/src/vs/workbench/parts/extensions/electron-browser/extensionsViews.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"extensions": "Kiegészítők",
-	"no extensions found": "Kiegészítő nem található.",
-	"suggestProxyError": "A piactér 'ECONNREFUSED' hibával tért vissza. Ellenőrizze a 'http.proxy' beállítást!"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/extensions/electron-browser/runtimeExtensionsEditor.i18n.json b/i18n/hun/src/vs/workbench/parts/extensions/electron-browser/runtimeExtensionsEditor.i18n.json
deleted file mode 100644
index 751d687e6f8..00000000000
--- a/i18n/hun/src/vs/workbench/parts/extensions/electron-browser/runtimeExtensionsEditor.i18n.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"starActivation": "Indulásnál aktiválódott",
-	"workspaceContainsGlobActivation": "Azért aktiválódott, mert létezik a következőre illeszkedő fájl a munkaterületen: {0}",
-	"workspaceContainsFileActivation": "Azért aktiválódott, mert van {0} nevű fájl a munkaterületen ",
-	"languageActivation": "Azért aktiválódott, mert megnyitott egy {0} fájlt.",
-	"workspaceGenericActivation": "A következő miatt aktiválódott: {0}",
-	"errors": "{0} kezeletlen hiba",
-	"extensionsInputName": "Futó kiegészítők",
-	"showRuntimeExtensions": "Futó kiegészítők megjelenítése",
-	"reportExtensionIssue": "Probléma jelentése",
-	"extensionHostProfileStart": "Kiegészítő gazdafolyamat profilozásának elindítása",
-	"extensionHostProfileStop": "Kiegészítő gazdafolyamat profilozásának leállítása",
-	"saveExtensionHostProfile": "Kiegészítő gazdafolyamat profiljának elmentése"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.i18n.json b/i18n/hun/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.i18n.json
deleted file mode 100644
index ca858c413b1..00000000000
--- a/i18n/hun/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.i18n.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"installingVSIXExtension": "Kiegészítő telepítése VSIX-ből...",
-	"malicious": "Jelezték, hogy a kiegészítőt problémás.",
-	"installingMarketPlaceExtension": "Kiegészítő telepítése a piactérről...",
-	"uninstallingExtension": "Kiegészítő eltávolítása...",
-	"enableDependeciesConfirmation": "A kiegészítő engedélyezésével annak függőségei is engedélyezve lesznek. Szeretné folytatni?",
-	"enable": "Igen",
-	"doNotEnable": "Nem",
-	"disableDependeciesConfirmation": "A kiegészítő függőségeit is szeretné letiltani?",
-	"yes": "Igen",
-	"no": "Nem",
-	"cancel": "Mégse",
-	"singleDependentError": "Nem sikerült letiltani a(z) '{0}' kiegészítőt: a(z) '{1}' kiegészítő függ tőle.",
-	"twoDependentsError": "Nem sikerült letiltani a(z) '{0}' kiegészítőt: a(z) '{1}' és '{2}' kiegészítők függnek tőle.",
-	"multipleDependentsError": "Nem sikerült letiltani a(z) '{0}' kiegészítőt: a(z) '{1}', '{2}' és más kiegészítők függnek tőle.",
-	"installConfirmation": "Szeretné telepíteni a(z) '{0}' kiegészítőt?",
-	"install": "Telepítés"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json b/i18n/hun/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json
deleted file mode 100644
index a79e4252425..00000000000
--- a/i18n/hun/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"workbenchConfigurationTitle": "Munkaterület",
-	"feedbackVisibility": "Meghatározza az állapotsoron megjelenő, visszajelzés tweetelése (mosoly) gomb láthatóságát."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/feedback/electron-browser/feedback.i18n.json b/i18n/hun/src/vs/workbench/parts/feedback/electron-browser/feedback.i18n.json
deleted file mode 100644
index 9c6fd91e684..00000000000
--- a/i18n/hun/src/vs/workbench/parts/feedback/electron-browser/feedback.i18n.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"sendFeedback": "Visszajelzés tweetelése",
-	"label.sendASmile": "Küldje el nekünk egy tweetben a visszajelzését!",
-	"patchedVersion1": "A telepítés hibás.",
-	"patchedVersion2": "Az alábbiakat adja meg, ha hibát akar beküldeni.",
-	"sentiment": "Milyennek találja az alkalmazást?",
-	"smileCaption": "Elégedett",
-	"frownCaption": "Elégedetlen vagyok vele",
-	"other ways to contact us": "Más értesítési módok",
-	"submit a bug": "Hibajelentés küldése",
-	"request a missing feature": "Hiányzó funkció kérése",
-	"tell us why?": "Mondja el, hogy miért",
-	"commentsHeader": "Visszajelzés",
-	"showFeedback": "Visszajelzésre szolgáló mosoly gomb megjelenítése az állapotsoron",
-	"tweet": "Tweer",
-	"character left": "karakter maradt",
-	"characters left": "karakter maradt",
-	"feedbackSending": "Küldés",
-	"feedbackSent": "Köszönjük!",
-	"feedbackSendingError": "Újrapróbálkozás"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json b/i18n/hun/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json
deleted file mode 100644
index 34a5f733ab9..00000000000
--- a/i18n/hun/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hide": "Elrejtés"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/files/browser/editors/binaryFileEditor.i18n.json b/i18n/hun/src/vs/workbench/parts/files/browser/editors/binaryFileEditor.i18n.json
deleted file mode 100644
index 264d82a4f74..00000000000
--- a/i18n/hun/src/vs/workbench/parts/files/browser/editors/binaryFileEditor.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"binaryFileEditor": "Bináris megjelenítő"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/files/browser/editors/textFileEditor.i18n.json b/i18n/hun/src/vs/workbench/parts/files/browser/editors/textFileEditor.i18n.json
deleted file mode 100644
index 4baf355021f..00000000000
--- a/i18n/hun/src/vs/workbench/parts/files/browser/editors/textFileEditor.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"textFileEditor": "Szövegfájlszerkesztő",
-	"createFile": "Fájl létrehozása",
-	"relaunchWithIncreasedMemoryLimit": "Újraindítás {0} MB-tal",
-	"configureMemoryLimit": "Memóriakorlát beállítása",
-	"fileEditorWithInputAriaLabel": "{0}. Szövegfájlszerkesztő.",
-	"fileEditorAriaLabel": "Szövegfájlszerkesztő"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/files/browser/explorerViewlet.i18n.json b/i18n/hun/src/vs/workbench/parts/files/browser/explorerViewlet.i18n.json
deleted file mode 100644
index f5098b1e4b7..00000000000
--- a/i18n/hun/src/vs/workbench/parts/files/browser/explorerViewlet.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"folders": "Mappák"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/files/browser/fileActions.contribution.i18n.json b/i18n/hun/src/vs/workbench/parts/files/browser/fileActions.contribution.i18n.json
deleted file mode 100644
index d032a29e684..00000000000
--- a/i18n/hun/src/vs/workbench/parts/files/browser/fileActions.contribution.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"filesCategory": "Fájl",
-	"revealInSideBar": "Megjelenítés az oldalsávon",
-	"acceptLocalChanges": "A lemezen lévő tartalom felülírása a saját módosításokkal",
-	"revertLocalChanges": "Saját módosítások elvetése és a lemezen lévő tartalom visszaállítása"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/files/browser/fileActions.i18n.json b/i18n/hun/src/vs/workbench/parts/files/browser/fileActions.i18n.json
deleted file mode 100644
index 89393542705..00000000000
--- a/i18n/hun/src/vs/workbench/parts/files/browser/fileActions.i18n.json
+++ /dev/null
@@ -1,73 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"retry": "Újra",
-	"rename": "Átnevezés",
-	"newFile": "Új fájl",
-	"newFolder": "Új mappa",
-	"openFolderFirst": "Mappák vagy fájlok létrehozásához először nyisson meg egy mappát!",
-	"newUntitledFile": "Új, névtelen fájl",
-	"createNewFile": "Új fájl",
-	"createNewFolder": "Új mappa",
-	"deleteButtonLabelRecycleBin": "Áthelyezés a lo&&mtárba",
-	"deleteButtonLabelTrash": "Áthelyezés a &&kukába",
-	"deleteButtonLabel": "&&Törlés",
-	"dirtyMessageFolderOneDelete": "Törölni készül egy olyan mappát, melyben egy nem mentett változtatásokat tartalmazó fájl van. Folytatja?",
-	"dirtyMessageFolderDelete": "Törölni készül egy olyan mappát, melyben {0} nem mentett változtatásokat tartalmazó fájl van. Folytatja?",
-	"dirtyMessageFileDelete": "Törölni készül egy olyan fájlt, amely nem mentett változtatásokat tartalmaz. Folytatja?",
-	"dirtyWarning": "A módosítások elvesznek, ha nem menti őket.",
-	"confirmMoveTrashMessageFolder": "Törli a(z) '{0}' nevű mappát és a teljes tartalmát?",
-	"confirmMoveTrashMessageFile": "Törli a(z) '{0}' nevű fájlt?",
-	"undoBin": "Helyreállíthatja a lomtárból.",
-	"undoTrash": "Helyreállíthatja a kukából.",
-	"doNotAskAgain": "Ne kérdezze meg újra",
-	"confirmDeleteMessageFolder": "Törli a(z) {0} mappát és a teljes tartalmát?",
-	"confirmDeleteMessageFile": "Véglegesen törli a következőt: {0}?",
-	"irreversible": "A művelet nem vonható vissza!",
-	"permDelete": "Végleges törlés",
-	"delete": "Törlés",
-	"importFiles": "Fájlok importálása",
-	"confirmOverwrite": "A célmappában már van ilyen nevű mappa vagy fájl. Le szeretné cserélni?",
-	"replaceButtonLabel": "&&Csere",
-	"copyFile": "Másolás",
-	"pasteFile": "Beillesztés",
-	"duplicateFile": "Duplikálás",
-	"openToSide": "Megnyitás oldalt",
-	"compareSource": "Kijelölés összehasonlításhoz",
-	"globalCompareFile": "Aktív fájl összehasonlítása...",
-	"openFileToCompare": "Fájlok összehasonlításához elősször nyisson meg egy fájlt.",
-	"compareWith": "'{0}' összehasonlítása a következővel: '{1}'",
-	"compareFiles": "Fájlok összehasonlítása",
-	"refresh": "Frissítés",
-	"save": "Mentés",
-	"saveAs": "Mentés másként...",
-	"saveAll": "Összes mentése",
-	"saveAllInGroup": "Összes mentése a csoportban",
-	"saveFiles": "Összes fájl mentése",
-	"revert": "Fájl visszaállítása",
-	"focusOpenEditors": "Váltás a megnyitott szerkesztőablakok nézetre",
-	"focusFilesExplorer": "Váltás a fájlkezelőre",
-	"showInExplorer": "Aktív fájl megjelenítése az oldalsávon",
-	"openFileToShow": "Fájl fájlkezelőben történő megjelenítéséhez először nyisson meg egy fájlt",
-	"collapseExplorerFolders": "Mappák összecsukása a fájlkezelőben",
-	"refreshExplorer": "Fájlkezelő frissítése",
-	"openFileInNewWindow": "Aktív fájl megnyitása új ablakban",
-	"openFileToShowInNewWindow": "Fájl új ablakban történő megnyitásához először nyisson meg egy fájlt",
-	"revealInWindows": "Megjelenítés a fájlkezelőben",
-	"revealInMac": "Megjelenítés a Finderben",
-	"openContainer": "Tartalmazó mappa megnyitása",
-	"revealActiveFileInWindows": "Aktív fájl megjelenítése a Windows Intézőben",
-	"revealActiveFileInMac": "Aktív fájl megjelenítése a Finderben",
-	"openActiveFileContainer": "Aktív fájlt tartalmazó mappa megnyitása",
-	"copyPath": "Elérési út másolása",
-	"copyPathOfActive": "Aktív fájl elérési útjának másolása",
-	"emptyFileNameError": "Meg kell adni egy fájl vagy mappa nevét.",
-	"fileNameExistsError": "Már létezik **{0}** nevű fájl vagy mappa ezen a helyszínen. Adjon meg egy másik nevet!",
-	"invalidFileNameError": "A(z) **{0}** név nem érvényes fájl- vagy mappanév. Adjon meg egy másik nevet!",
-	"filePathTooLongError": "A(z) **{0}** név egy olyan elérési utat eredményez, ami túl hosszú. Adjon meg egy másik nevet!",
-	"compareWithSaved": "Aktív fájl összehasonlítása a mentett változattal",
-	"modifiedLabel": "{0} (a lemezen) ↔ {1}"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/files/browser/fileCommands.i18n.json b/i18n/hun/src/vs/workbench/parts/files/browser/fileCommands.i18n.json
deleted file mode 100644
index dd9057b1fa4..00000000000
--- a/i18n/hun/src/vs/workbench/parts/files/browser/fileCommands.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"openFileToCopy": "Fájlok elérési útjának másolásához elősször nyisson meg egy fájlt",
-	"openFileToReveal": "Fájlok felfedéséhez elősször nyisson meg egy fájlt"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/files/browser/files.contribution.i18n.json b/i18n/hun/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
deleted file mode 100644
index a6c7fe4eaef..00000000000
--- a/i18n/hun/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
+++ /dev/null
@@ -1,53 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"showExplorerViewlet": "Fájlkezelő megjelenítése",
-	"explore": "Fájlkezelő",
-	"view": "Nézet",
-	"textFileEditor": "Szövegfájlszerkesztő",
-	"binaryFileEditor": "Bináris fájlszerkesztő",
-	"filesConfigurationTitle": "Fájlok",
-	"exclude": "Globális minták konfigurálása fájlok és mappák kizárásához. A fájlkezelő például ezen beállítás alapján dönti el, hogy mely fájlokat és mappákat jelenítsen meg vagy rejtsen el.",
-	"files.exclude.boolean": "A globális minta, amire illesztve lesznek a fájlok elérési útjai. A minta engedélyezéséhez vagy letiltásához állítsa igaz vagy hamis értékre.",
-	"files.exclude.when": "További ellenőrzés elvégzése egy egyező fájl testvérein. Az egyező fájlnévhez használja a $(basename) változót.",
-	"associations": "Rendeljen nyelveket a fájlokhoz (pl: \"*.kiterjesztés\": \"html\"). Ezek a hozzárendelések elsőbbséget élveznek a telepített nyelvek által definiált alapértelmezett beállításokkal szemben.",
-	"encoding": "A fájlok írásánál és olvasásánál használt alapértelmezett karakterkészlet. A beállítás nyelvenként is konfigurálható.",
-	"autoGuessEncoding": "Ha engedélyezve van, fájlok megnyitásakor megpróbálja kitalálni a karakterkészletüket. A beállítás nyelvenként is konfigurálható.",
-	"eol": "Az alapértelmezett sorvégjel. LF-hez használjon \\n-t, CRLF-hez pedig \\r\\n-t.",
-	"trimTrailingWhitespace": "Ha engedélyezve van, a fájl mentésekor levágja a sor végén található szóközöket.",
-	"insertFinalNewline": "Ha engedélyezve van, mentéskor beszúr egy záró újsort a fájl végére.",
-	"trimFinalNewlines": "Ha engedélyezve van, mentéskor levágja a fájl végérő az összes újsort az utolsó újsor után.",
-	"files.autoSave.off": "A módosított fájlok soha nincsenek automatikusan mentve.",
-	"files.autoSave.afterDelay": "A módosított fájlok automatikusan mentésre kerülnek a 'files.autoSaveDelay' beállításban meghatározott időközönként.",
-	"files.autoSave.onFocusChange": "A módosított fájlok automatikusan mentésre kerülnek, ha a szerkesztőablak elveszíti a fókuszt.",
-	"files.autoSave.onWindowChange": "A módosított fájlok automatikusan mentésre kerülnek, ha az ablak elveszíti a fókuszt.",
-	"autoSave": "Meghatározza a módosított fájlok automatikus mentési stratégiáját. Elfogadott értékek: '{0}', '{1}', '{2}' (a szerkesztőablak elveszíti a fókuszt), '{3}' (az ablak elveszíti a fókuszt). Ha az értéke '{4}', megadható a késleltetés a 'files.autoSaveDelay' beállításban.",
-	"autoSaveDelay": "Meghatározza ezredmásodpercben a késleltetést, ami után a módosított fájlok automatikusan mentésre kerülnek. Csak akkor van hatása, ha a 'files.autoSave' beállítás értéke '{0}'.",
-	"watcherExclude": "Globális minta, ami meghatározza azoknak a fájloknak a listáját, amelyek ki vannak szűrve a figyelésből. A mintáknak abszolút elérési utakra kell illeszkedniük (azaz előtagként adja hozzá a **-t vagy a teljes elérési utat a megfelelő illeszkedéshez). A beállítás módosítása újraindítást igényel. Ha úgy észleli, hogy a Code túl sok processzort használ indításnál, ki tudja szűrni a nagy mappákat a kezdeti terhelés csökkentés érdekében.",
-	"hotExit.off": "Gyors kilépés letiltása.",
-	"hotExit.onExit": "Gyors kilépésről akkor van szó, ha az utolsó ablakot bezárják Windowson és Linuxon, vagy ha a workbench.action.quit parancs van futtatva (a parancskatalógusból, billentyűkombinációval vagy a menüből). Az összes biztonsági mentéssel rendelkező ablak helyre lesz állítva a következő indítás során.",
-	"hotExit.onExitAndWindowClose": "Gyors kilépésről akkor van szó, ha az utolsó ablakot bezárják Windowson és Linuxon, ha a workbench.action.quit parancs van futtatva (a parancskatalógusból, billentyűkombinációval vagy a menüből), vagy bármely ablak, amelyben mappa van megnyitva, függetlenül attól, hogy az az utolsó ablak-e. Az összes megnyitott, mappa nélküli ablak helyre lesz állítva a következő indítás során. A megnyitott mappát tartalmazó ablakok helyreállításához állítsa a \"window.restoreWindows\" értékét \"all\"-ra.",
-	"hotExit": "Meghatározza, hogy a nem mentett fájlokra emlékezzen-e az alkalmazás a munkamenetek között, így ki lehet hagyni a mentéssel kapcsolatos felugró ablakokat kilépésnél.",
-	"useExperimentalFileWatcher": "Új, kísérleti fájlfigyelő használata.",
-	"defaultLanguage": "Az új fájlokhoz alapértelmezetten hozzárendelt nyelv.",
-	"editorConfigurationTitle": "Szerkesztőablak",
-	"formatOnSave": "Fájlok formázása mentéskor. Az adott nyelvhez rendelkezésre kell állni formázónak, nem lehet beállítva automatikus mentés, és a szerkesztő nem állhat éppen lefelé.",
-	"explorerConfigurationTitle": "Fájlkezelő",
-	"openEditorsVisible": "A megnyitott szerkesztőablakok panelen megjelenített szerkesztőablakok száma. Állítsa 0-ra, ha el szeretné rejteni a panelt.",
-	"dynamicHeight": "Meghatározza, hogy a megnyitott szerkesztőablakok szakasz magassága automatikusan illeszkedjen a megnyitott elemek számához vagy sem.",
-	"autoReveal": "Meghatározza, hogy a fájlkezelőben automatikusan fel legyenek fedve és ki legyenek jelölve a fájlok, amikor megnyitják őket.",
-	"enableDragAndDrop": "Meghatározza, hogy a fájlkezelőben áthelyezhetők-e a fájlok és mappák húzással.",
-	"confirmDragAndDrop": "Meghatározza, hogy a fájlkezelő kérjen-e megerősítést fájlok és mappák húzással történő áthelyezése esetén.",
-	"confirmDelete": "Meghatározza, hogy a fájlkezelő kérjen-e megerősítést a fájlok lomtárba történő helyezése esetén.",
-	"sortOrder.default": "A fájlok és mappák név szerint vannak rendezve, ABC-sorrendben. A mappák a fájlok előtt vannak listázva.",
-	"sortOrder.mixed": "A fájlok és mappák név szerint vannak rendezve, ABC-sorrendben. A fájlok és a mappák közösen vannak rendezve.",
-	"sortOrder.filesFirst": "A fájlok és mappák név szerint vannak rendezve, ABC-sorrendben. A fájlok a mappák előtt vannak listázva.",
-	"sortOrder.type": "A fájlok és mappák a kiterjesztésük szerint vannak rendezve, ABC-sorrendben. A mappák a fájlok előtt vannak listázva.",
-	"sortOrder.modified": "A fájlok és mappák a legutolsó módosítás dátuma szerint vannak rendezve, csökkenő sorrendben. A mappák a fájlok előtt vannak listázva.",
-	"sortOrder": "Meghatározza a fájlok és mappák rendezési módját a fájlkezelőben. Az alapértelmezett rendezésen túl beállítható 'mixed' (a fájlok és mappák közösen vannak rendezve), 'type' (rendezés fájltípus szerint), 'modified' (rendezés utolsó módosítási dátum szerint) vagy 'filesFirst' (fájlok a mappák elé vannak rendezve) is.",
-	"explorer.decorations.colors": "Meghatározza, hogy a fájldekorációk használjanak-e színeket.",
-	"explorer.decorations.badges": "Meghatározza, hogy a fájldekorációk használjanak-e jelvényeket."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/files/browser/saveErrorHandler.i18n.json b/i18n/hun/src/vs/workbench/parts/files/browser/saveErrorHandler.i18n.json
deleted file mode 100644
index 0bb33fdc628..00000000000
--- a/i18n/hun/src/vs/workbench/parts/files/browser/saveErrorHandler.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"userGuide": "Használja a jobbra lévő szerkesztői eszköztáron található műveleteket a saját módosítások **visszavonására** vagy **írja felül** a lemezen lévő tartalmat a változtatásokkal",
-	"discard": "Elvetés",
-	"overwrite": "Felülírás",
-	"retry": "Újrapróbálkozás",
-	"readonlySaveError": "Nem sikerült menteni a(z) '{0}' fájlt: a fájl írásvédett. Válassza a 'Felülírás' lehetőséget a védelem eltávolításához.",
-	"genericSaveError": "Hiba a(z) '{0}' mentése közben: {1}",
-	"staleSaveError": "Nem sikerült menteni a(z) '{0}' fájlt: a lemezen lévő tartalom újabb. Kattintson az **Összehasonlítás*** gombra a helyi és a lemezen lévő változat összehasonlításához.",
-	"compareChanges": "Összehasonlítás",
-	"saveConflictDiffLabel": "{0} (a lemezen) ↔ {1} ({2}) – Mentési konfliktus feloldása"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/files/browser/views/emptyView.i18n.json b/i18n/hun/src/vs/workbench/parts/files/browser/views/emptyView.i18n.json
deleted file mode 100644
index 30d6d309142..00000000000
--- a/i18n/hun/src/vs/workbench/parts/files/browser/views/emptyView.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"noWorkspace": "Nincs mappa megnyitva",
-	"explorerSection": "Fájlkezelő szakasz",
-	"noWorkspaceHelp": "Még nem adott mappát a munkaterülethez.",
-	"addFolder": "Mappa hozzáadása",
-	"noFolderHelp": "Még nem nyitott meg mappát",
-	"openFolder": "Mappa megnyitása"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/files/browser/views/explorerDecorationsProvider.i18n.json b/i18n/hun/src/vs/workbench/parts/files/browser/views/explorerDecorationsProvider.i18n.json
deleted file mode 100644
index e8e887279e8..00000000000
--- a/i18n/hun/src/vs/workbench/parts/files/browser/views/explorerDecorationsProvider.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"label": "Fájlkezelő",
-	"canNotResolve": "Nem sikerült feloldani a munkaterület-mappát"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/files/browser/views/explorerView.i18n.json b/i18n/hun/src/vs/workbench/parts/files/browser/views/explorerView.i18n.json
deleted file mode 100644
index d5015512419..00000000000
--- a/i18n/hun/src/vs/workbench/parts/files/browser/views/explorerView.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"explorerSection": "Fájlkezelő szakasz",
-	"treeAriaLabel": "Fájlkezelő"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/files/browser/views/explorerViewer.i18n.json b/i18n/hun/src/vs/workbench/parts/files/browser/views/explorerViewer.i18n.json
deleted file mode 100644
index e00a7141ecf..00000000000
--- a/i18n/hun/src/vs/workbench/parts/files/browser/views/explorerViewer.i18n.json
+++ /dev/null
@@ -1,19 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"fileInputAriaLabel": "Adja meg a fájl nevét. Nyomjon 'Enter'-t a megerősítéshez vagy 'Escape'-et a megszakításhoz.",
-	"filesExplorerViewerAriaLabel": "{0}, Fájlkezelő",
-	"dropFolders": "Szeretné hozzáadni a mappákat a munkaterülethez?",
-	"dropFolder": "Szeretné hozzáadni a mappát a munkaterülethez?",
-	"addFolders": "Mappák hozzá&&adása",
-	"addFolder": "Mappa hozzá&&adása",
-	"confirmMove": "Biztosan át szeretné helyezni a következőt: '{0}'?",
-	"doNotAskAgain": "Ne kérdezze meg újra",
-	"moveButtonLabel": "&&Áthelyezés",
-	"confirmOverwriteMessage": "A célmappában már létezik '{0}' nevű elem. Le szeretné cserélni?",
-	"irreversible": "A művelet nem vonható vissza!",
-	"replaceButtonLabel": "&&Csere"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/files/browser/views/openEditorsView.i18n.json b/i18n/hun/src/vs/workbench/parts/files/browser/views/openEditorsView.i18n.json
deleted file mode 100644
index 4a7e2812057..00000000000
--- a/i18n/hun/src/vs/workbench/parts/files/browser/views/openEditorsView.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"openEditors": "Megnyitott szerkesztőablakok",
-	"openEditosrSection": "Megnyitott szerkesztőablakok szakasz",
-	"treeAriaLabel": "Megnyitott szerkesztőablakok: az aktív fájlok listája",
-	"dirtyCounter": "{0} nincs mentve"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/files/browser/views/openEditorsViewer.i18n.json b/i18n/hun/src/vs/workbench/parts/files/browser/views/openEditorsViewer.i18n.json
deleted file mode 100644
index 41a3029037e..00000000000
--- a/i18n/hun/src/vs/workbench/parts/files/browser/views/openEditorsViewer.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"editorGroupAriaLabel": "{0}, Szerkesztőcsoport",
-	"openEditorAriaLabel": "{0}, megnyitott szerkesztőablak",
-	"saveAll": "Összes mentése",
-	"closeAllUnmodified": "Nem módosultak bezárása",
-	"closeAll": "Összes bezárása",
-	"compareWithSaved": "Összehasonlítás a mentett változattal",
-	"close": "Bezárás",
-	"closeOthers": "Többi bezárása"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/files/common/dirtyFilesTracker.i18n.json b/i18n/hun/src/vs/workbench/parts/files/common/dirtyFilesTracker.i18n.json
deleted file mode 100644
index 96c319e986f..00000000000
--- a/i18n/hun/src/vs/workbench/parts/files/common/dirtyFilesTracker.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"dirtyFile": "1 nem mentett fájl",
-	"dirtyFiles": "{0} nem mentett fájl"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/files/common/editors/fileEditorInput.i18n.json b/i18n/hun/src/vs/workbench/parts/files/common/editors/fileEditorInput.i18n.json
deleted file mode 100644
index 4233a24443c..00000000000
--- a/i18n/hun/src/vs/workbench/parts/files/common/editors/fileEditorInput.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"orphanedFile": "{0} (törölve a lemezről)"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/files/electron-browser/explorerViewlet.i18n.json b/i18n/hun/src/vs/workbench/parts/files/electron-browser/explorerViewlet.i18n.json
deleted file mode 100644
index 97b2768af6b..00000000000
--- a/i18n/hun/src/vs/workbench/parts/files/electron-browser/explorerViewlet.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"folders": "Mappák"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json b/i18n/hun/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
deleted file mode 100644
index d0fac53b441..00000000000
--- a/i18n/hun/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"filesCategory": "Fájl",
-	"revealInSideBar": "Megjelenítés az oldalsávon",
-	"acceptLocalChanges": "A lemezen lévő tartalom felülírása a saját módosításokkal",
-	"revertLocalChanges": "Saját módosítások elvetése és a lemezen lévő tartalom visszaállítása",
-	"copyPathOfActive": "Aktív fájl elérési útjának másolása",
-	"saveAllInGroup": "Összes mentése a csoportban",
-	"saveFiles": "Összes fájl mentése",
-	"revert": "Fájl visszaállítása",
-	"compareActiveWithSaved": "Aktív fájl összehasonlítása a mentett változattal",
-	"closeEditor": "Szerkesztőablak bezárása",
-	"view": "Nézet",
-	"openToSide": "Megnyitás oldalt",
-	"revealInWindows": "Megjelenítés a fájlkezelőben",
-	"revealInMac": "Megjelenítés a Finderben",
-	"openContainer": "Tartalmazó mappa megnyitása",
-	"copyPath": "Elérési út másolása",
-	"saveAll": "Összes mentése",
-	"compareWithSaved": "Összehasonlítás a mentett változattal",
-	"compareWithSelected": "Összehasonlítás a kiválasztottal",
-	"compareSource": "Kijelölés összehasonlításhoz",
-	"compareSelected": "Kiválasztottak összehasonlítása",
-	"close": "Bezárás",
-	"closeOthers": "Többi bezárása",
-	"closeSaved": "Mentettek bezárása",
-	"closeAll": "Összes bezárása",
-	"deleteFile": "Végleges törlés"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json b/i18n/hun/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
deleted file mode 100644
index 9db97a911ff..00000000000
--- a/i18n/hun/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
+++ /dev/null
@@ -1,72 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"newFile": "Új fájl",
-	"newFolder": "Új mappa",
-	"rename": "Átnevezés",
-	"delete": "Törlés",
-	"copyFile": "Másolás",
-	"pasteFile": "Beillesztés",
-	"retry": "Újrapróbálkozás",
-	"renameWhenSourcePathIsParentOfTargetError": "Létező mappában az „Új mappa” vagy „Új fájl” parancsokkal hozhat lére új elemeket.",
-	"newUntitledFile": "Új, névtelen fájl",
-	"createNewFile": "Új fájl",
-	"createNewFolder": "Új mappa",
-	"deleteButtonLabelRecycleBin": "Áthelyezés a lo&&mtárba",
-	"deleteButtonLabelTrash": "Áthelyezés a &&kukába",
-	"deleteButtonLabel": "&&Törlés",
-	"dirtyMessageFilesDelete": "Olyan fájlokat készül törölni, amelyek nem mentett változtatásokat tartalmaznak. Folytatja?",
-	"dirtyMessageFolderOneDelete": "Törölni készül egy olyan mappát, melyben egy nem mentett változtatásokat tartalmazó fájl van. Folytatja?",
-	"dirtyMessageFolderDelete": "Törölni készül egy olyan mappát, melyben {0} nem mentett változtatásokat tartalmazó fájl van. Folytatja?",
-	"dirtyMessageFileDelete": "Törölni készül egy olyan fájlt, amely nem mentett változtatásokat tartalmaz. Folytatja?",
-	"dirtyWarning": "A módosítások elvesznek, ha nem menti őket.",
-	"undoBin": "Helyreállíthatja a lomtárból.",
-	"undoTrash": "Helyreállíthatja a kukából.",
-	"doNotAskAgain": "Ne kérdezze meg újra",
-	"irreversible": "A művelet nem vonható vissza!",
-	"binFailed": "Nem sikerült törölni a lomtár használatával. Szeretné helyette véglegesen törölni?",
-	"trashFailed": "Nem sikerült törölni a kuka használatával. Szeretné helyette véglegesen törölni?",
-	"deletePermanentlyButtonLabel": "&&Törlés véglegesen",
-	"retryButtonLabel": "Új&&rapróbálkozás",
-	"confirmMoveTrashMessageFilesAndDirectories": "Törli a következő {0} fájlt vagy könyvtárat a teljes tartalmával együtt?",
-	"confirmMoveTrashMessageMultipleDirectories": "Törli a következő {0} könyvtárat a teljes tartalmával együtt?",
-	"confirmMoveTrashMessageMultiple": "Törli a következő {0} fájlt?",
-	"confirmMoveTrashMessageFolder": "Törli a(z) '{0}' nevű mappát és a teljes tartalmát?",
-	"confirmMoveTrashMessageFile": "Törli a(z) '{0}' nevű fájlt?",
-	"confirmDeleteMessageFilesAndDirectories": "Véglegesen törli a következő {0} fájlt vagy könyvtárat a teljes tartalmával együtt?",
-	"confirmDeleteMessageMultipleDirectories": "Véglegesen törli a következő {0} könyvtárat a teljes tartalmával együtt?",
-	"confirmDeleteMessageMultiple": "Véglegesen törli a következő {0} fájlt?",
-	"confirmDeleteMessageFolder": "Törli a(z) '{0}' nevű mappát és annak teljes tartalmát? ",
-	"confirmDeleteMessageFile": "Véglegesen törli a(z) '{0}' nevű fájlt?",
-	"addFiles": "Fájlok hozzáadása",
-	"confirmOverwrite": "A célmappában már van ilyen nevű mappa vagy fájl. Le szeretné cserélni?",
-	"replaceButtonLabel": "&&Csere",
-	"fileIsAncestor": "A beillesztendő fájl a célmappa szülője",
-	"fileDeleted": "A beillesztendő fájl időközben törölve lett vagy át lett helyezve",
-	"duplicateFile": "Duplikálás",
-	"globalCompareFile": "Aktív fájl összehasonlítása...",
-	"openFileToCompare": "Fájlok összehasonlításához elősször nyisson meg egy fájlt.",
-	"refresh": "Frissítés",
-	"saveAllInGroup": "Összes mentése a csoportban",
-	"focusOpenEditors": "Váltás a megnyitott szerkesztőablakok nézetre",
-	"focusFilesExplorer": "Váltás a fájlkezelőre",
-	"showInExplorer": "Aktív fájl megjelenítése az oldalsávon",
-	"openFileToShow": "Fájl fájlkezelőben történő megjelenítéséhez először nyisson meg egy fájlt",
-	"collapseExplorerFolders": "Mappák összecsukása a fájlkezelőben",
-	"refreshExplorer": "Fájlkezelő frissítése",
-	"openFileInNewWindow": "Aktív fájl megnyitása új ablakban",
-	"openFileToShowInNewWindow": "Fájl új ablakban történő megnyitásához először nyisson meg egy fájlt",
-	"copyPath": "Elérési út másolása",
-	"emptyFileNameError": "Meg kell adni egy fájl vagy mappa nevét.",
-	"fileNameStartsWithSlashError": "A fájlok és mappák neve nem kezdődhet perjellel.",
-	"fileNameExistsError": "Már létezik **{0}** nevű fájl vagy mappa ezen a helyszínen. Adjon meg egy másik nevet!",
-	"invalidFileNameError": "A(z) **{0}** név nem érvényes fájl- vagy mappanév. Adjon meg egy másik nevet!",
-	"filePathTooLongError": "A(z) **{0}** név egy olyan elérési utat eredményez, ami túl hosszú. Adjon meg egy másik nevet!",
-	"compareWithClipboard": "Aktív fájl összehasonlítása a vágólap tartalmával",
-	"clipboardComparisonLabel": "Vágólap ↔ {0}"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json b/i18n/hun/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
deleted file mode 100644
index 57708c04947..00000000000
--- a/i18n/hun/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"revealInWindows": "Megjelenítés a fájlkezelőben",
-	"revealInMac": "Megjelenítés a Finderben",
-	"openContainer": "Tartalmazó mappa megnyitása",
-	"saveAs": "Mentés másként...",
-	"save": "Mentés",
-	"saveAll": "Összes mentése",
-	"removeFolderFromWorkspace": "Mappa eltávolítása a munkaterületről",
-	"genericRevertError": "Nem sikerült a(z) '{0}' visszaállítása: {1}",
-	"modifiedLabel": "{0} (a lemezen) ↔ {1}",
-	"openFileToReveal": "Fájlok felfedéséhez elősször nyisson meg egy fájlt",
-	"openFileToCopy": "Fájlok elérési útjának másolásához elősször nyisson meg egy fájlt"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json b/i18n/hun/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
deleted file mode 100644
index edaae86a63a..00000000000
--- a/i18n/hun/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"showExplorerViewlet": "Fájlkezelő megjelenítése",
-	"explore": "Fájlkezelő",
-	"view": "Nézet",
-	"textFileEditor": "Szövegfájlszerkesztő",
-	"binaryFileEditor": "Bináris fájlszerkesztő",
-	"filesConfigurationTitle": "Fájlok",
-	"exclude": "Globális minták konfigurálása fájlok és mappák kizárásához. A fájlkezelő például ezen beállítás alapján dönti el, hogy mely fájlokat és mappákat jelenítsen meg vagy rejtsen el.",
-	"files.exclude.boolean": "A globális minta, amire illesztve lesznek a fájlok elérési útjai. A minta engedélyezéséhez vagy letiltásához állítsa igaz vagy hamis értékre.",
-	"files.exclude.when": "További ellenőrzés elvégzése az illeszkedő fájlok testvérein. Az illeszkedő fájl nevéhez használja a $(basename) változót!",
-	"associations": "Rendeljen nyelveket a fájlokhoz (pl: \"*.kiterjesztés\": \"html\"). Ezek a hozzárendelések elsőbbséget élveznek a telepített nyelvek által definiált alapértelmezett beállításokkal szemben.",
-	"encoding": "A fájlok írásánál és olvasásánál használt alapértelmezett karakterkészlet. A beállítás nyelvenként is konfigurálható.",
-	"autoGuessEncoding": "Ha engedélyezve van, fájlok megnyitásakor megpróbálja kitalálni a karakterkészletüket. A beállítás nyelvenként is konfigurálható.",
-	"eol": "Az alapértelmezett sorvégjel. LF-hez használjon \\n-t, CRLF-hez pedig \\r\\n-t.",
-	"trimTrailingWhitespace": "Ha engedélyezve van, a fájl mentésekor levágja a sor végén található szóközöket.",
-	"insertFinalNewline": "Ha engedélyezve van, mentéskor beszúr egy záró újsort a fájl végére.",
-	"trimFinalNewlines": "Ha engedélyezve van, mentéskor levágja a fájl végérő az összes újsort az utolsó újsor után.",
-	"files.autoSave.off": "A módosított fájlok soha nincsenek automatikusan mentve.",
-	"files.autoSave.afterDelay": "A módosított fájlok automatikusan mentésre kerülnek a 'files.autoSaveDelay' beállításban meghatározott időközönként.",
-	"files.autoSave.onFocusChange": "A módosított fájlok automatikusan mentésre kerülnek, ha a szerkesztőablak elveszíti a fókuszt.",
-	"files.autoSave.onWindowChange": "A módosított fájlok automatikusan mentésre kerülnek, ha az ablak elveszíti a fókuszt.",
-	"autoSave": "Meghatározza a módosított fájlok automatikus mentési stratégiáját. Elfogadott értékek: '{0}', '{1}', '{2}' (a szerkesztőablak elveszíti a fókuszt), '{3}' (az ablak elveszíti a fókuszt). Ha az értéke '{4}', megadható a késleltetés a 'files.autoSaveDelay' beállításban.",
-	"autoSaveDelay": "Meghatározza ezredmásodpercben a késleltetést, ami után a módosított fájlok automatikusan mentésre kerülnek. Csak akkor van hatása, ha a 'files.autoSave' beállítás értéke '{0}'.",
-	"watcherExclude": "Globális minta, ami meghatározza azoknak a fájloknak a listáját, amelyek ki vannak szűrve a figyelésből. A mintáknak abszolút elérési utakra kell illeszkedniük (azaz előtagként adja hozzá a **-t vagy a teljes elérési utat a megfelelő illeszkedéshez). A beállítás módosítása újraindítást igényel. Ha úgy észleli, hogy a Code túl sok processzort használ indításnál, ki tudja szűrni a nagy mappákat a kezdeti terhelés csökkentés érdekében.",
-	"hotExit.off": "Gyors kilépés letiltása.",
-	"hotExit.onExit": "Gyors kilépésről akkor van szó, ha az utolsó ablakot bezárják Windowson és Linuxon, vagy ha a workbench.action.quit parancs van futtatva (a parancskatalógusból, billentyűkombinációval vagy a menüből). Az összes biztonsági mentéssel rendelkező ablak helyre lesz állítva a következő indítás során.",
-	"hotExit.onExitAndWindowClose": "Gyors kilépésről akkor van szó, ha az utolsó ablakot bezárják Windowson és Linuxon, ha a workbench.action.quit parancs van futtatva (a parancskatalógusból, billentyűkombinációval vagy a menüből), vagy bármely ablak, amelyben mappa van megnyitva, függetlenül attól, hogy az az utolsó ablak-e. Az összes megnyitott, mappa nélküli ablak helyre lesz állítva a következő indítás során. A megnyitott mappát tartalmazó ablakok helyreállításához állítsa a \"window.restoreWindows\" értékét \"all\"-ra.",
-	"hotExit": "Meghatározza, hogy a nem mentett fájlokra emlékezzen-e az alkalmazás a munkamenetek között, így ki lehet hagyni a mentéssel kapcsolatos felugró ablakokat kilépésnél.",
-	"useExperimentalFileWatcher": "Új, kísérleti fájlfigyelő használata.",
-	"defaultLanguage": "Az új fájlokhoz alapértelmezetten hozzárendelt nyelv.",
-	"maxMemoryForLargeFilesMB": "Meghatározza a VS Code számára elérhető memória mennyiségét újraindítás után, nagy fájlok megnyitása esetén. Hatása ugyanaz, mint a --max-memory=ÚJMÉRET kapcsoló megadása parancssorból való indítás esetén.",
-	"editorConfigurationTitle": "Szerkesztőablak",
-	"formatOnSave": "Fájlok formázása mentéskor. Az adott nyelvhez rendelkezésre kell állni formázónak, nem lehet beállítva automatikus mentés, és a szerkesztő nem állhat éppen lefelé.",
-	"formatOnSaveTimeout": "Időkorlát mentéskor végzett formázások esetén. Meghatároz egy időkorlátot ezredmásodpercben a formatOnSave-parancsok számára. Az ennél hosszabb ideig tartó parancsok meg lesznek szakítva.",
-	"explorerConfigurationTitle": "Fájlkezelő",
-	"openEditorsVisible": "A megnyitott szerkesztőablakok panelen megjelenített szerkesztőablakok száma.",
-	"autoReveal": "Meghatározza, hogy a fájlkezelőben automatikusan fel legyenek fedve és ki legyenek jelölve a fájlok, amikor megnyitják őket.",
-	"enableDragAndDrop": "Meghatározza, hogy a fájlkezelőben áthelyezhetők-e a fájlok és mappák húzással.",
-	"confirmDragAndDrop": "Meghatározza, hogy a fájlkezelő kérjen-e megerősítést fájlok és mappák húzással történő áthelyezése esetén.",
-	"confirmDelete": "Meghatározza, hogy a fájlkezelő kérjen-e megerősítést a fájlok lomtárba történő helyezése esetén.",
-	"sortOrder.default": "A fájlok és mappák név szerint vannak rendezve, ABC-sorrendben. A mappák a fájlok előtt vannak listázva.",
-	"sortOrder.mixed": "A fájlok és mappák név szerint vannak rendezve, ABC-sorrendben. A fájlok és a mappák közösen vannak rendezve.",
-	"sortOrder.filesFirst": "A fájlok és mappák név szerint vannak rendezve, ABC-sorrendben. A fájlok a mappák előtt vannak listázva.",
-	"sortOrder.type": "A fájlok és mappák a kiterjesztésük szerint vannak rendezve, ABC-sorrendben. A mappák a fájlok előtt vannak listázva.",
-	"sortOrder.modified": "A fájlok és mappák a legutolsó módosítás dátuma szerint vannak rendezve, csökkenő sorrendben. A mappák a fájlok előtt vannak listázva.",
-	"sortOrder": "Meghatározza a fájlok és mappák rendezési módját a fájlkezelőben. Az alapértelmezett rendezésen túl beállítható 'mixed' (a fájlok és mappák közösen vannak rendezve), 'type' (rendezés fájltípus szerint), 'modified' (rendezés utolsó módosítási dátum szerint) vagy 'filesFirst' (fájlok a mappák elé vannak rendezve) is.",
-	"explorer.decorations.colors": "Meghatározza, hogy a fájldekorációk használjanak-e színeket.",
-	"explorer.decorations.badges": "Meghatározza, hogy a fájldekorációk használjanak-e jelvényeket."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json b/i18n/hun/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json
deleted file mode 100644
index b8d7b3a3953..00000000000
--- a/i18n/hun/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"userGuide": "Használja a szerkesztői eszköztáron található műveleteket a helyi változtatások visszavonására vagy írja felül a lemezen lévő tartalmat a változtatásokkal",
-	"staleSaveError": "Nem sikerült menteni a(z) '{0}' fájlt: a lemezen lévő tartalom újabb. Hasonlítsa össze a helyi és a lemezen lévő változatot!",
-	"retry": "Újrapróbálkozás",
-	"discard": "Elvetés",
-	"readonlySaveErrorAdmin": "Nem sikerült menteni a(z) '{0}' fájlt: a fájl írásvédett. Válassza a 'Felülírás rendszergazdaként' lehetőséget a védelem eltávolításához!",
-	"readonlySaveError": "Nem sikerült menteni a(z) '{0}' fájlt: a fájl írásvédett. Válassza a 'Felülírás' lehetőséget a védelem eltávolításának megkísérléséhez!",
-	"permissionDeniedSaveError": "Nem sikerült menteni a(z) '{0}' fájlt: nincs megfelelő jogosultság. Válassza az 'Újrapróbálkozás rendszergazdaként' lehetőséget az újrapróbálkozáshoz adminisztrátorként!",
-	"genericSaveError": "Hiba a(z) '{0}' mentése közben: {1}",
-	"learnMore": "További információ",
-	"dontShowAgain": "Ne jelenítse meg újra",
-	"compareChanges": "Összehasonlítás",
-	"saveConflictDiffLabel": "{0} (a lemezen) ↔ {1} ({2}) – Mentési konfliktus feloldása",
-	"overwriteElevated": "Felülírás rendszergazdaként...",
-	"saveElevated": "Újrapróbálkozás rendszergazdaként...",
-	"overwrite": "Felülírás"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/files/electron-browser/views/emptyView.i18n.json b/i18n/hun/src/vs/workbench/parts/files/electron-browser/views/emptyView.i18n.json
deleted file mode 100644
index f919c1e8a77..00000000000
--- a/i18n/hun/src/vs/workbench/parts/files/electron-browser/views/emptyView.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noWorkspace": "Nincs mappa megnyitva",
-	"explorerSection": "Fájlkezelő szakasz",
-	"noWorkspaceHelp": "Még nem adott mappát a munkaterülethez.",
-	"addFolder": "Mappa hozzáadása",
-	"noFolderHelp": "Még nem nyitott meg mappát",
-	"openFolder": "Mappa megnyitása"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/files/electron-browser/views/explorerDecorationsProvider.i18n.json b/i18n/hun/src/vs/workbench/parts/files/electron-browser/views/explorerDecorationsProvider.i18n.json
deleted file mode 100644
index c62840b1333..00000000000
--- a/i18n/hun/src/vs/workbench/parts/files/electron-browser/views/explorerDecorationsProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"label": "Fájlkezelő",
-	"canNotResolve": "Nem sikerült feloldani a munkaterület-mappát",
-	"symbolicLlink": "Szimbolikus hivatkozás"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/files/electron-browser/views/explorerView.i18n.json b/i18n/hun/src/vs/workbench/parts/files/electron-browser/views/explorerView.i18n.json
deleted file mode 100644
index 8cb803a4d13..00000000000
--- a/i18n/hun/src/vs/workbench/parts/files/electron-browser/views/explorerView.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"explorerSection": "Fájlkezelő szakasz",
-	"treeAriaLabel": "Fájlkezelő"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json b/i18n/hun/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
deleted file mode 100644
index cf15f7edd90..00000000000
--- a/i18n/hun/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"fileInputAriaLabel": "Adja meg a fájl nevét. Nyomjon 'Enter'-t a megerősítéshez vagy 'Escape'-et a megszakításhoz.",
-	"createFileFromExplorerInfoMessage": "**{0}** fájl létrehozva a következő helyen: **{1}**",
-	"renameFileFromExplorerInfoMessage": "Áthelyezés és átnevezés a következőre: **{0}**",
-	"createFolderFromExplorerInfoMessage": "**{0}** mappa létrehozása a következő helyen: **{1}**",
-	"filesExplorerViewerAriaLabel": "{0}, Fájlkezelő",
-	"dropFolders": "Szeretné hozzáadni a mappákat a munkaterülethez?",
-	"dropFolder": "Szeretné hozzáadni a mappát a munkaterülethez?",
-	"addFolders": "Mappák hozzá&&adása",
-	"addFolder": "Mappa hozzá&&adása",
-	"confirmRootsMove": "Szeretné módosítani több gyökérmappa sorrendjét a munkaterületen belül?",
-	"confirmMultiMove": "Át szeretné helyezni a következő {0} fájlt?",
-	"confirmRootMove": "Szeretné módosítani a(z) '{0}' gyökérmappa sorrendjét a munkaterületen belül?",
-	"confirmMove": "Át szeretné helyezni a(z) '{0}' nevű fájlt?",
-	"doNotAskAgain": "Ne kérdezze meg újra",
-	"moveButtonLabel": "&&Áthelyezés",
-	"confirmOverwriteMessage": "A célmappában már létezik '{0}' nevű elem. Le szeretné cserélni?",
-	"irreversible": "A művelet nem vonható vissza!",
-	"replaceButtonLabel": "&&Csere"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json b/i18n/hun/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json
deleted file mode 100644
index 701e6f98bc8..00000000000
--- a/i18n/hun/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openEditors": "Megnyitott szerkesztőablakok",
-	"openEditosrSection": "Megnyitott szerkesztőablakok szakasz",
-	"dirtyCounter": "{0} nincs mentve"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/files/electron-browser/views/openEditorsViewer.i18n.json b/i18n/hun/src/vs/workbench/parts/files/electron-browser/views/openEditorsViewer.i18n.json
deleted file mode 100644
index 41a3029037e..00000000000
--- a/i18n/hun/src/vs/workbench/parts/files/electron-browser/views/openEditorsViewer.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"editorGroupAriaLabel": "{0}, Szerkesztőcsoport",
-	"openEditorAriaLabel": "{0}, megnyitott szerkesztőablak",
-	"saveAll": "Összes mentése",
-	"closeAllUnmodified": "Nem módosultak bezárása",
-	"closeAll": "Összes bezárása",
-	"compareWithSaved": "Összehasonlítás a mentett változattal",
-	"close": "Bezárás",
-	"closeOthers": "Többi bezárása"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/html/browser/html.contribution.i18n.json b/i18n/hun/src/vs/workbench/parts/html/browser/html.contribution.i18n.json
deleted file mode 100644
index c2a0ca800e8..00000000000
--- a/i18n/hun/src/vs/workbench/parts/html/browser/html.contribution.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"html.editor.label": "HTML-előnézet"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/html/browser/htmlPreviewPart.i18n.json b/i18n/hun/src/vs/workbench/parts/html/browser/htmlPreviewPart.i18n.json
deleted file mode 100644
index d5c321fd607..00000000000
--- a/i18n/hun/src/vs/workbench/parts/html/browser/htmlPreviewPart.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"html.voidInput": "Érvénytelen bemenet a szerkesztőablakból."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/html/browser/webview.contribution.i18n.json b/i18n/hun/src/vs/workbench/parts/html/browser/webview.contribution.i18n.json
deleted file mode 100644
index 6f1887b8477..00000000000
--- a/i18n/hun/src/vs/workbench/parts/html/browser/webview.contribution.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"developer": "Fejlesztői"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/html/browser/webview.i18n.json b/i18n/hun/src/vs/workbench/parts/html/browser/webview.i18n.json
deleted file mode 100644
index 2f238385c10..00000000000
--- a/i18n/hun/src/vs/workbench/parts/html/browser/webview.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"devtools.webview": "Fejlesztői: Webview-eszközök"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/html/browser/webviewCommands.i18n.json b/i18n/hun/src/vs/workbench/parts/html/browser/webviewCommands.i18n.json
deleted file mode 100644
index ff551556d4a..00000000000
--- a/i18n/hun/src/vs/workbench/parts/html/browser/webviewCommands.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"editor.action.webvieweditor.showFind": "Váltás a keresőmodulra",
-	"openToolsLabel": "Webview-fejlesztőeszközök megnyitása",
-	"refreshWebviewLabel": "Webview-k újratöltése"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json b/i18n/hun/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json
deleted file mode 100644
index c2a0ca800e8..00000000000
--- a/i18n/hun/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"html.editor.label": "HTML-előnézet"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json b/i18n/hun/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json
deleted file mode 100644
index d5c321fd607..00000000000
--- a/i18n/hun/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"html.voidInput": "Érvénytelen bemenet a szerkesztőablakból."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json b/i18n/hun/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json
deleted file mode 100644
index 6f1887b8477..00000000000
--- a/i18n/hun/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"developer": "Fejlesztői"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json b/i18n/hun/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json
deleted file mode 100644
index 89f213109cf..00000000000
--- a/i18n/hun/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openToolsLabel": "Webview-fejlesztőeszközök megnyitása",
-	"refreshWebviewLabel": "Webview-k újratöltése"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json b/i18n/hun/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
deleted file mode 100644
index 626849ee9d1..00000000000
--- a/i18n/hun/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"updateLocale": "Szeretné a VS Code felületét {0} nyelvűre állítani és újraindítani az alkalmazást?",
-	"yes": "Igen",
-	"no": "Nem",
-	"neverAgain": "Ne jelenítse meg újra",
-	"JsonSchema.locale": "A felhasználói felületen használt nyelv.",
-	"vscode.extension.contributes.localizations": "Lokalizációkat szolgáltat a szerkesztőhöz",
-	"vscode.extension.contributes.localizations.languageId": "Annak a nyelvnek az azonosítója, amelyre a megjelenített szövegek fordítva vannak.",
-	"vscode.extension.contributes.localizations.languageName": "A nyelv neve angolul.",
-	"vscode.extension.contributes.localizations.languageNameLocalized": "A nyelv neve a szolgáltatott nyelven.",
-	"vscode.extension.contributes.localizations.translations": "A nyelvhez rendelt fordítások listája.",
-	"vscode.extension.contributes.localizations.translations.id": "Azonosító, ami a VS Code-ra vagy arra a kiegészítőre hivatkozik, amihez a fordítás szolgáltatva van. A VS Code azonosítója mindig `vscode`, kiegészítők esetén pedig a `publisherId.extensionName` formátumban kell megadni.",
-	"vscode.extension.contributes.localizations.translations.id.pattern": "Az id értéke VS Code fordítása esetében `vscode`, egy kiegészítő esetében pedig `publisherId.extensionName` formátumú lehet.",
-	"vscode.extension.contributes.localizations.translations.path": "A nyelvhez tartozó fordításokat tartalmazó fájl relatív elérési útja."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/localizations/browser/localizationsActions.i18n.json b/i18n/hun/src/vs/workbench/parts/localizations/browser/localizationsActions.i18n.json
deleted file mode 100644
index 8181e5ce9e2..00000000000
--- a/i18n/hun/src/vs/workbench/parts/localizations/browser/localizationsActions.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"configureLocale": "Nyelv beállítása",
-	"displayLanguage": "Meghatározza a VSCode felületének nyelvét.",
-	"doc": "Az elérhető nyelvek listája a következő címen tekinthető meg: {0}",
-	"restart": "Az érték módosítása után újra kell indítani a VSCode-ot.",
-	"fail.createSettings": "Nem sikerült a(z) '{0}' létrehozás ({1})."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/localizations/electron-browser/localizations.contribution.i18n.json b/i18n/hun/src/vs/workbench/parts/localizations/electron-browser/localizations.contribution.i18n.json
deleted file mode 100644
index 8d361d68901..00000000000
--- a/i18n/hun/src/vs/workbench/parts/localizations/electron-browser/localizations.contribution.i18n.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"updateLocale": "Szeretné a VS Code felületét {0} nyelvűre állítani és újraindítani az alkalmazást?",
-	"activateLanguagePack": "Szeretné újraindítani a VS Code-ot a telepített nyelvi csomag aktiválásához?",
-	"yes": "Igen",
-	"no": "Nem",
-	"neverAgain": "Ne jelenítse meg újra",
-	"install": "Telepítés",
-	"more information": "További információ...",
-	"JsonSchema.locale": "A felhasználói felületen használt nyelv.",
-	"vscode.extension.contributes.localizations": "Lokalizációkat szolgáltat a szerkesztőhöz",
-	"vscode.extension.contributes.localizations.languageId": "Annak a nyelvnek az azonosítója, amelyre a megjelenített szövegek fordítva vannak.",
-	"vscode.extension.contributes.localizations.languageName": "A nyelv neve angolul.",
-	"vscode.extension.contributes.localizations.languageNameLocalized": "A nyelv neve a szolgáltatott nyelven.",
-	"vscode.extension.contributes.localizations.translations": "A nyelvhez rendelt fordítások listája.",
-	"vscode.extension.contributes.localizations.translations.id": "Azonosító, ami a VS Code-ra vagy arra a kiegészítőre hivatkozik, amihez a fordítás szolgáltatva van. A VS Code azonosítója mindig `vscode`, kiegészítők esetén pedig a `publisherId.extensionName` formátumban kell megadni.",
-	"vscode.extension.contributes.localizations.translations.id.pattern": "Az id értéke VS Code fordítása esetében `vscode`, egy kiegészítő esetében pedig `publisherId.extensionName` formátumú lehet.",
-	"vscode.extension.contributes.localizations.translations.path": "A nyelvhez tartozó fordításokat tartalmazó fájl relatív elérési útja."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/localizations/electron-browser/localizationsActions.i18n.json b/i18n/hun/src/vs/workbench/parts/localizations/electron-browser/localizationsActions.i18n.json
deleted file mode 100644
index c598672a288..00000000000
--- a/i18n/hun/src/vs/workbench/parts/localizations/electron-browser/localizationsActions.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"configureLocale": "Megjelenítési nyelv beállítása",
-	"displayLanguage": "Meghatározza a VSCode felületének nyelvét.",
-	"doc": "Az elérhető nyelvek listája a következő címen tekinthető meg: {0}",
-	"restart": "Az érték módosítása után újra kell indítani a VSCode-ot.",
-	"fail.createSettings": "Nem sikerült a(z) '{0}' létrehozás ({1})."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json b/i18n/hun/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json
deleted file mode 100644
index 47c134fd471..00000000000
--- a/i18n/hun/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"mainLog": "Napló (elsődleges)",
-	"sharedLog": "Napló (megosztott)",
-	"rendererLog": "Napló (ablak)",
-	"extensionsLog": "Napló (kiegészítő gazdafolyamata)",
-	"developer": "Fejlesztői"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json b/i18n/hun/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json
deleted file mode 100644
index 533388e750e..00000000000
--- a/i18n/hun/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openLogsFolder": "Naplómappa megnyitása",
-	"showLogs": "Naplók megjelenítése...",
-	"rendererProcess": "Ablak ({0})",
-	"emptyWindow": "Ablak",
-	"extensionHost": "Kiegészítő gazdafolyamata",
-	"sharedProcess": "Megosztott",
-	"mainProcess": "Elsődleges",
-	"selectProcess": "Válasszon folyamatnaplót!",
-	"openLogFile": "Naplófájl megnyitása...",
-	"setLogLevel": "Naplózási szint beállítása...",
-	"trace": "Nyomkövetés",
-	"debug": "Hibakeresés",
-	"info": "Információ",
-	"warn": "Figyelmeztetés",
-	"err": "Hiba",
-	"critical": "Kritikus",
-	"off": "Kikapcsolva",
-	"selectLogLevel": "Naplózási szint beállítása",
-	"default and current": "Alapértelmezett & jelenlegi",
-	"default": "Alapértelmezett",
-	"current": "Aktuális"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/markers/browser/markersFileDecorations.i18n.json b/i18n/hun/src/vs/workbench/parts/markers/browser/markersFileDecorations.i18n.json
deleted file mode 100644
index e26c8c27c96..00000000000
--- a/i18n/hun/src/vs/workbench/parts/markers/browser/markersFileDecorations.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"label": "Problémák",
-	"tooltip.1": "A fájlban 1 probléma található",
-	"tooltip.N": "A fájlban {0} probléma található",
-	"markers.showOnFile": "Fájlokban és mappákban található hibák és figyelmeztetések megjelenítése"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/markers/browser/markersPanel.i18n.json b/i18n/hun/src/vs/workbench/parts/markers/browser/markersPanel.i18n.json
deleted file mode 100644
index 0eecc9c3575..00000000000
--- a/i18n/hun/src/vs/workbench/parts/markers/browser/markersPanel.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"totalProblems": "Összesen {0} probléma",
-	"filteredProblems": "{0} probléma megjelenítve (összesen: {1})"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/markers/common/markers.i18n.json b/i18n/hun/src/vs/workbench/parts/markers/common/markers.i18n.json
deleted file mode 100644
index 0eecc9c3575..00000000000
--- a/i18n/hun/src/vs/workbench/parts/markers/common/markers.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"totalProblems": "Összesen {0} probléma",
-	"filteredProblems": "{0} probléma megjelenítve (összesen: {1})"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/markers/common/messages.i18n.json b/i18n/hun/src/vs/workbench/parts/markers/common/messages.i18n.json
deleted file mode 100644
index 773ba59f111..00000000000
--- a/i18n/hun/src/vs/workbench/parts/markers/common/messages.i18n.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"viewCategory": "Nézet",
-	"problems.view.toggle.label": "Problémák be- és kikapcsolása (hiba, figyelmeztetés, információ)",
-	"problems.view.focus.label": "Váltás a problémákra (hiba, figyelmeztetés, információ)",
-	"problems.panel.configuration.title": "Problémák-nézet",
-	"problems.panel.configuration.autoreveal": "Meghatározza, hogy a problémák nézet automatikusan felfedje-e a fájlokat, amikor megnyitja őket.",
-	"markers.panel.title.problems": "Problémák",
-	"markers.panel.aria.label.problems.tree": "Problémák fájlonként csoportosítva",
-	"markers.panel.no.problems.build": "A munkaterületen eddig egyetlen hiba sem lett érzékelve.",
-	"markers.panel.no.problems.filters": "A megadott szűrőfeltételnek egyetlen elem sem felel meg.",
-	"markers.panel.action.filter": "Problémák szűrése",
-	"markers.panel.filter.placeholder": "Szűrés típus vagy szöveg alapján",
-	"markers.panel.filter.errors": "hibák",
-	"markers.panel.filter.warnings": "figyelmeztetések",
-	"markers.panel.filter.infos": "információk",
-	"markers.panel.single.error.label": "1 hiba",
-	"markers.panel.multiple.errors.label": "{0} hiba",
-	"markers.panel.single.warning.label": "1 figyelmeztetés",
-	"markers.panel.multiple.warnings.label": "{0} figyelmeztetés",
-	"markers.panel.single.info.label": "1 információ",
-	"markers.panel.multiple.infos.label": "{0} információ",
-	"markers.panel.single.unknown.label": "1 ismeretlen",
-	"markers.panel.multiple.unknowns.label": "{0} ismeretlen",
-	"markers.panel.at.ln.col.number": "({0}, {1})",
-	"problems.tree.aria.label.resource": "{0} {1} problémával",
-	"problems.tree.aria.label.error.marker": "{0} által generált hiba: {1}, sor: {2}, oszlop: {3}",
-	"problems.tree.aria.label.error.marker.nosource": "Hiba: {0}, sor: {1}, oszlop: {2}",
-	"problems.tree.aria.label.warning.marker": "{0} által generált figyelmeztetés: {1}, sor: {2}, oszlop: {3}",
-	"problems.tree.aria.label.warning.marker.nosource": "Figyelmeztetés: {0}, sor: {1}, oszlop: {2}",
-	"problems.tree.aria.label.info.marker": "{0} által generált információ: {1}, sor: {2}, oszlop: {3}",
-	"problems.tree.aria.label.info.marker.nosource": "Információ: {0}, sor: {1}, oszlop: {2}",
-	"problems.tree.aria.label.marker": "{0} által generált probléma: {1}, sor: {2}, oszlop: {3}",
-	"problems.tree.aria.label.marker.nosource": "Probléma: {0}, sor: {1}, oszlop: {2}",
-	"errors.warnings.show.label": "Hibák és figyelmezetések megjelenítése"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json b/i18n/hun/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json
deleted file mode 100644
index 08d7b8601cf..00000000000
--- a/i18n/hun/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"copyMarker": "Másolás",
-	"copyMessage": "Üzenet másolása"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/markers/electron-browser/markers.i18n.json b/i18n/hun/src/vs/workbench/parts/markers/electron-browser/markers.i18n.json
deleted file mode 100644
index 9cc6717e0d4..00000000000
--- a/i18n/hun/src/vs/workbench/parts/markers/electron-browser/markers.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"totalProblems": "Összesen {0} probléma"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/markers/electron-browser/markersElectronContributions.i18n.json b/i18n/hun/src/vs/workbench/parts/markers/electron-browser/markersElectronContributions.i18n.json
deleted file mode 100644
index c1008a9652d..00000000000
--- a/i18n/hun/src/vs/workbench/parts/markers/electron-browser/markersElectronContributions.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"copyMarker": "Másolás",
-	"copyMarkerMessage": "Üzenet másolása"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.i18n.json b/i18n/hun/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.i18n.json
deleted file mode 100644
index e26c8c27c96..00000000000
--- a/i18n/hun/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"label": "Problémák",
-	"tooltip.1": "A fájlban 1 probléma található",
-	"tooltip.N": "A fájlban {0} probléma található",
-	"markers.showOnFile": "Fájlokban és mappákban található hibák és figyelmeztetések megjelenítése"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/markers/electron-browser/markersPanel.i18n.json b/i18n/hun/src/vs/workbench/parts/markers/electron-browser/markersPanel.i18n.json
deleted file mode 100644
index b058dcf4078..00000000000
--- a/i18n/hun/src/vs/workbench/parts/markers/electron-browser/markersPanel.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"disableFilesExclude": "Fájlkizárási beállítások kikapcsolása",
-	"clearFilter": "Szűrő törlése"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/markers/electron-browser/markersPanelActions.i18n.json b/i18n/hun/src/vs/workbench/parts/markers/electron-browser/markersPanelActions.i18n.json
deleted file mode 100644
index 9b95cf1be7f..00000000000
--- a/i18n/hun/src/vs/workbench/parts/markers/electron-browser/markersPanelActions.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"showing filtered problems": "{0} megjelenítve (összesen: {1})"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json b/i18n/hun/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
deleted file mode 100644
index e2f7dbb8aea..00000000000
--- a/i18n/hun/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"viewCategory": "Nézet",
-	"problems.view.toggle.label": "Problémák be- és kikapcsolása (hiba, figyelmeztetés, információ)",
-	"problems.view.focus.label": "Váltás a problémákra (hiba, figyelmeztetés, információ)",
-	"problems.panel.configuration.title": "Problémák-nézet",
-	"problems.panel.configuration.autoreveal": "Meghatározza, hogy a problémák nézet automatikusan felfedje-e a fájlokat, amikor megnyitja őket.",
-	"markers.panel.title.problems": "Problémák",
-	"markers.panel.aria.label.problems.tree": "Problémák fájlonként csoportosítva",
-	"markers.panel.no.problems.build": "A munkaterületen eddig egyetlen hiba sem lett érzékelve.",
-	"markers.panel.no.problems.filters": "A megadott szűrőfeltételeknek egyetlen elem sem felel meg.",
-	"markers.panel.no.problems.file.exclusions": "Az összes probléma el van rejtve, mert a fájlkizárási szűrő engedélyezve van.",
-	"markers.panel.action.useFilesExclude": "Fájlkizárási beállítások használata",
-	"markers.panel.action.donotUseFilesExclude": " Ne legyenek használva a fájlkizárási beállítások",
-	"markers.panel.action.filter": "Problémák szűrése",
-	"markers.panel.filter.ariaLabel": "Problémák szűrése",
-	"markers.panel.filter.placeholder": "Szűrő, pl.: szöveg, **/*.ts, !**/node_modules/**",
-	"markers.panel.filter.errors": "hibák",
-	"markers.panel.filter.warnings": "figyelmeztetések",
-	"markers.panel.filter.infos": "információk",
-	"markers.panel.single.error.label": "1 hiba",
-	"markers.panel.multiple.errors.label": "{0} hiba",
-	"markers.panel.single.warning.label": "1 figyelmeztetés",
-	"markers.panel.multiple.warnings.label": "{0} figyelmeztetés",
-	"markers.panel.single.info.label": "1 információ",
-	"markers.panel.multiple.infos.label": "{0} információ",
-	"markers.panel.single.unknown.label": "1 ismeretlen",
-	"markers.panel.multiple.unknowns.label": "{0} ismeretlen",
-	"markers.panel.at.ln.col.number": "({0}, {1})",
-	"problems.tree.aria.label.resource": "{0} {1} problémával",
-	"problems.tree.aria.label.marker.relatedInformation": "Ez a probléma {0} helyre hivatkozik.",
-	"problems.tree.aria.label.error.marker": "{0} által generált hiba: {1}, sor: {2}, oszlop: {3}.{4}",
-	"problems.tree.aria.label.error.marker.nosource": "Hiba: {0}, sor: {1}, oszlop: {2}.{3}",
-	"problems.tree.aria.label.warning.marker": "{0} által generált figyelmeztetés: {1}, sor: {2}, oszlop: {3}.{4}",
-	"problems.tree.aria.label.warning.marker.nosource": "Figyelmeztetés: {0}, sor: {1}, oszlop: {2}.{3}",
-	"problems.tree.aria.label.info.marker": "{0} által generált információ: {1}, sor: {2}, oszlop: {3}.{4}",
-	"problems.tree.aria.label.info.marker.nosource": "Információ: {0}, sor: {1}, oszlop: {2}.{3}",
-	"problems.tree.aria.label.marker": "{0} által generált probléma: {1}, sor: {2}, oszlop: {3}.{4}",
-	"problems.tree.aria.label.marker.nosource": "Probléma: {0}, sor: {1}, oszlop: {2}.{3}",
-	"problems.tree.aria.label.relatedinfo.message": "{0}, sor: {1}, oszlop: {2}, a következő helyen: {3}",
-	"errors.warnings.show.label": "Hibák és figyelmezetések megjelenítése"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/nps/electron-browser/nps.contribution.i18n.json b/i18n/hun/src/vs/workbench/parts/nps/electron-browser/nps.contribution.i18n.json
deleted file mode 100644
index bd0a0d19696..00000000000
--- a/i18n/hun/src/vs/workbench/parts/nps/electron-browser/nps.contribution.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"surveyQuestion": "Lenne kedve egy gyors elégedettségi felméréshez?",
-	"takeSurvey": "Felmérés kitöltése",
-	"remindLater": "Emlékeztessen később",
-	"neverAgain": "Ne jelenjen meg újra"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/outline/electron-browser/outline.contribution.i18n.json b/i18n/hun/src/vs/workbench/parts/outline/electron-browser/outline.contribution.i18n.json
deleted file mode 100644
index a52e10c8b19..00000000000
--- a/i18n/hun/src/vs/workbench/parts/outline/electron-browser/outline.contribution.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"name": "Vázlat",
-	"category.focus": "Fájl",
-	"label.focus": "Váltás a vázlatra"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/outline/electron-browser/outlinePanel.i18n.json b/i18n/hun/src/vs/workbench/parts/outline/electron-browser/outlinePanel.i18n.json
deleted file mode 100644
index 24d2f7be0c5..00000000000
--- a/i18n/hun/src/vs/workbench/parts/outline/electron-browser/outlinePanel.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"filter": "Szűrés",
-	"collapse": "Összes bezárása",
-	"sortByPosition": "Rendezés pozíció szerint",
-	"sortByName": "Rendezés név szerint",
-	"sortByKind": "Rendezés típus szerint",
-	"live": "Kurzor követése",
-	"no-editor": "Nincs vázlattal rendelkező szerkesztőablak nyitva.",
-	"too-many-symbols": "Sajnáljuk, de a fájl túl nagy a vázlat megjelenítéséhez."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/outline/electron-browser/outlineTree.i18n.json b/i18n/hun/src/vs/workbench/parts/outline/electron-browser/outlineTree.i18n.json
deleted file mode 100644
index 4651ccb1889..00000000000
--- a/i18n/hun/src/vs/workbench/parts/outline/electron-browser/outlineTree.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"outline.title": "{0}. sor a következő helyen: {1}"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/output/browser/output.contribution.i18n.json b/i18n/hun/src/vs/workbench/parts/output/browser/output.contribution.i18n.json
deleted file mode 100644
index 06381af2f68..00000000000
--- a/i18n/hun/src/vs/workbench/parts/output/browser/output.contribution.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"output": "Kimenet",
-	"viewCategory": "Nézet",
-	"clearOutput.label": "Kimenet törlése"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/output/browser/outputActions.i18n.json b/i18n/hun/src/vs/workbench/parts/output/browser/outputActions.i18n.json
deleted file mode 100644
index b0047af883c..00000000000
--- a/i18n/hun/src/vs/workbench/parts/output/browser/outputActions.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleOutput": "Kimenet be- és kikapcsolása",
-	"clearOutput": "Kimenet törlése",
-	"toggleOutputScrollLock": "Kimenet görgetési zárának be- és kikapcsolása",
-	"switchToOutput.label": "Váltás a kimenetre",
-	"openInLogViewer": "Naplófájl megnyitása"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/output/browser/outputPanel.i18n.json b/i18n/hun/src/vs/workbench/parts/output/browser/outputPanel.i18n.json
deleted file mode 100644
index ae031057a05..00000000000
--- a/i18n/hun/src/vs/workbench/parts/output/browser/outputPanel.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"output": "Kimenet",
-	"outputPanelWithInputAriaLabel": "{0}, kimenetpanel",
-	"outputPanelAriaLabel": "Kimenetpanel"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/output/common/output.i18n.json b/i18n/hun/src/vs/workbench/parts/output/common/output.i18n.json
deleted file mode 100644
index 6d78e77e5ec..00000000000
--- a/i18n/hun/src/vs/workbench/parts/output/common/output.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"output": "Kimenet",
-	"channel": "a következőhöz: '{0}'"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json b/i18n/hun/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
deleted file mode 100644
index 0e30f573276..00000000000
--- a/i18n/hun/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"output": "Kimenet",
-	"logViewer": "Naplófájl-megjelenítő",
-	"viewCategory": "Nézet",
-	"clearOutput.label": "Kimenet törlése",
-	"openActiveLogOutputFile": "Nézet: Aktív napló kimeneti fájljának megnyitása"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json b/i18n/hun/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json
deleted file mode 100644
index 2967f9f2d34..00000000000
--- a/i18n/hun/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"output": "{0} – Kimenet",
-	"channel": "A(z) '{0}' kimeneti csatornája"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/performance/electron-browser/performance.contribution.i18n.json b/i18n/hun/src/vs/workbench/parts/performance/electron-browser/performance.contribution.i18n.json
deleted file mode 100644
index bf91ad5e3b5..00000000000
--- a/i18n/hun/src/vs/workbench/parts/performance/electron-browser/performance.contribution.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"prof.message": "Profil sikeresen elkészítve.",
-	"prof.detail": "Készítsen egy hibajelentést, és manuálisan csatolja a következő fájlokat:\n{0}",
-	"prof.restartAndFileIssue": "Hibajelentés létrehozása és újraindítás",
-	"prof.restart": "Újraindítás",
-	"prof.thanks": "Köszönjük a segítséget!",
-	"prof.detail.restart": "Egy utolsó újraindítás szükséges a(z) '{0}' használatához. Ismételten köszönjük a közreműködését!"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/performance/electron-browser/startupProfiler.i18n.json b/i18n/hun/src/vs/workbench/parts/performance/electron-browser/startupProfiler.i18n.json
deleted file mode 100644
index 73c36284f5a..00000000000
--- a/i18n/hun/src/vs/workbench/parts/performance/electron-browser/startupProfiler.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"prof.message": "Profil sikeresen elkészítve.",
-	"prof.detail": "Készítsen egy hibajelentést, és manuálisan csatolja a következő fájlokat:\n{0}",
-	"prof.restartAndFileIssue": "Hibajelentés létrehozása és újraindítás",
-	"prof.restart": "Újraindítás",
-	"prof.thanks": "Köszönjük a segítséget!",
-	"prof.detail.restart": "Egy utolsó újraindítás szükséges a(z) '{0}' használatához. Ismételten köszönjük a közreműködését!"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/preferences/browser/keybindingWidgets.i18n.json b/i18n/hun/src/vs/workbench/parts/preferences/browser/keybindingWidgets.i18n.json
deleted file mode 100644
index cf4b07aaf30..00000000000
--- a/i18n/hun/src/vs/workbench/parts/preferences/browser/keybindingWidgets.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"defineKeybinding.oneExists": "1 másik parancshoz ez a billentyűparancs van rendelve",
-	"defineKeybinding.existing": "{0} másik parancshoz ez a billentyűparancs van rendelve",
-	"defineKeybinding.initial": "Üsse le a kívánt billentyűkombinációt, majd nyomja meg az ENTER-t.",
-	"defineKeybinding.chordsTo": "kombináció a következőhöz:"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json b/i18n/hun/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
deleted file mode 100644
index c6560556f50..00000000000
--- a/i18n/hun/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"showDefaultKeybindings": "Alapértelmezett billentyűparancsok megjelenítése",
-	"showUserKeybindings": "Felhasználói billentyűparancsok megjelenítése",
-	"SearchKeybindings.AriaLabel": "Billentyűparancsok keresése",
-	"SearchKeybindings.Placeholder": "Billentyűparancsok keresése",
-	"sortByPrecedene": "Rendezés precedencia szerint",
-	"header-message": "További, haladó testreszabáshoz nyissa meg és szerkessze a következő fájlt:",
-	"keybindings-file-name": "keybindings.json",
-	"keybindingsLabel": "Billentyűparancsok",
-	"changeLabel": "Billentyűparancs módosítása",
-	"addLabel": "Billentyűparancs hozzáadása",
-	"removeLabel": "Billentyűparancs eltávolítása",
-	"resetLabel": "Billentyűparancs visszaállítása",
-	"showSameKeybindings": "Egyező billentyűparancsok megjelenítése",
-	"copyLabel": "Másolás",
-	"copyCommandLabel": "Parancs másolása",
-	"error": "'{0}' hiba a billentyűparancsok szerkesztése közben. Nyissa meg a 'keybindings.json' fájlt, és keresse meg a hibákat!",
-	"command": "Parancs",
-	"keybinding": "Billentyűparancs",
-	"source": "Forrás",
-	"when": "Mikor?",
-	"editKeybindingLabelWithKey": "{0} billentyűparancs módosítása",
-	"editKeybindingLabel": "Billentyűparancs módosítása",
-	"addKeybindingLabelWithKey": "{0} billentyűparancs hozzáadása",
-	"addKeybindingLabel": "Billentyűparancs hozzáadása",
-	"title": "{0} ({1})",
-	"commandAriaLabel": "Parancs: {0}.",
-	"keybindingAriaLabel": "Billentyűparancs: {0}.",
-	"noKeybinding": "Nincs billentyűparancs hozzárendelve.",
-	"sourceAriaLabel": "Forrás: {0}.",
-	"whenAriaLabel": "Mikor: {0}.",
-	"noWhen": "Nincs 'mikor'-kontextus."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/preferences/browser/keybindingsEditorContribution.i18n.json b/i18n/hun/src/vs/workbench/parts/preferences/browser/keybindingsEditorContribution.i18n.json
deleted file mode 100644
index 64f1ecc1612..00000000000
--- a/i18n/hun/src/vs/workbench/parts/preferences/browser/keybindingsEditorContribution.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"defineKeybinding.start": "Billentyűparancs megadása",
-	"defineKeybinding.kbLayoutErrorMessage": "A jelenlegi billentyűkiosztással nem használható ez a billentyűkombináció.",
-	"defineKeybinding.kbLayoutLocalAndUSMessage": "**{0}** a jelenlegi billentyűkiosztással (**{1}** az alapértelmezett amerikaival.",
-	"defineKeybinding.kbLayoutLocalMessage": "**{0}** a jelenlegi billentyűkiosztással."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/preferences/browser/preferences.contribution.i18n.json b/i18n/hun/src/vs/workbench/parts/preferences/browser/preferences.contribution.i18n.json
deleted file mode 100644
index b2ceafc3869..00000000000
--- a/i18n/hun/src/vs/workbench/parts/preferences/browser/preferences.contribution.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"defaultPreferencesEditor": "Alapértelmezett beállításszerkesztő",
-	"keybindingsEditor": "Billentyűparancs-szerkesztő",
-	"preferences": "Beállítások"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json b/i18n/hun/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
deleted file mode 100644
index 36745949f07..00000000000
--- a/i18n/hun/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openRawDefaultSettings": "Nyers alapértelmezett beállítások megnyitása",
-	"openSettings2": "Beállítások megnyitása (előzetes verzió)",
-	"openSettings": "Beállítások megnyitása",
-	"openGlobalSettings": "Felhasználói beállítások megnyitása",
-	"openGlobalKeybindings": "Billentyűparancsok megnyitása",
-	"openGlobalKeybindingsFile": "Billentyűparancsfájl megnyitása",
-	"openWorkspaceSettings": "Munkaterület beállításainak megnyitása",
-	"openFolderSettings": "Mappa beállításainak megnyitása",
-	"configureLanguageBasedSettings": "Nyelvspecifikus beállítások konfigurálása...",
-	"languageDescriptionConfigured": "(({0})",
-	"pickLanguage": "Nyelv kiválasztása"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json b/i18n/hun/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
deleted file mode 100644
index b1b8e310251..00000000000
--- a/i18n/hun/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"SearchSettingsWidget.AriaLabel": "Beállítások keresése",
-	"SearchSettingsWidget.Placeholder": "Beállítások keresése",
-	"noSettingsFound": "Nincs eredmény",
-	"oneSettingFound": "1 egyező beállítás",
-	"settingsFound": "{0} egyező beállítás",
-	"totalSettingsMessage": "Összesen {0} beállítás",
-	"nlpResult": "Természetes nyelvi keresés eredményei",
-	"filterResult": "Szűrt találatok",
-	"defaultSettings": "Alapértelmezett beállítások",
-	"defaultUserSettings": "Alapértelmezett felhasználói beállítások",
-	"defaultWorkspaceSettings": "Alapértelmezett munkaterületi beállítások",
-	"defaultFolderSettings": "Alapértelmezett mappabeállítások",
-	"defaultEditorReadonly": "A jobb oldalon lévő szerkesztőablak tartalmának módosításával írhatja felül az alapértelmezett beállításokat.",
-	"preferencesAriaLabel": "Az alapértelmezett beállítások. Írásvédett szerkesztőablak."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json b/i18n/hun/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
deleted file mode 100644
index 7fcd4f374ab..00000000000
--- a/i18n/hun/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"emptyUserSettingsHeader": "Az ebben a fájlban elhelyezett beállítások felülírják az alapértelmezett beállításokat.",
-	"emptyWorkspaceSettingsHeader": "Az ebben a fájlban elhelyezett beállítások felülírják a felhasználói beállításokat.",
-	"emptyFolderSettingsHeader": "Az ebben a fájlban elhelyezett beállítások felülírják a munkaterületre vonatkozó beállításokat.",
-	"reportSettingsSearchIssue": "Probléma jelentése",
-	"newExtensionLabel": "\"{0}\" kiegészítő megjelenítése",
-	"editTtile": "Szerkesztés",
-	"replaceDefaultValue": "Csere a beállításokban",
-	"copyDefaultValue": "Másolás a beállításokba"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/preferences/browser/preferencesService.i18n.json b/i18n/hun/src/vs/workbench/parts/preferences/browser/preferencesService.i18n.json
deleted file mode 100644
index af8b48895f0..00000000000
--- a/i18n/hun/src/vs/workbench/parts/preferences/browser/preferencesService.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openFolderFirst": "Munkaterületspecifikus beállítások létrehozásához nyisson meg egy mappát",
-	"emptyKeybindingsHeader": "Az ebben a fájlban elhelyezett billentyűparancsok felülírják az alapértelmezett beállításokat",
-	"defaultKeybindings": "Alapértelmezett billentyűparancsok",
-	"folderSettingsName": "{0} (mappabeállítások)",
-	"fail.createSettings": "Nem sikerült a(z) '{0}' létrehozás ({1})."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json b/i18n/hun/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
deleted file mode 100644
index e4a3df1c36f..00000000000
--- a/i18n/hun/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"defaultSettings": "A jobb oldalon lévő szerkesztőablakban elhelyezett beállítások felülírják az alapértelmezett beállításokat.",
-	"noSettingsFound": "Beállítás nem található.",
-	"settingsSwitcherBarAriaLabel": "Beállításkapcsoló",
-	"userSettings": "Felhasználói beállítások",
-	"workspaceSettings": "Munkaterület-beállítások",
-	"folderSettings": "Mappabeálíltások"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/preferences/browser/settingsEditor2.i18n.json b/i18n/hun/src/vs/workbench/parts/preferences/browser/settingsEditor2.i18n.json
deleted file mode 100644
index 18d6c84cfb5..00000000000
--- a/i18n/hun/src/vs/workbench/parts/preferences/browser/settingsEditor2.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"previewWarning": "Betekintő",
-	"previewLabel": "Ez az új beállításszerkesztő előzetes verziója.",
-	"SearchSettings.AriaLabel": "Beállítások keresése",
-	"SearchSettings.Placeholder": "Beállítások keresése",
-	"advancedCustomizationLabel": "További, haladó testreszabáshoz nyissa meg és szerkessze a következő fájlt:",
-	"openSettingsLabel": "settings.json",
-	"showOverriddenOnly": "Csak a módosítottak jelenjenek meg",
-	"treeAriaLabel": "Beállítások",
-	"feedbackButtonLabel": "Visszajelzés küldése"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/preferences/browser/settingsTree.i18n.json b/i18n/hun/src/vs/workbench/parts/preferences/browser/settingsTree.i18n.json
deleted file mode 100644
index 7b0f71712e6..00000000000
--- a/i18n/hun/src/vs/workbench/parts/preferences/browser/settingsTree.i18n.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"modifiedItemForeground": "A módosított beállítások előtérszíne.",
-	"workspace": "Munkaterület",
-	"user": "Felhasználói",
-	"resetButtonTitle": "visszaállítás",
-	"configured": "Módosítva",
-	"alsoConfiguredIn": "A következő helyen is be van állítva:",
-	"configuredIn": "A következő helyen be van állítva:",
-	"editInSettingsJson": "Szerkesztés a settings.jsonban",
-	"settingRowAriaLabel": "{0} {1}, beállítás",
-	"groupRowAriaLabel": "{0}, csoport"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/preferences/common/keybindingsEditorModel.i18n.json b/i18n/hun/src/vs/workbench/parts/preferences/common/keybindingsEditorModel.i18n.json
deleted file mode 100644
index 5a3aa4077c9..00000000000
--- a/i18n/hun/src/vs/workbench/parts/preferences/common/keybindingsEditorModel.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"default": "Alapértelmezett",
-	"user": "Felhasználói",
-	"meta": "meta",
-	"option": "beállítás"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/preferences/common/preferences.i18n.json b/i18n/hun/src/vs/workbench/parts/preferences/common/preferences.i18n.json
deleted file mode 100644
index 286ef5c8c24..00000000000
--- a/i18n/hun/src/vs/workbench/parts/preferences/common/preferences.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"userSettingsTarget": "Felhasználói beállítások",
-	"workspaceSettingsTarget": "Munkaterület-beállítások"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json b/i18n/hun/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json
deleted file mode 100644
index ec3d7a520ad..00000000000
--- a/i18n/hun/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"commonlyUsed": "Gyakran használt",
-	"defaultKeybindingsHeader": "A billentyűparancsok fájlban elhelyezett billentyűparancsok felülírják az alapértelmezett beállításokat"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/preferences/electron-browser/preferences.contribution.i18n.json b/i18n/hun/src/vs/workbench/parts/preferences/electron-browser/preferences.contribution.i18n.json
deleted file mode 100644
index e96a4eb2ee3..00000000000
--- a/i18n/hun/src/vs/workbench/parts/preferences/electron-browser/preferences.contribution.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"defaultPreferencesEditor": "Alapértelmezett beállításszerkesztő",
-	"settingsEditor2": "Beállításszerkesztő 2",
-	"keybindingsEditor": "Billentyűparancs-szerkesztő",
-	"preferences": "Beállítások"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/quickopen/browser/commandsHandler.i18n.json b/i18n/hun/src/vs/workbench/parts/quickopen/browser/commandsHandler.i18n.json
deleted file mode 100644
index b4597bf78af..00000000000
--- a/i18n/hun/src/vs/workbench/parts/quickopen/browser/commandsHandler.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"showTriggerActions": "Összes parancs megjelenítése",
-	"clearCommandHistory": "Parancselőzmények törlése",
-	"showCommands.label": "Parancskatalógus...",
-	"entryAriaLabelWithKey": "{0}, {1}, parancsok",
-	"entryAriaLabel": "{0}, parancs",
-	"actionNotEnabled": "Ebben a kontextusban nem engedélyezett a(z) '{0}' parancs futtatása.",
-	"canNotRun": "A(z) '{0}' parancs hibát eredményezett.",
-	"recentlyUsed": "legutóbb használt",
-	"morecCommands": "további parancsok",
-	"cat.title": "{0}: {1}",
-	"noCommandsMatching": "Parancs nem található"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/quickopen/browser/gotoLineHandler.i18n.json b/i18n/hun/src/vs/workbench/parts/quickopen/browser/gotoLineHandler.i18n.json
deleted file mode 100644
index 250721d4e85..00000000000
--- a/i18n/hun/src/vs/workbench/parts/quickopen/browser/gotoLineHandler.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"gotoLine": "Ugrás adott sorhoz...",
-	"gotoLineLabelEmptyWithLimit": "Adja meg a keresett sor számát 1 és {0} között!",
-	"gotoLineLabelEmpty": "Adja meg a keresett sor számát!",
-	"gotoLineColumnLabel": "Ugrás a(z) {0}. sor {1}. oszlopára",
-	"gotoLineLabel": "Ugrás a(z) {0}. sorra",
-	"gotoLineHandlerAriaLabel": "Adja meg a keresett sor számát!",
-	"cannotRunGotoLine": "Sorra ugráshoz nyisson meg egy szövegfájlt!"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/quickopen/browser/gotoSymbolHandler.i18n.json b/i18n/hun/src/vs/workbench/parts/quickopen/browser/gotoSymbolHandler.i18n.json
deleted file mode 100644
index 40049252020..00000000000
--- a/i18n/hun/src/vs/workbench/parts/quickopen/browser/gotoSymbolHandler.i18n.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"gotoSymbol": "Ugrás szimbólumhoz egy fájlban...",
-	"symbols": "szimbólumok ({0})",
-	"method": "metódusok ({0})",
-	"function": "függvények ({0})",
-	"_constructor": "konstruktorok ({0})",
-	"variable": "változók ({0})",
-	"class": "osztályok ({0})",
-	"interface": "interfészek ({0})",
-	"namespace": "névterek ({0})",
-	"package": "csomagok ({0})",
-	"modules": "modulok ({0})",
-	"property": "tulajdonságok ({0})",
-	"enum": "enumerátorok ({0n)",
-	"string": "karakterláncok ({0})",
-	"rule": "szabályok ({0})",
-	"file": "fájlok ({0})",
-	"array": "tömbök ({0})",
-	"number": "számok ({0})",
-	"boolean": "logikai értékek ({0})",
-	"object": "objektumok ({0})",
-	"key": "kulcsok ({0})",
-	"entryAriaLabel": "{0}, szimbólumok",
-	"noSymbolsMatching": "Nincs illeszkedő szimbólum",
-	"noSymbolsFound": "Szimbólum nem található",
-	"gotoSymbolHandlerAriaLabel": "Írjon az aktív szerkesztőablakban található szimbólumok szűréséhez.",
-	"cannotRunGotoSymbolInFile": "Ehhez a fájlhoz nincs szimbóluminformáció",
-	"cannotRunGotoSymbol": "Szimbólumra ugráshoz nyisson meg egy szövegfájlt!"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/quickopen/browser/helpHandler.i18n.json b/i18n/hun/src/vs/workbench/parts/quickopen/browser/helpHandler.i18n.json
deleted file mode 100644
index 22e9e448e61..00000000000
--- a/i18n/hun/src/vs/workbench/parts/quickopen/browser/helpHandler.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"entryAriaLabel": "{0}, választó súgó",
-	"globalCommands": "globális parancsok",
-	"editorCommands": "szerkesztőablak parancsai"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json b/i18n/hun/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json
deleted file mode 100644
index 30ceee409e6..00000000000
--- a/i18n/hun/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"view": "Nézet",
-	"commandsHandlerDescriptionDefault": "Parancsok megjelenítése és futtatása",
-	"gotoLineDescriptionMac": "Ugrás adott sorhoz",
-	"gotoLineDescriptionWin": "Ugrás adott sorhoz",
-	"gotoSymbolDescription": "Ugrás szimbólumhoz egy fájlban...",
-	"gotoSymbolDescriptionScoped": "Ugrás szimbólumhoz egy fájlban kategória alapján",
-	"helpDescription": "Súgó megjelenítése",
-	"viewPickerDescription": "Nézet megnyitása"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/quickopen/browser/viewPickerHandler.i18n.json b/i18n/hun/src/vs/workbench/parts/quickopen/browser/viewPickerHandler.i18n.json
deleted file mode 100644
index 39c77deabee..00000000000
--- a/i18n/hun/src/vs/workbench/parts/quickopen/browser/viewPickerHandler.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"entryAriaLabel": "{0}, nézetválasztó",
-	"views": "Nézetek",
-	"panels": "Panelek",
-	"terminals": "Terminál",
-	"terminalTitle": "{0}: {1}",
-	"channels": "Kimenet",
-	"openView": "Nézet megnyitása",
-	"quickOpenView": "Gyors megnyitás nézet"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.i18n.json b/i18n/hun/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.i18n.json
deleted file mode 100644
index 89aab51ca27..00000000000
--- a/i18n/hun/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"relaunchSettingMessage": "Egy olyan beállítás változott, melynek hatályba lépéséhez újraindítás szükséges.",
-	"relaunchSettingDetail": "A beállítás engedélyezéséhez nyomja meg az újraindítás gombot a {0} újraindításához.",
-	"restart": "Új&&raindítás"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.i18n.json b/i18n/hun/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.i18n.json
deleted file mode 100644
index 8349d99a4a6..00000000000
--- a/i18n/hun/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.i18n.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"changes": "{0}. módosítás (összesen: {1})",
-	"change": "{0}. módosítás (összesen: {1})",
-	"show previous change": "Előző módosítás megjelenítése",
-	"show next change": "Következő módosítás megjelenítése",
-	"move to previous change": "Ugrás az előző módosításra",
-	"move to next change": "Ugrás az következő módosításra",
-	"editorGutterModifiedBackground": "A szerkesztőablak margójának háttérszíne a módosított soroknál.",
-	"editorGutterAddedBackground": "A szerkesztőablak margójának háttérszíne a hozzáadott soroknál.",
-	"editorGutterDeletedBackground": "A szerkesztőablak margójának háttérszíne a törölt soroknál.",
-	"overviewRulerModifiedForeground": "A módosított tartalmat jelölő jelzések színe az áttekintősávon.",
-	"overviewRulerAddedForeground": "A hozzáadott tartalmat jelölő jelzések színe az áttekintősávon.",
-	"overviewRulerDeletedForeground": "A törölt tartalmat jelölő jelzések színe az áttekintősávon."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json b/i18n/hun/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
deleted file mode 100644
index b8dbc7740d8..00000000000
--- a/i18n/hun/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleGitViewlet": "Git megjelenítése",
-	"source control": "Verziókezelő rendszer",
-	"toggleSCMViewlet": "Verziókezelő megjelenítése",
-	"view": "Nézet",
-	"scmConfigurationTitle": "VKR (SCM)",
-	"alwaysShowProviders": "Mindig megjelenjen-e a verziókezelő rendszerek szakasz.",
-	"diffDecorations": "Vezérli a szerkesztőablakban megjelenő, változásokat jelölő dekorátorokat.",
-	"diffGutterWidth": "Vezérli a szerkesztőablak margóján megjelenő, változásokat jelölő dekorátorok szélességét (pixelben)."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/scm/electron-browser/scmActivity.i18n.json b/i18n/hun/src/vs/workbench/parts/scm/electron-browser/scmActivity.i18n.json
deleted file mode 100644
index 94692cf6b09..00000000000
--- a/i18n/hun/src/vs/workbench/parts/scm/electron-browser/scmActivity.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"scmPendingChangesBadge": "{0} függőben lévő módosítás"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/scm/electron-browser/scmMenus.i18n.json b/i18n/hun/src/vs/workbench/parts/scm/electron-browser/scmMenus.i18n.json
deleted file mode 100644
index a7af703f9fc..00000000000
--- a/i18n/hun/src/vs/workbench/parts/scm/electron-browser/scmMenus.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"installAdditionalSCMProviders": "További verziókezelő rendszerek telepítése...",
-	"switch provider": "Váltás más verziókezelő rendszerre..."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json b/i18n/hun/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
deleted file mode 100644
index eed65b480a8..00000000000
--- a/i18n/hun/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"scm providers": "Verziókezelő rendszerek",
-	"hideRepository": "Elrejtés",
-	"installAdditionalSCMProviders": "További verziókezelő rendszerek telepítése...",
-	"no open repo": "Nincs aktív verziókezelő rendszer.",
-	"source control": "Verziókezelő rendszer",
-	"viewletTitle": "{0}: {1}",
-	"hideView": "Elrejtés"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/search/browser/openAnythingHandler.i18n.json b/i18n/hun/src/vs/workbench/parts/search/browser/openAnythingHandler.i18n.json
deleted file mode 100644
index a224ff786ec..00000000000
--- a/i18n/hun/src/vs/workbench/parts/search/browser/openAnythingHandler.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"fileAndTypeResults": "fájl- és szimbólumkeresés eredménye",
-	"fileResults": "fájlkeresés eredménye"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/search/browser/openFileHandler.i18n.json b/i18n/hun/src/vs/workbench/parts/search/browser/openFileHandler.i18n.json
deleted file mode 100644
index 17de1f29d5d..00000000000
--- a/i18n/hun/src/vs/workbench/parts/search/browser/openFileHandler.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"entryAriaLabel": "{0}, fájlválasztó",
-	"searchResults": "keresési eredmények"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/search/browser/openSymbolHandler.i18n.json b/i18n/hun/src/vs/workbench/parts/search/browser/openSymbolHandler.i18n.json
deleted file mode 100644
index 93075a04952..00000000000
--- a/i18n/hun/src/vs/workbench/parts/search/browser/openSymbolHandler.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"entryAriaLabel": "{0}, szimbólumválasztó",
-	"symbols": "szimbólumkeresési eredmények",
-	"noSymbolsMatching": "Nincs illeszkedő szimbólum",
-	"noSymbolsWithoutInput": "Adja meg a keresett szimbólumot"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/search/browser/patternInputWidget.i18n.json b/i18n/hun/src/vs/workbench/parts/search/browser/patternInputWidget.i18n.json
deleted file mode 100644
index d22debd3745..00000000000
--- a/i18n/hun/src/vs/workbench/parts/search/browser/patternInputWidget.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"defaultLabel": "bemeneti adat",
-	"useExcludesAndIgnoreFilesDescription": "Kizárási beállítások és ignore-fájlok használata"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/search/browser/replaceService.i18n.json b/i18n/hun/src/vs/workbench/parts/search/browser/replaceService.i18n.json
deleted file mode 100644
index 0293f5f5ef5..00000000000
--- a/i18n/hun/src/vs/workbench/parts/search/browser/replaceService.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"fileReplaceChanges": "{0} ↔ {1} (csere előnézete)"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/search/browser/search.contribution.i18n.json b/i18n/hun/src/vs/workbench/parts/search/browser/search.contribution.i18n.json
deleted file mode 100644
index e1fb57e6aa6..00000000000
--- a/i18n/hun/src/vs/workbench/parts/search/browser/search.contribution.i18n.json
+++ /dev/null
@@ -1,22 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"showTriggerActions": "Szimbólum megkeresése a munkaterületen...",
-	"name": "Keresés",
-	"search": "Keresés",
-	"view": "Nézet",
-	"openAnythingHandlerDescription": "Fájl megkeresése",
-	"openSymbolDescriptionNormal": "Szimbólum megkeresése a munkaterületen",
-	"searchOutputChannelTitle": "Keresés",
-	"searchConfigurationTitle": "Keresés",
-	"exclude": "Globális minták konfigurálása fájlok és mappák keresésből való kizárásához. Örökli az összes globális mintát a fliex.exclude beállításból.",
-	"exclude.boolean": "A globális minta, amire illesztve lesznek a fájlok elérési útjai. A minta engedélyezéséhez vagy letiltásához állítsa igaz vagy hamis értékre.",
-	"exclude.when": "További ellenőrzés elvégzése az illeszkedő fájlok testvérein. Az illeszkedő fájl nevéhez használja a $(basename) változót!",
-	"useRipgrep": "Meghatározza, hogy a szövegben és fájlokban való kereséshez a ripgrep van-e használva.",
-	"useIgnoreFiles": "Meghatározza, hogy a .gitignore és .ignore fájlok használva legyenek-e a kereséshez.",
-	"search.quickOpen.includeSymbols": "Meghatározza, hogy a fájlok gyors megnyitásánál megjelenjenek-e a globális szimbólumkereső találatai.",
-	"search.followSymlinks": "Meghatározza, hogy keresés során követve legyenek-e a szimbolikus linkek."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/search/browser/searchActions.i18n.json b/i18n/hun/src/vs/workbench/parts/search/browser/searchActions.i18n.json
deleted file mode 100644
index 9a1dc2269a1..00000000000
--- a/i18n/hun/src/vs/workbench/parts/search/browser/searchActions.i18n.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"nextSearchIncludePattern": "Következő bele foglalt keresési minta megjelenítése",
-	"previousSearchIncludePattern": "Előző bele foglalt keresési minta megjelenítése",
-	"nextSearchExcludePattern": "Következő kizáró keresési minta megjelenítése",
-	"previousSearchExcludePattern": "Előző kizáró keresési minta megjelenítése",
-	"nextSearchTerm": "Következő keresőkifejezés megjelenítése",
-	"previousSearchTerm": "Előző keresőkifejezés megjelenítése",
-	"nextReplaceTerm": "Következő keresési cserekifejezés megjelenítése",
-	"previousReplaceTerm": "Előző keresési cserekifejezés megjelenítése",
-	"findInFiles": "Keresés a fájlokban",
-	"replaceInFiles": "Csere a fájlokban",
-	"RefreshAction.label": "Frissítés",
-	"CollapseDeepestExpandedLevelAction.label": "Összes bezárása",
-	"ClearSearchResultsAction.label": "Törlés",
-	"CancelSearchAction.label": "Keresés megszakítása",
-	"FocusNextSearchResult.label": "Váltás a következő keresési eredményre",
-	"FocusPreviousSearchResult.label": "Váltás az előző keresési eredményre",
-	"RemoveAction.label": "Elvetés",
-	"file.replaceAll.label": "Összes cseréje",
-	"match.replace.label": "Csere"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/search/browser/searchResultsView.i18n.json b/i18n/hun/src/vs/workbench/parts/search/browser/searchResultsView.i18n.json
deleted file mode 100644
index 5d5a52d846c..00000000000
--- a/i18n/hun/src/vs/workbench/parts/search/browser/searchResultsView.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"searchFolderMatch.other.label": "További fájlok",
-	"searchFileMatches": "{0} fájl található",
-	"searchFileMatch": "{0} fájl található",
-	"searchMatches": "{0} találat",
-	"searchMatch": "{0} találat",
-	"folderMatchAriaLabel": "{0} találat a(z) {2} gyökérmappában. Keresési eredmény ",
-	"fileMatchAriaLabel": "{0} találat a(z) {2} mappa {1} fájljában. Keresési eredmény",
-	"replacePreviewResultAria": "{0} kifejezés cseréje a következőre: {1}, a(z) {2}. oszlopban, a következő szöveget tartalmazó sorban: {3}",
-	"searchResultAria": "Találat a(z) {0} kifejezésre a(z) {1}. oszlopban, a következő szöveget tartalmazó sorban: {2}"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/search/browser/searchView.i18n.json b/i18n/hun/src/vs/workbench/parts/search/browser/searchView.i18n.json
deleted file mode 100644
index 414222489bd..00000000000
--- a/i18n/hun/src/vs/workbench/parts/search/browser/searchView.i18n.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"moreSearch": "Keresési részletek be- és kikapcsolása",
-	"searchScope.includes": "bele foglalt fájlok",
-	"label.includes": "Keresésbe bele foglalt fájlok",
-	"searchScope.excludes": "kizárt fájlok",
-	"label.excludes": "Keresésből kizárt fájlok",
-	"replaceAll.confirmation.title": "Összes cseréje",
-	"replaceAll.confirm.button": "&&Csere",
-	"replaceAll.occurrence.file.message": "{0} előfordulás cserélve {1} fájlban a következőre: '{2}'.",
-	"removeAll.occurrence.file.message": "{0} előfordulás cserélve {1} fájlban.",
-	"replaceAll.occurrence.files.message": "{0} előfordulás cserélve {1} fájlban a következőre: '{2}'.",
-	"removeAll.occurrence.files.message": "{0} előfordulás cserélve {1} fájlban.",
-	"replaceAll.occurrences.file.message": "{0} előfordulás cserélve {1} fájlban a következőre: '{2}'.",
-	"removeAll.occurrences.file.message": "{0} előfordulás cserélve {1} fájlban.",
-	"replaceAll.occurrences.files.message": "{0} előfordulás cserélve {1} fájlban a következőre: '{2}'.",
-	"removeAll.occurrences.files.message": "{0} előfordulás cserélve {1} fájlban.",
-	"removeAll.occurrence.file.confirmation.message": "Cserél {0} előfordulás {1} fájlban a következőre: '{2}'?",
-	"replaceAll.occurrence.file.confirmation.message": "Cserél {0} előfordulást {1} fájlban?",
-	"removeAll.occurrence.files.confirmation.message": "Cserél {0} előfordulás {1} fájlban a következőre: '{2}'?",
-	"replaceAll.occurrence.files.confirmation.message": "Cserél {0} előfordulást {1} fájlban?",
-	"removeAll.occurrences.file.confirmation.message": "Cserél {0} előfordulás {1} fájlban a következőre: '{2}'?",
-	"replaceAll.occurrences.file.confirmation.message": "Cserél {0} előfordulást {1} fájlban?",
-	"removeAll.occurrences.files.confirmation.message": "Cserél {0} előfordulás {1} fájlban a következőre: '{2}'?",
-	"replaceAll.occurrences.files.confirmation.message": "Cserél {0} előfordulást {1} fájlban?",
-	"treeAriaLabel": "Keresési eredmények",
-	"searchPathNotFoundError": "A keresett elérési út nem található: {0}",
-	"searchMaxResultsWarning": "Az eredményhalmaz csak a találatok egy részét tartalmazza. Pontosítsa a keresést a keresési eredmények halmazának szűkítéséhez!",
-	"searchCanceled": "A keresés meg lett szakítva, mielőtt eredményt hozott volna –",
-	"noResultsIncludesExcludes": "Nincs találat a következő helyen: '{0}', '{1}' kivételével –",
-	"noResultsIncludes": "Nincs találat a következő helyen: '{0}' –",
-	"noResultsExcludes": "Nincs találat '{1}' kivételével –",
-	"noResultsFound": "Nincs találat. Ellenőrizze a kizárási beállításokat és az ignore-fájlokat –",
-	"rerunSearch.message": "Keresés megismétlése",
-	"rerunSearchInAll.message": "Keresés megismétlése az összes fájlban",
-	"openSettings.message": "Beállítások megnyitása",
-	"openSettings.learnMore": "További információ",
-	"ariaSearchResultsStatus": "A keresés {0} találatot eredményezett {1} fájlban",
-	"search.file.result": "{0} találat {1} fájlban",
-	"search.files.result": "{0} találat {1} fájlban",
-	"search.file.results": "{0} találat {1} fájlban",
-	"search.files.results": "{0} találat {1} fájlban",
-	"searchWithoutFolder": "Még nincs mappa megnyitva. Jelenleg csak a nyitott fájlokban történik keresés –",
-	"openFolder": "Mappa megnyitása"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json b/i18n/hun/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
deleted file mode 100644
index 7156b4ce412..00000000000
--- a/i18n/hun/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"moreSearch": "Keresési részletek be- és kikapcsolása",
-	"searchScope.includes": "bele foglalt fájlok",
-	"label.includes": "Keresésbe bele foglalt fájlok",
-	"searchScope.excludes": "kizárt fájlok",
-	"label.excludes": "Keresésből kizárt fájlok",
-	"replaceAll.confirmation.title": "Minden előfordulás cseréje",
-	"replaceAll.confirm.button": "&&Csere",
-	"replaceAll.occurrence.file.message": "{0} előfordulás cserélve {1} fájlban a következőre: '{2}'.",
-	"removeAll.occurrence.file.message": "{0} előfordulás cserélve {1} fájlban.",
-	"replaceAll.occurrence.files.message": "{0} előfordulás cserélve {1} fájlban a következőre: '{2}'.",
-	"removeAll.occurrence.files.message": "{0} előfordulás cserélve {1} fájlban.",
-	"replaceAll.occurrences.file.message": "{0} előfordulás cserélve {1} fájlban a következőre: '{2}'.",
-	"removeAll.occurrences.file.message": "{0} előfordulás cserélve {1} fájlban.",
-	"replaceAll.occurrences.files.message": "{0} előfordulás cserélve {1} fájlban a következőre: '{2}'.",
-	"removeAll.occurrences.files.message": "{0} előfordulás cserélve {1} fájlban.",
-	"removeAll.occurrence.file.confirmation.message": "Cserél {0} előfordulás {1} fájlban a következőre: '{2}'?",
-	"replaceAll.occurrence.file.confirmation.message": "Cserél {0} előfordulást {1} fájlban?",
-	"removeAll.occurrence.files.confirmation.message": "Cserél {0} előfordulás {1} fájlban a következőre: '{2}'?",
-	"replaceAll.occurrence.files.confirmation.message": "Cserél {0} előfordulást {1} fájlban?",
-	"removeAll.occurrences.file.confirmation.message": "Cserél {0} előfordulás {1} fájlban a következőre: '{2}'?",
-	"replaceAll.occurrences.file.confirmation.message": "Cserél {0} előfordulást {1} fájlban?",
-	"removeAll.occurrences.files.confirmation.message": "Cserél {0} előfordulás {1} fájlban a következőre: '{2}'?",
-	"replaceAll.occurrences.files.confirmation.message": "Cserél {0} előfordulást {1} fájlban?",
-	"treeAriaLabel": "Keresési eredmények",
-	"searchPathNotFoundError": "Keresési elérési út nem található: {0}",
-	"searchMaxResultsWarning": "Az eredményhalmaz csak a találatok egy részét tartalmazza. Pontosítsa a keresést a keresési eredmények halmazának szűkítéséhez!",
-	"searchCanceled": "A keresés meg lett szakítva, mielőtt eredményt hozott volna –",
-	"noResultsIncludesExcludes": "Nincs találat a következő helyen: '{0}', '{1}' kivételével –",
-	"noResultsIncludes": "Nincs találat a következő helyen: '{0}' –",
-	"noResultsExcludes": "Nincs találat '{1}' kivételével –",
-	"noResultsFound": "Nincs találat. Ellenőrizze a kizárási beállításokat és az ignore-fájlokat –",
-	"rerunSearch.message": "Keresés megismétlése",
-	"rerunSearchInAll.message": "Keresés megismétlése az összes fájlban",
-	"openSettings.message": "Beállítások megnyitása",
-	"openSettings.learnMore": "További információ",
-	"ariaSearchResultsStatus": "A keresés {0} találatot eredményezett {1} fájlban",
-	"search.file.result": "{0} találat {1} fájlban",
-	"search.files.result": "{0} találat {1} fájlban",
-	"search.file.results": "{0} találat {1} fájlban",
-	"search.files.results": "{0} találat {1} fájlban",
-	"searchWithoutFolder": "Még nincs mappa megnyitva. Jelenleg csak a nyitott fájlokban történik keresés –",
-	"openFolder": "Mappa megnyitása"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/search/browser/searchWidget.i18n.json b/i18n/hun/src/vs/workbench/parts/search/browser/searchWidget.i18n.json
deleted file mode 100644
index 9a5b0439759..00000000000
--- a/i18n/hun/src/vs/workbench/parts/search/browser/searchWidget.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"search.action.replaceAll.disabled.label": "Összes cseréje (küldje el a keresést az engedélyezéshez)",
-	"search.action.replaceAll.enabled.label": "Összes cseréje",
-	"search.replace.toggle.button.title": "Cseremd be- és kikapcsolása",
-	"label.Search": "Keresés: adja meg a keresőkifejezést, majd nyomjon Entert a kereséshez vagy Escape-et a megszakításhoz",
-	"search.placeHolder": "Keresés",
-	"label.Replace": "Csere: adja meg a cerekifejezést, majd nyomjon Entert a kereséshez vagy Escape-et a megszakításhoz",
-	"search.replace.placeHolder": "Csere",
-	"regexp.validationFailure": "A kifejezés mindenre illeszkedik",
-	"regexp.backreferenceValidationFailure": "A visszahivatkozás nem támogatott"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/search/common/queryBuilder.i18n.json b/i18n/hun/src/vs/workbench/parts/search/common/queryBuilder.i18n.json
deleted file mode 100644
index 794e9a07819..00000000000
--- a/i18n/hun/src/vs/workbench/parts/search/common/queryBuilder.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"search.noWorkspaceWithName": "Nincs {0} nevű mappa a munkaterületen"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json b/i18n/hun/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
deleted file mode 100644
index 1439e6263ae..00000000000
--- a/i18n/hun/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"search": "Keresés",
-	"copyMatchLabel": "Másolás",
-	"copyPathLabel": "Elérési út másolása",
-	"copyAllLabel": "Összes másolása",
-	"clearSearchHistoryLabel": "Keresési előzmények törlése",
-	"toggleSearchViewPositionLabel": "Keresőnézet helyzetének váltása",
-	"findInFolder": "Keresés mappában...",
-	"findInWorkspace": "Keresés a munkaterületen...",
-	"showTriggerActions": "Ugrás szimbólumhoz a munkaterületen...",
-	"name": "Keresés",
-	"showSearchViewl": "Keresés megjelenítése",
-	"view": "Nézet",
-	"findInFiles": "Keresés a fájlokban",
-	"openAnythingHandlerDescription": "Ugrás fájlhoz",
-	"openSymbolDescriptionNormal": "Ugrás szimbólumhoz a munkaterületen",
-	"searchConfigurationTitle": "Keresés",
-	"exclude": "Fájlok és mappák keresésből való kizárására szolgáló globális minták. Örökli az összes globális mintát a fliex.exclude beállításból.",
-	"exclude.boolean": "A globális minta, amire illesztve lesznek a fájlok elérési útjai. A minta engedélyezéséhez vagy letiltásához állítsa igaz vagy hamis értékre.",
-	"exclude.when": "További ellenőrzés elvégzése az illeszkedő fájlok testvérein. Az illeszkedő fájl nevéhez használja a $(basename) változót!",
-	"useRipgrep": "Meghatározza, hogy a szövegben és fájlokban való kereséshez a ripgrep van-e használva.",
-	"useIgnoreFiles": "Meghatározza, hogy a .gitignore és .ignore fájlok használva legyenek-e a kereséshez.",
-	"search.quickOpen.includeSymbols": "Meghatározza, hogy a fájlok gyors megnyitásánál megjelenjenek-e a globális szimbólumkereső találatai.",
-	"search.followSymlinks": "Meghatározza, hogy keresés során követve legyenek-e a szimbolikus linkek.",
-	"search.smartCase": "Figyelmen kívül hagyja a kis- és nagybetűket, ha a minta csak kisbetűkből áll, ellenkező esetben kis- és nagybetűérzékenyen keres",
-	"search.globalFindClipboard": "Meghatározza, hogy a keresőmodul olvassa és módosítsa-e a megosztott keresési vágólapot macOS-en.",
-	"search.location": "Meghatározza, hogy a keresés az oldalsávon jelenik meg vagy egy panelként a panelterületen, mely utóbbi esetén több vízszintes hely áll rendelkezésre."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/search/electron-browser/searchActions.i18n.json b/i18n/hun/src/vs/workbench/parts/search/electron-browser/searchActions.i18n.json
deleted file mode 100644
index 3f73a581190..00000000000
--- a/i18n/hun/src/vs/workbench/parts/search/electron-browser/searchActions.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"findInFolder": "Keresés mappában...",
-	"findInWorkspace": "Keresés a munkaterületen..."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/snippets/electron-browser/TMSnippets.i18n.json b/i18n/hun/src/vs/workbench/parts/snippets/electron-browser/TMSnippets.i18n.json
deleted file mode 100644
index 161e797da75..00000000000
--- a/i18n/hun/src/vs/workbench/parts/snippets/electron-browser/TMSnippets.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"vscode.extension.contributes.snippets": "Kódrészleteket szolgáltat.",
-	"vscode.extension.contributes.snippets-language": "Azon nyelv azonosítója, amely számára szolgáltatva van ez a kódrészlet.",
-	"vscode.extension.contributes.snippets-path": "A kódrészlet-fájl elérési útja. Az elérési út relatív a kiegészítő mappájához, és általában a következővel kezdődik: './snippets/',",
-	"invalid.language": "Ismeretlen nyelv található a következőben: `contributes.{0}.language`. A megadott érték: {1}",
-	"invalid.path.0": "Hiányzó karakterlánc a `contributes.{0}.path`-ban. A megadott érték: {1}",
-	"invalid.path.1": "A `contributes.{0}.path` ({1}) nem a kiegészítő mappáján belül található ({2}). Emiatt előfordulhat, hogy a kiegészítő nem lesz hordozható.",
-	"badVariableUse": "A(z) \"{0}\" kódrészlet nagy valószínűséggel keveri a kódrészletváltozók és a kódrészlet-helyjelölők fogalmát. További információ a következő oldalon található: https://code.visualstudio.com/docs/editor/userdefinedsnippets#_snippet-syntax"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json b/i18n/hun/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json
deleted file mode 100644
index f3d84a4571d..00000000000
--- a/i18n/hun/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"global.scope": "(globális)",
-	"global.1": "(({0})",
-	"new.global": "Új globális kódrészlet-fájl...",
-	"group.global": "Létező kódrészletek",
-	"new.global.sep": "Új kódrészletek",
-	"openSnippet.pickLanguage": "Válasszon hozzon létre egy kódrészlet-fájlt!",
-	"openSnippet.label": "Felhasználói kódrészletek konfigurálása",
-	"preferences": "Beállítások"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/snippets/electron-browser/insertSnippet.i18n.json b/i18n/hun/src/vs/workbench/parts/snippets/electron-browser/insertSnippet.i18n.json
deleted file mode 100644
index 6d3b1606e84..00000000000
--- a/i18n/hun/src/vs/workbench/parts/snippets/electron-browser/insertSnippet.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"snippet.suggestions.label": "Kódrészlet beszúrása",
-	"sep.userSnippet": "Felhasználói kódrészletek",
-	"sep.extSnippet": "Kiegészítők kódrészletei"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json b/i18n/hun/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json
deleted file mode 100644
index 5a3f80015bb..00000000000
--- a/i18n/hun/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"snippetSchema.json.default": "Üres kódrészlet",
-	"snippetSchema.json": "Felhasználói kódrészlet-konfiguráció",
-	"snippetSchema.json.prefix": "A kódrészlet IntelliSense-ben történő kiválasztásánál használt előtag",
-	"snippetSchema.json.body": "A kódrészlet tartalma. Kurzorpozíciók definiálásához használja a '$1' és '${1:defaultText}' jelölőket, a '$0' pedig a végső kurzorpozíció. Változónevek a '${varName}' és '${varName:defaultText}' formában definiálhatók, pl.: 'Ez a fájl: $TM_FILENAME'.",
-	"snippetSchema.json.description": "A kódrészlet leírása",
-	"snippetSchema.json.scope": "Azok nyelvek nevei, amelyekhez a kódrészlet tartozik, pl. 'typescript,javascript'."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json b/i18n/hun/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json
deleted file mode 100644
index 869515c3c57..00000000000
--- a/i18n/hun/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"source.snippetGlobal": "Globális felhasználói kódrészket",
-	"source.snippet": "Felhasználói kódrészlet"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json b/i18n/hun/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
deleted file mode 100644
index f6494963584..00000000000
--- a/i18n/hun/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"invalid.path.0": "Hiányzó karakterlánc a `contributes.{0}.path`-ban. A megadott érték: {1}",
-	"invalid.language.0": "Nyelv elhagyása esetén a `contributes.{0}.path` értékének egy `.code-snippets`-fájlnak kell lennie. A megadott érték: {1}",
-	"invalid.language": "Ismeretlen nyelv található a következőben: `contributes.{0}.language`. A megadott érték: {1}",
-	"invalid.path.1": "A `contributes.{0}.path` ({1}) nem a kiegészítő mappáján belül található ({2}). Emiatt előfordulhat, hogy a kiegészítő nem lesz hordozható.",
-	"vscode.extension.contributes.snippets": "Kódrészleteket szolgáltat.",
-	"vscode.extension.contributes.snippets-language": "Azon nyelv azonosítója, amely számára szolgáltatva van ez a kódrészlet.",
-	"vscode.extension.contributes.snippets-path": "A kódrészlet-fájl elérési útja. Az elérési út relatív a kiegészítő mappájához, és általában a következővel kezdődik: './snippets/',",
-	"badVariableUse": "A(z) '{0}' kiegészítőben egy vagy több kódrészlet nagy valószínűséggel keveri a kódrészletváltozók és a kódrészlet-helyjelölők fogalmát (további információ a következő oldalon található: https://code.visualstudio.com/docs/editor/userdefinedsnippets#_snippet-syntax)",
-	"badFile": "A(z) \"{0}\" kódrészletet tartalmazó fájlt nem sikerült beolvasni.",
-	"detail.snippet": "{0} ({1})",
-	"snippetSuggest.longLabel": "{0}, {1}"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/snippets/electron-browser/tabCompletion.i18n.json b/i18n/hun/src/vs/workbench/parts/snippets/electron-browser/tabCompletion.i18n.json
deleted file mode 100644
index 153821a19a2..00000000000
--- a/i18n/hun/src/vs/workbench/parts/snippets/electron-browser/tabCompletion.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"tabCompletion": "Kódrészletek beszúrása, ha az előtagjuk illeszkedik. Legjobban akkor működik, ha a 'quickSuggestions' nincs engedélyezve."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/surveys/electron-browser/languageSurveys.contribution.i18n.json b/i18n/hun/src/vs/workbench/parts/surveys/electron-browser/languageSurveys.contribution.i18n.json
deleted file mode 100644
index 77d4506f265..00000000000
--- a/i18n/hun/src/vs/workbench/parts/surveys/electron-browser/languageSurveys.contribution.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"helpUs": "Segítsen javítani a {0}-támogatásunkat",
-	"takeShortSurvey": "Rövid felmérés kitöltése",
-	"remindLater": "Emlékeztessen később",
-	"neverAgain": "Ne jelenítse meg újra"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/surveys/electron-browser/nps.contribution.i18n.json b/i18n/hun/src/vs/workbench/parts/surveys/electron-browser/nps.contribution.i18n.json
deleted file mode 100644
index 114c9ebb551..00000000000
--- a/i18n/hun/src/vs/workbench/parts/surveys/electron-browser/nps.contribution.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"surveyQuestion": "Lenne kedve egy gyors elégedettségi felméréshez?",
-	"takeSurvey": "Felmérés kitöltése",
-	"remindLater": "Emlékeztessen később",
-	"neverAgain": "Ne jelenítse meg újra"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/tasks/browser/buildQuickOpen.i18n.json b/i18n/hun/src/vs/workbench/parts/tasks/browser/buildQuickOpen.i18n.json
deleted file mode 100644
index 014090555b3..00000000000
--- a/i18n/hun/src/vs/workbench/parts/tasks/browser/buildQuickOpen.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"tasksAriaLabel": "Adja meg a buildelési feladat nevét!",
-	"noTasksMatching": "Nincs ilyen feladat",
-	"noTasksFound": "Buildelési feladat nem található"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/tasks/browser/quickOpen.i18n.json b/i18n/hun/src/vs/workbench/parts/tasks/browser/quickOpen.i18n.json
deleted file mode 100644
index 467f6cde75c..00000000000
--- a/i18n/hun/src/vs/workbench/parts/tasks/browser/quickOpen.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"entryAriaLabel": "{0}, feladatok",
-	"recentlyUsed": "legutóbb futtatott feladatok",
-	"configured": "konfigurált feladatok",
-	"detected": "talált feladatok",
-	"customizeTask": "Feladat beállítása"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/tasks/browser/restartQuickOpen.i18n.json b/i18n/hun/src/vs/workbench/parts/tasks/browser/restartQuickOpen.i18n.json
deleted file mode 100644
index dad5b6db3e8..00000000000
--- a/i18n/hun/src/vs/workbench/parts/tasks/browser/restartQuickOpen.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"tasksAriaLabel": "Adja meg az újraindítandó feladat nevét!",
-	"noTasksMatching": "Nincs ilyen feladat",
-	"noTasksFound": "Újraindítandó feladat nem található"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/tasks/browser/taskQuickOpen.i18n.json b/i18n/hun/src/vs/workbench/parts/tasks/browser/taskQuickOpen.i18n.json
deleted file mode 100644
index db2d6fab05c..00000000000
--- a/i18n/hun/src/vs/workbench/parts/tasks/browser/taskQuickOpen.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"tasksAriaLabel": "Adja meg a futtatandó feladat nevét!",
-	"noTasksMatching": "Nincs ilyen feladat",
-	"noTasksFound": "Feladat nem található"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/tasks/browser/terminateQuickOpen.i18n.json b/i18n/hun/src/vs/workbench/parts/tasks/browser/terminateQuickOpen.i18n.json
deleted file mode 100644
index 76eb0f2619d..00000000000
--- a/i18n/hun/src/vs/workbench/parts/tasks/browser/terminateQuickOpen.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"tasksAriaLabel": "Adja meg a megszakítandó feladat nevét!",
-	"noTasksMatching": "Nincs ilyen feladat",
-	"noTasksFound": "Megszakítandó feladat nem található"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/tasks/browser/testQuickOpen.i18n.json b/i18n/hun/src/vs/workbench/parts/tasks/browser/testQuickOpen.i18n.json
deleted file mode 100644
index 52db1a193d3..00000000000
--- a/i18n/hun/src/vs/workbench/parts/tasks/browser/testQuickOpen.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"tasksAriaLabel": "Adja meg a tesztelési feladat nevét!",
-	"noTasksMatching": "Nincs ilyen feladat",
-	"noTasksFound": "Tesztelési feladat nem találhat"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json b/i18n/hun/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json
deleted file mode 100644
index 8012cefbb20..00000000000
--- a/i18n/hun/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json
+++ /dev/null
@@ -1,76 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"ProblemPatternParser.loopProperty.notLast": "A loop tulajdonság csak az utolsó, sorra illesztő kifejezésnél támogatott.",
-	"ProblemPatternParser.problemPattern.kindProperty.notFirst": "A problémaminta érvénytelen. A kind tulajdonságot csak az első elemnél kell megadni.",
-	"ProblemPatternParser.problemPattern.missingRegExp": "A problémamintából hiányzik egy reguláris kifejezés.",
-	"ProblemPatternParser.problemPattern.missingProperty": "A problémaminta érvénytelen. Legalább a fájlt és az üzenetet tartalmaznia kell.",
-	"ProblemPatternParser.problemPattern.missingLocation": "A problémaminta érvénytelen. A kind értéke \"file\" legyen vagy tartalmaznia kell egy sorra vagy helyszínre illeszkedő csoportot.",
-	"ProblemPatternParser.invalidRegexp": "Hiba: A(z) {0} karakterlánc nem érvényes reguláris kifejezés.\n",
-	"ProblemPatternSchema.regexp": "A kimenetben található hibák, figyelmeztetések és információk megkeresésére használt reguláris kifejezés.",
-	"ProblemPatternSchema.kind": "A minta egy helyre (fájlra és sorra) vagy csak egy fájlra illeszkedik.",
-	"ProblemPatternSchema.file": "Annak az illesztési csoportnak az indexe, amely tartalmazza azt, hogy a probléma melyik fájlban található. Ha nincs megadva, akkor az alapértelmezett érték, 1 van használva.",
-	"ProblemPatternSchema.location": "Annak az illesztési csoportnak az indexe, amely tartalmazza a probléma helyét. Az érvényes minták helyek illesztésére: (line), (line,column) és (startLine,startColumn,endLine,endColumn). Ha nincs megadva, akkor a (line,column) van feltételezve.",
-	"ProblemPatternSchema.line": "Annak az illesztési csoportnak az indexe, amely tartalmazza azt, hogy a probléma hanyadik sorban található. Alapértelmezett értéke 2.",
-	"ProblemPatternSchema.column": "Annak az illesztési csoportnak az indexe, amely tartalmazza azt, hogy a probléma az adott soron belül mely oszlopban található. Alapértelmezett értéke 3.",
-	"ProblemPatternSchema.endLine": "Annak az illesztési csoportnak az indexe, amely tartalmazza azt, hogy a probléma mely sorban ér véget. Alapértelmezett értéke határozatlan.",
-	"ProblemPatternSchema.endColumn": "Annak az illesztési csoportnak az indexe, amely tartalmazza azt, hogy a probléma  vége a zárósoron belül mely oszlopban található. Alapértelmezett értéke határozatlan.",
-	"ProblemPatternSchema.severity": "Annak az illesztési csoportnak az indexe, amely tartalmazza a probléma súlyosságát. Alapértelmezett értéke határozatlan.",
-	"ProblemPatternSchema.code": "Annak az illesztési csoportnak az indexe, amely tartalmazza a problémás kódrészletet. Alapértelmezett értéke határozatlan.",
-	"ProblemPatternSchema.message": "Annak az illesztési csoportnak az indexe, amely tartalmazza az üzenetet. Ha nincs megadva, és a location paraméternek van értéke, akkor a 4, minden más esetben 5 az alapértelmezett érték.",
-	"ProblemPatternSchema.loop": "Több soros illesztés esetén meghatározza, hogy az aktuális minta mindaddig végre legyen-e hajtva, amíg eredményt talál. Csak többsoros minta esetén használható, utolsóként.",
-	"NamedProblemPatternSchema.name": "A problémaminta neve.",
-	"NamedMultiLineProblemPatternSchema.name": "A többsoros problémaminta neve.",
-	"NamedMultiLineProblemPatternSchema.patterns": "A konkrét minkák.",
-	"ProblemPatternExtPoint": "Problémamintákat szolgáltat.",
-	"ProblemPatternRegistry.error": "Érvénytelen problémaminta. A minta figyelmen kívül lesz hagyva.",
-	"ProblemMatcherParser.noProblemMatcher": "Hiba: a leírást nem sikerült problémaillesztővé alakítani:\n{0}\n",
-	"ProblemMatcherParser.noProblemPattern": "Hiba: a leírás nem definiál érvényes problémamintát:\n{0}\n",
-	"ProblemMatcherParser.noOwner": "Hiba: a leírás nem határoz meg tulajdonost:\n{0}\n",
-	"ProblemMatcherParser.noFileLocation": "Hiba: a leírás nem határoz meg fájlhelyszínt:\n{0}\n",
-	"ProblemMatcherParser.unknownSeverity": "Információ: ismeretlen súlyosság: {0}. Az érvényes értékek: error, warning és info.\n",
-	"ProblemMatcherParser.noDefinedPatter": "Hiba: nem létezik {0} azonosítóval rendelkező minta.",
-	"ProblemMatcherParser.noIdentifier": "Hiba: a minta tulajdonság egy üres azonosítóra hivatkozik.",
-	"ProblemMatcherParser.noValidIdentifier": "Hiba: a minta {0} tulajdonsága nem érvényes mintaváltozónév.",
-	"ProblemMatcherParser.problemPattern.watchingMatcher": "A problémaillesztőnek definiálnia kell a kezdőmintát és a zárómintát is a figyeléshez.",
-	"ProblemMatcherParser.invalidRegexp": "Hiba: A(z) {0} karakterlánc nem érvényes reguláris kifejezés.\n",
-	"WatchingPatternSchema.regexp": "Reguláris kifejezés a háttérben futó feladat indulásának vagy befejeződésének detektálására.",
-	"WatchingPatternSchema.file": "Annak az illesztési csoportnak az indexe, amely tartalmazza azt, hogy a probléma melyik fájlban található. Elhagyható.",
-	"PatternTypeSchema.name": "Egy szolgáltatott vagy elődefiniált minta neve",
-	"PatternTypeSchema.description": "Egy problémaminta vagy egy szolgáltatott vagy elődefiniált problémaminta neve. Elhagyható, ha az alapként használandó minta meg van adva.",
-	"ProblemMatcherSchema.base": "A alapként használni kívánt problémaillesztő neve.",
-	"ProblemMatcherSchema.owner": "A probléma tulajdonosa a Code-on belül. Elhagyható, ha az alapként használt minta meg van adva. Alapértelmezett értéke 'external', ha nem létezik és az alapként használt minta nincs meghatározva.",
-	"ProblemMatcherSchema.source": "A diagnosztika forrásának emberek számára szánt leírása, pl. 'typescript' vagy 'super lint'.",
-	"ProblemMatcherSchema.severity": "Az elkapott problémák alapértelmezett súlyossága. Ez az érték van használva, ha a minta nem definiál illesztési csoportot a súlyossághoz.",
-	"ProblemMatcherSchema.applyTo": "Meghatározza, hogy a szöveges dokumentumhoz jelentett probléma megnyitott, bezárt vagy minden dokumentumra legyen alkalmazva.",
-	"ProblemMatcherSchema.fileLocation": "Meghatározza, hogy a problémamintában talált fájlnevek hogyan legyenek értelmezve.",
-	"ProblemMatcherSchema.background": "Minták, melyekkel követhető egy háttérben futó feladaton aktív illesztő indulása és befejeződése.",
-	"ProblemMatcherSchema.background.activeOnStart": "Ha értéke igaz, akkor a háttérfeladat aktív módban van, amikor a feladat indul. Ez egyenlő egy olyan sor kimenetre történő kiírásával, ami illeszkedik a beginPatternre.",
-	"ProblemMatcherSchema.background.beginsPattern": "Ha illeszkedik a kimenetre, akkor a háttérben futó feladat elindulása lesz jelezve.",
-	"ProblemMatcherSchema.background.endsPattern": "Ha illeszkedik a kimenetre, akkor a háttérben futó feladat befejeződése lesz jelezve.",
-	"ProblemMatcherSchema.watching.deprecated": "A watching tulajdonság elavult. Használja a backgroundot helyette.",
-	"ProblemMatcherSchema.watching": "Minták, melyekkel következő a figyelő illesztők indulása és befejeződése.",
-	"ProblemMatcherSchema.watching.activeOnStart": "Ha értéke igaz, akkor a figyelő aktív módban van, amikor a feladat indul. Ez egyenlő egy olyan sor kimenetre történő kiírásával, ami illeszkedik a beginPatternre.",
-	"ProblemMatcherSchema.watching.beginsPattern": "Ha illeszkedik a kimenetre, akkor a figyelő feladat elindulása lesz jelezve.",
-	"ProblemMatcherSchema.watching.endsPattern": "Ha illeszkedik a kimenetre, akkor a figyelő feladat befejeződése lesz jelezve.",
-	"LegacyProblemMatcherSchema.watchedBegin.deprecated": "Ez a tulajdonság elavult. Használja a watching tulajdonságot helyette.",
-	"LegacyProblemMatcherSchema.watchedBegin": "Reguláris kifejezés, mely jelzi, hogy a figyeltő feladatok fájlmódosítás miatt éppen műveletet hajtanak végre.",
-	"LegacyProblemMatcherSchema.watchedEnd.deprecated": "Ez a tulajdonság elavult. Használja a watching tulajdonságot helyette.",
-	"LegacyProblemMatcherSchema.watchedEnd": "Reguláros kifejezés, ami jelzi, hogy a figyelő feladat befejezte a végrehajtást.",
-	"NamedProblemMatcherSchema.name": "A problémaillesztő neve, amivel hivatkozni lehet rá.",
-	"NamedProblemMatcherSchema.label": "A problémaillesztő leírása emberek számára.",
-	"ProblemMatcherExtPoint": "Problémaillesztőket szolgáltat.",
-	"msCompile": "Microsoft fordítói problémák",
-	"lessCompile": "Less-problémák",
-	"gulp-tsc": "Gulp TSC-problémák",
-	"jshint": "JSHint-problémák",
-	"jshint-stylish": "JSHint stylish-problémák",
-	"eslint-compact": "ESLint compact-problémák",
-	"eslint-stylish": "ESLint stylish-problémák",
-	"go": "Go-problémák"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/tasks/common/taskConfiguration.i18n.json b/i18n/hun/src/vs/workbench/parts/tasks/common/taskConfiguration.i18n.json
deleted file mode 100644
index b798f4ca94f..00000000000
--- a/i18n/hun/src/vs/workbench/parts/tasks/common/taskConfiguration.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"ConfigurationParser.invalidCWD": "Figyelmeztetés: az options.cwd értékének string típusúnak kell lennie. A következő érték figyelmen kívül van hagyva: {0}.",
-	"ConfigurationParser.noargs": "Hiba: a parancssori argumentumokat string típusú tömbként kell megadni. A megadott érték:\n{0}",
-	"ConfigurationParser.noShell": "Figyelmeztetés: a shellkonfiguráció csak akkor támogatott, ha a feladat a terminálban van végrehajtva.",
-	"ConfigurationParser.noName": "Hiba: a deklarációs hatókörben lévő problémailleszőnek kötelező nevet adni:\n{0}\n",
-	"ConfigurationParser.unknownMatcherKind": "Figyelem: a megadott problémaillesztő ismeretlen. A támogatott típusok: string | ProblemMatcher | (string | ProblemMatcher)[].\n{0}\n",
-	"ConfigurationParser.invalidVaraibleReference": "Hiba: érvénytelen problemMatcher-referencia: {0}\n",
-	"ConfigurationParser.noTaskName": "Hiba: a feladathoz meg kell adni a taskName tulajdonságot. A feladat figyelmen kívül lesz hagyva.\n{0}\n",
-	"taskConfiguration.shellArgs": "Figyelmeztetés: a(z) '{0}' feladat egy rendszerparancs, és vagy a parancs nevében vagy az argumentumok egyikében escape nélküli szóköz található. A megfelelő idézőjelezés érdekében olvassza bele az argumentumokat a parancsba.",
-	"taskConfiguration.noCommandOrDependsOn": "Hiba: a(z) '{0}' feladat nem ad meg parancsot, és nem definiálja a dependsOn tulajdonságot sem. A feladat figyelmen kívül lesz hagyva. A definíciója:\n{1}",
-	"taskConfiguration.noCommand": "Hiba: a(z) '{0}' feladathoz nincs definiálva a parancs. A feladat figyelmen kívül lesz hagyva. A definíciója:\n{1}"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/tasks/common/taskDefinitionRegistry.i18n.json b/i18n/hun/src/vs/workbench/parts/tasks/common/taskDefinitionRegistry.i18n.json
deleted file mode 100644
index c61ab35d02f..00000000000
--- a/i18n/hun/src/vs/workbench/parts/tasks/common/taskDefinitionRegistry.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"TaskDefinition.description": "A feladat tényleges típusa. Megjegyzés: a „$” karakterrel kezdődő feladattípusok belső használatra vannak fenntartva.",
-	"TaskDefinition.properties": "A feladattípus további tulajdonságai",
-	"TaskTypeConfiguration.noType": "A feladattípus-konfigurációból hiányzik a kötelező 'taskType' tulajdonság",
-	"TaskDefinitionExtPoint": "Feladattípusokat szolgáltat"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/tasks/common/taskTemplates.i18n.json b/i18n/hun/src/vs/workbench/parts/tasks/common/taskTemplates.i18n.json
deleted file mode 100644
index 60c5b252872..00000000000
--- a/i18n/hun/src/vs/workbench/parts/tasks/common/taskTemplates.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"dotnetCore": "Végrehajt egy .NET Core buildelési parancsot",
-	"msbuild": "Végrehajtja a buildelés célpontját",
-	"externalCommand": "Példa egy tetszőleges külső parancs futtatására",
-	"Maven": "Általános maven parancsokat hajt végre"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/tasks/common/taskTypeRegistry.i18n.json b/i18n/hun/src/vs/workbench/parts/tasks/common/taskTypeRegistry.i18n.json
deleted file mode 100644
index 8b6ad71cd4e..00000000000
--- a/i18n/hun/src/vs/workbench/parts/tasks/common/taskTypeRegistry.i18n.json
+++ /dev/null
@@ -1,6 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/tasks/electron-browser/jsonSchemaCommon.i18n.json b/i18n/hun/src/vs/workbench/parts/tasks/electron-browser/jsonSchemaCommon.i18n.json
deleted file mode 100644
index a08800b8ccc..00000000000
--- a/i18n/hun/src/vs/workbench/parts/tasks/electron-browser/jsonSchemaCommon.i18n.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"JsonSchema.options": "További parancsbeálíltások",
-	"JsonSchema.options.cwd": "A végrehajtott program vagy parancsfájl munkakönyvtára. Ha nincs megadva, akkor a Code aktuális munkaterületének gyökérkönyvtára van használva.",
-	"JsonSchema.options.env": "A végrehajtott parancs vagy shell környezete. Ha nincs megadva, akkor a szülőfolyamat környezete van használva.",
-	"JsonSchema.shellConfiguration": "Meghatározza a használt shellt.",
-	"JsonSchema.shell.executable": "A használt shell.",
-	"JsonSchema.shell.args": "Shellargumentumok.",
-	"JsonSchema.command": "A végrehajtandó parancs. Lehet egy külső parancs vagy egy rendszerparancs.",
-	"JsonSchema.tasks.args": "A parancs meghívásakor átadott argumentumok.",
-	"JsonSchema.tasks.taskName": "A feladat neve.",
-	"JsonSchema.tasks.windows": "Windows-specifikus parancskonfiguráció",
-	"JsonSchema.tasks.mac": "Mac-specifikus parancskonfiguráció",
-	"JsonSchema.tasks.linux": "Linux-specifikus parancskonfiguráció",
-	"JsonSchema.tasks.suppressTaskName": "Meghatározza, hogy a feladat neve hozzá van adva argumentumként a parancshoz. Ha nincs megadva, akkor a globálisan meghatározot érték van használva.",
-	"JsonSchema.tasks.showOutput": "Meghatározza, hogy a futó feladat kimenete meg van-e jelenítve, vagy sem. Ha nincs megadva, akkor a globálisan meghatározot érték van használva.",
-	"JsonSchema.echoCommand": "Meghatározza, hogy a végrehajtott parancs ki van-e írva a kimenetre. Alapértelmezett értéke hamis.",
-	"JsonSchema.tasks.watching.deprecation": "Elavult. Használja helyette az isBackground beállítást.",
-	"JsonSchema.tasks.watching": "A feladat folyamatosan fut-e és figyeli-e a fájlrendszert.",
-	"JsonSchema.tasks.background": "A feladat folyamatosan fut-e és a háttérben fut-e.",
-	"JsonSchema.tasks.promptOnClose": "A felhasználó figyelmeztetve van-e, ha a VS Code egy futó feladat közben záródik be.",
-	"JsonSchema.tasks.build": "A parancsot a Code alapértelmezett buildelési parancsához rendeli.",
-	"JsonSchema.tasks.test": "A parancsot a Code alapértelmezett tesztelési parancsához rendeli.",
-	"JsonSchema.tasks.matchers": "A használt problémaillesztők. Lehet karakterlánc, problémaillesztő, vagy egy tömb, ami karakterláncokat és problémaillesztőket tartalmaz.",
-	"JsonSchema.args": "A parancsnak átadott további argumentumok.",
-	"JsonSchema.showOutput": "Meghatározza, hogy a futó feladat kimenete megjelenjen-e vagy sem. Ha nincs megadva, az 'always' érték van használva.",
-	"JsonSchema.watching.deprecation": "Elavult. Használja helyette az isBackground beállítást.",
-	"JsonSchema.watching": "A feladat folyamatosan fut-e és figyeli-e a fájlrendszert.",
-	"JsonSchema.background": "A feladat folyamatosan fut-e és a háttérben fut-e.",
-	"JsonSchema.promptOnClose": "A felhasználó figyelmeztetve van-e, ha a VS Code egy háttérben futó feladat közben záródik be.",
-	"JsonSchema.suppressTaskName": "Meghatározza, hogy a feladat neve hozzá van adva argumentumként a parancshoz. Alapértelmezett értéke hamis.",
-	"JsonSchema.taskSelector": "Előtag, ami jelzi, hogy az argumentum a feladat.",
-	"JsonSchema.matchers": "A használt problémaillesztők. Lehet karakterlánc, problémaillesztő, vagy egy tömb, ami karakterláncokat és problémaillesztőket tartalmaz.",
-	"JsonSchema.tasks": "Feladatkonfigurációk. Általában egy külső feladatfuttató rendszerben definiált feladatok kiegészítő beállításokkal ellátott változatai."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v1.i18n.json b/i18n/hun/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v1.i18n.json
deleted file mode 100644
index ce8c9efb171..00000000000
--- a/i18n/hun/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v1.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"JsonSchema.version": "A konfiguráció verziószáma",
-	"JsonSchema._runner": "A futtató kikerült a kísérleti állapotból. Használja a hivatalos runner tulajdonságot!",
-	"JsonSchema.runner": "Meghatározza, hogy a feladat folyamatként van-e végrehajtva, és a kimenet a kimeneti ablakban jelenjen-e meg, vagy a terminálban.",
-	"JsonSchema.windows": "Windows-specifikus parancskonfiguráció",
-	"JsonSchema.mac": "Mac-specifikus parancskonfiguráció",
-	"JsonSchema.linux": "Linux-specifikus parancskonfiguráció",
-	"JsonSchema.shell": "Meghatározza, hogy a parancs egy rendszerparancs vagy egy külső program. Alapértelmezett értéke hamis, ha nincs megadva."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json b/i18n/hun/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
deleted file mode 100644
index 25b373020cb..00000000000
--- a/i18n/hun/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"JsonSchema.shell": "Meghatározza, hogy a parancs egy rendszerparancs vagy egy külső program. Alapértelmezett értéke hamis, ha nincs megadva.",
-	"JsonSchema.tasks.isShellCommand.deprecated": "Az isShellCommand tulajdonság elavult. Használja helyette a feladat type tulajdonságát és a shell tulajdonságot a beállításoknál. További információt az 1.14-es verzió kiadási jegyzékében talál.",
-	"JsonSchema.tasks.dependsOn.string": "Egy másik feladat, amitől ez a feladat függ.",
-	"JsonSchema.tasks.dependsOn.array": "Más feladatok, amiktől ez a feladat függ.",
-	"JsonSchema.tasks.presentation": "A feladat kimenetének megjelenítésére és adatbevitelére használt panelt konfigurálja.",
-	"JsonSchema.tasks.presentation.echo": "Meghatározza, hogy a végrehajtott parancs ki van-e írva a terminálban. Alapértelmezett értéke true.",
-	"JsonSchema.tasks.presentation.focus": "Meghatározza, hogy a panel fókuszt kap-e. Az alapértelmezett értéke true. Ha true-ra van állítva, akkor a panel fel is lesz fedve.",
-	"JsonSchema.tasks.presentation.reveal.always": "A feladat végrehajtásakor mindig legyen felfedve a terminál.",
-	"JsonSchema.tasks.presentation.reveal.silent": "Csak akkor legyen felfedve a terminál, ha nincs problémaillesztő társítva a feladathoz, és probléma történik a végrehajtás során.",
-	"JsonSchema.tasks.presentation.reveal.never": "Soha ne legyen felfedve a terminál a feladat végrehajtása során.",
-	"JsonSchema.tasks.presentation.reveals": "Meghatározza, hogy a feladatot futtató panel fel van-e fedve vagy sem. Alapértelmezett értéke \"always\".",
-	"JsonSchema.tasks.presentation.instance": "Meghatározza, hogy a panel meg van-e osztva a feladatok között, ennek a feladatnak van-e dedikálva, vagy új készül minden egyes futtatás során.",
-	"JsonSchema.tasks.terminal": "A terminal tulajdonság elavult. Használja helyette a presentation tulajdonságot!",
-	"JsonSchema.tasks.group.kind": "A feladat végrehajtási csoportja.",
-	"JsonSchema.tasks.group.isDefault": "Meghatározza, hogy ez a feladat egy elsődleges feladat-e a csoportban.",
-	"JsonSchema.tasks.group.defaultBuild": "A feladatot az alapértelmezett buildelési feladatnak jelöli meg.",
-	"JsonSchema.tasks.group.defaultTest": "A feladatot az alapértelmezett tesztelési feladatnak jelöli meg.",
-	"JsonSchema.tasks.group.build": "A feladatot a 'Buildelési feladat futtatása' parancson keresztül elérhető buildelési feladatnak jelöli meg.",
-	"JsonSchema.tasks.group.test": "A feladatot a 'Tesztelési feladat futtatása' parancson keresztül elérhető tesztelési feladatnak jelöli meg.",
-	"JsonSchema.tasks.group.none": "A feladatot egyetlen csoporthoz sem rendeli",
-	"JsonSchema.tasks.group": "Meghatározza a feladat végrehajtási csoportját. A \"build\" esetén a buildelési csoportba, a \"test\" esetén a tesztelési csoportba kerül bele a feladat.",
-	"JsonSchema.tasks.type": "Meghatározza, hogy a feladat folyamatként van-e végrehajtva vagy egy parancsként a shellben.",
-	"JsonSchema.commandArray": "A végrehajtandó shell-parancs. A tömb elemei szóközzel elválasztva lesznek egymás után fűzve.",
-	"JsonSchema.command.quotedString.value": "A parancs tényleges értéke",
-	"JsonSchema.tasks.quoting.escape": "A karaktereket a shell saját feloldókarakterével oldja fel (pl. PowerShell alatt a `, míg bash alatt a \\ karakterrel).",
-	"JsonSchema.tasks.quoting.strong": "Az argumentumot a shell erős idézőjel-karakterével veszi körül (pl. PowerShell és bash alatt a \" karakterrel). ",
-	"JsonSchema.tasks.quoting.weak": "Az argumentumot a shell erős idézőjel-karakterével veszi körül (pl. PowerShell és bash alatt a ' karakterrel). ",
-	"JsonSchema.command.quotesString.quote": "Hogyan legyen idézőjelezve a parancs értéke.",
-	"JsonSchema.command": "A végrehajtandó parancs. Lehet egy külső parancs vagy egy rendszerparancs.",
-	"JsonSchema.args.quotedString.value": "Az argumentum tényleges értéke",
-	"JsonSchema.args.quotesString.quote": "Hogyan legyen idézőjelezve az argumentum értéke.",
-	"JsonSchema.tasks.args": "A parancs meghívásakor átadott argumentumok.",
-	"JsonSchema.tasks.label": "A feladat felhasználói felületen megjelenő neve",
-	"JsonSchema.version": "A konfiguráció verziószáma",
-	"JsonSchema.tasks.identifier": "A feladat felhasználó által definiált azonosítója, amivel hivatkozni lehet a feladatra a lauch.json-ban vagy egy dependsOn-utasításban.",
-	"JsonSchema.tasks.taskLabel": "A feladat címkéje",
-	"JsonSchema.tasks.taskName": "A feladat neve.",
-	"JsonSchema.tasks.taskName.deprecated": "A feladat name tulajdonsága elavult. Használja a label tulajdonságot helyette!",
-	"JsonSchema.tasks.background": "A feladat folyamatosan fut-e és a háttérben fut-e.",
-	"JsonSchema.tasks.promptOnClose": "A felhasználó figyelmeztetve van-e, ha a VS Code egy futó feladat közben záródik be.",
-	"JsonSchema.tasks.matchers": "A használt problémaillesztők. Lehet karakterlánc, problémaillesztő, vagy egy tömb, ami karakterláncokat és problémaillesztőket tartalmaz.",
-	"JsonSchema.customizations.customizes.type": "Az egyedi konfigurációhoz használt feladattípus",
-	"JsonSchema.tasks.customize.deprecated": "A customize tulajdonság elavult. A feladat egyedi konfigurálásának új megközelítésével kapcsolatban további információt az 1.14-es verzió kiadási jegyzékében talál.",
-	"JsonSchema.tasks.showOputput.deprecated": "A showOutput tulajdonság elavult. Használja helyette a presentation tulajdonságon belül a reveal tulajdonságot! További információt az 1.14-es verzió kiadási jegyzékében talál.",
-	"JsonSchema.tasks.echoCommand.deprecated": "Az echoCommand tulajdonság elavult. Használja helyette a presentation tulajdonságon belül az echo tulajdonságot! További információt az 1.14-es verzió kiadási jegyzékében talál.",
-	"JsonSchema.tasks.suppressTaskName.deprecated": "Az suppressTaskName tulajdonság elavult. Helyette olvassza be a parancsot az argumentumaival együtt a feladatba! További információt az 1.14-es verzió kiadási jegyzékében talál.",
-	"JsonSchema.tasks.isBuildCommand.deprecated": "Az isBuildCommand tulajdonság elavult. Használja helyette a group tulajdonságot! További információt az 1.14-es verzió kiadási jegyzékében talál.",
-	"JsonSchema.tasks.isTestCommand.deprecated": "Az isTestCommand tulajdonság elavult. Használja helyette a group tulajdonságot! További információt az 1.14-es verzió kiadási jegyzékében talál.",
-	"JsonSchema.tasks.taskSelector.deprecated": "A taskSelector tulajdonság elavult. Helyette olvassza be a parancsot az argumentumaival együtt a feladatba! További információt az 1.14-es verzió kiadási jegyzékében talál.",
-	"JsonSchema.windows": "Windows-specifikus parancskonfiguráció",
-	"JsonSchema.mac": "Mac-specifikus parancskonfiguráció",
-	"JsonSchema.linux": "Linux-specifikus parancskonfiguráció"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json b/i18n/hun/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
deleted file mode 100644
index f91b0b4ec32..00000000000
--- a/i18n/hun/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
+++ /dev/null
@@ -1,89 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"tasksCategory": "Feladatok",
-	"ConfigureTaskRunnerAction.label": "Feladat beállítása",
-	"totalErrors": "{0} hiba",
-	"totalWarnings": "{0} figyelmeztetés",
-	"totalInfos": "{0} információ",
-	"problems": "Problémák",
-	"building": "Buildelés...",
-	"manyProblems": "10k+",
-	"runningTasks": "Futó feladatok megjelenítése",
-	"tasks": "Feladatok",
-	"TaskSystem.noHotSwap": "A feladatvégrehajtó motor megváltoztatása egy futó, aktív feladat esetén az ablak újraindítását igényli.",
-	"reloadWindow": "Ablak újratöltése",
-	"TaskServer.folderIgnored": "A(z) {0} mappa figyelmen kívül van hagyva, mert 0.1.0-s verziójú feladatkonfigurációt használ.",
-	"TaskService.noBuildTask1": "Nincs buildelési feladat definiálva. Jelöljön meg egy feladatot az 'isBuildCommand' tulajdonsággal a tasks.json fájlban!",
-	"TaskService.noBuildTask2": "Nincs buildelési feladat definiálva. Jelöljön meg egy feladatot a 'build' csoporttal a tasks.json fájlban!",
-	"TaskService.noTestTask1": "Nincs tesztelési feladat definiálva. Jelöljön meg egy feladatot az 'isTestCommand' tulajdonsággal a tasks.json fájlban!",
-	"TaskService.noTestTask2": "Nincs tesztelési feladat definiálva. Jelöljön meg egy feladatot a 'test' csoporttal a tasks.json fájlban!",
-	"TaskServer.noTask": "A futtatni kívánt feladat ({0}) nem található.",
-	"TaskService.associate": "társítás",
-	"TaskService.attachProblemMatcher.continueWithout": "Folytatás a feladat kimenetének átkutatása nélkül",
-	"TaskService.attachProblemMatcher.never": "Soha ne kutassa át a feladat kimenetét",
-	"TaskService.attachProblemMatcher.learnMoreAbout": "További információk a feladat kimenetének átkutatásáról",
-	"selectProblemMatcher": "Válassza ki, milyen típusú hibák és figyelmeztetések legyenek keresve a feladat kimenetében!",
-	"customizeParseErrors": "A jelenlegi feladatkonfigurációban hibák vannak. Feladat egyedivé tétele előtt javítsa a hibákat!",
-	"moreThanOneBuildTask": "Túl sok buildelési feladat van definiálva a tasks.json-ban. Az első lesz végrehajtva.\n",
-	"TaskSystem.activeSame.background": "A(z) '{0}' azonosítójú feladat már aktiválva van és a háttérben fut.",
-	"TaskSystem.activeSame.noBackground": "A(z) '{0}' azonosítójú feladat már aktiválva van.",
-	"terminateTask": "Feladat megszakítása",
-	"restartTask": "Feladat újraindítása",
-	"TaskSystem.active": "Már fut egy feladat. Szakítsa meg, mielőtt egy másik feladatot futtatna.",
-	"TaskSystem.restartFailed": "Nem sikerült a(z) {0} feladat befejezése és újraindítása.",
-	"TaskService.noConfiguration": "Hiba: a(z) {0} feladatok felderítése nem szolgáltatott feladatot a következő konfigurációhoz:\n{1}\nA feladat figyelmen kívül lesz hagyva.\n",
-	"TaskSystem.configurationErrors": "Hiba: a megadott feladatkonfigurációban validációs hibák vannak, és nem használható. Először javítsa ezeket a hibákat!",
-	"taskService.ignoreingFolder": "Feladatkonfiguráció figyelmen kívül hagyva a munkaterület {0} nevű mappája esetében. Több mappás munkaterületen a feladatok támogatásához az összes mappának a 2.0-s verziójú feladatkonfigurációt kell használni.\n",
-	"TaskSystem.invalidTaskJson": "Hiba. A tasks.json fájlban szintaktikai hibák találhatók. Javítsa ezeket a hibákat feladatvégrehajtás előtt.\n",
-	"TaskSystem.runningTask": "Már fut egy feladat. Szeretné megszakítani?",
-	"TaskSystem.terminateTask": "Felada&&t megszakítása",
-	"TaskSystem.noProcess": "Az elindított feladat már nem létezik. Ha a feladat egy háttérfolyamatot indított, a VS Code-ból való kilépés árva folyamatokat eredményezhet. Ennek megakadályozása érdekében indítsa el a legutóbbi háttérfolyamatot a wait kapcsolóval!",
-	"TaskSystem.exitAnyways": "Kilépés mind&&enképp",
-	"TerminateAction.label": "Feladat megszakítása",
-	"TaskSystem.unknownError": "Hiba történt a feladat futtatása közben. További részletek a feladatnaplóban.",
-	"TaskService.noWorkspace": "A feladatok csak egy munkaterület mappájára vonatkozóan érhetők el.",
-	"recentlyUsed": "legutóbb futtatott feladatok",
-	"configured": "konfigurált feladatok",
-	"detected": "talált feladatok",
-	"TaskService.ignoredFolder": "A következő munkaterületi mappák figyelmen kívül vannak hagyva, mert 0.1.0-s verziójú feladatkonfigurációt használnak: {0}",
-	"TaskService.notAgain": "Ne jelenítse meg újra",
-	"TaskService.pickRunTask": "Válassza ki a futtatandó feladatot!",
-	"TaslService.noEntryToRun": "Nincs futtatandó feladat. Feladatok konfigurálása...",
-	"TaskService.fetchingBuildTasks": "Buildelési feladatok lekérése...",
-	"TaskService.pickBuildTask": "Válassza ki a futtatandó buildelési feladatot!",
-	"TaskService.noBuildTask": "Nincs futtatandó buildelési feladat. Buildelési feladatok konfigurálása...",
-	"TaskService.fetchingTestTasks": "Tesztelési feladatok lekérése...",
-	"TaskService.pickTestTask": "Válassza ki a futtatandó tesztelési feladatot",
-	"TaskService.noTestTaskTerminal": "Nincs futtatandó tesztelési feladat. Feladatok konfigurálása...",
-	"TaskService.tastToTerminate": "Válassza ki a megszakítandó feladatot!",
-	"TaskService.noTaskRunning": "Jelenleg nem fut feladat",
-	"TerminateAction.noProcess": "Az elindított folyamat már nem létezik. Ha a feladat háttérfeladatokat indított, a VS Code-ból való kilépés árva folyamatokat eredményezhet. ",
-	"TerminateAction.failed": "Nem sikerült megszakítani a futó feladatot",
-	"TaskService.tastToRestart": "Válassza ki az újraindítandó feladatot!",
-	"TaskService.noTaskToRestart": "Nincs újraindítható feladat",
-	"TaskService.template": "Válasszon feladatsablont!",
-	"TaskService.createJsonFile": "Tasks.json fájl létrehozása sablon alapján",
-	"TaskService.openJsonFile": "Tasks.json-fájl megnyitása",
-	"TaskService.pickTask": "Válassza ki a konfigurálandó feladatot!",
-	"TaskService.defaultBuildTaskExists": "A(z) {0} már meg van jelölve alapértelmezett buildelési feladatnak",
-	"TaskService.pickDefaultBuildTask": "Válassza ki az alpértelmezett buildelési feladatként használt feladatot!",
-	"TaskService.defaultTestTaskExists": "A(z) {0} már meg van jelölve alapértelmezett tesztelési feladatként.",
-	"TaskService.pickDefaultTestTask": "Válassza ki az alpértelmezett tesztelési feladatként használt feladatot!",
-	"TaskService.pickShowTask": "Válassza ki a feladatot a kimenet megjelenítéséhez!",
-	"TaskService.noTaskIsRunning": "Nem fut feladat",
-	"ShowLogAction.label": "Feladatnapló megtekintése",
-	"RunTaskAction.label": "Feladat futtatása",
-	"RestartTaskAction.label": "Futó feladat újraindítása...",
-	"ShowTasksAction.label": "Futó feladatok megjelenítése",
-	"BuildAction.label": "Buildelési feladat futtatása",
-	"TestAction.label": "Tesztelési feladat futtatása",
-	"ConfigureDefaultBuildTask.label": "Alapértelmezett buildelési feladat beállítása",
-	"ConfigureDefaultTestTask.label": "Alapértelmezett tesztelési feladat beállítása",
-	"quickOpen.task": "Feladat futtatása"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/tasks/electron-browser/taskPanel.i18n.json b/i18n/hun/src/vs/workbench/parts/tasks/electron-browser/taskPanel.i18n.json
deleted file mode 100644
index 976a047743c..00000000000
--- a/i18n/hun/src/vs/workbench/parts/tasks/electron-browser/taskPanel.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"tasks": "Feladatok"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.i18n.json b/i18n/hun/src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.i18n.json
deleted file mode 100644
index a4201e0c7e7..00000000000
--- a/i18n/hun/src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"TerminalTaskSystem.unknownError": "Ismeretlen hiba történt a feladat végrehajtása közben. Részletek a feladat kimeneti naplójában találhatók.",
-	"dependencyFailed": "Nem sikerült feloldani a(z) '{0}' függő feladatot a(z) '{1}' munkaterületi mappában",
-	"TerminalTaskSystem.terminalName": "Feladat – {0}",
-	"closeTerminal": "A folytatáshoz nyomjon meg egy billentyűt.",
-	"reuseTerminal": "A terminál fel lesz használva egy másik feladathoz. A bezáráshoz nyomjon meg egy billentyűt!",
-	"TerminalTaskSystem": "Rendszerparancsok nem hajthatók végre UNC-meghajtókon a cmd.exe használata esetén.",
-	"unkownProblemMatcher": "A(z) {0} problémaillesztő nem található. Az illesztő figyelmen kívül lesz hagyva."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/tasks/node/processRunnerDetector.i18n.json b/i18n/hun/src/vs/workbench/parts/tasks/node/processRunnerDetector.i18n.json
deleted file mode 100644
index 9021650b830..00000000000
--- a/i18n/hun/src/vs/workbench/parts/tasks/node/processRunnerDetector.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"TaskSystemDetector.noGulpTasks": "A gulp --tasks-simple futtatása nem listázott egyetlen feladatot sem. Futtatta az npm install parancsot?",
-	"TaskSystemDetector.noJakeTasks": "A jake --tasks futtatása nem listázott egyetlen feladatot sem. Futtatta az npm install parancsot?",
-	"TaskSystemDetector.noGulpProgram": "A Gulp nincs telepítve a rendszerre. Futtassa az npm install -g gulp parancsot a telepítéshez!",
-	"TaskSystemDetector.noJakeProgram": "A Jake nincs telepítve a rendszerre. Futtassa az npm install -g jake parancsot a telepítéshez!",
-	"TaskSystemDetector.noGruntProgram": "A Grunt nincs telepítve a rendszerre. Futtassa az npm install -g grunt parancsot a telepítéshez!",
-	"TaskSystemDetector.noProgram": "Az) {0} program nem található. Az üzenet: {1}",
-	"TaskSystemDetector.buildTaskDetected": "Felderítésre került a következő buildelési feladat: '{0}'.",
-	"TaskSystemDetector.testTaskDetected": "Felderítésre került a következő tesztelési feladat: '{0}'. "
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/tasks/node/processTaskSystem.i18n.json b/i18n/hun/src/vs/workbench/parts/tasks/node/processTaskSystem.i18n.json
deleted file mode 100644
index ea498a579ca..00000000000
--- a/i18n/hun/src/vs/workbench/parts/tasks/node/processTaskSystem.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"TaskRunnerSystem.unknownError": "Ismeretlen hiba történt a feladat végrehajtása közben. Részletek a kimeneti naplóban találhatók.",
-	"TaskRunnerSystem.watchingBuildTaskFinished": "A figyelő buildelési feladat befejeződött.",
-	"TaskRunnerSystem.childProcessError": "Nem sikerült elindítani a külső programot: {0} {1}.",
-	"TaskRunnerSystem.cancelRequested": "Az) '{0}' feladat a felhasználó kérésére lett megszakítva.",
-	"unkownProblemMatcher": "A(z) {0} problémaillesztőt nem lehet feloldani. Az illesztő figyelmen kívül lesz hagyva."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json b/i18n/hun/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
deleted file mode 100644
index fc54f4c27dc..00000000000
--- a/i18n/hun/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"ConfigurationParser.invalidCWD": "Figyelmeztetés: az options.cwd értékének string típusúnak kell lennie. A következő érték figyelmen kívül van hagyva: {0}.",
-	"ConfigurationParser.inValidArg": "Hiba: a parancssori argumentum egy string vagy egy idézőjeles string lehet. A megadott érték:\n{0}",
-	"ConfigurationParser.noargs": "Hiba: a parancssori argumentumokat string típusú tömbként kell megadni. A megadott érték:\n{0}",
-	"ConfigurationParser.noShell": "Figyelmeztetés: a shellkonfiguráció csak akkor támogatott, ha a feladat a terminálban van végrehajtva.",
-	"ConfigurationParser.noName": "Hiba: a deklarációs hatókörben lévő problémailleszőnek kötelező nevet adni:\n{0}\n",
-	"ConfigurationParser.unknownMatcherKind": "Figyelem: a megadott problémaillesztő ismeretlen. A támogatott típusok: string | ProblemMatcher | (string | ProblemMatcher)[].\n{0}\n",
-	"ConfigurationParser.invalidVaraibleReference": "Hiba: érvénytelen problemMatcher-referencia: {0}\n",
-	"ConfigurationParser.noTaskType": "Hiba: a feladatkonfigurációnak rendelkeznie kell type tulajdonsággal. A konfiguráció figyelmen kívül lesz hagyva.\n{0}\n",
-	"ConfigurationParser.noTypeDefinition": "Hiba: nincs '{0}' azonosítójú feladattípus regisztrálva. Elfelejtett telepíteni egy kiegészítőt, ami a feladat szolgáltatásáért felelős?",
-	"ConfigurationParser.missingRequiredProperty": "Hiba: a(z) '{0}' feladatkonfigurációból hiányzik a kötelező '{1}' tulajdonság. A feladatkonfiguráció figyelmen kívül lesz hagyva.",
-	"ConfigurationParser.notCustom": "Hiba: a feladat nem egyedi feladatként van definiálva. A konfiguráció figyelmen kívül lesz hagyva.\n{0}\n",
-	"ConfigurationParser.noTaskName": "Hiba: a feladatnak rendelkeznie kell adni taskName tulajdonsággal. A feladat figyelmen kívül lesz hagyva.\n{0}\n",
-	"taskConfiguration.noCommandOrDependsOn": "Hiba: a(z) '{0}' feladat nem ad meg parancsot, és nem definiálja a dependsOn tulajdonságot sem. A feladat figyelmen kívül lesz hagyva. A definíciója:\n{1}",
-	"taskConfiguration.noCommand": "Hiba: a(z) '{0}' feladathoz nincs definiálva a parancs. A feladat figyelmen kívül lesz hagyva. A definíciója:\n{1}",
-	"TaskParse.noOsSpecificGlobalTasks": "A feladatok 2.0.0-s verziója nem támogatja a globális, operációs rendszer-specifikus feladatokat. Alakítsa át őket operációs rendszer-specifikus parancsot tartalmazó feladattá. Az érintett feladatok:\n{0}"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.i18n.json b/i18n/hun/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.i18n.json
deleted file mode 100644
index 2b1d782eb21..00000000000
--- a/i18n/hun/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"termEntryAriaLabel": "{0}, terminálválasztó",
-	"termCreateEntryAriaLabel": "{0}, új terminál létrehozása",
-	"workbench.action.terminal.newplus": "$(plus) Új integrált terminál létrehozása",
-	"noTerminalsMatching": "Nincs ilyen terminál",
-	"noTerminalsFound": "Nincs megnyitott terminál"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/terminal/common/terminalColorRegistry.i18n.json b/i18n/hun/src/vs/workbench/parts/terminal/common/terminalColorRegistry.i18n.json
deleted file mode 100644
index e68d7791167..00000000000
--- a/i18n/hun/src/vs/workbench/parts/terminal/common/terminalColorRegistry.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"terminal.background": "A terminál háttérszíne. Ez lehetővé teszi a terminál paneltől eltérő színezését.",
-	"terminal.foreground": "A terminál előtérszíne.",
-	"terminalCursor.foreground": "A terminál kurzorának előtérszíne.",
-	"terminalCursor.background": "A terminál kurzorának háttérszíne. Lehetővé teszik az olyan karakterek színének módosítását, amelyek fölött egy blokk-típusú kurzor áll.",
-	"terminal.selectionBackground": "A terminálban kijelölt tartalom háttérszíne.",
-	"terminal.border": "A terminálokat elválasztó keret színe. Alapértelmezett értéke megegyezik a panel.border értékével.",
-	"terminal.ansiColor": "'{0}' ANSI-szín a terminálban."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json b/i18n/hun/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
deleted file mode 100644
index 8ec8f827057..00000000000
--- a/i18n/hun/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"quickOpen.terminal": "Összes megnyitott terminál megjelenítése",
-	"terminal": "Terminál",
-	"terminalIntegratedConfigurationTitle": "Beépített terminál",
-	"terminal.integrated.shell.linux": "A terminál által használt shell elérési útja Linuxon.",
-	"terminal.integrated.shellArgs.linux": "Linux-terminál esetén használt parancssori argumentumok.",
-	"terminal.integrated.shell.osx": "A terminál által használt shell elérési útja OS X-en.",
-	"terminal.integrated.shellArgs.osx": "OS X-terminál esetén használt parancssori argumentumok.",
-	"terminal.integrated.shell.windows": "A terminál által használt shell elérési útja Windowson. A Windows beépített shelljei (cmd, PowerShell vagy Bash on Ubuntu) használata esetén kell megadni.",
-	"terminal.integrated.shellArgs.windows": "Windows-terminál esetén használt parancssori argumentumok.",
-	"terminal.integrated.macOptionIsMeta": "Az option billentyű meta billentyűként legyen kezelve a terminálban, macOS-en.",
-	"terminal.integrated.copyOnSelection": "Ha be van kapcsolva, a terminálban kijelölt szöveg a vágólapra lesz másolva.",
-	"terminal.integrated.fontFamily": "Meghatározza a terminál betűtípusát. Alapértelmezett értéke az editor.fontFamily értéke.",
-	"terminal.integrated.fontSize": "Meghatározza a terminálban használt betű méretét, pixelekben.",
-	"terminal.integrated.letterSpacing": "Meghatározza a terminál betűközét. Értéke egy szám, ami meghatározza, hogy további hány pixel legyen a karakterek között.",
-	"terminal.integrated.lineHeight": "Meghatározza a terminál sormagasságát. A tényleges méret a megadott szám és a terminál betűméretének szorzatából jön ki.",
-	"terminal.integrated.fontWeight": "A nem félkövér szöveg esetén használt betűvastagság a terminálban.",
-	"terminal.integrated.fontWeightBold": "A félkövér szöveg esetén használt betűvastagság a terminálban.",
-	"terminal.integrated.cursorBlinking": "Meghatározza, hogy a terminál kurzora villog-e.",
-	"terminal.integrated.cursorStyle": "Meghatározza a terminál kurzorának stílusát.",
-	"terminal.integrated.scrollback": "Meghatározza, hogy a terminál legfeljebb hány sort tárol a pufferben.",
-	"terminal.integrated.setLocaleVariables": "Meghatározza, hogy a lokálváltozók be vannak-e állítva a terminál indításánál. Alapértelmezett értéke igaz OS X-en, hamis más platformokon.",
-	"terminal.integrated.rendererType": "Meghatározza, hogy melyik módszerrel van kirajzolva a terminál: a „canvas” esetén az alap (gyors) canvas-alapú megjelenítővel, míg „dom” esetén a tartalék DOM-alapú megjelenítővel. Az „auto” esetén a VS Code megpróbálja kitalálni, melyik módszer lesz hatékonyabb. Az érték módosítása után újra kell tölteni a VS Code-ot, hogy az új terminálokban érvénybe lépjen a beállítás.",
-	"terminal.integrated.rightClickBehavior": "Meghatározza, hogy a terminál milyen műveletet hajt végre jobb kattintás esetén. Lehetséges értékek: „default”, „copyPaste” és „selectWord”. „default” esetén megjelenik a helyi menü, „copyPaste” esetén másolja a kijelölt szöveget vagy beilleszt, „selectWord” esetén pedig kijelöli a kurzor alatti szót és megjeleníti a helyi menüt.",
-	"terminal.integrated.cwd": "Explicit elérési út, ahol a terminál indítva lesz. Ez a shellfolyamat munkakönyvtára (cwd) lesz. Ez a beállítás nagyon hasznos olyan munkaterületeken, ahol a gyökérkönyvtár nem felel meg munkakönyvtárnak.",
-	"terminal.integrated.confirmOnExit": "Az alkalmazás kérjen-e megerősítést kilépéskor, ha van aktív terminál-munkafolyamat.",
-	"terminal.integrated.enableBell": "Meghatározza, hogy engedélyezve van-e a csengő a terminálba.",
-	"terminal.integrated.commandsToSkipShell": "Olyan parancsazonosítók listája, melyek nem lesznek elküldve a shellnek, és ehelyett mindig a Code kezeli le őket. Ez lehetővé teszi, hogy az olyan billentyűparancsok, melyeket normál esetben a shell dolgozna fel, ugyanúgy működjenek, mint mikor a terminálon nincs fókusz. Például ilyen a gyorsmegnyitás indításához használt Ctrl+P.",
-	"terminal.integrated.env.osx": "A VS Code folyamatához hozzáadott környezeti változókat tartalmazó objektum, amit az OS X-es terminál használ.",
-	"terminal.integrated.env.linux": "A VS Code folyamatához hozzáadott környezeti változókat tartalmazó objektum, amit a linuxos terminál használ.",
-	"terminal.integrated.env.windows": "A VS Code folyamatához hozzáadott környezeti változókat tartalmazó objektum, amit a windowsos terminál használ.",
-	"terminal.integrated.showExitAlert": "A `A terminálfolyamat a következő kilépési kóddal állt le` üzenet megjelenítése, ha a kilépési kód nem nulla.",
-	"terminal.integrated.experimentalRestore": "Vissza legyenek-e állítva a terminálos munkamenetek a VS Code indításakor. Ez egy kísérleti beállítás: hibákat tartalmazhat és változhat is a jövőben.",
-	"terminalCategory": "Terminál",
-	"viewCategory": "Nézet"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json b/i18n/hun/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
deleted file mode 100644
index b5d8a4cb5cb..00000000000
--- a/i18n/hun/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
+++ /dev/null
@@ -1,63 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"workbench.action.terminal.toggleTerminal": "Integrált terminál be- és kikapcsolása",
-	"workbench.action.terminal.kill": "Az aktív terminálpéldány leállítása",
-	"workbench.action.terminal.kill.short": "Terminál leállítása",
-	"workbench.action.terminal.quickKill": "Terminálpéldány leállítása",
-	"workbench.action.terminal.copySelection": "Kijelölés másolása",
-	"workbench.action.terminal.selectAll": "Összes kijelölése",
-	"workbench.action.terminal.deleteWordLeft": "Balra lévő szó törlése",
-	"workbench.action.terminal.deleteWordRight": "Jobbra lévő szó törlése",
-	"workbench.action.terminal.moveToLineStart": "Ugrás a sor elejére",
-	"workbench.action.terminal.moveToLineEnd": "Ugrás a sor végére",
-	"workbench.action.terminal.new": "Új integrált terminál létrehozása",
-	"workbench.action.terminal.new.short": "Új terminál",
-	"workbench.action.terminal.newWorkspacePlaceholder": "Az aktuális munkakönyvtár kiválasztása az új terminálhoz",
-	"workbench.action.terminal.newInActiveWorkspace": "Új integrált terminál létrehozása (az aktív munkaterületen)",
-	"workbench.action.terminal.split": "Terminál kettéosztása",
-	"workbench.action.terminal.splitInActiveWorkspace": "Terminál kettéosztása (az aktív munkaterületen)",
-	"workbench.action.terminal.focusPreviousPane": "Váltás az előző panelra",
-	"workbench.action.terminal.focusNextPane": "Ugrás a következő panelra",
-	"workbench.action.terminal.resizePaneLeft": "Méret növelése balra",
-	"workbench.action.terminal.resizePaneRight": "Méret növelése jobbra",
-	"workbench.action.terminal.resizePaneUp": "Méret növelése felfelé",
-	"workbench.action.terminal.resizePaneDown": "Méret növelése lefelé",
-	"workbench.action.terminal.focus": "Váltás a terminálra",
-	"workbench.action.terminal.focusNext": "Váltás a következő terminálra",
-	"workbench.action.terminal.focusPrevious": "Váltás az előző terminálra",
-	"workbench.action.terminal.paste": "Beillesztés az aktív terminálba",
-	"workbench.action.terminal.DefaultShell": "Alapértelmezett shell kiválasztása",
-	"workbench.action.terminal.runSelectedText": "Kijelölt szöveg futtatása az aktív terminálban",
-	"workbench.action.terminal.runActiveFile": "Aktív fájl futtatása az az aktív terminálban",
-	"workbench.action.terminal.runActiveFile.noFile": "Csak a lemezen lévő fájlok futtathatók a terminálban",
-	"workbench.action.terminal.switchTerminal": "Terminál váltása",
-	"workbench.action.terminal.scrollDown": "Görgetés lefelé (soronként)",
-	"workbench.action.terminal.scrollDownPage": "Görgetés lefelé (oldalanként)",
-	"workbench.action.terminal.scrollToBottom": "Görgetés az aljára",
-	"workbench.action.terminal.scrollUp": "Görgetés felfelé (soronként)",
-	"workbench.action.terminal.scrollUpPage": "G9rgetés felfelé (oldalanként)",
-	"workbench.action.terminal.scrollToTop": "Görgetés a tetejére",
-	"workbench.action.terminal.clear": "Törlés",
-	"workbench.action.terminal.clearSelection": "Kijelölés megszüntetése",
-	"workbench.action.terminal.allowWorkspaceShell": "Munkaterületspecifikus shellkonfiguráció engedélyezése",
-	"workbench.action.terminal.disallowWorkspaceShell": "Munkaterületspecifikus shellkonfiguráció letiltása",
-	"workbench.action.terminal.rename": "Átnevezés",
-	"workbench.action.terminal.rename.prompt": "Adja meg a terminál nevét!",
-	"workbench.action.terminal.focusFindWidget": "Váltás a keresőmodulra",
-	"workbench.action.terminal.hideFindWidget": "Keresőmodul elrejtése",
-	"nextTerminalFindTerm": "Következő keresési kifejezés megjelenítése",
-	"previousTerminalFindTerm": "Előző keresési kifejezés megjelenítése",
-	"quickOpenTerm": "Aktív terminál váltása",
-	"workbench.action.terminal.scrollToPreviousCommand": "Görgetés az előző parancshoz",
-	"workbench.action.terminal.scrollToNextCommand": "Görgetés a következő parancshoz",
-	"workbench.action.terminal.selectToPreviousCommand": "Előző parancs kiválasztása",
-	"workbench.action.terminal.selectToNextCommand": "Következő parancs kiválasztása",
-	"workbench.action.terminal.selectToPreviousLine": "Kijelölés az előző sorig",
-	"workbench.action.terminal.selectToNextLine": "Kijelölés a következő sorig"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json b/i18n/hun/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
deleted file mode 100644
index e68d7791167..00000000000
--- a/i18n/hun/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"terminal.background": "A terminál háttérszíne. Ez lehetővé teszi a terminál paneltől eltérő színezését.",
-	"terminal.foreground": "A terminál előtérszíne.",
-	"terminalCursor.foreground": "A terminál kurzorának előtérszíne.",
-	"terminalCursor.background": "A terminál kurzorának háttérszíne. Lehetővé teszik az olyan karakterek színének módosítását, amelyek fölött egy blokk-típusú kurzor áll.",
-	"terminal.selectionBackground": "A terminálban kijelölt tartalom háttérszíne.",
-	"terminal.border": "A terminálokat elválasztó keret színe. Alapértelmezett értéke megegyezik a panel.border értékével.",
-	"terminal.ansiColor": "'{0}' ANSI-szín a terminálban."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/terminal/electron-browser/terminalConfigHelper.i18n.json b/i18n/hun/src/vs/workbench/parts/terminal/electron-browser/terminalConfigHelper.i18n.json
deleted file mode 100644
index 803a2d658e0..00000000000
--- a/i18n/hun/src/vs/workbench/parts/terminal/electron-browser/terminalConfigHelper.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"terminal.integrated.allowWorkspaceShell": "Engedélyezi a(z) {0} (a munkaterületi beállításokban definiálva) terminálról történő indítását?",
-	"allow": "Engedélyezés",
-	"disallow": "Tiltás"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/terminal/electron-browser/terminalFindWidget.i18n.json b/i18n/hun/src/vs/workbench/parts/terminal/electron-browser/terminalFindWidget.i18n.json
deleted file mode 100644
index 2d5b3af7ef7..00000000000
--- a/i18n/hun/src/vs/workbench/parts/terminal/electron-browser/terminalFindWidget.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"label.find": "Keresés",
-	"placeholder.find": "Keresés",
-	"label.previousMatchButton": "Előző találat",
-	"label.nextMatchButton": "Következő találat",
-	"label.closeButton": "Bezárás"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json b/i18n/hun/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json
deleted file mode 100644
index 4605d8c3cba..00000000000
--- a/i18n/hun/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"terminal.integrated.a11yBlankLine": "Üres sor",
-	"terminal.integrated.a11yPromptLabel": "Terminál bemenet",
-	"terminal.integrated.a11yTooMuchOutput": "Túl sok felolvasásra váró kimenet, navigáljon a sorokhoz manuálisan a felolvasáshoz!",
-	"yes": "Igen",
-	"terminal.rendererInAllNewTerminals": "Az összes új terminál nem GPU-alapú kirajzolást fog használni.",
-	"no": "Nem",
-	"dontShowAgain": "Ne jelenítse meg újra",
-	"terminal.slowRendering": "Úgy tűnik, hogy az integrált terminál alapértelmezett kirajzolására szolgáló motorja lassú ezen a számítógépen. Szeretne váltani az alternatív, DOM-alapú kirajzolóra, amely javíthat a teljesítményen? [További információ a terminál beállításairól](https://code.visualstudio.com/docs/editor/integrated-terminal#_changing-how-the-terminal-is-rendered).",
-	"terminal.integrated.copySelection.noSelection": "A terminálban nincs semmi kijelölve a másoláshoz",
-	"terminal.integrated.exitedWithCode": "A terminálfolyamat a következő kilépési kóddal állt le: {0}",
-	"terminal.integrated.waitOnExit": "A folytatáshoz nyomjon meg egy billentyűt...",
-	"terminal.integrated.launchFailed": "A(z) '{0}{1}' terminálfolyamat-parancsot nem sikerült elindítani (kilépési kód: {2})",
-	"terminal.integrated.launchFailedExtHost": "A terminálfolyamat nem tudott elindulni (kilépési kód: {0})"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/terminal/electron-browser/terminalLinkHandler.i18n.json b/i18n/hun/src/vs/workbench/parts/terminal/electron-browser/terminalLinkHandler.i18n.json
deleted file mode 100644
index 8f6a95dc2ec..00000000000
--- a/i18n/hun/src/vs/workbench/parts/terminal/electron-browser/terminalLinkHandler.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"terminalLinkHandler.followLinkAlt": "Hivatkozás megnyitása Alt + kattintás paranccsal",
-	"terminalLinkHandler.followLinkCmd": "Hivatkozás megnyitása Cmd + kattintás paranccsal",
-	"terminalLinkHandler.followLinkCtrl": "Hivatkozott oldal megnyitása Ctrl + kattintás paranccsal"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json b/i18n/hun/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json
deleted file mode 100644
index 77f44251679..00000000000
--- a/i18n/hun/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"terminal.useMonospace": "'monospace' használata",
-	"terminal.monospaceOnly": "A terminál csak fix szélességű betűtípusokat támogat.",
-	"copy": "Másolás",
-	"split": "Kettéosztás",
-	"paste": "Beillesztés",
-	"selectAll": "Összes kijelölése",
-	"clear": "Törlés"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json b/i18n/hun/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
deleted file mode 100644
index f684fc9f673..00000000000
--- a/i18n/hun/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"terminal.integrated.chooseWindowsShellInfo": "Megváltoztathatja az alapértelmezett terminált a testreszabás gomb választásával.",
-	"customize": "Testreszabás",
-	"never again": "Ne jelenítse meg újra",
-	"terminal.integrated.chooseWindowsShell": "Válassza ki a preferált terminál shellt! Ez később módosítható a beállításokban.",
-	"terminalService.terminalCloseConfirmationSingular": "Van egy aktív terminálmunkamenet. Szeretné megszakítani?",
-	"terminalService.terminalCloseConfirmationPlural": "{0} aktív terminálmunkamenet van. Szeretné megszakítani?"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/themes/electron-browser/themes.contribution.i18n.json b/i18n/hun/src/vs/workbench/parts/themes/electron-browser/themes.contribution.i18n.json
deleted file mode 100644
index 24d59de9298..00000000000
--- a/i18n/hun/src/vs/workbench/parts/themes/electron-browser/themes.contribution.i18n.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"selectTheme.label": "Színtéma",
-	"themes.category.light": "világos témák",
-	"themes.category.dark": "sötét témák",
-	"themes.category.hc": "kontrasztos témák",
-	"installColorThemes": "További színtémák telepítése...",
-	"themes.selectTheme": "Válasszon színtémát! (Előnézet a fel/le billentyűvel.)",
-	"selectIconTheme.label": "Fájlikontéma",
-	"noIconThemeLabel": "Nincs",
-	"noIconThemeDesc": "Fájlikonok letiltása",
-	"installIconThemes": "További fájlikontémák telepítése...",
-	"themes.selectIconTheme": "Válasszon fájlikontémát!",
-	"generateColorTheme.label": "Színtéma generálása az aktuális beállítások alapján",
-	"preferences": "Beállítások",
-	"developer": "Fejlesztői"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/trust/electron-browser/unsupportedWorkspaceSettings.contribution.i18n.json b/i18n/hun/src/vs/workbench/parts/trust/electron-browser/unsupportedWorkspaceSettings.contribution.i18n.json
deleted file mode 100644
index dc383e1092c..00000000000
--- a/i18n/hun/src/vs/workbench/parts/trust/electron-browser/unsupportedWorkspaceSettings.contribution.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openWorkspaceSettings": "Munkaterület beállításainak megnyitása",
-	"dontShowAgain": "Ne jelenítse meg újra",
-	"unsupportedWorkspaceSettings": "A munkaterület olyan beállításokat tartalmaz, amelyeket csak a felhasználói beállításoknál lehet megadni (({0}). További információhoz kattintson [ide]({1})!"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json b/i18n/hun/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json
deleted file mode 100644
index d682cbdfb4c..00000000000
--- a/i18n/hun/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"releaseNotesInputName": "Kiadási jegyzék: {0}",
-	"unassigned": "nincs hozzárendelve"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/update/electron-browser/releaseNotesInput.i18n.json b/i18n/hun/src/vs/workbench/parts/update/electron-browser/releaseNotesInput.i18n.json
deleted file mode 100644
index 4888f3c8795..00000000000
--- a/i18n/hun/src/vs/workbench/parts/update/electron-browser/releaseNotesInput.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"releaseNotesInputName": "Kiadási jegyzék: {0}"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/update/electron-browser/update.contribution.i18n.json b/i18n/hun/src/vs/workbench/parts/update/electron-browser/update.contribution.i18n.json
deleted file mode 100644
index ab9ac7a787d..00000000000
--- a/i18n/hun/src/vs/workbench/parts/update/electron-browser/update.contribution.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"release notes": "Kiadási jegyzék"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/update/electron-browser/update.i18n.json b/i18n/hun/src/vs/workbench/parts/update/electron-browser/update.i18n.json
deleted file mode 100644
index ee159633915..00000000000
--- a/i18n/hun/src/vs/workbench/parts/update/electron-browser/update.i18n.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"releaseNotes": "Kiadási jegyzék",
-	"showReleaseNotes": "Kiadási jegyzék megjelenítése",
-	"read the release notes": "Üdvözöljük a {0} v{1} verziójában. Szeretné megtekinteni a kiadási jegyzéket?",
-	"licenseChanged": "A licencfeltételek változtak. A változások áttekintéséhez kattintson [ide]({0})!",
-	"neveragain": "Ne jelenítse meg újra",
-	"64bitisavailable": "Elérhető a {0} 64-bites Windowsra készült változata! További információhoz kattintson [ide]({1})!",
-	"updateIsReady": "Új {0}-frissítés érhető el.",
-	"noUpdatesAvailable": "Jelenleg nincs elérhető frissítés.",
-	"ok": "OK",
-	"thereIsUpdateAvailable": "Van elérhető frissítés.",
-	"download now": "Letöltés most",
-	"later": "Később",
-	"updateAvailable": "Frissítés érhető el: {0} {1}",
-	"installUpdate": "Frissítés telepítése",
-	"updateInstalling": "{0} {1} a háttérben települ. Jelzünk, ha elkészült.",
-	"updateAvailableAfterRestart": "A {0} újraindításával telepíthető a legújabb frissítés.",
-	"updateNow": "Frissítés most",
-	"commandPalette": "Parancskatalógus...",
-	"settings": "Beállítások",
-	"keyboardShortcuts": "Billentyűparancsok",
-	"showExtensions": "Kiegészítők kezelése",
-	"userSnippets": "Felhasználói kódrészletek",
-	"selectTheme.label": "Színtéma",
-	"themes.selectIconTheme.label": "Fájlikontéma",
-	"checkForUpdates": "Frissítések keresése...",
-	"checkingForUpdates": "Frissítések keresése...",
-	"DownloadingUpdate": "Frissítés letöltése...",
-	"installUpdate...": "Frissítés telepítése...",
-	"installingUpdate": "Frissítés telepítése...",
-	"restartToUpdate": "Újraindítás a frissítéshez..."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/url/electron-browser/url.contribution.i18n.json b/i18n/hun/src/vs/workbench/parts/url/electron-browser/url.contribution.i18n.json
deleted file mode 100644
index 4fc157d384a..00000000000
--- a/i18n/hun/src/vs/workbench/parts/url/electron-browser/url.contribution.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openUrl": "URL megnyitása",
-	"developer": "Fejlesztői"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/views/browser/views.i18n.json b/i18n/hun/src/vs/workbench/parts/views/browser/views.i18n.json
deleted file mode 100644
index f00a5e742b6..00000000000
--- a/i18n/hun/src/vs/workbench/parts/views/browser/views.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"viewToolbarAriaLabel": "{0} művelet",
-	"hideView": "Elrejtés az oldalsávról"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/views/browser/viewsExtensionPoint.i18n.json b/i18n/hun/src/vs/workbench/parts/views/browser/viewsExtensionPoint.i18n.json
deleted file mode 100644
index b7933d496e4..00000000000
--- a/i18n/hun/src/vs/workbench/parts/views/browser/viewsExtensionPoint.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"requirearray": "a nézeteket tömbként kell megadni",
-	"requirestring": "a(z) `{0}` tulajdonság kötelező és `string` típusúnak kell lennie",
-	"optstring": "a(z) `{0}` tulajdonság elhagyható vagy `string` típusúnak kell lennie",
-	"vscode.extension.contributes.view.id": "A nézet azonosítója. Ez használható az adatszolgáltató regisztrálásához a `vscode.window.registerTreeDataProviderForView` API-n keresztül. Ezen túl a kiegészítő aktiválásához regisztrálni kell az `onView:${id}` eseményt az `activationEvents`-nél.",
-	"vscode.extension.contributes.view.name": "A nézet emberek számára olvasható neve. Meg fog jelenni",
-	"vscode.extension.contributes.view.when": "A nézet megjelenítésének feltétele",
-	"vscode.extension.contributes.views": "Nézeteket szolgáltat a szerkesztőhöz",
-	"views.explorer": "Fájlkezelő-nézet",
-	"views.debug": "Hibakeresési nézet",
-	"locationId.invalid": "A(z) `{0}` nem érvényes nézethelyszín"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/watermark/electron-browser/watermark.i18n.json b/i18n/hun/src/vs/workbench/parts/watermark/electron-browser/watermark.i18n.json
deleted file mode 100644
index 1bca00a5a23..00000000000
--- a/i18n/hun/src/vs/workbench/parts/watermark/electron-browser/watermark.i18n.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"watermark.showCommands": "Összes parancs megjelenítése ",
-	"watermark.quickOpen": "Ugrás fájlhoz",
-	"watermark.openFile": "Fájl megnyitása",
-	"watermark.openFolder": "Mappa megnyitása",
-	"watermark.openFileFolder": "Fájl vagy mappa megnyitása",
-	"watermark.openRecent": "Legutóbbi megnyitása",
-	"watermark.newUntitledFile": "Új, névtelen fájl",
-	"watermark.toggleTerminal": "Terminál be- és kikapcsolása",
-	"watermark.findInFiles": "Keresés a fájlokban",
-	"watermark.startDebugging": "Hibakeresés indítása",
-	"watermark.unboundCommand": "nincs hozzárendelve",
-	"workbenchConfigurationTitle": "Munkaterület",
-	"tips.enabled": "Ha engedélyezve van, tippek jelennek meg vízjelként, ha nincs egyetlen szerkesztőablak sem nyitva."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json b/i18n/hun/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json
deleted file mode 100644
index d027e8f4428..00000000000
--- a/i18n/hun/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"webview.editor.label": "webview-szerkesztő",
-	"developer": "Fejlesztői"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/webview/electron-browser/webviewCommands.i18n.json b/i18n/hun/src/vs/workbench/parts/webview/electron-browser/webviewCommands.i18n.json
deleted file mode 100644
index 89f213109cf..00000000000
--- a/i18n/hun/src/vs/workbench/parts/webview/electron-browser/webviewCommands.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openToolsLabel": "Webview-fejlesztőeszközök megnyitása",
-	"refreshWebviewLabel": "Webview-k újratöltése"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json b/i18n/hun/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json
deleted file mode 100644
index 37523ae01ca..00000000000
--- a/i18n/hun/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"telemetryOptOut.optOutNotice": "Segítsen a VS Code tökéletesítésében azzal, hogy engedélyezi a Microsoft számára a használati adatok gyűjtését! Olvasssa el az [adatvédelmi nyilatkozatot]({0}), és tudja meg, hogyan [kapcsolhatja ki]({1}) ezt a funkciót.",
-	"telemetryOptOut.optInNotice": "Segítsen a VS Code tökéletesítésében azzal, hogy engedélyezi a Microsoft számára a használati adatok gyűjtését! Olvasssa el az [adatvédelmi nyilatkozatot]({0}), és tudja meg, hogyan [kapcsolhatja be]({1}) ezt a funkciót.",
-	"telemetryOptOut.readMore": "További információk"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/welcome/overlay/browser/welcomeOverlay.i18n.json b/i18n/hun/src/vs/workbench/parts/welcome/overlay/browser/welcomeOverlay.i18n.json
deleted file mode 100644
index 0fb4b450576..00000000000
--- a/i18n/hun/src/vs/workbench/parts/welcome/overlay/browser/welcomeOverlay.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"welcomeOverlay.explorer": "Fájlkezelő",
-	"welcomeOverlay.search": "Keresés a fájlok között",
-	"welcomeOverlay.git": "Forráskódkezelés",
-	"welcomeOverlay.debug": "Indítás és hibakeresés",
-	"welcomeOverlay.extensions": "Kiterjesztések kezelése",
-	"welcomeOverlay.problems": "Hibák és figyelmeztetések megtekintése",
-	"welcomeOverlay.commandPalette": "Összes parancs megkeresése és futtatása",
-	"welcomeOverlay.notifications": "Értesítések megjelenítése",
-	"welcomeOverlay": "Felhasználói felület áttekintése",
-	"hideWelcomeOverlay": "Felület áttekintésének elrejtése",
-	"help": "Segítség"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json b/i18n/hun/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
deleted file mode 100644
index e777fa951c0..00000000000
--- a/i18n/hun/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"welcomePage.vscode": "Visual Studio Code",
-	"welcomePage.editingEvolved": "Szerkesztés, továbbfejlesztve",
-	"welcomePage.start": "Start",
-	"welcomePage.newFile": "Új fájl",
-	"welcomePage.openFolder": "Mappa megnyitása...",
-	"welcomePage.addWorkspaceFolder": "Mappa hozzáadása a munkaterülethez...",
-	"welcomePage.recent": "Legutóbbi",
-	"welcomePage.moreRecent": "Tovább...",
-	"welcomePage.noRecentFolders": "Nincsenek megnyitott mappák",
-	"welcomePage.help": "Segítség",
-	"welcomePage.keybindingsCheatsheet": "Nyomatható billentyűparancs-referencia",
-	"welcomePage.introductoryVideos": "Bemutatóvideók",
-	"welcomePage.tipsAndTricks": "Tippek és trükkök",
-	"welcomePage.productDocumentation": "Termékdokumentáció",
-	"welcomePage.gitHubRepository": "GitHub-forráskódtár",
-	"welcomePage.stackOverflow": "Stack Overflow",
-	"welcomePage.showOnStartup": "Üdvözlőlap megjelenítése induláskor",
-	"welcomePage.customize": "Testreszabás",
-	"welcomePage.installExtensionPacks": "Eszközök és nyelvek",
-	"welcomePage.installExtensionPacksDescription": "{0} és {1} fejlesztőkörnyezetek telepítése ",
-	"welcomePage.moreExtensions": "további",
-	"welcomePage.installKeymapDescription": "Beállítások és billentyűkombinációk",
-	"welcomePage.installKeymapExtension": "{0} és {1} billentyűparancsok és beállítások telepítése ",
-	"welcomePage.others": "további",
-	"welcomePage.colorTheme": "Színtéma",
-	"welcomePage.colorThemeDescription": "Alakítsa át szeretett szerkesztőjét úgy, ahogyan szeretné!",
-	"welcomePage.learn": "További információ",
-	"welcomePage.showCommands": "Összes parancs megkeresése és futtatása",
-	"welcomePage.showCommandsDescription": "Parancsok gyors listázása és keresése a parancskatalógusban ({0})",
-	"welcomePage.interfaceOverview": "Felhasználói felület áttekintése",
-	"welcomePage.interfaceOverviewDescription": "Fedvény, ami vizuálisan bemutatja a felhasználói felület legfőbb részeit.",
-	"welcomePage.interactivePlayground": "Interaktív játszótér",
-	"welcomePage.interactivePlaygroundDescription": "Próbálja ki a szerkesztő funkcióit egy rövid bemutató keretében!"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.contribution.i18n.json b/i18n/hun/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.contribution.i18n.json
deleted file mode 100644
index 1e34cc48c26..00000000000
--- a/i18n/hun/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.contribution.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"workbenchConfigurationTitle": "Munkaterület",
-	"workbench.startupEditor.none": "Indítás szerkesztőablak nélkül.",
-	"workbench.startupEditor.welcomePage": "Üdvözlőlap megnyitása (alapértelmezett).",
-	"workbench.startupEditor.newUntitledFile": "Új, névtelen fájl megnyitása.",
-	"workbench.startupEditor": "Meghatározza, melyik szerkesztőablak jelenjen meg induláskor, ha egyetlen sem lett helyreállítva a korábbi munkamenetből. Válassza a 'none' értéket, ha szerkesztőablak nélkül induljon, a 'welcomePage'-t, ha az üdvözlőlap nyíljon meg (alapértelmezett), a 'newUntitledFile'-t, ha egy új, névtelen fájl nyíljon meg (csak egy üres munkaterület nyílik meg).",
-	"help": "Segítség"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json b/i18n/hun/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json
deleted file mode 100644
index 8ffe66f77ad..00000000000
--- a/i18n/hun/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"welcomePage": "Üdvözöljük!",
-	"welcomePage.javaScript": "JavaScript",
-	"welcomePage.typeScript": "TypeScript",
-	"welcomePage.python": "Python",
-	"welcomePage.php": "PHP",
-	"welcomePage.azure": "Azure",
-	"welcomePage.showAzureExtensions": "Azure-kiegészítők megjelenítése",
-	"welcomePage.docker": "Docker",
-	"welcomePage.vim": "Vim",
-	"welcomePage.sublime": "Sublime",
-	"welcomePage.atom": "Atom",
-	"welcomePage.extensionPackAlreadyInstalled": "A(z) {0}-környezet már telepítve van.",
-	"welcomePage.willReloadAfterInstallingExtensionPack": "Az ablak újratölt a(z) {0} kiegészítő környezet telepítése után.",
-	"welcomePage.installingExtensionPack": "{0} kiegészítő környezet telepítése...",
-	"welcomePage.extensionPackNotFound": "A(z) {1} azonosítójú {0}-környezet nem található.",
-	"welcomePage.keymapAlreadyInstalled": "A(z) {0} billentyűparancsok már telepítve vannak.",
-	"welcomePage.willReloadAfterInstallingKeymap": "Az ablak újratölt a(z) {0} billentyűparancsok telepítése után.",
-	"welcomePage.installingKeymap": "{0} billentyűparancsok telepítése...",
-	"welcomePage.keymapNotFound": "A(z) {1} azonosítójú {0} billentyűparancsok nem találhatók.",
-	"welcome.title": "Üdvözöljük!",
-	"welcomePage.openFolderWithPath": "{1} elérési úton található {0} mappa megnyitása",
-	"welcomePage.extensionListSeparator": ", ",
-	"welcomePage.installKeymap": "{0}-billentyűkonfiguráció telepítése",
-	"welcomePage.installExtensionPack": "{0} kiegészítő környezet telepítése",
-	"welcomePage.installedKeymap": "A(z) {0}-billenyűkiosztás már telepítve van",
-	"welcomePage.installedExtensionPack": "A(z) {0}-környezet már telepítve van.",
-	"ok": "OK",
-	"details": "Részletek",
-	"welcomePage.buttonBackground": "Az üdvözlőlapon található gombok háttérszíne",
-	"welcomePage.buttonHoverBackground": "Az üdvözlőlapon található gombok háttérszíne, amikor a mutató fölöttük áll."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/welcome/walkThrough/electron-browser/editor/editorWalkThrough.i18n.json b/i18n/hun/src/vs/workbench/parts/welcome/walkThrough/electron-browser/editor/editorWalkThrough.i18n.json
deleted file mode 100644
index ae00c356289..00000000000
--- a/i18n/hun/src/vs/workbench/parts/welcome/walkThrough/electron-browser/editor/editorWalkThrough.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"editorWalkThrough.title": "Interaktív játszótér",
-	"editorWalkThrough": "Interaktív játszótér"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThrough.contribution.i18n.json b/i18n/hun/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThrough.contribution.i18n.json
deleted file mode 100644
index 459d916354c..00000000000
--- a/i18n/hun/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThrough.contribution.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"walkThrough.editor.label": "Interaktív játszótér",
-	"help": "Segítség"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughActions.i18n.json b/i18n/hun/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughActions.i18n.json
deleted file mode 100644
index 12b107dc6c3..00000000000
--- a/i18n/hun/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughActions.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"editorWalkThrough.arrowUp": "Görgetés felfelé (soronként)",
-	"editorWalkThrough.arrowDown": "Görgetés lefelé (soronként)",
-	"editorWalkThrough.pageUp": "Görgetés felfelé (oldalanként)",
-	"editorWalkThrough.pageDown": "Görgetés lefelé (oldalanként)"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughPart.i18n.json b/i18n/hun/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughPart.i18n.json
deleted file mode 100644
index c1aff2a25ca..00000000000
--- a/i18n/hun/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughPart.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"walkThrough.unboundCommand": "nincs hozzárendelve",
-	"walkThrough.gitNotFound": "Úgy tűnik, hogy a Git nincs telepítve a rendszerre.",
-	"walkThrough.embeddedEditorBackground": "Az interaktív játszótér szerkesztőablakainak háttérszíne."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/services/actions/electron-browser/menusExtensionPoint.i18n.json b/i18n/hun/src/vs/workbench/services/actions/electron-browser/menusExtensionPoint.i18n.json
deleted file mode 100644
index e50c39417bf..00000000000
--- a/i18n/hun/src/vs/workbench/services/actions/electron-browser/menusExtensionPoint.i18n.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"requirearray": "a menüelemeket tömbként kell megadni",
-	"requirestring": "a(z) `{0}` tulajdonság kötelező és `string` típusúnak kell lennie",
-	"optstring": "a(z) `{0}` tulajdonság elhagyható vagy `string` típusúnak kell lennie",
-	"vscode.extension.contributes.menuItem.command": "A végrehajtandó parancs azonosítója. A parancsot a 'commands'-szakaszban kell deklarálni",
-	"vscode.extension.contributes.menuItem.alt": "Egy alternatív végrehajtandó parancs azonosítója. A parancsot a 'commands'-szakaszban kell deklarálni",
-	"vscode.extension.contributes.menuItem.when": "A feltételnek igaznak kell lennie az elem megjelenítéséhez",
-	"vscode.extension.contributes.menuItem.group": "A csoport, amibe a parancs tartozik",
-	"vscode.extension.contributes.menus": "Menüket szolgáltat a szerkesztőhöz",
-	"menus.commandPalette": "A parancskatalógus",
-	"menus.touchBar": "A Touch Bar (csak macOS-en)",
-	"menus.editorTitle": "A szerkesztőablak címsora menüje",
-	"menus.editorContext": "A szerkesztőablak helyi menüje",
-	"menus.explorerContext": "A fájlkezelő helyi menüje",
-	"menus.editorTabContext": "A szerkesztőablak füleinek helyi menüje",
-	"menus.debugCallstackContext": "A hibakeresési hívási verem helyi menüje",
-	"menus.scmTitle": "A verziókezelő címsorának menüje",
-	"menus.scmSourceControl": "A verziókezelő menüje",
-	"menus.resourceGroupContext": "A verziókezelő erőforráscsoportja helyi menüje",
-	"menus.resourceStateContext": "A verziókzeleő erőforrásállapot helyi menüje",
-	"view.viewTitle": "A szolgáltatott nézet címsorának menüje",
-	"view.itemContext": "A szolgáltatott nézet elemének helyi menüje",
-	"nonempty": "az érték nem lehet üres.",
-	"opticon": "a(z) `icon` tulajdonság elhagyható vagy ha van értéke, akkor string vagy literál (pl. `{dark, light}`) típusúnak kell lennie",
-	"requireStringOrObject": "a(z) `{0}` tulajdonság kötelező és `string` vagy `object` típusúnak kell lennie",
-	"requirestrings": "a(z) `{0}` és `{1}` tulajdonságok kötelezők és `string` típusúnak kell lenniük",
-	"vscode.extension.contributes.commandType.command": "A végrehajtandó parancs azonosítója",
-	"vscode.extension.contributes.commandType.title": "A cím, amivel a parancs meg fog jelenni a felhasználói felületen",
-	"vscode.extension.contributes.commandType.category": "(Nem kötelező) Kategória neve, amibe a felületen csoportosítva lesz a parancs",
-	"vscode.extension.contributes.commandType.icon": "(Nem kötelező) Ikon, ami reprezentálni fogja a parancsot a felhasználói felületen. Egy fájl elérési útja vagy egy színtéma-konfiguráció",
-	"vscode.extension.contributes.commandType.icon.light": "Az ikon elérési útja, ha világos téma van használatban",
-	"vscode.extension.contributes.commandType.icon.dark": "Az ikon elérési útja, ha sötét téma van használatban",
-	"vscode.extension.contributes.commands": "Parancsokat szolgáltat a parancskatalógushoz.",
-	"dup": "A(z) `{0}` parancs többször szerepel a `commands`-szakaszban.",
-	"menuId.invalid": "A(z) `{0}` nem érvényes menüazonosító",
-	"missing.command": "A menüpont a(z) `{0}` parancsra hivatkozik, ami nincs deklarálva a 'commands'-szakaszban.",
-	"missing.altCommand": "A menüpont a(z) `{0}` alternatív parancsra hivatkozik, ami nincs deklarálva a 'commands'-szakaszban.",
-	"dupe.command": "A menüpont ugyanazt a parancsot hivatkozza alapértelmezett és alternatív parancsként"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/services/bulkEdit/electron-browser/bulkEditService.i18n.json b/i18n/hun/src/vs/workbench/services/bulkEdit/electron-browser/bulkEditService.i18n.json
deleted file mode 100644
index 970cf632d01..00000000000
--- a/i18n/hun/src/vs/workbench/services/bulkEdit/electron-browser/bulkEditService.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"summary.0": "Nem történtek változtatások",
-	"summary.nm": "{0} változtatást végzett {0} fájlban",
-	"summary.n0": "{0} változtatást végzett egy fájlban",
-	"conflict": "A következő fájlok módosultak időközben: {0}"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/services/configuration/common/configurationExtensionPoint.i18n.json b/i18n/hun/src/vs/workbench/services/configuration/common/configurationExtensionPoint.i18n.json
deleted file mode 100644
index e68aaa57dfa..00000000000
--- a/i18n/hun/src/vs/workbench/services/configuration/common/configurationExtensionPoint.i18n.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.contributes.configuration.title": "A beállítások összefoglaló leírása. Ez a címke jelenik meg a beállítások fájlban egy különálló megjegyzésként.",
-	"vscode.extension.contributes.configuration.properties": "A konfigurációs tulajdonságok leírása.",
-	"scope.application.description": "Alkalmazásspecifikus beállítás, ami csak a felhasználói beállításokban konfigurálható.",
-	"scope.window.description": "Ablakspecifikus beállítás, ami konfigurálható a felhasználói vagy munkaterületi beállításokban.",
-	"scope.resource.description": "Erőforrásspecifikus beállítás, ami beállítható a felhasználói, munkaterületi és mappaszintű beállításokban.",
-	"scope.description": "A hatókör, amire a beállítás vonatkozik. Az elérhető hatókörök: `window` és `resource`.",
-	"vscode.extension.contributes.defaultConfiguration": "Adott nyelvre vonatkozóan szerkesztőbeállításokat szolgáltat.",
-	"vscode.extension.contributes.configuration": "Konfigurációs beállításokat szolgáltat.",
-	"invalid.title": "a 'configuration.title' értékét karakterláncként kell megadni",
-	"invalid.properties": "A 'configuration.properties' értékét egy objektumként kell megadni",
-	"invalid.property": "A 'configuration.property' értékét egy objektumként kell megadni",
-	"invalid.allOf": "A 'configuration.allOf' elavult, és használata nem javasolt. Helyette több konfigurációs szakaszt kell átadni tömbként a 'configuration' értékeként.",
-	"workspaceConfig.folders.description": "A munkaterületre betöltött mappák listája.",
-	"workspaceConfig.path.description": "Egy fájl elérési útja, pl. `/root/folderA` vagy `./folderA` relatív elérési út esetén, ami a munkaterületfájl helye alapján lesz feloldva.",
-	"workspaceConfig.name.description": "A mappa neve. Nem kötelező megadni.",
-	"workspaceConfig.uri.description": "A mappa URI-ja",
-	"workspaceConfig.settings.description": "Munkaterület-beállítások",
-	"workspaceConfig.launch.description": "Munkaterületspecifikus indítási konfigurációk",
-	"workspaceConfig.extensions.description": "Munkaterület-kiegészítők",
-	"unknownWorkspaceProperty": "Ismeretlen munkaterület-konfigurációs tulajdonság"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/services/configuration/node/configuration.i18n.json b/i18n/hun/src/vs/workbench/services/configuration/node/configuration.i18n.json
deleted file mode 100644
index 209303272b7..00000000000
--- a/i18n/hun/src/vs/workbench/services/configuration/node/configuration.i18n.json
+++ /dev/null
@@ -1,24 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"vscode.extension.contributes.configuration.title": "A beállítások összefoglaló leírása. Ez a címke jelenik meg a beállítások fájlban egy különálló megjegyzésként.",
-	"vscode.extension.contributes.configuration.properties": "A konfigurációs tulajdonságok leírása.",
-	"scope.window.description": "Ablakspecifikus beállítás, ami konfigurálható a felhasználói vagy munkaterületi beállításokban.",
-	"scope.resource.description": "Erőforrásspecifikus beállítás, ami beállítható a felhasználói, munkaterületi és mappaszintű beállításokban.",
-	"scope.description": "A hatókör, amire a beállítás vonatkozik. Az elérhető hatókörök: `window` és `resource`.",
-	"vscode.extension.contributes.configuration": "Konfigurációs beállításokat szolgáltat.",
-	"invalid.title": "a 'configuration.title' értékét karakterláncként kell megadni",
-	"vscode.extension.contributes.defaultConfiguration": "Adott nyelvre vonatkozóan szerkesztőbeállításokat szolgáltat.",
-	"invalid.properties": "A 'configuration.properties' értékét egy objektumként kell megadni",
-	"invalid.allOf": "A 'configuration.allOf' elavult, és használata nem javasolt. Helyette több konfigurációs szakaszt kell átadni tömbként a 'configuration' értékeként.",
-	"workspaceConfig.folders.description": "A munkaterületre betöltött mappák listája.",
-	"workspaceConfig.path.description": "Egy fájl elérési útja, pl. `/root/folderA` vagy `./folderA` relatív elérési út esetén, ami a munkaterületfájl helye alapján lesz feloldva.",
-	"workspaceConfig.name.description": "A mappa neve. Nem kötelező megadni.",
-	"workspaceConfig.uri.description": "A mappa URI-ja",
-	"workspaceConfig.settings.description": "Munkaterület-beállítások",
-	"workspaceConfig.extensions.description": "Munkaterület-kiegészítők",
-	"unknownWorkspaceProperty": "Ismeretlen munkaterület-konfigurációs tulajdonság"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json b/i18n/hun/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
deleted file mode 100644
index 8838896ef92..00000000000
--- a/i18n/hun/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openTasksConfiguration": "Feladatkonfiguráció megnyitása",
-	"openLaunchConfiguration": "Indítási konfiguráció megnyitása",
-	"open": "Beállítások megnyitása",
-	"saveAndRetry": "Mentés és újrapróbálkozás",
-	"errorUnknownKey": "Nem sikerült írni a következőbe: {0}. A(z) {1} nem regisztrált beállítás.",
-	"errorInvalidWorkspaceConfigurationApplication": "Nem sikerült írni a munkaterület beállításaiba, mert ez a beállítás csak a felhasználói beállításokban használható. ",
-	"errorInvalidFolderConfiguration": "Nem sikerült írni a mappa beállításaiba, mert a(z) {0} nem támogatott mappa típusú erőforrások hatókörében.",
-	"errorInvalidUserTarget": "Nem sikerült írni a felhasználói beállításokba, mert a(z) {0} nem támogatott globális hatókörben.",
-	"errorInvalidWorkspaceTarget": "Nem sikerült írni a munkaterület beállításaiba, mert a(z) {0} nem támogatott munkaterületi hatókörben egy több mappát tartalmazó munkaterületen.",
-	"errorInvalidFolderTarget": "Nem sikerült írni a mappa beállításaiba, mert nincs erőforrás megadva.",
-	"errorNoWorkspaceOpened": "Nem sikerült írni a következőbe: {0}. Nincs munkaterület megnyitva. Nyisson meg egy munkaterületet, majd próbálja újra!",
-	"errorInvalidTaskConfiguration": "Nem sikerült írni a feladatokat tartalmazó konfigurációs fájljába. Nyissa meg a fájlt, javítsa a benne található hibákat és figyelmeztetéseket, majd próbálja újra!",
-	"errorInvalidLaunchConfiguration": "Nem sikerült írni az indítási konfigurációs fájlba. Nyissa meg a fájlt, javítsa a benne található hibákat és figyelmeztetéseket, majd próbálja újra!",
-	"errorInvalidConfiguration": "Nem sikerült írni a felhasználói beállításokba. Nyissa meg a felhasználói beállításokat, javítsa a hibákat és figyelmeztetéseket a fájlban, majd próbálja újra!",
-	"errorInvalidConfigurationWorkspace": "Nem sikerült írni a munkaterület beállításaiba. Nyissa meg a munkaterület beállításait, javítsa a hibákat és figyelmeztetéseket a fájlban, majd próbálja újra!",
-	"errorInvalidConfigurationFolder": "Nem sikerült írni a mappa beállításaiba. Nyissa meg a(z) '{0}' mappa beállításait, javítsa a hibákat és figyelmeztetéseket a fájlban, majd próbálja újra!",
-	"errorTasksConfigurationFileDirty": "Nem sikerült írni a feladatokat tartalmazó konfigurációs fájljába, mert módosítva lett. Mentse, majd próbálja újra!",
-	"errorLaunchConfigurationFileDirty": "Nem sikerült írni az indítási konfigurációs fájlba, mert a fájl módosítva lett. Mentse, majd próbálja újra!",
-	"errorConfigurationFileDirty": "Nem sikerült írni a felhasználói beállításokba, mert a fájl módosítva lett. Mentse a felhasználói beállításokat tartalmazó fájlt, majd próbálja újra!",
-	"errorConfigurationFileDirtyWorkspace": "Nem sikerült írni a munkaterületi beállításokba, mert a fájl módosítva lett. Mentse a munkaterület beállításait tartalmazó fájlt, majd próbálja újra!",
-	"errorConfigurationFileDirtyFolder": "Nem sikerült írni a mappa beállításait tartalmazó fájlba, mert a fájl módosítva lett. Mentse a(z) '{0}' mappa beállításait tartalmazó fájlt, majd próbálja újra!",
-	"userTarget": "Felhasználói beállítások",
-	"workspaceTarget": "Munkaterület-beállítások",
-	"folderTarget": "Mappabeálíltások"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/services/configuration/node/configurationService.i18n.json b/i18n/hun/src/vs/workbench/services/configuration/node/configurationService.i18n.json
deleted file mode 100644
index e25641ff799..00000000000
--- a/i18n/hun/src/vs/workbench/services/configuration/node/configurationService.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"unsupportedApplicationSetting": "Ez a beállítás csak a felhasználói beállításokban szerepelhet.",
-	"unsupportedWindowSetting": "Ez a beállítás jelenleg nem alkalmazható. Akkor van használatban, ha közvetlenül nyitja meg ezt a mappát."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/services/configuration/node/jsonEditingService.i18n.json b/i18n/hun/src/vs/workbench/services/configuration/node/jsonEditingService.i18n.json
deleted file mode 100644
index 2baa8617dd6..00000000000
--- a/i18n/hun/src/vs/workbench/services/configuration/node/jsonEditingService.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"errorInvalidFile": "Nem sikerült írni a fájlba. Nyissa meg a fájlt, javítsa a hibákat és figyelmeztetéseket a fájlban, majd próbálja újra!",
-	"errorFileDirty": "Nem sikerült írni a fájlba, mert a fájl módosítva lett. Mentse a fájlt, majd próbálja újra!"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json b/i18n/hun/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
deleted file mode 100644
index 8e0b4e75ddb..00000000000
--- a/i18n/hun/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"stringsOnlySupported": "A(z) {0} parancsnak nem egy szöveg lett az eredmény. Értékbehelyettesítésnél csak szöveget eredményező parancsok támogatottak."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/services/configurationResolver/node/variableResolver.i18n.json b/i18n/hun/src/vs/workbench/services/configurationResolver/node/variableResolver.i18n.json
deleted file mode 100644
index 978a6d116b1..00000000000
--- a/i18n/hun/src/vs/workbench/services/configurationResolver/node/variableResolver.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"missingEnvVarName": "A(z) '{0}' értékét nem lehet feloldani, mert nincs megadva a környezeti változó neve.",
-	"configNotFound": "A(z) '{0}' értékét nem lehet feloldani, mert a(z) '{1}' beállítás nem található.",
-	"configNoString": "A(z) '{0}' értékét nem lehet feloldani, mert a(z) '{1}' strukturált értékkel rendelkezik.",
-	"missingConfigName": "A(z) '{0}' értékét nem lehet feloldani, mert nincs megadva a beállítás neve.",
-	"noValueForCommand": "A(z) '{0}' értékét nem lehet feloldani, mert a parancsnak nincs értéke.",
-	"canNotFindFolder": "A(z) '{0}' értékét nem lehet feloldani, mert nincs '{1}' nevű mappa.",
-	"canNotResolveWorkspaceFolderMultiRoot": "Az) '{0}' értékét nem lehet feloldani egy többmappás munkaterületen. Pontosítsa a változó hatókörét a : karakterrel és a mappa nevének megadásával!",
-	"canNotResolveWorkspaceFolder": "A(z) '{0}' értékét nem lehet feloldani. Nyisson meg egy mappát!",
-	"canNotResolveFile": "A(z) '{0}' értékét nem lehet feloldani. Nyisson meg egy szerkesztőablakot!",
-	"canNotResolveLineNumber": "A(z) '{0}' értékét nem lehet feloldani. Jelöljön ki egy sort az aktív szerkesztőablakban!",
-	"canNotResolveSelectedText": "A(z) '{0}' értékét nem lehet feloldani. Jelöljön ki szöveget az aktív szerkesztőablakban!"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/services/crashReporter/common/crashReporterService.i18n.json b/i18n/hun/src/vs/workbench/services/crashReporter/common/crashReporterService.i18n.json
deleted file mode 100644
index afdabd01421..00000000000
--- a/i18n/hun/src/vs/workbench/services/crashReporter/common/crashReporterService.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"telemetryConfigurationTitle": "Telemetria",
-	"telemetry.enableCrashReporting": "Összeomlási jelentések küldésének engedélyezése a Microsofthoz.\nA beállítás érvénybe lépéséhez újraindítás szükséges."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/services/crashReporter/electron-browser/crashReporterService.i18n.json b/i18n/hun/src/vs/workbench/services/crashReporter/electron-browser/crashReporterService.i18n.json
deleted file mode 100644
index 24abd97c201..00000000000
--- a/i18n/hun/src/vs/workbench/services/crashReporter/electron-browser/crashReporterService.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"telemetryConfigurationTitle": "Telemetria",
-	"telemetry.enableCrashReporting": "Összeomlási jelentések küldésének engedélyezése a Microsofthoz.\nA beállítás érvénybe lépéséhez újraindítás szükséges."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/services/decorations/browser/decorationsService.i18n.json b/i18n/hun/src/vs/workbench/services/decorations/browser/decorationsService.i18n.json
deleted file mode 100644
index 3f99528a60d..00000000000
--- a/i18n/hun/src/vs/workbench/services/decorations/browser/decorationsService.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"bubbleTitle": "Kiemelt elemeket tartalmaz"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json b/i18n/hun/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json
deleted file mode 100644
index a1522b0bc3e..00000000000
--- a/i18n/hun/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"yesButton": "&&Igen",
-	"cancelButton": "Mégse"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/services/dialogs/electron-browser/dialogs.i18n.json b/i18n/hun/src/vs/workbench/services/dialogs/electron-browser/dialogs.i18n.json
deleted file mode 100644
index b04e3b7b4c7..00000000000
--- a/i18n/hun/src/vs/workbench/services/dialogs/electron-browser/dialogs.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"yesButton": "&&Igen",
-	"cancelButton": "Mégse",
-	"moreFile": "...1 további fájl nincs megjelenítve",
-	"moreFiles": "...{0} további fájl nincs megjelenítve"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/services/editor/browser/editorService.i18n.json b/i18n/hun/src/vs/workbench/services/editor/browser/editorService.i18n.json
deleted file mode 100644
index 50e968f8ee3..00000000000
--- a/i18n/hun/src/vs/workbench/services/editor/browser/editorService.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"compareLabels": "{0} ↔ {1}"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/services/editor/common/editorService.i18n.json b/i18n/hun/src/vs/workbench/services/editor/common/editorService.i18n.json
deleted file mode 100644
index ca1ee0161c1..00000000000
--- a/i18n/hun/src/vs/workbench/services/editor/common/editorService.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"compareLabels": "{0} ↔ {1}"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/services/extensions/common/extensionsRegistry.i18n.json b/i18n/hun/src/vs/workbench/services/extensions/common/extensionsRegistry.i18n.json
deleted file mode 100644
index 89f126918e8..00000000000
--- a/i18n/hun/src/vs/workbench/services/extensions/common/extensionsRegistry.i18n.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.engines": "Motorkompatibilitás.",
-	"vscode.extension.engines.vscode": "VS Code kiegészítőkhöz. Meghatározza azt a VS Code-verziót, amivel a kiegészítő kompatibilis. Nem lehet *. Például a ^0.10.5 a VS Code minimum 0.10.5-ös verziójával való kompatibilitást jelzi.",
-	"vscode.extension.publisher": "A VS Code-kiegészítő kiadója.",
-	"vscode.extension.displayName": "A kiegészítő VS Code galériában megjelenített neve.",
-	"vscode.extension.categories": "A VS Code-galériában való kategorizálásra használt kategóriák.",
-	"vscode.extension.category.languages.deprecated": "Használja helyette a „programozási nyelveket”!",
-	"vscode.extension.galleryBanner": "A VS Code piactéren használt szalagcím.",
-	"vscode.extension.galleryBanner.color": "A VS Code piactéren használt szalagcím színe.",
-	"vscode.extension.galleryBanner.theme": "A szalagcímben használt betűtípus színsémája.",
-	"vscode.extension.contributes": "A csomagban található összes szolgáltatás, amit ez a VS Code kiterjesztés tartalmaz.",
-	"vscode.extension.preview": "A kiegészítő előnézetesnek jelölése a piactéren.",
-	"vscode.extension.activationEvents": "A VS Code kiegészítő aktiválási eseményei.",
-	"vscode.extension.activationEvents.onLanguage": "Aktiváló esemény, ami akkor fut le, ha az adott nyelvhez társított fájl kerül megnyitásra.",
-	"vscode.extension.activationEvents.onCommand": "Aktiváló esemény, ami akkor fut le, amikor a megadott parancsot meghívják.",
-	"vscode.extension.activationEvents.onDebug": "Aktiváló esemény, ami akkor fut le, ha a felhasználó hibakeresést indít el vagy beállítani készül a hibakeresési konfigurációt.",
-	"vscode.extension.activationEvents.onDebugInitialConfigurations": "Aktivációs esemény, ami minden esetben kiváltódik, ha \"launch.json\"-t kell létrehozni (és az összes provideDebugConfigurations metódusokat meg kell hívni).",
-	"vscode.extension.activationEvents.onDebugResolve": "Aktiváló esemény, ami akkor fut, ha a megadott típusú hibakeresési munkamenetnek el kell indulnia (és a megfelelő resolveDebugConfiguration metódusokat meg kell hívni).",
-	"vscode.extension.activationEvents.workspaceContains": "Aktiváló esemény, ami akkor fut le, ha egy olyan mappa kerül megnyitásra, amiben legalább egy olyan fájl van, amely illeszkedik a megadott globális mintára.",
-	"vscode.extension.activationEvents.onView": "Aktiváló esemény, ami akkor fut le, amikor a megadott nézetet kiterjesztik.",
-	"vscode.extension.activationEvents.onUri": "Aktiváló esemény, ami akkor fut le, amikor megnyílik egy URI, ami ehhez a kiegészítőhöz van irányítva.",
-	"vscode.extension.activationEvents.star": "Aktiváló esemény, ami a VS Code indításakor fut le. A jó felhasználói élmény érdekében csak akkor használja ezt az eseményt, ha más aktiváló események nem alkalmasak az adott kiegészítő esetében.",
-	"vscode.extension.badges": "A kiegészítő piactéren található oldalának oldalsávjában megjelenő jelvények listája.",
-	"vscode.extension.badges.url": "A jelvény kép URL-je.",
-	"vscode.extension.badges.href": "A jelvény hivatkozása.",
-	"vscode.extension.badges.description": "A jelvény leírása.",
-	"vscode.extension.markdown": "Meghatározza a piactéren a markdown-tartalom megjelenítéséhez használt motort.",
-	"vscode.extension.qna": "Meghatározza a piactéren található „Kérdések és válaszok” (Q&A) hivatkozást. „marketplace” érték esetén a piactér alapértelmezett kérdések és válaszok oldala van engedélyezve. Egyéb szöveges tartalom esetén egy saját URL-lel rendelkező „kérdések és válaszok”-oldal adható meg! False érték esetén a „kérdések és válaszok”-oldal ki van kapcsolva.",
-	"vscode.extension.extensionDependencies": "Más kiegészítők, melyek függőségei ennek a kiegészítőnek. A kiegészítők azonosítója mindig ${publisher}.${name} formájú. Például: vscode.csharp.",
-	"vscode.extension.scripts.prepublish": "A VS Code kiegészítő publikálása előtt végrehajtott parancsfájl.",
-	"vscode.extension.scripts.uninstall": "Eltávolítási illesztőpont VS Code kiegészítők számára. Parancsfájl, ami a VS Code újraindítása (leállása és elindítása) esetén fut le a kiegészítő teljes eltávolítása után. Csak Node-parancsfájlok használhatók.",
-	"vscode.extension.icon": "Egy 128x128 pixeles ikon elérési útja."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/services/extensions/electron-browser/extensionHost.i18n.json b/i18n/hun/src/vs/workbench/services/extensions/electron-browser/extensionHost.i18n.json
deleted file mode 100644
index 10dc61c2737..00000000000
--- a/i18n/hun/src/vs/workbench/services/extensions/electron-browser/extensionHost.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"extensionHostProcess.startupFailDebug": "A kiegészítő gazdafolyamata nem idult el 10 másodperben belül. Elképzelhető, hogy megállt az első soron, és szüksége van a hibakeresőre a folytatáshoz.",
-	"extensionHostProcess.startupFail": "A kiegészítő gazdafolyamata nem idult el 10 másodperben belül. Ez probléma lehet.",
-	"reloadWindow": "Ablak újratöltése",
-	"extensionHostProcess.error": "A kiegészítő gazdafolyamatától hiba érkezett: {0}"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/services/extensions/electron-browser/extensionHostProfiler.i18n.json b/i18n/hun/src/vs/workbench/services/extensions/electron-browser/extensionHostProfiler.i18n.json
deleted file mode 100644
index 47a54ef7b7d..00000000000
--- a/i18n/hun/src/vs/workbench/services/extensions/electron-browser/extensionHostProfiler.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"message": "$(zap) Kiegészítő gazdafolyamat profilozása..."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/services/extensions/electron-browser/extensionPoints.i18n.json b/i18n/hun/src/vs/workbench/services/extensions/electron-browser/extensionPoints.i18n.json
deleted file mode 100644
index 816060ad966..00000000000
--- a/i18n/hun/src/vs/workbench/services/extensions/electron-browser/extensionPoints.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"jsonParseFail": "Hiba a(z) {0} feldolgozása közben: {1}.",
-	"fileReadFail": "A(z) ({0}) fájl nem olvasható: {1}.",
-	"jsonsParseReportErrors": "Hiba a(z) {0} feldolgozása közben: {1}.",
-	"missingNLSKey": "A(z) {0} kulcshoz tartozó üzenet nem található."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json b/i18n/hun/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json
deleted file mode 100644
index a6ca11e97bf..00000000000
--- a/i18n/hun/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"extensionsDisabled": "Az összes kiegészítő le van tiltva.",
-	"extensionHostProcess.crash": "A kiegészítő gazdafolyamata váratlanul leállt.",
-	"extensionHostProcess.unresponsiveCrash": "A kiegészítő gazdafolyamata le lett állítva, mert nem válaszolt.",
-	"devTools": "Fejlesztői eszközök megnyitása",
-	"restart": "Kiegészítő gazdafolyamatának újraindítása",
-	"overwritingExtension": "A(z) {0} kiegészítő felülírása a következővel: {1}.",
-	"extensionUnderDevelopment": "A(z) {0} elérési úton található fejlesztői kiegészítő betöltése",
-	"extensionCache.invalid": "A kiegészítők módosultak a lemezen. Töltse újra az ablakot!",
-	"reloadWindow": "Ablak újratöltése"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/services/extensions/node/extensionPoints.i18n.json b/i18n/hun/src/vs/workbench/services/extensions/node/extensionPoints.i18n.json
deleted file mode 100644
index d7f73b550d2..00000000000
--- a/i18n/hun/src/vs/workbench/services/extensions/node/extensionPoints.i18n.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"jsonParseFail": "Hiba a(z) {0} feldolgozása közben: {1}.",
-	"fileReadFail": "A(z) ({0}) fájl nem olvasható: {1}.",
-	"jsonsParseReportErrors": "Hiba a(z) {0} feldolgozása közben: {1}.",
-	"missingNLSKey": "A(z) {0} kulcshoz tartozó üzenet nem található.",
-	"notSemver": "A kiegészítő verziója nem semver-kompatibilis.",
-	"extensionDescription.empty": "A kiegészítő leírása üres",
-	"extensionDescription.publisher": "a(z) `{0}` tulajdonság kötelező és `string` típusúnak kell lennie",
-	"extensionDescription.name": "a(z) `{0}` tulajdonság kötelező és `string` típusúnak kell lennie",
-	"extensionDescription.version": "a(z) `{0}` tulajdonság kötelező és `string` típusúnak kell lennie",
-	"extensionDescription.engines": "a(z) `{0}` tulajdonság kötelező és `object` típusúnak kell lennie",
-	"extensionDescription.engines.vscode": "a(z) `{0}` tulajdonság kötelező és `string` típusúnak kell lennie",
-	"extensionDescription.extensionDependencies": "a(z) `{0}` tulajdonság elhagyható vagy `string[]` típusúnak kell lennie",
-	"extensionDescription.activationEvents1": "a(z) `{0}` tulajdonság elhagyható vagy `string[]` típusúnak kell lennie",
-	"extensionDescription.activationEvents2": "a(z) `{0}` és `{1}` megadása kötelező vagy mindkettőt el kell hagyni",
-	"extensionDescription.main1": "a(z) `{0}` tulajdonság elhagyható vagy `string` típusúnak kell lennie",
-	"extensionDescription.main2": "A `main` ({0}) nem a kiegészítő mappáján belül található ({1}). Emiatt előfordulhat, hogy a kiegészítő nem lesz hordozható.",
-	"extensionDescription.main3": "a(z) `{0}` és `{1}` megadása kötelező vagy mindkettőt el kell hagyni"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/services/files/electron-browser/fileService.i18n.json b/i18n/hun/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
deleted file mode 100644
index d5082fc09cf..00000000000
--- a/i18n/hun/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"netVersionError": "A működéshez Microsoft .NET-keretrendszer 4.5 szükséges. A telepítéshez kövesse az alábbi hivatkozást!",
-	"installNet": ".NET Framework 4.5 letöltése",
-	"neverShowAgain": "Ne jelenítse meg újra",
-	"enospcError": "A {0} nem tudja figyelni a fájlváltozásokat egy ilyen nagy munkaterületen. Kövesse az utasításokat az alábbi hivatkozáson a probléma megoldásához!",
-	"learnMore": "Utasítások",
-	"fileInvalidPath": "Érvénytelen fájlerőforrás ({0})",
-	"fileIsDirectoryError": "A fájl egy könyvtár",
-	"fileNotModifiedError": "A fájl azóta nem módosult",
-	"fileTooLargeForHeapError": "Egy ekkora fájl megnyitásához újra kell indítania a VS Code-ot, és engedélyeznie kell, hogy több memóriát használhasson.",
-	"fileTooLargeError": "A fájl túl nagy a megnyitáshoz",
-	"fileNotFoundError": "Fájl nem található ({0})",
-	"fileBinaryError": "A fájl binárisnak tűnik és nem nyitható meg szövegként",
-	"filePermission": "Engedély megtagadva a fájl írására ({0})",
-	"fileExists": "A létrehozandó fájl már létezik ({0})",
-	"fileModifiedError": "A fájl azóta módosult",
-	"fileReadOnlyError": "A fájl csak olvasható",
-	"fileMoveConflict": "Nem lehet áthelyezni vagy másolni. A fájl már létezik a célhelyen.",
-	"unableToMoveCopyError": "Nem lehet áthelyezni vagy másolni. A fájl felülírná a mappát, amiben található.",
-	"binFailed": "A következő fájlt nem sikerült a lomtárba helyezni: '{0}'",
-	"trashFailed": "A(z) {0} kukába helyezése nem sikerült"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json b/i18n/hun/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
deleted file mode 100644
index 7f2659c063a..00000000000
--- a/i18n/hun/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"invalidPath": "A(z) „{0}” erőforrás elérési útja csak abszolút lehet",
-	"fileNotFoundError": "Fájl nem található ({0})",
-	"fileIsDirectoryError": "A fájl egy könyvtár",
-	"fileNotModifiedError": "A fájl azóta nem módosult",
-	"fileBinaryError": "A fájl binárisnak tűnik és nem nyitható meg szövegként",
-	"err.create": "Nem sikerült létrehozni a(z) {0} nevű fájlt",
-	"fileMoveConflict": "Nem lehet áthelyezni vagy másolni. A fájl már létezik a célhelyen."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/services/files/node/fileService.i18n.json b/i18n/hun/src/vs/workbench/services/files/node/fileService.i18n.json
deleted file mode 100644
index 639f690d07a..00000000000
--- a/i18n/hun/src/vs/workbench/services/files/node/fileService.i18n.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"fileInvalidPath": "Érvénytelen fájlerőforrás ({0})",
-	"fileIsDirectoryError": "A fájl egy könyvtár",
-	"fileNotModifiedError": "A fájl azóta nem módosult",
-	"fileTooLargeForHeapError": "A fájlméret túllépi az alapértelmezett memóriakorlátot.  A jelenlegi beállítás szerint az alkalmazás újraindul {0}MB-os korláttal.",
-	"fileTooLargeError": "A fájl túl nagy a megnyitáshoz",
-	"fileNotFoundError": "Fájl nem található ({0})",
-	"fileBinaryError": "A fájl binárisnak tűnik és nem nyitható meg szövegként",
-	"filePermission": "Engedély megtagadva a fájl írására ({0})",
-	"fileExists": "A létrehozandó fájl már létezik ({0})",
-	"fileMoveConflict": "Nem lehet áthelyezni vagy másolni. A fájl már létezik a célhelyen.",
-	"unableToMoveCopyError": "Nem lehet áthelyezni vagy másolni. A fájl felülírná a mappát, amiben található.",
-	"foldersCopyError": "A munkaterületre nem másolhatók mappák. Válasszon ki egyedi fájlokat a másoláshoz.",
-	"fileModifiedError": "A fájl azóta módosult",
-	"fileReadOnlyError": "A fájl csak olvasható"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/services/jsonschemas/common/jsonValidationExtensionPoint.i18n.json b/i18n/hun/src/vs/workbench/services/jsonschemas/common/jsonValidationExtensionPoint.i18n.json
deleted file mode 100644
index 2ba8ba75d98..00000000000
--- a/i18n/hun/src/vs/workbench/services/jsonschemas/common/jsonValidationExtensionPoint.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"contributes.jsonValidation": "JSON-sémakonfigurációkat szolgáltat.",
-	"contributes.jsonValidation.fileMatch": "Az illesztendő fájlok mintája, például \"package.json\" vagy \"*.launch\".",
-	"contributes.jsonValidation.url": "A séma URL-címe ('http:', 'https:') vagy relatív elérési útja a kiegészítő mappájához képest ('./').",
-	"invalid.jsonValidation": "a 'configuration.jsonValidation' értékét tömbként kell megadni",
-	"invalid.fileMatch": "a 'configuration.jsonValidation.fileMatch' tulajdonság kötelező",
-	"invalid.url": "a 'configuration.jsonValidation.url' értéke URL-cím vagy relatív elérési út lehet",
-	"invalid.url.fileschema": "a 'configuration.jsonValidation.url' érvénytelen relatív elérési utat tartalmaz: {0}",
-	"invalid.url.schema": "a 'configuration.jsonValidation.url' érténének 'http:'-tal, 'https:'-tal, vagy a kiegészítőben elhelyezett sémák hivatkozása esetén './'-rel kell kezdődnie."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/services/keybinding/common/keybindingEditing.i18n.json b/i18n/hun/src/vs/workbench/services/keybinding/common/keybindingEditing.i18n.json
deleted file mode 100644
index 5aec38d16ea..00000000000
--- a/i18n/hun/src/vs/workbench/services/keybinding/common/keybindingEditing.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"errorKeybindingsFileDirty": "Nem lehet írni a billentyűparancsokat tartalmazó fájlba, mert módosítva lett. Mentse, majd próbálja újra!",
-	"parseErrors": "Nem lehet írni a billentyűparancsokat tartalmazó konfigurációs fájlba. Nyissa meg a fájlt, javítsa a benne található hibákat vagy figyelmeztetéseket, majd próbálja újra!",
-	"errorInvalidConfiguration": "Nem lehet írni a billentyűparancsokat tartalmazó konfigurációs fájlt. A fájlban van egy objektum, ami nem tömb típusú. Nyissa meg a fájlt, javítsa a hibát, majd próbálja újra!",
-	"emptyKeybindingsHeader": "Az ebben a fájlban elhelyezett billentyűparancsok felülírják az alapértelmezett beállításokat"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/services/keybinding/electron-browser/keybindingService.i18n.json b/i18n/hun/src/vs/workbench/services/keybinding/electron-browser/keybindingService.i18n.json
deleted file mode 100644
index fda6870576b..00000000000
--- a/i18n/hun/src/vs/workbench/services/keybinding/electron-browser/keybindingService.i18n.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"nonempty": "az érték nem lehet üres.",
-	"requirestring": "a(z) `{0}` tulajdonság kötelező és `string` típusúnak kell lennie",
-	"optstring": "a(z) `{0}` tulajdonság elhagyható vagy `string` típusúnak kell lennie",
-	"vscode.extension.contributes.keybindings.command": "A billentyűparancs aktiválása esetén futtatandó parancs azonosítója.",
-	"vscode.extension.contributes.keybindings.key": "Billenty vagy billentyűparancs (különálló billentyűk plusz jellel és sorozatok szóközzel, pl.: Crtl + O és Ctrl+L L).",
-	"vscode.extension.contributes.keybindings.mac": "Mac-specifikus billentyű vagy billentyűsorozat.",
-	"vscode.extension.contributes.keybindings.linux": "Linux-specifikus billentyű vagy billentyűsorozat.",
-	"vscode.extension.contributes.keybindings.win": "Windows-specifikus billentyű vagy billentyűsorozat.",
-	"vscode.extension.contributes.keybindings.when": "A billentyűparancs aktiválási feltétele.",
-	"vscode.extension.contributes.keybindings": "Billentyűparancsok kezelését teszi lehetővé.",
-	"invalid.keybindings": "Érvénytelen `contributes.{0}`: {1}",
-	"unboundCommands": "A további elérhető parancsok a következők: ",
-	"keybindings.json.title": "Billentyűparancsok konfigurációja",
-	"keybindings.json.key": "Billentyű vagy billentyűsorozat (szóközzel elválasztva)",
-	"keybindings.json.command": "A végrehajtandó parancs neve",
-	"keybindings.json.when": "A billentyűparancs aktiválási feltétele.",
-	"keybindings.json.args": "A végrehajtandó parancs számára átadott argumentumok",
-	"keyboardConfigurationTitle": "Billentyűzet",
-	"dispatch": "Meghatározza, hogy a billentyűleütések észleléséhez a `code` (ajánlott) vagy `keyCode` esemény legyen használva.",
-	"touchbar.enabled": "Ha elérhető, engedélyezi a macOS érintősávgombokat a billentyűzeten."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/services/message/browser/messageList.i18n.json b/i18n/hun/src/vs/workbench/services/message/browser/messageList.i18n.json
deleted file mode 100644
index b1c0ebe3f21..00000000000
--- a/i18n/hun/src/vs/workbench/services/message/browser/messageList.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"alertErrorMessage": "Hiba: {0}",
-	"alertWarningMessage": "Figyelmeztetés: {0}",
-	"alertInfoMessage": "Információ: {0}",
-	"error": "Hiba",
-	"warning": "Figyelmeztetés",
-	"info": "Információ",
-	"close": "Bezárás"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/services/message/electron-browser/messageService.i18n.json b/i18n/hun/src/vs/workbench/services/message/electron-browser/messageService.i18n.json
deleted file mode 100644
index a1522b0bc3e..00000000000
--- a/i18n/hun/src/vs/workbench/services/message/electron-browser/messageService.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"yesButton": "&&Igen",
-	"cancelButton": "Mégse"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/services/mode/common/workbenchModeService.i18n.json b/i18n/hun/src/vs/workbench/services/mode/common/workbenchModeService.i18n.json
deleted file mode 100644
index dda926c5198..00000000000
--- a/i18n/hun/src/vs/workbench/services/mode/common/workbenchModeService.i18n.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.contributes.languages": "Nyelvdeklarációkat definiál.",
-	"vscode.extension.contributes.languages.id": "A nyelv azonosítója",
-	"vscode.extension.contributes.languages.aliases": "A nyelv kiegészítő nevei.",
-	"vscode.extension.contributes.languages.extensions": "A nyelvhez hozzárendelt fájlkiterjesztések.",
-	"vscode.extension.contributes.languages.filenames": "A nyelvhez hozzárendelt fájlnevek.",
-	"vscode.extension.contributes.languages.filenamePatterns": "A nyelvhez hozzárendelt globális minták.",
-	"vscode.extension.contributes.languages.mimetypes": "A nyelvhez hozzárendelt MIME-típusok.",
-	"vscode.extension.contributes.languages.firstLine": "Reguláris kifejezés, ami az adott nyelven írt fájl első sorára illeszkedik.",
-	"vscode.extension.contributes.languages.configuration": "A nyelvhez tartozó konfigurációkat tartalmazó fájl relatív elérési útja.",
-	"invalid": "Érvénytelen `contributes.{0}`: a várt érték egy tömb.",
-	"invalid.empty": "A `contributes.{0}` értéke üres",
-	"require.id": "a(z) `{0}` tulajdonság kötelező és `string` típusúnak kell lennie",
-	"opt.extensions": "a(z) `{0}` tulajdonság elhagyható és `string[]` típusúnak kell lennie",
-	"opt.filenames": "a(z) `{0}` tulajdonság elhagyható és `string[]` típusúnak kell lennie",
-	"opt.firstLine": "a(z) `{0}` tulajdonság elhagyható és `string` típusúnak kell lennie",
-	"opt.configuration": "a(z) `{0}` tulajdonság elhagyható és `string` típusúnak kell lennie",
-	"opt.aliases": "a(z) `{0}` tulajdonság elhagyható és `string[]` típusúnak kell lennie",
-	"opt.mimetypes": "a(z) `{0}` tulajdonság elhagyható és `string[]` típusúnak kell lennie"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/services/progress/browser/progressService2.i18n.json b/i18n/hun/src/vs/workbench/services/progress/browser/progressService2.i18n.json
deleted file mode 100644
index d15b9a685b2..00000000000
--- a/i18n/hun/src/vs/workbench/services/progress/browser/progressService2.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"progress.subtitle": "{0} – {1}",
-	"progress.title": "{0}: {1}",
-	"cancel": "Mégse"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/services/textMate/electron-browser/TMGrammars.i18n.json b/i18n/hun/src/vs/workbench/services/textMate/electron-browser/TMGrammars.i18n.json
deleted file mode 100644
index b6c32f7bccf..00000000000
--- a/i18n/hun/src/vs/workbench/services/textMate/electron-browser/TMGrammars.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.contributes.grammars": "TextMate-tokenizálókat szolgáltat.",
-	"vscode.extension.contributes.grammars.language": "Annak a nyelvnek az azonosítója, amely számára szolgáltatva van ez a szintaxis.",
-	"vscode.extension.contributes.grammars.scopeName": "A tmLanguage-fájl által használt TextMate-hatókör neve.",
-	"vscode.extension.contributes.grammars.path": "A tmLanguage-fájl elérési útja. Az elérési út relatív a kiegészítő mappájához képest, és általában './syntaxes/'-zal kezdődik.",
-	"vscode.extension.contributes.grammars.embeddedLanguages": "Hatókörnevek leképezése nyelvazonosítókra, ha a nyelvtan tartalmaz beágyazott nyelveket.",
-	"vscode.extension.contributes.grammars.tokenTypes": "Hatókörnevek leképezése tokentípusokra.",
-	"vscode.extension.contributes.grammars.injectTo": "Azon nyelvi hatókörök nevei, ahová be lesz ágyazva ez a nyelvtan."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/services/textMate/electron-browser/TMSyntax.i18n.json b/i18n/hun/src/vs/workbench/services/textMate/electron-browser/TMSyntax.i18n.json
deleted file mode 100644
index 83e21414598..00000000000
--- a/i18n/hun/src/vs/workbench/services/textMate/electron-browser/TMSyntax.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"invalid.language": "Ismeretlen nyelv található a következőben: `contributes.{0}.language`. A megadott érték: {1}",
-	"invalid.scopeName": "Hiányzó karakterlánc a `contributes.{0}.scopeName`-ben. A megadott érték: {1}",
-	"invalid.path.0": "Hiányzó karakterlánc a `contributes.{0}.path`-ban. A megadott érték: {1}",
-	"invalid.injectTo": "A `contributes.{0}.injectTo` értéke érvénytelen. Az értéke egy tömb lehet, ami nyelvhatókörök neveit tartalmazza. A megadott érték: {1}",
-	"invalid.embeddedLanguages": "A `contributes.{0}.embeddedLanguages` értéke érvénytelen. Az értéke egy hatókörnév-nyelv kulcs-érték párokat tartalmazó objektum lehet. A megadott érték: {1}",
-	"invalid.tokenTypes": "A `contributes.{0}.tokenTypes` értéke érvénytelen. Az értéke egy hatókörnév-tokentípus kulcs-érték párokat tartalmazó objektum lehet. A megadott érték: {1}",
-	"invalid.path.1": "A `contributes.{0}.path` ({1}) nem a kiegészítő mappáján belül található ({2}). Emiatt előfordulhat, hogy a kiegészítő nem lesz hordozható.",
-	"no-tm-grammar": "Nincs TM Grammar regisztrálva ehhez a nyelvhez."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/services/textfile/common/textFileEditorModel.i18n.json b/i18n/hun/src/vs/workbench/services/textfile/common/textFileEditorModel.i18n.json
deleted file mode 100644
index 1cb5234683f..00000000000
--- a/i18n/hun/src/vs/workbench/services/textfile/common/textFileEditorModel.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"saveFileFirst": "A fájl módosítva lett. Mentse, mielőtt megnyitná egy másik kódolással.",
-	"genericSaveError": "Hiba a(z) {0} mentése közben ({1})."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/services/textfile/common/textFileService.i18n.json b/i18n/hun/src/vs/workbench/services/textfile/common/textFileService.i18n.json
deleted file mode 100644
index 7b00815a6fd..00000000000
--- a/i18n/hun/src/vs/workbench/services/textfile/common/textFileService.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"files.backup.failSave": "A módosított fájlokat nem sikerült kiírni a biztonsági mentéseket tartalmazó tárhelyre (Hiba: {0}). Próbálja meg menteni a fájlokat, majd lépjen ki!"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json b/i18n/hun/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json
deleted file mode 100644
index b94fe48249e..00000000000
--- a/i18n/hun/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"saveChangesMessage": "Szeretné menteni a(z) {0} fájlban elvégzett módosításokat?",
-	"saveChangesMessages": "Szeretné menteni a következő {0} fájlban elvégzett módosításokat?",
-	"saveAll": "Ö&&sszes mentése",
-	"save": "Menté&&s",
-	"dontSave": "&&Ne mentse",
-	"cancel": "Mégse",
-	"saveChangesDetail": "A módosítások elvesznek, ha nem menti őket.",
-	"allFiles": "Összes fájl",
-	"noExt": "Nincs kiterjesztés"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/services/themes/common/colorExtensionPoint.i18n.json b/i18n/hun/src/vs/workbench/services/themes/common/colorExtensionPoint.i18n.json
deleted file mode 100644
index de7dfdd7463..00000000000
--- a/i18n/hun/src/vs/workbench/services/themes/common/colorExtensionPoint.i18n.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"contributes.color": "Kiegészítők által definiált, témázható színeket szolgáltat.",
-	"contributes.color.id": "A témázható szín azonosítója.",
-	"contributes.color.id.format": "Az azonosítókat az aa[.bb]* formában kell megadni.",
-	"contributes.color.description": "A témázható szín leírása.",
-	"contributes.defaults.light": "Az alapértelmezett szín világos témák esetén. Vagy egy szín hex formátumban (#RRGGBB[AA]) vagy egy témázható szín azonosítója, ami meghatározza az alapértelmezett értéket.",
-	"contributes.defaults.dark": "Az alapértelmezett szín sötét témák esetén. Vagy egy szín hex formátumban (#RRGGBB[AA]) vagy egy témázható szín azonosítója, ami meghatározza az alapértelmezett értéket.",
-	"contributes.defaults.highContrast": "Az alapértelmezett szín nagy kontrasztú témák esetén. Vagy egy szín hex formátumban (#RRGGBB[AA]) vagy egy témázható szín azonosítója, ami meghatározza az alapértelmezett értéket.",
-	"invalid.colorConfiguration": "a 'configuration.colors' értékét tömbként kell megadni",
-	"invalid.default.colorType": "A(z) {0} értéke egy szín hex formátumban (#RRGGBB[AA]) vagy egy témázható szín azonosítója, ami meghatározza az alapértelmezett értéket.",
-	"invalid.id": "A 'configuration.colors.id' értékét meg kell adni, és nem lehet üres",
-	"invalid.id.format": "A 'configuration.colors.id' értékét a word[.word]* formátumban kell megadni.",
-	"invalid.description": "A 'configuration.colors.description' értékét meg kell adni, és nem lehet üres",
-	"invalid.defaults": "A 'configuration.colors.defaults' értékét meg kell adni, és tartalmaznia kell 'light', 'dark' és 'highContrast' tulajdonságokat"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/services/themes/common/colorThemeSchema.i18n.json b/i18n/hun/src/vs/workbench/services/themes/common/colorThemeSchema.i18n.json
deleted file mode 100644
index 595de7359bd..00000000000
--- a/i18n/hun/src/vs/workbench/services/themes/common/colorThemeSchema.i18n.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"schema.token.settings": "A token színe és stílusa.",
-	"schema.token.foreground": "A token előtérszíne.",
-	"schema.token.background.warning": "A tokenek háttérszíne jelenleg nem támogatott.",
-	"schema.token.fontStyle": "A szabály betűstílusa 'italic', 'bold', 'underline', ezek kombinációja lehet. Az üres szöveg eltávolítja az örökölt beállításokat.",
-	"schema.fontStyle.error": "A betűstílus 'italic', 'bold', 'underline', ezek kombinációja vagy üres szöveg lehet.",
-	"schema.token.fontStyle.none": "Nincs (örökölt stílusok eltávolítása)",
-	"schema.properties.name": "A szabály leírása.",
-	"schema.properties.scope": "Hatókörszelektor, amire ez a szabály illeszkedik.",
-	"schema.tokenColors.path": "Egy tmTheme-fájl elérési útja (az aktuális fájlhoz képest relatívan).",
-	"schema.colors": "A szintaktikai kiemeléshez használt színek"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/services/themes/common/fileIconThemeSchema.i18n.json b/i18n/hun/src/vs/workbench/services/themes/common/fileIconThemeSchema.i18n.json
deleted file mode 100644
index 08a13b6e304..00000000000
--- a/i18n/hun/src/vs/workbench/services/themes/common/fileIconThemeSchema.i18n.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"schema.folderExpanded": "Kinyitott mappánál használt ikon. A kinyitott mappa ikonját nem kötelező megadni. Ha nincs  megadva, akkor a mappaikon lesz megjelenítve.",
-	"schema.folder": "A bezárt mappák ikonja, illetve ha a folderExpanded nincs megadva, akkor a kinyitott mappáké is.",
-	"schema.file": "Az alapértelmezett fájlikon, ami minden olyan fájlnál megjelenik, ami nem illeszkedik egyetlen kiterjesztésre, fájlnévre vagy nyelvazonosítóra sem.",
-	"schema.folderNames": "Ikonokat társít mappanevekhez. Az objektum kulcsa a mappa neve elérési útvonalrészletek nélkül. Nem tartalmazhat mintákat és helyettesítő karaktereket. A mappa nevének vizsgálatánál a kis- és nagybetűk nincsenek megkülönböztetve.",
-	"schema.folderName": "A társításhoz tartozó ikondefiníció azonosítója.",
-	"schema.folderNamesExpanded": "Ikonokat társít mappanevekhez kinyitott mappák esetén. Az objektum kulcsa a mappa neve elérési útvonalrészletek nélkül. Nem tartalmazhat mintákat és helyettesítő karaktereket. A mappa nevének vizsgálatánál a kis- és nagybetűk nincsenek megkülönböztetve.",
-	"schema.folderNameExpanded": "A társításhoz tartozó ikondefiníció azonosítója. ",
-	"schema.fileExtensions": "Ikonokat társít fájlkiterjesztésekhez. Az objektum kulcsa a fájlkiterjesztés neve. A kiterjesztés neve a fájl nevének utolsó része az utolsó pont után (a pont nélkül). A kiterjesztések vizsgálatánál a kis- és nagybetűk nincsenek megkülönböztetve. ",
-	"schema.fileExtension": "A társításhoz tartozó ikondefiníció azonosítója. ",
-	"schema.fileNames": "Ikonokat társít fájlnevekhez. Az objektum kulcsa a fájl teljes neve, az elérési út többi része nélkül. A fájlnév tartalmazhat pontokat és fájlkiterjesztést. Nem tartalmazhat mintákat és helyettesítő karaktereket. A fájlnevek vizsgálatánál a kis- és nagybetűk nincsenek megkülönböztetve.",
-	"schema.fileName": "A társításhoz tartozó ikondefiníció azonosítója. ",
-	"schema.languageIds": "Ikonokat társít nyelvekhez. Az objektum kulcsa a nyelvet szolgáltató komponens által definiált nyelvazonosító.",
-	"schema.languageId": "A társításhoz tartozó ikondefiníció azonosítója. ",
-	"schema.fonts": "Az ikondefiníciókban használt betűkészletek.",
-	"schema.id": "A betűkészlet azonosítója.",
-	"schema.src": "A betűkészlet elérési útja.",
-	"schema.font-path": "A betűkészlet elérési útja, relatívan az aktuális ikontémafájlhoz képest.",
-	"schema.font-format": "A betűkészlet formátuma.",
-	"schema.font-weight": "A betűkészlet betűvastagsága.",
-	"schema.font-sstyle": "A betűkészlet stílusa.",
-	"schema.font-size": "A betűkészlet alapértelmezett mérete.",
-	"schema.iconDefinitions": "A fájlok ikonokhoz történő rendelésénél használható ikonok leírása.",
-	"schema.iconDefinition": "Egy ikondefiníció. Az objektum kulcsa a definíció azonosítója.",
-	"schema.iconPath": "SVG vagy PNG használata esetén a kép elérési útja. Az elérési út relatív az ikonkészletfájlhoz képest.",
-	"schema.fontCharacter": "Betűkészlet használata esetén a betűkészletből használandó karakter.",
-	"schema.fontColor": "Betűkészlet használata esetén a használt szín.",
-	"schema.fontSize": "Betűkészlet használata esetén a betűkészlet mérete a szöveg betűkészletének méretéhez képest, százalékban. Ha nincs megadva, akkor a betűkészlet-definícióban megadott érték van használva.",
-	"schema.fontId": "Betűkészlet használata esetén a betűkészlet azonosítója. Ha nincs megadva, akkor az első betűkészlet-definíció van használva.",
-	"schema.light": "Fájlikon-társítások világos témák használata esetén. Nem kötelező megadni.",
-	"schema.highContrast": "Fájlikon-társítások nagy kontrasztú témák használata esetén. Nem kötelező megadni.",
-	"schema.hidesExplorerArrows": "Meghatározza, hogy a fájlkezelőben megjelenő nyilak el legyenek-e rejtve, amikor ez a téma aktív."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/services/themes/electron-browser/colorThemeData.i18n.json b/i18n/hun/src/vs/workbench/services/themes/electron-browser/colorThemeData.i18n.json
deleted file mode 100644
index b8af5ee7245..00000000000
--- a/i18n/hun/src/vs/workbench/services/themes/electron-browser/colorThemeData.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"error.cannotparsejson": "Hiba a JSON témafájl feldolgozása közben: {0}",
-	"error.invalidformat.colors": "Hiba a színtémafájl feldolgozása közben: {0}. A 'colors' értéke nem 'object' típusú.",
-	"error.invalidformat.tokenColors": "Hiba a színtémafájl feldolgozása közben: {0}. A 'tokenColors' tulajdonság vagy egy színeket tartalmazó tömb legyen vagy egy TextMate témafájl elérési útja.",
-	"error.plist.invalidformat": "Hiba a tmTheme-fájl feldolgozása közben: {0}. A 'settings' nem egy tömb.",
-	"error.cannotparse": "Hiba a tmTheme-fájl feldolgozása közben: {0}",
-	"error.cannotload": "Hiba a(z) {0} tmTheme fájl betöltése közben: {1}"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/services/themes/electron-browser/colorThemeStore.i18n.json b/i18n/hun/src/vs/workbench/services/themes/electron-browser/colorThemeStore.i18n.json
deleted file mode 100644
index 2c95279f677..00000000000
--- a/i18n/hun/src/vs/workbench/services/themes/electron-browser/colorThemeStore.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.contributes.themes": "TextMate-színtémákat szolgáltat.",
-	"vscode.extension.contributes.themes.id": "Az ikontéma felhasználói beállításokban használt azonosítója.",
-	"vscode.extension.contributes.themes.label": "A színtéma felhasználói felületen megjelenő neve.",
-	"vscode.extension.contributes.themes.uiTheme": "A szerkesztőablak körül megjelenő elemek alaptémája. A 'vs' a világos, a 'vs-dark' a sötét színtéma, a 'hc-black' pedig a sötét, nagy kontrasztú téma.",
-	"vscode.extension.contributes.themes.path": "A tmTheme-fájl elérési útja. Az elérési út relatív a kiegészítő mappájához képest, és általában './themes/themeFile.tmTheme'.",
-	"reqarray": "a(z) `{0}` kiegszítési pontot tömbként kell megadni",
-	"reqpath": "Hiányzó karakterlánc a `contributes.{0}.path`-ban. A megadott érték: {1}",
-	"invalid.path.1": "A `contributes.{0}.path` ({1}) nem a kiegészítő mappáján belül található ({2}). Emiatt előfordulhat, hogy a kiegészítő nem lesz hordozható."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/services/themes/electron-browser/fileIconThemeData.i18n.json b/i18n/hun/src/vs/workbench/services/themes/electron-browser/fileIconThemeData.i18n.json
deleted file mode 100644
index 85d635ea7ea..00000000000
--- a/i18n/hun/src/vs/workbench/services/themes/electron-browser/fileIconThemeData.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"error.cannotparseicontheme": "Hiba a fájlikonokat leíró fájl feldolgozása közben: {0}"
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/services/themes/electron-browser/fileIconThemeStore.i18n.json b/i18n/hun/src/vs/workbench/services/themes/electron-browser/fileIconThemeStore.i18n.json
deleted file mode 100644
index b57b09634fd..00000000000
--- a/i18n/hun/src/vs/workbench/services/themes/electron-browser/fileIconThemeStore.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.contributes.iconThemes": "Fájlikontémákat szolgáltat.",
-	"vscode.extension.contributes.iconThemes.id": "Az ikontéma felhasználói beállításokban használt azonosítója.",
-	"vscode.extension.contributes.iconThemes.label": "Az ikontéma felhasználói felületen megjelenő neve.",
-	"vscode.extension.contributes.iconThemes.path": "A témadefiníciós fájl elérési útja. Az elérési út relatív a kiegészítő mappájához képest, és általában ./icons/awesome-icon-theme.json'.",
-	"reqarray": "a(z) `{0}` kiegszítési pontot tömbként kell megadni",
-	"reqpath": "Hiányzó karakterlánc a `contributes.{0}.path`-ban. A megadott érték: {1}",
-	"reqid": "Hiányzó karakterlánc a `contributes.{0}.id`-ben. A megadott érték: {1}",
-	"invalid.path.1": "A `contributes.{0}.path` ({1}) nem a kiegészítő mappáján belül található ({2}). Emiatt előfordulhat, hogy a kiegészítő nem lesz hordozható."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json b/i18n/hun/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
deleted file mode 100644
index cf978af5d8a..00000000000
--- a/i18n/hun/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"error.cannotloadtheme": "Nem sikerült betölteni a(z) '{0}' témát: {1}.",
-	"colorTheme": "Meghatározza a munkaterületen használt színtémát.",
-	"colorThemeError": "A téma ismeretlen vagy nincs telepítve.",
-	"iconTheme": "Meghatározza a munkaterületen használt ikontémát. 'null' érték esetén nem jelenik meg egyetlen fájlikon sem.",
-	"noIconThemeDesc": "Nincsenek fájlikonok",
-	"iconThemeError": "A fájlikontéma ismeretlen vagy nincs telepítve.",
-	"workbenchColors": "Felülírja az aktuális színtémában definiált színeket.",
-	"editorColors.comments": "Meghatározza a megjegyzések színét és stílusát.",
-	"editorColors.strings": "Meghatározza a sztringliterálok színét és stílusát.",
-	"editorColors.keywords": "Meghatározza a kulcsszavak színét és stílusát.",
-	"editorColors.numbers": "Meghatározza a számliterálok színét és stílusát.",
-	"editorColors.types": "Meghatározza a típusdeklarációk és -referenciák színét és stílusát.",
-	"editorColors.functions": "Meghatározza a függvénydeklarációk és -referenciák színét és stílusát.",
-	"editorColors.variables": "Meghatározza a változódeklarációk és -referenciák színét és stílusát.",
-	"editorColors.textMateRules": "Színek és stílusok beállítása textmate témázási szabályok alapján (haladó).",
-	"editorColors": "Felülírja az aktuális színtémában definiált, szerkesztőablakhoz kapcsolódó színeket és betűstílusokat."
-}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json b/i18n/hun/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json
deleted file mode 100644
index eda2e6fffa6..00000000000
--- a/i18n/hun/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"errorInvalidTaskConfiguration": "Nem sikerült írni a munkaterület konfigurációs fájljába. Nyissa meg a fájlt, javítsa a benne található hibákat és figyelmeztetéseket, majd próbálja újra!",
-	"errorWorkspaceConfigurationFileDirty": "Nem sikerült írni a munkaterület konfigurációs fájljába, mert módosítva lett. Mentse, majd próbálja újra!",
-	"openWorkspaceConfigurationFile": "Munkaterület-konfiguráció megnyitása"
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/azure-account/out/azure-account.i18n.json b/i18n/ita/extensions/azure-account/out/azure-account.i18n.json
deleted file mode 100644
index 7417dd475b9..00000000000
--- a/i18n/ita/extensions/azure-account/out/azure-account.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"azure-account.copyAndOpen": "Copia e apri",
-	"azure-account.close": "Chiudi",
-	"azure-account.login": "Accedi",
-	"azure-account.loginFirst": "Non è stato eseguito l'accesso. Eseguirlo.",
-	"azure-account.userCodeFailed": "L'acquisizione del codice utente non è riuscita",
-	"azure-account.tokenFailed": "Acquisizione del token con il codice dispositivo",
-	"azure-account.tokenFromRefreshTokenFailed": "Acquisizione del token con il token di aggiornamento"
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/azure-account/out/extension.i18n.json b/i18n/ita/extensions/azure-account/out/extension.i18n.json
deleted file mode 100644
index a89b7f23c89..00000000000
--- a/i18n/ita/extensions/azure-account/out/extension.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"azure-account.loggingIn": "Azure: accesso...",
-	"azure-account.loggedIn": "Azure: {0}"
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/bat/package.i18n.json b/i18n/ita/extensions/bat/package.i18n.json
deleted file mode 100644
index 57bd86e640b..00000000000
--- a/i18n/ita/extensions/bat/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Nozioni di base del linguaggio Windows Bat",
-	"description": "Offre gli snippet, la sottolineatura delle sintassi, il match delle parentesi e il folding nei file batch Windows."
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/clojure/package.i18n.json b/i18n/ita/extensions/clojure/package.i18n.json
deleted file mode 100644
index 7e2eebcb932..00000000000
--- a/i18n/ita/extensions/clojure/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Nozioni di base del linguaggio Clojure",
-	"description": "Offre la sottolineatura delle sintassi e il match delle parentesi nei file Clojure."
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/coffeescript/package.i18n.json b/i18n/ita/extensions/coffeescript/package.i18n.json
deleted file mode 100644
index 5a017283e39..00000000000
--- a/i18n/ita/extensions/coffeescript/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Nozioni di base sul linguaggio CoffeeScript",
-	"description": "Offre gli snippet, la sottolineatura delle sintassi, il match delle parentesi e il folding nei file CoffeeScript."
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/configuration-editing/out/extension.i18n.json b/i18n/ita/extensions/configuration-editing/out/extension.i18n.json
deleted file mode 100644
index 6e5448a6a92..00000000000
--- a/i18n/ita/extensions/configuration-editing/out/extension.i18n.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"workspaceFolder": "Percorso della cartella aperta in VS Code",
-	"workspaceFolderBasename": "Nome della cartella aperta In VS Code senza barre di separazione (/)",
-	"relativeFile": "Il file attualmente aperto relativo a ${workspaceFolder}",
-	"file": "File attualmente aperto",
-	"cwd": "Cartella di lavoro attuale per il task di avvio",
-	"lineNumber": "La riga attuale nel file attivo",
-	"selectedText": "Il testo selezionato nel file attivo",
-	"fileDirname": "Il nome della cartella del file attuale",
-	"fileExtname": "L'estensione del file attualmente aperto",
-	"fileBasename": "Il nome del file attualmente aperto",
-	"fileBasenameNoExtension": "Il nome del file attualmente aperto senza estensione",
-	"exampleExtension": "Esempio"
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json b/i18n/ita/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json
deleted file mode 100644
index 1417314d6a2..00000000000
--- a/i18n/ita/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"activeEditorShort": "il nome del file (ad esempio MyFile.txt)",
-	"activeEditorMedium": "il percorso del file relativo alla cartella dell'area di lavoro (ad es. myFolder/myFile.txt)",
-	"activeEditorLong": "il percorso completo del file (ad es. /Users/Development/myProject/myFolder/myFile.txt)",
-	"rootName": "nome dell'Area di lavoro (ad es. myFolder o myWorkspace)",
-	"rootPath": "percorso dell'Area di lavoro (ad es. /Users/Development/myWorkspace)",
-	"folderName": "nome della cartella dell'area di lavoro in cui è contenuto il file (ad es. myFolder)",
-	"folderPath": "percorso della cartella dell'area di lavoro in cui è contenuto il file (ad es. /Users/Development/myFolder)",
-	"appName": "ad esempio VS Code",
-	"dirty": "un indicatore dirty se l'editor attivo è dirty",
-	"separator": "un separatore condizionale (' - ') visualizzato solo se circondato da variabili con valori",
-	"assocLabelFile": "File con estensione",
-	"assocDescriptionFile": "Esegue il mapping di tutti i file il cui nome file corrisponde al criterio GLOB alla lingua con l'identificatore specificato.",
-	"assocLabelPath": "File con percorso",
-	"assocDescriptionPath": "Esegue il mapping di tutti i file il cui percorso assoluto corrisponde al criterio GLOB alla lingua con l'identificatore specificato.",
-	"fileLabel": "File in base all'estensione",
-	"fileDescription": "Trova tutti i file di un'estensione di file specifica.",
-	"filesLabel": "File con più estensioni",
-	"filesDescription": "Trova tutti i file con qualsiasi estensione di file.",
-	"derivedLabel": "File con elementi di pari livello in base al nome",
-	"derivedDescription": "Trova file con elementi di pari livello e nome identico ma estensione diversa.",
-	"topFolderLabel": "Cartella in base al nome (primo livello)",
-	"topFolderDescription": "Trova una cartella di primo livello con un nome specifico.",
-	"topFoldersLabel": "Cartella con più nomi (primo livello)",
-	"topFoldersDescription": "Trova più cartelle di primo livello.",
-	"folderLabel": "Cartella in base al nome (qualsiasi percorso)",
-	"folderDescription": "Trova una cartella con un nome specifico in qualsiasi percorso.",
-	"falseDescription": "Disabilita il criterio.",
-	"trueDescription": "Abilita il criterio.",
-	"siblingsDescription": "Trova file con elementi di pari livello e nome identico ma estensione diversa.",
-	"languageSpecificEditorSettings": "Impostazioni dell'editor specifiche del linguaggio",
-	"languageSpecificEditorSettingsDescription": "Esegue l'override delle impostazioni dell'editor per il linguaggio"
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/configuration-editing/package.i18n.json b/i18n/ita/extensions/configuration-editing/package.i18n.json
deleted file mode 100644
index 38af8d4423f..00000000000
--- a/i18n/ita/extensions/configuration-editing/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Modifica della configurazione",
-	"description": "Offre funzionalità (IntelliSense avanzato, auto correzione) nei file di configurazione come le impostazioni, i file di suggerimenti di avvio e di estensione."
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/cpp/package.i18n.json b/i18n/ita/extensions/cpp/package.i18n.json
deleted file mode 100644
index e37028ee02a..00000000000
--- a/i18n/ita/extensions/cpp/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Nozioni fondamentali del linguaggio C/C++",
-	"description": "Offre gli snippet, la sottolineatura delle sintassi, il match delle parentesi e il folding nei file C/C++."
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/csharp/package.i18n.json b/i18n/ita/extensions/csharp/package.i18n.json
deleted file mode 100644
index 30b9c0af4c7..00000000000
--- a/i18n/ita/extensions/csharp/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Nozioni di base del linguaggio c#",
-	"description": "Offre gli snippet, la sottolineatura delle sintassi, il match delle parentesi e il folding nei file C#."
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/css-language-features/client/out/cssMain.i18n.json b/i18n/ita/extensions/css-language-features/client/out/cssMain.i18n.json
deleted file mode 100644
index 49766496907..00000000000
--- a/i18n/ita/extensions/css-language-features/client/out/cssMain.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"cssserver.name": "Server di linguaggio CSS",
-	"folding.start": "Inizio di una regione riducibile",
-	"folding.end": "Fine di una regione riducibile"
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/css-language-features/package.i18n.json b/i18n/ita/extensions/css-language-features/package.i18n.json
deleted file mode 100644
index 35517becb5b..00000000000
--- a/i18n/ita/extensions/css-language-features/package.i18n.json
+++ /dev/null
@@ -1,81 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Funzionalità del linguaggio CSS",
-	"description": "Offre un supporto avanzato per i file CSS, LESS e SCSS",
-	"css.title": "CSS",
-	"css.lint.argumentsInColorFunction.desc": "Numero di parametri non valido",
-	"css.lint.boxModel.desc": "Non usare width o height con padding o border",
-	"css.lint.compatibleVendorPrefixes.desc": "Quando si usa un prefisso specifico del fornitore, assicurarsi di includere anche tutte le altre proprietà specifiche del fornitore",
-	"css.lint.duplicateProperties.desc": "Non usare definizioni di stile duplicate",
-	"css.lint.emptyRules.desc": "Non usare set di regole vuoti",
-	"css.lint.float.desc": "Evitare di usare 'float'. Con gli elementi float si ottiene codice CSS che causa facilmente interruzioni in caso di modifica di un aspetto del layout.",
-	"css.lint.fontFaceProperties.desc": "La regola @font-face deve definire le proprietà 'src' e 'font-family'",
-	"css.lint.hexColorLength.desc": "I colori esadecimali devono essere composti da tre o sei numeri esadecimali",
-	"css.lint.idSelector.desc": "I selettori non devono contenere ID perché queste regole sono strettamente accoppiate al codice HTML.",
-	"css.lint.ieHack.desc": "Gli hack IE sono necessari solo per il supporto di IE7 e versioni precedenti",
-	"css.lint.important.desc": "Evitare di usare !important perché indica che la specificità dell'intero codice CSS non è più controllabile ed è necessario effettuarne il refactoring.",
-	"css.lint.importStatement.desc": "Le istruzioni Import non vengono caricate in parallelo",
-	"css.lint.propertyIgnoredDueToDisplay.desc": "La proprietà viene ignorata a causa della visualizzazione. Ad esempio, con 'display: inline', le proprietà width, height, margin-top, margin-bottom e float non hanno effetto",
-	"css.lint.universalSelector.desc": "Il selettore universale (*) è notoriamente lento",
-	"css.lint.unknownProperties.desc": "Proprietà sconosciuta.",
-	"css.lint.unknownVendorSpecificProperties.desc": "Proprietà specifica del fornitore sconosciuta.",
-	"css.lint.vendorPrefix.desc": "Quando si usa un prefisso specifico del fornitore, includere anche la proprietà standard",
-	"css.lint.zeroUnits.desc": "Non è necessaria alcuna unità per lo zero",
-	"css.trace.server.desc": "Traccia la comunicazione tra VS Code e il server del linguaggio CSS.",
-	"css.validate.title": "Controlla la convalida CSS e le gravità dei problemi.",
-	"css.validate.desc": "Abilita o disabilita tutte le convalide",
-	"less.title": "LESS",
-	"less.lint.argumentsInColorFunction.desc": "Numero di parametri non valido",
-	"less.lint.boxModel.desc": "Non usare width o height con padding o border",
-	"less.lint.compatibleVendorPrefixes.desc": "Quando si usa un prefisso specifico del fornitore, assicurarsi di includere anche tutte le altre proprietà specifiche del fornitore",
-	"less.lint.duplicateProperties.desc": "Non usare definizioni di stile duplicate",
-	"less.lint.emptyRules.desc": "Non usare set di regole vuoti",
-	"less.lint.float.desc": "Evitare di usare 'float'. Con gli elementi float si ottiene codice CSS che causa facilmente interruzioni in caso di modifica di un aspetto del layout.",
-	"less.lint.fontFaceProperties.desc": "La regola @font-face deve definire le proprietà 'src' e 'font-family'",
-	"less.lint.hexColorLength.desc": "I colori esadecimali devono essere composti da tre o sei numeri esadecimali",
-	"less.lint.idSelector.desc": "I selettori non devono contenere ID perché queste regole sono strettamente accoppiate al codice HTML.",
-	"less.lint.ieHack.desc": "Gli hack IE sono necessari solo per il supporto di IE7 e versioni precedenti",
-	"less.lint.important.desc": "Evitare di usare !important perché indica che la specificità dell'intero codice CSS non è più controllabile ed è necessario effettuarne il refactoring.",
-	"less.lint.importStatement.desc": "Le istruzioni Import non vengono caricate in parallelo",
-	"less.lint.propertyIgnoredDueToDisplay.desc": "La proprietà viene ignorata a causa della visualizzazione. Ad esempio, con 'display: inline', le proprietà width, height, margin-top, margin-bottom e float non hanno effetto",
-	"less.lint.universalSelector.desc": "Il selettore universale (*) è notoriamente lento",
-	"less.lint.unknownProperties.desc": "Proprietà sconosciuta.",
-	"less.lint.unknownVendorSpecificProperties.desc": "Proprietà specifica del fornitore sconosciuta.",
-	"less.lint.vendorPrefix.desc": "Quando si usa un prefisso specifico del fornitore, includere anche la proprietà standard",
-	"less.lint.zeroUnits.desc": "Non è necessaria alcuna unità per lo zero",
-	"less.validate.title": "Controlla la convalida LESS e le gravità dei problemi.",
-	"less.validate.desc": "Abilita o disabilita tutte le convalide",
-	"scss.title": "SCSS (Sass)",
-	"scss.lint.argumentsInColorFunction.desc": "Numero di parametri non valido",
-	"scss.lint.boxModel.desc": "Non usare width o height con padding o border",
-	"scss.lint.compatibleVendorPrefixes.desc": "Quando si usa un prefisso specifico del fornitore, assicurarsi di includere anche tutte le altre proprietà specifiche del fornitore",
-	"scss.lint.duplicateProperties.desc": "Non usare definizioni di stile duplicate",
-	"scss.lint.emptyRules.desc": "Non usare set di regole vuoti",
-	"scss.lint.float.desc": "Evitare di usare 'float'. Con gli elementi float si ottiene codice CSS che causa facilmente interruzioni in caso di modifica di un aspetto del layout.",
-	"scss.lint.fontFaceProperties.desc": "La regola @font-face deve definire le proprietà 'src' e 'font-family'",
-	"scss.lint.hexColorLength.desc": "I colori esadecimali devono essere composti da tre o sei numeri esadecimali",
-	"scss.lint.idSelector.desc": "I selettori non devono contenere ID perché queste regole sono strettamente accoppiate al codice HTML.",
-	"scss.lint.ieHack.desc": "Gli hack IE sono necessari solo per il supporto di IE7 e versioni precedenti",
-	"scss.lint.important.desc": "Evitare di usare !important perché indica che la specificità dell'intero codice CSS non è più controllabile ed è necessario effettuarne il refactoring.",
-	"scss.lint.importStatement.desc": "Le istruzioni Import non vengono caricate in parallelo",
-	"scss.lint.propertyIgnoredDueToDisplay.desc": "La proprietà viene ignorata a causa della visualizzazione. Ad esempio, con 'display: inline', le proprietà width, height, margin-top, margin-bottom e float non hanno effetto",
-	"scss.lint.universalSelector.desc": "Il selettore universale (*) è notoriamente lento",
-	"scss.lint.unknownProperties.desc": "Proprietà sconosciuta.",
-	"scss.lint.unknownVendorSpecificProperties.desc": "Proprietà specifica del fornitore sconosciuta.",
-	"scss.lint.vendorPrefix.desc": "Quando si usa un prefisso specifico del fornitore, includere anche la proprietà standard",
-	"scss.lint.zeroUnits.desc": "Non è necessaria alcuna unità per lo zero",
-	"scss.validate.title": "Controlla la convalida SCSS e le gravità dei problemi.",
-	"scss.validate.desc": "Abilita o disabilita tutte le convalide",
-	"less.colorDecorators.enable.desc": "Abilita o disabilita gli elementi Decorator di tipo colore",
-	"scss.colorDecorators.enable.desc": "Abilita o disabilita gli elementi Decorator di tipo colore",
-	"css.colorDecorators.enable.desc": "Abilita o disabilita gli elementi Decorator di tipo colore",
-	"css.colorDecorators.enable.deprecationMessage": "L'impostazione `css.colorDecorators.enable` è stata deprecata e sostituita da `editor.colorDecorators`.",
-	"scss.colorDecorators.enable.deprecationMessage": "L'impostazione `scss.colorDecorators.enable` è stata deprecata e sostituita da `editor.colorDecorators`.",
-	"less.colorDecorators.enable.deprecationMessage": "L'impostazione `less.colorDecorators.enable` è stata deprecata e sostituita da `editor.colorDecorators`."
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/css/client/out/cssMain.i18n.json b/i18n/ita/extensions/css/client/out/cssMain.i18n.json
deleted file mode 100644
index 49766496907..00000000000
--- a/i18n/ita/extensions/css/client/out/cssMain.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"cssserver.name": "Server di linguaggio CSS",
-	"folding.start": "Inizio di una regione riducibile",
-	"folding.end": "Fine di una regione riducibile"
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/css/package.i18n.json b/i18n/ita/extensions/css/package.i18n.json
deleted file mode 100644
index 5f1a325b6da..00000000000
--- a/i18n/ita/extensions/css/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Nozioni di base del linguaggio CSS",
-	"description": "Offre l'evidenziazione della sintassi e la corrispondenza delle parentesi nei file CSS, LESS e SCSS."
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/diff/package.i18n.json b/i18n/ita/extensions/diff/package.i18n.json
deleted file mode 100644
index 35229bd6699..00000000000
--- a/i18n/ita/extensions/diff/package.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	]
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/docker/package.i18n.json b/i18n/ita/extensions/docker/package.i18n.json
deleted file mode 100644
index 2eeef5df563..00000000000
--- a/i18n/ita/extensions/docker/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Nozioni di base del linguaggio Docker",
-	"description": "Offre la sottolineatura delle sintassi e il match delle parentesi nei file Docker."
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/emmet/package.i18n.json b/i18n/ita/extensions/emmet/package.i18n.json
deleted file mode 100644
index 325af035e69..00000000000
--- a/i18n/ita/extensions/emmet/package.i18n.json
+++ /dev/null
@@ -1,65 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"description": "Supporto di Emmet per VS codice",
-	"command.wrapWithAbbreviation": "Esegui il wrapping con l'abbreviazione",
-	"command.wrapIndividualLinesWithAbbreviation": "Esegui il wrapping di singole righe con l'abbreviazione",
-	"command.removeTag": "Rimuovi Tag",
-	"command.updateTag": "Aggiorna tag",
-	"command.matchTag": "Vai alla coppia corrispondente",
-	"command.balanceIn": "Corrispondenza (interna)",
-	"command.balanceOut": "Corrispondenza (esterna)",
-	"command.prevEditPoint": "Vai al punto di modifica precedente",
-	"command.nextEditPoint": "Vai al punto di modifica successivo",
-	"command.mergeLines": "Esegui merge delle righe",
-	"command.selectPrevItem": "Seleziona l'elemento precedente",
-	"command.selectNextItem": "Seleziona l'elemento successivo",
-	"command.splitJoinTag": "Dividi/Unisci tag",
-	"command.toggleComment": "Attiva/Disattiva commento",
-	"command.evaluateMathExpression": "Valuta espressione matematica",
-	"command.updateImageSize": "Aggiorna dimensioni immagine",
-	"command.reflectCSSValue": "Ricopia il valore CSS",
-	"command.incrementNumberByOne": "Aumenta di 1",
-	"command.decrementNumberByOne": "Riduci di 1",
-	"command.incrementNumberByOneTenth": "Aumenta di 0,1",
-	"command.decrementNumberByOneTenth": "Riduci di 0,1",
-	"command.incrementNumberByTen": "Aumenta di 10",
-	"command.decrementNumberByTen": "Riduci di 10",
-	"emmetSyntaxProfiles": "Consente di definire il profilo per la sintassi specificata oppure di usare un profilo personalizzato con regole specifiche.",
-	"emmetExclude": "Una matrice di linguaggi dove le abbreviazioni Emmet non dovrebbero essere espanse.",
-	"emmetExtensionsPath": "Percorso di una cartella contenente profili e snippet Emmet.'",
-	"emmetShowExpandedAbbreviation": "Mostra le abbreviazioni Emmet espanse come suggerimenti.\nL'opzione \"inMarkupAndStylesheetFilesOnly\" si applica a html, haml, jade, slim, xml, xsl, css, scss, sass, less e stylus.\nL'opzione \"sempre\" (always) si applica a tutte le parti del file indipendentemente dal markup/css.",
-	"emmetShowAbbreviationSuggestions": "Mostra possibili abbreviazioni Emmet come suggerimenti. Non si applica a fogli di stile o quando emmet.showExpandedAbbreviation è impostata a \"mai\" (never).",
-	"emmetIncludeLanguages": "Abilita le abbreviazioni Emmet in linguaggi che non sono normalmente supportati. Qui si può aggiungere un mapping tra il linguaggio ed il linguaggio supportato da Emmet.\n Ad esempio: {\"vue-html\": \"html\", \"javascript\": \"javascriptreact\"}",
-	"emmetVariables": "Variabili da utilizzare negli snippet Emmet",
-	"emmetTriggerExpansionOnTab": "Se abilitate, le abbreviazioni Emmet vengono espanse quando si preme TAB.",
-	"emmetPreferences": "Preferenze usate per modificare il comportamento di alcune azioni e i resolver di Emmet.",
-	"emmetPreferencesIntUnit": "Unità di misura predefinita per i valori integer",
-	"emmetPreferencesFloatUnit": "Unità di misura predefinita per i valori float",
-	"emmetPreferencesCssAfter": "Simbolo da inserire alla fine della proprietà CSS quando si espandono le abbreviazioni CSS",
-	"emmetPreferencesSassAfter": "Simbolo da inserire alla fine della proprietà CSS quando si espandono le abbreviazioni CSS nei file Sass",
-	"emmetPreferencesStylusAfter": "Simbolo da inserire alla fine della proprietà CSS quando si espandono le abbreviazioni CSS nei file Stylus",
-	"emmetPreferencesCssBetween": "Simbolo da inserire tra la proprietà CSS e il valore quando si espandono le abbreviazioni CSS",
-	"emmetPreferencesSassBetween": "Simbolo da inserire tra la proprietà CSS e il valore quando si espandono le abbreviazioni CSS nei file Sass",
-	"emmetPreferencesStylusBetween": "Simbolo da inserire tra la proprietà CSS e il valore quando si espandono le abbreviazioni CSS nei file Stylus",
-	"emmetShowSuggestionsAsSnippets": "Se è true, i suggerimenti Emmet verranno visualizzati come frammenti consentendo di ordinarli in base all'impostazione editor.snippetSuggestions.",
-	"emmetPreferencesBemElementSeparator": "Separatore di elementi utilizzati per le classi quando si utilizza il filtro BEM",
-	"emmetPreferencesBemModifierSeparator": "Separatore di modificatore utilizzato per le classi quando si utilizza il filtro BEM",
-	"emmetPreferencesFilterCommentBefore": "Una definizione di commento che deve essere inserita prima dell'elemento corrispondente quando viene applicato il filtro commenti.",
-	"emmetPreferencesFilterCommentAfter": "Una definizione di commento che deve essere posizionato dopo l'elemento corrispondente quando viene applicato il filtro commenti.",
-	"emmetPreferencesFilterCommentTrigger": "Un elenco delimitato da virgole di nomi di attributi che dovrebbero esistere come abbreviazione per il filtro commenti da applicare",
-	"emmetPreferencesFormatNoIndentTags": "Una matrice di nomi di tag che non dovrebbe ottenere il rientro interno",
-	"emmetPreferencesFormatForceIndentTags": "Una matrice di nomi di tag che dovrebbe sempre ottenere il rientro interno",
-	"emmetPreferencesAllowCompactBoolean": "Se true, viene prodotta una notazione compatta degli attributi booleani",
-	"emmetPreferencesCssWebkitProperties": "Proprietà CSS delimitate da virgola che assumono il prefisso 'webkit' del vendor quando utilizzate nelle abbreviazioni di Emmet che iniziano per '-'. Per evitare sempre il prefisso 'webkit' impostare stringa vuota.",
-	"emmetPreferencesCssMozProperties": "Proprietà CSS delimitate da virgola che assumono il prefisso 'moz' del vendor quando utilizzate nelle abbreviazioni di Emmet che iniziano per '-'. Per evitare sempre il prefisso 'moz' impostare stringa vuota.",
-	"emmetPreferencesCssOProperties": "Proprietà CSS delimitate da virgola che assumono il prefisso 'o' del vendor quando utilizzate nelle abbreviazioni di Emmet che iniziano per '-'. Per evitare sempre il prefisso 'o' impostare stringa vuota.",
-	"emmetPreferencesCssMsProperties": "Proprietà CSS delimitate da virgola che assumono il prefisso 'ms' del vendor quando utilizzate nelle abbreviazioni di Emmet che iniziano per '-'. Per evitare sempre il prefisso 'ms' impostare stringa vuota.",
-	"emmetPreferencesCssFuzzySearchMinScore": "Il valore minimo (da 0 a 1) che dovrebbe raggiungere un'abbreviazione di fuzzy-match. I valori più bassi possono produrre molti falsi positivi, i valori più alti possono ridurre le possibili corrispondenze.",
-	"emmetOptimizeStylesheetParsing": "Se è impostato su false, l'intero file viene analizzato per determinare se la posizione corrente è valida per l'espansione delle abbreviazioni di Emmet. Se è impostato su true, viene analizzato solo il contenuto circostante alla posizione corrente nei file css/scss/less."
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/extension-editing/out/extensionLinter.i18n.json b/i18n/ita/extensions/extension-editing/out/extensionLinter.i18n.json
deleted file mode 100644
index ffb77fa1af8..00000000000
--- a/i18n/ita/extensions/extension-editing/out/extensionLinter.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"httpsRequired": "Le immagini devono utilizzare il protocollo HTTPS.",
-	"svgsNotValid": "Immagini di tipo SVG non sono una fonte valida.",
-	"embeddedSvgsNotValid": "Immagini SVG incorporate non sono una fonte valida.",
-	"dataUrlsNotValid": "URL di dati non sono una fonte valida per le immagini.",
-	"relativeUrlRequiresHttpsRepository": "Immagini con URL relative richiedono di specificare un repository con protocollo HTTPS in package.json.",
-	"relativeIconUrlRequiresHttpsRepository": "Un'icona richiede di specificare un repository con protocollo HTTPS in questo package.json.",
-	"relativeBadgeUrlRequiresHttpsRepository": "Notifiche con URL relativo richiedono di specificare un repository con protocollo HTTPS in questo package.json."
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/extension-editing/out/packageDocumentHelper.i18n.json b/i18n/ita/extensions/extension-editing/out/packageDocumentHelper.i18n.json
deleted file mode 100644
index 78827e1269a..00000000000
--- a/i18n/ita/extensions/extension-editing/out/packageDocumentHelper.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"languageSpecificEditorSettings": "Impostazioni dell'editor specifiche del linguaggio",
-	"languageSpecificEditorSettingsDescription": "Esegue l'override delle impostazioni dell'editor per il linguaggio"
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/extension-editing/package.i18n.json b/i18n/ita/extensions/extension-editing/package.i18n.json
deleted file mode 100644
index 74c24f789d3..00000000000
--- a/i18n/ita/extensions/extension-editing/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Modifica dei file del pacchetto",
-	"description": "Offre IntelliSense per i punti di estensione VS Code e le funzionalità di linting nei file package.json."
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/fsharp/package.i18n.json b/i18n/ita/extensions/fsharp/package.i18n.json
deleted file mode 100644
index d07ecc71f82..00000000000
--- a/i18n/ita/extensions/fsharp/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Nozioni di base del linguaggio F #",
-	"description": "Offre gli snippet, la sottolineatura delle sintassi, il match delle parentesi e il folding nei file F#."
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/git/out/askpass-main.i18n.json b/i18n/ita/extensions/git/out/askpass-main.i18n.json
deleted file mode 100644
index 02f004177e6..00000000000
--- a/i18n/ita/extensions/git/out/askpass-main.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"missOrInvalid": "Credenziali mancanti o non valide."
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/git/out/autofetch.i18n.json b/i18n/ita/extensions/git/out/autofetch.i18n.json
deleted file mode 100644
index 204ce599932..00000000000
--- a/i18n/ita/extensions/git/out/autofetch.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"yes": "Sì",
-	"no": "No",
-	"not now": "Chiedimelo in seguito",
-	"suggest auto fetch": "Desideri che Code [esegua `git fetch` periodicamente]({0})?"
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/git/out/commands.i18n.json b/i18n/ita/extensions/git/out/commands.i18n.json
deleted file mode 100644
index b8b9f049019..00000000000
--- a/i18n/ita/extensions/git/out/commands.i18n.json
+++ /dev/null
@@ -1,91 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"tag at": "Tag in {0}",
-	"remote branch at": "Ramo remoto in {0}",
-	"create branch": "$(plus) Crea nuovo branch",
-	"repourl": "URL del repository",
-	"selectFolder": "Seleziona il Percorso del Repository",
-	"cloning": "Clonazione del repository GIT '{0}'...",
-	"proposeopen": "Aprire il repository clonato?",
-	"openrepo": "Apri repository",
-	"add": "Aggiungi all'Area di Lavoro",
-	"proposeopen2": "Vuoi aprire il repository clonato o aggiungerlo all'area di lavoro corrente?",
-	"init": "Selezionare la cartella dell'area di lavoro in cui inizializzare il Git repo",
-	"init repo": "Inizializza repository",
-	"create repo": "Inizializza repository",
-	"are you sure": "Questo creerà un repository Git in '{0}'. Sei sicuro di voler continuare?",
-	"HEAD not available": "La versione HEAD di '{0}' non è disponibile.",
-	"confirm stage files with merge conflicts": "Preparare per il commit {0} file con conflitti di merge?",
-	"confirm stage file with merge conflicts": "Preparare per il commit {0} con conflitti di merge?",
-	"yes": "Sì",
-	"confirm revert": "Ripristinare le modifiche selezionate in {0}?",
-	"revert": "Annulla modifiche",
-	"discard": "Rimuovi modifiche",
-	"confirm delete": "ELIMINARE {0}?",
-	"delete file": "Elimina file",
-	"confirm discard": "Rimuovere le modifiche in {0}?",
-	"confirm discard multiple": "Rimuovere le modifiche in {0} file?",
-	"warn untracked": "Verranno ELIMINATI {0} file di cui non viene tenuta traccia.",
-	"confirm discard all single": "Rimuovere le modifiche in {0}?",
-	"confirm discard all": "Rimuovere TUTTE le modifiche apportate in {0} file?\nQuesta operazione è IRREVERSIBILE.\nIl working set corrente andrà PERSO PER SEMPRE.",
-	"discardAll multiple": "Rimuovi 1 file",
-	"discardAll": "Rimuovi tutti i {0} file",
-	"confirm delete multiple": "ELIMINARE {0} file?",
-	"delete files": "Elimina file",
-	"there are untracked files single": "Se rimosso, il file seguente di cui non viene tenuta traccia verrà ELIMINATO DAL DISCO: {0}.",
-	"there are untracked files": "Se rimossi, {0} file di cui non viene tenuta traccia verranno ELIMINATI DAL DISCO.",
-	"confirm discard all 2": "{0}\n\nQuesta operazione è IRREVERSIBILE. Il working set corrente andrà PERSO PER SEMPRE.",
-	"yes discard tracked": "Rimuovi 1 file di cui viene tenuta traccia",
-	"yes discard tracked multiple": "Rimuovi {0} file di cui viene tenuta traccia",
-	"unsaved files single": "Il seguente file non è stato salvato: {0}\n\nVuoi salvarlo prima di eseguirne il commit? ",
-	"unsaved files": "Ci sono {0} file non ancora salvati.\n\nVuoi salvarli prima di eseguirne il commit? ",
-	"save and commit": "Salva tutto & esegui Commit",
-	"commit": "Esegui il Commit comunque",
-	"no staged changes": "Non ci sono modifiche in stage di cui eseguire il commit.\n\nSI desidera mettere in stage automaticamente tutte le modifiche ed eseguirne il commit direttamente?",
-	"always": "Sempre",
-	"no changes": "Non ci sono modifiche di cui eseguire il commit.",
-	"commit message": "Messaggio di commit",
-	"provide commit message": "Specificare un messaggio di commit",
-	"select a ref to checkout": "Selezionare un ref di cui eseguire checkout",
-	"branch name": "Nome ramo",
-	"provide branch name": "Specificare un nome di ramo",
-	"select branch to delete": "Seleziona un ramo da cancellare",
-	"confirm force delete branch": "Il merge del ramo '{0}' non è completo. Elimina comunque?",
-	"delete branch": "Elimina ramo",
-	"invalid branch name": "Nome di branch non valido",
-	"branch already exists": "La branch denominata '{0}' esiste già",
-	"select a branch to merge from": "Selezionare un ramo da cui eseguire il merge",
-	"merge conflicts": "Ci sono conflitti di merge. Risolverli prima di eseguire commit.",
-	"tag name": "Nome tag",
-	"provide tag name": "Specificare un nome di tag",
-	"tag message": "Messaggio",
-	"provide tag message": "Specificare un messaggio per aggiungere un'annotazione per il tag",
-	"no remotes to fetch": "Questo repository non ha remote configurati da cui eseguire un fetch.",
-	"no remotes to pull": "Il repository non contiene elementi remoti configurati come origini del pull.",
-	"pick remote pull repo": "Selezionare un repository remoto da cui effettuare il pull del ramo",
-	"no remotes to push": "Il repository non contiene elementi remoti configurati come destinazione del push.",
-	"nobranch": "Estrarre un ramo per eseguire il push in un elemento remoto.",
-	"confirm publish branch": "La branch '{0}' non ha una branch corrispondente a monte. Desideri pubblicarla?",
-	"ok": "OK",
-	"push with tags success": "Il push con tag è riuscito.",
-	"pick remote": "Selezionare un repository remoto in cui pubblicare il ramo '{0}':",
-	"sync is unpredictable": "Questa azione consentirà di effettuare il push e il pull di commit da e verso '{0}/[1]'.",
-	"never again": "OK, non visualizzare più",
-	"no remotes to publish": "Il repository non contiene elementi remoti configurati come destinazione della pubblicazione.",
-	"no changes stash": "Non ci sono modifiche da accantonare.",
-	"provide stash message": "Specificare un messaggio di accantonamento (facoltativo)",
-	"stash message": "Messaggio di accantonamento",
-	"no stashes": "Non ci sono accantonamenti da ripristinare.",
-	"pick stash to pop": "Scegli un accantonamento da prelevare",
-	"clean repo": "Pulire l'albero di lavoro del repository prima dell'estrazione.",
-	"cant push": "Impossibile fare push dei ref su remoto. Provare a eseguire un 'Pull' prima, per integrare le modifiche.",
-	"git error details": "GIT: {0}",
-	"git error": "Errore GIT",
-	"open git log": "Apri log GIT"
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/git/out/main.i18n.json b/i18n/ita/extensions/git/out/main.i18n.json
deleted file mode 100644
index 528e87d5fde..00000000000
--- a/i18n/ita/extensions/git/out/main.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"looking": "Ricerca di git in: {0}",
-	"using git": "Uso di GIT {0} da {1}",
-	"downloadgit": "Scarica GIT",
-	"neverShowAgain": "Non visualizzare più questo messaggio",
-	"notfound": "Git non trovato. Installarlo o configurarlo utilizzando l'impostazione 'git.path'.",
-	"updateGit": "Aggiorna GIT",
-	"git20": "La versione installata di GIT è la {0}. Per il corretto funzionamento di Code è consigliabile usare una versione di GIT non inferiore alla 2."
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/git/out/model.i18n.json b/i18n/ita/extensions/git/out/model.i18n.json
deleted file mode 100644
index 25fcf223ffe..00000000000
--- a/i18n/ita/extensions/git/out/model.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"too many submodules": "Il repository '{0}' ha {1} sottomoduli che non verranno aperti automaticamente. È possibile comunque aprirli individualmente aprendo il file all'interno.",
-	"no repositories": "Non ci sono repository disponibili",
-	"pick repo": "Scegli un repository"
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/git/out/repository.i18n.json b/i18n/ita/extensions/git/out/repository.i18n.json
deleted file mode 100644
index 935d229ef3d..00000000000
--- a/i18n/ita/extensions/git/out/repository.i18n.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"open": "Apri",
-	"index modified": "Indice modificato",
-	"modified": "Modificato",
-	"index added": "Indice aggiunto",
-	"index deleted": "Indice eliminato",
-	"deleted": "Eliminato",
-	"index renamed": "Indice rinominato",
-	"index copied": "Indice copiato",
-	"untracked": "Non registrato",
-	"ignored": "Ignorato",
-	"both deleted": "Entrambi eliminati",
-	"added by us": "Aggiunto da Microsoft",
-	"deleted by them": "Eliminato dall'utente",
-	"added by them": "Aggiunto dall'utente",
-	"deleted by us": "Eliminato da Microsoft",
-	"both added": "Entrambi aggiunti",
-	"both modified": "Entrambi modificati",
-	"commitMessage": "Message (press {0} to commit)",
-	"commit": "Esegui commit",
-	"merge changes": "Esegui merge delle modifiche",
-	"staged changes": "Modifiche preparate per il commit",
-	"changes": "Modifiche",
-	"commitMessageCountdown": "ancora {0} caratteri disponibili nella riga corrente",
-	"commitMessageWarning": "{0} caratteri rispetto ai {1} disponibili nella riga corrente",
-	"neveragain": "Non visualizzare più questo messaggio",
-	"huge": "Il repository git '{0}' ha troppe modifiche attive - verrà attivato solo un sottoinsieme delle funzionalità di Git."
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/git/out/scmProvider.i18n.json b/i18n/ita/extensions/git/out/scmProvider.i18n.json
deleted file mode 100644
index 83316c833f3..00000000000
--- a/i18n/ita/extensions/git/out/scmProvider.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"commit": "Esegui commit"
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/git/out/statusbar.i18n.json b/i18n/ita/extensions/git/out/statusbar.i18n.json
deleted file mode 100644
index 9c490ff6e8f..00000000000
--- a/i18n/ita/extensions/git/out/statusbar.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"checkout": "Estrai...",
-	"sync changes": "Sincronizza modifiche",
-	"publish changes": "Pubblica modifiche",
-	"syncing changes": "Sincronizzazione delle modifiche in corso..."
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/git/package.i18n.json b/i18n/ita/extensions/git/package.i18n.json
deleted file mode 100644
index 3e99eceff18..00000000000
--- a/i18n/ita/extensions/git/package.i18n.json
+++ /dev/null
@@ -1,87 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "GIT",
-	"description": "Integrazione SCM su Git",
-	"command.clone": "Clona",
-	"command.init": "Inizializza repository",
-	"command.close": "Chiudi repository",
-	"command.refresh": "Aggiorna",
-	"command.openChange": "Apri modifiche",
-	"command.openFile": "Apri file",
-	"command.openHEADFile": "Apri File (HEAD)",
-	"command.stage": "Prepara modifiche per commit",
-	"command.stageAll": "Prepara tutte le modifiche per commit",
-	"command.stageSelectedRanges": "Prepara per il commit intervalli selezionati",
-	"command.revertSelectedRanges": "Ripristina intervalli selezionati",
-	"command.stageChange": "Prepara modifica per commit",
-	"command.revertChange": "Annulla modifica",
-	"command.unstage": "Annulla preparazione modifiche per commit",
-	"command.unstageAll": "Annulla preparazione di tutte le modifiche per commit",
-	"command.unstageSelectedRanges": "Annulla preparazione per il commit di intervalli selezionati",
-	"command.clean": "Rimuovi modifiche",
-	"command.cleanAll": "Rimuovi tutte le modifiche",
-	"command.commit": "Commit",
-	"command.commitStaged": "Esegui commit dei file preparati",
-	"command.commitStagedSigned": "Esegui commit dei file preparati (approvazione)",
-	"command.commitStagedAmend": "Esegui commit dei file preparati (modifica)",
-	"command.commitAll": "Esegui commit di tutto",
-	"command.commitAllSigned": "Esegui commit di tutto (approvazione)",
-	"command.commitAllAmend": "Esegui commit di tutto (modifica)",
-	"command.undoCommit": "Annulla ultimo commit",
-	"command.checkout": "Estrai in...",
-	"command.branch": "Crea ramo...",
-	"command.deleteBranch": "Elimina ramo...",
-	"command.renameBranch": "Rinomina Branch...",
-	"command.merge": "Merge ramo...",
-	"command.createTag": "Crea tag",
-	"command.fetch": "Fetch",
-	"command.pull": "Esegui pull",
-	"command.pullRebase": "Esegui pull (Riassegna)",
-	"command.pullFrom": "Pull da...",
-	"command.push": "Esegui push",
-	"command.pushTo": "Esegui push in...",
-	"command.pushWithTags": "Esegui push con tag",
-	"command.sync": "Sincronizza",
-	"command.syncRebase": "Sincronizza (Rebase)",
-	"command.publish": "Pubblica ramo",
-	"command.showOutput": "Mostra output GIT",
-	"command.ignore": "Aggiungi file a .gitignore",
-	"command.stashIncludeUntracked": "Stash (includi non tracciate)",
-	"command.stash": "Accantona",
-	"command.stashPop": "Preleva accantonamento...",
-	"command.stashPopLatest": "Preleva accantonamento più recente",
-	"config.enabled": "Indica se GIT è abilitato",
-	"config.path": "Percorso dell'eseguibile di GIT",
-	"config.autoRepositoryDetection": "Se i repository devono essere rilevati automaticamente",
-	"config.autorefresh": "Indica se l'aggiornamento automatico è abilitato",
-	"config.autofetch": "Indica se il recupero automatico è abilitato",
-	"config.enableLongCommitWarning": "Indica se visualizzare un avviso in caso di messaggi di commit lunghi",
-	"config.confirmSync": "Conferma prima di sincronizzare i repository GIT",
-	"config.countBadge": "Controlla il contatore delle notifiche git. Con `all` vengono conteggiate tutte le modifiche. Con `tracked` vengono conteggiate solo le revisioni. Con `off` il contatore è disattivato.",
-	"config.checkoutType": "Controlla il tipo di branch mostrati eseguendo il comando `Estrai in...`. `all` mostra tutti i refs, `local` mostra solamente i branch locali, `tags` mostra solamente i tag e `remote` mostra solamente i branch remoti.",
-	"config.ignoreLegacyWarning": "Ignora l'avvertimento legacy di Git",
-	"config.ignoreMissingGitWarning": "Ignora il messaggio di avviso quando manca Git",
-	"config.ignoreLimitWarning": "Ignora il messaggio di avviso quando ci sono troppi cambiamenti in un repository",
-	"config.defaultCloneDirectory": "Il percorso predefinito dove clonare un repository GIT",
-	"config.enableSmartCommit": "Eseguire il commit di tutte le modifiche quando non ci sono modifiche preparate.",
-	"config.enableCommitSigning": "Abilita la firma del commit con GPG.",
-	"config.discardAllScope": "Controlla quali modifiche vengono rimosse tramite il comando `Rimuovi tutte le modifiche`. Con `all` vengono rimosse tutte le modifiche. Con `tracked` vengono rimossi solo i file di cui viene tenuta traccia. Con `prompt` viene visualizzata una finestra di dialogo ogni volta che si esegue l'azione.",
-	"config.decorations.enabled": "Controlla se Git fornisce colori e distintivi alle visualizzazioni Esplora risorse e Editor aperti.",
-	"config.promptToSaveFilesBeforeCommit": "Controlla se GIT deve verificare la presenza di file non salvati prima di eseguire il commit.",
-	"config.showInlineOpenFileAction": "Controlla se visualizzare un'azione Apri file inline nella visualizzazione modifiche GIT.",
-	"config.inputValidation": "Controlla quando visualizzare la convalida sull'input del messaggio di commit.",
-	"config.detectSubmodules": "Controlla se rilevare automaticamente i moduli secondari GIT.",
-	"config.detectSubmodulesLimit": "Controlla il limite dei sottomoduli git rilevati.",
-	"colors.modified": "Colore delle risorse modificate.",
-	"colors.deleted": "Colore delle risorse eliminate.",
-	"colors.untracked": "Colore delle risorse non tracciate.",
-	"colors.ignored": "Colore delle risorse ignorate.",
-	"colors.conflict": "Colore delle risorse con conflitti.",
-	"colors.submodule": "Colore delle risorse sottomodulo"
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/go/package.i18n.json b/i18n/ita/extensions/go/package.i18n.json
deleted file mode 100644
index f3780926927..00000000000
--- a/i18n/ita/extensions/go/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Nozioni di base del linguaggio Go",
-	"description": "Offre la sottolineatura delle sintassi e il match delle parentesi nei file Go."
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/groovy/package.i18n.json b/i18n/ita/extensions/groovy/package.i18n.json
deleted file mode 100644
index c0ca3b88219..00000000000
--- a/i18n/ita/extensions/groovy/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Nozioni di base del linguaggio Groovy",
-	"description": "Offre gli snippet, la sottolineatura delle sintassi, il match delle parentesi e il folding nei file Groovy."
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/grunt/out/main.i18n.json b/i18n/ita/extensions/grunt/out/main.i18n.json
deleted file mode 100644
index 01f22c8f2f3..00000000000
--- a/i18n/ita/extensions/grunt/out/main.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"execFailed": "Rilevamento automatico di Grunt per la cartella {0} non riuscito - errore: {1}"
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/grunt/package.i18n.json b/i18n/ita/extensions/grunt/package.i18n.json
deleted file mode 100644
index 7759deade75..00000000000
--- a/i18n/ita/extensions/grunt/package.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"description": "Estensione che aggiunge le funzionalità di Grunt a VSCode.",
-	"displayName": "Supporto Grunt per VSCode",
-	"config.grunt.autoDetect": "Controlla se la rilevazione automatica delle attività Grunt è on/off. L'impostazione predefinita è 'on'.",
-	"grunt.taskDefinition.type.description": "L'attività di Grunt da personalizzare.",
-	"grunt.taskDefinition.file.description": "Il file di Grunt che fornisce l'attività. Può essere omesso."
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/gulp/out/main.i18n.json b/i18n/ita/extensions/gulp/out/main.i18n.json
deleted file mode 100644
index ecaa1de646c..00000000000
--- a/i18n/ita/extensions/gulp/out/main.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"execFailed": "Rilevamento automatico di Gulp per la cartella {0} non riuscito - errore: {1}"
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/gulp/package.i18n.json b/i18n/ita/extensions/gulp/package.i18n.json
deleted file mode 100644
index 756d2a2dd2d..00000000000
--- a/i18n/ita/extensions/gulp/package.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"description": "Estensione che aggiunge le funzionalità di Gulp a VSCode.",
-	"displayName": "Supporto Gulp per VSCode",
-	"config.gulp.autoDetect": "Controlla se la rilevazione automatica delle attività gulp è on/off. L'impostazione predefinita è 'on'.",
-	"gulp.taskDefinition.type.description": "L'attività di Gulp da personalizzare.",
-	"gulp.taskDefinition.file.description": "Il file di Grunt che fornisce l'attività. Può essere omesso."
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/handlebars/package.i18n.json b/i18n/ita/extensions/handlebars/package.i18n.json
deleted file mode 100644
index 1d6614abda4..00000000000
--- a/i18n/ita/extensions/handlebars/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Nozioni di base del linguaggio Handlebars",
-	"description": "Offre la sottolineatura delle sintassi e il match delle parentesi nei file Handlebars."
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/hlsl/package.i18n.json b/i18n/ita/extensions/hlsl/package.i18n.json
deleted file mode 100644
index 0876afb4ee1..00000000000
--- a/i18n/ita/extensions/hlsl/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Nozioni di base del linguaggio HLSL",
-	"description": "Offre la sottolineatura delle sintassi e il match delle parentesi nei file HLSL."
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/html-language-features/client/out/htmlMain.i18n.json b/i18n/ita/extensions/html-language-features/client/out/htmlMain.i18n.json
deleted file mode 100644
index 8313a5f7e1b..00000000000
--- a/i18n/ita/extensions/html-language-features/client/out/htmlMain.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"htmlserver.name": "Server di linguaggio HTML",
-	"folding.start": "Inizio di una regione riducibile",
-	"folding.end": "Fine di una regione riducibile"
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/html-language-features/package.i18n.json b/i18n/ita/extensions/html-language-features/package.i18n.json
deleted file mode 100644
index b237335f1d3..00000000000
--- a/i18n/ita/extensions/html-language-features/package.i18n.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Funzionalità del linguaggio HTML",
-	"description": "Offre un supporto avanzato sul linguaggio per i file HTML, Razor e Handlebars",
-	"html.format.enable.desc": "Abilita/Disabilita il formattatore HTML predefinito",
-	"html.format.wrapLineLength.desc": "Numero massimo di caratteri per riga (0 = disabilita).",
-	"html.format.unformatted.desc": "Elenco di tag, separati da virgole, che non devono essere riformattati. Con 'null' viene usata l'impostazione predefinita che prevede l'uso di tutti i tag elencati in https://www.w3.org/TR/html5/dom.html#phrasing-content.",
-	"html.format.contentUnformatted.desc": "Elenco di tag, separati da virgole, in cui il contenuto non deve essere riformattato. Per impostazione predefinita, con 'null' viene usato il tag 'pre'.",
-	"html.format.indentInnerHtml.desc": "Imposta un rientro per le sezioni <head> e <body>.",
-	"html.format.preserveNewLines.desc": "Indica se è necessario mantenere interruzioni di riga esistenti prima degli elementi. Funziona solo prima degli elementi e non all'interno di tag o per il testo.",
-	"html.format.maxPreserveNewLines.desc": "Numero massimo di interruzioni di riga da mantenere in un unico blocco. Per non impostare un numero massimo, usare 'null'.",
-	"html.format.indentHandlebars.desc": "Applica la formattazione e imposta un rientro per {{#foo}} e {{/foo}}.",
-	"html.format.endWithNewline.desc": "Termina con un carattere di nuova riga.",
-	"html.format.extraLiners.desc": "Elenco di tag, separati da virgole, che devono essere preceduti da un carattere di nuova riga. Con 'null' viene usata l'impostazione predefinita \"head, body, /html\".",
-	"html.format.wrapAttributes.desc": "Esegue il wrapping degli attributi.",
-	"html.format.wrapAttributes.auto": "Esegue il wrapping degli attributi solo quando viene superata la lunghezza di riga.",
-	"html.format.wrapAttributes.force": "Esegue il wrapping di ogni attributo ad eccezione del primo.",
-	"html.format.wrapAttributes.forcealign": "Esegue il wrapping di ogni attributo ad eccezione del primo e mantiene l'allineamento.",
-	"html.format.wrapAttributes.forcemultiline": "Esegue il wrapping di ogni attributo.",
-	"html.suggest.angular1.desc": "Consente di configurare se il supporto del linguaggio HTML predefinito suggerisce tag e proprietà di Angular V1.",
-	"html.suggest.ionic.desc": "Consente di configurare se il supporto del linguaggio HTML predefinito suggerisce tag, proprietà e valori di Ionic.",
-	"html.suggest.html5.desc": "Consente di configurare se il supporto del linguaggio HTML predefinito suggerisce tag, proprietà e valori di HTML5.",
-	"html.trace.server.desc": "Traccia la comunicazione tra VS Code e il server del linguaggio HTML.",
-	"html.validate.scripts": "Consente di configurare se il supporto del linguaggio HTML predefinito convalida gli script incorporati.",
-	"html.validate.styles": "Consente di configurare se il supporto del linguaggio HTML predefinito convalida gli stili incorporati.",
-	"html.autoClosingTags": "Abilita/Disabilita la chiusura automatica dei tag HTML."
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/html/client/out/htmlMain.i18n.json b/i18n/ita/extensions/html/client/out/htmlMain.i18n.json
deleted file mode 100644
index 8313a5f7e1b..00000000000
--- a/i18n/ita/extensions/html/client/out/htmlMain.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"htmlserver.name": "Server di linguaggio HTML",
-	"folding.start": "Inizio di una regione riducibile",
-	"folding.end": "Fine di una regione riducibile"
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/html/package.i18n.json b/i18n/ita/extensions/html/package.i18n.json
deleted file mode 100644
index 9015f75af4c..00000000000
--- a/i18n/ita/extensions/html/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Nozioni di base del linguaggio HTML",
-	"description": "Fornisce l'evidenziazione della sintassi, la corrispondenza delle parentesi & frammenti nei file HTML."
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/ini/package.i18n.json b/i18n/ita/extensions/ini/package.i18n.json
deleted file mode 100644
index 69b59b8fa80..00000000000
--- a/i18n/ita/extensions/ini/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Nozioni di base del linguaggio ini",
-	"description": "Offre la sottolineatura delle sintassi e il match delle parentesi nei file Ini."
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/jake/out/main.i18n.json b/i18n/ita/extensions/jake/out/main.i18n.json
deleted file mode 100644
index fac2d4b2561..00000000000
--- a/i18n/ita/extensions/jake/out/main.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"execFailed": "Rilevamento automatico di Jake per la cartella {0} non riuscito - errore: {1}"
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/jake/package.i18n.json b/i18n/ita/extensions/jake/package.i18n.json
deleted file mode 100644
index ca78c7d1009..00000000000
--- a/i18n/ita/extensions/jake/package.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"description": "Estensione che aggiunge le funzionalità di Jake a VSCode.",
-	"displayName": "Supporto di Jake per VSCode",
-	"jake.taskDefinition.type.description": "L'attività di Jake da personalizzare.",
-	"jake.taskDefinition.file.description": "Il file di Jake che fornisce l'attività. Può essere omesso.",
-	"config.jake.autoDetect": "Controlla se la rilevazione automatica delle attività Jake è on/off. L'impostazione predefinita è 'on'."
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/java/package.i18n.json b/i18n/ita/extensions/java/package.i18n.json
deleted file mode 100644
index bf17c2aa557..00000000000
--- a/i18n/ita/extensions/java/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Nozioni di base del linguaggio Java",
-	"description": "Offre gli snippet, la sottolineatura delle sintassi, il match delle parentesi e il folding nei file Java."
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/javascript/out/features/bowerJSONContribution.i18n.json b/i18n/ita/extensions/javascript/out/features/bowerJSONContribution.i18n.json
deleted file mode 100644
index 7c9285f3195..00000000000
--- a/i18n/ita/extensions/javascript/out/features/bowerJSONContribution.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"json.bower.default": "bower.json predefinito",
-	"json.bower.error.repoaccess": "La richiesta al repository Bower non è riuscita: {0}",
-	"json.bower.latest.version": "più recente"
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/javascript/out/features/packageJSONContribution.i18n.json b/i18n/ita/extensions/javascript/out/features/packageJSONContribution.i18n.json
deleted file mode 100644
index 93333533002..00000000000
--- a/i18n/ita/extensions/javascript/out/features/packageJSONContribution.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"json.package.default": "package.json predefinito",
-	"json.npm.error.repoaccess": "La richiesta al repository NPM non è riuscita: {0}",
-	"json.npm.latestversion": "Ultima versione attualmente disponibile del pacchetto",
-	"json.npm.majorversion": "Trova la versione principale più recente (1.x.x)",
-	"json.npm.minorversion": "Trova la versione secondaria più recente (1.2.x)",
-	"json.npm.version.hover": "Ultima versione: {0}"
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/javascript/package.i18n.json b/i18n/ita/extensions/javascript/package.i18n.json
deleted file mode 100644
index 7383e18eed6..00000000000
--- a/i18n/ita/extensions/javascript/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Nozioni di base del linguaggio JavaScript",
-	"description": "Offre gli snippet, la sottolineatura delle sintassi, il match delle parentesi e il folding nei file JavaScript."
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/json-language-features/client/out/jsonMain.i18n.json b/i18n/ita/extensions/json-language-features/client/out/jsonMain.i18n.json
deleted file mode 100644
index b9cca5241bb..00000000000
--- a/i18n/ita/extensions/json-language-features/client/out/jsonMain.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"jsonserver.name": "Server di linguaggio JSON"
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/json-language-features/package.i18n.json b/i18n/ita/extensions/json-language-features/package.i18n.json
deleted file mode 100644
index 2b426a9eac1..00000000000
--- a/i18n/ita/extensions/json-language-features/package.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Funzionalità del linguaggio JSON",
-	"description": "Fornisce supporto avanzato del linguaggio per i file JSON.",
-	"json.schemas.desc": "Associa schemi a file JSON nel progetto corrente",
-	"json.schemas.url.desc": "URL di uno schema o percorso relativo di uno schema nella directory corrente",
-	"json.schemas.fileMatch.desc": "Matrice di criteri dei file da usare per la ricerca durante la risoluzione di file JSON in schemi.",
-	"json.schemas.fileMatch.item.desc": "Criteri dei file che possono contenere '*' da usare per la ricerca durante la risoluzione di file JSON in schemi.",
-	"json.schemas.schema.desc": "Definizione dello schema per l'URL specificato. È necessario specificare lo schema per evitare accessi all'URL dello schema.",
-	"json.format.enable.desc": "Abilita/Disabilita il formattatore JSON predefinito (richiede il riavvio)",
-	"json.tracing.desc": "Traccia le comunicazioni tra Visual Studio Code e il server di linguaggio JSON.",
-	"json.colorDecorators.enable.desc": "Abilita o disabilita gli elementi Decorator di tipo colore",
-	"json.colorDecorators.enable.deprecationMessage": "L'impostazione `json.colorDecorators.enable` è stata deprecata e sostituita da `editor.colorDecorators`."
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/json/client/out/jsonMain.i18n.json b/i18n/ita/extensions/json/client/out/jsonMain.i18n.json
deleted file mode 100644
index b9cca5241bb..00000000000
--- a/i18n/ita/extensions/json/client/out/jsonMain.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"jsonserver.name": "Server di linguaggio JSON"
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/json/package.i18n.json b/i18n/ita/extensions/json/package.i18n.json
deleted file mode 100644
index d1cf4899cfa..00000000000
--- a/i18n/ita/extensions/json/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Nozioni di base del linguaggio JSON",
-	"description": "Offre l'evidenziazione della sintassi e la corrispondenza delle parentesi nei file JSON."
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/less/package.i18n.json b/i18n/ita/extensions/less/package.i18n.json
deleted file mode 100644
index ef423d2dd45..00000000000
--- a/i18n/ita/extensions/less/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Nozioni di base del linguaggio Less",
-	"description": "Offre la sottolineatura delle sintassi, il match delle parentesi e il folding nei file Less."
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/log/package.i18n.json b/i18n/ita/extensions/log/package.i18n.json
deleted file mode 100644
index f29fd95bf3d..00000000000
--- a/i18n/ita/extensions/log/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Log",
-	"description": "Offre la sottolineatura delle sintassi per i file con estensione log."
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/lua/package.i18n.json b/i18n/ita/extensions/lua/package.i18n.json
deleted file mode 100644
index e5d42018ae1..00000000000
--- a/i18n/ita/extensions/lua/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Nozioni di base del linguaggio Lua",
-	"description": "Offre la sottolineatura delle sintassi e il match delle parentesi nei file Lua."
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/make/package.i18n.json b/i18n/ita/extensions/make/package.i18n.json
deleted file mode 100644
index e8034f3eb77..00000000000
--- a/i18n/ita/extensions/make/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Nozioni di base del linguaggio Make",
-	"description": "Offre la sottolineatura delle sintassi e il match delle parentesi nei file Make."
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/markdown-basics/package.i18n.json b/i18n/ita/extensions/markdown-basics/package.i18n.json
deleted file mode 100644
index 816ce519d4d..00000000000
--- a/i18n/ita/extensions/markdown-basics/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Nozioni di base del linguaggio Markdown",
-	"description": "Offre gli snippet e la sottolineatura delle sintassi per Markdown."
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json b/i18n/ita/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json
deleted file mode 100644
index eb5c477e4c1..00000000000
--- a/i18n/ita/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"onPreviewStyleLoadError": "Impossibile caricare 'markdown.styles': {0}"
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/markdown-language-features/out/features/preview.i18n.json b/i18n/ita/extensions/markdown-language-features/out/features/preview.i18n.json
deleted file mode 100644
index c46a3464cc4..00000000000
--- a/i18n/ita/extensions/markdown-language-features/out/features/preview.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"lockedPreviewTitle": "[Anteprima] {0}",
-	"previewTitle": "Anteprima {0}"
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/markdown-language-features/out/features/previewContentProvider.i18n.json b/i18n/ita/extensions/markdown-language-features/out/features/previewContentProvider.i18n.json
deleted file mode 100644
index 991ae221d10..00000000000
--- a/i18n/ita/extensions/markdown-language-features/out/features/previewContentProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"preview.securityMessage.text": "Alcuni contenuti sono stati disabilitati in questo documento",
-	"preview.securityMessage.title": "Contenuti potenzialmente non sicuri sono stati disattivati nell'anteprima del Markdown. Modificare l'impostazione di protezione dell'anteprima del Markdown per consentire la visualizzazione di contenuto insicuro o abilitare gli script",
-	"preview.securityMessage.label": "Avviso di sicurezza contenuto disabilitato"
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/markdown-language-features/out/security.i18n.json b/i18n/ita/extensions/markdown-language-features/out/security.i18n.json
deleted file mode 100644
index 257cf27b76e..00000000000
--- a/i18n/ita/extensions/markdown-language-features/out/security.i18n.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"strict.title": "Strict",
-	"strict.description": "Carica solo contenuto protetto",
-	"insecureLocalContent.title": "Consenti contenuto locale non protetto",
-	"insecureLocalContent.description": "Consente il caricamento di contenuti tramite HTTP servito da localhost",
-	"insecureContent.title": "Consenti contenuto non protetto",
-	"insecureContent.description": "Consente il caricamento di contenuti tramite HTTP",
-	"disable.title": "Disabilita",
-	"disable.description": "Consente l'esecuzione di tutti i contenuti e script. Scelta non consigliata",
-	"moreInfo.title": "Altre informazioni",
-	"enableSecurityWarning.title": "Abilita anteprima degli avvisi di protezione in questa area di lavoro",
-	"disableSecurityWarning.title": "Disabilita anteprima degli avvisi di protezione in questa area di lavoro",
-	"toggleSecurityWarning.description": "Non influisce sul livello di sicurezza del contenuto",
-	"preview.showPreviewSecuritySelector.title": "Seleziona impostazioni di protezione per le anteprime Markdown in questa area di lavoro"
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/markdown-language-features/package.i18n.json b/i18n/ita/extensions/markdown-language-features/package.i18n.json
deleted file mode 100644
index eeb708af9fa..00000000000
--- a/i18n/ita/extensions/markdown-language-features/package.i18n.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Funzionalità del linguaggio Markdown",
-	"description": "Fornisce un supporto avanzato del linguaggio per Markdown.",
-	"markdown.preview.breaks.desc": "Imposta come le interruzioni di riga vengono visualizzate nell'anteprima di markdown. Impostarlo a 'true' crea un <br>per ogni carattere di nuova riga.",
-	"markdown.preview.linkify": "Abilita o disabilita la conversione di testo simile a URL in collegamenti nell'anteprima markdown.",
-	"markdown.preview.doubleClickToSwitchToEditor.desc": "Fare doppio clic nell'anteprima markdown per passare all'editor.",
-	"markdown.preview.fontFamily.desc": "Consente di controllare la famiglia di caratteri usata nell'anteprima markdown.",
-	"markdown.preview.fontSize.desc": "Consente di controllare le dimensioni del carattere in pixel usate nell'anteprima markdown.",
-	"markdown.preview.lineHeight.desc": "Consente di controllare l'altezza della riga usata nell'anteprima markdown. Questo numero è relativo alle dimensioni del carattere.",
-	"markdown.preview.markEditorSelection.desc": "Contrassegna la selezione dell'editor corrente nell'anteprima markdown.",
-	"markdown.preview.scrollEditorWithPreview.desc": "Quando si scorre l'anteprima markdown, aggiorna la visualizzazione dell'editor.",
-	"markdown.preview.scrollPreviewWithEditor.desc": "Quando si scorre l'editor markdown, aggiorna la visualizzazione dell'anteprima.",
-	"markdown.preview.scrollPreviewWithEditorSelection.desc": "[Deprecato] Scorre l'anteprima markdown in modo da visualizzare la riga attualmente selezionata dall'editor.",
-	"markdown.preview.scrollPreviewWithEditorSelection.deprecationMessage": "Questa impostazione è stata sostituita da 'markdown.preview.scrollPreviewWithEditor' e non ha più effetto.",
-	"markdown.preview.title": "Apri anteprima",
-	"markdown.previewFrontMatter.dec": "Consente di impostare il rendering del front matter YAML nell'anteprima markdown. Con 'hide' il front matter viene rimosso; altrimenti il front matter viene considerato come contenuto markdown.",
-	"markdown.previewSide.title": "Apri anteprima lateralmente",
-	"markdown.showLockedPreviewToSide.title": "Apri anteprima bloccata lateralmente",
-	"markdown.showSource.title": "Mostra origine",
-	"markdown.styles.dec": "Elenco di URL o percorsi locali dei fogli di stile CSS da usare dall'anteprima markdown. I percorsi relativi vengono interpretati come relativi alla cartella aperta nella finestra di esplorazione. Se non è presente alcuna cartella aperta, vengono interpretati come relativi al percorso del file markdown. Tutti i caratteri '\\' devono essere scritti come '\\\\'.",
-	"markdown.showPreviewSecuritySelector.title": "Modifica impostazioni di sicurezza anteprima",
-	"markdown.trace.desc": "Abilitare la registrazione debug per l'estensione markdown.",
-	"markdown.preview.refresh.title": "Aggiorna anteprima",
-	"markdown.preview.toggleLock.title": "Attiva/Disattiva blocco anteprima"
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/markdown/out/commands.i18n.json b/i18n/ita/extensions/markdown/out/commands.i18n.json
deleted file mode 100644
index ac76c4524dc..00000000000
--- a/i18n/ita/extensions/markdown/out/commands.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"previewTitle": "Anteprima {0}",
-	"onPreviewStyleLoadError": "Impossibile caricare 'markdown.styles': {0}"
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/markdown/out/commands/onPreviewStyleLoadError.i18n.json b/i18n/ita/extensions/markdown/out/commands/onPreviewStyleLoadError.i18n.json
deleted file mode 100644
index eb5c477e4c1..00000000000
--- a/i18n/ita/extensions/markdown/out/commands/onPreviewStyleLoadError.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"onPreviewStyleLoadError": "Impossibile caricare 'markdown.styles': {0}"
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/markdown/out/extension.i18n.json b/i18n/ita/extensions/markdown/out/extension.i18n.json
deleted file mode 100644
index d1d6e298825..00000000000
--- a/i18n/ita/extensions/markdown/out/extension.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"onPreviewStyleLoadError": "Impossibile caricare 'markdown.styles': {0}",
-	"previewTitle": "Anteprima {0}"
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/markdown/out/features/preview.i18n.json b/i18n/ita/extensions/markdown/out/features/preview.i18n.json
deleted file mode 100644
index c46a3464cc4..00000000000
--- a/i18n/ita/extensions/markdown/out/features/preview.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"lockedPreviewTitle": "[Anteprima] {0}",
-	"previewTitle": "Anteprima {0}"
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/markdown/out/features/previewContentProvider.i18n.json b/i18n/ita/extensions/markdown/out/features/previewContentProvider.i18n.json
deleted file mode 100644
index 991ae221d10..00000000000
--- a/i18n/ita/extensions/markdown/out/features/previewContentProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"preview.securityMessage.text": "Alcuni contenuti sono stati disabilitati in questo documento",
-	"preview.securityMessage.title": "Contenuti potenzialmente non sicuri sono stati disattivati nell'anteprima del Markdown. Modificare l'impostazione di protezione dell'anteprima del Markdown per consentire la visualizzazione di contenuto insicuro o abilitare gli script",
-	"preview.securityMessage.label": "Avviso di sicurezza contenuto disabilitato"
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/markdown/out/previewContentProvider.i18n.json b/i18n/ita/extensions/markdown/out/previewContentProvider.i18n.json
deleted file mode 100644
index 9207358bc4d..00000000000
--- a/i18n/ita/extensions/markdown/out/previewContentProvider.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"preview.securityMessage.text": "Alcuni contenuti sono stati disabilitati in questo documento",
-	"preview.securityMessage.title": "Contenuti potenzialmente non sicuri sono stati disattivati nell'anteprima del Markdown. Modificare l'impostazione di protezione dell'anteprima del Markdown per consentire la visualizzazione di contenuto insicuro o abilitare gli script",
-	"preview.securityMessage.label": "Avviso di sicurezza contenuto disabilitato"
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/markdown/out/security.i18n.json b/i18n/ita/extensions/markdown/out/security.i18n.json
deleted file mode 100644
index 17900416bd6..00000000000
--- a/i18n/ita/extensions/markdown/out/security.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"strict.title": "Strict",
-	"strict.description": "Carica solo contenuto protetto",
-	"insecureContent.title": "Consenti contenuto non protetto",
-	"insecureContent.description": "Consente il caricamento di contenuti tramite HTTP",
-	"disable.title": "Disabilita",
-	"disable.description": "Consente l'esecuzione di tutti i contenuti e script. Scelta non consigliata",
-	"moreInfo.title": "Altre informazioni",
-	"enableSecurityWarning.title": "Abilita anteprima degli avvisi di protezione in questa area di lavoro",
-	"disableSecurityWarning.title": "Disabilita anteprima degli avvisi di protezione in questa area di lavoro",
-	"toggleSecurityWarning.description": "Non influisce sul livello di sicurezza del contenuto",
-	"preview.showPreviewSecuritySelector.title": "Seleziona impostazioni di protezione per le anteprime Markdown in questa area di lavoro"
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/markdown/package.i18n.json b/i18n/ita/extensions/markdown/package.i18n.json
deleted file mode 100644
index a46f2021ca0..00000000000
--- a/i18n/ita/extensions/markdown/package.i18n.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Funzionalità del linguaggio Markdown",
-	"description": "Fornisce un supporto avanzato del linguaggio per Markdown.",
-	"markdown.preview.breaks.desc": "Imposta come le interruzioni di riga vengono visualizzate nell'anteprima di markdown. Impostarlo a 'true' crea un <br>per ogni carattere di nuova riga.",
-	"markdown.preview.linkify": "Abilita o disabilita la conversione di testo simile a URL in collegamenti nell'anteprima markdown.",
-	"markdown.preview.doubleClickToSwitchToEditor.desc": "Fare doppio clic nell'anteprima markdown per passare all'editor.",
-	"markdown.preview.fontFamily.desc": "Consente di controllare la famiglia di caratteri usata nell'anteprima markdown.",
-	"markdown.preview.fontSize.desc": "Consente di controllare le dimensioni del carattere in pixel usate nell'anteprima markdown.",
-	"markdown.preview.lineHeight.desc": "Consente di controllare l'altezza della riga usata nell'anteprima markdown. Questo numero è relativo alle dimensioni del carattere.",
-	"markdown.preview.markEditorSelection.desc": "Contrassegna la selezione dell'editor corrente nell'anteprima markdown.",
-	"markdown.preview.scrollEditorWithPreview.desc": "Quando si scorre un anteprima di markdown, aggiornare la visualizzazione dell'editor.",
-	"markdown.preview.scrollPreviewWithEditor.desc": "Quando si scorre un editor di markdown, aggiornare la visualizzazione dell'anteprima.",
-	"markdown.preview.scrollPreviewWithEditorSelection.desc": "[Deprecato] Scorre l'anteprima markdown in modo da visualizzare la riga attualmente selezionata dall'editor.",
-	"markdown.preview.scrollPreviewWithEditorSelection.deprecationMessage": "Questa impostazione è stata sostituita da 'markdown.preview.scrollPreviewWithEditor' e non ha più effetto.",
-	"markdown.preview.title": "Apri anteprima",
-	"markdown.previewFrontMatter.dec": "Consente di impostare il rendering del front matter YAML nell'anteprima markdown. Con 'hide' il front matter viene rimosso; altrimenti il front matter viene considerato come contenuto markdown.",
-	"markdown.previewSide.title": "Apri anteprima lateralmente",
-	"markdown.showLockedPreviewToSide.title": "Apri anteprima bloccata lateralmente",
-	"markdown.showSource.title": "Mostra origine",
-	"markdown.styles.dec": "Elenco di URL o percorsi locali dei fogli di stile CSS da usare dall'anteprima markdown. I percorsi relativi vengono interpretati come relativi alla cartella aperta nella finestra di esplorazione. Se non è presente alcuna cartella aperta, vengono interpretati come relativi al percorso del file markdown. Tutti i caratteri '\\' devono essere scritti come '\\\\'.",
-	"markdown.showPreviewSecuritySelector.title": "Modifica impostazioni di sicurezza anteprima",
-	"markdown.trace.desc": "Abilitare la registrazione debug per l'estensione markdown.",
-	"markdown.preview.refresh.title": "Aggiorna anteprima",
-	"markdown.preview.toggleLock.title": "Attiva/Disattiva blocco anteprima"
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/merge-conflict/out/codelensProvider.i18n.json b/i18n/ita/extensions/merge-conflict/out/codelensProvider.i18n.json
deleted file mode 100644
index 591bd2bf3c6..00000000000
--- a/i18n/ita/extensions/merge-conflict/out/codelensProvider.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"acceptCurrentChange": "Accetta modifica corrente",
-	"acceptIncomingChange": "Accetta modifica in ingresso",
-	"acceptBothChanges": "Accetta entrambe le modifiche",
-	"compareChanges": "Confronta le modifiche"
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/merge-conflict/out/commandHandler.i18n.json b/i18n/ita/extensions/merge-conflict/out/commandHandler.i18n.json
deleted file mode 100644
index 8acf12c73f1..00000000000
--- a/i18n/ita/extensions/merge-conflict/out/commandHandler.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"cursorNotInConflict": "Il cursore dell'editor non si trova all'interno di un conflitto merge",
-	"compareChangesTitle": "{0}: modifiche correnti ⟷ modifiche in ingresso",
-	"cursorOnCommonAncestorsRange": "Il cursore dell'editor si trova all'interno del blocco di antenati comuni, si prega di passare al blocco \"corrente\" o \"in arrivo\"",
-	"cursorOnSplitterRange": "Il cursore si trova sulla barra di divisione di merge conflitti, si prega di spostarlo o al blocco \"corrente\" o a quello \"in ricezione\"",
-	"noConflicts": "Conflitti merge non trovati in questo file",
-	"noOtherConflictsInThisFile": "Nessun altro conflitto merge trovato in questo file"
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/merge-conflict/out/mergeDecorator.i18n.json b/i18n/ita/extensions/merge-conflict/out/mergeDecorator.i18n.json
deleted file mode 100644
index 1eb03a12d46..00000000000
--- a/i18n/ita/extensions/merge-conflict/out/mergeDecorator.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"currentChange": "(modifica corrente)",
-	"incomingChange": "(modifica in ingresso)"
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/merge-conflict/package.i18n.json b/i18n/ita/extensions/merge-conflict/package.i18n.json
deleted file mode 100644
index 5c38762d3e8..00000000000
--- a/i18n/ita/extensions/merge-conflict/package.i18n.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Esegui merge del conflitto",
-	"description": "Evidenziazione e comandi per i conflitti di merge inline.",
-	"command.category": "Esegui merge del conflitto",
-	"command.accept.all-current": "Accettare tutte le modifiche correnti",
-	"command.accept.all-incoming": "Accettare tutte le modifiche in ingresso",
-	"command.accept.all-both": "Accettare tutte in entrambe",
-	"command.accept.current": "Accettare corrente",
-	"command.accept.incoming": "Accettare modifiche in ingresso",
-	"command.accept.selection": "Accettare selezione",
-	"command.accept.both": "Accettare entrambe",
-	"command.next": "Conflitto successivo",
-	"command.previous": "Conflitto precedente",
-	"command.compare": "Confronta il conflitto corrente",
-	"config.title": "Esegui merge del conflitto",
-	"config.codeLensEnabled": "Abilita/Disabilita le finestre CodeLens del blocco merge di conflitti all'interno di editor",
-	"config.decoratorsEnabled": "Abilita/Disabilita gli elementi Decorator sul blocco merge di conflitti all'interno di editor"
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/npm/out/features/bowerJSONContribution.i18n.json b/i18n/ita/extensions/npm/out/features/bowerJSONContribution.i18n.json
deleted file mode 100644
index 7c9285f3195..00000000000
--- a/i18n/ita/extensions/npm/out/features/bowerJSONContribution.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"json.bower.default": "bower.json predefinito",
-	"json.bower.error.repoaccess": "La richiesta al repository Bower non è riuscita: {0}",
-	"json.bower.latest.version": "più recente"
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/npm/out/features/packageJSONContribution.i18n.json b/i18n/ita/extensions/npm/out/features/packageJSONContribution.i18n.json
deleted file mode 100644
index 93333533002..00000000000
--- a/i18n/ita/extensions/npm/out/features/packageJSONContribution.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"json.package.default": "package.json predefinito",
-	"json.npm.error.repoaccess": "La richiesta al repository NPM non è riuscita: {0}",
-	"json.npm.latestversion": "Ultima versione attualmente disponibile del pacchetto",
-	"json.npm.majorversion": "Trova la versione principale più recente (1.x.x)",
-	"json.npm.minorversion": "Trova la versione secondaria più recente (1.2.x)",
-	"json.npm.version.hover": "Ultima versione: {0}"
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/npm/out/main.i18n.json b/i18n/ita/extensions/npm/out/main.i18n.json
deleted file mode 100644
index c3dbec06958..00000000000
--- a/i18n/ita/extensions/npm/out/main.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"npm.parseError": "Rilevamento attività npm: non è stato possibile analizzare il file {0}"
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/npm/out/npmView.i18n.json b/i18n/ita/extensions/npm/out/npmView.i18n.json
deleted file mode 100644
index 8d06549b42c..00000000000
--- a/i18n/ita/extensions/npm/out/npmView.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noScripts": "Script non trovato",
-	"noDebugOptions": "Non è possibile avviare \"{0}\" per eseguire il debug perché negli script manca un'opzione di debug dei nodi, ad esempio \"--inspect-brk\".",
-	"learnMore": "Altre informazioni",
-	"ok": "OK",
-	"scriptInvalid": "Non è stato possibile trovare lo script \"{0}\". Provare ad aggiornare la visualizzazione."
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/npm/out/tasks.i18n.json b/i18n/ita/extensions/npm/out/tasks.i18n.json
deleted file mode 100644
index c3dbec06958..00000000000
--- a/i18n/ita/extensions/npm/out/tasks.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"npm.parseError": "Rilevamento attività npm: non è stato possibile analizzare il file {0}"
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/npm/package.i18n.json b/i18n/ita/extensions/npm/package.i18n.json
deleted file mode 100644
index 35faed0d788..00000000000
--- a/i18n/ita/extensions/npm/package.i18n.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"description": "Estensione che aggiunge il supporto delle attività per gli script npm.",
-	"displayName": "Supporto Npm per VSCode",
-	"config.npm.autoDetect": "Controlla se la rilevazione automatica degli script npm è on/off. L'impostazione predefinita è 'on'.",
-	"config.npm.runSilent": "Eseguire comandi npm con l'opzione `--silent`.",
-	"config.npm.packageManager": "Il gestore dei pacchetti utilizzato per eseguire script.",
-	"config.npm.exclude": "Configura i modelli glob per le cartelle che dovrebbero essere escluse dalla rilevazione automatica di script.",
-	"config.npm.enableScriptExplorer": "Vedi come Esplora risorse gli script npm.",
-	"config.npm.scriptExplorerAction": "Azione predefinita per il clic in Esplora script: 'open' o 'run'. L'impostazione predefinita è 'open'.",
-	"npm.parseError": "Rilevamento attività NPM: Impossibile analizzare il file {0}",
-	"taskdef.script": "Lo script di npm da personalizzare.",
-	"taskdef.path": "Il percorso della cartella del file J.json contenente lo script può essere omesso.",
-	"view.name": "Script di npm",
-	"command.refresh": "Aggiorna",
-	"command.run": "Esegui",
-	"command.debug": "Debug",
-	"command.openScript": "Apri",
-	"command.runInstall": "Esegui install"
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/objective-c/package.i18n.json b/i18n/ita/extensions/objective-c/package.i18n.json
deleted file mode 100644
index 256532fbeeb..00000000000
--- a/i18n/ita/extensions/objective-c/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Nozioni di base del linguaggio Objective-C",
-	"description": "Offre la sottolineatura delle sintassi e il match delle parentesi nei file Objective-C."
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/package-json/out/features/bowerJSONContribution.i18n.json b/i18n/ita/extensions/package-json/out/features/bowerJSONContribution.i18n.json
deleted file mode 100644
index 7c9285f3195..00000000000
--- a/i18n/ita/extensions/package-json/out/features/bowerJSONContribution.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"json.bower.default": "bower.json predefinito",
-	"json.bower.error.repoaccess": "La richiesta al repository Bower non è riuscita: {0}",
-	"json.bower.latest.version": "più recente"
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/package-json/out/features/packageJSONContribution.i18n.json b/i18n/ita/extensions/package-json/out/features/packageJSONContribution.i18n.json
deleted file mode 100644
index 93333533002..00000000000
--- a/i18n/ita/extensions/package-json/out/features/packageJSONContribution.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"json.package.default": "package.json predefinito",
-	"json.npm.error.repoaccess": "La richiesta al repository NPM non è riuscita: {0}",
-	"json.npm.latestversion": "Ultima versione attualmente disponibile del pacchetto",
-	"json.npm.majorversion": "Trova la versione principale più recente (1.x.x)",
-	"json.npm.minorversion": "Trova la versione secondaria più recente (1.2.x)",
-	"json.npm.version.hover": "Ultima versione: {0}"
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/package-json/package.i18n.json b/i18n/ita/extensions/package-json/package.i18n.json
deleted file mode 100644
index 35229bd6699..00000000000
--- a/i18n/ita/extensions/package-json/package.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	]
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/perl/package.i18n.json b/i18n/ita/extensions/perl/package.i18n.json
deleted file mode 100644
index 2bf8c09acc7..00000000000
--- a/i18n/ita/extensions/perl/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Nozioni di base del linguaggio Perl",
-	"description": "Offre la sottolineatura delle sintassi e il match delle parentesi nei file Perl."
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/php-language-features/out/features/validationProvider.i18n.json b/i18n/ita/extensions/php-language-features/out/features/validationProvider.i18n.json
deleted file mode 100644
index 7a30dfbedfe..00000000000
--- a/i18n/ita/extensions/php-language-features/out/features/validationProvider.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"php.useExecutablePath": "Consentire l'esecuzione di {0} (definito come impostazione dell'area di lavoro) per il lint dei file PHP?",
-	"php.yes": "Consenti",
-	"php.no": "Non consentire",
-	"wrongExecutable": "Non è possibile eseguire la convalida perché {0} non è un file eseguibile di PHP valido. Usare l'impostazione 'php.validate.executablePath' per convalidare il file eseguibile di PHP.",
-	"noExecutable": "Non è possibile eseguire la convalida perché non è impostato alcun file eseguibile di PHP. Usare l'impostazione 'php.validate.executablePath' per convalidare il file eseguibile di PHP.",
-	"unknownReason": "Non è stato possibile eseguire php con il percorso {0}. Il motivo è sconosciuto."
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/php-language-features/package.i18n.json b/i18n/ita/extensions/php-language-features/package.i18n.json
deleted file mode 100644
index b68565b4e5b..00000000000
--- a/i18n/ita/extensions/php-language-features/package.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"configuration.suggest.basic": "Consente di configurare l'abilitazione dei suggerimenti predefiniti per il linguaggio PHP. Il supporto suggerisce variabili e variabili globali PHP.",
-	"configuration.validate.enable": "Abilita/Disabilita la convalida PHP predefinita.",
-	"configuration.validate.executablePath": "Punta all'eseguibile di PHP.",
-	"configuration.validate.run": "Indica se il linter viene eseguito durante il salvataggio o la digitazione.",
-	"configuration.title": "PHP",
-	"commands.categroy.php": "PHP",
-	"command.untrustValidationExecutable": "Non consentire la convalida di PHP eseguibile (definito come impostazione dell'area di lavoro)",
-	"displayName": "Funzionalità del linguaggio PHP",
-	"description": "Fornisce supporto avanzato del linguaggio per i file PHP."
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/php/out/features/validationProvider.i18n.json b/i18n/ita/extensions/php/out/features/validationProvider.i18n.json
deleted file mode 100644
index 7a30dfbedfe..00000000000
--- a/i18n/ita/extensions/php/out/features/validationProvider.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"php.useExecutablePath": "Consentire l'esecuzione di {0} (definito come impostazione dell'area di lavoro) per il lint dei file PHP?",
-	"php.yes": "Consenti",
-	"php.no": "Non consentire",
-	"wrongExecutable": "Non è possibile eseguire la convalida perché {0} non è un file eseguibile di PHP valido. Usare l'impostazione 'php.validate.executablePath' per convalidare il file eseguibile di PHP.",
-	"noExecutable": "Non è possibile eseguire la convalida perché non è impostato alcun file eseguibile di PHP. Usare l'impostazione 'php.validate.executablePath' per convalidare il file eseguibile di PHP.",
-	"unknownReason": "Non è stato possibile eseguire php con il percorso {0}. Il motivo è sconosciuto."
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/php/package.i18n.json b/i18n/ita/extensions/php/package.i18n.json
deleted file mode 100644
index d8344412ea0..00000000000
--- a/i18n/ita/extensions/php/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Nozioni di base del linguaggio PHP",
-	"description": "Offre l'evidenziazione della sintassi e la corrispondenza delle parentesi nei file PHP."
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/powershell/package.i18n.json b/i18n/ita/extensions/powershell/package.i18n.json
deleted file mode 100644
index d8a5cae7e5a..00000000000
--- a/i18n/ita/extensions/powershell/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Nozioni di base del linguaggio PowerShell",
-	"description": "Offre gli snippet, la sottolineatura delle sintassi, il match delle parentesi e il folding nei file PowerShell."
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/pug/package.i18n.json b/i18n/ita/extensions/pug/package.i18n.json
deleted file mode 100644
index bc45fcd9c9e..00000000000
--- a/i18n/ita/extensions/pug/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Nozioni di base del linguaggio Pug",
-	"description": "Offre la sottolineatura delle sintassi e il match delle parentesi nei file Pug."
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/python/package.i18n.json b/i18n/ita/extensions/python/package.i18n.json
deleted file mode 100644
index 27872730a05..00000000000
--- a/i18n/ita/extensions/python/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Nozioni di base del linguaggio Python",
-	"description": "Offre la sottolineatura delle sintassi, il match delle parentesi e il folding nei file Python."
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/r/package.i18n.json b/i18n/ita/extensions/r/package.i18n.json
deleted file mode 100644
index c50685cdd2b..00000000000
--- a/i18n/ita/extensions/r/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Nozioni di base del linguaggio R",
-	"description": "Offre la sottolineatura delle sintassi e il match delle parentesi nei file R."
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/razor/package.i18n.json b/i18n/ita/extensions/razor/package.i18n.json
deleted file mode 100644
index 8146d5409a7..00000000000
--- a/i18n/ita/extensions/razor/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Nozioni di base del linguaggio Razor",
-	"description": "Offre la sottolineatura delle sintassi, il match delle parentesi e il folding nei file Razor."
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/ruby/package.i18n.json b/i18n/ita/extensions/ruby/package.i18n.json
deleted file mode 100644
index b6336a966e3..00000000000
--- a/i18n/ita/extensions/ruby/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Nozioni di base del linguaggio Ruby",
-	"description": "Offre la sottolineatura delle sintassi e il match delle parentesi nei file Ruby."
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/rust/package.i18n.json b/i18n/ita/extensions/rust/package.i18n.json
deleted file mode 100644
index 9c58aeacc52..00000000000
--- a/i18n/ita/extensions/rust/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Nozioni di base del linguaggio Rust",
-	"description": "Offre la sottolineatura delle sintassi e il match delle parentesi nei file Rust."
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/scss/package.i18n.json b/i18n/ita/extensions/scss/package.i18n.json
deleted file mode 100644
index 3f89b4c205d..00000000000
--- a/i18n/ita/extensions/scss/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Nozioni di base del linguaggio SCSS",
-	"description": "Offre la sottolineatura delle sintassi, il match delle parentesi e il folding nei file SCSS."
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/search-rg/package.i18n.json b/i18n/ita/extensions/search-rg/package.i18n.json
deleted file mode 100644
index 9ecfb7faf56..00000000000
--- a/i18n/ita/extensions/search-rg/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Cerca (ripgrep)",
-	"description": "Usa ripgrep per effettuare ricerche."
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/shaderlab/package.i18n.json b/i18n/ita/extensions/shaderlab/package.i18n.json
deleted file mode 100644
index 8646622df05..00000000000
--- a/i18n/ita/extensions/shaderlab/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Nozioni di base del linguaggio Shaderlab",
-	"description": "Offre la sottolineatura delle sintassi e il match delle parentesi nei file Shaderlab."
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/shellscript/package.i18n.json b/i18n/ita/extensions/shellscript/package.i18n.json
deleted file mode 100644
index fdb72128acb..00000000000
--- a/i18n/ita/extensions/shellscript/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Nozioni di base del linguaggio Shell Script",
-	"description": "Offre la sottolineatura delle sintassi e il match delle parentesi nei file Shell Script."
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/sql/package.i18n.json b/i18n/ita/extensions/sql/package.i18n.json
deleted file mode 100644
index 5b9d8f3c879..00000000000
--- a/i18n/ita/extensions/sql/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Nozioni di base del linguaggio SQL",
-	"description": "Offre la sottolineatura delle sintassi e il match delle parentesi nei file SQL."
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/swift/package.i18n.json b/i18n/ita/extensions/swift/package.i18n.json
deleted file mode 100644
index d913b1f06c8..00000000000
--- a/i18n/ita/extensions/swift/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Nozioni di base del linguaggio Swift",
-	"description": "Offre gli snippet, la sottolineatura delle sintassi e il match delle parentesi nei file Swift."
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/theme-abyss/package.i18n.json b/i18n/ita/extensions/theme-abyss/package.i18n.json
deleted file mode 100644
index eb827fcd010..00000000000
--- a/i18n/ita/extensions/theme-abyss/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Tema Abyss",
-	"description": "Tema Abyss per Visual Studio Code"
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/theme-defaults/package.i18n.json b/i18n/ita/extensions/theme-defaults/package.i18n.json
deleted file mode 100644
index 1052fca2965..00000000000
--- a/i18n/ita/extensions/theme-defaults/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Tema predefinito",
-	"description": "I temi light e dark predefiniti (Plus e Visual Studio)"
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/theme-kimbie-dark/package.i18n.json b/i18n/ita/extensions/theme-kimbie-dark/package.i18n.json
deleted file mode 100644
index a89738966a4..00000000000
--- a/i18n/ita/extensions/theme-kimbie-dark/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Tema Kimbie Dark",
-	"description": "Tema Kimbie Dark per Visual Studio Code"
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/theme-monokai-dimmed/package.i18n.json b/i18n/ita/extensions/theme-monokai-dimmed/package.i18n.json
deleted file mode 100644
index 84fc6e2f9e6..00000000000
--- a/i18n/ita/extensions/theme-monokai-dimmed/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Tema Monokai Dimmed",
-	"description": "Tema Monokai Dimmed per Visual Studio Code"
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/theme-monokai/package.i18n.json b/i18n/ita/extensions/theme-monokai/package.i18n.json
deleted file mode 100644
index 21dad3c3007..00000000000
--- a/i18n/ita/extensions/theme-monokai/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Tema Monokai",
-	"description": "Tema Monokai per Visual Studio Code"
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/theme-quietlight/package.i18n.json b/i18n/ita/extensions/theme-quietlight/package.i18n.json
deleted file mode 100644
index cc9cabc5d9a..00000000000
--- a/i18n/ita/extensions/theme-quietlight/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Tema Quiet Light",
-	"description": "Tema Quiet Light per Visual Studio Code"
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/theme-red/package.i18n.json b/i18n/ita/extensions/theme-red/package.i18n.json
deleted file mode 100644
index e68604fb914..00000000000
--- a/i18n/ita/extensions/theme-red/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Tema Red",
-	"description": "Tema Red per Visual Studio Code"
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/theme-seti/package.i18n.json b/i18n/ita/extensions/theme-seti/package.i18n.json
deleted file mode 100644
index d1263d299e4..00000000000
--- a/i18n/ita/extensions/theme-seti/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Tema Seti per le icone dei file",
-	"description": "Un tema per le icone dei file creato sulla base di Seti UI"
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/theme-solarized-dark/package.i18n.json b/i18n/ita/extensions/theme-solarized-dark/package.i18n.json
deleted file mode 100644
index 9007278f686..00000000000
--- a/i18n/ita/extensions/theme-solarized-dark/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Tema Solarized Dark",
-	"description": "Tema Solarized Dark per Visual Studio Code"
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/theme-solarized-light/package.i18n.json b/i18n/ita/extensions/theme-solarized-light/package.i18n.json
deleted file mode 100644
index 39bb2bfaf17..00000000000
--- a/i18n/ita/extensions/theme-solarized-light/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Tema Solarized Light",
-	"description": "Tema Solarized Light per Visual Studio Code"
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/theme-tomorrow-night-blue/package.i18n.json b/i18n/ita/extensions/theme-tomorrow-night-blue/package.i18n.json
deleted file mode 100644
index 1aa2aa03210..00000000000
--- a/i18n/ita/extensions/theme-tomorrow-night-blue/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Tema Tomorrow Night Blue",
-	"description": "Tema Tomorrow Night Blue per Visual Studio Code"
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/typescript-basics/package.i18n.json b/i18n/ita/extensions/typescript-basics/package.i18n.json
deleted file mode 100644
index cf91c25e086..00000000000
--- a/i18n/ita/extensions/typescript-basics/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Nozioni di base del linguaggio TypeScript",
-	"description": "Offre gli snippet, la sottolineatura delle sintassi, il match delle parentesi e il folding nei file TypeScript."
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/typescript-language-features/out/commands.i18n.json b/i18n/ita/extensions/typescript-language-features/out/commands.i18n.json
deleted file mode 100644
index ffa2bc44d1e..00000000000
--- a/i18n/ita/extensions/typescript-language-features/out/commands.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"typescript.projectConfigNoWorkspace": "Aprire una cartella in Visual Studio Code per usare un progetto TypeScript o JavaScript",
-	"typescript.projectConfigUnsupportedFile": "Non è stato possibile determinare il progetto TypeScript o JavaScript. Il tipo di file non è supportato",
-	"typescript.projectConfigCouldNotGetInfo": "Non è stato possibile determinare il progetto TypeScript o JavaScript",
-	"typescript.noTypeScriptProjectConfig": "Il file non fa parte di un progetto TypeScript. Clicca [qui]({0}) per saperne di più.",
-	"typescript.noJavaScriptProjectConfig": "Il file non fa parte di un progetto JavaScript. Clicca [qui]({0}) per saperne di più.",
-	"typescript.configureTsconfigQuickPick": "Configura tsconfig.json",
-	"typescript.configureJsconfigQuickPick": "Configura jsconfig.json"
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/typescript-language-features/out/features/completionItemProvider.i18n.json b/i18n/ita/extensions/typescript-language-features/out/features/completionItemProvider.i18n.json
deleted file mode 100644
index 86de96163a7..00000000000
--- a/i18n/ita/extensions/typescript-language-features/out/features/completionItemProvider.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"selectCodeAction": "Selezionare l'azione codice da applicare",
-	"acquiringTypingsLabel": "Acquisizione dei file typings...",
-	"acquiringTypingsDetail": "Acquisizione delle definizioni dei file typings per IntelliSense.",
-	"autoImportLabel": "Importazione automatica da {0}"
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/typescript-language-features/out/features/directiveCommentCompletionProvider.i18n.json b/i18n/ita/extensions/typescript-language-features/out/features/directiveCommentCompletionProvider.i18n.json
deleted file mode 100644
index 98bb57ed994..00000000000
--- a/i18n/ita/extensions/typescript-language-features/out/features/directiveCommentCompletionProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"ts-check": "Attiva il controllo semantico in un file JavaScript. Deve essere all'inizio del file.",
-	"ts-nocheck": "Disattiva il controllo semantico in un file JavaScript. Deve essere all'inizio del file.",
-	"ts-ignore": "Elimina errori di @ts-check sulla riga successiva di un file."
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/typescript-language-features/out/features/implementationsCodeLensProvider.i18n.json b/i18n/ita/extensions/typescript-language-features/out/features/implementationsCodeLensProvider.i18n.json
deleted file mode 100644
index cd8cac2d81a..00000000000
--- a/i18n/ita/extensions/typescript-language-features/out/features/implementationsCodeLensProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"oneImplementationLabel": "1 implementazione",
-	"manyImplementationLabel": "{0} implementazioni",
-	"implementationsErrorLabel": "Non è stato possibile determinare le implementazioni"
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/typescript-language-features/out/features/jsDocCompletionProvider.i18n.json b/i18n/ita/extensions/typescript-language-features/out/features/jsDocCompletionProvider.i18n.json
deleted file mode 100644
index 2e98125f88d..00000000000
--- a/i18n/ita/extensions/typescript-language-features/out/features/jsDocCompletionProvider.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"typescript.jsDocCompletionItem.documentation": "Commento JSDoc"
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/typescript-language-features/out/features/organizeImports.i18n.json b/i18n/ita/extensions/typescript-language-features/out/features/organizeImports.i18n.json
deleted file mode 100644
index 40c311f3382..00000000000
--- a/i18n/ita/extensions/typescript-language-features/out/features/organizeImports.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"oraganizeImportsAction.title": "Organizza gli Imports"
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/typescript-language-features/out/features/quickFixProvider.i18n.json b/i18n/ita/extensions/typescript-language-features/out/features/quickFixProvider.i18n.json
deleted file mode 100644
index 9bccba0f7a0..00000000000
--- a/i18n/ita/extensions/typescript-language-features/out/features/quickFixProvider.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"fixAllInFileLabel": "{0} (Correggi tutti nel file)"
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/typescript-language-features/out/features/referencesCodeLensProvider.i18n.json b/i18n/ita/extensions/typescript-language-features/out/features/referencesCodeLensProvider.i18n.json
deleted file mode 100644
index 4c74ac0e94a..00000000000
--- a/i18n/ita/extensions/typescript-language-features/out/features/referencesCodeLensProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"oneReferenceLabel": "1 riferimento",
-	"manyReferenceLabel": "{0} riferimenti",
-	"referenceErrorLabel": "Non è stato possibile determinare i riferimenti"
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/typescript-language-features/out/features/taskProvider.i18n.json b/i18n/ita/extensions/typescript-language-features/out/features/taskProvider.i18n.json
deleted file mode 100644
index a5aca9552f5..00000000000
--- a/i18n/ita/extensions/typescript-language-features/out/features/taskProvider.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"buildTscLabel": "Compila - {0}",
-	"buildAndWatchTscLabel": "Osserva - {0}"
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/typescript-language-features/out/features/updatePathsOnRename.i18n.json b/i18n/ita/extensions/typescript-language-features/out/features/updatePathsOnRename.i18n.json
deleted file mode 100644
index 34bc37ff3b9..00000000000
--- a/i18n/ita/extensions/typescript-language-features/out/features/updatePathsOnRename.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"prompt": "Aggiornare automaticamente le importazioni per il file spostato: '{0}'?",
-	"reject.title": "No",
-	"accept.title": "Sì",
-	"always.title": "Si, aggiorna sempre le importazioni",
-	"never.title": "No, non aggiornare mai le importazioni"
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/typescript-language-features/out/typescriptServiceClient.i18n.json b/i18n/ita/extensions/typescript-language-features/out/typescriptServiceClient.i18n.json
deleted file mode 100644
index 78e5e160a62..00000000000
--- a/i18n/ita/extensions/typescript-language-features/out/typescriptServiceClient.i18n.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noServerFound": "Il percorso {0} non punta a un'installazione valida di tsserver. Verrà eseguito il fallback alla versione in bundle di TypeScript.",
-	"serverCouldNotBeStarted": "Non è stato possibile avviare il server di linguaggio TypeScript. Messaggio di errore: {0}",
-	"typescript.openTsServerLog.notSupported": "Per la registrazione del server TypeScript è necessario almeno TypeScript 2.2.2",
-	"typescript.openTsServerLog.loggingNotEnabled": "La registrazione del server TypeScript è disattivata. Per abilitarla, impostare `typescript.tsserver.log` e riavviare il server TypeScript",
-	"typescript.openTsServerLog.enableAndReloadOption": "Abilita la registrazione e riavvia il server TypeScript",
-	"typescript.openTsServerLog.noLogFile": "Il server TypeScript non ha avviato la registrazione.",
-	"openTsServerLog.openFileFailedFailed": "Non è stato possibile aprire il file di log del server TypeScript",
-	"serverDiedAfterStart": "Il servizio di linguaggio TypeScript è stato arrestato in modo imprevisto per cinque volte dopo che è stato avviato e non verrà riavviato.",
-	"serverDiedReportIssue": "Segnala problema",
-	"serverDied": "Il servizio di linguaggio Typescript è stato arrestato in modo imprevisto per cinque volte negli ultimi cinque minuti."
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/typescript-language-features/out/utils/api.i18n.json b/i18n/ita/extensions/typescript-language-features/out/utils/api.i18n.json
deleted file mode 100644
index 75f0f394012..00000000000
--- a/i18n/ita/extensions/typescript-language-features/out/utils/api.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"invalidVersion": "versione non valida"
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/typescript-language-features/out/utils/logger.i18n.json b/i18n/ita/extensions/typescript-language-features/out/utils/logger.i18n.json
deleted file mode 100644
index 8f5ef5415b9..00000000000
--- a/i18n/ita/extensions/typescript-language-features/out/utils/logger.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"channelName": "TypeScript"
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/typescript-language-features/out/utils/projectStatus.i18n.json b/i18n/ita/extensions/typescript-language-features/out/utils/projectStatus.i18n.json
deleted file mode 100644
index ad1ac2efcc7..00000000000
--- a/i18n/ita/extensions/typescript-language-features/out/utils/projectStatus.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hintExclude": "Per abilitare le funzionalità del linguaggio JavaScript/TypeScript a livello di progetto, escludere le cartelle che contengono molti file, come {0}",
-	"hintExclude.generic": "Per abilitare le funzionalità del linguaggio JavaScript/TypeScript a livello di progetto, escludere le cartelle di grandi dimensioni che contengono file di origine su cui non si lavora.",
-	"large.label": "Configura esclusioni",
-	"hintExclude.tooltip": "Per abilitare le funzionalità del linguaggio JavaScript/TypeScript a livello di progetto, escludere le cartelle di grandi dimensioni che contengono file di origine su cui non si lavora."
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/typescript-language-features/out/utils/typingsStatus.i18n.json b/i18n/ita/extensions/typescript-language-features/out/utils/typingsStatus.i18n.json
deleted file mode 100644
index 78cf90b25ab..00000000000
--- a/i18n/ita/extensions/typescript-language-features/out/utils/typingsStatus.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"installingPackages": "Recupero dei dati per ottimizzare IntelliSense in TypeScript",
-	"typesInstallerInitializationFailed.title": "Non è stato possibile installare i file di definizione tipi per le funzionalità del linguaggio JavaScript. Verificare che NPM sia installato e o configurare 'typescript.npm' nelle impostazioni utente. Clicca [qui]({0}) per saperne di più.",
-	"typesInstallerInitializationFailed.doNotCheckAgain": "Non visualizzare più questo messaggio"
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/typescript-language-features/out/utils/versionPicker.i18n.json b/i18n/ita/extensions/typescript-language-features/out/utils/versionPicker.i18n.json
deleted file mode 100644
index c0e18983544..00000000000
--- a/i18n/ita/extensions/typescript-language-features/out/utils/versionPicker.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"useVSCodeVersionOption": "Usa versione di VS Code",
-	"useWorkspaceVersionOption": "Usa versione dell'area di lavoro",
-	"learnMore": "Altre informazioni",
-	"selectTsVersion": "Selezionare la versione di TypeScript usata per le funzionalità del linguaggio JavaScript e TypeScript"
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/typescript-language-features/out/utils/versionProvider.i18n.json b/i18n/ita/extensions/typescript-language-features/out/utils/versionProvider.i18n.json
deleted file mode 100644
index 385cbc61377..00000000000
--- a/i18n/ita/extensions/typescript-language-features/out/utils/versionProvider.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"couldNotLoadTsVersion": "Non è stato possibile caricare la versione di TypeScript in questo percorso",
-	"noBundledServerFound": "Il file tsserver di VS Code è stato eliminato da un'altra applicazione, ad esempio uno strumento di rilevamento virus che non funziona correttamente. Reinstallare VS Code."
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/typescript-language-features/package.i18n.json b/i18n/ita/extensions/typescript-language-features/package.i18n.json
deleted file mode 100644
index 63da622e36e..00000000000
--- a/i18n/ita/extensions/typescript-language-features/package.i18n.json
+++ /dev/null
@@ -1,67 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Funzionalità dei linguaggi TypeScript e JavaScript",
-	"description": "Fornisce un supporto avanzato per JavaScript e TypeScript",
-	"reloadProjects.title": "Ricarica progetto",
-	"configuration.typescript": "TypeScript",
-	"typescript.useCodeSnippetsOnMethodSuggest.dec": "Completare le funzioni con la relativa firma del parametro.",
-	"typescript.tsdk.desc": "Specifica il percorso della cartella che contiene i file tsserver e lib*.d.ts da usare.",
-	"typescript.disableAutomaticTypeAcquisition": "Disabilita l'acquisizione automatica del tipo. Richiede TypeScript >= 2.0.6.",
-	"typescript.tsserver.log": "Abilita la registrazione del server TypeScript in un file. Questo registro può essere utilizzato per diagnosticare problemi del server TypeScript. Il registro può contenere percorsi di file, codice sorgente e altre informazioni del progetto potenzialmente riservate. ",
-	"typescript.tsserver.pluginPaths": "Percorsi aggiuntivi per rilevare la presenza di plug-in del servizio di linguaggio Typescript. Richiede TypeScript >= 2.3.0.",
-	"typescript.tsserver.pluginPaths.item": "Percorso assoluto o relativo. Il percorso relativo verrà risolto in base alle cartelle dell'area di lavoro.",
-	"typescript.tsserver.trace": "Abilita la traccia dei messaggi inviati al server TypeScript. Questa traccia può essere utilizzata per diagnosticare problemi del server TypeScript. La traccia può contenere percorsi di file, codice sorgente e altre informazioni del progetto potenzialmente riservate.",
-	"typescript.validate.enable": "Abilita/Disabilita la convalida TypeScript.",
-	"typescript.format.enable": "Abilita/Disabilita il formattatore TypeScript predefinito.",
-	"javascript.format.enable": "Abilita/Disabilita il formattatore JavaScript predefinito.",
-	"format.insertSpaceAfterCommaDelimiter": "Consente di definire la gestione dello spazio dopo una virgola di delimitazione6",
-	"format.insertSpaceAfterConstructor": "Definisce la gestione dello spazio dopo la parola chiave constructor. Richiede TypeScript >= 2.3.0.",
-	"format.insertSpaceAfterSemicolonInForStatements": " Consente di definire la gestione dello spazio dopo un punto e virgola in un'istruzione for.",
-	"format.insertSpaceBeforeAndAfterBinaryOperators": "Consente di definire la gestione dello spazio dopo un operatore binario.",
-	"format.insertSpaceAfterKeywordsInControlFlowStatements": "Consente di definire la gestione dello spazio dopo le parole chiave in un'istruzione del flusso di controllo.",
-	"format.insertSpaceAfterFunctionKeywordForAnonymousFunctions": "Consente di definire la gestione dello spazio dopo la parola chiave function per funzioni anonime.",
-	"format.insertSpaceBeforeFunctionParenthesis": "Consente di definire la gestione dello spazio prima delle parentesi dell'argomento della funzione. Richiede TypeScript >= 2.1.5.",
-	"format.insertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis": "Consente di definire la gestione dello spazio dopo le parentesi tonde di apertura e di chiusura non vuote.",
-	"format.insertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets": "Consente di definire la gestione dello spazio dopo le parentesi quadre di apertura e di chiusura non vuote.",
-	"format.insertSpaceAfterOpeningAndBeforeClosingNonemptyBraces": "Consente di definire la gestione dello spazio dopo l'apertura e prima della chiusura di parentesi graffe non vuote. Richiede TypeScript >= 2.3.0.",
-	"format.insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces": "Consente di definire la gestione dello spazio dopo la parentesi graffa iniziale e prima della parentesi graffa finale della stringa del modello. Richiede TypeScript >= 2.0.6",
-	"format.insertSpaceAfterOpeningAndBeforeClosingJsxExpressionBraces": "Consente di definire la gestione dello spazio dopo la parentesi graffa iniziale e prima della parentesi graffa finale dell'espressione JSX. Richiede TypeScript >= 2.0.6",
-	"format.insertSpaceAfterTypeAssertion": "Definisce la gestione dello spazio dopo le asserzioni di tipo in TypeScript. Richiede TypeScript >= 2.4.",
-	"format.placeOpenBraceOnNewLineForFunctions": "Consente di definire se una parentesi graffa di apertura viene o meno inserita su una riga per le funzioni.",
-	"format.placeOpenBraceOnNewLineForControlBlocks": "Consente di definire se una parentesi graffa di apertura viene o meno inserita su una riga per i blocchi di controllo.",
-	"javascript.validate.enable": "Abilita/Disabilita la convalida JavaScript.",
-	"goToProjectConfig.title": "Passa a Configurazione progetto",
-	"javascript.referencesCodeLens.enabled": "Abilita/disabilita riferimenti CodeLens nei file JavaScript.",
-	"typescript.referencesCodeLens.enabled": "Abilita/disabilita riferimenti CodeLens nei file TypeScript. Richiede TypeScript >= 2.0.6.",
-	"typescript.implementationsCodeLens.enabled": "Abilita/Disabilita le finestre CodeLens per le implementazioni. Richiede una versione di TypeScript uguale o successiva alla 2.2.0.",
-	"typescript.openTsServerLog.title": "Apri il log del server TypeScript",
-	"typescript.restartTsServer": "Riavvia server TS",
-	"typescript.selectTypeScriptVersion.title": "Seleziona la versione di TypeScript",
-	"typescript.reportStyleChecksAsWarnings": "Evidenzia i controlli di stile come warning",
-	"jsDocCompletion.enabled": "Abilita/Disabilita commenti automatici JSDoc",
-	"javascript.implicitProjectConfig.checkJs": "Abilita/disabilita il controllo semantico di file JavaScript. File jsconfig.json o tsconfig.json esistenti sovrascrivono su questa impostazione. Richiede TypeScript >= 2.3.1.",
-	"typescript.npm": "Specifica il percorso dell'eseguibile NPM utilizzato per l'acquisizione automatica delle definizioni di tipi. Richiede TypeScript >= 2.3.4.",
-	"typescript.check.npmIsInstalled": "Controlla se NPM è installato per l'acquisizione automatica delle definizioni di tipi",
-	"javascript.nameSuggestions": "Abilita/disabilita l'inclusione di nomi univoci dal file negli elenchi di suggerimento di JavaScript.",
-	"typescript.tsc.autoDetect": "Controlla l'auto-rilevazione di attività di tsc. 'off' disabilita questa funzionalità. 'build' crea solo attività di singola compilazione esecuzione. 'watch' crea solo attività di compilazione e controllo. 'on' crea attività  sia di tipo 'build' che 'watch'. Il valore predefinito è 'on'.",
-	"typescript.problemMatchers.tsc.label": "Problemi TypeScript",
-	"typescript.problemMatchers.tscWatch.label": "Problemi TypeScript (modalità espressione di controllo)",
-	"typescript.quickSuggestionsForPaths": "Abilita/disabilita i suggerimenti rapidi quando si digita un percorso di importazione.",
-	"typescript.locale": "Consente di definire le impostazioni locail usate per segnalare errori JavaScript e TypeScript. Richiede TypeScript >= 2.6.0. Con l'impostazione predefinita 'null' vengono usate le impostazioni locali di VS Code.",
-	"javascript.implicitProjectConfig.experimentalDecorators": "Abilita/disabilita gli elementi 'experimentalDecorators' per file JavaScript che non fanno parte di un progetto. I file jsconfig.json o tsconfig.json esistenti sovrascrivono questa impostazione. Richiede TypeScript >= 2.3.1.",
-	"typescript.autoImportSuggestions.enabled": "Abilita/disabilita il suggerimento automatico per gli import. Richiede una versione di TypeScript >= 2.6.1",
-	"typescript.experimental.syntaxFolding": "Abilita/disabilita i marcatori di folding con riconoscimento della sintassi.",
-	"taskDefinition.tsconfig.description": "File tsconfig che definisce la compilazione TS.",
-	"javascript.suggestionActions.enabled": "Abilita/disabilita la diagnostica dei suggerimenti per i file JavaScript nell'editor. Richiede TypeScript >= 2.8.",
-	"typescript.suggestionActions.enabled": "Abilita/disabilita la diagnostica dei suggerimenti per i file TypeScript nell'editor. Richiede TypeScript >= 2.8.",
-	"typescript.preferences.quoteStyle": "Stile di virgolette preferito da usare per le correzioni rapide. È possibile scegliere tra 'single', 'double' o 'auto' per derivare il tipo di virgolette dalle importazioni esistenti. Richiede TypeScript >= 2.9",
-	"typescript.preferences.importModuleSpecifier": "Stile di percorso preferito per le importazioni automatiche:\n- \"relative\", ovvero relativo al percorso del file.\n- \"non-relative\", basato sull'elemento 'baseUrl' configurato in 'jsconfig.json' / 'tsconfig.json'.\n- \"auto\", per derivare il tipo di percorso più breve.\nRichiede TypeScript >= 2.9",
-	"typescript.showUnused": "Abilita/disabilita l'evidenziazione delle variabili inutilizzate nel codice. Richiede TypeScript > = 2,9",
-	"typescript.updateImportsOnFileMove.enabled": "Abilita/disabilita l'aggiornamento automatico dei percorsi di importazione quando si rinomina o si sposta un file in VS Code. I valori possibili sono: 'prompt', che chiede conferma per ogni ridenominazione, 'always', che aggiorna automaticamente i percorsi e 'never' che rinomina i percorsi senza chiedere conferma. Richiede TypeScript >= 2.9"
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/typescript/out/commands.i18n.json b/i18n/ita/extensions/typescript/out/commands.i18n.json
deleted file mode 100644
index ffa2bc44d1e..00000000000
--- a/i18n/ita/extensions/typescript/out/commands.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"typescript.projectConfigNoWorkspace": "Aprire una cartella in Visual Studio Code per usare un progetto TypeScript o JavaScript",
-	"typescript.projectConfigUnsupportedFile": "Non è stato possibile determinare il progetto TypeScript o JavaScript. Il tipo di file non è supportato",
-	"typescript.projectConfigCouldNotGetInfo": "Non è stato possibile determinare il progetto TypeScript o JavaScript",
-	"typescript.noTypeScriptProjectConfig": "Il file non fa parte di un progetto TypeScript. Clicca [qui]({0}) per saperne di più.",
-	"typescript.noJavaScriptProjectConfig": "Il file non fa parte di un progetto JavaScript. Clicca [qui]({0}) per saperne di più.",
-	"typescript.configureTsconfigQuickPick": "Configura tsconfig.json",
-	"typescript.configureJsconfigQuickPick": "Configura jsconfig.json"
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/typescript/out/features/bufferSyncSupport.i18n.json b/i18n/ita/extensions/typescript/out/features/bufferSyncSupport.i18n.json
deleted file mode 100644
index e6788ac396b..00000000000
--- a/i18n/ita/extensions/typescript/out/features/bufferSyncSupport.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"moreInformation": "Altre informazioni",
-	"doNotCheckAgain": "Non eseguire più la verifica",
-	"close": "Chiudi",
-	"updateTscCheck": "L'impostazione utente 'typescript.check.tscVersion' è stata aggiornata ed è ora false"
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/typescript/out/features/completionItemProvider.i18n.json b/i18n/ita/extensions/typescript/out/features/completionItemProvider.i18n.json
deleted file mode 100644
index 86de96163a7..00000000000
--- a/i18n/ita/extensions/typescript/out/features/completionItemProvider.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"selectCodeAction": "Selezionare l'azione codice da applicare",
-	"acquiringTypingsLabel": "Acquisizione dei file typings...",
-	"acquiringTypingsDetail": "Acquisizione delle definizioni dei file typings per IntelliSense.",
-	"autoImportLabel": "Importazione automatica da {0}"
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/typescript/out/features/directiveCommentCompletionProvider.i18n.json b/i18n/ita/extensions/typescript/out/features/directiveCommentCompletionProvider.i18n.json
deleted file mode 100644
index 98bb57ed994..00000000000
--- a/i18n/ita/extensions/typescript/out/features/directiveCommentCompletionProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"ts-check": "Attiva il controllo semantico in un file JavaScript. Deve essere all'inizio del file.",
-	"ts-nocheck": "Disattiva il controllo semantico in un file JavaScript. Deve essere all'inizio del file.",
-	"ts-ignore": "Elimina errori di @ts-check sulla riga successiva di un file."
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/typescript/out/features/implementationsCodeLensProvider.i18n.json b/i18n/ita/extensions/typescript/out/features/implementationsCodeLensProvider.i18n.json
deleted file mode 100644
index cd8cac2d81a..00000000000
--- a/i18n/ita/extensions/typescript/out/features/implementationsCodeLensProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"oneImplementationLabel": "1 implementazione",
-	"manyImplementationLabel": "{0} implementazioni",
-	"implementationsErrorLabel": "Non è stato possibile determinare le implementazioni"
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/typescript/out/features/jsDocCompletionProvider.i18n.json b/i18n/ita/extensions/typescript/out/features/jsDocCompletionProvider.i18n.json
deleted file mode 100644
index 2e98125f88d..00000000000
--- a/i18n/ita/extensions/typescript/out/features/jsDocCompletionProvider.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"typescript.jsDocCompletionItem.documentation": "Commento JSDoc"
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/typescript/out/features/quickFixProvider.i18n.json b/i18n/ita/extensions/typescript/out/features/quickFixProvider.i18n.json
deleted file mode 100644
index 9bccba0f7a0..00000000000
--- a/i18n/ita/extensions/typescript/out/features/quickFixProvider.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"fixAllInFileLabel": "{0} (Correggi tutti nel file)"
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/typescript/out/features/referencesCodeLensProvider.i18n.json b/i18n/ita/extensions/typescript/out/features/referencesCodeLensProvider.i18n.json
deleted file mode 100644
index 4c74ac0e94a..00000000000
--- a/i18n/ita/extensions/typescript/out/features/referencesCodeLensProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"oneReferenceLabel": "1 riferimento",
-	"manyReferenceLabel": "{0} riferimenti",
-	"referenceErrorLabel": "Non è stato possibile determinare i riferimenti"
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/typescript/out/features/taskProvider.i18n.json b/i18n/ita/extensions/typescript/out/features/taskProvider.i18n.json
deleted file mode 100644
index a5aca9552f5..00000000000
--- a/i18n/ita/extensions/typescript/out/features/taskProvider.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"buildTscLabel": "Compila - {0}",
-	"buildAndWatchTscLabel": "Osserva - {0}"
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/typescript/out/typescriptMain.i18n.json b/i18n/ita/extensions/typescript/out/typescriptMain.i18n.json
deleted file mode 100644
index e771e7a4a9e..00000000000
--- a/i18n/ita/extensions/typescript/out/typescriptMain.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"typescript.projectConfigNoWorkspace": "Aprire una cartella in Visual Studio Code per usare un progetto TypeScript o JavaScript",
-	"typescript.projectConfigUnsupportedFile": "Non è stato possibile determinare il progetto TypeScript o JavaScript. Il tipo di file non è supportato",
-	"typescript.projectConfigCouldNotGetInfo": "Non è stato possibile determinare il progetto TypeScript o JavaScript",
-	"typescript.noTypeScriptProjectConfig": "Il file non fa parte di un progetto TypeScript",
-	"typescript.noJavaScriptProjectConfig": "Il file non fa parte di un progetto JavaScript",
-	"typescript.configureTsconfigQuickPick": "Configura tsconfig.json",
-	"typescript.configureJsconfigQuickPick": "Configura jsconfig.json",
-	"typescript.projectConfigLearnMore": "Altre informazioni"
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/typescript/out/typescriptServiceClient.i18n.json b/i18n/ita/extensions/typescript/out/typescriptServiceClient.i18n.json
deleted file mode 100644
index 78e5e160a62..00000000000
--- a/i18n/ita/extensions/typescript/out/typescriptServiceClient.i18n.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noServerFound": "Il percorso {0} non punta a un'installazione valida di tsserver. Verrà eseguito il fallback alla versione in bundle di TypeScript.",
-	"serverCouldNotBeStarted": "Non è stato possibile avviare il server di linguaggio TypeScript. Messaggio di errore: {0}",
-	"typescript.openTsServerLog.notSupported": "Per la registrazione del server TypeScript è necessario almeno TypeScript 2.2.2",
-	"typescript.openTsServerLog.loggingNotEnabled": "La registrazione del server TypeScript è disattivata. Per abilitarla, impostare `typescript.tsserver.log` e riavviare il server TypeScript",
-	"typescript.openTsServerLog.enableAndReloadOption": "Abilita la registrazione e riavvia il server TypeScript",
-	"typescript.openTsServerLog.noLogFile": "Il server TypeScript non ha avviato la registrazione.",
-	"openTsServerLog.openFileFailedFailed": "Non è stato possibile aprire il file di log del server TypeScript",
-	"serverDiedAfterStart": "Il servizio di linguaggio TypeScript è stato arrestato in modo imprevisto per cinque volte dopo che è stato avviato e non verrà riavviato.",
-	"serverDiedReportIssue": "Segnala problema",
-	"serverDied": "Il servizio di linguaggio Typescript è stato arrestato in modo imprevisto per cinque volte negli ultimi cinque minuti."
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/typescript/out/utils/api.i18n.json b/i18n/ita/extensions/typescript/out/utils/api.i18n.json
deleted file mode 100644
index 75f0f394012..00000000000
--- a/i18n/ita/extensions/typescript/out/utils/api.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"invalidVersion": "versione non valida"
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/typescript/out/utils/logger.i18n.json b/i18n/ita/extensions/typescript/out/utils/logger.i18n.json
deleted file mode 100644
index 8f5ef5415b9..00000000000
--- a/i18n/ita/extensions/typescript/out/utils/logger.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"channelName": "TypeScript"
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/typescript/out/utils/projectStatus.i18n.json b/i18n/ita/extensions/typescript/out/utils/projectStatus.i18n.json
deleted file mode 100644
index ad1ac2efcc7..00000000000
--- a/i18n/ita/extensions/typescript/out/utils/projectStatus.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hintExclude": "Per abilitare le funzionalità del linguaggio JavaScript/TypeScript a livello di progetto, escludere le cartelle che contengono molti file, come {0}",
-	"hintExclude.generic": "Per abilitare le funzionalità del linguaggio JavaScript/TypeScript a livello di progetto, escludere le cartelle di grandi dimensioni che contengono file di origine su cui non si lavora.",
-	"large.label": "Configura esclusioni",
-	"hintExclude.tooltip": "Per abilitare le funzionalità del linguaggio JavaScript/TypeScript a livello di progetto, escludere le cartelle di grandi dimensioni che contengono file di origine su cui non si lavora."
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/typescript/out/utils/typingsStatus.i18n.json b/i18n/ita/extensions/typescript/out/utils/typingsStatus.i18n.json
deleted file mode 100644
index 78cf90b25ab..00000000000
--- a/i18n/ita/extensions/typescript/out/utils/typingsStatus.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"installingPackages": "Recupero dei dati per ottimizzare IntelliSense in TypeScript",
-	"typesInstallerInitializationFailed.title": "Non è stato possibile installare i file di definizione tipi per le funzionalità del linguaggio JavaScript. Verificare che NPM sia installato e o configurare 'typescript.npm' nelle impostazioni utente. Clicca [qui]({0}) per saperne di più.",
-	"typesInstallerInitializationFailed.doNotCheckAgain": "Non visualizzare più questo messaggio"
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/typescript/out/utils/versionPicker.i18n.json b/i18n/ita/extensions/typescript/out/utils/versionPicker.i18n.json
deleted file mode 100644
index c0e18983544..00000000000
--- a/i18n/ita/extensions/typescript/out/utils/versionPicker.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"useVSCodeVersionOption": "Usa versione di VS Code",
-	"useWorkspaceVersionOption": "Usa versione dell'area di lavoro",
-	"learnMore": "Altre informazioni",
-	"selectTsVersion": "Selezionare la versione di TypeScript usata per le funzionalità del linguaggio JavaScript e TypeScript"
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/typescript/out/utils/versionProvider.i18n.json b/i18n/ita/extensions/typescript/out/utils/versionProvider.i18n.json
deleted file mode 100644
index 385cbc61377..00000000000
--- a/i18n/ita/extensions/typescript/out/utils/versionProvider.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"couldNotLoadTsVersion": "Non è stato possibile caricare la versione di TypeScript in questo percorso",
-	"noBundledServerFound": "Il file tsserver di VS Code è stato eliminato da un'altra applicazione, ad esempio uno strumento di rilevamento virus che non funziona correttamente. Reinstallare VS Code."
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/typescript/package.i18n.json b/i18n/ita/extensions/typescript/package.i18n.json
deleted file mode 100644
index 054fef232fe..00000000000
--- a/i18n/ita/extensions/typescript/package.i18n.json
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Funzionalità dei linguaggi TypeScript e JavaScript",
-	"description": "Fornisce un supporto avanzato per JavaScript e TypeScript",
-	"typescript.reloadProjects.title": "Ricarica progetto",
-	"javascript.reloadProjects.title": "Ricarica progetto",
-	"configuration.typescript": "TypeScript",
-	"typescript.useCodeSnippetsOnMethodSuggest.dec": "Completare le funzioni con la relativa firma del parametro.",
-	"typescript.tsdk.desc": "Specifica il percorso della cartella che contiene i file tsserver e lib*.d.ts da usare.",
-	"typescript.disableAutomaticTypeAcquisition": "Disabilita l'acquisizione automatica del tipo. Richiede TypeScript >= 2.0.6.",
-	"typescript.tsserver.log": "Abilita la registrazione del server TypeScript in un file. Questo registro può essere utilizzato per diagnosticare problemi del server TypeScript. Il registro può contenere percorsi di file, codice sorgente e altre informazioni del progetto potenzialmente riservate. ",
-	"typescript.tsserver.trace": "Abilita la traccia dei messaggi inviati al server TypeScript. Questa traccia può essere utilizzata per diagnosticare problemi del server TypeScript. La traccia può contenere percorsi di file, codice sorgente e altre informazioni del progetto potenzialmente riservate.",
-	"typescript.validate.enable": "Abilita/Disabilita la convalida TypeScript.",
-	"typescript.format.enable": "Abilita/Disabilita il formattatore TypeScript predefinito.",
-	"javascript.format.enable": "Abilita/Disabilita il formattatore JavaScript predefinito.",
-	"format.insertSpaceAfterCommaDelimiter": "Consente di definire la gestione dello spazio dopo una virgola di delimitazione6",
-	"format.insertSpaceAfterConstructor": "Definisce la gestione dello spazio dopo la parola chiave constructor. Richiede TypeScript >= 2.3.0.",
-	"format.insertSpaceAfterSemicolonInForStatements": " Consente di definire la gestione dello spazio dopo un punto e virgola in un'istruzione for.",
-	"format.insertSpaceBeforeAndAfterBinaryOperators": "Consente di definire la gestione dello spazio dopo un operatore binario.",
-	"format.insertSpaceAfterKeywordsInControlFlowStatements": "Consente di definire la gestione dello spazio dopo le parole chiave in un'istruzione del flusso di controllo.",
-	"format.insertSpaceAfterFunctionKeywordForAnonymousFunctions": "Consente di definire la gestione dello spazio dopo la parola chiave function per funzioni anonime.",
-	"format.insertSpaceBeforeFunctionParenthesis": "Consente di definire la gestione dello spazio prima delle parentesi dell'argomento della funzione. Richiede TypeScript >= 2.1.5.",
-	"format.insertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis": "Consente di definire la gestione dello spazio dopo le parentesi tonde di apertura e di chiusura non vuote.",
-	"format.insertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets": "Consente di definire la gestione dello spazio dopo le parentesi quadre di apertura e di chiusura non vuote.",
-	"format.insertSpaceAfterOpeningAndBeforeClosingNonemptyBraces": "Consente di definire la gestione dello spazio dopo l'apertura e prima della chiusura di parentesi graffe non vuote. Richiede TypeScript >= 2.3.0.",
-	"format.insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces": "Consente di definire la gestione dello spazio dopo la parentesi graffa iniziale e prima della parentesi graffa finale della stringa del modello. Richiede TypeScript >= 2.0.6",
-	"format.insertSpaceAfterOpeningAndBeforeClosingJsxExpressionBraces": "Consente di definire la gestione dello spazio dopo la parentesi graffa iniziale e prima della parentesi graffa finale dell'espressione JSX. Richiede TypeScript >= 2.0.6",
-	"format.insertSpaceAfterTypeAssertion": "Definisce la gestione dello spazio dopo le asserzioni di tipo in TypeScript. Richiede TypeScript >= 2.4.",
-	"format.placeOpenBraceOnNewLineForFunctions": "Consente di definire se una parentesi graffa di apertura viene o meno inserita su una riga per le funzioni.",
-	"format.placeOpenBraceOnNewLineForControlBlocks": "Consente di definire se una parentesi graffa di apertura viene o meno inserita su una riga per i blocchi di controllo.",
-	"javascript.validate.enable": "Abilita/Disabilita la convalida JavaScript.",
-	"typescript.goToProjectConfig.title": "Passa a Configurazione progetto",
-	"javascript.goToProjectConfig.title": "Passa a Configurazione progetto",
-	"javascript.referencesCodeLens.enabled": "Abilita/disabilita riferimenti CodeLens nei file JavaScript.",
-	"typescript.referencesCodeLens.enabled": "Abilita/disabilita riferimenti CodeLens nei file TypeScript. Richiede TypeScript >= 2.0.6.",
-	"typescript.implementationsCodeLens.enabled": "Abilita/Disabilita le finestre CodeLens per le implementazioni. Richiede una versione di TypeScript uguale o successiva alla 2.2.0.",
-	"typescript.openTsServerLog.title": "Apri il log del server TypeScript",
-	"typescript.restartTsServer": "Riavvia server TS",
-	"typescript.selectTypeScriptVersion.title": "Seleziona la versione di TypeScript",
-	"typescript.reportStyleChecksAsWarnings": "Evidenzia i controlli di stile come warning",
-	"jsDocCompletion.enabled": "Abilita/Disabilita commenti automatici JSDoc",
-	"javascript.implicitProjectConfig.checkJs": "Abilita/disabilita il controllo semantico di file JavaScript. File jsconfig.json o tsconfig.json esistenti sovrascrivono su questa impostazione. Richiede TypeScript >= 2.3.1.",
-	"typescript.npm": "Specifica il percorso dell'eseguibile NPM utilizzato per l'acquisizione automatica delle definizioni di tipi. Richiede TypeScript >= 2.3.4.",
-	"typescript.check.npmIsInstalled": "Controlla se NPM è installato per l'acquisizione automatica delle definizioni di tipi",
-	"javascript.nameSuggestions": "Abilita/disabilita l'inclusione di nomi univoci dal file negli elenchi di suggerimento di JavaScript.",
-	"typescript.tsc.autoDetect": "Controlla l'auto-rilevazione di attività di tsc. 'off' disabilita questa funzionalità. 'build' crea solo attività di singola compilazione esecuzione. 'watch' crea solo attività di compilazione e controllo. 'on' crea attività  sia di tipo 'build' che 'watch'. Il valore predefinito è 'on'.",
-	"typescript.problemMatchers.tsc.label": "Problemi TypeScript",
-	"typescript.problemMatchers.tscWatch.label": "Problemi TypeScript (modalità espressione di controllo)",
-	"typescript.quickSuggestionsForPaths": "Attiva/Disattiva suggerimenti rapidi quando si digita un percorso di importazione.",
-	"typescript.locale": "Assegna le impostazioni internazionali utilizzate per riportare errori TypeScript. Richiede TypeScript > = 2.6.0. Il valore predefinito 'null' utilizza le impostazioni internazionali di VS Code.",
-	"javascript.implicitProjectConfig.experimentalDecorators": "Abilita/disabilita 'experimentalDecorators' per i file JavaScript che non fanno parte di un progetto. File jsconfig.json o tsconfig.json esistenti ignorano questa impostazione. Richiede TypeScript >= 2.3.1.",
-	"typescript.autoImportSuggestions.enabled": "Abilita/Disabilita suggerimenti importazione automatica. Richiede una versione di TypeScript >= 2.6.1",
-	"typescript.experimental.syntaxFolding": "Abilita/disabilita i marcatori di folding con riconoscimento della sintassi.",
-	"taskDefinition.tsconfig.description": "File tsconfig che definisce la compilazione TS."
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/vb/package.i18n.json b/i18n/ita/extensions/vb/package.i18n.json
deleted file mode 100644
index 94b9116a352..00000000000
--- a/i18n/ita/extensions/vb/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Nozioni di base del linguaggio Visual Basic",
-	"description": "Offre gli snippet, la sottolineatura delle sintassi, il match delle parentesi e il folding nei file Visual Basic."
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/xml/package.i18n.json b/i18n/ita/extensions/xml/package.i18n.json
deleted file mode 100644
index 25306841830..00000000000
--- a/i18n/ita/extensions/xml/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Nozioni di base del linguaggio XML",
-	"description": "Offre la sottolineatura delle sintassi e il match delle parentesi nei file XML."
-}
\ No newline at end of file
diff --git a/i18n/ita/extensions/yaml/package.i18n.json b/i18n/ita/extensions/yaml/package.i18n.json
deleted file mode 100644
index c61f843104a..00000000000
--- a/i18n/ita/extensions/yaml/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Nozioni di base del linguaggio YAML",
-	"description": "Offre la sottolineatura delle sintassi e il match delle parentesi nei file YAML."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/base/browser/ui/actionbar/actionbar.i18n.json b/i18n/ita/src/vs/base/browser/ui/actionbar/actionbar.i18n.json
deleted file mode 100644
index 309631273fe..00000000000
--- a/i18n/ita/src/vs/base/browser/ui/actionbar/actionbar.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"titleLabel": "{0} ({1})"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/base/browser/ui/aria/aria.i18n.json b/i18n/ita/src/vs/base/browser/ui/aria/aria.i18n.json
deleted file mode 100644
index 7c9c11579f8..00000000000
--- a/i18n/ita/src/vs/base/browser/ui/aria/aria.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"repeated": "{0} (nuova occorrenza)"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/base/browser/ui/findinput/findInput.i18n.json b/i18n/ita/src/vs/base/browser/ui/findinput/findInput.i18n.json
deleted file mode 100644
index 5582a352d0e..00000000000
--- a/i18n/ita/src/vs/base/browser/ui/findinput/findInput.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"defaultLabel": "input"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/base/browser/ui/findinput/findInputCheckboxes.i18n.json b/i18n/ita/src/vs/base/browser/ui/findinput/findInputCheckboxes.i18n.json
deleted file mode 100644
index 42e52e98773..00000000000
--- a/i18n/ita/src/vs/base/browser/ui/findinput/findInputCheckboxes.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"caseDescription": "Maiuscole/minuscole",
-	"wordsDescription": "Parola intera",
-	"regexDescription": "Usa espressione regolare"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/base/browser/ui/inputbox/inputBox.i18n.json b/i18n/ita/src/vs/base/browser/ui/inputbox/inputBox.i18n.json
deleted file mode 100644
index 82791decf4f..00000000000
--- a/i18n/ita/src/vs/base/browser/ui/inputbox/inputBox.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"alertErrorMessage": "Errore: {0}",
-	"alertWarningMessage": "Avviso: {0}",
-	"alertInfoMessage": "Info: {0}"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/base/browser/ui/resourceviewer/resourceViewer.i18n.json b/i18n/ita/src/vs/base/browser/ui/resourceviewer/resourceViewer.i18n.json
deleted file mode 100644
index 2b12daabc07..00000000000
--- a/i18n/ita/src/vs/base/browser/ui/resourceviewer/resourceViewer.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"imgMeta": "{0}x{1} {2}",
-	"largeImageError": "L'immagine è troppo grande per essere visualizzata nell'editor",
-	"resourceOpenExternalButton": "Aprire l'immagine utilizzando un programma esterno?",
-	"nativeBinaryError": "Il file non verrà visualizzato nell'editor perché è binario, è molto grande o usa una codifica testo non supportata.",
-	"sizeB": "{0} B",
-	"sizeKB": "{0} KB",
-	"sizeMB": "{0} MB",
-	"sizeGB": "{0} GB",
-	"sizeTB": "{0} TB"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json b/i18n/ita/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json
deleted file mode 100644
index 750d811d866..00000000000
--- a/i18n/ita/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"selectAriaOption": "{0}"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/base/browser/ui/toolbar/toolbar.i18n.json b/i18n/ita/src/vs/base/browser/ui/toolbar/toolbar.i18n.json
deleted file mode 100644
index 177437fcb1f..00000000000
--- a/i18n/ita/src/vs/base/browser/ui/toolbar/toolbar.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"more": "Altro"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/base/common/errorMessage.i18n.json b/i18n/ita/src/vs/base/common/errorMessage.i18n.json
deleted file mode 100644
index b313a3d0ab4..00000000000
--- a/i18n/ita/src/vs/base/common/errorMessage.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"stackTrace.format": "{0}: {1}",
-	"error.defaultMessage": "Si è verificato un errore sconosciuto. Per altri dettagli, vedere il log.",
-	"nodeExceptionMessage": "Si è verificato un errore di sistema ({0})",
-	"error.moreErrors": "{0} ({1} errori in totale)"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/base/common/json.i18n.json b/i18n/ita/src/vs/base/common/json.i18n.json
deleted file mode 100644
index 2ffc2a9d464..00000000000
--- a/i18n/ita/src/vs/base/common/json.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"error.invalidSymbol": "Simbolo non valido",
-	"error.invalidNumberFormat": "Formato di numero non valido",
-	"error.propertyNameExpected": "È previsto un nome di proprietà",
-	"error.valueExpected": "È previsto un valore",
-	"error.colonExpected": "Sono previsti i due punti",
-	"error.commaExpected": "È prevista la virgola",
-	"error.closeBraceExpected": "È prevista la parentesi graffa di chiusura",
-	"error.closeBracketExpected": "È prevista la parentesi quadra di chiusura",
-	"error.endOfFileExpected": "È prevista la fine del file"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/base/common/jsonErrorMessages.i18n.json b/i18n/ita/src/vs/base/common/jsonErrorMessages.i18n.json
deleted file mode 100644
index 7128b220244..00000000000
--- a/i18n/ita/src/vs/base/common/jsonErrorMessages.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"error.invalidSymbol": "Simbolo non valido",
-	"error.invalidNumberFormat": "Formato di numero non valido",
-	"error.propertyNameExpected": "È previsto un nome di proprietà",
-	"error.valueExpected": "È previsto un valore",
-	"error.colonExpected": "Sono previsti i due punti",
-	"error.commaExpected": "È prevista la virgola",
-	"error.closeBraceExpected": "È prevista la parentesi graffa di chiusura",
-	"error.closeBracketExpected": "È prevista la parentesi quadra di chiusura",
-	"error.endOfFileExpected": "È prevista la fine del file"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/base/common/keybindingLabels.i18n.json b/i18n/ita/src/vs/base/common/keybindingLabels.i18n.json
deleted file mode 100644
index 2e29130a07a..00000000000
--- a/i18n/ita/src/vs/base/common/keybindingLabels.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"ctrlKey": "CTRL",
-	"shiftKey": "MAIUSC",
-	"altKey": "ALT",
-	"windowsKey": "Windows",
-	"ctrlKey.long": "CTRL",
-	"shiftKey.long": "MAIUSC",
-	"altKey.long": "ALT",
-	"cmdKey.long": "Comando",
-	"windowsKey.long": "Windows"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/base/common/processes.i18n.json b/i18n/ita/src/vs/base/common/processes.i18n.json
deleted file mode 100644
index 7488580f0e6..00000000000
--- a/i18n/ita/src/vs/base/common/processes.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"ExecutableParser.commandMissing": "Errore: nelle informazioni sull'eseguibile deve essere definito un comando di tipo string.",
-	"ExecutableParser.isShellCommand": "Avviso: isShellCommand deve essere di tipo boolean. Il valore {0} verrà ignorato.",
-	"ExecutableParser.args": "Avviso: gli argomenti devono essere di tipo string[]. Il valore {0} verrà ignorato.",
-	"ExecutableParser.invalidCWD": "Avviso: options.cwd deve essere di tipo string. Il valore {0} verrà ignorato."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/base/common/severity.i18n.json b/i18n/ita/src/vs/base/common/severity.i18n.json
deleted file mode 100644
index f585e5046c6..00000000000
--- a/i18n/ita/src/vs/base/common/severity.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"sev.error": "Errore",
-	"sev.warning": "Avviso",
-	"sev.info": "Informazioni"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/base/node/processes.i18n.json b/i18n/ita/src/vs/base/node/processes.i18n.json
deleted file mode 100644
index 15d77305511..00000000000
--- a/i18n/ita/src/vs/base/node/processes.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"TaskRunner.UNC": "Non è possibile eseguire un comando della shell su un'unità UNC."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/base/node/ps.i18n.json b/i18n/ita/src/vs/base/node/ps.i18n.json
deleted file mode 100644
index 4795960aaa0..00000000000
--- a/i18n/ita/src/vs/base/node/ps.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"collecting": "Raccolta informazioni su CPU e memoria in corso. Potrebbe impiegare qualche secondo."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/base/node/zip.i18n.json b/i18n/ita/src/vs/base/node/zip.i18n.json
deleted file mode 100644
index 6b7be154b57..00000000000
--- a/i18n/ita/src/vs/base/node/zip.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"incompleteExtract": "Non completato. Trovate {0} di {1} voci",
-	"notFound": "{0} non è stato trovato all'interno del file ZIP."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/base/parts/quickopen/browser/quickOpenModel.i18n.json b/i18n/ita/src/vs/base/parts/quickopen/browser/quickOpenModel.i18n.json
deleted file mode 100644
index 242042fe757..00000000000
--- a/i18n/ita/src/vs/base/parts/quickopen/browser/quickOpenModel.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"quickOpenAriaLabelEntry": "{0}, selezione",
-	"quickOpenAriaLabel": "selezione"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/base/parts/quickopen/browser/quickOpenWidget.i18n.json b/i18n/ita/src/vs/base/parts/quickopen/browser/quickOpenWidget.i18n.json
deleted file mode 100644
index ce13fa3e7fc..00000000000
--- a/i18n/ita/src/vs/base/parts/quickopen/browser/quickOpenWidget.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"quickOpenAriaLabel": "Selezione rapida. Digitare per ridurre il numero di risultati.",
-	"treeAriaLabel": "Selezione rapida"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/base/parts/tree/browser/treeDefaults.i18n.json b/i18n/ita/src/vs/base/parts/tree/browser/treeDefaults.i18n.json
deleted file mode 100644
index e7606c8b141..00000000000
--- a/i18n/ita/src/vs/base/parts/tree/browser/treeDefaults.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"collapse": "Comprimi"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json b/i18n/ita/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
deleted file mode 100644
index 227d32796a6..00000000000
--- a/i18n/ita/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hide": "nascondi",
-	"show": "mostra",
-	"previewOnGitHub": "Anteprima in GitHub",
-	"loadingData": "Caricamento dei dati...",
-	"rateLimited": "Superato il limite di query GitHub. Attendere prego.",
-	"similarIssues": "Problemi simili",
-	"open": "Apri",
-	"closed": "Chiuso",
-	"noSimilarIssues": "Nessun problema simile trovato",
-	"settingsSearchIssue": "Problema di ricerca impostazioni",
-	"bugReporter": "Segnalazione bug",
-	"featureRequest": "Richiesta di funzionalità",
-	"performanceIssue": "Problema di prestazioni",
-	"stepsToReproduce": "Passi da riprodurre",
-	"bugDescription": "Indicare i passaggi necessari per riprodurre il problema in modo affidabile. Includere i risultati effettivi e quelli previsti. È supportato il linguaggio Markdown per GitHub. Sarà possibile modificare il problema e aggiungere screenshot quando verrà visualizzato in anteprima in GitHub.",
-	"performanceIssueDesciption": "Quando si è verificato questo problema di prestazioni? All'avvio o dopo una serie specifiche di azioni? È supportato il linguaggio Markdown per GitHub. Sarà possibile modificare il problema e aggiungere screenshot quando verrà visualizzato in anteprima in GitHub.",
-	"description": "Descrizione",
-	"featureRequestDescription": "Descrivere la funzionalità desiderata. È supportato il linguaggio Markdown per GitHub. Sarà possibile modificare il problema e aggiungere screenshot quando verrà visualizzato in anteprima in GitHub.",
-	"expectedResults": "Risultati previsti",
-	"settingsSearchResultsDescription": "Elencare i risultati che si prevedeva di visualizzare durante la ricerca con questa query. È supportato il linguaggio Markdown per GitHub. Sarà possibile modificare il problema e aggiungere screenshot quando verrà visualizzato in anteprima in GitHub.",
-	"pasteData": "I dati necessari sono stati scritti negli appunti perché erano eccessivi per l'invio. Incollarli.",
-	"disabledExtensions": "Le estensioni sono disabilitate"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json b/i18n/ita/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
deleted file mode 100644
index a59dbde663c..00000000000
--- a/i18n/ita/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"completeInEnglish": "Completare il modulo in lingua inglese.",
-	"issueTypeLabel": "Questo è un",
-	"issueSourceLabel": "File in",
-	"vscode": "Visual Studio Code",
-	"extension": "Un'estensione",
-	"disableExtensionsLabelText": "Provare a riprodurre il problema dopo {0}. Se il problema si verifica solo quando le estensioni sono attive, è probabilmente un problema legato ad un'estensione.",
-	"disableExtensions": "disabilitando tutte le estensioni e ricaricando la finestra",
-	"chooseExtension": "Estensione",
-	"issueTitleLabel": "Titolo",
-	"issueTitleRequired": "Immettere un titolo.",
-	"titleLengthValidation": "Il titolo è troppo lungo.",
-	"details": "Immettere i dettagli.",
-	"sendSystemInfo": "Includi informazioni sul sistema ({0})",
-	"show": "mostra",
-	"sendProcessInfo": "Includi i processi attualmente in esecuzione ({0})",
-	"sendWorkspaceInfo": "Includi i metadati dell'area di lavoro ({0})",
-	"sendExtensions": "Includi le estensioni abilitate ({0})",
-	"sendSearchedExtensions": "Invia le estensioni cercate ({0})",
-	"sendSettingsSearchDetails": "Invia i dettagli di ricerca delle impostazioni ({0})"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/code/electron-browser/processExplorer/processExplorerMain.i18n.json b/i18n/ita/src/vs/code/electron-browser/processExplorer/processExplorerMain.i18n.json
deleted file mode 100644
index edf6b8f4660..00000000000
--- a/i18n/ita/src/vs/code/electron-browser/processExplorer/processExplorerMain.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"cpu": "% CPU",
-	"memory": "Memoria (MB)",
-	"pid": "PID",
-	"name": "Nome",
-	"killProcess": "Arresta il processo",
-	"forceKillProcess": "Arresto forzato del processo",
-	"copy": "Copia",
-	"copyAll": "Copia tutti"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/code/electron-main/auth.i18n.json b/i18n/ita/src/vs/code/electron-main/auth.i18n.json
deleted file mode 100644
index 674db87b9f5..00000000000
--- a/i18n/ita/src/vs/code/electron-main/auth.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"authRequire": "Autenticazione proxy necessaria",
-	"proxyauth": "Il proxy {0} richiede l'autenticazione."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/code/electron-main/logUploader.i18n.json b/i18n/ita/src/vs/code/electron-main/logUploader.i18n.json
deleted file mode 100644
index 39ed2854c63..00000000000
--- a/i18n/ita/src/vs/code/electron-main/logUploader.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"invalidEndpoint": "Endpoint dell'uploader di log non valido",
-	"beginUploading": "Caricamento...",
-	"didUploadLogs": "Caricamento riuscito. ID file di log: {0}",
-	"logUploadPromptHeader": "I log della sessione verranno caricati in un endpoint Microsoft protetto accessibile solo ai membri Microsoft del team di VS Code.",
-	"logUploadPromptBody": "I log della sessione possono contenere informazioni personali, quali percorsi completi o contenuti di file. Esaminare e correggere i file di log della sessione qui: '{0}'",
-	"logUploadPromptBodyDetails": "Continuando si conferma di aver esaminato e corretto i file di log della sessione e di accettare che Microsoft li usi per eseguire il debug di VS Code.",
-	"logUploadPromptAcceptInstructions": "Per proseguire con l'upload, eseguire il codice con '--upload-logs={0}'",
-	"postError": "Si è verificato un errore durante l'invio dei log: {0}",
-	"responseError": "Si è verificato un errore durante l'invio dei log. È stato ottenuto {0} - {1}",
-	"parseError": "Si è verificato un errore durante l'analisi della risposta",
-	"zipError": "Si è verificato un errore durante la compressione dei log: {0}"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/code/electron-main/main.i18n.json b/i18n/ita/src/vs/code/electron-main/main.i18n.json
deleted file mode 100644
index f2ca8e2c497..00000000000
--- a/i18n/ita/src/vs/code/electron-main/main.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"secondInstanceNoResponse": "Un'altra istanza di {0} è in esecuzione ma non risponde",
-	"secondInstanceNoResponseDetail": "Chiudere tutte le altre istanze e riprovare.",
-	"secondInstanceAdmin": "Una seconda istanza di {0} è già in esecuzione come amministratore.",
-	"secondInstanceAdminDetail": "Chiudere l'altra istanza e riprovare.",
-	"close": "&&Chiudi"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/code/electron-main/menus.i18n.json b/i18n/ita/src/vs/code/electron-main/menus.i18n.json
deleted file mode 100644
index a5f6c5e0343..00000000000
--- a/i18n/ita/src/vs/code/electron-main/menus.i18n.json
+++ /dev/null
@@ -1,193 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"mFile": "&&File",
-	"mEdit": "&&Modifica",
-	"mSelection": "&&Selezione",
-	"mView": "&&Visualizza",
-	"mGoto": "&&Esegui",
-	"mDebug": "&&Debug",
-	"mWindow": "Finestra",
-	"mHelp": "&&Guida",
-	"mTask": "A&&ttività",
-	"miNewWindow": "&&Nuova finestra",
-	"mAbout": "Informazioni su {0}",
-	"mServices": "Servizi",
-	"mHide": "Nascondi {0}",
-	"mHideOthers": "Nascondi altri",
-	"mShowAll": "Mostra tutto",
-	"miQuit": "Chiudi {0}",
-	"miNewFile": "&&Nuovo file",
-	"miOpen": "&&Apri...",
-	"miOpenWorkspace": "Aprire Wor&&kspace...",
-	"miOpenFolder": "Apri &&cartella...",
-	"miOpenFile": "&&Apri file...",
-	"miOpenRecent": "Apri &&recenti",
-	"miSaveWorkspaceAs": "Salva area di lavoro con nome...",
-	"miAddFolderToWorkspace": "A&&ggiungere cartella all'area di lavoro...",
-	"miSave": "&&Salva",
-	"miSaveAs": "Salva con nome...",
-	"miSaveAll": "Salva &&tutto",
-	"miAutoSave": "Salvataggio automatico",
-	"miRevert": "Ripristina file",
-	"miCloseWindow": "Chiudi finestra",
-	"miCloseWorkspace": "Chiudi &&area di lavoro",
-	"miCloseFolder": "Chiudi &&cartella",
-	"miCloseEditor": "Chiudi &&editor",
-	"miExit": "&&Uscita",
-	"miOpenSettings": "&&Impostazioni",
-	"miOpenKeymap": "Tasti di scelta &&rapida",
-	"miOpenKeymapExtensions": "Estensioni &&mappature tastiera",
-	"miOpenSnippets": "&&Frammenti utente",
-	"miSelectColorTheme": "Tema &&colori",
-	"miSelectIconTheme": "Tema &&icona file",
-	"miPreferences": "&&Preferenze",
-	"miReopenClosedEditor": "&&Riapri editor chiuso",
-	"miMore": "&&Altro...",
-	"miClearRecentOpen": "&&Cancella elementi aperti di recente",
-	"miUndo": "Annulla",
-	"miRedo": "Ripristina",
-	"miCut": "Taglia (&&X)",
-	"miCopy": "&&Copia",
-	"miPaste": "Incolla (&&V)",
-	"miFind": "Trova (&&F)",
-	"miReplace": "&&Sostituisci",
-	"miFindInFiles": "Cerca &&nei file",
-	"miReplaceInFiles": "Sostituisci nei &&file",
-	"miEmmetExpandAbbreviation": "Emmet: &&Espandi abbreviazione",
-	"miShowEmmetCommands": "E&&mmet...",
-	"miToggleLineComment": "Attiva/Disattiva commento per &&riga",
-	"miToggleBlockComment": "Attiva/Disattiva commento per &&blocco",
-	"miMultiCursorAlt": "Passare ad ALT+clic per multi-cursore",
-	"miMultiCursorCmd": "Passare a Cmd+clic per multi-cursore",
-	"miMultiCursorCtrl": "Passare a CTRL+clic per multi-cursore",
-	"miInsertCursorAbove": "&&Aggiungi cursore sopra",
-	"miInsertCursorBelow": "A&&ggiungi cursore sotto",
-	"miInsertCursorAtEndOfEachLineSelected": "Aggiungi c&&ursori a fine riga",
-	"miAddSelectionToNextFindMatch": "Aggiungi &&occorrenza successiva",
-	"miAddSelectionToPreviousFindMatch": "Aggiungi occorrenza &&precedente",
-	"miSelectHighlights": "Seleziona &&tutte le occorrenze",
-	"miCopyLinesUp": "&&Copia riga in alto",
-	"miCopyLinesDown": "Co&&pia riga in basso",
-	"miMoveLinesUp": "Sposta riga in &&alto",
-	"miMoveLinesDown": "Sposta riga in &&basso",
-	"miSelectAll": "Seleziona &&tutto",
-	"miSmartSelectGrow": "Espan&&di selezione",
-	"miSmartSelectShrink": "&&Riduci selezione",
-	"miViewExplorer": "&&Esplora risorse",
-	"miViewSearch": "Cerca",
-	"miViewSCM": "S&&CM",
-	"miViewDebug": "&&Debug",
-	"miViewExtensions": "E&&stensioni",
-	"miToggleOutput": "&&Output",
-	"miToggleDebugConsole": "Console di de&&bug",
-	"miToggleIntegratedTerminal": "&&Terminale integrato",
-	"miMarker": "&&Problemi",
-	"miCommandPalette": "&&Riquadro comandi...",
-	"miOpenView": "&&Apri visualizzazione...",
-	"miToggleFullScreen": "Attiva/Disattiva sc&&hermo intero",
-	"miToggleZenMode": "Attiva/Disattiva modalità Zen",
-	"miToggleCenteredLayout": "Attiva/Disattiva layout centrato",
-	"miToggleMenuBar": "Attiva/Disattiva &&barra dei menu",
-	"miSplitEditor": "Dividi &&editor",
-	"miToggleEditorLayout": "Attiva/Disattiva &&layout gruppi dell'editor",
-	"miToggleSidebar": "Attiva/Disattiva &&barra laterale",
-	"miMoveSidebarRight": "Sposta barra laterale a &&destra",
-	"miMoveSidebarLeft": "Sp&&osta barra laterale a sinistra",
-	"miTogglePanel": "Attiva/Disattiva &&pannello",
-	"miHideStatusbar": "&&Nascondi barra di stato",
-	"miShowStatusbar": "&&Mostra barra di stato",
-	"miHideActivityBar": "Nascondi &&barra attività",
-	"miShowActivityBar": "Mostra &&barra attività",
-	"miToggleWordWrap": "Attiva/Disattiva &&ritorno a capo automatico",
-	"miToggleMinimap": "Attiva/Disattiva &&mini mappa",
-	"miToggleRenderWhitespace": "Attiva/Disattiva rendering &&spazi vuoti",
-	"miToggleRenderControlCharacters": "Attiva/Disattiva &&caratteri di controllo",
-	"miZoomIn": "&&Zoom avanti",
-	"miZoomOut": "Zoom indi&&etro",
-	"miZoomReset": "&&Reimposta zoom",
-	"miBack": "&&Indietro",
-	"miForward": "&&Avanti",
-	"miNextEditor": "&&Editor successivo",
-	"miPreviousEditor": "Editor &&precedente",
-	"miNextEditorInGroup": "&&Editor successivo usato nel gruppo",
-	"miPreviousEditorInGroup": "Editor &&precedente usato nel gruppo",
-	"miSwitchEditor": "Cambia &&editor",
-	"miFocusFirstGroup": "&&Primo gruppo",
-	"miFocusSecondGroup": "&&Secondo gruppo",
-	"miFocusThirdGroup": "&&Terzo gruppo",
-	"miNextGroup": "&&Gruppo successivo",
-	"miPreviousGroup": "Gruppo &&precedente",
-	"miSwitchGroup": "Cambia &&gruppo",
-	"miGotoFile": "Vai al &&file...",
-	"miGotoSymbolInFile": "Vai al &&simbolo nel file...",
-	"miGotoSymbolInWorkspace": "Vai al &&simbolo nell'area di lavoro...",
-	"miGotoDefinition": "Vai alla &&definizione",
-	"miGotoTypeDefinition": "Vai alla &&definizione di tipo",
-	"miGotoImplementation": "Vai all'&&implementazione",
-	"miGotoLine": "Vai alla riga...",
-	"miStartDebugging": "&&Avvia debug",
-	"miStartWithoutDebugging": "Avvia &&senza debug",
-	"miStopDebugging": "A&&rresta debug",
-	"miRestart Debugging": "&&Riavvia debug",
-	"miOpenConfigurations": "Apri &&configurazioni",
-	"miAddConfiguration": "Aggiungi configurazione...",
-	"miStepOver": "Ese&&gui istruzione/routine",
-	"miStepInto": "&&Esegui istruzione",
-	"miStepOut": "Esci da &&istruzione/routine",
-	"miContinue": "&&Continua",
-	"miToggleBreakpoint": "Attiva/Disattiva &&punto di interruzione",
-	"miConditionalBreakpoint": "Punto di interruzione &&condizionale...",
-	"miInlineBreakpoint": "P&&unto di interruzione in linea",
-	"miFunctionBreakpoint": "Punto di interruzione &&funzione...",
-	"miLogPoint": "&&Punto di registrazione...",
-	"miNewBreakpoint": "&&Nuovo punto di interruzione",
-	"miEnableAllBreakpoints": "Abilita tutti i punti di interruzione",
-	"miDisableAllBreakpoints": "Disabilita tutti i &&punti di interruzione",
-	"miRemoveAllBreakpoints": "Rimuovi &&tutti i punti di interruzione",
-	"miInstallAdditionalDebuggers": "&&Installa debugger aggiuntivi...",
-	"mMinimize": "Riduci a icona",
-	"mZoom": "Zoom",
-	"mBringToFront": "Porta tutto in primo piano",
-	"miSwitchWindow": "Cambia &&finestra...",
-	"mShowPreviousTab": "Visualizza scheda precedente",
-	"mShowNextTab": "Visualizza scheda successiva",
-	"mMoveTabToNewWindow": "Sposta scheda in una nuova finestra",
-	"mMergeAllWindows": "Unisci tutte le finestre",
-	"miToggleDevTools": "&&Attiva/Disattiva strumenti di sviluppo",
-	"miAccessibilityOptions": "&&Opzioni accessibilità",
-	"miOpenProcessExplorerer": "Apri &&Process Explorer",
-	"miReportIssue": "&&Segnala problema",
-	"miWelcome": "&&Benvenuti",
-	"miInteractivePlayground": "Playground &&interattivo",
-	"miDocumentation": "&&Documentazione",
-	"miReleaseNotes": "&&Note sulla versione",
-	"miKeyboardShortcuts": "&&Riferimento per tasti di scelta rapida",
-	"miIntroductoryVideos": "&&Video introduttivi",
-	"miTipsAndTricks": "&&Suggerimenti e trucchi",
-	"miTwitter": "Seguici su T&&witter",
-	"miUserVoice": "&&Cerca in richieste di funzionalità",
-	"miLicense": "&&Visualizza licenza",
-	"miPrivacyStatement": "&&Informativa sulla privacy",
-	"miAbout": "&&Informazioni su",
-	"miRunTask": "&&Esegui attività...",
-	"miBuildTask": "Esegui attività di &&compilazione...",
-	"miRunningTask": "Mostra attività in esec&&uzione...",
-	"miRestartTask": "Ria&&vvia attività in esecuzione...",
-	"miTerminateTask": "&&Termina attività...",
-	"miConfigureTask": "&&Configura attività...",
-	"miConfigureBuildTask": "Configura atti&&vità di compilazione predefinita...",
-	"accessibilityOptionsWindowTitle": "Opzioni accessibilità",
-	"miCheckForUpdates": "Verifica disponibilità aggiornamenti...",
-	"miCheckingForUpdates": "Verifica della disponibilità di aggiornamenti...",
-	"miDownloadUpdate": "Scarica l'aggiornamento disponibile",
-	"miDownloadingUpdate": "Download dell'aggiornamento...",
-	"miInstallUpdate": "Installa aggiornamento...",
-	"miInstallingUpdate": "Installazione dell'aggiornamento...",
-	"miRestartToUpdate": "Riavvia per aggiornare..."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/code/electron-main/window.i18n.json b/i18n/ita/src/vs/code/electron-main/window.i18n.json
deleted file mode 100644
index 5b97df86881..00000000000
--- a/i18n/ita/src/vs/code/electron-main/window.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hiddenMenuBar": "È comunque possibile accedere alla barra dei menu premendo ALT."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/code/electron-main/windows.i18n.json b/i18n/ita/src/vs/code/electron-main/windows.i18n.json
deleted file mode 100644
index 250ae146295..00000000000
--- a/i18n/ita/src/vs/code/electron-main/windows.i18n.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"ok": "OK",
-	"pathNotExistTitle": "Il percorso non esiste",
-	"pathNotExistDetail": "Il percorso '{0}' sembra non esistere più sul disco.",
-	"reopen": "&& Riaprire",
-	"wait": "&&Continua ad attendere",
-	"close": "&&Chiudi",
-	"appStalled": "La finestra non risponde",
-	"appStalledDetail": "È possibile riaprire la finestra, chiuderla oppure attendere.",
-	"appCrashed": "Si è verificato un arresto anomalo della finestra",
-	"appCrashedDetail": "Ci scusiamo per l'inconveniente. Per riprendere dal punto in cui si è verificata l'interruzione, riaprire la finestra.",
-	"open": "Apri",
-	"openFolder": "Apri cartella",
-	"openFile": "Apri file",
-	"workspaceOpenedMessage": "Non è possibile salvare l'area di lavoro '{0}'",
-	"workspaceOpenedDetail": "L'area di lavoro è già aperta in un'altra finestra. Chiudere tale finestra prima di riprovare.",
-	"openWorkspace": "&&Apri",
-	"openWorkspaceTitle": "Apri area di lavoro",
-	"save": "&&Salva",
-	"doNotSave": "&&Non salvare",
-	"cancel": "Annulla",
-	"saveWorkspaceMessage": "Salvare la configurazione dell'area di lavoro in un file?",
-	"saveWorkspaceDetail": "Salvare l'area di lavoro se si prevede di aprirla di nuovo.",
-	"saveWorkspace": "Salva area di lavoro"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/code/node/cliProcessMain.i18n.json b/i18n/ita/src/vs/code/node/cliProcessMain.i18n.json
deleted file mode 100644
index d2d7924208d..00000000000
--- a/i18n/ita/src/vs/code/node/cliProcessMain.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"notFound": "L'estensione '{0}' non è stata trovata.",
-	"notInstalled": "L'estensione '{0}' non è installata.",
-	"useId": "Assicurarsi di usare l'ID estensione completo, incluso l'editore, ad esempio {0}",
-	"successVsixInstall": "L'estensione '{0}' è stata installata.",
-	"cancelVsixInstall": "Installazione dell'estensione '{0}' annullata.",
-	"alreadyInstalled": "L'estensione '{0}' è già installata.",
-	"foundExtension": "L'estensione '{0}' è stata trovata nel Marketplace.",
-	"installing": "Installazione...",
-	"successInstall": "L'estensione '{0}' versione {1} è stata installata.",
-	"uninstalling": "Disinstallazione di {0}...",
-	"successUninstall": "L'estensione '{0}' è stata disinstallata."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/editor/browser/services/bulkEdit.i18n.json b/i18n/ita/src/vs/editor/browser/services/bulkEdit.i18n.json
deleted file mode 100644
index b13c64b973b..00000000000
--- a/i18n/ita/src/vs/editor/browser/services/bulkEdit.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"summary.0": "Non sono state effettuate modifiche",
-	"summary.nm": "Effettuate {0} modifiche al testo in {1} file",
-	"summary.n0": "Effettuate {0} modifiche al testo in un file",
-	"conflict": "Nel frattempo questi file sono stati modificati: {0}"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/editor/browser/widget/codeEditorWidget.i18n.json b/i18n/ita/src/vs/editor/browser/widget/codeEditorWidget.i18n.json
deleted file mode 100644
index 9f68decbccd..00000000000
--- a/i18n/ita/src/vs/editor/browser/widget/codeEditorWidget.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"cursors.maximum": "Il numero di cursori è stato limitato a {0}."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/editor/browser/widget/diffEditorWidget.i18n.json b/i18n/ita/src/vs/editor/browser/widget/diffEditorWidget.i18n.json
deleted file mode 100644
index 0589042a8b4..00000000000
--- a/i18n/ita/src/vs/editor/browser/widget/diffEditorWidget.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"diff.tooLarge": "Non è possibile confrontare i file perché uno è troppo grande."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/editor/browser/widget/diffReview.i18n.json b/i18n/ita/src/vs/editor/browser/widget/diffReview.i18n.json
deleted file mode 100644
index 61fa5061b58..00000000000
--- a/i18n/ita/src/vs/editor/browser/widget/diffReview.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"label.close": "Chiudi",
-	"no_lines": "nessuna linea",
-	"one_line": "1 linea",
-	"more_lines": "{0} linee",
-	"header": "Differenza {0} di {1}: originale {2}, {3}, modificate {4}, {5}",
-	"blankLine": "vuota",
-	"equalLine": "originali {0}, modificate {1}: {2}",
-	"insertLine": "+ modificate {0}: {1}",
-	"deleteLine": "- originali {0}: {1}",
-	"editor.action.diffReview.next": "Vai alla differenza successiva",
-	"editor.action.diffReview.prev": "Vai alla differenza precedente"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/editor/common/commonCodeEditor.i18n.json b/i18n/ita/src/vs/editor/common/commonCodeEditor.i18n.json
deleted file mode 100644
index 9f68decbccd..00000000000
--- a/i18n/ita/src/vs/editor/common/commonCodeEditor.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"cursors.maximum": "Il numero di cursori è stato limitato a {0}."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/editor/common/config/commonEditorConfig.i18n.json b/i18n/ita/src/vs/editor/common/config/commonEditorConfig.i18n.json
deleted file mode 100644
index f91d8d15e9f..00000000000
--- a/i18n/ita/src/vs/editor/common/config/commonEditorConfig.i18n.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"editorConfigurationTitle": "Editor",
-	"fontFamily": "Controlla la famiglia di caratteri.",
-	"fontWeight": "Controlla lo spessore del carattere.",
-	"fontSize": "Controlla le dimensioni del carattere in pixel.",
-	"lineHeight": "Controlla l'altezza della riga. Usare 0 per calcolare l'altezza della riga dalle dimensioni del carattere.",
-	"letterSpacing": "Controlla la spaziatura tra le lettere in pixel.",
-	"lineNumbers.off": "I numeri di riga non vengono visualizzati.",
-	"lineNumbers.on": "I numeri di riga vengono visualizzati come numeri assoluti.",
-	"lineNumbers.relative": "I numeri di riga vengono visualizzati come distanza in linee alla posizione del cursore.",
-	"lineNumbers.interval": "I numeri di riga vengono visualizzati ogni 10 righe.",
-	"lineNumbers": "Controlla la visualizzazione dei numeri di riga.",
-	"rulers": "Mostra righelli verticali dopo un certo numero di caratteri a spaziatura fissa. Utilizza più valori  per più righelli. Nessun righello viene disegnati se la matrice è vuota",
-	"wordSeparators": "Caratteri che verranno usati come separatori di parola quando si eseguono operazioni o spostamenti correlati a parole",
-	"tabSize": "Il numero di spazi corrispondenti ad un carattere Tab. Questa impostazione viene sottoposta a override in base al contenuto dei file quando 'editor.detectIndentation' è 'on'.",
-	"tabSize.errorMessage": "È previsto 'number'. Nota: il valore \"auto\" è stato sostituito dall'impostazione `editor.detectIndentation`.",
-	"insertSpaces": "Inserire spazi quando si preme Tab. Questa impostazione viene sottoposta a override in base al contenuto dei file quando è 'editor.detectIndentation' è 'on'.",
-	"insertSpaces.errorMessage": "È previsto 'boolean'. Nota: il valore \"auto\" è stato sostituito dall'impostazione `editor.detectIndentation`.",
-	"detectIndentation": "All'apertura di un file, `editor.tabSize` e `editor.insertSpaces` verranno rilevati in base al contenuto del file.",
-	"roundedSelection": "Controlla se gli angoli delle selezioni sono arrotondati",
-	"scrollBeyondLastLine": "Controlla se l'editor scorrerà oltre l'ultima riga",
-	"scrollBeyondLastColumn": "Controlla il numero di caratteri aggiuntivi oltre il quale l'editor scorrerà orizzontalmente",
-	"smoothScrolling": "Controlla se per lo scorrimento dell'editor verrà usata un'animazione.",
-	"minimap.enabled": "Controlla se la mini mappa è visualizzata",
-	"minimap.side": "Definisce il lato in cui eseguire il rendering della mini mappa.",
-	"minimap.showSlider": "Controlla se lo slider della mini mappa viene nascosto automaticamente.",
-	"minimap.renderCharacters": "Esegue il rendering dei caratteri effettivi di una riga (in contrapposizione ai blocchi colore)",
-	"minimap.maxColumn": "Limita la larghezza della mini mappa in modo da eseguire il rendering al massimo di un certo numero di colonne",
-	"find.seedSearchStringFromSelection": "Controlla se inizializzare la stringa di ricerca nel Widget Trova con il testo selezionato nell'editor",
-	"find.autoFindInSelection": "Controlla se l'impostazione Trova nella selezione è attivata quando vengono selezionati più caratteri o righe di testo nell'editor",
-	"find.globalFindClipboard": "Controlla se il widget Trova debba leggere o modificare gli appunti ricerche condivise su macOS",
-	"wordWrap.off": "Il wrapping delle righe non viene eseguito.",
-	"wordWrap.on": "Verrà eseguito il wrapping delle righe in base alla larghezza del viewport.",
-	"wordWrap.wordWrapColumn": "Verrà eseguito il wrapping delle righe alla posizione corrispondente a `editor.wordWrapColumn`.",
-	"wordWrap.bounded": "Verrà eseguito il wrapping delle righe alla posizione minima del viewport e di `editor.wordWrapColumn`.",
-	"wordWrap": "Controlla il wrapping delle righe. Valori possibili:\n - 'off' (disabilita il wrapping),\n - 'on' (wrapping del viewport),\n - 'wordWrapColumn' (esegue il wrapping alla posizione corrispondente a `editor.wordWrapColumn`) o\n - 'bounded' (esegue il wrapping alla posizione minima del viewport e di `editor.wordWrapColumn`).",
-	"wordWrapColumn": "Controlla la colonna di wrapping dell'editor quando il valore di `editor.wordWrap` è 'wordWrapColumn' o 'bounded'.",
-	"wrappingIndent": "Controlla il rientro delle righe con ritorno a capo. Può essere uno dei valori seguenti: 'none', 'same', 'indent' o 'deepIndent'.",
-	"mouseWheelScrollSensitivity": "Moltiplicatore da usare sui valori `deltaX` e `deltaY` degli eventi di scorrimento della rotellina del mouse",
-	"multiCursorModifier.ctrlCmd": "Rappresenta il tasto 'Control' (ctrl) su Windows e Linux e il tasto 'Comando' (cmd) su OSX.",
-	"multiCursorModifier.alt": "Rappresenta il tasto 'Alt' su Windows e Linux e il tasto 'Opzione' su OSX.",
-	"multiCursorModifier": "Il modificatore da utilizzare per aggiungere molteplici cursori con il mouse. 'ctrlCmd' rappresenta il tasto 'Control' su Windows e Linux e  il tasto 'Comando' su OSX. I gesti del mouse Vai a definizione e Apri il Link si adatteranno in modo da non entrare in conflitto con il modificatore multi-cursore.",
-	"multiCursorMergeOverlapping": "Unire i cursori multipli se sovrapposti.",
-	"quickSuggestions.strings": "Abilita i suggerimenti rapidi all'interno di stringhe.",
-	"quickSuggestions.comments": "Abilita i suggerimenti rapidi all'interno di commenti.",
-	"quickSuggestions.other": "Abilita i suggerimenti rapidi all'esterno di stringhe e commenti.",
-	"quickSuggestions": "Controlla se visualizzare automaticamente i suggerimenti durante la digitazione",
-	"quickSuggestionsDelay": "Controlla il ritardo in ms dopo il quale verranno visualizzati i suggerimenti rapidi",
-	"parameterHints": "Abilita un popup che mostra documentazione sui parametri e informazioni sui tipi mentre si digita",
-	"autoClosingBrackets": "Controlla se l'editor deve chiudere automaticamente le parentesi quadre dopo che sono state aperte",
-	"formatOnType": "Controlla se l'editor deve formattare automaticamente la riga dopo la digitazione",
-	"formatOnPaste": "Controlla se l'editor deve formattare automaticamente il contenuto incollato. Deve essere disponibile un formattatore che deve essere in grado di formattare un intervallo in un documento.",
-	"autoIndent": "Controlla se l'editor deve correggere automaticamente l'indentazione mentre l'utente digita, incolla o sposta delle righe. Devono essere disponibili le regole di indentazione del linguaggio.",
-	"suggestOnTriggerCharacters": "Controlla se i suggerimenti devono essere visualizzati automaticamente durante la digitazione dei caratteri trigger",
-	"acceptSuggestionOnEnter": "Controlla se i suggerimenti devono essere accettati con 'INVIO' in aggiunta a 'TAB'. In questo modo è possibile evitare ambiguità tra l'inserimento di nuove righe e l'accettazione di suggerimenti. Il valore 'smart' indica di accettare un suggerimento con 'INVIO' quando comporta una modifica al testo",
-	"acceptSuggestionOnCommitCharacter": "Controlla se accettare i suggerimenti con i caratteri di commit. Ad esempio, in JavaScript il punto e virgola (';') può essere un carattere di commit che accetta un suggerimento e digita tale carattere.",
-	"snippetSuggestions.top": "Visualizza i suggerimenti dello snippet sopra gli altri suggerimenti.",
-	"snippetSuggestions.bottom": "Visualizza i suggerimenti dello snippet sotto gli altri suggerimenti.",
-	"snippetSuggestions.inline": "Visualizza i suggerimenti degli snippet insieme agli altri suggerimenti.",
-	"snippetSuggestions.none": "Non mostrare i suggerimenti sugli snippet.",
-	"snippetSuggestions": "Controlla se i frammenti di codice sono visualizzati con altri suggerimenti e il modo in cui sono ordinati.",
-	"emptySelectionClipboard": "Consente di controllare se, quando si copia senza aver effettuato una selezione, viene copiata la riga corrente.",
-	"wordBasedSuggestions": "Controlla se calcolare i completamenti in base alle parole presenti nel documento.",
-	"suggestSelection.first": "Consente di selezionare sempre il primo suggerimento.",
-	"suggestSelection.recentlyUsed": "Consente di selezionare suggerimenti recenti a meno che continuando a digitare non ne venga selezionato uno, ad esempio `console.| -> console.log` perché `log` è stato completato di recente.",
-	"suggestSelection.recentlyUsedByPrefix": "Consente di selezionare i suggerimenti in base a prefissi precedenti che hanno completato tali suggerimenti, ad esempio `co -> console` e `con -> const`.",
-	"suggestSelection": "Controlla la modalità di preselezione dei suggerimenti durante la visualizzazione degll'elenco dei suggerimenti.",
-	"suggestFontSize": "Dimensioni del carattere per il widget dei suggerimenti",
-	"suggestLineHeight": "Altezza della riga per il widget dei suggerimenti",
-	"selectionHighlight": "Controlla se l'editor deve evidenziare gli elementi corrispondenti simili alla selezione",
-	"occurrencesHighlight": "Controlla se l'editor deve evidenziare le occorrenze di simboli semantici",
-	"overviewRulerLanes": "Controlla il numero di effetti che possono essere visualizzati nella stessa posizione nel righello delle annotazioni",
-	"overviewRulerBorder": "Controlla se deve essere disegnato un bordo intorno al righello delle annotazioni.",
-	"cursorBlinking": "Controllo dello stile di animazione del cursore.",
-	"mouseWheelZoom": "Ingrandisce il carattere dell'editor quando si usa la rotellina del mouse e si tiene premuto CTRL",
-	"cursorStyle": "Controlla lo stile del cursore. I valori accettati sono 'block', 'block-outline', 'line', 'line-thin', 'underline' e 'underline-thin'",
-	"cursorWidth": "Controlla la larghezza del cursore quando editor.cursorSyle è impostato a 'line'",
-	"fontLigatures": "Abilita i caratteri legatura",
-	"hideCursorInOverviewRuler": "Controlla se il cursore deve essere nascosto nel righello delle annotazioni.",
-	"renderWhitespace": "Consente di controllare in che modo l'editor deve eseguire il rendering dei caratteri di spazio vuoto. Le opzioni possibili sono: 'none', 'boundary' e 'all'. Con l'opzione 'boundary' non viene eseguito il rendering di singoli spazi tra le parole.",
-	"renderControlCharacters": "Controlla se l'editor deve eseguire il rendering dei caratteri di controllo",
-	"renderIndentGuides": "Controlla se l'editor deve eseguire il rendering delle guide con rientro",
-	"renderLineHighlight": "Consente di controllare in che modo l'editor deve eseguire il rendering dell'evidenziazione di riga corrente. Le opzioni possibili sono 'none', 'gutter', 'line' e 'all'.",
-	"codeLens": "Controlla se nell'editor è visualizzato CodeLens",
-	"folding": "Controlla se per l'editor è abilitata la riduzione del codice",
-	"foldingStrategyAuto": "Se disponibile, usa una strategia di riduzione specifica del linguaggio, altrimenti esegue il fallback alla strategia di base per i rientri.",
-	"foldingStrategyIndentation": "Usa sempre la strategia di riduzione basata sui rientri",
-	"foldingStrategy": "Controlla in che modo vengono calcolati gli intervalli di riduzione. Con 'auto' viene usata l'eventuale strategia di riduzione specifica disponibile. Con 'indentation' viene usata forzatamente la strategia di riduzione basata sui rientri.",
-	"showFoldingControls": "Controlla se i controlli di riduzione sul margine della barra di scorrimento sono automaticamente nascosti.",
-	"matchBrackets": "Evidenzia le parentesi corrispondenti quando se ne seleziona una.",
-	"glyphMargin": "Controlla se l'editor deve eseguire il rendering del margine verticale del glifo. Il margine del glifo viene usato principalmente per il debug.",
-	"useTabStops": "Inserimento ed eliminazione dello spazio vuoto dopo le tabulazioni",
-	"trimAutoWhitespace": "Rimuovi lo spazio vuoto finale inserito automaticamente",
-	"stablePeek": "Mantiene aperti gli editor rapidi anche quando si fa doppio clic sul contenuto o si preme ESC.",
-	"dragAndDrop": "Controlla se l'editor consentire lo spostamento di selezioni tramite trascinamento della selezione.",
-	"accessibilitySupport.auto": "L'editor utilizzerà API della piattaforma per rilevare quando è collegata un'utilità per la lettura dello schermo.",
-	"accessibilitySupport.on": "L'editor sarà definitivamente ottimizzato per l'utilizzo con un'utilità per la lettura dello schermo.",
-	"accessibilitySupport.off": "L'editor non sarà mai ottimizzato per l'utilizzo con un'utilità per la lettura dello schermo.",
-	"accessibilitySupport": "Controlla se l'editor deve essere eseguito in una modalità ottimizzata per le utilità per la lettura dello schermo.",
-	"links": "Controlla se l'editor deve individuare i collegamenti e renderli cliccabili",
-	"colorDecorators": "Controlla se l'editor deve eseguire il rendering del selettore di colore e degli elementi Decorator di tipo colore inline.",
-	"codeActions": "Abilita il codice azione lightbulb",
-	"codeActionsOnSave.organizeImports": "Eseguire l'organizzazione degli Imports durante il salvataggio?",
-	"codeActionsOnSave": "Tipi di azione codice da eseguire durante il salvataggio.",
-	"codeActionsOnSaveTimeout": "Timeout per le azioni codice eseguite durante il salvataggio.",
-	"selectionClipboard": "Controlla se gli appunti primari di Linux devono essere supportati.",
-	"sideBySide": "Controlla se l'editor diff mostra le differenze affiancate o incorporate",
-	"ignoreTrimWhitespace": "Controlla se l'editor diff mostra come differenze le modifiche relative a spazi vuoti iniziali e finali",
-	"largeFileOptimizations": "Gestione speciale dei file di grandi dimensioni per disabilitare alcune funzionalità che fanno un uso intensivo della memoria.",
-	"renderIndicators": "Consente di controllare se l'editor diff mostra gli indicatori +/- per le modifiche aggiunte/rimosse"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/editor/common/config/defaultConfig.i18n.json b/i18n/ita/src/vs/editor/common/config/defaultConfig.i18n.json
deleted file mode 100644
index 9c443a0f33d..00000000000
--- a/i18n/ita/src/vs/editor/common/config/defaultConfig.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"editorViewAccessibleLabel": "Contenuto editor"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/editor/common/config/editorOptions.i18n.json b/i18n/ita/src/vs/editor/common/config/editorOptions.i18n.json
deleted file mode 100644
index 4e84210449e..00000000000
--- a/i18n/ita/src/vs/editor/common/config/editorOptions.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"accessibilityOffAriaLabel": "L'editor non è accessibile in questo momento. Premere Alt+F1 per le opzioni.",
-	"editorViewAccessibleLabel": "Contenuto editor"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/editor/common/controller/cursor.i18n.json b/i18n/ita/src/vs/editor/common/controller/cursor.i18n.json
deleted file mode 100644
index 80e2b028b7f..00000000000
--- a/i18n/ita/src/vs/editor/common/controller/cursor.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"corrupt.commands": "Eccezione imprevista durante l'esecuzione del comando."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/editor/common/model/textModelWithTokens.i18n.json b/i18n/ita/src/vs/editor/common/model/textModelWithTokens.i18n.json
deleted file mode 100644
index f0c92c9031a..00000000000
--- a/i18n/ita/src/vs/editor/common/model/textModelWithTokens.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"mode.tokenizationSupportFailed": "Si è verificato un errore della modalità durante la suddivisione in token dell'input."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/editor/common/modes/modesRegistry.i18n.json b/i18n/ita/src/vs/editor/common/modes/modesRegistry.i18n.json
deleted file mode 100644
index ac9c8cd40e8..00000000000
--- a/i18n/ita/src/vs/editor/common/modes/modesRegistry.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"plainText.alias": "Testo normale"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/editor/common/services/bulkEdit.i18n.json b/i18n/ita/src/vs/editor/common/services/bulkEdit.i18n.json
deleted file mode 100644
index 10ea73bb963..00000000000
--- a/i18n/ita/src/vs/editor/common/services/bulkEdit.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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": "Nel frattempo questi file sono stati modificati: {0}",
-	"summary.0": "Non sono state effettuate modifiche",
-	"summary.nm": "Effettuate {0} modifiche al testo in {1} file",
-	"summary.n0": "Effettuate {0} modifiche al testo in un file"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/editor/common/services/modeServiceImpl.i18n.json b/i18n/ita/src/vs/editor/common/services/modeServiceImpl.i18n.json
deleted file mode 100644
index 8ad3c063657..00000000000
--- a/i18n/ita/src/vs/editor/common/services/modeServiceImpl.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"vscode.extension.contributes.languages": "Dichiarazioni del linguaggio per contributes.",
-	"vscode.extension.contributes.languages.id": "ID del linguaggio.",
-	"vscode.extension.contributes.languages.aliases": "Alias di nome per il linguaggio.",
-	"vscode.extension.contributes.languages.extensions": "Estensioni di file associate al linguaggio.",
-	"vscode.extension.contributes.languages.filenames": "Nomi file associati al linguaggio.",
-	"vscode.extension.contributes.languages.filenamePatterns": "Criteri GLOB dei nomi file associati al linguaggio.",
-	"vscode.extension.contributes.languages.mimetypes": "Tipi MIME associati al linguaggio.",
-	"vscode.extension.contributes.languages.firstLine": "Espressione regolare corrispondente alla prima riga di un file del linguaggio.",
-	"vscode.extension.contributes.languages.configuration": "Percorso relativo di un file che contiene le opzioni di configurazione per il linguaggio."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/editor/common/services/modelServiceImpl.i18n.json b/i18n/ita/src/vs/editor/common/services/modelServiceImpl.i18n.json
deleted file mode 100644
index e12a9398484..00000000000
--- a/i18n/ita/src/vs/editor/common/services/modelServiceImpl.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"diagAndSourceMultiline": "[{0}]\n{1}",
-	"diagAndSource": "[{0}] {1}"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/editor/common/view/editorColorRegistry.i18n.json b/i18n/ita/src/vs/editor/common/view/editorColorRegistry.i18n.json
deleted file mode 100644
index 047668b002c..00000000000
--- a/i18n/ita/src/vs/editor/common/view/editorColorRegistry.i18n.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"lineHighlight": "Colore di sfondo per l'evidenziazione della riga alla posizione del cursore.",
-	"lineHighlightBorderBox": "Colore di sfondo per il bordo intorno alla riga alla posizione del cursore.",
-	"rangeHighlight": "Colore di sfondo degli intervalli evidenziati, ad esempio dalle funzionalità Quick Open e Trova. il colore non deve essere opaco per evitare di nascondere le decorazioni sottostanti.",
-	"rangeHighlightBorder": "Colore di sfondo del bordo intorno agli intervalli selezionati.",
-	"caret": "Colore del cursore dell'editor.",
-	"editorCursorBackground": "Colore di sfondo del cursore editor. Permette di personalizzare il colore di un carattere quando sovrapposto da un blocco cursore.",
-	"editorWhitespaces": "Colore dei caratteri di spazio vuoto nell'editor.",
-	"editorIndentGuides": "Colore delle guide per i rientri dell'editor.",
-	"editorActiveIndentGuide": "Colore delle guide di indentazione dell'editor attivo",
-	"editorLineNumbers": "Colore dei numeri di riga dell'editor.",
-	"editorActiveLineNumber": "Colore dei numeri per la riga attiva dell'editor",
-	"deprecatedEditorActiveLineNumber": "Id è deprecato. In alternativa utilizzare 'editorLineNumber.activeForeground'.",
-	"editorRuler": "Colore dei righelli dell'editor.",
-	"editorCodeLensForeground": "Colore primo piano delle finestre di CodeLens dell'editor",
-	"editorBracketMatchBackground": "Colore di sfondo delle parentesi corrispondenti",
-	"editorBracketMatchBorder": "Colore delle caselle di parentesi corrispondenti",
-	"editorOverviewRulerBorder": "Colore del bordo del righello delle annotazioni.",
-	"editorGutter": "Colore di sfondo della barra di navigazione dell'editor. La barra contiene i margini di glifo e i numeri di riga.",
-	"errorForeground": "Colore primo piano degli squiggle di errore nell'editor.",
-	"errorBorder": "Colore del bordo degli squiggle di errore nell'editor.",
-	"warningForeground": "Colore primo piano degli squiggle di avviso nell'editor",
-	"warningBorder": "Colore del bordo degli squggle di avviso nell'editor.",
-	"infoForeground": "Colore primo piano degli squiggle di informazione nell'editor",
-	"infoBorder": "Colore del bordo degli squiggle di informazione nell'editor",
-	"hintForeground": "Colore primo piano degli squiggle di suggerimento nell'editor.",
-	"hintBorder": "Colore del bordo degli squiggle di suggerimento nell'editor.",
-	"unnecessaryForeground": "Colore primo piano del codice non necessario nell'editor.",
-	"overviewRulerRangeHighlight": "Colore del marcatore righello panoramica per evidenziazione intervalli. Il colore non deve essere opaco per non nascondere decorazioni sottostanti.",
-	"overviewRuleError": "Colore del marcatore del righello delle annotazioni per gli errori.",
-	"overviewRuleWarning": "Colore del marcatore del righello delle annotazioni per gli avvisi.",
-	"overviewRuleInfo": "Colore del marcatore del righello delle annotazioni per i messaggi di tipo informativo."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/editor/contrib/accessibility/browser/accessibility.i18n.json b/i18n/ita/src/vs/editor/contrib/accessibility/browser/accessibility.i18n.json
deleted file mode 100644
index 63e6e2a5f11..00000000000
--- a/i18n/ita/src/vs/editor/contrib/accessibility/browser/accessibility.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"introMsg": "Grazie per aver provato le opzioni di accessibilità di Visual Studio Code.",
-	"status": "Stato:",
-	"tabFocusModeOnMsg": "Premere TAB nell'editor corrente per spostare lo stato attivo sull'elemento con stato attivabile successivo. Per attivare/disattivare questo comportamento, premere {0}.",
-	"tabFocusModeOnMsgNoKb": "Premere TAB nell'editor corrente per spostare lo stato attivo sull'elemento con stato attivabile successivo. Il comando {0} non può essere attualmente attivato con un tasto di scelta rapida.",
-	"tabFocusModeOffMsg": "Premere TAB nell'editor corrente per inserire il carattere di tabulazione. Per attivare/disattivare questo comportamento, premere {0}.",
-	"tabFocusModeOffMsgNoKb": "Premere TAB nell'editor corrente per inserire il carattere di tabulazione. Il comando {0} non può essere attualmente attivato con un tasto di scelta rapida.",
-	"outroMsg": "Per chiudere questa descrizione comando e tornare all'editor, premere ESC.",
-	"ShowAccessibilityHelpAction": "Visualizza la Guida sull'accessibilità"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/editor/contrib/bracketMatching/bracketMatching.i18n.json b/i18n/ita/src/vs/editor/contrib/bracketMatching/bracketMatching.i18n.json
deleted file mode 100644
index 850895f114f..00000000000
--- a/i18n/ita/src/vs/editor/contrib/bracketMatching/bracketMatching.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"overviewRulerBracketMatchForeground": "Colore del marcatore del righello delle annotazioni per la corrispondenza delle parentesi.",
-	"smartSelect.jumpBracket": "Vai alla parentesi",
-	"smartSelect.selectToBracket": "Seleziona fino alla parentesi"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/editor/contrib/bracketMatching/common/bracketMatching.i18n.json b/i18n/ita/src/vs/editor/contrib/bracketMatching/common/bracketMatching.i18n.json
deleted file mode 100644
index 2e610be7bab..00000000000
--- a/i18n/ita/src/vs/editor/contrib/bracketMatching/common/bracketMatching.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"smartSelect.jumpBracket": "Vai alla parentesi"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/editor/contrib/caretOperations/caretOperations.i18n.json b/i18n/ita/src/vs/editor/contrib/caretOperations/caretOperations.i18n.json
deleted file mode 100644
index 5bd0064f324..00000000000
--- a/i18n/ita/src/vs/editor/contrib/caretOperations/caretOperations.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"caret.moveLeft": "Sposta il punto di inserimento a sinistra",
-	"caret.moveRight": "Sposta il punto di inserimento a destra"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/editor/contrib/caretOperations/common/caretOperations.i18n.json b/i18n/ita/src/vs/editor/contrib/caretOperations/common/caretOperations.i18n.json
deleted file mode 100644
index 6b90ea0ccd2..00000000000
--- a/i18n/ita/src/vs/editor/contrib/caretOperations/common/caretOperations.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"caret.moveLeft": "Sposta il punto di inserimento a sinistra",
-	"caret.moveRight": "Sposta il punto di inserimento a destra"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/editor/contrib/caretOperations/common/transpose.i18n.json b/i18n/ita/src/vs/editor/contrib/caretOperations/common/transpose.i18n.json
deleted file mode 100644
index 7e7a9ec3525..00000000000
--- a/i18n/ita/src/vs/editor/contrib/caretOperations/common/transpose.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"transposeLetters.label": "Trasponi lettere"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/editor/contrib/caretOperations/transpose.i18n.json b/i18n/ita/src/vs/editor/contrib/caretOperations/transpose.i18n.json
deleted file mode 100644
index 253ccabbd68..00000000000
--- a/i18n/ita/src/vs/editor/contrib/caretOperations/transpose.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"transposeLetters.label": "Trasponi lettere"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/editor/contrib/clipboard/browser/clipboard.i18n.json b/i18n/ita/src/vs/editor/contrib/clipboard/browser/clipboard.i18n.json
deleted file mode 100644
index b99c88a4ae1..00000000000
--- a/i18n/ita/src/vs/editor/contrib/clipboard/browser/clipboard.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"actions.clipboard.cutLabel": "Taglia",
-	"actions.clipboard.copyLabel": "Copia",
-	"actions.clipboard.pasteLabel": "Incolla",
-	"actions.clipboard.copyWithSyntaxHighlightingLabel": "Copia con evidenziazione sintassi"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/editor/contrib/clipboard/clipboard.i18n.json b/i18n/ita/src/vs/editor/contrib/clipboard/clipboard.i18n.json
deleted file mode 100644
index d97e94a0cd9..00000000000
--- a/i18n/ita/src/vs/editor/contrib/clipboard/clipboard.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"actions.clipboard.cutLabel": "Taglia",
-	"actions.clipboard.copyLabel": "Copia",
-	"actions.clipboard.pasteLabel": "Incolla",
-	"actions.clipboard.copyWithSyntaxHighlightingLabel": "Copia con evidenziazione sintassi"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/editor/contrib/codeAction/codeActionCommands.i18n.json b/i18n/ita/src/vs/editor/contrib/codeAction/codeActionCommands.i18n.json
deleted file mode 100644
index b1dfa12d604..00000000000
--- a/i18n/ita/src/vs/editor/contrib/codeAction/codeActionCommands.i18n.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"quickFixWithKb": "Mostra correzioni ({0})",
-	"quickFix": "Mostra correzioni",
-	"quickfix.trigger.label": "Correzione rapida...",
-	"editor.action.quickFix.noneMessage": "Azioni codice non disponibili",
-	"refactor.label": "Effettua refactoring...",
-	"editor.action.refactor.noneMessage": "Refactoring non disponibili",
-	"source.label": "Azione origine...",
-	"editor.action.source.noneMessage": "Azioni origine non disponibili",
-	"organizeImports.label": "Organizza gli Imports",
-	"editor.action.organize.noneMessage": "Azioni di organizzazione Imports non disponibili"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/editor/contrib/comment/comment.i18n.json b/i18n/ita/src/vs/editor/contrib/comment/comment.i18n.json
deleted file mode 100644
index f7a6bf7370e..00000000000
--- a/i18n/ita/src/vs/editor/contrib/comment/comment.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"comment.line": "Attiva/Disattiva commento per la riga",
-	"comment.line.add": "Aggiungi commento per la riga",
-	"comment.line.remove": "Rimuovi commento per la riga",
-	"comment.block": "Attiva/Disattiva commento per il blocco"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/editor/contrib/comment/common/comment.i18n.json b/i18n/ita/src/vs/editor/contrib/comment/common/comment.i18n.json
deleted file mode 100644
index 846cfb50443..00000000000
--- a/i18n/ita/src/vs/editor/contrib/comment/common/comment.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"comment.line": "Attiva/Disattiva commento per la riga",
-	"comment.line.add": "Aggiungi commento per la riga",
-	"comment.line.remove": "Rimuovi commento per la riga",
-	"comment.block": "Attiva/Disattiva commento per il blocco"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/editor/contrib/contextmenu/browser/contextmenu.i18n.json b/i18n/ita/src/vs/editor/contrib/contextmenu/browser/contextmenu.i18n.json
deleted file mode 100644
index fc0acd1195a..00000000000
--- a/i18n/ita/src/vs/editor/contrib/contextmenu/browser/contextmenu.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"action.showContextMenu.label": "Mostra il menu di scelta rapida editor"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/editor/contrib/contextmenu/contextmenu.i18n.json b/i18n/ita/src/vs/editor/contrib/contextmenu/contextmenu.i18n.json
deleted file mode 100644
index fe7033eb392..00000000000
--- a/i18n/ita/src/vs/editor/contrib/contextmenu/contextmenu.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"action.showContextMenu.label": "Mostra il menu di scelta rapida editor"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/editor/contrib/find/browser/findWidget.i18n.json b/i18n/ita/src/vs/editor/contrib/find/browser/findWidget.i18n.json
deleted file mode 100644
index f8b42e27976..00000000000
--- a/i18n/ita/src/vs/editor/contrib/find/browser/findWidget.i18n.json
+++ /dev/null
@@ -1,21 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"label.find": "Trova",
-	"placeholder.find": "Trova",
-	"label.previousMatchButton": "Risultato precedente",
-	"label.nextMatchButton": "Risultato successivo",
-	"label.toggleSelectionFind": "Trova nella selezione",
-	"label.closeButton": "Chiudi",
-	"label.replace": "Sostituisci",
-	"placeholder.replace": "Sostituisci",
-	"label.replaceButton": "Sostituisci",
-	"label.replaceAllButton": "Sostituisci tutto",
-	"label.toggleReplaceButton": "Attiva/Disattiva modalità sostituzione",
-	"title.matchesCountLimit": "Solo i primi {0} risultati vengono evidenziati, ma tutte le operazioni di ricerca funzionano su tutto il testo.",
-	"label.matchesLocation": "{0} di {1}",
-	"label.noResults": "Nessun risultato"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/editor/contrib/find/browser/simpleFindWidget.i18n.json b/i18n/ita/src/vs/editor/contrib/find/browser/simpleFindWidget.i18n.json
deleted file mode 100644
index a930fde7ffb..00000000000
--- a/i18n/ita/src/vs/editor/contrib/find/browser/simpleFindWidget.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"label.find": "Trova",
-	"placeholder.find": "Trova",
-	"label.previousMatchButton": "Risultato precedente",
-	"label.nextMatchButton": "Risultato successivo",
-	"label.closeButton": "Chiudi"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/editor/contrib/find/common/findController.i18n.json b/i18n/ita/src/vs/editor/contrib/find/common/findController.i18n.json
deleted file mode 100644
index 753c08a072a..00000000000
--- a/i18n/ita/src/vs/editor/contrib/find/common/findController.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"startFindAction": "Trova",
-	"findNextMatchAction": "Trova successivo",
-	"findPreviousMatchAction": "Trova precedente",
-	"nextSelectionMatchFindAction": "Trova selezione successiva",
-	"previousSelectionMatchFindAction": "Trova selezione precedente",
-	"startReplace": "Sostituisci",
-	"showNextFindTermAction": "Mostra il termine di ricerca successivo",
-	"showPreviousFindTermAction": "Mostra il termine di ricerca precedente"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/editor/contrib/find/findController.i18n.json b/i18n/ita/src/vs/editor/contrib/find/findController.i18n.json
deleted file mode 100644
index 5c4cb025bfc..00000000000
--- a/i18n/ita/src/vs/editor/contrib/find/findController.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"startFindAction": "Trova",
-	"startFindWithSelectionAction": "Trova nella selezione",
-	"findNextMatchAction": "Trova successivo",
-	"findPreviousMatchAction": "Trova precedente",
-	"nextSelectionMatchFindAction": "Trova selezione successiva",
-	"previousSelectionMatchFindAction": "Trova selezione precedente",
-	"startReplace": "Sostituisci",
-	"showNextFindTermAction": "Mostra il termine di ricerca successivo",
-	"showPreviousFindTermAction": "Mostra il termine di ricerca precedente"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/editor/contrib/find/findWidget.i18n.json b/i18n/ita/src/vs/editor/contrib/find/findWidget.i18n.json
deleted file mode 100644
index eead03b4389..00000000000
--- a/i18n/ita/src/vs/editor/contrib/find/findWidget.i18n.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"label.find": "Trova",
-	"placeholder.find": "Trova",
-	"label.previousMatchButton": "Risultato precedente",
-	"label.nextMatchButton": "Risultato successivo",
-	"label.toggleSelectionFind": "Trova nella selezione",
-	"label.closeButton": "Chiudi",
-	"label.replace": "Sostituisci",
-	"placeholder.replace": "Sostituisci",
-	"label.replaceButton": "Sostituisci",
-	"label.replaceAllButton": "Sostituisci tutto",
-	"label.toggleReplaceButton": "Attiva/Disattiva modalità sostituzione",
-	"title.matchesCountLimit": "Solo i primi {0} risultati vengono evidenziati, ma tutte le operazioni di ricerca funzionano su tutto il testo.",
-	"label.matchesLocation": "{0} di {1}",
-	"label.noResults": "Nessun risultato"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/editor/contrib/find/simpleFindWidget.i18n.json b/i18n/ita/src/vs/editor/contrib/find/simpleFindWidget.i18n.json
deleted file mode 100644
index 139f9c288b6..00000000000
--- a/i18n/ita/src/vs/editor/contrib/find/simpleFindWidget.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"label.find": "Trova",
-	"placeholder.find": "Trova",
-	"label.previousMatchButton": "Risultato precedente",
-	"label.nextMatchButton": "Risultato successivo",
-	"label.closeButton": "Chiudi"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/editor/contrib/folding/browser/folding.i18n.json b/i18n/ita/src/vs/editor/contrib/folding/browser/folding.i18n.json
deleted file mode 100644
index cebd48ad3bd..00000000000
--- a/i18n/ita/src/vs/editor/contrib/folding/browser/folding.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"unfoldAction.label": "Espandi",
-	"unFoldRecursivelyAction.label": "Espandi in modo ricorsivo",
-	"foldAction.label": "Riduci",
-	"foldRecursivelyAction.label": "Riduci in modo ricorsivo",
-	"foldAllAction.label": "Riduci tutto",
-	"unfoldAllAction.label": "Espandi tutto",
-	"foldLevelAction.label": "Livello riduzione {0}"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/editor/contrib/folding/folding.i18n.json b/i18n/ita/src/vs/editor/contrib/folding/folding.i18n.json
deleted file mode 100644
index 1c2fdee7f80..00000000000
--- a/i18n/ita/src/vs/editor/contrib/folding/folding.i18n.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"unfoldAction.label": "Espandi",
-	"unFoldRecursivelyAction.label": "Espandi in modo ricorsivo",
-	"foldAction.label": "Riduci",
-	"foldRecursivelyAction.label": "Riduci in modo ricorsivo",
-	"foldAllBlockComments.label": "Riduci tutti i blocchi commento",
-	"foldAllMarkerRegions.label": "Riduci tutte le regioni",
-	"unfoldAllMarkerRegions.label": "Espandi tutte le regioni",
-	"foldAllAction.label": "Riduci tutto",
-	"unfoldAllAction.label": "Espandi tutto",
-	"foldLevelAction.label": "Livello riduzione {0}"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/editor/contrib/fontZoom/fontZoom.i18n.json b/i18n/ita/src/vs/editor/contrib/fontZoom/fontZoom.i18n.json
deleted file mode 100644
index 6e44bb06f01..00000000000
--- a/i18n/ita/src/vs/editor/contrib/fontZoom/fontZoom.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"EditorFontZoomIn.label": "Zoom In del Font Editor",
-	"EditorFontZoomOut.label": "Zoom Reset del Font Editor",
-	"EditorFontZoomReset.label": "Reset dello Zoom del Font Editor"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/editor/contrib/format/browser/formatActions.i18n.json b/i18n/ita/src/vs/editor/contrib/format/browser/formatActions.i18n.json
deleted file mode 100644
index 1232d4a3bb3..00000000000
--- a/i18n/ita/src/vs/editor/contrib/format/browser/formatActions.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"hint11": "È stata apportata 1 modifica di formattazione a riga {0}",
-	"hintn1": "Sono state apportate {0} modifiche di formattazione a riga {1}",
-	"hint1n": "È stata apportata 1 modifica di formattazione tra le righe {0} e {1}",
-	"hintnn": "Sono state apportate {0} modifiche di formattazione tra le righe {1} e {2}",
-	"no.provider": "Ci dispiace, ma non c'è alcun formattatore per i file '{0}' installati.",
-	"formatDocument.label": "Formatta documento",
-	"formatSelection.label": "Formatta selezione"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/editor/contrib/format/formatActions.i18n.json b/i18n/ita/src/vs/editor/contrib/format/formatActions.i18n.json
deleted file mode 100644
index 85c09bb79a4..00000000000
--- a/i18n/ita/src/vs/editor/contrib/format/formatActions.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hint11": "È stata apportata 1 modifica di formattazione a riga {0}",
-	"hintn1": "Sono state apportate {0} modifiche di formattazione a riga {1}",
-	"hint1n": "È stata apportata 1 modifica di formattazione tra le righe {0} e {1}",
-	"hintnn": "Sono state apportate {0} modifiche di formattazione tra le righe {1} e {2}",
-	"no.provider": "Non c'è alcun formattatore installato per i file '{0}'.",
-	"formatDocument.label": "Formatta documento",
-	"no.documentprovider": "Non è installato alcun formattatore di documenti per i file '{0}'.",
-	"formatSelection.label": "Formatta selezione",
-	"no.selectionprovider": "Non è installato alcun formattatore di selezione per i file '{0}'."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.i18n.json b/i18n/ita/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.i18n.json
deleted file mode 100644
index 13ee2830e0b..00000000000
--- a/i18n/ita/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.i18n.json
+++ /dev/null
@@ -1,24 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"noResultWord": "Non è stata trovata alcuna definizione per '{0}'",
-	"generic.noResults": "Non è stata trovata alcuna definizione",
-	"meta.title": " - Definizioni di {0}",
-	"actions.goToDecl.label": "Vai alla definizione",
-	"actions.goToDeclToSide.label": "Apri definizione lateralmente",
-	"actions.previewDecl.label": "Visualizza la definizione",
-	"goToImplementation.noResultWord": "Non sono state trovate implementazioni per '{0}'",
-	"goToImplementation.generic.noResults": "Non sono state trovate implementazioni",
-	"meta.implementations.title": "- {0} implementazioni",
-	"actions.goToImplementation.label": "Vai all'implementazione",
-	"actions.peekImplementation.label": "Anteprima implementazione",
-	"goToTypeDefinition.noResultWord": "Non sono state trovate definizioni di tipi per '{0}'",
-	"goToTypeDefinition.generic.noResults": "Non sono state trovate definizioni di tipi",
-	"meta.typeDefinitions.title": " - {0} definizioni di tipo",
-	"actions.goToTypeDefinition.label": "Vai alla definizione di tipo",
-	"actions.peekTypeDefinition.label": "Anteprima definizione di tipo",
-	"multipleResults": "Fare clic per visualizzare {0} definizioni."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/editor/contrib/goToDeclaration/browser/goToDeclarationCommands.i18n.json b/i18n/ita/src/vs/editor/contrib/goToDeclaration/browser/goToDeclarationCommands.i18n.json
deleted file mode 100644
index 9df481ec1b5..00000000000
--- a/i18n/ita/src/vs/editor/contrib/goToDeclaration/browser/goToDeclarationCommands.i18n.json
+++ /dev/null
@@ -1,23 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"noResultWord": "Non è stata trovata alcuna definizione per '{0}'",
-	"generic.noResults": "Non è stata trovata alcuna definizione",
-	"meta.title": " - Definizioni di {0}",
-	"actions.goToDecl.label": "Vai alla definizione",
-	"actions.goToDeclToSide.label": "Apri definizione lateralmente",
-	"actions.previewDecl.label": "Visualizza la definizione",
-	"goToImplementation.noResultWord": "Non sono state trovate implementazioni per '{0}'",
-	"goToImplementation.generic.noResults": "Non sono state trovate implementazioni",
-	"meta.implementations.title": "- {0} implementazioni",
-	"actions.goToImplementation.label": "Vai all'implementazione",
-	"actions.peekImplementation.label": "Anteprima implementazione",
-	"goToTypeDefinition.noResultWord": "Non sono state trovate definizioni di tipi per '{0}'",
-	"goToTypeDefinition.generic.noResults": "Non sono state trovate definizioni di tipi",
-	"meta.typeDefinitions.title": " - {0} definizioni di tipo",
-	"actions.goToTypeDefinition.label": "Vai alla definizione di tipo",
-	"actions.peekTypeDefinition.label": "Anteprima definizione di tipo"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/editor/contrib/goToDeclaration/browser/goToDeclarationMouse.i18n.json b/i18n/ita/src/vs/editor/contrib/goToDeclaration/browser/goToDeclarationMouse.i18n.json
deleted file mode 100644
index fa526a1f9e6..00000000000
--- a/i18n/ita/src/vs/editor/contrib/goToDeclaration/browser/goToDeclarationMouse.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"multipleResults": "Fare clic per visualizzare {0} definizioni."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/editor/contrib/goToDeclaration/goToDeclarationCommands.i18n.json b/i18n/ita/src/vs/editor/contrib/goToDeclaration/goToDeclarationCommands.i18n.json
deleted file mode 100644
index bf65f23a920..00000000000
--- a/i18n/ita/src/vs/editor/contrib/goToDeclaration/goToDeclarationCommands.i18n.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noResultWord": "Non è stata trovata alcuna definizione per '{0}'",
-	"generic.noResults": "Non è stata trovata alcuna definizione",
-	"meta.title": " - Definizioni di {0}",
-	"actions.goToDecl.label": "Vai alla definizione",
-	"actions.goToDeclToSide.label": "Apri definizione lateralmente",
-	"actions.previewDecl.label": "Visualizza la definizione",
-	"goToImplementation.noResultWord": "Non sono state trovate implementazioni per '{0}'",
-	"goToImplementation.generic.noResults": "Non sono state trovate implementazioni",
-	"meta.implementations.title": "- {0} implementazioni",
-	"actions.goToImplementation.label": "Vai all'implementazione",
-	"actions.peekImplementation.label": "Anteprima implementazione",
-	"goToTypeDefinition.noResultWord": "Non sono state trovate definizioni di tipi per '{0}'",
-	"goToTypeDefinition.generic.noResults": "Non sono state trovate definizioni di tipi",
-	"meta.typeDefinitions.title": " - {0} definizioni di tipo",
-	"actions.goToTypeDefinition.label": "Vai alla definizione di tipo",
-	"actions.peekTypeDefinition.label": "Anteprima definizione di tipo"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/editor/contrib/goToDeclaration/goToDeclarationMouse.i18n.json b/i18n/ita/src/vs/editor/contrib/goToDeclaration/goToDeclarationMouse.i18n.json
deleted file mode 100644
index 3136bef3f3f..00000000000
--- a/i18n/ita/src/vs/editor/contrib/goToDeclaration/goToDeclarationMouse.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"multipleResults": "Fare clic per visualizzare {0} definizioni."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/editor/contrib/goToDefinition/goToDefinitionCommands.i18n.json b/i18n/ita/src/vs/editor/contrib/goToDefinition/goToDefinitionCommands.i18n.json
deleted file mode 100644
index bf65f23a920..00000000000
--- a/i18n/ita/src/vs/editor/contrib/goToDefinition/goToDefinitionCommands.i18n.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noResultWord": "Non è stata trovata alcuna definizione per '{0}'",
-	"generic.noResults": "Non è stata trovata alcuna definizione",
-	"meta.title": " - Definizioni di {0}",
-	"actions.goToDecl.label": "Vai alla definizione",
-	"actions.goToDeclToSide.label": "Apri definizione lateralmente",
-	"actions.previewDecl.label": "Visualizza la definizione",
-	"goToImplementation.noResultWord": "Non sono state trovate implementazioni per '{0}'",
-	"goToImplementation.generic.noResults": "Non sono state trovate implementazioni",
-	"meta.implementations.title": "- {0} implementazioni",
-	"actions.goToImplementation.label": "Vai all'implementazione",
-	"actions.peekImplementation.label": "Anteprima implementazione",
-	"goToTypeDefinition.noResultWord": "Non sono state trovate definizioni di tipi per '{0}'",
-	"goToTypeDefinition.generic.noResults": "Non sono state trovate definizioni di tipi",
-	"meta.typeDefinitions.title": " - {0} definizioni di tipo",
-	"actions.goToTypeDefinition.label": "Vai alla definizione di tipo",
-	"actions.peekTypeDefinition.label": "Anteprima definizione di tipo"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/editor/contrib/goToDefinition/goToDefinitionMouse.i18n.json b/i18n/ita/src/vs/editor/contrib/goToDefinition/goToDefinitionMouse.i18n.json
deleted file mode 100644
index 3136bef3f3f..00000000000
--- a/i18n/ita/src/vs/editor/contrib/goToDefinition/goToDefinitionMouse.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"multipleResults": "Fare clic per visualizzare {0} definizioni."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/editor/contrib/gotoError/browser/gotoError.i18n.json b/i18n/ita/src/vs/editor/contrib/gotoError/browser/gotoError.i18n.json
deleted file mode 100644
index 2d24c4f96ea..00000000000
--- a/i18n/ita/src/vs/editor/contrib/gotoError/browser/gotoError.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"title.wo_source": "({0}/{1})",
-	"markerAction.next.label": "Vai a errore o avviso successivo",
-	"markerAction.previous.label": "Vai a errore o avviso precedente",
-	"editorMarkerNavigationError": "Colore per gli errori del widget di spostamento tra marcatori dell'editor.",
-	"editorMarkerNavigationWarning": "Colore per gli avvisi del widget di spostamento tra marcatori dell'editor.",
-	"editorMarkerNavigationInfo": "Colore delle informazioni del widget di navigazione marcatori dell'editor.",
-	"editorMarkerNavigationBackground": "Sfondo del widget di spostamento tra marcatori dell'editor."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/editor/contrib/gotoError/gotoError.i18n.json b/i18n/ita/src/vs/editor/contrib/gotoError/gotoError.i18n.json
deleted file mode 100644
index 48940378750..00000000000
--- a/i18n/ita/src/vs/editor/contrib/gotoError/gotoError.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"markerAction.next.label": "Vai al problema successivo (Errore, Avviso, Informazioni)",
-	"markerAction.previous.label": "Vai al problema precedente (Errore, Avviso, Info)",
-	"markerAction.nextInFiles.label": "Vai al Problema Successivo nei File (Error, Warning, Info)",
-	"markerAction.previousInFiles.label": "Vai al Problema Precedente nei File (Error, Warning, Info) "
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json b/i18n/ita/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json
deleted file mode 100644
index a69e81d71e3..00000000000
--- a/i18n/ita/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"title.wo_source": "({0}/{1})",
-	"editorMarkerNavigationError": "Colore per gli errori del widget di spostamento tra marcatori dell'editor.",
-	"editorMarkerNavigationWarning": "Colore per gli avvisi del widget di spostamento tra marcatori dell'editor.",
-	"editorMarkerNavigationInfo": "Colore delle informazioni del widget di navigazione marcatori dell'editor.",
-	"editorMarkerNavigationBackground": "Sfondo del widget di spostamento tra marcatori dell'editor."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/editor/contrib/hover/browser/hover.i18n.json b/i18n/ita/src/vs/editor/contrib/hover/browser/hover.i18n.json
deleted file mode 100644
index 385b42e5290..00000000000
--- a/i18n/ita/src/vs/editor/contrib/hover/browser/hover.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"showHover": "Visualizza passaggio del mouse"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/editor/contrib/hover/browser/modesContentHover.i18n.json b/i18n/ita/src/vs/editor/contrib/hover/browser/modesContentHover.i18n.json
deleted file mode 100644
index 607247a8c49..00000000000
--- a/i18n/ita/src/vs/editor/contrib/hover/browser/modesContentHover.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"modesContentHover.loading": "Caricamento..."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/editor/contrib/hover/hover.i18n.json b/i18n/ita/src/vs/editor/contrib/hover/hover.i18n.json
deleted file mode 100644
index f30212f7771..00000000000
--- a/i18n/ita/src/vs/editor/contrib/hover/hover.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"showHover": "Visualizza passaggio del mouse"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/editor/contrib/hover/modesContentHover.i18n.json b/i18n/ita/src/vs/editor/contrib/hover/modesContentHover.i18n.json
deleted file mode 100644
index 247f9e87f7e..00000000000
--- a/i18n/ita/src/vs/editor/contrib/hover/modesContentHover.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"modesContentHover.loading": "Caricamento..."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/editor/contrib/inPlaceReplace/common/inPlaceReplace.i18n.json b/i18n/ita/src/vs/editor/contrib/inPlaceReplace/common/inPlaceReplace.i18n.json
deleted file mode 100644
index ce39cfca313..00000000000
--- a/i18n/ita/src/vs/editor/contrib/inPlaceReplace/common/inPlaceReplace.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"InPlaceReplaceAction.previous.label": "Sostituisci con il valore precedente",
-	"InPlaceReplaceAction.next.label": "Sostituisci con il valore successivo"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/editor/contrib/inPlaceReplace/inPlaceReplace.i18n.json b/i18n/ita/src/vs/editor/contrib/inPlaceReplace/inPlaceReplace.i18n.json
deleted file mode 100644
index 862a16a7490..00000000000
--- a/i18n/ita/src/vs/editor/contrib/inPlaceReplace/inPlaceReplace.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"InPlaceReplaceAction.previous.label": "Sostituisci con il valore precedente",
-	"InPlaceReplaceAction.next.label": "Sostituisci con il valore successivo"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/editor/contrib/indentation/common/indentation.i18n.json b/i18n/ita/src/vs/editor/contrib/indentation/common/indentation.i18n.json
deleted file mode 100644
index 2617ceedc29..00000000000
--- a/i18n/ita/src/vs/editor/contrib/indentation/common/indentation.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"indentationToSpaces": "Converti rientro in spazi",
-	"indentationToTabs": "Converti rientro in tabulazioni",
-	"configuredTabSize": "Dimensione tabulazione configurata",
-	"selectTabWidth": "Seleziona dimensione tabulazione per il file corrente",
-	"indentUsingTabs": "Imposta rientro con tabulazioni",
-	"indentUsingSpaces": "Imposta rientro con spazi",
-	"detectIndentation": "Rileva rientro dal contenuto",
-	"editor.reindentlines": "Imposta nuovo rientro per righe"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/editor/contrib/indentation/indentation.i18n.json b/i18n/ita/src/vs/editor/contrib/indentation/indentation.i18n.json
deleted file mode 100644
index 9d6fd03aa12..00000000000
--- a/i18n/ita/src/vs/editor/contrib/indentation/indentation.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"indentationToSpaces": "Converti rientro in spazi",
-	"indentationToTabs": "Converti rientro in tabulazioni",
-	"configuredTabSize": "Dimensione tabulazione configurata",
-	"selectTabWidth": "Seleziona dimensione tabulazione per il file corrente",
-	"indentUsingTabs": "Imposta rientro con tabulazioni",
-	"indentUsingSpaces": "Imposta rientro con spazi",
-	"detectIndentation": "Rileva rientro dal contenuto",
-	"editor.reindentlines": "Imposta nuovo rientro per righe",
-	"editor.reindentselectedlines": "Re-Indenta le Linee Selezionate"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/editor/contrib/inspectTMScopes/electron-browser/inspectTMScopes.i18n.json b/i18n/ita/src/vs/editor/contrib/inspectTMScopes/electron-browser/inspectTMScopes.i18n.json
deleted file mode 100644
index 9fcc4080ecc..00000000000
--- a/i18n/ita/src/vs/editor/contrib/inspectTMScopes/electron-browser/inspectTMScopes.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"inspectTMScopes": "Sviluppatore: controlla ambiti TextMate",
-	"inspectTMScopesWidget.loading": "Caricamento..."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/editor/contrib/linesOperations/common/linesOperations.i18n.json b/i18n/ita/src/vs/editor/contrib/linesOperations/common/linesOperations.i18n.json
deleted file mode 100644
index 6f27a9a47e0..00000000000
--- a/i18n/ita/src/vs/editor/contrib/linesOperations/common/linesOperations.i18n.json
+++ /dev/null
@@ -1,25 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"lines.copyUp": "Copia la riga in alto",
-	"lines.copyDown": "Copia la riga in basso",
-	"lines.moveUp": "Sposta la riga in alto",
-	"lines.moveDown": "Sposta la riga in basso",
-	"lines.sortAscending": "Ordinamento righe crescente",
-	"lines.sortDescending": "Ordinamento righe decrescente",
-	"lines.trimTrailingWhitespace": "Taglia spazio vuoto finale",
-	"lines.delete": "Elimina la riga",
-	"lines.indent": "Imposta un rientro per la riga",
-	"lines.outdent": "Riduci il rientro per la riga",
-	"lines.insertBefore": "Inserisci la riga sopra",
-	"lines.insertAfter": "Inserisci la riga sotto",
-	"lines.deleteAllLeft": "Elimina tutto a sinistra",
-	"lines.deleteAllRight": "Elimina tutto a destra",
-	"lines.joinLines": "Unisci righe",
-	"editor.transpose": "Trasponi caratteri intorno al cursore",
-	"editor.transformToUppercase": "Converti in maiuscolo",
-	"editor.transformToLowercase": "Converti in minuscolo"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/editor/contrib/linesOperations/linesOperations.i18n.json b/i18n/ita/src/vs/editor/contrib/linesOperations/linesOperations.i18n.json
deleted file mode 100644
index 92a832d6a88..00000000000
--- a/i18n/ita/src/vs/editor/contrib/linesOperations/linesOperations.i18n.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"lines.copyUp": "Copia la riga in alto",
-	"lines.copyDown": "Copia la riga in basso",
-	"lines.moveUp": "Sposta la riga in alto",
-	"lines.moveDown": "Sposta la riga in basso",
-	"lines.sortAscending": "Ordinamento righe crescente",
-	"lines.sortDescending": "Ordinamento righe decrescente",
-	"lines.trimTrailingWhitespace": "Taglia spazio vuoto finale",
-	"lines.delete": "Elimina la riga",
-	"lines.indent": "Imposta un rientro per la riga",
-	"lines.outdent": "Riduci il rientro per la riga",
-	"lines.insertBefore": "Inserisci la riga sopra",
-	"lines.insertAfter": "Inserisci la riga sotto",
-	"lines.deleteAllLeft": "Elimina tutto a sinistra",
-	"lines.deleteAllRight": "Elimina tutto a destra",
-	"lines.joinLines": "Unisci righe",
-	"editor.transpose": "Trasponi caratteri intorno al cursore",
-	"editor.transformToUppercase": "Converti in maiuscolo",
-	"editor.transformToLowercase": "Converti in minuscolo"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/editor/contrib/links/browser/links.i18n.json b/i18n/ita/src/vs/editor/contrib/links/browser/links.i18n.json
deleted file mode 100644
index bb29675d506..00000000000
--- a/i18n/ita/src/vs/editor/contrib/links/browser/links.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"links.navigate.mac": "Cmd + clic per seguire il collegamento",
-	"links.navigate": "CTRL + clic per seguire il collegamento",
-	"links.command.mac": "Cmd + click per eseguire il comando",
-	"links.command": "Ctrl + clic per eseguire il comando",
-	"links.navigate.al": "Alt + clic per seguire il collegamento",
-	"links.command.al": "Alt + clic per eseguire il comando",
-	"invalid.url": "Non è stato possibile aprire questo collegamento perché il formato non è valido: {0}",
-	"missing.url": "Non è stato possibile aprire questo collegamento perché manca la destinazione.",
-	"label": "Apri il collegamento"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/editor/contrib/links/links.i18n.json b/i18n/ita/src/vs/editor/contrib/links/links.i18n.json
deleted file mode 100644
index b8d39472123..00000000000
--- a/i18n/ita/src/vs/editor/contrib/links/links.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"links.navigate.mac": "Cmd + clic per seguire il collegamento",
-	"links.navigate": "CTRL + clic per seguire il collegamento",
-	"links.command.mac": "Cmd + click per eseguire il comando",
-	"links.command": "Ctrl + clic per eseguire il comando",
-	"links.navigate.al.mac": "Opzione + clic per seguire il collegamento",
-	"links.navigate.al": "Alt + clic per seguire il collegamento",
-	"links.command.al.mac": "Opzione + clic per eseguire il comando",
-	"links.command.al": "Alt + clic per eseguire il comando",
-	"invalid.url": "Non è stato possibile aprire questo collegamento perché il formato non è valido: {0}",
-	"missing.url": "Non è stato possibile aprire questo collegamento perché manca la destinazione.",
-	"label": "Apri il collegamento"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/editor/contrib/message/messageController.i18n.json b/i18n/ita/src/vs/editor/contrib/message/messageController.i18n.json
deleted file mode 100644
index 7a1932aabcc..00000000000
--- a/i18n/ita/src/vs/editor/contrib/message/messageController.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"editor.readonly": "Impossibile modificare nell'editor di sola lettura"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/editor/contrib/multicursor/common/multicursor.i18n.json b/i18n/ita/src/vs/editor/contrib/multicursor/common/multicursor.i18n.json
deleted file mode 100644
index af2b081d453..00000000000
--- a/i18n/ita/src/vs/editor/contrib/multicursor/common/multicursor.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"mutlicursor.insertAbove": "Aggiungi cursore sopra",
-	"mutlicursor.insertBelow": "Aggiungi cursore sotto",
-	"mutlicursor.insertAtEndOfEachLineSelected": "Aggiungi cursore alla fine delle righe",
-	"addSelectionToNextFindMatch": "Aggiungi selezione a risultato ricerca successivo",
-	"addSelectionToPreviousFindMatch": "Aggiungi selezione a risultato ricerca precedente",
-	"moveSelectionToNextFindMatch": "Sposta ultima selezione a risultato ricerca successivo",
-	"moveSelectionToPreviousFindMatch": "Sposta ultima selezione a risultato ricerca precedente",
-	"selectAllOccurrencesOfFindMatch": "Seleziona tutte le occorrenze del risultato ricerca",
-	"changeAll.label": "Cambia tutte le occorrenze"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/editor/contrib/multicursor/multicursor.i18n.json b/i18n/ita/src/vs/editor/contrib/multicursor/multicursor.i18n.json
deleted file mode 100644
index 92c93c927a1..00000000000
--- a/i18n/ita/src/vs/editor/contrib/multicursor/multicursor.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"mutlicursor.insertAbove": "Aggiungi cursore sopra",
-	"mutlicursor.insertBelow": "Aggiungi cursore sotto",
-	"mutlicursor.insertAtEndOfEachLineSelected": "Aggiungi cursore alla fine delle righe",
-	"addSelectionToNextFindMatch": "Aggiungi selezione a risultato ricerca successivo",
-	"addSelectionToPreviousFindMatch": "Aggiungi selezione a risultato ricerca precedente",
-	"moveSelectionToNextFindMatch": "Sposta ultima selezione a risultato ricerca successivo",
-	"moveSelectionToPreviousFindMatch": "Sposta ultima selezione a risultato ricerca precedente",
-	"selectAllOccurrencesOfFindMatch": "Seleziona tutte le occorrenze del risultato ricerca",
-	"changeAll.label": "Cambia tutte le occorrenze"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/editor/contrib/parameterHints/browser/parameterHints.i18n.json b/i18n/ita/src/vs/editor/contrib/parameterHints/browser/parameterHints.i18n.json
deleted file mode 100644
index 27a96b2c54f..00000000000
--- a/i18n/ita/src/vs/editor/contrib/parameterHints/browser/parameterHints.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"parameterHints.trigger.label": "Attiva i suggerimenti per i parametri"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/editor/contrib/parameterHints/browser/parameterHintsWidget.i18n.json b/i18n/ita/src/vs/editor/contrib/parameterHints/browser/parameterHintsWidget.i18n.json
deleted file mode 100644
index f5613ad126f..00000000000
--- a/i18n/ita/src/vs/editor/contrib/parameterHints/browser/parameterHintsWidget.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"hint": "{0}, suggerimento"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/editor/contrib/parameterHints/parameterHints.i18n.json b/i18n/ita/src/vs/editor/contrib/parameterHints/parameterHints.i18n.json
deleted file mode 100644
index 8158af50723..00000000000
--- a/i18n/ita/src/vs/editor/contrib/parameterHints/parameterHints.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"parameterHints.trigger.label": "Attiva i suggerimenti per i parametri"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/editor/contrib/parameterHints/parameterHintsWidget.i18n.json b/i18n/ita/src/vs/editor/contrib/parameterHints/parameterHintsWidget.i18n.json
deleted file mode 100644
index fc0e21e0858..00000000000
--- a/i18n/ita/src/vs/editor/contrib/parameterHints/parameterHintsWidget.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hint": "{0}, suggerimento"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/editor/contrib/quickFix/browser/quickFixCommands.i18n.json b/i18n/ita/src/vs/editor/contrib/quickFix/browser/quickFixCommands.i18n.json
deleted file mode 100644
index 29a73e519d0..00000000000
--- a/i18n/ita/src/vs/editor/contrib/quickFix/browser/quickFixCommands.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"quickFixWithKb": "Mostra correzioni ({0})",
-	"quickFix": "Mostra correzioni",
-	"quickfix.trigger.label": "Correzione rapida"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/editor/contrib/quickFix/quickFixCommands.i18n.json b/i18n/ita/src/vs/editor/contrib/quickFix/quickFixCommands.i18n.json
deleted file mode 100644
index cb81a1d813f..00000000000
--- a/i18n/ita/src/vs/editor/contrib/quickFix/quickFixCommands.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"quickFixWithKb": "Mostra correzioni ({0})",
-	"quickFix": "Mostra correzioni",
-	"quickfix.trigger.label": "Correzione rapida",
-	"refactor.label": "Esegui il refactoring"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/editor/contrib/referenceSearch/browser/peekViewWidget.i18n.json b/i18n/ita/src/vs/editor/contrib/referenceSearch/browser/peekViewWidget.i18n.json
deleted file mode 100644
index fe8e7a6d653..00000000000
--- a/i18n/ita/src/vs/editor/contrib/referenceSearch/browser/peekViewWidget.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"label.close": "Chiudi"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/editor/contrib/referenceSearch/browser/referenceSearch.i18n.json b/i18n/ita/src/vs/editor/contrib/referenceSearch/browser/referenceSearch.i18n.json
deleted file mode 100644
index a9e04aae3bb..00000000000
--- a/i18n/ita/src/vs/editor/contrib/referenceSearch/browser/referenceSearch.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"meta.titleReference": " - Riferimenti di {0}",
-	"references.action.label": "Trova tutti i riferimenti"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/editor/contrib/referenceSearch/browser/referencesController.i18n.json b/i18n/ita/src/vs/editor/contrib/referenceSearch/browser/referencesController.i18n.json
deleted file mode 100644
index af8f531bdc2..00000000000
--- a/i18n/ita/src/vs/editor/contrib/referenceSearch/browser/referencesController.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"labelLoading": "Caricamento..."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/editor/contrib/referenceSearch/browser/referencesModel.i18n.json b/i18n/ita/src/vs/editor/contrib/referenceSearch/browser/referencesModel.i18n.json
deleted file mode 100644
index d9f668ac458..00000000000
--- a/i18n/ita/src/vs/editor/contrib/referenceSearch/browser/referencesModel.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"aria.oneReference": "simbolo in {0} alla riga {1} colonna {2}",
-	"aria.fileReferences.1": "1 simbolo in {0}, percorso completo {1}",
-	"aria.fileReferences.N": "{0} simboli in {1}, percorso completo {2}",
-	"aria.result.0": "Non sono stati trovati risultati",
-	"aria.result.1": "Trovato 1 simbolo in {0}",
-	"aria.result.n1": "Trovati {0} simboli in {1}",
-	"aria.result.nm": "Trovati {0} simboli in {1} file"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/editor/contrib/referenceSearch/browser/referencesWidget.i18n.json b/i18n/ita/src/vs/editor/contrib/referenceSearch/browser/referencesWidget.i18n.json
deleted file mode 100644
index 1b3c14ffa2f..00000000000
--- a/i18n/ita/src/vs/editor/contrib/referenceSearch/browser/referencesWidget.i18n.json
+++ /dev/null
@@ -1,27 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"referencesFailre": "Non è stato possibile risolvere il file.",
-	"referencesCount": "{0} riferimenti",
-	"referenceCount": "{0} riferimento",
-	"missingPreviewMessage": "anteprima non disponibile",
-	"treeAriaLabel": "Riferimenti",
-	"noResults": "Nessun risultato",
-	"peekView.alternateTitle": "Riferimenti",
-	"peekViewTitleBackground": "Colore di sfondo dell'area del titolo della visualizzazione rapida.",
-	"peekViewTitleForeground": "Colore del titolo della visualizzazione rapida.",
-	"peekViewTitleInfoForeground": "Colore delle informazioni del titolo della visualizzazione rapida.",
-	"peekViewBorder": "Colore dei bordi e della freccia della visualizzazione rapida.",
-	"peekViewResultsBackground": "Colore di sfondo dell'elenco risultati della visualizzazione rapida.",
-	"peekViewResultsMatchForeground": "Colore primo piano dei nodi riga nell'elenco risultati della visualizzazione rapida.",
-	"peekViewResultsFileForeground": "Colore primo piano dei nodi file nell'elenco risultati della visualizzazione rapida.",
-	"peekViewResultsSelectionBackground": "Colore di sfondo della voce selezionata nell'elenco risultati della visualizzazione rapida.",
-	"peekViewResultsSelectionForeground": "Colore primo piano della voce selezionata nell'elenco risultati della visualizzazione rapida.",
-	"peekViewEditorBackground": "Colore di sfondo dell'editor di visualizzazioni rapide.",
-	"peekViewEditorGutterBackground": "Colore di sfondo della barra di navigazione nell'editor visualizzazione rapida.",
-	"peekViewResultsMatchHighlight": "Colore dell'evidenziazione delle corrispondenze nell'elenco risultati della visualizzazione rapida.",
-	"peekViewEditorMatchHighlight": "Colore dell'evidenziazione delle corrispondenze nell'editor di visualizzazioni rapide."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/editor/contrib/referenceSearch/peekViewWidget.i18n.json b/i18n/ita/src/vs/editor/contrib/referenceSearch/peekViewWidget.i18n.json
deleted file mode 100644
index a7e9b99aa99..00000000000
--- a/i18n/ita/src/vs/editor/contrib/referenceSearch/peekViewWidget.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"label.close": "Chiudi"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/editor/contrib/referenceSearch/referenceSearch.i18n.json b/i18n/ita/src/vs/editor/contrib/referenceSearch/referenceSearch.i18n.json
deleted file mode 100644
index 7b18156e59c..00000000000
--- a/i18n/ita/src/vs/editor/contrib/referenceSearch/referenceSearch.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"meta.titleReference": " - Riferimenti di {0}",
-	"references.action.label": "Trova tutti i riferimenti"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/editor/contrib/referenceSearch/referencesController.i18n.json b/i18n/ita/src/vs/editor/contrib/referenceSearch/referencesController.i18n.json
deleted file mode 100644
index 183df5221e1..00000000000
--- a/i18n/ita/src/vs/editor/contrib/referenceSearch/referencesController.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"labelLoading": "Caricamento..."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/editor/contrib/referenceSearch/referencesModel.i18n.json b/i18n/ita/src/vs/editor/contrib/referenceSearch/referencesModel.i18n.json
deleted file mode 100644
index 4e083032ff6..00000000000
--- a/i18n/ita/src/vs/editor/contrib/referenceSearch/referencesModel.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"aria.oneReference": "simbolo in {0} alla riga {1} colonna {2}",
-	"aria.fileReferences.1": "1 simbolo in {0}, percorso completo {1}",
-	"aria.fileReferences.N": "{0} simboli in {1}, percorso completo {2}",
-	"aria.result.0": "Non sono stati trovati risultati",
-	"aria.result.1": "Trovato 1 simbolo in {0}",
-	"aria.result.n1": "Trovati {0} simboli in {1}",
-	"aria.result.nm": "Trovati {0} simboli in {1} file"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/editor/contrib/referenceSearch/referencesWidget.i18n.json b/i18n/ita/src/vs/editor/contrib/referenceSearch/referencesWidget.i18n.json
deleted file mode 100644
index cbce43a708c..00000000000
--- a/i18n/ita/src/vs/editor/contrib/referenceSearch/referencesWidget.i18n.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"referencesFailre": "Non è stato possibile risolvere il file.",
-	"referencesCount": "{0} riferimenti",
-	"referenceCount": "{0} riferimento",
-	"missingPreviewMessage": "anteprima non disponibile",
-	"treeAriaLabel": "Riferimenti",
-	"noResults": "Nessun risultato",
-	"peekView.alternateTitle": "Riferimenti",
-	"peekViewTitleBackground": "Colore di sfondo dell'area del titolo della visualizzazione rapida.",
-	"peekViewTitleForeground": "Colore del titolo della visualizzazione rapida.",
-	"peekViewTitleInfoForeground": "Colore delle informazioni del titolo della visualizzazione rapida.",
-	"peekViewBorder": "Colore dei bordi e della freccia della visualizzazione rapida.",
-	"peekViewResultsBackground": "Colore di sfondo dell'elenco risultati della visualizzazione rapida.",
-	"peekViewResultsMatchForeground": "Colore primo piano dei nodi riga nell'elenco risultati della visualizzazione rapida.",
-	"peekViewResultsFileForeground": "Colore primo piano dei nodi file nell'elenco risultati della visualizzazione rapida.",
-	"peekViewResultsSelectionBackground": "Colore di sfondo della voce selezionata nell'elenco risultati della visualizzazione rapida.",
-	"peekViewResultsSelectionForeground": "Colore primo piano della voce selezionata nell'elenco risultati della visualizzazione rapida.",
-	"peekViewEditorBackground": "Colore di sfondo dell'editor di visualizzazioni rapide.",
-	"peekViewEditorGutterBackground": "Colore di sfondo della barra di navigazione nell'editor visualizzazione rapida.",
-	"peekViewResultsMatchHighlight": "Colore dell'evidenziazione delle corrispondenze nell'elenco risultati della visualizzazione rapida.",
-	"peekViewEditorMatchHighlight": "Colore dell'evidenziazione delle corrispondenze nell'editor di visualizzazioni rapide.",
-	"peekViewEditorMatchHighlightBorder": "Bordo dell'evidenziazione delle corrispondenze nell'editor di visualizzazioni rapide."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/editor/contrib/rename/browser/rename.i18n.json b/i18n/ita/src/vs/editor/contrib/rename/browser/rename.i18n.json
deleted file mode 100644
index c1a735fcca6..00000000000
--- a/i18n/ita/src/vs/editor/contrib/rename/browser/rename.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"no result": "Nessun risultato.",
-	"aria": "Correttamente rinominato '{0}' in '{1}'. Sommario: {2}",
-	"rename.failed": "L'esecuzione dell'operazione di ridenominazione non è riuscita.",
-	"rename.label": "Rinomina simbolo"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/editor/contrib/rename/browser/renameInputField.i18n.json b/i18n/ita/src/vs/editor/contrib/rename/browser/renameInputField.i18n.json
deleted file mode 100644
index 8d3c8a03d06..00000000000
--- a/i18n/ita/src/vs/editor/contrib/rename/browser/renameInputField.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"renameAriaLabel": "Consente di rinominare l'input. Digitare il nuovo nome e premere INVIO per eseguire il commit."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/editor/contrib/rename/rename.i18n.json b/i18n/ita/src/vs/editor/contrib/rename/rename.i18n.json
deleted file mode 100644
index c0974ff283c..00000000000
--- a/i18n/ita/src/vs/editor/contrib/rename/rename.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"no result": "Nessun risultato.",
-	"aria": "Correttamente rinominato '{0}' in '{1}'. Sommario: {2}",
-	"rename.failed": "L'esecuzione dell'operazione di ridenominazione non è riuscita.",
-	"rename.label": "Rinomina simbolo"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/editor/contrib/rename/renameInputField.i18n.json b/i18n/ita/src/vs/editor/contrib/rename/renameInputField.i18n.json
deleted file mode 100644
index a2e90681b95..00000000000
--- a/i18n/ita/src/vs/editor/contrib/rename/renameInputField.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"renameAriaLabel": "Consente di rinominare l'input. Digitare il nuovo nome e premere INVIO per eseguire il commit."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/editor/contrib/smartSelect/common/smartSelect.i18n.json b/i18n/ita/src/vs/editor/contrib/smartSelect/common/smartSelect.i18n.json
deleted file mode 100644
index e50cd06027c..00000000000
--- a/i18n/ita/src/vs/editor/contrib/smartSelect/common/smartSelect.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"smartSelect.grow": "Espandi SELECT",
-	"smartSelect.shrink": "Comprimi SELECT"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/editor/contrib/smartSelect/smartSelect.i18n.json b/i18n/ita/src/vs/editor/contrib/smartSelect/smartSelect.i18n.json
deleted file mode 100644
index ab203aab8b5..00000000000
--- a/i18n/ita/src/vs/editor/contrib/smartSelect/smartSelect.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"smartSelect.grow": "Espandi SELECT",
-	"smartSelect.shrink": "Comprimi SELECT"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/editor/contrib/snippet/snippetVariables.i18n.json b/i18n/ita/src/vs/editor/contrib/snippet/snippetVariables.i18n.json
deleted file mode 100644
index af44bbbb9ea..00000000000
--- a/i18n/ita/src/vs/editor/contrib/snippet/snippetVariables.i18n.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"Sunday": "Domenica",
-	"Monday": "Lunedì",
-	"Tuesday": "Martedì",
-	"Wednesday": "Mercoledì",
-	"Thursday": "Giovedì",
-	"Friday": "Venerdì",
-	"Saturday": "Sabato",
-	"SundayShort": "Dom",
-	"MondayShort": "Lun",
-	"TuesdayShort": "Mar",
-	"WednesdayShort": "Mer",
-	"ThursdayShort": "Gio",
-	"FridayShort": "Ven",
-	"SaturdayShort": "Sab",
-	"January": "Gennaio",
-	"February": "Febbraio",
-	"March": "Marzo",
-	"April": "Aprile",
-	"May": "Maggio",
-	"June": "Giugno",
-	"July": "Luglio",
-	"August": "Agosto",
-	"September": "Settembre",
-	"October": "Ottobre",
-	"November": "Novembre",
-	"December": "Dicembre",
-	"JanuaryShort": "Gen",
-	"FebruaryShort": "Feb",
-	"MarchShort": "Mar",
-	"AprilShort": "Apr",
-	"MayShort": "Mag",
-	"JuneShort": "Giu",
-	"JulyShort": "Lug",
-	"AugustShort": "Ago",
-	"SeptemberShort": "Set",
-	"OctoberShort": "Ott",
-	"NovemberShort": "Nov",
-	"DecemberShort": "Dic"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/editor/contrib/suggest/browser/suggestController.i18n.json b/i18n/ita/src/vs/editor/contrib/suggest/browser/suggestController.i18n.json
deleted file mode 100644
index a68bd5b22df..00000000000
--- a/i18n/ita/src/vs/editor/contrib/suggest/browser/suggestController.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"arai.alert.snippet": "L'accettazione di '{0}' ha inserito il seguente testo: {1}",
-	"suggest.trigger.label": "Attiva suggerimento"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/editor/contrib/suggest/browser/suggestWidget.i18n.json b/i18n/ita/src/vs/editor/contrib/suggest/browser/suggestWidget.i18n.json
deleted file mode 100644
index eb519f2c5dd..00000000000
--- a/i18n/ita/src/vs/editor/contrib/suggest/browser/suggestWidget.i18n.json
+++ /dev/null
@@ -1,21 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"editorSuggestWidgetBackground": "Colore di sfondo del widget dei suggerimenti.",
-	"editorSuggestWidgetBorder": "Colore del bordo del widget dei suggerimenti.",
-	"editorSuggestWidgetForeground": "Colore primo piano del widget dei suggerimenti.",
-	"editorSuggestWidgetSelectedBackground": "Colore di sfondo della voce selezionata del widget dei suggerimenti.",
-	"editorSuggestWidgetHighlightForeground": "Colore delle evidenziazioni corrispondenze nel widget dei suggerimenti.",
-	"readMore": "Altre informazioni...{0}",
-	"suggestionWithDetailsAriaLabel": "{0}, suggerimento, con dettagli",
-	"suggestionAriaLabel": "{0}, suggerimento",
-	"readLess": "Meno informazioni... {0}",
-	"suggestWidget.loading": "Caricamento...",
-	"suggestWidget.noSuggestions": "Non ci sono suggerimenti.",
-	"suggestionAriaAccepted": "{0}, accettato",
-	"ariaCurrentSuggestionWithDetails": "{0}, suggerimento, con dettagli",
-	"ariaCurrentSuggestion": "{0}, suggerimento"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/editor/contrib/suggest/suggestController.i18n.json b/i18n/ita/src/vs/editor/contrib/suggest/suggestController.i18n.json
deleted file mode 100644
index 958300caaa2..00000000000
--- a/i18n/ita/src/vs/editor/contrib/suggest/suggestController.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"arai.alert.snippet": "L'accettazione di '{0}' ha inserito il seguente testo: {1}",
-	"suggest.trigger.label": "Attiva suggerimento"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/editor/contrib/suggest/suggestWidget.i18n.json b/i18n/ita/src/vs/editor/contrib/suggest/suggestWidget.i18n.json
deleted file mode 100644
index 4a71e6bd1e6..00000000000
--- a/i18n/ita/src/vs/editor/contrib/suggest/suggestWidget.i18n.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"editorSuggestWidgetBackground": "Colore di sfondo del widget dei suggerimenti.",
-	"editorSuggestWidgetBorder": "Colore del bordo del widget dei suggerimenti.",
-	"editorSuggestWidgetForeground": "Colore primo piano del widget dei suggerimenti.",
-	"editorSuggestWidgetSelectedBackground": "Colore di sfondo della voce selezionata del widget dei suggerimenti.",
-	"editorSuggestWidgetHighlightForeground": "Colore delle evidenziazioni corrispondenze nel widget dei suggerimenti.",
-	"readMore": "Altre informazioni...{0}",
-	"suggestionWithDetailsAriaLabel": "{0}, suggerimento, con dettagli",
-	"suggestionAriaLabel": "{0}, suggerimento",
-	"readLess": "Meno informazioni... {0}",
-	"suggestWidget.loading": "Caricamento...",
-	"suggestWidget.noSuggestions": "Non ci sono suggerimenti.",
-	"suggestionAriaAccepted": "{0}, accettato",
-	"ariaCurrentSuggestionWithDetails": "{0}, suggerimento, con dettagli",
-	"ariaCurrentSuggestion": "{0}, suggerimento"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/editor/contrib/toggleTabFocusMode/common/toggleTabFocusMode.i18n.json b/i18n/ita/src/vs/editor/contrib/toggleTabFocusMode/common/toggleTabFocusMode.i18n.json
deleted file mode 100644
index 3994298789f..00000000000
--- a/i18n/ita/src/vs/editor/contrib/toggleTabFocusMode/common/toggleTabFocusMode.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"toggle.tabMovesFocus": "Attiva/Disattiva l'uso di TAB per spostare lo stato attivo"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/editor/contrib/toggleTabFocusMode/toggleTabFocusMode.i18n.json b/i18n/ita/src/vs/editor/contrib/toggleTabFocusMode/toggleTabFocusMode.i18n.json
deleted file mode 100644
index ea92850c9ba..00000000000
--- a/i18n/ita/src/vs/editor/contrib/toggleTabFocusMode/toggleTabFocusMode.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggle.tabMovesFocus": "Attiva/Disattiva l'uso di TAB per spostare lo stato attivo"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/editor/contrib/wordHighlighter/common/wordHighlighter.i18n.json b/i18n/ita/src/vs/editor/contrib/wordHighlighter/common/wordHighlighter.i18n.json
deleted file mode 100644
index d57627a559a..00000000000
--- a/i18n/ita/src/vs/editor/contrib/wordHighlighter/common/wordHighlighter.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"wordHighlight": "Colore di sfondo di un simbolo durante l'accesso in lettura, ad esempio durante la lettura di una variabile.",
-	"wordHighlightStrong": "Colore di sfondo di un simbolo durante l'accesso in scrittura, ad esempio durante la scrittura in una variabile.",
-	"overviewRulerWordHighlightForeground": "Colore del marcatore del righello delle annotazioni per le evidenziazioni dei simboli.",
-	"overviewRulerWordHighlightStrongForeground": "Colore del marcatore del righello delle annotazioni per le evidenziazioni dei simboli di accesso in scrittura.",
-	"wordHighlight.next.label": "Vai al prossimo simbolo evidenziato",
-	"wordHighlight.previous.label": "Vai al precedente simbolo evidenziato"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json b/i18n/ita/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
deleted file mode 100644
index e0d29249698..00000000000
--- a/i18n/ita/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"wordHighlight": "Colore di sfondo di un simbolo durante l'accesso in lettura, ad esempio durante la lettura di una variabile. Il colore non deve essere opaco per evitare di nascondere le decorazioni sottostanti.",
-	"wordHighlightStrong": "Colore di sfondo di un simbolo durante l'accesso in scrittura, per esempio durante la scrittura di una variabile. Il colore non deve essere opaco per evitare di nascondere le decorazioni sottostanti.",
-	"wordHighlightBorder": "Colore del bordo di un simbolo durante l'accesso in lettura, ad esempio durante la lettura di una variabile.",
-	"wordHighlightStrongBorder": "Colore del bordo di un simbolo durante l'accesso in scrittura, ad esempio durante la scrittura in una variabile.",
-	"overviewRulerWordHighlightForeground": "Colore del marcatore righello panoramica per evidenziazione simboli. Il colore non deve essere opaco per non nascondere decorazioni sottostanti.",
-	"overviewRulerWordHighlightStrongForeground": "Colore del marcatore righello panoramica per evidenziazione simboli con accesso in scrittura. Il colore non deve essere opaco per non nascondere decorazioni sottostanti.",
-	"wordHighlight.next.label": "Vai al prossimo simbolo evidenziato",
-	"wordHighlight.previous.label": "Vai al precedente simbolo evidenziato"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/editor/contrib/zoneWidget/browser/peekViewWidget.i18n.json b/i18n/ita/src/vs/editor/contrib/zoneWidget/browser/peekViewWidget.i18n.json
deleted file mode 100644
index fe8e7a6d653..00000000000
--- a/i18n/ita/src/vs/editor/contrib/zoneWidget/browser/peekViewWidget.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"label.close": "Chiudi"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/editor/electron-browser/textMate/TMSyntax.i18n.json b/i18n/ita/src/vs/editor/electron-browser/textMate/TMSyntax.i18n.json
deleted file mode 100644
index 0548a8aa6a9..00000000000
--- a/i18n/ita/src/vs/editor/electron-browser/textMate/TMSyntax.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"invalid.language": "Il linguaggio in `contributes.{0}.language` è sconosciuto. Valore specificato: {1}",
-	"invalid.scopeName": "È previsto un valore stringa in `contributes.{0}.scopeName`. Valore specificato: {1}",
-	"invalid.path.0": "È previsto un valore stringa in `contributes.{0}.path`. Valore specificato: {1}",
-	"invalid.injectTo": "Il valore in `contributes.{0}.injectTo` non è valido. Deve essere una matrice di nomi di ambito del linguaggio. Valore specificato: {1}",
-	"invalid.embeddedLanguages": "Il valore in `contributes.{0}.embeddedLanguages` non è valido. Deve essere un mapping di oggetti tra nome ambito e linguaggio. Valore specificato: {1}",
-	"invalid.path.1": "Valore previsto di `contributes.{0}.path` ({1}) da includere nella cartella dell'estensione ({2}). L'estensione potrebbe non essere più portatile.",
-	"no-tm-grammar": "Non è stata registrata alcuna grammatica TM per questo linguaggio."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/editor/node/languageConfigurationExtensionPoint.i18n.json b/i18n/ita/src/vs/editor/node/languageConfigurationExtensionPoint.i18n.json
deleted file mode 100644
index 0a974d14915..00000000000
--- a/i18n/ita/src/vs/editor/node/languageConfigurationExtensionPoint.i18n.json
+++ /dev/null
@@ -1,23 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"parseErrors": "Errori durante l'analisi di {0}: {1}",
-	"schema.openBracket": "Sequenza di stringa o carattere parentesi quadra di apertura.",
-	"schema.closeBracket": "Sequenza di stringa o carattere parentesi quadra di chiusura.",
-	"schema.comments": "Definisce i simboli di commento",
-	"schema.blockComments": "Definisce il modo in cui sono contrassegnati i commenti per il blocco.",
-	"schema.blockComment.begin": "Sequenza di caratteri che indica l'inizio di un commento per il blocco.",
-	"schema.blockComment.end": "Sequenza di caratteri che termina i commenti per il blocco.",
-	"schema.lineComment": "Sequenza di caratteri che indica l'inizio di un commento per la riga.",
-	"schema.brackets": "Definisce i simboli di parentesi quadra che aumentano o riducono il rientro.",
-	"schema.autoClosingPairs": "Definisce le coppie di parentesi quadre. Quando viene immessa una parentesi quadra di apertura, quella di chiusura viene inserita automaticamente.",
-	"schema.autoClosingPairs.notIn": "Definisce un elenco di ambiti in cui la corrispondenza automatica delle coppie è disabilitata.",
-	"schema.surroundingPairs": "Definisce le coppie di parentesi quadre che possono essere usate per racchiudere una stringa selezionata.",
-	"schema.wordPattern": "La definizione di parola per il linguaggio.",
-	"schema.wordPattern.pattern": "Il modello di RegExp utilizzato per trovare parole.",
-	"schema.wordPattern.flags": "I flag di RegExp utilizzati per trovare parole.",
-	"schema.wordPattern.flags.errorMessage": "Deve corrispondere al modello `/^([gimuy]+)$/`."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/editor/node/textMate/TMGrammars.i18n.json b/i18n/ita/src/vs/editor/node/textMate/TMGrammars.i18n.json
deleted file mode 100644
index 0cfd798fe9e..00000000000
--- a/i18n/ita/src/vs/editor/node/textMate/TMGrammars.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"vscode.extension.contributes.grammars": "Tokenizer TextMate per contributes.",
-	"vscode.extension.contributes.grammars.language": "Identificatore di linguaggio per cui si aggiunge come contributo questa sintassi.",
-	"vscode.extension.contributes.grammars.scopeName": "Nome dell'ambito TextMate usato dal file tmLanguage.",
-	"vscode.extension.contributes.grammars.path": "Percorso del file tmLanguage. È relativo alla cartella delle estensioni e in genere inizia con './syntaxes/'.",
-	"vscode.extension.contributes.grammars.embeddedLanguages": "Mapping tra nome ambito e ID linguaggio se questa grammatica contiene linguaggi incorporati.",
-	"vscode.extension.contributes.grammars.injectTo": "Elenco di nomi di ambito del linguaggio in cui viene inserita questa grammatica."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/platform/actions/browser/menuItemActionItem.i18n.json b/i18n/ita/src/vs/platform/actions/browser/menuItemActionItem.i18n.json
deleted file mode 100644
index 0d4e76110bb..00000000000
--- a/i18n/ita/src/vs/platform/actions/browser/menuItemActionItem.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"titleAndKb": "{0} ({1})"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json b/i18n/ita/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
deleted file mode 100644
index 1b2a046fdb0..00000000000
--- a/i18n/ita/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"requirearray": "le voci di menu devono essere una matrice",
-	"requirestring": "la proprietà `{0}` è obbligatoria e deve essere di tipo `string`",
-	"optstring": "la proprietà `{0}` può essere omessa o deve essere di tipo `string`",
-	"vscode.extension.contributes.menuItem.command": "Identificatore del comando da eseguire. Il comando deve essere dichiarato nella sezione 'commands'",
-	"vscode.extension.contributes.menuItem.alt": "Identificatore di un comando alternativo da eseguire. Il comando deve essere dichiarato nella sezione 'commands'",
-	"vscode.extension.contributes.menuItem.when": "Condizione che deve essere vera per mostrare questo elemento",
-	"vscode.extension.contributes.menuItem.group": "Gruppo a cui appartiene questo comando",
-	"vscode.extension.contributes.menus": "Aggiunge voci del menu all'editor come contributo",
-	"menus.commandPalette": "Riquadro comandi",
-	"menus.touchBar": "La Touch Bar (solo Mac OS)",
-	"menus.editorTitle": "Menu del titolo dell'editor",
-	"menus.editorContext": "Menu di scelta rapida dell'editor",
-	"menus.explorerContext": "Menu di scelta rapida Esplora file",
-	"menus.editorTabContext": "Menu di scelta rapida delle schede dell'editor",
-	"menus.debugCallstackContext": "Menu di scelta rapida dello stack di chiamate di debug",
-	"menus.scmTitle": "Menu del titolo del controllo del codice sorgente",
-	"menus.scmSourceControl": "Menu del controllo del codice sorgente",
-	"menus.resourceGroupContext": "Menu di scelta rapida del gruppo di risorse del controllo del codice sorgente",
-	"menus.resourceStateContext": "Menu di scelta rapida dello stato delle risorse del controllo del codice sorgente",
-	"view.viewTitle": "Menu del titolo della visualizzazione contribuita",
-	"view.itemContext": "Menu di contesto dell'elemento visualizzazione contribuita",
-	"nonempty": "è previsto un valore non vuoto.",
-	"opticon": "la proprietà `icon` può essere omessa o deve essere una stringa o un valore letterale come `{dark, light}`",
-	"requireStringOrObject": "la proprietà `{0}` è obbligatoria e deve essere di tipo `object` o `string`",
-	"requirestrings": "le proprietà `{0}` e `{1}` sono obbligatorie e devono essere di tipo `string`",
-	"vscode.extension.contributes.commandType.command": "Identificatore del comando da eseguire",
-	"vscode.extension.contributes.commandType.title": "Titolo con cui è rappresentato il comando nell'interfaccia utente",
-	"vscode.extension.contributes.commandType.category": "(Facoltativo) Stringa di categoria in base a cui è raggruppato il comando nell'interfaccia utente",
-	"vscode.extension.contributes.commandType.icon": "(Facoltativa) Icona usata per rappresentare il comando nell'interfaccia utente. Percorso di file o configurazione che supporta i temi",
-	"vscode.extension.contributes.commandType.icon.light": "Percorso dell'icona quando viene usato un tema chiaro",
-	"vscode.extension.contributes.commandType.icon.dark": "Percorso dell'icona quando viene usato un tema scuro",
-	"vscode.extension.contributes.commands": "Comandi di contributes per il riquadro comandi.",
-	"dup": "Il comando `{0}` è presente più volte nella sezione `commands`.",
-	"menuId.invalid": "`{0}` non è un identificatore di menu valido",
-	"missing.command": "La voce di menu fa riferimento a un comando `{0}` che non è definito nella sezione 'commands'.",
-	"missing.altCommand": "La voce di menu fa riferimento a un comando alternativo `{0}` che non è definito nella sezione 'commands'.",
-	"dupe.command": "La voce di menu fa riferimento allo stesso comando come comando predefinito e come comando alternativo"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/platform/configuration/common/configurationRegistry.i18n.json b/i18n/ita/src/vs/platform/configuration/common/configurationRegistry.i18n.json
deleted file mode 100644
index a11a66ad067..00000000000
--- a/i18n/ita/src/vs/platform/configuration/common/configurationRegistry.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"defaultConfigurations.title": "Override configurazione predefinita",
-	"overrideSettings.description": "Consente di configurare le impostazioni dell'editor di cui eseguire l'override per il linguaggio {0}.",
-	"overrideSettings.defaultDescription": "Consente di configurare le impostazioni dell'editor di cui eseguire l'override per un linguaggio.",
-	"config.property.languageDefault": "Non è possibile registrare '{0}'. Corrisponde al criterio di proprietà '\\\\[.*\\\\]$' per la descrizione delle impostazioni dell'editor specifiche del linguaggio. Usare il contributo 'configurationDefaults'.",
-	"config.property.duplicate": "Non è possibile registrare '{0}'. Questa proprietà è già registrata."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/platform/dialogs/common/dialogs.i18n.json b/i18n/ita/src/vs/platform/dialogs/common/dialogs.i18n.json
deleted file mode 100644
index 6b01687be11..00000000000
--- a/i18n/ita/src/vs/platform/dialogs/common/dialogs.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"moreFile": "...1 altro file non visualizzato",
-	"moreFiles": "...{0} altri file non visualizzati"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/platform/dialogs/node/dialogService.i18n.json b/i18n/ita/src/vs/platform/dialogs/node/dialogService.i18n.json
deleted file mode 100644
index 37c77254e7c..00000000000
--- a/i18n/ita/src/vs/platform/dialogs/node/dialogService.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"cancel": "Annulla"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/platform/environment/node/argv.i18n.json b/i18n/ita/src/vs/platform/environment/node/argv.i18n.json
deleted file mode 100644
index 9db983246ea..00000000000
--- a/i18n/ita/src/vs/platform/environment/node/argv.i18n.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"gotoValidation": "Gli argomenti nella modalità `--goto` devono essere espressi nel formato `FILE(:LINE(:CHARACTER))`.",
-	"diff": "Confronta due file tra loro.",
-	"add": "Aggiunge la cartella o le cartelle all'ultima finestra attiva.",
-	"goto": "Apre un file nel percorso alla posizione specificata di riga e carattere.",
-	"newWindow": "Forza l'apertura di una nuova finestra.",
-	"reuseWindow": "Forza l'apertura di un file o di una cartella nell'ultima finestra attiva.",
-	"wait": "Attendere la chiusura dei file prima della restituzione.",
-	"locale": "Impostazioni locali da usare, ad esempio en-US o it-IT.",
-	"userDataDir": "Consente di specificare la directory in cui si trovano i dati utente. Può essere usata per aprire più istanze diverse di Code.",
-	"version": "Visualizza la versione.",
-	"help": "Visualizza la sintassi.",
-	"extensionHomePath": "Impostare il percorso radice per le estensioni.",
-	"listExtensions": "Elenca le estensioni installate.",
-	"showVersions": "Mostra le versioni delle estensioni installate, quando si usa --list-extension.",
-	"installExtension": "Installa un'estensione.",
-	"uninstallExtension": "Disinstalla un'estensione.",
-	"experimentalApis": "Abilita funzionalità di API proposte per un'estensione.",
-	"verbose": "Visualizza l'output dettagliato (implica --wait).",
-	"log": "Livello di logging da utilizzare. Il valore predefinito è 'info'. I valori consentiti sono 'critical, 'error', 'warn', 'info', 'debug', 'trace', 'off'.",
-	"status": "Stampare le informazioni di utilizzo e diagnostica di processo.",
-	"performance": "Eseguire l'avvio con il comando 'Developer: Startup Performance' abilitato.",
-	"prof-startup": "Esegui il profiler della CPU durante l'avvio",
-	"disableExtensions": "Disabilita tutte le estensioni installate.",
-	"inspect-extensions": "Consente il debug e profiling delle estensioni. Controllare gli strumenti di sviluppo per la URI di connessione.",
-	"inspect-brk-extensions": "Consente di eseguire debug e profilatura delle estensioni con l'host dell'estensione messo in pausa dopo l'avvio. Controllare gli strumenti di sviluppo per l'URI di connessione.",
-	"disableGPU": "Disabilita l'accelerazione hardware della GPU.",
-	"uploadLogs": "Caricamento dei log della sessione corrente verso un punto di comunicazione sicuro.",
-	"maxMemory": "Dimensione massima della memoria per una finestra (in Mbytes).",
-	"usage": "Utilizzo",
-	"options": "opzioni",
-	"paths": "percorsi",
-	"stdinWindows": "Per leggere l'output da un altro programma, aggiungere alla fine '-' (ad esempio 'echo Hello World | {0} -')",
-	"stdinUnix": "Per leggere da stdin, aggiungere alla fine '-' (ad esempio 'ps aux | grep code | {0} -')",
-	"optionsUpperCase": "Opzioni",
-	"extensionsManagement": "Gestione delle estensioni",
-	"troubleshooting": "Risoluzione dei problemi"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/platform/extensionManagement/common/extensionEnablementService.i18n.json b/i18n/ita/src/vs/platform/extensionManagement/common/extensionEnablementService.i18n.json
deleted file mode 100644
index a4a832a4b96..00000000000
--- a/i18n/ita/src/vs/platform/extensionManagement/common/extensionEnablementService.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noWorkspace": "Non esiste alcuna area di lavoro."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/platform/extensionManagement/common/extensionManagement.i18n.json b/i18n/ita/src/vs/platform/extensionManagement/common/extensionManagement.i18n.json
deleted file mode 100644
index bf164fc9645..00000000000
--- a/i18n/ita/src/vs/platform/extensionManagement/common/extensionManagement.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"extensions": "Estensioni",
-	"preferences": "Preferenze"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/platform/extensionManagement/node/extensionGalleryService.i18n.json b/i18n/ita/src/vs/platform/extensionManagement/node/extensionGalleryService.i18n.json
deleted file mode 100644
index a4a126f602d..00000000000
--- a/i18n/ita/src/vs/platform/extensionManagement/node/extensionGalleryService.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"notCompatibleDownload": "Impossibile scaricare perché non è stata trovata l'estensione compatibile con la versione corrente '{0}' di VS Code."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json b/i18n/ita/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
deleted file mode 100644
index 35f8ed83f0d..00000000000
--- a/i18n/ita/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"invalidManifest": "Estensione non valida: package.json non è un file JSON.",
-	"incompatible": "Impossibile installare l'estensione '{0}' in quanto non è compatibile con VS Code '{1}'.",
-	"restartCode": "Riavviare Code prima di reinstallare {0}.",
-	"installingOutdatedExtension": "Una versione più recente di questa estensione è già installata. Vuoi eseguire l'override di questa con la versione precedente?",
-	"override": "Eseguire l'override",
-	"cancel": "Annulla",
-	"errorInstallingDependencies": "Errore durante l'installazione delle dipendenze. {0}",
-	"MarketPlaceDisabled": "Il Marketplace non è abilitato",
-	"removeError": "Errore durante la rimozione dell'estensione: {0}. Chiudere e riavviare VS Code prima di riprovare.",
-	"Not a Marketplace extension": "Solo le Estensioni del Marketplace possono essere reinstallate",
-	"notFoundCompatible": "Impossibile installare '{0}'; non è presente alcuna versione compatibile con VS Code '{1}'.",
-	"malicious extension": "Non è possibile installare l'estensione poiché è stata segnalata come problematica.",
-	"notFoundCompatibleDependency": "Impossibile installare perché non è stata trovata l'estensione dipendente '{0}' compatibile con la versione corrente '{1}' di VS Code.",
-	"quitCode": "Impossibile installare l'estensione. Riavviare VS Code prima di procedere ad un nuovo setup.",
-	"exitCode": "Impossibile installare l'estensione. Riavviare VS Code prima di procedere ad un nuovo setup.",
-	"renameError": "Errore sconosciuto durante la ridenominazione di {0} in {1}",
-	"uninstallDependeciesConfirmation": "Disinstallare solo '{0}' o anche le relative dipendenze?",
-	"uninstallOnly": "Solo Estensioni",
-	"uninstallAll": "Disinstalla tutti",
-	"singleDependentError": "Non è possibile disinstallare l'estensione '{0}'. L'estensione '{1}' dipende da tale estensione.",
-	"twoDependentsError": "Non è possibile disinstallare l'estensione '{0}'. Le estensioni '{1}' e '{2}' dipendono da tale estensione.",
-	"multipleDependentsError": "Non è possibile disinstallare l'estensione '{0}'. Alcune estensioni, tra cui '{1}' e '{2}' dipendono da tale estensione.",
-	"notExists": "L'estensione non è stata trovata"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/platform/extensions/common/abstractExtensionService.i18n.json b/i18n/ita/src/vs/platform/extensions/common/abstractExtensionService.i18n.json
deleted file mode 100644
index be99767feaa..00000000000
--- a/i18n/ita/src/vs/platform/extensions/common/abstractExtensionService.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"unknownDep": "L'attivazione dell'estensione `{1}` non è riuscita. Motivo: la dipendenza `{0}` è sconosciuta.",
-	"failedDep1": "L'attivazione dell'estensione `{1}` non è riuscita. Motivo: non è stato possibile attivare la dipendenza `{0}`.",
-	"failedDep2": "L'attivazione dell'estensione `{0}` non è riuscita. Motivo: sono presenti più di 10 livelli di dipendenze (molto probabilmente un ciclo di dipendenze).",
-	"activationError": "L'attivazione dell'estensione `{0}` non è riuscita: {1}."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/platform/extensions/common/extensionsRegistry.i18n.json b/i18n/ita/src/vs/platform/extensions/common/extensionsRegistry.i18n.json
deleted file mode 100644
index f793c5994e0..00000000000
--- a/i18n/ita/src/vs/platform/extensions/common/extensionsRegistry.i18n.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.engines.vscode": "Per le estensioni di Visual Studio Code consente di specificare la versione di Visual Studio Code con cui è compatibile l'estensione. Non può essere *. Ad esempio: ^0.10.5 indica la compatibilità con la versione minima 0.10.5 di Visual Studio Code.",
-	"vscode.extension.publisher": "Editore dell'estensione Visual Studio Code.",
-	"vscode.extension.displayName": "Nome visualizzato per l'estensione usato nella raccolta di Visual Studio Code.",
-	"vscode.extension.categories": "Categorie usate dalla raccolta di Visual Studio Code per definire la categoria dell'estensione.",
-	"vscode.extension.galleryBanner": "Banner usato nel marketplace di Visual Studio Code.",
-	"vscode.extension.galleryBanner.color": "Colore del banner nell'intestazione pagina del marketplace di Visual Studio Code.",
-	"vscode.extension.galleryBanner.theme": "Tema colori per il tipo di carattere usato nel banner.",
-	"vscode.extension.contributes": "Tutti i contributi dell'estensione Visual Studio Code rappresentati da questo pacchetto.",
-	"vscode.extension.preview": "Imposta l'estensione in modo che venga contrassegnata come Anteprima nel Marketplace.",
-	"vscode.extension.activationEvents": "Eventi di attivazione per l'estensione Visual Studio Code.",
-	"vscode.extension.activationEvents.onLanguage": "Un evento di attivazione emesso ogni volta che viene aperto un file che risolve nella lingua specificata.",
-	"vscode.extension.activationEvents.onCommand": "Un evento di attivazione emesso ogni volta che viene invocato il comando specificato.",
-	"vscode.extension.activationEvents.onDebug": "Un evento di attivazione emesso ogni volta che un utente sta per avviare il debug o sta per impostare le configurazioni di debug.",
-	"vscode.extension.activationEvents.onDebugInitialConfigurations": "Un evento di attivazione emesso ogni volta che un \"launch.json\" deve essere creato (e tutti i metodi di provideDebugConfigurations devono essere chiamati).",
-	"vscode.extension.activationEvents.onDebugResolve": "Un evento di attivazione emesso ogni volta che una sessione di debug di tipo specifico sta per essere lanciata (e un corrispondente metodo resolveDebugConfiguration deve essere chiamato).",
-	"vscode.extension.activationEvents.workspaceContains": "Un evento di attivazione emesso ogni volta che si apre una cartella che contiene almeno un file corrispondente al criterio GLOB specificato.",
-	"vscode.extension.activationEvents.onView": "Un evento di attivazione emesso ogni volta che la visualizzazione specificata viene espansa.",
-	"vscode.extension.activationEvents.star": "Un evento di attivazione emesso all'avvio di VS Code. Per garantire la migliore esperienza per l'utente finale, sei pregato di utilizzare questo evento di attivazione nella tua estensione solo quando nessun'altra combinazione di eventi di attivazione funziona nel tuo caso.",
-	"vscode.extension.badges": "Matrice di notifiche da visualizzare nella barra laterale della pagina delle estensioni del Marketplace.",
-	"vscode.extension.badges.url": "URL di immagine della notifica.",
-	"vscode.extension.badges.href": "Collegamento della notifica.",
-	"vscode.extension.badges.description": "Descrizione della notifica.",
-	"vscode.extension.extensionDependencies": "Dipendenze ad altre estensioni. L'identificatore di un'estensione è sempre ${publisher}.${name}. Ad esempio: vscode.csharp.",
-	"vscode.extension.scripts.prepublish": "Script eseguito prima che il pacchetto venga pubblicato come estensione Visual Studio Code.",
-	"vscode.extension.icon": "Percorso di un'icona da 128x128 pixel."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/platform/extensions/node/extensionValidator.i18n.json b/i18n/ita/src/vs/platform/extensions/node/extensionValidator.i18n.json
deleted file mode 100644
index d391b80504f..00000000000
--- a/i18n/ita/src/vs/platform/extensions/node/extensionValidator.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"versionSyntax": "Non è stato possibile analizzare il valore {0} di `engines.vscode`. Usare ad esempio: ^1.22.0, ^1.22.x e così via.",
-	"versionSpecificity1": "La versione specificata in `engines.vscode` ({0}) non è abbastanza specifica. Per le versioni di vscode precedenti alla 1.0.0, definire almeno le versioni principale e secondaria desiderate, ad esempio ^0.10.0, 0.10.x, 0.11.0 e così via.",
-	"versionSpecificity2": "La versione specificata in `engines.vscode` ({0}) non è abbastanza specifica. Per le versioni di vscode successive alla 1.0.0, definire almeno la versione principale desiderata, ad esempio ^1.10.0, 1.10.x, 1.x.x, 2.x.x e così via.",
-	"versionMismatch": "L'estensione non è compatibile con Visual Studio Code {0}. Per l'estensione è richiesto: {1}."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/platform/history/electron-main/historyMainService.i18n.json b/i18n/ita/src/vs/platform/history/electron-main/historyMainService.i18n.json
deleted file mode 100644
index 2a1d7b316e5..00000000000
--- a/i18n/ita/src/vs/platform/history/electron-main/historyMainService.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"newWindow": "Nuova finestra",
-	"newWindowDesc": "Apre una nuova finestra",
-	"recentFolders": "Aree di lavoro recenti",
-	"folderDesc": "{0} {1}",
-	"codeWorkspace": "Area di lavoro del codice"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/platform/integrity/node/integrityServiceImpl.i18n.json b/i18n/ita/src/vs/platform/integrity/node/integrityServiceImpl.i18n.json
deleted file mode 100644
index 7abef1dc4df..00000000000
--- a/i18n/ita/src/vs/platform/integrity/node/integrityServiceImpl.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"integrity.prompt": "L'installazione di {0} sembra danneggiata. Reinstallare.",
-	"integrity.moreInformation": "Altre informazioni",
-	"integrity.dontShowAgain": "Non visualizzare più questo messaggio"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/platform/issue/electron-main/issueService.i18n.json b/i18n/ita/src/vs/platform/issue/electron-main/issueService.i18n.json
deleted file mode 100644
index a87b943cffc..00000000000
--- a/i18n/ita/src/vs/platform/issue/electron-main/issueService.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"issueReporter": "Rapporti di issue",
-	"processExplorer": "Esplora processi"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/platform/jsonschemas/common/jsonValidationExtensionPoint.i18n.json b/i18n/ita/src/vs/platform/jsonschemas/common/jsonValidationExtensionPoint.i18n.json
deleted file mode 100644
index d1d60c618b4..00000000000
--- a/i18n/ita/src/vs/platform/jsonschemas/common/jsonValidationExtensionPoint.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"contributes.jsonValidation": "Configurazione dello schema JSON per contributes.",
-	"contributes.jsonValidation.fileMatch": "Criteri dei file da soddisfare, ad esempio \"package.json\" o \"*.launch\".",
-	"contributes.jsonValidation.url": "URL dello schema ('http:', 'https:') o percorso relativo della cartella delle estensioni ('./').",
-	"invalid.jsonValidation": "'configuration.jsonValidation' deve essere una matrice",
-	"invalid.fileMatch": "'configuration.jsonValidation.fileMatch' deve essere definito",
-	"invalid.url": "'configuration.jsonValidation.url' deve essere un URL o un percorso relativo",
-	"invalid.url.fileschema": "'configuration.jsonValidation.url' è un URL relativo non valido: {0}",
-	"invalid.url.schema": "'configuration.jsonValidation.url' deve iniziare con 'http:', 'https:' o './' per fare riferimento agli schemi presenti nell'estensione"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/platform/keybinding/common/abstractKeybindingService.i18n.json b/i18n/ita/src/vs/platform/keybinding/common/abstractKeybindingService.i18n.json
deleted file mode 100644
index cd87c72cd48..00000000000
--- a/i18n/ita/src/vs/platform/keybinding/common/abstractKeybindingService.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"first.chord": "È stato premuto ({0}). In attesa del secondo tasto...",
-	"missing.chord": "La combinazione di tasti ({0}, {1}) non è un comando."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/platform/keybinding/common/keybindingLabels.i18n.json b/i18n/ita/src/vs/platform/keybinding/common/keybindingLabels.i18n.json
deleted file mode 100644
index e88e90ec703..00000000000
--- a/i18n/ita/src/vs/platform/keybinding/common/keybindingLabels.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"ctrlKey": "CTRL",
-	"shiftKey": "MAIUSC",
-	"altKey": "ALT",
-	"windowsKey": "Windows",
-	"ctrlKey.long": "CTRL",
-	"shiftKey.long": "MAIUSC",
-	"altKey.long": "ALT",
-	"cmdKey.long": "Comando",
-	"windowsKey.long": "Windows"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/platform/list/browser/listService.i18n.json b/i18n/ita/src/vs/platform/list/browser/listService.i18n.json
deleted file mode 100644
index 8a43e89f813..00000000000
--- a/i18n/ita/src/vs/platform/list/browser/listService.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"workbenchConfigurationTitle": "Area di lavoro",
-	"multiSelectModifier.ctrlCmd": "Rappresenta il tasto 'Control' (ctrl) su Windows e Linux e il tasto 'Comando' (cmd) su OSX.",
-	"multiSelectModifier.alt": "Rappresenta il tasto 'Alt' su Windows e Linux e il tasto 'Opzione' su OSX.",
-	"multiSelectModifier": "Modificatore da usare per aggiungere un elemento in alberi ed elenchi a una selezione multipla con il mouse (ad esempio editor aperti e visualizzazione Gestione controllo servizi in Esplora risorse). 'ctrlCmd' rappresenta il tasto 'CTRL' in Windows e Linux e  il tasto 'Cmd' in OSX. I gesti del mouse Apri lateralmente, se supportati, si adatteranno in modo da non entrare in conflitto con il modificatore di selezione multipla.",
-	"openMode.singleClick": "Apre elementi facendo un singolo clic col mouse.",
-	"openMode.doubleClick": "Apre elementi facendo doppio clic col mouse.",
-	"openModeModifier": "Controlla la modalità di apertura degli elementi in alberi ed elenchi con il mouse, se supportata. Impostare su `singleClick` per aprire gli elementi con un unico clic del mouse e `doubleClick` per aprirli solo se viene fatto doppio clic. Per gli elementi padre con elementi figlio negli alberi, questa impostazione controllerà se per espandere l'elemento padre è necessario fare clic una sola volta o fare doppio clic. Tenere presente che alcuni alberi ed elenchi potrebbero scegliere di ignorare questa impostazione se non è applicabile. ",
-	"horizontalScrolling setting": "Controlla se gli alberi supportano lo scorrimento orizzontale in workbench."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/platform/localizations/common/localizations.i18n.json b/i18n/ita/src/vs/platform/localizations/common/localizations.i18n.json
deleted file mode 100644
index 9a74ccf77b6..00000000000
--- a/i18n/ita/src/vs/platform/localizations/common/localizations.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.contributes.localizations": "Contribuisce traduzioni all'editor",
-	"vscode.extension.contributes.localizations.languageId": "Id della lingua in cui sono tradotte le stringhe visualizzate.",
-	"vscode.extension.contributes.localizations.languageName": "Nome della lingua in inglese.",
-	"vscode.extension.contributes.localizations.languageNameLocalized": "Nome della lingua nella lingua stessa.",
-	"vscode.extension.contributes.localizations.translations": "Lista delle traduzioni associate alla lingua.",
-	"vscode.extension.contributes.localizations.translations.id": "ID di VS Code o dell'estensione cui si riferisce questa traduzione. L'ID di VS Code è sempre 'vscode' e quello di un'estensione deve essere nel formato 'publisherId.extensionName'.",
-	"vscode.extension.contributes.localizations.translations.id.pattern": "L'ID deve essere 'vscode' o essere nel formato 'publisherId.extensionName' per tradurre rispettivamente VS Code o un'estensione.",
-	"vscode.extension.contributes.localizations.translations.path": "Percorso relativo di un file che contiene le traduzioni per la lingua."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/platform/markers/common/markers.i18n.json b/i18n/ita/src/vs/platform/markers/common/markers.i18n.json
deleted file mode 100644
index f585e5046c6..00000000000
--- a/i18n/ita/src/vs/platform/markers/common/markers.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"sev.error": "Errore",
-	"sev.warning": "Avviso",
-	"sev.info": "Informazioni"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/platform/markers/common/problemMatcher.i18n.json b/i18n/ita/src/vs/platform/markers/common/problemMatcher.i18n.json
deleted file mode 100644
index 42d882ec6a9..00000000000
--- a/i18n/ita/src/vs/platform/markers/common/problemMatcher.i18n.json
+++ /dev/null
@@ -1,72 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"ProblemPatternParser.loopProperty.notLast": "La proprietà loop è supportata solo sul matcher dell'ultima riga.",
-	"ProblemPatternParser.problemPattern.missingRegExp": "Nel criterio del problema manca un'espressione regolare.",
-	"ProblemPatternParser.problemPattern.missingProperty": "Il criterio del problema non è valido. Deve includere almeno un gruppo di corrispondenze di tipo file, messaggio e riga o posizione.",
-	"ProblemPatternParser.invalidRegexp": "Errore: la stringa {0} non è un'espressione regolare valida.\n",
-	"ProblemPatternSchema.regexp": "Espressione regolare per trovare un messaggio di tipo errore, avviso o info nell'output.",
-	"ProblemPatternSchema.file": "Indice del gruppo di corrispondenze del nome file. Se omesso, viene usato 1.",
-	"ProblemPatternSchema.location": "Indice del gruppo di corrispondenze della posizione del problema. I criteri di posizione validi sono: (line), (line,column) e (startLine,startColumn,endLine,endColumn). Se omesso, si presuppone che sia impostato su (line,column).",
-	"ProblemPatternSchema.line": "Indice del gruppo di corrispondenze della riga del problema. Il valore predefinito è 2",
-	"ProblemPatternSchema.column": "Indice del gruppo di corrispondenze del carattere di riga del problema. Il valore predefinito è 3",
-	"ProblemPatternSchema.endLine": "Indice del gruppo di corrispondenze della riga finale del problema. Il valore predefinito è undefined",
-	"ProblemPatternSchema.endColumn": "Indice del gruppo di corrispondenze del carattere di fine riga del problema. Il valore predefinito è undefined",
-	"ProblemPatternSchema.severity": "Indice del gruppo di corrispondenze della gravità del problema. Il valore predefinito è undefined",
-	"ProblemPatternSchema.code": "Indice del gruppo di corrispondenze del codice del problema. Il valore predefinito è undefined",
-	"ProblemPatternSchema.message": "Indice del gruppo di corrispondenze del messaggio. Se omesso, il valore predefinito è 4 se si specifica la posizione; in caso contrario, il valore predefinito è 5.",
-	"ProblemPatternSchema.loop": "In un matcher di più righe il ciclo indica se questo criterio viene eseguito in un ciclo finché esiste la corrispondenza. Può essere specificato solo come ultimo criterio in un criterio su più righe.",
-	"NamedProblemPatternSchema.name": "Nome del criterio di problema.",
-	"NamedMultiLineProblemPatternSchema.name": "Nome del criterio di problema a più righe.",
-	"NamedMultiLineProblemPatternSchema.patterns": "Criteri effettivi.",
-	"ProblemPatternExtPoint": "Aggiunge come contributo i criteri di problema",
-	"ProblemPatternRegistry.error": "Il criterio di problema non è valido e verrà ignorato.",
-	"ProblemMatcherParser.noProblemMatcher": "Errore: la descrizione non può essere convertita in un matcher problemi:\n{0}\n",
-	"ProblemMatcherParser.noProblemPattern": "Errore: la descrizione non definisce un criterio problema valido:\n{0}\n",
-	"ProblemMatcherParser.noOwner": "Errore: la descrizione non definisce un proprietario:\n{0}\n",
-	"ProblemMatcherParser.noFileLocation": "Errore: la descrizione non definisce un percorso file:\n{0}\n",
-	"ProblemMatcherParser.unknownSeverity": "Info: gravità {0} sconosciuta. I valori validi sono errore, avviso e info.\n",
-	"ProblemMatcherParser.noDefinedPatter": "Errore: il criterio con identificatore {0} non esiste.",
-	"ProblemMatcherParser.noIdentifier": "Errore: la proprietà del criterio fa riferimento a un identificatore vuoto.",
-	"ProblemMatcherParser.noValidIdentifier": "Errore: la proprietà {0} del criterio non è un nome di variabile criterio valido.",
-	"ProblemMatcherParser.problemPattern.watchingMatcher": "Un matcher problemi deve definire un criterio di inizio e un criterio di fine per il controllo.",
-	"ProblemMatcherParser.invalidRegexp": "Errore: la stringa {0} non è un'espressione regolare valida.\n",
-	"WatchingPatternSchema.regexp": "L'espressione regolare per rilevare l'inizio o la fine di un'attività in background.",
-	"WatchingPatternSchema.file": "Indice del gruppo di corrispondenze del nome file. Può essere omesso.",
-	"PatternTypeSchema.name": "Nome di un criterio predefinito o aggiunto come contributo",
-	"PatternTypeSchema.description": "Criterio di problema o nome di un criterio di problema predefinito o aggiunto come contributo. Può essere omesso se si specifica base.",
-	"ProblemMatcherSchema.base": "Nome di un matcher problemi di base da usare.",
-	"ProblemMatcherSchema.owner": "Proprietario del problema in Visual Studio Code. Può essere omesso se si specifica base. Se è omesso e non si specifica base, viene usato il valore predefinito 'external'.",
-	"ProblemMatcherSchema.severity": "Gravità predefinita per i problemi di acquisizione. Viene usato se il criterio non definisce un gruppo di corrispondenze per la gravità.",
-	"ProblemMatcherSchema.applyTo": "Controlla se un problema segnalato in un documento di testo è valido solo per i documenti aperti o chiusi oppure per tutti i documenti.",
-	"ProblemMatcherSchema.fileLocation": "Consente di definire come interpretare i nomi file indicati in un criterio di problema.",
-	"ProblemMatcherSchema.background": "Criteri per tenere traccia dell'inizio e della fine di un matcher attivo su un'attività in background.",
-	"ProblemMatcherSchema.background.activeOnStart": "Se impostato a true, il monitor in backbround è in modalità attiva quando l'attività inizia. Equivale a inviare una riga che corrisponde al beginPattern",
-	"ProblemMatcherSchema.background.beginsPattern": "Se corrisponde nell'output, viene segnalato l'avvio di un'attività in background.",
-	"ProblemMatcherSchema.background.endsPattern": "Se corrisponde nell'output, viene segnalata la fine di un'attività in background.",
-	"ProblemMatcherSchema.watching.deprecated": "La proprietà watching è deprecata. In alternativa, utilizzare background (sfondo).",
-	"ProblemMatcherSchema.watching": "Criteri per tenere traccia dell'inizio e della fine di un matcher watching.",
-	"ProblemMatcherSchema.watching.activeOnStart": "Se impostato su true, indica che il watcher è in modalità attiva all'avvio dell'attività. Equivale a inviare una riga che corrisponde al criterio di avvio",
-	"ProblemMatcherSchema.watching.beginsPattern": "Se corrisponde nell'output, viene segnalato l'avvio di un'attività di controllo.",
-	"ProblemMatcherSchema.watching.endsPattern": "Se corrisponde nell'output, viene segnalata la fine di un'attività di controllo.",
-	"LegacyProblemMatcherSchema.watchedBegin.deprecated": "Questa proprietà è deprecata. In alternativa, usare la proprietà watching.",
-	"LegacyProblemMatcherSchema.watchedBegin": "Espressione regolare con cui viene segnalato l'avvio dell'esecuzione di un'attività controllata attivato tramite il controllo dei file.",
-	"LegacyProblemMatcherSchema.watchedEnd.deprecated": "Questa proprietà è deprecata. In alternativa, usare la proprietà watching.",
-	"LegacyProblemMatcherSchema.watchedEnd": "Espressione regolare con cui viene segnalato il termine dell'esecuzione di un'attività controllata.",
-	"NamedProblemMatcherSchema.name": "Nome del matcher problemi utilizzato per riferirsi ad esso.",
-	"NamedProblemMatcherSchema.label": "Un'etichetta leggibile del matcher problemi.",
-	"ProblemMatcherExtPoint": "Aggiunge come contributo i matcher problemi",
-	"msCompile": "Problemi del compilatore di Microsoft",
-	"lessCompile": "Problemi Less",
-	"gulp-tsc": "Problemi TSC Gulp",
-	"jshint": "Problemi JSHint",
-	"jshint-stylish": "Problemi di stile di JSHint",
-	"eslint-compact": "Problemi di compattazione di ESLint",
-	"eslint-stylish": "Problemi di stile di ESLint",
-	"go": "Problemi di Go"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/platform/message/common/message.i18n.json b/i18n/ita/src/vs/platform/message/common/message.i18n.json
deleted file mode 100644
index 5361700d443..00000000000
--- a/i18n/ita/src/vs/platform/message/common/message.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"close": "Chiudi",
-	"later": "In seguito",
-	"cancel": "Annulla",
-	"moreFile": "...1 altro file non visualizzato",
-	"moreFiles": "...{0} altri file non visualizzati"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/platform/node/minimalTranslations.i18n.json b/i18n/ita/src/vs/platform/node/minimalTranslations.i18n.json
deleted file mode 100644
index 248dd2ff32a..00000000000
--- a/i18n/ita/src/vs/platform/node/minimalTranslations.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"showLanguagePackExtensions": "VS Code è disponibile in {0}. Cercare i language packs nel Marketplace per iniziare.",
-	"searchMarketplace": "Cerca nel Marketplace",
-	"installAndRestartMessage": "Codice VS è disponibile in {0}. Installare il language pack per iniziare. È necessario un riavvio.",
-	"installAndRestart": "Installa e riavvia"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/platform/request/node/request.i18n.json b/i18n/ita/src/vs/platform/request/node/request.i18n.json
deleted file mode 100644
index c64f2d3020e..00000000000
--- a/i18n/ita/src/vs/platform/request/node/request.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"httpConfigurationTitle": "HTTP",
-	"proxy": "Impostazione proxy da usare. Se non è impostata, verrà ottenuta dalle variabili di ambiente http_proxy e https_proxy",
-	"strictSSL": "Indica se il certificato del server proxy deve essere verificato in base all'elenco di CA specificate.",
-	"proxyAuthorization": "Valore da inviare come intestazione 'Proxy-Authorization' per ogni richiesta di rete."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/platform/telemetry/common/telemetryService.i18n.json b/i18n/ita/src/vs/platform/telemetry/common/telemetryService.i18n.json
deleted file mode 100644
index 316dd1f9317..00000000000
--- a/i18n/ita/src/vs/platform/telemetry/common/telemetryService.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"telemetryConfigurationTitle": "Telemetria",
-	"telemetry.enableTelemetry": "Consente l'invio di errori e dati sull'utilizzo a Microsoft."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/platform/theme/common/colorExtensionPoint.i18n.json b/i18n/ita/src/vs/platform/theme/common/colorExtensionPoint.i18n.json
deleted file mode 100644
index 3c84f247f78..00000000000
--- a/i18n/ita/src/vs/platform/theme/common/colorExtensionPoint.i18n.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"contributes.color": "Aggiunge colori tematizzabili alle estensioni definite",
-	"contributes.color.id": "Identificatore del colore che supporta i temi",
-	"contributes.color.id.format": "Gli identificativi devono rispettare il formato aa[.bb]*",
-	"contributes.color.description": "Descrizione del colore che supporta i temi",
-	"contributes.defaults.light": "Colore predefinito per i temi chiari. Può essere un valore di colore in formato esadecimale (#RRGGBB[AA]) oppure l'identificativo di un colore che supporta i temi e fornisce l'impostazione predefinita.",
-	"contributes.defaults.dark": "Colore predefinito per i temi scuri. Può essere un valore di colore in formato esadecimale (#RRGGBB[AA]) oppure l'identificativo di un colore che supporta i temi e fornisce l'impostazione predefinita.",
-	"contributes.defaults.highContrast": "Colore predefinito per i temi a contrasto elevato. Può essere un valore di colore in formato esadecimale (#RRGGBB[AA]) oppure l'identificativo di un colore che supporta i temi e fornisce l'impostazione predefinita.",
-	"invalid.colorConfiguration": "'configuration.colors' deve essere un array",
-	"invalid.default.colorType": "{0} deve essere un valore di colore in formato esadecimale (#RRGGBB [AA] o #RGB[A]) o l'identificativo di un colore che supporta i temi e che fornisce il valore predefinito. ",
-	"invalid.id": "'configuration.colors.id' deve essere definito e non può essere vuoto",
-	"invalid.id.format": "'configuration.colors.id' deve essere specificato dopo parola[.parola]*",
-	"invalid.description": "'configuration.colors.description' deve essere definito e non può essere vuoto",
-	"invalid.defaults": "'configuration.colors.defaults' deve essere definito e deve contenere 'light', 'dark' e 'highContrast'"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/platform/theme/common/colorRegistry.i18n.json b/i18n/ita/src/vs/platform/theme/common/colorRegistry.i18n.json
deleted file mode 100644
index db040b20535..00000000000
--- a/i18n/ita/src/vs/platform/theme/common/colorRegistry.i18n.json
+++ /dev/null
@@ -1,101 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"schema.colors": "Colori usati nell'area di lavoro.",
-	"foreground": "Colore primo piano. Questo colore è utilizzato solo se non viene sovrascritto da un componente.",
-	"errorForeground": "Colore primo piano globale per i messaggi di errore. Questo colore è utilizzato solamente se non viene sottoposto a override da un componente.",
-	"descriptionForeground": "Colore primo piano del testo che fornisce informazioni aggiuntive, ad esempio per un'etichetta di testo.",
-	"focusBorder": "Colore dei bordi degli elementi evidenziati. Questo colore è utilizzato solo se non viene sovrascritto da un componente.",
-	"contrastBorder": "Un bordo supplementare attorno agli elementi per contrastarli maggiormente rispetto agli altri.",
-	"activeContrastBorder": "Un bordo supplementare intorno agli elementi attivi per contrastarli maggiormente rispetto agli altri.",
-	"selectionBackground": "Il colore di sfondo delle selezioni di testo nel workbench (ad esempio per i campi di input o aree di testo). Si noti che questo non si applica alle selezioni all'interno dell'editor.",
-	"textSeparatorForeground": "Colore dei separatori di testo.",
-	"textLinkForeground": "Colore primo piano dei link nel testo.",
-	"textLinkActiveForeground": "Colore di primo piano per i link nel testo cliccati o sotto il mouse.",
-	"textPreformatForeground": "Colore primo piano dei segmenti di testo preformattato.",
-	"textBlockQuoteBackground": "Colore di sfondo per le citazioni nel testo.",
-	"textBlockQuoteBorder": "Colore bordo per citazioni nel testo.",
-	"textCodeBlockBackground": "Colore sfondo per blocchi di codice nel testo.",
-	"widgetShadow": "Colore ombreggiatura dei widget, ad es. Trova/Sostituisci all'interno dell'editor.",
-	"inputBoxBackground": "Sfondo della casella di input.",
-	"inputBoxForeground": "Primo piano della casella di input.",
-	"inputBoxBorder": "Bordo della casella di input.",
-	"inputBoxActiveOptionBorder": "Colore del bordo di opzioni attivate nei campi di input.",
-	"inputPlaceholderForeground": "Colore primo piano di casella di input per il testo segnaposto.",
-	"inputValidationInfoBackground": "Colore di sfondo di convalida dell'input di tipo Informazione.",
-	"inputValidationInfoBorder": "Colore bordo di convalida dell'input di tipo Informazione.",
-	"inputValidationWarningBackground": "Colore di sfondo di convalida dell'input di tipo Avviso.",
-	"inputValidationWarningBorder": "Colore bordo di convalida dell'input di tipo Avviso.",
-	"inputValidationErrorBackground": "Colore di sfondo di convalida dell'input di tipo Errore.",
-	"inputValidationErrorBorder": "Colore bordo di convalida dell'input di tipo Errore.",
-	"dropdownBackground": "Sfondo dell'elenco a discesa.",
-	"dropdownListBackground": "Sfondo dell'elenco a discesa.",
-	"dropdownForeground": "Primo piano dell'elenco a discesa.",
-	"dropdownBorder": "Bordo dell'elenco a discesa.",
-	"listFocusBackground": "Colore sfondo Elenco/Struttura ad albero per l'elemento evidenziato quando l'Elenco/Struttura ad albero è attivo. Un Elenco/Struttura ad albero attivo\nha il focus della tastiera, uno inattivo no.",
-	"listFocusForeground": "Colore primo piano Elenco/Struttura ad albero per l'elemento con stato attivo quando l'Elenco/Struttura ad albero è attivo. Un Elenco/Struttura ad albero attivo\nha il focus della tastiera, uno inattivo no.",
-	"listActiveSelectionBackground": "Colore sfondo Elenco/Struttura ad albero per l'elemento selezionato quando l'Elenco/Struttura ad albero è attivo. Un Elenco/Struttura ad albero attivo\nha il focus della tastiera, uno inattivo no.",
-	"listActiveSelectionForeground": "Colore primo piano Elenco/Struttura ad albero per l'elemento selezionato quando l'Elenco/Struttura ad albero è attivo. Un Elenco/Struttura ad albero attivo\nha il focus della tastiera, uno inattivo no.",
-	"listInactiveSelectionBackground": "Colore sfondo Elenco/Struttura ad albero per l'elemento selezionato quando l'Elenco/Struttura ad albero è inattivo. Un Elenco/Struttura ad albero attivo\nha il focus della tastiera, uno inattivo no.",
-	"listInactiveSelectionForeground": "Colore primo piano Elenco/Struttura ad albero per l'elemento selezionato quando l'Elenco/Struttura ad albero è inattivo. Un Elenco/Struttura ad albero attivo\nha il focus della tastiera, uno inattivo no.",
-	"listHoverBackground": "Sfondo Elenco/Struttura ad albero al passaggio del mouse sugli elementi.",
-	"listHoverForeground": "Primo piano Elenco/Struttura ad albero al passaggio del mouse sugli elementi.",
-	"listDropBackground": "Sfondo Elenco/Struttura ad albero durante il trascinamento degli elementi selezionati.",
-	"highlight": "Colore primo piano Elenco/Struttura ad albero delle occorrenze trovate durante la ricerca nell'Elenco/Struttura ad albero.",
-	"invalidItemForeground": "Colore di primo piano di Elenco/Struttura ad albero per gli elementi non validi, ad esempio una radice non risolta in Esplora.",
-	"listErrorForeground": "Colore di primo piano della lista degli errori.",
-	"listWarningForeground": "Colore di primo piano della lista delle warning.",
-	"pickerGroupForeground": "Colore di selezione rapida per il raggruppamento delle etichette.",
-	"pickerGroupBorder": "Colore di selezione rapida per il raggruppamento dei bordi.",
-	"buttonForeground": "Colore primo piano del pulsante.",
-	"buttonBackground": "Colore di sfondo del pulsante.",
-	"buttonHoverBackground": "Colore di sfondo del pulsante al passaggio del mouse.",
-	"badgeBackground": "Colore di sfondo del badge. I badge sono piccole etichette informative, ad esempio per mostrare il conteggio dei risultati di una ricerca.",
-	"badgeForeground": "Colore primo piano del badge. I badge sono piccole etichette informative, ad esempio per mostrare il conteggio dei risultati di una ricerca.",
-	"scrollbarShadow": "Ombra di ScrollBar per indicare lo scorrimento della visualizzazione.",
-	"scrollbarSliderBackground": "Colore di sfondo dello slider della barra di scorrimento.",
-	"scrollbarSliderHoverBackground": "Colore di sfondo dello Slider della Barra di scorrimento al passaggio del mouse.",
-	"scrollbarSliderActiveBackground": "Colore di sfondo del cursore della barra di scorrimento quando cliccata.",
-	"progressBarBackground": "Colore di sfondo dell'indicatore di stato che può essere mostrato durante l'esecuzione di operazioni lunghe.",
-	"editorBackground": "Colore di sfondo dell'editor.",
-	"editorForeground": "Colore primo piano predefinito dell'editor.",
-	"editorWidgetBackground": "Colore di sfondo dei widget dell'editor, ad esempio Trova/Sostituisci.",
-	"editorWidgetBorder": "Colore bordo dei widget dell'editor. Il colore viene utilizzato solo se il widget sceglie di avere un bordo e se il colore non è sottoposto a override da un widget.",
-	"editorSelectionBackground": "Colore della selezione dell'editor.",
-	"editorSelectionForeground": "Colore del testo selezionato per il contrasto elevato.",
-	"editorInactiveSelection": "Colore della selezione in un editor non attivo. Il colore non deve essere opaco per evitare di nascondere le decorazioni sottostanti.",
-	"editorSelectionHighlight": "Colore delle aree con lo stesso contenuto della selezione. Il colore non deve essere opaco per evitare di nascondere le decorazioni sottostanti.",
-	"editorSelectionHighlightBorder": "Colore del bordo delle regioni con lo stesso contenuto della selezione.",
-	"editorFindMatch": "Colore della corrispondenza di ricerca corrente.",
-	"findMatchHighlight": "Colore degli altri risultati della ricerca. Il colore non deve essere opaco per evitare di nascondere le decorazioni sottostanti.",
-	"findRangeHighlight": "Colore dell'intervallo di limite della ricerca. Il colore non deve essere opaco per non nascondere decorazioni sottostanti.",
-	"editorFindMatchBorder": "Colore del bordo della corrispondenza della ricerca corrente.",
-	"findMatchHighlightBorder": "Colore del bordo delle altre corrispondenze della ricerca.",
-	"findRangeHighlightBorder": "Colore del bordo dell'intervallo di limite della ricerca. Il colore non deve essere opaco per non nascondere decorazioni sottostanti.",
-	"findWidgetResizeBorder": "Colore del bordo della barra di ridimensionamento del comando trova.",
-	"hoverHighlight": "Evidenziazione sotto la parola per cui è visualizzata un'area sensibile al passaggio del mouse. Il colore non deve essere opaco per evitare di nascondere le decorazioni sottostanti.",
-	"hoverBackground": "Colore di sfondo dell'area sensibile al passaggio del mouse dell'editor.",
-	"hoverBorder": "Colore del bordo dell'area sensibile al passaggio del mouse dell'editor.",
-	"activeLinkForeground": "Colore dei collegamenti attivi.",
-	"diffEditorInserted": "Colore di sfondo per il testo che è stato inserito. Il colore non deve essere opaco per non nascondere le decorazioni sottostanti.",
-	"diffEditorRemoved": "Colore di sfondo per il testo che è stato rimosso. Il colore non deve essere opaco per non nascondere le decorazioni sottostanti.",
-	"diffEditorInsertedOutline": "Colore del contorno del testo che è stato inserito.",
-	"diffEditorRemovedOutline": "Colore del contorno del testo che è stato rimosso.",
-	"mergeCurrentHeaderBackground": "Sfondo intestazione corrente in conflitti di merge in linea. Il colore non deve essere opaco per evitare di nascondere le decorazioni sottostanti.",
-	"mergeCurrentContentBackground": "Sfondo contenuto corrente in conflitti di merge in linea. Il colore non deve essere opaco per evitare di nascondere le decorazioni sottostanti.",
-	"mergeIncomingHeaderBackground": "Sfondo intestazione modifica in ingresso in conflitti di merge in linea. Il colore non deve essere opaco per evitare di nascondere le decorazioni sottostanti.",
-	"mergeIncomingContentBackground": "Sfondo contenuto modifica in ingresso in conflitti di merge in linea. Il colore non deve essere opaco per evitare di nascondere le decorazioni sottostanti.",
-	"mergeCommonHeaderBackground": "Sfondo dell'intestazione dell'antenato comune nei conflitti di merge in linea. Il colore non deve essere opaco per evitare di nascondere le decorazioni sottostanti.",
-	"mergeCommonContentBackground": "Sfondo del contenuto del predecessore comune in conflitti di merge in line. Il colore non deve essere opaco per non nascondere decorazioni sottostanti.",
-	"mergeBorder": "Colore bordo su intestazioni e sulla barra di divisione di conflitti di merge in linea.",
-	"overviewRulerCurrentContentForeground": "Colore primo piano righello panoramica attuale per i conflitti di merge in linea.",
-	"overviewRulerIncomingContentForeground": "Colore primo piano del righello panoramica modifiche in arrivo per i conflitti di merge in linea.",
-	"overviewRulerCommonContentForeground": "Colore primo piano righello panoramica dell'antenato comune per i conflitti di merge in linea.",
-	"overviewRulerFindMatchForeground": "Colore del marcatore righello panoramica per trovare corrispondenze. Il colore non deve essere opaco per non nascondere decorazioni sottostanti.",
-	"overviewRulerSelectionHighlightForeground": "Colore del marcatore righello panoramica per evidenziazione selezioni. Il colore non deve essere opaco per non nascondere decorazioni sottostanti."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/platform/update/node/update.config.contribution.i18n.json b/i18n/ita/src/vs/platform/update/node/update.config.contribution.i18n.json
deleted file mode 100644
index d46195aa2fb..00000000000
--- a/i18n/ita/src/vs/platform/update/node/update.config.contribution.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"updateConfigurationTitle": "Aggiorna",
-	"updateChannel": "Consente di configurare la ricezione degli aggiornamenti automatici da un canale di aggiornamento. Richiede un riavvio dopo la modifica.",
-	"enableWindowsBackgroundUpdates": "Abilita gli aggiornamenti di Windows in background."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/platform/url/electron-browser/inactiveExtensionUrlHandler.i18n.json b/i18n/ita/src/vs/platform/url/electron-browser/inactiveExtensionUrlHandler.i18n.json
deleted file mode 100644
index b2a5da8a7dc..00000000000
--- a/i18n/ita/src/vs/platform/url/electron-browser/inactiveExtensionUrlHandler.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"confirmUrl": "Permettere ad una estensione di aprire questo URL?"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/platform/windows/electron-main/windowsService.i18n.json b/i18n/ita/src/vs/platform/windows/electron-main/windowsService.i18n.json
deleted file mode 100644
index 4dd52fafa65..00000000000
--- a/i18n/ita/src/vs/platform/windows/electron-main/windowsService.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"aboutDetail": "Versione {0}\nCommit {1}\nData {2}\nShell {3}\nRenderer {4}\nNodo {5}\nArchitettura {6}",
-	"okButton": "OK",
-	"copy": "&&Copia"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/platform/workspaces/common/workspaces.i18n.json b/i18n/ita/src/vs/platform/workspaces/common/workspaces.i18n.json
deleted file mode 100644
index df96dd6ffbe..00000000000
--- a/i18n/ita/src/vs/platform/workspaces/common/workspaces.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"codeWorkspace": "Area di lavoro del codice",
-	"untitledWorkspace": "Senza titolo (Area di lavoro)",
-	"workspaceNameVerbose": "{0} (Area di lavoro)",
-	"workspaceName": "{0} (Area di lavoro)"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/api/browser/localizationsExtensionPoint.i18n.json b/i18n/ita/src/vs/workbench/api/browser/localizationsExtensionPoint.i18n.json
deleted file mode 100644
index 900a05c78d9..00000000000
--- a/i18n/ita/src/vs/workbench/api/browser/localizationsExtensionPoint.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"requirearray": "le traduzioni devono essere una matrice",
-	"requirestring": "la proprietà `{0}` è obbligatoria e deve essere di tipo `string`",
-	"optstring": "la proprietà `{0}` può essere omessa o deve essere di tipo `string`",
-	"vscode.extension.contributes.localizations": "Contribuisce traduzioni all'editor",
-	"vscode.extension.contributes.localizations.languageId": "Id della lingua in cui sono tradotte le stringhe visualizzate.",
-	"vscode.extension.contributes.localizations.languageName": "Nome della lingua in cui sono tradotte le stringhe visualizzate.",
-	"vscode.extension.contributes.localizations.translations": "Percorso relativo alla cartella che contiene tutti i file di traduzione per la lingua fornita."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/api/browser/viewsContainersExtensionPoint.i18n.json b/i18n/ita/src/vs/workbench/api/browser/viewsContainersExtensionPoint.i18n.json
deleted file mode 100644
index ac822acba0f..00000000000
--- a/i18n/ita/src/vs/workbench/api/browser/viewsContainersExtensionPoint.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.contributes.views.containers.id": "ID univoco usato per identificare il contenitore in cui è possibile aggiungere visualizzazioni come contributo usando il punto di aggiunta contributo 'views'",
-	"vscode.extension.contributes.views.containers.title": "Stringa leggibile usata per il rendering del contenitore",
-	"vscode.extension.contributes.views.containers.icon": "Percorso dell'icona del contenitore. Le icone, le cui dimensioni sono 24x24, sono centrate in un blocco le cui dimensioni sono 50x40 e sono caratterizzate dal colore di riempimento 'rgb(215, 218, 224)' o '#d7dae0'. Anche se è accettato qualsiasi tipo di file immagine, per le icone è consigliabile usare il formato SVG.",
-	"vscode.extension.contributes.viewsContainers": "Aggiunge come contributo contenitori di visualizzazioni all'editor",
-	"views.container.activitybar": "Aggiunge come contributo contenitori di visualizzazioni alla barra attività",
-	"test": "Test",
-	"requirearray": "i contenitori di visualizzazioni devono essere una matrice",
-	"requireidstring": "la proprietà `{0}` è obbligatoria e deve essere di tipo `string`. Sono consentiti solo caratteri alfanumerici, '_' e '-'.",
-	"requirestring": "la proprietà `{0}` è obbligatoria e deve essere di tipo `string`",
-	"showViewlet": "Mostra {0}",
-	"view": "Visualizza"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json b/i18n/ita/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json
deleted file mode 100644
index 1135b733ef3..00000000000
--- a/i18n/ita/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"requirearray": "Visualizzazioni devono essere una matrice",
-	"requirestring": "la proprietà `{0}` è obbligatoria e deve essere di tipo `string`",
-	"optstring": "la proprietà `{0}` può essere omessa o deve essere di tipo `string`",
-	"vscode.extension.contributes.view.id": "Identificatore della vista. Utilizzare questo per registrare un provider di dati tramite l'API 'vscode.window.registerTreeDataProviderForView'. Anche per innescare l'attivazione dell'estensione tramite la registrazione dell'evento 'onView: ${id}' a 'activationEvents'.",
-	"vscode.extension.contributes.view.name": "Il nome della visualizzazione. Verrà mostrato",
-	"vscode.extension.contributes.view.when": "Condizione che deve essere vera per mostrare questa visualizzazione",
-	"vscode.extension.contributes.views": "Contribuisce visualizzazioni all'editor",
-	"views.explorer": "Aggiunge come contributo visualizzazioni al contenitore Esplora risorse nella barra attività",
-	"views.debug": "Aggiunge come contributo visualizzazioni al contenitore Debug nella barra attività",
-	"views.scm": "Aggiunge come contributo visualizzazioni al contenitore Gestione controllo servizi nella barra attività",
-	"views.test": "Aggiunge come contributo visualizzazioni al contenitore Test nella barra attività",
-	"views.contributed": "Aggiunge come contributo visualizzazioni al contenitore delle visualizzazioni aggiunto come contributo",
-	"ViewContainerDoesnotExist": "Il contenitore di visualizzazioni '{0}' non esiste e tutte le visualizzazioni registrate verranno aggiunte a 'Esplora risorse'.",
-	"duplicateView1": "Non è possibile registrare più visualizzazioni con stesso ID `{0}` nel percorso `{1}`",
-	"duplicateView2": "Nel percorso `{1}` è già registrata una visualizzazione con ID `{0}` "
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/api/electron-browser/mainThreadExtensionService.i18n.json b/i18n/ita/src/vs/workbench/api/electron-browser/mainThreadExtensionService.i18n.json
deleted file mode 100644
index 606de953f3a..00000000000
--- a/i18n/ita/src/vs/workbench/api/electron-browser/mainThreadExtensionService.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"overwritingExtension": "Sovrascrittura dell'estensione {0} con {1}.",
-	"extensionUnderDevelopment": "Caricamento dell'estensione di sviluppo in {0}"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/api/electron-browser/mainThreadMessageService.i18n.json b/i18n/ita/src/vs/workbench/api/electron-browser/mainThreadMessageService.i18n.json
deleted file mode 100644
index 65746665f69..00000000000
--- a/i18n/ita/src/vs/workbench/api/electron-browser/mainThreadMessageService.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"extensionSource": "{0} (estensione)",
-	"defaultSource": "Estensione",
-	"manageExtension": "Gestisci estensione",
-	"cancel": "Annulla",
-	"ok": "OK"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json b/i18n/ita/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
deleted file mode 100644
index 475ba817066..00000000000
--- a/i18n/ita/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"timeout.formatOnSave": "Comando Formatta dopo salvataggio interrotto dopo {0} ms",
-	"codeActionsOnSave.didTimeout": "codeActionsOnSave interrotto dopo {0} ms",
-	"timeout.onWillSave": "Evento onWillSaveTextDocument interrotto dopo 1750 ms",
-	"saveParticipants": "Esecuzione del salvataggio partecipanti..."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json b/i18n/ita/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json
deleted file mode 100644
index ee8688cdc85..00000000000
--- a/i18n/ita/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"task.label": "{0}: {1}"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/api/electron-browser/mainThreadWebview.i18n.json b/i18n/ita/src/vs/workbench/api/electron-browser/mainThreadWebview.i18n.json
deleted file mode 100644
index 8b6ff1d8567..00000000000
--- a/i18n/ita/src/vs/workbench/api/electron-browser/mainThreadWebview.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"errorMessage": "Si è verificato un errore durante il tentativo di ripristinare la visualizzazione: {0}"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/api/electron-browser/mainThreadWorkspace.i18n.json b/i18n/ita/src/vs/workbench/api/electron-browser/mainThreadWorkspace.i18n.json
deleted file mode 100644
index db4d9b00284..00000000000
--- a/i18n/ita/src/vs/workbench/api/electron-browser/mainThreadWorkspace.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"folderStatusMessageAddSingleFolder": "L'estensione '{0}' ha aggiunto 1 cartella all'area di lavoro",
-	"folderStatusMessageAddMultipleFolders": "L'estensione '{0}' ha aggiunto {1} cartelle all'area di lavoro",
-	"folderStatusMessageRemoveSingleFolder": "L'estensione '{0}' ha rimosso 1 cartella dall'area di lavoro",
-	"folderStatusMessageRemoveMultipleFolders": "L'estensione '{0}' ha rimosso {1} cartelle dall'area di lavoro",
-	"folderStatusChangeFolder": "L'estensione '{0}' ha cambiato le cartelle dell'area di lavoro"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/api/node/extHostDiagnostics.i18n.json b/i18n/ita/src/vs/workbench/api/node/extHostDiagnostics.i18n.json
deleted file mode 100644
index c7c70215eb3..00000000000
--- a/i18n/ita/src/vs/workbench/api/node/extHostDiagnostics.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"limitHit": "Non verranno visualizzati altri {0} errori e avvisi."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/api/node/extHostExplorerView.i18n.json b/i18n/ita/src/vs/workbench/api/node/extHostExplorerView.i18n.json
deleted file mode 100644
index 8905123ff84..00000000000
--- a/i18n/ita/src/vs/workbench/api/node/extHostExplorerView.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"treeExplorer.notRegistered": "Non è stato registrato alcun elemento TreeExplorerNodeProvider con ID '{0}'.",
-	"treeExplorer.failedToProvideRootNode": "Con l'elemento TreeExplorerNodeProvider '{0}' non è stato possibile fornire il nodo radice."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/api/node/extHostExtensionActivator.i18n.json b/i18n/ita/src/vs/workbench/api/node/extHostExtensionActivator.i18n.json
deleted file mode 100644
index da45d7e41c8..00000000000
--- a/i18n/ita/src/vs/workbench/api/node/extHostExtensionActivator.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"unknownDep": "L'attivazione dell'estensione '{1}' non è riuscita. Motivo: la dipendenza '{0}' è sconosciuta.",
-	"failedDep1": "L'attivazione dell'estensione '{1}' non è riuscita. Motivo: non è stato possibile attivare la dipendenza '{0}'.",
-	"failedDep2": "L'attivazione dell'estensione '{0}' non è riuscita. Motivo: sono presenti più di 10 livelli di dipendenze (molto probabilmente un ciclo di dipendenze).",
-	"activationError": "L'attivazione dell'estensione '{0}' non è riuscita: {1}."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/api/node/extHostProgress.i18n.json b/i18n/ita/src/vs/workbench/api/node/extHostProgress.i18n.json
deleted file mode 100644
index 04c3870e62b..00000000000
--- a/i18n/ita/src/vs/workbench/api/node/extHostProgress.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"extensionSource": "{0} (estensione)"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/api/node/extHostTask.i18n.json b/i18n/ita/src/vs/workbench/api/node/extHostTask.i18n.json
deleted file mode 100644
index ee8688cdc85..00000000000
--- a/i18n/ita/src/vs/workbench/api/node/extHostTask.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"task.label": "{0}: {1}"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/api/node/extHostTreeExplorers.i18n.json b/i18n/ita/src/vs/workbench/api/node/extHostTreeExplorers.i18n.json
deleted file mode 100644
index 7d463badde9..00000000000
--- a/i18n/ita/src/vs/workbench/api/node/extHostTreeExplorers.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"treeExplorer.notRegistered": "Non è stato registrato alcun elemento TreeExplorerNodeProvider con ID '{0}'.",
-	"treeExplorer.failedToProvideRootNode": "Con l'elemento TreeExplorerNodeProvider '{0}' non è stato possibile fornire il nodo radice.",
-	"treeExplorer.failedToResolveChildren": "Con l'elemento TreeExplorerNodeProvider '{0}' non è stato possibile risolvere gli elementi figlio."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/api/node/extHostTreeView.i18n.json b/i18n/ita/src/vs/workbench/api/node/extHostTreeView.i18n.json
deleted file mode 100644
index 8905123ff84..00000000000
--- a/i18n/ita/src/vs/workbench/api/node/extHostTreeView.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"treeExplorer.notRegistered": "Non è stato registrato alcun elemento TreeExplorerNodeProvider con ID '{0}'.",
-	"treeExplorer.failedToProvideRootNode": "Con l'elemento TreeExplorerNodeProvider '{0}' non è stato possibile fornire il nodo radice."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/api/node/extHostTreeViews.i18n.json b/i18n/ita/src/vs/workbench/api/node/extHostTreeViews.i18n.json
deleted file mode 100644
index 3a17c732425..00000000000
--- a/i18n/ita/src/vs/workbench/api/node/extHostTreeViews.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"treeView.notRegistered": "Nessuna visualizzazione di struttura ad albero con ID '{0}' registrata.",
-	"treeView.duplicateElement": "L'elemento con id {0} è già registrato"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/api/node/extHostWorkspace.i18n.json b/i18n/ita/src/vs/workbench/api/node/extHostWorkspace.i18n.json
deleted file mode 100644
index 091a55ded09..00000000000
--- a/i18n/ita/src/vs/workbench/api/node/extHostWorkspace.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"updateerror": "L'estensione '{0}' non è riuscita ad aggiornare le cartelle dell'area di lavoro: {1}"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/api/node/mainThreadExtensionService.i18n.json b/i18n/ita/src/vs/workbench/api/node/mainThreadExtensionService.i18n.json
deleted file mode 100644
index 606de953f3a..00000000000
--- a/i18n/ita/src/vs/workbench/api/node/mainThreadExtensionService.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"overwritingExtension": "Sovrascrittura dell'estensione {0} con {1}.",
-	"extensionUnderDevelopment": "Caricamento dell'estensione di sviluppo in {0}"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/api/node/mainThreadMessageService.i18n.json b/i18n/ita/src/vs/workbench/api/node/mainThreadMessageService.i18n.json
deleted file mode 100644
index e2fbc59847f..00000000000
--- a/i18n/ita/src/vs/workbench/api/node/mainThreadMessageService.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"close": "Chiudi",
-	"cancel": "Annulla",
-	"ok": "OK"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/browser/actions/configureLocale.i18n.json b/i18n/ita/src/vs/workbench/browser/actions/configureLocale.i18n.json
deleted file mode 100644
index a124f7f6f31..00000000000
--- a/i18n/ita/src/vs/workbench/browser/actions/configureLocale.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"configureLocale": "Configura lingua",
-	"displayLanguage": "Definisce la lingua visualizzata di VSCode.",
-	"doc": "Per un elenco delle lingue supportate, vedere {0}.",
-	"restart": "Se si modifica il valore, è necessario riavviare VSCode.",
-	"fail.createSettings": "Non è possibile creare '{0}' ({1}).",
-	"JsonSchema.locale": "Linguaggio dell'interfaccia utente da usare."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/browser/actions/fileActions.i18n.json b/i18n/ita/src/vs/workbench/browser/actions/fileActions.i18n.json
deleted file mode 100644
index ce47cce90d0..00000000000
--- a/i18n/ita/src/vs/workbench/browser/actions/fileActions.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"openFolder": "Apri cartella...",
-	"openFileFolder": "Apri..."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/browser/actions/toggleActivityBarVisibility.i18n.json b/i18n/ita/src/vs/workbench/browser/actions/toggleActivityBarVisibility.i18n.json
deleted file mode 100644
index 31d3eaea3ee..00000000000
--- a/i18n/ita/src/vs/workbench/browser/actions/toggleActivityBarVisibility.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleActivityBar": "Attiva/Disattiva visibilità della barra attività",
-	"view": "Visualizza"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/browser/actions/toggleCenteredLayout.i18n.json b/i18n/ita/src/vs/workbench/browser/actions/toggleCenteredLayout.i18n.json
deleted file mode 100644
index 405a253466c..00000000000
--- a/i18n/ita/src/vs/workbench/browser/actions/toggleCenteredLayout.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleCenteredLayout": "Attiva/Disattiva layout al centro",
-	"view": "Visualizza"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/browser/actions/toggleEditorLayout.i18n.json b/i18n/ita/src/vs/workbench/browser/actions/toggleEditorLayout.i18n.json
deleted file mode 100644
index 9f6fb1fe101..00000000000
--- a/i18n/ita/src/vs/workbench/browser/actions/toggleEditorLayout.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleEditorGroupLayout": "Attiva/Disattiva layout orizzontale/verticale gruppi di editor",
-	"horizontalLayout": "Layout orizzontale gruppi di editor",
-	"verticalLayout": "Layout verticale gruppi di editor",
-	"view": "Visualizza"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/browser/actions/toggleSidebarPosition.i18n.json b/i18n/ita/src/vs/workbench/browser/actions/toggleSidebarPosition.i18n.json
deleted file mode 100644
index 775b458dbde..00000000000
--- a/i18n/ita/src/vs/workbench/browser/actions/toggleSidebarPosition.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleSidebarPosition": "Attiva/Disattiva posizione della barra laterale",
-	"view": "Visualizza"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/browser/actions/toggleSidebarVisibility.i18n.json b/i18n/ita/src/vs/workbench/browser/actions/toggleSidebarVisibility.i18n.json
deleted file mode 100644
index 78b75dda8fd..00000000000
--- a/i18n/ita/src/vs/workbench/browser/actions/toggleSidebarVisibility.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleSidebar": "Attiva/Disattiva visibilità della barra laterale",
-	"view": "Visualizza"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/browser/actions/toggleStatusbarVisibility.i18n.json b/i18n/ita/src/vs/workbench/browser/actions/toggleStatusbarVisibility.i18n.json
deleted file mode 100644
index 0e2d776b422..00000000000
--- a/i18n/ita/src/vs/workbench/browser/actions/toggleStatusbarVisibility.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleStatusbar": "Attiva/Disattiva visibilità della barra di stato",
-	"view": "Visualizza"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/browser/actions/toggleTabsVisibility.i18n.json b/i18n/ita/src/vs/workbench/browser/actions/toggleTabsVisibility.i18n.json
deleted file mode 100644
index 3bc529f9c80..00000000000
--- a/i18n/ita/src/vs/workbench/browser/actions/toggleTabsVisibility.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleTabs": "Attiva/disattiva visibilità delle schede",
-	"view": "Visualizza"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/browser/actions/toggleZenMode.i18n.json b/i18n/ita/src/vs/workbench/browser/actions/toggleZenMode.i18n.json
deleted file mode 100644
index 85b1d7f4d19..00000000000
--- a/i18n/ita/src/vs/workbench/browser/actions/toggleZenMode.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleZenMode": "Attiva/Disattiva modalità Zen",
-	"view": "Visualizza"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/browser/actions/workspaceActions.i18n.json b/i18n/ita/src/vs/workbench/browser/actions/workspaceActions.i18n.json
deleted file mode 100644
index 967a9460fbe..00000000000
--- a/i18n/ita/src/vs/workbench/browser/actions/workspaceActions.i18n.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openFile": "Apri file...",
-	"openFolder": "Apri cartella...",
-	"openFileFolder": "Apri...",
-	"globalRemoveFolderFromWorkspace": "Rimuovi cartella dall'area di lavoro...",
-	"saveWorkspaceAsAction": "Salva area di lavoro come...",
-	"save": "&&Salva",
-	"saveWorkspace": "Salva area di lavoro",
-	"openWorkspaceAction": "Apri area di lavoro...",
-	"openWorkspaceConfigFile": "Apri file di configurazione dell'area di lavoro",
-	"duplicateWorkspaceInNewWindow": "Duplica area di lavoro nella nuova finestra"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/browser/actions/workspaceCommands.i18n.json b/i18n/ita/src/vs/workbench/browser/actions/workspaceCommands.i18n.json
deleted file mode 100644
index 48e9eddc787..00000000000
--- a/i18n/ita/src/vs/workbench/browser/actions/workspaceCommands.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"addFolderToWorkspace": "Aggiungi cartella all'area di lavoro...",
-	"add": "&&Aggiungi",
-	"addFolderToWorkspaceTitle": "Aggiungi cartella all'area di lavoro",
-	"workspaceFolderPickerPlaceholder": "Selezionare la cartella dell'area di lavoro"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/browser/parts/activitybar/activitybarActions.i18n.json b/i18n/ita/src/vs/workbench/browser/parts/activitybar/activitybarActions.i18n.json
deleted file mode 100644
index 492b8e03095..00000000000
--- a/i18n/ita/src/vs/workbench/browser/parts/activitybar/activitybarActions.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"badgeTitle": "{0} - {1}",
-	"titleKeybinding": "{0} ({1})",
-	"removeFromActivityBar": "Nascondi in barra attività",
-	"keepInActivityBar": "Mantieni in barra attività",
-	"additionalViews": "Visualizzazioni aggiuntive",
-	"numberBadge": "{0} ({1})",
-	"manageExtension": "Gestisci estensione",
-	"toggle": "Attiva/Disattiva visualizzazione bloccata"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/browser/parts/activitybar/activitybarPart.i18n.json b/i18n/ita/src/vs/workbench/browser/parts/activitybar/activitybarPart.i18n.json
deleted file mode 100644
index ef76e12f13a..00000000000
--- a/i18n/ita/src/vs/workbench/browser/parts/activitybar/activitybarPart.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hideActivitBar": "Nascondi barra attività",
-	"globalActions": "Azioni globali"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/browser/parts/compositePart.i18n.json b/i18n/ita/src/vs/workbench/browser/parts/compositePart.i18n.json
deleted file mode 100644
index 9903f01d5ff..00000000000
--- a/i18n/ita/src/vs/workbench/browser/parts/compositePart.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"ariaCompositeToolbarLabel": "Azioni di {0}",
-	"titleTooltip": "{0} ({1})"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/browser/parts/compositebar/compositeBar.i18n.json b/i18n/ita/src/vs/workbench/browser/parts/compositebar/compositeBar.i18n.json
deleted file mode 100644
index 194504f610b..00000000000
--- a/i18n/ita/src/vs/workbench/browser/parts/compositebar/compositeBar.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"activityBarAriaLabel": "Cambio visualizzazione attiva"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/browser/parts/compositebar/compositeBarActions.i18n.json b/i18n/ita/src/vs/workbench/browser/parts/compositebar/compositeBarActions.i18n.json
deleted file mode 100644
index 8b19a3a5d08..00000000000
--- a/i18n/ita/src/vs/workbench/browser/parts/compositebar/compositeBarActions.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"largeNumberBadge": "Più di 10.000",
-	"badgeTitle": "{0} - {1}",
-	"additionalViews": "Visualizzazioni aggiuntive",
-	"numberBadge": "{0} ({1})",
-	"manageExtension": "Gestisci estensione",
-	"titleKeybinding": "{0} ({1})",
-	"hide": "Nascondi",
-	"keep": "Mantieni",
-	"toggle": "Attiva/Disattiva visualizzazione bloccata"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/browser/parts/editor/binaryDiffEditor.i18n.json b/i18n/ita/src/vs/workbench/browser/parts/editor/binaryDiffEditor.i18n.json
deleted file mode 100644
index ea1317f6659..00000000000
--- a/i18n/ita/src/vs/workbench/browser/parts/editor/binaryDiffEditor.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"metadataDiff": "{0} ↔ {1}"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/browser/parts/editor/binaryEditor.i18n.json b/i18n/ita/src/vs/workbench/browser/parts/editor/binaryEditor.i18n.json
deleted file mode 100644
index 33ccc7e17f1..00000000000
--- a/i18n/ita/src/vs/workbench/browser/parts/editor/binaryEditor.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"binaryEditor": "Visualizzatore file binari"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json b/i18n/ita/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json
deleted file mode 100644
index cf3660bce1c..00000000000
--- a/i18n/ita/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"textEditor": "Editor di testo",
-	"textDiffEditor": "Editor diff file di testo",
-	"binaryDiffEditor": "Editor diff file binari",
-	"sideBySideEditor": "Editor affiancato",
-	"groupOnePicker": "Mostra editor nel primo gruppo",
-	"groupTwoPicker": "Mostra editor nel secondo gruppo",
-	"groupThreePicker": "Mostra editor nel terzo gruppo",
-	"allEditorsPicker": "Mostra tutti gli editor aperti",
-	"view": "Visualizza",
-	"file": "File",
-	"close": "Chiudi",
-	"closeOthers": "Chiudi altri",
-	"closeRight": "Chiudi a destra",
-	"closeAllSaved": "Chiudi salvati",
-	"closeAll": "Chiudi tutto",
-	"keepOpen": "Mantieni aperto",
-	"toggleInlineView": "Attiva/disattiva visualizzazione Inline",
-	"showOpenedEditors": "Mostra editor aperti",
-	"keepEditor": "Mantieni editor",
-	"closeEditorsInGroup": "Chiudi tutti gli editor del gruppo",
-	"closeSavedEditors": "Chiudi editor salvati del gruppo",
-	"closeOtherEditors": "Chiudi gli altri editor",
-	"closeRightEditors": "Chiudi editor a destra"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/browser/parts/editor/editorActions.i18n.json b/i18n/ita/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
deleted file mode 100644
index 52332d26b60..00000000000
--- a/i18n/ita/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
+++ /dev/null
@@ -1,58 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"splitEditor": "Dividi editor",
-	"joinTwoGroups": "Unisci editor di due gruppi",
-	"navigateEditorGroups": "Esplora gruppi di editor",
-	"focusActiveEditorGroup": "Sposta stato attivo sul gruppo di editor attivo",
-	"focusFirstEditorGroup": "Sposta stato attivo sul primo gruppo di editor",
-	"focusSecondEditorGroup": "Sposta stato attivo sul secondo gruppo di editor",
-	"focusThirdEditorGroup": "Sposta stato attivo sul terzo gruppo di editor",
-	"focusPreviousGroup": "Sposta stato attivo sul gruppo precedente",
-	"focusNextGroup": "Sposta stato attivo sul gruppo successivo",
-	"openToSide": "Apri lateralmente",
-	"closeEditor": "Chiudi editor",
-	"closeOneEditor": "Chiudi",
-	"revertAndCloseActiveEditor": "Ripristina e chiudi editor",
-	"closeEditorsToTheLeft": "Chiudi editor a sinistra",
-	"closeAllEditors": "Chiudi tutti gli editor",
-	"closeEditorsInOtherGroups": "Chiudi editor in altri gruppi",
-	"moveActiveGroupLeft": "Sposta gruppo di editor a sinistra",
-	"moveActiveGroupRight": "Sposta gruppo di editor a destra",
-	"minimizeOtherEditorGroups": "Riduci a icona gli altri gruppi di editor",
-	"evenEditorGroups": "Imposta stessa larghezza per gruppo di editor",
-	"maximizeEditor": "Ingrandisci gruppo di editor e nascondi barra laterale",
-	"openNextEditor": "Apri editor successivo",
-	"openPreviousEditor": "Apri editor precedente",
-	"nextEditorInGroup": "Apri editor successivo del gruppo",
-	"openPreviousEditorInGroup": "Apri editor precedente del gruppo",
-	"lastEditorInGroup": "Apri ultimo editor del gruppo",
-	"navigateNext": "Avanti",
-	"navigatePrevious": "Indietro",
-	"navigateLast": "Vai all'ultima",
-	"reopenClosedEditor": "Riapri editor chiuso",
-	"clearRecentFiles": "Cancella elementi aperti di recente",
-	"showEditorsInFirstGroup": "Mostra editor nel primo gruppo",
-	"showEditorsInSecondGroup": "Mostra editor nel secondo gruppo",
-	"showEditorsInThirdGroup": "Mostra editor nel terzo gruppo",
-	"showAllEditors": "Mostra tutti gli editor",
-	"openPreviousRecentlyUsedEditorInGroup": "Apri editor precedente usato di recente nel gruppo",
-	"openNextRecentlyUsedEditorInGroup": "Apri editor successivo usato di recente nel gruppo",
-	"navigateEditorHistoryByInput": "Apri editor precedente dalla cronologia",
-	"openNextRecentlyUsedEditor": "Apri editor successivo usato di recente",
-	"openPreviousRecentlyUsedEditor": "Apri editor precedente usato di recente",
-	"clearEditorHistory": "Cancella cronologia degli editor",
-	"focusLastEditorInStack": "Apri ultimo editor del gruppo",
-	"moveEditorLeft": "Sposta editor a sinistra",
-	"moveEditorRight": "Sposta editor a destra",
-	"moveEditorToPreviousGroup": "Sposta editor nel gruppo precedente",
-	"moveEditorToNextGroup": "Sposta editor nel gruppo successivo",
-	"moveEditorToFirstGroup": "Sposta l'Editor nel primo gruppo",
-	"moveEditorToSecondGroup": "Sposta l'Editor nel secondo gruppo",
-	"moveEditorToThirdGroup": "Sposta l'Editor nel terzo gruppo"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json b/i18n/ita/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json
deleted file mode 100644
index 5a34fab0153..00000000000
--- a/i18n/ita/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"editorCommand.activeEditorMove.description": "Consente di spostare l'editor attivo per schede o gruppi",
-	"editorCommand.activeEditorMove.arg.name": "Argomento per spostamento editor attivo",
-	"editorCommand.activeEditorMove.arg.description": "Proprietà degli argomenti:\n\t* 'to': valore stringa che specifica dove eseguire lo spostamento.\n\t* 'by': valore stringa che specifica l'unità per lo spostamento, ovvero per scheda o per gruppo.\n\t* 'value': valore numerico che specifica il numero di posizioni o una posizione assoluta per lo spostamento."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/browser/parts/editor/editorPart.i18n.json b/i18n/ita/src/vs/workbench/browser/parts/editor/editorPart.i18n.json
deleted file mode 100644
index ef704108a20..00000000000
--- a/i18n/ita/src/vs/workbench/browser/parts/editor/editorPart.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"groupOneVertical": "A sinistra",
-	"groupTwoVertical": "Al centro",
-	"groupThreeVertical": "A destra",
-	"groupOneHorizontal": "In alto",
-	"groupTwoHorizontal": "Al centro",
-	"groupThreeHorizontal": "In basso",
-	"editorOpenError": "Non è possibile aprire '{0}': {1}."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/browser/parts/editor/editorPicker.i18n.json b/i18n/ita/src/vs/workbench/browser/parts/editor/editorPicker.i18n.json
deleted file mode 100644
index a302562d019..00000000000
--- a/i18n/ita/src/vs/workbench/browser/parts/editor/editorPicker.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"entryAriaLabel": "{0}, selezione gruppo di editor",
-	"groupLabel": "Gruppo: {0}",
-	"noResultsFoundInGroup": "Nel gruppo non è stato trovato alcun editor aperto corrispondente",
-	"noOpenedEditors": "L'elenco degli editor aperti è attualmente vuoto nel gruppo",
-	"noResultsFound": "Non è stato trovato alcun editor aperto corrispondente",
-	"noOpenedEditorsAllGroups": "L'elenco degli editor aperti è attualmente vuoto"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json b/i18n/ita/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json
deleted file mode 100644
index f7d0ba95e12..00000000000
--- a/i18n/ita/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"singleSelectionRange": "Ri {0}, col {1} ({2} selezionate)",
-	"singleSelection": "Ri {0}, col {1}",
-	"multiSelectionRange": "{0} selezioni ({1} caratteri selezionati)",
-	"multiSelection": "{0} selezioni",
-	"endOfLineLineFeed": "LF",
-	"endOfLineCarriageReturnLineFeed": "CRLF",
-	"tabFocusModeEnabled": "TAB per spostare lo stato attivo",
-	"screenReaderDetected": "Ottimizzato per l'utilità per la lettura dello schermo",
-	"screenReaderDetectedExtra": "Se non si utilizza un'utilità per la lettura dello schermo, si prega di impostare 'editor.accessibilitySupport' a \"off\".",
-	"disableTabMode": "Disabilita modalità accessibilità",
-	"gotoLine": "Vai alla riga",
-	"selectIndentation": "Seleziona rientro",
-	"selectEncoding": "Seleziona codifica",
-	"selectEOL": "Seleziona sequenza di fine riga",
-	"selectLanguageMode": "Seleziona modalità linguaggio",
-	"fileInfo": "Informazioni sul file",
-	"spacesSize": "Spazi: {0}",
-	"tabSize": "Dimensione tabulazione: {0}",
-	"showLanguageExtensions": "Cerca '{0}' nelle estensioni del Marketplace...",
-	"changeMode": "Cambia modalità linguaggio",
-	"noEditor": "Al momento non ci sono editor di testo attivi",
-	"languageDescription": "({0}) - Linguaggio configurato",
-	"languageDescriptionConfigured": "({0})",
-	"languagesPicks": "linguaggi (identificatore)",
-	"configureModeSettings": "Configura impostazioni basate su linguaggio '{0}'...",
-	"configureAssociationsExt": "Configura associazione file per '{0}'...",
-	"autoDetect": "Rilevamento automatico",
-	"pickLanguage": "Seleziona modalità linguaggio",
-	"currentAssociation": "Associazione corrente",
-	"pickLanguageToConfigure": "Seleziona la modalità linguaggio da associare a '{0}'",
-	"changeIndentation": "Cambia rientro",
-	"noWritableCodeEditor": "L'editor di testo attivo è di sola lettura.",
-	"indentView": "cambia visualizzazione",
-	"indentConvert": "converti file",
-	"pickAction": "Seleziona azione",
-	"changeEndOfLine": "Cambia sequenza di fine riga",
-	"pickEndOfLine": "Seleziona sequenza di fine riga",
-	"changeEncoding": "Cambia codifica file",
-	"noFileEditor": "Al momento non ci sono file attivi",
-	"saveWithEncoding": "Salva con codifica",
-	"reopenWithEncoding": "Riapri con codifica",
-	"guessedEncoding": "Ipotizzata dal contenuto",
-	"pickEncodingForReopen": "Seleziona codifica per la riapertura del file",
-	"pickEncodingForSave": "Seleziona codifica per il salvataggio del file",
-	"screenReaderDetectedExplanation.title": "Ottimizzato per l'utilità per la lettura dello schermo",
-	"screenReaderDetectedExplanation.question": "Si usa un'utilità per la lettura per lo schermo per VS Code?",
-	"screenReaderDetectedExplanation.answerYes": "Sì",
-	"screenReaderDetectedExplanation.answerNo": "No",
-	"screenReaderDetectedExplanation.body1": "VS Code è ora ottimizzato per l'utilizzo con un'utilità per la lettura dello schermo.",
-	"screenReaderDetectedExplanation.body2": "Alcune funzionalità dell'editor avranno un comportamento differente: ad esempio a capo automatico, folding, ecc."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/browser/parts/editor/resourceViewer.i18n.json b/i18n/ita/src/vs/workbench/browser/parts/editor/resourceViewer.i18n.json
deleted file mode 100644
index 7e1b27bff8c..00000000000
--- a/i18n/ita/src/vs/workbench/browser/parts/editor/resourceViewer.i18n.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"sizeB": "{0} B",
-	"sizeKB": "{0} KB",
-	"sizeMB": "{0} MB",
-	"sizeGB": "{0} GB",
-	"sizeTB": "{0} TB",
-	"largeImageError": "L'immagine non viene visualizzata nell'editor perché è troppo grande ({0}).",
-	"resourceOpenExternalButton": "Aprire l'immagine utilizzando un programma esterno?",
-	"nativeFileTooLargeError": "Il file non viene visualizzato nell'editor perché è troppo grande ({0}).",
-	"nativeBinaryError": "Il file non viene visualizzato nell'editor perché è binario o usa una codifica di testo non supportata.",
-	"openAsText": "Aprirlo comunque?",
-	"zoom.action.fit.label": "Immagine intera",
-	"imgMeta": "{0}x{1} {2}"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/browser/parts/editor/tabsTitleControl.i18n.json b/i18n/ita/src/vs/workbench/browser/parts/editor/tabsTitleControl.i18n.json
deleted file mode 100644
index d9f9e96667a..00000000000
--- a/i18n/ita/src/vs/workbench/browser/parts/editor/tabsTitleControl.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"araLabelTabActions": "Azioni delle schede"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json b/i18n/ita/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json
deleted file mode 100644
index 22268f1a23d..00000000000
--- a/i18n/ita/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"textDiffEditor": "Editor diff file di testo",
-	"readonlyEditorWithInputAriaLabel": "{0}. Editor di confronto testo di sola lettura.",
-	"readonlyEditorAriaLabel": "Editor di confronto testo di sola lettura.",
-	"editableEditorWithInputAriaLabel": "{0}. Editor di confronto file di testo",
-	"editableEditorAriaLabel": "Editor di confronto file di testo.",
-	"navigate.next.label": "Revisione successiva",
-	"navigate.prev.label": "Revisione precedente",
-	"toggleIgnoreTrimWhitespace.label": "Ignora lo spazio vuoto finale"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/browser/parts/editor/textEditor.i18n.json b/i18n/ita/src/vs/workbench/browser/parts/editor/textEditor.i18n.json
deleted file mode 100644
index 56c8dffd178..00000000000
--- a/i18n/ita/src/vs/workbench/browser/parts/editor/textEditor.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"editorLabelWithGroup": "{0}, gruppo {1}."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/browser/parts/editor/textResourceEditor.i18n.json b/i18n/ita/src/vs/workbench/browser/parts/editor/textResourceEditor.i18n.json
deleted file mode 100644
index 4926889e700..00000000000
--- a/i18n/ita/src/vs/workbench/browser/parts/editor/textResourceEditor.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"textEditor": "Editor di testo",
-	"readonlyEditorWithInputAriaLabel": "{0}. Editor di testo di sola lettura.",
-	"readonlyEditorAriaLabel": "Editor di testo di sola lettura.",
-	"untitledFileEditorWithInputAriaLabel": "{0}. Editor di testo file senza titolo.",
-	"untitledFileEditorAriaLabel": "Editor di testo file senza titolo."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/browser/parts/editor/titleControl.i18n.json b/i18n/ita/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
deleted file mode 100644
index 87ef247c949..00000000000
--- a/i18n/ita/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"araLabelEditorActions": "Azioni editor"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/browser/parts/notifications/notificationsActions.i18n.json b/i18n/ita/src/vs/workbench/browser/parts/notifications/notificationsActions.i18n.json
deleted file mode 100644
index 7c397013973..00000000000
--- a/i18n/ita/src/vs/workbench/browser/parts/notifications/notificationsActions.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"clearNotification": "Cancella notifica",
-	"clearNotifications": "Cancella tutte le notifiche",
-	"hideNotificationsCenter": "Nascondi notifiche",
-	"expandNotification": "Espandi notifica",
-	"collapseNotification": "Comprimi notifica",
-	"configureNotification": "Configura notifica",
-	"copyNotification": "Copia testo"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/browser/parts/notifications/notificationsAlerts.i18n.json b/i18n/ita/src/vs/workbench/browser/parts/notifications/notificationsAlerts.i18n.json
deleted file mode 100644
index 82791decf4f..00000000000
--- a/i18n/ita/src/vs/workbench/browser/parts/notifications/notificationsAlerts.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"alertErrorMessage": "Errore: {0}",
-	"alertWarningMessage": "Avviso: {0}",
-	"alertInfoMessage": "Info: {0}"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json b/i18n/ita/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json
deleted file mode 100644
index a203ffaf2a0..00000000000
--- a/i18n/ita/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"notificationsEmpty": "Nessuna nuova notifica",
-	"notifications": "Notifiche",
-	"notificationsToolbar": "Azioni del centro notifiche",
-	"notificationsList": "Elenco notifiche"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/browser/parts/notifications/notificationsCommands.i18n.json b/i18n/ita/src/vs/workbench/browser/parts/notifications/notificationsCommands.i18n.json
deleted file mode 100644
index 41e6a2aec82..00000000000
--- a/i18n/ita/src/vs/workbench/browser/parts/notifications/notificationsCommands.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"notifications": "Notifiche",
-	"showNotifications": "Mostra notifiche",
-	"hideNotifications": "Nascondi notifiche",
-	"clearAllNotifications": "Cancella tutte le notifiche"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/browser/parts/notifications/notificationsStatus.i18n.json b/i18n/ita/src/vs/workbench/browser/parts/notifications/notificationsStatus.i18n.json
deleted file mode 100644
index 9d0a5939e1f..00000000000
--- a/i18n/ita/src/vs/workbench/browser/parts/notifications/notificationsStatus.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hideNotifications": "Nascondi notifiche",
-	"zeroNotifications": "Nessuna notifica",
-	"noNotifications": "Nessuna nuova notifica",
-	"oneNotification": "1 nuova notifica",
-	"notifications": "{0} nuove notifiche"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/browser/parts/notifications/notificationsToasts.i18n.json b/i18n/ita/src/vs/workbench/browser/parts/notifications/notificationsToasts.i18n.json
deleted file mode 100644
index 325f3cbc5dc..00000000000
--- a/i18n/ita/src/vs/workbench/browser/parts/notifications/notificationsToasts.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"notificationsToast": "Avviso popup di notifica"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/browser/parts/notifications/notificationsViewer.i18n.json b/i18n/ita/src/vs/workbench/browser/parts/notifications/notificationsViewer.i18n.json
deleted file mode 100644
index 599667672d6..00000000000
--- a/i18n/ita/src/vs/workbench/browser/parts/notifications/notificationsViewer.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"notificationActions": "Azioni notifica",
-	"notificationSource": "Origine: {0}"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/browser/parts/panel/panelActions.i18n.json b/i18n/ita/src/vs/workbench/browser/parts/panel/panelActions.i18n.json
deleted file mode 100644
index c833030dc0a..00000000000
--- a/i18n/ita/src/vs/workbench/browser/parts/panel/panelActions.i18n.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"closePanel": "Chiudi pannello",
-	"togglePanel": "Attiva/Disattiva pannello",
-	"focusPanel": "Sposta lo stato attivo nel pannello",
-	"toggledPanelPosition": "Attiva/Disattiva la posizione del pannello",
-	"moveToRight": "Sposta a destra",
-	"moveToBottom": "Sposta verso il basso",
-	"toggleMaximizedPanel": "Attiva/Disattiva pannello ingrandito",
-	"maximizePanel": "Ingrandisci dimensioni del pannello",
-	"minimizePanel": "Ripristina dimensioni del pannello",
-	"view": "Visualizza"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/browser/parts/panel/panelPart.i18n.json b/i18n/ita/src/vs/workbench/browser/parts/panel/panelPart.i18n.json
deleted file mode 100644
index de89b63f168..00000000000
--- a/i18n/ita/src/vs/workbench/browser/parts/panel/panelPart.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hidePanel": "Nascondi pannello"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/browser/parts/quickinput/quickInput.i18n.json b/i18n/ita/src/vs/workbench/browser/parts/quickinput/quickInput.i18n.json
deleted file mode 100644
index d77f9743219..00000000000
--- a/i18n/ita/src/vs/workbench/browser/parts/quickinput/quickInput.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"inputModeEntryDescription": "{0} (premere 'INVIO' per confermare oppure 'ESC' per annullare)",
-	"inputModeEntry": "Premere 'INVIO' per confermare l'input oppure 'ESC' per annullare",
-	"quickInput.countSelected": "{0} selezionati",
-	"ok": "OK"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/browser/parts/quickinput/quickInputBox.i18n.json b/i18n/ita/src/vs/workbench/browser/parts/quickinput/quickInputBox.i18n.json
deleted file mode 100644
index 055b435ed78..00000000000
--- a/i18n/ita/src/vs/workbench/browser/parts/quickinput/quickInputBox.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"quickInputBox.ariaLabel": "Digitare per ridurre il numero di risultati."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/browser/parts/quickopen/quickOpenController.i18n.json b/i18n/ita/src/vs/workbench/browser/parts/quickopen/quickOpenController.i18n.json
deleted file mode 100644
index f26d0d9fd88..00000000000
--- a/i18n/ita/src/vs/workbench/browser/parts/quickopen/quickOpenController.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"emptyPicks": "Non ci sono voci selezionabili",
-	"quickOpenInput": "Digitare '?' per visualizzare la Guida relativa alle azioni che è possibile eseguire qui",
-	"historyMatches": "aperti di recente",
-	"noResultsFound1": "Non sono stati trovati risultati",
-	"canNotRunPlaceholder": "Questo gestore per Quick Open non può essere usato nel contesto corrente",
-	"entryAriaLabel": "{0}, aperti di recente",
-	"removeFromEditorHistory": "Rimuovi dalla cronologia",
-	"pickHistory": "Selezionare una voce dell'editor da rimuovere dalla cronologia"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/browser/parts/quickopen/quickopen.contribution.i18n.json b/i18n/ita/src/vs/workbench/browser/parts/quickopen/quickopen.contribution.i18n.json
deleted file mode 100644
index 6a397dbe56c..00000000000
--- a/i18n/ita/src/vs/workbench/browser/parts/quickopen/quickopen.contribution.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"quickOpen": "Vai al file...",
-	"quickNavigateNext": "Passa a successiva in Quick Open",
-	"quickNavigatePrevious": "Passa a precedente in Quick Open",
-	"quickSelectNext": "Seleziona successiva in Quick Open",
-	"quickSelectPrevious": "Seleziona precedente in Quick Open"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/browser/parts/quickopen/quickopen.i18n.json b/i18n/ita/src/vs/workbench/browser/parts/quickopen/quickopen.i18n.json
deleted file mode 100644
index 1fd70125c1d..00000000000
--- a/i18n/ita/src/vs/workbench/browser/parts/quickopen/quickopen.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"quickOpen": "Vai al file...",
-	"quickNavigateNext": "Passa a successiva in Quick Open",
-	"quickNavigatePrevious": "Passa a precedente in Quick Open",
-	"quickSelectNext": "Seleziona successiva in Quick Open",
-	"quickSelectPrevious": "Seleziona precedente in Quick Open"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/browser/parts/sidebar/sidebarPart.i18n.json b/i18n/ita/src/vs/workbench/browser/parts/sidebar/sidebarPart.i18n.json
deleted file mode 100644
index f27bb31505e..00000000000
--- a/i18n/ita/src/vs/workbench/browser/parts/sidebar/sidebarPart.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"focusSideBar": "Sposta lo stato attivo nella barra laterale",
-	"viewCategory": "Visualizza"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/browser/parts/statusbar/statusbarPart.i18n.json b/i18n/ita/src/vs/workbench/browser/parts/statusbar/statusbarPart.i18n.json
deleted file mode 100644
index 782003d430e..00000000000
--- a/i18n/ita/src/vs/workbench/browser/parts/statusbar/statusbarPart.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"manageExtension": "Gestisci estensione"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/browser/parts/titlebar/titlebarPart.i18n.json b/i18n/ita/src/vs/workbench/browser/parts/titlebar/titlebarPart.i18n.json
deleted file mode 100644
index 3c70a6ef243..00000000000
--- a/i18n/ita/src/vs/workbench/browser/parts/titlebar/titlebarPart.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"patchedWindowTitle": "[Non supportata]",
-	"userIsAdmin": "[Amministratore]",
-	"userIsSudo": "[Superutente]",
-	"devExtensionWindowTitlePrefix": "[Host di sviluppo estensione]"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/browser/parts/views/panelViewlet.i18n.json b/i18n/ita/src/vs/workbench/browser/parts/views/panelViewlet.i18n.json
deleted file mode 100644
index 77d0d58519a..00000000000
--- a/i18n/ita/src/vs/workbench/browser/parts/views/panelViewlet.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"viewToolbarAriaLabel": "Azioni di {0}"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/browser/parts/views/views.i18n.json b/i18n/ita/src/vs/workbench/browser/parts/views/views.i18n.json
deleted file mode 100644
index 860e3f239f2..00000000000
--- a/i18n/ita/src/vs/workbench/browser/parts/views/views.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"viewToolbarAriaLabel": "Azioni di {0}",
-	"hideView": "Nascondi da barra laterale"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/browser/parts/views/viewsRegistry.i18n.json b/i18n/ita/src/vs/workbench/browser/parts/views/viewsRegistry.i18n.json
deleted file mode 100644
index ed1c7bde950..00000000000
--- a/i18n/ita/src/vs/workbench/browser/parts/views/viewsRegistry.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"duplicateId": "Nel percorso `{1}` è già registrata una visualizzazione con ID `{0}` "
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/browser/parts/views/viewsViewlet.i18n.json b/i18n/ita/src/vs/workbench/browser/parts/views/viewsViewlet.i18n.json
deleted file mode 100644
index 63beb6be22d..00000000000
--- a/i18n/ita/src/vs/workbench/browser/parts/views/viewsViewlet.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"cannot toggle": "Non è possibile attivare/disattivare la visibilità per questa visualizzazione {0}",
-	"cannot show": "Non è possibile mostrare questa visualizzazione {0} perché è nascosta dalla relativa condizione 'when'",
-	"hideView": "Nascondi"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/browser/quickopen.i18n.json b/i18n/ita/src/vs/workbench/browser/quickopen.i18n.json
deleted file mode 100644
index b73c1c27752..00000000000
--- a/i18n/ita/src/vs/workbench/browser/quickopen.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noResultsMatching": "Non ci sono risultati corrispondenti",
-	"noResultsFound2": "Non sono stati trovati risultati"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/browser/viewlet.i18n.json b/i18n/ita/src/vs/workbench/browser/viewlet.i18n.json
deleted file mode 100644
index 4a89346d720..00000000000
--- a/i18n/ita/src/vs/workbench/browser/viewlet.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"compositePart.hideSideBarLabel": "Nascondi barra laterale",
-	"collapse": "Comprimi tutto"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/common/theme.i18n.json b/i18n/ita/src/vs/workbench/common/theme.i18n.json
deleted file mode 100644
index 35f6e5209eb..00000000000
--- a/i18n/ita/src/vs/workbench/common/theme.i18n.json
+++ /dev/null
@@ -1,72 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"tabActiveBackground": "Colore di sfondo delle schede attive. Le schede sono i contenitori degli editor nell'area degli editor. È possibile aprire più schede in un gruppo di editor e possono esistere più gruppi di editor.",
-	"tabInactiveBackground": "Colore di sfondo delle schede inattive. Le schede sono i contenitori degli editor nell'area degli editor. È possibile aprire più schede in un gruppo di editor e possono esistere più gruppi di editor.",
-	"tabHoverBackground": "Colore di sfondo al passaggio del mouse sulle schede. Le schede sono i contenitori degli editor nell'area degli editor. È possibile aprire più schede in un gruppo di editor e possono esistere più gruppi di editor.",
-	"tabUnfocusedHoverBackground": "Colore di sfondo al passaggio del mouse sulle schede in un gruppo non attivo. Le schede sono i contenitori degli editor nell'area degli editor. È possibile aprire più schede in un gruppo di editor e possono esistere più gruppi di editor.",
-	"tabBorder": "Bordo per separare le schede l'una dall'altra. Le schede sono i contenitori degli editor nell'area degli editor. È possibile aprire più schede in un gruppo di editor e possono esistere più gruppi di editor.",
-	"tabActiveBorder": "Bordo nella parte inferiore di una scheda attiva. Le schede sono i contenitori degli editor nell'area degli editor. È possibile aprire più schede in un gruppo di editor e possono esistere più gruppi di editor.",
-	"tabActiveBorderTop": "Bordo nella parte superiore di una scheda attiva. Le schede sono i contenitori degli editor nell'area degli editor. È possibile aprire più schede in un gruppo di editor e possono esistere più gruppi di editor.",
-	"tabActiveUnfocusedBorder": "Bordo nella parte inferiore di una scheda attiva in un gruppo con stato non attivo. Le schede sono i contenitori degli editor nell'area degli editor. È possibile aprire più schede in un gruppo di editor e possono esistere più gruppi di editor.",
-	"tabActiveUnfocusedBorderTop": "Bordo nella parte superiore di una scheda attiva in un gruppo con stato non attivo. Le schede sono i contenitori degli editor nell'area degli editor. È possibile aprire più schede in un gruppo di editor e possono esistere più gruppi di editor.",
-	"tabHoverBorder": "Bordo da utilizzare per evidenziare la scheda al passaggio del mouse. Le schede sono i contenitori degli editor nell'area degli editor. È possibile aprire più schede in un gruppo di editor e possono esistere più gruppi di editor.",
-	"tabUnfocusedHoverBorder": "Bordo da utilizzare per evidenziare la scheda non attiva al passaggio del mouse. Le schede sono i contenitori degli editor nell'area degli editor. È possibile aprire più schede in un gruppo di editor e possono esistere più gruppi di editor.",
-	"tabActiveForeground": "Colore di primo piano delle schede attive in un gruppo attivo. Le schede sono i contenitori degli editor nell'area degli editor. È possibile aprire più schede in un gruppo di editor e possono esistere più gruppi di editor.",
-	"tabInactiveForeground": "Colore di primo piano delle schede inattive in un gruppo attivo. Le schede sono i contenitori degli editor nell'area degli editor. È possibile aprire più schede in un gruppo di editor e possono esistere più gruppi di editor.",
-	"tabUnfocusedActiveForeground": "Colore primo piano delle schede attive in un gruppo con stato non attivo. Le schede sono i contenitori degli editor nell'area degli editor. È possibile aprire più schede in un gruppo di editor e possono esistere più gruppi di editor.",
-	"tabUnfocusedInactiveForeground": "Colore primo piano delle schede inattiva in un gruppo con stato non attivo. Le schede sono i contenitori degli editor nell'area degli editor. È possibile aprire più schede in un gruppo di editor e possono esistere più gruppi di editor.",
-	"editorGroupBackground": "Colore di sfondo di un gruppo di editor. I gruppi di editor sono contenitori di editor. Il colore di sfondo viene visualizzato quando si trascinano i gruppi di editor in un'altra posizione.",
-	"tabsContainerBackground": "Colore di sfondo dell'intestazione del titolo di gruppo di editor, quando le schede sono abilitate. I gruppi di editor sono i contenitori degli editor.",
-	"tabsContainerBorder": "Colore del bordo dell'intestazione del titolo di gruppo di editor, quando le schede sono abilitate. I gruppi di editor sono i contenitori degli editor.",
-	"editorGroupHeaderBackground": "Colore di sfondo dell'intestazione del titolo dell'editor quando le schede sono disabilitate (`\"workbench.editor.showTabs\": false`). I gruppi di editor sono contenitori di editor.",
-	"editorGroupBorder": "Colore per separare più gruppi di editor l'uno dall'altro. I gruppi di editor sono i contenitori degli editor.",
-	"editorDragAndDropBackground": "Colore di sfondo quando si trascinano gli editor. Il colore dovrebbe avere una trasparenza impostata in modo che il contenuto dell'editor sia ancora visibile.",
-	"panelBackground": "Colore di sfondo dei pannelli. I pannelli sono visualizzati sotto l'area degli editor e contengono visualizzazioni quali quella di output e del terminale integrato.",
-	"panelBorder": "Colore del bordo dei pannelli per separarli dall'editor. I pannelli sono visualizzati sotto l'area dell'editor e contengono viste quali quella di output e del terminale integrato.",
-	"panelActiveTitleForeground": "Colore del titolo del pannello attivo. I pannelli sono visualizzati sotto l'area degli editor e contengono visualizzazioni quali quella di output e quella del terminale integrato.",
-	"panelInactiveTitleForeground": "Colore del titolo del pannello inattivo. I pannelli sono visualizzati sotto l'area degli editor e contengono visualizzazioni quali quella di output e quella del terminale integrato.",
-	"panelActiveTitleBorder": "Colore del bordo del titolo del pannello attivo. I pannelli sono visualizzati sotto l'area degli editor e contengono visualizzazioni quali quella di output e del terminale integrato.",
-	"panelDragAndDropBackground": "Colore di feedback trascinamento per il titolo del pannello. Il colore dovrebbe avere trasparenza in modo che le voci del pannello possono ancora trasparire. I pannelli vengono visualizzati sotto l'area dell'editor e contengono viste come quella di output e del terminale integrato.",
-	"statusBarForeground": "Colore primo piano quando viene aperta un'area di lavoro. La barra di stato è visualizzata nella parte inferiore della finestra.",
-	"statusBarNoFolderForeground": "Colore primo piano quando non ci sono cartelle aperte. La barra di stato è visualizzata nella parte inferiore della finestra.",
-	"statusBarBackground": "Colore di sfondo della barra di stato quando viene aperta un'area di lavoro. La barra di stato è visualizzata nella parte inferiore della finestra.",
-	"statusBarNoFolderBackground": "Colore di sfondo della barra di stato quando non ci sono cartelle aperte. La barra di stato è visualizzata nella parte inferiore della finestra.",
-	"statusBarBorder": "Colore del bordo della barra di stato che la separa dalla sidebar e dall'editor. La barra di stato è visualizzata nella parte inferiore della finestra.",
-	"statusBarNoFolderBorder": "Colore del bordo della barra di stato che la separa dalla barra laterale e dall'editor quando non ci sono cartelle aperte. La barra di stato è visualizzata nella parte inferiore della finestra.",
-	"statusBarItemActiveBackground": "Colore di sfondo degli elementi della barra di stato quando si fa clic. La barra di stato è visualizzata nella parte inferiore della finestra.",
-	"statusBarItemHoverBackground": "Colore di sfondo degli elementi della barra di stato al passaggio del mouse. La barra di stato è visualizzata nella parte inferiore della finestra.",
-	"statusBarProminentItemBackground": "Colore di sfondo degli elementi rilevanti della barra di stato. Gli elementi rilevanti spiccano rispetto ad altre voci della barra di stato. Per vedere un esempio, cambiare la modalità `Toggle Tab Key Moves Focus` nella barra dei comandi. La barra di stato è visualizzata nella parte inferiore della finestra.",
-	"statusBarProminentItemHoverBackground": "Colore di sfondo degli elementi rilevanti della barra di stato al passaggio del mouse. Gli elementi rilevanti spiccano rispetto ad altre voci della barra di stato. Per vedere un esempio, cambiare la modalità `Toggle Tab Key Moves Focus` nella barra dei comandi. La barra di stato è visualizzata nella parte inferiore della finestra.",
-	"activityBarBackground": "Colore di sfondo della barra attività. La barra attività viene visualizzata nella parte inferiore sinistra/destra e consente il passaggio tra diverse visualizzazioni della barra laterale",
-	"activityBarForeground": "Colore primo piano della barra attività (ad es. quello utilizzato per le icone). La barra attività viene mostrata all'estrema sinistra o destra e permette di alternare le visualizzazioni della barra laterale.",
-	"activityBarBorder": "Colore del bordo della barra attività che la separa dalla barra laterale. La barra di attività viene mostrata all'estrema sinistra o destra e permette di alternare le visualizzazioni della barra laterale.",
-	"activityBarDragAndDropBackground": "Colore feedback drag and drop per gli elementi della barra di attività. Il colore dovrebbe avere una trasparenza impostata in modo che le voci della barra di attività possano ancora essere visibili. La barra di attività viene mostrata all'estrema sinistra o destra e permette di alternare le visualizzazioni della barra laterale.",
-	"activityBarBadgeBackground": "Colore di sfondo della notifica utente dell'attività. La barra attività viene visualizzata all'estrema sinistra o all'estrema destra e consente di spostarsi tra le visualizzazioni della barra laterale.",
-	"activityBarBadgeForeground": "Colore primo piano della notifica utente dell'attività. La barra attività viene visualizzata all'estrema sinistra o all'estrema destra e consente di spostarsi tra le visualizzazioni della barra laterale.",
-	"sideBarBackground": "Colore di sfondo della barra laterale. La barra laterale è il contenitore per visualizzazioni come Explorer e ricerca.",
-	"sideBarForeground": "Colore primo piano della barra laterale. La barra laterale è il contenitore per le visualizzazioni come Esplora risorse e Cerca.",
-	"sideBarBorder": "Colore del bordo della barra laterale che la separa all'editor. La barra laterale è il contenitore per visualizzazioni come Esplora risorse e Cerca.",
-	"sideBarTitleForeground": "Colore primo piano del titolo della barra laterale. La barra laterale è il contenitore per visualizzazioni come Explorer e ricerca.",
-	"sideBarDragAndDropBackground": "Colore di retroazione di trascinamento della selezione per le sezioni della barra laterale. Il colore dovrebbe avere una trasparenza impostata in modo che le sezioni della barra laterale siano ancora visibili. La barra laterale è il contenitore di visualizzazioni come Esplora risorse e Cerca.",
-	"sideBarSectionHeaderBackground": "Colore di sfondo dell'intestazione di sezione della barra laterale. La barra laterale è il contenitore di visualizzazioni quali Esplora risorse e Cerca.",
-	"sideBarSectionHeaderForeground": "Colore primo piano dell'intestazione di sezione della barra laterale. La barra laterale è il contenitore di visualizzazioni come Esplora risorse e Cerca.",
-	"titleBarActiveForeground": "Colore primo piano della barra del titolo quando la finestra è attiva. Si noti che questo colore è attualmente supportato solo su macOS.",
-	"titleBarInactiveForeground": "Colore primo piano della barra del titolo quando la finestra è inattiva. Si noti che questo colore è attualmente supportato solo su macOS.",
-	"titleBarActiveBackground": "Colore di sfondo della barra di titolo quando la finestra è attiva. Si noti che questo colore è attualmente solo supportati su macOS.",
-	"titleBarInactiveBackground": "Colore di sfondo della barra del titolo quando la finestra è inattiva. Si noti che questo colore è attualmente supportato solo su macOS.",
-	"titleBarBorder": "Colore del bordo della barra di stato. Si noti che questo colore è attualmente supportato solo su macOS.",
-	"notificationCenterBorder": "Colore del bordo del centro notifiche. Le notifiche scorrono dalla parte inferiore destra della finestra.",
-	"notificationToastBorder": "Colore del bordo dell'avviso popup di notifica. Le notifiche scorrono dalla parte inferiore destra della finestra.",
-	"notificationsForeground": "Colore primo piano delle notifiche. Le notifiche scorrono dalla parte inferiore destra della finestra.",
-	"notificationsBackground": "Colore di sfondo delle notifiche. Le notifiche scorrono dalla parte inferiore destra della finestra.",
-	"notificationsLink": "Colore primo piano dei collegamenti delle notifiche. Le notifiche scorrono dalla parte inferiore destra della finestra.",
-	"notificationCenterHeaderForeground": "Colore primo piano dell'intestazione del centro notifiche. Le notifiche scorrono dalla parte inferiore destra della finestra.",
-	"notificationCenterHeaderBackground": "Colore di sfondo dell'intestazione del centro notifiche. Le notifiche scorrono dalla parte inferiore destra della finestra.",
-	"notificationsBorder": "Colore del bordo che separa le notifiche da altre notifiche nel centro notifiche. Le notifiche scorrono dalla parte inferiore destra della finestra."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/common/views.i18n.json b/i18n/ita/src/vs/workbench/common/views.i18n.json
deleted file mode 100644
index eb055ed4506..00000000000
--- a/i18n/ita/src/vs/workbench/common/views.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"duplicateId": "Nel percorso '{1}' è già registrata una visualizzazione con ID '{0}' "
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/electron-browser/actions.i18n.json b/i18n/ita/src/vs/workbench/electron-browser/actions.i18n.json
deleted file mode 100644
index 9737d645d67..00000000000
--- a/i18n/ita/src/vs/workbench/electron-browser/actions.i18n.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"closeWindow": "Chiudi finestra",
-	"closeWorkspace": "Chiudi area di lavoro",
-	"noWorkspaceOpened": "In questa istanza non ci sono attualmente aree di lavoro aperte da chiudere.",
-	"newWindow": "Nuova finestra",
-	"toggleFullScreen": "Attiva/Disattiva schermo intero",
-	"toggleMenuBar": "Attiva/Disattiva barra dei menu",
-	"toggleDevTools": "Attiva/Disattiva strumenti di sviluppo",
-	"zoomIn": "Zoom avanti",
-	"zoomOut": "Zoom indietro",
-	"zoomReset": "Reimposta zoom",
-	"appPerf": "Prestazioni all'avvio",
-	"reloadWindow": "Ricarica finestra",
-	"reloadWindowWithExntesionsDisabled": "Ricarica la finestra con le estensioni disabilitate",
-	"switchWindowPlaceHolder": "Selezionare una finestra a cui passare",
-	"current": "Finestra corrente",
-	"close": "Chiudi finestra",
-	"switchWindow": "Cambia finestra...",
-	"quickSwitchWindow": "Cambio rapido finestra...",
-	"workspaces": "aree di lavoro",
-	"files": "file",
-	"openRecentPlaceHolderMac": "Selezionare per aprirlo (tenere premuto CMD per aprire l'elemento in una nuova finestra)",
-	"openRecentPlaceHolder": "Selezionare per aprirlo (tenere premuto CTRL per aprire l'elemento in una nuova finestra)",
-	"remove": "Rimuovi dagli elementi aperti di recente",
-	"openRecent": "Apri recenti...",
-	"quickOpenRecent": "Apertura rapida recenti...",
-	"reportIssueInEnglish": "Segnala problema",
-	"openProcessExplorer": "Apri Esplora processi",
-	"reportPerformanceIssue": "Segnala problema di prestazioni",
-	"keybindingsReference": "Riferimento per tasti di scelta rapida",
-	"openDocumentationUrl": "Documentazione",
-	"openIntroductoryVideosUrl": "Video introduttivi",
-	"openTipsAndTricksUrl": "Suggerimenti e trucchi",
-	"toggleSharedProcess": "Attiva/Disattiva processo condiviso",
-	"navigateLeft": "Passa alla visualizzazione a sinistra",
-	"navigateRight": "Passa alla visualizzazione a destra",
-	"navigateUp": "Passa alla visualizzazione in alto",
-	"navigateDown": "Passa alla visualizzazione in basso",
-	"increaseViewSize": "Aumenta la dimensione della visualizzazione corrente",
-	"decreaseViewSize": "Diminuisce la dimensione della visualizzazione corrente",
-	"showPreviousTab": "Visualizza scheda della finestra precedente",
-	"showNextWindowTab": "Visualizza scheda della finestra successiva",
-	"moveWindowTabToNewWindow": "Sposta scheda della finestra in una nuova finestra",
-	"mergeAllWindowTabs": "Unisci tutte le finestre",
-	"toggleWindowTabsBar": "Attiva/Disattiva barra delle schede delle finestre",
-	"about": "Informazioni su {0}",
-	"inspect context keys": "Esamina le chiavi di contesto"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/electron-browser/commands.i18n.json b/i18n/ita/src/vs/workbench/electron-browser/commands.i18n.json
deleted file mode 100644
index 983899514ca..00000000000
--- a/i18n/ita/src/vs/workbench/electron-browser/commands.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"diffLeftRightLabel": "{0} ⟷ {1}"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/electron-browser/configureLocale.i18n.json b/i18n/ita/src/vs/workbench/electron-browser/configureLocale.i18n.json
deleted file mode 100644
index a124f7f6f31..00000000000
--- a/i18n/ita/src/vs/workbench/electron-browser/configureLocale.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"configureLocale": "Configura lingua",
-	"displayLanguage": "Definisce la lingua visualizzata di VSCode.",
-	"doc": "Per un elenco delle lingue supportate, vedere {0}.",
-	"restart": "Se si modifica il valore, è necessario riavviare VSCode.",
-	"fail.createSettings": "Non è possibile creare '{0}' ({1}).",
-	"JsonSchema.locale": "Linguaggio dell'interfaccia utente da usare."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/electron-browser/crashReporter.i18n.json b/i18n/ita/src/vs/workbench/electron-browser/crashReporter.i18n.json
deleted file mode 100644
index f3982be9f88..00000000000
--- a/i18n/ita/src/vs/workbench/electron-browser/crashReporter.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"telemetryConfigurationTitle": "Telemetria",
-	"telemetry.enableCrashReporting": "Consente l'invio di segnalazioni di arresto anomalo del sistema a Microsoft.\nPer rendere effettiva questa opzione, è necessario riavviare."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/electron-browser/extensionHost.i18n.json b/i18n/ita/src/vs/workbench/electron-browser/extensionHost.i18n.json
deleted file mode 100644
index 0aa001ff5f3..00000000000
--- a/i18n/ita/src/vs/workbench/electron-browser/extensionHost.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"extensionHostProcess.startupFailDebug": "L'host dell'estensione non è stato avviato entro 10 secondi. Potrebbe essersi arrestato alla prima riga e richiedere un debugger per continuare.",
-	"extensionHostProcess.startupFail": "L'host dell'estensione non è stato avviato entro 10 secondi. Potrebbe essersi verificato un problema.",
-	"extensionHostProcess.error": "Errore restituito dall'host dell'estensione: {0}",
-	"devTools": "Strumenti di sviluppo",
-	"extensionHostProcess.crash": "L'host dell'estensione è stato terminato in modo imprevisto. Ricaricare la finestra per ripristinare."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/electron-browser/main.contribution.i18n.json b/i18n/ita/src/vs/workbench/electron-browser/main.contribution.i18n.json
deleted file mode 100644
index 16fec1a5d98..00000000000
--- a/i18n/ita/src/vs/workbench/electron-browser/main.contribution.i18n.json
+++ /dev/null
@@ -1,91 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"view": "Visualizza",
-	"help": "Guida",
-	"file": "File",
-	"workspaces": "Aree di lavoro",
-	"developer": "Sviluppatore",
-	"workbenchConfigurationTitle": "Area di lavoro",
-	"showEditorTabs": "Controlla se visualizzare o meno gli editor aperti in schede.",
-	"workbench.editor.labelFormat.default": "Visualizza il nome del file. Quando le schede sono abilitate e due file hanno lo stesso nome in un unico gruppo, vengono aggiunte le sezioni distintive del percorso di ciascun file. Quando le schede sono disabilitate, se l'editor è attivo, viene visualizzato il percorso relativo alla radice dell'area di lavoro.",
-	"workbench.editor.labelFormat.short": "Visualizza il nome del file seguito dal relativo nome di directory.",
-	"workbench.editor.labelFormat.medium": "Visualizza il nome del file seguito dal proprio percorso, relativo alla radice dell'area di lavoro.",
-	"workbench.editor.labelFormat.long": "Visualizza il nome del file seguito dal relativo percorso assoluto.",
-	"tabDescription": "Controlla il formato dell'etichetta per un editor. Se si modifica questa impostazione, ad esempio, risulterà più agevole individuare il percorso di un file:\n- short:   'parent'\n- medium:  'workspace/src/parent'\n- long:    '/home/user/workspace/src/parent'\n- default: '.../parent', quando un'altra scheda condivide lo stesso titolo, oppure il percorso relativo dell'area di lavoro se le schede sono disabilitate",
-	"editorTabCloseButton": "Controlla la posizione dei pulsanti di chiusura delle schede dell'editor oppure li disabilita quando è impostata su 'off'.",
-	"tabSizing": "Controlla il ridimensionamento delle schede dell'editor. Impostare su 'fit' per adattare le dimensioni delle schede in modo che l'intera etichetta dell'editor sia visibile. Impostare su 'shrink' per consentire il ridimensionamento delle schede qaundo lo spazio disponibile è insufficiente per visualizzare tutte le schede contemporaneamente.",
-	"showIcons": "Controlla se visualizzare o meno un'icona per gli editor aperti. Richiede l'abilitazione anche di un tema dell'icona.",
-	"enablePreview": "Controlla se gli editor aperti vengono visualizzati come anteprima. Le anteprime editor vengono riutilizzate finché vengono mantenute (ad esempio tramite doppio clic o modifica) e vengono visualizzate in corsivo.",
-	"enablePreviewFromQuickOpen": "Controlla se gli editor aperti da Quick Open vengono visualizzati come anteprima. Le anteprime editor vengono riutilizzate finché vengono mantenute, ad esempio tramite doppio clic o modifica.",
-	"closeOnFileDelete": "Controlla se gli editor che visualizzano un file devono chiudersi automaticamente quando il file viene eliminato o rinominato da un altro processo. Se si disabilita questa opzione, in una simile circostanza l'editor verrà aperto e i file risulteranno modificati ma non salvati. Nota: se si elimina il file dall'interno dell'applicazione, l'editor verrà sempre chiuso e i file modificati ma non salvati non verranno mai chiusi allo scopo di salvaguardare i dati.",
-	"editorOpenPositioning": "Controlla la posizione in cui vengono aperti gli editor. Selezionare 'sinistra' o 'destra' per aprire gli editor a sinistra o a destra di quello attualmente attivo. Selezionare 'primo' o 'ultimo' per aprire gli editor indipendentemente da quello attualmente attivo.",
-	"revealIfOpen": "Controlla se un editor viene visualizzato in uno qualsiasi dei gruppi visibili se viene aperto. Se l'opzione è disabilitata, un editor verrà aperto preferibilmente nel gruppo di editor attualmente attivo. Se è abilitata, un editor già aperto verrà visualizzato e non aperto di nuovo nel gruppo di editor attualmente attivo. Nota: in alcuni casi questa impostazione viene ignorata, ad esempio quando si forza l'apertura di un editor in un gruppo specifico oppure a lato del gruppo attualmente attivo.",
-	"swipeToNavigate": "Scorrere orizzontalmente con tre dita per spostarsi tra i file aperti.",
-	"commandHistory": "Controlla il numero di comandi utilizzati di recente da mantenere nella cronologia. Impostare a 0 per disabilitare la cronologia dei comandi.",
-	"preserveInput": "Controlla se l'ultimo input digitato nel riquadro comandi deve essere ripristinato alla successiva riapertura del riquadro.",
-	"closeOnFocusLost": "Controlla se Quick Open deve essere chiuso automaticamente quando perde lo stato attivo.",
-	"openDefaultSettings": "Controlla se all'apertura delle impostazioni viene aperto anche un editor che mostra tutte le impostazioni predefinite.",
-	"sideBarLocation": "Controlla la posizione della barra laterale. Può essere visualizzata a sinistra o a destra del workbench.",
-	"panelDefaultLocation": "Controlla la posizione predefinita del pannello. Può essere mostrato nella parte inferiore o a destra del banco di lavoro.",
-	"statusBarVisibility": "Controlla la visibilità della barra di stato nella parte inferiore del workbench.",
-	"activityBarVisibility": "Controlla la visibilità della barra attività nel workbench.",
-	"viewVisibility": "Controlla la visibilità delle azioni dell'intestazione della visualizzazione. Le azioni dell'intestazione della visualizzazione possono essere sempre visibili oppure visibili solo quando lo stato attivo è spostato sulla visualizzazione o si passa con il puntatore sulla visualizzazione.",
-	"fontAliasing": "Controlla il metodo di aliasing dei caratteri nell'area di lavoro.\n- default: anti-aliasing dei caratteri a livello di sub-pixel. Nella maggior parte delle visualizzazioni non retina consentirà di ottenere un testo con il massimo contrasto.\n- antialiased: anti-aliasing dei caratteri a livello di pixel, invece che a livello di sub-pixel. Consente di visualizzare i caratteri più chiari.\n- none: disabilita l'anti-aliasing dei caratteri. Il testo verrà visualizzato con contorni irregolari.\n- auto: applica automaticamente `default` o `antialiased` in base al valore DPI degli schermi.",
-	"workbench.fontAliasing.default": "Anti-aliasing dei caratteri a livello di sub-pixel. Nella maggior parte delle visualizzazioni non retina consentirà di ottenere un testo con il massimo contrasto.",
-	"workbench.fontAliasing.antialiased": "Anti-aliasing dei caratteri a livello di pixel, invece che a livello di sub-pixel. Consente di visualizzare i caratteri più chiari.",
-	"workbench.fontAliasing.none": "Disabilita l'anti-aliasing dei caratteri. Il testo verrà visualizzato con contorni irregolari. ",
-	"workbench.fontAliasing.auto": "Applica automaticamente `default` o `antialiased` in base al valore DPI degli schermi.",
-	"enableNaturalLanguageSettingsSearch": "Controlla se abilitare la modalità di ricerca in linguaggio naturale per le impostazioni.",
-	"windowConfigurationTitle": "Finestra",
-	"window.openFilesInNewWindow.on": "I file verranno aperti in una nuova finestra",
-	"window.openFilesInNewWindow.off": "I file verranno aperti nella finestra con la cartella dei file aperta o nell'ultima finestra attiva",
-	"window.openFilesInNewWindow.defaultMac": "I file verranno aperti nella finestra con la cartella dei file aperta o nell'ultima finestra attiva a meno che non vengano aperti tramite il pannello Dock o da Finder",
-	"window.openFilesInNewWindow.default": "I file verranno aperti in una nuova finestra a meno che non vengano selezionati all'interno dell'applicazione, ad esempio tramite il menu File",
-	"openFilesInNewWindowMac": "Controlla se i file devono essere aperti in una nuova finestra.\n- default: i file verranno aperti nella finestra con la cartella dei file aperta o nell'ultima finestra attiva a meno che non vengano aperti tramite il pannello Dock o da Finder\n- on: i file verranno aperti in una nuova finestra\n- off: i file verranno aperti nella finestra con la cartella dei file aperta o nell'ultima finestra attiva\nNota: possono comunque verificarsi casi in cui questa impostazione viene ignorata, ad esempio quando si usa l'opzione della riga di comando -new-window o -reuse-window.",
-	"openFilesInNewWindow": "Controlla se i file devono essere aperti in una nuova finestra.\n- default: i file verranno aperti in una nuova finestra a meno che non vengano selezionati all'interno dell'applicazione, ad esempio tramite il menu File\n- on: i file verranno aperti in una nuova finestra\n- off: i file verranno aperti nella finestra con la cartella dei file aperta o nell'ultima finestra attiva\nNota: possono comunque verificarsi casi in cui questa impostazione viene ignorata, ad esempio quando si usa l'opzione della riga di comando -new-window o -reuse-window.",
-	"window.openFoldersInNewWindow.on": "Le cartelle verranno aperte in una nuova finestra",
-	"window.openFoldersInNewWindow.off": "Le cartelle sostituiranno l'ultima finestra attiva",
-	"window.openFoldersInNewWindow.default": "Le cartelle verranno aperte in una nuova finestra a meno che non si selezioni una cartella dall'interno dell'applicazione, ad esempio tramite il menu File",
-	"openFoldersInNewWindow": "Controlla se le cartelle devono essere aperte in una nuova finestra o sostituire l'ultima finestra attiva.\n- default: le cartelle verranno aperte in una nuova finestra a meno che non si selezioni una cartella dall'interno dell'applicazione, ad esempio tramite il menu File\n- on: le cartelle verranno aperte in una nuova finestra\n- off: le cartelle sostituiranno l'ultima finestra attiva\nNota: possono comunque verificarsi casi in cui questa impostazione viene ignorata, ad esempio quando si usa l'opzione della riga di comando -new-window o -reuse-window.",
-	"window.openWithoutArgumentsInNewWindow.on": "Apri una nuova finestra vuota",
-	"window.openWithoutArgumentsInNewWindow.off": "Imposta lo stato attivo sull'ultima istanza in esecuzione attiva",
-	"openWithoutArgumentsInNewWindow": "Controlla se deve essere aperta una nuova finestra vuota quando si avvia una seconda istanza senza argomento o se è necessario impostare lo stato attivo sull'ultima istanza in esecuzione.\n- on: apre una nuova finestra vuota\n- off: imposta lo stato attivo sull'ultima istanza in esecuzione attiva\nNota: possono comunque verificarsi casi in cui questa impostazione viene ignorata, ad esempio quando si usa l'opzione della riga di comando -new-window o -reuse-window.",
-	"window.reopenFolders.all": "Riapre tutte le finestre.",
-	"window.reopenFolders.folders": "Riapre tutte le cartelle. Le aree di lavoro vuote non verranno ripristinate.",
-	"window.reopenFolders.one": "Riapre l'ultima finestra attiva.",
-	"window.reopenFolders.none": "Non riapre mai una finestra. Inizia sempre con una finestra vuota.",
-	"restoreWindows": "Controlla la modalità di riapertura delle finestre dopo un riavvio. Selezionare 'none' per iniziare sempre con un'area di lavoro vuota, 'one' per riaprire l'ultima finestra usata,  'folders' per riaprire tutte le finestre con cartelle aperte oppure 'all' per riaprire tutte le finestre dell'ultima sessione.",
-	"restoreFullscreen": "Controlla se una finestra deve essere ripristinata a schermo intero se è stata chiusa in questa modalità.",
-	"zoomLevel": "Consente di modificare il livello di zoom della finestra. Il valore originale è 0 e ogni incremento superiore (ad esempio 1) o inferiore (ad esempio -1) rappresenta un aumento o una diminuzione del 20% della percentuale di zoom. È anche possibile immettere valori decimali per modificare il livello di zoom con maggiore granularità.",
-	"title": "Controlla il titolo della finestra in base all'editor attivo. Le variabili vengono sostituite in base al contesto:\n${activeEditorShort}: nome del file (ad es. MyFile.txt)\n${activeEditorMedium}: percorso del file relativo alla cartella dell'area di lavoro (ad es. myFolder/myFile.txt)\n${activeEditorLong}: percorso completo del file (ad es. / Users/Development/myProject/myFolder/myFile.txt)\n${folderName}: nome della cartella dell'area di lavoro in cui è contenuto il file (ad es. myFolder)\n${folderPath}: percorso della cartella dell'area di lavoro in cui è contenuto il file (ad es. /Users/Development/myFolder)\n${rootName}: nome dell'area di lavoro (ad es. myFolder o myWorkspace)\n${rootPath}: percorso dell'area di lavoro (ad es. /Users/Development/myWorkspace)\n$(appName): ad esempio VS Code\n${dirty}: indica se l'editor attivo è in fase di modifica\n${separator}: separatore condizionale (\" - \") che viene visualizzato solo quando circondato da variabili con valori o testo statico",
-	"window.newWindowDimensions.default": "Apre nuove finestre al centro della schermata.",
-	"window.newWindowDimensions.inherit": "Apre nuove finestre le cui dimensioni sono uguali a quelle dell'ultima finestra attiva.",
-	"window.newWindowDimensions.maximized": "Apre nuove finestre ingrandite a schermo intero.",
-	"window.newWindowDimensions.fullscreen": "Apre nuove finestre nella modalità a schermo intero.",
-	"newWindowDimensions": "Controlla le dimensioni relative all'apertura di una nuova finestra quando almeno un'altra finestra è già aperta. Per impostazione predefinita, una nuova finestra di dimensioni ridotte viene aperta al centro della schermata. Se è impostata su 'inherit', la finestra assumerà le stesse dimensioni dell'ultima finestra attiva. Se è impostata su 'maximized', la finestra aperta risulterà ingrandita, mentre con 'fullscreen' verrà visualizzata a schermo intero. Sia noti che questa impostazione non impatta sulla prima finestra che era stata aperta. La prima finestra si riaprirà sempre con la dimensione e la posizione che aveva prima della chiusura.",
-	"closeWhenEmpty": "Controlla se con la chiusura dell'ultimo editor deve essere chiusa ancge la finestra. Questa impostazione viene applicata solo alle finestre che non contengono cartelle.",
-	"window.menuBarVisibility.default": "Il menu è nascosto solo nella modalità a schermo intero.",
-	"window.menuBarVisibility.visible": "Il menu è sempre visibile, anche nella modalità a schermo intero.",
-	"window.menuBarVisibility.toggle": "Il menu è nascosto ma può essere visualizzato premendo ALT.",
-	"window.menuBarVisibility.hidden": "Il menu è sempre nascosto.",
-	"menuBarVisibility": "Controlla la visibilità della barra dei menu. L'impostazione 'toggle' indica che la barra dei menu è nascosta e che per visualizzarla è necessario premere una sola volta il tasto ALT. Per impostazione predefinita, la barra dei menu è visibile a meno che la finestra non sia a schermo intero.",
-	"enableMenuBarMnemonics": "Se abilitato, i menu principali possono essere aperti tramite tasti di scelta rapida Alt + tasto. Disattivare i tasti di scelta permette invece di associare questi tasti di scelta rapida Alt + tasto ai comandi dell'editor.",
-	"autoDetectHighContrast": "Se è abilitata, passa automaticamente a un tema a contrasto elevato se Windows usa un tema di questo tipo e al tipo scuro quando non si usa più un tema a contrasto elevato Windows.",
-	"titleBarStyle": "Consente di modificare l'aspetto della barra del titolo della finestra. Per applicare le modifiche, è necessario un riavvio completo.",
-	"window.nativeTabs": "Abilita le finestre di tab per macOS Sierra. La modifica richiede un riavvio. Eventuali personalizzazioni della barra del titolo verranno disabilitate",
-	"window.smoothScrollingWorkaround": "Abilitare questa soluzione alternativa se lo scorrimento non è più fluido dopo il ripristino di una finestra di VS Code ridotta a icona. Si tratta di una soluzione alternativa per un problema (https://github.com/Microsoft/vscode/issues/13612) in cui si verificano ritardi nello scorrimento in dispositivi con trackpad di precisione, come quelli Surface di Microsoft. Se si abilita questa soluzione alternativa, si potrebbe riscontrare un certo sfarfallio del layout dopo aver ripristinato la finestra ridotta a icona alle dimensioni normali, ma in altre situazioni non produce alcun effetto negativo.",
-	"window.clickThroughInactive": "Se è abilitata, facendo clic su una finestra inattiva si attiverà non solo la finestra, ma anche l'elemento su cui è posizionato il puntatore del mouse se è selezionabile. Se è disabilitata, facendo clic in un punto qualsiasi in una finestra inattiva verrà attivata solo la finestra e sarà necessario fare di nuovo clic sull'elemento.",
-	"zenModeConfigurationTitle": "Modalità Zen",
-	"zenMode.fullScreen": "Consente di controllare se attivando la modalità Zen anche l'area di lavoro passa alla modalità schermo intero.",
-	"zenMode.centerLayout": "Controlla se attivando la modalità Zen viene centrato anche il layout.",
-	"zenMode.hideTabs": "Controlla se attivando la modalità Zen vengono nascoste anche le schede del workbench.",
-	"zenMode.hideStatusBar": "Controlla se attivando la modalità Zen viene nascosta anche la barra di stato nella parte inferiore del workbench.",
-	"zenMode.hideActivityBar": "Controlla se attivando la modalità Zen viene nascosta anche la barra di stato alla sinistra del workbench",
-	"zenMode.restore": "Controlla se una finestra deve essere ripristinata nella modalità Zen se è stata chiusa in questa modalità."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/electron-browser/main.i18n.json b/i18n/ita/src/vs/workbench/electron-browser/main.i18n.json
deleted file mode 100644
index ece346caeeb..00000000000
--- a/i18n/ita/src/vs/workbench/electron-browser/main.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"loaderError": "Non è stato possibile caricare un file obbligatorio. Non si è più connessi a Internet oppure il server a cui si è connessi è offline. Per riprovare, aggiornare il browser.",
-	"loaderErrorNative": "Non è stato possibile caricare un file obbligatorio. Riavviare l'applicazione e riprovare. Dettagli: {0}"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/electron-browser/shell.i18n.json b/i18n/ita/src/vs/workbench/electron-browser/shell.i18n.json
deleted file mode 100644
index efda81182a1..00000000000
--- a/i18n/ita/src/vs/workbench/electron-browser/shell.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"runningAsRoot": "È consigliabile non eseguire il codice come 'radice'."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/electron-browser/window.i18n.json b/i18n/ita/src/vs/workbench/electron-browser/window.i18n.json
deleted file mode 100644
index 44890b35904..00000000000
--- a/i18n/ita/src/vs/workbench/electron-browser/window.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"undo": "Annulla",
-	"redo": "Ripristina",
-	"cut": "Taglia",
-	"copy": "Copia",
-	"paste": "Incolla",
-	"selectAll": "Seleziona tutto",
-	"runningAsRoot": "Non è consigliabile eseguire {0} come utente root."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/electron-browser/workbench.i18n.json b/i18n/ita/src/vs/workbench/electron-browser/workbench.i18n.json
deleted file mode 100644
index 9cbbdc70aa8..00000000000
--- a/i18n/ita/src/vs/workbench/electron-browser/workbench.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"developer": "Sviluppatore",
-	"file": "File"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/node/extensionHostMain.i18n.json b/i18n/ita/src/vs/workbench/node/extensionHostMain.i18n.json
deleted file mode 100644
index 88bba9dbd53..00000000000
--- a/i18n/ita/src/vs/workbench/node/extensionHostMain.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"extensionTestError": "Il percorso {0} non punta a un Test Runner di estensioni valido."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/node/extensionPoints.i18n.json b/i18n/ita/src/vs/workbench/node/extensionPoints.i18n.json
deleted file mode 100644
index a8123821923..00000000000
--- a/i18n/ita/src/vs/workbench/node/extensionPoints.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"jsonParseFail": "Non è stato possibile analizzare {0}: {1}.",
-	"fileReadFail": "Non è possibile leggere il file {0}: {1}.",
-	"jsonsParseFail": "Non è stato possibile analizzare {0} o {1}: {2}.",
-	"missingNLSKey": "Il messaggio per la chiave {0} non è stato trovato."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/cli/electron-browser/cli.contribution.i18n.json b/i18n/ita/src/vs/workbench/parts/cli/electron-browser/cli.contribution.i18n.json
deleted file mode 100644
index d0f8b32e972..00000000000
--- a/i18n/ita/src/vs/workbench/parts/cli/electron-browser/cli.contribution.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"install": "Installa il comando '{0}' in PATH",
-	"not available": "Questo comando non è disponibile",
-	"successIn": "Il comando della shell '{0}' è stato installato in PATH.",
-	"ok": "OK",
-	"cancel2": "Annulla",
-	"warnEscalation": "Visual Studio Code eseguirà 'osascript' per richiedere i privilegi di amministratore per installare il comando della shell.",
-	"cantCreateBinFolder": "Non è possibile creare '/usr/local/bin'.",
-	"aborted": "Operazione interrotta",
-	"uninstall": "Disinstalla il comando '{0}' da PATH",
-	"successFrom": "Il comando della shell '{0}' è stato disinstallato da PATH.",
-	"shellCommand": "Comando della shell"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/codeEditor/electron-browser/accessibility.i18n.json b/i18n/ita/src/vs/workbench/parts/codeEditor/electron-browser/accessibility.i18n.json
deleted file mode 100644
index 70f3a0973ba..00000000000
--- a/i18n/ita/src/vs/workbench/parts/codeEditor/electron-browser/accessibility.i18n.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"emergencyConfOn": "Modifica dell'impostazione 'editor.accessibilitySupport' a 'on' in corso.",
-	"openingDocs": "Apertura della pagina di documentazione sull'accessibilità di VS Code in corso.",
-	"introMsg": "Grazie per aver provato le opzioni di accessibilità di Visual Studio Code.",
-	"status": "Stato:",
-	"changeConfigToOnMac": "Premere Comando+E per configurare l'editor per essere definitivamente ottimizzato per l'utilizzo con un un'utilità per la lettura dello schermo.",
-	"changeConfigToOnWinLinux": "Premere Control+E per configurare l'editor per essere definitivamente ottimizzato per l'utilizzo con un un'utilità per la lettura dello schermo.",
-	"auto_unknown": "L'editor è configurato per utilizzare le API della piattaforma per rilevare quando è collegata un'utilità per la lettura dello schermo ma il runtime corrente non lo supporta.",
-	"auto_on": "L'editor ha rilevato automaticamente che è collegata un'utilità per la lettura dello schermo.",
-	"auto_off": "L'editor è configurato per rilevare automaticamente quando è collegata un'utilità per la lettura dello schermo, che non è collegata in questo momento.",
-	"configuredOn": "L'editor è configurato per essere definitivamente ottimizzato per l'utilizzo con un'utilità per la lettura dello schermo - è possibile modificare questo modificando l'impostazione 'editor.accessibilitySupport'.",
-	"configuredOff": "L'editor è configurato per non essere ottimizzato per l'utilizzo con un'utilità per la lettura dello schermo.",
-	"tabFocusModeOnMsg": "Premere TAB nell'editor corrente per spostare lo stato attivo sull'elemento con stato attivabile successivo. Per attivare/disattivare questo comportamento, premere {0}.",
-	"tabFocusModeOnMsgNoKb": "Premere TAB nell'editor corrente per spostare lo stato attivo sull'elemento con stato attivabile successivo. Il comando {0} non può essere attualmente attivato con un tasto di scelta rapida.",
-	"tabFocusModeOffMsg": "Premere TAB nell'editor corrente per inserire il carattere di tabulazione. Per attivare/disattivare questo comportamento, premere {0}.",
-	"tabFocusModeOffMsgNoKb": "Premere TAB nell'editor corrente per inserire il carattere di tabulazione. Il comando {0} non può essere attualmente attivato con un tasto di scelta rapida.",
-	"openDocMac": "Premere Comando+H per aprire una finestra del browser con maggiori informazioni relative all'accessibilità di VS Code.",
-	"openDocWinLinux": "Premere Control+H per aprire una finestra del browser con maggiori informazioni relative all'accessibilità di VS Code.",
-	"outroMsg": "Per chiudere questa descrizione comando e tornare all'editor, premere ESC o MAIUSC+ESC.",
-	"ShowAccessibilityHelpAction": "Visualizza la Guida sull'accessibilità"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/codeEditor/electron-browser/inspectKeybindings.i18n.json b/i18n/ita/src/vs/workbench/parts/codeEditor/electron-browser/inspectKeybindings.i18n.json
deleted file mode 100644
index 3c25715487c..00000000000
--- a/i18n/ita/src/vs/workbench/parts/codeEditor/electron-browser/inspectKeybindings.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"workbench.action.inspectKeyMap": "Sviluppatore: controlla mapping tasti"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/codeEditor/electron-browser/inspectTMScopes.i18n.json b/i18n/ita/src/vs/workbench/parts/codeEditor/electron-browser/inspectTMScopes.i18n.json
deleted file mode 100644
index 9fcc4080ecc..00000000000
--- a/i18n/ita/src/vs/workbench/parts/codeEditor/electron-browser/inspectTMScopes.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"inspectTMScopes": "Sviluppatore: controlla ambiti TextMate",
-	"inspectTMScopesWidget.loading": "Caricamento..."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/codeEditor/electron-browser/languageConfiguration/languageConfigurationExtensionPoint.i18n.json b/i18n/ita/src/vs/workbench/parts/codeEditor/electron-browser/languageConfiguration/languageConfigurationExtensionPoint.i18n.json
deleted file mode 100644
index ee8766b9b8b..00000000000
--- a/i18n/ita/src/vs/workbench/parts/codeEditor/electron-browser/languageConfiguration/languageConfigurationExtensionPoint.i18n.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"parseErrors": "Errori durante l'analisi di {0}: {1}",
-	"schema.openBracket": "Sequenza di stringa o carattere parentesi quadra di apertura.",
-	"schema.closeBracket": "Sequenza di stringa o carattere parentesi quadra di chiusura.",
-	"schema.comments": "Definisce i simboli di commento",
-	"schema.blockComments": "Definisce il modo in cui sono contrassegnati i commenti per il blocco.",
-	"schema.blockComment.begin": "Sequenza di caratteri che indica l'inizio di un commento per il blocco.",
-	"schema.blockComment.end": "Sequenza di caratteri che termina i commenti per il blocco.",
-	"schema.lineComment": "Sequenza di caratteri che indica l'inizio di un commento per la riga.",
-	"schema.brackets": "Definisce i simboli di parentesi quadra che aumentano o riducono il rientro.",
-	"schema.autoClosingPairs": "Definisce le coppie di parentesi quadre. Quando viene immessa una parentesi quadra di apertura, quella di chiusura viene inserita automaticamente.",
-	"schema.autoClosingPairs.notIn": "Definisce un elenco di ambiti in cui la corrispondenza automatica delle coppie è disabilitata.",
-	"schema.surroundingPairs": "Definisce le coppie di parentesi quadre che possono essere usate per racchiudere una stringa selezionata.",
-	"schema.wordPattern": "La definizione di parola per il linguaggio.",
-	"schema.wordPattern.pattern": "Il modello di RegExp utilizzato per trovare parole.",
-	"schema.wordPattern.flags": "I flag di RegExp utilizzati per trovare parole.",
-	"schema.wordPattern.flags.errorMessage": "Deve corrispondere al modello `/^([gimuy]+)$/`.",
-	"schema.indentationRules": "Impostazioni di rientro del linguaggio.",
-	"schema.indentationRules.increaseIndentPattern": "Se una riga corrisponde a questo criterio, tutte le linee successive devono essere rientrate una volta (fino alla corrispondenza di un'altra regola).",
-	"schema.indentationRules.increaseIndentPattern.pattern": "Criterio di RegExp per increaseIndentPattern.",
-	"schema.indentationRules.increaseIndentPattern.flags": "Flag di RegExp per increaseIndentPattern.",
-	"schema.indentationRules.increaseIndentPattern.errorMessage": "Deve corrispondere al modello `/^([gimuy]+)$/`.",
-	"schema.indentationRules.decreaseIndentPattern": "Se una riga corrisponde a questo criterio, il rientro di tutte le linee successive verrà ridotto una volta (fino alla corrispondenza di un'altra regola).",
-	"schema.indentationRules.decreaseIndentPattern.pattern": "Criterio di RegExp per decreaseIndentPattern.",
-	"schema.indentationRules.decreaseIndentPattern.flags": "Flag di RegExp per decreaseIndentPattern.",
-	"schema.indentationRules.decreaseIndentPattern.errorMessage": "Deve corrispondere al modello `/^([gimuy]+)$/`.",
-	"schema.indentationRules.indentNextLinePattern": "Se una riga corrisponde a questo criterio, il rientro verrà applicato una sola volta **solo alla riga successiva**.",
-	"schema.indentationRules.indentNextLinePattern.pattern": "Criterio di RegExp per indentNextLinePattern.",
-	"schema.indentationRules.indentNextLinePattern.flags": "Flag di RegExp per indentNextLinePattern.",
-	"schema.indentationRules.indentNextLinePattern.errorMessage": "Deve corrispondere al modello `/^([gimuy]+)$/`.",
-	"schema.indentationRules.unIndentedLinePattern": "Se una riga corrisponde a questo criterio, il rientro non deve essere modificato e la riga non deve essere valutata rispetto alle altre regole.",
-	"schema.indentationRules.unIndentedLinePattern.pattern": "Criterio di RegExp per unIndentedLinePattern.",
-	"schema.indentationRules.unIndentedLinePattern.flags": "Flag di RegExp per unIndentedLinePattern.",
-	"schema.indentationRules.unIndentedLinePattern.errorMessage": "Deve corrispondere al modello `/^([gimuy]+)$/`.",
-	"schema.folding": "Impostazioni di riduzione del codice del linguaggio.",
-	"schema.folding.offSide": "Un linguaggio è conforme alla regola di offside se i blocchi in tale linguaggio vengono espressi in base al relativo rientro. Se questa opzione è impostata, le righe vuote appartengono al blocco successivo.",
-	"schema.folding.markers": "Marcatori di riduzione del codice specifici del linguaggio, come '#region' e '#endregion'. Le espressioni regolari di inizio e fine verranno confrontate con il contenuto di tutte le righe e devono essere progettate in modo efficace",
-	"schema.folding.markers.start": "Criterio di espressione regolare per il marcatore di inizio. L'espressione regolare deve iniziare con '^'.",
-	"schema.folding.markers.end": "Criterio di espressione regolare per il marcatore di fine. L'espressione regolare deve iniziare con '^'."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/codeEditor/electron-browser/largeFileOptimizations.i18n.json b/i18n/ita/src/vs/workbench/parts/codeEditor/electron-browser/largeFileOptimizations.i18n.json
deleted file mode 100644
index 3f801b948a0..00000000000
--- a/i18n/ita/src/vs/workbench/parts/codeEditor/electron-browser/largeFileOptimizations.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"largeFile": "{0}: per questo file di grandi dimensioni sono state disattivate le opzioni di tokenizzazione, ritorno a capo automatico e riduzione del codice allo scopo di ridurre l'utilizzo della memoria ed evitare blocchi o arresti anomali.",
-	"neverShowAgain": "OK. Non visualizzare più questo messaggio",
-	"removeOptimizations": "Abilita le funzionalità in modo forzato",
-	"reopenFilePrompt": "Riaprire il file per rendere effettiva questa impostazione."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/codeEditor/electron-browser/textMate/inspectTMScopes.i18n.json b/i18n/ita/src/vs/workbench/parts/codeEditor/electron-browser/textMate/inspectTMScopes.i18n.json
deleted file mode 100644
index 51e6edd6c95..00000000000
--- a/i18n/ita/src/vs/workbench/parts/codeEditor/electron-browser/textMate/inspectTMScopes.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"inspectTMScopes": "Sviluppatore: controlla ambiti TextMate",
-	"inspectTMScopesWidget.loading": "Caricamento..."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/codeEditor/electron-browser/toggleMinimap.i18n.json b/i18n/ita/src/vs/workbench/parts/codeEditor/electron-browser/toggleMinimap.i18n.json
deleted file mode 100644
index 38bfd704a5c..00000000000
--- a/i18n/ita/src/vs/workbench/parts/codeEditor/electron-browser/toggleMinimap.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleMinimap": "Visualizza: Attiva/Disattiva mini mappa"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/codeEditor/electron-browser/toggleMultiCursorModifier.i18n.json b/i18n/ita/src/vs/workbench/parts/codeEditor/electron-browser/toggleMultiCursorModifier.i18n.json
deleted file mode 100644
index 746f16b869d..00000000000
--- a/i18n/ita/src/vs/workbench/parts/codeEditor/electron-browser/toggleMultiCursorModifier.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleLocation": "Modificatore per l'attivazione/disattivazione multi-cursore"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderControlCharacter.i18n.json b/i18n/ita/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderControlCharacter.i18n.json
deleted file mode 100644
index 4a9047f95e2..00000000000
--- a/i18n/ita/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderControlCharacter.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleRenderControlCharacters": "Visualizza: Attiva/Disattiva caratteri di controllo"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderWhitespace.i18n.json b/i18n/ita/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderWhitespace.i18n.json
deleted file mode 100644
index 11ec6af67eb..00000000000
--- a/i18n/ita/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderWhitespace.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleRenderWhitespace": "Visualizza: Attiva/Disattiva rendering spazi vuoti"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/codeEditor/electron-browser/toggleWordWrap.i18n.json b/i18n/ita/src/vs/workbench/parts/codeEditor/electron-browser/toggleWordWrap.i18n.json
deleted file mode 100644
index 7bb728b27ab..00000000000
--- a/i18n/ita/src/vs/workbench/parts/codeEditor/electron-browser/toggleWordWrap.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggle.wordwrap": "Visualizza: Attiva/Disattiva ritorno a capo automatico",
-	"wordWrap.notInDiffEditor": "Non è possibile attivare/disattivare il ritorno a capo automatico in un editor diff.",
-	"unwrapMinified": "Disabilita il ritorno a capo automatico per questo file",
-	"wrapMinified": "Abilita il ritorno a capo automatico per questo file"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/codeEditor/electron-browser/wordWrapMigration.i18n.json b/i18n/ita/src/vs/workbench/parts/codeEditor/electron-browser/wordWrapMigration.i18n.json
deleted file mode 100644
index 175428dc848..00000000000
--- a/i18n/ita/src/vs/workbench/parts/codeEditor/electron-browser/wordWrapMigration.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"wordWrapMigration.ok": "OK",
-	"wordWrapMigration.dontShowAgain": "Non visualizzare più questo messaggio",
-	"wordWrapMigration.openSettings": "Apri impostazioni",
-	"wordWrapMigration.prompt": "L'impostazione `editor.wrappingColumn` è stata deprecata e sostituita da `editor.wordWrap`."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/debug/browser/breakpointWidget.i18n.json b/i18n/ita/src/vs/workbench/parts/debug/browser/breakpointWidget.i18n.json
deleted file mode 100644
index cf59ef97f5c..00000000000
--- a/i18n/ita/src/vs/workbench/parts/debug/browser/breakpointWidget.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"breakpointWidgetExpressionPlaceholder": "Interrompe quando l'espressione restituisce true. Premere 'INVIO' per accettare oppure 'ESC' per annullare.",
-	"breakpointWidgetAriaLabel": "Il programma si arresterà in questo punto solo se la condizione è vera. Premere INVIO per accettare oppure ESC per annullare.",
-	"breakpointWidgetHitCountPlaceholder": "Interrompe quando viene soddisfatta la condizione del numero di passaggi. Premere 'INVIO' per accettare oppure 'ESC' per annullare.",
-	"breakpointWidgetHitCountAriaLabel": "Il programma si arresterà in questo punto solo se viene raggiunto il numero di passaggi. Premere INVIO per accettare oppure ESC per annullare.",
-	"expression": "Espressione",
-	"hitCount": "Numero di passaggi"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json b/i18n/ita/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
deleted file mode 100644
index 656b814006f..00000000000
--- a/i18n/ita/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"logPoint": "Punto di registrazione",
-	"breakpoint": "Punto di interruzione",
-	"editBreakpoint": "Modifica {0}...",
-	"removeBreakpoint": "Rimuovi {0}",
-	"functionBreakpointsNotSupported": "Punti di interruzione delle funzioni non sono supportati da questo tipo di debug",
-	"functionBreakpointPlaceholder": "Funzione per cui inserire il punto di interruzione",
-	"functionBreakPointInputAriaLabel": "Digitare il punto di interruzione della funzione",
-	"breakpointDisabledHover": "Punto di interruzione disabilitato",
-	"breakpointUnverifieddHover": "Punto di interruzione non verificato",
-	"functionBreakpointUnsupported": "Punti di interruzione di funzione non supportati da questo tipo di debug",
-	"breakpointDirtydHover": "Punto di interruzione non verificato. Il file è stato modificato. Riavviare la sessione di debug.",
-	"logBreakpointUnsupported": "Punti di registrazione non supportati da questo tipo di debug",
-	"conditionalBreakpointUnsupported": "Punti di interruzione condizionali non supportati da questo tipo di debug",
-	"hitBreakpointUnsupported": "Sono stati raggiunti punti di interruzione condizionali non supportati da questo tipo di debug"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/debug/browser/debugActionItems.i18n.json b/i18n/ita/src/vs/workbench/parts/debug/browser/debugActionItems.i18n.json
deleted file mode 100644
index f41f96b7c06..00000000000
--- a/i18n/ita/src/vs/workbench/parts/debug/browser/debugActionItems.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noConfigurations": "Non ci sono configurazioni",
-	"addConfigTo": "Aggiungi configurazione ({0})...",
-	"addConfiguration": "Aggiungi configurazione..."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/debug/browser/debugActions.i18n.json b/i18n/ita/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
deleted file mode 100644
index f7b613949dc..00000000000
--- a/i18n/ita/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openLaunchJson": "Apri {0}",
-	"launchJsonNeedsConfigurtion": "Configurare o correggere 'launch.json'",
-	"noFolderDebugConfig": "Si prega di aprire prima una cartella per consentire una configurazione di debug avanzato.",
-	"startDebug": "Avvia debug",
-	"startWithoutDebugging": "Avvia senza eseguire debug",
-	"selectAndStartDebugging": "Seleziona e avvia il debug",
-	"restartDebug": "Riavvia",
-	"reconnectDebug": "Riconnetti",
-	"stepOverDebug": "Esegui istruzione/routine",
-	"stepIntoDebug": "Esegui istruzione",
-	"stepOutDebug": "Esci da istruzione/routine",
-	"stopDebug": "Arresta",
-	"disconnectDebug": "Disconnetti",
-	"continueDebug": "Continua",
-	"pauseDebug": "Sospendi",
-	"terminateThread": "Termina thread",
-	"restartFrame": "Riavvia frame",
-	"removeBreakpoint": "Rimuovi punto di interruzione",
-	"removeAllBreakpoints": "Rimuovi tutti i punti di interruzione",
-	"enableAllBreakpoints": "Abilita tutti i punti di interruzione",
-	"disableAllBreakpoints": "Disabilita tutti i punti di interruzione",
-	"activateBreakpoints": "Attiva punti di interruzione",
-	"deactivateBreakpoints": "Disattiva punti di interruzione",
-	"reapplyAllBreakpoints": "Riapplica tutti i punti di interruzione",
-	"addFunctionBreakpoint": "Aggiungi punto di interruzione della funzione",
-	"setValue": "Imposta valore",
-	"addWatchExpression": "Aggiungi espressione",
-	"editWatchExpression": "Modifica espressione",
-	"addToWatchExpressions": "Aggiungi a espressione di controllo",
-	"removeWatchExpression": "Rimuovi espressione",
-	"removeAllWatchExpressions": "Rimuovi tutte le espressioni",
-	"clearRepl": "Cancella console",
-	"debugConsoleAction": "Console di debug",
-	"unreadOutput": "Nuovo output nella console di debug",
-	"debugFocusConsole": "Console di debug stato attivo",
-	"focusSession": "Sposta stato attivo su sessione",
-	"stepBackDebug": "Torna indietro",
-	"reverseContinue": "Inverti"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/debug/browser/debugActionsWidget.i18n.json b/i18n/ita/src/vs/workbench/parts/debug/browser/debugActionsWidget.i18n.json
deleted file mode 100644
index 7ddb38388aa..00000000000
--- a/i18n/ita/src/vs/workbench/parts/debug/browser/debugActionsWidget.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"debugToolBarBackground": "Colore di sfondo della barra degli strumenti di debug.",
-	"debugToolBarBorder": "Colore del bordo della barra degli strumenti di debug."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/debug/browser/debugCommands.i18n.json b/i18n/ita/src/vs/workbench/parts/debug/browser/debugCommands.i18n.json
deleted file mode 100644
index 0a3246caad7..00000000000
--- a/i18n/ita/src/vs/workbench/parts/debug/browser/debugCommands.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noFolderDebugConfig": "Si prega di aprire prima una cartella per consentire una configurazione di debug avanzato.",
-	"inlineBreakpoint": "Punto di interruzione in linea",
-	"debug": "Debug",
-	"addInlineBreakpoint": "Aggiungi punto di interruzione in linea"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/debug/browser/debugContentProvider.i18n.json b/i18n/ita/src/vs/workbench/parts/debug/browser/debugContentProvider.i18n.json
deleted file mode 100644
index 37041dc7dfc..00000000000
--- a/i18n/ita/src/vs/workbench/parts/debug/browser/debugContentProvider.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"unable": "Non è possibile risolvere la risorsa senza una sessione di debug",
-	"canNotResolveSource": "Non è stato possibile risolvere la risorsa {0}. Nessuna risposta dall'estensione di debug."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json b/i18n/ita/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
deleted file mode 100644
index 83bb2032b73..00000000000
--- a/i18n/ita/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleBreakpointAction": "Debug: Attiva/Disattiva punto di interruzione",
-	"conditionalBreakpointEditorAction": "Debug: Aggiungi Punto di interruzione condizionale...",
-	"logPointEditorAction": "Debug: Aggiungi punto di registrazione...",
-	"runToCursor": "Esegui fino al cursore",
-	"debugEvaluate": "Debug: Valuta",
-	"debugAddToWatch": "Debug: Aggiungi a espressione di controllo",
-	"showDebugHover": "Debug: Visualizza passaggio del mouse",
-	"goToNextBreakpoint": "Debug: Vai al punto di interruzione successivo",
-	"goToPreviousBreakpoint": "Debug: Vai al punto di interruzione precedente"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/debug/browser/debugEditorModelManager.i18n.json b/i18n/ita/src/vs/workbench/parts/debug/browser/debugEditorModelManager.i18n.json
deleted file mode 100644
index c87d6a379b4..00000000000
--- a/i18n/ita/src/vs/workbench/parts/debug/browser/debugEditorModelManager.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"breakpointDisabledHover": "Punto di interruzione disabilitato",
-	"breakpointUnverifieddHover": "Punto di interruzione non verificato",
-	"breakpointDirtydHover": "Punto di interruzione non verificato. Il file è stato modificato. Riavviare la sessione di debug.",
-	"breakpointUnsupported": "Punti di interruzione condizionali non supportati da questo tipo di debug"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/debug/browser/debugQuickOpen.i18n.json b/i18n/ita/src/vs/workbench/parts/debug/browser/debugQuickOpen.i18n.json
deleted file mode 100644
index 6adb78a2250..00000000000
--- a/i18n/ita/src/vs/workbench/parts/debug/browser/debugQuickOpen.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"entryAriaLabel": "{0}, debug",
-	"debugAriaLabel": "Digitare il nome di una configurazione di avvio da eseguire.",
-	"addConfigTo": "Aggiungi configurazione ({0})...",
-	"addConfiguration": "Aggiungi configurazione...",
-	"noConfigurationsMatching": "Non esistono configurazioni di debug corrispondenti",
-	"noConfigurationsFound": "Non è stata trovata alcuna configurazione di debug. Creare un file 'launch.json'."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/debug/browser/debugStatus.i18n.json b/i18n/ita/src/vs/workbench/parts/debug/browser/debugStatus.i18n.json
deleted file mode 100644
index c49ae5ea1c1..00000000000
--- a/i18n/ita/src/vs/workbench/parts/debug/browser/debugStatus.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"selectAndStartDebug": "Selezionare e avviare la configurazione di debug"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/debug/browser/debugViewlet.i18n.json b/i18n/ita/src/vs/workbench/parts/debug/browser/debugViewlet.i18n.json
deleted file mode 100644
index 52ef13cae43..00000000000
--- a/i18n/ita/src/vs/workbench/parts/debug/browser/debugViewlet.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"startAdditionalSession": "Avvia sessione aggiuntiva",
-	"debugFocusVariablesView": "Variabili in focus",
-	"debugFocusWatchView": "Espressione di controllo in focus",
-	"debugFocusCallStackView": "Stack di chiamate in focus",
-	"debugFocusBreakpointsView": "Punti di interruzione in focus"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/debug/browser/exceptionWidget.i18n.json b/i18n/ita/src/vs/workbench/parts/debug/browser/exceptionWidget.i18n.json
deleted file mode 100644
index 8ce4aa5db13..00000000000
--- a/i18n/ita/src/vs/workbench/parts/debug/browser/exceptionWidget.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"debugExceptionWidgetBorder": "Colore del bordo del widget Eccezione.",
-	"debugExceptionWidgetBackground": "Colore di sfondo del widget Eccezione.",
-	"exceptionThrownWithId": "Si è verificata un'eccezione: {0}",
-	"exceptionThrown": "Si è verificata un'eccezione"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/debug/browser/linkDetector.i18n.json b/i18n/ita/src/vs/workbench/parts/debug/browser/linkDetector.i18n.json
deleted file mode 100644
index 836294f427a..00000000000
--- a/i18n/ita/src/vs/workbench/parts/debug/browser/linkDetector.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"fileLinkMac": "Fare clic per aprire (CMD+clic apre lateralmente)",
-	"fileLink": "Fare clic per aprire (CTRL+clic apre lateralmente)"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/debug/browser/statusbarColorProvider.i18n.json b/i18n/ita/src/vs/workbench/parts/debug/browser/statusbarColorProvider.i18n.json
deleted file mode 100644
index 8560eb80870..00000000000
--- a/i18n/ita/src/vs/workbench/parts/debug/browser/statusbarColorProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"statusBarDebuggingBackground": "Colore di sfondo della barra di stato quando è in corso il debug di un programma. La barra di stato è visualizzata nella parte inferiore della finestra",
-	"statusBarDebuggingForeground": "Colore primo piano della barra di stato quando è in corso il debug di un programma. La barra di stato è visualizzata nella parte inferiore della finestra",
-	"statusBarDebuggingBorder": "Colore del bordo della barra di stato che la separa dalla barra laterale e dall'editor durante il debug di un programma. La barra di stato è visualizzata nella parte inferiore della finestra."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/debug/common/debug.i18n.json b/i18n/ita/src/vs/workbench/parts/debug/common/debug.i18n.json
deleted file mode 100644
index ffa78198786..00000000000
--- a/i18n/ita/src/vs/workbench/parts/debug/common/debug.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"internalConsoleOptions": "Controlla il comportamento della console di debug interna."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/debug/common/debugModel.i18n.json b/i18n/ita/src/vs/workbench/parts/debug/common/debugModel.i18n.json
deleted file mode 100644
index b09083c8793..00000000000
--- a/i18n/ita/src/vs/workbench/parts/debug/common/debugModel.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"notAvailable": "non disponibile",
-	"startDebugFirst": "Per eseguire la valutazione, avviare una sessione di debug"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/debug/common/debugSchemas.i18n.json b/i18n/ita/src/vs/workbench/parts/debug/common/debugSchemas.i18n.json
deleted file mode 100644
index ec9fac99de4..00000000000
--- a/i18n/ita/src/vs/workbench/parts/debug/common/debugSchemas.i18n.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.contributes.debuggers": "Adattatori di debug per contributes.",
-	"vscode.extension.contributes.debuggers.type": "Identificatore univoco per questo adattatore di debug.",
-	"vscode.extension.contributes.debuggers.label": "Nome visualizzato per questo adattatore di debug.",
-	"vscode.extension.contributes.debuggers.program": "Percorso del programma dell'adattatore di debug. Il percorso è assoluto o relativo alla cartella delle estensioni.",
-	"vscode.extension.contributes.debuggers.args": "Argomenti facoltativi da passare all'adattatore.",
-	"vscode.extension.contributes.debuggers.runtime": "Runtime facoltativo nel caso in cui l'attributo del programma non sia un eseguibile ma richieda un runtime.",
-	"vscode.extension.contributes.debuggers.runtimeArgs": "Argomenti del runtime facoltativo.",
-	"vscode.extension.contributes.debuggers.variables": "Mapping tra le variabili interattive, ad esempio ${action.pickProcess}, in `launch.json` e un comando.",
-	"vscode.extension.contributes.debuggers.initialConfigurations": "Configurazioni per generare la versione iniziale di 'launch.json'.",
-	"vscode.extension.contributes.debuggers.languages": "Elenco dei linguaggi. per cui l'estensione di debug può essere considerata il \"debugger predefinito\".",
-	"vscode.extension.contributes.debuggers.adapterExecutableCommand": "Se è specificato, Visual Studio Code chiamerà questo comando per determinare il percorso eseguibile della scheda di debug e gli argomenti da passare.",
-	"vscode.extension.contributes.debuggers.configurationSnippets": "Frammenti per l'aggiunta di nuove configurazioni in 'launch.json'.",
-	"vscode.extension.contributes.debuggers.configurationAttributes": "Configurazioni dello schema JSON per la convalida di 'launch.json'.",
-	"vscode.extension.contributes.debuggers.windows": "Impostazioni specifiche di Windows.",
-	"vscode.extension.contributes.debuggers.windows.runtime": "Runtime usato per Windows.",
-	"vscode.extension.contributes.debuggers.osx": "Impostazioni specifiche di macOS.",
-	"vscode.extension.contributes.debuggers.osx.runtime": "Runtime usato per macOS.",
-	"vscode.extension.contributes.debuggers.linux": "Impostazioni specifiche di Linux.",
-	"vscode.extension.contributes.debuggers.linux.runtime": "Runtime usato per Linux.",
-	"vscode.extension.contributes.breakpoints": "Punti di interruzione per contributes.",
-	"vscode.extension.contributes.breakpoints.language": "Consente i punti di interruzione per questo linguaggio.",
-	"app.launch.json.title": "Launch",
-	"app.launch.json.version": "Versione di questo formato di file.",
-	"app.launch.json.configurations": "Elenco delle configurazioni. Aggiungere nuove configurazioni o modificare quelle esistenti con IntelliSense.",
-	"app.launch.json.compounds": "Elenco degli elementi compounds. Ogni elemento compounds fa riferimento a più configurazioni che verranno avviate insieme.",
-	"app.launch.json.compound.name": "Nome dell'elemento compounds. Viene visualizzato nel menu a discesa della configurazione di avvio.",
-	"useUniqueNames": "Usare nomi di configurazione univoci.",
-	"app.launch.json.compound.folder": "Nome della cartella in cui si trova l'elemento compounds.",
-	"app.launch.json.compounds.configurations": "Nomi delle configurazioni che verranno avviate per questo elemento compounds."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/debug/common/debugSource.i18n.json b/i18n/ita/src/vs/workbench/parts/debug/common/debugSource.i18n.json
deleted file mode 100644
index c1fcec4fb96..00000000000
--- a/i18n/ita/src/vs/workbench/parts/debug/common/debugSource.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"unknownSource": "Origine sconosciuta"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json b/i18n/ita/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
deleted file mode 100644
index 10c6796d647..00000000000
--- a/i18n/ita/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"breakpointWidgetLogMessagePlaceholder": "Messaggio da registrare quando viene raggiunto il punto di interruzione. Le espressioni tra parentesi graffe ({}) vengono interpolate. Premere 'INVIO' per accettare, \"ESC\" per annullare.",
-	"breakpointWidgetHitCountPlaceholder": "Interrompe quando viene soddisfatta la condizione del numero di passaggi. Premere 'INVIO' per accettare oppure 'ESC' per annullare.",
-	"breakpointWidgetExpressionPlaceholder": "Interrompe quando l'espressione restituisce true. Premere 'INVIO' per accettare oppure 'ESC' per annullare.",
-	"expression": "Espressione",
-	"hitCount": "Numero di passaggi",
-	"logMessage": "Messaggio di log"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/debug/electron-browser/breakpointsView.i18n.json b/i18n/ita/src/vs/workbench/parts/debug/electron-browser/breakpointsView.i18n.json
deleted file mode 100644
index 07cc11d896a..00000000000
--- a/i18n/ita/src/vs/workbench/parts/debug/electron-browser/breakpointsView.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"editConditionalBreakpoint": "Modifica punto di interruzione...",
-	"functionBreakpointsNotSupported": "Punti di interruzione delle funzioni non sono supportati da questo tipo di debug",
-	"functionBreakpointPlaceholder": "Funzione per cui inserire il punto di interruzione",
-	"functionBreakPointInputAriaLabel": "Digitare il punto di interruzione della funzione"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/debug/electron-browser/callStackView.i18n.json b/i18n/ita/src/vs/workbench/parts/debug/electron-browser/callStackView.i18n.json
deleted file mode 100644
index 476e4bda585..00000000000
--- a/i18n/ita/src/vs/workbench/parts/debug/electron-browser/callStackView.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"callstackSection": "Sezione Stack di chiamate",
-	"debugStopped": "In pausa su {0}",
-	"callStackAriaLabel": "Stack di chiamate di debug",
-	"session": "Sessione",
-	"paused": "In pausa",
-	"running": "In esecuzione",
-	"thread": "Thread",
-	"pausedOn": "In pausa su {0}",
-	"loadMoreStackFrames": "Carica altri stack frame",
-	"threadAriaLabel": "Thread {0}, stack di chiamate, debug",
-	"stackFrameAriaLabel": "Riga{1} {2} dello stack frame {0}, stack di chiamate, debug"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json b/i18n/ita/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
deleted file mode 100644
index 6b44ed029fe..00000000000
--- a/i18n/ita/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleDebugViewlet": "Mostra debug",
-	"toggleDebugPanel": "Console di debug",
-	"debug": "Debug",
-	"debugPanel": "Console di debug",
-	"variables": "Variabili",
-	"watch": "Espressione di controllo",
-	"callStack": "Stack di chiamate",
-	"breakpoints": "Punti di interruzione",
-	"view": "Visualizza",
-	"debugCategory": "Debug",
-	"debugCommands": "Configurazione di debug",
-	"debugConfigurationTitle": "Debug",
-	"allowBreakpointsEverywhere": "Consente l'impostazione del punto di interruzione in qualsiasi file",
-	"openExplorerOnEnd": "Apre automaticamente la visualizzazione di esplorazione al termine di una sessione di debug",
-	"inlineValues": "Mostra i valori delle variabili inline nell'editor durante il debug",
-	"toolBarLocation": "Controlla la posizione della barra degli strumenti di debug. Le opzioni sono: \"floating\", ovvero mobile in tutte le visualizzazioni, \"docked\", ovvero ancorata nella visualizzazione di debug oppure \"hidden\", ovvero nascosta",
-	"never": "Non mostrare mai debug nella barra di stato",
-	"always": "Visualizzare sempre debug nella barra di stato",
-	"onFirstSessionStart": "Mostra debug nella barra solo stato dopo il primo avvio del debug",
-	"showInStatusBar": "Controlla se rendere visibile la barra di stato del debug",
-	"openDebug": "Controlla se la visualizzazione di debug debba essere aperta all'avvio della sessione di debug.",
-	"enableAllHovers": "Controlla se è necessario abilitare i passaggi del mouse non di debug durante il debug. Se è true, i provider di passaggi del mouse verranno chiamati per fornire un passaggio del mouse. I passaggi del mouse normali non verranno visualizzati anche se il valore di questa impostazione è true.",
-	"launch": "Configurazione globale per l'esecuzione del debug. Può essere usata come un'alternativa a \"launch.json\" "
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/debug/electron-browser/debugCommands.i18n.json b/i18n/ita/src/vs/workbench/parts/debug/electron-browser/debugCommands.i18n.json
deleted file mode 100644
index 4b486477de1..00000000000
--- a/i18n/ita/src/vs/workbench/parts/debug/electron-browser/debugCommands.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noFolderDebugConfig": "Si prega di aprire prima una cartella per consentire una configurazione di debug avanzato."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json b/i18n/ita/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json
deleted file mode 100644
index 73bdd73c5df..00000000000
--- a/i18n/ita/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"debugNoType": "Il \"tipo\" del debugger non può essere omesso e deve essere di tipo \"string\"",
-	"selectDebug": "Seleziona ambiente",
-	"DebugConfig.failed": "Non è possibile creare il file 'launch.json' all'interno della cartella '.vscode' ({0}).",
-	"workspace": "area di lavoro",
-	"user settings": "impostazioni utente"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json b/i18n/ita/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
deleted file mode 100644
index 43601d1a73d..00000000000
--- a/i18n/ita/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"logPoint": "Punto di registrazione",
-	"breakpoint": "Punto di interruzione",
-	"removeBreakpoint": "Rimuovi {0}",
-	"editBreakpoint": "Modifica {0}...",
-	"disableBreakpoint": "Disabilita {0}",
-	"enableBreakpoint": "Abilita {0}",
-	"removeBreakpoints": "Rimuovi punti di interruzione",
-	"removeInlineBreakpointOnColumn": "Rimuovi punto di interruzione in linea a colonna {0}",
-	"removeLineBreakpoint": "Rimuovi punto di interruzione riga",
-	"editBreakpoints": "Modifica punti di interruzione",
-	"editInlineBreakpointOnColumn": "Modifica punto di interruzione in linea a colonna {0}",
-	"editLineBrekapoint": "Modifica punto di interruzione riga",
-	"enableDisableBreakpoints": "Abilita/Disabilita punti di interruzione",
-	"disableInlineColumnBreakpoint": "Disabilita punto di interruzione in linea a colonna {0}",
-	"disableBreakpointOnLine": "Disabilita punto di interruzione riga",
-	"enableBreakpoints": "Abilita punto di interruzione in linea a colonna {0}",
-	"enableBreakpointOnLine": "Abilita punto di interruzione riga",
-	"addBreakpoint": "Aggiungi punto di interruzione",
-	"addConditionalBreakpoint": "Aggiungi punto di interruzione condizionale...",
-	"addLogPoint": "Aggiungi punto di registrazione...",
-	"breakpointHasCondition": "Per questo {0} è presente un {1} che verrà perso in seguito alla rimozione. Provare invece a disabilitare il {0}.",
-	"message": "messaggio",
-	"condition": "condizione",
-	"removeLogPoint": "Rimuovi {0}",
-	"disableLogPoint": "Disabilita {0}",
-	"cancel": "Annulla",
-	"addConfiguration": "Aggiungi configurazione..."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/debug/electron-browser/debugHover.i18n.json b/i18n/ita/src/vs/workbench/parts/debug/electron-browser/debugHover.i18n.json
deleted file mode 100644
index d4b6c2724ef..00000000000
--- a/i18n/ita/src/vs/workbench/parts/debug/electron-browser/debugHover.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"treeAriaLabel": "Esegui debug al passaggio del mouse"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json b/i18n/ita/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
deleted file mode 100644
index c085858a8c6..00000000000
--- a/i18n/ita/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"snapshotObj": "Per questo oggetto vengono visualizzati solo i valori primitivi.",
-	"debuggingPaused": "Il debug è stato sospeso. Motivo: {0}, {1} {2}",
-	"debuggingStarted": "Il debug è stato avviato.",
-	"debuggingStopped": "Il debug è stato arrestato.",
-	"breakpointAdded": "Aggiunto un punto di interruzione a riga {0} del file {1}",
-	"breakpointRemoved": "Rimosso un punto di interruzione a riga {0} del file {1}",
-	"compoundMustHaveConfigurations": "Per avviare più configurazioni, deve essere impostato l'attributo \"configurations\" dell'elemento compounds.",
-	"noConfigurationNameInWorkspace": "Non è stato possibile trovare la configurazione di avvio '{0}' nell'area di lavoro.",
-	"multipleConfigurationNamesInWorkspace": "Nell'area di lavoro sono presenti più configurazioni di avvio '{0}'. Usare il nome di cartella per qualificare la configurazione.",
-	"noFolderWithName": "La cartella denominata '{0}' per la configurazione '{1}' nell'elemento compounds '{2}' non è stata trovata.",
-	"configMissing": "In 'launch.json' manca la configurazione '{0}'.",
-	"launchJsonDoesNotExist": "'launch.json' non esiste.",
-	"debugRequestNotSupported": "Nella configurazione di debug scelta l'attributo '{0}' ha un valore non supportato '{1}'.",
-	"debugRequesMissing": "Nella configurazione di debug scelta manca l'attributo '{0}'.",
-	"debugTypeNotSupported": "Il tipo di debug configurato '{0}' non è supportato.",
-	"debugTypeMissing": "Manca la proprietà 'type' per la configurazione di avvio scelta.",
-	"debugAnyway": "Eseguire comunque il debug",
-	"preLaunchTaskErrors": "Sono stati rilevati errori di compilazione durante preLaunchTask '{0}'.",
-	"preLaunchTaskError": "È stato rilevato un errore di compilazione durante preLaunchTask '{0}'.",
-	"preLaunchTaskExitCode": "L'attività di preavvio '{0}' è stata terminata ed è stato restituito il codice di uscita {1}.",
-	"showErrors": "Mostra errori",
-	"noFolderWorkspaceDebugError": "Non è possibile eseguire il debug del file attivo. Assicurarsi che sia salvato su disco e che sia installata un'estensione di debug per tale tipo di file.",
-	"cancel": "Annulla",
-	"DebugTaskNotFound": "Impossibile trovare l'attività '{0}'.",
-	"taskNotTracked": "L'attività '{0}' non può essere rintracciata."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/debug/electron-browser/debugViewer.i18n.json b/i18n/ita/src/vs/workbench/parts/debug/electron-browser/debugViewer.i18n.json
deleted file mode 100644
index 8d4276b5c03..00000000000
--- a/i18n/ita/src/vs/workbench/parts/debug/electron-browser/debugViewer.i18n.json
+++ /dev/null
@@ -1,28 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"process": "Processo",
-	"paused": "In pausa",
-	"running": "In esecuzione",
-	"thread": "Thread",
-	"pausedOn": "In pausa su {0}",
-	"loadMoreStackFrames": "Carica altri stack frame",
-	"threadAriaLabel": "Thread {0}, stack di chiamate, debug",
-	"stackFrameAriaLabel": "Riga{1} {2} dello stack frame {0}, stack di chiamate, debug",
-	"variableValueAriaLabel": "Digitare il nuovo valore della variabile",
-	"variableScopeAriaLabel": "Ambito {0}, variabili, debug",
-	"variableAriaLabel": "Valore {1} di {0}, variabili, debug",
-	"watchExpressionPlaceholder": "Espressione da controllare",
-	"watchExpressionInputAriaLabel": "Digitare l'espressione di controllo",
-	"watchExpressionAriaLabel": "Valore {1} di {0}, espressione di controllo, debug",
-	"watchVariableAriaLabel": "Valore {1} di {0}, espressione di controllo, debug",
-	"functionBreakpointPlaceholder": "Funzione per cui inserire il punto di interruzione",
-	"functionBreakPointInputAriaLabel": "Digitare il punto di interruzione della funzione",
-	"functionBreakpointsNotSupported": "Punti di interruzione delle funzioni non sono supportati da questo tipo di debug",
-	"breakpointAriaLabel": "Riga {0} {1} del punto di interruzione, punti di interruzione, debug",
-	"functionBreakpointAriaLabel": "Punto di interruzione {0} della funzione, punti di interruzione, debug",
-	"exceptionBreakpointAriaLabel": "Punto di interruzione {0} dell'eccezione, punti di interruzione, debug"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/debug/electron-browser/debugViews.i18n.json b/i18n/ita/src/vs/workbench/parts/debug/electron-browser/debugViews.i18n.json
deleted file mode 100644
index 78aa8974cb4..00000000000
--- a/i18n/ita/src/vs/workbench/parts/debug/electron-browser/debugViews.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"variablesSection": "Sezione Variabili",
-	"variablesAriaTreeLabel": "Esegui debug variabili",
-	"expressionsSection": "Sezione Espressioni",
-	"watchAriaTreeLabel": "Esegui debug espressioni di controllo",
-	"callstackSection": "Sezione Stack di chiamate",
-	"debugStopped": "In pausa su {0}",
-	"callStackAriaLabel": "Esegui debug stack di chiamate",
-	"breakpointsSection": "Sezione Punti di interruzione",
-	"breakpointsAriaTreeLabel": "Esegui debug punti di interruzione"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/debug/electron-browser/electronDebugActions.i18n.json b/i18n/ita/src/vs/workbench/parts/debug/electron-browser/electronDebugActions.i18n.json
deleted file mode 100644
index 296065c3efd..00000000000
--- a/i18n/ita/src/vs/workbench/parts/debug/electron-browser/electronDebugActions.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"copyValue": "Copia valore",
-	"copyAsExpression": "Copia come espressione",
-	"copy": "Copia",
-	"copyAll": "Copia tutti",
-	"copyStackTrace": "Copia stack di chiamate"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/debug/electron-browser/rawDebugSession.i18n.json b/i18n/ita/src/vs/workbench/parts/debug/electron-browser/rawDebugSession.i18n.json
deleted file mode 100644
index a77a1e4728d..00000000000
--- a/i18n/ita/src/vs/workbench/parts/debug/electron-browser/rawDebugSession.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"moreInfo": "Altre info",
-	"debugAdapterCrash": "Il processo dell'adattatore di debug è stato terminato in modo imprevisto"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/debug/electron-browser/repl.i18n.json b/i18n/ita/src/vs/workbench/parts/debug/electron-browser/repl.i18n.json
deleted file mode 100644
index 6795de08034..00000000000
--- a/i18n/ita/src/vs/workbench/parts/debug/electron-browser/repl.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"replAriaLabel": "Pannello del ciclo Read Eval Print",
-	"actions.repl.historyPrevious": "Cronologia indietro",
-	"actions.repl.historyNext": "Cronologia avanti",
-	"actions.repl.acceptInput": "Accetta input da REPL",
-	"actions.repl.copyAll": "Debug: copia tutto in console"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/debug/electron-browser/replViewer.i18n.json b/i18n/ita/src/vs/workbench/parts/debug/electron-browser/replViewer.i18n.json
deleted file mode 100644
index 00b46b84ddd..00000000000
--- a/i18n/ita/src/vs/workbench/parts/debug/electron-browser/replViewer.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"stateCapture": "Lo stato dell'oggetto viene acquisito dalla prima valutazione",
-	"replVariableAriaLabel": "Il valore della variabile {0} è {1}, ciclo Read Eval Print, debug",
-	"replExpressionAriaLabel": "Il valore dell'espressione {0} è {1}, ciclo Read Eval Print, debug",
-	"replValueOutputAriaLabel": "{0}, ciclo Read Eval Print, debug",
-	"replRawObjectAriaLabel": "REPL variabile {0} ha valore {1}, read eval loop print, debug"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/debug/electron-browser/statusbarColorProvider.i18n.json b/i18n/ita/src/vs/workbench/parts/debug/electron-browser/statusbarColorProvider.i18n.json
deleted file mode 100644
index 8560eb80870..00000000000
--- a/i18n/ita/src/vs/workbench/parts/debug/electron-browser/statusbarColorProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"statusBarDebuggingBackground": "Colore di sfondo della barra di stato quando è in corso il debug di un programma. La barra di stato è visualizzata nella parte inferiore della finestra",
-	"statusBarDebuggingForeground": "Colore primo piano della barra di stato quando è in corso il debug di un programma. La barra di stato è visualizzata nella parte inferiore della finestra",
-	"statusBarDebuggingBorder": "Colore del bordo della barra di stato che la separa dalla barra laterale e dall'editor durante il debug di un programma. La barra di stato è visualizzata nella parte inferiore della finestra."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json b/i18n/ita/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json
deleted file mode 100644
index 40bf3c28324..00000000000
--- a/i18n/ita/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"debug.terminal.title": "oggetto del debug"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/debug/electron-browser/variablesView.i18n.json b/i18n/ita/src/vs/workbench/parts/debug/electron-browser/variablesView.i18n.json
deleted file mode 100644
index eab7f767d61..00000000000
--- a/i18n/ita/src/vs/workbench/parts/debug/electron-browser/variablesView.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"variablesSection": "Sezione Variabili",
-	"variablesAriaTreeLabel": "Esegui debug variabili",
-	"variableValueAriaLabel": "Digitare il nuovo valore della variabile",
-	"variableScopeAriaLabel": "Ambito {0}, variabili, debug",
-	"variableAriaLabel": "Valore {1} di {0}, variabili, debug"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/debug/electron-browser/watchExpressionsView.i18n.json b/i18n/ita/src/vs/workbench/parts/debug/electron-browser/watchExpressionsView.i18n.json
deleted file mode 100644
index ee9ec53abe2..00000000000
--- a/i18n/ita/src/vs/workbench/parts/debug/electron-browser/watchExpressionsView.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"expressionsSection": "Sezione Espressioni",
-	"watchAriaTreeLabel": "Esegui debug espressioni di controllo",
-	"watchExpressionPlaceholder": "Espressione da controllare",
-	"watchExpressionInputAriaLabel": "Digitare l'espressione di controllo",
-	"watchExpressionAriaLabel": "Valore {1} di {0}, espressione di controllo, debug",
-	"watchVariableAriaLabel": "Valore {1} di {0}, espressione di controllo, debug"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json b/i18n/ita/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
deleted file mode 100644
index 3a9023e4662..00000000000
--- a/i18n/ita/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"debugAdapterBinNotFound": "Il file eseguibile '{0}' dell'adattatore di debug non esiste.",
-	"debugAdapterCannotDetermineExecutable": "Non è possibile determinare il file eseguibile per l'adattatore di debug '{0}'.",
-	"unableToLaunchDebugAdapter": "Non è possibile avviare l'adattatore di debug da '{0}'.",
-	"unableToLaunchDebugAdapterNoArgs": "Non è possibile avviare l'adattatore di debug."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/debug/node/debugger.i18n.json b/i18n/ita/src/vs/workbench/parts/debug/node/debugger.i18n.json
deleted file mode 100644
index d7bf531b57e..00000000000
--- a/i18n/ita/src/vs/workbench/parts/debug/node/debugger.i18n.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"launch.config.comment1": "Usare IntelliSense per informazioni sui possibili attributi.",
-	"launch.config.comment2": "Al passaggio del mouse vengono visualizzate le descrizioni degli attributi esistenti.",
-	"launch.config.comment3": "Per ulteriori informazioni, visitare: {0}",
-	"debugType": "Tipo di configurazione.",
-	"debugTypeNotRecognised": "Il tipo di debug non è riconosciuto. Assicurarsi di avere un'estensione appropriata per il debug installata e che sia abilitata.",
-	"node2NotSupported": "\"node2\" non è più supportato. In alternativa, usare \"node\" e impostare l'attributo \"protocol\" su \"inspector\".",
-	"debugName": "Nome della configurazione. Viene visualizzato nel menu a discesa della configurazione di avvio.",
-	"debugRequest": "Tipo della richiesta di configurazione. Può essere \"launch\" o \"attach\".",
-	"debugServer": "Solo per lo sviluppo dell'estensione di debug: se si specifica una porta, Visual Studio Code prova a connettersi a un adattatore di debug in esecuzione in modalità server",
-	"debugPrelaunchTask": "Attività da eseguire prima dell'avvio della sessione di debug.",
-	"debugPostDebugTask": "Attività da eseguire dopo il completamento della sessione di debug.",
-	"debugWindowsConfiguration": "Attributi della configurazione di avvio specifici di Windows.",
-	"debugOSXConfiguration": "Attributi della configurazione di avvio specifici di OS X.",
-	"debugLinuxConfiguration": "Attributi della configurazione di avvio specifici di Linux.",
-	"deprecatedVariables": "'env.', 'config.' e 'command.' sono deprecati. In alternativa, usare 'env:', 'config:' e 'command:'."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/debug/node/terminals.i18n.json b/i18n/ita/src/vs/workbench/parts/debug/node/terminals.i18n.json
deleted file mode 100644
index b2beae5d759..00000000000
--- a/i18n/ita/src/vs/workbench/parts/debug/node/terminals.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"console.title": "Console di Visual Studio Code",
-	"mac.terminal.script.failed": "Lo script '{0}' non è riuscito. Codice di uscita: {1}",
-	"mac.terminal.type.not.supported": "'{0}' non supportato",
-	"press.any.key": "Premere un tasto qualsiasi per continuare...",
-	"linux.term.failed": "'{0}' non riuscito. Codice di uscita: {1}"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/emmet/browser/actions/showEmmetCommands.i18n.json b/i18n/ita/src/vs/workbench/parts/emmet/browser/actions/showEmmetCommands.i18n.json
deleted file mode 100644
index 259a27518df..00000000000
--- a/i18n/ita/src/vs/workbench/parts/emmet/browser/actions/showEmmetCommands.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"showEmmetCommands": "Mostra comandi Emmet"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/emmet/electron-browser/actions/balance.i18n.json b/i18n/ita/src/vs/workbench/parts/emmet/electron-browser/actions/balance.i18n.json
deleted file mode 100644
index 22f94f4cf36..00000000000
--- a/i18n/ita/src/vs/workbench/parts/emmet/electron-browser/actions/balance.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"balanceInward": "Emmet: Saldo (in ingresso)",
-	"balanceOutward": "Emmet: Saldo (in uscita)"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/emmet/electron-browser/actions/editPoints.i18n.json b/i18n/ita/src/vs/workbench/parts/emmet/electron-browser/actions/editPoints.i18n.json
deleted file mode 100644
index 34249d623c8..00000000000
--- a/i18n/ita/src/vs/workbench/parts/emmet/electron-browser/actions/editPoints.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"previousEditPoint": "Emmet: andare al punto di modifica precedente",
-	"nextEditPoint": "Emmet: andare al punto di modifica successivo"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/emmet/electron-browser/actions/evaluateMath.i18n.json b/i18n/ita/src/vs/workbench/parts/emmet/electron-browser/actions/evaluateMath.i18n.json
deleted file mode 100644
index 27d67e79fef..00000000000
--- a/i18n/ita/src/vs/workbench/parts/emmet/electron-browser/actions/evaluateMath.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"evaluateMathExpression": "Emmet: Valuta espressione matematica"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/emmet/electron-browser/actions/expandAbbreviation.i18n.json b/i18n/ita/src/vs/workbench/parts/emmet/electron-browser/actions/expandAbbreviation.i18n.json
deleted file mode 100644
index 3dfa439236a..00000000000
--- a/i18n/ita/src/vs/workbench/parts/emmet/electron-browser/actions/expandAbbreviation.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"expandAbbreviationAction": "Emmet: Espandi abbreviazione"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/emmet/electron-browser/actions/incrementDecrement.i18n.json b/i18n/ita/src/vs/workbench/parts/emmet/electron-browser/actions/incrementDecrement.i18n.json
deleted file mode 100644
index ece4609ebc5..00000000000
--- a/i18n/ita/src/vs/workbench/parts/emmet/electron-browser/actions/incrementDecrement.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"incrementNumberByOneTenth": "Emmet: Aumenta di 0,1",
-	"incrementNumberByOne": "Emmet: Aumenta di 1",
-	"incrementNumberByTen": "Emmet: Aumenta di 10",
-	"decrementNumberByOneTenth": "Emmet: Riduci di 0,1",
-	"decrementNumberByOne": "Emmet: Riduci di 1",
-	"decrementNumberByTen": "Emmet: Riduci di 10"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/emmet/electron-browser/actions/matchingPair.i18n.json b/i18n/ita/src/vs/workbench/parts/emmet/electron-browser/actions/matchingPair.i18n.json
deleted file mode 100644
index e7e21455b6b..00000000000
--- a/i18n/ita/src/vs/workbench/parts/emmet/electron-browser/actions/matchingPair.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"matchingPair": "Emmet: Vai alla coppia corrispondente"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/emmet/electron-browser/actions/mergeLines.i18n.json b/i18n/ita/src/vs/workbench/parts/emmet/electron-browser/actions/mergeLines.i18n.json
deleted file mode 100644
index 5dc3268b490..00000000000
--- a/i18n/ita/src/vs/workbench/parts/emmet/electron-browser/actions/mergeLines.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"mergeLines": "Emmet: Esegui merge delle righe"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/emmet/electron-browser/actions/reflectCssValue.i18n.json b/i18n/ita/src/vs/workbench/parts/emmet/electron-browser/actions/reflectCssValue.i18n.json
deleted file mode 100644
index 15cd2c912c4..00000000000
--- a/i18n/ita/src/vs/workbench/parts/emmet/electron-browser/actions/reflectCssValue.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"reflectCSSValue": "Emmet: Effettua reflection del valore CSS"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/emmet/electron-browser/actions/removeTag.i18n.json b/i18n/ita/src/vs/workbench/parts/emmet/electron-browser/actions/removeTag.i18n.json
deleted file mode 100644
index a375d4ca576..00000000000
--- a/i18n/ita/src/vs/workbench/parts/emmet/electron-browser/actions/removeTag.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"removeTag": "Emmet: Rimuovi tag"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/emmet/electron-browser/actions/selectItem.i18n.json b/i18n/ita/src/vs/workbench/parts/emmet/electron-browser/actions/selectItem.i18n.json
deleted file mode 100644
index 78c6fd0761b..00000000000
--- a/i18n/ita/src/vs/workbench/parts/emmet/electron-browser/actions/selectItem.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"selectPreviousItem": "Emmet: Seleziona elemento precedente",
-	"selectNextItem": "Emmet: Seleziona elemento successivo"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/emmet/electron-browser/actions/splitJoinTag.i18n.json b/i18n/ita/src/vs/workbench/parts/emmet/electron-browser/actions/splitJoinTag.i18n.json
deleted file mode 100644
index 006ad09b523..00000000000
--- a/i18n/ita/src/vs/workbench/parts/emmet/electron-browser/actions/splitJoinTag.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"splitJoinTag": "Emmet: Dividi/Unisci tag"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/emmet/electron-browser/actions/toggleComment.i18n.json b/i18n/ita/src/vs/workbench/parts/emmet/electron-browser/actions/toggleComment.i18n.json
deleted file mode 100644
index f4338f86f4e..00000000000
--- a/i18n/ita/src/vs/workbench/parts/emmet/electron-browser/actions/toggleComment.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"toggleComment": "Emmet: Attiva/Disattiva commento"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/emmet/electron-browser/actions/updateImageSize.i18n.json b/i18n/ita/src/vs/workbench/parts/emmet/electron-browser/actions/updateImageSize.i18n.json
deleted file mode 100644
index 49c7306573d..00000000000
--- a/i18n/ita/src/vs/workbench/parts/emmet/electron-browser/actions/updateImageSize.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"updateImageSize": "Emmet: Aggiorna dimensioni immagine"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/emmet/electron-browser/actions/updateTag.i18n.json b/i18n/ita/src/vs/workbench/parts/emmet/electron-browser/actions/updateTag.i18n.json
deleted file mode 100644
index 38caa12dc95..00000000000
--- a/i18n/ita/src/vs/workbench/parts/emmet/electron-browser/actions/updateTag.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"updateTag": "Emmet: Aggiorna tag",
-	"enterTag": "Immetti tag",
-	"tag": "Tag"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/emmet/electron-browser/actions/wrapWithAbbreviation.i18n.json b/i18n/ita/src/vs/workbench/parts/emmet/electron-browser/actions/wrapWithAbbreviation.i18n.json
deleted file mode 100644
index f83f8f86716..00000000000
--- a/i18n/ita/src/vs/workbench/parts/emmet/electron-browser/actions/wrapWithAbbreviation.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"wrapWithAbbreviationAction": "Emmet: Esegui il wrapping con l'abbreviazione",
-	"enterAbbreviation": "Immetti abbreviazione",
-	"abbreviation": "Abbreviazione"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/emmet/electron-browser/emmet.contribution.i18n.json b/i18n/ita/src/vs/workbench/parts/emmet/electron-browser/emmet.contribution.i18n.json
deleted file mode 100644
index ef13f9c1246..00000000000
--- a/i18n/ita/src/vs/workbench/parts/emmet/electron-browser/emmet.contribution.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"emmetConfigurationTitle": "Emmet",
-	"triggerExpansionOnTab": "Se abilitate, le abbreviazioni Emmet vengono espanse quando si preme TAB. Non applicabile quando emmet.useNewemmet è impostato su true.",
-	"emmetPreferences": "Preferenze usate per modificare il comportamento di alcune azioni e i resolver di Emmet. Non applicabile quando emmet.useNewemmet è impostato su true.",
-	"emmetSyntaxProfiles": "Consente di definire il profilo per la sintassi specificata oppure di usare un profilo personalizzato con regole specifiche.",
-	"emmetExclude": "Matrice di linguaggi in cui le abbreviazioni Emmet non devono essere espanse.",
-	"emmetExtensionsPath": "Percorso di una cartella contenente snippet, preferenze e profili Emmet. Quando emmet.useNewEmmet è impostato su true, vengono gestiti solo i profili di questo percorso di estensione.",
-	"useNewEmmet": "Prova i nuovi moduli emmet (che andrà a sostituire la vecchia libreria singola emmet) per tutte le funzionalità emmet."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/emmet/node/actions/balance.i18n.json b/i18n/ita/src/vs/workbench/parts/emmet/node/actions/balance.i18n.json
deleted file mode 100644
index 22f94f4cf36..00000000000
--- a/i18n/ita/src/vs/workbench/parts/emmet/node/actions/balance.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"balanceInward": "Emmet: Saldo (in ingresso)",
-	"balanceOutward": "Emmet: Saldo (in uscita)"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/emmet/node/actions/editPoints.i18n.json b/i18n/ita/src/vs/workbench/parts/emmet/node/actions/editPoints.i18n.json
deleted file mode 100644
index 1549e77ce27..00000000000
--- a/i18n/ita/src/vs/workbench/parts/emmet/node/actions/editPoints.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"previousEditPoint": "Emmet: Punto di modifica precedente",
-	"nextEditPoint": "Emmet: Punto di modifica successivo"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/emmet/node/actions/evaluateMath.i18n.json b/i18n/ita/src/vs/workbench/parts/emmet/node/actions/evaluateMath.i18n.json
deleted file mode 100644
index 27d67e79fef..00000000000
--- a/i18n/ita/src/vs/workbench/parts/emmet/node/actions/evaluateMath.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"evaluateMathExpression": "Emmet: Valuta espressione matematica"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/emmet/node/actions/expandAbbreviation.i18n.json b/i18n/ita/src/vs/workbench/parts/emmet/node/actions/expandAbbreviation.i18n.json
deleted file mode 100644
index 71a96f5f840..00000000000
--- a/i18n/ita/src/vs/workbench/parts/emmet/node/actions/expandAbbreviation.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"expandAbbreviationAction": "Emmet: Espandi abbreviazione"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/emmet/node/actions/incrementDecrement.i18n.json b/i18n/ita/src/vs/workbench/parts/emmet/node/actions/incrementDecrement.i18n.json
deleted file mode 100644
index ece4609ebc5..00000000000
--- a/i18n/ita/src/vs/workbench/parts/emmet/node/actions/incrementDecrement.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"incrementNumberByOneTenth": "Emmet: Aumenta di 0,1",
-	"incrementNumberByOne": "Emmet: Aumenta di 1",
-	"incrementNumberByTen": "Emmet: Aumenta di 10",
-	"decrementNumberByOneTenth": "Emmet: Riduci di 0,1",
-	"decrementNumberByOne": "Emmet: Riduci di 1",
-	"decrementNumberByTen": "Emmet: Riduci di 10"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/emmet/node/actions/matchingPair.i18n.json b/i18n/ita/src/vs/workbench/parts/emmet/node/actions/matchingPair.i18n.json
deleted file mode 100644
index e7e21455b6b..00000000000
--- a/i18n/ita/src/vs/workbench/parts/emmet/node/actions/matchingPair.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"matchingPair": "Emmet: Vai alla coppia corrispondente"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/emmet/node/actions/mergeLines.i18n.json b/i18n/ita/src/vs/workbench/parts/emmet/node/actions/mergeLines.i18n.json
deleted file mode 100644
index 5dc3268b490..00000000000
--- a/i18n/ita/src/vs/workbench/parts/emmet/node/actions/mergeLines.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"mergeLines": "Emmet: Esegui merge delle righe"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/emmet/node/actions/reflectCssValue.i18n.json b/i18n/ita/src/vs/workbench/parts/emmet/node/actions/reflectCssValue.i18n.json
deleted file mode 100644
index 15cd2c912c4..00000000000
--- a/i18n/ita/src/vs/workbench/parts/emmet/node/actions/reflectCssValue.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"reflectCSSValue": "Emmet: Effettua reflection del valore CSS"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/emmet/node/actions/removeTag.i18n.json b/i18n/ita/src/vs/workbench/parts/emmet/node/actions/removeTag.i18n.json
deleted file mode 100644
index a375d4ca576..00000000000
--- a/i18n/ita/src/vs/workbench/parts/emmet/node/actions/removeTag.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"removeTag": "Emmet: Rimuovi tag"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/emmet/node/actions/selectItem.i18n.json b/i18n/ita/src/vs/workbench/parts/emmet/node/actions/selectItem.i18n.json
deleted file mode 100644
index 78c6fd0761b..00000000000
--- a/i18n/ita/src/vs/workbench/parts/emmet/node/actions/selectItem.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"selectPreviousItem": "Emmet: Seleziona elemento precedente",
-	"selectNextItem": "Emmet: Seleziona elemento successivo"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/emmet/node/actions/splitJoinTag.i18n.json b/i18n/ita/src/vs/workbench/parts/emmet/node/actions/splitJoinTag.i18n.json
deleted file mode 100644
index 006ad09b523..00000000000
--- a/i18n/ita/src/vs/workbench/parts/emmet/node/actions/splitJoinTag.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"splitJoinTag": "Emmet: Dividi/Unisci tag"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/emmet/node/actions/toggleComment.i18n.json b/i18n/ita/src/vs/workbench/parts/emmet/node/actions/toggleComment.i18n.json
deleted file mode 100644
index f4338f86f4e..00000000000
--- a/i18n/ita/src/vs/workbench/parts/emmet/node/actions/toggleComment.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"toggleComment": "Emmet: Attiva/Disattiva commento"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/emmet/node/actions/updateImageSize.i18n.json b/i18n/ita/src/vs/workbench/parts/emmet/node/actions/updateImageSize.i18n.json
deleted file mode 100644
index 49c7306573d..00000000000
--- a/i18n/ita/src/vs/workbench/parts/emmet/node/actions/updateImageSize.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"updateImageSize": "Emmet: Aggiorna dimensioni immagine"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/emmet/node/actions/updateTag.i18n.json b/i18n/ita/src/vs/workbench/parts/emmet/node/actions/updateTag.i18n.json
deleted file mode 100644
index 38caa12dc95..00000000000
--- a/i18n/ita/src/vs/workbench/parts/emmet/node/actions/updateTag.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"updateTag": "Emmet: Aggiorna tag",
-	"enterTag": "Immetti tag",
-	"tag": "Tag"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/emmet/node/actions/wrapWithAbbreviation.i18n.json b/i18n/ita/src/vs/workbench/parts/emmet/node/actions/wrapWithAbbreviation.i18n.json
deleted file mode 100644
index f83f8f86716..00000000000
--- a/i18n/ita/src/vs/workbench/parts/emmet/node/actions/wrapWithAbbreviation.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"wrapWithAbbreviationAction": "Emmet: Esegui il wrapping con l'abbreviazione",
-	"enterAbbreviation": "Immetti abbreviazione",
-	"abbreviation": "Abbreviazione"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/emmet/node/emmet.contribution.i18n.json b/i18n/ita/src/vs/workbench/parts/emmet/node/emmet.contribution.i18n.json
deleted file mode 100644
index 2b16a19f047..00000000000
--- a/i18n/ita/src/vs/workbench/parts/emmet/node/emmet.contribution.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"emmetConfigurationTitle": "Emmet",
-	"triggerExpansionOnTab": "Se abilitate, le abbreviazioni Emmet vengono espanse quando si preme TAB.",
-	"emmetPreferences": "Preferenze usate per modificare il comportamento di alcune azioni e i resolver di Emmet.",
-	"emmetSyntaxProfiles": "Consente di definire il profilo per la sintassi specificata oppure di usare un profilo personalizzato con regole specifiche.",
-	"emmetExclude": "Matrice di linguaggi in cui le abbreviazioni Emmet non devono essere espanse.",
-	"emmetExtensionsPath": "Percorso di una cartella contenente snippet, preferenze e profili Emmet"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json b/i18n/ita/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
deleted file mode 100644
index 2e6bc1e73d8..00000000000
--- a/i18n/ita/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"terminalConfigurationTitle": "Terminale esterno",
-	"explorer.openInTerminalKind": "Personalizza il tipo di terminale da avviare.",
-	"terminal.external.windowsExec": "Personalizza il terminale da eseguire in Windows.",
-	"terminal.external.osxExec": "Personalizza l'applicazione di terminale da eseguire in OS X.",
-	"terminal.external.linuxExec": "Personalizza il terminale da eseguire in Linux.",
-	"globalConsoleActionWin": "Apri nuovo prompt dei comandi",
-	"globalConsoleActionMacLinux": "Apri nuovo terminale",
-	"scopedConsoleActionWin": "Apri nel prompt dei comandi",
-	"scopedConsoleActionMacLinux": "Apri nel terminale"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/execution/electron-browser/terminal.contribution.i18n.json b/i18n/ita/src/vs/workbench/parts/execution/electron-browser/terminal.contribution.i18n.json
deleted file mode 100644
index 5f16bea9c5e..00000000000
--- a/i18n/ita/src/vs/workbench/parts/execution/electron-browser/terminal.contribution.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"terminalConfigurationTitle": "Terminale esterno",
-	"terminal.external.windowsExec": "Personalizza il terminale da eseguire in Windows.",
-	"terminal.external.osxExec": "Personalizza l'applicazione di terminale da eseguire in OS X.",
-	"terminal.external.linuxExec": "Personalizza il terminale da eseguire in Linux.",
-	"globalConsoleActionWin": "Apri nuovo prompt dei comandi",
-	"globalConsoleActionMacLinux": "Apri nuovo terminale",
-	"scopedConsoleActionWin": "Apri nel prompt dei comandi",
-	"scopedConsoleActionMacLinux": "Apri nel terminale"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/execution/electron-browser/terminalService.i18n.json b/i18n/ita/src/vs/workbench/parts/execution/electron-browser/terminalService.i18n.json
deleted file mode 100644
index b2beae5d759..00000000000
--- a/i18n/ita/src/vs/workbench/parts/execution/electron-browser/terminalService.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"console.title": "Console di Visual Studio Code",
-	"mac.terminal.script.failed": "Lo script '{0}' non è riuscito. Codice di uscita: {1}",
-	"mac.terminal.type.not.supported": "'{0}' non supportato",
-	"press.any.key": "Premere un tasto qualsiasi per continuare...",
-	"linux.term.failed": "'{0}' non riuscito. Codice di uscita: {1}"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/explorers/browser/treeExplorer.contribution.i18n.json b/i18n/ita/src/vs/workbench/parts/explorers/browser/treeExplorer.contribution.i18n.json
deleted file mode 100644
index 8dbebb2e4a7..00000000000
--- a/i18n/ita/src/vs/workbench/parts/explorers/browser/treeExplorer.contribution.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"vscode.extension.contributes.view": "Visualizzazione personalizzata per contributes",
-	"vscode.extension.contributes.view.id": "ID univoco usato per identificare la visualizzazione creata tramite vscode.workspace.createTreeView",
-	"vscode.extension.contributes.view.label": "Stringa leggibile usata per il rendering della visualizzazione",
-	"vscode.extension.contributes.view.icon": "Percorso dell'icona della visualizzazione",
-	"vscode.extension.contributes.views": "Visualizzazioni personalizzate per contributes",
-	"showViewlet": "Mostra {0}",
-	"view": "Visualizza"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/explorers/browser/treeExplorerActions.i18n.json b/i18n/ita/src/vs/workbench/parts/explorers/browser/treeExplorerActions.i18n.json
deleted file mode 100644
index 324ed325042..00000000000
--- a/i18n/ita/src/vs/workbench/parts/explorers/browser/treeExplorerActions.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"refresh": "Aggiorna"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/explorers/browser/treeExplorerService.i18n.json b/i18n/ita/src/vs/workbench/parts/explorers/browser/treeExplorerService.i18n.json
deleted file mode 100644
index 2a43886db18..00000000000
--- a/i18n/ita/src/vs/workbench/parts/explorers/browser/treeExplorerService.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"treeExplorer.noMatchingProviderId": "Non è stato registrato alcun elemento TreeExplorerNodeProvider con ID {providerId}."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/explorers/browser/views/treeExplorerView.i18n.json b/i18n/ita/src/vs/workbench/parts/explorers/browser/views/treeExplorerView.i18n.json
deleted file mode 100644
index 50e9e258b16..00000000000
--- a/i18n/ita/src/vs/workbench/parts/explorers/browser/views/treeExplorerView.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"treeExplorerViewlet.tree": "Sezione Tree Explorer"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/extensions/browser/dependenciesViewer.i18n.json b/i18n/ita/src/vs/workbench/parts/extensions/browser/dependenciesViewer.i18n.json
deleted file mode 100644
index 1a1b80921ba..00000000000
--- a/i18n/ita/src/vs/workbench/parts/extensions/browser/dependenciesViewer.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"error": "Errore",
-	"Unknown Dependency": "Dipendenza sconosciuta:"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json b/i18n/ita/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json
deleted file mode 100644
index c10190882f0..00000000000
--- a/i18n/ita/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"name": "Nome dell'estensione",
-	"extension id": "Identificatore dell'estensione",
-	"preview": "Anteprima",
-	"builtin": "Predefinita",
-	"publisher": "Nome dell'editore",
-	"install count": "Conteggio delle installazioni",
-	"rating": "Valutazione",
-	"repository": "Repository",
-	"license": "Licenza",
-	"details": "Dettagli",
-	"contributions": "Contributi",
-	"changelog": "Log delle modifiche",
-	"dependencies": "Dipendenze",
-	"noReadme": "File LEGGIMI non disponibile.",
-	"noChangelog": "Changelog non disponibile.",
-	"noContributions": "Nessun contributo",
-	"noDependencies": "Nessuna dipendenza",
-	"settings": "Impostazioni ({0})",
-	"setting name": "Nome",
-	"description": "Descrizione",
-	"default": "Impostazione predefinita",
-	"debuggers": "Debugger ({0})",
-	"debugger name": "Nome",
-	"debugger type": "Tipo",
-	"views": "Visualizzazioni ({0})",
-	"view id": "ID",
-	"view name": "Nome",
-	"view location": "Dove",
-	"localizations": "Localizzazioni ({0})",
-	"localizations language id": "ID lingua",
-	"localizations language name": "Nome lingua",
-	"localizations localized language name": "Nome lingua (localizzato)",
-	"colorThemes": "Temi colore ({0})",
-	"iconThemes": "Temi icona ({0})",
-	"colors": "Colori ({0})",
-	"colorId": "ID",
-	"defaultDark": "Predefinito scuro",
-	"defaultLight": "Predefinito chiaro",
-	"defaultHC": "Predefinito contrasto elevato",
-	"JSON Validation": "Convalida JSON ({0})",
-	"fileMatch": "Corrispondenza file",
-	"schema": "Schema",
-	"commands": "Comandi ({0})",
-	"command name": "Nome",
-	"keyboard shortcuts": "Tasti di scelta rapida",
-	"menuContexts": "Contesti menu",
-	"languages": "Linguaggi ({0})",
-	"language id": "ID",
-	"language name": "Nome",
-	"file extensions": "Estensioni di file",
-	"grammar": "Grammatica",
-	"snippets": "Frammenti"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json b/i18n/ita/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
deleted file mode 100644
index 8a9cb12815f..00000000000
--- a/i18n/ita/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
+++ /dev/null
@@ -1,81 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"download": "Scarica manualmente",
-	"install vsix": "Dopo il download, installare manualmente il VSIX scaricato di '{0}'.",
-	"installAction": "Installa",
-	"installing": "Installazione",
-	"failedToInstall": "Non è stato possibile installare '{0}'.",
-	"uninstallAction": "Disinstalla",
-	"Uninstalling": "Disinstallazione",
-	"updateAction": "Aggiorna",
-	"updateTo": "Aggiorna a {0}",
-	"failedToUpdate": "Non è stato possibile aggiornare '{0}'.",
-	"ManageExtensionAction.uninstallingTooltip": "Disinstallazione",
-	"enableForWorkspaceAction": "Abilita (area di lavoro)",
-	"enableGloballyAction": "Abilita",
-	"enableAction": "Abilita",
-	"disableForWorkspaceAction": "Disabilita (area di lavoro)",
-	"disableGloballyAction": "Disabilita",
-	"disableAction": "Disabilita",
-	"checkForUpdates": "Controlla la disponibilità di aggiornamenti",
-	"enableAutoUpdate": "Abilita l'aggiornamento automatico delle estensioni",
-	"disableAutoUpdate": "Disabilita l'aggiornamento automatico delle estensioni",
-	"updateAll": "Aggiorna tutte le estensioni",
-	"reloadAction": "Ricarica",
-	"postUpdateTooltip": "Ricaricare per aggiornare",
-	"postUpdateMessage": "Ricaricare questa finestra per attivare l'estensione aggiornata '{0}'?",
-	"postEnableTooltip": "Ricaricare per attivare",
-	"postEnableMessage": "Ricaricare questa finestra per attivare l'estensione '{0}'?",
-	"postDisableTooltip": "Ricaricare per disattivare",
-	"postDisableMessage": "Ricaricare questa finestra per disattivare l'estensione '{0}'?",
-	"postUninstallTooltip": "Ricaricare per disattivare",
-	"postUninstallMessage": "Ricaricare questa finestra per disattivare l'estensione disinstallata '{0}'?",
-	"toggleExtensionsViewlet": "Mostra estensioni",
-	"installExtensions": "Installa estensioni",
-	"showEnabledExtensions": "Mostra estensioni abilitate",
-	"showInstalledExtensions": "Mostra estensioni installate",
-	"showDisabledExtensions": "Mostra estensioni disabilitate",
-	"clearExtensionsInput": "Cancella input estensioni",
-	"showBuiltInExtensions": "Mostra estensioni predefinite",
-	"showOutdatedExtensions": "Mostra estensioni obsolete",
-	"showPopularExtensions": "Mostra estensioni più richieste",
-	"showRecommendedExtensions": "Mostra estensioni consigliate",
-	"installWorkspaceRecommendedExtensions": "Installa tutte le estensioni consigliate per l'area di lavoro",
-	"allExtensionsInstalled": "Tutte le estensioni consigliate per questa area di lavoro sono già state installate",
-	"installRecommendedExtension": "Installa l'estensione consigliata",
-	"extensionInstalled": "L'estensione consigliata è già stata installata",
-	"showRecommendedKeymapExtensionsShort": "Mappature tastiera",
-	"showLanguageExtensionsShort": "Estensioni del linguaggio",
-	"showAzureExtensionsShort": "Estensioni di Azure",
-	"OpenExtensionsFile.failed": "Non è possibile creare il file 'extensions.json' all'interno della cartella '.vscode' ({0}).",
-	"configureWorkspaceRecommendedExtensions": "Configura estensioni consigliate (area di lavoro)",
-	"configureWorkspaceFolderRecommendedExtensions": "Configura estensioni consigliate (cartella dell'area di lavoro)",
-	"malicious tooltip": "Questa estensione è stata segnalata come problematica.",
-	"malicious": "Dannosa",
-	"disabled": "Disabilitata",
-	"disabled globally": "Disabilitata",
-	"disabled workspace": "Disabilitata per questa area di lavoro",
-	"disableAll": "Disabilita tutte le estensioni installate",
-	"disableAllWorkspace": "Disabilita tutte le estensioni installate per questa area di lavoro",
-	"enableAll": "Abilita tutte le estensioni",
-	"enableAllWorkspace": "Abilita tutte le estensioni per questa area di lavoro",
-	"openExtensionsFolder": "Apri cartella estensioni",
-	"installVSIX": "Installa da VSIX...",
-	"installFromVSIX": "Installa da VSIX",
-	"installButton": "&&Installa",
-	"InstallVSIXAction.success": "L'estensione è stata installata. Ricaricare per abilitarla.",
-	"InstallVSIXAction.reloadNow": "Ricarica ora",
-	"reinstall": "Reinstalla estensione...",
-	"selectExtension": "Seleziona l'estensione da reinstallare",
-	"ReinstallAction.success": "L'estensione è stata reinstallata.",
-	"ReinstallAction.reloadNow": "Ricarica ora",
-	"extensionButtonProminentBackground": "Colore di sfondo delle azioni di estensioni che si distinguono (es. pulsante Installa).",
-	"extensionButtonProminentForeground": "Colore primo piano di pulsanti per azioni di estensioni che si distinguono (es. pulsante Installa).",
-	"extensionButtonProminentHoverBackground": "Colore di sfondo al passaggio del mouse dei pulsanti per azioni di estensione che si distinguono (es. pulsante Installa)."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/extensions/browser/extensionsList.i18n.json b/i18n/ita/src/vs/workbench/parts/extensions/browser/extensionsList.i18n.json
deleted file mode 100644
index 7270442b342..00000000000
--- a/i18n/ita/src/vs/workbench/parts/extensions/browser/extensionsList.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"recommended": "Consigliate"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/extensions/browser/extensionsQuickOpen.i18n.json b/i18n/ita/src/vs/workbench/parts/extensions/browser/extensionsQuickOpen.i18n.json
deleted file mode 100644
index 4561970c2a4..00000000000
--- a/i18n/ita/src/vs/workbench/parts/extensions/browser/extensionsQuickOpen.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"manage": "Premere INVIO per gestire le estensioni.",
-	"notfound": "Estensione '{0}' non trovata nel Marketplace.",
-	"install": "Premere INVIO per installare '{0}' dal Marketplace.",
-	"searchFor": "Premere INVIO per cercare '{0}' nel Marketplace.",
-	"noExtensionsToInstall": "Digitare un nome di estensione"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/extensions/browser/extensionsWidgets.i18n.json b/i18n/ita/src/vs/workbench/parts/extensions/browser/extensionsWidgets.i18n.json
deleted file mode 100644
index c8974951f6c..00000000000
--- a/i18n/ita/src/vs/workbench/parts/extensions/browser/extensionsWidgets.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"ratedByUsers": "Valutato da {0} utenti",
-	"ratedBySingleUser": "Valutato da 1 utente"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/extensions/common/extensionsFileTemplate.i18n.json b/i18n/ita/src/vs/workbench/parts/extensions/common/extensionsFileTemplate.i18n.json
deleted file mode 100644
index 60e0c558fba..00000000000
--- a/i18n/ita/src/vs/workbench/parts/extensions/common/extensionsFileTemplate.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"app.extensions.json.title": "Estensioni",
-	"app.extensions.json.recommendations": "Elenco delle estensioni consigliate. L'identificatore di un'estensione è sempre '${publisher}.${name}'. Ad esempio: 'vscode.csharp'.",
-	"app.extension.identifier.errorMessage": "Formato imprevisto '${publisher}.${name}'. Esempio: 'vscode.csharp'."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/extensions/common/extensionsInput.i18n.json b/i18n/ita/src/vs/workbench/parts/extensions/common/extensionsInput.i18n.json
deleted file mode 100644
index 5061bcaf2f1..00000000000
--- a/i18n/ita/src/vs/workbench/parts/extensions/common/extensionsInput.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"extensionsInputName": "Estensione: {0}"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json b/i18n/ita/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
deleted file mode 100644
index e979e517232..00000000000
--- a/i18n/ita/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
+++ /dev/null
@@ -1,69 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"name": "Nome dell'estensione",
-	"extension id": "Identificatore dell'estensione",
-	"preview": "Anteprima",
-	"builtin": "Predefinita",
-	"publisher": "Nome dell'editore",
-	"install count": "Conteggio delle installazioni",
-	"rating": "Valutazione",
-	"repository": "Repository",
-	"license": "Licenza",
-	"details": "Dettagli",
-	"detailstooltip": "Dettagli dell'estensione. Rendering eseguito dal file 'README.md' dell'estensione",
-	"contributions": "Contributi",
-	"contributionstooltip": "Elenca i contributi a VS Code aggiunti da questa estensione",
-	"changelog": "Log delle modifiche",
-	"changelogtooltip": "Cronologia degli aggiornamenti dell'estensione. Rendering eseguito dal file 'CHANGELOG.md' dell'estensione",
-	"dependencies": "Dipendenze",
-	"dependenciestooltip": "Elenca le estensioni da cui dipende questa estensione",
-	"noReadme": "File LEGGIMI non disponibile.",
-	"noChangelog": "Changelog non disponibile.",
-	"noContributions": "Nessun contributo",
-	"noDependencies": "Nessuna dipendenza",
-	"settings": "Impostazioni ({0})",
-	"setting name": "Nome",
-	"description": "Descrizione",
-	"default": "Impostazione predefinita",
-	"debuggers": "Debugger ({0})",
-	"debugger name": "Nome",
-	"debugger type": "Tipo",
-	"viewContainers": "Visualizza contenitori ({0})",
-	"view container id": "ID",
-	"view container title": "Titolo",
-	"view container location": "Dove",
-	"views": "Visualizzazioni ({0})",
-	"view id": "ID",
-	"view name": "Nome",
-	"view location": "Dove",
-	"localizations": "Localizzazioni ({0})",
-	"localizations language id": "ID lingua",
-	"localizations language name": "Nome del linguaggio",
-	"localizations localized language name": "Nome della lingua (localizzato)",
-	"colorThemes": "Temi colore ({0})",
-	"iconThemes": "Temi icona ({0})",
-	"colors": "Colori ({0})",
-	"colorId": "ID",
-	"defaultDark": "Predefinito scuro",
-	"defaultLight": "Predefinito chiaro",
-	"defaultHC": "Predefinito contrasto elevato",
-	"JSON Validation": "Convalida JSON ({0})",
-	"fileMatch": "Corrispondenza file",
-	"schema": "Schema",
-	"commands": "Comandi ({0})",
-	"command name": "Nome",
-	"keyboard shortcuts": "Scelte rapide da tastiera",
-	"menuContexts": "Contesti menu",
-	"languages": "Linguaggi ({0})",
-	"language id": "ID",
-	"language name": "Nome",
-	"file extensions": "Estensioni di file",
-	"grammar": "Grammatica",
-	"snippets": "Frammenti"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/extensions/electron-browser/extensionProfileService.i18n.json b/i18n/ita/src/vs/workbench/parts/extensions/electron-browser/extensionProfileService.i18n.json
deleted file mode 100644
index 122ac0848d2..00000000000
--- a/i18n/ita/src/vs/workbench/parts/extensions/electron-browser/extensionProfileService.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"restart1": "Esegui profilatura estensioni",
-	"restart2": "Per eseguire la profilatura delle estensioni, è richiesto un riavvio. Riavviare '{0}' ora?",
-	"restart3": "Riavvia",
-	"cancel": "Annulla",
-	"selectAndStartDebug": "Fare clic per arrestare la profilatura."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json b/i18n/ita/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
deleted file mode 100644
index 87312cd2502..00000000000
--- a/i18n/ita/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"neverShowAgain": "Non visualizzare più questo messaggio",
-	"searchMarketplace": "Cerca nel Marketplace",
-	"dynamicWorkspaceRecommendation": "Questa estensione potrebbe essere interessante perché viene usata da altri utenti del repository {0}.",
-	"exeBasedRecommendation": "Questa estensione è consigliata perché avete installato {0}.",
-	"fileBasedRecommendation": "Questa estensione è raccomandata in base ai file aperti di recente.",
-	"workspaceRecommendation": "Questa estensione è consigliata dagli utenti dell'area di lavoro corrente.",
-	"reallyRecommended2": "Per questo tipo di file è consigliabile utilizzare l'estensione '{0}'.",
-	"reallyRecommendedExtensionPack": "Per questo tipo di file è consigliabile usare il pacchetto di estensione '{0}'.",
-	"install": "Installa",
-	"showRecommendations": "Mostra gli elementi consigliati",
-	"showLanguageExtensions": "Il Marketplace ha estensioni per i file '.{0}'",
-	"workspaceRecommended": "Per questa area di lavoro sono disponibili estensioni consigliate.",
-	"installAll": "Installa tutto",
-	"ignoreExtensionRecommendations": "Ignorare tutti i suggerimenti per le estensioni?",
-	"ignoreAll": "Sì, ignora tutti",
-	"no": "No"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/extensions/electron-browser/extensions.contribution.i18n.json b/i18n/ita/src/vs/workbench/parts/extensions/electron-browser/extensions.contribution.i18n.json
deleted file mode 100644
index 73ccd10b71c..00000000000
--- a/i18n/ita/src/vs/workbench/parts/extensions/electron-browser/extensions.contribution.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"extensionsCommands": "Gestisci le estensioni",
-	"galleryExtensionsCommands": "Installa estensioni della raccolta",
-	"extension": "Estensione",
-	"runtimeExtension": "Estensioni in esecuzione",
-	"extensions": "Estensioni",
-	"view": "Visualizza",
-	"developer": "Sviluppatore",
-	"extensionsConfigurationTitle": "Estensioni",
-	"extensionsAutoUpdate": "Aggiorna automaticamente le estensioni",
-	"extensionsIgnoreRecommendations": "Se impostato a true, le notifiche delle raccomandazioni dell'estensione non verranno più mostrate.",
-	"extensionsShowRecommendationsOnlyOnDemand": "Se impostato su true, le raccomandazioni non verranno recuperate o modificate a meno che non sia specificamente richiesto dall'utente."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.i18n.json b/i18n/ita/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.i18n.json
deleted file mode 100644
index b4c1e79a326..00000000000
--- a/i18n/ita/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openExtensionsFolder": "Apri cartella estensioni",
-	"installVSIX": "Installa da VSIX...",
-	"installFromVSIX": "Installare da VSIX",
-	"installButton": "&&Installa",
-	"InstallVSIXAction.reloadNow": "Ricarica ora"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/extensions/electron-browser/extensionsUtils.i18n.json b/i18n/ita/src/vs/workbench/parts/extensions/electron-browser/extensionsUtils.i18n.json
deleted file mode 100644
index b78ce5a7c83..00000000000
--- a/i18n/ita/src/vs/workbench/parts/extensions/electron-browser/extensionsUtils.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"disableOtherKeymapsConfirmation": "Disabilitare altre mappature tastiera ({0}) per evitare conflitti tra tasti di scelta rapida?",
-	"yes": "Sì",
-	"no": "No"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json b/i18n/ita/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
deleted file mode 100644
index 17b06f638b8..00000000000
--- a/i18n/ita/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"marketPlace": "Marketplace",
-	"installedExtensions": "Installate",
-	"searchInstalledExtensions": "Installate",
-	"recommendedExtensions": "Consigliate",
-	"otherRecommendedExtensions": "Altri consigli",
-	"workspaceRecommendedExtensions": "Consigli per l'area di lavoro",
-	"builtInExtensions": "Funzionalità",
-	"builtInThemesExtensions": "Temi",
-	"builtInBasicsExtensions": "Linguaggi di programmazione",
-	"searchExtensions": "Cerca le estensioni nel Marketplace",
-	"sort by installs": "Ordina per: conteggio installazioni",
-	"sort by rating": "Ordina per: classificazione",
-	"sort by name": "Ordina per: Nome",
-	"suggestProxyError": "Marketplace ha restituito 'ECONNREFUSED'. Controllare l'impostazione 'http.proxy'.",
-	"extensions": "Estensioni",
-	"outdatedExtensions": "{0} estensioni obsolete",
-	"malicious warning": "L'estensione '{0}' è stata disinstallata perché è stata segnalata come problematica.",
-	"reloadNow": "Ricarica ora"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/extensions/electron-browser/extensionsViews.i18n.json b/i18n/ita/src/vs/workbench/parts/extensions/electron-browser/extensionsViews.i18n.json
deleted file mode 100644
index eb659e0ab86..00000000000
--- a/i18n/ita/src/vs/workbench/parts/extensions/electron-browser/extensionsViews.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"extensions": "Estensioni",
-	"no extensions found": "Non sono state trovate estensioni.",
-	"suggestProxyError": "Marketplace ha restituito 'ECONNREFUSED'. Controllare l'impostazione 'http.proxy'."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/extensions/electron-browser/keymapExtensions.i18n.json b/i18n/ita/src/vs/workbench/parts/extensions/electron-browser/keymapExtensions.i18n.json
deleted file mode 100644
index 6c3f2e984e8..00000000000
--- a/i18n/ita/src/vs/workbench/parts/extensions/electron-browser/keymapExtensions.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"disableOtherKeymapsConfirmation": "Disabilitare altre mappature tastiera per evitare conflitti tra tasti di scelta rapida?",
-	"yes": "Sì",
-	"no": "No"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/extensions/electron-browser/runtimeExtensionsEditor.i18n.json b/i18n/ita/src/vs/workbench/parts/extensions/electron-browser/runtimeExtensionsEditor.i18n.json
deleted file mode 100644
index d8fc4374e9a..00000000000
--- a/i18n/ita/src/vs/workbench/parts/extensions/electron-browser/runtimeExtensionsEditor.i18n.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"starActivation": "Attivata all'avvio",
-	"workspaceContainsGlobActivation": "Attivata perché nell'area di lavoro è presente un file corrispondente a {0}",
-	"workspaceContainsFileActivation": "Attivata perché nell'area di lavoro è presente il file {0}",
-	"languageActivation": "Attivata perché è stato aperto un file {0}",
-	"workspaceGenericActivation": "Data di attivazione: {0}",
-	"errors": "{0} errori non rilevati",
-	"extensionsInputName": "Estensioni in esecuzione",
-	"showRuntimeExtensions": "Mostra estensioni in esecuzione",
-	"reportExtensionIssue": "Segnala problema",
-	"extensionHostProfileStart": "Avvia profilo host dell'estensione",
-	"extensionHostProfileStop": "Arresta profilo host dell'estensione",
-	"saveExtensionHostProfile": "Salva profilo host dell'estensione"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.i18n.json b/i18n/ita/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.i18n.json
deleted file mode 100644
index 69b2daed0ab..00000000000
--- a/i18n/ita/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.i18n.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"installingVSIXExtension": "Installazione estensione da VSIX in corso...",
-	"malicious": "Questa estensione è segnalata come problematica.",
-	"installingMarketPlaceExtension": "Installazione dell'estensione dal Marketplace...",
-	"uninstallingExtension": "Disinstallazione estensione in corso...",
-	"enableDependeciesConfirmation": "Se si abilita un'estensione, verranno abilitate anche le relative dipendenze. Continuare?",
-	"enable": "Sì",
-	"doNotEnable": "No",
-	"disableDependeciesConfirmation": "Disabilitare anche le dipendenze dell'estensione?",
-	"yes": "Sì",
-	"no": "No",
-	"cancel": "Annulla",
-	"singleDependentError": "Non è possibile disabilitare l'estensione '{0}'. L'estensione '{1}' dipende da tale estensione.",
-	"twoDependentsError": "Non è possibile disabilitare l'estensione '{0}'. Le estensioni '{1}' e '{2}' dipendono da tale estensione.",
-	"multipleDependentsError": "Non è possibile disabilitare l'estensione '{0}'. Alcune estensioni, tra cui '{1}' e '{2}' dipendono da tale estensione.",
-	"installConfirmation": "Installare l'estensione '{0}'?",
-	"install": "Installa"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json b/i18n/ita/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json
deleted file mode 100644
index f20b6fbba02..00000000000
--- a/i18n/ita/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"workbenchConfigurationTitle": "Area di lavoro",
-	"feedbackVisibility": "Controlla la visibilità del feedback Twitter (smiley) nella barra di stato nella parte inferiore del banco di lavoro."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/feedback/electron-browser/feedback.i18n.json b/i18n/ita/src/vs/workbench/parts/feedback/electron-browser/feedback.i18n.json
deleted file mode 100644
index 46d826dd875..00000000000
--- a/i18n/ita/src/vs/workbench/parts/feedback/electron-browser/feedback.i18n.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"sendFeedback": "Invia commenti e suggerimenti tramite Twitter",
-	"label.sendASmile": "Invia commenti e suggerimenti tramite Twitter.",
-	"patchedVersion1": "L'installazione è danneggiata.",
-	"patchedVersion2": "Specificare questo fattore se si invia una segnalazione di bug.",
-	"sentiment": "Grado di soddisfazione dell'esperienza",
-	"smileCaption": "Felice",
-	"frownCaption": "Triste",
-	"other ways to contact us": "Altri modi per contattare Microsoft",
-	"submit a bug": "Segnala un bug",
-	"request a missing feature": "Richiedi una funzionalità mancante",
-	"tell us why?": "Motivo",
-	"commentsHeader": "Commenti",
-	"showFeedback": "Visualizza Feedback Smiley nella barra di stato",
-	"tweet": "Invia un tweet",
-	"character left": "carattere rimasto",
-	"characters left": "caratteri rimasti",
-	"feedbackSending": "Invio",
-	"feedbackSent": "Grazie",
-	"feedbackSendingError": "Riprovare"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json b/i18n/ita/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json
deleted file mode 100644
index f61ceeb442f..00000000000
--- a/i18n/ita/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hide": "Nascondi"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/files/browser/editors/binaryFileEditor.i18n.json b/i18n/ita/src/vs/workbench/parts/files/browser/editors/binaryFileEditor.i18n.json
deleted file mode 100644
index c29cc9bb3db..00000000000
--- a/i18n/ita/src/vs/workbench/parts/files/browser/editors/binaryFileEditor.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"binaryFileEditor": "Visualizzatore file binari"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/files/browser/editors/textFileEditor.i18n.json b/i18n/ita/src/vs/workbench/parts/files/browser/editors/textFileEditor.i18n.json
deleted file mode 100644
index 45337827eb3..00000000000
--- a/i18n/ita/src/vs/workbench/parts/files/browser/editors/textFileEditor.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"textFileEditor": "Editor file di testo",
-	"createFile": "Crea file",
-	"relaunchWithIncreasedMemoryLimit": "Riavvia con {0} MB",
-	"configureMemoryLimit": "Configura limite di memoria",
-	"fileEditorWithInputAriaLabel": "{0}. Editor file di testo.",
-	"fileEditorAriaLabel": "Editor file di testo."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/files/browser/explorerViewlet.i18n.json b/i18n/ita/src/vs/workbench/parts/files/browser/explorerViewlet.i18n.json
deleted file mode 100644
index 4133fa4bc3c..00000000000
--- a/i18n/ita/src/vs/workbench/parts/files/browser/explorerViewlet.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"folders": "Cartelle"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/files/browser/fileActions.contribution.i18n.json b/i18n/ita/src/vs/workbench/parts/files/browser/fileActions.contribution.i18n.json
deleted file mode 100644
index 979ee1896bb..00000000000
--- a/i18n/ita/src/vs/workbench/parts/files/browser/fileActions.contribution.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"filesCategory": "File",
-	"revealInSideBar": "Visualizza nella barra laterale",
-	"acceptLocalChanges": "Utilizzare le modifiche e sovrascrivere il contenuto del disco",
-	"revertLocalChanges": "Annullare le modifiche e tornare al contenuto sul disco"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/files/browser/fileActions.i18n.json b/i18n/ita/src/vs/workbench/parts/files/browser/fileActions.i18n.json
deleted file mode 100644
index 7d23a38e703..00000000000
--- a/i18n/ita/src/vs/workbench/parts/files/browser/fileActions.i18n.json
+++ /dev/null
@@ -1,75 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"retry": "Riprova",
-	"rename": "Rinomina",
-	"newFile": "Nuovo file",
-	"newFolder": "Nuova cartella",
-	"openFolderFirst": "Aprire prima di tutto una cartella per creare file o cartelle al suo interno.",
-	"newUntitledFile": "Nuovo file senza nome",
-	"createNewFile": "Nuovo file",
-	"createNewFolder": "Nuova cartella",
-	"deleteButtonLabelRecycleBin": "&&Sposta nel Cestino",
-	"deleteButtonLabelTrash": "&&Sposta nel cestino",
-	"deleteButtonLabel": "&&Elimina",
-	"dirtyMessageFolderOneDelete": "Si sta per eliminare una cartella con modifiche non salvate in un file. Continuare?",
-	"dirtyMessageFolderDelete": "Si sta per eliminare una cartella con modifiche non salvate in {0} file. Continuare?",
-	"dirtyMessageFileDelete": "Si sta per eliminare un file con modifiche non salvate. Continuare?",
-	"dirtyWarning": "Le modifiche apportate andranno perse se non vengono salvate.",
-	"confirmMoveTrashMessageFolder": "Eliminare '{0}' e il relativo contenuto?",
-	"confirmMoveTrashMessageFile": "Eliminare '{0}'?",
-	"undoBin": "È possibile ripristinare dal Cestino.",
-	"undoTrash": "È possibile ripristinare dal cestino.",
-	"doNotAskAgain": "Non chiedermelo di nuovo",
-	"confirmDeleteMessageFolder": "Eliminare definitivamente '{0}' e il relativo contenuto?",
-	"confirmDeleteMessageFile": "Eliminare definitivamente '{0}'?",
-	"irreversible": "Questa azione è irreversibile.",
-	"permDelete": "Elimina definitivamente",
-	"delete": "Elimina",
-	"importFiles": "Importa file",
-	"confirmOverwrite": "Nella cartella di destinazione esiste già un file o una cartella con lo stesso nome. Sovrascrivere?",
-	"replaceButtonLabel": "&&Sostituisci",
-	"copyFile": "Copia",
-	"pasteFile": "Incolla",
-	"duplicateFile": "Duplicato",
-	"openToSide": "Apri lateralmente",
-	"compareSource": "Seleziona per il confronto",
-	"globalCompareFile": "Confronta file attivo con...",
-	"openFileToCompare": "Aprire prima un file per confrontarlo con un altro file.",
-	"compareWith": "Confronta '{0}' con '{1}'",
-	"compareFiles": "Confronta file",
-	"refresh": "Aggiorna",
-	"save": "Salva",
-	"saveAs": "Salva con nome...",
-	"saveAll": "Salva tutto",
-	"saveAllInGroup": "Salva tutto nel gruppo",
-	"saveFiles": "Salva tutti i file",
-	"revert": "Ripristina file",
-	"focusOpenEditors": "Stato attivo su visualizzazione editor aperti",
-	"focusFilesExplorer": "Stato attivo su Esplora file",
-	"showInExplorer": "Visualizza file attivo nella barra laterale",
-	"openFileToShow": "Aprire prima di tutto un file per visualizzarlo in Esplora risorse",
-	"collapseExplorerFolders": "Comprimi cartelle in Explorer",
-	"refreshExplorer": "Aggiorna Explorer",
-	"openFileInNewWindow": "Apri file attivo in un'altra finestra",
-	"openFileToShowInNewWindow": "Aprire prima un file per visualizzarlo in un'altra finestra",
-	"revealInWindows": "Visualizza in Esplora risorse",
-	"revealInMac": "Visualizza in Finder",
-	"openContainer": "Apri cartella superiore",
-	"revealActiveFileInWindows": "Visualizza file attivo in Esplora risorse",
-	"revealActiveFileInMac": "Visualizza file attivo in Finder",
-	"openActiveFileContainer": "Apri cartella che contiene il file attivo",
-	"copyPath": "Copia percorso",
-	"copyPathOfActive": "Copia percorso del file attivo",
-	"emptyFileNameError": "È necessario specificare un nome file o un nome di cartella.",
-	"fileNameExistsError": "In questo percorso esiste già un file o una cartella **{0}**. Scegliere un nome diverso.",
-	"invalidFileNameError": "Il nome **{0}** non è valido per un nome file o un nome di cartella. Scegliere un nome diverso.",
-	"filePathTooLongError": "Con il nome **{0}** il percorso diventa troppo lungo. Scegliere un nome più breve.",
-	"compareWithSaved": "Confronta file attivo con file salvato",
-	"modifiedLabel": "{0} (su disco) ↔ {1}",
-	"compareWithClipboard": "Confronta il file attivo con gli appunti",
-	"clipboardComparisonLabel": "Appunti ↔ {0}"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/files/browser/fileCommands.i18n.json b/i18n/ita/src/vs/workbench/parts/files/browser/fileCommands.i18n.json
deleted file mode 100644
index a02c62cce4f..00000000000
--- a/i18n/ita/src/vs/workbench/parts/files/browser/fileCommands.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"openFileToCopy": "Aprire prima un file per copiarne il percorso",
-	"openFileToReveal": "Aprire prima un file per visualizzarlo"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/files/browser/files.contribution.i18n.json b/i18n/ita/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
deleted file mode 100644
index 1f2167be7be..00000000000
--- a/i18n/ita/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
+++ /dev/null
@@ -1,53 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"showExplorerViewlet": "Mostra Esplora risorse",
-	"explore": "Esplora risorse",
-	"view": "Visualizza",
-	"textFileEditor": "Editor file di testo",
-	"binaryFileEditor": "Editor file binari",
-	"filesConfigurationTitle": "File",
-	"exclude": "Consente di configurare i criteri GLOB per escludere file e cartelle. Ad esempio, la funzionalità Esplora file stabilisce quali file e cartelle mostrare o nascondere in base a questa impostazione.",
-	"files.exclude.boolean": "Criterio GLOB da usare per trovare percorsi file. Impostare su True o False per abilitare o disabilitare il criterio.",
-	"files.exclude.when": "Controllo aggiuntivo sugli elementi di pari livello di un file corrispondente. Usare $(basename) come variabile del nome file corrispondente.",
-	"associations": "Consente di configurare le associazioni tra file e linguaggi, ad esempio \"*.extension\": \"html\". Queste hanno la precedenza sulle associazioni predefinite dei linguaggi installate.",
-	"encoding": "Codifica del set di caratteri predefinita da usare durante la lettura e la scrittura di file. È possibile configurare questa impostazione anche in base alla lingua.",
-	"autoGuessEncoding": "Quando questa opzione è abilitata, la codifica del set di caratteri viene ipotizzata all'apertura dei file. È possibile configurare questa impostazione anche in base alla lingua.",
-	"eol": "Il carattere di fine riga predefinito. Utilizzare \\n per LF e \\r\\n per CRLF.",
-	"trimTrailingWhitespace": "Se è abilitato, taglierà lo spazio vuoto quando si salva un file.",
-	"insertFinalNewline": "Se è abilitato, inserisce un carattere di nuova riga finale alla fine del file durante il salvataggio.",
-	"trimFinalNewlines": "Se è abilitato, taglia tutte le nuove righe dopo il carattere di nuova riga finale alla fine del file durante il salvataggio.",
-	"files.autoSave.off": "Un file dirty non viene mai salvato automaticamente.",
-	"files.autoSave.afterDelay": "Un file dirty viene salvato automaticamente in base al valore configurato di 'files.autoSaveDelay'.",
-	"files.autoSave.onFocusChange": "Un file dirty viene salvato automaticamente quando l'editor perde lo stato attivo.",
-	"files.autoSave.onWindowChange": "Un file dirty viene salvato automaticamente quando la finestra perde lo stato attivo.",
-	"autoSave": "Controlla il salvataggio automatico dei file dirty. Valori accettati: '{0}', '{1}', '{2}' (l'editor perde lo stato attivo), '{3}' (la finestra perde lo stato attivo). Se è impostato su '{4}', è possibile configurare il ritardo in 'files.autoSaveDelay'.",
-	"autoSaveDelay": "Controlla il ritardo in ms dopo il quale un file dirty viene salvato automaticamente. Si applica solo quando 'files.autoSave' è impostato su '{0}'",
-	"watcherExclude": "Consente di configurare i criteri GLOB dei percorsi file da escludere dal controllo dei file. I criteri devono corrispondere in percorsi assoluti (per una corretta corrispondenza aggiungere come prefisso ** il percorso completo). Se si modifica questa impostazione, è necessario riavviare. Quando si nota che Code consuma troppo tempo della CPU all'avvio, è possibile escludere le cartelle di grandi dimensioni per ridurre il carico iniziale.",
-	"hotExit.off": "Disabilita Hot Exit.",
-	"hotExit.onExit": "La funzionalità Hot Exit verrà attivata alla chiusura dell'applicazione, ovvero quando si chiude l'ultima finestra in Windows/Linux o quando si attiva il comando workbench.action.quit (riquadro comandi, tasto di scelta rapida, menu). Tutte le finestre con backup verranno ripristinate al successivo avvio.",
-	"hotExit.onExitAndWindowClose": "La funzionalità Hot Exit verrà attivata alla chiusura dell'applicazione, ovvero quando si chiude l'ultima finestra in Windows/Linux o quando si attiva il comando workbench.action.quit (riquadro comandi, tasto di scelta rapida, menu), nonché per qualsiasi finestra con una cartella aperta indipendentemente dal fatto che sia l'ultima. Tutte le finestre senza cartelle aperte verranno ripristinate al successivo avvio. Per riportare le finestre di cartelle allo stato in cui si trovavano prima dell'arresto, impostare \"window.restoreFolders\" su \"all\".",
-	"hotExit": "Controlla se i file non salvati verranno memorizzati tra una sessione e l'altra, consentendo di ignorare il prompt di salvataggio alla chiusura dell'editor.",
-	"useExperimentalFileWatcher": "Usa il nuovo watcher di file sperimentale.",
-	"defaultLanguage": "Modalità linguaggio predefinita assegnata ai nuovi file.",
-	"editorConfigurationTitle": "Editor",
-	"formatOnSave": "Formatta un file durante il salvataggio. Deve essere disponibile un formattatore, il file non deve essere salvato automaticamente e l'editor non deve essere in fase di chiusura.",
-	"explorerConfigurationTitle": "Esplora file",
-	"openEditorsVisible": "Numero di editor visualizzati nel riquadro degli editor aperti. Impostarlo su 0 per nascondere il riquadro.",
-	"dynamicHeight": "Controlla se l'altezza della sezione degli editor aperti deve essere adattata o meno dinamicamente al numero di elementi.",
-	"autoReveal": "Controlla se Esplora risorse deve rivelare automaticamente e selezionare i file durante l'apertura.",
-	"enableDragAndDrop": "Controlla se Esplora risorse deve consentire lo spostamento di file e cartelle tramite trascinamento della selezione.",
-	"confirmDragAndDrop": "Controlla se Esplora risorse deve chiedere conferma prima di spostare file e cartelle tramite trascinamento della selezione.",
-	"confirmDelete": "Controlla se Esplora risorse deve chiedere una conferma quando si elimina file tramite il cestino.",
-	"sortOrder.default": "I file e le cartelle vengono ordinati in ordine alfabetico in base al nome. Le cartelle vengono visualizzate prima dei file.",
-	"sortOrder.mixed": "I file e le cartelle vengono ordinati ordine alfabetico in base al nome, in un unico elenco ordinato.",
-	"sortOrder.filesFirst": "I file e le cartelle vengono ordinati in ordine alfabetico in base al nome. I file vengono visualizzati prima delle cartelle.",
-	"sortOrder.type": "I file e le cartelle vengono ordinati in ordine alfabetico in base all'estensione. Le cartelle vengono visualizzate prima dei file.",
-	"sortOrder.modified": "I file e le cartelle vengono ordinati in ordine decrescente in base alla data dell'ultima modifica. Le cartelle vengono visualizzate prima dei file.",
-	"sortOrder": "Controlla l'ordinamento di file e cartelle in Esplora risorse. Oltre all'ordinamento predefinito, è possibile impostare l'ordine su 'mixed' (file e cartelle vengono ordinati insieme), 'type' (in base al tipo di file), 'modified' (in base alla data dell'ultima modifica) o 'filesFirst' (i file vengono ordinati prima delle cartelle).",
-	"explorer.decorations.colors": "Controlli se decorazioni file dovrebbero usare colori.",
-	"explorer.decorations.badges": "Controlli se decorazioni file devono utilizzare badge."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/files/browser/saveErrorHandler.i18n.json b/i18n/ita/src/vs/workbench/parts/files/browser/saveErrorHandler.i18n.json
deleted file mode 100644
index 49ebceb9611..00000000000
--- a/i18n/ita/src/vs/workbench/parts/files/browser/saveErrorHandler.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"userGuide": "Usare le azioni della barra degli strumenti dell'editor a destra per **annullare** le modifiche o per **sovrascrivere** il contenuto su disco con le modifiche",
-	"discard": "Rimuovi",
-	"overwrite": "Sovrascrivi",
-	"retry": "Riprova",
-	"readonlySaveError": "Non è stato possibile salvare '{0}': il file è protetto da scrittura. Selezionare 'Sovrascrivi' per rimuovere la protezione.",
-	"genericSaveError": "Non è stato possibile salvare '{0}': {1}",
-	"staleSaveError": "Non è stato possibile salvare '{0}': il contenuto sul disco è più recente. Fare clic su **Confronta** per confrontare la versione corrente con quella sul disco.",
-	"compareChanges": "Confronta",
-	"saveConflictDiffLabel": "{0} (su disco) ↔ {1} (in {2}) - Risolvere conflitto in fase di salvataggio"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/files/browser/views/emptyView.i18n.json b/i18n/ita/src/vs/workbench/parts/files/browser/views/emptyView.i18n.json
deleted file mode 100644
index 0fc4ed5c41b..00000000000
--- a/i18n/ita/src/vs/workbench/parts/files/browser/views/emptyView.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"noWorkspace": "Nessuna cartella aperta",
-	"explorerSection": "Sezione Esplora file",
-	"noWorkspaceHelp": "Non hai ancora aggiunto cartelle nell'area di lavoro",
-	"addFolder": "Aggiungi cartella",
-	"noFolderHelp": "Non ci sono ancora cartelle aperte.",
-	"openFolder": "Apri cartella"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/files/browser/views/explorerDecorationsProvider.i18n.json b/i18n/ita/src/vs/workbench/parts/files/browser/views/explorerDecorationsProvider.i18n.json
deleted file mode 100644
index 5e6781977fb..00000000000
--- a/i18n/ita/src/vs/workbench/parts/files/browser/views/explorerDecorationsProvider.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"label": "Esplora risorse",
-	"canNotResolve": "Non può risolvere la cartella dell'area di lavoro"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/files/browser/views/explorerView.i18n.json b/i18n/ita/src/vs/workbench/parts/files/browser/views/explorerView.i18n.json
deleted file mode 100644
index 43fcd8d45a7..00000000000
--- a/i18n/ita/src/vs/workbench/parts/files/browser/views/explorerView.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"explorerSection": "Sezione Esplora file",
-	"treeAriaLabel": "Esplora file"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/files/browser/views/explorerViewer.i18n.json b/i18n/ita/src/vs/workbench/parts/files/browser/views/explorerViewer.i18n.json
deleted file mode 100644
index e1c70dabcca..00000000000
--- a/i18n/ita/src/vs/workbench/parts/files/browser/views/explorerViewer.i18n.json
+++ /dev/null
@@ -1,19 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"fileInputAriaLabel": "Digitare il nome file. Premere INVIO per confermare oppure ESC per annullare.",
-	"filesExplorerViewerAriaLabel": "{0}, Esplora file",
-	"dropFolders": "Aggiungere le cartelle all'area di lavoro?",
-	"dropFolder": "Aggiungere la cartella all'area di lavoro?",
-	"addFolders": "&& Aggiungi cartelle",
-	"addFolder": "&&Aggiungi cartella",
-	"confirmMove": "Sei sicuro di voler spostare '{0}'?",
-	"doNotAskAgain": "Non chiedermelo di nuovo",
-	"moveButtonLabel": "&&Sposta",
-	"confirmOverwriteMessage": "'{0}' esiste già nella cartella di destinazione. Sostituirlo?",
-	"irreversible": "Questa azione è irreversibile.",
-	"replaceButtonLabel": "&&Sostituisci"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/files/browser/views/openEditorsView.i18n.json b/i18n/ita/src/vs/workbench/parts/files/browser/views/openEditorsView.i18n.json
deleted file mode 100644
index 1f600783232..00000000000
--- a/i18n/ita/src/vs/workbench/parts/files/browser/views/openEditorsView.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"openEditors": "Editor aperti",
-	"openEditosrSection": "Sezione Editor aperti",
-	"treeAriaLabel": "Editor aperti: elenco di file attivi",
-	"dirtyCounter": "{0} non salvati"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/files/browser/views/openEditorsViewer.i18n.json b/i18n/ita/src/vs/workbench/parts/files/browser/views/openEditorsViewer.i18n.json
deleted file mode 100644
index 8cdbd287795..00000000000
--- a/i18n/ita/src/vs/workbench/parts/files/browser/views/openEditorsViewer.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"editorGroupAriaLabel": "{0}, Gruppo di editor",
-	"openEditorAriaLabel": "{0}, Apri editor",
-	"saveAll": "Salva tutto",
-	"closeAllUnmodified": "Chiudi non modificate",
-	"closeAll": "Chiudi tutto",
-	"compareWithSaved": "Confronta con file salvato",
-	"close": "Chiudi",
-	"closeOthers": "Chiudi altri"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/files/common/dirtyFilesTracker.i18n.json b/i18n/ita/src/vs/workbench/parts/files/common/dirtyFilesTracker.i18n.json
deleted file mode 100644
index cde98f01a5e..00000000000
--- a/i18n/ita/src/vs/workbench/parts/files/common/dirtyFilesTracker.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"dirtyFile": "1 file non salvato",
-	"dirtyFiles": "{0} file non salvati"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/files/common/editors/fileEditorInput.i18n.json b/i18n/ita/src/vs/workbench/parts/files/common/editors/fileEditorInput.i18n.json
deleted file mode 100644
index a6f396bbe8c..00000000000
--- a/i18n/ita/src/vs/workbench/parts/files/common/editors/fileEditorInput.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"orphanedFile": "{0} (deleted from disk)"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/files/electron-browser/explorerViewlet.i18n.json b/i18n/ita/src/vs/workbench/parts/files/electron-browser/explorerViewlet.i18n.json
deleted file mode 100644
index d6d085b80f2..00000000000
--- a/i18n/ita/src/vs/workbench/parts/files/electron-browser/explorerViewlet.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"folders": "Cartelle"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json b/i18n/ita/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
deleted file mode 100644
index f659f351cf6..00000000000
--- a/i18n/ita/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"filesCategory": "File",
-	"revealInSideBar": "Visualizza nella barra laterale",
-	"acceptLocalChanges": "Utilizzare le modifiche e sovrascrivere il contenuto del disco",
-	"revertLocalChanges": "Annullare le modifiche e tornare al contenuto sul disco",
-	"copyPathOfActive": "Copia percorso del file attivo",
-	"saveAllInGroup": "Salva tutto nel gruppo",
-	"saveFiles": "Salva tutti i file",
-	"revert": "Ripristina file",
-	"compareActiveWithSaved": "Confronta file attivo con file salvato",
-	"closeEditor": "Chiudi editor",
-	"view": "Visualizza",
-	"openToSide": "Apri lateralmente",
-	"revealInWindows": "Visualizza in Esplora risorse",
-	"revealInMac": "Visualizza in Finder",
-	"openContainer": "Apri cartella superiore",
-	"copyPath": "Copia percorso",
-	"saveAll": "Salva tutto",
-	"compareWithSaved": "Confronta con file salvato",
-	"compareWithSelected": "Confronta con selezionati",
-	"compareSource": "Seleziona per il confronto",
-	"compareSelected": "Confronta selezionati",
-	"close": "Chiudi",
-	"closeOthers": "Chiudi altri",
-	"closeSaved": "Chiudi salvati",
-	"closeAll": "Chiudi tutto",
-	"deleteFile": "Elimina definitivamente"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json b/i18n/ita/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
deleted file mode 100644
index be168507f7f..00000000000
--- a/i18n/ita/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
+++ /dev/null
@@ -1,72 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"newFile": "Nuovo file",
-	"newFolder": "Nuova cartella",
-	"rename": "Rinomina",
-	"delete": "Elimina",
-	"copyFile": "Copia",
-	"pasteFile": "Incolla",
-	"retry": "Riprova",
-	"renameWhenSourcePathIsParentOfTargetError": "Usare il comando 'Nuova cartella' o 'Nuovo file' per aggiungere elementi figlio a una cartella esistente",
-	"newUntitledFile": "Nuovo file senza nome",
-	"createNewFile": "Nuovo file",
-	"createNewFolder": "Nuova cartella",
-	"deleteButtonLabelRecycleBin": "&&Sposta nel Cestino",
-	"deleteButtonLabelTrash": "&&Sposta nel cestino",
-	"deleteButtonLabel": "&&Elimina",
-	"dirtyMessageFilesDelete": "Stai eliminando file non ancora salvati. Vuoi continuare?",
-	"dirtyMessageFolderOneDelete": "Si sta per eliminare una cartella con modifiche non salvate in un file. Continuare?",
-	"dirtyMessageFolderDelete": "Si sta per eliminare una cartella con modifiche non salvate in {0} file. Continuare?",
-	"dirtyMessageFileDelete": "Si sta per eliminare un file con modifiche non salvate. Continuare?",
-	"dirtyWarning": "Le modifiche apportate andranno perse se non vengono salvate.",
-	"undoBin": "È possibile ripristinare dal Cestino.",
-	"undoTrash": "È possibile ripristinare dal Cestino.",
-	"doNotAskAgain": "Non chiedermelo di nuovo",
-	"irreversible": "Questa azione è irreversibile.",
-	"binFailed": "Impossibile eliminare utilizzando il Cestino. Si desidera eliminare definitivamente invece?",
-	"trashFailed": "Impossibile eliminare utilizzando il Cestino. Si desidera eliminare definitivamente invece?",
-	"deletePermanentlyButtonLabel": "&& Eliminare in modo permanente",
-	"retryButtonLabel": "&& Riprova",
-	"confirmMoveTrashMessageFilesAndDirectories": "Eliminare i {0} file/directory seguenti e il relativo contenuto?",
-	"confirmMoveTrashMessageMultipleDirectories": "Eliminare le {0} directory seguenti e il relativo contenuto?",
-	"confirmMoveTrashMessageMultiple": "Sei sicuro di voler eliminarei seguenti {0} file?",
-	"confirmMoveTrashMessageFolder": "Eliminare '{0}' e il relativo contenuto?",
-	"confirmMoveTrashMessageFile": "Eliminare '{0}'?",
-	"confirmDeleteMessageFilesAndDirectories": "Eliminare definitivamente i {0} file/directory seguenti e il relativo contenuto?",
-	"confirmDeleteMessageMultipleDirectories": "Eliminare definitivamente le {0} directory seguenti e il relativo contenuto?",
-	"confirmDeleteMessageMultiple": "Sei sicuro di voler eliminare permanentemente i seguenti {0} file?",
-	"confirmDeleteMessageFolder": "Eliminare definitivamente '{0}' e il relativo contenuto?",
-	"confirmDeleteMessageFile": "Eliminare definitivamente '{0}'?",
-	"addFiles": "Aggiungi file",
-	"confirmOverwrite": "Nella cartella di destinazione esiste già un file o una cartella con lo stesso nome. Sovrascrivere?",
-	"replaceButtonLabel": "&&Sostituisci",
-	"fileIsAncestor": "Il file da incollare è un predecessore della cartella di destinazione",
-	"fileDeleted": "Il file da incollare è stato eliminato o spostato nel frattempo",
-	"duplicateFile": "Duplicato",
-	"globalCompareFile": "Confronta file attivo con...",
-	"openFileToCompare": "Aprire prima un file per confrontarlo con un altro file.",
-	"refresh": "Aggiorna",
-	"saveAllInGroup": "Salva tutto nel gruppo",
-	"focusOpenEditors": "Stato attivo su visualizzazione editor aperti",
-	"focusFilesExplorer": "Stato attivo su Esplora file",
-	"showInExplorer": "Visualizza file attivo nella barra laterale",
-	"openFileToShow": "Aprire prima di tutto un file per visualizzarlo in Esplora risorse",
-	"collapseExplorerFolders": "Comprimi cartelle in Explorer",
-	"refreshExplorer": "Aggiorna Explorer",
-	"openFileInNewWindow": "Apri file attivo in un'altra finestra",
-	"openFileToShowInNewWindow": "Aprire prima un file per visualizzarlo in un'altra finestra",
-	"copyPath": "Copia percorso",
-	"emptyFileNameError": "È necessario specificare un nome file o un nome di cartella.",
-	"fileNameStartsWithSlashError": "Un nome di file o cartella non può iniziare con una barra.",
-	"fileNameExistsError": "In questo percorso esiste già un file o una cartella **{0}**. Scegliere un nome diverso.",
-	"invalidFileNameError": "Il nome **{0}** non è valido per un nome file o un nome di cartella. Scegliere un nome diverso.",
-	"filePathTooLongError": "Con il nome **{0}** il percorso diventa troppo lungo. Scegliere un nome più breve.",
-	"compareWithClipboard": "Confronta il file attivo con gli appunti",
-	"clipboardComparisonLabel": "Appunti ↔ {0}"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json b/i18n/ita/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
deleted file mode 100644
index 2e22a3e434a..00000000000
--- a/i18n/ita/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"revealInWindows": "Visualizza in Esplora risorse",
-	"revealInMac": "Visualizza in Finder",
-	"openContainer": "Apri cartella superiore",
-	"saveAs": "Salva con nome...",
-	"save": "Salva",
-	"saveAll": "Salva tutto",
-	"removeFolderFromWorkspace": "Rimuovi cartella dall'area di lavoro",
-	"genericRevertError": "Impossibile ripristinare '{0}': {1}",
-	"modifiedLabel": "{0} (su disco) ↔ {1}",
-	"openFileToReveal": "Aprire prima un file per visualizzarlo",
-	"openFileToCopy": "Aprire prima un file per copiarne il percorso"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json b/i18n/ita/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
deleted file mode 100644
index a29bf6c8fdd..00000000000
--- a/i18n/ita/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"showExplorerViewlet": "Mostra Esplora risorse",
-	"explore": "Esplora risorse",
-	"view": "Visualizza",
-	"textFileEditor": "Editor file di testo",
-	"binaryFileEditor": "Editor file binari",
-	"filesConfigurationTitle": "File",
-	"exclude": "Consente di configurare i criteri GLOB per escludere file e cartelle. Ad esempio, la funzionalità Esplora file stabilisce quali file e cartelle mostrare o nascondere in base a questa impostazione.",
-	"files.exclude.boolean": "Criterio GLOB da usare per trovare percorsi file. Impostare su True o False per abilitare o disabilitare il criterio.",
-	"files.exclude.when": "Controllo aggiuntivo sugli elementi di pari livello di un file corrispondente. Usare $(basename) come variabile del nome file corrispondente.",
-	"associations": "Consente di configurare le associazioni tra file e linguaggi, ad esempio \"*.extension\": \"html\". Queste hanno la precedenza sulle associazioni predefinite dei linguaggi installate.",
-	"encoding": "Codifica del set di caratteri predefinita da usare durante la lettura e la scrittura di file. È possibile configurare questa impostazione anche in base alla lingua.",
-	"autoGuessEncoding": "Quando questa opzione è abilitata, la codifica del set di caratteri viene ipotizzata all'apertura dei file. È possibile configurare questa impostazione anche in base alla lingua.",
-	"eol": "Il carattere di fine riga predefinito. Utilizzare \\n per LF e \\r\\n per CRLF.",
-	"trimTrailingWhitespace": "Se è abilitato, taglierà lo spazio vuoto quando si salva un file.",
-	"insertFinalNewline": "Se è abilitato, inserisce un carattere di nuova riga finale alla fine del file durante il salvataggio.",
-	"trimFinalNewlines": "Se è abilitato, taglia tutte le nuove righe dopo il carattere di nuova riga finale alla fine del file durante il salvataggio.",
-	"files.autoSave.off": "Un file dirty non viene mai salvato automaticamente.",
-	"files.autoSave.afterDelay": "Un file dirty viene salvato automaticamente in base al valore configurato di 'files.autoSaveDelay'.",
-	"files.autoSave.onFocusChange": "Un file dirty viene salvato automaticamente quando l'editor perde lo stato attivo.",
-	"files.autoSave.onWindowChange": "Un file dirty viene salvato automaticamente quando la finestra perde lo stato attivo.",
-	"autoSave": "Controlla il salvataggio automatico dei file dirty. Valori accettati: '{0}', '{1}', '{2}' (l'editor perde lo stato attivo), '{3}' (la finestra perde lo stato attivo). Se è impostato su '{4}', è possibile configurare il ritardo in 'files.autoSaveDelay'.",
-	"autoSaveDelay": "Controlla il ritardo in ms dopo il quale un file dirty viene salvato automaticamente. Si applica solo quando 'files.autoSave' è impostato su '{0}'",
-	"watcherExclude": "Consente di configurare i criteri GLOB dei percorsi file da escludere dal controllo dei file. I criteri devono corrispondere in percorsi assoluti (per una corretta corrispondenza aggiungere come prefisso ** il percorso completo). Se si modifica questa impostazione, è necessario riavviare. Quando si nota che Code consuma troppo tempo della CPU all'avvio, è possibile escludere le cartelle di grandi dimensioni per ridurre il carico iniziale.",
-	"hotExit.off": "Disabilita Hot Exit.",
-	"hotExit.onExit": "La funzionalità Hot Exit verrà attivata alla chiusura dell'applicazione, ovvero quando si chiude l'ultima finestra in Windows/Linux o quando si attiva il comando workbench.action.quit (riquadro comandi, tasto di scelta rapida, menu). Tutte le finestre con backup verranno ripristinate al successivo avvio.",
-	"hotExit.onExitAndWindowClose": "La funzionalità Hot Exit verrà attivata alla chiusura dell'applicazione, ovvero quando si chiude l'ultima finestra in Windows/Linux o quando si attiva il comando workbench.action.quit (riquadro comandi, tasto di scelta rapida, menu), nonché per qualsiasi finestra con una cartella aperta indipendentemente dal fatto che sia l'ultima. Tutte le finestre senza cartelle aperte verranno ripristinate al successivo avvio. Per riportare le finestre di cartelle allo stato in cui si trovavano prima dell'arresto, impostare \"window.restoreFolders\" su \"all\".",
-	"hotExit": "Controlla se i file non salvati verranno memorizzati tra una sessione e l'altra, consentendo di ignorare il prompt di salvataggio alla chiusura dell'editor.",
-	"useExperimentalFileWatcher": "Usa il nuovo watcher di file sperimentale.",
-	"defaultLanguage": "Modalità linguaggio predefinita assegnata ai nuovi file.",
-	"maxMemoryForLargeFilesMB": "Controlla la memoria disponibile per VS Code dopo il riavvio durante il tentativo di aprire file di grandi dimensioni. Il risultato è uguale a quanto si specifica --max-memory=NEWSIZE sulla riga di comando.",
-	"editorConfigurationTitle": "Editor",
-	"formatOnSave": "Formatta un file durante il salvataggio. Deve essere disponibile un formattatore, il file non deve essere salvato automaticamente e l'editor non deve essere in fase di chiusura.",
-	"formatOnSaveTimeout": "Timeout per Formatta dopo il salvataggio. Specifica un limite di tempo in millisecondi per i comandi formatOnSave. I comandi che richiedono più tempo del timeout specificato verranno annullati.",
-	"explorerConfigurationTitle": "Esplora file",
-	"openEditorsVisible": "Numero di editor visualizzati nel riquadro degli editor aperti.",
-	"autoReveal": "Controlla se Esplora risorse deve rivelare automaticamente e selezionare i file durante l'apertura.",
-	"enableDragAndDrop": "Controlla se Esplora risorse deve consentire lo spostamento di file e cartelle tramite trascinamento della selezione.",
-	"confirmDragAndDrop": "Controlla se Esplora risorse deve chiedere conferma prima di spostare file e cartelle tramite trascinamento della selezione.",
-	"confirmDelete": "Controlla se Esplora risorse deve chiedere una conferma quando si elimina file tramite il cestino.",
-	"sortOrder.default": "I file e le cartelle vengono ordinati in ordine alfabetico in base al nome. Le cartelle vengono visualizzate prima dei file.",
-	"sortOrder.mixed": "I file e le cartelle vengono ordinati ordine alfabetico in base al nome, in un unico elenco ordinato.",
-	"sortOrder.filesFirst": "I file e le cartelle vengono ordinati in ordine alfabetico in base al nome. I file vengono visualizzati prima delle cartelle.",
-	"sortOrder.type": "I file e le cartelle vengono ordinati in ordine alfabetico in base all'estensione. Le cartelle vengono visualizzate prima dei file.",
-	"sortOrder.modified": "I file e le cartelle vengono ordinati in ordine decrescente in base alla data dell'ultima modifica. Le cartelle vengono visualizzate prima dei file.",
-	"sortOrder": "Controlla l'ordinamento di file e cartelle in Esplora risorse. Oltre all'ordinamento predefinito, è possibile impostare l'ordine su 'mixed' (file e cartelle vengono ordinati insieme), 'type' (in base al tipo di file), 'modified' (in base alla data dell'ultima modifica) o 'filesFirst' (i file vengono ordinati prima delle cartelle).",
-	"explorer.decorations.colors": "Controlla l'uso dei colori negli effetti del file.",
-	"explorer.decorations.badges": "Controlli se decorazioni file devono utilizzare badge."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json b/i18n/ita/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json
deleted file mode 100644
index f0de873df31..00000000000
--- a/i18n/ita/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"userGuide": "Usare le azioni della barra degli strumenti dell'editor per annullare le modifiche oppure sovrascrivere il contenuto su disco con le modifiche.",
-	"staleSaveError": "Non è stato possibile salvare '{0}': il contenuto sul disco è più recente. Confrontare la versione corrente con quella sul disco.",
-	"retry": "Riprova",
-	"discard": "Rimuovi",
-	"readonlySaveErrorAdmin": "Impossibile salvare '{0}': Il file è protetto da scrittura. Selezionare 'Sovrascrivi come Admin' per riprovare come amministratore.",
-	"readonlySaveError": "Impossibile salvare '{0}': Il file è protetto da scrittura. Selezionare 'Sovrascrivi come Admin' per provare a rimuovere la protezione.",
-	"permissionDeniedSaveError": "Impossibile salvare '{0}': Autorizzazioni insufficienti. Selezionare 'Riprova come Admin' per eseguire come amministratore.",
-	"genericSaveError": "Non è stato possibile salvare '{0}': {1}",
-	"learnMore": "Altre informazioni",
-	"dontShowAgain": "Non visualizzare più questo messaggio",
-	"compareChanges": "Confronta",
-	"saveConflictDiffLabel": "{0} (su disco) ↔ {1} (in {2}) - Risolvere conflitto in fase di salvataggio",
-	"overwriteElevated": "Sovrascrivi come admin...",
-	"saveElevated": "Riprova come amministratore...",
-	"overwrite": "Sovrascrivi"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/files/electron-browser/views/emptyView.i18n.json b/i18n/ita/src/vs/workbench/parts/files/electron-browser/views/emptyView.i18n.json
deleted file mode 100644
index c5eee3d232d..00000000000
--- a/i18n/ita/src/vs/workbench/parts/files/electron-browser/views/emptyView.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noWorkspace": "Nessuna cartella aperta",
-	"explorerSection": "Sezione Esplora file",
-	"noWorkspaceHelp": "Non hai ancora aggiunto cartelle nell'area di lavoro",
-	"addFolder": "Aggiungi cartella",
-	"noFolderHelp": "Non ci sono ancora cartelle aperte.",
-	"openFolder": "Apri cartella"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/files/electron-browser/views/explorerDecorationsProvider.i18n.json b/i18n/ita/src/vs/workbench/parts/files/electron-browser/views/explorerDecorationsProvider.i18n.json
deleted file mode 100644
index a8895546c98..00000000000
--- a/i18n/ita/src/vs/workbench/parts/files/electron-browser/views/explorerDecorationsProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"label": "Esplora risorse",
-	"canNotResolve": "Non è possibile risolvere la cartella dell'area di lavoro",
-	"symbolicLlink": "Collegamento simbolico"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/files/electron-browser/views/explorerView.i18n.json b/i18n/ita/src/vs/workbench/parts/files/electron-browser/views/explorerView.i18n.json
deleted file mode 100644
index db9eaf93326..00000000000
--- a/i18n/ita/src/vs/workbench/parts/files/electron-browser/views/explorerView.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"explorerSection": "Sezione Esplora file",
-	"treeAriaLabel": "Esplora file"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json b/i18n/ita/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
deleted file mode 100644
index a54b8fa48ad..00000000000
--- a/i18n/ita/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"fileInputAriaLabel": "Digitare il nome file. Premere INVIO per confermare oppure ESC per annullare.",
-	"createFileFromExplorerInfoMessage": "Crea il file **{0}** in **{1}**",
-	"renameFileFromExplorerInfoMessage": "Sposta e rinomina in **{0}**",
-	"createFolderFromExplorerInfoMessage": "Crea la cartella **{0}** in **{1}**",
-	"filesExplorerViewerAriaLabel": "{0}, Esplora file",
-	"dropFolders": "Aggiungere le cartelle all'area di lavoro?",
-	"dropFolder": "Aggiungere la cartella all'area di lavoro?",
-	"addFolders": "&& Aggiungi cartelle",
-	"addFolder": "&&Aggiungi cartella",
-	"confirmRootsMove": "Sei sicuro che si desidera modificare l'ordine di più cartelle root nell'area di lavoro?",
-	"confirmMultiMove": "Sei sicuro di voler spostare i seguenti {0} file?",
-	"confirmRootMove": "Sei sicuro che si desidera modificare l'ordine delle cartella principale '{0}' nell'area di lavoro?",
-	"confirmMove": "Sei sicuro di voler spostare '{0}'?",
-	"doNotAskAgain": "Non chiedermelo di nuovo",
-	"moveButtonLabel": "&&Sposta",
-	"confirmOverwriteMessage": "'{0}' esiste già nella cartella di destinazione. Sostituirlo?",
-	"irreversible": "Questa azione è irreversibile.",
-	"replaceButtonLabel": "&&Sostituisci"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json b/i18n/ita/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json
deleted file mode 100644
index 9d379690a90..00000000000
--- a/i18n/ita/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openEditors": "Editor aperti",
-	"openEditosrSection": "Sezione Editor aperti",
-	"dirtyCounter": "{0} non salvati"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/files/electron-browser/views/openEditorsViewer.i18n.json b/i18n/ita/src/vs/workbench/parts/files/electron-browser/views/openEditorsViewer.i18n.json
deleted file mode 100644
index 4ca857f227a..00000000000
--- a/i18n/ita/src/vs/workbench/parts/files/electron-browser/views/openEditorsViewer.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"editorGroupAriaLabel": "{0}, Gruppo di editor",
-	"openEditorAriaLabel": "{0}, Apri editor",
-	"saveAll": "Salva tutto",
-	"closeAllUnmodified": "Chiudi non modificati",
-	"closeAll": "Chiudi tutto",
-	"compareWithSaved": "Confronta con file salvato",
-	"close": "Chiudi",
-	"closeOthers": "Chiudi altri"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/git/browser/gitActions.contribution.i18n.json b/i18n/ita/src/vs/workbench/parts/git/browser/gitActions.contribution.i18n.json
deleted file mode 100644
index 7dc7e02c9fc..00000000000
--- a/i18n/ita/src/vs/workbench/parts/git/browser/gitActions.contribution.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"switchToChangesView": "Passa alla visualizzazione modifiche",
-	"openInEditor": "Passa alla visualizzazione editor",
-	"workbenchStage": "Prepara",
-	"workbenchUnstage": "Annulla preparazione",
-	"stageSelectedLines": "Gestisci temporaneamente le righe selezionate",
-	"unstageSelectedLines": "Annulla la preparazione delle righe selezionate",
-	"revertSelectedLines": "Ripristina righe selezionate",
-	"confirmRevertMessage": "Annullare le modifiche selezionate?",
-	"irreversible": "Questa azione è irreversibile.",
-	"revertChangesLabel": "&&Annulla modifiche",
-	"openChange": "Apri modifica",
-	"openFile": "Apri file",
-	"git": "GIT"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/git/browser/gitActions.i18n.json b/i18n/ita/src/vs/workbench/parts/git/browser/gitActions.i18n.json
deleted file mode 100644
index 476f72cab4f..00000000000
--- a/i18n/ita/src/vs/workbench/parts/git/browser/gitActions.i18n.json
+++ /dev/null
@@ -1,46 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"openChange": "Apri modifica",
-	"openFile": "Apri file",
-	"init": "Init",
-	"refresh": "Aggiorna",
-	"stageChanges": "Prepara",
-	"stageAllChanges": "Gestisci tutto temporaneamente",
-	"confirmUndoMessage": "Pulire tutte le modifiche?",
-	"confirmUndoAllOne": "In {0} file ci sono modifiche non preparate per il commit.\n\nQuesta azione è irreversibile.",
-	"confirmUndoAllMultiple": "In {0} file ci sono modifiche non preparate per il commit.\n\nQuesta azione è irreversibile.",
-	"cleanChangesLabel": "&&Pulisci modifiche",
-	"confirmUndo": "Pulire le modifiche in '{0}'?",
-	"irreversible": "Questa azione è irreversibile.",
-	"undoChanges": "Pulisci",
-	"undoAllChanges": "Pulisci tutto",
-	"unstage": "Annulla preparazione",
-	"unstageAllChanges": "Annulla la gestione temporanea di tutto",
-	"dirtyTreeCheckout": "Non è possibile eseguire l'estrazione. Eseguire prima il commit o l'accantonamento del lavoro.",
-	"commitStaged": "Esegui commit dei file preparati",
-	"commitStagedAmend": "Esegui commit dei file preparati (modifica)",
-	"commitStagedSignedOff": "Esegui commit dei file preparati (approvazione)",
-	"commit": "Commit",
-	"commitMessage": "Messaggio di commit",
-	"commitAll": "Esegui commit di tutto",
-	"commitAllSignedOff": "Esegui commit di tutto (approvazione)",
-	"commitAll2": "Esegui commit di tutto",
-	"commitStaged2": "Esegui commit dei file preparati",
-	"dirtyTreePull": "Non è possibile eseguire il pull. Eseguire prima il commit o l'accantonamento del lavoro.",
-	"authFailed": "L'autenticazione non è riuscita su git remote.",
-	"pushToRemote": "Esegui push in...",
-	"pushToRemotePickMessage": "Selezionare un repository remoto in cui effettuare il push del ramo '{0}':",
-	"publish": "Pubblica",
-	"confirmPublishMessage": "Pubblicare '{0}' in '{1}'?",
-	"confirmPublishMessageButton": "&&Pubblica",
-	"publishPickMessage": "Selezionare un repository remoto in cui pubblicare il ramo '{0}':",
-	"sync is unpredictable": "Questa azione consentirà di effettuare il push e il pull di commit da e verso '{0}'.",
-	"ok": "OK",
-	"cancel": "Annulla",
-	"never again": "OK, non visualizzare più",
-	"undoLastCommit": "Annulla ultimo commit"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/git/browser/gitQuickOpen.i18n.json b/i18n/ita/src/vs/workbench/parts/git/browser/gitQuickOpen.i18n.json
deleted file mode 100644
index 43e30d22d2f..00000000000
--- a/i18n/ita/src/vs/workbench/parts/git/browser/gitQuickOpen.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"refAriaLabel": "{0}, GIT",
-	"checkoutBranch": "Ramo in {0}",
-	"checkoutRemoteBranch": "Ramo remoto in {0}",
-	"checkoutTag": "Tag in {0}",
-	"alreadyCheckedOut": "Il ramo {0} è già il ramo corrente",
-	"branchAriaLabel": "{0}, ramo GIT",
-	"createBranch": "Crea ramo {0}",
-	"noBranches": "Non ci sono altri rami",
-	"notValidBranchName": "Specificare un nome di ramo valido"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/git/browser/gitServices.i18n.json b/i18n/ita/src/vs/workbench/parts/git/browser/gitServices.i18n.json
deleted file mode 100644
index 6add96babe1..00000000000
--- a/i18n/ita/src/vs/workbench/parts/git/browser/gitServices.i18n.json
+++ /dev/null
@@ -1,30 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"cantOpen": "Non è possibile aprire questa risorsa GIT.",
-	"gitIndexChanges": "{0} (indice) ↔ {1}",
-	"gitIndexChangesDesc": "{0} - Modifiche nell'indice",
-	"gitIndexChangesRenamed": "{0} ← {1}",
-	"gitIndexChangesRenamedDesc": "{0} - Rinominato - Modifiche nell'indice",
-	"workingTreeChanges": "{0} (HEAD) ↔ {1}",
-	"workingTreeChangesDesc": "{0} - Modifiche nell'albero di lavoro",
-	"gitMergeChanges": "{0} (merge) ↔ {1}",
-	"gitMergeChangesDesc": "{0} - Esegui merge delle modifiche",
-	"updateGit": "La versione installata di GIT è la {0}. Per il corretto funzionamento di Code è consigliabile usare una versione di GIT non inferiore alla 2.0.0.",
-	"download": "Scarica",
-	"neverShowAgain": "Non visualizzare più questo messaggio",
-	"configureUsernameEmail": "Configurare il nome utente e l'indirizzo di posta elettronica di GIT.",
-	"badConfigFile": "GIT {0}",
-	"unmergedChanges": "Prima di eseguire il commit delle modifiche, è necessario risolvere le modifiche non sottoposte a merge.",
-	"showOutput": "Mostra output",
-	"cancel": "Annulla",
-	"checkNativeConsole": "Si è verificato un errore durante l'esecuzione di un'operazione git. Esaminare l'output oppure usare la console per controllare lo stato del repository.",
-	"changesFromIndex": "{0} (index)",
-	"changesFromIndexDesc": "{0} - Modifiche nell'indice",
-	"changesFromTree": "{0} ({1})",
-	"changesFromTreeDesc": "{0} - Modifiche in {1}",
-	"cantOpenResource": "Non è possibile aprire questa risorsa GIT."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/git/browser/gitWidgets.i18n.json b/i18n/ita/src/vs/workbench/parts/git/browser/gitWidgets.i18n.json
deleted file mode 100644
index 008493bd9b1..00000000000
--- a/i18n/ita/src/vs/workbench/parts/git/browser/gitWidgets.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"publishBranch": "Pubblica ramo",
-	"syncBranch": "Sincronizza modifiche",
-	"gitNotEnabled": "GIT non è abilitato in quest'area di lavoro."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/git/browser/gitWorkbenchContributions.i18n.json b/i18n/ita/src/vs/workbench/parts/git/browser/gitWorkbenchContributions.i18n.json
deleted file mode 100644
index 97c3d840e04..00000000000
--- a/i18n/ita/src/vs/workbench/parts/git/browser/gitWorkbenchContributions.i18n.json
+++ /dev/null
@@ -1,23 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"gitProgressBadge": "Stato di esecuzione GIT",
-	"gitPendingChangesBadge": "{0} modifiche in sospeso",
-	"toggleGitViewlet": "Mostra GIT",
-	"git": "GIT",
-	"view": "Visualizza",
-	"gitCommands": "Comandi GIT",
-	"gitConfigurationTitle": "GIT",
-	"gitEnabled": "GIT abilitato",
-	"gitPath": "Percorso dell'eseguibile di GIT",
-	"gitAutoRefresh": "Indica se l'aggiornamento automatico è abilitato",
-	"gitAutoFetch": "Indica se il recupero automatico è abilitato.",
-	"gitLongCommit": "Indica se visualizzare un avviso in caso di messaggi di commit lunghi.",
-	"gitLargeRepos": "Consente a Code di gestire sempre i repository di grandi dimensioni.",
-	"confirmSync": "Confermare prima di sincronizzare i repository GIT.",
-	"countBadge": "Controlla il contatore dei log GIT.",
-	"checkoutType": "Controlla il tipo di rami elencati."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/git/browser/views/changes/changesView.i18n.json b/i18n/ita/src/vs/workbench/parts/git/browser/views/changes/changesView.i18n.json
deleted file mode 100644
index e982ce4e62f..00000000000
--- a/i18n/ita/src/vs/workbench/parts/git/browser/views/changes/changesView.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"needMessage": "Fornire un messaggio di commit. È sempre possibile premere **{0}** per eseguire il commit delle modifiche. Se sono presenti modifiche preparate per il commit, verrà eseguito il commit solo di tali modifiche. In caso contrario, verrà eseguito il commit di tutte le modifiche.",
-	"nothingToCommit": "Non appena sono presenti modifiche di cui eseguire il commit, immettere il messaggio di commit e premere **{0}** per eseguire il commit. Se sono presenti modifiche preparate per il commit, verrà eseguito il commit solo di tali modifiche. In caso contrario, verrà eseguito il commit di tutte le modifiche.",
-	"longCommit": "È consigliabile limitare la prima riga del commit a 50 caratteri. Per aggiungere informazioni, è possibile usare altre righe.",
-	"commitMessage": "Message (press {0} to commit)",
-	"commitMessageAriaLabel": "GIT: digitare il messaggio e premere {0} per eseguire il commit",
-	"treeAriaLabel": "Visualizzazione modifiche GIT",
-	"showOutput": "Mostra output GIT"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/git/browser/views/changes/changesViewer.i18n.json b/i18n/ita/src/vs/workbench/parts/git/browser/views/changes/changesViewer.i18n.json
deleted file mode 100644
index 7fa53710971..00000000000
--- a/i18n/ita/src/vs/workbench/parts/git/browser/views/changes/changesViewer.i18n.json
+++ /dev/null
@@ -1,38 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"stagedChanges": "Modifiche preparate per il commit",
-	"allChanges": "Modifiche",
-	"mergeChanges": "Esegui merge delle modifiche",
-	"outsideOfWorkspace": "Questo file non è presente nell'area di lavoro corrente.",
-	"modified-char": "M",
-	"added-char": "A",
-	"deleted-char": "D",
-	"renamed-char": "R",
-	"copied-char": "C",
-	"untracked-char": "U",
-	"ignored-char": "!",
-	"title-index-modified": "Modificato nell'indice",
-	"title-modified": "Modificato",
-	"title-index-added": "Aggiunto all'indice",
-	"title-index-deleted": "Eliminato nell'indice",
-	"title-deleted": "Eliminato",
-	"title-index-renamed": "Rinominato nell'indice",
-	"title-index-copied": "Copiato nell'indice",
-	"title-untracked": "Non registrato",
-	"title-ignored": "Ignorato",
-	"title-conflict-both-deleted": "Conflitto: eliminato dall'utente e da Microsoft",
-	"title-conflict-added-by-us": "Conflitto: aggiunto da Microsoft",
-	"title-conflict-deleted-by-them": "Conflitto: eliminato dall'utente",
-	"title-conflict-added-by-them": "Conflitto: aggiunto dall'utente",
-	"title-conflict-deleted-by-us": "Conflitto: eliminato da Microsoft",
-	"title-conflict-both-added": "Conflitto: aggiunto dall'utente e da Microsoft",
-	"title-conflict-both-modified": "Conflitto: modificato dall'utente e da Microsoft",
-	"fileStatusAriaLabel": "Lo stato del file {0} nella cartella {1} è: {2}, GIT",
-	"ariaLabelStagedChanges": "Modifiche preparate per il commit, GIT",
-	"ariaLabelChanges": "Modifiche, GIT",
-	"ariaLabelMerge": "Merge, GIT"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/git/browser/views/disabled/disabledView.i18n.json b/i18n/ita/src/vs/workbench/parts/git/browser/views/disabled/disabledView.i18n.json
deleted file mode 100644
index 41c897cbd25..00000000000
--- a/i18n/ita/src/vs/workbench/parts/git/browser/views/disabled/disabledView.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"disabled": "GIT è disabilitata nelle impostazioni."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/git/browser/views/empty/emptyView.i18n.json b/i18n/ita/src/vs/workbench/parts/git/browser/views/empty/emptyView.i18n.json
deleted file mode 100644
index c870f3a366f..00000000000
--- a/i18n/ita/src/vs/workbench/parts/git/browser/views/empty/emptyView.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"noGit": "Quest'area di lavoro non è ancora sotto il controllo del codice sorgente di GIT.",
-	"gitinit": "Inizializza repository GIT"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/git/browser/views/gitless/gitlessView.i18n.json b/i18n/ita/src/vs/workbench/parts/git/browser/views/gitless/gitlessView.i18n.json
deleted file mode 100644
index 8ee6ba96d94..00000000000
--- a/i18n/ita/src/vs/workbench/parts/git/browser/views/gitless/gitlessView.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"macInstallWith": "È possibile installarlo con {0}, scaricarlo da {1} oppure installare gli strumenti di sviluppo da riga di comando di {2} digitando {3} a un prompt del terminale.",
-	"winInstallWith": "È possibile installarlo con {0} o scaricarlo da {1}.",
-	"linuxDownloadFrom": "È possibile scaricarlo da {0}.",
-	"downloadFrom": "È possibile scaricarlo da {0}.",
-	"looksLike": "Sembra che GIT non sia installato nel sistema.",
-	"pleaseRestart": "Dopo aver installato GIT, riavviare VSCode."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/git/browser/views/huge/hugeView.i18n.json b/i18n/ita/src/vs/workbench/parts/git/browser/views/huge/hugeView.i18n.json
deleted file mode 100644
index 5809ffdd42c..00000000000
--- a/i18n/ita/src/vs/workbench/parts/git/browser/views/huge/hugeView.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"huge": "Sembra che nel repository siano presenti molte modifiche attive.\nQuesto può causare un notevole rallentamento di Code.",
-	"setting": "Per disabilitare definitivamente questo avviso, usare l'impostazione seguente:",
-	"allo": "Consenti repository di grandi dimensioni"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/git/browser/views/notroot/notrootView.i18n.json b/i18n/ita/src/vs/workbench/parts/git/browser/views/notroot/notrootView.i18n.json
deleted file mode 100644
index c2c8274069d..00000000000
--- a/i18n/ita/src/vs/workbench/parts/git/browser/views/notroot/notrootView.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"wrongRoot": "Questa directory sembra essere inclusa in un repository GIT.",
-	"pleaseRestart": "Aprire la directory radice del repository per accedere alle funzionalità di GIT."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/git/browser/views/noworkspace/noworkspaceView.i18n.json b/i18n/ita/src/vs/workbench/parts/git/browser/views/noworkspace/noworkspaceView.i18n.json
deleted file mode 100644
index 5a4847fb125..00000000000
--- a/i18n/ita/src/vs/workbench/parts/git/browser/views/noworkspace/noworkspaceView.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"noWorkspaceHelp": "Non ci sono ancora cartelle aperte.",
-	"pleaseRestart": "Aprire una cartella con un repository GIT per accedere alle funzionalità di GIT.",
-	"openFolder": "Apri cartella"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/git/electron-browser/git.contribution.i18n.json b/i18n/ita/src/vs/workbench/parts/git/electron-browser/git.contribution.i18n.json
deleted file mode 100644
index b02e0f15a80..00000000000
--- a/i18n/ita/src/vs/workbench/parts/git/electron-browser/git.contribution.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"toggleSCMViewlet": "Mostra Gestione controllo servizi",
-	"git": "GIT"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/git/electron-browser/gitActions.i18n.json b/i18n/ita/src/vs/workbench/parts/git/electron-browser/gitActions.i18n.json
deleted file mode 100644
index 773a3dd5a18..00000000000
--- a/i18n/ita/src/vs/workbench/parts/git/electron-browser/gitActions.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"valid": "Specificare un URL valido per il repository GIT",
-	"url": "URL del repository",
-	"directory": "Directory di clonazione di destinazione",
-	"cloning": "Clonazione del repository '{0}'...",
-	"already exists": "Il repository di destinazione esiste già. Selezionare un'altra directory in cui eseguire la clonazione."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/git/electron-main/askpassService.i18n.json b/i18n/ita/src/vs/workbench/parts/git/electron-main/askpassService.i18n.json
deleted file mode 100644
index fa15e3b391d..00000000000
--- a/i18n/ita/src/vs/workbench/parts/git/electron-main/askpassService.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"git": "GIT"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/git/node/git.lib.i18n.json b/i18n/ita/src/vs/workbench/parts/git/node/git.lib.i18n.json
deleted file mode 100644
index b5a5af6daf1..00000000000
--- a/i18n/ita/src/vs/workbench/parts/git/node/git.lib.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"errorBuffer": "Non è possibile aprire il file da GIT",
-	"fileBinaryError": "Il file sembra essere binario e non può essere aperto come file di testo"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/html/browser/html.contribution.i18n.json b/i18n/ita/src/vs/workbench/parts/html/browser/html.contribution.i18n.json
deleted file mode 100644
index 4d04454a2ac..00000000000
--- a/i18n/ita/src/vs/workbench/parts/html/browser/html.contribution.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"html.editor.label": "Anteprima HTML"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/html/browser/htmlPreviewPart.i18n.json b/i18n/ita/src/vs/workbench/parts/html/browser/htmlPreviewPart.i18n.json
deleted file mode 100644
index 6ad886b279b..00000000000
--- a/i18n/ita/src/vs/workbench/parts/html/browser/htmlPreviewPart.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"html.voidInput": "L'input dell'editor non è valido."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/html/browser/webview.contribution.i18n.json b/i18n/ita/src/vs/workbench/parts/html/browser/webview.contribution.i18n.json
deleted file mode 100644
index 2011975d153..00000000000
--- a/i18n/ita/src/vs/workbench/parts/html/browser/webview.contribution.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"developer": "Sviluppatore"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/html/browser/webview.i18n.json b/i18n/ita/src/vs/workbench/parts/html/browser/webview.i18n.json
deleted file mode 100644
index 145bf2139d7..00000000000
--- a/i18n/ita/src/vs/workbench/parts/html/browser/webview.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"devtools.webview": "Sviluppatore: Strumenti Webview"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/html/browser/webviewCommands.i18n.json b/i18n/ita/src/vs/workbench/parts/html/browser/webviewCommands.i18n.json
deleted file mode 100644
index de0fdcaec9f..00000000000
--- a/i18n/ita/src/vs/workbench/parts/html/browser/webviewCommands.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"editor.action.webvieweditor.showFind": "Stato attivo su widget Trova",
-	"openToolsLabel": "Apri strumenti di sviluppo Webview",
-	"refreshWebviewLabel": "Ricarica Webview"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json b/i18n/ita/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json
deleted file mode 100644
index 4d04454a2ac..00000000000
--- a/i18n/ita/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"html.editor.label": "Anteprima HTML"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json b/i18n/ita/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json
deleted file mode 100644
index 6ad886b279b..00000000000
--- a/i18n/ita/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"html.voidInput": "L'input dell'editor non è valido."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json b/i18n/ita/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json
deleted file mode 100644
index 2011975d153..00000000000
--- a/i18n/ita/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"developer": "Sviluppatore"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json b/i18n/ita/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json
deleted file mode 100644
index ee36d0bcec9..00000000000
--- a/i18n/ita/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openToolsLabel": "Apri strumenti di sviluppo Webview",
-	"refreshWebviewLabel": "Ricarica Webview"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json b/i18n/ita/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
deleted file mode 100644
index d821a4ec5e0..00000000000
--- a/i18n/ita/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"updateLocale": "Cambiare la lingua dell'interfaccia utente di VS Code in {0} e riavviare?",
-	"yes": "Sì",
-	"no": "No",
-	"neverAgain": "Non visualizzare più questo messaggio",
-	"JsonSchema.locale": "Linguaggio dell'interfaccia utente da usare.",
-	"vscode.extension.contributes.localizations": "Contribuisce traduzioni all'editor",
-	"vscode.extension.contributes.localizations.languageId": "Id della lingua in cui sono tradotte le stringhe visualizzate.",
-	"vscode.extension.contributes.localizations.languageName": "Nome della lingua in inglese.",
-	"vscode.extension.contributes.localizations.languageNameLocalized": "Nome della lingua nella lingua stessa.",
-	"vscode.extension.contributes.localizations.translations": "Lista delle traduzioni associate alla lingua.",
-	"vscode.extension.contributes.localizations.translations.id": "ID di VS Code o dell'estensione cui si riferisce questa traduzione. L'ID di VS Code è sempre 'vscode' e quello di un'estensione deve essere nel formato 'publisherId.extensionName'.",
-	"vscode.extension.contributes.localizations.translations.id.pattern": "L'ID deve essere 'vscode' o essere nel formato 'publisherId.extensionName' per tradurre rispettivamente VS Code o un'estensione.",
-	"vscode.extension.contributes.localizations.translations.path": "Percorso relativo di un file che contiene le traduzioni per la lingua."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/localizations/browser/localizationsActions.i18n.json b/i18n/ita/src/vs/workbench/parts/localizations/browser/localizationsActions.i18n.json
deleted file mode 100644
index 339538154c0..00000000000
--- a/i18n/ita/src/vs/workbench/parts/localizations/browser/localizationsActions.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"configureLocale": "Configura lingua",
-	"displayLanguage": "Definisce la lingua visualizzata di VSCode.",
-	"doc": "Per un elenco delle lingue supportate, vedere {0}.",
-	"restart": "Se si modifica il valore, è necessario riavviare VSCode.",
-	"fail.createSettings": "Non è possibile creare '{0}' ({1})."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/localizations/electron-browser/localizations.contribution.i18n.json b/i18n/ita/src/vs/workbench/parts/localizations/electron-browser/localizations.contribution.i18n.json
deleted file mode 100644
index a9b62477dd3..00000000000
--- a/i18n/ita/src/vs/workbench/parts/localizations/electron-browser/localizations.contribution.i18n.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"updateLocale": "Cambiare la lingua dell'interfaccia utente di VS Code in {0} e riavviare?",
-	"activateLanguagePack": "Riavviare VS Code per attivare il Language Pack appena installato?",
-	"yes": "Sì",
-	"no": "No",
-	"neverAgain": "Non visualizzare più questo messaggio",
-	"install language pack": "Nel prossimo futuro VS Code supporterà solo Language Pack sotto forma di estensioni del Marketplace. Installare l'estensione '{0}' per poter continuare a usare la lingua attualmente configurata. ",
-	"install": "Installa",
-	"more information": "Altre informazioni...",
-	"JsonSchema.locale": "Linguaggio dell'interfaccia utente da usare.",
-	"vscode.extension.contributes.localizations": "Contribuisce traduzioni all'editor",
-	"vscode.extension.contributes.localizations.languageId": "Id della lingua in cui sono tradotte le stringhe visualizzate.",
-	"vscode.extension.contributes.localizations.languageName": "Nome della lingua in inglese.",
-	"vscode.extension.contributes.localizations.languageNameLocalized": "Nome della lingua nella lingua stessa.",
-	"vscode.extension.contributes.localizations.translations": "Lista delle traduzioni associate alla lingua.",
-	"vscode.extension.contributes.localizations.translations.id": "ID di VS Code o dell'estensione cui si riferisce questa traduzione. L'ID di VS Code è sempre 'vscode' e quello di un'estensione deve essere nel formato 'publisherId.extensionName'.",
-	"vscode.extension.contributes.localizations.translations.id.pattern": "L'ID deve essere 'vscode' o essere nel formato 'publisherId.extensionName' per tradurre rispettivamente VS Code o un'estensione.",
-	"vscode.extension.contributes.localizations.translations.path": "Percorso relativo di un file che contiene le traduzioni per la lingua."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/localizations/electron-browser/localizationsActions.i18n.json b/i18n/ita/src/vs/workbench/parts/localizations/electron-browser/localizationsActions.i18n.json
deleted file mode 100644
index 77b3d8837ef..00000000000
--- a/i18n/ita/src/vs/workbench/parts/localizations/electron-browser/localizationsActions.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"configureLocale": "Configura la lingua visualizzata",
-	"displayLanguage": "Definisce la lingua visualizzata di VSCode.",
-	"doc": "Per un elenco delle lingue supportate, vedere {0}.",
-	"restart": "Se si modifica il valore, è necessario riavviare VSCode.",
-	"fail.createSettings": "Non è possibile creare '{0}' ({1})."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json b/i18n/ita/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json
deleted file mode 100644
index 020217534a1..00000000000
--- a/i18n/ita/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"mainLog": "Log (Principale)",
-	"sharedLog": "Log (Condiviso)",
-	"rendererLog": "Log (Finestra)",
-	"extensionsLog": "Log (Host dell'estensione)",
-	"developer": "Sviluppatore"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json b/i18n/ita/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json
deleted file mode 100644
index 1f4e198062a..00000000000
--- a/i18n/ita/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openLogsFolder": "Apri cartella dei log",
-	"showLogs": "Mostra log...",
-	"rendererProcess": "Finestra ({0})",
-	"emptyWindow": "Finestra",
-	"extensionHost": "Host dell'estensione",
-	"sharedProcess": "Condiviso",
-	"mainProcess": "Principale",
-	"selectProcess": "Seleziona log per il processo",
-	"openLogFile": "Apri file di Log...",
-	"setLogLevel": "Imposta livello log...",
-	"trace": "Analisi",
-	"debug": "Debug",
-	"info": "Informazioni",
-	"warn": "Avviso",
-	"err": "Errore",
-	"critical": "Errori critici",
-	"off": "Disattivato",
-	"selectLogLevel": "Seleziona il livello log",
-	"default and current": "Predefinito e corrente",
-	"default": "Impostazione predefinita",
-	"current": "Corrente"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/markers/browser/markersFileDecorations.i18n.json b/i18n/ita/src/vs/workbench/parts/markers/browser/markersFileDecorations.i18n.json
deleted file mode 100644
index 10e9a745d68..00000000000
--- a/i18n/ita/src/vs/workbench/parts/markers/browser/markersFileDecorations.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"label": "Problemi",
-	"tooltip.1": "1 problema in questo file",
-	"tooltip.N": "{0} problemi in questo file",
-	"markers.showOnFile": "Visualizza errori & avvisi su file e cartella."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/markers/browser/markersPanel.i18n.json b/i18n/ita/src/vs/workbench/parts/markers/browser/markersPanel.i18n.json
deleted file mode 100644
index 8c26d708058..00000000000
--- a/i18n/ita/src/vs/workbench/parts/markers/browser/markersPanel.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"totalProblems": "Totale {0} problemi",
-	"filteredProblems": "Mostrando {0} di {1} problemi"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/markers/common/markers.i18n.json b/i18n/ita/src/vs/workbench/parts/markers/common/markers.i18n.json
deleted file mode 100644
index 8c26d708058..00000000000
--- a/i18n/ita/src/vs/workbench/parts/markers/common/markers.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"totalProblems": "Totale {0} problemi",
-	"filteredProblems": "Mostrando {0} di {1} problemi"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/markers/common/messages.i18n.json b/i18n/ita/src/vs/workbench/parts/markers/common/messages.i18n.json
deleted file mode 100644
index c69fa3b4ca1..00000000000
--- a/i18n/ita/src/vs/workbench/parts/markers/common/messages.i18n.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"viewCategory": "Visualizza",
-	"problems.view.toggle.label": "Attiva/Disattiva Problemi (Errori, Avvisi, Informazioni)",
-	"problems.view.focus.label": "Sposta lo stato attivo su problemi (Errori, Avvisi, Informazioni)",
-	"problems.panel.configuration.title": "Visualizzazione Problemi",
-	"problems.panel.configuration.autoreveal": "Controlla se la visualizzazione Problemi deve visualizzare automaticamente i file durante l'apertura",
-	"markers.panel.title.problems": "Problemi",
-	"markers.panel.aria.label.problems.tree": "Problemi raggruppati per file",
-	"markers.panel.no.problems.build": "Finora non sono stati rilevati problemi nell'area di lavoro.",
-	"markers.panel.no.problems.filters": "Non sono stati trovati risultati corrispondenti ai criteri di filtro specificati",
-	"markers.panel.action.filter": "Filtra problemi",
-	"markers.panel.filter.placeholder": "Filtra per tipo o testo",
-	"markers.panel.filter.errors": "errori",
-	"markers.panel.filter.warnings": "avvisi",
-	"markers.panel.filter.infos": "messaggi informativi",
-	"markers.panel.single.error.label": "1 errore",
-	"markers.panel.multiple.errors.label": "{0} errori",
-	"markers.panel.single.warning.label": "1 avviso",
-	"markers.panel.multiple.warnings.label": "{0} avvisi",
-	"markers.panel.single.info.label": "1 messaggio informativo",
-	"markers.panel.multiple.infos.label": "{0} messaggi informativi",
-	"markers.panel.single.unknown.label": "1 sconosciuto",
-	"markers.panel.multiple.unknowns.label": "{0} sconosciuti",
-	"markers.panel.at.ln.col.number": "({0}, {1})",
-	"problems.tree.aria.label.resource": "{0} con {1} problemi",
-	"problems.tree.aria.label.error.marker": "Errore generato da {0}: {1} a riga {2} e carattere {3}",
-	"problems.tree.aria.label.error.marker.nosource": "Errore: {0} a riga {1} e carattere {2}",
-	"problems.tree.aria.label.warning.marker": "Avviso generato da {0}: {1} a riga {2} e carattere {3}",
-	"problems.tree.aria.label.warning.marker.nosource": "Avviso: {0} a riga {1} e carattere {2}",
-	"problems.tree.aria.label.info.marker": "Messaggio informativo generato da {0}: {1} a riga {2} e carattere {3}",
-	"problems.tree.aria.label.info.marker.nosource": "Messaggio informativo: {0} a riga {1} e carattere {2}",
-	"problems.tree.aria.label.marker": "Problema generato da {0}: {1} a riga {2} e carattere {3}",
-	"problems.tree.aria.label.marker.nosource": "Problema: {0} a riga {1} e carattere {2}",
-	"errors.warnings.show.label": "Mostra errori e avvisi"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json b/i18n/ita/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json
deleted file mode 100644
index c8c335d94e4..00000000000
--- a/i18n/ita/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"copyMarker": "Copia",
-	"copyMessage": "Copia messaggio "
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/markers/electron-browser/markers.i18n.json b/i18n/ita/src/vs/workbench/parts/markers/electron-browser/markers.i18n.json
deleted file mode 100644
index f743668975c..00000000000
--- a/i18n/ita/src/vs/workbench/parts/markers/electron-browser/markers.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"totalProblems": "Totale {0} problemi"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/markers/electron-browser/markersElectronContributions.i18n.json b/i18n/ita/src/vs/workbench/parts/markers/electron-browser/markersElectronContributions.i18n.json
deleted file mode 100644
index c5f6e111238..00000000000
--- a/i18n/ita/src/vs/workbench/parts/markers/electron-browser/markersElectronContributions.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"copyMarker": "Copia",
-	"copyMarkerMessage": "Copia messaggio"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.i18n.json b/i18n/ita/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.i18n.json
deleted file mode 100644
index 2fafad9b706..00000000000
--- a/i18n/ita/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"label": "Problemi",
-	"tooltip.1": "1 problema in questo file ",
-	"tooltip.N": "{0} problemi in questo file",
-	"markers.showOnFile": "Mostra errori e avvisi relativi a file e cartella. "
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/markers/electron-browser/markersPanel.i18n.json b/i18n/ita/src/vs/workbench/parts/markers/electron-browser/markersPanel.i18n.json
deleted file mode 100644
index 4d926353419..00000000000
--- a/i18n/ita/src/vs/workbench/parts/markers/electron-browser/markersPanel.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"disableFilesExclude": "Disabilita filtro di esclusione file.",
-	"clearFilter": "Cancella il filtro."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/markers/electron-browser/markersPanelActions.i18n.json b/i18n/ita/src/vs/workbench/parts/markers/electron-browser/markersPanelActions.i18n.json
deleted file mode 100644
index 9cf8a094768..00000000000
--- a/i18n/ita/src/vs/workbench/parts/markers/electron-browser/markersPanelActions.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"showing filtered problems": "Visualizzazione di {0} di {1}"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json b/i18n/ita/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
deleted file mode 100644
index f06a4d05635..00000000000
--- a/i18n/ita/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"viewCategory": "Visualizza",
-	"problems.view.toggle.label": "Attiva/Disattiva Problemi (Errori, Avvisi, Informazioni)",
-	"problems.view.focus.label": "Sposta lo stato attivo su problemi (Errori, Avvisi, Informazioni)",
-	"problems.panel.configuration.title": "Visualizzazione Problemi",
-	"problems.panel.configuration.autoreveal": "Controlla se la visualizzazione Problemi deve visualizzare automaticamente i file durante l'apertura",
-	"markers.panel.title.problems": "Problemi",
-	"markers.panel.aria.label.problems.tree": "Problemi raggruppati per file",
-	"markers.panel.no.problems.build": "Finora non sono stati rilevati problemi nell'area di lavoro.",
-	"markers.panel.no.problems.filters": "Non sono stati trovati risultati corrispondenti ai criteri di filtro specificati.",
-	"markers.panel.no.problems.file.exclusions": "Tutti i problemi sono nascosti perché è abilitato il filtro di esclusione file.",
-	"markers.panel.action.useFilesExclude": "Filtra usando l'impostazione di esclusione file",
-	"markers.panel.action.donotUseFilesExclude": "Non usare l'impostazione di esclusione file",
-	"markers.panel.action.filter": "Filtra problemi",
-	"markers.panel.filter.ariaLabel": "Filtra problemi",
-	"markers.panel.filter.placeholder": "Filtro. Ad esempio: text, **/*.ts,!**/node_modules/**",
-	"markers.panel.filter.errors": "errori",
-	"markers.panel.filter.warnings": "avvisi",
-	"markers.panel.filter.infos": "messaggi informativi",
-	"markers.panel.single.error.label": "1 errore",
-	"markers.panel.multiple.errors.label": "{0} errori",
-	"markers.panel.single.warning.label": "1 avviso",
-	"markers.panel.multiple.warnings.label": "{0} avvisi",
-	"markers.panel.single.info.label": "1 messaggio informativo",
-	"markers.panel.multiple.infos.label": "{0} messaggi informativi",
-	"markers.panel.single.unknown.label": "1 sconosciuto",
-	"markers.panel.multiple.unknowns.label": "{0} sconosciuti",
-	"markers.panel.at.ln.col.number": "({0}, {1})",
-	"problems.tree.aria.label.resource": "{0} con {1} problemi",
-	"problems.tree.aria.label.marker.relatedInformation": " Questo problema include riferimenti a {0} percorsi.",
-	"problems.tree.aria.label.error.marker": "Errore generato da {0}: {1} a riga {2} e carattere {3}.{4}",
-	"problems.tree.aria.label.error.marker.nosource": "Errore: {0} a riga {1} e carattere {2}.{3}",
-	"problems.tree.aria.label.warning.marker": "Avviso generato da {0}: {1} a riga {2} e carattere {3}.{4}",
-	"problems.tree.aria.label.warning.marker.nosource": "Avviso: {0} a riga {1} e carattere {2}.{3}",
-	"problems.tree.aria.label.info.marker": "Messaggio informativo generato da {0}: {1} a riga {2} e carattere {3}.{4}",
-	"problems.tree.aria.label.info.marker.nosource": "Messaggio informativo: {0} a riga {1} e carattere {2}.{3}",
-	"problems.tree.aria.label.marker": "Problema generato da {0}: {1} a riga {2} e carattere {3}.{4}",
-	"problems.tree.aria.label.marker.nosource": "Problema: {0} a riga {1} e carattere {2}.{3}",
-	"problems.tree.aria.label.relatedinfo.message": "{0} a riga {1} e carattere {2} in {3}",
-	"errors.warnings.show.label": "Mostra errori e avvisi"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/nps/electron-browser/nps.contribution.i18n.json b/i18n/ita/src/vs/workbench/parts/nps/electron-browser/nps.contribution.i18n.json
deleted file mode 100644
index f5bb473c1df..00000000000
--- a/i18n/ita/src/vs/workbench/parts/nps/electron-browser/nps.contribution.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"surveyQuestion": "Partecipare a un breve sondaggio?",
-	"takeSurvey": "Partecipa a sondaggio",
-	"remindLater": "Visualizza più tardi",
-	"neverAgain": "Non visualizzare più questo messaggio"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/outline/electron-browser/outline.contribution.i18n.json b/i18n/ita/src/vs/workbench/parts/outline/electron-browser/outline.contribution.i18n.json
deleted file mode 100644
index e040d38aaeb..00000000000
--- a/i18n/ita/src/vs/workbench/parts/outline/electron-browser/outline.contribution.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"name": "Contorno",
-	"category.focus": "File",
-	"label.focus": "Stato attivo su contorno"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/outline/electron-browser/outlinePanel.i18n.json b/i18n/ita/src/vs/workbench/parts/outline/electron-browser/outlinePanel.i18n.json
deleted file mode 100644
index f588ff6a2d4..00000000000
--- a/i18n/ita/src/vs/workbench/parts/outline/electron-browser/outlinePanel.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"filter": "Filtro",
-	"collapse": "Comprimi tutto",
-	"sortByPosition": "Ordina per: posizione",
-	"sortByName": "Ordina per: Nome",
-	"sortByKind": "Ordina per: tipo",
-	"live": "Segui il cursore",
-	"no-editor": "Non ci sono editor aperti in grado di fornire informazioni sul contorno.",
-	"too-many-symbols": "Questo file è troppo grande per la visualizzazione di un contorno."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/outline/electron-browser/outlineTree.i18n.json b/i18n/ita/src/vs/workbench/parts/outline/electron-browser/outlineTree.i18n.json
deleted file mode 100644
index 99d82041399..00000000000
--- a/i18n/ita/src/vs/workbench/parts/outline/electron-browser/outlineTree.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"outline.title": "riga {0} in {1}"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/output/browser/output.contribution.i18n.json b/i18n/ita/src/vs/workbench/parts/output/browser/output.contribution.i18n.json
deleted file mode 100644
index 99ba0e6815c..00000000000
--- a/i18n/ita/src/vs/workbench/parts/output/browser/output.contribution.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"output": "Output",
-	"viewCategory": "Visualizza",
-	"clearOutput.label": "Cancella output"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/output/browser/outputActions.i18n.json b/i18n/ita/src/vs/workbench/parts/output/browser/outputActions.i18n.json
deleted file mode 100644
index 1aaa39797ad..00000000000
--- a/i18n/ita/src/vs/workbench/parts/output/browser/outputActions.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleOutput": "Attiva/Disattiva output",
-	"clearOutput": "Cancella output",
-	"toggleOutputScrollLock": "Attiva/Disattiva blocco scorrimento per output",
-	"switchToOutput.label": "Passa all'output",
-	"openInLogViewer": "Apri file di log"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/output/browser/outputPanel.i18n.json b/i18n/ita/src/vs/workbench/parts/output/browser/outputPanel.i18n.json
deleted file mode 100644
index 035da4c1ba2..00000000000
--- a/i18n/ita/src/vs/workbench/parts/output/browser/outputPanel.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"output": "Output",
-	"outputPanelWithInputAriaLabel": "{0}, Pannello di output",
-	"outputPanelAriaLabel": "Pannello di output"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/output/common/output.i18n.json b/i18n/ita/src/vs/workbench/parts/output/common/output.i18n.json
deleted file mode 100644
index 7bd96f76c26..00000000000
--- a/i18n/ita/src/vs/workbench/parts/output/common/output.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"output": "Output",
-	"channel": "per '{0}'"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json b/i18n/ita/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
deleted file mode 100644
index 9800b7b0870..00000000000
--- a/i18n/ita/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"output": "Output",
-	"logViewer": "Visualizzatore Log",
-	"viewCategory": "Visualizza",
-	"clearOutput.label": "Cancella output",
-	"openActiveLogOutputFile": "Visualizza: Apri file di output del log attivo"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json b/i18n/ita/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json
deleted file mode 100644
index 2592755ea52..00000000000
--- a/i18n/ita/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"output": "{0} - Output",
-	"channel": "Canale Output per '{0}'"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/performance/electron-browser/performance.contribution.i18n.json b/i18n/ita/src/vs/workbench/parts/performance/electron-browser/performance.contribution.i18n.json
deleted file mode 100644
index a4bad776c26..00000000000
--- a/i18n/ita/src/vs/workbench/parts/performance/electron-browser/performance.contribution.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"prof.message": "I profili sono stati creati.",
-	"prof.detail": "Creare un problema e allegare manualmente i file seguenti:\n{0}",
-	"prof.restartAndFileIssue": "Crea problema e riavvia",
-	"prof.restart": "Riavvia",
-	"prof.thanks": "Grazie per l'aiuto.",
-	"prof.detail.restart": "È necessario un riavvio alla fine per continuare a utilizzare '{0}'. Ancora una volta, grazie per il vostro contributo."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/performance/electron-browser/startupProfiler.i18n.json b/i18n/ita/src/vs/workbench/parts/performance/electron-browser/startupProfiler.i18n.json
deleted file mode 100644
index 84921b2297b..00000000000
--- a/i18n/ita/src/vs/workbench/parts/performance/electron-browser/startupProfiler.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"prof.message": "I profili sono stati creati.",
-	"prof.detail": "Creare un problema e allegare manualmente i file seguenti:\n{0}",
-	"prof.restartAndFileIssue": "Crea problema e riavvia",
-	"prof.restart": "Riavvia",
-	"prof.thanks": "Grazie per l'aiuto.",
-	"prof.detail.restart": "È necessario un riavvio alla fine per continuare a utilizzare '{0}'. Ancora una volta, grazie per il vostro contributo."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/preferences/browser/keybindingWidgets.i18n.json b/i18n/ita/src/vs/workbench/parts/preferences/browser/keybindingWidgets.i18n.json
deleted file mode 100644
index a0be1c98b14..00000000000
--- a/i18n/ita/src/vs/workbench/parts/preferences/browser/keybindingWidgets.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"defineKeybinding.oneExists": "Questo tasto di scelta rapida è assegnato a 1 comando esistente",
-	"defineKeybinding.existing": "Questo tasto di scelta rapida è assegnato a {0} comandi esistenti",
-	"defineKeybinding.initial": "Premere la combinazione di tasti desiderata, quindi INVIO.",
-	"defineKeybinding.chordsTo": "premi contemporaneamente per"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json b/i18n/ita/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
deleted file mode 100644
index ab7704c8c47..00000000000
--- a/i18n/ita/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"showDefaultKeybindings": "Mostra tasti di scelta rapida predefiniti",
-	"showUserKeybindings": "Mostra tasti di scelta rapida utente",
-	"SearchKeybindings.AriaLabel": "Cerca tasti di scelta rapida",
-	"SearchKeybindings.Placeholder": "Cerca tasti di scelta rapida",
-	"sortByPrecedene": "Ordina per Precedenza",
-	"header-message": "Per personalizzazioni avanzate, aprire e modificare",
-	"keybindings-file-name": "keybindings.json",
-	"keybindingsLabel": "Tasti di scelta rapida",
-	"changeLabel": "Cambia tasto di scelta rapida",
-	"addLabel": "Aggiungi tasto di scelta rapida",
-	"removeLabel": "Rimuovi tasto di scelta rapida",
-	"resetLabel": "Reimposta tasto di scelta rapida",
-	"showSameKeybindings": "Mostra gli stessi tasti di scelta rapida",
-	"copyLabel": "Copia",
-	"copyCommandLabel": "Copia comando",
-	"error": "Si è verificato l'errore '{0}' durante la modifica del tasto di scelta rapida. Aprire il file 'keybindings.json' e verificare la presenza di errori.",
-	"command": "Comando",
-	"keybinding": "Tasto di scelta rapida",
-	"source": "Origine",
-	"when": "Quando",
-	"editKeybindingLabelWithKey": "Cambia tasto di scelta rapida {0}",
-	"editKeybindingLabel": "Cambia tasto di scelta rapida",
-	"addKeybindingLabelWithKey": "Aggiungi tasto di scelta rapida {0}",
-	"addKeybindingLabel": "Aggiungi tasto di scelta rapida",
-	"title": "{0} ({1})",
-	"commandAriaLabel": "Il comando è {0}.",
-	"keybindingAriaLabel": "Il tasto di scelta rapida è {0}.",
-	"noKeybinding": "Non è stato assegnato alcun tasto di scelta rapida.",
-	"sourceAriaLabel": "L'origine è {0}.",
-	"whenAriaLabel": "Il valore di Quando è {0}.",
-	"noWhen": "Non esiste alcun contesto per Quando."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/preferences/browser/keybindingsEditorContribution.i18n.json b/i18n/ita/src/vs/workbench/parts/preferences/browser/keybindingsEditorContribution.i18n.json
deleted file mode 100644
index 37b65ecbbf1..00000000000
--- a/i18n/ita/src/vs/workbench/parts/preferences/browser/keybindingsEditorContribution.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"defineKeybinding.start": "Definisci tasto di scelta rapida",
-	"defineKeybinding.kbLayoutErrorMessage": "Non sarà possibile produrre questa combinazione di tasti con il layout di tastiera corrente.",
-	"defineKeybinding.kbLayoutLocalAndUSMessage": "**{0}** per il layout di tastiera corrente (**{1}** per quello standard US).",
-	"defineKeybinding.kbLayoutLocalMessage": "**{0}** per il layout di tastiera corrente."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/preferences/browser/preferences.contribution.i18n.json b/i18n/ita/src/vs/workbench/parts/preferences/browser/preferences.contribution.i18n.json
deleted file mode 100644
index 5cc9af3d773..00000000000
--- a/i18n/ita/src/vs/workbench/parts/preferences/browser/preferences.contribution.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"defaultPreferencesEditor": "Editor preferenze predefinite",
-	"keybindingsEditor": "Editor tasti di scelta rapida",
-	"preferences": "Preferenze"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json b/i18n/ita/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
deleted file mode 100644
index 89b7fb9711b..00000000000
--- a/i18n/ita/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openRawDefaultSettings": "Apri impostazioni predefinite non elaborate",
-	"openSettings2": "Apri impostazioni (anteprima)",
-	"openSettings": "Apri impostazioni",
-	"openGlobalSettings": "Apri impostazioni utente",
-	"openGlobalKeybindings": "Apri tasti di scelta rapida",
-	"openGlobalKeybindingsFile": "Apri file dei tasti di scelta rapida",
-	"openWorkspaceSettings": "Apri impostazioni area di lavoro",
-	"openFolderSettings": "Apri impostazioni cartella",
-	"configureLanguageBasedSettings": "Configura impostazioni specifiche del linguaggio...",
-	"languageDescriptionConfigured": "({0})",
-	"pickLanguage": "Seleziona linguaggio"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json b/i18n/ita/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
deleted file mode 100644
index 10bf388adfb..00000000000
--- a/i18n/ita/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"SearchSettingsWidget.AriaLabel": "Cerca impostazioni",
-	"SearchSettingsWidget.Placeholder": "Cerca impostazioni",
-	"noSettingsFound": "Nessun risultato",
-	"oneSettingFound": "1 impostazione trovata",
-	"settingsFound": "{0} impostazioni trovate",
-	"totalSettingsMessage": "{0} impostazioni in totale",
-	"nlpResult": "Risultati linguaggio naturale",
-	"filterResult": "Risultati filtrati",
-	"defaultSettings": "Impostazioni predefinite",
-	"defaultUserSettings": "Impostazioni predefinite utente",
-	"defaultWorkspaceSettings": "Impostazioni area di lavoro predefinite",
-	"defaultFolderSettings": "Impostazioni cartella predefinite",
-	"defaultEditorReadonly": "Modificare nell'editor a destra per ignorare le impostazioni predefinite.",
-	"preferencesAriaLabel": "Preferenze predefinite. Editor di testo di sola lettura."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json b/i18n/ita/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
deleted file mode 100644
index acbb94499dd..00000000000
--- a/i18n/ita/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"emptyUserSettingsHeader": "Inserire le impostazioni qui per sovrascrivere quelle predefinite.",
-	"emptyWorkspaceSettingsHeader": "Inserire le impostazioni qui per sovrascrivere le impostazioni utente.",
-	"emptyFolderSettingsHeader": "Inserire le impostazioni cartella qui per sovrascrivere quelle dell'area di lavoro.",
-	"reportSettingsSearchIssue": "Segnala problema",
-	"newExtensionLabel": "Mostra l'estensione \"{0}\"",
-	"editTtile": "Modifica",
-	"replaceDefaultValue": "Sostituisci nelle impostazioni",
-	"copyDefaultValue": "Copia nelle impostazioni"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/preferences/browser/preferencesService.i18n.json b/i18n/ita/src/vs/workbench/parts/preferences/browser/preferencesService.i18n.json
deleted file mode 100644
index 5ef406c6972..00000000000
--- a/i18n/ita/src/vs/workbench/parts/preferences/browser/preferencesService.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openFolderFirst": "Aprire prima una cartella per creare le impostazioni dell'area di lavoro",
-	"emptyKeybindingsHeader": "Inserire i tasti di scelta rapida in questo file per sovrascrivere i valori predefiniti",
-	"defaultKeybindings": "Tasti di scelta rapida predefiniti",
-	"folderSettingsName": "{0} (Impostazioni cartella)",
-	"fail.createSettings": "Non è possibile creare '{0}' ({1})."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json b/i18n/ita/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
deleted file mode 100644
index fe346036c36..00000000000
--- a/i18n/ita/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"defaultSettings": "Inserire le impostazioni nell'editor di lato destro per eseguire l'override.",
-	"noSettingsFound": "Non sono state trovate impostazioni.",
-	"settingsSwitcherBarAriaLabel": "Selezione impostazioni",
-	"userSettings": "Impostazioni utente",
-	"workspaceSettings": "Impostazioni area di lavoro",
-	"folderSettings": "Impostazioni cartella"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/preferences/browser/settingsEditor2.i18n.json b/i18n/ita/src/vs/workbench/parts/preferences/browser/settingsEditor2.i18n.json
deleted file mode 100644
index dd23b2f46c7..00000000000
--- a/i18n/ita/src/vs/workbench/parts/preferences/browser/settingsEditor2.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"previewWarning": "Anteprima",
-	"previewLabel": "Anteprima del nuovo editor impostazioni",
-	"SearchSettings.AriaLabel": "Cerca impostazioni",
-	"SearchSettings.Placeholder": "Cerca impostazioni",
-	"advancedCustomizationLabel": "Per personalizzazioni avanzate, aprire e modificare",
-	"openSettingsLabel": "settings.json",
-	"showOverriddenOnly": "Mostra solo i modificati",
-	"treeAriaLabel": "Impostazioni",
-	"feedbackButtonLabel": "Invia commenti e suggerimenti"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/preferences/browser/settingsTree.i18n.json b/i18n/ita/src/vs/workbench/parts/preferences/browser/settingsTree.i18n.json
deleted file mode 100644
index 8747aaf5530..00000000000
--- a/i18n/ita/src/vs/workbench/parts/preferences/browser/settingsTree.i18n.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"modifiedItemForeground": "Colore primo piano per un'impostazione modificata.",
-	"workspace": "Area di lavoro",
-	"user": "Utente",
-	"resetButtonTitle": "reimposta",
-	"configured": "Modificato",
-	"alsoConfiguredIn": "Modificato anche in",
-	"configuredIn": "Modificato in",
-	"editInSettingsJson": "Modifica in settings.json",
-	"settingRowAriaLabel": "{0} {1}, impostazione",
-	"groupRowAriaLabel": "{0}, gruppo"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/preferences/common/keybindingsEditorModel.i18n.json b/i18n/ita/src/vs/workbench/parts/preferences/common/keybindingsEditorModel.i18n.json
deleted file mode 100644
index 14cd8fe7ac5..00000000000
--- a/i18n/ita/src/vs/workbench/parts/preferences/common/keybindingsEditorModel.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"default": "Impostazione predefinita",
-	"user": "Utente",
-	"meta": "meta",
-	"option": "opzione"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/preferences/common/preferences.i18n.json b/i18n/ita/src/vs/workbench/parts/preferences/common/preferences.i18n.json
deleted file mode 100644
index 53c390a85d7..00000000000
--- a/i18n/ita/src/vs/workbench/parts/preferences/common/preferences.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"userSettingsTarget": "Impostazioni utente",
-	"workspaceSettingsTarget": "Impostazioni area di lavoro"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json b/i18n/ita/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json
deleted file mode 100644
index 0dbd18fbe23..00000000000
--- a/i18n/ita/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"commonlyUsed": "Più usate",
-	"defaultKeybindingsHeader": "Per sovrascrivere i tasti di scelta rapida, inserirli nel file dei tasti di scelta rapida."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/preferences/electron-browser/preferences.contribution.i18n.json b/i18n/ita/src/vs/workbench/parts/preferences/electron-browser/preferences.contribution.i18n.json
deleted file mode 100644
index cdde32652ca..00000000000
--- a/i18n/ita/src/vs/workbench/parts/preferences/electron-browser/preferences.contribution.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"defaultPreferencesEditor": "Editor preferenze predefinite",
-	"settingsEditor2": "Editor impostazioni 2",
-	"keybindingsEditor": "Editor tasti di scelta rapida",
-	"preferences": "Preferenze"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/quickopen/browser/commandsHandler.i18n.json b/i18n/ita/src/vs/workbench/parts/quickopen/browser/commandsHandler.i18n.json
deleted file mode 100644
index b9f87d66972..00000000000
--- a/i18n/ita/src/vs/workbench/parts/quickopen/browser/commandsHandler.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"showTriggerActions": "Mostra tutti i comandi",
-	"clearCommandHistory": "Cancella cronologia dei comandi",
-	"showCommands.label": "Riquadro comandi...",
-	"entryAriaLabelWithKey": "{0}, {1}, comandi",
-	"entryAriaLabel": "{0}, comandi",
-	"actionNotEnabled": "Il comando '{0}' non è abilitato nel contesto corrente.",
-	"canNotRun": "Il comando '{0}' ha restituito un errore.",
-	"recentlyUsed": "usate di recente",
-	"morecCommands": "altri comandi",
-	"cat.title": "{0}: {1}",
-	"noCommandsMatching": "Non ci sono comandi corrispondenti"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/quickopen/browser/gotoLineHandler.i18n.json b/i18n/ita/src/vs/workbench/parts/quickopen/browser/gotoLineHandler.i18n.json
deleted file mode 100644
index df279c3c8ce..00000000000
--- a/i18n/ita/src/vs/workbench/parts/quickopen/browser/gotoLineHandler.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"gotoLine": "Vai alla riga...",
-	"gotoLineLabelEmptyWithLimit": "Digitare un numero di riga a cui passare compreso tra 1 e {0}",
-	"gotoLineLabelEmpty": "Digitare un numero di riga a cui passare",
-	"gotoLineColumnLabel": "Vai a riga {0} e carattere {1}",
-	"gotoLineLabel": "Vai a riga {0}",
-	"gotoLineHandlerAriaLabel": "Digitare un numero di riga a cui passare.",
-	"cannotRunGotoLine": "Aprire prima un file di testo per passare a una riga"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/quickopen/browser/gotoSymbolHandler.i18n.json b/i18n/ita/src/vs/workbench/parts/quickopen/browser/gotoSymbolHandler.i18n.json
deleted file mode 100644
index 239aff240b5..00000000000
--- a/i18n/ita/src/vs/workbench/parts/quickopen/browser/gotoSymbolHandler.i18n.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"gotoSymbol": "Vai al simbolo nel file...",
-	"symbols": "simboli ({0})",
-	"method": "metodi ({0})",
-	"function": "funzioni ({0})",
-	"_constructor": "costruttori ({0})",
-	"variable": "variabili ({0})",
-	"class": "classi ({0})",
-	"interface": "interfacce ({0})",
-	"namespace": "spazi dei nomi ({0})",
-	"package": "pacchetti ({0})",
-	"modules": "moduli ({0})",
-	"property": "proprietà ({0})",
-	"enum": "enumerazioni ({0})",
-	"string": "stringhe ({0})",
-	"rule": "regole ({0})",
-	"file": "file ({0})",
-	"array": "matrici ({0})",
-	"number": "numeri ({0})",
-	"boolean": "valori booleani ({0})",
-	"object": "oggetti ({0})",
-	"key": "chiavi ({0})",
-	"entryAriaLabel": "{0}, simboli",
-	"noSymbolsMatching": "Non ci sono simboli corrispondenti",
-	"noSymbolsFound": "Non sono stati trovati simboli",
-	"gotoSymbolHandlerAriaLabel": "Digitare per ridurre il numero di simboli dell'editor attualmente attivo.",
-	"cannotRunGotoSymbolInFile": "Non sono disponibili informazioni relative ai simboli per il file",
-	"cannotRunGotoSymbol": "Aprire prima un file di testo per passare a un simbolo"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/quickopen/browser/helpHandler.i18n.json b/i18n/ita/src/vs/workbench/parts/quickopen/browser/helpHandler.i18n.json
deleted file mode 100644
index a42a30fa99e..00000000000
--- a/i18n/ita/src/vs/workbench/parts/quickopen/browser/helpHandler.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"entryAriaLabel": "{0}, Guida per la selezione",
-	"globalCommands": "comandi globali",
-	"editorCommands": "comandi dell'editor"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json b/i18n/ita/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json
deleted file mode 100644
index 5323d00bb18..00000000000
--- a/i18n/ita/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"view": "Visualizza",
-	"commandsHandlerDescriptionDefault": "Mostra ed esegui comandi",
-	"gotoLineDescriptionMac": "Vai alla riga",
-	"gotoLineDescriptionWin": "Vai alla riga",
-	"gotoSymbolDescription": "Vai al simbolo nel file",
-	"gotoSymbolDescriptionScoped": "Vai al simbolo nel file per categoria",
-	"helpDescription": "Visualizza la Guida",
-	"viewPickerDescription": "Apri visualizzazione"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/quickopen/browser/viewPickerHandler.i18n.json b/i18n/ita/src/vs/workbench/parts/quickopen/browser/viewPickerHandler.i18n.json
deleted file mode 100644
index b35fec01db7..00000000000
--- a/i18n/ita/src/vs/workbench/parts/quickopen/browser/viewPickerHandler.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"entryAriaLabel": "{0}, selezione visualizzazione",
-	"views": "Visualizzazioni",
-	"panels": "Pannelli",
-	"terminals": "Terminale",
-	"terminalTitle": "{0}: {1}",
-	"channels": "Output",
-	"openView": "Apri visualizzazione",
-	"quickOpenView": "Visualizzazione Quick Open"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.i18n.json b/i18n/ita/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.i18n.json
deleted file mode 100644
index 1b4ea6a446b..00000000000
--- a/i18n/ita/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"relaunchSettingMessage": "È necessario riavviare per rendere effettiva un'impostazione modificata.",
-	"relaunchSettingDetail": "Fare clic sul pulsante di riavvio per riavviare {0} e abilitare l'impostazione.",
-	"restart": "&&Riavvia"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.i18n.json b/i18n/ita/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.i18n.json
deleted file mode 100644
index d04bc9f9683..00000000000
--- a/i18n/ita/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.i18n.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"changes": "{0} di {1} modifiche",
-	"change": "{0} di {1} modifica",
-	"show previous change": "Mostra modifica precedente",
-	"show next change": "Mostra modifica successiva",
-	"move to previous change": "Passa alla modifica precedente",
-	"move to next change": "Passa alla modifica successiva",
-	"editorGutterModifiedBackground": "Colore di sfondo della barra di navigazione dell'editor per le righe che sono state modificate.",
-	"editorGutterAddedBackground": "Colore di sfondo della barra di navigazione dell'editor per le righe che sono state aggiunte.",
-	"editorGutterDeletedBackground": "Colore di sfondo della barra di navigazione dell'editor per le righe che sono state cancellate.",
-	"overviewRulerModifiedForeground": "Colore del marcatore del righello delle annotazioni per il contenuto modificato.",
-	"overviewRulerAddedForeground": "Colore del marcatore del righello delle annotazioni per il contenuto aggiunto.",
-	"overviewRulerDeletedForeground": "Colore del marcatore del righello delle annotazioni per il contenuto eliminato."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json b/i18n/ita/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
deleted file mode 100644
index 1bf66fd38b6..00000000000
--- a/i18n/ita/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleGitViewlet": "Mostra GIT",
-	"source control": "Controllo del codice sorgente",
-	"toggleSCMViewlet": "Mostra Gestione controllo servizi",
-	"view": "Visualizza",
-	"scmConfigurationTitle": "Gestione controllo servizi",
-	"alwaysShowProviders": "Mostrare sempre la sezione Provider di controllo del codice sorgente.",
-	"diffDecorations": "Controlla decorazioni diff nell'editor",
-	"diffGutterWidth": "Controlla la larghezza (px) delle decorazioni diff nella barra di navigazione (aggiunte e modificate)."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/scm/electron-browser/scmActivity.i18n.json b/i18n/ita/src/vs/workbench/parts/scm/electron-browser/scmActivity.i18n.json
deleted file mode 100644
index 69fa3354980..00000000000
--- a/i18n/ita/src/vs/workbench/parts/scm/electron-browser/scmActivity.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"scmPendingChangesBadge": "{0} modifiche in sospeso"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/scm/electron-browser/scmMenus.i18n.json b/i18n/ita/src/vs/workbench/parts/scm/electron-browser/scmMenus.i18n.json
deleted file mode 100644
index 9f3adc546ff..00000000000
--- a/i18n/ita/src/vs/workbench/parts/scm/electron-browser/scmMenus.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"installAdditionalSCMProviders": "Installa ulteriori provider SCM ...",
-	"switch provider": "Cambia provider SCM"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json b/i18n/ita/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
deleted file mode 100644
index 781c9834bae..00000000000
--- a/i18n/ita/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"scm providers": "Provider di controllo del codice sorgente",
-	"hideRepository": "Nascondi",
-	"installAdditionalSCMProviders": "Installa ulteriori provider SCM ...",
-	"no open repo": "Non esistono provider di controllo codice sorgente attivi.",
-	"source control": "Controllo del codice sorgente",
-	"viewletTitle": "{0}: {1}",
-	"hideView": "Nascondi"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/search/browser/openAnythingHandler.i18n.json b/i18n/ita/src/vs/workbench/parts/search/browser/openAnythingHandler.i18n.json
deleted file mode 100644
index 6721509dab9..00000000000
--- a/i18n/ita/src/vs/workbench/parts/search/browser/openAnythingHandler.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"fileAndTypeResults": "risultati per file e simboli",
-	"fileResults": "risultati dei file"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/search/browser/openFileHandler.i18n.json b/i18n/ita/src/vs/workbench/parts/search/browser/openFileHandler.i18n.json
deleted file mode 100644
index d6cebb030d8..00000000000
--- a/i18n/ita/src/vs/workbench/parts/search/browser/openFileHandler.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"entryAriaLabel": "{0}, selezione file",
-	"searchResults": "risultati ricerca"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/search/browser/openSymbolHandler.i18n.json b/i18n/ita/src/vs/workbench/parts/search/browser/openSymbolHandler.i18n.json
deleted file mode 100644
index 41c4259b88f..00000000000
--- a/i18n/ita/src/vs/workbench/parts/search/browser/openSymbolHandler.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"entryAriaLabel": "{0}, selezione simboli",
-	"symbols": "risultati per simboli",
-	"noSymbolsMatching": "Non ci sono simboli corrispondenti",
-	"noSymbolsWithoutInput": "Digitare per cercare i simboli"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/search/browser/patternInputWidget.i18n.json b/i18n/ita/src/vs/workbench/parts/search/browser/patternInputWidget.i18n.json
deleted file mode 100644
index 2c35802d3d5..00000000000
--- a/i18n/ita/src/vs/workbench/parts/search/browser/patternInputWidget.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"defaultLabel": "input",
-	"useExcludesAndIgnoreFilesDescription": "Utilizzare le impostazioni di esclusione e ignorare i file"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/search/browser/replaceService.i18n.json b/i18n/ita/src/vs/workbench/parts/search/browser/replaceService.i18n.json
deleted file mode 100644
index 6fc0081e09b..00000000000
--- a/i18n/ita/src/vs/workbench/parts/search/browser/replaceService.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"fileReplaceChanges": "{0} ↔ {1} (Anteprima sostituzione)"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/search/browser/search.contribution.i18n.json b/i18n/ita/src/vs/workbench/parts/search/browser/search.contribution.i18n.json
deleted file mode 100644
index 25315a7f99e..00000000000
--- a/i18n/ita/src/vs/workbench/parts/search/browser/search.contribution.i18n.json
+++ /dev/null
@@ -1,22 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"showTriggerActions": "Vai al simbolo nell'area di lavoro...",
-	"name": "Cerca",
-	"search": "Cerca",
-	"view": "Visualizza",
-	"openAnythingHandlerDescription": "Vai al file",
-	"openSymbolDescriptionNormal": "Vai al simbolo nell'area di lavoro",
-	"searchOutputChannelTitle": "Cerca",
-	"searchConfigurationTitle": "Cerca",
-	"exclude": "Consente di configurare i criteri GLOB per escludere file e cartelle nelle ricerche. Eredita tutti i criteri GLOB dall'impostazione files.exclude.",
-	"exclude.boolean": "Criterio GLOB da usare per trovare percorsi file. Impostare su True o False per abilitare o disabilitare il criterio.",
-	"exclude.when": "Controllo aggiuntivo sugli elementi di pari livello di un file corrispondente. Usare $(basename) come variabile del nome file corrispondente.",
-	"useRipgrep": "Controlla l'utilizzo di ripgrep nelle ricerche su testo e file",
-	"useIgnoreFiles": "Controlla se utilizzare i file .gitignore e .ignore durante la ricerca di file",
-	"search.quickOpen.includeSymbols": "Configurare questa opzione per includere i risultati di una ricerca di simboli globale nei risultati dei file per Quick Open.",
-	"search.followSymlinks": "Controlla se seguire i collegamenti simbolici durante la ricerca."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/search/browser/searchActions.i18n.json b/i18n/ita/src/vs/workbench/parts/search/browser/searchActions.i18n.json
deleted file mode 100644
index 92c227f5790..00000000000
--- a/i18n/ita/src/vs/workbench/parts/search/browser/searchActions.i18n.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"nextSearchIncludePattern": "Mostra i criteri di inclusione per la ricerca successivi",
-	"previousSearchIncludePattern": "Mostra i criteri di inclusione per la ricerca precedenti",
-	"nextSearchExcludePattern": "Mostra i criteri di esclusione per la ricerca successivi",
-	"previousSearchExcludePattern": "Mostra i criteri di esclusione per la ricerca precedenti",
-	"nextSearchTerm": "Mostra il termine di ricerca successivo",
-	"previousSearchTerm": "Mostra il termine di ricerca precedente",
-	"nextReplaceTerm": "Mostra il termine di ricerca/sostituzione successivo",
-	"previousReplaceTerm": "Mostra il termine di ricerca/sostituzione precedente",
-	"findInFiles": "Cerca nei file",
-	"replaceInFiles": "Sostituisci nei file",
-	"RefreshAction.label": "Aggiorna",
-	"CollapseDeepestExpandedLevelAction.label": "Comprimi tutto",
-	"ClearSearchResultsAction.label": "Cancella",
-	"CancelSearchAction.label": "Annulla ricerca",
-	"FocusNextSearchResult.label": "Sposta lo stato attivo sul risultato della ricerca successivo",
-	"FocusPreviousSearchResult.label": "Sposta lo stato attivo sul risultato della ricerca precedente",
-	"RemoveAction.label": "Chiudi",
-	"file.replaceAll.label": "Sostituisci tutto",
-	"match.replace.label": "Sostituisci"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/search/browser/searchResultsView.i18n.json b/i18n/ita/src/vs/workbench/parts/search/browser/searchResultsView.i18n.json
deleted file mode 100644
index b79d204589e..00000000000
--- a/i18n/ita/src/vs/workbench/parts/search/browser/searchResultsView.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"searchFolderMatch.other.label": "Altri file",
-	"searchFileMatches": "{0} file trovati",
-	"searchFileMatch": "{0} file trovato",
-	"searchMatches": "{0} corrispondenze trovate",
-	"searchMatch": "{0} corrispondenza trovata",
-	"folderMatchAriaLabel": "{0} corrispondenze nella cartella radice {1}, risultato della ricerca",
-	"fileMatchAriaLabel": "{0} corrispondenze nel file {1} della cartella {2}, risultato della ricerca",
-	"replacePreviewResultAria": "Sostituisce il termine {0} con {1} alla colonna {2} in linea con il testo {3}",
-	"searchResultAria": "Trovato termine {0} alla colonna {1} in linea con il testo {2}"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/search/browser/searchView.i18n.json b/i18n/ita/src/vs/workbench/parts/search/browser/searchView.i18n.json
deleted file mode 100644
index e2aee106234..00000000000
--- a/i18n/ita/src/vs/workbench/parts/search/browser/searchView.i18n.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"moreSearch": "Attiva/Disattiva dettagli ricerca",
-	"searchScope.includes": "file da includere",
-	"label.includes": "Criteri di inclusione per la ricerca",
-	"searchScope.excludes": "file da escludere",
-	"label.excludes": "Criteri di esclusione per la ricerca",
-	"replaceAll.confirmation.title": "Sostituisci tutto",
-	"replaceAll.confirm.button": "&&Sostituisci",
-	"replaceAll.occurrence.file.message": "{0} occorrenza in {1} file è stata sostituita con '{2}'.",
-	"removeAll.occurrence.file.message": "È stata sostituita {0} occorrenza in {1} file.",
-	"replaceAll.occurrence.files.message": "{0} occorrenza in {1} file è stata sostituita con '{2}'.",
-	"removeAll.occurrence.files.message": "È stata sostituita {0} occorrenze in {1} file.",
-	"replaceAll.occurrences.file.message": "{0} occorrenze in {1} file sono state sostituite con '{2}'.",
-	"removeAll.occurrences.file.message": "Sono state sostituite {0} occorrenze in {1} file.",
-	"replaceAll.occurrences.files.message": "{0} occorrenze in {1} file sono state sostituite con '{2}'.",
-	"removeAll.occurrences.files.message": "Sono state sostituite {0} occorrenze in {1} file.",
-	"removeAll.occurrence.file.confirmation.message": "Sostituire {0} occorrenza in {1} file con '{2}'?",
-	"replaceAll.occurrence.file.confirmation.message": "Sostituire {0} occorrenza in {1} file?",
-	"removeAll.occurrence.files.confirmation.message": "Sostituire {0} occorrenza in {1} file con '{2}'?",
-	"replaceAll.occurrence.files.confirmation.message": "Sostituire {0} occorrenza in {1} file?",
-	"removeAll.occurrences.file.confirmation.message": "Sostituire {0} occorrenze in {1} file con '{2}'?",
-	"replaceAll.occurrences.file.confirmation.message": "Sostituire {0} occorrenze in {1} file?",
-	"removeAll.occurrences.files.confirmation.message": "Sostituire {0} occorrenze in {1} file con '{2}'?",
-	"replaceAll.occurrences.files.confirmation.message": "Sostituire {0} occorrenze in {1} file?",
-	"treeAriaLabel": "Risultati ricerca",
-	"searchPathNotFoundError": "Percorso di ricerca non trovato: {0}",
-	"searchMaxResultsWarning": "Il set di risultati contiene solo un subset di tutte le corrispondenze. Eseguire una ricerca più specifica per ridurre il numero di risultati.",
-	"searchCanceled": "La ricerca è stata annullata prima della visualizzazione dei risultati - ",
-	"noResultsIncludesExcludes": "Non sono stati trovati risultati in '{0}' escludendo '{1}' - ",
-	"noResultsIncludes": "Non sono stati trovati risultati in '{0}' - ",
-	"noResultsExcludes": "Non sono stati trovati risultati escludendo '{0}' - ",
-	"noResultsFound": "Nessun risultato trovato. Rivedere le impostazioni delle esclusioni configurate e file ignorati - ",
-	"rerunSearch.message": "Cerca di nuovo",
-	"rerunSearchInAll.message": "Cerca di nuovo in tutti i file",
-	"openSettings.message": "Apri impostazioni",
-	"openSettings.learnMore": "Altre informazioni",
-	"ariaSearchResultsStatus": "La ricerca ha restituito {0} risultati in {1} file",
-	"search.file.result": "{0} risultato in {1} file",
-	"search.files.result": "{0} risultato in {1} file",
-	"search.file.results": "{0} risultati in {1} file",
-	"search.files.results": "{0} risultati in {1} file",
-	"searchWithoutFolder": "Non ci sono ancora cartelle aperte. La ricerca verrà eseguita solo nei file aperti - ",
-	"openFolder": "Apri cartella"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json b/i18n/ita/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
deleted file mode 100644
index e2aee106234..00000000000
--- a/i18n/ita/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"moreSearch": "Attiva/Disattiva dettagli ricerca",
-	"searchScope.includes": "file da includere",
-	"label.includes": "Criteri di inclusione per la ricerca",
-	"searchScope.excludes": "file da escludere",
-	"label.excludes": "Criteri di esclusione per la ricerca",
-	"replaceAll.confirmation.title": "Sostituisci tutto",
-	"replaceAll.confirm.button": "&&Sostituisci",
-	"replaceAll.occurrence.file.message": "{0} occorrenza in {1} file è stata sostituita con '{2}'.",
-	"removeAll.occurrence.file.message": "È stata sostituita {0} occorrenza in {1} file.",
-	"replaceAll.occurrence.files.message": "{0} occorrenza in {1} file è stata sostituita con '{2}'.",
-	"removeAll.occurrence.files.message": "È stata sostituita {0} occorrenze in {1} file.",
-	"replaceAll.occurrences.file.message": "{0} occorrenze in {1} file sono state sostituite con '{2}'.",
-	"removeAll.occurrences.file.message": "Sono state sostituite {0} occorrenze in {1} file.",
-	"replaceAll.occurrences.files.message": "{0} occorrenze in {1} file sono state sostituite con '{2}'.",
-	"removeAll.occurrences.files.message": "Sono state sostituite {0} occorrenze in {1} file.",
-	"removeAll.occurrence.file.confirmation.message": "Sostituire {0} occorrenza in {1} file con '{2}'?",
-	"replaceAll.occurrence.file.confirmation.message": "Sostituire {0} occorrenza in {1} file?",
-	"removeAll.occurrence.files.confirmation.message": "Sostituire {0} occorrenza in {1} file con '{2}'?",
-	"replaceAll.occurrence.files.confirmation.message": "Sostituire {0} occorrenza in {1} file?",
-	"removeAll.occurrences.file.confirmation.message": "Sostituire {0} occorrenze in {1} file con '{2}'?",
-	"replaceAll.occurrences.file.confirmation.message": "Sostituire {0} occorrenze in {1} file?",
-	"removeAll.occurrences.files.confirmation.message": "Sostituire {0} occorrenze in {1} file con '{2}'?",
-	"replaceAll.occurrences.files.confirmation.message": "Sostituire {0} occorrenze in {1} file?",
-	"treeAriaLabel": "Risultati ricerca",
-	"searchPathNotFoundError": "Percorso di ricerca non trovato: {0}",
-	"searchMaxResultsWarning": "Il set di risultati contiene solo un subset di tutte le corrispondenze. Eseguire una ricerca più specifica per ridurre il numero di risultati.",
-	"searchCanceled": "La ricerca è stata annullata prima della visualizzazione dei risultati - ",
-	"noResultsIncludesExcludes": "Non sono stati trovati risultati in '{0}' escludendo '{1}' - ",
-	"noResultsIncludes": "Non sono stati trovati risultati in '{0}' - ",
-	"noResultsExcludes": "Non sono stati trovati risultati escludendo '{0}' - ",
-	"noResultsFound": "Nessun risultato trovato. Rivedere le impostazioni delle esclusioni configurate e file ignorati - ",
-	"rerunSearch.message": "Cerca di nuovo",
-	"rerunSearchInAll.message": "Cerca di nuovo in tutti i file",
-	"openSettings.message": "Apri impostazioni",
-	"openSettings.learnMore": "Altre informazioni",
-	"ariaSearchResultsStatus": "La ricerca ha restituito {0} risultati in {1} file",
-	"search.file.result": "{0} risultato in {1} file",
-	"search.files.result": "{0} risultato in {1} file",
-	"search.file.results": "{0} risultati in {1} file",
-	"search.files.results": "{0} risultati in {1} file",
-	"searchWithoutFolder": "Non ci sono ancora cartelle aperte. La ricerca verrà eseguita solo nei file aperti - ",
-	"openFolder": "Apri cartella"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/search/browser/searchWidget.i18n.json b/i18n/ita/src/vs/workbench/parts/search/browser/searchWidget.i18n.json
deleted file mode 100644
index 308c6304f2a..00000000000
--- a/i18n/ita/src/vs/workbench/parts/search/browser/searchWidget.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"search.action.replaceAll.disabled.label": "Sostituisci tutto (inviare la ricerca per abilitare)",
-	"search.action.replaceAll.enabled.label": "Sostituisci tutto",
-	"search.replace.toggle.button.title": "Attiva/Disattiva sostituzione",
-	"label.Search": "Cerca: digitare il termine di ricerca e premere INVIO per cercare oppure ESC per annullare",
-	"search.placeHolder": "Cerca",
-	"label.Replace": "Sostituisci: digitare il termine da sostituire e premere INVIO per visualizzare l'anteprima oppure ESC per annullare",
-	"search.replace.placeHolder": "Sostituisci",
-	"regexp.validationFailure": "Espressione corrispondente a qualsiasi valore",
-	"regexp.backreferenceValidationFailure": "I backreference non sono supportati"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/search/common/queryBuilder.i18n.json b/i18n/ita/src/vs/workbench/parts/search/common/queryBuilder.i18n.json
deleted file mode 100644
index 7a0d50122c5..00000000000
--- a/i18n/ita/src/vs/workbench/parts/search/common/queryBuilder.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"search.noWorkspaceWithName": "Nell'area di lavoro non ci sono cartelle denominate {0}"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json b/i18n/ita/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
deleted file mode 100644
index 13379f4fe2a..00000000000
--- a/i18n/ita/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"search": "Cerca",
-	"copyMatchLabel": "Copia",
-	"copyPathLabel": "Copia percorso",
-	"copyAllLabel": "Copia tutti",
-	"clearSearchHistoryLabel": "Cancella cronologia di ricerca",
-	"toggleSearchViewPositionLabel": "Attiva/Disattiva ricerca posizione della visualizzazione",
-	"findInFolder": "Trova nella cartella...",
-	"findInWorkspace": "Trova nell'area di lavoro...",
-	"showTriggerActions": "Vai al simbolo nell'area di lavoro...",
-	"name": "Cerca",
-	"showSearchViewl": "Mostra Cerca",
-	"view": "Visualizza",
-	"findInFiles": "Cerca nei file",
-	"openAnythingHandlerDescription": "Vai al file",
-	"openSymbolDescriptionNormal": "Vai al simbolo nell'area di lavoro",
-	"searchConfigurationTitle": "Cerca",
-	"exclude": "Consente di configurare i criteri GLOB per escludere file e cartelle nelle ricerche. Eredita tutti i criteri GLOB dall'impostazione files.exclude.",
-	"exclude.boolean": "Criterio GLOB da usare per trovare percorsi file. Impostare su True o False per abilitare o disabilitare il criterio.",
-	"exclude.when": "Controllo aggiuntivo sugli elementi di pari livello di un file corrispondente. Usare $(basename) come variabile del nome file corrispondente.",
-	"useRipgrep": "Controlla l'utilizzo di ripgrep nelle ricerche su testo e file",
-	"useIgnoreFiles": "Controlla se utilizzare i file .gitignore e .ignore durante la ricerca di file",
-	"search.quickOpen.includeSymbols": "Configurare questa opzione per includere i risultati di una ricerca di simboli globale nei risultati dei file per Quick Open.",
-	"search.followSymlinks": "Controlla se seguire i collegamenti simbolici durante la ricerca.",
-	"search.smartCase": "Cerca in modo insensibile alle maiuscole/minuscole se il criterio è tutto minuscolo, altrimenti cerca in modalità sensibile a maiuscole/minuscole",
-	"search.globalFindClipboard": "Controlla se il viewlet di ricerca deve leggere o modificare gli appunti di ricerca condivisi in macOS",
-	"search.location": "Controlla se la ricerca verrà mostrata come visualizzazione nella barra laterale o come pannello nell'area pannelli per ottenere più spazio orizzontale."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/search/electron-browser/searchActions.i18n.json b/i18n/ita/src/vs/workbench/parts/search/electron-browser/searchActions.i18n.json
deleted file mode 100644
index dd91e701081..00000000000
--- a/i18n/ita/src/vs/workbench/parts/search/electron-browser/searchActions.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"findInFolder": "Trova nella cartella...",
-	"findInWorkspace": "Trova nell'area di lavoro..."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/snippets/electron-browser/TMSnippets.i18n.json b/i18n/ita/src/vs/workbench/parts/snippets/electron-browser/TMSnippets.i18n.json
deleted file mode 100644
index cd9b550b98a..00000000000
--- a/i18n/ita/src/vs/workbench/parts/snippets/electron-browser/TMSnippets.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"vscode.extension.contributes.snippets": "Frammenti per contributes.",
-	"vscode.extension.contributes.snippets-language": "Identificatore di linguaggio per cui si aggiunge come contributo questo frammento.",
-	"vscode.extension.contributes.snippets-path": "Percorso del file snippets. È relativo alla cartella delle estensioni e in genere inizia con './snippets/'.",
-	"invalid.language": "Il linguaggio in `contributes.{0}.language` è sconosciuto. Valore specificato: {1}",
-	"invalid.path.0": "È previsto un valore stringa in `contributes.{0}.path`. Valore specificato: {1}",
-	"invalid.path.1": "Valore previsto di `contributes.{0}.path` ({1}) da includere nella cartella dell'estensione ({2}). L'estensione potrebbe non essere più portatile.",
-	"badVariableUse": "Il frammento \"{0}\" molto probabilmente confonde variabili-frammento con segnaposti-frammento. Vedere https://code.visualstudio.com/docs/editor/userdefinedsnippets#_snippet-syntax per ulteriori dettagli."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json b/i18n/ita/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json
deleted file mode 100644
index e38dd49d0c9..00000000000
--- a/i18n/ita/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"global.scope": "(globale)",
-	"global.1": "({0})",
-	"new.global": "Nuovo file di Frammenti globali...",
-	"group.global": "Frammenti esistenti",
-	"new.global.sep": "Nuovi frammenti di codice",
-	"openSnippet.pickLanguage": "Selezionare file di Frammenti o creare Frammenti di codice",
-	"openSnippet.label": "Configura Frammenti utente",
-	"preferences": "Preferenze"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/snippets/electron-browser/insertSnippet.i18n.json b/i18n/ita/src/vs/workbench/parts/snippets/electron-browser/insertSnippet.i18n.json
deleted file mode 100644
index edd90007915..00000000000
--- a/i18n/ita/src/vs/workbench/parts/snippets/electron-browser/insertSnippet.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"snippet.suggestions.label": "Inserisci frammento",
-	"sep.userSnippet": "Frammenti utente",
-	"sep.extSnippet": "Frammenti estensione"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json b/i18n/ita/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json
deleted file mode 100644
index 9b4c727b904..00000000000
--- a/i18n/ita/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"snippetSchema.json.default": "Frammento vuoto",
-	"snippetSchema.json": "Configurazione del frammento utente",
-	"snippetSchema.json.prefix": "Prefisso da usare quando si seleziona il frammento in IntelliSense",
-	"snippetSchema.json.body": "Il contenuto del frammento. Usare '$1', '${1:defaultText}' per definire le posizioni del cursore, utilizzare '$0' per la posizione finale del cursore. Inserire i valori delle variabili con '${varName}' e '${varName:defaultText}', ad esempio 'Nome del file: $TM_FILENAME'.",
-	"snippetSchema.json.description": "Descrizione del frammento.",
-	"snippetSchema.json.scope": "Un elenco di nomi di linguaggio a cui si applica questo frammento di codice, ad esempio 'typescript, javascript'."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json b/i18n/ita/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json
deleted file mode 100644
index 0c9e86e93b1..00000000000
--- a/i18n/ita/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"source.snippetGlobal": "Frammento utente globale",
-	"source.snippet": "Frammento utente"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json b/i18n/ita/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
deleted file mode 100644
index c878d5c9380..00000000000
--- a/i18n/ita/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"invalid.path.0": "È previsto un valore stringa in `contributes.{0}.path`. Valore specificato: {1}",
-	"invalid.language.0": "Quando si omette il linguaggio, il valore di `contributes.{0}.path` deve essere un file `.code-snippets`. Fornire il valore: {1}",
-	"invalid.language": "Il linguaggio in `contributes.{0}.language` è sconosciuto. Valore specificato: {1}",
-	"invalid.path.1": "Valore previsto di `contributes.{0}.path` ({1}) da includere nella cartella dell'estensione ({2}). L'estensione potrebbe non essere più portatile.",
-	"vscode.extension.contributes.snippets": "Frammenti per contributes.",
-	"vscode.extension.contributes.snippets-language": "Identificatore di linguaggio per cui si aggiunge come contributo questo frammento.",
-	"vscode.extension.contributes.snippets-path": "Percorso del file snippets. È relativo alla cartella delle estensioni e in genere inizia con './snippets/'.",
-	"badVariableUse": "Uno o più frammenti dall'estensione '{0}' confondono molto probabilmente variabili-frammento e segnaposto-frammento (Vedere https://code.visualstudio.com/docs/editor/userdefinedsnippets#_snippet-syntax per maggiori dettagli)",
-	"badFile": "Non è stato possibile leggere il file di frammento \"{0}\".",
-	"detail.snippet": "{0} ({1})",
-	"snippetSuggest.longLabel": "{0}, {1}"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/snippets/electron-browser/tabCompletion.i18n.json b/i18n/ita/src/vs/workbench/parts/snippets/electron-browser/tabCompletion.i18n.json
deleted file mode 100644
index 7965a1ffcd8..00000000000
--- a/i18n/ita/src/vs/workbench/parts/snippets/electron-browser/tabCompletion.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"tabCompletion": "Inserisce frammenti di codice quando il prefisso corrisponde. Funziona in modo ottimale quando non sono abilitati i suggerimenti rapidi."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/surveys/electron-browser/languageSurveys.contribution.i18n.json b/i18n/ita/src/vs/workbench/parts/surveys/electron-browser/languageSurveys.contribution.i18n.json
deleted file mode 100644
index c0eba234792..00000000000
--- a/i18n/ita/src/vs/workbench/parts/surveys/electron-browser/languageSurveys.contribution.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"helpUs": "Aiutaci a migliorare il nostro supporto all'{0}",
-	"takeShortSurvey": "Partecipa a un breve sondaggio",
-	"remindLater": "Visualizza più tardi",
-	"neverAgain": "Non visualizzare più questo messaggio"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/surveys/electron-browser/nps.contribution.i18n.json b/i18n/ita/src/vs/workbench/parts/surveys/electron-browser/nps.contribution.i18n.json
deleted file mode 100644
index 613cfcb5fd1..00000000000
--- a/i18n/ita/src/vs/workbench/parts/surveys/electron-browser/nps.contribution.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"surveyQuestion": "Partecipare a un breve sondaggio?",
-	"takeSurvey": "Partecipa a sondaggio",
-	"remindLater": "Visualizza più tardi",
-	"neverAgain": "Non visualizzare più questo messaggio"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/tasks/browser/buildQuickOpen.i18n.json b/i18n/ita/src/vs/workbench/parts/tasks/browser/buildQuickOpen.i18n.json
deleted file mode 100644
index 6574ffdaef1..00000000000
--- a/i18n/ita/src/vs/workbench/parts/tasks/browser/buildQuickOpen.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"noTasksMatching": "No tasks matching"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/tasks/browser/quickOpen.i18n.json b/i18n/ita/src/vs/workbench/parts/tasks/browser/quickOpen.i18n.json
deleted file mode 100644
index fb60bd28a7a..00000000000
--- a/i18n/ita/src/vs/workbench/parts/tasks/browser/quickOpen.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"entryAriaLabel": "{0}, tasks",
-	"recentlyUsed": "attività usate di recente",
-	"configured": "attività configurate",
-	"detected": "attività rilevate",
-	"customizeTask": "Configura attività"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/tasks/browser/restartQuickOpen.i18n.json b/i18n/ita/src/vs/workbench/parts/tasks/browser/restartQuickOpen.i18n.json
deleted file mode 100644
index cce0f602a0f..00000000000
--- a/i18n/ita/src/vs/workbench/parts/tasks/browser/restartQuickOpen.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"tasksAriaLabel": "Digitare il nome di un'attività da riavviare",
-	"noTasksMatching": "No tasks matching",
-	"noTasksFound": "Non sono state trovate attività da riavviare"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/tasks/browser/taskQuickOpen.i18n.json b/i18n/ita/src/vs/workbench/parts/tasks/browser/taskQuickOpen.i18n.json
deleted file mode 100644
index 174cd12b982..00000000000
--- a/i18n/ita/src/vs/workbench/parts/tasks/browser/taskQuickOpen.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"tasksAriaLabel": "Digitare il nome di un'attività da eseguire",
-	"noTasksMatching": "No tasks matching",
-	"noTasksFound": "Non sono state trovate attività"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/tasks/browser/terminateQuickOpen.i18n.json b/i18n/ita/src/vs/workbench/parts/tasks/browser/terminateQuickOpen.i18n.json
deleted file mode 100644
index 96e5576de10..00000000000
--- a/i18n/ita/src/vs/workbench/parts/tasks/browser/terminateQuickOpen.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"tasksAriaLabel": "Type the name of a task to terminate",
-	"noTasksMatching": "No tasks matching",
-	"noTasksFound": "No tasks to terminate found"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/tasks/browser/testQuickOpen.i18n.json b/i18n/ita/src/vs/workbench/parts/tasks/browser/testQuickOpen.i18n.json
deleted file mode 100644
index 6574ffdaef1..00000000000
--- a/i18n/ita/src/vs/workbench/parts/tasks/browser/testQuickOpen.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"noTasksMatching": "No tasks matching"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json b/i18n/ita/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json
deleted file mode 100644
index f2036927853..00000000000
--- a/i18n/ita/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json
+++ /dev/null
@@ -1,76 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"ProblemPatternParser.loopProperty.notLast": "La proprietà loop è supportata solo sul matcher dell'ultima riga.",
-	"ProblemPatternParser.problemPattern.kindProperty.notFirst": "Il criterio del problema non è valido. La proprietà kind deve essere specificata solo nel primo elemento",
-	"ProblemPatternParser.problemPattern.missingRegExp": "Nel criterio del problema manca un'espressione regolare.",
-	"ProblemPatternParser.problemPattern.missingProperty": "Il criterio del problema non è valido. Deve includere almeno un file e un messaggio.",
-	"ProblemPatternParser.problemPattern.missingLocation": "Il criterio del problema non è valido. Il tipo deve essere \"file\" oppure deve il criterio deve includere un gruppo di corrispondenze di tipo line o posizione.",
-	"ProblemPatternParser.invalidRegexp": "Errore: la stringa {0} non è un'espressione regolare valida.\n",
-	"ProblemPatternSchema.regexp": "Espressione regolare per trovare un messaggio di tipo errore, avviso o info nell'output.",
-	"ProblemPatternSchema.kind": "Indica se il criterio corrisponde a una posizione (file e riga) o solo a un file.",
-	"ProblemPatternSchema.file": "Indice del gruppo di corrispondenze del nome file. Se omesso, viene usato 1.",
-	"ProblemPatternSchema.location": "Indice del gruppo di corrispondenze della posizione del problema. I criteri di posizione validi sono: (line), (line,column) e (startLine,startColumn,endLine,endColumn). Se omesso, si presuppone che sia impostato su (line,column).",
-	"ProblemPatternSchema.line": "Indice del gruppo di corrispondenze della riga del problema. Il valore predefinito è 2",
-	"ProblemPatternSchema.column": "Indice del gruppo di corrispondenze del carattere di riga del problema. Il valore predefinito è 3",
-	"ProblemPatternSchema.endLine": "Indice del gruppo di corrispondenze della riga finale del problema. Il valore predefinito è undefined",
-	"ProblemPatternSchema.endColumn": "Indice del gruppo di corrispondenze del carattere di fine riga del problema. Il valore predefinito è undefined",
-	"ProblemPatternSchema.severity": "Indice del gruppo di corrispondenze della gravità del problema. Il valore predefinito è undefined",
-	"ProblemPatternSchema.code": "Indice del gruppo di corrispondenze del codice del problema. Il valore predefinito è undefined",
-	"ProblemPatternSchema.message": "Indice del gruppo di corrispondenze del messaggio. Se omesso, il valore predefinito è 4 se si specifica la posizione; in caso contrario, il valore predefinito è 5.",
-	"ProblemPatternSchema.loop": "In un matcher di più righe il ciclo indica se questo criterio viene eseguito in un ciclo finché esiste la corrispondenza. Può essere specificato solo come ultimo criterio in un criterio su più righe.",
-	"NamedProblemPatternSchema.name": "Nome del criterio di problema.",
-	"NamedMultiLineProblemPatternSchema.name": "Nome del criterio di problema a più righe.",
-	"NamedMultiLineProblemPatternSchema.patterns": "Criteri effettivi.",
-	"ProblemPatternExtPoint": "Aggiunge come contributo i criteri di problema",
-	"ProblemPatternRegistry.error": "Il criterio di problema non è valido e verrà ignorato.",
-	"ProblemMatcherParser.noProblemMatcher": "Errore: la descrizione non può essere convertita in un matcher problemi:\n{0}\n",
-	"ProblemMatcherParser.noProblemPattern": "Errore: la descrizione non definisce un criterio problema valido:\n{0}\n",
-	"ProblemMatcherParser.noOwner": "Errore: la descrizione non definisce un proprietario:\n{0}\n",
-	"ProblemMatcherParser.noFileLocation": "Errore: la descrizione non definisce un percorso file:\n{0}\n",
-	"ProblemMatcherParser.unknownSeverity": "Info: gravità {0} sconosciuta. I valori validi sono errore, avviso e info.\n",
-	"ProblemMatcherParser.noDefinedPatter": "Errore: il criterio con identificatore {0} non esiste.",
-	"ProblemMatcherParser.noIdentifier": "Errore: la proprietà del criterio fa riferimento a un identificatore vuoto.",
-	"ProblemMatcherParser.noValidIdentifier": "Errore: la proprietà {0} del criterio non è un nome di variabile criterio valido.",
-	"ProblemMatcherParser.problemPattern.watchingMatcher": "Un matcher problemi deve definire un criterio di inizio e un criterio di fine per il controllo.",
-	"ProblemMatcherParser.invalidRegexp": "Errore: la stringa {0} non è un'espressione regolare valida.\n",
-	"WatchingPatternSchema.regexp": "L'espressione regolare per rilevare l'inizio o la fine di un'attività in background.",
-	"WatchingPatternSchema.file": "Indice del gruppo di corrispondenze del nome file. Può essere omesso.",
-	"PatternTypeSchema.name": "Nome di un criterio predefinito o aggiunto come contributo",
-	"PatternTypeSchema.description": "Criterio di problema o nome di un criterio di problema predefinito o aggiunto come contributo. Può essere omesso se si specifica base.",
-	"ProblemMatcherSchema.base": "Nome di un matcher problemi di base da usare.",
-	"ProblemMatcherSchema.owner": "Proprietario del problema in Visual Studio Code. Può essere omesso se si specifica base. Se è omesso e non si specifica base, viene usato il valore predefinito 'external'.",
-	"ProblemMatcherSchema.source": "Stringa in formato leggibile che descrive l'origine di questa diagnostica, ad esempio 'typescript' o 'super lint'.",
-	"ProblemMatcherSchema.severity": "Gravità predefinita per i problemi di acquisizione. Viene usato se il criterio non definisce un gruppo di corrispondenze per la gravità.",
-	"ProblemMatcherSchema.applyTo": "Controlla se un problema segnalato in un documento di testo è valido solo per i documenti aperti o chiusi oppure per tutti i documenti.",
-	"ProblemMatcherSchema.fileLocation": "Consente di definire come interpretare i nomi file indicati in un criterio di problema.",
-	"ProblemMatcherSchema.background": "Criteri per tenere traccia dell'inizio e della fine di un matcher attivo su un'attività in background.",
-	"ProblemMatcherSchema.background.activeOnStart": "Se impostato a true, il monitor in backbround è in modalità attiva quando l'attività inizia. Equivale a inviare una riga che corrisponde al beginPattern",
-	"ProblemMatcherSchema.background.beginsPattern": "Se corrisponde nell'output, viene segnalato l'avvio di un'attività in background.",
-	"ProblemMatcherSchema.background.endsPattern": "Se corrisponde nell'output, viene segnalata la fine di un'attività in background.",
-	"ProblemMatcherSchema.watching.deprecated": "La proprietà watching è deprecata. In alternativa, utilizzare background (sfondo).",
-	"ProblemMatcherSchema.watching": "Criteri per tenere traccia dell'inizio e della fine di un matcher watching.",
-	"ProblemMatcherSchema.watching.activeOnStart": "Se impostato su true, indica che il watcher è in modalità attiva all'avvio dell'attività. Equivale a inviare una riga che corrisponde al criterio di avvio",
-	"ProblemMatcherSchema.watching.beginsPattern": "Se corrisponde nell'output, viene segnalato l'avvio di un'attività di controllo.",
-	"ProblemMatcherSchema.watching.endsPattern": "Se corrisponde nell'output, viene segnalata la fine di un'attività di controllo.",
-	"LegacyProblemMatcherSchema.watchedBegin.deprecated": "Questa proprietà è deprecata. In alternativa, usare la proprietà watching.",
-	"LegacyProblemMatcherSchema.watchedBegin": "Espressione regolare con cui viene segnalato l'avvio dell'esecuzione di un'attività controllata attivato tramite il controllo dei file.",
-	"LegacyProblemMatcherSchema.watchedEnd.deprecated": "Questa proprietà è deprecata. In alternativa, usare la proprietà watching.",
-	"LegacyProblemMatcherSchema.watchedEnd": "Espressione regolare con cui viene segnalato il termine dell'esecuzione di un'attività controllata.",
-	"NamedProblemMatcherSchema.name": "Nome del matcher problemi utilizzato per riferirsi ad esso.",
-	"NamedProblemMatcherSchema.label": "Un'etichetta leggibile del matcher problemi.",
-	"ProblemMatcherExtPoint": "Aggiunge come contributo i matcher problemi",
-	"msCompile": "Problemi del compilatore di Microsoft",
-	"lessCompile": "Problemi Less",
-	"gulp-tsc": "Problemi TSC Gulp",
-	"jshint": "Problemi JSHint",
-	"jshint-stylish": "Problemi di stile di JSHint",
-	"eslint-compact": "Problemi di compattazione di ESLint",
-	"eslint-stylish": "Problemi di stile di ESLint",
-	"go": "Problemi di Go"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/tasks/common/taskConfiguration.i18n.json b/i18n/ita/src/vs/workbench/parts/tasks/common/taskConfiguration.i18n.json
deleted file mode 100644
index f5aa6fc8cda..00000000000
--- a/i18n/ita/src/vs/workbench/parts/tasks/common/taskConfiguration.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"ConfigurationParser.invalidCWD": "Avviso: options.cwd deve essere di tipo string. Il valore {0} verrà ignorato.\n",
-	"ConfigurationParser.noargs": "Errore: gli argomenti del comando devono essere un array di stringhe. Il valore specificato è:\n{0}",
-	"ConfigurationParser.noShell": "Avviso: la configurazione della shell è supportata solo quando si eseguono attività nel terminale.",
-	"ConfigurationParser.noName": "Errore: è necessario specificare un nome per il matcher problemi nell'ambito di dichiarazione:\n{0}\n",
-	"ConfigurationParser.unknownMatcherKind": "Avviso: il matcher problemi definito è sconosciuto. I tipi supportati sono string | ProblemMatcher | (string | ProblemMatcher)[].\n{0}\n",
-	"ConfigurationParser.invalidVaraibleReference": "Errore: il riferimento a problemMatcher non è valido: {0}\n",
-	"ConfigurationParser.noTaskName": "Errore: le attività devono specificare una proprietà taskName. L'attività verrà ignorata.\n{0}\n",
-	"taskConfiguration.shellArgs": "Avviso: l'attività '{0}' è un comando della shell e il nome del comando o uno dei relativi argomenti contiene spazi senza codice di escape. Per garantire la corretta indicazione della riga di comando, unire gli argomenti nel comando.",
-	"taskConfiguration.noCommandOrDependsOn": "Errore: l'attività '{0}' non specifica un comando né una proprietà dependsOn. L'attività verrà ignorata. La sua definizione è:\n{1}",
-	"taskConfiguration.noCommand": "Errore: l'attività '{0}' non definisce un comando. L'attività verrà ignorata. Definizione dell'attività:\n{1}"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/tasks/common/taskDefinitionRegistry.i18n.json b/i18n/ita/src/vs/workbench/parts/tasks/common/taskDefinitionRegistry.i18n.json
deleted file mode 100644
index 273092d0744..00000000000
--- a/i18n/ita/src/vs/workbench/parts/tasks/common/taskDefinitionRegistry.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"TaskDefinition.description": "Tipo di attività effettivo. Notare che i tipi che iniziano con il carattere '$' sono riservati per l'utilizzo interno.",
-	"TaskDefinition.properties": "Proprietà aggiuntive del tipo di attività",
-	"TaskTypeConfiguration.noType": "Nella configurazione del tipo di attività manca la proprietà obbligatoria 'taskType'",
-	"TaskDefinitionExtPoint": "Tipi di attività per contributes"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/tasks/common/taskTemplates.i18n.json b/i18n/ita/src/vs/workbench/parts/tasks/common/taskTemplates.i18n.json
deleted file mode 100644
index 55ecd35a289..00000000000
--- a/i18n/ita/src/vs/workbench/parts/tasks/common/taskTemplates.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"dotnetCore": "Esegue il comando di compilazione di .NET Core",
-	"msbuild": "Esegue la destinazione di compilazione",
-	"externalCommand": "Esempio per eseguire un comando esterno arbitrario",
-	"Maven": "Consente di eseguire comandi Maven comuni"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/tasks/common/taskTypeRegistry.i18n.json b/i18n/ita/src/vs/workbench/parts/tasks/common/taskTypeRegistry.i18n.json
deleted file mode 100644
index 8b6ad71cd4e..00000000000
--- a/i18n/ita/src/vs/workbench/parts/tasks/common/taskTypeRegistry.i18n.json
+++ /dev/null
@@ -1,6 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/tasks/electron-browser/jsonSchemaCommon.i18n.json b/i18n/ita/src/vs/workbench/parts/tasks/electron-browser/jsonSchemaCommon.i18n.json
deleted file mode 100644
index e191eebd4d1..00000000000
--- a/i18n/ita/src/vs/workbench/parts/tasks/electron-browser/jsonSchemaCommon.i18n.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"JsonSchema.options": "Opzioni dei comandi aggiuntive",
-	"JsonSchema.options.cwd": "Directory di lavoro corrente del programma o dello script eseguito. Se omesso, viene usata la radice dell'area di lavoro corrente di Visual Studio Code.",
-	"JsonSchema.options.env": "Ambiente della shell o del programma eseguito. Se omesso, viene usato l'ambiente del processo padre.",
-	"JsonSchema.shellConfiguration": "Configura la shell da utilizzare.",
-	"JsonSchema.shell.executable": "Shell da usare.",
-	"JsonSchema.shell.args": "Argomenti della shell.",
-	"JsonSchema.command": "Comando da eseguire. Può essere un programma esterno o un comando della shell.",
-	"JsonSchema.tasks.args": "Argomenti passati al comando quando viene richiamata questa attività.",
-	"JsonSchema.tasks.taskName": "Nome dell'attività",
-	"JsonSchema.tasks.windows": "Configurazione dei comandi specifica di Windows",
-	"JsonSchema.tasks.mac": "Configurazione dei comandi specifica di Mac",
-	"JsonSchema.tasks.linux": "Configurazione dei comandi specifica di Linux",
-	"JsonSchema.tasks.suppressTaskName": "Controlla se il nome dell'attività viene aggiunto come argomento al comando. Se omesso, viene usato il valore definito globalmente.",
-	"JsonSchema.tasks.showOutput": "Controlla la visualizzazione dell'output dell'attività in esecuzione. Se omesso, viene usato il valore definito globalmente.",
-	"JsonSchema.echoCommand": "Controlla se l'eco del comando eseguito viene incluso nell'output. Il valore predefinito è false.",
-	"JsonSchema.tasks.watching.deprecation": "Deprecato. In alternativa, usare isBackground.",
-	"JsonSchema.tasks.watching": "Indica se l'attività eseguita viene mantenuta attiva e controlla il file system.",
-	"JsonSchema.tasks.background": "Indica se l'attività eseguita viene mantenuta attiva ed è in esecuzione in background.",
-	"JsonSchema.tasks.promptOnClose": "Indica se viene visualizzato un prompt utente quando Visual Studio Code viene chiuso con un'attività in esecuzione.",
-	"JsonSchema.tasks.build": "Esegue il mapping di questa attività al comando di compilazione predefinito di Visual Studio Code.",
-	"JsonSchema.tasks.test": "Esegue il mapping di questa attività al comando di test predefinito di Visual Studio Code.",
-	"JsonSchema.tasks.matchers": "Matcher problemi da usare. Può essere una stringa oppure una definizione di matcher problemi oppure una matrice di stringhe e matcher problemi.",
-	"JsonSchema.args": "Argomenti aggiuntivi passati al comando.",
-	"JsonSchema.showOutput": "Controlla la visualizzazione dell'output dell'attività in esecuzione. Se omesso, viene usato 'always'.",
-	"JsonSchema.watching.deprecation": "Deprecato. In alternativa, usare isBackground.",
-	"JsonSchema.watching": "Indica se l'attività eseguita viene mantenuta attiva e controlla il file system.",
-	"JsonSchema.background": "Indica se l'attività eseguita viene mantenuta attiva ed è in esecuzione in background.",
-	"JsonSchema.promptOnClose": "Indica se viene visualizzato un prompt utente quando Visual Studio Code viene chiuso con un'attività in background in esecuzione.",
-	"JsonSchema.suppressTaskName": "Controlla se il nome dell'attività viene aggiunto come argomento al comando. Il valore predefinito è false.",
-	"JsonSchema.taskSelector": "Prefisso per indicare che un argomento è l'attività.",
-	"JsonSchema.matchers": "Matcher problemi da usare. Può essere una stringa oppure una definizione di matcher problemi oppure una matrice di stringhe e matcher problemi.",
-	"JsonSchema.tasks": "Configurazioni dell'attività. In genere si tratta di miglioramenti dell'attività già definite nello strumento di esecuzione attività esterno."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v1.i18n.json b/i18n/ita/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v1.i18n.json
deleted file mode 100644
index 1aef1d6636f..00000000000
--- a/i18n/ita/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v1.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"JsonSchema.version": "Numero di versione della configurazione",
-	"JsonSchema._runner": "Runner è stata promossa. Utilizzare la proprietà ufficiale runner",
-	"JsonSchema.runner": "Definisce se l'attività viene eseguita come un processo e l'output viene visualizzato nella finestra di output o all'interno del terminale.",
-	"JsonSchema.windows": "Configurazione dei comandi specifica di Windows",
-	"JsonSchema.mac": "Configurazione dei comandi specifica di Mac",
-	"JsonSchema.linux": "Configurazione dei comandi specifica di Linux",
-	"JsonSchema.shell": "Specifica se il comando è un comando della shell o un programma esterno. Se omesso, viene usato il valore predefinito false."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json b/i18n/ita/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
deleted file mode 100644
index 96a5512e9db..00000000000
--- a/i18n/ita/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"JsonSchema.shell": "Specifica se il comando è un comando della shell o un programma esterno. Se omesso, viene usato il valore predefinito false.",
-	"JsonSchema.tasks.isShellCommand.deprecated": "La proprietà isShellCommand è deprecata. Usare la proprietà type dell'attività e la proprietà shell nelle opzioni. Vedere anche le note sulla versione 1.14.",
-	"JsonSchema.tasks.dependsOn.string": "Altra attività da cui dipende questa attività.",
-	"JsonSchema.tasks.dependsOn.array": "Altre attività da cui dipende questa attività.",
-	"JsonSchema.tasks.presentation": "Consente di configurare il pannello usato per presentare l'output dell'attività e legge il relativo input.",
-	"JsonSchema.tasks.presentation.echo": "Controlla se l'eco del comando eseguito viene visualizzato nel pannello. Il valore predefinito è true.",
-	"JsonSchema.tasks.presentation.focus": "Controlla se il pannello riceve lo stato attivo. Il valore predefinito è false. Se è impostato su true, il pannello viene anche visualizzato.",
-	"JsonSchema.tasks.presentation.reveal.always": "Visualizza sempre il terminale quando viene eseguita questa attività.",
-	"JsonSchema.tasks.presentation.reveal.silent": "Visualizza il terminale solo se all'attività non è associato alcun matcher problemi e si verifica un errore durante l'esecuzione dell'attività.",
-	"JsonSchema.tasks.presentation.reveal.never": "Non visualizza mai il terminale quando viene eseguita questa attività.",
-	"JsonSchema.tasks.presentation.reveals": "Controlla se il pannello che esegue l'attività viene visualizzato o meno. Il valore predefinito è \"always\".",
-	"JsonSchema.tasks.presentation.instance": "Controlli se il pannello è condiviso tra le attività, dedicato a quest'attività o se ne viene creato uno nuovo a ogni esecuzione.",
-	"JsonSchema.tasks.terminal": "La proprietà terminal è deprecata. In alternativa, usare presentation.",
-	"JsonSchema.tasks.group.kind": "Gruppo di esecuzione dell'attività.",
-	"JsonSchema.tasks.group.isDefault": "Definisce se questa attività è l'attività predefinita nel gruppo.",
-	"JsonSchema.tasks.group.defaultBuild": "Contrassegna l'attività come attività di compilazione predefinita.",
-	"JsonSchema.tasks.group.defaultTest": "Contrassegna l'attività come attività di test predefinita.",
-	"JsonSchema.tasks.group.build": "Contrassegna l'attività come attività di compilazione accessibile tramite il comando 'Esegui attività di compilazione'.",
-	"JsonSchema.tasks.group.test": "Contrassegna l'attività come attività di test accessibile tramite il comando 'Esegui attività di test'.",
-	"JsonSchema.tasks.group.none": "Non assegna l'attività ad alcun gruppo",
-	"JsonSchema.tasks.group": "Definisce il gruppo di esecuzione a cui appartiene questa attività. Supporta \"build\" per aggiungerlo al gruppo di compilazione e \"test\" per aggiungerlo al gruppo di test.",
-	"JsonSchema.tasks.type": "Definisce se l'attività viene eseguita come un processo o come un comando all'interno di una shell.",
-	"JsonSchema.commandArray": "Comando della shell da eseguire. Per unire gli elementi della matrice verrà usato un carattere di spazio",
-	"JsonSchema.command.quotedString.value": "Valore effettivo del comando",
-	"JsonSchema.tasks.quoting.escape": "Evita i caratteri utilizzando il carattere di escape della shell (per esempio ` sotto PowerShell e \\ sotto bash).",
-	"JsonSchema.tasks.quoting.strong": "Virgoletta l'argomento utilizzando il carattere di doppio apice della shell (per esempio \" sotto PowerShell e bash).",
-	"JsonSchema.tasks.quoting.weak": "Virgoletta l'argomento utilizzando il carattere di singolo apice della shell (per esempio ' sotto PowerShell e bash).",
-	"JsonSchema.command.quotesString.quote": "Come il valore del comando dovrebbe essere virgolettato",
-	"JsonSchema.command": "Comando da eseguire. Può essere un programma esterno o un comando della shell.",
-	"JsonSchema.args.quotedString.value": "Valore effettivo del comando",
-	"JsonSchema.args.quotesString.quote": "Come il valore dell'argomento dovrebbe essere virgolettato",
-	"JsonSchema.tasks.args": "Argomenti passati al comando quando viene richiamata questa attività.",
-	"JsonSchema.tasks.label": "Etichetta dell'attività per l'interfaccia utente ",
-	"JsonSchema.version": "Numero di versione della configurazione",
-	"JsonSchema.tasks.identifier": "Identificatore definito dall'utente per fare riferimento all'attività in launch.json o in una clausola dependsOn.",
-	"JsonSchema.tasks.taskLabel": "Etichetta dell'attività",
-	"JsonSchema.tasks.taskName": "Nome dell'attività",
-	"JsonSchema.tasks.taskName.deprecated": "La proprietà name dell'attività è deprecata. In alternativa, usare la proprietà label.",
-	"JsonSchema.tasks.background": "Indica se l'attività eseguita viene mantenuta attiva ed è in esecuzione in background.",
-	"JsonSchema.tasks.promptOnClose": "Indica se viene visualizzato un prompt utente quando Visual Studio Code viene chiuso con un'attività in esecuzione.",
-	"JsonSchema.tasks.matchers": "Matcher problemi da usare. Può essere una stringa oppure una definizione di matcher problemi oppure una matrice di stringhe e matcher problemi.",
-	"JsonSchema.customizations.customizes.type": "Tipo di attività da personalizzare",
-	"JsonSchema.tasks.customize.deprecated": "La proprietà customize è deprecata. Vedere le note sulla versione 1.14 per informazioni su come eseguire la migrazione al nuovo approccio di personalizzazione delle attività",
-	"JsonSchema.tasks.showOputput.deprecated": "La proprietà showOutput è deprecata. In alternativa, usare invece la proprietà reveal all'interno della proprietà presentation. Vedere anche le note sulla versione 1.14.",
-	"JsonSchema.tasks.echoCommand.deprecated": "La proprietà echoCommand è deprecata. In alternativa, usare la proprietà echo all'interno della proprietà presentation. Vedere anche le note sulla versione 1.14.",
-	"JsonSchema.tasks.suppressTaskName.deprecated": "La proprietà suppressTaskName è deprecata. In alternativa, incorporare nell'attività il comando con i relativi argomenti. Vedere anche le note sulla versione 1.14.",
-	"JsonSchema.tasks.isBuildCommand.deprecated": "La proprietà isBuildCommand è deprecata. In alternativa, usare la proprietà group. Vedere anche le note sulla versione 1.14.",
-	"JsonSchema.tasks.isTestCommand.deprecated": "La proprietà isTestCommand è deprecata. In alternativa, usare la proprietà group. Vedere anche le note sulla versione 1.14.",
-	"JsonSchema.tasks.taskSelector.deprecated": "La proprietà taskSelector è deprecata. In alternativa, incorporare nell'attività il comando con i relativi argomenti. Vedere anche le note sulla versione 1.14. ",
-	"JsonSchema.windows": "Configurazione dei comandi specifica di Windows",
-	"JsonSchema.mac": "Configurazione dei comandi specifica di Mac",
-	"JsonSchema.linux": "Configurazione dei comandi specifica di Linux"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json b/i18n/ita/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
deleted file mode 100644
index 83baac91404..00000000000
--- a/i18n/ita/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
+++ /dev/null
@@ -1,89 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"tasksCategory": "Attività",
-	"ConfigureTaskRunnerAction.label": "Configura attività",
-	"totalErrors": "{0} errori",
-	"totalWarnings": "{0} avvisi",
-	"totalInfos": "{0} messaggi informativi",
-	"problems": "Problemi",
-	"building": "Compilazione in corso...",
-	"manyProblems": "Più di 10.000",
-	"runningTasks": "Visualizza attività in esecuzione",
-	"tasks": "Attività",
-	"TaskSystem.noHotSwap": "Se si cambia il motore di esecuzione delle attività con un'attività attiva in esecuzione, è necessario ricaricare la finestra",
-	"reloadWindow": "Ricarica finestra",
-	"TaskServer.folderIgnored": "La cartella {0} viene ignorata poiché utilizza attività (task) versione 0.1.0",
-	"TaskService.noBuildTask1": "Non è stata definita alcuna attività di compilazione. Contrassegnare un'attività con 'isBuildCommand' nel file tasks.json.",
-	"TaskService.noBuildTask2": "Non è stata definita alcuna attività di compilazione. Contrassegnare un'attività come gruppo 'build' nel file tasks.json.",
-	"TaskService.noTestTask1": "Non è stata definita alcuna attività di test. Contrassegnare un'attività con 'isTestCommand' nel file tasks.json.",
-	"TaskService.noTestTask2": "Non è stata definita alcuna attività di test. Contrassegnare un'attività come gruppo 'test' nel file tasks.json.",
-	"TaskServer.noTask": "Attività {0} richiesta per l'esecuzione non trovata",
-	"TaskService.associate": "associare",
-	"TaskService.attachProblemMatcher.continueWithout": "Continua senza analizzare l'output dell'attività",
-	"TaskService.attachProblemMatcher.never": "Mai analizzare l'output dell'attività",
-	"TaskService.attachProblemMatcher.learnMoreAbout": "Ulteriori informazioni sull'analisi dell'output della attività",
-	"selectProblemMatcher": "Selezionare il tipo di errori e di avvisi per cui analizzare l'output dell'attività",
-	"customizeParseErrors": "La configurazione dell'attività corrente presenta errori. Per favore correggere gli errori prima di personalizzazione un'attività.",
-	"moreThanOneBuildTask": "tasks.json contiene molte attività di compilazione. È in corso l'esecuzione della prima.\n",
-	"TaskSystem.activeSame.background": "L'attività '{0}' è già attiva e in modalità background.",
-	"TaskSystem.activeSame.noBackground": "L'attività '{0}' è già attiva.",
-	"terminateTask": "Termina attività",
-	"restartTask": "Riavvia attività",
-	"TaskSystem.active": "Al momento c'è già un'attività in esecuzione. Terminarla prima di eseguirne un'altra.",
-	"TaskSystem.restartFailed": "Non è stato possibile terminare e riavviare l'attività {0}",
-	"TaskService.noConfiguration": "Errore: Il rilevamento di attività {0} non ha contribuito un'attività nella seguente configurazione: \n{1} \nL'attività verrà ignorata.\n",
-	"TaskSystem.configurationErrors": "Errore: la configurazione delle attività specificata contiene errori di convalida e non è utilizzabile. Correggere prima gli errori.",
-	"taskService.ignoreingFolder": "Le configurazioni delle attività per la cartella dell'area di lavoro {0} verranno ignorate. Per il supporto delle attività delle aree di lavoro in più cartelle è necessario che tutte le cartelle usino la versione 2.0.0 delle attività\n",
-	"TaskSystem.invalidTaskJson": "Errore: nel contenuto del file tasks.json sono presenti errori di sintassi. Correggerli prima di eseguire un'attività.\n",
-	"TaskSystem.runningTask": "È presente un'attività in esecuzione. Terminarla?",
-	"TaskSystem.terminateTask": "&&Termina attività",
-	"TaskSystem.noProcess": "L'attività avviata non esiste più. Se l'attività implica la generazione di processi in background, uscendo da Visual Studio Code potrebbero essere presenti processi orfani. Per evitarlo, avviare l'ultimo processo in background con un flag di attesa.",
-	"TaskSystem.exitAnyways": "&&Esci comunque",
-	"TerminateAction.label": "Termina attività",
-	"TaskSystem.unknownError": "Si è verificato un errore durante l'esecuzione di un'attività. Per dettagli, vedere il log attività.",
-	"TaskService.noWorkspace": "Le attività sono disponibili solo per una cartella dell'area di lavoro.",
-	"recentlyUsed": "attività usate di recente",
-	"configured": "attività configurate",
-	"detected": "attività rilevate",
-	"TaskService.ignoredFolder": "Le cartelle dell'area di lavoro seguenti verranno ignorate perché usano la versione 0.1.0 delle attività: {0}",
-	"TaskService.notAgain": "Non visualizzare più questo messaggio",
-	"TaskService.pickRunTask": "Selezionare l'attività da eseguire",
-	"TaslService.noEntryToRun": "Non è stata trovata alcuna attività da eseguire. Configurare le attività...",
-	"TaskService.fetchingBuildTasks": "Recupero delle attività di compilazione...",
-	"TaskService.pickBuildTask": "Selezionare l'attività di compilazione da eseguire",
-	"TaskService.noBuildTask": "Nessuna attività di compilazione da eseguire trovato. Configurare l'attività di compilazione...",
-	"TaskService.fetchingTestTasks": "Recupero delle attività di test...",
-	"TaskService.pickTestTask": "Selezionare l'attività di test da eseguire",
-	"TaskService.noTestTaskTerminal": "Non è stata trovata alcuna attività di test da eseguire. Configurare le attività...",
-	"TaskService.tastToTerminate": "Selezionare l'attività da terminare",
-	"TaskService.noTaskRunning": "Non ci sono attività attualmente in esecuzione",
-	"TerminateAction.noProcess": "Il processo avviato non esiste più. Se l'attività implica la generazione di attività in background, uscendo da Visual Studio Code potrebbero essere presenti processi orfani.",
-	"TerminateAction.failed": "Non è stato possibile terminare l'attività in esecuzione",
-	"TaskService.tastToRestart": "Selezionare l'attività da riavviare",
-	"TaskService.noTaskToRestart": "Non ci sono attività da riavviare",
-	"TaskService.template": "Selezionare un modello di attività",
-	"TaskService.createJsonFile": "Crea il file tasks.json dal modello",
-	"TaskService.openJsonFile": "Apri il file tasks.json",
-	"TaskService.pickTask": "Selezionare un'attività da configurare",
-	"TaskService.defaultBuildTaskExists": "{0} è già contrassegnato come attività di compilazione predefinita",
-	"TaskService.pickDefaultBuildTask": "Selezionare l'attività da usare come attività di compilazione predefinita",
-	"TaskService.defaultTestTaskExists": "{0} è già contrassegnato come attività di test predefinita.",
-	"TaskService.pickDefaultTestTask": "Selezionare l'attività da usare come attività di test predefinita",
-	"TaskService.pickShowTask": "Selezionare l'attività di cui mostrare l'output",
-	"TaskService.noTaskIsRunning": "Non ci sono attività in esecuzione",
-	"ShowLogAction.label": "Mostra log attività",
-	"RunTaskAction.label": "Esegui attività",
-	"RestartTaskAction.label": "Riavvia attività in esecuzione",
-	"ShowTasksAction.label": "Mostra attività in esecuzione",
-	"BuildAction.label": "Esegui attività di compilazione",
-	"TestAction.label": "Esegui attività di test",
-	"ConfigureDefaultBuildTask.label": "Configura attività di compilazione predefinita",
-	"ConfigureDefaultTestTask.label": "Configura attività di test predefinita",
-	"quickOpen.task": "Esegui attività"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/tasks/electron-browser/taskPanel.i18n.json b/i18n/ita/src/vs/workbench/parts/tasks/electron-browser/taskPanel.i18n.json
deleted file mode 100644
index 9372d80ae2e..00000000000
--- a/i18n/ita/src/vs/workbench/parts/tasks/electron-browser/taskPanel.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"tasks": "Attività"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.i18n.json b/i18n/ita/src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.i18n.json
deleted file mode 100644
index aed34db2d6d..00000000000
--- a/i18n/ita/src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"TerminalTaskSystem.unknownError": "Si è verificato un errore sconosciuto durante l'esecuzione di un'attività. Per dettagli, vedere il log di output dell'attività.",
-	"dependencyFailed": "Non è stato possibile risolvere l'attività dipendente '{0}' nella cartella dell'area di lavoro '{1}'",
-	"TerminalTaskSystem.terminalName": "Attività - {0}",
-	"closeTerminal": "Premere un tasto qualsiasi per chiudere il terminale.",
-	"reuseTerminal": "Terminale verrà riutilizzato dalle attività, premere un tasto qualsiasi per chiuderlo.",
-	"TerminalTaskSystem": "Non è possibile eseguire un comando della shell su un'unità UNC con cmd.exe.",
-	"unkownProblemMatcher": "Il matcher problemi {0} non può essere risolto. il matcher verrà ignorato"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/tasks/node/processRunnerDetector.i18n.json b/i18n/ita/src/vs/workbench/parts/tasks/node/processRunnerDetector.i18n.json
deleted file mode 100644
index 7e67f4a78bd..00000000000
--- a/i18n/ita/src/vs/workbench/parts/tasks/node/processRunnerDetector.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"TaskSystemDetector.noGulpTasks": "Eseguendo gulp --tasks-simple non è stata elencata alcuna attività. È stato eseguito npm install?",
-	"TaskSystemDetector.noJakeTasks": "Eseguendo jake --tasks non è stata elencata alcuna attività. È stato eseguito npm install?",
-	"TaskSystemDetector.noGulpProgram": "Gulp non è installato nel sistema. Eseguire npm install -g gulp per installarlo.",
-	"TaskSystemDetector.noJakeProgram": "Jake non è installato nel sistema. Eseguire npm install -g jake per installarlo.",
-	"TaskSystemDetector.noGruntProgram": "Grunt non è installato nel sistema. Eseguire npm install -g grunt per installarlo.",
-	"TaskSystemDetector.noProgram": "Il programma {0} non è stato trovato. Messaggio: {1}",
-	"TaskSystemDetector.buildTaskDetected": "È stata rilevata l'attività di compilazione denominata '{0}'.",
-	"TaskSystemDetector.testTaskDetected": "È stata rilevata l'attività di test denominata '{0}'."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/tasks/node/processTaskSystem.i18n.json b/i18n/ita/src/vs/workbench/parts/tasks/node/processTaskSystem.i18n.json
deleted file mode 100644
index d56e2a01958..00000000000
--- a/i18n/ita/src/vs/workbench/parts/tasks/node/processTaskSystem.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"TaskRunnerSystem.unknownError": "Si è verificato un errore sconosciuto durante l'esecuzione di un'attività. Per dettagli, vedere il log di output dell'attività.",
-	"TaskRunnerSystem.watchingBuildTaskFinished": "\nIl controllo delle attività di build è terminato.",
-	"TaskRunnerSystem.childProcessError": "Failed to launch external program {0} {1}.",
-	"TaskRunnerSystem.cancelRequested": "\nL'attività '{0}' è stata terminata come richiesto dall'utente.",
-	"unkownProblemMatcher": "Il matcher problemi {0} non può essere risolto. Il matcher verrà ignorato"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json b/i18n/ita/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
deleted file mode 100644
index b89a9a5d2c8..00000000000
--- a/i18n/ita/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"ConfigurationParser.invalidCWD": "Avviso: options.cwd deve essere di tipo string. Il valore {0} verrà ignorato.\n",
-	"ConfigurationParser.inValidArg": "Errore: l'argomento del comando deve essere una stringa o una stringa virgolettata. Il valore specificato è:\n{0}",
-	"ConfigurationParser.noargs": "Errore: gli argomenti del comando devono essere un array di stringhe. Il valore specificato è:\n{0}",
-	"ConfigurationParser.noShell": "Avviso: la configurazione della shell è supportata solo quando si eseguono attività nel terminale.",
-	"ConfigurationParser.noName": "Errore: è necessario specificare un nome per il matcher problemi nell'ambito di dichiarazione:\n{0}\n",
-	"ConfigurationParser.unknownMatcherKind": "Avviso: il matcher problemi definito è sconosciuto. I tipi supportati sono string | ProblemMatcher | (string | ProblemMatcher)[].\n{0}\n",
-	"ConfigurationParser.invalidVaraibleReference": "Errore: il riferimento a problemMatcher non è valido: {0}\n",
-	"ConfigurationParser.noTaskType": "Errore: la configurazione di tasks deve contenere una proprietà di tipo. La configurazione verrà ignorata.\n{0}\n",
-	"ConfigurationParser.noTypeDefinition": "Errore: non ci sono attività registrate di tipo '{0}'. Non è stata installata un'estensione che fornisce un provider di task corrispondente?",
-	"ConfigurationParser.missingRequiredProperty": "Errore: nella configurazione di attività '{0}' manca la proprietà obbligatoria '{1}'. La configurazione dell'attività verrà ignorata.",
-	"ConfigurationParser.notCustom": "Errore: tasks non è dichiarato come un'attività personalizzata. La configurazione verrà ignorata.\n{0}\n",
-	"ConfigurationParser.noTaskName": "Errore: un'attività deve specificare una proprietà label. L'attività verrà ignorata.\n{0}\n",
-	"taskConfiguration.noCommandOrDependsOn": "Errore: l'attività '{0}' non specifica un comando né una proprietà dependsOn. L'attività verrà ignorata. La sua definizione è:\n{1}",
-	"taskConfiguration.noCommand": "Errore: l'attività '{0}' non definisce un comando. L'attività verrà ignorata. Definizione dell'attività:\n{1}",
-	"TaskParse.noOsSpecificGlobalTasks": "L'attività versione 2.0.0 non supporta attività specifiche globali del sistema operativo. Convertirle in un'attività con un comando specifico del sistema operativo. Attività interessate:\n{0}"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.i18n.json b/i18n/ita/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.i18n.json
deleted file mode 100644
index c79317e1e19..00000000000
--- a/i18n/ita/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"termEntryAriaLabel": "{0}, selettore terminale",
-	"termCreateEntryAriaLabel": "{0}, crea un nuovo terminale",
-	"workbench.action.terminal.newplus": "$(plus) Crea nuovo terminale integrato",
-	"noTerminalsMatching": "Nessun terminale corrispondente",
-	"noTerminalsFound": "Nessun terminale aperto"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/terminal/common/terminalColorRegistry.i18n.json b/i18n/ita/src/vs/workbench/parts/terminal/common/terminalColorRegistry.i18n.json
deleted file mode 100644
index 7ae3aac58f6..00000000000
--- a/i18n/ita/src/vs/workbench/parts/terminal/common/terminalColorRegistry.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"terminal.background": "Il colore di sfondo del terminale, questo consente di colorare il terminale in modo diverso dal pannello.",
-	"terminal.foreground": "Il colore di primo piano del terminale.",
-	"terminalCursor.foreground": "Colore di primo piano del cursore del terminale.",
-	"terminalCursor.background": "Colore di sfondo del cursore del terminale. Permette di personalizzare il colore di un carattere quando sovrapposto da un blocco cursore.",
-	"terminal.selectionBackground": "Colore di sfondo di selezione del terminale.",
-	"terminal.border": "Colore del bordo che separa i riquadri divisi all'interno del terminale. L'impostazione predefinita è panel.border.",
-	"terminal.ansiColor": "'{0}' colori ANSI nel terminale. "
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json b/i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
deleted file mode 100644
index b43f261b33e..00000000000
--- a/i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"quickOpen.terminal": "Mostra tutti i terminali aperti",
-	"terminal": "Terminale",
-	"terminalIntegratedConfigurationTitle": "Terminale integrato",
-	"terminal.integrated.shell.linux": "Percorso della shell usata dal terminale in Linux.",
-	"terminal.integrated.shellArgs.linux": "Argomenti della riga di comando da usare nel terminale Linux.",
-	"terminal.integrated.shell.osx": "Percorso della shell usata dal terminale in OS X.",
-	"terminal.integrated.shellArgs.osx": "Argomenti della riga di comando da usare nel terminale OS X.",
-	"terminal.integrated.shell.windows": "Il percorso della shell che il terminale utilizza su Windows. Quando si utilizzano shell fornite con Windows (cmd, PowerShell o Bash su Ubuntu).",
-	"terminal.integrated.shellArgs.windows": "Argomenti della riga di comando da usare nel terminale Windows.",
-	"terminal.integrated.macOptionIsMeta": "Utilizzare il tasto opzione come tasto meta nel terminale di OSX",
-	"terminal.integrated.copyOnSelection": "Quando impostato, il testo selezionato nel terminale sarà copiato negli appunti.",
-	"terminal.integrated.fontFamily": "Controlla la famiglia di caratteri del terminale. L'impostazione predefinita è il valore di editor.fontFamily.",
-	"terminal.integrated.fontSize": "Consente di controllare le dimensioni del carattere in pixel del terminale.",
-	"terminal.integrated.letterSpacing": "Controlla la spaziatura delle lettere del terminale. Si tratta di un valore intero che rappresenta il numero di pixel da aggiungere tra i caratteri.",
-	"terminal.integrated.lineHeight": "Controlla l'altezza della riga del terminale. Questo numero è moltiplicato per la dimensione del carattere del terminale per ottenere l'effettiva altezza della riga in pixel.",
-	"terminal.integrated.fontWeight": "Spessore del carattere da usare nel terminale per il testo non in grassetto.",
-	"terminal.integrated.fontWeightBold": "Spessore del carattere da usare nel terminale per il testo in grassetto.",
-	"terminal.integrated.cursorBlinking": "Controlla se il cursore del terminale è intermittente o meno.",
-	"terminal.integrated.cursorStyle": "Controlla lo stile del cursore del terminale.",
-	"terminal.integrated.scrollback": "Consente di controllare il numero massimo di righe che il terminale mantiene nel buffer.",
-	"terminal.integrated.setLocaleVariables": "Controlla se le variabili delle impostazioni locali sono impostate all'avvio del terminale. Il valore predefinito è true per OS X e false per altre piattaforme.",
-	"terminal.integrated.rendererType": "Controlla la modalità di rendering del terminale. Le opzioni sono \"canvas\" per il renderer di canvas standard (rapido), \"dom\" per il renderer di fallback basato su DOM oppure \"auto\" che consente a VS Code di individuare quello migliore. Per rendere effettiva questa impostazione, è necessario ricariare VS Code.",
-	"terminal.integrated.rightClickBehavior": "Controlla la reazione del terminale quando viene fatto clic con il pulsante destro del mouse. Le opzioni disponibili solo \"default\", \"copyPaste\" e \"selectWord\". Con \"default\" verrà visualizzato il menu di scelta rapida. Con \"copyPaste\" verrà eseguita un'operazione di copia in presenza di una selezione o in caso contrario un'operazione di incollamento. Con \"selectWord\" verrà selezionata la parola sotto il cursore e verrà visualizzato il menu di scelta rapida.",
-	"terminal.integrated.cwd": "Percorso di avvio esplicito in cui verrà avviato il terminale. Viene usato come directory di lavoro corrente per il processo della shell. Può risultare particolarmente utile nelle impostazioni dell'area di lavoro se la directory radice non costituisce una directory di lavoro corrente comoda.",
-	"terminal.integrated.confirmOnExit": "Indica se confermare all'uscita la presenza di sessioni di terminale attive.",
-	"terminal.integrated.enableBell": "Indica se il cicalino del terminale è abilitato o meno.",
-	"terminal.integrated.commandsToSkipShell": "Set di ID comando i cui tasti di scelta rapida non verranno inviati alla shell e verranno sempre gestiti da Code. In tal modo i tasti di scelta rapida normalmente utilizzati dalla shell avranno lo stesso effetto di quando il terminale non ha lo stato attivo, ad esempio CTRL+P per avviare Quick Open.",
-	"terminal.integrated.env.osx": "Oggetto con variabili di ambiente che verrà aggiunto al processo VS Code per essere utilizzato dal terminale su OS X",
-	"terminal.integrated.env.linux": "Oggetto con variabili di ambiente che verrà aggiunto al processo VS Code per essere utilizzato dal terminale su Linux",
-	"terminal.integrated.env.windows": "Oggetto con variabili di ambiente che verrà aggiunto al processo VS Code per essere utilizzato dal terminale su Windows",
-	"terminal.integrated.showExitAlert": "Visualizza avviso \"Il processo terminale ha restituito codice di uscita\" quando il codice di uscita è diverso da zero.",
-	"terminal.integrated.experimentalRestore": "Indica se ripristinare automaticamente le sessioni di terminale per l'area di lavoro all'avvio di VS Code. Si tratta di un'impostazione sperimentale che potrebbe contenere bug e cambiare in futuro.",
-	"terminalCategory": "Terminale",
-	"viewCategory": "Visualizza"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json b/i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
deleted file mode 100644
index 9af26b9889e..00000000000
--- a/i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
+++ /dev/null
@@ -1,63 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"workbench.action.terminal.toggleTerminal": "Attiva/Disattiva terminale integrato",
-	"workbench.action.terminal.kill": "Termina istanza attiva del terminale",
-	"workbench.action.terminal.kill.short": "Termina il terminale",
-	"workbench.action.terminal.quickKill": "Termina istanza del terminale",
-	"workbench.action.terminal.copySelection": "Copia selezione",
-	"workbench.action.terminal.selectAll": "Seleziona tutto",
-	"workbench.action.terminal.deleteWordLeft": "Elimina parola a sinistra",
-	"workbench.action.terminal.deleteWordRight": "Elimina la parola a destra",
-	"workbench.action.terminal.moveToLineStart": "Passa all'inizio della riga",
-	"workbench.action.terminal.moveToLineEnd": "Passa alla fine della riga",
-	"workbench.action.terminal.new": "Crea nuovo terminale integrato",
-	"workbench.action.terminal.new.short": "Nuovo terminale",
-	"workbench.action.terminal.newWorkspacePlaceholder": "Selezionare la cartella di lavoro corrente per un nuovo terminale.",
-	"workbench.action.terminal.newInActiveWorkspace": "Crea un nuovo terminale integrato (nel workspace attivo)",
-	"workbench.action.terminal.split": "Terminale diviso",
-	"workbench.action.terminal.splitInActiveWorkspace": "Terminale diviso (nell'area di lavoro attiva)",
-	"workbench.action.terminal.focusPreviousPane": "Sposta stato attivo sul riquadro precedente",
-	"workbench.action.terminal.focusNextPane": "Sposta stato attivo sul riquadro successivo",
-	"workbench.action.terminal.resizePaneLeft": "Ridimensiona il riquadro a sinistra",
-	"workbench.action.terminal.resizePaneRight": "Ridimensiona il riquadro a destra",
-	"workbench.action.terminal.resizePaneUp": "Ridimensiona il riquadro in alto",
-	"workbench.action.terminal.resizePaneDown": "Ridimensiona il riquadro in basso",
-	"workbench.action.terminal.focus": "Sposta stato attivo su terminale",
-	"workbench.action.terminal.focusNext": "Sposta stato attivo su terminale successivo",
-	"workbench.action.terminal.focusPrevious": "Sposta stato attivo su terminale precedente",
-	"workbench.action.terminal.paste": "Incolla nel terminale attivo",
-	"workbench.action.terminal.DefaultShell": "Selezionare la Shell di Default",
-	"workbench.action.terminal.runSelectedText": "Esegui testo selezionato nel terminale attivo",
-	"workbench.action.terminal.runActiveFile": "Esegui file attivo nel terminale attivo",
-	"workbench.action.terminal.runActiveFile.noFile": "Nel terminale è possibile eseguire solo file su disco",
-	"workbench.action.terminal.switchTerminal": "Cambia terminale",
-	"workbench.action.terminal.scrollDown": "Scorri giù (riga)",
-	"workbench.action.terminal.scrollDownPage": "Scorri giù (pagina)",
-	"workbench.action.terminal.scrollToBottom": "Scorri alla fine",
-	"workbench.action.terminal.scrollUp": "Scorri su (riga)",
-	"workbench.action.terminal.scrollUpPage": "Scorri su (pagina)",
-	"workbench.action.terminal.scrollToTop": "Scorri all'inizio",
-	"workbench.action.terminal.clear": "Cancella",
-	"workbench.action.terminal.clearSelection": "Cancella selezione",
-	"workbench.action.terminal.allowWorkspaceShell": "Consente la configurazione della Shell dell'area di lavoro",
-	"workbench.action.terminal.disallowWorkspaceShell": "Non consente la configurazione della Shell dell'area di lavoro",
-	"workbench.action.terminal.rename": "Rinomina",
-	"workbench.action.terminal.rename.prompt": "Immettere il nome del terminale",
-	"workbench.action.terminal.focusFindWidget": "Stato attivo su widget Trova",
-	"workbench.action.terminal.hideFindWidget": "Nascondi widget Trova",
-	"nextTerminalFindTerm": "Mostra il termine di ricerca successivo",
-	"previousTerminalFindTerm": "Mostra il termine di ricerca precedente",
-	"quickOpenTerm": "Cambia terminale attivo",
-	"workbench.action.terminal.scrollToPreviousCommand": "Scorri al comando precedente",
-	"workbench.action.terminal.scrollToNextCommand": "Scorri al comando successivo",
-	"workbench.action.terminal.selectToPreviousCommand": "Aggiungi selezione a comando precedente",
-	"workbench.action.terminal.selectToNextCommand": "Aggiungi selezione a comando successivo",
-	"workbench.action.terminal.selectToPreviousLine": "Aggiungi selezione a riga precedente",
-	"workbench.action.terminal.selectToNextLine": "Aggiungi selezione a riga successiva"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json b/i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
deleted file mode 100644
index 7ae3aac58f6..00000000000
--- a/i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"terminal.background": "Il colore di sfondo del terminale, questo consente di colorare il terminale in modo diverso dal pannello.",
-	"terminal.foreground": "Il colore di primo piano del terminale.",
-	"terminalCursor.foreground": "Colore di primo piano del cursore del terminale.",
-	"terminalCursor.background": "Colore di sfondo del cursore del terminale. Permette di personalizzare il colore di un carattere quando sovrapposto da un blocco cursore.",
-	"terminal.selectionBackground": "Colore di sfondo di selezione del terminale.",
-	"terminal.border": "Colore del bordo che separa i riquadri divisi all'interno del terminale. L'impostazione predefinita è panel.border.",
-	"terminal.ansiColor": "'{0}' colori ANSI nel terminale. "
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminalConfigHelper.i18n.json b/i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminalConfigHelper.i18n.json
deleted file mode 100644
index 2755c052a65..00000000000
--- a/i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminalConfigHelper.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"terminal.integrated.allowWorkspaceShell": "Consentire l'esecuzione di {0} (definito come impostazione dell'area di lavoro) nel terminale?",
-	"allow": "Allow",
-	"disallow": "Disallow"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminalFindWidget.i18n.json b/i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminalFindWidget.i18n.json
deleted file mode 100644
index a930fde7ffb..00000000000
--- a/i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminalFindWidget.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"label.find": "Trova",
-	"placeholder.find": "Trova",
-	"label.previousMatchButton": "Risultato precedente",
-	"label.nextMatchButton": "Risultato successivo",
-	"label.closeButton": "Chiudi"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json b/i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json
deleted file mode 100644
index 343f27488ed..00000000000
--- a/i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"terminal.integrated.a11yBlankLine": "Riga vuota",
-	"terminal.integrated.a11yPromptLabel": "Input di terminale",
-	"terminal.integrated.a11yTooMuchOutput": "Troppo output da annunciare. Per leggere, spostarsi manualmente nelle righe",
-	"yes": "Sì",
-	"terminal.rendererInAllNewTerminals": "Per tutti i nuovi terminali creati verrà usato il renderer non GPU.",
-	"no": "No",
-	"dontShowAgain": "Non visualizzare più questo messaggio",
-	"terminal.slowRendering": "Il renderer standard per il terminale integrato sembra lento nel computer. Passare al renderer alternativo basato su DOM che potrebbe offrire migliori prestazioni? [Altre informazioni sulle impostazioni del terminale](https://code.visualstudio.com/docs/editor/integrated-terminal#_changing-how-the-terminal-is-rendered).",
-	"terminal.integrated.copySelection.noSelection": "Il terminale non contiene alcuna selezione da copiare",
-	"terminal.integrated.exitedWithCode": "Il processo del terminale è stato terminato. Codice di uscita: {0}",
-	"terminal.integrated.waitOnExit": "Premere un tasto qualsiasi per chiudere il terminale",
-	"terminal.integrated.launchFailed": "Non è stato possibile avviare il comando '{0}{1}' del processo del terminale (codice di uscita: {2})",
-	"terminal.integrated.launchFailedExtHost": "Non è stato possibile avviare il processo del terminale (codice di uscita: {0})"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminalLinkHandler.i18n.json b/i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminalLinkHandler.i18n.json
deleted file mode 100644
index e5d76fcde18..00000000000
--- a/i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminalLinkHandler.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"terminalLinkHandler.followLinkAlt": "Alt + clic per seguire il collegamento",
-	"terminalLinkHandler.followLinkCmd": "Cmd + clic per seguire il collegamento",
-	"terminalLinkHandler.followLinkCtrl": "CTRL + clic per seguire il collegamento"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json b/i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json
deleted file mode 100644
index 17f51bf21b6..00000000000
--- a/i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"terminal.useMonospace": "Usa 'monospace'",
-	"terminal.monospaceOnly": "Il terminale supporta solo tipi di carattere a spaziatura fissa.",
-	"copy": "Copia",
-	"split": "Dividi",
-	"paste": "Incolla",
-	"selectAll": "Seleziona tutto",
-	"clear": "Cancella"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json b/i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
deleted file mode 100644
index 40819f4f5c0..00000000000
--- a/i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"terminal.integrated.chooseWindowsShellInfo": "È possibile modificare la shell di terminale di default selezionando il pulsante Personalizza.",
-	"customize": "Personalizza",
-	"never again": "Non visualizzare più questo messaggio",
-	"terminal.integrated.chooseWindowsShell": "Seleziona la shell di terminale preferita - è possibile modificare questa impostazione dopo",
-	"terminalService.terminalCloseConfirmationSingular": "C'è una sessione di terminale attiva. Terminarla?",
-	"terminalService.terminalCloseConfirmationPlural": "Ci sono {0} sessioni di terminale attive. Terminarle?"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/themes/electron-browser/themes.contribution.i18n.json b/i18n/ita/src/vs/workbench/parts/themes/electron-browser/themes.contribution.i18n.json
deleted file mode 100644
index 28b4a746aa3..00000000000
--- a/i18n/ita/src/vs/workbench/parts/themes/electron-browser/themes.contribution.i18n.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"selectTheme.label": "Tema colori",
-	"themes.category.light": "temi chiari",
-	"themes.category.dark": "temi scuri",
-	"themes.category.hc": "temi a contrasto elevato",
-	"installColorThemes": "Installa temi colori aggiuntivi...",
-	"themes.selectTheme": "Selezionare il Tema colori (tasti su/giù per anteprima)",
-	"selectIconTheme.label": "Tema icona file",
-	"noIconThemeLabel": "Nessuno",
-	"noIconThemeDesc": "Disabilita le icone dei file",
-	"installIconThemes": "Installa temi dell'icona file aggiuntivi...",
-	"themes.selectIconTheme": "Seleziona il tema dell'icona file",
-	"generateColorTheme.label": "Genera tema colore da impostazioni correnti",
-	"preferences": "Preferenze",
-	"developer": "Sviluppatore"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/trust/electron-browser/unsupportedWorkspaceSettings.contribution.i18n.json b/i18n/ita/src/vs/workbench/parts/trust/electron-browser/unsupportedWorkspaceSettings.contribution.i18n.json
deleted file mode 100644
index a2ee6206bbf..00000000000
--- a/i18n/ita/src/vs/workbench/parts/trust/electron-browser/unsupportedWorkspaceSettings.contribution.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openWorkspaceSettings": "Apri impostazioni area di lavoro",
-	"dontShowAgain": "Non visualizzare più questo messaggio",
-	"unsupportedWorkspaceSettings": "Quest'area di lavoro contiene impostazioni che è possibile specificare solo nelle impostazioni utente  ({0}). Per maggiori informazioni, fare clic [qui]({1})."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json b/i18n/ita/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json
deleted file mode 100644
index a720e18d093..00000000000
--- a/i18n/ita/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"releaseNotesInputName": "Note sulla versione: {0}",
-	"unassigned": "non assegnato"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/update/electron-browser/releaseNotesInput.i18n.json b/i18n/ita/src/vs/workbench/parts/update/electron-browser/releaseNotesInput.i18n.json
deleted file mode 100644
index 22cf5ee48bb..00000000000
--- a/i18n/ita/src/vs/workbench/parts/update/electron-browser/releaseNotesInput.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"releaseNotesInputName": "Note sulla versione: {0}"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/update/electron-browser/update.contribution.i18n.json b/i18n/ita/src/vs/workbench/parts/update/electron-browser/update.contribution.i18n.json
deleted file mode 100644
index 8b167c6ddf6..00000000000
--- a/i18n/ita/src/vs/workbench/parts/update/electron-browser/update.contribution.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"release notes": "Note sulla versione"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/update/electron-browser/update.i18n.json b/i18n/ita/src/vs/workbench/parts/update/electron-browser/update.i18n.json
deleted file mode 100644
index aed35ee0f73..00000000000
--- a/i18n/ita/src/vs/workbench/parts/update/electron-browser/update.i18n.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"releaseNotes": "Note sulla versione",
-	"showReleaseNotes": "Mostra note sulla versione",
-	"read the release notes": "Benvenuti in {0} versione {1}. Leggere le note sulla versione?",
-	"licenseChanged": "I termini della licenza sono cambiati. Fare clic [qui]({0}) e leggerli con attenzione.",
-	"neveragain": "Non visualizzare più questo messaggio",
-	"64bitisavailable": "{0} per Windows a 64 bit è ora disponibile. Per maggiori informazioni, fare clic [qui]({1}).",
-	"updateIsReady": "Nuovo aggiornamento di {0} disponibile.",
-	"noUpdatesAvailable": "Al momento non sono disponibili aggiornamenti.",
-	"ok": "OK",
-	"thereIsUpdateAvailable": "È disponibile un aggiornamento.",
-	"download now": "Scarica ora",
-	"later": "In seguito",
-	"updateAvailable": "È disponibile un aggiornamento: {0} {1}",
-	"installUpdate": "Installa aggiornamento",
-	"updateInstalling": "{0} {1} verrà installato in background. Al termine, verrà visualizzato un messaggio.",
-	"updateAvailableAfterRestart": "Riavviare {0} per applicare l'aggiornamento più recente.",
-	"updateNow": "Aggiorna adesso",
-	"commandPalette": "Riquadro comandi...",
-	"settings": "Impostazioni",
-	"keyboardShortcuts": "Scelte rapide da tastiera",
-	"showExtensions": "Gestisci le estensioni",
-	"userSnippets": "Frammenti utente",
-	"selectTheme.label": "Tema colori",
-	"themes.selectIconTheme.label": "Tema icona file",
-	"checkForUpdates": "Verifica disponibilità aggiornamenti...",
-	"checkingForUpdates": "Verifica della disponibilità di aggiornamenti...",
-	"DownloadingUpdate": "Download dell'aggiornamento...",
-	"installUpdate...": "Installa aggiornamento...",
-	"installingUpdate": "Installazione dell'aggiornamento...",
-	"restartToUpdate": "Riavvia per aggiornare..."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/url/electron-browser/url.contribution.i18n.json b/i18n/ita/src/vs/workbench/parts/url/electron-browser/url.contribution.i18n.json
deleted file mode 100644
index b57afe97dea..00000000000
--- a/i18n/ita/src/vs/workbench/parts/url/electron-browser/url.contribution.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openUrl": "Apri URL",
-	"developer": "Sviluppatore"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/views/browser/views.i18n.json b/i18n/ita/src/vs/workbench/parts/views/browser/views.i18n.json
deleted file mode 100644
index 860e3f239f2..00000000000
--- a/i18n/ita/src/vs/workbench/parts/views/browser/views.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"viewToolbarAriaLabel": "Azioni di {0}",
-	"hideView": "Nascondi da barra laterale"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/views/browser/viewsExtensionPoint.i18n.json b/i18n/ita/src/vs/workbench/parts/views/browser/viewsExtensionPoint.i18n.json
deleted file mode 100644
index 79ac78f96ad..00000000000
--- a/i18n/ita/src/vs/workbench/parts/views/browser/viewsExtensionPoint.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"requirearray": "Visualizzazioni devono essere una matrice",
-	"requirestring": "la proprietà `{0}` è obbligatoria e deve essere di tipo `string`",
-	"optstring": "la proprietà `{0}` può essere omessa o deve essere di tipo `string`",
-	"vscode.extension.contributes.view.id": "Identificatore della vista. Utilizzare questo per registrare un provider di dati tramite l'API 'vscode.window.registerTreeDataProviderForView'. Anche per innescare l'attivazione dell'estensione tramite la registrazione dell'evento 'onView: ${id}' a 'activationEvents'.",
-	"vscode.extension.contributes.view.name": "Il nome della visualizzazione. Verrà mostrato",
-	"vscode.extension.contributes.view.when": "Condizione che deve essere vera per mostrare questa visualizzazione",
-	"vscode.extension.contributes.views": "Contribuisce visualizzazioni all'editor",
-	"views.explorer": "Visualizzazione di esplorazione",
-	"views.debug": "Visualizzazione Debug",
-	"locationId.invalid": "'{0}' non è una posizione valida per la visualizzazione"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/watermark/electron-browser/watermark.i18n.json b/i18n/ita/src/vs/workbench/parts/watermark/electron-browser/watermark.i18n.json
deleted file mode 100644
index ef5b3a87b8e..00000000000
--- a/i18n/ita/src/vs/workbench/parts/watermark/electron-browser/watermark.i18n.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"watermark.showCommands": "Mostra tutti i comandi",
-	"watermark.quickOpen": "Vai al file",
-	"watermark.openFile": "Apri file",
-	"watermark.openFolder": "Apri cartella",
-	"watermark.openFileFolder": "Apri file o cartella",
-	"watermark.openRecent": "Apri recenti",
-	"watermark.newUntitledFile": "Nuovo file senza nome",
-	"watermark.toggleTerminal": "Attiva/Disattiva terminale",
-	"watermark.findInFiles": "Cerca nei file",
-	"watermark.startDebugging": "Avvia debug",
-	"watermark.unboundCommand": "non associato",
-	"workbenchConfigurationTitle": "Area di lavoro",
-	"tips.enabled": "Quando questa opzione è abilitata, se non ci sono editor aperti, verranno visualizzati i suggerimenti filigrana."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json b/i18n/ita/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json
deleted file mode 100644
index 09c98a26547..00000000000
--- a/i18n/ita/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"webview.editor.label": "editor Webview",
-	"developer": "Sviluppatore"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/webview/electron-browser/webviewCommands.i18n.json b/i18n/ita/src/vs/workbench/parts/webview/electron-browser/webviewCommands.i18n.json
deleted file mode 100644
index ee36d0bcec9..00000000000
--- a/i18n/ita/src/vs/workbench/parts/webview/electron-browser/webviewCommands.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openToolsLabel": "Apri strumenti di sviluppo Webview",
-	"refreshWebviewLabel": "Ricarica Webview"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json b/i18n/ita/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json
deleted file mode 100644
index 647449f9420..00000000000
--- a/i18n/ita/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"telemetryOptOut.optOutNotice": "Per contribuire al miglioramento di VS Code, è possibile consentire a Microsoft di raccogliere i dati di utilizzo. Leggere l'[informativa sulla privacy]({0}) per informazioni su come [rifiutare esplicitamente]({1}).",
-	"telemetryOptOut.optInNotice": "Per contribuire al miglioramento di VS Code, è possibile consentire a Microsoft di raccogliere i dati di utilizzo. Leggere l'[informativa sulla privacy]({0}) per informazioni su come [acconsentire esplicitamente]({1}).",
-	"telemetryOptOut.readMore": "Altre informazioni"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/welcome/overlay/browser/welcomeOverlay.i18n.json b/i18n/ita/src/vs/workbench/parts/welcome/overlay/browser/welcomeOverlay.i18n.json
deleted file mode 100644
index 3251e4b60b4..00000000000
--- a/i18n/ita/src/vs/workbench/parts/welcome/overlay/browser/welcomeOverlay.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"welcomeOverlay.explorer": "Esplora file",
-	"welcomeOverlay.search": "Cerca nei file",
-	"welcomeOverlay.git": "Gestione del codice sorgente",
-	"welcomeOverlay.debug": "Avvia ed esegui il debug",
-	"welcomeOverlay.extensions": "Gestisci le estensioni",
-	"welcomeOverlay.problems": "Visualizza errori e avvisi",
-	"welcomeOverlay.commandPalette": "Trova ed esegui tutti i comandi",
-	"welcomeOverlay.notifications": "Mostra notifiche",
-	"welcomeOverlay": "Panoramica interfaccia utente",
-	"hideWelcomeOverlay": "Nascondi panoramica interfaccia",
-	"help": "Guida"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json b/i18n/ita/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
deleted file mode 100644
index 4042bb544ec..00000000000
--- a/i18n/ita/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"welcomePage.vscode": "Visual Studio Code",
-	"welcomePage.editingEvolved": "Evoluzione dell'editor",
-	"welcomePage.start": "Avvia",
-	"welcomePage.newFile": "Nuovo file",
-	"welcomePage.openFolder": "Apri cartella...",
-	"welcomePage.addWorkspaceFolder": "Aggiungi cartella dell'area di lavoro...",
-	"welcomePage.recent": "Recenti",
-	"welcomePage.moreRecent": "Altro...",
-	"welcomePage.noRecentFolders": "Non ci sono cartelle recenti",
-	"welcomePage.help": "Guida",
-	"welcomePage.keybindingsCheatsheet": "Bigino combinazione tasti stampabile",
-	"welcomePage.introductoryVideos": "Video introduttivi",
-	"welcomePage.tipsAndTricks": "Suggerimenti e trucchi",
-	"welcomePage.productDocumentation": "Documentazione del prodotto",
-	"welcomePage.gitHubRepository": "Repository GitHub",
-	"welcomePage.stackOverflow": "Stack Overflow",
-	"welcomePage.showOnStartup": "Mostra la pagina iniziale all'avvio",
-	"welcomePage.customize": "Personalizza",
-	"welcomePage.installExtensionPacks": "Strumenti e linguaggi",
-	"welcomePage.installExtensionPacksDescription": "Installare il supporto per {0} e {1}",
-	"welcomePage.moreExtensions": "altro",
-	"welcomePage.installKeymapDescription": "Impostazioni e tasti di scelta rapida",
-	"welcomePage.installKeymapExtension": "Installa le impostazioni e i tasti di scelta rapida di {0} e {1}",
-	"welcomePage.others": "altri",
-	"welcomePage.colorTheme": "Tema colori",
-	"welcomePage.colorThemeDescription": "Tutto quel che serve per configurare editor e codice nel modo desiderato",
-	"welcomePage.learn": "Impara",
-	"welcomePage.showCommands": "Trova ed esegui tutti i comandi",
-	"welcomePage.showCommandsDescription": "Accesso e ricerca rapida di comandi dal riquadro comandi ({0})",
-	"welcomePage.interfaceOverview": "Panoramica dell'interfaccia",
-	"welcomePage.interfaceOverviewDescription": "Immagine in sovrimpressione che evidenzia i principali componenti dell'interfaccia utente",
-	"welcomePage.interactivePlayground": "Playground interattivo",
-	"welcomePage.interactivePlaygroundDescription": "Breve panoramica delle funzionalità essenziali dell'editor"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.contribution.i18n.json b/i18n/ita/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.contribution.i18n.json
deleted file mode 100644
index 82f6aedb638..00000000000
--- a/i18n/ita/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.contribution.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"workbenchConfigurationTitle": "Area di lavoro",
-	"workbench.startupEditor.none": "Avvia senza un editor.",
-	"workbench.startupEditor.welcomePage": "Apre la pagina di benvenuto (impostazione predefinita).",
-	"workbench.startupEditor.newUntitledFile": "Apre un nuovo file senza nome.",
-	"workbench.startupEditor": "Controlla quale editor viene visualizzato all'avvio, se non ne è stato ripristinato nessuno dalla versione precedente. Selezionare 'none' per avviare senza un editor, 'welcomePage' per aprire la pagina di benvenuto (impostazione predefinita), 'newUntitledFile' per aprire un nuovo file senza nome (solo quando si apre uno spazio di lavoro vuoto).",
-	"help": "Guida"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json b/i18n/ita/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json
deleted file mode 100644
index b638ceb72cd..00000000000
--- a/i18n/ita/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"welcomePage": "Benvenuti",
-	"welcomePage.javaScript": "JavaScript",
-	"welcomePage.typeScript": "TypeScript",
-	"welcomePage.python": "Python",
-	"welcomePage.php": "PHP",
-	"welcomePage.azure": "Azure",
-	"welcomePage.showAzureExtensions": "Mostra estensioni di Azure",
-	"welcomePage.docker": "Docker",
-	"welcomePage.vim": "Vim",
-	"welcomePage.sublime": "Sublime",
-	"welcomePage.atom": "Atom",
-	"welcomePage.extensionPackAlreadyInstalled": "Il supporto per {0} è già installato.",
-	"welcomePage.willReloadAfterInstallingExtensionPack": "La finestra verrà ricaricata dopo l'installazione di supporto aggiuntivo per {0}.",
-	"welcomePage.installingExtensionPack": "Installazione di supporto aggiuntivo per {0} in corso...",
-	"welcomePage.extensionPackNotFound": "Il supporto per {0} con ID {1} non è stato trovato.",
-	"welcomePage.keymapAlreadyInstalled": "I tasti di scelta rapida di {0} sono già installati.",
-	"welcomePage.willReloadAfterInstallingKeymap": "La finestra verrà ricaricata dopo l'installazione dei tasti di scelta rapida di {0}.",
-	"welcomePage.installingKeymap": "Installazione dei tasti di scelta rapida di {0}...",
-	"welcomePage.keymapNotFound": "I tasti di scelta rapida di {0} con ID {1} non sono stati trovati.",
-	"welcome.title": "Benvenuti",
-	"welcomePage.openFolderWithPath": "Apri la cartella {0} con percorso {1}",
-	"welcomePage.extensionListSeparator": ",",
-	"welcomePage.installKeymap": "Installa mappatura tastiera {0}",
-	"welcomePage.installExtensionPack": "Installa supporto aggiuntivo per {0}",
-	"welcomePage.installedKeymap": "Mappatura tastiera {0} è già installata",
-	"welcomePage.installedExtensionPack": "Il supporto {0} è già installato",
-	"ok": "OK",
-	"details": "Dettagli",
-	"welcomePage.buttonBackground": "Colore di sfondo dei pulsanti nella pagina di benvenuto.",
-	"welcomePage.buttonHoverBackground": "Colore di sfondo al passaggio del mouse dei pulsanti nella pagina di benvenuto."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/welcome/walkThrough/electron-browser/editor/editorWalkThrough.i18n.json b/i18n/ita/src/vs/workbench/parts/welcome/walkThrough/electron-browser/editor/editorWalkThrough.i18n.json
deleted file mode 100644
index 0e26a64df74..00000000000
--- a/i18n/ita/src/vs/workbench/parts/welcome/walkThrough/electron-browser/editor/editorWalkThrough.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"editorWalkThrough.title": "Playground interattivo",
-	"editorWalkThrough": "Playground interattivo"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThrough.contribution.i18n.json b/i18n/ita/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThrough.contribution.i18n.json
deleted file mode 100644
index 2692bc2599f..00000000000
--- a/i18n/ita/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThrough.contribution.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"walkThrough.editor.label": "Playground interattivo",
-	"help": "Guida"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughActions.i18n.json b/i18n/ita/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughActions.i18n.json
deleted file mode 100644
index 5044f96d2a8..00000000000
--- a/i18n/ita/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughActions.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"editorWalkThrough.arrowUp": "Scorri su (riga)",
-	"editorWalkThrough.arrowDown": "Scorri giù (riga)",
-	"editorWalkThrough.pageUp": "Scorri su (pagina)",
-	"editorWalkThrough.pageDown": "Scorri giù (pagina)"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughPart.i18n.json b/i18n/ita/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughPart.i18n.json
deleted file mode 100644
index 04e3f6e884c..00000000000
--- a/i18n/ita/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughPart.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"walkThrough.unboundCommand": "non associato",
-	"walkThrough.gitNotFound": "Sembra che GIT non sia installato nel sistema.",
-	"walkThrough.embeddedEditorBackground": "Colore di sfondo degli editor incorporati nel playground interattivo."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/services/actions/electron-browser/menusExtensionPoint.i18n.json b/i18n/ita/src/vs/workbench/services/actions/electron-browser/menusExtensionPoint.i18n.json
deleted file mode 100644
index 1b2a046fdb0..00000000000
--- a/i18n/ita/src/vs/workbench/services/actions/electron-browser/menusExtensionPoint.i18n.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"requirearray": "le voci di menu devono essere una matrice",
-	"requirestring": "la proprietà `{0}` è obbligatoria e deve essere di tipo `string`",
-	"optstring": "la proprietà `{0}` può essere omessa o deve essere di tipo `string`",
-	"vscode.extension.contributes.menuItem.command": "Identificatore del comando da eseguire. Il comando deve essere dichiarato nella sezione 'commands'",
-	"vscode.extension.contributes.menuItem.alt": "Identificatore di un comando alternativo da eseguire. Il comando deve essere dichiarato nella sezione 'commands'",
-	"vscode.extension.contributes.menuItem.when": "Condizione che deve essere vera per mostrare questo elemento",
-	"vscode.extension.contributes.menuItem.group": "Gruppo a cui appartiene questo comando",
-	"vscode.extension.contributes.menus": "Aggiunge voci del menu all'editor come contributo",
-	"menus.commandPalette": "Riquadro comandi",
-	"menus.touchBar": "La Touch Bar (solo Mac OS)",
-	"menus.editorTitle": "Menu del titolo dell'editor",
-	"menus.editorContext": "Menu di scelta rapida dell'editor",
-	"menus.explorerContext": "Menu di scelta rapida Esplora file",
-	"menus.editorTabContext": "Menu di scelta rapida delle schede dell'editor",
-	"menus.debugCallstackContext": "Menu di scelta rapida dello stack di chiamate di debug",
-	"menus.scmTitle": "Menu del titolo del controllo del codice sorgente",
-	"menus.scmSourceControl": "Menu del controllo del codice sorgente",
-	"menus.resourceGroupContext": "Menu di scelta rapida del gruppo di risorse del controllo del codice sorgente",
-	"menus.resourceStateContext": "Menu di scelta rapida dello stato delle risorse del controllo del codice sorgente",
-	"view.viewTitle": "Menu del titolo della visualizzazione contribuita",
-	"view.itemContext": "Menu di contesto dell'elemento visualizzazione contribuita",
-	"nonempty": "è previsto un valore non vuoto.",
-	"opticon": "la proprietà `icon` può essere omessa o deve essere una stringa o un valore letterale come `{dark, light}`",
-	"requireStringOrObject": "la proprietà `{0}` è obbligatoria e deve essere di tipo `object` o `string`",
-	"requirestrings": "le proprietà `{0}` e `{1}` sono obbligatorie e devono essere di tipo `string`",
-	"vscode.extension.contributes.commandType.command": "Identificatore del comando da eseguire",
-	"vscode.extension.contributes.commandType.title": "Titolo con cui è rappresentato il comando nell'interfaccia utente",
-	"vscode.extension.contributes.commandType.category": "(Facoltativo) Stringa di categoria in base a cui è raggruppato il comando nell'interfaccia utente",
-	"vscode.extension.contributes.commandType.icon": "(Facoltativa) Icona usata per rappresentare il comando nell'interfaccia utente. Percorso di file o configurazione che supporta i temi",
-	"vscode.extension.contributes.commandType.icon.light": "Percorso dell'icona quando viene usato un tema chiaro",
-	"vscode.extension.contributes.commandType.icon.dark": "Percorso dell'icona quando viene usato un tema scuro",
-	"vscode.extension.contributes.commands": "Comandi di contributes per il riquadro comandi.",
-	"dup": "Il comando `{0}` è presente più volte nella sezione `commands`.",
-	"menuId.invalid": "`{0}` non è un identificatore di menu valido",
-	"missing.command": "La voce di menu fa riferimento a un comando `{0}` che non è definito nella sezione 'commands'.",
-	"missing.altCommand": "La voce di menu fa riferimento a un comando alternativo `{0}` che non è definito nella sezione 'commands'.",
-	"dupe.command": "La voce di menu fa riferimento allo stesso comando come comando predefinito e come comando alternativo"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/services/bulkEdit/electron-browser/bulkEditService.i18n.json b/i18n/ita/src/vs/workbench/services/bulkEdit/electron-browser/bulkEditService.i18n.json
deleted file mode 100644
index b13c64b973b..00000000000
--- a/i18n/ita/src/vs/workbench/services/bulkEdit/electron-browser/bulkEditService.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"summary.0": "Non sono state effettuate modifiche",
-	"summary.nm": "Effettuate {0} modifiche al testo in {1} file",
-	"summary.n0": "Effettuate {0} modifiche al testo in un file",
-	"conflict": "Nel frattempo questi file sono stati modificati: {0}"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/services/configuration/common/configurationExtensionPoint.i18n.json b/i18n/ita/src/vs/workbench/services/configuration/common/configurationExtensionPoint.i18n.json
deleted file mode 100644
index 1ac29db2691..00000000000
--- a/i18n/ita/src/vs/workbench/services/configuration/common/configurationExtensionPoint.i18n.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.contributes.configuration.title": "Riepilogo delle impostazioni. Questa etichetta verrà usata nel file di impostazioni come commento di separazione.",
-	"vscode.extension.contributes.configuration.properties": "Descrizione delle proprietà di configurazione.",
-	"scope.application.description": "Configurazione specifica dell'applicazione, che può essere configurata solo in Impostazioni utente.",
-	"scope.window.description": "Configurazione specifica della finestra, che può essere configurata nelle impostazioni dell'utente o dell'area di lavoro.",
-	"scope.resource.description": "Configurazione specifica di risorse, che possono essere configurate nelle impostazioni utente, in quelle dell'area di lavoro o di una cartella.",
-	"scope.description": "Ambito in cui la configurazione è applicabile. Gli ambiti disponibili sono 'finestra' e 'risorsa'.",
-	"vscode.extension.contributes.defaultConfiguration": "Aggiunge come contributo le impostazioni di configurazione predefinite dell'editor in base al linguaggio.",
-	"vscode.extension.contributes.configuration": "Impostazioni di configurazione di contributes.",
-	"invalid.title": "'configuration.title' deve essere una stringa",
-	"invalid.properties": "'configuration.properties' deve essere un oggetto",
-	"invalid.property": "'configuration.property' deve essere un oggetto",
-	"invalid.allOf": "'configuration.allOf' è deprecato e non deve più essere usato. Passare invece una matrice di sezioni di configurazione al punto di aggiunta contributo 'configuration'.",
-	"workspaceConfig.folders.description": "Elenco di cartelle da caricare nell'area di lavoro.",
-	"workspaceConfig.path.description": "Percorso di file, ad esempio `/root/folderA` o `./folderA` per un percorso relativo che verrà risolto in base alla posizione del file dell'area di lavoro.",
-	"workspaceConfig.name.description": "Nome facoltativo per la cartella. ",
-	"workspaceConfig.uri.description": "URI della cartella",
-	"workspaceConfig.settings.description": "Impostazioni area di lavoro",
-	"workspaceConfig.launch.description": "Configurazioni di avvio dell'area di lavoro",
-	"workspaceConfig.extensions.description": "Estensioni dell'area di lavoro",
-	"unknownWorkspaceProperty": "La proprietà di configurazione dell'area di lavoro è sconosciuta"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/services/configuration/node/configuration.i18n.json b/i18n/ita/src/vs/workbench/services/configuration/node/configuration.i18n.json
deleted file mode 100644
index b5a489af390..00000000000
--- a/i18n/ita/src/vs/workbench/services/configuration/node/configuration.i18n.json
+++ /dev/null
@@ -1,24 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"vscode.extension.contributes.configuration.title": "Riepilogo delle impostazioni. Questa etichetta verrà usata nel file di impostazioni come commento di separazione.",
-	"vscode.extension.contributes.configuration.properties": "Descrizione delle proprietà di configurazione.",
-	"scope.window.description": "Configurazione specifica della finestra, che può essere configurata nelle impostazioni dell'utente o dell'area di lavoro.",
-	"scope.resource.description": "Configurazione specifica di risorse, che possono essere configurate nelle impostazioni utente, in quelle dell'area di lavoro o di una cartella.",
-	"scope.description": "Ambito in cui la configurazione è applicabile. Gli ambiti disponibili sono 'finestra' e 'risorsa'.",
-	"vscode.extension.contributes.configuration": "Impostazioni di configurazione di contributes.",
-	"invalid.title": "'configuration.title' deve essere una stringa",
-	"vscode.extension.contributes.defaultConfiguration": "Aggiunge come contributo le impostazioni di configurazione predefinite dell'editor in base al linguaggio.",
-	"invalid.properties": "'configuration.properties' deve essere un oggetto",
-	"invalid.allOf": "'configuration.allOf' è deprecato e non deve più essere usato. Passare invece una matrice di sezioni di configurazione al punto di aggiunta contributo 'configuration'.",
-	"workspaceConfig.folders.description": "Elenco di cartelle da caricare nell'area di lavoro.",
-	"workspaceConfig.path.description": "Percorso di file, ad esempio `/root/folderA` o `./folderA` per un percorso relativo che verrà risolto in base alla posizione del file dell'area di lavoro.",
-	"workspaceConfig.name.description": "Nome facoltativo per la cartella. ",
-	"workspaceConfig.uri.description": "URI della cartella",
-	"workspaceConfig.settings.description": "Impostazioni di area di lavoro",
-	"workspaceConfig.extensions.description": "Estensioni dell'area di lavoro",
-	"unknownWorkspaceProperty": "La proprietà di configurazione dell'area di lavoro è sconosciuta"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json b/i18n/ita/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
deleted file mode 100644
index 73635731361..00000000000
--- a/i18n/ita/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openTasksConfiguration": "Apri configurazione attività",
-	"openLaunchConfiguration": "Apri configurazione di avvio",
-	"open": "Apri impostazioni",
-	"saveAndRetry": "Salva e riprova",
-	"errorUnknownKey": "Impossibile scrivere {0} perché {1} non è una configurazione registrata.",
-	"errorInvalidWorkspaceConfigurationApplication": "Non è possibile scrivere {0} in Impostazioni area di lavoro. Questa impostazione può essere scritta solo in Impostazioni utente.",
-	"errorInvalidFolderConfiguration": "Impossibile scrivere nella cartella impostazioni perché {0} non supporta l'ambito di risorsa della cartella.",
-	"errorInvalidUserTarget": "Impossibile scrivere le impostazioni utente perché {0} non supporta l'ambito globale.",
-	"errorInvalidWorkspaceTarget": "Impossibile scrivere nell'area di lavoro perché {0} non supporta l'ambito globale in un'area di lavoro a cartelle multiple.",
-	"errorInvalidFolderTarget": "Impossibile scrivere nella cartella impostazioni perché non viene fornita alcuna risorsa.",
-	"errorNoWorkspaceOpened": "Impossibile scrivere su {0} poiché nessuna area di lavoro è aperta. Si prega di aprire un'area di lavoro e riprovare.",
-	"errorInvalidTaskConfiguration": "Non è possibile scrivere nel file di configurazione delle attività. Aprirlo per correggere eventuali errori/avvisi e riprovare.",
-	"errorInvalidLaunchConfiguration": "Non è possibile scrivere nel file di configurazione di avvio. Aprirlo per correggere eventuali errori/avvisi e riprovare.",
-	"errorInvalidConfiguration": "Non è possibile scrivere nelle impostazioni utente. Aprirlo per correggere eventuali errori/avvisi e riprovare.",
-	"errorInvalidConfigurationWorkspace": "Non è possibile scrivere nelle impostazioni dell'area di lavoro. Aprire le impostazioni dell'area di lavoro e per correggere eventuali errori/avvisi presenti nel file e riprovare.",
-	"errorInvalidConfigurationFolder": "Non è possibile scrivere nelle impostazioni della cartella. Aprire le impostazioni della cartella '{0}' per correggere eventuali errori/avvisi e riprovare.",
-	"errorTasksConfigurationFileDirty": "Non è possibile scrivere nel file di configurazione delle attività perché il file è stato modificato. Salvarlo prima, quindi riprovare.",
-	"errorLaunchConfigurationFileDirty": "Non è possibile scrivere nel file di configurazione di avvio perché il file è stato modificato. Salvarlo prima, quindi riprovare.",
-	"errorConfigurationFileDirty": "Non è possibile scrivere nelle impostazioni utente perché il file è stato modificato. Salvare prima il file delle impostazioni utente, quindi riprovare.",
-	"errorConfigurationFileDirtyWorkspace": "Non è possibile scrivere nelle impostazioni dell'area di lavoro perché il file è stato modificato. Salvare prima il file delle impostazioni dell'area di lavoro, quindi riprovare.",
-	"errorConfigurationFileDirtyFolder": "Non è possibile scrivere nelle impostazioni della cartella perché il file è stato modificato. Salvare prima il file di impostazioni della cartella '{0}', quindi riprovare.",
-	"userTarget": "Impostazioni utente",
-	"workspaceTarget": "Impostazioni area di lavoro",
-	"folderTarget": "Impostazioni della cartella"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/services/configuration/node/configurationService.i18n.json b/i18n/ita/src/vs/workbench/services/configuration/node/configurationService.i18n.json
deleted file mode 100644
index 35c50e0a9d8..00000000000
--- a/i18n/ita/src/vs/workbench/services/configuration/node/configurationService.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"unsupportedApplicationSetting": "Questa impostazione può essere applicata solo in Impostazioni utente",
-	"unsupportedWindowSetting": "Non è possibile applicare ora questa impostazione. Verrà applicata direttamente all'apertura della cartella."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/services/configuration/node/jsonEditingService.i18n.json b/i18n/ita/src/vs/workbench/services/configuration/node/jsonEditingService.i18n.json
deleted file mode 100644
index bf0a4aae108..00000000000
--- a/i18n/ita/src/vs/workbench/services/configuration/node/jsonEditingService.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"errorInvalidFile": "Impossibile scrivere nel file. Si prega di aprire il file per correggere eventuali errori o avvisi nel file e riprovare.",
-	"errorFileDirty": "Impossibile scrivere nel file perché il file è stato modificato. Si prega di salvare il file e riprovare."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json b/i18n/ita/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
deleted file mode 100644
index 39897d5e6c7..00000000000
--- a/i18n/ita/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"stringsOnlySupported": "Il comando {0} non ha restituito un risultato in formato stringa. Come risultati dei comandi usati per la sostituzione delle variabili sono supportate solo le stringhe."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/services/configurationResolver/node/variableResolver.i18n.json b/i18n/ita/src/vs/workbench/services/configurationResolver/node/variableResolver.i18n.json
deleted file mode 100644
index a7e1f925508..00000000000
--- a/i18n/ita/src/vs/workbench/services/configurationResolver/node/variableResolver.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"missingEnvVarName": "Non è possibile risolvere '{0}' perché non è assegnato alcun nome di variabile di ambiente.",
-	"configNotFound": "Non è possibile risolvere '{0}' perché l'impostazione '{1}' non è stata trovata.",
-	"configNoString": "Non è possibile risolvere '{0}' perché '{1}' è un valore strutturato.",
-	"missingConfigName": "Non è possibile risolvere '{0}' perché non è assegnato alcun nome di impostazioni.",
-	"noValueForCommand": "Non è possibile risolvere '{0}' perché al comando non è assegnato alcun valore.",
-	"canNotFindFolder": "Non è possibile risolvere '{0}'. La cartella '{1}' non esiste.",
-	"canNotResolveWorkspaceFolderMultiRoot": "Non è possibile risolvere '{0}' in un'area di lavoro a cartelle multiple. Assegnare un ambito a questa variabile usando ':' e un nome di cartella dell'area di lavoro.",
-	"canNotResolveWorkspaceFolder": "Non è possibile risolvere '{0}'. Aprire una cartella.",
-	"canNotResolveFile": "Non è possibile risolvere '{0}'. Aprire un editor.",
-	"canNotResolveLineNumber": "Non è possibile risolvere '{0}'. Assicurarsi che sia selezionata una riga nell'editor attivo.",
-	"canNotResolveSelectedText": "Non è possibile risolvere '{0}'. Assicurarsi che sia selezionato del testo nell'editor attivo."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/services/crashReporter/common/crashReporterService.i18n.json b/i18n/ita/src/vs/workbench/services/crashReporter/common/crashReporterService.i18n.json
deleted file mode 100644
index f3982be9f88..00000000000
--- a/i18n/ita/src/vs/workbench/services/crashReporter/common/crashReporterService.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"telemetryConfigurationTitle": "Telemetria",
-	"telemetry.enableCrashReporting": "Consente l'invio di segnalazioni di arresto anomalo del sistema a Microsoft.\nPer rendere effettiva questa opzione, è necessario riavviare."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/services/crashReporter/electron-browser/crashReporterService.i18n.json b/i18n/ita/src/vs/workbench/services/crashReporter/electron-browser/crashReporterService.i18n.json
deleted file mode 100644
index 2e52c71a62c..00000000000
--- a/i18n/ita/src/vs/workbench/services/crashReporter/electron-browser/crashReporterService.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"telemetryConfigurationTitle": "Telemetria",
-	"telemetry.enableCrashReporting": "Consente l'invio di segnalazioni di arresto anomalo del sistema a Microsoft.\nPer rendere effettiva questa opzione, è necessario riavviare."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/services/decorations/browser/decorationsService.i18n.json b/i18n/ita/src/vs/workbench/services/decorations/browser/decorationsService.i18n.json
deleted file mode 100644
index b3d7a1fd560..00000000000
--- a/i18n/ita/src/vs/workbench/services/decorations/browser/decorationsService.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"bubbleTitle": "Contiene elementi enfatizzati"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json b/i18n/ita/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json
deleted file mode 100644
index bb1f14b4fcf..00000000000
--- a/i18n/ita/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"yesButton": "&&Sì",
-	"cancelButton": "Annulla"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/services/dialogs/electron-browser/dialogs.i18n.json b/i18n/ita/src/vs/workbench/services/dialogs/electron-browser/dialogs.i18n.json
deleted file mode 100644
index 0deb593ad80..00000000000
--- a/i18n/ita/src/vs/workbench/services/dialogs/electron-browser/dialogs.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"yesButton": "&&Sì",
-	"cancelButton": "Annulla",
-	"moreFile": "...1 altro file non visualizzato",
-	"moreFiles": "...{0} altri file non visualizzati"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/services/editor/browser/editorService.i18n.json b/i18n/ita/src/vs/workbench/services/editor/browser/editorService.i18n.json
deleted file mode 100644
index 50e968f8ee3..00000000000
--- a/i18n/ita/src/vs/workbench/services/editor/browser/editorService.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"compareLabels": "{0} ↔ {1}"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/services/editor/common/editorService.i18n.json b/i18n/ita/src/vs/workbench/services/editor/common/editorService.i18n.json
deleted file mode 100644
index ca1ee0161c1..00000000000
--- a/i18n/ita/src/vs/workbench/services/editor/common/editorService.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"compareLabels": "{0} ↔ {1}"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/services/extensions/common/extensionsRegistry.i18n.json b/i18n/ita/src/vs/workbench/services/extensions/common/extensionsRegistry.i18n.json
deleted file mode 100644
index c8cae817c45..00000000000
--- a/i18n/ita/src/vs/workbench/services/extensions/common/extensionsRegistry.i18n.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.engines": "Compatibilità del motore.",
-	"vscode.extension.engines.vscode": "Per le estensioni di Visual Studio Code consente di specificare la versione di Visual Studio Code con cui è compatibile l'estensione. Non può essere *. Ad esempio: ^0.10.5 indica la compatibilità con la versione minima 0.10.5 di Visual Studio Code.",
-	"vscode.extension.publisher": "Editore dell'estensione Visual Studio Code.",
-	"vscode.extension.displayName": "Nome visualizzato per l'estensione usato nella raccolta di Visual Studio Code.",
-	"vscode.extension.categories": "Categorie usate dalla raccolta di Visual Studio Code per definire la categoria dell'estensione.",
-	"vscode.extension.category.languages.deprecated": "Usa in alternativa 'Linguaggi di programmazione'",
-	"vscode.extension.galleryBanner": "Banner usato nel marketplace di Visual Studio Code.",
-	"vscode.extension.galleryBanner.color": "Colore del banner nell'intestazione pagina del marketplace di Visual Studio Code.",
-	"vscode.extension.galleryBanner.theme": "Tema colori per il tipo di carattere usato nel banner.",
-	"vscode.extension.contributes": "Tutti i contributi dell'estensione Visual Studio Code rappresentati da questo pacchetto.",
-	"vscode.extension.preview": "Imposta l'estensione in modo che venga contrassegnata come Anteprima nel Marketplace.",
-	"vscode.extension.activationEvents": "Eventi di attivazione per l'estensione Visual Studio Code.",
-	"vscode.extension.activationEvents.onLanguage": "Un evento di attivazione emesso ogni volta che viene aperto un file che risolve nella lingua specificata.",
-	"vscode.extension.activationEvents.onCommand": "Un evento di attivazione emesso ogni volta che viene invocato il comando specificato.",
-	"vscode.extension.activationEvents.onDebug": "Un evento di attivazione emesso ogni volta che un utente sta per avviare il debug o sta per impostare le configurazioni di debug.",
-	"vscode.extension.activationEvents.onDebugInitialConfigurations": "Un evento di attivazione emesso ogni volta che un \"launch.json\" deve essere creato (e tutti i metodi di provideDebugConfigurations devono essere chiamati).",
-	"vscode.extension.activationEvents.onDebugResolve": "Un evento di attivazione emesso ogni volta che una sessione di debug di tipo specifico sta per essere lanciata (e un corrispondente metodo resolveDebugConfiguration deve essere chiamato).",
-	"vscode.extension.activationEvents.workspaceContains": "Un evento di attivazione emesso ogni volta che si apre una cartella che contiene almeno un file corrispondente al criterio GLOB specificato.",
-	"vscode.extension.activationEvents.onView": "Un evento di attivazione emesso ogni volta che la visualizzazione specificata viene espansa.",
-	"vscode.extension.activationEvents.onUri": "Un evento di attivazione emesso ogni volta che viene aperto un URI a livello di sistema indirizzato a questa estensione.",
-	"vscode.extension.activationEvents.star": "Un evento di attivazione emesso all'avvio di VS Code. Per garantire la migliore esperienza per l'utente finale, sei pregato di utilizzare questo evento di attivazione nella tua estensione solo quando nessun'altra combinazione di eventi di attivazione funziona nel tuo caso.",
-	"vscode.extension.badges": "Matrice di notifiche da visualizzare nella barra laterale della pagina delle estensioni del Marketplace.",
-	"vscode.extension.badges.url": "URL di immagine della notifica.",
-	"vscode.extension.badges.href": "Collegamento della notifica.",
-	"vscode.extension.badges.description": "Descrizione della notifica.",
-	"vscode.extension.markdown": "Controlla il motore di rendering di Markdown usato nel Marketplace. Può essere github (impostazione predefinita) o standard.",
-	"vscode.extension.qna": "Controlla il collegamento alle domande frequenti nel Marketplace. Impostare su marketplace per abilitare il sito predefinito delle domande frequenti nel Marketplace. Impostare su una stringa per specificare l'URL di un sito personalizzato di domande frequenti. Impostare su false per disabilitare la sezione delle domande frequenti.",
-	"vscode.extension.extensionDependencies": "Dipendenze ad altre estensioni. L'identificatore di un'estensione è sempre ${publisher}.${name}. Ad esempio: vscode.csharp.",
-	"vscode.extension.scripts.prepublish": "Script eseguito prima che il pacchetto venga pubblicato come estensione Visual Studio Code.",
-	"vscode.extension.scripts.uninstall": "Hook di disinstallazione per l'estensione VS Code. Script che viene eseguito quando l'estensione viene disinstallata completamente da VS Code, ovvero quando VS Code viene riavviato (arresto e avvio) dopo la disinstallazione dell'estensione. Sono supportati solo gli script Node.",
-	"vscode.extension.icon": "Percorso di un'icona da 128x128 pixel."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/services/extensions/electron-browser/extensionHost.i18n.json b/i18n/ita/src/vs/workbench/services/extensions/electron-browser/extensionHost.i18n.json
deleted file mode 100644
index 9afa6ea006f..00000000000
--- a/i18n/ita/src/vs/workbench/services/extensions/electron-browser/extensionHost.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"extensionHostProcess.startupFailDebug": "L'host dell'estensione non è stato avviato entro 10 secondi. Potrebbe essersi arrestato alla prima riga e richiedere un debugger per continuare.",
-	"extensionHostProcess.startupFail": "L'host dell'estensione non è stato avviato entro 10 secondi. Potrebbe essersi verificato un problema.",
-	"reloadWindow": "Ricarica finestra",
-	"extensionHostProcess.error": "Errore restituito dall'host dell'estensione: {0}"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/services/extensions/electron-browser/extensionHostProfiler.i18n.json b/i18n/ita/src/vs/workbench/services/extensions/electron-browser/extensionHostProfiler.i18n.json
deleted file mode 100644
index 9064922dee2..00000000000
--- a/i18n/ita/src/vs/workbench/services/extensions/electron-browser/extensionHostProfiler.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"message": "$(zap) Host profilatura estensione..."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/services/extensions/electron-browser/extensionPoints.i18n.json b/i18n/ita/src/vs/workbench/services/extensions/electron-browser/extensionPoints.i18n.json
deleted file mode 100644
index 357580d8fe3..00000000000
--- a/i18n/ita/src/vs/workbench/services/extensions/electron-browser/extensionPoints.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"jsonParseFail": "Non è stato possibile analizzare {0}: {1}.",
-	"fileReadFail": "Non è possibile leggere il file {0}: {1}.",
-	"jsonsParseReportErrors": "Non è stato possibile analizzare {0}: {1}.",
-	"missingNLSKey": "Il messaggio per la chiave {0} non è stato trovato."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json b/i18n/ita/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json
deleted file mode 100644
index c2d273b94b1..00000000000
--- a/i18n/ita/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"extensionsDisabled": "Tutte le estensioni sono disabilitate.",
-	"extensionHostProcess.crash": "L'host dell'estensione è stato terminato in modo imprevisto.",
-	"extensionHostProcess.unresponsiveCrash": "L'host dell'estensione è stato terminato perché non rispondeva.",
-	"devTools": "Apri strumenti di sviluppo",
-	"restart": "Riavvia host dell'estensione",
-	"overwritingExtension": "Sovrascrittura dell'estensione {0} con {1}.",
-	"extensionUnderDevelopment": "Caricamento dell'estensione di sviluppo in {0}",
-	"extensionCache.invalid": "Le estensioni sono state modificate sul disco. Si prega di ricaricare la finestra.",
-	"reloadWindow": "Ricarica finestra"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/services/extensions/node/extensionPoints.i18n.json b/i18n/ita/src/vs/workbench/services/extensions/node/extensionPoints.i18n.json
deleted file mode 100644
index ac765a33125..00000000000
--- a/i18n/ita/src/vs/workbench/services/extensions/node/extensionPoints.i18n.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"jsonParseFail": "Non è stato possibile analizzare {0}: {1}.",
-	"fileReadFail": "Non è possibile leggere il file {0}: {1}.",
-	"jsonsParseReportErrors": "Non è stato possibile analizzare {0}: {1}.",
-	"missingNLSKey": "Il messaggio per la chiave {0} non è stato trovato.",
-	"notSemver": "La versione dell'estensione non è compatibile con semver.",
-	"extensionDescription.empty": "La descrizione dell'estensione restituita è vuota",
-	"extensionDescription.publisher": "la proprietà `{0}` è obbligatoria e deve essere di tipo `string`",
-	"extensionDescription.name": "la proprietà `{0}` è obbligatoria e deve essere di tipo `string`",
-	"extensionDescription.version": "la proprietà `{0}` è obbligatoria e deve essere di tipo `string`",
-	"extensionDescription.engines": "la proprietà `{0}` è obbligatoria e deve essere di tipo `object`",
-	"extensionDescription.engines.vscode": "la proprietà `{0}` è obbligatoria e deve essere di tipo `string`",
-	"extensionDescription.extensionDependencies": "la proprietà `{0}` può essere omessa o deve essere di tipo `string[]`",
-	"extensionDescription.activationEvents1": "la proprietà `{0}` può essere omessa o deve essere di tipo `string[]`",
-	"extensionDescription.activationEvents2": "le proprietà `{0}` e `{1}` devono essere specificate o omesse entrambi",
-	"extensionDescription.main1": "la proprietà `{0}` può essere omessa o deve essere di tipo `string`",
-	"extensionDescription.main2": "Valore previsto di `main` ({0}) da includere nella cartella dell'estensione ({1}). L'estensione potrebbe non essere più portatile.",
-	"extensionDescription.main3": "le proprietà `{0}` e `{1}` devono essere specificate o omesse entrambi"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/services/files/electron-browser/fileService.i18n.json b/i18n/ita/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
deleted file mode 100644
index 9d7b1a95836..00000000000
--- a/i18n/ita/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"netVersionError": "Microsoft .NET Framework 4.5 è obbligatorio. Selezionare il collegamento per installarlo.",
-	"installNet": "Scarica .NET Framework 4.5",
-	"neverShowAgain": "Non visualizzare più questo messaggio",
-	"enospcError": "{0} non è in grado di controllare le modifiche di una grande area di lavoro. Per risolvere questo problema, seguire il collegamento alle istruzioni. ",
-	"learnMore": "Istruzioni",
-	"fileInvalidPath": "Risorsa del file non valida ({0})",
-	"fileIsDirectoryError": "Il File è una Directory",
-	"fileNotModifiedError": "File non modificato dal giorno",
-	"fileTooLargeForHeapError": "Per aprire un file di queste dimensioni, è necessario riavviare VS Code e consentirgli di usare più memoria",
-	"fileTooLargeError": "File troppo grande per essere aperto",
-	"fileNotFoundError": "Il file non è stato trovato ({0})",
-	"fileBinaryError": "Il file sembra essere binario e non può essere aperto come file di testo",
-	"filePermission": "Autorizzazione di scrittura sul file negata ({0}) ",
-	"fileExists": "Il file da creare esiste già ({0})",
-	"fileModifiedError": "File modificato da",
-	"fileReadOnlyError": "Il file è di sola lettura",
-	"fileMoveConflict": "Non è possibile eseguire operazioni di spostamento/copia. Il file esiste già nella destinazione.",
-	"unableToMoveCopyError": "Non è possibile eseguire operazioni di spostamento/copia. Il file sostituirebbe la cartella in cui è contenuto.",
-	"binFailed": "Non è stato possibile spostare '{0}' nel Cestino",
-	"trashFailed": "Non è stato possibile spostare '{0}' nel Cestino"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json b/i18n/ita/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
deleted file mode 100644
index b25e5dc4490..00000000000
--- a/i18n/ita/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"invalidPath": "Il percorso della risorsa '{0}' deve essere assoluto",
-	"fileNotFoundError": "Il file non è stato trovato ({0})",
-	"fileIsDirectoryError": "Il File è una Directory",
-	"fileNotModifiedError": "File non modificato dal giorno",
-	"fileBinaryError": "Il file sembra essere binario e non può essere aperto come file di testo",
-	"err.create": "Non è stato possibile creare il file {0}",
-	"fileMoveConflict": "Non è possibile eseguire operazioni di spostamento/copia. Il file esiste già nella destinazione."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/services/files/node/fileService.i18n.json b/i18n/ita/src/vs/workbench/services/files/node/fileService.i18n.json
deleted file mode 100644
index e98cc6a8898..00000000000
--- a/i18n/ita/src/vs/workbench/services/files/node/fileService.i18n.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"fileInvalidPath": "Risorsa del file non valida ({0})",
-	"fileIsDirectoryError": "Il File è una Directory",
-	"fileNotModifiedError": "File non modificato dal giorno",
-	"fileTooLargeError": "File troppo grande per essere aperto",
-	"fileNotFoundError": "Il file non è stato trovato ({0})",
-	"fileBinaryError": "Il file sembra essere binario e non può essere aperto come file di testo",
-	"filePermission": "Autorizzazione di scrittura sul file negata ({0}) ",
-	"fileExists": "Il file da creare esiste già ({0})",
-	"fileMoveConflict": "Non è possibile eseguire operazioni di spostamento/copia. Il file esiste già nella destinazione.",
-	"unableToMoveCopyError": "Non è possibile eseguire operazioni di spostamento/copia. Il file sostituirebbe la cartella in cui è contenuto.",
-	"foldersCopyError": "Non è possibile copiare le cartelle nell'area di lavoro. Selezionare i singoli file per copiarli.",
-	"fileModifiedError": "File modificato da",
-	"fileReadOnlyError": "Il file è di sola lettura"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/services/jsonschemas/common/jsonValidationExtensionPoint.i18n.json b/i18n/ita/src/vs/workbench/services/jsonschemas/common/jsonValidationExtensionPoint.i18n.json
deleted file mode 100644
index d1d60c618b4..00000000000
--- a/i18n/ita/src/vs/workbench/services/jsonschemas/common/jsonValidationExtensionPoint.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"contributes.jsonValidation": "Configurazione dello schema JSON per contributes.",
-	"contributes.jsonValidation.fileMatch": "Criteri dei file da soddisfare, ad esempio \"package.json\" o \"*.launch\".",
-	"contributes.jsonValidation.url": "URL dello schema ('http:', 'https:') o percorso relativo della cartella delle estensioni ('./').",
-	"invalid.jsonValidation": "'configuration.jsonValidation' deve essere una matrice",
-	"invalid.fileMatch": "'configuration.jsonValidation.fileMatch' deve essere definito",
-	"invalid.url": "'configuration.jsonValidation.url' deve essere un URL o un percorso relativo",
-	"invalid.url.fileschema": "'configuration.jsonValidation.url' è un URL relativo non valido: {0}",
-	"invalid.url.schema": "'configuration.jsonValidation.url' deve iniziare con 'http:', 'https:' o './' per fare riferimento agli schemi presenti nell'estensione"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/services/keybinding/common/keybindingEditing.i18n.json b/i18n/ita/src/vs/workbench/services/keybinding/common/keybindingEditing.i18n.json
deleted file mode 100644
index 82e6a7b770b..00000000000
--- a/i18n/ita/src/vs/workbench/services/keybinding/common/keybindingEditing.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"errorKeybindingsFileDirty": "Non è possibile scrivere perché il file di configurazione dei tasti di scelta rapida è stato modificato. Salvarlo prima e quindi riprovare.",
-	"parseErrors": "Non è possibile scrivere nel file di configurazione dei tasti di scelta rapida. Aprirlo e correggere gli errori/avvisi nel file, quindi riprovare.",
-	"errorInvalidConfiguration": "Non è possibile scrivere nel file di configurazione dei tasti di scelta rapida. Contiene un oggetto non di tipo Array. Aprire il file per pulirlo e riprovare.",
-	"emptyKeybindingsHeader": "Inserire i tasti di scelta rapida in questo file per sovrascrivere i valori predefiniti"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/services/keybinding/electron-browser/keybindingService.i18n.json b/i18n/ita/src/vs/workbench/services/keybinding/electron-browser/keybindingService.i18n.json
deleted file mode 100644
index d5c4ae6fc0c..00000000000
--- a/i18n/ita/src/vs/workbench/services/keybinding/electron-browser/keybindingService.i18n.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"nonempty": "è previsto un valore non vuoto.",
-	"requirestring": "la proprietà `{0}` è obbligatoria e deve essere di tipo `string`",
-	"optstring": "la proprietà `{0}` può essere omessa o deve essere di tipo `string`",
-	"vscode.extension.contributes.keybindings.command": "Identificatore del comando da eseguire quando si attiva il tasto di scelta rapida.",
-	"vscode.extension.contributes.keybindings.key": "Tasto o sequenza di tasti (separare i tasti con un segno di addizione e le sequenze con uno spazio, ad esempio CTRL+O e CTRL+L L per una combinazione).",
-	"vscode.extension.contributes.keybindings.mac": "Tasto o sequenza di tasti specifica di Mac.",
-	"vscode.extension.contributes.keybindings.linux": "Tasto o sequenza di tasti specifica di Linux.",
-	"vscode.extension.contributes.keybindings.win": "Tasto o sequenza di tasti specifica di Windows.",
-	"vscode.extension.contributes.keybindings.when": "Condizione quando il tasto è attivo.",
-	"vscode.extension.contributes.keybindings": "Tasti di scelta rapida per contributes.",
-	"invalid.keybindings": "Il valore di `contributes.{0}` non è valido: {1}",
-	"unboundCommands": "Altri comandi disponibili: ",
-	"keybindings.json.title": "Configurazione dei tasti di scelta rapida",
-	"keybindings.json.key": "Tasto o sequenza di tasti (separati da spazio)",
-	"keybindings.json.command": "Nome del comando da eseguire",
-	"keybindings.json.when": "Condizione quando il tasto è attivo.",
-	"keybindings.json.args": "Argomenti da passare al comando da eseguire.",
-	"keyboardConfigurationTitle": "Tastiera",
-	"dispatch": "Controlla la logica di invio delle pressioni di tasti da usare, tra `code` (scelta consigliata) e `keyCode`.",
-	"touchbar.enabled": "Abilita i pulsanti della Touch Bar di OSX sulla tastiera se possibile"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/services/message/browser/messageList.i18n.json b/i18n/ita/src/vs/workbench/services/message/browser/messageList.i18n.json
deleted file mode 100644
index 3a6ab20e94a..00000000000
--- a/i18n/ita/src/vs/workbench/services/message/browser/messageList.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"alertErrorMessage": "Errore: {0}",
-	"alertWarningMessage": "Avviso: {0}",
-	"alertInfoMessage": "Info: {0}",
-	"error": "Errore",
-	"warning": "Avviso",
-	"info": "Informazioni",
-	"close": "Chiudi"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/services/message/electron-browser/messageService.i18n.json b/i18n/ita/src/vs/workbench/services/message/electron-browser/messageService.i18n.json
deleted file mode 100644
index bb1f14b4fcf..00000000000
--- a/i18n/ita/src/vs/workbench/services/message/electron-browser/messageService.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"yesButton": "&&Sì",
-	"cancelButton": "Annulla"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/services/mode/common/workbenchModeService.i18n.json b/i18n/ita/src/vs/workbench/services/mode/common/workbenchModeService.i18n.json
deleted file mode 100644
index 0cd8d8c2d20..00000000000
--- a/i18n/ita/src/vs/workbench/services/mode/common/workbenchModeService.i18n.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.contributes.languages": "Dichiarazioni del linguaggio per contributes.",
-	"vscode.extension.contributes.languages.id": "ID del linguaggio.",
-	"vscode.extension.contributes.languages.aliases": "Alias di nome per il linguaggio.",
-	"vscode.extension.contributes.languages.extensions": "Estensioni di file associate al linguaggio.",
-	"vscode.extension.contributes.languages.filenames": "Nomi file associati al linguaggio.",
-	"vscode.extension.contributes.languages.filenamePatterns": "Criteri GLOB dei nomi file associati al linguaggio.",
-	"vscode.extension.contributes.languages.mimetypes": "Tipi MIME associati al linguaggio.",
-	"vscode.extension.contributes.languages.firstLine": "Espressione regolare corrispondente alla prima riga di un file del linguaggio.",
-	"vscode.extension.contributes.languages.configuration": "Percorso relativo di un file che contiene le opzioni di configurazione per il linguaggio.",
-	"invalid": "Il valore di `contributes.{0}` non è valido. È prevista una matrice.",
-	"invalid.empty": "Il valore di `contributes.{0}` è vuoto",
-	"require.id": "la proprietà `{0}` è obbligatoria e deve essere di tipo `string`",
-	"opt.extensions": "la proprietà `{0}` può essere omessa e deve essere di tipo `string[]`",
-	"opt.filenames": "la proprietà `{0}` può essere omessa e deve essere di tipo `string[]`",
-	"opt.firstLine": "la proprietà `{0}` può essere omessa e deve essere di tipo `string`",
-	"opt.configuration": "la proprietà `{0}` può essere omessa e deve essere di tipo `string`",
-	"opt.aliases": "la proprietà `{0}` può essere omessa e deve essere di tipo `string[]`",
-	"opt.mimetypes": "la proprietà `{0}` può essere omessa e deve essere di tipo `string[]`"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/services/progress/browser/progressService2.i18n.json b/i18n/ita/src/vs/workbench/services/progress/browser/progressService2.i18n.json
deleted file mode 100644
index 4fa1f89e7ff..00000000000
--- a/i18n/ita/src/vs/workbench/services/progress/browser/progressService2.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"progress.subtitle": "{0} - {1}",
-	"progress.title": "{0}: {1}",
-	"cancel": "Annulla"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/services/textMate/electron-browser/TMGrammars.i18n.json b/i18n/ita/src/vs/workbench/services/textMate/electron-browser/TMGrammars.i18n.json
deleted file mode 100644
index d8c6c0c8a17..00000000000
--- a/i18n/ita/src/vs/workbench/services/textMate/electron-browser/TMGrammars.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.contributes.grammars": "Tokenizer TextMate per contributes.",
-	"vscode.extension.contributes.grammars.language": "Identificatore di linguaggio per cui si aggiunge come contributo questa sintassi.",
-	"vscode.extension.contributes.grammars.scopeName": "Nome dell'ambito TextMate usato dal file tmLanguage.",
-	"vscode.extension.contributes.grammars.path": "Percorso del file tmLanguage. È relativo alla cartella delle estensioni e in genere inizia con './syntaxes/'.",
-	"vscode.extension.contributes.grammars.embeddedLanguages": "Mapping tra nome ambito e ID linguaggio se questa grammatica contiene linguaggi incorporati.",
-	"vscode.extension.contributes.grammars.tokenTypes": "Mapping tra nome di ambito e tipi di token.",
-	"vscode.extension.contributes.grammars.injectTo": "Elenco di nomi di ambito del linguaggio in cui viene inserita questa grammatica."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/services/textMate/electron-browser/TMSyntax.i18n.json b/i18n/ita/src/vs/workbench/services/textMate/electron-browser/TMSyntax.i18n.json
deleted file mode 100644
index 1c4e6bd4f78..00000000000
--- a/i18n/ita/src/vs/workbench/services/textMate/electron-browser/TMSyntax.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"invalid.language": "Il linguaggio in `contributes.{0}.language` è sconosciuto. Valore specificato: {1}",
-	"invalid.scopeName": "È previsto un valore stringa in `contributes.{0}.scopeName`. Valore specificato: {1}",
-	"invalid.path.0": "È previsto un valore stringa in `contributes.{0}.path`. Valore specificato: {1}",
-	"invalid.injectTo": "Il valore in `contributes.{0}.injectTo` non è valido. Deve essere una matrice di nomi di ambito del linguaggio. Valore specificato: {1}",
-	"invalid.embeddedLanguages": "Il valore in `contributes.{0}.embeddedLanguages` non è valido. Deve essere un mapping di oggetti tra nome ambito e linguaggio. Valore specificato: {1}",
-	"invalid.tokenTypes": "Il valore in `contributes.{0}.tokenTypes` non è valido. Deve essere un mapping di oggetti tra nome ambito e tipo di token. Valore specificato: {1}",
-	"invalid.path.1": "Valore previsto di `contributes.{0}.path` ({1}) da includere nella cartella dell'estensione ({2}). L'estensione potrebbe non essere più portatile.",
-	"no-tm-grammar": "Non è stata registrata alcuna grammatica TM per questo linguaggio."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/services/textfile/common/textFileEditorModel.i18n.json b/i18n/ita/src/vs/workbench/services/textfile/common/textFileEditorModel.i18n.json
deleted file mode 100644
index bd17979304a..00000000000
--- a/i18n/ita/src/vs/workbench/services/textfile/common/textFileEditorModel.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"saveFileFirst": "Il file è modificato ma non salvato. Salvarlo prima di riaprirlo con un'altra codifica.",
-	"genericSaveError": "Non è stato possibile salvare '{0}': {1}"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/services/textfile/common/textFileService.i18n.json b/i18n/ita/src/vs/workbench/services/textfile/common/textFileService.i18n.json
deleted file mode 100644
index fb052d8b3fd..00000000000
--- a/i18n/ita/src/vs/workbench/services/textfile/common/textFileService.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"files.backup.failSave": "Non è stato possibile scrivere i file che sono stati modificati nel percorso di backup (errore: {0}). provare a salvare i file prima e quindi uscire."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json b/i18n/ita/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json
deleted file mode 100644
index bd90eec60a7..00000000000
--- a/i18n/ita/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"saveChangesMessage": "Salvare le modifiche apportate a {0}?",
-	"saveChangesMessages": "Salvare le modifiche apportate ai file seguenti di {0}?",
-	"saveAll": "&&Salva tutto",
-	"save": "&&Salva",
-	"dontSave": "&&Non salvare",
-	"cancel": "Annulla",
-	"saveChangesDetail": "Le modifiche apportate andranno perse se non vengono salvate.",
-	"allFiles": "Tutti i file",
-	"noExt": "Nessuna estensione"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/services/themes/common/colorExtensionPoint.i18n.json b/i18n/ita/src/vs/workbench/services/themes/common/colorExtensionPoint.i18n.json
deleted file mode 100644
index 3c84f247f78..00000000000
--- a/i18n/ita/src/vs/workbench/services/themes/common/colorExtensionPoint.i18n.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"contributes.color": "Aggiunge colori tematizzabili alle estensioni definite",
-	"contributes.color.id": "Identificatore del colore che supporta i temi",
-	"contributes.color.id.format": "Gli identificativi devono rispettare il formato aa[.bb]*",
-	"contributes.color.description": "Descrizione del colore che supporta i temi",
-	"contributes.defaults.light": "Colore predefinito per i temi chiari. Può essere un valore di colore in formato esadecimale (#RRGGBB[AA]) oppure l'identificativo di un colore che supporta i temi e fornisce l'impostazione predefinita.",
-	"contributes.defaults.dark": "Colore predefinito per i temi scuri. Può essere un valore di colore in formato esadecimale (#RRGGBB[AA]) oppure l'identificativo di un colore che supporta i temi e fornisce l'impostazione predefinita.",
-	"contributes.defaults.highContrast": "Colore predefinito per i temi a contrasto elevato. Può essere un valore di colore in formato esadecimale (#RRGGBB[AA]) oppure l'identificativo di un colore che supporta i temi e fornisce l'impostazione predefinita.",
-	"invalid.colorConfiguration": "'configuration.colors' deve essere un array",
-	"invalid.default.colorType": "{0} deve essere un valore di colore in formato esadecimale (#RRGGBB [AA] o #RGB[A]) o l'identificativo di un colore che supporta i temi e che fornisce il valore predefinito. ",
-	"invalid.id": "'configuration.colors.id' deve essere definito e non può essere vuoto",
-	"invalid.id.format": "'configuration.colors.id' deve essere specificato dopo parola[.parola]*",
-	"invalid.description": "'configuration.colors.description' deve essere definito e non può essere vuoto",
-	"invalid.defaults": "'configuration.colors.defaults' deve essere definito e deve contenere 'light', 'dark' e 'highContrast'"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/services/themes/common/colorThemeSchema.i18n.json b/i18n/ita/src/vs/workbench/services/themes/common/colorThemeSchema.i18n.json
deleted file mode 100644
index ca82bab7411..00000000000
--- a/i18n/ita/src/vs/workbench/services/themes/common/colorThemeSchema.i18n.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"schema.token.settings": "Colori e stili per il token.",
-	"schema.token.foreground": "Colore primo piano per il token.",
-	"schema.token.background.warning": "I colori di sfondo del token non sono supportati.",
-	"schema.token.fontStyle": "Stile del carattere della regola: 'italic', 'bold' o 'underline' o una combinazione. Con una stringa vuota le impostazioni ereditate vengono annullate.",
-	"schema.fontStyle.error": "Lo stile del carattere deve 'italic', 'bold' o 'underline' oppure una combinazione di tali impostazioni oppure la stringa vuota.",
-	"schema.token.fontStyle.none": "Nessuno (cancella lo stile ereditato)",
-	"schema.properties.name": "Descrizione della regola.",
-	"schema.properties.scope": "Selettore di ambito usato per la corrispondenza della regola.",
-	"schema.tokenColors.path": "Percorso di un file tmTheme (relativo al file corrente).",
-	"schema.colors": "Colori per l'evidenziazione della sintassi"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/services/themes/common/fileIconThemeSchema.i18n.json b/i18n/ita/src/vs/workbench/services/themes/common/fileIconThemeSchema.i18n.json
deleted file mode 100644
index 84a536773a0..00000000000
--- a/i18n/ita/src/vs/workbench/services/themes/common/fileIconThemeSchema.i18n.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"schema.folderExpanded": "Icona di cartella per le cartelle espanse. L'icona di cartella espansa è facoltativa. Se non è impostata, verrà visualizzata l'icona definita per la cartella.",
-	"schema.folder": "Icona di cartella per le cartelle compresse e anche per quelle espanse se folderExpanded non è impostato.",
-	"schema.file": "Icona del file predefinita, visualizzata per tutti i file che non corrispondono ad alcuna estensione, nome file o ID lingua.",
-	"schema.folderNames": "Associa i nomi di cartella alle icone. La chiave dell'oggetto è il nome della cartella, escludendo eventuali segmenti di percorso. Non sono consentiti criteri o caratteri jolly. Per la corrispondenza dei nomi di cartella non viene fatta distinzione tra maiuscole e minuscole.",
-	"schema.folderName": "ID della definizione di icona per l'associazione.",
-	"schema.folderNamesExpanded": "Associa i nomi di cartella alle icone per le cartelle espanse. La chiave dell'oggetto è il nome della cartella, escludendo eventuali segmenti di percorso. Non sono consentiti criteri o caratteri jolly. Per la corrispondenza dei nomi di cartella non viene fatta distinzione tra maiuscole e minuscole.",
-	"schema.folderNameExpanded": "ID della definizione di icona per l'associazione.",
-	"schema.fileExtensions": "Associa le estensioni di file alle icone. La chiave dell'oggetto è il nome dell'estensione di file. Il nome dell'estensione corrisponde all'ultimo segmento di un nome file presente dopo l'ultimo punto (escludendo il punto). Per il confronto delle estensioni non viene fatta distinzione tra maiuscole e minuscole.",
-	"schema.fileExtension": "ID della definizione di icona per l'associazione.",
-	"schema.fileNames": "Associa i nomi file alle icone. La chiave dell'oggetto è il nome file completo, escludendo eventuali segmenti di percorso. Il nome file può includere punti e una possibile estensione. Non sono consentiti criteri o caratteri jolly. Per la corrispondenza dei nomi file non viene fatta distinzione tra maiuscole e minuscole.",
-	"schema.fileName": "ID della definizione di icona per l'associazione.",
-	"schema.languageIds": "Associa i linguaggi alle icone. La chiave dell'oggetto è l'ID linguaggio definito nel punto di aggiunta contributo del linguaggio.",
-	"schema.languageId": "ID della definizione di icona per l'associazione.",
-	"schema.fonts": "Tipi di carattere usati nelle definizioni di icona.",
-	"schema.id": "ID del tipo di carattere.",
-	"schema.src": "Percorso del tipo di carattere.",
-	"schema.font-path": "Percorso del tipo di carattere, relativo al file del tema dell'icona corrente.",
-	"schema.font-format": "Formato del tipo di carattere.",
-	"schema.font-weight": "Spessore del carattere.",
-	"schema.font-sstyle": "Stile del tipo di carattere.",
-	"schema.font-size": "Dimensioni predefinite del tipo di carattere.",
-	"schema.iconDefinitions": "Descrizione di tutte le icone utilizzabili quando si associano file a icone.",
-	"schema.iconDefinition": "Definizione di icona. La chiave dell'oggetto è l'ID della definizione.",
-	"schema.iconPath": "Quando si usa un file SVG o PNG: percorso dell'immagine. Il percorso è relativo al file impostato dell'icona.",
-	"schema.fontCharacter": "Quando si usa un tipo di carattere glifo: carattere nel tipo di carattere da usare.",
-	"schema.fontColor": "Quando si usa un tipo di carattere glifo: colore da usare.",
-	"schema.fontSize": "Quando si usa un tipo di carattere: dimensioni del carattere in percentuale rispetto al tipo di carattere del testo. Se non è impostato, per impostazione predefinita vengono usate le dimensioni della definizione del tipo di carattere.",
-	"schema.fontId": "Quando si usa un tipo di carattere: ID del tipo di carattere. Se non è impostato, per impostazione predefinita viene usata la prima definizione del tipo di carattere.",
-	"schema.light": "Associazioni facoltative per le icone di file in temi colore chiari.",
-	"schema.highContrast": "Associazioni facoltative per le icone di file in temi colore a contrasto elevato.",
-	"schema.hidesExplorerArrows": "Determina se le frecce dell'esploratore di file devono essere nascoste quando è attivo questo tema."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/services/themes/electron-browser/colorThemeData.i18n.json b/i18n/ita/src/vs/workbench/services/themes/electron-browser/colorThemeData.i18n.json
deleted file mode 100644
index 152b492e56b..00000000000
--- a/i18n/ita/src/vs/workbench/services/themes/electron-browser/colorThemeData.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"error.cannotparsejson": "Problemi durante l'analisi del file di tema di JSON: {0}",
-	"error.invalidformat.colors": "Si è verificato un problema durante l'analisi del file di tema {0}. La proprietà 'colors' non è di tipo 'object'.",
-	"error.invalidformat.tokenColors": "Si è verificato un problema durante l'analisi del file del tema colori {0}. La proprietà 'tokenColors' deve essere una matrice che specifica colori oppure un percorso di un file di tema TextMate",
-	"error.plist.invalidformat": "Si è verificato un problema durante l'analisi del file tmTheme {0}. 'settings' non è una matrice.",
-	"error.cannotparse": "Si sono verificati problemi durante l'analisi del file tmTheme {0}",
-	"error.cannotload": "Si sono verificati problemi durante il caricamento del file tmTheme {0}: {1}"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/services/themes/electron-browser/colorThemeStore.i18n.json b/i18n/ita/src/vs/workbench/services/themes/electron-browser/colorThemeStore.i18n.json
deleted file mode 100644
index e57d265b9e4..00000000000
--- a/i18n/ita/src/vs/workbench/services/themes/electron-browser/colorThemeStore.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.contributes.themes": "Contributes textmate color themes.",
-	"vscode.extension.contributes.themes.id": "ID del tema dell'icona usato nelle impostazioni utente.",
-	"vscode.extension.contributes.themes.label": "Etichetta del tema colori visualizzata nell'interfaccia utente.",
-	"vscode.extension.contributes.themes.uiTheme": "Tema di base che definisce i colori nell'editor: 'vs' è il tema colori chiaro, mentre 'vs-dark' è il tema colori scuro e 'hc-black' è il tema a contrasto elevato scuro.",
-	"vscode.extension.contributes.themes.path": "Percorso del file tmTheme. È relativo alla cartella delle estensioni e corrisponde in genere a './themes/themeFile.tmTheme'.",
-	"reqarray": "Extension point `{0}` must be an array.",
-	"reqpath": "È previsto un valore stringa in `contributes.{0}.path`. Valore specificato: {1}",
-	"invalid.path.1": "Valore previsto di `contributes.{0}.path` ({1}) da includere nella cartella dell'estensione ({2}). L'estensione potrebbe non essere più portatile."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/services/themes/electron-browser/fileIconThemeData.i18n.json b/i18n/ita/src/vs/workbench/services/themes/electron-browser/fileIconThemeData.i18n.json
deleted file mode 100644
index 8582255d004..00000000000
--- a/i18n/ita/src/vs/workbench/services/themes/electron-browser/fileIconThemeData.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"error.cannotparseicontheme": "Problems parsing file icons file: {0}"
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/services/themes/electron-browser/fileIconThemeStore.i18n.json b/i18n/ita/src/vs/workbench/services/themes/electron-browser/fileIconThemeStore.i18n.json
deleted file mode 100644
index 65ed5a59fa6..00000000000
--- a/i18n/ita/src/vs/workbench/services/themes/electron-browser/fileIconThemeStore.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.contributes.iconThemes": "Contributes file icon themes.",
-	"vscode.extension.contributes.iconThemes.id": "ID del tema dell'icona usato nelle impostazioni utente.",
-	"vscode.extension.contributes.iconThemes.label": "Etichetta del tema dell'icona visualizzata nell'interfaccia utente.",
-	"vscode.extension.contributes.iconThemes.path": "Percorso del file di definizione del tema dell'icona. È relativo alla cartella delle estensioni e corrisponde in genere a './icons/awesome-icon-theme.json'.",
-	"reqarray": "Extension point `{0}` must be an array.",
-	"reqpath": "È previsto un valore stringa in `contributes.{0}.path`. Valore specificato: {1}",
-	"reqid": "È previsto un valore stringa in `contributes.{0}.id`. Valore specificato: {1}",
-	"invalid.path.1": "Valore previsto di `contributes.{0}.path` ({1}) da includere nella cartella dell'estensione ({2}). L'estensione potrebbe non essere più portatile."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json b/i18n/ita/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
deleted file mode 100644
index 59d0978a765..00000000000
--- a/i18n/ita/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"error.cannotloadtheme": "Unable to load {0}: {1}",
-	"colorTheme": "Specifies the color theme used in the workbench.",
-	"colorThemeError": "Theme is unknown or not installed.",
-	"iconTheme": "Specifica il tema dell'icona usato nell'area di lavoro oppure 'null' se non viene visualizzato alcun icona di file.",
-	"noIconThemeDesc": "No file icons",
-	"iconThemeError": "File icon theme is unknown or not installed.",
-	"workbenchColors": "Sostituisce i colori del tema colori attualmente selezionato.",
-	"editorColors.comments": "Imposta i colori e gli stili per i commenti",
-	"editorColors.strings": "Imposta i colori e gli stili per i valori letterali stringa.",
-	"editorColors.keywords": "Imposta i colori e gli stili per le parole chiave.",
-	"editorColors.numbers": "Imposta i colori e stili per i valori letterali numerici.",
-	"editorColors.types": "Imposta i colori e gli stili per i riferimenti e le dichiarazioni di tipo.",
-	"editorColors.functions": "Imposta i colori e gli stili per i riferimenti e le dichiarazioni di funzioni.",
-	"editorColors.variables": "Imposta i colori e gli stili per i riferimenti e le dichiarazioni di variabili.",
-	"editorColors.textMateRules": "Imposta i colori e gli stili usando le regole di creazione temi di TextMate (impostazione avanzata).",
-	"editorColors": "Sostituisce i colori dell'editor e lo stile dei font nel tema colori attualmente selezionato."
-}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json b/i18n/ita/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json
deleted file mode 100644
index 11167d34b3d..00000000000
--- a/i18n/ita/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"errorInvalidTaskConfiguration": "Impossibile scrivere nel file di configurazione dell'area di lavoro. Si prega di aprire il file per correggere eventuali errori/avvisi e riprovare.",
-	"errorWorkspaceConfigurationFileDirty": "Impossibile scrivere nel file di configurazione dell'area di lavoro, perché il file è sporco. Si prega di salvarlo e riprovare.",
-	"openWorkspaceConfigurationFile": "Apri configurazione dell'area di lavoro"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/azure-account/out/azure-account.i18n.json b/i18n/jpn/extensions/azure-account/out/azure-account.i18n.json
deleted file mode 100644
index 30b2830386c..00000000000
--- a/i18n/jpn/extensions/azure-account/out/azure-account.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"azure-account.copyAndOpen": "コピーして開く",
-	"azure-account.close": "閉じる",
-	"azure-account.login": "ログイン",
-	"azure-account.loginFirst": "最初にログインが必要です。",
-	"azure-account.userCodeFailed": "ユーザーコードの取得に失敗しました",
-	"azure-account.tokenFailed": "デバイス コードを持つトークンを取得",
-	"azure-account.tokenFromRefreshTokenFailed": "リフレッシュ トークンを含むトークンの取得"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/azure-account/out/extension.i18n.json b/i18n/jpn/extensions/azure-account/out/extension.i18n.json
deleted file mode 100644
index e643d542223..00000000000
--- a/i18n/jpn/extensions/azure-account/out/extension.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"azure-account.loggingIn": "Azure: ログイン...",
-	"azure-account.loggedIn": "Azure: {0}"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/bat/package.i18n.json b/i18n/jpn/extensions/bat/package.i18n.json
deleted file mode 100644
index 4a631398a58..00000000000
--- a/i18n/jpn/extensions/bat/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Windows バッチ言語の基礎",
-	"description": "Windows batch ファイル内でスニペット、構文ハイライト、かっこ一致、折りたたみを提供します。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/clojure/package.i18n.json b/i18n/jpn/extensions/clojure/package.i18n.json
deleted file mode 100644
index 452a9e3f777..00000000000
--- a/i18n/jpn/extensions/clojure/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Clojure の基本言語サポート",
-	"description": "Clojure ファイル内で構文ハイライト、かっこ一致を提供します。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/coffeescript/package.i18n.json b/i18n/jpn/extensions/coffeescript/package.i18n.json
deleted file mode 100644
index 8469f5de5b3..00000000000
--- a/i18n/jpn/extensions/coffeescript/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "CoffeeScript の基本言語サポート",
-	"description": "CoffeScript ファイル内でスニペット、構文ハイライト、かっこ一致、折りたたみを提供します。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/configuration-editing/out/extension.i18n.json b/i18n/jpn/extensions/configuration-editing/out/extension.i18n.json
deleted file mode 100644
index ccf09b53fff..00000000000
--- a/i18n/jpn/extensions/configuration-editing/out/extension.i18n.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"workspaceFolder": "VS Code で開いているフォルダーのパス",
-	"workspaceFolderBasename": "スラッシュ (/) を含まない VS Code で開いているフォルダーのパス",
-	"relativeFile": "${workspaceFolder} に相対的な現在開いているファイル",
-	"file": "現在開いているファイル",
-	"cwd": "タスク ランナー起動時の作業ディレクトリ",
-	"lineNumber": "アクティブなファイル内で選択している行の番号",
-	"selectedText": "アクティブなファイル内で選択しているテキスト",
-	"fileDirname": "現在開いているファイルのディレクトリ名",
-	"fileExtname": "現在開いているファイルの拡張子",
-	"fileBasename": "現在開いているファイルのベース名",
-	"fileBasenameNoExtension": "現在開いているファイルの拡張子を含まないベース名",
-	"exampleExtension": "例"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json b/i18n/jpn/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json
deleted file mode 100644
index e71ba067641..00000000000
--- a/i18n/jpn/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"activeEditorShort": "ファイル名 (例: myFile.txt)",
-	"activeEditorMedium": "ワークスペース フォルダーに相対的なファイルのパス (例: myFolder/myFile.txt)",
-	"activeEditorLong": "ファイルの完全なパス (例: /Users/Development/myProject/myFolder/myFile.txt)",
-	"rootName": "ワークスペースの名前 (例: myFolder または myWorkspace)",
-	"rootPath": "ワークスペースのファイル パス (例: /Users/Development/myWorkspace)",
-	"folderName": "ファイルが含まれているワークスペース フォルダーの名前 (例: myFolder)",
-	"folderPath": "ファイルが含まれているワークスペース フォルダーのファイル パス (例: /Users/Development/myFolder)",
-	"appName": "例: VS Code",
-	"dirty": "アクティブなエディターがダーティである場合のダーティ インジケーター",
-	"separator": "値のある変数で囲まれた場合にのみ表示される条件付き区切り記号 (' - ')",
-	"assocLabelFile": "当該拡張子のファイル",
-	"assocDescriptionFile": "ファイル名が glob パターンに一致するすべてのファイルを、指定された識別子の言語にマップします。",
-	"assocLabelPath": "当該パスのファイル",
-	"assocDescriptionPath": "絶対パスの glob パターンがパスに一致するすべてのファイルを、指定した識別子の言語にマップします。",
-	"fileLabel": "特定の拡張子のファイル",
-	"fileDescription": "特定のファイル拡張子を持つすべてのファイルと一致します。",
-	"filesLabel": "複数の拡張子のファイル",
-	"filesDescription": "いずれかのファイル拡張子を持つすべてのファイルと一致します。",
-	"derivedLabel": "同じ名前の同種のファイル",
-	"derivedDescription": "名前が同じで拡張子が異なる兄弟を持つファイルと一致します。",
-	"topFolderLabel": "特定の名前のフォルダー (最上位)",
-	"topFolderDescription": "特定の名前の最上位にあるフォルダーと一致します。",
-	"topFoldersLabel": "複数の名前のフォルダー (最上位)",
-	"topFoldersDescription": "複数の最上位フォルダーと一致します。",
-	"folderLabel": "特定の名前のフォルダー (任意の場所)",
-	"folderDescription": "任意の場所にある特定の名前のフォルダーと一致します。",
-	"falseDescription": "パターンを無効にします。",
-	"trueDescription": "パターンを有効にします。",
-	"siblingsDescription": "名前が同じで異なる拡張子を持つ同種のファイルと一致します。",
-	"languageSpecificEditorSettings": "言語固有のエディター設定",
-	"languageSpecificEditorSettingsDescription": "言語に対するエディター設定を上書きします"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/configuration-editing/package.i18n.json b/i18n/jpn/extensions/configuration-editing/package.i18n.json
deleted file mode 100644
index 95a0b875ebd..00000000000
--- a/i18n/jpn/extensions/configuration-editing/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "設定の編集機能",
-	"description": "設定、起動、そして拡張機能の推奨事項ファイルのような、構成ファイルの機能 (高度な IntelliSense、auto-fixing など) を提供します。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/cpp/package.i18n.json b/i18n/jpn/extensions/cpp/package.i18n.json
deleted file mode 100644
index 1aaab9dc95f..00000000000
--- a/i18n/jpn/extensions/cpp/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "C/C++ の基本言語サポート",
-	"description": "C/C++ ファイル内でスニペット、構文ハイライト、かっこ一致、折りたたみを提供します。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/csharp/package.i18n.json b/i18n/jpn/extensions/csharp/package.i18n.json
deleted file mode 100644
index 0e9a464c970..00000000000
--- a/i18n/jpn/extensions/csharp/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "C# の基本言語サポート",
-	"description": "C# ファイル内でスニペット、構文ハイライト、かっこ一致、折りたたみを提供します。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/css-language-features/client/out/cssMain.i18n.json b/i18n/jpn/extensions/css-language-features/client/out/cssMain.i18n.json
deleted file mode 100644
index 6d6b061cb73..00000000000
--- a/i18n/jpn/extensions/css-language-features/client/out/cssMain.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"cssserver.name": "CSS 言語サーバー",
-	"folding.start": "折りたたみ領域の開始",
-	"folding.end": "折りたたみ領域の終了"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/css-language-features/package.i18n.json b/i18n/jpn/extensions/css-language-features/package.i18n.json
deleted file mode 100644
index f77f0b75a07..00000000000
--- a/i18n/jpn/extensions/css-language-features/package.i18n.json
+++ /dev/null
@@ -1,81 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "CSS 言語機能",
-	"description": "CSS、LESS、SCSS ファイルに豊富な言語サポートを提供。",
-	"css.title": "CSS",
-	"css.lint.argumentsInColorFunction.desc": "無効なパラメーター数値",
-	"css.lint.boxModel.desc": "padding や border を使用するときに width や height を使用しないでください",
-	"css.lint.compatibleVendorPrefixes.desc": "ベンダー プレフィックス を使用するときは、他すべてのベンダー プレフィックスも必ず含めてください",
-	"css.lint.duplicateProperties.desc": "重複するスタイル定義を使用しないでください",
-	"css.lint.emptyRules.desc": "空の規則セットを使用しないでください",
-	"css.lint.float.desc": "'float' の使用を避けてください。float は脆弱な CSS につながり、レイアウトの一部が変更されたときに CSS が破損しやすくなります。",
-	"css.lint.fontFaceProperties.desc": "@font-face 規則で 'src' プロパティと 'font-family' プロパティを定義する必要があります",
-	"css.lint.hexColorLength.desc": "Hex には 3 つまたは 6 つの 16 進数が含まれる必要があります",
-	"css.lint.idSelector.desc": "セレクターには ID を含めないでください。これらの規則と HTML の結合が密接すぎます。",
-	"css.lint.ieHack.desc": "IE ハックは、IE7 以前をサポートする場合にのみ必要です",
-	"css.lint.important.desc": "!important は使用しないでください。これは CSS 全体の特定性が制御不能になり、リファクタリングが必要なことを示しています。",
-	"css.lint.importStatement.desc": "複数の Import ステートメントを同時に読み込むことはできません",
-	"css.lint.propertyIgnoredDueToDisplay.desc": "display によってプロパティを無視します。例: 'display: inline' の場合、width、height、margin-top、margin-bottom、float プロパティには効果がありません。",
-	"css.lint.universalSelector.desc": "ユニバーサル セレクター (*) を使用すると処理速度が低下することが分かっています",
-	"css.lint.unknownProperties.desc": "不明なプロパティ。",
-	"css.lint.unknownVendorSpecificProperties.desc": "不明なベンダー固有のプロパティ。",
-	"css.lint.vendorPrefix.desc": "ベンダー固有のプレフィックスを使用する場合は、標準のプロパティも含めます",
-	"css.lint.zeroUnits.desc": "0 に単位は必要ありません",
-	"css.trace.server.desc": "VS Code と CSS 言語サーバー間の通信をトレースします。",
-	"css.validate.title": "CSS の検証と問題の重大度を制御します。",
-	"css.validate.desc": "すべての検証を有効または無効にします",
-	"less.title": "LESS",
-	"less.lint.argumentsInColorFunction.desc": "無効なパラメーター数値",
-	"less.lint.boxModel.desc": "padding や border を使用するときに width や height を使用しないでください",
-	"less.lint.compatibleVendorPrefixes.desc": "ベンダー プレフィックス を使用するときは、他すべてのベンダー プレフィックスも必ず含めてください",
-	"less.lint.duplicateProperties.desc": "重複するスタイル定義を使用しないでください",
-	"less.lint.emptyRules.desc": "空の規則セットを使用しないでください",
-	"less.lint.float.desc": "'float' の使用を避けてください。float は脆弱な CSS につながり、レイアウトの一部が変更されたときに CSS が破損しやすくなります。",
-	"less.lint.fontFaceProperties.desc": "@font-face 規則で 'src' プロパティと 'font-family' プロパティを定義する必要があります",
-	"less.lint.hexColorLength.desc": "Hex には 3 つまたは 6 つの 16 進数が含まれる必要があります",
-	"less.lint.idSelector.desc": "セレクターには ID を含めないでください。これらの規則と HTML の結合が密接すぎます。",
-	"less.lint.ieHack.desc": "IE ハックは、IE7 以前をサポートする場合にのみ必要です",
-	"less.lint.important.desc": "!important は使用しないでください。これは CSS 全体の特定性が制御不能になり、リファクタリングが必要なことを示しています。",
-	"less.lint.importStatement.desc": "複数の Import ステートメントを同時に読み込むことはできません",
-	"less.lint.propertyIgnoredDueToDisplay.desc": "display によってプロパティを無視します。例: 'display: inline' の場合、width、height、margin-top、margin-bottom、float プロパティには効果がありません。",
-	"less.lint.universalSelector.desc": "ユニバーサル セレクター (*) を使用すると処理速度が低下することが分かっています",
-	"less.lint.unknownProperties.desc": "不明なプロパティ。",
-	"less.lint.unknownVendorSpecificProperties.desc": "不明なベンダー固有のプロパティ。",
-	"less.lint.vendorPrefix.desc": "ベンダー固有のプレフィックスを使用する場合は、標準のプロパティも含めます",
-	"less.lint.zeroUnits.desc": "0 に単位は必要ありません",
-	"less.validate.title": "LESS の検証と問題の重大度を制御します。",
-	"less.validate.desc": "すべての検証を有効または無効にします",
-	"scss.title": "SCSS (Sass)",
-	"scss.lint.argumentsInColorFunction.desc": "無効なパラメーター数値",
-	"scss.lint.boxModel.desc": "padding や border を使用するときに width や height を使用しないでください",
-	"scss.lint.compatibleVendorPrefixes.desc": "ベンダー プレフィックス を使用するときは、他すべてのベンダー プレフィックスも必ず含めてください",
-	"scss.lint.duplicateProperties.desc": "重複するスタイル定義を使用しないでください",
-	"scss.lint.emptyRules.desc": "空の規則セットを使用しないでください",
-	"scss.lint.float.desc": "'float' の使用を避けてください。float は脆弱な CSS につながり、レイアウトの一部が変更されたときに CSS が破損しやすくなります。",
-	"scss.lint.fontFaceProperties.desc": "@font-face 規則で 'src' プロパティと 'font-family' プロパティを定義する必要があります",
-	"scss.lint.hexColorLength.desc": "Hex には 3 つまたは 6 つの 16 進数が含まれる必要があります",
-	"scss.lint.idSelector.desc": "セレクターには ID を含めないでください。これらの規則と HTML の結合が密接すぎます。",
-	"scss.lint.ieHack.desc": "IE ハックは、IE7 以前をサポートする場合にのみ必要です",
-	"scss.lint.important.desc": "!important は使用しないでください。これは CSS 全体の特定性が制御不能になり、リファクタリングが必要なことを示しています。",
-	"scss.lint.importStatement.desc": "複数の Import ステートメントを同時に読み込むことはできません",
-	"scss.lint.propertyIgnoredDueToDisplay.desc": "display によってプロパティを無視します。例: 'display: inline' の場合、width、height、margin-top、margin-bottom、float プロパティには効果がありません。",
-	"scss.lint.universalSelector.desc": "ユニバーサル セレクター (*) を使用すると処理速度が低下することが分かっています",
-	"scss.lint.unknownProperties.desc": "不明なプロパティ。",
-	"scss.lint.unknownVendorSpecificProperties.desc": "不明なベンダー固有のプロパティ。",
-	"scss.lint.vendorPrefix.desc": "ベンダー固有のプレフィックスを使用する場合は、標準のプロパティも含めます",
-	"scss.lint.zeroUnits.desc": "0 に単位は必要ありません",
-	"scss.validate.title": "SCSS の検証と問題の重大度を制御します。",
-	"scss.validate.desc": "すべての検証を有効または無効にします",
-	"less.colorDecorators.enable.desc": "カラー デコレーターを有効または無効にします",
-	"scss.colorDecorators.enable.desc": "カラー デコレーターを有効または無効にします",
-	"css.colorDecorators.enable.desc": "カラー デコレーターを有効または無効にします",
-	"css.colorDecorators.enable.deprecationMessage": "設定 `css.colorDecorators.enable` は使用されなくなりました。`editor.colorDecorators` を使用してください。",
-	"scss.colorDecorators.enable.deprecationMessage": "設定 `scss.colorDecorators.enable` は使用されなくなりました。`editor.colorDecorators` を使用してください。",
-	"less.colorDecorators.enable.deprecationMessage": "設定 `less.colorDecorators.enable` は使用されなくなりました。`editor.colorDecorators` を使用してください。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/css/client/out/cssMain.i18n.json b/i18n/jpn/extensions/css/client/out/cssMain.i18n.json
deleted file mode 100644
index 6d6b061cb73..00000000000
--- a/i18n/jpn/extensions/css/client/out/cssMain.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"cssserver.name": "CSS 言語サーバー",
-	"folding.start": "折りたたみ領域の開始",
-	"folding.end": "折りたたみ領域の終了"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/css/package.i18n.json b/i18n/jpn/extensions/css/package.i18n.json
deleted file mode 100644
index afbe11a31b6..00000000000
--- a/i18n/jpn/extensions/css/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "CSS の基本言語サポート",
-	"description": "CSS、LESS、SCSS ファイル内で構文ハイライト、かっこ一致を提供します。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/diff/package.i18n.json b/i18n/jpn/extensions/diff/package.i18n.json
deleted file mode 100644
index 21985c70354..00000000000
--- a/i18n/jpn/extensions/diff/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Diff ファイルの言語機能",
-	"description": "Diff ファイル内で構文ハイライト、かっこ一致などの言語機能を提供"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/docker/package.i18n.json b/i18n/jpn/extensions/docker/package.i18n.json
deleted file mode 100644
index c12e263b0ec..00000000000
--- a/i18n/jpn/extensions/docker/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Docker ファイルの基本言語サポート",
-	"description": "Docker ファイル内で構文ハイライト、かっこ一致を提供します。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/emmet/package.i18n.json b/i18n/jpn/extensions/emmet/package.i18n.json
deleted file mode 100644
index 2ea428b8ba7..00000000000
--- a/i18n/jpn/extensions/emmet/package.i18n.json
+++ /dev/null
@@ -1,65 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"description": "VSCode の Emmet サポート",
-	"command.wrapWithAbbreviation": "ラップ変換",
-	"command.wrapIndividualLinesWithAbbreviation": "個々の行でラップ変換",
-	"command.removeTag": "タグの削除",
-	"command.updateTag": "タグの更新",
-	"command.matchTag": "一致するペアに移動",
-	"command.balanceIn": "バランス (内側)",
-	"command.balanceOut": "バランス (外側)",
-	"command.prevEditPoint": "前の編集点に移動",
-	"command.nextEditPoint": "次の編集点に移動",
-	"command.mergeLines": "行のマージ",
-	"command.selectPrevItem": "前の項目を選択",
-	"command.selectNextItem": "次の項目を選択",
-	"command.splitJoinTag": "タグの分割/結合",
-	"command.toggleComment": "コメントの切り替え",
-	"command.evaluateMathExpression": "数式の評価",
-	"command.updateImageSize": "イメージ サイズの更新",
-	"command.reflectCSSValue": "CSS 値を反映",
-	"command.incrementNumberByOne": "1 ずつ増加",
-	"command.decrementNumberByOne": "1 ずつ減少",
-	"command.incrementNumberByOneTenth": "0.1 ずつ増加",
-	"command.decrementNumberByOneTenth": "0.1 ずつ減少",
-	"command.incrementNumberByTen": "10 ずつ増加",
-	"command.decrementNumberByTen": "10 ずつ減少",
-	"emmetSyntaxProfiles": "指定した構文に対してプロファイルを定義するか、特定の規則がある独自のプロファイルをご使用ください。",
-	"emmetExclude": "Emmet 省略記法を展開すべきでない言語の配列。",
-	"emmetExtensionsPath": "Emmet のプロファイルとスニペットを含むフォルダーへのパス。",
-	"emmetShowExpandedAbbreviation": "展開された Emmet 省略記法を候補として表示します。\n\"inMarkupAndStylesheetFilesOnly\" オプションは、html、haml、jade、slim、xml、xsl、css、scss、sass、less、stylus に適用されます。\n\"always\" オプションは markup/css に関係なくファイルのすべての部分に適用されます。",
-	"emmetShowAbbreviationSuggestions": "利用できる Emmet 省略記法を候補として表示します。スタイルシートや emmet.showExpandedAbbreviation を \"never\" に設定していると適用されません。",
-	"emmetIncludeLanguages": "既定でサポートされていない言語で Emmet 略語を有効にします。ここに、その言語と Emmet でサポートされる言語のマッピングを追加します。\n 例: {\"vue-html\":\"html\"、\"javascript\":\"javascriptreact\"}",
-	"emmetVariables": "Emmet のスニペットで使用される変数",
-	"emmetTriggerExpansionOnTab": "有効にすると、TAB キーを押したときに Eemmet 省略記法が展開されます。",
-	"emmetPreferences": "Emmet の一部のアクションやリゾルバーの動作の変更に使用される基本設定。",
-	"emmetPreferencesIntUnit": "整数値に使用する既定の単位",
-	"emmetPreferencesFloatUnit": "float 値に使用する既定の単位",
-	"emmetPreferencesCssAfter": "CSS の略語を展開するときに CSS プロパティの末尾に配置されるシンボル",
-	"emmetPreferencesSassAfter": "Sass ファイルで CSS 略語を展開するときに CSS プロパティの末尾に配置されるシンボル",
-	"emmetPreferencesStylusAfter": "Stylus ファイルで CSS 略語を展開するときに CSS プロパティの末尾に配置されるシンボル",
-	"emmetPreferencesCssBetween": "CSS の略語を展開するときに CSS プロパティと値の間に配置されるシンボル ",
-	"emmetPreferencesSassBetween": "Sass ファイルで CSS の略語を展開するときに CSS プロパティと値の間に配置されるシンボル ",
-	"emmetPreferencesStylusBetween": "Stylus ファイルで CSS の略語を展開するときに CSS プロパティと値の間に配置されるシンボル ",
-	"emmetShowSuggestionsAsSnippets": "true の場合、Emmet 候補をスニペットとして表示して editor.snippetSuggestions 設定に従ってそれらを並び替えます。",
-	"emmetPreferencesBemElementSeparator": "BEM フィルターを利用時にクラス使用する Element の区切り文字 ",
-	"emmetPreferencesBemModifierSeparator": "BEM フィルターを利用時にクラス使用する Modifier の区切り文字",
-	"emmetPreferencesFilterCommentBefore": "コメント フィルター使用時、一致した要素の前に配置するコメントの定義。 ",
-	"emmetPreferencesFilterCommentAfter": "コメント フィルター使用時、一致した要素の後に配置するコメントの定義。",
-	"emmetPreferencesFilterCommentTrigger": "コメント フィルターに適用される略語に存在する属性名のカンマ区切りのリスト",
-	"emmetPreferencesFormatNoIndentTags": "内部インデントを取得しないタグ名の配列",
-	"emmetPreferencesFormatForceIndentTags": "内部インデントを常に取得するタグ名の配列",
-	"emmetPreferencesAllowCompactBoolean": "true の場合、 Boolean 型属性の短縮表記が生成されます",
-	"emmetPreferencesCssWebkitProperties": "Emmet 省略記法で使用される場合に `-` で始まる 'webkit' ベンダー プレフィックスを取得するカンマ区切りの CSS プロパティ。常に 'webkit' プレフィックスを避ける場合は空の文字列に設定します。",
-	"emmetPreferencesCssMozProperties": "Emmet 省略記法で使用される場合に `-` で始まる 'moz' ベンダー プレフィックスを取得するカンマ区切りの CSS プロパティ。常に 'moz' プレフィックスを避ける場合は空の文字列に設定します。",
-	"emmetPreferencesCssOProperties": "Emmet 省略記法で使用される場合に `-` で始まる 'o' ベンダー プレフィックスを取得するカンマ区切りの CSS プロパティ。常に 'o' プレフィックスを避ける場合は空の文字列に設定します。",
-	"emmetPreferencesCssMsProperties": "Emmet 省略記法で使用される場合に `-` で始まる 'ms' ベンダー プレフィックスを取得するカンマ区切りの CSS プロパティ。常に 'ms' プレフィックスを避ける場合は空の文字列に設定します。",
-	"emmetPreferencesCssFuzzySearchMinScore": "あいまい検索の省略形が達成すべき (0 から 1 の) 最小スコア。値が低ければ多くの誤検出が発生する可能性があります。値が高ければ一致する見込みが減る可能性があります。",
-	"emmetOptimizeStylesheetParsing": "false に設定すると、現在位置が Emmet 略語の展開位置として有効かどうかを判定するためにファイル全体を解析します。true に設定すると、css/scss/less ファイルの現在位置周辺のコンテンツのみを解析します。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/extension-editing/out/extensionLinter.i18n.json b/i18n/jpn/extensions/extension-editing/out/extensionLinter.i18n.json
deleted file mode 100644
index 29e11015a80..00000000000
--- a/i18n/jpn/extensions/extension-editing/out/extensionLinter.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"httpsRequired": "画像には HTTPS プロトコルを使用する必要があります。",
-	"svgsNotValid": "SVG は無効な画像のソースです。",
-	"embeddedSvgsNotValid": "埋め込み SVG は無効な画像のソースです。",
-	"dataUrlsNotValid": "Data URL は無効な画像のソースです。",
-	"relativeUrlRequiresHttpsRepository": "相対的な画像 URL では、HTTPS プロトコルのリポジトリが package.json で指定されている必要があります。",
-	"relativeIconUrlRequiresHttpsRepository": "アイコンは、HTTPS プロトコルのリポジトリがこの package.json で指定されている必要があります。 ",
-	"relativeBadgeUrlRequiresHttpsRepository": "相対的なバッジ URL では、HTTPS プロトコルのリポジトリが package.json で指定されている必要があります。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/extension-editing/out/packageDocumentHelper.i18n.json b/i18n/jpn/extensions/extension-editing/out/packageDocumentHelper.i18n.json
deleted file mode 100644
index ee1e98bfd27..00000000000
--- a/i18n/jpn/extensions/extension-editing/out/packageDocumentHelper.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"languageSpecificEditorSettings": "言語固有のエディター設定",
-	"languageSpecificEditorSettingsDescription": "言語に対するエディター設定を上書きします"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/extension-editing/package.i18n.json b/i18n/jpn/extensions/extension-editing/package.i18n.json
deleted file mode 100644
index a5a04889ab5..00000000000
--- a/i18n/jpn/extensions/extension-editing/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "パッケージ ファイルの編集機能",
-	"description": "VS Code の拡張ポイント向けの IntelliSense と、package.json ファイルでのリンティング機能を提供します。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/fsharp/package.i18n.json b/i18n/jpn/extensions/fsharp/package.i18n.json
deleted file mode 100644
index 6d591e732ee..00000000000
--- a/i18n/jpn/extensions/fsharp/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "F# の基本言語サポート",
-	"description": "F# ファイル内でスニペット、構文ハイライト、かっこ一致、折りたたみを提供します。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/git/out/askpass-main.i18n.json b/i18n/jpn/extensions/git/out/askpass-main.i18n.json
deleted file mode 100644
index c13f979d5ae..00000000000
--- a/i18n/jpn/extensions/git/out/askpass-main.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"missOrInvalid": "資格情報が見つからないか、無効です。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/git/out/autofetch.i18n.json b/i18n/jpn/extensions/git/out/autofetch.i18n.json
deleted file mode 100644
index 8f0a88a1e10..00000000000
--- a/i18n/jpn/extensions/git/out/autofetch.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"yes": "はい",
-	"no": "いいえ",
-	"not now": "後で通知する",
-	"suggest auto fetch": "Code が [定期的に 'git fetch']({0}) を実行してもよろしいですか?"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/git/out/commands.i18n.json b/i18n/jpn/extensions/git/out/commands.i18n.json
deleted file mode 100644
index 9e38217888f..00000000000
--- a/i18n/jpn/extensions/git/out/commands.i18n.json
+++ /dev/null
@@ -1,91 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"tag at": "{0} のタグ",
-	"remote branch at": "{0} でのリモート ブランチ",
-	"create branch": "$(plus) 新しいブランチを作成",
-	"repourl": "リポジトリ URL",
-	"selectFolder": "リポジトリの場所を選択",
-	"cloning": "Git リポジトリ '{0}' を複製しています...",
-	"proposeopen": "クローンしたリポジトリを開きますか?",
-	"openrepo": "リポジトリを開く",
-	"add": "ワークスペースに追加",
-	"proposeopen2": "複製したリポジトリを開きますか? または現在のワークスペースに追加しますか?",
-	"init": "Git リポジトリを初期化するワークスペース フォルダーを選択してください",
-	"init repo": "リポジトリの初期化",
-	"create repo": "リポジトリの初期化",
-	"are you sure": "'{0}' に Git リポジトリを作成します。続行してもよろしいですか?",
-	"HEAD not available": "'{0}' の HEAD バージョンは利用できません。",
-	"confirm stage files with merge conflicts": "マージの競合がある {0} 個のファイルをステージしてもよろしいですか?",
-	"confirm stage file with merge conflicts": "マージの競合がある {0} をステージしてもよろしいですか? ",
-	"yes": "はい",
-	"confirm revert": "{0} で選択した変更を元に戻しますか?",
-	"revert": "変更を元に戻す",
-	"discard": "変更を破棄",
-	"confirm delete": "本当に {0} を削除してもよろしいですか?",
-	"delete file": "ファイルを削除",
-	"confirm discard": "{0} の変更を破棄しますか?",
-	"confirm discard multiple": "{0} 個のファイルの変更内容を破棄しますか?",
-	"warn untracked": "未追跡ファイル {0} が削除されます!",
-	"confirm discard all single": "{0} の変更を破棄しますか?",
-	"confirm discard all": "{0} 個のファイルのすべての変更を破棄してもよろしいですか?\nこの変更は元に戻すことができません!\n現在のワーキング セットは永久に失われます。",
-	"discardAll multiple": "1 つのファイルを破棄",
-	"discardAll": "{0} 個のファイルをすべて破棄",
-	"confirm delete multiple": "本当に {0} 個のファイルを削除してもよろしいですか?",
-	"delete files": "複数のファイルを削除",
-	"there are untracked files single": "破棄すると次の未追跡ファイルがディスクから削除されます: {0}。",
-	"there are untracked files": "破棄すると {0} 個の未追跡ファイルがディスクから削除されます。",
-	"confirm discard all 2": "{0}\n\nこの変更は元に戻すことはできません。現在のワーキング セットは永久に失われます。",
-	"yes discard tracked": "1 つの追跡ファイルを破棄",
-	"yes discard tracked multiple": "{0} 個の追跡ファイルを破棄",
-	"unsaved files single": "次のファイルが保存されていません: {0}。\n\nコミット前に保存しますか?",
-	"unsaved files": "{0} 個の保存されていないファイルがあります。\n\nコミット前に保存しますか?",
-	"save and commit": "すべて保存してコミットする",
-	"commit": "とにかくコミットする",
-	"no staged changes": "コミットするステージされた変更がありません。\n\nすべての変更を自動的にステージして、直接コミットしますか?",
-	"always": "常に行う",
-	"no changes": "コミットする必要のある変更はありません。",
-	"commit message": "コミット メッセージ",
-	"provide commit message": "コミット メッセージを入力してください",
-	"select a ref to checkout": "チェックアウトする参照を選択",
-	"branch name": "ブランチ名",
-	"provide branch name": "ブランチ名を指定してください",
-	"select branch to delete": "削除するブランチの選択",
-	"confirm force delete branch": "ブランチ '{0}' はマージされていません。それでも削除しますか？",
-	"delete branch": "ブランチの削除",
-	"invalid branch name": "無効なブランチ名",
-	"branch already exists": "ブランチ名 '{0}' は既に存在します",
-	"select a branch to merge from": "マージ元のブランチを選択",
-	"merge conflicts": "マージの競合があります。コミットする前にこれを解決してください。",
-	"tag name": "タグ名",
-	"provide tag name": "タグ名を入力してください",
-	"tag message": "メッセージ",
-	"provide tag message": "注釈付きタグにつけるメッセージを入力してください",
-	"no remotes to fetch": "リポジトリには、フェッチ元として構成されているリモートがありません。",
-	"no remotes to pull": "リポジトリには、プル元として構成されているリモートがありません。",
-	"pick remote pull repo": "リモートを選んで、ブランチを次からプルします:",
-	"no remotes to push": "リポジトリには、プッシュ先として構成されているリモートがありません。",
-	"nobranch": "リモートにプッシュするブランチをチェックアウトしてください。",
-	"confirm publish branch": "'{0}' ブランチに上流ブランチはありません。このブランチを公開しますか?",
-	"ok": "OK",
-	"push with tags success": "タグが正常にプッシュされました。",
-	"pick remote": "リモートを選んで、ブランチ '{0}' を次に公開します:",
-	"sync is unpredictable": "このアクションはコミットを '{0}/{1}' との間でプッシュしたりプルしたりします。",
-	"never again": "OK、今後は表示しない",
-	"no remotes to publish": "リポジトリには、発行先として構成されているリモートがありません。",
-	"no changes stash": "スタッシュする変更がありません。",
-	"provide stash message": "必要に応じてスタッシュ メッセージを入力してください",
-	"stash message": "スタッシュ メッセージ",
-	"no stashes": "復元するスタッシュがありません。",
-	"pick stash to pop": "適用するスタッシュを選択してください",
-	"clean repo": "チェックアウトの前に、リポジトリの作業ツリーを消去してください。",
-	"cant push": "参照仕様をリモートにプッシュできません。最初に 'Pull' を実行して変更を統合してください。",
-	"git error details": "Git: {0}",
-	"git error": "Git エラー",
-	"open git log": "Git ログを開く"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/git/out/main.i18n.json b/i18n/jpn/extensions/git/out/main.i18n.json
deleted file mode 100644
index 0fab781f4ca..00000000000
--- a/i18n/jpn/extensions/git/out/main.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"looking": "Git を求めて次の場所を探しています: {0}",
-	"using git": "{1} から Git {0} を使用しています",
-	"downloadgit": "Git のダウンロード",
-	"neverShowAgain": "今後は表示しない",
-	"notfound": "Git が見つかりません。Git をインストールするか 'git.path' 設定でパスを構成してください。",
-	"updateGit": "Git の更新",
-	"git20": "git {0} がインストールされているようです。Code は Git 2 以上で最適に動作します"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/git/out/model.i18n.json b/i18n/jpn/extensions/git/out/model.i18n.json
deleted file mode 100644
index b58f38d95f2..00000000000
--- a/i18n/jpn/extensions/git/out/model.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"too many submodules": "'{0}' リポジトリに {1} 個のサブモジュールがあり、自動では開かれません。 ファイルを開くことで、それぞれを個別に開くことができます。",
-	"no repositories": "利用可能なリポジトリがありません",
-	"pick repo": "リポジトリの選択"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/git/out/repository.i18n.json b/i18n/jpn/extensions/git/out/repository.i18n.json
deleted file mode 100644
index 0bcce0f6123..00000000000
--- a/i18n/jpn/extensions/git/out/repository.i18n.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"open": "開く",
-	"index modified": "変更されたインデックス",
-	"modified": "変更済み",
-	"index added": "インデックスの追加",
-	"index deleted": "削除されたインデックス",
-	"deleted": "削除済み",
-	"index renamed": "インデックスの名前変更",
-	"index copied": "インデックスをコピー",
-	"untracked": "追跡対象外",
-	"ignored": "無視",
-	"both deleted": "双方とも削除",
-	"added by us": "こちら側による追加",
-	"deleted by them": "あちら側による削除",
-	"added by them": "あちら側による追加",
-	"deleted by us": "こちら側による削除",
-	"both added": "双方とも追加",
-	"both modified": "双方とも変更",
-	"commitMessage": "Message (press {0} to commit)",
-	"commit": "コミット",
-	"merge changes": "変更のマージ",
-	"staged changes": "ステージング済みの変更",
-	"changes": "変更",
-	"commitMessageCountdown": "現在の行で残り {0} 文字",
-	"commitMessageWarning": "現在の行で {1} から {0} 文字オーバー",
-	"neveragain": "今後は表示しない",
-	"huge": "'{0}' のGit リポジトリにアクティブな変更が多いため、 Git 機能の一部のみが有効になります。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/git/out/scmProvider.i18n.json b/i18n/jpn/extensions/git/out/scmProvider.i18n.json
deleted file mode 100644
index fe8b64ab93b..00000000000
--- a/i18n/jpn/extensions/git/out/scmProvider.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"commit": "コミット"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/git/out/statusbar.i18n.json b/i18n/jpn/extensions/git/out/statusbar.i18n.json
deleted file mode 100644
index bf0824d668b..00000000000
--- a/i18n/jpn/extensions/git/out/statusbar.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"checkout": "チェックアウト...",
-	"sync changes": "変更の同期",
-	"publish changes": "変更の発行",
-	"syncing changes": "変更を同期しています..."
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/git/package.i18n.json b/i18n/jpn/extensions/git/package.i18n.json
deleted file mode 100644
index 5f3a79c4800..00000000000
--- a/i18n/jpn/extensions/git/package.i18n.json
+++ /dev/null
@@ -1,87 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Git",
-	"description": "Git SCM統合",
-	"command.clone": "クローン",
-	"command.init": "リポジトリの初期化",
-	"command.close": "リポジトリを閉じる",
-	"command.refresh": "最新の情報に更新",
-	"command.openChange": "変更を開く",
-	"command.openFile": "ファイルを開く",
-	"command.openHEADFile": "HEAD のファイルを開く",
-	"command.stage": "変更のステージング",
-	"command.stageAll": "すべての変更をステージ",
-	"command.stageSelectedRanges": "選択した範囲をステージ",
-	"command.revertSelectedRanges": "選択範囲を元に戻す",
-	"command.stageChange": "変更のステージング",
-	"command.revertChange": "変更を元に戻す",
-	"command.unstage": "変更のステージング解除",
-	"command.unstageAll": "すべての変更のステージング解除",
-	"command.unstageSelectedRanges": "選択した範囲のステージを解除",
-	"command.clean": "変更を破棄",
-	"command.cleanAll": "すべての変更を破棄",
-	"command.commit": "Commit",
-	"command.commitStaged": "ステージング済みをコミット",
-	"command.commitStagedSigned": "コミットしてステージング (サインオフ)",
-	"command.commitStagedAmend": "コミットしてステージング (修正)",
-	"command.commitAll": "すべてコミット",
-	"command.commitAllSigned": "すべてコミット (サインオフ)",
-	"command.commitAllAmend": "すべてコミット (修正)",
-	"command.undoCommit": "前回のコミットを元に戻す",
-	"command.checkout": "チェックアウト先...",
-	"command.branch": "ブランチを作成...",
-	"command.deleteBranch": "ブランチの削除...",
-	"command.renameBranch": "ブランチ名の変更...",
-	"command.merge": "ブランチをマージ...",
-	"command.createTag": "タグを作成",
-	"command.fetch": "フェッチ",
-	"command.pull": "プル",
-	"command.pullRebase": "プル (リベース)",
-	"command.pullFrom": "指定元からプル...",
-	"command.push": "プッシュ",
-	"command.pushTo": "プッシュ先...",
-	"command.pushWithTags": "タグをつけてプッシュ",
-	"command.sync": "同期",
-	"command.syncRebase": "同期 (リベース)",
-	"command.publish": "ブランチの発行",
-	"command.showOutput": "Git 出力の表示",
-	"command.ignore": "ファイルを .gitignore に追加",
-	"command.stashIncludeUntracked": "スタッシュ (未追跡ファイルを含む)",
-	"command.stash": "スタッシュ",
-	"command.stashPop": "スタッシュを適用して削除...",
-	"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": "`Checkout to...` を実行するときに表示されるブランチの種類を制御します。`all` はすべての参照を表示します。`local` はローカル ブランチのみ、`tags`  はタグのみ、`remote` はリモート ブランチのみを表示します。 ",
-	"config.ignoreLegacyWarning": "旧 Git の警告を無視します",
-	"config.ignoreMissingGitWarning": "Git が見つからない場合の警告を無視します",
-	"config.ignoreLimitWarning": "リポジトリ内に変更が多い場合は警告を無視します",
-	"config.defaultCloneDirectory": "Git リポジトリをクローンする既定の場所",
-	"config.enableSmartCommit": "ステージされた変更がない場合はすべての変更をコミットします。",
-	"config.enableCommitSigning": "GPG によりデジタル署名されたコミットを有効にします。",
-	"config.discardAllScope": "'すべての変更を破棄' コマンドによってどの変更が破棄されるかを制御します。'all' はすべての変更を破棄します。 'tracked' は追跡されているファイルだけを破棄します。 'prompt' は、アクションが実行されるたびにプロンプ​​ト ダイアログを表示します。",
-	"config.decorations.enabled": "Git が配色とバッジをエクスプローラーと開いているエディターのビューに提供するかどうかを制御します。",
-	"config.promptToSaveFilesBeforeCommit": "コミット前に Git が保存していないファイルを確認すべきかどうかを制御します。",
-	"config.showInlineOpenFileAction": "Git 変更の表示内にインラインのファイルを開くアクションを表示するかどうかを制御します。",
-	"config.inputValidation": "コミット メッセージの入力検証をいつ表示するかを制御します。",
-	"config.detectSubmodules": "Git のサブモジュールを自動的に検出するかどうかを制御します。",
-	"config.detectSubmodulesLimit": "Git サブモジュールの検出の制限を制御します。",
-	"colors.modified": "リソースを改変した場合の配色",
-	"colors.deleted": "リソースを検出した場合の配色",
-	"colors.untracked": "リソースを追跡しない場合の配色",
-	"colors.ignored": "リソースを無視する場合の配色",
-	"colors.conflict": "リソースが競合する場合の配色",
-	"colors.submodule": "サブモジュールの配色。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/go/package.i18n.json b/i18n/jpn/extensions/go/package.i18n.json
deleted file mode 100644
index 3f97bde04dc..00000000000
--- a/i18n/jpn/extensions/go/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Go 言語の基礎",
-	"description": "Go ファイル内で構文ハイライト、かっこ一致を提供します。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/groovy/package.i18n.json b/i18n/jpn/extensions/groovy/package.i18n.json
deleted file mode 100644
index 0c6d0586213..00000000000
--- a/i18n/jpn/extensions/groovy/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Groovy の基本言語サポート",
-	"description": "Groovy ファイル内でスニペット、構文ハイライト、かっこ一致を提供します。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/grunt/out/main.i18n.json b/i18n/jpn/extensions/grunt/out/main.i18n.json
deleted file mode 100644
index 556e0d512ef..00000000000
--- a/i18n/jpn/extensions/grunt/out/main.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"execFailed": "フォルダ {0} でGrunt のエラーによる失敗を自動検出: {1}"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/grunt/package.i18n.json b/i18n/jpn/extensions/grunt/package.i18n.json
deleted file mode 100644
index a5a7ec48619..00000000000
--- a/i18n/jpn/extensions/grunt/package.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"description": "VS Code に Grunt 機能を追加する拡張機能。",
-	"displayName": "VSCode の Grunt サポート",
-	"config.grunt.autoDetect": "Grunt タスクの自動検出をオンにするかオフにするかを制御します。既定はオンです。",
-	"grunt.taskDefinition.type.description": "カスタマイズする Grunt タスク。",
-	"grunt.taskDefinition.file.description": "タスクを提供する Grunt ファイル。省略できます。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/gulp/out/main.i18n.json b/i18n/jpn/extensions/gulp/out/main.i18n.json
deleted file mode 100644
index abc19b7449e..00000000000
--- a/i18n/jpn/extensions/gulp/out/main.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"execFailed": "フォルダ {0} でgulp のエラーによる失敗を自動検出: {1}"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/gulp/package.i18n.json b/i18n/jpn/extensions/gulp/package.i18n.json
deleted file mode 100644
index 52a48fd688b..00000000000
--- a/i18n/jpn/extensions/gulp/package.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"description": "VS Code に Gulp 機能を追加する拡張機能。",
-	"displayName": "VSCode の Gulp サポート",
-	"config.gulp.autoDetect": "Gulp タスクの自動検出をオンにするかオフにするかを制御します。既定はオンです。",
-	"gulp.taskDefinition.type.description": "カスタマイズする Gulp タスク。",
-	"gulp.taskDefinition.file.description": "タスクを提供する Gulp ファイル。省略できます。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/handlebars/package.i18n.json b/i18n/jpn/extensions/handlebars/package.i18n.json
deleted file mode 100644
index a92c28504e0..00000000000
--- a/i18n/jpn/extensions/handlebars/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Handlebars の基本言語サポート",
-	"description": "Handlebars  ファイル内で構文ハイライト、かっこ一致を提供します。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/hlsl/package.i18n.json b/i18n/jpn/extensions/hlsl/package.i18n.json
deleted file mode 100644
index a88dfee66db..00000000000
--- a/i18n/jpn/extensions/hlsl/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "HLSL の基本言語サポート",
-	"description": "HLSL ファイル内で構文ハイライト、かっこ一致を提供します。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/html-language-features/client/out/htmlMain.i18n.json b/i18n/jpn/extensions/html-language-features/client/out/htmlMain.i18n.json
deleted file mode 100644
index ed3272fd709..00000000000
--- a/i18n/jpn/extensions/html-language-features/client/out/htmlMain.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"htmlserver.name": "HTML 言語サーバー",
-	"folding.start": "折りたたみ領域の開始",
-	"folding.end": "折りたたみ領域の終了"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/html-language-features/package.i18n.json b/i18n/jpn/extensions/html-language-features/package.i18n.json
deleted file mode 100644
index 18b6e348d48..00000000000
--- a/i18n/jpn/extensions/html-language-features/package.i18n.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "HTML 言語機能",
-	"description": "HTML、Razor、Handlebar ファイルに豊富な言語サポートを提供。",
-	"html.format.enable.desc": "既定の HTML フォーマッタを有効/無効にします",
-	"html.format.wrapLineLength.desc": "1 行あたりの最大文字数 (0 = 無効にする)。",
-	"html.format.unformatted.desc": "再フォーマットしてはならないタグの、コンマ区切りの一覧。'null' の場合、既定で https://www.w3.org/TR/html5/dom.html#phrasing-content にリストされているすべてのタグになります。",
-	"html.format.contentUnformatted.desc": "コンテンツを再フォーマットしてはならないタグをコンマで区切ってリストにします。'null' は、既定値の 'pre' タグを表します。",
-	"html.format.indentInnerHtml.desc": "<head> セクションと <body> セクションをインデントします。",
-	"html.format.preserveNewLines.desc": "要素の前にある既存の改行を保持するかどうか。要素の前でのみ機能し、タグの内側やテキストに対しては機能しません。",
-	"html.format.maxPreserveNewLines.desc": "1 つのチャンク内に保持できる改行の最大数。無制限にするには、'null' を使います。",
-	"html.format.indentHandlebars.desc": "書式設定とインデント {{#foo}} および {{/foo}}。",
-	"html.format.endWithNewline.desc": "末尾に改行を入れます。",
-	"html.format.extraLiners.desc": "直前に改行を 1 つ入れるタグの、コンマで区切られたリストです。'null' は、既定値の \"head, body, /html\" を表します。",
-	"html.format.wrapAttributes.desc": "属性を折り返します。",
-	"html.format.wrapAttributes.auto": "行の長さが超過した場合のみ属性を折り返します。",
-	"html.format.wrapAttributes.force": "先頭以外の各属性を折り返します。",
-	"html.format.wrapAttributes.forcealign": "先頭以外の各属性を折り返して位置を合わせます。",
-	"html.format.wrapAttributes.forcemultiline": "各属性を折り返します。",
-	"html.suggest.angular1.desc": "ビルトイン HTML 言語サポートが Angular V1 のタグおよびプロパティを候補表示するかどうかを構成します。",
-	"html.suggest.ionic.desc": "ビルトイン HTML 言語サポートが Ionic のタグ、プロパティ、および値を候補表示するかどうかを構成します。",
-	"html.suggest.html5.desc": "ビルトイン HTML 言語サポートが HTML5 のタグ、プロパティ、および値を候補表示するかどうかを構成します。",
-	"html.trace.server.desc": "VS Code と HTML 言語サーバー間の通信をトレースします。",
-	"html.validate.scripts": "ビルトイン HTML 言語サポートが埋め込みスクリプトを検証するかどうかを構成します。",
-	"html.validate.styles": "ビルトイン HTML 言語サポートが埋め込みスタイルを検証するかどうかを構成します。",
-	"html.autoClosingTags": "HTML タグの自動クローズを有効/無効にします。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/html/client/out/htmlMain.i18n.json b/i18n/jpn/extensions/html/client/out/htmlMain.i18n.json
deleted file mode 100644
index ed3272fd709..00000000000
--- a/i18n/jpn/extensions/html/client/out/htmlMain.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"htmlserver.name": "HTML 言語サーバー",
-	"folding.start": "折りたたみ領域の開始",
-	"folding.end": "折りたたみ領域の終了"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/html/package.i18n.json b/i18n/jpn/extensions/html/package.i18n.json
deleted file mode 100644
index 965c8b85db9..00000000000
--- a/i18n/jpn/extensions/html/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "HTML の基本言語サポート",
-	"description": "HTML ファイル内で構文ハイライト、かっこ一致、スニペットを提供"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/ini/package.i18n.json b/i18n/jpn/extensions/ini/package.i18n.json
deleted file mode 100644
index ee77be67f3f..00000000000
--- a/i18n/jpn/extensions/ini/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Ini の基本言語サポート",
-	"description": "Ini ファイル内で構文ハイライト、かっこ一致を提供します。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/jake/out/main.i18n.json b/i18n/jpn/extensions/jake/out/main.i18n.json
deleted file mode 100644
index 22de3ec1404..00000000000
--- a/i18n/jpn/extensions/jake/out/main.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"execFailed": "フォルダ {0} でJake のエラーによる失敗を自動検出: {1}"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/jake/package.i18n.json b/i18n/jpn/extensions/jake/package.i18n.json
deleted file mode 100644
index cba6e7a19e6..00000000000
--- a/i18n/jpn/extensions/jake/package.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"description": "VS Code に Jake 機能を追加する拡張機能。",
-	"displayName": "VSCode の Jake サポート",
-	"jake.taskDefinition.type.description": "カスタマイズする Jake タスク。",
-	"jake.taskDefinition.file.description": "タスクを提供する Jake ファイル。省略できます。",
-	"config.jake.autoDetect": "Jake タスクの自動検出をオンにするかオフにするかを制御します。既定はオンです。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/java/package.i18n.json b/i18n/jpn/extensions/java/package.i18n.json
deleted file mode 100644
index 39f4027b3f4..00000000000
--- a/i18n/jpn/extensions/java/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Java の基本言語サポート",
-	"description": "Java ファイル内でスニペット、構文ハイライト、かっこ一致、折りたたみを提供します。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/javascript/out/features/bowerJSONContribution.i18n.json b/i18n/jpn/extensions/javascript/out/features/bowerJSONContribution.i18n.json
deleted file mode 100644
index 8a1702b2bb4..00000000000
--- a/i18n/jpn/extensions/javascript/out/features/bowerJSONContribution.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"json.bower.default": "既定の bower.json",
-	"json.bower.error.repoaccess": "bower リポジトリに対する要求が失敗しました: {0}",
-	"json.bower.latest.version": "最新"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/javascript/out/features/packageJSONContribution.i18n.json b/i18n/jpn/extensions/javascript/out/features/packageJSONContribution.i18n.json
deleted file mode 100644
index e1d881e28c2..00000000000
--- a/i18n/jpn/extensions/javascript/out/features/packageJSONContribution.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"json.package.default": "既定の package.json",
-	"json.npm.error.repoaccess": "NPM リポジトリに対する要求が失敗しました: {0}",
-	"json.npm.latestversion": "パッケージの現在の最新バージョン",
-	"json.npm.majorversion": "最新のメジャー バージョンと一致します (1.x.x)",
-	"json.npm.minorversion": "最新のマイナー バージョンと一致します (1.2.x)",
-	"json.npm.version.hover": "最新バージョン: {0}"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/javascript/package.i18n.json b/i18n/jpn/extensions/javascript/package.i18n.json
deleted file mode 100644
index d26c5684759..00000000000
--- a/i18n/jpn/extensions/javascript/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "JavaScript の基本言語サポート",
-	"description": "JavaScript ファイル内でスニペット、構文ハイライト、かっこ一致、折りたたみを提供します。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/json-language-features/client/out/jsonMain.i18n.json b/i18n/jpn/extensions/json-language-features/client/out/jsonMain.i18n.json
deleted file mode 100644
index 2700229f8e7..00000000000
--- a/i18n/jpn/extensions/json-language-features/client/out/jsonMain.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"jsonserver.name": "JSON 言語サーバー"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/json-language-features/package.i18n.json b/i18n/jpn/extensions/json-language-features/package.i18n.json
deleted file mode 100644
index 2960f3fa69e..00000000000
--- a/i18n/jpn/extensions/json-language-features/package.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "JSON 言語機能",
-	"description": "JSON ファイルに豊富な言語サポートを提供。",
-	"json.schemas.desc": "スキーマを現在のプロジェクトの JSON ファイルに関連付けます",
-	"json.schemas.url.desc": "スキーマへの URL または現在のディレクトリのスキーマへの相対パス",
-	"json.schemas.fileMatch.desc": "JSON ファイルをスキーマに解決する場合に一致するファイル パターンの配列です。",
-	"json.schemas.fileMatch.item.desc": "JSON ファイルをスキーマに解決する場合に一致するよう '*' を含む可能性があるファイル パターンです。",
-	"json.schemas.schema.desc": "指定された URL のスキーマ定義です。スキーマは、スキーマ URL へのアクセスを避けるためにのみ指定する必要があります。",
-	"json.format.enable.desc": "既定の JSON フォーマッタを有効/無効にします (再起動が必要です)",
-	"json.tracing.desc": "VS Code と JSON 言語サーバー間の通信をトレースします。",
-	"json.colorDecorators.enable.desc": "カラー デコレーターを有効または無効にします",
-	"json.colorDecorators.enable.deprecationMessage": "設定 `json.colorDecorators.enable` は使用されなくなりました。`editor.colorDecorators` を使用してください。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/json/client/out/jsonMain.i18n.json b/i18n/jpn/extensions/json/client/out/jsonMain.i18n.json
deleted file mode 100644
index 2700229f8e7..00000000000
--- a/i18n/jpn/extensions/json/client/out/jsonMain.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"jsonserver.name": "JSON 言語サーバー"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/json/package.i18n.json b/i18n/jpn/extensions/json/package.i18n.json
deleted file mode 100644
index 2ec4d67b799..00000000000
--- a/i18n/jpn/extensions/json/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "JSON の基本言語サポート",
-	"description": "JSON ファイル内で構文ハイライト、かっこ一致を提供"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/less/package.i18n.json b/i18n/jpn/extensions/less/package.i18n.json
deleted file mode 100644
index e4347a969e8..00000000000
--- a/i18n/jpn/extensions/less/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Less の基本言語サポート",
-	"description": "Less ファイル内で構文ハイライト、かっこ一致、折りたたみを提供します。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/log/package.i18n.json b/i18n/jpn/extensions/log/package.i18n.json
deleted file mode 100644
index a6c829a1fd2..00000000000
--- a/i18n/jpn/extensions/log/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "ログ",
-	"description": ".log 拡張子を持つファイルの構文ハイライトを提供します。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/lua/package.i18n.json b/i18n/jpn/extensions/lua/package.i18n.json
deleted file mode 100644
index f91a605ad03..00000000000
--- a/i18n/jpn/extensions/lua/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Lua の基本言語サポート",
-	"description": "Lua ファイル内で構文ハイライト、かっこ一致を提供します。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/make/package.i18n.json b/i18n/jpn/extensions/make/package.i18n.json
deleted file mode 100644
index 8c66e8a639d..00000000000
--- a/i18n/jpn/extensions/make/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Make の基本言語サポート",
-	"description": "Make ファイル内で構文ハイライト、かっこ一致を提供します。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/markdown-basics/package.i18n.json b/i18n/jpn/extensions/markdown-basics/package.i18n.json
deleted file mode 100644
index 24adb748216..00000000000
--- a/i18n/jpn/extensions/markdown-basics/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Markdown の基本言語サポート",
-	"description": "Markdown のスニペット、構文ハイライトを提供します。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json b/i18n/jpn/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json
deleted file mode 100644
index 0489b0c3667..00000000000
--- a/i18n/jpn/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"onPreviewStyleLoadError": "'markdown.styles' を読み込むことができません: {0}"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/markdown-language-features/out/features/preview.i18n.json b/i18n/jpn/extensions/markdown-language-features/out/features/preview.i18n.json
deleted file mode 100644
index 21f810889f0..00000000000
--- a/i18n/jpn/extensions/markdown-language-features/out/features/preview.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"lockedPreviewTitle": "[プレビュー] {0}",
-	"previewTitle": "プレビュー {0}"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/markdown-language-features/out/features/previewContentProvider.i18n.json b/i18n/jpn/extensions/markdown-language-features/out/features/previewContentProvider.i18n.json
deleted file mode 100644
index 8031d3c647d..00000000000
--- a/i18n/jpn/extensions/markdown-language-features/out/features/previewContentProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"preview.securityMessage.text": "このドキュメントで一部のコンテンツが無効になっています",
-	"preview.securityMessage.title": "安全でない可能性があるか保護されていないコンテンツは、マークダウン プレビューで無効化されています。保護されていないコンテンツやスクリプトを有効にするには、マークダウン プレビューのセキュリティ設定を変更してください",
-	"preview.securityMessage.label": "セキュリティが無効なコンテンツの警告"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/markdown-language-features/out/security.i18n.json b/i18n/jpn/extensions/markdown-language-features/out/security.i18n.json
deleted file mode 100644
index 4e88fd4f8be..00000000000
--- a/i18n/jpn/extensions/markdown-language-features/out/security.i18n.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"strict.title": "高レベル",
-	"strict.description": "セキュリティで保護されたコンテンツのみを読み込む",
-	"insecureLocalContent.title": "安全でないローカル コンテンツを許可する",
-	"insecureLocalContent.description": "localhost から http で提供されるコンテンツの読み込みを有効にします",
-	"insecureContent.title": "セキュリティで保護されていないコンテンツを許可する",
-	"insecureContent.description": "HTTP を介したコンテンツの読み込みを有効にする",
-	"disable.title": "無効にする",
-	"disable.description": "すべてのコンテンツとスクリプトの実行を許可します。推奨されません。",
-	"moreInfo.title": "詳細情報",
-	"enableSecurityWarning.title": "このワークスペースでプレビューのセキュリティ警告を有効にする",
-	"disableSecurityWarning.title": "このワークスペースでプレビューのセキュリティ警告を有効にする",
-	"toggleSecurityWarning.description": "コンテンツのセキュリティ レベルに影響しません",
-	"preview.showPreviewSecuritySelector.title": "ワークスペースのマークダウン プレビューに関するセキュリティ設定を選択 "
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/markdown-language-features/package.i18n.json b/i18n/jpn/extensions/markdown-language-features/package.i18n.json
deleted file mode 100644
index 58b68df0b74..00000000000
--- a/i18n/jpn/extensions/markdown-language-features/package.i18n.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Markdown 言語機能",
-	"description": "Markdown に豊富な言語サポートを提供。",
-	"markdown.preview.breaks.desc": "マークダウン プレビューで改行をレンダリングする方法を設定します。'true' に設定すると改行ごとに <br> を作成します。",
-	"markdown.preview.linkify": "マークダウン プレビューで URL 形式のテキストからリンクへの変換を有効または無効にします。",
-	"markdown.preview.doubleClickToSwitchToEditor.desc": "マークダウンのプレビューでダブルクリックすると、エディターに切り替わります。",
-	"markdown.preview.fontFamily.desc": "マークダウン プレビューで使用されるフォント ファミリを制御します。",
-	"markdown.preview.fontSize.desc": "マークダウン プレビューで使用されるフォント サイズ (ピクセル単位) を制御します。",
-	"markdown.preview.lineHeight.desc": "マークダウン プレビューで使用される行の高さを制御します。この数値はフォント サイズを基準とします。",
-	"markdown.preview.markEditorSelection.desc": "マークダウンのプレビューに、エディターの現在の選択範囲を示すマークが付きます。",
-	"markdown.preview.scrollEditorWithPreview.desc": "マークダウンのプレビューをスクロールすると、エディターのビューが更新されます 。",
-	"markdown.preview.scrollPreviewWithEditor.desc": "マークダウンのエディターをスクロールすると、プレビューのビューが更新されます。",
-	"markdown.preview.scrollPreviewWithEditorSelection.desc": "[非推奨] エディターの現在選択されている行を表示するためにマークダウン プレビューをスクロールします。",
-	"markdown.preview.scrollPreviewWithEditorSelection.deprecationMessage": "この設定は 'markdown.preview.scrollPreviewWithEditor' に置き換えられ、もはや有効ではありません。",
-	"markdown.preview.title": "プレビューを開く",
-	"markdown.previewFrontMatter.dec": "マークダウン プレビューで YAML front matter がレンダリングされる方法を設定します。'hide' の場合、front matter が削除されます。その他の場合には、front matter はマークダウン コンテンツとして処理されます。",
-	"markdown.previewSide.title": "プレビューを横に表示",
-	"markdown.showLockedPreviewToSide.title": "ロックされたプレビューを横に表示",
-	"markdown.showSource.title": "ソースの表示",
-	"markdown.styles.dec": "マークダウン プレビューから使用する CSS スタイル シートの URL またはローカル パスの一覧。相対パスは、エクスプローラーで開かれているフォルダーへの絶対パスと解釈されます。開かれているフォルダーがない場合、マークダウン ファイルの場所を基準としていると解釈されます。'\\' はすべて '\\\\' と入力する必要があります。",
-	"markdown.showPreviewSecuritySelector.title": "プレビュー のセキュリティ設定を変更",
-	"markdown.trace.desc": "マークダウン拡張機能のデバッグ ログを有効にします。",
-	"markdown.preview.refresh.title": "プレビューを更新",
-	"markdown.preview.toggleLock.title": "プレビュー ロックの切り替え"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/markdown/out/commands.i18n.json b/i18n/jpn/extensions/markdown/out/commands.i18n.json
deleted file mode 100644
index d6aacde9fbe..00000000000
--- a/i18n/jpn/extensions/markdown/out/commands.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"previewTitle": "プレビュー {0}",
-	"onPreviewStyleLoadError": "'markdown.styles' を読み込むことができません: {0}"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/markdown/out/commands/onPreviewStyleLoadError.i18n.json b/i18n/jpn/extensions/markdown/out/commands/onPreviewStyleLoadError.i18n.json
deleted file mode 100644
index 0489b0c3667..00000000000
--- a/i18n/jpn/extensions/markdown/out/commands/onPreviewStyleLoadError.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"onPreviewStyleLoadError": "'markdown.styles' を読み込むことができません: {0}"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/markdown/out/extension.i18n.json b/i18n/jpn/extensions/markdown/out/extension.i18n.json
deleted file mode 100644
index 20d27004e03..00000000000
--- a/i18n/jpn/extensions/markdown/out/extension.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"onPreviewStyleLoadError": "'markdown.styles' を読み込むことができません: {0}",
-	"previewTitle": "プレビュー {0}"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/markdown/out/features/preview.i18n.json b/i18n/jpn/extensions/markdown/out/features/preview.i18n.json
deleted file mode 100644
index 21f810889f0..00000000000
--- a/i18n/jpn/extensions/markdown/out/features/preview.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"lockedPreviewTitle": "[プレビュー] {0}",
-	"previewTitle": "プレビュー {0}"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/markdown/out/features/previewContentProvider.i18n.json b/i18n/jpn/extensions/markdown/out/features/previewContentProvider.i18n.json
deleted file mode 100644
index 8031d3c647d..00000000000
--- a/i18n/jpn/extensions/markdown/out/features/previewContentProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"preview.securityMessage.text": "このドキュメントで一部のコンテンツが無効になっています",
-	"preview.securityMessage.title": "安全でない可能性があるか保護されていないコンテンツは、マークダウン プレビューで無効化されています。保護されていないコンテンツやスクリプトを有効にするには、マークダウン プレビューのセキュリティ設定を変更してください",
-	"preview.securityMessage.label": "セキュリティが無効なコンテンツの警告"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/markdown/out/previewContentProvider.i18n.json b/i18n/jpn/extensions/markdown/out/previewContentProvider.i18n.json
deleted file mode 100644
index 6d4c8918e8f..00000000000
--- a/i18n/jpn/extensions/markdown/out/previewContentProvider.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"preview.securityMessage.text": "このドキュメントで一部のコンテンツが無効になっています",
-	"preview.securityMessage.title": "安全でない可能性があるか保護されていないコンテンツは、マークダウン プレビューで無効化されています。保護されていないコンテンツやスクリプトを有効にするには、マークダウン プレビューのセキュリティ設定を変更してください",
-	"preview.securityMessage.label": "セキュリティが無効なコンテンツの警告"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/markdown/out/security.i18n.json b/i18n/jpn/extensions/markdown/out/security.i18n.json
deleted file mode 100644
index fd9bf5f6a30..00000000000
--- a/i18n/jpn/extensions/markdown/out/security.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"strict.title": "高レベル",
-	"strict.description": "セキュリティで保護されたコンテンツのみを読み込む",
-	"insecureContent.title": "セキュリティで保護されていないコンテンツを許可する",
-	"insecureContent.description": "HTTP を介したコンテンツの読み込みを有効にする",
-	"disable.title": "無効にする",
-	"disable.description": "すべてのコンテンツとスクリプトの実行を許可します。推奨されません。",
-	"moreInfo.title": "詳細情報",
-	"enableSecurityWarning.title": "このワークスペースでプレビューのセキュリティ警告を有効にする",
-	"disableSecurityWarning.title": "このワークスペースでプレビューのセキュリティ警告を有効にする",
-	"toggleSecurityWarning.description": "コンテンツのセキュリティ レベルには影響しません",
-	"preview.showPreviewSecuritySelector.title": "ワークスペースのマークダウン プレビューに関するセキュリティ設定を選択 "
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/markdown/package.i18n.json b/i18n/jpn/extensions/markdown/package.i18n.json
deleted file mode 100644
index 58b68df0b74..00000000000
--- a/i18n/jpn/extensions/markdown/package.i18n.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Markdown 言語機能",
-	"description": "Markdown に豊富な言語サポートを提供。",
-	"markdown.preview.breaks.desc": "マークダウン プレビューで改行をレンダリングする方法を設定します。'true' に設定すると改行ごとに <br> を作成します。",
-	"markdown.preview.linkify": "マークダウン プレビューで URL 形式のテキストからリンクへの変換を有効または無効にします。",
-	"markdown.preview.doubleClickToSwitchToEditor.desc": "マークダウンのプレビューでダブルクリックすると、エディターに切り替わります。",
-	"markdown.preview.fontFamily.desc": "マークダウン プレビューで使用されるフォント ファミリを制御します。",
-	"markdown.preview.fontSize.desc": "マークダウン プレビューで使用されるフォント サイズ (ピクセル単位) を制御します。",
-	"markdown.preview.lineHeight.desc": "マークダウン プレビューで使用される行の高さを制御します。この数値はフォント サイズを基準とします。",
-	"markdown.preview.markEditorSelection.desc": "マークダウンのプレビューに、エディターの現在の選択範囲を示すマークが付きます。",
-	"markdown.preview.scrollEditorWithPreview.desc": "マークダウンのプレビューをスクロールすると、エディターのビューが更新されます 。",
-	"markdown.preview.scrollPreviewWithEditor.desc": "マークダウンのエディターをスクロールすると、プレビューのビューが更新されます。",
-	"markdown.preview.scrollPreviewWithEditorSelection.desc": "[非推奨] エディターの現在選択されている行を表示するためにマークダウン プレビューをスクロールします。",
-	"markdown.preview.scrollPreviewWithEditorSelection.deprecationMessage": "この設定は 'markdown.preview.scrollPreviewWithEditor' に置き換えられ、もはや有効ではありません。",
-	"markdown.preview.title": "プレビューを開く",
-	"markdown.previewFrontMatter.dec": "マークダウン プレビューで YAML front matter がレンダリングされる方法を設定します。'hide' の場合、front matter が削除されます。その他の場合には、front matter はマークダウン コンテンツとして処理されます。",
-	"markdown.previewSide.title": "プレビューを横に表示",
-	"markdown.showLockedPreviewToSide.title": "ロックされたプレビューを横に表示",
-	"markdown.showSource.title": "ソースの表示",
-	"markdown.styles.dec": "マークダウン プレビューから使用する CSS スタイル シートの URL またはローカル パスの一覧。相対パスは、エクスプローラーで開かれているフォルダーへの絶対パスと解釈されます。開かれているフォルダーがない場合、マークダウン ファイルの場所を基準としていると解釈されます。'\\' はすべて '\\\\' と入力する必要があります。",
-	"markdown.showPreviewSecuritySelector.title": "プレビュー のセキュリティ設定を変更",
-	"markdown.trace.desc": "マークダウン拡張機能のデバッグ ログを有効にします。",
-	"markdown.preview.refresh.title": "プレビューを更新",
-	"markdown.preview.toggleLock.title": "プレビュー ロックの切り替え"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/merge-conflict/out/codelensProvider.i18n.json b/i18n/jpn/extensions/merge-conflict/out/codelensProvider.i18n.json
deleted file mode 100644
index d8ec9931111..00000000000
--- a/i18n/jpn/extensions/merge-conflict/out/codelensProvider.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"acceptCurrentChange": "現在の変更を取り込む",
-	"acceptIncomingChange": "入力側の変更を取り込む",
-	"acceptBothChanges": "両方の変更を取り込む",
-	"compareChanges": "変更の比較"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/merge-conflict/out/commandHandler.i18n.json b/i18n/jpn/extensions/merge-conflict/out/commandHandler.i18n.json
deleted file mode 100644
index 0c28587b20c..00000000000
--- a/i18n/jpn/extensions/merge-conflict/out/commandHandler.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"cursorNotInConflict": "エディターのカーソルがマージの競合の範囲内にありません",
-	"compareChangesTitle": "{0}: 現在の変更 ⟷ 入力側の変更",
-	"cursorOnCommonAncestorsRange": "エディターのカーソルが共通の祖先ブロック内にあります。”現在” または \"入力側\" のいずれかのブロックに移動してください",
-	"cursorOnSplitterRange": "エディターのカーソルがマージ コンフリクトのスプリッター内にあります。”現在” または \"入力側\" のいずれかのブロックに移動してください",
-	"noConflicts": "このファイルにマージの競合は存在しません",
-	"noOtherConflictsInThisFile": "このファイルに他のマージの競合は存在しません"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/merge-conflict/out/mergeDecorator.i18n.json b/i18n/jpn/extensions/merge-conflict/out/mergeDecorator.i18n.json
deleted file mode 100644
index b034d10361a..00000000000
--- a/i18n/jpn/extensions/merge-conflict/out/mergeDecorator.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"currentChange": "(現在の変更)",
-	"incomingChange": "(入力側の変更)"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/merge-conflict/package.i18n.json b/i18n/jpn/extensions/merge-conflict/package.i18n.json
deleted file mode 100644
index a21287ee929..00000000000
--- a/i18n/jpn/extensions/merge-conflict/package.i18n.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "マージの競合",
-	"description": "行内マージ競合のハイライト、コマンドを提供します。",
-	"command.category": "マージの競合",
-	"command.accept.all-current": "現在の方をすべて取り込む",
-	"command.accept.all-incoming": "入力側のすべてを取り込む",
-	"command.accept.all-both": "両方をすべて取り込む",
-	"command.accept.current": "現在の方を取り込む",
-	"command.accept.incoming": "入力側を取り込む",
-	"command.accept.selection": "選択項目を取り込む",
-	"command.accept.both": "両方を取り込む",
-	"command.next": "次の競合",
-	"command.previous": "前の競合",
-	"command.compare": "現在の競合を比較",
-	"config.title": "マージの競合",
-	"config.codeLensEnabled": "エディター内のマージ競合ブロックで CodeLens を有効/無効にします",
-	"config.decoratorsEnabled": "エディター内でマージの競合デコレーターを有効/無効にします。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/npm/out/features/bowerJSONContribution.i18n.json b/i18n/jpn/extensions/npm/out/features/bowerJSONContribution.i18n.json
deleted file mode 100644
index 8a1702b2bb4..00000000000
--- a/i18n/jpn/extensions/npm/out/features/bowerJSONContribution.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"json.bower.default": "既定の bower.json",
-	"json.bower.error.repoaccess": "bower リポジトリに対する要求が失敗しました: {0}",
-	"json.bower.latest.version": "最新"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/npm/out/features/packageJSONContribution.i18n.json b/i18n/jpn/extensions/npm/out/features/packageJSONContribution.i18n.json
deleted file mode 100644
index e1d881e28c2..00000000000
--- a/i18n/jpn/extensions/npm/out/features/packageJSONContribution.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"json.package.default": "既定の package.json",
-	"json.npm.error.repoaccess": "NPM リポジトリに対する要求が失敗しました: {0}",
-	"json.npm.latestversion": "パッケージの現在の最新バージョン",
-	"json.npm.majorversion": "最新のメジャー バージョンと一致します (1.x.x)",
-	"json.npm.minorversion": "最新のマイナー バージョンと一致します (1.2.x)",
-	"json.npm.version.hover": "最新バージョン: {0}"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/npm/out/main.i18n.json b/i18n/jpn/extensions/npm/out/main.i18n.json
deleted file mode 100644
index 3995a9c7f9b..00000000000
--- a/i18n/jpn/extensions/npm/out/main.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"npm.parseError": "npmタスク検出: ファイル {0} の解析に失敗しました"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/npm/out/npmView.i18n.json b/i18n/jpn/extensions/npm/out/npmView.i18n.json
deleted file mode 100644
index b97b06cabbd..00000000000
--- a/i18n/jpn/extensions/npm/out/npmView.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noScripts": "スクリプトが見つかりません",
-	"noDebugOptions": "スクリプトの Node デバッグ オプションが不足しているため、\"{0}\" をデバッグ起動できません。例: --inspect-brk\"。",
-	"learnMore": "詳細情報",
-	"ok": "OK",
-	"scriptInvalid": "スクリプト '{0}' が見つかりませんでした。ビューを更新してください。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/npm/out/tasks.i18n.json b/i18n/jpn/extensions/npm/out/tasks.i18n.json
deleted file mode 100644
index 3995a9c7f9b..00000000000
--- a/i18n/jpn/extensions/npm/out/tasks.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"npm.parseError": "npmタスク検出: ファイル {0} の解析に失敗しました"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/npm/package.i18n.json b/i18n/jpn/extensions/npm/package.i18n.json
deleted file mode 100644
index 0ff30c62c2a..00000000000
--- a/i18n/jpn/extensions/npm/package.i18n.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"description": "npm スクリプトのタスクサポートを追加する拡張",
-	"displayName": "VSCode の npm サポート",
-	"config.npm.autoDetect": "npm スクリプトの自動検出をオンにするかオフにするかを制御します。既定はオンです。",
-	"config.npm.runSilent": "`--silent` オプションを使用して npm コマンドを実行する。",
-	"config.npm.packageManager": "スクリプトを実行するために使用するパッケージ マネージャー。",
-	"config.npm.exclude": "自動スクリプト検出から除外するフォルダーの glob パターンを構成します。",
-	"config.npm.enableScriptExplorer": "npm スクリプトのエクスプ ローラー ビューを有効にします。",
-	"config.npm.scriptExplorerAction": "スクリプトエクスプローラーで使用される規定のクリックアクション： 'open' または 'run' 、規定値は 'open' です。",
-	"npm.parseError": "npmタスク検出: ファイル {0} の解析に失敗しました",
-	"taskdef.script": "カスタマイズする npm スクリプト。",
-	"taskdef.path": "スクリプトを提供する package.json ファイルのフォルダー パス。省略できます。",
-	"view.name": "Npm スクリプト",
-	"command.refresh": "最新の情報に更新",
-	"command.run": "実行",
-	"command.debug": "デバッグ",
-	"command.openScript": "Open",
-	"command.runInstall": "インストールを実行"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/objective-c/package.i18n.json b/i18n/jpn/extensions/objective-c/package.i18n.json
deleted file mode 100644
index 3a96752f68e..00000000000
--- a/i18n/jpn/extensions/objective-c/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Objective-C の基本言語サポート",
-	"description": "Objective-C ファイル内で構文ハイライト、かっこ一致を提供します。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/package-json/out/features/bowerJSONContribution.i18n.json b/i18n/jpn/extensions/package-json/out/features/bowerJSONContribution.i18n.json
deleted file mode 100644
index 8a1702b2bb4..00000000000
--- a/i18n/jpn/extensions/package-json/out/features/bowerJSONContribution.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"json.bower.default": "既定の bower.json",
-	"json.bower.error.repoaccess": "bower リポジトリに対する要求が失敗しました: {0}",
-	"json.bower.latest.version": "最新"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/package-json/out/features/packageJSONContribution.i18n.json b/i18n/jpn/extensions/package-json/out/features/packageJSONContribution.i18n.json
deleted file mode 100644
index e1d881e28c2..00000000000
--- a/i18n/jpn/extensions/package-json/out/features/packageJSONContribution.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"json.package.default": "既定の package.json",
-	"json.npm.error.repoaccess": "NPM リポジトリに対する要求が失敗しました: {0}",
-	"json.npm.latestversion": "パッケージの現在の最新バージョン",
-	"json.npm.majorversion": "最新のメジャー バージョンと一致します (1.x.x)",
-	"json.npm.minorversion": "最新のマイナー バージョンと一致します (1.2.x)",
-	"json.npm.version.hover": "最新バージョン: {0}"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/package-json/package.i18n.json b/i18n/jpn/extensions/package-json/package.i18n.json
deleted file mode 100644
index 35229bd6699..00000000000
--- a/i18n/jpn/extensions/package-json/package.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	]
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/perl/package.i18n.json b/i18n/jpn/extensions/perl/package.i18n.json
deleted file mode 100644
index 86a5b57dc53..00000000000
--- a/i18n/jpn/extensions/perl/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Perl の基本言語サポート",
-	"description": "Perl ファイル内で構文ハイライト、かっこ一致を提供します。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/php-language-features/out/features/validationProvider.i18n.json b/i18n/jpn/extensions/php-language-features/out/features/validationProvider.i18n.json
deleted file mode 100644
index 3f34bb85eac..00000000000
--- a/i18n/jpn/extensions/php-language-features/out/features/validationProvider.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"php.useExecutablePath": "PHP ファイルを lint するために {0} (ワークスペースの設定として定義されている) を実行することを許可しますか?",
-	"php.yes": "許可",
-	"php.no": "許可しない",
-	"wrongExecutable": "{0} が有効な PHP 実行可能ファイルではないため、検証できません。設定 'php.validate.executablePath' を使用して PHP 実行可能ファイルを構成してください。",
-	"noExecutable": "PHP 実行可能ファイルが設定されていないため、検証できません。設定 'php.validate.executablePath' を使用して PHP 実行可能ファイルを構成してください。",
-	"unknownReason": "パス {0} を使用して php を実行できませんでした。理由は不明です。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/php-language-features/package.i18n.json b/i18n/jpn/extensions/php-language-features/package.i18n.json
deleted file mode 100644
index 15a98a885de..00000000000
--- a/i18n/jpn/extensions/php-language-features/package.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"configuration.suggest.basic": "組み込みの PHP 言語候補機能を有効にするかどうかを設定します。このサポートによって、PHP グローバルと変数の候補が示されます。",
-	"configuration.validate.enable": "組み込みの PHP 検証を有効/無効にします。",
-	"configuration.validate.executablePath": "PHP 実行可能ファイルを指定します。",
-	"configuration.validate.run": "リンターを保存時に実行するか、入力時に実行するか。",
-	"configuration.title": "PHP",
-	"commands.categroy.php": "PHP",
-	"command.untrustValidationExecutable": "PHP の検証を無効にします (ワークスペース設定として定義)。",
-	"displayName": "PHP 言語機能",
-	"description": "PHP ファイルに豊富な言語サポートを提供します。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/php/out/features/validationProvider.i18n.json b/i18n/jpn/extensions/php/out/features/validationProvider.i18n.json
deleted file mode 100644
index 3f34bb85eac..00000000000
--- a/i18n/jpn/extensions/php/out/features/validationProvider.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"php.useExecutablePath": "PHP ファイルを lint するために {0} (ワークスペースの設定として定義されている) を実行することを許可しますか?",
-	"php.yes": "許可",
-	"php.no": "許可しない",
-	"wrongExecutable": "{0} が有効な PHP 実行可能ファイルではないため、検証できません。設定 'php.validate.executablePath' を使用して PHP 実行可能ファイルを構成してください。",
-	"noExecutable": "PHP 実行可能ファイルが設定されていないため、検証できません。設定 'php.validate.executablePath' を使用して PHP 実行可能ファイルを構成してください。",
-	"unknownReason": "パス {0} を使用して php を実行できませんでした。理由は不明です。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/php/package.i18n.json b/i18n/jpn/extensions/php/package.i18n.json
deleted file mode 100644
index 16bb0ef7ca1..00000000000
--- a/i18n/jpn/extensions/php/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "PHP の基本言語サポート",
-	"description": "PHP ファイル内に構文ハイライト、かっこ一致を提供します。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/powershell/package.i18n.json b/i18n/jpn/extensions/powershell/package.i18n.json
deleted file mode 100644
index 180dafb0718..00000000000
--- a/i18n/jpn/extensions/powershell/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Powershell の基本言語サポート",
-	"description": "Powershell ファイル内でスニペット、構文ハイライト、かっこ一致、折りたたみを提供します。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/pug/package.i18n.json b/i18n/jpn/extensions/pug/package.i18n.json
deleted file mode 100644
index 73d653c5737..00000000000
--- a/i18n/jpn/extensions/pug/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Pug の基本言語サポート",
-	"description": "Pug ファイル内で構文ハイライト、かっこ一致を提供します。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/python/package.i18n.json b/i18n/jpn/extensions/python/package.i18n.json
deleted file mode 100644
index f430b5629f8..00000000000
--- a/i18n/jpn/extensions/python/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Python の基本言語サポート",
-	"description": "Python ファイル内で構文ハイライト、かっこ一致、折りたたみを提供します。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/r/package.i18n.json b/i18n/jpn/extensions/r/package.i18n.json
deleted file mode 100644
index 03ea0598bc5..00000000000
--- a/i18n/jpn/extensions/r/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "R の基本言語サポート",
-	"description": "R ファイル内で構文ハイライト、かっこ一致を提供します。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/razor/package.i18n.json b/i18n/jpn/extensions/razor/package.i18n.json
deleted file mode 100644
index 5865de3607d..00000000000
--- a/i18n/jpn/extensions/razor/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Razor の基本言語サポート",
-	"description": "Razor ファイル内で構文ハイライト、かっこ一致、折りたたみを提供します。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/ruby/package.i18n.json b/i18n/jpn/extensions/ruby/package.i18n.json
deleted file mode 100644
index f540ede6f97..00000000000
--- a/i18n/jpn/extensions/ruby/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Ruby の基本言語サポート",
-	"description": "Ruby ファイル内で構文ハイライト、かっこ一致を提供します。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/rust/package.i18n.json b/i18n/jpn/extensions/rust/package.i18n.json
deleted file mode 100644
index 79d1cff744d..00000000000
--- a/i18n/jpn/extensions/rust/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Rust の基本言語サポート",
-	"description": "Rust ファイル内で構文ハイライト、かっこ一致を提供します。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/scss/package.i18n.json b/i18n/jpn/extensions/scss/package.i18n.json
deleted file mode 100644
index 3ee04074328..00000000000
--- a/i18n/jpn/extensions/scss/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "SCSS の基本言語サポート",
-	"description": "SCSS ファイル内で構文ハイライト、かっこ一致、折りたたみを提供します。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/search-rg/package.i18n.json b/i18n/jpn/extensions/search-rg/package.i18n.json
deleted file mode 100644
index dbcf08fd4ed..00000000000
--- a/i18n/jpn/extensions/search-rg/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "検索 (ripgrep)",
-	"description": "Ripgrep を使用して検索を提供します。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/shaderlab/package.i18n.json b/i18n/jpn/extensions/shaderlab/package.i18n.json
deleted file mode 100644
index 79c517dc10d..00000000000
--- a/i18n/jpn/extensions/shaderlab/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Shaderlab の基本言語サポート",
-	"description": "Shaderlab ファイル内で構文ハイライト、かっこ一致を提供します。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/shellscript/package.i18n.json b/i18n/jpn/extensions/shellscript/package.i18n.json
deleted file mode 100644
index c5a4ab21dbb..00000000000
--- a/i18n/jpn/extensions/shellscript/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Shell Script の基本言語サポート",
-	"description": "Shell Script ファイル内で構文ハイライト、かっこ一致を提供します。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/sql/package.i18n.json b/i18n/jpn/extensions/sql/package.i18n.json
deleted file mode 100644
index e22a9a3147f..00000000000
--- a/i18n/jpn/extensions/sql/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "SQL の基本言語サポート",
-	"description": "SQL ファイル内で構文ハイライト、かっこ一致を提供します。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/swift/package.i18n.json b/i18n/jpn/extensions/swift/package.i18n.json
deleted file mode 100644
index 1e24cc65054..00000000000
--- a/i18n/jpn/extensions/swift/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Swift の基本言語サポート",
-	"description": "Swift ファイル内でスニペット、構文ハイライト、かっこ一致を提供します。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/theme-abyss/package.i18n.json b/i18n/jpn/extensions/theme-abyss/package.i18n.json
deleted file mode 100644
index 1d140035acf..00000000000
--- a/i18n/jpn/extensions/theme-abyss/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Abyss テーマ",
-	"description": "Visual Studio Code の Abyss テーマ"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/theme-defaults/package.i18n.json b/i18n/jpn/extensions/theme-defaults/package.i18n.json
deleted file mode 100644
index 141108af1f7..00000000000
--- a/i18n/jpn/extensions/theme-defaults/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "既定のテーマ",
-	"description": "既定の light と dark テーマ (Plus と Visual Studio)"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/theme-kimbie-dark/package.i18n.json b/i18n/jpn/extensions/theme-kimbie-dark/package.i18n.json
deleted file mode 100644
index 6ea2a80b992..00000000000
--- a/i18n/jpn/extensions/theme-kimbie-dark/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Kimbie Dark テーマ",
-	"description": "Visual Studio Code の Kimbie dark テーマ"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/theme-monokai-dimmed/package.i18n.json b/i18n/jpn/extensions/theme-monokai-dimmed/package.i18n.json
deleted file mode 100644
index 920c1d771f1..00000000000
--- a/i18n/jpn/extensions/theme-monokai-dimmed/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Monokai Dimmed テーマ",
-	"description": "Visual Studio Code の Monokai dimmed テーマ"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/theme-monokai/package.i18n.json b/i18n/jpn/extensions/theme-monokai/package.i18n.json
deleted file mode 100644
index 1a17583a684..00000000000
--- a/i18n/jpn/extensions/theme-monokai/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Monokai テーマ",
-	"description": "Visual Studio Code の Monokai テーマ"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/theme-quietlight/package.i18n.json b/i18n/jpn/extensions/theme-quietlight/package.i18n.json
deleted file mode 100644
index 1e11494e465..00000000000
--- a/i18n/jpn/extensions/theme-quietlight/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Quiet Light テーマ",
-	"description": "Visual Studio Code の Quiet light テーマ"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/theme-red/package.i18n.json b/i18n/jpn/extensions/theme-red/package.i18n.json
deleted file mode 100644
index c3cbeebae1c..00000000000
--- a/i18n/jpn/extensions/theme-red/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Red テーマ",
-	"description": "Visual Studio Code の Red テーマ"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/theme-seti/package.i18n.json b/i18n/jpn/extensions/theme-seti/package.i18n.json
deleted file mode 100644
index ddc8ab55ab8..00000000000
--- a/i18n/jpn/extensions/theme-seti/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Seti File Icon テーマ",
-	"description": "Seti UI file icons を使用したファイル アイコンのテーマ"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/theme-solarized-dark/package.i18n.json b/i18n/jpn/extensions/theme-solarized-dark/package.i18n.json
deleted file mode 100644
index 57b4d83a10f..00000000000
--- a/i18n/jpn/extensions/theme-solarized-dark/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Solarized Dark テーマ",
-	"description": "Visual Studio Code の Solarized dark テーマ"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/theme-solarized-light/package.i18n.json b/i18n/jpn/extensions/theme-solarized-light/package.i18n.json
deleted file mode 100644
index 628873e1860..00000000000
--- a/i18n/jpn/extensions/theme-solarized-light/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Solarized Light テーマ",
-	"description": "Visual Studio Code の Solarized light テーマ"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/theme-tomorrow-night-blue/package.i18n.json b/i18n/jpn/extensions/theme-tomorrow-night-blue/package.i18n.json
deleted file mode 100644
index 2b7eef9cb9c..00000000000
--- a/i18n/jpn/extensions/theme-tomorrow-night-blue/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Tomorrow Night Blue テーマ",
-	"description": "Visual Studio Code の Tomorrow night blue テーマ"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/typescript-basics/package.i18n.json b/i18n/jpn/extensions/typescript-basics/package.i18n.json
deleted file mode 100644
index a5d1254d7b7..00000000000
--- a/i18n/jpn/extensions/typescript-basics/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "TypeScript 言語の基礎",
-	"description": "TypeScript ファイル内でスニペット、構文ハイライト、かっこ一致、折りたたみを提供します。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/typescript-language-features/out/commands.i18n.json b/i18n/jpn/extensions/typescript-language-features/out/commands.i18n.json
deleted file mode 100644
index e69dc45423d..00000000000
--- a/i18n/jpn/extensions/typescript-language-features/out/commands.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"typescript.projectConfigNoWorkspace": "TypeScript または JavaScript プロジェクトを使用するには、VS Code でフォルダーを開いてください",
-	"typescript.projectConfigUnsupportedFile": "TypeScript または JavaScript のプロジェクトを判別できませんでした。サポートされていないファイルの種類です",
-	"typescript.projectConfigCouldNotGetInfo": "TypeScript または JavaScript のプロジェクトを判別できませんでした",
-	"typescript.noTypeScriptProjectConfig": "ファイルは TypeScript プロジェクトの一部ではありません。詳細情報は [こちら]({1}) をクリックしてください。",
-	"typescript.noJavaScriptProjectConfig": "ファイルは JavaScript プロジェクトの一部ではありません。詳細情報は [こちら]({1}) をクリックしてください。",
-	"typescript.configureTsconfigQuickPick": "tsconfig.json を構成する",
-	"typescript.configureJsconfigQuickPick": "jsconfig.json を構成する"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/typescript-language-features/out/features/completionItemProvider.i18n.json b/i18n/jpn/extensions/typescript-language-features/out/features/completionItemProvider.i18n.json
deleted file mode 100644
index adb307b9768..00000000000
--- a/i18n/jpn/extensions/typescript-language-features/out/features/completionItemProvider.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"selectCodeAction": "適用するコード アクションを選択",
-	"acquiringTypingsLabel": "Typings の定義ファイルを取得中...",
-	"acquiringTypingsDetail": "IntelliSense の Typings の定義ファイルを取得しています。",
-	"autoImportLabel": "{0} から自動インポート"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/typescript-language-features/out/features/directiveCommentCompletionProvider.i18n.json b/i18n/jpn/extensions/typescript-language-features/out/features/directiveCommentCompletionProvider.i18n.json
deleted file mode 100644
index 19d9bea48dd..00000000000
--- a/i18n/jpn/extensions/typescript-language-features/out/features/directiveCommentCompletionProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"ts-check": "JavaScript ファイルのセマンティック チェックを有効にします。 ファイルの先頭にある必要があります。",
-	"ts-nocheck": "JavaScript ファイルのセマンティック チェックを無効にします。 ファイルの先頭にある必要があります。",
-	"ts-ignore": "ファイルの次の行で @ts-check エラーを抑制します。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/typescript-language-features/out/features/implementationsCodeLensProvider.i18n.json b/i18n/jpn/extensions/typescript-language-features/out/features/implementationsCodeLensProvider.i18n.json
deleted file mode 100644
index 64c5084a0d1..00000000000
--- a/i18n/jpn/extensions/typescript-language-features/out/features/implementationsCodeLensProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"oneImplementationLabel": "1 個の実装",
-	"manyImplementationLabel": "{0} 個の実装",
-	"implementationsErrorLabel": "実装を特定できませんでした"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/typescript-language-features/out/features/jsDocCompletionProvider.i18n.json b/i18n/jpn/extensions/typescript-language-features/out/features/jsDocCompletionProvider.i18n.json
deleted file mode 100644
index 26a29c2851a..00000000000
--- a/i18n/jpn/extensions/typescript-language-features/out/features/jsDocCompletionProvider.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"typescript.jsDocCompletionItem.documentation": "JSDoc コメント"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/typescript-language-features/out/features/organizeImports.i18n.json b/i18n/jpn/extensions/typescript-language-features/out/features/organizeImports.i18n.json
deleted file mode 100644
index 7882c9fa95f..00000000000
--- a/i18n/jpn/extensions/typescript-language-features/out/features/organizeImports.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"oraganizeImportsAction.title": "インポートを整理"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/typescript-language-features/out/features/quickFixProvider.i18n.json b/i18n/jpn/extensions/typescript-language-features/out/features/quickFixProvider.i18n.json
deleted file mode 100644
index 453c92d6195..00000000000
--- a/i18n/jpn/extensions/typescript-language-features/out/features/quickFixProvider.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"fixAllInFileLabel": "{0} (ファイルの中のすべてを修正する)"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/typescript-language-features/out/features/referencesCodeLensProvider.i18n.json b/i18n/jpn/extensions/typescript-language-features/out/features/referencesCodeLensProvider.i18n.json
deleted file mode 100644
index 71699891f3b..00000000000
--- a/i18n/jpn/extensions/typescript-language-features/out/features/referencesCodeLensProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"oneReferenceLabel": "1 個の参照",
-	"manyReferenceLabel": "{0} 個の参照",
-	"referenceErrorLabel": "参照を判別できませんでした"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/typescript-language-features/out/features/taskProvider.i18n.json b/i18n/jpn/extensions/typescript-language-features/out/features/taskProvider.i18n.json
deleted file mode 100644
index bb8e166d153..00000000000
--- a/i18n/jpn/extensions/typescript-language-features/out/features/taskProvider.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"buildTscLabel": "ビルド - {0}",
-	"buildAndWatchTscLabel": "ウォッチ - {0}"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/typescript-language-features/out/features/updatePathsOnRename.i18n.json b/i18n/jpn/extensions/typescript-language-features/out/features/updatePathsOnRename.i18n.json
deleted file mode 100644
index 9c9457ec2e4..00000000000
--- a/i18n/jpn/extensions/typescript-language-features/out/features/updatePathsOnRename.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"prompt": "移動したファイルの import を自動的に更新しますか: '{0}'?",
-	"reject.title": "いいえ",
-	"accept.title": "はい",
-	"always.title": "はい。常に import を自動的に更新します。",
-	"never.title": "いいえ。常に import を自動的に更新しません。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/typescript-language-features/out/typescriptServiceClient.i18n.json b/i18n/jpn/extensions/typescript-language-features/out/typescriptServiceClient.i18n.json
deleted file mode 100644
index 904634944f4..00000000000
--- a/i18n/jpn/extensions/typescript-language-features/out/typescriptServiceClient.i18n.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noServerFound": "パス {0} は、有効な tsserver インストールを指していません。バンドルされている TypeScript バージョンにフォールバックしています。",
-	"serverCouldNotBeStarted": "TypeScript 言語サーバーを起動できません。エラー メッセージ: {0}",
-	"typescript.openTsServerLog.notSupported": "TS サーバーのログには TS 2.2.2 以降が必要です",
-	"typescript.openTsServerLog.loggingNotEnabled": "TS サーバーのログがオフになっています。ログを有効にするには、`typescript.tsserver.log` を設定して TS サーバーを再起動してください",
-	"typescript.openTsServerLog.enableAndReloadOption": "ログを有効にして、TS サーバーを再起動する",
-	"typescript.openTsServerLog.noLogFile": "TS サーバーはログを開始していません。",
-	"openTsServerLog.openFileFailedFailed": "TS サーバーのログ ファイルを開くことができませんでした",
-	"serverDiedAfterStart": "TypeScript 言語サービスは、開始直後に 5 回停止しました。サービスは再開されません。",
-	"serverDiedReportIssue": "問題の報告",
-	"serverDied": "TypeScript 言語サービスは、直前の 5 分間に 5 回、予期せずに停止しました。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/typescript-language-features/out/utils/api.i18n.json b/i18n/jpn/extensions/typescript-language-features/out/utils/api.i18n.json
deleted file mode 100644
index 4b09d67cea3..00000000000
--- a/i18n/jpn/extensions/typescript-language-features/out/utils/api.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"invalidVersion": "バージョンが無効です"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/typescript-language-features/out/utils/logger.i18n.json b/i18n/jpn/extensions/typescript-language-features/out/utils/logger.i18n.json
deleted file mode 100644
index 8f5ef5415b9..00000000000
--- a/i18n/jpn/extensions/typescript-language-features/out/utils/logger.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"channelName": "TypeScript"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/typescript-language-features/out/utils/projectStatus.i18n.json b/i18n/jpn/extensions/typescript-language-features/out/utils/projectStatus.i18n.json
deleted file mode 100644
index d4f07accea4..00000000000
--- a/i18n/jpn/extensions/typescript-language-features/out/utils/projectStatus.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hintExclude": "プロジェクト全体の JavaScript/TypeScript 言語機能を有効にするには、多数のファイルが含まれるフォルダーを除外します。例: {0}",
-	"hintExclude.generic": "プロジェクト全体の JavaScript/TypeScript 言語機能を有効にするには、作業していないソース ファイルが含まれるサイズの大きなフォルダーを除外します。",
-	"large.label": "除外の構成",
-	"hintExclude.tooltip": "プロジェクト全体の JavaScript/TypeScript 言語機能を有効にするには、作業していないソース ファイルが含まれるサイズの大きなフォルダーを除外します。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/typescript-language-features/out/utils/typingsStatus.i18n.json b/i18n/jpn/extensions/typescript-language-features/out/utils/typingsStatus.i18n.json
deleted file mode 100644
index 416302dc017..00000000000
--- a/i18n/jpn/extensions/typescript-language-features/out/utils/typingsStatus.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"installingPackages": "より適した TypeScript IntelliSense に関するデータをフェッチしています",
-	"typesInstallerInitializationFailed.title": "JavaScript 言語機能のための型定義ファイルをインストールできませんでした。NPM のインストールを確認するか、ユーザー設定で  'typescript.npm' を構成してください。詳細は [こちら]({0}) をクリックしてください。",
-	"typesInstallerInitializationFailed.doNotCheckAgain": "今後は表示しない"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/typescript-language-features/out/utils/versionPicker.i18n.json b/i18n/jpn/extensions/typescript-language-features/out/utils/versionPicker.i18n.json
deleted file mode 100644
index e9aaf978151..00000000000
--- a/i18n/jpn/extensions/typescript-language-features/out/utils/versionPicker.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"useVSCodeVersionOption": "VS Code のバージョンを使用",
-	"useWorkspaceVersionOption": "ワークスペースのバージョンを使用",
-	"learnMore": "詳細情報",
-	"selectTsVersion": "JavaScript および TypeScript 言語の機能に使用する TypeScript バージョンを選択します"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/typescript-language-features/out/utils/versionProvider.i18n.json b/i18n/jpn/extensions/typescript-language-features/out/utils/versionProvider.i18n.json
deleted file mode 100644
index bb98209ca70..00000000000
--- a/i18n/jpn/extensions/typescript-language-features/out/utils/versionProvider.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"couldNotLoadTsVersion": "このパスでは TypeScript のバージョンを読み込むことができません",
-	"noBundledServerFound": "VS Code の tsserver が適切に動作しないウイルス検出ツールなどの他アプリケーションにより削除されました。VS Code を再インストールしてください。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/typescript-language-features/package.i18n.json b/i18n/jpn/extensions/typescript-language-features/package.i18n.json
deleted file mode 100644
index 63f8c98d309..00000000000
--- a/i18n/jpn/extensions/typescript-language-features/package.i18n.json
+++ /dev/null
@@ -1,67 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "TypeScript と JavaScript の言語機能",
-	"description": "JavaScript と TypeScript ファイルに豊富な言語サポートを提供。",
-	"reloadProjects.title": "プロジェクトの再読み込み",
-	"configuration.typescript": "TypeScript",
-	"typescript.useCodeSnippetsOnMethodSuggest.dec": "パラメーター シグネチャを含む完全な関数。",
-	"typescript.tsdk.desc": "使用する tsserver と lib*.d.ts ファイルが含まれているフォルダーのパスを指定します。",
-	"typescript.disableAutomaticTypeAcquisition": "型定義の自動取得を無効にします。TypeScript 2.0.6 以上が必要です。",
-	"typescript.tsserver.log": "ファイルへの TS サーバーのログを有効にします。このログは TS サーバーの問題を診断するために使用できます。ログには、プロジェクトのファイルパス、ソースコード、その他の潜在的に機密性の高い情報が含まれている場合があります。",
-	"typescript.tsserver.pluginPaths": "Typescript 言語サービス プラグインを検出する追加のパス。TypeScript 2.3.0以上が必要。",
-	"typescript.tsserver.pluginPaths.item": "絶対または相対パスのいずれか。相対パスはワークスペース フォルダーに対して解決されます。",
-	"typescript.tsserver.trace": "TS サーバーに送信されるメッセージのトレースを有効にします。このトレースは TS サーバーの問題を診断するために使用できます。トレースには、プロジェクトのファイルパス、ソースコード、その他の潜在的に機密性の高い情報が含まれている場合があります。",
-	"typescript.validate.enable": "TypeScript の検証を有効/無効にします。",
-	"typescript.format.enable": "既定の TypeScript フォーマッタを有効/無効にします。",
-	"javascript.format.enable": "既定の JavaScript フォーマッタを有効/無効にします。",
-	"format.insertSpaceAfterCommaDelimiter": "コンマ区切り記号の後のスペース処理を定義します。",
-	"format.insertSpaceAfterConstructor": "コンストラクター キーワードの後にスペース処理を定義します。TypeScript が 2.3.0 以上である必要があります。",
-	"format.insertSpaceAfterSemicolonInForStatements": " for ステートメント内のセミコロンの後のスペース処理を定義します。",
-	"format.insertSpaceBeforeAndAfterBinaryOperators": "2 項演算子の後のスペース処理を定義します。",
-	"format.insertSpaceAfterKeywordsInControlFlowStatements": "制御フロー ステートメント内のキーワードの後のスペース処理を定義します。",
-	"format.insertSpaceAfterFunctionKeywordForAnonymousFunctions": "匿名関数の関数キーワードの後のスペース処理を定義します。",
-	"format.insertSpaceBeforeFunctionParenthesis": "関数の引数のかっこの前にあるスペース処理を定義します。TypeScript が 2.1.5. 以上である必要があります。",
-	"format.insertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis": "左右の空でないかっこの間のスペース処理を定義します。",
-	"format.insertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets": "左右の空でない角かっこの間のスペース処理を定義します。",
-	"format.insertSpaceAfterOpeningAndBeforeClosingNonemptyBraces": "左右の空でないかっこの間のスペース処理を定義します。TypeScript が 2.3.0 以上である必要があります。",
-	"format.insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces": "テンプレート文字列の始め波かっこの後と終わり波かっこの前のスペース処理を定義します。TypeScript が 2.0.6 以上である必要があります。",
-	"format.insertSpaceAfterOpeningAndBeforeClosingJsxExpressionBraces": "JSX 式の始め波かっこの後と終わり波かっこの前のスペース処理を定義します。TypeScript が 2.0.6 以上である必要があります。",
-	"format.insertSpaceAfterTypeAssertion": "TypeScript の型アサーションの後のスペース処理を定義します。TypeScript が 2.4 以上である必要があります。",
-	"format.placeOpenBraceOnNewLineForFunctions": "新しい行に関数の始め波かっこを配置するかどうかを定義します。",
-	"format.placeOpenBraceOnNewLineForControlBlocks": "新しい行にコントロール ブロックの始め波かっこを配置するかどうかを定義します。",
-	"javascript.validate.enable": "JavaScript の検証を有効/無効にします。",
-	"goToProjectConfig.title": "プロジェクト構成に移動",
-	"javascript.referencesCodeLens.enabled": "JavaScript ファイル内で CodeLens の参照を有効/無効にします。",
-	"typescript.referencesCodeLens.enabled": "TypeScript ファイル内で CodeLens の参照を有効/無効にします。TypeScript 2.0.6 以上が必要です。",
-	"typescript.implementationsCodeLens.enabled": "CodeLens の実装を有効/無効にします。TypeScript 2.2.0 以上が必要です。",
-	"typescript.openTsServerLog.title": "TS サーバーのログを開く",
-	"typescript.restartTsServer": "TS サーバーを再起動",
-	"typescript.selectTypeScriptVersion.title": "TypeScript のバージョンの選択",
-	"typescript.reportStyleChecksAsWarnings": "スタイルチェックレポートを警告扱いとする",
-	"jsDocCompletion.enabled": " 自動 JSDoc コメントを有効/無効にします",
-	"javascript.implicitProjectConfig.checkJs": "JavaScript ファイルのセマンティック チェックを有効/無効にします。既存の jsconfig.json や tsconfig.json ファイルの設定はこれより優先されます。TypeScript は 2.3.1 以上が必要です。",
-	"typescript.npm": "型定義の自動取得に使用される NPM 実行可能ファイルへのパスを指定します。TypeScript 2.3.4 以上が必要です。",
-	"typescript.check.npmIsInstalled": "型定義の自動取得に NPM がインストールされているかどうかを確認します。",
-	"javascript.nameSuggestions": "JavaScript の候補リスト内でファイルから一意の名前を含むかどうかを有効/無効にします。",
-	"typescript.tsc.autoDetect": "tsc タスクの自動検出を制御します。'off' はこの機能を無効にします。'build' は 1 つのコンパイル実行タスクのみを表示します。'watch' はコンパイルとウォッチ タスクのみを表示します。'on' はビルド タスクとウォッチ タスクの両方を表示します。既定値は 'on' です。",
-	"typescript.problemMatchers.tsc.label": "TypeScript の問題",
-	"typescript.problemMatchers.tscWatch.label": "TypeScript の問題 (ウォッチ モード)",
-	"typescript.quickSuggestionsForPaths": "Import パスを入力するときのクイック候補を有効/無効にします。",
-	"typescript.locale": "JavaScript と TypeScript のエラーを報告するために使用するロケールを設定します。TypeScript は 2.6.0 以上が必要です。'null' の既定値では VS Code のロケールを使用します。",
-	"javascript.implicitProjectConfig.experimentalDecorators": "プロジェクト外の JavaScript ファイルの 'experimentalDecorators' を有効/無効にします。既存の jsconfi.json や tsconfi.json ファイルの設定はこれより優先されます。TypeScript は 2.3.1 以上が必要です。",
-	"typescript.autoImportSuggestions.enabled": "自動 import 提案を有効/無効にします。TypeScript 2.6.1 以上が必要です",
-	"typescript.experimental.syntaxFolding": "構文の折りたたみマーカー認識を有効/無効にします。",
-	"taskDefinition.tsconfig.description": "TS ビルドを定義する tsconfig ファイル。",
-	"javascript.suggestionActions.enabled": "エディター内で JavaScript ファイルの診断の提案を有効または無効にします。TypeScript 2.8 以上である必要があります。",
-	"typescript.suggestionActions.enabled": "エディター内で TypeScript ファイルの提案診断を有効/無効にします。TypeScript 2.8 以上が必要です",
-	"typescript.preferences.quoteStyle": "クイック修正に使用するのに好ましい引用符のスタイル: 'single' 引用符、'double' 引用符、既存の import から種類を推測する 'auto'。TypeScript 2.9 以上が必要です",
-	"typescript.preferences.importModuleSpecifier": "自動 import で優先されるパスのスタイル:\n- ファイルの場所に相対的な \"relative\"。\n- 'jsconfig.json' / 'tsconfig.json' で構成されている 'baseUrl' に基づく \"non-relative\"。\n- 最短のパス型を推論する \"auto\"。\nTypeScript 2.9 以上が必要です",
-	"typescript.showUnused": "コード内で使用されていない変数の強調表示を有効/無効にします。TypeScript 2.9 以上が必要です。",
-	"typescript.updateImportsOnFileMove.enabled": "VS Code でファイルの名前変更や移動するときの import パスの自動的な更新を有効/無効にします。有効な値は: 名前変更時に確認をする 'prompt'、常に自動的にパスを更新する 'always'、パスの名前を変更せず確認も行わない 'never' です。TypeScript 2.9 以上が必要です。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/typescript/out/commands.i18n.json b/i18n/jpn/extensions/typescript/out/commands.i18n.json
deleted file mode 100644
index e69dc45423d..00000000000
--- a/i18n/jpn/extensions/typescript/out/commands.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"typescript.projectConfigNoWorkspace": "TypeScript または JavaScript プロジェクトを使用するには、VS Code でフォルダーを開いてください",
-	"typescript.projectConfigUnsupportedFile": "TypeScript または JavaScript のプロジェクトを判別できませんでした。サポートされていないファイルの種類です",
-	"typescript.projectConfigCouldNotGetInfo": "TypeScript または JavaScript のプロジェクトを判別できませんでした",
-	"typescript.noTypeScriptProjectConfig": "ファイルは TypeScript プロジェクトの一部ではありません。詳細情報は [こちら]({1}) をクリックしてください。",
-	"typescript.noJavaScriptProjectConfig": "ファイルは JavaScript プロジェクトの一部ではありません。詳細情報は [こちら]({1}) をクリックしてください。",
-	"typescript.configureTsconfigQuickPick": "tsconfig.json を構成する",
-	"typescript.configureJsconfigQuickPick": "jsconfig.json を構成する"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/typescript/out/features/bufferSyncSupport.i18n.json b/i18n/jpn/extensions/typescript/out/features/bufferSyncSupport.i18n.json
deleted file mode 100644
index e11a2a2a20f..00000000000
--- a/i18n/jpn/extensions/typescript/out/features/bufferSyncSupport.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"versionMismatch": "エディター機能は TypeScript ({1}) を使用しています。TypeScript ({0}) がコンピューターへグローバルにインストールされているため、VS Code のエラーは TSC エラーと異なる場合があります。",
-	"moreInformation": "詳細情報",
-	"doNotCheckAgain": "今後確認しない",
-	"close": "閉じる",
-	"updateTscCheck": "ユーザー設定 'typescript.check.tscVersion' を false に更新しました"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/typescript/out/features/completionItemProvider.i18n.json b/i18n/jpn/extensions/typescript/out/features/completionItemProvider.i18n.json
deleted file mode 100644
index adb307b9768..00000000000
--- a/i18n/jpn/extensions/typescript/out/features/completionItemProvider.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"selectCodeAction": "適用するコード アクションを選択",
-	"acquiringTypingsLabel": "Typings の定義ファイルを取得中...",
-	"acquiringTypingsDetail": "IntelliSense の Typings の定義ファイルを取得しています。",
-	"autoImportLabel": "{0} から自動インポート"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/typescript/out/features/directiveCommentCompletionProvider.i18n.json b/i18n/jpn/extensions/typescript/out/features/directiveCommentCompletionProvider.i18n.json
deleted file mode 100644
index 19d9bea48dd..00000000000
--- a/i18n/jpn/extensions/typescript/out/features/directiveCommentCompletionProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"ts-check": "JavaScript ファイルのセマンティック チェックを有効にします。 ファイルの先頭にある必要があります。",
-	"ts-nocheck": "JavaScript ファイルのセマンティック チェックを無効にします。 ファイルの先頭にある必要があります。",
-	"ts-ignore": "ファイルの次の行で @ts-check エラーを抑制します。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/typescript/out/features/implementationsCodeLensProvider.i18n.json b/i18n/jpn/extensions/typescript/out/features/implementationsCodeLensProvider.i18n.json
deleted file mode 100644
index 64c5084a0d1..00000000000
--- a/i18n/jpn/extensions/typescript/out/features/implementationsCodeLensProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"oneImplementationLabel": "1 個の実装",
-	"manyImplementationLabel": "{0} 個の実装",
-	"implementationsErrorLabel": "実装を特定できませんでした"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/typescript/out/features/jsDocCompletionProvider.i18n.json b/i18n/jpn/extensions/typescript/out/features/jsDocCompletionProvider.i18n.json
deleted file mode 100644
index 26a29c2851a..00000000000
--- a/i18n/jpn/extensions/typescript/out/features/jsDocCompletionProvider.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"typescript.jsDocCompletionItem.documentation": "JSDoc コメント"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/typescript/out/features/quickFixProvider.i18n.json b/i18n/jpn/extensions/typescript/out/features/quickFixProvider.i18n.json
deleted file mode 100644
index 453c92d6195..00000000000
--- a/i18n/jpn/extensions/typescript/out/features/quickFixProvider.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"fixAllInFileLabel": "{0} (ファイルの中のすべてを修正する)"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/typescript/out/features/referencesCodeLensProvider.i18n.json b/i18n/jpn/extensions/typescript/out/features/referencesCodeLensProvider.i18n.json
deleted file mode 100644
index 71699891f3b..00000000000
--- a/i18n/jpn/extensions/typescript/out/features/referencesCodeLensProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"oneReferenceLabel": "1 個の参照",
-	"manyReferenceLabel": "{0} 個の参照",
-	"referenceErrorLabel": "参照を判別できませんでした"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/typescript/out/features/taskProvider.i18n.json b/i18n/jpn/extensions/typescript/out/features/taskProvider.i18n.json
deleted file mode 100644
index bb8e166d153..00000000000
--- a/i18n/jpn/extensions/typescript/out/features/taskProvider.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"buildTscLabel": "ビルド - {0}",
-	"buildAndWatchTscLabel": "ウォッチ - {0}"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/typescript/out/typescriptMain.i18n.json b/i18n/jpn/extensions/typescript/out/typescriptMain.i18n.json
deleted file mode 100644
index e996cf2c1a9..00000000000
--- a/i18n/jpn/extensions/typescript/out/typescriptMain.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"typescript.projectConfigNoWorkspace": "TypeScript または JavaScript プロジェクトを使用するには、VS Code でフォルダーを開いてください",
-	"typescript.projectConfigUnsupportedFile": "TypeScript または JavaScript のプロジェクトを判別できませんでした。サポートされていないファイルの種類です",
-	"typescript.projectConfigCouldNotGetInfo": "TypeScript または JavaScript のプロジェクトを判別できませんでした",
-	"typescript.noTypeScriptProjectConfig": "ファイルは TypeScript プロジェクトの一部ではない",
-	"typescript.noJavaScriptProjectConfig": "ファイルは JavaScript プロジェクトの一部ではない",
-	"typescript.configureTsconfigQuickPick": "tsconfig.json を構成する",
-	"typescript.configureJsconfigQuickPick": "jsconfig.json を構成する",
-	"typescript.projectConfigLearnMore": "詳細情報"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/typescript/out/typescriptServiceClient.i18n.json b/i18n/jpn/extensions/typescript/out/typescriptServiceClient.i18n.json
deleted file mode 100644
index 904634944f4..00000000000
--- a/i18n/jpn/extensions/typescript/out/typescriptServiceClient.i18n.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noServerFound": "パス {0} は、有効な tsserver インストールを指していません。バンドルされている TypeScript バージョンにフォールバックしています。",
-	"serverCouldNotBeStarted": "TypeScript 言語サーバーを起動できません。エラー メッセージ: {0}",
-	"typescript.openTsServerLog.notSupported": "TS サーバーのログには TS 2.2.2 以降が必要です",
-	"typescript.openTsServerLog.loggingNotEnabled": "TS サーバーのログがオフになっています。ログを有効にするには、`typescript.tsserver.log` を設定して TS サーバーを再起動してください",
-	"typescript.openTsServerLog.enableAndReloadOption": "ログを有効にして、TS サーバーを再起動する",
-	"typescript.openTsServerLog.noLogFile": "TS サーバーはログを開始していません。",
-	"openTsServerLog.openFileFailedFailed": "TS サーバーのログ ファイルを開くことができませんでした",
-	"serverDiedAfterStart": "TypeScript 言語サービスは、開始直後に 5 回停止しました。サービスは再開されません。",
-	"serverDiedReportIssue": "問題の報告",
-	"serverDied": "TypeScript 言語サービスは、直前の 5 分間に 5 回、予期せずに停止しました。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/typescript/out/utils/api.i18n.json b/i18n/jpn/extensions/typescript/out/utils/api.i18n.json
deleted file mode 100644
index 4b09d67cea3..00000000000
--- a/i18n/jpn/extensions/typescript/out/utils/api.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"invalidVersion": "バージョンが無効です"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/typescript/out/utils/logger.i18n.json b/i18n/jpn/extensions/typescript/out/utils/logger.i18n.json
deleted file mode 100644
index 8f5ef5415b9..00000000000
--- a/i18n/jpn/extensions/typescript/out/utils/logger.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"channelName": "TypeScript"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/typescript/out/utils/projectStatus.i18n.json b/i18n/jpn/extensions/typescript/out/utils/projectStatus.i18n.json
deleted file mode 100644
index d4f07accea4..00000000000
--- a/i18n/jpn/extensions/typescript/out/utils/projectStatus.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hintExclude": "プロジェクト全体の JavaScript/TypeScript 言語機能を有効にするには、多数のファイルが含まれるフォルダーを除外します。例: {0}",
-	"hintExclude.generic": "プロジェクト全体の JavaScript/TypeScript 言語機能を有効にするには、作業していないソース ファイルが含まれるサイズの大きなフォルダーを除外します。",
-	"large.label": "除外の構成",
-	"hintExclude.tooltip": "プロジェクト全体の JavaScript/TypeScript 言語機能を有効にするには、作業していないソース ファイルが含まれるサイズの大きなフォルダーを除外します。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/typescript/out/utils/typingsStatus.i18n.json b/i18n/jpn/extensions/typescript/out/utils/typingsStatus.i18n.json
deleted file mode 100644
index 416302dc017..00000000000
--- a/i18n/jpn/extensions/typescript/out/utils/typingsStatus.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"installingPackages": "より適した TypeScript IntelliSense に関するデータをフェッチしています",
-	"typesInstallerInitializationFailed.title": "JavaScript 言語機能のための型定義ファイルをインストールできませんでした。NPM のインストールを確認するか、ユーザー設定で  'typescript.npm' を構成してください。詳細は [こちら]({0}) をクリックしてください。",
-	"typesInstallerInitializationFailed.doNotCheckAgain": "今後は表示しない"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/typescript/out/utils/versionPicker.i18n.json b/i18n/jpn/extensions/typescript/out/utils/versionPicker.i18n.json
deleted file mode 100644
index e9aaf978151..00000000000
--- a/i18n/jpn/extensions/typescript/out/utils/versionPicker.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"useVSCodeVersionOption": "VS Code のバージョンを使用",
-	"useWorkspaceVersionOption": "ワークスペースのバージョンを使用",
-	"learnMore": "詳細情報",
-	"selectTsVersion": "JavaScript および TypeScript 言語の機能に使用する TypeScript バージョンを選択します"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/typescript/out/utils/versionProvider.i18n.json b/i18n/jpn/extensions/typescript/out/utils/versionProvider.i18n.json
deleted file mode 100644
index bb98209ca70..00000000000
--- a/i18n/jpn/extensions/typescript/out/utils/versionProvider.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"couldNotLoadTsVersion": "このパスでは TypeScript のバージョンを読み込むことができません",
-	"noBundledServerFound": "VS Code の tsserver が適切に動作しないウイルス検出ツールなどの他アプリケーションにより削除されました。VS Code を再インストールしてください。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/typescript/package.i18n.json b/i18n/jpn/extensions/typescript/package.i18n.json
deleted file mode 100644
index a1554306e84..00000000000
--- a/i18n/jpn/extensions/typescript/package.i18n.json
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "TypeScript と JavaScript の言語機能",
-	"description": "JavaScript と TypeScript ファイルに豊富な言語サポートを提供。",
-	"typescript.reloadProjects.title": "プロジェクトの再読み込み",
-	"javascript.reloadProjects.title": "プロジェクトの再読み込み",
-	"configuration.typescript": "TypeScript",
-	"typescript.useCodeSnippetsOnMethodSuggest.dec": "パラメーター シグネチャを含む完全な関数。",
-	"typescript.tsdk.desc": "使用する tsserver と lib*.d.ts ファイルが含まれているフォルダーのパスを指定します。",
-	"typescript.disableAutomaticTypeAcquisition": "型定義の自動取得を無効にします。TypeScript 2.0.6 以上が必要です。",
-	"typescript.tsserver.log": "ファイルへの TS サーバーのログを有効にします。このログは TS サーバーの問題を診断するために使用できます。ログには、プロジェクトのファイルパス、ソースコード、その他の潜在的に機密性の高い情報が含まれている場合があります。",
-	"typescript.tsserver.trace": "TS サーバーに送信されるメッセージのトレースを有効にします。このトレースは TS サーバーの問題を診断するために使用できます。トレースには、プロジェクトのファイルパス、ソースコード、その他の潜在的に機密性の高い情報が含まれている場合があります。",
-	"typescript.validate.enable": "TypeScript の検証を有効/無効にします。",
-	"typescript.format.enable": "既定の TypeScript フォーマッタを有効/無効にします。",
-	"javascript.format.enable": "既定の JavaScript フォーマッタを有効/無効にします。",
-	"format.insertSpaceAfterCommaDelimiter": "コンマ区切り記号の後のスペース処理を定義します。",
-	"format.insertSpaceAfterConstructor": "コンストラクター キーワードの後にスペース処理を定義します。TypeScript が 2.3.0 以上である必要があります。",
-	"format.insertSpaceAfterSemicolonInForStatements": " for ステートメント内のセミコロンの後のスペース処理を定義します。",
-	"format.insertSpaceBeforeAndAfterBinaryOperators": "2 項演算子の後のスペース処理を定義します。",
-	"format.insertSpaceAfterKeywordsInControlFlowStatements": "制御フロー ステートメント内のキーワードの後のスペース処理を定義します。",
-	"format.insertSpaceAfterFunctionKeywordForAnonymousFunctions": "匿名関数の関数キーワードの後のスペース処理を定義します。",
-	"format.insertSpaceBeforeFunctionParenthesis": "関数の引数のかっこの前にあるスペース処理を定義します。TypeScript が 2.1.5. 以上である必要があります。",
-	"format.insertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis": "左右の空でないかっこの間のスペース処理を定義します。",
-	"format.insertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets": "左右の空でない角かっこの間のスペース処理を定義します。",
-	"format.insertSpaceAfterOpeningAndBeforeClosingNonemptyBraces": "左右の空でないかっこの間のスペース処理を定義します。TypeScript が 2.3.0 以上である必要があります。",
-	"format.insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces": "テンプレート文字列の始め波かっこの後と終わり波かっこの前のスペース処理を定義します。TypeScript が 2.0.6 以上である必要があります。",
-	"format.insertSpaceAfterOpeningAndBeforeClosingJsxExpressionBraces": "JSX 式の始め波かっこの後と終わり波かっこの前のスペース処理を定義します。TypeScript が 2.0.6 以上である必要があります。",
-	"format.insertSpaceAfterTypeAssertion": "TypeScript の型アサーションの後のスペース処理を定義します。TypeScript が 2.4 以上である必要があります。",
-	"format.placeOpenBraceOnNewLineForFunctions": "新しい行に関数の始め波かっこを配置するかどうかを定義します。",
-	"format.placeOpenBraceOnNewLineForControlBlocks": "新しい行にコントロール ブロックの始め波かっこを配置するかどうかを定義します。",
-	"javascript.validate.enable": "JavaScript の検証を有効/無効にします。",
-	"typescript.goToProjectConfig.title": "プロジェクト構成に移動",
-	"javascript.goToProjectConfig.title": "プロジェクト構成に移動",
-	"javascript.referencesCodeLens.enabled": "JavaScript ファイル内で CodeLens の参照を有効/無効にします。",
-	"typescript.referencesCodeLens.enabled": "TypeScript ファイル内で CodeLens の参照を有効/無効にします。TypeScript 2.0.6 以上が必要です。",
-	"typescript.implementationsCodeLens.enabled": "CodeLens の実装を有効/無効にします。TypeScript 2.2.0 以上が必要です。",
-	"typescript.openTsServerLog.title": "TS サーバーのログを開く",
-	"typescript.restartTsServer": "TS サーバーを再起動",
-	"typescript.selectTypeScriptVersion.title": "TypeScript のバージョンの選択",
-	"typescript.reportStyleChecksAsWarnings": "スタイルチェックレポートを警告扱いとする",
-	"jsDocCompletion.enabled": " 自動 JSDoc コメントを有効/無効にします",
-	"javascript.implicitProjectConfig.checkJs": "JavaScript ファイルのセマンティック チェックを有効/無効にします。既存の jsconfi.json や tsconfi.json ファイルの設定はこれより優先されます。TypeScript は 2.3.1 以上である必要があります。",
-	"typescript.npm": "型定義の自動取得に使用される NPM 実行可能ファイルへのパスを指定します。TypeScript 2.3.4 以上が必要です。",
-	"typescript.check.npmIsInstalled": "型定義の自動取得に NPM がインストールされているかどうかを確認します。",
-	"javascript.nameSuggestions": "JavaScript の候補リスト内でファイルから一意の名前を含むかどうかを有効/無効にします。",
-	"typescript.tsc.autoDetect": "tsc タスクの自動検出を制御します。'off' はこの機能を無効にします。'build' は 1 つのコンパイル実行タスクのみを表示します。'watch' はコンパイルとウォッチ タスクのみを表示します。'on' はビルド タスクとウォッチ タスクの両方を表示します。既定値は 'on' です。",
-	"typescript.problemMatchers.tsc.label": "TypeScript の問題",
-	"typescript.problemMatchers.tscWatch.label": "TypeScript の問題 (ウォッチ モード)",
-	"typescript.quickSuggestionsForPaths": "Import パスを入力するときのクイック候補を有効/無効にします。",
-	"typescript.locale": "TypeScript のエラーを報告するために使用するロケールを設定します。TypeScript 2.6.0 以上が必要です。'null' の規定値は TypeScript のエラーに VS Code のロケールを使用します。",
-	"javascript.implicitProjectConfig.experimentalDecorators": "プロジェクト外の JavaScript ファイルの 'experimentalDecorators' を有効/無効にします。既存の jsconfi.json や tsconfi.json ファイルの設定はこれより優先されます。TypeScript は 2.3.1 以上である必要があります。",
-	"typescript.autoImportSuggestions.enabled": "自動 import 提案を有効/無効にします。TypeScript 2.6.1 以上が必要です",
-	"typescript.experimental.syntaxFolding": "構文の折りたたみマーカー認識を有効/無効にします。",
-	"taskDefinition.tsconfig.description": "TS ビルドを定義する tsconfig ファイル。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/vb/package.i18n.json b/i18n/jpn/extensions/vb/package.i18n.json
deleted file mode 100644
index f4b027a8478..00000000000
--- a/i18n/jpn/extensions/vb/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Visual Basic の基本言語サポート",
-	"description": "Visual Basic ファイル内でスニペット、構文ハイライト、かっこ一致、折りたたみを提供します。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/xml/package.i18n.json b/i18n/jpn/extensions/xml/package.i18n.json
deleted file mode 100644
index 2665b81d6ff..00000000000
--- a/i18n/jpn/extensions/xml/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "XML の基本言語サポート",
-	"description": "XML ファイル内で構文ハイライト、かっこ一致を提供します。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/yaml/package.i18n.json b/i18n/jpn/extensions/yaml/package.i18n.json
deleted file mode 100644
index 3e00386dff8..00000000000
--- a/i18n/jpn/extensions/yaml/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "YAML の基本言語サポート",
-	"description": "YAML ファイル内で構文ハイライト、かっこ一致を提供します。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/base/browser/ui/actionbar/actionbar.i18n.json b/i18n/jpn/src/vs/base/browser/ui/actionbar/actionbar.i18n.json
deleted file mode 100644
index 309631273fe..00000000000
--- a/i18n/jpn/src/vs/base/browser/ui/actionbar/actionbar.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"titleLabel": "{0} ({1})"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/base/browser/ui/aria/aria.i18n.json b/i18n/jpn/src/vs/base/browser/ui/aria/aria.i18n.json
deleted file mode 100644
index 47dd4e495e9..00000000000
--- a/i18n/jpn/src/vs/base/browser/ui/aria/aria.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"repeated": "{0} (再発)"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/base/browser/ui/findinput/findInput.i18n.json b/i18n/jpn/src/vs/base/browser/ui/findinput/findInput.i18n.json
deleted file mode 100644
index 7f06f9e6872..00000000000
--- a/i18n/jpn/src/vs/base/browser/ui/findinput/findInput.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"defaultLabel": "入力"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/base/browser/ui/findinput/findInputCheckboxes.i18n.json b/i18n/jpn/src/vs/base/browser/ui/findinput/findInputCheckboxes.i18n.json
deleted file mode 100644
index 8a4005a9f9c..00000000000
--- a/i18n/jpn/src/vs/base/browser/ui/findinput/findInputCheckboxes.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"caseDescription": "大文字と小文字を区別する",
-	"wordsDescription": "単語単位で検索する",
-	"regexDescription": "正規表現を使用する"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/base/browser/ui/inputbox/inputBox.i18n.json b/i18n/jpn/src/vs/base/browser/ui/inputbox/inputBox.i18n.json
deleted file mode 100644
index 0441e6402cd..00000000000
--- a/i18n/jpn/src/vs/base/browser/ui/inputbox/inputBox.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"alertErrorMessage": "エラー: {0}",
-	"alertWarningMessage": "警告: {0}",
-	"alertInfoMessage": "情報: {0}"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/base/browser/ui/resourceviewer/resourceViewer.i18n.json b/i18n/jpn/src/vs/base/browser/ui/resourceviewer/resourceViewer.i18n.json
deleted file mode 100644
index b70110f94fc..00000000000
--- a/i18n/jpn/src/vs/base/browser/ui/resourceviewer/resourceViewer.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"imgMeta": "{0}x{1} {2}",
-	"largeImageError": "画像が非常に大きいため、エディターに表示されません。 ",
-	"resourceOpenExternalButton": "外部のプログラムを使用して画像を開きますか?",
-	"nativeBinaryError": "このファイルはバイナリか、非常に大きいか、またはサポートされていないテキスト エンコードを使用しているため、エディターに表示されません。",
-	"sizeB": "{0}B",
-	"sizeKB": "{0}KB",
-	"sizeMB": "{0}MB",
-	"sizeGB": "{0}GB",
-	"sizeTB": "{0}TB"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json b/i18n/jpn/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json
deleted file mode 100644
index 750d811d866..00000000000
--- a/i18n/jpn/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"selectAriaOption": "{0}"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/base/browser/ui/toolbar/toolbar.i18n.json b/i18n/jpn/src/vs/base/browser/ui/toolbar/toolbar.i18n.json
deleted file mode 100644
index 4048e2ea65b..00000000000
--- a/i18n/jpn/src/vs/base/browser/ui/toolbar/toolbar.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"more": "その他"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/base/common/errorMessage.i18n.json b/i18n/jpn/src/vs/base/common/errorMessage.i18n.json
deleted file mode 100644
index 321bf47464c..00000000000
--- a/i18n/jpn/src/vs/base/common/errorMessage.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"stackTrace.format": "{0}: {1}",
-	"error.defaultMessage": "不明なエラーが発生しました。ログで詳細を確認してください。",
-	"nodeExceptionMessage": "システム エラーが発生しました ({0})",
-	"error.moreErrors": "{0} (合計 {1} エラー)"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/base/common/json.i18n.json b/i18n/jpn/src/vs/base/common/json.i18n.json
deleted file mode 100644
index 21cbaadbdbc..00000000000
--- a/i18n/jpn/src/vs/base/common/json.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"error.invalidSymbol": "シンボルが無効です",
-	"error.invalidNumberFormat": "数値表示形式が無効です",
-	"error.propertyNameExpected": "プロパティ名が必要です",
-	"error.valueExpected": "値が必要です",
-	"error.colonExpected": "コロンが必要です",
-	"error.commaExpected": "コンマが必要です",
-	"error.closeBraceExpected": "右中かっこが必要です",
-	"error.closeBracketExpected": "右角かっこが必要です",
-	"error.endOfFileExpected": "ファイルの終わりが必要です"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/base/common/jsonErrorMessages.i18n.json b/i18n/jpn/src/vs/base/common/jsonErrorMessages.i18n.json
deleted file mode 100644
index 6d1861c0a1f..00000000000
--- a/i18n/jpn/src/vs/base/common/jsonErrorMessages.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"error.invalidSymbol": "シンボルが無効です",
-	"error.invalidNumberFormat": "数値表示形式が無効です",
-	"error.propertyNameExpected": "プロパティ名が必要です",
-	"error.valueExpected": "値が必要です",
-	"error.colonExpected": "コロンが必要です",
-	"error.commaExpected": "コンマが必要です",
-	"error.closeBraceExpected": "右中かっこが必要です",
-	"error.closeBracketExpected": "右角かっこが必要です",
-	"error.endOfFileExpected": "EOF が必要です"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/base/common/keybindingLabels.i18n.json b/i18n/jpn/src/vs/base/common/keybindingLabels.i18n.json
deleted file mode 100644
index d19afb8fbf4..00000000000
--- a/i18n/jpn/src/vs/base/common/keybindingLabels.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"ctrlKey": "Ctrl",
-	"shiftKey": "Shift",
-	"altKey": "Alt",
-	"windowsKey": "Windows",
-	"ctrlKey.long": "Control",
-	"shiftKey.long": "Shift",
-	"altKey.long": "Alt",
-	"cmdKey.long": "コマンド",
-	"windowsKey.long": "Windows"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/base/common/processes.i18n.json b/i18n/jpn/src/vs/base/common/processes.i18n.json
deleted file mode 100644
index fd42d989c5b..00000000000
--- a/i18n/jpn/src/vs/base/common/processes.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"ExecutableParser.commandMissing": "エラー: 実行可能ファイルの情報は、型 string のコマンドを定義する必要があります。",
-	"ExecutableParser.isShellCommand": "警告: isShellCommand は、型ブール値でなければなりません。値 {0} を無視します。",
-	"ExecutableParser.args": "警告: 引数は、型 string[] でなければなりません。値 {0} を無視します。",
-	"ExecutableParser.invalidCWD": "警告: options.cwd は、型 string でなければなりません。値 {0} を無視します。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/base/common/severity.i18n.json b/i18n/jpn/src/vs/base/common/severity.i18n.json
deleted file mode 100644
index 5842e6fd343..00000000000
--- a/i18n/jpn/src/vs/base/common/severity.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"sev.error": "エラー",
-	"sev.warning": "警告",
-	"sev.info": "情報"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/base/node/processes.i18n.json b/i18n/jpn/src/vs/base/node/processes.i18n.json
deleted file mode 100644
index 0a846d65bed..00000000000
--- a/i18n/jpn/src/vs/base/node/processes.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"TaskRunner.UNC": "UNC ドライブ上でシェル コマンドを実行できません。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/base/node/ps.i18n.json b/i18n/jpn/src/vs/base/node/ps.i18n.json
deleted file mode 100644
index 063f7302f8e..00000000000
--- a/i18n/jpn/src/vs/base/node/ps.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"collecting": "CPU とメモリーの情報を収集しています。これには数秒かかる場合があります。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/base/node/zip.i18n.json b/i18n/jpn/src/vs/base/node/zip.i18n.json
deleted file mode 100644
index 285911a9a78..00000000000
--- a/i18n/jpn/src/vs/base/node/zip.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"incompleteExtract": "不完全です。{0} / {1} 個のエントリが見つかりました",
-	"notFound": "zip ファイルの中に {0} が見つかりません。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/base/parts/quickopen/browser/quickOpenModel.i18n.json b/i18n/jpn/src/vs/base/parts/quickopen/browser/quickOpenModel.i18n.json
deleted file mode 100644
index bb65d0f69b0..00000000000
--- a/i18n/jpn/src/vs/base/parts/quickopen/browser/quickOpenModel.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"quickOpenAriaLabelEntry": "{0}, ピッカー",
-	"quickOpenAriaLabel": "選択"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/base/parts/quickopen/browser/quickOpenWidget.i18n.json b/i18n/jpn/src/vs/base/parts/quickopen/browser/quickOpenWidget.i18n.json
deleted file mode 100644
index d7177135c0c..00000000000
--- a/i18n/jpn/src/vs/base/parts/quickopen/browser/quickOpenWidget.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"quickOpenAriaLabel": "クイック選択。入力すると結果が絞り込まれます。",
-	"treeAriaLabel": "クイック選択"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/base/parts/tree/browser/treeDefaults.i18n.json b/i18n/jpn/src/vs/base/parts/tree/browser/treeDefaults.i18n.json
deleted file mode 100644
index 2b61d86954a..00000000000
--- a/i18n/jpn/src/vs/base/parts/tree/browser/treeDefaults.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"collapse": "折りたたむ"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json b/i18n/jpn/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
deleted file mode 100644
index 315725569ba..00000000000
--- a/i18n/jpn/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hide": "非表示",
-	"show": "表示",
-	"previewOnGitHub": "GitHub 上でプレビュー",
-	"loadingData": "データを読み込んでいます...",
-	"rateLimited": "GitHub クエリの制限を超えました。お待ちください。",
-	"similarIssues": "類似の問題",
-	"open": "Open",
-	"closed": "Closed",
-	"noSimilarIssues": "類似の問題は見つかりませんでした",
-	"settingsSearchIssue": "設定検索の問題",
-	"bugReporter": "バグ レポート",
-	"featureRequest": "機能欲求",
-	"performanceIssue": "パフォーマンスの問題",
-	"stepsToReproduce": "再現手順",
-	"bugDescription": "問題を再現するための正確な手順を共有します。このとき、期待する結果と実際の結果を提供してください。GitHub-flavored Markdown に対応しています。GitHub 上で確認するときに問題を編集してスクリーンショットを追加できます。",
-	"performanceIssueDesciption": "このパフォーマンスの問題はいつ発生しましたか? それは起動時ですか? それとも特定のアクションのあとですか? GitHub-flavored Markdown に対応しています。GitHub 上で確認するときに問題を編集してスクリーンショットを追加できます。",
-	"description": "説明",
-	"featureRequestDescription": "見てみたいその機能についての詳細を入力してください。GitHub-flavored Markdown に対応しています。GitHub 上で確認するときに問題を編集してスクリーンショットを追加できます。",
-	"expectedResults": "期待された結果",
-	"settingsSearchResultsDescription": "このクエリで検索したときに、表示されることを期待していた結果をリストしてください。GitHub-flavored Markdown に対応しています。GitHub 上で確認するときに問題を編集してスクリーンショットを追加できます。",
-	"pasteData": "必要なデータが送信するには大きすぎたため、クリップボードに書き込みました。貼り付けてください。",
-	"disabledExtensions": "拡張機能が無効化されています"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json b/i18n/jpn/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
deleted file mode 100644
index 0b1e88174f8..00000000000
--- a/i18n/jpn/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"completeInEnglish": "英語で記入して下さい。",
-	"issueTypeLabel": "種類",
-	"issueSourceLabel": "記録",
-	"vscode": "Visual Studio Code",
-	"extension": "拡張機能",
-	"disableExtensionsLabelText": "{0} を実行後に問題を再現してみてください。拡張機能がアクティブな場合にのみ問題が再現する場合は、拡張機能の問題である可能性があります。",
-	"disableExtensions": "すべての拡張機能を無効にしてウィンドウを再読みする",
-	"chooseExtension": "拡張機能",
-	"issueTitleLabel": "題名",
-	"issueTitleRequired": "題名を入力してください",
-	"titleLengthValidation": "タイトルが長すぎます。",
-	"details": "詳細を入力してください。",
-	"sendSystemInfo": "自分のシステム情報 ({0}) を含める",
-	"show": "表示",
-	"sendProcessInfo": "自分が現在実行中のプロセス ({0}) を含める",
-	"sendWorkspaceInfo": "自分のワークスペースのメタデータ ({0}) を含める",
-	"sendExtensions": "自分の利用可能な拡張機能 ({0}) を含める",
-	"sendSearchedExtensions": "検索された拡張機能 ({0}) を送信する",
-	"sendSettingsSearchDetails": "設定検索の詳細 ({0}) を送信する"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/code/electron-browser/processExplorer/processExplorerMain.i18n.json b/i18n/jpn/src/vs/code/electron-browser/processExplorer/processExplorerMain.i18n.json
deleted file mode 100644
index d8aef7839d1..00000000000
--- a/i18n/jpn/src/vs/code/electron-browser/processExplorer/processExplorerMain.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"cpu": "CPU %",
-	"memory": "メモリ (MB)",
-	"pid": "pid",
-	"name": "名前",
-	"killProcess": "プロセスの終了",
-	"forceKillProcess": "プロセスの強制終了",
-	"copy": "コピー",
-	"copyAll": "すべてコピー"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/code/electron-main/auth.i18n.json b/i18n/jpn/src/vs/code/electron-main/auth.i18n.json
deleted file mode 100644
index 882d453d265..00000000000
--- a/i18n/jpn/src/vs/code/electron-main/auth.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"authRequire": "プロキシ認証が必要",
-	"proxyauth": "{0} プロキシには認証が必要です。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/code/electron-main/logUploader.i18n.json b/i18n/jpn/src/vs/code/electron-main/logUploader.i18n.json
deleted file mode 100644
index 017becb5cd7..00000000000
--- a/i18n/jpn/src/vs/code/electron-main/logUploader.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"invalidEndpoint": "無効なログ アップローダーのエンドポイント",
-	"beginUploading": "アップロードしています...",
-	"didUploadLogs": "アップロードに成功しました! Log file ID: {0}",
-	"logUploadPromptHeader": "Microsoft メンバーの VS Code チームのみがアクセスできる安全な Microsoft エンドポイントにセッション ログをアップロードしようとしています。",
-	"logUploadPromptBody": "セッション ログは完全なパスやファイルの内容などの個人情報を含んでいる可能性があります。セッション ログ ファイルを次の場所で確認して編集してください: '{0}'",
-	"logUploadPromptBodyDetails": "続行するには、セッション ログ ファイルを確認および編集済みであり、Microsoft が VS Code のデバッグにそれらを利用することに同意しているかを確認してください。",
-	"logUploadPromptAcceptInstructions": "アップロードを続けるために '--upload-logs={0}' をつけて code を実行してください",
-	"postError": "ログを提出中のエラー: {0}",
-	"responseError": "ログの投稿でエラーが発生しました。{0} を取得しました — {1}",
-	"parseError": "レスポンスを解析中にエラー",
-	"zipError": "ログを zip に圧縮中にエラー : {0}"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/code/electron-main/main.i18n.json b/i18n/jpn/src/vs/code/electron-main/main.i18n.json
deleted file mode 100644
index e137b7d2995..00000000000
--- a/i18n/jpn/src/vs/code/electron-main/main.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"secondInstanceNoResponse": "{0} の別のインスタンスが実行中ですが応答していません",
-	"secondInstanceNoResponseDetail": "他すべてのインスタンスを閉じてからもう一度お試しください。",
-	"secondInstanceAdmin": "{0} の 2 つ目のインスタンスが既に管理者として実行されています。",
-	"secondInstanceAdminDetail": "他すべてのインスタンスを閉じてからもう一度お試しください。",
-	"close": "閉じる(&&C)"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/code/electron-main/menus.i18n.json b/i18n/jpn/src/vs/code/electron-main/menus.i18n.json
deleted file mode 100644
index ff7eb3df479..00000000000
--- a/i18n/jpn/src/vs/code/electron-main/menus.i18n.json
+++ /dev/null
@@ -1,193 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"mFile": "ファイル(&&F)",
-	"mEdit": "編集(&&E)",
-	"mSelection": "選択(&C)",
-	"mView": "表示(&&V)",
-	"mGoto": "移動(&G)",
-	"mDebug": "デバッグ(&&D)",
-	"mWindow": "ウィンドウ",
-	"mHelp": "ヘルプ(&&H)",
-	"mTask": "タスク(&&T)",
-	"miNewWindow": "新しいウィンドウ(&&W)",
-	"mAbout": "{0} のバージョン情報",
-	"mServices": "サービス",
-	"mHide": "{0} を非表示にする",
-	"mHideOthers": "その他を非表示にする",
-	"mShowAll": "すべて表示",
-	"miQuit": "{0} を終了",
-	"miNewFile": "新規ファイル(&&N)",
-	"miOpen": "開く(&&O)...",
-	"miOpenWorkspace": "ワークスペースを開く(&&K)...",
-	"miOpenFolder": "フォルダーを開く(&&F)...",
-	"miOpenFile": "ファイルを開く(&&O)...",
-	"miOpenRecent": "最近使用した項目を開く(&&R)",
-	"miSaveWorkspaceAs": "名前を付けてワークスペースを保存...",
-	"miAddFolderToWorkspace": "ワークスペースにフォルダーを追加(&&D)...",
-	"miSave": "保存(&&S)",
-	"miSaveAs": "名前を付けて保存(&&A)...",
-	"miSaveAll": "すべて保存(&&L)",
-	"miAutoSave": "自動保存",
-	"miRevert": "ファイルを元に戻す(&&V)",
-	"miCloseWindow": "ウィンドウを閉じる(&&E)",
-	"miCloseWorkspace": "ワークスペースを閉じる(&&W)",
-	"miCloseFolder": "フォルダーを閉じる(&&F)",
-	"miCloseEditor": "エディターを閉じる(&&C)",
-	"miExit": "終了(&E)",
-	"miOpenSettings": "設定 (&&S)",
-	"miOpenKeymap": "キーボード ショートカット(&&K)",
-	"miOpenKeymapExtensions": "キーマップ拡張機能(&&K)",
-	"miOpenSnippets": "ユーザー スニペット(&&S)",
-	"miSelectColorTheme": "配色テーマ(&&C)",
-	"miSelectIconTheme": "ファイル アイコンのテーマ(&&I)",
-	"miPreferences": "基本設定(&&P)",
-	"miReopenClosedEditor": "閉じたエディターを再度開く(&&R)",
-	"miMore": "その他(&&M)...",
-	"miClearRecentOpen": "最近開いた項目をクリア(&&C)",
-	"miUndo": "元に戻す(&&U)",
-	"miRedo": "やり直し(&&R)",
-	"miCut": "切り取り(&C)",
-	"miCopy": "コピー (&&C)",
-	"miPaste": "貼り付け(&&P)",
-	"miFind": "検索(&&F)",
-	"miReplace": "置換(&&R)",
-	"miFindInFiles": "複数ファイルから検索(&&I)",
-	"miReplaceInFiles": "複数のファイルで置換(&&I)",
-	"miEmmetExpandAbbreviation": "Emmet: 略語の展開(&&X)",
-	"miShowEmmetCommands": "Emmet(&&M)...",
-	"miToggleLineComment": "行コメントの切り替え(&&T)",
-	"miToggleBlockComment": "ブロック コメントの切り替え(&&B)",
-	"miMultiCursorAlt": "マルチ カーソルを Alt+Click に切り替える",
-	"miMultiCursorCmd": "マルチ カーソルを Cmd+Click に切り替える",
-	"miMultiCursorCtrl": "マルチ カーソルを Ctrl+Click に切り替える",
-	"miInsertCursorAbove": "カーソルを上に挿入(&&A)",
-	"miInsertCursorBelow": "カーソルを下に挿入(&&D)",
-	"miInsertCursorAtEndOfEachLineSelected": "カーソルを行末に挿入(&&U)",
-	"miAddSelectionToNextFindMatch": "次の出現箇所を追加(&&N)",
-	"miAddSelectionToPreviousFindMatch": "前の出現箇所を追加(&&R)",
-	"miSelectHighlights": "すべての出現箇所を選択(&&O)",
-	"miCopyLinesUp": "行を上へコピー(&&C)",
-	"miCopyLinesDown": "行を下へコピー(&&P)",
-	"miMoveLinesUp": "行を上へ移動(&&V)",
-	"miMoveLinesDown": "行を下へ移動(&&L)",
-	"miSelectAll": "すべて選択(&&S)",
-	"miSmartSelectGrow": "選択範囲の展開(&&E)",
-	"miSmartSelectShrink": "選択範囲の縮小(&&S)",
-	"miViewExplorer": "エクスプローラー(&&E)",
-	"miViewSearch": "検索(&&S)",
-	"miViewSCM": "SCM(&&S)",
-	"miViewDebug": "デバッグ(&&D)",
-	"miViewExtensions": "拡張機能(&&X)",
-	"miToggleOutput": "出力(&&O)",
-	"miToggleDebugConsole": "デバッグ コンソール(&&B)",
-	"miToggleIntegratedTerminal": "統合ターミナル(&&I)",
-	"miMarker": "問題(&&P)",
-	"miCommandPalette": "コマンド パレット(&&C)...",
-	"miOpenView": "ビューを開く... &&O",
-	"miToggleFullScreen": "全画面表示の切り替え(&&F)",
-	"miToggleZenMode": "Zen Mode の切り替え",
-	"miToggleCenteredLayout": "中央揃えレイアウトの切り替え",
-	"miToggleMenuBar": "メニュー バーの切り替え(&&B)",
-	"miSplitEditor": "エディターを分割(&&E)",
-	"miToggleEditorLayout": "エディター グループ レイアウトの切り替え(&&L)",
-	"miToggleSidebar": "サイドバーの切り替え(&&T)",
-	"miMoveSidebarRight": "サイド バーを右へ移動(&&M)",
-	"miMoveSidebarLeft": "サイド バーを左へ移動(&&M)",
-	"miTogglePanel": "パネルの切り替え(&&P)",
-	"miHideStatusbar": "ステータス バーを非表示(&&H)",
-	"miShowStatusbar": "ステータス バーの表示(&&S)",
-	"miHideActivityBar": "アクティビティ バーを非表示にする(&&A)",
-	"miShowActivityBar": "アクティビティ バーを表示する(&&A)",
-	"miToggleWordWrap": "折り返しの切り替え(&&W)",
-	"miToggleMinimap": "ミニマップの切り替え(&&M)",
-	"miToggleRenderWhitespace": "空白文字の表示の切り替え(&&R)",
-	"miToggleRenderControlCharacters": "制御文字の切り替え(&&C)",
-	"miZoomIn": "拡大(&&Z)",
-	"miZoomOut": "縮小(&&U)",
-	"miZoomReset": "ズームのリセット(&&R)",
-	"miBack": "戻る(&B)",
-	"miForward": "進む(&&F)",
-	"miNextEditor": "次のエディター(&&N)",
-	"miPreviousEditor": "前のエディター(&&P)",
-	"miNextEditorInGroup": "グループ内の次の使用されているエディター(&&N)",
-	"miPreviousEditorInGroup": "グループ内の前の使用されているエディター(&&P)",
-	"miSwitchEditor": "エディターの切り替え(&&E)",
-	"miFocusFirstGroup": "1 番目のグループ(&&F)",
-	"miFocusSecondGroup": "2 番目のグループ(&&S)",
-	"miFocusThirdGroup": "3 番目のグループ(&&T)",
-	"miNextGroup": "次のグループ(&&N)",
-	"miPreviousGroup": "前のグループ(&&P)",
-	"miSwitchGroup": "グループの切り替え(&&G)",
-	"miGotoFile": "ファイルに移動(&&F)...",
-	"miGotoSymbolInFile": "ファイル内のシンボルへ移動(&&S)...",
-	"miGotoSymbolInWorkspace": "ワークスペース内のシンボルへ移動(&&W)...",
-	"miGotoDefinition": "定義に移動(&&D)",
-	"miGotoTypeDefinition": "型定義に移動(&&T)",
-	"miGotoImplementation": "実装に移動(&&I)",
-	"miGotoLine": "指定行へ移動(&&L)...",
-	"miStartDebugging": "デバッグの開始(&&S)",
-	"miStartWithoutDebugging": "デバッグなしで開始(&&W)",
-	"miStopDebugging": "デバッグの停止(&&S)",
-	"miRestart Debugging": "デバッグの再起動(&&R)",
-	"miOpenConfigurations": "構成を開く(&&C)",
-	"miAddConfiguration": "構成の追加...",
-	"miStepOver": "ステップ オーバーする(&&O)",
-	"miStepInto": "ステップ インする(&&I)",
-	"miStepOut": "ステップ アウトする(&&U)",
-	"miContinue": "続行(&&C)",
-	"miToggleBreakpoint": "ブレークポイントの切り替え(&&B)",
-	"miConditionalBreakpoint": "条件付きブレークポイント(&&C)...",
-	"miInlineBreakpoint": "インライン ブレークポイント(&&O)",
-	"miFunctionBreakpoint": "関数のブレークポイント(&&F)...",
-	"miLogPoint": "ログポイント(&&L)",
-	"miNewBreakpoint": "新しいブレークポイント(&&N)",
-	"miEnableAllBreakpoints": "すべてのブレークポイントを有効にする",
-	"miDisableAllBreakpoints": "すべてのブレークポイントを無効にする(&&L)",
-	"miRemoveAllBreakpoints": "すべてのブレークポイントを削除する(&&R)",
-	"miInstallAdditionalDebuggers": "追加のデバッガーをインストール(&&I)...",
-	"mMinimize": "最小化",
-	"mZoom": "ズーム",
-	"mBringToFront": "すべてを前面に配置",
-	"miSwitchWindow": "ウィンドウの切り替え(&&W)...",
-	"mShowPreviousTab": "前のタブを表示",
-	"mShowNextTab": "次のタブを表示",
-	"mMoveTabToNewWindow": "タブを新しいウィンドウに移動",
-	"mMergeAllWindows": "すべてのウィンドウを統合",
-	"miToggleDevTools": "開発者ツールの切り替え(&&T)",
-	"miAccessibilityOptions": "ユーザー補助オプション(&&O)",
-	"miOpenProcessExplorerer": "プロセス エクスプローラーを開く(&&P)",
-	"miReportIssue": "問題の報告(&&I)",
-	"miWelcome": "ようこそ(&&W)",
-	"miInteractivePlayground": "対話型プレイグラウンド(&&I)",
-	"miDocumentation": "参照資料(&&D)",
-	"miReleaseNotes": "リリース ノート(&&R)",
-	"miKeyboardShortcuts": "キーボード ショートカットの参照(&&K)",
-	"miIntroductoryVideos": "紹介ビデオ(&&V)",
-	"miTipsAndTricks": "ヒントとコツ(&&T)",
-	"miTwitter": "ツイッターに参加(&&J)",
-	"miUserVoice": "機能要求の検索(&&S)",
-	"miLicense": "ライセンスの表示(&&L)",
-	"miPrivacyStatement": "プライバシーについて(&&P)",
-	"miAbout": "バージョン情報(&&A)",
-	"miRunTask": "タスクの実行(&&R)...",
-	"miBuildTask": "ビルド タスクの実行(&&B)...",
-	"miRunningTask": "実行中のタスクを表示(&&G)...",
-	"miRestartTask": "実行中のタスクの再起動(&&E)...",
-	"miTerminateTask": "タスクの終了(&&T)...",
-	"miConfigureTask": "タスクの構成(&&C)…",
-	"miConfigureBuildTask": "既定のビルド タスクの構成(&&F)…",
-	"accessibilityOptionsWindowTitle": "ユーザー補助オプション",
-	"miCheckForUpdates": "更新の確認...",
-	"miCheckingForUpdates": "更新を確認しています...",
-	"miDownloadUpdate": "利用可能な更新プログラムをダウンロードします",
-	"miDownloadingUpdate": "更新をダウンロードしています...",
-	"miInstallUpdate": "更新プログラムのインストール...",
-	"miInstallingUpdate": "更新プログラムをインストールしています...",
-	"miRestartToUpdate": "再起動して更新..."
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/code/electron-main/window.i18n.json b/i18n/jpn/src/vs/code/electron-main/window.i18n.json
deleted file mode 100644
index a319c46f96b..00000000000
--- a/i18n/jpn/src/vs/code/electron-main/window.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hiddenMenuBar": "引き続き Alt キーを押してメニュー バーにアクセスできます。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/code/electron-main/windows.i18n.json b/i18n/jpn/src/vs/code/electron-main/windows.i18n.json
deleted file mode 100644
index f510ab911e2..00000000000
--- a/i18n/jpn/src/vs/code/electron-main/windows.i18n.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"ok": "OK",
-	"pathNotExistTitle": "パスが存在しません",
-	"pathNotExistDetail": "パス '{0}' はディスクに存在しなくなったようです。",
-	"reopen": "もう一度開く(&&R)",
-	"wait": "待機を続ける(&&K)",
-	"close": "閉じる(&&C)",
-	"appStalled": "ウィンドウから応答がありません",
-	"appStalledDetail": "ウィンドウを再度開くか、閉じるか、このまま待機できます。",
-	"appCrashed": "ウィンドウがクラッシュしました",
-	"appCrashedDetail": "ご不便をおかけして申し訳ありません。ウィンドウを再度開いて、中断したところから続行できます。",
-	"open": "開く",
-	"openFolder": "フォルダーを開く",
-	"openFile": "ファイルを開く",
-	"workspaceOpenedMessage": "ワークスペース '{0}' を保存できません",
-	"workspaceOpenedDetail": "ワークスペースは既に別のウィンドウで開いています。最初にそのウィンドウを閉じててから、もう一度やり直してください。",
-	"openWorkspace": "開く(&&O)",
-	"openWorkspaceTitle": "ワークスペースを開く",
-	"save": "保存(&&S)",
-	"doNotSave": "保存しない(&&N)",
-	"cancel": "キャンセル",
-	"saveWorkspaceMessage": "ワークスペースの構成をファイルとして保存しますか?",
-	"saveWorkspaceDetail": "再度開く予定があるならワークスペースを保存します。",
-	"saveWorkspace": "ワークスペースを保存"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/code/node/cliProcessMain.i18n.json b/i18n/jpn/src/vs/code/node/cliProcessMain.i18n.json
deleted file mode 100644
index d4f994f4c39..00000000000
--- a/i18n/jpn/src/vs/code/node/cliProcessMain.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"notFound": "拡張機能 '{0}' が見つかりませんでした。",
-	"notInstalled": "拡張機能 '{0}' がインストールされていません。",
-	"useId": "発行元などの完全な拡張機能 ID を使用していることをご確認ください。例: {0}",
-	"successVsixInstall": "拡張機能 '{0}' が正常にインストールされました。",
-	"cancelVsixInstall": "拡張機能 '{0}' のインストールをキャンセルしました。",
-	"alreadyInstalled": "拡張機能 '{0}' は既にインストールされています。",
-	"foundExtension": "Marketplace で '{0}' が見つかりました。",
-	"installing": "インストールしています...",
-	"successInstall": "拡張機能 '{0}' v{1} が正常にインストールされました!",
-	"uninstalling": "{0} をアンインストールしています...",
-	"successUninstall": "拡張機能 '{0}' が正常にアンインストールされました!"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/editor/browser/services/bulkEdit.i18n.json b/i18n/jpn/src/vs/editor/browser/services/bulkEdit.i18n.json
deleted file mode 100644
index 89893c1411c..00000000000
--- a/i18n/jpn/src/vs/editor/browser/services/bulkEdit.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"summary.0": "編集は行われませんでした",
-	"summary.nm": "{1} 個のファイルで {0} 件のテキスト編集を実行",
-	"summary.n0": "1 つのファイルで {0} 個のテキストを編集",
-	"conflict": "この間に次のファイルが変更されました: {0}"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/editor/browser/widget/codeEditorWidget.i18n.json b/i18n/jpn/src/vs/editor/browser/widget/codeEditorWidget.i18n.json
deleted file mode 100644
index f29a4df99e0..00000000000
--- a/i18n/jpn/src/vs/editor/browser/widget/codeEditorWidget.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"cursors.maximum": "カーソルの数は {0} 個に制限されています。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/editor/browser/widget/diffEditorWidget.i18n.json b/i18n/jpn/src/vs/editor/browser/widget/diffEditorWidget.i18n.json
deleted file mode 100644
index 203a55dde83..00000000000
--- a/i18n/jpn/src/vs/editor/browser/widget/diffEditorWidget.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"diff.tooLarge": "一方のファイルが大きすぎるため、ファイルを比較できません。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/editor/browser/widget/diffReview.i18n.json b/i18n/jpn/src/vs/editor/browser/widget/diffReview.i18n.json
deleted file mode 100644
index a7429f0232b..00000000000
--- a/i18n/jpn/src/vs/editor/browser/widget/diffReview.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"label.close": "閉じる",
-	"no_lines": "行なし",
-	"one_line": "1 行",
-	"more_lines": "{0} 行",
-	"header": "{1} の差異 {0}: 変更前 {2}, {3}, 変更後 {4}, {5}",
-	"blankLine": "空白",
-	"equalLine": "変更前の {0}、変更後の {1}: {2}",
-	"insertLine": "+ 変更後の {0}: {1}",
-	"deleteLine": "- 変更前の {0}: {1}",
-	"editor.action.diffReview.next": "次の差分に移動",
-	"editor.action.diffReview.prev": "前の差分に移動"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/editor/common/commonCodeEditor.i18n.json b/i18n/jpn/src/vs/editor/common/commonCodeEditor.i18n.json
deleted file mode 100644
index f29a4df99e0..00000000000
--- a/i18n/jpn/src/vs/editor/common/commonCodeEditor.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"cursors.maximum": "カーソルの数は {0} 個に制限されています。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/editor/common/config/commonEditorConfig.i18n.json b/i18n/jpn/src/vs/editor/common/config/commonEditorConfig.i18n.json
deleted file mode 100644
index 8a524167aa3..00000000000
--- a/i18n/jpn/src/vs/editor/common/config/commonEditorConfig.i18n.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"editorConfigurationTitle": "エディター",
-	"fontFamily": "フォント ファミリを制御します。",
-	"fontWeight": "フォントの太さを制御します。",
-	"fontSize": "フォント サイズをピクセル単位で制御します。",
-	"lineHeight": "行の高さを制御します。fontSize に基づいて lineHeight を計算する場合には、0 を使用します。",
-	"letterSpacing": "文字の間隔をピクセル単位で制御します。",
-	"lineNumbers.off": "行番号は表示されません。",
-	"lineNumbers.on": "行番号は、絶対数として表示されます。",
-	"lineNumbers.relative": "行番号は、カーソル位置までの行数として表示されます。",
-	"lineNumbers.interval": "行番号は 10 行ごとに表示されます。",
-	"lineNumbers": "行番号の表示を制御します。",
-	"rulers": "等幅フォントの特定番号の後ろに垂直ルーラーを表示します。複数のルーラーには複数の値を使用します。配列が空の場合はルーラーを表示しません。",
-	"wordSeparators": "単語に関連したナビゲーションまたは操作を実行するときに、単語の区切り文字として使用される文字",
-	"tabSize": "1 つのタブに相当するスペースの数。`editor.detectIndentation` がオンの場合、この設定はファイル コンテンツに基づいて上書きされます。",
-	"tabSize.errorMessage": "'number' が必要です。`editor.detectIndentation` 設定によって値 \"auto\" が置き換えられていることに注意してください。",
-	"insertSpaces": "Tab キーを押すとスペースが挿入されます。`editor.detectIndentation` がオンの場合、この設定はファイル コンテンツに基づいて上書きされます。",
-	"insertSpaces.errorMessage": "'boolean' が必要です。`editor.detectIndentation` 設定によって値 \"auto\" が置き換えられていることに注意してください。",
-	"detectIndentation": "ファイルを開くと、そのファイルの内容に基づいて `editor.tabSize` と `editor.insertSpaces` が検出されます。",
-	"roundedSelection": "選択範囲の角を丸くするかどうかを制御します",
-	"scrollBeyondLastLine": "エディターで最後の行を越えてスクロールするかどうかを制御します",
-	"scrollBeyondLastColumn": "エディターが水平方向に余分にスクロールする文字数を制御します",
-	"smoothScrolling": "アニメーションでエディターをスクロールするかどうかを制御します",
-	"minimap.enabled": "ミニマップを表示するかどうかを制御します",
-	"minimap.side": "ミニマップを表示する場所を制御します。",
-	"minimap.showSlider": "ミニマップのスライダーを自動的に非表示にするかどうかを制御します。",
-	"minimap.renderCharacters": "行に (カラー ブロックではなく) 実際の文字を表示します",
-	"minimap.maxColumn": "表示するミニマップの最大幅を特定の桁数に制限します",
-	"find.seedSearchStringFromSelection": "エディターの選択から検索ウィジェット内の検索文字列を与えるかどうかを制御します",
-	"find.autoFindInSelection": "エディター内で複数の文字もしくは行が選択されているときに選択範囲を検索するフラグを有効にするかどうかを制御します",
-	"find.globalFindClipboard": "macOS で検索ウィジェットが共有の検索クリップボードを読み取りまたは変更するかどうかを制御します",
-	"wordWrap.off": "行を折り返しません。",
-	"wordWrap.on": "行をビューポートの幅で折り返します。",
-	"wordWrap.wordWrapColumn": "行を 'editor.wordWrapColumn' で折り返します。",
-	"wordWrap.bounded": "ビューポートと 'editor.wordWrapColumn' の最小値で行を折り返します。",
-	"wordWrap": "行の折り返し方法を制御します。次の値を指定できます。\n - 'off' (折り返さない),\n - 'on' (ビューポート折り返し),\n - 'wordWrapColumn' ('editor.wordWrapColumn' で折り返し) or\n - 'bounded' (ビューポートと 'editor.wordWrapColumn' の最小値で折り返し).",
-	"wordWrapColumn": "'editor.wordWrap' が 'wordWrapColumn' または 'bounded' の場合に、エディターの折り返し桁を制御します。",
-	"wrappingIndent": "折り返し行のインデントを制御します。'none'、'same'、'indent' または 'deepIndent' のいずれかを指定できます。",
-	"mouseWheelScrollSensitivity": "マウス ホイール スクロール イベントの `deltaX` と `deltaY` で使用される乗数",
-	"multiCursorModifier.ctrlCmd": "Windows および Linux 上の `Control` キーと macOS 上の `Command` キーに割り当てます。",
-	"multiCursorModifier.alt": "Windows および Linux 上の `Alt` キーと macOS 上の `Option` キーに割り当てます。",
-	"multiCursorModifier": "マウスを使用して複数のカーソルを追加するときに使用する修飾キーです。`ctrlCmd` は Windows および Linux 上の `Control` キーと macOS 上の `Command` キーに割り当てます。「定義に移動」や「リンクを開く」のマウス操作は、マルチカーソルの修飾キーと競合しないように適用されます。",
-	"multiCursorMergeOverlapping": "複数のカーソルが重なっているときは、マージします。",
-	"quickSuggestions.strings": "文字列内でクイック候補を有効にします。",
-	"quickSuggestions.comments": "コメント内でクイック候補を有効にします。",
-	"quickSuggestions.other": "文字列およびコメント外でクイック候補を有効にします。",
-	"quickSuggestions": "入力中に候補を自動的に表示するかどうかを制御します",
-	"quickSuggestionsDelay": "クイック候補が表示されるまでの待ち時間 (ミリ秒) を制御します",
-	"parameterHints": "入力時にパラメーター ドキュメントと型情報を表示するポップアップを有効にする",
-	"autoClosingBrackets": "エディターで左角かっこの後に自動的に右角かっこを挿入するかどうかを制御します",
-	"formatOnType": "エディターで入力後に自動的に行の書式設定を行うかどうかを制御します",
-	"formatOnPaste": "貼り付けた内容がエディターにより自動的にフォーマットされるかどうかを制御します。フォーマッタを使用可能にする必要があります。また、フォーマッタがドキュメント内の範囲をフォーマットできなければなりません。",
-	"autoIndent": "ユーザーが入力や貼り付け、行の移動をしたとき、エディターがインデントを自動的に調整するかどうかを制御します。言語のインデント ルールを使用できる必要があります。",
-	"suggestOnTriggerCharacters": "トリガー文字の入力時に候補が自動的に表示されるようにするかどうかを制御します",
-	"acceptSuggestionOnEnter": "'Tab' キーに加えて 'Enter' キーで候補を受け入れるかどうかを制御します。改行の挿入や候補の反映の間であいまいさを解消するのに役立ちます。'smart' 値は文字を変更するときに、Enter キーを押すだけで提案を反映することを意味します。",
-	"acceptSuggestionOnCommitCharacter": "コミット文字で候補を受け入れるかどうかを制御します。たとえば、JavaScript ではセミコロン (';') をコミット文字にして、候補を受け入れてその文字を入力することができます。",
-	"snippetSuggestions.top": "他の候補の上にスニペットの候補を表示します。",
-	"snippetSuggestions.bottom": "他の候補の下にスニペットの候補を表示します。",
-	"snippetSuggestions.inline": "他の候補と一緒にスニペットの候補を表示します。",
-	"snippetSuggestions.none": "スニペットの候補を表示しません。",
-	"snippetSuggestions": "他の修正候補と一緒にスニペットを表示するかどうか、およびその並び替えの方法を制御します。",
-	"emptySelectionClipboard": "選択範囲を指定しないでコピーする場合に現在の行をコピーするかどうかを制御します。",
-	"wordBasedSuggestions": "ドキュメント内の単語に基づいて入力候補を計算するかどうかを制御します。",
-	"suggestSelection.first": "常に最初の候補を選択します。",
-	"suggestSelection.recentlyUsed": "追加入力によって選択されたものがなければ、最近の候補を選択します。例: `console.| -> console.log` (`log` は最近入力されたため)。",
-	"suggestSelection.recentlyUsedByPrefix": "これらの候補を入力した前のプレフィックスに基づいて候補を選択します。例: `co -> console`、`con -> const`。",
-	"suggestSelection": "候補リストを表示するときに候補を事前に選択する方法を制御します。",
-	"suggestFontSize": "候補のウィジェットのフォント サイズ",
-	"suggestLineHeight": "候補のウィジェットの行の高さ",
-	"selectionHighlight": "エディターで選択範囲に類似する一致箇所を強調表示するかどうかを制御します",
-	"occurrencesHighlight": "エディターでセマンティック シンボルの出現箇所を強調表示するかどうかを制御します",
-	"overviewRulerLanes": "概要ルーラーの同じ位置に表示できる装飾の数を制御します",
-	"overviewRulerBorder": "概要ルーラーの周囲に境界線が描画されるかどうかを制御します。",
-	"cursorBlinking": "カーソルのアニメーション方式を制御します。",
-	"mouseWheelZoom": "Ctrl キーを押しながらマウス ホイールを使用してエディターのフォントをズームします",
-	"cursorStyle": "カーソルのスタイルを制御します。指定できる値は 'block'、'block-outline'、'line'、'line-thin'、'underline'、'underline-thin' です",
-	"cursorWidth": "editor.cursorStyle が 'line' に設定されている場合、カーソルの幅を制御する",
-	"fontLigatures": "フォントの合字を使用します",
-	"hideCursorInOverviewRuler": "概要ルーラーでカーソルを非表示にするかどうかを制御します。",
-	"renderWhitespace": "エディターで空白文字を表示する方法を制御します。'none'、'boundary' および 'all' が使用可能です。'boundary' オプションでは、単語間の単一スペースは表示されません。",
-	"renderControlCharacters": "エディターで制御文字を表示する必要があるかどうかを制御します",
-	"renderIndentGuides": "エディターでインデントのガイドを表示する必要があるかどうかを制御します",
-	"renderLineHighlight": "エディターが現在の行をどのように強調表示するかを制御します。考えられる値は 'none'、'gutter'、'line'、'all' です。",
-	"codeLens": "エディターが CodeLens を表示するかどうかを制御します",
-	"folding": "エディターでコードの折りたたみを有効にするかどうかを制御します",
-	"foldingStrategyAuto": "利用可能であれば、言語に特有の折りたたみ方式を使用して、そうでない場合はインデント方式に戻ります。",
-	"foldingStrategyIndentation": "常にインデントに基づく折りたたみ方式を使用します",
-	"foldingStrategy": "折りたたみ範囲の計算方法を制御します。'auto' は利用可能であれば言語固有の折りたたみ方式を使用します。'indentation' は常にインデントに基づく折りたたみ方式を使用します。",
-	"showFoldingControls": "余白上の折りたたみコントロールを自動的に非表示にするかどうかを制御します 。",
-	"matchBrackets": "かっこを選択すると、対応するかっこを強調表示します。",
-	"glyphMargin": "エディターで縦のグリフ余白が表示されるかどうかを制御します。ほとんどの場合、グリフ余白はデバッグに使用されます。",
-	"useTabStops": "空白の挿入や削除はタブ位置に従って行われます",
-	"trimAutoWhitespace": "自動挿入された末尾の空白を削除する",
-	"stablePeek": "エディターのコンテンツをダブルクリックするか、Esc キーを押しても、ピーク エディターを開いたままにします。",
-	"dragAndDrop": "ドラッグ アンド ドロップによる選択範囲の移動をエディターが許可する必要があるかどうかを制御します。",
-	"accessibilitySupport.auto": "エディターはスクリーン リーダーがいつ接続されたかを検出するためにプラットフォーム API を使用します。",
-	"accessibilitySupport.on": "エディターは永続的にスクリーン リーダー向けに最適化されます。",
-	"accessibilitySupport.off": "エディターはスクリーン リーダー向けに最適化されません。",
-	"accessibilitySupport": "エディターをスクリーン リーダーに最適化されたモードで実行するかどうかを制御します。",
-	"links": "エディターがリンクを検出してクリック可能な状態にするかどうかを制御します",
-	"colorDecorators": "エディターでインライン カラー デコレーターと色の選択を表示する必要があるかどうかを制御します。",
-	"codeActions": "コード アクション (lightbulb) を有効にする",
-	"codeActionsOnSave.organizeImports": "保存時にインポートの整理を実行しますか?",
-	"codeActionsOnSave": "保存時に実行されるコードアクションの種類。",
-	"codeActionsOnSaveTimeout": "保存時に実行されるコード アクションのタイムアウト値。",
-	"selectionClipboard": "Linux の PRIMARY クリップボードをサポートするかどうかを制御します。",
-	"sideBySide": "差分エディターが差分を横に並べて表示するか、行内に表示するかを制御します",
-	"ignoreTrimWhitespace": "差分エディターが、先頭または末尾の空白の変更を差分として表示するかどうかを制御します。",
-	"largeFileOptimizations": "大きなファイルでメモリが集中する特定の機能を無効にするための特別な処理。",
-	"renderIndicators": "差分エディターが追加/削除された変更に +/- インジケーターを示すかどうかを制御します"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/editor/common/config/defaultConfig.i18n.json b/i18n/jpn/src/vs/editor/common/config/defaultConfig.i18n.json
deleted file mode 100644
index 3fdfb4e461b..00000000000
--- a/i18n/jpn/src/vs/editor/common/config/defaultConfig.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"editorViewAccessibleLabel": "エディターのコンテンツ"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/editor/common/config/editorOptions.i18n.json b/i18n/jpn/src/vs/editor/common/config/editorOptions.i18n.json
deleted file mode 100644
index d4f7294be01..00000000000
--- a/i18n/jpn/src/vs/editor/common/config/editorOptions.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"accessibilityOffAriaLabel": "現在エディターにアクセスすることはできません。 Alt + F1 キーを押してオプションを選択します。",
-	"editorViewAccessibleLabel": "エディターのコンテンツ"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/editor/common/controller/cursor.i18n.json b/i18n/jpn/src/vs/editor/common/controller/cursor.i18n.json
deleted file mode 100644
index 7977de0028a..00000000000
--- a/i18n/jpn/src/vs/editor/common/controller/cursor.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"corrupt.commands": "コマンドの実行中に予期しない例外が発生しました。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/editor/common/model/textModelWithTokens.i18n.json b/i18n/jpn/src/vs/editor/common/model/textModelWithTokens.i18n.json
deleted file mode 100644
index aaf09102694..00000000000
--- a/i18n/jpn/src/vs/editor/common/model/textModelWithTokens.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"mode.tokenizationSupportFailed": "入力のトークン化中にモードが失敗しました。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/editor/common/modes/modesRegistry.i18n.json b/i18n/jpn/src/vs/editor/common/modes/modesRegistry.i18n.json
deleted file mode 100644
index 7d6d5c8cdf1..00000000000
--- a/i18n/jpn/src/vs/editor/common/modes/modesRegistry.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"plainText.alias": "プレーンテキスト"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/editor/common/services/bulkEdit.i18n.json b/i18n/jpn/src/vs/editor/common/services/bulkEdit.i18n.json
deleted file mode 100644
index 4c84c291c57..00000000000
--- a/i18n/jpn/src/vs/editor/common/services/bulkEdit.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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}",
-	"summary.0": "編集は行われませんでした",
-	"summary.nm": "{1} 個のファイルで {0} 件のテキスト編集を実行",
-	"summary.n0": "1 つのファイルで {0} 個のテキストを編集"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/editor/common/services/modeServiceImpl.i18n.json b/i18n/jpn/src/vs/editor/common/services/modeServiceImpl.i18n.json
deleted file mode 100644
index 7202f95ac0f..00000000000
--- a/i18n/jpn/src/vs/editor/common/services/modeServiceImpl.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"vscode.extension.contributes.languages": "言語の宣言を提供します。",
-	"vscode.extension.contributes.languages.id": "言語の ID。",
-	"vscode.extension.contributes.languages.aliases": "言語の名前のエイリアス。",
-	"vscode.extension.contributes.languages.extensions": "言語に関連付けられているファイルの拡張子。",
-	"vscode.extension.contributes.languages.filenames": "言語に関連付けられたファイル名。",
-	"vscode.extension.contributes.languages.filenamePatterns": "言語に関連付けられたファイル名の glob パターン。",
-	"vscode.extension.contributes.languages.mimetypes": "言語に関連付けられている MIME の種類。",
-	"vscode.extension.contributes.languages.firstLine": "言語のファイルの最初の行に一致する正規表現。",
-	"vscode.extension.contributes.languages.configuration": "言語の構成オプションを含むファイルへの相対パス。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/editor/common/services/modelServiceImpl.i18n.json b/i18n/jpn/src/vs/editor/common/services/modelServiceImpl.i18n.json
deleted file mode 100644
index e12a9398484..00000000000
--- a/i18n/jpn/src/vs/editor/common/services/modelServiceImpl.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"diagAndSourceMultiline": "[{0}]\n{1}",
-	"diagAndSource": "[{0}] {1}"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/editor/common/view/editorColorRegistry.i18n.json b/i18n/jpn/src/vs/editor/common/view/editorColorRegistry.i18n.json
deleted file mode 100644
index 94d561750e1..00000000000
--- a/i18n/jpn/src/vs/editor/common/view/editorColorRegistry.i18n.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"lineHighlight": "カーソル位置の行を強調表示する背景色。",
-	"lineHighlightBorderBox": "カーソル位置の行の境界線を強調表示する背景色。",
-	"rangeHighlight": "Quick Open 機能や検索機能などによって強調表示された範囲の背景色。下にある装飾を隠さないために、色は不透過であってはなりません。",
-	"rangeHighlightBorder": "強調表示された範囲の境界線の背景色。",
-	"caret": "エディターのカーソルの色。",
-	"editorCursorBackground": "選択された文字列の背景色です。選択された文字列の背景色をカスタマイズ出来ます。",
-	"editorWhitespaces": "エディターのスペース文字の色。",
-	"editorIndentGuides": "エディター インデント ガイドの色。",
-	"editorActiveIndentGuide": "アクティブなエディターのインデント ガイドの色。",
-	"editorLineNumbers": "エディターの行番号の色。",
-	"editorActiveLineNumber": "エディターのアクティブ行番号の色",
-	"deprecatedEditorActiveLineNumber": "id は使用しないでください。代わりに 'EditorLineNumber.activeForeground' を使用してください。",
-	"editorRuler": "エディター ルーラーの色。",
-	"editorCodeLensForeground": "CodeLens エディターの前景色。",
-	"editorBracketMatchBackground": "一致するかっこの背景色",
-	"editorBracketMatchBorder": "一致するかっこ内のボックスの色",
-	"editorOverviewRulerBorder": "概要ルーラーの境界色。",
-	"editorGutter": "エディターの余白の背景色。余白にはグリフ マージンと行番号が含まれます。",
-	"errorForeground": "エディターでエラーを示す波線の前景色。",
-	"errorBorder": "エディターでエラーを示す波線の境界線の色。",
-	"warningForeground": "エディターで警告を示す波線の前景色。",
-	"warningBorder": "エディターで警告を示す波線の境界線の色。",
-	"infoForeground": "エディターで情報を示す波線の前景色。",
-	"infoBorder": "エディターで情報を示す波線の境界線の色。",
-	"hintForeground": "エディターでヒントを示す波線の前景色。",
-	"hintBorder": "エディターでヒントを示す波線の境界線の色。",
-	"unnecessaryForeground": "エディターの中で不要なコードを示す前景色。",
-	"overviewRulerRangeHighlight": "範囲を強調表示するときの概要ルーラーのマーカー色。この色は下地の色に紛れないよう不明瞭であってはいけません。",
-	"overviewRuleError": "エラーを示す概要ルーラーのマーカー色。",
-	"overviewRuleWarning": "警告を示す概要ルーラーのマーカー色。",
-	"overviewRuleInfo": "情報を示す概要ルーラーのマーカー色。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/editor/contrib/accessibility/browser/accessibility.i18n.json b/i18n/jpn/src/vs/editor/contrib/accessibility/browser/accessibility.i18n.json
deleted file mode 100644
index d5763711c92..00000000000
--- a/i18n/jpn/src/vs/editor/contrib/accessibility/browser/accessibility.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"introMsg": "VS Code のアクセシビリティ オプションをご利用いただき、ありがとうございます。",
-	"status": "ステータス:",
-	"tabFocusModeOnMsg": "現在のエディターで Tab キーを押すと、次のフォーカス可能な要素にフォーカスを移動します。{0} を押すと、この動作が切り替わります。",
-	"tabFocusModeOnMsgNoKb": "現在のエディターで Tab キーを押すと、次のフォーカス可能な要素にフォーカスを移動します。コマンド {0} は、キー バインドでは現在トリガーできません。",
-	"tabFocusModeOffMsg": "現在のエディターで Tab キーを押すと、タブ文字が挿入されます。{0} を押すと、この動作が切り替わります。",
-	"tabFocusModeOffMsgNoKb": "現在のエディターで Tab キーを押すと、タブ文字が挿入されます。コマンド {0} は、キー バインドでは現在トリガーできません。",
-	"outroMsg": "Esc キーを押すと、ヒントを消してエディターに戻ることができます。",
-	"ShowAccessibilityHelpAction": "アクセシビリティのヘルプを表示します"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/editor/contrib/bracketMatching/bracketMatching.i18n.json b/i18n/jpn/src/vs/editor/contrib/bracketMatching/bracketMatching.i18n.json
deleted file mode 100644
index 7c1a348d6fa..00000000000
--- a/i18n/jpn/src/vs/editor/contrib/bracketMatching/bracketMatching.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"overviewRulerBracketMatchForeground": "一致するブラケットを示す概要ルーラーのマーカー色。",
-	"smartSelect.jumpBracket": "ブラケットへ移動",
-	"smartSelect.selectToBracket": "ブラケットに選択"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/editor/contrib/bracketMatching/common/bracketMatching.i18n.json b/i18n/jpn/src/vs/editor/contrib/bracketMatching/common/bracketMatching.i18n.json
deleted file mode 100644
index f800170e7d3..00000000000
--- a/i18n/jpn/src/vs/editor/contrib/bracketMatching/common/bracketMatching.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"smartSelect.jumpBracket": "ブラケットへ移動"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/editor/contrib/caretOperations/caretOperations.i18n.json b/i18n/jpn/src/vs/editor/contrib/caretOperations/caretOperations.i18n.json
deleted file mode 100644
index 049e54de173..00000000000
--- a/i18n/jpn/src/vs/editor/contrib/caretOperations/caretOperations.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"caret.moveLeft": "キャレットを左に移動",
-	"caret.moveRight": "キャレットを右に移動"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/editor/contrib/caretOperations/common/caretOperations.i18n.json b/i18n/jpn/src/vs/editor/contrib/caretOperations/common/caretOperations.i18n.json
deleted file mode 100644
index ba2310b3ed5..00000000000
--- a/i18n/jpn/src/vs/editor/contrib/caretOperations/common/caretOperations.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"caret.moveLeft": "キャレットを左に移動",
-	"caret.moveRight": "キャレットを右に移動"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/editor/contrib/caretOperations/common/transpose.i18n.json b/i18n/jpn/src/vs/editor/contrib/caretOperations/common/transpose.i18n.json
deleted file mode 100644
index 22876b64d42..00000000000
--- a/i18n/jpn/src/vs/editor/contrib/caretOperations/common/transpose.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"transposeLetters.label": "文字の入れ替え"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/editor/contrib/caretOperations/transpose.i18n.json b/i18n/jpn/src/vs/editor/contrib/caretOperations/transpose.i18n.json
deleted file mode 100644
index 8d4a1248c52..00000000000
--- a/i18n/jpn/src/vs/editor/contrib/caretOperations/transpose.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"transposeLetters.label": "文字の入れ替え"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/editor/contrib/clipboard/browser/clipboard.i18n.json b/i18n/jpn/src/vs/editor/contrib/clipboard/browser/clipboard.i18n.json
deleted file mode 100644
index d52c3575c45..00000000000
--- a/i18n/jpn/src/vs/editor/contrib/clipboard/browser/clipboard.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"actions.clipboard.cutLabel": "切り取り",
-	"actions.clipboard.copyLabel": "コピー",
-	"actions.clipboard.pasteLabel": "貼り付け",
-	"actions.clipboard.copyWithSyntaxHighlightingLabel": "構文を強調表示してコピー"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/editor/contrib/clipboard/clipboard.i18n.json b/i18n/jpn/src/vs/editor/contrib/clipboard/clipboard.i18n.json
deleted file mode 100644
index 023af54c4a1..00000000000
--- a/i18n/jpn/src/vs/editor/contrib/clipboard/clipboard.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"actions.clipboard.cutLabel": "切り取り",
-	"actions.clipboard.copyLabel": "コピー",
-	"actions.clipboard.pasteLabel": "貼り付け",
-	"actions.clipboard.copyWithSyntaxHighlightingLabel": "構文を強調表示してコピー"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/editor/contrib/codeAction/codeActionCommands.i18n.json b/i18n/jpn/src/vs/editor/contrib/codeAction/codeActionCommands.i18n.json
deleted file mode 100644
index 7e60a39f1ef..00000000000
--- a/i18n/jpn/src/vs/editor/contrib/codeAction/codeActionCommands.i18n.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"quickFixWithKb": "修正プログラム ({0}) を表示する",
-	"quickFix": "修正プログラムを表示する",
-	"quickfix.trigger.label": "クイック フィックス...",
-	"editor.action.quickFix.noneMessage": "利用可能なコード アクションはありません",
-	"refactor.label": "リファクター...",
-	"editor.action.refactor.noneMessage": "利用可能なリファクタリングはありません",
-	"source.label": "ソース アクション...",
-	"editor.action.source.noneMessage": "利用可能なソース アクションはありません",
-	"organizeImports.label": "インポートを整理",
-	"editor.action.organize.noneMessage": "利用可能なインポートの整理アクションはありません"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/editor/contrib/comment/comment.i18n.json b/i18n/jpn/src/vs/editor/contrib/comment/comment.i18n.json
deleted file mode 100644
index 8d298c61181..00000000000
--- a/i18n/jpn/src/vs/editor/contrib/comment/comment.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"comment.line": "行コメントの切り替え",
-	"comment.line.add": "行コメントの追加",
-	"comment.line.remove": "行コメントの削除",
-	"comment.block": "ブロック コメントの切り替え"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/editor/contrib/comment/common/comment.i18n.json b/i18n/jpn/src/vs/editor/contrib/comment/common/comment.i18n.json
deleted file mode 100644
index dbb6b93c0b6..00000000000
--- a/i18n/jpn/src/vs/editor/contrib/comment/common/comment.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"comment.line": "行コメントの切り替え",
-	"comment.line.add": "行コメントの追加",
-	"comment.line.remove": "行コメントの削除",
-	"comment.block": "ブロック コメントの切り替え"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/editor/contrib/contextmenu/browser/contextmenu.i18n.json b/i18n/jpn/src/vs/editor/contrib/contextmenu/browser/contextmenu.i18n.json
deleted file mode 100644
index 070e2831f8a..00000000000
--- a/i18n/jpn/src/vs/editor/contrib/contextmenu/browser/contextmenu.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"action.showContextMenu.label": "エディターのコンテキスト メニューの表示"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/editor/contrib/contextmenu/contextmenu.i18n.json b/i18n/jpn/src/vs/editor/contrib/contextmenu/contextmenu.i18n.json
deleted file mode 100644
index 2a9c3c8ced7..00000000000
--- a/i18n/jpn/src/vs/editor/contrib/contextmenu/contextmenu.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"action.showContextMenu.label": "エディターのコンテキスト メニューの表示"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/editor/contrib/find/browser/findWidget.i18n.json b/i18n/jpn/src/vs/editor/contrib/find/browser/findWidget.i18n.json
deleted file mode 100644
index 4dc327d6de8..00000000000
--- a/i18n/jpn/src/vs/editor/contrib/find/browser/findWidget.i18n.json
+++ /dev/null
@@ -1,21 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"label.find": "検索",
-	"placeholder.find": "検索",
-	"label.previousMatchButton": "前の一致項目",
-	"label.nextMatchButton": "次の一致項目",
-	"label.toggleSelectionFind": "選択範囲を検索",
-	"label.closeButton": "閉じる",
-	"label.replace": "置換",
-	"placeholder.replace": "置換",
-	"label.replaceButton": "置換",
-	"label.replaceAllButton": "すべて置換",
-	"label.toggleReplaceButton": "置換モードの切り替え",
-	"title.matchesCountLimit": "最初の {0} 件の結果だけが強調表示されますが、すべての検索操作はテキスト全体で機能します。",
-	"label.matchesLocation": "{0} / {1} 件",
-	"label.noResults": "結果なし"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/editor/contrib/find/browser/simpleFindWidget.i18n.json b/i18n/jpn/src/vs/editor/contrib/find/browser/simpleFindWidget.i18n.json
deleted file mode 100644
index 19f4b3b0c2d..00000000000
--- a/i18n/jpn/src/vs/editor/contrib/find/browser/simpleFindWidget.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"label.find": "検索",
-	"placeholder.find": "検索",
-	"label.previousMatchButton": "前の一致項目",
-	"label.nextMatchButton": "次の一致項目",
-	"label.closeButton": "閉じる"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/editor/contrib/find/common/findController.i18n.json b/i18n/jpn/src/vs/editor/contrib/find/common/findController.i18n.json
deleted file mode 100644
index 93947cdf9ce..00000000000
--- a/i18n/jpn/src/vs/editor/contrib/find/common/findController.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"startFindAction": "検索",
-	"findNextMatchAction": "次を検索",
-	"findPreviousMatchAction": "前を検索",
-	"nextSelectionMatchFindAction": "次の選択項目を検索",
-	"previousSelectionMatchFindAction": "前の選択項目を検索",
-	"startReplace": "置換",
-	"showNextFindTermAction": "次の検索語句を表示",
-	"showPreviousFindTermAction": "前の検索語句を表示"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/editor/contrib/find/findController.i18n.json b/i18n/jpn/src/vs/editor/contrib/find/findController.i18n.json
deleted file mode 100644
index 50b54839cc5..00000000000
--- a/i18n/jpn/src/vs/editor/contrib/find/findController.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"startFindAction": "検索",
-	"startFindWithSelectionAction": "選択範囲を検索",
-	"findNextMatchAction": "次を検索",
-	"findPreviousMatchAction": "前を検索",
-	"nextSelectionMatchFindAction": "次の選択項目を検索",
-	"previousSelectionMatchFindAction": "前の選択項目を検索",
-	"startReplace": "置換",
-	"showNextFindTermAction": "次の検索語句を表示",
-	"showPreviousFindTermAction": "前の検索語句を表示"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/editor/contrib/find/findWidget.i18n.json b/i18n/jpn/src/vs/editor/contrib/find/findWidget.i18n.json
deleted file mode 100644
index 1bbfe39bdce..00000000000
--- a/i18n/jpn/src/vs/editor/contrib/find/findWidget.i18n.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"label.find": "検索",
-	"placeholder.find": "検索",
-	"label.previousMatchButton": "前の一致項目",
-	"label.nextMatchButton": "次の一致項目",
-	"label.toggleSelectionFind": "選択範囲を検索",
-	"label.closeButton": "閉じる",
-	"label.replace": "置換",
-	"placeholder.replace": "置換",
-	"label.replaceButton": "置換",
-	"label.replaceAllButton": "すべて置換",
-	"label.toggleReplaceButton": "置換モードの切り替え",
-	"title.matchesCountLimit": "最初の {0} 件の結果だけが強調表示されますが、すべての検索操作はテキスト全体で機能します。",
-	"label.matchesLocation": "{0} / {1} 件",
-	"label.noResults": "結果なし"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/editor/contrib/find/simpleFindWidget.i18n.json b/i18n/jpn/src/vs/editor/contrib/find/simpleFindWidget.i18n.json
deleted file mode 100644
index 2a08c4f59a7..00000000000
--- a/i18n/jpn/src/vs/editor/contrib/find/simpleFindWidget.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"label.find": "検索",
-	"placeholder.find": "検索",
-	"label.previousMatchButton": "前の一致項目",
-	"label.nextMatchButton": "次の一致項目",
-	"label.closeButton": "閉じる"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/editor/contrib/folding/browser/folding.i18n.json b/i18n/jpn/src/vs/editor/contrib/folding/browser/folding.i18n.json
deleted file mode 100644
index b75a79c1ee8..00000000000
--- a/i18n/jpn/src/vs/editor/contrib/folding/browser/folding.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"unfoldAction.label": "展開",
-	"unFoldRecursivelyAction.label": "再帰的に展開",
-	"foldAction.label": "折りたたみ",
-	"foldRecursivelyAction.label": "再帰的に折りたたむ",
-	"foldAllAction.label": "すべて折りたたみ",
-	"unfoldAllAction.label": "すべて展開",
-	"foldLevelAction.label": "折りたたみレベル {0}"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/editor/contrib/folding/folding.i18n.json b/i18n/jpn/src/vs/editor/contrib/folding/folding.i18n.json
deleted file mode 100644
index 0bebad98f59..00000000000
--- a/i18n/jpn/src/vs/editor/contrib/folding/folding.i18n.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"unfoldAction.label": "展開",
-	"unFoldRecursivelyAction.label": "再帰的に展開",
-	"foldAction.label": "折りたたみ",
-	"foldRecursivelyAction.label": "再帰的に折りたたむ",
-	"foldAllBlockComments.label": "すべてのブロック コメントの折りたたみ",
-	"foldAllMarkerRegions.label": "すべての領域を折りたたむ",
-	"unfoldAllMarkerRegions.label": "すべての領域を展開",
-	"foldAllAction.label": "すべて折りたたみ",
-	"unfoldAllAction.label": "すべて展開",
-	"foldLevelAction.label": "レベル {0} で折りたたむ"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/editor/contrib/fontZoom/fontZoom.i18n.json b/i18n/jpn/src/vs/editor/contrib/fontZoom/fontZoom.i18n.json
deleted file mode 100644
index 138aaa20e3f..00000000000
--- a/i18n/jpn/src/vs/editor/contrib/fontZoom/fontZoom.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"EditorFontZoomIn.label": "エディターのフォントを拡大",
-	"EditorFontZoomOut.label": "エディターのフォントを縮小",
-	"EditorFontZoomReset.label": "エディターのフォントのズームをリセット"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/editor/contrib/format/browser/formatActions.i18n.json b/i18n/jpn/src/vs/editor/contrib/format/browser/formatActions.i18n.json
deleted file mode 100644
index 077fe93a291..00000000000
--- a/i18n/jpn/src/vs/editor/contrib/format/browser/formatActions.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"hint11": "行 {0} で 1 つの書式設定を編集",
-	"hintn1": "行 {1} で {0} 個の書式設定を編集",
-	"hint1n": "行 {0} と {1} の間で 1 つの書式設定を編集",
-	"hintnn": "行 {1} と {2} の間で {0} 個の書式設定を編集",
-	"no.provider": "申し訳ありません。インストールされた '{0}'ファイル用のフォーマッターが存在しません。",
-	"formatDocument.label": "ドキュメントのフォーマット",
-	"formatSelection.label": "選択範囲のフォーマット"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/editor/contrib/format/formatActions.i18n.json b/i18n/jpn/src/vs/editor/contrib/format/formatActions.i18n.json
deleted file mode 100644
index eed5820f47f..00000000000
--- a/i18n/jpn/src/vs/editor/contrib/format/formatActions.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hint11": "行 {0} で 1 つの書式設定を編集",
-	"hintn1": "行 {1} で {0} 個の書式設定を編集",
-	"hint1n": "行 {0} と {1} の間で 1 つの書式設定を編集",
-	"hintnn": "行 {1} と {2} の間で {0} 個の書式設定を編集",
-	"no.provider": "インストールされた '{0}'ファイル用のフォーマッターが存在しません。",
-	"formatDocument.label": "ドキュメントのフォーマット",
-	"no.documentprovider": "インストールされた '{0}'ファイル用のドキュメント フォーマッターが存在しません。",
-	"formatSelection.label": "選択範囲のフォーマット",
-	"no.selectionprovider": "インストールされた '{0}' ファイル用の選択範囲フォーマッターが存在しません。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.i18n.json b/i18n/jpn/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.i18n.json
deleted file mode 100644
index 23f407e894b..00000000000
--- a/i18n/jpn/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.i18n.json
+++ /dev/null
@@ -1,24 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"noResultWord": "'{0}' の定義は見つかりません",
-	"generic.noResults": "定義が見つかりません",
-	"meta.title": " – {0} 個の定義",
-	"actions.goToDecl.label": "定義へ移動",
-	"actions.goToDeclToSide.label": "定義を横に開く",
-	"actions.previewDecl.label": "定義をここに表示",
-	"goToImplementation.noResultWord": "'{0}' の実装が見つかりません",
-	"goToImplementation.generic.noResults": "実装が見つかりません",
-	"meta.implementations.title": "– {0} 個の実装",
-	"actions.goToImplementation.label": "実装に移動",
-	"actions.peekImplementation.label": "実装のプレビュー",
-	"goToTypeDefinition.noResultWord": "'{0}' の型定義が見つかりません",
-	"goToTypeDefinition.generic.noResults": "型定義が見つかりません",
-	"meta.typeDefinitions.title": " – {0} 個の型定義",
-	"actions.goToTypeDefinition.label": "型定義へ移動",
-	"actions.peekTypeDefinition.label": "型定義を表示",
-	"multipleResults": "クリックして、{0} の定義を表示します。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/editor/contrib/goToDeclaration/browser/goToDeclarationCommands.i18n.json b/i18n/jpn/src/vs/editor/contrib/goToDeclaration/browser/goToDeclarationCommands.i18n.json
deleted file mode 100644
index 624f9b7af70..00000000000
--- a/i18n/jpn/src/vs/editor/contrib/goToDeclaration/browser/goToDeclarationCommands.i18n.json
+++ /dev/null
@@ -1,23 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"noResultWord": "'{0}' の定義は見つかりません",
-	"generic.noResults": "定義が見つかりません",
-	"meta.title": " – {0} 個の定義",
-	"actions.goToDecl.label": "定義へ移動",
-	"actions.goToDeclToSide.label": "定義を横に開く",
-	"actions.previewDecl.label": "定義をここに表示",
-	"goToImplementation.noResultWord": "'{0}' の実装が見つかりません",
-	"goToImplementation.generic.noResults": "実装が見つかりません",
-	"meta.implementations.title": "– {0} 個の実装",
-	"actions.goToImplementation.label": "実装に移動",
-	"actions.peekImplementation.label": "実装のプレビュー",
-	"goToTypeDefinition.noResultWord": "'{0}' の型定義が見つかりません",
-	"goToTypeDefinition.generic.noResults": "型定義が見つかりません",
-	"meta.typeDefinitions.title": " – {0} 個の型定義",
-	"actions.goToTypeDefinition.label": "型定義へ移動",
-	"actions.peekTypeDefinition.label": "型定義を表示"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/editor/contrib/goToDeclaration/browser/goToDeclarationMouse.i18n.json b/i18n/jpn/src/vs/editor/contrib/goToDeclaration/browser/goToDeclarationMouse.i18n.json
deleted file mode 100644
index f918ba9f96d..00000000000
--- a/i18n/jpn/src/vs/editor/contrib/goToDeclaration/browser/goToDeclarationMouse.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"multipleResults": "クリックして、{0} の定義を表示します。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/editor/contrib/goToDeclaration/goToDeclarationCommands.i18n.json b/i18n/jpn/src/vs/editor/contrib/goToDeclaration/goToDeclarationCommands.i18n.json
deleted file mode 100644
index 45c062ceeb3..00000000000
--- a/i18n/jpn/src/vs/editor/contrib/goToDeclaration/goToDeclarationCommands.i18n.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noResultWord": "'{0}' の定義は見つかりません",
-	"generic.noResults": "定義が見つかりません",
-	"meta.title": " – {0} 個の定義",
-	"actions.goToDecl.label": "定義へ移動",
-	"actions.goToDeclToSide.label": "定義を横に開く",
-	"actions.previewDecl.label": "定義をここに表示",
-	"goToImplementation.noResultWord": "'{0}' の実装が見つかりません",
-	"goToImplementation.generic.noResults": "実装が見つかりません",
-	"meta.implementations.title": "– {0} 個の実装",
-	"actions.goToImplementation.label": "実装に移動",
-	"actions.peekImplementation.label": "実装のプレビュー",
-	"goToTypeDefinition.noResultWord": "'{0}' の型定義が見つかりません",
-	"goToTypeDefinition.generic.noResults": "型定義が見つかりません",
-	"meta.typeDefinitions.title": " – {0} 個の型定義",
-	"actions.goToTypeDefinition.label": "型定義へ移動",
-	"actions.peekTypeDefinition.label": "型定義を表示"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/editor/contrib/goToDeclaration/goToDeclarationMouse.i18n.json b/i18n/jpn/src/vs/editor/contrib/goToDeclaration/goToDeclarationMouse.i18n.json
deleted file mode 100644
index 6d3fcaf1cde..00000000000
--- a/i18n/jpn/src/vs/editor/contrib/goToDeclaration/goToDeclarationMouse.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"multipleResults": "クリックして、{0} の定義を表示します。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/editor/contrib/goToDefinition/goToDefinitionCommands.i18n.json b/i18n/jpn/src/vs/editor/contrib/goToDefinition/goToDefinitionCommands.i18n.json
deleted file mode 100644
index 45c062ceeb3..00000000000
--- a/i18n/jpn/src/vs/editor/contrib/goToDefinition/goToDefinitionCommands.i18n.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noResultWord": "'{0}' の定義は見つかりません",
-	"generic.noResults": "定義が見つかりません",
-	"meta.title": " – {0} 個の定義",
-	"actions.goToDecl.label": "定義へ移動",
-	"actions.goToDeclToSide.label": "定義を横に開く",
-	"actions.previewDecl.label": "定義をここに表示",
-	"goToImplementation.noResultWord": "'{0}' の実装が見つかりません",
-	"goToImplementation.generic.noResults": "実装が見つかりません",
-	"meta.implementations.title": "– {0} 個の実装",
-	"actions.goToImplementation.label": "実装に移動",
-	"actions.peekImplementation.label": "実装のプレビュー",
-	"goToTypeDefinition.noResultWord": "'{0}' の型定義が見つかりません",
-	"goToTypeDefinition.generic.noResults": "型定義が見つかりません",
-	"meta.typeDefinitions.title": " – {0} 個の型定義",
-	"actions.goToTypeDefinition.label": "型定義へ移動",
-	"actions.peekTypeDefinition.label": "型定義を表示"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/editor/contrib/goToDefinition/goToDefinitionMouse.i18n.json b/i18n/jpn/src/vs/editor/contrib/goToDefinition/goToDefinitionMouse.i18n.json
deleted file mode 100644
index 6d3fcaf1cde..00000000000
--- a/i18n/jpn/src/vs/editor/contrib/goToDefinition/goToDefinitionMouse.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"multipleResults": "クリックして、{0} の定義を表示します。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/editor/contrib/gotoError/browser/gotoError.i18n.json b/i18n/jpn/src/vs/editor/contrib/gotoError/browser/gotoError.i18n.json
deleted file mode 100644
index 53ea71a9d4e..00000000000
--- a/i18n/jpn/src/vs/editor/contrib/gotoError/browser/gotoError.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"title.wo_source": "({0}/{1})",
-	"markerAction.next.label": "次のエラーまたは警告へ移動",
-	"markerAction.previous.label": "前のエラーまたは警告へ移動",
-	"editorMarkerNavigationError": "エディターのマーカー ナビゲーション ウィジェットのエラーの色。",
-	"editorMarkerNavigationWarning": "エディターのマーカー ナビゲーション ウィジェットの警告の色。",
-	"editorMarkerNavigationInfo": "エディターのマーカー ナビゲーション ウィジェットの情報の色。",
-	"editorMarkerNavigationBackground": "エディターのマーカー ナビゲーション ウィジェットの背景。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/editor/contrib/gotoError/gotoError.i18n.json b/i18n/jpn/src/vs/editor/contrib/gotoError/gotoError.i18n.json
deleted file mode 100644
index f1211735237..00000000000
--- a/i18n/jpn/src/vs/editor/contrib/gotoError/gotoError.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"markerAction.next.label": "次の問題 (エラー、警告、情報) へ移動",
-	"markerAction.previous.label": "前の問題 (エラー、警告、情報) へ移動",
-	"markerAction.nextInFiles.label": "ファイル内の次の問題 (エラー、警告、情報) へ移動",
-	"markerAction.previousInFiles.label": "ファイル内の前の問題 (エラー、警告、情報) へ移動"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json b/i18n/jpn/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json
deleted file mode 100644
index a523dd78325..00000000000
--- a/i18n/jpn/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"title.wo_source": "({0}/{1})",
-	"editorMarkerNavigationError": "エディターのマーカー ナビゲーション ウィジェットのエラーの色。",
-	"editorMarkerNavigationWarning": "エディターのマーカー ナビゲーション ウィジェットの警告の色。",
-	"editorMarkerNavigationInfo": "エディターのマーカー ナビゲーション ウィジェットの情報の色。",
-	"editorMarkerNavigationBackground": "エディターのマーカー ナビゲーション ウィジェットの背景。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/editor/contrib/hover/browser/hover.i18n.json b/i18n/jpn/src/vs/editor/contrib/hover/browser/hover.i18n.json
deleted file mode 100644
index 13ad7162719..00000000000
--- a/i18n/jpn/src/vs/editor/contrib/hover/browser/hover.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"showHover": "ホバーの表示"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/editor/contrib/hover/browser/modesContentHover.i18n.json b/i18n/jpn/src/vs/editor/contrib/hover/browser/modesContentHover.i18n.json
deleted file mode 100644
index 7606a08044a..00000000000
--- a/i18n/jpn/src/vs/editor/contrib/hover/browser/modesContentHover.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"modesContentHover.loading": "読み込んでいます..."
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/editor/contrib/hover/hover.i18n.json b/i18n/jpn/src/vs/editor/contrib/hover/hover.i18n.json
deleted file mode 100644
index 16b2fd8c383..00000000000
--- a/i18n/jpn/src/vs/editor/contrib/hover/hover.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"showHover": "ホバーの表示"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/editor/contrib/hover/modesContentHover.i18n.json b/i18n/jpn/src/vs/editor/contrib/hover/modesContentHover.i18n.json
deleted file mode 100644
index 6eaa290a232..00000000000
--- a/i18n/jpn/src/vs/editor/contrib/hover/modesContentHover.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"modesContentHover.loading": "読み込んでいます..."
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/editor/contrib/inPlaceReplace/common/inPlaceReplace.i18n.json b/i18n/jpn/src/vs/editor/contrib/inPlaceReplace/common/inPlaceReplace.i18n.json
deleted file mode 100644
index 2136e47678d..00000000000
--- a/i18n/jpn/src/vs/editor/contrib/inPlaceReplace/common/inPlaceReplace.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"InPlaceReplaceAction.previous.label": "前の値に置換",
-	"InPlaceReplaceAction.next.label": "次の値に置換"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/editor/contrib/inPlaceReplace/inPlaceReplace.i18n.json b/i18n/jpn/src/vs/editor/contrib/inPlaceReplace/inPlaceReplace.i18n.json
deleted file mode 100644
index b32005b1ed2..00000000000
--- a/i18n/jpn/src/vs/editor/contrib/inPlaceReplace/inPlaceReplace.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"InPlaceReplaceAction.previous.label": "前の値に置換",
-	"InPlaceReplaceAction.next.label": "次の値に置換"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/editor/contrib/indentation/common/indentation.i18n.json b/i18n/jpn/src/vs/editor/contrib/indentation/common/indentation.i18n.json
deleted file mode 100644
index 94408494ff6..00000000000
--- a/i18n/jpn/src/vs/editor/contrib/indentation/common/indentation.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"indentationToSpaces": "インデントをスペースに変換",
-	"indentationToTabs": "インデントをタブに変換",
-	"configuredTabSize": "構成されたタブのサイズ",
-	"selectTabWidth": "現在のファイルのタブのサイズを選択",
-	"indentUsingTabs": "タブによるインデント",
-	"indentUsingSpaces": "スペースによるインデント",
-	"detectIndentation": "内容からインデントを検出",
-	"editor.reindentlines": "行の再インデント"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/editor/contrib/indentation/indentation.i18n.json b/i18n/jpn/src/vs/editor/contrib/indentation/indentation.i18n.json
deleted file mode 100644
index 04225556e73..00000000000
--- a/i18n/jpn/src/vs/editor/contrib/indentation/indentation.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"indentationToSpaces": "インデントをスペースに変換",
-	"indentationToTabs": "インデントをタブに変換",
-	"configuredTabSize": "構成されたタブのサイズ",
-	"selectTabWidth": "現在のファイルのタブのサイズを選択",
-	"indentUsingTabs": "タブによるインデント",
-	"indentUsingSpaces": "スペースによるインデント",
-	"detectIndentation": "内容からインデントを検出",
-	"editor.reindentlines": "行の再インデント",
-	"editor.reindentselectedlines": "選択行を再インデント"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/editor/contrib/inspectTMScopes/electron-browser/inspectTMScopes.i18n.json b/i18n/jpn/src/vs/editor/contrib/inspectTMScopes/electron-browser/inspectTMScopes.i18n.json
deleted file mode 100644
index 1e4f9dabdb2..00000000000
--- a/i18n/jpn/src/vs/editor/contrib/inspectTMScopes/electron-browser/inspectTMScopes.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"inspectTMScopes": "開発者: TM スコープの検査",
-	"inspectTMScopesWidget.loading": "読み込んでいます..."
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/editor/contrib/linesOperations/common/linesOperations.i18n.json b/i18n/jpn/src/vs/editor/contrib/linesOperations/common/linesOperations.i18n.json
deleted file mode 100644
index a9fd8094ec7..00000000000
--- a/i18n/jpn/src/vs/editor/contrib/linesOperations/common/linesOperations.i18n.json
+++ /dev/null
@@ -1,25 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"lines.copyUp": "行を上へコピー",
-	"lines.copyDown": "行を下へコピー",
-	"lines.moveUp": "行を上へ移動",
-	"lines.moveDown": "行を下へ移動",
-	"lines.sortAscending": "行を昇順に並べ替え",
-	"lines.sortDescending": "行を降順に並べ替え",
-	"lines.trimTrailingWhitespace": "末尾の空白のトリミング",
-	"lines.delete": "行の削除",
-	"lines.indent": "行のインデント",
-	"lines.outdent": "行のインデント解除",
-	"lines.insertBefore": "行を上に挿入",
-	"lines.insertAfter": "行を下に挿入",
-	"lines.deleteAllLeft": "左側をすべて削除",
-	"lines.deleteAllRight": "右側をすべて削除",
-	"lines.joinLines": "行をつなげる",
-	"editor.transpose": "カーソルの周囲の文字を入れ替える",
-	"editor.transformToUppercase": "大文字に変換",
-	"editor.transformToLowercase": "小文字に変換"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/editor/contrib/linesOperations/linesOperations.i18n.json b/i18n/jpn/src/vs/editor/contrib/linesOperations/linesOperations.i18n.json
deleted file mode 100644
index 16f53a15f51..00000000000
--- a/i18n/jpn/src/vs/editor/contrib/linesOperations/linesOperations.i18n.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"lines.copyUp": "行を上へコピー",
-	"lines.copyDown": "行を下へコピー",
-	"lines.moveUp": "行を上へ移動",
-	"lines.moveDown": "行を下へ移動",
-	"lines.sortAscending": "行を昇順に並べ替え",
-	"lines.sortDescending": "行を降順に並べ替え",
-	"lines.trimTrailingWhitespace": "末尾の空白のトリミング",
-	"lines.delete": "行の削除",
-	"lines.indent": "行のインデント",
-	"lines.outdent": "行のインデント解除",
-	"lines.insertBefore": "行を上に挿入",
-	"lines.insertAfter": "行を下に挿入",
-	"lines.deleteAllLeft": "左側をすべて削除",
-	"lines.deleteAllRight": "右側をすべて削除",
-	"lines.joinLines": "行をつなげる",
-	"editor.transpose": "カーソルの周囲の文字を入れ替える",
-	"editor.transformToUppercase": "大文字に変換",
-	"editor.transformToLowercase": "小文字に変換"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/editor/contrib/links/browser/links.i18n.json b/i18n/jpn/src/vs/editor/contrib/links/browser/links.i18n.json
deleted file mode 100644
index e00353168e9..00000000000
--- a/i18n/jpn/src/vs/editor/contrib/links/browser/links.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"links.navigate.mac": "command キーを押しながらクリックしてリンク先を表示",
-	"links.navigate": "Ctrl キーを押しながらクリックしてリンク先を表示",
-	"links.command.mac": "command キーを押しながらクリックしてコマンドを実行",
-	"links.command": "Ctrl キーを押しながらクリックしてコマンドを実行",
-	"links.navigate.al": "Altl キーを押しながらクリックしてリンク先を表示",
-	"links.command.al": "Alt キーを押しながらクリックしてコマンドを実行",
-	"invalid.url": "申し訳ありません。このリンクは形式が正しくないため開くことができませんでした: {0}",
-	"missing.url": "申し訳ありません。このリンクはターゲットが存在しないため開くことができませんでした。",
-	"label": "リンクを開く"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/editor/contrib/links/links.i18n.json b/i18n/jpn/src/vs/editor/contrib/links/links.i18n.json
deleted file mode 100644
index 5bdb5b2382d..00000000000
--- a/i18n/jpn/src/vs/editor/contrib/links/links.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"links.navigate.mac": "command キーを押しながらクリックしてリンク先を表示",
-	"links.navigate": "Ctrl キーを押しながらクリックしてリンク先を表示",
-	"links.command.mac": "command キーを押しながらクリックしてコマンドを実行",
-	"links.command": "Ctrl キーを押しながらクリックしてコマンドを実行",
-	"links.navigate.al.mac": "Option キーを押しながらクリックしてリンク先を表示",
-	"links.navigate.al": "Altl キーを押しながらクリックしてリンク先を表示",
-	"links.command.al.mac": "Option キーを押しながらクリックしてコマンドを実行",
-	"links.command.al": "Alt キーを押しながらクリックしてコマンドを実行",
-	"invalid.url": "このリンクは形式が正しくないため開くことができませんでした: {0}",
-	"missing.url": "このリンクはターゲットが存在しないため開くことができませんでした。",
-	"label": "リンクを開く"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/editor/contrib/message/messageController.i18n.json b/i18n/jpn/src/vs/editor/contrib/message/messageController.i18n.json
deleted file mode 100644
index b11769a8241..00000000000
--- a/i18n/jpn/src/vs/editor/contrib/message/messageController.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"editor.readonly": "読み取り専用のエディターは編集できません"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/editor/contrib/multicursor/common/multicursor.i18n.json b/i18n/jpn/src/vs/editor/contrib/multicursor/common/multicursor.i18n.json
deleted file mode 100644
index 0df6dca88c6..00000000000
--- a/i18n/jpn/src/vs/editor/contrib/multicursor/common/multicursor.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"mutlicursor.insertAbove": "カーソルを上に挿入",
-	"mutlicursor.insertBelow": "カーソルを下に挿入",
-	"mutlicursor.insertAtEndOfEachLineSelected": "カーソルを行末に挿入",
-	"addSelectionToNextFindMatch": "選択した項目を次の一致項目に追加",
-	"addSelectionToPreviousFindMatch": "選んだ項目を前の一致項目に追加する",
-	"moveSelectionToNextFindMatch": "最後に選択した項目を次の一致項目に移動",
-	"moveSelectionToPreviousFindMatch": "最後に選んだ項目を前の一致項目に移動する",
-	"selectAllOccurrencesOfFindMatch": "一致するすべての出現箇所を選択します",
-	"changeAll.label": "すべての出現箇所を変更"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/editor/contrib/multicursor/multicursor.i18n.json b/i18n/jpn/src/vs/editor/contrib/multicursor/multicursor.i18n.json
deleted file mode 100644
index 28bb716c138..00000000000
--- a/i18n/jpn/src/vs/editor/contrib/multicursor/multicursor.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"mutlicursor.insertAbove": "カーソルを上に挿入",
-	"mutlicursor.insertBelow": "カーソルを下に挿入",
-	"mutlicursor.insertAtEndOfEachLineSelected": "カーソルを行末に挿入",
-	"addSelectionToNextFindMatch": "選択項目を次の一致項目に追加",
-	"addSelectionToPreviousFindMatch": "選択項目を次の一致項目に追加",
-	"moveSelectionToNextFindMatch": "最後に選択した項目を次の一致項目に移動",
-	"moveSelectionToPreviousFindMatch": "最後に選択した項目を前の一致項目に移動",
-	"selectAllOccurrencesOfFindMatch": "一致するすべての出現箇所を選択",
-	"changeAll.label": "すべての出現箇所を変更"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/editor/contrib/parameterHints/browser/parameterHints.i18n.json b/i18n/jpn/src/vs/editor/contrib/parameterHints/browser/parameterHints.i18n.json
deleted file mode 100644
index 64d3d836869..00000000000
--- a/i18n/jpn/src/vs/editor/contrib/parameterHints/browser/parameterHints.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"parameterHints.trigger.label": "パラメーター ヒントをトリガー"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/editor/contrib/parameterHints/browser/parameterHintsWidget.i18n.json b/i18n/jpn/src/vs/editor/contrib/parameterHints/browser/parameterHintsWidget.i18n.json
deleted file mode 100644
index 4ea56b2c8da..00000000000
--- a/i18n/jpn/src/vs/editor/contrib/parameterHints/browser/parameterHintsWidget.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"hint": "{0}、ヒント"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/editor/contrib/parameterHints/parameterHints.i18n.json b/i18n/jpn/src/vs/editor/contrib/parameterHints/parameterHints.i18n.json
deleted file mode 100644
index 7c80aa1ca9c..00000000000
--- a/i18n/jpn/src/vs/editor/contrib/parameterHints/parameterHints.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"parameterHints.trigger.label": "パラメーター ヒントをトリガー"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/editor/contrib/parameterHints/parameterHintsWidget.i18n.json b/i18n/jpn/src/vs/editor/contrib/parameterHints/parameterHintsWidget.i18n.json
deleted file mode 100644
index d06019fface..00000000000
--- a/i18n/jpn/src/vs/editor/contrib/parameterHints/parameterHintsWidget.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hint": "{0}、ヒント"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/editor/contrib/quickFix/browser/quickFixCommands.i18n.json b/i18n/jpn/src/vs/editor/contrib/quickFix/browser/quickFixCommands.i18n.json
deleted file mode 100644
index 14dcd69b4a6..00000000000
--- a/i18n/jpn/src/vs/editor/contrib/quickFix/browser/quickFixCommands.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"quickFixWithKb": "修正プログラム ({0}) を表示する",
-	"quickFix": "修正プログラムを表示する",
-	"quickfix.trigger.label": "クイック修正"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/editor/contrib/quickFix/quickFixCommands.i18n.json b/i18n/jpn/src/vs/editor/contrib/quickFix/quickFixCommands.i18n.json
deleted file mode 100644
index f3a19e19b68..00000000000
--- a/i18n/jpn/src/vs/editor/contrib/quickFix/quickFixCommands.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"quickFixWithKb": "修正プログラム ({0}) を表示する",
-	"quickFix": "修正プログラムを表示する",
-	"quickfix.trigger.label": "クイック修正",
-	"refactor.label": "リファクタリング"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/editor/contrib/referenceSearch/browser/peekViewWidget.i18n.json b/i18n/jpn/src/vs/editor/contrib/referenceSearch/browser/peekViewWidget.i18n.json
deleted file mode 100644
index e6139bff349..00000000000
--- a/i18n/jpn/src/vs/editor/contrib/referenceSearch/browser/peekViewWidget.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"label.close": "閉じる"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/editor/contrib/referenceSearch/browser/referenceSearch.i18n.json b/i18n/jpn/src/vs/editor/contrib/referenceSearch/browser/referenceSearch.i18n.json
deleted file mode 100644
index 0040e3675d8..00000000000
--- a/i18n/jpn/src/vs/editor/contrib/referenceSearch/browser/referenceSearch.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"meta.titleReference": "– {0} 個の参照",
-	"references.action.label": "すべての参照の検索"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/editor/contrib/referenceSearch/browser/referencesController.i18n.json b/i18n/jpn/src/vs/editor/contrib/referenceSearch/browser/referencesController.i18n.json
deleted file mode 100644
index b31a080bc82..00000000000
--- a/i18n/jpn/src/vs/editor/contrib/referenceSearch/browser/referencesController.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"labelLoading": "読み込んでいます..."
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/editor/contrib/referenceSearch/browser/referencesModel.i18n.json b/i18n/jpn/src/vs/editor/contrib/referenceSearch/browser/referencesModel.i18n.json
deleted file mode 100644
index 00407b4d7e3..00000000000
--- a/i18n/jpn/src/vs/editor/contrib/referenceSearch/browser/referencesModel.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"aria.oneReference": "列 {2} の {1} 行目に {0} つのシンボル",
-	"aria.fileReferences.1": "{0} に 1 個のシンボル、完全なパス {1}",
-	"aria.fileReferences.N": "{1} に {0} 個のシンボル、完全なパス {2}",
-	"aria.result.0": "一致する項目はありません",
-	"aria.result.1": "{0} に 1 個のシンボルが見つかりました",
-	"aria.result.n1": "{1} に {0} 個のシンボルが見つかりました",
-	"aria.result.nm": "{1} 個のファイルに {0} 個のシンボルが見つかりました"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/editor/contrib/referenceSearch/browser/referencesWidget.i18n.json b/i18n/jpn/src/vs/editor/contrib/referenceSearch/browser/referencesWidget.i18n.json
deleted file mode 100644
index 8fedf2e46b0..00000000000
--- a/i18n/jpn/src/vs/editor/contrib/referenceSearch/browser/referencesWidget.i18n.json
+++ /dev/null
@@ -1,27 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"referencesFailre": "ファイルを解決できませんでした。",
-	"referencesCount": "{0} 個の参照",
-	"referenceCount": "{0} 個の参照",
-	"missingPreviewMessage": "プレビューを表示できません",
-	"treeAriaLabel": "参照",
-	"noResults": "結果がありません",
-	"peekView.alternateTitle": "参照",
-	"peekViewTitleBackground": "ピーク ビューのタイトル領域の背景色。",
-	"peekViewTitleForeground": "ピーク ビュー タイトルの色。",
-	"peekViewTitleInfoForeground": "ピーク ビューのタイトル情報の色。",
-	"peekViewBorder": "ピーク ビューの境界と矢印の色。",
-	"peekViewResultsBackground": "ピーク ビュー結果リストの背景色。",
-	"peekViewResultsMatchForeground": "ピーク ビュー結果リストのライン ノードの前景色。",
-	"peekViewResultsFileForeground": "ピーク ビュー結果リストのファイル ノードの前景色。",
-	"peekViewResultsSelectionBackground": "ピーク ビュー結果リストの選択済みエントリの背景色。",
-	"peekViewResultsSelectionForeground": "ピーク ビュー結果リストの選択済みエントリの前景色。",
-	"peekViewEditorBackground": "ピーク ビュー エディターの背景色。",
-	"peekViewEditorGutterBackground": "ピーク ビュー エディターの余白の背景色。",
-	"peekViewResultsMatchHighlight": "ピーク ビュー結果リストの一致した強調表示色。",
-	"peekViewEditorMatchHighlight": "ピーク ビュー エディターの一致した強調表示色。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/editor/contrib/referenceSearch/peekViewWidget.i18n.json b/i18n/jpn/src/vs/editor/contrib/referenceSearch/peekViewWidget.i18n.json
deleted file mode 100644
index e2e3fa620dc..00000000000
--- a/i18n/jpn/src/vs/editor/contrib/referenceSearch/peekViewWidget.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"label.close": "閉じる"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/editor/contrib/referenceSearch/referenceSearch.i18n.json b/i18n/jpn/src/vs/editor/contrib/referenceSearch/referenceSearch.i18n.json
deleted file mode 100644
index 2f955eddd72..00000000000
--- a/i18n/jpn/src/vs/editor/contrib/referenceSearch/referenceSearch.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"meta.titleReference": "– {0} 個の参照",
-	"references.action.label": "すべての参照の検索"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/editor/contrib/referenceSearch/referencesController.i18n.json b/i18n/jpn/src/vs/editor/contrib/referenceSearch/referencesController.i18n.json
deleted file mode 100644
index 43f87d67bf8..00000000000
--- a/i18n/jpn/src/vs/editor/contrib/referenceSearch/referencesController.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"labelLoading": "読み込んでいます..."
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/editor/contrib/referenceSearch/referencesModel.i18n.json b/i18n/jpn/src/vs/editor/contrib/referenceSearch/referencesModel.i18n.json
deleted file mode 100644
index 9bf33b2b906..00000000000
--- a/i18n/jpn/src/vs/editor/contrib/referenceSearch/referencesModel.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"aria.oneReference": "列 {2} の {1} 行目に {0} つのシンボル",
-	"aria.fileReferences.1": "{0} に 1 個のシンボル、完全なパス {1}",
-	"aria.fileReferences.N": "{1} に {0} 個のシンボル、完全なパス {2}",
-	"aria.result.0": "一致する項目はありません",
-	"aria.result.1": "{0} に 1 個のシンボルが見つかりました",
-	"aria.result.n1": "{1} に {0} 個のシンボルが見つかりました",
-	"aria.result.nm": "{1} 個のファイルに {0} 個のシンボルが見つかりました"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/editor/contrib/referenceSearch/referencesWidget.i18n.json b/i18n/jpn/src/vs/editor/contrib/referenceSearch/referencesWidget.i18n.json
deleted file mode 100644
index e13c2a22eca..00000000000
--- a/i18n/jpn/src/vs/editor/contrib/referenceSearch/referencesWidget.i18n.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"referencesFailre": "ファイルを解決できませんでした。",
-	"referencesCount": "{0} 個の参照",
-	"referenceCount": "{0} 個の参照",
-	"missingPreviewMessage": "プレビューを表示できません",
-	"treeAriaLabel": "参照",
-	"noResults": "結果がありません",
-	"peekView.alternateTitle": "参照",
-	"peekViewTitleBackground": "ピーク ビューのタイトル領域の背景色。",
-	"peekViewTitleForeground": "ピーク ビュー タイトルの色。",
-	"peekViewTitleInfoForeground": "ピーク ビューのタイトル情報の色。",
-	"peekViewBorder": "ピーク ビューの境界と矢印の色。",
-	"peekViewResultsBackground": "ピーク ビュー結果リストの背景色。",
-	"peekViewResultsMatchForeground": "ピーク ビュー結果リストのライン ノードの前景色。",
-	"peekViewResultsFileForeground": "ピーク ビュー結果リストのファイル ノードの前景色。",
-	"peekViewResultsSelectionBackground": "ピーク ビュー結果リストの選択済みエントリの背景色。",
-	"peekViewResultsSelectionForeground": "ピーク ビュー結果リストの選択済みエントリの前景色。",
-	"peekViewEditorBackground": "ピーク ビュー エディターの背景色。",
-	"peekViewEditorGutterBackground": "ピーク ビュー エディターの余白の背景色。",
-	"peekViewResultsMatchHighlight": "ピーク ビュー結果リストの一致した強調表示色。",
-	"peekViewEditorMatchHighlight": "ピーク ビュー エディターの一致した強調表示色。",
-	"peekViewEditorMatchHighlightBorder": "ピーク ビュー エディターの一致した強調境界色。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/editor/contrib/rename/browser/rename.i18n.json b/i18n/jpn/src/vs/editor/contrib/rename/browser/rename.i18n.json
deleted file mode 100644
index 65225095897..00000000000
--- a/i18n/jpn/src/vs/editor/contrib/rename/browser/rename.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"no result": "結果がありません。",
-	"aria": "'{0}' から '{1}' への名前変更が正常に完了しました。概要: {2}",
-	"rename.failed": "申し訳ありません。名前の変更を実行できませんでした。",
-	"rename.label": "シンボルの名前を変更"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/editor/contrib/rename/browser/renameInputField.i18n.json b/i18n/jpn/src/vs/editor/contrib/rename/browser/renameInputField.i18n.json
deleted file mode 100644
index 3978f544c8b..00000000000
--- a/i18n/jpn/src/vs/editor/contrib/rename/browser/renameInputField.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"renameAriaLabel": "名前変更入力。新しい名前を入力し、Enter キーを押してコミットしてください。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/editor/contrib/rename/rename.i18n.json b/i18n/jpn/src/vs/editor/contrib/rename/rename.i18n.json
deleted file mode 100644
index 311c35e73dc..00000000000
--- a/i18n/jpn/src/vs/editor/contrib/rename/rename.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"no result": "結果がありません。",
-	"aria": "'{0}' から '{1}' への名前変更が正常に完了しました。概要: {2}",
-	"rename.failed": "名前の変更を実行できませんでした。",
-	"rename.label": "シンボルの名前を変更"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/editor/contrib/rename/renameInputField.i18n.json b/i18n/jpn/src/vs/editor/contrib/rename/renameInputField.i18n.json
deleted file mode 100644
index de377154879..00000000000
--- a/i18n/jpn/src/vs/editor/contrib/rename/renameInputField.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"renameAriaLabel": "名前変更入力。新しい名前を入力し、Enter キーを押してコミットしてください。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/editor/contrib/smartSelect/common/smartSelect.i18n.json b/i18n/jpn/src/vs/editor/contrib/smartSelect/common/smartSelect.i18n.json
deleted file mode 100644
index 381a45a7bda..00000000000
--- a/i18n/jpn/src/vs/editor/contrib/smartSelect/common/smartSelect.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"smartSelect.grow": "選択範囲を拡大",
-	"smartSelect.shrink": "選択範囲を縮小"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/editor/contrib/smartSelect/smartSelect.i18n.json b/i18n/jpn/src/vs/editor/contrib/smartSelect/smartSelect.i18n.json
deleted file mode 100644
index 6a28d22a208..00000000000
--- a/i18n/jpn/src/vs/editor/contrib/smartSelect/smartSelect.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"smartSelect.grow": "選択範囲を拡大",
-	"smartSelect.shrink": "選択範囲を縮小"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/editor/contrib/snippet/snippetVariables.i18n.json b/i18n/jpn/src/vs/editor/contrib/snippet/snippetVariables.i18n.json
deleted file mode 100644
index 7c0d7d8f473..00000000000
--- a/i18n/jpn/src/vs/editor/contrib/snippet/snippetVariables.i18n.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"Sunday": "日曜日",
-	"Monday": "月曜日",
-	"Tuesday": "火曜日",
-	"Wednesday": "水曜日",
-	"Thursday": "木曜日",
-	"Friday": "金曜日",
-	"Saturday": "土曜日",
-	"SundayShort": "日",
-	"MondayShort": "月",
-	"TuesdayShort": "火",
-	"WednesdayShort": "水",
-	"ThursdayShort": "木",
-	"FridayShort": "金",
-	"SaturdayShort": "土",
-	"January": "1 月",
-	"February": "2 月",
-	"March": "3 月",
-	"April": "4 月",
-	"May": "5 月",
-	"June": "6 月",
-	"July": "7 月",
-	"August": "8 月",
-	"September": "9 月",
-	"October": "10 月",
-	"November": "11 月",
-	"December": "12 月",
-	"JanuaryShort": "1 月",
-	"FebruaryShort": "2 月",
-	"MarchShort": "3 月",
-	"AprilShort": "4 月",
-	"MayShort": "5 月",
-	"JuneShort": "6 月",
-	"JulyShort": "7 月",
-	"AugustShort": "8 月",
-	"SeptemberShort": "9 月",
-	"OctoberShort": "10 月",
-	"NovemberShort": "11 月",
-	"DecemberShort": "12 月"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/editor/contrib/suggest/browser/suggestController.i18n.json b/i18n/jpn/src/vs/editor/contrib/suggest/browser/suggestController.i18n.json
deleted file mode 100644
index 1c7707699b8..00000000000
--- a/i18n/jpn/src/vs/editor/contrib/suggest/browser/suggestController.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"arai.alert.snippet": "'{0}' が次のテキストを挿入したことを承認しています: {1}",
-	"suggest.trigger.label": "候補をトリガー"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/editor/contrib/suggest/browser/suggestWidget.i18n.json b/i18n/jpn/src/vs/editor/contrib/suggest/browser/suggestWidget.i18n.json
deleted file mode 100644
index 65e2583d291..00000000000
--- a/i18n/jpn/src/vs/editor/contrib/suggest/browser/suggestWidget.i18n.json
+++ /dev/null
@@ -1,21 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"editorSuggestWidgetBackground": "候補のウィジェットの背景色。",
-	"editorSuggestWidgetBorder": "候補ウィジェットの境界線色。",
-	"editorSuggestWidgetForeground": "候補ウィジェットの前景色。",
-	"editorSuggestWidgetSelectedBackground": "候補ウィジェット内で選択済みエントリの背景色。",
-	"editorSuggestWidgetHighlightForeground": "候補のウィジェット内で一致したハイライトの色。",
-	"readMore": "詳細を表示...{0}",
-	"suggestionWithDetailsAriaLabel": "{0}、候補、詳細あり",
-	"suggestionAriaLabel": "{0}、候補",
-	"readLess": "詳細を隠す...{0}",
-	"suggestWidget.loading": "読み込んでいます...",
-	"suggestWidget.noSuggestions": "候補はありません。",
-	"suggestionAriaAccepted": "{0}、受け入れ済み",
-	"ariaCurrentSuggestionWithDetails": "{0}、候補、詳細あり",
-	"ariaCurrentSuggestion": "{0}、候補"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/editor/contrib/suggest/suggestController.i18n.json b/i18n/jpn/src/vs/editor/contrib/suggest/suggestController.i18n.json
deleted file mode 100644
index 3e82990bd4d..00000000000
--- a/i18n/jpn/src/vs/editor/contrib/suggest/suggestController.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"arai.alert.snippet": "'{0}' が次のテキストを挿入したことを承認しています: {1}",
-	"suggest.trigger.label": "候補をトリガー"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/editor/contrib/suggest/suggestWidget.i18n.json b/i18n/jpn/src/vs/editor/contrib/suggest/suggestWidget.i18n.json
deleted file mode 100644
index 38e3baf9a2f..00000000000
--- a/i18n/jpn/src/vs/editor/contrib/suggest/suggestWidget.i18n.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"editorSuggestWidgetBackground": "候補のウィジェットの背景色。",
-	"editorSuggestWidgetBorder": "候補ウィジェットの境界線色。",
-	"editorSuggestWidgetForeground": "候補ウィジェットの前景色。",
-	"editorSuggestWidgetSelectedBackground": "候補ウィジェット内で選択済みエントリの背景色。",
-	"editorSuggestWidgetHighlightForeground": "候補のウィジェット内で一致したハイライトの色。",
-	"readMore": "詳細を表示...{0}",
-	"suggestionWithDetailsAriaLabel": "{0}、候補、詳細あり",
-	"suggestionAriaLabel": "{0}、候補",
-	"readLess": "詳細を隠す...{0}",
-	"suggestWidget.loading": "読み込んでいます...",
-	"suggestWidget.noSuggestions": "候補はありません。",
-	"suggestionAriaAccepted": "{0}、受け入れ済み",
-	"ariaCurrentSuggestionWithDetails": "{0}、候補、詳細あり",
-	"ariaCurrentSuggestion": "{0}、候補"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/editor/contrib/toggleTabFocusMode/common/toggleTabFocusMode.i18n.json b/i18n/jpn/src/vs/editor/contrib/toggleTabFocusMode/common/toggleTabFocusMode.i18n.json
deleted file mode 100644
index 63cb6013496..00000000000
--- a/i18n/jpn/src/vs/editor/contrib/toggleTabFocusMode/common/toggleTabFocusMode.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"toggle.tabMovesFocus": "Tab キーを切り替えるとフォーカスが移動します"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/editor/contrib/toggleTabFocusMode/toggleTabFocusMode.i18n.json b/i18n/jpn/src/vs/editor/contrib/toggleTabFocusMode/toggleTabFocusMode.i18n.json
deleted file mode 100644
index 429d9328a15..00000000000
--- a/i18n/jpn/src/vs/editor/contrib/toggleTabFocusMode/toggleTabFocusMode.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggle.tabMovesFocus": "TAB キーのフォーカス移動を切り替え"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/editor/contrib/wordHighlighter/common/wordHighlighter.i18n.json b/i18n/jpn/src/vs/editor/contrib/wordHighlighter/common/wordHighlighter.i18n.json
deleted file mode 100644
index 8eac21c6979..00000000000
--- a/i18n/jpn/src/vs/editor/contrib/wordHighlighter/common/wordHighlighter.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"wordHighlight": "変数の読み取りなど読み取りアクセス中のシンボルの背景色。",
-	"wordHighlightStrong": "変数への書き込みなど書き込みアクセス中のシンボルの背景色。",
-	"overviewRulerWordHighlightForeground": "シンボルを強調表示するときの概要ルーラーのマーカー色。",
-	"overviewRulerWordHighlightStrongForeground": "書き込みアクセス シンボルを強調表示するときの概要ルーラーのマーカー色。",
-	"wordHighlight.next.label": "次のシンボル ハイライトに移動",
-	"wordHighlight.previous.label": "前のシンボル ハイライトに移動"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json b/i18n/jpn/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
deleted file mode 100644
index 04ae521063b..00000000000
--- a/i18n/jpn/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"wordHighlight": "変数の読み取りなど読み取りアクセス中のシンボルの背景色。下にある装飾を隠さないために、色は不透過であってはなりません。",
-	"wordHighlightStrong": "変数への書き込みなど書き込みアクセス中のシンボルの背景色。下にある装飾を隠さないために、色は不透過であってはなりません。",
-	"wordHighlightBorder": "変数の読み取りなど読み取りアクセス中のシンボルの境界線の色。",
-	"wordHighlightStrongBorder": "変数への書き込みなど書き込みアクセス中のシンボルの境界線の色。",
-	"overviewRulerWordHighlightForeground": "シンボルを強調表示するときの概要ルーラーのマーカー色。この色は下地の色に紛れないよう不明瞭であってはいけません。",
-	"overviewRulerWordHighlightStrongForeground": "書き込みアクセス シンボルを強調表示するときの概要ルーラーのマーカー色。この色は下地の色に紛れないよう不明瞭であってはいけません。",
-	"wordHighlight.next.label": "次のシンボル ハイライトに移動",
-	"wordHighlight.previous.label": "前のシンボル ハイライトに移動"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/editor/contrib/zoneWidget/browser/peekViewWidget.i18n.json b/i18n/jpn/src/vs/editor/contrib/zoneWidget/browser/peekViewWidget.i18n.json
deleted file mode 100644
index e6139bff349..00000000000
--- a/i18n/jpn/src/vs/editor/contrib/zoneWidget/browser/peekViewWidget.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"label.close": "閉じる"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/editor/electron-browser/textMate/TMSyntax.i18n.json b/i18n/jpn/src/vs/editor/electron-browser/textMate/TMSyntax.i18n.json
deleted file mode 100644
index 8ff4f98ce53..00000000000
--- a/i18n/jpn/src/vs/editor/electron-browser/textMate/TMSyntax.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"invalid.language": "`contributes.{0}.language` で不明な言語です。提供された値: {1}",
-	"invalid.scopeName": "`contributes.{0}.scopeName` には文字列が必要です。提供された値: {1}",
-	"invalid.path.0": "`contributes.{0}.path` に文字列が必要です。提供された値: {1}",
-	"invalid.injectTo": "`contributes.{0}.injectTo` の値が無効です。言語の範囲名の配列である必要があります。指定された値: {1}",
-	"invalid.embeddedLanguages": "`contributes.{0}.embeddedLanguages` の値が無効です。スコープ名から言語へのオブジェクト マップである必要があります。指定された値: {1}",
-	"invalid.path.1": "拡張機能のフォルダー ({2}) の中に `contributes.{0}.path` ({1}) が含まれている必要があります。これにより拡張を移植できなくなる可能性があります。",
-	"no-tm-grammar": "この言語に対して TM 文法は登録されていません。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/editor/node/languageConfigurationExtensionPoint.i18n.json b/i18n/jpn/src/vs/editor/node/languageConfigurationExtensionPoint.i18n.json
deleted file mode 100644
index 7f3e60f73e4..00000000000
--- a/i18n/jpn/src/vs/editor/node/languageConfigurationExtensionPoint.i18n.json
+++ /dev/null
@@ -1,23 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"parseErrors": "{0} を解析中のエラー: {1}",
-	"schema.openBracket": "左角かっこまたは文字列シーケンス。",
-	"schema.closeBracket": "右角かっこまたは文字列シーケンス。",
-	"schema.comments": "コメント記号を定義します。",
-	"schema.blockComments": "ブロック コメントのマーク方法を定義します。",
-	"schema.blockComment.begin": "ブロック コメントを開始する文字シーケンス。",
-	"schema.blockComment.end": "ブロック コメントを終了する文字シーケンス。",
-	"schema.lineComment": "行コメントを開始する文字シーケンス。",
-	"schema.brackets": "インデントを増減する角かっこを定義します。",
-	"schema.autoClosingPairs": "角かっこのペアを定義します。左角かっこが入力されると、右角かっこが自動的に挿入されます。",
-	"schema.autoClosingPairs.notIn": "自動ペアが無効なスコープの一覧を定義します。",
-	"schema.surroundingPairs": "選択文字列を囲むときに使用できる角かっこのペアを定義します。",
-	"schema.wordPattern": "言語のための単語の定義。",
-	"schema.wordPattern.pattern": "言葉の照合に使用する正規表現パターン。",
-	"schema.wordPattern.flags": "言葉の照合に使用する正規表現フラグ。",
-	"schema.wordPattern.flags.errorMessage": "`/^([gimuy]+)$/` パターンに一致する必要があります。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/editor/node/textMate/TMGrammars.i18n.json b/i18n/jpn/src/vs/editor/node/textMate/TMGrammars.i18n.json
deleted file mode 100644
index bef6d6ac196..00000000000
--- a/i18n/jpn/src/vs/editor/node/textMate/TMGrammars.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"vscode.extension.contributes.grammars": "TextMate トークナイザーを提供します。",
-	"vscode.extension.contributes.grammars.language": "この構文の提供先の言語識別子です。",
-	"vscode.extension.contributes.grammars.scopeName": "tmLanguage ファイルにより使用される TextMate スコープ名。",
-	"vscode.extension.contributes.grammars.path": "tmLanguage ファイルのパス。拡張機能フォルダーの相対パスであり、通常 './syntaxes/' で始まります。",
-	"vscode.extension.contributes.grammars.embeddedLanguages": "この文法に言語が埋め込まれている場合は、言語 ID に対するスコープ名のマップ。",
-	"vscode.extension.contributes.grammars.injectTo": "この文法が挿入される言語の範囲名の一覧。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/platform/actions/browser/menuItemActionItem.i18n.json b/i18n/jpn/src/vs/platform/actions/browser/menuItemActionItem.i18n.json
deleted file mode 100644
index 0d4e76110bb..00000000000
--- a/i18n/jpn/src/vs/platform/actions/browser/menuItemActionItem.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"titleAndKb": "{0} ({1})"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json b/i18n/jpn/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
deleted file mode 100644
index ef65f3f2706..00000000000
--- a/i18n/jpn/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"requirearray": "メニュー項目は配列にする必要があります",
-	"requirestring": "`{0}` プロパティは必須で、`string` 型でなければなりません",
-	"optstring": "`{0}` プロパティは省略するか、`string` 型にする必要があります",
-	"vscode.extension.contributes.menuItem.command": "実行するコマンドの識別子。コマンドは 'commands' セクションで宣言する必要があります",
-	"vscode.extension.contributes.menuItem.alt": "実行する別のコマンドの識別子。コマンドは 'commands' セクションで宣言する必要があります",
-	"vscode.extension.contributes.menuItem.when": "この項目を表示するために満たす必要がある条件",
-	"vscode.extension.contributes.menuItem.group": "このコマンドが属するグループ",
-	"vscode.extension.contributes.menus": "メニュー項目をエディターに提供します",
-	"menus.commandPalette": "コマンド パレット",
-	"menus.touchBar": "Touch Bar (macOS のみ)",
-	"menus.editorTitle": "エディターのタイトル メニュー",
-	"menus.editorContext": "エディターのコンテキスト メニュー",
-	"menus.explorerContext": "エクスプローラーのコンテキスト メニュー",
-	"menus.editorTabContext": "エディターのタブのコンテキスト メニュー",
-	"menus.debugCallstackContext": "デバッグの呼び出し履歴のコンテキスト メニュー",
-	"menus.scmTitle": "ソース管理のタイトル メニュー",
-	"menus.scmSourceControl": "ソース管理メニュー",
-	"menus.resourceGroupContext": "ソース管理リソース グループのコンテキスト メニュー",
-	"menus.resourceStateContext": "ソース管理リソース状態のコンテキスト メニュー",
-	"view.viewTitle": "提供されたビューのタイトル メニュー",
-	"view.itemContext": "提供されたビュー項目のコンテキスト メニュー",
-	"nonempty": "空でない値が必要です。",
-	"opticon": "`icon` プロパティは省略できます。指定する場合には、文字列または `{dark, light}` などのリテラルにする必要があります",
-	"requireStringOrObject": "`{0}` プロパティは必須で、`string` または `object` の型でなければなりません",
-	"requirestrings": "プロパティの `{0}` と `{1}` は必須で、`string` 型でなければなりません",
-	"vscode.extension.contributes.commandType.command": "実行するコマンドの識別子",
-	"vscode.extension.contributes.commandType.title": "コマンドが UI に表示される際のタイトル",
-	"vscode.extension.contributes.commandType.category": "(省略可能) コマンド別のカテゴリ文字列が UI でグループ分けされます",
-	"vscode.extension.contributes.commandType.icon": "(省略可能) UI でコマンドを表すためのアイコン。ファイル パス、またはテーマ設定可能な構成のいずれかです",
-	"vscode.extension.contributes.commandType.icon.light": "ライト テーマが使用される場合のアイコン パス",
-	"vscode.extension.contributes.commandType.icon.dark": "ダーク テーマが使用される場合のアイコン パス",
-	"vscode.extension.contributes.commands": "コマンド パレットにコマンドを提供します。",
-	"dup": "コマンド `{0}` が `commands` セクションで複数回出現します。",
-	"menuId.invalid": "`{0}` は有効なメニュー識別子ではありません",
-	"missing.command": "メニュー項目が、'commands' セクションで定義されていないコマンド `{0}` を参照しています。",
-	"missing.altCommand": "メニュー項目が、'commands' セクションで定義されていない alt コマンド `{0}` を参照しています。",
-	"dupe.command": "メニュー項目において、既定と alt コマンドが同じコマンドを参照しています"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/platform/configuration/common/configurationRegistry.i18n.json b/i18n/jpn/src/vs/platform/configuration/common/configurationRegistry.i18n.json
deleted file mode 100644
index bcfabf28627..00000000000
--- a/i18n/jpn/src/vs/platform/configuration/common/configurationRegistry.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"defaultConfigurations.title": "既定の構成オーバーライド",
-	"overrideSettings.description": "{0} 言語に対して上書きされるエディター設定を構成します。",
-	"overrideSettings.defaultDescription": "言語に対して上書きされるエディター設定を構成します。",
-	"config.property.languageDefault": "'{0}' を登録できません。これは、言語固有のエディター設定を記述するプロパティ パターン '\\\\[.*\\\\]$' に一致しています。'configurationDefaults' コントリビューションを使用してください。",
-	"config.property.duplicate": "'{0}' を登録できません。このプロパティは既に登録されています。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/platform/dialogs/common/dialogs.i18n.json b/i18n/jpn/src/vs/platform/dialogs/common/dialogs.i18n.json
deleted file mode 100644
index 7921873c1f8..00000000000
--- a/i18n/jpn/src/vs/platform/dialogs/common/dialogs.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"moreFile": "...1 つの追加ファイルが表示されていません",
-	"moreFiles": "...{0} 個の追加ファイルが表示されていません"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/platform/dialogs/node/dialogService.i18n.json b/i18n/jpn/src/vs/platform/dialogs/node/dialogService.i18n.json
deleted file mode 100644
index c2ef06b51ea..00000000000
--- a/i18n/jpn/src/vs/platform/dialogs/node/dialogService.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"cancel": "キャンセル"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/platform/environment/node/argv.i18n.json b/i18n/jpn/src/vs/platform/environment/node/argv.i18n.json
deleted file mode 100644
index dd4553b6a25..00000000000
--- a/i18n/jpn/src/vs/platform/environment/node/argv.i18n.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"gotoValidation": "`--goto` モードの引数は `FILE(:LINE(:CHARACTER))` の形式にする必要があります。",
-	"diff": "2 つのファイルを比較します。",
-	"add": "最後にアクティブだったウィンドウにフォルダーを追加します。",
-	"goto": "指定した行と文字の位置にあるパスでファイルを開きます。",
-	"newWindow": "強制的に新しいウィンドウを開きます。",
-	"reuseWindow": "強制的に最後にアクティブだったウィンドウ内でファイルかフォルダーを開きます。",
-	"wait": "現在のファイルが閉じられるまで待機します。",
-	"locale": "使用する国と地域 (例:en-US や zh-TW など)。",
-	"userDataDir": "ユーザー データが保持されるディレクトリを指定します。複数の異なる Code のインスタンスを開くために使用できます。",
-	"version": "バージョンを表示します。",
-	"help": "使用法を表示します。",
-	"extensionHomePath": "拡張機能のルート パスを設定します。",
-	"listExtensions": "インストールされている拡張機能を一覧表示します。",
-	"showVersions": "--list-extension と使用するとき、インストールされている拡張機能のバージョンを表示します。",
-	"installExtension": "拡張機能をインストールします。",
-	"uninstallExtension": "拡張機能をアンインストールします。",
-	"experimentalApis": "拡張機能に対して Proposed API 機能を有効にします。",
-	"verbose": "詳細出力を表示します (--wait を含みます)。",
-	"log": "使用するログレベル。既定値は 'info' です。利用可能な値は  'critical', 'error', 'warn', 'info', 'debug', 'trace', 'off' です。",
-	"status": "プロセスの使用状況や診断情報を印刷します。",
-	"performance": "'Developer: Startup Performance' コマンドを有効にして開始します。",
-	"prof-startup": "起動中に CPU プロファイラーを実行する",
-	"disableExtensions": "インストールされたすべての拡張機能を無効にします。",
-	"inspect-extensions": "拡張機能のデバッグとプロファイリングを許可します。connection URI を開発者ツールで確認します。",
-	"inspect-brk-extensions": "起動後に一時停止されている拡張ホストとの拡張機能のデバッグとプロファイリングを許可します。connection URI を開発者ツールで確認ます。",
-	"disableGPU": "GPU ハードウェア アクセラレータを無効にします。",
-	"uploadLogs": "現在のセッションから安全なエンドポイントにログをアップロードします。",
-	"maxMemory": "ウィンドウの最大メモリ サイズ (バイト単位)。",
-	"usage": "使用法",
-	"options": "オプション",
-	"paths": "パス",
-	"stdinWindows": "別のプログラムから出力を読み取るには、'-' を付け足してください (例: 'echo Hello World | {0} -')",
-	"stdinUnix": "stdin から読み取るには、'-' を付け足してください (例: 'ps aux | grep code | {0} -')",
-	"optionsUpperCase": "オプション",
-	"extensionsManagement": "拡張機能の管理",
-	"troubleshooting": "トラブルシューティング"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/platform/extensionManagement/common/extensionEnablementService.i18n.json b/i18n/jpn/src/vs/platform/extensionManagement/common/extensionEnablementService.i18n.json
deleted file mode 100644
index 03c8d0c56f8..00000000000
--- a/i18n/jpn/src/vs/platform/extensionManagement/common/extensionEnablementService.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noWorkspace": "ワークスペースがありません。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/platform/extensionManagement/common/extensionManagement.i18n.json b/i18n/jpn/src/vs/platform/extensionManagement/common/extensionManagement.i18n.json
deleted file mode 100644
index 3b4294109de..00000000000
--- a/i18n/jpn/src/vs/platform/extensionManagement/common/extensionManagement.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"extensions": "拡張機能",
-	"preferences": "基本設定"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/platform/extensionManagement/node/extensionGalleryService.i18n.json b/i18n/jpn/src/vs/platform/extensionManagement/node/extensionGalleryService.i18n.json
deleted file mode 100644
index fe95cacf57e..00000000000
--- a/i18n/jpn/src/vs/platform/extensionManagement/node/extensionGalleryService.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"notCompatibleDownload": "VS Code の現在のバージョン '{0}' と互換性を持つ拡張機能が見つからないため、ダウンロードできません。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json b/i18n/jpn/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
deleted file mode 100644
index 64efa1b1dbf..00000000000
--- a/i18n/jpn/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"invalidManifest": "正しくない拡張機能: package.json は JSON ファイルではありません。",
-	"incompatible": "Code '{1}' と互換性のない拡張機能 '{0}' をインストールできません。",
-	"restartCode": "{0} を再インストールする前に、Code を再起動してください。",
-	"installingOutdatedExtension": "この拡張機能の新しいバージョンが既にインストールされています。古いバージョンでこれを上書きしますか?",
-	"override": "上書き",
-	"cancel": "キャンセル",
-	"errorInstallingDependencies": "依存関係のインストール中にエラーが発生しました。{0}",
-	"MarketPlaceDisabled": "Marketplace が有効になっていません",
-	"removeError": "拡張機能の削除中にエラーが発生しました: {0}。もう一度やり直す前に、VS Code の終了と起動を実施してください。",
-	"Not a Marketplace extension": "Marketplace の拡張機能のみ再インストールできます",
-	"notFoundCompatible": "'{0}' をインストールできません。VS Code '{1}' と互換性がある利用可能なバージョンがありません。",
-	"malicious extension": "問題が報告されたので、拡張機能をインストールできません。",
-	"notFoundCompatibleDependency": "VS Code の現在のバージョン '{1}'  と互換性を持つ、依存関係がある拡張機能 '{0}' が見つからないため、インストールできません。",
-	"quitCode": "拡張機能をインストールできません。再インストールの前に VS Code の終了と起動を実施してください。",
-	"exitCode": "拡張機能をインストールできません。再インストールの前に VS Code の終了と起動を実施してください。",
-	"renameError": "{0} から {1} に名前変更中に不明なエラーが発生しました",
-	"uninstallDependeciesConfirmation": "'{0}' のみをアンインストールしますか、または依存関係もアンインストールしますか?",
-	"uninstallOnly": "拡張機能のみ",
-	"uninstallAll": "すべてアンインストール",
-	"singleDependentError": "拡張機能 '{0}' をアンインストールできません。拡張機能 '{1}' がこの拡張機能に依存しています。",
-	"twoDependentsError": "拡張機能 '{0}' をアンインストールできません。拡張機能 '{1}' と '{2}' がこの拡張機能に依存しています。",
-	"multipleDependentsError": "拡張機能 '{0}' をアンインストールできません。拡張機能 '{1}'、'{2}'、その他がこの拡張機能に依存しています。",
-	"notExists": "拡張機能を見つけられませんでした"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/platform/extensions/common/abstractExtensionService.i18n.json b/i18n/jpn/src/vs/platform/extensions/common/abstractExtensionService.i18n.json
deleted file mode 100644
index 5d369543a9a..00000000000
--- a/i18n/jpn/src/vs/platform/extensions/common/abstractExtensionService.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"unknownDep": "拡張機能 `{1}` のアクティブ化に失敗しました。理由: 依存関係 `{0}` が不明です。",
-	"failedDep1": "拡張機能 `{1}` のアクティブ化に失敗しました。理由: 依存関係 `{0}` のアクティブ化に失敗しました。",
-	"failedDep2": "拡張機能 `{0}` のアクティブ化に失敗しました。理由: 依存関係のレベルが 10 を超えています (依存関係のループの可能性があります)。",
-	"activationError": "拡張機能 `{0}` のアクティブ化に失敗しました: {1}。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/platform/extensions/common/extensionsRegistry.i18n.json b/i18n/jpn/src/vs/platform/extensions/common/extensionsRegistry.i18n.json
deleted file mode 100644
index edd7f28feda..00000000000
--- a/i18n/jpn/src/vs/platform/extensions/common/extensionsRegistry.i18n.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.engines.vscode": "VS Code 拡張機能の場合、拡張機能と互換性のある VS Code バージョンを指定します。* を指定することはできません。たとえば、^0.10.5 は最小の VS Code バージョン 0.10.5 との互換性を示します。",
-	"vscode.extension.publisher": "VS Code 拡張機能の公開元。",
-	"vscode.extension.displayName": "VS Code ギャラリーで使用される拡張機能の表示名。",
-	"vscode.extension.categories": "VS Code ギャラリーで拡張機能の分類に使用されるカテゴリ。",
-	"vscode.extension.galleryBanner": "VS Code マーケットプレースで使用されるバナー。",
-	"vscode.extension.galleryBanner.color": "VS Code マーケットプレース ページ ヘッダー上のバナーの色。",
-	"vscode.extension.galleryBanner.theme": "バナーで使用されるフォントの配色テーマ。",
-	"vscode.extension.contributes": "このパッケージで表される VS Code 拡張機能のすべてのコントリビューション。",
-	"vscode.extension.preview": "Marketplace で Preview としてフラグが付けられるように拡張機能を設定します。",
-	"vscode.extension.activationEvents": "VS Code 拡張機能のアクティブ化イベント。",
-	"vscode.extension.activationEvents.onLanguage": "指定された言語を解決するファイルが開かれるたびにアクティブ化イベントが発行されます。",
-	"vscode.extension.activationEvents.onCommand": "指定したコマンドが呼び出されるたびにアクティブ化イベントが発行されます。",
-	"vscode.extension.activationEvents.onDebug": "デバッグの開始またはデバッグ構成がセットアップされるたびにアクティブ化イベントが発行されます。",
-	"vscode.extension.activationEvents.onDebugInitialConfigurations": "\"launch.json\" を作成する必要があるたびに (または、すべての provideDebugConfiguration メソッドを呼び出す必要があるたびに) アクティブ化イベントを発行します。",
-	"vscode.extension.activationEvents.onDebugResolve": "特定のタイプのデバッグ セッションが起動されるたびに（または、対応する resolveDebugConfiguration メソッドを呼び出す必要があるたびに）、アクティブ化イベントを発行します。",
-	"vscode.extension.activationEvents.workspaceContains": "指定した glob パターンに一致するファイルを少なくとも 1 つ以上含むフォルダーを開くたびにアクティブ化イベントが発行されます。",
-	"vscode.extension.activationEvents.onView": "指定したビューを展開するたびにアクティブ化イベントが発行されます。",
-	"vscode.extension.activationEvents.star": "VS Code 起動時にアクティブ化イベントを発行します。優れたエンドユーザー エクスペリエンスを確保するために、他のアクティブ化イベントの組み合わせでは望む動作にならないときのみ使用してください。",
-	"vscode.extension.badges": "Marketplace の拡張機能ページのサイドバーに表示されるバッジの配列。",
-	"vscode.extension.badges.url": "バッジのイメージ URL。",
-	"vscode.extension.badges.href": "バッジのリンク。",
-	"vscode.extension.badges.description": "バッジの説明。",
-	"vscode.extension.extensionDependencies": "他の拡張機能に対する依存関係。拡張機能の識別子は常に ${publisher}.${name} です。例: vscode.csharp。",
-	"vscode.extension.scripts.prepublish": "パッケージが VS Code 拡張機能として公開される前に実行されるスクリプト。",
-	"vscode.extension.icon": "128x128 ピクセルのアイコンへのパス。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/platform/extensions/node/extensionValidator.i18n.json b/i18n/jpn/src/vs/platform/extensions/node/extensionValidator.i18n.json
deleted file mode 100644
index 96e0f8571e1..00000000000
--- a/i18n/jpn/src/vs/platform/extensions/node/extensionValidator.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"versionSyntax": "`engines.vscode` の値 {0} を解析できませんでした。使用可能な値の例: ^1.22.0、^1.22.x など。",
-	"versionSpecificity1": "`engines.vscode` ({0}) で指定されたバージョンが十分に特定されていません。1.0.0 より前の vscode バージョンの場合は、少なくとも想定されているメジャー バージョンとマイナー バージョンを定義してください。例 ^0.10.0、0.10.x、0.11.0 など。",
-	"versionSpecificity2": "`engines.vscode` ({0}) で指定されたバージョンが明確ではありません。1.0.0 より後のバージョンの vscode の場合は、少なくとも、想定されているメジャー バージョンを定義してください。例 ^1.10.0、1.10.x、1.x.x、2.x.x など。",
-	"versionMismatch": "拡張機能が Code {0} と互換性がありません。拡張機能に必要なバージョン: {1}。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/platform/history/electron-main/historyMainService.i18n.json b/i18n/jpn/src/vs/platform/history/electron-main/historyMainService.i18n.json
deleted file mode 100644
index d1a070733c9..00000000000
--- a/i18n/jpn/src/vs/platform/history/electron-main/historyMainService.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"newWindow": "新しいウィンドウ",
-	"newWindowDesc": "新しいウィンドウを開く",
-	"recentFolders": "最近使ったワークスペース",
-	"folderDesc": "{0} {1}",
-	"codeWorkspace": "コード ワークスペース"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/platform/integrity/node/integrityServiceImpl.i18n.json b/i18n/jpn/src/vs/platform/integrity/node/integrityServiceImpl.i18n.json
deleted file mode 100644
index fca35bd3e43..00000000000
--- a/i18n/jpn/src/vs/platform/integrity/node/integrityServiceImpl.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"integrity.prompt": "{0} インストールが壊れている可能性があります。再インストールしてください。",
-	"integrity.moreInformation": "詳細情報",
-	"integrity.dontShowAgain": "今後は表示しない"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/platform/issue/electron-main/issueService.i18n.json b/i18n/jpn/src/vs/platform/issue/electron-main/issueService.i18n.json
deleted file mode 100644
index 3e52b3813de..00000000000
--- a/i18n/jpn/src/vs/platform/issue/electron-main/issueService.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"issueReporter": "問題のレポーター",
-	"processExplorer": "プロセス エクスプローラー"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/platform/jsonschemas/common/jsonValidationExtensionPoint.i18n.json b/i18n/jpn/src/vs/platform/jsonschemas/common/jsonValidationExtensionPoint.i18n.json
deleted file mode 100644
index 3f9d37eadbc..00000000000
--- a/i18n/jpn/src/vs/platform/jsonschemas/common/jsonValidationExtensionPoint.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"contributes.jsonValidation": "JSON スキーマ構成を提供します。",
-	"contributes.jsonValidation.fileMatch": "一致するファイル パターン、たとえば \"package.json\" または \"*.launch\" です。",
-	"contributes.jsonValidation.url": "スキーマ URL ('http:', 'https:') または拡張機能フォルダーへの相対パス ('./') です。",
-	"invalid.jsonValidation": "'configuration.jsonValidation' は配列でなければなりません",
-	"invalid.fileMatch": "'configuration.jsonValidation.fileMatch' が定義されていなければなりません",
-	"invalid.url": "'configuration.jsonValidation.url' は、URL または相対パスでなければなりません",
-	"invalid.url.fileschema": "'configuration.jsonValidation.url' は正しくない相対 URL です: {0}",
-	"invalid.url.schema": "'configuration.jsonValidation.url' は、'http:'、'https:'、または拡張機能にあるスキーマを参照する './' で始まる必要があります"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/platform/keybinding/common/abstractKeybindingService.i18n.json b/i18n/jpn/src/vs/platform/keybinding/common/abstractKeybindingService.i18n.json
deleted file mode 100644
index 08818c99ad9..00000000000
--- a/i18n/jpn/src/vs/platform/keybinding/common/abstractKeybindingService.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"first.chord": "({0}) が押されました。2 番目のキーを待っています...",
-	"missing.chord": "キーの組み合わせ ({0}、{1}) はコマンドではありません。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/platform/keybinding/common/keybindingLabels.i18n.json b/i18n/jpn/src/vs/platform/keybinding/common/keybindingLabels.i18n.json
deleted file mode 100644
index 013011fc131..00000000000
--- a/i18n/jpn/src/vs/platform/keybinding/common/keybindingLabels.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"ctrlKey": "Ctrl",
-	"shiftKey": "Shift",
-	"altKey": "Alt",
-	"windowsKey": "Windows",
-	"ctrlKey.long": "Control",
-	"shiftKey.long": "Shift",
-	"altKey.long": "Alt",
-	"cmdKey.long": "コマンド",
-	"windowsKey.long": "Windows"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/platform/list/browser/listService.i18n.json b/i18n/jpn/src/vs/platform/list/browser/listService.i18n.json
deleted file mode 100644
index b221fed5770..00000000000
--- a/i18n/jpn/src/vs/platform/list/browser/listService.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"workbenchConfigurationTitle": "ワークベンチ",
-	"multiSelectModifier.ctrlCmd": "Windows および Linux 上の `Control` キーと macOS 上の `Command` キーに割り当てます。",
-	"multiSelectModifier.alt": "Windows および Linux 上の `Alt` キーと macOS 上の `Option` キーに割り当てます。",
-	"multiSelectModifier": "マウスで複数の選択肢にツリーおよびリストの項目を追加するために使用される修飾子 (たとえば、エクスプローラーでエディターと scm ビューを開くなど)。`ctrlCmd` は、Windows と Linux では `Control` にマップされ、macOS では `Command` にマップされます。'横に並べて開く' マウス ジェスチャー (サポートされている場合) は、複数選択修飾子と競合しないように調整されます。",
-	"openMode.singleClick": "マウスのシングル クリックで項目を開きます。",
-	"openMode.doubleClick": "マウスのダブル クリックで項目を開きます。",
-	"openModeModifier": "マウスを使用して、ツリーとリストで項目を開く方法を制御します (サポートされている場合)。'SingleClick' に設定すると、項目をマウスのシングル クリックで開き、'doubleClick' に設定すると、ダブル クリックでのみ開きます。ツリーで子を持つ親の場合、この設定で、親をシングル クリックで展開するか、ダブル クリックで展開するかを制御します。該当しない場合、一部のツリーとリストでは、この設定が無視される場合があることに注意してください。",
-	"horizontalScrolling setting": "ワークベンチでツリーが水平スクロールをサポートするかどうかを制御します。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/platform/localizations/common/localizations.i18n.json b/i18n/jpn/src/vs/platform/localizations/common/localizations.i18n.json
deleted file mode 100644
index 6853608712d..00000000000
--- a/i18n/jpn/src/vs/platform/localizations/common/localizations.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.contributes.localizations": "ローカリゼーションをエディターに提供します",
-	"vscode.extension.contributes.localizations.languageId": "表示文字列が翻訳される言語の id。",
-	"vscode.extension.contributes.localizations.languageName": "英語での言語の名前。",
-	"vscode.extension.contributes.localizations.languageNameLocalized": "提供された言語での言語の名前。",
-	"vscode.extension.contributes.localizations.translations": "言語に関連付けられている翻訳の一覧です。",
-	"vscode.extension.contributes.localizations.translations.id": "この翻訳が提供される VS Code または拡張機能の ID。VS Code は常に `vscode` で、拡張機能の形式は `publisherId.extensionName` になります。",
-	"vscode.extension.contributes.localizations.translations.id.pattern": "VS Code または拡張機能を変換するための ID はそれぞれ、`vscode` か、`publisherId.extensionName` の形式になります。",
-	"vscode.extension.contributes.localizations.translations.path": "言語の翻訳を含むファイルへの相対パス。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/platform/markers/common/markers.i18n.json b/i18n/jpn/src/vs/platform/markers/common/markers.i18n.json
deleted file mode 100644
index 5842e6fd343..00000000000
--- a/i18n/jpn/src/vs/platform/markers/common/markers.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"sev.error": "エラー",
-	"sev.warning": "警告",
-	"sev.info": "情報"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/platform/markers/common/problemMatcher.i18n.json b/i18n/jpn/src/vs/platform/markers/common/problemMatcher.i18n.json
deleted file mode 100644
index 625566cb424..00000000000
--- a/i18n/jpn/src/vs/platform/markers/common/problemMatcher.i18n.json
+++ /dev/null
@@ -1,72 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"ProblemPatternParser.loopProperty.notLast": "ループ プロパティは、最終行マッチャーでのみサポートされています。",
-	"ProblemPatternParser.problemPattern.missingRegExp": "問題パターンに正規表現がありません。",
-	"ProblemPatternParser.problemPattern.missingProperty": "問題のパターンが正しくありません。少なくとも、ファイル、メッセージと行、またはロケーション一致グループがなければなりません。",
-	"ProblemPatternParser.invalidRegexp": "エラー: 文字列 {0} は、有効な正規表現ではありません。\n",
-	"ProblemPatternSchema.regexp": "出力のエラー、警告、または情報を検索する正規表現。",
-	"ProblemPatternSchema.file": "ファイル名の一致グループ インデックス。省略すると、1 が使用されます。",
-	"ProblemPatternSchema.location": "問題の場所の一致グループ インデックス。有効な場所のパターンは (line)、(line,column)、(startLine,startColumn,endLine,endColumn) です。省略すると、 (line,column) が想定されます。",
-	"ProblemPatternSchema.line": "問題の行の一致グループ インデックス。既定は 2 です",
-	"ProblemPatternSchema.column": "問題の行の文字の一致グループ インデックス。既定は 3 です",
-	"ProblemPatternSchema.endLine": "問題の最終行の一致グループ インデックス。既定は undefined です",
-	"ProblemPatternSchema.endColumn": "問題の最終行の文字の一致グループ インデックス。既定は undefined です",
-	"ProblemPatternSchema.severity": "問題の重大度の一致グループ インデックス。既定は undefined です",
-	"ProblemPatternSchema.code": "問題のコードの一致グループ インデックス。既定は undefined です",
-	"ProblemPatternSchema.message": "メッセージの一致グループ インデックス。省略した場合、場所を指定すると既定は 4 で、場所を指定しないと既定は 5 です。",
-	"ProblemPatternSchema.loop": "複数行マッチャー ループは、このパターンが一致する限りループで実行されるかどうかを示します。複数行パターン内の最後のパターンでのみ指定できます。",
-	"NamedProblemPatternSchema.name": "問題パターンの名前。",
-	"NamedMultiLineProblemPatternSchema.name": "The name of the problem multi line problem pattern.",
-	"NamedMultiLineProblemPatternSchema.patterns": "実際のパターン。",
-	"ProblemPatternExtPoint": "問題パターンを提供",
-	"ProblemPatternRegistry.error": "無効な問題パターンです。パターンは無視されます。",
-	"ProblemMatcherParser.noProblemMatcher": "エラー: 説明を問題マッチャーに変換することができません:\n{0}\n",
-	"ProblemMatcherParser.noProblemPattern": "エラー: 説明に有効な問題パターンが定義されていません:\n{0}\n",
-	"ProblemMatcherParser.noOwner": "エラー: 説明に所有者が定義されていません:\n{0}\n",
-	"ProblemMatcherParser.noFileLocation": "エラー: 説明にファイルの場所が定義されていません:\n{0}\n",
-	"ProblemMatcherParser.unknownSeverity": "情報: 不明な重大度 {0}。有効な値は、error、warning、info です。\n",
-	"ProblemMatcherParser.noDefinedPatter": "エラー: 識別子 {0} のパターンは存在しません。",
-	"ProblemMatcherParser.noIdentifier": "エラー: パターン プロパティが空の識別子を参照しています。",
-	"ProblemMatcherParser.noValidIdentifier": "エラー: パターン プロパティ {0} は有効なパターン変数名ではありません。",
-	"ProblemMatcherParser.problemPattern.watchingMatcher": "問題マッチャーは、ウォッチ対象の開始パターンと終了パターンの両方を定義する必要があります。",
-	"ProblemMatcherParser.invalidRegexp": "エラー: 文字列 {0} は、有効な正規表現ではありません。\n",
-	"WatchingPatternSchema.regexp": "バックグラウンド タスクの開始または終了を検出する正規表現。",
-	"WatchingPatternSchema.file": "ファイル名の一致グループ インデックス。省略できます。",
-	"PatternTypeSchema.name": "提供されたか事前定義された問題パターンの名前",
-	"PatternTypeSchema.description": "A problem pattern or the name of a contributed or predefined problem pattern. Can be omitted if base is specified.",
-	"ProblemMatcherSchema.base": "使用する基本問題マッチャーの名前。",
-	"ProblemMatcherSchema.owner": "Code 内の問題の所有者。base を指定すると省略できます。省略して base を指定しない場合、既定は 'external' になります。",
-	"ProblemMatcherSchema.severity": "キャプチャされた問題の既定の重大度。パターンが重要度の一致グループを定義していない場合に使用されます。",
-	"ProblemMatcherSchema.applyTo": "テキスト ドキュメントで報告された問題が、開いているドキュメントのみ、閉じられたドキュメントのみ、すべてのドキュメントのいずれに適用されるかを制御します。",
-	"ProblemMatcherSchema.fileLocation": "問題パターンで報告されたファイル名を解釈する方法を定義します。",
-	"ProblemMatcherSchema.background": "バックグラウンド タスクでアクティブなマッチャーの開始と終了を追跡するパターン。",
-	"ProblemMatcherSchema.background.activeOnStart": "true に設定すると、タスクの開始時にバックグラウンド モニターがアクティブ モードになります。これは beginPattern と一致する行の発行と同等です。",
-	"ProblemMatcherSchema.background.beginsPattern": "出力内で一致すると、バックグラウンド タスクの開始が通知されます。",
-	"ProblemMatcherSchema.background.endsPattern": "出力内で一致すると、バックグラウンド タスクの終了が通知されます。",
-	"ProblemMatcherSchema.watching.deprecated": "watching プロパティは使用されなくなりました。代わりに background をご使用ください。",
-	"ProblemMatcherSchema.watching": "監視パターンの開始と終了を追跡するマッチャー。",
-	"ProblemMatcherSchema.watching.activeOnStart": "true に設定すると、タスクの開始時にウォッチャーがアクティブ モードになります。これは beginPattern と一致する行の発行と同等です。",
-	"ProblemMatcherSchema.watching.beginsPattern": "出力内で一致すると、ウォッチ中のタスクの開始が通知されます。",
-	"ProblemMatcherSchema.watching.endsPattern": "出力内で一致すると、ウォッチ中のタスクの終了が通知されます。",
-	"LegacyProblemMatcherSchema.watchedBegin.deprecated": "このプロパティは非推奨です。代わりに watching プロパティをご使用ください。",
-	"LegacyProblemMatcherSchema.watchedBegin": "ファイル ウォッチでトリガーされた ウォッチ対象タスクの実行が開始されたことを伝達する正規表現。",
-	"LegacyProblemMatcherSchema.watchedEnd.deprecated": "このプロパティは非推奨です。代わりに watching プロパティをご使用ください。",
-	"LegacyProblemMatcherSchema.watchedEnd": "ウォッチ対象タスクの実行が終了したことを伝達する正規表現。",
-	"NamedProblemMatcherSchema.name": "これを参照するのに使用する問題マッチャーの名前。",
-	"NamedProblemMatcherSchema.label": "問題マッチャーの判読できるラベル。",
-	"ProblemMatcherExtPoint": "問題マッチャーを提供",
-	"msCompile": "Microsoft コンパイラの問題",
-	"lessCompile": "Less の問題",
-	"gulp-tsc": "Gulp TSC の問題",
-	"jshint": "JSHint の問題",
-	"jshint-stylish": "JSHint の問題 (stylish)",
-	"eslint-compact": "ESLint の問題 (compact)",
-	"eslint-stylish": "ESLint の問題 (stylish)",
-	"go": "Go の問題"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/platform/message/common/message.i18n.json b/i18n/jpn/src/vs/platform/message/common/message.i18n.json
deleted file mode 100644
index 44348c07c17..00000000000
--- a/i18n/jpn/src/vs/platform/message/common/message.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"close": "閉じる",
-	"later": "後続",
-	"cancel": "キャンセル",
-	"moreFile": "...1 つの追加ファイルが表示されていません",
-	"moreFiles": "...{0} 個の追加ファイルが表示されていません"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/platform/node/minimalTranslations.i18n.json b/i18n/jpn/src/vs/platform/node/minimalTranslations.i18n.json
deleted file mode 100644
index 2d79fb7e0fb..00000000000
--- a/i18n/jpn/src/vs/platform/node/minimalTranslations.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"showLanguagePackExtensions": "VS Codeは{0}で使用可能です。 初めに Marketplace で言語パックを検索してください。",
-	"searchMarketplace": "Marketplace を検索",
-	"installAndRestartMessage": "VS Codeは{0}で使用可能です。 初めに言語パックをインストールしてください。再起動が必要です。",
-	"installAndRestart": "インストールし再起動する"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/platform/request/node/request.i18n.json b/i18n/jpn/src/vs/platform/request/node/request.i18n.json
deleted file mode 100644
index e24cb7ccf9d..00000000000
--- a/i18n/jpn/src/vs/platform/request/node/request.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"httpConfigurationTitle": "HTTP",
-	"proxy": "使用するプロキシ設定。設定されていない場合、環境変数 http_proxy および https_proxy から取得されます。",
-	"strictSSL": "提供された CA の一覧と照らしてプロキシ サーバーの証明書を確認するかどうか。",
-	"proxyAuthorization": "すべてのネットワーク要求に対して 'Proxy-Authorization' ヘッダーとして送信する値。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/platform/telemetry/common/telemetryService.i18n.json b/i18n/jpn/src/vs/platform/telemetry/common/telemetryService.i18n.json
deleted file mode 100644
index 9e76cc82a29..00000000000
--- a/i18n/jpn/src/vs/platform/telemetry/common/telemetryService.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"telemetryConfigurationTitle": "テレメトリ",
-	"telemetry.enableTelemetry": "利用状況データとエラーを Microsoft に送信できるようにします。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/platform/theme/common/colorExtensionPoint.i18n.json b/i18n/jpn/src/vs/platform/theme/common/colorExtensionPoint.i18n.json
deleted file mode 100644
index 05d5a731920..00000000000
--- a/i18n/jpn/src/vs/platform/theme/common/colorExtensionPoint.i18n.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"contributes.color": "拡張機能でテーマ設定の可能な配色を提供します",
-	"contributes.color.id": "テーマ設定可能な配色の識別子",
-	"contributes.color.id.format": "識別子は aa[.bb]* の形式にする必要があります",
-	"contributes.color.description": "テーマ設定可能な配色の説明",
-	"contributes.defaults.light": "light テーマの既定の配色。配色の値は 16 進数(#RRGGBB[AA]) 、または 既定で提供されているテーマ設定可能な配色の識別子の既定値のいずれか。",
-	"contributes.defaults.dark": "dark テーマの既定の配色。配色の値は 16 進数(#RRGGBB[AA]) 、または 既定で提供されているテーマ設定可能な配色の識別子の既定値のいずれか。",
-	"contributes.defaults.highContrast": "high contrast テーマの既定の配色。配色の値は 16 進数(#RRGGBB[AA]) 、または 既定で提供されているテーマ設定可能な配色の識別子の既定値のいずれか。",
-	"invalid.colorConfiguration": "'configuration.colors' は配列である必要があります",
-	"invalid.default.colorType": "{0} は 16 進数(#RRGGBB[AA] または  #RGB[A]) 、または 既定で提供されているテーマ設定可能な配色の識別子の既定値のいずれかでなければなりません。",
-	"invalid.id": "'configuration.colors.id' を定義してください。空にはできません。",
-	"invalid.id.format": "'configuration.colors.id' は word[.word]* の形式である必要があります",
-	"invalid.description": "'configuration.colors.description' を定義してください。空にはできません。",
-	"invalid.defaults": "'configuration.colors.defaults' は定義する必要があります。'light' か 'dark'、'highContrast' を含める必要があります。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/platform/theme/common/colorRegistry.i18n.json b/i18n/jpn/src/vs/platform/theme/common/colorRegistry.i18n.json
deleted file mode 100644
index 10667640968..00000000000
--- a/i18n/jpn/src/vs/platform/theme/common/colorRegistry.i18n.json
+++ /dev/null
@@ -1,101 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"schema.colors": "ワークベンチで使用する色。",
-	"foreground": "全体の前景色。この色は、コンポーネントによってオーバーライドされていない場合にのみ使用されます。",
-	"errorForeground": "エラー メッセージ全体の前景色。この色は、コンポーネントによって上書きされていない場合にのみ使用されます。",
-	"descriptionForeground": "追加情報を提供する説明文の前景色、例:ラベル。",
-	"focusBorder": "フォーカスされた要素の境界線全体の色。この色はコンポーネントによって上書きされていない場合にのみ使用されます。",
-	"contrastBorder": "コントラストを強めるために、他の要素と隔てる追加の境界線。",
-	"activeContrastBorder": "コントラストを強めるために、アクティブな他要素と隔てる追加の境界線。",
-	"selectionBackground": "ワークベンチ内のテキスト選択の背景色 (例: 入力フィールドやテキストエリア)。エディター内の選択には適用されないことに注意してください。",
-	"textSeparatorForeground": "テキストの区切り文字の色。",
-	"textLinkForeground": "テキスト内のリンクの前景色。",
-	"textLinkActiveForeground": "クリックされたときとマウスをホバーしたときのテキスト内のリンクの前景色。",
-	"textPreformatForeground": "フォーマット済みテキスト セグメントの前景色。",
-	"textBlockQuoteBackground": "テキスト内のブロック引用の背景色。",
-	"textBlockQuoteBorder": "テキスト内のブロック引用の境界線色。",
-	"textCodeBlockBackground": "テキスト内のコード ブロックの背景色。",
-	"widgetShadow": "エディター内の検索/置換窓など、エディター ウィジェットの影の色。",
-	"inputBoxBackground": "入力ボックスの背景。",
-	"inputBoxForeground": "入力ボックスの前景。",
-	"inputBoxBorder": "入力ボックスの境界線。",
-	"inputBoxActiveOptionBorder": "入力フィールドのアクティブ オプションの境界線の色。",
-	"inputPlaceholderForeground": "入力ボックスのプレースホルダー テキストの前景色。",
-	"inputValidationInfoBackground": "情報の重大度を示す入力検証の背景色。",
-	"inputValidationInfoBorder": "情報の重大度を示す入力検証の境界線色。",
-	"inputValidationWarningBackground": "警告の重大度を示す入力検証の背景色。",
-	"inputValidationWarningBorder": "警告の重大度を示す入力検証の境界線色。",
-	"inputValidationErrorBackground": "エラーの重大度を示す入力検証の背景色。",
-	"inputValidationErrorBorder": "エラーの重大度を示す入力検証の境界線色。",
-	"dropdownBackground": "ドロップダウンの背景。",
-	"dropdownListBackground": "ドロップダウン リストの背景色。",
-	"dropdownForeground": "ドロップダウンの前景。",
-	"dropdownBorder": "ドロップダウンの境界線。",
-	"listFocusBackground": "ツリーリストがアクティブのとき、フォーカスされた項目のツリーリスト背景色。アクティブなツリーリストはキーボード フォーカスがあり、非アクティブではこれがありません。",
-	"listFocusForeground": "ツリーリストがアクティブのとき、フォーカスされた項目のツリーリスト前景色。アクティブなツリーリストはキーボード フォーカスがあり、非アクティブではこれがありません。",
-	"listActiveSelectionBackground": "ツリーリストがアクティブのとき、選択された項目のツリーリスト背景色。アクティブなツリーリストはキーボード フォーカスがあり、非アクティブではこれがありません。",
-	"listActiveSelectionForeground": "ツリーリストがアクティブのとき、選択された項目のツリーリスト前景色。アクティブなツリーリストはキーボード フォーカスがあり、非アクティブではこれがありません。",
-	"listInactiveSelectionBackground": "ツリーリストが非アクティブのとき、フォーカスされた項目のツリーリスト背景色。アクティブなツリーリストはキーボード フォーカスがあり、非アクティブではこれがありません。",
-	"listInactiveSelectionForeground": "ツリーリストが非アクティブのとき、選択された項目のツリーリスト前景色。アクティブなツリーリストはキーボード フォーカスがあり、非アクティブではこれがありません。",
-	"listHoverBackground": "マウス操作で項目をホバーするときのツリーリスト背景。",
-	"listHoverForeground": "マウス操作で項目をホバーするときのツリーリスト前景。",
-	"listDropBackground": "マウス操作で項目を移動するときのツリーリスト ドラッグ アンド ドロップの背景。",
-	"highlight": "ツリーリスト内を検索しているとき、一致した強調のツリーリスト前景色。",
-	"invalidItemForeground": "無効な項目のツリーリストの前景色。たとえばエクスプローラーの未解決なルート。",
-	"listErrorForeground": "エラーを含むリスト項目の前景色。",
-	"listWarningForeground": "警告が含まれるリスト項目の前景色。",
-	"pickerGroupForeground": "ラベルをグループ化するためのクリック選択の色。",
-	"pickerGroupBorder": "境界線をグループ化するためのクイック選択の色。",
-	"buttonForeground": "ボタンの前景色。",
-	"buttonBackground": "ボタンの背景色。",
-	"buttonHoverBackground": "ホバー時のボタン背景色。",
-	"badgeBackground": "バッジの背景色。バッジとは小さな情報ラベルのことです。例:検索結果の数",
-	"badgeForeground": "バッジの前景色。バッジとは小さな情報ラベルのことです。例:検索結果の数",
-	"scrollbarShadow": "ビューがスクロールされたことを示すスクロール バーの影。",
-	"scrollbarSliderBackground": "スクロール バーのスライダーの背景色。",
-	"scrollbarSliderHoverBackground": "ホバー時のスクロール バー スライダー背景色。",
-	"scrollbarSliderActiveBackground": "クリック時のスクロール バー スライダー背景色。",
-	"progressBarBackground": "時間のかかる操作で表示するプログレス バーの背景色。",
-	"editorBackground": "エディターの背景色。",
-	"editorForeground": "エディターの既定の前景色。",
-	"editorWidgetBackground": "検索/置換窓など、エディター ウィジェットの背景色。",
-	"editorWidgetBorder": "エディター ウィジェットの境界線色。ウィジェットに境界線があり、ウィジェットによって配色を上書きされていない場合でのみこの配色は使用されます。",
-	"editorSelectionBackground": "エディターの選択範囲の色。",
-	"editorSelectionForeground": "ハイ コントラストの選択済みテキストの色。",
-	"editorInactiveSelection": "非アクティブなエディターの選択範囲の色。下にある装飾を隠さないために、色は不透過であってはなりません。",
-	"editorSelectionHighlight": "選択範囲と同じコンテンツの領域の色。下にある装飾を隠さないために、色は不透過であってはなりません。",
-	"editorSelectionHighlightBorder": "選択範囲と同じコンテンツの境界線の色。",
-	"editorFindMatch": "現在の検索一致項目の色。",
-	"findMatchHighlight": "他の検索一致項目の色。下にある装飾を隠さないために、色は不透過であってはなりません。",
-	"findRangeHighlight": "検索を制限する範囲の色。下にある装飾を隠さないために、色は不透過であってはなりません。",
-	"editorFindMatchBorder": "現在の検索一致項目の境界線の色。",
-	"findMatchHighlightBorder": "他の検索一致項目の境界線の色。",
-	"findRangeHighlightBorder": "検索を制限する範囲の境界線の色。下にある装飾を隠さないために、色は不透過であってはなりません。",
-	"findWidgetResizeBorder": "検索ウィジェットのサイズ変更バーの境界線の色。",
-	"hoverHighlight": "ホバーが表示されているワードの下を強調表示します。下にある装飾を隠さないために、色は不透過であってはなりません。",
-	"hoverBackground": "エディター ホバーの背景色。",
-	"hoverBorder": "エディター ホバーの境界線の色。",
-	"activeLinkForeground": "アクティブなリンクの色。",
-	"diffEditorInserted": "挿入されたテキストの境界線の色。下にある装飾を隠さないために、色は不透過であってはなりません。",
-	"diffEditorRemoved": "削除されたテキストの境界線の色。下にある装飾を隠さないために、色は不透過であってはなりません。",
-	"diffEditorInsertedOutline": "挿入されたテキストの輪郭の色。",
-	"diffEditorRemovedOutline": "削除されたテキストの輪郭の色。",
-	"mergeCurrentHeaderBackground": "行内マージ競合の現在のヘッダー背景色。下にある装飾を隠さないために、色は不透過であってはなりません。",
-	"mergeCurrentContentBackground": "行内マージ競合の現在のコンテンツ背景色。下にある装飾を隠さないために、色は不透過であってはなりません。",
-	"mergeIncomingHeaderBackground": "行内マージ競合の入力側ヘッダー背景色。下にある装飾を隠さないために、色は不透過であってはなりません。",
-	"mergeIncomingContentBackground": "行内マージ競合の入力側コンテンツ背景色。下にある装飾を隠さないために、色は不透過であってはなりません。",
-	"mergeCommonHeaderBackground": "行内マージ競合の共通の祖先ヘッダー背景色。下にある装飾を隠さないために、色は不透過であってはなりません。",
-	"mergeCommonContentBackground": "行内マージ競合の共通の祖先コンテンツ背景色。下にある装飾を隠さないために、色は不透過であってはなりません。",
-	"mergeBorder": "行内マージ競合のヘッダーとスプリッターの境界線の色。",
-	"overviewRulerCurrentContentForeground": "行内マージ競合の現在の概要ルーラー前景色。",
-	"overviewRulerIncomingContentForeground": "行内マージ競合の入力側の概要ルーラー前景色。",
-	"overviewRulerCommonContentForeground": "行内マージ競合の共通の祖先概要ルーラー前景色。",
-	"overviewRulerFindMatchForeground": "検索一致項目を示す概要ルーラーのマーカー色。この色は下地の色に紛れないよう不明瞭であってはいけません。",
-	"overviewRulerSelectionHighlightForeground": "選択範囲を強調表示するときの概要ルーラーのマーカー色。この色は下地の色に紛れないよう不明瞭であってはいけません。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/platform/update/node/update.config.contribution.i18n.json b/i18n/jpn/src/vs/platform/update/node/update.config.contribution.i18n.json
deleted file mode 100644
index d5a33eaaefa..00000000000
--- a/i18n/jpn/src/vs/platform/update/node/update.config.contribution.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"updateConfigurationTitle": "更新",
-	"updateChannel": "更新チャネルから自動更新を受信するかどうかを構成します。変更後に再起動が必要です。",
-	"enableWindowsBackgroundUpdates": "Windows のバックグラウンド更新を有効にします。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/platform/url/electron-browser/inactiveExtensionUrlHandler.i18n.json b/i18n/jpn/src/vs/platform/url/electron-browser/inactiveExtensionUrlHandler.i18n.json
deleted file mode 100644
index cb7d4b51860..00000000000
--- a/i18n/jpn/src/vs/platform/url/electron-browser/inactiveExtensionUrlHandler.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"confirmUrl": "拡張機能がこの URL を開くことを許可しますか?"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/platform/windows/electron-main/windowsService.i18n.json b/i18n/jpn/src/vs/platform/windows/electron-main/windowsService.i18n.json
deleted file mode 100644
index 4e464d2e35d..00000000000
--- a/i18n/jpn/src/vs/platform/windows/electron-main/windowsService.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"aboutDetail": "バージョン {0}\nコミット {1}\n日付 {2}\nシェル {3}\nレンダラー {4}\nNode {5}\nアーキテクチャ {6}",
-	"okButton": "OK",
-	"copy": "コピー (&&C)"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/platform/workspaces/common/workspaces.i18n.json b/i18n/jpn/src/vs/platform/workspaces/common/workspaces.i18n.json
deleted file mode 100644
index 9b3ca7f2d6c..00000000000
--- a/i18n/jpn/src/vs/platform/workspaces/common/workspaces.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"codeWorkspace": "コード ワークスペース",
-	"untitledWorkspace": "未設定 (ワークスペース)",
-	"workspaceNameVerbose": "{0} (ワークスペース)",
-	"workspaceName": "{0} (ワークスペース)"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/api/browser/localizationsExtensionPoint.i18n.json b/i18n/jpn/src/vs/workbench/api/browser/localizationsExtensionPoint.i18n.json
deleted file mode 100644
index 9c89d5ccada..00000000000
--- a/i18n/jpn/src/vs/workbench/api/browser/localizationsExtensionPoint.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"requirearray": "ローカリゼーションは配列にする必要があります",
-	"requirestring": " `{0}`  プロパティは必須で、`string` 型でなければなりません",
-	"optstring": "`{0}` プロパティは省略するか、`string` 型にする必要があります",
-	"vscode.extension.contributes.localizations": "ローカリゼーションをエディターに提供します",
-	"vscode.extension.contributes.localizations.languageId": "表示文字列が翻訳される言語の id。",
-	"vscode.extension.contributes.localizations.languageName": "表示文字列が翻訳される言語名。",
-	"vscode.extension.contributes.localizations.translations": "提供されている言語のすべての翻訳ファイルを含むフォルダへの相対パス。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/api/browser/viewsContainersExtensionPoint.i18n.json b/i18n/jpn/src/vs/workbench/api/browser/viewsContainersExtensionPoint.i18n.json
deleted file mode 100644
index ee5ed252d7e..00000000000
--- a/i18n/jpn/src/vs/workbench/api/browser/viewsContainersExtensionPoint.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.contributes.views.containers.id": "'views' コントリビューション ポイントを使用して提供できるコンテナを識別するための一意の ID",
-	"vscode.extension.contributes.views.containers.title": "コンテナーの表示に使用する、人が判別できる文字列",
-	"vscode.extension.contributes.views.containers.icon": "コンテナ アイコンのパス。アイコンは、50x40 のブロックの中心に配置された 24x24 のサイズで、'rgb(215, 218, 224)' または '#d7dae0' の色で塗りつぶされます。アイコンでは、任意の種類の画像を使用できますが、SVG にすることをお勧めします。",
-	"vscode.extension.contributes.viewsContainers": "ビュー コンテナをエディターに提供します",
-	"views.container.activitybar": "アクティビティ バーにビュー コンテナを提供します",
-	"test": "テスト",
-	"requirearray": "ビュー コンテナは配列である必要があります",
-	"requireidstring": "プロパティ '{0}' は必須で、'string' 型でなければなりません。英数字と '_' , '-' のみが使用できます。",
-	"requirestring": " `{0}`  プロパティは必須で、`string` 型でなければなりません",
-	"showViewlet": "{0} を表示",
-	"view": "表示"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json b/i18n/jpn/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json
deleted file mode 100644
index 140381eb48f..00000000000
--- a/i18n/jpn/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"requirearray": "ビューは配列にする必要があります",
-	"requirestring": " `{0}`  プロパティは必須で、`string` 型でなければなりません",
-	"optstring": "`{0}` プロパティは省略するか、`string` 型にする必要があります",
-	"vscode.extension.contributes.view.id": "ビューの識別子。`vscode.window.registerTreeDataProviderForView` API を介してデータ プロバイダーを登録するには、これを使用します。また、`onView:${id}` イベントを `activationEvents` に登録することによって、拡張機能のアクティブ化をトリガーするためにも使用できます。",
-	"vscode.extension.contributes.view.name": "ビューの判読できる名前。表示されます",
-	"vscode.extension.contributes.view.when": "このビューを表示するために満たす必要がある条件",
-	"vscode.extension.contributes.views": "ビューをエディターに提供します",
-	"views.explorer": "アクション バーのエクスプローラー コンテナにビューを提供します",
-	"views.debug": "アクション バーのデバッグ コンテナにビューを提供します",
-	"views.scm": "アクション バーのSCM コンテナにビューを提供します",
-	"views.test": "アクション バーのテスト コンテナにビューを提供します",
-	"views.contributed": "コントリビューション　ビュー コンテナにビューを提供します",
-	"ViewContainerDoesnotExist": "ビュー コンテナ '{0}' が存在しません。このコンテナに登録されているすべてのビューは 'エクスプローラー' に追加されます。",
-	"duplicateView1": "location `{1}` で同じ id `{0}` を使用する複数のビューを登録できません",
-	"duplicateView2": "location `{1}` で id `{0}` のビューが既に登録されています"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/api/electron-browser/mainThreadExtensionService.i18n.json b/i18n/jpn/src/vs/workbench/api/electron-browser/mainThreadExtensionService.i18n.json
deleted file mode 100644
index df697c332c2..00000000000
--- a/i18n/jpn/src/vs/workbench/api/electron-browser/mainThreadExtensionService.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"overwritingExtension": "拡張機能 {0} を {1} で上書きしています。",
-	"extensionUnderDevelopment": "開発の拡張機能を {0} に読み込んでいます"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/api/electron-browser/mainThreadMessageService.i18n.json b/i18n/jpn/src/vs/workbench/api/electron-browser/mainThreadMessageService.i18n.json
deleted file mode 100644
index fda2ce866eb..00000000000
--- a/i18n/jpn/src/vs/workbench/api/electron-browser/mainThreadMessageService.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"extensionSource": "{0} (拡張機能)",
-	"defaultSource": "拡張機能",
-	"manageExtension": "拡張機能を管理",
-	"cancel": "キャンセル",
-	"ok": "OK"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json b/i18n/jpn/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
deleted file mode 100644
index 2cc93b19315..00000000000
--- a/i18n/jpn/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"timeout.formatOnSave": "保存時のフォーマットは {0}ms 後に中止されました",
-	"codeActionsOnSave.didTimeout": "codeActionsOnSave は {0} ms 後に中止されました",
-	"timeout.onWillSave": "onWillSaveTextDocument-event は 1750ms 後に中止されました",
-	"saveParticipants": "Save Participants が実行中です..."
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json b/i18n/jpn/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json
deleted file mode 100644
index ee8688cdc85..00000000000
--- a/i18n/jpn/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"task.label": "{0}: {1}"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/api/electron-browser/mainThreadWebview.i18n.json b/i18n/jpn/src/vs/workbench/api/electron-browser/mainThreadWebview.i18n.json
deleted file mode 100644
index b0aba9ae620..00000000000
--- a/i18n/jpn/src/vs/workbench/api/electron-browser/mainThreadWebview.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"errorMessage": "view:{0} を復元中にエラーが発生しました"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/api/electron-browser/mainThreadWorkspace.i18n.json b/i18n/jpn/src/vs/workbench/api/electron-browser/mainThreadWorkspace.i18n.json
deleted file mode 100644
index 955a5016ea5..00000000000
--- a/i18n/jpn/src/vs/workbench/api/electron-browser/mainThreadWorkspace.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"folderStatusMessageAddSingleFolder": "拡張機能 '{0}' は 1 つのフォルダーをワークスペースに追加しました",
-	"folderStatusMessageAddMultipleFolders": "拡張機能 '{0}' は {1} フォルダーをワークスペースに追加しました",
-	"folderStatusMessageRemoveSingleFolder": "拡張機能 '{0}' は 1 つのフォルダーをワークスペースから削除しました",
-	"folderStatusMessageRemoveMultipleFolders": "拡張機能 '{0}' は {1} フォルダーをワークスペースから削除しました",
-	"folderStatusChangeFolder": "拡張機能 '{0}' はワークスペースのフォルダーを変更しました"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/api/node/extHostDiagnostics.i18n.json b/i18n/jpn/src/vs/workbench/api/node/extHostDiagnostics.i18n.json
deleted file mode 100644
index 5dcbef87f17..00000000000
--- a/i18n/jpn/src/vs/workbench/api/node/extHostDiagnostics.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"limitHit": "{0} 個の追加のエラーと警告が表示されていません。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/api/node/extHostExplorerView.i18n.json b/i18n/jpn/src/vs/workbench/api/node/extHostExplorerView.i18n.json
deleted file mode 100644
index 6447043d7ee..00000000000
--- a/i18n/jpn/src/vs/workbench/api/node/extHostExplorerView.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"treeExplorer.notRegistered": "ID '{0}' の TreeExplorerNodeProvider は登録されていません。",
-	"treeExplorer.failedToProvideRootNode": "TreeExplorerNodeProvider '{0}' がルート ノードの指定に失敗しました。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/api/node/extHostExtensionActivator.i18n.json b/i18n/jpn/src/vs/workbench/api/node/extHostExtensionActivator.i18n.json
deleted file mode 100644
index d7be1321439..00000000000
--- a/i18n/jpn/src/vs/workbench/api/node/extHostExtensionActivator.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"unknownDep": "拡張機能 '{1}' のアクティブ化に失敗しました。理由: 依存関係 '{0}' が不明です。",
-	"failedDep1": "拡張機能 '{1}' のアクティブ化に失敗しました。理由: 依存関係 '{0}' のアクティブ化に失敗しました。",
-	"failedDep2": "拡張機能 '{0}' のアクティブ化に失敗しました。理由: 依存関係のレベルが 10 を超えています (依存関係のループの可能性があります)。",
-	"activationError": "拡張機能 '{0}' のアクティブ化に失敗しました: {1}。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/api/node/extHostProgress.i18n.json b/i18n/jpn/src/vs/workbench/api/node/extHostProgress.i18n.json
deleted file mode 100644
index c56e83de881..00000000000
--- a/i18n/jpn/src/vs/workbench/api/node/extHostProgress.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"extensionSource": "{0} (拡張機能)"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/api/node/extHostTask.i18n.json b/i18n/jpn/src/vs/workbench/api/node/extHostTask.i18n.json
deleted file mode 100644
index ee8688cdc85..00000000000
--- a/i18n/jpn/src/vs/workbench/api/node/extHostTask.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"task.label": "{0}: {1}"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/api/node/extHostTreeExplorers.i18n.json b/i18n/jpn/src/vs/workbench/api/node/extHostTreeExplorers.i18n.json
deleted file mode 100644
index 20b6c53ee25..00000000000
--- a/i18n/jpn/src/vs/workbench/api/node/extHostTreeExplorers.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"treeExplorer.notRegistered": "ID '{0}' の TreeExplorerNodeProvider は登録されていません。",
-	"treeExplorer.failedToProvideRootNode": "TreeExplorerNodeProvider '{0}' がルート ノードの指定に失敗しました。",
-	"treeExplorer.failedToResolveChildren": "TreeExplorerNodeProvider '{0}' が子の解決に失敗しました。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/api/node/extHostTreeView.i18n.json b/i18n/jpn/src/vs/workbench/api/node/extHostTreeView.i18n.json
deleted file mode 100644
index 6447043d7ee..00000000000
--- a/i18n/jpn/src/vs/workbench/api/node/extHostTreeView.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"treeExplorer.notRegistered": "ID '{0}' の TreeExplorerNodeProvider は登録されていません。",
-	"treeExplorer.failedToProvideRootNode": "TreeExplorerNodeProvider '{0}' がルート ノードの指定に失敗しました。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/api/node/extHostTreeViews.i18n.json b/i18n/jpn/src/vs/workbench/api/node/extHostTreeViews.i18n.json
deleted file mode 100644
index d8c4f33ad00..00000000000
--- a/i18n/jpn/src/vs/workbench/api/node/extHostTreeViews.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"treeView.notRegistered": "ID '{0}' のツリー ビューは登録されていません。",
-	"treeView.duplicateElement": "id [0] の要素はすでに登録されています。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/api/node/extHostWorkspace.i18n.json b/i18n/jpn/src/vs/workbench/api/node/extHostWorkspace.i18n.json
deleted file mode 100644
index 63ec18e6954..00000000000
--- a/i18n/jpn/src/vs/workbench/api/node/extHostWorkspace.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"updateerror": "拡張機能 '{0}' はワークスペースのフォルダーを更新できませんでした: {1}"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/api/node/mainThreadExtensionService.i18n.json b/i18n/jpn/src/vs/workbench/api/node/mainThreadExtensionService.i18n.json
deleted file mode 100644
index df697c332c2..00000000000
--- a/i18n/jpn/src/vs/workbench/api/node/mainThreadExtensionService.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"overwritingExtension": "拡張機能 {0} を {1} で上書きしています。",
-	"extensionUnderDevelopment": "開発の拡張機能を {0} に読み込んでいます"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/api/node/mainThreadMessageService.i18n.json b/i18n/jpn/src/vs/workbench/api/node/mainThreadMessageService.i18n.json
deleted file mode 100644
index c3df3145deb..00000000000
--- a/i18n/jpn/src/vs/workbench/api/node/mainThreadMessageService.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"close": "閉じる",
-	"cancel": "キャンセル",
-	"ok": "OK"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/browser/actions/configureLocale.i18n.json b/i18n/jpn/src/vs/workbench/browser/actions/configureLocale.i18n.json
deleted file mode 100644
index 21107d326ab..00000000000
--- a/i18n/jpn/src/vs/workbench/browser/actions/configureLocale.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"configureLocale": "言語を構成する",
-	"displayLanguage": "VSCode の表示言語を定義します。",
-	"doc": "サポートされている言語の一覧については、{0} をご覧ください。",
-	"restart": "値を変更するには VS Code の再起動が必要です。",
-	"fail.createSettings": "'{0}' ({1}) を作成できません。",
-	"JsonSchema.locale": "使用する UI 言語。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/browser/actions/fileActions.i18n.json b/i18n/jpn/src/vs/workbench/browser/actions/fileActions.i18n.json
deleted file mode 100644
index 07f35cfc628..00000000000
--- a/i18n/jpn/src/vs/workbench/browser/actions/fileActions.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"openFolder": "フォルダーを開く...",
-	"openFileFolder": "開く...",
-	"add": "追加"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/browser/actions/toggleActivityBarVisibility.i18n.json b/i18n/jpn/src/vs/workbench/browser/actions/toggleActivityBarVisibility.i18n.json
deleted file mode 100644
index 12f7739bbb9..00000000000
--- a/i18n/jpn/src/vs/workbench/browser/actions/toggleActivityBarVisibility.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleActivityBar": "アクティビティ バーの表示の切り替え",
-	"view": "表示"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/browser/actions/toggleCenteredLayout.i18n.json b/i18n/jpn/src/vs/workbench/browser/actions/toggleCenteredLayout.i18n.json
deleted file mode 100644
index 3172dd596cb..00000000000
--- a/i18n/jpn/src/vs/workbench/browser/actions/toggleCenteredLayout.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleCenteredLayout": "中央揃えレイアウトの切り替え",
-	"view": "表示"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/browser/actions/toggleEditorLayout.i18n.json b/i18n/jpn/src/vs/workbench/browser/actions/toggleEditorLayout.i18n.json
deleted file mode 100644
index be266ce4159..00000000000
--- a/i18n/jpn/src/vs/workbench/browser/actions/toggleEditorLayout.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleEditorGroupLayout": "エディターグループの縦/横レイアウトを切り替える",
-	"horizontalLayout": "エディターグループの横レイアウト",
-	"verticalLayout": "エディターグループの縦レイアウト",
-	"view": "表示"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/browser/actions/toggleSidebarPosition.i18n.json b/i18n/jpn/src/vs/workbench/browser/actions/toggleSidebarPosition.i18n.json
deleted file mode 100644
index 3e04ebe84bc..00000000000
--- a/i18n/jpn/src/vs/workbench/browser/actions/toggleSidebarPosition.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleSidebarPosition": "サイド バーの位置の切り替え",
-	"view": "表示"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/browser/actions/toggleSidebarVisibility.i18n.json b/i18n/jpn/src/vs/workbench/browser/actions/toggleSidebarVisibility.i18n.json
deleted file mode 100644
index 71785593b21..00000000000
--- a/i18n/jpn/src/vs/workbench/browser/actions/toggleSidebarVisibility.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleSidebar": "サイドバーの表示の切り替え",
-	"view": "表示"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/browser/actions/toggleStatusbarVisibility.i18n.json b/i18n/jpn/src/vs/workbench/browser/actions/toggleStatusbarVisibility.i18n.json
deleted file mode 100644
index 176fb13b312..00000000000
--- a/i18n/jpn/src/vs/workbench/browser/actions/toggleStatusbarVisibility.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleStatusbar": "ステータス バーの可視性の切り替え",
-	"view": "表示"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/browser/actions/toggleTabsVisibility.i18n.json b/i18n/jpn/src/vs/workbench/browser/actions/toggleTabsVisibility.i18n.json
deleted file mode 100644
index 4fe169cc7ce..00000000000
--- a/i18n/jpn/src/vs/workbench/browser/actions/toggleTabsVisibility.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleTabs": "タブ表示の切り替え",
-	"view": "表示"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/browser/actions/toggleZenMode.i18n.json b/i18n/jpn/src/vs/workbench/browser/actions/toggleZenMode.i18n.json
deleted file mode 100644
index e1fb8411fec..00000000000
--- a/i18n/jpn/src/vs/workbench/browser/actions/toggleZenMode.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleZenMode": "Zen Mode の切り替え",
-	"view": "表示"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/browser/actions/workspaceActions.i18n.json b/i18n/jpn/src/vs/workbench/browser/actions/workspaceActions.i18n.json
deleted file mode 100644
index 504738102db..00000000000
--- a/i18n/jpn/src/vs/workbench/browser/actions/workspaceActions.i18n.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openFile": "ファイルを開く...",
-	"openFolder": "フォルダーを開く...",
-	"openFileFolder": "開く...",
-	"globalRemoveFolderFromWorkspace": "ワークスペースからフォルダーを削除...",
-	"saveWorkspaceAsAction": "名前を付けてワークスペースを保存...",
-	"save": "保存(&&S)",
-	"saveWorkspace": "ワークスペースを保存",
-	"openWorkspaceAction": "ワークスペースを開く...",
-	"openWorkspaceConfigFile": "ワークスペースの構成ファイルを開く",
-	"duplicateWorkspaceInNewWindow": "新しいウィンドウでワークスペースを複製"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/browser/actions/workspaceCommands.i18n.json b/i18n/jpn/src/vs/workbench/browser/actions/workspaceCommands.i18n.json
deleted file mode 100644
index 8ba90a3ef5e..00000000000
--- a/i18n/jpn/src/vs/workbench/browser/actions/workspaceCommands.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"addFolderToWorkspace": "ワークスペースにフォルダーを追加...",
-	"add": "追加(&&A)",
-	"addFolderToWorkspaceTitle": "ワークスペースにフォルダーを追加",
-	"workspaceFolderPickerPlaceholder": "ワークスペース フォルダーを選択"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/browser/parts/activitybar/activitybarActions.i18n.json b/i18n/jpn/src/vs/workbench/browser/parts/activitybar/activitybarActions.i18n.json
deleted file mode 100644
index 8cee18d4c69..00000000000
--- a/i18n/jpn/src/vs/workbench/browser/parts/activitybar/activitybarActions.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"badgeTitle": "{0} - {1}",
-	"titleKeybinding": "{0} ({1})",
-	"removeFromActivityBar": "アクティビティ バーから非表示",
-	"keepInActivityBar": "アクティビティ バーに保持",
-	"additionalViews": "その他のビュー",
-	"numberBadge": "{0} ({1})",
-	"manageExtension": "拡張機能を管理",
-	"toggle": "ビューのピン留めの切り替え"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/browser/parts/activitybar/activitybarPart.i18n.json b/i18n/jpn/src/vs/workbench/browser/parts/activitybar/activitybarPart.i18n.json
deleted file mode 100644
index 0c404e57911..00000000000
--- a/i18n/jpn/src/vs/workbench/browser/parts/activitybar/activitybarPart.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hideActivitBar": "アクティビティ バーを非表示にする",
-	"globalActions": "グローバル操作"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/browser/parts/compositePart.i18n.json b/i18n/jpn/src/vs/workbench/browser/parts/compositePart.i18n.json
deleted file mode 100644
index 1e7a5ff841b..00000000000
--- a/i18n/jpn/src/vs/workbench/browser/parts/compositePart.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"ariaCompositeToolbarLabel": "{0} 個のアクション",
-	"titleTooltip": "{0} ({1})"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/browser/parts/compositebar/compositeBar.i18n.json b/i18n/jpn/src/vs/workbench/browser/parts/compositebar/compositeBar.i18n.json
deleted file mode 100644
index d52c7fc0d4a..00000000000
--- a/i18n/jpn/src/vs/workbench/browser/parts/compositebar/compositeBar.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"activityBarAriaLabel": "アクティブなビュー スイッチャー"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/browser/parts/compositebar/compositeBarActions.i18n.json b/i18n/jpn/src/vs/workbench/browser/parts/compositebar/compositeBarActions.i18n.json
deleted file mode 100644
index bacd6527f35..00000000000
--- a/i18n/jpn/src/vs/workbench/browser/parts/compositebar/compositeBarActions.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"largeNumberBadge": "10k+",
-	"badgeTitle": "{0} - {1}",
-	"additionalViews": "その他のビュー",
-	"numberBadge": "{0} ({1})",
-	"manageExtension": "拡張機能を管理",
-	"titleKeybinding": "{0} ({1})",
-	"hide": "非表示",
-	"keep": "保持",
-	"toggle": "ビューのピン留めの切り替え"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/browser/parts/editor/binaryDiffEditor.i18n.json b/i18n/jpn/src/vs/workbench/browser/parts/editor/binaryDiffEditor.i18n.json
deleted file mode 100644
index ea1317f6659..00000000000
--- a/i18n/jpn/src/vs/workbench/browser/parts/editor/binaryDiffEditor.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"metadataDiff": "{0} ↔ {1}"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/browser/parts/editor/binaryEditor.i18n.json b/i18n/jpn/src/vs/workbench/browser/parts/editor/binaryEditor.i18n.json
deleted file mode 100644
index 3335fde460a..00000000000
--- a/i18n/jpn/src/vs/workbench/browser/parts/editor/binaryEditor.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"binaryEditor": "バイナリ ビューアー"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json b/i18n/jpn/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json
deleted file mode 100644
index aeadb446825..00000000000
--- a/i18n/jpn/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"textEditor": "テキスト エディター",
-	"textDiffEditor": "テキスト差分エディター",
-	"binaryDiffEditor": "バイナリ差分エディター",
-	"sideBySideEditor": "横並びエディター",
-	"groupOnePicker": "最初のグループのエディターを表示する",
-	"groupTwoPicker": "2 番目のグループでエディターを表示する",
-	"groupThreePicker": "3 番目のグループのエディターを表示する",
-	"allEditorsPicker": "開いているエディターをすべて表示する",
-	"view": "表示",
-	"file": "ファイル",
-	"close": "閉じる",
-	"closeOthers": "その他を閉じる",
-	"closeRight": "右側を閉じる",
-	"closeAllSaved": "保存済みを閉じる",
-	"closeAll": "すべて閉じる",
-	"keepOpen": "開いたままにする",
-	"toggleInlineView": "インライン表示に切り替え",
-	"showOpenedEditors": "開いているエディターを表示",
-	"keepEditor": "エディターを保持",
-	"closeEditorsInGroup": "グループ内のすべてのエディターを閉じる",
-	"closeSavedEditors": "グループ内の保存済みエディターを閉じる",
-	"closeOtherEditors": "その他のエディターを閉じる",
-	"closeRightEditors": "右側のエディターを閉じる"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/browser/parts/editor/editorActions.i18n.json b/i18n/jpn/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
deleted file mode 100644
index e7a6b2fb2a7..00000000000
--- a/i18n/jpn/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
+++ /dev/null
@@ -1,58 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"splitEditor": "エディターの分割",
-	"joinTwoGroups": "2 つのグループのエディターを結合",
-	"navigateEditorGroups": "エディター グループ間で移動する",
-	"focusActiveEditorGroup": "アクティブなエディター グループにフォーカス",
-	"focusFirstEditorGroup": "最初のエディター グループにフォーカス",
-	"focusSecondEditorGroup": "2 番目のエディター グループにフォーカス",
-	"focusThirdEditorGroup": "3 番目のエディター グループにフォーカス",
-	"focusPreviousGroup": "前のグループにフォーカス",
-	"focusNextGroup": "次のグループにフォーカス",
-	"openToSide": "横に並べて開く",
-	"closeEditor": "エディターを閉じる",
-	"closeOneEditor": "閉じる",
-	"revertAndCloseActiveEditor": "元に戻してエディターを閉じる",
-	"closeEditorsToTheLeft": "左側のエディターを閉じる",
-	"closeAllEditors": "すべてのエディターを閉じる",
-	"closeEditorsInOtherGroups": "他のグループ内のエディターを閉じる",
-	"moveActiveGroupLeft": "エディター グループを左側に移動する",
-	"moveActiveGroupRight": "エディター グループを右側に移動する",
-	"minimizeOtherEditorGroups": "他のエディター グループを最小化する",
-	"evenEditorGroups": "エディター グループの幅を等間隔に設定する",
-	"maximizeEditor": "エディター グループを最大化してサイドバーを非表示にする",
-	"openNextEditor": "次のエディターを開く",
-	"openPreviousEditor": "以前のエディターを開く",
-	"nextEditorInGroup": "グループ内で次のエディターを開く",
-	"openPreviousEditorInGroup": "グループ内で前のエディターを開く",
-	"lastEditorInGroup": "グループ内の最後のエディターを開く",
-	"navigateNext": "次に進む",
-	"navigatePrevious": "前に戻る",
-	"navigateLast": "戻る",
-	"reopenClosedEditor": "閉じたエディターを再度開く",
-	"clearRecentFiles": "最近開いた項目をクリア",
-	"showEditorsInFirstGroup": "1 番目のグループのエディターを表示する",
-	"showEditorsInSecondGroup": "2 番目のグループでエディターを表示する",
-	"showEditorsInThirdGroup": "3 番目のグループのエディターを表示する",
-	"showAllEditors": "すべてのエディターを表示する",
-	"openPreviousRecentlyUsedEditorInGroup": "グループ内の最近使用したエディターのうち前のエディターを開く",
-	"openNextRecentlyUsedEditorInGroup": "グループ内の最近使用したエディターのうち次のエディターを開く",
-	"navigateEditorHistoryByInput": "履歴から以前のエディターを開く",
-	"openNextRecentlyUsedEditor": "最近使用したエディターのうち次のエディターを開く",
-	"openPreviousRecentlyUsedEditor": "最近使用したエディターのうち前のエディターを開く",
-	"clearEditorHistory": "エディター履歴のクリア",
-	"focusLastEditorInStack": "グループ内の最後のエディターを開く",
-	"moveEditorLeft": "エディターを左へ移動",
-	"moveEditorRight": "エディターを右へ移動",
-	"moveEditorToPreviousGroup": "エディターを前のグループに移動",
-	"moveEditorToNextGroup": "エディターを次のグループに移動",
-	"moveEditorToFirstGroup": "エディターを 1 番目のグループに移動",
-	"moveEditorToSecondGroup": "エディターを 2 番目のグループに移動",
-	"moveEditorToThirdGroup": "エディターを 3 番目のグループに移動"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json b/i18n/jpn/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json
deleted file mode 100644
index 2b13248d5c1..00000000000
--- a/i18n/jpn/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"editorCommand.activeEditorMove.description": "タブまたはグループ別にアクティブ エディターを移動する",
-	"editorCommand.activeEditorMove.arg.name": "アクティブ エディターの Move 引数",
-	"editorCommand.activeEditorMove.arg.description": "引数プロパティ:\n\t* 'to': 移動先を指定する文字列値。\n\t* 'by': 移動の単位を指定する文字列値。タブ別またはグループ別。\n\t* 'value': 移動の位置数もしくは絶対位置を指定する数値。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/browser/parts/editor/editorPart.i18n.json b/i18n/jpn/src/vs/workbench/browser/parts/editor/editorPart.i18n.json
deleted file mode 100644
index 48a4db691c6..00000000000
--- a/i18n/jpn/src/vs/workbench/browser/parts/editor/editorPart.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"groupOneVertical": "左",
-	"groupTwoVertical": "中央",
-	"groupThreeVertical": "右",
-	"groupOneHorizontal": "上",
-	"groupTwoHorizontal": "中央",
-	"groupThreeHorizontal": "下",
-	"editorOpenError": "'{0}' を開くことができません: {1}。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/browser/parts/editor/editorPicker.i18n.json b/i18n/jpn/src/vs/workbench/browser/parts/editor/editorPicker.i18n.json
deleted file mode 100644
index dda0aef9923..00000000000
--- a/i18n/jpn/src/vs/workbench/browser/parts/editor/editorPicker.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"entryAriaLabel": "{0}、エディター グループの選択",
-	"groupLabel": "グループ: {0}",
-	"noResultsFoundInGroup": "グループ内に一致する開いているエディターがありません",
-	"noOpenedEditors": "グループ内で開いているエディターの一覧は現在、空です",
-	"noResultsFound": "一致する開いているエディターがありません",
-	"noOpenedEditorsAllGroups": "開いているエディターの一覧は現在、空です"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json b/i18n/jpn/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json
deleted file mode 100644
index e7c0107e6c1..00000000000
--- a/i18n/jpn/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"singleSelectionRange": "行 {0}、列 {1} ({2} 個選択)",
-	"singleSelection": "行 {0}、列 {1}",
-	"multiSelectionRange": "{0} 個の選択項目 ({1} 文字を選択)",
-	"multiSelection": "{0} 個の選択項目",
-	"endOfLineLineFeed": "LF",
-	"endOfLineCarriageReturnLineFeed": "CRLF",
-	"tabFocusModeEnabled": "タブによるフォーカスの移動",
-	"screenReaderDetected": "スクリーン リーダーに最適化",
-	"screenReaderDetectedExtra": "スクリーン リーダーを使用しない場合、`editor.accessibilitySupport` を \"off\" にしてください。",
-	"disableTabMode": "アクセシビリティ モードを無効にする",
-	"gotoLine": "行へ移動",
-	"selectIndentation": "インデントを選択",
-	"selectEncoding": "エンコードの選択",
-	"selectEOL": "改行コードの選択",
-	"selectLanguageMode": "言語モードの選択",
-	"fileInfo": "ファイル情報",
-	"spacesSize": "スペース: {0}",
-	"tabSize": "タブのサイズ: {0}",
-	"showLanguageExtensions": "'{0}' の Marketplace の拡張機能を検索する ...",
-	"changeMode": "言語モードの変更",
-	"noEditor": "現在アクティブなテキスト エディターはありません",
-	"languageDescription": "({0}) - 構成済みの言語",
-	"languageDescriptionConfigured": "({0})",
-	"languagesPicks": "言語 (識別子)",
-	"configureModeSettings": "'{0}' 言語ベース設定を構成します...",
-	"configureAssociationsExt": "'{0}' に対するファイルの関連付けの構成...",
-	"autoDetect": "自動検出",
-	"pickLanguage": "言語モードの選択",
-	"currentAssociation": "現在の関連付け",
-	"pickLanguageToConfigure": "'{0}' に関連付ける言語モードの選択",
-	"changeIndentation": "インデントの変更",
-	"noWritableCodeEditor": "アクティブなコード エディターは読み取り専用です。",
-	"indentView": "ビューの変更",
-	"indentConvert": "ファイルの変換",
-	"pickAction": "アクションの選択",
-	"changeEndOfLine": "改行コードの変更",
-	"pickEndOfLine": "改行コードの選択",
-	"changeEncoding": "ファイルのエンコードの変更",
-	"noFileEditor": "現在アクティブなファイルはありません",
-	"saveWithEncoding": "エンコード付きで保存",
-	"reopenWithEncoding": "エンコード付きで再度開く",
-	"guessedEncoding": "コンテンツから推測",
-	"pickEncodingForReopen": "ファイルを再度開くときのファイルのエンコードの選択",
-	"pickEncodingForSave": "保存時のファイルのエンコードの選択",
-	"screenReaderDetectedExplanation.title": "スクリーン リーダーに最適化",
-	"screenReaderDetectedExplanation.question": "VS Codeの操作にスクリーンリーダーを使用していますか?",
-	"screenReaderDetectedExplanation.answerYes": "はい",
-	"screenReaderDetectedExplanation.answerNo": "いいえ",
-	"screenReaderDetectedExplanation.body1": "VS Codeは現在スクリーンリーダーの使用状況に最適化されています。",
-	"screenReaderDetectedExplanation.body2": "いくつかのエディター機能が通常と異なる動作をします。例: 折り返し、折りたたみなど"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/browser/parts/editor/resourceViewer.i18n.json b/i18n/jpn/src/vs/workbench/browser/parts/editor/resourceViewer.i18n.json
deleted file mode 100644
index 9be51e2dac8..00000000000
--- a/i18n/jpn/src/vs/workbench/browser/parts/editor/resourceViewer.i18n.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"sizeB": "{0}B",
-	"sizeKB": "{0}KB",
-	"sizeMB": "{0}MB",
-	"sizeGB": "{0}GB",
-	"sizeTB": "{0}TB",
-	"largeImageError": "画像が大きすぎるため、エディターに表示されません ({0})。",
-	"resourceOpenExternalButton": "外部のプログラムを使用して画像を開きますか?",
-	"nativeFileTooLargeError": "ファイルが大きすぎるため、エディターに表示されません ({0})。",
-	"nativeBinaryError": "このファイルはバイナリか、サポートされていないテキスト エンコードを使用しているため、エディターに表示されません。",
-	"openAsText": "このまま開きますか?",
-	"zoom.action.fit.label": "画像全体",
-	"imgMeta": "{0}x{1} {2}"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/browser/parts/editor/tabsTitleControl.i18n.json b/i18n/jpn/src/vs/workbench/browser/parts/editor/tabsTitleControl.i18n.json
deleted file mode 100644
index a9d66c2fa0a..00000000000
--- a/i18n/jpn/src/vs/workbench/browser/parts/editor/tabsTitleControl.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"araLabelTabActions": "タブ操作"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json b/i18n/jpn/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json
deleted file mode 100644
index 6701af9c344..00000000000
--- a/i18n/jpn/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"textDiffEditor": "テキスト差分エディター",
-	"readonlyEditorWithInputAriaLabel": "{0}。読み取り専用のテキスト比較エディター。",
-	"readonlyEditorAriaLabel": "読み取り専用のテキスト比較エディター。",
-	"editableEditorWithInputAriaLabel": "{0}。テキスト ファイル比較エディター。",
-	"editableEditorAriaLabel": "テキスト ファイル比較エディター。",
-	"navigate.next.label": "次の変更箇所",
-	"navigate.prev.label": "前の変更箇所",
-	"toggleIgnoreTrimWhitespace.label": "末尾の空白文字のトリミングを無視する"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/browser/parts/editor/textEditor.i18n.json b/i18n/jpn/src/vs/workbench/browser/parts/editor/textEditor.i18n.json
deleted file mode 100644
index aae88e73e10..00000000000
--- a/i18n/jpn/src/vs/workbench/browser/parts/editor/textEditor.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"editorLabelWithGroup": "{0}、グループ {1}。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/browser/parts/editor/textResourceEditor.i18n.json b/i18n/jpn/src/vs/workbench/browser/parts/editor/textResourceEditor.i18n.json
deleted file mode 100644
index 3cdd53653e6..00000000000
--- a/i18n/jpn/src/vs/workbench/browser/parts/editor/textResourceEditor.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"textEditor": "テキスト エディター",
-	"readonlyEditorWithInputAriaLabel": "{0}。読み取り専用のテキスト エディター。",
-	"readonlyEditorAriaLabel": "読み取り専用のテキスト エディター。",
-	"untitledFileEditorWithInputAriaLabel": "{0}。無題のファイル テキスト エディター。",
-	"untitledFileEditorAriaLabel": "無題のファイル テキスト エディター。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/browser/parts/editor/titleControl.i18n.json b/i18n/jpn/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
deleted file mode 100644
index 8d15ea098f8..00000000000
--- a/i18n/jpn/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"araLabelEditorActions": "エディター操作"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/browser/parts/notifications/notificationsActions.i18n.json b/i18n/jpn/src/vs/workbench/browser/parts/notifications/notificationsActions.i18n.json
deleted file mode 100644
index 1330de43be3..00000000000
--- a/i18n/jpn/src/vs/workbench/browser/parts/notifications/notificationsActions.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"clearNotification": "通知のクリア",
-	"clearNotifications": "すべての通知をクリア",
-	"hideNotificationsCenter": "通知を非表示",
-	"expandNotification": "通知を展開",
-	"collapseNotification": "通知を折りたたむ",
-	"configureNotification": "通知を構成する",
-	"copyNotification": "テキストをコピー"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/browser/parts/notifications/notificationsAlerts.i18n.json b/i18n/jpn/src/vs/workbench/browser/parts/notifications/notificationsAlerts.i18n.json
deleted file mode 100644
index 0441e6402cd..00000000000
--- a/i18n/jpn/src/vs/workbench/browser/parts/notifications/notificationsAlerts.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"alertErrorMessage": "エラー: {0}",
-	"alertWarningMessage": "警告: {0}",
-	"alertInfoMessage": "情報: {0}"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json b/i18n/jpn/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json
deleted file mode 100644
index 9cfb4721d40..00000000000
--- a/i18n/jpn/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"notificationsEmpty": "新しい通知はありません",
-	"notifications": "通知",
-	"notificationsToolbar": "通知センターのアクション",
-	"notificationsList": "通知リスト"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/browser/parts/notifications/notificationsCommands.i18n.json b/i18n/jpn/src/vs/workbench/browser/parts/notifications/notificationsCommands.i18n.json
deleted file mode 100644
index 36ef6f71fd6..00000000000
--- a/i18n/jpn/src/vs/workbench/browser/parts/notifications/notificationsCommands.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"notifications": "通知",
-	"showNotifications": "通知を表示",
-	"hideNotifications": "通知を非表示",
-	"clearAllNotifications": "すべての通知をクリア"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/browser/parts/notifications/notificationsStatus.i18n.json b/i18n/jpn/src/vs/workbench/browser/parts/notifications/notificationsStatus.i18n.json
deleted file mode 100644
index 74d1a30af44..00000000000
--- a/i18n/jpn/src/vs/workbench/browser/parts/notifications/notificationsStatus.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hideNotifications": "通知を非表示",
-	"zeroNotifications": "通知はありません",
-	"noNotifications": "新しい通知はありません",
-	"oneNotification": "1 件の新しい通知",
-	"notifications": "{0} 件の新しい通知"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/browser/parts/notifications/notificationsToasts.i18n.json b/i18n/jpn/src/vs/workbench/browser/parts/notifications/notificationsToasts.i18n.json
deleted file mode 100644
index 5606f74b8e7..00000000000
--- a/i18n/jpn/src/vs/workbench/browser/parts/notifications/notificationsToasts.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"notificationsToast": "通知トースト"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/browser/parts/notifications/notificationsViewer.i18n.json b/i18n/jpn/src/vs/workbench/browser/parts/notifications/notificationsViewer.i18n.json
deleted file mode 100644
index b08e977654e..00000000000
--- a/i18n/jpn/src/vs/workbench/browser/parts/notifications/notificationsViewer.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"notificationActions": "通知操作",
-	"notificationSource": "ソース: {0}"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/browser/parts/panel/panelActions.i18n.json b/i18n/jpn/src/vs/workbench/browser/parts/panel/panelActions.i18n.json
deleted file mode 100644
index d48fbc125ff..00000000000
--- a/i18n/jpn/src/vs/workbench/browser/parts/panel/panelActions.i18n.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"closePanel": "パネルを閉じる",
-	"togglePanel": "パネルの切り替え",
-	"focusPanel": "パネルにフォーカスする",
-	"toggledPanelPosition": "パネル位置の切り替え",
-	"moveToRight": "右に移動",
-	"moveToBottom": "下に移動",
-	"toggleMaximizedPanel": "最大化されるパネルの切り替え",
-	"maximizePanel": "パネル サイズの最大化",
-	"minimizePanel": "パネル サイズを元に戻す",
-	"view": "表示"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/browser/parts/panel/panelPart.i18n.json b/i18n/jpn/src/vs/workbench/browser/parts/panel/panelPart.i18n.json
deleted file mode 100644
index a8fe6e6f737..00000000000
--- a/i18n/jpn/src/vs/workbench/browser/parts/panel/panelPart.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hidePanel": "パネルを非表示"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/browser/parts/quickinput/quickInput.i18n.json b/i18n/jpn/src/vs/workbench/browser/parts/quickinput/quickInput.i18n.json
deleted file mode 100644
index 39a84641d99..00000000000
--- a/i18n/jpn/src/vs/workbench/browser/parts/quickinput/quickInput.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"inputModeEntryDescription": "{0} ('Enter' を押して確認するか 'Escape' を押して取り消します)",
-	"inputModeEntry": "'Enter' を押して入力を確認するか 'Escape' を押して取り消します",
-	"quickInput.countSelected": "{0} 個選択済み",
-	"ok": "OK"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/browser/parts/quickinput/quickInputBox.i18n.json b/i18n/jpn/src/vs/workbench/browser/parts/quickinput/quickInputBox.i18n.json
deleted file mode 100644
index f4c7eecf0db..00000000000
--- a/i18n/jpn/src/vs/workbench/browser/parts/quickinput/quickInputBox.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"quickInputBox.ariaLabel": "入力すると結果が絞り込まれます。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/browser/parts/quickopen/quickOpenController.i18n.json b/i18n/jpn/src/vs/workbench/browser/parts/quickopen/quickOpenController.i18n.json
deleted file mode 100644
index 05c3e60e8ad..00000000000
--- a/i18n/jpn/src/vs/workbench/browser/parts/quickopen/quickOpenController.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"emptyPicks": "選べるエントリがありません",
-	"quickOpenInput": "'?' と入力すると、ここで実行できる処理に関するヘルプが表示されます",
-	"historyMatches": "最近開いたもの",
-	"noResultsFound1": "一致する項目はありません",
-	"canNotRunPlaceholder": "この Quick Open ハンドラーは現在のコンテキストでは使用できません",
-	"entryAriaLabel": "{0}、最近開いたもの",
-	"removeFromEditorHistory": "履歴から削除",
-	"pickHistory": "履歴から削除するエディター エントリを選ぶ"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/browser/parts/quickopen/quickopen.contribution.i18n.json b/i18n/jpn/src/vs/workbench/browser/parts/quickopen/quickopen.contribution.i18n.json
deleted file mode 100644
index b1dcfefa58e..00000000000
--- a/i18n/jpn/src/vs/workbench/browser/parts/quickopen/quickopen.contribution.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"quickOpen": "ファイルに移動...",
-	"quickNavigateNext": "Quick Open で次に移動",
-	"quickNavigatePrevious": "Quick Open で前に移動",
-	"quickSelectNext": "Quick Open で [次へ] を選択",
-	"quickSelectPrevious": "Quick Open で [前へ] を選択"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/browser/parts/quickopen/quickopen.i18n.json b/i18n/jpn/src/vs/workbench/browser/parts/quickopen/quickopen.i18n.json
deleted file mode 100644
index d6791c78831..00000000000
--- a/i18n/jpn/src/vs/workbench/browser/parts/quickopen/quickopen.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"quickOpen": "ファイルに移動...",
-	"quickNavigateNext": "Quick Open で次に移動",
-	"quickNavigatePrevious": "Quick Open で前に移動",
-	"quickSelectNext": "Quick Open で [次へ] を選択",
-	"quickSelectPrevious": "Quick Open で [前へ] を選択"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/browser/parts/sidebar/sidebarPart.i18n.json b/i18n/jpn/src/vs/workbench/browser/parts/sidebar/sidebarPart.i18n.json
deleted file mode 100644
index 8b796232b8d..00000000000
--- a/i18n/jpn/src/vs/workbench/browser/parts/sidebar/sidebarPart.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"focusSideBar": "サイド バー内にフォーカス",
-	"viewCategory": "表示"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/browser/parts/statusbar/statusbarPart.i18n.json b/i18n/jpn/src/vs/workbench/browser/parts/statusbar/statusbarPart.i18n.json
deleted file mode 100644
index 3e47e7d9a9f..00000000000
--- a/i18n/jpn/src/vs/workbench/browser/parts/statusbar/statusbarPart.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"manageExtension": "拡張機能を管理"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/browser/parts/titlebar/titlebarPart.i18n.json b/i18n/jpn/src/vs/workbench/browser/parts/titlebar/titlebarPart.i18n.json
deleted file mode 100644
index 94be0507f09..00000000000
--- a/i18n/jpn/src/vs/workbench/browser/parts/titlebar/titlebarPart.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"patchedWindowTitle": "[サポート対象外]",
-	"userIsAdmin": "[管理者]",
-	"userIsSudo": "[スーパー ユーザー]",
-	"devExtensionWindowTitlePrefix": "[拡張機能開発ホスト]"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/browser/parts/views/panelViewlet.i18n.json b/i18n/jpn/src/vs/workbench/browser/parts/views/panelViewlet.i18n.json
deleted file mode 100644
index f56c0fb7b3b..00000000000
--- a/i18n/jpn/src/vs/workbench/browser/parts/views/panelViewlet.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"viewToolbarAriaLabel": "{0} 個のアクション"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/browser/parts/views/views.i18n.json b/i18n/jpn/src/vs/workbench/browser/parts/views/views.i18n.json
deleted file mode 100644
index 77323e2fdd2..00000000000
--- a/i18n/jpn/src/vs/workbench/browser/parts/views/views.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"viewToolbarAriaLabel": "{0} 個のアクション",
-	"hideView": "サイド バーから非表示"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/browser/parts/views/viewsRegistry.i18n.json b/i18n/jpn/src/vs/workbench/browser/parts/views/viewsRegistry.i18n.json
deleted file mode 100644
index 3607a9f498a..00000000000
--- a/i18n/jpn/src/vs/workbench/browser/parts/views/viewsRegistry.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"duplicateId": "location `{1}` で id `{0}` のビューが既に登録されています"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/browser/parts/views/viewsViewlet.i18n.json b/i18n/jpn/src/vs/workbench/browser/parts/views/viewsViewlet.i18n.json
deleted file mode 100644
index 7b9178bd243..00000000000
--- a/i18n/jpn/src/vs/workbench/browser/parts/views/viewsViewlet.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"cannot toggle": "このビュー {0} は表示/非表示を切り替えることができません。",
-	"cannot show": "ビュー {0} は 'when' 条件によって隠されているため表示できません",
-	"hideView": "非表示"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/browser/quickopen.i18n.json b/i18n/jpn/src/vs/workbench/browser/quickopen.i18n.json
deleted file mode 100644
index e38aebddaa0..00000000000
--- a/i18n/jpn/src/vs/workbench/browser/quickopen.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noResultsMatching": "一致する結果はありません",
-	"noResultsFound2": "一致する項目はありません"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/browser/viewlet.i18n.json b/i18n/jpn/src/vs/workbench/browser/viewlet.i18n.json
deleted file mode 100644
index 10ad1bc74b7..00000000000
--- a/i18n/jpn/src/vs/workbench/browser/viewlet.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"compositePart.hideSideBarLabel": "サイド バーを非表示",
-	"collapse": "すべて折りたたむ"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/common/theme.i18n.json b/i18n/jpn/src/vs/workbench/common/theme.i18n.json
deleted file mode 100644
index b14021a3507..00000000000
--- a/i18n/jpn/src/vs/workbench/common/theme.i18n.json
+++ /dev/null
@@ -1,72 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"tabActiveBackground": "アクティブ タブの背景色。タブはエディター領域におけるエディターのコンテナーです。1 つのエディター グループで複数のタブを開くことができます。エディター グループを複数にすることもできます。",
-	"tabInactiveBackground": "非アクティブ タブの背景色。タブはエディター領域におけるエディターのコンテナーです。1 つのエディター グループで複数のタブを開くことができます。エディター グループを複数にすることもできます。",
-	"tabHoverBackground": "ホバー時のタブの背景色。タブはエディター領域におけるエディターのコンテナです。1 つのエディター グループで複数のタブを開くことができます。エディター グループを複数にすることもできます。",
-	"tabUnfocusedHoverBackground": "ホバー時のフォーカスされていないグループ内のタブの背景色。タブはエディター領域におけるエディターのコンテナです。1 つのエディター グループで複数のタブを開くことができます。エディター グループを複数にすることもできます。",
-	"tabBorder": "タブ同士を分けるための境界線。タブはエディター領域内にあるエディターのコンテナーです。複数のタブを 1 つのエディター グループで開くことができます。複数のエディター グループがある可能性があります。",
-	"tabActiveBorder": "アクティブなタブの下部の境界線。タブはエディター領域内にあるエディターのコンテナーです。複数のタブを 1 つのエディター グループで開くことができます。複数のエディター グループがある可能性があります。",
-	"tabActiveBorderTop": "アクティブなタブの上部の境界線。タブはエディター領域内にあるエディターのコンテナーです。複数のタブを 1 つのエディター グループで開くことができます。複数のエディター グループがある可能性があります。",
-	"tabActiveUnfocusedBorder": "フォーカスされていないグループ内で、アクティブなタブの下部の境界線。タブはエディター領域内にあるエディターのコンテナーです。複数のタブを 1 つのエディター グループで開くことができます。複数のエディター グループがある可能性があります。",
-	"tabActiveUnfocusedBorderTop": "フォーカスされていないグループ内で、アクティブなタブの上部の境界線。タブはエディター領域内にあるエディターのコンテナーです。複数のタブを 1 つのエディター グループで開くことができます。複数のエディター グループがある可能性があります。",
-	"tabHoverBorder": "ホバー時のタブを強調表示するための境界線。タブはエディター領域内にあるエディターのコンテナーです。複数のタブを 1 つのエディター グループで開くことができます。複数のエディター グループがある可能性があります。",
-	"tabUnfocusedHoverBorder": "ホバー時のフォーカスされていないグループ内のタブを強調表示するための境界線。タブはエディター領域内にあるエディターのコンテナーです。複数のタブを 1 つのエディター グループで開くことができます。複数のエディター グループがある可能性があります。",
-	"tabActiveForeground": "アクティブ グループ内のアクティブ タブの前景色。タブはエディター領域におけるエディターのコンテナーです。1 つのエディター グループで複数のタブを開くことができます。エディター グループを複数にすることもできます。",
-	"tabInactiveForeground": "アクティブ グループ内の非アクティブ タブの前景色。タブはエディター領域におけるエディターのコンテナーです。1 つのエディター グループで複数のタブを開くことができます。エディター グループを複数にすることもできます。",
-	"tabUnfocusedActiveForeground": "フォーカスされていないグループ内のアクティブ タブの前景色。タブはエディター領域におけるエディターのコンテナーです。1 つのエディター グループで複数のタブを開くことができます。エディター グループを複数にすることもできます。",
-	"tabUnfocusedInactiveForeground": "フォーカスされていないグループ内の非アクティブ タブの前景色。タブはエディター領域におけるエディターのコンテナーです。1 つのエディター グループで複数のタブを開くことができます。エディター グループを複数にすることもできます。",
-	"editorGroupBackground": "エディター グループの背景色。エディター グループはエディターのコンテナーです。背景色はエディター グループをドラッグすると表示されます。",
-	"tabsContainerBackground": "タブが有効な場合の エディター グループ タイトル ヘッダーの背景色。エディター グループはエディターのコンテナーです。",
-	"tabsContainerBorder": "タブが有効な場合の エディター グループ タイトル ヘッダーの境界線色。エディター グループはエディターのコンテナーです。",
-	"editorGroupHeaderBackground": "タブが無効な場合 (`\"workbench.editor.showTabs\": false`) のエディター グループ タイトル ヘッダーの背景色。エディター グループはエディターのコンテナーです。",
-	"editorGroupBorder": "複数のエディター グループを互いに分離するための色。エディター グループはエディターのコンテナーです。",
-	"editorDragAndDropBackground": "エディターの周囲をドラッグしているときの背景色。エディターのコンテンツが最後まで輝くために、色は透過である必要があります。",
-	"panelBackground": "パネルの背景色。パネルはエディター領域の下に表示され、出力や統合ターミナルなどのビューを含みます。",
-	"panelBorder": "パネルをエディターと区切るためのパネル ボーダー色。パネルはエディター領域の下に表示され、出力や統合ターミナルなどのビューを含みます。",
-	"panelActiveTitleForeground": "アクティブ パネルのタイトルの色。パネルはエディター領域の下に表示され、出力や統合ターミナルなどのビューを含みます。",
-	"panelInactiveTitleForeground": "非アクティブ パネルのタイトルの色。パネルはエディター領域の下に表示され、出力や統合ターミナルなどのビューを含みます。",
-	"panelActiveTitleBorder": "アクティブ パネル タイトルの境界線の色。パネルはエディター領域の下に表示され、出力や統合ターミナルなどのビューを含みます。",
-	"panelDragAndDropBackground": "パネル タイトル項目のドラッグ アンド ドロップ フィードバックの色。パネル エントリーが最後まで輝くために、色は透過である必要があります。パネルはエディター エリアの下側に表示され、出力や統合ターミナルのようなビューを含みます。",
-	"statusBarForeground": "ワークスペースを開いていないときのステータス バーの前景色。ステータス バーはウィンドウの下部に表示されます。",
-	"statusBarNoFolderForeground": "フォルダーが開いていないときのステータス バーの前景色。ステータス バーはウィンドウの下部に表示されます。",
-	"statusBarBackground": "ワークスペースを開いていないときのステータス バーの背景色。ステータス バーはウィンドウの下部に表示されます。",
-	"statusBarNoFolderBackground": "フォルダーが開いていないときのステータス バーの背景色。ステータス バーはウィンドウの下部に表示されます。",
-	"statusBarBorder": "サイドバーとエディターを隔てるステータス バーの境界線色。ステータス バーはウィンドウの下部に表示されます。",
-	"statusBarNoFolderBorder": "フォルダーを開いていないときにサイドバーとエディターを隔てるワークスペースのステータス バーの境界線の色。ステータス バーはウィンドウの下部に表示されます。 ",
-	"statusBarItemActiveBackground": "クリック時のステータス バーの項目の背景色。ステータス バーはウィンドウの下部に表示されます。",
-	"statusBarItemHoverBackground": "ホバーしたときのステータス バーの項目の背景色。ステータス バーはウィンドウの下部に表示されます。",
-	"statusBarProminentItemBackground": "ステータスバーで目立たせる項目の背景色。この項目は、重要性を示すために他のエントリーより目立って表示されます。コマンドパレットから `Toggle Tab Key Moves Focus` に切り替えると例を見ることができます。ステータスバーはウィンドウの下部に表示されます。",
-	"statusBarProminentItemHoverBackground": "ホバー中のステータスバーで目立たせる項目の背景色。この項目は、重要性を示すために他のエントリーより目立って表示されます。コマンドパレットから `Toggle Tab Key Moves Focus` に切り替えると例を見ることができます。ステータスバーはウィンドウの下部に表示されます。",
-	"activityBarBackground": "アクティビティ バーの背景色。アクティビティ バーは左端または右端に表示され、サイド バーのビューを切り替えることができます。",
-	"activityBarForeground": "アクティビティ バーの前景色 (例: アイコンの色)。アクティビティ バーは左端または右端に表示され、サイド バーのビューを切り替えることができます。",
-	"activityBarBorder": "サイド バーと隔てるアクティビティ バーの境界線色。アクティビティ バーは左端または右端に表示され、サイド バーのビューを切り替えることができます。",
-	"activityBarDragAndDropBackground": "アクティビティ バーの項目のドラッグ アンド ドロップ フィードバックの色。アクティビティ バーが最後まで輝くために、色は透過である必要があります。アクティビティ バーは左端または右端に表示され、サイド バーの表示を切り替えることができます。",
-	"activityBarBadgeBackground": "アクティビティ通知バッジの背景色。アクティビティ バーは左端または右端に表示され、サイド バーの表示を切り替えることができます。",
-	"activityBarBadgeForeground": "アクティビティ通知バッジの前景色。アクティビティ バーは左端または右端に表示され、サイド バーの表示を切り替えることができます。",
-	"sideBarBackground": "サイド バーの背景色。サイド バーは、エクスプローラーや検索などのビューが入るコンテナーです。",
-	"sideBarForeground": "サイド バーの前景色。サイド バーは、エクスプローラーや検索などのビューが入るコンテナーです。",
-	"sideBarBorder": "エディターとの区切りを示すサイド バーの境界線の色。サイド バーは、エクスプローラーや検索などのビューが入るコンテナーです。",
-	"sideBarTitleForeground": "サイド バーのタイトルの前景色。サイド バーは、エクスプローラーや検索などのビューが入るコンテナーです。",
-	"sideBarDragAndDropBackground": "サイド バーのセクションのドラッグ アンド ドロップ フィードバックの色。サイド バーのセクションが最後まで輝くために、色は透過である必要があります。サイド バーはエクスプローラーや検索のようなビューのコンテナーです。",
-	"sideBarSectionHeaderBackground": "サイド バーのセクション ヘッダーの背景色。サイド バーは、エクスプローラーや検索などのビューが入るコンテナーです。",
-	"sideBarSectionHeaderForeground": "サイド バーのセクション ヘッダーの前景色。サイド バーは、エクスプローラーや検索などのビューが入るコンテナーです。",
-	"titleBarActiveForeground": "ウィンドウがアクティブな場合のタイトル バーの前景。現在、この色は macOS でのみサポートされているのでご注意ください。",
-	"titleBarInactiveForeground": "ウィンドウが非アクティブな場合のタイトル バーの前景。現在、この色は macOS でのみサポートされているのでご注意ください。",
-	"titleBarActiveBackground": "ウィンドウがアクティブな場合のタイトル バーの背景。現在、この色は macOS でのみサポートされているのでご注意ください。",
-	"titleBarInactiveBackground": "ウィンドウが非アクティブな場合のタイトル バーの背景。現在、この色は macOS でのみサポートされているのでご注意ください。",
-	"titleBarBorder": "タイトル バーの境界線色。現在、この色は macOS でのみサポートされているのでご注意ください。",
-	"notificationCenterBorder": "通知センターの境界線色。通知はウィンドウの右下からスライド表示します。",
-	"notificationToastBorder": "通知トーストの境界線色。通知はウィンドウの右下からスライド表示します。",
-	"notificationsForeground": "通知の前景色。通知はウィンドウの右下からスライド表示します。",
-	"notificationsBackground": "通知の背景色。通知はウィンドウの右下からスライド表示します。",
-	"notificationsLink": "通知内リンクの前景色。通知はウィンドウの右下からスライド表示します。",
-	"notificationCenterHeaderForeground": "通知センターのヘッダーの前景色。通知はウィンドウの右下からスライド表示します。",
-	"notificationCenterHeaderBackground": "通知センターのヘッダーの背景色。通知はウィンドウの右下からスライド表示します。",
-	"notificationsBorder": "通知センターで通知を他の通知と区切っている境界線色。通知はウィンドウの右下からスライド表示します。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/common/views.i18n.json b/i18n/jpn/src/vs/workbench/common/views.i18n.json
deleted file mode 100644
index 9bb889a78e1..00000000000
--- a/i18n/jpn/src/vs/workbench/common/views.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"duplicateId": "location '{1}' で id '{0}' のビューが既に登録されています"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/electron-browser/actions.i18n.json b/i18n/jpn/src/vs/workbench/electron-browser/actions.i18n.json
deleted file mode 100644
index bb47142b456..00000000000
--- a/i18n/jpn/src/vs/workbench/electron-browser/actions.i18n.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"closeWindow": "ウィンドウを閉じる",
-	"closeWorkspace": "ワークスペースを閉じる",
-	"noWorkspaceOpened": "このインスタンスで現在開いているワークスペースがないので、閉じられません。",
-	"newWindow": "新しいウィンドウ",
-	"toggleFullScreen": "全画面表示の切り替え",
-	"toggleMenuBar": "メニュー バーの切り替え",
-	"toggleDevTools": "開発者ツールの切り替え",
-	"zoomIn": "拡大",
-	"zoomOut": "縮小",
-	"zoomReset": "ズームのリセット",
-	"appPerf": "スタートアップ パフォーマンス",
-	"reloadWindow": "ウィンドウの再読み込み",
-	"reloadWindowWithExntesionsDisabled": "拡張機能を無効にしてウィンドウを再読み込み",
-	"switchWindowPlaceHolder": "切り替え先のウィンドウを選択してください",
-	"current": "現在のウィンドウ",
-	"close": "ウィンドウを閉じる",
-	"switchWindow": "ウィンドウの切り替え...",
-	"quickSwitchWindow": "ウィンドウをすぐに切り替える...",
-	"workspaces": "ワークスペース",
-	"files": "ファイル",
-	"openRecentPlaceHolderMac": "開くものを選択 (Cmd キーを押しながら新しいウィンドウで開く)",
-	"openRecentPlaceHolder": "開くものを選択 (Ctrl キーを押しながら新しいウィンドウで開く)",
-	"remove": "最近開いた項目から削除",
-	"openRecent": "最近開いた項目…",
-	"quickOpenRecent": "最近使用したものを開く...",
-	"reportIssueInEnglish": "問題の報告",
-	"openProcessExplorer": "プロセス エクスプローラーを開く",
-	"reportPerformanceIssue": "パフォーマンスの問題のレポート",
-	"keybindingsReference": "キーボード ショートカットの参照",
-	"openDocumentationUrl": "ドキュメント",
-	"openIntroductoryVideosUrl": "紹介ビデオ",
-	"openTipsAndTricksUrl": " ヒントとコツ",
-	"toggleSharedProcess": "共有プロセスを切り替える",
-	"navigateLeft": "左のビュー部分に移動",
-	"navigateRight": "右のビュー部分に移動",
-	"navigateUp": "上のビュー部分に移動",
-	"navigateDown": "下のビュー部分に移動",
-	"increaseViewSize": "現在のビューのサイズの拡大",
-	"decreaseViewSize": "現在のビューのサイズの縮小",
-	"showPreviousTab": "前のウィンドウ タブを表示",
-	"showNextWindowTab": "次のウィンドウ タブを表示",
-	"moveWindowTabToNewWindow": "ウィンドウ タブを新しいウィンドウに移動",
-	"mergeAllWindowTabs": "すべてのウィンドウを統合",
-	"toggleWindowTabsBar": "ウィンドウ タブ バーの切り替え",
-	"about": "{0} のバージョン情報",
-	"inspect context keys": "コンテキスト キーの検査"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/electron-browser/commands.i18n.json b/i18n/jpn/src/vs/workbench/electron-browser/commands.i18n.json
deleted file mode 100644
index 983899514ca..00000000000
--- a/i18n/jpn/src/vs/workbench/electron-browser/commands.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"diffLeftRightLabel": "{0} ⟷ {1}"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/electron-browser/configureLocale.i18n.json b/i18n/jpn/src/vs/workbench/electron-browser/configureLocale.i18n.json
deleted file mode 100644
index 21107d326ab..00000000000
--- a/i18n/jpn/src/vs/workbench/electron-browser/configureLocale.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"configureLocale": "言語を構成する",
-	"displayLanguage": "VSCode の表示言語を定義します。",
-	"doc": "サポートされている言語の一覧については、{0} をご覧ください。",
-	"restart": "値を変更するには VS Code の再起動が必要です。",
-	"fail.createSettings": "'{0}' ({1}) を作成できません。",
-	"JsonSchema.locale": "使用する UI 言語。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/electron-browser/crashReporter.i18n.json b/i18n/jpn/src/vs/workbench/electron-browser/crashReporter.i18n.json
deleted file mode 100644
index 7df1ec40941..00000000000
--- a/i18n/jpn/src/vs/workbench/electron-browser/crashReporter.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"telemetryConfigurationTitle": "テレメトリ",
-	"telemetry.enableCrashReporting": "クラッシュ レポートを Microsoft に送信するように設定します。\nこのオプションを有効にするには、再起動が必要です。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/electron-browser/extensionHost.i18n.json b/i18n/jpn/src/vs/workbench/electron-browser/extensionHost.i18n.json
deleted file mode 100644
index a986ab13518..00000000000
--- a/i18n/jpn/src/vs/workbench/electron-browser/extensionHost.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"extensionHostProcess.startupFailDebug": "拡張機能ホストが 10 秒以内に開始されませんでした。先頭行で停止している可能性があり、続行するにはデバッガーが必要です。",
-	"extensionHostProcess.startupFail": "拡張機能ホストが 10 秒以内に開始されませんでした。問題が発生している可能性があります。",
-	"extensionHostProcess.error": "拡張機能ホストからのエラー: {0}",
-	"devTools": "開発者ツール",
-	"extensionHostProcess.crash": "拡張機能ホストが予期せずに終了しました。回復するには、ウィンドウを再度読み込んでください。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/electron-browser/main.contribution.i18n.json b/i18n/jpn/src/vs/workbench/electron-browser/main.contribution.i18n.json
deleted file mode 100644
index 3b03f305576..00000000000
--- a/i18n/jpn/src/vs/workbench/electron-browser/main.contribution.i18n.json
+++ /dev/null
@@ -1,91 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"view": "表示",
-	"help": "ヘルプ",
-	"file": "ファイル",
-	"workspaces": "ワークスペース",
-	"developer": "開発者",
-	"workbenchConfigurationTitle": "ワークベンチ",
-	"showEditorTabs": "開いているエディターをタブに表示するかどうかを制御します。",
-	"workbench.editor.labelFormat.default": "ファイルの名前を表示します。タブが有効かつ 1 つのグループ内の 2 つの同名ファイルがあるときに各ファイルのパスの区切り記号が追加されます。タブを無効にすると、エディターがアクティブな時にワークスペース フォルダーの相対パスが表示されます。",
-	"workbench.editor.labelFormat.short": "ディレクトリ名に続けてファイル名を表示します。",
-	"workbench.editor.labelFormat.medium": "ワークスペース フォルダーからの相対パスに続けてファイル名を表示します。",
-	"workbench.editor.labelFormat.long": "絶対パスに続けてファイル名を表示します。",
-	"tabDescription": "エディターのラベルの書式を制御します。例としてこの設定を変更することでファイルの場所を理解しやすくなります:\n- short: 'parent'\n- medium: 'workspace/src/parent'\n- long: '/home/user/workspace/src/parent'\n- default: '.../parent', 　別タブで、同じタイトルを共有する場合や、相対的なワークスペース パス タブが無効になっている場合",
-	"editorTabCloseButton": "エディター タブの閉じるボタンの位置を制御するか、[off] に設定した場合に無効にします。",
-	"tabSizing": "エディターのタブの大きさを制御します。常に完全なエディター ラベルを表示するのに足りるタブの大きさを維持するには 'fit' を設定します。すべてのタブを一度に表示するには利用可能なスペースが足りない場合に、タブを縮小可能にするには 'shrink' を設定します。",
-	"showIcons": "開いているエディターをアイコンで表示するかどうかを制御します。これには、アイコンのテーマを有効にする必要もあります。",
-	"enablePreview": "開かれるエディターをプレビューとして表示するかどうかを制御します。プレビュー エディターは (例: ダブル クリックまたは編集などによって) 変更される時まで再利用し、斜体で表示します。",
-	"enablePreviewFromQuickOpen": "Quick Open で開いたエディターをプレビューとして表示するかどうかを制御します。プレビュー エディターは、保持されている間、再利用されます (ダブルクリックまたは編集などによって)。",
-	"closeOnFileDelete": "ファイルを表示しているエディターを、ファイルが削除されるかその他のプロセスによって名前を変更された場合に、自動的に閉じるかどうかを制御します。これを無効にすると、このような場合にエディターはダーティで開かれたままになります。アプリケーション内で削除すると、必ずエディターは閉じられ、ダーティ ファイルは閉じられることがなく、データは保存されませんのでご注意ください。",
-	"editorOpenPositioning": "エディターを開く場所を制御します。'left' または 'right' を選択すると現在アクティブになっているエディターの左または右にエディターを開きます。'first' または 'last' を選択すると現在アクティブになっているエディターとは別個にエディターを開きます。",
-	"revealIfOpen": "任意の表示グループが開かれた場合に、そこにエディターを表示するかどうかを制御します。無効にした場合、エディターは現在のアクティブなエディター グループに優先して開かれます。有効にした場合は、現在のアクティブなエディター グループにもう一度開くのではなく、既に開いているエディターが表示されます。特定のグループ内や現在アクティブなグループの横に強制的にエディターを開いた場合などに、この設定が無視される場合もあることにご注意ください。",
-	"swipeToNavigate": "3 本の指で横方向にスワイプすると、開いているファイル間を移動できます。",
-	"commandHistory": "コマンド パレットで最近使用したコマンド履歴を保持する数を制御します。0 に設定するとコマンド履歴を無効にします。",
-	"preserveInput": "次回開いたとき、コマンド パレットの最後の入力を復元するかどうかを制御します。",
-	"closeOnFocusLost": "フォーカスを失ったときに Quick Open を自動的に閉じるかどうかを制御します。",
-	"openDefaultSettings": "設定を開くとすべての既定の設定を表示するエディターも開くかどうかを制御します。",
-	"sideBarLocation": "サイド バーの位置を制御します。ワークベンチの左右のいずれかに表示できます。",
-	"panelDefaultLocation": "パネルの既定の位置を制御します。ワークベンチの下部または右のいずれかに表示できます。",
-	"statusBarVisibility": "ワークベンチの下部にステータス バーを表示するかどうかを制御します。",
-	"activityBarVisibility": "ワークベンチでのアクティビティ バーの表示をコントロールします。",
-	"viewVisibility": "ビュー ヘッダー アクションを表示するかどうかを制御します。ビュー ヘッダー アクションは常に表示されるか、パネルをフォーカスやホバーしたときのみ表示のいずれかです。",
-	"fontAliasing": "ワークベンチのフォント エイリアシング方法を制御します。\n- default: サブピクセル方式でフォントを滑らかにします。ほとんどの非 Retina ディスプレイでもっとも鮮明なテキストを提供します\n- antialiased: サブピクセルとは対照的に、ピクセルのレベルでフォントを滑らかにします。フォント全体がより細く見えます\n- none: フォントのスムージングを無効にします。テキストをぎざぎざな尖ったエッジで表示します\n- auto: ディスプレイの DPI に基づいて自動的に `default` か `antialiased` を適用します",
-	"workbench.fontAliasing.default": "サブピクセル方式でフォントを滑らかにします。ほとんどの非 Retina ディスプレイでもっとも鮮明なテキストを提供します。",
-	"workbench.fontAliasing.antialiased": "サブピクセルとは対照的に、ピクセルのレベルでフォントを滑らかにします。フォント全体がより細く見えるようになります。",
-	"workbench.fontAliasing.none": "フォントのスムージングを無効にします。テキストをぎざぎざな尖ったエッジで表示します。",
-	"workbench.fontAliasing.auto": "ディスプレイの DPI に基づいて自動的に `default` か `antialiased` を適用します。",
-	"enableNaturalLanguageSettingsSearch": "設定で自然文検索モードを有効にするかどうかを制御します。",
-	"windowConfigurationTitle": "ウィンドウ",
-	"window.openFilesInNewWindow.on": "新しいウィンドウでファイルを開きます",
-	"window.openFilesInNewWindow.off": "ファイルのフォルダーが開かれていたウィンドウまたは最後のアクティブ ウィンドウでファイルを開きます",
-	"window.openFilesInNewWindow.defaultMac": "Dock または Finder を使用して開いたときを除き、ファイルのフォルダーを開いているウィンドウまたは最後のアクティブ ウィンドウでファイルを開きます",
-	"window.openFilesInNewWindow.default": "アプリケーション内から選択したとき (例: ファイル メニュー介したとき) を除き 、新しいウィンドウでファイルを開きます",
-	"openFilesInNewWindowMac": "ファイルを新しいウィンドウで開くかどうかを制御します。\n- default: Dock または Finder を使用して開いたときを除き、ファイルのフォルダーを開いているウィンドウまたは最後のアクティブ ウィンドウでファイルを開きます\n- on: 新しいウィンドウでファイルを開きます\n- off: ファイルのフォルダーを開いているフォルダーまたは最後のアクティブ ウィンドウでファイルを開きます\nこの設定は無視される場合もあります (例: -new-window または -reuse-window コマンド ライン オプションを使用する場合など)。",
-	"openFilesInNewWindow": "ファイルを新しいウィンドウで開くかどうかを制御します。\n- default: アプリケーション内から選択したとき (例: ファイル メニュー介したとき) を除き 、新しいウィンドウでファイルを開きます\n- on: 新しいウィンドウでファイルを開きます\n- off: ファイルのフォルダーを開いているフォルダーまたは最後のアクティブ ウィンドウでファイルを開きます\nこの設定は無視される場合もあります (例: -new-window または -reuse-window コマンド ライン オプションを使用する場合など)。",
-	"window.openFoldersInNewWindow.on": "新しいウィンドウでフォルダーを開きます",
-	"window.openFoldersInNewWindow.off": "フォルダーは、最後のアクティブ ウィンドウで開きます",
-	"window.openFoldersInNewWindow.default": "フォルダーがアプリケーション内から (たとえば、[ファイル] メニューから) 選択された場合を除いて、新しいウィンドウでフォルダーを開きます",
-	"openFoldersInNewWindow": "フォルダーを新しいウィンドウで開くか、最後のアクティブ ウィンドウで開くかを制御します。\n- default: アプリケーション内で ([ファイル] メニューなどから) 選択したものでなければ、新しいウィンドウでフォルダーを開く\n- on: 新しいウィンドウでフォルダーを開く\n- off: 最後のアクティブ ウィンドウでフォルダーを開く\nこの設定は無視される場合もあります (-new-window または -reuse-window コマンド ライン オプションを使用する場合など)。",
-	"window.openWithoutArgumentsInNewWindow.on": "新しい空のウィンドウを開く",
-	"window.openWithoutArgumentsInNewWindow.off": "最後にアクティブだった実行中のインスタンスにフォーカスする",
-	"openWithoutArgumentsInNewWindow": "引数なしで 2 つ目のインスタンスを起動するとき、新しい空のウィンドウを開くか、最後に実行されていたウィンドウにフォーカスするかを制御します。\n- on: 新しい空のウィンドウを開く\n- off: 最後に実行されていたウィンドウにフォーカスする\nこの設定は無視される場合もあります (-new-window または -reuse-window コマンド ライン オプションを使用する場合など)。",
-	"window.reopenFolders.all": "すべてのウィンドウを再度開きます。",
-	"window.reopenFolders.folders": "すべてのフォルダーを再度開きます。空のワークスペースは復元されません。",
-	"window.reopenFolders.one": "最後にアクティブだったウィンドウを再び開きます。",
-	"window.reopenFolders.none": "ウィンドウ再度開きません。常に空のウィンドウで開始します。",
-	"restoreWindows": "再起動後にワークスペースを再度開く方法を制御します。'none' を選択すると常に空のワークスペースで開始します。'one' を選択すると最後に使用したウィンドウを再度開きます。'folders' を選択すると開かれていたフォルダーとすべてのウィンドウを再度開きます。'all' を選択すると前回のセッションのすべてのウィンドウを再度開きます。",
-	"restoreFullscreen": "全画面表示モードで終了した場合に、ウィンドウを全画面表示モードに復元するかどうかを制御します。",
-	"zoomLevel": "ウィンドウのズーム レベルを調整します。元のサイズは 0 で、1 つ上げるごとに (1 など) 20% ずつ拡大することを表し、1 つ下げるごとに (-1 など) 20% ずつ縮小することを表します。小数点以下の桁数を入力して、さらに細かくズーム レベルを調整することもできます。",
-	"title": "アクティブなエディターに基づいてウィンドウのタイトルを制御します。変数は、コンテキストに基づいて置換されます:\n${activeEditorShort}: ファイル名 (例: myFile.txt)\n${activeEditorMedium}: ワークスペース フォルダーへの相対パス (例: myFolder/myFile.txt)\n${activeEditorLong}: ファイルの完全なパス (例: /Users/Development/myProject/myFolder/myFile.txt)\n${folderName}: ファイルが含まれているワークスペース フォルダー名 (例: myFolder)\n${folderPath}: ァイルが含まれているワークスペース フォルダーのファイルパス (例: /Users/Development/myFolder)\n${rootName}: ワークスペースの名前 (例: myFolder や myWorkspace)\n${rootPath}: ワークスペースのファイル パス (例: /Users/Development/myWorkspace)\n${appName}: 例: VS Code\n${dirty}: アクティブなエディターがダーティである場合のダーティ インジゲーター\n${separator}: 値のある変数かスタティック テキストで囲まれた場合にのみ表示される条件付き区切り記号 (\" - \")",
-	"window.newWindowDimensions.default": "新しいウィンドウを画面の中央に開きます。",
-	"window.newWindowDimensions.inherit": "新しいウィンドウを、最後にアクティブだったウィンドウと同じサイズで開きます。",
-	"window.newWindowDimensions.maximized": "新しいウィンドウを最大化した状態で開きます。",
-	"window.newWindowDimensions.fullscreen": "新しいウィンドウを全画面表示モードで開きます。",
-	"newWindowDimensions": "既に 1 つ以上のウィンドウを開いているとき、新しく開くウィンドウのサイズを制御します。既定では、新しいウィンドウを画面中央に小さいサイズで開きます。'inherit' に設定すると、最後のアクティブ ウィンドウと同じサイズで開きます。'maximized' に設定するとウィンドウは最大サイズで開き、'fullscreen' に設定すると全画面になります。この設定は、最初に開いたウィンドウに適用されないことに注意してください。最初のウィンドウは常に、前回閉じたサイズと位置で復元します。",
-	"closeWhenEmpty": "最後のエディターを閉じたときに、ウィンドウも閉じるかどうかを制御します。この設定はフォルダーを表示していないウィンドウにのみ適用されます。",
-	"window.menuBarVisibility.default": "メニューは全画面表示モードの場合にのみ非表示です。",
-	"window.menuBarVisibility.visible": "全画面表示モードの場合も含めて、常にメニューが表示されます。",
-	"window.menuBarVisibility.toggle": "メニューは非表示ですが、Alt キーを押すと表示できます。",
-	"window.menuBarVisibility.hidden": "メニューは常に非表示です。",
-	"menuBarVisibility": "メニュー バーの表示/非表示を制御します。'切り替え' 設定は Alt キーを 1 回押すとメニュー バーの表示/非表示が切り替わることを意味します。既定では、ウィンドウが全画面表示の場合を除き、メニュー バーは表示されます。",
-	"enableMenuBarMnemonics": "有効にすると、Alt キー ショートカットを使用してメイン メニューを開くことができます。ニーモニックを無効にすると、これらの Alt キー ショートカットをエディター コマンドの代わりにバインドできます。",
-	"autoDetectHighContrast": "有効にすると、Windows でハイ コントラスト テーマが使用されている場合にはハイ コントラスト テーマに自動的に変更され、Windows のハイ コントラスト テーマから切り替えられている場合にはダーク テーマに自動的に変更されます。",
-	"titleBarStyle": "ウィンドウのタイトル バーの外観を調整します。変更を適用するには、完全に再起動する必要があります。",
-	"window.nativeTabs": "macOS Sierra ウィンドウ タブを有効にします。この変更を適用するには完全な再起動が必要であり、ネイティブ タブでカスタムのタイトル バー スタイルが構成されていた場合はそれが無効になることに注意してください。",
-	"window.smoothScrollingWorkaround": "最小化した VS Code ウィンドウを元のサイズに戻したあと、スクロールが滑らかにならない場合はこの回避策を有効にしてください。これは Microsoft Surface のような高精度タッチパッドを備えたデバイスで、スクロールの開始が遅れる問題 (https://github.com/Microsoft/vscode/issues/13612) の回避策です。有効にすると、最小化の状態からウィンドウを元に戻したあとに少しレイアウトがちらつきますが、そうでなければ無害です。",
-	"window.clickThroughInactive": "有効な場合、非アクティブなウィンドウをクリックするとウィンドウがアクティブになり、クリック可能な場合はマウスの下の要素がトリガーされます。無効にすると、非アクティブなウィンドウの任意の場所をクリックするとそのウィンドウがアクティブになり、要素には 2 回目のクリックが必要になります。",
-	"zenModeConfigurationTitle": "Zen Mode",
-	"zenMode.fullScreen": "Zen Mode をオンにするとワークベンチを自動的に全画面モードに切り替えるかどうかを制御します。",
-	"zenMode.centerLayout": "Zen Mode をオンにしたときにレイアウトを中央揃えにするかどうかを制御します。",
-	"zenMode.hideTabs": "Zen Mode をオンにしたときにワークベンチ タブも非表示にするかどうかを制御します。",
-	"zenMode.hideStatusBar": "Zen Mode をオンにするとワークベンチの下部にあるステータス バーを非表示にするかどうかを制御します。",
-	"zenMode.hideActivityBar": "Zen Mode をオンにするとワークベンチの左側にあるアクティビティ バーを非表示にするかを制御します。",
-	"zenMode.restore": "Zen Mode で終了したウィンドウを Zen Mode に復元するかどうかを制御します。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/electron-browser/main.i18n.json b/i18n/jpn/src/vs/workbench/electron-browser/main.i18n.json
deleted file mode 100644
index a3adfc569a9..00000000000
--- a/i18n/jpn/src/vs/workbench/electron-browser/main.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"loaderError": "必要なファイルを読み込みに失敗しました。インターネット接続が切れたか、接続先のサーバーがオフラインです。ブラウザーを更新して、もう一度やり直してください。",
-	"loaderErrorNative": "必要なファイルの読み込みに失敗しました。アプリケーションを再起動してもう一度試してください。詳細: {0}"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/electron-browser/shell.i18n.json b/i18n/jpn/src/vs/workbench/electron-browser/shell.i18n.json
deleted file mode 100644
index 7edc0e838e8..00000000000
--- a/i18n/jpn/src/vs/workbench/electron-browser/shell.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"runningAsRoot": "コードを 'root ' として実行しないことをお勧めします。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/electron-browser/window.i18n.json b/i18n/jpn/src/vs/workbench/electron-browser/window.i18n.json
deleted file mode 100644
index b544af3baf4..00000000000
--- a/i18n/jpn/src/vs/workbench/electron-browser/window.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"undo": "元に戻す",
-	"redo": "やり直し",
-	"cut": "切り取り",
-	"copy": "コピー",
-	"paste": "貼り付け",
-	"selectAll": "すべて選択",
-	"runningAsRoot": "{0} をルート ユーザーとして実行しないことを推奨します。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/electron-browser/workbench.i18n.json b/i18n/jpn/src/vs/workbench/electron-browser/workbench.i18n.json
deleted file mode 100644
index 195ad269052..00000000000
--- a/i18n/jpn/src/vs/workbench/electron-browser/workbench.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"developer": "開発者",
-	"file": "ファイル"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/node/extensionHostMain.i18n.json b/i18n/jpn/src/vs/workbench/node/extensionHostMain.i18n.json
deleted file mode 100644
index 3fca6f5d375..00000000000
--- a/i18n/jpn/src/vs/workbench/node/extensionHostMain.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"extensionTestError": "パス {0} は有効な拡張機能テスト ランナーを指していません。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/node/extensionPoints.i18n.json b/i18n/jpn/src/vs/workbench/node/extensionPoints.i18n.json
deleted file mode 100644
index 7d36d86d279..00000000000
--- a/i18n/jpn/src/vs/workbench/node/extensionPoints.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"jsonParseFail": "{0} を解析できません: {1}。",
-	"fileReadFail": "ファイル {0} を読み取れません: {1}。",
-	"jsonsParseFail": "{0} または {1} を解析できませんでした: {2}。",
-	"missingNLSKey": "キー {0} のメッセージが見つかりませんでした。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/cli/electron-browser/cli.contribution.i18n.json b/i18n/jpn/src/vs/workbench/parts/cli/electron-browser/cli.contribution.i18n.json
deleted file mode 100644
index ff2ce946ed3..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/cli/electron-browser/cli.contribution.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"install": "PATH 内に '{0}' コマンドをインストールします",
-	"not available": "このコマンドは使用できません",
-	"successIn": "シェル コマンド '{0}' が PATH に正常にインストールされました。",
-	"ok": "OK",
-	"cancel2": "キャンセル",
-	"warnEscalation": "管理者特権でシェル コマンドをインストールできるように、Code が 'osascript' のプロンプトを出します",
-	"cantCreateBinFolder": "'/usr/local/bin' を作成できません。",
-	"aborted": "中止されました",
-	"uninstall": "'{0}' コマンドを PATH からアンインストールします",
-	"successFrom": "シェル コマンド '{0}' が PATH から正常にアンインストールされました。",
-	"shellCommand": "シェル コマンド"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/codeEditor/electron-browser/accessibility.i18n.json b/i18n/jpn/src/vs/workbench/parts/codeEditor/electron-browser/accessibility.i18n.json
deleted file mode 100644
index a58b652a6cc..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/codeEditor/electron-browser/accessibility.i18n.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"emergencyConfOn": "現在 `editor.accessibilitySupport` 設定を 'on' に変更しています。",
-	"openingDocs": "現在 VS Code のアクセシビリティ ドキュメントページを開いています。",
-	"introMsg": "VS Code のアクセシビリティ オプションをご利用いただき、ありがとうございます。",
-	"status": "ステータス:",
-	"changeConfigToOnMac": "スクリーン リーダーで使用するためにエディターを永続的に最適化するように設定するには、Command + E を押してください。",
-	"changeConfigToOnWinLinux": "スクリーン リーダーで使用するためにエディターを永続的に最適化するように設定するには、Control + E を押してください。",
-	"auto_unknown": "エディターは、プラットフォーム API を使用してスクリーン リーダーがいつ接続されたかを検出するように設定されていますが、現在のランタイムはこれをサポートしていません。",
-	"auto_on": "エディターはスクリーン リーダーの接続を自動検出しました。",
-	"auto_off": "エディターは、スクリーン リーダーが接続されると自動的に検出するように構成されていますが、今回は検出できませんでした。",
-	"configuredOn": "エディターはスクリーン リーダーで使用するために永続的に最適化されるように設定されています。これは `editor.accessibilitySupport` の設定を編集することで変更できます。",
-	"configuredOff": "エディターはスクリーン リーダー向けに最適化しないように構成されています。",
-	"tabFocusModeOnMsg": "現在のエディターで Tab キーを押すと、次のフォーカス可能な要素にフォーカスを移動します。{0} を押すと、この動作が切り替わります。",
-	"tabFocusModeOnMsgNoKb": "現在のエディターで Tab キーを押すと、次のフォーカス可能な要素にフォーカスを移動します。コマンド {0} は、キー バインドでは現在トリガーできません。",
-	"tabFocusModeOffMsg": "現在のエディターで Tab キーを押すと、タブ文字が挿入されます。{0} を押すと、この動作が切り替わります。",
-	"tabFocusModeOffMsgNoKb": "現在のエディターで Tab キーを押すと、タブ文字が挿入されます。コマンド {0} は、キー バインドでは現在トリガーできません。",
-	"openDocMac": "command + H キーを押して、ブラウザー ウィンドウを今すぐ開き、アクセシビリティに関連する他の VS Code 情報を確認します。",
-	"openDocWinLinux": "Ctrl + H キーを押して、ブラウザー ウィンドウを今すぐ開き、アクセシビリティに関連する他の VS Code 情報を確認します。",
-	"outroMsg": "Esc キー か Shift+Esc を押すと、ヒントを消してエディターに戻ることができます。",
-	"ShowAccessibilityHelpAction": "アクセシビリティのヘルプを表示"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/codeEditor/electron-browser/inspectKeybindings.i18n.json b/i18n/jpn/src/vs/workbench/parts/codeEditor/electron-browser/inspectKeybindings.i18n.json
deleted file mode 100644
index 2aba45f3707..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/codeEditor/electron-browser/inspectKeybindings.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"workbench.action.inspectKeyMap": "開発者: キー マッピングを検査する"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/codeEditor/electron-browser/inspectTMScopes.i18n.json b/i18n/jpn/src/vs/workbench/parts/codeEditor/electron-browser/inspectTMScopes.i18n.json
deleted file mode 100644
index 1e4f9dabdb2..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/codeEditor/electron-browser/inspectTMScopes.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"inspectTMScopes": "開発者: TM スコープの検査",
-	"inspectTMScopesWidget.loading": "読み込んでいます..."
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/codeEditor/electron-browser/languageConfiguration/languageConfigurationExtensionPoint.i18n.json b/i18n/jpn/src/vs/workbench/parts/codeEditor/electron-browser/languageConfiguration/languageConfigurationExtensionPoint.i18n.json
deleted file mode 100644
index 716fe074491..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/codeEditor/electron-browser/languageConfiguration/languageConfigurationExtensionPoint.i18n.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"parseErrors": "{0} を解析中のエラー: {1}",
-	"schema.openBracket": "左角かっこまたは文字列シーケンス。",
-	"schema.closeBracket": "右角かっこまたは文字列シーケンス。",
-	"schema.comments": "コメント記号を定義します。",
-	"schema.blockComments": "ブロック コメントのマーク方法を定義します。",
-	"schema.blockComment.begin": "ブロック コメントを開始する文字シーケンス。",
-	"schema.blockComment.end": "ブロック コメントを終了する文字シーケンス。",
-	"schema.lineComment": "行コメントを開始する文字シーケンス。",
-	"schema.brackets": "インデントを増減する角かっこを定義します。",
-	"schema.autoClosingPairs": "角かっこのペアを定義します。左角かっこが入力されると、右角かっこが自動的に挿入されます。",
-	"schema.autoClosingPairs.notIn": "自動ペアが無効なスコープの一覧を定義します。",
-	"schema.surroundingPairs": "選択文字列を囲むときに使用できる角かっこのペアを定義します。",
-	"schema.wordPattern": "言語のための単語の定義。",
-	"schema.wordPattern.pattern": "言葉の照合に使用する正規表現パターン。",
-	"schema.wordPattern.flags": "言葉の照合に使用する正規表現フラグ。",
-	"schema.wordPattern.flags.errorMessage": "`/^([gimuy]+)$/` パターンに一致する必要があります。",
-	"schema.indentationRules": "言語のインデント設定。",
-	"schema.indentationRules.increaseIndentPattern": "ある行がこのパターンと一致する場合は、それ以降のすべての行を一度インデントする必要があります (別のルールが一致するまで) 。",
-	"schema.indentationRules.increaseIndentPattern.pattern": "increaseIndentPattern に使用する正規表現パターン。",
-	"schema.indentationRules.increaseIndentPattern.flags": "increaseIndentPattern に使用する正規表現フラグ。",
-	"schema.indentationRules.increaseIndentPattern.errorMessage": "`/^([gimuy]+)$/` パターンに一致する必要があります。",
-	"schema.indentationRules.decreaseIndentPattern": "ある行がこのパターンに一致する場合は、それ以降のすべての行は一度アンインデントする必要があります (別のルールが一致するまで) 。",
-	"schema.indentationRules.decreaseIndentPattern.pattern": "decreaseIndentPattern に使用する正規表現パターン。",
-	"schema.indentationRules.decreaseIndentPattern.flags": "decreaseIndentPattern に使用する正規表現フラグ。",
-	"schema.indentationRules.decreaseIndentPattern.errorMessage": "`/^([gimuy]+)$/` パターンに一致する必要があります。",
-	"schema.indentationRules.indentNextLinePattern": "ある行がこのパターンと一致する場合は、**次の行のみ** を一度インデントする必要があります。",
-	"schema.indentationRules.indentNextLinePattern.pattern": "indentNextLinePattern に使用する正規表現パターン。",
-	"schema.indentationRules.indentNextLinePattern.flags": "indentNextLinePattern に使用する正規表現フラグ。",
-	"schema.indentationRules.indentNextLinePattern.errorMessage": "`/^([gimuy]+)$/` パターンに一致する必要があります。",
-	"schema.indentationRules.unIndentedLinePattern": "ある行がこのパターンと一致する場合は、そのインデントを変更してはならず、他のルールに対して評価してもなりません。",
-	"schema.indentationRules.unIndentedLinePattern.pattern": "unIndentedLinePattern に使用する正規表現パターン。",
-	"schema.indentationRules.unIndentedLinePattern.flags": "unIndentedLinePattern に使用する正規表現フラグ。",
-	"schema.indentationRules.unIndentedLinePattern.errorMessage": "`/^([gimuy]+)$/` パターンに一致する必要があります。",
-	"schema.folding": "言語の折り畳み設定。",
-	"schema.folding.offSide": "その言語のブロックがインデントで表現されている場合、言語はオフサイドルールに従います。 設定されている場合、空行は後続のブロックに属します。",
-	"schema.folding.markers": "'#region'や '#endregion'などの言語固有の折りたたみマーカー。開始と終了の正規表現はすべての行の内容に対してテストし効率的に設計してください。",
-	"schema.folding.markers.start": "開始マーカーの正規表現パターン。 正規表現は '^' で始めてください。",
-	"schema.folding.markers.end": "終了マーカーの正規表現パターン。 正規表現は '^' で始めてください。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/codeEditor/electron-browser/largeFileOptimizations.i18n.json b/i18n/jpn/src/vs/workbench/parts/codeEditor/electron-browser/largeFileOptimizations.i18n.json
deleted file mode 100644
index 370ce49161e..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/codeEditor/electron-browser/largeFileOptimizations.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"largeFile": "{0}: トークン化、折り返し、折りたたみは、メモリの使用量を減らしてフリーズやクラッシュを回避するために、この大きいファイルで無効化されています。",
-	"neverShowAgain": "OK、今後は表示しない",
-	"removeOptimizations": "強制的に機能を有効化",
-	"reopenFilePrompt": "この設定を有効にするためにファイルを再度開いてください。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/codeEditor/electron-browser/textMate/inspectTMScopes.i18n.json b/i18n/jpn/src/vs/workbench/parts/codeEditor/electron-browser/textMate/inspectTMScopes.i18n.json
deleted file mode 100644
index 67618a8b5e1..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/codeEditor/electron-browser/textMate/inspectTMScopes.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"inspectTMScopes": "開発者: TM スコープの検査",
-	"inspectTMScopesWidget.loading": "読み込んでいます..."
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/codeEditor/electron-browser/toggleMinimap.i18n.json b/i18n/jpn/src/vs/workbench/parts/codeEditor/electron-browser/toggleMinimap.i18n.json
deleted file mode 100644
index 465ad161ad9..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/codeEditor/electron-browser/toggleMinimap.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleMinimap": "表示: ミニマップの切り替え"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/codeEditor/electron-browser/toggleMultiCursorModifier.i18n.json b/i18n/jpn/src/vs/workbench/parts/codeEditor/electron-browser/toggleMultiCursorModifier.i18n.json
deleted file mode 100644
index cb56f95f2b8..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/codeEditor/electron-browser/toggleMultiCursorModifier.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleLocation": "マルチカーソル修飾子の切り替え"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderControlCharacter.i18n.json b/i18n/jpn/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderControlCharacter.i18n.json
deleted file mode 100644
index cb1849eb7ae..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderControlCharacter.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleRenderControlCharacters": "表示: 制御文字の切り替え"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderWhitespace.i18n.json b/i18n/jpn/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderWhitespace.i18n.json
deleted file mode 100644
index 888a38817b8..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderWhitespace.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleRenderWhitespace": "表示: 空白文字の表示の切り替え"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/codeEditor/electron-browser/toggleWordWrap.i18n.json b/i18n/jpn/src/vs/workbench/parts/codeEditor/electron-browser/toggleWordWrap.i18n.json
deleted file mode 100644
index 8aefa19c532..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/codeEditor/electron-browser/toggleWordWrap.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggle.wordwrap": "表示: [右端で折り返す] の設定/解除",
-	"wordWrap.notInDiffEditor": "差分エディターで折り返しの切り替えができません。",
-	"unwrapMinified": "このファイルでの折り返しを無効にする",
-	"wrapMinified": "このファイルでの折り返しを有効にする"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/codeEditor/electron-browser/wordWrapMigration.i18n.json b/i18n/jpn/src/vs/workbench/parts/codeEditor/electron-browser/wordWrapMigration.i18n.json
deleted file mode 100644
index 9ce40f5a86a..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/codeEditor/electron-browser/wordWrapMigration.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"wordWrapMigration.ok": "OK",
-	"wordWrapMigration.dontShowAgain": "今後は表示しない",
-	"wordWrapMigration.openSettings": "設定を開く",
-	"wordWrapMigration.prompt": "設定 'editor.wrappingColumn' は使用されなくなりました。'editor.wordWrap' を使用してください。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/debug/browser/breakpointWidget.i18n.json b/i18n/jpn/src/vs/workbench/parts/debug/browser/breakpointWidget.i18n.json
deleted file mode 100644
index a31c66c4d32..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/debug/browser/breakpointWidget.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"breakpointWidgetExpressionPlaceholder": "式が true と評価される場合に中断します。'Enter' を押して受け入れるか 'Esc' を押して取り消します。",
-	"breakpointWidgetAriaLabel": "この条件が true の場合にのみプログラムはこの位置で停止します。Enter を押して受け入れるか、Esc を押して取り消します。",
-	"breakpointWidgetHitCountPlaceholder": "ヒット カウント条件が満たされる場合に中断します。'Enter' を押して受け入れるか 'Esc' を押して取り消します。",
-	"breakpointWidgetHitCountAriaLabel": "ヒット カウントが満たされる場合にのみプログラムはこの位置で停止します。Enter を押して受け入れるか、Esc を押して取り消します。",
-	"expression": "式",
-	"hitCount": "ヒット カウント"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json b/i18n/jpn/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
deleted file mode 100644
index 04da69ca72e..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"logPoint": "ログポイント",
-	"breakpoint": "ブレークポイント",
-	"editBreakpoint": "{0} を編集...",
-	"removeBreakpoint": "{0} を削除",
-	"functionBreakpointsNotSupported": "このデバッグの種類では関数ブレークポイントはサポートされていません",
-	"functionBreakpointPlaceholder": "中断対象の関数",
-	"functionBreakPointInputAriaLabel": "関数ブレークポイントを入力します",
-	"breakpointDisabledHover": "無効なブレークポイント",
-	"breakpointUnverifieddHover": "未確認のブレークポイント",
-	"functionBreakpointUnsupported": "このデバッグの種類では関数ブレークポイントはサポートされていません",
-	"breakpointDirtydHover": "未確認のブレークポイント。ファイルは変更されているので、デバッグ セッションを再起動してください。",
-	"logBreakpointUnsupported": "ログポイントは、このデバッグの種類ではサポートされていません",
-	"conditionalBreakpointUnsupported": "このデバッグの種類では、条件付きブレークポイントはサポートされていません。",
-	"hitBreakpointUnsupported": "このデバッグの種類では、ヒットした条件付きブレークポイントはサポートされていません。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/debug/browser/debugActionItems.i18n.json b/i18n/jpn/src/vs/workbench/parts/debug/browser/debugActionItems.i18n.json
deleted file mode 100644
index 2aabd470587..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/debug/browser/debugActionItems.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noConfigurations": "構成がありません",
-	"addConfigTo": "設定 ({0}) の追加 ...",
-	"addConfiguration": "構成の追加..."
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/debug/browser/debugActions.i18n.json b/i18n/jpn/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
deleted file mode 100644
index f154d6f46bc..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openLaunchJson": "{0} を開く",
-	"launchJsonNeedsConfigurtion": "'launch.json' の構成や修正",
-	"noFolderDebugConfig": "高度なデバッグ構成を行うには、最初にフォルダーを開いてください。",
-	"startDebug": "デバッグの開始",
-	"startWithoutDebugging": "デバッグなしで開始",
-	"selectAndStartDebugging": "選択してデバッグを開始",
-	"restartDebug": "再起動",
-	"reconnectDebug": "再接続",
-	"stepOverDebug": "ステップ オーバー",
-	"stepIntoDebug": "ステップ インする",
-	"stepOutDebug": "ステップ アウト",
-	"stopDebug": "停止",
-	"disconnectDebug": "切断",
-	"continueDebug": "続行",
-	"pauseDebug": "一時停止",
-	"terminateThread": "スレッドを終了",
-	"restartFrame": "フレームの再起動",
-	"removeBreakpoint": "ブレークポイントの削除",
-	"removeAllBreakpoints": "すべてのブレークポイントを削除する",
-	"enableAllBreakpoints": "すべてのブレークポイントを有効にする",
-	"disableAllBreakpoints": "すべてのブレークポイントを無効にする",
-	"activateBreakpoints": "ブレークポイントのアクティブ化",
-	"deactivateBreakpoints": "ブレークポイントの非アクティブ化",
-	"reapplyAllBreakpoints": "すべてのブレークポイントを再適用する",
-	"addFunctionBreakpoint": "関数ブレークポイントの追加",
-	"setValue": "値の設定",
-	"addWatchExpression": "式の追加",
-	"editWatchExpression": "式の編集",
-	"addToWatchExpressions": "ウォッチに追加",
-	"removeWatchExpression": "式の削除",
-	"removeAllWatchExpressions": "すべての式を削除する",
-	"clearRepl": "コンソールのクリア",
-	"debugConsoleAction": "デバッグ コンソール",
-	"unreadOutput": "デバッグ コンソールでの新しい出力",
-	"debugFocusConsole": "デバッグ コンソールにフォーカスを移動",
-	"focusSession": "セッションにフォーカス",
-	"stepBackDebug": "1 つ戻る",
-	"reverseContinue": "反転"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/debug/browser/debugActionsWidget.i18n.json b/i18n/jpn/src/vs/workbench/parts/debug/browser/debugActionsWidget.i18n.json
deleted file mode 100644
index 5de2170d297..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/debug/browser/debugActionsWidget.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"debugToolBarBackground": "デバッグ ツール バーの背景色。",
-	"debugToolBarBorder": "デバッグ ツール バーの境界線色。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/debug/browser/debugCommands.i18n.json b/i18n/jpn/src/vs/workbench/parts/debug/browser/debugCommands.i18n.json
deleted file mode 100644
index f9aac9e0f80..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/debug/browser/debugCommands.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noFolderDebugConfig": "高度なデバッグ構成を行うには、最初にフォルダーを開いてください。",
-	"inlineBreakpoint": "インライン ブレークポイント",
-	"debug": "デバッグ",
-	"addInlineBreakpoint": "インライン ブレークポイントを追加"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/debug/browser/debugContentProvider.i18n.json b/i18n/jpn/src/vs/workbench/parts/debug/browser/debugContentProvider.i18n.json
deleted file mode 100644
index 3909fd76648..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/debug/browser/debugContentProvider.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"unable": "デバッグ セッションなしでリソースを解決できません",
-	"canNotResolveSource": "リソース {0} を解決できませんでした。デバッグ拡張機能から応答がありません。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json b/i18n/jpn/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
deleted file mode 100644
index eb83945b7d0..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleBreakpointAction": "デバッグ: ブレークポイントの切り替え",
-	"conditionalBreakpointEditorAction": "デバッグ: 条件付きブレークポイントの追加...",
-	"logPointEditorAction": "デバッグ: ログポイントの追加...",
-	"runToCursor": "カーソル行の前まで実行",
-	"debugEvaluate": "デバッグ: 評価",
-	"debugAddToWatch": "デバッグ: ウォッチに追加",
-	"showDebugHover": "デバッグ: ホバーの表示",
-	"goToNextBreakpoint": "デバッグ： 次のブレークポイントへ移動",
-	"goToPreviousBreakpoint": "デバッグ： 前のブレークポイントへ移動"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/debug/browser/debugEditorModelManager.i18n.json b/i18n/jpn/src/vs/workbench/parts/debug/browser/debugEditorModelManager.i18n.json
deleted file mode 100644
index 6a2a2307401..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/debug/browser/debugEditorModelManager.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"breakpointDisabledHover": "無効なブレークポイント",
-	"breakpointUnverifieddHover": "未確認のブレークポイント",
-	"breakpointDirtydHover": "未確認のブレークポイント。ファイルは変更されているので、デバッグ セッションを再起動してください。",
-	"breakpointUnsupported": "このデバッグの種類では、条件付きブレークポイントはサポートされていません。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/debug/browser/debugQuickOpen.i18n.json b/i18n/jpn/src/vs/workbench/parts/debug/browser/debugQuickOpen.i18n.json
deleted file mode 100644
index 39b690741db..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/debug/browser/debugQuickOpen.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"entryAriaLabel": "{0}、デバッグ",
-	"debugAriaLabel": "実行する起動構成の名前を入力してください。",
-	"addConfigTo": "構成 ({0}) の追加...",
-	"addConfiguration": "構成の追加...",
-	"noConfigurationsMatching": "一致するデバッグ構成はありません",
-	"noConfigurationsFound": "デバッグ構成が見つかりません。'launch.json' ファイルを作成してください。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/debug/browser/debugStatus.i18n.json b/i18n/jpn/src/vs/workbench/parts/debug/browser/debugStatus.i18n.json
deleted file mode 100644
index fb3e69967d2..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/debug/browser/debugStatus.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"selectAndStartDebug": "選択してデバッグ構成を開始"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/debug/browser/debugViewlet.i18n.json b/i18n/jpn/src/vs/workbench/parts/debug/browser/debugViewlet.i18n.json
deleted file mode 100644
index 9ef2472b686..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/debug/browser/debugViewlet.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"startAdditionalSession": "追加のセッションを開始",
-	"debugFocusVariablesView": "変数にフォーカス",
-	"debugFocusWatchView": "ウォッチにフォーカス",
-	"debugFocusCallStackView": "コールスタックにフォーカス",
-	"debugFocusBreakpointsView": "ブレークポイントにフォーカス"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/debug/browser/exceptionWidget.i18n.json b/i18n/jpn/src/vs/workbench/parts/debug/browser/exceptionWidget.i18n.json
deleted file mode 100644
index cd85a698278..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/debug/browser/exceptionWidget.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"debugExceptionWidgetBorder": "例外ウィジェットの境界線の色。",
-	"debugExceptionWidgetBackground": "例外ウィジェットの背景色。",
-	"exceptionThrownWithId": "例外が発生しました: {0}",
-	"exceptionThrown": "例外が発生しました"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/debug/browser/linkDetector.i18n.json b/i18n/jpn/src/vs/workbench/parts/debug/browser/linkDetector.i18n.json
deleted file mode 100644
index 25bfbffe6bd..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/debug/browser/linkDetector.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"fileLinkMac": "クリックして従う (Cmd を押しながらクリックすると横に開きます)",
-	"fileLink": "クリックして従う (Ctrl を押しながらクリックすると横に開きます)"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/debug/browser/statusbarColorProvider.i18n.json b/i18n/jpn/src/vs/workbench/parts/debug/browser/statusbarColorProvider.i18n.json
deleted file mode 100644
index 7fafcaff947..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/debug/browser/statusbarColorProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"statusBarDebuggingBackground": "プログラムをデバッグしているときのステータス バーの背景色。ステータス バーはウィンドウの下部に表示されます",
-	"statusBarDebuggingForeground": "プログラムをデバッグしているときのステータス バーの前景色。ステータス バーはウィンドウの下部に表示されます",
-	"statusBarDebuggingBorder": "プログラムをデバッグしているときのサイドバーおよびエディターを隔てるステータス バーの境界線の色。ステータス バーはウィンドウの下部に表示されます"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/debug/common/debug.i18n.json b/i18n/jpn/src/vs/workbench/parts/debug/common/debug.i18n.json
deleted file mode 100644
index 206552fd54d..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/debug/common/debug.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"internalConsoleOptions": "内部デバッグ コンソールの動作を制御します。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/debug/common/debugModel.i18n.json b/i18n/jpn/src/vs/workbench/parts/debug/common/debugModel.i18n.json
deleted file mode 100644
index 57f95e42cc7..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/debug/common/debugModel.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"notAvailable": "使用できません",
-	"startDebugFirst": "デバッグ セッションを開始して評価してください"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/debug/common/debugSchemas.i18n.json b/i18n/jpn/src/vs/workbench/parts/debug/common/debugSchemas.i18n.json
deleted file mode 100644
index f4ab983e565..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/debug/common/debugSchemas.i18n.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.contributes.debuggers": "デバッグ アダプターを提供します。",
-	"vscode.extension.contributes.debuggers.type": "このデバッグ アダプターの一意識別子。",
-	"vscode.extension.contributes.debuggers.label": "このデバッグ アダプターの表示名。",
-	"vscode.extension.contributes.debuggers.program": "デバッグ アダプター プログラムへのパス。絶対パスか拡張機能フォルダーへの相対パスです。",
-	"vscode.extension.contributes.debuggers.args": "アダプターに渡すオプションの引数。",
-	"vscode.extension.contributes.debuggers.runtime": "プログラム属性が実行可能でなく、ランタイムが必要な場合のオプション ランタイム。",
-	"vscode.extension.contributes.debuggers.runtimeArgs": "オプションのランタイム引数。",
-	"vscode.extension.contributes.debuggers.variables": "`launch.json` 内の対話型の変数 (例: ${action.pickProcess}) からコマンドへマッピングしています。",
-	"vscode.extension.contributes.debuggers.initialConfigurations": "初期 'launch.json' を生成するための構成。",
-	"vscode.extension.contributes.debuggers.languages": "デバッグ拡張機能が \"既定のデバッガー\" とされる言語の一覧。",
-	"vscode.extension.contributes.debuggers.adapterExecutableCommand": "指定されている場合、VS Code はこのコマンドを呼び出し、デバッグ アダプターの実行可能パスと、渡す引数を決定します。",
-	"vscode.extension.contributes.debuggers.configurationSnippets": "'launch.json' に新しい構成を追加するためのスニペット。",
-	"vscode.extension.contributes.debuggers.configurationAttributes": "'launch.json' を検証するための JSON スキーマ構成。",
-	"vscode.extension.contributes.debuggers.windows": "Windows 固有の設定。",
-	"vscode.extension.contributes.debuggers.windows.runtime": "Windows で使用されるランタイム。",
-	"vscode.extension.contributes.debuggers.osx": "macOS 固有の設定。",
-	"vscode.extension.contributes.debuggers.osx.runtime": "macOS で使用されるランタイム。",
-	"vscode.extension.contributes.debuggers.linux": "Linux 固有の設定。",
-	"vscode.extension.contributes.debuggers.linux.runtime": "Linux で使用されるランタイム。",
-	"vscode.extension.contributes.breakpoints": "ブレークポイントを提供します。",
-	"vscode.extension.contributes.breakpoints.language": "この言語でブレークポイントを許可します。",
-	"app.launch.json.title": "起動",
-	"app.launch.json.version": "このファイル形式のバージョン。",
-	"app.launch.json.configurations": "構成の一覧。IntelliSense を使用して、新しい構成を追加したり、既存の構成を編集したります。",
-	"app.launch.json.compounds": "複合の一覧。各複合は、同時に起動される複数の構成を参照します。",
-	"app.launch.json.compound.name": "複合の名前。起動構成のドロップダウン メニューに表示されます。",
-	"useUniqueNames": "一意の構成名を使用してください。",
-	"app.launch.json.compound.folder": "複合があるフォルダーの名前。",
-	"app.launch.json.compounds.configurations": "この複合の一部として開始される構成の名前。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/debug/common/debugSource.i18n.json b/i18n/jpn/src/vs/workbench/parts/debug/common/debugSource.i18n.json
deleted file mode 100644
index 8f0b9b21a9c..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/debug/common/debugSource.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"unknownSource": "不明なソース"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json b/i18n/jpn/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
deleted file mode 100644
index 46a0d6b70e2..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"breakpointWidgetLogMessagePlaceholder": "ブレークポイントにヒットしたときにログに記録するメッセージ。{} 内の式は補間されます。受け入れるには 'Enter' を、キャンセルするには 'esc' を押します。",
-	"breakpointWidgetHitCountPlaceholder": "ヒット カウント条件が満たされる場合に中断します。'Enter' を押して受け入れるか 'Esc' を押して取り消します。",
-	"breakpointWidgetExpressionPlaceholder": "式が true と評価される場合に中断します。'Enter' を押して受け入れるか 'Esc' を押して取り消します。",
-	"expression": "式",
-	"hitCount": "ヒット カウント",
-	"logMessage": "ログ メッセージ"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/debug/electron-browser/breakpointsView.i18n.json b/i18n/jpn/src/vs/workbench/parts/debug/electron-browser/breakpointsView.i18n.json
deleted file mode 100644
index 967aadf3291..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/debug/electron-browser/breakpointsView.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"editConditionalBreakpoint": "ブレークポイントの編集...",
-	"functionBreakpointsNotSupported": "このデバッグの種類では関数ブレークポイントはサポートされていません",
-	"functionBreakpointPlaceholder": "中断対象の関数",
-	"functionBreakPointInputAriaLabel": "関数ブレークポイントを入力します"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/debug/electron-browser/callStackView.i18n.json b/i18n/jpn/src/vs/workbench/parts/debug/electron-browser/callStackView.i18n.json
deleted file mode 100644
index 7c405a1093e..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/debug/electron-browser/callStackView.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"callstackSection": "コール スタック セクション",
-	"debugStopped": "{0} で一時停止",
-	"callStackAriaLabel": "コール スタックのデバッグ",
-	"session": "セッション",
-	"paused": "一時停止",
-	"running": "実行中",
-	"thread": "スレッド",
-	"pausedOn": "{0} で一時停止",
-	"loadMoreStackFrames": "スタック フレームをさらに読み込む",
-	"threadAriaLabel": "スレッド {0}、呼び出しスタック、デバッグ",
-	"stackFrameAriaLabel": "スタック フレーム {0} 行 {1} {2}、呼び出しスタック、デバッグ"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json b/i18n/jpn/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
deleted file mode 100644
index d168fc00cab..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleDebugViewlet": "デバッグの表示",
-	"toggleDebugPanel": "デバッグ コンソール",
-	"debug": "デバッグ",
-	"debugPanel": "デバッグ コンソール",
-	"variables": "変数",
-	"watch": "ウォッチ式",
-	"callStack": "コール スタック",
-	"breakpoints": "ブレークポイント",
-	"view": "表示",
-	"debugCategory": "デバッグ",
-	"debugCommands": "デバッグ構成",
-	"debugConfigurationTitle": "デバッグ",
-	"allowBreakpointsEverywhere": "任意のファイルにブレークポイントを設定できるようにする",
-	"openExplorerOnEnd": "デバッグ セッションの終わりにエクスプローラ ビューを自動的に開きます",
-	"inlineValues": "デバッグ中にエディターの行内に変数値を表示します",
-	"toolBarLocation": "デバッグ ツールバーの位置を制御します。\"floating\" はすべてのビュー内、 \"docked\" はデバッグ ビュー内、または \"hidden\" のいずれかです",
-	"never": "今後ステータス バーにデバッグを表示しない",
-	"always": "ステータス バーにデバッグを常に表示する",
-	"onFirstSessionStart": "初めてデバッグが開始されたときのみステータス バーにデバッグを表示する",
-	"showInStatusBar": "デバッグのステータス バーが表示されるタイミングを制御",
-	"openDebug": "デバッグ ビューを開くか、デバッグ セッションを開始するかを制御します。",
-	"enableAllHovers": "デバッグ中に非デバッグ ホバーを有効にするかどうかを制御します。true の場合、ホバーを提供するためにホバー プロバイダーが呼び出されます。この設定が true でも通常のホバーは表示されません。",
-	"launch": "グローバル デバッグ起動構成。ワークスペース間で共有される 'launch.json' の代わりとして使用する必要があります"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/debug/electron-browser/debugCommands.i18n.json b/i18n/jpn/src/vs/workbench/parts/debug/electron-browser/debugCommands.i18n.json
deleted file mode 100644
index 9432105e17b..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/debug/electron-browser/debugCommands.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noFolderDebugConfig": "高度なデバッグ構成を行うには、最初にフォルダーを開いてください。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json b/i18n/jpn/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json
deleted file mode 100644
index 14f4e7bbbb9..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"debugNoType": "デバッガー 'type' は省略不可で、'string' 型でなければなりません。",
-	"selectDebug": "環境の選択",
-	"DebugConfig.failed": "'launch.json' ファイルを '.vscode' フォルダー ({0}) 内に作成できません。",
-	"workspace": "ワークスペース",
-	"user settings": "ユーザー設定"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json b/i18n/jpn/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
deleted file mode 100644
index 566c067b7ee..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"logPoint": "ログポイント",
-	"breakpoint": "ブレークポイント",
-	"removeBreakpoint": "{0} を削除",
-	"editBreakpoint": "{0} を編集...",
-	"disableBreakpoint": "{0} を無効にする",
-	"enableBreakpoint": "{0} を有効にする",
-	"removeBreakpoints": "ブレークポイントの削除",
-	"removeInlineBreakpointOnColumn": "列 {0} のインライン ブレークポイントを削除",
-	"removeLineBreakpoint": "行のブレークポイントの削除",
-	"editBreakpoints": "ブレークポイントの編集",
-	"editInlineBreakpointOnColumn": "列 {0} のインライン ブレークポイントを編集",
-	"editLineBrekapoint": "行のブレークポイントの編集",
-	"enableDisableBreakpoints": "ブレークポイントの有効化/無効化",
-	"disableInlineColumnBreakpoint": "列 {0} のインライン ブレークポイントを無効化",
-	"disableBreakpointOnLine": "行のブレークポイントの無効化",
-	"enableBreakpoints": "列 {0} のインライン ブレークポイントを有効化",
-	"enableBreakpointOnLine": "行のブレークポイントの有効化",
-	"addBreakpoint": "ブレークポイントの追加",
-	"addConditionalBreakpoint": "条件付きブレークポイントの追加...",
-	"addLogPoint": "ログポイントを追加...",
-	"breakpointHasCondition": "この {0} には削除時に失われる {1} があります。代わりに {0} を無効にすることを検討してください。",
-	"message": "メッセージ",
-	"condition": "条件",
-	"removeLogPoint": "{0} を削除",
-	"disableLogPoint": "{0} を無効にする",
-	"cancel": "キャンセル",
-	"addConfiguration": "構成の追加..."
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/debug/electron-browser/debugHover.i18n.json b/i18n/jpn/src/vs/workbench/parts/debug/electron-browser/debugHover.i18n.json
deleted file mode 100644
index 732921cca6e..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/debug/electron-browser/debugHover.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"treeAriaLabel": "デバッグ ホバー"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json b/i18n/jpn/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
deleted file mode 100644
index 94c8c8c8a16..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"snapshotObj": "このオブジェクトのプリミティブ値のみ表示されます。",
-	"debuggingPaused": "デバッグは一時停止されました、理由 {0}、{1} {2}",
-	"debuggingStarted": "デバッグは開始されました。",
-	"debuggingStopped": "デバッグは停止されました。",
-	"breakpointAdded": "ブレークポイントを追加しました。行 {0}、ファイル {1}",
-	"breakpointRemoved": "ブレークポイントを削除しました。行 {0}、ファイル {1}",
-	"compoundMustHaveConfigurations": "複合構成を開始するには、複合に \"configurations\" 属性が設定されている必要があります。",
-	"noConfigurationNameInWorkspace": "ワークスペースに起動構成 '{0}' が見つかりませんでした。",
-	"multipleConfigurationNamesInWorkspace": "ワークスペースに複数の起動構成 '{0}' があります。フォルダー名を使用して構成を修飾してください。",
-	"noFolderWithName": "複合 '{2}' の構成 '{1}' で、名前 '{0}' を含むフォルダーが見つかりませんでした。",
-	"configMissing": "構成 '{0}' が 'launch.json' 内にありません。",
-	"launchJsonDoesNotExist": "'launch.json' は存在しません。",
-	"debugRequestNotSupported": "選択しているデバッグ構成で '{0}' 属性はサポートされない値 '{1}' を指定しています。",
-	"debugRequesMissing": "選択しているデバッグ構成に属性 '{0}' が含まれていません。",
-	"debugTypeNotSupported": "構成されているデバッグの種類 '{0}' はサポートされていません。",
-	"debugTypeMissing": "選択された起動構成のプロパティ 'type' がありません。",
-	"debugAnyway": "このままデバッグを続ける",
-	"preLaunchTaskErrors": "preLaunchTask '{0}' の実行中にビルド エラーが検出されました。",
-	"preLaunchTaskError": "preLaunchTask '{0}' の実行中にビルド エラーが検出されました。",
-	"preLaunchTaskExitCode": "preLaunchTask '{0}' が終了コード {1} で終了しました。",
-	"showErrors": "エラーの表示",
-	"noFolderWorkspaceDebugError": "アクティブ ファイルをデバッグできません。ファイルがディスクに保存されており、そのファイル タイプのデバッグ拡張機能がインストールされていることを確認してください。",
-	"cancel": "キャンセル",
-	"DebugTaskNotFound": "タスク '{0}' を見つけられませんでした。",
-	"taskNotTracked": "タスク '{0}' を追跡できません。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/debug/electron-browser/debugViewer.i18n.json b/i18n/jpn/src/vs/workbench/parts/debug/electron-browser/debugViewer.i18n.json
deleted file mode 100644
index c5d93f01d5f..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/debug/electron-browser/debugViewer.i18n.json
+++ /dev/null
@@ -1,28 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"process": "プロセス",
-	"paused": "一時停止",
-	"running": "実行しています",
-	"thread": "スレッド",
-	"pausedOn": "{0} で一時停止",
-	"loadMoreStackFrames": "スタック フレームをさらに読み込む",
-	"threadAriaLabel": "スレッド {0}、呼び出しスタック、デバッグ",
-	"stackFrameAriaLabel": "スタック フレーム {0} 行 {1} {2}、呼び出しスタック、デバッグ",
-	"variableValueAriaLabel": "新しい変数値を入力する",
-	"variableScopeAriaLabel": "範囲 {0}、変数、デバッグ",
-	"variableAriaLabel": "{0} 値 {1}、変数、デバッグ",
-	"watchExpressionPlaceholder": "ウォッチ対象の式",
-	"watchExpressionInputAriaLabel": "ウォッチ式を入力します",
-	"watchExpressionAriaLabel": "{0} 値 {1}、ウォッチ、デバッグ",
-	"watchVariableAriaLabel": "{0} 値 {1}、ウォッチ、デバッグ",
-	"functionBreakpointPlaceholder": "中断対象の関数",
-	"functionBreakPointInputAriaLabel": "関数ブレークポイントを入力します",
-	"functionBreakpointsNotSupported": "このデバッグの種類では関数ブレークポイントはサポートされていません",
-	"breakpointAriaLabel": "ブレークポイント行 {0} {1}、ブレークポイント、デバッグ",
-	"functionBreakpointAriaLabel": "関数ブレークポイント {0}、ブレークポイント、デバッグ",
-	"exceptionBreakpointAriaLabel": "例外ブレークポイント {0}、ブレークポイント、デバッグ"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/debug/electron-browser/debugViews.i18n.json b/i18n/jpn/src/vs/workbench/parts/debug/electron-browser/debugViews.i18n.json
deleted file mode 100644
index e6c7a195a3d..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/debug/electron-browser/debugViews.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"variablesSection": "変数セクション",
-	"variablesAriaTreeLabel": "変数のデバッグ",
-	"expressionsSection": "式セクション",
-	"watchAriaTreeLabel": "ウォッチ式のデバッグ",
-	"callstackSection": "コール スタック セクション",
-	"debugStopped": "{0} で一時停止",
-	"callStackAriaLabel": "コール スタックのデバッグ",
-	"breakpointsSection": "ブレークポイント セクション",
-	"breakpointsAriaTreeLabel": "デバッグ ブレークポイント"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/debug/electron-browser/electronDebugActions.i18n.json b/i18n/jpn/src/vs/workbench/parts/debug/electron-browser/electronDebugActions.i18n.json
deleted file mode 100644
index 93a52a63f2e..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/debug/electron-browser/electronDebugActions.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"copyValue": "値のコピー",
-	"copyAsExpression": "式としてコピー",
-	"copy": "コピー",
-	"copyAll": "すべてコピー",
-	"copyStackTrace": "呼び出し履歴のコピー"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/debug/electron-browser/rawDebugSession.i18n.json b/i18n/jpn/src/vs/workbench/parts/debug/electron-browser/rawDebugSession.i18n.json
deleted file mode 100644
index 262d8dacd54..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/debug/electron-browser/rawDebugSession.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"moreInfo": "詳細情報",
-	"debugAdapterCrash": "デバッグ アダプター プロセスが予期せず終了しました"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/debug/electron-browser/repl.i18n.json b/i18n/jpn/src/vs/workbench/parts/debug/electron-browser/repl.i18n.json
deleted file mode 100644
index 512d0bf249c..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/debug/electron-browser/repl.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"replAriaLabel": "Read Eval Print Loop パネル",
-	"actions.repl.historyPrevious": "前の履歴",
-	"actions.repl.historyNext": "次の履歴",
-	"actions.repl.acceptInput": "REPL での入力を反映",
-	"actions.repl.copyAll": "デバッグ: コンソールをすべてコピー"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/debug/electron-browser/replViewer.i18n.json b/i18n/jpn/src/vs/workbench/parts/debug/electron-browser/replViewer.i18n.json
deleted file mode 100644
index 67712f15fdd..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/debug/electron-browser/replViewer.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"stateCapture": "最初の評価からオブジェクトの状態がキャプチャされます",
-	"replVariableAriaLabel": "変数 {0} に値 {1} があります、Read Eval Print Loop、デバッグ",
-	"replExpressionAriaLabel": "式 {0} に値 {1} があります、Read Eval Print Loop、デバッグ",
-	"replValueOutputAriaLabel": "{0}、Read Eval Print Loop、デバッグ",
-	"replRawObjectAriaLabel": "Repl 変数 {0} に値 {1} があります、Read Eval Print Loop、デバッグ"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/debug/electron-browser/statusbarColorProvider.i18n.json b/i18n/jpn/src/vs/workbench/parts/debug/electron-browser/statusbarColorProvider.i18n.json
deleted file mode 100644
index 7fafcaff947..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/debug/electron-browser/statusbarColorProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"statusBarDebuggingBackground": "プログラムをデバッグしているときのステータス バーの背景色。ステータス バーはウィンドウの下部に表示されます",
-	"statusBarDebuggingForeground": "プログラムをデバッグしているときのステータス バーの前景色。ステータス バーはウィンドウの下部に表示されます",
-	"statusBarDebuggingBorder": "プログラムをデバッグしているときのサイドバーおよびエディターを隔てるステータス バーの境界線の色。ステータス バーはウィンドウの下部に表示されます"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json b/i18n/jpn/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json
deleted file mode 100644
index 13d471ad7b0..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"debug.terminal.title": "デバッグ対象"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/debug/electron-browser/variablesView.i18n.json b/i18n/jpn/src/vs/workbench/parts/debug/electron-browser/variablesView.i18n.json
deleted file mode 100644
index 71bb3586866..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/debug/electron-browser/variablesView.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"variablesSection": "変数セクション",
-	"variablesAriaTreeLabel": "変数のデバッグ",
-	"variableValueAriaLabel": "新しい変数値を入力する",
-	"variableScopeAriaLabel": "範囲 {0}、変数、デバッグ",
-	"variableAriaLabel": "{0} 値 {1}、変数、デバッグ"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/debug/electron-browser/watchExpressionsView.i18n.json b/i18n/jpn/src/vs/workbench/parts/debug/electron-browser/watchExpressionsView.i18n.json
deleted file mode 100644
index 80222426156..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/debug/electron-browser/watchExpressionsView.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"expressionsSection": "式セクション",
-	"watchAriaTreeLabel": "ウォッチ式のデバッグ",
-	"watchExpressionPlaceholder": "ウォッチ対象の式",
-	"watchExpressionInputAriaLabel": "ウォッチ式を入力します",
-	"watchExpressionAriaLabel": "{0} 値 {1}、ウォッチ、デバッグ",
-	"watchVariableAriaLabel": "{0} 値 {1}、ウォッチ、デバッグ"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json b/i18n/jpn/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
deleted file mode 100644
index 152d9f1c423..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"debugAdapterBinNotFound": "デバッグ アダプターの実行可能ファイル '{0}' がありません。",
-	"debugAdapterCannotDetermineExecutable": "デバッグ アダプター '{0}' の実行可能ファイルを判別できません。",
-	"unableToLaunchDebugAdapter": "デバッグ アダプターを {0} から起動できません。",
-	"unableToLaunchDebugAdapterNoArgs": "デバッグ アダプターを起動できません。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/debug/node/debugger.i18n.json b/i18n/jpn/src/vs/workbench/parts/debug/node/debugger.i18n.json
deleted file mode 100644
index af1ed513222..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/debug/node/debugger.i18n.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"launch.config.comment1": "IntelliSense を使用して利用可能な属性を学べます。",
-	"launch.config.comment2": "既存の属性の説明をホバーして表示します。",
-	"launch.config.comment3": "詳細情報は次を確認してください: {0}",
-	"debugType": "構成の種類。",
-	"debugTypeNotRecognised": "デバッグの種類は認識されませんでした。対応するデバッグの拡張機能がインストールされており、有効になっていることを確認してください。",
-	"node2NotSupported": "\"node2\" はサポートされていません。代わりに \"node\" を使用し、\"protocol\" 属性を \"inspector\" に設定してください。",
-	"debugName": "構成の名前。起動構成のドロップダウン メニューに表示されます。",
-	"debugRequest": "構成の要求の種類。\"launch\" または \"attach\" です。",
-	"debugServer": "デバッグ拡張機能の開発のみ。ポートが指定の VS Code の場合、サーバー モードで実行中のデバッグ アダプターへの接続が試行されます。",
-	"debugPrelaunchTask": "デバッグ セッションの開始前に実行するタスク。",
-	"debugPostDebugTask": "デバッグ セッションの終了前に実行するタスク。",
-	"debugWindowsConfiguration": "Windows 固有の起動構成の属性。",
-	"debugOSXConfiguration": "OS X 固有の起動構成の属性。",
-	"debugLinuxConfiguration": "Linux 固有の起動構成の属性。",
-	"deprecatedVariables": "'env.'、'config.'、'command.' は使用されていません。代わりに、'env:'、'config:'、'command:' を使用してください。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/debug/node/terminals.i18n.json b/i18n/jpn/src/vs/workbench/parts/debug/node/terminals.i18n.json
deleted file mode 100644
index 3b21863f9bf..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/debug/node/terminals.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"console.title": "VS Code コンソール",
-	"mac.terminal.script.failed": "スクリプト '{0}' が終了コード {1} で失敗しました",
-	"mac.terminal.type.not.supported": "'{0}' はサポートされていません",
-	"press.any.key": "続行するには、任意のキーを押してください...",
-	"linux.term.failed": "'{0}' が終了コード {1} で失敗しました"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/emmet/browser/actions/showEmmetCommands.i18n.json b/i18n/jpn/src/vs/workbench/parts/emmet/browser/actions/showEmmetCommands.i18n.json
deleted file mode 100644
index f3c3902228e..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/emmet/browser/actions/showEmmetCommands.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"showEmmetCommands": "Emmet コマンドの表示"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/emmet/electron-browser/actions/balance.i18n.json b/i18n/jpn/src/vs/workbench/parts/emmet/electron-browser/actions/balance.i18n.json
deleted file mode 100644
index 13eb719a34f..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/emmet/electron-browser/actions/balance.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"balanceInward": "Emmet: バランス (内側)",
-	"balanceOutward": "Emmet: バランス (外側)"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/emmet/electron-browser/actions/editPoints.i18n.json b/i18n/jpn/src/vs/workbench/parts/emmet/electron-browser/actions/editPoints.i18n.json
deleted file mode 100644
index 188f2a35673..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/emmet/electron-browser/actions/editPoints.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"previousEditPoint": "Emmet: 前の編集点に移動する",
-	"nextEditPoint": "Emmet: 次の編集点に移動する"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/emmet/electron-browser/actions/evaluateMath.i18n.json b/i18n/jpn/src/vs/workbench/parts/emmet/electron-browser/actions/evaluateMath.i18n.json
deleted file mode 100644
index f6a68a59f42..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/emmet/electron-browser/actions/evaluateMath.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"evaluateMathExpression": "Emmet: 数式の評価"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/emmet/electron-browser/actions/expandAbbreviation.i18n.json b/i18n/jpn/src/vs/workbench/parts/emmet/electron-browser/actions/expandAbbreviation.i18n.json
deleted file mode 100644
index c7da631b9c0..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/emmet/electron-browser/actions/expandAbbreviation.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"expandAbbreviationAction": "Emmet: 略語の展開"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/emmet/electron-browser/actions/incrementDecrement.i18n.json b/i18n/jpn/src/vs/workbench/parts/emmet/electron-browser/actions/incrementDecrement.i18n.json
deleted file mode 100644
index 4c2a1db638c..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/emmet/electron-browser/actions/incrementDecrement.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"incrementNumberByOneTenth": "Emmet: 0.1 ずつ増加",
-	"incrementNumberByOne": "Emmet: 1 ずつ増加",
-	"incrementNumberByTen": "Emmet: 10 ずつ増加",
-	"decrementNumberByOneTenth": "Emmet: 0.1 ずつ減少",
-	"decrementNumberByOne": "Emmet: 1 減少",
-	"decrementNumberByTen": "Emmet: 10 ずつ減少"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/emmet/electron-browser/actions/matchingPair.i18n.json b/i18n/jpn/src/vs/workbench/parts/emmet/electron-browser/actions/matchingPair.i18n.json
deleted file mode 100644
index adcbee4abaf..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/emmet/electron-browser/actions/matchingPair.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"matchingPair": "Emmet: 一致するペアに移動"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/emmet/electron-browser/actions/mergeLines.i18n.json b/i18n/jpn/src/vs/workbench/parts/emmet/electron-browser/actions/mergeLines.i18n.json
deleted file mode 100644
index c834e4b5aaa..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/emmet/electron-browser/actions/mergeLines.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"mergeLines": "Emmet: 行のマージ"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/emmet/electron-browser/actions/reflectCssValue.i18n.json b/i18n/jpn/src/vs/workbench/parts/emmet/electron-browser/actions/reflectCssValue.i18n.json
deleted file mode 100644
index ab8fd5a62ba..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/emmet/electron-browser/actions/reflectCssValue.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"reflectCSSValue": "Emmet: CSS 値の反転"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/emmet/electron-browser/actions/removeTag.i18n.json b/i18n/jpn/src/vs/workbench/parts/emmet/electron-browser/actions/removeTag.i18n.json
deleted file mode 100644
index c3bc9dd651f..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/emmet/electron-browser/actions/removeTag.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"removeTag": "Emmet: タグの削除"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/emmet/electron-browser/actions/selectItem.i18n.json b/i18n/jpn/src/vs/workbench/parts/emmet/electron-browser/actions/selectItem.i18n.json
deleted file mode 100644
index 350aee6aff9..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/emmet/electron-browser/actions/selectItem.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"selectPreviousItem": "Emmet: 前の項目の選択",
-	"selectNextItem": "Emmet: 次の項目の選択"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/emmet/electron-browser/actions/splitJoinTag.i18n.json b/i18n/jpn/src/vs/workbench/parts/emmet/electron-browser/actions/splitJoinTag.i18n.json
deleted file mode 100644
index 4b1dbd8a454..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/emmet/electron-browser/actions/splitJoinTag.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"splitJoinTag": "Emmet: タグの分割/結合"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/emmet/electron-browser/actions/toggleComment.i18n.json b/i18n/jpn/src/vs/workbench/parts/emmet/electron-browser/actions/toggleComment.i18n.json
deleted file mode 100644
index 942a483bfa3..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/emmet/electron-browser/actions/toggleComment.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"toggleComment": "Emmet: コメントの表示/非表示"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/emmet/electron-browser/actions/updateImageSize.i18n.json b/i18n/jpn/src/vs/workbench/parts/emmet/electron-browser/actions/updateImageSize.i18n.json
deleted file mode 100644
index ba3773dfcdb..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/emmet/electron-browser/actions/updateImageSize.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"updateImageSize": "Emmet: イメージ サイズの更新"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/emmet/electron-browser/actions/updateTag.i18n.json b/i18n/jpn/src/vs/workbench/parts/emmet/electron-browser/actions/updateTag.i18n.json
deleted file mode 100644
index 873d819f37a..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/emmet/electron-browser/actions/updateTag.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"updateTag": "Emmet: タグの更新",
-	"enterTag": "タグの入力",
-	"tag": "タグ"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/emmet/electron-browser/actions/wrapWithAbbreviation.i18n.json b/i18n/jpn/src/vs/workbench/parts/emmet/electron-browser/actions/wrapWithAbbreviation.i18n.json
deleted file mode 100644
index 3f72714a048..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/emmet/electron-browser/actions/wrapWithAbbreviation.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"wrapWithAbbreviationAction": "Emmet: 省略形でラップ",
-	"enterAbbreviation": "省略形の入力",
-	"abbreviation": "省略形"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/emmet/electron-browser/emmet.contribution.i18n.json b/i18n/jpn/src/vs/workbench/parts/emmet/electron-browser/emmet.contribution.i18n.json
deleted file mode 100644
index e62cceeca51..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/emmet/electron-browser/emmet.contribution.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"emmetConfigurationTitle": "Emmet",
-	"triggerExpansionOnTab": "有効にすると、TAB キーを押したときに emmet 省略記法が展開されます。emmet.useNewemmet が true に設定されているときは適用されません。",
-	"emmetPreferences": "Emmet の一部のアクションやリゾルバーの動作の変更に使用される基本設定。emmet.useNewemmet が true に設定されているときは適用されません。",
-	"emmetSyntaxProfiles": "指定した構文に対してプロファイルを定義するか、特定の規則がある独自のプロファイルをご使用ください。",
-	"emmetExclude": "emmet 省略記法を展開すべきでない言語の配列。",
-	"emmetExtensionsPath": "Emmet のプロファイル、スニペット、基本設定を含むフォルダーへのパス。emmet.useNewEmmet が true に設定されている場合、プロファイルのみが拡張パスから受け入れられます。",
-	"useNewEmmet": "すべての emmet 機能に対して、新しい emmet モジュールをお試しください (最終的に、以前の単一 emmet ライブラリは置き換えられます)。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/emmet/node/actions/balance.i18n.json b/i18n/jpn/src/vs/workbench/parts/emmet/node/actions/balance.i18n.json
deleted file mode 100644
index 13eb719a34f..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/emmet/node/actions/balance.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"balanceInward": "Emmet: バランス (内側)",
-	"balanceOutward": "Emmet: バランス (外側)"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/emmet/node/actions/editPoints.i18n.json b/i18n/jpn/src/vs/workbench/parts/emmet/node/actions/editPoints.i18n.json
deleted file mode 100644
index cf9dccd3bbd..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/emmet/node/actions/editPoints.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"previousEditPoint": "Emmet: 前の編集点",
-	"nextEditPoint": "Emmet: 次の編集点"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/emmet/node/actions/evaluateMath.i18n.json b/i18n/jpn/src/vs/workbench/parts/emmet/node/actions/evaluateMath.i18n.json
deleted file mode 100644
index f6a68a59f42..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/emmet/node/actions/evaluateMath.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"evaluateMathExpression": "Emmet: 数式の評価"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/emmet/node/actions/expandAbbreviation.i18n.json b/i18n/jpn/src/vs/workbench/parts/emmet/node/actions/expandAbbreviation.i18n.json
deleted file mode 100644
index 23680f558e5..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/emmet/node/actions/expandAbbreviation.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"expandAbbreviationAction": "Emmet: 略語の展開"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/emmet/node/actions/incrementDecrement.i18n.json b/i18n/jpn/src/vs/workbench/parts/emmet/node/actions/incrementDecrement.i18n.json
deleted file mode 100644
index 4c2a1db638c..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/emmet/node/actions/incrementDecrement.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"incrementNumberByOneTenth": "Emmet: 0.1 ずつ増加",
-	"incrementNumberByOne": "Emmet: 1 ずつ増加",
-	"incrementNumberByTen": "Emmet: 10 ずつ増加",
-	"decrementNumberByOneTenth": "Emmet: 0.1 ずつ減少",
-	"decrementNumberByOne": "Emmet: 1 減少",
-	"decrementNumberByTen": "Emmet: 10 ずつ減少"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/emmet/node/actions/matchingPair.i18n.json b/i18n/jpn/src/vs/workbench/parts/emmet/node/actions/matchingPair.i18n.json
deleted file mode 100644
index adcbee4abaf..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/emmet/node/actions/matchingPair.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"matchingPair": "Emmet: 一致するペアに移動"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/emmet/node/actions/mergeLines.i18n.json b/i18n/jpn/src/vs/workbench/parts/emmet/node/actions/mergeLines.i18n.json
deleted file mode 100644
index c834e4b5aaa..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/emmet/node/actions/mergeLines.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"mergeLines": "Emmet: 行のマージ"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/emmet/node/actions/reflectCssValue.i18n.json b/i18n/jpn/src/vs/workbench/parts/emmet/node/actions/reflectCssValue.i18n.json
deleted file mode 100644
index ab8fd5a62ba..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/emmet/node/actions/reflectCssValue.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"reflectCSSValue": "Emmet: CSS 値の反転"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/emmet/node/actions/removeTag.i18n.json b/i18n/jpn/src/vs/workbench/parts/emmet/node/actions/removeTag.i18n.json
deleted file mode 100644
index c3bc9dd651f..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/emmet/node/actions/removeTag.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"removeTag": "Emmet: タグの削除"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/emmet/node/actions/selectItem.i18n.json b/i18n/jpn/src/vs/workbench/parts/emmet/node/actions/selectItem.i18n.json
deleted file mode 100644
index 350aee6aff9..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/emmet/node/actions/selectItem.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"selectPreviousItem": "Emmet: 前の項目の選択",
-	"selectNextItem": "Emmet: 次の項目の選択"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/emmet/node/actions/splitJoinTag.i18n.json b/i18n/jpn/src/vs/workbench/parts/emmet/node/actions/splitJoinTag.i18n.json
deleted file mode 100644
index 4b1dbd8a454..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/emmet/node/actions/splitJoinTag.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"splitJoinTag": "Emmet: タグの分割/結合"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/emmet/node/actions/toggleComment.i18n.json b/i18n/jpn/src/vs/workbench/parts/emmet/node/actions/toggleComment.i18n.json
deleted file mode 100644
index 942a483bfa3..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/emmet/node/actions/toggleComment.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"toggleComment": "Emmet: コメントの表示/非表示"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/emmet/node/actions/updateImageSize.i18n.json b/i18n/jpn/src/vs/workbench/parts/emmet/node/actions/updateImageSize.i18n.json
deleted file mode 100644
index ba3773dfcdb..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/emmet/node/actions/updateImageSize.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"updateImageSize": "Emmet: イメージ サイズの更新"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/emmet/node/actions/updateTag.i18n.json b/i18n/jpn/src/vs/workbench/parts/emmet/node/actions/updateTag.i18n.json
deleted file mode 100644
index 873d819f37a..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/emmet/node/actions/updateTag.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"updateTag": "Emmet: タグの更新",
-	"enterTag": "タグの入力",
-	"tag": "タグ"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/emmet/node/actions/wrapWithAbbreviation.i18n.json b/i18n/jpn/src/vs/workbench/parts/emmet/node/actions/wrapWithAbbreviation.i18n.json
deleted file mode 100644
index 3f72714a048..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/emmet/node/actions/wrapWithAbbreviation.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"wrapWithAbbreviationAction": "Emmet: 省略形でラップ",
-	"enterAbbreviation": "省略形の入力",
-	"abbreviation": "省略形"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/emmet/node/emmet.contribution.i18n.json b/i18n/jpn/src/vs/workbench/parts/emmet/node/emmet.contribution.i18n.json
deleted file mode 100644
index f8b16e8c78d..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/emmet/node/emmet.contribution.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"emmetConfigurationTitle": "Emmet",
-	"triggerExpansionOnTab": "これをオンにすると、TAB キーを押したときに emmet 省略記法が展開されます.",
-	"emmetPreferences": "Emmet の一部のアクションやリゾルバーの動作の変更に使用される基本設定。",
-	"emmetSyntaxProfiles": "指定した構文に対してプロファイルを定義するか、特定の規則がある独自のプロファイルをご使用ください。",
-	"emmetExclude": "emmet 省略記法を展開すべきでない言語の配列。",
-	"emmetExtensionsPath": "Emmet のプロファイル、スニペット、基本設定を含むフォルダーへのパス"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json b/i18n/jpn/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
deleted file mode 100644
index 3d2ead4c932..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"terminalConfigurationTitle": "外部ターミナル",
-	"explorer.openInTerminalKind": "起動するターミナルの種類をカスタマイズします。",
-	"terminal.external.windowsExec": "どのターミナルを Windows で実行するかをカスタマイズします。",
-	"terminal.external.osxExec": "どのターミナル アプリケーションを OS X で実行するかをカスタマイズします。",
-	"terminal.external.linuxExec": "どのターミナルを Linux で実行するかをカスタマイズします。",
-	"globalConsoleActionWin": "新しいコマンド プロンプトを開く",
-	"globalConsoleActionMacLinux": "新しいターミナルを開く",
-	"scopedConsoleActionWin": "コマンド プロンプトで開く",
-	"scopedConsoleActionMacLinux": "ターミナルで開く"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/execution/electron-browser/terminal.contribution.i18n.json b/i18n/jpn/src/vs/workbench/parts/execution/electron-browser/terminal.contribution.i18n.json
deleted file mode 100644
index 11e9b9ae7f7..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/execution/electron-browser/terminal.contribution.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"terminalConfigurationTitle": "外部ターミナル",
-	"terminal.external.windowsExec": "どのターミナルを Windows で実行するかをカスタマイズします。",
-	"terminal.external.osxExec": "どのターミナル アプリケーションを OS X で実行するかをカスタマイズします。",
-	"terminal.external.linuxExec": "どのターミナルを Linux で実行するかをカスタマイズします。",
-	"globalConsoleActionWin": "新しいコマンド プロンプトを開く",
-	"globalConsoleActionMacLinux": "新しいターミナルを開く",
-	"scopedConsoleActionWin": "コマンド プロンプトで開く",
-	"scopedConsoleActionMacLinux": "ターミナルで開く"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/execution/electron-browser/terminalService.i18n.json b/i18n/jpn/src/vs/workbench/parts/execution/electron-browser/terminalService.i18n.json
deleted file mode 100644
index 3b21863f9bf..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/execution/electron-browser/terminalService.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"console.title": "VS Code コンソール",
-	"mac.terminal.script.failed": "スクリプト '{0}' が終了コード {1} で失敗しました",
-	"mac.terminal.type.not.supported": "'{0}' はサポートされていません",
-	"press.any.key": "続行するには、任意のキーを押してください...",
-	"linux.term.failed": "'{0}' が終了コード {1} で失敗しました"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/explorers/browser/treeExplorer.contribution.i18n.json b/i18n/jpn/src/vs/workbench/parts/explorers/browser/treeExplorer.contribution.i18n.json
deleted file mode 100644
index 497be6143f7..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/explorers/browser/treeExplorer.contribution.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"vscode.extension.contributes.view": "カスタム ビューを提供します",
-	"vscode.extension.contributes.view.id": "vscode.workspace.createTreeView を介して生成した、ビューを認識するための一意の ID",
-	"vscode.extension.contributes.view.label": "ビューの表示に使用する、他人が解釈できる文字列",
-	"vscode.extension.contributes.view.icon": "ビュー アイコンへのパス",
-	"vscode.extension.contributes.views": "複数のカスタム ビューを提供します",
-	"showViewlet": "{0} を表示",
-	"view": "表示"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/explorers/browser/treeExplorerActions.i18n.json b/i18n/jpn/src/vs/workbench/parts/explorers/browser/treeExplorerActions.i18n.json
deleted file mode 100644
index 35740fe14c4..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/explorers/browser/treeExplorerActions.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"refresh": "最新の情報に更新"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/explorers/browser/treeExplorerService.i18n.json b/i18n/jpn/src/vs/workbench/parts/explorers/browser/treeExplorerService.i18n.json
deleted file mode 100644
index 63e24172325..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/explorers/browser/treeExplorerService.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"treeExplorer.noMatchingProviderId": "ID {providerId} の TreeExplorerNodeProvider は登録されていません。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/explorers/browser/views/treeExplorerView.i18n.json b/i18n/jpn/src/vs/workbench/parts/explorers/browser/views/treeExplorerView.i18n.json
deleted file mode 100644
index 34c326ced69..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/explorers/browser/views/treeExplorerView.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"treeExplorerViewlet.tree": "Tree Explorer セクション"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/extensions/browser/dependenciesViewer.i18n.json b/i18n/jpn/src/vs/workbench/parts/extensions/browser/dependenciesViewer.i18n.json
deleted file mode 100644
index ee62d1b99dd..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/extensions/browser/dependenciesViewer.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"error": "エラー",
-	"Unknown Dependency": "不明な依存関係:"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json b/i18n/jpn/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json
deleted file mode 100644
index 039a3a0e4af..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"name": "拡張機能名",
-	"extension id": "拡張機能の識別子",
-	"preview": "プレビュー",
-	"builtin": "ビルトイン",
-	"publisher": "発行者名",
-	"install count": "インストール数",
-	"rating": "評価",
-	"repository": "リポジトリ",
-	"license": "ライセンス",
-	"details": "詳細",
-	"contributions": "コントリビューション",
-	"changelog": "変更ログ",
-	"dependencies": "依存関係",
-	"noReadme": "利用できる README はありません。",
-	"noChangelog": "使用可能な変更ログはありません。",
-	"noContributions": "コントリビューションはありません",
-	"noDependencies": "依存関係はありません",
-	"settings": "設定 ({0})",
-	"setting name": "名前",
-	"description": "説明",
-	"default": "既定",
-	"debuggers": "デバッガー ({0})",
-	"debugger name": "名前",
-	"debugger type": "種類",
-	"views": "ビュー ({0})",
-	"view id": "ID",
-	"view name": "名前",
-	"view location": "場所",
-	"localizations": "ローカライズ ({0})",
-	"localizations language id": "言語 ID",
-	"localizations language name": "言語名",
-	"localizations localized language name": "言語名 (ローカライズ済み)",
-	"colorThemes": "配色テーマ ({0})",
-	"iconThemes": "アイコン テーマ ({0})",
-	"colors": "配色 ({0})",
-	"colorId": "Id",
-	"defaultDark": "ダーク テーマの既定値",
-	"defaultLight": "ライト テーマの既定値",
-	"defaultHC": "ハイ コントラストの既定値",
-	"JSON Validation": "JSON 検証 ({0})",
-	"fileMatch": "対象ファイル",
-	"schema": "スキーマ",
-	"commands": "コマンド ({0})",
-	"command name": "名前",
-	"keyboard shortcuts": "キーボード ショートカット",
-	"menuContexts": "メニュー コンテキスト",
-	"languages": "言語 ({0})",
-	"language id": "ID",
-	"language name": "名前",
-	"file extensions": "ファイル拡張子",
-	"grammar": "文章校正",
-	"snippets": "スニペット"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json b/i18n/jpn/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
deleted file mode 100644
index 69dc63c434a..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
+++ /dev/null
@@ -1,81 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"download": "手動でダウンロード",
-	"install vsix": "ダウンロードが終わったら、ダウンロードされた '{0}' の VSIX を手動でインストールしてください。",
-	"installAction": "インストール",
-	"installing": "インストールしています",
-	"failedToInstall": "'{0}' をインストールできませんでした。",
-	"uninstallAction": "アンインストール",
-	"Uninstalling": "アンインストールしています",
-	"updateAction": "更新",
-	"updateTo": "{0} に更新",
-	"failedToUpdate": "'{0}' を更新できませんでした。",
-	"ManageExtensionAction.uninstallingTooltip": "アンインストールしています",
-	"enableForWorkspaceAction": "有効にする (ワークスペース)",
-	"enableGloballyAction": "有効",
-	"enableAction": "有効",
-	"disableForWorkspaceAction": "無効にする (ワークスペース)",
-	"disableGloballyAction": "無効にする",
-	"disableAction": "無効にする",
-	"checkForUpdates": "更新の確認",
-	"enableAutoUpdate": "拡張機能の自動更新を有効にする",
-	"disableAutoUpdate": "拡張機能の自動更新を無効にする",
-	"updateAll": "すべての拡張機能を更新します",
-	"reloadAction": "再読み込み",
-	"postUpdateTooltip": "再読み込みして更新する",
-	"postUpdateMessage": "このウィンドウを再読み込みして、更新済みの拡張機能 '{0}' をアクティブ化しますか?",
-	"postEnableTooltip": "再読み込みしてアクティブにする",
-	"postEnableMessage": "このウィンドウを再度読み込んで、拡張機能 '{0}' をアクティブ化しますか?",
-	"postDisableTooltip": "再読み込みして非アクティブ化する",
-	"postDisableMessage": "このウィンドウを再読み込みして、拡張機能 '{0}' を非アクティブ化しますか?",
-	"postUninstallTooltip": "再読み込みして非アクティブ化する",
-	"postUninstallMessage": "このウィンドウを再度読み込んで、アンインストール済みの拡張機能 '{0}' を非アクティブ化しますか?",
-	"toggleExtensionsViewlet": "拡張機能を表示する",
-	"installExtensions": "拡張機能のインストール",
-	"showEnabledExtensions": "有効な拡張機能の表示",
-	"showInstalledExtensions": "インストール済みの拡張機能の表示",
-	"showDisabledExtensions": "無効な拡張機能の表示",
-	"clearExtensionsInput": "拡張機能の入力のクリア",
-	"showBuiltInExtensions": "ビルトイン拡張機能の表示",
-	"showOutdatedExtensions": "古くなった拡張機能の表示",
-	"showPopularExtensions": "人気の拡張機能の表示",
-	"showRecommendedExtensions": "お勧めの拡張機能を表示",
-	"installWorkspaceRecommendedExtensions": "ワークスペースのおすすめの拡張機能をすべてインストール",
-	"allExtensionsInstalled": "このワークスペースに推奨されているすべての拡張機能はすでにインストールされています",
-	"installRecommendedExtension": "おすすめの拡張機能のインストール",
-	"extensionInstalled": "推奨された拡張機能がすでにインストールされています",
-	"showRecommendedKeymapExtensionsShort": "キーマップ",
-	"showLanguageExtensionsShort": "言語の拡張機能",
-	"showAzureExtensionsShort": "Azure 拡張機能",
-	"OpenExtensionsFile.failed": "'.vscode' ファルダー ({0}) 内に 'extensions.json' ファイルを作成できません。",
-	"configureWorkspaceRecommendedExtensions": "推奨事項の拡張機能を構成 (ワークスペース)",
-	"configureWorkspaceFolderRecommendedExtensions": "推奨事項の拡張機能を構成 (ワークスペース フォルダー)",
-	"malicious tooltip": "この拡張機能は問題ありと報告されました。",
-	"malicious": "悪意がある",
-	"disabled": "無効",
-	"disabled globally": "無効",
-	"disabled workspace": "このワークスペースでは無効",
-	"disableAll": "インストール済みのすべての拡張機能を無効にする",
-	"disableAllWorkspace": "このワークスペースのインストール済みの拡張機能をすべて無効にする",
-	"enableAll": "すべての拡張機能を有効にする",
-	"enableAllWorkspace": "このワークスペースの拡張機能をすべて有効にする",
-	"openExtensionsFolder": "拡張機能フォルダーを開く",
-	"installVSIX": "VSIX からのインストール...",
-	"installFromVSIX": "VSIX からインストール",
-	"installButton": "インストール(&&I)",
-	"InstallVSIXAction.success": "拡張機能が正常にインストールされました。有効にするには再読み込みしてください。",
-	"InstallVSIXAction.reloadNow": "今すぐ再度読み込む",
-	"reinstall": "拡張機能の再インストール...",
-	"selectExtension": "再インストールする拡張機能を選択",
-	"ReinstallAction.success": "拡張機能が正常に再インストールされました。",
-	"ReinstallAction.reloadNow": "今すぐ再度読み込む",
-	"extensionButtonProminentBackground": "際立っているアクション拡張機能のボタンの背景色（例: インストールボタン）。",
-	"extensionButtonProminentForeground": "際立っているアクション拡張機能のボタンの前景色（例: インストールボタン）。",
-	"extensionButtonProminentHoverBackground": "際立っているアクション拡張機能のボタンのホバー背景色（例: インストールボタン）。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/extensions/browser/extensionsList.i18n.json b/i18n/jpn/src/vs/workbench/parts/extensions/browser/extensionsList.i18n.json
deleted file mode 100644
index 7fd46ed2ab6..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/extensions/browser/extensionsList.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"recommended": "推奨"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/extensions/browser/extensionsQuickOpen.i18n.json b/i18n/jpn/src/vs/workbench/parts/extensions/browser/extensionsQuickOpen.i18n.json
deleted file mode 100644
index 7caf6591a40..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/extensions/browser/extensionsQuickOpen.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"manage": "拡張機能を管理するには Enter キーを押してください。",
-	"notfound": "拡張機能 '{0}' が Marketplace に見つかりませんでした。",
-	"install": "Marketplace から '{0}' をインストールするには Enter キーを押してください。",
-	"searchFor": "マーケットプレース内で '{0}' を検索するには、Enter キーを押してください。",
-	"noExtensionsToInstall": "拡張機能名を入力してください"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/extensions/browser/extensionsWidgets.i18n.json b/i18n/jpn/src/vs/workbench/parts/extensions/browser/extensionsWidgets.i18n.json
deleted file mode 100644
index 4a286928b15..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/extensions/browser/extensionsWidgets.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"ratedByUsers": "{0} 人が評価",
-	"ratedBySingleUser": "1 人が評価"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/extensions/common/extensionsFileTemplate.i18n.json b/i18n/jpn/src/vs/workbench/parts/extensions/common/extensionsFileTemplate.i18n.json
deleted file mode 100644
index 2be1db645f7..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/extensions/common/extensionsFileTemplate.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"app.extensions.json.title": "拡張機能",
-	"app.extensions.json.recommendations": "拡張機能の推奨事項のリスト。拡張機能の ID は常に '${publisher}.${name}' です。例: 'vscode.csharp'。",
-	"app.extension.identifier.errorMessage": "予期される形式 '${publisher}.${name}'。例: 'vscode.csharp'。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/extensions/common/extensionsInput.i18n.json b/i18n/jpn/src/vs/workbench/parts/extensions/common/extensionsInput.i18n.json
deleted file mode 100644
index aa96ba57d3f..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/extensions/common/extensionsInput.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"extensionsInputName": "拡張機能: {0}"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json b/i18n/jpn/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
deleted file mode 100644
index 52ef71e8bf9..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
+++ /dev/null
@@ -1,69 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"name": "拡張機能名",
-	"extension id": "拡張機能の識別子",
-	"preview": "プレビュー",
-	"builtin": "ビルトイン",
-	"publisher": "発行者名",
-	"install count": "インストール数",
-	"rating": "評価",
-	"repository": "リポジトリ",
-	"license": "ライセンス",
-	"details": "詳細",
-	"detailstooltip": "拡張機能の詳細、拡張機能の 'README.md' ファイルから表示",
-	"contributions": "コントリビューション",
-	"contributionstooltip": "この拡張機能による VS Code へのコントリビューションの一覧",
-	"changelog": "変更ログ",
-	"changelogtooltip": "拡張機能の更新履歴、拡張機能の 'CHANGELOG.md' ファイルから表示",
-	"dependencies": "依存関係",
-	"dependenciestooltip": "この拡張機能が依存する拡張機能の一覧",
-	"noReadme": "利用できる README はありません。",
-	"noChangelog": "使用可能な変更ログはありません。",
-	"noContributions": "コントリビューションはありません",
-	"noDependencies": "依存関係はありません",
-	"settings": "設定 ({0})",
-	"setting name": "名前",
-	"description": "説明",
-	"default": "既定",
-	"debuggers": "デバッガー ({0})",
-	"debugger name": "名前",
-	"debugger type": "種類",
-	"viewContainers": "ビュー コンテナ ({0})",
-	"view container id": "ID",
-	"view container title": "題名",
-	"view container location": "場所",
-	"views": "ビュー ({0})",
-	"view id": "ID",
-	"view name": "名前",
-	"view location": "場所",
-	"localizations": "ローカライズ ({0})",
-	"localizations language id": "言語 ID",
-	"localizations language name": "言語名",
-	"localizations localized language name": "言語名 (ローカライズ)",
-	"colorThemes": "配色テーマ ({0})",
-	"iconThemes": "アイコン テーマ ({0})",
-	"colors": "配色 ({0})",
-	"colorId": "Id",
-	"defaultDark": "ダーク テーマの既定値",
-	"defaultLight": "ライト テーマの既定値",
-	"defaultHC": "ハイ コントラストの既定値",
-	"JSON Validation": "JSON 検証 ({0})",
-	"fileMatch": "対象ファイル",
-	"schema": "スキーマ",
-	"commands": "コマンド ({0})",
-	"command name": "名前",
-	"keyboard shortcuts": "キーボード ショートカット",
-	"menuContexts": "メニュー コンテキスト",
-	"languages": "言語 ({0})",
-	"language id": "ID",
-	"language name": "名前",
-	"file extensions": "ファイル拡張子",
-	"grammar": "文章校正",
-	"snippets": "スニペット"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/extensions/electron-browser/extensionProfileService.i18n.json b/i18n/jpn/src/vs/workbench/parts/extensions/electron-browser/extensionProfileService.i18n.json
deleted file mode 100644
index d17ed990511..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/extensions/electron-browser/extensionProfileService.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"restart1": "拡張機能のプロファイル",
-	"restart2": "拡張機能のプロファイルには再起動が必要です。今すぐ '{0}' を再起動しますか?",
-	"restart3": "再起動",
-	"cancel": "キャンセル",
-	"selectAndStartDebug": "クリックしてプロファイリングを停止します。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json b/i18n/jpn/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
deleted file mode 100644
index c1d5e7d9f01..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"neverShowAgain": "今後は表示しない",
-	"searchMarketplace": "Marketplace を検索",
-	"dynamicWorkspaceRecommendation": "{0} レポジトリのユーザーに人気があるので、あなたもこの拡張機能に関心を持たれるかもしれません。",
-	"exeBasedRecommendation": "{0} がインストールされているため、この拡張機能を推奨します。",
-	"fileBasedRecommendation": "最近開いたファイルに基づいてこの拡張機能が推奨されます。",
-	"workspaceRecommendation": "現在のワークスペースのユーザーによってこの拡張機能が推奨されています。",
-	"reallyRecommended2": "このファイルの種類には拡張機能 '{0}' が推奨されます。",
-	"reallyRecommendedExtensionPack": "このファイルの種類には拡張機能パック '{0}' が推奨されます。",
-	"install": "インストール",
-	"showRecommendations": "推奨事項を表示",
-	"showLanguageExtensions": "'.{0}' ファイルに役立つ拡張機能が Marketplace にあります",
-	"workspaceRecommended": "このワークスペースには拡張機能の推奨事項があります。",
-	"installAll": "すべてインストール",
-	"ignoreExtensionRecommendations": "すべての拡張機能の推奨事項を無視しますか?",
-	"ignoreAll": "はい、すべて無視します",
-	"no": "いいえ"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/extensions/electron-browser/extensions.contribution.i18n.json b/i18n/jpn/src/vs/workbench/parts/extensions/electron-browser/extensions.contribution.i18n.json
deleted file mode 100644
index 77f4fac2faa..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/extensions/electron-browser/extensions.contribution.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"extensionsCommands": "拡張機能の管理",
-	"galleryExtensionsCommands": "ギャラリー拡張機能のインストール",
-	"extension": "拡張機能",
-	"runtimeExtension": "実行中の拡張機能",
-	"extensions": "拡張機能",
-	"view": "表示",
-	"developer": "開発者",
-	"extensionsConfigurationTitle": "拡張機能",
-	"extensionsAutoUpdate": "拡張機能を自動的に更新します",
-	"extensionsIgnoreRecommendations": "true に設定した場合、拡張機能の推奨事項の通知を表示しません。",
-	"extensionsShowRecommendationsOnlyOnDemand": "true に設定した場合、ユーザーが特別に要求しない限り推奨の取得や表示を行いません。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.i18n.json b/i18n/jpn/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.i18n.json
deleted file mode 100644
index c11c8b6bc40..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openExtensionsFolder": "拡張機能フォルダーを開く",
-	"installVSIX": "VSIX からのインストール...",
-	"installFromVSIX": "VSIX からインストール",
-	"installButton": "インストール(&&I)",
-	"InstallVSIXAction.success": "拡張機能が正常にインストールされました。有効にするには再読み込みしてください。",
-	"InstallVSIXAction.reloadNow": "今すぐ再度読み込む"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/extensions/electron-browser/extensionsUtils.i18n.json b/i18n/jpn/src/vs/workbench/parts/extensions/electron-browser/extensionsUtils.i18n.json
deleted file mode 100644
index 22837a8d961..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/extensions/electron-browser/extensionsUtils.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"disableOtherKeymapsConfirmation": "キーバインド間の競合を回避するために、他のキーマップ ({0}) を無効にしますか?",
-	"yes": "はい",
-	"no": "いいえ"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json b/i18n/jpn/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
deleted file mode 100644
index 5d9d43e41b5..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"marketPlace": "Marketplace",
-	"installedExtensions": "インストール済み",
-	"searchInstalledExtensions": "インストール済み",
-	"recommendedExtensions": "推奨",
-	"otherRecommendedExtensions": "その他の推奨事項",
-	"workspaceRecommendedExtensions": "ワークスペースの推奨事項",
-	"builtInExtensions": "機能",
-	"builtInThemesExtensions": "テーマ",
-	"builtInBasicsExtensions": "プログラミング言語",
-	"searchExtensions": "Marketplace で拡張機能を検索する",
-	"sort by installs": "並べ替え: インストール数",
-	"sort by rating": "並べ替え: 評価",
-	"sort by name": "並べ替え: 名前",
-	"suggestProxyError": "Marketplace が 'ECONNREFUSED' を返しました。'http.proxy' 設定を確認してください。",
-	"extensions": "拡張機能",
-	"outdatedExtensions": "{0} 古くなった拡張機能",
-	"malicious warning": "問題があることが報告された '{0}' をアンインストールしました。",
-	"reloadNow": "今すぐ再度読み込む"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/extensions/electron-browser/extensionsViews.i18n.json b/i18n/jpn/src/vs/workbench/parts/extensions/electron-browser/extensionsViews.i18n.json
deleted file mode 100644
index e5ec4d3b4b9..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/extensions/electron-browser/extensionsViews.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"extensions": "拡張機能",
-	"no extensions found": "拡張機能が見つかりません",
-	"suggestProxyError": "Marketplace が 'ECONNREFUSED' を返しました。'http.proxy' 設定を確認してください。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/extensions/electron-browser/keymapExtensions.i18n.json b/i18n/jpn/src/vs/workbench/parts/extensions/electron-browser/keymapExtensions.i18n.json
deleted file mode 100644
index e5b2af33ec3..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/extensions/electron-browser/keymapExtensions.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"disableOtherKeymapsConfirmation": "キーバインド間の競合を回避するために、他のキーマップを無効にしますか?",
-	"yes": "はい",
-	"no": "いいえ"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/extensions/electron-browser/runtimeExtensionsEditor.i18n.json b/i18n/jpn/src/vs/workbench/parts/extensions/electron-browser/runtimeExtensionsEditor.i18n.json
deleted file mode 100644
index 6088a2028ef..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/extensions/electron-browser/runtimeExtensionsEditor.i18n.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"starActivation": "起動時にアクティブ化",
-	"workspaceContainsGlobActivation": "ワークスペースで {0} に一致するファイルが存在するとアクティブ化",
-	"workspaceContainsFileActivation": "ワークスペースに {0} ファイルが存在するとアクティブ化",
-	"languageActivation": "{0} ファイルが開かれるとアクティブ化",
-	"workspaceGenericActivation": "{0} 上でアクティブ化",
-	"errors": "{0} 個の未検出のエラー",
-	"extensionsInputName": "実行中の拡張機能",
-	"showRuntimeExtensions": "実行中の拡張機能の表示",
-	"reportExtensionIssue": "問題の報告",
-	"extensionHostProfileStart": "拡張機能ホストのプロファイルを開始",
-	"extensionHostProfileStop": "拡張機能ホストのプロファイルを停止",
-	"saveExtensionHostProfile": "拡張機能ホストのプロファイルを保存"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.i18n.json b/i18n/jpn/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.i18n.json
deleted file mode 100644
index 4eb7ebc4f89..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.i18n.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"installingVSIXExtension": "VSIX から拡張機能をインストールしています...",
-	"malicious": "この拡張機能には問題があると報告されています。",
-	"installingMarketPlaceExtension": "Marketplace から拡張機能をインストールしています...",
-	"uninstallingExtension": "拡張機能をアンインストールしています...",
-	"enableDependeciesConfirmation": "拡張機能を有効にすると、その依存関係も有効になります。 続行しますか？",
-	"enable": "はい",
-	"doNotEnable": "いいえ",
-	"disableDependeciesConfirmation": "拡張機能の依存関係も無効にしますか？",
-	"yes": "はい",
-	"no": "いいえ",
-	"cancel": "キャンセル",
-	"singleDependentError": "拡張機能 '{0}' を無効にできません。これに拡張機能 '{1}' が依存しています。",
-	"twoDependentsError": "拡張機能 '{0}' を無効にできません。これに拡張機能 '{1}' と '{2}' が依存しています。",
-	"multipleDependentsError": "拡張機能 '{0}' を無効にできません。これに拡張機能 '{1}'、'{2}'、その他が依存しています。",
-	"installConfirmation": "'{0}' 拡張機能をインストールしますか?",
-	"install": "インストール"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json b/i18n/jpn/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json
deleted file mode 100644
index 494c5510591..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"workbenchConfigurationTitle": "ワークベンチ",
-	"feedbackVisibility": "ワークベンチ下部にあるステータス バーで Twitter のフィードバック (スマイル) を表示するかどうかを制御します。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/feedback/electron-browser/feedback.i18n.json b/i18n/jpn/src/vs/workbench/parts/feedback/electron-browser/feedback.i18n.json
deleted file mode 100644
index 2751b55c435..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/feedback/electron-browser/feedback.i18n.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"sendFeedback": "フィードバックをツイートする",
-	"label.sendASmile": "フィードバックをツイートしてください。",
-	"patchedVersion1": "インストールが壊れています。",
-	"patchedVersion2": "バグを送信する場合には、これを指定してください。",
-	"sentiment": "ご感想をお聞かせください。",
-	"smileCaption": "ハッピー",
-	"frownCaption": "悲しい",
-	"other ways to contact us": "その他の連絡方法",
-	"submit a bug": "バグを送信する",
-	"request a missing feature": "欠落している機能を要求する",
-	"tell us why?": "理由をお知らせください",
-	"commentsHeader": "コメント",
-	"showFeedback": "ステータス バーにフィードバックの笑顔文字を表示",
-	"tweet": "ツイートする",
-	"character left": "文字入力可",
-	"characters left": "文字入力可",
-	"feedbackSending": "送信中",
-	"feedbackSent": "ありがとうございました",
-	"feedbackSendingError": "もう一度やり直してください"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json b/i18n/jpn/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json
deleted file mode 100644
index 156f602f4b4..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hide": "非表示"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/files/browser/editors/binaryFileEditor.i18n.json b/i18n/jpn/src/vs/workbench/parts/files/browser/editors/binaryFileEditor.i18n.json
deleted file mode 100644
index 77bf5564ced..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/files/browser/editors/binaryFileEditor.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"binaryFileEditor": "バイナリ ファイル ビューアー"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/files/browser/editors/textFileEditor.i18n.json b/i18n/jpn/src/vs/workbench/parts/files/browser/editors/textFileEditor.i18n.json
deleted file mode 100644
index 0c2ececf19e..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/files/browser/editors/textFileEditor.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"textFileEditor": "テキスト ファイル エディター",
-	"createFile": "ファイルの作成",
-	"relaunchWithIncreasedMemoryLimit": "{0} MB で再起動",
-	"configureMemoryLimit": "メモリ制限を構成する",
-	"fileEditorWithInputAriaLabel": "{0}。テキスト ファイル エディター。",
-	"fileEditorAriaLabel": "テキスト ファイル エディター。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/files/browser/explorerViewlet.i18n.json b/i18n/jpn/src/vs/workbench/parts/files/browser/explorerViewlet.i18n.json
deleted file mode 100644
index 7b7ea0200a0..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/files/browser/explorerViewlet.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"folders": "フォルダー"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/files/browser/fileActions.contribution.i18n.json b/i18n/jpn/src/vs/workbench/parts/files/browser/fileActions.contribution.i18n.json
deleted file mode 100644
index 76306159955..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/files/browser/fileActions.contribution.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"filesCategory": "ファイル",
-	"revealInSideBar": "サイド バーに表示",
-	"acceptLocalChanges": "変更を使用してディスクの内容を上書き",
-	"revertLocalChanges": "変更を破棄してディスク上の内容に戻る"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/files/browser/fileActions.i18n.json b/i18n/jpn/src/vs/workbench/parts/files/browser/fileActions.i18n.json
deleted file mode 100644
index 2ef009f9c59..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/files/browser/fileActions.i18n.json
+++ /dev/null
@@ -1,75 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"retry": "再試行",
-	"rename": "名前変更",
-	"newFile": "新しいファイル",
-	"newFolder": "新しいフォルダー",
-	"openFolderFirst": "フォルダー内にファイルやフォルダーを作成するには、フォルダーをまず開く必要があります。",
-	"newUntitledFile": "無題の新規ファイル",
-	"createNewFile": "新しいファイル",
-	"createNewFolder": "新しいフォルダー",
-	"deleteButtonLabelRecycleBin": "ごみ箱に移動(&&M)",
-	"deleteButtonLabelTrash": "ゴミ箱に移動(&&M)",
-	"deleteButtonLabel": "削除(&&D)",
-	"dirtyMessageFolderOneDelete": "保存されていない変更がある 1 個のファイルを含むフォルダーを削除します。続行しますか?",
-	"dirtyMessageFolderDelete": "保存されていない変更があるファイルを {0} 個含むフォルダーを削除します。続行しますか?",
-	"dirtyMessageFileDelete": "保存されていない変更があるファイルを削除します。続行しますか?",
-	"dirtyWarning": "保存しないと変更内容が失われます。",
-	"confirmMoveTrashMessageFolder": "'{0}' とその内容を削除しますか?",
-	"confirmMoveTrashMessageFile": "'{0}' を削除しますか?",
-	"undoBin": "ごみ箱から復元できます。",
-	"undoTrash": "ゴミ箱から復元できます。",
-	"doNotAskAgain": "再度表示しない",
-	"confirmDeleteMessageFolder": "'{0}' とその内容を完全に削除してもよろしいですか?",
-	"confirmDeleteMessageFile": "'{0}' を完全に削除してもよろしいですか?",
-	"irreversible": "このアクションは元に戻すことができません。",
-	"permDelete": "完全に削除",
-	"delete": "削除",
-	"importFiles": "ファイルのインポート",
-	"confirmOverwrite": "保存先のフォルダーに同じ名前のファイルまたはフォルダーが既に存在します。置き換えてもよろしいですか?",
-	"replaceButtonLabel": "置換(&&R)",
-	"copyFile": "コピー",
-	"pasteFile": "貼り付け",
-	"duplicateFile": "重複",
-	"openToSide": "横に並べて開く",
-	"compareSource": "比較対象の選択",
-	"globalCompareFile": "アクティブ ファイルを比較しています...",
-	"openFileToCompare": "まずファイルを開いてから別のファイルと比較してください",
-	"compareWith": "'{0}' と '{1}' を比較",
-	"compareFiles": "ファイルの比較",
-	"refresh": "最新の情報に更新",
-	"save": "保存",
-	"saveAs": "名前を付けて保存...",
-	"saveAll": "すべて保存",
-	"saveAllInGroup": "グループ内のすべてを保存する",
-	"saveFiles": "すべてのファイルを保存",
-	"revert": "ファイルを元に戻す",
-	"focusOpenEditors": "開いているエディターのビューにフォーカスする",
-	"focusFilesExplorer": "ファイル エクスプローラーにフォーカスを置く",
-	"showInExplorer": "アクティブ ファイルをサイド バーに表示",
-	"openFileToShow": "エクスプローラーでファイルを表示するには、ファイルをまず開く必要があります",
-	"collapseExplorerFolders": "エクスプローラーのフォルダーを折りたたむ",
-	"refreshExplorer": "エクスプローラーを最新表示する",
-	"openFileInNewWindow": "新しいウィンドウでアクティブ ファイルを開く",
-	"openFileToShowInNewWindow": "まずファイルを開いてから新しいウィンドウで開きます",
-	"revealInWindows": "エクスプローラーで表示",
-	"revealInMac": "Finder で表示します",
-	"openContainer": "このアイテムのフォルダーを開く",
-	"revealActiveFileInWindows": "Windows エクスプローラーでアクティブ ファイルを表示する",
-	"revealActiveFileInMac": "Finder でアクティブ ファイルを表示する",
-	"openActiveFileContainer": "アクティブ ファイルを含んでいるフォルダーを開く",
-	"copyPath": "パスのコピー",
-	"copyPathOfActive": "アクティブ ファイルのパスのコピー",
-	"emptyFileNameError": "ファイルまたはフォルダーの名前を指定する必要があります。",
-	"fileNameExistsError": "**{0}** というファイルまたはフォルダーはこの場所に既に存在します。別の名前を指定してください。",
-	"invalidFileNameError": "名前 **{0}** がファイル名またはフォルダー名として無効です。別の名前を指定してください。",
-	"filePathTooLongError": "名前 **{0}** のパスが長すぎます。名前を短くしてください。",
-	"compareWithSaved": "保存済みファイルと作業中のファイルを比較",
-	"modifiedLabel": "{0} (ローカル) ↔ {1}",
-	"compareWithClipboard": "クリップボードとアクティブ ファイルを比較",
-	"clipboardComparisonLabel": "クリップボード ↔ {0}"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/files/browser/fileCommands.i18n.json b/i18n/jpn/src/vs/workbench/parts/files/browser/fileCommands.i18n.json
deleted file mode 100644
index 4f2a963e359..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/files/browser/fileCommands.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"openFileToCopy": "まずファイルを開いてからそのパスをコピーします",
-	"openFileToReveal": "まずファイルを開いてから表示します"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/files/browser/files.contribution.i18n.json b/i18n/jpn/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
deleted file mode 100644
index 5461c0b3fa9..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
+++ /dev/null
@@ -1,53 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"showExplorerViewlet": "エクスプローラーを表示",
-	"explore": "エクスプローラー",
-	"view": "表示",
-	"textFileEditor": "テキスト ファイル エディター",
-	"binaryFileEditor": "バイナリ ファイル エディター",
-	"filesConfigurationTitle": "ファイル",
-	"exclude": "ファイルとフォルダーを除外するための glob パターンを構成します。たとえば、ファイル エクスプローラーではこの設定に基づいてファイルとフォルダーの表示や非表示を決定します。",
-	"files.exclude.boolean": "ファイル パスの照合基準となる glob パターン。これを true または false に設定すると、パターンがそれぞれ有効/無効になります。",
-	"files.exclude.when": "一致するファイルの兄弟をさらにチェックします。一致するファイル名の変数として $(basename) を使用します。",
-	"associations": "言語に対するファイルの関連付け (例 \"*.extension\": \"html\") を構成します。これらの関連付けは、インストールされている言語の既定の関連付けより優先されます。",
-	"encoding": "ファイルの読み取り/書き込みで使用する既定の文字セット エンコーディング。言語ごとに構成することも可能です。",
-	"autoGuessEncoding": "有効な場合、ファイルを開くときに文字セット エンコードを推測します。言語ごとに構成することも可能です。",
-	"eol": "既定の改行文字。LF の場合には \\n を CRLF の場合には \\r\\n を使用してください。",
-	"trimTrailingWhitespace": "有効にすると、ファイルの保存時に末尾の空白をトリミングします。",
-	"insertFinalNewline": "有効にすると、ファイルの保存時に最新の行を末尾に挿入します。",
-	"trimFinalNewlines": "有効にすると、ファイルの保存時に最終行以降の新しい行をトリミングします。",
-	"files.autoSave.off": "ダーティ ファイルを自動的に保存することはしません。",
-	"files.autoSave.afterDelay": "'files.autoSaveDelay' で構成された時間の経過後に、ダーティ ファイルを自動的に保存します。",
-	"files.autoSave.onFocusChange": "エディターがフォーカスを失った時点で、ダーティ ファイルを自動的に保存します。",
-	"files.autoSave.onWindowChange": "ウィンドウがフォーカスを失った時点で、ダーティ ファイルを自動的に保存します。",
-	"autoSave": "ダーティ ファイルの自動保存を制御します。有効な値: '{0}'、'{1}'、'{2}' (エディターがフォーカスを失います)、'{3}' (ウィンドウがフォーカスを失います)。'{4}' に設定すると、'files.autoSaveDelay' で遅延を構成できます。",
-	"autoSaveDelay": "ダーティ ファイルの自動保存の遅延をミリ秒単位で制御します。'files.autoSave' が '{0}' に設定されている場合のみ適用されます",
-	"watcherExclude": "ファイル監視から除外するファイル パスの glob パターンを設定します。パターンは絶対パスで一致する必要があります (つまり、適切に一致するには、プレフィックス ** を指定するか、完全パスを指定します\n)。この設定を変更した場合は、再起動が必要になります。始動時に Code が消費する CPU 時間が多い場合は、大きいフォルダーを除外すれば初期の負荷を減らすことができます。",
-	"hotExit.off": "Hot Exit を無効にします。",
-	"hotExit.onExit": "アプリケーションが閉じると (Windows/Linux で最後のウィンドウが閉じるとき、または workbench.action.quit コマンドがトリガーされるとき (コマンド パレット、キー バインド、メニュー))、Hot Exit がトリガーされます。バックアップされているすべてのウィンドウは、次の起動時に復元されます。",
-	"hotExit.onExitAndWindowClose": "アプリケーションが閉じると (Windows/Linux で最後のウィンドウが閉じるとき、または workbench.action.quit コマンドがトリガーするとき (コマンド パレット、キー バインド、メニュー))、Hot Exit がトリガーされます。また、フォルダーが開かれているウィンドウについても、それが最後のウィンドウかどうかに関係なく、Hot Exit がトリガーされます。フォルダーが開かれていないウィンドウはすべて、次回の起動時に復元されます。フォルダーのウィンドウをシャットダウン前と同じ状態に復元するには、\"window.restoreWindows\" を \"all\" に設定します。",
-	"hotExit": "エディターを終了するときに保存を確認するダイアログを省略し、保存されていないファイルをセッション後も保持するかどうかを制御します。",
-	"useExperimentalFileWatcher": "新しい試験的な File Watcher を使用します。",
-	"defaultLanguage": "新しいファイルに割り当てられる既定の言語モード。",
-	"editorConfigurationTitle": "エディター",
-	"formatOnSave": "ファイルを保存するときにフォーマットしてください。フォーマッタを使用可能にして、ファイルを自動保存せず、エディターをシャットダウンしないでください。",
-	"explorerConfigurationTitle": "エクスプローラー",
-	"openEditorsVisible": "[開いているエディター] ウィンドウに表示されているエディターの数。0 に設定するとウィンドウが非表示になります。",
-	"dynamicHeight": "開いているエディターのセクションの高さを要素の数に合わせて動的に調整するかどうかを制御します。",
-	"autoReveal": "エクスプローラーでファイルを開くとき、自動的にファイルの内容を表示して選択するかどうかを制御します。",
-	"enableDragAndDrop": "ドラッグ アンド ドロップを使用したファイルとフォルダーの移動をエクスプローラーが許可するかどうかを制御します。",
-	"confirmDragAndDrop": "ドラッグ アンド ドロップを使用したファイルやフォルダーの移動時にエクスプローラーが確認を求めるかどうかを制御します。",
-	"confirmDelete": "ごみ箱を経由したファイル削除時にエクスプローラーが確認を求めるかどうかを制御します。",
-	"sortOrder.default": "ファイルとフォルダーをアルファベット順に名前で並び替えます。フォルダーはファイルの前に表示されます。",
-	"sortOrder.mixed": "ファイルとフォルダーをアルファベット順に名前で並び替えます。ファイルはフォルダーと混交して表示されます。",
-	"sortOrder.filesFirst": "ファイルとフォルダーをアルファベット順に名前で並び替えます。ファイルはフォルダーの前に表示されます。",
-	"sortOrder.type": "ファイルとフォルダーをアルファベット順に拡張子で並び替えます。フォルダーはファイルの前に表示されます。",
-	"sortOrder.modified": "ファイルとフォルダーを降順に最終更新日で並び替えます。フォルダーはファイルの前に表示されます。",
-	"sortOrder": "エクスプローラー内のファイルとフォルダーの並び順を制御します。既定の並び順に加えて、'mixed' (ファイルとフォルダーを混交した並び順)、' type' (ファイルの種類順)、' modified' (最終更新日時順)、または 'filesFirst' (フォルダーの前にファイルを並べる) のいずれかの並び順に設定できます。 ",
-	"explorer.decorations.colors": "ファイルの装飾に配色を使用するかどうかを制御します。",
-	"explorer.decorations.badges": "ファイルの装飾にバッジを使用するかどうかを制御します。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/files/browser/saveErrorHandler.i18n.json b/i18n/jpn/src/vs/workbench/parts/files/browser/saveErrorHandler.i18n.json
deleted file mode 100644
index a11f1cb6ffc..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/files/browser/saveErrorHandler.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"userGuide": "右側のエディター ツール バーの操作で、変更を [元に戻す] か、ディスクの内容を変更内容で [上書き] します",
-	"discard": "破棄",
-	"overwrite": "上書き",
-	"retry": "再試行",
-	"readonlySaveError": "'{0}' の保存に失敗しました。ファイルが書き込み禁止になっています。[上書き] を選択して保護を解除してください。",
-	"genericSaveError": "'{0}' の保存に失敗しました: {1}",
-	"staleSaveError": "'{0} の保存に失敗しました。ディスクの内容の方が新しくなっています。[比較] をクリックしてご使用のバージョンをディスク上のバージョンと比較してください。",
-	"compareChanges": "比較",
-	"saveConflictDiffLabel": "{0} (ディスク上) ↔ {1} ({2} 内) - 保存の競合を解決"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/files/browser/views/emptyView.i18n.json b/i18n/jpn/src/vs/workbench/parts/files/browser/views/emptyView.i18n.json
deleted file mode 100644
index ac152686d08..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/files/browser/views/emptyView.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"noWorkspace": "開いているフォルダーがありません",
-	"explorerSection": "ファイル エクスプローラー セクション",
-	"noWorkspaceHelp": "まだフォルダーをワークスペースに追加していません。",
-	"addFolder": "フォルダーの追加",
-	"noFolderHelp": "まだフォルダーを開いていません。",
-	"openFolder": "フォルダーを開く"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/files/browser/views/explorerDecorationsProvider.i18n.json b/i18n/jpn/src/vs/workbench/parts/files/browser/views/explorerDecorationsProvider.i18n.json
deleted file mode 100644
index 44e1e67ff1c..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/files/browser/views/explorerDecorationsProvider.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"label": "エクスプローラー",
-	"canNotResolve": "ワークスペース フォルダーを解決できません"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/files/browser/views/explorerView.i18n.json b/i18n/jpn/src/vs/workbench/parts/files/browser/views/explorerView.i18n.json
deleted file mode 100644
index 2397d9a49b4..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/files/browser/views/explorerView.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"explorerSection": "ファイル エクスプローラー セクション",
-	"treeAriaLabel": "ファイル エクスプローラー"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/files/browser/views/explorerViewer.i18n.json b/i18n/jpn/src/vs/workbench/parts/files/browser/views/explorerViewer.i18n.json
deleted file mode 100644
index f9c3565a125..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/files/browser/views/explorerViewer.i18n.json
+++ /dev/null
@@ -1,19 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"fileInputAriaLabel": "ファイル名を入力します。Enter キーを押して確認するか、Esc キーを押して取り消します。",
-	"filesExplorerViewerAriaLabel": "{0}、ファイル エクスプローラー",
-	"dropFolders": "ワークスペースにフォルダーを追加しますか?",
-	"dropFolder": "ワークスペースにフォルダーを追加しますか?",
-	"addFolders": "フォルダーの追加(&&A)",
-	"addFolder": "フォルダーの追加(&&A)",
-	"confirmMove": "'{0}' を移動しますか?",
-	"doNotAskAgain": "再度表示しない",
-	"moveButtonLabel": "移動(&&M)",
-	"confirmOverwriteMessage": "'{0}' は保存先フォルダーに既に存在します。置き換えてもよろしいですか。",
-	"irreversible": "このアクションは元に戻すことができません。",
-	"replaceButtonLabel": "置換(&&R)"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/files/browser/views/openEditorsView.i18n.json b/i18n/jpn/src/vs/workbench/parts/files/browser/views/openEditorsView.i18n.json
deleted file mode 100644
index 489a4baaeeb..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/files/browser/views/openEditorsView.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"openEditors": "開いているエディター",
-	"openEditosrSection": "[開いているエディター] セクション",
-	"treeAriaLabel": "開いているエディター: アクティブなファイルのリスト",
-	"dirtyCounter": "未保存 ({0})"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/files/browser/views/openEditorsViewer.i18n.json b/i18n/jpn/src/vs/workbench/parts/files/browser/views/openEditorsViewer.i18n.json
deleted file mode 100644
index 838a289ecd9..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/files/browser/views/openEditorsViewer.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"editorGroupAriaLabel": "{0}、エディター グループ",
-	"openEditorAriaLabel": "{0}、開いているエディター",
-	"saveAll": "すべて保存",
-	"closeAllUnmodified": "未変更を閉じる",
-	"closeAll": "すべて閉じる",
-	"compareWithSaved": "保存済みと比較",
-	"close": "閉じる",
-	"closeOthers": "その他を閉じる"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/files/common/dirtyFilesTracker.i18n.json b/i18n/jpn/src/vs/workbench/parts/files/common/dirtyFilesTracker.i18n.json
deleted file mode 100644
index 3d9f7a93103..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/files/common/dirtyFilesTracker.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"dirtyFile": "1 つの未保存のファイル",
-	"dirtyFiles": "{0} 個の未保存のファイル"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/files/common/editors/fileEditorInput.i18n.json b/i18n/jpn/src/vs/workbench/parts/files/common/editors/fileEditorInput.i18n.json
deleted file mode 100644
index a6f396bbe8c..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/files/common/editors/fileEditorInput.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"orphanedFile": "{0} (deleted from disk)"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/files/electron-browser/explorerViewlet.i18n.json b/i18n/jpn/src/vs/workbench/parts/files/electron-browser/explorerViewlet.i18n.json
deleted file mode 100644
index dd1350b07ca..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/files/electron-browser/explorerViewlet.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"folders": "フォルダー"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json b/i18n/jpn/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
deleted file mode 100644
index d74bc3c8267..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"filesCategory": "ファイル",
-	"revealInSideBar": "サイド バーに表示",
-	"acceptLocalChanges": "変更を使用してディスクの内容を上書き",
-	"revertLocalChanges": "変更を破棄してディスク上の内容に戻る",
-	"copyPathOfActive": "アクティブ ファイルのパスのコピー",
-	"saveAllInGroup": "グループ内のすべてを保存する",
-	"saveFiles": "すべてのファイルを保存",
-	"revert": "ファイルを元に戻す",
-	"compareActiveWithSaved": "保存済みファイルと作業中のファイルを比較",
-	"closeEditor": "エディターを閉じる",
-	"view": "表示",
-	"openToSide": "横に並べて開く",
-	"revealInWindows": "エクスプローラーで表示",
-	"revealInMac": "Finder で表示します",
-	"openContainer": "このアイテムのフォルダーを開く",
-	"copyPath": "パスのコピー",
-	"saveAll": "すべて保存",
-	"compareWithSaved": "保存済みと比較",
-	"compareWithSelected": "選択項目と比較",
-	"compareSource": "比較対象の選択",
-	"compareSelected": "選択項目の比較",
-	"close": "閉じる",
-	"closeOthers": "その他を閉じる",
-	"closeSaved": "保存済みを閉じる",
-	"closeAll": "すべて閉じる",
-	"deleteFile": "完全に削除"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json b/i18n/jpn/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
deleted file mode 100644
index e65ff7942d8..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
+++ /dev/null
@@ -1,72 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"newFile": "新しいファイル",
-	"newFolder": "新しいフォルダー",
-	"rename": "名前変更",
-	"delete": "削除",
-	"copyFile": "コピー",
-	"pasteFile": "貼り付け",
-	"retry": "再試行",
-	"renameWhenSourcePathIsParentOfTargetError": "既存のフォルダーに子を追加するには 'New Folder' や 'New File' コマンドを使用してください",
-	"newUntitledFile": "無題の新規ファイル",
-	"createNewFile": "新しいファイル",
-	"createNewFolder": "新しいフォルダー",
-	"deleteButtonLabelRecycleBin": "ごみ箱に移動(&&M)",
-	"deleteButtonLabelTrash": "ごみ箱に移動(&&M)",
-	"deleteButtonLabel": "削除(&&D)",
-	"dirtyMessageFilesDelete": "保存されていない変更があるファイルを削除します。続行しますか?",
-	"dirtyMessageFolderOneDelete": "保存されていない変更がある 1 個のファイルを含むフォルダーを削除します。続行しますか?",
-	"dirtyMessageFolderDelete": "保存されていない変更があるファイルを {0} 個含むフォルダーを削除します。続行しますか?",
-	"dirtyMessageFileDelete": "保存されていない変更があるファイルを削除します。続行しますか?",
-	"dirtyWarning": "保存しないと変更内容が失われます。",
-	"undoBin": "ごみ箱から復元できます。",
-	"undoTrash": "ごみ箱から復元できます。",
-	"doNotAskAgain": "再度表示しない",
-	"irreversible": "このアクションは元に戻すことができません。",
-	"binFailed": "ごみ箱を使用した削除に失敗しました。代わりに完全に削除しますか?",
-	"trashFailed": "ごみ箱を使用した削除に失敗しました。代わりに完全に削除しますか?",
-	"deletePermanentlyButtonLabel": "完全に削除(&&D)",
-	"retryButtonLabel": "再試行(&&R)",
-	"confirmMoveTrashMessageFilesAndDirectories": "次の {0} ファイル/ディレクトリとその内容を削除しますか?",
-	"confirmMoveTrashMessageMultipleDirectories": "次の {0} ディレクトリとその内容を削除しますか?",
-	"confirmMoveTrashMessageMultiple": "次の {0} 個のファイルを削除してもよろしいですか?",
-	"confirmMoveTrashMessageFolder": "'{0}' とその内容を削除しますか?",
-	"confirmMoveTrashMessageFile": "'{0}' を削除しますか?",
-	"confirmDeleteMessageFilesAndDirectories": "次の {0} ファイル/ディレクトリとその内容を完全に削除しますか?",
-	"confirmDeleteMessageMultipleDirectories": "次の {0} ディレクトリとその内容を完全に削除しますか?",
-	"confirmDeleteMessageMultiple": "次の {0} 個のファイルを完全に削除してもよろしいですか?",
-	"confirmDeleteMessageFolder": "'{0}' とその内容を完全に削除してもよろしいですか?",
-	"confirmDeleteMessageFile": "'{0}' を完全に削除してもよろしいですか?",
-	"addFiles": "ファイルを追加",
-	"confirmOverwrite": "保存先のフォルダーに同じ名前のファイルまたはフォルダーが既に存在します。置き換えてもよろしいですか?",
-	"replaceButtonLabel": "置換(&&R)",
-	"fileIsAncestor": "ペーストするファイルは送り先フォルダの上位にいます",
-	"fileDeleted": "ファイルは削除されたか移動されています",
-	"duplicateFile": "重複",
-	"globalCompareFile": "アクティブ ファイルを比較しています...",
-	"openFileToCompare": "まずファイルを開いてから別のファイルと比較してください",
-	"refresh": "最新の情報に更新",
-	"saveAllInGroup": "グループ内のすべてを保存する",
-	"focusOpenEditors": "開いているエディターのビューにフォーカスする",
-	"focusFilesExplorer": "ファイル エクスプローラーにフォーカスを置く",
-	"showInExplorer": "アクティブ ファイルをサイド バーに表示",
-	"openFileToShow": "エクスプローラーでファイルを表示するには、ファイルをまず開く必要があります",
-	"collapseExplorerFolders": "エクスプローラーのフォルダーを折りたたむ",
-	"refreshExplorer": "エクスプローラーを最新表示する",
-	"openFileInNewWindow": "新しいウィンドウでアクティブ ファイルを開く",
-	"openFileToShowInNewWindow": "まずファイルを開いてから新しいウィンドウで開きます",
-	"copyPath": "パスのコピー",
-	"emptyFileNameError": "ファイルまたはフォルダーの名前を指定する必要があります。",
-	"fileNameStartsWithSlashError": "ファイルまたはフォルダーの名前はスラッシュで始めることができません。",
-	"fileNameExistsError": "**{0}** というファイルまたはフォルダーはこの場所に既に存在します。別の名前を指定してください。",
-	"invalidFileNameError": "名前 **{0}** がファイル名またはフォルダー名として無効です。別の名前を指定してください。",
-	"filePathTooLongError": "名前 **{0}** のパスが長すぎます。名前を短くしてください。",
-	"compareWithClipboard": "クリップボードとアクティブ ファイルを比較",
-	"clipboardComparisonLabel": "クリップボード ↔ {0}"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json b/i18n/jpn/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
deleted file mode 100644
index 67b41ed99db..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"revealInWindows": "エクスプローラーで表示",
-	"revealInMac": "Finder で表示します",
-	"openContainer": "このアイテムのフォルダーを開く",
-	"saveAs": "名前を付けて保存...",
-	"save": "保存",
-	"saveAll": "すべて保存",
-	"removeFolderFromWorkspace": "ワークスペースからフォルダーを削除",
-	"genericRevertError": "元へ戻すことに失敗しました '{0}': {1}",
-	"modifiedLabel": "{0} (ローカル) ↔ {1}",
-	"openFileToReveal": "まずファイルを開いてから表示します",
-	"openFileToCopy": "まずファイルを開いてからそのパスをコピーします"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json b/i18n/jpn/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
deleted file mode 100644
index fa96297a410..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"showExplorerViewlet": "エクスプローラーを表示",
-	"explore": "エクスプローラー",
-	"view": "表示",
-	"textFileEditor": "テキスト ファイル エディター",
-	"binaryFileEditor": "バイナリ ファイル エディター",
-	"filesConfigurationTitle": "ファイル",
-	"exclude": "ファイルとフォルダーを除外するための glob パターンを構成します。たとえば、ファイル エクスプローラーではこの設定に基づいてファイルとフォルダーの表示や非表示を決定します。",
-	"files.exclude.boolean": "ファイル パスの照合基準となる glob パターン。これを true または false に設定すると、パターンがそれぞれ有効/無効になります。",
-	"files.exclude.when": "一致するファイルの兄弟をさらにチェックします。一致するファイル名の変数として $(basename) を使用します。",
-	"associations": "言語に対するファイルの関連付け (例 \"*.extension\": \"html\") を構成します。これらの関連付けは、インストールされている言語の既定の関連付けより優先されます。",
-	"encoding": "ファイルの読み取り/書き込みで使用する既定の文字セット エンコーディング。言語ごとに構成することも可能です。",
-	"autoGuessEncoding": "有効な場合、ファイルを開くときに文字セット エンコードを推測します。言語ごとに構成することも可能です。",
-	"eol": "既定の改行文字。LF の場合には \\n を CRLF の場合には \\r\\n を使用してください。",
-	"trimTrailingWhitespace": "有効にすると、ファイルの保存時に末尾の空白をトリミングします。",
-	"insertFinalNewline": "有効にすると、ファイルの保存時に最新の行を末尾に挿入します。",
-	"trimFinalNewlines": "有効にすると、ファイルの保存時に最終行以降の新しい行をトリミングします。",
-	"files.autoSave.off": "ダーティ ファイルを自動的に保存することはしません。",
-	"files.autoSave.afterDelay": "'files.autoSaveDelay' で構成された時間の経過後に、ダーティ ファイルを自動的に保存します。",
-	"files.autoSave.onFocusChange": "エディターがフォーカスを失った時点で、ダーティ ファイルを自動的に保存します。",
-	"files.autoSave.onWindowChange": "ウィンドウがフォーカスを失った時点で、ダーティ ファイルを自動的に保存します。",
-	"autoSave": "ダーティ ファイルの自動保存を制御します。有効な値: '{0}'、'{1}'、'{2}' (エディターがフォーカスを失います)、'{3}' (ウィンドウがフォーカスを失います)。'{4}' に設定すると、'files.autoSaveDelay' で遅延を構成できます。",
-	"autoSaveDelay": "ダーティ ファイルの自動保存の遅延をミリ秒単位で制御します。'files.autoSave' が '{0}' に設定されている場合のみ適用されます",
-	"watcherExclude": "ファイル監視から除外するファイル パスの glob パターンを設定します。パターンは絶対パスで一致する必要があります (つまり、適切に一致するには、プレフィックス ** を指定するか、完全パスを指定します\n)。この設定を変更した場合は、再起動が必要になります。始動時に Code が消費する CPU 時間が多い場合は、大きいフォルダーを除外すれば初期の負荷を減らすことができます。",
-	"hotExit.off": "Hot Exit を無効にします。",
-	"hotExit.onExit": "アプリケーションが閉じると (Windows/Linux で最後のウィンドウが閉じるとき、または workbench.action.quit コマンドがトリガーされるとき (コマンド パレット、キー バインド、メニュー))、Hot Exit がトリガーされます。バックアップされているすべてのウィンドウは、次の起動時に復元されます。",
-	"hotExit.onExitAndWindowClose": "アプリケーションが閉じると (Windows/Linux で最後のウィンドウが閉じるとき、または workbench.action.quit コマンドがトリガーするとき (コマンド パレット、キー バインド、メニュー))、Hot Exit がトリガーされます。また、フォルダーが開かれているウィンドウについても、それが最後のウィンドウかどうかに関係なく、Hot Exit がトリガーされます。フォルダーが開かれていないウィンドウはすべて、次回の起動時に復元されます。フォルダーのウィンドウをシャットダウン前と同じ状態に復元するには、\"window.restoreWindows\" を \"all\" に設定します。",
-	"hotExit": "エディターを終了するときに保存を確認するダイアログを省略し、保存されていないファイルをセッション後も保持するかどうかを制御します。",
-	"useExperimentalFileWatcher": "新しい試験的な File Watcher を使用します。",
-	"defaultLanguage": "新しいファイルに割り当てられる既定の言語モード。",
-	"maxMemoryForLargeFilesMB": "大きなファイルを開こうとしたとき、VS Code の再起動後に使用できるメモリを制御します。コマンド ラインで --max-memory=NEWSIZE を指定するのと同じ効果があります。",
-	"editorConfigurationTitle": "エディター",
-	"formatOnSave": "ファイルを保存するときにフォーマットしてください。フォーマッタを使用可能にして、ファイルを自動保存せず、エディターをシャットダウンしないでください。",
-	"formatOnSaveTimeout": "保存時フォーマットのタイムアウトを制御します。formatOnSave-コマンドの時間制限をミリ秒単位で指定してください。指定したタイムアウトよりも時間がかかるコマンドはキャンセルされます。",
-	"explorerConfigurationTitle": "エクスプローラー",
-	"openEditorsVisible": "[開いているエディター] ウィンドウに表示するエディターの数。",
-	"autoReveal": "エクスプローラーでファイルを開くとき、自動的にファイルの内容を表示して選択するかどうかを制御します。",
-	"enableDragAndDrop": "ドラッグ アンド ドロップを使用したファイルとフォルダーの移動をエクスプローラーが許可するかどうかを制御します。",
-	"confirmDragAndDrop": "ドラッグ アンド ドロップを使用したファイルやフォルダーの移動時にエクスプローラーが確認を求めるかどうかを制御します。",
-	"confirmDelete": "ごみ箱を経由したファイル削除時にエクスプローラーが確認を求めるかどうかを制御します。",
-	"sortOrder.default": "ファイルとフォルダーをアルファベット順に名前で並び替えます。フォルダーはファイルの前に表示されます。",
-	"sortOrder.mixed": "ファイルとフォルダーをアルファベット順に名前で並び替えます。ファイルはフォルダーと混交して表示されます。",
-	"sortOrder.filesFirst": "ファイルとフォルダーをアルファベット順に名前で並び替えます。ファイルはフォルダーの前に表示されます。",
-	"sortOrder.type": "ファイルとフォルダーをアルファベット順に拡張子で並び替えます。フォルダーはファイルの前に表示されます。",
-	"sortOrder.modified": "ファイルとフォルダーを降順に最終更新日で並び替えます。フォルダーはファイルの前に表示されます。",
-	"sortOrder": "エクスプローラー内のファイルとフォルダーの並び順を制御します。既定の並び順に加えて、'mixed' (ファイルとフォルダーを混交した並び順)、' type' (ファイルの種類順)、' modified' (最終更新日時順)、または 'filesFirst' (フォルダーの前にファイルを並べる) のいずれかの並び順に設定できます。 ",
-	"explorer.decorations.colors": "ファイルの装飾に配色を使用するかどうかを制御します。",
-	"explorer.decorations.badges": "ファイルの装飾にバッジを使用するかどうかを制御します。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json b/i18n/jpn/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json
deleted file mode 100644
index 7134cb66e13..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"userGuide": "エディター ツール バーの操作で、変更を元に戻すか、ディスクの内容を変更内容で上書きします。",
-	"staleSaveError": "'{0} の保存に失敗しました。ディスクの内容の方が新しくなっています。ご使用のバージョンをディスク上のバージョンと比較してください。",
-	"retry": "再試行",
-	"discard": "破棄",
-	"readonlySaveErrorAdmin": "'{0}' の保存に失敗しました。ファイルが書き込み禁止になっています。[管理者権限で上書き] を選択して管理者として再試行してください。",
-	"readonlySaveError": "'{0}' の保存に失敗しました。ファイルが書き込み禁止になっています。[上書き] を選択して保護の解除を試してください。",
-	"permissionDeniedSaveError": "'{0}' の保存に失敗しました。十分な権限がありません。[管理者権限で再試行] を選択して管理者として再試行してください。",
-	"genericSaveError": "'{0}' の保存に失敗しました: {1}",
-	"learnMore": "詳細情報",
-	"dontShowAgain": "今後は表示しない",
-	"compareChanges": "比較",
-	"saveConflictDiffLabel": "{0} (ディスク上) ↔ {1} ({2} 内) - 保存の競合を解決",
-	"overwriteElevated": "管理者権限で上書き...",
-	"saveElevated": "管理者権限で再試行...",
-	"overwrite": "上書き"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/files/electron-browser/views/emptyView.i18n.json b/i18n/jpn/src/vs/workbench/parts/files/electron-browser/views/emptyView.i18n.json
deleted file mode 100644
index fc2d04da275..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/files/electron-browser/views/emptyView.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noWorkspace": "開いているフォルダーがありません",
-	"explorerSection": "ファイル エクスプローラー セクション",
-	"noWorkspaceHelp": "まだフォルダーをワークスペースに追加していません。",
-	"addFolder": "フォルダーの追加",
-	"noFolderHelp": "まだフォルダーを開いていません。",
-	"openFolder": "フォルダーを開く"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/files/electron-browser/views/explorerDecorationsProvider.i18n.json b/i18n/jpn/src/vs/workbench/parts/files/electron-browser/views/explorerDecorationsProvider.i18n.json
deleted file mode 100644
index 08544cd8f54..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/files/electron-browser/views/explorerDecorationsProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"label": "エクスプローラー",
-	"canNotResolve": "ワークスペース フォルダーを解決できません",
-	"symbolicLlink": "シンボリック リンク"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/files/electron-browser/views/explorerView.i18n.json b/i18n/jpn/src/vs/workbench/parts/files/electron-browser/views/explorerView.i18n.json
deleted file mode 100644
index 62ce8401e35..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/files/electron-browser/views/explorerView.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"explorerSection": "ファイル エクスプローラー セクション",
-	"treeAriaLabel": "ファイル エクスプローラー"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json b/i18n/jpn/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
deleted file mode 100644
index 4d56ec46874..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"fileInputAriaLabel": "ファイル名を入力します。Enter キーを押して確認するか、Esc キーを押して取り消します。",
-	"createFileFromExplorerInfoMessage": "**{1}** にファイル **{0}** を作成",
-	"renameFileFromExplorerInfoMessage": "**{0}** に移動と名前変更",
-	"createFolderFromExplorerInfoMessage": "**{1}** にフォルダー **{0}** を作成",
-	"filesExplorerViewerAriaLabel": "{0}、ファイル エクスプローラー",
-	"dropFolders": "ワークスペースにフォルダーを追加しますか?",
-	"dropFolder": "ワークスペースにフォルダーを追加しますか?",
-	"addFolders": "フォルダーの追加(&&A)",
-	"addFolder": "フォルダーの追加(&&A)",
-	"confirmRootsMove": "ワークスペース内の複数のルート フォルダーの順序が変更されますがよろしいですか?",
-	"confirmMultiMove": "次の {0} 個のファイルを移動してもよろしいですか?",
-	"confirmRootMove": "ワークスペース内のルート フォルダー '{0}' の順序が変更されますがよろしいですか?",
-	"confirmMove": "'{0}' を移動しますか?",
-	"doNotAskAgain": "再度表示しない",
-	"moveButtonLabel": "移動(&&M)",
-	"confirmOverwriteMessage": "'{0}' は保存先フォルダーに既に存在します。置き換えてもよろしいですか。",
-	"irreversible": "このアクションは元に戻すことができません。",
-	"replaceButtonLabel": "置換(&&R)"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json b/i18n/jpn/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json
deleted file mode 100644
index 7befdcbac2f..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openEditors": "開いているエディター",
-	"openEditosrSection": "[開いているエディター] セクション",
-	"dirtyCounter": "未保存 ({0})"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/files/electron-browser/views/openEditorsViewer.i18n.json b/i18n/jpn/src/vs/workbench/parts/files/electron-browser/views/openEditorsViewer.i18n.json
deleted file mode 100644
index 838a289ecd9..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/files/electron-browser/views/openEditorsViewer.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"editorGroupAriaLabel": "{0}、エディター グループ",
-	"openEditorAriaLabel": "{0}、開いているエディター",
-	"saveAll": "すべて保存",
-	"closeAllUnmodified": "未変更を閉じる",
-	"closeAll": "すべて閉じる",
-	"compareWithSaved": "保存済みと比較",
-	"close": "閉じる",
-	"closeOthers": "その他を閉じる"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/git/browser/gitActions.contribution.i18n.json b/i18n/jpn/src/vs/workbench/parts/git/browser/gitActions.contribution.i18n.json
deleted file mode 100644
index 554c11165fc..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/git/browser/gitActions.contribution.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"switchToChangesView": "変更の表示に切り替え",
-	"openInEditor": "エディター ビューに切り替える",
-	"workbenchStage": "ステージ",
-	"workbenchUnstage": "ステージング解除",
-	"stageSelectedLines": "選択した行のステージング",
-	"unstageSelectedLines": "選択した行のステージング解除",
-	"revertSelectedLines": "選択した行を元に戻す",
-	"confirmRevertMessage": "選択した変更を元に戻しますか?",
-	"irreversible": "このアクションは元に戻すことができません。",
-	"revertChangesLabel": "変更を元に戻す(&&R)",
-	"openChange": "変更を開く",
-	"openFile": "ファイルを開く",
-	"git": "Git"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/git/browser/gitActions.i18n.json b/i18n/jpn/src/vs/workbench/parts/git/browser/gitActions.i18n.json
deleted file mode 100644
index ce6ff9ebb9d..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/git/browser/gitActions.i18n.json
+++ /dev/null
@@ -1,46 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"openChange": "変更を開く",
-	"openFile": "ファイルを開く",
-	"init": "初期化",
-	"refresh": "最新の情報に更新",
-	"stageChanges": "ステージ",
-	"stageAllChanges": "すべてステージング",
-	"confirmUndoMessage": "変更をすべて取り除いてもよろしいですか?",
-	"confirmUndoAllOne": "{0} ファイルにステージングされていない変更があります。\n\nこのアクションは元に戻すことができません。",
-	"confirmUndoAllMultiple": "{0} ファイルにステージングされていない変更があります。\n\nこのアクションは元に戻すことができません",
-	"cleanChangesLabel": "変更を取り除く(&&C)",
-	"confirmUndo": "'{0}' の変更を取り除いてよろしいですか?",
-	"irreversible": "このアクションは元に戻すことができません。",
-	"undoChanges": "取り除く",
-	"undoAllChanges": "すべて取り除く",
-	"unstage": "ステージング解除",
-	"unstageAllChanges": "すべてステージング解除",
-	"dirtyTreeCheckout": "チェックアウトできません。まず作業をコミットまたは一時退避してください。",
-	"commitStaged": "ステージング済みをコミット",
-	"commitStagedAmend": "コミットしてステージング (修正)",
-	"commitStagedSignedOff": "コミットしてステージング (サインオフ)",
-	"commit": "Commit",
-	"commitMessage": "コミット メッセージ",
-	"commitAll": "すべてコミット",
-	"commitAllSignedOff": "すべてコミット (サインオフ)",
-	"commitAll2": "すべてコミット",
-	"commitStaged2": "ステージング済みをコミット",
-	"dirtyTreePull": "プルできません。まず作業をコミットまたは一時退避してください。",
-	"authFailed": "Git リモートで認証が失敗しました。",
-	"pushToRemote": "プッシュ先...",
-	"pushToRemotePickMessage": "リモートを選んで、ブランチ '{0}' を次にプッシュします:",
-	"publish": "公開",
-	"confirmPublishMessage": "'{0}' を '{1}' に発行してよろしいですか?",
-	"confirmPublishMessageButton": "公開(&&P)",
-	"publishPickMessage": "リモートを選んで、ブランチ '{0}' を次に公開します:",
-	"sync is unpredictable": "このアクションはコミットを '{0}' との間でプッシュしたりプルしたりします。",
-	"ok": "OK",
-	"cancel": "キャンセル",
-	"never again": "OK、今後は表示しない",
-	"undoLastCommit": "前回のコミットを元に戻す"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/git/browser/gitQuickOpen.i18n.json b/i18n/jpn/src/vs/workbench/parts/git/browser/gitQuickOpen.i18n.json
deleted file mode 100644
index c34ce3a6ec2..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/git/browser/gitQuickOpen.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"refAriaLabel": "{0}、Git",
-	"checkoutBranch": "{0} のブランチ",
-	"checkoutRemoteBranch": "{0} でのリモート ブランチ",
-	"checkoutTag": "{0} のタグ",
-	"alreadyCheckedOut": "ブランチ {0} は既に現在のブランチになっています",
-	"branchAriaLabel": "{0}、Git ブランチ",
-	"createBranch": "ブランチ {0} を作成します",
-	"noBranches": "他のブランチがありません",
-	"notValidBranchName": "有効なブランチ名を指定してください"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/git/browser/gitServices.i18n.json b/i18n/jpn/src/vs/workbench/parts/git/browser/gitServices.i18n.json
deleted file mode 100644
index aacc90b0839..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/git/browser/gitServices.i18n.json
+++ /dev/null
@@ -1,30 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"cantOpen": "この Git リソースを開けません。",
-	"gitIndexChanges": "{0} (index) ↔ {1}",
-	"gitIndexChangesDesc": "{0} - インデックスでの変更",
-	"gitIndexChangesRenamed": "{0} ← {1}",
-	"gitIndexChangesRenamedDesc": "{0} - 名前変更済み - インデックスでの変更",
-	"workingTreeChanges": "{0} (HEAD) ↔ {1}",
-	"workingTreeChangesDesc": "{0} - 作業ツリーでの変更",
-	"gitMergeChanges": "{0} (merge) ↔ {1}",
-	"gitMergeChangesDesc": "{0} - 変更のマージ",
-	"updateGit": "git {0} がインストールされているようです。Code は 2.0.0 以上の git で最適に動作します。",
-	"download": "ダウンロード",
-	"neverShowAgain": "今後は表示しない",
-	"configureUsernameEmail": "Git ユーザー名と電子メールを構成してください。",
-	"badConfigFile": "Git {0}",
-	"unmergedChanges": "変更をコミットする前に、まずマージされていない変更を解決する必要があります。",
-	"showOutput": "出力の表示",
-	"cancel": "キャンセル",
-	"checkNativeConsole": "Git の操作を実行しているときに問題が発生しました。出力を確認するか、コンソールを使用してリポジトリの状態を確認してください。",
-	"changesFromIndex": "{0} (index)",
-	"changesFromIndexDesc": "{0} - インデックスでの変更",
-	"changesFromTree": "{0} ({1})",
-	"changesFromTreeDesc": "{0} - {1} での変更",
-	"cantOpenResource": "この Git リソースを開けません。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/git/browser/gitWidgets.i18n.json b/i18n/jpn/src/vs/workbench/parts/git/browser/gitWidgets.i18n.json
deleted file mode 100644
index 595623e07b1..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/git/browser/gitWidgets.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"publishBranch": "ブランチの発行",
-	"syncBranch": "変更の同期",
-	"gitNotEnabled": "このワークスペースでは Git が有効になっていません。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/git/browser/gitWorkbenchContributions.i18n.json b/i18n/jpn/src/vs/workbench/parts/git/browser/gitWorkbenchContributions.i18n.json
deleted file mode 100644
index 6054027b323..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/git/browser/gitWorkbenchContributions.i18n.json
+++ /dev/null
@@ -1,23 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"gitProgressBadge": "実行中の Git の状態",
-	"gitPendingChangesBadge": "{0} 個の保留中の変更",
-	"toggleGitViewlet": "Git を表示",
-	"git": "Git",
-	"view": "表示",
-	"gitCommands": "Git コマンド",
-	"gitConfigurationTitle": "Git",
-	"gitEnabled": "は Git 対応です",
-	"gitPath": "Git 実行可能ファイルのパス",
-	"gitAutoRefresh": "自動更新が有効かどうか",
-	"gitAutoFetch": "自動フェッチの有効/無効。",
-	"gitLongCommit": "長いコミット メッセージを警告するかどうか。",
-	"gitLargeRepos": "Code による大規模なリポジトリの管理を常に許可します。",
-	"confirmSync": "Git リポジトリを同期する前に確認します。",
-	"countBadge": "Git バッジ カウンターを制御します。",
-	"checkoutType": "一覧表示する分岐の種類を制御します。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/git/browser/views/changes/changesView.i18n.json b/i18n/jpn/src/vs/workbench/parts/git/browser/views/changes/changesView.i18n.json
deleted file mode 100644
index 5dfa3536c5d..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/git/browser/views/changes/changesView.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"needMessage": "コミット メッセージを入力してください。**{0}** を押すといつでも変更をコミットできます。ステージング済みの変更がある場合は、それらの変更だけがコミットされます。それ以外の場合は、すべての変更がコミットされます。",
-	"nothingToCommit": "コミットする変更があった時点で、コミット メッセージを入力するか、**{0}** を押して変更をコミットしてください。ステージング済みの変更がある場合は、それらの変更だけがコミットされます。それ以外の場合は、すべての変更がコミットされます。",
-	"longCommit": "コミットの最初の行は 50 文字を超えない長さにすることをお勧めします。補足情報は追加の行を使用して記載できます。",
-	"commitMessage": "Message (press {0} to commit)",
-	"commitMessageAriaLabel": "Git: コミット メッセージを入力し、{0} を押してコミットしてください",
-	"treeAriaLabel": "Git 変更の表示",
-	"showOutput": "Git 出力の表示"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/git/browser/views/changes/changesViewer.i18n.json b/i18n/jpn/src/vs/workbench/parts/git/browser/views/changes/changesViewer.i18n.json
deleted file mode 100644
index ce409be7775..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/git/browser/views/changes/changesViewer.i18n.json
+++ /dev/null
@@ -1,38 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"stagedChanges": "ステージング済みの変更",
-	"allChanges": "変更",
-	"mergeChanges": "変更のマージ",
-	"outsideOfWorkspace": "このファイルは現在のワークスペースの外にあります。",
-	"modified-char": "M",
-	"added-char": "A",
-	"deleted-char": "D",
-	"renamed-char": "R",
-	"copied-char": "C",
-	"untracked-char": "U",
-	"ignored-char": "!",
-	"title-index-modified": "インデックスで変更済み",
-	"title-modified": "変更済み",
-	"title-index-added": "インデックスに追加済み",
-	"title-index-deleted": "インデックスで削除済み",
-	"title-deleted": "削除済み",
-	"title-index-renamed": "インデックスで名前を変更済み",
-	"title-index-copied": "インデックスでコピー済み",
-	"title-untracked": "追跡対象外",
-	"title-ignored": "無視",
-	"title-conflict-both-deleted": "競合: 両方削除",
-	"title-conflict-added-by-us": "競合: こちらが追加",
-	"title-conflict-deleted-by-them": "競合: 他者が削除",
-	"title-conflict-added-by-them": "競合: 他者が追加",
-	"title-conflict-deleted-by-us": "競合: こちらが削除",
-	"title-conflict-both-added": "競合: 両方追加",
-	"title-conflict-both-modified": "競合: 両方変更",
-	"fileStatusAriaLabel": "フォルダー {1} 内のファイル {0} の状態: {2}、Git",
-	"ariaLabelStagedChanges": "ステージング済みの変更、Git",
-	"ariaLabelChanges": "変更、Git",
-	"ariaLabelMerge": "マージ、Git"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/git/browser/views/disabled/disabledView.i18n.json b/i18n/jpn/src/vs/workbench/parts/git/browser/views/disabled/disabledView.i18n.json
deleted file mode 100644
index 3db3a4400b0..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/git/browser/views/disabled/disabledView.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"disabled": "設定で Git が無効になっています。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/git/browser/views/empty/emptyView.i18n.json b/i18n/jpn/src/vs/workbench/parts/git/browser/views/empty/emptyView.i18n.json
deleted file mode 100644
index d0836b0f48b..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/git/browser/views/empty/emptyView.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"noGit": "このワークスペースはまだ Git ソース管理下にありません。",
-	"gitinit": "Git リポジトリの初期化"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/git/browser/views/gitless/gitlessView.i18n.json b/i18n/jpn/src/vs/workbench/parts/git/browser/views/gitless/gitlessView.i18n.json
deleted file mode 100644
index 9330a8db033..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/git/browser/views/gitless/gitlessView.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"macInstallWith": "{0} を使用してインストールするか、{1} からダウンロードするか、ターミナルのプロンプトで単に {3} と入力して {2} コマンド ライン開発者ツールをインストールできます。",
-	"winInstallWith": "{0} を使用してインストールするか、{1} からダウンロードできます。",
-	"linuxDownloadFrom": "{0} からダウンロードできます。",
-	"downloadFrom": "{0} からダウンロードできます。",
-	"looksLike": "システムに Git がインストールされていない可能性があります。",
-	"pleaseRestart": "Git をインストールし終えたら、VSCode を再起動してください。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/git/browser/views/huge/hugeView.i18n.json b/i18n/jpn/src/vs/workbench/parts/git/browser/views/huge/hugeView.i18n.json
deleted file mode 100644
index 413e5cadb32..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/git/browser/views/huge/hugeView.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"huge": "リポジトリに有効な変更が数多くある可能性があります。\nこれにより、コードの速度が大幅に低下することがあります。",
-	"setting": "次の設定を使用してこの警告を完全に無効にできます:",
-	"allo": "大規模なリポジトリを許可します"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/git/browser/views/notroot/notrootView.i18n.json b/i18n/jpn/src/vs/workbench/parts/git/browser/views/notroot/notrootView.i18n.json
deleted file mode 100644
index b2a6a5d5d89..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/git/browser/views/notroot/notrootView.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"wrongRoot": "このディレクトリは Git リポジトリに含まれているようです。",
-	"pleaseRestart": "Git 機能にアクセスするには、リポジトリのルート ディレクトリを開きます。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/git/browser/views/noworkspace/noworkspaceView.i18n.json b/i18n/jpn/src/vs/workbench/parts/git/browser/views/noworkspace/noworkspaceView.i18n.json
deleted file mode 100644
index 98d841785de..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/git/browser/views/noworkspace/noworkspaceView.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"noWorkspaceHelp": "まだフォルダーを開いていません。",
-	"pleaseRestart": "Git 機能にアクセスするには、Git リポジトリのあるフォルダーを開きます。",
-	"openFolder": "フォルダーを開く"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/git/electron-browser/git.contribution.i18n.json b/i18n/jpn/src/vs/workbench/parts/git/electron-browser/git.contribution.i18n.json
deleted file mode 100644
index 103da658214..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/git/electron-browser/git.contribution.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"toggleSCMViewlet": "SCM を表示",
-	"git": "Git"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/git/electron-browser/gitActions.i18n.json b/i18n/jpn/src/vs/workbench/parts/git/electron-browser/gitActions.i18n.json
deleted file mode 100644
index a98721ce88d..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/git/electron-browser/gitActions.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"valid": "有効な Git リポジトリの URL を入力してください",
-	"url": "リポジトリ URL",
-	"directory": "宛先の複製ディレクトリ",
-	"cloning": "リポジトリ '{0}' を複製しています...",
-	"already exists": "宛先レポジトリは既に存在しています。複製するための別のディレクトリを選択してください。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/git/electron-main/askpassService.i18n.json b/i18n/jpn/src/vs/workbench/parts/git/electron-main/askpassService.i18n.json
deleted file mode 100644
index 06ad0299d48..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/git/electron-main/askpassService.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"git": "Git"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/git/node/git.lib.i18n.json b/i18n/jpn/src/vs/workbench/parts/git/node/git.lib.i18n.json
deleted file mode 100644
index 99992ff6e22..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/git/node/git.lib.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"errorBuffer": "Git からファイルを開くことができません",
-	"fileBinaryError": "ファイルはバイナリのようなので、テキストとして開くことができません"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/html/browser/html.contribution.i18n.json b/i18n/jpn/src/vs/workbench/parts/html/browser/html.contribution.i18n.json
deleted file mode 100644
index 47e72aa69e4..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/html/browser/html.contribution.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"html.editor.label": "HTML プレビュー"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/html/browser/htmlPreviewPart.i18n.json b/i18n/jpn/src/vs/workbench/parts/html/browser/htmlPreviewPart.i18n.json
deleted file mode 100644
index d8a322eb85e..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/html/browser/htmlPreviewPart.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"html.voidInput": "エディター入力が正しくありません。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/html/browser/webview.contribution.i18n.json b/i18n/jpn/src/vs/workbench/parts/html/browser/webview.contribution.i18n.json
deleted file mode 100644
index e619da1dc8b..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/html/browser/webview.contribution.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"developer": "開発者"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/html/browser/webview.i18n.json b/i18n/jpn/src/vs/workbench/parts/html/browser/webview.i18n.json
deleted file mode 100644
index 7f5ae20d7db..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/html/browser/webview.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"devtools.webview": "開発者: Web ビュー ツール"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/html/browser/webviewCommands.i18n.json b/i18n/jpn/src/vs/workbench/parts/html/browser/webviewCommands.i18n.json
deleted file mode 100644
index 8a2601aeca2..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/html/browser/webviewCommands.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"editor.action.webvieweditor.showFind": "検索ウィジェットにフォーカスする",
-	"openToolsLabel": "Webview 開発者ツールを開く",
-	"refreshWebviewLabel": "WebView の再読み込み"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json b/i18n/jpn/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json
deleted file mode 100644
index 47e72aa69e4..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"html.editor.label": "HTML プレビュー"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json b/i18n/jpn/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json
deleted file mode 100644
index d8a322eb85e..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"html.voidInput": "エディター入力が正しくありません。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json b/i18n/jpn/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json
deleted file mode 100644
index e619da1dc8b..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"developer": "開発者"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json b/i18n/jpn/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json
deleted file mode 100644
index 14a4dc22123..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openToolsLabel": "Webview 開発者ツールを開く",
-	"refreshWebviewLabel": "WebView の再読み込み"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json b/i18n/jpn/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
deleted file mode 100644
index 19b3916384b..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"updateLocale": "VS Code の UI 言語を {0} にして再起動しますか?",
-	"yes": "はい",
-	"no": "いいえ",
-	"neverAgain": "今後は表示しない",
-	"JsonSchema.locale": "使用する UI 言語。",
-	"vscode.extension.contributes.localizations": "ローカリゼーションをエディターに提供します",
-	"vscode.extension.contributes.localizations.languageId": "表示文字列が翻訳される言語の id。",
-	"vscode.extension.contributes.localizations.languageName": "英語での言語の名前。",
-	"vscode.extension.contributes.localizations.languageNameLocalized": "提供された言語での言語の名前。",
-	"vscode.extension.contributes.localizations.translations": "言語に関連付けられている翻訳のリスト。",
-	"vscode.extension.contributes.localizations.translations.id": "この翻訳が提供される VS Code または拡張機能の ID。VS Code は常に `vscode` で、拡張機能の形式は `publisherId.extensionName` になります。",
-	"vscode.extension.contributes.localizations.translations.id.pattern": "VS Code または拡張機能を変換するための ID はそれぞれ、`vscode` か、`publisherId.extensionName` の形式になります。",
-	"vscode.extension.contributes.localizations.translations.path": "言語の翻訳を含むファイルへの相対パス。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/localizations/browser/localizationsActions.i18n.json b/i18n/jpn/src/vs/workbench/parts/localizations/browser/localizationsActions.i18n.json
deleted file mode 100644
index 3b68fb6c14d..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/localizations/browser/localizationsActions.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"configureLocale": "言語を構成する",
-	"displayLanguage": "VSCode の表示言語を定義します。",
-	"doc": "サポートされている言語の一覧については、{0} をご覧ください。",
-	"restart": "値を変更するには VS Code の再起動が必要です。",
-	"fail.createSettings": "'{0}' ({1}) を作成できません。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/localizations/electron-browser/localizations.contribution.i18n.json b/i18n/jpn/src/vs/workbench/parts/localizations/electron-browser/localizations.contribution.i18n.json
deleted file mode 100644
index 17369bf498c..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/localizations/electron-browser/localizations.contribution.i18n.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"updateLocale": "VS Code の UI 言語を {0} にして再起動しますか?",
-	"activateLanguagePack": "今インストールされた言語パックを有効にするために、VS Codeを再起動しますか？",
-	"yes": "はい",
-	"no": "いいえ",
-	"neverAgain": "今後は表示しない",
-	"install language pack": "近い将来、VS Code は Marketplace から入手する言語パックのみをサポートするようになります。現在構成している言語を使い続けるためには '{0}' 拡張機能をインストールしてください。",
-	"install": "インストール",
-	"more information": "詳細情報...",
-	"JsonSchema.locale": "使用する UI 言語。",
-	"vscode.extension.contributes.localizations": "ローカリゼーションをエディターに提供します",
-	"vscode.extension.contributes.localizations.languageId": "表示文字列が翻訳される言語の id。",
-	"vscode.extension.contributes.localizations.languageName": "英語での言語の名前。",
-	"vscode.extension.contributes.localizations.languageNameLocalized": "提供された言語での言語の名前。",
-	"vscode.extension.contributes.localizations.translations": "言語に関連付けられている翻訳のリスト。",
-	"vscode.extension.contributes.localizations.translations.id": "この翻訳が提供される VS Code または拡張機能の ID。VS Code は常に `vscode` で、拡張機能の形式は `publisherId.extensionName` になります。",
-	"vscode.extension.contributes.localizations.translations.id.pattern": "VS Code または拡張機能を変換するための ID はそれぞれ、`vscode` か、`publisherId.extensionName` の形式になります。",
-	"vscode.extension.contributes.localizations.translations.path": "言語の翻訳を含むファイルへの相対パス。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/localizations/electron-browser/localizationsActions.i18n.json b/i18n/jpn/src/vs/workbench/parts/localizations/electron-browser/localizationsActions.i18n.json
deleted file mode 100644
index d3e5957a330..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/localizations/electron-browser/localizationsActions.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"configureLocale": "表示言語を構成する",
-	"displayLanguage": "VSCode の表示言語を定義します。",
-	"doc": "サポートされている言語の一覧については、{0} をご覧ください。",
-	"restart": "値を変更するには VS Code の再起動が必要です。",
-	"fail.createSettings": "'{0}' ({1}) を作成できません。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json b/i18n/jpn/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json
deleted file mode 100644
index ae3a259ed98..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"mainLog": "ログ (メイン)",
-	"sharedLog": "ログ (共有)",
-	"rendererLog": "ログ (ウィンドウ)",
-	"extensionsLog": "ログ (拡張機能ホスト)",
-	"developer": "開発者"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json b/i18n/jpn/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json
deleted file mode 100644
index 109ecf99fed..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openLogsFolder": "ログ フォルダーを開く",
-	"showLogs": "ログの表示...",
-	"rendererProcess": "ウィンドウ ({0})",
-	"emptyWindow": "ウィンドウ",
-	"extensionHost": "拡張機能ホスト",
-	"sharedProcess": "共有",
-	"mainProcess": "メイン",
-	"selectProcess": "プロセスのログを選択",
-	"openLogFile": "ログ ファイルを開く...",
-	"setLogLevel": "ログ レベルの設定...",
-	"trace": "トレース",
-	"debug": "デバッグ",
-	"info": "情報",
-	"warn": "警告",
-	"err": "エラー",
-	"critical": "重大",
-	"off": "オフ",
-	"selectLogLevel": "ログ レベルを選択",
-	"default and current": "既定と現在",
-	"default": "既定",
-	"current": "現在"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/markers/browser/markersFileDecorations.i18n.json b/i18n/jpn/src/vs/workbench/parts/markers/browser/markersFileDecorations.i18n.json
deleted file mode 100644
index c361cf56e9a..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/markers/browser/markersFileDecorations.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"label": "問題",
-	"tooltip.1": "このファイルに 1 つの問題",
-	"tooltip.N": "このファイルに {0} 個の問題",
-	"markers.showOnFile": "ファイルとフォルダーにエラーと警告を表示します。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/markers/browser/markersPanel.i18n.json b/i18n/jpn/src/vs/workbench/parts/markers/browser/markersPanel.i18n.json
deleted file mode 100644
index 4d411c1a062..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/markers/browser/markersPanel.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"totalProblems": "合計 {0} 個の問題",
-	"filteredProblems": "{1} 個中 {0} 個の問題を表示しています"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/markers/common/markers.i18n.json b/i18n/jpn/src/vs/workbench/parts/markers/common/markers.i18n.json
deleted file mode 100644
index 4d411c1a062..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/markers/common/markers.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"totalProblems": "合計 {0} 個の問題",
-	"filteredProblems": "{1} 個中 {0} 個の問題を表示しています"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/markers/common/messages.i18n.json b/i18n/jpn/src/vs/workbench/parts/markers/common/messages.i18n.json
deleted file mode 100644
index d8eb9ed547f..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/markers/common/messages.i18n.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"viewCategory": "表示",
-	"problems.view.toggle.label": "問題  (エラー、警告、情報) の切り替え",
-	"problems.view.focus.label": "問題 (エラー、警告、情報) にフォーカス",
-	"problems.panel.configuration.title": "問題ビュー",
-	"problems.panel.configuration.autoreveal": "ファイルを開くときに問題ビューに自動的にそのファイルを表示するかどうかを制御します",
-	"markers.panel.title.problems": "問題",
-	"markers.panel.aria.label.problems.tree": "ファイル別にグループ化した問題",
-	"markers.panel.no.problems.build": "現時点でワークスペースの問題は検出されていません。",
-	"markers.panel.no.problems.filters": "指定されたフィルター条件による結果はありません",
-	"markers.panel.action.filter": "問題のフィルター処理",
-	"markers.panel.filter.placeholder": "種類またはテキストでフィルター処理",
-	"markers.panel.filter.errors": "エラー",
-	"markers.panel.filter.warnings": "警告",
-	"markers.panel.filter.infos": "情報",
-	"markers.panel.single.error.label": "エラー 1",
-	"markers.panel.multiple.errors.label": "エラー {0}",
-	"markers.panel.single.warning.label": "警告 1",
-	"markers.panel.multiple.warnings.label": "警告 {0}",
-	"markers.panel.single.info.label": "情報 1",
-	"markers.panel.multiple.infos.label": "情報 {0}",
-	"markers.panel.single.unknown.label": "不明 1",
-	"markers.panel.multiple.unknowns.label": "不明 {0}",
-	"markers.panel.at.ln.col.number": "({0}, {1})",
-	"problems.tree.aria.label.resource": "{0} (問題あり {1})",
-	"problems.tree.aria.label.error.marker": "{0}: {1} によって生成されたエラー (行 {2}、文字 {3})",
-	"problems.tree.aria.label.error.marker.nosource": "エラー: {0} (行 {1}、文字 {2})",
-	"problems.tree.aria.label.warning.marker": "{0}: {1} によって生成された警告 (行 {2}、文字 {3})",
-	"problems.tree.aria.label.warning.marker.nosource": "警告: {0} (行 {1}、文字 {2})",
-	"problems.tree.aria.label.info.marker": "{0}: {1} によって生成された情報 (行 {2}、文字 {3})",
-	"problems.tree.aria.label.info.marker.nosource": "情報: {0} (行 {1}、文字 {2})",
-	"problems.tree.aria.label.marker": "{0} によって生成された問題: {1} (行 {2}、文字 {3})",
-	"problems.tree.aria.label.marker.nosource": "問題: {0} (行 {1}、文字 {2})",
-	"errors.warnings.show.label": "エラーと警告の表示"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json b/i18n/jpn/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json
deleted file mode 100644
index c26e068a735..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"copyMarker": "コピー",
-	"copyMessage": "メッセージのコピー"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/markers/electron-browser/markers.i18n.json b/i18n/jpn/src/vs/workbench/parts/markers/electron-browser/markers.i18n.json
deleted file mode 100644
index 182631b8761..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/markers/electron-browser/markers.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"totalProblems": "合計 {0} 個の問題"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/markers/electron-browser/markersElectronContributions.i18n.json b/i18n/jpn/src/vs/workbench/parts/markers/electron-browser/markersElectronContributions.i18n.json
deleted file mode 100644
index d2939459ebd..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/markers/electron-browser/markersElectronContributions.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"copyMarker": "コピー",
-	"copyMarkerMessage": "メッセージのコピー"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.i18n.json b/i18n/jpn/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.i18n.json
deleted file mode 100644
index c361cf56e9a..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"label": "問題",
-	"tooltip.1": "このファイルに 1 つの問題",
-	"tooltip.N": "このファイルに {0} 個の問題",
-	"markers.showOnFile": "ファイルとフォルダーにエラーと警告を表示します。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/markers/electron-browser/markersPanel.i18n.json b/i18n/jpn/src/vs/workbench/parts/markers/electron-browser/markersPanel.i18n.json
deleted file mode 100644
index 9e750f7bf88..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/markers/electron-browser/markersPanel.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"disableFilesExclude": "ファイルの除外フィルターを無効にします。",
-	"clearFilter": "フィルターの解除。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/markers/electron-browser/markersPanelActions.i18n.json b/i18n/jpn/src/vs/workbench/parts/markers/electron-browser/markersPanelActions.i18n.json
deleted file mode 100644
index 568a2eaf8e4..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/markers/electron-browser/markersPanelActions.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"showing filtered problems": "{0}  / {1} を表示しています"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json b/i18n/jpn/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
deleted file mode 100644
index 58202066e48..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"viewCategory": "表示",
-	"problems.view.toggle.label": "問題  (エラー、警告、情報) の切り替え",
-	"problems.view.focus.label": "問題 (エラー、警告、情報) にフォーカス",
-	"problems.panel.configuration.title": "問題ビュー",
-	"problems.panel.configuration.autoreveal": "ファイルを開くときに問題ビューに自動的にそのファイルを表示するかどうかを制御します",
-	"markers.panel.title.problems": "問題",
-	"markers.panel.aria.label.problems.tree": "ファイル別にグループ化した問題",
-	"markers.panel.no.problems.build": "現時点でワークスペースの問題は検出されていません。",
-	"markers.panel.no.problems.filters": "指定されたフィルター条件による結果はありません。",
-	"markers.panel.no.problems.file.exclusions": "ファイルの除外設定が有効なため、すべての問題が非表示になっています。",
-	"markers.panel.action.useFilesExclude": "ファイルの除外設定を使用してフィルター処理",
-	"markers.panel.action.donotUseFilesExclude": "ファイルの除外設定を使用しない",
-	"markers.panel.action.filter": "問題のフィルター処理",
-	"markers.panel.filter.ariaLabel": "問題のフィルター処理",
-	"markers.panel.filter.placeholder": "フィルター。例: text, **/*.ts, !**/node_modules/**",
-	"markers.panel.filter.errors": "エラー",
-	"markers.panel.filter.warnings": "警告",
-	"markers.panel.filter.infos": "情報",
-	"markers.panel.single.error.label": "エラー 1",
-	"markers.panel.multiple.errors.label": "エラー {0}",
-	"markers.panel.single.warning.label": "警告 1",
-	"markers.panel.multiple.warnings.label": "警告 {0}",
-	"markers.panel.single.info.label": "情報 1",
-	"markers.panel.multiple.infos.label": "情報 {0}",
-	"markers.panel.single.unknown.label": "不明 1",
-	"markers.panel.multiple.unknowns.label": "不明 {0}",
-	"markers.panel.at.ln.col.number": "({0}, {1})",
-	"problems.tree.aria.label.resource": "{0} (問題あり {1})",
-	"problems.tree.aria.label.marker.relatedInformation": "この問題は {0} 個の箇所へ参照を持っています。",
-	"problems.tree.aria.label.error.marker": "{0}: {1} によって生成されたエラー (行 {2}、文字 {3}.{4})",
-	"problems.tree.aria.label.error.marker.nosource": "エラー: {0} (行 {1}、文字 {2}.{3})",
-	"problems.tree.aria.label.warning.marker": "{0}: {1} によって生成された警告 (行 {2}、文字 {3}.{4})",
-	"problems.tree.aria.label.warning.marker.nosource": "警告: {0} (行 {1}、文字 {2}.{3})",
-	"problems.tree.aria.label.info.marker": "{0}: {1} によって生成された情報 (行 {2}、文字 {3}.{4})",
-	"problems.tree.aria.label.info.marker.nosource": "情報: {0} (行 {1}、文字 {2}.{3})",
-	"problems.tree.aria.label.marker": "{0} によって生成された問題: {1} (行 {2}、文字 {3}.{4})",
-	"problems.tree.aria.label.marker.nosource": "問題: {0} (行 {1}、文字 {2}.{3})",
-	"problems.tree.aria.label.relatedinfo.message": "{0} ({3} の行 {1}、文字 {2})",
-	"errors.warnings.show.label": "エラーと警告の表示"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/nps/electron-browser/nps.contribution.i18n.json b/i18n/jpn/src/vs/workbench/parts/nps/electron-browser/nps.contribution.i18n.json
deleted file mode 100644
index 1b0a91d1c83..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/nps/electron-browser/nps.contribution.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"surveyQuestion": "短いフィードバック アンケートにご協力をお願いできますか?",
-	"takeSurvey": "アンケートの実施",
-	"remindLater": "後で通知する",
-	"neverAgain": "今後は表示しない"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/outline/electron-browser/outline.contribution.i18n.json b/i18n/jpn/src/vs/workbench/parts/outline/electron-browser/outline.contribution.i18n.json
deleted file mode 100644
index 5f57c312624..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/outline/electron-browser/outline.contribution.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"name": "概要",
-	"category.focus": "ファイル",
-	"label.focus": "アウトラインにフォーカスする"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/outline/electron-browser/outlinePanel.i18n.json b/i18n/jpn/src/vs/workbench/parts/outline/electron-browser/outlinePanel.i18n.json
deleted file mode 100644
index 46cf0edab80..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/outline/electron-browser/outlinePanel.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"filter": "フィルター",
-	"collapse": "すべて折りたたむ",
-	"sortByPosition": "並べ替え: 位置",
-	"sortByName": "並べ替え: 名前",
-	"sortByKind": "並べ替え: 種類",
-	"live": "カーソルに追従",
-	"no-editor": "概要情報を提供できるエディターが開かれていません。",
-	"too-many-symbols": "申し訳ありません、このファイルは大きすぎるのでアウトラインを表示できません。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/outline/electron-browser/outlineTree.i18n.json b/i18n/jpn/src/vs/workbench/parts/outline/electron-browser/outlineTree.i18n.json
deleted file mode 100644
index 45af06d7d67..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/outline/electron-browser/outlineTree.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"outline.title": "行 {1} の {0}"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/output/browser/output.contribution.i18n.json b/i18n/jpn/src/vs/workbench/parts/output/browser/output.contribution.i18n.json
deleted file mode 100644
index 83d92fa9895..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/output/browser/output.contribution.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"output": "出力",
-	"viewCategory": "表示",
-	"clearOutput.label": "出力のクリア"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/output/browser/outputActions.i18n.json b/i18n/jpn/src/vs/workbench/parts/output/browser/outputActions.i18n.json
deleted file mode 100644
index e980f87baa4..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/output/browser/outputActions.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleOutput": "出力の切り替え",
-	"clearOutput": "出力のクリア",
-	"toggleOutputScrollLock": "出力スクロール ロックの切り替え",
-	"switchToOutput.label": "出力に切り替え",
-	"openInLogViewer": "ログ ファイルを開く"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/output/browser/outputPanel.i18n.json b/i18n/jpn/src/vs/workbench/parts/output/browser/outputPanel.i18n.json
deleted file mode 100644
index 87725be8b44..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/output/browser/outputPanel.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"output": "出力",
-	"outputPanelWithInputAriaLabel": "{0}、出力パネル",
-	"outputPanelAriaLabel": "出力パネル"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/output/common/output.i18n.json b/i18n/jpn/src/vs/workbench/parts/output/common/output.i18n.json
deleted file mode 100644
index 76a777ba58e..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/output/common/output.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"output": "出力",
-	"channel": "'{0}' の"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json b/i18n/jpn/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
deleted file mode 100644
index 7ce6bdc9900..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"output": "出力",
-	"logViewer": "ログ ビューアー",
-	"viewCategory": "表示",
-	"clearOutput.label": "出力のクリア",
-	"openActiveLogOutputFile": "表示: アクティブなログ出力ファイルを開く"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json b/i18n/jpn/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json
deleted file mode 100644
index 03f9d6c7a38..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"output": "{0} - 出力",
-	"channel": "'{0}' の出力チャネル"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/performance/electron-browser/performance.contribution.i18n.json b/i18n/jpn/src/vs/workbench/parts/performance/electron-browser/performance.contribution.i18n.json
deleted file mode 100644
index bc5d929551c..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/performance/electron-browser/performance.contribution.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"prof.message": "プロファイルが正常に作成されました。",
-	"prof.detail": "案件を作成し、手動で次のファイルを添付してください:\\n{0}",
-	"prof.restartAndFileIssue": "問題を作成して再起動",
-	"prof.restart": "再起動",
-	"prof.thanks": "ご協力いただき、ありがとうございます。",
-	"prof.detail.restart": "'{0}' を引き続き使用するには、最後の再起動が必要です。 改めてあなたの貢献に感謝します。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/performance/electron-browser/startupProfiler.i18n.json b/i18n/jpn/src/vs/workbench/parts/performance/electron-browser/startupProfiler.i18n.json
deleted file mode 100644
index c9d5cc3ab50..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/performance/electron-browser/startupProfiler.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"prof.message": "プロファイルが正常に作成されました。",
-	"prof.detail": "案件を作成し、手動で次のファイルを添付してください:\\n{0}",
-	"prof.restartAndFileIssue": "問題を作成して再起動",
-	"prof.restart": "再起動",
-	"prof.thanks": "ご協力いただき、ありがとうございます。",
-	"prof.detail.restart": "'{0}' を引き続き使用するには、最後の再起動が必要です。 改めてあなたの貢献に感謝します。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/preferences/browser/keybindingWidgets.i18n.json b/i18n/jpn/src/vs/workbench/parts/preferences/browser/keybindingWidgets.i18n.json
deleted file mode 100644
index 5cd18931c08..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/preferences/browser/keybindingWidgets.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"defineKeybinding.oneExists": "1つの既存コマンドがこのキーバインドを使用しています",
-	"defineKeybinding.existing": "{0}つの既存コマンドがこのキーバインドを使用しています",
-	"defineKeybinding.initial": "任意のキーの組み合わせを押し、ENTER キーを押します。",
-	"defineKeybinding.chordsTo": "の次に"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json b/i18n/jpn/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
deleted file mode 100644
index efda21bd767..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"showDefaultKeybindings": "既定のキーバインドを表示",
-	"showUserKeybindings": "ユーザーのキーバインドを表示",
-	"SearchKeybindings.AriaLabel": "キー バインドの検索",
-	"SearchKeybindings.Placeholder": "キー バインドの検索",
-	"sortByPrecedene": "優先順位で並べ替え",
-	"header-message": "高度なカスタマイズを行うには、次を開いて編集:",
-	"keybindings-file-name": "keybindings.json",
-	"keybindingsLabel": "キー バインド",
-	"changeLabel": "キー バインドの変更",
-	"addLabel": "キー バインドの追加",
-	"removeLabel": "キー バインドの削除",
-	"resetLabel": "キー バインドのリセット",
-	"showSameKeybindings": "同じキーバインドを表示",
-	"copyLabel": "コピー",
-	"copyCommandLabel": "コピー コマンド",
-	"error": "キー バインドの編集中にエラー '{0}' が発生しました。'keybindings.json' ファイルを開いてご確認ください。",
-	"command": "コマンド",
-	"keybinding": "キー バインド",
-	"source": "ソース",
-	"when": "タイミング",
-	"editKeybindingLabelWithKey": "キー バインドの変更 {0}",
-	"editKeybindingLabel": "キー バインドの変更",
-	"addKeybindingLabelWithKey": "キー バインドの追加 {0}",
-	"addKeybindingLabel": "キー バインドの追加",
-	"title": "{0} ({1})",
-	"commandAriaLabel": "コマンドは {0} です。",
-	"keybindingAriaLabel": "キー バインドは {0} です。",
-	"noKeybinding": "キー バインドが割り当てられていません。",
-	"sourceAriaLabel": "ソースは {0} です。",
-	"whenAriaLabel": "タイミングは {0} です。",
-	"noWhen": "タイミングのコンテキストがありません。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/preferences/browser/keybindingsEditorContribution.i18n.json b/i18n/jpn/src/vs/workbench/parts/preferences/browser/keybindingsEditorContribution.i18n.json
deleted file mode 100644
index a7b524b185f..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/preferences/browser/keybindingsEditorContribution.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"defineKeybinding.start": "キー バインドの定義",
-	"defineKeybinding.kbLayoutErrorMessage": "現在のキーボード レイアウトでは、このキーの組み合わせを生成することはできません。",
-	"defineKeybinding.kbLayoutLocalAndUSMessage": "現在のキーボード レイアウトで示すと **{0}** です。(US 標準: **{1}**)",
-	"defineKeybinding.kbLayoutLocalMessage": "現在のキーボード レイアウトで示すと **{0}** です。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/preferences/browser/preferences.contribution.i18n.json b/i18n/jpn/src/vs/workbench/parts/preferences/browser/preferences.contribution.i18n.json
deleted file mode 100644
index 10d2433b22a..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/preferences/browser/preferences.contribution.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"defaultPreferencesEditor": "既定の基本設定エディター",
-	"keybindingsEditor": "キー バインド エディター",
-	"preferences": "基本設定"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json b/i18n/jpn/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
deleted file mode 100644
index 29c8a55e020..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openRawDefaultSettings": "既定の設定を Raw で開く",
-	"openSettings2": "設定を開く (プレビュー)",
-	"openSettings": "設定を開く",
-	"openGlobalSettings": "ユーザー設定を開く",
-	"openGlobalKeybindings": "キーボード ショートカットを開く",
-	"openGlobalKeybindingsFile": "キーボード ショートカット ファイルを開く",
-	"openWorkspaceSettings": "ワークスペース設定を開く",
-	"openFolderSettings": "フォルダーの設定を開く",
-	"configureLanguageBasedSettings": "言語固有の設定を構成します...",
-	"languageDescriptionConfigured": "({0})",
-	"pickLanguage": "言語の選択"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json b/i18n/jpn/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
deleted file mode 100644
index e3cca40ad76..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"SearchSettingsWidget.AriaLabel": "設定の検索",
-	"SearchSettingsWidget.Placeholder": "設定の検索",
-	"noSettingsFound": "結果なし",
-	"oneSettingFound": "1 個の設定が見つかりました",
-	"settingsFound": "{0} 個の設定が見つかりました",
-	"totalSettingsMessage": "合計 {0} 個の設定",
-	"nlpResult": "自然文 (natural language) の結果",
-	"filterResult": "フィルター後の結果",
-	"defaultSettings": "既定の設定",
-	"defaultUserSettings": "既定のユーザー設定",
-	"defaultWorkspaceSettings": "既定のワークスペース設定",
-	"defaultFolderSettings": "既定のフォルダー設定",
-	"defaultEditorReadonly": "既定値を上書きするには、右側のエディターを編集します。",
-	"preferencesAriaLabel": "既定の基本設定。読み取り専用のテキスト エディター。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json b/i18n/jpn/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
deleted file mode 100644
index c8dc571e62a..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"emptyUserSettingsHeader": "既定の設定を上書きするには、このファイル内に設定を挿入します。",
-	"emptyWorkspaceSettingsHeader": "ユーザー設定を上書きするには、このファイル内に設定を挿入します。",
-	"emptyFolderSettingsHeader": "ワークスペースの設定を上書きするには、このファイル内にフォルダーの設定を挿入します。",
-	"reportSettingsSearchIssue": "問題の報告",
-	"newExtensionLabel": "拡張機能 \"{0}\" を表示",
-	"editTtile": "編集",
-	"replaceDefaultValue": "設定を置換",
-	"copyDefaultValue": "設定にコピー"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/preferences/browser/preferencesService.i18n.json b/i18n/jpn/src/vs/workbench/parts/preferences/browser/preferencesService.i18n.json
deleted file mode 100644
index 626e2a42e4f..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/preferences/browser/preferencesService.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openFolderFirst": "ワークスペースの設定を作成するには、まずフォルダーを開いてください",
-	"emptyKeybindingsHeader": "既定値を上書きするには、このファイル内にキー バインドを挿入します",
-	"defaultKeybindings": "既定のキー バインド",
-	"folderSettingsName": "{0} (フォルダーの設定) ",
-	"fail.createSettings": "'{0}' ({1}) を作成できません。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json b/i18n/jpn/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
deleted file mode 100644
index 8465cccb637..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"defaultSettings": "上書きするには、右側のエディターに設定を入力します。",
-	"noSettingsFound": "設定が見つかりません。",
-	"settingsSwitcherBarAriaLabel": "設定切り替え",
-	"userSettings": "ユーザー設定",
-	"workspaceSettings": "ワークスペースの設定",
-	"folderSettings": "フォルダーの設定"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/preferences/browser/settingsEditor2.i18n.json b/i18n/jpn/src/vs/workbench/parts/preferences/browser/settingsEditor2.i18n.json
deleted file mode 100644
index cd42ac1c725..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/preferences/browser/settingsEditor2.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"previewWarning": "プレビュー",
-	"previewLabel": "これは私たちの新しい設定エディターのプレビューです。",
-	"SearchSettings.AriaLabel": "設定の検索",
-	"SearchSettings.Placeholder": "設定の検索",
-	"advancedCustomizationLabel": "高度なカスタマイズを行うには、次を開いて編集:",
-	"openSettingsLabel": "settings.json",
-	"showOverriddenOnly": "変更済みのみを表示",
-	"treeAriaLabel": "設定",
-	"feedbackButtonLabel": "フィードバックを提供"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/preferences/browser/settingsTree.i18n.json b/i18n/jpn/src/vs/workbench/parts/preferences/browser/settingsTree.i18n.json
deleted file mode 100644
index 14432e92b84..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/preferences/browser/settingsTree.i18n.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"modifiedItemForeground": "変更された設定の前景色。",
-	"workspace": "ワークスペース",
-	"user": "ユーザー",
-	"resetButtonTitle": "リセット",
-	"configured": "変更済み",
-	"alsoConfiguredIn": "次でも変更されています",
-	"configuredIn": "変更されています",
-	"editInSettingsJson": "settings.json で編集",
-	"settingRowAriaLabel": "{0} {1}、設定",
-	"groupRowAriaLabel": "{0}、グループ"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/preferences/common/keybindingsEditorModel.i18n.json b/i18n/jpn/src/vs/workbench/parts/preferences/common/keybindingsEditorModel.i18n.json
deleted file mode 100644
index caeef79a6e5..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/preferences/common/keybindingsEditorModel.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"default": "既定",
-	"user": "ユーザー",
-	"meta": "meta",
-	"option": "オプション"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/preferences/common/preferences.i18n.json b/i18n/jpn/src/vs/workbench/parts/preferences/common/preferences.i18n.json
deleted file mode 100644
index 566e113c1f4..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/preferences/common/preferences.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"userSettingsTarget": "ユーザー設定",
-	"workspaceSettingsTarget": "ワークスペースの設定"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json b/i18n/jpn/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json
deleted file mode 100644
index 7b3c484d202..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"commonlyUsed": "よく使用するもの",
-	"defaultKeybindingsHeader": "キー バインド ファイル内にキー バインドを挿入して、キー バインドを上書きします。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/preferences/electron-browser/preferences.contribution.i18n.json b/i18n/jpn/src/vs/workbench/parts/preferences/electron-browser/preferences.contribution.i18n.json
deleted file mode 100644
index 3ab2ac55682..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/preferences/electron-browser/preferences.contribution.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"defaultPreferencesEditor": "既定の基本設定エディター",
-	"settingsEditor2": "設定エディター 2",
-	"keybindingsEditor": "キー バインド エディター",
-	"preferences": "基本設定"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/quickopen/browser/commandsHandler.i18n.json b/i18n/jpn/src/vs/workbench/parts/quickopen/browser/commandsHandler.i18n.json
deleted file mode 100644
index 94dc105e1bb..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/quickopen/browser/commandsHandler.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"showTriggerActions": "すべてのコマンドの表示",
-	"clearCommandHistory": "コマンド履歴のクリア",
-	"showCommands.label": "コマンド パレット...",
-	"entryAriaLabelWithKey": "{0}、{1}、コマンド",
-	"entryAriaLabel": "{0}、コマンド",
-	"actionNotEnabled": "コマンド '{0}' は現在のコンテキストでは無効です。",
-	"canNotRun": "コマンド '{0}' でエラーが発生しました。",
-	"recentlyUsed": "最近使用したもの",
-	"morecCommands": "その他のコマンド",
-	"cat.title": "{0}: {1}",
-	"noCommandsMatching": "一致するコマンドはありません"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/quickopen/browser/gotoLineHandler.i18n.json b/i18n/jpn/src/vs/workbench/parts/quickopen/browser/gotoLineHandler.i18n.json
deleted file mode 100644
index f4c309b6316..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/quickopen/browser/gotoLineHandler.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"gotoLine": "指定行へ移動...",
-	"gotoLineLabelEmptyWithLimit": "移動先の行番号を 1 ～ {0} の範囲で入力してください",
-	"gotoLineLabelEmpty": "移動先の行番号を入力してください",
-	"gotoLineColumnLabel": "行 {0} 文字 {1} へ移動",
-	"gotoLineLabel": "行 {0} へ移動",
-	"gotoLineHandlerAriaLabel": "移動先の行番号を入力してください。",
-	"cannotRunGotoLine": "まずテキスト ファイルを開いてから指定行に移動します"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/quickopen/browser/gotoSymbolHandler.i18n.json b/i18n/jpn/src/vs/workbench/parts/quickopen/browser/gotoSymbolHandler.i18n.json
deleted file mode 100644
index dcafe06579c..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/quickopen/browser/gotoSymbolHandler.i18n.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"gotoSymbol": "ファイル内のシンボルへ移動...",
-	"symbols": "シンボル ({0})",
-	"method": "メソッド ({0})",
-	"function": "関数 ({0})",
-	"_constructor": "コンストラクター ({0})",
-	"variable": "変数 ({0})",
-	"class": "クラス ({0})",
-	"interface": "インターフェイス ({0})",
-	"namespace": "名前空間 ({0})",
-	"package": "パッケージ ({0})",
-	"modules": "モジュール ({0})",
-	"property": "プロパティ ({0})",
-	"enum": "列挙型 ({0})",
-	"string": "文字列 ({0})",
-	"rule": "ルール ({0})",
-	"file": "ファイル ({0})",
-	"array": "配列 ({0})",
-	"number": "数字 ({0})",
-	"boolean": "ブール値 ({0})",
-	"object": "オブジェクト ({0})",
-	"key": "キー ({0})",
-	"entryAriaLabel": "{0}、シンボル",
-	"noSymbolsMatching": "一致するシンボルはありません。",
-	"noSymbolsFound": "シンボルが見つかりません",
-	"gotoSymbolHandlerAriaLabel": "入力すると現在アクティブなエディターのシンボルが絞り込まれます。",
-	"cannotRunGotoSymbolInFile": "ファイルのシンボル情報がありません",
-	"cannotRunGotoSymbol": "まずテキスト ファイルを開いてからシンボルへ移動します"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/quickopen/browser/helpHandler.i18n.json b/i18n/jpn/src/vs/workbench/parts/quickopen/browser/helpHandler.i18n.json
deleted file mode 100644
index c977b43ab4b..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/quickopen/browser/helpHandler.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"entryAriaLabel": "{0}、ピッカーのヘルプ",
-	"globalCommands": "グローバル コマンド",
-	"editorCommands": "エディター コマンド"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json b/i18n/jpn/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json
deleted file mode 100644
index 977fd1e5ceb..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"view": "表示",
-	"commandsHandlerDescriptionDefault": "コマンドの表示と実行",
-	"gotoLineDescriptionMac": "行へ移動",
-	"gotoLineDescriptionWin": "行へ移動",
-	"gotoSymbolDescription": "ファイル内のシンボルへ移動",
-	"gotoSymbolDescriptionScoped": "カテゴリを指定してファイル内のシンボルへ移動",
-	"helpDescription": "ヘルプの表示",
-	"viewPickerDescription": "ビューを開く"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/quickopen/browser/viewPickerHandler.i18n.json b/i18n/jpn/src/vs/workbench/parts/quickopen/browser/viewPickerHandler.i18n.json
deleted file mode 100644
index 5bcd18a05fc..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/quickopen/browser/viewPickerHandler.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"entryAriaLabel": "{0}、ビューの選択",
-	"views": "ビュー",
-	"panels": "パネル",
-	"terminals": "ターミナル",
-	"terminalTitle": "{0}: {1}",
-	"channels": "出力",
-	"openView": "ビューを開く",
-	"quickOpenView": "Quick Open ビュー"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.i18n.json b/i18n/jpn/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.i18n.json
deleted file mode 100644
index 5a14440acb6..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"relaunchSettingMessage": "再起動が必要な設定を変更しました。",
-	"relaunchSettingDetail": "{0} を再起動ボタンで再起動して、設定を有効にしてください。",
-	"restart": "再起動(&&R)"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.i18n.json b/i18n/jpn/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.i18n.json
deleted file mode 100644
index f523b6b5863..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.i18n.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"changes": "{1} 個のうち {0} 個の変更",
-	"change": "{1} 個のうち {0} 個の変更 ",
-	"show previous change": "前の変更箇所を表示",
-	"show next change": "次の変更箇所を表示",
-	"move to previous change": "前の変更箇所に移動",
-	"move to next change": "次の変更箇所に移動",
-	"editorGutterModifiedBackground": "編集された行を示すエディター余白の背景色。",
-	"editorGutterAddedBackground": "追加された行を示すエディター余白の背景色。",
-	"editorGutterDeletedBackground": "削除された行を示すエディター余白の背景色。",
-	"overviewRulerModifiedForeground": "変更されたコンテンツを示す概要ルーラーのマーカー色。",
-	"overviewRulerAddedForeground": "追加されたコンテンツを示す概要ルーラーのマーカー色。",
-	"overviewRulerDeletedForeground": "削除されたコンテンツを示す概要ルーラーのマーカー色。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json b/i18n/jpn/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
deleted file mode 100644
index a508097adbd..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleGitViewlet": "Git を表示",
-	"source control": "ソース管理",
-	"toggleSCMViewlet": "SCM を表示",
-	"view": "表示",
-	"scmConfigurationTitle": "SCM",
-	"alwaysShowProviders": "ソース管理プロバイダーのセクションを常に表示するかどうか。",
-	"diffDecorations": "エディターの差分デコレーターを制御します。",
-	"diffGutterWidth": "(追加や修正を示す) ガター内の差分デコレーター幅 (px) を制御します。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/scm/electron-browser/scmActivity.i18n.json b/i18n/jpn/src/vs/workbench/parts/scm/electron-browser/scmActivity.i18n.json
deleted file mode 100644
index 95fd2a14a16..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/scm/electron-browser/scmActivity.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"scmPendingChangesBadge": "{0} 個の保留中の変更"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/scm/electron-browser/scmMenus.i18n.json b/i18n/jpn/src/vs/workbench/parts/scm/electron-browser/scmMenus.i18n.json
deleted file mode 100644
index d93c7d2fb84..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/scm/electron-browser/scmMenus.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"installAdditionalSCMProviders": "その他の SCM プロバイダーをインストール...",
-	"switch provider": "SCM プロバイダーの切り替え..."
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json b/i18n/jpn/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
deleted file mode 100644
index fadead296a9..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"scm providers": "ソース管理プロバイダー",
-	"hideRepository": "非表示",
-	"installAdditionalSCMProviders": "その他の SCM プロバイダーをインストール...",
-	"no open repo": "有効なソース管理プロバイダーがありません。",
-	"source control": "ソース管理",
-	"viewletTitle": "{0}: {1}",
-	"hideView": "非表示"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/search/browser/openAnythingHandler.i18n.json b/i18n/jpn/src/vs/workbench/parts/search/browser/openAnythingHandler.i18n.json
deleted file mode 100644
index e2073cc3e34..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/search/browser/openAnythingHandler.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"fileAndTypeResults": "ファイルとシンボルの結果",
-	"fileResults": "結果ファイル"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/search/browser/openFileHandler.i18n.json b/i18n/jpn/src/vs/workbench/parts/search/browser/openFileHandler.i18n.json
deleted file mode 100644
index c01de28de87..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/search/browser/openFileHandler.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"entryAriaLabel": "{0}、ファイル ピッカー",
-	"searchResults": "検索結果"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/search/browser/openSymbolHandler.i18n.json b/i18n/jpn/src/vs/workbench/parts/search/browser/openSymbolHandler.i18n.json
deleted file mode 100644
index a1ba76a5f49..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/search/browser/openSymbolHandler.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"entryAriaLabel": "{0}、シンボル ピッカー",
-	"symbols": "シンボルの結果",
-	"noSymbolsMatching": "一致するシンボルはありません。",
-	"noSymbolsWithoutInput": "入力してシンボルを検索します"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/search/browser/patternInputWidget.i18n.json b/i18n/jpn/src/vs/workbench/parts/search/browser/patternInputWidget.i18n.json
deleted file mode 100644
index 0891d483acb..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/search/browser/patternInputWidget.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"defaultLabel": "入力",
-	"useExcludesAndIgnoreFilesDescription": "除外設定を使用して、ファイルを無視します。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/search/browser/replaceService.i18n.json b/i18n/jpn/src/vs/workbench/parts/search/browser/replaceService.i18n.json
deleted file mode 100644
index fd292a943d2..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/search/browser/replaceService.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"fileReplaceChanges": "{0} ↔ {1} (置換のプレビュー)"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/search/browser/search.contribution.i18n.json b/i18n/jpn/src/vs/workbench/parts/search/browser/search.contribution.i18n.json
deleted file mode 100644
index cea0aca3303..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/search/browser/search.contribution.i18n.json
+++ /dev/null
@@ -1,22 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"showTriggerActions": "ワークスペース内のシンボルへ移動...",
-	"name": "検索",
-	"search": "検索",
-	"view": "表示",
-	"openAnythingHandlerDescription": "ファイルに移動する",
-	"openSymbolDescriptionNormal": "ワークスペース内のシンボルへ移動",
-	"searchOutputChannelTitle": "検索",
-	"searchConfigurationTitle": "検索",
-	"exclude": "検索でファイルとフォルダーを除外するために glob パターンを構成します。files.exclude 設定からすべての glob パターンを継承します。",
-	"exclude.boolean": "ファイル パスの照合基準となる glob パターン。これを true または false に設定すると、パターンがそれぞれ有効/無効になります。",
-	"exclude.when": "一致するファイルの兄弟をさらにチェックします。一致するファイル名の変数として $(basename) を使用します。",
-	"useRipgrep": "テキストとファイル検索で ripgrep を使用するかどうかを制御します",
-	"useIgnoreFiles": "ファイルを検索するときに、.gitignore ファイルを使用するか .ignore ファイルを使用するかを制御します。",
-	"search.quickOpen.includeSymbols": "グローバル シンボル検索の結果を、Quick Open の結果ファイルに含めるように構成します。",
-	"search.followSymlinks": "検索中にシンボリック リンクを追跡するかどうかを制御します。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/search/browser/searchActions.i18n.json b/i18n/jpn/src/vs/workbench/parts/search/browser/searchActions.i18n.json
deleted file mode 100644
index 0c0e1ef6922..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/search/browser/searchActions.i18n.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"nextSearchIncludePattern": "次の検索包含パターンを表示",
-	"previousSearchIncludePattern": "前の検索包含パターンを表示",
-	"nextSearchExcludePattern": "次の検索除外パターンを表示",
-	"previousSearchExcludePattern": "前の検索除外パターンを表示",
-	"nextSearchTerm": "次の検索語句を表示",
-	"previousSearchTerm": "前の検索語句を表示",
-	"nextReplaceTerm": "次の検索置換語句を表示",
-	"previousReplaceTerm": "前の検索置換語句を表示",
-	"findInFiles": "フォルダーを指定して検索",
-	"replaceInFiles": "複数のファイルで置換",
-	"RefreshAction.label": "最新の情報に更新",
-	"CollapseDeepestExpandedLevelAction.label": "すべて折りたたむ",
-	"ClearSearchResultsAction.label": "クリア",
-	"CancelSearchAction.label": "検索のキャンセル",
-	"FocusNextSearchResult.label": "次の検索結果にフォーカス",
-	"FocusPreviousSearchResult.label": "前の検索結果にフォーカス",
-	"RemoveAction.label": "却下",
-	"file.replaceAll.label": "すべて置換",
-	"match.replace.label": "置換"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/search/browser/searchResultsView.i18n.json b/i18n/jpn/src/vs/workbench/parts/search/browser/searchResultsView.i18n.json
deleted file mode 100644
index da49c49fd8d..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/search/browser/searchResultsView.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"searchFolderMatch.other.label": "その他のファイル",
-	"searchFileMatches": "{0} 個のファイルが見つかりました",
-	"searchFileMatch": "{0} 個のファイルが見つかりました",
-	"searchMatches": "一致する項目が {0} 件見つかりました",
-	"searchMatch": "一致する項目が {0} 件見つかりました",
-	"folderMatchAriaLabel": "{1} フォルダー ルート内で {0} 件の一致、検索結果",
-	"fileMatchAriaLabel": "フォルダー {2} のファイル {1} 内で {0} 件の一致、検索結果",
-	"replacePreviewResultAria": "テキスト {3} の {2} 列目の {0} を {1} に置換します",
-	"searchResultAria": "テキスト {2} の {1} 列目に {0} が見つかりました"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/search/browser/searchView.i18n.json b/i18n/jpn/src/vs/workbench/parts/search/browser/searchView.i18n.json
deleted file mode 100644
index e3bc313f762..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/search/browser/searchView.i18n.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"moreSearch": "詳細検索の切り替え",
-	"searchScope.includes": "含めるファイル",
-	"label.includes": "検索包含パターン",
-	"searchScope.excludes": "除外するファイル",
-	"label.excludes": "検索除外パターン",
-	"replaceAll.confirmation.title": "すべて置換",
-	"replaceAll.confirm.button": "置換(&&R)",
-	"replaceAll.occurrence.file.message": "{1} 個のファイルで {0} 件の出現箇所を '{2}' に置換しました。",
-	"removeAll.occurrence.file.message": "{1} 個のファイルで {0} 件の出現箇所を置換しました。",
-	"replaceAll.occurrence.files.message": "{1} 個のファイルで {0} 件の出現箇所を '{2}' に置換しました。",
-	"removeAll.occurrence.files.message": "{1} 個のファイルで {0} 件の出現箇所を置換しました。",
-	"replaceAll.occurrences.file.message": "{1} 個のファイルで {0} 件の出現箇所を '{2}' に置換しました。",
-	"removeAll.occurrences.file.message": "{1} 個のファイルで {0} 件の出現箇所を置換しました。",
-	"replaceAll.occurrences.files.message": "{1} 個のファイルで {0} 件の出現箇所を '{2}' に置換しました。",
-	"removeAll.occurrences.files.message": "{1} 個のファイルで {0} 件の出現箇所を置換しました。",
-	"removeAll.occurrence.file.confirmation.message": "{1} 個のファイルで {0} 件の出現箇所を '{2}' に置換しますか?",
-	"replaceAll.occurrence.file.confirmation.message": "{1} 個のファイルで {0} 件の出現箇所を置換しますか?",
-	"removeAll.occurrence.files.confirmation.message": "{1} 個のファイルで {0} 件の出現箇所を '{2}' に置換しますか?",
-	"replaceAll.occurrence.files.confirmation.message": "{1} 個のファイルで {0} 件の出現箇所を置換しますか?",
-	"removeAll.occurrences.file.confirmation.message": "{1} 個のファイルで {0} 件の出現箇所を '{2}' に置換しますか?",
-	"replaceAll.occurrences.file.confirmation.message": "{1} 個のファイルで {0} 件の出現箇所を置換しますか?",
-	"removeAll.occurrences.files.confirmation.message": "{1} 個のファイルで {0} 件の出現箇所を '{2}' に置換しますか?",
-	"replaceAll.occurrences.files.confirmation.message": "{1} 個のファイルで {0} 件の出現箇所を置換しますか?",
-	"treeAriaLabel": "検索結果",
-	"searchPathNotFoundError": "検索パスが見つかりません: {0}",
-	"searchMaxResultsWarning": "結果セットにはすべての一致項目のサブセットのみが含まれています。より限定的な検索条件を入力して、検索結果を絞り込んでください。",
-	"searchCanceled": "結果が見つかる前に検索が取り消されました - ",
-	"noResultsIncludesExcludes": "'{0}' に '{1}' を除外した結果はありません - ",
-	"noResultsIncludes": "'{0}' に結果はありません - ",
-	"noResultsExcludes": "'{0}' を除外した結果はありませんでした - ",
-	"noResultsFound": "結果はありません。構成された除外と無視するファイルの設定を確認してください -",
-	"rerunSearch.message": "もう一度検索してください",
-	"rerunSearchInAll.message": "すべてのファイルでもう一度検索してください",
-	"openSettings.message": "設定を開く",
-	"openSettings.learnMore": "詳細情報",
-	"ariaSearchResultsStatus": "検索により {1} 個のファイル内の {0} 件の結果が返されました",
-	"search.file.result": "{1} 個のファイルに {0} 件の結果",
-	"search.files.result": "{1} 個のファイルに {0} 件の結果",
-	"search.file.results": "{1} 個のファイルに {0} 件の結果",
-	"search.files.results": "{1} 個のファイルに {0} 件の結果",
-	"searchWithoutFolder": "まだフォルダーを開いていません。開いているファイルのみを検索しています - ",
-	"openFolder": "フォルダーを開く"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json b/i18n/jpn/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
deleted file mode 100644
index e3bc313f762..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"moreSearch": "詳細検索の切り替え",
-	"searchScope.includes": "含めるファイル",
-	"label.includes": "検索包含パターン",
-	"searchScope.excludes": "除外するファイル",
-	"label.excludes": "検索除外パターン",
-	"replaceAll.confirmation.title": "すべて置換",
-	"replaceAll.confirm.button": "置換(&&R)",
-	"replaceAll.occurrence.file.message": "{1} 個のファイルで {0} 件の出現箇所を '{2}' に置換しました。",
-	"removeAll.occurrence.file.message": "{1} 個のファイルで {0} 件の出現箇所を置換しました。",
-	"replaceAll.occurrence.files.message": "{1} 個のファイルで {0} 件の出現箇所を '{2}' に置換しました。",
-	"removeAll.occurrence.files.message": "{1} 個のファイルで {0} 件の出現箇所を置換しました。",
-	"replaceAll.occurrences.file.message": "{1} 個のファイルで {0} 件の出現箇所を '{2}' に置換しました。",
-	"removeAll.occurrences.file.message": "{1} 個のファイルで {0} 件の出現箇所を置換しました。",
-	"replaceAll.occurrences.files.message": "{1} 個のファイルで {0} 件の出現箇所を '{2}' に置換しました。",
-	"removeAll.occurrences.files.message": "{1} 個のファイルで {0} 件の出現箇所を置換しました。",
-	"removeAll.occurrence.file.confirmation.message": "{1} 個のファイルで {0} 件の出現箇所を '{2}' に置換しますか?",
-	"replaceAll.occurrence.file.confirmation.message": "{1} 個のファイルで {0} 件の出現箇所を置換しますか?",
-	"removeAll.occurrence.files.confirmation.message": "{1} 個のファイルで {0} 件の出現箇所を '{2}' に置換しますか?",
-	"replaceAll.occurrence.files.confirmation.message": "{1} 個のファイルで {0} 件の出現箇所を置換しますか?",
-	"removeAll.occurrences.file.confirmation.message": "{1} 個のファイルで {0} 件の出現箇所を '{2}' に置換しますか?",
-	"replaceAll.occurrences.file.confirmation.message": "{1} 個のファイルで {0} 件の出現箇所を置換しますか?",
-	"removeAll.occurrences.files.confirmation.message": "{1} 個のファイルで {0} 件の出現箇所を '{2}' に置換しますか?",
-	"replaceAll.occurrences.files.confirmation.message": "{1} 個のファイルで {0} 件の出現箇所を置換しますか?",
-	"treeAriaLabel": "検索結果",
-	"searchPathNotFoundError": "検索パスが見つかりません: {0}",
-	"searchMaxResultsWarning": "結果セットにはすべての一致項目のサブセットのみが含まれています。より限定的な検索条件を入力して、検索結果を絞り込んでください。",
-	"searchCanceled": "結果が見つかる前に検索が取り消されました - ",
-	"noResultsIncludesExcludes": "'{0}' に '{1}' を除外した結果はありません - ",
-	"noResultsIncludes": "'{0}' に結果はありません - ",
-	"noResultsExcludes": "'{0}' を除外した結果はありませんでした - ",
-	"noResultsFound": "結果はありません。構成された除外と無視するファイルの設定を確認してください -",
-	"rerunSearch.message": "もう一度検索してください",
-	"rerunSearchInAll.message": "すべてのファイルでもう一度検索してください",
-	"openSettings.message": "設定を開く",
-	"openSettings.learnMore": "詳細情報",
-	"ariaSearchResultsStatus": "検索により {1} 個のファイル内の {0} 件の結果が返されました",
-	"search.file.result": "{1} 個のファイルに {0} 件の結果",
-	"search.files.result": "{1} 個のファイルに {0} 件の結果",
-	"search.file.results": "{1} 個のファイルに {0} 件の結果",
-	"search.files.results": "{1} 個のファイルに {0} 件の結果",
-	"searchWithoutFolder": "まだフォルダーを開いていません。開いているファイルのみを検索しています - ",
-	"openFolder": "フォルダーを開く"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/search/browser/searchWidget.i18n.json b/i18n/jpn/src/vs/workbench/parts/search/browser/searchWidget.i18n.json
deleted file mode 100644
index bb69b79da47..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/search/browser/searchWidget.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"search.action.replaceAll.disabled.label": "すべて置換 (有効にする検索を実行)",
-	"search.action.replaceAll.enabled.label": "すべて置換",
-	"search.replace.toggle.button.title": "置換の切り替え",
-	"label.Search": "検索: 検索語句を入力し Enter を押して検索するか、Esc を押して取り消します",
-	"search.placeHolder": "検索",
-	"label.Replace": "置換: 置換用語を入力し、Enter を押してプレビューするか、Escape を押してキャンセルします",
-	"search.replace.placeHolder": "置換",
-	"regexp.validationFailure": "この式はすべてに一致します",
-	"regexp.backreferenceValidationFailure": "前方参照はサポートされていません"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/search/common/queryBuilder.i18n.json b/i18n/jpn/src/vs/workbench/parts/search/common/queryBuilder.i18n.json
deleted file mode 100644
index 1c389487583..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/search/common/queryBuilder.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"search.noWorkspaceWithName": "ワークスペースに次の名前のフォルダーはありません: {0}"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json b/i18n/jpn/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
deleted file mode 100644
index d63dc1c7de6..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"search": "検索",
-	"copyMatchLabel": "コピー",
-	"copyPathLabel": "パスのコピー",
-	"copyAllLabel": "すべてコピー",
-	"clearSearchHistoryLabel": "検索履歴のクリア",
-	"toggleSearchViewPositionLabel": "検索ビュー位置の切り替え",
-	"findInFolder": "フォルダー内を検索...",
-	"findInWorkspace": "ワークスペース内を検索...",
-	"showTriggerActions": "ワークスペース内のシンボルへ移動...",
-	"name": "検索",
-	"showSearchViewl": "検索の表示",
-	"view": "表示",
-	"findInFiles": "フォルダーを指定して検索",
-	"openAnythingHandlerDescription": "ファイルに移動する",
-	"openSymbolDescriptionNormal": "ワークスペース内のシンボルへ移動",
-	"searchConfigurationTitle": "検索",
-	"exclude": "検索でファイルとフォルダーを除外するために glob パターンを構成します。files.exclude 設定からすべての glob パターンを継承します。",
-	"exclude.boolean": "ファイル パスの照合基準となる glob パターン。これを true または false に設定すると、パターンがそれぞれ有効/無効になります。",
-	"exclude.when": "一致するファイルの兄弟をさらにチェックします。一致するファイル名の変数として $(basename) を使用します。",
-	"useRipgrep": "テキストとファイル検索で ripgrep を使用するかどうかを制御します",
-	"useIgnoreFiles": "ファイルを検索するときに、.gitignore ファイルを使用するか .ignore ファイルを使用するかを制御します。",
-	"search.quickOpen.includeSymbols": "グローバル シンボル検索の結果を、Quick Open の結果ファイルに含めるように構成します。",
-	"search.followSymlinks": "検索中にシンボリック リンクをたどるかどうかを制御します。",
-	"search.smartCase": "すべて小文字のパターンの場合、大文字と小文字を区別しないで検索し、そうでない場合は大文字と小文字を区別して検索する",
-	"search.globalFindClipboard": "macOS で検索ビューが共有の検索クリップボードを読み取りまたは変更するかどうかを制御します",
-	"search.location": "検索をサイドバーのビューとして表示するか、より水平方向の空間をとるためにパネル領域のパネルとして表示するかを制御します。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/search/electron-browser/searchActions.i18n.json b/i18n/jpn/src/vs/workbench/parts/search/electron-browser/searchActions.i18n.json
deleted file mode 100644
index 379fc84bf34..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/search/electron-browser/searchActions.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"findInFolder": "フォルダー内を検索...",
-	"findInWorkspace": "ワークスペース内を検索..."
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/snippets/electron-browser/TMSnippets.i18n.json b/i18n/jpn/src/vs/workbench/parts/snippets/electron-browser/TMSnippets.i18n.json
deleted file mode 100644
index 98112fb1164..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/snippets/electron-browser/TMSnippets.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"vscode.extension.contributes.snippets": "スニペットを提供します。",
-	"vscode.extension.contributes.snippets-language": "このスニペットの提供先の言語識別子です。",
-	"vscode.extension.contributes.snippets-path": "スニペット ファイルのパス。拡張機能フォルダーの相対パスであり、通常 './snippets/' で始まります。",
-	"invalid.language": "`contributes.{0}.language` で不明な言語です。提供された値: {1}",
-	"invalid.path.0": "`contributes.{0}.path` に文字列が必要です。提供された値: {1}",
-	"invalid.path.1": "拡張機能のフォルダー ({2}) の中に `contributes.{0}.path` ({1}) が含まれている必要があります。これにより拡張を移植できなくなる可能性があります。",
-	"badVariableUse": "スニペット \"{0}\" は、スニペット変数とスニペット プレースホルダーを混乱させる可能性が非常にあります。詳細については https://code.visualstudio.com/docs/editor/userdefinedsnippets#_snippet-syntax をご覧ください。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json b/i18n/jpn/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json
deleted file mode 100644
index 555cee1e7ac..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"global.scope": "(グローバル)",
-	"global.1": "({0})",
-	"new.global": "新しいグローバル スニペット ファイル...",
-	"group.global": "既存のスニペット",
-	"new.global.sep": "新しいスニペット",
-	"openSnippet.pickLanguage": "スニペット ファイルの選択もしくはスニペットの作成",
-	"openSnippet.label": "ユーザー スニペットの構成",
-	"preferences": "基本設定"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/snippets/electron-browser/insertSnippet.i18n.json b/i18n/jpn/src/vs/workbench/parts/snippets/electron-browser/insertSnippet.i18n.json
deleted file mode 100644
index af5e539af62..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/snippets/electron-browser/insertSnippet.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"snippet.suggestions.label": "スニペットの挿入",
-	"sep.userSnippet": "ユーザー スニペット",
-	"sep.extSnippet": "拡張機能のスニペット"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json b/i18n/jpn/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json
deleted file mode 100644
index e715ffb25dd..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"snippetSchema.json.default": "空のスニペット",
-	"snippetSchema.json": "ユーザー スニペット構成",
-	"snippetSchema.json.prefix": "intellisense でスニペットを選択するときに使用するプレフィックス",
-	"snippetSchema.json.body": "スニペットのコンテンツです。カーソルの位置を定義するには '$1', '${1:defaultText}' を使用し、最後のカーソルの位置には '$0' を使用します。'${varName}' と '${varName:defaultText}' を使用すると変数値を挿入します。例: 'This is file: $TM_FILENAME'.",
-	"snippetSchema.json.description": "スニペットについての記述。",
-	"snippetSchema.json.scope": "このスニペットを適用する言語名のリスト。例: 'typescript,javascript'。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json b/i18n/jpn/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json
deleted file mode 100644
index ee6c777124c..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"source.snippetGlobal": "グローバル ユーザー スニペット",
-	"source.snippet": "ユーザー スニペット"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json b/i18n/jpn/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
deleted file mode 100644
index 21441eaa272..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"invalid.path.0": "`contributes.{0}.path` に文字列が必要です。提供された値: {1}",
-	"invalid.language.0": "言語を省略するとき、`contributes.{0}.path` の値は `.code-snippets`-file にする必要があります。提供された値: {1}",
-	"invalid.language": "`contributes.{0}.language` で不明な言語です。提供された値: {1}",
-	"invalid.path.1": "拡張機能のフォルダー ({2}) の中に `contributes.{0}.path` ({1}) が含まれている必要があります。これにより拡張を移植できなくなる可能性があります。",
-	"vscode.extension.contributes.snippets": "スニペットを提供します。",
-	"vscode.extension.contributes.snippets-language": "このスニペットの提供先の言語識別子です。",
-	"vscode.extension.contributes.snippets-path": "スニペット ファイルのパス。拡張機能フォルダーの相対パスであり、通常 './snippets/' で始まります。",
-	"badVariableUse": "拡張機能 '{0}' の 1 つまたは複数のスニペットは、スニペット変数とスニペット プレース ホルダーを混乱させる可能性が非常にあります。 (詳細については、 https://code.visualstudio.com/docs/editor/userdefinedsnippets#_snippet-syntax を参照してください)",
-	"badFile": "スニペット ファイル \"{0}\" を読み込むことができませんでした。",
-	"detail.snippet": "{0} ({1})",
-	"snippetSuggest.longLabel": "{0}, {1}"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/snippets/electron-browser/tabCompletion.i18n.json b/i18n/jpn/src/vs/workbench/parts/snippets/electron-browser/tabCompletion.i18n.json
deleted file mode 100644
index d7c3cd55484..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/snippets/electron-browser/tabCompletion.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"tabCompletion": "プレフィックスが一致する場合にスニペットを挿入します。'quickSuggestions' が無効な場合に最適です。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/surveys/electron-browser/languageSurveys.contribution.i18n.json b/i18n/jpn/src/vs/workbench/parts/surveys/electron-browser/languageSurveys.contribution.i18n.json
deleted file mode 100644
index a1569ecbff5..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/surveys/electron-browser/languageSurveys.contribution.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"helpUs": "{0} のサポートの改善にご協力ください",
-	"takeShortSurvey": "簡単なアンケートの実施",
-	"remindLater": "後で通知する",
-	"neverAgain": "今後は表示しない"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/surveys/electron-browser/nps.contribution.i18n.json b/i18n/jpn/src/vs/workbench/parts/surveys/electron-browser/nps.contribution.i18n.json
deleted file mode 100644
index 8a3c261d16c..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/surveys/electron-browser/nps.contribution.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"surveyQuestion": "短いフィードバック アンケートにご協力をお願いできますか?",
-	"takeSurvey": "アンケートの実施",
-	"remindLater": "後で通知する",
-	"neverAgain": "今後は表示しない"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/tasks/browser/buildQuickOpen.i18n.json b/i18n/jpn/src/vs/workbench/parts/tasks/browser/buildQuickOpen.i18n.json
deleted file mode 100644
index d263ab93183..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/tasks/browser/buildQuickOpen.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"tasksAriaLabel": "ビルド タスクの名前を入力してください",
-	"noTasksMatching": "一致するタスクがありません",
-	"noTasksFound": "ビルド タスクが見つかりません"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/tasks/browser/quickOpen.i18n.json b/i18n/jpn/src/vs/workbench/parts/tasks/browser/quickOpen.i18n.json
deleted file mode 100644
index 160817b204b..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/tasks/browser/quickOpen.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"entryAriaLabel": "{0}, tasks",
-	"recentlyUsed": "最近使用したタスク",
-	"configured": "構成済みのタスク",
-	"detected": "検出されたタスク",
-	"customizeTask": "タスクの構成"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/tasks/browser/restartQuickOpen.i18n.json b/i18n/jpn/src/vs/workbench/parts/tasks/browser/restartQuickOpen.i18n.json
deleted file mode 100644
index 1e77cbdffdf..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/tasks/browser/restartQuickOpen.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"tasksAriaLabel": "再開するタスクの名前を入力します",
-	"noTasksMatching": "一致するタスクがありません",
-	"noTasksFound": "再開するタスクはありません"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/tasks/browser/taskQuickOpen.i18n.json b/i18n/jpn/src/vs/workbench/parts/tasks/browser/taskQuickOpen.i18n.json
deleted file mode 100644
index e1f1170a4f8..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/tasks/browser/taskQuickOpen.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"tasksAriaLabel": "実行するタスクの名前を入力します",
-	"noTasksMatching": "一致するタスクがありません",
-	"noTasksFound": "タスクが見つかりません"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/tasks/browser/terminateQuickOpen.i18n.json b/i18n/jpn/src/vs/workbench/parts/tasks/browser/terminateQuickOpen.i18n.json
deleted file mode 100644
index 96e5576de10..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/tasks/browser/terminateQuickOpen.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"tasksAriaLabel": "Type the name of a task to terminate",
-	"noTasksMatching": "No tasks matching",
-	"noTasksFound": "No tasks to terminate found"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/tasks/browser/testQuickOpen.i18n.json b/i18n/jpn/src/vs/workbench/parts/tasks/browser/testQuickOpen.i18n.json
deleted file mode 100644
index 19a320bb984..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/tasks/browser/testQuickOpen.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"tasksAriaLabel": "テスト タスクの名前を入力してください",
-	"noTasksMatching": "一致するタスクがありません",
-	"noTasksFound": "テスト タスクが見つかりません"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json b/i18n/jpn/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json
deleted file mode 100644
index c541ac646ed..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json
+++ /dev/null
@@ -1,76 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"ProblemPatternParser.loopProperty.notLast": "ループ プロパティは、最終行マッチャーでのみサポートされています。",
-	"ProblemPatternParser.problemPattern.kindProperty.notFirst": "問題のパターンが正しくありません。kind プロパティは最初の要素のみで指定される必要があります。",
-	"ProblemPatternParser.problemPattern.missingRegExp": "問題パターンに正規表現がありません。",
-	"ProblemPatternParser.problemPattern.missingProperty": "問題のパターンが正しくありません。少なくとも、file と message が必要です",
-	"ProblemPatternParser.problemPattern.missingLocation": "問題のパターンが正しくありません。kind: \"file\" または line や location の一致グループのいずれかが必要です。",
-	"ProblemPatternParser.invalidRegexp": "エラー: 文字列 {0} は、有効な正規表現ではありません。\n",
-	"ProblemPatternSchema.regexp": "出力のエラー、警告、または情報を検索する正規表現。",
-	"ProblemPatternSchema.kind": "パターンがロケーション (ファイルと行) またはファイルのみに一致するかどうか。",
-	"ProblemPatternSchema.file": "ファイル名の一致グループ インデックス。省略すると、1 が使用されます。",
-	"ProblemPatternSchema.location": "問題の場所の一致グループ インデックス。有効な場所のパターンは (line)、(line,column)、(startLine,startColumn,endLine,endColumn) です。省略すると、 (line,column) が想定されます。",
-	"ProblemPatternSchema.line": "問題の行の一致グループ インデックス。既定は 2 です",
-	"ProblemPatternSchema.column": "問題の行の文字の一致グループ インデックス。既定は 3 です",
-	"ProblemPatternSchema.endLine": "問題の最終行の一致グループ インデックス。既定は undefined です",
-	"ProblemPatternSchema.endColumn": "問題の最終行の文字の一致グループ インデックス。既定は undefined です",
-	"ProblemPatternSchema.severity": "問題の重大度の一致グループ インデックス。既定は undefined です",
-	"ProblemPatternSchema.code": "問題のコードの一致グループ インデックス。既定は undefined です",
-	"ProblemPatternSchema.message": "メッセージの一致グループ インデックス。省略した場合、場所を指定すると既定は 4 で、場所を指定しないと既定は 5 です。",
-	"ProblemPatternSchema.loop": "複数行マッチャー ループは、このパターンが一致する限りループで実行されるかどうかを示します。複数行パターン内の最後のパターンでのみ指定できます。",
-	"NamedProblemPatternSchema.name": "問題パターンの名前。",
-	"NamedMultiLineProblemPatternSchema.name": "複数行の問題パターンの名前。",
-	"NamedMultiLineProblemPatternSchema.patterns": "実際のパターン。",
-	"ProblemPatternExtPoint": "問題パターンを提供",
-	"ProblemPatternRegistry.error": "無効な問題パターンです。パターンは無視されます。",
-	"ProblemMatcherParser.noProblemMatcher": "エラー: 説明を問題マッチャーに変換することができません:\n{0}\n",
-	"ProblemMatcherParser.noProblemPattern": "エラー: 説明に有効な問題パターンが定義されていません:\n{0}\n",
-	"ProblemMatcherParser.noOwner": "エラー: 説明に所有者が定義されていません:\n{0}\n",
-	"ProblemMatcherParser.noFileLocation": "エラー: 説明にファイルの場所が定義されていません:\n{0}\n",
-	"ProblemMatcherParser.unknownSeverity": "情報: 不明な重大度 {0}。有効な値は、error、warning、info です。\n",
-	"ProblemMatcherParser.noDefinedPatter": "エラー: 識別子 {0} のパターンは存在しません。",
-	"ProblemMatcherParser.noIdentifier": "エラー: パターン プロパティが空の識別子を参照しています。",
-	"ProblemMatcherParser.noValidIdentifier": "エラー: パターン プロパティ {0} は有効なパターン変数名ではありません。",
-	"ProblemMatcherParser.problemPattern.watchingMatcher": "問題マッチャーは、ウォッチ対象の開始パターンと終了パターンの両方を定義する必要があります。",
-	"ProblemMatcherParser.invalidRegexp": "エラー: 文字列 {0} は、有効な正規表現ではありません。\n",
-	"WatchingPatternSchema.regexp": "バックグラウンド タスクの開始または終了を検出する正規表現。",
-	"WatchingPatternSchema.file": "ファイル名の一致グループ インデックス。省略できます。",
-	"PatternTypeSchema.name": "提供されたか事前定義された問題パターンの名前",
-	"PatternTypeSchema.description": "問題パターン、あるいは提供されたか事前定義された問題パターンの名前。基本問題パターンが指定されている場合は省略できます。",
-	"ProblemMatcherSchema.base": "使用する基本問題マッチャーの名前。",
-	"ProblemMatcherSchema.owner": "Code 内の問題の所有者。base を指定すると省略できます。省略して base を指定しない場合、既定は 'external' になります。",
-	"ProblemMatcherSchema.source": "'typescript' または 'super lint' のような、この診断のソースを記述する解読可能な文字列",
-	"ProblemMatcherSchema.severity": "キャプチャされた問題の既定の重大度。パターンが重要度の一致グループを定義していない場合に使用されます。",
-	"ProblemMatcherSchema.applyTo": "テキスト ドキュメントで報告された問題が、開いているドキュメントのみ、閉じられたドキュメントのみ、すべてのドキュメントのいずれに適用されるかを制御します。",
-	"ProblemMatcherSchema.fileLocation": "問題パターンで報告されたファイル名を解釈する方法を定義します。",
-	"ProblemMatcherSchema.background": "バックグラウンド タスクでアクティブなマッチャーの開始と終了を追跡するパターン。",
-	"ProblemMatcherSchema.background.activeOnStart": "true に設定すると、タスクの開始時にバックグラウンド モニターがアクティブ モードになります。これは beginPattern と一致する行の発行と同等です。",
-	"ProblemMatcherSchema.background.beginsPattern": "出力内で一致すると、バックグラウンド タスクの開始が通知されます。",
-	"ProblemMatcherSchema.background.endsPattern": "出力内で一致すると、バックグラウンド タスクの終了が通知されます。",
-	"ProblemMatcherSchema.watching.deprecated": "watching プロパティは使用されなくなりました。代わりに background をご使用ください。",
-	"ProblemMatcherSchema.watching": "監視パターンの開始と終了を追跡するマッチャー。",
-	"ProblemMatcherSchema.watching.activeOnStart": "true に設定すると、タスクの開始時にウォッチャーがアクティブ モードになります。これは beginPattern と一致する行の発行と同等です。",
-	"ProblemMatcherSchema.watching.beginsPattern": "出力内で一致すると、ウォッチ中のタスクの開始が通知されます。",
-	"ProblemMatcherSchema.watching.endsPattern": "出力内で一致すると、ウォッチ中のタスクの終了が通知されます。",
-	"LegacyProblemMatcherSchema.watchedBegin.deprecated": "このプロパティは非推奨です。代わりに watching プロパティをご使用ください。",
-	"LegacyProblemMatcherSchema.watchedBegin": "ファイル ウォッチでトリガーされた ウォッチ対象タスクの実行が開始されたことを伝達する正規表現。",
-	"LegacyProblemMatcherSchema.watchedEnd.deprecated": "このプロパティは非推奨です。代わりに watching プロパティをご使用ください。",
-	"LegacyProblemMatcherSchema.watchedEnd": "ウォッチ対象タスクの実行が終了したことを伝達する正規表現。",
-	"NamedProblemMatcherSchema.name": "これを参照するのに使用する問題マッチャーの名前。",
-	"NamedProblemMatcherSchema.label": "問題マッチャーの判読できるラベル。",
-	"ProblemMatcherExtPoint": "問題マッチャーを提供",
-	"msCompile": "Microsoft コンパイラの問題",
-	"lessCompile": "Less の問題",
-	"gulp-tsc": "Gulp TSC の問題",
-	"jshint": "JSHint の問題",
-	"jshint-stylish": "JSHint の問題 (stylish)",
-	"eslint-compact": "ESLint の問題 (compact)",
-	"eslint-stylish": "ESLint の問題 (stylish)",
-	"go": "Go の問題"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/tasks/common/taskConfiguration.i18n.json b/i18n/jpn/src/vs/workbench/parts/tasks/common/taskConfiguration.i18n.json
deleted file mode 100644
index f4de865e7e8..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/tasks/common/taskConfiguration.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"ConfigurationParser.invalidCWD": "警告: options.cwd は、string 型でなければなりません。値 {0} を無視します",
-	"ConfigurationParser.noargs": "エラー: コマンド引数は文字列の配列でなければなりません。指定された値:\n{0}",
-	"ConfigurationParser.noShell": "警告: シェル構成がサポートされるのは、ターミナルでタスクを実行している場合のみです。",
-	"ConfigurationParser.noName": "エラー: 宣言スコープ内の問題マッチャーに次の名前がなければなりません:\n{0}\n",
-	"ConfigurationParser.unknownMatcherKind": "警告: 定義されている問題マッチャーが不明です。サポートされている型は string | ProblemMatcher | (string | ProblemMatcher)[] です。\n{0}\n",
-	"ConfigurationParser.invalidVaraibleReference": "エラー: 正しくない problemMatcher 参照 {0}\n",
-	"ConfigurationParser.noTaskName": "エラー: タスクが taskName プロパティを提供しなければなりません。このタスクは無視されます。\n{0}\n",
-	"taskConfiguration.shellArgs": "警告: タスク '{0}' はシェル コマンドです。コマンド名または引数の 1 つに、エスケープされていないスペースが含まれています。コマンド ラインの引用が正しく解釈されるように、引数をコマンドにマージしてください。",
-	"taskConfiguration.noCommandOrDependsOn": "エラー: タスク '{0}' は、コマンドも dependsOn プロパティも指定していません。このタスクは無視されます。定義は次のとおりです:\n{1}",
-	"taskConfiguration.noCommand": "エラー: タスク '{0}' はコマンドを定義していません。このタスクは無視されます。定義は次のとおりです:\n{1}"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/tasks/common/taskDefinitionRegistry.i18n.json b/i18n/jpn/src/vs/workbench/parts/tasks/common/taskDefinitionRegistry.i18n.json
deleted file mode 100644
index d09863fe3b1..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/tasks/common/taskDefinitionRegistry.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"TaskDefinition.description": "実際のタスクの種類。先頭が '$' で始まる種類は内部使用のために予約されています。",
-	"TaskDefinition.properties": "タスクの種類の追加プロパティ",
-	"TaskTypeConfiguration.noType": "タスクの種類を構成するのに必要な 'taskType' プロパティがありません",
-	"TaskDefinitionExtPoint": "タスクの種類を提供"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/tasks/common/taskTemplates.i18n.json b/i18n/jpn/src/vs/workbench/parts/tasks/common/taskTemplates.i18n.json
deleted file mode 100644
index c38f89172f6..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/tasks/common/taskTemplates.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"dotnetCore": ".NET Core ビルド コマンドの実行",
-	"msbuild": "ビルド ターゲットを実行",
-	"externalCommand": "任意の外部コマンドを実行する例",
-	"Maven": "共通の maven コマンドを実行する"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/tasks/common/taskTypeRegistry.i18n.json b/i18n/jpn/src/vs/workbench/parts/tasks/common/taskTypeRegistry.i18n.json
deleted file mode 100644
index 8b6ad71cd4e..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/tasks/common/taskTypeRegistry.i18n.json
+++ /dev/null
@@ -1,6 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/tasks/electron-browser/jsonSchemaCommon.i18n.json b/i18n/jpn/src/vs/workbench/parts/tasks/electron-browser/jsonSchemaCommon.i18n.json
deleted file mode 100644
index 096f9ff2538..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/tasks/electron-browser/jsonSchemaCommon.i18n.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"JsonSchema.options": "追加のコマンド オプション",
-	"JsonSchema.options.cwd": "実行されるプログラムまたはスクリプトの現在の作業ディレクトリ。省略すると、Code の現在のワークスペースのルートが使用されます。",
-	"JsonSchema.options.env": "実行されるプログラムまたはシェルの環境。省略すると、親プロセスの環境が使用されます。",
-	"JsonSchema.shellConfiguration": "使用するシェルを構成します。",
-	"JsonSchema.shell.executable": "使用するシェル。",
-	"JsonSchema.shell.args": "シェル引数。",
-	"JsonSchema.command": "実行されるコマンド。外部プログラムかシェル コマンドです。",
-	"JsonSchema.tasks.args": "このタスクの起動時にコマンドに渡される引数。",
-	"JsonSchema.tasks.taskName": "タスクの名前",
-	"JsonSchema.tasks.windows": "Windows 固有のコマンド構成",
-	"JsonSchema.tasks.mac": "Mac 固有のコマンド構成",
-	"JsonSchema.tasks.linux": "Linux 固有のコマンド構成",
-	"JsonSchema.tasks.suppressTaskName": "タスク名を引数としてコマンドに追加するかどうかを制御します。省略すると、グローバルに定義された値が使用されます。",
-	"JsonSchema.tasks.showOutput": "実行中のタスクの出力が表示されるかどうかを制御します。省略すると、グローバルに定義された値が使用されます。",
-	"JsonSchema.echoCommand": "実行されるコマンドが出力にエコーされるかどうかを制御します。既定は false です。",
-	"JsonSchema.tasks.watching.deprecation": "使用しないでください。代わりに isBackground をご使用ください。",
-	"JsonSchema.tasks.watching": "実行済みのタスクが維持され、ファイル システムをウォッチしているかどうか。",
-	"JsonSchema.tasks.background": "実行済みのタスクが維持され、バッググラウンドで実行されているかどうか。",
-	"JsonSchema.tasks.promptOnClose": "タスクの実行中に VS Code を閉じるときにユーザーにダイアログを表示するかどうか。",
-	"JsonSchema.tasks.build": "このタスクを Code の既定のビルド コマンドにマップします。",
-	"JsonSchema.tasks.test": "このタスクを Code の既定のテスト コマンドにマップします。",
-	"JsonSchema.tasks.matchers": "使用する問題マッチャー。1 つの文字列または問題マッチャー定義か、文字列と問題マッチャーの配列です。",
-	"JsonSchema.args": "さらにコマンドに渡される引数。",
-	"JsonSchema.showOutput": "実行中のタスクの出力が表示されるかどうかを制御します。省略すると、'always' が使用されます。",
-	"JsonSchema.watching.deprecation": "使用しないでください。代わりに isBackground をご使用ください。",
-	"JsonSchema.watching": "実行済みのタスクが維持され、ファイル システムをウォッチしているかどうか。",
-	"JsonSchema.background": "実行済みのタスクが維持され、バッググラウンドで実行されているかどうか。",
-	"JsonSchema.promptOnClose": "バックグラウンド タスクの実行中に VS Code を閉じる時に、ユーザーに対してプロンプトが表示されるかどうか。",
-	"JsonSchema.suppressTaskName": "タスク名を引数としてコマンドに追加するかどうかを制御します。既定は false です。",
-	"JsonSchema.taskSelector": "引数がタスクであることを示すプレフィックス。",
-	"JsonSchema.matchers": "使用する問題マッチャー。1 つの文字列または問題マッチャー定義か、文字列と問題マッチャーの配列です。",
-	"JsonSchema.tasks": "タスクの構成。普通は外部タスク ランナーで既に定義されているタスクのエンリッチメントです。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v1.i18n.json b/i18n/jpn/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v1.i18n.json
deleted file mode 100644
index e4cb09543db..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v1.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"JsonSchema.version": "構成のバージョン番号",
-	"JsonSchema._runner": "ランナーが新しくなります。正式なランナープロパティーを使用してください",
-	"JsonSchema.runner": "タスクをプロセスとして実行して、出力が出力ウィンドウまたは端末内に表示されるかどうかを定義します。",
-	"JsonSchema.windows": "Windows 固有のコマンド構成",
-	"JsonSchema.mac": "Mac 固有のコマンド構成",
-	"JsonSchema.linux": "Linux 固有のコマンド構成",
-	"JsonSchema.shell": "コマンドがシェル コマンドか外部プログラムかを指定します。省略すると、既定は false になります。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json b/i18n/jpn/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
deleted file mode 100644
index 12d9ee548c0..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"JsonSchema.shell": "コマンドがシェル コマンドか外部プログラムかを指定します。省略すると、既定は false になります。",
-	"JsonSchema.tasks.isShellCommand.deprecated": "isShellCommand プロパティは使用されていません。代わりに、タスクの type プロパティとオプションの shell プロパティをご使用ください。また 1.14 リリース ノートをご確認ください。",
-	"JsonSchema.tasks.dependsOn.string": "このタスクが依存している別のタスク。",
-	"JsonSchema.tasks.dependsOn.array": "このタスクが依存している他の複数のタスク。",
-	"JsonSchema.tasks.presentation": "タスクの出力の表示と入力の読み取りに使用するようにパネルを構成します。",
-	"JsonSchema.tasks.presentation.echo": "実行されたコマンドがパネルにエコーされるかどうかを制御します。既定は trueです。",
-	"JsonSchema.tasks.presentation.focus": "パネルがフォーカスされるかどうかを制御します。既定は false です。true に設定した場合、パネルも表示されます。",
-	"JsonSchema.tasks.presentation.reveal.always": "タスクを実行したとき常にターミナルを表示します。",
-	"JsonSchema.tasks.presentation.reveal.silent": "タスクに関連付けられた問題マッチャーがなく、実行時にエラーが発生した場合のみターミナルを表示します。",
-	"JsonSchema.tasks.presentation.reveal.never": "このタスクを実行するときに、今後ターミナルを表示しません。",
-	"JsonSchema.tasks.presentation.reveals": "タスクを実行しているパネルを表示するかどうかを制御します。既定は \"always\" です。",
-	"JsonSchema.tasks.presentation.instance": "タスク間でパネルを共有するか、またはこのタスクで占有するか、実行ごとに新しいパネルを作成するかどうかを制御します。",
-	"JsonSchema.tasks.terminal": "terminal プロパティは非推奨です。代わりに presentation をご使用ください",
-	"JsonSchema.tasks.group.kind": "タスクの実行グループ。",
-	"JsonSchema.tasks.group.isDefault": "このタスクがグループ内の既定のタスクであるかどうかを定義します。",
-	"JsonSchema.tasks.group.defaultBuild": "既定のビルド タスクとしてタスクをマークします。",
-	"JsonSchema.tasks.group.defaultTest": "既定のテスト タスクとしてタスクをマークします。",
-	"JsonSchema.tasks.group.build": "'ビルド タスクの実行' コマンドからアクセスできるビルド タスクとしてタスクをマークします。",
-	"JsonSchema.tasks.group.test": "'テスト タスクの実行' コマンドからアクセスできるビルド タスクとしてタスクをマークします。",
-	"JsonSchema.tasks.group.none": "タスクをグループに割り当てない",
-	"JsonSchema.tasks.group": "このタスクが属する実行グループを定義します。ビルド グループに追加する \"build\" とテスト グループに追加する \"test\" をサポートしています。",
-	"JsonSchema.tasks.type": "タスクをプロセスとして実行するか、またはシェル内部でコマンドとして実行するかどうかを定義します。",
-	"JsonSchema.commandArray": "実行されるシェル コマンドです。配列の項目は空白文字を使用して結合されます。",
-	"JsonSchema.command.quotedString.value": "実際のコマンド値",
-	"JsonSchema.tasks.quoting.escape": "シェルのエスケープ文字を使用して文字をエスケープします (例: PowerShell の ` 、bash の \\)。",
-	"JsonSchema.tasks.quoting.strong": "シェルの strong quote 文字を使用して引数を引用します (例: PowerShell や bash の下の \")。",
-	"JsonSchema.tasks.quoting.weak": "シェルの weak quote 文字を使用して引数を引用します (例: PowerShell や bash の下の ')。",
-	"JsonSchema.command.quotesString.quote": "どのようにコマンドの値を引用符で囲うかを制御します。",
-	"JsonSchema.command": "実行されるコマンド。外部プログラムかシェル コマンドです。",
-	"JsonSchema.args.quotedString.value": "実際の引数値",
-	"JsonSchema.args.quotesString.quote": "どのように引数の値を引用符で囲うかを制御します。",
-	"JsonSchema.tasks.args": "このタスクの起動時にコマンドに渡される引数。",
-	"JsonSchema.tasks.label": "タスクのユーザー インターフェイス ラベル",
-	"JsonSchema.version": "構成のバージョン番号",
-	"JsonSchema.tasks.identifier": "launch.json または dependsOn 句のタスクを参照するユーザー定義の識別子。",
-	"JsonSchema.tasks.taskLabel": "タスクのラベル",
-	"JsonSchema.tasks.taskName": "タスクの名前",
-	"JsonSchema.tasks.taskName.deprecated": "タスクの name プロパティは非推奨です。代わりに label プロパティをご使用ください。",
-	"JsonSchema.tasks.background": "実行済みのタスクが維持され、バッググラウンドで実行されているかどうか。",
-	"JsonSchema.tasks.promptOnClose": "タスクの実行中に VS Code を閉じるときにユーザーにダイアログを表示するかどうか。",
-	"JsonSchema.tasks.matchers": "使用する問題マッチャー。1 つの文字列または問題マッチャー定義か、文字列と問題マッチャーの配列です。",
-	"JsonSchema.customizations.customizes.type": "カスタマイズするタスクの種類",
-	"JsonSchema.tasks.customize.deprecated": "customize プロパティは非推奨です。新しいタスクのカスタマイズ方法に移行する方法については 1.14 リリース ノートをご確認ください。",
-	"JsonSchema.tasks.showOputput.deprecated": "showOutputプロパティは非推奨です。代わりに presentation プロパティ内の reveal プロパティを使用してください。また 1.14 リリース ノートをご確認ください。",
-	"JsonSchema.tasks.echoCommand.deprecated": "echoCommand プロパティは使用されていません。代わりに presentation プロパティ内の echo プロパティを使用してください。また 1.14 リリース ノートをご確認ください。",
-	"JsonSchema.tasks.suppressTaskName.deprecated": "suppressTaskName プロパティは非推奨です。代わりに、その引数を含むコマンドをタスクにインライン展開してください。1.14 リリース ノートも参照してください。",
-	"JsonSchema.tasks.isBuildCommand.deprecated": "isBuildCommand プロパティは非推奨です。代わりに group プロパティを使用してください。また 1.14 リリース ノートをご確認ください。",
-	"JsonSchema.tasks.isTestCommand.deprecated": "isTestCommand プロパティは非推奨です。代わりに group プロパティを使用してください。また 1.14 リリース ノートをご確認ください。",
-	"JsonSchema.tasks.taskSelector.deprecated": "taskSelector プロパティは非推奨です。代わりに、その引数を含むコマンドをタスクにインライン展開してください。1.14 リリース ノートも参照してください。",
-	"JsonSchema.windows": "Windows 固有のコマンド構成",
-	"JsonSchema.mac": "Mac 固有のコマンド構成",
-	"JsonSchema.linux": "Linux 固有のコマンド構成"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json b/i18n/jpn/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
deleted file mode 100644
index 8021ef7847f..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
+++ /dev/null
@@ -1,89 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"tasksCategory": "タスク",
-	"ConfigureTaskRunnerAction.label": "タスクの構成",
-	"totalErrors": "エラー {0}",
-	"totalWarnings": "警告 {0}",
-	"totalInfos": "情報 {0}",
-	"problems": "問題",
-	"building": "ビルド中...",
-	"manyProblems": "10K+",
-	"runningTasks": "実行中のタスクを表示",
-	"tasks": "タスク",
-	"TaskSystem.noHotSwap": "アクティブなタスクを実行しているタスク実行エンジンを変更するには、ウィンドウの再読み込みが必要です",
-	"reloadWindow": "ウィンドウの再読み込み",
-	"TaskServer.folderIgnored": "{0} フォルダーはタスク バージョン 0.1.0  を使用しているために無視されます",
-	"TaskService.noBuildTask1": "ビルド タスクが定義されていません。tasks.json ファイルでタスクに 'isBuildCommand' というマークを付けてください。",
-	"TaskService.noBuildTask2": "ビルド タスクが定義されていません。tasks.json ファイルでタスクに 'build' グループとしてマークを付けてください。",
-	"TaskService.noTestTask1": "テスト タスクが定義されていません。tasks.json ファイルでタスクに 'isTestCommand' というマークを付けてください。",
-	"TaskService.noTestTask2": "テスト タスクが定義されていません。tasks.json ファイルでタスクに 'test' グループとしてマークを付けてください。",
-	"TaskServer.noTask": "実行が要求されたタスク {0} が見つかりません。",
-	"TaskService.associate": "関連",
-	"TaskService.attachProblemMatcher.continueWithout": "タスクの出力をスキャンせずに続行",
-	"TaskService.attachProblemMatcher.never": "今後このタスクの出力をスキャンしない",
-	"TaskService.attachProblemMatcher.learnMoreAbout": "タスク出力のスキャンについての詳細",
-	"selectProblemMatcher": "スキャンするタスク出力のエラーと警告の種類を選択",
-	"customizeParseErrors": "現在のタスクの構成にはエラーがあります。タスクをカスタマイズする前にエラーを修正してください。",
-	"moreThanOneBuildTask": "tasks.json で複数のビルド タスクが定義されています。最初のタスクのみを実行します。\\n",
-	"TaskSystem.activeSame.background": "タスク '{0}' は既にバックグラウンド モードでアクティブです。",
-	"TaskSystem.activeSame.noBackground": "タスク '{0}' は既にアクティブです。",
-	"terminateTask": "タスクの終了",
-	"restartTask": "タスクの再開",
-	"TaskSystem.active": "既に実行中のタスクがあります。まずこのタスクを終了してから、別のタスクを実行してください。",
-	"TaskSystem.restartFailed": "タスク {0} を終了して再開できませんでした",
-	"TaskService.noConfiguration": "エラー: {0} タスク検出は次の構成に対してタスクを提供していません:\n{1}\nこのタスクは無視されます。\n",
-	"TaskSystem.configurationErrors": "エラー: 指定したタスク構成に検証エラーがあり、使用できません。最初にエラーを修正してください。",
-	"taskService.ignoreingFolder": "ワークスペース フォルダー {0} のタスク構成を無視します。マルチ フォルダー ワークスペース タスクのサポートには、すべてのフォルダーがタスク バージョン 2.0.0 を使用する必要があります。\n",
-	"TaskSystem.invalidTaskJson": "エラー: tasks.json ファイルの内容に構文エラーがあります。訂正してからタスクを実行してください。\n",
-	"TaskSystem.runningTask": "実行中のタスクがあります。終了しますか?",
-	"TaskSystem.terminateTask": "タスクの終了(&&T)",
-	"TaskSystem.noProcess": "起動したタスクは既に存在しません。タスクを起動したバックグラウンド プロセスが VS コードで終了すると、プロセスが孤立することがあります。これを回避するには、待機フラグを設定して最後のバックグラウンド プロセスを開始します。",
-	"TaskSystem.exitAnyways": "常に終了(&&E)",
-	"TerminateAction.label": "タスクの終了",
-	"TaskSystem.unknownError": "タスクの実行中にエラーが発生しました。詳細については、タスク ログを参照してください。",
-	"TaskService.noWorkspace": "タスクはワークスペース フォルダーでのみ利用可能です。",
-	"recentlyUsed": "最近使用したタスク",
-	"configured": "構成済みのタスク",
-	"detected": "検出されたタスク",
-	"TaskService.ignoredFolder": "次のワークスペース フォルダーはタスク バージョン 0.1.0 を使用しているため無視されます: {0}",
-	"TaskService.notAgain": "今後は表示しない",
-	"TaskService.pickRunTask": "実行するタスクを選択してください",
-	"TaslService.noEntryToRun": "実行するタスクがありません。タスクを構成する...",
-	"TaskService.fetchingBuildTasks": "ビルド タスクをフェッチしています...",
-	"TaskService.pickBuildTask": "実行するビルド タスクを選択",
-	"TaskService.noBuildTask": "実行するビルド タスクがありません。ビルド タスクを構成する...",
-	"TaskService.fetchingTestTasks": "テスト タスクをフェッチしています...",
-	"TaskService.pickTestTask": "実行するテスト タスクを選択してください",
-	"TaskService.noTestTaskTerminal": "実行するテスト タスクがありません。タスクを構成する... ",
-	"TaskService.tastToTerminate": "終了するタスクを選択",
-	"TaskService.noTaskRunning": "現在実行中のタスクはありません",
-	"TerminateAction.noProcess": "起動したプロセスは既に存在しません。タスクを起動したバックグラウンド タスクが VS コードで終了すると、プロセスが孤立することがあります。",
-	"TerminateAction.failed": "実行中のタスクの終了に失敗しました",
-	"TaskService.tastToRestart": "再起動するタスクを選択してください",
-	"TaskService.noTaskToRestart": "再起動するタスクがありません",
-	"TaskService.template": "タスク テンプレートを選択",
-	"TaskService.createJsonFile": "テンプレートから tasks.json を生成",
-	"TaskService.openJsonFile": "tasks.json ファイルを開く",
-	"TaskService.pickTask": "構成するタスクを選択",
-	"TaskService.defaultBuildTaskExists": "{0} は既に既定のビルド タスクとしてマークされています",
-	"TaskService.pickDefaultBuildTask": "既定のビルド タスクとして使用するタスクを選択",
-	"TaskService.defaultTestTaskExists": "{0} は既に既定のテスト タスクとしてマークされています。",
-	"TaskService.pickDefaultTestTask": "既定のテスト タスクとして使用するタスクを選択",
-	"TaskService.pickShowTask": "出力を表示するタスクを選択",
-	"TaskService.noTaskIsRunning": "実行中のタスクはありません",
-	"ShowLogAction.label": "タスク ログの表示",
-	"RunTaskAction.label": "タスクの実行",
-	"RestartTaskAction.label": "実行中のタスクの再起動",
-	"ShowTasksAction.label": "実行中のタスクを表示",
-	"BuildAction.label": "ビルド タスクの実行",
-	"TestAction.label": "テスト タスクの実行",
-	"ConfigureDefaultBuildTask.label": "既定のビルド タスクを構成する",
-	"ConfigureDefaultTestTask.label": "既定のテスト タスクを構成する",
-	"quickOpen.task": "タスクの実行"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/tasks/electron-browser/taskPanel.i18n.json b/i18n/jpn/src/vs/workbench/parts/tasks/electron-browser/taskPanel.i18n.json
deleted file mode 100644
index 4c803b34792..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/tasks/electron-browser/taskPanel.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"tasks": "タスク"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.i18n.json b/i18n/jpn/src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.i18n.json
deleted file mode 100644
index cdd450e9166..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"TerminalTaskSystem.unknownError": "タスクの実行中に不明なエラーが発生しました。詳細については、タスク出力ログを参照してください。",
-	"dependencyFailed": "ワークスペース フォルダー '{1}' 内で依存タスクの '{0}' を解決できませんでした",
-	"TerminalTaskSystem.terminalName": "タスク - {0}",
-	"closeTerminal": "任意のキーを押してターミナルを終了します。",
-	"reuseTerminal": "ターミナルはタスクで再利用されます、閉じるには任意のキーを押してください。",
-	"TerminalTaskSystem": "cmd.exe を使用して UNC ドライブ上でシェル コマンドを実行できません。",
-	"unkownProblemMatcher": "問題マッチャー {0} は解決できませんでした。マッチャーは無視されます"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/tasks/node/processRunnerDetector.i18n.json b/i18n/jpn/src/vs/workbench/parts/tasks/node/processRunnerDetector.i18n.json
deleted file mode 100644
index 85347430d9a..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/tasks/node/processRunnerDetector.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"TaskSystemDetector.noGulpTasks": "gulp --tasks-simple が実行されましたがタスクの一覧は表示されませんでした。npm install を実行しましたか?",
-	"TaskSystemDetector.noJakeTasks": "jake --tasks が実行されましたがタスクの一覧は表示されませんでした。npm install を実行しましたか?",
-	"TaskSystemDetector.noGulpProgram": "システムに Gulp がインストールされていません。npm install -g gulp を実行してインストールしてください。",
-	"TaskSystemDetector.noJakeProgram": "システムに Jake がインストールされていません。npm install -g jake を実行してインストールしてください。",
-	"TaskSystemDetector.noGruntProgram": "システムに Grunt がインストールされていません。npm install -g grunt を実行してインストールしてください。",
-	"TaskSystemDetector.noProgram": "プログラム {0} が見つかりませんでした。メッセージは {1} です",
-	"TaskSystemDetector.buildTaskDetected": "名前 '{0}' のビルド タスクが検出されました。",
-	"TaskSystemDetector.testTaskDetected": "名前 '{0}' のテスト タスクが検出されました。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/tasks/node/processTaskSystem.i18n.json b/i18n/jpn/src/vs/workbench/parts/tasks/node/processTaskSystem.i18n.json
deleted file mode 100644
index 33a08efcbd2..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/tasks/node/processTaskSystem.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"TaskRunnerSystem.unknownError": "タスクの実行中に不明なエラーが発生しました。詳細については、タスク出力ログを参照してください。",
-	"TaskRunnerSystem.watchingBuildTaskFinished": "\nビルド タスクのウォッチが終了しました。",
-	"TaskRunnerSystem.childProcessError": "Failed to launch external program {0} {1}.",
-	"TaskRunnerSystem.cancelRequested": "\nユーザー要求ごとにタスク '{0}' が終了しました。",
-	"unkownProblemMatcher": "問題マッチャー {0} は解決できませんでした。マッチャーは無視されます"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json b/i18n/jpn/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
deleted file mode 100644
index c7a264707a6..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"ConfigurationParser.invalidCWD": "警告: options.cwd は、string 型でなければなりません。値 {0} を無視します",
-	"ConfigurationParser.inValidArg": "エラー: コマンド引数は文字列もしくは引用文字列のどちらかである必要があります。指定された値:\n{0}",
-	"ConfigurationParser.noargs": "エラー: コマンド引数は文字列の配列でなければなりません。指定された値:\n{0}",
-	"ConfigurationParser.noShell": "警告: シェル構成がサポートされるのは、ターミナルでタスクを実行している場合のみです。",
-	"ConfigurationParser.noName": "エラー: 宣言スコープ内の問題マッチャーに次の名前がなければなりません:\n{0}\n",
-	"ConfigurationParser.unknownMatcherKind": "警告: 定義されている問題マッチャーが不明です。サポートされている型は string | ProblemMatcher | (string | ProblemMatcher)[] です。\n{0}\n",
-	"ConfigurationParser.invalidVaraibleReference": "エラー: 正しくない problemMatcher 参照 {0}\n",
-	"ConfigurationParser.noTaskType": "エラー: タスクの構成には type プロパティが必要です。この構成は無視されます。\n{0}\n",
-	"ConfigurationParser.noTypeDefinition": "Error: タスク タイプ '{0}' は登録されていません。対応するタスク プロバイダーを提供する拡張機能をインストールしましたか?",
-	"ConfigurationParser.missingRequiredProperty": "エラー: タスク構成 '{0}' に必要な '{1}' プロパティがありません。構成は無視されます。 ",
-	"ConfigurationParser.notCustom": "エラー: タスクがカスタム タスクとして定義されていません。この構成は無視されます。\n{0}\n",
-	"ConfigurationParser.noTaskName": "エラー: タスクが label プロパティを提供しなければなりません。このタスクは無視されます。\n{0}\n",
-	"taskConfiguration.noCommandOrDependsOn": "エラー: タスク '{0}' は、コマンドも dependsOn プロパティも指定していません。このタスクは無視されます。定義は次のとおりです:\n{1}",
-	"taskConfiguration.noCommand": "エラー: タスク '{0}' はコマンドを定義していません。このタスクは無視されます。定義は次のとおりです:\n{1}",
-	"TaskParse.noOsSpecificGlobalTasks": "バージョン 2.0.0 のタスクでは、OS に固有のグローバル タスクはサポートされません。OS に固有のコマンドを使用したタスクに変換してください。影響を受けるタスクは次のとおりです。\n{0}"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.i18n.json b/i18n/jpn/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.i18n.json
deleted file mode 100644
index 197c74abf03..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"termEntryAriaLabel": "{0}、ターミナル ピッカー",
-	"termCreateEntryAriaLabel": "{0} 、新しいターミナルの作成",
-	"workbench.action.terminal.newplus": "$(plus) 新しい統合ターミナルの作成",
-	"noTerminalsMatching": "一致するターミナルがありません",
-	"noTerminalsFound": "開いているターミナルがありません"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/terminal/common/terminalColorRegistry.i18n.json b/i18n/jpn/src/vs/workbench/parts/terminal/common/terminalColorRegistry.i18n.json
deleted file mode 100644
index 1941d0b6328..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/terminal/common/terminalColorRegistry.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"terminal.background": "ターミナルの背景色。パネルごとに異なる色を指定できます。",
-	"terminal.foreground": "ターミナルの前景色。",
-	"terminalCursor.foreground": "ターミナルのカーソル前景色。",
-	"terminalCursor.background": "ターミナルのカーソルの背景色。ブロックカーソルで重ねた文字の色をカスタマイズできます。",
-	"terminal.selectionBackground": "ターミナルの選択範囲の背景色。",
-	"terminal.border": "ターミナル内の分割パネルを区切る境界線色。デフォルトは panel.border です。",
-	"terminal.ansiColor": "ターミナルの '{0}' ANSI カラー。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json b/i18n/jpn/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
deleted file mode 100644
index 62e38b3747f..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"quickOpen.terminal": "開いているすべてのターミナルを表示",
-	"terminal": "ターミナル",
-	"terminalIntegratedConfigurationTitle": "統合ターミナル",
-	"terminal.integrated.shell.linux": "ターミナルが Linux で使用するシェルのパス。",
-	"terminal.integrated.shellArgs.linux": "Linux のターミナルで使用するコマンド ライン引数。",
-	"terminal.integrated.shell.osx": "ターミナルが OS X で使用するシェルのパス。",
-	"terminal.integrated.shellArgs.osx": "OS X 端末で使用するコマンド ライン引数。",
-	"terminal.integrated.shell.windows": "Windows でターミナルが使用するシェルのパス。 Windows に同梱されているシェルを使用する場合 (cmd、PowerShell、または Bash on Ubuntu) 。",
-	"terminal.integrated.shellArgs.windows": "Windows ターミナル上の場合に使用されるコマンド ライン引数。",
-	"terminal.integrated.macOptionIsMeta": "macOS のターミナルでは、オプション キーをメタ キーとして扱います。",
-	"terminal.integrated.copyOnSelection": "設定した場合、ターミナルで選択しているテキストはクリップボードにコピーされます。",
-	"terminal.integrated.fontFamily": "端末のフォント ファミリを制御します。既定値は editor.fontFamily になります。",
-	"terminal.integrated.fontSize": "ターミナルのフォント サイズをピクセル単位で制御します。",
-	"terminal.integrated.letterSpacing": "ターミナルの文字間隔を制御、これは文字間の追加ピクセル数を表す整数値です。",
-	"terminal.integrated.lineHeight": "ターミナルの行の高さを制御します。この数値にターミナルのフォント サイズを乗算すると、実際の行の高さ (ピクセル単位) になります。",
-	"terminal.integrated.fontWeight": "ターミナル内で太字ではないテキストに使用するフォントの太さ。",
-	"terminal.integrated.fontWeightBold": "ターミナル内で太字のテキストに使用するフォントの太さ。",
-	"terminal.integrated.cursorBlinking": "ターミナルのカーソルを点滅させるかどうかを制御します。",
-	"terminal.integrated.cursorStyle": "端末のカーソルのスタイルを制御します。",
-	"terminal.integrated.scrollback": "端末がそのバッファーに保持できる最大行数を制御します。",
-	"terminal.integrated.setLocaleVariables": "ターミナルの開始時にロケール変数を設定するかどうかを制御します。OS X では既定で true になり、その他のプラットフォームでは false です。",
-	"terminal.integrated.rendererType": "ターミナルのレンダリングを制御します。オプションは標準的な (速い)  キャンバス方式の \"canvas\"、代替的な DOM ベースのレンダリングの \"dom\"、いずれか良い方を VS Code に推測させる \"auto\" です。この設定は反映させるために VS Code を再読み込みする必要があります。",
-	"terminal.integrated.rightClickBehavior": "ターミナルが右クリックにどのように反応するかを制御します。\"default\"、\"copyPaste\"、 \"selectWord\" を指定できます。\"default\" はコンテキスト メニューを表示します。\"copyPaste\" は選択範囲があるとコピーし、そうでない場合は貼り付けを行います。\"selectWord\" はカーソル下の単語を選択し、コンテキスト メニューを表示します。",
-	"terminal.integrated.cwd": "端末を起動する明示的な開始パスです。これはシェル プロセスの現在の作業ディレクトリ (cwd) として使用されます。特にルート ディレクトリが cwd に適していない場合に、ワークスペースの設定で役立ちます。",
-	"terminal.integrated.confirmOnExit": "アクティブなターミナル セッションがある場合に終了の確認をするかどうか。",
-	"terminal.integrated.enableBell": "ターミナルのベルが有効かどうか。",
-	"terminal.integrated.commandsToSkipShell": "キーバインドがシェルに送信されず、代わりに常に Code で処理されるコマンド ID のセット。これにより、ターミナルがフォーカスされていない場合と同じ動作をするシェルによって通常使用されるキーバインドを使用できるようになります。例: Ctrl+p で Quick Open を起動します。",
-	"terminal.integrated.env.osx": "OS X のターミナルで使用される VS Code のプロセスに追加される環境変数を持つオブジェクト",
-	"terminal.integrated.env.linux": "Linux のターミナルで使用される VS Code のプロセスに追加される環境変数を持つオブジェクト",
-	"terminal.integrated.env.windows": "Windows のターミナルで使用される VS Code のプロセスに追加される環境変数を持つオブジェクト",
-	"terminal.integrated.showExitAlert": "0 以外の終了コードのとき `終了コードを伴ってターミナルの処理が終了しました` と警告を表示します。",
-	"terminal.integrated.experimentalRestore": "VS Code の起動時に自動的にワークスペースのターミナル セッションを復元するかどうか。これは実験的な設定です。不具合や将来的に変更される可能性があります。",
-	"terminalCategory": "ターミナル",
-	"viewCategory": "表示"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json b/i18n/jpn/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
deleted file mode 100644
index bd0ce993993..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
+++ /dev/null
@@ -1,63 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"workbench.action.terminal.toggleTerminal": "統合ターミナルの切り替え",
-	"workbench.action.terminal.kill": "アクティブな端末インスタンスを強制終了",
-	"workbench.action.terminal.kill.short": "ターミナルの強制終了",
-	"workbench.action.terminal.quickKill": "ターミナル インスタンスの停止",
-	"workbench.action.terminal.copySelection": "選択内容のコピー",
-	"workbench.action.terminal.selectAll": "すべて選択",
-	"workbench.action.terminal.deleteWordLeft": "左の文字を削除",
-	"workbench.action.terminal.deleteWordRight": "右の文字を削除",
-	"workbench.action.terminal.moveToLineStart": "行の先頭へ移動",
-	"workbench.action.terminal.moveToLineEnd": "行末に移動",
-	"workbench.action.terminal.new": "新しい統合ターミナルの作成",
-	"workbench.action.terminal.new.short": "新しいターミナル",
-	"workbench.action.terminal.newWorkspacePlaceholder": "新しいターミナルの作業ディレクトリを選択してください",
-	"workbench.action.terminal.newInActiveWorkspace": "(アクティブなワークスペースで) 新しいターミナルの作成",
-	"workbench.action.terminal.split": "ターミナルの分割",
-	"workbench.action.terminal.splitInActiveWorkspace": "(アクティブなワークスペースで) ターミナルの分割",
-	"workbench.action.terminal.focusPreviousPane": "前のペインにフォーカス",
-	"workbench.action.terminal.focusNextPane": "次のペインにフォーカス",
-	"workbench.action.terminal.resizePaneLeft": "ペインを左にリサイズ",
-	"workbench.action.terminal.resizePaneRight": "ペインを右にリサイズ",
-	"workbench.action.terminal.resizePaneUp": "ペインを上にリサイズ",
-	"workbench.action.terminal.resizePaneDown": "ペインを下にリサイズ",
-	"workbench.action.terminal.focus": "端末にフォーカス",
-	"workbench.action.terminal.focusNext": "次の端末にフォーカス",
-	"workbench.action.terminal.focusPrevious": "前のターミナルにフォーカス",
-	"workbench.action.terminal.paste": "アクティブなターミナルに貼り付け",
-	"workbench.action.terminal.DefaultShell": "既定のシェルの選択",
-	"workbench.action.terminal.runSelectedText": "アクティブなターミナルで選択したテキストを実行",
-	"workbench.action.terminal.runActiveFile": "アクティブなファイルをアクティブなターミナルで実行",
-	"workbench.action.terminal.runActiveFile.noFile": "ターミナルで実行できるのは、ディスク上のファイルのみです",
-	"workbench.action.terminal.switchTerminal": "ターミナルの切り替え",
-	"workbench.action.terminal.scrollDown": "下にスクロール (行)",
-	"workbench.action.terminal.scrollDownPage": "スクロール ダウン (ページ)",
-	"workbench.action.terminal.scrollToBottom": "一番下にスクロール",
-	"workbench.action.terminal.scrollUp": "上にスクロール (行)",
-	"workbench.action.terminal.scrollUpPage": "スクロール アップ (ページ)",
-	"workbench.action.terminal.scrollToTop": "一番上にスクロール",
-	"workbench.action.terminal.clear": "クリア",
-	"workbench.action.terminal.clearSelection": "選択のクリア",
-	"workbench.action.terminal.allowWorkspaceShell": "ワークスペースでシェルを構成することを許可する",
-	"workbench.action.terminal.disallowWorkspaceShell": "ワークスペースでシェルを構成することを許可しない",
-	"workbench.action.terminal.rename": "名前変更",
-	"workbench.action.terminal.rename.prompt": "ターミナルの名前を入力してください",
-	"workbench.action.terminal.focusFindWidget": "検索ウィジェットにフォーカスする",
-	"workbench.action.terminal.hideFindWidget": "検索ウィジェットを非表示にする",
-	"nextTerminalFindTerm": "次の検索語句を表示",
-	"previousTerminalFindTerm": "前の検索語句を表示",
-	"quickOpenTerm": "アクティブなターミナルの切り替え",
-	"workbench.action.terminal.scrollToPreviousCommand": "前のコマンドにスクロール",
-	"workbench.action.terminal.scrollToNextCommand": "次のコマンドにスクロール",
-	"workbench.action.terminal.selectToPreviousCommand": "前のコマンドを選択",
-	"workbench.action.terminal.selectToNextCommand": "次のコマンドを選択",
-	"workbench.action.terminal.selectToPreviousLine": "前の行を選択",
-	"workbench.action.terminal.selectToNextLine": "次の行を選択"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json b/i18n/jpn/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
deleted file mode 100644
index 1941d0b6328..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"terminal.background": "ターミナルの背景色。パネルごとに異なる色を指定できます。",
-	"terminal.foreground": "ターミナルの前景色。",
-	"terminalCursor.foreground": "ターミナルのカーソル前景色。",
-	"terminalCursor.background": "ターミナルのカーソルの背景色。ブロックカーソルで重ねた文字の色をカスタマイズできます。",
-	"terminal.selectionBackground": "ターミナルの選択範囲の背景色。",
-	"terminal.border": "ターミナル内の分割パネルを区切る境界線色。デフォルトは panel.border です。",
-	"terminal.ansiColor": "ターミナルの '{0}' ANSI カラー。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/terminal/electron-browser/terminalConfigHelper.i18n.json b/i18n/jpn/src/vs/workbench/parts/terminal/electron-browser/terminalConfigHelper.i18n.json
deleted file mode 100644
index 86150306383..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/terminal/electron-browser/terminalConfigHelper.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"terminal.integrated.allowWorkspaceShell": "{0} (ワークスペースの設定として定義されている) をターミナルで起動することを許可しますか?",
-	"allow": "Allow",
-	"disallow": "Disallow"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/terminal/electron-browser/terminalFindWidget.i18n.json b/i18n/jpn/src/vs/workbench/parts/terminal/electron-browser/terminalFindWidget.i18n.json
deleted file mode 100644
index 19f4b3b0c2d..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/terminal/electron-browser/terminalFindWidget.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"label.find": "検索",
-	"placeholder.find": "検索",
-	"label.previousMatchButton": "前の一致項目",
-	"label.nextMatchButton": "次の一致項目",
-	"label.closeButton": "閉じる"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json b/i18n/jpn/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json
deleted file mode 100644
index 62fabc08564..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"terminal.integrated.a11yBlankLine": "空白行",
-	"terminal.integrated.a11yPromptLabel": "端末入力",
-	"terminal.integrated.a11yTooMuchOutput": "通知する出力が多すぎます。行に移動して手動で読み取ってください",
-	"yes": "はい",
-	"terminal.rendererInAllNewTerminals": "すべての新しく作成されるターミナルは非 GPU レンダラーを使用します。",
-	"no": "いいえ",
-	"dontShowAgain": "今後は表示しない",
-	"terminal.slowRendering": "統合ターミナルの標準レンダラーが遅くなっているようです。パフォーマンスの向上を見込める DOM ベースのレンダラーに切り替えますか? [ターミナルの設定についてこちらを参照してください](https://code.visualstudio.com/docs/editor/integrated-terminal#_changing-how-the-terminal-is-rendered)。",
-	"terminal.integrated.copySelection.noSelection": "ターミナルにコピー対象の選択範囲がありません",
-	"terminal.integrated.exitedWithCode": "ターミナルの処理が終了しました (終了コード: {0})",
-	"terminal.integrated.waitOnExit": "任意のキーを押して端末を終了します",
-	"terminal.integrated.launchFailed": "ターミナルのプロセス コマンド '{0}{1}' を起動できませんでした (終了コード: {2})",
-	"terminal.integrated.launchFailedExtHost": "ターミナル プロセスが起動に失敗しました (終了コード: {0})"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/terminal/electron-browser/terminalLinkHandler.i18n.json b/i18n/jpn/src/vs/workbench/parts/terminal/electron-browser/terminalLinkHandler.i18n.json
deleted file mode 100644
index a8c844fb0d6..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/terminal/electron-browser/terminalLinkHandler.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"terminalLinkHandler.followLinkAlt": "Altl キーを押しながらクリックしてリンク先を表示",
-	"terminalLinkHandler.followLinkCmd": "command キーを押しながらクリックしてリンク先を表示",
-	"terminalLinkHandler.followLinkCtrl": "Ctrl キーを押しながらクリックしてリンク先を表示"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json b/i18n/jpn/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json
deleted file mode 100644
index f15ddb75286..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"terminal.useMonospace": "「等幅」を使用します。",
-	"terminal.monospaceOnly": "ターミナルは等幅フォントのみサポートしています。",
-	"copy": "コピー",
-	"split": "分割",
-	"paste": "貼り付け",
-	"selectAll": "すべて選択",
-	"clear": "クリア"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json b/i18n/jpn/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
deleted file mode 100644
index ccb663830c2..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"terminal.integrated.chooseWindowsShellInfo": "カスタマイズ ボタンを選択して、既定のターミナル シェルを変更できます。",
-	"customize": "カスタマイズする",
-	"never again": "今後は表示しない",
-	"terminal.integrated.chooseWindowsShell": "優先するターミナル シェルを選択します。これは後で設定から変更できます",
-	"terminalService.terminalCloseConfirmationSingular": "アクティブなターミナル セッションが 1 つあります。中止しますか?",
-	"terminalService.terminalCloseConfirmationPlural": "アクティブなターミナル セッションが {0} 個あります。中止しますか?"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/themes/electron-browser/themes.contribution.i18n.json b/i18n/jpn/src/vs/workbench/parts/themes/electron-browser/themes.contribution.i18n.json
deleted file mode 100644
index cc8228fd1da..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/themes/electron-browser/themes.contribution.i18n.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"selectTheme.label": "配色テーマ",
-	"themes.category.light": "ライト テーマ",
-	"themes.category.dark": "ダーク テーマ",
-	"themes.category.hc": "ハイ コントラスト テーマ",
-	"installColorThemes": "その他の配色テーマをインストール...",
-	"themes.selectTheme": "配色テーマの選択 (上/下キーでプレビュー可能)",
-	"selectIconTheme.label": "ファイル アイコンのテーマ",
-	"noIconThemeLabel": "なし",
-	"noIconThemeDesc": "ファイル アイコンを無効にする",
-	"installIconThemes": "その他のファイル アイコンのテーマをインストール...",
-	"themes.selectIconTheme": "ファイル アイコンのテーマを選択します",
-	"generateColorTheme.label": "現在の設定から配色テーマを生成する",
-	"preferences": "基本設定",
-	"developer": "Developer"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/trust/electron-browser/unsupportedWorkspaceSettings.contribution.i18n.json b/i18n/jpn/src/vs/workbench/parts/trust/electron-browser/unsupportedWorkspaceSettings.contribution.i18n.json
deleted file mode 100644
index e57be05971a..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/trust/electron-browser/unsupportedWorkspaceSettings.contribution.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openWorkspaceSettings": "ワークスペース設定を開く",
-	"dontShowAgain": "今後は表示しない",
-	"unsupportedWorkspaceSettings": "このワークスペースには、ユーザー設定でのみ設定可能な設定が含まれています ({0})。詳細情報は[こちら]({1})をクリックしてください。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json b/i18n/jpn/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json
deleted file mode 100644
index 8bfa1cc30f1..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"releaseNotesInputName": "リリース ノート: {0}",
-	"unassigned": "未割り当て"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/update/electron-browser/releaseNotesInput.i18n.json b/i18n/jpn/src/vs/workbench/parts/update/electron-browser/releaseNotesInput.i18n.json
deleted file mode 100644
index 266fb4dc2f5..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/update/electron-browser/releaseNotesInput.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"releaseNotesInputName": "リリース ノート: {0}"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/update/electron-browser/update.contribution.i18n.json b/i18n/jpn/src/vs/workbench/parts/update/electron-browser/update.contribution.i18n.json
deleted file mode 100644
index 9d62a11fec4..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/update/electron-browser/update.contribution.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"release notes": "リリース ノート"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/update/electron-browser/update.i18n.json b/i18n/jpn/src/vs/workbench/parts/update/electron-browser/update.i18n.json
deleted file mode 100644
index be4c3ee187a..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/update/electron-browser/update.i18n.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"releaseNotes": "リリース ノート",
-	"showReleaseNotes": "リリース ノートの表示",
-	"read the release notes": "{0} v{1} へようこそ! リリース ノートを確認しますか?",
-	"licenseChanged": "ライセンス条項が変更されました。[こちら]({0}) をクリックして内容をご確認ください。",
-	"neveragain": "今後は表示しない",
-	"64bitisavailable": "64 ビット Windows 用の {0} が利用可能になりました！詳細情報は[こちら]({1})をクリックしてください。",
-	"updateIsReady": "新しい更新 {0} が利用可能です。",
-	"noUpdatesAvailable": "現在入手可能な更新はありません。",
-	"ok": "OK",
-	"thereIsUpdateAvailable": "利用可能な更新プログラムがあります。",
-	"download now": "今すぐダウンロード",
-	"later": "後で",
-	"updateAvailable": "利用可能な更新プログラムがあります: {0} {1}",
-	"installUpdate": "更新プログラムのインストール",
-	"updateInstalling": "バックグラウンドで {0} {1} がインストールされています。処理が完了次第、お知らせします。",
-	"updateAvailableAfterRestart": "最新の更新プログラムを適用するために {0} を再起動してください。",
-	"updateNow": "今すぐ更新",
-	"commandPalette": "コマンド パレット...",
-	"settings": "設定",
-	"keyboardShortcuts": "キーボード ショートカット",
-	"showExtensions": "拡張機能の管理",
-	"userSnippets": "ユーザー スニペット",
-	"selectTheme.label": "配色テーマ",
-	"themes.selectIconTheme.label": "ファイル アイコンのテーマ",
-	"checkForUpdates": "更新の確認...",
-	"checkingForUpdates": "更新を確認しています...",
-	"DownloadingUpdate": "更新をダウンロードしています...",
-	"installUpdate...": "更新プログラムのインストール...",
-	"installingUpdate": "更新プログラムをインストールしています...",
-	"restartToUpdate": "再起動して更新..."
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/url/electron-browser/url.contribution.i18n.json b/i18n/jpn/src/vs/workbench/parts/url/electron-browser/url.contribution.i18n.json
deleted file mode 100644
index d4807e12215..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/url/electron-browser/url.contribution.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openUrl": "URL を開く",
-	"developer": "開発者"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/views/browser/views.i18n.json b/i18n/jpn/src/vs/workbench/parts/views/browser/views.i18n.json
deleted file mode 100644
index 77323e2fdd2..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/views/browser/views.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"viewToolbarAriaLabel": "{0} 個のアクション",
-	"hideView": "サイド バーから非表示"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/views/browser/viewsExtensionPoint.i18n.json b/i18n/jpn/src/vs/workbench/parts/views/browser/viewsExtensionPoint.i18n.json
deleted file mode 100644
index 7b7a2d57fdc..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/views/browser/viewsExtensionPoint.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"requirearray": "ビューは配列にする必要があります",
-	"requirestring": " `{0}`  プロパティは必須で、`string` 型でなければなりません",
-	"optstring": "`{0}` プロパティは省略するか、`string` 型にする必要があります",
-	"vscode.extension.contributes.view.id": "ビューの識別子。`vscode.window.registerTreeDataProviderForView` API を介してデータ プロバイダーを登録するには、これを使用します。また、`onView:${id}` イベントを `activationEvents` に登録することによって、拡張機能のアクティブ化をトリガーするためにも使用できます。",
-	"vscode.extension.contributes.view.name": "ビューの判読できる名前。表示されます",
-	"vscode.extension.contributes.view.when": "このビューを表示するために満たす必要がある条件",
-	"vscode.extension.contributes.views": "ビューをエディターに提供します",
-	"views.explorer": "エクスプローラー ビュー",
-	"views.debug": "デバッグ ビュー",
-	"locationId.invalid": "`{0}` は有効なビューの場所ではありません"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/watermark/electron-browser/watermark.i18n.json b/i18n/jpn/src/vs/workbench/parts/watermark/electron-browser/watermark.i18n.json
deleted file mode 100644
index 227e79acafa..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/watermark/electron-browser/watermark.i18n.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"watermark.showCommands": "すべてのコマンドの表示",
-	"watermark.quickOpen": "ファイルに移動する",
-	"watermark.openFile": "ファイルを開く",
-	"watermark.openFolder": "フォルダーを開く",
-	"watermark.openFileFolder": "ファイルまたはフォルダーを開く",
-	"watermark.openRecent": "最近開いた項目",
-	"watermark.newUntitledFile": "無題の新規ファイル",
-	"watermark.toggleTerminal": "ターミナルの切り替え",
-	"watermark.findInFiles": "フォルダーを指定して検索",
-	"watermark.startDebugging": "デバッグの開始",
-	"watermark.unboundCommand": "バインドなし",
-	"workbenchConfigurationTitle": "ワークベンチ",
-	"tips.enabled": "有効にすると、エディターを 1 つも開いていないときに透かしのヒントが表示されます。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json b/i18n/jpn/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json
deleted file mode 100644
index 4dfeb1219a9..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"webview.editor.label": "webview エディター",
-	"developer": "開発者"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/webview/electron-browser/webviewCommands.i18n.json b/i18n/jpn/src/vs/workbench/parts/webview/electron-browser/webviewCommands.i18n.json
deleted file mode 100644
index 14a4dc22123..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/webview/electron-browser/webviewCommands.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openToolsLabel": "Webview 開発者ツールを開く",
-	"refreshWebviewLabel": "WebView の再読み込み"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json b/i18n/jpn/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json
deleted file mode 100644
index 635368f9425..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"telemetryOptOut.optOutNotice": "Microsoft による利用状況のデータ収集を許可することで VS Code の改善に役立てることができます。私たちの [プライバシーに関する声明]({0}) 参照し、[オプト アウト]({1}) する方法を確認してください。",
-	"telemetryOptOut.optInNotice": "Microsoft による利用状況のデータ収集を許可することで VS Code の改善に役立てることができます。私たちの [プライバシーに関する声明]({0}) 参照し、[オプト イン]({1}) する方法を確認してください。",
-	"telemetryOptOut.readMore": "詳細を参照"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/welcome/overlay/browser/welcomeOverlay.i18n.json b/i18n/jpn/src/vs/workbench/parts/welcome/overlay/browser/welcomeOverlay.i18n.json
deleted file mode 100644
index 335e27fbbcd..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/welcome/overlay/browser/welcomeOverlay.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"welcomeOverlay.explorer": "エクスプローラー",
-	"welcomeOverlay.search": "複数ファイルの検索",
-	"welcomeOverlay.git": "ソース コード管理",
-	"welcomeOverlay.debug": "起動およびデバッグ",
-	"welcomeOverlay.extensions": "拡張機能の管理",
-	"welcomeOverlay.problems": "エラーおよび警告の表示",
-	"welcomeOverlay.commandPalette": "すべてのコマンドの検索と実行",
-	"welcomeOverlay.notifications": "通知を表示",
-	"welcomeOverlay": "ユーザー インターフェイスの概要",
-	"hideWelcomeOverlay": "インターフェイスの概要を非表示にします",
-	"help": "ヘルプ"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json b/i18n/jpn/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
deleted file mode 100644
index 946723a6712..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"welcomePage.vscode": "Visual Studio Code",
-	"welcomePage.editingEvolved": "進化した編集",
-	"welcomePage.start": "開始",
-	"welcomePage.newFile": "新しいファイル",
-	"welcomePage.openFolder": "フォルダーを開く...",
-	"welcomePage.addWorkspaceFolder": "ワークスペース フォルダーを追加…",
-	"welcomePage.recent": "最近",
-	"welcomePage.moreRecent": "その他",
-	"welcomePage.noRecentFolders": "最近使用したフォルダーなし",
-	"welcomePage.help": "ヘルプ",
-	"welcomePage.keybindingsCheatsheet": "印刷可能なキーボードのチートシート",
-	"welcomePage.introductoryVideos": "紹介ビデオ",
-	"welcomePage.tipsAndTricks": "ヒントとコツ",
-	"welcomePage.productDocumentation": "製品ドキュメント",
-	"welcomePage.gitHubRepository": "GitHub リポジトリ",
-	"welcomePage.stackOverflow": "Stack Overflow",
-	"welcomePage.showOnStartup": "起動時にウェルカム ページを表示",
-	"welcomePage.customize": "カスタマイズ",
-	"welcomePage.installExtensionPacks": "ツールと言語",
-	"welcomePage.installExtensionPacksDescription": "{0} と {1} のサポートをインストールする ",
-	"welcomePage.moreExtensions": "その他",
-	"welcomePage.installKeymapDescription": "設定とキーバインド",
-	"welcomePage.installKeymapExtension": "{0} と {1} の設定とキーボード ショートカットをインストールします",
-	"welcomePage.others": "その他",
-	"welcomePage.colorTheme": "配色テーマ",
-	"welcomePage.colorThemeDescription": "エディターとコードの外観を自由に設定します",
-	"welcomePage.learn": "学ぶ",
-	"welcomePage.showCommands": "すべてのコマンドの検索と実行",
-	"welcomePage.showCommandsDescription": "コマンド パレットからコマンドを検索してすばやくアクセスします ({0})",
-	"welcomePage.interfaceOverview": "インターフェイスの概要",
-	"welcomePage.interfaceOverviewDescription": "UI の主要コンポーネントを解説した視覚オーバーレイを表示します",
-	"welcomePage.interactivePlayground": "対話型プレイグラウンド",
-	"welcomePage.interactivePlaygroundDescription": "エディターの基本機能を簡潔なチュートリアルで体験します"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.contribution.i18n.json b/i18n/jpn/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.contribution.i18n.json
deleted file mode 100644
index 48548675d7f..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.contribution.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"workbenchConfigurationTitle": "ワークベンチ",
-	"workbench.startupEditor.none": "エディターなしで開始",
-	"workbench.startupEditor.welcomePage": "ウェルカムページを開きます (既定)。",
-	"workbench.startupEditor.newUntitledFile": "無題の新規ファイルを開きます。",
-	"workbench.startupEditor": "前のセッションからエディターが復元されていない場合に、起動時に表示するかどうかを制御します。'none' を選択するとエディターなしで開始します。'welcomePage' を選択するとウェルカム ページを開きます (既定)。'newUntitledFile' を選択すると新しい無題のファイルを開きます (空のワークスペースを開いているときのみ)。",
-	"help": "ヘルプ"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json b/i18n/jpn/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json
deleted file mode 100644
index 07da4459243..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"welcomePage": "ようこそ",
-	"welcomePage.javaScript": "JavaScript",
-	"welcomePage.typeScript": "TypeScript",
-	"welcomePage.python": "Python",
-	"welcomePage.php": "PHP",
-	"welcomePage.azure": "Azure",
-	"welcomePage.showAzureExtensions": "Azure 拡張機能の表示",
-	"welcomePage.docker": "Docker",
-	"welcomePage.vim": "Vim",
-	"welcomePage.sublime": "Sublime",
-	"welcomePage.atom": "Atom",
-	"welcomePage.extensionPackAlreadyInstalled": "{0} のサポートは既にインストールされています。",
-	"welcomePage.willReloadAfterInstallingExtensionPack": "{0} に追加のサポートをインストールしたあと、ウィンドウが再度読み込まれます。",
-	"welcomePage.installingExtensionPack": "{0} に追加のサポートをインストールしています...",
-	"welcomePage.extensionPackNotFound": "ID {1} のサポート {0} は見つかりませんでした。",
-	"welcomePage.keymapAlreadyInstalled": "キーボード ショートカット {0} は既にインストールされています。",
-	"welcomePage.willReloadAfterInstallingKeymap": "キーボード ショートカット {0} をインストールした後、ウィンドウが再度読み込まれます。",
-	"welcomePage.installingKeymap": "{0} のキーボード ショートカットをインストールしています...",
-	"welcomePage.keymapNotFound": "ID {1} のキーボード ショートカット {0} は見つかりませんでした。",
-	"welcome.title": "ようこそ",
-	"welcomePage.openFolderWithPath": "パス {1} のフォルダー {0} を開く",
-	"welcomePage.extensionListSeparator": ",",
-	"welcomePage.installKeymap": "{0} キーマップをインストールする",
-	"welcomePage.installExtensionPack": "{0} に追加のサポートをインストールする",
-	"welcomePage.installedKeymap": "{0} キーマップは既にインストールされています",
-	"welcomePage.installedExtensionPack": "{0} のサポートは既にインストールされています",
-	"ok": "OK",
-	"details": "詳細",
-	"welcomePage.buttonBackground": "ウェルカム ページのボタンの背景色。",
-	"welcomePage.buttonHoverBackground": "ウェルカム ページのボタンのホバー背景色。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/welcome/walkThrough/electron-browser/editor/editorWalkThrough.i18n.json b/i18n/jpn/src/vs/workbench/parts/welcome/walkThrough/electron-browser/editor/editorWalkThrough.i18n.json
deleted file mode 100644
index 579dff00fa8..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/welcome/walkThrough/electron-browser/editor/editorWalkThrough.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"editorWalkThrough.title": "対話型プレイグラウンド",
-	"editorWalkThrough": "対話型プレイグラウンド"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThrough.contribution.i18n.json b/i18n/jpn/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThrough.contribution.i18n.json
deleted file mode 100644
index d55f422b356..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThrough.contribution.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"walkThrough.editor.label": "対話型プレイグラウンド",
-	"help": "ヘルプ"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughActions.i18n.json b/i18n/jpn/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughActions.i18n.json
deleted file mode 100644
index 3c8fc4a4cdb..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughActions.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"editorWalkThrough.arrowUp": "上にスクロール (行)",
-	"editorWalkThrough.arrowDown": "下にスクロール (行)",
-	"editorWalkThrough.pageUp": "スクロール アップ (ページ)",
-	"editorWalkThrough.pageDown": "スクロール ダウン (ページ)"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughPart.i18n.json b/i18n/jpn/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughPart.i18n.json
deleted file mode 100644
index d984a6a9eb3..00000000000
--- a/i18n/jpn/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughPart.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"walkThrough.unboundCommand": "バインドなし",
-	"walkThrough.gitNotFound": "システムに Git がインストールされていない可能性があります。",
-	"walkThrough.embeddedEditorBackground": "対話型プレイグラウンドの埋め込みエディターの背景色。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/services/actions/electron-browser/menusExtensionPoint.i18n.json b/i18n/jpn/src/vs/workbench/services/actions/electron-browser/menusExtensionPoint.i18n.json
deleted file mode 100644
index 58e22eb0b52..00000000000
--- a/i18n/jpn/src/vs/workbench/services/actions/electron-browser/menusExtensionPoint.i18n.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"requirearray": "メニュー項目は配列にする必要があります",
-	"requirestring": " `{0}`  プロパティは必須で、`string` 型でなければなりません",
-	"optstring": "`{0}` プロパティは省略するか、`string` 型にする必要があります",
-	"vscode.extension.contributes.menuItem.command": "実行するコマンドの識別子。コマンドは 'commands' セクションで宣言する必要があります",
-	"vscode.extension.contributes.menuItem.alt": "実行する別のコマンドの識別子。コマンドは 'commands' セクションで宣言する必要があります",
-	"vscode.extension.contributes.menuItem.when": "この項目を表示するために満たす必要がある条件",
-	"vscode.extension.contributes.menuItem.group": "このコマンドが属するグループ",
-	"vscode.extension.contributes.menus": "メニュー項目をエディターに提供します",
-	"menus.commandPalette": "コマンド パレット",
-	"menus.touchBar": "Touch Bar (macOS のみ)",
-	"menus.editorTitle": "エディターのタイトル メニュー",
-	"menus.editorContext": "エディターのコンテキスト メニュー",
-	"menus.explorerContext": "エクスプローラーのコンテキスト メニュー",
-	"menus.editorTabContext": "エディターのタブのコンテキスト メニュー",
-	"menus.debugCallstackContext": "デバッグの呼び出し履歴のコンテキスト メニュー",
-	"menus.scmTitle": "ソース管理のタイトル メニュー",
-	"menus.scmSourceControl": "ソース管理メニュー",
-	"menus.resourceGroupContext": "ソース管理リソース グループのコンテキスト メニュー",
-	"menus.resourceStateContext": "ソース管理リソース状態のコンテキスト メニュー",
-	"view.viewTitle": "提供されたビューのタイトル メニュー",
-	"view.itemContext": "提供されたビュー項目のコンテキスト メニュー",
-	"nonempty": "空でない値が必要です。",
-	"opticon": "`icon` プロパティは省略できます。指定する場合には、文字列または `{dark, light}` などのリテラルにする必要があります",
-	"requireStringOrObject": "`{0}` プロパティは必須で、`string` または `object` の型でなければなりません",
-	"requirestrings": "プロパティの `{0}` と `{1}` は必須で、`string` 型でなければなりません",
-	"vscode.extension.contributes.commandType.command": "実行するコマンドの識別子",
-	"vscode.extension.contributes.commandType.title": "コマンドが UI に表示される際のタイトル",
-	"vscode.extension.contributes.commandType.category": "(省略可能) コマンド別のカテゴリ文字列が UI でグループ分けされます",
-	"vscode.extension.contributes.commandType.icon": "(省略可能) UI でコマンドを表すためのアイコン。ファイル パス、またはテーマ設定可能な構成のいずれかです",
-	"vscode.extension.contributes.commandType.icon.light": "ライト テーマが使用される場合のアイコン パス",
-	"vscode.extension.contributes.commandType.icon.dark": "ダーク テーマが使用される場合のアイコン パス",
-	"vscode.extension.contributes.commands": "コマンド パレットにコマンドを提供します。",
-	"dup": "コマンド `{0}` が `commands` セクションで複数回出現します。",
-	"menuId.invalid": "`{0}` は有効なメニュー識別子ではありません",
-	"missing.command": "メニュー項目が、'commands' セクションで定義されていないコマンド `{0}` を参照しています。",
-	"missing.altCommand": "メニュー項目が、'commands' セクションで定義されていない alt コマンド `{0}` を参照しています。",
-	"dupe.command": "メニュー項目において、既定と alt コマンドが同じコマンドを参照しています"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/services/bulkEdit/electron-browser/bulkEditService.i18n.json b/i18n/jpn/src/vs/workbench/services/bulkEdit/electron-browser/bulkEditService.i18n.json
deleted file mode 100644
index 89893c1411c..00000000000
--- a/i18n/jpn/src/vs/workbench/services/bulkEdit/electron-browser/bulkEditService.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"summary.0": "編集は行われませんでした",
-	"summary.nm": "{1} 個のファイルで {0} 件のテキスト編集を実行",
-	"summary.n0": "1 つのファイルで {0} 個のテキストを編集",
-	"conflict": "この間に次のファイルが変更されました: {0}"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/services/configuration/common/configurationExtensionPoint.i18n.json b/i18n/jpn/src/vs/workbench/services/configuration/common/configurationExtensionPoint.i18n.json
deleted file mode 100644
index 7ecd0c68d13..00000000000
--- a/i18n/jpn/src/vs/workbench/services/configuration/common/configurationExtensionPoint.i18n.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.contributes.configuration.title": "設定の概要です。このラベルは、設定ファイルでコメントの区切り文字として使用します。",
-	"vscode.extension.contributes.configuration.properties": "構成のプロパティの説明です。",
-	"scope.application.description": "ユーザー設定でのみ構成できるアプリケーション固有の構成。",
-	"scope.window.description": "ウィンドウ固有の構成。ユーザーまたはワークスペースの設定で構成できます。",
-	"scope.resource.description": "リソース固有の構成。ユーザー、ワークスペース、またはフォルダーの設定で構成できます。",
-	"scope.description": "構成が適用される範囲。 使用可能なスコープは `window` と ` resource` です。",
-	"vscode.extension.contributes.defaultConfiguration": "言語ごとに既定のエディター構成の設定を提供します。",
-	"vscode.extension.contributes.configuration": "構成の設定を提供します。",
-	"invalid.title": "'configuration.title' は、文字列である必要があります",
-	"invalid.properties": "'configuration.properties' は、オブジェクトである必要があります",
-	"invalid.property": "'configuration.property' は、オブジェクトである必要があります",
-	"invalid.allOf": "'configuration.allOf' は非推奨で使用できなくなります。代わりに 'configuration' コントリビューション ポイントに複数の構成セクションを配列として渡します。",
-	"workspaceConfig.folders.description": "ワークスペースで読み込まれるフォルダーのリスト。",
-	"workspaceConfig.path.description": "ファイルパス。例: `/root/folderA` または `./folderA` のようなワークスペース ファイルの場所に対して解決される相対パス。",
-	"workspaceConfig.name.description": "フォルダーにつけるオプションの名前。",
-	"workspaceConfig.uri.description": "フォルダーの URI",
-	"workspaceConfig.settings.description": "ワークスペースの設定",
-	"workspaceConfig.launch.description": "ワークスペースの起動構成",
-	"workspaceConfig.extensions.description": "ワークスペースの拡張機能",
-	"unknownWorkspaceProperty": "不明なワークスペース構成のプロパティ"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/services/configuration/node/configuration.i18n.json b/i18n/jpn/src/vs/workbench/services/configuration/node/configuration.i18n.json
deleted file mode 100644
index 60bf4e08cf5..00000000000
--- a/i18n/jpn/src/vs/workbench/services/configuration/node/configuration.i18n.json
+++ /dev/null
@@ -1,24 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"vscode.extension.contributes.configuration.title": "設定の概要です。このラベルは、設定ファイルでコメントの区切り文字として使用します。",
-	"vscode.extension.contributes.configuration.properties": "構成のプロパティの説明です。",
-	"scope.window.description": "ウィンドウ固有の構成。ユーザーまたはワークスペースの設定で構成できます。",
-	"scope.resource.description": "リソース固有の構成。ユーザー、ワークスペース、またはフォルダーの設定で構成できます。",
-	"scope.description": "構成が適用される範囲。 使用可能なスコープは `window` と ` resource` です。",
-	"vscode.extension.contributes.configuration": "構成の設定を提供します。",
-	"invalid.title": "'configuration.title' は、文字列である必要があります",
-	"vscode.extension.contributes.defaultConfiguration": "言語ごとに既定のエディター構成の設定を提供します。",
-	"invalid.properties": "'configuration.properties' は、オブジェクトである必要があります",
-	"invalid.allOf": "'configuration.allOf' は非推奨で使用できなくなります。代わりに 'configuration' コントリビューション ポイントに複数の構成セクションを配列として渡します。",
-	"workspaceConfig.folders.description": "ワークスペースで読み込まれるフォルダーのリスト。",
-	"workspaceConfig.path.description": "ファイルパス。例: `/root/folderA` または `./folderA` のようなワークスペース ファイルの場所に対して解決される相対パス。",
-	"workspaceConfig.name.description": "フォルダーにつけるオプションの名前。",
-	"workspaceConfig.uri.description": "フォルダーの URI",
-	"workspaceConfig.settings.description": "ワークスペースの設定",
-	"workspaceConfig.extensions.description": "ワークスペースの拡張機能",
-	"unknownWorkspaceProperty": "不明なワークスペース構成プロパティ"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json b/i18n/jpn/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
deleted file mode 100644
index 627b2d01b48..00000000000
--- a/i18n/jpn/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openTasksConfiguration": "タスク構成を開く",
-	"openLaunchConfiguration": "起動構成を開く",
-	"open": "設定を開く",
-	"saveAndRetry": "保存して再試行",
-	"errorUnknownKey": "{1} は登録済みの構成ではないため、{0} に書き込むことができません。",
-	"errorInvalidWorkspaceConfigurationApplication": "{0} をワークスペース設定に書き込めません。この設定はユーザー設定にのみ書き込めます。",
-	"errorInvalidFolderConfiguration": "{0} はフォルダーのリソース スコープをサポートしていないため、フォルダー設定に書き込むことができません。",
-	"errorInvalidUserTarget": "{0} はグローバル スコープをサポートしていないため、ユーザー設定に書き込むことができません。",
-	"errorInvalidWorkspaceTarget": "{0} はマルチ フォルダー ワークスペースでワークスペース スコープをサポートしていないため、ワークスペース設定を書き込むことができません。",
-	"errorInvalidFolderTarget": "リソースが指定されていないため、フォルダー設定に書き込むことができません。",
-	"errorNoWorkspaceOpened": "開いているワークスペースがないため、{0} に書き込むことができません。最初にワークスペースを開いてから、もう一度お試しください。",
-	"errorInvalidTaskConfiguration": "タスク構成ファイルに書き込めません。ファイルを開いて、ファイル内のエラー/警告を修正してからもう一度お試しください。",
-	"errorInvalidLaunchConfiguration": "起動構成ファイルに書き込めません。ファイルを開いて、ファイル内のエラー/警告を修正してからもう一度お試しください。",
-	"errorInvalidConfiguration": "ユーザー設定に書き込めません。ユーザー設定を開いて、ファイル内のエラー/警告を修正してからもう一度お試しください。",
-	"errorInvalidConfigurationWorkspace": "ワークスペース設定に書き込めません。ワークスペース設定を開いて、ファイル内のエラー/警告を修正してからもう一度お試しください。",
-	"errorInvalidConfigurationFolder": "フォルダー設定に書き込めません。'{0}' フォルダー設定を開いて、ファイル内のエラー/警告を修正してからもう一度お試しください。",
-	"errorTasksConfigurationFileDirty": "ファイルが変更されているため、タスク構成ファイルに書き込めません。ファイルを保存してから、もう一度お試しください。",
-	"errorLaunchConfigurationFileDirty": "ファイルが変更されているため、起動構成ファイルに書き込めません。ファイルを保存してから、もう一度お試しください。",
-	"errorConfigurationFileDirty": "ファイルが変更されているため、ユーザー設定を書き込めません。ユーザー設定ファイルを保存してから、もう一度お試しください。",
-	"errorConfigurationFileDirtyWorkspace": "ファイルが変更されているため、ワークスペース設定を書き込めません。ワークスペース設定ファイルを保存してから、もう一度お試しください。",
-	"errorConfigurationFileDirtyFolder": "ファイルが変更されているため、フォルダー設定を書き込めません。'{0}' フォルダー設定ファイルを保存してから、もう一度お試しください。",
-	"userTarget": "ユーザー設定",
-	"workspaceTarget": "ワークスペースの設定",
-	"folderTarget": "フォルダーの設定"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/services/configuration/node/configurationService.i18n.json b/i18n/jpn/src/vs/workbench/services/configuration/node/configurationService.i18n.json
deleted file mode 100644
index 8283d684b01..00000000000
--- a/i18n/jpn/src/vs/workbench/services/configuration/node/configurationService.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"unsupportedApplicationSetting": "この設定はユーザー設定でのみ適用できます",
-	"unsupportedWindowSetting": "この設定は現在適用できません。このフォルダーを直接開いたときに適用されます。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/services/configuration/node/jsonEditingService.i18n.json b/i18n/jpn/src/vs/workbench/services/configuration/node/jsonEditingService.i18n.json
deleted file mode 100644
index cc023cb8a8a..00000000000
--- a/i18n/jpn/src/vs/workbench/services/configuration/node/jsonEditingService.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"errorInvalidFile": "ファイルに書き込めません。ファイルを開いて、ファイル内のエラー/警告を修正してからもう一度お試しください。",
-	"errorFileDirty": "ファイルがダーティ状態でありファイルに書き込めません。ファイルを保存してからもう一度お試しください。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json b/i18n/jpn/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
deleted file mode 100644
index b7ae27bc9db..00000000000
--- a/i18n/jpn/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"stringsOnlySupported": "コマンド {0} は文字列を返しませんでした。変数の置換に使用されるコマンドの戻り値は、文字列のみがサポートされます。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/services/configurationResolver/node/variableResolver.i18n.json b/i18n/jpn/src/vs/workbench/services/configurationResolver/node/variableResolver.i18n.json
deleted file mode 100644
index bd28d12355f..00000000000
--- a/i18n/jpn/src/vs/workbench/services/configurationResolver/node/variableResolver.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"missingEnvVarName": "環境変数名が指定されていないため、'{0}' を解決できません。",
-	"configNotFound": "設定 '{1}' が見つからないため、'{0}' を解決できません。",
-	"configNoString": "'{1}' は構造化された値であるため、'{0}' を解決できません。",
-	"missingConfigName": "設定名が指定されていないため、'{0}' を解決できません。",
-	"noValueForCommand": "コマンドに値がないため '{0}' を解決できません。",
-	"canNotFindFolder": "'{0}' を解決できません。フォルダー '{1}' がありません。",
-	"canNotResolveWorkspaceFolderMultiRoot": "'{0}' はマルチ フォルダー ワークスペースで解決できません。 ':' とフォルダー名を使用して、この変数のスコープを指定してください。",
-	"canNotResolveWorkspaceFolder": "'{0}' を解決できません。フォルダーを開いてください。",
-	"canNotResolveFile": "'{0}' を解決できません。エディターを開いてください。",
-	"canNotResolveLineNumber": "'{0}' を解決できません。アクティブなエディターに選択済みの行があることを確認してください。",
-	"canNotResolveSelectedText": "'{0}' を解決できません。アクティブなエディターに選択済みのテキストがあることを確認してください。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/services/crashReporter/common/crashReporterService.i18n.json b/i18n/jpn/src/vs/workbench/services/crashReporter/common/crashReporterService.i18n.json
deleted file mode 100644
index 7df1ec40941..00000000000
--- a/i18n/jpn/src/vs/workbench/services/crashReporter/common/crashReporterService.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"telemetryConfigurationTitle": "テレメトリ",
-	"telemetry.enableCrashReporting": "クラッシュ レポートを Microsoft に送信するように設定します。\nこのオプションを有効にするには、再起動が必要です。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/services/crashReporter/electron-browser/crashReporterService.i18n.json b/i18n/jpn/src/vs/workbench/services/crashReporter/electron-browser/crashReporterService.i18n.json
deleted file mode 100644
index 01e3ddeb1ea..00000000000
--- a/i18n/jpn/src/vs/workbench/services/crashReporter/electron-browser/crashReporterService.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"telemetryConfigurationTitle": "テレメトリ",
-	"telemetry.enableCrashReporting": "クラッシュ レポートを Microsoft に送信するように設定します。\nこのオプションを有効にするには、再起動が必要です。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/services/decorations/browser/decorationsService.i18n.json b/i18n/jpn/src/vs/workbench/services/decorations/browser/decorationsService.i18n.json
deleted file mode 100644
index 806121941c5..00000000000
--- a/i18n/jpn/src/vs/workbench/services/decorations/browser/decorationsService.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"bubbleTitle": "強調された項目を含む"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json b/i18n/jpn/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json
deleted file mode 100644
index d51266c5310..00000000000
--- a/i18n/jpn/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"yesButton": "はい(&&Y)",
-	"cancelButton": "キャンセル"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/services/dialogs/electron-browser/dialogs.i18n.json b/i18n/jpn/src/vs/workbench/services/dialogs/electron-browser/dialogs.i18n.json
deleted file mode 100644
index 8a26763d0e7..00000000000
--- a/i18n/jpn/src/vs/workbench/services/dialogs/electron-browser/dialogs.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"yesButton": "はい(&&Y)",
-	"cancelButton": "キャンセル",
-	"moreFile": "...1 つの追加ファイルが表示されていません",
-	"moreFiles": "...{0} 個の追加ファイルが表示されていません"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/services/editor/browser/editorService.i18n.json b/i18n/jpn/src/vs/workbench/services/editor/browser/editorService.i18n.json
deleted file mode 100644
index 50e968f8ee3..00000000000
--- a/i18n/jpn/src/vs/workbench/services/editor/browser/editorService.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"compareLabels": "{0} ↔ {1}"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/services/editor/common/editorService.i18n.json b/i18n/jpn/src/vs/workbench/services/editor/common/editorService.i18n.json
deleted file mode 100644
index ca1ee0161c1..00000000000
--- a/i18n/jpn/src/vs/workbench/services/editor/common/editorService.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"compareLabels": "{0} ↔ {1}"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/services/extensions/common/extensionsRegistry.i18n.json b/i18n/jpn/src/vs/workbench/services/extensions/common/extensionsRegistry.i18n.json
deleted file mode 100644
index f04ca84fa1e..00000000000
--- a/i18n/jpn/src/vs/workbench/services/extensions/common/extensionsRegistry.i18n.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.engines": "エンジンの互換性。",
-	"vscode.extension.engines.vscode": "VS Code 拡張機能の場合、拡張機能と互換性のある VS Code バージョンを指定します。* を指定することはできません。たとえば、^0.10.5 は最小の VS Code バージョン 0.10.5 との互換性を示します。",
-	"vscode.extension.publisher": "VS Code 拡張機能の公開元。",
-	"vscode.extension.displayName": "VS Code ギャラリーで使用される拡張機能の表示名。",
-	"vscode.extension.categories": "VS Code ギャラリーで拡張機能の分類に使用されるカテゴリ。",
-	"vscode.extension.category.languages.deprecated": "代わりに 'Programming Languages' を使用してください",
-	"vscode.extension.galleryBanner": "VS Code マーケットプレースで使用されるバナー。",
-	"vscode.extension.galleryBanner.color": "VS Code マーケットプレース ページ ヘッダー上のバナーの色。",
-	"vscode.extension.galleryBanner.theme": "バナーで使用されるフォントの配色テーマ。",
-	"vscode.extension.contributes": "このパッケージで表される VS Code 拡張機能のすべてのコントリビューション。",
-	"vscode.extension.preview": "Marketplace で Preview としてフラグが付けられるように拡張機能を設定します。",
-	"vscode.extension.activationEvents": "VS Code 拡張機能のアクティブ化イベント。",
-	"vscode.extension.activationEvents.onLanguage": "指定された言語を解決するファイルが開かれるたびにアクティブ化イベントが発行されます。",
-	"vscode.extension.activationEvents.onCommand": "指定したコマンドが呼び出されるたびにアクティブ化イベントが発行されます。",
-	"vscode.extension.activationEvents.onDebug": "デバッグの開始またはデバッグ構成がセットアップされるたびにアクティブ化イベントが発行されます。",
-	"vscode.extension.activationEvents.onDebugInitialConfigurations": "\"launch.json\" を作成する必要があるたびに (または、すべての provideDebugConfiguration メソッドを呼び出す必要があるたびに) アクティブ化イベントを発行します。",
-	"vscode.extension.activationEvents.onDebugResolve": "特定のタイプのデバッグ セッションが起動されるたびに（または、対応する resolveDebugConfiguration メソッドを呼び出す必要があるたびに）、アクティブ化イベントを発行します。",
-	"vscode.extension.activationEvents.workspaceContains": "指定した glob パターンに一致するファイルを少なくとも 1 つ以上含むフォルダーを開くたびにアクティブ化イベントが発行されます。",
-	"vscode.extension.activationEvents.onView": "指定したビューを展開するたびにアクティブ化イベントが発行されます。",
-	"vscode.extension.activationEvents.onUri": "この拡張機能用のシステム全体の URI が開かれるたびにアクティブ化イベントが発行されます。",
-	"vscode.extension.activationEvents.star": "VS Code 起動時にアクティブ化イベントを発行します。優れたエンドユーザー エクスペリエンスを確保するために、他のアクティブ化イベントの組み合わせでは望む動作にならないときのみ使用してください。",
-	"vscode.extension.badges": "Marketplace の拡張機能ページのサイドバーに表示されるバッジの配列。",
-	"vscode.extension.badges.url": "バッジのイメージ URL。",
-	"vscode.extension.badges.href": "バッジのリンク。",
-	"vscode.extension.badges.description": "バッジの説明。",
-	"vscode.extension.markdown": "Marketplace で使用される Markdown レンダリング エンジンを制御します。github (既定) か standard のいずれかを指定できます。",
-	"vscode.extension.qna": "Marketplace の Q&A リンクを制御します。既定の Marketplace Q & A サイトを有効にするには marketplace を設定します。カスタム Q & A サイトの URL を提供するには文字列を設定します。Q & A を完全に無効にするには false を設定します。",
-	"vscode.extension.extensionDependencies": "他の拡張機能に対する依存関係。拡張機能の識別子は常に ${publisher}.${name} です。例: vscode.csharp。",
-	"vscode.extension.scripts.prepublish": "パッケージが VS Code 拡張機能として公開される前に実行されるスクリプト。",
-	"vscode.extension.scripts.uninstall": "VS コード拡張機能のフックをアンインストールします。 VS コードから拡張機能を完全にアンインストールした時に実行されるスクリプトです。スクリプトは、拡張機能をアンインストールした後に VS コードを再起動 (シャット ダウンしてから起動) したときに実行されます。Node スクリプトのみがサポートされます。",
-	"vscode.extension.icon": "128x128 ピクセルのアイコンへのパス。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/services/extensions/electron-browser/extensionHost.i18n.json b/i18n/jpn/src/vs/workbench/services/extensions/electron-browser/extensionHost.i18n.json
deleted file mode 100644
index 8a4a9711171..00000000000
--- a/i18n/jpn/src/vs/workbench/services/extensions/electron-browser/extensionHost.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"extensionHostProcess.startupFailDebug": "拡張機能ホストが 10 秒以内に開始されませんでした。先頭行で停止している可能性があり、続行するにはデバッガーが必要です。",
-	"extensionHostProcess.startupFail": "拡張機能ホストが 10 秒以内に開始されませんでした。問題が発生している可能性があります。",
-	"reloadWindow": "ウィンドウの再読み込み",
-	"extensionHostProcess.error": "拡張機能ホストからのエラー: {0}"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/services/extensions/electron-browser/extensionHostProfiler.i18n.json b/i18n/jpn/src/vs/workbench/services/extensions/electron-browser/extensionHostProfiler.i18n.json
deleted file mode 100644
index b923dbc97df..00000000000
--- a/i18n/jpn/src/vs/workbench/services/extensions/electron-browser/extensionHostProfiler.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"message": "$(zap) 拡張機能ホストのプロファイリング..."
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/services/extensions/electron-browser/extensionPoints.i18n.json b/i18n/jpn/src/vs/workbench/services/extensions/electron-browser/extensionPoints.i18n.json
deleted file mode 100644
index 764aaf678ad..00000000000
--- a/i18n/jpn/src/vs/workbench/services/extensions/electron-browser/extensionPoints.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"jsonParseFail": "{0} を解析できません: {1}。",
-	"fileReadFail": "ファイル {0} を読み取れません: {1}。",
-	"jsonsParseReportErrors": "{0} を解析できません: {1}。",
-	"missingNLSKey": "キー {0} のメッセージが見つかりませんでした。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json b/i18n/jpn/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json
deleted file mode 100644
index ebdf2bc38d9..00000000000
--- a/i18n/jpn/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"extensionsDisabled": "すべての拡張機能が無効化されています。",
-	"extensionHostProcess.crash": "拡張機能のホストが予期せずに終了しました。",
-	"extensionHostProcess.unresponsiveCrash": "拡張機能のホストが応答しないため終了しました。",
-	"devTools": "開発者ツールを開く",
-	"restart": "拡張機能のホストを再起動",
-	"overwritingExtension": "拡張機能 {0} を {1} で上書きしています。",
-	"extensionUnderDevelopment": "開発の拡張機能を {0} に読み込んでいます",
-	"extensionCache.invalid": "拡張機能がディスク上で変更されています。ウィンドウを再読み込みしてください。",
-	"reloadWindow": "ウィンドウの再読み込み"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/services/extensions/node/extensionPoints.i18n.json b/i18n/jpn/src/vs/workbench/services/extensions/node/extensionPoints.i18n.json
deleted file mode 100644
index 8f8382d165a..00000000000
--- a/i18n/jpn/src/vs/workbench/services/extensions/node/extensionPoints.i18n.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"jsonParseFail": "{0} を解析できません: {1}。",
-	"fileReadFail": "ファイル {0} を読み取れません: {1}。",
-	"jsonsParseReportErrors": "{0} を解析できません: {1}。",
-	"missingNLSKey": "キー {0} のメッセージが見つかりませんでした。",
-	"notSemver": "拡張機能のバージョンが semver と互換性がありません。",
-	"extensionDescription.empty": "空の拡張機能の説明を入手しました",
-	"extensionDescription.publisher": " `{0}`  プロパティは必須で、`string` 型でなければなりません",
-	"extensionDescription.name": " `{0}`  プロパティは必須で、`string` 型でなければなりません",
-	"extensionDescription.version": " `{0}`  プロパティは必須で、`string` 型でなければなりません",
-	"extensionDescription.engines": "`{0}` プロパティは必須で、`string` 型でなければなりません",
-	"extensionDescription.engines.vscode": " `{0}`  プロパティは必須で、`string` 型でなければなりません",
-	"extensionDescription.extensionDependencies": "`{0}` プロパティは省略するか、`string[]` 型にする必要があります",
-	"extensionDescription.activationEvents1": "`{0}` プロパティは省略するか、`string[]` 型にする必要があります",
-	"extensionDescription.activationEvents2": "プロパティ `{0}` と `{1}` は、両方とも指定するか両方とも省略しなければなりません",
-	"extensionDescription.main1": "`{0}` プロパティは省略するか、`string` 型にする必要があります",
-	"extensionDescription.main2": "拡張機能のフォルダー ({1}) の中に `main` ({0}) が含まれることが予期されます。これにより拡張機能を移植できなくなる可能性があります。",
-	"extensionDescription.main3": "プロパティ `{0}` と `{1}` は、両方とも指定するか両方とも省略しなければなりません"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/services/files/electron-browser/fileService.i18n.json b/i18n/jpn/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
deleted file mode 100644
index ae5be60aaaf..00000000000
--- a/i18n/jpn/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"netVersionError": "Microsoft .NET Framework 4.5 が必要です。リンクに移動してインストールしてください。",
-	"installNet": ".NET Framework 4.5 をダウンロードします",
-	"neverShowAgain": "今後は表示しない",
-	"enospcError": "{0} はこの大規模なワークスペース内のファイル変更を監視できません。この問題を解決するには、リンクの手順に従ってください。",
-	"learnMore": "説明書",
-	"fileInvalidPath": "ファイルのリソース ({0}) が無効です",
-	"fileIsDirectoryError": "ファイルはディレクトリです",
-	"fileNotModifiedError": "ファイルは次の時点以後に変更されていません:",
-	"fileTooLargeForHeapError": "このサイズのファイルを開くには、VS Code を再起動してより多くのメモリ使用を許可する必要があります",
-	"fileTooLargeError": "開くファイルが大きすぎます",
-	"fileNotFoundError": "ファイルが見つかりません ({0})",
-	"fileBinaryError": "ファイルはバイナリのようなので、テキストとして開くことができません",
-	"filePermission": "ファイルへの書き込み許可が拒否されました ({0})",
-	"fileExists": "生成しようとしているファイル ({0}) は既に存在しています",
-	"fileModifiedError": "ファイルは次の時点以後に更新されました:",
-	"fileReadOnlyError": "ファイルは読み取り専用です",
-	"fileMoveConflict": "移動/コピーできません。移動/コピー先にファイルが既に存在します。",
-	"unableToMoveCopyError": "移動/コピーできません。ファイルが含まれるフォルダーが置き換わることになります。",
-	"binFailed": "'{0}' をごみ箱に移動できませんでした",
-	"trashFailed": "'{0}' をごみ箱に移動できませんでした"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json b/i18n/jpn/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
deleted file mode 100644
index da438326649..00000000000
--- a/i18n/jpn/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"invalidPath": "リソース '{0}' のパスは絶対パスにする必要があります",
-	"fileNotFoundError": "ファイルが見つかりません ({0})",
-	"fileIsDirectoryError": "ファイルはディレクトリです",
-	"fileNotModifiedError": "ファイルは次の時点以後に変更されていません:",
-	"fileBinaryError": "ファイルはバイナリのようなので、テキストとして開くことができません",
-	"err.create": "ファイル {0} を作成できませんでした",
-	"fileMoveConflict": "移動/コピーできません。移動/コピー先にファイルが既に存在します。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/services/files/node/fileService.i18n.json b/i18n/jpn/src/vs/workbench/services/files/node/fileService.i18n.json
deleted file mode 100644
index 15dc46337bb..00000000000
--- a/i18n/jpn/src/vs/workbench/services/files/node/fileService.i18n.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"fileInvalidPath": "ファイルのリソース ({0}) が無効です",
-	"fileIsDirectoryError": "ファイルはディレクトリです",
-	"fileNotModifiedError": "ファイルは次の時点以後に変更されていません:",
-	"fileTooLargeForHeapError": "ファイル サイズが既定のメモリ制限を超えています。より大きい制限値で再起動してください。現在の設定では {0}MB で再起動するよう構成されています",
-	"fileTooLargeError": "開くファイルが大きすぎます",
-	"fileNotFoundError": "ファイルが見つかりません ({0})",
-	"fileBinaryError": "ファイルはバイナリのようなので、テキストとして開くことができません",
-	"filePermission": "ファイルへの書き込み許可が拒否されました ({0})",
-	"fileExists": "生成しようとしているファイル ({0}) は既に存在しています",
-	"fileMoveConflict": "移動/コピーできません。移動/コピー先にファイルが既に存在します。",
-	"unableToMoveCopyError": "移動/コピーできません。ファイルが含まれるフォルダーが置き換わることになります。",
-	"foldersCopyError": "フォルダーをワークスペース内にコピーできません。個々のファイルを選択してコピーしてください。",
-	"fileModifiedError": "ファイルは次の時点以後に更新されました:",
-	"fileReadOnlyError": "ファイルは読み取り専用です"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/services/jsonschemas/common/jsonValidationExtensionPoint.i18n.json b/i18n/jpn/src/vs/workbench/services/jsonschemas/common/jsonValidationExtensionPoint.i18n.json
deleted file mode 100644
index 3f9d37eadbc..00000000000
--- a/i18n/jpn/src/vs/workbench/services/jsonschemas/common/jsonValidationExtensionPoint.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"contributes.jsonValidation": "JSON スキーマ構成を提供します。",
-	"contributes.jsonValidation.fileMatch": "一致するファイル パターン、たとえば \"package.json\" または \"*.launch\" です。",
-	"contributes.jsonValidation.url": "スキーマ URL ('http:', 'https:') または拡張機能フォルダーへの相対パス ('./') です。",
-	"invalid.jsonValidation": "'configuration.jsonValidation' は配列でなければなりません",
-	"invalid.fileMatch": "'configuration.jsonValidation.fileMatch' が定義されていなければなりません",
-	"invalid.url": "'configuration.jsonValidation.url' は、URL または相対パスでなければなりません",
-	"invalid.url.fileschema": "'configuration.jsonValidation.url' は正しくない相対 URL です: {0}",
-	"invalid.url.schema": "'configuration.jsonValidation.url' は、'http:'、'https:'、または拡張機能にあるスキーマを参照する './' で始まる必要があります"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/services/keybinding/common/keybindingEditing.i18n.json b/i18n/jpn/src/vs/workbench/services/keybinding/common/keybindingEditing.i18n.json
deleted file mode 100644
index 04cac94ef4e..00000000000
--- a/i18n/jpn/src/vs/workbench/services/keybinding/common/keybindingEditing.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"errorKeybindingsFileDirty": "キーバインド構成ファイルが変更されているため書き込めません。まずファイルを保存してからもう一度お試しください。",
-	"parseErrors": "キー バインド構成ファイルに書き込めません。ファイルを開いて、ファイル内のエラー/警告を修正してからもう一度お試しください。",
-	"errorInvalidConfiguration": "キー バインド構成ファイルを書き込めません。配列型ではないオブジェクトが存在します。クリーン アップするファイルを開いてからもう一度お試しください。",
-	"emptyKeybindingsHeader": "既定値を上書きするには、このファイル内にキー バインドを挿入します"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/services/keybinding/electron-browser/keybindingService.i18n.json b/i18n/jpn/src/vs/workbench/services/keybinding/electron-browser/keybindingService.i18n.json
deleted file mode 100644
index 3da56ec25d9..00000000000
--- a/i18n/jpn/src/vs/workbench/services/keybinding/electron-browser/keybindingService.i18n.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"nonempty": "空以外の値が必要です。",
-	"requirestring": "`{0}` プロパティは必須で、`string` 型でなければなりません",
-	"optstring": "`{0}` プロパティは省略するか、`string` 型にする必要があります",
-	"vscode.extension.contributes.keybindings.command": "キー バインドのトリガー時に実行するコマンドの識別子。",
-	"vscode.extension.contributes.keybindings.key": "キーまたはキー シーケンス (キーは + で区切り、シーケンスはスペースで区切ります。例: Ctrl+O、Ctrl+L L)。",
-	"vscode.extension.contributes.keybindings.mac": "Mac 固有のキーまたはキー シーケンス。",
-	"vscode.extension.contributes.keybindings.linux": "Linux 固有のキーまたはキー シーケンス。",
-	"vscode.extension.contributes.keybindings.win": "Windows 固有のキーまたはキー シーケンス。",
-	"vscode.extension.contributes.keybindings.when": "キーがアクティブになるときの条件。",
-	"vscode.extension.contributes.keybindings": "キー バインドを提供します。",
-	"invalid.keybindings": "正しくない `contributes.{0}`: {1}",
-	"unboundCommands": "他に使用できるコマンドは次のとおりです: ",
-	"keybindings.json.title": "キー バインドの構成",
-	"keybindings.json.key": "キーまたはキー シーケンス (スペースで区切る)",
-	"keybindings.json.command": "実行するコマンドの名前",
-	"keybindings.json.when": "キーがアクティブになるときの条件。",
-	"keybindings.json.args": "実行するコマンドに渡す引数。",
-	"keyboardConfigurationTitle": "キーボード",
-	"dispatch": "`code` (推奨) または `keyCode` のいずれかを使用するキー操作のディスパッチ ロジックを制御します。",
-	"touchbar.enabled": "利用可能であれば macOS の Touch Bar ボタンを有効にします。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/services/message/browser/messageList.i18n.json b/i18n/jpn/src/vs/workbench/services/message/browser/messageList.i18n.json
deleted file mode 100644
index e5510b98700..00000000000
--- a/i18n/jpn/src/vs/workbench/services/message/browser/messageList.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"alertErrorMessage": "エラー: {0}",
-	"alertWarningMessage": "警告: {0}",
-	"alertInfoMessage": "情報: {0}",
-	"error": "エラー",
-	"warning": "警告",
-	"info": "情報",
-	"close": "閉じる"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/services/message/electron-browser/messageService.i18n.json b/i18n/jpn/src/vs/workbench/services/message/electron-browser/messageService.i18n.json
deleted file mode 100644
index d51266c5310..00000000000
--- a/i18n/jpn/src/vs/workbench/services/message/electron-browser/messageService.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"yesButton": "はい(&&Y)",
-	"cancelButton": "キャンセル"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/services/mode/common/workbenchModeService.i18n.json b/i18n/jpn/src/vs/workbench/services/mode/common/workbenchModeService.i18n.json
deleted file mode 100644
index 143aa1f268f..00000000000
--- a/i18n/jpn/src/vs/workbench/services/mode/common/workbenchModeService.i18n.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.contributes.languages": "言語の宣言を提供します。",
-	"vscode.extension.contributes.languages.id": "言語の ID。",
-	"vscode.extension.contributes.languages.aliases": "言語の名前のエイリアス。",
-	"vscode.extension.contributes.languages.extensions": "言語に関連付けられているファイルの拡張子。",
-	"vscode.extension.contributes.languages.filenames": "言語に関連付けられたファイル名。",
-	"vscode.extension.contributes.languages.filenamePatterns": "言語に関連付けられたファイル名の glob パターン。",
-	"vscode.extension.contributes.languages.mimetypes": "言語に関連付けられている MIME の種類。",
-	"vscode.extension.contributes.languages.firstLine": "言語のファイルの最初の行に一致する正規表現。",
-	"vscode.extension.contributes.languages.configuration": "言語の構成オプションを含むファイルへの相対パス。",
-	"invalid": "`contributes.{0}` が無効です。配列が必要です。",
-	"invalid.empty": "`contributes.{0}` に対する空の値",
-	"require.id": "`{0}` プロパティは必須で、`string` 型でなければなりません",
-	"opt.extensions": "`{0}` プロパティを省略するか、`string[]` 型にする必要があります",
-	"opt.filenames": "`{0}` プロパティを省略するか、`string[]` 型にする必要があります",
-	"opt.firstLine": "`{0}` プロパティを省略するか、`string` 型にする必要があります",
-	"opt.configuration": "`{0}` プロパティを省略するか、`string` 型にする必要があります",
-	"opt.aliases": "`{0}` プロパティを省略するか、`string[]` 型にする必要があります",
-	"opt.mimetypes": "`{0}` プロパティを省略するか、`string[]` 型にする必要があります"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/services/progress/browser/progressService2.i18n.json b/i18n/jpn/src/vs/workbench/services/progress/browser/progressService2.i18n.json
deleted file mode 100644
index 0814f6f9f96..00000000000
--- a/i18n/jpn/src/vs/workbench/services/progress/browser/progressService2.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"progress.subtitle": "{0} - {1}",
-	"progress.title": "{0}: {1}",
-	"cancel": "キャンセル"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/services/textMate/electron-browser/TMGrammars.i18n.json b/i18n/jpn/src/vs/workbench/services/textMate/electron-browser/TMGrammars.i18n.json
deleted file mode 100644
index e2962bb3983..00000000000
--- a/i18n/jpn/src/vs/workbench/services/textMate/electron-browser/TMGrammars.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.contributes.grammars": "TextMate トークナイザーを提供します。",
-	"vscode.extension.contributes.grammars.language": "この構文の提供先の言語識別子です。",
-	"vscode.extension.contributes.grammars.scopeName": "tmLanguage ファイルにより使用される TextMate スコープ名。",
-	"vscode.extension.contributes.grammars.path": "tmLanguage ファイルのパス。拡張機能フォルダーの相対パスであり、通常 './syntaxes/' で始まります。",
-	"vscode.extension.contributes.grammars.embeddedLanguages": "この文法に言語が埋め込まれている場合は、言語 ID に対するスコープ名のマップ。",
-	"vscode.extension.contributes.grammars.tokenTypes": "スコープ名のトークン タイプへの割当て。",
-	"vscode.extension.contributes.grammars.injectTo": "この文法が挿入される言語の範囲名の一覧。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/services/textMate/electron-browser/TMSyntax.i18n.json b/i18n/jpn/src/vs/workbench/services/textMate/electron-browser/TMSyntax.i18n.json
deleted file mode 100644
index 26bc6832aeb..00000000000
--- a/i18n/jpn/src/vs/workbench/services/textMate/electron-browser/TMSyntax.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"invalid.language": "`contributes.{0}.language` で不明な言語です。提供された値: {1}",
-	"invalid.scopeName": "`contributes.{0}.scopeName` には文字列が必要です。提供された値: {1}",
-	"invalid.path.0": "`contributes.{0}.path` に文字列が必要です。提供された値: {1}",
-	"invalid.injectTo": "`contributes.{0}.injectTo` の値が無効です。言語の範囲名の配列である必要があります。指定された値: {1}",
-	"invalid.embeddedLanguages": "`contributes.{0}.embeddedLanguages` の値が無効です。スコープ名から言語へのオブジェクト マップである必要があります。指定された値: {1}",
-	"invalid.tokenTypes": "`contributes.{0}.tokenTypes` の値が無効です。オブジェクトはスコープ名からトークン タイプへ割り当てられている必要があります。指定された値: {1}",
-	"invalid.path.1": "拡張機能のフォルダー ({2}) の中に `contributes.{0}.path` ({1}) が含まれている必要があります。これにより拡張を移植できなくなる可能性があります。",
-	"no-tm-grammar": "この言語に対して TM 文法は登録されていません。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/services/textfile/common/textFileEditorModel.i18n.json b/i18n/jpn/src/vs/workbench/services/textfile/common/textFileEditorModel.i18n.json
deleted file mode 100644
index c4116fb86b4..00000000000
--- a/i18n/jpn/src/vs/workbench/services/textfile/common/textFileEditorModel.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"saveFileFirst": "ファイルがダーティです。まず保存してから、別のエンコードで再度開いてください。",
-	"genericSaveError": "'{0}' の保存に失敗しました: {1}"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/services/textfile/common/textFileService.i18n.json b/i18n/jpn/src/vs/workbench/services/textfile/common/textFileService.i18n.json
deleted file mode 100644
index e2e05add6d7..00000000000
--- a/i18n/jpn/src/vs/workbench/services/textfile/common/textFileService.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"files.backup.failSave": "変更されたファイルをバックアップ場所に書き込めませんでした (エラー: {0})。ファイルを保存しなおして終了してください。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json b/i18n/jpn/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json
deleted file mode 100644
index 7bade8011c7..00000000000
--- a/i18n/jpn/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"saveChangesMessage": "{0} に加えた変更を保存しますか?",
-	"saveChangesMessages": "次の {0} ファイルに対する変更を保存しますか?",
-	"saveAll": "すべて保存(&&S)",
-	"save": "保存(&&S)",
-	"dontSave": "保存しない(&&N)",
-	"cancel": "キャンセル",
-	"saveChangesDetail": "保存しないと変更内容が失われます。",
-	"allFiles": "すべてのファイル",
-	"noExt": "拡張子なし"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/services/themes/common/colorExtensionPoint.i18n.json b/i18n/jpn/src/vs/workbench/services/themes/common/colorExtensionPoint.i18n.json
deleted file mode 100644
index 05d5a731920..00000000000
--- a/i18n/jpn/src/vs/workbench/services/themes/common/colorExtensionPoint.i18n.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"contributes.color": "拡張機能でテーマ設定の可能な配色を提供します",
-	"contributes.color.id": "テーマ設定可能な配色の識別子",
-	"contributes.color.id.format": "識別子は aa[.bb]* の形式にする必要があります",
-	"contributes.color.description": "テーマ設定可能な配色の説明",
-	"contributes.defaults.light": "light テーマの既定の配色。配色の値は 16 進数(#RRGGBB[AA]) 、または 既定で提供されているテーマ設定可能な配色の識別子の既定値のいずれか。",
-	"contributes.defaults.dark": "dark テーマの既定の配色。配色の値は 16 進数(#RRGGBB[AA]) 、または 既定で提供されているテーマ設定可能な配色の識別子の既定値のいずれか。",
-	"contributes.defaults.highContrast": "high contrast テーマの既定の配色。配色の値は 16 進数(#RRGGBB[AA]) 、または 既定で提供されているテーマ設定可能な配色の識別子の既定値のいずれか。",
-	"invalid.colorConfiguration": "'configuration.colors' は配列である必要があります",
-	"invalid.default.colorType": "{0} は 16 進数(#RRGGBB[AA] または  #RGB[A]) 、または 既定で提供されているテーマ設定可能な配色の識別子の既定値のいずれかでなければなりません。",
-	"invalid.id": "'configuration.colors.id' を定義してください。空にはできません。",
-	"invalid.id.format": "'configuration.colors.id' は word[.word]* の形式である必要があります",
-	"invalid.description": "'configuration.colors.description' を定義してください。空にはできません。",
-	"invalid.defaults": "'configuration.colors.defaults' は定義する必要があります。'light' か 'dark'、'highContrast' を含める必要があります。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/services/themes/common/colorThemeSchema.i18n.json b/i18n/jpn/src/vs/workbench/services/themes/common/colorThemeSchema.i18n.json
deleted file mode 100644
index c0b06c46190..00000000000
--- a/i18n/jpn/src/vs/workbench/services/themes/common/colorThemeSchema.i18n.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"schema.token.settings": "トークンの色とスタイル。",
-	"schema.token.foreground": "トークンの前景色。",
-	"schema.token.background.warning": "トークンの背景色は、現在サポートされていません。",
-	"schema.token.fontStyle": "ルールのフォント スタイル:  'italic'、'bold'、'underline' のいずれかまたはこれらの組み合わせです。空の文字列は継承された設定を解除します。",
-	"schema.fontStyle.error": "フォント スタイルは 'italic'、'bold'、'underline' もしくはこれらの組み合わせ、または空の文字列である必要があります。",
-	"schema.token.fontStyle.none": "なし (継承したスタイルを解除)",
-	"schema.properties.name": "ルールの説明。",
-	"schema.properties.scope": "このルールに一致するスコープ セレクター。",
-	"schema.tokenColors.path": "tmTheme ファイルへのパス (現在のファイルとの相対パス)。",
-	"schema.colors": "構文の強調表示をする色"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/services/themes/common/fileIconThemeSchema.i18n.json b/i18n/jpn/src/vs/workbench/services/themes/common/fileIconThemeSchema.i18n.json
deleted file mode 100644
index 86f17f94166..00000000000
--- a/i18n/jpn/src/vs/workbench/services/themes/common/fileIconThemeSchema.i18n.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"schema.folderExpanded": "折りたたんだフォルダーのフォルダー アイコン。展開したフォルダー アイコンは省略可能です。設定していない場合は、フォルダーに定義したアイコンが表示されます。",
-	"schema.folder": "折りたたんだフォルダー、または folderExpanded が設定されていない場合は展開したフォルダーのフォルダー アイコン。",
-	"schema.file": "どの拡張子、ファイル名、または言語 ID とも一致しないファイルすべてに表示される既定のファイル アイコン。",
-	"schema.folderNames": "フォルダー名をアイコンに関連付けます。オブジェクト キーはフォルダー名ですが、パスの部分は含みません。パターンやワイルドカードは使用できません。フォルダー名の一致では大文字と小文字を区別しません。",
-	"schema.folderName": "関連付けのためのアイコン定義の ID。",
-	"schema.folderNamesExpanded": "フォルダー名を展開したフォルダーのアイコンに関連付けます。オブジェクト キーはフォルダー名ですが、パスの部分は含みません。パターンやワイルドカードは使用できません。フォルダー名の一致では大文字と小文字を区別しません。",
-	"schema.folderNameExpanded": "関連付けのためのアイコン定義の ID。",
-	"schema.fileExtensions": "ファイル拡張子をアイコンに関連付けます。オブジェクト キーはファイル拡張子名です。拡張子名は、最後のドットに続くファイル名の最後の部分です (ドットは含みません)。拡張子の比較は大文字と小文字が区別しないで行われます。",
-	"schema.fileExtension": "関連付けのためのアイコン定義の ID。",
-	"schema.fileNames": "ファイル名をアイコンに関連付けます。オブジェクト キーは完全なファイル名ですが、パスの部分は含みません。ファイル名にはドットおよび可能なファイル拡張子が含まれる場合があります。パターンやワイルドカードは使用できません。ファイル名の一致では大文字と小文字を区別しません。",
-	"schema.fileName": "関連付けのためのアイコン定義の ID。",
-	"schema.languageIds": "言語をアイコンに関連付けます。オブジェクト キーは言語のコントリビューション ポイントで定義された言語 ID です。",
-	"schema.languageId": "関連付けのためのアイコン定義の ID。",
-	"schema.fonts": "アイコンの定義に使用されるフォント。",
-	"schema.id": "フォントの ID。",
-	"schema.src": "フォントの場所。",
-	"schema.font-path": "現在のアイコン テーマ ファイルへのフォントの相対パス。",
-	"schema.font-format": "フォントの書式。",
-	"schema.font-weight": "フォントの太さ。",
-	"schema.font-sstyle": "フォント スタイル。",
-	"schema.font-size": "フォントの既定サイズ。",
-	"schema.iconDefinitions": "ファイルをアイコンに関連付けるときに使用できるすべてのアイコンの説明です。",
-	"schema.iconDefinition": "アイコンの定義です。オブジェクト キーは定義の ID です。",
-	"schema.iconPath": "SVG または PNG を使用する場合: イメージへのパス。アイコン設定ファイルへの相対パスです。",
-	"schema.fontCharacter": "グリフ フォントを使用する場合: 使用するフォントの文字。",
-	"schema.fontColor": "グリフ フォントを使用する場合: 使用する色。",
-	"schema.fontSize": "フォントを使用する場合: テキスト フォントに対するフォントサイズの割合。設定されていない場合、既定値はフォント定義のサイズになります。",
-	"schema.fontId": "フォントを使用する場合: フォントの ID。設定されていない場合、既定値は最初のフォント定義になります。",
-	"schema.light": "明るい配色テーマでのファイル アイコンの任意の関連付け。",
-	"schema.highContrast": "ハイ コントラスト配色テーマでのファイル アイコンの任意の関連付け。",
-	"schema.hidesExplorerArrows": "このテーマがアクティブな時に、エクスプローラーの矢印を非表示にするかどうかを構成します。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/services/themes/electron-browser/colorThemeData.i18n.json b/i18n/jpn/src/vs/workbench/services/themes/electron-browser/colorThemeData.i18n.json
deleted file mode 100644
index 34d5bf4b4f0..00000000000
--- a/i18n/jpn/src/vs/workbench/services/themes/electron-browser/colorThemeData.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"error.cannotparsejson": "JSON テーマ ファイルの解析中に問題が発生しました: {0}",
-	"error.invalidformat.colors": "配色テーマ ファイルの解析中に問題が発生しました: {0}。'colors' プロパティは 'object' 型ではありません。",
-	"error.invalidformat.tokenColors": "配色テーマ ファイルを解析中に問題が発生しました:  {0}。'tokenColors' プロパティには配色を指定した配列、または TextMate テーマ ファイルへのパスを指定してください。",
-	"error.plist.invalidformat": "tmTheme ファイルの解析中に問題が発生しました: {0}。'settings' は配列ではありません。",
-	"error.cannotparse": "tmTheme ファイルの解析中に問題が発生しました: {0}",
-	"error.cannotload": "tmTheme ファイル {0} の読み込み中に問題が発生しました: {1}"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/services/themes/electron-browser/colorThemeStore.i18n.json b/i18n/jpn/src/vs/workbench/services/themes/electron-browser/colorThemeStore.i18n.json
deleted file mode 100644
index 2a6fb59e0eb..00000000000
--- a/i18n/jpn/src/vs/workbench/services/themes/electron-browser/colorThemeStore.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.contributes.themes": "TextMate の配色テーマを提供します。",
-	"vscode.extension.contributes.themes.id": "ユーザー設定で使用されるアイコン テーマの ID。",
-	"vscode.extension.contributes.themes.label": "UI で表示される配色テーマのラベル。",
-	"vscode.extension.contributes.themes.uiTheme": "エディターの周囲の色を定義する基本テーマ: 'vs' は明るい色のテーマで、'vs-dark' は濃い色のテーマです。'hc-black' は濃い色のハイ コントラストのテーマです。",
-	"vscode.extension.contributes.themes.path": "tmTheme ファイルのパス。拡張機能フォルダーに対する相対パスで、通常 './themes/themeFile.tmTheme' です。",
-	"reqarray": "Extension point `{0}` must be an array.",
-	"reqpath": "`contributes.{0}.path` に文字列が必要です。提供された値: {1}",
-	"invalid.path.1": "拡張機能のフォルダー ({2}) の中に `contributes.{0}.path` ({1}) が含まれている必要があります。これにより拡張を移植できなくなる可能性があります。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/services/themes/electron-browser/fileIconThemeData.i18n.json b/i18n/jpn/src/vs/workbench/services/themes/electron-browser/fileIconThemeData.i18n.json
deleted file mode 100644
index 0ea19e097c1..00000000000
--- a/i18n/jpn/src/vs/workbench/services/themes/electron-browser/fileIconThemeData.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"error.cannotparseicontheme": "アイコン ファイルの解析中に問題が発生しました: {0}"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/services/themes/electron-browser/fileIconThemeStore.i18n.json b/i18n/jpn/src/vs/workbench/services/themes/electron-browser/fileIconThemeStore.i18n.json
deleted file mode 100644
index 99e697c1cf7..00000000000
--- a/i18n/jpn/src/vs/workbench/services/themes/electron-browser/fileIconThemeStore.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.contributes.iconThemes": "Contributes file icon themes.",
-	"vscode.extension.contributes.iconThemes.id": "ユーザー設定で使用されるアイコン テーマの ID。",
-	"vscode.extension.contributes.iconThemes.label": "UI に表示されるアイコン テーマのラベル。",
-	"vscode.extension.contributes.iconThemes.path": "アイコン テーマの定義ファイルのパス。このパスは拡張フォルダーの相対パスであり、通常は './icons/awesome-icon-theme.json' です。",
-	"reqarray": "Extension point `{0}` must be an array.",
-	"reqpath": "`contributes.{0}.path` に文字列が必要です。提供された値: {1}",
-	"reqid": "`contributes.{0}.id` に文字列が必要です。提供された値: {1}",
-	"invalid.path.1": "拡張機能のフォルダー ({2}) の中に `contributes.{0}.path` ({1}) が含まれている必要があります。これにより拡張を移植できなくなる可能性があります。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json b/i18n/jpn/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
deleted file mode 100644
index 1c24e18b835..00000000000
--- a/i18n/jpn/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"error.cannotloadtheme": "Unable to load {0}: {1}",
-	"colorTheme": "ワークベンチで使用する配色テーマを指定します。",
-	"colorThemeError": "テーマが不明、またはインストールされていません。",
-	"iconTheme": "ワークベンチで使用するアイコンのテーマを指定します。'null' を指定するとファイル アイコンが表示されなくなります。",
-	"noIconThemeDesc": "ファイル アイコンがありません",
-	"iconThemeError": "ファイル アイコンのテーマが不明、またはインストールされていません。",
-	"workbenchColors": "現在選択している配色テーマで配色を上書きします。",
-	"editorColors.comments": "コメントの色とスタイルを設定します",
-	"editorColors.strings": "文字列リテラルの色とスタイルを設定します。",
-	"editorColors.keywords": "キーワードの色とスタイルを設定します。",
-	"editorColors.numbers": "数値リテラルの色とスタイルを設定します。",
-	"editorColors.types": "型定義と参照の色とスタイルを設定します。",
-	"editorColors.functions": "関数定義と参照の色とスタイルを設定します。",
-	"editorColors.variables": "変数定義と参照の色とスタイルを設定します。",
-	"editorColors.textMateRules": "textmate テーマ規則 (高度) を使っての色とスタイルを設定します。",
-	"editorColors": "現在選択している配色テーマで配色とフォント スタイルを上書きします。"
-}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json b/i18n/jpn/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json
deleted file mode 100644
index 8bba8a3b703..00000000000
--- a/i18n/jpn/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"errorInvalidTaskConfiguration": "ワークスペース構成ファイルに書き込めません。ファイルを開いて、ファイル内のエラー/警告を修正してからもう一度お試しください。",
-	"errorWorkspaceConfigurationFileDirty": "ファイルが変更されているため、ワークスペース構成ファイルに書き込めません。ファイルを保存してから、もう一度お試しください。",
-	"openWorkspaceConfigurationFile": "ワークスペースの構成を開く"
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/azure-account/out/azure-account.i18n.json b/i18n/kor/extensions/azure-account/out/azure-account.i18n.json
deleted file mode 100644
index c939d0255af..00000000000
--- a/i18n/kor/extensions/azure-account/out/azure-account.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"azure-account.copyAndOpen": "복사 및 열기",
-	"azure-account.close": "닫기",
-	"azure-account.login": "로그인",
-	"azure-account.loginFirst": "로그인하지 않았습니다. 먼저 로그인하세요.",
-	"azure-account.userCodeFailed": "사용자 코드를 가져오지 못했습니다.",
-	"azure-account.tokenFailed": "장치 토큰을 사용하여 토큰을 가져오는 중",
-	"azure-account.tokenFromRefreshTokenFailed": "새로 고침 토큰을 사용하여 토큰을 가져오는 중"
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/azure-account/out/extension.i18n.json b/i18n/kor/extensions/azure-account/out/extension.i18n.json
deleted file mode 100644
index f17dba5f8b8..00000000000
--- a/i18n/kor/extensions/azure-account/out/extension.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"azure-account.loggingIn": "Azure: 로그인하는 중...",
-	"azure-account.loggedIn": "Azure: {0}"
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/bat/package.i18n.json b/i18n/kor/extensions/bat/package.i18n.json
deleted file mode 100644
index b94caeb75e0..00000000000
--- a/i18n/kor/extensions/bat/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Windows Bat 언어 기본",
-	"description": "Windows 배치 파일에서 코드 조각, 구문 강조 표시, 괄호 일치 및  접기를 제공합니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/clojure/package.i18n.json b/i18n/kor/extensions/clojure/package.i18n.json
deleted file mode 100644
index 91c9c8703f9..00000000000
--- a/i18n/kor/extensions/clojure/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Clojure 언어 기본",
-	"description": "Clojure 파일에서 구문 강조 표시 및 괄호 일치를 제공합니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/coffeescript/package.i18n.json b/i18n/kor/extensions/coffeescript/package.i18n.json
deleted file mode 100644
index 0a1dace1983..00000000000
--- a/i18n/kor/extensions/coffeescript/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "CoffeeScript 언어 기본",
-	"description": "CoffeeScript 파일에서 코드 조각, 구문 강조 표시, 괄호 일치 및 접기를 제공합니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/configuration-editing/out/extension.i18n.json b/i18n/kor/extensions/configuration-editing/out/extension.i18n.json
deleted file mode 100644
index 905732a4c6b..00000000000
--- a/i18n/kor/extensions/configuration-editing/out/extension.i18n.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"workspaceFolder": "VS Code에서 연 폴더의 경로",
-	"workspaceFolderBasename": "VS Code에서 연 폴더의 이름(슬래시(/) 제외)",
-	"relativeFile": "${workspaceFolder}을(를) 기준으로 현재 열려 있는 파일",
-	"file": "현재 열려 있는 파일",
-	"cwd": "시작 시 작업 러너의 현재 작업 디렉터리",
-	"lineNumber": "활성 파일에서 현재 선택된 줄 번호",
-	"selectedText": "활성 파일에서 현재 선택된 텍스트",
-	"fileDirname": "현재 열려 있는 파일의 dirname",
-	"fileExtname": "현재 열려 있는 파일의 확장명",
-	"fileBasename": "현재 열려 있는 파일의 기본 이름",
-	"fileBasenameNoExtension": "현재 열려 있는 파일의 기본 이름(파일 확장명 제외)",
-	"exampleExtension": "예"
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json b/i18n/kor/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json
deleted file mode 100644
index fec46f39171..00000000000
--- a/i18n/kor/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"activeEditorShort": "파일 이름 (예: myFile.txt)",
-	"activeEditorMedium": "작업 영역 폴더 (예: myFolder/myFile.txt) 파일의 경로",
-	"activeEditorLong": "(예: /Users/Development/myProject/myFolder/myFile.txt) 파일의 전체 경로",
-	"rootName": "작업 영역 (예를 들어 myFolder 또는 myWorkspace)의 이름",
-	"rootPath": "작업 영역 (예: /Users/Development/myWorkspace)의 파일 경로",
-	"folderName": "작업 영역 폴더는 파일의 이름 (예를 들어 myFolder)에 포함 되어",
-	"folderPath": "작업 영역 폴더는 파일의 파일 경로 (예: /Users/Development/myFolder)에 포함 되어",
-	"appName": "예: VS Code",
-	"dirty": "활성 편집기가 더티인 경우 더티 표시기",
-	"separator": "값이 있는 변수로 둘러싸인 경우에만 표시되는 조건부 구분 기호 (' - ')",
-	"assocLabelFile": "확장명이 있는 파일",
-	"assocDescriptionFile": "파일 이름에서 GLOB 패턴과 일치하는 모든 파일을 지정된 ID를 사용하는 언어에 매핑합니다.",
-	"assocLabelPath": "경로가 있는 파일",
-	"assocDescriptionPath": "경로에서 절대 경로 GLOB 패턴과 일치하는 모든 파일을 지정된 ID를 사용하는 언어에 매핑합니다.",
-	"fileLabel": "확장명별 파일",
-	"fileDescription": "특정 파일 확장명이 있는 모든 파일을 일치시킵니다.",
-	"filesLabel": "여러 확장명이 있는 파일",
-	"filesDescription": "파일 확장명이 있는 모든 파일을 일치시킵니다.",
-	"derivedLabel": "이름별 형제가 있는 파일",
-	"derivedDescription": "동일한 이름의 형제가 있지만 확장명이 다른 파일을 일치시킵니다.",
-	"topFolderLabel": "이름별 폴더(최상위)",
-	"topFolderDescription": "특정 이름의 최상위 폴더를 일치시킵니다.",
-	"topFoldersLabel": "이름이 여러 개 있는 폴더(최상위)",
-	"topFoldersDescription": "여러 최상위 폴더를 일치시킵니다.",
-	"folderLabel": "이름별 폴더(모든 위치)",
-	"folderDescription": "모든 위치에 있는 특정 이름의 폴더를 일치시킵니다.",
-	"falseDescription": "패턴을 사용하지 않도록 설정합니다.",
-	"trueDescription": "패턴을 사용하도록 설정합니다.",
-	"siblingsDescription": "동일한 이름의 형제가 있지만 확장명이 다른 파일을 일치시킵니다.",
-	"languageSpecificEditorSettings": "언어별 편집기 설정",
-	"languageSpecificEditorSettingsDescription": "언어용 편집기 설정 재정의"
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/configuration-editing/package.i18n.json b/i18n/kor/extensions/configuration-editing/package.i18n.json
deleted file mode 100644
index ba5ead0bb40..00000000000
--- a/i18n/kor/extensions/configuration-editing/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "구성 편집",
-	"description": "설정, 시작 및 확장명 추천 파일과 같은 구성 파일에서 기능(고급 IntelliSense, 자동 수정)을 제공합니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/cpp/package.i18n.json b/i18n/kor/extensions/cpp/package.i18n.json
deleted file mode 100644
index b7a1a80c068..00000000000
--- a/i18n/kor/extensions/cpp/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "C/C++ 언어 기본",
-	"description": "C/C++ 파일에서 코드 조각, 구문 강조 표시, 괄호 일치 및 접기를 제공합니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/csharp/package.i18n.json b/i18n/kor/extensions/csharp/package.i18n.json
deleted file mode 100644
index 71f4bd5fc8c..00000000000
--- a/i18n/kor/extensions/csharp/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "C# 언어 기본",
-	"description": "C# 파일에서 코드 조각, 구문 강조 표시, 괄호 일치 및 접기를 제공합니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/css-language-features/client/out/cssMain.i18n.json b/i18n/kor/extensions/css-language-features/client/out/cssMain.i18n.json
deleted file mode 100644
index 18013d8de41..00000000000
--- a/i18n/kor/extensions/css-language-features/client/out/cssMain.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"cssserver.name": "CSS 언어 서버",
-	"folding.start": "영역 접기 시작",
-	"folding.end": "접기 영역 끝"
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/css-language-features/package.i18n.json b/i18n/kor/extensions/css-language-features/package.i18n.json
deleted file mode 100644
index 43cc6cb4724..00000000000
--- a/i18n/kor/extensions/css-language-features/package.i18n.json
+++ /dev/null
@@ -1,81 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "CSS 언어 기능",
-	"description": "CSS, LESS 및 SCSS 파일에 대한 다양한 언어 지원을 제공합니다.",
-	"css.title": "CSS",
-	"css.lint.argumentsInColorFunction.desc": "잘못된 매개 변수 수",
-	"css.lint.boxModel.desc": "패딩 또는 테두리를 사용하는 경우 너비 또는 높이를 사용하지 마세요.",
-	"css.lint.compatibleVendorPrefixes.desc": "공급업체 관련 접두사를 사용할 경우 다른 모든 공급업체 관련 속성도 포함합니다.",
-	"css.lint.duplicateProperties.desc": "중복된 스타일 정의를 사용하지 마세요.",
-	"css.lint.emptyRules.desc": "빈 규칙 집합을 사용하지 마세요.",
-	"css.lint.float.desc": "'float'를 사용하지 않도록 합니다. Float를 사용하면 레이아웃의 한쪽이 바뀔 경우 CSS가 쉽게 깨질 수 있습니다.",
-	"css.lint.fontFaceProperties.desc": "@font-face 규칙에서 'src' 및 'font-family' 속성을 정의해야 합니다.",
-	"css.lint.hexColorLength.desc": "16진수 색은 3개 또는 6개의 16진수로 구성되어야 합니다.",
-	"css.lint.idSelector.desc": "이러한 규칙은 HTML과 긴밀하게 결합되므로 선택기에 ID를 포함하면 안 됩니다.",
-	"css.lint.ieHack.desc": "IE 핵(Hack)은 IE7 이상을 지원할 때만 필요합니다.",
-	"css.lint.important.desc": "!important는 사용하지 않도록 합니다. 이것은 전체 CSS의 특정성에 문제가 있어서 리팩터링해야 함을 나타냅니다.",
-	"css.lint.importStatement.desc": "Import 문은 병렬로 로드되지 않습니다.",
-	"css.lint.propertyIgnoredDueToDisplay.desc": "display 때문에 속성이 무시됩니다. 예를 들어 'display: inline'을 사용할 경우 width, height, margin-top, margin-bottom 및 float 속성은 적용되지 않습니다.",
-	"css.lint.universalSelector.desc": "범용 선택기 (*)는 느린 것으로 알려져 있습니다.",
-	"css.lint.unknownProperties.desc": "알 수 없는 속성입니다.",
-	"css.lint.unknownVendorSpecificProperties.desc": "알 수 없는 공급업체 관련 속성입니다.",
-	"css.lint.vendorPrefix.desc": "공급업체 관련 접두사를 사용할 때 표준 속성도 포함합니다.",
-	"css.lint.zeroUnits.desc": "0에는 단위가 필요하지 않습니다.",
-	"css.trace.server.desc": "VS Code와 CSS 언어 서버 간 통신을 추적합니다.",
-	"css.validate.title": "CSS 유효성 검사 및 문제 심각도를 제어합니다.",
-	"css.validate.desc": "모든 유효성 검사 사용 또는 사용 안 함",
-	"less.title": "LESS",
-	"less.lint.argumentsInColorFunction.desc": "잘못된 매개 변수 수",
-	"less.lint.boxModel.desc": "패딩 또는 테두리를 사용하는 경우 너비 또는 높이를 사용하지 마세요.",
-	"less.lint.compatibleVendorPrefixes.desc": "공급업체 관련 접두사를 사용할 경우 다른 모든 공급업체 관련 속성도 포함합니다.",
-	"less.lint.duplicateProperties.desc": "중복된 스타일 정의를 사용하지 마세요.",
-	"less.lint.emptyRules.desc": "빈 규칙 집합을 사용하지 마세요.",
-	"less.lint.float.desc": "'float'를 사용하지 않도록 합니다. Float를 사용하면 레이아웃의 한쪽이 바뀔 경우 CSS가 쉽게 깨질 수 있습니다.",
-	"less.lint.fontFaceProperties.desc": "@font-face 규칙에서 'src' 및 'font-family' 속성을 정의해야 합니다.",
-	"less.lint.hexColorLength.desc": "16진수 색은 3개 또는 6개의 16진수로 구성되어야 합니다.",
-	"less.lint.idSelector.desc": "이러한 규칙은 HTML과 긴밀하게 결합되므로 선택기에 ID를 포함하면 안 됩니다.",
-	"less.lint.ieHack.desc": "IE 핵(Hack)은 IE7 이상을 지원할 때만 필요합니다.",
-	"less.lint.important.desc": "!important는 사용하지 않도록 합니다. 이것은 전체 CSS의 특정성에 문제가 있어서 리팩터링해야 함을 나타냅니다.",
-	"less.lint.importStatement.desc": "Import 문은 병렬로 로드되지 않습니다.",
-	"less.lint.propertyIgnoredDueToDisplay.desc": "display 때문에 속성이 무시됩니다. 예를 들어 'display: inline'을 사용할 경우 width, height, margin-top, margin-bottom 및 float 속성은 적용되지 않습니다.",
-	"less.lint.universalSelector.desc": "범용 선택기 (*)는 느린 것으로 알려져 있습니다.",
-	"less.lint.unknownProperties.desc": "알 수 없는 속성입니다.",
-	"less.lint.unknownVendorSpecificProperties.desc": "알 수 없는 공급업체 관련 속성입니다.",
-	"less.lint.vendorPrefix.desc": "공급업체 관련 접두사를 사용할 때 표준 속성도 포함합니다.",
-	"less.lint.zeroUnits.desc": "0에는 단위가 필요하지 않습니다.",
-	"less.validate.title": "LESS 유효성 검사 및 문제 심각도를 제어합니다.",
-	"less.validate.desc": "모든 유효성 검사 사용 또는 사용 안 함",
-	"scss.title": "SCSS(Sass)",
-	"scss.lint.argumentsInColorFunction.desc": "잘못된 매개 변수 수",
-	"scss.lint.boxModel.desc": "패딩 또는 테두리를 사용하는 경우 너비 또는 높이를 사용하지 마세요.",
-	"scss.lint.compatibleVendorPrefixes.desc": "공급업체 관련 접두사를 사용할 경우 다른 모든 공급업체 관련 속성도 포함합니다.",
-	"scss.lint.duplicateProperties.desc": "중복된 스타일 정의를 사용하지 마세요.",
-	"scss.lint.emptyRules.desc": "빈 규칙 집합을 사용하지 마세요.",
-	"scss.lint.float.desc": "'float'를 사용하지 않도록 합니다. Float를 사용하면 레이아웃의 한쪽이 바뀔 경우 CSS가 쉽게 깨질 수 있습니다.",
-	"scss.lint.fontFaceProperties.desc": "@font-face 규칙에서 'src' 및 'font-family' 속성을 정의해야 합니다.",
-	"scss.lint.hexColorLength.desc": "16진수 색은 3개 또는 6개의 16진수로 구성되어야 합니다.",
-	"scss.lint.idSelector.desc": "이러한 규칙은 HTML과 긴밀하게 결합되므로 선택기에 ID를 포함하면 안 됩니다.",
-	"scss.lint.ieHack.desc": "IE 핵(Hack)은 IE7 이상을 지원할 때만 필요합니다.",
-	"scss.lint.important.desc": "!important는 사용하지 않도록 합니다. 이것은 전체 CSS의 특정성에 문제가 있어서 리팩터링해야 함을 나타냅니다.",
-	"scss.lint.importStatement.desc": "Import 문은 병렬로 로드되지 않습니다.",
-	"scss.lint.propertyIgnoredDueToDisplay.desc": "display 때문에 속성이 무시됩니다. 예를 들어 'display: inline'을 사용할 경우 width, height, margin-top, margin-bottom 및 float 속성은 적용되지 않습니다.",
-	"scss.lint.universalSelector.desc": "범용 선택기 (*)는 느린 것으로 알려져 있습니다.",
-	"scss.lint.unknownProperties.desc": "알 수 없는 속성입니다.",
-	"scss.lint.unknownVendorSpecificProperties.desc": "알 수 없는 공급업체 관련 속성입니다.",
-	"scss.lint.vendorPrefix.desc": "공급업체 관련 접두사를 사용할 때 표준 속성도 포함합니다.",
-	"scss.lint.zeroUnits.desc": "0에는 단위가 필요하지 않습니다.",
-	"scss.validate.title": "SCSS 유효성 검사 및 문제 심각도를 제어합니다.",
-	"scss.validate.desc": "모든 유효성 검사 사용 또는 사용 안 함",
-	"less.colorDecorators.enable.desc": "색 데코레이터 사용 또는 사용 안 함",
-	"scss.colorDecorators.enable.desc": "색 데코레이터 사용 또는 사용 안 함",
-	"css.colorDecorators.enable.desc": "색 데코레이터 사용 또는 사용 안 함",
-	"css.colorDecorators.enable.deprecationMessage": "`css.colorDecorators.enable` 설정은 `editor.colorDecorators`를 위해 사용되지 않습니다.",
-	"scss.colorDecorators.enable.deprecationMessage": "`scss.colorDecorators.enable` 설정은 `editor.colorDecorators`를 위해 사용되지 않습니다.",
-	"less.colorDecorators.enable.deprecationMessage": "`less.colorDecorators.enable` 설정은 `editor.colorDecorators`를 위해 사용되지 않습니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/css/client/out/cssMain.i18n.json b/i18n/kor/extensions/css/client/out/cssMain.i18n.json
deleted file mode 100644
index 18013d8de41..00000000000
--- a/i18n/kor/extensions/css/client/out/cssMain.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"cssserver.name": "CSS 언어 서버",
-	"folding.start": "영역 접기 시작",
-	"folding.end": "접기 영역 끝"
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/css/package.i18n.json b/i18n/kor/extensions/css/package.i18n.json
deleted file mode 100644
index 2d4d9da9391..00000000000
--- a/i18n/kor/extensions/css/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "CSS 언어 기본",
-	"description": "CSS,LESS,SCSS 파일에서 구문 강조 표시와 괄호 일치를 제공합니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/diff/package.i18n.json b/i18n/kor/extensions/diff/package.i18n.json
deleted file mode 100644
index 35229bd6699..00000000000
--- a/i18n/kor/extensions/diff/package.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	]
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/docker/package.i18n.json b/i18n/kor/extensions/docker/package.i18n.json
deleted file mode 100644
index 773f0ff4af7..00000000000
--- a/i18n/kor/extensions/docker/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Docker 언어 기본",
-	"description": "Docker 파일에서 구문 강조 표시 및 괄호 일치를 제공합니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/emmet/package.i18n.json b/i18n/kor/extensions/emmet/package.i18n.json
deleted file mode 100644
index 517fee7baf0..00000000000
--- a/i18n/kor/extensions/emmet/package.i18n.json
+++ /dev/null
@@ -1,65 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"description": "VS Code에 대한 Emmet 지원",
-	"command.wrapWithAbbreviation": "약어로 래핑",
-	"command.wrapIndividualLinesWithAbbreviation": "약어로 개별 줄 래핑",
-	"command.removeTag": "태그 제거",
-	"command.updateTag": "태그 업데이트",
-	"command.matchTag": "일치하는 쌍으로 이동",
-	"command.balanceIn": "균형있게(안쪽으로)",
-	"command.balanceOut": "균형있게(바깥쪽으로)",
-	"command.prevEditPoint": "이전 편집 점으로 이동",
-	"command.nextEditPoint": "다음 편집 점으로 이동",
-	"command.mergeLines": "줄 병합",
-	"command.selectPrevItem": "이전 항목 선택",
-	"command.selectNextItem": "다음 항목 선택",
-	"command.splitJoinTag": "태그 분할/조인",
-	"command.toggleComment": "주석 토글",
-	"command.evaluateMathExpression": "수식 평가",
-	"command.updateImageSize": "이미지 크기 업데이트",
-	"command.reflectCSSValue": "CSS 값 반영",
-	"command.incrementNumberByOne": "1씩 증가",
-	"command.decrementNumberByOne": "1씩 감소",
-	"command.incrementNumberByOneTenth": "0.1씩 증가",
-	"command.decrementNumberByOneTenth": "0.1씩 감소",
-	"command.incrementNumberByTen": "10씩 증가",
-	"command.decrementNumberByTen": "10씩 감소",
-	"emmetSyntaxProfiles": "지정된 구문에 대한 프로필을 정의하거나 특정 규칙이 포함된 고유한 프로필을 사용하세요.",
-	"emmetExclude": "Emmet 약어는 확장하면 안 되는 언어의 배열입니다.",
-	"emmetExtensionsPath": "Emmet 프로필 및 코드 조각이 포함된 폴더의 경로입니다.'",
-	"emmetShowExpandedAbbreviation": "확장된 emmet 약어를 제안으로 표시합니다.\n\"inMarkupAndStylesheetFilesOnly\" 옵션이 html, haml, jade, slim, xml, xsl, css, scss, sass, less 및 stylus에 적용됩니다.\n\"always\" 옵션이 마크업/css에 관계없이 파일의 모든 부분에 적용됩니다.",
-	"emmetShowAbbreviationSuggestions": "가능한 emmet 약어를 제안으로 표시합니다. 스타일시트에는 적용되지 않고 emmet.showExpandedAbbreviation이 \"never\"로 설정되어 있을 때도 적용되지 않습니다.",
-	"emmetIncludeLanguages": "기본 지원되지 않는 언어에서 Emmet 약어를 사용하도록 설정합니다. 언어와 emmet 지원 언어 사이에 매핑을 추가합니다.\n예: {\"vue-html\": \"html\", \"javascript\": \"javascriptreact\"}",
-	"emmetVariables": "emmet 조각에 사용되는 변수",
-	"emmetTriggerExpansionOnTab": "사용하도록 설정하면 emmet 약어는 Tab 키를 눌렀을 때 확장됩니다.",
-	"emmetPreferences": "Emmet의 일부 작업 및 해결 프로그램의 동작을 수정하는 데 사용되는 기본 설정입니다.",
-	"emmetPreferencesIntUnit": "정수 값의 기본 단위",
-	"emmetPreferencesFloatUnit": "부동 소수점 값의 기본 단위",
-	"emmetPreferencesCssAfter": "CSS 약어를 확장할 때 CSS 속성의 끝에 배치할 기호",
-	"emmetPreferencesSassAfter": "Sass 파일에서 CSS 약어를 확장할 때 CSS 속성의 끝에 배치할 기호",
-	"emmetPreferencesStylusAfter": "Stylus 파일에서 CSS 약어를 확장할 때 CSS 속성의 끝에 배치할 기호",
-	"emmetPreferencesCssBetween": "CSS 약어를 확장할 때 CSS 속성 및 값 사이에 배치할 기호",
-	"emmetPreferencesSassBetween": "Sass 파일에서 CSS 약어를 확장할 때 CSS 속성 및 값 사이에 배치할 기호",
-	"emmetPreferencesStylusBetween": "Stylus 파일에서 CSS 약어를 확장할 때 CSS 속성 및 값 사이에 배치할 기호",
-	"emmetShowSuggestionsAsSnippets": "True이면 emmet 제안이 코드 조각으로 표시되며 editor.snippetSuggestions 설정에 따라 코드 조각을 정렬할 수 있습니다.",
-	"emmetPreferencesBemElementSeparator": "BEM 필터 사용시 요소 구분자를 클래스로 사용합니다.",
-	"emmetPreferencesBemModifierSeparator": "BEM 필터 사용시 변경된 구분자를 클래스로 사용합니다.",
-	"emmetPreferencesFilterCommentBefore": "코멘트 필터가 적용 될때 코맨트 표시는 해당된 요소 앞에 배치 해야합니다.",
-	"emmetPreferencesFilterCommentAfter": "코멘트 필터가 적용 될때 코맨트 표시는 해당된 요소 뒤에 배치 해야합니다.",
-	"emmetPreferencesFilterCommentTrigger": "콤마로 구분된 리스트의 속성은 코멘트 필터 약어로 존재해야 합니다.",
-	"emmetPreferencesFormatNoIndentTags": "내부 들여쓰기하면 안 되는 태그 이름 배열",
-	"emmetPreferencesFormatForceIndentTags": "항상 내부 들여쓰기를 해야 하는 태그 이름의 배열",
-	"emmetPreferencesAllowCompactBoolean": "true인 경우 부울 속성의 축소된 표기법이 생성됩니다.",
-	"emmetPreferencesCssWebkitProperties": "`-`로 시작하는 Emmet 약어에서 사용될 때 'webkit' 공급업체 접두사를 가져오는 쉼표로 구분된 CSS 속성입니다. 항상 'webkit' 접두사를 사용하지 않으려면 빈 문자열로 설정합니다.",
-	"emmetPreferencesCssMozProperties": "`-`로 시작하는 Emmet 약어에서 사용될 때 'moz' 공급업체 접두사를 가져오는 쉼표로 구분된 CSS 속성입니다. 항상 'moz' 접두사를 사용하지 않으려면 빈 문자열로 설정합니다.",
-	"emmetPreferencesCssOProperties": "`-`로 시작하는 emmet 약어에서 사용할 때 'o' 공급업체 접두사를 가져오는 쉼표로 구분된 CSS 속성입니다. 항상 'o' 접두사를 사용하지 않으려면 빈 문자열로 설정합니다.",
-	"emmetPreferencesCssMsProperties": "`-`로 시작하는 emmet 약어에서 사용할 때 'ms' 공급업체 접두사를 가져오는 쉼표로 구분된 CSS 속성입니다. 항상 'ms' 접두사를 사용하지 않으려면 빈 문자열로 설정합니다.",
-	"emmetPreferencesCssFuzzySearchMinScore": "유사 일치 약어가 획득해야 하는 최소 점수(0에서 1 사이)입니다. 값이 낮을수록 가양성 일치 항목이 늘 수 있고, 값이 높을수록 가능한 일치 항목이 줄 수 있습니다.",
-	"emmetOptimizeStylesheetParsing": "False로 설정할 경우 전체 파일이 구문 분석되어 현재 위치가 Emmet 약어 확장에 유효한지 확인합니다. True로 설정할 경우 css/scss/less 파일에서 현재 위치 주변의 콘텐츠만 구문 분석합니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/extension-editing/out/extensionLinter.i18n.json b/i18n/kor/extensions/extension-editing/out/extensionLinter.i18n.json
deleted file mode 100644
index 1a6b6fec169..00000000000
--- a/i18n/kor/extensions/extension-editing/out/extensionLinter.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"httpsRequired": "이미지는 HTTPS 프로토콜을 사용해야 합니다.",
-	"svgsNotValid": "SVG는 올바른 이미지 소스가 아닙니다.",
-	"embeddedSvgsNotValid": "내장 SVG는 올바른 이미지 소스가 아닙니다.",
-	"dataUrlsNotValid": "데이터 URL은 올바른 이미지 소스가 아닙니다.",
-	"relativeUrlRequiresHttpsRepository": "관계형 이미지 URL은 package.json에 HTTPS 프로토콜이 지정된 저장소가 필요합니다.",
-	"relativeIconUrlRequiresHttpsRepository": "아이콘은 package.json에 HTTPS 프로토콜이 지정된 저장소가 필요합니다.",
-	"relativeBadgeUrlRequiresHttpsRepository": "관계형 배지 URL은 package.json에 HTTPS 프로토콜이 지정된 저장소가 필요합니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/extension-editing/out/packageDocumentHelper.i18n.json b/i18n/kor/extensions/extension-editing/out/packageDocumentHelper.i18n.json
deleted file mode 100644
index 2ec90e35ddf..00000000000
--- a/i18n/kor/extensions/extension-editing/out/packageDocumentHelper.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"languageSpecificEditorSettings": "언어별 편집기 설정",
-	"languageSpecificEditorSettingsDescription": "언어용 편집기 설정 재정의"
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/extension-editing/package.i18n.json b/i18n/kor/extensions/extension-editing/package.i18n.json
deleted file mode 100644
index da40974d29f..00000000000
--- a/i18n/kor/extensions/extension-editing/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "패키지 파일 편집",
-	"description": "VS Code 확장 지점 및 package.json 파일의 lint 기능에 대해 IntelliSense를 제공합니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/fsharp/package.i18n.json b/i18n/kor/extensions/fsharp/package.i18n.json
deleted file mode 100644
index cd155f6f79b..00000000000
--- a/i18n/kor/extensions/fsharp/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "F# 언어 기본",
-	"description": "F# 파일에서 코드 조각, 구문 강조 표시, 괄호 일치 및 접기를 제공합니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/git/out/askpass-main.i18n.json b/i18n/kor/extensions/git/out/askpass-main.i18n.json
deleted file mode 100644
index 24a0710bfc1..00000000000
--- a/i18n/kor/extensions/git/out/askpass-main.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"missOrInvalid": "자격 증명이 없거나 잘못되었습니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/git/out/autofetch.i18n.json b/i18n/kor/extensions/git/out/autofetch.i18n.json
deleted file mode 100644
index 7f6a3198eb6..00000000000
--- a/i18n/kor/extensions/git/out/autofetch.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"yes": "예",
-	"no": "아니요",
-	"not now": "나중에 물어보기",
-	"suggest auto fetch": "Code에서 ['git fetch']({0})를 정기적으로 실행하도록 하시겠습니까?"
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/git/out/commands.i18n.json b/i18n/kor/extensions/git/out/commands.i18n.json
deleted file mode 100644
index 5c881abd459..00000000000
--- a/i18n/kor/extensions/git/out/commands.i18n.json
+++ /dev/null
@@ -1,91 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"tag at": "{0}의 태그",
-	"remote branch at": "{0}에서 원격 분기",
-	"create branch": "$(plus) 새 분기 생성",
-	"repourl": "리포지토리 URL",
-	"selectFolder": "리포지토리 위치 선택",
-	"cloning": "Git 리포지토리 '{0}'을(를) 복제하는 중...",
-	"proposeopen": "복제된 리포지토리를 여시겠습니까?",
-	"openrepo": "리포지토리 열기",
-	"add": "작업 영역에 추가",
-	"proposeopen2": "복제된 리포지토리를 열거나 현재 작업 영역에 추가하시겠습니까?",
-	"init": "Git 리포지토리를 초기화할 작업 영역 폴더 선택",
-	"init repo": "리포지토리 초기화",
-	"create repo": "리포지토리 초기화",
-	"are you sure": "'{0}'에서 Git 리포지토리가 만들어집니다. 계속하시겠습니까?",
-	"HEAD not available": "'{0}'의 HEAD 버전이 없습니다.",
-	"confirm stage files with merge conflicts": "병합 충돌이 있는 {0} 파일을 스테이징하시겠습니까?",
-	"confirm stage file with merge conflicts": "병합 충돌이 있는 {0}을(를) 스테이징하시겠습니까?",
-	"yes": "예",
-	"confirm revert": "{0}에서 선택한 변경 내용을 되돌리시겠습니까?",
-	"revert": "변경 내용 되돌리기",
-	"discard": "변경 내용 취소",
-	"confirm delete": "{0}을(를) 삭제하시겠습니까?",
-	"delete file": "파일 삭제",
-	"confirm discard": "{0}의 변경 내용을 취소하시겠습니까?",
-	"confirm discard multiple": "{0}개 파일의 변경 내용을 취소하시겠습니까?",
-	"warn untracked": "{0}개의 추적되지 않은 파일을 삭제합니다.",
-	"confirm discard all single": "{0}의 변경 내용을 취소하시겠습니까?",
-	"confirm discard all": "{0} 파일에서 변경 내용을 모두 취소하시겠습니까?\n이 작업은 되돌릴 수 없습니다.\n현재 작업 설정이 영구적으로 손실됩니다.",
-	"discardAll multiple": "1개 파일 취소",
-	"discardAll": "{0}개 파일 모두 버리기",
-	"confirm delete multiple": "{0}개 파일을 삭제하시겠습니까?",
-	"delete files": "파일 삭제",
-	"there are untracked files single": "취소한 경우 다음 추적되지 않은 파일이 디스크에서 삭제됩니다. {0}.",
-	"there are untracked files": "취소하는 경우 {0}개의 추적되지 않은 파일이 디스크에서 삭제됩니다.",
-	"confirm discard all 2": "{0}\n\n이 작업은 되돌릴 수 없으며, 현재 작업 설정이 영구적으로 손실됩니다.",
-	"yes discard tracked": "1개의 추적된 파일 취소",
-	"yes discard tracked multiple": "{0}개의 추적된 파일 취소",
-	"unsaved files single": "다음 파일이 저장되지 않았습니다: {0}.\n\n제출하기 전에 저장할까요?",
-	"unsaved files": "저장되지 않은 {0}개의 파일들이 있습니다.\n\n제출하기 전에 저장할까요?",
-	"save and commit": "모두 저장하고 제출",
-	"commit": "그냥 제출",
-	"no staged changes": "저장할 단계적 변경 사항이 없습니다.\n\n모든 변경 사항을 자동으로 스테이징하고 직접 저장하시겠습니까?",
-	"always": "항상",
-	"no changes": "커밋할 변경 내용이 없습니다.",
-	"commit message": "커밋 메시지",
-	"provide commit message": "커밋 메시지를 제공하세요.",
-	"select a ref to checkout": "체크아웃할 참조 선택",
-	"branch name": "분기 이름",
-	"provide branch name": "분기 이름을 입력하세요.",
-	"select branch to delete": "삭제할 분기 선택",
-	"confirm force delete branch": "'{0}' 분기가 완벽히 병합되지 않았습니다. 그래도 삭제할까요?",
-	"delete branch": "분기 삭제",
-	"invalid branch name": "잘못된 분기 이름",
-	"branch already exists": "이름이 '{0}'인 분기가 이미 있습니다.",
-	"select a branch to merge from": "병합할 분기 선택",
-	"merge conflicts": "병합 충돌이 있습니다. 해결한 후 계속하십시오.",
-	"tag name": "태그 이름",
-	"provide tag name": "태그 이름을 입력하세요.",
-	"tag message": "메시지",
-	"provide tag message": "태그에 주석을 달 메시지를 입력하세요.",
-	"no remotes to fetch": "이 리포지토리에 페치할 원격 항목이 구성되어 있지 않습니다.",
-	"no remotes to pull": "리포지토리에 풀하도록 구성된 원격 항목이 없습니다.",
-	"pick remote pull repo": "분기를 가져올 원격 선택",
-	"no remotes to push": "리포지토리에 푸시하도록 구성된 원격이 없습니다.",
-	"nobranch": "원격에 푸시할 분기를 체크 아웃하세요.",
-	"confirm publish branch": "'{0}' 분기에는 상향 분기가 없습니다. 이 분기를 게시하시겠습니까?",
-	"ok": "확인",
-	"push with tags success": "태그와 함께 푸시되었습니다.",
-	"pick remote": "'{0}' 분기를 다음에 게시하려면 원격을 선택하세요.",
-	"sync is unpredictable": "이 작업은 '{0}/{1}' 간에 커밋을 푸시하고 풀합니다. ",
-	"never again": "다시 표시 안 함",
-	"no remotes to publish": "리포지토리에 게시하도록 구성된 원격이 없습니다.",
-	"no changes stash": "스태시할 변경 내용이 없습니다.",
-	"provide stash message": "필요한 경우 스태시 메시지를 입력하세요.",
-	"stash message": "스태시 메시지",
-	"no stashes": "복원할 스태시가 없습니다.",
-	"pick stash to pop": "표시할 스태시 선택",
-	"clean repo": "체크 아웃하기 전에 리포지토리 작업 트리를 정리하세요.",
-	"cant push": "참조를 원격에 푸시할 수 없습니다. 먼저 '풀'을 실행하여 변경 내용을 통합하세요.",
-	"git error details": "Git: {0}",
-	"git error": "Git 오류",
-	"open git log": "Git 로그 열기"
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/git/out/main.i18n.json b/i18n/kor/extensions/git/out/main.i18n.json
deleted file mode 100644
index d456beffb80..00000000000
--- a/i18n/kor/extensions/git/out/main.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"looking": "다음에서 git을 찾는 중: {0}",
-	"using git": "{1}에서 git {0}을(를) 사용하는 중",
-	"downloadgit": "Git 다운로드",
-	"neverShowAgain": "다시 표시 안 함",
-	"notfound": "Git을 찾을 수 없습니다. 'git.path'를 사용하여 Git을 설치하거나 구성합니다.",
-	"updateGit": "Git 업데이트",
-	"git20": "Git {0}이(가) 설치된 것 같습니다. 코드는 2 이하의 Git에서 최적으로 작동합니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/git/out/model.i18n.json b/i18n/kor/extensions/git/out/model.i18n.json
deleted file mode 100644
index 47bfb877f0f..00000000000
--- a/i18n/kor/extensions/git/out/model.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"too many submodules": "'{0}' 리포지토리에 자동으로 열리지 않는 {1}개의 하위 모듈이 있습니다. 모듈 내의 파일을 열러 각 모듈을 개별적으로 열 수는 있습니다.",
-	"no repositories": "사용 가능한 리포지토리가 없습니다.",
-	"pick repo": "리포지토리 선택"
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/git/out/repository.i18n.json b/i18n/kor/extensions/git/out/repository.i18n.json
deleted file mode 100644
index 0d6d7f489d0..00000000000
--- a/i18n/kor/extensions/git/out/repository.i18n.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"open": "열기",
-	"index modified": "인덱스 수정됨",
-	"modified": "수정됨",
-	"index added": "인덱스 추가됨",
-	"index deleted": "인덱스 삭제됨",
-	"deleted": "삭제됨",
-	"index renamed": "인덱스 이름 변경됨",
-	"index copied": "인덱스 복사됨",
-	"untracked": "추적되지 않음",
-	"ignored": "무시됨",
-	"both deleted": "둘 다 삭제됨",
-	"added by us": "본인이 추가함",
-	"deleted by them": "타인이 삭제함",
-	"added by them": "타인이 추가함",
-	"deleted by us": "본인이 삭제함",
-	"both added": "둘 다 추가됨",
-	"both modified": "둘 다 수정됨",
-	"commitMessage": "메시지(커밋하려면 {0} 누르기)",
-	"commit": "커밋",
-	"merge changes": "변경 내용 병합",
-	"staged changes": "스테이징된 변경 내용",
-	"changes": "변경 내용",
-	"commitMessageCountdown": "현재 줄에서 {0} 글자 남음",
-	"commitMessageWarning": "현재 줄에서 {0} 글자 초과 {1}",
-	"neveragain": "다시 표시 안 함",
-	"huge": "'{0}'의 Git 리포지토리에 활성 변경 내용이 너무 많습니다. Git 기능의 하위 집합만 사용할 수 있도록 설정됩니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/git/out/scmProvider.i18n.json b/i18n/kor/extensions/git/out/scmProvider.i18n.json
deleted file mode 100644
index 69250749f77..00000000000
--- a/i18n/kor/extensions/git/out/scmProvider.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"commit": "커밋"
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/git/out/statusbar.i18n.json b/i18n/kor/extensions/git/out/statusbar.i18n.json
deleted file mode 100644
index faf6fa27f20..00000000000
--- a/i18n/kor/extensions/git/out/statusbar.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"checkout": "체크 아웃...",
-	"sync changes": "변경 내용 동기화",
-	"publish changes": "변경 내용 게시",
-	"syncing changes": "변경 내용을 동기화하는 중..."
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/git/package.i18n.json b/i18n/kor/extensions/git/package.i18n.json
deleted file mode 100644
index 3703ac48f99..00000000000
--- a/i18n/kor/extensions/git/package.i18n.json
+++ /dev/null
@@ -1,87 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Git",
-	"description": "Git SCM 통합",
-	"command.clone": "복제",
-	"command.init": "리포지토리 초기화",
-	"command.close": "리포지토리 닫기",
-	"command.refresh": "새로 고침",
-	"command.openChange": "변경 내용 열기",
-	"command.openFile": "파일 열기",
-	"command.openHEADFile": "파일 열기(HEAD)",
-	"command.stage": "변경 내용 스테이징",
-	"command.stageAll": "모든 변경 내용 스테이징",
-	"command.stageSelectedRanges": "선택한 범위 스테이징",
-	"command.revertSelectedRanges": "선택한 범위 되돌리기",
-	"command.stageChange": "변경 내용 스테이징",
-	"command.revertChange": "변경 내용 되돌리기",
-	"command.unstage": "변경 내용 스테이징 취소",
-	"command.unstageAll": "모든 변경 내용 스테이징 취소",
-	"command.unstageSelectedRanges": "선택한 범위 스테이징 취소",
-	"command.clean": "변경 내용 취소",
-	"command.cleanAll": "모든 변경 내용 취소",
-	"command.commit": "Commit",
-	"command.commitStaged": "스테이징된 항목 커밋",
-	"command.commitStagedSigned": "스테이징된 항목 커밋(로그오프됨)",
-	"command.commitStagedAmend": "스테이징된 항목 커밋(수정)",
-	"command.commitAll": "모두 커밋",
-	"command.commitAllSigned": "모두 커밋(로그오프됨)",
-	"command.commitAllAmend": "모두 커밋 (수정)",
-	"command.undoCommit": "마지막 커밋 실행 취소",
-	"command.checkout": "다음으로 체크 아웃...",
-	"command.branch": "분기 만들기...",
-	"command.deleteBranch": "분기 삭제...",
-	"command.renameBranch": "분기 이름 바꾸기...",
-	"command.merge": "분기 병합...",
-	"command.createTag": "태그 생성",
-	"command.fetch": "페치",
-	"command.pull": "풀",
-	"command.pullRebase": "풀(다시 지정)",
-	"command.pullFrom": "가져올 위치...",
-	"command.push": "푸시",
-	"command.pushTo": "다음으로 푸시...",
-	"command.pushWithTags": "태그로 푸시",
-	"command.sync": "동기화",
-	"command.syncRebase": "동기화(다시 지정)",
-	"command.publish": "분기 게시",
-	"command.showOutput": "Git 출력 표시",
-	"command.ignore": ".gitignore에 파일 추가",
-	"command.stashIncludeUntracked": "스태시(미추적 포함)",
-	"command.stash": "스태시",
-	"command.stashPop": "스태시 표시...",
-	"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`이면 모든 참조를 표시하고, `local`이면 로컬 분기만 표시하고, `tags`이면 태그만 표시하고, `remote`이면 원격 분기만 표시합니다.",
-	"config.ignoreLegacyWarning": "레거시 Git 경고를 무시합니다.",
-	"config.ignoreMissingGitWarning": "Git이 없으면 경고를 무시합니다.",
-	"config.ignoreLimitWarning": "리포지토리에 변경 내용이 너무 많으면 경고를 무시합니다.",
-	"config.defaultCloneDirectory": "git 리포지토리를 복제할 기본 위치",
-	"config.enableSmartCommit": "단계적 변경 사항이 없는 경우 모든 변경 사항을 저장합니다.",
-	"config.enableCommitSigning": "GPG를 사용한 커밋 서명을 사용하도록 설정합니다.",
-	"config.discardAllScope": "`모든 변경 내용 취소` 명령으로 취소되는 변경 내용을 제어합니다. `all`이면 모든 변경 내용을 취소합니다. `tracked`이면 추적된 파일만 취소합니다. `prompt`이면 작업을 실행할 때마다 프롬프트 대화 상자를 표시합니다.",
-	"config.decorations.enabled": "Git에서 색과 배지를 탐색기와 열려 있는 편집기 뷰에 적용하는지 제어합니다.",
-	"config.promptToSaveFilesBeforeCommit": "Git가 제출(commit)하기 전에 저장되지 않은 파일을 검사할지를 제어합니다. ",
-	"config.showInlineOpenFileAction": "Git 변경점 보기에서 파일 열기 동작 줄을 표시할지의 여부를 제어합니다.",
-	"config.inputValidation": "커밋 메시지 입력 유효성 검사를 언제 표시할지 제어합니다.",
-	"config.detectSubmodules": "Git 하위 모듈을 자동으로 검색할지 여부를 제어합니다.",
-	"config.detectSubmodulesLimit": "Git submodules 검출 개수의 제한을 제어합니다.",
-	"colors.modified": "수정된 리소스의 색상입니다.",
-	"colors.deleted": "삭제된 리소스의 색상입니다.",
-	"colors.untracked": "추적되지 않은 리소스의 색상입니다.",
-	"colors.ignored": "무시된 리소스의 색상입니다.",
-	"colors.conflict": "충돌이 발생한 리소스의 색상입니다.",
-	"colors.submodule": "서브모듈 자원의 색상"
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/go/package.i18n.json b/i18n/kor/extensions/go/package.i18n.json
deleted file mode 100644
index e96af6f8c61..00000000000
--- a/i18n/kor/extensions/go/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Go 언어 기본",
-	"description": "Go 파일에서 구문 강조 표시 및 괄호 일치를 제공합니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/groovy/package.i18n.json b/i18n/kor/extensions/groovy/package.i18n.json
deleted file mode 100644
index 03012fdafc8..00000000000
--- a/i18n/kor/extensions/groovy/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Groovy 언어 기본",
-	"description": "Groovy 파일에서 코드 조각, 구문 강조 표시, 괄호 일치 및 접기를 제공합니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/grunt/out/main.i18n.json b/i18n/kor/extensions/grunt/out/main.i18n.json
deleted file mode 100644
index 12be3ef6461..00000000000
--- a/i18n/kor/extensions/grunt/out/main.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"execFailed": "폴더 {0}에 대해 Grunt 자동 검색에 실패하고 {1} 오류가 발생했습니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/grunt/package.i18n.json b/i18n/kor/extensions/grunt/package.i18n.json
deleted file mode 100644
index f8895078557..00000000000
--- a/i18n/kor/extensions/grunt/package.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"description": "VSCode에 Grunt 기능을 추가할 확장입니다.",
-	"displayName": "VSCode에 대한 Grunt 지원",
-	"config.grunt.autoDetect": "Grunt 작업의 자동 검색을 사용할지 여부를 제어합니다. 기본값은 [켜기]입니다.",
-	"grunt.taskDefinition.type.description": "사용자 지정할 Grunt 작업입니다.",
-	"grunt.taskDefinition.file.description": "작업을 제공하는 Grunt 파일이며 생략할 수 있습니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/gulp/out/main.i18n.json b/i18n/kor/extensions/gulp/out/main.i18n.json
deleted file mode 100644
index d31cddf0bd4..00000000000
--- a/i18n/kor/extensions/gulp/out/main.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"execFailed": "폴더 {0}에 대해 Gulp 자동 검색에 실패하고 {1} 오류가 발생했습니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/gulp/package.i18n.json b/i18n/kor/extensions/gulp/package.i18n.json
deleted file mode 100644
index 4203e9df9c4..00000000000
--- a/i18n/kor/extensions/gulp/package.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"description": "VSCode에 Gulp 기능을 추가할 확장입니다.",
-	"displayName": "VSCode에 대한 Gulp 지원",
-	"config.gulp.autoDetect": "Gulp 작업의 자동 검색을 사용할지 여부를 제어합니다. 기본값은 [켜기]입니다.",
-	"gulp.taskDefinition.type.description": "사용자 지정할 Gulp 작업입니다.",
-	"gulp.taskDefinition.file.description": "작업을 제공하는 Gulp 파일이며 생략할 수 있습니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/handlebars/package.i18n.json b/i18n/kor/extensions/handlebars/package.i18n.json
deleted file mode 100644
index e7c46e56465..00000000000
--- a/i18n/kor/extensions/handlebars/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Handlebars 언어 기본",
-	"description": "Handlebars 파일에서 구문 강조 표시 및 괄호 일치를 제공합니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/hlsl/package.i18n.json b/i18n/kor/extensions/hlsl/package.i18n.json
deleted file mode 100644
index 13e006d274d..00000000000
--- a/i18n/kor/extensions/hlsl/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "HLSL 언어 기본",
-	"description": "HLSL 파일에서 구문 강조 표시 및 괄호 일치를 제공합니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/html-language-features/client/out/htmlMain.i18n.json b/i18n/kor/extensions/html-language-features/client/out/htmlMain.i18n.json
deleted file mode 100644
index d112b7520ae..00000000000
--- a/i18n/kor/extensions/html-language-features/client/out/htmlMain.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"htmlserver.name": "HTML 언어 서버",
-	"folding.start": "영역 접기 시작",
-	"folding.end": "접기 영역 끝"
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/html-language-features/package.i18n.json b/i18n/kor/extensions/html-language-features/package.i18n.json
deleted file mode 100644
index 064a37a9634..00000000000
--- a/i18n/kor/extensions/html-language-features/package.i18n.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "HTML 언어 기능",
-	"description": "HTML, Razor 및 Handlebar 파일에 대한 다양한 언어 지원을 제공합니다.",
-	"html.format.enable.desc": "기본 HTML 포맷터를 사용하거나 사용하지 않습니다.",
-	"html.format.wrapLineLength.desc": "한 줄당 최대 문자 수입니다(0 = 사용 안 함).",
-	"html.format.unformatted.desc": "쉼표로 분리된 태그 목록으로, 서식을 다시 지정해서는 안 됩니다. https://www.w3.org/TR/html5/dom.html#phrasing-content에 나열된 모든 태그의 기본값은 'null'로 설정됩니다.",
-	"html.format.contentUnformatted.desc": "쉼표로 분리된 태그 목록으로, 콘텐츠의 서식을 다시 지정해서는 안 됩니다. 'pre' 태그의 기본값은 'null'로 설정됩니다.",
-	"html.format.indentInnerHtml.desc": "<head> 및 <body> 섹션을 들여쓰기합니다.",
-	"html.format.preserveNewLines.desc": "요소 앞에 있는 기존 줄 바꿈의 유지 여부입니다. 요소 앞에만 적용되며 태그 안이나 텍스트에는 적용되지 않습니다.",
-	"html.format.maxPreserveNewLines.desc": "청크 한 개에 유지할 수 있는 최대 줄 바꿈 수입니다. 무제한일 때는 'null'을 사용합니다.",
-	"html.format.indentHandlebars.desc": "{{#foo}} 및 {{/foo}}를 서식 지정하고 들여쓰기합니다.",
-	"html.format.endWithNewline.desc": "줄 바꿈으로 끝납니다.",
-	"html.format.extraLiners.desc": "쉼표로 분리된 태그 목록으로 앞에 줄 바꿈을 추가로 넣어야 합니다. \"head, body, /html\"의 기본값은 'null'로 설정됩니다.",
-	"html.format.wrapAttributes.desc": "특성을 래핑합니다.",
-	"html.format.wrapAttributes.auto": "줄 길이를 초과하는 경우에만 특성을 래핑합니다.",
-	"html.format.wrapAttributes.force": "첫 번째 특성을 제외한 각 특성을 래핑합니다.",
-	"html.format.wrapAttributes.forcealign": "첫 번째 특성을 제외한 각 특성을 래핑하고 정렬된 상태를 유지합니다.",
-	"html.format.wrapAttributes.forcemultiline": "각 특성을 래핑합니다.",
-	"html.suggest.angular1.desc": "기본 제공 HTML 언어 지원에서 Angular V1 태그 및 속성을 제안하는지 여부를 구성합니다.",
-	"html.suggest.ionic.desc": "기본 제공 HTML 언어 지원에서 Ionic 태그, 속성 및 값을 제안하는지 여부를 구성합니다.",
-	"html.suggest.html5.desc": "기본 제공 HTML 언어 지원에서 HTML5 태그, 속성 및 값을 제안하는지 여부를 구성합니다.",
-	"html.trace.server.desc": "VS Code와 HTML 언어 서버 간 통신을 추적합니다.",
-	"html.validate.scripts": "기본 제공 HTML 언어 지원에서 포함 스크립트의 유효성을 검사하는지 여부를 구성합니다.",
-	"html.validate.styles": "기본 제공 HTML 언어 지원에서 포함 스타일의 유효성을 검사하는지 여부를 구성합니다.",
-	"html.autoClosingTags": "HTML 태그의 자동 닫기를 사용하거나 사용하지 않습니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/html/client/out/htmlMain.i18n.json b/i18n/kor/extensions/html/client/out/htmlMain.i18n.json
deleted file mode 100644
index d112b7520ae..00000000000
--- a/i18n/kor/extensions/html/client/out/htmlMain.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"htmlserver.name": "HTML 언어 서버",
-	"folding.start": "영역 접기 시작",
-	"folding.end": "접기 영역 끝"
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/html/package.i18n.json b/i18n/kor/extensions/html/package.i18n.json
deleted file mode 100644
index 0801cef7b57..00000000000
--- a/i18n/kor/extensions/html/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "HTML 언어 기본",
-	"description": "HTML 파일에서 구문 강조 표시, 괄호 일치 및 코드 조각을 제공합니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/ini/package.i18n.json b/i18n/kor/extensions/ini/package.i18n.json
deleted file mode 100644
index 1b035d634b2..00000000000
--- a/i18n/kor/extensions/ini/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Ini 언어 기본",
-	"description": "Ini 파일에서 구문 강조 표시 및 괄호 일치를 제공합니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/jake/out/main.i18n.json b/i18n/kor/extensions/jake/out/main.i18n.json
deleted file mode 100644
index 7f2b9a95456..00000000000
--- a/i18n/kor/extensions/jake/out/main.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"execFailed": "폴더 {0}에 대해 Jake 자동 검색에 실패하고 {1} 오류가 발생했습니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/jake/package.i18n.json b/i18n/kor/extensions/jake/package.i18n.json
deleted file mode 100644
index f83be6fbb64..00000000000
--- a/i18n/kor/extensions/jake/package.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"description": "VSCode에 Jake 기능을 추가할 확장입니다.",
-	"displayName": "VSCode에 대한 Jake 지원",
-	"jake.taskDefinition.type.description": "사용자 지정할 Jake 작업입니다.",
-	"jake.taskDefinition.file.description": "작업을 제공하는 Jake 파일이며 생략할 수 있습니다.",
-	"config.jake.autoDetect": "Jake 작업에 대한 자동 검색 사용 여부를 설정합니다. 기본값은 [켜기]입니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/java/package.i18n.json b/i18n/kor/extensions/java/package.i18n.json
deleted file mode 100644
index 10a50630a00..00000000000
--- a/i18n/kor/extensions/java/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Java 언어 기본",
-	"description": "Java  파일에서 코드 조각, 구문 강조 표시, 괄호 일치 및 접기를 제공합니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/javascript/out/features/bowerJSONContribution.i18n.json b/i18n/kor/extensions/javascript/out/features/bowerJSONContribution.i18n.json
deleted file mode 100644
index 031b105146a..00000000000
--- a/i18n/kor/extensions/javascript/out/features/bowerJSONContribution.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"json.bower.default": "기본 bower.json",
-	"json.bower.error.repoaccess": "Bower 리포지토리 요청 실패: {0}",
-	"json.bower.latest.version": "최신"
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/javascript/out/features/packageJSONContribution.i18n.json b/i18n/kor/extensions/javascript/out/features/packageJSONContribution.i18n.json
deleted file mode 100644
index 3170baac559..00000000000
--- a/i18n/kor/extensions/javascript/out/features/packageJSONContribution.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"json.package.default": "기본 package.json",
-	"json.npm.error.repoaccess": "NPM 리포지토리 요청 실패: {0}",
-	"json.npm.latestversion": "패키지의 현재 최신 버전",
-	"json.npm.majorversion": "최신 주 버전(1.x.x)을 일치시킵니다.",
-	"json.npm.minorversion": "최신 부 버전(1.2.x)을 일치시킵니다.",
-	"json.npm.version.hover": "최신 버전: {0}"
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/javascript/package.i18n.json b/i18n/kor/extensions/javascript/package.i18n.json
deleted file mode 100644
index b2be2c111cb..00000000000
--- a/i18n/kor/extensions/javascript/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "JavaScript 언어 기본",
-	"description": "JavaScript 파일에서 코드 조각, 구문 강조 표시, 괄호 일치 및 접기를 제공합니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/json-language-features/client/out/jsonMain.i18n.json b/i18n/kor/extensions/json-language-features/client/out/jsonMain.i18n.json
deleted file mode 100644
index 115ea612718..00000000000
--- a/i18n/kor/extensions/json-language-features/client/out/jsonMain.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"jsonserver.name": "JSON 언어 서버"
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/json-language-features/package.i18n.json b/i18n/kor/extensions/json-language-features/package.i18n.json
deleted file mode 100644
index d86c7ffa3da..00000000000
--- a/i18n/kor/extensions/json-language-features/package.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "JSON 언어 기능",
-	"description": "JSON 파일에 대한 다양한 언어 지원을 제공합니다.",
-	"json.schemas.desc": "현재 프로젝트에서 스키마를 JSON 파일에 연결",
-	"json.schemas.url.desc": "현재 디렉터리에 있는 스키마의 URL 또는 상대 경로",
-	"json.schemas.fileMatch.desc": "스키마에 대한 JSON 파일을 확인할 때 일치할 파일 패턴의 배열입니다.",
-	"json.schemas.fileMatch.item.desc": "스키마에 대한 JSON 파일을 확인할 때 일치할 '*'를 포함할 수 있는 파일 패턴입니다.",
-	"json.schemas.schema.desc": "지정된 URL에 대한 스키마 정의입니다. 스키마 URL에 대한 액세스 방지를 위해서만 스키마를 제공해야 합니다.",
-	"json.format.enable.desc": "기본 JSON 포맷터 사용/사용 안 함(다시 시작해야 함)",
-	"json.tracing.desc": "VS Code와 JSON 언어 서버 간 통신을 추적합니다.",
-	"json.colorDecorators.enable.desc": "색 데코레이터 사용 또는 사용 안 함",
-	"json.colorDecorators.enable.deprecationMessage": "`json.colorDecorators.enable` 설정은 `editor.colorDecorators`를 위해 사용되지 않습니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/json/client/out/jsonMain.i18n.json b/i18n/kor/extensions/json/client/out/jsonMain.i18n.json
deleted file mode 100644
index 115ea612718..00000000000
--- a/i18n/kor/extensions/json/client/out/jsonMain.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"jsonserver.name": "JSON 언어 서버"
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/json/package.i18n.json b/i18n/kor/extensions/json/package.i18n.json
deleted file mode 100644
index c63982946ed..00000000000
--- a/i18n/kor/extensions/json/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "JSON 언어 기본",
-	"description": "JSON 파일에서 구문 강조 표시 및 괄호 일치를 제공합니다. "
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/less/package.i18n.json b/i18n/kor/extensions/less/package.i18n.json
deleted file mode 100644
index 5b68258c408..00000000000
--- a/i18n/kor/extensions/less/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Less 언어 기본",
-	"description": "Less 파일에서 구문 강조 표시, 괄호 일치 및 접기를 제공합니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/log/package.i18n.json b/i18n/kor/extensions/log/package.i18n.json
deleted file mode 100644
index deed4e3f434..00000000000
--- a/i18n/kor/extensions/log/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "로그",
-	"description": "확장명이 .log인 파일에 대해 구문 강조 표시를 제공합니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/lua/package.i18n.json b/i18n/kor/extensions/lua/package.i18n.json
deleted file mode 100644
index d7f16433ac6..00000000000
--- a/i18n/kor/extensions/lua/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Lua 언어 기본",
-	"description": "Lua 파일에서 구문 강조 표시 및 괄호 일치를 제공합니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/make/package.i18n.json b/i18n/kor/extensions/make/package.i18n.json
deleted file mode 100644
index 0052e6620fe..00000000000
--- a/i18n/kor/extensions/make/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Make 언어 기본",
-	"description": "Make 파일에서 구문 강조 표시 및 괄호 일치를 제공합니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/markdown-basics/package.i18n.json b/i18n/kor/extensions/markdown-basics/package.i18n.json
deleted file mode 100644
index ef18fb49e64..00000000000
--- a/i18n/kor/extensions/markdown-basics/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Markdown 언어 기본",
-	"description": "Markdown에 대해 코드 조각 및 구문 강조 표시를 제공합니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json b/i18n/kor/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json
deleted file mode 100644
index 84643755d0a..00000000000
--- a/i18n/kor/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"onPreviewStyleLoadError": "'markdown.styles': {0}을 불러올 수 없음"
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/markdown-language-features/out/features/preview.i18n.json b/i18n/kor/extensions/markdown-language-features/out/features/preview.i18n.json
deleted file mode 100644
index 4bc763aedcc..00000000000
--- a/i18n/kor/extensions/markdown-language-features/out/features/preview.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"lockedPreviewTitle": "[미리 보기] {0}",
-	"previewTitle": "미리 보기 {0}"
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/markdown-language-features/out/features/previewContentProvider.i18n.json b/i18n/kor/extensions/markdown-language-features/out/features/previewContentProvider.i18n.json
deleted file mode 100644
index 01370fa604b..00000000000
--- a/i18n/kor/extensions/markdown-language-features/out/features/previewContentProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"preview.securityMessage.text": "이 문서에서 일부 콘텐츠가 사용하지 않도록 설정되었습니다.",
-	"preview.securityMessage.title": "Markdown 미리 보기에서 잠재적으로 안전하지 않거나 보안되지 않은 콘텐츠가 사용하지 않도록 설정되어 있습니다. 이 콘텐츠나 스크립트를 허용하려면 Markdown 미리 보기 보안 설정을 변경하세요.",
-	"preview.securityMessage.label": "콘텐츠 사용할 수 없음 보안 경고"
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/markdown-language-features/out/security.i18n.json b/i18n/kor/extensions/markdown-language-features/out/security.i18n.json
deleted file mode 100644
index aa640026595..00000000000
--- a/i18n/kor/extensions/markdown-language-features/out/security.i18n.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"strict.title": "Strict",
-	"strict.description": "보안 콘텐츠만 로드",
-	"insecureLocalContent.title": "안전하지 않은 로컬 콘텐츠 허용",
-	"insecureLocalContent.description": "localhost에서 제공되는 http를 통한 콘텐츠 로드 사용",
-	"insecureContent.title": "안전하지 않은 콘텐츠 허용",
-	"insecureContent.description": "http를 통한 콘텐츠 로드 사용",
-	"disable.title": "사용 안 함",
-	"disable.description": "모든 콘텐츠 및 스크립트 실행을 허용합니다. 권장하지 않습니다.",
-	"moreInfo.title": "추가 정보",
-	"enableSecurityWarning.title": "이 작업 영역에서 미리 보기 보안 경고 사용",
-	"disableSecurityWarning.title": "이 작업 영역에서 미리보기 보안 경고 사용 안 함",
-	"toggleSecurityWarning.description": "콘텐츠 보안 수준에 영향을 주지 않습니다.",
-	"preview.showPreviewSecuritySelector.title": "이 작업 영역에 대해 Markdown 미리 보기의 보안 설정 선택"
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/markdown-language-features/package.i18n.json b/i18n/kor/extensions/markdown-language-features/package.i18n.json
deleted file mode 100644
index 83878314ebe..00000000000
--- a/i18n/kor/extensions/markdown-language-features/package.i18n.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Markdown 언어 기능",
-	"description": "Markdown에 대한 다양한 언어 지원을 제공합니다.",
-	"markdown.preview.breaks.desc": "마크다운 미리 보기에서 줄바꿈 렌더링 방식을 설정합니다. 'true'로 설정하면 모든 행에 대해 <br>이(가) 생성됩니다.",
-	"markdown.preview.linkify": "Markdown 미리 보기에서 URL 같은 텍스트를 링크로 변환을 사용하거나 사용하지 않도록 설정합니다.",
-	"markdown.preview.doubleClickToSwitchToEditor.desc": "markdown 미리 보기에서 두 번 클릭하여 편집기로 전환합니다.",
-	"markdown.preview.fontFamily.desc": "markdown 미리 보기에서 사용되는 글꼴 패밀리를 제어합니다.",
-	"markdown.preview.fontSize.desc": "markdown 미리 보기에서 사용되는 글꼴 크기(픽셀)를 제어합니다.",
-	"markdown.preview.lineHeight.desc": "markdown 미리 보기에 사용되는 줄 높이를 제어합니다. 이 숫자는 글꼴 크기에 상대적입니다.",
-	"markdown.preview.markEditorSelection.desc": "markdown 미리 보기에 현재 편집기 선택을 표시합니다.",
-	"markdown.preview.scrollEditorWithPreview.desc": "Markdown 미리 보기를 스크롤할 때 편집기의 보기를 업데이트합니다.",
-	"markdown.preview.scrollPreviewWithEditor.desc": "Markdown 편집기를 스크롤할 때 미리 보기의 보기를 업데이트합니다.",
-	"markdown.preview.scrollPreviewWithEditorSelection.desc": "[사용되지 않음] markdown 미리 보기를 스크롤하여 편집기에서 현재 선택한 줄을 표시합니다.",
-	"markdown.preview.scrollPreviewWithEditorSelection.deprecationMessage": "이 설정은 'markdown.preview.scrollPreviewWithEditor'로 대체되었으며 더 이상 영향을 주지 않습니다.",
-	"markdown.preview.title": "미리 보기 열기",
-	"markdown.previewFrontMatter.dec": "markdown 미리 보기에서 YAML 전문을 렌더링할 방법을 설정합니다. '숨기기' 기능을 사용하면 전문이 제거되고, 그러지 않으면 전문이 markdown 콘텐츠로 처리됩니다.",
-	"markdown.previewSide.title": "측면에서 미리 보기 열기",
-	"markdown.showLockedPreviewToSide.title": "측면에서 잠긴 미리 보기 열기",
-	"markdown.showSource.title": "소스 표시",
-	"markdown.styles.dec": "markdown 미리 보기에서 사용할 CSS 스타일시트의 URL 또는 로컬 경로 목록입니다. 상대 경로는 탐색기에서 열린 폴더를 기준으로 해석됩니다. 열린 폴더가 없으면 markdown 파일의 위치를 기준으로 해석됩니다. 모든 '\\'는 '\\\\'로 써야 합니다.",
-	"markdown.showPreviewSecuritySelector.title": "미리 보기 보안 설정 변경",
-	"markdown.trace.desc": "Markdown 확장에 대해 디버그 로깅을 사용하도록 설정합니다.",
-	"markdown.preview.refresh.title": "미리 보기 새로 고침",
-	"markdown.preview.toggleLock.title": "미리 보기 잠금 설정/해제"
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/markdown/out/commands.i18n.json b/i18n/kor/extensions/markdown/out/commands.i18n.json
deleted file mode 100644
index aea09e921f6..00000000000
--- a/i18n/kor/extensions/markdown/out/commands.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"previewTitle": "{0} 미리 보기",
-	"onPreviewStyleLoadError": "'markdown.styles': {0}을 불러올 수 없음"
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/markdown/out/commands/onPreviewStyleLoadError.i18n.json b/i18n/kor/extensions/markdown/out/commands/onPreviewStyleLoadError.i18n.json
deleted file mode 100644
index 84643755d0a..00000000000
--- a/i18n/kor/extensions/markdown/out/commands/onPreviewStyleLoadError.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"onPreviewStyleLoadError": "'markdown.styles': {0}을 불러올 수 없음"
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/markdown/out/extension.i18n.json b/i18n/kor/extensions/markdown/out/extension.i18n.json
deleted file mode 100644
index 81729088db3..00000000000
--- a/i18n/kor/extensions/markdown/out/extension.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"onPreviewStyleLoadError": "'markdown.styles': {0}을 불러올 수 없음",
-	"previewTitle": "{0} 미리 보기"
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/markdown/out/features/preview.i18n.json b/i18n/kor/extensions/markdown/out/features/preview.i18n.json
deleted file mode 100644
index 4bc763aedcc..00000000000
--- a/i18n/kor/extensions/markdown/out/features/preview.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"lockedPreviewTitle": "[미리 보기] {0}",
-	"previewTitle": "미리 보기 {0}"
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/markdown/out/features/previewContentProvider.i18n.json b/i18n/kor/extensions/markdown/out/features/previewContentProvider.i18n.json
deleted file mode 100644
index 01370fa604b..00000000000
--- a/i18n/kor/extensions/markdown/out/features/previewContentProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"preview.securityMessage.text": "이 문서에서 일부 콘텐츠가 사용하지 않도록 설정되었습니다.",
-	"preview.securityMessage.title": "Markdown 미리 보기에서 잠재적으로 안전하지 않거나 보안되지 않은 콘텐츠가 사용하지 않도록 설정되어 있습니다. 이 콘텐츠나 스크립트를 허용하려면 Markdown 미리 보기 보안 설정을 변경하세요.",
-	"preview.securityMessage.label": "콘텐츠 사용할 수 없음 보안 경고"
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/markdown/out/previewContentProvider.i18n.json b/i18n/kor/extensions/markdown/out/previewContentProvider.i18n.json
deleted file mode 100644
index 966b7d5fad1..00000000000
--- a/i18n/kor/extensions/markdown/out/previewContentProvider.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"preview.securityMessage.text": "이 문서에서 일부 콘텐츠가 사용하지 않도록 설정되었습니다.",
-	"preview.securityMessage.title": "Markdown 미리 보기에서 잠재적으로 안전하지 않거나 보안되지 않은 콘텐츠가 사용하지 않도록 설정되어 있습니다. 이 콘텐츠나 스크립트를 허용하려면 Markdown 미리 보기 보안 설정을 변경하세요.",
-	"preview.securityMessage.label": "콘텐츠 사용할 수 없음 보안 경고"
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/markdown/out/security.i18n.json b/i18n/kor/extensions/markdown/out/security.i18n.json
deleted file mode 100644
index b7fd641e493..00000000000
--- a/i18n/kor/extensions/markdown/out/security.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"strict.title": "Strict",
-	"strict.description": "보안 콘텐츠만 로드",
-	"insecureContent.title": "안전하지 않은 콘텐츠 허용",
-	"insecureContent.description": "http를 통한 콘텐츠 로드 사용",
-	"disable.title": "사용 안 함",
-	"disable.description": "모든 콘텐츠 및 스크립트 실행을 허용합니다. 권장하지 않습니다.",
-	"moreInfo.title": "추가 정보",
-	"enableSecurityWarning.title": "이 작업 영역에서 미리 보기 보안 경고 사용",
-	"disableSecurityWarning.title": "이 작업 영역에서 미리보기 보안 경고 사용 안 함",
-	"toggleSecurityWarning.description": "콘텐츠 보안 수준에 영향을 주지 않습니다.",
-	"preview.showPreviewSecuritySelector.title": "이 작업 영역에 대해 Markdown 미리 보기의 보안 설정 선택"
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/markdown/package.i18n.json b/i18n/kor/extensions/markdown/package.i18n.json
deleted file mode 100644
index 83878314ebe..00000000000
--- a/i18n/kor/extensions/markdown/package.i18n.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Markdown 언어 기능",
-	"description": "Markdown에 대한 다양한 언어 지원을 제공합니다.",
-	"markdown.preview.breaks.desc": "마크다운 미리 보기에서 줄바꿈 렌더링 방식을 설정합니다. 'true'로 설정하면 모든 행에 대해 <br>이(가) 생성됩니다.",
-	"markdown.preview.linkify": "Markdown 미리 보기에서 URL 같은 텍스트를 링크로 변환을 사용하거나 사용하지 않도록 설정합니다.",
-	"markdown.preview.doubleClickToSwitchToEditor.desc": "markdown 미리 보기에서 두 번 클릭하여 편집기로 전환합니다.",
-	"markdown.preview.fontFamily.desc": "markdown 미리 보기에서 사용되는 글꼴 패밀리를 제어합니다.",
-	"markdown.preview.fontSize.desc": "markdown 미리 보기에서 사용되는 글꼴 크기(픽셀)를 제어합니다.",
-	"markdown.preview.lineHeight.desc": "markdown 미리 보기에 사용되는 줄 높이를 제어합니다. 이 숫자는 글꼴 크기에 상대적입니다.",
-	"markdown.preview.markEditorSelection.desc": "markdown 미리 보기에 현재 편집기 선택을 표시합니다.",
-	"markdown.preview.scrollEditorWithPreview.desc": "Markdown 미리 보기를 스크롤할 때 편집기의 보기를 업데이트합니다.",
-	"markdown.preview.scrollPreviewWithEditor.desc": "Markdown 편집기를 스크롤할 때 미리 보기의 보기를 업데이트합니다.",
-	"markdown.preview.scrollPreviewWithEditorSelection.desc": "[사용되지 않음] markdown 미리 보기를 스크롤하여 편집기에서 현재 선택한 줄을 표시합니다.",
-	"markdown.preview.scrollPreviewWithEditorSelection.deprecationMessage": "이 설정은 'markdown.preview.scrollPreviewWithEditor'로 대체되었으며 더 이상 영향을 주지 않습니다.",
-	"markdown.preview.title": "미리 보기 열기",
-	"markdown.previewFrontMatter.dec": "markdown 미리 보기에서 YAML 전문을 렌더링할 방법을 설정합니다. '숨기기' 기능을 사용하면 전문이 제거되고, 그러지 않으면 전문이 markdown 콘텐츠로 처리됩니다.",
-	"markdown.previewSide.title": "측면에서 미리 보기 열기",
-	"markdown.showLockedPreviewToSide.title": "측면에서 잠긴 미리 보기 열기",
-	"markdown.showSource.title": "소스 표시",
-	"markdown.styles.dec": "markdown 미리 보기에서 사용할 CSS 스타일시트의 URL 또는 로컬 경로 목록입니다. 상대 경로는 탐색기에서 열린 폴더를 기준으로 해석됩니다. 열린 폴더가 없으면 markdown 파일의 위치를 기준으로 해석됩니다. 모든 '\\'는 '\\\\'로 써야 합니다.",
-	"markdown.showPreviewSecuritySelector.title": "미리 보기 보안 설정 변경",
-	"markdown.trace.desc": "Markdown 확장에 대해 디버그 로깅을 사용하도록 설정합니다.",
-	"markdown.preview.refresh.title": "미리 보기 새로 고침",
-	"markdown.preview.toggleLock.title": "미리 보기 잠금 설정/해제"
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/merge-conflict/out/codelensProvider.i18n.json b/i18n/kor/extensions/merge-conflict/out/codelensProvider.i18n.json
deleted file mode 100644
index 4bfb419b679..00000000000
--- a/i18n/kor/extensions/merge-conflict/out/codelensProvider.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"acceptCurrentChange": "현재 변경 사항 수락",
-	"acceptIncomingChange": "수신 변경 사항 수락",
-	"acceptBothChanges": "두 변경 사항 모두 수락",
-	"compareChanges": "변경 사항 비교"
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/merge-conflict/out/commandHandler.i18n.json b/i18n/kor/extensions/merge-conflict/out/commandHandler.i18n.json
deleted file mode 100644
index 90edd092445..00000000000
--- a/i18n/kor/extensions/merge-conflict/out/commandHandler.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"cursorNotInConflict": "편집기 커서가 병합 충돌 내에 없음",
-	"compareChangesTitle": "{0}: 현재 변경 사항 ⟷ 수신 변경 사항",
-	"cursorOnCommonAncestorsRange": "편집기 커서가 공통 과거 블록 내에 있습니다. \"현재\" 또는 \"수신\" 블록으로 옮기세요.",
-	"cursorOnSplitterRange": "편집기 커서가 병합 충돌 스플리터 내에 있습니다. \"현재\" 또는 \"수신\" 블록으로 옮기세요.",
-	"noConflicts": "이 파일에서 발견된 병합 충돌 없음",
-	"noOtherConflictsInThisFile": "이 파일 내에 다른 병합 충돌 없음"
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/merge-conflict/out/mergeDecorator.i18n.json b/i18n/kor/extensions/merge-conflict/out/mergeDecorator.i18n.json
deleted file mode 100644
index 8d91980beaa..00000000000
--- a/i18n/kor/extensions/merge-conflict/out/mergeDecorator.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"currentChange": "(현재 변경 사항)",
-	"incomingChange": "(수신 변경 사항)"
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/merge-conflict/package.i18n.json b/i18n/kor/extensions/merge-conflict/package.i18n.json
deleted file mode 100644
index 985040d350c..00000000000
--- a/i18n/kor/extensions/merge-conflict/package.i18n.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "충돌 병합",
-	"description": "인라인 병합 충돌에 대한 강조 표시 및 명령입니다.",
-	"command.category": "충돌 병합",
-	"command.accept.all-current": "모든 현재 사항 수락",
-	"command.accept.all-incoming": "수신 모두 수락",
-	"command.accept.all-both": "둘 다 모두 수락",
-	"command.accept.current": "현재 수락",
-	"command.accept.incoming": "수신 수락",
-	"command.accept.selection": "선택 수락",
-	"command.accept.both": "둘 다 수락",
-	"command.next": "다음 충돌",
-	"command.previous": "이전 충돌",
-	"command.compare": "현재 충돌 비교",
-	"config.title": "충돌 병합",
-	"config.codeLensEnabled": "편집기 내에서 충돌 블록 CodeLense 병합 사용/사용 안 함",
-	"config.decoratorsEnabled": "편집기 내에서 충돌 병합 사용/사용 안 함"
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/npm/out/features/bowerJSONContribution.i18n.json b/i18n/kor/extensions/npm/out/features/bowerJSONContribution.i18n.json
deleted file mode 100644
index 031b105146a..00000000000
--- a/i18n/kor/extensions/npm/out/features/bowerJSONContribution.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"json.bower.default": "기본 bower.json",
-	"json.bower.error.repoaccess": "Bower 리포지토리 요청 실패: {0}",
-	"json.bower.latest.version": "최신"
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/npm/out/features/packageJSONContribution.i18n.json b/i18n/kor/extensions/npm/out/features/packageJSONContribution.i18n.json
deleted file mode 100644
index 3170baac559..00000000000
--- a/i18n/kor/extensions/npm/out/features/packageJSONContribution.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"json.package.default": "기본 package.json",
-	"json.npm.error.repoaccess": "NPM 리포지토리 요청 실패: {0}",
-	"json.npm.latestversion": "패키지의 현재 최신 버전",
-	"json.npm.majorversion": "최신 주 버전(1.x.x)을 일치시킵니다.",
-	"json.npm.minorversion": "최신 부 버전(1.2.x)을 일치시킵니다.",
-	"json.npm.version.hover": "최신 버전: {0}"
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/npm/out/main.i18n.json b/i18n/kor/extensions/npm/out/main.i18n.json
deleted file mode 100644
index c60d6694a03..00000000000
--- a/i18n/kor/extensions/npm/out/main.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"npm.parseError": "Npm 작업 검색: {0} 파일을 구문 분석하지 못했습니다. "
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/npm/out/npmView.i18n.json b/i18n/kor/extensions/npm/out/npmView.i18n.json
deleted file mode 100644
index 1f8713e1e46..00000000000
--- a/i18n/kor/extensions/npm/out/npmView.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noScripts": "스크립트를 찾을 수 없음",
-	"noDebugOptions": "스크립트에 노드 디버그 옵션(예: '--inspect-brk')이 없으므로 디버깅에 사용할 \"{0}\"을(를) 시작할 수 없습니다.",
-	"learnMore": "자세한 정보",
-	"ok": "확인",
-	"scriptInvalid": "\"{0}\" 스크립트를 찾을 수 없습니다. 뷰로 새로 고쳐 보세요."
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/npm/out/tasks.i18n.json b/i18n/kor/extensions/npm/out/tasks.i18n.json
deleted file mode 100644
index c60d6694a03..00000000000
--- a/i18n/kor/extensions/npm/out/tasks.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"npm.parseError": "Npm 작업 검색: {0} 파일을 구문 분석하지 못했습니다. "
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/npm/package.i18n.json b/i18n/kor/extensions/npm/package.i18n.json
deleted file mode 100644
index b762a88ac6b..00000000000
--- a/i18n/kor/extensions/npm/package.i18n.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"description": "npm 스크립트에 대한 작업 지원을 추가할 확장입니다.",
-	"displayName": "VSCode에 대한 Npm 지원",
-	"config.npm.autoDetect": "npm 스크립트에 대한 자동 검색 여부를 설정합니다. 기본값은 [켜기]입니다.",
-	"config.npm.runSilent": " `--silent` 옵션으로 npm 명령 실행.",
-	"config.npm.packageManager": "스크립트를 실행하는 데 사용하는 패키지 관리자.",
-	"config.npm.exclude": "자동 스크립트 검색에서 제외할 폴더에 대한 Glob 패턴을 구성합니다.",
-	"config.npm.enableScriptExplorer": "npm 스크립트에 대한 탐색기 뷰를 사용하도록 설정합니다.",
-	"config.npm.scriptExplorerAction": "스크립트 탐색기에서 사용되는 기본 클릭 동작으로 '열기' 또는 '실행'이며, 기본값은 '열기'입니다.",
-	"npm.parseError": "Npm 작업 검색: {0} 파일을 구문 분석하지 못했습니다.",
-	"taskdef.script": "사용자 지정할 npm 스크립트입니다.",
-	"taskdef.path": "스크립트를 제공하는 package.json 파일의 폴더 경로이며 생략할 수 있습니다.",
-	"view.name": "Npm 스크립트",
-	"command.refresh": "새로 고침",
-	"command.run": "실행",
-	"command.debug": "디버그",
-	"command.openScript": "열기",
-	"command.runInstall": "설치 실행"
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/objective-c/package.i18n.json b/i18n/kor/extensions/objective-c/package.i18n.json
deleted file mode 100644
index 14efc920b26..00000000000
--- a/i18n/kor/extensions/objective-c/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Objective-C 언어 기본",
-	"description": "Objective-C 파일에서 구문 강조 표시 및 괄호 일치를 제공합니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/package-json/out/features/bowerJSONContribution.i18n.json b/i18n/kor/extensions/package-json/out/features/bowerJSONContribution.i18n.json
deleted file mode 100644
index 031b105146a..00000000000
--- a/i18n/kor/extensions/package-json/out/features/bowerJSONContribution.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"json.bower.default": "기본 bower.json",
-	"json.bower.error.repoaccess": "Bower 리포지토리 요청 실패: {0}",
-	"json.bower.latest.version": "최신"
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/package-json/out/features/packageJSONContribution.i18n.json b/i18n/kor/extensions/package-json/out/features/packageJSONContribution.i18n.json
deleted file mode 100644
index 3170baac559..00000000000
--- a/i18n/kor/extensions/package-json/out/features/packageJSONContribution.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"json.package.default": "기본 package.json",
-	"json.npm.error.repoaccess": "NPM 리포지토리 요청 실패: {0}",
-	"json.npm.latestversion": "패키지의 현재 최신 버전",
-	"json.npm.majorversion": "최신 주 버전(1.x.x)을 일치시킵니다.",
-	"json.npm.minorversion": "최신 부 버전(1.2.x)을 일치시킵니다.",
-	"json.npm.version.hover": "최신 버전: {0}"
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/package-json/package.i18n.json b/i18n/kor/extensions/package-json/package.i18n.json
deleted file mode 100644
index 35229bd6699..00000000000
--- a/i18n/kor/extensions/package-json/package.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	]
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/perl/package.i18n.json b/i18n/kor/extensions/perl/package.i18n.json
deleted file mode 100644
index a03b504e172..00000000000
--- a/i18n/kor/extensions/perl/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Perl 언어 기본",
-	"description": "Perl 파일에서 구문 강조 표시 및 괄호 일치를 제공합니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/php-language-features/out/features/validationProvider.i18n.json b/i18n/kor/extensions/php-language-features/out/features/validationProvider.i18n.json
deleted file mode 100644
index e88d0e75520..00000000000
--- a/i18n/kor/extensions/php-language-features/out/features/validationProvider.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"php.useExecutablePath": "PHP 파일을 lint하기 위해 {0}(작업 영역 설정으로 정의됨)의 실행을 허용하시겠습니까?",
-	"php.yes": "허용",
-	"php.no": "허용 안 함",
-	"wrongExecutable": "{0}은(는) 유효한 PHP 실행 파일이 아니기 때문에 유효성을 검사할 수 없습니다. 'php.validate.executablePath' 설정을 사용하여 PHP 실행 파일을 구성하세요.",
-	"noExecutable": "PHP 실행 파일이 설정되지 않았기 때문에 유효성을 검사할 수 없습니다. 'php.validate.executablePath' 설정을 사용하여 PHP 실행 파일을 구성하세요.",
-	"unknownReason": "{0} 경로를 사용하여 php를 실행하지 못했습니다. 이유를 알 수 없습니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/php-language-features/package.i18n.json b/i18n/kor/extensions/php-language-features/package.i18n.json
deleted file mode 100644
index 462c5348bcc..00000000000
--- a/i18n/kor/extensions/php-language-features/package.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"configuration.suggest.basic": "기본 제공 PHP 언어 제안을 사용하는지 여부를 구성합니다. 지원에서는 PHP 전역 및 변수를 제안합니다.",
-	"configuration.validate.enable": "기본 제공 PHP 유효성 검사를 사용하거나 사용하지 않습니다.",
-	"configuration.validate.executablePath": "PHP 실행 파일을 가리킵니다.",
-	"configuration.validate.run": "저장 시 또는 입력 시 Linter의 실행 여부입니다.",
-	"configuration.title": "PHP",
-	"commands.categroy.php": "PHP",
-	"command.untrustValidationExecutable": "PHP 유효성 검사 실행 파일을 허용하지 않음(작업\n 영역 설정으로 정의됨)",
-	"displayName": "PHP 언어 기능",
-	"description": "PHP 파일에 대한 다양한 언어 지원을 제공합니다. "
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/php/out/features/validationProvider.i18n.json b/i18n/kor/extensions/php/out/features/validationProvider.i18n.json
deleted file mode 100644
index e88d0e75520..00000000000
--- a/i18n/kor/extensions/php/out/features/validationProvider.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"php.useExecutablePath": "PHP 파일을 lint하기 위해 {0}(작업 영역 설정으로 정의됨)의 실행을 허용하시겠습니까?",
-	"php.yes": "허용",
-	"php.no": "허용 안 함",
-	"wrongExecutable": "{0}은(는) 유효한 PHP 실행 파일이 아니기 때문에 유효성을 검사할 수 없습니다. 'php.validate.executablePath' 설정을 사용하여 PHP 실행 파일을 구성하세요.",
-	"noExecutable": "PHP 실행 파일이 설정되지 않았기 때문에 유효성을 검사할 수 없습니다. 'php.validate.executablePath' 설정을 사용하여 PHP 실행 파일을 구성하세요.",
-	"unknownReason": "{0} 경로를 사용하여 php를 실행하지 못했습니다. 이유를 알 수 없습니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/php/package.i18n.json b/i18n/kor/extensions/php/package.i18n.json
deleted file mode 100644
index ad3f734a9df..00000000000
--- a/i18n/kor/extensions/php/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "PHP 언어 기본",
-	"description": "PHP 파일에서 구문 강조 표시 및 괄호 일치를 제공합니다. "
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/powershell/package.i18n.json b/i18n/kor/extensions/powershell/package.i18n.json
deleted file mode 100644
index 1409ac14cc0..00000000000
--- a/i18n/kor/extensions/powershell/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Powershell 언어 기본",
-	"description": "Powershell 파일에서 코드 조각, 구문 강조 표시, 괄호 일치 및 접기를 제공합니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/pug/package.i18n.json b/i18n/kor/extensions/pug/package.i18n.json
deleted file mode 100644
index 84c8811d1a5..00000000000
--- a/i18n/kor/extensions/pug/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Pug 언어 기본",
-	"description": "Pug 파일에서 구문 강조 표시 및 괄호 일치를 제공합니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/python/package.i18n.json b/i18n/kor/extensions/python/package.i18n.json
deleted file mode 100644
index a79c41da463..00000000000
--- a/i18n/kor/extensions/python/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Python 언어 기본",
-	"description": "Python 파일에서 구문 강조 표시, 괄호 일치 및 접기를 제공합니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/r/package.i18n.json b/i18n/kor/extensions/r/package.i18n.json
deleted file mode 100644
index ef3edc28ff9..00000000000
--- a/i18n/kor/extensions/r/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "R 언어 기본",
-	"description": "R 파일에서 구문 강조 표시 및 괄호 일치를 제공합니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/razor/package.i18n.json b/i18n/kor/extensions/razor/package.i18n.json
deleted file mode 100644
index 1a9a5fa9eb9..00000000000
--- a/i18n/kor/extensions/razor/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Razor 언어 기본",
-	"description": "Razor 파일에서 구문 강조 표시, 괄호 일치 및 접기를 제공합니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/ruby/package.i18n.json b/i18n/kor/extensions/ruby/package.i18n.json
deleted file mode 100644
index 28bde264ce0..00000000000
--- a/i18n/kor/extensions/ruby/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Ruby 언어 기본",
-	"description": "Ruby 파일에서 구문 강조 표시 및 괄호 일치를 제공합니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/rust/package.i18n.json b/i18n/kor/extensions/rust/package.i18n.json
deleted file mode 100644
index 3cb992e7532..00000000000
--- a/i18n/kor/extensions/rust/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Rust 언어 기본",
-	"description": "Rust 파일에서 구문 강조 표시 및 괄호 일치를 제공합니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/scss/package.i18n.json b/i18n/kor/extensions/scss/package.i18n.json
deleted file mode 100644
index 8a78efd1104..00000000000
--- a/i18n/kor/extensions/scss/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "SCSS 언어 기본",
-	"description": "SCSS 파일에서 구문 강조 표시, 괄호 일치 및 접기를 제공합니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/search-rg/package.i18n.json b/i18n/kor/extensions/search-rg/package.i18n.json
deleted file mode 100644
index 244c93586d1..00000000000
--- a/i18n/kor/extensions/search-rg/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "검색(ripgrep)",
-	"description": "Ripgrep을 사용하여 검색을 제공합니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/shaderlab/package.i18n.json b/i18n/kor/extensions/shaderlab/package.i18n.json
deleted file mode 100644
index 68f64006d01..00000000000
--- a/i18n/kor/extensions/shaderlab/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Shaderlab 언어 기본",
-	"description": "Shaderlab 파일에서 구문 강조 표시 및 괄호 일치를 제공합니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/shellscript/package.i18n.json b/i18n/kor/extensions/shellscript/package.i18n.json
deleted file mode 100644
index a37f353d0f0..00000000000
--- a/i18n/kor/extensions/shellscript/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "셸 스크립트 언어 기본",
-	"description": "셸 스크립트 파일에서 구문 강조 표시 및 괄호 일치를 제공합니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/sql/package.i18n.json b/i18n/kor/extensions/sql/package.i18n.json
deleted file mode 100644
index cce5044673e..00000000000
--- a/i18n/kor/extensions/sql/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "SQL 언어 기본",
-	"description": "SQL 파일에서 구문 강조 표시 및 괄호 일치를 제공합니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/swift/package.i18n.json b/i18n/kor/extensions/swift/package.i18n.json
deleted file mode 100644
index 0e54ebd4fe1..00000000000
--- a/i18n/kor/extensions/swift/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Swift 언어 기본",
-	"description": "Swift 파일에서 코드 조각, 구문 강조 표시 및 괄호 일치를 제공합니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/theme-abyss/package.i18n.json b/i18n/kor/extensions/theme-abyss/package.i18n.json
deleted file mode 100644
index 057f2aebc15..00000000000
--- a/i18n/kor/extensions/theme-abyss/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "심해 테마",
-	"description": "Visual Studio Code용 심해 테마"
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/theme-defaults/package.i18n.json b/i18n/kor/extensions/theme-defaults/package.i18n.json
deleted file mode 100644
index 5c95bc43467..00000000000
--- a/i18n/kor/extensions/theme-defaults/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "기본 테마",
-	"description": "기본 밝은 테마 및 어두운 테마(Plus 및 Visual Studio)"
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/theme-kimbie-dark/package.i18n.json b/i18n/kor/extensions/theme-kimbie-dark/package.i18n.json
deleted file mode 100644
index 78c4bc42135..00000000000
--- a/i18n/kor/extensions/theme-kimbie-dark/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Kimbie 어두운 테마",
-	"description": "Visual Studio Code용 Kimbie 어두운 테마"
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/theme-monokai-dimmed/package.i18n.json b/i18n/kor/extensions/theme-monokai-dimmed/package.i18n.json
deleted file mode 100644
index 62e85004bcb..00000000000
--- a/i18n/kor/extensions/theme-monokai-dimmed/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Monokai 흐릿한 테마",
-	"description": "Visual Studio Code용 Monokai 흐릿한 테마"
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/theme-monokai/package.i18n.json b/i18n/kor/extensions/theme-monokai/package.i18n.json
deleted file mode 100644
index 139771985aa..00000000000
--- a/i18n/kor/extensions/theme-monokai/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Monokai 테마",
-	"description": "Visual Studio Code용 Monokai 테마"
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/theme-quietlight/package.i18n.json b/i18n/kor/extensions/theme-quietlight/package.i18n.json
deleted file mode 100644
index fb185e0937e..00000000000
--- a/i18n/kor/extensions/theme-quietlight/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "고요한 밝은 테마",
-	"description": "Visual Studio Code용 고요한 밝은 테마"
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/theme-red/package.i18n.json b/i18n/kor/extensions/theme-red/package.i18n.json
deleted file mode 100644
index 84575aaef82..00000000000
--- a/i18n/kor/extensions/theme-red/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "빨간색 테마",
-	"description": "Visual Studio Code용 빨간색 테마"
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/theme-seti/package.i18n.json b/i18n/kor/extensions/theme-seti/package.i18n.json
deleted file mode 100644
index a4e61f7e692..00000000000
--- a/i18n/kor/extensions/theme-seti/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Seti 파일 아이콘 테마",
-	"description": "Seti UI 파일 아이콘으로 만든 파일 아이콘 테마"
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/theme-solarized-dark/package.i18n.json b/i18n/kor/extensions/theme-solarized-dark/package.i18n.json
deleted file mode 100644
index f56c00a6e58..00000000000
--- a/i18n/kor/extensions/theme-solarized-dark/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "노출 어두운 테마",
-	"description": "Visual Studio Code용 노출 어두운 테마"
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/theme-solarized-light/package.i18n.json b/i18n/kor/extensions/theme-solarized-light/package.i18n.json
deleted file mode 100644
index e00699da953..00000000000
--- a/i18n/kor/extensions/theme-solarized-light/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "노출 밝은 테마",
-	"description": "Visual Studio Code용 노출 밝은 테마"
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/theme-tomorrow-night-blue/package.i18n.json b/i18n/kor/extensions/theme-tomorrow-night-blue/package.i18n.json
deleted file mode 100644
index c9ef329c54b..00000000000
--- a/i18n/kor/extensions/theme-tomorrow-night-blue/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "내일 밤 파란색 테마",
-	"description": "Visual Studio Code용 내일 밤 파란색 테마"
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/typescript-basics/package.i18n.json b/i18n/kor/extensions/typescript-basics/package.i18n.json
deleted file mode 100644
index 61b1b8c55e9..00000000000
--- a/i18n/kor/extensions/typescript-basics/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "TypeScript 언어 기본 사항",
-	"description": "TypeScript 파일에서 코드 조각, 구문 강조 표시, 괄호 일치 및 접기를 제공합니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/typescript-language-features/out/commands.i18n.json b/i18n/kor/extensions/typescript-language-features/out/commands.i18n.json
deleted file mode 100644
index dd43847bd6e..00000000000
--- a/i18n/kor/extensions/typescript-language-features/out/commands.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"typescript.projectConfigNoWorkspace": "TypeScript 또는 JavaScript 프로젝트를 사용하려면 VS Code의 폴더를 여세요.",
-	"typescript.projectConfigUnsupportedFile": "TypeScript 또는 JavaScript 프로젝트를 확인할 수 없습니다. 지원되지 않는 파일 형식",
-	"typescript.projectConfigCouldNotGetInfo": "TypeScript 또는 JavaScript 프로젝트를 확인할 수 없습니다.",
-	"typescript.noTypeScriptProjectConfig": "파일이 TypeScript 프로젝트의 일부가 아닙니다. 자세히 알아보려면 [여기]({0})를 클릭하세요.",
-	"typescript.noJavaScriptProjectConfig": "파일이 JavaScript 프로젝트의 일부가 아닙니다. 자세히 알아보려면 [여기]({0})를 클릭하세요.",
-	"typescript.configureTsconfigQuickPick": "tsconfig.json 구성",
-	"typescript.configureJsconfigQuickPick": "jsconfig.json 구성"
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/typescript-language-features/out/features/completionItemProvider.i18n.json b/i18n/kor/extensions/typescript-language-features/out/features/completionItemProvider.i18n.json
deleted file mode 100644
index 65d840cf0b5..00000000000
--- a/i18n/kor/extensions/typescript-language-features/out/features/completionItemProvider.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"selectCodeAction": "적용할 코드 동작 선택",
-	"acquiringTypingsLabel": "typings를 가져오는 중...",
-	"acquiringTypingsDetail": "IntelliSense에 대한 typings 정의를 가져오는 중입니다.",
-	"autoImportLabel": "{0}에서 자동으로 가져오기"
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/typescript-language-features/out/features/directiveCommentCompletionProvider.i18n.json b/i18n/kor/extensions/typescript-language-features/out/features/directiveCommentCompletionProvider.i18n.json
deleted file mode 100644
index 365792bc459..00000000000
--- a/i18n/kor/extensions/typescript-language-features/out/features/directiveCommentCompletionProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"ts-check": "JavaScript 파일에서 의미 검사를 사용합니다. 파일의 최상단에 있어야 합니다.",
-	"ts-nocheck": "JavaScript 파일에서 의미 검사를 사용하지 않습니다. 파일의 최상단에 있어야 합니다.",
-	"ts-ignore": "파일의 다음 행에서 @ts-check 오류를 억제합니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/typescript-language-features/out/features/implementationsCodeLensProvider.i18n.json b/i18n/kor/extensions/typescript-language-features/out/features/implementationsCodeLensProvider.i18n.json
deleted file mode 100644
index 272312dad8e..00000000000
--- a/i18n/kor/extensions/typescript-language-features/out/features/implementationsCodeLensProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"oneImplementationLabel": "1개 구현",
-	"manyImplementationLabel": "{0}개 구현",
-	"implementationsErrorLabel": "구현을 확인할 수 없음"
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/typescript-language-features/out/features/jsDocCompletionProvider.i18n.json b/i18n/kor/extensions/typescript-language-features/out/features/jsDocCompletionProvider.i18n.json
deleted file mode 100644
index de5777d4c7a..00000000000
--- a/i18n/kor/extensions/typescript-language-features/out/features/jsDocCompletionProvider.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"typescript.jsDocCompletionItem.documentation": "JSDoc 주석"
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/typescript-language-features/out/features/organizeImports.i18n.json b/i18n/kor/extensions/typescript-language-features/out/features/organizeImports.i18n.json
deleted file mode 100644
index 86003226d94..00000000000
--- a/i18n/kor/extensions/typescript-language-features/out/features/organizeImports.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"oraganizeImportsAction.title": "가져오기 구성"
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/typescript-language-features/out/features/quickFixProvider.i18n.json b/i18n/kor/extensions/typescript-language-features/out/features/quickFixProvider.i18n.json
deleted file mode 100644
index b91c84de957..00000000000
--- a/i18n/kor/extensions/typescript-language-features/out/features/quickFixProvider.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"fixAllInFileLabel": "{0} (파일에서 모두 수정)"
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/typescript-language-features/out/features/referencesCodeLensProvider.i18n.json b/i18n/kor/extensions/typescript-language-features/out/features/referencesCodeLensProvider.i18n.json
deleted file mode 100644
index 69609e31fcb..00000000000
--- a/i18n/kor/extensions/typescript-language-features/out/features/referencesCodeLensProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"oneReferenceLabel": "참조 1개",
-	"manyReferenceLabel": "참조 {0}개",
-	"referenceErrorLabel": "참조를 확인할 수 없음"
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/typescript-language-features/out/features/taskProvider.i18n.json b/i18n/kor/extensions/typescript-language-features/out/features/taskProvider.i18n.json
deleted file mode 100644
index 6982eedcfd9..00000000000
--- a/i18n/kor/extensions/typescript-language-features/out/features/taskProvider.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"buildTscLabel": "빌드 - {0}",
-	"buildAndWatchTscLabel": "보기 - {0}"
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/typescript-language-features/out/features/updatePathsOnRename.i18n.json b/i18n/kor/extensions/typescript-language-features/out/features/updatePathsOnRename.i18n.json
deleted file mode 100644
index f9ea82243d8..00000000000
--- a/i18n/kor/extensions/typescript-language-features/out/features/updatePathsOnRename.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"prompt": "이동된 파일 '{0}'에 대한 가져오기를 가종으로 업데이트하시겠습니까?",
-	"reject.title": "아니요",
-	"accept.title": "예",
-	"always.title": "예, 가져오기 항상 업데이트",
-	"never.title": "아니요, 가져오기 업데이트 안 함"
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/typescript-language-features/out/typescriptServiceClient.i18n.json b/i18n/kor/extensions/typescript-language-features/out/typescriptServiceClient.i18n.json
deleted file mode 100644
index 3f50eeec8ab..00000000000
--- a/i18n/kor/extensions/typescript-language-features/out/typescriptServiceClient.i18n.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noServerFound": "경로 {0}이(가) 올바른 tsserver 설치를 가리키지 않습니다. 포함된 TypeScript 버전을 대신 사용합니다.",
-	"serverCouldNotBeStarted": "TypeScript 언어 서버를 시작할 수 없습니다. 오류 메시지: {0}",
-	"typescript.openTsServerLog.notSupported": "TS 서버 로깅을 사용하려면 TS 2.2.2 이상이 필요합니다.",
-	"typescript.openTsServerLog.loggingNotEnabled": "TS 서버 로깅이 꺼져 있습니다. `typescript.tsserver.log`를 설정하고 TS 서버를 다시 시작하여 로깅을 사용하도록 설정하세요.",
-	"typescript.openTsServerLog.enableAndReloadOption": "로깅 사용 및 TS 서버 다시 시작",
-	"typescript.openTsServerLog.noLogFile": "TS 서버에서 로깅을 시작하지 않았습니다.",
-	"openTsServerLog.openFileFailedFailed": "TS 서버 로그 파일을 열 수 없습니다.",
-	"serverDiedAfterStart": "TypeScript 언어 서비스가 시작된 직후 5번 종료되었습니다. 서비스가 다시 시작되지 않습니다.",
-	"serverDiedReportIssue": "문제 보고",
-	"serverDied": "TypeScript 언어 서비스가 지난 5분 동안 예기치 않게 5번 종료되었습니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/typescript-language-features/out/utils/api.i18n.json b/i18n/kor/extensions/typescript-language-features/out/utils/api.i18n.json
deleted file mode 100644
index f57994230cb..00000000000
--- a/i18n/kor/extensions/typescript-language-features/out/utils/api.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"invalidVersion": "잘못된 버전"
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/typescript-language-features/out/utils/logger.i18n.json b/i18n/kor/extensions/typescript-language-features/out/utils/logger.i18n.json
deleted file mode 100644
index 8f5ef5415b9..00000000000
--- a/i18n/kor/extensions/typescript-language-features/out/utils/logger.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"channelName": "TypeScript"
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/typescript-language-features/out/utils/projectStatus.i18n.json b/i18n/kor/extensions/typescript-language-features/out/utils/projectStatus.i18n.json
deleted file mode 100644
index 49fa81ab46e..00000000000
--- a/i18n/kor/extensions/typescript-language-features/out/utils/projectStatus.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hintExclude": "프로젝트 전체에서 JavaScript/TypeScript 언어 기능을 사용하도록 설정하려면 {0}과(와) 같이 파일이 많은 폴더를 제외하세요.",
-	"hintExclude.generic": "프로젝트 전체에서 JavaScript/TypeScript 언어 기능을 사용하도록 설정하려면 사용하지 않는 소스 파일이 포함된 큰 폴더를 제외하세요.",
-	"large.label": "제외 구성",
-	"hintExclude.tooltip": "프로젝트 전체에서 JavaScript/TypeScript 언어 기능을 사용하도록 설정하려면 사용하지 않는 소스 파일이 포함된 큰 폴더를 제외하세요."
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/typescript-language-features/out/utils/typingsStatus.i18n.json b/i18n/kor/extensions/typescript-language-features/out/utils/typingsStatus.i18n.json
deleted file mode 100644
index 0fad82fa51a..00000000000
--- a/i18n/kor/extensions/typescript-language-features/out/utils/typingsStatus.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"installingPackages": "TypeScript IntelliSense를 향상하기 위해 데이터를 페치하는 중",
-	"typesInstallerInitializationFailed.title": "JavaScript 언어 기능에 대한 입력 파일을 설치할 수 없습니다. NPM이 설치되어 있는지 확인하거나 사용자 설정에서 'typescript.npm'을 구성하세요.  자세히 알아보려면 [여기]({0})를 클릭하세요.",
-	"typesInstallerInitializationFailed.doNotCheckAgain": "다시 표시 안 함"
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/typescript-language-features/out/utils/versionPicker.i18n.json b/i18n/kor/extensions/typescript-language-features/out/utils/versionPicker.i18n.json
deleted file mode 100644
index bdd4f232c51..00000000000
--- a/i18n/kor/extensions/typescript-language-features/out/utils/versionPicker.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"useVSCodeVersionOption": "VS Code의 버전 사용",
-	"useWorkspaceVersionOption": "작업 영역 버전 사용",
-	"learnMore": "자세한 정보",
-	"selectTsVersion": "JavaScript 및 TypeScript 언어 기능에 사용되는 TypeScript 버전 선택"
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/typescript-language-features/out/utils/versionProvider.i18n.json b/i18n/kor/extensions/typescript-language-features/out/utils/versionProvider.i18n.json
deleted file mode 100644
index 9a563329739..00000000000
--- a/i18n/kor/extensions/typescript-language-features/out/utils/versionProvider.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"couldNotLoadTsVersion": "이 경로에서 TypeScript 버전을 로드할 수 없습니다.",
-	"noBundledServerFound": "잘못 동작하는 바이러스 감지 도구와 같은 다른 응용 프로그램에서 VS Code의 tsserver가 삭제되었습니다. VS Code를 다시 설치하세요."
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/typescript-language-features/package.i18n.json b/i18n/kor/extensions/typescript-language-features/package.i18n.json
deleted file mode 100644
index 984ed51999a..00000000000
--- a/i18n/kor/extensions/typescript-language-features/package.i18n.json
+++ /dev/null
@@ -1,67 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "TypeScript 및 JavaScript 언어 기능",
-	"description": "JavaScript 및 TypeScript에 대한 다양한 언어 지원을 제공합니다.",
-	"reloadProjects.title": "프로젝트 다시 로드",
-	"configuration.typescript": "TypeScript",
-	"typescript.useCodeSnippetsOnMethodSuggest.dec": "매개 변수 서명으로 함수를 완료하세요.",
-	"typescript.tsdk.desc": "사용할 tsserver 및 lib*.d.ts 파일이 들어 있는 폴더 경로를 지정합니다.",
-	"typescript.disableAutomaticTypeAcquisition": "자동 형식 인식을 사용하지 않습니다. TypeScript >= 2.0.6이 필요합니다.",
-	"typescript.tsserver.log": "파일에 대해 TS 서버 로깅을 사용하도록 설정합니다. 이 로그는 TS 서버 문제를 진단하는 데 사용될 수 있습니다. 로그에는 파일 경로, 소스 코드 및 프로젝트에서 잠재적으로 중요한 기타 정보가 포함될 수 있습니다.",
-	"typescript.tsserver.pluginPaths": "Typescript 언어 서비스 플러그 인을 검색할 추가 경로입니다. TypeScript 2.3.0 이상이 필요합니다.",
-	"typescript.tsserver.pluginPaths.item": "절대 또는 상대 경로입니다. 상대 경로는 작업 영역 폴더를 기준으로 확인됩니다.",
-	"typescript.tsserver.trace": "TS 서버로 전송한 메시지 추적을 사용하도록 설정합니다. 이\n 추적은 TS 서버 문제를 진단하는 데 사용될 수 있습니다. 추적에는 파일 경로, 소스 코드 및 프로젝트에서 잠재적으로 중요한\n 기타 정보가 포함될 수 있습니다.",
-	"typescript.validate.enable": "TypeScript 유효성 검사를 사용하거나 사용하지 않습니다.",
-	"typescript.format.enable": "기본 TypeScript 포맷터를 사용하거나 사용하지 않습니다.",
-	"javascript.format.enable": "기본 JavaScript 포맷터를 사용하거나 사용하지 않습니다.",
-	"format.insertSpaceAfterCommaDelimiter": "쉼표 구분 기호 뒤에 오는 공백 처리를 정의합니다.",
-	"format.insertSpaceAfterConstructor": "컨스트럭터 키워드 뒤 공백 처리를 정의합니다. TypeScript >= 2.3.0이 필요합니다.",
-	"format.insertSpaceAfterSemicolonInForStatements": " for 문에서 세미콜론 뒤에 오는 공백 처리를 정의합니다.",
-	"format.insertSpaceBeforeAndAfterBinaryOperators": "이항 연산자 뒤에 오는 공백 처리를 정의합니다.",
-	"format.insertSpaceAfterKeywordsInControlFlowStatements": "제어 흐름 문의 키워드 뒤에 오는 공백 처리를 정의합니다.",
-	"format.insertSpaceAfterFunctionKeywordForAnonymousFunctions": "익명 함수의 function 키워드 뒤에 오는 공백 처리를 정의합니다.",
-	"format.insertSpaceBeforeFunctionParenthesis": "함수 인수 괄호 앞에 오는 공백 처리를 정의합니다. TypeScript 2.1.5 이상이 필요합니다.",
-	"format.insertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis": "비어 있지 않은 여는 괄호 뒤와 닫는 괄호 앞에 오는 공백 처리를 정의합니다.",
-	"format.insertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets": "비어 있지 않은 여는 대괄호 뒤와 닫는 대괄호 앞에 오는 공백 처리를 정의합니다.",
-	"format.insertSpaceAfterOpeningAndBeforeClosingNonemptyBraces": "비어 있지 않은 여는 중괄호 뒤와 닫는 중괄호 앞의 공백 처리를 정의합니다. TypeScript 2.3.0 이상이 필요합니다.",
-	"format.insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces": "템플릿 문자열의 여는 중괄호 뒤와 닫는 중괄호 앞의 공백 처리를 정의합니다. TypeScript >= 2.0.6이 필요합니다.",
-	"format.insertSpaceAfterOpeningAndBeforeClosingJsxExpressionBraces": "JSX 식의 여는 중괄호 뒤와 닫는 중괄호 앞의 공백 처리를 정의합니다. TypeScript >= 2.0.6이 필요합니다.",
-	"format.insertSpaceAfterTypeAssertion": "TypeScript에서 유형 어설션 이후 공백 처리를 정의합니다. TypeScript >= 2.4가 필요합니다.",
-	"format.placeOpenBraceOnNewLineForFunctions": "함수의 새 줄에 여는 중괄호를 넣을지 정의합니다.",
-	"format.placeOpenBraceOnNewLineForControlBlocks": "제어 블록의 새 줄에 여는 중괄호를 넣을지 정의합니다.",
-	"javascript.validate.enable": "JavaScript 유효성 검사를 사용하거나 사용하지 않습니다.",
-	"goToProjectConfig.title": "프로젝트 구성으로 이동",
-	"javascript.referencesCodeLens.enabled": "JavaScript 파일에서 CodeLense 참조를 사용/사용 안 함으로 설정합니다.",
-	"typescript.referencesCodeLens.enabled": "TypeScript 파일에서 참조 CodeLense를 사용/사용 안 함으로 설정합니다. TypeScript >= 2.0.6이 필요합니다.",
-	"typescript.implementationsCodeLens.enabled": "구현 CodeLens를 사용하거나 사용하지 않도록 설정합니다. TypeScript >= 2.2.0이 필요합니다.",
-	"typescript.openTsServerLog.title": "TS 서버 로그 열기",
-	"typescript.restartTsServer": "TS 서버 다시 시작",
-	"typescript.selectTypeScriptVersion.title": "TypeScript 버전 선택",
-	"typescript.reportStyleChecksAsWarnings": "스타일 검사를 경고로 보고",
-	"jsDocCompletion.enabled": "자동 JSDoc 주석 사용/사용 안 함",
-	"javascript.implicitProjectConfig.checkJs": "JavaScript 파일의 의미 체계 검사를 사용하거나 사용하지 않도록 설정합니다. 기존 jsconfig.json 또는 tsconfig.json 파일은 이 설정을 재정의합니다. TypeScript 2.3.1 이상이 필요합니다. ",
-	"typescript.npm": "자동 입력 인식에 사용된 NPM 실행 파일 경로를 지정합니다. TypeScript >= 2.3.4가 필요합니다.",
-	"typescript.check.npmIsInstalled": "자동 입력 인식에 대해 NPM이 설치되어 있는지 확인합니다.",
-	"javascript.nameSuggestions": "JavaScript 제안 목록의 파일에서 고유한 이름 포함을 사용/사용 안 함으로 설정합니다.",
-	"typescript.tsc.autoDetect": "tsc 작업의 자동 검색을 제어합니다. '해제'는 이 기능을 사용하지 않도록 설정합니다. '빌드'는 단일 실행 컴파일 작업만 만듭니다. '보기'는 컴파일 및 보기 작업만 만듭니다. '설정'은 빌드 및 보기 작업을 모두 만듭니다. 기본 옵션은 '설정'입니다.",
-	"typescript.problemMatchers.tsc.label": "TypeScript 문제",
-	"typescript.problemMatchers.tscWatch.label": "TypeScript 문제(감시 모드)",
-	"typescript.quickSuggestionsForPaths": "가져오기 경로를 입력할 때 빠른 제안을 사용하거나 사용하지 않습니다.",
-	"typescript.locale": "JavaScript 또는 TypeScript 오류를 보고하는 데 사용하는 로캘을 설정합니다. TypeScript 2.6.0 이상이 필요합니다. 기본값 'null'을 설정하면 VS Code의 로캘이 사용됩니다.",
-	"javascript.implicitProjectConfig.experimentalDecorators": "프로젝트의 일부가 아닌 JavaScript 파일에 대해 'experimentalDecorators'를 사용하거나 사용하지 않도록 설정합니다. 기존 jsconfig.json 또는 tsconfig.json 파일은 이 설정을 재정의합니다. TypeScript 2.3.1 이상이 필요합니다.",
-	"typescript.autoImportSuggestions.enabled": "자동 가져오기 제안을 사용하거나 사용하지 않도록 설정합니다. TypeScript 2.6.1 이상이 필요합니다.",
-	"typescript.experimental.syntaxFolding": "구문 인식 접기 마커를 설정하거나 해제합니다.",
-	"taskDefinition.tsconfig.description": "TS 빌드를 정의하는 tsconfig 파일입니다.",
-	"javascript.suggestionActions.enabled": "편집기에서 JavaScript 파일에 대한 제안 진단을 사용하거나 사용하지 않도록 설정합니다. TypeScript 2.8 이상이 필요합니다.",
-	"typescript.suggestionActions.enabled": "편집기에서 TypeScript 파일에 대한 제안 진단을 사용하거나 사용하지 않도록 설정합니다. TypeScript 2.8 이상이 필요합니다.",
-	"typescript.preferences.quoteStyle": "빠른 수정에 사용할 기본 따옴표 스타일로 '작은' 따옴표, '큰' 따옴표 또는 '자동'입니다. '자동'이면 기존 가져오기에서 따옴표 형식이 유추됩니다. TypeScript 2.9 이상이 필요합니다.",
-	"typescript.preferences.importModuleSpecifier": "자동 가져오기에 대한 기본 경로 스타일:\n- 파일 위치에 \"상대적\"\n- 'jsconfig.json' / 'tsconfig.json'에 구성된 'baseUrl'을 기준으로 \"상대적이지 않음\"\n- \"자동\"은 가장 짧은 경로 유형을 유추합니다.\nTypeScript 2.9 이상이 필요합니다.",
-	"typescript.showUnused": "코드에서 사용되지 않는 변수의 강조 표시를 사용하거나 사용하지 않도록 설정합니다. TypeScript 2.9 이상이 필요합니다.",
-	"typescript.updateImportsOnFileMove.enabled": "VS Code에서 파일을 이동하거나 이름을 바꿀 때 가져오기 경로의 자동 업데이트를 사용하거나 사용하지 않도록 설정합니다. 가능한 값은 'prompt'(이름을 바꿀 때마다 메시지 표시)', 'always'(경로를 항상 자동으로 업데이트) 및 'never'(경로 이름을 바꾸지 않고 메시지를 다시 표시 안 함)입니다. TypeScript 2.9 이상이 필요합니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/typescript/out/commands.i18n.json b/i18n/kor/extensions/typescript/out/commands.i18n.json
deleted file mode 100644
index dd43847bd6e..00000000000
--- a/i18n/kor/extensions/typescript/out/commands.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"typescript.projectConfigNoWorkspace": "TypeScript 또는 JavaScript 프로젝트를 사용하려면 VS Code의 폴더를 여세요.",
-	"typescript.projectConfigUnsupportedFile": "TypeScript 또는 JavaScript 프로젝트를 확인할 수 없습니다. 지원되지 않는 파일 형식",
-	"typescript.projectConfigCouldNotGetInfo": "TypeScript 또는 JavaScript 프로젝트를 확인할 수 없습니다.",
-	"typescript.noTypeScriptProjectConfig": "파일이 TypeScript 프로젝트의 일부가 아닙니다. 자세히 알아보려면 [여기]({0})를 클릭하세요.",
-	"typescript.noJavaScriptProjectConfig": "파일이 JavaScript 프로젝트의 일부가 아닙니다. 자세히 알아보려면 [여기]({0})를 클릭하세요.",
-	"typescript.configureTsconfigQuickPick": "tsconfig.json 구성",
-	"typescript.configureJsconfigQuickPick": "jsconfig.json 구성"
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/typescript/out/features/bufferSyncSupport.i18n.json b/i18n/kor/extensions/typescript/out/features/bufferSyncSupport.i18n.json
deleted file mode 100644
index 099f0f45bd1..00000000000
--- a/i18n/kor/extensions/typescript/out/features/bufferSyncSupport.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"moreInformation": "추가 정보",
-	"doNotCheckAgain": "다시 확인 안 함",
-	"close": "닫기",
-	"updateTscCheck": "사용자 설정 'typescript.check.tscVersion'을 false로 업데이트했습니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/typescript/out/features/completionItemProvider.i18n.json b/i18n/kor/extensions/typescript/out/features/completionItemProvider.i18n.json
deleted file mode 100644
index 65d840cf0b5..00000000000
--- a/i18n/kor/extensions/typescript/out/features/completionItemProvider.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"selectCodeAction": "적용할 코드 동작 선택",
-	"acquiringTypingsLabel": "typings를 가져오는 중...",
-	"acquiringTypingsDetail": "IntelliSense에 대한 typings 정의를 가져오는 중입니다.",
-	"autoImportLabel": "{0}에서 자동으로 가져오기"
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/typescript/out/features/directiveCommentCompletionProvider.i18n.json b/i18n/kor/extensions/typescript/out/features/directiveCommentCompletionProvider.i18n.json
deleted file mode 100644
index 365792bc459..00000000000
--- a/i18n/kor/extensions/typescript/out/features/directiveCommentCompletionProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"ts-check": "JavaScript 파일에서 의미 검사를 사용합니다. 파일의 최상단에 있어야 합니다.",
-	"ts-nocheck": "JavaScript 파일에서 의미 검사를 사용하지 않습니다. 파일의 최상단에 있어야 합니다.",
-	"ts-ignore": "파일의 다음 행에서 @ts-check 오류를 억제합니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/typescript/out/features/implementationsCodeLensProvider.i18n.json b/i18n/kor/extensions/typescript/out/features/implementationsCodeLensProvider.i18n.json
deleted file mode 100644
index 272312dad8e..00000000000
--- a/i18n/kor/extensions/typescript/out/features/implementationsCodeLensProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"oneImplementationLabel": "1개 구현",
-	"manyImplementationLabel": "{0}개 구현",
-	"implementationsErrorLabel": "구현을 확인할 수 없음"
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/typescript/out/features/jsDocCompletionProvider.i18n.json b/i18n/kor/extensions/typescript/out/features/jsDocCompletionProvider.i18n.json
deleted file mode 100644
index de5777d4c7a..00000000000
--- a/i18n/kor/extensions/typescript/out/features/jsDocCompletionProvider.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"typescript.jsDocCompletionItem.documentation": "JSDoc 주석"
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/typescript/out/features/quickFixProvider.i18n.json b/i18n/kor/extensions/typescript/out/features/quickFixProvider.i18n.json
deleted file mode 100644
index b91c84de957..00000000000
--- a/i18n/kor/extensions/typescript/out/features/quickFixProvider.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"fixAllInFileLabel": "{0} (파일에서 모두 수정)"
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/typescript/out/features/referencesCodeLensProvider.i18n.json b/i18n/kor/extensions/typescript/out/features/referencesCodeLensProvider.i18n.json
deleted file mode 100644
index 69609e31fcb..00000000000
--- a/i18n/kor/extensions/typescript/out/features/referencesCodeLensProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"oneReferenceLabel": "참조 1개",
-	"manyReferenceLabel": "참조 {0}개",
-	"referenceErrorLabel": "참조를 확인할 수 없음"
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/typescript/out/features/taskProvider.i18n.json b/i18n/kor/extensions/typescript/out/features/taskProvider.i18n.json
deleted file mode 100644
index 6982eedcfd9..00000000000
--- a/i18n/kor/extensions/typescript/out/features/taskProvider.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"buildTscLabel": "빌드 - {0}",
-	"buildAndWatchTscLabel": "보기 - {0}"
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/typescript/out/typescriptMain.i18n.json b/i18n/kor/extensions/typescript/out/typescriptMain.i18n.json
deleted file mode 100644
index 70c3246796b..00000000000
--- a/i18n/kor/extensions/typescript/out/typescriptMain.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"typescript.projectConfigNoWorkspace": "TypeScript 또는 JavaScript 프로젝트를 사용하려면 VS Code의 폴더를 여세요.",
-	"typescript.projectConfigUnsupportedFile": "TypeScript 또는 JavaScript 프로젝트를 확인할 수 없습니다. 지원되지 않는 파일 형식",
-	"typescript.projectConfigCouldNotGetInfo": "TypeScript 또는 JavaScript 프로젝트를 확인할 수 없습니다.",
-	"typescript.noTypeScriptProjectConfig": "파일이 TypeScript 프로젝트의 일부가 아닙니다.",
-	"typescript.noJavaScriptProjectConfig": "파일이 JavaScript 프로젝트의 일부가 아닙니다.",
-	"typescript.configureTsconfigQuickPick": "tsconfig.json 구성",
-	"typescript.configureJsconfigQuickPick": "jsconfig.json 구성",
-	"typescript.projectConfigLearnMore": "자세한 정보"
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/typescript/out/typescriptServiceClient.i18n.json b/i18n/kor/extensions/typescript/out/typescriptServiceClient.i18n.json
deleted file mode 100644
index 3f50eeec8ab..00000000000
--- a/i18n/kor/extensions/typescript/out/typescriptServiceClient.i18n.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noServerFound": "경로 {0}이(가) 올바른 tsserver 설치를 가리키지 않습니다. 포함된 TypeScript 버전을 대신 사용합니다.",
-	"serverCouldNotBeStarted": "TypeScript 언어 서버를 시작할 수 없습니다. 오류 메시지: {0}",
-	"typescript.openTsServerLog.notSupported": "TS 서버 로깅을 사용하려면 TS 2.2.2 이상이 필요합니다.",
-	"typescript.openTsServerLog.loggingNotEnabled": "TS 서버 로깅이 꺼져 있습니다. `typescript.tsserver.log`를 설정하고 TS 서버를 다시 시작하여 로깅을 사용하도록 설정하세요.",
-	"typescript.openTsServerLog.enableAndReloadOption": "로깅 사용 및 TS 서버 다시 시작",
-	"typescript.openTsServerLog.noLogFile": "TS 서버에서 로깅을 시작하지 않았습니다.",
-	"openTsServerLog.openFileFailedFailed": "TS 서버 로그 파일을 열 수 없습니다.",
-	"serverDiedAfterStart": "TypeScript 언어 서비스가 시작된 직후 5번 종료되었습니다. 서비스가 다시 시작되지 않습니다.",
-	"serverDiedReportIssue": "문제 보고",
-	"serverDied": "TypeScript 언어 서비스가 지난 5분 동안 예기치 않게 5번 종료되었습니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/typescript/out/utils/api.i18n.json b/i18n/kor/extensions/typescript/out/utils/api.i18n.json
deleted file mode 100644
index f57994230cb..00000000000
--- a/i18n/kor/extensions/typescript/out/utils/api.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"invalidVersion": "잘못된 버전"
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/typescript/out/utils/logger.i18n.json b/i18n/kor/extensions/typescript/out/utils/logger.i18n.json
deleted file mode 100644
index 8f5ef5415b9..00000000000
--- a/i18n/kor/extensions/typescript/out/utils/logger.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"channelName": "TypeScript"
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/typescript/out/utils/projectStatus.i18n.json b/i18n/kor/extensions/typescript/out/utils/projectStatus.i18n.json
deleted file mode 100644
index 49fa81ab46e..00000000000
--- a/i18n/kor/extensions/typescript/out/utils/projectStatus.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hintExclude": "프로젝트 전체에서 JavaScript/TypeScript 언어 기능을 사용하도록 설정하려면 {0}과(와) 같이 파일이 많은 폴더를 제외하세요.",
-	"hintExclude.generic": "프로젝트 전체에서 JavaScript/TypeScript 언어 기능을 사용하도록 설정하려면 사용하지 않는 소스 파일이 포함된 큰 폴더를 제외하세요.",
-	"large.label": "제외 구성",
-	"hintExclude.tooltip": "프로젝트 전체에서 JavaScript/TypeScript 언어 기능을 사용하도록 설정하려면 사용하지 않는 소스 파일이 포함된 큰 폴더를 제외하세요."
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/typescript/out/utils/typingsStatus.i18n.json b/i18n/kor/extensions/typescript/out/utils/typingsStatus.i18n.json
deleted file mode 100644
index 0fad82fa51a..00000000000
--- a/i18n/kor/extensions/typescript/out/utils/typingsStatus.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"installingPackages": "TypeScript IntelliSense를 향상하기 위해 데이터를 페치하는 중",
-	"typesInstallerInitializationFailed.title": "JavaScript 언어 기능에 대한 입력 파일을 설치할 수 없습니다. NPM이 설치되어 있는지 확인하거나 사용자 설정에서 'typescript.npm'을 구성하세요.  자세히 알아보려면 [여기]({0})를 클릭하세요.",
-	"typesInstallerInitializationFailed.doNotCheckAgain": "다시 표시 안 함"
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/typescript/out/utils/versionPicker.i18n.json b/i18n/kor/extensions/typescript/out/utils/versionPicker.i18n.json
deleted file mode 100644
index bdd4f232c51..00000000000
--- a/i18n/kor/extensions/typescript/out/utils/versionPicker.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"useVSCodeVersionOption": "VS Code의 버전 사용",
-	"useWorkspaceVersionOption": "작업 영역 버전 사용",
-	"learnMore": "자세한 정보",
-	"selectTsVersion": "JavaScript 및 TypeScript 언어 기능에 사용되는 TypeScript 버전 선택"
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/typescript/out/utils/versionProvider.i18n.json b/i18n/kor/extensions/typescript/out/utils/versionProvider.i18n.json
deleted file mode 100644
index 9a563329739..00000000000
--- a/i18n/kor/extensions/typescript/out/utils/versionProvider.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"couldNotLoadTsVersion": "이 경로에서 TypeScript 버전을 로드할 수 없습니다.",
-	"noBundledServerFound": "잘못 동작하는 바이러스 감지 도구와 같은 다른 응용 프로그램에서 VS Code의 tsserver가 삭제되었습니다. VS Code를 다시 설치하세요."
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/typescript/package.i18n.json b/i18n/kor/extensions/typescript/package.i18n.json
deleted file mode 100644
index dd42af00286..00000000000
--- a/i18n/kor/extensions/typescript/package.i18n.json
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "TypeScript 및 JavaScript 언어 기능",
-	"description": "JavaScript 및 TypeScript에 대한 다양한 언어 지원을 제공합니다.",
-	"typescript.reloadProjects.title": "프로젝트 다시 로드",
-	"javascript.reloadProjects.title": "프로젝트 다시 로드",
-	"configuration.typescript": "TypeScript",
-	"typescript.useCodeSnippetsOnMethodSuggest.dec": "매개 변수 서명으로 함수를 완료하세요.",
-	"typescript.tsdk.desc": "사용할 tsserver 및 lib*.d.ts 파일이 들어 있는 폴더 경로를 지정합니다.",
-	"typescript.disableAutomaticTypeAcquisition": "자동 형식 인식을 사용하지 않습니다. TypeScript >= 2.0.6이 필요합니다.",
-	"typescript.tsserver.log": "파일에 대해 TS 서버 로깅을 사용하도록 설정합니다. 이 로그는 TS 서버 문제를 진단하는 데 사용될 수 있습니다. 로그에는 파일 경로, 소스 코드 및 프로젝트에서 잠재적으로 중요한 기타 정보가 포함될 수 있습니다.",
-	"typescript.tsserver.trace": "TS 서버로 전송한 메시지 추적을 사용하도록 설정합니다. 이\n 추적은 TS 서버 문제를 진단하는 데 사용될 수 있습니다. 추적에는 파일 경로, 소스 코드 및 프로젝트에서 잠재적으로 중요한\n 기타 정보가 포함될 수 있습니다.",
-	"typescript.validate.enable": "TypeScript 유효성 검사를 사용하거나 사용하지 않습니다.",
-	"typescript.format.enable": "기본 TypeScript 포맷터를 사용하거나 사용하지 않습니다.",
-	"javascript.format.enable": "기본 JavaScript 포맷터를 사용하거나 사용하지 않습니다.",
-	"format.insertSpaceAfterCommaDelimiter": "쉼표 구분 기호 뒤에 오는 공백 처리를 정의합니다.",
-	"format.insertSpaceAfterConstructor": "컨스트럭터 키워드 뒤 공백 처리를 정의합니다. TypeScript >= 2.3.0이 필요합니다.",
-	"format.insertSpaceAfterSemicolonInForStatements": " for 문에서 세미콜론 뒤에 오는 공백 처리를 정의합니다.",
-	"format.insertSpaceBeforeAndAfterBinaryOperators": "이항 연산자 뒤에 오는 공백 처리를 정의합니다.",
-	"format.insertSpaceAfterKeywordsInControlFlowStatements": "제어 흐름 문의 키워드 뒤에 오는 공백 처리를 정의합니다.",
-	"format.insertSpaceAfterFunctionKeywordForAnonymousFunctions": "익명 함수의 function 키워드 뒤에 오는 공백 처리를 정의합니다.",
-	"format.insertSpaceBeforeFunctionParenthesis": "함수 인수 괄호 앞에 오는 공백 처리를 정의합니다. TypeScript 2.1.5 이상이 필요합니다.",
-	"format.insertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis": "비어 있지 않은 여는 괄호 뒤와 닫는 괄호 앞에 오는 공백 처리를 정의합니다.",
-	"format.insertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets": "비어 있지 않은 여는 대괄호 뒤와 닫는 대괄호 앞에 오는 공백 처리를 정의합니다.",
-	"format.insertSpaceAfterOpeningAndBeforeClosingNonemptyBraces": "비어 있지 않은 여는 중괄호 뒤와 닫는 중괄호 앞의 공백 처리를 정의합니다. TypeScript >= 2.3.0이 필요합니다.",
-	"format.insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces": "템플릿 문자열의 여는 중괄호 뒤와 닫는 중괄호 앞의 공백 처리를 정의합니다. TypeScript >= 2.0.6이 필요합니다.",
-	"format.insertSpaceAfterOpeningAndBeforeClosingJsxExpressionBraces": "JSX 식의 여는 중괄호 뒤와 닫는 중괄호 앞의 공백 처리를 정의합니다. TypeScript >= 2.0.6이 필요합니다.",
-	"format.insertSpaceAfterTypeAssertion": "TypeScript에서 유형 어설션 이후 공백 처리를 정의합니다. TypeScript >= 2.4가 필요합니다.",
-	"format.placeOpenBraceOnNewLineForFunctions": "함수의 새 줄에 여는 중괄호를 넣을지 정의합니다.",
-	"format.placeOpenBraceOnNewLineForControlBlocks": "제어 블록의 새 줄에 여는 중괄호를 넣을지 정의합니다.",
-	"javascript.validate.enable": "JavaScript 유효성 검사를 사용하거나 사용하지 않습니다.",
-	"typescript.goToProjectConfig.title": "프로젝트 구성으로 이동",
-	"javascript.goToProjectConfig.title": "프로젝트 구성으로 이동",
-	"javascript.referencesCodeLens.enabled": "JavaScript 파일에서 CodeLense 참조를 사용/사용 안 함으로 설정합니다.",
-	"typescript.referencesCodeLens.enabled": "TypeScript 파일에서 참조 CodeLense를 사용/사용 안 함으로 설정합니다. TypeScript >= 2.0.6이 필요합니다.",
-	"typescript.implementationsCodeLens.enabled": "구현 CodeLens를 사용하거나 사용하지 않도록 설정합니다. TypeScript >= 2.2.0이 필요합니다.",
-	"typescript.openTsServerLog.title": "TS 서버 로그 열기",
-	"typescript.restartTsServer": "TS 서버 다시 시작",
-	"typescript.selectTypeScriptVersion.title": "TypeScript 버전 선택",
-	"typescript.reportStyleChecksAsWarnings": "스타일 검사를 경고로 보고",
-	"jsDocCompletion.enabled": "자동 JSDoc 주석 사용/사용 안 함",
-	"javascript.implicitProjectConfig.checkJs": "JavaScript 파일의 의미 체계 검사를 사용/사용하지 않습니다. 기존 jsconfig.json 또는 tsconfig.json 파일은 이 설정을 재정의합니다. TypeScript >=2.3.1이 필요합니다. ",
-	"typescript.npm": "자동 입력 인식에 사용된 NPM 실행 파일 경로를 지정합니다. TypeScript >= 2.3.4가 필요합니다.",
-	"typescript.check.npmIsInstalled": "자동 입력 인식에 대해 NPM이 설치되어 있는지 확인합니다.",
-	"javascript.nameSuggestions": "JavaScript 제안 목록의 파일에서 고유한 이름 포함을 사용/사용 안 함으로 설정합니다.",
-	"typescript.tsc.autoDetect": "tsc 작업의 자동 검색을 제어합니다. '해제'는 이 기능을 사용하지 않도록 설정합니다. '빌드'는 단일 실행 컴파일 작업만 만듭니다. '보기'는 컴파일 및 보기 작업만 만듭니다. '설정'은 빌드 및 보기 작업을 모두 만듭니다. 기본 옵션은 '설정'입니다.",
-	"typescript.problemMatchers.tsc.label": "TypeScript 문제",
-	"typescript.problemMatchers.tscWatch.label": "TypeScript 문제(감시 모드)",
-	"typescript.quickSuggestionsForPaths": "가져오기 경로를 입력할 때 빠른 제안을 사용하거나 사용하지 않습니다.",
-	"typescript.locale": "TypeScript 오류를 보고하는 데 사용하는 로캘을 설정합니다. TypeScript >= 2.6.0이 필요합니다. 기본값 'null'은 TypeScript 오류에 대해 VS Code의 로캘을 사용합니다.",
-	"javascript.implicitProjectConfig.experimentalDecorators": "프로젝트의 일부가 아닌 JavaScript 파일에 대해 'experimentalDecorators'를 사용하거나 사용하지 않도록 설정합니다. 기존 jsconfig.json 또는 tsconfig.json 파일은 이 설정을 재정의합니다. TypeScript >=2.3.1이 필요합니다.",
-	"typescript.autoImportSuggestions.enabled": "자동 가져오기 제안을 사용하거나 사용하지 않도록 설정합니다. TypeScript >=2.6.1이 필요합니다.",
-	"typescript.experimental.syntaxFolding": "구문 인식 접기 마커를 설정하거나 해제합니다.",
-	"taskDefinition.tsconfig.description": "TS 빌드를 정의하는 tsconfig 파일입니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/vb/package.i18n.json b/i18n/kor/extensions/vb/package.i18n.json
deleted file mode 100644
index 0726ad5192a..00000000000
--- a/i18n/kor/extensions/vb/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Visual Basic 언어 기본",
-	"description": "Visual Basic 파일에서 코드 조각, 구문 강조 표시, 괄호 일치 및 접기를 제공합니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/xml/package.i18n.json b/i18n/kor/extensions/xml/package.i18n.json
deleted file mode 100644
index 1047461f820..00000000000
--- a/i18n/kor/extensions/xml/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "XML 언어 기본",
-	"description": "XML 파일에서 구문 강조 표시 및 괄호 일치를 제공합니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/extensions/yaml/package.i18n.json b/i18n/kor/extensions/yaml/package.i18n.json
deleted file mode 100644
index 573c4139d42..00000000000
--- a/i18n/kor/extensions/yaml/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "YAML 언어 기본",
-	"description": "YAML 파일에서 구문 강조 표시 및 괄호 일치를 제공합니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/base/browser/ui/actionbar/actionbar.i18n.json b/i18n/kor/src/vs/base/browser/ui/actionbar/actionbar.i18n.json
deleted file mode 100644
index f8de912523f..00000000000
--- a/i18n/kor/src/vs/base/browser/ui/actionbar/actionbar.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"titleLabel": "{0}({1})"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/base/browser/ui/aria/aria.i18n.json b/i18n/kor/src/vs/base/browser/ui/aria/aria.i18n.json
deleted file mode 100644
index 88e6e20cbb5..00000000000
--- a/i18n/kor/src/vs/base/browser/ui/aria/aria.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"repeated": "{0}(다시 발생함)"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/base/browser/ui/findinput/findInput.i18n.json b/i18n/kor/src/vs/base/browser/ui/findinput/findInput.i18n.json
deleted file mode 100644
index 875b9bb59d8..00000000000
--- a/i18n/kor/src/vs/base/browser/ui/findinput/findInput.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"defaultLabel": "입력"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/base/browser/ui/findinput/findInputCheckboxes.i18n.json b/i18n/kor/src/vs/base/browser/ui/findinput/findInputCheckboxes.i18n.json
deleted file mode 100644
index b4a8dcbcd90..00000000000
--- a/i18n/kor/src/vs/base/browser/ui/findinput/findInputCheckboxes.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"caseDescription": "대/소문자 구분",
-	"wordsDescription": "단어 단위로",
-	"regexDescription": "정규식 사용"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/base/browser/ui/inputbox/inputBox.i18n.json b/i18n/kor/src/vs/base/browser/ui/inputbox/inputBox.i18n.json
deleted file mode 100644
index 372a72b2a70..00000000000
--- a/i18n/kor/src/vs/base/browser/ui/inputbox/inputBox.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"alertErrorMessage": "오류: {0}",
-	"alertWarningMessage": "경고: {0}",
-	"alertInfoMessage": "정보: {0}"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/base/browser/ui/resourceviewer/resourceViewer.i18n.json b/i18n/kor/src/vs/base/browser/ui/resourceviewer/resourceViewer.i18n.json
deleted file mode 100644
index 9ef41787914..00000000000
--- a/i18n/kor/src/vs/base/browser/ui/resourceviewer/resourceViewer.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"imgMeta": "{0}x{1} {2}",
-	"largeImageError": "이미지가 너무 커서 편집기에 표시할 수 없습니다. ",
-	"resourceOpenExternalButton": " 외부 프로그램으로 이미지를 열까요?",
-	"nativeBinaryError": "파일이 이진이거나 매우 크거나 지원되지 않는 텍스트 인코딩을 사용하기 때문에 편집기에서 표시되지 않습니다.",
-	"sizeB": "{0}B",
-	"sizeKB": "{0}KB",
-	"sizeMB": "{0}MB",
-	"sizeGB": "{0}GB",
-	"sizeTB": "{0}TB"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json b/i18n/kor/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json
deleted file mode 100644
index 750d811d866..00000000000
--- a/i18n/kor/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"selectAriaOption": "{0}"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/base/browser/ui/toolbar/toolbar.i18n.json b/i18n/kor/src/vs/base/browser/ui/toolbar/toolbar.i18n.json
deleted file mode 100644
index ee60ee2d287..00000000000
--- a/i18n/kor/src/vs/base/browser/ui/toolbar/toolbar.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"more": "자세히"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/base/common/errorMessage.i18n.json b/i18n/kor/src/vs/base/common/errorMessage.i18n.json
deleted file mode 100644
index b348e475e36..00000000000
--- a/i18n/kor/src/vs/base/common/errorMessage.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"stackTrace.format": "{0}: {1}",
-	"error.defaultMessage": "알 수 없는 오류가 발생했습니다. 자세한 내용은 로그를 참조하세요.",
-	"nodeExceptionMessage": "시스템 오류가 발생했습니다({0}).",
-	"error.moreErrors": "{0}(총 {1}개의 오류)"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/base/common/json.i18n.json b/i18n/kor/src/vs/base/common/json.i18n.json
deleted file mode 100644
index ac05a5533ca..00000000000
--- a/i18n/kor/src/vs/base/common/json.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"error.invalidSymbol": "잘못된 기호",
-	"error.invalidNumberFormat": "잘못된 숫자 형식",
-	"error.propertyNameExpected": "속성 이름 필요",
-	"error.valueExpected": "값 필요",
-	"error.colonExpected": "콜론이 필요합니다.",
-	"error.commaExpected": "쉼표가 필요합니다.",
-	"error.closeBraceExpected": "닫는 괄호 필요",
-	"error.closeBracketExpected": "닫는 대괄호 필요",
-	"error.endOfFileExpected": "파일 끝 필요"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/base/common/jsonErrorMessages.i18n.json b/i18n/kor/src/vs/base/common/jsonErrorMessages.i18n.json
deleted file mode 100644
index c94927ecb13..00000000000
--- a/i18n/kor/src/vs/base/common/jsonErrorMessages.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"error.invalidSymbol": "잘못된 기호",
-	"error.invalidNumberFormat": "잘못된 숫자 형식",
-	"error.propertyNameExpected": "속성 이름 필요",
-	"error.valueExpected": "값 필요",
-	"error.colonExpected": "콜론이 필요합니다.",
-	"error.commaExpected": "쉼표가 필요합니다.",
-	"error.closeBraceExpected": "닫는 괄호 필요",
-	"error.closeBracketExpected": "닫는 대괄호 필요",
-	"error.endOfFileExpected": "파일 끝 필요"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/base/common/keybindingLabels.i18n.json b/i18n/kor/src/vs/base/common/keybindingLabels.i18n.json
deleted file mode 100644
index 027b604b4c7..00000000000
--- a/i18n/kor/src/vs/base/common/keybindingLabels.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"ctrlKey": "Ctrl",
-	"shiftKey": "<Shift>",
-	"altKey": "Alt",
-	"windowsKey": "Windows",
-	"ctrlKey.long": "컨트롤",
-	"shiftKey.long": "<Shift>",
-	"altKey.long": "Alt",
-	"cmdKey.long": "명령",
-	"windowsKey.long": "Windows"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/base/common/processes.i18n.json b/i18n/kor/src/vs/base/common/processes.i18n.json
deleted file mode 100644
index 5e0fd4eb99f..00000000000
--- a/i18n/kor/src/vs/base/common/processes.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"ExecutableParser.commandMissing": "오류: 실행 파일 정보에서는 문자열 형식의 명령을 정의해야 합니다.",
-	"ExecutableParser.isShellCommand": "경고: isShellCommand는 boolean 형식이어야 합니다. {0} 값을 무시합니다.",
-	"ExecutableParser.args": "경고: args는 string[] 형식이어야 합니다. {0} 값을 무시합니다.",
-	"ExecutableParser.invalidCWD": "경고: options.cwd는 string 형식이어야 합니다. {0} 값을 무시합니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/base/common/severity.i18n.json b/i18n/kor/src/vs/base/common/severity.i18n.json
deleted file mode 100644
index d0a8772dd00..00000000000
--- a/i18n/kor/src/vs/base/common/severity.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"sev.error": "오류",
-	"sev.warning": "경고",
-	"sev.info": "정보"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/base/node/processes.i18n.json b/i18n/kor/src/vs/base/node/processes.i18n.json
deleted file mode 100644
index 05a4cd5f14f..00000000000
--- a/i18n/kor/src/vs/base/node/processes.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"TaskRunner.UNC": "UNC 드라이브에서 셸 명령을 실행할 수 없습니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/base/node/ps.i18n.json b/i18n/kor/src/vs/base/node/ps.i18n.json
deleted file mode 100644
index 8c188b449a5..00000000000
--- a/i18n/kor/src/vs/base/node/ps.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"collecting": "CPU와 메모리 정보를 수집중입니다. 시간이 약간 걸립니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/base/node/zip.i18n.json b/i18n/kor/src/vs/base/node/zip.i18n.json
deleted file mode 100644
index 0ed982e1ded..00000000000
--- a/i18n/kor/src/vs/base/node/zip.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"incompleteExtract": "완료되지 않았습니다. {1}개 항목 중 {0}개를 찾았습니다.",
-	"notFound": "zip 파일 내에 {0}이(가) 없습니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/base/parts/quickopen/browser/quickOpenModel.i18n.json b/i18n/kor/src/vs/base/parts/quickopen/browser/quickOpenModel.i18n.json
deleted file mode 100644
index 8a7077380c9..00000000000
--- a/i18n/kor/src/vs/base/parts/quickopen/browser/quickOpenModel.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"quickOpenAriaLabelEntry": "{0}, 선택기",
-	"quickOpenAriaLabel": "선택기"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/base/parts/quickopen/browser/quickOpenWidget.i18n.json b/i18n/kor/src/vs/base/parts/quickopen/browser/quickOpenWidget.i18n.json
deleted file mode 100644
index c9738d217b6..00000000000
--- a/i18n/kor/src/vs/base/parts/quickopen/browser/quickOpenWidget.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"quickOpenAriaLabel": "빠른 선택기입니다. 결과의 범위를 축소하려면 입력합니다.",
-	"treeAriaLabel": "빠른 선택기"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/base/parts/tree/browser/treeDefaults.i18n.json b/i18n/kor/src/vs/base/parts/tree/browser/treeDefaults.i18n.json
deleted file mode 100644
index 0188edc7e0e..00000000000
--- a/i18n/kor/src/vs/base/parts/tree/browser/treeDefaults.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"collapse": "축소"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json b/i18n/kor/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
deleted file mode 100644
index 76588bffb73..00000000000
--- a/i18n/kor/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hide": "숨기기",
-	"show": "표시",
-	"previewOnGitHub": "GitHub에서 미리 보기",
-	"loadingData": "데이터 로드 중...",
-	"rateLimited": "GitHub 쿼리 제한이 초과되었습니다. 기다려 주세요.",
-	"similarIssues": "유사한 문제",
-	"open": "열기",
-	"closed": "닫힘",
-	"noSimilarIssues": "검색된 유사한 문제 없음",
-	"settingsSearchIssue": "설정 검색 문제",
-	"bugReporter": "버그 보고서",
-	"featureRequest": "기능 요청",
-	"performanceIssue": "성능 문제",
-	"stepsToReproduce": "재현 단계",
-	"bugDescription": "문제를 안정적으로 재현시킬 수 있는 방법을 공유해주세요. 실제 결과와 예상 결과를 포함하세요. GitHub 버전의 Markdown을 지원합니다. GitHub에서 미리 볼 때 문제를 편집하고 스크린샷을 추가할 수 있습니다.",
-	"performanceIssueDesciption": "이 성능 문제가 언제 발생합니까? 시작할 때 발생합니까? 특정 작업을 진행한 이후에 발생합니까? GitHub 버전의 Markdown을 지원합니다. GitHub에서 미리 볼 때 문제를 편집하고 스크린샷을 추가할 수 있습니다.",
-	"description": "설명",
-	"featureRequestDescription": "보고 싶어하는 기능을 설명해주세요. GitHub 버전의 Markdown을 지원합니다. GitHub에서 미리 볼 때 문제를 편집하고 스크린샷을 추가할 수 있습니다.",
-	"expectedResults": "예상 결과",
-	"settingsSearchResultsDescription": "이 쿼리를 검색할 때 기대했던 결과의 목록을 알려주세요. GitHub 버전의 Markdown을 지원합니다. GitHub에서 미리 볼 때 문제를 편집하고 스크린샷을 추가할 수 있습니다.",
-	"pasteData": "너무 커서 보낼 수 없었기 때문에 필요한 데이터를 클립보드에 썼습니다. 붙여 넣으세요.",
-	"disabledExtensions": "확장을 사용할 수 없습니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json b/i18n/kor/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
deleted file mode 100644
index ff0a015d193..00000000000
--- a/i18n/kor/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"completeInEnglish": "양식을 영어로 작성해 주세요.",
-	"issueTypeLabel": "이것은",
-	"issueSourceLabel": "제출 대상",
-	"vscode": "Visual Studio Code",
-	"extension": "확장",
-	"disableExtensionsLabelText": "{0} 후 문제를 재현해 보세요. 확장이 활성 상태인 경우에만 문제가 재현되면 확장과 관련된 문제일 수 있습니다.",
-	"disableExtensions": "모든 확장을 사용하지 않도록 설정하고 창 다시 로드",
-	"chooseExtension": "확장",
-	"issueTitleLabel": "제목",
-	"issueTitleRequired": "제목을 입력하세요.",
-	"titleLengthValidation": "제목이 너무 깁니다.",
-	"details": "상세 내용을 입력하세요.",
-	"sendSystemInfo": "내 시스템 정보 포함({0})",
-	"show": "표시",
-	"sendProcessInfo": "현재 실행 중인 프로세스 포함({0})",
-	"sendWorkspaceInfo": "내 작업 영역 메타데이터 포함({0})",
-	"sendExtensions": "사용하도록 설정된 확장 포함({0})",
-	"sendSearchedExtensions": "검색된 확장 보내기({0})",
-	"sendSettingsSearchDetails": "설정 검색 세부 정보 보내기({0})"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/code/electron-browser/processExplorer/processExplorerMain.i18n.json b/i18n/kor/src/vs/code/electron-browser/processExplorer/processExplorerMain.i18n.json
deleted file mode 100644
index 159ef5e93d6..00000000000
--- a/i18n/kor/src/vs/code/electron-browser/processExplorer/processExplorerMain.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"cpu": "CPU %",
-	"memory": "메모리(MB)",
-	"pid": "PID",
-	"name": "이름",
-	"killProcess": "프로세스 종료",
-	"forceKillProcess": "프로세스 강제 종료",
-	"copy": "복사",
-	"copyAll": "모두 복사"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/code/electron-main/auth.i18n.json b/i18n/kor/src/vs/code/electron-main/auth.i18n.json
deleted file mode 100644
index 47f853841b3..00000000000
--- a/i18n/kor/src/vs/code/electron-main/auth.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"authRequire": "프록시 인증 필요",
-	"proxyauth": "프록시 {0}에 인증이 필요합니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/code/electron-main/logUploader.i18n.json b/i18n/kor/src/vs/code/electron-main/logUploader.i18n.json
deleted file mode 100644
index 127ac6cacc7..00000000000
--- a/i18n/kor/src/vs/code/electron-main/logUploader.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"invalidEndpoint": "잘못된 로그 업로더 끝점",
-	"beginUploading": "업로드 중...",
-	"didUploadLogs": "업로드 성공. 로그 파일 ID: {0}",
-	"logUploadPromptHeader": "Microsoft의 VS Code 팀만 액세스할 수 있는 안전한 Microsoft 끝점에 세션 로그를 업로드하려고 합니다.",
-	"logUploadPromptBody": "세션 로그에 전체 경로, 파일 내용 등과 같은 개인 정보가 포함되어 있을 수 있습니다. 다음에서 세션 로그 파일을 검토하고 편집하세요. '{0}'",
-	"logUploadPromptBodyDetails": "계속하면 세션 로그 파일을 검토하고 수정했으며 Microsoft에서 이 파일을 사용하여 VS Code를 디버그하는 데 동의한다고 확인하게 됩니다.",
-	"logUploadPromptAcceptInstructions": "업로드를 계속하려면 '--upload-logs={0}'을(를) 사용하여 코드를 실행하세요.",
-	"postError": "로그를 게시하는 동안 오류가 발생했습니다. {0}",
-	"responseError": "로그를 게시하는 동안 오류가 발생했습니다. {0} — {1} 받음",
-	"parseError": "응답을 구문 분석하는 동안 오류가 발생했습니다.",
-	"zipError": "로그를 압축하는 동안 오류가 발생했습니다. {0}"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/code/electron-main/main.i18n.json b/i18n/kor/src/vs/code/electron-main/main.i18n.json
deleted file mode 100644
index 1a35370bca6..00000000000
--- a/i18n/kor/src/vs/code/electron-main/main.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"secondInstanceNoResponse": "{0}의 다른 인스턴스가 실행 중이지만 응답하지 않음",
-	"secondInstanceNoResponseDetail": "다른 인스턴스를 모두 닫고 다시 시도하세요.",
-	"secondInstanceAdmin": "{0}의 두 번째 인스턴스가 이미 관리자 권한으로 실행되고 있습니다.",
-	"secondInstanceAdminDetail": "다른 인스턴스를 닫고 다시 시도하세요.",
-	"close": "닫기(&&C)"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/code/electron-main/menus.i18n.json b/i18n/kor/src/vs/code/electron-main/menus.i18n.json
deleted file mode 100644
index a3a33ffe4d8..00000000000
--- a/i18n/kor/src/vs/code/electron-main/menus.i18n.json
+++ /dev/null
@@ -1,193 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"mFile": "파일(&&F)",
-	"mEdit": "편집(&&E)",
-	"mSelection": "선택 영역(&S)",
-	"mView": "보기(&&V)",
-	"mGoto": "이동(&G)",
-	"mDebug": "디버그(&&D)",
-	"mWindow": "창",
-	"mHelp": "도움말(&&H)",
-	"mTask": "작업(&T)",
-	"miNewWindow": "새 창(&&W)",
-	"mAbout": "{0} 정보",
-	"mServices": "서비스",
-	"mHide": "{0} 숨기기",
-	"mHideOthers": "기타 숨기기",
-	"mShowAll": "모두 표시",
-	"miQuit": "{0} 종료",
-	"miNewFile": "새 파일(&&N)",
-	"miOpen": "열기(&&O)...",
-	"miOpenWorkspace": "작업 영역 열기(&&K)...",
-	"miOpenFolder": "폴더 열기(&&F)...",
-	"miOpenFile": "파일 열기(&&O)...",
-	"miOpenRecent": "최근 항목 열기(&&R)",
-	"miSaveWorkspaceAs": "작업 영역을 다른 이름으로 저장",
-	"miAddFolderToWorkspace": "작업 영역에 폴더 추가(&&D)...",
-	"miSave": "저장(&&S)",
-	"miSaveAs": "다른 이름으로 저장(&&A)...",
-	"miSaveAll": "모두 저장(&&L)",
-	"miAutoSave": "자동 저장",
-	"miRevert": "파일 되돌리기(&&V)",
-	"miCloseWindow": "창 닫기(&&E)",
-	"miCloseWorkspace": "작업 영역 닫기(&W)",
-	"miCloseFolder": "폴더 닫기(&&F)",
-	"miCloseEditor": "편집기 닫기(&&C)",
-	"miExit": "끝내기(&X)",
-	"miOpenSettings": "설정(&S)",
-	"miOpenKeymap": "바로 가기 키(&&K)",
-	"miOpenKeymapExtensions": "키맵 확장(&&K)",
-	"miOpenSnippets": "사용자 코드 조각(&&S)",
-	"miSelectColorTheme": "색 테마(&&C)",
-	"miSelectIconTheme": "파일 아이콘 테마(&&I)",
-	"miPreferences": "기본 설정(&&P)",
-	"miReopenClosedEditor": "닫힌 편집기 다시 열기(&&R)",
-	"miMore": "자세히...(&M)",
-	"miClearRecentOpen": "최근에 연 항목 지우기(&&C)",
-	"miUndo": "실행 취소(&&U)",
-	"miRedo": "다시 실행(&&R)",
-	"miCut": "자르기(&T)",
-	"miCopy": "복사(&&C)",
-	"miPaste": "붙여넣기(&&P)",
-	"miFind": "찾기(&&F)",
-	"miReplace": "바꾸기(&&R)",
-	"miFindInFiles": "파일에서 찾기(&&I)",
-	"miReplaceInFiles": "파일에서 바꾸기(&&I)",
-	"miEmmetExpandAbbreviation": "Emmet: 약어 확장(&&X)",
-	"miShowEmmetCommands": "Emmet(&&M)...",
-	"miToggleLineComment": "줄 주석 설정/해제(&&T)",
-	"miToggleBlockComment": "블록 주석 설정/해제(&&B)",
-	"miMultiCursorAlt": "다중 커서를 위해 Alt+Click으로 전환",
-	"miMultiCursorCmd": "다중 커서에 Cmd+Click 사용 ",
-	"miMultiCursorCtrl": "다중 커서에 Ctrl+클릭 사용",
-	"miInsertCursorAbove": "위에 커서 추가(&&A)",
-	"miInsertCursorBelow": "아래에 커서 추가(&&D)",
-	"miInsertCursorAtEndOfEachLineSelected": "줄 끝에 커서 추가(&&U)",
-	"miAddSelectionToNextFindMatch": "다음 항목 추가(&&N)",
-	"miAddSelectionToPreviousFindMatch": "이전 항목 추가(&&R)",
-	"miSelectHighlights": "모든 항목 선택(&&O)",
-	"miCopyLinesUp": "위에 줄 복사(&&C)",
-	"miCopyLinesDown": "아래에 줄 복사(&&P)",
-	"miMoveLinesUp": "줄 위로 이동(&&V)",
-	"miMoveLinesDown": "줄 아래로 이동(&&L)",
-	"miSelectAll": "모두 선택(&&S)",
-	"miSmartSelectGrow": "선택 영역 확장(&&E)",
-	"miSmartSelectShrink": "선택 영역 축소(&&S)",
-	"miViewExplorer": "탐색기(&&E)",
-	"miViewSearch": "검색(&&S)",
-	"miViewSCM": "SCM(&&C)",
-	"miViewDebug": "디버그(&&D)",
-	"miViewExtensions": "확장(&&X)",
-	"miToggleOutput": "출력(&&O)",
-	"miToggleDebugConsole": "디버그 콘솔(&&B)",
-	"miToggleIntegratedTerminal": "통합 터미널(&&I)",
-	"miMarker": "문제(&&P)",
-	"miCommandPalette": "명령 팔레트(&&C)...",
-	"miOpenView": "뷰 열기(&&O)...",
-	"miToggleFullScreen": "전체 화면 설정/해제(&&F)",
-	"miToggleZenMode": "Zen 모드 설정/해제",
-	"miToggleCenteredLayout": "가운데 맞춤된 레이아웃 설정/해제",
-	"miToggleMenuBar": "메뉴 모음 설정/해제(&&B)",
-	"miSplitEditor": "편집기 분할(&&E)",
-	"miToggleEditorLayout": "편집기 그룹 레이아웃 설정/해제(&&L)",
-	"miToggleSidebar": "사이드바 설정/해제(&&T)",
-	"miMoveSidebarRight": "사이드바를 오른쪽으로 이동(&&M)",
-	"miMoveSidebarLeft": "사이드바를 왼쪽으로 이동(&&M)",
-	"miTogglePanel": "패널 설정/해제(&&P)",
-	"miHideStatusbar": "상태 표시줄 숨기기(&&H)",
-	"miShowStatusbar": "상태 표시줄 표시(&&S)",
-	"miHideActivityBar": "작업 막대 숨기기(&&A)",
-	"miShowActivityBar": "작업 막대 표시(&&A)",
-	"miToggleWordWrap": "자동 줄 바꿈 설정/해제(&&W)",
-	"miToggleMinimap": "미니맵 토글(&&M)",
-	"miToggleRenderWhitespace": "공백 설정/해제 및 렌더링(&&R)",
-	"miToggleRenderControlCharacters": "제어 문자 설정/해제(&&C)",
-	"miZoomIn": "확대(&&Z)",
-	"miZoomOut": "축소(&&U)",
-	"miZoomReset": "확대/축소 다시 설정(&&R)",
-	"miBack": "뒤로(&B)",
-	"miForward": "앞으로(&&F)",
-	"miNextEditor": "다음 편집기(&&N)",
-	"miPreviousEditor": "이전 편집기(&&P)",
-	"miNextEditorInGroup": "그룹에서 다음에 사용되는 편집기(&&N)",
-	"miPreviousEditorInGroup": "그룹에서 이전에 사용된 편집기(&&P)",
-	"miSwitchEditor": "편집기 전환(&&E)",
-	"miFocusFirstGroup": "첫 번째 그룹(&&F)",
-	"miFocusSecondGroup": "두 번째 그룹(&&S)",
-	"miFocusThirdGroup": "세 번째 그룹(&&T)",
-	"miNextGroup": "다음 그룹(&&N)",
-	"miPreviousGroup": "이전 그룹(&&P)",
-	"miSwitchGroup": "그룹 전환(&&G)",
-	"miGotoFile": "파일로 이동(&&F)...",
-	"miGotoSymbolInFile": "파일의 기호로 이동(&&S)...",
-	"miGotoSymbolInWorkspace": "작업 영역의 기호로 이동(&&W)...",
-	"miGotoDefinition": "정의로 이동(&&D)",
-	"miGotoTypeDefinition": "형식 정의로 이동( &&T)",
-	"miGotoImplementation": "구현으로 이동( &&I)",
-	"miGotoLine": "줄 이동(&&L)...",
-	"miStartDebugging": "디버깅 시작(&&S)",
-	"miStartWithoutDebugging": "디버깅하지 않고 시작(&&W)",
-	"miStopDebugging": "디버깅 중지(&&S)",
-	"miRestart Debugging": "디버깅 다시 시작(&&R)",
-	"miOpenConfigurations": "구성 열기(&&C)",
-	"miAddConfiguration": "구성 추가...",
-	"miStepOver": "프로시저 단위 실행(&&O)",
-	"miStepInto": "한 단계씩 코드 실행(&&I)",
-	"miStepOut": "프로시저 나가기(&&U)",
-	"miContinue": "계속(&&C)",
-	"miToggleBreakpoint": "중단점 설정/해제(&&B)",
-	"miConditionalBreakpoint": "조건부 중단점(&&C)...",
-	"miInlineBreakpoint": "인라인 중단점(&&O)",
-	"miFunctionBreakpoint": "함수 중단점(&&F)...",
-	"miLogPoint": "Logpoint(&&L)...",
-	"miNewBreakpoint": "새 중단점(&&N)",
-	"miEnableAllBreakpoints": "모든 중단점 설정",
-	"miDisableAllBreakpoints": "모든 중단점 사용 안 함(&&L)",
-	"miRemoveAllBreakpoints": "모든 중단점 제거(&&A)",
-	"miInstallAdditionalDebuggers": "추가 디버거 설치(&&I)...",
-	"mMinimize": "최소화",
-	"mZoom": "확대/축소",
-	"mBringToFront": "모두 맨 앞으로 가져오기",
-	"miSwitchWindow": "창 전환(&&W)",
-	"mShowPreviousTab": "이전 탭 표시",
-	"mShowNextTab": "다음 탭 표시",
-	"mMoveTabToNewWindow": "새 창으로 탭 이동",
-	"mMergeAllWindows": "모든 창 병합",
-	"miToggleDevTools": "개발자 도구 설정/해제(&&T)",
-	"miAccessibilityOptions": "접근성 옵션(&&O)",
-	"miOpenProcessExplorerer": "프로세스 탐색기 열기(&&P)",
-	"miReportIssue": "문제 보고(&&I)",
-	"miWelcome": "시작(&&W)",
-	"miInteractivePlayground": "대화형 실습(&&I)",
-	"miDocumentation": "설명서(&&D)",
-	"miReleaseNotes": "릴리스 정보(&&R)",
-	"miKeyboardShortcuts": "바로 가기 키 참조(&&K)",
-	"miIntroductoryVideos": "소개 비디오(&&V)",
-	"miTipsAndTricks": "팁과 요령(&T)",
-	"miTwitter": "Twitter에서 참여(&&J)",
-	"miUserVoice": "검색 기능 요청(&&S)",
-	"miLicense": "라이선스 보기(&&L)",
-	"miPrivacyStatement": "개인정보처리방침(&&P)",
-	"miAbout": "정보(&&A)",
-	"miRunTask": "작업 실행(&&R)...",
-	"miBuildTask": "빌드 작업 실행(&&B)...",
-	"miRunningTask": "실행 중인 작업 표시(&&G)...",
-	"miRestartTask": "실행 중인 작업 다시 시작(&&E)...",
-	"miTerminateTask": "작업 종료(&&T)...",
-	"miConfigureTask": "작업 구성(&&C)...",
-	"miConfigureBuildTask": "기본 빌드 작업 구성(&&F)...",
-	"accessibilityOptionsWindowTitle": "접근성 옵션",
-	"miCheckForUpdates": "업데이트 확인...",
-	"miCheckingForUpdates": "업데이트를 확인하는 중...",
-	"miDownloadUpdate": "사용 가능한 업데이트 다운로드",
-	"miDownloadingUpdate": "업데이트를 다운로드하는 중...",
-	"miInstallUpdate": "업데이트 설치...",
-	"miInstallingUpdate": "업데이트를 설치하는 중...",
-	"miRestartToUpdate": "다시 시작하여 업데이트..."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/code/electron-main/window.i18n.json b/i18n/kor/src/vs/code/electron-main/window.i18n.json
deleted file mode 100644
index ff8c3b1aedc..00000000000
--- a/i18n/kor/src/vs/code/electron-main/window.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hiddenMenuBar": "<Alt> 키를 눌러 메뉴 모음에 계속 액세스할 수 있습니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/code/electron-main/windows.i18n.json b/i18n/kor/src/vs/code/electron-main/windows.i18n.json
deleted file mode 100644
index d5c6b9b1265..00000000000
--- a/i18n/kor/src/vs/code/electron-main/windows.i18n.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"ok": "확인",
-	"pathNotExistTitle": "경로가 없습니다.",
-	"pathNotExistDetail": "'{0}' 경로가 디스크에 더 이상 없는 것 같습니다.",
-	"reopen": "다시 열기(&&R)",
-	"wait": "계속 대기(&&K)",
-	"close": "닫기(&&C)",
-	"appStalled": "창이 더 이상 응답하지 않습니다.",
-	"appStalledDetail": "창을 다시 열거나, 닫거나, 계속 기다릴 수 있습니다.",
-	"appCrashed": "창이 충돌했습니다.",
-	"appCrashedDetail": "불편을 드려서 죄송합니다. 창을 다시 열면 중단된 위치에서 계속할 수 있습니다.",
-	"open": "열기",
-	"openFolder": "폴더 열기",
-	"openFile": "파일 열기",
-	"workspaceOpenedMessage": "'{0}' 작업 영역을 저장할 수 없음",
-	"workspaceOpenedDetail": "작업 영역이 이미 다른 창에 열렸습니다. 먼저 해당 창을 닫은 후 다시 시도하세요.",
-	"openWorkspace": "열기(&&O)",
-	"openWorkspaceTitle": "작업 영역 열기",
-	"save": "저장(&&S)",
-	"doNotSave": "저장 안 함(&&N)",
-	"cancel": "취소",
-	"saveWorkspaceMessage": "작업 영역 구성을 파일로 저장하시겠습니까?",
-	"saveWorkspaceDetail": "작업 영역을 다시 열려면 작업 영역을 저장하세요.",
-	"saveWorkspace": "작업 영역 저장"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/code/node/cliProcessMain.i18n.json b/i18n/kor/src/vs/code/node/cliProcessMain.i18n.json
deleted file mode 100644
index 3852ee2e6df..00000000000
--- a/i18n/kor/src/vs/code/node/cliProcessMain.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"notFound": "'{0}' 확장을 찾을 수 없습니다.",
-	"notInstalled": "'{0}' 확장이 설치되어 있지 않습니다.",
-	"useId": "게시자를 포함한 전체 확장 ID(예: {0})를 사용하세요.",
-	"successVsixInstall": "확장 '{0}'이(가) 설치되었습니다!",
-	"cancelVsixInstall": "'{0}' 확장 설치를 취소했습니다.",
-	"alreadyInstalled": "'{0}' 확장이 이미 설치되어 있습니다.",
-	"foundExtension": "마켓플레이스에서 '{0}'을(를) 찾았습니다.",
-	"installing": "설치 중...",
-	"successInstall": "확장 '{0}' v{1}이(가) 성공적으로 설치되었습니다!",
-	"uninstalling": "{0} 제거 중...",
-	"successUninstall": "'{0}' 확장이 성공적으로 제거되었습니다!"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/editor/browser/services/bulkEdit.i18n.json b/i18n/kor/src/vs/editor/browser/services/bulkEdit.i18n.json
deleted file mode 100644
index 1b092993f52..00000000000
--- a/i18n/kor/src/vs/editor/browser/services/bulkEdit.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"summary.0": "편집하지 않음",
-	"summary.nm": "{1}개 파일에서 {0}개 텍스트 편집을 수행함",
-	"summary.n0": "1개 파일에서 {0}개 텍스트 편집을 수행함",
-	"conflict": "이러한 파일이 동시에 변경되었습니다. {0}"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/editor/browser/widget/codeEditorWidget.i18n.json b/i18n/kor/src/vs/editor/browser/widget/codeEditorWidget.i18n.json
deleted file mode 100644
index abc2f81a46c..00000000000
--- a/i18n/kor/src/vs/editor/browser/widget/codeEditorWidget.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"cursors.maximum": "커서 수는 {0}(으)로 제한되었습니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/editor/browser/widget/diffEditorWidget.i18n.json b/i18n/kor/src/vs/editor/browser/widget/diffEditorWidget.i18n.json
deleted file mode 100644
index bda85bce0b2..00000000000
--- a/i18n/kor/src/vs/editor/browser/widget/diffEditorWidget.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"diff.tooLarge": "파일 1개가 너무 커서 파일을 비교할 수 없습니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/editor/browser/widget/diffReview.i18n.json b/i18n/kor/src/vs/editor/browser/widget/diffReview.i18n.json
deleted file mode 100644
index f9c1eb60275..00000000000
--- a/i18n/kor/src/vs/editor/browser/widget/diffReview.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"label.close": "닫기",
-	"no_lines": "줄 없음",
-	"one_line": "1줄",
-	"more_lines": "{0}줄",
-	"header": "차이 {0}/{1}개: 원본 {2}, {3}, 수정 {4}, {5}",
-	"blankLine": "비어 있음",
-	"equalLine": "원본 {0}, 수정 {1}: {2}",
-	"insertLine": "+ 수정됨 {0}: {1}",
-	"deleteLine": "- 원본 {0}: {1}",
-	"editor.action.diffReview.next": "다음 다른 항목으로 이동",
-	"editor.action.diffReview.prev": "다음 다른 항목으로 이동"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/editor/common/commonCodeEditor.i18n.json b/i18n/kor/src/vs/editor/common/commonCodeEditor.i18n.json
deleted file mode 100644
index abc2f81a46c..00000000000
--- a/i18n/kor/src/vs/editor/common/commonCodeEditor.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"cursors.maximum": "커서 수는 {0}(으)로 제한되었습니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/editor/common/config/commonEditorConfig.i18n.json b/i18n/kor/src/vs/editor/common/config/commonEditorConfig.i18n.json
deleted file mode 100644
index c96c0fe1469..00000000000
--- a/i18n/kor/src/vs/editor/common/config/commonEditorConfig.i18n.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"editorConfigurationTitle": "편집기",
-	"fontFamily": "글꼴 패밀리를 제어합니다.",
-	"fontWeight": "글꼴 두께를 제어합니다.",
-	"fontSize": "글꼴 크기(픽셀)를 제어합니다.",
-	"lineHeight": "줄 높이를 제어합니다. fontSize의 lineHeight를 계산하려면 0을 사용합니다.",
-	"letterSpacing": "글자 간격을 픽셀 단위로 조정합니다.",
-	"lineNumbers.off": "줄 번호는 렌더링 되지 않습니다.",
-	"lineNumbers.on": "줄 번호는 절대값으로 렌더링 됩니다.",
-	"lineNumbers.relative": "줄 번호는 커서 위치에서 줄 간격 거리로 렌더링 됩니다.",
-	"lineNumbers.interval": "줄 번호는 매 10 줄마다 렌더링이 이루어집니다.",
-	"lineNumbers": "줄 번호의 표시 여부를 제어합니다.",
-	"rulers": "특정 수의 고정 폭 문자 뒤에 세로 눈금자를 렌더링합니다. 여러 눈금자의 경우 여러 값을 사용합니다. 배열이 비어 있는 경우 눈금자가 그려져 있지 않습니다.",
-	"wordSeparators": "단어 관련 탐색 또는 작업을 수행할 때 단어 구분 기호로 사용되는 문자입니다.",
-	"tabSize": "탭 한 개에 해당하는 공백 수입니다. `editor.detectIndentation`이 켜져 있는 경우 이 설정은 파일 콘텐츠에 따라 재정의됩니다.",
-	"tabSize.errorMessage": "'number'가 필요합니다. 값 \"auto\"는 `editor.detectIndentation` 설정에 의해 바뀌었습니다.",
-	"insertSpaces": "탭 키를 누를 때 공백을 삽입합니다. `editor.detectIndentation`이 켜져 있는 경우 이 설정은 파일 콘텐츠에 따라 재정의됩니다.",
-	"insertSpaces.errorMessage": "'boolean'이 필요합니다. 값 \"auto\"는 `editor.detectIndentation` 설정에 의해 바뀌었습니다.",
-	"detectIndentation": "파일을 열면 파일 콘텐츠를 기반으로 하여 'editor.tabSize'와 'editor.insertSpaces'가 검색됩니다.",
-	"roundedSelection": "선택 항목의 모서리를 둥글게 할지 여부를 제어합니다.",
-	"scrollBeyondLastLine": "편집기에서 마지막 줄 이후로 스크롤할지 여부를 제어합니다.",
-	"scrollBeyondLastColumn": "편집기에서 가로로 스크롤되는 범위를 벗어나는 추가 문자의 수를 제어합니다.",
-	"smoothScrolling": "편집기에서 애니메이션을 사용하여 스크롤할지 여부를 제어합니다.",
-	"minimap.enabled": "미니맵 표시 여부를 제어합니다.",
-	"minimap.side": "미니맵을 렌더링할 측면을 제어합니다.",
-	"minimap.showSlider": "미니맵 슬라이더를 자동으로 숨길지 결정합니다.",
-	"minimap.renderCharacters": "줄의 실제 문자(색 블록 아님) 렌더링",
-	"minimap.maxColumn": "최대 특정 수의 열을 렌더링하도록 미니맵의 너비를 제한합니다.",
-	"find.seedSearchStringFromSelection": "편집기 선택에서 Find Widget의 검색 문자열을 시딩할지 설정합니다.",
-	"find.autoFindInSelection": "편집기에서 여러 글자 또는 행을 선택했을 때 Find in Selection 플래그를 켤지 설정합니다.",
-	"find.globalFindClipboard": "macOS에서 Find Widget이 공유 클립보드 찾기를 읽거나 수정해야 할지 설정합니다.",
-	"wordWrap.off": "줄이 바뀌지 않습니다.",
-	"wordWrap.on": "뷰포트 너비에서 줄이 바뀝니다.",
-	"wordWrap.wordWrapColumn": "`editor.wordWrapColumn`에서 줄이 바뀝니다.",
-	"wordWrap.bounded": "뷰포트의 최소값 및 `editor.wordWrapColumn`에서 줄이 바뀝니다.",
-	"wordWrap": "줄 바꿈 여부를 제어합니다. 다음 중 하나일 수 있습니다.\n - 'off' (줄 바꿈 사용 안 함),\n - 'on' (뷰포트 줄 바꿈),\n - 'wordWrapColumn' (`editor.wordWrapColumn`에서 줄 바꿈) 또는\n - 'bounded' (뷰포트의 최소값 및 `editor.wordWrapColumn`에서 줄 바꿈).",
-	"wordWrapColumn": "`editor.wordWrap`이 'wordWrapColumn' 또는 'bounded'인 경우 편집기의 열 줄 바꿈을 제어합니다.",
-	"wrappingIndent": "줄 바꿈 행의 들여쓰기를 제어합니다. 'none', 'same', 'indent' 또는 'deepIndent' 중 하나일 수 있습니다.",
-	"mouseWheelScrollSensitivity": "마우스 휠 스크롤 이벤트의 `deltaX` 및 `deltaY`에서 사용할 승수",
-	"multiCursorModifier.ctrlCmd": "Windows와 Linux의 'Control'을 macOS의 'Command'로 매핑합니다.",
-	"multiCursorModifier.alt": "Windows와 Linux의 'Alt'를 macOS의 'Option'으로 매핑합니다.",
-	"multiCursorModifier": "마우스로 여러 커서를 추가할 때 사용할 수정자입니다. `ctrlCmd`는 Windows와 Linux에서 `Control`로 매핑되고 macOS에서 `Command`로 매핑됩니다. Go To Definition 및 Open Link 마우스 제스처가 멀티커서 수정자와 충돌하지 않도록 조정됩니다.",
-	"multiCursorMergeOverlapping": "여러 커서가 겹치는 경우 커서를 병합합니다.",
-	"quickSuggestions.strings": "문자열 내에서 빠른 제안을 사용합니다.",
-	"quickSuggestions.comments": "주석 내에서 빠른 제안을 사용합니다.",
-	"quickSuggestions.other": "문자열 및 주석 외부에서 빠른 제안을 사용합니다.",
-	"quickSuggestions": "입력하는 동안 제안을 자동으로 표시할지 여부를 제어합니다.",
-	"quickSuggestionsDelay": "빠른 제안을 표시할 지연 시간(ms)을 제어합니다.",
-	"parameterHints": "입력과 동시에 매개변수 문서와 유형 정보를 표시하는 팝업을 사용",
-	"autoClosingBrackets": "괄호를 연 다음에 편집기에서 괄호를 자동으로 닫을지 여부를 제어합니다.",
-	"formatOnType": "입력 후 편집기에서 자동으로 줄의 서식을 지정할지 여부를 제어합니다.",
-	"formatOnPaste": "붙여넣은 콘텐츠의 서식을 편집기에서 자동으로 지정할지 여부를 제어합니다. 포맷터는 반드시 사용할 수 있어야 하며 문서에서 범위의 서식을 지정할 수 있어야 합니다.",
-	"autoIndent": "사용자가 입력하고 라인을 붙여넣거나 이동할 때 편집기가 자동으로 들여쓰기를 적용할지 결정합니다. 해당 언어의 들여쓰기 규칙을 사용할 수 있어야 합니다.",
-	"suggestOnTriggerCharacters": "트리거 문자를 입력할 때 제안을 자동으로 표시할지 여부를 제어합니다.",
-	"acceptSuggestionOnEnter": "'Tab' 키 외에 'Enter' 키에 대한 제안도 허용할지를 제어합니다. 새 줄을 삽입하는 동작과 제안을 허용하는 동작 간의 모호함을 없앨 수 있습니다.",
-	"acceptSuggestionOnCommitCharacter": "커밋 문자에 대한 제안을 허용할지를 제어합니다. 예를 들어 JavaScript에서는 세미콜론(';')이 제안을 허용하고 해당 문자를 입력하는 커밋 문자일 수 있습니다.",
-	"snippetSuggestions.top": "다른 제안 위에 조각 제안을 표시합니다.",
-	"snippetSuggestions.bottom": "다른 제안 아래에 조각 제안을 표시합니다.",
-	"snippetSuggestions.inline": "다른 제안과 함께 조각 제안을 표시합니다.",
-	"snippetSuggestions.none": "코드 조각 제안을 표시하지 않습니다.\n",
-	"snippetSuggestions": "코드 조각이 다른 추천과 함께 표시되는지 여부 및 정렬 방법을 제어합니다.",
-	"emptySelectionClipboard": "선택 영역 없이 현재 줄 복사 여부를 제어합니다.",
-	"wordBasedSuggestions": "문서 내 단어를 기반으로 완성을 계산할지 여부를 제어합니다.",
-	"suggestSelection.first": "항상 첫 번째 제안을 선택합니다.",
-	"suggestSelection.recentlyUsed": "추가로 입력되지 않는 경우, 최근 제안을 선택합니다. 예를 들어 'log'가 최근에 완료되었으므로 'console.| -> console.log'로 전개되는 것을 선택합니다.",
-	"suggestSelection.recentlyUsedByPrefix": "제안을 완료한 이전 접두사를 기준으로 제안을 선택합니다. 예를 들어 'co-> console'로,  'con->const'로 전개됩니다.",
-	"suggestSelection": "제안 목록을 표시할 때 제한이 미리 선택되는 방식을 제어합니다.",
-	"suggestFontSize": "제안 위젯의 글꼴 크기",
-	"suggestLineHeight": "제안 위젯의 줄 높이",
-	"selectionHighlight": "편집기에서 선택 항목과 유사한 일치 항목을 강조 표시할지 여부를 제어합니다.",
-	"occurrencesHighlight": "편집기에서 의미 체계 기호 항목을 강조 표시할지 여부를 제어합니다.",
-	"overviewRulerLanes": "개요 눈금자에서 동일한 위치에 표시될 수 있는 장식 수를 제어합니다.",
-	"overviewRulerBorder": "개요 눈금자 주위에 테두리를 그릴지 여부를 제어합니다.",
-	"cursorBlinking": "커서 애니메이션 스타일을 제어합니다.",
-	"mouseWheelZoom": "마우스 휠을 사용할 때 Ctrl 키를 누르고 있으면 편집기의 글꼴 확대/축소",
-	"cursorStyle": "커서 스타일을 제어합니다. 허용되는 값은 '블록', '블록-윤곽', '줄', '줄-가늘게', '밑줄' 및 '밑줄-가늘게'입니다.",
-	"cursorWidth": "editor.cursorStyle 설정이 'line'으로 설정되어 있을 때 커서의 넓이를 조절합니다.",
-	"fontLigatures": "글꼴 합자 사용",
-	"hideCursorInOverviewRuler": "커서가 개요 눈금자에서 가려져야 하는지 여부를 제어합니다.",
-	"renderWhitespace": "편집기에서 공백 문자를 렌더링하는 방법을 제어합니다. 가능한 값은 'none', 'boundary' 및 'all'입니다. 'boundary' 옵션은 단어 사이의 한 칸 공백을 렌더링하지 않습니다.",
-	"renderControlCharacters": "편집기에서 제어 문자를 렌더링할지를 제어합니다.",
-	"renderIndentGuides": "편집기에서 들여쓰기 가이드를 렌더링할지를 제어합니다.",
-	"renderLineHighlight": "편집기가 현재 줄 강조 표시를 렌더링하는 방식을 제어합니다. 가능한 값은 'none', 'gutter', 'line' 및 'all'입니다.",
-	"codeLens": "편집기에서 CodeLens를 표시하는지 여부를 제어합니다.",
-	"folding": "편집기에서 코드 접기를 사용할지 여부를 제어합니다.",
-	"foldingStrategyAuto": "사용 가능한 경우 언어 관련 접기 전략을 사용하고, 그렇지 않은 경우 들여쓰기 기반 전략으로 대체합니다.",
-	"foldingStrategyIndentation": "항상 들여쓰기 기반 접기 전략 사용",
-	"foldingStrategy": "접기 범위를 계산하는 방식을 제어합니다. '자동' 선택이면 사용 가능한 경우 언어 관련 접기 전략을 사용합니다. '들여쓰기'이면 들여쓰기 기반 접기 전략이 사용됩니다.",
-	"showFoldingControls": "거터의 폴드 컨트롤을 자동으로 숨길지 결정합니다.",
-	"matchBrackets": "대괄호 중 하나를 선택할 때 일치하는 대괄호를 강조 표시합니다.",
-	"glyphMargin": "편집기에서 세로 문자 모양 여백을 렌더링할지 여부를 제어합니다. 문자 모양 여백은 주로 디버깅에 사용됩니다.",
-	"useTabStops": "탭 정지 뒤에 공백 삽입 및 삭제",
-	"trimAutoWhitespace": "끝에 자동 삽입된 공백 제거",
-	"stablePeek": "해당 콘텐츠를 두 번 클릭하거나 <Esc> 키를 누르더라도 Peek 편집기를 열린 상태로 유지합니다.",
-	"dragAndDrop": "편집기에서 끌어서 놓기로 선택 영역을 이동할 수 있는지 여부를 제어합니다.",
-	"accessibilitySupport.auto": "편집기가 스크린 리더가 연결되면 플랫폼 API를 사용하여 감지합니다.",
-	"accessibilitySupport.on": "편집기가 스크린 리더 사용을 위해 영구적으로 최적화됩니다.",
-	"accessibilitySupport.off": "편집기가 스크린 리더 사용을 위해 최적화되지 않습니다.",
-	"accessibilitySupport": "편집기를 스크린 리더를 위해 최적화된 모드로 실행할지 결정합니다.",
-	"links": "편집기에서 링크를 감지하고 클릭할 수 있게 만들지 결정합니다.",
-	"colorDecorators": "편집기에서 인라인 색 데코레이터 및 색 선택을 렌더링할지를 제어합니다.",
-	"codeActions": "코드 동작 전구를 사용합니다.",
-	"codeActionsOnSave.organizeImports": "저장할 때 가져오기 구성을 실행하시겠습니까?",
-	"codeActionsOnSave": "저장할 때 실행되는 코드 동작 종류입니다.",
-	"codeActionsOnSaveTimeout": "저장할 때 실행되는 코드 동작에 대한 시간 제한입니다.",
-	"selectionClipboard": "Linux 주 클립보드의 지원 여부를 제어합니다.",
-	"sideBySide": "diff 편집기에서 diff를 나란히 표시할지 인라인으로 표시할지 여부를 제어합니다.",
-	"ignoreTrimWhitespace": "diff 편집기에서 선행 공백 또는 후행 공백 변경을 diffs로 표시할지 여부를 제어합니다.",
-	"largeFileOptimizations": "큰 파일에 대한 특수 처리로, 메모리를 많이 사용하는 특정 기능을 사용하지 않도록 설정합니다.",
-	"renderIndicators": "diff 편집기에서 추가/제거된 변경 내용에 대해 +/- 표시기를 표시하는지 여부를 제어합니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/editor/common/config/defaultConfig.i18n.json b/i18n/kor/src/vs/editor/common/config/defaultConfig.i18n.json
deleted file mode 100644
index 4118aae2aa7..00000000000
--- a/i18n/kor/src/vs/editor/common/config/defaultConfig.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"editorViewAccessibleLabel": "편집기 콘텐츠"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/editor/common/config/editorOptions.i18n.json b/i18n/kor/src/vs/editor/common/config/editorOptions.i18n.json
deleted file mode 100644
index 846c5026b92..00000000000
--- a/i18n/kor/src/vs/editor/common/config/editorOptions.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"accessibilityOffAriaLabel": "지금은 편집기를 사용할 수 없습니다. Alt+F1을 눌러 옵션을 보세요.",
-	"editorViewAccessibleLabel": "편집기 콘텐츠"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/editor/common/controller/cursor.i18n.json b/i18n/kor/src/vs/editor/common/controller/cursor.i18n.json
deleted file mode 100644
index 254a9098c64..00000000000
--- a/i18n/kor/src/vs/editor/common/controller/cursor.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"corrupt.commands": "명령을 실행하는 동안 예기치 않은 예외가 발생했습니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/editor/common/model/textModelWithTokens.i18n.json b/i18n/kor/src/vs/editor/common/model/textModelWithTokens.i18n.json
deleted file mode 100644
index e0730be40aa..00000000000
--- a/i18n/kor/src/vs/editor/common/model/textModelWithTokens.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"mode.tokenizationSupportFailed": "입력을 토큰화하는 동안 모드에서 오류가 발생했습니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/editor/common/modes/modesRegistry.i18n.json b/i18n/kor/src/vs/editor/common/modes/modesRegistry.i18n.json
deleted file mode 100644
index 34252470c61..00000000000
--- a/i18n/kor/src/vs/editor/common/modes/modesRegistry.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"plainText.alias": "일반 텍스트"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/editor/common/services/bulkEdit.i18n.json b/i18n/kor/src/vs/editor/common/services/bulkEdit.i18n.json
deleted file mode 100644
index e75053c8837..00000000000
--- a/i18n/kor/src/vs/editor/common/services/bulkEdit.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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}",
-	"summary.0": "편집하지 않음",
-	"summary.nm": "{1}개 파일에서 {0}개 텍스트 편집을 수행함",
-	"summary.n0": "1개 파일에서 {0}개 텍스트 편집을 수행함"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/editor/common/services/modeServiceImpl.i18n.json b/i18n/kor/src/vs/editor/common/services/modeServiceImpl.i18n.json
deleted file mode 100644
index 856ad50187e..00000000000
--- a/i18n/kor/src/vs/editor/common/services/modeServiceImpl.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"vscode.extension.contributes.languages": "언어 선언을 적용합니다.",
-	"vscode.extension.contributes.languages.id": "언어의 ID입니다.",
-	"vscode.extension.contributes.languages.aliases": "언어에 대한 이름 별칭입니다.",
-	"vscode.extension.contributes.languages.extensions": "파일 확장이 언어에 연결되어 있습니다.",
-	"vscode.extension.contributes.languages.filenames": "파일 이름이 언어에 연결되어 있습니다.",
-	"vscode.extension.contributes.languages.filenamePatterns": "파일 이름 GLOB 패턴이 언어에 연결되어 있습니다.",
-	"vscode.extension.contributes.languages.mimetypes": "Mime 형식이 언어에 연결되어 있습니다.",
-	"vscode.extension.contributes.languages.firstLine": "언어 파일의 첫 번째 줄과 일치하는 정규식입니다.",
-	"vscode.extension.contributes.languages.configuration": "언어에 대한 구성 옵션을 포함하는 파일에 대한 상대 경로입니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/editor/common/services/modelServiceImpl.i18n.json b/i18n/kor/src/vs/editor/common/services/modelServiceImpl.i18n.json
deleted file mode 100644
index e12a9398484..00000000000
--- a/i18n/kor/src/vs/editor/common/services/modelServiceImpl.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"diagAndSourceMultiline": "[{0}]\n{1}",
-	"diagAndSource": "[{0}] {1}"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/editor/common/view/editorColorRegistry.i18n.json b/i18n/kor/src/vs/editor/common/view/editorColorRegistry.i18n.json
deleted file mode 100644
index c148a56d8d6..00000000000
--- a/i18n/kor/src/vs/editor/common/view/editorColorRegistry.i18n.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"lineHighlight": "커서 위치의 줄 강조 표시에 대한 배경색입니다.",
-	"lineHighlightBorderBox": "커서 위치의 줄 테두리에 대한 배경색입니다.",
-	"rangeHighlight": "빠른 열기 및 찾기 기능 등을 통해 강조 표시된 영역의 배경색입니다. 색은 밑에 깔린 꾸밈을 가리지 않도록 반드시 불투명이 아니어야 합니다.",
-	"rangeHighlightBorder": "강조 영역 주변의 테두리에 대한 배경색입니다",
-	"caret": "편집기 커서 색입니다.",
-	"editorCursorBackground": "편집기 커서의 배경색입니다. 블록 커서와 겹치는 글자의 색상을 사용자 정의할 수 있습니다.",
-	"editorWhitespaces": "편집기의 공백 문자 색입니다.",
-	"editorIndentGuides": "편집기 들여쓰기 안내선 색입니다.",
-	"editorActiveIndentGuide": "활성 편집기 들여쓰기 안내선 색입니다.",
-	"editorLineNumbers": "편집기 줄 번호 색입니다.",
-	"editorActiveLineNumber": "편집기 활성 영역 줄번호 색상",
-	"deprecatedEditorActiveLineNumber": "ID는 사용되지 않습니다. 대신 'editorLineNumber.activeForeground'를 사용하세요.",
-	"editorRuler": "편집기 눈금의 색상입니다.",
-	"editorCodeLensForeground": "편집기 코드 렌즈의 전경색입니다.",
-	"editorBracketMatchBackground": "일치하는 괄호 뒤의 배경색",
-	"editorBracketMatchBorder": "일치하는 브래킷 박스의 색상",
-	"editorOverviewRulerBorder": "개요 눈금 경계의 색상입니다.",
-	"editorGutter": "편집기 거터의 배경색입니다. 거터에는 글리프 여백과 행 수가 있습니다.",
-	"errorForeground": "편집기 내 오류 표시선의 전경색입니다.",
-	"errorBorder": "편집기 내 오류 표시선의 테두리 색입니다.",
-	"warningForeground": "편집기 내 경고 표시선의 전경색입니다.",
-	"warningBorder": "편집기 내 경고 표시선의 테두리 색입니다.",
-	"infoForeground": "편집기 내 정보 표시선의 전경색입니다.",
-	"infoBorder": "편집기 내 정보 표시선의 테두리 색입니다.",
-	"hintForeground": "편집기에서 힌트 표시선의 전경색입니다.",
-	"hintBorder": "편집기에서 힌트 표시선의 테두리 색입니다.",
-	"unnecessaryForeground": "편집기 내 불필요한 코드의 전경색입니다.",
-	"overviewRulerRangeHighlight": "범위 강조의 개요 눈금자 표식 색입니다. 이 색은 불투명해야만 내부 장식을 가리지 않습니다.",
-	"overviewRuleError": "오류의 개요 눈금자 마커 색입니다.",
-	"overviewRuleWarning": "경고의 개요 눈금자 마커 색입니다.",
-	"overviewRuleInfo": "정보의 개요 눈금자 마커 색입니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/editor/contrib/accessibility/browser/accessibility.i18n.json b/i18n/kor/src/vs/editor/contrib/accessibility/browser/accessibility.i18n.json
deleted file mode 100644
index 6376986b998..00000000000
--- a/i18n/kor/src/vs/editor/contrib/accessibility/browser/accessibility.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"introMsg": "VS Code의 접근성 옵션을 사용해 주셔서 감사합니다.",
-	"status": "상태:",
-	"tabFocusModeOnMsg": "현재 편집기에서 <Tab> 키를 누르면 포커스가 다음 포커스 가능한 요소로 이동합니다. {0}을(를) 눌러서 이 동작을 설정/해제합니다.",
-	"tabFocusModeOnMsgNoKb": "현재 편집기에서 <Tab> 키를 누르면 포커스가 다음 포커스 가능한 요소로 이동합니다. {0} 명령은 현재 키 바인딩으로 트리거할 수 없습니다.",
-	"tabFocusModeOffMsg": "현재 편집기에서 <Tab> 키를 누르면 탭 문자가 삽입됩니다. {0}을(를) 눌러서 이 동작을 설정/해제합니다.",
-	"tabFocusModeOffMsgNoKb": "현재 편집기에서 <Tab> 키를 누르면 탭 문자가 삽입됩니다. {0} 명령은 현재 키 바인딩으로 트리거할 수 없습니다.",
-	"outroMsg": "이 도구 설명을 해제하고 Esc 키를 눌러서 편집기로 돌아갈 수 있습니다.",
-	"ShowAccessibilityHelpAction": "접근성 도움말 표시"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/editor/contrib/bracketMatching/bracketMatching.i18n.json b/i18n/kor/src/vs/editor/contrib/bracketMatching/bracketMatching.i18n.json
deleted file mode 100644
index 4e71c899a27..00000000000
--- a/i18n/kor/src/vs/editor/contrib/bracketMatching/bracketMatching.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"overviewRulerBracketMatchForeground": "괄호에 해당하는 영역을 표시자에 채색하여 표시합니다.",
-	"smartSelect.jumpBracket": "대괄호로 이동",
-	"smartSelect.selectToBracket": "괄호까지 선택"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/editor/contrib/bracketMatching/common/bracketMatching.i18n.json b/i18n/kor/src/vs/editor/contrib/bracketMatching/common/bracketMatching.i18n.json
deleted file mode 100644
index 4bf58092c96..00000000000
--- a/i18n/kor/src/vs/editor/contrib/bracketMatching/common/bracketMatching.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"smartSelect.jumpBracket": "대괄호로 이동"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/editor/contrib/caretOperations/caretOperations.i18n.json b/i18n/kor/src/vs/editor/contrib/caretOperations/caretOperations.i18n.json
deleted file mode 100644
index de643cc0aeb..00000000000
--- a/i18n/kor/src/vs/editor/contrib/caretOperations/caretOperations.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"caret.moveLeft": "캐럿을 왼쪽으로 이동",
-	"caret.moveRight": "캐럿을 오른쪽으로 이동"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/editor/contrib/caretOperations/common/caretOperations.i18n.json b/i18n/kor/src/vs/editor/contrib/caretOperations/common/caretOperations.i18n.json
deleted file mode 100644
index 27cec366d1a..00000000000
--- a/i18n/kor/src/vs/editor/contrib/caretOperations/common/caretOperations.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"caret.moveLeft": "캐럿을 왼쪽으로 이동",
-	"caret.moveRight": "캐럿을 오른쪽으로 이동"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/editor/contrib/caretOperations/common/transpose.i18n.json b/i18n/kor/src/vs/editor/contrib/caretOperations/common/transpose.i18n.json
deleted file mode 100644
index 71fd84232aa..00000000000
--- a/i18n/kor/src/vs/editor/contrib/caretOperations/common/transpose.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"transposeLetters.label": "문자 바꾸기"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/editor/contrib/caretOperations/transpose.i18n.json b/i18n/kor/src/vs/editor/contrib/caretOperations/transpose.i18n.json
deleted file mode 100644
index 280af0cd65e..00000000000
--- a/i18n/kor/src/vs/editor/contrib/caretOperations/transpose.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"transposeLetters.label": "문자 바꾸기"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/editor/contrib/clipboard/browser/clipboard.i18n.json b/i18n/kor/src/vs/editor/contrib/clipboard/browser/clipboard.i18n.json
deleted file mode 100644
index 1e6e7c17e21..00000000000
--- a/i18n/kor/src/vs/editor/contrib/clipboard/browser/clipboard.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"actions.clipboard.cutLabel": "잘라내기",
-	"actions.clipboard.copyLabel": "복사",
-	"actions.clipboard.pasteLabel": "붙여넣기",
-	"actions.clipboard.copyWithSyntaxHighlightingLabel": "구문을 강조 표시하여 복사"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/editor/contrib/clipboard/clipboard.i18n.json b/i18n/kor/src/vs/editor/contrib/clipboard/clipboard.i18n.json
deleted file mode 100644
index 13bc8eb9206..00000000000
--- a/i18n/kor/src/vs/editor/contrib/clipboard/clipboard.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"actions.clipboard.cutLabel": "잘라내기",
-	"actions.clipboard.copyLabel": "복사",
-	"actions.clipboard.pasteLabel": "붙여넣기",
-	"actions.clipboard.copyWithSyntaxHighlightingLabel": "구문을 강조 표시하여 복사"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/editor/contrib/codeAction/codeActionCommands.i18n.json b/i18n/kor/src/vs/editor/contrib/codeAction/codeActionCommands.i18n.json
deleted file mode 100644
index 8c25ff6cd43..00000000000
--- a/i18n/kor/src/vs/editor/contrib/codeAction/codeActionCommands.i18n.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"quickFixWithKb": "수정 사항 표시({0})",
-	"quickFix": "수정 사항 표시",
-	"quickfix.trigger.label": "빠른 수정...",
-	"editor.action.quickFix.noneMessage": "사용 가능한 코드 동작이 없습니다.",
-	"refactor.label": "리팩터링...",
-	"editor.action.refactor.noneMessage": "사용 가능한 리펙터링이 없습니다.",
-	"source.label": "소스 작업...",
-	"editor.action.source.noneMessage": "사용 가능한 소스 작업이 없습니다.",
-	"organizeImports.label": "가져오기 구성",
-	"editor.action.organize.noneMessage": "사용 가능한 가져오기 구성 작업이 없습니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/editor/contrib/comment/comment.i18n.json b/i18n/kor/src/vs/editor/contrib/comment/comment.i18n.json
deleted file mode 100644
index d53d890d0e4..00000000000
--- a/i18n/kor/src/vs/editor/contrib/comment/comment.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"comment.line": "줄 주석 설정/해제",
-	"comment.line.add": "줄 주석 추가",
-	"comment.line.remove": "줄 주석 제거",
-	"comment.block": "블록 주석 설정/해제"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/editor/contrib/comment/common/comment.i18n.json b/i18n/kor/src/vs/editor/contrib/comment/common/comment.i18n.json
deleted file mode 100644
index 5b5b2cac857..00000000000
--- a/i18n/kor/src/vs/editor/contrib/comment/common/comment.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"comment.line": "줄 주석 설정/해제",
-	"comment.line.add": "줄 주석 추가",
-	"comment.line.remove": "줄 주석 제거",
-	"comment.block": "블록 주석 설정/해제"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/editor/contrib/contextmenu/browser/contextmenu.i18n.json b/i18n/kor/src/vs/editor/contrib/contextmenu/browser/contextmenu.i18n.json
deleted file mode 100644
index cee5d91a1b7..00000000000
--- a/i18n/kor/src/vs/editor/contrib/contextmenu/browser/contextmenu.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"action.showContextMenu.label": "편집기 상황에 맞는 메뉴 표시"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/editor/contrib/contextmenu/contextmenu.i18n.json b/i18n/kor/src/vs/editor/contrib/contextmenu/contextmenu.i18n.json
deleted file mode 100644
index 46fb92dc93a..00000000000
--- a/i18n/kor/src/vs/editor/contrib/contextmenu/contextmenu.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"action.showContextMenu.label": "편집기 상황에 맞는 메뉴 표시"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/editor/contrib/find/browser/findWidget.i18n.json b/i18n/kor/src/vs/editor/contrib/find/browser/findWidget.i18n.json
deleted file mode 100644
index f820392132e..00000000000
--- a/i18n/kor/src/vs/editor/contrib/find/browser/findWidget.i18n.json
+++ /dev/null
@@ -1,21 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"label.find": "찾기",
-	"placeholder.find": "찾기",
-	"label.previousMatchButton": "이전 검색 결과",
-	"label.nextMatchButton": "다음 검색 결과",
-	"label.toggleSelectionFind": "선택 항목에서 찾기",
-	"label.closeButton": "닫기",
-	"label.replace": "바꾸기",
-	"placeholder.replace": "바꾸기",
-	"label.replaceButton": "바꾸기",
-	"label.replaceAllButton": "모두 바꾸기",
-	"label.toggleReplaceButton": "바꾸기 모드 설정/해제",
-	"title.matchesCountLimit": "처음 {0}개의 결과가 강조 표시되지만 모든 찾기 작업은 전체 텍스트에 대해 수행됩니다.",
-	"label.matchesLocation": "{0}/{1}",
-	"label.noResults": "결과 없음"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/editor/contrib/find/browser/simpleFindWidget.i18n.json b/i18n/kor/src/vs/editor/contrib/find/browser/simpleFindWidget.i18n.json
deleted file mode 100644
index c45550055e9..00000000000
--- a/i18n/kor/src/vs/editor/contrib/find/browser/simpleFindWidget.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"label.find": "찾기",
-	"placeholder.find": "찾기",
-	"label.previousMatchButton": "이전 검색 결과",
-	"label.nextMatchButton": "다음 검색 결과",
-	"label.closeButton": "닫기"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/editor/contrib/find/common/findController.i18n.json b/i18n/kor/src/vs/editor/contrib/find/common/findController.i18n.json
deleted file mode 100644
index 7201d1ab08f..00000000000
--- a/i18n/kor/src/vs/editor/contrib/find/common/findController.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"startFindAction": "찾기",
-	"findNextMatchAction": "다음 찾기",
-	"findPreviousMatchAction": "이전 찾기",
-	"nextSelectionMatchFindAction": "다음 선택 찾기",
-	"previousSelectionMatchFindAction": "이전 선택 찾기",
-	"startReplace": "바꾸기",
-	"showNextFindTermAction": "다음 검색어 표시",
-	"showPreviousFindTermAction": "이전 검색어 표시"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/editor/contrib/find/findController.i18n.json b/i18n/kor/src/vs/editor/contrib/find/findController.i18n.json
deleted file mode 100644
index 775d0958140..00000000000
--- a/i18n/kor/src/vs/editor/contrib/find/findController.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"startFindAction": "찾기",
-	"startFindWithSelectionAction": "선택 영역에서 찾기",
-	"findNextMatchAction": "다음 찾기",
-	"findPreviousMatchAction": "이전 찾기",
-	"nextSelectionMatchFindAction": "다음 선택 찾기",
-	"previousSelectionMatchFindAction": "이전 선택 찾기",
-	"startReplace": "바꾸기",
-	"showNextFindTermAction": "다음 검색어 표시",
-	"showPreviousFindTermAction": "이전 검색어 표시"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/editor/contrib/find/findWidget.i18n.json b/i18n/kor/src/vs/editor/contrib/find/findWidget.i18n.json
deleted file mode 100644
index eb53e1ab1da..00000000000
--- a/i18n/kor/src/vs/editor/contrib/find/findWidget.i18n.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"label.find": "찾기",
-	"placeholder.find": "찾기",
-	"label.previousMatchButton": "이전 검색 결과",
-	"label.nextMatchButton": "다음 검색 결과",
-	"label.toggleSelectionFind": "선택 항목에서 찾기",
-	"label.closeButton": "닫기",
-	"label.replace": "바꾸기",
-	"placeholder.replace": "바꾸기",
-	"label.replaceButton": "바꾸기",
-	"label.replaceAllButton": "모두 바꾸기",
-	"label.toggleReplaceButton": "바꾸기 모드 설정/해제",
-	"title.matchesCountLimit": "처음 {0}개의 결과가 강조 표시되지만 모든 찾기 작업은 전체 텍스트에 대해 수행됩니다.",
-	"label.matchesLocation": "{0}/{1}",
-	"label.noResults": "결과 없음"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/editor/contrib/find/simpleFindWidget.i18n.json b/i18n/kor/src/vs/editor/contrib/find/simpleFindWidget.i18n.json
deleted file mode 100644
index 258899ec0e3..00000000000
--- a/i18n/kor/src/vs/editor/contrib/find/simpleFindWidget.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"label.find": "찾기",
-	"placeholder.find": "찾기",
-	"label.previousMatchButton": "이전 검색 결과",
-	"label.nextMatchButton": "다음 검색 결과",
-	"label.closeButton": "닫기"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/editor/contrib/folding/browser/folding.i18n.json b/i18n/kor/src/vs/editor/contrib/folding/browser/folding.i18n.json
deleted file mode 100644
index 0414d7621a5..00000000000
--- a/i18n/kor/src/vs/editor/contrib/folding/browser/folding.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"unfoldAction.label": "펼치기",
-	"unFoldRecursivelyAction.label": "재귀적으로 펼치기",
-	"foldAction.label": "접기",
-	"foldRecursivelyAction.label": "재귀적으로 접기",
-	"foldAllAction.label": "모두 접기",
-	"unfoldAllAction.label": "모두 펼치기",
-	"foldLevelAction.label": "수준 {0} 접기"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/editor/contrib/folding/folding.i18n.json b/i18n/kor/src/vs/editor/contrib/folding/folding.i18n.json
deleted file mode 100644
index 702a8ee6eb6..00000000000
--- a/i18n/kor/src/vs/editor/contrib/folding/folding.i18n.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"unfoldAction.label": "펼치기",
-	"unFoldRecursivelyAction.label": "재귀적으로 펼치기",
-	"foldAction.label": "접기",
-	"foldRecursivelyAction.label": "재귀적으로 접기",
-	"foldAllBlockComments.label": "모든 블록 코멘트를 접기",
-	"foldAllMarkerRegions.label": "모든 영역 접기",
-	"unfoldAllMarkerRegions.label": "모든 영역 펼치기",
-	"foldAllAction.label": "모두 접기",
-	"unfoldAllAction.label": "모두 펼치기",
-	"foldLevelAction.label": "수준 {0} 접기"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/editor/contrib/fontZoom/fontZoom.i18n.json b/i18n/kor/src/vs/editor/contrib/fontZoom/fontZoom.i18n.json
deleted file mode 100644
index bd09d8f5460..00000000000
--- a/i18n/kor/src/vs/editor/contrib/fontZoom/fontZoom.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"EditorFontZoomIn.label": "편집기 글꼴 확대",
-	"EditorFontZoomOut.label": "편집기 글꼴 축소",
-	"EditorFontZoomReset.label": "편집기 글꼴 확대/축소 다시 설정"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/editor/contrib/format/browser/formatActions.i18n.json b/i18n/kor/src/vs/editor/contrib/format/browser/formatActions.i18n.json
deleted file mode 100644
index 8811618c869..00000000000
--- a/i18n/kor/src/vs/editor/contrib/format/browser/formatActions.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"hint11": "줄 {0}에서 1개 서식 편집을 수행했습니다.",
-	"hintn1": "줄 {1}에서 {0}개 서식 편집을 수행했습니다.",
-	"hint1n": "줄 {0}과(와) {1} 사이에서 1개 서식 편집을 수행했습니다.",
-	"hintnn": "줄 {1}과(와) {2} 사이에서 {0}개 서식 편집을 수행했습니다.",
-	"no.provider": "죄송 합니다, 하지만 ' {0} '파일에 대 한 포맷터가 존재 하지 않습니다..",
-	"formatDocument.label": "문서 서식",
-	"formatSelection.label": "선택 영역 서식"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/editor/contrib/format/formatActions.i18n.json b/i18n/kor/src/vs/editor/contrib/format/formatActions.i18n.json
deleted file mode 100644
index 2f2110917d0..00000000000
--- a/i18n/kor/src/vs/editor/contrib/format/formatActions.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hint11": "줄 {0}에서 1개 서식 편집을 수행했습니다.",
-	"hintn1": "줄 {1}에서 {0}개 서식 편집을 수행했습니다.",
-	"hint1n": "줄 {0}과(와) {1} 사이에서 1개 서식 편집을 수행했습니다.",
-	"hintnn": "줄 {1}과(와) {2} 사이에서 {0}개 서식 편집을 수행했습니다.",
-	"no.provider": " '{0}'-파일에 대한 설치된 형식기가 없습니다.",
-	"formatDocument.label": "문서 서식",
-	"no.documentprovider": " '{0}'-파일에 대한 문서 포맷터가 설치되어 있지 않습니다.",
-	"formatSelection.label": "선택 영역 서식",
-	"no.selectionprovider": "'{0}'-파일에 대한 선택 영역 포맷터가 설치되어 있지 않습니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.i18n.json b/i18n/kor/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.i18n.json
deleted file mode 100644
index 6180413fbf3..00000000000
--- a/i18n/kor/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.i18n.json
+++ /dev/null
@@ -1,24 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"noResultWord": "'{0}'에 대한 정의를 찾을 수 없습니다.",
-	"generic.noResults": "정의를 찾을 수 없음",
-	"meta.title": "– {0} 정의",
-	"actions.goToDecl.label": "정의로 이동",
-	"actions.goToDeclToSide.label": "측면에서 정의 열기",
-	"actions.previewDecl.label": "정의 피킹(Peeking)",
-	"goToImplementation.noResultWord": "'{0}'에 대한 구현을 찾을 수 없습니다.",
-	"goToImplementation.generic.noResults": "구현을 찾을 수 없습니다.",
-	"meta.implementations.title": " – {0} 개 구현",
-	"actions.goToImplementation.label": "구현으로 이동",
-	"actions.peekImplementation.label": "구현 미리 보기",
-	"goToTypeDefinition.noResultWord": "'{0}'에 대한 형식 정의를 찾을 수 없습니다.",
-	"goToTypeDefinition.generic.noResults": "형식 정의를 찾을 수 없습니다.",
-	"meta.typeDefinitions.title": "– {0} 형식 정의",
-	"actions.goToTypeDefinition.label": "형식 정의로 이동",
-	"actions.peekTypeDefinition.label": "형식 정의 미리 보기",
-	"multipleResults": "{0}개 정의를 표시하려면 클릭하세요."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/editor/contrib/goToDeclaration/browser/goToDeclarationCommands.i18n.json b/i18n/kor/src/vs/editor/contrib/goToDeclaration/browser/goToDeclarationCommands.i18n.json
deleted file mode 100644
index eb7148607bd..00000000000
--- a/i18n/kor/src/vs/editor/contrib/goToDeclaration/browser/goToDeclarationCommands.i18n.json
+++ /dev/null
@@ -1,23 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"noResultWord": "'{0}'에 대한 정의를 찾을 수 없습니다.",
-	"generic.noResults": "정의를 찾을 수 없음",
-	"meta.title": "– {0} 정의",
-	"actions.goToDecl.label": "정의로 이동",
-	"actions.goToDeclToSide.label": "측면에서 정의 열기",
-	"actions.previewDecl.label": "정의 피킹(Peeking)",
-	"goToImplementation.noResultWord": "'{0}'에 대한 구현을 찾을 수 없습니다.",
-	"goToImplementation.generic.noResults": "구현을 찾을 수 없습니다.",
-	"meta.implementations.title": " – {0} 개 구현",
-	"actions.goToImplementation.label": "구현으로 이동",
-	"actions.peekImplementation.label": "구현 미리 보기",
-	"goToTypeDefinition.noResultWord": "'{0}'에 대한 형식 정의를 찾을 수 없습니다.",
-	"goToTypeDefinition.generic.noResults": "형식 정의를 찾을 수 없습니다.",
-	"meta.typeDefinitions.title": "– {0} 형식 정의",
-	"actions.goToTypeDefinition.label": "형식 정의로 이동",
-	"actions.peekTypeDefinition.label": "형식 정의 미리 보기"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/editor/contrib/goToDeclaration/browser/goToDeclarationMouse.i18n.json b/i18n/kor/src/vs/editor/contrib/goToDeclaration/browser/goToDeclarationMouse.i18n.json
deleted file mode 100644
index 57b4929798f..00000000000
--- a/i18n/kor/src/vs/editor/contrib/goToDeclaration/browser/goToDeclarationMouse.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"multipleResults": "{0}개 정의를 표시하려면 클릭하세요."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/editor/contrib/goToDeclaration/goToDeclarationCommands.i18n.json b/i18n/kor/src/vs/editor/contrib/goToDeclaration/goToDeclarationCommands.i18n.json
deleted file mode 100644
index 9ea2577ce62..00000000000
--- a/i18n/kor/src/vs/editor/contrib/goToDeclaration/goToDeclarationCommands.i18n.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noResultWord": "'{0}'에 대한 정의를 찾을 수 없습니다.",
-	"generic.noResults": "정의를 찾을 수 없음",
-	"meta.title": "– {0} 정의",
-	"actions.goToDecl.label": "정의로 이동",
-	"actions.goToDeclToSide.label": "측면에서 정의 열기",
-	"actions.previewDecl.label": "정의 피킹(Peeking)",
-	"goToImplementation.noResultWord": "'{0}'에 대한 구현을 찾을 수 없습니다.",
-	"goToImplementation.generic.noResults": "구현을 찾을 수 없습니다.",
-	"meta.implementations.title": " – {0} 개 구현",
-	"actions.goToImplementation.label": "구현으로 이동",
-	"actions.peekImplementation.label": "구현 미리 보기",
-	"goToTypeDefinition.noResultWord": "'{0}'에 대한 형식 정의를 찾을 수 없습니다.",
-	"goToTypeDefinition.generic.noResults": "형식 정의를 찾을 수 없습니다.",
-	"meta.typeDefinitions.title": "– {0} 형식 정의",
-	"actions.goToTypeDefinition.label": "형식 정의로 이동",
-	"actions.peekTypeDefinition.label": "형식 정의 미리 보기"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/editor/contrib/goToDeclaration/goToDeclarationMouse.i18n.json b/i18n/kor/src/vs/editor/contrib/goToDeclaration/goToDeclarationMouse.i18n.json
deleted file mode 100644
index 98ad1f027b2..00000000000
--- a/i18n/kor/src/vs/editor/contrib/goToDeclaration/goToDeclarationMouse.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"multipleResults": "{0}개 정의를 표시하려면 클릭하세요."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/editor/contrib/goToDefinition/goToDefinitionCommands.i18n.json b/i18n/kor/src/vs/editor/contrib/goToDefinition/goToDefinitionCommands.i18n.json
deleted file mode 100644
index 9ea2577ce62..00000000000
--- a/i18n/kor/src/vs/editor/contrib/goToDefinition/goToDefinitionCommands.i18n.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noResultWord": "'{0}'에 대한 정의를 찾을 수 없습니다.",
-	"generic.noResults": "정의를 찾을 수 없음",
-	"meta.title": "– {0} 정의",
-	"actions.goToDecl.label": "정의로 이동",
-	"actions.goToDeclToSide.label": "측면에서 정의 열기",
-	"actions.previewDecl.label": "정의 피킹(Peeking)",
-	"goToImplementation.noResultWord": "'{0}'에 대한 구현을 찾을 수 없습니다.",
-	"goToImplementation.generic.noResults": "구현을 찾을 수 없습니다.",
-	"meta.implementations.title": " – {0} 개 구현",
-	"actions.goToImplementation.label": "구현으로 이동",
-	"actions.peekImplementation.label": "구현 미리 보기",
-	"goToTypeDefinition.noResultWord": "'{0}'에 대한 형식 정의를 찾을 수 없습니다.",
-	"goToTypeDefinition.generic.noResults": "형식 정의를 찾을 수 없습니다.",
-	"meta.typeDefinitions.title": "– {0} 형식 정의",
-	"actions.goToTypeDefinition.label": "형식 정의로 이동",
-	"actions.peekTypeDefinition.label": "형식 정의 미리 보기"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/editor/contrib/goToDefinition/goToDefinitionMouse.i18n.json b/i18n/kor/src/vs/editor/contrib/goToDefinition/goToDefinitionMouse.i18n.json
deleted file mode 100644
index 98ad1f027b2..00000000000
--- a/i18n/kor/src/vs/editor/contrib/goToDefinition/goToDefinitionMouse.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"multipleResults": "{0}개 정의를 표시하려면 클릭하세요."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/editor/contrib/gotoError/browser/gotoError.i18n.json b/i18n/kor/src/vs/editor/contrib/gotoError/browser/gotoError.i18n.json
deleted file mode 100644
index 58029e4cfcd..00000000000
--- a/i18n/kor/src/vs/editor/contrib/gotoError/browser/gotoError.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"title.wo_source": "({0}/{1})",
-	"markerAction.next.label": "다음 오류 또는 경고로 이동",
-	"markerAction.previous.label": "이전 오류 또는 경고로 이동",
-	"editorMarkerNavigationError": "편집기 표식 탐색 위젯 오류 색입니다.",
-	"editorMarkerNavigationWarning": "편집기 표식 탐색 위젯 경고 색입니다.",
-	"editorMarkerNavigationInfo": "편집기 표식 탐색 위젯 정보 색입니다.",
-	"editorMarkerNavigationBackground": "편집기 표식 탐색 위젯 배경입니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/editor/contrib/gotoError/gotoError.i18n.json b/i18n/kor/src/vs/editor/contrib/gotoError/gotoError.i18n.json
deleted file mode 100644
index 4b9dba92931..00000000000
--- a/i18n/kor/src/vs/editor/contrib/gotoError/gotoError.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"markerAction.next.label": "다음 문제로 이동 (오류, 경고, 정보)",
-	"markerAction.previous.label": "이전 문제로 이동 (오류, 경고, 정보)",
-	"markerAction.nextInFiles.label": "파일의 다음 문제로 이동 (오류, 경고, 정보)",
-	"markerAction.previousInFiles.label": "파일의 이전 문제로 이동 (오류, 경고, 정보)"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json b/i18n/kor/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json
deleted file mode 100644
index ff17e99717f..00000000000
--- a/i18n/kor/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"title.wo_source": "({0}/{1})",
-	"editorMarkerNavigationError": "편집기 표식 탐색 위젯 오류 색입니다.",
-	"editorMarkerNavigationWarning": "편집기 표식 탐색 위젯 경고 색입니다.",
-	"editorMarkerNavigationInfo": "편집기 표식 탐색 위젯 정보 색입니다.",
-	"editorMarkerNavigationBackground": "편집기 표식 탐색 위젯 배경입니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/editor/contrib/hover/browser/hover.i18n.json b/i18n/kor/src/vs/editor/contrib/hover/browser/hover.i18n.json
deleted file mode 100644
index af972da445a..00000000000
--- a/i18n/kor/src/vs/editor/contrib/hover/browser/hover.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"showHover": "가리키기 표시"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/editor/contrib/hover/browser/modesContentHover.i18n.json b/i18n/kor/src/vs/editor/contrib/hover/browser/modesContentHover.i18n.json
deleted file mode 100644
index 9e3147cdd15..00000000000
--- a/i18n/kor/src/vs/editor/contrib/hover/browser/modesContentHover.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"modesContentHover.loading": "로드 중..."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/editor/contrib/hover/hover.i18n.json b/i18n/kor/src/vs/editor/contrib/hover/hover.i18n.json
deleted file mode 100644
index 0e02d14cf20..00000000000
--- a/i18n/kor/src/vs/editor/contrib/hover/hover.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"showHover": "가리키기 표시"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/editor/contrib/hover/modesContentHover.i18n.json b/i18n/kor/src/vs/editor/contrib/hover/modesContentHover.i18n.json
deleted file mode 100644
index 46da151cb44..00000000000
--- a/i18n/kor/src/vs/editor/contrib/hover/modesContentHover.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"modesContentHover.loading": "로드 중..."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/editor/contrib/inPlaceReplace/common/inPlaceReplace.i18n.json b/i18n/kor/src/vs/editor/contrib/inPlaceReplace/common/inPlaceReplace.i18n.json
deleted file mode 100644
index 8c88e6b0caa..00000000000
--- a/i18n/kor/src/vs/editor/contrib/inPlaceReplace/common/inPlaceReplace.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"InPlaceReplaceAction.previous.label": "이전 값으로 바꾸기",
-	"InPlaceReplaceAction.next.label": "다음 값으로 바꾸기"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/editor/contrib/inPlaceReplace/inPlaceReplace.i18n.json b/i18n/kor/src/vs/editor/contrib/inPlaceReplace/inPlaceReplace.i18n.json
deleted file mode 100644
index 76b4a11bf6d..00000000000
--- a/i18n/kor/src/vs/editor/contrib/inPlaceReplace/inPlaceReplace.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"InPlaceReplaceAction.previous.label": "이전 값으로 바꾸기",
-	"InPlaceReplaceAction.next.label": "다음 값으로 바꾸기"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/editor/contrib/indentation/common/indentation.i18n.json b/i18n/kor/src/vs/editor/contrib/indentation/common/indentation.i18n.json
deleted file mode 100644
index 0e91b461922..00000000000
--- a/i18n/kor/src/vs/editor/contrib/indentation/common/indentation.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"indentationToSpaces": "들여쓰기를 공백으로 변환",
-	"indentationToTabs": "들여쓰기를 탭으로 변환",
-	"configuredTabSize": "구성된 탭 크기",
-	"selectTabWidth": "현재 파일의 탭 크기 선택",
-	"indentUsingTabs": "탭을 사용한 들여쓰기",
-	"indentUsingSpaces": "공백을 사용한 들여쓰기",
-	"detectIndentation": "콘텐츠에서 들여쓰기 감지",
-	"editor.reindentlines": "줄 다시 들여쓰기"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/editor/contrib/indentation/indentation.i18n.json b/i18n/kor/src/vs/editor/contrib/indentation/indentation.i18n.json
deleted file mode 100644
index 174f8c8c394..00000000000
--- a/i18n/kor/src/vs/editor/contrib/indentation/indentation.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"indentationToSpaces": "들여쓰기를 공백으로 변환",
-	"indentationToTabs": "들여쓰기를 탭으로 변환",
-	"configuredTabSize": "구성된 탭 크기",
-	"selectTabWidth": "현재 파일의 탭 크기 선택",
-	"indentUsingTabs": "탭을 사용한 들여쓰기",
-	"indentUsingSpaces": "공백을 사용한 들여쓰기",
-	"detectIndentation": "콘텐츠에서 들여쓰기 감지",
-	"editor.reindentlines": "줄 다시 들여쓰기",
-	"editor.reindentselectedlines": "선택한 줄 다시 들여쓰기"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/editor/contrib/inspectTMScopes/electron-browser/inspectTMScopes.i18n.json b/i18n/kor/src/vs/editor/contrib/inspectTMScopes/electron-browser/inspectTMScopes.i18n.json
deleted file mode 100644
index b945677181e..00000000000
--- a/i18n/kor/src/vs/editor/contrib/inspectTMScopes/electron-browser/inspectTMScopes.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"inspectTMScopes": "개발자: TM 범위 검사",
-	"inspectTMScopesWidget.loading": "로드 중..."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/editor/contrib/linesOperations/common/linesOperations.i18n.json b/i18n/kor/src/vs/editor/contrib/linesOperations/common/linesOperations.i18n.json
deleted file mode 100644
index 7e12706f990..00000000000
--- a/i18n/kor/src/vs/editor/contrib/linesOperations/common/linesOperations.i18n.json
+++ /dev/null
@@ -1,25 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"lines.copyUp": "위에 줄 복사",
-	"lines.copyDown": "아래에 줄 복사",
-	"lines.moveUp": "줄 위로 이동",
-	"lines.moveDown": "줄 아래로 이동",
-	"lines.sortAscending": "줄을 오름차순 정렬",
-	"lines.sortDescending": "줄을 내림차순으로 정렬",
-	"lines.trimTrailingWhitespace": "후행 공백 자르기",
-	"lines.delete": "줄 삭제",
-	"lines.indent": "줄 들여쓰기",
-	"lines.outdent": "줄 내어쓰기",
-	"lines.insertBefore": "위에 줄 삽입",
-	"lines.insertAfter": "아래에 줄 삽입",
-	"lines.deleteAllLeft": "왼쪽 모두 삭제",
-	"lines.deleteAllRight": "우측에 있는 항목 삭제",
-	"lines.joinLines": "줄 연결",
-	"editor.transpose": "커서 주위 문자 바꾸기",
-	"editor.transformToUppercase": "대문자로 변환",
-	"editor.transformToLowercase": "소문자로 변환"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/editor/contrib/linesOperations/linesOperations.i18n.json b/i18n/kor/src/vs/editor/contrib/linesOperations/linesOperations.i18n.json
deleted file mode 100644
index b7ecf9015dd..00000000000
--- a/i18n/kor/src/vs/editor/contrib/linesOperations/linesOperations.i18n.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"lines.copyUp": "위에 줄 복사",
-	"lines.copyDown": "아래에 줄 복사",
-	"lines.moveUp": "줄 위로 이동",
-	"lines.moveDown": "줄 아래로 이동",
-	"lines.sortAscending": "줄을 오름차순 정렬",
-	"lines.sortDescending": "줄을 내림차순으로 정렬",
-	"lines.trimTrailingWhitespace": "후행 공백 자르기",
-	"lines.delete": "줄 삭제",
-	"lines.indent": "줄 들여쓰기",
-	"lines.outdent": "줄 내어쓰기",
-	"lines.insertBefore": "위에 줄 삽입",
-	"lines.insertAfter": "아래에 줄 삽입",
-	"lines.deleteAllLeft": "왼쪽 모두 삭제",
-	"lines.deleteAllRight": "우측에 있는 항목 삭제",
-	"lines.joinLines": "줄 연결",
-	"editor.transpose": "커서 주위 문자 바꾸기",
-	"editor.transformToUppercase": "대문자로 변환",
-	"editor.transformToLowercase": "소문자로 변환"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/editor/contrib/links/browser/links.i18n.json b/i18n/kor/src/vs/editor/contrib/links/browser/links.i18n.json
deleted file mode 100644
index 2bc3afdb9fc..00000000000
--- a/i18n/kor/src/vs/editor/contrib/links/browser/links.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"links.navigate.mac": "Cmd 키를 누르고 클릭하여 링크로 이동",
-	"links.navigate": "Ctrl 키를 누르고 클릭하여 링크로 이동",
-	"links.command.mac": "명령을 실행하려면 Cmd+클릭",
-	"links.command": "명령을 실행하려면 Ctrl+클릭",
-	"links.navigate.al": "Alt 키를 누르고 클릭하여 링크로 이동",
-	"links.command.al": "명령을 실행하려면 Alt+클릭",
-	"invalid.url": "죄송합니다. 이 링크는 형식이 올바르지 않으므로 열지 못했습니다. {0}",
-	"missing.url": "죄송합니다. 대상이 없으므로 이 링크를 열지 못했습니다.",
-	"label": "링크 열기"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/editor/contrib/links/links.i18n.json b/i18n/kor/src/vs/editor/contrib/links/links.i18n.json
deleted file mode 100644
index c11e5ac62db..00000000000
--- a/i18n/kor/src/vs/editor/contrib/links/links.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"links.navigate.mac": "Cmd 키를 누르고 클릭하여 링크로 이동",
-	"links.navigate": "Ctrl 키를 누르고 클릭하여 링크로 이동",
-	"links.command.mac": "명령을 실행하려면 Cmd+클릭",
-	"links.command": "명령을 실행하려면 Ctrl+클릭",
-	"links.navigate.al.mac": "<Option> 키를 누르고 클릭하여 링크로 이동",
-	"links.navigate.al": "Alt 키를 누르고 클릭하여 링크로 이동",
-	"links.command.al.mac": "<Option> 키를 누르고 클릭하여 명령 실행",
-	"links.command.al": "명령을 실행하려면 Alt+클릭",
-	"invalid.url": "{0} 형식이 올바르지 않으므로 이 링크를 열지 못했습니다",
-	"missing.url": "대상이 없으므로 이 링크를 열지 못했습니다.",
-	"label": "링크 열기"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/editor/contrib/message/messageController.i18n.json b/i18n/kor/src/vs/editor/contrib/message/messageController.i18n.json
deleted file mode 100644
index af6229ea68c..00000000000
--- a/i18n/kor/src/vs/editor/contrib/message/messageController.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"editor.readonly": "읽기 전용 편집기에서는 편집할 수 없습니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/editor/contrib/multicursor/common/multicursor.i18n.json b/i18n/kor/src/vs/editor/contrib/multicursor/common/multicursor.i18n.json
deleted file mode 100644
index af6f5d6235c..00000000000
--- a/i18n/kor/src/vs/editor/contrib/multicursor/common/multicursor.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"mutlicursor.insertAbove": "위에 커서 추가",
-	"mutlicursor.insertBelow": "아래에 커서 추가",
-	"mutlicursor.insertAtEndOfEachLineSelected": "줄 끝에 커서 추가",
-	"addSelectionToNextFindMatch": "다음 일치 항목 찾기에 선택 항목 추가",
-	"addSelectionToPreviousFindMatch": "이전 일치 항목 찾기에 선택 항목 추가",
-	"moveSelectionToNextFindMatch": "다음 일치 항목 찾기로 마지막 선택 항목 이동",
-	"moveSelectionToPreviousFindMatch": "마지막 선택 항목을 이전 일치 항목 찾기로 이동",
-	"selectAllOccurrencesOfFindMatch": "일치 항목 찾기의 모든 항목 선택",
-	"changeAll.label": "모든 항목 변경"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/editor/contrib/multicursor/multicursor.i18n.json b/i18n/kor/src/vs/editor/contrib/multicursor/multicursor.i18n.json
deleted file mode 100644
index 00cdbc933fe..00000000000
--- a/i18n/kor/src/vs/editor/contrib/multicursor/multicursor.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"mutlicursor.insertAbove": "위에 커서 추가",
-	"mutlicursor.insertBelow": "아래에 커서 추가",
-	"mutlicursor.insertAtEndOfEachLineSelected": "줄 끝에 커서 추가",
-	"addSelectionToNextFindMatch": "다음 일치 항목 찾기에 선택 항목 추가",
-	"addSelectionToPreviousFindMatch": "이전 일치 항목 찾기에 선택 항목 추가",
-	"moveSelectionToNextFindMatch": "다음 일치 항목 찾기로 마지막 선택 항목 이동",
-	"moveSelectionToPreviousFindMatch": "마지막 선택 항목을 이전 일치 항목 찾기로 이동",
-	"selectAllOccurrencesOfFindMatch": "일치 항목 찾기의 모든 항목 선택",
-	"changeAll.label": "모든 항목 변경"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/editor/contrib/parameterHints/browser/parameterHints.i18n.json b/i18n/kor/src/vs/editor/contrib/parameterHints/browser/parameterHints.i18n.json
deleted file mode 100644
index 884202c9ab9..00000000000
--- a/i18n/kor/src/vs/editor/contrib/parameterHints/browser/parameterHints.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"parameterHints.trigger.label": "매개 변수 힌트 트리거"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/editor/contrib/parameterHints/browser/parameterHintsWidget.i18n.json b/i18n/kor/src/vs/editor/contrib/parameterHints/browser/parameterHintsWidget.i18n.json
deleted file mode 100644
index 83d04f35bc4..00000000000
--- a/i18n/kor/src/vs/editor/contrib/parameterHints/browser/parameterHintsWidget.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"hint": "{0}, 힌트"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/editor/contrib/parameterHints/parameterHints.i18n.json b/i18n/kor/src/vs/editor/contrib/parameterHints/parameterHints.i18n.json
deleted file mode 100644
index 5a4b33d8ef0..00000000000
--- a/i18n/kor/src/vs/editor/contrib/parameterHints/parameterHints.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"parameterHints.trigger.label": "매개 변수 힌트 트리거"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/editor/contrib/parameterHints/parameterHintsWidget.i18n.json b/i18n/kor/src/vs/editor/contrib/parameterHints/parameterHintsWidget.i18n.json
deleted file mode 100644
index 9feb0759f0d..00000000000
--- a/i18n/kor/src/vs/editor/contrib/parameterHints/parameterHintsWidget.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hint": "{0}, 힌트"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/editor/contrib/quickFix/browser/quickFixCommands.i18n.json b/i18n/kor/src/vs/editor/contrib/quickFix/browser/quickFixCommands.i18n.json
deleted file mode 100644
index d4430bc088d..00000000000
--- a/i18n/kor/src/vs/editor/contrib/quickFix/browser/quickFixCommands.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"quickFixWithKb": "수정 사항 표시({0})",
-	"quickFix": "수정 사항 표시",
-	"quickfix.trigger.label": "빠른 수정"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/editor/contrib/quickFix/quickFixCommands.i18n.json b/i18n/kor/src/vs/editor/contrib/quickFix/quickFixCommands.i18n.json
deleted file mode 100644
index c277197a433..00000000000
--- a/i18n/kor/src/vs/editor/contrib/quickFix/quickFixCommands.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"quickFixWithKb": "수정 사항 표시({0})",
-	"quickFix": "수정 사항 표시",
-	"quickfix.trigger.label": "빠른 수정",
-	"refactor.label": "리팩터링"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/editor/contrib/referenceSearch/browser/peekViewWidget.i18n.json b/i18n/kor/src/vs/editor/contrib/referenceSearch/browser/peekViewWidget.i18n.json
deleted file mode 100644
index 9befc5560b1..00000000000
--- a/i18n/kor/src/vs/editor/contrib/referenceSearch/browser/peekViewWidget.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"label.close": "닫기"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/editor/contrib/referenceSearch/browser/referenceSearch.i18n.json b/i18n/kor/src/vs/editor/contrib/referenceSearch/browser/referenceSearch.i18n.json
deleted file mode 100644
index 199f308fdda..00000000000
--- a/i18n/kor/src/vs/editor/contrib/referenceSearch/browser/referenceSearch.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"meta.titleReference": "–참조 {0}개",
-	"references.action.label": "모든 참조 찾기"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/editor/contrib/referenceSearch/browser/referencesController.i18n.json b/i18n/kor/src/vs/editor/contrib/referenceSearch/browser/referencesController.i18n.json
deleted file mode 100644
index 519c07a8e60..00000000000
--- a/i18n/kor/src/vs/editor/contrib/referenceSearch/browser/referencesController.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"labelLoading": "로드 중..."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/editor/contrib/referenceSearch/browser/referencesModel.i18n.json b/i18n/kor/src/vs/editor/contrib/referenceSearch/browser/referencesModel.i18n.json
deleted file mode 100644
index 48d18866618..00000000000
--- a/i18n/kor/src/vs/editor/contrib/referenceSearch/browser/referencesModel.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"aria.oneReference": "{2}열, {1}줄, {0}의 기호",
-	"aria.fileReferences.1": "{0}의 기호 1개, 전체 경로 {1}",
-	"aria.fileReferences.N": "{1}의 기호 {0}개, 전체 경로 {2}",
-	"aria.result.0": "결과 없음",
-	"aria.result.1": "{0}에서 기호 1개를 찾았습니다.",
-	"aria.result.n1": "{1}에서 기호 {0}개를 찾았습니다.",
-	"aria.result.nm": "{1}개 파일에서 기호 {0}개를 찾았습니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/editor/contrib/referenceSearch/browser/referencesWidget.i18n.json b/i18n/kor/src/vs/editor/contrib/referenceSearch/browser/referencesWidget.i18n.json
deleted file mode 100644
index bebeacf6346..00000000000
--- a/i18n/kor/src/vs/editor/contrib/referenceSearch/browser/referencesWidget.i18n.json
+++ /dev/null
@@ -1,27 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"referencesFailre": "파일을 확인하지 못했습니다.",
-	"referencesCount": "참조 {0}개",
-	"referenceCount": "참조 {0}개",
-	"missingPreviewMessage": "미리 보기를 사용할 수 없음",
-	"treeAriaLabel": "참조",
-	"noResults": "결과 없음",
-	"peekView.alternateTitle": "참조",
-	"peekViewTitleBackground": "Peek 뷰 제목 영역의 배경색입니다.",
-	"peekViewTitleForeground": "Peek 뷰 제목 색입니다.",
-	"peekViewTitleInfoForeground": "Peek 뷰 제목 정보 색입니다.",
-	"peekViewBorder": "Peek 뷰 테두리 및 화살표 색입니다.",
-	"peekViewResultsBackground": "Peek 뷰 결과 목록의 배경색입니다.",
-	"peekViewResultsMatchForeground": "Peek 뷰 결과 목록에서 라인 노드의 전경색입니다.",
-	"peekViewResultsFileForeground": "Peek 뷰 결과 목록에서 파일 노드의 전경색입니다.",
-	"peekViewResultsSelectionBackground": "Peek 뷰 결과 목록에서 선택된 항목의 배경색입니다.",
-	"peekViewResultsSelectionForeground": "Peek 뷰 결과 목록에서 선택된 항목의 전경색입니다.",
-	"peekViewEditorBackground": "Peek 뷰 편집기의 배경색입니다.",
-	"peekViewEditorGutterBackground": "Peek 뷰 편집기의 거터 배경색입니다.",
-	"peekViewResultsMatchHighlight": "Peek 뷰 결과 목록의 일치 항목 강조 표시 색입니다.",
-	"peekViewEditorMatchHighlight": "Peek 뷰 편집기의 일치 항목 강조 표시 색입니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/editor/contrib/referenceSearch/peekViewWidget.i18n.json b/i18n/kor/src/vs/editor/contrib/referenceSearch/peekViewWidget.i18n.json
deleted file mode 100644
index 7d62c372226..00000000000
--- a/i18n/kor/src/vs/editor/contrib/referenceSearch/peekViewWidget.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"label.close": "닫기"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/editor/contrib/referenceSearch/referenceSearch.i18n.json b/i18n/kor/src/vs/editor/contrib/referenceSearch/referenceSearch.i18n.json
deleted file mode 100644
index 8f95725cdc2..00000000000
--- a/i18n/kor/src/vs/editor/contrib/referenceSearch/referenceSearch.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"meta.titleReference": "–참조 {0}개",
-	"references.action.label": "모든 참조 찾기"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/editor/contrib/referenceSearch/referencesController.i18n.json b/i18n/kor/src/vs/editor/contrib/referenceSearch/referencesController.i18n.json
deleted file mode 100644
index 02cd85b3b13..00000000000
--- a/i18n/kor/src/vs/editor/contrib/referenceSearch/referencesController.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"labelLoading": "로드 중..."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/editor/contrib/referenceSearch/referencesModel.i18n.json b/i18n/kor/src/vs/editor/contrib/referenceSearch/referencesModel.i18n.json
deleted file mode 100644
index 8354438edca..00000000000
--- a/i18n/kor/src/vs/editor/contrib/referenceSearch/referencesModel.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"aria.oneReference": "{2}열, {1}줄, {0}의 기호",
-	"aria.fileReferences.1": "{0}의 기호 1개, 전체 경로 {1}",
-	"aria.fileReferences.N": "{1}의 기호 {0}개, 전체 경로 {2}",
-	"aria.result.0": "결과 없음",
-	"aria.result.1": "{0}에서 기호 1개를 찾았습니다.",
-	"aria.result.n1": "{1}에서 기호 {0}개를 찾았습니다.",
-	"aria.result.nm": "{1}개 파일에서 기호 {0}개를 찾았습니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/editor/contrib/referenceSearch/referencesWidget.i18n.json b/i18n/kor/src/vs/editor/contrib/referenceSearch/referencesWidget.i18n.json
deleted file mode 100644
index 318afc435b7..00000000000
--- a/i18n/kor/src/vs/editor/contrib/referenceSearch/referencesWidget.i18n.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"referencesFailre": "파일을 확인하지 못했습니다.",
-	"referencesCount": "참조 {0}개",
-	"referenceCount": "참조 {0}개",
-	"missingPreviewMessage": "미리 보기를 사용할 수 없음",
-	"treeAriaLabel": "참조",
-	"noResults": "결과 없음",
-	"peekView.alternateTitle": "참조",
-	"peekViewTitleBackground": "Peek 뷰 제목 영역의 배경색입니다.",
-	"peekViewTitleForeground": "Peek 뷰 제목 색입니다.",
-	"peekViewTitleInfoForeground": "Peek 뷰 제목 정보 색입니다.",
-	"peekViewBorder": "Peek 뷰 테두리 및 화살표 색입니다.",
-	"peekViewResultsBackground": "Peek 뷰 결과 목록의 배경색입니다.",
-	"peekViewResultsMatchForeground": "Peek 뷰 결과 목록에서 라인 노드의 전경색입니다.",
-	"peekViewResultsFileForeground": "Peek 뷰 결과 목록에서 파일 노드의 전경색입니다.",
-	"peekViewResultsSelectionBackground": "Peek 뷰 결과 목록에서 선택된 항목의 배경색입니다.",
-	"peekViewResultsSelectionForeground": "Peek 뷰 결과 목록에서 선택된 항목의 전경색입니다.",
-	"peekViewEditorBackground": "Peek 뷰 편집기의 배경색입니다.",
-	"peekViewEditorGutterBackground": "Peek 뷰 편집기의 거터 배경색입니다.",
-	"peekViewResultsMatchHighlight": "Peek 뷰 결과 목록의 일치 항목 강조 표시 색입니다.",
-	"peekViewEditorMatchHighlight": "Peek 뷰 편집기의 일치 항목 강조 표시 색입니다.",
-	"peekViewEditorMatchHighlightBorder": "Peek 뷰 편집기의 일치 항목 강조 표시 테두리입니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/editor/contrib/rename/browser/rename.i18n.json b/i18n/kor/src/vs/editor/contrib/rename/browser/rename.i18n.json
deleted file mode 100644
index 623526b7432..00000000000
--- a/i18n/kor/src/vs/editor/contrib/rename/browser/rename.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"no result": "결과가 없습니다.",
-	"aria": "'{0}'을(를) '{1}'(으)로 이름을 변경했습니다. 요약: {2}",
-	"rename.failed": "죄송합니다. 이름 바꾸기를 실행하지 못했습니다.",
-	"rename.label": "기호 이름 바꾸기"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/editor/contrib/rename/browser/renameInputField.i18n.json b/i18n/kor/src/vs/editor/contrib/rename/browser/renameInputField.i18n.json
deleted file mode 100644
index 8e16d0a05f7..00000000000
--- a/i18n/kor/src/vs/editor/contrib/rename/browser/renameInputField.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"renameAriaLabel": "입력 이름을 바꾸세요. 새 이름을 입력한 다음 [Enter] 키를 눌러 커밋하세요."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/editor/contrib/rename/rename.i18n.json b/i18n/kor/src/vs/editor/contrib/rename/rename.i18n.json
deleted file mode 100644
index 2fccdd673f9..00000000000
--- a/i18n/kor/src/vs/editor/contrib/rename/rename.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"no result": "결과가 없습니다.",
-	"aria": "'{0}'을(를) '{1}'(으)로 이름을 변경했습니다. 요약: {2}",
-	"rename.failed": "이름 변경을 실행하지 못했습니다.",
-	"rename.label": "기호 이름 바꾸기"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/editor/contrib/rename/renameInputField.i18n.json b/i18n/kor/src/vs/editor/contrib/rename/renameInputField.i18n.json
deleted file mode 100644
index 097b4d29aa1..00000000000
--- a/i18n/kor/src/vs/editor/contrib/rename/renameInputField.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"renameAriaLabel": "입력 이름을 바꾸세요. 새 이름을 입력한 다음 [Enter] 키를 눌러 커밋하세요."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/editor/contrib/smartSelect/common/smartSelect.i18n.json b/i18n/kor/src/vs/editor/contrib/smartSelect/common/smartSelect.i18n.json
deleted file mode 100644
index 127400173af..00000000000
--- a/i18n/kor/src/vs/editor/contrib/smartSelect/common/smartSelect.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"smartSelect.grow": "선택 확장",
-	"smartSelect.shrink": "선택 축소"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/editor/contrib/smartSelect/smartSelect.i18n.json b/i18n/kor/src/vs/editor/contrib/smartSelect/smartSelect.i18n.json
deleted file mode 100644
index 0717c02bd40..00000000000
--- a/i18n/kor/src/vs/editor/contrib/smartSelect/smartSelect.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"smartSelect.grow": "선택 확장",
-	"smartSelect.shrink": "선택 축소"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/editor/contrib/snippet/snippetVariables.i18n.json b/i18n/kor/src/vs/editor/contrib/snippet/snippetVariables.i18n.json
deleted file mode 100644
index 7078503b8e1..00000000000
--- a/i18n/kor/src/vs/editor/contrib/snippet/snippetVariables.i18n.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"Sunday": "일요일",
-	"Monday": "월요일",
-	"Tuesday": "화요일",
-	"Wednesday": "수요일",
-	"Thursday": "목요일",
-	"Friday": "금요일",
-	"Saturday": "토요일",
-	"SundayShort": "일",
-	"MondayShort": "월",
-	"TuesdayShort": "화",
-	"WednesdayShort": "수",
-	"ThursdayShort": "목",
-	"FridayShort": "금",
-	"SaturdayShort": "토",
-	"January": "1 월",
-	"February": "2 월",
-	"March": "3 월",
-	"April": "4 월",
-	"May": "5 월",
-	"June": "6 월",
-	"July": "7 월",
-	"August": "8 월",
-	"September": "9 월",
-	"October": "10 월",
-	"November": "11 월",
-	"December": "12 월",
-	"JanuaryShort": "1 월",
-	"FebruaryShort": "2 월",
-	"MarchShort": "3 월",
-	"AprilShort": "4 월",
-	"MayShort": "5 월",
-	"JuneShort": "6 월",
-	"JulyShort": "7 월",
-	"AugustShort": "8 월",
-	"SeptemberShort": "9 월",
-	"OctoberShort": "10 월",
-	"NovemberShort": "11 월",
-	"DecemberShort": "12 월"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/editor/contrib/suggest/browser/suggestController.i18n.json b/i18n/kor/src/vs/editor/contrib/suggest/browser/suggestController.i18n.json
deleted file mode 100644
index c9232c0a95d..00000000000
--- a/i18n/kor/src/vs/editor/contrib/suggest/browser/suggestController.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"arai.alert.snippet": "'{0}'을(를) 적용하여 다음 텍스트가 삽입되었습니다.\n {1}",
-	"suggest.trigger.label": "제안 항목 트리거"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/editor/contrib/suggest/browser/suggestWidget.i18n.json b/i18n/kor/src/vs/editor/contrib/suggest/browser/suggestWidget.i18n.json
deleted file mode 100644
index db8bbbe6670..00000000000
--- a/i18n/kor/src/vs/editor/contrib/suggest/browser/suggestWidget.i18n.json
+++ /dev/null
@@ -1,21 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"editorSuggestWidgetBackground": "제안 위젯의 배경색입니다.",
-	"editorSuggestWidgetBorder": "제안 위젯의 테두리 색입니다.",
-	"editorSuggestWidgetForeground": "제안 위젯의 전경색입니다.",
-	"editorSuggestWidgetSelectedBackground": "제한 위젯에서 선택된 항목의 배경색입니다.",
-	"editorSuggestWidgetHighlightForeground": "제안 위젯의 일치 항목 강조 표시 색입니다.",
-	"readMore": "자세히 알아보기...{0}",
-	"suggestionWithDetailsAriaLabel": "{0}, 제안, 세부 정보 있음",
-	"suggestionAriaLabel": "{0}, 제안",
-	"readLess": "간단히 보기...{0}",
-	"suggestWidget.loading": "로드 중...",
-	"suggestWidget.noSuggestions": "제안 항목이 없습니다.",
-	"suggestionAriaAccepted": "{0}, 수락됨",
-	"ariaCurrentSuggestionWithDetails": "{0}, 제안, 세부 정보 있음",
-	"ariaCurrentSuggestion": "{0}, 제안"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/editor/contrib/suggest/suggestController.i18n.json b/i18n/kor/src/vs/editor/contrib/suggest/suggestController.i18n.json
deleted file mode 100644
index 7228d8b3a2a..00000000000
--- a/i18n/kor/src/vs/editor/contrib/suggest/suggestController.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"arai.alert.snippet": "'{0}'을(를) 적용하여 다음 텍스트가 삽입되었습니다.\n {1}",
-	"suggest.trigger.label": "제안 항목 트리거"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/editor/contrib/suggest/suggestWidget.i18n.json b/i18n/kor/src/vs/editor/contrib/suggest/suggestWidget.i18n.json
deleted file mode 100644
index 7cb85570326..00000000000
--- a/i18n/kor/src/vs/editor/contrib/suggest/suggestWidget.i18n.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"editorSuggestWidgetBackground": "제안 위젯의 배경색입니다.",
-	"editorSuggestWidgetBorder": "제안 위젯의 테두리 색입니다.",
-	"editorSuggestWidgetForeground": "제안 위젯의 전경색입니다.",
-	"editorSuggestWidgetSelectedBackground": "제한 위젯에서 선택된 항목의 배경색입니다.",
-	"editorSuggestWidgetHighlightForeground": "제안 위젯의 일치 항목 강조 표시 색입니다.",
-	"readMore": "자세히 알아보기...{0}",
-	"suggestionWithDetailsAriaLabel": "{0}, 제안, 세부 정보 있음",
-	"suggestionAriaLabel": "{0}, 제안",
-	"readLess": "간단히 보기...{0}",
-	"suggestWidget.loading": "로드 중...",
-	"suggestWidget.noSuggestions": "제안 항목이 없습니다.",
-	"suggestionAriaAccepted": "{0}, 수락됨",
-	"ariaCurrentSuggestionWithDetails": "{0}, 제안, 세부 정보 있음",
-	"ariaCurrentSuggestion": "{0}, 제안"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/editor/contrib/toggleTabFocusMode/common/toggleTabFocusMode.i18n.json b/i18n/kor/src/vs/editor/contrib/toggleTabFocusMode/common/toggleTabFocusMode.i18n.json
deleted file mode 100644
index 71b2a67ea6a..00000000000
--- a/i18n/kor/src/vs/editor/contrib/toggleTabFocusMode/common/toggleTabFocusMode.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"toggle.tabMovesFocus": "<Tab> 키로 포커스 이동 설정/해제"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/editor/contrib/toggleTabFocusMode/toggleTabFocusMode.i18n.json b/i18n/kor/src/vs/editor/contrib/toggleTabFocusMode/toggleTabFocusMode.i18n.json
deleted file mode 100644
index aa9fbbb48bf..00000000000
--- a/i18n/kor/src/vs/editor/contrib/toggleTabFocusMode/toggleTabFocusMode.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggle.tabMovesFocus": "<Tab> 키로 포커스 이동 설정/해제"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/editor/contrib/wordHighlighter/common/wordHighlighter.i18n.json b/i18n/kor/src/vs/editor/contrib/wordHighlighter/common/wordHighlighter.i18n.json
deleted file mode 100644
index ab340d73f19..00000000000
--- a/i18n/kor/src/vs/editor/contrib/wordHighlighter/common/wordHighlighter.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"wordHighlight": "변수 읽기와 같은 읽기 액세스 중 기호의 배경색입니다.",
-	"wordHighlightStrong": "변수에 쓰기와 같은 쓰기 액세스 중 기호의 배경색입니다.",
-	"overviewRulerWordHighlightForeground": "기호 강조 표시의 개요 눈금자 마커 색입니다.",
-	"overviewRulerWordHighlightStrongForeground": "쓰기 권한 기호 강조 표시의 개요 눈금자 마커 색입니다.",
-	"wordHighlight.next.label": "다음 강조 기호로 이동",
-	"wordHighlight.previous.label": "이전 강조 기호로 이동"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json b/i18n/kor/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
deleted file mode 100644
index aaaf9225abd..00000000000
--- a/i18n/kor/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"wordHighlight": "변수 읽기와 같은 읽기 액세스 중 기호의 배경색입니다. 색상은 밑에 깔린 꾸밈을 가리지 않도록 반드시 불투명이 아니어야 합니다.",
-	"wordHighlightStrong": "변수에 쓰기와 같은 쓰기 액세스 중 기호의 배경색입니다. 색상은 밑에 깔린 꾸밈을 가리지 않도록 반드시 불투명이 아니어야 합니다.",
-	"wordHighlightBorder": "변수 읽기와 같은 읽기 액세스 중 기호의 테두리 색입니다.",
-	"wordHighlightStrongBorder": "변수에 쓰기와 같은 쓰기 액세스 중 기호의 테두리 색입니다.",
-	"overviewRulerWordHighlightForeground": "기호 강조의 개요 눈금자 표식 색입니다. 이 색은 불투명해야만 내부 장식을 가리지 않습니다.",
-	"overviewRulerWordHighlightStrongForeground": "쓰기 액세스 기호 강조의 개요 눈금자 표식 색입니다. 이 색은 불투명해야만 내부 장식을 가리지 않습니다.",
-	"wordHighlight.next.label": "다음 강조 기호로 이동",
-	"wordHighlight.previous.label": "이전 강조 기호로 이동"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/editor/contrib/zoneWidget/browser/peekViewWidget.i18n.json b/i18n/kor/src/vs/editor/contrib/zoneWidget/browser/peekViewWidget.i18n.json
deleted file mode 100644
index 9befc5560b1..00000000000
--- a/i18n/kor/src/vs/editor/contrib/zoneWidget/browser/peekViewWidget.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"label.close": "닫기"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/editor/electron-browser/textMate/TMSyntax.i18n.json b/i18n/kor/src/vs/editor/electron-browser/textMate/TMSyntax.i18n.json
deleted file mode 100644
index f45f3fb57a7..00000000000
--- a/i18n/kor/src/vs/editor/electron-browser/textMate/TMSyntax.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"invalid.language": "`contributes.{0}.language`에 알 수 없는 언어가 있습니다. 제공된 값: {1}",
-	"invalid.scopeName": "`contributes.{0}.scopeName`에 문자열이 필요합니다. 제공된 값: {1}",
-	"invalid.path.0": "`contributes.{0}.path`에 문자열이 필요합니다. 제공된 값: {1}",
-	"invalid.injectTo": "`contributes.{0}.injectTo`의 값이 잘못되었습니다. 언어 범위 이름 배열이어야 합니다. 제공된 값: {1}",
-	"invalid.embeddedLanguages": "`contributes.{0}.embeddedLanguages` 값이 잘못되었습니다. 범위 이름에서 언어까지의 개체 맵이어야 합니다. 제공된 값: {1}",
-	"invalid.path.1": "확장 폴더({2})에 포함할 `contributes.{0}.path`({1})가 필요합니다. 확장이 이식 불가능해질 수 있습니다.",
-	"no-tm-grammar": "이 언어에 대해 등록된 TM 문법이 없습니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/editor/node/languageConfigurationExtensionPoint.i18n.json b/i18n/kor/src/vs/editor/node/languageConfigurationExtensionPoint.i18n.json
deleted file mode 100644
index 59242661db1..00000000000
--- a/i18n/kor/src/vs/editor/node/languageConfigurationExtensionPoint.i18n.json
+++ /dev/null
@@ -1,23 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"parseErrors": "{0}을(를) 구문 분석하는 동안 오류가 발생했습니다. {1}",
-	"schema.openBracket": "여는 대괄호 문자 또는 문자열 시퀀스입니다.",
-	"schema.closeBracket": "닫는 대괄호 문자 또는 문자열 시퀀스입니다.",
-	"schema.comments": "주석 기호를 정의합니다.",
-	"schema.blockComments": "블록 주석이 표시되는 방법을 정의합니다.",
-	"schema.blockComment.begin": "블록 주석을 시작하는 문자 시퀀스입니다.",
-	"schema.blockComment.end": "블록 주석을 끝내는 문자 시퀀스입니다.",
-	"schema.lineComment": "줄 주석을 시작하는 문자 시퀀스입니다.",
-	"schema.brackets": "들여쓰기를 늘리거나 줄이는 대괄호 기호를 정의합니다.",
-	"schema.autoClosingPairs": "대괄호 쌍을 정의합니다. 여는 대괄호를 입력하면 닫는 대괄호가 자동으로 삽입됩니다.",
-	"schema.autoClosingPairs.notIn": "자동 쌍을 사용하지 않도록 설정된 범위 목록을 정의합니다.",
-	"schema.surroundingPairs": "선택한 문자열을 둘러싸는 데 사용할 수 있는 대괄호 쌍을 정의합니다.",
-	"schema.wordPattern": "해당 언어에 대한 단어 정의입니다.",
-	"schema.wordPattern.pattern": "단어 일치에 사용하는 RegEXP 패턴입니다.",
-	"schema.wordPattern.flags": "단어 일치에 사용하는 RegExp 플래그입니다.",
-	"schema.wordPattern.flags.errorMessage": "`/^([gimuy]+)$/` 패턴과 일치해야 합니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/editor/node/textMate/TMGrammars.i18n.json b/i18n/kor/src/vs/editor/node/textMate/TMGrammars.i18n.json
deleted file mode 100644
index 264d88bd8aa..00000000000
--- a/i18n/kor/src/vs/editor/node/textMate/TMGrammars.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"vscode.extension.contributes.grammars": "textmate 토크나이저를 적용합니다.",
-	"vscode.extension.contributes.grammars.language": "이 구문이 적용되는 언어 식별자입니다.",
-	"vscode.extension.contributes.grammars.scopeName": "tmLanguage 파일에 사용되는 Textmate 범위 이름입니다.",
-	"vscode.extension.contributes.grammars.path": "tmLanguage 파일의 경로입니다. 확장 폴더의 상대 경로이며 일반적으로 './syntaxes/'로 시작합니다.",
-	"vscode.extension.contributes.grammars.embeddedLanguages": "이 문법에 포함된 언어가 있는 경우 언어 ID에 대한 범위 이름의 맵입니다.",
-	"vscode.extension.contributes.grammars.injectTo": "이 문법이 삽입되는 언어 범위 이름 목록입니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/platform/actions/browser/menuItemActionItem.i18n.json b/i18n/kor/src/vs/platform/actions/browser/menuItemActionItem.i18n.json
deleted file mode 100644
index d97625fbf6c..00000000000
--- a/i18n/kor/src/vs/platform/actions/browser/menuItemActionItem.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"titleAndKb": "{0}({1})"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json b/i18n/kor/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
deleted file mode 100644
index c92b8c11e09..00000000000
--- a/i18n/kor/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"requirearray": "메뉴 항목은 배열이어야 합니다.",
-	"requirestring": "속성 `{0}`은(는) 필수이며 `string` 형식이어야 합니다.",
-	"optstring": "속성 `{0}`은(는) 생략할 수 있으며 `string` 형식이어야 합니다.",
-	"vscode.extension.contributes.menuItem.command": "실행할 명령의 식별자입니다. 명령은 '명령' 섹션에 선언되어야 합니다.",
-	"vscode.extension.contributes.menuItem.alt": "실행할 대체 명령의 식별자입니다. 명령은 '명령' 섹션에 선언되어야 합니다.",
-	"vscode.extension.contributes.menuItem.when": "이 항목을 표시하기 위해 true여야 하는 조건입니다.",
-	"vscode.extension.contributes.menuItem.group": "이 명령이 속하는 그룹입니다.",
-	"vscode.extension.contributes.menus": "편집기에 메뉴 항목을 적용합니다.",
-	"menus.commandPalette": "명령 팔레트",
-	"menus.touchBar": "터치 바(macOS 전용)",
-	"menus.editorTitle": "편집기 제목 메뉴",
-	"menus.editorContext": "편집기 상황에 맞는 메뉴",
-	"menus.explorerContext": "파일 탐색기 상황에 맞는 메뉴",
-	"menus.editorTabContext": "편집기 탭 상황에 맞는 메뉴",
-	"menus.debugCallstackContext": "디버그 호출 스택 상황에 맞는 메뉴",
-	"menus.scmTitle": "소스 제어 제목 메뉴",
-	"menus.scmSourceControl": "소스 제어 메뉴",
-	"menus.resourceGroupContext": "소스 제어 리소스 그룹 상황에 맞는 메뉴",
-	"menus.resourceStateContext": "소스 제어 리소스 상태 상황에 맞는 메뉴",
-	"view.viewTitle": "기여 조회 제목 메뉴",
-	"view.itemContext": "기여 조회 항목 상황에 맞는 메뉴",
-	"nonempty": "비어 있지 않은 값이 필요합니다.",
-	"opticon": "`icon` 속성은 생략할 수 있거나 문자열 또는 리터럴(예: `{dark, light}`)이어야 합니다.",
-	"requireStringOrObject": "`{0}` 속성은 필수이며 `string` 또는 `object` 형식이어야 합니다.",
-	"requirestrings": "`{0}` 및 `{1}` 속성은 필수이며 `string` 형식이어야 합니다.",
-	"vscode.extension.contributes.commandType.command": "실행할 명령의 식별자",
-	"vscode.extension.contributes.commandType.title": "명령이 UI에 표시되는 제목입니다.",
-	"vscode.extension.contributes.commandType.category": "(선택 사항) UI에서 명령별 범주 문자열을 그룹화합니다.",
-	"vscode.extension.contributes.commandType.icon": "(선택 사항) UI에서 명령을 나타내는 데 사용되는 아이콘입니다. 파일 경로 또는 테마 지정 가능 구성입니다.",
-	"vscode.extension.contributes.commandType.icon.light": "밝은 테마가 사용될 경우의 아이콘 경로입니다.",
-	"vscode.extension.contributes.commandType.icon.dark": "어두운 테마가 사용될 경우의 아이콘 경로입니다.",
-	"vscode.extension.contributes.commands": "명령 팔레트에 명령을 적용합니다.",
-	"dup": "`명령` 섹션에 `{0}` 명령이 여러 번 나타납니다.",
-	"menuId.invalid": "`{0}`은(는) 유효한 메뉴 식별자가 아닙니다.",
-	"missing.command": "메뉴 항목이 '명령' 섹션에 정의되지 않은 `{0}` 명령을 참조합니다.",
-	"missing.altCommand": "메뉴 항목이 '명령' 섹션에 정의되지 않은 alt 명령 `{0}`을(를) 참조합니다.",
-	"dupe.command": "메뉴 항목이 동일한 명령을 기본값과 alt 명령으로 참조합니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/platform/configuration/common/configurationRegistry.i18n.json b/i18n/kor/src/vs/platform/configuration/common/configurationRegistry.i18n.json
deleted file mode 100644
index 816d7c56e4f..00000000000
--- a/i18n/kor/src/vs/platform/configuration/common/configurationRegistry.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"defaultConfigurations.title": "기본 구성 재정의",
-	"overrideSettings.description": "{0} 언어에 대해 재정의할 편집기 설정을 구성합니다.",
-	"overrideSettings.defaultDescription": "언어에 대해 재정의할 편집기 설정을 구성합니다.",
-	"config.property.languageDefault": "'{0}'을(를) 등록할 수 없습니다. 이는 언어별 편집기 설정을 설명하는 속성 패턴인 '\\\\[.*\\\\]$'과(와) 일치합니다. 'configurationDefaults' 기여를 사용하세요.",
-	"config.property.duplicate": "'{0}'을(를) 등록할 수 없습니다. 이 속성은 이미 등록되어 있습니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/platform/dialogs/common/dialogs.i18n.json b/i18n/kor/src/vs/platform/dialogs/common/dialogs.i18n.json
deleted file mode 100644
index e770ddd1642..00000000000
--- a/i18n/kor/src/vs/platform/dialogs/common/dialogs.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"moreFile": "...1개의 추가 파일이 표시되지 않음",
-	"moreFiles": "...{0}개의 추가 파일이 표시되지 않음"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/platform/dialogs/node/dialogService.i18n.json b/i18n/kor/src/vs/platform/dialogs/node/dialogService.i18n.json
deleted file mode 100644
index a32e01e761e..00000000000
--- a/i18n/kor/src/vs/platform/dialogs/node/dialogService.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"cancel": "취소"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/platform/environment/node/argv.i18n.json b/i18n/kor/src/vs/platform/environment/node/argv.i18n.json
deleted file mode 100644
index 5e47e69c560..00000000000
--- a/i18n/kor/src/vs/platform/environment/node/argv.i18n.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"gotoValidation": "`--goto` 모드에서 인수는 `FILE(:LINE(:CHARACTER))` 형식이어야 합니다.",
-	"diff": "두 파일을 서로 비교합니다.",
-	"add": "마지막 활성 창에 폴더를 추가합니다.",
-	"goto": "지정된 줄과 문자 위치에 있는 경로의 파일을 엽니다.",
-	"newWindow": "새 창을 강제로 엽니다.",
-	"reuseWindow": "마지막 활성 창에서 파일 또는 파일을 강제로 엽니다.",
-	"wait": "파일이 닫힐 때 까지 기다린 후 돌아갑니다.",
-	"locale": "사용할 로캘(예: en-US 또는 zh-TW)입니다.",
-	"userDataDir": "사용자 데이터가 저장되는 디렉터리를 지정합니다. Code의 여러 고유 인스턴스를 여는 데 사용할 수 있습니다.",
-	"version": "버전을 출력합니다.",
-	"help": "사용법을 출력합니다.",
-	"extensionHomePath": "확장의 루트 경로를 설정합니다.",
-	"listExtensions": "설치된 확장을 나열합니다.",
-	"showVersions": "#NAME?",
-	"installExtension": "확장을 설치합니다.",
-	"uninstallExtension": "확장을 제거합니다.",
-	"experimentalApis": "확장에 대해 제안된 API 기능을 사용하도록 설정합니다.",
-	"verbose": "자세한 정보 표시를 출력합니다(--wait를 의미).",
-	"log": "사용할 로그 수준이며 기본값은 'info'입니다. 허용되는 값은 'critical', 'error', 'warn', 'info', 'debug', 'trace', 'off'입니다.",
-	"status": "프로세스 사용 및 진단 정보를 인쇄합니다.",
-	"performance": "'Developer: Startup Performance' 명령을 사용하여 시작합니다.",
-	"prof-startup": "시작하는 동안 CPU 프로파일러 실행",
-	"disableExtensions": "설치된 모든 확장을 사용하지 않도록 설정합니다.",
-	"inspect-extensions": "디버깅 및 확장 프로파일링을 허용합니다. 연결 URI는 개발자 도구를 확인하세요.",
-	"inspect-brk-extensions": "시작 후 일시 중시된 확장 호스트에서 디버깅 및 확장 프로파일링을 허용합니다. 연결 URI는 개발자 도구를 확인하세요.",
-	"disableGPU": "GPU 하드웨어 가속을 사용하지 않도록 설정합니다.",
-	"uploadLogs": "현재의 세션에서 안전한 종점으로 로그 업로드",
-	"maxMemory": "윈도우에 대한 최대 메모리 크기 (단위 MB).",
-	"usage": "사용법",
-	"options": "옵션",
-	"paths": "경로",
-	"stdinWindows": "다른 프로그램의 출력을 읽으려면, '-'를 추가하십시오. (예: 'echo Hello World | {0} -')",
-	"stdinUnix": "stdin에서 읽어오려면, '-'를 추가하십시오.(예. 'ps aux | grep code | {0} -')",
-	"optionsUpperCase": "옵션",
-	"extensionsManagement": "확장 관리",
-	"troubleshooting": "문제 해결"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/platform/extensionManagement/common/extensionEnablementService.i18n.json b/i18n/kor/src/vs/platform/extensionManagement/common/extensionEnablementService.i18n.json
deleted file mode 100644
index ca84ce5d2d7..00000000000
--- a/i18n/kor/src/vs/platform/extensionManagement/common/extensionEnablementService.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noWorkspace": "작업 영역이 없습니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/platform/extensionManagement/common/extensionManagement.i18n.json b/i18n/kor/src/vs/platform/extensionManagement/common/extensionManagement.i18n.json
deleted file mode 100644
index e23c9e37b29..00000000000
--- a/i18n/kor/src/vs/platform/extensionManagement/common/extensionManagement.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"extensions": "확장",
-	"preferences": "기본 설정"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/platform/extensionManagement/node/extensionGalleryService.i18n.json b/i18n/kor/src/vs/platform/extensionManagement/node/extensionGalleryService.i18n.json
deleted file mode 100644
index 7bb6efc105c..00000000000
--- a/i18n/kor/src/vs/platform/extensionManagement/node/extensionGalleryService.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"notCompatibleDownload": "VS Code의 현재 버전 '{0}'과(와) 호환되는 확장을 찾을 수 없으므로 다운로드할 수 없습니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json b/i18n/kor/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
deleted file mode 100644
index 05518f96202..00000000000
--- a/i18n/kor/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"invalidManifest": "잘못된 확장: package.json이 JSON 파일이 아닙니다.",
-	"incompatible": "'{0}' 확장은 Code '{1}'과(와) 호환되지 않으므로 설치할 수 없습니다.",
-	"restartCode": "{0}을(를) 다시 설치하기 전에 Code를 다시 시작하세요.",
-	"installingOutdatedExtension": "이 확장의 최신 버전이 이미 설치되어 있습니다. 이 버전을 이전 버전으로 재정의하시겠습니까?",
-	"override": "재정의",
-	"cancel": "취소",
-	"errorInstallingDependencies": "의존성 설치 중 오류가 발생했습니다. {0}",
-	"MarketPlaceDisabled": "Marketplace를 사용할 수 없습니다.",
-	"removeError": "확장을 제거하는 동안 오류가 발생했습니다. {0}. 다시 시도하기 전에 VS Code를 종료하고 다시 시작하세요.",
-	"Not a Marketplace extension": "마켓플레이스 확장만 다시 설치할 수 있습니다.",
-	"notFoundCompatible": "'{0}'을(를) 설치할 수 없습니다; VS Code '{1}'과 호환되는 버전이 없습니다.",
-	"malicious extension": "문제가 있다고 보고되었으므로 확장을 설치할 수 없습니다.",
-	"notFoundCompatibleDependency": "VS Code의 현재 버전 '{1}'과(와) 호환되는 종속된 확장 '{0}'을(를) 찾을 수 없으므로 설치할 수 없습니다.",
-	"quitCode": "확장을 설치할 수 없습니다. 다시 설치하기 위해 VS Code를 종료하고 다시 시작하십시오.",
-	"exitCode": "확장을 설치할 수 없습니다. 다시 설치하기 전에 VS 코드를 종료한 후 다시 시작하십시오. ",
-	"renameError": "이름을 {0}에서 {1}(으)로 변경하는 중 알 수 없는 오류 발생",
-	"uninstallDependeciesConfirmation": "'{0}'만 제거할까요, 아니면 종속성도 제거할까요?",
-	"uninstallOnly": "확장만",
-	"uninstallAll": "모두 제거",
-	"singleDependentError": "확장 '{0}'을(를) 제거할 수 없습니다. 확장 '{1}'이(가) 이 확장에 종속됩니다.",
-	"twoDependentsError": "확장 '{0}'을(를) 제거할 수 없습니다. 확장 '{1}' 및 '{2}'이(가) 이 확장에 종속됩니다.",
-	"multipleDependentsError": "확장 '{0}'을(를) 제거할 수 없습니다. 확장 '{1}', '{2}' 등이 이 확장에 종속됩니다.",
-	"notExists": "확장을 찾을 수 없음"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/platform/extensions/common/abstractExtensionService.i18n.json b/i18n/kor/src/vs/platform/extensions/common/abstractExtensionService.i18n.json
deleted file mode 100644
index 6aaab18c9bf..00000000000
--- a/i18n/kor/src/vs/platform/extensions/common/abstractExtensionService.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"unknownDep": "확장 `{1}`을(를) 활성화하지 못했습니다. 이유: 알 수 없는 종속성 `{0}`.",
-	"failedDep1": "확장 `{1}`을(를) 활성화하지 못했습니다. 이유: 종속성 `{0}`이(가) 활성화되지 않았습니다.",
-	"failedDep2": "확장 `{0}`을(를) 활성화하지 못했습니다. 이유: 종속성 수준이 10개가 넘음(종속성 루프일 가능성이 높음).",
-	"activationError": "확장 `{0}` 활성화 실패: {1}."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/platform/extensions/common/extensionsRegistry.i18n.json b/i18n/kor/src/vs/platform/extensions/common/extensionsRegistry.i18n.json
deleted file mode 100644
index e0c7d88cbca..00000000000
--- a/i18n/kor/src/vs/platform/extensions/common/extensionsRegistry.i18n.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.engines.vscode": "VS Code 확장의 경우, 확장이 호환되는 VS Code 버전을 지정합니다. *일 수 없습니다. 예를 들어 ^0.10.5는 최소 VS Code 버전인 0.10.5와 호환됨을 나타냅니다.",
-	"vscode.extension.publisher": "VS Code 확장의 게시자입니다.",
-	"vscode.extension.displayName": "VS Code 갤러리에 사용되는 확장의 표시 이름입니다.",
-	"vscode.extension.categories": "확장을 분류하기 위해 VS Code 갤러리에서 사용하는 범주입니다.",
-	"vscode.extension.galleryBanner": "VS Code 마켓플레이스에 사용되는 배너입니다.",
-	"vscode.extension.galleryBanner.color": "VS Code 마켓플레이스 페이지 머리글의 배너 색상입니다.",
-	"vscode.extension.galleryBanner.theme": "배너에 사용되는 글꼴의 색상 테마입니다.",
-	"vscode.extension.contributes": "이 패키지에 표시된 VS Code 확장의 전체 기여입니다.",
-	"vscode.extension.preview": "마켓플레이스에서 Preview로 플래그 지정할 확장을 설정합니다.",
-	"vscode.extension.activationEvents": "VS Code 확장에 대한 활성화 이벤트입니다.",
-	"vscode.extension.activationEvents.onLanguage": "지정된 언어로 확인되는 파일을 열 때마다 활성화 이벤트가 발송됩니다.",
-	"vscode.extension.activationEvents.onCommand": "지정된 명령을 호출할 때마다 활성화 이벤트가 발송됩니다.",
-	"vscode.extension.activationEvents.onDebug": "사용자가 디버깅을 시작하거나 디버그 구성을 설정하려고 할 때마다 활성화 이벤트를 내보냅니다.",
-	"vscode.extension.activationEvents.onDebugInitialConfigurations": "\"launch.json\"을 만들어야 할 때마다(그리고 모든 provideDebugConfigurations 메서드를 호출해야 할 때마다) 발생하는 활성화 이벤트입니다.",
-	"vscode.extension.activationEvents.onDebugResolve": "특정 유형의 디버그 세션이 시작하려고 할 때마다(그리고 해당하는 resolveDebugConfiguration 메서드를 호출해야 할 때마다) 발생하는 활성화 이벤트입니다.",
-	"vscode.extension.activationEvents.workspaceContains": "지정된 glob 패턴과 일치하는 파일이 하나 이상 있는 폴더를 열 때마다 활성화 알림이 발송됩니다.",
-	"vscode.extension.activationEvents.onView": "지정된 뷰가 확장될 때마다 활성화 이벤트가 내보내 집니다.",
-	"vscode.extension.activationEvents.star": "VS Code 시작 시 활성화 이벤트가 발송됩니다. 훌륭한 최종 사용자 경험을 보장하려면 사용 케이스에서 다른 활성화 이벤트 조합이 작동하지 않을 때에만 확장에서 이 활성화 이벤트를 사용하세요.",
-	"vscode.extension.badges": "마켓플레이스 확장 페이지의 사이드바에 표시할 배지의 배열입니다.",
-	"vscode.extension.badges.url": "배지 이미지 URL입니다.",
-	"vscode.extension.badges.href": "배지 링크입니다.",
-	"vscode.extension.badges.description": "배지 설명입니다.",
-	"vscode.extension.extensionDependencies": "다른 확장에 대한 종속성입니다. 확장 식별자는 항상 ${publisher}.${name}입니다(예: vscode.csharp).",
-	"vscode.extension.scripts.prepublish": "패키지가 VS Code 확장 형태로 게시되기 전에 스크립트가 실행되었습니다.",
-	"vscode.extension.icon": "128x128 픽셀 아이콘의 경로입니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/platform/extensions/node/extensionValidator.i18n.json b/i18n/kor/src/vs/platform/extensions/node/extensionValidator.i18n.json
deleted file mode 100644
index 857ee7287d7..00000000000
--- a/i18n/kor/src/vs/platform/extensions/node/extensionValidator.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"versionSyntax": "`engines.vscode` 값 {0}을(를) 구문 분석할 수 없습니다. ^1.22.0, ^1.22.x 등을 사용하세요.",
-	"versionSpecificity1": "`engines.vscode`({0})에 지정된 버전이 명확하지 않습니다. vscode 버전이 1.0.0 이전이면 최소한 원하는 주 버전과 부 버전을 정의하세요( 예: ^0.10.0, 0.10.x, 0.11.0 등).",
-	"versionSpecificity2": "`engines.vscode`({0})에 지정된 버전이 명확하지 않습니다. vscode 버전이 1.0.0 이후이면 최소한 원하는 주 버전을 정의하세요(예: ^1.10.0, 1.10.x, 1.x.x, 2.x.x 등).",
-	"versionMismatch": "확장이 Code {0}과(와) 호환되지 않습니다. 확장에 {1}이(가) 필요합니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/platform/history/electron-main/historyMainService.i18n.json b/i18n/kor/src/vs/platform/history/electron-main/historyMainService.i18n.json
deleted file mode 100644
index 9400d59c513..00000000000
--- a/i18n/kor/src/vs/platform/history/electron-main/historyMainService.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"newWindow": "새 창",
-	"newWindowDesc": "새 창을 엽니다.",
-	"recentFolders": "최근 작업 영역",
-	"folderDesc": "{0} {1}",
-	"codeWorkspace": "코드 작업 영역"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/platform/integrity/node/integrityServiceImpl.i18n.json b/i18n/kor/src/vs/platform/integrity/node/integrityServiceImpl.i18n.json
deleted file mode 100644
index 78585e502ec..00000000000
--- a/i18n/kor/src/vs/platform/integrity/node/integrityServiceImpl.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"integrity.prompt": "{0} 설치가 손상된 것 같습니다. 다시 설치하세요.",
-	"integrity.moreInformation": "추가 정보",
-	"integrity.dontShowAgain": "다시 표시 안 함"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/platform/issue/electron-main/issueService.i18n.json b/i18n/kor/src/vs/platform/issue/electron-main/issueService.i18n.json
deleted file mode 100644
index 27d2b1e7d9c..00000000000
--- a/i18n/kor/src/vs/platform/issue/electron-main/issueService.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"issueReporter": "문제 보고자",
-	"processExplorer": "프로세스 탐색기"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/platform/jsonschemas/common/jsonValidationExtensionPoint.i18n.json b/i18n/kor/src/vs/platform/jsonschemas/common/jsonValidationExtensionPoint.i18n.json
deleted file mode 100644
index 42c82644097..00000000000
--- a/i18n/kor/src/vs/platform/jsonschemas/common/jsonValidationExtensionPoint.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"contributes.jsonValidation": "json 스키마 구성을 적용합니다.",
-	"contributes.jsonValidation.fileMatch": "일치할 파일 패턴(예: \"package.json\" 또는 \"*.launch\")입니다.",
-	"contributes.jsonValidation.url": "스키마 URL('http:', 'https:') 또는 확장 폴더에 대한 상대 경로('./')입니다.",
-	"invalid.jsonValidation": "'configuration.jsonValidation'은 배열이어야 합니다.",
-	"invalid.fileMatch": "'configuration.jsonValidation.fileMatch'를 정의해야 합니다.",
-	"invalid.url": "'configuration.jsonValidation.url'은 URL 또는 상대 경로여야 합니다.",
-	"invalid.url.fileschema": "'configuration.jsonValidation.url'이 잘못된 상대 URL입니다. {0}",
-	"invalid.url.schema": "확장에 있는 스키마를 참조하려면 'configuration.jsonValidation.url'이 'http:', 'https:' 또는 './'로 시작해야 합니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/platform/keybinding/common/abstractKeybindingService.i18n.json b/i18n/kor/src/vs/platform/keybinding/common/abstractKeybindingService.i18n.json
deleted file mode 100644
index bab30db7474..00000000000
--- a/i18n/kor/src/vs/platform/keybinding/common/abstractKeybindingService.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"first.chord": "({0})을(를) 눌렀습니다. 둘째 키는 잠시 기다렸다가 누르세요.",
-	"missing.chord": "키 조합({0}, {1})은 명령이 아닙니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/platform/keybinding/common/keybindingLabels.i18n.json b/i18n/kor/src/vs/platform/keybinding/common/keybindingLabels.i18n.json
deleted file mode 100644
index 9faa4114ef5..00000000000
--- a/i18n/kor/src/vs/platform/keybinding/common/keybindingLabels.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"ctrlKey": "<Ctrl>",
-	"shiftKey": "<Shift>",
-	"altKey": "<Alt>",
-	"windowsKey": "Windows",
-	"ctrlKey.long": "컨트롤",
-	"shiftKey.long": "<Shift>",
-	"altKey.long": "<Alt>",
-	"cmdKey.long": "명령",
-	"windowsKey.long": "Windows"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/platform/list/browser/listService.i18n.json b/i18n/kor/src/vs/platform/list/browser/listService.i18n.json
deleted file mode 100644
index 8b32c5188c5..00000000000
--- a/i18n/kor/src/vs/platform/list/browser/listService.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"workbenchConfigurationTitle": "워크벤치",
-	"multiSelectModifier.ctrlCmd": "Windows와 Linux의 'Control'을 macOS의 'Command'로 매핑합니다.",
-	"multiSelectModifier.alt": "Windows와 Linux의 'Alt'를 macOS의 'Option'으로 매핑합니다.",
-	"multiSelectModifier": "마우스로 트리와 목록의 항목을 다중 선택에 추가할 때 사용할 한정자입니다(예를 들어 탐색기에서 편집기와 SCM 보기를 여는 경우). `ctrlCmd`는 Windows와 Linux에서 `Control`로 매핑되고 macOS에서 `Command`로 매핑됩니다. '옆에서 열기' 마우스 제스처(지원되는 경우)는 다중 선택 한정자와 충돌하지 않도록 조정됩니다.",
-	"openMode.singleClick": "마우스를 한 번 클릭하여 항목을 엽니다.",
-	"openMode.doubleClick": "마우스를 두 번 클릭하여 항목을 엽니다.",
-	"openModeModifier": "트리와 목록에서 마우스를 사용하여 항목을 여는 방법을 제어합니다(지원되는 경우). 마우스을 한 번 클릭하여 항목을 열려면 `singleClick` 으로 설정하고 마우스 두 번 클릭을 통해서만 열려면 `doubleClick`으로 설정합니다. 트리에서 하위 항목이 있는 상위 항목의 경우 이 설정은 상위 항목을 한 번 클릭으로 확장할지 두 번 클릭으로 확장할지를 제어합니다. 일부 트리와 목록에서는 이 설정을 적용할 수 없는 경우  무시하도록 선택할 수 있습니다. ",
-	"horizontalScrolling setting": "워크벤치에서 수평 스크롤 지원 여부를 제어 합니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/platform/localizations/common/localizations.i18n.json b/i18n/kor/src/vs/platform/localizations/common/localizations.i18n.json
deleted file mode 100644
index fc09801065f..00000000000
--- a/i18n/kor/src/vs/platform/localizations/common/localizations.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.contributes.localizations": "편집기에 지역화를 적용합니다.",
-	"vscode.extension.contributes.localizations.languageId": "표시 문자열이 번역되는 언어의 ID입니다.",
-	"vscode.extension.contributes.localizations.languageName": "영어로 된 언어 이름입니다.",
-	"vscode.extension.contributes.localizations.languageNameLocalized": "적용된 언어로 된 언어 이름입니다.",
-	"vscode.extension.contributes.localizations.translations": "해당 언어에 연결된 번역 목록입니다.",
-	"vscode.extension.contributes.localizations.translations.id": "이 변환이 적용되는 VS Code 또는 확장의 ID입니다. VS Code의 ID는 항상 `vscode`이고 확장의 ID는 `publisherId.extensionName` 형식이어야 합니다.",
-	"vscode.extension.contributes.localizations.translations.id.pattern": "ID는 VS Code를 변환하거나 확장을 변환하는 경우 각각 `vscode` 또는 `publisherId.extensionName` 형식이어야 합니다.",
-	"vscode.extension.contributes.localizations.translations.path": "언어에 대한 변환을 포함하는 파일의 상대 경로입니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/platform/markers/common/markers.i18n.json b/i18n/kor/src/vs/platform/markers/common/markers.i18n.json
deleted file mode 100644
index d0a8772dd00..00000000000
--- a/i18n/kor/src/vs/platform/markers/common/markers.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"sev.error": "오류",
-	"sev.warning": "경고",
-	"sev.info": "정보"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/platform/markers/common/problemMatcher.i18n.json b/i18n/kor/src/vs/platform/markers/common/problemMatcher.i18n.json
deleted file mode 100644
index fe6cabbea04..00000000000
--- a/i18n/kor/src/vs/platform/markers/common/problemMatcher.i18n.json
+++ /dev/null
@@ -1,72 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"ProblemPatternParser.loopProperty.notLast": "loop 속성은 마지막 줄 검사기에서만 지원됩니다.",
-	"ProblemPatternParser.problemPattern.missingRegExp": "문제 패턴에 정규식이 없습니다.",
-	"ProblemPatternParser.problemPattern.missingProperty": "문제 패턴이 잘못되었습니다. 하나 이상의 파일, 메시지 및 줄 또는 위치 일치 그룹을 포함해야 합니다.",
-	"ProblemPatternParser.invalidRegexp": "오류: {0} 문자열은 유효한 정규식이 아닙니다.\n",
-	"ProblemPatternSchema.regexp": "출력에서 오류, 경고 또는 정보를 찾는 정규식입니다.",
-	"ProblemPatternSchema.file": "파일 이름의 일치 그룹 인덱스입니다. 생략된 경우 1이 사용됩니다.",
-	"ProblemPatternSchema.location": "문제 위치의 일치 그룹 인덱스입니다. 유효한 위치 패턴은 (line), (line,column) 및 (startLine,startColumn,endLine,endColumn)입니다. 생략하면 (line,column)이 사용됩니다.",
-	"ProblemPatternSchema.line": "문제 줄의 일치 그룹 인덱스입니다. 기본값은 2입니다.",
-	"ProblemPatternSchema.column": "문제의 줄바꿈 문자의 일치 그룹 인덱스입니다. 기본값은 3입니다.",
-	"ProblemPatternSchema.endLine": "문제 끝 줄의 일치 그룹 인덱스입니다. 기본적으로 정의되지 않습니다.",
-	"ProblemPatternSchema.endColumn": "문제의 끝 줄바꿈 문자의 일치 그룹 인덱스입니다. 기본값은 정의되지 않았습니다.",
-	"ProblemPatternSchema.severity": "문제 심각도의 일치 그룹 인덱스입니다. 기본적으로 정의되지 않습니다.",
-	"ProblemPatternSchema.code": "문제 코드의 일치 그룹 인덱스입니다. 기본적으로 정의되지 않습니다.",
-	"ProblemPatternSchema.message": "메시지의 일치 그룹 인덱스입니다. 생략된 경우 기본값은 위치가 지정된 경우 4이고, 그렇지 않으면 5입니다.",
-	"ProblemPatternSchema.loop": "여러 줄 선택기 루프에서는 이 패턴이 일치할 경우 루프에서 패턴을 실행할지 여부를 나타냅니다. 여러 줄 패턴의 마지막 패턴에 대해서만 지정할 수 있습니다.",
-	"NamedProblemPatternSchema.name": "문제 패턴의 이름입니다.",
-	"NamedMultiLineProblemPatternSchema.name": "여러 줄 문제 패턴의 이름입니다.",
-	"NamedMultiLineProblemPatternSchema.patterns": "실제 패턴입니다.",
-	"ProblemPatternExtPoint": "문제 패턴을 제공합니다.",
-	"ProblemPatternRegistry.error": "잘못된 문제 패턴입니다. 패턴이 무시됩니다.",
-	"ProblemMatcherParser.noProblemMatcher": "오류: 설명을 문제 선택기로 변환할 수 없습니다.\n{0}\n",
-	"ProblemMatcherParser.noProblemPattern": "오류: 설명에서 유효한 문제 패턴을 정의하지 않습니다.\n{0}\n",
-	"ProblemMatcherParser.noOwner": "오류: 설명에서 소유자를 정의하지 않습니다.\n{0}\n",
-	"ProblemMatcherParser.noFileLocation": "오류: 설명에서 파일 위치를 정의하지 않습니다.\n{0}\n",
-	"ProblemMatcherParser.unknownSeverity": "정보: 알 수 없는 심각도 {0}. 유효한 값은 오류, 경고 및 정보입니다.\n",
-	"ProblemMatcherParser.noDefinedPatter": "오류: 식별자가 {0}인 패턴이 없습니다.",
-	"ProblemMatcherParser.noIdentifier": "오류: 패턴 속성이 빈 식별자를 참조합니다.",
-	"ProblemMatcherParser.noValidIdentifier": "오류: 패턴 속성 {0}이(가) 유효한 패턴 변수 이름이 아닙니다.",
-	"ProblemMatcherParser.problemPattern.watchingMatcher": "문제 검사기에서 감시 시작 패턴과 종료 패턴을 모두 정의해야 합니다.",
-	"ProblemMatcherParser.invalidRegexp": "오류: {0} 문자열은 유효한 정규식이 아닙니다.\n",
-	"WatchingPatternSchema.regexp": "백그라운드 작업의 시작 또는 종료를 감지하는 정규식입니다.",
-	"WatchingPatternSchema.file": "파일 이름의 일치 그룹 인덱스이며 생략할 수 있습니다.",
-	"PatternTypeSchema.name": "제공되거나 미리 정의된 패턴의 이름",
-	"PatternTypeSchema.description": "문제 패턴 또는 제공되거나 미리 정의된 문제 패턴의 이름입니다. 기본이 지정된 경우 생략할 수 있습니다.",
-	"ProblemMatcherSchema.base": "사용할 기본 문제 선택기의 이름입니다.",
-	"ProblemMatcherSchema.owner": "Code 내부의 문제 소유자입니다. 기본값을 지정한 경우 생략할 수 있습니다. 기본값을 지정하지 않고 생략한 경우 기본값은 '외부'입니다.",
-	"ProblemMatcherSchema.severity": "캡처 문제에 대한 기본 심각도입니다. 패턴에서 심각도에 대한 일치 그룹을 정의하지 않은 경우에 사용됩니다.",
-	"ProblemMatcherSchema.applyTo": "텍스트 문서에 복된 문제가 열린 문서, 닫힌 문서 또는 모든 문서에 적용되는지를 제어합니다.",
-	"ProblemMatcherSchema.fileLocation": "문제 패턴에 보고된 파일 이름을 해석하는 방법을 정의합니다.",
-	"ProblemMatcherSchema.background": "백그라운드 작업에서 활성 상태인 matcher의 시작과 끝을 추적하는 패턴입니다.",
-	"ProblemMatcherSchema.background.activeOnStart": "true로 설정한 경우 작업이 시작되면 백그라운드 모니터가  활성 모드로 전환됩니다. 이는 beginPattern과 일치하는 줄을 실행하는 것과 같습니다.",
-	"ProblemMatcherSchema.background.beginsPattern": "출력이 일치하는 경우 백그라운드 작업을 시작할 때 신호를 받습니다.",
-	"ProblemMatcherSchema.background.endsPattern": "출력이 일치하는 경우 백그라운드 작업을 끝날 때 신호를 받습니다.",
-	"ProblemMatcherSchema.watching.deprecated": "조사 속성은 사용되지 않습니다. 백그라운드 속성을 대신 사용하세요.",
-	"ProblemMatcherSchema.watching": "조사 matcher의 시작과 끝을 추적하는 패턴입니다.",
-	"ProblemMatcherSchema.watching.activeOnStart": "true로 설정한 경우 작업이 시작되면 선택기가 활성 모드로 전환됩니다. 이는 beginPattern과 일치하는 줄을 실행하는 것과 같습니다.",
-	"ProblemMatcherSchema.watching.beginsPattern": "출력이 일치하는 경우 조사 작업을 시작할 때 신호를 받습니다.",
-	"ProblemMatcherSchema.watching.endsPattern": "출력이 일치하는 경우 조사 작업을 끝날 때 신호를 받습니다.",
-	"LegacyProblemMatcherSchema.watchedBegin.deprecated": "이 속성은 사용되지 않습니다. 대신 감시 속성을 사용하세요.",
-	"LegacyProblemMatcherSchema.watchedBegin": "파일 감시를 통해 트리거되는 감시되는 작업이 시작됨을 나타내는 정규식입니다.",
-	"LegacyProblemMatcherSchema.watchedEnd.deprecated": "이 속성은 사용되지 않습니다. 대신 감시 속성을 사용하세요.",
-	"LegacyProblemMatcherSchema.watchedEnd": "감시되는 작업이 종료됨을 나타내는 정규식입니다.",
-	"NamedProblemMatcherSchema.name": "참조를 위한 문제 선택기의 이름입니다.",
-	"NamedProblemMatcherSchema.label": "사람이 읽을 수 있는 문제 일치기의 레이블입니다.",
-	"ProblemMatcherExtPoint": "문제 선택기를 제공합니다.",
-	"msCompile": "Microsoft 컴파일러 문제",
-	"lessCompile": "문제 적게 보기",
-	"gulp-tsc": "Gulp TSC 문제",
-	"jshint": "JSHint 문제",
-	"jshint-stylish": "JSHint 스타일 문제",
-	"eslint-compact": "ESLint 컴팩트 문제",
-	"eslint-stylish": "ESLint 스타일 문제",
-	"go": "이동 문제"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/platform/message/common/message.i18n.json b/i18n/kor/src/vs/platform/message/common/message.i18n.json
deleted file mode 100644
index c0cadb165e7..00000000000
--- a/i18n/kor/src/vs/platform/message/common/message.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"close": "닫기",
-	"later": "나중에",
-	"cancel": "취소",
-	"moreFile": "...1개의 추가 파일이 표시되지 않음",
-	"moreFiles": "...{0}개의 추가 파일이 표시되지 않음"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/platform/node/minimalTranslations.i18n.json b/i18n/kor/src/vs/platform/node/minimalTranslations.i18n.json
deleted file mode 100644
index 94c91cdbbad..00000000000
--- a/i18n/kor/src/vs/platform/node/minimalTranslations.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"showLanguagePackExtensions": "VS Code는 {0}(으)로 제공됩니다. 시작하려면 Marketplace에서 언어 팩을 검색하세요.",
-	"searchMarketplace": "Marketplace 검색",
-	"installAndRestartMessage": "VS Code는 {0}(으)로 제공됩니다. 시작하려면 언어 팩을 설치하세요. 다시 시작해야 합니다.",
-	"installAndRestart": "설치 및 다시 시작"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/platform/request/node/request.i18n.json b/i18n/kor/src/vs/platform/request/node/request.i18n.json
deleted file mode 100644
index 82b7f1f247c..00000000000
--- a/i18n/kor/src/vs/platform/request/node/request.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"httpConfigurationTitle": "HTTP",
-	"proxy": "사용할 프록시 설정입니다. 설정되지 않으면 http_proxy 및 https_proxy 환경 변수에서 가져옵니다.",
-	"strictSSL": "제공된 CA 목록에 대해 프록시 서버 인증서를 확인해야 하는지 여부를 나타냅니다.",
-	"proxyAuthorization": "모든 네트워크 요청에 대해 'Proxy-Authorization' 헤더로 보낼 값입니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/platform/telemetry/common/telemetryService.i18n.json b/i18n/kor/src/vs/platform/telemetry/common/telemetryService.i18n.json
deleted file mode 100644
index e23f0a8589b..00000000000
--- a/i18n/kor/src/vs/platform/telemetry/common/telemetryService.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"telemetryConfigurationTitle": "원격 분석",
-	"telemetry.enableTelemetry": "사용 데이터와 오류를 Microsoft에 전송할 수 있습니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/platform/theme/common/colorExtensionPoint.i18n.json b/i18n/kor/src/vs/platform/theme/common/colorExtensionPoint.i18n.json
deleted file mode 100644
index eb6d49f4520..00000000000
--- a/i18n/kor/src/vs/platform/theme/common/colorExtensionPoint.i18n.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"contributes.color": "확장 정의 테마 지정 가능 색을 적용합니다.",
-	"contributes.color.id": "테마 지정 가능 색의 식별자입니다.",
-	"contributes.color.id.format": "식별자는 aa[.bb]* 형식이어야 합니다.",
-	"contributes.color.description": "테마 지정 가능 색에 대한 설명입니다.",
-	"contributes.defaults.light": "밝은 테마의 기본 색입니다. 16진수의 색 값(#RRGGBB[AA]) 또는 기본값을 제공하는 테마 지정 가능 색의 식별자입니다.",
-	"contributes.defaults.dark": "어두운 테마의 기본 색입니다. 16진수의 색 값(#RRGGBB[AA]) 또는 기본값을 제공하는 테마 지정 가능 색의 식별자입니다.",
-	"contributes.defaults.highContrast": "고대비 테마의 기본 색상입니다. 기본값을 제공하는 16진수(#RRGGBB[AA])의 색상 값 또는 테마 지정 가능 색의 식별자입니다.",
-	"invalid.colorConfiguration": "'configuration.colors'는 배열이어야 합니다.",
-	"invalid.default.colorType": "{0}은(는) 16진수의 색 값(#RRGGBB[AA] 또는 #RGB[A]) 또는 기본값을 제공하는 테마 지정 가능 색의 식별자입니다.",
-	"invalid.id": "'configuration.colors.id'를 정의해야 하며 비워둘 수 없습니다.",
-	"invalid.id.format": "'configuration.colors.id'는 단어[.word]* 다음에 와야 합니다.",
-	"invalid.description": "'configuration.colors.description'을 정의해야 하며 비워둘 수 없습니다.",
-	"invalid.defaults": "'configuration.colors.defaults'를 정의해야 하며 'light', 'dark' 및 'highContrast'를 포함해야 합니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/platform/theme/common/colorRegistry.i18n.json b/i18n/kor/src/vs/platform/theme/common/colorRegistry.i18n.json
deleted file mode 100644
index 44b01274f5b..00000000000
--- a/i18n/kor/src/vs/platform/theme/common/colorRegistry.i18n.json
+++ /dev/null
@@ -1,101 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"schema.colors": "워크벤치에서 사용되는 색입니다.",
-	"foreground": "전체 전경색입니다. 이 색은 구성 요소에서 재정의하지 않은 경우에만 사용됩니다.",
-	"errorForeground": "오류 메시지에 대한 전체 전경색입니다. 이 색은 구성 요소에서 재정의하지 않은 경우에만 사용됩니다.",
-	"descriptionForeground": "레이블과 같이 추가 정보를 제공하는 설명 텍스트의 전경색입니다.",
-	"focusBorder": "포커스가 있는 요소의 전체 테두리 색입니다. 이 색은 구성 요소에서 재정의하지 않은 경우에만 사용됩니다.",
-	"contrastBorder": "더 뚜렷이 대비되도록 요소를 다른 요소와 구분하는 요소 주위의 추가 테두리입니다.",
-	"activeContrastBorder": "더 뚜렷이 대비되도록 요소를 다른 요소와 구분하는 활성 요소 주위의 추가 테두리입니다.",
-	"selectionBackground": "워크벤치의 텍스트 선택(예: 입력 필드 또는 텍스트 영역) 전경색입니다. 편집기 내의 선택에는 적용되지 않습니다.",
-	"textSeparatorForeground": "텍스트 구분자 색상입니다.",
-	"textLinkForeground": "텍스트 내 링크의 전경색입니다.",
-	"textLinkActiveForeground": "클릭하고 마우스가 올라간 상태의 텍스트 내 링크의 전경색입니다.",
-	"textPreformatForeground": "미리 서식이 지정된 텍스트 세그먼트의 전경색입니다.",
-	"textBlockQuoteBackground": "텍스트 내 블록 인용의 전경색입니다.",
-	"textBlockQuoteBorder": "텍스트 내 블록 인용의 테두리 색입니다.",
-	"textCodeBlockBackground": "텍스트 내 코드 블록의 전경색입니다.",
-	"widgetShadow": "편집기 내에서 찾기/바꾸기 같은 위젯의 그림자 색입니다.",
-	"inputBoxBackground": "입력 상자 배경입니다.",
-	"inputBoxForeground": "입력 상자 전경입니다.",
-	"inputBoxBorder": "입력 상자 테두리입니다.",
-	"inputBoxActiveOptionBorder": "입력 필드에서 활성화된 옵션의 테두리 색입니다.",
-	"inputPlaceholderForeground": "위치 표시자 텍스트에 대한 입력 상자 전경색입니다.",
-	"inputValidationInfoBackground": "정보 심각도의 입력 유효성 검사 배경색입니다.",
-	"inputValidationInfoBorder": "정보 심각도의 입력 유효성 검사 테두리 색입니다.",
-	"inputValidationWarningBackground": "경고 심각도의 입력 유효성 검사 배경색입니다.",
-	"inputValidationWarningBorder": "경고 심각도의 입력 유효성 검사 테두리 색입니다.",
-	"inputValidationErrorBackground": "오류 심각도의 입력 유효성 검사 배경색입니다.",
-	"inputValidationErrorBorder": "오류 심각도의 입력 유효성 검사 테두리 색입니다.",
-	"dropdownBackground": "드롭다운 배경입니다.",
-	"dropdownListBackground": "드롭다운 목록 배경입니다.",
-	"dropdownForeground": "드롭다운 전경입니다.",
-	"dropdownBorder": "드롭다운 테두리입니다.",
-	"listFocusBackground": "목록/트리가 활성 상태인 경우 포커스가 있는 항목의 목록/트리 배경색입니다. 목록/트리가 활성 상태이면 키보드 포커스를 가지며, 비활성 상태이면 포커스가 없습니다.",
-	"listFocusForeground": "목록/트리가 활성 상태인 경우 포커스가 있는 항목의 목록/트리 전경색입니다. 목록/트리가 활성 상태이면 키보드 포커스를 가지며, 비활성 상태이면 포커스가 없습니다.",
-	"listActiveSelectionBackground": "목록/트리가 활성 상태인 경우 선택한 항목의 목록/트리 배경색입니다. 목록/트리가 활성 상태이면 키보드 포커스를 가지며, 비활성 상태이면 포커스가 없습니다.",
-	"listActiveSelectionForeground": "목록/트리가 활성 상태인 경우 선택한 항목의 목록/트리 전경색입니다. 목록/트리가 활성 상태이면 키보드 포커스를 가지며, 비활성 상태이면 포커스가 없습니다.",
-	"listInactiveSelectionBackground": "목록/트리가 비활성 상태인 경우 선택한 항목의 목록/트리 배경색입니다. 목록/트리가 활성 상태이면 키보드 포커스를 가지며, 비활성 상태이면 포커스가 없습니다.",
-	"listInactiveSelectionForeground": "목록/트리가 비활성 상태인 경우 선택한 항목의 목록/트리 전경색입니다. 목록/트리가 활성 상태이면 키보드 포커스를 가지며, 비활성 상태이면 포커스가 없습니다.",
-	"listHoverBackground": "마우스로 항목을 가리킬 때 목록/트리 배경입니다.",
-	"listHoverForeground": "마우스로 항목을 가리킬 때 목록/트리 전경입니다.",
-	"listDropBackground": "마우스로 항목을 이동할 때 목록/트리 끌어서 놓기 배경입니다.",
-	"highlight": "목록/트리 내에서 검색할 때 일치 항목 강조 표시의 목록/트리 전경색입니다.",
-	"invalidItemForeground": "잘못된 항목에 대한 목록/트리 전경 색(예: 탐색기의 확인할 수 없는 루트).",
-	"listErrorForeground": "오류를 포함하는 목록 항목의 전경색입니다.",
-	"listWarningForeground": "경고를 포함하는 목록 항목의 전경색입니다.",
-	"pickerGroupForeground": "그룹화 레이블에 대한 빠른 선택기 색입니다.",
-	"pickerGroupBorder": "그룹화 테두리에 대한 빠른 선택기 색입니다.",
-	"buttonForeground": "단추 기본 전경색입니다.",
-	"buttonBackground": "단추 배경색입니다.",
-	"buttonHoverBackground": "마우스로 가리킬 때 단추 배경색입니다.",
-	"badgeBackground": "배지 배경색입니다. 배지는 검색 결과 수와 같은 소량의 정보 레이블입니다.",
-	"badgeForeground": "배지 전경색입니다. 배지는 검색 결과 수와 같은 소량의 정보 레이블입니다.",
-	"scrollbarShadow": "스크롤되는 보기를 나타내는 스크롤 막대 그림자입니다.",
-	"scrollbarSliderBackground": "스크롤 막대 슬라이버 배경색입니다.",
-	"scrollbarSliderHoverBackground": "마우스로 가리킬 때 스크롤 막대 슬라이더 배경색입니다.",
-	"scrollbarSliderActiveBackground": "클릭된 상태일 때 스크롤 막대 슬라이더 배경색입니다.",
-	"progressBarBackground": "오래 실행 중인 작업에 대해 표시되는 진행률 표시 막대의 배경색입니다.",
-	"editorBackground": "편집기 배경색입니다.",
-	"editorForeground": "편집기 기본 전경색입니다.",
-	"editorWidgetBackground": "찾기/바꾸기 같은 편집기 위젯의 배경색입니다.",
-	"editorWidgetBorder": "편집기 위젯의 테두리 색입니다. 위젯에 테두리가 있고 위젯이 색상을 무시하지 않을 때만 사용됩니다.",
-	"editorSelectionBackground": "편집기 선택 영역의 색입니다.",
-	"editorSelectionForeground": "고대비를 위한 선택 텍스트의 색입니다.",
-	"editorInactiveSelection": "비활성화된 편집기에서 선택영역의 색상. 색상은 밑의 꾸밈을 가리지 않도록 반드시 불투명이 아니어야 합니다.",
-	"editorSelectionHighlight": "선택 영역과 동일한 콘텐츠가 있는 영역의 색입니다. 색상은 밑의 꾸밈을 가리지 않도록 반드시 불투명이 아니어야 합니다.",
-	"editorSelectionHighlightBorder": "선택 영역과 동일한 콘텐츠가 있는 영역의 테두리 색입니다.",
-	"editorFindMatch": "현재 검색 일치 항목의 색입니다.",
-	"findMatchHighlight": "기타 일치하는 검색의 색상. 색상은 밑의 꾸밈을 가리지 않도록 반드시 불투명이 아니어야 합니다.",
-	"findRangeHighlight": "검색을 제한하는 범위의 색입니다. 이 색은 기본 장식을 가리지 않도록 불투명하지 않아야 합니다.",
-	"editorFindMatchBorder": "현재 검색과 일치하는 테두리 색입니다.",
-	"findMatchHighlightBorder": "다른 검색과 일치하는 테두리 색입니다.",
-	"findRangeHighlightBorder": "검색을 제한하는 범위의 테두리 색입니다. 이 색은 기본 장식을 가리지 않도록 불투명하지 않아야 합니다.",
-	"findWidgetResizeBorder": "찾기 위젯의 크기 조정 막대의 테두리 색입니다.",
-	"hoverHighlight": "호버가 표시된 단어 아래를 강조 표시합니다. 색상은 밑의 꾸밈을 가리지 않도록 반드시 불투명이 아니어야 합니다.",
-	"hoverBackground": "편집기 호버의 배경색.",
-	"hoverBorder": "편집기 호버의 테두리 색입니다.",
-	"activeLinkForeground": "활성 링크의 색입니다.",
-	"diffEditorInserted": "글자 배경색이 삽입되었습니다. 해당 색상은 적용된 꾸밈을 가리지 않기 위해 불투명해서는 안됩니다.",
-	"diffEditorRemoved": "글자 배경색이 제거되었습니다. 해당 색상은 적용된 꾸밈을 가리지 않기 위해 불투명해서는 안됩니다.",
-	"diffEditorInsertedOutline": "삽입된 텍스트의 윤곽선 색입니다.",
-	"diffEditorRemovedOutline": "제거된 텍스트의 윤곽선 색입니다.",
-	"mergeCurrentHeaderBackground": "인라인 병합 충돌의 현재 헤더 배경입니다. 색상은 밑의 꾸밈을 가리지 않도록 반드시 불투명이 아니어야 합니다.",
-	"mergeCurrentContentBackground": "인라인 병합 충돌의 현재 콘텐츠 배경입니다. 색상은 밑의 꾸밈을 가리지 않도록 반드시 불투명이 아니어야 합니다.",
-	"mergeIncomingHeaderBackground": "인라인 병합 충돌에서 수신 헤더 배경입니다. 색상은 밑의 꾸밈을 가리지 않도록 반드시 불투명이 아니어야 합니다.",
-	"mergeIncomingContentBackground": "인라인 병합 충돌에서 수신 콘텐츠 배경입니다. 색상은 밑의 꾸밈을 가리지 않도록 반드시 불투명이 아니어야 합니다.",
-	"mergeCommonHeaderBackground": "인라인 병합 충돌의 공통 과거 헤더 배경입니다. 색상은 밑의 꾸밈을 가리지 않도록 반드시 불투명이 아니어야 합니다.",
-	"mergeCommonContentBackground": "인라인 병합 충돌의 공용 상위 콘텐츠 배경입니다. 이 색은 기본 장식을 가리지 않도록 불투명하지 않아야 합니다.",
-	"mergeBorder": "인라인 병합 충돌에서 헤더 및 스플리터의 테두리 색입니다.",
-	"overviewRulerCurrentContentForeground": "인라인 병합 충돌에서 현재 개요 눈금 전경색입니다.",
-	"overviewRulerIncomingContentForeground": "인라인 병합 충돌에서 수신 개요 눈금 전경색입니다.",
-	"overviewRulerCommonContentForeground": "인라인 병합 충돌에서 공통 과거 개요 눈금 전경색입니다.",
-	"overviewRulerFindMatchForeground": "일치하는 항목 찾기의 개요 눈금자 표식 색입니다. 이 색은 불투명해야만 내부 장식을 가리지 않습니다.",
-	"overviewRulerSelectionHighlightForeground": "선택 영역 강조의 개요 눈금자 표식 색입니다. 이 색은 불투명해야만 내부 장식을 가리지 않습니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/platform/update/node/update.config.contribution.i18n.json b/i18n/kor/src/vs/platform/update/node/update.config.contribution.i18n.json
deleted file mode 100644
index eead230c689..00000000000
--- a/i18n/kor/src/vs/platform/update/node/update.config.contribution.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"updateConfigurationTitle": "업데이트",
-	"updateChannel": "업데이트 채널에서 자동 업데이트를 받을지 여부를 구성합니다. 변경 후 다시 시작해야 합니다.",
-	"enableWindowsBackgroundUpdates": "Windows 배경 업데이트를 활성화합니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/platform/url/electron-browser/inactiveExtensionUrlHandler.i18n.json b/i18n/kor/src/vs/platform/url/electron-browser/inactiveExtensionUrlHandler.i18n.json
deleted file mode 100644
index 68460146404..00000000000
--- a/i18n/kor/src/vs/platform/url/electron-browser/inactiveExtensionUrlHandler.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"confirmUrl": "확장이 이 URL을 열도록 허용하겠습니까?"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/platform/windows/electron-main/windowsService.i18n.json b/i18n/kor/src/vs/platform/windows/electron-main/windowsService.i18n.json
deleted file mode 100644
index ff41fce7f3c..00000000000
--- a/i18n/kor/src/vs/platform/windows/electron-main/windowsService.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"aboutDetail": "버전 {0}\n커밋 {1}\n날짜 {2}\n셸 {3}\n렌더러 {4}\n노드 {5}\n아키텍처 {6}",
-	"okButton": "확인",
-	"copy": "복사(&&C)"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/platform/workspaces/common/workspaces.i18n.json b/i18n/kor/src/vs/platform/workspaces/common/workspaces.i18n.json
deleted file mode 100644
index 3e94ef3d79a..00000000000
--- a/i18n/kor/src/vs/platform/workspaces/common/workspaces.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"codeWorkspace": "코드 작업 영역",
-	"untitledWorkspace": "제목 없음(작업 영역)",
-	"workspaceNameVerbose": "{0}(작업 영역)",
-	"workspaceName": "{0}(작업 영역)"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/api/browser/localizationsExtensionPoint.i18n.json b/i18n/kor/src/vs/workbench/api/browser/localizationsExtensionPoint.i18n.json
deleted file mode 100644
index 0e0639f5633..00000000000
--- a/i18n/kor/src/vs/workbench/api/browser/localizationsExtensionPoint.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"requirestring": "속성 `{0}`은(는) 필수이며 `string` 형식이어야 합니다.",
-	"optstring": "속성 `{0}`은(는) 생략할 수 있으며 `string` 형식이어야 합니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/api/browser/viewsContainersExtensionPoint.i18n.json b/i18n/kor/src/vs/workbench/api/browser/viewsContainersExtensionPoint.i18n.json
deleted file mode 100644
index 4fcdf622980..00000000000
--- a/i18n/kor/src/vs/workbench/api/browser/viewsContainersExtensionPoint.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.contributes.views.containers.id": "'뷰' 기여 지점을 사용하여 뷰가 기여될 수 있는 컨테이너를 식별하는 데 사용되는 고유한 ID",
-	"vscode.extension.contributes.views.containers.title": "컨테이너를 렌더링하는 데 사용되는 사람이 읽을 수 있는 문자열",
-	"vscode.extension.contributes.views.containers.icon": "컨테이너 아이콘의 경로입니다. 아이콘은 50x40 사각형의 가운데에 있는 24x24 크기이며 채우기 색은 'rgb(215, 218, 224)' 또는 '#d7dae0'입니다. 아이콘의 이미지 파일 형식은 무엇이든 상관없지만 SVG를 사용하는 것이 좋습니다..",
-	"vscode.extension.contributes.viewsContainers": "뷰 컨테이너를 편집기에 기여합니다.",
-	"views.container.activitybar": "뷰 컨테이너를 작업 막대에 기여",
-	"test": "테스트",
-	"requirearray": "뷰 컨테이너는 배열이어야 합니다.",
-	"requireidstring": "`{0}` 속성은 필수이며 `string` 형식이어야 합니다. 영숫자와 ,  '_',  '-'만 사용할 수 있습니다.",
-	"requirestring": "속성 `{0}`은(는) 필수이며 `string` 형식이어야 합니다.",
-	"showViewlet": "{0} 표시",
-	"view": "보기"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json b/i18n/kor/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json
deleted file mode 100644
index ada81b2d8dc..00000000000
--- a/i18n/kor/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"requirearray": "뷰는 배열이어야 합니다.",
-	"requirestring": "속성 `{0}`은(는) 필수이며 `string` 형식이어야 합니다.",
-	"optstring": "속성 `{0}`은(는) 생략할 수 있으며 `string` 형식이어야 합니다.",
-	"vscode.extension.contributes.view.id": "뷰의 식별자입니다. 'vscode.window.registerTreeDataProviderForView` API를 통해 데이터 공급자를 등록하는 데 사용합니다. `onView:${id}` 이벤트를 `activationEvents`에 등록하여 확장 활성화를 트리거하는 데에도 사용합니다.",
-	"vscode.extension.contributes.view.name": "사용자가 읽을 수 있는 뷰 이름입니다. 표시됩니다.",
-	"vscode.extension.contributes.view.when": "이 보기를 표시하기 위해 true여야 하는 조건입니다.",
-	"vscode.extension.contributes.views": "뷰를 에디터에 적용합니다.",
-	"views.explorer": "뷰를 작업 막대의 탐색기 컨테이너에 기여합니다.",
-	"views.debug": "뷰를 작업 막대의 디버그 컨테이너에 기여합니다.",
-	"views.scm": "뷰를 작업 막대의 SCM 컨테이너에 적용합니다.",
-	"views.test": "뷰를 작업 막대의 테스트 컨테이너에 적용합니다.",
-	"views.contributed": "뷰를 기여된 뷰 컨테이너에 기여합니다.",
-	"ViewContainerDoesnotExist": "뷰 컨테이너 '{0}'이(가) 없으므로 이 컨테이너에 등록된 모든 뷰가 '탐색기'에 추가됩니다.",
-	"duplicateView1": "위치 '{1}'에서 동일한 ID '{0}'(으)로된 여러 개의 보기를 등록할 수 없습니다.",
-	"duplicateView2": "ID `{0}`이(가) 포함된 뷰가 위치 `{1}`에 이미 등록되어 있습니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/api/electron-browser/mainThreadExtensionService.i18n.json b/i18n/kor/src/vs/workbench/api/electron-browser/mainThreadExtensionService.i18n.json
deleted file mode 100644
index a0a766dacfd..00000000000
--- a/i18n/kor/src/vs/workbench/api/electron-browser/mainThreadExtensionService.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"overwritingExtension": "확장 {0}을(를) {1}(으)로 덮어쓰는 중입니다.",
-	"extensionUnderDevelopment": "{0}에서 개발 확장 로드 중"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/api/electron-browser/mainThreadMessageService.i18n.json b/i18n/kor/src/vs/workbench/api/electron-browser/mainThreadMessageService.i18n.json
deleted file mode 100644
index 19bb0d93623..00000000000
--- a/i18n/kor/src/vs/workbench/api/electron-browser/mainThreadMessageService.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"extensionSource": "{0} (확장)",
-	"defaultSource": "확장",
-	"manageExtension": "확장 관리",
-	"cancel": "취소",
-	"ok": "확인"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json b/i18n/kor/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
deleted file mode 100644
index e260c7da4c6..00000000000
--- a/i18n/kor/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"timeout.formatOnSave": "저장 시 {0}ms 후에 서식 지정이 중단됨",
-	"codeActionsOnSave.didTimeout": "{0}밀리초 후 codeActionsOnSave 중단됨",
-	"timeout.onWillSave": "1750ms 후에 onWillSaveTextDocument-event가 중단됨",
-	"saveParticipants": "실행중인 저장 관계자..."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json b/i18n/kor/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json
deleted file mode 100644
index ee8688cdc85..00000000000
--- a/i18n/kor/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"task.label": "{0}: {1}"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/api/electron-browser/mainThreadWebview.i18n.json b/i18n/kor/src/vs/workbench/api/electron-browser/mainThreadWebview.i18n.json
deleted file mode 100644
index b55013c7dfb..00000000000
--- a/i18n/kor/src/vs/workbench/api/electron-browser/mainThreadWebview.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"errorMessage": "뷰를 복원하는 중 오류 발생:{0}"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/api/electron-browser/mainThreadWorkspace.i18n.json b/i18n/kor/src/vs/workbench/api/electron-browser/mainThreadWorkspace.i18n.json
deleted file mode 100644
index 2d1a9a6ea73..00000000000
--- a/i18n/kor/src/vs/workbench/api/electron-browser/mainThreadWorkspace.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"folderStatusMessageAddSingleFolder": "'{0}' 확장이 작업 영역에 1개 폴더를 추가함",
-	"folderStatusMessageAddMultipleFolders": "'{0}' 확장이 작업 영역에 {1}개 폴더를 추가함",
-	"folderStatusMessageRemoveSingleFolder": "'{0}' 확장이 작업 영역에서 1개 폴더를 제거함",
-	"folderStatusMessageRemoveMultipleFolders": "'{0}' 확장이 작업 영역에서 {1}개 폴더를 제거함",
-	"folderStatusChangeFolder": "'{0}' 확장이 작업 영역의 폴더를 변경함"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/api/node/extHostDiagnostics.i18n.json b/i18n/kor/src/vs/workbench/api/node/extHostDiagnostics.i18n.json
deleted file mode 100644
index 84f648a9550..00000000000
--- a/i18n/kor/src/vs/workbench/api/node/extHostDiagnostics.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"limitHit": "{0}개의 추가 오류 및 경고를 표시하지 않습니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/api/node/extHostExplorerView.i18n.json b/i18n/kor/src/vs/workbench/api/node/extHostExplorerView.i18n.json
deleted file mode 100644
index b5a93203559..00000000000
--- a/i18n/kor/src/vs/workbench/api/node/extHostExplorerView.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"treeExplorer.notRegistered": "ID가 '{0}'인 등록된 TreeExplorerNodeProvider가 없습니다.",
-	"treeExplorer.failedToProvideRootNode": "TreeExplorerNodeProvider '{0}'에서 루트 노드를 제공하지 못했습니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/api/node/extHostExtensionActivator.i18n.json b/i18n/kor/src/vs/workbench/api/node/extHostExtensionActivator.i18n.json
deleted file mode 100644
index 0f680b0e851..00000000000
--- a/i18n/kor/src/vs/workbench/api/node/extHostExtensionActivator.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"unknownDep": "`{1}` 확장을 활성화하지 못했습니다. 이유: 알 수 없는 종속성 `{0}`.",
-	"failedDep1": "`{1}` 확장을 활성화하지 못했습니다. 이유: `{0}` 종속성을 활성화하지 못했습니다.",
-	"failedDep2": "`{1}` 확장을 활성화하지 못했습니다. 이유: 10개를 초과하는 종속성 수준(종속성 루프일 가능성 높음).",
-	"activationError": "'{0}' 확장을 활성화하지 못했습니다. {1}."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/api/node/extHostProgress.i18n.json b/i18n/kor/src/vs/workbench/api/node/extHostProgress.i18n.json
deleted file mode 100644
index b3d4a235518..00000000000
--- a/i18n/kor/src/vs/workbench/api/node/extHostProgress.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"extensionSource": "{0} (확장)"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/api/node/extHostTask.i18n.json b/i18n/kor/src/vs/workbench/api/node/extHostTask.i18n.json
deleted file mode 100644
index ee8688cdc85..00000000000
--- a/i18n/kor/src/vs/workbench/api/node/extHostTask.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"task.label": "{0}: {1}"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/api/node/extHostTreeExplorers.i18n.json b/i18n/kor/src/vs/workbench/api/node/extHostTreeExplorers.i18n.json
deleted file mode 100644
index c89e93c9117..00000000000
--- a/i18n/kor/src/vs/workbench/api/node/extHostTreeExplorers.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"treeExplorer.notRegistered": "ID가 '{0}'인 등록된 TreeExplorerNodeProvider가 없습니다.",
-	"treeExplorer.failedToProvideRootNode": "TreeExplorerNodeProvider '{0}'에서 루트 노드를 제공하지 못했습니다.",
-	"treeExplorer.failedToResolveChildren": "TreeExplorerNodeProvider '{0}'에서 자식을 확인하지 못했습니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/api/node/extHostTreeView.i18n.json b/i18n/kor/src/vs/workbench/api/node/extHostTreeView.i18n.json
deleted file mode 100644
index b5a93203559..00000000000
--- a/i18n/kor/src/vs/workbench/api/node/extHostTreeView.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"treeExplorer.notRegistered": "ID가 '{0}'인 등록된 TreeExplorerNodeProvider가 없습니다.",
-	"treeExplorer.failedToProvideRootNode": "TreeExplorerNodeProvider '{0}'에서 루트 노드를 제공하지 못했습니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/api/node/extHostTreeViews.i18n.json b/i18n/kor/src/vs/workbench/api/node/extHostTreeViews.i18n.json
deleted file mode 100644
index 119f9434ea1..00000000000
--- a/i18n/kor/src/vs/workbench/api/node/extHostTreeViews.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"treeView.notRegistered": "ID가 '{0}'인 등록된 트리 뷰가 없습니다.",
-	"treeView.duplicateElement": "ID가 {0}인 요소가 이미 등록되어 있습니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/api/node/extHostWorkspace.i18n.json b/i18n/kor/src/vs/workbench/api/node/extHostWorkspace.i18n.json
deleted file mode 100644
index a003ec20048..00000000000
--- a/i18n/kor/src/vs/workbench/api/node/extHostWorkspace.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"updateerror": "'{0}' 확장이 작업 영역 폴더를 업데이트하지 못했습니다. {1}"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/api/node/mainThreadExtensionService.i18n.json b/i18n/kor/src/vs/workbench/api/node/mainThreadExtensionService.i18n.json
deleted file mode 100644
index a0a766dacfd..00000000000
--- a/i18n/kor/src/vs/workbench/api/node/mainThreadExtensionService.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"overwritingExtension": "확장 {0}을(를) {1}(으)로 덮어쓰는 중입니다.",
-	"extensionUnderDevelopment": "{0}에서 개발 확장 로드 중"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/api/node/mainThreadMessageService.i18n.json b/i18n/kor/src/vs/workbench/api/node/mainThreadMessageService.i18n.json
deleted file mode 100644
index 68f2beaa1e0..00000000000
--- a/i18n/kor/src/vs/workbench/api/node/mainThreadMessageService.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"close": "닫기",
-	"cancel": "취소",
-	"ok": "확인"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/browser/actions/configureLocale.i18n.json b/i18n/kor/src/vs/workbench/browser/actions/configureLocale.i18n.json
deleted file mode 100644
index 46230055683..00000000000
--- a/i18n/kor/src/vs/workbench/browser/actions/configureLocale.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"configureLocale": "언어 구성",
-	"displayLanguage": "VSCode의 표시 언어를 정의합니다.",
-	"doc": "지원되는 언어 목록은 {0} 을(를) 참조하세요.",
-	"restart": "값을 변경하려면 VSCode를 다시 시작해야 합니다.",
-	"fail.createSettings": "'{0}'({1})을(를) 만들 수 없습니다.",
-	"JsonSchema.locale": "사용할 UI 언어입니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/browser/actions/fileActions.i18n.json b/i18n/kor/src/vs/workbench/browser/actions/fileActions.i18n.json
deleted file mode 100644
index 2ab74dda0fe..00000000000
--- a/i18n/kor/src/vs/workbench/browser/actions/fileActions.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"openFolder": "폴더 열기...",
-	"openFileFolder": "열기..."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/browser/actions/toggleActivityBarVisibility.i18n.json b/i18n/kor/src/vs/workbench/browser/actions/toggleActivityBarVisibility.i18n.json
deleted file mode 100644
index 5021d0ac242..00000000000
--- a/i18n/kor/src/vs/workbench/browser/actions/toggleActivityBarVisibility.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleActivityBar": "작업 막대 표시 유형 전환",
-	"view": "보기"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/browser/actions/toggleCenteredLayout.i18n.json b/i18n/kor/src/vs/workbench/browser/actions/toggleCenteredLayout.i18n.json
deleted file mode 100644
index f176db31908..00000000000
--- a/i18n/kor/src/vs/workbench/browser/actions/toggleCenteredLayout.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleCenteredLayout": "가운데 맞춤된 레이아웃 설정/해제",
-	"view": "보기"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/browser/actions/toggleEditorLayout.i18n.json b/i18n/kor/src/vs/workbench/browser/actions/toggleEditorLayout.i18n.json
deleted file mode 100644
index 16d8ef2c979..00000000000
--- a/i18n/kor/src/vs/workbench/browser/actions/toggleEditorLayout.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleEditorGroupLayout": "편집기 그룹 세로/가로 레이아웃 설정/해제",
-	"horizontalLayout": "가로 편집기 그룹 레이아웃",
-	"verticalLayout": "세로 편집기 그룹 레이아웃",
-	"view": "보기"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/browser/actions/toggleSidebarPosition.i18n.json b/i18n/kor/src/vs/workbench/browser/actions/toggleSidebarPosition.i18n.json
deleted file mode 100644
index 6a131e7319a..00000000000
--- a/i18n/kor/src/vs/workbench/browser/actions/toggleSidebarPosition.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleSidebarPosition": "사이드바 위치 설정/해제",
-	"view": "보기"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/browser/actions/toggleSidebarVisibility.i18n.json b/i18n/kor/src/vs/workbench/browser/actions/toggleSidebarVisibility.i18n.json
deleted file mode 100644
index 57769827d9f..00000000000
--- a/i18n/kor/src/vs/workbench/browser/actions/toggleSidebarVisibility.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleSidebar": "사이드바 표시 유형 설정/해제",
-	"view": "보기"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/browser/actions/toggleStatusbarVisibility.i18n.json b/i18n/kor/src/vs/workbench/browser/actions/toggleStatusbarVisibility.i18n.json
deleted file mode 100644
index d2e2c28f908..00000000000
--- a/i18n/kor/src/vs/workbench/browser/actions/toggleStatusbarVisibility.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleStatusbar": "상태 표시줄 표시 설정/해제",
-	"view": "보기"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/browser/actions/toggleTabsVisibility.i18n.json b/i18n/kor/src/vs/workbench/browser/actions/toggleTabsVisibility.i18n.json
deleted file mode 100644
index 04536816ec2..00000000000
--- a/i18n/kor/src/vs/workbench/browser/actions/toggleTabsVisibility.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleTabs": "탭 표시 설정/해제",
-	"view": "보기"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/browser/actions/toggleZenMode.i18n.json b/i18n/kor/src/vs/workbench/browser/actions/toggleZenMode.i18n.json
deleted file mode 100644
index 5ed12f81254..00000000000
--- a/i18n/kor/src/vs/workbench/browser/actions/toggleZenMode.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleZenMode": "Zen 모드 설정/해제",
-	"view": "보기"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/browser/actions/workspaceActions.i18n.json b/i18n/kor/src/vs/workbench/browser/actions/workspaceActions.i18n.json
deleted file mode 100644
index 9f392ee6782..00000000000
--- a/i18n/kor/src/vs/workbench/browser/actions/workspaceActions.i18n.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openFile": "파일 열기...",
-	"openFolder": "폴더 열기...",
-	"openFileFolder": "열기...",
-	"globalRemoveFolderFromWorkspace": "작업 영역에서 폴더 제거...",
-	"saveWorkspaceAsAction": "작업 영역을 다른 이름으로 저장",
-	"save": "저장(&&S)",
-	"saveWorkspace": "작업 영역 저장",
-	"openWorkspaceAction": "작업 영역 열기...",
-	"openWorkspaceConfigFile": "작업 영역 구성 파일 열기",
-	"duplicateWorkspaceInNewWindow": "새 창에 작업 영역 복제"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/browser/actions/workspaceCommands.i18n.json b/i18n/kor/src/vs/workbench/browser/actions/workspaceCommands.i18n.json
deleted file mode 100644
index ab09f3bfef7..00000000000
--- a/i18n/kor/src/vs/workbench/browser/actions/workspaceCommands.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"addFolderToWorkspace": "작업 영역에 폴더 추가...",
-	"add": "추가(&&A)",
-	"addFolderToWorkspaceTitle": "작업 영역에 폴더 추가",
-	"workspaceFolderPickerPlaceholder": "작업 영역 폴더 선택"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/browser/parts/activitybar/activitybarActions.i18n.json b/i18n/kor/src/vs/workbench/browser/parts/activitybar/activitybarActions.i18n.json
deleted file mode 100644
index 2c8a795fe67..00000000000
--- a/i18n/kor/src/vs/workbench/browser/parts/activitybar/activitybarActions.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"badgeTitle": "{0} - {1}",
-	"titleKeybinding": "{0}({1})",
-	"removeFromActivityBar": "작업 막대에서 숨기기",
-	"keepInActivityBar": "작업 막대에 유지",
-	"additionalViews": "추가 뷰",
-	"numberBadge": "{0}({1})",
-	"manageExtension": "확장 관리",
-	"toggle": "뷰 고정 전환"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/browser/parts/activitybar/activitybarPart.i18n.json b/i18n/kor/src/vs/workbench/browser/parts/activitybar/activitybarPart.i18n.json
deleted file mode 100644
index 6664eb56067..00000000000
--- a/i18n/kor/src/vs/workbench/browser/parts/activitybar/activitybarPart.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hideActivitBar": "작업 막대 숨기기",
-	"globalActions": "전역 작업"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/browser/parts/compositePart.i18n.json b/i18n/kor/src/vs/workbench/browser/parts/compositePart.i18n.json
deleted file mode 100644
index 6463b167671..00000000000
--- a/i18n/kor/src/vs/workbench/browser/parts/compositePart.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"ariaCompositeToolbarLabel": "{0} 동작",
-	"titleTooltip": "{0}({1})"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/browser/parts/compositebar/compositeBar.i18n.json b/i18n/kor/src/vs/workbench/browser/parts/compositebar/compositeBar.i18n.json
deleted file mode 100644
index 42e1efdef52..00000000000
--- a/i18n/kor/src/vs/workbench/browser/parts/compositebar/compositeBar.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"activityBarAriaLabel": "활성 뷰 전환기"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/browser/parts/compositebar/compositeBarActions.i18n.json b/i18n/kor/src/vs/workbench/browser/parts/compositebar/compositeBarActions.i18n.json
deleted file mode 100644
index 875980e9b30..00000000000
--- a/i18n/kor/src/vs/workbench/browser/parts/compositebar/compositeBarActions.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"largeNumberBadge": "10k+",
-	"badgeTitle": "{0} - {1}",
-	"additionalViews": "추가 뷰",
-	"numberBadge": "{0}({1})",
-	"manageExtension": "확장 관리",
-	"titleKeybinding": "{0}({1})",
-	"hide": "숨기기",
-	"keep": "유지",
-	"toggle": "뷰 고정 전환"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/browser/parts/editor/binaryDiffEditor.i18n.json b/i18n/kor/src/vs/workbench/browser/parts/editor/binaryDiffEditor.i18n.json
deleted file mode 100644
index ea1317f6659..00000000000
--- a/i18n/kor/src/vs/workbench/browser/parts/editor/binaryDiffEditor.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"metadataDiff": "{0} ↔ {1}"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/browser/parts/editor/binaryEditor.i18n.json b/i18n/kor/src/vs/workbench/browser/parts/editor/binaryEditor.i18n.json
deleted file mode 100644
index 1908c0744f2..00000000000
--- a/i18n/kor/src/vs/workbench/browser/parts/editor/binaryEditor.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"binaryEditor": "이진 뷰어"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json b/i18n/kor/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json
deleted file mode 100644
index f0e2070a7f4..00000000000
--- a/i18n/kor/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"textEditor": "텍스트 편집기",
-	"textDiffEditor": "텍스트 Diff 편집기",
-	"binaryDiffEditor": "이진 Diff 편집기",
-	"sideBySideEditor": "병렬 편집기",
-	"groupOnePicker": "첫 번째 그룹에 편집기 표시",
-	"groupTwoPicker": "두 번째 그룹에 편집기 표시",
-	"groupThreePicker": "세 번째 그룹에 편집기 표시",
-	"allEditorsPicker": "열려 있는 모든 편집기 표시",
-	"view": "보기",
-	"file": "파일",
-	"close": "닫기",
-	"closeOthers": "기타 항목 닫기",
-	"closeRight": "오른쪽에 있는 항목 닫기",
-	"closeAllSaved": "저장된 항목 닫기",
-	"closeAll": "모두 닫기",
-	"keepOpen": "열린 상태 유지",
-	"toggleInlineView": "인라인 뷰 설정/해제",
-	"showOpenedEditors": "열려 있는 편집기 표시",
-	"keepEditor": "편집기 유지",
-	"closeEditorsInGroup": "그룹의 모든 편집기 닫기",
-	"closeSavedEditors": "그룹에서 저장된 편집기 닫기",
-	"closeOtherEditors": "다른 편집기 닫기",
-	"closeRightEditors": "오른쪽에 있는 편집기 닫기"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/browser/parts/editor/editorActions.i18n.json b/i18n/kor/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
deleted file mode 100644
index c3a38e203dc..00000000000
--- a/i18n/kor/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
+++ /dev/null
@@ -1,58 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"splitEditor": "편집기 분할",
-	"joinTwoGroups": "두 그룹의 편집기 조인",
-	"navigateEditorGroups": "편집기 그룹 간 탐색",
-	"focusActiveEditorGroup": "활성 편집기 그룹에 포커스",
-	"focusFirstEditorGroup": "첫 번째 편집기 그룹에 포커스",
-	"focusSecondEditorGroup": "두 번째 편집기 그룹에 포커스",
-	"focusThirdEditorGroup": "세 번째 편집기 그룹에 포커스",
-	"focusPreviousGroup": "이전 그룹에 포커스",
-	"focusNextGroup": "다음 그룹에 포커스",
-	"openToSide": "측면에서 열기",
-	"closeEditor": "편집기 닫기",
-	"closeOneEditor": "닫기",
-	"revertAndCloseActiveEditor": "편집기 되돌리기 및 닫기",
-	"closeEditorsToTheLeft": "왼쪽에 있는 편집기 닫기",
-	"closeAllEditors": "모든 편집기 닫기",
-	"closeEditorsInOtherGroups": "다른 그룹의 편집기 닫기",
-	"moveActiveGroupLeft": "편집기 그룹을 왼쪽으로 이동",
-	"moveActiveGroupRight": "편집기 그룹을 오른쪽으로 이동",
-	"minimizeOtherEditorGroups": "다른 편집기 그룹 최소화",
-	"evenEditorGroups": "균등한 편집기 그룹 너비",
-	"maximizeEditor": "편집기 그룹 최대화 및 사이드바 숨기기",
-	"openNextEditor": "다음 편집기 열기",
-	"openPreviousEditor": "이전 편집기 열기",
-	"nextEditorInGroup": "그룹에서 다음 편집기 열기",
-	"openPreviousEditorInGroup": "그룹에서 이전 편집기 열기",
-	"lastEditorInGroup": "그룹의 마지막 편집기 열기",
-	"navigateNext": "앞으로 이동",
-	"navigatePrevious": "뒤로 이동",
-	"navigateLast": "마지막으로 이동",
-	"reopenClosedEditor": "닫힌 편집기 다시 열기",
-	"clearRecentFiles": "최근 사용 항목 지우기",
-	"showEditorsInFirstGroup": "첫 번째 그룹에 편집기 표시",
-	"showEditorsInSecondGroup": "두 번째 그룹에 편집기 표시",
-	"showEditorsInThirdGroup": "세 번째 그룹에 편집기 표시",
-	"showAllEditors": "모든 편집기 표시",
-	"openPreviousRecentlyUsedEditorInGroup": "그룹에서 최근에 사용한 이전 편집기 열기",
-	"openNextRecentlyUsedEditorInGroup": "그룹에서 최근에 사용한 다음 편집기 열기",
-	"navigateEditorHistoryByInput": "기록에서 이전 편집기 열기",
-	"openNextRecentlyUsedEditor": "최근에 사용한 다음 편집기 열기",
-	"openPreviousRecentlyUsedEditor": "최근에 사용한 이전 편집기 열기",
-	"clearEditorHistory": "편집기 기록 지우기",
-	"focusLastEditorInStack": "그룹의 마지막 편집기 열기",
-	"moveEditorLeft": "왼쪽으로 편집기 이동",
-	"moveEditorRight": "오른쪽으로 편집기 이동",
-	"moveEditorToPreviousGroup": "편집기를 이전 그룹으로 이동",
-	"moveEditorToNextGroup": "편집기를 다음 그룹으로 이동",
-	"moveEditorToFirstGroup": "편집기를 첫 번째 그룹으로 이동",
-	"moveEditorToSecondGroup": "편집기를 두 번째 그룹으로 이동",
-	"moveEditorToThirdGroup": "편집기를 세 번째 그룹으로 이동"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json b/i18n/kor/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json
deleted file mode 100644
index 610a770a8a9..00000000000
--- a/i18n/kor/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"editorCommand.activeEditorMove.description": "활성 편집기를 탭 또는 그룹 단위로 이동",
-	"editorCommand.activeEditorMove.arg.name": "활성 편집기 이동 인수",
-	"editorCommand.activeEditorMove.arg.description": "인수 속성: * '를': 문자열 값을 제공 하 고 위치를 이동.\n\t* ' 의해': 문자열 이동에 대 한 단위를 제공 하는 값. 탭 또는 그룹.\n\t* ' value': 얼마나 많은 위치 또는 이동 하는 절대 위치를 제공 하는 숫자 값."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/browser/parts/editor/editorPart.i18n.json b/i18n/kor/src/vs/workbench/browser/parts/editor/editorPart.i18n.json
deleted file mode 100644
index f09fd78c96f..00000000000
--- a/i18n/kor/src/vs/workbench/browser/parts/editor/editorPart.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"groupOneVertical": "왼쪽",
-	"groupTwoVertical": "가운데",
-	"groupThreeVertical": "오른쪽",
-	"groupOneHorizontal": "위쪽",
-	"groupTwoHorizontal": "가운데",
-	"groupThreeHorizontal": "아래쪽",
-	"editorOpenError": "'{0}'을(를) 열 수 없습니다. {1}."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/browser/parts/editor/editorPicker.i18n.json b/i18n/kor/src/vs/workbench/browser/parts/editor/editorPicker.i18n.json
deleted file mode 100644
index 0885a8f5d6f..00000000000
--- a/i18n/kor/src/vs/workbench/browser/parts/editor/editorPicker.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"entryAriaLabel": "{0}, 편집기 그룹 선택기",
-	"groupLabel": "그룹: {0}",
-	"noResultsFoundInGroup": "그룹에서 일치하는 열려 있는 편집기를 찾을 수 없습니다.",
-	"noOpenedEditors": "열려 있는 편집기 목록이 현재 그룹에서 비어 있습니다.",
-	"noResultsFound": "일치하는 열려 있는 편집기를 찾을 수 없습니다.",
-	"noOpenedEditorsAllGroups": "열려 있는 편집기 목록이 현재 비어 있습니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json b/i18n/kor/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json
deleted file mode 100644
index 94a028963a4..00000000000
--- a/i18n/kor/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"singleSelectionRange": "줄 {0}, 열 {1}({2} 선택됨)",
-	"singleSelection": "줄 {0}, 열 {1}",
-	"multiSelectionRange": "{0} 선택 항목({1}자 선택됨)",
-	"multiSelection": "{0} 선택 항목",
-	"endOfLineLineFeed": "LF",
-	"endOfLineCarriageReturnLineFeed": "CRLF",
-	"tabFocusModeEnabled": "Tab으로 포커스 이동",
-	"screenReaderDetected": "화면 읽기 프로그램이 최적화됨",
-	"screenReaderDetectedExtra": "화면 읽기 프로그램을 사용하지 않는 경우 `editor.accessibilitySupport` 설정을 \"off\"로 변경하세요.",
-	"disableTabMode": "접근성 모드 사용 안 함",
-	"gotoLine": "줄 이동",
-	"selectIndentation": "들여쓰기 선택",
-	"selectEncoding": "인코딩 선택",
-	"selectEOL": "줄 시퀀스의 끝 선택",
-	"selectLanguageMode": "언어 모드 선택",
-	"fileInfo": "파일 정보",
-	"spacesSize": "공백: {0}",
-	"tabSize": "Tab 크기: {0}",
-	"showLanguageExtensions": "'{0}'의 마켓플레이스 확장 검색...",
-	"changeMode": "언어 모드 변경",
-	"noEditor": "현재 활성 텍스트 편집기 없음",
-	"languageDescription": "({0}) - 구성된 언어",
-	"languageDescriptionConfigured": "({0})",
-	"languagesPicks": "언어(식별자)",
-	"configureModeSettings": "'{0}' 언어 기반 설정 구성...",
-	"configureAssociationsExt": "'{0}'에 대한 파일 연결 구성...",
-	"autoDetect": "자동 감지",
-	"pickLanguage": "언어 모드 선택",
-	"currentAssociation": "현재 연결",
-	"pickLanguageToConfigure": "'{0}'과(와) 연결할 언어 모드 선택",
-	"changeIndentation": "ID 변경",
-	"noWritableCodeEditor": "활성 코드 편집기는 읽기 전용입니다.",
-	"indentView": "보기 변경",
-	"indentConvert": "파일 변환",
-	"pickAction": "작업 선택",
-	"changeEndOfLine": "줄 시퀀스의 끝 변경",
-	"pickEndOfLine": "줄 시퀀스의 끝 선택",
-	"changeEncoding": "파일 인코딩 변경",
-	"noFileEditor": "현재 활성 파일 없음",
-	"saveWithEncoding": "인코딩하여 저장",
-	"reopenWithEncoding": "인코딩하여 다시 열기",
-	"guessedEncoding": "콘텐츠에서 추측함",
-	"pickEncodingForReopen": "파일을 다시 열 파일 인코딩 선택",
-	"pickEncodingForSave": "파일을 저장할 파일 인코딩 선택",
-	"screenReaderDetectedExplanation.title": "화면 읽기 프로그램이 최적화됨",
-	"screenReaderDetectedExplanation.question": "VS Code를 작동하기 위해 화면 읽기 프로그램을 사용하십니까?",
-	"screenReaderDetectedExplanation.answerYes": "예",
-	"screenReaderDetectedExplanation.answerNo": "아니요",
-	"screenReaderDetectedExplanation.body1": "VS Code가 이제 화면 읽기 프로그램과 사용하는 데 최적화되었습니다.",
-	"screenReaderDetectedExplanation.body2": "줄바꿈, 접기 등의 일부 편집기 기능은 동작이 다릅니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/browser/parts/editor/resourceViewer.i18n.json b/i18n/kor/src/vs/workbench/browser/parts/editor/resourceViewer.i18n.json
deleted file mode 100644
index d01bfad8cc7..00000000000
--- a/i18n/kor/src/vs/workbench/browser/parts/editor/resourceViewer.i18n.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"sizeB": "{0}B",
-	"sizeKB": "{0}KB",
-	"sizeMB": "{0}MB",
-	"sizeGB": "{0}GB",
-	"sizeTB": "{0}TB",
-	"largeImageError": "이미지가 너무 커서 편집기에 표시할 수 없습니다({0}). ",
-	"resourceOpenExternalButton": " 외부 프로그램으로 이미지를 열까요?",
-	"nativeFileTooLargeError": "파일이 너무 커서 편집기에서 표시되지 않습니다({0}).",
-	"nativeBinaryError": "파일이 이진이거나 지원되지 않는 텍스트 인코딩을 사용하기 때문에 편집기에서 표시되지 않습니다.",
-	"openAsText": "그래도 여시겠습니까?",
-	"zoom.action.fit.label": "전체 이미지",
-	"imgMeta": "{0}x{1} {2}"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/browser/parts/editor/tabsTitleControl.i18n.json b/i18n/kor/src/vs/workbench/browser/parts/editor/tabsTitleControl.i18n.json
deleted file mode 100644
index b99c2e75196..00000000000
--- a/i18n/kor/src/vs/workbench/browser/parts/editor/tabsTitleControl.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"araLabelTabActions": "탭 작업"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json b/i18n/kor/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json
deleted file mode 100644
index b2d63ee836a..00000000000
--- a/i18n/kor/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"textDiffEditor": "텍스트 Diff 편집기",
-	"readonlyEditorWithInputAriaLabel": "{0}. 읽기 전용 텍스트 비교 편집기입니다.",
-	"readonlyEditorAriaLabel": "읽기 전용 텍스트 비교 편집기입니다.",
-	"editableEditorWithInputAriaLabel": "{0}. 텍스트 파일 비교 편집기입니다.",
-	"editableEditorAriaLabel": "텍스트 파일 비교 편집기입니다.",
-	"navigate.next.label": "다음 변경 내용",
-	"navigate.prev.label": "이전 변경 내용",
-	"toggleIgnoreTrimWhitespace.label": "자르기 공백 무시"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/browser/parts/editor/textEditor.i18n.json b/i18n/kor/src/vs/workbench/browser/parts/editor/textEditor.i18n.json
deleted file mode 100644
index 5b30b50a0d6..00000000000
--- a/i18n/kor/src/vs/workbench/browser/parts/editor/textEditor.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"editorLabelWithGroup": "{0}, 그룹 {1}."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/browser/parts/editor/textResourceEditor.i18n.json b/i18n/kor/src/vs/workbench/browser/parts/editor/textResourceEditor.i18n.json
deleted file mode 100644
index 6e7048d47b4..00000000000
--- a/i18n/kor/src/vs/workbench/browser/parts/editor/textResourceEditor.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"textEditor": "텍스트 편집기",
-	"readonlyEditorWithInputAriaLabel": "{0}. 읽기 전용 텍스트 편집기입니다.",
-	"readonlyEditorAriaLabel": "읽기 전용 텍스트 편집기입니다.",
-	"untitledFileEditorWithInputAriaLabel": "{0}. 제목 없는 파일 텍스트 편집기입니다.",
-	"untitledFileEditorAriaLabel": "제목 없는 파일 텍스트 편집기입니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/browser/parts/editor/titleControl.i18n.json b/i18n/kor/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
deleted file mode 100644
index 2acca1606b7..00000000000
--- a/i18n/kor/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"araLabelEditorActions": "편집기 작업"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/browser/parts/notifications/notificationsActions.i18n.json b/i18n/kor/src/vs/workbench/browser/parts/notifications/notificationsActions.i18n.json
deleted file mode 100644
index 3df7bbf7430..00000000000
--- a/i18n/kor/src/vs/workbench/browser/parts/notifications/notificationsActions.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"clearNotification": "알림 지우기",
-	"clearNotifications": "모든 알림 지우기",
-	"hideNotificationsCenter": "알림 숨기기",
-	"expandNotification": "알림 확장",
-	"collapseNotification": "알림 축소",
-	"configureNotification": "알림 구성",
-	"copyNotification": "텍스트 복사"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/browser/parts/notifications/notificationsAlerts.i18n.json b/i18n/kor/src/vs/workbench/browser/parts/notifications/notificationsAlerts.i18n.json
deleted file mode 100644
index 372a72b2a70..00000000000
--- a/i18n/kor/src/vs/workbench/browser/parts/notifications/notificationsAlerts.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"alertErrorMessage": "오류: {0}",
-	"alertWarningMessage": "경고: {0}",
-	"alertInfoMessage": "정보: {0}"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json b/i18n/kor/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json
deleted file mode 100644
index 68b015e8455..00000000000
--- a/i18n/kor/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"notificationsEmpty": "새 알림 없음",
-	"notifications": "알림",
-	"notificationsToolbar": "알림 센터 작업",
-	"notificationsList": "알림 목록"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/browser/parts/notifications/notificationsCommands.i18n.json b/i18n/kor/src/vs/workbench/browser/parts/notifications/notificationsCommands.i18n.json
deleted file mode 100644
index e8144e0f388..00000000000
--- a/i18n/kor/src/vs/workbench/browser/parts/notifications/notificationsCommands.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"notifications": "알림",
-	"showNotifications": "알림 표시",
-	"hideNotifications": "알림 숨기기",
-	"clearAllNotifications": "모든 알림 지우기"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/browser/parts/notifications/notificationsStatus.i18n.json b/i18n/kor/src/vs/workbench/browser/parts/notifications/notificationsStatus.i18n.json
deleted file mode 100644
index ec0efad9701..00000000000
--- a/i18n/kor/src/vs/workbench/browser/parts/notifications/notificationsStatus.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hideNotifications": "알림 숨기기",
-	"zeroNotifications": "알림 없음",
-	"noNotifications": "새 알림 없음",
-	"oneNotification": "1개의 새 알림",
-	"notifications": "{0}개의 새 알림"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/browser/parts/notifications/notificationsToasts.i18n.json b/i18n/kor/src/vs/workbench/browser/parts/notifications/notificationsToasts.i18n.json
deleted file mode 100644
index 80263072f0e..00000000000
--- a/i18n/kor/src/vs/workbench/browser/parts/notifications/notificationsToasts.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"notificationsToast": "알림"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/browser/parts/notifications/notificationsViewer.i18n.json b/i18n/kor/src/vs/workbench/browser/parts/notifications/notificationsViewer.i18n.json
deleted file mode 100644
index 3bd2a8dc894..00000000000
--- a/i18n/kor/src/vs/workbench/browser/parts/notifications/notificationsViewer.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"notificationActions": "알림 작업",
-	"notificationSource": "소스: {0}"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/browser/parts/panel/panelActions.i18n.json b/i18n/kor/src/vs/workbench/browser/parts/panel/panelActions.i18n.json
deleted file mode 100644
index 9d55e76b222..00000000000
--- a/i18n/kor/src/vs/workbench/browser/parts/panel/panelActions.i18n.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"closePanel": "패널 닫기",
-	"togglePanel": "패널 설정/해제",
-	"focusPanel": "패널로 포커스 이동",
-	"toggledPanelPosition": "패널 위치 설정/해제",
-	"moveToRight": "오른쪽으로 이동",
-	"moveToBottom": "아래로 이동",
-	"toggleMaximizedPanel": "최대화된 패널 설정/해제",
-	"maximizePanel": "패널 크기 최대화",
-	"minimizePanel": "패널 크기 복원",
-	"view": "보기"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/browser/parts/panel/panelPart.i18n.json b/i18n/kor/src/vs/workbench/browser/parts/panel/panelPart.i18n.json
deleted file mode 100644
index 7a9e5518344..00000000000
--- a/i18n/kor/src/vs/workbench/browser/parts/panel/panelPart.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hidePanel": "패널 숨기기"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/browser/parts/quickinput/quickInput.i18n.json b/i18n/kor/src/vs/workbench/browser/parts/quickinput/quickInput.i18n.json
deleted file mode 100644
index bcd2d0d1454..00000000000
--- a/i18n/kor/src/vs/workbench/browser/parts/quickinput/quickInput.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"inputModeEntryDescription": "{0}(확인하려면 'Enter' 키를 누르고, 취소하려면 'Escape' 키를 누름)",
-	"inputModeEntry": "입력을 확인하려면 'Enter' 키를 누르고, 취소하려면 'Esc' 키를 누르세요.",
-	"quickInput.countSelected": "{0} 선택됨",
-	"ok": "확인"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/browser/parts/quickinput/quickInputBox.i18n.json b/i18n/kor/src/vs/workbench/browser/parts/quickinput/quickInputBox.i18n.json
deleted file mode 100644
index 4e4c6e6f123..00000000000
--- a/i18n/kor/src/vs/workbench/browser/parts/quickinput/quickInputBox.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"quickInputBox.ariaLabel": "결과의 범위를 축소하려면 입력하세요."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/browser/parts/quickopen/quickOpenController.i18n.json b/i18n/kor/src/vs/workbench/browser/parts/quickopen/quickOpenController.i18n.json
deleted file mode 100644
index 1a6c382d1b2..00000000000
--- a/i18n/kor/src/vs/workbench/browser/parts/quickopen/quickOpenController.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"emptyPicks": "선택할 항목이 없습니다.",
-	"quickOpenInput": "'?'를 입력하면 여기에서 수행할 수 있는 작업에 대한 도움말을 확인할 수 있습니다.",
-	"historyMatches": "최근에 사용한 항목",
-	"noResultsFound1": "결과 없음",
-	"canNotRunPlaceholder": "이 Quick Open 처리기는 현재 컨텍스트에서 사용할 수 없습니다.",
-	"entryAriaLabel": "{0}, 최근에 사용한 항목",
-	"removeFromEditorHistory": "기록에서 제거",
-	"pickHistory": "기록에서 제거할 편집기 항목 선택"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/browser/parts/quickopen/quickopen.contribution.i18n.json b/i18n/kor/src/vs/workbench/browser/parts/quickopen/quickopen.contribution.i18n.json
deleted file mode 100644
index 8b1fffebc06..00000000000
--- a/i18n/kor/src/vs/workbench/browser/parts/quickopen/quickopen.contribution.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"quickOpen": "파일로 이동...",
-	"quickNavigateNext": "Quick Open에서 다음 탐색",
-	"quickNavigatePrevious": "Quick Open에서 이전 탐색",
-	"quickSelectNext": "Quick Open에서 다음 선택",
-	"quickSelectPrevious": "Quick Open에서 이전 선택"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/browser/parts/quickopen/quickopen.i18n.json b/i18n/kor/src/vs/workbench/browser/parts/quickopen/quickopen.i18n.json
deleted file mode 100644
index 1bfcf491843..00000000000
--- a/i18n/kor/src/vs/workbench/browser/parts/quickopen/quickopen.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"quickOpen": "파일로 이동...",
-	"quickNavigateNext": "Quick Open에서 다음 탐색",
-	"quickNavigatePrevious": "Quick Open에서 이전 탐색",
-	"quickSelectNext": "Quick Open에서 다음 선택",
-	"quickSelectPrevious": "Quick Open에서 이전 선택"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/browser/parts/sidebar/sidebarPart.i18n.json b/i18n/kor/src/vs/workbench/browser/parts/sidebar/sidebarPart.i18n.json
deleted file mode 100644
index 93f9a5f3a8b..00000000000
--- a/i18n/kor/src/vs/workbench/browser/parts/sidebar/sidebarPart.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"focusSideBar": "사이드바에 포커스",
-	"viewCategory": "보기"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/browser/parts/statusbar/statusbarPart.i18n.json b/i18n/kor/src/vs/workbench/browser/parts/statusbar/statusbarPart.i18n.json
deleted file mode 100644
index 1578b3dace5..00000000000
--- a/i18n/kor/src/vs/workbench/browser/parts/statusbar/statusbarPart.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"manageExtension": "확장 관리"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/browser/parts/titlebar/titlebarPart.i18n.json b/i18n/kor/src/vs/workbench/browser/parts/titlebar/titlebarPart.i18n.json
deleted file mode 100644
index a5553bc1a00..00000000000
--- a/i18n/kor/src/vs/workbench/browser/parts/titlebar/titlebarPart.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"patchedWindowTitle": "[지원되지 않음]",
-	"userIsAdmin": "[관리자]",
-	"userIsSudo": "[슈퍼유저]",
-	"devExtensionWindowTitlePrefix": "[확장 개발 호스트]"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/browser/parts/views/panelViewlet.i18n.json b/i18n/kor/src/vs/workbench/browser/parts/views/panelViewlet.i18n.json
deleted file mode 100644
index ebeb1e2aeca..00000000000
--- a/i18n/kor/src/vs/workbench/browser/parts/views/panelViewlet.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"viewToolbarAriaLabel": "{0} 동작"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/browser/parts/views/views.i18n.json b/i18n/kor/src/vs/workbench/browser/parts/views/views.i18n.json
deleted file mode 100644
index 126ed4fd56c..00000000000
--- a/i18n/kor/src/vs/workbench/browser/parts/views/views.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"viewToolbarAriaLabel": "{0} 동작",
-	"hideView": "사이드바에서 숨기기"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/browser/parts/views/viewsRegistry.i18n.json b/i18n/kor/src/vs/workbench/browser/parts/views/viewsRegistry.i18n.json
deleted file mode 100644
index 6a3532ad44d..00000000000
--- a/i18n/kor/src/vs/workbench/browser/parts/views/viewsRegistry.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"duplicateId": "ID `{0}`이(가) 포함된 뷰가 위치 `{1}`에 이미 등록되어 있습니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/browser/parts/views/viewsViewlet.i18n.json b/i18n/kor/src/vs/workbench/browser/parts/views/viewsViewlet.i18n.json
deleted file mode 100644
index 8934fc203c0..00000000000
--- a/i18n/kor/src/vs/workbench/browser/parts/views/viewsViewlet.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"cannot toggle": "이 {0} 뷰에서 표시 여부를 전환할 수 없습니다.",
-	"cannot show": "이 {0} 뷰는 'when' 조건으로 숨겨져 있으므로 표시할 수 없습니다.",
-	"hideView": "숨기기"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/browser/quickopen.i18n.json b/i18n/kor/src/vs/workbench/browser/quickopen.i18n.json
deleted file mode 100644
index e1af75d07a4..00000000000
--- a/i18n/kor/src/vs/workbench/browser/quickopen.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noResultsMatching": "일치하는 결과 없음",
-	"noResultsFound2": "결과 없음"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/browser/viewlet.i18n.json b/i18n/kor/src/vs/workbench/browser/viewlet.i18n.json
deleted file mode 100644
index 4892b2fd17b..00000000000
--- a/i18n/kor/src/vs/workbench/browser/viewlet.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"compositePart.hideSideBarLabel": "사이드 막대 숨기기",
-	"collapse": "모두 축소"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/common/theme.i18n.json b/i18n/kor/src/vs/workbench/common/theme.i18n.json
deleted file mode 100644
index 634f6ea85a7..00000000000
--- a/i18n/kor/src/vs/workbench/common/theme.i18n.json
+++ /dev/null
@@ -1,72 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"tabActiveBackground": "활성 탭 배경색입니다. 탭은 편집기 영역에서 편집기의 컨테이너입니다. 한 편집기 그룹에서 여러 탭을 열 수 있습니다. 여러 편집기 그룹이 있을 수 있습니다.",
-	"tabInactiveBackground": "비활성 탭 배경색입니다. 탭은 편집기 영역에서 편집기의 컨테이너입니다. 한 편집기 그룹에서 여러 탭을 열 수 있습니다. 여러 편집기 그룹이 있을 수 있습니다.",
-	"tabHoverBackground": "마우스 커서를 올려놓았을 때의 탭 배경색. 탭은 편집 영역에서 편집기를 감싸고 있습니다. 한 편집기 그룹에서 여러 탭을 열 수 있습니다. 편집기 그룹이 여러 개일 수 있습니다.",
-	"tabUnfocusedHoverBackground": "마우스 커서를 올려놓았을 때 포커스를 받지 못한 탭 배경색. 탭은 편집 영역에서 편집기를 감싸고 있습니다. 한 편집기 그룹에서 여러 탭을 열 수 있습니다. 편집기 그룹이 여러 개일 수 있습니다.",
-	"tabBorder": "탭을 서로 구분하기 위한 테두리입니다. 탭은 편집기 영역에서 편집기의 컨테이너입니다. 한 편집기 그룹에 여러 탭을 열 수 있습니다. 여러 편집기 그룹이 있을 수 있습니다.",
-	"tabActiveBorder": "활성 탭 맨 아래의 테두리입니다. 탭은 편집기 영역에서 편집기의 컨테이너입니다. 한 편집기 그룹에 여러 탭을 열 수 있습니다. 여러 편집기 그룹이 있을 수 있습니다.",
-	"tabActiveBorderTop": "활성 탭 맨 위의 위한 테두리입니다. 탭은 편집기 영역에서 편집기의 컨테이너입니다. 한 편집기 그룹에 여러 탭을 열 수 있습니다. 여러 편집기 그룹이 있을 수 있습니다.",
-	"tabActiveUnfocusedBorder": "포커스가 없는 그룹에서 활성 탭 맨 아래의 테두리입니다. 탭은 편집기 영역에서 편집기의 컨테이너입니다. 한 편집기 그룹에 여러 탭을 열 수 있습니다. 여러 편집기 그룹이 있을 수 있습니다.",
-	"tabActiveUnfocusedBorderTop": "포커스가 없는 그룹에서 활성 탭 맨 위의 테두리입니다. 탭은 편집기 영역에서 편집기의 컨테이너입니다. 한 편집기 그룹에 여러 탭을 열 수 있습니다. 여러 편집기 그룹이 있을 수 있습니다.",
-	"tabHoverBorder": "마우스 커서를 올려놓았을 때 활성 탭의 테두리. 탭은 편집 영역에서 편집기를 감싸고 있습니다. 한 편집기 그룹에서 여러 탭을 열 수 있습니다. 편집기 그룹이 여러 개일 수 있습니다.",
-	"tabUnfocusedHoverBorder": "마우스 커서를 올려놓았을 때 포커스를 받지 못한 그룹에서 활성 탭 테두리. 탭은 편집 영역에서 편집기를 감싸고 있습니다. 한 편집기 그룹에서 여러 탭을 열 수 있습니다. 편집기 그룹이 여러 개일 수 있습니다.",
-	"tabActiveForeground": "활성 그룹의 활성 탭 전경색입니다. 탭은 편집기 영역에서 편집기의 컨테이너입니다. 한 편집기 그룹에서 여러 탭을 열 수 있습니다. 여러 편집기 그룹이 있을 수 있습니다.",
-	"tabInactiveForeground": "활성 그룹의 비활성 탭 전경색입니다. 탭은 편집기 영역에서 편집기의 컨테이너입니다. 한 편집기 그룹에서 여러 탭을 열 수 있습니다. 여러 편집기 그룹이 있을 수 있습니다.",
-	"tabUnfocusedActiveForeground": "포커스가 없는 그룹의 활성 탭 전경색입니다. 탭은 편집기 영역에서 편집기의 컨테이너입니다. 한 편집기 그룹에서 여러 탭을 열 수 있습니다. 여러 편집기 그룹이 있을 수 있습니다.",
-	"tabUnfocusedInactiveForeground": "포커스가 없는 그룹의 비활성 탭 전경색입니다. 탭은 편집기 영역에서 편집기의 컨테이너입니다. 한 편집기 그룹에서 여러 탭을 열 수 있습니다. 여러 편집기 그룹이 있을 수 있습니다.",
-	"editorGroupBackground": "편집기 그룹의 배경색입니다. 편집기 그룹은 편집기의 컨테이너입니다. 배경색은 편집기 그룹을 끌 때 표시됩니다.",
-	"tabsContainerBackground": "탭을 사용도록 설정한 경우 편집기 그룹 제목 머리글의 배경색입니다. 편집기 그룹은 편집기의 컨테이너입니다.",
-	"tabsContainerBorder": "탭을 사용하도록 설정한 경우 편집기 그룹 제목 머리글의 테두리 색입니다. 편집기 그룹은 편집기의 컨테이너입니다.",
-	"editorGroupHeaderBackground": "탭을 사용하지 않도록 설정한 경우(`\"workbench.editor.showTabs\": false`) 편집기 그룹 제목 머리글의 배경색입니다. 편집기 그룹은 편집기의 컨테이너입니다.",
-	"editorGroupBorder": "여러 편집기 그룹을 서로 구분하기 위한 색입니다. 편집기 그룹은 편집기의 컨테이너입니다.",
-	"editorDragAndDropBackground": "편집기를 끌 때 배경색입니다. 편집기 내용이 계속 비추어 보이도록 이 색은 투명해야 합니다.",
-	"panelBackground": "패널 배경색입니다. 패널은 편집기 영역 아래에 표시되며 출력 및 통합 터미널 같은 보기가 포함됩니다.",
-	"panelBorder": "편집기 패널과 구분하기 위한 패널 테두리 색입니다. 패널은 편집기 영역 아래에 표시되며 출력 및 통합 터미널 같은 보기가 포함됩니다.",
-	"panelActiveTitleForeground": "활성 패널의 제목 색입니다. 패널은 편집기 영역 아래에 표시되며 출력 및 통합 터미널 같은 보기가 포함됩니다.",
-	"panelInactiveTitleForeground": "비활성 패널의 제목 색입니다. 패널은 편집기 영역 아래에 표시되며 출력 및 통합 터미널 같은 보기가 포함됩니다.",
-	"panelActiveTitleBorder": "활성 패널 제목의 테두리 색입니다. 패널은 편집기 영역 아래에 표시되며 출력 및 통합 터미널 같은 보기가 포함됩니다.",
-	"panelDragAndDropBackground": "패널 제목 항목의 끌어서 놓기 피드백 색입니다. 이 색은 패널 항목이 게속 비추어 보이도록 투명해야 합니다. 패널은 편집기 영역 아래에 표시되며 출력 및 통합 터미널 같은 보기가 포함됩니다.",
-	"statusBarForeground": "작업 영역이 열려 있을 때의 상태 표시줄 전경색입니다. 상태 표시줄은 창의 맨 아래에 표시됩니다.",
-	"statusBarNoFolderForeground": "폴더가 열리지 않았을 때의 상태 표시줄 전경색입니다. 상태 표시줄은 창의 맨 아래에 표시됩니다.",
-	"statusBarBackground": "작업 영역이 열려 있을 때의 상태 표시줄 배경색입니다. 상태 표시줄은 창의 맨 아래에 표시됩니다.",
-	"statusBarNoFolderBackground": "폴더가 열리지 않았을 때의 상태 표시줄 배경색입니다. 상태 표시줄은 창의 맨 아래에 표시됩니다.",
-	"statusBarBorder": "사이드바 및 편집기와 구분하는 상태 표시줄 테두리 색입니다. 상태 표시줄은 창의 맨 아래에 표시됩니다.",
-	"statusBarNoFolderBorder": "열린 폴더가 없을 때 사이드바 및 편집기와 구분하는 상태 표시줄 테두리 색입니다. 상태 표시줄은 창의 맨 아래에 표시됩니다.",
-	"statusBarItemActiveBackground": "클릭할 때의 상태 표시줄 항목 배경색입니다. 상태 표시줄은 창의 맨 아래에 표시됩니다.",
-	"statusBarItemHoverBackground": "마우스로 가리킬 때의 상태 표시줄 항목 배경색입니다. 상태 표시줄은 창의 맨 아래에 표시됩니다.",
-	"statusBarProminentItemBackground": " 상태 표시줄 주요 항목 배경 색. 주요 항목은 중요성을 알려주기 위해 다른 상태 표시줄 항목보다 눈에 띕니다. 예제를 보기 위해 명령 팔레트에서 '포커스 이동을 위해 탭 키 토글' 모드를 변경합니다. 창 아래쪽에 상태 표시줄이 나타납니다.",
-	"statusBarProminentItemHoverBackground": "마우스 커서를 올렸을 때 상태 표시줄 주요 항목 배경 색. 주요 항목은 중요성을 알려주기 위해 다른 상태 표시줄 항목보다 눈에 띕니다. 예제를 보기 위해 명령 팔레트에서 '포커스 이동을 위해 탭 키 토글' 모드를 변경합니다. 창 아래쪽에 상태 표시줄이 나타납니다.",
-	"activityBarBackground": "작업 막대 배경색입니다. 작업 막대는 맨 왼쪽이나 오른쪽에 표시되며 사이드바의 뷰 간을 전환하는 데 사용할 수 있습니다.",
-	"activityBarForeground": "작업 막대 전경 색(예: 아이콘에 사용됨)입니다. 작업 막대는 오른쪽이나 왼쪽 끝에 표시되며 사이드바의 보기 간을 전환할 수 있습니다.",
-	"activityBarBorder": "사이드바와 구분하는 작업 막대 테두리색입니다. 작업 막대는 오른쪽이나 왼쪽 끝에 표시되며 사이드바의 보기 간을 전환할 수 있습니다.",
-	"activityBarDragAndDropBackground": "작업 막대 항목의 끌어서 놓기 피드백 색입니다. 작업 막대 항목이 계속 비추어 보이도록 이 색은 투명해야 합니다. 작업 막대는 왼쪽이나 오른쪽 끝에 표시되며 사이드바의 보기를 전환할 수 있습니다.",
-	"activityBarBadgeBackground": "활동 알림 배지 배경색입니다. 작업 막대는 왼쪽이나 오른쪽 끝에 표시되며 사이드바의 보기를 전환할 수 있습니다.",
-	"activityBarBadgeForeground": "활동 알림 배지 전경색입니다. 작업 막대는 왼쪽이나 오른쪽 끝에 표시되며 사이드바의 보기를 전환할 수 있습니다.",
-	"sideBarBackground": "사이드바 배경색입니다. 사이드바는 탐색기 및 검색과 같은 뷰의 컨테이너입니다.",
-	"sideBarForeground": "사이드바 전경색입니다. 사이드바는 탐색기 및 검색과 같은 뷰의 컨테이너입니다.",
-	"sideBarBorder": "편집기와 구분하는 측면의 사이드바 테두리 색입니다. 사이드바는 탐색기 및 검색과 같은 뷰의 컨테이너입니다.",
-	"sideBarTitleForeground": "사이드바 제목 전경색입니다. 사이드바는 탐색기 및 검색과 같은 뷰의 컨테이너입니다.",
-	"sideBarDragAndDropBackground": "사이드 막대 섹션의 끌어서 놓기 피드백 색입니다. 사이드 막대 섹션이 계속 비추어 보이도록 이 색은 투명해야 합니다. 사이드 막대는 왼쪽이나 오른쪽 끝에 표시되며 사이드바의 보기를 전환할 수 있습니다.",
-	"sideBarSectionHeaderBackground": "사이드바 섹션 헤더 배경색입니다. 사이드바는 탐색기 및 검색과 같은 뷰의 컨테이너입니다.",
-	"sideBarSectionHeaderForeground": "사이드바 섹션 헤더 전경색입니다. 사이드바는 탐색기 및 검색과 같은 뷰의 컨테이너입니다.",
-	"titleBarActiveForeground": "창이 활성화된 경우의 제목 표시줄 전경입니다. 이 색은 현재 macOS에서만 지원됩니다.",
-	"titleBarInactiveForeground": "창이 비활성화된 경우의 제목 표시줄 전경입니다. 이 색은 현재 macOS에서만 지원됩니다.",
-	"titleBarActiveBackground": "창을 활성화할 때의 제목 표시줄 전경입니다. 이 색은 현재 macOS에서만 지원됩니다.",
-	"titleBarInactiveBackground": "창이 비활성화된 경우의 제목 표시줄 배경입니다. 이 색은 현재 macOS에서만 지원됩니다.",
-	"titleBarBorder": "제목 막대 테두리 색입니다. 현재 이 색상은 macOS에서만 지원됩니다.",
-	"notificationCenterBorder": "알림 센터 테두리 색입니다. 알림은 창 오른쪽 맨 아래에 표시됩니다.",
-	"notificationToastBorder": "알림 테두리 색입니다. 알림은 창 오른쪽 맨 아래에 표시됩니다.",
-	"notificationsForeground": "알림 전경색입니다. 알림은 창 오른쪽 맨 아래에 표시됩니다.",
-	"notificationsBackground": "알림 센터 배경색입니다. 알림은 창 오른쪽 맨 아래에 표시됩니다.",
-	"notificationsLink": "알림 링크 전경색입니다. 알림은 창 오른쪽 맨 아래에 표시됩니다.",
-	"notificationCenterHeaderForeground": "알림 센터 머리글 전경색입니다. 알림은 창 오른쪽 맨 아래에 표시됩니다.",
-	"notificationCenterHeaderBackground": "알림 센터 머리글 배경색입니다. 알림은 창 오른쪽 맨 아래에 표시됩니다.",
-	"notificationsBorder": "알림 센터에서 다른 알림과 구분하는 알림 테두리 색입니다. 알림은 창 오른쪽 맨 아래에 표시됩니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/common/views.i18n.json b/i18n/kor/src/vs/workbench/common/views.i18n.json
deleted file mode 100644
index dd937818bf9..00000000000
--- a/i18n/kor/src/vs/workbench/common/views.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"duplicateId": "ID `{0}`인 뷰가 위치 `{1}`에 이미 등록되어 있습니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/electron-browser/actions.i18n.json b/i18n/kor/src/vs/workbench/electron-browser/actions.i18n.json
deleted file mode 100644
index e913e127345..00000000000
--- a/i18n/kor/src/vs/workbench/electron-browser/actions.i18n.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"closeWindow": "창 닫기",
-	"closeWorkspace": "작업 영역 닫기",
-	"noWorkspaceOpened": "현재 이 인스턴스에 열려 있는 작업 영역이 없습니다.",
-	"newWindow": "새 창",
-	"toggleFullScreen": "전체 화면 설정/해제",
-	"toggleMenuBar": "메뉴 모음 설정/해제",
-	"toggleDevTools": "개발자 도구 설정/해제",
-	"zoomIn": "확대",
-	"zoomOut": "축소",
-	"zoomReset": "확대/축소 다시 설정",
-	"appPerf": "시작 성능",
-	"reloadWindow": "창 다시 로드",
-	"reloadWindowWithExntesionsDisabled": "확장을 사용하지 않도록 설정하고 창 다시 로드",
-	"switchWindowPlaceHolder": "전환할 창 선택",
-	"current": "현재 창",
-	"close": "창 닫기",
-	"switchWindow": "창 전환",
-	"quickSwitchWindow": "빠른 창 전환",
-	"workspaces": "작업 영역",
-	"files": "파일",
-	"openRecentPlaceHolderMac": "선택하여 열기(새 창에서 열려면 Cmd 키를 길게 누름)",
-	"openRecentPlaceHolder": "선택하여 열기(새 창에서 열려면 Ctrl 키를 길게 누름)",
-	"remove": "최근에 사용한 항목에서 제거",
-	"openRecent": "최근 항목 열기...",
-	"quickOpenRecent": "빠른 최근 항목 열기...",
-	"reportIssueInEnglish": "문제 보고",
-	"openProcessExplorer": "프로세스 탐색기 열기",
-	"reportPerformanceIssue": "성능 문제 보고",
-	"keybindingsReference": "바로 가기 키 참조",
-	"openDocumentationUrl": "설명서",
-	"openIntroductoryVideosUrl": "소개 비디오",
-	"openTipsAndTricksUrl": "팁과 요령",
-	"toggleSharedProcess": "공유 프로세스 설정/해제",
-	"navigateLeft": "뷰 왼쪽으로 이동",
-	"navigateRight": "뷰 오른쪽으로 이동",
-	"navigateUp": "뷰 위로 이동",
-	"navigateDown": "뷰 아래로 이동",
-	"increaseViewSize": "현재 뷰 크기 늘리기",
-	"decreaseViewSize": "현재 뷰 크기 줄이기",
-	"showPreviousTab": "이전 창 탭 표시",
-	"showNextWindowTab": "다음 창 탭 표시",
-	"moveWindowTabToNewWindow": "창 탭을 새 창으로 이동",
-	"mergeAllWindowTabs": "모든 창 병합",
-	"toggleWindowTabsBar": "창 탭 모음 설정/해제",
-	"about": "{0} 정보",
-	"inspect context keys": "컨텍스트 키 검사"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/electron-browser/commands.i18n.json b/i18n/kor/src/vs/workbench/electron-browser/commands.i18n.json
deleted file mode 100644
index 983899514ca..00000000000
--- a/i18n/kor/src/vs/workbench/electron-browser/commands.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"diffLeftRightLabel": "{0} ⟷ {1}"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/electron-browser/configureLocale.i18n.json b/i18n/kor/src/vs/workbench/electron-browser/configureLocale.i18n.json
deleted file mode 100644
index 3c255978d33..00000000000
--- a/i18n/kor/src/vs/workbench/electron-browser/configureLocale.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"configureLocale": "언어 구성",
-	"displayLanguage": "VSCode의 표시 언어를 정의합니다.",
-	"doc": "지원되는 언어 목록은 {0} 을(를) 참조하세요.",
-	"restart": "값을 변경하려면 VSCode를 다시 시작해야 합니다.",
-	"fail.createSettings": "{0}'({1})을(를) 만들 수 없습니다.",
-	"JsonSchema.locale": "사용할 UI 언어입니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/electron-browser/crashReporter.i18n.json b/i18n/kor/src/vs/workbench/electron-browser/crashReporter.i18n.json
deleted file mode 100644
index cff423b1f3b..00000000000
--- a/i18n/kor/src/vs/workbench/electron-browser/crashReporter.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"telemetryConfigurationTitle": "원격 분석",
-	"telemetry.enableCrashReporting": "충돌 보고서를 Microsoft에 전송할 수 있도록 설정합니다.\n이 옵션을 적용하려면 다시 시작해야 합니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/electron-browser/extensionHost.i18n.json b/i18n/kor/src/vs/workbench/electron-browser/extensionHost.i18n.json
deleted file mode 100644
index 253dfe45911..00000000000
--- a/i18n/kor/src/vs/workbench/electron-browser/extensionHost.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"extensionHostProcess.startupFailDebug": "확장 호스트가 10초 내에 시작되지 않았습니다. 첫 번째 줄에서 중지되었을 수 있습니다. 계속하려면 디버거가 필요합니다.",
-	"extensionHostProcess.startupFail": "확장 호스트가 10초 이내에 시작되지 않았습니다. 문제가 발생했을 수 있습니다.",
-	"extensionHostProcess.error": "확장 호스트에서 오류 발생: {0}",
-	"devTools": "개발자 도구",
-	"extensionHostProcess.crash": "확장 호스트가 예기치 않게 종료되었습니다. 복구하려면 창을 다시 로드하세요."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/electron-browser/main.contribution.i18n.json b/i18n/kor/src/vs/workbench/electron-browser/main.contribution.i18n.json
deleted file mode 100644
index faff44b1768..00000000000
--- a/i18n/kor/src/vs/workbench/electron-browser/main.contribution.i18n.json
+++ /dev/null
@@ -1,91 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"view": "보기",
-	"help": "도움말",
-	"file": "파일",
-	"workspaces": "작업 영역",
-	"developer": "개발자",
-	"workbenchConfigurationTitle": "워크벤치",
-	"showEditorTabs": "열려 있는 편집기를 탭에서 표시할지 여부를 제어합니다.",
-	"workbench.editor.labelFormat.default": "파일 이름을 표시합니다. 탭이 사용하도록 설정되어 있고 하나의 그룹에서 파일 2개의 이름이 동일하면, 각 파일 경로의 특정 섹션이 추가됩니다. 탭이 사용하도록 설정되어 있지 않으면, 작업 영역 폴더에 대한 경로는 편집기가 활성 상태일 때 표시됩니다.",
-	"workbench.editor.labelFormat.short": "디렉터리 이름 앞에 오는 파일의 이름을 표시합니다.",
-	"workbench.editor.labelFormat.medium": "작업 영역 폴더에 상대적인 경로 앞에 오는 파일의 이름을 표시합니다.",
-	"workbench.editor.labelFormat.long": "절대 경로 앞에 오는 파일의 이름을 표시합니다.",
-	"tabDescription": "편집기의 레이블 형식을 제어합니다. 예를 들어 이 설정을 변경하면 파일의 위치를 더 쉽게 파악할 수 있습니다.:\n- 짧게:   'parent'\n- 중간:  'workspace/src/parent'\n- 길게:    '/home/user/workspace/src/parent'\n- 기본값: '.../parent', 다른 탭이 동일한 제목을 공유하거나, 탭을 사용하지 않도록 설정한 경우 작업 영역 상대 경로",
-	"editorTabCloseButton": "편집기의 탭 닫기 단추의 위치를 제어하거나 'off'로 설정된 경우 이 단추를 사용하지 않도록 설정합니다.",
-	"tabSizing": "편집기 탭의 크기를 제어합니다. 탭이 항상 전체 텍스트 레이블을 표시할 수 있게 확대되도록 하려면 '맞춤'으로 설정합니다. 사용 가능한 공간이 부족히 모든 탭을 한 번에 표시할 수 없는 경우 탭이 축소되도록 하려면 '축소'로 설정합니다.",
-	"showIcons": "열린 편집기를 아이콘과 함께 표시할지 여부를 제어합니다. 이를 위해서는 아이콘 테마도 사용하도록 설정해야 합니다.",
-	"enablePreview": "열려 있는 편집기를 미리 보기로 표시할지 여부를 제어합니다. 미리 보기 편집기는 유지된 상태까지(예: 두 번 클릭 또는 편집을 통해) 다시 사용되며 기울임꼴 글꼴 스타일로 표시됩니다.",
-	"enablePreviewFromQuickOpen": "Quick Open에서 연 편집기를 미리 보기로 표시할지 여부를 제어합니다. 미리 보기 편집기는 유지된 상태까지(예: 두 번 클릭 또는 편집을 통해) 다시 사용됩니다.",
-	"closeOnFileDelete": "일부 다른 프로세스에서 파일을 삭제하거나 이름을 바꿀 때 파일을 표시하는 편집기를 자동으로 닫을지 여부를 제어합니다. 사용하지 않도록 설정하는 경우 이러한 이벤트가 발생하면 편집기가 더티 상태로 계속 열려 있습니다. 응용 프로그램 내에서 삭제하면 항상 편집기가 닫히고 데이터를 유지하기 위해 더티 파일은 닫히지 않습니다.",
-	"editorOpenPositioning": "편집기가 열리는 위치를 제어합니다. 현재 활성 편집기의 왼쪽 또는 오른쪽에서 편집기를 열려면 '왼쪽' 또는 '오른쪽'을 선택합니다. 현재 활성 편집기와 독립적으로 편집기를 열려면 '처음' 또는 '마지막'을 선택합니다.",
-	"revealIfOpen": "편집기를 여는 경우 보이는 그룹 중 하나에 표시할지 여부를 제어합니다. 사용하지 않도록 설정할 경우 편집기가 기본적으로 현재 활성 편집기 그룹에 열립니다. 사용하도록 설정할 경우 현재 활성 편집기 그룹에서 편집기가 다시 열리지 않고 이미 열린 편집기가 표시됩니다. 강제로 편집기가 특정 그룹에서 열리거나 현재 활성 그룹 옆에 열리도록 하는 등의 일부 경우에는 이 설정이 무시됩니다.",
-	"swipeToNavigate": "세 손가락으로 가로로 살짝 밀어 열려 있는 파일 간을 이동합니다.",
-	"commandHistory": "명령 팔레트 기록을 유지하기 위해 최근 사용한 명령 개수를 제어합니다. 0으로 설정하면 명령 기록을 사용하지 않습니다.",
-	"preserveInput": "다음에 열 때 마지막으로 명령 팔레트에 입력한 내용을 복원할지 결정합니다.",
-	"closeOnFocusLost": "Quick Open가 포커스를 잃으면 자동으로 닫을지 여부를 제어합니다.",
-	"openDefaultSettings": "설정을 열면 모든 기본 설정을 표시하는 편집기도 열리는지 여부를 제어합니다.",
-	"sideBarLocation": "사이드바의 위치를 제어합니다. 워크벤치의 왼쪽이나 오른쪽에 표시될 수 있습니다.",
-	"panelDefaultLocation": "패널의 기본 위치를 제어합니다. 워크벤치의 아래 또는 오른쪽에 표시될 수 있습니다.",
-	"statusBarVisibility": "워크벤치 아래쪽에서 상태 표시줄의 표시 유형을 제어합니다.",
-	"activityBarVisibility": "워크벤치에서 작업 막대의 표시 유형을 제어합니다.",
-	"viewVisibility": "보기 머리글 작업의 표시 여부를 제어합니다. 보기 머리글 작업은 항상 표시할 수도 있고 보기에 포커스가 있거나 보기를 마우스로 가리킬 때만 표시할 수도 있습니다.",
-	"fontAliasing": "워크벤치에서 글꼴 앨리어싱 방식을 제어합니다.\n- 기본: 서브 픽셀 글꼴 다듬기. 대부분의 일반 디스플레이에서 가장 선명한 글꼴 제공\n- 안티앨리어싱: 서브 픽셀이 아닌 픽셀 단위에서 글꼴 다듬기. 전반적으로 더 밝은 느낌을 줄 수 있음\n- 없음: 글꼴 다듬기 사용 안 함. 텍스트 모서리가 각지게 표시됨\n- 자동: 디스플레이의 DPI에 따라 `기본` 또는 `안티앨리어싱`을 자동으로 적용합니다.",
-	"workbench.fontAliasing.default": "서브 픽셀 글꼴 다듬기. 대부분의 일반 디스플레이에서 가장 선명한 텍스트를 제공합니다. ",
-	"workbench.fontAliasing.antialiased": "서브 픽셀이 아닌 픽셀 수준에서 글꼴을 다듬습니다. 전반적으로 글꼴이 더 밝게 표시됩니다.",
-	"workbench.fontAliasing.none": "글꼴 다듬기를 사용하지 않습니다. 텍스트 가장자리가 각지게 표시됩니다.",
-	"workbench.fontAliasing.auto": "디스플레이의 DPI에 따라 `기본` 또는 `안티앨리어싱`을 자동으로 적용합니다.",
-	"enableNaturalLanguageSettingsSearch": "설정에 대한 자연어 검색 모드를 사용할지 여부를 제어합니다.",
-	"windowConfigurationTitle": "창",
-	"window.openFilesInNewWindow.on": "파일이 새 창에서 열립니다.",
-	"window.openFilesInNewWindow.off": "파일이 파일의 폴더가 열려 있는 창 또는 마지막 활성 창에서 열립니다.",
-	"window.openFilesInNewWindow.defaultMac": "Dock 또는 Finder를 통해 파일을 연 경우를 제외하고 파일이 파일의 폴더가 열린 창 또는 마지막 활성 창에서 열립니다.",
-	"window.openFilesInNewWindow.default": "응용 프로그램 내에서 선택(예: 파일 메뉴를 통해)하는 경우를 제외하고 파일이 새 창에서 열립니다. ",
-	"openFilesInNewWindowMac": "파일을 새 창에서 열지 여부를 제어합니다.\n- default: Dock 또는 Finder를 통해 파일을 연 경우를 제외하고, 파일이 파일의 폴더가 열린 창 또는 마지막 활성 창에서 열립니다.\n- on: 파일이 새 창에서 열립니다.\n- off: 파일이 파일의 폴더가 열린 창 또는 마지막 활성 창에서 열립니다.\n이 설정이 무시되는 경우도 있을 수 있습니다(예: -new-window 또는 reuse-window 명령줄 옵션을 사용할 경우).",
-	"openFilesInNewWindow": "파일을 새 창에서 열지 여부를 제어합니다.\n- default: 응용 프로그램 내에서 [파일] 메뉴 등을 통해 파일을 선택하는 경우를 제외하고, 파일이 새 창에서 열립니다.\n- on: 파일이 새 창에서 열립니다.\n- off: 파일이 파일의 폴더가 열린 창 또는 마지막 활성 창에서 열립니다.\n이 설정이 무시되는 경우도 있을 수 있습니다(예: -new-window 또는 reuse-window 명령줄 옵션을 사용할 경우).",
-	"window.openFoldersInNewWindow.on": "폴더가 새 창에서 열립니다.",
-	"window.openFoldersInNewWindow.off": "폴더가 마지막 활성 창을 바꿉니다.",
-	"window.openFoldersInNewWindow.default": "폴더를 응용 프로그램 내에서 선택(예: 파일 메뉴를 통해)하는 경우를 제외하고 폴더가 새 창에서 열립니다.",
-	"openFoldersInNewWindow": "폴더를 새 창에서 열지, 마지막 활성 창과 바꿀지를 제어합니다.\n- default: 응용 프로그램 내에서 [파일] 메뉴 등을 통해 폴더를 선택하는 경우를 제외하고, 폴더는 새 창에서 열립니다.\n- on: 폴더가 새 창에서 열립니다.\n- off: 폴더가 마지막 활성 창을 대체합니다\n이 설정이 무시되는 경우도 있을 수 있습니다(예: -new-window 또는 -reuse-window 명령줄 옵션을 사용할 경우).",
-	"window.openWithoutArgumentsInNewWindow.on": "새로운 빈 창 열기",
-	"window.openWithoutArgumentsInNewWindow.off": "실행 중인 마지막 활성 인스턴스에 포커스",
-	"openWithoutArgumentsInNewWindow": "인수 없이 두 번째 인스턴스를 시작할 때 새로운 빈 창을 열지 또는 실행 중인 마지막 인스턴스에 포커스가 생길지 여부를 제어합니다.\n- on: 새로운 빈 창을 엽니다.\n- off: 실행 중인 마지막 활성 인스턴스에 포커스가 생깁니다.\n이 설정이 무시되는 경우도 있을 수 있습니다(예: -new-window 또는 -reuse-window 명령줄 옵션을 사용할 경우).",
-	"window.reopenFolders.all": "모든 창을 다시 엽니다.",
-	"window.reopenFolders.folders": "모든 폴더를 다시 엽니다. 빈 작업 영역은 복원되지 않습니다.",
-	"window.reopenFolders.one": "마지막 활성 창을 다시 엽니다.",
-	"window.reopenFolders.none": "창을 다시 열지 않고 항상 빈 창으로 시작합니다.",
-	"restoreWindows": "다시 시작한 이후에 창을 다시 여는 방법을 설정합니다. 'none'을 선택하면 항상 빈 작업 영역으로 시작하고 'one'을 선택하면 마지막으로 작업한 창이 다시 열리고 'folders'를 선택하면 열었던 폴더가 포함된 모든 창이 다시 열리며 'all'을 선택하면 지난 세션의 모든 창이 다시 열립니다.",
-	"restoreFullscreen": "창이 전체 화면 모드에서 종료된 경우 창을 전체 화면 모드로 복원할지 여부를 제어합니다.",
-	"zoomLevel": "창의 확대/축소 수준을 조정합니다. 원래 크기는 0이고 각 상한 증분(예: 1) 또는 하한 증분(예: -1)은 20% 더 크거나 더 작게 확대/축소하는 것을 나타냅니다. 10진수를 입력하여 확대/축소 수준을 세부적으로 조정할 수도 있습니다.",
-	"title": "활성 편집기를 기반으로 창 제목을 제어합니다. 변수는 컨텍스트를 기준으로 대체됩니다.\n${activeEditorShort}: 파일 이름(예: myFile.txt)\n${activeEditorMedium}: 작업 영역 폴더를 기준으로 하는 파일에 대한 상대 경로(예: myFolder/myFile.txt)\n${activeEditorLong}: 파일의 전체 경로(예: /Users/Development/myProject/myFolder/myFile.txt)\n${folderName}: 파일이 포함된 작업 영역 폴더의 이름(예: myFolder)\n${folderPath}: 파일이 포함된 작업 영역 폴더의 파일 경로(예: /Users/Development/myFolder)\n${rootName}: 작업 영역의 이름(예: myFolder or myWorkspace)\n${rootPath}: 작업 영역의 파일 경로(예: /Users/Development/myWorkspace)\n${appName}: 예: VS Code\n${dirty}: 활성 편집기가 더티인 경우 더티 표시기\n${separator}: 값 또는 정적 텍스트가 있는 변수로 둘러싸인 경우에만 표시되는 조건부 구분 기호(\" - \")",
-	"window.newWindowDimensions.default": "화면 가운데에서 새 창을 엽니다.",
-	"window.newWindowDimensions.inherit": "마지막 활성 창과 동일한 크기로 새 창을 엽니다.",
-	"window.newWindowDimensions.maximized": "최대화된 새 창을 엽니다.",
-	"window.newWindowDimensions.fullscreen": "전체 화면 모드에서 새 창을 엽니다.",
-	"newWindowDimensions": "하나 이상의 창이 이미 열려 있을 때 여는 새 새 창의 크기를 제어합니다. 기본적으로 새 창은 화면 가운데에 작은 크기로 열립니다. 'inherit'으로 설정할 경우 마지막 활성 창과 동일한 크기로 창이 열립니다. 'maximized'로 설정할 경우 창이 최대화되어 열리고 'fullscreen'으로 구성할 경우 전체 화면으로 열립니다. 이 설정은 여는 첫 번째 창에는 적용되지 않습니다. 첫 번째 창의 경우 항상 창을 닫기 전의 크기와 위치가 복원됩니다.",
-	"closeWhenEmpty": "undefined",
-	"window.menuBarVisibility.default": "메뉴가 전체 화면 모드에서만 숨겨집니다.",
-	"window.menuBarVisibility.visible": "메뉴가 전체 화면 모드에서도 항상 표시됩니다.",
-	"window.menuBarVisibility.toggle": "메뉴가 숨겨져 있지만 <Alt> 키를 통해 메뉴를 표시할 수 있습니다.",
-	"window.menuBarVisibility.hidden": "메뉴가 항상 숨겨집니다.",
-	"menuBarVisibility": "메뉴 모음의 표시 여부를 제어합니다. '설정/해제'를 설정함으로써 메뉴 모음이 숨겨지고 <Alt> 키를 누를 때마다 메뉴 모음이 표시됩니다. 기본값으로, 창이 전체 화면인 경우를 제외하고 메뉴 모음이 표시됩니다.",
-	"enableMenuBarMnemonics": "사용하도록 설정하는 경우 Alt 키 바로 가기를 통해 주 메뉴를 열 수 있습니다. 니모닉을 사용하지 않도록 설정하면 대신 이러한 Alt 키 바로 가기를 편집기 명령에 바인딩할 수 있습니다.",
-	"autoDetectHighContrast": "사용하도록 설정한 경우 Windows에서 고대비 테마를 사용 중이면 고대비 테마로 자동으로 변경되고 Windows 고대비 테마를 해제하면 어두운 테마로 변경됩니다.",
-	"titleBarStyle": "창 제목 표시줄의 모양을 조정합니다. 변경 내용을 적용하려면 전체 다시 시작해야 합니다.",
-	"window.nativeTabs": "macOS Sierra 창 탭을 사용하도록 설정합니다. 변경\n 내용을 적용하려면 전체 다시 시작해야 하고, 기본 탭에서\n 사용자 지정 제목 표시줄 스타일(구성된 경우)을 비활성화합니다.",
-	"window.smoothScrollingWorkaround": "최소화된 VS Code 창을 복원한 후 더 이상 원활하게 스크롤되지 않으면 이 해결 방법을 사용하도록 설정하세요. 이 해결 방법은 Microsoft의 Surface 장치와 같이 정밀 트랙 패드가 장착된 장치에서 스크롤이 지연되기 시작하는 문제(https://github.com/Microsoft/vscode/issues/13612)를 해결합니다. 이 해결 방법을 사용하도록 설정하면 최소화된 상태에서 창을 복원한 후 약간의 레이아웃 깜박거림이 발생할 수 있지만 그 외의 해는 없습니다.",
-	"window.clickThroughInactive": "사용하도록 설정한 경우 비활성 창을 클릭하면 창도 활성화되고 클릭 가능한 경우 마우스 아래의 요소도 트리거됩니다. 사용하지 않도록 설정한 경우 비활성 창에서 아무곳이나 클릭하면 창만 활성화되며 요소는 또 한번 클릭해야 합니다.",
-	"zenModeConfigurationTitle": "Zen 모드",
-	"zenMode.fullScreen": "Zen 모드를 켜면 워크벤치도 전체 화면 모드로 전환되는지 여부를 제어합니다.",
-	"zenMode.centerLayout": "Zen 모드를 켜면 레이아웃도 가운데로 맞춰지는지 여부를 제어합니다.",
-	"zenMode.hideTabs": "Zen 모드를 켜면 워크벤치 탭도 숨길지를 제어합니다.",
-	"zenMode.hideStatusBar": "Zen 모드를 켜면 워크벤치 하단에서 상태 표시줄도 숨길지를 제어합니다.",
-	"zenMode.hideActivityBar": "Zen 모드를 켜면 워크벤치의 왼쪽에 있는 작업 막대도 숨길지\n 여부를 제어합니다.",
-	"zenMode.restore": "창이 Zen 모드에서 종료된 경우 Zen 모드로 복원할지 제어합니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/electron-browser/main.i18n.json b/i18n/kor/src/vs/workbench/electron-browser/main.i18n.json
deleted file mode 100644
index c4270a1aa73..00000000000
--- a/i18n/kor/src/vs/workbench/electron-browser/main.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"loaderError": "필요한 파일을 로드하지 못했습니다. 인터넷에 연결되지 않았거나 연결된 서버가 오프라인 상태입니다. 브라우저를 새로 고친 후 다시 시도해 보세요.",
-	"loaderErrorNative": "필요한 파일을 로드하지 못했습니다. 응용 프로그램을 다시 시작하여 다시 시도하세요. 세부 정보: {0}"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/electron-browser/shell.i18n.json b/i18n/kor/src/vs/workbench/electron-browser/shell.i18n.json
deleted file mode 100644
index 79ac1b1fdaa..00000000000
--- a/i18n/kor/src/vs/workbench/electron-browser/shell.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"runningAsRoot": "Code를 '루트'로 실행하지 않는 것이 좋습니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/electron-browser/window.i18n.json b/i18n/kor/src/vs/workbench/electron-browser/window.i18n.json
deleted file mode 100644
index 703e3d8d426..00000000000
--- a/i18n/kor/src/vs/workbench/electron-browser/window.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"undo": "실행 취소",
-	"redo": "다시 실행",
-	"cut": "잘라내기",
-	"copy": "복사",
-	"paste": "붙여넣기",
-	"selectAll": "모두 선택",
-	"runningAsRoot": "{0}을(를) 루트 사용자로 실행하지 않는 것이 좋습니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/electron-browser/workbench.i18n.json b/i18n/kor/src/vs/workbench/electron-browser/workbench.i18n.json
deleted file mode 100644
index a1a743cd8e3..00000000000
--- a/i18n/kor/src/vs/workbench/electron-browser/workbench.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"developer": "개발자",
-	"file": "파일"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/node/extensionHostMain.i18n.json b/i18n/kor/src/vs/workbench/node/extensionHostMain.i18n.json
deleted file mode 100644
index 1db13cc7201..00000000000
--- a/i18n/kor/src/vs/workbench/node/extensionHostMain.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"extensionTestError": "경로 {0}이(가) 유효한 확장 Test Runner를 가리키지 않습니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/node/extensionPoints.i18n.json b/i18n/kor/src/vs/workbench/node/extensionPoints.i18n.json
deleted file mode 100644
index 2105771ead9..00000000000
--- a/i18n/kor/src/vs/workbench/node/extensionPoints.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"jsonParseFail": "{0}을(를) 구문 분석하지 못함: {1}.",
-	"fileReadFail": "파일 {0}을(를) 읽을 수 없음: {1}.",
-	"jsonsParseFail": "{0} 또는 {1}을(를) 구문 분석하지 못했습니다. {2}",
-	"missingNLSKey": "키 {0}에 대한 메시지를 찾을 수 없습니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/cli/electron-browser/cli.contribution.i18n.json b/i18n/kor/src/vs/workbench/parts/cli/electron-browser/cli.contribution.i18n.json
deleted file mode 100644
index 5d6cf942328..00000000000
--- a/i18n/kor/src/vs/workbench/parts/cli/electron-browser/cli.contribution.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"install": "PATH에 '{0}' 명령 설치",
-	"not available": "이 명령은 사용할 수 없습니다.",
-	"successIn": "셸 명령 '{0}'이(가) PATH에 설치되었습니다.",
-	"ok": "확인",
-	"cancel2": "취소",
-	"warnEscalation": "이제 Code에서 'osascript'를 사용하여 관리자에게 셸 명령을 설치할 권한이 있는지를 묻습니다.",
-	"cantCreateBinFolder": "'/usr/local/bin'을 만들 수 없습니다.",
-	"aborted": "중단됨",
-	"uninstall": "PATH에서 '{0}' 명령 제거",
-	"successFrom": "셸 명령 '{0}'이(가) PATH에서 제거되었습니다.",
-	"shellCommand": "셸 명령"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/codeEditor/electron-browser/accessibility.i18n.json b/i18n/kor/src/vs/workbench/parts/codeEditor/electron-browser/accessibility.i18n.json
deleted file mode 100644
index d46b89a51d8..00000000000
--- a/i18n/kor/src/vs/workbench/parts/codeEditor/electron-browser/accessibility.i18n.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"emergencyConfOn": "이제 `editor.accessibilitySupport` 설정을 'on'으로 변경합니다.",
-	"openingDocs": "이제 VS Code 접근성 설명서 페이지를 엽니다.",
-	"introMsg": "VS Code의 접근성 옵션을 사용해 주셔서 감사합니다.",
-	"status": "상태:",
-	"changeConfigToOnMac": "화면 읽기 프로그램에서 사용에 영구적으로 최적화되도록 편집기를 구성하려면 지금 Command+E를 누르세요.",
-	"changeConfigToOnWinLinux": "화면 읽기 프로그램에서 사용에 영구적으로 최적화되도록 편집기를 구성하려면 지금 Command+E를 누르세요.",
-	"auto_unknown": "편집기는 플랫폼 API를 사용하여 화면 읽기 프로그램이 연결되는 시기를 검색하도록 구성되어 있지만 현재 런타임에서는 이 구성을 지원하지 않습니다.",
-	"auto_on": "편집기는 화면 읽기 프로그램이 연결되어 있음을 자동으로\n 검색했습니다.",
-	"auto_off": "편집기는 화면 편집기가 연결되는 시기를 자동으로 검색하도록 구성되어 있지만, 이 구성은 현재 지원되지 않습니다.",
-	"configuredOn": "편집기는 화면 읽기 프로그램에서 사용에 영구적으로 최적화되도록 편집기를 구성되어 있습니다. `editor.accessibilitySupport` 설정을 편집하여 이 구성을 변경할 수 있습니다.",
-	"configuredOff": "편집기는 화면 읽기 프로그램에서 사용에 최적화되지 않도록 구성되었습니다.",
-	"tabFocusModeOnMsg": "현재 편집기에서 <Tab> 키를 누르면 포커스가 다음 포커스 가능한 요소로 이동합니다. {0}을(를) 눌러서 이 동작을 설정/해제합니다.",
-	"tabFocusModeOnMsgNoKb": "현재 편집기에서 <Tab> 키를 누르면 포커스가 다음 포커스 가능한 요소로 이동합니다. {0} 명령은 현재 키 바인딩으로 트리거할 수 없습니다.",
-	"tabFocusModeOffMsg": "현재 편집기에서 <Tab> 키를 누르면 탭 문자가 삽입됩니다. {0}을(를) 눌러서 이 동작을 설정/해제합니다.",
-	"tabFocusModeOffMsgNoKb": "현재 편집기에서 <Tab> 키를 누르면 탭 문자가 삽입됩니다. {0} 명령은 현재 키 바인딩으로 트리거할 수 없습니다.",
-	"openDocMac": "브라우저 창에 접근성과 관련된 추가 VS Code 정보를 열려면 Command+H를 누르세요.",
-	"openDocWinLinux": "브라우저 창에 접근성과 관련된 추가 VS Code 정보를 열려면 지금 Control+H를 누르세요.",
-	"outroMsg": "이 도구 설명을 해제하고 Esc 키 또는 Shift+Esc를 눌러서 편집기로 돌아갈 수 있습니다.",
-	"ShowAccessibilityHelpAction": "접근성 도움말 표시"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/codeEditor/electron-browser/inspectKeybindings.i18n.json b/i18n/kor/src/vs/workbench/parts/codeEditor/electron-browser/inspectKeybindings.i18n.json
deleted file mode 100644
index 348b7fde598..00000000000
--- a/i18n/kor/src/vs/workbench/parts/codeEditor/electron-browser/inspectKeybindings.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"workbench.action.inspectKeyMap": "개발자: 키 매핑 검사"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/codeEditor/electron-browser/inspectTMScopes.i18n.json b/i18n/kor/src/vs/workbench/parts/codeEditor/electron-browser/inspectTMScopes.i18n.json
deleted file mode 100644
index b945677181e..00000000000
--- a/i18n/kor/src/vs/workbench/parts/codeEditor/electron-browser/inspectTMScopes.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"inspectTMScopes": "개발자: TM 범위 검사",
-	"inspectTMScopesWidget.loading": "로드 중..."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/codeEditor/electron-browser/languageConfiguration/languageConfigurationExtensionPoint.i18n.json b/i18n/kor/src/vs/workbench/parts/codeEditor/electron-browser/languageConfiguration/languageConfigurationExtensionPoint.i18n.json
deleted file mode 100644
index afa2b96152f..00000000000
--- a/i18n/kor/src/vs/workbench/parts/codeEditor/electron-browser/languageConfiguration/languageConfigurationExtensionPoint.i18n.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"parseErrors": "{0}을(를) 구문 분석하는 동안 오류가 발생했습니다. {1}",
-	"schema.openBracket": "여는 대괄호 문자 또는 문자열 시퀀스입니다.",
-	"schema.closeBracket": "닫는 대괄호 문자 또는 문자열 시퀀스입니다.",
-	"schema.comments": "주석 기호를 정의합니다.",
-	"schema.blockComments": "블록 주석이 표시되는 방법을 정의합니다.",
-	"schema.blockComment.begin": "블록 주석을 시작하는 문자 시퀀스입니다.",
-	"schema.blockComment.end": "블록 주석을 끝내는 문자 시퀀스입니다.",
-	"schema.lineComment": "줄 주석을 시작하는 문자 시퀀스입니다.",
-	"schema.brackets": "들여쓰기를 늘리거나 줄이는 대괄호 기호를 정의합니다.",
-	"schema.autoClosingPairs": "대괄호 쌍을 정의합니다. 여는 대괄호를 입력하면 닫는 대괄호가 자동으로 삽입됩니다.",
-	"schema.autoClosingPairs.notIn": "자동 쌍을 사용하지 않도록 설정된 범위 목록을 정의합니다.",
-	"schema.surroundingPairs": "선택한 문자열을 둘러싸는 데 사용할 수 있는 대괄호 쌍을 정의합니다.",
-	"schema.wordPattern": "해당 언어에 대한 단어 정의입니다.",
-	"schema.wordPattern.pattern": "단어 일치에 사용하는 RegEXP 패턴입니다.",
-	"schema.wordPattern.flags": "단어 일치에 사용하는 RegExp 플래그입니다.",
-	"schema.wordPattern.flags.errorMessage": "`/^([gimuy]+)$/` 패턴과 일치해야 합니다.",
-	"schema.indentationRules": "해당 언어의 들여쓰기 설정입니다.",
-	"schema.indentationRules.increaseIndentPattern": "라인이 이 패턴과 일치할 경우 이후의 모든 행을 한 번 들여씁니다(다른 규칙이 일치할 때까지).",
-	"schema.indentationRules.increaseIndentPattern.pattern": "increaseIndentPattern에 대한 RegExp 패턴입니다.",
-	"schema.indentationRules.increaseIndentPattern.flags": "increaseIndentPattern에 대한 RegExp 플래그입니다.",
-	"schema.indentationRules.increaseIndentPattern.errorMessage": "`/^([gimuy]+)$/` 패턴과 일치해야 합니다.",
-	"schema.indentationRules.decreaseIndentPattern": "행이 이 패턴과 일치하면 이후의 모든 행은 한 번 들여쓰지 않습니다(다른 규칙이 일치할 때까지).",
-	"schema.indentationRules.decreaseIndentPattern.pattern": "decreaseIndentPattern에 대한 RegExp 패턴입니다.",
-	"schema.indentationRules.decreaseIndentPattern.flags": "decreaseIndentPattern에 대한 RegExp 플래그입니다.",
-	"schema.indentationRules.decreaseIndentPattern.errorMessage": "`/^([gimuy]+)$/` 패턴과 일치해야 합니다.",
-	"schema.indentationRules.indentNextLinePattern": "행이 이 패턴과 일치하면 **그 다음 행만** 한 번 들여쓰기합니다.",
-	"schema.indentationRules.indentNextLinePattern.pattern": "indentNextLinePattern에 대한 RegExp 패턴입니다.",
-	"schema.indentationRules.indentNextLinePattern.flags": "indentNextLinePattern에 대한 RegExp 플래그입니다.",
-	"schema.indentationRules.indentNextLinePattern.errorMessage": "`/^([gimuy]+)$/` 패턴과 일치해야 합니다.",
-	"schema.indentationRules.unIndentedLinePattern": "행이 이 패턴과 일치하면 들여쓰기를 수정하지 않고 다른 규칙에 대해서 평가하지도 않습니다.",
-	"schema.indentationRules.unIndentedLinePattern.pattern": "unIndentedLinePattern에 대한 RegExp 패턴입니다.",
-	"schema.indentationRules.unIndentedLinePattern.flags": "unIndentedLinePattern에 대한 RegExp 플래그입니다.",
-	"schema.indentationRules.unIndentedLinePattern.errorMessage": "`/^([gimuy]+)$/` 패턴과 일치해야 합니다.",
-	"schema.folding": "해당 언어의 접기 설정입니다.",
-	"schema.folding.offSide": "해당 언어의 블록이 들여쓰기로 표현되는 경우 언어는 오프사이드 규칙을 준수합니다. 설정하는 경우 빈 줄은 후속 블록에 속합니다.",
-	"schema.folding.markers": "'#region' 및 '#endregion'처럼 언어별 접기 표식입니다. 시작 및 종료 regex는 모든 줄의 콘텐츠에 대해 테스트되며 효율적으로 설계되어야 합니다.",
-	"schema.folding.markers.start": "시작 표식에 대한 RegExp 패턴입니다. regexp는 '^'으로 시작해야 합니다.",
-	"schema.folding.markers.end": "끝 표식에 대한 RegExp 패턴입니다. regexp는 '^'으로 시작해야 합니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/codeEditor/electron-browser/largeFileOptimizations.i18n.json b/i18n/kor/src/vs/workbench/parts/codeEditor/electron-browser/largeFileOptimizations.i18n.json
deleted file mode 100644
index b3091669ff6..00000000000
--- a/i18n/kor/src/vs/workbench/parts/codeEditor/electron-browser/largeFileOptimizations.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"largeFile": "{0}: 메모리 사용을 줄이고 멈춤 또는 작동 중단을 방지하기 위해 이 큰 파일에 대해 토큰화, 줄 바꿈 및 접기를 해제했습니다.",
-	"neverShowAgain": "다시 표시 안 함",
-	"removeOptimizations": "강제로 기능을 사용하도록 설정",
-	"reopenFilePrompt": "이 설정을 적용하려면 파일을 다시 여세요."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/codeEditor/electron-browser/textMate/inspectTMScopes.i18n.json b/i18n/kor/src/vs/workbench/parts/codeEditor/electron-browser/textMate/inspectTMScopes.i18n.json
deleted file mode 100644
index 636ffde123e..00000000000
--- a/i18n/kor/src/vs/workbench/parts/codeEditor/electron-browser/textMate/inspectTMScopes.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"inspectTMScopes": "개발자: TM 범위 검사",
-	"inspectTMScopesWidget.loading": "로드 중..."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/codeEditor/electron-browser/toggleMinimap.i18n.json b/i18n/kor/src/vs/workbench/parts/codeEditor/electron-browser/toggleMinimap.i18n.json
deleted file mode 100644
index d8536fcf098..00000000000
--- a/i18n/kor/src/vs/workbench/parts/codeEditor/electron-browser/toggleMinimap.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleMinimap": "보기: 미니맵 토글"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/codeEditor/electron-browser/toggleMultiCursorModifier.i18n.json b/i18n/kor/src/vs/workbench/parts/codeEditor/electron-browser/toggleMultiCursorModifier.i18n.json
deleted file mode 100644
index 8159b708a65..00000000000
--- a/i18n/kor/src/vs/workbench/parts/codeEditor/electron-browser/toggleMultiCursorModifier.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleLocation": "다중 커서 한정자 설정/해제"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderControlCharacter.i18n.json b/i18n/kor/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderControlCharacter.i18n.json
deleted file mode 100644
index 9d609ff8327..00000000000
--- a/i18n/kor/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderControlCharacter.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleRenderControlCharacters": "보기: 제어 문자 토글"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderWhitespace.i18n.json b/i18n/kor/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderWhitespace.i18n.json
deleted file mode 100644
index 18184e2aa93..00000000000
--- a/i18n/kor/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderWhitespace.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleRenderWhitespace": "보기: 렌더링 공백 토글"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/codeEditor/electron-browser/toggleWordWrap.i18n.json b/i18n/kor/src/vs/workbench/parts/codeEditor/electron-browser/toggleWordWrap.i18n.json
deleted file mode 100644
index 9ca84461f48..00000000000
--- a/i18n/kor/src/vs/workbench/parts/codeEditor/electron-browser/toggleWordWrap.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggle.wordwrap": "보기: 자동 줄 바꿈 설정/해제",
-	"wordWrap.notInDiffEditor": "diff 편집기에서 자동 줄 바꿈을 설정/해제할 수 없습니다.",
-	"unwrapMinified": "이 파일에 대해 줄 바꿈 사용 안 함",
-	"wrapMinified": "이 파일에 대해 줄 바꿈 사용"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/codeEditor/electron-browser/wordWrapMigration.i18n.json b/i18n/kor/src/vs/workbench/parts/codeEditor/electron-browser/wordWrapMigration.i18n.json
deleted file mode 100644
index de7f5c56db0..00000000000
--- a/i18n/kor/src/vs/workbench/parts/codeEditor/electron-browser/wordWrapMigration.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"wordWrapMigration.ok": "확인",
-	"wordWrapMigration.dontShowAgain": "다시 표시 안 함",
-	"wordWrapMigration.openSettings": "설정 열기",
-	"wordWrapMigration.prompt": "`editor.wrappingColumn` 설정은 `editor.wordWrap`을 위해 사용되지 않습니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/debug/browser/breakpointWidget.i18n.json b/i18n/kor/src/vs/workbench/parts/debug/browser/breakpointWidget.i18n.json
deleted file mode 100644
index 06a0fe72276..00000000000
--- a/i18n/kor/src/vs/workbench/parts/debug/browser/breakpointWidget.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"breakpointWidgetExpressionPlaceholder": "식이 true로 계산될 경우 중단합니다. 적용하려면 'Enter' 키를 누르고 취소하려면 'Esc' 키를 누릅니다.",
-	"breakpointWidgetAriaLabel": "이 조건이 true인 경우에만 프로그램이 여기서 중지됩니다. 수락하려면 <Enter> 키를 누르고, 취소하려면 <Esc> 키를 누르세요.",
-	"breakpointWidgetHitCountPlaceholder": "적중 횟수 조건이 충족될 경우 중단합니다. 적용하려면 'Enter' 키를 누르고 취소하려면 'Esc' 키를 누릅니다.",
-	"breakpointWidgetHitCountAriaLabel": "적중 횟수가 충족되는 경우에만 프로그램이 여기서 중지됩니다. 수락하려면 <Enter> 키를 누르고, 취소하려면 <Esc> 키를 누르세요.",
-	"expression": "식",
-	"hitCount": "적중 횟수"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json b/i18n/kor/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
deleted file mode 100644
index 0495fb536e2..00000000000
--- a/i18n/kor/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"logPoint": "Logpoint",
-	"breakpoint": "중단점",
-	"editBreakpoint": "{0} 편집...",
-	"removeBreakpoint": "{0} 제거",
-	"functionBreakpointsNotSupported": "이 디버그 형식은 함수 중단점을 지원하지 않습니다.",
-	"functionBreakpointPlaceholder": "중단할 함수",
-	"functionBreakPointInputAriaLabel": "함수 중단점 입력",
-	"breakpointDisabledHover": "해제된 중단점",
-	"breakpointUnverifieddHover": "확인되지 않은 중단점",
-	"functionBreakpointUnsupported": "이 디버그 형식은 함수 중단점을 지원하지 않습니다.",
-	"breakpointDirtydHover": "확인되지 않은 중단점입니다. 파일이 수정되었습니다. 디버그 세션을 다시 시작하세요.",
-	"logBreakpointUnsupported": "이 디버그 형식에서 지원되지 않는 logpoint",
-	"conditionalBreakpointUnsupported": "이 디버그 형식에서 지원되지 않는 조건부 중단점",
-	"hitBreakpointUnsupported": "이 디버그 형식은 조건부 중단점 적중을 지원하지 않습니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/debug/browser/debugActionItems.i18n.json b/i18n/kor/src/vs/workbench/parts/debug/browser/debugActionItems.i18n.json
deleted file mode 100644
index dd3c2e18916..00000000000
--- a/i18n/kor/src/vs/workbench/parts/debug/browser/debugActionItems.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noConfigurations": "구성 없음",
-	"addConfigTo": "구성 추가 ({0})...",
-	"addConfiguration": "구성 추가..."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/debug/browser/debugActions.i18n.json b/i18n/kor/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
deleted file mode 100644
index d1d8a2f6ed3..00000000000
--- a/i18n/kor/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openLaunchJson": "{0} 열기",
-	"launchJsonNeedsConfigurtion": "'launch.json' 구성 또는 수정",
-	"noFolderDebugConfig": "고급 디버그 구성을 수행하려면 먼저 폴더를 여세요.",
-	"startDebug": "디버깅 시작",
-	"startWithoutDebugging": "디버깅하지 않고 시작",
-	"selectAndStartDebugging": "디버깅 선택 및 시작",
-	"restartDebug": "다시 시작",
-	"reconnectDebug": "다시 연결",
-	"stepOverDebug": "단위 실행",
-	"stepIntoDebug": "단계 정보",
-	"stepOutDebug": "단계 출력",
-	"stopDebug": "중지",
-	"disconnectDebug": "연결 끊기",
-	"continueDebug": "계속",
-	"pauseDebug": "일시 중지",
-	"terminateThread": "스레드 종료",
-	"restartFrame": "프레임 다시 시작",
-	"removeBreakpoint": "중단점 제거",
-	"removeAllBreakpoints": "모든 중단점 제거",
-	"enableAllBreakpoints": "모든 중단점 설정",
-	"disableAllBreakpoints": "모든 중단점 해제",
-	"activateBreakpoints": "중단점 활성화",
-	"deactivateBreakpoints": "중단점 비활성화",
-	"reapplyAllBreakpoints": "모든 중단점 다시 적용",
-	"addFunctionBreakpoint": "함수 중단점 추가",
-	"setValue": "값 설정",
-	"addWatchExpression": "식 추가",
-	"editWatchExpression": "식 편집",
-	"addToWatchExpressions": "조사식에 추가",
-	"removeWatchExpression": "식 제거",
-	"removeAllWatchExpressions": "모든 식 제거",
-	"clearRepl": "콘솔 지우기",
-	"debugConsoleAction": "디버그 콘솔",
-	"unreadOutput": "디버그 콘솔의 새 출력",
-	"debugFocusConsole": "디버그 콘솔에 포커스",
-	"focusSession": "세션에 포커스 설정",
-	"stepBackDebug": "뒤로 이동",
-	"reverseContinue": "반전"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/debug/browser/debugActionsWidget.i18n.json b/i18n/kor/src/vs/workbench/parts/debug/browser/debugActionsWidget.i18n.json
deleted file mode 100644
index cb865a46050..00000000000
--- a/i18n/kor/src/vs/workbench/parts/debug/browser/debugActionsWidget.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"debugToolBarBackground": "디버그 도구 모음 배경색입니다.",
-	"debugToolBarBorder": "디버그 도구 모음 테두리색입니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/debug/browser/debugCommands.i18n.json b/i18n/kor/src/vs/workbench/parts/debug/browser/debugCommands.i18n.json
deleted file mode 100644
index 7928624aeb4..00000000000
--- a/i18n/kor/src/vs/workbench/parts/debug/browser/debugCommands.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noFolderDebugConfig": "고급 디버그 구성을 수행하려면 먼저 폴더를 여세요.",
-	"inlineBreakpoint": "인라인 중단점",
-	"debug": "디버그",
-	"addInlineBreakpoint": "인라인 중단점 추가"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/debug/browser/debugContentProvider.i18n.json b/i18n/kor/src/vs/workbench/parts/debug/browser/debugContentProvider.i18n.json
deleted file mode 100644
index 54dad0bedb8..00000000000
--- a/i18n/kor/src/vs/workbench/parts/debug/browser/debugContentProvider.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"unable": "디버그 세션이 없는 리소스를 확인할 수 없음",
-	"canNotResolveSource": "{0} 리소스를 확인할 수 없습니다. 디버그 확장에서 응답이 없습니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json b/i18n/kor/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
deleted file mode 100644
index 6a3df39c249..00000000000
--- a/i18n/kor/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleBreakpointAction": "디버그: 중단점 설정/해제",
-	"conditionalBreakpointEditorAction": "디버그: 조건부 중단점 추가...",
-	"logPointEditorAction": "디버그 : Logpoint 추가...",
-	"runToCursor": "커서까지 실행",
-	"debugEvaluate": "디버그: 평가",
-	"debugAddToWatch": "디버그: 조사식에 추가",
-	"showDebugHover": "디버그: 가리키기 표시",
-	"goToNextBreakpoint": "디버그 : 다음 중단점으로 이동",
-	"goToPreviousBreakpoint": "디버그 : 이전 중단점으로 이동"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/debug/browser/debugEditorModelManager.i18n.json b/i18n/kor/src/vs/workbench/parts/debug/browser/debugEditorModelManager.i18n.json
deleted file mode 100644
index 32987ab3369..00000000000
--- a/i18n/kor/src/vs/workbench/parts/debug/browser/debugEditorModelManager.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"breakpointDisabledHover": "해제된 중단점",
-	"breakpointUnverifieddHover": "확인되지 않은 중단점",
-	"breakpointDirtydHover": "확인되지 않은 중단점입니다. 파일이 수정되었습니다. 디버그 세션을 다시 시작하세요.",
-	"breakpointUnsupported": "이 디버그 형식에서 지원되지 않는 조건부 중단점"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/debug/browser/debugQuickOpen.i18n.json b/i18n/kor/src/vs/workbench/parts/debug/browser/debugQuickOpen.i18n.json
deleted file mode 100644
index ffa51bf68f4..00000000000
--- a/i18n/kor/src/vs/workbench/parts/debug/browser/debugQuickOpen.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"entryAriaLabel": "{0}, 디버그",
-	"debugAriaLabel": "실행할 시작 구성의 이름을 입력하세요.",
-	"addConfigTo": "구성 추가 ({0})...",
-	"addConfiguration": "구성 추가...",
-	"noConfigurationsMatching": "일치하는 디버그 구성 없음",
-	"noConfigurationsFound": "디버그 구성을 찾을 수 없습니다. 'launch.json' 파일을 만드세요."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/debug/browser/debugStatus.i18n.json b/i18n/kor/src/vs/workbench/parts/debug/browser/debugStatus.i18n.json
deleted file mode 100644
index a4d28ad0252..00000000000
--- a/i18n/kor/src/vs/workbench/parts/debug/browser/debugStatus.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"selectAndStartDebug": "디버그 구성 선택 및 시작"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/debug/browser/debugViewlet.i18n.json b/i18n/kor/src/vs/workbench/parts/debug/browser/debugViewlet.i18n.json
deleted file mode 100644
index 280e7417d10..00000000000
--- a/i18n/kor/src/vs/workbench/parts/debug/browser/debugViewlet.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"startAdditionalSession": "추가 세션 시작",
-	"debugFocusVariablesView": "포커스 변수",
-	"debugFocusWatchView": "포커스 조사식",
-	"debugFocusCallStackView": "포커스 호출 스택",
-	"debugFocusBreakpointsView": "포커스 중단점"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/debug/browser/exceptionWidget.i18n.json b/i18n/kor/src/vs/workbench/parts/debug/browser/exceptionWidget.i18n.json
deleted file mode 100644
index ab384c94286..00000000000
--- a/i18n/kor/src/vs/workbench/parts/debug/browser/exceptionWidget.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"debugExceptionWidgetBorder": "예외 위젯 테두리 색입니다.",
-	"debugExceptionWidgetBackground": "예외 위젯 배경색입니다.",
-	"exceptionThrownWithId": "예외가 발생했습니다. {0}",
-	"exceptionThrown": "예외가 발생했습니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/debug/browser/linkDetector.i18n.json b/i18n/kor/src/vs/workbench/parts/debug/browser/linkDetector.i18n.json
deleted file mode 100644
index dca3d8a4d0f..00000000000
--- a/i18n/kor/src/vs/workbench/parts/debug/browser/linkDetector.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"fileLinkMac": "클릭하여 이동(측면에서 열려면 Cmd 키를 누르고 클릭)",
-	"fileLink": "클릭하여 이동(측면에서 열려면 Ctrl 키를 누르고 클릭)"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/debug/browser/statusbarColorProvider.i18n.json b/i18n/kor/src/vs/workbench/parts/debug/browser/statusbarColorProvider.i18n.json
deleted file mode 100644
index a364973604e..00000000000
--- a/i18n/kor/src/vs/workbench/parts/debug/browser/statusbarColorProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"statusBarDebuggingBackground": "프로그램이 디버그될 때의 상태 표시줄 배경색입니다. 상태 표시줄은 창의 맨 아래에 표시됩니다.",
-	"statusBarDebuggingForeground": "프로그램이 디버그될 때의 상태 표시줄 전경색입니다. 상태 표시줄은 창의 맨 아래에 표시됩니다.",
-	"statusBarDebuggingBorder": "프로그램 디버깅 중 사이드바 및 편집기와 구분하는 상태 표시줄 테두리 색입니다. 상태 표시줄은 창의 맨 아래에 표시됩니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/debug/common/debug.i18n.json b/i18n/kor/src/vs/workbench/parts/debug/common/debug.i18n.json
deleted file mode 100644
index 4258ad4cb0d..00000000000
--- a/i18n/kor/src/vs/workbench/parts/debug/common/debug.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"internalConsoleOptions": "내부 디버그 콘솔의 동작을 제어합니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/debug/common/debugModel.i18n.json b/i18n/kor/src/vs/workbench/parts/debug/common/debugModel.i18n.json
deleted file mode 100644
index b16981fa5ff..00000000000
--- a/i18n/kor/src/vs/workbench/parts/debug/common/debugModel.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"notAvailable": "사용할 수 없음",
-	"startDebugFirst": "평가할 디버그 세션을 시작하세요."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/debug/common/debugSchemas.i18n.json b/i18n/kor/src/vs/workbench/parts/debug/common/debugSchemas.i18n.json
deleted file mode 100644
index 4f7ea3cfac0..00000000000
--- a/i18n/kor/src/vs/workbench/parts/debug/common/debugSchemas.i18n.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.contributes.debuggers": "디버그 어댑터를 적용합니다.",
-	"vscode.extension.contributes.debuggers.type": "이 디버그 어댑터에 대한 고유한 식별자입니다.",
-	"vscode.extension.contributes.debuggers.label": "이 디버그 어댑터에 대한 이름을 표시합니다.",
-	"vscode.extension.contributes.debuggers.program": "디버그 어댑터 프로그램의 경로입니다. 절대 경로이거나 확장 폴더의 상대 경로입니다.",
-	"vscode.extension.contributes.debuggers.args": "어댑터에 전달할 선택적 인수입니다.",
-	"vscode.extension.contributes.debuggers.runtime": "프로그램 특성이 실행 파일이 아니지만 런타임이 필요한 경우의 선택적 런타임입니다.",
-	"vscode.extension.contributes.debuggers.runtimeArgs": "선택적 런타임 인수입니다.",
-	"vscode.extension.contributes.debuggers.variables": "`launch.json`의 대화형 변수(예: ${action.pickProcess})에서 명령으로의 매핑입니다.",
-	"vscode.extension.contributes.debuggers.initialConfigurations": "초기 'launch.json'을 생성하기 위한 구성입니다.",
-	"vscode.extension.contributes.debuggers.languages": "디버그 확장이 \"기본 디버거\"로 간주될 수 있는 언어 목록입니다.",
-	"vscode.extension.contributes.debuggers.adapterExecutableCommand": "지정하는 경우 VS Code에서 이 명령을 호출하여 디버그 어댑터의 실행 파일 경로 및 전달할 인수를 확인합니다.",
-	"vscode.extension.contributes.debuggers.configurationSnippets": "'launch.json'에 새 구성을 추가하는 코드 조각입니다.",
-	"vscode.extension.contributes.debuggers.configurationAttributes": "'launch.json'의 유효성 검사를 위한 JSON 스키마 구성입니다.",
-	"vscode.extension.contributes.debuggers.windows": "Windows 특정 설정",
-	"vscode.extension.contributes.debuggers.windows.runtime": "Windows에 사용되는 런타임입니다.",
-	"vscode.extension.contributes.debuggers.osx": "macOS 관련 설정입니다.",
-	"vscode.extension.contributes.debuggers.osx.runtime": "macOS에 사용되는 런타임입니다.",
-	"vscode.extension.contributes.debuggers.linux": "Linux 특정 설정",
-	"vscode.extension.contributes.debuggers.linux.runtime": "Linux에 사용되는 런타임입니다.",
-	"vscode.extension.contributes.breakpoints": "중단점을 적용합니다.",
-	"vscode.extension.contributes.breakpoints.language": "이 언어에 대해 중단점을 허용합니다.",
-	"app.launch.json.title": "시작",
-	"app.launch.json.version": "이 파일 형식의 버전입니다.",
-	"app.launch.json.configurations": "구성 목록입니다. IntelliSense를 사용하여 새 구성을 추가하거나 기존 구성을 편집합니다.",
-	"app.launch.json.compounds": "복합의 목록입니다. 각 복합은 함께 시작되는 여러 구성을 참조합니다.",
-	"app.launch.json.compound.name": "복합의 이름입니다. 구성 시작 드롭 다운 메뉴에 표시됩니다.",
-	"useUniqueNames": "고유한 구성 이름을 사용하세요.",
-	"app.launch.json.compound.folder": "복합형 항목이 있는 폴더의 이름입니다.",
-	"app.launch.json.compounds.configurations": "이 복합의 일부로 시작되는 구성의 이름입니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/debug/common/debugSource.i18n.json b/i18n/kor/src/vs/workbench/parts/debug/common/debugSource.i18n.json
deleted file mode 100644
index c749e7fc53a..00000000000
--- a/i18n/kor/src/vs/workbench/parts/debug/common/debugSource.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"unknownSource": "알 수 없는 소스"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json b/i18n/kor/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
deleted file mode 100644
index ff73e8551e5..00000000000
--- a/i18n/kor/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"breakpointWidgetLogMessagePlaceholder": "중단점이 적중될 때 기록할 메시지입니다. {} 내의 식은 보간됩니다. 수락하려면 'Enter' 키를 누르고  취소하려면 'esc' 키를 누르세요.",
-	"breakpointWidgetHitCountPlaceholder": "적중 횟수 조건이 충족될 경우 중단합니다. 적용하려면 'Enter' 키를 누르고 취소하려면 'Esc' 키를 누릅니다.",
-	"breakpointWidgetExpressionPlaceholder": "식이 true로 계산될 경우 중단합니다. 적용하려면 'Enter' 키를 누르고 취소하려면 'Esc' 키를 누릅니다.",
-	"expression": "식",
-	"hitCount": "적중 횟수",
-	"logMessage": "로그 메시지"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/debug/electron-browser/breakpointsView.i18n.json b/i18n/kor/src/vs/workbench/parts/debug/electron-browser/breakpointsView.i18n.json
deleted file mode 100644
index f110fb1dbb0..00000000000
--- a/i18n/kor/src/vs/workbench/parts/debug/electron-browser/breakpointsView.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"editConditionalBreakpoint": "중단점 편집...",
-	"functionBreakpointsNotSupported": "이 디버그 형식은 함수 중단점을 지원하지 않습니다.",
-	"functionBreakpointPlaceholder": "중단할 함수",
-	"functionBreakPointInputAriaLabel": "함수 중단점 입력"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/debug/electron-browser/callStackView.i18n.json b/i18n/kor/src/vs/workbench/parts/debug/electron-browser/callStackView.i18n.json
deleted file mode 100644
index e7cba031cda..00000000000
--- a/i18n/kor/src/vs/workbench/parts/debug/electron-browser/callStackView.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"callstackSection": "호출 스택 섹션",
-	"debugStopped": "{0}에서 일시 중지됨",
-	"callStackAriaLabel": "호출 스택 디버그",
-	"session": "세션",
-	"paused": "일시 중지됨",
-	"running": "실행 중",
-	"thread": "스레드",
-	"pausedOn": "{0}에서 일시 중지됨",
-	"loadMoreStackFrames": "더 많은 스택 프레임 로드",
-	"threadAriaLabel": "스레드 {0}, 호출 스택, 디버그",
-	"stackFrameAriaLabel": "스택 프레임 {0} 줄 {1} {2}, 호출 스택, 디버그"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json b/i18n/kor/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
deleted file mode 100644
index 383c5e7a51d..00000000000
--- a/i18n/kor/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleDebugViewlet": "디버그 표시",
-	"toggleDebugPanel": "디버그 콘솔",
-	"debug": "디버그",
-	"debugPanel": "디버그 콘솔",
-	"variables": "변수",
-	"watch": "조사식",
-	"callStack": "호출 스택",
-	"breakpoints": "중단점",
-	"view": "보기",
-	"debugCategory": "디버그",
-	"debugCommands": "디버그 구성",
-	"debugConfigurationTitle": "디버그",
-	"allowBreakpointsEverywhere": "모든 파일에 대한 중단점을 설정할 수 있습니다.",
-	"openExplorerOnEnd": "디버그 세션 끝에 탐색기 뷰를 자동으로 엽니다.",
-	"inlineValues": "디버그하는 동안 편집기에서 변수 값을 인라인으로 표시합니다.",
-	"toolBarLocation": "디버그 도구 모음의 위치를 제어합니다. \"floating\"(모든 보기에서 부동 창으로 표시), \"docked\"(디버그 보기에 고정) 또는 \"hidden\"(숨김)입니다.",
-	"never": "상태 표시줄에 디버그 표시 안 함",
-	"always": "상태 표시줄에 디버그 항상 표시",
-	"onFirstSessionStart": "디버그가 처음으로 시작된 후에만 상태 표시줄에 디버그 표시",
-	"showInStatusBar": "디버그 상태 표시줄을 표시할 시기를 제어합니다.",
-	"openDebug": "디버깅 세션 시작 시에 디버그 보기를 열지 여부를 제어합니다",
-	"enableAllHovers": "디버그할 때 디버그가 아닌 가리키기를 사용하도록 설정할지 여부를 제어합니다. True이면 가리키기를 제공하기 위해 가리키기 공급자를 호출합니다. 이 설정이 true인 경우에도 일반 가리키기는 표시되지 않습니다.",
-	"launch": "전역 디버그 시작 구성입니다. 작업 영역에서 공유되는 \n 'launch.json'에 대한 대체로 사용되어야 합니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/debug/electron-browser/debugCommands.i18n.json b/i18n/kor/src/vs/workbench/parts/debug/electron-browser/debugCommands.i18n.json
deleted file mode 100644
index 591fb68a19d..00000000000
--- a/i18n/kor/src/vs/workbench/parts/debug/electron-browser/debugCommands.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noFolderDebugConfig": "고급 디버그 구성을 수행하려면 먼저 폴더를 여세요."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json b/i18n/kor/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json
deleted file mode 100644
index dc993a8c3d2..00000000000
--- a/i18n/kor/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"debugNoType": "디버거 '형식'은 생략할 수 없으며 '문자열' 형식이어야 합니다.",
-	"selectDebug": "환경 선택",
-	"DebugConfig.failed": "'.vscode' 폴더({0}) 내에 'launch.json' 파일을 만들 수 없습니다.",
-	"workspace": "작업 영역",
-	"user settings": "사용자 설정"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json b/i18n/kor/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
deleted file mode 100644
index b40f849a9c2..00000000000
--- a/i18n/kor/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"logPoint": "Logpoint",
-	"breakpoint": "중단점",
-	"removeBreakpoint": "{0} 제거",
-	"editBreakpoint": "{0} 편집...",
-	"disableBreakpoint": "{0} 사용 안 함",
-	"enableBreakpoint": "{0} 사용",
-	"removeBreakpoints": "중단점 제거",
-	"removeInlineBreakpointOnColumn": "{0} 열에서 인라인 중단점 제거",
-	"removeLineBreakpoint": "줄 중단점 제거",
-	"editBreakpoints": "중단점 편집",
-	"editInlineBreakpointOnColumn": "{0} 열에서 인라인 중단점 편집",
-	"editLineBrekapoint": "줄 중단점 편집",
-	"enableDisableBreakpoints": "중단점 사용/사용 안 함",
-	"disableInlineColumnBreakpoint": "{0} 열에서 인라인 중단점 사용 안 함",
-	"disableBreakpointOnLine": "줄 중단점 사용 안 함",
-	"enableBreakpoints": "{0} 열에서 인라인 중단점 사용",
-	"enableBreakpointOnLine": "줄 중단점 사용",
-	"addBreakpoint": "중단점 추가",
-	"addConditionalBreakpoint": "조건부 중단점 추가...",
-	"addLogPoint": "Logpoint 추가...",
-	"breakpointHasCondition": "이 {0}에는 제거 시 손실되는 {1}이(가) 있습니다. 대신 {0}을(를) 사용하지 않도록 설정하세요.",
-	"message": "메시지",
-	"condition": "조건",
-	"removeLogPoint": "{0} 제거",
-	"disableLogPoint": "{0} 사용 안 함",
-	"cancel": "취소",
-	"addConfiguration": "구성 추가..."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/debug/electron-browser/debugHover.i18n.json b/i18n/kor/src/vs/workbench/parts/debug/electron-browser/debugHover.i18n.json
deleted file mode 100644
index f5b1693d358..00000000000
--- a/i18n/kor/src/vs/workbench/parts/debug/electron-browser/debugHover.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"treeAriaLabel": "가리키기 디버그"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json b/i18n/kor/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
deleted file mode 100644
index f0485e490c5..00000000000
--- a/i18n/kor/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"snapshotObj": "이 개체에 대한 기본 값만 표시됩니다.",
-	"debuggingPaused": "디버그가 일시 중지되었습니다. 이유 {0}, {1} {2}",
-	"debuggingStarted": "디버그가 시작되었습니다.",
-	"debuggingStopped": "디버그가 중지되었습니다.",
-	"breakpointAdded": "파일 {1}, 줄 {0}에 중단점이 추가되었습니다.",
-	"breakpointRemoved": "파일 {1}, 줄 {0}에서 중단점이 제거되었습니다.",
-	"compoundMustHaveConfigurations": "여러 구성을 시작하려면 복합에 \"configurations\" 특성 집합이 있어야 합니다.",
-	"noConfigurationNameInWorkspace": "작업 영역에서 시작 구성 '{0}'을(를) 찾을 수 없습니다.",
-	"multipleConfigurationNamesInWorkspace": "작업 영역에 시작 구성 '{0}'이(가) 여러 개 있습니다. 폴더 이름을 사용하여 구성을 한정하세요.",
-	"noFolderWithName": "복합형 '{2}'의 구성 '{1}'에 대해 이름이 '{0}'인 폴더를 찾을 수 없습니다.",
-	"configMissing": "'{0}' 구성이 'launch.json'에 없습니다.",
-	"launchJsonDoesNotExist": "'launch.json'이 없습니다.",
-	"debugRequestNotSupported": "'{0}' 특성에는 선택한 디버그 구성에서 지원되지 않는 값 '{1}'이(가) 있습니다.",
-	"debugRequesMissing": "선택한 디버그 구성에 특성 '{0}'이(가) 없습니다.",
-	"debugTypeNotSupported": "구성된 디버그 형식 '{0}'은(는) 지원되지 않습니다.",
-	"debugTypeMissing": "선택한 시작 구성에 대한 'type' 속성이 없습니다.",
-	"debugAnyway": "디버그",
-	"preLaunchTaskErrors": "preLaunchTask '{0}' 진행 중에 빌드 오류가 감지되었습니다.",
-	"preLaunchTaskError": "preLaunchTask '{0}' 진행 중에 빌드 오류가 감지되었습니다.",
-	"preLaunchTaskExitCode": "preLaunchTask '{0}'이(가) {1} 종료 코드와 함께 종료되었습니다.",
-	"showErrors": "오류 표시",
-	"noFolderWorkspaceDebugError": "활성 파일은 디버그할 수 없습니다. 이 파일이 디스크에 저장되어 있고 해당 파일 형식에 대한 디버그 확장이 설치되어 있는지 확인하세요.",
-	"cancel": "취소",
-	"DebugTaskNotFound": "작업 '{0}' 을(를) 찾을 수 없습니다.",
-	"taskNotTracked": "작업 '{0}' 을(를) 추적할 수 없습니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/debug/electron-browser/debugViewer.i18n.json b/i18n/kor/src/vs/workbench/parts/debug/electron-browser/debugViewer.i18n.json
deleted file mode 100644
index 73e4a8a8e06..00000000000
--- a/i18n/kor/src/vs/workbench/parts/debug/electron-browser/debugViewer.i18n.json
+++ /dev/null
@@ -1,28 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"process": "프로세스",
-	"paused": "일시 중지됨",
-	"running": "실행 중",
-	"thread": "스레드",
-	"pausedOn": "{0}에서 일시 중지됨",
-	"loadMoreStackFrames": "더 많은 스택 프레임 로드",
-	"threadAriaLabel": "스레드 {0}, 호출 스택, 디버그",
-	"stackFrameAriaLabel": "스택 프레임 {0} 줄 {1} {2}, 호출 스택, 디버그",
-	"variableValueAriaLabel": "새 변수 값 입력",
-	"variableScopeAriaLabel": "{0} 범위, 변수, 디버그",
-	"variableAriaLabel": "{0} 값 {1}, 변수, 디버그",
-	"watchExpressionPlaceholder": "조사할 식",
-	"watchExpressionInputAriaLabel": "조사식 입력",
-	"watchExpressionAriaLabel": "{0} 값 {1}, 조사식, 디버그",
-	"watchVariableAriaLabel": "{0} 값 {1}, 조사식, 디버그",
-	"functionBreakpointPlaceholder": "중단할 함수",
-	"functionBreakPointInputAriaLabel": "함수 중단점 입력",
-	"functionBreakpointsNotSupported": "이 디버그 형식은 함수 중단점을 지원하지 않습니다.",
-	"breakpointAriaLabel": "중단점 줄 {0} {1}, 중단점, 디버그",
-	"functionBreakpointAriaLabel": "함수 중단점 {0}, 중단점, 디버그",
-	"exceptionBreakpointAriaLabel": "예외 중단점 {0}, 중단점, 디버그"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/debug/electron-browser/debugViews.i18n.json b/i18n/kor/src/vs/workbench/parts/debug/electron-browser/debugViews.i18n.json
deleted file mode 100644
index b890a7946e2..00000000000
--- a/i18n/kor/src/vs/workbench/parts/debug/electron-browser/debugViews.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"variablesSection": "변수 섹션",
-	"variablesAriaTreeLabel": "변수 디버그",
-	"expressionsSection": "식 섹션",
-	"watchAriaTreeLabel": "조사식 디버그",
-	"callstackSection": "호출 스택 섹션",
-	"debugStopped": "{0}에서 일시 중지됨",
-	"callStackAriaLabel": "호출 스택 디버그",
-	"breakpointsSection": "중단점 섹션",
-	"breakpointsAriaTreeLabel": "중단점 디버그"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/debug/electron-browser/electronDebugActions.i18n.json b/i18n/kor/src/vs/workbench/parts/debug/electron-browser/electronDebugActions.i18n.json
deleted file mode 100644
index 79de72d3e1f..00000000000
--- a/i18n/kor/src/vs/workbench/parts/debug/electron-browser/electronDebugActions.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"copyValue": "값 복사",
-	"copyAsExpression": "식으로 복사",
-	"copy": "복사",
-	"copyAll": "모두 복사",
-	"copyStackTrace": "호출 스택 복사"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/debug/electron-browser/rawDebugSession.i18n.json b/i18n/kor/src/vs/workbench/parts/debug/electron-browser/rawDebugSession.i18n.json
deleted file mode 100644
index 742e35e3d50..00000000000
--- a/i18n/kor/src/vs/workbench/parts/debug/electron-browser/rawDebugSession.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"moreInfo": "추가 정보",
-	"debugAdapterCrash": "디버그 어댑터 프로세스가 예기치 않게 종료되었습니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/debug/electron-browser/repl.i18n.json b/i18n/kor/src/vs/workbench/parts/debug/electron-browser/repl.i18n.json
deleted file mode 100644
index 3e29018521d..00000000000
--- a/i18n/kor/src/vs/workbench/parts/debug/electron-browser/repl.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"replAriaLabel": "읽기 평가 인쇄 루프 패널",
-	"actions.repl.historyPrevious": "기록 이전",
-	"actions.repl.historyNext": "기록 다음",
-	"actions.repl.acceptInput": "REPL 입력 적용",
-	"actions.repl.copyAll": "디버그: 모두 콘솔 복사"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/debug/electron-browser/replViewer.i18n.json b/i18n/kor/src/vs/workbench/parts/debug/electron-browser/replViewer.i18n.json
deleted file mode 100644
index 458c1b8a6ff..00000000000
--- a/i18n/kor/src/vs/workbench/parts/debug/electron-browser/replViewer.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"stateCapture": "개체 상태는 첫 번재 평가에서 캡처됩니다.",
-	"replVariableAriaLabel": "{0} 변수에 {1} 값이 있습니다. 읽기 평가 인쇄 루프, 디버그",
-	"replExpressionAriaLabel": "{0} 식에 {1} 값이 있습니다. 읽기 평가 인쇄 루프, 디버그",
-	"replValueOutputAriaLabel": "{0}, 읽기 평가 인쇄 루프, 디버그",
-	"replRawObjectAriaLabel": "REPL 변수 {0}에 {1} 값이 있습니다. 읽기 평가 인쇄 루프, 디버그"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/debug/electron-browser/statusbarColorProvider.i18n.json b/i18n/kor/src/vs/workbench/parts/debug/electron-browser/statusbarColorProvider.i18n.json
deleted file mode 100644
index a364973604e..00000000000
--- a/i18n/kor/src/vs/workbench/parts/debug/electron-browser/statusbarColorProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"statusBarDebuggingBackground": "프로그램이 디버그될 때의 상태 표시줄 배경색입니다. 상태 표시줄은 창의 맨 아래에 표시됩니다.",
-	"statusBarDebuggingForeground": "프로그램이 디버그될 때의 상태 표시줄 전경색입니다. 상태 표시줄은 창의 맨 아래에 표시됩니다.",
-	"statusBarDebuggingBorder": "프로그램 디버깅 중 사이드바 및 편집기와 구분하는 상태 표시줄 테두리 색입니다. 상태 표시줄은 창의 맨 아래에 표시됩니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json b/i18n/kor/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json
deleted file mode 100644
index 225f55e21c1..00000000000
--- a/i18n/kor/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"debug.terminal.title": "디버기"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/debug/electron-browser/variablesView.i18n.json b/i18n/kor/src/vs/workbench/parts/debug/electron-browser/variablesView.i18n.json
deleted file mode 100644
index c354396071e..00000000000
--- a/i18n/kor/src/vs/workbench/parts/debug/electron-browser/variablesView.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"variablesSection": "변수 섹션",
-	"variablesAriaTreeLabel": "변수 디버그",
-	"variableValueAriaLabel": "새 변수 값 입력",
-	"variableScopeAriaLabel": "{0} 범위, 변수, 디버그",
-	"variableAriaLabel": "{0} 값 {1}, 변수, 디버그"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/debug/electron-browser/watchExpressionsView.i18n.json b/i18n/kor/src/vs/workbench/parts/debug/electron-browser/watchExpressionsView.i18n.json
deleted file mode 100644
index a586cd226f6..00000000000
--- a/i18n/kor/src/vs/workbench/parts/debug/electron-browser/watchExpressionsView.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"expressionsSection": "식 섹션",
-	"watchAriaTreeLabel": "조사식 디버그",
-	"watchExpressionPlaceholder": "조사할 식",
-	"watchExpressionInputAriaLabel": "조사식 입력",
-	"watchExpressionAriaLabel": "{0} 값 {1}, 조사식, 디버그",
-	"watchVariableAriaLabel": "{0} 값 {1}, 조사식, 디버그"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json b/i18n/kor/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
deleted file mode 100644
index e49f8a732d5..00000000000
--- a/i18n/kor/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"debugAdapterBinNotFound": "디버그 어댑터 실행 파일 '{0}'이(가) 없습니다.",
-	"debugAdapterCannotDetermineExecutable": "디버그 어댑터 '{0}'에 대한 실행 파일을 확인할 수 없습니다.",
-	"unableToLaunchDebugAdapter": "'{0}'에서 디버그 어댑터를 시작할 수 없습니다.",
-	"unableToLaunchDebugAdapterNoArgs": "디버그 어댑터를 시작할 수 없습니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/debug/node/debugger.i18n.json b/i18n/kor/src/vs/workbench/parts/debug/node/debugger.i18n.json
deleted file mode 100644
index ded2c6ad581..00000000000
--- a/i18n/kor/src/vs/workbench/parts/debug/node/debugger.i18n.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"launch.config.comment1": "IntelliSense를 사용하여 가능한 특성에 대해 알아보세요.",
-	"launch.config.comment2": "기존 특성에 대한 설명을 보려면 가리킵니다.",
-	"launch.config.comment3": "자세한 내용을 보려면 {0}을(를) 방문하세요.",
-	"debugType": "구성의 형식입니다.",
-	"debugTypeNotRecognised": "디버그 형식이 인식되지 않습니다. 해당하는 디버그 확장을 설치하고 사용하도록 설정했는지 확인하세요.",
-	"node2NotSupported": "\"node2\"는 더 이상 지원되지 않습니다. 대신 \"node\"를 사용하고 \"protocol\" 특성을 \"inspector\"로 설정하세요.",
-	"debugName": "구성 이름이며, 구성 시작 드롭다운 메뉴에 표시됩니다.",
-	"debugRequest": "구성 형식을 요청합니다. \"시작\" 또는 \"연결\"일 수 있습니다.",
-	"debugServer": "디버그 확장 배포 전용입니다. 포트가 지정된 경우 VS Code에서는 서버 모드로 실행하는 디버그 어댑터에 연결을 시도합니다.",
-	"debugPrelaunchTask": "디버그 세션이 시작되기 이전에 실행할 작업입니다.",
-	"debugPostDebugTask": "디버그 세션 종료 후 실행할 작업입니다.",
-	"debugWindowsConfiguration": "Windows 특정 시작 구성 특성입니다.",
-	"debugOSXConfiguration": "OS X 특정 시작 구성 특성입니다.",
-	"debugLinuxConfiguration": "Linux 특정 시작 구성 특성입니다.",
-	"deprecatedVariables": "'env.', 'config.' 및 'command.'는 사용되지 않습니다. 대신 'env:', 'config:' 및 'command:'를 사용하세요."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/debug/node/terminals.i18n.json b/i18n/kor/src/vs/workbench/parts/debug/node/terminals.i18n.json
deleted file mode 100644
index 850e1c758d6..00000000000
--- a/i18n/kor/src/vs/workbench/parts/debug/node/terminals.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"console.title": "VS Code 콘솔",
-	"mac.terminal.script.failed": "스크립트 '{0}'이(가) 실패했습니다(종료 코드: {1}).",
-	"mac.terminal.type.not.supported": "'{0}'이(가) 지원되지 않습니다.",
-	"press.any.key": "계속하려면 아무 키나 누르세요.",
-	"linux.term.failed": "'{0}'에서 실패했습니다(종료 코드: {1})."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/emmet/browser/actions/showEmmetCommands.i18n.json b/i18n/kor/src/vs/workbench/parts/emmet/browser/actions/showEmmetCommands.i18n.json
deleted file mode 100644
index 6784d9c0c0f..00000000000
--- a/i18n/kor/src/vs/workbench/parts/emmet/browser/actions/showEmmetCommands.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"showEmmetCommands": "Emmet 명령 표시"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/emmet/electron-browser/actions/balance.i18n.json b/i18n/kor/src/vs/workbench/parts/emmet/electron-browser/actions/balance.i18n.json
deleted file mode 100644
index 82d5698f1e0..00000000000
--- a/i18n/kor/src/vs/workbench/parts/emmet/electron-browser/actions/balance.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"balanceInward": "Emmet: 균형있게(안쪽으로)",
-	"balanceOutward": "Emmet: 균형있게(바깥쪽으로)"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/emmet/electron-browser/actions/editPoints.i18n.json b/i18n/kor/src/vs/workbench/parts/emmet/electron-browser/actions/editPoints.i18n.json
deleted file mode 100644
index 12f82e199c9..00000000000
--- a/i18n/kor/src/vs/workbench/parts/emmet/electron-browser/actions/editPoints.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"previousEditPoint": "Emmet: 이전 편집 점으로 이동",
-	"nextEditPoint": "Emmet: 다음 편집 점으로 이동"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/emmet/electron-browser/actions/evaluateMath.i18n.json b/i18n/kor/src/vs/workbench/parts/emmet/electron-browser/actions/evaluateMath.i18n.json
deleted file mode 100644
index 5323baf8c08..00000000000
--- a/i18n/kor/src/vs/workbench/parts/emmet/electron-browser/actions/evaluateMath.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"evaluateMathExpression": "Emmet: 수학 식 평가"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/emmet/electron-browser/actions/expandAbbreviation.i18n.json b/i18n/kor/src/vs/workbench/parts/emmet/electron-browser/actions/expandAbbreviation.i18n.json
deleted file mode 100644
index b51e5a5c7aa..00000000000
--- a/i18n/kor/src/vs/workbench/parts/emmet/electron-browser/actions/expandAbbreviation.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"expandAbbreviationAction": "Emmet: 약어 확장"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/emmet/electron-browser/actions/incrementDecrement.i18n.json b/i18n/kor/src/vs/workbench/parts/emmet/electron-browser/actions/incrementDecrement.i18n.json
deleted file mode 100644
index 2255914bed5..00000000000
--- a/i18n/kor/src/vs/workbench/parts/emmet/electron-browser/actions/incrementDecrement.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"incrementNumberByOneTenth": "Emmet: 0.1 증가",
-	"incrementNumberByOne": "Emmet: 1 증가",
-	"incrementNumberByTen": "Emmet: 10 증가",
-	"decrementNumberByOneTenth": "Emmet: 0.1 감소",
-	"decrementNumberByOne": "Emmet: 1 감소",
-	"decrementNumberByTen": "Emmet: 10 감소"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/emmet/electron-browser/actions/matchingPair.i18n.json b/i18n/kor/src/vs/workbench/parts/emmet/electron-browser/actions/matchingPair.i18n.json
deleted file mode 100644
index 83a77e69884..00000000000
--- a/i18n/kor/src/vs/workbench/parts/emmet/electron-browser/actions/matchingPair.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"matchingPair": "Emmet: 일치하는 쌍으로 이동"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/emmet/electron-browser/actions/mergeLines.i18n.json b/i18n/kor/src/vs/workbench/parts/emmet/electron-browser/actions/mergeLines.i18n.json
deleted file mode 100644
index 161537077b5..00000000000
--- a/i18n/kor/src/vs/workbench/parts/emmet/electron-browser/actions/mergeLines.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"mergeLines": "Emmet: 줄 병합"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/emmet/electron-browser/actions/reflectCssValue.i18n.json b/i18n/kor/src/vs/workbench/parts/emmet/electron-browser/actions/reflectCssValue.i18n.json
deleted file mode 100644
index 9de599d6dbe..00000000000
--- a/i18n/kor/src/vs/workbench/parts/emmet/electron-browser/actions/reflectCssValue.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"reflectCSSValue": "Emmet: CSS 값 반영"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/emmet/electron-browser/actions/removeTag.i18n.json b/i18n/kor/src/vs/workbench/parts/emmet/electron-browser/actions/removeTag.i18n.json
deleted file mode 100644
index d694fdaa5d8..00000000000
--- a/i18n/kor/src/vs/workbench/parts/emmet/electron-browser/actions/removeTag.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"removeTag": "Emmet: 태그 제거"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/emmet/electron-browser/actions/selectItem.i18n.json b/i18n/kor/src/vs/workbench/parts/emmet/electron-browser/actions/selectItem.i18n.json
deleted file mode 100644
index ce90cf1c917..00000000000
--- a/i18n/kor/src/vs/workbench/parts/emmet/electron-browser/actions/selectItem.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"selectPreviousItem": "Emmet: 이전 항목 선택",
-	"selectNextItem": "Emmet: 다음 항목 선택"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/emmet/electron-browser/actions/splitJoinTag.i18n.json b/i18n/kor/src/vs/workbench/parts/emmet/electron-browser/actions/splitJoinTag.i18n.json
deleted file mode 100644
index d700fca47b3..00000000000
--- a/i18n/kor/src/vs/workbench/parts/emmet/electron-browser/actions/splitJoinTag.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"splitJoinTag": "Emmet: 태그 분할/조인"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/emmet/electron-browser/actions/toggleComment.i18n.json b/i18n/kor/src/vs/workbench/parts/emmet/electron-browser/actions/toggleComment.i18n.json
deleted file mode 100644
index 47d9fb34230..00000000000
--- a/i18n/kor/src/vs/workbench/parts/emmet/electron-browser/actions/toggleComment.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"toggleComment": "Emmet: 주석 설정/해제"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/emmet/electron-browser/actions/updateImageSize.i18n.json b/i18n/kor/src/vs/workbench/parts/emmet/electron-browser/actions/updateImageSize.i18n.json
deleted file mode 100644
index 4cf87429ced..00000000000
--- a/i18n/kor/src/vs/workbench/parts/emmet/electron-browser/actions/updateImageSize.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"updateImageSize": "Emmet: 이미지 크기 업데이트"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/emmet/electron-browser/actions/updateTag.i18n.json b/i18n/kor/src/vs/workbench/parts/emmet/electron-browser/actions/updateTag.i18n.json
deleted file mode 100644
index 00369305a07..00000000000
--- a/i18n/kor/src/vs/workbench/parts/emmet/electron-browser/actions/updateTag.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"updateTag": "Emmet: 태그 업데이트",
-	"enterTag": "태그 입력",
-	"tag": "태그"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/emmet/electron-browser/actions/wrapWithAbbreviation.i18n.json b/i18n/kor/src/vs/workbench/parts/emmet/electron-browser/actions/wrapWithAbbreviation.i18n.json
deleted file mode 100644
index d86b2ec66c0..00000000000
--- a/i18n/kor/src/vs/workbench/parts/emmet/electron-browser/actions/wrapWithAbbreviation.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"wrapWithAbbreviationAction": "Emmet: 약어로 래핑",
-	"enterAbbreviation": "약어 입력",
-	"abbreviation": "약어"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/emmet/electron-browser/emmet.contribution.i18n.json b/i18n/kor/src/vs/workbench/parts/emmet/electron-browser/emmet.contribution.i18n.json
deleted file mode 100644
index cc42700efc8..00000000000
--- a/i18n/kor/src/vs/workbench/parts/emmet/electron-browser/emmet.contribution.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"emmetConfigurationTitle": "Emmet",
-	"triggerExpansionOnTab": "사용하도록 설정하면 emmet 약어는 <Tab> 키를 눌렀을 때 확장됩니다. emmet.useNewemmet을 true로 설정하면 적용되지 않습니다.",
-	"emmetPreferences": "Emmet의 일부 작업 및 해결 프로그램의 동작을 수정하는 데 사용되는 기본 설정입니다. emmet.useNewemmet을 true로 설정하면 적용되지 않습니다.",
-	"emmetSyntaxProfiles": "지정된 구문에 대한 프로필을 정의하거나 특정 규칙이 포함된 고유한 프로필을 사용하세요.",
-	"emmetExclude": "Emmet 약어를 확장하면 안 되는 언어의 배열입니다.",
-	"emmetExtensionsPath": "Emmet 프로필, 코드 조각 및 기본 설정이 포함된 폴더의 경로입니다. emmet.useNewEmmet이 true일 때만 확장 경로의 프로필이 인정됩니다.",
-	"useNewEmmet": "모든 emmet 기능에 대해 새 emmet 모듈을 사용해 보세요(이전 단일 emmet 라이브러리를 대체함)."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/emmet/node/actions/balance.i18n.json b/i18n/kor/src/vs/workbench/parts/emmet/node/actions/balance.i18n.json
deleted file mode 100644
index 82d5698f1e0..00000000000
--- a/i18n/kor/src/vs/workbench/parts/emmet/node/actions/balance.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"balanceInward": "Emmet: 균형있게(안쪽으로)",
-	"balanceOutward": "Emmet: 균형있게(바깥쪽으로)"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/emmet/node/actions/editPoints.i18n.json b/i18n/kor/src/vs/workbench/parts/emmet/node/actions/editPoints.i18n.json
deleted file mode 100644
index 739aa4ea537..00000000000
--- a/i18n/kor/src/vs/workbench/parts/emmet/node/actions/editPoints.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"previousEditPoint": "Emmet: 이전 편집 점",
-	"nextEditPoint": "Emmet: 다음 편집 점"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/emmet/node/actions/evaluateMath.i18n.json b/i18n/kor/src/vs/workbench/parts/emmet/node/actions/evaluateMath.i18n.json
deleted file mode 100644
index 5323baf8c08..00000000000
--- a/i18n/kor/src/vs/workbench/parts/emmet/node/actions/evaluateMath.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"evaluateMathExpression": "Emmet: 수학 식 평가"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/emmet/node/actions/expandAbbreviation.i18n.json b/i18n/kor/src/vs/workbench/parts/emmet/node/actions/expandAbbreviation.i18n.json
deleted file mode 100644
index 15be0c84d97..00000000000
--- a/i18n/kor/src/vs/workbench/parts/emmet/node/actions/expandAbbreviation.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"expandAbbreviationAction": "Emmet: 약어 확장"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/emmet/node/actions/incrementDecrement.i18n.json b/i18n/kor/src/vs/workbench/parts/emmet/node/actions/incrementDecrement.i18n.json
deleted file mode 100644
index 2255914bed5..00000000000
--- a/i18n/kor/src/vs/workbench/parts/emmet/node/actions/incrementDecrement.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"incrementNumberByOneTenth": "Emmet: 0.1 증가",
-	"incrementNumberByOne": "Emmet: 1 증가",
-	"incrementNumberByTen": "Emmet: 10 증가",
-	"decrementNumberByOneTenth": "Emmet: 0.1 감소",
-	"decrementNumberByOne": "Emmet: 1 감소",
-	"decrementNumberByTen": "Emmet: 10 감소"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/emmet/node/actions/matchingPair.i18n.json b/i18n/kor/src/vs/workbench/parts/emmet/node/actions/matchingPair.i18n.json
deleted file mode 100644
index 83a77e69884..00000000000
--- a/i18n/kor/src/vs/workbench/parts/emmet/node/actions/matchingPair.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"matchingPair": "Emmet: 일치하는 쌍으로 이동"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/emmet/node/actions/mergeLines.i18n.json b/i18n/kor/src/vs/workbench/parts/emmet/node/actions/mergeLines.i18n.json
deleted file mode 100644
index 161537077b5..00000000000
--- a/i18n/kor/src/vs/workbench/parts/emmet/node/actions/mergeLines.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"mergeLines": "Emmet: 줄 병합"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/emmet/node/actions/reflectCssValue.i18n.json b/i18n/kor/src/vs/workbench/parts/emmet/node/actions/reflectCssValue.i18n.json
deleted file mode 100644
index 9de599d6dbe..00000000000
--- a/i18n/kor/src/vs/workbench/parts/emmet/node/actions/reflectCssValue.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"reflectCSSValue": "Emmet: CSS 값 반영"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/emmet/node/actions/removeTag.i18n.json b/i18n/kor/src/vs/workbench/parts/emmet/node/actions/removeTag.i18n.json
deleted file mode 100644
index d694fdaa5d8..00000000000
--- a/i18n/kor/src/vs/workbench/parts/emmet/node/actions/removeTag.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"removeTag": "Emmet: 태그 제거"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/emmet/node/actions/selectItem.i18n.json b/i18n/kor/src/vs/workbench/parts/emmet/node/actions/selectItem.i18n.json
deleted file mode 100644
index ce90cf1c917..00000000000
--- a/i18n/kor/src/vs/workbench/parts/emmet/node/actions/selectItem.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"selectPreviousItem": "Emmet: 이전 항목 선택",
-	"selectNextItem": "Emmet: 다음 항목 선택"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/emmet/node/actions/splitJoinTag.i18n.json b/i18n/kor/src/vs/workbench/parts/emmet/node/actions/splitJoinTag.i18n.json
deleted file mode 100644
index d700fca47b3..00000000000
--- a/i18n/kor/src/vs/workbench/parts/emmet/node/actions/splitJoinTag.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"splitJoinTag": "Emmet: 태그 분할/조인"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/emmet/node/actions/toggleComment.i18n.json b/i18n/kor/src/vs/workbench/parts/emmet/node/actions/toggleComment.i18n.json
deleted file mode 100644
index 47d9fb34230..00000000000
--- a/i18n/kor/src/vs/workbench/parts/emmet/node/actions/toggleComment.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"toggleComment": "Emmet: 주석 설정/해제"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/emmet/node/actions/updateImageSize.i18n.json b/i18n/kor/src/vs/workbench/parts/emmet/node/actions/updateImageSize.i18n.json
deleted file mode 100644
index 4cf87429ced..00000000000
--- a/i18n/kor/src/vs/workbench/parts/emmet/node/actions/updateImageSize.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"updateImageSize": "Emmet: 이미지 크기 업데이트"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/emmet/node/actions/updateTag.i18n.json b/i18n/kor/src/vs/workbench/parts/emmet/node/actions/updateTag.i18n.json
deleted file mode 100644
index 00369305a07..00000000000
--- a/i18n/kor/src/vs/workbench/parts/emmet/node/actions/updateTag.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"updateTag": "Emmet: 태그 업데이트",
-	"enterTag": "태그 입력",
-	"tag": "태그"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/emmet/node/actions/wrapWithAbbreviation.i18n.json b/i18n/kor/src/vs/workbench/parts/emmet/node/actions/wrapWithAbbreviation.i18n.json
deleted file mode 100644
index d86b2ec66c0..00000000000
--- a/i18n/kor/src/vs/workbench/parts/emmet/node/actions/wrapWithAbbreviation.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"wrapWithAbbreviationAction": "Emmet: 약어로 래핑",
-	"enterAbbreviation": "약어 입력",
-	"abbreviation": "약어"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/emmet/node/emmet.contribution.i18n.json b/i18n/kor/src/vs/workbench/parts/emmet/node/emmet.contribution.i18n.json
deleted file mode 100644
index b4ba4df288c..00000000000
--- a/i18n/kor/src/vs/workbench/parts/emmet/node/emmet.contribution.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"emmetConfigurationTitle": "Emmet",
-	"triggerExpansionOnTab": "사용하도록 설정하면 emmet 약어는 <Tab> 키를 눌렀을 때 확장됩니다.",
-	"emmetPreferences": "Emmet의 일부 작업 및 해결 프로그램의 동작을 수정하는 데 사용되는 기본 설정입니다.",
-	"emmetSyntaxProfiles": "지정된 구문에 대한 프로필을 정의하거나 특정 규칙이 포함된 고유한 프로필을 사용하세요.",
-	"emmetExclude": "Emmet 약어를 확장하면 안 되는 언어의 배열입니다.",
-	"emmetExtensionsPath": "Emmet 프로필, 코드 조각 및 기본 설정이 포함된 폴더의 경로"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json b/i18n/kor/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
deleted file mode 100644
index d7e3fbf5bab..00000000000
--- a/i18n/kor/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"terminalConfigurationTitle": "외부 터미널",
-	"explorer.openInTerminalKind": "실행할 터미널 종류를 사용자 지정합니다.",
-	"terminal.external.windowsExec": "Windows에서 실행할 터미널을 사용자 지정합니다.",
-	"terminal.external.osxExec": "OS X에서 실행할 터미널 응용 프로그램을 사용자 지정합니다.",
-	"terminal.external.linuxExec": "Linux에서 실행할 터미널을 사용자 지정합니다.",
-	"globalConsoleActionWin": "새 명령 프롬프트 열기",
-	"globalConsoleActionMacLinux": "새 터미널 열기",
-	"scopedConsoleActionWin": "명령 프롬프트에서 열기",
-	"scopedConsoleActionMacLinux": "터미널에서 열기"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/execution/electron-browser/terminal.contribution.i18n.json b/i18n/kor/src/vs/workbench/parts/execution/electron-browser/terminal.contribution.i18n.json
deleted file mode 100644
index 563087d2f54..00000000000
--- a/i18n/kor/src/vs/workbench/parts/execution/electron-browser/terminal.contribution.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"terminalConfigurationTitle": "외부 터미널",
-	"terminal.external.windowsExec": "Windows에서 실행할 터미널을 사용자 지정합니다.",
-	"terminal.external.osxExec": "OS X에서 실행할 터미널 응용 프로그램을 사용자 지정합니다.",
-	"terminal.external.linuxExec": "Linux에서 실행할 터미널을 사용자 지정합니다.",
-	"globalConsoleActionWin": "새 명령 프롬프트 열기",
-	"globalConsoleActionMacLinux": "새 터미널 열기",
-	"scopedConsoleActionWin": "명령 프롬프트에서 열기",
-	"scopedConsoleActionMacLinux": "터미널에서 열기"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/execution/electron-browser/terminalService.i18n.json b/i18n/kor/src/vs/workbench/parts/execution/electron-browser/terminalService.i18n.json
deleted file mode 100644
index 850e1c758d6..00000000000
--- a/i18n/kor/src/vs/workbench/parts/execution/electron-browser/terminalService.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"console.title": "VS Code 콘솔",
-	"mac.terminal.script.failed": "스크립트 '{0}'이(가) 실패했습니다(종료 코드: {1}).",
-	"mac.terminal.type.not.supported": "'{0}'이(가) 지원되지 않습니다.",
-	"press.any.key": "계속하려면 아무 키나 누르세요.",
-	"linux.term.failed": "'{0}'에서 실패했습니다(종료 코드: {1})."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/explorers/browser/treeExplorer.contribution.i18n.json b/i18n/kor/src/vs/workbench/parts/explorers/browser/treeExplorer.contribution.i18n.json
deleted file mode 100644
index 1d9370c72b0..00000000000
--- a/i18n/kor/src/vs/workbench/parts/explorers/browser/treeExplorer.contribution.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"vscode.extension.contributes.view": "사용자 지정 뷰를 적용합니다.",
-	"vscode.extension.contributes.view.id": "vscode.workspace.createTreeView를 통해 만든 뷰를 식별하는 데 사용된 고유 ID",
-	"vscode.extension.contributes.view.label": "뷰를 렌더링하는 데 사용되는 사람이 읽을 수 있는 문자열",
-	"vscode.extension.contributes.view.icon": "뷰 아이콘의 경로",
-	"vscode.extension.contributes.views": "사용자 지정 뷰를 적용합니다.",
-	"showViewlet": "{0} 표시",
-	"view": "보기"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/explorers/browser/treeExplorerActions.i18n.json b/i18n/kor/src/vs/workbench/parts/explorers/browser/treeExplorerActions.i18n.json
deleted file mode 100644
index 5553273dba2..00000000000
--- a/i18n/kor/src/vs/workbench/parts/explorers/browser/treeExplorerActions.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"refresh": "새로 고침"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/explorers/browser/treeExplorerService.i18n.json b/i18n/kor/src/vs/workbench/parts/explorers/browser/treeExplorerService.i18n.json
deleted file mode 100644
index 287d93cf202..00000000000
--- a/i18n/kor/src/vs/workbench/parts/explorers/browser/treeExplorerService.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"treeExplorer.noMatchingProviderId": "ID가 {providerId}인 등록된 TreeExplorerNodeProvider가 없습니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/explorers/browser/views/treeExplorerView.i18n.json b/i18n/kor/src/vs/workbench/parts/explorers/browser/views/treeExplorerView.i18n.json
deleted file mode 100644
index 49ededf88a8..00000000000
--- a/i18n/kor/src/vs/workbench/parts/explorers/browser/views/treeExplorerView.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"treeExplorerViewlet.tree": "창 다시 로드"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/extensions/browser/dependenciesViewer.i18n.json b/i18n/kor/src/vs/workbench/parts/extensions/browser/dependenciesViewer.i18n.json
deleted file mode 100644
index a616705c592..00000000000
--- a/i18n/kor/src/vs/workbench/parts/extensions/browser/dependenciesViewer.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"error": "오류",
-	"Unknown Dependency": "알 수 없는 종속성:"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json b/i18n/kor/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json
deleted file mode 100644
index ac0d4279306..00000000000
--- a/i18n/kor/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"name": "확장 이름",
-	"extension id": "확장 ID",
-	"preview": "미리 보기",
-	"builtin": "기본 제공",
-	"publisher": "게시자 이름",
-	"install count": "설치 수",
-	"rating": "등급",
-	"repository": "리포지토리",
-	"license": "라이선스",
-	"details": "세부 정보",
-	"contributions": "기여",
-	"changelog": "변경 로그",
-	"dependencies": "종속성",
-	"noReadme": "사용 가능한 추가 정보가 없습니다.",
-	"noChangelog": "CHANGELOG를 사용할 수 없습니다.",
-	"noContributions": "참여 없음",
-	"noDependencies": "종속성 없음",
-	"settings": "설정({0})",
-	"setting name": "이름",
-	"description": "설명",
-	"default": "기본값",
-	"debuggers": "디버거({0})",
-	"debugger name": "이름",
-	"debugger type": "유형",
-	"views": "뷰({0})",
-	"view id": "ID",
-	"view name": "이름",
-	"view location": "위치",
-	"localizations": "지역화({0})",
-	"localizations language id": "언어 ID",
-	"localizations language name": "언어 이름",
-	"localizations localized language name": "언어 이름(지역화됨)",
-	"colorThemes": "색 테마({0})",
-	"iconThemes": "아이콘 테마({0})",
-	"colors": "색({0})",
-	"colorId": "ID",
-	"defaultDark": "어둡게 기본값",
-	"defaultLight": "밝게 기본값",
-	"defaultHC": "고대비 기본값",
-	"JSON Validation": "JSON 유효성 검사({0})",
-	"fileMatch": "파일 일치",
-	"schema": "스키마",
-	"commands": "명령({0})",
-	"command name": "이름",
-	"keyboard shortcuts": "바로 가기 키(&&K)",
-	"menuContexts": "메뉴 컨텍스트",
-	"languages": "언어({0})",
-	"language id": "ID",
-	"language name": "이름",
-	"file extensions": "파일 확장명",
-	"grammar": "문법",
-	"snippets": "코드 조각"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json b/i18n/kor/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
deleted file mode 100644
index 3b79008f444..00000000000
--- a/i18n/kor/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
+++ /dev/null
@@ -1,81 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"download": "수동으로 다운로드",
-	"install vsix": "다운로드하고 나면 다운로드한 '{0}'의 VSIX를 수동으로 설치하세요.",
-	"installAction": "설치",
-	"installing": "설치 중",
-	"failedToInstall": "'{0}'을(를) 설치하지 못했습니다.",
-	"uninstallAction": "제거",
-	"Uninstalling": "제거하는 중",
-	"updateAction": "업데이트",
-	"updateTo": "{0}(으)로 업데이트",
-	"failedToUpdate": "'{0}'을(를) 업데이트하지 못했습니다.",
-	"ManageExtensionAction.uninstallingTooltip": "제거하는 중",
-	"enableForWorkspaceAction": "사용(작업 영역)",
-	"enableGloballyAction": "사용",
-	"enableAction": "사용",
-	"disableForWorkspaceAction": "사용 안 함(작업 영역)",
-	"disableGloballyAction": "사용 안 함",
-	"disableAction": "사용 안 함",
-	"checkForUpdates": "업데이트 확인",
-	"enableAutoUpdate": "확장 자동 업데이트 사용",
-	"disableAutoUpdate": "확장 자동 업데이트 사용 안 함",
-	"updateAll": "모든 확장 업데이트",
-	"reloadAction": "다시 로드",
-	"postUpdateTooltip": "업데이트하려면 다시 로드",
-	"postUpdateMessage": "이 창을 다시 로드하여 업데이트된 확장 '{0}'을(를) 활성화하시겠습니까?",
-	"postEnableTooltip": "활성화하려면 다시 로드",
-	"postEnableMessage": "이 창을 다시 로드하여 '{0}' 확장을 활성화하시겠습니까?",
-	"postDisableTooltip": "비활성화하려면 다시 로드",
-	"postDisableMessage": "이 창을 다시 로드하여 '{0}' 확장을 비활성화하시겠습니까?",
-	"postUninstallTooltip": "비활성화하려면 다시 로드",
-	"postUninstallMessage": "이 창을 다시 로드하여 제거된 확장 '{0}'을(를) 비활성화하시겠습니까?",
-	"toggleExtensionsViewlet": "확장 표시",
-	"installExtensions": "확장 설치",
-	"showEnabledExtensions": "사용 확장자 표시",
-	"showInstalledExtensions": "설치된 확장 표시",
-	"showDisabledExtensions": "사용할 수 없는 확장 표시",
-	"clearExtensionsInput": "확장 입력 지우기",
-	"showBuiltInExtensions": "기본 제공 확장 표시",
-	"showOutdatedExtensions": "만료된 확장 표시",
-	"showPopularExtensions": "자주 사용되는 확장 표시",
-	"showRecommendedExtensions": "권장되는 확장 표시",
-	"installWorkspaceRecommendedExtensions": "작업 영역 권장 확장 모두 설치",
-	"allExtensionsInstalled": "이 작업 영역에 권장되는 확장이 모두 이미 설치되었습니다.",
-	"installRecommendedExtension": "권장되는 확장 설치",
-	"extensionInstalled": "권장되는 확장이 이미 설치되어 있습니다.",
-	"showRecommendedKeymapExtensionsShort": "키 맵",
-	"showLanguageExtensionsShort": "언어 확장",
-	"showAzureExtensionsShort": "Azure 확장",
-	"OpenExtensionsFile.failed": "'.vscode' 폴더({0}) 내에 'extensions.json' 파일을 만들 수 없습니다.",
-	"configureWorkspaceRecommendedExtensions": "권장 확장 구성(작업 영역)",
-	"configureWorkspaceFolderRecommendedExtensions": "권장 확장 구성(작업 영역 폴더)",
-	"malicious tooltip": "이 확장은 문제가 있다고 보고되었습니다.",
-	"malicious": "악성",
-	"disabled": "사용 안 함",
-	"disabled globally": "사용 안 함",
-	"disabled workspace": "이 작업 영역에 대해  사용 안 함",
-	"disableAll": "설치된 모든 확장 사용 안 함",
-	"disableAllWorkspace": "이 작업 영역에 대해 설치된 모든 확장 사용 안 함",
-	"enableAll": "모든 확장 사용",
-	"enableAllWorkspace": "이 작업 영역에 대해 모든 확장 사용",
-	"openExtensionsFolder": "Extensions 폴더 열기",
-	"installVSIX": "VSIX에서 설치...",
-	"installFromVSIX": "VSIX에서 설치",
-	"installButton": "설치(&&I)",
-	"InstallVSIXAction.success": "확장이 설치되었습니다. 사용하도록 설정하려면 다시 로드하세요.",
-	"InstallVSIXAction.reloadNow": "지금 다시 로드",
-	"reinstall": "확장 다시 설치...",
-	"selectExtension": "다시 설치할 확장 선택",
-	"ReinstallAction.success": "확장이 설치되었습니다.",
-	"ReinstallAction.reloadNow": "지금 다시 로드",
-	"extensionButtonProminentBackground": "눈에 잘 띄는 작업 확장의 단추 배경색입니다(예: 설치 단추).",
-	"extensionButtonProminentForeground": "눈에 잘 띄는 작업 확장의 단추 전경색입니다(예: 설치 단추).",
-	"extensionButtonProminentHoverBackground": "눈에 잘 띄는 작업 확장의 단추 배경 커서 올리기 색입니다(예: 설치 단추)."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/extensions/browser/extensionsList.i18n.json b/i18n/kor/src/vs/workbench/parts/extensions/browser/extensionsList.i18n.json
deleted file mode 100644
index b2d929577ac..00000000000
--- a/i18n/kor/src/vs/workbench/parts/extensions/browser/extensionsList.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"recommended": "권장"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/extensions/browser/extensionsQuickOpen.i18n.json b/i18n/kor/src/vs/workbench/parts/extensions/browser/extensionsQuickOpen.i18n.json
deleted file mode 100644
index 46f4e3c4fab..00000000000
--- a/i18n/kor/src/vs/workbench/parts/extensions/browser/extensionsQuickOpen.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"manage": "확장을 관리하려면 <Enter> 키를 누르세요.",
-	"notfound": "마켓플레이스에서 '{0}' 확장을 찾을 수 없습니다.",
-	"install": "Marketplace에서 '{0}'을(를) 설치하려면 <Enter> 키를 누르세요.",
-	"searchFor": "마켓플레이스에서 '{0}'을(를) 검색하려면 <Enter> 키를 누르세요.",
-	"noExtensionsToInstall": "확장 이름을 입력하세요."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/extensions/browser/extensionsWidgets.i18n.json b/i18n/kor/src/vs/workbench/parts/extensions/browser/extensionsWidgets.i18n.json
deleted file mode 100644
index b96bcf0427e..00000000000
--- a/i18n/kor/src/vs/workbench/parts/extensions/browser/extensionsWidgets.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"ratedByUsers": "{0}명의 사용자가 등급을 매김",
-	"ratedBySingleUser": "1명의 사용자가 등급을 매김"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/extensions/common/extensionsFileTemplate.i18n.json b/i18n/kor/src/vs/workbench/parts/extensions/common/extensionsFileTemplate.i18n.json
deleted file mode 100644
index 2f22d750754..00000000000
--- a/i18n/kor/src/vs/workbench/parts/extensions/common/extensionsFileTemplate.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"app.extensions.json.title": "확장",
-	"app.extensions.json.recommendations": "확장 권장 목록입니다. 확장의 식별자는 항상 '${publisher}.${name}'입니다. 예: 'vscode.csharp'",
-	"app.extension.identifier.errorMessage": "필요한 형식은 '${publisher}.${name}'입니다. 예: 'vscode.csharp'"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/extensions/common/extensionsInput.i18n.json b/i18n/kor/src/vs/workbench/parts/extensions/common/extensionsInput.i18n.json
deleted file mode 100644
index 468b1594a81..00000000000
--- a/i18n/kor/src/vs/workbench/parts/extensions/common/extensionsInput.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"extensionsInputName": "확장: {0}"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json b/i18n/kor/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
deleted file mode 100644
index 0ba9ae100f9..00000000000
--- a/i18n/kor/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
+++ /dev/null
@@ -1,69 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"name": "확장 이름",
-	"extension id": "확장 ID",
-	"preview": "미리 보기",
-	"builtin": "기본 제공",
-	"publisher": "게시자 이름",
-	"install count": "설치 수",
-	"rating": "등급",
-	"repository": "리포지토리",
-	"license": "라이선스",
-	"details": "세부 정보",
-	"detailstooltip": "확장의 'README.md' 파일에서 렌더링된 확장 세부 정보",
-	"contributions": "기여",
-	"contributionstooltip": "이 확장의 VS Code에 대한 기여 나열",
-	"changelog": "변경 로그",
-	"changelogtooltip": "확장의 'CHANGELOG.md' 파일에서 렌더링된 확장 업데이트 기록",
-	"dependencies": "종속성",
-	"dependenciestooltip": "이 확장이 종속된 확장 나열",
-	"noReadme": "사용 가능한 추가 정보가 없습니다.",
-	"noChangelog": "CHANGELOG를 사용할 수 없습니다.",
-	"noContributions": "참여 없음",
-	"noDependencies": "종속성 없음",
-	"settings": "설정({0})",
-	"setting name": "이름",
-	"description": "설명",
-	"default": "기본값",
-	"debuggers": "디버거({0})",
-	"debugger name": "이름",
-	"debugger type": "유형",
-	"viewContainers": "컨테이너 보기({0})",
-	"view container id": "ID",
-	"view container title": "제목",
-	"view container location": "위치",
-	"views": "뷰({0})",
-	"view id": "ID",
-	"view name": "이름",
-	"view location": "위치",
-	"localizations": "지역화({0})",
-	"localizations language id": "언어 ID",
-	"localizations language name": "언어 이름",
-	"localizations localized language name": "언어 이름(지역화됨)",
-	"colorThemes": "색 테마({0})",
-	"iconThemes": "아이콘 테마({0})",
-	"colors": "색({0})",
-	"colorId": "ID",
-	"defaultDark": "어둡게 기본값",
-	"defaultLight": "밝게 기본값",
-	"defaultHC": "고대비 기본값",
-	"JSON Validation": "JSON 유효성 검사({0})",
-	"fileMatch": "파일 일치",
-	"schema": "스키마",
-	"commands": "명령({0})",
-	"command name": "이름",
-	"keyboard shortcuts": "바로 가기 키(&&K)",
-	"menuContexts": "메뉴 컨텍스트",
-	"languages": "언어({0})",
-	"language id": "ID",
-	"language name": "이름",
-	"file extensions": "파일 확장명",
-	"grammar": "문법",
-	"snippets": "코드 조각"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/extensions/electron-browser/extensionProfileService.i18n.json b/i18n/kor/src/vs/workbench/parts/extensions/electron-browser/extensionProfileService.i18n.json
deleted file mode 100644
index 6ca85821a3c..00000000000
--- a/i18n/kor/src/vs/workbench/parts/extensions/electron-browser/extensionProfileService.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"restart1": "확장 프로파일링",
-	"restart2": "확장을 프로파일링하려면 다시 시작해야 합니다. 지금 '{0}'을(를) 다시 시작하시겠습니까?",
-	"restart3": "다시 시작",
-	"cancel": "취소",
-	"selectAndStartDebug": "프로파일링을 중지하려면 클릭하세요."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json b/i18n/kor/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
deleted file mode 100644
index 7d98f29daa7..00000000000
--- a/i18n/kor/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"neverShowAgain": "다시 표시 안 함",
-	"searchMarketplace": "Marketplace 검색",
-	"dynamicWorkspaceRecommendation": "이 확장은 {0} 리포지토리의 사용자들에게 인기가 있으므로 관심을 가질 만합니다.",
-	"exeBasedRecommendation": "{0}이(가) 설치되어 있으므로 이 확장을 권장합니다.",
-	"fileBasedRecommendation": "최근에 연 파일을 기반으로 확장이 권장됩니다.",
-	"workspaceRecommendation": "이 확장은 현재 작업 영역 사용자가 권장합니다.",
-	"reallyRecommended2": "이 파일 형식에 대해 '{0}' 확장이 권장됩니다.",
-	"reallyRecommendedExtensionPack": "이 파일 형식에 대해 '{0}' 확장 팩이 권장됩니다.",
-	"install": "설치",
-	"showRecommendations": "권장 사항 표시",
-	"showLanguageExtensions": "Marketplace에 '.{0}' 파일이 지원되는 확장이 있습니다.",
-	"workspaceRecommended": "이 작업 영역에 확장 권장 사항이 있습니다.",
-	"installAll": "모두 설치",
-	"ignoreExtensionRecommendations": "확장 권장 사항을 모두 무시하시겠습니까?",
-	"ignoreAll": "예, 모두 무시",
-	"no": "아니요"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/extensions/electron-browser/extensions.contribution.i18n.json b/i18n/kor/src/vs/workbench/parts/extensions/electron-browser/extensions.contribution.i18n.json
deleted file mode 100644
index 6523ae0d7b1..00000000000
--- a/i18n/kor/src/vs/workbench/parts/extensions/electron-browser/extensions.contribution.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"extensionsCommands": "확장 관리",
-	"galleryExtensionsCommands": "갤러리 확장 설치",
-	"extension": "확장",
-	"runtimeExtension": "실행 중인 확장",
-	"extensions": "확장",
-	"view": "보기",
-	"developer": "개발자",
-	"extensionsConfigurationTitle": "확장",
-	"extensionsAutoUpdate": "자동으로 확장 업데이트",
-	"extensionsIgnoreRecommendations": "True로 설정하는 경우 확장 권장 사항에 대한 알림 표시가 중지됩니다.",
-	"extensionsShowRecommendationsOnlyOnDemand": "True로 설정하는 경우 사용자가 특별히 요청하는 경우가 아니면 권장 사항을 가져오거나 표시하지 않습니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.i18n.json b/i18n/kor/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.i18n.json
deleted file mode 100644
index 856397662ef..00000000000
--- a/i18n/kor/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openExtensionsFolder": "Extensions 폴더 열기",
-	"installVSIX": "VSIX에서 설치...",
-	"installFromVSIX": "VSIX에서 설치",
-	"installButton": "설치(&&I)",
-	"InstallVSIXAction.reloadNow": "지금 다시 로드"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/extensions/electron-browser/extensionsUtils.i18n.json b/i18n/kor/src/vs/workbench/parts/extensions/electron-browser/extensionsUtils.i18n.json
deleted file mode 100644
index b4035d78429..00000000000
--- a/i18n/kor/src/vs/workbench/parts/extensions/electron-browser/extensionsUtils.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"disableOtherKeymapsConfirmation": "키 바인딩 간 충돌을 피하기 위해 다른 키 맵({0})을 사용하지 않도록 설정할까요?",
-	"yes": "예",
-	"no": "아니요"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json b/i18n/kor/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
deleted file mode 100644
index 018f63d5c0f..00000000000
--- a/i18n/kor/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"marketPlace": "마켓플레이스",
-	"installedExtensions": "설치됨",
-	"searchInstalledExtensions": "설치됨",
-	"recommendedExtensions": "권장",
-	"otherRecommendedExtensions": "기타 권장 사항",
-	"workspaceRecommendedExtensions": "작업 영역 권장 사항",
-	"builtInExtensions": "기능",
-	"builtInThemesExtensions": "테마",
-	"builtInBasicsExtensions": "프로그래밍 언어",
-	"searchExtensions": "마켓플레이스에서 확장 검색",
-	"sort by installs": "정렬 기준: 설치 수",
-	"sort by rating": "정렬 기준: 등급",
-	"sort by name": "정렬 기준: 이름",
-	"suggestProxyError": "마켓플레이스에서 'ECONNREFUSED'를 반환했습니다. 'http.proxy' 설정을 확인하세요.",
-	"extensions": "확장",
-	"outdatedExtensions": "{0}개의 만료된 확장",
-	"malicious warning": "문제가 있다고 보고된 '{0}'을(를) 제거했습니다.",
-	"reloadNow": "지금 다시 로드"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/extensions/electron-browser/extensionsViews.i18n.json b/i18n/kor/src/vs/workbench/parts/extensions/electron-browser/extensionsViews.i18n.json
deleted file mode 100644
index 5352a8e4e06..00000000000
--- a/i18n/kor/src/vs/workbench/parts/extensions/electron-browser/extensionsViews.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"extensions": "확장",
-	"no extensions found": "확장을 찾을 수 없습니다.",
-	"suggestProxyError": "마켓플레이스에서 'ECONNREFUSED'를 반환했습니다. 'http.proxy' 설정을 확인하세요."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/extensions/electron-browser/keymapExtensions.i18n.json b/i18n/kor/src/vs/workbench/parts/extensions/electron-browser/keymapExtensions.i18n.json
deleted file mode 100644
index 86d18d9fce3..00000000000
--- a/i18n/kor/src/vs/workbench/parts/extensions/electron-browser/keymapExtensions.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"disableOtherKeymapsConfirmation": "키 바인딩 간 충돌을 피하기 위해 다른 키 맵을 사용하지 않도록 설정할까요?",
-	"yes": "예",
-	"no": "아니요"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/extensions/electron-browser/runtimeExtensionsEditor.i18n.json b/i18n/kor/src/vs/workbench/parts/extensions/electron-browser/runtimeExtensionsEditor.i18n.json
deleted file mode 100644
index 3271bfdf63b..00000000000
--- a/i18n/kor/src/vs/workbench/parts/extensions/electron-browser/runtimeExtensionsEditor.i18n.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"starActivation": "시작 시 활성화됨",
-	"workspaceContainsGlobActivation": "{0}과(와) 일치하는 파일이 작업 영역에 있으므로 활성화됨",
-	"workspaceContainsFileActivation": "{0} 파일이 작업 영역에 있으므로 활성화됨",
-	"languageActivation": "{0} 파일을 열었으므로 활성화됨",
-	"workspaceGenericActivation": "{0}에서 활성화됨",
-	"errors": "Catch되지 않은 오류 {0}개",
-	"extensionsInputName": "실행 중인 확장",
-	"showRuntimeExtensions": "실행 중인 확장 표시",
-	"reportExtensionIssue": "문제 보고",
-	"extensionHostProfileStart": "확장 호스트 프로필 시작",
-	"extensionHostProfileStop": "확장 호스트 프로필 중지",
-	"saveExtensionHostProfile": "확장 호스트 프로필 저장"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.i18n.json b/i18n/kor/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.i18n.json
deleted file mode 100644
index 2a348dbd447..00000000000
--- a/i18n/kor/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.i18n.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"installingVSIXExtension": "VSIX에서 확장을 설치하는 중...",
-	"malicious": "이 확장은 문제가 있다고 보고되었습니다.",
-	"installingMarketPlaceExtension": "Marketplace에서 확장을 설치하는 중...",
-	"uninstallingExtension": "확장을 제거하는 중....",
-	"enableDependeciesConfirmation": "확장을 사용하도록 설정하면 종속성도 사용하도록 설정됩니다. 계속하시겠습니까?",
-	"enable": "예",
-	"doNotEnable": "아니요",
-	"disableDependeciesConfirmation": "확장의 종속성도 사용하지 않도록 설정하시겠습니까?",
-	"yes": "예",
-	"no": "아니요",
-	"cancel": "취소",
-	"singleDependentError": "확장 '{0}'을(를) 사용하지 않도록 설정할 수 없습니다. 확장 '{1}'이(가) 이 확장에 종속됩니다.",
-	"twoDependentsError": "확장 '{0}'을(를) 사용하지 않도록 설정할 수 없습니다. 확장 '{1}' 및 '{2}'이(가) 이 확장에 종속됩니다.",
-	"multipleDependentsError": "확장 '{0}'을(를) 사용하지 않도록 설정할 수 없습니다. 확장 '{1}', '{2}' 등이 이 확장에 종속됩니다.",
-	"installConfirmation": "'{0}' 확장을 설치하시겠습니까?",
-	"install": "설치"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json b/i18n/kor/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json
deleted file mode 100644
index a10f2911959..00000000000
--- a/i18n/kor/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"workbenchConfigurationTitle": "워크벤치",
-	"feedbackVisibility": "워크벤치의 아래쪽에 있는 상태 표시줄에 Twitter 피드백(스마일 기호)의 표시 여부를 제어합니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/feedback/electron-browser/feedback.i18n.json b/i18n/kor/src/vs/workbench/parts/feedback/electron-browser/feedback.i18n.json
deleted file mode 100644
index 4dd3a301fb7..00000000000
--- a/i18n/kor/src/vs/workbench/parts/feedback/electron-browser/feedback.i18n.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"sendFeedback": "Tweet 피드백",
-	"label.sendASmile": "피드백을 트윗하세요.",
-	"patchedVersion1": "설치가 손상되었습니다.",
-	"patchedVersion2": "버그를 제출하는 경우 지정하세요.",
-	"sentiment": "사용 소감을 알려주세요.",
-	"smileCaption": "기쁨",
-	"frownCaption": "슬픔",
-	"other ways to contact us": "다른 문의 방법",
-	"submit a bug": "버그 제출",
-	"request a missing feature": "누락된 기능 요청",
-	"tell us why?": "이유를 알려 주세요.",
-	"commentsHeader": "설명",
-	"showFeedback": "상태 표시줄에 피드백 스마일 기호 표시",
-	"tweet": "Tweet",
-	"character left": "남은 문자",
-	"characters left": "남은 문자",
-	"feedbackSending": "보내는 중",
-	"feedbackSent": "감사합니다.",
-	"feedbackSendingError": "다시 시도하세요."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json b/i18n/kor/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json
deleted file mode 100644
index 2831ffe9f70..00000000000
--- a/i18n/kor/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hide": "숨기기"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/files/browser/editors/binaryFileEditor.i18n.json b/i18n/kor/src/vs/workbench/parts/files/browser/editors/binaryFileEditor.i18n.json
deleted file mode 100644
index 5016bc4c698..00000000000
--- a/i18n/kor/src/vs/workbench/parts/files/browser/editors/binaryFileEditor.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"binaryFileEditor": "이진 파일 뷰어"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/files/browser/editors/textFileEditor.i18n.json b/i18n/kor/src/vs/workbench/parts/files/browser/editors/textFileEditor.i18n.json
deleted file mode 100644
index 07dded1ffc9..00000000000
--- a/i18n/kor/src/vs/workbench/parts/files/browser/editors/textFileEditor.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"textFileEditor": "텍스트 파일 편집기",
-	"createFile": "파일 만들기",
-	"relaunchWithIncreasedMemoryLimit": "{0}MB로 다시 시작",
-	"configureMemoryLimit": "메모리 제한 구성",
-	"fileEditorWithInputAriaLabel": "{0}. 텍스트 파일 편집기입니다.",
-	"fileEditorAriaLabel": "텍스트 파일 편집기입니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/files/browser/explorerViewlet.i18n.json b/i18n/kor/src/vs/workbench/parts/files/browser/explorerViewlet.i18n.json
deleted file mode 100644
index 11ed628ff54..00000000000
--- a/i18n/kor/src/vs/workbench/parts/files/browser/explorerViewlet.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"folders": "폴더"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/files/browser/fileActions.contribution.i18n.json b/i18n/kor/src/vs/workbench/parts/files/browser/fileActions.contribution.i18n.json
deleted file mode 100644
index 70dd8169321..00000000000
--- a/i18n/kor/src/vs/workbench/parts/files/browser/fileActions.contribution.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"filesCategory": "파일",
-	"revealInSideBar": "세로 막대에 표시",
-	"acceptLocalChanges": "변경을 적용하고 디스크 콘텐츠 덮어쓰기",
-	"revertLocalChanges": "변경 내용을 취소하고 디스크의 콘텐츠로 되돌리기"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/files/browser/fileActions.i18n.json b/i18n/kor/src/vs/workbench/parts/files/browser/fileActions.i18n.json
deleted file mode 100644
index b962da52ed9..00000000000
--- a/i18n/kor/src/vs/workbench/parts/files/browser/fileActions.i18n.json
+++ /dev/null
@@ -1,73 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"retry": "다시 시도",
-	"rename": "이름 바꾸기",
-	"newFile": "새 파일",
-	"newFolder": "새 폴더",
-	"openFolderFirst": "안에 파일이나 폴더를 만들려면 먼저 폴더를 엽니다.",
-	"newUntitledFile": "제목이 없는 새 파일",
-	"createNewFile": "새 파일",
-	"createNewFolder": "새 폴더",
-	"deleteButtonLabelRecycleBin": "휴지통으로 이동(&&M)",
-	"deleteButtonLabelTrash": "휴지통으로 이동(&&M)",
-	"deleteButtonLabel": "삭제(&&D)",
-	"dirtyMessageFolderOneDelete": "1개 파일에 저장되지 않은 변경 내용이 있는 폴더를 삭제하려고 합니다. 계속하시겠습니까?",
-	"dirtyMessageFolderDelete": "{0}개 파일에 저장되지 않은 변경 내용이 있는 폴더를 삭제하려고 합니다. 계속하시겠습니까?",
-	"dirtyMessageFileDelete": "저장되지 않은 변경 내용이 있는 파일을 삭제하려고 합니다. 계속하시겠습니까?",
-	"dirtyWarning": "변경 내용을 저장하지 않은 경우 변경 내용이 손실됩니다.",
-	"confirmMoveTrashMessageFolder": "'{0}'과(와) 해당 내용을 삭제할까요?",
-	"confirmMoveTrashMessageFile": "'{0}'을(를) 삭제할까요?",
-	"undoBin": "휴지통에서 복원할 수 있습니다.",
-	"undoTrash": "휴지통에서 복원할 수 있습니다.",
-	"doNotAskAgain": "이 메시지를 다시 표시 안 함",
-	"confirmDeleteMessageFolder": "'{0}'과(와) 해당 내용을 영구히 삭제할까요?",
-	"confirmDeleteMessageFile": "'{0}'을(를) 영구히 삭제할까요?",
-	"irreversible": "이 작업은 취소할 수 없습니다.",
-	"permDelete": "영구히 삭제",
-	"delete": "삭제",
-	"importFiles": "파일 가져오기",
-	"confirmOverwrite": "이름이 같은 파일 또는 폴더가 대상 폴더에 이미 있습니다. 덮어쓸까요?",
-	"replaceButtonLabel": "바꾸기(&&R)",
-	"copyFile": "복사",
-	"pasteFile": "붙여넣기",
-	"duplicateFile": "중복",
-	"openToSide": "측면에서 열기",
-	"compareSource": "비교를 위해 선택",
-	"globalCompareFile": "활성 파일을 다음과 비교...",
-	"openFileToCompare": "첫 번째 파일을 열어서 다른 파일과 비교합니다.",
-	"compareWith": "'{0}'과(와) '{1}' 비교",
-	"compareFiles": "파일 비교",
-	"refresh": "새로 고침",
-	"save": "저장",
-	"saveAs": "다른 이름으로 저장...",
-	"saveAll": "모두 저장",
-	"saveAllInGroup": "그룹의 모든 항목 저장",
-	"saveFiles": "파일 모두 저장",
-	"revert": "파일 되돌리기",
-	"focusOpenEditors": "열려 있는 편집기 뷰에 포커스",
-	"focusFilesExplorer": "파일 탐색기에 포커스",
-	"showInExplorer": "세로 막대에서 활성 파일 표시",
-	"openFileToShow": "탐색기에 표시하려면 먼저 파일을 엽니다.",
-	"collapseExplorerFolders": "탐색기에서 폴더 축소",
-	"refreshExplorer": "탐색기 새로 고침",
-	"openFileInNewWindow": "새 창에서 활성 파일 열기",
-	"openFileToShowInNewWindow": "먼저 파일 한 개를 새 창에서 엽니다.",
-	"revealInWindows": "탐색기에 표시",
-	"revealInMac": "Finder에 표시",
-	"openContainer": "상위 폴더 열기",
-	"revealActiveFileInWindows": "Windows 탐색기에 활성 파일 표시",
-	"revealActiveFileInMac": "Finder에 활성 파일 표시",
-	"openActiveFileContainer": "활성 파일의 상위 폴더 열기",
-	"copyPath": "경로 복사",
-	"copyPathOfActive": "활성 파일의 경로 복사",
-	"emptyFileNameError": "파일 또는 폴더 이름을 입력해야 합니다.",
-	"fileNameExistsError": "파일 또는 폴더 **{0}**이(가) 이 위치에 이미 있습니다. 다른 이름을 선택하세요.",
-	"invalidFileNameError": "**{0}**(이)라는 이름은 파일 또는 폴더 이름으로 올바르지 않습니다. 다른 이름을 선택하세요.",
-	"filePathTooLongError": "**{0}**(이)라는 이름을 사용하면 경로가 너무 길어집니다. 짧은 이름을 선택하세요.",
-	"compareWithSaved": "활성 파일을 저장된 파일과 비교",
-	"modifiedLabel": "{0}(디스크) ↔ {1}"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/files/browser/fileCommands.i18n.json b/i18n/kor/src/vs/workbench/parts/files/browser/fileCommands.i18n.json
deleted file mode 100644
index f77f75c5013..00000000000
--- a/i18n/kor/src/vs/workbench/parts/files/browser/fileCommands.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"openFileToCopy": "첫 번째 파일을 열어서 경로를 복사합니다.",
-	"openFileToReveal": "첫 번째 파일을 열어서 나타냅니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/files/browser/files.contribution.i18n.json b/i18n/kor/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
deleted file mode 100644
index 64e3a748c1d..00000000000
--- a/i18n/kor/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
+++ /dev/null
@@ -1,53 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"showExplorerViewlet": "탐색기 표시",
-	"explore": "탐색기",
-	"view": "보기",
-	"textFileEditor": "텍스트 파일 편집기",
-	"binaryFileEditor": "이진 파일 편집기",
-	"filesConfigurationTitle": "파일",
-	"exclude": "파일 및 폴더를 제외하도록 GLOB 패턴을 구성합니다. 예를 들어 파일 탐색기는 이 설정에 따라 표시하거나 숨길 파일 및 폴더를 결정합니다.",
-	"files.exclude.boolean": "파일 경로를 일치시킬 GLOB 패턴입니다. 패턴을 사용하거나 사용하지 않도록 설정하려면 true 또는 false로 설정하세요.",
-	"files.exclude.when": "일치하는 파일의 형제에 대한 추가 검사입니다. $(basename)을 일치하는 파일 이름에 대한 변수로 사용하세요.",
-	"associations": "파일과 언어의 연결을 구성하세요(예: \"*.extension\": \"html\"). 이러한 구성은 설치된 언어의 기본 연결보다 우선 순위가 높습니다.",
-	"encoding": "파일을 읽고 쓸 때 사용할 기본 문자 집합 인코딩입니다. 이 설정은 언어별로 구성할 수도 있습니다.",
-	"autoGuessEncoding": "사용하도록 설정하는 경우 파일을 열 때 문자 집합 인코딩을 추측합니다. 이 설정은 언어별로 구성할 수도 있습니다.",
-	"eol": "줄 바꿈 문자의 기본 끝입니다. LF에는 \\n, CRLF에는 \\r\\n을 사용하세요.",
-	"trimTrailingWhitespace": "사용하도록 설정되면 파일을 저장할 때 후행 공백이 잘립니다.",
-	"insertFinalNewline": "사용하도록 설정되면 저장할 때 파일 끝에 마지막 줄바꿈을 삽입합니다.",
-	"trimFinalNewlines": "사용하도록 설정되면 저장할 때 파일 끝에 마지막 줄 바꿈 이후의 모든 줄 바꿈이 잘립니다.",
-	"files.autoSave.off": "더티 파일이 자동으로 저장되지 않습니다.",
-	"files.autoSave.afterDelay": "'files.autoSaveDelay' 구성 후 더티 파일이 자동으로 저장됩니다.",
-	"files.autoSave.onFocusChange": "편집기가 포커스를 잃으면 더티 파일이 자동으로 저장됩니다.",
-	"files.autoSave.onWindowChange": "창이 포커스를 잃으면 더티 파일이 자동으로 저장됩니다.",
-	"autoSave": "더티 파일 자동 저장을 제어합니다. 허용되는 값은 '{0}', '{1}', '{2}'(편집기가 포커스를 잃음), '{3}'(창이 포커스를 잃음)입니다. '{4}'(으)로 설정하는 경우 'files.autoSaveDelay'에서 지연을 구성할 수 있습니다.",
-	"autoSaveDelay": "더티 파일을 자동으로 저장할 때까지의 지연(밀리초)을 제어합니다. 'files.autoSave'를 '{0}'(으)로 설정한 경우에만 적용됩니다.",
-	"watcherExclude": "파일 감시에서 제외할 파일 경로의 GLOB 패턴을 구성하세요. 패턴은 절대 경로(**접두사가 있는 경로 또는 전체 경로)여야 합니다. 이 설정을 변경하려면 다시 시작해야 합니다. 시작 시 Code에서 CPU 시간을 많이 차지하면 대용량 폴더를 제외하여 초기 로드를 줄일 수 있습니다.",
-	"hotExit.off": "핫 종료를 사용하지 않습니다.",
-	"hotExit.onExit": "핫 종료는 응용 프로그램을 닫을 때 트리거됩니다. 즉 Windows/Linux에서 마지막 창을 닫을 때나 workbench.action.quit 명령이 트리거될 때(명령 팔레트, 키 바인딩, 메뉴)입니다. 다음 실행 시 백업을 포함한 모든 창이 복원됩니다.",
-	"hotExit.onExitAndWindowClose": "핫 종료는 응용 프로그램을 닫을 때 트리거됩니다. 즉 Windows/Linux에서 마지막 창을 닫을 때나 workbench.action.quit 명령이 트리거될 때(명령 팔레트, 키 바인딩, 메뉴), 또한 마지막 창인지 여부에 상관없이 폴더가 열린 모든 창의 경우입니다. 열린 폴더가 없는 모든 창은 다음 실행 시 복원됩니다. 종료되기 전 상태로 폴더 창을 복원하려면 \"window.restoreWindows\"를 \"all\"로 설정합니다.",
-	"hotExit": "저장하지 않은 파일을 세션 간에 기억하여, 편집기를 종료할 때 저장할지 묻는 메시지를 건너뛸지 여부를 제어합니다.",
-	"useExperimentalFileWatcher": "새로운 실험 파일 감시자를 사용하세요.",
-	"defaultLanguage": "새 파일에 할당되는 기본 언어 모드입니다.",
-	"editorConfigurationTitle": "편집기",
-	"formatOnSave": "파일 저장 시 서식을 지정합니다. 포맷터를 사용할 수 있어야 하며, 파일이 자동으로 저장되지 않아야 하고, 편집기가 종료되지 않아야 합니다.",
-	"explorerConfigurationTitle": "파일 탐색기",
-	"openEditorsVisible": "열려 있는 편집기 창에 표시되는 편집기 수입니다. 창을 숨기려면 0으로 설정합니다.",
-	"dynamicHeight": "열려 있는 편집기 섹션의 높이가 요소 수에 따라 동적으로 조정되는지 여부를 제어합니다.",
-	"autoReveal": "탐색기에서 파일을 열 때 자동으로 표시하고 선택할지를 제어합니다.",
-	"enableDragAndDrop": "탐색기에서 끌어서 놓기를 통한 파일 및 폴더 이동을 허용하는지를 제어합니다.",
-	"confirmDragAndDrop": "끌어서 놓기를 사용하여 파일 및 폴더를 이동하기 위해 탐색기에서 확인을 요청해야 하는지 제어합니다.",
-	"confirmDelete": "파일을 휴지통에서 삭제할 때 탐색기에서 확인을 요청해야 하는지 제어합니다.",
-	"sortOrder.default": "파일 및 폴더가 이름을 기준으로 사전순으로 정렬됩니다. 폴더가 파일 앞에 표시됩니다.",
-	"sortOrder.mixed": "파일 및 폴더가 이름을 기준으로 사전순으로 정렬됩니다. 파일이 폴더와 결합됩니다.",
-	"sortOrder.filesFirst": "파일 및 폴더가 이름을 기준으로 사전순으로 정렬됩니다. 파일이 폴더 앞에 표시됩니다.",
-	"sortOrder.type": "파일 및 폴더가 확장명을 기준으로 사전순으로 정렬됩니다. 폴더가 파일 앞에 표시됩니다.",
-	"sortOrder.modified": "파일 및 폴더가 마지막으로 수정한 날짜를 기준으로 내림차순 정렬됩니다. 폴더가 파일 앞에 표시됩니다.",
-	"sortOrder": "탐색기에서 파일 및 폴더의 정렬 순서를 제어합니다. 기본 정렬 외에 순서를 'mixed'(파일 및 폴더가 결합되어 정렬), 'type'(파일 형식 기준), 'modified'(마지막으로 수정한 날짜 기준) 또는 'filesFirst'(파일을 폴더 앞에 정렬)로 설정할 수 있습니다.",
-	"explorer.decorations.colors": "파일 장식에 색을 사용해야 하는지 제어합니다.",
-	"explorer.decorations.badges": "파일 장식에 배지를 사용해야 하는지 제어합니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/files/browser/saveErrorHandler.i18n.json b/i18n/kor/src/vs/workbench/parts/files/browser/saveErrorHandler.i18n.json
deleted file mode 100644
index 6cf353ae712..00000000000
--- a/i18n/kor/src/vs/workbench/parts/files/browser/saveErrorHandler.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"userGuide": "오른쪽 편집기 도구 모음의 작업을 사용하여 변경 내용을 **실행 취소**하거나 디스크의 콘텐츠를 변경 내용으로 **덮어쓰기**",
-	"discard": "삭제",
-	"overwrite": "덮어쓰기",
-	"retry": "다시 시도",
-	"readonlySaveError": "'{0}'을(를) 저장하지 못했습니다. 파일이 쓰기 보호되어 있습니다. 보호를 제거하려면 '덮어쓰기'를 선택하세요.",
-	"genericSaveError": "'{0}'을(를) 저장하지 못했습니다. {1}",
-	"staleSaveError": "'{0}'을(를) 저장하지 못했습니다. 디스크의 내용이 최신 버전입니다. 버전을 디스크에 있는 버전과 비교하려면 **비교**를 클릭하세요.",
-	"compareChanges": "비교",
-	"saveConflictDiffLabel": "{0}(디스크에 있음) ↔ {1}({2}에 있음) - 저장 충돌 해결"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/files/browser/views/emptyView.i18n.json b/i18n/kor/src/vs/workbench/parts/files/browser/views/emptyView.i18n.json
deleted file mode 100644
index 639701925b4..00000000000
--- a/i18n/kor/src/vs/workbench/parts/files/browser/views/emptyView.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"noWorkspace": "열린 폴더 없음",
-	"explorerSection": "파일 탐색기 섹션",
-	"noWorkspaceHelp": "작업 영역에 아직 폴더를 추가하지 않았습니다.",
-	"addFolder": "폴더 추가",
-	"noFolderHelp": "아직 폴더를 열지 않았습니다.",
-	"openFolder": "폴더 열기"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/files/browser/views/explorerDecorationsProvider.i18n.json b/i18n/kor/src/vs/workbench/parts/files/browser/views/explorerDecorationsProvider.i18n.json
deleted file mode 100644
index 89eb88bfbfe..00000000000
--- a/i18n/kor/src/vs/workbench/parts/files/browser/views/explorerDecorationsProvider.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"label": "탐색기",
-	"canNotResolve": "작업 영역 폴더를 확인할 수 없습니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/files/browser/views/explorerView.i18n.json b/i18n/kor/src/vs/workbench/parts/files/browser/views/explorerView.i18n.json
deleted file mode 100644
index e98c63b21c8..00000000000
--- a/i18n/kor/src/vs/workbench/parts/files/browser/views/explorerView.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"explorerSection": "파일 탐색기 섹션",
-	"treeAriaLabel": "파일 탐색기"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/files/browser/views/explorerViewer.i18n.json b/i18n/kor/src/vs/workbench/parts/files/browser/views/explorerViewer.i18n.json
deleted file mode 100644
index 249d7018e6a..00000000000
--- a/i18n/kor/src/vs/workbench/parts/files/browser/views/explorerViewer.i18n.json
+++ /dev/null
@@ -1,19 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"fileInputAriaLabel": "파일 이름을 입력합니다. 확인하려면 Enter 키를 누르고, 취소하려면 Esc 키를 누릅니다.",
-	"filesExplorerViewerAriaLabel": "{0}, 파일 탐색기",
-	"dropFolders": "작업 영역에 폴더를 추가하시겠습니까?",
-	"dropFolder": "작업 영역에 폴더를 추가하시겠습니까?",
-	"addFolders": "폴더 추가(&&A)",
-	"addFolder": "폴더 추가(&&A)",
-	"confirmMove": "'{0}'을(를) 이동하시겠습니까?",
-	"doNotAskAgain": "이 메시지를 다시 표시 안 함",
-	"moveButtonLabel": "이동(&&M)",
-	"confirmOverwriteMessage": "'{0}'이(가) 대상 폴더에 이미 있습니다. 바꿀까요?",
-	"irreversible": "이 작업은 취소할 수 없습니다.",
-	"replaceButtonLabel": "바꾸기(&&R)"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/files/browser/views/openEditorsView.i18n.json b/i18n/kor/src/vs/workbench/parts/files/browser/views/openEditorsView.i18n.json
deleted file mode 100644
index cb51b565b31..00000000000
--- a/i18n/kor/src/vs/workbench/parts/files/browser/views/openEditorsView.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"openEditors": "열려 있는 편집기",
-	"openEditosrSection": "열려 있는 편집기 섹션",
-	"treeAriaLabel": "열린 편집기: 활성 파일 목록",
-	"dirtyCounter": "{0}이(가) 저장되지 않음"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/files/browser/views/openEditorsViewer.i18n.json b/i18n/kor/src/vs/workbench/parts/files/browser/views/openEditorsViewer.i18n.json
deleted file mode 100644
index 54e2599b3f7..00000000000
--- a/i18n/kor/src/vs/workbench/parts/files/browser/views/openEditorsViewer.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"editorGroupAriaLabel": "{0}, 편집기 그룹",
-	"openEditorAriaLabel": "{0}, 편집기 열기",
-	"saveAll": "모두 저장",
-	"closeAllUnmodified": "수정되지 않은 항목 닫기",
-	"closeAll": "모두 닫기",
-	"compareWithSaved": "저장된 항목과 비교",
-	"close": "닫기",
-	"closeOthers": "기타 항목 닫기"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/files/common/dirtyFilesTracker.i18n.json b/i18n/kor/src/vs/workbench/parts/files/common/dirtyFilesTracker.i18n.json
deleted file mode 100644
index 3bf1d80fbbb..00000000000
--- a/i18n/kor/src/vs/workbench/parts/files/common/dirtyFilesTracker.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"dirtyFile": "저장되지 않은 파일 1개",
-	"dirtyFiles": "{0}개의 저장되지 않은 파일"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/files/common/editors/fileEditorInput.i18n.json b/i18n/kor/src/vs/workbench/parts/files/common/editors/fileEditorInput.i18n.json
deleted file mode 100644
index a6f396bbe8c..00000000000
--- a/i18n/kor/src/vs/workbench/parts/files/common/editors/fileEditorInput.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"orphanedFile": "{0} (deleted from disk)"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/files/electron-browser/explorerViewlet.i18n.json b/i18n/kor/src/vs/workbench/parts/files/electron-browser/explorerViewlet.i18n.json
deleted file mode 100644
index 3a14383052c..00000000000
--- a/i18n/kor/src/vs/workbench/parts/files/electron-browser/explorerViewlet.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"folders": "폴더"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json b/i18n/kor/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
deleted file mode 100644
index 42cc77c6edf..00000000000
--- a/i18n/kor/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"filesCategory": "파일",
-	"revealInSideBar": "세로 막대에 표시",
-	"acceptLocalChanges": "변경을 적용하고 디스크 콘텐츠 덮어쓰기",
-	"revertLocalChanges": "변경 내용을 취소하고 디스크의 콘텐츠로 되돌리기",
-	"copyPathOfActive": "활성 파일의 경로 복사",
-	"saveAllInGroup": "그룹의 모든 항목 저장",
-	"saveFiles": "파일 모두 저장",
-	"revert": "파일 되돌리기",
-	"compareActiveWithSaved": "활성 파일을 저장된 파일과 비교",
-	"closeEditor": "편집기 닫기",
-	"view": "보기",
-	"openToSide": "측면에서 열기",
-	"revealInWindows": "탐색기에 표시",
-	"revealInMac": "Finder에 표시",
-	"openContainer": "상위 폴더 열기",
-	"copyPath": "경로 복사",
-	"saveAll": "모두 저장",
-	"compareWithSaved": "저장된 항목과 비교",
-	"compareWithSelected": "선택한 항목과 비교",
-	"compareSource": "비교를 위해 선택",
-	"compareSelected": "선택 항목 비교",
-	"close": "닫기",
-	"closeOthers": "기타 항목 닫기",
-	"closeSaved": "저장된 항목 닫기",
-	"closeAll": "모두 닫기",
-	"deleteFile": "영구히 삭제"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json b/i18n/kor/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
deleted file mode 100644
index 3bf77a27ac7..00000000000
--- a/i18n/kor/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
+++ /dev/null
@@ -1,72 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"newFile": "새 파일",
-	"newFolder": "새 폴더",
-	"rename": "이름 바꾸기",
-	"delete": "삭제",
-	"copyFile": "복사",
-	"pasteFile": "붙여넣기",
-	"retry": "다시 시도",
-	"renameWhenSourcePathIsParentOfTargetError": "'새 폴더' 또는 '새 파일' 명령을 사용하여 기존 폴더에 자식을 추가하세요.",
-	"newUntitledFile": "제목이 없는 새 파일",
-	"createNewFile": "새 파일",
-	"createNewFolder": "새 폴더",
-	"deleteButtonLabelRecycleBin": "휴지통으로 이동(&&M)",
-	"deleteButtonLabelTrash": "휴지통으로 이동(&&M)",
-	"deleteButtonLabel": "삭제(&&D)",
-	"dirtyMessageFilesDelete": "저장되지 않은 변경 내용이 있는 파일을 삭제하려고 합니다. 계속하시겠습니까?",
-	"dirtyMessageFolderOneDelete": "1개 파일에 저장되지 않은 변경 내용이 있는 폴더를 삭제하려고 합니다. 계속하시겠습니까?",
-	"dirtyMessageFolderDelete": "{0}개 파일에 저장되지 않은 변경 내용이 있는 폴더를 삭제하려고 합니다. 계속하시겠습니까?",
-	"dirtyMessageFileDelete": "저장되지 않은 변경 내용이 있는 파일을 삭제하려고 합니다. 계속하시겠습니까?",
-	"dirtyWarning": "변경 내용을 저장하지 않은 경우 변경 내용이 손실됩니다.",
-	"undoBin": "휴지통에서 복원할 수 있습니다.",
-	"undoTrash": "휴지통에서 복원할 수 있습니다.",
-	"doNotAskAgain": "이 메시지를 다시 표시 안 함",
-	"irreversible": "이 작업은 취소할 수 없습니다.",
-	"binFailed": "휴지통을 사용하여 삭제하지 못했습니다. 대신 영구히 삭제하시겠습니까?",
-	"trashFailed": "휴지통을 사용하여 삭제하지 못했습니다. 대신 영구히 삭제하시겠습니까?",
-	"deletePermanentlyButtonLabel": "영구 삭제 (&&D)",
-	"retryButtonLabel": "다시 시도 (&&R)",
-	"confirmMoveTrashMessageFilesAndDirectories": "다음 {0}개 파일/디렉터리 및 해당 내용을 삭제하시겠습니까?",
-	"confirmMoveTrashMessageMultipleDirectories": "다음 {0}개 디렉터리 및 해당 내용을 삭제하시겠습니까?",
-	"confirmMoveTrashMessageMultiple": "다음 {0}개 파일을 삭제하시겠습니까?",
-	"confirmMoveTrashMessageFolder": "'{0}'과(와) 해당 내용을 삭제할까요?",
-	"confirmMoveTrashMessageFile": "'{0}'을(를) 삭제할까요?",
-	"confirmDeleteMessageFilesAndDirectories": "다음 {0}개 파일/디렉터리 및 해당 내용을 영구히 삭제하시겠습니까?",
-	"confirmDeleteMessageMultipleDirectories": "다음 {0}개 디렉터리 및 해당 내용을 영구히 삭제하시겠습니까?",
-	"confirmDeleteMessageMultiple": "다음 {0}개 파일을 영구히 삭제하시겠습니까?",
-	"confirmDeleteMessageFolder": "'{0}'과(와) 해당 내용을 영구히 삭제할까요?",
-	"confirmDeleteMessageFile": "'{0}'을(를) 영구히 삭제할까요?",
-	"addFiles": "파일 추가",
-	"confirmOverwrite": "이름이 같은 파일 또는 폴더가 대상 폴더에 이미 있습니다. 덮어쓸까요?",
-	"replaceButtonLabel": "바꾸기(&&R)",
-	"fileIsAncestor": "붙여 넣을 파일이 대상 폴더의 상위 항목입니다.",
-	"fileDeleted": "그동안 붙여 넣을 파일이 삭제되거나 이동되었습니다.",
-	"duplicateFile": "중복",
-	"globalCompareFile": "활성 파일을 다음과 비교...",
-	"openFileToCompare": "첫 번째 파일을 열어서 다른 파일과 비교합니다.",
-	"refresh": "새로 고침",
-	"saveAllInGroup": "그룹의 모든 항목 저장",
-	"focusOpenEditors": "열려 있는 편집기 뷰에 포커스",
-	"focusFilesExplorer": "파일 탐색기에 포커스",
-	"showInExplorer": "세로 막대에서 활성 파일 표시",
-	"openFileToShow": "탐색기에 표시하려면 먼저 파일을 엽니다.",
-	"collapseExplorerFolders": "탐색기에서 폴더 축소",
-	"refreshExplorer": "탐색기 새로 고침",
-	"openFileInNewWindow": "새 창에서 활성 파일 열기",
-	"openFileToShowInNewWindow": "먼저 파일 한 개를 새 창에서 엽니다.",
-	"copyPath": "경로 복사",
-	"emptyFileNameError": "파일 또는 폴더 이름을 입력해야 합니다.",
-	"fileNameStartsWithSlashError": "파일 또는 폴더 이름은 슬래시로 시작할 수 없습니다.",
-	"fileNameExistsError": "파일 또는 폴더 **{0}**이(가) 이 위치에 이미 있습니다. 다른 이름을 선택하세요.",
-	"invalidFileNameError": "**{0}**(이)라는 이름은 파일 또는 폴더 이름으로 올바르지 않습니다. 다른 이름을 선택하세요.",
-	"filePathTooLongError": "**{0}**(이)라는 이름을 사용하면 경로가 너무 길어집니다. 짧은 이름을 선택하세요.",
-	"compareWithClipboard": "클립보드와 활성 파일 비교",
-	"clipboardComparisonLabel": "클립보드 ↔ {0}"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json b/i18n/kor/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
deleted file mode 100644
index 8c22f8027cd..00000000000
--- a/i18n/kor/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"revealInWindows": "탐색기에 표시",
-	"revealInMac": "Finder에 표시",
-	"openContainer": "상위 폴더 열기",
-	"saveAs": "다른 이름으로 저장...",
-	"save": "저장",
-	"saveAll": "모두 저장",
-	"removeFolderFromWorkspace": "작업 영역에서 폴더 삭제",
-	"genericRevertError": "'{0}' 되돌리기 실패: {1}",
-	"modifiedLabel": "{0}(디스크) ↔ {1}",
-	"openFileToReveal": "첫 번째 파일을 열어서 나타냅니다.",
-	"openFileToCopy": "첫 번째 파일을 열어서 경로를 복사합니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json b/i18n/kor/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
deleted file mode 100644
index 86c9a7c9d2e..00000000000
--- a/i18n/kor/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"showExplorerViewlet": "탐색기 표시",
-	"explore": "탐색기",
-	"view": "보기",
-	"textFileEditor": "텍스트 파일 편집기",
-	"binaryFileEditor": "이진 파일 편집기",
-	"filesConfigurationTitle": "파일",
-	"exclude": "파일 및 폴더를 제외하도록 GLOB 패턴을 구성합니다. 예를 들어 파일 탐색기는 이 설정에 따라 표시하거나 숨길 파일 및 폴더를 결정합니다.",
-	"files.exclude.boolean": "파일 경로를 일치시킬 GLOB 패턴입니다. 패턴을 사용하거나 사용하지 않도록 설정하려면 true 또는 false로 설정하세요.",
-	"files.exclude.when": "일치하는 파일의 형제에 대한 추가 검사입니다. $(basename)을 일치하는 파일 이름에 대한 변수로 사용하세요.",
-	"associations": "파일과 언어의 연결을 구성하세요(예: \"*.extension\": \"html\"). 이러한 구성은 설치된 언어의 기본 연결보다 우선 순위가 높습니다.",
-	"encoding": "파일을 읽고 쓸 때 사용할 기본 문자 집합 인코딩입니다. 이 설정은 언어별로 구성할 수도 있습니다.",
-	"autoGuessEncoding": "사용하도록 설정하는 경우 파일을 열 때 문자 집합 인코딩을 추측합니다. 이 설정은 언어별로 구성할 수도 있습니다.",
-	"eol": "줄 바꿈 문자의 기본 끝입니다. LF에는 \\n, CRLF에는 \\r\\n을 사용하세요.",
-	"trimTrailingWhitespace": "사용하도록 설정되면 파일을 저장할 때 후행 공백이 잘립니다.",
-	"insertFinalNewline": "사용하도록 설정되면 저장할 때 파일 끝에 마지막 줄바꿈을 삽입합니다.",
-	"trimFinalNewlines": "사용하도록 설정되면 저장할 때 파일 끝에 마지막 줄 바꿈 이후의 모든 줄 바꿈이 잘립니다.",
-	"files.autoSave.off": "더티 파일이 자동으로 저장되지 않습니다.",
-	"files.autoSave.afterDelay": "'files.autoSaveDelay' 구성 후 더티 파일이 자동으로 저장됩니다.",
-	"files.autoSave.onFocusChange": "편집기가 포커스를 잃으면 더티 파일이 자동으로 저장됩니다.",
-	"files.autoSave.onWindowChange": "창이 포커스를 잃으면 더티 파일이 자동으로 저장됩니다.",
-	"autoSave": "더티 파일 자동 저장을 제어합니다. 허용되는 값은 '{0}', '{1}', '{2}'(편집기가 포커스를 잃음), '{3}'(창이 포커스를 잃음)입니다. '{4}'(으)로 설정하는 경우 'files.autoSaveDelay'에서 지연을 구성할 수 있습니다.",
-	"autoSaveDelay": "더티 파일을 자동으로 저장할 때까지의 지연(밀리초)을 제어합니다. 'files.autoSave'를 '{0}'(으)로 설정한 경우에만 적용됩니다.",
-	"watcherExclude": "파일 감시에서 제외할 파일 경로의 GLOB 패턴을 구성하세요. 패턴은 절대 경로(**접두사가 있는 경로 또는 전체 경로)여야 합니다. 이 설정을 변경하려면 다시 시작해야 합니다. 시작 시 Code에서 CPU 시간을 많이 차지하면 대용량 폴더를 제외하여 초기 로드를 줄일 수 있습니다.",
-	"hotExit.off": "핫 종료를 사용하지 않습니다.",
-	"hotExit.onExit": "핫 종료는 응용 프로그램을 닫을 때 트리거됩니다. 즉 Windows/Linux에서 마지막 창을 닫을 때나 workbench.action.quit 명령이 트리거될 때(명령 팔레트, 키 바인딩, 메뉴)입니다. 다음 실행 시 백업을 포함한 모든 창이 복원됩니다.",
-	"hotExit.onExitAndWindowClose": "핫 종료는 응용 프로그램을 닫을 때 트리거됩니다. 즉 Windows/Linux에서 마지막 창을 닫을 때나 workbench.action.quit 명령이 트리거될 때(명령 팔레트, 키 바인딩, 메뉴), 또한 마지막 창인지 여부에 상관없이 폴더가 열린 모든 창의 경우입니다. 열린 폴더가 없는 모든 창은 다음 실행 시 복원됩니다. 종료되기 전 상태로 폴더 창을 복원하려면 \"window.restoreWindows\"를 \"all\"로 설정합니다.",
-	"hotExit": "저장하지 않은 파일을 세션 간에 기억하여, 편집기를 종료할 때 저장할지 묻는 메시지를 건너뛸지 여부를 제어합니다.",
-	"useExperimentalFileWatcher": "새로운 실험 파일 감시자를 사용하세요.",
-	"defaultLanguage": "새 파일에 할당되는 기본 언어 모드입니다.",
-	"maxMemoryForLargeFilesMB": "큰 파일을 열려고 할 때 다시 시작한 후 VS Code에 사용 가능한 메모리를 제어합니다. 명령줄에 --max-memory=NEWSIZE를 지정하는 것과 결과가 같습니다. ",
-	"editorConfigurationTitle": "편집기",
-	"formatOnSave": "파일 저장 시 서식을 지정합니다. 포맷터를 사용할 수 있어야 하며, 파일이 자동으로 저장되지 않아야 하고, 편집기가 종료되지 않아야 합니다.",
-	"formatOnSaveTimeout": "저장 시 서식 지정의 시간 제한. FormatOnSave 명령에 대한 시간 제한을 밀리초로 지정합니다. 지정된 시간 제한보다 오래 걸리는 명령은 취소됩니다.",
-	"explorerConfigurationTitle": "파일 탐색기",
-	"openEditorsVisible": "열려 있는 편집기 창에 표시되는 편집기 수입니다.",
-	"autoReveal": "탐색기에서 파일을 열 때 자동으로 표시하고 선택할지를 제어합니다.",
-	"enableDragAndDrop": "탐색기에서 끌어서 놓기를 통한 파일 및 폴더 이동을 허용하는지를 제어합니다.",
-	"confirmDragAndDrop": "끌어서 놓기를 사용하여 파일 및 폴더를 이동하기 위해 탐색기에서 확인을 요청해야 하는지 제어합니다.",
-	"confirmDelete": "파일을 휴지통에서 삭제할 때 탐색기에서 확인을 요청해야 하는지 제어합니다.",
-	"sortOrder.default": "파일 및 폴더가 이름을 기준으로 사전순으로 정렬됩니다. 폴더가 파일 앞에 표시됩니다.",
-	"sortOrder.mixed": "파일 및 폴더가 이름을 기준으로 사전순으로 정렬됩니다. 파일이 폴더와 결합됩니다.",
-	"sortOrder.filesFirst": "파일 및 폴더가 이름을 기준으로 사전순으로 정렬됩니다. 파일이 폴더 앞에 표시됩니다.",
-	"sortOrder.type": "파일 및 폴더가 확장명을 기준으로 사전순으로 정렬됩니다. 폴더가 파일 앞에 표시됩니다.",
-	"sortOrder.modified": "파일 및 폴더가 마지막으로 수정한 날짜를 기준으로 내림차순 정렬됩니다. 폴더가 파일 앞에 표시됩니다.",
-	"sortOrder": "탐색기에서 파일 및 폴더의 정렬 순서를 제어합니다. 기본 정렬 외에 순서를 'mixed'(파일 및 폴더가 결합되어 정렬), 'type'(파일 형식 기준), 'modified'(마지막으로 수정한 날짜 기준) 또는 'filesFirst'(파일을 폴더 앞에 정렬)로 설정할 수 있습니다.",
-	"explorer.decorations.colors": "파일 장식에 색을 사용해야 하는지 제어합니다.",
-	"explorer.decorations.badges": "파일 장식에 배지를 사용해야 하는지 제어합니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json b/i18n/kor/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json
deleted file mode 100644
index b2bb3346a0a..00000000000
--- a/i18n/kor/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"userGuide": "편집기 도구 모음의 작업을 사용하여 변경 내용을 실행 취소하거나 디스크의 콘텐츠를 변경 내용으로 덮어쓰세요.",
-	"staleSaveError": "'{0}'을(를) 저장하지 못했습니다. 디스크의 내용이 최신 버전입니다. 버전을 디스크에 있는 버전과 비교하하세요.",
-	"retry": "다시 시도",
-	"discard": "삭제",
-	"readonlySaveErrorAdmin": "'{0}' 저장 실패: 파일이 쓰기 보호되어 있습니다. 관리자로 다시 시도하려면 '관리자로 덮어쓰기'를 선택하세요.",
-	"readonlySaveError": "'{0}' 저장 실패: 파일이 쓰기 보호되어 있습니다. 보호를 제거하려면 '덮어쓰기'를 선택하세요.",
-	"permissionDeniedSaveError": "저장 실패 '{0}': 권한 부족. 관리자로 다시 시도하려면 '관리자로 다시 시도'를 선택하세요.",
-	"genericSaveError": "'{0}'을(를) 저장하지 못했습니다. {1}",
-	"learnMore": "자세한 정보",
-	"dontShowAgain": "다시 표시 안 함",
-	"compareChanges": "비교",
-	"saveConflictDiffLabel": "{0}(디스크에 있음) ↔ {1}({2}에 있음) - 저장 충돌 해결",
-	"overwriteElevated": "관리자로 덮어쓰기...",
-	"saveElevated": "관리자로 다시 시도...",
-	"overwrite": "덮어쓰기"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/files/electron-browser/views/emptyView.i18n.json b/i18n/kor/src/vs/workbench/parts/files/electron-browser/views/emptyView.i18n.json
deleted file mode 100644
index a442c7ea306..00000000000
--- a/i18n/kor/src/vs/workbench/parts/files/electron-browser/views/emptyView.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noWorkspace": "열린 폴더 없음",
-	"explorerSection": "파일 탐색기 섹션",
-	"noWorkspaceHelp": "작업 영역에 아직 폴더를 추가하지 않았습니다.",
-	"addFolder": "폴더 추가",
-	"noFolderHelp": "아직 폴더를 열지 않았습니다.",
-	"openFolder": "폴더 열기"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/files/electron-browser/views/explorerDecorationsProvider.i18n.json b/i18n/kor/src/vs/workbench/parts/files/electron-browser/views/explorerDecorationsProvider.i18n.json
deleted file mode 100644
index f12dbce84b7..00000000000
--- a/i18n/kor/src/vs/workbench/parts/files/electron-browser/views/explorerDecorationsProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"label": "탐색기",
-	"canNotResolve": "작업 영역 폴더를 확인할 수 없습니다.",
-	"symbolicLlink": "바로 가기 링크"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/files/electron-browser/views/explorerView.i18n.json b/i18n/kor/src/vs/workbench/parts/files/electron-browser/views/explorerView.i18n.json
deleted file mode 100644
index 99b600e8b4f..00000000000
--- a/i18n/kor/src/vs/workbench/parts/files/electron-browser/views/explorerView.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"explorerSection": "파일 탐색기 섹션",
-	"treeAriaLabel": "파일 탐색기"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json b/i18n/kor/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
deleted file mode 100644
index 0e96fcdac44..00000000000
--- a/i18n/kor/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"fileInputAriaLabel": "파일 이름을 입력합니다. 확인하려면 Enter 키를 누르고, 취소하려면 Esc 키를 누릅니다.",
-	"createFileFromExplorerInfoMessage": "**{1}**에 **{0}** 만들기",
-	"renameFileFromExplorerInfoMessage": "이동 및 **{0}**(으)로 이름 바꾸기",
-	"createFolderFromExplorerInfoMessage": "**{1}**에 **{0}** 폴더 만들기",
-	"filesExplorerViewerAriaLabel": "{0}, 파일 탐색기",
-	"dropFolders": "작업 영역에 폴더를 추가하시겠습니까?",
-	"dropFolder": "작업 영역에 폴더를 추가하시겠습니까?",
-	"addFolders": "폴더 추가(&&A)",
-	"addFolder": "폴더 추가(&&A)",
-	"confirmRootsMove": "작업 영역에서 다중 루트 폴더의 순서를 변경하시겠습니까? ",
-	"confirmMultiMove": "다음 {0}개 파일을 이동하시겠습니까?",
-	"confirmRootMove": "작업 영역에서 루트 폴더 '{0}'의 순서를 변경하시겠습니까? ",
-	"confirmMove": "'{0}'을(를) 이동하시겠습니까?",
-	"doNotAskAgain": "이 메시지를 다시 표시 안 함",
-	"moveButtonLabel": "이동(&&M)",
-	"confirmOverwriteMessage": "'{0}'이(가) 대상 폴더에 이미 있습니다. 바꿀까요?",
-	"irreversible": "이 작업은 취소할 수 없습니다.",
-	"replaceButtonLabel": "바꾸기(&&R)"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json b/i18n/kor/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json
deleted file mode 100644
index 37b7ea8b192..00000000000
--- a/i18n/kor/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openEditors": "열려 있는 편집기",
-	"openEditosrSection": "열려 있는 편집기 섹션",
-	"dirtyCounter": "{0}이(가) 저장되지 않음"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/files/electron-browser/views/openEditorsViewer.i18n.json b/i18n/kor/src/vs/workbench/parts/files/electron-browser/views/openEditorsViewer.i18n.json
deleted file mode 100644
index 4946bd4745c..00000000000
--- a/i18n/kor/src/vs/workbench/parts/files/electron-browser/views/openEditorsViewer.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"editorGroupAriaLabel": "{0}, 편집기 그룹",
-	"openEditorAriaLabel": "{0}, 편집기 열기",
-	"saveAll": "모두 저장",
-	"closeAllUnmodified": "미수정 항목 닫기",
-	"closeAll": "모두 닫기",
-	"compareWithSaved": "저장된 항목과 비교",
-	"close": "닫기",
-	"closeOthers": "기타 항목 닫기"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/git/browser/gitActions.contribution.i18n.json b/i18n/kor/src/vs/workbench/parts/git/browser/gitActions.contribution.i18n.json
deleted file mode 100644
index fc8466fc1d0..00000000000
--- a/i18n/kor/src/vs/workbench/parts/git/browser/gitActions.contribution.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"switchToChangesView": "변경 내용 보기로 전환",
-	"openInEditor": "편집기 보기로 전환",
-	"workbenchStage": "스테이징",
-	"workbenchUnstage": "스테이징 취소",
-	"stageSelectedLines": "선택한 줄 스테이징",
-	"unstageSelectedLines": "선택한 줄 스테이징 취소",
-	"revertSelectedLines": "선택한 줄 되돌리기",
-	"confirmRevertMessage": "선택한 변경 내용을 되돌리시겠습니까?",
-	"irreversible": "이 작업은 취소할 수 없습니다.",
-	"revertChangesLabel": "변경 내용 되돌리기(&&R)",
-	"openChange": "변경 내용 열기",
-	"openFile": "파일 열기",
-	"git": "Git"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/git/browser/gitActions.i18n.json b/i18n/kor/src/vs/workbench/parts/git/browser/gitActions.i18n.json
deleted file mode 100644
index 4e6b5f36ec7..00000000000
--- a/i18n/kor/src/vs/workbench/parts/git/browser/gitActions.i18n.json
+++ /dev/null
@@ -1,46 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"openChange": "변경 내용 열기",
-	"openFile": "파일 열기",
-	"init": "Init",
-	"refresh": "새로 고침",
-	"stageChanges": "스테이징",
-	"stageAllChanges": "모두 스테이징",
-	"confirmUndoMessage": "모든 변경 내용을 정리할까요?",
-	"confirmUndoAllOne": "{0} 파일에 스테이징되지 않은 변경 내용이 있습니다.\n\n이 작업은 취소할 수 없습니다.",
-	"confirmUndoAllMultiple": "{0}개 파일에 스테이징되지 않은 변경 내용이 있습니다.\n\n이 작업은 취소할 수 없습니다.",
-	"cleanChangesLabel": "변경 내용 정리(&&C)",
-	"confirmUndo": "'{0}'의 변경 내용을 정리할까요?",
-	"irreversible": "이 작업은 취소할 수 없습니다.",
-	"undoChanges": "정리",
-	"undoAllChanges": "모두 정리",
-	"unstage": "스테이징 취소",
-	"unstageAllChanges": "모두 스테이징 취소",
-	"dirtyTreeCheckout": "체크 아웃할 수 없습니다. 먼저 작업을 커밋하거나 스태시하세요.",
-	"commitStaged": "스테이징된 항목 커밋",
-	"commitStagedAmend": "스테이징된 항목 커밋(수정)",
-	"commitStagedSignedOff": "스테이징된 항목 커밋(로그오프됨)",
-	"commit": "Commit",
-	"commitMessage": "커밋 메시지",
-	"commitAll": "모두 커밋",
-	"commitAllSignedOff": "모두 커밋(로그오프됨)",
-	"commitAll2": "모두 커밋",
-	"commitStaged2": "스테이징된 항목 커밋",
-	"dirtyTreePull": "끌어올 수 없습니다. 먼저 작업을 커밋하거나 스태시하세요.",
-	"authFailed": "원격 git에 대한 인증이 실패했습니다.",
-	"pushToRemote": "다음으로 푸시...",
-	"pushToRemotePickMessage": "'{0}' 분기를 푸시할 원격 선택:",
-	"publish": "게시",
-	"confirmPublishMessage": "'{0}'을(를) '{1}'에 게시할까요?",
-	"confirmPublishMessageButton": "게시(&&P)",
-	"publishPickMessage": "'{0}' 분기를 다음에 게시하려면 원격을 선택하세요.",
-	"sync is unpredictable": "이 작업은 '{0}' 간에 커밋을 푸시하고 풀합니다.",
-	"ok": "확인",
-	"cancel": "취소",
-	"never again": "다시 표시 안 함",
-	"undoLastCommit": "마지막 커밋 실행 취소"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/git/browser/gitQuickOpen.i18n.json b/i18n/kor/src/vs/workbench/parts/git/browser/gitQuickOpen.i18n.json
deleted file mode 100644
index 1c160903b8e..00000000000
--- a/i18n/kor/src/vs/workbench/parts/git/browser/gitQuickOpen.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"refAriaLabel": "{0}, git",
-	"checkoutBranch": "{0}의 분기",
-	"checkoutRemoteBranch": "{0}에서 원격 분기",
-	"checkoutTag": "{0}의 태그",
-	"alreadyCheckedOut": "{0} 분기는 이미 현재 분기입니다.",
-	"branchAriaLabel": "{0}, git 분기",
-	"createBranch": "분기 {0} 만들기",
-	"noBranches": "다른 분기 없음",
-	"notValidBranchName": "유효한 분기 이름을 제공하세요."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/git/browser/gitServices.i18n.json b/i18n/kor/src/vs/workbench/parts/git/browser/gitServices.i18n.json
deleted file mode 100644
index 42da3e64358..00000000000
--- a/i18n/kor/src/vs/workbench/parts/git/browser/gitServices.i18n.json
+++ /dev/null
@@ -1,30 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"cantOpen": "이 Git 리소스를 열 수 없습니다.",
-	"gitIndexChanges": "{0}(index) ↔ {1}",
-	"gitIndexChangesDesc": "{0} - 인덱스 변경 내용",
-	"gitIndexChangesRenamed": "{0} ← {1}",
-	"gitIndexChangesRenamedDesc": "{0} - 이름 바꿈 - 인덱스 변경 내용",
-	"workingTreeChanges": "{0} (HEAD) ↔ {1}",
-	"workingTreeChangesDesc": "{0} - 작업 트리 변경 내용",
-	"gitMergeChanges": "{0}(병합) ↔ {1}",
-	"gitMergeChangesDesc": "{0} - 변경 내용 병합",
-	"updateGit": "Git {0}이(가) 설치된 것 같습니다. Code는 2.0.0 이하의 Git에서 최적으로 작동합니다.",
-	"download": "다운로드",
-	"neverShowAgain": "다시 표시 안 함",
-	"configureUsernameEmail": "git 사용자 이름 및 메일을 구성하세요.",
-	"badConfigFile": "Git {0}",
-	"unmergedChanges": "변경 내용을 커밋하기 전에 먼저 병합되지 않은 변경 내용을 확인해야 합니다.",
-	"showOutput": "출력 표시",
-	"cancel": "취소",
-	"checkNativeConsole": "git 작업을 실행하는 동안 문제가 발생했습니다. 출력을 검토하거나 콘솔을 사용하여 리포지토리의 상태를 확인하세요.",
-	"changesFromIndex": "{0}(index)",
-	"changesFromIndexDesc": "{0} - 인덱스 변경 내용",
-	"changesFromTree": "{0}({1})",
-	"changesFromTreeDesc": "{0} - {1} 변경 내용",
-	"cantOpenResource": "이 Git 리소스를 열 수 없습니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/git/browser/gitWidgets.i18n.json b/i18n/kor/src/vs/workbench/parts/git/browser/gitWidgets.i18n.json
deleted file mode 100644
index 4117cf9dbe0..00000000000
--- a/i18n/kor/src/vs/workbench/parts/git/browser/gitWidgets.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"publishBranch": "분기 게시",
-	"syncBranch": "변경 내용 동기화",
-	"gitNotEnabled": "이 작업 영역에서 Git을 사용하도록 설정되어 있지 않습니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/git/browser/gitWorkbenchContributions.i18n.json b/i18n/kor/src/vs/workbench/parts/git/browser/gitWorkbenchContributions.i18n.json
deleted file mode 100644
index 6f7a24d7bc9..00000000000
--- a/i18n/kor/src/vs/workbench/parts/git/browser/gitWorkbenchContributions.i18n.json
+++ /dev/null
@@ -1,23 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"gitProgressBadge": "실행 중인 Git 상태",
-	"gitPendingChangesBadge": "{0}개의 보류 중인 변경 내용",
-	"toggleGitViewlet": "Git 표시",
-	"git": "Git",
-	"view": "보기",
-	"gitCommands": "Git 명령",
-	"gitConfigurationTitle": "Git",
-	"gitEnabled": "git를 사용하도록 설정할까요?",
-	"gitPath": "Git 실행 파일의 경로",
-	"gitAutoRefresh": "자동 새로 고침 사용 여부",
-	"gitAutoFetch": "자동 가져오기를 사용하도록 설정했는지 여부입니다.",
-	"gitLongCommit": "긴 커밋 메시지에 대해 경고할지 여부입니다.",
-	"gitLargeRepos": "항상 대규모 리포지토리가 Code로 관리되도록 허용합니다.",
-	"confirmSync": "Git 리포지토리를 동기화하기 전에 확인합니다.",
-	"countBadge": "Git 배지 카운터를 제어합니다.",
-	"checkoutType": "나열되는 분기 유형을 제어합니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/git/browser/views/changes/changesView.i18n.json b/i18n/kor/src/vs/workbench/parts/git/browser/views/changes/changesView.i18n.json
deleted file mode 100644
index c6c35150c4b..00000000000
--- a/i18n/kor/src/vs/workbench/parts/git/browser/views/changes/changesView.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"needMessage": "커밋 메시지를 입력하세요. 언제든지 **{0}**을(를) 눌러 변경 내용을 커밋할 수 있습니다. 스테이징된 변경 내용이 있으면 해당 변경 내용만 커밋되고 그렇지 않으면 모든 변경 내용이 커밋됩니다.",
-	"nothingToCommit": "커밋할 변경 내용이 있으면 커밋 메시지를 입력하고 **{0}**을(를) 눌러 변경 내용을 커밋하세요. 스테이징된 변경 내용이 있으면 해당 변경 내용만 커밋되고 그렇지 않으면 모든 변경 내용이 커밋됩니다.",
-	"longCommit": "커밋의 첫 번째 줄은 50자 미만으로 유지하는 것이 좋습니다. 추가 정보를 위해 자유롭게 더 많은 줄을 사용하세요.",
-	"commitMessage": "Message (press {0} to commit)",
-	"commitMessageAriaLabel": "Git: 커밋하려면 커밋 메시지를 입력하고 {0}을(를) 누르세요.",
-	"treeAriaLabel": "Git 변경 내용 보기",
-	"showOutput": "Git 출력 표시"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/git/browser/views/changes/changesViewer.i18n.json b/i18n/kor/src/vs/workbench/parts/git/browser/views/changes/changesViewer.i18n.json
deleted file mode 100644
index faeaf8b3bce..00000000000
--- a/i18n/kor/src/vs/workbench/parts/git/browser/views/changes/changesViewer.i18n.json
+++ /dev/null
@@ -1,38 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"stagedChanges": "스테이징된 변경 내용",
-	"allChanges": "변경 내용",
-	"mergeChanges": "변경 내용 병합",
-	"outsideOfWorkspace": "이 파일은 현재 작업 영역의 외부에 있습니다.",
-	"modified-char": "M",
-	"added-char": "A",
-	"deleted-char": "D",
-	"renamed-char": "R",
-	"copied-char": "C",
-	"untracked-char": "U",
-	"ignored-char": "!",
-	"title-index-modified": "인덱스에서 수정",
-	"title-modified": "수정됨",
-	"title-index-added": "인덱스에 추가",
-	"title-index-deleted": "인덱스에서 삭제",
-	"title-deleted": "삭제됨",
-	"title-index-renamed": "인덱스에서 이름 변경",
-	"title-index-copied": "인덱스에 복사",
-	"title-untracked": "추적되지 않음",
-	"title-ignored": "무시됨",
-	"title-conflict-both-deleted": "충돌: 양쪽에서 삭제",
-	"title-conflict-added-by-us": "충돌: 자체 추가",
-	"title-conflict-deleted-by-them": "충돌: 타인이 삭제",
-	"title-conflict-added-by-them": "충돌: 타인이 추가",
-	"title-conflict-deleted-by-us": "충돌: 자체 삭제",
-	"title-conflict-both-added": "충돌: 양쪽에서 추가",
-	"title-conflict-both-modified": "충돌: 양쪽에서 수정",
-	"fileStatusAriaLabel": "{1} 폴더에 있는 {0} 파일의 상태는 {2}입니다. Git",
-	"ariaLabelStagedChanges": "스테이징된 변경 내용, Git",
-	"ariaLabelChanges": "변경, Git",
-	"ariaLabelMerge": "병합, Git"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/git/browser/views/disabled/disabledView.i18n.json b/i18n/kor/src/vs/workbench/parts/git/browser/views/disabled/disabledView.i18n.json
deleted file mode 100644
index 800bb049a53..00000000000
--- a/i18n/kor/src/vs/workbench/parts/git/browser/views/disabled/disabledView.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"disabled": "Git가 설정에서 사용하지 않도록 지정되어 있습니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/git/browser/views/empty/emptyView.i18n.json b/i18n/kor/src/vs/workbench/parts/git/browser/views/empty/emptyView.i18n.json
deleted file mode 100644
index 45fc86e0c67..00000000000
--- a/i18n/kor/src/vs/workbench/parts/git/browser/views/empty/emptyView.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"noGit": "이 작업 영역에는 아직 Git 소스 제어가 적용되지 않습니다.",
-	"gitinit": "Git 리포지토리 초기화"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/git/browser/views/gitless/gitlessView.i18n.json b/i18n/kor/src/vs/workbench/parts/git/browser/views/gitless/gitlessView.i18n.json
deleted file mode 100644
index a4b0bdaad9f..00000000000
--- a/i18n/kor/src/vs/workbench/parts/git/browser/views/gitless/gitlessView.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"macInstallWith": "터미널 프롬프트에 {3}을(를) 입력하여 {0}과(와) 함께 설치하거나 {1}에서 다운로드하거나 {2} 명령줄 개발자 도구를 설치할 수 있습니다.",
-	"winInstallWith": "{0}에서 설치하거나 {1}에서 다운로드할 수 있습니다.",
-	"linuxDownloadFrom": "{0}에서 다운로드할 수 있습니다.",
-	"downloadFrom": "{0}에서 다운로드할 수 있습니다.",
-	"looksLike": "git가 시스템에 설치되지 않은 것 같습니다.",
-	"pleaseRestart": "Git이 설치되면 VSCode를 다시 시작하세요."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/git/browser/views/huge/hugeView.i18n.json b/i18n/kor/src/vs/workbench/parts/git/browser/views/huge/hugeView.i18n.json
deleted file mode 100644
index 42c89e1acf5..00000000000
--- a/i18n/kor/src/vs/workbench/parts/git/browser/views/huge/hugeView.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"huge": "리포지토리에 활성 변경 내용이 많은 것 같습니다.\nCode가 매우 느려질 수 있습니다.",
-	"setting": "다음 설정을 사용하여 이 경고를 영구적으로 사용하지 않을 수 있습니다.",
-	"allo": "대규모 리포지토리 허용"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/git/browser/views/notroot/notrootView.i18n.json b/i18n/kor/src/vs/workbench/parts/git/browser/views/notroot/notrootView.i18n.json
deleted file mode 100644
index b7f45319cbf..00000000000
--- a/i18n/kor/src/vs/workbench/parts/git/browser/views/notroot/notrootView.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"wrongRoot": "이 디렉터리가 git 리포지토리에 포함되어 있는 것 같습니다.",
-	"pleaseRestart": "Git 기능에 액세스하려면 리포지토리의 루트 디렉터리를 엽니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/git/browser/views/noworkspace/noworkspaceView.i18n.json b/i18n/kor/src/vs/workbench/parts/git/browser/views/noworkspace/noworkspaceView.i18n.json
deleted file mode 100644
index c86dd10d311..00000000000
--- a/i18n/kor/src/vs/workbench/parts/git/browser/views/noworkspace/noworkspaceView.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"noWorkspaceHelp": "아직 폴더를 열지 않았습니다.",
-	"pleaseRestart": "Git 기능에 액세스하려면 Git 리포지토리에서 폴더를 엽니다.",
-	"openFolder": "폴더 열기"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/git/electron-browser/git.contribution.i18n.json b/i18n/kor/src/vs/workbench/parts/git/electron-browser/git.contribution.i18n.json
deleted file mode 100644
index 3128ce34341..00000000000
--- a/i18n/kor/src/vs/workbench/parts/git/electron-browser/git.contribution.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"toggleSCMViewlet": "SCM 표시",
-	"git": "Git"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/git/electron-browser/gitActions.i18n.json b/i18n/kor/src/vs/workbench/parts/git/electron-browser/gitActions.i18n.json
deleted file mode 100644
index 257e82a7521..00000000000
--- a/i18n/kor/src/vs/workbench/parts/git/electron-browser/gitActions.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"valid": "올바른 Git 리포지토리 URL을 입력하세요.",
-	"url": "리포지토리 URL",
-	"directory": "대상 복제 디렉터리",
-	"cloning": "'{0}' 리포지토리를 복제하는 중...",
-	"already exists": "대상 리포지토리가 이미 있습니다. 복제할 다른 디렉터리를 선택하세요."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/git/electron-main/askpassService.i18n.json b/i18n/kor/src/vs/workbench/parts/git/electron-main/askpassService.i18n.json
deleted file mode 100644
index 06ad0299d48..00000000000
--- a/i18n/kor/src/vs/workbench/parts/git/electron-main/askpassService.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"git": "Git"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/git/node/git.lib.i18n.json b/i18n/kor/src/vs/workbench/parts/git/node/git.lib.i18n.json
deleted file mode 100644
index 3845e66fd4a..00000000000
--- a/i18n/kor/src/vs/workbench/parts/git/node/git.lib.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"errorBuffer": "git에서 파일을 열 수 없습니다.",
-	"fileBinaryError": "파일이 이진인 것 같으므로 테스트로 열 수 없습니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/html/browser/html.contribution.i18n.json b/i18n/kor/src/vs/workbench/parts/html/browser/html.contribution.i18n.json
deleted file mode 100644
index 72937e2691d..00000000000
--- a/i18n/kor/src/vs/workbench/parts/html/browser/html.contribution.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"html.editor.label": "Html 미리 보기"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/html/browser/htmlPreviewPart.i18n.json b/i18n/kor/src/vs/workbench/parts/html/browser/htmlPreviewPart.i18n.json
deleted file mode 100644
index a9bf2716767..00000000000
--- a/i18n/kor/src/vs/workbench/parts/html/browser/htmlPreviewPart.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"html.voidInput": "잘못된 편집기 입력입니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/html/browser/webview.contribution.i18n.json b/i18n/kor/src/vs/workbench/parts/html/browser/webview.contribution.i18n.json
deleted file mode 100644
index 73fa26c6394..00000000000
--- a/i18n/kor/src/vs/workbench/parts/html/browser/webview.contribution.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"developer": "개발자"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/html/browser/webview.i18n.json b/i18n/kor/src/vs/workbench/parts/html/browser/webview.i18n.json
deleted file mode 100644
index fc0ecfdc6c7..00000000000
--- a/i18n/kor/src/vs/workbench/parts/html/browser/webview.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"devtools.webview": "개발자: Webview 도구"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/html/browser/webviewCommands.i18n.json b/i18n/kor/src/vs/workbench/parts/html/browser/webviewCommands.i18n.json
deleted file mode 100644
index e1e1b8586d5..00000000000
--- a/i18n/kor/src/vs/workbench/parts/html/browser/webviewCommands.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"editor.action.webvieweditor.showFind": "파인드 위젯 포커스",
-	"openToolsLabel": "Webview 개발자 도구 열기",
-	"refreshWebviewLabel": "Webview 다시 로드"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json b/i18n/kor/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json
deleted file mode 100644
index 72937e2691d..00000000000
--- a/i18n/kor/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"html.editor.label": "Html 미리 보기"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json b/i18n/kor/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json
deleted file mode 100644
index a9bf2716767..00000000000
--- a/i18n/kor/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"html.voidInput": "잘못된 편집기 입력입니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json b/i18n/kor/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json
deleted file mode 100644
index 73fa26c6394..00000000000
--- a/i18n/kor/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"developer": "개발자"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json b/i18n/kor/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json
deleted file mode 100644
index 3a107e5fb3a..00000000000
--- a/i18n/kor/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openToolsLabel": "Webview 개발자 도구 열기",
-	"refreshWebviewLabel": "Webview 다시 로드"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json b/i18n/kor/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
deleted file mode 100644
index 2fdfcbff78e..00000000000
--- a/i18n/kor/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"updateLocale": "VS Code의 UI 언어를 {0}(으)로 변경하고 다시 시작하시겠습니까?",
-	"yes": "예",
-	"no": "아니요",
-	"neverAgain": "다시 표시 안 함",
-	"JsonSchema.locale": "사용할 UI 언어입니다.",
-	"vscode.extension.contributes.localizations": "편집기에 지역화를 적용합니다.",
-	"vscode.extension.contributes.localizations.languageId": "표시 문자열이 번역되는 언어의 ID입니다.",
-	"vscode.extension.contributes.localizations.languageName": "영어로 된 언어 이름입니다.",
-	"vscode.extension.contributes.localizations.languageNameLocalized": "적용된 언어로 된 언어 이름입니다.",
-	"vscode.extension.contributes.localizations.translations": "해당 언어에 연결된 번역 목록입니다.",
-	"vscode.extension.contributes.localizations.translations.id": "이 변환이 적용되는 VS Code 또는 확장의 ID입니다. VS Code의 ID는 항상 `vscode`이고 확장의 ID는 `publisherId.extensionName` 형식이어야 합니다.",
-	"vscode.extension.contributes.localizations.translations.id.pattern": "ID는 VS Code를 변환하거나 확장을 변환하는 경우 각각 `vscode` 또는 `publisherId.extensionName` 형식이어야 합니다.",
-	"vscode.extension.contributes.localizations.translations.path": "언어에 대한 변환을 포함하는 파일의 상대 경로입니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/localizations/browser/localizationsActions.i18n.json b/i18n/kor/src/vs/workbench/parts/localizations/browser/localizationsActions.i18n.json
deleted file mode 100644
index e8656093b5c..00000000000
--- a/i18n/kor/src/vs/workbench/parts/localizations/browser/localizationsActions.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"configureLocale": "언어 구성",
-	"displayLanguage": "VSCode의 표시 언어를 정의합니다.",
-	"doc": "지원되는 언어 목록은 {0} 을(를) 참조하세요.",
-	"restart": "값을 변경하려면 VSCode를 다시 시작해야 합니다.",
-	"fail.createSettings": "{0}'({1})을(를) 만들 수 없습니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/localizations/electron-browser/localizations.contribution.i18n.json b/i18n/kor/src/vs/workbench/parts/localizations/electron-browser/localizations.contribution.i18n.json
deleted file mode 100644
index 66ced1818fd..00000000000
--- a/i18n/kor/src/vs/workbench/parts/localizations/electron-browser/localizations.contribution.i18n.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"updateLocale": "VS Code의 UI 언어를 {0}(으)로 변경하고 다시 시작하시겠습니까?",
-	"activateLanguagePack": "방금 설치한 언어 팩을 활성화하기 위해 VS Code를 다시 시작하시겠습니까?",
-	"yes": "예",
-	"no": "아니요",
-	"neverAgain": "다시 표시 안 함",
-	"install language pack": "곧 VS Code에서는 Marketplace 확장 형식의 언어 팩만 지원합니다. 현재 구성된 언어를 계속 사용하도록 구성하려면 '{0}' 확장을 설치하세요. ",
-	"install": "설치",
-	"more information": "자세한 정보...",
-	"JsonSchema.locale": "사용할 UI 언어입니다.",
-	"vscode.extension.contributes.localizations": "편집기에 지역화를 적용합니다.",
-	"vscode.extension.contributes.localizations.languageId": "표시 문자열이 번역되는 언어의 ID입니다.",
-	"vscode.extension.contributes.localizations.languageName": "영어로 된 언어 이름입니다.",
-	"vscode.extension.contributes.localizations.languageNameLocalized": "적용된 언어로 된 언어 이름입니다.",
-	"vscode.extension.contributes.localizations.translations": "해당 언어에 연결된 번역 목록입니다.",
-	"vscode.extension.contributes.localizations.translations.id": "이 변환이 적용되는 VS Code 또는 확장의 ID입니다. VS Code의 ID는 항상 `vscode`이고 확장의 ID는 `publisherId.extensionName` 형식이어야 합니다.",
-	"vscode.extension.contributes.localizations.translations.id.pattern": "ID는 VS Code를 변환하거나 확장을 변환하는 경우 각각 `vscode` 또는 `publisherId.extensionName` 형식이어야 합니다.",
-	"vscode.extension.contributes.localizations.translations.path": "언어에 대한 변환을 포함하는 파일의 상대 경로입니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/localizations/electron-browser/localizationsActions.i18n.json b/i18n/kor/src/vs/workbench/parts/localizations/electron-browser/localizationsActions.i18n.json
deleted file mode 100644
index d312034e6cd..00000000000
--- a/i18n/kor/src/vs/workbench/parts/localizations/electron-browser/localizationsActions.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"configureLocale": "표시 언어 구성",
-	"displayLanguage": "VSCode의 표시 언어를 정의합니다.",
-	"doc": "지원되는 언어 목록은 {0} 을(를) 참조하세요.",
-	"restart": "값을 변경하려면 VSCode를 다시 시작해야 합니다.",
-	"fail.createSettings": "{0}'({1})을(를) 만들 수 없습니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json b/i18n/kor/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json
deleted file mode 100644
index eed5e71d3e5..00000000000
--- a/i18n/kor/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"mainLog": "로그(메인)",
-	"sharedLog": "로그(공유)",
-	"rendererLog": "로그(창)",
-	"extensionsLog": "로그(확장 호스트)",
-	"developer": "개발자"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json b/i18n/kor/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json
deleted file mode 100644
index 3bd63de7ca6..00000000000
--- a/i18n/kor/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openLogsFolder": "로그 폴더 열기",
-	"showLogs": "로그 표시...",
-	"rendererProcess": "창({0})",
-	"emptyWindow": "창",
-	"extensionHost": "확장 호스트",
-	"sharedProcess": "공유",
-	"mainProcess": "기본",
-	"selectProcess": "프로세스에 대한 로그 선택",
-	"openLogFile": "로그 파일 열기...",
-	"setLogLevel": "로그 수준 설정...",
-	"trace": "Trace",
-	"debug": "디버그",
-	"info": "정보",
-	"warn": "경고",
-	"err": "오류",
-	"critical": "Critical",
-	"off": "Off",
-	"selectLogLevel": "로그 수준 선택",
-	"default and current": "기본값 및 현재",
-	"default": "기본값",
-	"current": "현재"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/markers/browser/markersFileDecorations.i18n.json b/i18n/kor/src/vs/workbench/parts/markers/browser/markersFileDecorations.i18n.json
deleted file mode 100644
index 2103b0440bb..00000000000
--- a/i18n/kor/src/vs/workbench/parts/markers/browser/markersFileDecorations.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"label": "문제",
-	"tooltip.1": "이 파일의 문제 1개",
-	"tooltip.N": "이 파일의 문제 {0}개",
-	"markers.showOnFile": "파일과 폴더의 오류 및 경고 표시"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/markers/browser/markersPanel.i18n.json b/i18n/kor/src/vs/workbench/parts/markers/browser/markersPanel.i18n.json
deleted file mode 100644
index 5ea2aa6a147..00000000000
--- a/i18n/kor/src/vs/workbench/parts/markers/browser/markersPanel.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"totalProblems": "총 {0}개 문제",
-	"filteredProblems": "{1}개 중 {0}개 문제 표시"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/markers/common/markers.i18n.json b/i18n/kor/src/vs/workbench/parts/markers/common/markers.i18n.json
deleted file mode 100644
index 5ea2aa6a147..00000000000
--- a/i18n/kor/src/vs/workbench/parts/markers/common/markers.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"totalProblems": "총 {0}개 문제",
-	"filteredProblems": "{1}개 중 {0}개 문제 표시"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/markers/common/messages.i18n.json b/i18n/kor/src/vs/workbench/parts/markers/common/messages.i18n.json
deleted file mode 100644
index 96ac7a8193d..00000000000
--- a/i18n/kor/src/vs/workbench/parts/markers/common/messages.i18n.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"viewCategory": "보기",
-	"problems.view.toggle.label": "문제 토글(오류, 경고, 정보)",
-	"problems.view.focus.label": "포커스 문제(오류, 경고, 정보)",
-	"problems.panel.configuration.title": "문제 보기",
-	"problems.panel.configuration.autoreveal": "문제 보기를 열 때 문제 보기에 자동으로 파일이 표시되어야 하는지를 제어합니다.",
-	"markers.panel.title.problems": "문제",
-	"markers.panel.aria.label.problems.tree": "파일별로 그룹화된 문제",
-	"markers.panel.no.problems.build": "지금까지 작업 영역에서 문제가 감지되지 않았습니다.",
-	"markers.panel.no.problems.filters": "제공된 필터 기준으로 결과를 찾을 수 없습니다.",
-	"markers.panel.action.filter": "문제 필터링",
-	"markers.panel.filter.placeholder": "형식 또는 텍스트로 필터링",
-	"markers.panel.filter.errors": "오류",
-	"markers.panel.filter.warnings": "경고",
-	"markers.panel.filter.infos": "정보",
-	"markers.panel.single.error.label": "오류 1개",
-	"markers.panel.multiple.errors.label": "오류 {0}개",
-	"markers.panel.single.warning.label": "경고 1개",
-	"markers.panel.multiple.warnings.label": "경고 {0}개",
-	"markers.panel.single.info.label": "정보 1개",
-	"markers.panel.multiple.infos.label": "정보 {0}개",
-	"markers.panel.single.unknown.label": "알 수 없음 1개",
-	"markers.panel.multiple.unknowns.label": "알 수 없음 {0}개",
-	"markers.panel.at.ln.col.number": "({0}, {1})",
-	"problems.tree.aria.label.resource": "{0}에 {1}개의 문제가 있음",
-	"problems.tree.aria.label.error.marker": "{0}에 의해 오류 발생: 줄 {2} 및 문자 {3}의 {1}",
-	"problems.tree.aria.label.error.marker.nosource": "오류: 줄 {1} 및 문자 {2}의 {0}",
-	"problems.tree.aria.label.warning.marker": "{0}에 의해 경고 발생: 줄 {2} 및 문자 {3}의 {1}",
-	"problems.tree.aria.label.warning.marker.nosource": "경고: 줄 {1} 및 문자 {2}의 {0}",
-	"problems.tree.aria.label.info.marker": "{0}에 의해 정보 생성됨: 줄 {2} 및 문자 {3}의 {1}",
-	"problems.tree.aria.label.info.marker.nosource": "정보: 줄 {1} 및 문자 {2}의 {0}",
-	"problems.tree.aria.label.marker": "{0}에 의해 문제 발생: 줄 {2} 및 문자 {3}의 {1}",
-	"problems.tree.aria.label.marker.nosource": "문제: 줄 {1} 및 문자 {2}의 {0}",
-	"errors.warnings.show.label": "오류 및 경고 표시"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json b/i18n/kor/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json
deleted file mode 100644
index 15ccb30fd5d..00000000000
--- a/i18n/kor/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"copyMarker": "복사",
-	"copyMessage": "메시지 복사"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/markers/electron-browser/markers.i18n.json b/i18n/kor/src/vs/workbench/parts/markers/electron-browser/markers.i18n.json
deleted file mode 100644
index dae3babf1ff..00000000000
--- a/i18n/kor/src/vs/workbench/parts/markers/electron-browser/markers.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"totalProblems": "총 {0}개 문제"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/markers/electron-browser/markersElectronContributions.i18n.json b/i18n/kor/src/vs/workbench/parts/markers/electron-browser/markersElectronContributions.i18n.json
deleted file mode 100644
index e999d986aef..00000000000
--- a/i18n/kor/src/vs/workbench/parts/markers/electron-browser/markersElectronContributions.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"copyMarker": "복사",
-	"copyMarkerMessage": "메시지 복사"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.i18n.json b/i18n/kor/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.i18n.json
deleted file mode 100644
index 2103b0440bb..00000000000
--- a/i18n/kor/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"label": "문제",
-	"tooltip.1": "이 파일의 문제 1개",
-	"tooltip.N": "이 파일의 문제 {0}개",
-	"markers.showOnFile": "파일과 폴더의 오류 및 경고 표시"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/markers/electron-browser/markersPanel.i18n.json b/i18n/kor/src/vs/workbench/parts/markers/electron-browser/markersPanel.i18n.json
deleted file mode 100644
index 5145f166a0a..00000000000
--- a/i18n/kor/src/vs/workbench/parts/markers/electron-browser/markersPanel.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"disableFilesExclude": "파일 제외 필터를 사용하지 않도록 설정합니다.",
-	"clearFilter": "필터를 지웁니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/markers/electron-browser/markersPanelActions.i18n.json b/i18n/kor/src/vs/workbench/parts/markers/electron-browser/markersPanelActions.i18n.json
deleted file mode 100644
index b597a05c76c..00000000000
--- a/i18n/kor/src/vs/workbench/parts/markers/electron-browser/markersPanelActions.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"showing filtered problems": "{0}/{1} 표시"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json b/i18n/kor/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
deleted file mode 100644
index c7863f2ea1b..00000000000
--- a/i18n/kor/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"viewCategory": "보기",
-	"problems.view.toggle.label": "문제 토글(오류, 경고, 정보)",
-	"problems.view.focus.label": "포커스 문제(오류, 경고, 정보)",
-	"problems.panel.configuration.title": "문제 보기",
-	"problems.panel.configuration.autoreveal": "문제 보기를 열 때 문제 보기에 자동으로 파일이 표시되어야 하는지를 제어합니다.",
-	"markers.panel.title.problems": "문제",
-	"markers.panel.aria.label.problems.tree": "파일별로 그룹화된 문제",
-	"markers.panel.no.problems.build": "지금까지 작업 영역에서 문제가 감지되지 않았습니다.",
-	"markers.panel.no.problems.filters": "지정된 필터 조건으로 결과를 찾을 수 없습니다.",
-	"markers.panel.no.problems.file.exclusions": "파일 제외 필터를 사용하도록 설정했으므로 모든 문제가 숨겨집니다.",
-	"markers.panel.action.useFilesExclude": "파일 제외 필터를 사용하여 필터링",
-	"markers.panel.action.donotUseFilesExclude": "파일 제외 설정 사용 안 함",
-	"markers.panel.action.filter": "문제 필터링",
-	"markers.panel.filter.ariaLabel": "문제 필터링",
-	"markers.panel.filter.placeholder": "필터입니다. 예: text, **/*.ts, !**/node_modules/**",
-	"markers.panel.filter.errors": "오류",
-	"markers.panel.filter.warnings": "경고",
-	"markers.panel.filter.infos": "정보",
-	"markers.panel.single.error.label": "오류 1개",
-	"markers.panel.multiple.errors.label": "오류 {0}개",
-	"markers.panel.single.warning.label": "경고 1개",
-	"markers.panel.multiple.warnings.label": "경고 {0}개",
-	"markers.panel.single.info.label": "정보 1개",
-	"markers.panel.multiple.infos.label": "정보 {0}개",
-	"markers.panel.single.unknown.label": "알 수 없음 1개",
-	"markers.panel.multiple.unknowns.label": "알 수 없음 {0}개",
-	"markers.panel.at.ln.col.number": "({0}, {1})",
-	"problems.tree.aria.label.resource": "{0}에 {1}개의 문제가 있음",
-	"problems.tree.aria.label.marker.relatedInformation": " 이 문제에는 {0} 위치에 대한 참조가 있습니다.",
-	"problems.tree.aria.label.error.marker": "{0}에 의해 오류 발생: 줄 {2} 및 문자 {3}.{4}의 {1}",
-	"problems.tree.aria.label.error.marker.nosource": "오류: 줄 {1} 및 문자 {2}의 {0}.{3}",
-	"problems.tree.aria.label.warning.marker": "{0}에 의해 경고 발생: 줄 {2} 및 문자 {3}의 {1}.{4}",
-	"problems.tree.aria.label.warning.marker.nosource": "경고: 줄 {1} 및 문자 {2}의 {0}.{3}",
-	"problems.tree.aria.label.info.marker": "{0}에 의해 정보가 생성됨: 줄 {2} 및 문자 {3}의 {1}.{4}",
-	"problems.tree.aria.label.info.marker.nosource": "정보: 줄 {1} 및 문자 {2}의 {0}.{3}",
-	"problems.tree.aria.label.marker": "{0}에 의해 문제 발생: 줄 {2} 및 문자 {3}의 {1}.{4}",
-	"problems.tree.aria.label.marker.nosource": "문제: 줄 {1} 및 문자 {2}의 {0}.{3}",
-	"problems.tree.aria.label.relatedinfo.message": "{3}에서 줄 {1} 및 문자 {2}의 {0}",
-	"errors.warnings.show.label": "오류 및 경고 표시"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/nps/electron-browser/nps.contribution.i18n.json b/i18n/kor/src/vs/workbench/parts/nps/electron-browser/nps.contribution.i18n.json
deleted file mode 100644
index 9cc54c77a3c..00000000000
--- a/i18n/kor/src/vs/workbench/parts/nps/electron-browser/nps.contribution.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"surveyQuestion": "간단한 피드백 설문 조사에 참여하시겠어요?",
-	"takeSurvey": "설문 조사 참여",
-	"remindLater": "나중에 알림",
-	"neverAgain": "다시 표시 안 함"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/outline/electron-browser/outline.contribution.i18n.json b/i18n/kor/src/vs/workbench/parts/outline/electron-browser/outline.contribution.i18n.json
deleted file mode 100644
index 06b0fe68776..00000000000
--- a/i18n/kor/src/vs/workbench/parts/outline/electron-browser/outline.contribution.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"name": "개요",
-	"category.focus": "파일",
-	"label.focus": "윤곽에 포커스 설정"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/outline/electron-browser/outlinePanel.i18n.json b/i18n/kor/src/vs/workbench/parts/outline/electron-browser/outlinePanel.i18n.json
deleted file mode 100644
index d8be418ac18..00000000000
--- a/i18n/kor/src/vs/workbench/parts/outline/electron-browser/outlinePanel.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"filter": "필터",
-	"collapse": "모두 축소",
-	"sortByPosition": "정렬 기준: 위치",
-	"sortByName": "정렬 기준: 이름",
-	"sortByKind": "정렬 기준: 유형",
-	"live": "커서 따르기",
-	"no-editor": "윤곽 정보를 제공할 수 있는 편집기가 열려 있지 않습니다.",
-	"too-many-symbols": "죄송하지만 이 파일이 너무 커서 윤곽을 표시할 수 없습니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/outline/electron-browser/outlineTree.i18n.json b/i18n/kor/src/vs/workbench/parts/outline/electron-browser/outlineTree.i18n.json
deleted file mode 100644
index 00fc36426e0..00000000000
--- a/i18n/kor/src/vs/workbench/parts/outline/electron-browser/outlineTree.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"outline.title": "{1}의 줄 {0}"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/output/browser/output.contribution.i18n.json b/i18n/kor/src/vs/workbench/parts/output/browser/output.contribution.i18n.json
deleted file mode 100644
index 8596cd47f88..00000000000
--- a/i18n/kor/src/vs/workbench/parts/output/browser/output.contribution.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"output": "출력",
-	"viewCategory": "보기",
-	"clearOutput.label": "출력 내용 지우기"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/output/browser/outputActions.i18n.json b/i18n/kor/src/vs/workbench/parts/output/browser/outputActions.i18n.json
deleted file mode 100644
index bce61a36cfe..00000000000
--- a/i18n/kor/src/vs/workbench/parts/output/browser/outputActions.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleOutput": "출력 설정/해제",
-	"clearOutput": "출력 내용 지우기",
-	"toggleOutputScrollLock": "출력 스크롤 잠금 설정/해제",
-	"switchToOutput.label": "출력으로 전환",
-	"openInLogViewer": "로그 파일 열기"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/output/browser/outputPanel.i18n.json b/i18n/kor/src/vs/workbench/parts/output/browser/outputPanel.i18n.json
deleted file mode 100644
index a3f20cef548..00000000000
--- a/i18n/kor/src/vs/workbench/parts/output/browser/outputPanel.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"output": "출력",
-	"outputPanelWithInputAriaLabel": "{0}, 출력 패널",
-	"outputPanelAriaLabel": "출력 패널"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/output/common/output.i18n.json b/i18n/kor/src/vs/workbench/parts/output/common/output.i18n.json
deleted file mode 100644
index 260eb76e372..00000000000
--- a/i18n/kor/src/vs/workbench/parts/output/common/output.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"output": "출력",
-	"channel": "'{0}'의 경우"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json b/i18n/kor/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
deleted file mode 100644
index 1b45ff7d927..00000000000
--- a/i18n/kor/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"output": "출력",
-	"logViewer": "로그 표시기",
-	"viewCategory": "보기",
-	"clearOutput.label": "출력 내용 지우기",
-	"openActiveLogOutputFile": "보기: 활성 로그 출력 파일 열기"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json b/i18n/kor/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json
deleted file mode 100644
index 675dfcdef15..00000000000
--- a/i18n/kor/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"output": "{0} - 출력",
-	"channel": "'{0}'에 대한 출력 채널"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/performance/electron-browser/performance.contribution.i18n.json b/i18n/kor/src/vs/workbench/parts/performance/electron-browser/performance.contribution.i18n.json
deleted file mode 100644
index d0885df5255..00000000000
--- a/i18n/kor/src/vs/workbench/parts/performance/electron-browser/performance.contribution.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"prof.message": "프로필을 만들었습니다.",
-	"prof.detail": "문제를 발생시키고 다음 파일을 수동으로 첨부하세요.\n{0}",
-	"prof.restartAndFileIssue": "문제 만들기 및 다시 시작",
-	"prof.restart": "다시 시작",
-	"prof.thanks": "도움을 주셔서 감사합니다.",
-	"prof.detail.restart": "계속 '{0}'을(를) 사용하려면 마지막으로 다시 시작해야 합니다. 기여해 주셔서 다시 한번 감사드립니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/performance/electron-browser/startupProfiler.i18n.json b/i18n/kor/src/vs/workbench/parts/performance/electron-browser/startupProfiler.i18n.json
deleted file mode 100644
index 2f53b9f60e5..00000000000
--- a/i18n/kor/src/vs/workbench/parts/performance/electron-browser/startupProfiler.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"prof.message": "프로필을 만들었습니다.",
-	"prof.detail": "문제를 발생시키고 다음 파일을 수동으로 첨부하세요.\n{0}",
-	"prof.restartAndFileIssue": "문제 만들기 및 다시 시작",
-	"prof.restart": "다시 시작",
-	"prof.thanks": "도움을 주셔서 감사합니다.",
-	"prof.detail.restart": "계속 '{0}'을(를) 사용하려면 마지막으로 다시 시작해야 합니다. 기여해 주셔서 다시 한번 감사드립니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/preferences/browser/keybindingWidgets.i18n.json b/i18n/kor/src/vs/workbench/parts/preferences/browser/keybindingWidgets.i18n.json
deleted file mode 100644
index 076c415045b..00000000000
--- a/i18n/kor/src/vs/workbench/parts/preferences/browser/keybindingWidgets.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"defineKeybinding.oneExists": "1개의 기존 명령에 이 키 바인딩이 있습니다.",
-	"defineKeybinding.existing": "{0}개의 기존 명령에 이 키 바인딩이 있습니다.",
-	"defineKeybinding.initial": "원하는 키 조합을 누르고 <Enter> 키를 누르세요.",
-	"defineKeybinding.chordsTo": "현"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json b/i18n/kor/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
deleted file mode 100644
index 6a6e7f15271..00000000000
--- a/i18n/kor/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"showDefaultKeybindings": "기본 키 바인딩 표시",
-	"showUserKeybindings": "사용자 키 바인딩 표시",
-	"SearchKeybindings.AriaLabel": "키 바인딩 검색",
-	"SearchKeybindings.Placeholder": "키 바인딩 검색",
-	"sortByPrecedene": "우선 순위별 정렬",
-	"header-message": "고급 사용자 지정의 경우 다음 파일을 열고 편집하세요.",
-	"keybindings-file-name": "keybindings.json",
-	"keybindingsLabel": "키 바인딩",
-	"changeLabel": "키 바인딩 변경",
-	"addLabel": "키 바인딩 추가",
-	"removeLabel": "키 바인딩 제거",
-	"resetLabel": "키 바인딩 다시 설정",
-	"showSameKeybindings": "동일한 키 바인딩 표시",
-	"copyLabel": "복사",
-	"copyCommandLabel": "복사 명령",
-	"error": "키 바인딩을 편집하는 동안 '{0}' 오류가 발생했습니다. 'keybindings.json' 파일을 열고 오류를 확인하세요.",
-	"command": "명령",
-	"keybinding": "키 바인딩",
-	"source": "소스",
-	"when": "시기",
-	"editKeybindingLabelWithKey": "키 바인딩 {0} 변경",
-	"editKeybindingLabel": "키 바인딩 변경",
-	"addKeybindingLabelWithKey": "키 바인딩 {0} 추가",
-	"addKeybindingLabel": "키 바인딩 추가",
-	"title": "{0}({1})",
-	"commandAriaLabel": "명령은 {0}입니다.",
-	"keybindingAriaLabel": "키 바인딩은 {0}입니다.",
-	"noKeybinding": "키 바인딩이 할당되지 않았습니다.",
-	"sourceAriaLabel": "소스는 {0}입니다.",
-	"whenAriaLabel": "{0}인 경우",
-	"noWhen": "컨텍스트인 경우 아니요"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/preferences/browser/keybindingsEditorContribution.i18n.json b/i18n/kor/src/vs/workbench/parts/preferences/browser/keybindingsEditorContribution.i18n.json
deleted file mode 100644
index d291d053704..00000000000
--- a/i18n/kor/src/vs/workbench/parts/preferences/browser/keybindingsEditorContribution.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"defineKeybinding.start": "키 바인딩 정의",
-	"defineKeybinding.kbLayoutErrorMessage": "현재 자판 배열에서는 이 키 조합을 생성할 수 없습니다.",
-	"defineKeybinding.kbLayoutLocalAndUSMessage": "현재 자판 배열의 경우 **{0}**입니다(**{1}**: 미국 표준).",
-	"defineKeybinding.kbLayoutLocalMessage": "현재 자판 배열의 경우 **{0}**입니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/preferences/browser/preferences.contribution.i18n.json b/i18n/kor/src/vs/workbench/parts/preferences/browser/preferences.contribution.i18n.json
deleted file mode 100644
index c37bd69f731..00000000000
--- a/i18n/kor/src/vs/workbench/parts/preferences/browser/preferences.contribution.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"defaultPreferencesEditor": "기본 설정 편집기",
-	"keybindingsEditor": "키 바인딩 편집기",
-	"preferences": "기본 설정"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json b/i18n/kor/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
deleted file mode 100644
index ad061c299ee..00000000000
--- a/i18n/kor/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openRawDefaultSettings": "원시 기본 설정 열기",
-	"openSettings2": "설정 열기(미리 보기)",
-	"openSettings": "설정 열기",
-	"openGlobalSettings": "사용자 설정 열기",
-	"openGlobalKeybindings": "바로 가기 키 열기",
-	"openGlobalKeybindingsFile": "바로 가기 키 파일 열기",
-	"openWorkspaceSettings": "작업 영역 설정 열기",
-	"openFolderSettings": "폴더 설정 열기",
-	"configureLanguageBasedSettings": "언어별 설정 구성...",
-	"languageDescriptionConfigured": "({0})",
-	"pickLanguage": "언어 선택"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json b/i18n/kor/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
deleted file mode 100644
index aecb53ab9b9..00000000000
--- a/i18n/kor/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"SearchSettingsWidget.AriaLabel": "설정 검색",
-	"SearchSettingsWidget.Placeholder": "설정 검색",
-	"noSettingsFound": "결과 없음",
-	"oneSettingFound": "1개 설정 찾음",
-	"settingsFound": "{0}개 설정 찾음",
-	"totalSettingsMessage": "총 {0}개 설정",
-	"nlpResult": "자연어 결과",
-	"filterResult": "필터링된 결과",
-	"defaultSettings": "기본 설정",
-	"defaultUserSettings": "기본 사용자 설정",
-	"defaultWorkspaceSettings": "기본 작업 영역 설정",
-	"defaultFolderSettings": "기본 폴더 설정",
-	"defaultEditorReadonly": "기본값을 재정의하려면 오른쪽 편집기를 편집하세요.",
-	"preferencesAriaLabel": "기본 설정. 읽기 전용 텍스트 편집기입니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json b/i18n/kor/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
deleted file mode 100644
index 952972db109..00000000000
--- a/i18n/kor/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"emptyUserSettingsHeader": "설정을 여기에 넣어서 기본 설정을 덮어씁니다.",
-	"emptyWorkspaceSettingsHeader": "설정을 여기에 넣어서 사용자 설정을 덮어씁니다.",
-	"emptyFolderSettingsHeader": "폴더 설정을 여기에 넣어서 작업 영역 설정을 덮어씁니다.",
-	"reportSettingsSearchIssue": "문제 보고",
-	"newExtensionLabel": "\"{0}\" 확장 표시",
-	"editTtile": "편집",
-	"replaceDefaultValue": "설정에서 바꾸기",
-	"copyDefaultValue": "설정에 복사"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/preferences/browser/preferencesService.i18n.json b/i18n/kor/src/vs/workbench/parts/preferences/browser/preferencesService.i18n.json
deleted file mode 100644
index 503603410ea..00000000000
--- a/i18n/kor/src/vs/workbench/parts/preferences/browser/preferencesService.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openFolderFirst": "첫 번째 폴더를 열어서 작업 영역 설정을 만듭니다.",
-	"emptyKeybindingsHeader": "키 바인딩을 이 파일에 넣어서 기본값을 덮어씁니다.",
-	"defaultKeybindings": "기본 키 바인딩",
-	"folderSettingsName": "{0}(폴더 설정)",
-	"fail.createSettings": "{0}'({1})을(를) 만들 수 없습니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json b/i18n/kor/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
deleted file mode 100644
index a8bd67a28f3..00000000000
--- a/i18n/kor/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"defaultSettings": "설정을 오른쪽 편집기에 넣어서 덮어씁니다.",
-	"noSettingsFound": "설정을 찾을 수 없습니다.",
-	"settingsSwitcherBarAriaLabel": "설정 전환기",
-	"userSettings": "사용자 설정",
-	"workspaceSettings": "작업 영역 설정",
-	"folderSettings": "폴더 설정"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/preferences/browser/settingsEditor2.i18n.json b/i18n/kor/src/vs/workbench/parts/preferences/browser/settingsEditor2.i18n.json
deleted file mode 100644
index 20795088f9f..00000000000
--- a/i18n/kor/src/vs/workbench/parts/preferences/browser/settingsEditor2.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"previewWarning": "미리 보기",
-	"previewLabel": "새 설정 편집기의 미리 보기입니다.",
-	"SearchSettings.AriaLabel": "설정 검색",
-	"SearchSettings.Placeholder": "설정 검색",
-	"advancedCustomizationLabel": "고급 사용자 지정의 경우 다음 파일을 열고 편집하세요.",
-	"openSettingsLabel": "settings.json",
-	"showOverriddenOnly": "수정된 내용만 표시",
-	"treeAriaLabel": "설정",
-	"feedbackButtonLabel": "피드백 제공"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/preferences/browser/settingsTree.i18n.json b/i18n/kor/src/vs/workbench/parts/preferences/browser/settingsTree.i18n.json
deleted file mode 100644
index db30cb9c730..00000000000
--- a/i18n/kor/src/vs/workbench/parts/preferences/browser/settingsTree.i18n.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"modifiedItemForeground": "수정된 설정의 전경색입니다.",
-	"workspace": "작업 영역",
-	"user": "사용자",
-	"resetButtonTitle": "다시 설정",
-	"configured": "수정됨",
-	"alsoConfiguredIn": "다음에서도 수정됨",
-	"configuredIn": "다음에서 수정됨",
-	"editInSettingsJson": "settings.json에서 편집",
-	"settingRowAriaLabel": "{0} {1}, 설정",
-	"groupRowAriaLabel": "{0}, 그룹"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/preferences/common/keybindingsEditorModel.i18n.json b/i18n/kor/src/vs/workbench/parts/preferences/common/keybindingsEditorModel.i18n.json
deleted file mode 100644
index dbad6edf753..00000000000
--- a/i18n/kor/src/vs/workbench/parts/preferences/common/keybindingsEditorModel.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"default": "기본값",
-	"user": "사용자",
-	"meta": "메타",
-	"option": "옵션"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/preferences/common/preferences.i18n.json b/i18n/kor/src/vs/workbench/parts/preferences/common/preferences.i18n.json
deleted file mode 100644
index 6639aec53ec..00000000000
--- a/i18n/kor/src/vs/workbench/parts/preferences/common/preferences.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"userSettingsTarget": "사용자 설정",
-	"workspaceSettingsTarget": "작업 영역 설정"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json b/i18n/kor/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json
deleted file mode 100644
index 9d01c25ee37..00000000000
--- a/i18n/kor/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"commonlyUsed": "일반적으로 사용되는 설정",
-	"defaultKeybindingsHeader": "키 바인딩을 키 바인딩 파일에 배치하여 덮어씁니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/preferences/electron-browser/preferences.contribution.i18n.json b/i18n/kor/src/vs/workbench/parts/preferences/electron-browser/preferences.contribution.i18n.json
deleted file mode 100644
index 693a8f3f5a3..00000000000
--- a/i18n/kor/src/vs/workbench/parts/preferences/electron-browser/preferences.contribution.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"defaultPreferencesEditor": "기본 설정 편집기",
-	"settingsEditor2": "설정 편집기 2",
-	"keybindingsEditor": "키 바인딩 편집기",
-	"preferences": "기본 설정"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/quickopen/browser/commandsHandler.i18n.json b/i18n/kor/src/vs/workbench/parts/quickopen/browser/commandsHandler.i18n.json
deleted file mode 100644
index 16dd8342ca1..00000000000
--- a/i18n/kor/src/vs/workbench/parts/quickopen/browser/commandsHandler.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"showTriggerActions": "모든 명령 표시",
-	"clearCommandHistory": "명령 기록 지우기",
-	"showCommands.label": "명령 팔레트...",
-	"entryAriaLabelWithKey": "{0}, {1}, 명령",
-	"entryAriaLabel": "{0}, 명령",
-	"actionNotEnabled": "'{0}' 명령은 현재 컨텍스트에서 사용할 수 없습니다.",
-	"canNotRun": "'{0}' 명령에서 오류가 발생했습니다.",
-	"recentlyUsed": "최근에 사용한 항목",
-	"morecCommands": "기타 명령",
-	"cat.title": "{0}: {1}",
-	"noCommandsMatching": "일치하는 명령 없음"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/quickopen/browser/gotoLineHandler.i18n.json b/i18n/kor/src/vs/workbench/parts/quickopen/browser/gotoLineHandler.i18n.json
deleted file mode 100644
index 5448942dccd..00000000000
--- a/i18n/kor/src/vs/workbench/parts/quickopen/browser/gotoLineHandler.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"gotoLine": "줄 이동...",
-	"gotoLineLabelEmptyWithLimit": "이동할 1과 {0} 사이의 줄 번호 입력",
-	"gotoLineLabelEmpty": "이동할 줄 번호 입력",
-	"gotoLineColumnLabel": "줄 {0} 및 문자 {1}(으)로 이동",
-	"gotoLineLabel": "줄 {0}(으)로 이동",
-	"gotoLineHandlerAriaLabel": "이동할 줄 번호를 입력합니다.",
-	"cannotRunGotoLine": "첫 번째 텍스트 파일을 열어서 줄로 이동합니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/quickopen/browser/gotoSymbolHandler.i18n.json b/i18n/kor/src/vs/workbench/parts/quickopen/browser/gotoSymbolHandler.i18n.json
deleted file mode 100644
index 3933bc74805..00000000000
--- a/i18n/kor/src/vs/workbench/parts/quickopen/browser/gotoSymbolHandler.i18n.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"gotoSymbol": "파일의 기호로 이동...",
-	"symbols": "기호({0})",
-	"method": "메서드({0})",
-	"function": "함수({0})",
-	"_constructor": "생성자({0})",
-	"variable": "변수({0})",
-	"class": "클래스({0})",
-	"interface": "인터페이스({0})",
-	"namespace": "네임스페이스({0})",
-	"package": "패키지({0})",
-	"modules": "모듈({0})",
-	"property": "속성({0})",
-	"enum": "열거형({0})",
-	"string": "문자열({0})",
-	"rule": "규칙({0})",
-	"file": "파일({0})",
-	"array": "배열({0})",
-	"number": "구성원({0})",
-	"boolean": "부울({0})",
-	"object": "개체({0})",
-	"key": "키({0})",
-	"entryAriaLabel": "{0}, 기호",
-	"noSymbolsMatching": "일치하는 기호 없음",
-	"noSymbolsFound": "기호를 찾을 수 없음",
-	"gotoSymbolHandlerAriaLabel": "입력하여 현재 활성화된 편집기의 기호를 축소합니다.",
-	"cannotRunGotoSymbolInFile": "파일에 대한 기호 정보가 없습니다.",
-	"cannotRunGotoSymbol": "첫 번째 텍스트 파일을 열어서 기호로 이동합니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/quickopen/browser/helpHandler.i18n.json b/i18n/kor/src/vs/workbench/parts/quickopen/browser/helpHandler.i18n.json
deleted file mode 100644
index 27437a83a16..00000000000
--- a/i18n/kor/src/vs/workbench/parts/quickopen/browser/helpHandler.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"entryAriaLabel": "{0}, 선택기 도움말",
-	"globalCommands": "전역 명령",
-	"editorCommands": "편집기 명령"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json b/i18n/kor/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json
deleted file mode 100644
index 648ba46bbdb..00000000000
--- a/i18n/kor/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"view": "보기",
-	"commandsHandlerDescriptionDefault": "명령 표시 및 실행",
-	"gotoLineDescriptionMac": "줄 이동",
-	"gotoLineDescriptionWin": "줄 이동",
-	"gotoSymbolDescription": "파일의 기호로 이동",
-	"gotoSymbolDescriptionScoped": "범주로 파일의 기호로 이동",
-	"helpDescription": "도움말 표시",
-	"viewPickerDescription": "뷰 열기"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/quickopen/browser/viewPickerHandler.i18n.json b/i18n/kor/src/vs/workbench/parts/quickopen/browser/viewPickerHandler.i18n.json
deleted file mode 100644
index 5ad7f1451ea..00000000000
--- a/i18n/kor/src/vs/workbench/parts/quickopen/browser/viewPickerHandler.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"entryAriaLabel": "{0}, 뷰 선택기",
-	"views": "뷰",
-	"panels": "패널",
-	"terminals": "터미널",
-	"terminalTitle": "{0}: {1}",
-	"channels": "출력",
-	"openView": "뷰 열기",
-	"quickOpenView": "Quick Open 뷰"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.i18n.json b/i18n/kor/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.i18n.json
deleted file mode 100644
index 112bca1e01f..00000000000
--- a/i18n/kor/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"relaunchSettingMessage": "설정이 변경되어 다시 시작해야만 적용됩니다.",
-	"relaunchSettingDetail": "[다시 시작] 단추를 눌러 {0}을(를) 다시 시작하고 설정을 사용하도록 설정하세요.",
-	"restart": "다시 시작(&&R)"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.i18n.json b/i18n/kor/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.i18n.json
deleted file mode 100644
index 52b3cb24c35..00000000000
--- a/i18n/kor/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.i18n.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"changes": "변경 내용 {0}/{1}개",
-	"change": "변경 내용 {0}/{1}개",
-	"show previous change": "이전 변경 내용 표시",
-	"show next change": "다음 변경 내용 표시",
-	"move to previous change": "이전 변경 내용으로 이동",
-	"move to next change": "다음 변경 내용으로 이동",
-	"editorGutterModifiedBackground": "수정된 줄의 편집기 여백 배경색입니다.",
-	"editorGutterAddedBackground": "추가된 줄의 편집기 여백 배경색입니다.",
-	"editorGutterDeletedBackground": "삭제된 줄의 편집기 여백 배경색입니다.",
-	"overviewRulerModifiedForeground": "수정된 콘텐츠의 개요 눈금자 마커 색입니다.",
-	"overviewRulerAddedForeground": "추가된 콘텐츠의 개요 눈금자 마커 색입니다.",
-	"overviewRulerDeletedForeground": "삭제된 콘텐츠의 개요 눈금자 마커 색입니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json b/i18n/kor/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
deleted file mode 100644
index 073f844e784..00000000000
--- a/i18n/kor/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleGitViewlet": "Git 표시",
-	"source control": "소스 제어",
-	"toggleSCMViewlet": "SCM 표시",
-	"view": "보기",
-	"scmConfigurationTitle": "SCM",
-	"alwaysShowProviders": "소스 제어 공급자 부분을 항상 표시할지의 여부",
-	"diffDecorations": "편집기에서 차이점 장식을 제어합니다.",
-	"diffGutterWidth": "여백에서 차이점 장식의 너비(px)를 제어합니다(추가 및 수정됨)."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/scm/electron-browser/scmActivity.i18n.json b/i18n/kor/src/vs/workbench/parts/scm/electron-browser/scmActivity.i18n.json
deleted file mode 100644
index e58968b0c6b..00000000000
--- a/i18n/kor/src/vs/workbench/parts/scm/electron-browser/scmActivity.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"scmPendingChangesBadge": "{0}개의 보류 중인 변경 내용"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/scm/electron-browser/scmMenus.i18n.json b/i18n/kor/src/vs/workbench/parts/scm/electron-browser/scmMenus.i18n.json
deleted file mode 100644
index 2910b5c28ea..00000000000
--- a/i18n/kor/src/vs/workbench/parts/scm/electron-browser/scmMenus.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"installAdditionalSCMProviders": "추가 SCM 공급자 설치...",
-	"switch provider": "SCM 공급자 전환..."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json b/i18n/kor/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
deleted file mode 100644
index a3f29b119ba..00000000000
--- a/i18n/kor/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"scm providers": "소스 제어 공급자",
-	"hideRepository": "숨기기",
-	"installAdditionalSCMProviders": "추가 SCM 공급자 설치...",
-	"no open repo": "활성 소스 제어 공급자가 없습니다.",
-	"source control": "소스 제어",
-	"viewletTitle": "{0}: {1}",
-	"hideView": "숨기기"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/search/browser/openAnythingHandler.i18n.json b/i18n/kor/src/vs/workbench/parts/search/browser/openAnythingHandler.i18n.json
deleted file mode 100644
index 7b190885ed6..00000000000
--- a/i18n/kor/src/vs/workbench/parts/search/browser/openAnythingHandler.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"fileAndTypeResults": "파일 및 기호 결과",
-	"fileResults": "파일 결과"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/search/browser/openFileHandler.i18n.json b/i18n/kor/src/vs/workbench/parts/search/browser/openFileHandler.i18n.json
deleted file mode 100644
index 1a2ac0a464b..00000000000
--- a/i18n/kor/src/vs/workbench/parts/search/browser/openFileHandler.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"entryAriaLabel": "{0}, 파일 선택기",
-	"searchResults": "검색 결과"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/search/browser/openSymbolHandler.i18n.json b/i18n/kor/src/vs/workbench/parts/search/browser/openSymbolHandler.i18n.json
deleted file mode 100644
index 64f4de3ca22..00000000000
--- a/i18n/kor/src/vs/workbench/parts/search/browser/openSymbolHandler.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"entryAriaLabel": "{0}, 기호 선택기",
-	"symbols": "기호 결과",
-	"noSymbolsMatching": "일치하는 기호 없음",
-	"noSymbolsWithoutInput": "입력하여 기호 검색"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/search/browser/patternInputWidget.i18n.json b/i18n/kor/src/vs/workbench/parts/search/browser/patternInputWidget.i18n.json
deleted file mode 100644
index edc1ed7d61f..00000000000
--- a/i18n/kor/src/vs/workbench/parts/search/browser/patternInputWidget.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"defaultLabel": "입력",
-	"useExcludesAndIgnoreFilesDescription": "제외 설정 및 파일 무시 사용"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/search/browser/replaceService.i18n.json b/i18n/kor/src/vs/workbench/parts/search/browser/replaceService.i18n.json
deleted file mode 100644
index 00e36e43f60..00000000000
--- a/i18n/kor/src/vs/workbench/parts/search/browser/replaceService.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"fileReplaceChanges": "{0} ↔ {1}(미리 보기 바꾸기)"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/search/browser/search.contribution.i18n.json b/i18n/kor/src/vs/workbench/parts/search/browser/search.contribution.i18n.json
deleted file mode 100644
index 9b239f6fd5f..00000000000
--- a/i18n/kor/src/vs/workbench/parts/search/browser/search.contribution.i18n.json
+++ /dev/null
@@ -1,22 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"showTriggerActions": "작업 영역에서 기호로 이동...",
-	"name": "검색",
-	"search": "검색",
-	"view": "보기",
-	"openAnythingHandlerDescription": "파일로 이동",
-	"openSymbolDescriptionNormal": "작업 영역에서 기호로 이동",
-	"searchOutputChannelTitle": "검색",
-	"searchConfigurationTitle": "검색",
-	"exclude": "검색에서 파일 및 폴더를 제외하도록 GLOB 패턴을 구성합니다. files.exclude 설정에서 모든 GLOB 패턴을 상속합니다.",
-	"exclude.boolean": "파일 경로를 일치시킬 GLOB 패턴입니다. 패턴을 사용하거나 사용하지 않도록 설정하려면 true 또는 false로 설정하세요.",
-	"exclude.when": "일치하는 파일의 형제에 대한 추가 검사입니다. $(basename)을 일치하는 파일 이름에 대한 변수로 사용하세요.",
-	"useRipgrep": "텍스트 및 파일 검색에서 ripgrep 사용 여부를 제어합니다.",
-	"useIgnoreFiles": "파일을 검색할 때 .gitignore 파일 및 .ignore 파일을 사용할지 여부를 제어합니다.",
-	"search.quickOpen.includeSymbols": "Quick Open에 대한 파일 결과에 전역 기호 검색 결과를 포함하도록 구성합니다.",
-	"search.followSymlinks": "검색하는 동안 symlink를 누를지 여부를 제어합니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/search/browser/searchActions.i18n.json b/i18n/kor/src/vs/workbench/parts/search/browser/searchActions.i18n.json
deleted file mode 100644
index 071d294ccc8..00000000000
--- a/i18n/kor/src/vs/workbench/parts/search/browser/searchActions.i18n.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"nextSearchIncludePattern": "다음 검색 포함 패턴 표시",
-	"previousSearchIncludePattern": "이전 검색 포함 패턴 표시",
-	"nextSearchExcludePattern": "다음 검색 제외 패턴 표시",
-	"previousSearchExcludePattern": "이전 검색 제외 패턴 표시",
-	"nextSearchTerm": "다음 검색어 표시",
-	"previousSearchTerm": "이전 검색어 표시",
-	"nextReplaceTerm": "다음 검색 대체어 표시",
-	"previousReplaceTerm": "이전 검색 대체어 표시",
-	"findInFiles": "파일에서 찾기",
-	"replaceInFiles": "파일에서 바꾸기",
-	"RefreshAction.label": "새로 고침",
-	"CollapseDeepestExpandedLevelAction.label": "모두 축소",
-	"ClearSearchResultsAction.label": "지우기",
-	"CancelSearchAction.label": "검색 취소",
-	"FocusNextSearchResult.label": "다음 검색 결과에 포커스",
-	"FocusPreviousSearchResult.label": "이전 검색 결과에 포커스",
-	"RemoveAction.label": "해제",
-	"file.replaceAll.label": "모두 바꾸기",
-	"match.replace.label": "바꾸기"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/search/browser/searchResultsView.i18n.json b/i18n/kor/src/vs/workbench/parts/search/browser/searchResultsView.i18n.json
deleted file mode 100644
index 51d183c82ff..00000000000
--- a/i18n/kor/src/vs/workbench/parts/search/browser/searchResultsView.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"searchFolderMatch.other.label": "다른 파일",
-	"searchFileMatches": "{0}개 파일 찾음",
-	"searchFileMatch": "{0}개 파일 찾음",
-	"searchMatches": "일치하는 {0}개 항목을 찾음",
-	"searchMatch": "일치하는 {0}개 항목을 찾음",
-	"folderMatchAriaLabel": "폴더 루트 {1}에서 {0}개 일치, 검색 결과",
-	"fileMatchAriaLabel": "{2} 폴더의 {1} 파일에 {0}개의 일치 항목이 있음, 검색 결과",
-	"replacePreviewResultAria": "{3} 텍스트가 있는 줄의 열 위치 {2}에서 용어 {0}을(를) {1}(으)로 바꾸기",
-	"searchResultAria": "{2} 텍스트가 있는 줄의 열 위치 {1}에서 {0} 용어 찾기"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/search/browser/searchView.i18n.json b/i18n/kor/src/vs/workbench/parts/search/browser/searchView.i18n.json
deleted file mode 100644
index c98e307c23b..00000000000
--- a/i18n/kor/src/vs/workbench/parts/search/browser/searchView.i18n.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"moreSearch": "검색 세부 정보 설정/해제",
-	"searchScope.includes": "포함할 파일",
-	"label.includes": "패턴 포함 검색",
-	"searchScope.excludes": "제외할 파일",
-	"label.excludes": "패턴 제외 검색",
-	"replaceAll.confirmation.title": "모두 바꾸기",
-	"replaceAll.confirm.button": "바꾸기(&&R)",
-	"replaceAll.occurrence.file.message": "{1}개 파일에서 {0}개를 '{2}'(으)로 바꿨습니다.",
-	"removeAll.occurrence.file.message": "{1}개 파일에서 {0}개를 바꿨습니다.",
-	"replaceAll.occurrence.files.message": "{1}개 파일에서 {0}개를 '{2}'(으)로 바꿨습니다.",
-	"removeAll.occurrence.files.message": "{1}개 파일에서 {0}개를 바꿨습니다.",
-	"replaceAll.occurrences.file.message": "{1}개 파일에서 {0}개를 '{2}'(으)로 바꿨습니다.",
-	"removeAll.occurrences.file.message": "{1}개 파일에서 {0}개를 바꿨습니다.",
-	"replaceAll.occurrences.files.message": "{1}개 파일에서 {0}개를 '{2}'(으)로 바꿨습니다.",
-	"removeAll.occurrences.files.message": "{1}개 파일에서 {0}개를 바꿨습니다.",
-	"removeAll.occurrence.file.confirmation.message": "{1}개 파일에서 {0}개를 '{2}'(으)로 바꾸시겠습니까?",
-	"replaceAll.occurrence.file.confirmation.message": "{1}개 파일에서 {0}개를 바꾸시겠습니까?",
-	"removeAll.occurrence.files.confirmation.message": "{1}개 파일에서 {0}개를 '{2}'(으)로 바꾸시겠습니까?",
-	"replaceAll.occurrence.files.confirmation.message": "{1}개 파일에서 {0}개를 바꾸시겠습니까?",
-	"removeAll.occurrences.file.confirmation.message": "{1}개 파일에서 {0}개를 '{2}'(으)로 바꾸시겠습니까?",
-	"replaceAll.occurrences.file.confirmation.message": "{1}개 파일에서 {0}개를 바꾸시겠습니까?",
-	"removeAll.occurrences.files.confirmation.message": "{1}개 파일에서 {0}개를 '{2}'(으)로 바꾸시겠습니까?",
-	"replaceAll.occurrences.files.confirmation.message": "{1}개 파일에서 {0}개를 바꾸시겠습니까?",
-	"treeAriaLabel": "검색 결과",
-	"searchPathNotFoundError": "검색 경로를 찾을 수 없음: {0}",
-	"searchMaxResultsWarning": "결과 집합에는 모든 일치 항목의 하위 집합만 포함됩니다. 결과 범위를 좁히려면 검색을 더 세분화하세요.",
-	"searchCanceled": "결과를 찾기 이전에 검색이 취소되었습니다. -",
-	"noResultsIncludesExcludes": "'{0}'에 '{1}'을(를) 제외한 결과 없음 - ",
-	"noResultsIncludes": "'{0}'에 결과 없음 - ",
-	"noResultsExcludes": "'{0}'을(를) 제외하는 결과가 없음 - ",
-	"noResultsFound": "결과가 없습니다. 구성된 예외 설정을 검토하고 파일을 무시하세요.",
-	"rerunSearch.message": "다시 검색",
-	"rerunSearchInAll.message": "모든 파일에서 다시 검색",
-	"openSettings.message": "설정 열기",
-	"openSettings.learnMore": "자세한 정보",
-	"ariaSearchResultsStatus": "검색에서 {1}개의 파일에 {0}개의 결과를 반환했습니다.",
-	"search.file.result": "{1}개 파일에서 {0}개 결과",
-	"search.files.result": "{1}개 파일에서 {0}개 결과",
-	"search.file.results": "{1}개 파일에서 {0}개 결과",
-	"search.files.results": "{1}개 파일에서 {0}개 결과",
-	"searchWithoutFolder": "아직 폴더를 열지 않았습니다. 현재 열린 파일만 검색됩니다. ",
-	"openFolder": "폴더 열기"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json b/i18n/kor/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
deleted file mode 100644
index c98e307c23b..00000000000
--- a/i18n/kor/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"moreSearch": "검색 세부 정보 설정/해제",
-	"searchScope.includes": "포함할 파일",
-	"label.includes": "패턴 포함 검색",
-	"searchScope.excludes": "제외할 파일",
-	"label.excludes": "패턴 제외 검색",
-	"replaceAll.confirmation.title": "모두 바꾸기",
-	"replaceAll.confirm.button": "바꾸기(&&R)",
-	"replaceAll.occurrence.file.message": "{1}개 파일에서 {0}개를 '{2}'(으)로 바꿨습니다.",
-	"removeAll.occurrence.file.message": "{1}개 파일에서 {0}개를 바꿨습니다.",
-	"replaceAll.occurrence.files.message": "{1}개 파일에서 {0}개를 '{2}'(으)로 바꿨습니다.",
-	"removeAll.occurrence.files.message": "{1}개 파일에서 {0}개를 바꿨습니다.",
-	"replaceAll.occurrences.file.message": "{1}개 파일에서 {0}개를 '{2}'(으)로 바꿨습니다.",
-	"removeAll.occurrences.file.message": "{1}개 파일에서 {0}개를 바꿨습니다.",
-	"replaceAll.occurrences.files.message": "{1}개 파일에서 {0}개를 '{2}'(으)로 바꿨습니다.",
-	"removeAll.occurrences.files.message": "{1}개 파일에서 {0}개를 바꿨습니다.",
-	"removeAll.occurrence.file.confirmation.message": "{1}개 파일에서 {0}개를 '{2}'(으)로 바꾸시겠습니까?",
-	"replaceAll.occurrence.file.confirmation.message": "{1}개 파일에서 {0}개를 바꾸시겠습니까?",
-	"removeAll.occurrence.files.confirmation.message": "{1}개 파일에서 {0}개를 '{2}'(으)로 바꾸시겠습니까?",
-	"replaceAll.occurrence.files.confirmation.message": "{1}개 파일에서 {0}개를 바꾸시겠습니까?",
-	"removeAll.occurrences.file.confirmation.message": "{1}개 파일에서 {0}개를 '{2}'(으)로 바꾸시겠습니까?",
-	"replaceAll.occurrences.file.confirmation.message": "{1}개 파일에서 {0}개를 바꾸시겠습니까?",
-	"removeAll.occurrences.files.confirmation.message": "{1}개 파일에서 {0}개를 '{2}'(으)로 바꾸시겠습니까?",
-	"replaceAll.occurrences.files.confirmation.message": "{1}개 파일에서 {0}개를 바꾸시겠습니까?",
-	"treeAriaLabel": "검색 결과",
-	"searchPathNotFoundError": "검색 경로를 찾을 수 없음: {0}",
-	"searchMaxResultsWarning": "결과 집합에는 모든 일치 항목의 하위 집합만 포함됩니다. 결과 범위를 좁히려면 검색을 더 세분화하세요.",
-	"searchCanceled": "결과를 찾기 이전에 검색이 취소되었습니다. -",
-	"noResultsIncludesExcludes": "'{0}'에 '{1}'을(를) 제외한 결과 없음 - ",
-	"noResultsIncludes": "'{0}'에 결과 없음 - ",
-	"noResultsExcludes": "'{0}'을(를) 제외하는 결과가 없음 - ",
-	"noResultsFound": "결과가 없습니다. 구성된 예외 설정을 검토하고 파일을 무시하세요.",
-	"rerunSearch.message": "다시 검색",
-	"rerunSearchInAll.message": "모든 파일에서 다시 검색",
-	"openSettings.message": "설정 열기",
-	"openSettings.learnMore": "자세한 정보",
-	"ariaSearchResultsStatus": "검색에서 {1}개의 파일에 {0}개의 결과를 반환했습니다.",
-	"search.file.result": "{1}개 파일에서 {0}개 결과",
-	"search.files.result": "{1}개 파일에서 {0}개 결과",
-	"search.file.results": "{1}개 파일에서 {0}개 결과",
-	"search.files.results": "{1}개 파일에서 {0}개 결과",
-	"searchWithoutFolder": "아직 폴더를 열지 않았습니다. 현재 열린 파일만 검색됩니다. ",
-	"openFolder": "폴더 열기"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/search/browser/searchWidget.i18n.json b/i18n/kor/src/vs/workbench/parts/search/browser/searchWidget.i18n.json
deleted file mode 100644
index 5fb23573a4f..00000000000
--- a/i18n/kor/src/vs/workbench/parts/search/browser/searchWidget.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"search.action.replaceAll.disabled.label": "모두 바꾸기(사용하려면 검색 전송)",
-	"search.action.replaceAll.enabled.label": "모두 바꾸기",
-	"search.replace.toggle.button.title": "바꾸기 설정/해제",
-	"label.Search": "검색: 검색어를 입력하고 Enter 키를 눌러서 검색하세요. 취소하려면 Esc 키를 누르세요.",
-	"search.placeHolder": "검색",
-	"label.Replace": "바꾸기: 바꿀 용어를 입력한 후 미리 보려면 <Enter> 키를 누르고 취소하려면 <Esc> 키를 누르세요.",
-	"search.replace.placeHolder": "바꾸기",
-	"regexp.validationFailure": "식이 모든 항목과 일치",
-	"regexp.backreferenceValidationFailure": "역참조는 지원되지 않습니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/search/common/queryBuilder.i18n.json b/i18n/kor/src/vs/workbench/parts/search/common/queryBuilder.i18n.json
deleted file mode 100644
index 7429c4c4e1d..00000000000
--- a/i18n/kor/src/vs/workbench/parts/search/common/queryBuilder.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"search.noWorkspaceWithName": "작업 영역에 이름이 {0}인 폴더가 없습니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json b/i18n/kor/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
deleted file mode 100644
index b8f4fa84a25..00000000000
--- a/i18n/kor/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"search": "검색",
-	"copyMatchLabel": "복사",
-	"copyPathLabel": "경로 복사",
-	"copyAllLabel": "모두 복사",
-	"clearSearchHistoryLabel": "검색 기록 지우기",
-	"toggleSearchViewPositionLabel": "검색 보기 위치 토글",
-	"findInFolder": "폴더에서 찾기...",
-	"findInWorkspace": "작업 영역에서 찾기...",
-	"showTriggerActions": "작업 영역에서 기호로 이동...",
-	"name": "검색",
-	"showSearchViewl": "검색 표시",
-	"view": "보기",
-	"findInFiles": "파일에서 찾기",
-	"openAnythingHandlerDescription": "파일로 이동",
-	"openSymbolDescriptionNormal": "작업 영역에서 기호로 이동",
-	"searchConfigurationTitle": "검색",
-	"exclude": "검색에서 파일 및 폴더를 제외하도록 GLOB 패턴을 구성합니다. files.exclude 설정에서 모든 GLOB 패턴을 상속합니다.",
-	"exclude.boolean": "파일 경로를 일치시킬 GLOB 패턴입니다. 패턴을 사용하거나 사용하지 않도록 설정하려면 true 또는 false로 설정하세요.",
-	"exclude.when": "일치하는 파일의 형제에 대한 추가 검사입니다. $(basename)을 일치하는 파일 이름에 대한 변수로 사용하세요.",
-	"useRipgrep": "텍스트 및 파일 검색에서 ripgrep 사용 여부를 제어합니다.",
-	"useIgnoreFiles": "파일을 검색할 때 .gitignore 파일 및 .ignore 파일을 사용할지 여부를 제어합니다.",
-	"search.quickOpen.includeSymbols": "Quick Open에 대한 파일 결과에 전역 기호 검색 결과를 포함하도록 구성합니다.",
-	"search.followSymlinks": "검색하는 동안 symlink를 누를지 여부를 제어합니다.",
-	"search.smartCase": "패턴이 모두 소문자인 경우 대/소문자를 구분하지 않고 검색하고, 그렇지 않으면 대/소문자를 구분하여 검색합니다.",
-	"search.globalFindClipboard": "macOS에서 검색 보기가 공유 클립보드 찾기를 읽거나 수정해야 할지를 제어합니다.",
-	"search.location": "검색을 사이드바의 보기로 표시할지 또는 가로 간격을 늘리기 위해 패널 영역의 패널로 표시할지를 제어합니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/search/electron-browser/searchActions.i18n.json b/i18n/kor/src/vs/workbench/parts/search/electron-browser/searchActions.i18n.json
deleted file mode 100644
index 32615898bd4..00000000000
--- a/i18n/kor/src/vs/workbench/parts/search/electron-browser/searchActions.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"findInFolder": "폴더에서 찾기...",
-	"findInWorkspace": "작업 영역에서 찾기..."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/snippets/electron-browser/TMSnippets.i18n.json b/i18n/kor/src/vs/workbench/parts/snippets/electron-browser/TMSnippets.i18n.json
deleted file mode 100644
index c9ce2ccb5f3..00000000000
--- a/i18n/kor/src/vs/workbench/parts/snippets/electron-browser/TMSnippets.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"vscode.extension.contributes.snippets": "코드 조각을 적용합니다.",
-	"vscode.extension.contributes.snippets-language": "이 코드 조각이 적용되는 언어 식별자입니다.",
-	"vscode.extension.contributes.snippets-path": "코드 조각 파일의 경로입니다. 이 경로는 확장 폴더의 상대 경로이며 일반적으로 './snippets/'로 시작합니다.",
-	"invalid.language": "`contributes.{0}.language`에 알 수 없는 언어가 있습니다. 제공된 값: {1}",
-	"invalid.path.0": "`contributes.{0}.path`에 문자열이 필요합니다. 제공된 값: {1}",
-	"invalid.path.1": "확장 폴더({2})에 포함할 `contributes.{0}.path`({1})가 필요합니다. 확장이 이식 불가능해질 수 있습니다.",
-	"badVariableUse": "\"{0}\"-snippet은 snippet-variables 및 snippet-placeholders와 혼동하기 쉽습니다. 자세한 내용은\n https://code.visualstudio.com/docs/editor/userdefinedsnippets#_snippet-syntax를 참조하세요."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json b/i18n/kor/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json
deleted file mode 100644
index aa0416d884e..00000000000
--- a/i18n/kor/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"global.scope": "(전역)",
-	"global.1": "({0})",
-	"new.global": "새 전역 코드 조각 파일...",
-	"group.global": "기존 코드 조각",
-	"new.global.sep": "새 코드 조각",
-	"openSnippet.pickLanguage": "코드 조각 파일 선택 또는 코드 조각 만들기",
-	"openSnippet.label": "사용자 코드 조각 구성",
-	"preferences": "기본 설정"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/snippets/electron-browser/insertSnippet.i18n.json b/i18n/kor/src/vs/workbench/parts/snippets/electron-browser/insertSnippet.i18n.json
deleted file mode 100644
index 528ca95cbc9..00000000000
--- a/i18n/kor/src/vs/workbench/parts/snippets/electron-browser/insertSnippet.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"snippet.suggestions.label": "코드 조각 삽입",
-	"sep.userSnippet": "사용자 코드 조각",
-	"sep.extSnippet": "확장 코드 조각"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json b/i18n/kor/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json
deleted file mode 100644
index c3fc6b2dfd0..00000000000
--- a/i18n/kor/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"snippetSchema.json.default": "빈 코드 조각",
-	"snippetSchema.json": "사용자 코드 조각 구성",
-	"snippetSchema.json.prefix": "IntelliSense에서 코드 조각을 선택할 때 사용할 접두사입니다.",
-	"snippetSchema.json.body": "코드 조각 콘텐츠입니다. '$1', '${1:defaultText}'를 사용하여 커서 위치를 정의하고, '$0'을 최종 커서 위치에 사용하세요. '${varName}' 및 '${varName:defaultText}'에 변수 값을 삽입하세요(예: '$TM_FILENAME 파일입니다').",
-	"snippetSchema.json.description": "코드 조각 설명입니다.",
-	"snippetSchema.json.scope": "예를 들어, 'typescript,javascript' 와 같이 해당 코드 조각이 적용되는 언어 이름의 목록입니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json b/i18n/kor/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json
deleted file mode 100644
index aab78fb22a4..00000000000
--- a/i18n/kor/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"source.snippetGlobal": "전역 사용자 코드 조각",
-	"source.snippet": "사용자 코드 조각"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json b/i18n/kor/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
deleted file mode 100644
index 4bb4deec5c3..00000000000
--- a/i18n/kor/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"invalid.path.0": "`contributes.{0}.path`에 문자열이 필요합니다. 제공된 값: {1}",
-	"invalid.language.0": "언어를 생략하는 경우 `contributes.{0}.path` 값은 `.code-snippets`-file이어야 합니다. 제공된 값: {1}",
-	"invalid.language": "`contributes.{0}.language`에 알 수 없는 언어가 있습니다. 제공된 값: {1}",
-	"invalid.path.1": "확장 폴더({2})에 포함할 `contributes.{0}.path`({1})가 필요합니다. 확장이 이식 불가능해질 수 있습니다.",
-	"vscode.extension.contributes.snippets": "코드 조각을 적용합니다.",
-	"vscode.extension.contributes.snippets-language": "이 코드 조각이 적용되는 언어 식별자입니다.",
-	"vscode.extension.contributes.snippets-path": "코드 조각 파일의 경로입니다. 이 경로는 확장 폴더의 상대 경로이며 일반적으로 './snippets/'로 시작합니다.",
-	"badVariableUse": "'{0}' 확장의 1개 이상의 코드 조각은 snippet-variables 및 snippet-placeholders와 혼동하기 쉽습니다(자세한 내용은 https://code.visualstudio.com/docs/editor/userdefinedsnippets#_snippet-syntax를 참조하세요).",
-	"badFile": "코드 조각 파일 \"{0}\"을(를) 읽을 수 없습니다.",
-	"detail.snippet": "{0}({1})",
-	"snippetSuggest.longLabel": "{0}, {1}"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/snippets/electron-browser/tabCompletion.i18n.json b/i18n/kor/src/vs/workbench/parts/snippets/electron-browser/tabCompletion.i18n.json
deleted file mode 100644
index d4dba2ce351..00000000000
--- a/i18n/kor/src/vs/workbench/parts/snippets/electron-browser/tabCompletion.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"tabCompletion": "접두사가 일치하는 경우 코드 조각을 삽입합니다. 'quickSuggestions'를 사용하지 않을 때 가장 잘 작동합니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/surveys/electron-browser/languageSurveys.contribution.i18n.json b/i18n/kor/src/vs/workbench/parts/surveys/electron-browser/languageSurveys.contribution.i18n.json
deleted file mode 100644
index e6bd5e0a444..00000000000
--- a/i18n/kor/src/vs/workbench/parts/surveys/electron-browser/languageSurveys.contribution.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"helpUs": "{0}에 대한 지원을 개선하는 데 도움을 주세요.",
-	"takeShortSurvey": "간단한 설문 조사 참여",
-	"remindLater": "나중에 알림",
-	"neverAgain": "다시 표시 안 함"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/surveys/electron-browser/nps.contribution.i18n.json b/i18n/kor/src/vs/workbench/parts/surveys/electron-browser/nps.contribution.i18n.json
deleted file mode 100644
index 9e0d0c2fac7..00000000000
--- a/i18n/kor/src/vs/workbench/parts/surveys/electron-browser/nps.contribution.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"surveyQuestion": "간단한 피드백 설문 조사에 참여하시겠어요?",
-	"takeSurvey": "설문 조사 참여",
-	"remindLater": "나중에 알림",
-	"neverAgain": "다시 표시 안 함"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/tasks/browser/buildQuickOpen.i18n.json b/i18n/kor/src/vs/workbench/parts/tasks/browser/buildQuickOpen.i18n.json
deleted file mode 100644
index 1f6208b0c91..00000000000
--- a/i18n/kor/src/vs/workbench/parts/tasks/browser/buildQuickOpen.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"noTasksMatching": "일치하는 작업 없음"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/tasks/browser/quickOpen.i18n.json b/i18n/kor/src/vs/workbench/parts/tasks/browser/quickOpen.i18n.json
deleted file mode 100644
index cb7d039c613..00000000000
--- a/i18n/kor/src/vs/workbench/parts/tasks/browser/quickOpen.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"entryAriaLabel": "{0}, 작업",
-	"recentlyUsed": "최근에 사용한 작어",
-	"configured": "구성된 작업",
-	"detected": "감지된 작업",
-	"customizeTask": "작업 구성"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/tasks/browser/restartQuickOpen.i18n.json b/i18n/kor/src/vs/workbench/parts/tasks/browser/restartQuickOpen.i18n.json
deleted file mode 100644
index 0417fe610ad..00000000000
--- a/i18n/kor/src/vs/workbench/parts/tasks/browser/restartQuickOpen.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"tasksAriaLabel": "다시 시작할 작업 이름 입력",
-	"noTasksMatching": "일치하는 작업 없음",
-	"noTasksFound": "다시 시작할 작업이 없습니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/tasks/browser/taskQuickOpen.i18n.json b/i18n/kor/src/vs/workbench/parts/tasks/browser/taskQuickOpen.i18n.json
deleted file mode 100644
index 984b5410df2..00000000000
--- a/i18n/kor/src/vs/workbench/parts/tasks/browser/taskQuickOpen.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"tasksAriaLabel": "실행할 작업의 이름 입력",
-	"noTasksMatching": "일치하는 작업 없음",
-	"noTasksFound": "작업을 찾을 수 없음"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/tasks/browser/terminateQuickOpen.i18n.json b/i18n/kor/src/vs/workbench/parts/tasks/browser/terminateQuickOpen.i18n.json
deleted file mode 100644
index a74a36b9ee1..00000000000
--- a/i18n/kor/src/vs/workbench/parts/tasks/browser/terminateQuickOpen.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"tasksAriaLabel": "Type the name of a task to terminate",
-	"noTasksMatching": "일치하는 작업 없음",
-	"noTasksFound": "No tasks to terminate found"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/tasks/browser/testQuickOpen.i18n.json b/i18n/kor/src/vs/workbench/parts/tasks/browser/testQuickOpen.i18n.json
deleted file mode 100644
index 1f6208b0c91..00000000000
--- a/i18n/kor/src/vs/workbench/parts/tasks/browser/testQuickOpen.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"noTasksMatching": "일치하는 작업 없음"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json b/i18n/kor/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json
deleted file mode 100644
index a6d3822b0a1..00000000000
--- a/i18n/kor/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json
+++ /dev/null
@@ -1,76 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"ProblemPatternParser.loopProperty.notLast": "loop 속성은 마지막 줄 검사기에서만 지원됩니다.",
-	"ProblemPatternParser.problemPattern.kindProperty.notFirst": "문제 패턴이 잘못되었습니다. Kind 속성은 첫 번째 요소에만 지정해야 합니다.",
-	"ProblemPatternParser.problemPattern.missingRegExp": "문제 패턴에 정규식이 없습니다.",
-	"ProblemPatternParser.problemPattern.missingProperty": "문제 패턴이 잘못되었습니다. 하나 이상의 파일 및 메시지를 포함해야 합니다.",
-	"ProblemPatternParser.problemPattern.missingLocation": "문제 패턴이 잘못되었습니다. \"파일\" 종류, 줄 또는 위치 일치 그룹을 포함해야 합니다.",
-	"ProblemPatternParser.invalidRegexp": "오류: {0} 문자열은 유효한 정규식이 아닙니다.\n",
-	"ProblemPatternSchema.regexp": "출력에서 오류, 경고 또는 정보를 찾는 정규식입니다.",
-	"ProblemPatternSchema.kind": "패턴이 위치(파일 및 줄)와 일치하는지 또는 파일하고만 일치하는지 여부입니다.",
-	"ProblemPatternSchema.file": "파일 이름의 일치 그룹 인덱스입니다. 생략된 경우 1이 사용됩니다.",
-	"ProblemPatternSchema.location": "문제 위치의 일치 그룹 인덱스입니다. 유효한 위치 패턴은 (line), (line,column) 및 (startLine,startColumn,endLine,endColumn)입니다. 생략하면 (line,column)이 사용됩니다.",
-	"ProblemPatternSchema.line": "문제 줄의 일치 그룹 인덱스입니다. 기본값은 2입니다.",
-	"ProblemPatternSchema.column": "문제의 줄바꿈 문자의 일치 그룹 인덱스입니다. 기본값은 3입니다.",
-	"ProblemPatternSchema.endLine": "문제 끝 줄의 일치 그룹 인덱스입니다. 기본적으로 정의되지 않습니다.",
-	"ProblemPatternSchema.endColumn": "문제의 끝 줄바꿈 문자의 일치 그룹 인덱스입니다. 기본값은 정의되지 않았습니다.",
-	"ProblemPatternSchema.severity": "문제 심각도의 일치 그룹 인덱스입니다. 기본적으로 정의되지 않습니다.",
-	"ProblemPatternSchema.code": "문제 코드의 일치 그룹 인덱스입니다. 기본적으로 정의되지 않습니다.",
-	"ProblemPatternSchema.message": "메시지의 일치 그룹 인덱스입니다. 생략된 경우 기본값은 위치가 지정된 경우 4이고, 그렇지 않으면 5입니다.",
-	"ProblemPatternSchema.loop": "여러 줄 선택기 루프에서는 이 패턴이 일치할 경우 루프에서 패턴을 실행할지 여부를 나타냅니다. 여러 줄 패턴의 마지막 패턴에 대해서만 지정할 수 있습니다.",
-	"NamedProblemPatternSchema.name": "문제 패턴의 이름입니다.",
-	"NamedMultiLineProblemPatternSchema.name": "여러 줄 문제 패턴의 이름입니다.",
-	"NamedMultiLineProblemPatternSchema.patterns": "실제 패턴입니다.",
-	"ProblemPatternExtPoint": "문제 패턴을 제공합니다.",
-	"ProblemPatternRegistry.error": "잘못된 문제 패턴입니다. 패턴이 무시됩니다.",
-	"ProblemMatcherParser.noProblemMatcher": "오류: 설명을 문제 선택기로 변환할 수 없습니다.\n{0}\n",
-	"ProblemMatcherParser.noProblemPattern": "오류: 설명에서 유효한 문제 패턴을 정의하지 않습니다.\n{0}\n",
-	"ProblemMatcherParser.noOwner": "오류: 설명에서 소유자를 정의하지 않습니다.\n{0}\n",
-	"ProblemMatcherParser.noFileLocation": "오류: 설명에서 파일 위치를 정의하지 않습니다.\n{0}\n",
-	"ProblemMatcherParser.unknownSeverity": "정보: 알 수 없는 심각도 {0}. 유효한 값은 오류, 경고 및 정보입니다.\n",
-	"ProblemMatcherParser.noDefinedPatter": "오류: 식별자가 {0}인 패턴이 없습니다.",
-	"ProblemMatcherParser.noIdentifier": "오류: 패턴 속성이 빈 식별자를 참조합니다.",
-	"ProblemMatcherParser.noValidIdentifier": "오류: 패턴 속성 {0}이(가) 유효한 패턴 변수 이름이 아닙니다.",
-	"ProblemMatcherParser.problemPattern.watchingMatcher": "문제 검사기에서 감시 시작 패턴과 종료 패턴을 모두 정의해야 합니다.",
-	"ProblemMatcherParser.invalidRegexp": "오류: {0} 문자열은 유효한 정규식이 아닙니다.\n",
-	"WatchingPatternSchema.regexp": "백그라운드 작업의 시작 또는 종료를 감지하는 정규식입니다.",
-	"WatchingPatternSchema.file": "파일 이름의 일치 그룹 인덱스이며 생략할 수 있습니다.",
-	"PatternTypeSchema.name": "제공되거나 미리 정의된 패턴의 이름",
-	"PatternTypeSchema.description": "문제 패턴 또는 제공되거나 미리 정의된 문제 패턴의 이름입니다. 기본이 지정된 경우 생략할 수 있습니다.",
-	"ProblemMatcherSchema.base": "사용할 기본 문제 선택기의 이름입니다.",
-	"ProblemMatcherSchema.owner": "Code 내부의 문제 소유자입니다. 기본값을 지정한 경우 생략할 수 있습니다. 기본값을 지정하지 않고 생략한 경우 기본값은 '외부'입니다.",
-	"ProblemMatcherSchema.source": "이 진단의 소스를 설명하는 사람이 읽을 수 있는 문자열입니다(예: 'typescript' 또는 'super lint').",
-	"ProblemMatcherSchema.severity": "캡처 문제에 대한 기본 심각도입니다. 패턴에서 심각도에 대한 일치 그룹을 정의하지 않은 경우에 사용됩니다.",
-	"ProblemMatcherSchema.applyTo": "텍스트 문서에 복된 문제가 열린 문서, 닫힌 문서 또는 모든 문서에 적용되는지를 제어합니다.",
-	"ProblemMatcherSchema.fileLocation": "문제 패턴에 보고된 파일 이름을 해석하는 방법을 정의합니다.",
-	"ProblemMatcherSchema.background": "백그라운드 작업에서 활성 상태인 matcher의 시작과 끝을 추적하는 패턴입니다.",
-	"ProblemMatcherSchema.background.activeOnStart": "true로 설정한 경우 작업이 시작되면 백그라운드 모니터가  활성 모드로 전환됩니다. 이는 beginPattern과 일치하는 줄을 실행하는 것과 같습니다.",
-	"ProblemMatcherSchema.background.beginsPattern": "출력이 일치하는 경우 백그라운드 작업을 시작할 때 신호를 받습니다.",
-	"ProblemMatcherSchema.background.endsPattern": "출력이 일치하는 경우 백그라운드 작업을 끝날 때 신호를 받습니다.",
-	"ProblemMatcherSchema.watching.deprecated": "조사 속성은 사용되지 않습니다. 백그라운드 속성을 대신 사용하세요.",
-	"ProblemMatcherSchema.watching": "조사 matcher의 시작과 끝을 추적하는 패턴입니다.",
-	"ProblemMatcherSchema.watching.activeOnStart": "true로 설정한 경우 작업이 시작되면 선택기가 활성 모드로 전환됩니다. 이는 beginPattern과 일치하는 줄을 실행하는 것과 같습니다.",
-	"ProblemMatcherSchema.watching.beginsPattern": "출력이 일치하는 경우 조사 작업을 시작할 때 신호를 받습니다.",
-	"ProblemMatcherSchema.watching.endsPattern": "출력이 일치하는 경우 조사 작업을 끝날 때 신호를 받습니다.",
-	"LegacyProblemMatcherSchema.watchedBegin.deprecated": "이 속성은 사용되지 않습니다. 대신 감시 속성을 사용하세요.",
-	"LegacyProblemMatcherSchema.watchedBegin": "파일 감시를 통해 트리거되는 감시되는 작업이 시작됨을 나타내는 정규식입니다.",
-	"LegacyProblemMatcherSchema.watchedEnd.deprecated": "이 속성은 사용되지 않습니다. 대신 감시 속성을 사용하세요.",
-	"LegacyProblemMatcherSchema.watchedEnd": "감시되는 작업이 종료됨을 나타내는 정규식입니다.",
-	"NamedProblemMatcherSchema.name": "참조를 위한 문제 선택기의 이름입니다.",
-	"NamedProblemMatcherSchema.label": "사람이 읽을 수 있는 문제 일치기의 레이블입니다.",
-	"ProblemMatcherExtPoint": "문제 선택기를 제공합니다.",
-	"msCompile": "Microsoft 컴파일러 문제",
-	"lessCompile": "문제 적게 보기",
-	"gulp-tsc": "Gulp TSC 문제",
-	"jshint": "JSHint 문제",
-	"jshint-stylish": "JSHint 스타일 문제",
-	"eslint-compact": "ESLint 컴팩트 문제",
-	"eslint-stylish": "ESLint 스타일 문제",
-	"go": "이동 문제"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/tasks/common/taskConfiguration.i18n.json b/i18n/kor/src/vs/workbench/parts/tasks/common/taskConfiguration.i18n.json
deleted file mode 100644
index aa72080ed62..00000000000
--- a/i18n/kor/src/vs/workbench/parts/tasks/common/taskConfiguration.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"ConfigurationParser.invalidCWD": "경고: options.cwd는 string 형식이어야 합니다. {0} 값을 무시합니다.\n",
-	"ConfigurationParser.noargs": "오류: 명령 인수는 문자열의 배열이어야 합니다. 제공된 값:\n{0}",
-	"ConfigurationParser.noShell": "경고: 셸 구성은 작업을 터미널에서 실행 중일 때에만 지원됩니다.",
-	"ConfigurationParser.noName": "오류: 선언 범위 내의 문제 선택기는 이름이 있어야 합니다.\n{0}\n",
-	"ConfigurationParser.unknownMatcherKind": "경고: 정의된 문제 선택기를 알 수 없습니다. 지원되는 형식은 string | ProblemMatcher |(string | ProblemMatcher)[]입니다.\n{0}\n",
-	"ConfigurationParser.invalidVaraibleReference": "오류: 잘못된 problemMatcher 참조:  {0}\n",
-	"ConfigurationParser.noTaskName": "오류: 작업에서 taskName 속성을 제공해야 합니다. 이 작업은 무시됩니다.\n{0}\n",
-	"taskConfiguration.shellArgs": "경고: 작업 '{0}'은(는) 셸 명령이며, 명령 이름이나 인수 중 하나에 이스케이프되지 않은 공백이 있습니다. 명령줄 인용을 올바르게 하려면 인수를 명령으로 병합하세요.",
-	"taskConfiguration.noCommandOrDependsOn": "오류: 작업 '{0}'에서 명령이나 dependsOn 속성을 지정하지 않습니다. 이 작업은 무시됩니다. 해당 작업의 정의는 {1}입니다.",
-	"taskConfiguration.noCommand": "오류: 작업 '{0}'에서 명령을 정의하지 않습니다. 이 작업은 무시됩니다. 해당 작업의 정의는\n{1}입니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/tasks/common/taskDefinitionRegistry.i18n.json b/i18n/kor/src/vs/workbench/parts/tasks/common/taskDefinitionRegistry.i18n.json
deleted file mode 100644
index b4c7aa7cab8..00000000000
--- a/i18n/kor/src/vs/workbench/parts/tasks/common/taskDefinitionRegistry.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"TaskDefinition.description": "실제 작업 형식입니다. '$'로 시작하는 형식은 내부용으로 예약되어 있습니다.",
-	"TaskDefinition.properties": "작업 유형의 추가 속성",
-	"TaskTypeConfiguration.noType": "작업 유형 구성에 필요한 'taskType' 속성이 없음",
-	"TaskDefinitionExtPoint": "작업 유형 적용"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/tasks/common/taskTemplates.i18n.json b/i18n/kor/src/vs/workbench/parts/tasks/common/taskTemplates.i18n.json
deleted file mode 100644
index af688a79fea..00000000000
--- a/i18n/kor/src/vs/workbench/parts/tasks/common/taskTemplates.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"dotnetCore": ".NET Core 빌드 명령을 실행합니다.",
-	"msbuild": "빌드 대상을 실행합니다.",
-	"externalCommand": "임의의 외부 명령을 실행하는 예",
-	"Maven": "일반적인 Maven 명령을 실행합니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/tasks/common/taskTypeRegistry.i18n.json b/i18n/kor/src/vs/workbench/parts/tasks/common/taskTypeRegistry.i18n.json
deleted file mode 100644
index 8b6ad71cd4e..00000000000
--- a/i18n/kor/src/vs/workbench/parts/tasks/common/taskTypeRegistry.i18n.json
+++ /dev/null
@@ -1,6 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/tasks/electron-browser/jsonSchemaCommon.i18n.json b/i18n/kor/src/vs/workbench/parts/tasks/electron-browser/jsonSchemaCommon.i18n.json
deleted file mode 100644
index b993ad035fe..00000000000
--- a/i18n/kor/src/vs/workbench/parts/tasks/electron-browser/jsonSchemaCommon.i18n.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"JsonSchema.options": "추가 명령 옵션",
-	"JsonSchema.options.cwd": "실행된 프로그램 또는 스크립트의 현재 작업 디렉터리입니다. 생략된 경우 Code의 현재 작업 영역 루트가 사용됩니다.",
-	"JsonSchema.options.env": "실행할 프로그램 또는 셸의 환경입니다. 생략하면 부모 프로세스의 환경이 사용됩니다.",
-	"JsonSchema.shellConfiguration": "사용할 셸을 구성합니다.",
-	"JsonSchema.shell.executable": "사용할 셸입니다.",
-	"JsonSchema.shell.args": "셸 인수입니다.",
-	"JsonSchema.command": "실행할 명령이며, 외부 프로그램 또는 셸 명령입니다.",
-	"JsonSchema.tasks.args": "이 작업이 호출될 때 명령에 전달되는 인수입니다.",
-	"JsonSchema.tasks.taskName": "작업 이름",
-	"JsonSchema.tasks.windows": "Windows 특정 명령 구성",
-	"JsonSchema.tasks.mac": "Mac 특정 명령 구성",
-	"JsonSchema.tasks.linux": "Linux 특정 명령 구성",
-	"JsonSchema.tasks.suppressTaskName": "작업 이름을 명령에 인수로 추가할지 여부를 제어합니다. 생략하면 전역적으로 정의된 값이 사용됩니다.",
-	"JsonSchema.tasks.showOutput": "실행 중인 작업에 대한 출력을 표시할지 여부를 제어합니다. 생략하면 전역적으로 정의된 값이 사용됩니다.",
-	"JsonSchema.echoCommand": "실행된 명령을 출력에 에코할지 여부를 제어합니다. 기본값은 false입니다.",
-	"JsonSchema.tasks.watching.deprecation": "사용되지 않습니다. 대신 isBackground를 사용합니다.",
-	"JsonSchema.tasks.watching": "실행된 작업을 활성 상태로 유지할지 파일 시스템을 조사할지 여부를 나타냅니다.",
-	"JsonSchema.tasks.background": "실행한 작업을 활성 상태로 유지하고 배경에서 실행하는지 여부입니다.",
-	"JsonSchema.tasks.promptOnClose": "실행 중인 작업이 있는 VS Code가 닫힐 때 사용자에게 메시지를 표시할지 여부입니다.",
-	"JsonSchema.tasks.build": "이 작업을 Code의 기본 빌드 명령에 매핑합니다.",
-	"JsonSchema.tasks.test": "이 작업을 Code의 기본 테스트 명령에 매핑합니다.",
-	"JsonSchema.tasks.matchers": "사용할 문제 선택기입니다. 문자열, 문제 선택기 정의 또는 문자열 및 문제 선택기 배열일 수 있습니다.",
-	"JsonSchema.args": "명령에 전달되는 추가 인수입니다.",
-	"JsonSchema.showOutput": "실행 중인 작업에 대한 출력을 표시할지 여부를 제어합니다. 생략하면 '항상'이 사용됩니다.",
-	"JsonSchema.watching.deprecation": "사용되지 않습니다. 대신 isBackground를 사용합니다.",
-	"JsonSchema.watching": "실행된 작업을 활성 상태로 유지할지 파일 시스템을 조사할지 여부를 나타냅니다.",
-	"JsonSchema.background": "실행한 작업을 활성 상태로 유지하고 배경에서 실행하는지 여부입니다.",
-	"JsonSchema.promptOnClose": "백그라운드 작업이 실행 중인 상태에서 VS Code가 종료될 경우 사용자에게 메시지를 표시할지 여부를 나타냅니다.",
-	"JsonSchema.suppressTaskName": "작업 이름을 명령에 인수로 추가할지 여부를 제어합니다. 기본값은 false입니다.",
-	"JsonSchema.taskSelector": "인수가 작업임을 나타내는 접두사입니다.",
-	"JsonSchema.matchers": "사용할 문제 선택기입니다. 문자열, 문제 선택기 정의 또는 문자열 및 문제 선택기 배열일 수 있습니다.",
-	"JsonSchema.tasks": "작업 구성입니다. 일반적으로 외부 Task Runner에 이미 정의되어 있는 작업을 보강합니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v1.i18n.json b/i18n/kor/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v1.i18n.json
deleted file mode 100644
index e003780a8dc..00000000000
--- a/i18n/kor/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v1.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"JsonSchema.version": "구성의 버전 번호입니다.",
-	"JsonSchema._runner": "러너가 더 이상 사용되지 않습니다. 공식 러너 속성을 사용하세요.",
-	"JsonSchema.runner": "작업이 프로세스로 실행되는지 여부와 출력이 출력 창이나 터미널 내부 중 어디에 표시되는지를 정의합니다.",
-	"JsonSchema.windows": "Windows 특정 명령 구성",
-	"JsonSchema.mac": "Mac 특정 명령 구성",
-	"JsonSchema.linux": "Linux 특정 명령 구성",
-	"JsonSchema.shell": "명령이 셸 명령인지 외부 프로그램인지 여부를 지정합니다. 생략하면 기본값 false가 사용됩니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json b/i18n/kor/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
deleted file mode 100644
index 5dfbb2074f0..00000000000
--- a/i18n/kor/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"JsonSchema.shell": "명령이 셸 명령인지 외부 프로그램인지 여부를 지정합니다. 생략하면 기본값 false가 사용됩니다.",
-	"JsonSchema.tasks.isShellCommand.deprecated": "isShellCommand 속성은 사용 중단되었습니다. 작업의 유형 속성과 셸 속성을 대신 사용하세요. 1.14 릴리스 노트를 참고하세요.",
-	"JsonSchema.tasks.dependsOn.string": "이 작업이 종속된 또 다른 작업입니다.",
-	"JsonSchema.tasks.dependsOn.array": "이 작업이 종속된 다른 여러 작업입니다.",
-	"JsonSchema.tasks.presentation": "작업의 출력을 제시하고 입력을 읽는 데 사용하는 패널을 구성합니다.",
-	"JsonSchema.tasks.presentation.echo": "실행된 명령을 패널에 에코할지 결정합니다. 기본값은 true입니다.",
-	"JsonSchema.tasks.presentation.focus": "패널이 포커스를 잡는지 결정합니다. 기본값은 false입니다. true로 설정하면 패널도 드러납니다.",
-	"JsonSchema.tasks.presentation.reveal.always": "이 작업이 호출될 때 터미널을 항상 표시합니다.",
-	"JsonSchema.tasks.presentation.reveal.silent": "문제 선택기가 작업과 연결되어 있지 않고 실행하는 중 오류가 발생하는 경우에만 터미널을 표시합니다.",
-	"JsonSchema.tasks.presentation.reveal.never": "작업을 실행할 때 터미널을 표시하지 않습니다.",
-	"JsonSchema.tasks.presentation.reveals": "작업을 실행 중인 패널이 표시되는지 여부를 제어합니다. 기본값은 \"항상\"입니다.",
-	"JsonSchema.tasks.presentation.instance": "패널을 작업 간에 공유할지 결정합니다. 이 작업 전용 패널로 사용하거나 실행할 때마다 새로 생성합니다.",
-	"JsonSchema.tasks.terminal": "이 터미널 속성은 사용되지 않습니다. 프레젠테이션을 대신 사용하세요.",
-	"JsonSchema.tasks.group.kind": "작업 실행 그룹입니다.",
-	"JsonSchema.tasks.group.isDefault": "작업이 그룹 내 기본 작업에 있는지 정의합니다.",
-	"JsonSchema.tasks.group.defaultBuild": "이 작업을 기본 빌드 작업으로 표시합니다.",
-	"JsonSchema.tasks.group.defaultTest": "이 작업을 기본 테스트 작업으로 표시합니다.",
-	"JsonSchema.tasks.group.build": "이 작업을 '빌드 작업 실행' 명령을 통해 액세스 가능한 빌드 작업으로 표시합니다.",
-	"JsonSchema.tasks.group.test": "이 작업을 '테스트 작업 실행' 명령을 통해 액세스할 수 있는 테스트 작업으로 표시합니다.",
-	"JsonSchema.tasks.group.none": "작업을 그룹에 할당 안 함",
-	"JsonSchema.tasks.group": "이 작업을 할당할 실행 그룹을 정의합니다. 빌드 그룹에 추가를 위한 \"build'와 테스트 그룹에 추가를 위한 \"test\"를 지원합니다.",
-	"JsonSchema.tasks.type": "작업이 프로세스로 실행되는지 또는 셸 내의 명령으로 실행되는지를 제어합니다.",
-	"JsonSchema.commandArray": "실행할 셸 명령입니다. 배열 항목은 공백 문자를 사용하여 연결됩니다.",
-	"JsonSchema.command.quotedString.value": "실제 명령 값",
-	"JsonSchema.tasks.quoting.escape": "셸의 이스케이프 문자를 사용하여 문자를 이스케이프합니다(예: ` under PowerShell 및 \\ under bash).",
-	"JsonSchema.tasks.quoting.strong": "셸의 강력한 따옴표 문자를 사용하여 인수를 따옴표 처리합니다(예: \" under PowerShell and bash).",
-	"JsonSchema.tasks.quoting.weak": "셸의 약한 따옴표 문자를 사용하여 인수를 따옴표 처리합니다(예: PowerShell 및 bash의 경우 ').",
-	"JsonSchema.command.quotesString.quote": "명령 값을 따옴표로 묶을 방법입니다.",
-	"JsonSchema.command": "실행할 명령이며, 외부 프로그램 또는 셸 명령입니다.",
-	"JsonSchema.args.quotedString.value": "실제 인수 값",
-	"JsonSchema.args.quotesString.quote": "인수 값을 따옴표로 묶을 방법입니다.",
-	"JsonSchema.tasks.args": "이 작업이 호출될 때 명령에 전달되는 인수입니다.",
-	"JsonSchema.tasks.label": "작업 사용자 인터페이스 레이블",
-	"JsonSchema.version": "구성의 버전 번호입니다.",
-	"JsonSchema.tasks.identifier": "작업을 launch.json 또는 dependsOn 구문에서 참조할 사용자 정의 식별자입니다.",
-	"JsonSchema.tasks.taskLabel": "작업 레이블",
-	"JsonSchema.tasks.taskName": "작업 이름",
-	"JsonSchema.tasks.taskName.deprecated": "이 작업 이름은 사용되지 않습니다. 레이블 속성을 대신 사용하세요.",
-	"JsonSchema.tasks.background": "실행한 작업을 활성 상태로 유지하고 배경에서 실행하는지 여부입니다.",
-	"JsonSchema.tasks.promptOnClose": "실행 중인 작업이 있는 VS Code가 닫힐 때 사용자에게 메시지를 표시할지 여부입니다.",
-	"JsonSchema.tasks.matchers": "사용할 문제 선택기입니다. 문자열, 문제 선택기 정의 또는 문자열 및 문제 선택기 배열일 수 있습니다.",
-	"JsonSchema.customizations.customizes.type": "사용자 지정할 작업 유형",
-	"JsonSchema.tasks.customize.deprecated": "사용자 지정 속성은 사용되지 않습니다. 새로운 작업 사용자 지정 방식으로 마이그레이션을 위해 1.14 릴리스 노트를 참고하세요.",
-	"JsonSchema.tasks.showOputput.deprecated": "showOutput 속성은 사용되지 않습니다. 대신 presentation 속성 내 reveal 속성을 사용하세요. 1.14 릴리스 노트도 참고하세요.",
-	"JsonSchema.tasks.echoCommand.deprecated": "echoCommand 속성은 사용되지 않습니다. 대신 presentation 속성 내 echo 속성을 사용하세요. 1.14 릴리스 노트도 참고하세요.",
-	"JsonSchema.tasks.suppressTaskName.deprecated": "suppressTaskName 속성은 사용되지 않습니다. 대신 명령을 인수와 함께 작업에 인라인으로 삽입하세요. 1.14 릴리스 노트를 참고하세요.",
-	"JsonSchema.tasks.isBuildCommand.deprecated": "isBuildCommand 속성은 사용되지 않습니다. 대신 group 속성을 사용하세요. 1.14 릴리스 노트도 참고하세요.",
-	"JsonSchema.tasks.isTestCommand.deprecated": "isTestCommand 속성은 사용되지 않습니다. 대신 group 속성을 사용하세요. 1.14 릴리스 노트를 참고하세요.",
-	"JsonSchema.tasks.taskSelector.deprecated": "taskSelector 속성은 사용되지 않습니다. 대신 명령을 인수와 함께 작업에 인라인으로 삽입하세요. 1.14 릴리스 노트를 참고하세요.",
-	"JsonSchema.windows": "Windows 특정 명령 구성",
-	"JsonSchema.mac": "Mac 특정 명령 구성",
-	"JsonSchema.linux": "Linux 특정 명령 구성"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json b/i18n/kor/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
deleted file mode 100644
index 7b483f685d0..00000000000
--- a/i18n/kor/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
+++ /dev/null
@@ -1,89 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"tasksCategory": "작업",
-	"ConfigureTaskRunnerAction.label": "작업 구성",
-	"totalErrors": "오류 {0}개",
-	"totalWarnings": "경고 {0}개",
-	"totalInfos": "정보 {0}개",
-	"problems": "문제",
-	"building": "빌드하고 있습니다...",
-	"manyProblems": "10K+",
-	"runningTasks": "실행 중인 작업 표시",
-	"tasks": "작업",
-	"TaskSystem.noHotSwap": "실행 중인 활성 작업이 있는 작업 실행 엔진을 변경하면 Window를 다시 로드해야 합니다.",
-	"reloadWindow": "창 다시 로드",
-	"TaskServer.folderIgnored": "작업 버전 0.1.0을 사용하므로 {0} 폴더가 무시됩니다.",
-	"TaskService.noBuildTask1": "정의된 빌드 작업이 없습니다. tasks.json 파일에서 작업을 'isBuildCommand'로 표시하세요.",
-	"TaskService.noBuildTask2": "정의된 빌드 작업이 없습니다. tasks.json 파일에서 작업을 'build'로 표시하세요.",
-	"TaskService.noTestTask1": "정의된 테스트 작업이 없습니다. tasks.json 파일에서 작업을 'isTestCommand'로 표시하세요.",
-	"TaskService.noTestTask2": "정의된 테스트 작업이 없습니다. tasks.json 파일에서 작업을 'test'로 표시하세요.",
-	"TaskServer.noTask": "실행하도록 요청한 작업 {0}을(를) 찾을 수 없습니다.",
-	"TaskService.associate": "연결",
-	"TaskService.attachProblemMatcher.continueWithout": "작업 출력을 스캔하지 않고 계속",
-	"TaskService.attachProblemMatcher.never": "작업 출력 스캔 안 함",
-	"TaskService.attachProblemMatcher.learnMoreAbout": "작업 출력 스캔에 대해 자세히 알아보기",
-	"selectProblemMatcher": "작업 출력에서 스캔할 오류 및 경고 유형을 선택",
-	"customizeParseErrors": "현재 작성 구성에 오류가 있습니다. 작업을 사용자 지정하기 전에 오류를 수정하세요.\n",
-	"moreThanOneBuildTask": "tasks.json에 여러 빌드 작업이 정의되어 있습니다. 첫 번째 작업을 실행합니다.\n",
-	"TaskSystem.activeSame.background": "'{0}' 작업이 이미 활성 상태이며 백그라운드 모드입니다.",
-	"TaskSystem.activeSame.noBackground": "'{0}' 작업은 이미 활성 상태입니다.",
-	"terminateTask": "작업 종료",
-	"restartTask": "작업 다시 시작",
-	"TaskSystem.active": "이미 실행 중인 작업이 있습니다. 다른 작업을 실행하려면 먼저 이 작업을 종료하세요.",
-	"TaskSystem.restartFailed": "{0} 작업을 종료하고 다시 시작하지 못했습니다.",
-	"TaskService.noConfiguration": "오류: {0} 작업 검색에서는 다음 구성에 대한 작업을 제공하지 않습니다:\n{1}\n이 작업이 무시됩니다.\n",
-	"TaskSystem.configurationErrors": "오류: 제공한 작업 구성에 유효성 검사 오류가 있으며 사용할 수 없습니다. 먼저 오류를 수정하세요.",
-	"taskService.ignoreingFolder": "작업 영역 폴더 {0}에 대한 작업 구성을 무시합니다. 여러 폴더 작업 영역 작업 지원은 모든 폴더가 작업 버전 2.0.0을 사용해야 합니다.\n",
-	"TaskSystem.invalidTaskJson": "오류: tasks.json 파일의 내용에 구문 오류가 있습니다. 작업을 실행하기 전에 오류를 정정하세요.\n",
-	"TaskSystem.runningTask": "실행 중인 작업이 있습니다. 이 작업을 종료할까요?",
-	"TaskSystem.terminateTask": "작업 종료(&&T)",
-	"TaskSystem.noProcess": "시작된 작업이 더 이상 존재하지 않습니다. 작업에서 생성된, VS Code를 끝내는 백그라운드 프로세스가 분리된 프로세스가 될 수 있습니다. 이를 방지하려면 wait 플래그를 사용하여 마지막 백그라운드 프로세스를 시작하세요.",
-	"TaskSystem.exitAnyways": "끝내기(&&E)",
-	"TerminateAction.label": "작업 종료",
-	"TaskSystem.unknownError": "작업을 실행하는 동안 오류가 발생했습니다. 자세한 내용은 작업 로그를 참조하세요.",
-	"TaskService.noWorkspace": "작업은 작업 영역 폴더에서만 사용할 수 있습니다.",
-	"recentlyUsed": "최근에 사용한 작업",
-	"configured": "구성된 작업",
-	"detected": "감지된 작업",
-	"TaskService.ignoredFolder": "작업 버전 0.1.0을 사용하기 때문에 다음 작업 영역 폴더는 무시됩니다. {0}",
-	"TaskService.notAgain": "다시 표시 안 함",
-	"TaskService.pickRunTask": "실행할 작업 선택",
-	"TaslService.noEntryToRun": "실행할 작업이 없습니다. 작업 구성...",
-	"TaskService.fetchingBuildTasks": "빌드 작업을 페치하는 중...",
-	"TaskService.pickBuildTask": "실행할 빌드 작업 선택",
-	"TaskService.noBuildTask": "실행할 빌드 작업을 찾을 수 없습니다. 빌드 작업 구성...",
-	"TaskService.fetchingTestTasks": "테스트 작업을 페치하는 중...",
-	"TaskService.pickTestTask": "실행할 테스트 작업 선택",
-	"TaskService.noTestTaskTerminal": "실행할 테스트 작업이 없습니다. 작업 구성...",
-	"TaskService.tastToTerminate": "종료할 작업 선택",
-	"TaskService.noTaskRunning": "현재 실행 중인 작업이 없습니다.",
-	"TerminateAction.noProcess": "시작된 프로세스가 더 이상 존재하지 않습니다. 작업에서 생성된, VS Code를 끝내는 백그라운드 작업이 분리된 프로세스가 될 수 있습니다.",
-	"TerminateAction.failed": "실행 중인 작업을 종료하지 못했습니다.",
-	"TaskService.tastToRestart": "다시 시작할 작업 선택",
-	"TaskService.noTaskToRestart": "다시 시작할 작업이 없습니다.",
-	"TaskService.template": "작업 템플릿 선택",
-	"TaskService.createJsonFile": "템플릿에서 tasks.json 파일 만들기",
-	"TaskService.openJsonFile": "tasks.json 파일 열기",
-	"TaskService.pickTask": "구성할 작업 선택",
-	"TaskService.defaultBuildTaskExists": "{0}은(는) 이미 기본 빌드 작업으로 표시되어 있습니다.",
-	"TaskService.pickDefaultBuildTask": "기본 빌드 작업으로 사용할 작업을 선택",
-	"TaskService.defaultTestTaskExists": "{0}은(는) 이미 기본 테스트 작업으로 표시되어 있습니다.",
-	"TaskService.pickDefaultTestTask": "기본 테스트 작업으로 사용할 작업 선택",
-	"TaskService.pickShowTask": "출력을 표시할 작업 선택",
-	"TaskService.noTaskIsRunning": "실행 중인 작업이 없습니다.",
-	"ShowLogAction.label": "작업 로그 표시",
-	"RunTaskAction.label": "작업 실행",
-	"RestartTaskAction.label": "실행 중인 작업 다시 시작",
-	"ShowTasksAction.label": "실행 중인 작업 표시",
-	"BuildAction.label": "빌드 작업 실행",
-	"TestAction.label": "테스트 작업 실행",
-	"ConfigureDefaultBuildTask.label": "기본 빌드 작업 구성",
-	"ConfigureDefaultTestTask.label": "기본 테스트 작업 구성",
-	"quickOpen.task": "작업 실행"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/tasks/electron-browser/taskPanel.i18n.json b/i18n/kor/src/vs/workbench/parts/tasks/electron-browser/taskPanel.i18n.json
deleted file mode 100644
index 1bd330c69fb..00000000000
--- a/i18n/kor/src/vs/workbench/parts/tasks/electron-browser/taskPanel.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"tasks": "작업"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.i18n.json b/i18n/kor/src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.i18n.json
deleted file mode 100644
index 346918e15f0..00000000000
--- a/i18n/kor/src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"TerminalTaskSystem.unknownError": "작업을 실행하는 동안 알 수 없는 오류가 발생했습니다. 자세한 내용은 작업 출력 로그를 참조하세요.",
-	"dependencyFailed": "작업 영역 폴더 '{1}'에서 종속 작업 '{0}'을(를) 확인할 수 없습니다. ",
-	"TerminalTaskSystem.terminalName": "작업 - {0}",
-	"closeTerminal": "터미널을 종료하려면 아무 키나 누르세요.",
-	"reuseTerminal": "터미널이 작업에서 다시 사용됩니다. 닫으려면 아무 키나 누르세요.",
-	"TerminalTaskSystem": "Cmd.exe를 사용하여 UNC 드라이브에 셸 명령을 실행할 수 없습니다.",
-	"unkownProblemMatcher": "문제 선택기 {0}을(를) 확인할 수 없습니다. 이 선택기는 무시됩니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/tasks/node/processRunnerDetector.i18n.json b/i18n/kor/src/vs/workbench/parts/tasks/node/processRunnerDetector.i18n.json
deleted file mode 100644
index fab827f007f..00000000000
--- a/i18n/kor/src/vs/workbench/parts/tasks/node/processRunnerDetector.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"TaskSystemDetector.noGulpTasks": "gulp --tasks-simple을 실행해도 작업이 나열되지 않습니다. npm install을 실행했나요?",
-	"TaskSystemDetector.noJakeTasks": "jake --tasks를 실행해도 작업이 나열되지 않습니다. npm install을 실행했나요?",
-	"TaskSystemDetector.noGulpProgram": "Gulp가 시스템에 설치되어 있지 않습니다. npm install -g gulp를 실행하여 설치하세요.",
-	"TaskSystemDetector.noJakeProgram": "Jake가 시스템에 설치되어 있지 않습니다. npm install -g jake를 실행하여 설치하세요.",
-	"TaskSystemDetector.noGruntProgram": "Grunt가 시스템에 설치되어 있지 않습니다. npm install -g grunt를 실행하여 설치하세요.",
-	"TaskSystemDetector.noProgram": "{0} 프로그램을 찾을 수 없습니다. 메시지는 {1}입니다.",
-	"TaskSystemDetector.buildTaskDetected": "이름이 '{0}'인 빌드 작업이 발견되었습니다.",
-	"TaskSystemDetector.testTaskDetected": "이름이 '{0}'인 테스트 작업이 발견되었습니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/tasks/node/processTaskSystem.i18n.json b/i18n/kor/src/vs/workbench/parts/tasks/node/processTaskSystem.i18n.json
deleted file mode 100644
index f21f95093ad..00000000000
--- a/i18n/kor/src/vs/workbench/parts/tasks/node/processTaskSystem.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"TaskRunnerSystem.unknownError": "작업을 실행하는 동안 알 수 없는 오류가 발생했습니다. 자세한 내용은 작업 출력 로그를 참조하세요.",
-	"TaskRunnerSystem.watchingBuildTaskFinished": "\n빌드 감시 작업이 완료되었습니다.",
-	"TaskRunnerSystem.childProcessError": "Failed to launch external program {0} {1}.",
-	"TaskRunnerSystem.cancelRequested": "\n사용자 요청에 따라 '{0}' 작업이 종료되었습니다.",
-	"unkownProblemMatcher": "문제 선택기 {0}을(를) 확인할 수 없습니다. 이 선택기는 무시됩니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json b/i18n/kor/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
deleted file mode 100644
index 13963265fec..00000000000
--- a/i18n/kor/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"ConfigurationParser.invalidCWD": "경고: options.cwd는 string 형식이어야 합니다. {0} 값을 무시합니다.\n",
-	"ConfigurationParser.inValidArg": "오류: 명령 인수는 문자열 또는 따옴표 붙은 문자열이어야 합니다. 제공된 값:\n{0}",
-	"ConfigurationParser.noargs": "오류: 명령 인수는 문자열의 배열이어야 합니다. 제공된 값:\n{0}",
-	"ConfigurationParser.noShell": "경고: 셸 구성은 작업을 터미널에서 실행 중일 때에만 지원됩니다.",
-	"ConfigurationParser.noName": "오류: 선언 범위 내의 문제 선택기는 이름이 있어야 합니다.\n{0}\n",
-	"ConfigurationParser.unknownMatcherKind": "경고: 정의된 문제 선택기를 알 수 없습니다. 지원되는 형식은 string | ProblemMatcher |(string | ProblemMatcher)[]입니다.\n{0}\n",
-	"ConfigurationParser.invalidVaraibleReference": "오류: 잘못된 problemMatcher 참조:  {0}\n",
-	"ConfigurationParser.noTaskType": "오류: 작업 구성은 유형 속성이 필요합니다. 이 구성은 무시됩니다.\n{0}\n",
-	"ConfigurationParser.noTypeDefinition": "오류: 등록된 작업 형식 '{0}'이(가) 없습니다. 해당하는 작업 공급자를 제공하는 확장을 설치하지 않으셨습니까?",
-	"ConfigurationParser.missingRequiredProperty": "오류: 작업 구성 '{0}'에 필요한 속성 '{1}'이(가) 없습니다. 작업 구성이 무시됩니다.",
-	"ConfigurationParser.notCustom": "오류: 작업이 사용자 지정 작업으로 선언되지 않았습니다. 이 구성은 무시됩니다.\n{0}\n",
-	"ConfigurationParser.noTaskName": "오류: 작업에서 레이블 속성을 제공해야 합니다. 이 작업은 무시됩니다.\n{0}\n",
-	"taskConfiguration.noCommandOrDependsOn": "오류: 작업 '{0}'에서 명령이나 dependsOn 속성을 지정하지 않습니다. 이 작업은 무시됩니다. 해당 작업의 정의는 {1}입니다.",
-	"taskConfiguration.noCommand": "오류: 작업 '{0}'에서 명령을 정의하지 않습니다. 이 작업은 무시됩니다. 해당 작업의 정의는\n{1}입니다.",
-	"TaskParse.noOsSpecificGlobalTasks": "작업 버전 2.0.0은 글로벌 OS별 작업을 지원하지 않습니다. OS별 명령을 사용하여 작업으로 변환하세요. 영향을 받는 작업::\n{0}"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.i18n.json b/i18n/kor/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.i18n.json
deleted file mode 100644
index ba7f34ebda0..00000000000
--- a/i18n/kor/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"termEntryAriaLabel": "{0}, 터미널 선택기",
-	"termCreateEntryAriaLabel": "{0}, 새 터미널 만들기",
-	"workbench.action.terminal.newplus": "$(plus) 새 통합 터미널 만들기",
-	"noTerminalsMatching": "일치하는 터미널 없음",
-	"noTerminalsFound": "열린 터미널 없음"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/terminal/common/terminalColorRegistry.i18n.json b/i18n/kor/src/vs/workbench/parts/terminal/common/terminalColorRegistry.i18n.json
deleted file mode 100644
index d9e00ba0782..00000000000
--- a/i18n/kor/src/vs/workbench/parts/terminal/common/terminalColorRegistry.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"terminal.background": "터미널의 배경색입니다. 이 설정을 사용하면 터미널\n 색을 패널과 다르게 지정할 수 있습니다.",
-	"terminal.foreground": "터미널의 전경색입니다.",
-	"terminalCursor.foreground": "터미널 커서의 전경색입니다.",
-	"terminalCursor.background": "터미널 커서의 배경색입니다. 블록 커서와 겹친 문자의 색상을 사용자 정의할 수 있습니다.",
-	"terminal.selectionBackground": "터미널의 선택 영역 배경색입니다.",
-	"terminal.border": "터미널 내의 분할 창을 구분하는 테두리의 색입니다. 기본값은 panel.border입니다.",
-	"terminal.ansiColor": "터미널의 '{0}' ANSI 색상"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json b/i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
deleted file mode 100644
index bc58bba26a3..00000000000
--- a/i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"quickOpen.terminal": "모든 열려 있는 터미널 표시",
-	"terminal": "터미널",
-	"terminalIntegratedConfigurationTitle": "통합 터미널",
-	"terminal.integrated.shell.linux": "터미널이 Linux에서 사용하는 셸의 경로입니다.",
-	"terminal.integrated.shellArgs.linux": "Linux 터미널에 있을 때 사용할 명령줄 인수입니다.",
-	"terminal.integrated.shell.osx": "터미널이 OS X에서 사용하는 셸의 경로입니다.",
-	"terminal.integrated.shellArgs.osx": "OS X 터미널에 있을 때 사용할 명령줄 인수입니다.",
-	"terminal.integrated.shell.windows": "터미널이 Windows에서 사용하는 셸의 경로입니다. Windows와 함께 제공되는 셸을 사용하는 경우(cmd, PowerShell 또는 Ubuntu의 Bash)",
-	"terminal.integrated.shellArgs.windows": "Windows 터미널에 있을 때 사용할 명령줄 인수입니다.",
-	"terminal.integrated.macOptionIsMeta": "macOS의 터미널에서 옵션 키를 메타 키로 처리합니다.",
-	"terminal.integrated.copyOnSelection": "설정된 경우, 터미널에서 선택된 텍스트가 클립보드로 복사됩니다.",
-	"terminal.integrated.fontFamily": "터미널의 글꼴 패밀리를 제어하며, 기본값은 editor.fontFamily의 값입니다.",
-	"terminal.integrated.fontSize": "터미널의 글꼴 크기(픽셀)를 제어합니다.",
-	"terminal.integrated.letterSpacing": "터미널의 문자 간격을 제어하며, 문자  사이에 추가할 픽셀의 양을 나타내는 정수 값입니다.",
-	"terminal.integrated.lineHeight": "터미널의 줄 높이를 제어합니다. 이 숫자에 터미널 글꼴 크기를 곱해 실제 줄 높이(픽셀)를 얻습니다.",
-	"terminal.integrated.fontWeight": "터미널 내에서 굵은 글꼴이 아닌 텍스트에 사용할 글꼴 두께입니다.",
-	"terminal.integrated.fontWeightBold": "터미널 내에서 굵은 글꼴 텍스트에 사용할 글꼴 두께입니다.",
-	"terminal.integrated.cursorBlinking": "터미널 커서 깜박임 여부를 제어합니다.",
-	"terminal.integrated.cursorStyle": "터미널 커서의 스타일을 제어합니다.",
-	"terminal.integrated.scrollback": "터미널에서 버퍼에 유지하는 최대 줄 수를 제어합니다.",
-	"terminal.integrated.setLocaleVariables": "로캘 변수가 터미널 시작 시 설정되는지 여부를 제어하며, 기본값은 OS X에서 true이고 기타 플랫폼에서 false입니다.",
-	"terminal.integrated.rendererType": "터미널이 렌더링되는 방식을 제어하며, 옵션은 \"canvas\"(표준(고속) 캔버스 렌더러, \"dom\"(대체 (fallback) DOM 기반 렌더러) 또는 \"auto\"(VS Code에서 어떤 렌더러가 가장 적절할지 추축하도록 허용)입니다. 이 설정을 적용하려면 VS Code를 다시 로드해야 합니다.",
-	"terminal.integrated.rightClickBehavior": "터미널이 마우스 오른쪽 단추 클릭에 대응하는 방식을 제어합니다. 가능한 값은 'default', 'copyPaste' 및 'selectWord'입니다. 'default'는 상황에 맞는 메뉴를 표시하고, 'copyPaste'는 선택 항목이 있으면 복사하고 없으면 붙여 넣으며, 'selectWord'는 커서 아래의 단어를 선택하고 상황에 맞는 메뉴를 표시합니다.",
-	"terminal.integrated.cwd": "터미널이 시작될 명시적 시작 경로입니다. 셸 프로세스의 현재 작업 디렉터리(cwd)로 사용됩니다. 루트 디렉터리가 편리한 cwd가 아닌 경우 작업 영역 설정에서 특히 유용하게 사용할 수 있습니다.",
-	"terminal.integrated.confirmOnExit": "끝낼 때 활성 터미널 세션이 있는지 확인할지 여부입니다.",
-	"terminal.integrated.enableBell": "터미널 벨의 사용 여부입니다.",
-	"terminal.integrated.commandsToSkipShell": "키 바인딩이 셸에 전송되지 않고 항상 Code에서 처리되는 명령 ID 집합입니다. 따라서 셸에서 정상적으로 사용되어 터미널에 포커스가 없을 때와 동일하게 작동하는 키 바인딩을 사용할 수 있습니다(예: <Ctrl+P>를 사용하여 Quick Open 시작).",
-	"terminal.integrated.env.osx": "OS X의 터미널이 사용하는 VS Code 프로세스에 추가될 환경 변수를 포함한 개체",
-	"terminal.integrated.env.linux": "Linux의 터미널에서 사용할 VS Code 프로세스에 추가되는 환경 변수를 포함한 개체",
-	"terminal.integrated.env.windows": "Windows의 터미널에서 사용할 VS Code 프로세스에 추가되는 환경 변수를 포함한 개체",
-	"terminal.integrated.showExitAlert": "종료 코드가 0이 아닌 경우 `터미널 프로세스가 종료 코드로 종료되었습니다` 경고를 표시합니다.",
-	"terminal.integrated.experimentalRestore": "VS Code를 시작할 때 작업 영역에 대한 터미널 세션을 자동으로 복원할지 여부를 지정합니다. 이 설정은 실험적 설정이므로 버그가 있을 수 있고 향후 변경될 수 있습니다.",
-	"terminalCategory": "터미널",
-	"viewCategory": "보기"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json b/i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
deleted file mode 100644
index 0c53998d6e0..00000000000
--- a/i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
+++ /dev/null
@@ -1,63 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"workbench.action.terminal.toggleTerminal": "통합 터미널 설정/해제",
-	"workbench.action.terminal.kill": "활성 터미널 인스턴스 종료",
-	"workbench.action.terminal.kill.short": "터미널 종료",
-	"workbench.action.terminal.quickKill": "터미널 인스턴스 종료",
-	"workbench.action.terminal.copySelection": "선택 영역 복사",
-	"workbench.action.terminal.selectAll": "모두 선택",
-	"workbench.action.terminal.deleteWordLeft": "왼쪽 단어 삭제",
-	"workbench.action.terminal.deleteWordRight": "오른쪽 단어 삭제",
-	"workbench.action.terminal.moveToLineStart": "줄 시작으로 이동",
-	"workbench.action.terminal.moveToLineEnd": "줄 끝으로 이동",
-	"workbench.action.terminal.new": "새 통합 터미널 만들기",
-	"workbench.action.terminal.new.short": "새 터미널",
-	"workbench.action.terminal.newWorkspacePlaceholder": "새 터미널의 현재 작업 디렉토리를 선택합니다.",
-	"workbench.action.terminal.newInActiveWorkspace": "새 통합 터미널 만들기(활성 작업 영역에)",
-	"workbench.action.terminal.split": "터미널 분할",
-	"workbench.action.terminal.splitInActiveWorkspace": "터미널 분할(활성 작업 영역에서)",
-	"workbench.action.terminal.focusPreviousPane": "이전 창에 포커스",
-	"workbench.action.terminal.focusNextPane": "다음 창에 포커스",
-	"workbench.action.terminal.resizePaneLeft": "창 왼쪽 크기 조정",
-	"workbench.action.terminal.resizePaneRight": "창 오른쪽 크기 조정",
-	"workbench.action.terminal.resizePaneUp": "창 위쪽 크기 조정",
-	"workbench.action.terminal.resizePaneDown": "창 아래쪽 크기 조정",
-	"workbench.action.terminal.focus": "터미널에 포커스",
-	"workbench.action.terminal.focusNext": "다음 터미널에 포커스",
-	"workbench.action.terminal.focusPrevious": "이전 터미널에 포커스",
-	"workbench.action.terminal.paste": "활성 터미널에 붙여넣기",
-	"workbench.action.terminal.DefaultShell": "기본 셸 선택",
-	"workbench.action.terminal.runSelectedText": "활성 터미널에서 선택한 텍스트 실행",
-	"workbench.action.terminal.runActiveFile": "활성 터미널에서 활성 파일 실행",
-	"workbench.action.terminal.runActiveFile.noFile": "디스크의 파일만 터미널에서 실행할 수 있습니다.",
-	"workbench.action.terminal.switchTerminal": "터미널 전환",
-	"workbench.action.terminal.scrollDown": "아래로 스크롤(줄)",
-	"workbench.action.terminal.scrollDownPage": "아래로 스크롤(페이지)",
-	"workbench.action.terminal.scrollToBottom": "맨 아래로 스크롤",
-	"workbench.action.terminal.scrollUp": "위로 스크롤(줄)",
-	"workbench.action.terminal.scrollUpPage": "위로 스크롤(페이지)",
-	"workbench.action.terminal.scrollToTop": "맨 위로 스크롤",
-	"workbench.action.terminal.clear": "지우기",
-	"workbench.action.terminal.clearSelection": "선택 영역 지우기",
-	"workbench.action.terminal.allowWorkspaceShell": "작업 영역 셸 구성 허용",
-	"workbench.action.terminal.disallowWorkspaceShell": "작업 영역 셸 구성 허용 안 함",
-	"workbench.action.terminal.rename": "이름 바꾸기",
-	"workbench.action.terminal.rename.prompt": "터미널 이름 입력",
-	"workbench.action.terminal.focusFindWidget": "파인드 위젯 포커스",
-	"workbench.action.terminal.hideFindWidget": "파인드 위젯 숨기기",
-	"nextTerminalFindTerm": "다음 검색어 표시",
-	"previousTerminalFindTerm": "이전 검색어 표시",
-	"quickOpenTerm": "활성 터미널 전환",
-	"workbench.action.terminal.scrollToPreviousCommand": "이전 명령으로 스크롤",
-	"workbench.action.terminal.scrollToNextCommand": "다음 명령으로 스크롤",
-	"workbench.action.terminal.selectToPreviousCommand": "이전 명령까지 선택",
-	"workbench.action.terminal.selectToNextCommand": "다음 명령까지 선택",
-	"workbench.action.terminal.selectToPreviousLine": "이전 줄까지 선택",
-	"workbench.action.terminal.selectToNextLine": "다음 줄까지 선택"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json b/i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
deleted file mode 100644
index d9e00ba0782..00000000000
--- a/i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"terminal.background": "터미널의 배경색입니다. 이 설정을 사용하면 터미널\n 색을 패널과 다르게 지정할 수 있습니다.",
-	"terminal.foreground": "터미널의 전경색입니다.",
-	"terminalCursor.foreground": "터미널 커서의 전경색입니다.",
-	"terminalCursor.background": "터미널 커서의 배경색입니다. 블록 커서와 겹친 문자의 색상을 사용자 정의할 수 있습니다.",
-	"terminal.selectionBackground": "터미널의 선택 영역 배경색입니다.",
-	"terminal.border": "터미널 내의 분할 창을 구분하는 테두리의 색입니다. 기본값은 panel.border입니다.",
-	"terminal.ansiColor": "터미널의 '{0}' ANSI 색상"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminalConfigHelper.i18n.json b/i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminalConfigHelper.i18n.json
deleted file mode 100644
index 5d07bbc0bbc..00000000000
--- a/i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminalConfigHelper.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"terminal.integrated.allowWorkspaceShell": "터미널에서 {0}(작업 영역 설정으로 정의됨)이(가) 시작되도록\n 허용할까요?",
-	"allow": "Allow",
-	"disallow": "Disallow"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminalFindWidget.i18n.json b/i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminalFindWidget.i18n.json
deleted file mode 100644
index c45550055e9..00000000000
--- a/i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminalFindWidget.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"label.find": "찾기",
-	"placeholder.find": "찾기",
-	"label.previousMatchButton": "이전 검색 결과",
-	"label.nextMatchButton": "다음 검색 결과",
-	"label.closeButton": "닫기"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json b/i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json
deleted file mode 100644
index 260b52f5f8b..00000000000
--- a/i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"terminal.integrated.a11yBlankLine": "빈 줄",
-	"terminal.integrated.a11yPromptLabel": "터미널 입력",
-	"terminal.integrated.a11yTooMuchOutput": "발표할 출력이 너무 많음, 읽을 행으로 수동 이동",
-	"yes": "예",
-	"terminal.rendererInAllNewTerminals": "새로 만든 터미널은 모두 비 GPU 렌더러를 사용합니다.",
-	"no": "아니요",
-	"dontShowAgain": "다시 표시 안 함",
-	"terminal.slowRendering": "통합 터미널의 표준 렌더러가 컴퓨터에서 느린 것 같습니다. 성능을 향상할 수 있는 대체 DOM 기반 렌더러로 전환하시겠습니까? [터미널 설정에 대한 자세한 정보](https://code.visualstudio.com/docs/editor/integrated-terminal#_changing-how-the-terminal-is-rendered)",
-	"terminal.integrated.copySelection.noSelection": "터미널에 복사할 선택 항목이 없음",
-	"terminal.integrated.exitedWithCode": "터미널 프로세스가 종료 코드 {0}(으)로 종료되었습니다.",
-	"terminal.integrated.waitOnExit": "터미널을 닫으려면 아무 키나 누르세요.",
-	"terminal.integrated.launchFailed": "터미널 프로세스 명령 '{0}{1}'을(를) 실행하지 못했습니다(종료 코드: {2}).",
-	"terminal.integrated.launchFailedExtHost": "터미널 프로세스를 시작하지 못했습니다(종료 코드: {0})."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminalLinkHandler.i18n.json b/i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminalLinkHandler.i18n.json
deleted file mode 100644
index 2d6513ab9a3..00000000000
--- a/i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminalLinkHandler.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"terminalLinkHandler.followLinkAlt": "Alt 키를 누르고 클릭하여 링크로 이동",
-	"terminalLinkHandler.followLinkCmd": "Cmd 키를 누르고 클릭하여 링크로 이동",
-	"terminalLinkHandler.followLinkCtrl": "Ctrl 키를 누르고 클릭하여 링크로 이동"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json b/i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json
deleted file mode 100644
index 0798e161a36..00000000000
--- a/i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"terminal.useMonospace": "'고정 폭' 사용",
-	"terminal.monospaceOnly": "터미널은 고정 폭 글꼴만 지원합니다.",
-	"copy": "복사",
-	"split": "분할",
-	"paste": "붙여넣기",
-	"selectAll": "모두 선택",
-	"clear": "지우기"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json b/i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
deleted file mode 100644
index 444b81d0780..00000000000
--- a/i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"terminal.integrated.chooseWindowsShellInfo": "사용자 지정 단추를 선택하여 기본 터미널 셸을 변경할 수 있습니다.",
-	"customize": "사용자 지정",
-	"never again": "다시 표시 안 함",
-	"terminal.integrated.chooseWindowsShell": "기본으로 설정할 터미널 셸을 선택하세요. 나중에 설정에서 이 셸을 변경할 수 있습니다.",
-	"terminalService.terminalCloseConfirmationSingular": "활성 터미널 세션이 있습니다. 종료할까요?",
-	"terminalService.terminalCloseConfirmationPlural": "{0}개의 활성 터미널 세션이 있습니다. 종료할까요?"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/themes/electron-browser/themes.contribution.i18n.json b/i18n/kor/src/vs/workbench/parts/themes/electron-browser/themes.contribution.i18n.json
deleted file mode 100644
index eaf1592fa8c..00000000000
--- a/i18n/kor/src/vs/workbench/parts/themes/electron-browser/themes.contribution.i18n.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"selectTheme.label": "색 테마",
-	"themes.category.light": "밝은 테마",
-	"themes.category.dark": "어두운 테마",
-	"themes.category.hc": "고대비 테마",
-	"installColorThemes": "추가 색 테마 설치...",
-	"themes.selectTheme": "색 테마 선택(미리 보려면 위로/아래로 키 사용)",
-	"selectIconTheme.label": "파일 아이콘 테마",
-	"noIconThemeLabel": "없음",
-	"noIconThemeDesc": "파일 아이콘 사용 안 함",
-	"installIconThemes": "추가 파일 아이콘 테마 설치...",
-	"themes.selectIconTheme": "파일 아이콘 테마 선택",
-	"generateColorTheme.label": "현재 설정에서 색 테마 생성",
-	"preferences": "기본 설정",
-	"developer": "개발자"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/trust/electron-browser/unsupportedWorkspaceSettings.contribution.i18n.json b/i18n/kor/src/vs/workbench/parts/trust/electron-browser/unsupportedWorkspaceSettings.contribution.i18n.json
deleted file mode 100644
index 1dfa3710832..00000000000
--- a/i18n/kor/src/vs/workbench/parts/trust/electron-browser/unsupportedWorkspaceSettings.contribution.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openWorkspaceSettings": "작업 영역 설정 열기",
-	"dontShowAgain": "다시 표시 안 함",
-	"unsupportedWorkspaceSettings": "이 작업 영역에는 사용자 설정({0})에서만 지정할 수 있는 설정이 포함되어 있습니다. 자세히 알아보려면 [여기]({1})를 클릭하세요."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json b/i18n/kor/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json
deleted file mode 100644
index 3314e92b45d..00000000000
--- a/i18n/kor/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"releaseNotesInputName": "릴리스 정보: {0}",
-	"unassigned": "할당되지 않음"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/update/electron-browser/releaseNotesInput.i18n.json b/i18n/kor/src/vs/workbench/parts/update/electron-browser/releaseNotesInput.i18n.json
deleted file mode 100644
index 30552482e9f..00000000000
--- a/i18n/kor/src/vs/workbench/parts/update/electron-browser/releaseNotesInput.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"releaseNotesInputName": "릴리스 정보: {0}"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/update/electron-browser/update.contribution.i18n.json b/i18n/kor/src/vs/workbench/parts/update/electron-browser/update.contribution.i18n.json
deleted file mode 100644
index 6bbed6b4081..00000000000
--- a/i18n/kor/src/vs/workbench/parts/update/electron-browser/update.contribution.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"release notes": "릴리스 정보"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/update/electron-browser/update.i18n.json b/i18n/kor/src/vs/workbench/parts/update/electron-browser/update.i18n.json
deleted file mode 100644
index 46a0013cd0e..00000000000
--- a/i18n/kor/src/vs/workbench/parts/update/electron-browser/update.i18n.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"releaseNotes": "릴리스 정보",
-	"showReleaseNotes": "릴리스 정보 표시",
-	"read the release notes": "{0} v{1}을(를) 시작합니다. 릴리스 정보를 확인하시겠습니까?",
-	"licenseChanged": "사용 조건이 변경되었습니다. [여기]({0})를 클릭하여 자세히 읽어보세요.",
-	"neveragain": "다시 표시 안 함",
-	"64bitisavailable": "64비트 Windows용 {0}을(를) 사용할 수 있습니다. 자세히 알아보려면 [여기]({1})를 클릭하세요.",
-	"updateIsReady": "새 {0} 업데이트를 사용할 수 있습니다.",
-	"noUpdatesAvailable": "현재 사용할 수 있는 업데이트가 없습니다.",
-	"ok": "확인",
-	"thereIsUpdateAvailable": "사용 가능한 업데이트가 있습니다.",
-	"download now": "지금 다운로드",
-	"later": "나중에",
-	"updateAvailable": "사용 가능한 업데이트가 있습니다. {0} {1}",
-	"installUpdate": "업데이트 설치",
-	"updateInstalling": "{0} {1}이(가) 백그라운드에서 설치되고 있습니다. 설치가 끝나면 알려드리겠습니다.",
-	"updateAvailableAfterRestart": "최신 업데이트를 적용하려면 {0}을(를) 다시 시작하세요.",
-	"updateNow": "지금 업데이트",
-	"commandPalette": "명령 팔레트...",
-	"settings": "설정",
-	"keyboardShortcuts": "바로 가기 키(&&K)",
-	"showExtensions": "확장 관리",
-	"userSnippets": "사용자 코드 조각",
-	"selectTheme.label": "색 테마",
-	"themes.selectIconTheme.label": "파일 아이콘 테마",
-	"checkForUpdates": "업데이트 확인...",
-	"checkingForUpdates": "업데이트를 확인하는 중...",
-	"DownloadingUpdate": "업데이트를 다운로드하는 중...",
-	"installUpdate...": "업데이트 설치...",
-	"installingUpdate": "업데이트를 설치하는 중...",
-	"restartToUpdate": "업데이트하기 위해 다시 시작..."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/url/electron-browser/url.contribution.i18n.json b/i18n/kor/src/vs/workbench/parts/url/electron-browser/url.contribution.i18n.json
deleted file mode 100644
index a154966e52a..00000000000
--- a/i18n/kor/src/vs/workbench/parts/url/electron-browser/url.contribution.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openUrl": "URL 열기",
-	"developer": "개발자"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/views/browser/views.i18n.json b/i18n/kor/src/vs/workbench/parts/views/browser/views.i18n.json
deleted file mode 100644
index 126ed4fd56c..00000000000
--- a/i18n/kor/src/vs/workbench/parts/views/browser/views.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"viewToolbarAriaLabel": "{0} 동작",
-	"hideView": "사이드바에서 숨기기"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/views/browser/viewsExtensionPoint.i18n.json b/i18n/kor/src/vs/workbench/parts/views/browser/viewsExtensionPoint.i18n.json
deleted file mode 100644
index 25892e50a69..00000000000
--- a/i18n/kor/src/vs/workbench/parts/views/browser/viewsExtensionPoint.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"requirearray": "뷰는 배열이어야 합니다.",
-	"requirestring": "속성 `{0}`은(는) 필수이며 `string` 형식이어야 합니다.",
-	"optstring": "속성 `{0}`은(는) 생략할 수 있으며 `string` 형식이어야 합니다.",
-	"vscode.extension.contributes.view.id": "뷰의 식별자입니다. 'vscode.window.registerTreeDataProviderForView` API를 통해 데이터 공급자를 등록하는 데 사용합니다. `onView:${id}` 이벤트를 `activationEvents`에 등록하여 확장 활성화를 트리거하는 데에도 사용합니다.",
-	"vscode.extension.contributes.view.name": "사용자가 읽을 수 있는 뷰 이름입니다. 표시됩니다.",
-	"vscode.extension.contributes.view.when": "이 보기를 표시하기 위해 true여야 하는 조건입니다.",
-	"vscode.extension.contributes.views": "뷰를 에디터에 적용합니다.",
-	"views.explorer": "탐색기 뷰",
-	"views.debug": "디버그 보기",
-	"locationId.invalid": "`{0}`은(는) 유효한 뷰 위치가 아닙니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/watermark/electron-browser/watermark.i18n.json b/i18n/kor/src/vs/workbench/parts/watermark/electron-browser/watermark.i18n.json
deleted file mode 100644
index 644d7503d73..00000000000
--- a/i18n/kor/src/vs/workbench/parts/watermark/electron-browser/watermark.i18n.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"watermark.showCommands": "모든 명령 표시",
-	"watermark.quickOpen": "파일로 이동",
-	"watermark.openFile": "파일 열기",
-	"watermark.openFolder": "폴더 열기",
-	"watermark.openFileFolder": "파일 또는 폴더 열기",
-	"watermark.openRecent": "최근 파일 열기",
-	"watermark.newUntitledFile": "제목이 없는 새 파일",
-	"watermark.toggleTerminal": "터미널 설정/해제",
-	"watermark.findInFiles": "파일에서 찾기",
-	"watermark.startDebugging": "디버깅 시작",
-	"watermark.unboundCommand": "바인딩 안 됨",
-	"workbenchConfigurationTitle": "워크벤치",
-	"tips.enabled": "사용하도록 설정되면 편집기가 열리지 않았을 때 워터마크 팁이 표시됩니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json b/i18n/kor/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json
deleted file mode 100644
index d6b00d87854..00000000000
--- a/i18n/kor/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"webview.editor.label": "webview 편집기",
-	"developer": "개발자"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/webview/electron-browser/webviewCommands.i18n.json b/i18n/kor/src/vs/workbench/parts/webview/electron-browser/webviewCommands.i18n.json
deleted file mode 100644
index 3a107e5fb3a..00000000000
--- a/i18n/kor/src/vs/workbench/parts/webview/electron-browser/webviewCommands.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openToolsLabel": "Webview 개발자 도구 열기",
-	"refreshWebviewLabel": "Webview 다시 로드"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json b/i18n/kor/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json
deleted file mode 100644
index 88ec2a103e6..00000000000
--- a/i18n/kor/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"telemetryOptOut.optOutNotice": "Microsoft에서 사용 데이터를 수집하도록 허용하여 VS Code 개선에 도움을 주세요. Microsoft [개인정보처리방침]({0})을 읽고 [옵트아웃]({1})하는 방법을 알아보세요.",
-	"telemetryOptOut.optInNotice": "Microsoft에서 사용 데이터를 수집하도록 허용하여 VS Code 개선에 도움을 주세요. Microsoft [개인정보처리방침]({0})을 읽고 [옵트인]({1})하는 방법을 알아보세요.",
-	"telemetryOptOut.readMore": "자세히 알아보기"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/welcome/overlay/browser/welcomeOverlay.i18n.json b/i18n/kor/src/vs/workbench/parts/welcome/overlay/browser/welcomeOverlay.i18n.json
deleted file mode 100644
index 5fcd967bd06..00000000000
--- a/i18n/kor/src/vs/workbench/parts/welcome/overlay/browser/welcomeOverlay.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"welcomeOverlay.explorer": "파일 탐색기",
-	"welcomeOverlay.search": "전체 파일 검색",
-	"welcomeOverlay.git": "소스 코드 관리",
-	"welcomeOverlay.debug": "시작 및 디버그",
-	"welcomeOverlay.extensions": "확장 관리",
-	"welcomeOverlay.problems": "오류 및 경고 보기",
-	"welcomeOverlay.commandPalette": "모든 명령 찾기 및 실행",
-	"welcomeOverlay.notifications": "알림 표시",
-	"welcomeOverlay": "사용자 인터페이스 개요",
-	"hideWelcomeOverlay": "인터페이스 개요 숨기기",
-	"help": "도움말"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json b/i18n/kor/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
deleted file mode 100644
index 41ca426ace3..00000000000
--- a/i18n/kor/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"welcomePage.vscode": "Visual Studio Code",
-	"welcomePage.editingEvolved": "편집 향상됨",
-	"welcomePage.start": "시작",
-	"welcomePage.newFile": "새 파일",
-	"welcomePage.openFolder": "폴더 열기...",
-	"welcomePage.addWorkspaceFolder": "작업 영역 폴더 추가...",
-	"welcomePage.recent": "최근 항목",
-	"welcomePage.moreRecent": "자세히...",
-	"welcomePage.noRecentFolders": "최근 폴더 없음",
-	"welcomePage.help": "도움말",
-	"welcomePage.keybindingsCheatsheet": "인쇄 가능 키보드 치트시트",
-	"welcomePage.introductoryVideos": "소개 비디오",
-	"welcomePage.tipsAndTricks": "팁과 요령",
-	"welcomePage.productDocumentation": "제품 설명서",
-	"welcomePage.gitHubRepository": "GitHub 리포지토리",
-	"welcomePage.stackOverflow": "Stack Overflow",
-	"welcomePage.showOnStartup": "시작 시 시작 페이지 표시",
-	"welcomePage.customize": "사용자 지정",
-	"welcomePage.installExtensionPacks": "도구 및 언어",
-	"welcomePage.installExtensionPacksDescription": "{0} 및 {1}에 대한 지원 설치",
-	"welcomePage.moreExtensions": "자세히",
-	"welcomePage.installKeymapDescription": "설정 및 키 바인딩",
-	"welcomePage.installKeymapExtension": "설정과 {0} 및 {1}의 바로 가기 키 설치",
-	"welcomePage.others": "기타",
-	"welcomePage.colorTheme": "색 테마",
-	"welcomePage.colorThemeDescription": "편집기 및 코드가 좋아하는 방식으로 표시되게 만들기",
-	"welcomePage.learn": "알아보기",
-	"welcomePage.showCommands": "모든 명령 찾기 및 실행",
-	"welcomePage.showCommandsDescription": "명령 팔레트({0})에서 빠른 액세스 및 명령 검색",
-	"welcomePage.interfaceOverview": "인터페이스 개요",
-	"welcomePage.interfaceOverviewDescription": "UI의 주요 구성 요소를 강조 표시하는 시각적 오버레이 가져오기",
-	"welcomePage.interactivePlayground": "대화형 실습",
-	"welcomePage.interactivePlaygroundDescription": "짧은 연습에서 기본 편집기 기능 사용해 보기"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.contribution.i18n.json b/i18n/kor/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.contribution.i18n.json
deleted file mode 100644
index aa4def687d8..00000000000
--- a/i18n/kor/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.contribution.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"workbenchConfigurationTitle": "워크벤치",
-	"workbench.startupEditor.none": "편집기를 사용하지 않고 시작합니다.",
-	"workbench.startupEditor.welcomePage": "시작 페이지를 엽니다(기본값).",
-	"workbench.startupEditor.newUntitledFile": "제목이 없는 새 파일 열기",
-	"workbench.startupEditor": "시작할 때 이전 세션에서 복구하지 않을 경우 어떤 편집기가 표시될지 결정합니다. 'none'을 선택하면 편집기 없이 시작하고 'welcomePage'를 선택하면 Welcome 페이지(기본값)가 열리며 'newUntitledFile'을 선택하면 제목 없는 새 파일이 열립니다(빈 작업 영역을 열 때만).",
-	"help": "도움말"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json b/i18n/kor/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json
deleted file mode 100644
index 1591b991e17..00000000000
--- a/i18n/kor/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"welcomePage": "시작",
-	"welcomePage.javaScript": "JavaScript",
-	"welcomePage.typeScript": "TypeScript",
-	"welcomePage.python": "Python",
-	"welcomePage.php": "PHP",
-	"welcomePage.azure": "Azure",
-	"welcomePage.showAzureExtensions": "Azure 확장 표시",
-	"welcomePage.docker": "Docker",
-	"welcomePage.vim": "Vim",
-	"welcomePage.sublime": "Sublime",
-	"welcomePage.atom": "Atom",
-	"welcomePage.extensionPackAlreadyInstalled": "{0}에 대한 지원이 이미 설치되어 있습니다.",
-	"welcomePage.willReloadAfterInstallingExtensionPack": "{0}에 대한 추가 지원을 설치한 후 창이 다시 로드됩니다.",
-	"welcomePage.installingExtensionPack": "{0}에 대한 추가 지원을 설치하는 중...",
-	"welcomePage.extensionPackNotFound": "ID가 {1}인 {0}에 대한 지원을 찾을 수 없습니다.",
-	"welcomePage.keymapAlreadyInstalled": "{0} 바로 가기 키가 이미 설치되어 있습니다.",
-	"welcomePage.willReloadAfterInstallingKeymap": "{0} 바로 가기 키를 설치한 후 창이 다시 로드됩니다.",
-	"welcomePage.installingKeymap": "{0} 바로 가기 키를 설치하는 중...",
-	"welcomePage.keymapNotFound": "ID가 {1}인 {0} 바로 가기 키를 찾을 수 없습니다.",
-	"welcome.title": "시작",
-	"welcomePage.openFolderWithPath": "경로가 {1}인 {0} 폴더 열기",
-	"welcomePage.extensionListSeparator": ", ",
-	"welcomePage.installKeymap": "{0} 키맵 설치",
-	"welcomePage.installExtensionPack": "{0}에 대한 추가 지원 설치",
-	"welcomePage.installedKeymap": "{0} 키맵이 이미 설치되어 있습니다.",
-	"welcomePage.installedExtensionPack": "{0} 지원이 이미 설치되어 있습니다.",
-	"ok": "확인",
-	"details": "세부 정보",
-	"welcomePage.buttonBackground": "시작 페이지에서 단추의 배경색입니다.",
-	"welcomePage.buttonHoverBackground": "시작 페이지에서 단추의 커서 올리기 배경색입니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/welcome/walkThrough/electron-browser/editor/editorWalkThrough.i18n.json b/i18n/kor/src/vs/workbench/parts/welcome/walkThrough/electron-browser/editor/editorWalkThrough.i18n.json
deleted file mode 100644
index a01a437bc10..00000000000
--- a/i18n/kor/src/vs/workbench/parts/welcome/walkThrough/electron-browser/editor/editorWalkThrough.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"editorWalkThrough.title": "대화형 실습",
-	"editorWalkThrough": "대화형 실습"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThrough.contribution.i18n.json b/i18n/kor/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThrough.contribution.i18n.json
deleted file mode 100644
index c1a83ff4deb..00000000000
--- a/i18n/kor/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThrough.contribution.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"walkThrough.editor.label": "대화형 실습",
-	"help": "도움말"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughActions.i18n.json b/i18n/kor/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughActions.i18n.json
deleted file mode 100644
index 8ab0ded8b44..00000000000
--- a/i18n/kor/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughActions.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"editorWalkThrough.arrowUp": "위로 스크롤(줄)",
-	"editorWalkThrough.arrowDown": "아래로 스크롤(줄)",
-	"editorWalkThrough.pageUp": "위로 스크롤(페이지)",
-	"editorWalkThrough.pageDown": "아래로 스크롤(페이지)"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughPart.i18n.json b/i18n/kor/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughPart.i18n.json
deleted file mode 100644
index a6dc9904581..00000000000
--- a/i18n/kor/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughPart.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"walkThrough.unboundCommand": "바인딩 안 됨",
-	"walkThrough.gitNotFound": "Git가 시스템에 설치되지 않은 것 같습니다.",
-	"walkThrough.embeddedEditorBackground": "대화형 실습에서 포함된 편집기의 배경색입니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/services/actions/electron-browser/menusExtensionPoint.i18n.json b/i18n/kor/src/vs/workbench/services/actions/electron-browser/menusExtensionPoint.i18n.json
deleted file mode 100644
index c92b8c11e09..00000000000
--- a/i18n/kor/src/vs/workbench/services/actions/electron-browser/menusExtensionPoint.i18n.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"requirearray": "메뉴 항목은 배열이어야 합니다.",
-	"requirestring": "속성 `{0}`은(는) 필수이며 `string` 형식이어야 합니다.",
-	"optstring": "속성 `{0}`은(는) 생략할 수 있으며 `string` 형식이어야 합니다.",
-	"vscode.extension.contributes.menuItem.command": "실행할 명령의 식별자입니다. 명령은 '명령' 섹션에 선언되어야 합니다.",
-	"vscode.extension.contributes.menuItem.alt": "실행할 대체 명령의 식별자입니다. 명령은 '명령' 섹션에 선언되어야 합니다.",
-	"vscode.extension.contributes.menuItem.when": "이 항목을 표시하기 위해 true여야 하는 조건입니다.",
-	"vscode.extension.contributes.menuItem.group": "이 명령이 속하는 그룹입니다.",
-	"vscode.extension.contributes.menus": "편집기에 메뉴 항목을 적용합니다.",
-	"menus.commandPalette": "명령 팔레트",
-	"menus.touchBar": "터치 바(macOS 전용)",
-	"menus.editorTitle": "편집기 제목 메뉴",
-	"menus.editorContext": "편집기 상황에 맞는 메뉴",
-	"menus.explorerContext": "파일 탐색기 상황에 맞는 메뉴",
-	"menus.editorTabContext": "편집기 탭 상황에 맞는 메뉴",
-	"menus.debugCallstackContext": "디버그 호출 스택 상황에 맞는 메뉴",
-	"menus.scmTitle": "소스 제어 제목 메뉴",
-	"menus.scmSourceControl": "소스 제어 메뉴",
-	"menus.resourceGroupContext": "소스 제어 리소스 그룹 상황에 맞는 메뉴",
-	"menus.resourceStateContext": "소스 제어 리소스 상태 상황에 맞는 메뉴",
-	"view.viewTitle": "기여 조회 제목 메뉴",
-	"view.itemContext": "기여 조회 항목 상황에 맞는 메뉴",
-	"nonempty": "비어 있지 않은 값이 필요합니다.",
-	"opticon": "`icon` 속성은 생략할 수 있거나 문자열 또는 리터럴(예: `{dark, light}`)이어야 합니다.",
-	"requireStringOrObject": "`{0}` 속성은 필수이며 `string` 또는 `object` 형식이어야 합니다.",
-	"requirestrings": "`{0}` 및 `{1}` 속성은 필수이며 `string` 형식이어야 합니다.",
-	"vscode.extension.contributes.commandType.command": "실행할 명령의 식별자",
-	"vscode.extension.contributes.commandType.title": "명령이 UI에 표시되는 제목입니다.",
-	"vscode.extension.contributes.commandType.category": "(선택 사항) UI에서 명령별 범주 문자열을 그룹화합니다.",
-	"vscode.extension.contributes.commandType.icon": "(선택 사항) UI에서 명령을 나타내는 데 사용되는 아이콘입니다. 파일 경로 또는 테마 지정 가능 구성입니다.",
-	"vscode.extension.contributes.commandType.icon.light": "밝은 테마가 사용될 경우의 아이콘 경로입니다.",
-	"vscode.extension.contributes.commandType.icon.dark": "어두운 테마가 사용될 경우의 아이콘 경로입니다.",
-	"vscode.extension.contributes.commands": "명령 팔레트에 명령을 적용합니다.",
-	"dup": "`명령` 섹션에 `{0}` 명령이 여러 번 나타납니다.",
-	"menuId.invalid": "`{0}`은(는) 유효한 메뉴 식별자가 아닙니다.",
-	"missing.command": "메뉴 항목이 '명령' 섹션에 정의되지 않은 `{0}` 명령을 참조합니다.",
-	"missing.altCommand": "메뉴 항목이 '명령' 섹션에 정의되지 않은 alt 명령 `{0}`을(를) 참조합니다.",
-	"dupe.command": "메뉴 항목이 동일한 명령을 기본값과 alt 명령으로 참조합니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/services/bulkEdit/electron-browser/bulkEditService.i18n.json b/i18n/kor/src/vs/workbench/services/bulkEdit/electron-browser/bulkEditService.i18n.json
deleted file mode 100644
index 1b092993f52..00000000000
--- a/i18n/kor/src/vs/workbench/services/bulkEdit/electron-browser/bulkEditService.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"summary.0": "편집하지 않음",
-	"summary.nm": "{1}개 파일에서 {0}개 텍스트 편집을 수행함",
-	"summary.n0": "1개 파일에서 {0}개 텍스트 편집을 수행함",
-	"conflict": "이러한 파일이 동시에 변경되었습니다. {0}"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/services/configuration/common/configurationExtensionPoint.i18n.json b/i18n/kor/src/vs/workbench/services/configuration/common/configurationExtensionPoint.i18n.json
deleted file mode 100644
index 6cd63821229..00000000000
--- a/i18n/kor/src/vs/workbench/services/configuration/common/configurationExtensionPoint.i18n.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.contributes.configuration.title": "설정을 요약합니다. 이 레이블은 설정 파일에서 구분 주석으로 사용됩니다.",
-	"vscode.extension.contributes.configuration.properties": "구성 속성에 대한 설명입니다.",
-	"scope.application.description": "[사용자] 설정에서만 구성할 수 있는 응용 프로그램 관련 구성입니다.",
-	"scope.window.description": "[사용자] 설정 또는 [작업 영역] 설정에서 구성할 수 있는 창 특정 구성입니다.",
-	"scope.resource.description": "사용자, 작업 영역 또는 폴더 설정에서 구성할 수 있는 리소스 특정 구성",
-	"scope.description": "구성이 적용되는 범위입니다. 사용 가능 범위는 '창'과 '리소스'입니다.",
-	"vscode.extension.contributes.defaultConfiguration": "언어별로 기본 편집기 구성 설정을 적용합니다.",
-	"vscode.extension.contributes.configuration": "구성 설정을 적용합니다.",
-	"invalid.title": "'configuration.title'은 문자열이어야 합니다.",
-	"invalid.properties": "'configuration.properties'는 개체여야 합니다.",
-	"invalid.property": "'configuration.properties'는 개체여야 합니다.",
-	"invalid.allOf": "'configuration.allOf'는 사용되지 않으며 더 이상 사용해서는 안됩니다. 대신 여러 구성 섹션을 배열로 'configuration' 기여 지점에 전달하세요.",
-	"workspaceConfig.folders.description": "작업 영역에 로드되는 폴더 목록입니다.",
-	"workspaceConfig.path.description": "파일 경로입니다. 예: `/root/folderA` 또는 `./folderA`(작업 영역 파일의 위치를 기준으로 확인할 상대 경로인 경우)",
-	"workspaceConfig.name.description": "폴더에 대한 선택적 이름입니다.",
-	"workspaceConfig.uri.description": "폴더 URI",
-	"workspaceConfig.settings.description": "작업 영역 설정",
-	"workspaceConfig.launch.description": "작업 영역 시작 구성",
-	"workspaceConfig.extensions.description": "작업 영역 확장",
-	"unknownWorkspaceProperty": "알 수 없는 작업 영역 구성 속성"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/services/configuration/node/configuration.i18n.json b/i18n/kor/src/vs/workbench/services/configuration/node/configuration.i18n.json
deleted file mode 100644
index 96b95e7ea94..00000000000
--- a/i18n/kor/src/vs/workbench/services/configuration/node/configuration.i18n.json
+++ /dev/null
@@ -1,24 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"vscode.extension.contributes.configuration.title": "설정을 요약합니다. 이 레이블은 설정 파일에서 구분 주석으로 사용됩니다.",
-	"vscode.extension.contributes.configuration.properties": "구성 속성에 대한 설명입니다.",
-	"scope.window.description": "[사용자] 설정 또는 [작업 영역] 설정에서 구성할 수 있는 창 특정 구성입니다.",
-	"scope.resource.description": "사용자, 작업 영역 또는 폴더 설정에서 구성할 수 있는 리소스 특정 구성",
-	"scope.description": "구성이 적용되는 범위입니다. 사용 가능 범위는 '창'과 '리소스'입니다.",
-	"vscode.extension.contributes.configuration": "구성 설정을 적용합니다.",
-	"invalid.title": "'configuration.title'은 문자열이어야 합니다.",
-	"vscode.extension.contributes.defaultConfiguration": "언어별로 기본 편집기 구성 설정을 적용합니다.",
-	"invalid.properties": "'configuration.properties'는 개체여야 합니다.",
-	"invalid.allOf": "'configuration.allOf'는 사용되지 않으며 더 이상 사용해서는 안됩니다. 대신 여러 구성 섹션을 배열로 'configuration' 기여 지점에 전달하세요.",
-	"workspaceConfig.folders.description": "작업 영역에 로드되는 폴더 목록입니다.",
-	"workspaceConfig.path.description": "파일 경로입니다. 예: `/root/folderA` 또는 `./folderA`(작업 영역 파일의 위치를 기준으로 확인할 상대 경로인 경우)",
-	"workspaceConfig.name.description": "폴더에 대한 선택적 이름입니다.",
-	"workspaceConfig.uri.description": "폴더의 URI",
-	"workspaceConfig.settings.description": "작업 영역 설정",
-	"workspaceConfig.extensions.description": "작업 영역 확장",
-	"unknownWorkspaceProperty": "알 수 없는 작업 영역 구성 속성"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json b/i18n/kor/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
deleted file mode 100644
index e81a8a242fb..00000000000
--- a/i18n/kor/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openTasksConfiguration": "작업 구성 열기",
-	"openLaunchConfiguration": "시작 구성 열기",
-	"open": "설정 열기",
-	"saveAndRetry": "저장 및 다시 시도",
-	"errorUnknownKey": "{1}은(는) 등록된 구성이 아니므로 {0}에 쓸 수 없습니다.",
-	"errorInvalidWorkspaceConfigurationApplication": "{0}을(를) [작업 영역] 설정에 쓸 수 없습니다. 이 설정은 [사용자] 설정에만 쓸 수 있습니다.",
-	"errorInvalidFolderConfiguration": "{0}이(가) 폴더 리소스 범위를 지원하지 않으므로 폴더 설정에 쓸 수 없습니다.",
-	"errorInvalidUserTarget": "{0}이(가) 글로벌 범위를 지원하지 않으므로 사용자 설정에 쓸 수 없습니다.",
-	"errorInvalidWorkspaceTarget": "{0}이(가) 여러 폴더 작업 영역에서 작업 영역 범위를 지원하지 않으므로 작업 영역 설정에 쓸 수 없습니다.",
-	"errorInvalidFolderTarget": "리소스가 제공되지 않으므로 폴더 설정에 쓸 수 없습니다.",
-	"errorNoWorkspaceOpened": "작업 영역이 열려 있지 않으므로 {0}에 쓸 수 없습니다. 먼저 작업 영역을 열고 다시 시도하세요.",
-	"errorInvalidTaskConfiguration": "작업 구성 파일에 쓸 수 없습니다. 파일을 열고 오류/경고를 수정한 다음 다시 시도하세요.",
-	"errorInvalidLaunchConfiguration": "시작 구성 파일에 쓸 수 없습니다. 파일을 열고 오류/경고를 수정한 다음 다시 시도하세요.",
-	"errorInvalidConfiguration": "사용자 설정에 쓸 수 없습니다. 사용자 설정을 열어 오류/경고를 수정하고 다시 시도하세요.",
-	"errorInvalidConfigurationWorkspace": "작업 영역 설정에 쓸 수 없습니다. 작업 영역 설정을 열어 오류/경고를 수정하고 다시 시도하세요.",
-	"errorInvalidConfigurationFolder": "폴더 설정에 쓸 수 없습니다. '{0}' 폴더 설정을 열어 오류/경고를 수정하고 다시 시도하세요.",
-	"errorTasksConfigurationFileDirty": "작업 구성 파일이 변경되어 이 파일에 쓸 수 없습니다. 먼저 파일을 저장하고 다시 시도하세요.",
-	"errorLaunchConfigurationFileDirty": "시작 구성 파일이 변경되어 이 파일에 쓸 수 없습니다. 먼저 파일을 저장하고 다시 시도하세요.",
-	"errorConfigurationFileDirty": "사용자 설정 파일이 변경되어 사용자 설정에 쓸 수 없습니다. 먼저 사용자 설정 파일을 저장하고 다시 시도하세요.",
-	"errorConfigurationFileDirtyWorkspace": "작업 영역 설정 파일이 변경되어 작업 영역 설정에 쓸 수 없습니다. 먼저 작업 영역 설정 파일을 저장하고 다시 시도하세요.",
-	"errorConfigurationFileDirtyFolder": "폴더 설정 파일이 변경되어 폴더 설정에 쓸 수 없습니다. 먼저 '{0}' 폴더 설정 파일을 저장하고 다시 시도하세요.",
-	"userTarget": "사용자 설정",
-	"workspaceTarget": "작업 영역 설정",
-	"folderTarget": "폴더 설정"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/services/configuration/node/configurationService.i18n.json b/i18n/kor/src/vs/workbench/services/configuration/node/configurationService.i18n.json
deleted file mode 100644
index ef1d360dbb7..00000000000
--- a/i18n/kor/src/vs/workbench/services/configuration/node/configurationService.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"unsupportedApplicationSetting": "이 설정은 [사용자] 설정에서만 적용할 수 있습니다.",
-	"unsupportedWindowSetting": "이 설정은 지금 적용할 수 없으며 이 폴더를 직접 열 경우에 적용됩니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/services/configuration/node/jsonEditingService.i18n.json b/i18n/kor/src/vs/workbench/services/configuration/node/jsonEditingService.i18n.json
deleted file mode 100644
index 58f3403ef49..00000000000
--- a/i18n/kor/src/vs/workbench/services/configuration/node/jsonEditingService.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"errorInvalidFile": "파일에 쓸 수 없습니다. 파일을 열어 오류/경고를 수정한 후 다시 시도하세요.",
-	"errorFileDirty": "파일이 오염되어 파일에 쓸 수 없습니다. 파일을 저장하고 다시 시도하세요."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json b/i18n/kor/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
deleted file mode 100644
index c8a335099eb..00000000000
--- a/i18n/kor/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"stringsOnlySupported": "{0} 명령이 문자열 결과를 반환하지 않았습니다. 변수 대신 사용한 명령의 결과로는 문자열만 지원됩니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/services/configurationResolver/node/variableResolver.i18n.json b/i18n/kor/src/vs/workbench/services/configurationResolver/node/variableResolver.i18n.json
deleted file mode 100644
index aadf3905be6..00000000000
--- a/i18n/kor/src/vs/workbench/services/configurationResolver/node/variableResolver.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"missingEnvVarName": "환경 변수 이름을 지정하지 않았으므로 '{0}'을(를) 확인할 수 없습니다.",
-	"configNotFound": "'{1}' 설정을 찾을 수 없으므로 '{0}'을(를) 확인할 수 없습니다.",
-	"configNoString": "'{1}'은(는) 구조적 값이므로 '{0}'을(를) 확인할 수 없습니다.",
-	"missingConfigName": "설정 이름을 지정하지 않았으므로 '{0}'을(를) 확인할 수 없습니다.",
-	"noValueForCommand": "명령에 값이 없으므로 '{0}'을(를) 확인할 수 없습니다.",
-	"canNotFindFolder": "'{0}'을(를) 확인할 수 없습니다. 해당 '{1}' 폴더가 없습니다.",
-	"canNotResolveWorkspaceFolderMultiRoot": "다중 폴더 작업 영역에서 '{0}'을(를) 확인할 수 없습니다. ':'과 작업 영역 폴더 이름을 사용하여 이 변수 범위를 정하세요.",
-	"canNotResolveWorkspaceFolder": "'{0}'을(를) 확인할 수 없습니다. 폴더를 여세요.",
-	"canNotResolveFile": "'{0}'을(를) 확인할 수 없습니다. 편집기를 여세요.",
-	"canNotResolveLineNumber": "'{0}'을(를) 확인할 수 없습니다. 선택한 줄이 활성 편집기에 있는지 확인하세요.",
-	"canNotResolveSelectedText": "'{0}'을(를) 확인할 수 없습니다. 선택한 텍스트가 활성 편집기에 있는지 확인하세요."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/services/crashReporter/common/crashReporterService.i18n.json b/i18n/kor/src/vs/workbench/services/crashReporter/common/crashReporterService.i18n.json
deleted file mode 100644
index cff423b1f3b..00000000000
--- a/i18n/kor/src/vs/workbench/services/crashReporter/common/crashReporterService.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"telemetryConfigurationTitle": "원격 분석",
-	"telemetry.enableCrashReporting": "충돌 보고서를 Microsoft에 전송할 수 있도록 설정합니다.\n이 옵션을 적용하려면 다시 시작해야 합니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/services/crashReporter/electron-browser/crashReporterService.i18n.json b/i18n/kor/src/vs/workbench/services/crashReporter/electron-browser/crashReporterService.i18n.json
deleted file mode 100644
index 9a469f4da5a..00000000000
--- a/i18n/kor/src/vs/workbench/services/crashReporter/electron-browser/crashReporterService.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"telemetryConfigurationTitle": "원격 분석",
-	"telemetry.enableCrashReporting": "충돌 보고서를 Microsoft에 전송할 수 있도록 설정합니다.\n이 옵션을 적용하려면 다시 시작해야 합니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/services/decorations/browser/decorationsService.i18n.json b/i18n/kor/src/vs/workbench/services/decorations/browser/decorationsService.i18n.json
deleted file mode 100644
index 5b8f343022a..00000000000
--- a/i18n/kor/src/vs/workbench/services/decorations/browser/decorationsService.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"bubbleTitle": "강조 표시한 항목 포함"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json b/i18n/kor/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json
deleted file mode 100644
index 96048859920..00000000000
--- a/i18n/kor/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"yesButton": "예(&&Y)",
-	"cancelButton": "취소"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/services/dialogs/electron-browser/dialogs.i18n.json b/i18n/kor/src/vs/workbench/services/dialogs/electron-browser/dialogs.i18n.json
deleted file mode 100644
index 90a59063f98..00000000000
--- a/i18n/kor/src/vs/workbench/services/dialogs/electron-browser/dialogs.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"yesButton": "예(&&Y)",
-	"cancelButton": "취소",
-	"moreFile": "...1개의 추가 파일이 표시되지 않음",
-	"moreFiles": "...{0}개의 추가 파일이 표시되지 않음"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/services/editor/browser/editorService.i18n.json b/i18n/kor/src/vs/workbench/services/editor/browser/editorService.i18n.json
deleted file mode 100644
index 50e968f8ee3..00000000000
--- a/i18n/kor/src/vs/workbench/services/editor/browser/editorService.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"compareLabels": "{0} ↔ {1}"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/services/editor/common/editorService.i18n.json b/i18n/kor/src/vs/workbench/services/editor/common/editorService.i18n.json
deleted file mode 100644
index ca1ee0161c1..00000000000
--- a/i18n/kor/src/vs/workbench/services/editor/common/editorService.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"compareLabels": "{0} ↔ {1}"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/services/extensions/common/extensionsRegistry.i18n.json b/i18n/kor/src/vs/workbench/services/extensions/common/extensionsRegistry.i18n.json
deleted file mode 100644
index b38e23eb40d..00000000000
--- a/i18n/kor/src/vs/workbench/services/extensions/common/extensionsRegistry.i18n.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.engines": "엔진 호환성입니다.",
-	"vscode.extension.engines.vscode": "VS Code 확장의 경우, 확장이 호환되는 VS Code 버전을 지정합니다. *일 수 없습니다. 예를 들어 ^0.10.5는 최소 VS Code 버전인 0.10.5와 호환됨을 나타냅니다.",
-	"vscode.extension.publisher": "VS Code 확장의 게시자입니다.",
-	"vscode.extension.displayName": "VS Code 갤러리에 사용되는 확장의 표시 이름입니다.",
-	"vscode.extension.categories": "확장을 분류하기 위해 VS Code 갤러리에서 사용하는 범주입니다.",
-	"vscode.extension.category.languages.deprecated": "대신 '프로그래밍 언어' 사용",
-	"vscode.extension.galleryBanner": "VS Code 마켓플레이스에 사용되는 배너입니다.",
-	"vscode.extension.galleryBanner.color": "VS Code 마켓플레이스 페이지 머리글의 배너 색상입니다.",
-	"vscode.extension.galleryBanner.theme": "배너에 사용되는 글꼴의 색상 테마입니다.",
-	"vscode.extension.contributes": "이 패키지에 표시된 VS Code 확장의 전체 기여입니다.",
-	"vscode.extension.preview": "마켓플레이스에서 Preview로 플래그 지정할 확장을 설정합니다.",
-	"vscode.extension.activationEvents": "VS Code 확장에 대한 활성화 이벤트입니다.",
-	"vscode.extension.activationEvents.onLanguage": "지정된 언어로 확인되는 파일을 열 때마다 활성화 이벤트가 발송됩니다.",
-	"vscode.extension.activationEvents.onCommand": "지정된 명령을 호출할 때마다 활성화 이벤트가 발송됩니다.",
-	"vscode.extension.activationEvents.onDebug": "사용자가 디버깅을 시작하거나 디버그 구성을 설정하려고 할 때마다 활성화 이벤트를 내보냅니다.",
-	"vscode.extension.activationEvents.onDebugInitialConfigurations": "\"launch.json\"을 만들어야 할 때마다(그리고 모든 provideDebugConfigurations 메서드를 호출해야 할 때마다) 발생하는 활성화 이벤트입니다.",
-	"vscode.extension.activationEvents.onDebugResolve": "특정 유형의 디버그 세션이 시작하려고 할 때마다(그리고 해당하는 resolveDebugConfiguration 메서드를 호출해야 할 때마다) 발생하는 활성화 이벤트입니다.",
-	"vscode.extension.activationEvents.workspaceContains": "지정된 glob 패턴과 일치하는 파일이 하나 이상 있는 폴더를 열 때마다 활성화 알림이 발송됩니다.",
-	"vscode.extension.activationEvents.onView": "지정된 뷰가 확장될 때마다 활성화 이벤트가 내보내 집니다.",
-	"vscode.extension.activationEvents.onUri": "이 확장으로 이동되는 시스템 차원 URI를 열 때마다 활성화 이벤트를 내보냅니다.",
-	"vscode.extension.activationEvents.star": "VS Code 시작 시 활성화 이벤트가 발송됩니다. 훌륭한 최종 사용자 경험을 보장하려면 사용 케이스에서 다른 활성화 이벤트 조합이 작동하지 않을 때에만 확장에서 이 활성화 이벤트를 사용하세요.",
-	"vscode.extension.badges": "마켓플레이스 확장 페이지의 사이드바에 표시할 배지의 배열입니다.",
-	"vscode.extension.badges.url": "배지 이미지 URL입니다.",
-	"vscode.extension.badges.href": "배지 링크입니다.",
-	"vscode.extension.badges.description": "배지 설명입니다.",
-	"vscode.extension.markdown": "Marketplace에서 사용되는 Markdown 렌더링 엔진을 제어합니다. Github(기본값) 또는 표준입니다.",
-	"vscode.extension.qna": "Marketplace에서 Q&A 링크를 제어합니다. 기본 Marketplace Q & A 사이트를 사용하도록 설정하려면 marketplace로 설정합니다. 사용자 지정 Q & A 사이트의 URL을 제공하려면 문자열로 설정합니다. Q & A를 전적으로 사용하지 않도록 설정하려면 false로 설정합니다.",
-	"vscode.extension.extensionDependencies": "다른 확장에 대한 종속성입니다. 확장 식별자는 항상 ${publisher}.${name}입니다(예: vscode.csharp).",
-	"vscode.extension.scripts.prepublish": "패키지가 VS Code 확장 형태로 게시되기 전에 스크립트가 실행되었습니다.",
-	"vscode.extension.scripts.uninstall": "VS Code 확장에 대한 후크를 제거합니다. 확장이 VS Code에서 완전히 제거될 때 즉, 확장이 제거된 후 VS Code가 다시 시작할 때(종료하고 시작) 실행되는 스크립트입니다. 노드 스크립트만 지원됩니다.",
-	"vscode.extension.icon": "128x128 픽셀 아이콘의 경로입니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/services/extensions/electron-browser/extensionHost.i18n.json b/i18n/kor/src/vs/workbench/services/extensions/electron-browser/extensionHost.i18n.json
deleted file mode 100644
index 59dd41575e5..00000000000
--- a/i18n/kor/src/vs/workbench/services/extensions/electron-browser/extensionHost.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"extensionHostProcess.startupFailDebug": "확장 호스트가 10초 내에 시작되지 않았습니다. 첫 번째 줄에서 중지되었을 수 있습니다. 계속하려면 디버거가 필요합니다.",
-	"extensionHostProcess.startupFail": "확장 호스트가 10초 이내에 시작되지 않았습니다. 문제가 발생했을 수 있습니다.",
-	"reloadWindow": "창 다시 로드",
-	"extensionHostProcess.error": "확장 호스트에서 오류 발생: {0}"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/services/extensions/electron-browser/extensionHostProfiler.i18n.json b/i18n/kor/src/vs/workbench/services/extensions/electron-browser/extensionHostProfiler.i18n.json
deleted file mode 100644
index d2e87a56b9a..00000000000
--- a/i18n/kor/src/vs/workbench/services/extensions/electron-browser/extensionHostProfiler.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"message": "$(zap) 확장 호스트를 프로파일링하는 중..."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/services/extensions/electron-browser/extensionPoints.i18n.json b/i18n/kor/src/vs/workbench/services/extensions/electron-browser/extensionPoints.i18n.json
deleted file mode 100644
index d8ba92cfb2a..00000000000
--- a/i18n/kor/src/vs/workbench/services/extensions/electron-browser/extensionPoints.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"jsonParseFail": "{0}을(를) 구문 분석하지 못함: {1}.",
-	"fileReadFail": "파일 {0}을(를) 읽을 수 없음: {1}.",
-	"jsonsParseReportErrors": "{0}을(를) 구문 분석하지 못함: {1}.",
-	"missingNLSKey": "키 {0}에 대한 메시지를 찾을 수 없습니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json b/i18n/kor/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json
deleted file mode 100644
index 69402728066..00000000000
--- a/i18n/kor/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"extensionsDisabled": "모든 확장을 사용할 수 없습니다.",
-	"extensionHostProcess.crash": "확장 호스트가 예기치 않게 종료되었습니다.",
-	"extensionHostProcess.unresponsiveCrash": "확장 호스트가 응답하지 않아서 종료되었습니다.",
-	"devTools": "개발자 도구 열기",
-	"restart": "확장 호스트 다시 시작",
-	"overwritingExtension": "확장 {0}을(를) {1}(으)로 덮어쓰는 중입니다.",
-	"extensionUnderDevelopment": "{0}에서 개발 확장 로드 중",
-	"extensionCache.invalid": "확장이 디스크에서 수정되었습니다. 창을 다시 로드하세요.",
-	"reloadWindow": "창 다시 로드"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/services/extensions/node/extensionPoints.i18n.json b/i18n/kor/src/vs/workbench/services/extensions/node/extensionPoints.i18n.json
deleted file mode 100644
index 97775a0c1ef..00000000000
--- a/i18n/kor/src/vs/workbench/services/extensions/node/extensionPoints.i18n.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"jsonParseFail": "{0}을(를) 구문 분석하지 못함: {1}.",
-	"fileReadFail": "파일 {0}을(를) 읽을 수 없음: {1}.",
-	"jsonsParseReportErrors": "{0}을(를) 구문 분석하지 못함: {1}.",
-	"missingNLSKey": "키 {0}에 대한 메시지를 찾을 수 없습니다.",
-	"notSemver": "확장 버전이 semver와 호환되지 않습니다.",
-	"extensionDescription.empty": "가져온 확장 설명이 비어 있습니다.",
-	"extensionDescription.publisher": "속성 `{0}`은(는) 필수이며 `string` 형식이어야 합니다.",
-	"extensionDescription.name": "속성 `{0}`은(는) 필수이며 `string` 형식이어야 합니다.",
-	"extensionDescription.version": "속성 `{0}`은(는) 필수이며 `string` 형식이어야 합니다.",
-	"extensionDescription.engines": "속성 `{0}`은(는) 필수이며 `object` 형식이어야 합니다.",
-	"extensionDescription.engines.vscode": "속성 `{0}`은(는) 필수이며 `string` 형식이어야 합니다.",
-	"extensionDescription.extensionDependencies": "속성 `{0}`은(는) 생략할 수 있으며 `string[]` 형식이어야 합니다.",
-	"extensionDescription.activationEvents1": "속성 `{0}`은(는) 생략할 수 있으며 `string[]` 형식이어야 합니다.",
-	"extensionDescription.activationEvents2": "속성 `{0}` 및 `{1}`은(는) 둘 다 지정하거나 둘 다 생략해야 합니다.",
-	"extensionDescription.main1": "속성 `{0}`은(는) 생략할 수 있으며 `string` 형식이어야 합니다.",
-	"extensionDescription.main2": "확장의 폴더({1}) 내에 포함할 `main`({0})이 필요합니다. 이로 인해 확장이 이식 불가능한 상태가 될 수 있습니다.",
-	"extensionDescription.main3": "속성 `{0}` 및 `{1}`은(는) 둘 다 지정하거나 둘 다 생략해야 합니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/services/files/electron-browser/fileService.i18n.json b/i18n/kor/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
deleted file mode 100644
index 361d1ad7355..00000000000
--- a/i18n/kor/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"netVersionError": "Microsoft .NET Framework 4.5가 필요합니다. 설치하려면 링크를 클릭하세요.",
-	"installNet": ".NET Framework 4.5 다운로드",
-	"neverShowAgain": "다시 표시 안 함",
-	"enospcError": "{0}은(는) 이 큰 작업 영역에서 파일 변경 내용을 감시할 수 없습니다. 지침 링크에 따라 이 문제를 해결하세요.",
-	"learnMore": "지침",
-	"fileInvalidPath": "잘못된 파일 리소스({0})",
-	"fileIsDirectoryError": "파일이 디렉터리입니다.",
-	"fileNotModifiedError": "파일 수정 안 됨",
-	"fileTooLargeForHeapError": "이 크기의 파일을 열려면 VS Code를 다시 시작하여 더 많은 메모리를 사용하도록 허용해야 합니다.",
-	"fileTooLargeError": "파일이 너무 커서 열 수 없음",
-	"fileNotFoundError": "파일을 찾을 수 없습니다({0}).",
-	"fileBinaryError": "파일이 이진인 것 같으므로 테스트로 열 수 없습니다.",
-	"filePermission": "파일 쓰기 권한이 거부되었습니다. ({0})",
-	"fileExists": "만드려는 파일이 이미 있음({0})",
-	"fileModifiedError": "파일 수정됨",
-	"fileReadOnlyError": "파일이 읽기 전용입니다.",
-	"fileMoveConflict": "이동/복사할 수 없습니다. 대상에 파일이 이미 있습니다.",
-	"unableToMoveCopyError": "이동/복사할 수 없습니다. 파일이 포함된 폴더를 파일로 대체합니다.",
-	"binFailed": "'{0}'을(를) 휴지통으로 이동하지 못함",
-	"trashFailed": "'{0}'을(를) 휴지통으로 이동하지 못함"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json b/i18n/kor/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
deleted file mode 100644
index ef565fe453f..00000000000
--- a/i18n/kor/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"invalidPath": "'{0}' 리소스의 경로는 절대 경로여야 합니다.",
-	"fileNotFoundError": "파일을 찾을 수 없습니다({0}).",
-	"fileIsDirectoryError": "파일이 디렉터리입니다.",
-	"fileNotModifiedError": "파일 수정 안 됨",
-	"fileBinaryError": "파일이 이진인 것 같으므로 테스트로 열 수 없습니다.",
-	"err.create": "{0} 파일을 만들지 못했습니다.",
-	"fileMoveConflict": "이동/복사할 수 없습니다. 대상에 파일이 이미 있습니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/services/files/node/fileService.i18n.json b/i18n/kor/src/vs/workbench/services/files/node/fileService.i18n.json
deleted file mode 100644
index d411f384a72..00000000000
--- a/i18n/kor/src/vs/workbench/services/files/node/fileService.i18n.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"fileInvalidPath": "잘못된 파일 리소스({0})",
-	"fileIsDirectoryError": "파일이 디렉터리입니다.",
-	"fileNotModifiedError": "파일 수정 안 됨",
-	"fileTooLargeError": "파일이 너무 커서 열 수 없음",
-	"fileNotFoundError": "파일을 찾을 수 없습니다({0}).",
-	"fileBinaryError": "파일이 이진인 것 같으므로 테스트로 열 수 없습니다.",
-	"filePermission": "파일 쓰기 권한이 거부되었습니다. ({0})",
-	"fileExists": "만드려는 파일이 이미 있음({0})",
-	"fileMoveConflict": "이동/복사할 수 없습니다. 대상에 파일이 이미 있습니다.",
-	"unableToMoveCopyError": "이동/복사할 수 없습니다. 파일이 포함된 폴더를 파일로 대체합니다.",
-	"foldersCopyError": "폴더를 작업 영역에 복사할 수 없습니다. 개별 파일을 선택하여 복사하세요.",
-	"fileModifiedError": "파일 수정됨",
-	"fileReadOnlyError": "파일이 읽기 전용입니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/services/jsonschemas/common/jsonValidationExtensionPoint.i18n.json b/i18n/kor/src/vs/workbench/services/jsonschemas/common/jsonValidationExtensionPoint.i18n.json
deleted file mode 100644
index 42c82644097..00000000000
--- a/i18n/kor/src/vs/workbench/services/jsonschemas/common/jsonValidationExtensionPoint.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"contributes.jsonValidation": "json 스키마 구성을 적용합니다.",
-	"contributes.jsonValidation.fileMatch": "일치할 파일 패턴(예: \"package.json\" 또는 \"*.launch\")입니다.",
-	"contributes.jsonValidation.url": "스키마 URL('http:', 'https:') 또는 확장 폴더에 대한 상대 경로('./')입니다.",
-	"invalid.jsonValidation": "'configuration.jsonValidation'은 배열이어야 합니다.",
-	"invalid.fileMatch": "'configuration.jsonValidation.fileMatch'를 정의해야 합니다.",
-	"invalid.url": "'configuration.jsonValidation.url'은 URL 또는 상대 경로여야 합니다.",
-	"invalid.url.fileschema": "'configuration.jsonValidation.url'이 잘못된 상대 URL입니다. {0}",
-	"invalid.url.schema": "확장에 있는 스키마를 참조하려면 'configuration.jsonValidation.url'이 'http:', 'https:' 또는 './'로 시작해야 합니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/services/keybinding/common/keybindingEditing.i18n.json b/i18n/kor/src/vs/workbench/services/keybinding/common/keybindingEditing.i18n.json
deleted file mode 100644
index 3be329cea3b..00000000000
--- a/i18n/kor/src/vs/workbench/services/keybinding/common/keybindingEditing.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"errorKeybindingsFileDirty": "키 바인딩 구성 파일이 변경되었으므로 쓸 수 없습니다. 먼저 파일을 저장하고 다시 시도하세요.",
-	"parseErrors": "키 바인딩 구성 파일에 쓸 수 없습니다. 파일을 열고 오류/경고를 수정한 다음 다시 시도하세요.",
-	"errorInvalidConfiguration": "키 바인딩 구성 파일에 쓸 수 없습니다. 이 파일에 배열 형식이 아닌 개체가 있습니다. 파일을 열어 정리하고 다시 시도하세요.",
-	"emptyKeybindingsHeader": "키 바인딩을 이 파일에 넣어서 기본값을 덮어씁니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/services/keybinding/electron-browser/keybindingService.i18n.json b/i18n/kor/src/vs/workbench/services/keybinding/electron-browser/keybindingService.i18n.json
deleted file mode 100644
index 4f7f21f665e..00000000000
--- a/i18n/kor/src/vs/workbench/services/keybinding/electron-browser/keybindingService.i18n.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"nonempty": "비어 있지 않은 값이 필요합니다.",
-	"requirestring": "속성 `{0}`은(는) 필수이며 `string` 형식이어야 합니다.",
-	"optstring": "속성 `{0}`은(는) 생략할 수 있으며 `string` 형식이어야 합니다.",
-	"vscode.extension.contributes.keybindings.command": "키 바인딩이 트리거될 때 실행할 명령의 식별자입니다.",
-	"vscode.extension.contributes.keybindings.key": "키 또는 키 시퀀스(더하기 기호가 있는 개별 키, 공백이 있는 시퀀스, 예: Ctrl+O 및 Ctrl+L L을 동시에 누름)",
-	"vscode.extension.contributes.keybindings.mac": "Mac 특정 키 또는 키 시퀀스입니다.",
-	"vscode.extension.contributes.keybindings.linux": "Linux 특정 키 또는 키 시퀀스",
-	"vscode.extension.contributes.keybindings.win": "Windows 특정 키 또는 키 시퀀스",
-	"vscode.extension.contributes.keybindings.when": "키가 활성화되는 조건입니다.",
-	"vscode.extension.contributes.keybindings": "키 바인딩을 적용합니다.",
-	"invalid.keybindings": "잘못된 `contributes.{0}`입니다. {1}",
-	"unboundCommands": "사용 가능한 다른 명령:",
-	"keybindings.json.title": "키 바인딩 구성",
-	"keybindings.json.key": "키 또는 키 시퀀스(공백으로 구분됨)",
-	"keybindings.json.command": "실행할 명령의 이름",
-	"keybindings.json.when": "키가 활성화되는 조건입니다.",
-	"keybindings.json.args": "실행할 명령에 전달할 인수입니다.",
-	"keyboardConfigurationTitle": "키보드",
-	"dispatch": "`code`(권장) 또는 `keyCode`를 사용하는 키 누름에 대한 디스패치 논리를 제어합니다.",
-	"touchbar.enabled": "사용 가능한 경우 키보드의 macOS Touch Bar 단추를 사용하도록 설정합니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/services/message/browser/messageList.i18n.json b/i18n/kor/src/vs/workbench/services/message/browser/messageList.i18n.json
deleted file mode 100644
index 51ef25e8b0c..00000000000
--- a/i18n/kor/src/vs/workbench/services/message/browser/messageList.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"alertErrorMessage": "오류: {0}",
-	"alertWarningMessage": "경고: {0}",
-	"alertInfoMessage": "정보: {0}",
-	"error": "오류",
-	"warning": "경고",
-	"info": "정보",
-	"close": "닫기"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/services/message/electron-browser/messageService.i18n.json b/i18n/kor/src/vs/workbench/services/message/electron-browser/messageService.i18n.json
deleted file mode 100644
index 96048859920..00000000000
--- a/i18n/kor/src/vs/workbench/services/message/electron-browser/messageService.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"yesButton": "예(&&Y)",
-	"cancelButton": "취소"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/services/mode/common/workbenchModeService.i18n.json b/i18n/kor/src/vs/workbench/services/mode/common/workbenchModeService.i18n.json
deleted file mode 100644
index 7ff48035f1e..00000000000
--- a/i18n/kor/src/vs/workbench/services/mode/common/workbenchModeService.i18n.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.contributes.languages": "언어 선언을 적용합니다.",
-	"vscode.extension.contributes.languages.id": "언어의 ID입니다.",
-	"vscode.extension.contributes.languages.aliases": "언어에 대한 이름 별칭입니다.",
-	"vscode.extension.contributes.languages.extensions": "파일 확장이 언어에 연결되어 있습니다.",
-	"vscode.extension.contributes.languages.filenames": "파일 이름이 언어에 연결되어 있습니다.",
-	"vscode.extension.contributes.languages.filenamePatterns": "파일 이름 GLOB 패턴이 언어에 연결되어 있습니다.",
-	"vscode.extension.contributes.languages.mimetypes": "Mime 형식이 언어에 연결되어 있습니다.",
-	"vscode.extension.contributes.languages.firstLine": "언어 파일의 첫 번째 줄과 일치하는 정규식입니다.",
-	"vscode.extension.contributes.languages.configuration": "언어에 대한 구성 옵션을 포함하는 파일에 대한 상대 경로입니다.",
-	"invalid": "잘못된 `contributes.{0}`입니다. 배열이 필요합니다.",
-	"invalid.empty": "`contributes.{0}`에 대한 빈 값",
-	"require.id": "속성 `{0}`은(는) 필수이며 `string` 형식이어야 합니다.",
-	"opt.extensions": "`{0}` 속성은 생략 가능하며 `string[]` 형식이어야 합니다.",
-	"opt.filenames": "`{0}` 속성은 생략 가능하며 `string[]` 형식이어야 합니다.",
-	"opt.firstLine": "`{0}` 속성은 생략 가능하며 `string` 형식이어야 합니다.",
-	"opt.configuration": "`{0}` 속성은 생략 가능하며 `string` 형식이어야 합니다.",
-	"opt.aliases": "`{0}` 속성은 생략 가능하며 `string[]` 형식이어야 합니다.",
-	"opt.mimetypes": "`{0}` 속성은 생략 가능하며 `string[]` 형식이어야 합니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/services/progress/browser/progressService2.i18n.json b/i18n/kor/src/vs/workbench/services/progress/browser/progressService2.i18n.json
deleted file mode 100644
index d4f0c4c0f4d..00000000000
--- a/i18n/kor/src/vs/workbench/services/progress/browser/progressService2.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"progress.subtitle": "{0} - {1}",
-	"progress.title": "{0}: {1}",
-	"cancel": "취소"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/services/textMate/electron-browser/TMGrammars.i18n.json b/i18n/kor/src/vs/workbench/services/textMate/electron-browser/TMGrammars.i18n.json
deleted file mode 100644
index 9535580ff01..00000000000
--- a/i18n/kor/src/vs/workbench/services/textMate/electron-browser/TMGrammars.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.contributes.grammars": "textmate 토크나이저를 적용합니다.",
-	"vscode.extension.contributes.grammars.language": "이 구문이 적용되는 언어 식별자입니다.",
-	"vscode.extension.contributes.grammars.scopeName": "tmLanguage 파일에 사용되는 Textmate 범위 이름입니다.",
-	"vscode.extension.contributes.grammars.path": "tmLanguage 파일의 경로입니다. 확장 폴더의 상대 경로이며 일반적으로 './syntaxes/'로 시작합니다.",
-	"vscode.extension.contributes.grammars.embeddedLanguages": "이 문법에 포함된 언어가 있는 경우 언어 ID에 대한 범위 이름의 맵입니다.",
-	"vscode.extension.contributes.grammars.tokenTypes": "토큰 형식에 대한 범위 이름의 맵입니다.",
-	"vscode.extension.contributes.grammars.injectTo": "이 문법이 삽입되는 언어 범위 이름 목록입니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/services/textMate/electron-browser/TMSyntax.i18n.json b/i18n/kor/src/vs/workbench/services/textMate/electron-browser/TMSyntax.i18n.json
deleted file mode 100644
index 1b87a0da7e9..00000000000
--- a/i18n/kor/src/vs/workbench/services/textMate/electron-browser/TMSyntax.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"invalid.language": "`contributes.{0}.language`에 알 수 없는 언어가 있습니다. 제공된 값: {1}",
-	"invalid.scopeName": "`contributes.{0}.scopeName`에 문자열이 필요합니다. 제공된 값: {1}",
-	"invalid.path.0": "`contributes.{0}.path`에 문자열이 필요합니다. 제공된 값: {1}",
-	"invalid.injectTo": "`contributes.{0}.injectTo`의 값이 잘못되었습니다. 언어 범위 이름 배열이어야 합니다. 제공된 값: {1}",
-	"invalid.embeddedLanguages": "`contributes.{0}.embeddedLanguages` 값이 잘못되었습니다. 범위 이름에서 언어까지의 개체 맵이어야 합니다. 제공된 값: {1}",
-	"invalid.tokenTypes": "`contributes.{0}.tokenTypes` 값이 잘못되었습니다. 범위 이름에서 언어까지의 개체 맵이어야 합니다. 제공된 값: {1}",
-	"invalid.path.1": "확장 폴더({2})에 포함할 `contributes.{0}.path`({1})가 필요합니다. 확장이 이식 불가능해질 수 있습니다.",
-	"no-tm-grammar": "이 언어에 대해 등록된 TM 문법이 없습니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/services/textfile/common/textFileEditorModel.i18n.json b/i18n/kor/src/vs/workbench/services/textfile/common/textFileEditorModel.i18n.json
deleted file mode 100644
index 2174b30ffc0..00000000000
--- a/i18n/kor/src/vs/workbench/services/textfile/common/textFileEditorModel.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"saveFileFirst": "더티 파일입니다. 다른 인코딩을 사용하여 파일을 다시 열기 전에 파일을 저장하세요.",
-	"genericSaveError": "'{0}'을(를) 저장하지 못했습니다. {1}"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/services/textfile/common/textFileService.i18n.json b/i18n/kor/src/vs/workbench/services/textfile/common/textFileService.i18n.json
deleted file mode 100644
index c1461906d4e..00000000000
--- a/i18n/kor/src/vs/workbench/services/textfile/common/textFileService.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"files.backup.failSave": "변경된 내용이 있는 파일을 백업 위치에 쓸 수 없습니다(오류: {0}). 먼저 파일을 저장한 다음 종료해 보세요."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json b/i18n/kor/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json
deleted file mode 100644
index cbccbeec814..00000000000
--- a/i18n/kor/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"saveChangesMessage": "{0}에 대한 변경 내용을 저장할까요?",
-	"saveChangesMessages": "다음 {0}개 파일에 대한 변경 내용을 저장할까요?",
-	"saveAll": "모두 저장(&&S)",
-	"save": "저장(&&S)",
-	"dontSave": "저장 안 함(&&N)",
-	"cancel": "취소",
-	"saveChangesDetail": "변경 내용을 저장하지 않은 경우 변경 내용이 손실됩니다.",
-	"allFiles": "모든 파일",
-	"noExt": "확장 없음"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/services/themes/common/colorExtensionPoint.i18n.json b/i18n/kor/src/vs/workbench/services/themes/common/colorExtensionPoint.i18n.json
deleted file mode 100644
index eb6d49f4520..00000000000
--- a/i18n/kor/src/vs/workbench/services/themes/common/colorExtensionPoint.i18n.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"contributes.color": "확장 정의 테마 지정 가능 색을 적용합니다.",
-	"contributes.color.id": "테마 지정 가능 색의 식별자입니다.",
-	"contributes.color.id.format": "식별자는 aa[.bb]* 형식이어야 합니다.",
-	"contributes.color.description": "테마 지정 가능 색에 대한 설명입니다.",
-	"contributes.defaults.light": "밝은 테마의 기본 색입니다. 16진수의 색 값(#RRGGBB[AA]) 또는 기본값을 제공하는 테마 지정 가능 색의 식별자입니다.",
-	"contributes.defaults.dark": "어두운 테마의 기본 색입니다. 16진수의 색 값(#RRGGBB[AA]) 또는 기본값을 제공하는 테마 지정 가능 색의 식별자입니다.",
-	"contributes.defaults.highContrast": "고대비 테마의 기본 색상입니다. 기본값을 제공하는 16진수(#RRGGBB[AA])의 색상 값 또는 테마 지정 가능 색의 식별자입니다.",
-	"invalid.colorConfiguration": "'configuration.colors'는 배열이어야 합니다.",
-	"invalid.default.colorType": "{0}은(는) 16진수의 색 값(#RRGGBB[AA] 또는 #RGB[A]) 또는 기본값을 제공하는 테마 지정 가능 색의 식별자입니다.",
-	"invalid.id": "'configuration.colors.id'를 정의해야 하며 비워둘 수 없습니다.",
-	"invalid.id.format": "'configuration.colors.id'는 단어[.word]* 다음에 와야 합니다.",
-	"invalid.description": "'configuration.colors.description'을 정의해야 하며 비워둘 수 없습니다.",
-	"invalid.defaults": "'configuration.colors.defaults'를 정의해야 하며 'light', 'dark' 및 'highContrast'를 포함해야 합니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/services/themes/common/colorThemeSchema.i18n.json b/i18n/kor/src/vs/workbench/services/themes/common/colorThemeSchema.i18n.json
deleted file mode 100644
index 46df36fa33f..00000000000
--- a/i18n/kor/src/vs/workbench/services/themes/common/colorThemeSchema.i18n.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"schema.token.settings": "토큰의 색 및 스타일입니다.",
-	"schema.token.foreground": "토큰의 전경색입니다.",
-	"schema.token.background.warning": "현재 토큰 배경색이 지원되지 않습니다.",
-	"schema.token.fontStyle": "규칙의 글꼴 스타일로 '기울임꼴, '굵게' 및 '밑줄' 중 하나이거나 이들의 조합입니다. 빈 문자열을 지정하면 상속된 설정이 해제됩니다.",
-	"schema.fontStyle.error": "글꼴 스타일은 '기울임꼴, '굵게' , '밑줄' 또는 이들의 조합이나 빈 문자열이어야 합니다.",
-	"schema.token.fontStyle.none": "없음(상속된 스타일 지우기)",
-	"schema.properties.name": "규칙에 대한 설명입니다.",
-	"schema.properties.scope": "이 규칙과 일치하는 범위 선택기입니다.",
-	"schema.tokenColors.path": "tmTheme 파일의 경로(현재 파일의 상대 경로)입니다.",
-	"schema.colors": "구문 강조 표시를 위한 색"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/services/themes/common/fileIconThemeSchema.i18n.json b/i18n/kor/src/vs/workbench/services/themes/common/fileIconThemeSchema.i18n.json
deleted file mode 100644
index 991bbd5c3ee..00000000000
--- a/i18n/kor/src/vs/workbench/services/themes/common/fileIconThemeSchema.i18n.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"schema.folderExpanded": "확장된 폴더의 폴더 아이콘입니다. 확장된 폴더 아이콘은 선택 사항입니다. 설정하지 않으면 폴더에 대해 정의된 아이콘이 표시됩니다.",
-	"schema.folder": "축소된 폴더의 폴더 아이콘이며, folderExpanded가 설정되지 않은 경우 확장된 폴더의 폴더 아이콘이기도 합니다.",
-	"schema.file": "어떤 확장명, 파일 이름 또는 언어 ID와도 일치하는 모든 파일에 대해 표시되는 기본 파일 아이콘입니다.",
-	"schema.folderNames": "폴더 이름을 아이콘과 연결합니다. 개체 키는 경로 세그먼트를 제외한 폴더 이름입니다. 패턴이나 와일드카드는 허용되지 않습니다. 폴더 이름 일치는 대/소문자를 구분하지 않습니다.",
-	"schema.folderName": "연결에 대한 아이콘 정의의 ID입니다.",
-	"schema.folderNamesExpanded": "폴더 이름을 확장된 폴더의 아이콘과 연결합니다. 개체 키는 경로 세그먼트를 제외한 폴더 이름입니다. 패턴이나 와일드카드는 허용되지 않습니다. 폴더 이름 일치는 대/소문자를 구분하지 않습니다.",
-	"schema.folderNameExpanded": "연결에 대한 아이콘 정의의 ID입니다.",
-	"schema.fileExtensions": "파일 확장명을 아이콘과 연결합니다. 개체 키는 파일 확장명입니다. 확장명은 파일 이름에서 마지막 점 뒤에 있는 마지막 세그먼트(점 불포함)입니다. 확장명은 대/소문자를 구분하지 않고 비교됩니다.",
-	"schema.fileExtension": "연결에 대한 아이콘 정의의 ID입니다.",
-	"schema.fileNames": "파일 이름을 아이콘과 연결합니다. 개체 키는 경로 세그먼트를 제외한 전체 파일 이름입니다. 파일 이름은 점과 파일 확장명을 포함할 수 있습니다. 패턴이나 와일드카드는 허용되지 않습니다. 파일 이름 일치는 대/소문자를 구분하지 않습니다.",
-	"schema.fileName": "연결에 대한 아이콘 정의의 ID입니다.",
-	"schema.languageIds": "언어를 아이콘과 연결합니다. 개체 키는 언어 기여 지점에 정의된 언어 ID입니다.",
-	"schema.languageId": "연결에 대한 아이콘 정의의 ID입니다.",
-	"schema.fonts": "아이콘 정의에 사용된 글꼴입니다.",
-	"schema.id": "글꼴의 ID입니다.",
-	"schema.src": "글꼴의 위치입니다.",
-	"schema.font-path": "현재 아이콘 테마 파일의 상대 글꼴 경로입니다.",
-	"schema.font-format": "글꼴의 형식입니다.",
-	"schema.font-weight": "글꼴의 두께입니다.",
-	"schema.font-sstyle": "글꼴의 스타일입니다.",
-	"schema.font-size": "글꼴의 기본 크기입니다.",
-	"schema.iconDefinitions": "파일을 아이콘과 연결할 때 사용할 수 있는 모든 아이콘의 설명입니다.",
-	"schema.iconDefinition": "아이콘 정의입니다. 개체 키는 정의의 ID입니다.",
-	"schema.iconPath": "SVG 또는 PNG를 사용하는 경우: 이미지의 경로입니다. 아이콘 집합 파일의 상대 경로입니다.",
-	"schema.fontCharacter": "문자 모양 글꼴을 사용하는 경우: 사용할 글꼴의 문자입니다.",
-	"schema.fontColor": "문자 모양 글꼴을 사용하는 경우: 사용할 색입니다.",
-	"schema.fontSize": "글꼴을 사용하는 경우: 텍스트 글꼴에 대한 글꼴 크기(백분율로 표시)입니다. 설정하지 않으면 기본값으로 글꼴 정의의 크기가 사용됩니다.",
-	"schema.fontId": "글꼴을 사용하는 경우: 글꼴의 ID입니다. 설정하지 않으면 기본값으로 첫 번째 글꼴 정의가 사용됩니다.",
-	"schema.light": "밝은 색 테마에서 파일 아이콘에 대한 선택적 연결입니다.",
-	"schema.highContrast": "고대비 색 테마에서 파일 아이콘에 대한 선택적 연결입니다.",
-	"schema.hidesExplorerArrows": "이 테마가 활성 상태일 때 파일 탐색기의 화살표 숨김 여부를 구성합니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/services/themes/electron-browser/colorThemeData.i18n.json b/i18n/kor/src/vs/workbench/services/themes/electron-browser/colorThemeData.i18n.json
deleted file mode 100644
index f892e55439e..00000000000
--- a/i18n/kor/src/vs/workbench/services/themes/electron-browser/colorThemeData.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"error.cannotparsejson": "JSON 테마 파일을 구문 분석하는 중 문제 발생: {0}",
-	"error.invalidformat.colors": "색 테마 파일 {0}을(를) 구문 분석하는 중 문제가 발생했습니다. 'colors' 속성이 'object' 형식이 아닙니다.",
-	"error.invalidformat.tokenColors": "색 테마 파일 {0}을(를) 구문 분석하는 중 문제가 발생했습니다. 'tokenColors' 속성이 색을 지정하는 배열 또는 TextMate 테마 파일의 경로여야 합니다.",
-	"error.plist.invalidformat": "tmTheme 파일 {0}을(를) 구문 분석하는 중 문제가 발생했습니다. 'settings'가 배열이 아닙니다.",
-	"error.cannotparse": "tmTheme 파일 {0}을(를) 구문 분석하는 중 문제가 발생했습니다.",
-	"error.cannotload": "tmTheme 파일 {0}을(를) 로드하는 중 문제가 발생했습니다. {1}"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/services/themes/electron-browser/colorThemeStore.i18n.json b/i18n/kor/src/vs/workbench/services/themes/electron-browser/colorThemeStore.i18n.json
deleted file mode 100644
index 56643396df7..00000000000
--- a/i18n/kor/src/vs/workbench/services/themes/electron-browser/colorThemeStore.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.contributes.themes": "Contributes textmate color themes.",
-	"vscode.extension.contributes.themes.id": "사용자 설정에 사용된 아이콘 테마의 ID입니다.",
-	"vscode.extension.contributes.themes.label": "UI에 표시되는 색 테마의 레이블입니다.",
-	"vscode.extension.contributes.themes.uiTheme": "편집기 주변의 색을 정의하는 기본 테마입니다. 'vs'는 밝은색 테마이고, 'vs-dark'는 어두운색 테마입니다. 'hc-black'은 어두운 고대비 테마입니다.",
-	"vscode.extension.contributes.themes.path": "tmTheme 파일의 경로입니다. 확장 폴더의 상대 경로이며 일반적으로 './themes/themeFile.tmTheme'입니다.",
-	"reqarray": "Extension point `{0}` must be an array.",
-	"reqpath": "`contributes.{0}.path`에 문자열이 필요합니다. 제공된 값: {1}",
-	"invalid.path.1": "확장 폴더({2})에 포함할 `contributes.{0}.path`({1})가 필요합니다. 확장이 이식 불가능해질 수 있습니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/services/themes/electron-browser/fileIconThemeData.i18n.json b/i18n/kor/src/vs/workbench/services/themes/electron-browser/fileIconThemeData.i18n.json
deleted file mode 100644
index 8582255d004..00000000000
--- a/i18n/kor/src/vs/workbench/services/themes/electron-browser/fileIconThemeData.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"error.cannotparseicontheme": "Problems parsing file icons file: {0}"
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/services/themes/electron-browser/fileIconThemeStore.i18n.json b/i18n/kor/src/vs/workbench/services/themes/electron-browser/fileIconThemeStore.i18n.json
deleted file mode 100644
index 2b5f3aa176f..00000000000
--- a/i18n/kor/src/vs/workbench/services/themes/electron-browser/fileIconThemeStore.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.contributes.iconThemes": "Contributes file icon themes.",
-	"vscode.extension.contributes.iconThemes.id": "사용자 설정에 사용된 아이콘 테마의 ID입니다.",
-	"vscode.extension.contributes.iconThemes.label": "UI에 표시된 아이콘 테마의 레이블입니다.",
-	"vscode.extension.contributes.iconThemes.path": "아이콘 테마 정의 파일의 경로입니다. 확장 폴더의 상대 경로이며 일반적으로 './icons/awesome-icon-theme.json'입니다.",
-	"reqarray": "Extension point `{0}` must be an array.",
-	"reqpath": "`contributes.{0}.path`에 문자열이 필요합니다. 제공된 값: {1}",
-	"reqid": "`contributes.{0}.id`에 문자열이 필요합니다. 제공된 값: {1}",
-	"invalid.path.1": "확장 폴더({2})에 포함할 `contributes.{0}.path`({1})가 필요합니다. 확장이 이식 불가능해질 수 있습니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json b/i18n/kor/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
deleted file mode 100644
index d97177c41e4..00000000000
--- a/i18n/kor/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"error.cannotloadtheme": "Unable to load {0}: {1}",
-	"colorTheme": "Specifies the color theme used in the workbench.",
-	"colorThemeError": "Theme is unknown or not installed.",
-	"iconTheme": "워크벤치에서 사용되는 아이콘 테마를 지정합니다. 'null'로 지정하면 파일 아이콘을 표시하지 않습니다.",
-	"noIconThemeDesc": "No file icons",
-	"iconThemeError": "File icon theme is unknown or not installed.",
-	"workbenchColors": "현재 선택한 색 테마에서 색을 재정의합니다.",
-	"editorColors.comments": "주석의 색 및 스타일을 설정합니다.",
-	"editorColors.strings": "문자열 리터럴의 색 및 스타일을 설정합니다.",
-	"editorColors.keywords": "키워드의 색과 스타일을 설정합니다.",
-	"editorColors.numbers": "숫자 리터럴의 색과 스타일을 설정합니다.",
-	"editorColors.types": "형식 선언 및 참조의 색 및 스타일을 설정합니다.",
-	"editorColors.functions": "함수 선언 및 참조의 색 및 스타일을 설정합니다.",
-	"editorColors.variables": "변수 선언 및 참조의 색 및 스타일을 설정합니다.",
-	"editorColors.textMateRules": "textmate 테마 설정 규칙을 사용하여 색 및 스타일을 설정합니다(고급).",
-	"editorColors": "현재 선택된 색 테마에서 편집기 색상과 글꼴 스타일을 재정의합니다."
-}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json b/i18n/kor/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json
deleted file mode 100644
index 61519fa8e49..00000000000
--- a/i18n/kor/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"errorInvalidTaskConfiguration": "작업 영역 구성 파일에 쓸 수 없습니다. 파일을 열고 오류/경고를 수정한 다음 다시 시도하세요.",
-	"errorWorkspaceConfigurationFileDirty": "파일이 변경되어 작업 영역 구성 파일에 쓸 수 없습니다. 저장하고 다시 시도하세요.",
-	"openWorkspaceConfigurationFile": "작업 영역 구성 열기"
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/azure-account/out/azure-account.i18n.json b/i18n/ptb/extensions/azure-account/out/azure-account.i18n.json
deleted file mode 100644
index be4c29f593c..00000000000
--- a/i18n/ptb/extensions/azure-account/out/azure-account.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"azure-account.copyAndOpen": "Copiar e Abrir",
-	"azure-account.close": "Fechar",
-	"azure-account.login": "Login",
-	"azure-account.loginFirst": "Não está logado, faça o login primeiro",
-	"azure-account.userCodeFailed": "Falha na aquisição do código do usuário.",
-	"azure-account.tokenFailed": "Adquirindo Token pelo código do dispositivo.",
-	"azure-account.tokenFromRefreshTokenFailed": "Adquirindo token com token de atualização"
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/azure-account/out/extension.i18n.json b/i18n/ptb/extensions/azure-account/out/extension.i18n.json
deleted file mode 100644
index 584e7c82e0f..00000000000
--- a/i18n/ptb/extensions/azure-account/out/extension.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"azure-account.loggingIn": "Azure: Login...",
-	"azure-account.loggedIn": "Azure: {0}"
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/bat/package.i18n.json b/i18n/ptb/extensions/bat/package.i18n.json
deleted file mode 100644
index fb3b72aaee0..00000000000
--- a/i18n/ptb/extensions/bat/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Noções Básicas Sobre a Linguagem Bat do Windows",
-	"description": "Fornece trechos de código, realce de sintaxe, correspondência de suporte e dobramento em arquivos de lote Windows."
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/clojure/package.i18n.json b/i18n/ptb/extensions/clojure/package.i18n.json
deleted file mode 100644
index d146e27fa42..00000000000
--- a/i18n/ptb/extensions/clojure/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Noções Básicas Sobre a Linguagem Clojure",
-	"description": "Fornece realce de sintaxe e correspondência de suporte e dobramento em arquivos Clojure."
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/coffeescript/package.i18n.json b/i18n/ptb/extensions/coffeescript/package.i18n.json
deleted file mode 100644
index 95fe95501c9..00000000000
--- a/i18n/ptb/extensions/coffeescript/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Noções Básicas Sobre a Linguagem CoffeeScript",
-	"description": "Fornece trechos de código, realce de sintaxe, correspondência de suporte e dobramento em arquivos CoffeeScript."
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/configuration-editing/out/extension.i18n.json b/i18n/ptb/extensions/configuration-editing/out/extension.i18n.json
deleted file mode 100644
index c504784c2f7..00000000000
--- a/i18n/ptb/extensions/configuration-editing/out/extension.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"workspaceFolder": "O caminho da pasta aberta no VS  Code",
-	"workspaceFolderBasename": "O nome da pasta aberta no VS Code sem barras (/)",
-	"relativeFile": "[teste]",
-	"file": "O arquivo aberto atual",
-	"exampleExtension": "Exemplo"
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json b/i18n/ptb/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json
deleted file mode 100644
index 7e7a9ca7e1d..00000000000
--- a/i18n/ptb/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"activeEditorShort": "o nome do arquivo (por exemplo, MyFile. txt)",
-	"activeEditorMedium": "o caminho do arquivo relativo à pasta de trabalho (por exemplo, myFolder/myFile.txt)",
-	"activeEditorLong": "o caminho completo do arquivo (por exemplo, /Users/Development/myProject/myFolder/myFile.txt)",
-	"rootName": "nome da área de trabalho (por exemplo, minhaPasta ou minhaAreadeTrabalho)",
-	"rootPath": "caminho do arquivo da área de trabalho (por exemplo, /Usuarios/Desenvolvimento/minhaAreadeTrabalho)",
-	"folderName": "nome do diretório da área de trabalho onde arquivo está localizado (por exemplo, myFolder)",
-	"folderPath": "caminho do arquivo no diretório da área de trabalho onde o arquivo está localizado (por exemplo, /Users/Development/myFolder)",
-	"appName": "por exemplo VS Code",
-	"dirty": "Um indicador de alteração se o editor ativo foi alterado",
-	"separator": "um separador condicional (' - ') que somente é mostrado quando envolvido por variáveis com valores",
-	"assocLabelFile": "Arquivos com Extensão",
-	"assocDescriptionFile": "Mapear todos arquivos que correspondem ao padrão global no seu nome de arquivo à linguagem com o identificador dado",
-	"assocLabelPath": "Arquivos com Caminho",
-	"assocDescriptionPath": "Mapear todos os arquivos que correspondem ao caminho absoluto global no seu caminho à linguagem com o identificador dado",
-	"fileLabel": "Arquivos por Extensão",
-	"fileDescription": "Combina todos os arquivos de uma extensão de arquivo específica.",
-	"filesLabel": "Arquivos com Várias Extensões",
-	"filesDescription": "Combina todos os arquivos com qualquer uma das extensões de arquivo.",
-	"derivedLabel": "Arquivos com Irmãos por Nome",
-	"derivedDescription": "Combina arquivos que têm irmãos com o mesmo nome, mas uma extensão diferente.",
-	"topFolderLabel": "Pasta por Nome (Nível Superior)",
-	"topFolderDescription": "Combina uma pasta de nível superior com um nome específico.",
-	"topFoldersLabel": "Pastas com Vários Nomes (Nível Superior)",
-	"topFoldersDescription": "Combina várias pastas de nível superior.",
-	"folderLabel": "Pasta por Nome (Qualquer Local)",
-	"folderDescription": "Combina uma pasta com um nome específico em qualquer local.",
-	"falseDescription": "Desabilita o padrão.",
-	"trueDescription": "Habilita o padrão.",
-	"siblingsDescription": "Combina arquivos que têm irmãos com o mesmo nome, mas uma extensão diferente.",
-	"languageSpecificEditorSettings": "Configurações do editor especificas para a linguagem",
-	"languageSpecificEditorSettingsDescription": "Sobrescrever as configurações do editor para a linguagem"
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/configuration-editing/package.i18n.json b/i18n/ptb/extensions/configuration-editing/package.i18n.json
deleted file mode 100644
index 10996414b61..00000000000
--- a/i18n/ptb/extensions/configuration-editing/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Edição de Configuração",
-	"description": "Fornece recursos (IntelliSense avançado, correção automática) em arquivos de configuração, como configurações, inicialização e arquivos de recomendação de extensão."
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/cpp/package.i18n.json b/i18n/ptb/extensions/cpp/package.i18n.json
deleted file mode 100644
index 08236c7ff81..00000000000
--- a/i18n/ptb/extensions/cpp/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Noções Básicas Sobre a Linguagem C/C++",
-	"description": "Fornece trechos de código, realce de sintaxe, correspondência de suporte e dobramento em arquivos C/C++."
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/csharp/package.i18n.json b/i18n/ptb/extensions/csharp/package.i18n.json
deleted file mode 100644
index 17b719d771d..00000000000
--- a/i18n/ptb/extensions/csharp/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Noções Básicas Sobre a Linguagem C#",
-	"description": "Fornece trechos de código, realce de sintaxe, correspondência de suporte e dobramento em arquivos C#."
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/css-language-features/client/out/cssMain.i18n.json b/i18n/ptb/extensions/css-language-features/client/out/cssMain.i18n.json
deleted file mode 100644
index d8cc2994174..00000000000
--- a/i18n/ptb/extensions/css-language-features/client/out/cssMain.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"cssserver.name": "Servidor de linguagem CSS",
-	"folding.start": "Início da Região Expansível",
-	"folding.end": "Fim da Região Expansível"
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/css-language-features/package.i18n.json b/i18n/ptb/extensions/css-language-features/package.i18n.json
deleted file mode 100644
index a05cdcfbdc2..00000000000
--- a/i18n/ptb/extensions/css-language-features/package.i18n.json
+++ /dev/null
@@ -1,81 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Recursos da Linguagem CSS",
-	"description": "Fornece suporte de linguagem rico para arquivos CSS, LESS e SCSS.",
-	"css.title": "CSS",
-	"css.lint.argumentsInColorFunction.desc": "Número inválido de parâmetros",
-	"css.lint.boxModel.desc": "Não use largura ou altura ao usar preenchimento ou borda",
-	"css.lint.compatibleVendorPrefixes.desc": "Ao usar um prefixo específico de fornecedor, certifique-se de também incluir todas as outras propriedades específicas do fornecedor",
-	"css.lint.duplicateProperties.desc": "Não use as definições de estilo duplicadas",
-	"css.lint.emptyRules.desc": "Não use conjuntos de regra em branco",
-	"css.lint.float.desc": "Evite usar 'float'. Floats levam a CSS frágil, que é fácil de quebrar se um aspecto do layout for alterado.",
-	"css.lint.fontFaceProperties.desc": "A regra @font-face deve definir propriedades 'src' e 'font-family'",
-	"css.lint.hexColorLength.desc": "Cores hexadecimais devem consistir em três ou seis números hexadecimais",
-	"css.lint.idSelector.desc": "Seletores não devem conter IDs, pois essas regras estão firmemente acopladas ao HTML.",
-	"css.lint.ieHack.desc": "IE hacks somente são necessários ao dar suporte ao IE7 e mais antigos",
-	"css.lint.important.desc": "Evite usar !important. Esta é uma indicação de que a especificidade do CSS inteiro saiu de controle e precisa ser fatorada novamente.",
-	"css.lint.importStatement.desc": "Instruções de importação não carregam em paralelo",
-	"css.lint.propertyIgnoredDueToDisplay.desc": "Propriedade ignorada devido à exibição. Por exemplo, com 'display: inline', as propriedades width, height, margin-top, margin-bottom e float não têm efeito",
-	"css.lint.universalSelector.desc": "O seletor universal (*) é conhecido por ser lento",
-	"css.lint.unknownProperties.desc": "Propriedade desconhecida.",
-	"css.lint.unknownVendorSpecificProperties.desc": "Propriedade específica do fornecedor desconhecida.",
-	"css.lint.vendorPrefix.desc": "Ao usar um prefixo específico do fornecedor, inclua também a propriedade padrão",
-	"css.lint.zeroUnits.desc": "Nenhuma unidade para zero é necessária",
-	"css.trace.server.desc": "Rastrear a comunicação entre o VS Code e o servidor de linguagem CSS.",
-	"css.validate.title": "Controla a validação CSS and a gravidade dos problemas.",
-	"css.validate.desc": "Habilita ou desabilita todas as validações",
-	"less.title": "LESS",
-	"less.lint.argumentsInColorFunction.desc": "Número inválido de parâmetros",
-	"less.lint.boxModel.desc": "Não use largura ou altura ao usar preenchimento ou borda",
-	"less.lint.compatibleVendorPrefixes.desc": "Ao usar um prefixo específico de fornecedor, certifique-se de também incluir todas as outras propriedades específicas do fornecedor",
-	"less.lint.duplicateProperties.desc": "Não use as definições de estilo duplicadas",
-	"less.lint.emptyRules.desc": "Não use conjuntos de regra em branco",
-	"less.lint.float.desc": "Evite usar 'float'. Floats levam a CSS frágil, que é fácil de quebrar se um aspecto do layout for alterado.",
-	"less.lint.fontFaceProperties.desc": "A regra @font-face deve definir propriedades 'src' e 'font-family'",
-	"less.lint.hexColorLength.desc": "Cores hexadecimais devem consistir em três ou seis números hexadecimais",
-	"less.lint.idSelector.desc": "Seletores não devem conter IDs, pois essas regras estão firmemente acopladas ao HTML.",
-	"less.lint.ieHack.desc": "IE hacks somente são necessários ao dar suporte ao IE7 e mais antigos",
-	"less.lint.important.desc": "Evite usar !important. Esta é uma indicação de que a especificidade do CSS inteiro saiu de controle e precisa ser fatorada novamente.",
-	"less.lint.importStatement.desc": "Instruções de importação não carregam em paralelo",
-	"less.lint.propertyIgnoredDueToDisplay.desc": "Propriedade ignorada devido à exibição. Por exemplo, com 'display: inline', as propriedades width, height, margin-top, margin-bottom e float não têm efeito",
-	"less.lint.universalSelector.desc": "O seletor universal (*) é conhecido por ser lento",
-	"less.lint.unknownProperties.desc": "Propriedade desconhecida.",
-	"less.lint.unknownVendorSpecificProperties.desc": "Propriedade específica do fornecedor desconhecida.",
-	"less.lint.vendorPrefix.desc": "Ao usar um prefixo específico do fornecedor, inclua também a propriedade padrão",
-	"less.lint.zeroUnits.desc": "Nenhuma unidade para zero é necessária",
-	"less.validate.title": "Controla MENOS as severidades de validação e problemas.",
-	"less.validate.desc": "Habilita ou desabilita todas as validações",
-	"scss.title": "SCSS (Sass)",
-	"scss.lint.argumentsInColorFunction.desc": "Número inválido de parâmetros",
-	"scss.lint.boxModel.desc": "Não use largura ou altura ao usar preenchimento ou borda",
-	"scss.lint.compatibleVendorPrefixes.desc": "Ao usar um prefixo específico de fornecedor, certifique-se de também incluir todas as outras propriedades específicas do fornecedor",
-	"scss.lint.duplicateProperties.desc": "Não use as definições de estilo duplicadas",
-	"scss.lint.emptyRules.desc": "Não use conjuntos de regra em branco",
-	"scss.lint.float.desc": "Evite usar 'float'. Floats levam a CSS frágil, que é fácil de quebrar se um aspecto do layout for alterado.",
-	"scss.lint.fontFaceProperties.desc": "A regra @font-face deve definir propriedades 'src' e 'font-family'",
-	"scss.lint.hexColorLength.desc": "Cores hexadecimais devem consistir em três ou seis números hexadecimais",
-	"scss.lint.idSelector.desc": "Seletores não devem conter IDs, pois essas regras estão firmemente acopladas ao HTML.",
-	"scss.lint.ieHack.desc": "IE hacks somente são necessários ao dar suporte ao IE7 e mais antigos",
-	"scss.lint.important.desc": "Evite usar !important. Esta é uma indicação de que a especificidade do CSS inteiro saiu de controle e precisa ser fatorada novamente.",
-	"scss.lint.importStatement.desc": "Instruções de importação não carregam em paralelo",
-	"scss.lint.propertyIgnoredDueToDisplay.desc": "Propriedade ignorada devido à exibição. Por exemplo, com 'display: inline', as propriedades width, height, margin-top, margin-bottom e float não têm efeito",
-	"scss.lint.universalSelector.desc": "O seletor universal (*) é conhecido por ser lento",
-	"scss.lint.unknownProperties.desc": "Propriedade desconhecida.",
-	"scss.lint.unknownVendorSpecificProperties.desc": "Propriedade específica do fornecedor desconhecida.",
-	"scss.lint.vendorPrefix.desc": "Ao usar um prefixo específico do fornecedor, inclua também a propriedade padrão",
-	"scss.lint.zeroUnits.desc": "Nenhuma unidade para zero é necessária",
-	"scss.validate.title": "Controla severidades de validação e problemas SCSS.",
-	"scss.validate.desc": "Habilita ou desabilita todas as validações",
-	"less.colorDecorators.enable.desc": "Habilita ou desabilita os decoradores de cor",
-	"scss.colorDecorators.enable.desc": "Habilita ou desabilita os decoradores de cor",
-	"css.colorDecorators.enable.desc": "Habilita ou desabilita os decoradores de cor",
-	"css.colorDecorators.enable.deprecationMessage": "A configuração 'css.colorDecorators.enable' foi descontinuada em favor de 'editor.colorDecorators'.",
-	"scss.colorDecorators.enable.deprecationMessage": "A configuração 'scss.colorDecorators.enable' foi descontinuada em favor de 'editor.colorDecorators'.",
-	"less.colorDecorators.enable.deprecationMessage": "A configuração 'less.colorDecorators.enable' foi descontinuada em favor de 'editor.colorDecorators'."
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/css/client/out/cssMain.i18n.json b/i18n/ptb/extensions/css/client/out/cssMain.i18n.json
deleted file mode 100644
index d8cc2994174..00000000000
--- a/i18n/ptb/extensions/css/client/out/cssMain.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"cssserver.name": "Servidor de linguagem CSS",
-	"folding.start": "Início da Região Expansível",
-	"folding.end": "Fim da Região Expansível"
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/css/package.i18n.json b/i18n/ptb/extensions/css/package.i18n.json
deleted file mode 100644
index b5a1c26e58b..00000000000
--- a/i18n/ptb/extensions/css/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Noções Básicas da Linguagem CSS",
-	"description": "Fornece realce de sintaxe e correspondência de colchetes para arquivos CSS, LESS e SCSS."
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/diff/package.i18n.json b/i18n/ptb/extensions/diff/package.i18n.json
deleted file mode 100644
index 93196d31864..00000000000
--- a/i18n/ptb/extensions/diff/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Recursos da Linguagem de Arquivo Diff",
-	"description": "Fornece Realce de sintaxe, Dobramento, Correspondência de colchetes, Trechos de código e outros recursos de linguagem em arquivos Diff"
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/docker/package.i18n.json b/i18n/ptb/extensions/docker/package.i18n.json
deleted file mode 100644
index 7af2f8fd8f0..00000000000
--- a/i18n/ptb/extensions/docker/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Noções Básicas Sobre a Linguagem Docker",
-	"description": "Fornece realce de sintaxe e correspondência de suporte em arquivos Docker."
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/emmet/package.i18n.json b/i18n/ptb/extensions/emmet/package.i18n.json
deleted file mode 100644
index bd44dd5d552..00000000000
--- a/i18n/ptb/extensions/emmet/package.i18n.json
+++ /dev/null
@@ -1,65 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"description": "Suporte ao Emmet para VS Code",
-	"command.wrapWithAbbreviation": "Envelope com a abreviatura",
-	"command.wrapIndividualLinesWithAbbreviation": "Envelopar Linhas Individuais com Abreviatura",
-	"command.removeTag": "Remover Tag",
-	"command.updateTag": "Atualizar Tag",
-	"command.matchTag": "Ir para par de correspondência",
-	"command.balanceIn": "Saldo (interno)",
-	"command.balanceOut": "Saldo (Externo)",
-	"command.prevEditPoint": "Ir para Ponto de edição anterior",
-	"command.nextEditPoint": "Ir para o próximo ponto de edição",
-	"command.mergeLines": "Mesclar linhas",
-	"command.selectPrevItem": "Selecione o Item anterior",
-	"command.selectNextItem": "Selecionar o próximo Item",
-	"command.splitJoinTag": "Dividir/Unir Tag",
-	"command.toggleComment": "Alternar Comentário de Linha",
-	"command.evaluateMathExpression": "Avaliar a expressão matemática",
-	"command.updateImageSize": "Atualizar Tamanho da Imagem",
-	"command.reflectCSSValue": "Refletir Valor do CSS",
-	"command.incrementNumberByOne": "Incremento de 1",
-	"command.decrementNumberByOne": "Decrementar por 1",
-	"command.incrementNumberByOneTenth": "Incremento de 0.1",
-	"command.decrementNumberByOneTenth": "Decrementar por 0.1",
-	"command.incrementNumberByTen": "Incremento de 10",
-	"command.decrementNumberByTen": "Decrementar por 10",
-	"emmetSyntaxProfiles": "Definir o perfil para a sintaxe especificada ou usar seu próprio perfil com regras específicas.",
-	"emmetExclude": "Uma matriz de línguas onde abreviaturas Emmet não devem ser expandidas.",
-	"emmetExtensionsPath": "Caminho para uma pasta que contém os perfis Emmet e trechos de códigos.'",
-	"emmetShowExpandedAbbreviation": "Mostrar abreviaturas Emmet expandidas como sugestões.\nA opção \"inMarkupAndStylesheetFilesOnly\" aplica-se a html, haml, jade, slim, xml, xsl, css, scss, sass, less e stylus.\nA opção \"always\" se aplica a todas as partes do arquivo independentemente de marcação/css.",
-	"emmetShowAbbreviationSuggestions": "Mostra abreviações Emmet possíveis como sugestões. Não aplicável em folhas de estilo ou quando emmet.showExpandedAbbreviation é definido como \"never\".",
-	"emmetIncludeLanguages": "Ative abreviações do Emmet em idiomas que não são suportados por padrão. Adicione um mapeamento aqui entre o idioma e a linguagem suportada emmet.\nPor exemplo: {\"vue-html\": \"html\", \"javascript\": \"javascriptreact\"}",
-	"emmetVariables": "Variáveis a serem usadas em trechos de código Emmet",
-	"emmetTriggerExpansionOnTab": "Quando habilitado, abreviações Emmet são expandidas ao pressionar TAB.",
-	"emmetPreferences": "Preferências usadas para modificar o comportamento de algumas ações e resolvedores de Emmet.",
-	"emmetPreferencesIntUnit": "Unidade padrão para valores inteiros",
-	"emmetPreferencesFloatUnit": "Unidade padrão para valores float",
-	"emmetPreferencesCssAfter": "Símbolo a ser colocado no final da propriedade CSS quando expandir abreviaturas CSS",
-	"emmetPreferencesSassAfter": "Símbolo a ser colocado no final da propriedade CSS quando expandir abreviaturas CSS em arquivos Sass",
-	"emmetPreferencesStylusAfter": "Símbolo a ser colocado no final da propriedade CSS quando expandir abreviaturas CSS em arquivos Stylus",
-	"emmetPreferencesCssBetween": "Símbolo a ser colocado entre a propriedade CSS e o valor quando expandir abreviaturas CSS",
-	"emmetPreferencesSassBetween": "Símbolo a ser colocado entre a propriedade CSS e o valor quando expandir abreviaturas CSS em arquivos Sass",
-	"emmetPreferencesStylusBetween": "Símbolo a ser colocado entre a propriedade CSS e o valor quando expandir abreviaturas CSS em arquivos Stylus",
-	"emmetShowSuggestionsAsSnippets": "Se verdadeiro, então as sugestões emmet aparecerão como trechos, permitindo você requisitá-los conforme a configuração de editor.snippetSuggestions.",
-	"emmetPreferencesBemElementSeparator": "Separador de elemento usado para classes quando utilizar o filtro BEM",
-	"emmetPreferencesBemModifierSeparator": "Separador de modificador usado para classes quando utilizar o filtro BEM",
-	"emmetPreferencesFilterCommentBefore": "Uma definição de comentário que deve ser colocado antes de elemento correspondente quando um filtro de comentário é aplicado.",
-	"emmetPreferencesFilterCommentAfter": "Uma definição de comentário que deve ser colocado após o elemento correspondente quando um filtro de comentário é aplicado.",
-	"emmetPreferencesFilterCommentTrigger": "Uma lista separada por vírgulas de nomes de atributo que deve existir em abreviações para o filtro de comentário a ser aplicado",
-	"emmetPreferencesFormatNoIndentTags": "Uma matriz de nomes de abas que não devem ter recuo interno",
-	"emmetPreferencesFormatForceIndentTags": "Uma matriz de nomes de abas que deve sempre devem ter recuo interno",
-	"emmetPreferencesAllowCompactBoolean": "Se verdadeiro, a notação compacta de atributos booleanos são produzidos",
-	"emmetPreferencesCssWebkitProperties": "Propriedades CSS separadas por vírgula que recebem o prefixo vendor 'webkit' quando utilizado em abreviações do Emmet que iniciam com `-`. Defina como string vazia para sempre evitar o prefixo 'webkit'.",
-	"emmetPreferencesCssMozProperties": "Propriedades CSS separadas por vírgula que recebem o prefixo vendor 'moz' quando utilizado em abreviações do Emmet que iniciam com `-`. Defina como string vazia para sempre evitar o prefixo 'moz'.",
-	"emmetPreferencesCssOProperties": "Propriedades CSS separadas por vírgula que recebem o prefixo vendor 'o' quando utilizado em abreviações do Emmet que iniciam com `-`. Defina como string vazia para sempre evitar o prefixo 'o'.",
-	"emmetPreferencesCssMsProperties": "Propriedades CSS separadas por vírgula que recebem o prefixo vendor 'ms' quando utilizado em abreviações do Emmet que iniciam com `-`. Defina como string vazia para sempre evitar o prefixo 'ms'.",
-	"emmetPreferencesCssFuzzySearchMinScore": "A pontuação mínima (de 0 a 1) que a abreviação difusa deve alcançar. Os valores mais baixos podem produzir muitas correspondências falso-positivas, valores mais elevados podem reduzir possíveis correspondências.\n",
-	"emmetOptimizeStylesheetParsing": "Quando definido como false, o arquivo inteiro é analisado para determinar se a posição atual é válida para expandir as abreviações Emmet. Quando definido como true, somente o conteúdo em torno da posição atual em arquivos css / scss / less é analisado."
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/extension-editing/out/extensionLinter.i18n.json b/i18n/ptb/extensions/extension-editing/out/extensionLinter.i18n.json
deleted file mode 100644
index 514199b2eb4..00000000000
--- a/i18n/ptb/extensions/extension-editing/out/extensionLinter.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"httpsRequired": "Imagens devem usar o protocolo HTTPS.",
-	"svgsNotValid": "SVGs não são uma fonte de imagem válida.",
-	"embeddedSvgsNotValid": "SVGs embutidos não são uma fonte de imagem válida.",
-	"dataUrlsNotValid": "URLs de dados não são uma fonte de imagem válida.",
-	"relativeUrlRequiresHttpsRepository": "URLs relativas de Imagem exigem um repositório com o protocolo HTTPS para serem especificadas no pacote .json.",
-	"relativeIconUrlRequiresHttpsRepository": "Um ícone requer um repositório com o protocolo HTTPS para ser especificado neste package.json.",
-	"relativeBadgeUrlRequiresHttpsRepository": "URLs relativas de crachá exigem um repositório com o protocolo HTTPS para ser especificado neste package.json."
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/extension-editing/out/packageDocumentHelper.i18n.json b/i18n/ptb/extensions/extension-editing/out/packageDocumentHelper.i18n.json
deleted file mode 100644
index 8e55b050f76..00000000000
--- a/i18n/ptb/extensions/extension-editing/out/packageDocumentHelper.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"languageSpecificEditorSettings": "Configurações do editor especificas para a linguagem",
-	"languageSpecificEditorSettingsDescription": "Sobrescrever as configurações do editor para a linguagem"
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/extension-editing/package.i18n.json b/i18n/ptb/extensions/extension-editing/package.i18n.json
deleted file mode 100644
index 5be926c7d74..00000000000
--- a/i18n/ptb/extensions/extension-editing/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Edição de Arquivo de Pacote",
-	"description": "Fornece IntelliSense para os pontos de extensão de código do VS Code e capacidade de linting em arquivos package.json."
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/fsharp/package.i18n.json b/i18n/ptb/extensions/fsharp/package.i18n.json
deleted file mode 100644
index 3d6dee1adb0..00000000000
--- a/i18n/ptb/extensions/fsharp/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Noções Básicas Sobre a Linguagem F#",
-	"description": "Fornece trechos de código, realce de sintaxe, correspondência de colchetes e oclusão de código em arquivos F#."
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/git/out/askpass-main.i18n.json b/i18n/ptb/extensions/git/out/askpass-main.i18n.json
deleted file mode 100644
index 748b96bae29..00000000000
--- a/i18n/ptb/extensions/git/out/askpass-main.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"missOrInvalid": "Credenciais ausentes ou inválidas."
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/git/out/autofetch.i18n.json b/i18n/ptb/extensions/git/out/autofetch.i18n.json
deleted file mode 100644
index 00c05e0d65e..00000000000
--- a/i18n/ptb/extensions/git/out/autofetch.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"yes": "Sim",
-	"no": "Não",
-	"not now": "Pergunte-me depois",
-	"suggest auto fetch": "Você gostaria que o Code [execute periodicamente o 'git fetch']({0})?"
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/git/out/commands.i18n.json b/i18n/ptb/extensions/git/out/commands.i18n.json
deleted file mode 100644
index 614b7d0fe2a..00000000000
--- a/i18n/ptb/extensions/git/out/commands.i18n.json
+++ /dev/null
@@ -1,88 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"tag at": "Etiqueta em {0}",
-	"remote branch at": "Ramo remoto em {0}",
-	"create branch": "$(plus) criar nova ramificação",
-	"repourl": "URL do repositório",
-	"cloning": "Clonando repositório git '{0}'...",
-	"proposeopen": "Gostaria de abrir o repositório clonado?",
-	"openrepo": "Abrir Repositório",
-	"init": "Escolher a pasta de trabalho para inicializar o git repo",
-	"init repo": "Inicializar Repositório",
-	"create repo": "Inicializar Repositório",
-	"are you sure": "Isto irá criar um repositório Git em '{0}'. Tem certeza que deseja continuar?",
-	"HEAD not available": "Versão HEAD de '{0}' não está disponível.",
-	"confirm stage files with merge conflicts": "Tem certeza que deseja processar {0} arquivos com conflitos de mesclagem?",
-	"confirm stage file with merge conflicts": "Tem certeza que deseja processar {0} com conflitos de mesclagem?",
-	"yes": "Sim",
-	"confirm revert": "Tem certeza que deseja reverter as alterações selecionadas em {0}?",
-	"revert": "Reverter as alterações",
-	"discard": "Descartar alterações",
-	"confirm delete": "Tem certeza que deseja EXCLUIR {0}?",
-	"delete file": "Excluir arquivo",
-	"confirm discard": "Tem certeza que deseja descartar as alterações em {0}?",
-	"confirm discard multiple": "Tem certeza que deseja descartar as alterações em {0} arquivos?",
-	"warn untracked": "Isso irá excluir {0} registros não rastreados!",
-	"confirm discard all single": "Tem certeza que deseja descartar as alterações em {0}?",
-	"confirm discard all": "Tem certeza que deseja descartar todas as alterações em {0} arquivos?\nIsso é IRREVERSíVEL!\nO conjunto de trabalhando atual será PERDIDO PARA SEMPRE.",
-	"discardAll multiple": "Descartar 1 Arquivo",
-	"discardAll": "Descartar Todos os {0} Arquivos",
-	"confirm delete multiple": "Tem certeza que deseja EXCLUIR {0} arquivos?",
-	"delete files": "Excluir arquivos",
-	"there are untracked files single": "O seguinte arquivo não controlado será excluído do disco se descartado: {0}.",
-	"there are untracked files": "Existem {0} arquivos não controlados que serão excluídos do disco se descartados.",
-	"confirm discard all 2": "{0}\n\n é IRREVERSÍVEL, o conjunto de trabalho atual será PERDIDO PARA SEMPRE.",
-	"yes discard tracked": "Descartar 1 arquivo controlado",
-	"yes discard tracked multiple": "Descartar arquivos {0} controlados",
-	"unsaved files single": "O seguinte arquivo não foi salvo: [0}.\n\nGostaria de salvá-lo antes de executar o commit?",
-	"unsaved files": "Existem {0} arquivos não salvos.\n\nGostaria de salvá-los antes de executar o commit?",
-	"save and commit": "Salvar Tudo & Confirmar",
-	"commit": "Confirmar de qualquer maneira",
-	"no staged changes": "Não há nenhuma modificação escalonada para confirmar.\n\nGostaria de escalonar automaticamente todas as suas alterações e confirmá-las diretamente?",
-	"always": "Sempre",
-	"no changes": "Não há mudanças para confirmar.",
-	"commit message": "Confirmar mensagem",
-	"provide commit message": "Por favor, forneça uma mensagem de commit",
-	"select a ref to checkout": "Selecione uma referência para check-out",
-	"branch name": "Nome do Ramo",
-	"provide branch name": "Por favor, forneça um nome de ramo",
-	"select branch to delete": "Selecione uma ramificação para excluir",
-	"confirm force delete branch": "A ramificação '{0}' não foi totalmente mesclada. Excluir mesmo assim?",
-	"delete branch": "Excluir ramificação",
-	"invalid branch name": "Nome da ramificação inválido.",
-	"branch already exists": "Um ramo chamado '{0}' já existe",
-	"select a branch to merge from": "Selecione uma ramificação para mesclar",
-	"merge conflicts": "Existem conflitos de mesclagem. Resolva-os antes de confirmar.",
-	"tag name": "Nome do rótulo",
-	"provide tag name": "Por favor, forneça um nome de Tag",
-	"tag message": "Mensagem",
-	"provide tag message": "Por favor, forneça uma mensagem para comentar o rótulo",
-	"no remotes to fetch": "Este repositório não possui remotos configurados para buscar algo",
-	"no remotes to pull": "O seu repositório não possui remotos configurados para efetuar pull.",
-	"pick remote pull repo": "Selecione um remoto para efeutar o pull da ramificação",
-	"no remotes to push": "O seu repositório não possui remotos configurados para efetuar push.",
-	"nobranch": "Por favor, faça checkout em um ramo para fazer push em um remoto.",
-	"confirm publish branch": "O branch '{0}' não possui um branch superior. Você quer publicar este branch?",
-	"ok": "OK",
-	"push with tags success": "Envio de rótulos finalizado com sucesso.",
-	"pick remote": "Pegue um  remoto para publicar o ramo '{0}':",
-	"sync is unpredictable": "Esta ação vai empurrar e puxar commits de e para '{0}/{1}'.",
-	"never again": "OK, Não Mostrar Novamente",
-	"no remotes to publish": "Seu repositório não possui remotos configurados para publicação.",
-	"no changes stash": "Não há nenhuma mudança para esconder.",
-	"provide stash message": "Opcionalmente forneça uma mensagem para esconder.",
-	"stash message": "Mensagem oculta",
-	"no stashes": "Não há esconderijos para restaurar.",
-	"pick stash to pop": "Escolher um esconderijo de pop",
-	"clean repo": "Por favor, limpe sua árvore de trabalho do repositório antes de fazer check-out.",
-	"cant push": "Não foi possível enviar referências para ramoto. Tente executar primeiro o 'Pull' para integrar com suas modificações.",
-	"git error details": "Git: {0}",
-	"git error": "Erro de Git",
-	"open git log": "Abrir Histórico do Git"
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/git/out/main.i18n.json b/i18n/ptb/extensions/git/out/main.i18n.json
deleted file mode 100644
index 4d1a91d6f32..00000000000
--- a/i18n/ptb/extensions/git/out/main.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"looking": "Procurando pelo git em: {0}",
-	"using git": "Usando git {0} de {1}",
-	"downloadgit": "Baixar o Git",
-	"neverShowAgain": "Não mostrar novamente",
-	"notfound": "Git não encontrado. Instale ou configure usando a configuração 'git.path'.",
-	"updateGit": "Atualizar o Git",
-	"git20": "Você parece ter o git {0} instalado. Code funciona melhor com git > = 2"
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/git/out/model.i18n.json b/i18n/ptb/extensions/git/out/model.i18n.json
deleted file mode 100644
index 39e57632fd8..00000000000
--- a/i18n/ptb/extensions/git/out/model.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"too many submodules": "O repositório '{0}' possui submódulos {1} que não serão abertos automaticamente. Você ainda pode abrir cada um individualmente abrindo um arquivo dentro dele.",
-	"no repositories": "Não existem repositórios disponíveis",
-	"pick repo": "Escolha um repositório"
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/git/out/repository.i18n.json b/i18n/ptb/extensions/git/out/repository.i18n.json
deleted file mode 100644
index ee4b84c2404..00000000000
--- a/i18n/ptb/extensions/git/out/repository.i18n.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"open": "Abrir",
-	"index modified": "Índice Modificado",
-	"modified": "Modificado",
-	"index added": "Índice Adicionado",
-	"index deleted": "Índice Excluído",
-	"deleted": "Excluído",
-	"index renamed": "Índice Renomeado",
-	"index copied": "Índice Copiado",
-	"untracked": "Não acompanhado",
-	"ignored": "Ignorado",
-	"both deleted": "Ambos Excluídos",
-	"added by us": "Adicionado Por Nós",
-	"deleted by them": "Excluído Por Eles",
-	"added by them": "Adicionado Por Eles",
-	"deleted by us": "Excluído Por Nós",
-	"both added": "Ambos adicionados",
-	"both modified": "Ambos Modificados",
-	"commitMessage": "Mensagem (tecle {0} para confirmar)",
-	"commit": "Confirmar",
-	"merge changes": "Mesclar Alterações",
-	"staged changes": "Alterações em Etapas",
-	"changes": "Alterações",
-	"commitMessageCountdown": "{0} caracteres restantes na linha atual",
-	"commitMessageWarning": "{0} caracteres sobre {1} na linha atual",
-	"neveragain": "Não mostrar novamente",
-	"huge": "O repositório git em '{0}' tem muitas atualizações ativas, somente um subconjunto de funcionalidades do Git será habilitado."
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/git/out/scmProvider.i18n.json b/i18n/ptb/extensions/git/out/scmProvider.i18n.json
deleted file mode 100644
index 490dda3603e..00000000000
--- a/i18n/ptb/extensions/git/out/scmProvider.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"commit": "Confirmar"
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/git/out/statusbar.i18n.json b/i18n/ptb/extensions/git/out/statusbar.i18n.json
deleted file mode 100644
index e73bb5248d1..00000000000
--- a/i18n/ptb/extensions/git/out/statusbar.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"checkout": "Checkout...",
-	"sync changes": "Sincronizar alterações",
-	"publish changes": "Publicar Alterações",
-	"syncing changes": "Sincronizando Alterações..."
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/git/package.i18n.json b/i18n/ptb/extensions/git/package.i18n.json
deleted file mode 100644
index 6ab84324adb..00000000000
--- a/i18n/ptb/extensions/git/package.i18n.json
+++ /dev/null
@@ -1,87 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Git",
-	"description": "Integração com SCM Git",
-	"command.clone": "Clonar",
-	"command.init": "Inicializar Repositório",
-	"command.close": "Fechar o repositório",
-	"command.refresh": "Atualizar",
-	"command.openChange": "Abrir alterações",
-	"command.openFile": "Abrir Arquivo",
-	"command.openHEADFile": "Abrir arquivo (HEAD)",
-	"command.stage": "Estagiar Alterações",
-	"command.stageAll": "Estagiar Todas Alterações",
-	"command.stageSelectedRanges": "Estagiar Faixas Selecionadas",
-	"command.revertSelectedRanges": "Reverter Faixas Selecionadas",
-	"command.stageChange": "Mudança de fase",
-	"command.revertChange": "Reverter a alteração",
-	"command.unstage": "Desestagiar Alterações",
-	"command.unstageAll": "Desestagiar Todas Alterações",
-	"command.unstageSelectedRanges": "Desestagiar Faixas Selecionadas",
-	"command.clean": "Descartar Alterações",
-	"command.cleanAll": "Descartar Todas as Alterações",
-	"command.commit": "Confirmar",
-	"command.commitStaged": "Confirmar os preparados",
-	"command.commitStagedSigned": "Confirmar Estagiados (Desconectado)",
-	"command.commitStagedAmend": "Confirmar estagiado (alterar)",
-	"command.commitAll": "Confirmar tudo",
-	"command.commitAllSigned": "Confirmar Tudo (Desconectado)",
-	"command.commitAllAmend": "Comitar Tudo (Corrigir)",
-	"command.undoCommit": "Desfazer Ultima Confirmação",
-	"command.checkout": "Fazer checkout para...",
-	"command.branch": "Criar Ramificação...",
-	"command.deleteBranch": "Excluir Ramificação...",
-	"command.renameBranch": "Renomear o Branch",
-	"command.merge": "Mesclar ramificação...",
-	"command.createTag": "Criar Tag",
-	"command.fetch": "Buscar",
-	"command.pull": "Efetuar pull",
-	"command.pullRebase": "Efetuar pull (Rebase)",
-	"command.pullFrom": "Fazer pull de...",
-	"command.push": "Enviar por push",
-	"command.pushTo": "Enviar por push para...",
-	"command.pushWithTags": "Mover com Tags",
-	"command.sync": "Sincronizar",
-	"command.syncRebase": "Sincronização (Rebase)",
-	"command.publish": "Publicar Ramo",
-	"command.showOutput": "Mostrar Saída do Git",
-	"command.ignore": "Adicionar arquivo ao .gitignore",
-	"command.stashIncludeUntracked": "Estoque (incluir não controlados)",
-	"command.stash": "Esconder",
-	"command.stashPop": "Pop Stash...",
-	"command.stashPopLatest": "Pop mais recente Stash",
-	"config.enabled": "Se o git estiver habilitado",
-	"config.path": "Caminho para o executável do git",
-	"config.autoRepositoryDetection": "Se os repositórios devem ser detectados automaticamente",
-	"config.autorefresh": "Se a atualização automática estiver habilitada",
-	"config.autofetch": "Se a recuperação automática estiver habilitada",
-	"config.enableLongCommitWarning": "Se mensagens longas de confirmação devem ter aviso",
-	"config.confirmSync": "Confirmar antes de sincronizar repositórios git",
-	"config.countBadge": "Controla o contador de distintivos do git. 'todos' considera todas as alterações. 'rastreado' considera apenas as alterações controladas. 'desligado' desliga o contador.",
-	"config.checkoutType": "Controla quais tipos de ramos são listados quando executando `Checkout para... `. `todos` mostra todas as referências, `local` mostra apenas os ramos locais, `etiquetas` mostra apenas etiquetas e `remoto` mostra apenas os ramos remotos.",
-	"config.ignoreLegacyWarning": "Ignora o aviso de Git legado",
-	"config.ignoreMissingGitWarning": "Ignora o aviso quando Git não existir.",
-	"config.ignoreLimitWarning": "Ignora o aviso quando houver muitas alterações em um repositório",
-	"config.defaultCloneDirectory": "O local padrão onde clonar um repositório git",
-	"config.enableSmartCommit": "Confirme todas as alterações quando não há modificações planejadas.",
-	"config.enableCommitSigning": "Habilitar Commit assinando com GPG.",
-	"config.discardAllScope": "Controla as alterações que são descartadas pelo comando 'Descartar todas as alterações'. 'todos' descarta todas as alterações. 'rastreados' descarta somente arquivos rastreados. 'prompt' mostra uma caixa de diálogo de alerta cada vez que a ação é executada.",
-	"config.decorations.enabled": "Controla se o Git contribui cores e emblemas para o explorer e visualizador de editores abertos.",
-	"config.promptToSaveFilesBeforeCommit": "Controla se o Git deve verificar arquivos não salvos antes do Commit.",
-	"config.showInlineOpenFileAction": "Controla se deve mostrar uma ação Abrir Arquivo em linha na visualização de alterações do Git.",
-	"config.inputValidation": "Controla quando exibir validação do campo de mensagem do commit.",
-	"config.detectSubmodules": "Controla se deve detectar automaticamente os sub-módulos do git.",
-	"config.detectSubmodulesLimit": "Controla o limite de sub-módulos git detectados.",
-	"colors.modified": "Cor para recursos modificados.",
-	"colors.deleted": "Cor para recursos excluídos.",
-	"colors.untracked": "Cor para recursos não controlados.",
-	"colors.ignored": "Cor para recursos ignorados.",
-	"colors.conflict": "Cor para recursos com conflitos.",
-	"colors.submodule": "Cor para recursos de sub-módulos."
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/go/package.i18n.json b/i18n/ptb/extensions/go/package.i18n.json
deleted file mode 100644
index 203f97d1603..00000000000
--- a/i18n/ptb/extensions/go/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Noções Básicas Sobre a Linguagem Go",
-	"description": "Fornece realce de sintaxe e correspondência de colchetes em arquivos Go."
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/groovy/package.i18n.json b/i18n/ptb/extensions/groovy/package.i18n.json
deleted file mode 100644
index abdb1ff0880..00000000000
--- a/i18n/ptb/extensions/groovy/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Noções Básicas Sobre a Linguagem Groovy",
-	"description": "Fornece trechos de código, realce de sintaxe e correspondência de colchetes em arquivos Groovy."
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/grunt/out/main.i18n.json b/i18n/ptb/extensions/grunt/out/main.i18n.json
deleted file mode 100644
index 11d261fe593..00000000000
--- a/i18n/ptb/extensions/grunt/out/main.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"execFailed": "Auto detecção de Grunt para pasta {0} falhou com erro: {1}"
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/grunt/package.i18n.json b/i18n/ptb/extensions/grunt/package.i18n.json
deleted file mode 100644
index 6211c0cf13e..00000000000
--- a/i18n/ptb/extensions/grunt/package.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"description": "Extensão para adicionar capacidades Grunt ao VSCode.",
-	"displayName": "Suporte ao Grunt para VSCode",
-	"config.grunt.autoDetect": "Controla se a deteção automática de tarefas do Grunt está ligado ou desligado. Padrão é ligado.",
-	"grunt.taskDefinition.type.description": "A tarefa Grunt a ser personalizada.",
-	"grunt.taskDefinition.file.description": "O arquivo Grunt que fornece a tarefa. Pode ser omitido."
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/gulp/out/main.i18n.json b/i18n/ptb/extensions/gulp/out/main.i18n.json
deleted file mode 100644
index debfd09446d..00000000000
--- a/i18n/ptb/extensions/gulp/out/main.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"execFailed": "Auto detecção de gulp para pasta {0} falhou com erro: {1}"
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/gulp/package.i18n.json b/i18n/ptb/extensions/gulp/package.i18n.json
deleted file mode 100644
index f60761351a2..00000000000
--- a/i18n/ptb/extensions/gulp/package.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"description": "Extensão para adicionar capacidades Gulp ao VSCode.",
-	"displayName": "Suporte ao Gulp para VSCode",
-	"config.gulp.autoDetect": "Controla se a detecção automática de tarefas Gulp está ativada ou desativada. Por padrão, é ativado.",
-	"gulp.taskDefinition.type.description": "A tarefa Gulp a ser customizada.",
-	"gulp.taskDefinition.file.description": "O arquivo Gulp que fornece a tarefa. Pode ser omitido."
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/handlebars/package.i18n.json b/i18n/ptb/extensions/handlebars/package.i18n.json
deleted file mode 100644
index 2eb0ec888d5..00000000000
--- a/i18n/ptb/extensions/handlebars/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Noções Básicas Sobre a Linguagem Handlebars",
-	"description": "Fornece realce de sintaxe e correspondência de colchetes em arquivos Handlebars."
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/hlsl/package.i18n.json b/i18n/ptb/extensions/hlsl/package.i18n.json
deleted file mode 100644
index f00e509b8c7..00000000000
--- a/i18n/ptb/extensions/hlsl/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Noções Básicas Sobre a Linguagem HLSL",
-	"description": "Fornece realce de sintaxe e correspondência de colchetes em arquivos HLSL."
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/html-language-features/client/out/htmlMain.i18n.json b/i18n/ptb/extensions/html-language-features/client/out/htmlMain.i18n.json
deleted file mode 100644
index 6e9a973c172..00000000000
--- a/i18n/ptb/extensions/html-language-features/client/out/htmlMain.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"htmlserver.name": "Servidor de Linguagem HTML",
-	"folding.start": "Início da Região Expansível",
-	"folding.end": "Fim da Região Expansível"
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/html-language-features/package.i18n.json b/i18n/ptb/extensions/html-language-features/package.i18n.json
deleted file mode 100644
index a434dbe0f11..00000000000
--- a/i18n/ptb/extensions/html-language-features/package.i18n.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Recursos da Linguagem HTML",
-	"description": "Fornece suporte de linguagem rico para arquivos HTML, Razor e Handlebar.",
-	"html.format.enable.desc": "Ativar/desativar o formatador HTML padrão",
-	"html.format.wrapLineLength.desc": "Quantidade máxima de caracteres por linha (0 = desativar).",
-	"html.format.unformatted.desc": "Lista de tags, separados por vírgula, que não deveria ser reformatada. o padrão é 'nulo' para todas as tags listadas em https://www.w3.org/TR/html5/dom.html#phrasing-content.",
-	"html.format.contentUnformatted.desc": "Lista de tags, separada por vírgula, onde o conteúdo não deve ser reformatado. o padrão é 'nulo' para a tag 'pré'.",
-	"html.format.indentInnerHtml.desc": "Indentar secões <head>e <body>.",
-	"html.format.preserveNewLines.desc": "Se quebras de linha existentes antes de elementos deveriam ser preservadas. Só funciona antes de elementos, não dentro de rótulos ou para texto.",
-	"html.format.maxPreserveNewLines.desc": "Número máximo de quebras de linha a serem preservadas em um bloco. Use 'null' para ilimitado.",
-	"html.format.indentHandlebars.desc": "Formatar e indentar {{#foo}} e {{/ foo}}.",
-	"html.format.endWithNewline.desc": "Finalizar com uma nova linha.",
-	"html.format.extraLiners.desc": "Lista de rótulos, separados por vírgulas, que deveriam ter uma quebra de linha extra antes deles. 'null' admite o padrão \"head, body, /html\".",
-	"html.format.wrapAttributes.desc": "Agrupar atributos.",
-	"html.format.wrapAttributes.auto": "Agrupar atributos somente quando o tamanho da linha é excedido.",
-	"html.format.wrapAttributes.force": "Agrupar cada atributo exceto o primeiro.",
-	"html.format.wrapAttributes.forcealign": "Agrupar cada atributo, exceto o primeiro e manter alinhado.",
-	"html.format.wrapAttributes.forcemultiline": "Agrupar cada atributo.",
-	"html.suggest.angular1.desc": "Configura se o suporte da linguagem HTML interna sugere rótulos e propriedades do Angular V1.",
-	"html.suggest.ionic.desc": "Configura se o suporte da linguagem HTML interna sugere rótulos, propriedades e valores Ionic.",
-	"html.suggest.html5.desc": "Configura se o suporte da linguagem HTML interna sugere rótulos, propriedades e valores HTML5.",
-	"html.trace.server.desc": "Rastrear a comunicação entre o VS Code e o servidor de linguagem HTML.",
-	"html.validate.scripts": "Configura se o suporte da linguagem HTML interna valida scripts embutidos.",
-	"html.validate.styles": "Configura se o suporte da linguagem HTML interna valida estilos embutidos.",
-	"html.autoClosingTags": "Ativar/desativar o fechamento automático de tags HTML."
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/html/client/out/htmlMain.i18n.json b/i18n/ptb/extensions/html/client/out/htmlMain.i18n.json
deleted file mode 100644
index 6e9a973c172..00000000000
--- a/i18n/ptb/extensions/html/client/out/htmlMain.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"htmlserver.name": "Servidor de Linguagem HTML",
-	"folding.start": "Início da Região Expansível",
-	"folding.end": "Fim da Região Expansível"
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/html/package.i18n.json b/i18n/ptb/extensions/html/package.i18n.json
deleted file mode 100644
index 53d3b893dda..00000000000
--- a/i18n/ptb/extensions/html/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Noções Básicas da Linguagem HTML",
-	"description": "Fornece realce de sintaxe, correspondência de colchetes e trechos em arquivos HTML."
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/ini/package.i18n.json b/i18n/ptb/extensions/ini/package.i18n.json
deleted file mode 100644
index f7e7bd037dd..00000000000
--- a/i18n/ptb/extensions/ini/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Noções Básicas Sobre a Linguagem Ini",
-	"description": "Fornece realce de sintaxe e correspondência de colchetes em arquivos Ini."
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/jake/out/main.i18n.json b/i18n/ptb/extensions/jake/out/main.i18n.json
deleted file mode 100644
index 3311ea5fa59..00000000000
--- a/i18n/ptb/extensions/jake/out/main.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"execFailed": "Auto detecção de Jake para pasta {0} falhou com o erro: {1}"
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/jake/package.i18n.json b/i18n/ptb/extensions/jake/package.i18n.json
deleted file mode 100644
index 08c5614d21b..00000000000
--- a/i18n/ptb/extensions/jake/package.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"description": "Extensão para adicionar capacidades Jake ao VSCode.",
-	"displayName": "Suporte ao Jake para VSCode",
-	"jake.taskDefinition.type.description": "A tarefa Jake a ser customizada.",
-	"jake.taskDefinition.file.description": "O arquivo Jake que fornece a tarefa. Pode ser omitido.",
-	"config.jake.autoDetect": "Controla se a detecção automática de tarefas Jake está ativada ou desativada. Por padrão, é ativado."
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/java/package.i18n.json b/i18n/ptb/extensions/java/package.i18n.json
deleted file mode 100644
index 207e95a5b2f..00000000000
--- a/i18n/ptb/extensions/java/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Noções Básicas Sobre a Linguagem Java",
-	"description": "Fornece trechos de código, realce de sintaxe, correspondência de colchetes e oclusão de código em arquivos Java."
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/javascript/out/features/bowerJSONContribution.i18n.json b/i18n/ptb/extensions/javascript/out/features/bowerJSONContribution.i18n.json
deleted file mode 100644
index 80ae12b6249..00000000000
--- a/i18n/ptb/extensions/javascript/out/features/bowerJSONContribution.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"json.bower.default": "Bower.json padrão",
-	"json.bower.error.repoaccess": "Falha na solicitação ao repositório bower: {0}",
-	"json.bower.latest.version": "último"
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/javascript/out/features/packageJSONContribution.i18n.json b/i18n/ptb/extensions/javascript/out/features/packageJSONContribution.i18n.json
deleted file mode 100644
index d00bf34c203..00000000000
--- a/i18n/ptb/extensions/javascript/out/features/packageJSONContribution.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"json.package.default": "Package.json padrão",
-	"json.npm.error.repoaccess": "Falha na solicitação ao repositório NPM: {0}",
-	"json.npm.latestversion": "A versão do pacote mais recente no momento",
-	"json.npm.majorversion": "Combina com a versão principal mais recente (1.x.x)",
-	"json.npm.minorversion": "Combina a versão secundária mais recente (1.2.x)",
-	"json.npm.version.hover": "Última versão: {0}"
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/javascript/package.i18n.json b/i18n/ptb/extensions/javascript/package.i18n.json
deleted file mode 100644
index 582a7ee0bac..00000000000
--- a/i18n/ptb/extensions/javascript/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Noções Básicas Sobre a Linguagem JavaScript",
-	"description": "Fornece realce de sintaxe, correspondência de colchetes e oclusão de código em arquivos JavaScript."
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/json-language-features/client/out/jsonMain.i18n.json b/i18n/ptb/extensions/json-language-features/client/out/jsonMain.i18n.json
deleted file mode 100644
index 3db289491e4..00000000000
--- a/i18n/ptb/extensions/json-language-features/client/out/jsonMain.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"jsonserver.name": "Servidor de linguagem JSON"
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/json-language-features/package.i18n.json b/i18n/ptb/extensions/json-language-features/package.i18n.json
deleted file mode 100644
index 5be341b6196..00000000000
--- a/i18n/ptb/extensions/json-language-features/package.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Recursos da Linguagem JSON",
-	"description": "Fornece suporte de linguagem rico para arquivos JSON.",
-	"json.schemas.desc": "Esquemas associadas a arquivos de JSON no projeto atual",
-	"json.schemas.url.desc": "Um URL para um esquema ou um caminho relativo a um esquema no diretório atual",
-	"json.schemas.fileMatch.desc": "Uma matriz de padrões de arquivos para correspondência ao resolver arquivos JSON para esquemas.",
-	"json.schemas.fileMatch.item.desc": "Um padrão de arquivos que pode conter '*' para fazer a correspondência ao resolver arquivos JSON para esquemas.",
-	"json.schemas.schema.desc": "A definição de esquema para o URL dado. O esquema precisa ser fornecido apenas para evitar acessos ao URL do esquema.",
-	"json.format.enable.desc": "Habilitar/desabilitar o formatador JSON padrão (requer reinicialização)",
-	"json.tracing.desc": "Loga a comunicação entre o VS Code e o servidor de linguagem JSON.",
-	"json.colorDecorators.enable.desc": "Habilita ou desabilita os decoradores de cor",
-	"json.colorDecorators.enable.deprecationMessage": "A configuração 'json.colorDecorators.enable' foi descontinuada em favor de 'editor.colorDecorators'."
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/json/client/out/jsonMain.i18n.json b/i18n/ptb/extensions/json/client/out/jsonMain.i18n.json
deleted file mode 100644
index 3db289491e4..00000000000
--- a/i18n/ptb/extensions/json/client/out/jsonMain.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"jsonserver.name": "Servidor de linguagem JSON"
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/json/package.i18n.json b/i18n/ptb/extensions/json/package.i18n.json
deleted file mode 100644
index 4f2081eef5f..00000000000
--- a/i18n/ptb/extensions/json/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Noções Básicas da Linguagem JSON",
-	"description": "Fornece realce de sintaxe e correspondência de colchetes em arquivos JSON."
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/less/package.i18n.json b/i18n/ptb/extensions/less/package.i18n.json
deleted file mode 100644
index f83a843880a..00000000000
--- a/i18n/ptb/extensions/less/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Noções Básicas Sobre a Linguagem Less",
-	"description": "Fornece realce de sintaxe, correspondência de colchetes e oclusão de código em arquivos Less."
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/log/package.i18n.json b/i18n/ptb/extensions/log/package.i18n.json
deleted file mode 100644
index 0f7313e5de8..00000000000
--- a/i18n/ptb/extensions/log/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Log",
-	"description": "Fornece realce de sintaxe para arquivos com extensão .log."
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/lua/package.i18n.json b/i18n/ptb/extensions/lua/package.i18n.json
deleted file mode 100644
index a85199917e7..00000000000
--- a/i18n/ptb/extensions/lua/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Noções Básicas Sobre a Linguagem Lua",
-	"description": "Fornece realce de sintaxe e correspondência de colchetes em arquivos Lua."
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/make/package.i18n.json b/i18n/ptb/extensions/make/package.i18n.json
deleted file mode 100644
index 52ddd461b8d..00000000000
--- a/i18n/ptb/extensions/make/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Noções Básicas Sobre a Linguagem Make",
-	"description": "Fornece realce de sintaxe e correspondência de colchetes em arquivos Make."
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/markdown-basics/package.i18n.json b/i18n/ptb/extensions/markdown-basics/package.i18n.json
deleted file mode 100644
index 4295e53ce24..00000000000
--- a/i18n/ptb/extensions/markdown-basics/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Noções Básicas Sobre a Linguagem Markdown",
-	"description": "Fornece trechos de código e destaque de sintaxe para Markdown."
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json b/i18n/ptb/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json
deleted file mode 100644
index b72e8b907d6..00000000000
--- a/i18n/ptb/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"onPreviewStyleLoadError": "Não foi possível carregar o 'markdown.styles': {0}"
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/markdown-language-features/out/features/preview.i18n.json b/i18n/ptb/extensions/markdown-language-features/out/features/preview.i18n.json
deleted file mode 100644
index c84ba98d829..00000000000
--- a/i18n/ptb/extensions/markdown-language-features/out/features/preview.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"lockedPreviewTitle": "[Pré-visualização] {0}",
-	"previewTitle": "Pré-visualização {0}"
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/markdown-language-features/out/features/previewContentProvider.i18n.json b/i18n/ptb/extensions/markdown-language-features/out/features/previewContentProvider.i18n.json
deleted file mode 100644
index 3d1337eab3e..00000000000
--- a/i18n/ptb/extensions/markdown-language-features/out/features/previewContentProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"preview.securityMessage.text": "Parte do conteúdo foi desativada neste documento",
-	"preview.securityMessage.title": "Conteúdo potencialmente inseguro foi desativado na visualização de remarcação. Altere a configuração de segurança de visualização do Markdown para permitir conteúdo inseguro ou habilitar scripts",
-	"preview.securityMessage.label": "Conteúdo do Aviso de Segurança Desativado"
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/markdown-language-features/out/security.i18n.json b/i18n/ptb/extensions/markdown-language-features/out/security.i18n.json
deleted file mode 100644
index ead307bcb9d..00000000000
--- a/i18n/ptb/extensions/markdown-language-features/out/security.i18n.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"strict.title": "Estrito",
-	"strict.description": "Somente carregar conteúdo seguro",
-	"insecureLocalContent.title": "Permitir conteúdo local inseguro",
-	"insecureLocalContent.description": "Permitir carregar conteúdo por http servida por localhost",
-	"insecureContent.title": "Permitir conteúdo inseguro",
-	"insecureContent.description": "Permitir o carregamento de conteúdo via http",
-	"disable.title": "Desabilitar",
-	"disable.description": "Permitir a execução de conteúdo e scripts. Não recomendado",
-	"moreInfo.title": "Mais informações",
-	"enableSecurityWarning.title": "Habilitar a visualização de avisos de segurança neste espaço de trabalho",
-	"disableSecurityWarning.title": "Desabilitar a visualização de avisos de segurança neste espaço de trabalho",
-	"toggleSecurityWarning.description": "Não afeta o nível de segurança do conteúdo",
-	"preview.showPreviewSecuritySelector.title": "Selecione as configurações de segurança para pré-visualização de Markdown nesta área de trabalho."
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/markdown-language-features/package.i18n.json b/i18n/ptb/extensions/markdown-language-features/package.i18n.json
deleted file mode 100644
index 2a40b868546..00000000000
--- a/i18n/ptb/extensions/markdown-language-features/package.i18n.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Recursos da Linguagem Markdown",
-	"description": "Fornece suporte à linguagem rica para Markdown.",
-	"markdown.preview.breaks.desc": "Configura como quebras de linha são processadas na visualização de markdown. Configurando como 'true' cria um <br> para cada nova linha.",
-	"markdown.preview.linkify": "Habilitar ou desabilitar a conversão de texto URL para links na visualização markdown.",
-	"markdown.preview.doubleClickToSwitchToEditor.desc": "Duplo clique na pré-visualização markdown para alternar para o editor.",
-	"markdown.preview.fontFamily.desc": "Controla a família de fonte usada na pré-visualização de markdown.",
-	"markdown.preview.fontSize.desc": "Controla o tamanho da fonte em pixels usado na pré-visualização de markdown.",
-	"markdown.preview.lineHeight.desc": "Controla a altura de linha usada na pré-visualização de markdown. Este número é relativo ao tamanho de fonte.",
-	"markdown.preview.markEditorSelection.desc": "Marca a seleção atual do editor na pré-visualização de markdown.",
-	"markdown.preview.scrollEditorWithPreview.desc": "Quando uma pré-visualização de markdown é rolada, atualiza a exibição do editor.",
-	"markdown.preview.scrollPreviewWithEditor.desc": "Quando um editor de markdown é rolado, atualiza a exibição da pré-visualização.",
-	"markdown.preview.scrollPreviewWithEditorSelection.desc": "[Descontinuada] Rola a pré-visualização Markdown para mostrar a linha atualmente selecionada no editor.",
-	"markdown.preview.scrollPreviewWithEditorSelection.deprecationMessage": "Esta configuração foi substituída por 'markdown.preview.scrollPreviewWithEditor' e já não tem qualquer efeito.",
-	"markdown.preview.title": "Abrir a visualização",
-	"markdown.previewFrontMatter.dec": "Configura como o frontispicio YAML frente questão devem ser processado na pré-visualização de markdown. 'hide' remove o frontispicio. Caso contrário, o frontispicio é tratado como conteúdo de markdown.",
-	"markdown.previewSide.title": "Abre pré-visualização ao lado",
-	"markdown.showLockedPreviewToSide.title": "Abrir pré-visualização travada ao lado",
-	"markdown.showSource.title": "Exibir Código-Fonte",
-	"markdown.styles.dec": "Uma lista de URLs ou caminhos locais para folhas de estilo CSS para usar na pré-visualização do markdown. Caminhos relativos são interpretados em relação à pasta aberta no explorer. Se não houver nenhuma pasta aberta, eles são interpretados em relação ao local do arquivo markdown. Todos os ' \\' precisam ser escritos como ' \\ \\ '.",
-	"markdown.showPreviewSecuritySelector.title": "Alterar configurações de segurança da pré-visualização",
-	"markdown.trace.desc": "Habilitar log de depuração para a extensão do markdown.",
-	"markdown.preview.refresh.title": "Atualizar pré-visualização",
-	"markdown.preview.toggleLock.title": "Alternar Bloqueio de Visualização"
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/markdown/out/commands.i18n.json b/i18n/ptb/extensions/markdown/out/commands.i18n.json
deleted file mode 100644
index 7016ff845a8..00000000000
--- a/i18n/ptb/extensions/markdown/out/commands.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"previewTitle": "Visualização {0}",
-	"onPreviewStyleLoadError": "Não foi possível carregar o 'markdown.styles': {0}"
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/markdown/out/commands/onPreviewStyleLoadError.i18n.json b/i18n/ptb/extensions/markdown/out/commands/onPreviewStyleLoadError.i18n.json
deleted file mode 100644
index b72e8b907d6..00000000000
--- a/i18n/ptb/extensions/markdown/out/commands/onPreviewStyleLoadError.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"onPreviewStyleLoadError": "Não foi possível carregar o 'markdown.styles': {0}"
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/markdown/out/extension.i18n.json b/i18n/ptb/extensions/markdown/out/extension.i18n.json
deleted file mode 100644
index 8660a23d4f2..00000000000
--- a/i18n/ptb/extensions/markdown/out/extension.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"onPreviewStyleLoadError": "Não foi possível carregar o 'markdown.styles': {0}",
-	"previewTitle": "Visualização {0}"
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/markdown/out/features/preview.i18n.json b/i18n/ptb/extensions/markdown/out/features/preview.i18n.json
deleted file mode 100644
index c84ba98d829..00000000000
--- a/i18n/ptb/extensions/markdown/out/features/preview.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"lockedPreviewTitle": "[Pré-visualização] {0}",
-	"previewTitle": "Pré-visualização {0}"
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/markdown/out/features/previewContentProvider.i18n.json b/i18n/ptb/extensions/markdown/out/features/previewContentProvider.i18n.json
deleted file mode 100644
index 604c6ffae93..00000000000
--- a/i18n/ptb/extensions/markdown/out/features/previewContentProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"preview.securityMessage.text": "Algum conteúdo foi desativado neste documento",
-	"preview.securityMessage.title": "Conteúdo potencialmente inseguro foi desativado na visualização de remarcação. Altere a configuração de segurança de visualização do Markdown para permitir conteúdo inseguro ou habilitar scripts",
-	"preview.securityMessage.label": "Conteúdo do Aviso de Segurança Desativado"
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/markdown/out/previewContentProvider.i18n.json b/i18n/ptb/extensions/markdown/out/previewContentProvider.i18n.json
deleted file mode 100644
index b8fe23c6262..00000000000
--- a/i18n/ptb/extensions/markdown/out/previewContentProvider.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"preview.securityMessage.text": "Algum conteúdo foi desativado neste documento",
-	"preview.securityMessage.title": "Conteúdo potencialmente inseguro foi desativado na visualização de remarcação. Altere a configuração de segurança de visualização do Markdown para permitir conteúdo inseguro ou habilitar scripts",
-	"preview.securityMessage.label": "Conteúdo do aviso de segurança desativado"
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/markdown/out/security.i18n.json b/i18n/ptb/extensions/markdown/out/security.i18n.json
deleted file mode 100644
index ed697341a9e..00000000000
--- a/i18n/ptb/extensions/markdown/out/security.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"strict.title": "Estrita",
-	"strict.description": "Somente carregar conteúdo seguro",
-	"insecureContent.title": "Permitir conteúdo inseguro",
-	"insecureContent.description": "Habilitar o carregamento de conteúdo sobre http",
-	"disable.title": "Desabilitar",
-	"disable.description": "Permitir a execução de conteúdo e scripts. Não recomendado",
-	"moreInfo.title": "Mais informações",
-	"enableSecurityWarning.title": "Habilitar a visualização de avisos de segurança neste espaço de trabalho",
-	"disableSecurityWarning.title": "Desabilitar a visualização de avisos de segurança neste espaço de trabalho",
-	"toggleSecurityWarning.description": "Não afeta o nível de segurança de conteúdo",
-	"preview.showPreviewSecuritySelector.title": "Selecione as configurações de segurança para visualizações de Markdown neste espaço de trabalho"
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/markdown/package.i18n.json b/i18n/ptb/extensions/markdown/package.i18n.json
deleted file mode 100644
index 2d381cc3188..00000000000
--- a/i18n/ptb/extensions/markdown/package.i18n.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Recursos da Linguagem Markdown",
-	"description": "Fornece suporte à linguagem rica para Markdown.",
-	"markdown.preview.breaks.desc": "Configura como quebras de linha são processadas na visualização de markdown. Configurando como 'true' cria um <br> para cada nova linha.",
-	"markdown.preview.linkify": "Habilitar ou desabilitar a conversão de texto URL para links na visualização markdown.",
-	"markdown.preview.doubleClickToSwitchToEditor.desc": "Duplo clique na pré-visualização markdown para alternar para o editor.",
-	"markdown.preview.fontFamily.desc": "Controla a família de fonte usada na pré-visualização de markdown.",
-	"markdown.preview.fontSize.desc": "Controla o tamanho da fonte em pixels usado na pré-visualização de markdown.",
-	"markdown.preview.lineHeight.desc": "Controla a altura de linha usada na pré-visualização de markdown. Este número é relativo ao tamanho de fonte.",
-	"markdown.preview.markEditorSelection.desc": "Marca a seleção atual do editor na pré-visualização de markdown.",
-	"markdown.preview.scrollEditorWithPreview.desc": "Quando uma pré-visualização de markdown é rolada, atualiza a exibição do editor.",
-	"markdown.preview.scrollPreviewWithEditor.desc": "Quando um editor de markdown é rolado, atualiza a exibição da pré-visualização.",
-	"markdown.preview.title": "Abrir a visualização",
-	"markdown.previewFrontMatter.dec": "Configura como o frontispicio YAML frente questão devem ser processado na pré-visualização de markdown. 'hide' remove o frontispicio. Caso contrário, o frontispicio é tratado como conteúdo de markdown.",
-	"markdown.previewSide.title": "Abre pré-visualização ao lado",
-	"markdown.showSource.title": "Exibir Código-Fonte",
-	"markdown.styles.dec": "Uma lista de URLs ou caminhos locais para folhas de estilo CSS para usar na pré-visualização do markdown. Caminhos relativos são interpretados em relação à pasta aberta no explorer. Se não houver nenhuma pasta aberta, eles são interpretados em relação ao local do arquivo markdown. Todos os ' \\' precisam ser escritos como ' \\ \\ '.",
-	"markdown.showPreviewSecuritySelector.title": "Alterar as configurações de segurança de visualização",
-	"markdown.trace.desc": "Habilitar log de depuração para a extensão do markdown."
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/merge-conflict/out/codelensProvider.i18n.json b/i18n/ptb/extensions/merge-conflict/out/codelensProvider.i18n.json
deleted file mode 100644
index e9077c87e47..00000000000
--- a/i18n/ptb/extensions/merge-conflict/out/codelensProvider.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"acceptCurrentChange": "Aceitar a mudança atual",
-	"acceptIncomingChange": "Aceitar a mudança de entrada",
-	"acceptBothChanges": "Aceitar as duas alterações",
-	"compareChanges": "Comparar as mudanças"
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/merge-conflict/out/commandHandler.i18n.json b/i18n/ptb/extensions/merge-conflict/out/commandHandler.i18n.json
deleted file mode 100644
index 4d35c4109d9..00000000000
--- a/i18n/ptb/extensions/merge-conflict/out/commandHandler.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"cursorNotInConflict": "Cursor do editor não está dentro de um conflito de mesclagem",
-	"compareChangesTitle": "{0}: Alterações Atuais ⟷ Alterações de Entrada",
-	"cursorOnCommonAncestorsRange": "Cursor do editor está dentro do bloco comum de ancestrais, favor mover para o bloco \"atual\" ou \"entrada\"",
-	"cursorOnSplitterRange": "Cursor do editor está dentro do separador de conflitos de mesclagem, por favor mova-o para o bloco \"atual\" ou \"entrada\"",
-	"noConflicts": "Nenhum conflito de mesclagem encontrado neste arquivo",
-	"noOtherConflictsInThisFile": "Não há outros conflitos de mesclagem dentro desse arquivo"
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/merge-conflict/out/mergeDecorator.i18n.json b/i18n/ptb/extensions/merge-conflict/out/mergeDecorator.i18n.json
deleted file mode 100644
index 03de8be1cfa..00000000000
--- a/i18n/ptb/extensions/merge-conflict/out/mergeDecorator.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"currentChange": "(Mudança Atual)",
-	"incomingChange": "(Próxima Mudança)"
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/merge-conflict/package.i18n.json b/i18n/ptb/extensions/merge-conflict/package.i18n.json
deleted file mode 100644
index 7c3c0804258..00000000000
--- a/i18n/ptb/extensions/merge-conflict/package.i18n.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Mesclar conflitos",
-	"description": "Realce e comandos para mesclagem de conflitos inline.",
-	"command.category": "Conflito de Mesclagem",
-	"command.accept.all-current": "Aceitar Todos os Atuais",
-	"command.accept.all-incoming": "Aceitar todas entradas",
-	"command.accept.all-both": "Aceitar todas as duas",
-	"command.accept.current": "Aceitar a corrente",
-	"command.accept.incoming": "Aceitar entrada",
-	"command.accept.selection": "Aceitar a seleção",
-	"command.accept.both": "Aceitar Ambos",
-	"command.next": "Próximo conflito",
-	"command.previous": "Conflito anterior",
-	"command.compare": "Comparar o conflito atual",
-	"config.title": "Mesclar conflitos",
-	"config.codeLensEnabled": "Habilitar/Desabilitar o conflito de mesclagem no bloco CodeLens dentro do editor",
-	"config.decoratorsEnabled": "Habilitar/Desabilitar decoradores de mesclagem de conflitos dentro do editor"
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/npm/out/features/bowerJSONContribution.i18n.json b/i18n/ptb/extensions/npm/out/features/bowerJSONContribution.i18n.json
deleted file mode 100644
index 80ae12b6249..00000000000
--- a/i18n/ptb/extensions/npm/out/features/bowerJSONContribution.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"json.bower.default": "Bower.json padrão",
-	"json.bower.error.repoaccess": "Falha na solicitação ao repositório bower: {0}",
-	"json.bower.latest.version": "último"
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/npm/out/features/packageJSONContribution.i18n.json b/i18n/ptb/extensions/npm/out/features/packageJSONContribution.i18n.json
deleted file mode 100644
index d00bf34c203..00000000000
--- a/i18n/ptb/extensions/npm/out/features/packageJSONContribution.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"json.package.default": "Package.json padrão",
-	"json.npm.error.repoaccess": "Falha na solicitação ao repositório NPM: {0}",
-	"json.npm.latestversion": "A versão do pacote mais recente no momento",
-	"json.npm.majorversion": "Combina com a versão principal mais recente (1.x.x)",
-	"json.npm.minorversion": "Combina a versão secundária mais recente (1.2.x)",
-	"json.npm.version.hover": "Última versão: {0}"
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/npm/out/main.i18n.json b/i18n/ptb/extensions/npm/out/main.i18n.json
deleted file mode 100644
index 187a3c1e190..00000000000
--- a/i18n/ptb/extensions/npm/out/main.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"npm.parseError": "Deteção de tarefa NPM: falha ao analisar o arquivo {0}"
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/npm/out/npmView.i18n.json b/i18n/ptb/extensions/npm/out/npmView.i18n.json
deleted file mode 100644
index 512bbc8790a..00000000000
--- a/i18n/ptb/extensions/npm/out/npmView.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noScripts": "Scripts não encontrados.",
-	"noDebugOptions": "Não foi possível iniciar '{0}' para depuração porque os scripts não possuem uma opção de depuração para node, por exemplo \"--inspect-brk\".",
-	"learnMore": "Saiba Mais",
-	"ok": "OK",
-	"scriptInvalid": "Não foi possível encontrar o script \"{0}\". Tente atualizar a visualização."
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/npm/out/tasks.i18n.json b/i18n/ptb/extensions/npm/out/tasks.i18n.json
deleted file mode 100644
index cbb92a85734..00000000000
--- a/i18n/ptb/extensions/npm/out/tasks.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"npm.parseError": "Detecção de tarefa do npm: falha ao analisar o arquivo {0}"
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/npm/package.i18n.json b/i18n/ptb/extensions/npm/package.i18n.json
deleted file mode 100644
index 8efb19208f1..00000000000
--- a/i18n/ptb/extensions/npm/package.i18n.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"description": "Extensão para adicionar suporte a tarefas para scripts npm.",
-	"displayName": "Suporte ao Npm para VSCode",
-	"config.npm.autoDetect": "Controla se a deteção automática de scripts npm está ligado ou desligado. O padrão é ligado.",
-	"config.npm.runSilent": "Executar comandos npm com a opção '--silent'.",
-	"config.npm.packageManager": "O Gerenciador de pacotes usado para executar scripts.",
-	"config.npm.exclude": "Configure padrões glob para pastas que devem ser excluídos da detecção automática de script.",
-	"config.npm.enableScriptExplorer": "Ativar uma visualização do explorador para scripts npm.",
-	"npm.parseError": "Deteção de tarefa NPM: falha ao analisar o arquivo {0}",
-	"taskdef.script": "O script npm para personalizar.",
-	"view.name": "Scripts do npm",
-	"command.refresh": "Atualizar",
-	"command.run": "Executar",
-	"command.debug": "Depurar",
-	"command.openScript": "Abrir"
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/objective-c/package.i18n.json b/i18n/ptb/extensions/objective-c/package.i18n.json
deleted file mode 100644
index be2418c54c4..00000000000
--- a/i18n/ptb/extensions/objective-c/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Noções Básicas Sobre a Linguagem Objective-C",
-	"description": "Fornece realce de sintaxe e correspondência de colchetes em arquivos Objective-C."
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/package-json/out/features/bowerJSONContribution.i18n.json b/i18n/ptb/extensions/package-json/out/features/bowerJSONContribution.i18n.json
deleted file mode 100644
index 80ae12b6249..00000000000
--- a/i18n/ptb/extensions/package-json/out/features/bowerJSONContribution.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"json.bower.default": "Bower.json padrão",
-	"json.bower.error.repoaccess": "Falha na solicitação ao repositório bower: {0}",
-	"json.bower.latest.version": "último"
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/package-json/out/features/packageJSONContribution.i18n.json b/i18n/ptb/extensions/package-json/out/features/packageJSONContribution.i18n.json
deleted file mode 100644
index d00bf34c203..00000000000
--- a/i18n/ptb/extensions/package-json/out/features/packageJSONContribution.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"json.package.default": "Package.json padrão",
-	"json.npm.error.repoaccess": "Falha na solicitação ao repositório NPM: {0}",
-	"json.npm.latestversion": "A versão do pacote mais recente no momento",
-	"json.npm.majorversion": "Combina com a versão principal mais recente (1.x.x)",
-	"json.npm.minorversion": "Combina a versão secundária mais recente (1.2.x)",
-	"json.npm.version.hover": "Última versão: {0}"
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/package-json/package.i18n.json b/i18n/ptb/extensions/package-json/package.i18n.json
deleted file mode 100644
index 35229bd6699..00000000000
--- a/i18n/ptb/extensions/package-json/package.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	]
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/perl/package.i18n.json b/i18n/ptb/extensions/perl/package.i18n.json
deleted file mode 100644
index 5b15ff68e47..00000000000
--- a/i18n/ptb/extensions/perl/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Noções Básicas Sobre a Linguagem Perl",
-	"description": "Fornece realce de sintaxe e correspondência de colchetes em arquivos Perl."
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/php-language-features/out/features/validationProvider.i18n.json b/i18n/ptb/extensions/php-language-features/out/features/validationProvider.i18n.json
deleted file mode 100644
index bfb1b796def..00000000000
--- a/i18n/ptb/extensions/php-language-features/out/features/validationProvider.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"php.useExecutablePath": "Você permite {0} (definido como uma configuração do espaço de trabalho) a ser executado para lint de arquivos PHP?",
-	"php.yes": "Permitir",
-	"php.no": "Não permitir",
-	"wrongExecutable": "Não é possível validar {0} pois não é um executável php válido. Use a configuração 'php.validate.executablePath' para configurar o executável do PHP.",
-	"noExecutable": "Não é possível validar porque nenhum executável PHP está definido. Use a configuração 'php.validate.executablePath' para configurar o executável do PHP.",
-	"unknownReason": "Falha ao executar o php usando o caminho: {0}. O motivo é desconhecido."
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/php-language-features/package.i18n.json b/i18n/ptb/extensions/php-language-features/package.i18n.json
deleted file mode 100644
index 7779248205c..00000000000
--- a/i18n/ptb/extensions/php-language-features/package.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"configuration.suggest.basic": "Configura se as sugestões intrínsecas da linguagem PHP estão habilitadas. O suporte sugere globais e variáveis do PHP.",
-	"configuration.validate.enable": "Habilita/desabilita a validação interna do PHP.",
-	"configuration.validate.executablePath": "Aponta para o executável do PHP.",
-	"configuration.validate.run": "Se o linter é executado ao salvar ou ao digitar.",
-	"configuration.title": "PHP",
-	"commands.categroy.php": "PHP",
-	"command.untrustValidationExecutable": "Desabilita a validação de executável do PHP (definida como configuração do espaço de trabalho)",
-	"displayName": "Recursos da linguagem PHP",
-	"description": "Fornece suporte de linguagem rica para arquivos PHP."
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/php/out/features/validationProvider.i18n.json b/i18n/ptb/extensions/php/out/features/validationProvider.i18n.json
deleted file mode 100644
index bfb1b796def..00000000000
--- a/i18n/ptb/extensions/php/out/features/validationProvider.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"php.useExecutablePath": "Você permite {0} (definido como uma configuração do espaço de trabalho) a ser executado para lint de arquivos PHP?",
-	"php.yes": "Permitir",
-	"php.no": "Não permitir",
-	"wrongExecutable": "Não é possível validar {0} pois não é um executável php válido. Use a configuração 'php.validate.executablePath' para configurar o executável do PHP.",
-	"noExecutable": "Não é possível validar porque nenhum executável PHP está definido. Use a configuração 'php.validate.executablePath' para configurar o executável do PHP.",
-	"unknownReason": "Falha ao executar o php usando o caminho: {0}. O motivo é desconhecido."
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/php/package.i18n.json b/i18n/ptb/extensions/php/package.i18n.json
deleted file mode 100644
index 66c4ab05eef..00000000000
--- a/i18n/ptb/extensions/php/package.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"description": "Fornece realce de sintaxe e suporte a correspondência de colchetes para arquivos PHP."
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/powershell/package.i18n.json b/i18n/ptb/extensions/powershell/package.i18n.json
deleted file mode 100644
index c8d4a44ac0b..00000000000
--- a/i18n/ptb/extensions/powershell/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Noções Básicas Sobre a Linguagem Powershell",
-	"description": "Fornece realce de sintaxe, correspondência de colchetes e oclusão de código em arquivos Powershell."
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/pug/package.i18n.json b/i18n/ptb/extensions/pug/package.i18n.json
deleted file mode 100644
index a4a9f443d88..00000000000
--- a/i18n/ptb/extensions/pug/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Noções Básicas Sobre a Linguagem Pug",
-	"description": "Fornece realce de sintaxe e correspondência de colchetes em arquivos Pug."
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/python/package.i18n.json b/i18n/ptb/extensions/python/package.i18n.json
deleted file mode 100644
index ee8ff1f709e..00000000000
--- a/i18n/ptb/extensions/python/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Noções Básicas Sobre a Linguagem Python",
-	"description": "Fornece realce de sintaxe, correspondência de colchetes e oclusão de código em arquivos Python."
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/r/package.i18n.json b/i18n/ptb/extensions/r/package.i18n.json
deleted file mode 100644
index d6beac66e30..00000000000
--- a/i18n/ptb/extensions/r/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Noções Básicas Sobre a Linguagem R",
-	"description": "Fornece realce de sintaxe e correspondência de colchetes em arquivos R."
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/razor/package.i18n.json b/i18n/ptb/extensions/razor/package.i18n.json
deleted file mode 100644
index c79997f74c3..00000000000
--- a/i18n/ptb/extensions/razor/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Noções Básicas Sobre a Linguagem Razor",
-	"description": "Fornece realce de sintaxe, correspondência de colchetes e oclusão de código em arquivos Razor."
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/ruby/package.i18n.json b/i18n/ptb/extensions/ruby/package.i18n.json
deleted file mode 100644
index 11ef2cb215a..00000000000
--- a/i18n/ptb/extensions/ruby/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Noções Básicas Sobre a Linguagem Ruby",
-	"description": "Fornece realce de sintaxe e correspondência de colchetes em arquivos Ruby."
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/rust/package.i18n.json b/i18n/ptb/extensions/rust/package.i18n.json
deleted file mode 100644
index 7812f5b58c1..00000000000
--- a/i18n/ptb/extensions/rust/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Noções Básicas Sobre a Linguagem Rust",
-	"description": "Fornece realce de sintaxe e correspondência de colchetes em arquivos Rust."
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/scss/package.i18n.json b/i18n/ptb/extensions/scss/package.i18n.json
deleted file mode 100644
index 1f732d38a0a..00000000000
--- a/i18n/ptb/extensions/scss/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Noções Básicas Sobre a Linguagem SCSS",
-	"description": "Fornece realce de sintaxe, correspondência de colchetes e oclusão de código em arquivos SCSS."
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/search-rg/package.i18n.json b/i18n/ptb/extensions/search-rg/package.i18n.json
deleted file mode 100644
index 35229bd6699..00000000000
--- a/i18n/ptb/extensions/search-rg/package.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	]
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/shaderlab/package.i18n.json b/i18n/ptb/extensions/shaderlab/package.i18n.json
deleted file mode 100644
index 6138101920b..00000000000
--- a/i18n/ptb/extensions/shaderlab/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Noções Básicas Sobre a Linguagem Shaderlab",
-	"description": "Fornece realce de sintaxe e correspondência de colchetes em arquivos Shaderlab."
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/shellscript/package.i18n.json b/i18n/ptb/extensions/shellscript/package.i18n.json
deleted file mode 100644
index f52f15ed9de..00000000000
--- a/i18n/ptb/extensions/shellscript/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Noções Básicas Sobre a Linguagem Shell Script",
-	"description": "Fornece realce de sintaxe e correspondência de colchetes em arquivos de Script de Shell."
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/sql/package.i18n.json b/i18n/ptb/extensions/sql/package.i18n.json
deleted file mode 100644
index 95abedb5aac..00000000000
--- a/i18n/ptb/extensions/sql/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Noções Básicas Sobre a Linguagem SQL",
-	"description": "Fornece realce de sintaxe e correspondência de colchetes nos arquivos SQL."
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/swift/package.i18n.json b/i18n/ptb/extensions/swift/package.i18n.json
deleted file mode 100644
index aa1efe8c491..00000000000
--- a/i18n/ptb/extensions/swift/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Noções Básicas Sobre a Linguagem Swift",
-	"description": "Fornece trechos de código, realce de sintaxe e correspondência de colchetes em arquivos Swift."
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/theme-abyss/package.i18n.json b/i18n/ptb/extensions/theme-abyss/package.i18n.json
deleted file mode 100644
index 4517c7c7ec7..00000000000
--- a/i18n/ptb/extensions/theme-abyss/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Tema Abissal",
-	"description": "Tema Abismo para Visual Studio Code"
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/theme-defaults/package.i18n.json b/i18n/ptb/extensions/theme-defaults/package.i18n.json
deleted file mode 100644
index 1767af9c5bf..00000000000
--- a/i18n/ptb/extensions/theme-defaults/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Temas Padrões",
-	"description": "Os temas claro e escuro padrão (Plus e Visual Studio)"
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/theme-kimbie-dark/package.i18n.json b/i18n/ptb/extensions/theme-kimbie-dark/package.i18n.json
deleted file mode 100644
index 0581024356d..00000000000
--- a/i18n/ptb/extensions/theme-kimbie-dark/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Tema Kimbie Escuro",
-	"description": "Tema Kimble escruto para o Visual Studio Code"
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/theme-monokai-dimmed/package.i18n.json b/i18n/ptb/extensions/theme-monokai-dimmed/package.i18n.json
deleted file mode 100644
index ba0b136dda2..00000000000
--- a/i18n/ptb/extensions/theme-monokai-dimmed/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Tema Monokai Esmaecido",
-	"description": "Tema Monokai escurecido para o Visual Studio Code"
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/theme-monokai/package.i18n.json b/i18n/ptb/extensions/theme-monokai/package.i18n.json
deleted file mode 100644
index 1921a307294..00000000000
--- a/i18n/ptb/extensions/theme-monokai/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Tema Monokai",
-	"description": "Tema Monokai para Visual Studio Code"
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/theme-quietlight/package.i18n.json b/i18n/ptb/extensions/theme-quietlight/package.i18n.json
deleted file mode 100644
index 443fab6c0a3..00000000000
--- a/i18n/ptb/extensions/theme-quietlight/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Tema Claro Calmo",
-	"description": "Tema Claro Calmo para Visual Studio Code"
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/theme-red/package.i18n.json b/i18n/ptb/extensions/theme-red/package.i18n.json
deleted file mode 100644
index 520f70a8c2b..00000000000
--- a/i18n/ptb/extensions/theme-red/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Tema Vermelho",
-	"description": "Tema Vermelho para Visual Studio Code"
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/theme-seti/package.i18n.json b/i18n/ptb/extensions/theme-seti/package.i18n.json
deleted file mode 100644
index eeb743d6c17..00000000000
--- a/i18n/ptb/extensions/theme-seti/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Tema Ícone de Arquivo Seti",
-	"description": "Um tema de ícone de arquivo feito de Ícones de arquivos da interface de usuário Seti"
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/theme-solarized-dark/package.i18n.json b/i18n/ptb/extensions/theme-solarized-dark/package.i18n.json
deleted file mode 100644
index 1b0a1954c27..00000000000
--- a/i18n/ptb/extensions/theme-solarized-dark/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Tema Solarizado Escuro",
-	"description": "Tema solarizado escuro para o Visual Studio Code"
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/theme-solarized-light/package.i18n.json b/i18n/ptb/extensions/theme-solarized-light/package.i18n.json
deleted file mode 100644
index 11c26b39bbe..00000000000
--- a/i18n/ptb/extensions/theme-solarized-light/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Tema Solarizado Claro",
-	"description": "Tema solarizado claro para o Visual Studio Code"
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/theme-tomorrow-night-blue/package.i18n.json b/i18n/ptb/extensions/theme-tomorrow-night-blue/package.i18n.json
deleted file mode 100644
index 24413bb7486..00000000000
--- a/i18n/ptb/extensions/theme-tomorrow-night-blue/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Tema Noite Azul do Amanhã",
-	"description": "Tema azul noturno do amanhã para o Visual Studio Code"
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/typescript-basics/package.i18n.json b/i18n/ptb/extensions/typescript-basics/package.i18n.json
deleted file mode 100644
index 24615fd096d..00000000000
--- a/i18n/ptb/extensions/typescript-basics/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Noções Básicas da Linguagem TypeScript",
-	"description": "Fornece trechos, realce de sintaxe, correspondência de colchetes e oclusão de código em arquivos TypeScript."
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/typescript-language-features/out/commands.i18n.json b/i18n/ptb/extensions/typescript-language-features/out/commands.i18n.json
deleted file mode 100644
index 43bfcb4644a..00000000000
--- a/i18n/ptb/extensions/typescript-language-features/out/commands.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"typescript.projectConfigNoWorkspace": "Favor abrir uma pasta no VS Code para usar um projeto TypeScript ou JavaScript",
-	"typescript.projectConfigUnsupportedFile": "Não foi possível determinar o projeto TypeScript ou JavaScript. Tipo de arquivo não suportado",
-	"typescript.projectConfigCouldNotGetInfo": "Não foi possível determinar o projeto TypeScript ou JavaScript",
-	"typescript.noTypeScriptProjectConfig": "O arquivo não é parte do projeto TypeScript. Clique [aqui]({0}) para mais informações.",
-	"typescript.noJavaScriptProjectConfig": "O arquivo não é parte do projeto JavaScript. Clique [aqui]({0}) para mais informações.",
-	"typescript.configureTsconfigQuickPick": "Configurar tsconfig.json",
-	"typescript.configureJsconfigQuickPick": "Configurar jsconfig.json"
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/typescript-language-features/out/features/completionItemProvider.i18n.json b/i18n/ptb/extensions/typescript-language-features/out/features/completionItemProvider.i18n.json
deleted file mode 100644
index 07ef27a5bcf..00000000000
--- a/i18n/ptb/extensions/typescript-language-features/out/features/completionItemProvider.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"selectCodeAction": "Selecione uma ação de código para aplicar",
-	"acquiringTypingsLabel": "Adquirindo digitações...",
-	"acquiringTypingsDetail": "Adquirindo definições de digitações para o Intellisense.",
-	"autoImportLabel": "Importação automática de {0}"
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/typescript-language-features/out/features/directiveCommentCompletionProvider.i18n.json b/i18n/ptb/extensions/typescript-language-features/out/features/directiveCommentCompletionProvider.i18n.json
deleted file mode 100644
index eafca22f53d..00000000000
--- a/i18n/ptb/extensions/typescript-language-features/out/features/directiveCommentCompletionProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"ts-check": "Habilita verificação semântica em um arquivo JavaScript. Deve estar no topo de um arquivo.",
-	"ts-nocheck": "Desabilita verificação semântica em um arquivo JavaScript. Deve estar no topo de um arquivo.",
-	"ts-ignore": "Suprime erros de @ts-check na próxima linha de um arquivo."
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/typescript-language-features/out/features/implementationsCodeLensProvider.i18n.json b/i18n/ptb/extensions/typescript-language-features/out/features/implementationsCodeLensProvider.i18n.json
deleted file mode 100644
index c0ccafb6005..00000000000
--- a/i18n/ptb/extensions/typescript-language-features/out/features/implementationsCodeLensProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"oneImplementationLabel": "1 implementação",
-	"manyImplementationLabel": "{0} implementações",
-	"implementationsErrorLabel": "Não foi possível determinar implementações"
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/typescript-language-features/out/features/jsDocCompletionProvider.i18n.json b/i18n/ptb/extensions/typescript-language-features/out/features/jsDocCompletionProvider.i18n.json
deleted file mode 100644
index 0f22e0563e3..00000000000
--- a/i18n/ptb/extensions/typescript-language-features/out/features/jsDocCompletionProvider.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"typescript.jsDocCompletionItem.documentation": "Comentário JSDoc"
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/typescript-language-features/out/features/organizeImports.i18n.json b/i18n/ptb/extensions/typescript-language-features/out/features/organizeImports.i18n.json
deleted file mode 100644
index 32426c09a5c..00000000000
--- a/i18n/ptb/extensions/typescript-language-features/out/features/organizeImports.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"oraganizeImportsAction.title": "Organizar Imports"
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/typescript-language-features/out/features/quickFixProvider.i18n.json b/i18n/ptb/extensions/typescript-language-features/out/features/quickFixProvider.i18n.json
deleted file mode 100644
index 96d00a06bb5..00000000000
--- a/i18n/ptb/extensions/typescript-language-features/out/features/quickFixProvider.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"fixAllInFileLabel": "{0} (Reparar tudo no arquivo)"
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/typescript-language-features/out/features/referencesCodeLensProvider.i18n.json b/i18n/ptb/extensions/typescript-language-features/out/features/referencesCodeLensProvider.i18n.json
deleted file mode 100644
index fd899d96208..00000000000
--- a/i18n/ptb/extensions/typescript-language-features/out/features/referencesCodeLensProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"oneReferenceLabel": "1 referência",
-	"manyReferenceLabel": "{0} referências",
-	"referenceErrorLabel": "Não foi possível determinar as referências"
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/typescript-language-features/out/features/taskProvider.i18n.json b/i18n/ptb/extensions/typescript-language-features/out/features/taskProvider.i18n.json
deleted file mode 100644
index 083f9cdd4a2..00000000000
--- a/i18n/ptb/extensions/typescript-language-features/out/features/taskProvider.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"buildTscLabel": "compilar - {0}",
-	"buildAndWatchTscLabel": "monitorar - {0}"
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/typescript-language-features/out/features/updatePathsOnRename.i18n.json b/i18n/ptb/extensions/typescript-language-features/out/features/updatePathsOnRename.i18n.json
deleted file mode 100644
index 2dcbb657562..00000000000
--- a/i18n/ptb/extensions/typescript-language-features/out/features/updatePathsOnRename.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"reject.title": "Não",
-	"accept.title": "Sim"
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/typescript-language-features/out/typescriptServiceClient.i18n.json b/i18n/ptb/extensions/typescript-language-features/out/typescriptServiceClient.i18n.json
deleted file mode 100644
index 18d31ac5959..00000000000
--- a/i18n/ptb/extensions/typescript-language-features/out/typescriptServiceClient.i18n.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noServerFound": "O caminho {0} não aponta para uma instalação de tsserver válida. Voltando para a versão do TypeScript empacotada.",
-	"serverCouldNotBeStarted": "Servidor de linguagem TypeScript não pôde ser iniciado. Mensagem de erro é: {0}",
-	"typescript.openTsServerLog.notSupported": "Logging de TS Server requer TS TS 2.2.2+",
-	"typescript.openTsServerLog.loggingNotEnabled": "Logging de TS Server está desligado. Por favor configure 'typescript.tsserver.log' e reinicie o  TS Server para habilitar o log",
-	"typescript.openTsServerLog.enableAndReloadOption": "Habilitar logging e reniciar TS server",
-	"typescript.openTsServerLog.noLogFile": "O TS Server não iniciou o logging.",
-	"openTsServerLog.openFileFailedFailed": "Não foi possível abrir o arquivo de log do TS Server",
-	"serverDiedAfterStart": "O serviço de linguagem TypeScript morreu 5 vezes depois que começou. O serviço não será reiniciado.",
-	"serverDiedReportIssue": "Reportar Problema",
-	"serverDied": "O serviço TypeScript morreu inesperadamente 5 vezes nos últimos 5 minutos."
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/typescript-language-features/out/utils/api.i18n.json b/i18n/ptb/extensions/typescript-language-features/out/utils/api.i18n.json
deleted file mode 100644
index c723b32adb6..00000000000
--- a/i18n/ptb/extensions/typescript-language-features/out/utils/api.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"invalidVersion": "versão inválida"
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/typescript-language-features/out/utils/logger.i18n.json b/i18n/ptb/extensions/typescript-language-features/out/utils/logger.i18n.json
deleted file mode 100644
index 8f5ef5415b9..00000000000
--- a/i18n/ptb/extensions/typescript-language-features/out/utils/logger.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"channelName": "TypeScript"
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/typescript-language-features/out/utils/projectStatus.i18n.json b/i18n/ptb/extensions/typescript-language-features/out/utils/projectStatus.i18n.json
deleted file mode 100644
index 6cf4fd3d7e5..00000000000
--- a/i18n/ptb/extensions/typescript-language-features/out/utils/projectStatus.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hintExclude": "Para habilitar os recursos de linguagem JavaScript/TypeScipt em todo o projeto, excluir pastas com muitos arquivos, como: {0}",
-	"hintExclude.generic": "Para habilitar os recursos de linguagem JavaScript/TypeScipt em todo o projeto, excluir pastas grandes com arquivos em que você não trabalha.",
-	"large.label": "Configurar exclusões",
-	"hintExclude.tooltip": "Para habilitar os recursos de linguagem JavaScript/TypeScipt em todo o projeto, excluir pastas grandes com arquivos em que você não trabalha."
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/typescript-language-features/out/utils/typingsStatus.i18n.json b/i18n/ptb/extensions/typescript-language-features/out/utils/typingsStatus.i18n.json
deleted file mode 100644
index 26560f00bfe..00000000000
--- a/i18n/ptb/extensions/typescript-language-features/out/utils/typingsStatus.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"installingPackages": "Buscando dados para melhor IntelliSense do TypeScript",
-	"typesInstallerInitializationFailed.title": "Não foi possível instalar os arquivos de tipagem para recursos da linguagem JavaScript. Por favor, certifique-se que o NPM está instalado ou configure 'typescript.npm' em suas configurações de usuário. Clique [aqui]({0}) para mais informações.",
-	"typesInstallerInitializationFailed.doNotCheckAgain": "Não mostrar novamente"
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/typescript-language-features/out/utils/versionPicker.i18n.json b/i18n/ptb/extensions/typescript-language-features/out/utils/versionPicker.i18n.json
deleted file mode 100644
index 8f3cd072f30..00000000000
--- a/i18n/ptb/extensions/typescript-language-features/out/utils/versionPicker.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"useVSCodeVersionOption": "Use a versão do VS Code",
-	"useWorkspaceVersionOption": "Use a versão de área de trabalho",
-	"learnMore": "Saiba Mais",
-	"selectTsVersion": "Selecione a versão do TypeScript usada para os recursos de linguagem JavaScript e TypeScript"
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/typescript-language-features/out/utils/versionProvider.i18n.json b/i18n/ptb/extensions/typescript-language-features/out/utils/versionProvider.i18n.json
deleted file mode 100644
index ba136d68e8b..00000000000
--- a/i18n/ptb/extensions/typescript-language-features/out/utils/versionProvider.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"couldNotLoadTsVersion": "Não foi possível carregar a versão do TypeScript neste caminho",
-	"noBundledServerFound": "Tsserver do VS Code foi eliminado por outro aplicativo como uma ferramenta de detecção de vírus com um comportamento inadequado. Por favor reinstale o VS Code."
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/typescript-language-features/package.i18n.json b/i18n/ptb/extensions/typescript-language-features/package.i18n.json
deleted file mode 100644
index 57021d26fd9..00000000000
--- a/i18n/ptb/extensions/typescript-language-features/package.i18n.json
+++ /dev/null
@@ -1,58 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Recursos da Linguagem TypeScript e JavaScript",
-	"description": "Fornece suporte à linguagem rica pra JavaScript e TypeScript.",
-	"reloadProjects.title": "Recarregar Projeto",
-	"configuration.typescript": "TypeScript",
-	"typescript.useCodeSnippetsOnMethodSuggest.dec": "Funções completas com a assinatura do parâmetro.",
-	"typescript.tsdk.desc": "Especifica o caminho da pasta que contém os arquivos tsserver e lib*.d.ts para usar.",
-	"typescript.disableAutomaticTypeAcquisition": "Desabilita a aquisição automática de tipo. Requer TypeScript > = 2.0.6.",
-	"typescript.tsserver.log": "Habilita o log do servidor TS para um arquivo. Este log pode ser usado para diagnosticar problemas do servidor de TS. O log pode conter caminhos de arquivo, código-fonte e outras informações potencialmente confidenciais do seu projeto.",
-	"typescript.tsserver.pluginPaths": "Caminhos adicionais para descobrir os plugins do serviço de linguagem TypeScript. Requer TypeScript > = 2.3.0.",
-	"typescript.tsserver.pluginPaths.item": "Pode ser um caminho absoluto ou relativo. Caminho relativo será resolvido a partir da pasta da área de trabalho.",
-	"typescript.tsserver.trace": "Habilita o rastreamento de mensagens enviadas para o servidor de TS. Este rastreamento pode ser usado para diagnosticar problemas do servidor de TS. O rastreamento pode conter caminhos de arquivo, código-fonte e outras informações potencialmente confidenciais do seu projeto.",
-	"typescript.validate.enable": "Habilita/Desabilita a validação TypeScript.",
-	"typescript.format.enable": "Habilita/Desabilita o formatador padrão TypeScript.",
-	"javascript.format.enable": "Habilita/Desabilita o formatador padrão JavaScript.",
-	"format.insertSpaceAfterCommaDelimiter": "Define o tratamento de espaços após um delimitador vírgula.",
-	"format.insertSpaceAfterConstructor": "Define a manipulação de espaços após a palavra-chave do construtor. Requer TypeScript > = 2.3.0.",
-	"format.insertSpaceAfterSemicolonInForStatements": "Define o tratamento de espaços após um ponto e vírgula para um comando.",
-	"format.insertSpaceBeforeAndAfterBinaryOperators": "Define o tratamento de espaços após um operador binário.",
-	"format.insertSpaceAfterKeywordsInControlFlowStatements": "Define o tratamento de espaços após palavras-chave em um comando de controle de fluxo.",
-	"format.insertSpaceAfterFunctionKeywordForAnonymousFunctions": "Define o tratamento de espaços após uma palavra-chave de função para funções anônimas.",
-	"format.insertSpaceBeforeFunctionParenthesis": "Define a manipulação de espaços antes de parênteses do argumento de função. Requer TypeScript > = 2.1.5.",
-	"format.insertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis": "Define a manipulação de espaços após abrir e antes de fechar parênteses não vazios.",
-	"format.insertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets": "Define a manipulação de espaços após abrir e antes de fechar colchetes não vazios.",
-	"format.insertSpaceAfterOpeningAndBeforeClosingNonemptyBraces": "Define o espaço de manipulação após a abertura e antes de fechar chaves não vazias. Requer TypeScript >= 2.3.0.",
-	"format.insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces": "Define a manipulação de espaços após abrir e antes de fechar chaves de cadeias de caracteres de modelos. Requer TypeScript >= 2.0.6.",
-	"format.insertSpaceAfterOpeningAndBeforeClosingJsxExpressionBraces": "Define a manipulação de espaços após abrir e antes de fechar chaves de expressões JSX. Requer TypeScript >= 2.0.6.",
-	"format.insertSpaceAfterTypeAssertion": "Define a manipulação de espaços após asserções de tipo em TypeScript. Requer TypeScript >= 2,4.",
-	"format.placeOpenBraceOnNewLineForFunctions": "Define-se uma chave de abertura é colocada em uma nova linha para funções ou não.",
-	"format.placeOpenBraceOnNewLineForControlBlocks": "Define-se uma chave de abertura é colocada em uma nova linha para blocos de controle ou não.",
-	"javascript.validate.enable": "Habilitar/Desabilitar validação JavaScript.",
-	"goToProjectConfig.title": "Ir para a Configuração do Projeto",
-	"javascript.referencesCodeLens.enabled": "Habilitar/desabilitar referências CodeLens em arquivos JavaScript.",
-	"typescript.referencesCodeLens.enabled": "Habilitar/desabilitar referências CodeLens em arquivos TypeScript. Requer TypeScript > = 2.0.6.",
-	"typescript.implementationsCodeLens.enabled": "Habilitar/desabilitar implementações CodeLens. Requer TypeScript > = 2.0.6.",
-	"typescript.openTsServerLog.title": "Abrir arquivo de log do servidor TS",
-	"typescript.restartTsServer": "Reiniciar o servidor TS",
-	"typescript.selectTypeScriptVersion.title": "Selecionar a versão do JavaScript",
-	"typescript.reportStyleChecksAsWarnings": "Reportar verificações de estilo como avisos",
-	"jsDocCompletion.enabled": "Habilitar/Desabilitar comentários JSDoc automáticos.",
-	"typescript.npm": "Especifica o caminho para o executável do NPM usado para Aquisição de Tipo Automático. Requer TypeScript > = 2.3.4.",
-	"typescript.check.npmIsInstalled": "Verificar se o NPM está instalado para aquisição automática de tipo.",
-	"javascript.nameSuggestions": "Habilitar/desabilitar incluindo nomes exclusivos do arquivo nas listas de sugestão de JavaScript.",
-	"typescript.tsc.autoDetect": "Controla a auto deteção das tarefas de tsc. 'off' desativa esse recurso. 'build' só cria tarefas de compilação de execução única. 'watch' cria apenas tarefas de compilação e monitoramento. 'on' cria ambas as tarefas de compilar e monitoramento. Padrão é 'on'.",
-	"typescript.problemMatchers.tsc.label": "Problemas TypeScript",
-	"typescript.problemMatchers.tscWatch.label": "Problemas TypeScript (modo observação)",
-	"typescript.quickSuggestionsForPaths": "Ativar/desativar sugestões rápidas quando estiver digitando um caminho de importação.",
-	"typescript.experimental.syntaxFolding": "Habilita/Desabilita a sintaxe dos marcadores de pastas ativas.",
-	"taskDefinition.tsconfig.description": "O arquivo tsconfig que define a compilação do TS.",
-	"javascript.suggestionActions.enabled": "Ativar/desativar o diagnóstico de sugestões para arquivos JavaScript no editor. Requer TypeScript > = 2.8"
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/typescript/out/commands.i18n.json b/i18n/ptb/extensions/typescript/out/commands.i18n.json
deleted file mode 100644
index 43bfcb4644a..00000000000
--- a/i18n/ptb/extensions/typescript/out/commands.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"typescript.projectConfigNoWorkspace": "Favor abrir uma pasta no VS Code para usar um projeto TypeScript ou JavaScript",
-	"typescript.projectConfigUnsupportedFile": "Não foi possível determinar o projeto TypeScript ou JavaScript. Tipo de arquivo não suportado",
-	"typescript.projectConfigCouldNotGetInfo": "Não foi possível determinar o projeto TypeScript ou JavaScript",
-	"typescript.noTypeScriptProjectConfig": "O arquivo não é parte do projeto TypeScript. Clique [aqui]({0}) para mais informações.",
-	"typescript.noJavaScriptProjectConfig": "O arquivo não é parte do projeto JavaScript. Clique [aqui]({0}) para mais informações.",
-	"typescript.configureTsconfigQuickPick": "Configurar tsconfig.json",
-	"typescript.configureJsconfigQuickPick": "Configurar jsconfig.json"
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/typescript/out/features/bufferSyncSupport.i18n.json b/i18n/ptb/extensions/typescript/out/features/bufferSyncSupport.i18n.json
deleted file mode 100644
index 3cc3ca76ce7..00000000000
--- a/i18n/ptb/extensions/typescript/out/features/bufferSyncSupport.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"versionMismatch": "Usando o TypeScript ({1}) para recursos do editor. TypeScript ({0}) está instalado globalmente em sua máquina. Erros no VS Code podem diferir dos erros TSC",
-	"moreInformation": "Mais informações",
-	"doNotCheckAgain": "Não verificar novamente",
-	"close": "Fechar",
-	"updateTscCheck": "Atualizada configuração de usuário 'typescript.check.tscVersion' para false "
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/typescript/out/features/completionItemProvider.i18n.json b/i18n/ptb/extensions/typescript/out/features/completionItemProvider.i18n.json
deleted file mode 100644
index 07ef27a5bcf..00000000000
--- a/i18n/ptb/extensions/typescript/out/features/completionItemProvider.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"selectCodeAction": "Selecione uma ação de código para aplicar",
-	"acquiringTypingsLabel": "Adquirindo digitações...",
-	"acquiringTypingsDetail": "Adquirindo definições de digitações para o Intellisense.",
-	"autoImportLabel": "Importação automática de {0}"
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/typescript/out/features/directiveCommentCompletionProvider.i18n.json b/i18n/ptb/extensions/typescript/out/features/directiveCommentCompletionProvider.i18n.json
deleted file mode 100644
index eafca22f53d..00000000000
--- a/i18n/ptb/extensions/typescript/out/features/directiveCommentCompletionProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"ts-check": "Habilita verificação semântica em um arquivo JavaScript. Deve estar no topo de um arquivo.",
-	"ts-nocheck": "Desabilita verificação semântica em um arquivo JavaScript. Deve estar no topo de um arquivo.",
-	"ts-ignore": "Suprime erros de @ts-check na próxima linha de um arquivo."
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/typescript/out/features/implementationsCodeLensProvider.i18n.json b/i18n/ptb/extensions/typescript/out/features/implementationsCodeLensProvider.i18n.json
deleted file mode 100644
index c0ccafb6005..00000000000
--- a/i18n/ptb/extensions/typescript/out/features/implementationsCodeLensProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"oneImplementationLabel": "1 implementação",
-	"manyImplementationLabel": "{0} implementações",
-	"implementationsErrorLabel": "Não foi possível determinar implementações"
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/typescript/out/features/jsDocCompletionProvider.i18n.json b/i18n/ptb/extensions/typescript/out/features/jsDocCompletionProvider.i18n.json
deleted file mode 100644
index 0f22e0563e3..00000000000
--- a/i18n/ptb/extensions/typescript/out/features/jsDocCompletionProvider.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"typescript.jsDocCompletionItem.documentation": "Comentário JSDoc"
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/typescript/out/features/quickFixProvider.i18n.json b/i18n/ptb/extensions/typescript/out/features/quickFixProvider.i18n.json
deleted file mode 100644
index 96d00a06bb5..00000000000
--- a/i18n/ptb/extensions/typescript/out/features/quickFixProvider.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"fixAllInFileLabel": "{0} (Reparar tudo no arquivo)"
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/typescript/out/features/referencesCodeLensProvider.i18n.json b/i18n/ptb/extensions/typescript/out/features/referencesCodeLensProvider.i18n.json
deleted file mode 100644
index fd899d96208..00000000000
--- a/i18n/ptb/extensions/typescript/out/features/referencesCodeLensProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"oneReferenceLabel": "1 referência",
-	"manyReferenceLabel": "{0} referências",
-	"referenceErrorLabel": "Não foi possível determinar as referências"
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/typescript/out/features/taskProvider.i18n.json b/i18n/ptb/extensions/typescript/out/features/taskProvider.i18n.json
deleted file mode 100644
index 083f9cdd4a2..00000000000
--- a/i18n/ptb/extensions/typescript/out/features/taskProvider.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"buildTscLabel": "compilar - {0}",
-	"buildAndWatchTscLabel": "monitorar - {0}"
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/typescript/out/typescriptMain.i18n.json b/i18n/ptb/extensions/typescript/out/typescriptMain.i18n.json
deleted file mode 100644
index 82e6c288fb1..00000000000
--- a/i18n/ptb/extensions/typescript/out/typescriptMain.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"typescript.projectConfigNoWorkspace": "Favor abrir uma pasta no VS Code para usar um projeto TypeScript ou JavaScript",
-	"typescript.projectConfigUnsupportedFile": "Não foi possível determinar o projeto TypeScript ou JavaScript. Tipo de arquivo não suportado",
-	"typescript.projectConfigCouldNotGetInfo": "Não foi possível determinar o projeto TypeScript ou JavaScript",
-	"typescript.noTypeScriptProjectConfig": "Arquivo não é parte de um projeto TypeScript",
-	"typescript.noJavaScriptProjectConfig": "Arquivo não é parte de um projeto JavaScript",
-	"typescript.configureTsconfigQuickPick": "Configurar tsconfig.json",
-	"typescript.configureJsconfigQuickPick": "Configurar jsconfig.json",
-	"typescript.projectConfigLearnMore": "Saber Mais"
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/typescript/out/typescriptServiceClient.i18n.json b/i18n/ptb/extensions/typescript/out/typescriptServiceClient.i18n.json
deleted file mode 100644
index 18d31ac5959..00000000000
--- a/i18n/ptb/extensions/typescript/out/typescriptServiceClient.i18n.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noServerFound": "O caminho {0} não aponta para uma instalação de tsserver válida. Voltando para a versão do TypeScript empacotada.",
-	"serverCouldNotBeStarted": "Servidor de linguagem TypeScript não pôde ser iniciado. Mensagem de erro é: {0}",
-	"typescript.openTsServerLog.notSupported": "Logging de TS Server requer TS TS 2.2.2+",
-	"typescript.openTsServerLog.loggingNotEnabled": "Logging de TS Server está desligado. Por favor configure 'typescript.tsserver.log' e reinicie o  TS Server para habilitar o log",
-	"typescript.openTsServerLog.enableAndReloadOption": "Habilitar logging e reniciar TS server",
-	"typescript.openTsServerLog.noLogFile": "O TS Server não iniciou o logging.",
-	"openTsServerLog.openFileFailedFailed": "Não foi possível abrir o arquivo de log do TS Server",
-	"serverDiedAfterStart": "O serviço de linguagem TypeScript morreu 5 vezes depois que começou. O serviço não será reiniciado.",
-	"serverDiedReportIssue": "Reportar Problema",
-	"serverDied": "O serviço TypeScript morreu inesperadamente 5 vezes nos últimos 5 minutos."
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/typescript/out/utils/api.i18n.json b/i18n/ptb/extensions/typescript/out/utils/api.i18n.json
deleted file mode 100644
index c723b32adb6..00000000000
--- a/i18n/ptb/extensions/typescript/out/utils/api.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"invalidVersion": "versão inválida"
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/typescript/out/utils/logger.i18n.json b/i18n/ptb/extensions/typescript/out/utils/logger.i18n.json
deleted file mode 100644
index 8f5ef5415b9..00000000000
--- a/i18n/ptb/extensions/typescript/out/utils/logger.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"channelName": "TypeScript"
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/typescript/out/utils/projectStatus.i18n.json b/i18n/ptb/extensions/typescript/out/utils/projectStatus.i18n.json
deleted file mode 100644
index 6cf4fd3d7e5..00000000000
--- a/i18n/ptb/extensions/typescript/out/utils/projectStatus.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hintExclude": "Para habilitar os recursos de linguagem JavaScript/TypeScipt em todo o projeto, excluir pastas com muitos arquivos, como: {0}",
-	"hintExclude.generic": "Para habilitar os recursos de linguagem JavaScript/TypeScipt em todo o projeto, excluir pastas grandes com arquivos em que você não trabalha.",
-	"large.label": "Configurar exclusões",
-	"hintExclude.tooltip": "Para habilitar os recursos de linguagem JavaScript/TypeScipt em todo o projeto, excluir pastas grandes com arquivos em que você não trabalha."
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/typescript/out/utils/typingsStatus.i18n.json b/i18n/ptb/extensions/typescript/out/utils/typingsStatus.i18n.json
deleted file mode 100644
index 26560f00bfe..00000000000
--- a/i18n/ptb/extensions/typescript/out/utils/typingsStatus.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"installingPackages": "Buscando dados para melhor IntelliSense do TypeScript",
-	"typesInstallerInitializationFailed.title": "Não foi possível instalar os arquivos de tipagem para recursos da linguagem JavaScript. Por favor, certifique-se que o NPM está instalado ou configure 'typescript.npm' em suas configurações de usuário. Clique [aqui]({0}) para mais informações.",
-	"typesInstallerInitializationFailed.doNotCheckAgain": "Não mostrar novamente"
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/typescript/out/utils/versionPicker.i18n.json b/i18n/ptb/extensions/typescript/out/utils/versionPicker.i18n.json
deleted file mode 100644
index 8f3cd072f30..00000000000
--- a/i18n/ptb/extensions/typescript/out/utils/versionPicker.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"useVSCodeVersionOption": "Use a versão do VS Code",
-	"useWorkspaceVersionOption": "Use a versão de área de trabalho",
-	"learnMore": "Saiba Mais",
-	"selectTsVersion": "Selecione a versão do TypeScript usada para os recursos de linguagem JavaScript e TypeScript"
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/typescript/out/utils/versionProvider.i18n.json b/i18n/ptb/extensions/typescript/out/utils/versionProvider.i18n.json
deleted file mode 100644
index ba136d68e8b..00000000000
--- a/i18n/ptb/extensions/typescript/out/utils/versionProvider.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"couldNotLoadTsVersion": "Não foi possível carregar a versão do TypeScript neste caminho",
-	"noBundledServerFound": "Tsserver do VS Code foi eliminado por outro aplicativo como uma ferramenta de detecção de vírus com um comportamento inadequado. Por favor reinstale o VS Code."
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/typescript/package.i18n.json b/i18n/ptb/extensions/typescript/package.i18n.json
deleted file mode 100644
index e2a4a798904..00000000000
--- a/i18n/ptb/extensions/typescript/package.i18n.json
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Recursos da Linguagem TypeScript e JavaScript",
-	"description": "Fornece suporte à linguagem rica pra JavaScript e TypeScript.",
-	"typescript.reloadProjects.title": "Recarregar Projeto",
-	"javascript.reloadProjects.title": "Recarregar Projeto",
-	"configuration.typescript": "TypeScript",
-	"typescript.useCodeSnippetsOnMethodSuggest.dec": "Funções completas com a assinatura do parâmetro.",
-	"typescript.tsdk.desc": "Especifica o caminho da pasta que contém os arquivos tsserver e lib*.d.ts para usar.",
-	"typescript.disableAutomaticTypeAcquisition": "Desabilita a aquisição automática de tipo. Requer TypeScript > = 2.0.6.",
-	"typescript.tsserver.log": "Habilita o log do servidor TS para um arquivo. Este log pode ser usado para diagnosticar problemas do servidor de TS. O log pode conter caminhos de arquivo, código-fonte e outras informações potencialmente confidenciais do seu projeto.",
-	"typescript.tsserver.trace": "Habilita o rastreamento de mensagens enviadas para o servidor de TS. Este rastreamento pode ser usado para diagnosticar problemas do servidor de TS. O rastreamento pode conter caminhos de arquivo, código-fonte e outras informações potencialmente confidenciais do seu projeto.",
-	"typescript.validate.enable": "Habilita/Desabilita a validação TypeScript.",
-	"typescript.format.enable": "Habilita/Desabilita o formatador padrão TypeScript.",
-	"javascript.format.enable": "Habilita/Desabilita o formatador padrão JavaScript.",
-	"format.insertSpaceAfterCommaDelimiter": "Define o tratamento de espaços após um delimitador vírgula.",
-	"format.insertSpaceAfterConstructor": "Define a manipulação de espaços após a palavra-chave do construtor. Requer TypeScript > = 2.3.0.",
-	"format.insertSpaceAfterSemicolonInForStatements": "Define o tratamento de espaços após um ponto e vírgula para um comando.",
-	"format.insertSpaceBeforeAndAfterBinaryOperators": "Define o tratamento de espaços após um operador binário.",
-	"format.insertSpaceAfterKeywordsInControlFlowStatements": "Define o tratamento de espaços após palavras-chave em um comando de controle de fluxo.",
-	"format.insertSpaceAfterFunctionKeywordForAnonymousFunctions": "Define o tratamento de espaços após uma palavra-chave de função para funções anônimas.",
-	"format.insertSpaceBeforeFunctionParenthesis": "Define a manipulação de espaços antes de parênteses do argumento de função. Requer TypeScript > = 2.1.5.",
-	"format.insertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis": "Define a manipulação de espaços após abrir e antes de fechar parênteses não vazios.",
-	"format.insertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets": "Define a manipulação de espaços após abrir e antes de fechar colchetes não vazios.",
-	"format.insertSpaceAfterOpeningAndBeforeClosingNonemptyBraces": "Define a manipulação de espaços após abrir e antes de fechar chaves não vazias. Requer TypeScript >= 2.3.0.",
-	"format.insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces": "Define a manipulação de espaços após abrir e antes de fechar chaves de cadeias de caracteres de modelos. Requer TypeScript >= 2.0.6.",
-	"format.insertSpaceAfterOpeningAndBeforeClosingJsxExpressionBraces": "Define a manipulação de espaços após abrir e antes de fechar chaves de expressões JSX. Requer TypeScript >= 2.0.6.",
-	"format.insertSpaceAfterTypeAssertion": "Define a manipulação de espaços após asserções de tipo em TypeScript. Requer TypeScript >= 2,4.",
-	"format.placeOpenBraceOnNewLineForFunctions": "Define-se uma chave de abertura é colocada em uma nova linha para funções ou não.",
-	"format.placeOpenBraceOnNewLineForControlBlocks": "Define-se uma chave de abertura é colocada em uma nova linha para blocos de controle ou não.",
-	"javascript.validate.enable": "Habilitar/Desabilitar validação JavaScript.",
-	"typescript.goToProjectConfig.title": "Ir para a Configuração do Projeto",
-	"javascript.goToProjectConfig.title": "Ir para a Configuração do Projeto",
-	"javascript.referencesCodeLens.enabled": "Habilitar/desabilitar referências CodeLens em arquivos JavaScript.",
-	"typescript.referencesCodeLens.enabled": "Habilitar/desabilitar referências CodeLens em arquivos TypeScript. Requer TypeScript > = 2.0.6.",
-	"typescript.implementationsCodeLens.enabled": "Habilitar/desabilitar implementações CodeLens. Requer TypeScript > = 2.0.6.",
-	"typescript.openTsServerLog.title": "Abrir arquivo de log do servidor TS",
-	"typescript.restartTsServer": "Reiniciar o servidor TS",
-	"typescript.selectTypeScriptVersion.title": "Selecionar a versão do JavaScript",
-	"typescript.reportStyleChecksAsWarnings": "Relatório de verificações de estilo como avisos",
-	"jsDocCompletion.enabled": "Habilitar/Desabilitar comentários JSDoc automáticos.",
-	"javascript.implicitProjectConfig.checkJs": "Habilitar/desabilitar verificação semântica de arquivos JavaScript. Os arquivos existentes  jsconfig.json ou tsconfig.json substituem essa configuração. Requer TypeScript > = 2.3.1.",
-	"typescript.npm": "Especifica o caminho para o executável do NPM usado para Aquisição de Tipo Automático. Requer TypeScript > = 2.3.4.",
-	"typescript.check.npmIsInstalled": "Verificar se o NPM está instalado para aquisição automática de tipo.",
-	"javascript.nameSuggestions": "Habilitar/desabilitar incluindo nomes exclusivos do arquivo nas listas de sugestão de JavaScript.",
-	"typescript.tsc.autoDetect": "Controla a auto deteção das tarefas de tsc. 'off' desativa esse recurso. 'build' só cria tarefas de compilação de execução única. 'watch' cria apenas tarefas de compilação e monitoramento. 'on' cria ambas as tarefas de compilar e monitoramento. Padrão é 'on'.",
-	"typescript.problemMatchers.tsc.label": "Problemas TypeScript",
-	"typescript.problemMatchers.tscWatch.label": "Problemas TypeScript (modo observação)",
-	"typescript.quickSuggestionsForPaths": "Ativar/desativar sugestões rápidas quando estiver digitando um caminho de importação.",
-	"typescript.locale": "Define a localidade usada para relatar erros TypeScript. Requer TypeScript > = 2.6.0. Padrão 'null' usa a localidade do VS Code para erros TypeScript.",
-	"javascript.implicitProjectConfig.experimentalDecorators": "Ativar/desativar 'experimentalDecorators' para arquivos JavaScript que não fazem parte de um projeto. Os arquivos existentes de jsconfig.json ou tsconfig.json substituem essa configuração. Requer TypeScript >= 2.3.1.",
-	"typescript.autoImportSuggestions.enabled": "Ativar/desativar sugestões de importação automática. Requer TypeScript >= 2.6.1",
-	"typescript.experimental.syntaxFolding": "Habilita/Desabilita a sintaxe dos marcadores de pastas ativas.",
-	"taskDefinition.tsconfig.description": "O arquivo tsconfig que define a compilação de TS."
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/vb/package.i18n.json b/i18n/ptb/extensions/vb/package.i18n.json
deleted file mode 100644
index eaf6b99fa56..00000000000
--- a/i18n/ptb/extensions/vb/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Noções Básicas Sobre a Linguagem Visual Basic",
-	"description": "Fornece trechos, destaque de sintaxe, correspondência de colchetes e oclusão em arquivos do Visual Basic."
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/xml/package.i18n.json b/i18n/ptb/extensions/xml/package.i18n.json
deleted file mode 100644
index a5b08901983..00000000000
--- a/i18n/ptb/extensions/xml/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Noções Básicas Sobre a Linguagem XML",
-	"description": "Fornece realce de sintaxe e suporte a correspondência de colchetes em arquivos XML."
-}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/yaml/package.i18n.json b/i18n/ptb/extensions/yaml/package.i18n.json
deleted file mode 100644
index 4a6a3b45e48..00000000000
--- a/i18n/ptb/extensions/yaml/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Noções Básicas Sobre a Linguagem YAML",
-	"description": "Fornece realce de sintaxe e suporte a correspondência de colchetes em arquivos YAML."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/base/browser/ui/actionbar/actionbar.i18n.json b/i18n/ptb/src/vs/base/browser/ui/actionbar/actionbar.i18n.json
deleted file mode 100644
index 309631273fe..00000000000
--- a/i18n/ptb/src/vs/base/browser/ui/actionbar/actionbar.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"titleLabel": "{0} ({1})"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/base/browser/ui/aria/aria.i18n.json b/i18n/ptb/src/vs/base/browser/ui/aria/aria.i18n.json
deleted file mode 100644
index c31f5d65bda..00000000000
--- a/i18n/ptb/src/vs/base/browser/ui/aria/aria.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"repeated": "{0} (ocorreu novamente)"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/base/browser/ui/findinput/findInput.i18n.json b/i18n/ptb/src/vs/base/browser/ui/findinput/findInput.i18n.json
deleted file mode 100644
index 8cccc6aacb5..00000000000
--- a/i18n/ptb/src/vs/base/browser/ui/findinput/findInput.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"defaultLabel": "entrada"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/base/browser/ui/findinput/findInputCheckboxes.i18n.json b/i18n/ptb/src/vs/base/browser/ui/findinput/findInputCheckboxes.i18n.json
deleted file mode 100644
index 7fd5eb166a2..00000000000
--- a/i18n/ptb/src/vs/base/browser/ui/findinput/findInputCheckboxes.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"caseDescription": "Diferenciar Maiúsculas de Minúsculas",
-	"wordsDescription": "Coincidir Palavra Inteira",
-	"regexDescription": "Usar Expressão Regular"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/base/browser/ui/inputbox/inputBox.i18n.json b/i18n/ptb/src/vs/base/browser/ui/inputbox/inputBox.i18n.json
deleted file mode 100644
index 123e573a4b2..00000000000
--- a/i18n/ptb/src/vs/base/browser/ui/inputbox/inputBox.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"alertErrorMessage": "Erro: {0}",
-	"alertWarningMessage": "Aviso: {0}",
-	"alertInfoMessage": "Informações: {0}"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/base/browser/ui/resourceviewer/resourceViewer.i18n.json b/i18n/ptb/src/vs/base/browser/ui/resourceviewer/resourceViewer.i18n.json
deleted file mode 100644
index 106511f9f75..00000000000
--- a/i18n/ptb/src/vs/base/browser/ui/resourceviewer/resourceViewer.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"imgMeta": "{0}x{1} {2}",
-	"largeImageError": "A imagem é muito grande para ser exibida no editor.",
-	"resourceOpenExternalButton": "Abrir imagem usando um programa externo?",
-	"nativeBinaryError": "O arquivo não pode ser exibido no editor porque é binário, muito grande ou usa uma codificação de texto sem suporte.",
-	"sizeB": "{0}B",
-	"sizeKB": "{0}KB",
-	"sizeMB": "{0}MB",
-	"sizeGB": "{0}GB",
-	"sizeTB": "{0}TB"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json b/i18n/ptb/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json
deleted file mode 100644
index 750d811d866..00000000000
--- a/i18n/ptb/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"selectAriaOption": "{0}"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/base/browser/ui/toolbar/toolbar.i18n.json b/i18n/ptb/src/vs/base/browser/ui/toolbar/toolbar.i18n.json
deleted file mode 100644
index b497c2af7f8..00000000000
--- a/i18n/ptb/src/vs/base/browser/ui/toolbar/toolbar.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"more": "Mais"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/base/common/errorMessage.i18n.json b/i18n/ptb/src/vs/base/common/errorMessage.i18n.json
deleted file mode 100644
index f26ad834e75..00000000000
--- a/i18n/ptb/src/vs/base/common/errorMessage.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"stackTrace.format": "{0}: {1}",
-	"error.defaultMessage": "Ocorreu um erro desconhecido. Consulte o log para obter mais detalhes.",
-	"nodeExceptionMessage": "Ocorreu um erro de sistema ({0})",
-	"error.moreErrors": "{0} ({1} erros no total)"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/base/common/jsonErrorMessages.i18n.json b/i18n/ptb/src/vs/base/common/jsonErrorMessages.i18n.json
deleted file mode 100644
index c0df2b99ce9..00000000000
--- a/i18n/ptb/src/vs/base/common/jsonErrorMessages.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"error.invalidSymbol": "Símbolo inválido",
-	"error.invalidNumberFormat": "Formato de número inválido",
-	"error.propertyNameExpected": "Nome de propriedade esperado",
-	"error.valueExpected": "Valor esperado",
-	"error.colonExpected": "Dois-pontos esperado",
-	"error.commaExpected": "Vírgula esperada",
-	"error.closeBraceExpected": "Chave de fechamento esperada",
-	"error.closeBracketExpected": "Colchete de fechamento esperado",
-	"error.endOfFileExpected": "Fim do arquivo esperado"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/base/common/keybindingLabels.i18n.json b/i18n/ptb/src/vs/base/common/keybindingLabels.i18n.json
deleted file mode 100644
index 88f9db8bef5..00000000000
--- a/i18n/ptb/src/vs/base/common/keybindingLabels.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"ctrlKey": "Ctrl",
-	"shiftKey": "Shift",
-	"altKey": "Alt",
-	"windowsKey": "Windows",
-	"ctrlKey.long": "Control",
-	"shiftKey.long": "Shift",
-	"altKey.long": "Alt",
-	"cmdKey.long": "Command",
-	"windowsKey.long": "Windows"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/base/common/processes.i18n.json b/i18n/ptb/src/vs/base/common/processes.i18n.json
deleted file mode 100644
index 165322e5952..00000000000
--- a/i18n/ptb/src/vs/base/common/processes.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"ExecutableParser.commandMissing": "Erro: informações de executável devem definir um comando do tipo string",
-	"ExecutableParser.isShellCommand": "Aviso: IsShellCommand deve ser to tipo booleano. Ignorando valor {0}",
-	"ExecutableParser.args": "Aviso: args deve ser do tipo string[]. Ignorando valor {0}.",
-	"ExecutableParser.invalidCWD": "Aviso: options.cwd deve ser do tipo string. Ignorando valor {0}."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/base/common/severity.i18n.json b/i18n/ptb/src/vs/base/common/severity.i18n.json
deleted file mode 100644
index 1b82ec1834e..00000000000
--- a/i18n/ptb/src/vs/base/common/severity.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"sev.error": "Erro",
-	"sev.warning": "Aviso",
-	"sev.info": "Informações"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/base/node/processes.i18n.json b/i18n/ptb/src/vs/base/node/processes.i18n.json
deleted file mode 100644
index 35229bd6699..00000000000
--- a/i18n/ptb/src/vs/base/node/processes.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	]
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/base/node/ps.i18n.json b/i18n/ptb/src/vs/base/node/ps.i18n.json
deleted file mode 100644
index 0e0f9b95d0e..00000000000
--- a/i18n/ptb/src/vs/base/node/ps.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"collecting": "Coletando informações de CPU e memória. Isso pode demorar alguns segundos."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/base/node/zip.i18n.json b/i18n/ptb/src/vs/base/node/zip.i18n.json
deleted file mode 100644
index 3f515a45c39..00000000000
--- a/i18n/ptb/src/vs/base/node/zip.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"incompleteExtract": "Incompleto. Encontradas {0} de {1} entradas",
-	"notFound": "{0} não encontrado dentro do zip."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/base/parts/quickopen/browser/quickOpenModel.i18n.json b/i18n/ptb/src/vs/base/parts/quickopen/browser/quickOpenModel.i18n.json
deleted file mode 100644
index d229eb02296..00000000000
--- a/i18n/ptb/src/vs/base/parts/quickopen/browser/quickOpenModel.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"quickOpenAriaLabelEntry": "{0}, seletor",
-	"quickOpenAriaLabel": "seletor"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/base/parts/quickopen/browser/quickOpenWidget.i18n.json b/i18n/ptb/src/vs/base/parts/quickopen/browser/quickOpenWidget.i18n.json
deleted file mode 100644
index d913bcb9784..00000000000
--- a/i18n/ptb/src/vs/base/parts/quickopen/browser/quickOpenWidget.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"quickOpenAriaLabel": "Seletor rápido. Digite para filtrar resultados.",
-	"treeAriaLabel": "Seletor rápido"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/base/parts/tree/browser/treeDefaults.i18n.json b/i18n/ptb/src/vs/base/parts/tree/browser/treeDefaults.i18n.json
deleted file mode 100644
index 0fa878b1ead..00000000000
--- a/i18n/ptb/src/vs/base/parts/tree/browser/treeDefaults.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"collapse": "Recolher"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json b/i18n/ptb/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
deleted file mode 100644
index ff2a8afaccd..00000000000
--- a/i18n/ptb/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"previewOnGitHub": "Pré-visualizar no GitHub",
-	"loadingData": "Carregando dados...",
-	"rateLimited": "Limite de consulta do GitHub excedido. Por favor, espere.",
-	"similarIssues": "Problemas semelhantes",
-	"open": "Abrir",
-	"closed": "Fechado",
-	"noSimilarIssues": "Nenhum problema semelhante encontrado",
-	"settingsSearchIssue": "Problema na Pesquisa de Configurações",
-	"bugReporter": "Relatório de Bug",
-	"featureRequest": "Solicitação de Recurso",
-	"performanceIssue": "Problema de Performance",
-	"stepsToReproduce": "Etapas para Reproduzir",
-	"bugDescription": "Nós suportamos Markdown no padrão GitHub. Você poderá editar o seu problema e adicionar capturas de tela quando nós o pré-visualizarmos no GitHub. ",
-	"performanceIssueDesciption": "Nós suportamos Markdown no padrão GitHub. Você poderá editar o seu problema e adicionar capturas de tela quando nós o pré-visualizarmos no GitHub. ",
-	"description": "Descrição",
-	"featureRequestDescription": "Nós suportamos Markdown no padrão GitHub. Você poderá editar o seu problema e adicionar capturas de tela quando nós o pré-visualizarmos no GitHub. ",
-	"expectedResults": "Resultado Esperado",
-	"settingsSearchResultsDescription": "Nós suportamos Markdown no padrão GitHub. Você poderá editar o seu problema e adicionar capturas de tela quando nós o pré-visualizarmos no GitHub. ",
-	"pasteData": "Nós escrevemos os dados necessários em sua área de transferência porque era muito grande para ser enviado. Por favor, Cole.",
-	"disabledExtensions": "Extensões estão desabilitadas"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json b/i18n/ptb/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
deleted file mode 100644
index 3d619632740..00000000000
--- a/i18n/ptb/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"completeInEnglish": "Por favor, preencha o formulário em inglês.",
-	"issueTypeLabel": "Isso é um",
-	"issueSourceLabel": "Arquivo na",
-	"vscode": "Visual Studio Code",
-	"extension": "Uma extensão",
-	"disableExtensionsLabelText": "Tente reproduzir o problema depois de {0}. Se o problema só se reproduz quando as extensões são ativas, provavelmente é um problema com uma extensão.",
-	"disableExtensions": "desabilitando todas as extensões e recarregando a janela",
-	"chooseExtension": "Extensão",
-	"issueTitleLabel": "Título",
-	"issueTitleRequired": "Por favor, digite um título.",
-	"titleLengthValidation": "O título é muito longo.",
-	"details": "Por favor informe detalhes."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/code/electron-browser/processExplorer/processExplorerMain.i18n.json b/i18n/ptb/src/vs/code/electron-browser/processExplorer/processExplorerMain.i18n.json
deleted file mode 100644
index cb137ddea53..00000000000
--- a/i18n/ptb/src/vs/code/electron-browser/processExplorer/processExplorerMain.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"name": "Nome",
-	"forceKillProcess": "Matar processo a força",
-	"copy": "Copiar",
-	"copyAll": "Copiar todos"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/code/electron-main/auth.i18n.json b/i18n/ptb/src/vs/code/electron-main/auth.i18n.json
deleted file mode 100644
index 82ba485e3a8..00000000000
--- a/i18n/ptb/src/vs/code/electron-main/auth.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"authRequire": "Autenticação de proxy necessária",
-	"proxyauth": "O proxy {0} requer autenticação."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/code/electron-main/logUploader.i18n.json b/i18n/ptb/src/vs/code/electron-main/logUploader.i18n.json
deleted file mode 100644
index 0d8ffc448c9..00000000000
--- a/i18n/ptb/src/vs/code/electron-main/logUploader.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"invalidEndpoint": "Destino para envio do log é inválido.",
-	"beginUploading": "Enviando...",
-	"didUploadLogs": "Envio bem-sucedido! ID do arquivo de Log: {0}",
-	"logUploadPromptHeader": "Você está prestes a fazer o envio de seus logs de sessão para um ponto de extremidade seguro da Microsoft e que apenas membros da equipe Microsoft e do time VS Code podem acessar.",
-	"logUploadPromptBody": "Logs de sessão podem conter informações pessoais como caminhos completos ou conteúdos de arquivos. Por favor revise e elimine seus arquivos de log de sessão aqui: '{0}'",
-	"logUploadPromptBodyDetails": "Ao continuar você confirma que você revisou e eliminou seus arquivos de log de sessão e que você concorda que a Microsoft use eles para depurar o VS Code.",
-	"logUploadPromptAcceptInstructions": "Por favor execute o code com '--upload-logs={0}' para proceder com o upload",
-	"postError": "Erro ao postar logs: {0}",
-	"responseError": "Erro ao postar logs. Recebido {0} — {1}",
-	"parseError": "Erro ao analisar a resposta",
-	"zipError": "Erro ao zipar logs: {0}"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/code/electron-main/main.i18n.json b/i18n/ptb/src/vs/code/electron-main/main.i18n.json
deleted file mode 100644
index 9130aa4e7f9..00000000000
--- a/i18n/ptb/src/vs/code/electron-main/main.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"secondInstanceNoResponse": "Outra instância de {0} está sendo executada, mas não está respondendo",
-	"secondInstanceNoResponseDetail": "Por favor, feche todas as outras instãncias e tente novamente.",
-	"secondInstanceAdmin": "Uma segunda instãncia de {0} já está sendo executada como administrador.",
-	"secondInstanceAdminDetail": "Por favor, feche a outra instãncia e tente novamente.",
-	"close": "&&Fechar"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/code/electron-main/menus.i18n.json b/i18n/ptb/src/vs/code/electron-main/menus.i18n.json
deleted file mode 100644
index a0ea065a8bc..00000000000
--- a/i18n/ptb/src/vs/code/electron-main/menus.i18n.json
+++ /dev/null
@@ -1,191 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"mFile": "&&Arquivo",
-	"mEdit": "&&Editar",
-	"mSelection": "&&Seleção",
-	"mView": "&&Visualizar",
-	"mGoto": "&&Ir",
-	"mDebug": "&&Depurar",
-	"mWindow": "Janela",
-	"mHelp": "&&Ajuda",
-	"mTask": "&&Tarefas",
-	"miNewWindow": "Nova &&Janela",
-	"mAbout": "Sobre {0}",
-	"mServices": "Serviços",
-	"mHide": "Ocultar {0}",
-	"mHideOthers": "Ocultar Outros",
-	"mShowAll": "Mostrar Tudo",
-	"miQuit": "Sair de {0}",
-	"miNewFile": "&&Novo Arquivo",
-	"miOpen": "&&Abrir",
-	"miOpenWorkspace": "Abrir &&Espaço de Trabalho...",
-	"miOpenFolder": "Abrir &&Pasta",
-	"miOpenFile": "&&Abrir Arquivo",
-	"miOpenRecent": "Abrir &&Recente",
-	"miSaveWorkspaceAs": "Salvar Espaço de Trabalho Como...",
-	"miAddFolderToWorkspace": "A&&dicionar Pasta para o Espaço de Trabalho...",
-	"miSave": "&&Salvar",
-	"miSaveAs": "Salvar &&Como...",
-	"miSaveAll": "Salvar &&Tudo",
-	"miAutoSave": "Salvar Automaticamente",
-	"miRevert": "Re&&verter Arquivo",
-	"miCloseWindow": "Fe&&char Janela",
-	"miCloseWorkspace": "Fechar &&Espaço de Trabalho",
-	"miCloseFolder": "Fechar &&Pasta",
-	"miCloseEditor": "Fechar &&Editor",
-	"miExit": "Sai&&r",
-	"miOpenSettings": "&&Configurações",
-	"miOpenKeymap": "Atalhos de &&Teclado",
-	"miOpenKeymapExtensions": "Extensões de &&Mapeamento de Teclado",
-	"miOpenSnippets": "Trechos de Có&&digo do Usuário",
-	"miSelectColorTheme": "Cor do T&&ema",
-	"miSelectIconTheme": "&&Ícone de Arquivo do Tema",
-	"miPreferences": "&&Preferências",
-	"miReopenClosedEditor": "&&Reabrir Editor Fechado",
-	"miMore": "&&Mais...",
-	"miClearRecentOpen": "&&Limpar Abertos Recentemente",
-	"miUndo": "&&Desfazer",
-	"miRedo": "&&Refazer",
-	"miCut": "Cor&&tar",
-	"miCopy": "&&Copiar",
-	"miPaste": "Co&&lar",
-	"miFind": "&&Localizar",
-	"miReplace": "&&Substituir",
-	"miFindInFiles": "Localizar &&nos Arquivos",
-	"miReplaceInFiles": "Substituir &&nos Arquivos",
-	"miEmmetExpandAbbreviation": "Emmet: E&&xpandir Abreviação",
-	"miShowEmmetCommands": "E&&mmet...",
-	"miToggleLineComment": "&&Alternar Comentário de Linha",
-	"miToggleBlockComment": "Alternar Comentário de &&Bloco",
-	"miMultiCursorAlt": "Troque para Alt+clique para Multi-Cursor",
-	"miMultiCursorCmd": "Troque para Cmd+clique para Multi-Cursor",
-	"miMultiCursorCtrl": "Troque para Ctrl+clique para Multi-Cursor",
-	"miInsertCursorAbove": "&&Inserir cursor acima",
-	"miInsertCursorBelow": "Inserir cursor a&&baixo",
-	"miInsertCursorAtEndOfEachLineSelected": "Adicionar C&&ursores ao Final das Linhas",
-	"miAddSelectionToNextFindMatch": "Adicionar &&próxima ocorrência",
-	"miAddSelectionToPreviousFindMatch": "Adicionar  ocorrência a&&nterior ",
-	"miSelectHighlights": "Selecionar todas as &&ocorrências",
-	"miCopyLinesUp": "&&Copiar linha acima",
-	"miCopyLinesDown": "C&&opiar linha abaixo",
-	"miMoveLinesUp": "Mo&&ver linha para cima",
-	"miMoveLinesDown": "Mover &&linha para baixo",
-	"miSelectAll": "&&Selecionar Tudo",
-	"miSmartSelectGrow": "&&Expandir seleção",
-	"miSmartSelectShrink": "&&Reduzir seleção",
-	"miViewExplorer": "&&Explorador",
-	"miViewSearch": "&&Pesquisar",
-	"miViewSCM": "S&&CM",
-	"miViewDebug": "&&Depurar",
-	"miViewExtensions": "E&&xtensões",
-	"miToggleOutput": "&&Saída",
-	"miToggleDebugConsole": "Con&&sole de Depuração",
-	"miToggleIntegratedTerminal": "Terminal &&Integrado",
-	"miMarker": "&&Problemas",
-	"miCommandPalette": "&&Paleta de comando",
-	"miOpenView": "&&Abrir Visualização...",
-	"miToggleFullScreen": "Alternar &&Tela Inteira",
-	"miToggleZenMode": "Alternar modo Zen",
-	"miToggleCenteredLayout": "Alternar para Layout Centralizado",
-	"miToggleMenuBar": "Alternar &&Barra de Menus",
-	"miSplitEditor": "Dividir &&editor",
-	"miToggleEditorLayout": "Alternar &&Layout do Grupo de Editor",
-	"miToggleSidebar": "&&Alternar Barra Lateral",
-	"miMoveSidebarRight": "&&Mover a barra lateral para a direita",
-	"miMoveSidebarLeft": "&&Mover a barra lateral para a esquerda",
-	"miTogglePanel": "Alternar &&Painel",
-	"miHideStatusbar": "&&Ocultar Barra de Status",
-	"miShowStatusbar": "&&Mostrar Barra de Status",
-	"miHideActivityBar": "Ocultar Barra de &&Atividades",
-	"miShowActivityBar": "Mostrar Barra de &&Atividades",
-	"miToggleWordWrap": "Alternar &&Quebra de Linha",
-	"miToggleMinimap": "Alternar &&Painel",
-	"miToggleRenderWhitespace": "Alternar &&Renderização de Espaços em Branco",
-	"miToggleRenderControlCharacters": "Alternar &&Caracteres de Controle",
-	"miZoomIn": "&&Ampliar",
-	"miZoomOut": "Red&&uzir",
-	"miZoomReset": "&&Reinicializar Zoom",
-	"miBack": "&&Voltar",
-	"miForward": "&&Avançar",
-	"miNextEditor": "&&Próximo Editor",
-	"miPreviousEditor": "&&Editor Anterior",
-	"miNextEditorInGroup": "&&Próximo Editor Usado no Grupo",
-	"miPreviousEditorInGroup": "&&Editor Anterior Usado no Grupo",
-	"miSwitchEditor": "Trocar &&Editor",
-	"miFocusFirstGroup": "&&Primeiro Grupo",
-	"miFocusSecondGroup": "&&Segundo Grupo",
-	"miFocusThirdGroup": "&&Terceiro Grupo",
-	"miNextGroup": "&&Próximo Grupo",
-	"miPreviousGroup": "&&Grupo Anterior",
-	"miSwitchGroup": "Trocar &&Grupo",
-	"miGotoFile": "Ir para &&Arquivo...",
-	"miGotoSymbolInFile": "Ir para o &&Símbolo no Arquivo...",
-	"miGotoSymbolInWorkspace": "Ir para o Símbolo em &&Área de Trabalho",
-	"miGotoDefinition": "Ir para &&Definição",
-	"miGotoTypeDefinition": "Ir para a &&definição de tipo",
-	"miGotoImplementation": "Ir para a &&implementação",
-	"miGotoLine": "Ir para &&Linha...",
-	"miStartDebugging": "Iniciar Depuração",
-	"miStartWithoutDebugging": "Iniciar &&Sem Depuração",
-	"miStopDebugging": "&&Parar Depuração",
-	"miRestart Debugging": "&&Reiniciar Depuração",
-	"miOpenConfigurations": "Abrir &&Configurações",
-	"miAddConfiguration": "Adicionar Configuração...",
-	"miStepOver": "Pular &&Sobre",
-	"miStepInto": "Pular &&Dentro",
-	"miStepOut": "Pular &&Fora",
-	"miContinue": "&&Continuar",
-	"miToggleBreakpoint": "Alternar &&Ponto de Parada",
-	"miConditionalBreakpoint": "Ponto de Parada &&Condicional...",
-	"miFunctionBreakpoint": "Ponto de Parada de &&Função...",
-	"miNewBreakpoint": "&&Novo Ponto de Parada",
-	"miEnableAllBreakpoints": "Habilitar Todos os Pontos de Parada",
-	"miDisableAllBreakpoints": "Desabilitar T&&odos os Pontos de Parada",
-	"miRemoveAllBreakpoints": "Remover &&Todos os Pontos de Parada",
-	"miInstallAdditionalDebuggers": "&&Instalar Depuradores Adicionais...",
-	"mMinimize": "Minimizar",
-	"mZoom": "Ampliar",
-	"mBringToFront": "Trazer Tudo para a Frente",
-	"miSwitchWindow": "Alternar &&Janela...",
-	"mShowPreviousTab": "Mostrar a guia anterior",
-	"mShowNextTab": "Mostrar próxima guia",
-	"mMoveTabToNewWindow": "Mover guia para nova janela",
-	"mMergeAllWindows": "Mesclar todas as janelas",
-	"miToggleDevTools": "&&Alternar Ferramentas do Desenvolvedor",
-	"miAccessibilityOptions": "&&Opções de Acessibilidade",
-	"miOpenProcessExplorerer": "Abrir o &&Process Explorer",
-	"miReportIssue": "Reportar &&Problema",
-	"miWelcome": "&&Bem-vindo",
-	"miInteractivePlayground": "Playground &&Interativo",
-	"miDocumentation": "&&Documentação",
-	"miReleaseNotes": "&&Notas de Versão",
-	"miKeyboardShortcuts": "Referência de &&Atalhos de Teclado",
-	"miIntroductoryVideos": "&&Vídeos Introdutórios",
-	"miTipsAndTricks": "&&Dicas e truques",
-	"miTwitter": "&&Junte-se a nós no Twitter",
-	"miUserVoice": "&&Pesquisar Solicitações de Recursos",
-	"miLicense": "&&Exibir Licença",
-	"miPrivacyStatement": "&&Política de Privacidade",
-	"miAbout": "&&Sobre",
-	"miRunTask": "&&Executar Tarefa...",
-	"miBuildTask": "Executar Tarefa de &&compilação",
-	"miRunningTask": "Mostrar &&Tarefas Em Execução...",
-	"miRestartTask": "R&&einiciar Tarefa em Execução",
-	"miTerminateTask": "&&Finalizar Tarefa",
-	"miConfigureTask": "&& Configurar Tarefas...",
-	"miConfigureBuildTask": "Configurar Tarefas Padrão de Compilação...",
-	"accessibilityOptionsWindowTitle": "Opções de Acessibilidade",
-	"miCheckForUpdates": "Verificar Atualizações...",
-	"miCheckingForUpdates": "Verificando Atualizações...",
-	"miDownloadUpdate": "Baixar Atualização Disponível",
-	"miDownloadingUpdate": "Baixando Atualização...",
-	"miInstallUpdate": "Instalar Atualização...",
-	"miInstallingUpdate": "Instalando Atualização...",
-	"miRestartToUpdate": "Reinicie para Atualizar..."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/code/electron-main/window.i18n.json b/i18n/ptb/src/vs/code/electron-main/window.i18n.json
deleted file mode 100644
index 1c6c941418d..00000000000
--- a/i18n/ptb/src/vs/code/electron-main/window.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hiddenMenuBar": "Você ainda pode acessar a barra de menu pressionando a tecla Alt."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/code/electron-main/windows.i18n.json b/i18n/ptb/src/vs/code/electron-main/windows.i18n.json
deleted file mode 100644
index 25a098f0535..00000000000
--- a/i18n/ptb/src/vs/code/electron-main/windows.i18n.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"ok": "OK",
-	"pathNotExistTitle": "O caminho não existe",
-	"pathNotExistDetail": "Aparentemente o caminho {0} não existe mais no disco.",
-	"reopen": "&&Reabrir",
-	"wait": "&&Continuar Aguardando",
-	"close": "&&Fechar",
-	"appStalled": "A janela não está mais respondendo",
-	"appStalledDetail": "Você pode reabrir, fechar a janela ou continuar esperando.",
-	"appCrashed": "A janela foi fechada inesperadamente",
-	"appCrashedDetail": "Pedimos desculpas pelo inconveniente! Você pode reabrir a janela para continuar de onde parou.",
-	"open": "Abrir",
-	"openFolder": "Abrir Pasta",
-	"openFile": "Abrir Arquivo",
-	"workspaceOpenedMessage": "Não é possível salvar espaço de trabalho '{0}'",
-	"workspaceOpenedDetail": "O espaço de trabalho já está aberto em outra janela. Por favor, feche a janela primeiro e tente novamente.",
-	"openWorkspace": "&&Abrir",
-	"openWorkspaceTitle": "Abrir o Espaço de Trabalho",
-	"save": "&&Salvar",
-	"doNotSave": "&&Não Salvar",
-	"cancel": "Cancelar",
-	"saveWorkspaceMessage": "Você quer salvar a sua configuração de área de trabalho como um arquivo?",
-	"saveWorkspaceDetail": "Salve seu espaço de trabalho se pretende abri-lo novamente.",
-	"saveWorkspace": "Salvar o espaço de trabalho"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/code/node/cliProcessMain.i18n.json b/i18n/ptb/src/vs/code/node/cliProcessMain.i18n.json
deleted file mode 100644
index d7b75a600b1..00000000000
--- a/i18n/ptb/src/vs/code/node/cliProcessMain.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"notFound": "Extensão '{0}' não encontrada.",
-	"notInstalled": "Extensão '{0}' não está instalada.",
-	"useId": "Certifique-se de usar a ID de extensão completa, incluindo o editor, por exemplo: {0}",
-	"successVsixInstall": "Extensão '{0}' foi instalada com sucesso!",
-	"cancelVsixInstall": "Cancelada a instalação da extensão '{0}'.",
-	"alreadyInstalled": "Extensão '{0}' já está instalada.",
-	"foundExtension": "Encontrado '{0}' na loja VS Code.",
-	"installing": "Instalando...",
-	"successInstall": "Extensão '{0}' v {1} foi instalada com sucesso!",
-	"uninstalling": "Desinstalando {0}...",
-	"successUninstall": "Extensão '{0}' foi desinstalada com sucesso!"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/editor/browser/services/bulkEdit.i18n.json b/i18n/ptb/src/vs/editor/browser/services/bulkEdit.i18n.json
deleted file mode 100644
index f86add7197c..00000000000
--- a/i18n/ptb/src/vs/editor/browser/services/bulkEdit.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"summary.0": "Não foram feitas edições",
-	"summary.nm": "Feitas {0} edições de texto em {1} arquivos",
-	"summary.n0": "Feitas {0} edições de texto em um arquivo",
-	"conflict": "Estes arquivos foram alterados nesse meio tempo: {0}"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/editor/browser/widget/codeEditorWidget.i18n.json b/i18n/ptb/src/vs/editor/browser/widget/codeEditorWidget.i18n.json
deleted file mode 100644
index ddb215a585a..00000000000
--- a/i18n/ptb/src/vs/editor/browser/widget/codeEditorWidget.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"cursors.maximum": "O número de cursores foi limitado a {0}."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/editor/browser/widget/diffEditorWidget.i18n.json b/i18n/ptb/src/vs/editor/browser/widget/diffEditorWidget.i18n.json
deleted file mode 100644
index e0f2b782787..00000000000
--- a/i18n/ptb/src/vs/editor/browser/widget/diffEditorWidget.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"diff.tooLarge": "Não é possível comparar os arquivos pois um deles é muito grande."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/editor/browser/widget/diffReview.i18n.json b/i18n/ptb/src/vs/editor/browser/widget/diffReview.i18n.json
deleted file mode 100644
index 073825f3f56..00000000000
--- a/i18n/ptb/src/vs/editor/browser/widget/diffReview.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"label.close": "Fechar",
-	"more_lines": "{0} linhas",
-	"blankLine": "branco",
-	"equalLine": "original {0}, modificados {1}: {2}",
-	"insertLine": "+ modificado {0}: {1}",
-	"deleteLine": "-original {0}: {1}",
-	"editor.action.diffReview.next": "Ir para a próxima diferença",
-	"editor.action.diffReview.prev": "Ir para a diferença anterior"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/editor/common/commonCodeEditor.i18n.json b/i18n/ptb/src/vs/editor/common/commonCodeEditor.i18n.json
deleted file mode 100644
index 35229bd6699..00000000000
--- a/i18n/ptb/src/vs/editor/common/commonCodeEditor.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	]
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/editor/common/config/commonEditorConfig.i18n.json b/i18n/ptb/src/vs/editor/common/config/commonEditorConfig.i18n.json
deleted file mode 100644
index 6c41dd22a5a..00000000000
--- a/i18n/ptb/src/vs/editor/common/config/commonEditorConfig.i18n.json
+++ /dev/null
@@ -1,115 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"editorConfigurationTitle": "Editor",
-	"fontFamily": "Controla a família de fontes.",
-	"fontWeight": "Controla o peso da fonte.",
-	"fontSize": "Controla o tamanho da fonte em pixels.",
-	"lineHeight": "Controla a altura da linha. Use 0 para computar a altura da linha a partir do tamanho da fonte.",
-	"letterSpacing": "Controla o espaçamento da letra em pixels.",
-	"lineNumbers.off": "Números de linhas não são renderizados.",
-	"lineNumbers.on": "Números de linhas são renderizados em números absolutos.",
-	"lineNumbers.relative": "Números de linhas são renderizadas como distância em linhas até a posição do cursor.",
-	"lineNumbers.interval": "Números de linhas são renderizados a cada 10 linhas.",
-	"rulers": "Renderiza réguas verticais após um certo número de caracteres de espaço. Use vários valores para várias réguas. Réguas não serão desenhadas se a matriz estiver vazia",
-	"wordSeparators": "Caracteres que serão usados como separadores de palavras ao fazer navegação relacionada a palavras ou operações",
-	"tabSize": "O número de espaços equivalentes a uma tabulação. Esta configuração é sobreposta com base no conteúdo do arquivo quando `editor.detectIndentation` está ligado.",
-	"tabSize.errorMessage": "Esperado 'número'. Note que o valor \"auto\" foi alterado pela configuração 'editor.detectIndentation'.",
-	"insertSpaces": "Insere espaços quanto pressionado Tab. Esta configuração é sobrescrita com base no conteúdo do arquivo quando 'editor.detectIndentation' está habilitado.",
-	"insertSpaces.errorMessage": "Esperado 'booleano'. Note que o valor \"auto\" foi alterado pela configuração 'editor.detectIndentation'.",
-	"detectIndentation": "Quando um arquivo está sendo aberto, 'editor.tabSize' e 'editor.insertSpace' será detectado com base no conteúdo do arquivo.",
-	"roundedSelection": "Controla se as seleções têm cantos arredondados",
-	"scrollBeyondLastLine": "Controla se o editor rolará além da última linha",
-	"smoothScrolling": "Controla se o editor irá rolar usando uma animação",
-	"minimap.enabled": "Controla se o mini mapa é exibido",
-	"minimap.side": "Controla o lado onde renderizar o minimapa.",
-	"minimap.showSlider": "Controla se o controle deslizante minimap é oculto automaticamente.",
-	"minimap.renderCharacters": "Renderizar os caracteres em uma linha (em oposição a blocos de caracteres)",
-	"minimap.maxColumn": "Limitar o tamanho de um mini-mapa para renderizar no máximo um número determinado de colunas",
-	"find.seedSearchStringFromSelection": "Controla se nós inicializamos a string de pesquisa na Ferramenta de Pesquisa a partir da seleção do editor",
-	"find.autoFindInSelection": "Controla se a configuração Find in Selection deve estar ativada quando vários caracteres ou linhas de texto estão selecionados no editor",
-	"find.globalFindClipboard": "Controla se a ferramenta Localizar deve ler ou modificar a área de transfência de busca compartilhada no macOS",
-	"wordWrap.off": "As linhas nunca serão quebradas.",
-	"wordWrap.on": "As linhas serão quebradas na largura de visualização",
-	"wordWrap.wordWrapColumn": "As linhas serão quebradas em `editor.wordWrapColumn`.",
-	"wordWrap.bounded": "As linhas serão quebradas no mínimo entre a largura de visualização e `editor.wordWrapColumn`.",
-	"wordWrap": "Controla como as linhas devem ser quebradas automaticamente. Pode ser:\n- 'off' (quebra automática de linha desabilitada)\n- 'on' (quebra automática de linha na largura da janela)\n- 'wordWrapColumn' (quebra automática no numero de colunas definido em  `editor.wordWrapColumn`) ou\n- 'bounded' (quebra automática em uma dimensão minima da janela e na largura configurada)",
-	"wordWrapColumn": "Controla a coluna de quebra de linha do editor quando editor.wordWrap` é 'wordWrapColumn' ou 'bounded'.",
-	"mouseWheelScrollSensitivity": "Um multiplicador a ser usado em \"deltaX\" e \"deltaY\" dos eventos de rolagem do botão de rolagem do mouse",
-	"multiCursorModifier.ctrlCmd": "Mapeia para 'Control' no Windows e Linux e para 'Command' no macOS.",
-	"multiCursorModifier.alt": "Mapeia para 'Alt' em Windows e Linux e para 'Option' em macOS.",
-	"multiCursorModifier": "O modificador a ser usado para adicionar vários cursores com o mouse. `ctrlCmd` mapeia para 'Control' no Windows e Linux e para 'Command' no macOS. Os gestos do mouse Ir para definição e Abrir Link irão adaptar-se de forma que eles não entrem em conflito com o modificador multicursor.",
-	"multiCursorMergeOverlapping": "Mesclar vários cursores quando eles estão sobrepostos.",
-	"quickSuggestions.strings": "Habilitar sugestões rápidas dentro de strings.",
-	"quickSuggestions.comments": "Habilitar sugestões rápidas dentro de comentários.",
-	"quickSuggestions.other": "Habilitar sugestões rápidas fora de strings e comentários.",
-	"quickSuggestions": "Controlar se sugestões devem aparecer automaticamente ao digitar",
-	"quickSuggestionsDelay": "Controla o atraso em ms após o qual sugestões rápidas serão exibidas",
-	"parameterHints": "Habilita pop-up que mostra documentação de parâmetros e o tipo de informação conforme você digita",
-	"autoClosingBrackets": "Controla se o editor deve fechar colchetes automaticamente depois de abri-los",
-	"formatOnType": "Controla se o editor deve formatar automaticamente a linha após a digitação",
-	"formatOnPaste": "Controla se o editor deve formatar automaticamente o conteúdo colado. Um formatador deve estar disponível e o formatador deve ser capaz de formatar apenas uma parte do documento.",
-	"autoIndent": "Controla se o editor deve ajustar automaticamente o recuo quando os usuários digitam, colam ou movem linhas. Regras de recuo da língua devem estar disponíveis.",
-	"suggestOnTriggerCharacters": "Controla se as sugestões devem aparecer automaticamente ao digitar caracteres de gatilho",
-	"acceptSuggestionOnEnter": "Controla se as sugestões devem ser aceitas com 'Enter' - em adição a 'Tab'. Ajuda a evitar a ambiguidade entre a inserção de novas linhas ou aceitar sugestões. O valor 'smart' significa apenas aceitar uma sugestão com Enter quando ela fizer uma mudança textual",
-	"acceptSuggestionOnCommitCharacter": "Controla se as sugestões devem ser aceitas em caracteres de confirmação. Por exemplo, em JavaScript, o ponto-e-vírgula (';') pode ser um caractere de confirmação que aceita uma sugestão e digita esse caractere.",
-	"snippetSuggestions.top": "Mostre sugestões de trecho acima de outras sugestões.",
-	"snippetSuggestions.bottom": "Mostre sugestões de trecho abaixo de outras sugestões.",
-	"snippetSuggestions.inline": "Mostre sugestões de trechos com outras sugestões.",
-	"snippetSuggestions.none": "Não mostre sugestões de trecho.",
-	"snippetSuggestions": "Controla se os snippets são exibidos juntamente com as outras sugestões e como eles são ordenados.",
-	"emptySelectionClipboard": "Controla se a cópia sem nenhuma seleção copia a linha atual.",
-	"wordBasedSuggestions": "Controla se o auto-completar deve ser calculado baseado nas palavras no documento.",
-	"suggestSelection.first": "Escolha sempre a primeira sugestão.",
-	"suggestSelection.recentlyUsed": "Selecionar sugestões recentes, a menos que digitações adicionais selecionem um, por exemplo, 'console.| -> console. log ' porque 'log' foi concluída recentemente.",
-	"suggestSelection.recentlyUsedByPrefix": "Selecionar sugestões baseadas em prefixos anteriores que completaram essas sugestões, por exemplo, 'co-> console' e 'con-> const'.",
-	"suggestSelection": "Controla como as sugestões são pré-selecionados quando estiver mostrando a lista de sugestões.",
-	"suggestFontSize": "Tamanho da fonte para a ferramenta de sugestão",
-	"suggestLineHeight": "Altura de linha para a ferramenta de sugestão",
-	"selectionHighlight": "Controla se o editor deve realçar correspondências semelhantes à seleção",
-	"occurrencesHighlight": "Controla se o editor deve realçar ocorrências de símbolos semânticos.",
-	"overviewRulerLanes": "Controla o número de decorações que podem ser exibidas na mesma posição na régua de visão geral",
-	"overviewRulerBorder": "Controla se deve desenhar uma borda ao redor da régua de visão geral.",
-	"cursorBlinking": "Controla o estilo de animação do cursor.",
-	"mouseWheelZoom": "Alterar o zoom da fonte editor quando utilizada a roda do mouse e pressionando Ctrl",
-	"cursorStyle": "Controla o estilo do cursor, os valores aceitos são 'block', 'block-outline', 'line', 'line-thin', 'underline' e 'underline-thin'",
-	"cursorWidth": "Controla a largura do cursor quando editor.cursorStyle está definido como 'line'",
-	"fontLigatures": "Habilita ligaduras de fontes",
-	"hideCursorInOverviewRuler": "Controla se o cursor deve ficar oculto na régua de visão geral.",
-	"renderWhitespace": "Controla como o editor deve rendenizar caracteres de espaços em branco, possibilidades são 'none', 'boundary' e 'all'. A opção 'boundary' não rendeniza espaços simples entre palavras.",
-	"renderControlCharacters": "Controla se o editor deve renderizar caracteres de controle",
-	"renderIndentGuides": "Controla se o editor deve renderizar guias de identação",
-	"renderLineHighlight": "Controla como o editor deve renderizar a linha atual, as possibilidades são 'none', 'gutter', 'line' e 'all'.",
-	"codeLens": "Controla se o editor mostra CodeLens",
-	"folding": "Controla se o editor tem codigo colapsível hablitado",
-	"foldingStrategyAuto": "Se disponível, use uma estratégia de dobramento específica de idioma, caso contrário, recua para a estratégia baseada na indentação.",
-	"foldingStrategyIndentation": "Sempre use a estratégia de dobragem baseada no indentação ",
-	"foldingStrategy": "Controla a maneira como os intervalos de dobra são calculados. As opções 'auto' usam uma estratégia de dobra específica de idioma, se disponível. 'indentação' força o uso da estratégia de dobragem baseada na indentação.",
-	"showFoldingControls": "Controla se os controles de desdobramento na divisão são ocultas automaticamente.",
-	"matchBrackets": "Realça colchetes correspondente quando um deles estiver selecionado.",
-	"glyphMargin": "Controla se o editor deve renderizar a margem vertical de ícones. A margem vertical de ícones é usada primordialmente na depuração",
-	"useTabStops": "Inserção e deleção de espaço em branco seguem a tabulação",
-	"trimAutoWhitespace": "Remove espaços em branco inseridos automaticamente no fim da linha",
-	"stablePeek": "Mantém os editores de visualização abertos mesmo quando clicando seu conteúdo ou teclando Escape.",
-	"dragAndDrop": "Controla se o editor deve permitir mover seleções via arrastar e soltar.",
-	"accessibilitySupport.auto": "O editor irá utilizar a plataforma da API para detectar quando um leitor de tela está conectado.",
-	"accessibilitySupport.on": "O editor será permanentemente otimizado para o uso de um leitor de tela.",
-	"accessibilitySupport.off": "O editor nunca será otimizado para o uso de um leitor de tela.",
-	"accessibilitySupport": "Controla quando o editor deve executar em modo otimizado para leitores de tela.",
-	"links": "Controla se o editor deve detectar links e torná-los clicáveis",
-	"colorDecorators": "Controla se o editor deve processar os decoradores de cor inline e o seletor de cores.",
-	"codeActions": "Habilita a ação de código lightbulb",
-	"codeActionsOnSave.organizeImports": "Executar organização de imports ao salvar?",
-	"codeActionsOnSave": "Tipos de ação de código a serem executadas ao salvar.",
-	"codeActionsOnSaveTimeout": "Tempo limite para ações de código executadas ao salvar.",
-	"selectionClipboard": "Controla se a área primária de transferência Linux deve ser suportada.",
-	"sideBySide": "Controla se o editor de diff mostra as diff lado a lado ou inline.",
-	"ignoreTrimWhitespace": "Controla se o editor de diff mostra alterações nos espaços iniciais ou finais como diferenças",
-	"largeFileOptimizations": "Tratamento especial para arquivos grandes para desabilitar determinados recursos que fazem uso intensivo de memória.",
-	"renderIndicators": "Controla se o editor de diff mostra indicadores +/- para alterações adicionadas/removidas"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/editor/common/config/editorOptions.i18n.json b/i18n/ptb/src/vs/editor/common/config/editorOptions.i18n.json
deleted file mode 100644
index 93e1fd825d8..00000000000
--- a/i18n/ptb/src/vs/editor/common/config/editorOptions.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"accessibilityOffAriaLabel": "O editor não está acessível neste momento. Por favor pressione Alt+F1 para opções.",
-	"editorViewAccessibleLabel": "Conteúdo do editor"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/editor/common/controller/cursor.i18n.json b/i18n/ptb/src/vs/editor/common/controller/cursor.i18n.json
deleted file mode 100644
index afdb1b1a523..00000000000
--- a/i18n/ptb/src/vs/editor/common/controller/cursor.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"corrupt.commands": "Exceção inesperada ao executar o comando."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/editor/common/model/textModelWithTokens.i18n.json b/i18n/ptb/src/vs/editor/common/model/textModelWithTokens.i18n.json
deleted file mode 100644
index fc3574b7fde..00000000000
--- a/i18n/ptb/src/vs/editor/common/model/textModelWithTokens.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"mode.tokenizationSupportFailed": "O modo falhou ao gerar token da entrada."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/editor/common/modes/modesRegistry.i18n.json b/i18n/ptb/src/vs/editor/common/modes/modesRegistry.i18n.json
deleted file mode 100644
index 8cb39d608a9..00000000000
--- a/i18n/ptb/src/vs/editor/common/modes/modesRegistry.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"plainText.alias": "Texto sem formatação"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/editor/common/services/bulkEdit.i18n.json b/i18n/ptb/src/vs/editor/common/services/bulkEdit.i18n.json
deleted file mode 100644
index 3fada6ebf53..00000000000
--- a/i18n/ptb/src/vs/editor/common/services/bulkEdit.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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": "Estes arquivos foram alterados nesse meio tempo: {0}",
-	"summary.0": "Não foram feitas edições",
-	"summary.nm": "Feitas {0} edições de texto em {1} arquivos",
-	"summary.n0": "Feitas {0} edições de texto em um arquivo"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/editor/common/services/modeServiceImpl.i18n.json b/i18n/ptb/src/vs/editor/common/services/modeServiceImpl.i18n.json
deleted file mode 100644
index 85f2d2943f6..00000000000
--- a/i18n/ptb/src/vs/editor/common/services/modeServiceImpl.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"vscode.extension.contributes.languages": "Contribui às declarações de linguagem.",
-	"vscode.extension.contributes.languages.id": "ID da linguagem",
-	"vscode.extension.contributes.languages.aliases": "Aliases de nome para esta linguagem.",
-	"vscode.extension.contributes.languages.extensions": "Extensões de arquivos associadas a esta linguagem",
-	"vscode.extension.contributes.languages.filenames": "Nome dos arquivos associados a esta linguagem",
-	"vscode.extension.contributes.languages.filenamePatterns": "Padrão glob de nomes de arquivos associados a linguagem.",
-	"vscode.extension.contributes.languages.mimetypes": "Tipos Mime associados à linguagem.",
-	"vscode.extension.contributes.languages.firstLine": "Uma expressão regular que coincide com a primeira linha de um arquivo da linguaguem.",
-	"vscode.extension.contributes.languages.configuration": "Um caminho relativo para um arquivo contendo opções de configuração para a linguagem."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/editor/common/services/modelServiceImpl.i18n.json b/i18n/ptb/src/vs/editor/common/services/modelServiceImpl.i18n.json
deleted file mode 100644
index 90b046865c5..00000000000
--- a/i18n/ptb/src/vs/editor/common/services/modelServiceImpl.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"diagAndSourceMultiline": "[{0}] {1}",
-	"diagAndSource": "[{0}] {1}"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/editor/common/view/editorColorRegistry.i18n.json b/i18n/ptb/src/vs/editor/common/view/editorColorRegistry.i18n.json
deleted file mode 100644
index 94d4e2ad2ee..00000000000
--- a/i18n/ptb/src/vs/editor/common/view/editorColorRegistry.i18n.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"lineHighlight": "Cor de fundo para a posição do cursor  na seleção de linhas.",
-	"lineHighlightBorderBox": "Cor de fundo para a borda em volta da linha na posição do cursor",
-	"rangeHighlight": "Cor de fundo dos intervalos selecionados, assim como da abertura instantânea e localização de recursos. A cor não deve ser opaca para evitar esconder as decorações subjacentes",
-	"rangeHighlightBorder": "Cor de fundo para a borda em volta do intervalo destacado.",
-	"caret": "Cor do cursor no editor.",
-	"editorCursorBackground": "A cor de fundo do cursor do editor. Permite customizar a cor de um caractere sobreposto pelo bloco do cursor.",
-	"editorWhitespaces": "Cor dos caracteres em branco no editor",
-	"editorIndentGuides": "Cor das guias de indentação do editor.",
-	"editorActiveIndentGuide": "Cor das guias de indentação do editor ativo.",
-	"editorLineNumbers": "Cor dos números de linha do editor.",
-	"editorActiveLineNumber": "Cor dos números de linhas do editor",
-	"deprecatedEditorActiveLineNumber": "Identificação foi descontinuado. Use 'editorLineNumber.activeForeground'  em vez disso.",
-	"editorRuler": "Cor das réguas do editor.",
-	"editorCodeLensForeground": "Cor do primeiro plano das lentes de código do editor",
-	"editorBracketMatchBackground": "Cor de fundo atrás do colchetes correspondentes",
-	"editorBracketMatchBorder": "Cor para as caixas de colchetes correspondentes",
-	"editorOverviewRulerBorder": "Cor da borda da régua de visão geral.",
-	"editorGutter": "Cor de fundo da separação do editor.O separador contém os glifos das margens e os números de linha.",
-	"errorForeground": "Cor do primeiro plano das linhas onduladas de erro no editor.",
-	"errorBorder": "Cor da borda das linhas onduladas de erro no editor.",
-	"warningForeground": "Cor do primeiro plano de linhas onduladas de aviso no editor.",
-	"warningBorder": "Cor da borda das linhas onduladas de aviso no editor.",
-	"infoForeground": "Cor do primeiro plano das linhas de informação no editor.",
-	"infoBorder": "Cor da borda das linhas de informação no editor.",
-	"hintForeground": "Cor de primeiro plano de linhas onduladas de dica no editor.",
-	"hintBorder": "Cor da borda de linhas onduladas de dica no editor.",
-	"unnecessaryForeground": "Cor de primeiro plano de código desnecessário no editor.",
-	"overviewRulerRangeHighlight": "Visão geral da cor do marcador da régua para destaques do intervalo. A cor não deve ser opaca para não esconder decorações subjacentes.",
-	"overviewRuleError": "Visão geral da cor do marcador da régua para erros.",
-	"overviewRuleWarning": "Visão geral da cor do marcador da régua para avisos.",
-	"overviewRuleInfo": "Visão geral da cor do marcador da régua para informações."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/editor/contrib/accessibility/browser/accessibility.i18n.json b/i18n/ptb/src/vs/editor/contrib/accessibility/browser/accessibility.i18n.json
deleted file mode 100644
index e045839f7c6..00000000000
--- a/i18n/ptb/src/vs/editor/contrib/accessibility/browser/accessibility.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"introMsg": "Obrigado por testar a opção de acessibilidade do VS Code.",
-	"status": "Status",
-	"tabFocusModeOnMsg": "Pressionando Tab no editor corrente irá mover o foco para o próximo elemento focável. Mude este comportamento ao pressionar {0}.",
-	"tabFocusModeOnMsgNoKb": "Pressionando Tab no editor corrente irá mover o foco para o próximo elemento focável. O comando {0} não pode ser ativado atualmente por uma tecla.",
-	"tabFocusModeOffMsg": "Pressionando Tab no editor atual irá inserir um caractere Tab. Mude este comportamente ao pressionar {0}.",
-	"tabFocusModeOffMsgNoKb": "Pressionando Tab no editor atual irá inserir um caractere Tab. O comando {0} não pode ser ativado atualmente por uma tecla.",
-	"outroMsg": "Você pode ignorar essa dica e retornar ao editor apertando a tecla ESC",
-	"ShowAccessibilityHelpAction": "Mostrar ajuda de acessibilidade"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/editor/contrib/bracketMatching/bracketMatching.i18n.json b/i18n/ptb/src/vs/editor/contrib/bracketMatching/bracketMatching.i18n.json
deleted file mode 100644
index 3455981fc0f..00000000000
--- a/i18n/ptb/src/vs/editor/contrib/bracketMatching/bracketMatching.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"overviewRulerBracketMatchForeground": "Visão geral da cor do marcador da régua para colchetes correspondentes.",
-	"smartSelect.jumpBracket": "Ir para colchete",
-	"smartSelect.selectToBracket": "Selecionar para colchetes."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/editor/contrib/bracketMatching/common/bracketMatching.i18n.json b/i18n/ptb/src/vs/editor/contrib/bracketMatching/common/bracketMatching.i18n.json
deleted file mode 100644
index 4af1753636d..00000000000
--- a/i18n/ptb/src/vs/editor/contrib/bracketMatching/common/bracketMatching.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"smartSelect.jumpBracket": "Ir para colchete"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/editor/contrib/caretOperations/caretOperations.i18n.json b/i18n/ptb/src/vs/editor/contrib/caretOperations/caretOperations.i18n.json
deleted file mode 100644
index 9616c1b2554..00000000000
--- a/i18n/ptb/src/vs/editor/contrib/caretOperations/caretOperations.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"caret.moveLeft": "Mover cursor para a esquerda",
-	"caret.moveRight": "Mover cursor para a direita"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/editor/contrib/caretOperations/common/caretOperations.i18n.json b/i18n/ptb/src/vs/editor/contrib/caretOperations/common/caretOperations.i18n.json
deleted file mode 100644
index 157105c4a35..00000000000
--- a/i18n/ptb/src/vs/editor/contrib/caretOperations/common/caretOperations.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"caret.moveLeft": "Mover cursor para a esquerda",
-	"caret.moveRight": "Mover cursor para a direita"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/editor/contrib/caretOperations/common/transpose.i18n.json b/i18n/ptb/src/vs/editor/contrib/caretOperations/common/transpose.i18n.json
deleted file mode 100644
index c1d3083b198..00000000000
--- a/i18n/ptb/src/vs/editor/contrib/caretOperations/common/transpose.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"transposeLetters.label": "Transport letras"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/editor/contrib/caretOperations/transpose.i18n.json b/i18n/ptb/src/vs/editor/contrib/caretOperations/transpose.i18n.json
deleted file mode 100644
index e060e5a2ff2..00000000000
--- a/i18n/ptb/src/vs/editor/contrib/caretOperations/transpose.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"transposeLetters.label": "Transport letras"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/editor/contrib/clipboard/browser/clipboard.i18n.json b/i18n/ptb/src/vs/editor/contrib/clipboard/browser/clipboard.i18n.json
deleted file mode 100644
index 903f9fc1086..00000000000
--- a/i18n/ptb/src/vs/editor/contrib/clipboard/browser/clipboard.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"actions.clipboard.cutLabel": "Recortar",
-	"actions.clipboard.copyLabel": "Copiar",
-	"actions.clipboard.pasteLabel": "Colar",
-	"actions.clipboard.copyWithSyntaxHighlightingLabel": "Copiar com realce de sintaxe"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/editor/contrib/clipboard/clipboard.i18n.json b/i18n/ptb/src/vs/editor/contrib/clipboard/clipboard.i18n.json
deleted file mode 100644
index fec8bf3345c..00000000000
--- a/i18n/ptb/src/vs/editor/contrib/clipboard/clipboard.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"actions.clipboard.cutLabel": "Recortar",
-	"actions.clipboard.copyLabel": "Copiar",
-	"actions.clipboard.pasteLabel": "Colar",
-	"actions.clipboard.copyWithSyntaxHighlightingLabel": "Copiar com realce de sintaxe"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/editor/contrib/codeAction/codeActionCommands.i18n.json b/i18n/ptb/src/vs/editor/contrib/codeAction/codeActionCommands.i18n.json
deleted file mode 100644
index 55678d3bef1..00000000000
--- a/i18n/ptb/src/vs/editor/contrib/codeAction/codeActionCommands.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"quickFixWithKb": "Mostrar correções ({0})",
-	"quickFix": "Mostrar correções",
-	"quickfix.trigger.label": "Correção Rápida...",
-	"refactor.label": "Refatorar...",
-	"source.label": "Ação de Origem...",
-	"editor.action.source.noneMessage": "Não há ações de origem disponíveis",
-	"organizeImports.label": "Organizar Imports",
-	"editor.action.organize.noneMessage": "Nenhuma ação de organização de imports disponível"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/editor/contrib/comment/comment.i18n.json b/i18n/ptb/src/vs/editor/contrib/comment/comment.i18n.json
deleted file mode 100644
index 9d2f3567faf..00000000000
--- a/i18n/ptb/src/vs/editor/contrib/comment/comment.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"comment.line": "Alternar Comentário de Linha",
-	"comment.line.add": "Adicionar Comentário de Linha",
-	"comment.line.remove": "Remover Comentário de Linha",
-	"comment.block": "Alternar Comentário de Bloco"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/editor/contrib/comment/common/comment.i18n.json b/i18n/ptb/src/vs/editor/contrib/comment/common/comment.i18n.json
deleted file mode 100644
index ff1ba569c0c..00000000000
--- a/i18n/ptb/src/vs/editor/contrib/comment/common/comment.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"comment.line": "Alternar Comentário de Linha",
-	"comment.line.add": "Adicionar Comentário de Linha",
-	"comment.line.remove": "Remover Comentário de Linha",
-	"comment.block": "Alternar Comentário de Bloco"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/editor/contrib/contextmenu/browser/contextmenu.i18n.json b/i18n/ptb/src/vs/editor/contrib/contextmenu/browser/contextmenu.i18n.json
deleted file mode 100644
index e2b1d946bee..00000000000
--- a/i18n/ptb/src/vs/editor/contrib/contextmenu/browser/contextmenu.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"action.showContextMenu.label": "Mostrar o menu de contexto do editor"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/editor/contrib/contextmenu/contextmenu.i18n.json b/i18n/ptb/src/vs/editor/contrib/contextmenu/contextmenu.i18n.json
deleted file mode 100644
index 2a21962b686..00000000000
--- a/i18n/ptb/src/vs/editor/contrib/contextmenu/contextmenu.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"action.showContextMenu.label": "Mostrar o menu de contexto do editor"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/editor/contrib/find/browser/findWidget.i18n.json b/i18n/ptb/src/vs/editor/contrib/find/browser/findWidget.i18n.json
deleted file mode 100644
index 1f4f15c5562..00000000000
--- a/i18n/ptb/src/vs/editor/contrib/find/browser/findWidget.i18n.json
+++ /dev/null
@@ -1,21 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"label.find": "Localizar",
-	"placeholder.find": "Localizar",
-	"label.previousMatchButton": "Correspondência anterior",
-	"label.nextMatchButton": "Próxima correspondência",
-	"label.toggleSelectionFind": "Localizar na seleção",
-	"label.closeButton": "Fechar",
-	"label.replace": "Substituir",
-	"placeholder.replace": "Substituir",
-	"label.replaceButton": "Substituir",
-	"label.replaceAllButton": "Substituir Tudo",
-	"label.toggleReplaceButton": "Ativar/desativar modo Substituir",
-	"title.matchesCountLimit": "Apenas os primeiros {0} resultados serão destacados, mas todas as operações de busca funcionam em todo o texto.",
-	"label.matchesLocation": "{0} de {1}",
-	"label.noResults": "Nenhum resultado"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/editor/contrib/find/browser/simpleFindWidget.i18n.json b/i18n/ptb/src/vs/editor/contrib/find/browser/simpleFindWidget.i18n.json
deleted file mode 100644
index 9172767f770..00000000000
--- a/i18n/ptb/src/vs/editor/contrib/find/browser/simpleFindWidget.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"label.find": "Localizar",
-	"placeholder.find": "Localizar",
-	"label.previousMatchButton": "Correspondência anterior",
-	"label.nextMatchButton": "Próxima correspondência",
-	"label.closeButton": "Fechar"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/editor/contrib/find/common/findController.i18n.json b/i18n/ptb/src/vs/editor/contrib/find/common/findController.i18n.json
deleted file mode 100644
index ce656c20f36..00000000000
--- a/i18n/ptb/src/vs/editor/contrib/find/common/findController.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"startFindAction": "Localizar",
-	"findNextMatchAction": "Localizar Próximo",
-	"findPreviousMatchAction": "Localizar anterior",
-	"nextSelectionMatchFindAction": "Localizar Próxima Seleção",
-	"previousSelectionMatchFindAction": "Localizar Seleção Anterior",
-	"startReplace": "Substituir",
-	"showNextFindTermAction": "Mostrar Próximo Termo de Busca",
-	"showPreviousFindTermAction": "Mostrar Termo de Busca Anterior"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/editor/contrib/find/findController.i18n.json b/i18n/ptb/src/vs/editor/contrib/find/findController.i18n.json
deleted file mode 100644
index 366c954fbe5..00000000000
--- a/i18n/ptb/src/vs/editor/contrib/find/findController.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"startFindAction": "Localizar",
-	"startFindWithSelectionAction": "Procurar Com a Seleção",
-	"findNextMatchAction": "Localizar Próximo",
-	"findPreviousMatchAction": "Localizar anterior",
-	"nextSelectionMatchFindAction": "Localizar Próxima Seleção",
-	"previousSelectionMatchFindAction": "Localizar Seleção Anterior",
-	"startReplace": "Substituir",
-	"showNextFindTermAction": "Mostrar Próximo Termo de Busca",
-	"showPreviousFindTermAction": "Mostrar Termo de Busca Anterior"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/editor/contrib/find/findWidget.i18n.json b/i18n/ptb/src/vs/editor/contrib/find/findWidget.i18n.json
deleted file mode 100644
index 4fb9c63406b..00000000000
--- a/i18n/ptb/src/vs/editor/contrib/find/findWidget.i18n.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"label.find": "Localizar",
-	"placeholder.find": "Localizar",
-	"label.previousMatchButton": "Correspondência anterior",
-	"label.nextMatchButton": "Próxima correspondência",
-	"label.toggleSelectionFind": "Localizar na seleção",
-	"label.closeButton": "Fechar",
-	"label.replace": "Substituir",
-	"placeholder.replace": "Substituir",
-	"label.replaceButton": "Substituir",
-	"label.replaceAllButton": "Substituir Tudo",
-	"label.toggleReplaceButton": "Ativar/desativar modo Substituir",
-	"title.matchesCountLimit": "Apenas os primeiros {0} resultados serão destacados, mas todas as operações de busca funcionam em todo o texto.",
-	"label.matchesLocation": "{0} de {1}",
-	"label.noResults": "Nenhum resultado"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/editor/contrib/find/simpleFindWidget.i18n.json b/i18n/ptb/src/vs/editor/contrib/find/simpleFindWidget.i18n.json
deleted file mode 100644
index 457d3bc73fa..00000000000
--- a/i18n/ptb/src/vs/editor/contrib/find/simpleFindWidget.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"label.find": "Localizar",
-	"placeholder.find": "Localizar",
-	"label.previousMatchButton": "Correspondência anterior",
-	"label.nextMatchButton": "Próxima correspondência",
-	"label.closeButton": "Fechar"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/editor/contrib/folding/browser/folding.i18n.json b/i18n/ptb/src/vs/editor/contrib/folding/browser/folding.i18n.json
deleted file mode 100644
index c9d6b88a852..00000000000
--- a/i18n/ptb/src/vs/editor/contrib/folding/browser/folding.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"unfoldAction.label": "Abrir",
-	"unFoldRecursivelyAction.label": "Abrir recursivamente",
-	"foldAction.label": "Colapsar",
-	"foldRecursivelyAction.label": "Colapsar recursivamente",
-	"foldAllAction.label": "Colapsar tudo",
-	"unfoldAllAction.label": "Abrir tudo",
-	"foldLevelAction.label": "Nível de colapsamento {0}"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/editor/contrib/folding/folding.i18n.json b/i18n/ptb/src/vs/editor/contrib/folding/folding.i18n.json
deleted file mode 100644
index 9738b48efa9..00000000000
--- a/i18n/ptb/src/vs/editor/contrib/folding/folding.i18n.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"unfoldAction.label": "Abrir",
-	"unFoldRecursivelyAction.label": "Abrir recursivamente",
-	"foldAction.label": "Colapsar",
-	"foldRecursivelyAction.label": "Colapsar recursivamente",
-	"foldAllBlockComments.label": "Fechar Todos os Comentários de Bloco",
-	"foldAllMarkerRegions.label": "Fechar Todas as Regiões",
-	"unfoldAllMarkerRegions.label": "Abrir Todas as Regiões",
-	"foldAllAction.label": "Colapsar tudo",
-	"unfoldAllAction.label": "Abrir tudo",
-	"foldLevelAction.label": "Nível de colapsamento {0}"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/editor/contrib/fontZoom/fontZoom.i18n.json b/i18n/ptb/src/vs/editor/contrib/fontZoom/fontZoom.i18n.json
deleted file mode 100644
index ec9ba531e42..00000000000
--- a/i18n/ptb/src/vs/editor/contrib/fontZoom/fontZoom.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"EditorFontZoomOut.label": "Editor de fonte ' menos Zoom '"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/editor/contrib/format/browser/formatActions.i18n.json b/i18n/ptb/src/vs/editor/contrib/format/browser/formatActions.i18n.json
deleted file mode 100644
index 9dc8bacb232..00000000000
--- a/i18n/ptb/src/vs/editor/contrib/format/browser/formatActions.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"hint11": "1 edição de formatação feita na linha {0}",
-	"hintn1": "{0} edições de formatação feitas na linha {1}",
-	"hint1n": "Feita 1 edição de formatação entre as linhas {0} e {1}",
-	"hintnn": "Feitas {0} edições de formatação entre as linhas {1} e {2}",
-	"no.provider": "Desculpe, mas não há nenhum formatador para '{0}'-arquivos instalados.",
-	"formatDocument.label": "Formatar Documento",
-	"formatSelection.label": "Formatar Seleção"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/editor/contrib/format/formatActions.i18n.json b/i18n/ptb/src/vs/editor/contrib/format/formatActions.i18n.json
deleted file mode 100644
index 288a4a12673..00000000000
--- a/i18n/ptb/src/vs/editor/contrib/format/formatActions.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hint11": "1 edição de formatação feita na linha {0}",
-	"hintn1": "{0} edições de formatação feitas na linha {1}",
-	"hint1n": "Feita 1 edição de formatação entre as linhas {0} e {1}",
-	"hintnn": "Feitas {0} edições de formatação entre as linhas {1} e {2}",
-	"no.provider": "Não há formatador instalado para '{0}'-arquivos.",
-	"formatDocument.label": "Formatar Documento",
-	"formatSelection.label": "Formatar Seleção"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/editor/contrib/goToDeclaration/browser/goToDeclarationCommands.i18n.json b/i18n/ptb/src/vs/editor/contrib/goToDeclaration/browser/goToDeclarationCommands.i18n.json
deleted file mode 100644
index 01753366bca..00000000000
--- a/i18n/ptb/src/vs/editor/contrib/goToDeclaration/browser/goToDeclarationCommands.i18n.json
+++ /dev/null
@@ -1,23 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"noResultWord": "Não foi encontrada definição para '{0}'",
-	"generic.noResults": "Nenhuma definição encontrada",
-	"meta.title": "- {0} definições",
-	"actions.goToDecl.label": "Ir para Definição",
-	"actions.goToDeclToSide.label": "Abrir definição ao lado",
-	"actions.previewDecl.label": "Inspecionar definição",
-	"goToImplementation.noResultWord": "Nenhuma implementação encontrada para '{0}'",
-	"goToImplementation.generic.noResults": "Nenhuma implementação encontrada",
-	"meta.implementations.title": "– {0} implementações",
-	"actions.goToImplementation.label": "Ir para a implementação",
-	"actions.peekImplementation.label": "Inspecionar implementação",
-	"goToTypeDefinition.noResultWord": "Nenhuma definição encontrada para '{0}'",
-	"goToTypeDefinition.generic.noResults": "Nenhuma definição de tipo encontrada",
-	"meta.typeDefinitions.title": "– {0} definições de tipos",
-	"actions.goToTypeDefinition.label": "Ir para a definição de tipo",
-	"actions.peekTypeDefinition.label": "Inspecionar definição de tipo"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/editor/contrib/goToDeclaration/browser/goToDeclarationMouse.i18n.json b/i18n/ptb/src/vs/editor/contrib/goToDeclaration/browser/goToDeclarationMouse.i18n.json
deleted file mode 100644
index 675cbe29ae1..00000000000
--- a/i18n/ptb/src/vs/editor/contrib/goToDeclaration/browser/goToDeclarationMouse.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"multipleResults": "Clique para mostrar {0} definições."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/editor/contrib/goToDeclaration/goToDeclarationCommands.i18n.json b/i18n/ptb/src/vs/editor/contrib/goToDeclaration/goToDeclarationCommands.i18n.json
deleted file mode 100644
index de30b404b34..00000000000
--- a/i18n/ptb/src/vs/editor/contrib/goToDeclaration/goToDeclarationCommands.i18n.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noResultWord": "Não foi encontrada definição para '{0}'",
-	"generic.noResults": "Nenhuma definição encontrada",
-	"meta.title": "- {0} definições",
-	"actions.goToDecl.label": "Ir para Definição",
-	"actions.goToDeclToSide.label": "Abrir definição ao lado",
-	"actions.previewDecl.label": "Inspecionar definição",
-	"goToImplementation.noResultWord": "Nenhuma implementação encontrada para '{0}'",
-	"goToImplementation.generic.noResults": "Nenhuma implementação encontrada",
-	"meta.implementations.title": "– {0} implementações",
-	"actions.goToImplementation.label": "Ir para a implementação",
-	"actions.peekImplementation.label": "Inspecionar implementação",
-	"goToTypeDefinition.noResultWord": "Nenhuma definição encontrada para '{0}'",
-	"goToTypeDefinition.generic.noResults": "Nenhuma definição de tipo encontrada",
-	"meta.typeDefinitions.title": "– {0} definições de tipos",
-	"actions.goToTypeDefinition.label": "Ir para a definição de tipo",
-	"actions.peekTypeDefinition.label": "Inspecionar definição de tipo"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/editor/contrib/goToDeclaration/goToDeclarationMouse.i18n.json b/i18n/ptb/src/vs/editor/contrib/goToDeclaration/goToDeclarationMouse.i18n.json
deleted file mode 100644
index 67e0c676b7a..00000000000
--- a/i18n/ptb/src/vs/editor/contrib/goToDeclaration/goToDeclarationMouse.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"multipleResults": "Clique para mostrar {0} definições."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/editor/contrib/goToDefinition/goToDefinitionCommands.i18n.json b/i18n/ptb/src/vs/editor/contrib/goToDefinition/goToDefinitionCommands.i18n.json
deleted file mode 100644
index de30b404b34..00000000000
--- a/i18n/ptb/src/vs/editor/contrib/goToDefinition/goToDefinitionCommands.i18n.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noResultWord": "Não foi encontrada definição para '{0}'",
-	"generic.noResults": "Nenhuma definição encontrada",
-	"meta.title": "- {0} definições",
-	"actions.goToDecl.label": "Ir para Definição",
-	"actions.goToDeclToSide.label": "Abrir definição ao lado",
-	"actions.previewDecl.label": "Inspecionar definição",
-	"goToImplementation.noResultWord": "Nenhuma implementação encontrada para '{0}'",
-	"goToImplementation.generic.noResults": "Nenhuma implementação encontrada",
-	"meta.implementations.title": "– {0} implementações",
-	"actions.goToImplementation.label": "Ir para a implementação",
-	"actions.peekImplementation.label": "Inspecionar implementação",
-	"goToTypeDefinition.noResultWord": "Nenhuma definição encontrada para '{0}'",
-	"goToTypeDefinition.generic.noResults": "Nenhuma definição de tipo encontrada",
-	"meta.typeDefinitions.title": "– {0} definições de tipos",
-	"actions.goToTypeDefinition.label": "Ir para a definição de tipo",
-	"actions.peekTypeDefinition.label": "Inspecionar definição de tipo"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/editor/contrib/goToDefinition/goToDefinitionMouse.i18n.json b/i18n/ptb/src/vs/editor/contrib/goToDefinition/goToDefinitionMouse.i18n.json
deleted file mode 100644
index 67e0c676b7a..00000000000
--- a/i18n/ptb/src/vs/editor/contrib/goToDefinition/goToDefinitionMouse.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"multipleResults": "Clique para mostrar {0} definições."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/editor/contrib/gotoError/browser/gotoError.i18n.json b/i18n/ptb/src/vs/editor/contrib/gotoError/browser/gotoError.i18n.json
deleted file mode 100644
index d05aeee6c34..00000000000
--- a/i18n/ptb/src/vs/editor/contrib/gotoError/browser/gotoError.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"title.wo_source": "({0}/{1})",
-	"markerAction.next.label": "Ir para o Próximo Erro ou Aviso",
-	"markerAction.previous.label": "Ir para o Erro ou Aviso Anterior",
-	"editorMarkerNavigationError": "Ferramenta de marcação de edição apresentando error na cor ",
-	"editorMarkerNavigationWarning": "Ferramenta de marcação de edição apresentando adventência na cor",
-	"editorMarkerNavigationInfo": "Cor de informação da ferramenta de navegação do marcador do editor.",
-	"editorMarkerNavigationBackground": "Cor de fundo da ferramenta de marcação de navegação do editor."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/editor/contrib/gotoError/gotoError.i18n.json b/i18n/ptb/src/vs/editor/contrib/gotoError/gotoError.i18n.json
deleted file mode 100644
index 517488c6efe..00000000000
--- a/i18n/ptb/src/vs/editor/contrib/gotoError/gotoError.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"markerAction.next.label": "Ir para o Próximo Problema (Erro, Aviso, Informação)",
-	"markerAction.previous.label": "Ir para o Problema Anterior (Erro, Aviso, Informação)",
-	"markerAction.nextInFiles.label": "Ir para Próximo Problema nos Aquivos (Erro, Aviso, Info)"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json b/i18n/ptb/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json
deleted file mode 100644
index e76001982d3..00000000000
--- a/i18n/ptb/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"title.wo_source": "({0}/{1})",
-	"editorMarkerNavigationError": "Ferramenta de marcação de edição apresentando error na cor ",
-	"editorMarkerNavigationWarning": "Ferramenta de marcação de edição apresentando adventência na cor",
-	"editorMarkerNavigationInfo": "Cor de informação da ferramenta de navegação do marcador do editor.",
-	"editorMarkerNavigationBackground": "Cor de fundo da ferramenta de marcação de navegação do editor."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/editor/contrib/hover/browser/hover.i18n.json b/i18n/ptb/src/vs/editor/contrib/hover/browser/hover.i18n.json
deleted file mode 100644
index 196a8fb2bb0..00000000000
--- a/i18n/ptb/src/vs/editor/contrib/hover/browser/hover.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"showHover": "Mostrar Item Flutuante"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/editor/contrib/hover/browser/modesContentHover.i18n.json b/i18n/ptb/src/vs/editor/contrib/hover/browser/modesContentHover.i18n.json
deleted file mode 100644
index 2c74cf6f1ec..00000000000
--- a/i18n/ptb/src/vs/editor/contrib/hover/browser/modesContentHover.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"modesContentHover.loading": "Carregando..."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/editor/contrib/hover/hover.i18n.json b/i18n/ptb/src/vs/editor/contrib/hover/hover.i18n.json
deleted file mode 100644
index 17e0c9f7dd9..00000000000
--- a/i18n/ptb/src/vs/editor/contrib/hover/hover.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"showHover": "Mostrar Item Flutuante"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/editor/contrib/hover/modesContentHover.i18n.json b/i18n/ptb/src/vs/editor/contrib/hover/modesContentHover.i18n.json
deleted file mode 100644
index c52d9144e23..00000000000
--- a/i18n/ptb/src/vs/editor/contrib/hover/modesContentHover.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"modesContentHover.loading": "Carregando..."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/editor/contrib/inPlaceReplace/common/inPlaceReplace.i18n.json b/i18n/ptb/src/vs/editor/contrib/inPlaceReplace/common/inPlaceReplace.i18n.json
deleted file mode 100644
index fbbfbd02161..00000000000
--- a/i18n/ptb/src/vs/editor/contrib/inPlaceReplace/common/inPlaceReplace.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"InPlaceReplaceAction.previous.label": "Substituir pelo valor anterior",
-	"InPlaceReplaceAction.next.label": "Substituir pelo próximo valor"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/editor/contrib/inPlaceReplace/inPlaceReplace.i18n.json b/i18n/ptb/src/vs/editor/contrib/inPlaceReplace/inPlaceReplace.i18n.json
deleted file mode 100644
index ee4235fe754..00000000000
--- a/i18n/ptb/src/vs/editor/contrib/inPlaceReplace/inPlaceReplace.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"InPlaceReplaceAction.previous.label": "Substituir pelo valor anterior",
-	"InPlaceReplaceAction.next.label": "Substituir pelo próximo valor"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/editor/contrib/indentation/common/indentation.i18n.json b/i18n/ptb/src/vs/editor/contrib/indentation/common/indentation.i18n.json
deleted file mode 100644
index 8edeaaf8104..00000000000
--- a/i18n/ptb/src/vs/editor/contrib/indentation/common/indentation.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"indentationToSpaces": "Converter indentação em espaços.",
-	"indentationToTabs": "Coverter Indentação a Tabulações.",
-	"configuredTabSize": "Tamanho de Tabulação Configurado",
-	"selectTabWidth": "Selecione o Tamanho de Tabulação para o Arquivo Atual",
-	"indentUsingTabs": "Indentar Usando Tabulações",
-	"indentUsingSpaces": "Indentar Usando Espaços",
-	"detectIndentation": "Detectar Indentação a Partir do Conteúdo",
-	"editor.reindentlines": "Reindentar Linhas"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/editor/contrib/indentation/indentation.i18n.json b/i18n/ptb/src/vs/editor/contrib/indentation/indentation.i18n.json
deleted file mode 100644
index 90dbed9feeb..00000000000
--- a/i18n/ptb/src/vs/editor/contrib/indentation/indentation.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"indentationToSpaces": "Converter indentação em espaços.",
-	"indentationToTabs": "Coverter Indentação a Tabulações.",
-	"configuredTabSize": "Tamanho de Tabulação Configurado",
-	"selectTabWidth": "Selecione o Tamanho de Tabulação para o Arquivo Atual",
-	"indentUsingTabs": "Indentar Usando Tabulações",
-	"indentUsingSpaces": "Indentar Usando Espaços",
-	"detectIndentation": "Detectar Indentação a Partir do Conteúdo",
-	"editor.reindentlines": "Reindentar Linhas"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/editor/contrib/inspectTMScopes/electron-browser/inspectTMScopes.i18n.json b/i18n/ptb/src/vs/editor/contrib/inspectTMScopes/electron-browser/inspectTMScopes.i18n.json
deleted file mode 100644
index e715c4d667f..00000000000
--- a/i18n/ptb/src/vs/editor/contrib/inspectTMScopes/electron-browser/inspectTMScopes.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"inspectTMScopes": "Desenvolvedor: Inspecionar escopos TM",
-	"inspectTMScopesWidget.loading": "Carregando..."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/editor/contrib/linesOperations/common/linesOperations.i18n.json b/i18n/ptb/src/vs/editor/contrib/linesOperations/common/linesOperations.i18n.json
deleted file mode 100644
index 8a368ab368d..00000000000
--- a/i18n/ptb/src/vs/editor/contrib/linesOperations/common/linesOperations.i18n.json
+++ /dev/null
@@ -1,25 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"lines.copyUp": "Copiar linha acima",
-	"lines.copyDown": "Copiar linha abaixo",
-	"lines.moveUp": "Mover linha para cima",
-	"lines.moveDown": "Mover linha para baixo",
-	"lines.sortAscending": "Classificar Linhas Ascendentemente",
-	"lines.sortDescending": "Classificar Linhas Descendentemente",
-	"lines.trimTrailingWhitespace": "Cortar Espaço em Branco à Direita",
-	"lines.delete": "Excluir linha",
-	"lines.indent": "Recuar linha",
-	"lines.outdent": "Recuar linha para a esquerda",
-	"lines.insertBefore": "Inserir linha acima",
-	"lines.insertAfter": "Inserir linha abaixo",
-	"lines.deleteAllLeft": "Excluir tudo à Esquerda",
-	"lines.deleteAllRight": "Excluir Tudo à Direita",
-	"lines.joinLines": "Unir Linhas",
-	"editor.transpose": "Transpor caracteres ao redor do cursor",
-	"editor.transformToUppercase": "Transformar para maiúsculas",
-	"editor.transformToLowercase": "Transformar para minúsculas"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/editor/contrib/linesOperations/linesOperations.i18n.json b/i18n/ptb/src/vs/editor/contrib/linesOperations/linesOperations.i18n.json
deleted file mode 100644
index 785932ba86b..00000000000
--- a/i18n/ptb/src/vs/editor/contrib/linesOperations/linesOperations.i18n.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"lines.copyUp": "Copiar linha acima",
-	"lines.copyDown": "Copiar linha abaixo",
-	"lines.moveUp": "Mover linha para cima",
-	"lines.moveDown": "Mover linha para baixo",
-	"lines.sortAscending": "Classificar Linhas Ascendentemente",
-	"lines.sortDescending": "Classificar Linhas Descendentemente",
-	"lines.trimTrailingWhitespace": "Cortar Espaço em Branco à Direita",
-	"lines.delete": "Excluir linha",
-	"lines.indent": "Recuar linha",
-	"lines.outdent": "Recuar linha para a esquerda",
-	"lines.insertBefore": "Inserir linha acima",
-	"lines.insertAfter": "Inserir linha abaixo",
-	"lines.deleteAllLeft": "Excluir tudo à Esquerda",
-	"lines.deleteAllRight": "Excluir Tudo à Direita",
-	"lines.joinLines": "Unir Linhas",
-	"editor.transpose": "Transpor caracteres ao redor do cursor",
-	"editor.transformToUppercase": "Transformar para maiúsculas",
-	"editor.transformToLowercase": "Transformar para minúsculas"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/editor/contrib/links/browser/links.i18n.json b/i18n/ptb/src/vs/editor/contrib/links/browser/links.i18n.json
deleted file mode 100644
index 38c51b4ea6e..00000000000
--- a/i18n/ptb/src/vs/editor/contrib/links/browser/links.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"links.navigate.mac": "Cmd + clique para seguir o link",
-	"links.navigate": "Ctrl + clique para seguir o link",
-	"links.command.mac": "Cmd + clique para executar o comando",
-	"links.command": "CTRL + clique para executar o comando",
-	"links.navigate.al": "Alt + clique para seguir o link",
-	"links.command.al": "Alt + clique para executar o comando",
-	"invalid.url": "Desculpe, falha ao abrir este link porque ele não está bem formatado: {0}",
-	"missing.url": "Desculpe, falha ao abrir este link porque seu destino está faltando.",
-	"label": "Abrir link"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/editor/contrib/links/links.i18n.json b/i18n/ptb/src/vs/editor/contrib/links/links.i18n.json
deleted file mode 100644
index 282c64ac6d3..00000000000
--- a/i18n/ptb/src/vs/editor/contrib/links/links.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"links.navigate.mac": "Cmd + clique para seguir o link",
-	"links.navigate": "Ctrl + clique para seguir o link",
-	"links.command.mac": "Cmd + clique para executar o comando",
-	"links.command": "Ctrl + clique para executar o comando",
-	"links.navigate.al.mac": "Option + clique para seguir o link",
-	"links.navigate.al": "Alt + clique para seguir o link",
-	"links.command.al.mac": "Option + clique para executar o comando",
-	"links.command.al": "Alt + clique para executar o comando",
-	"invalid.url": "Falha ao abrir este link porque ele não está bem formatado: {0}",
-	"missing.url": "Falha ao abrir este link porque seu destino está faltando.",
-	"label": "Abrir link"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/editor/contrib/message/messageController.i18n.json b/i18n/ptb/src/vs/editor/contrib/message/messageController.i18n.json
deleted file mode 100644
index 4e67dd40a4b..00000000000
--- a/i18n/ptb/src/vs/editor/contrib/message/messageController.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"editor.readonly": "Não é possível editar no editor somente leitura"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/editor/contrib/multicursor/common/multicursor.i18n.json b/i18n/ptb/src/vs/editor/contrib/multicursor/common/multicursor.i18n.json
deleted file mode 100644
index 790c737c8eb..00000000000
--- a/i18n/ptb/src/vs/editor/contrib/multicursor/common/multicursor.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"mutlicursor.insertAbove": "Inserir cursor acima",
-	"mutlicursor.insertBelow": "Inserir cursor abaixo",
-	"mutlicursor.insertAtEndOfEachLineSelected": "Adicionar Cursores ao Final das Linhas",
-	"addSelectionToNextFindMatch": "Adicionar Seleção ao Próximo Localizar Correspondência",
-	"addSelectionToPreviousFindMatch": "Adicionar Seleção à Correspondência de Localização Anterior",
-	"moveSelectionToNextFindMatch": "Mover Última Seleção para Próximo Localizar Correspondência",
-	"moveSelectionToPreviousFindMatch": "Mover Última Seleção para Correspondência de Localização Anterior",
-	"selectAllOccurrencesOfFindMatch": "Selecionar Todas as Ocorrências de Localizar Correspondência",
-	"changeAll.label": "Alterar todas as ocorrências"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/editor/contrib/multicursor/multicursor.i18n.json b/i18n/ptb/src/vs/editor/contrib/multicursor/multicursor.i18n.json
deleted file mode 100644
index 644b805af50..00000000000
--- a/i18n/ptb/src/vs/editor/contrib/multicursor/multicursor.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"mutlicursor.insertAbove": "Inserir cursor acima",
-	"mutlicursor.insertBelow": "Inserir cursor abaixo",
-	"mutlicursor.insertAtEndOfEachLineSelected": "Adicionar Cursores ao Final das Linhas",
-	"addSelectionToNextFindMatch": "Adicionar Seleção ao Próximo Localizar Correspondência",
-	"addSelectionToPreviousFindMatch": "Adicionar Seleção à Correspondência de Localização Anterior",
-	"moveSelectionToNextFindMatch": "Mover Última Seleção para Próximo Localizar Correspondência",
-	"moveSelectionToPreviousFindMatch": "Mover Última Seleção para Correspondência de Localização Anterior",
-	"selectAllOccurrencesOfFindMatch": "Selecionar Todas as Ocorrências de Localizar Correspondência",
-	"changeAll.label": "Alterar todas as ocorrências"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/editor/contrib/parameterHints/browser/parameterHints.i18n.json b/i18n/ptb/src/vs/editor/contrib/parameterHints/browser/parameterHints.i18n.json
deleted file mode 100644
index f0450d3f4de..00000000000
--- a/i18n/ptb/src/vs/editor/contrib/parameterHints/browser/parameterHints.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"parameterHints.trigger.label": "Dicas de parâmetro de gatilho"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/editor/contrib/parameterHints/browser/parameterHintsWidget.i18n.json b/i18n/ptb/src/vs/editor/contrib/parameterHints/browser/parameterHintsWidget.i18n.json
deleted file mode 100644
index 0f8237adbb3..00000000000
--- a/i18n/ptb/src/vs/editor/contrib/parameterHints/browser/parameterHintsWidget.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"hint": "{0}, dica"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/editor/contrib/parameterHints/parameterHints.i18n.json b/i18n/ptb/src/vs/editor/contrib/parameterHints/parameterHints.i18n.json
deleted file mode 100644
index 333b99ba99b..00000000000
--- a/i18n/ptb/src/vs/editor/contrib/parameterHints/parameterHints.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"parameterHints.trigger.label": "Dicas de parâmetro de gatilho"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/editor/contrib/parameterHints/parameterHintsWidget.i18n.json b/i18n/ptb/src/vs/editor/contrib/parameterHints/parameterHintsWidget.i18n.json
deleted file mode 100644
index 2e012f17397..00000000000
--- a/i18n/ptb/src/vs/editor/contrib/parameterHints/parameterHintsWidget.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hint": "{0}, dica"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/editor/contrib/quickFix/browser/quickFixCommands.i18n.json b/i18n/ptb/src/vs/editor/contrib/quickFix/browser/quickFixCommands.i18n.json
deleted file mode 100644
index 01ae8d7aff8..00000000000
--- a/i18n/ptb/src/vs/editor/contrib/quickFix/browser/quickFixCommands.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"quickFixWithKb": "Mostrar correções ({0})",
-	"quickFix": "Mostrar correções",
-	"quickfix.trigger.label": "Correção Rápida"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/editor/contrib/quickFix/quickFixCommands.i18n.json b/i18n/ptb/src/vs/editor/contrib/quickFix/quickFixCommands.i18n.json
deleted file mode 100644
index 0dc34aa3b7c..00000000000
--- a/i18n/ptb/src/vs/editor/contrib/quickFix/quickFixCommands.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"quickFixWithKb": "Mostrar correções ({0})",
-	"quickFix": "Mostrar correções",
-	"quickfix.trigger.label": "Correção Rápida",
-	"refactor.label": "Refatorar"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/editor/contrib/referenceSearch/browser/peekViewWidget.i18n.json b/i18n/ptb/src/vs/editor/contrib/referenceSearch/browser/peekViewWidget.i18n.json
deleted file mode 100644
index 41ad7313b7d..00000000000
--- a/i18n/ptb/src/vs/editor/contrib/referenceSearch/browser/peekViewWidget.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"label.close": "Fechar"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/editor/contrib/referenceSearch/browser/referenceSearch.i18n.json b/i18n/ptb/src/vs/editor/contrib/referenceSearch/browser/referenceSearch.i18n.json
deleted file mode 100644
index 9d557535df6..00000000000
--- a/i18n/ptb/src/vs/editor/contrib/referenceSearch/browser/referenceSearch.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"meta.titleReference": "- {0} referências",
-	"references.action.label": "Localizar Todas as Referências"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/editor/contrib/referenceSearch/browser/referencesController.i18n.json b/i18n/ptb/src/vs/editor/contrib/referenceSearch/browser/referencesController.i18n.json
deleted file mode 100644
index 65217d2ace8..00000000000
--- a/i18n/ptb/src/vs/editor/contrib/referenceSearch/browser/referencesController.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"labelLoading": "Carregando..."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/editor/contrib/referenceSearch/browser/referencesModel.i18n.json b/i18n/ptb/src/vs/editor/contrib/referenceSearch/browser/referencesModel.i18n.json
deleted file mode 100644
index 2e25322d32c..00000000000
--- a/i18n/ptb/src/vs/editor/contrib/referenceSearch/browser/referencesModel.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"aria.oneReference": "símbolo em {0} na linha {1} e coluna {2}",
-	"aria.fileReferences.1": "1 símbolo em {0}, caminho completo {1}",
-	"aria.fileReferences.N": "{0} símbolos em {1}, caminho completo {2}",
-	"aria.result.0": "Nenhum resultado encontrado",
-	"aria.result.1": "Encontrado 1 símbolo em {0}",
-	"aria.result.n1": "Encontrados {0} símbolos em {1}",
-	"aria.result.nm": "Encontrados {0} símbolos em {1} arquivos"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/editor/contrib/referenceSearch/browser/referencesWidget.i18n.json b/i18n/ptb/src/vs/editor/contrib/referenceSearch/browser/referencesWidget.i18n.json
deleted file mode 100644
index 72f61eeaf83..00000000000
--- a/i18n/ptb/src/vs/editor/contrib/referenceSearch/browser/referencesWidget.i18n.json
+++ /dev/null
@@ -1,27 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"referencesFailre": "Falha ao resolver arquivo.",
-	"referencesCount": "{0} referências",
-	"referenceCount": "{0} referência",
-	"missingPreviewMessage": "nenhuma visualização disponível",
-	"treeAriaLabel": "Referências",
-	"noResults": "Nenhum resultado",
-	"peekView.alternateTitle": "Referências",
-	"peekViewTitleBackground": "Cor de fundo da área de visualização do título.",
-	"peekViewTitleForeground": "Cor de visualização do título.",
-	"peekViewTitleInfoForeground": "Cor da visualização de informações do título.",
-	"peekViewBorder": "Cor das bordas e seta da área de visualização",
-	"peekViewResultsBackground": "Cor de fundo da área de visualização da lista de resultados.",
-	"peekViewResultsMatchForeground": "Cor de primeiro plano para nós de linha na lista de resultados visualizados.",
-	"peekViewResultsFileForeground": "Cor de primeiro plano para nós de arquivos na lista de resultados visualizados.",
-	"peekViewResultsSelectionBackground": "Cor de fundo da entrada selecionada na visualização da lista de resultados.",
-	"peekViewResultsSelectionForeground": "Cor da entrada selecionada na visualização da lista de resultados.",
-	"peekViewEditorBackground": "Cor de fundo da visualização do editor.",
-	"peekViewEditorGutterBackground": "Cor de fundo da separação na visualização rápida do editor.",
-	"peekViewResultsMatchHighlight": "Corresponder cor de realce com visualização da lista de resultados.",
-	"peekViewEditorMatchHighlight": "Corresponder cor de realce com visualização do editor."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/editor/contrib/referenceSearch/peekViewWidget.i18n.json b/i18n/ptb/src/vs/editor/contrib/referenceSearch/peekViewWidget.i18n.json
deleted file mode 100644
index 6a6321be8fa..00000000000
--- a/i18n/ptb/src/vs/editor/contrib/referenceSearch/peekViewWidget.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"label.close": "Fechar"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/editor/contrib/referenceSearch/referenceSearch.i18n.json b/i18n/ptb/src/vs/editor/contrib/referenceSearch/referenceSearch.i18n.json
deleted file mode 100644
index 85da0fa1084..00000000000
--- a/i18n/ptb/src/vs/editor/contrib/referenceSearch/referenceSearch.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"meta.titleReference": "- {0} referências",
-	"references.action.label": "Localizar Todas as Referências"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/editor/contrib/referenceSearch/referencesController.i18n.json b/i18n/ptb/src/vs/editor/contrib/referenceSearch/referencesController.i18n.json
deleted file mode 100644
index ae3f0a5bfeb..00000000000
--- a/i18n/ptb/src/vs/editor/contrib/referenceSearch/referencesController.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"labelLoading": "Carregando..."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/editor/contrib/referenceSearch/referencesModel.i18n.json b/i18n/ptb/src/vs/editor/contrib/referenceSearch/referencesModel.i18n.json
deleted file mode 100644
index 578a6e1db1a..00000000000
--- a/i18n/ptb/src/vs/editor/contrib/referenceSearch/referencesModel.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"aria.oneReference": "símbolo em {0} na linha {1} e coluna {2}",
-	"aria.fileReferences.1": "1 símbolo em {0}, caminho completo {1}",
-	"aria.fileReferences.N": "{0} símbolos em {1}, caminho completo {2}",
-	"aria.result.0": "Nenhum resultado encontrado",
-	"aria.result.1": "Encontrado 1 símbolo em {0}",
-	"aria.result.n1": "Encontrados {0} símbolos em {1}",
-	"aria.result.nm": "Encontrados {0} símbolos em {1} arquivos"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/editor/contrib/referenceSearch/referencesWidget.i18n.json b/i18n/ptb/src/vs/editor/contrib/referenceSearch/referencesWidget.i18n.json
deleted file mode 100644
index 6491a3db45c..00000000000
--- a/i18n/ptb/src/vs/editor/contrib/referenceSearch/referencesWidget.i18n.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"referencesFailre": "Falha ao resolver arquivo.",
-	"referencesCount": "{0} referências",
-	"referenceCount": "{0} referência",
-	"missingPreviewMessage": "nenhuma visualização disponível",
-	"treeAriaLabel": "Referências",
-	"noResults": "Nenhum resultado",
-	"peekView.alternateTitle": "Referências",
-	"peekViewTitleBackground": "Cor de fundo da área de visualização do título.",
-	"peekViewTitleForeground": "Cor de visualização do título.",
-	"peekViewTitleInfoForeground": "Cor da visualização de informações do título.",
-	"peekViewBorder": "Cor das bordas e seta da área de visualização",
-	"peekViewResultsBackground": "Cor de fundo da área de visualização da lista de resultados.",
-	"peekViewResultsMatchForeground": "Cor de primeiro plano para nós de linha na lista de resultados visualizados.",
-	"peekViewResultsFileForeground": "Cor de primeiro plano para nós de arquivos na lista de resultados visualizados.",
-	"peekViewResultsSelectionBackground": "Cor de fundo da entrada selecionada na visualização da lista de resultados.",
-	"peekViewResultsSelectionForeground": "Cor da entrada selecionada na visualização da lista de resultados.",
-	"peekViewEditorBackground": "Cor de fundo da visualização do editor.",
-	"peekViewEditorGutterBackground": "Cor de fundo da separação na visualização rápida do editor.",
-	"peekViewResultsMatchHighlight": "Corresponder cor de realce com visualização da lista de resultados.",
-	"peekViewEditorMatchHighlight": "Corresponder cor de realce com visualização do editor."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/editor/contrib/rename/browser/rename.i18n.json b/i18n/ptb/src/vs/editor/contrib/rename/browser/rename.i18n.json
deleted file mode 100644
index a56535f6241..00000000000
--- a/i18n/ptb/src/vs/editor/contrib/rename/browser/rename.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"no result": "Nenhum resultado.",
-	"aria": "Renomeado '{0}' para '{1}'com sucesso. Resumo: {2}",
-	"rename.failed": "Desculpe, falha na execução de renomear.",
-	"rename.label": "Renomear Símbolo"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/editor/contrib/rename/browser/renameInputField.i18n.json b/i18n/ptb/src/vs/editor/contrib/rename/browser/renameInputField.i18n.json
deleted file mode 100644
index 49eba92fa44..00000000000
--- a/i18n/ptb/src/vs/editor/contrib/rename/browser/renameInputField.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"renameAriaLabel": "Renomear entrada. Digite o novo nome e tecle Enter para gravar."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/editor/contrib/rename/rename.i18n.json b/i18n/ptb/src/vs/editor/contrib/rename/rename.i18n.json
deleted file mode 100644
index 12676fe2b14..00000000000
--- a/i18n/ptb/src/vs/editor/contrib/rename/rename.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"no result": "Nenhum resultado.",
-	"aria": "Renomeado '{0}' para '{1}'com sucesso. Resumo: {2}",
-	"rename.failed": "Falha ao renomear",
-	"rename.label": "Renomear Símbolo"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/editor/contrib/rename/renameInputField.i18n.json b/i18n/ptb/src/vs/editor/contrib/rename/renameInputField.i18n.json
deleted file mode 100644
index 9f51b785f11..00000000000
--- a/i18n/ptb/src/vs/editor/contrib/rename/renameInputField.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"renameAriaLabel": "Renomear entrada. Digite o novo nome e tecle Enter para gravar."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/editor/contrib/smartSelect/common/smartSelect.i18n.json b/i18n/ptb/src/vs/editor/contrib/smartSelect/common/smartSelect.i18n.json
deleted file mode 100644
index 89319f9a266..00000000000
--- a/i18n/ptb/src/vs/editor/contrib/smartSelect/common/smartSelect.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"smartSelect.grow": "Expandir seleção",
-	"smartSelect.shrink": "Reduzir seleção"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/editor/contrib/smartSelect/smartSelect.i18n.json b/i18n/ptb/src/vs/editor/contrib/smartSelect/smartSelect.i18n.json
deleted file mode 100644
index 3ad31a62ca5..00000000000
--- a/i18n/ptb/src/vs/editor/contrib/smartSelect/smartSelect.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"smartSelect.grow": "Expandir seleção",
-	"smartSelect.shrink": "Reduzir seleção"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/editor/contrib/snippet/snippetVariables.i18n.json b/i18n/ptb/src/vs/editor/contrib/snippet/snippetVariables.i18n.json
deleted file mode 100644
index 8b1d4736ce9..00000000000
--- a/i18n/ptb/src/vs/editor/contrib/snippet/snippetVariables.i18n.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"Sunday": "Domingo",
-	"Monday": "Segunda-feira",
-	"Tuesday": "Terça-feira",
-	"Wednesday": "Quarta-feira",
-	"Thursday": "Quinta-feira",
-	"Friday": "Sexta-feira",
-	"Saturday": "Sábado",
-	"SundayShort": "Dom",
-	"MondayShort": "Seg",
-	"TuesdayShort": "Ter",
-	"WednesdayShort": "Qua",
-	"ThursdayShort": "Qui",
-	"FridayShort": "Sex",
-	"SaturdayShort": "Sáb",
-	"January": "Janeiro",
-	"February": "Fevereiro",
-	"March": "Março",
-	"April": "Abril",
-	"May": "Maio",
-	"June": "Junho",
-	"July": "Julho",
-	"August": "Agosto",
-	"September": "Setembro",
-	"October": "Outubro",
-	"November": "Novembro",
-	"December": "Dezembro",
-	"JanuaryShort": "Jan",
-	"FebruaryShort": "Fev",
-	"MarchShort": "Mar",
-	"AprilShort": "Abr",
-	"MayShort": "Mai",
-	"JuneShort": "Jun",
-	"JulyShort": "Jul",
-	"AugustShort": "Ago",
-	"SeptemberShort": "Set",
-	"OctoberShort": "Out",
-	"NovemberShort": "Nov",
-	"DecemberShort": "Dez"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/editor/contrib/suggest/browser/suggestController.i18n.json b/i18n/ptb/src/vs/editor/contrib/suggest/browser/suggestController.i18n.json
deleted file mode 100644
index b064152c8be..00000000000
--- a/i18n/ptb/src/vs/editor/contrib/suggest/browser/suggestController.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"arai.alert.snippet": "Ao aceitar '{0}' foi inserido o seguinte texto: {1}",
-	"suggest.trigger.label": "Sugestão de gatilho"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/editor/contrib/suggest/browser/suggestWidget.i18n.json b/i18n/ptb/src/vs/editor/contrib/suggest/browser/suggestWidget.i18n.json
deleted file mode 100644
index c9da4793d67..00000000000
--- a/i18n/ptb/src/vs/editor/contrib/suggest/browser/suggestWidget.i18n.json
+++ /dev/null
@@ -1,21 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"editorSuggestWidgetBackground": "Cor de fundo para a ferramenta de sugestão.",
-	"editorSuggestWidgetBorder": "Cor da borda para a ferramenta de sugestão.",
-	"editorSuggestWidgetForeground": "Cor de primeiro plano para a ferramenta de sugestão.",
-	"editorSuggestWidgetSelectedBackground": "Cor de fundo da entrada selecionada da ferramenta de sugestões.",
-	"editorSuggestWidgetHighlightForeground": "Cor de realce da correspondência na ferramenta de sugestão.",
-	"readMore": "Ler Mais...{0}",
-	"suggestionWithDetailsAriaLabel": "{0}, sugestão, tem detalhes",
-	"suggestionAriaLabel": "{0}, sugestão",
-	"readLess": "Ler menos... {0}",
-	"suggestWidget.loading": "Carregando...",
-	"suggestWidget.noSuggestions": "Nenhuma sugestão.",
-	"suggestionAriaAccepted": "{0}, aceito",
-	"ariaCurrentSuggestionWithDetails": "{0}, sugestão, tem detalhes",
-	"ariaCurrentSuggestion": "{0}, sugestão"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/editor/contrib/suggest/suggestController.i18n.json b/i18n/ptb/src/vs/editor/contrib/suggest/suggestController.i18n.json
deleted file mode 100644
index 65b811bccb6..00000000000
--- a/i18n/ptb/src/vs/editor/contrib/suggest/suggestController.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"arai.alert.snippet": "Ao aceitar '{0}' foi inserido o seguinte texto: {1}",
-	"suggest.trigger.label": "Sugestão de gatilho"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/editor/contrib/suggest/suggestWidget.i18n.json b/i18n/ptb/src/vs/editor/contrib/suggest/suggestWidget.i18n.json
deleted file mode 100644
index e6f476973f9..00000000000
--- a/i18n/ptb/src/vs/editor/contrib/suggest/suggestWidget.i18n.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"editorSuggestWidgetBackground": "Cor de fundo para a ferramenta de sugestão.",
-	"editorSuggestWidgetBorder": "Cor da borda para a ferramenta de sugestão.",
-	"editorSuggestWidgetForeground": "Cor de primeiro plano para a ferramenta de sugestão.",
-	"editorSuggestWidgetSelectedBackground": "Cor de fundo da entrada selecionada da ferramenta de sugestões.",
-	"editorSuggestWidgetHighlightForeground": "Cor de realce da correspondência na ferramenta de sugestão.",
-	"readMore": "Ler Mais...{0}",
-	"suggestionWithDetailsAriaLabel": "{0}, sugestão, tem detalhes",
-	"suggestionAriaLabel": "{0}, sugestão",
-	"readLess": "Ler menos... {0}",
-	"suggestWidget.loading": "Carregando...",
-	"suggestWidget.noSuggestions": "Nenhuma sugestão.",
-	"suggestionAriaAccepted": "{0}, aceito",
-	"ariaCurrentSuggestionWithDetails": "{0}, sugestão, tem detalhes",
-	"ariaCurrentSuggestion": "{0}, sugestão"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/editor/contrib/toggleTabFocusMode/common/toggleTabFocusMode.i18n.json b/i18n/ptb/src/vs/editor/contrib/toggleTabFocusMode/common/toggleTabFocusMode.i18n.json
deleted file mode 100644
index 0f3dd068095..00000000000
--- a/i18n/ptb/src/vs/editor/contrib/toggleTabFocusMode/common/toggleTabFocusMode.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"toggle.tabMovesFocus": "Alterne o uso da tecla Tab para mover o foco"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/editor/contrib/toggleTabFocusMode/toggleTabFocusMode.i18n.json b/i18n/ptb/src/vs/editor/contrib/toggleTabFocusMode/toggleTabFocusMode.i18n.json
deleted file mode 100644
index d7c5bef888b..00000000000
--- a/i18n/ptb/src/vs/editor/contrib/toggleTabFocusMode/toggleTabFocusMode.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggle.tabMovesFocus": "Alterne o uso da tecla Tab para mover o foco"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/editor/contrib/wordHighlighter/common/wordHighlighter.i18n.json b/i18n/ptb/src/vs/editor/contrib/wordHighlighter/common/wordHighlighter.i18n.json
deleted file mode 100644
index 36476d7e95d..00000000000
--- a/i18n/ptb/src/vs/editor/contrib/wordHighlighter/common/wordHighlighter.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"wordHighlight": "Cor de fundo de um símbolo durante acesso de leitura, como ao ler uma variável.",
-	"wordHighlightStrong": "Cor de fundo de um símbolo durante acesso de escrita, como ao escrever uma variável.",
-	"overviewRulerWordHighlightForeground": "Visão geral da cor do marcador da régua para destaques de símbolos.",
-	"overviewRulerWordHighlightStrongForeground": "Visão geral da cor do marcador da régua para gravação de destaques de símbolos.",
-	"wordHighlight.next.label": "Ir para o próximo símbolo de destaque",
-	"wordHighlight.previous.label": "Ir para o símbolo de destaque anterior"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json b/i18n/ptb/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
deleted file mode 100644
index 1c858bde51c..00000000000
--- a/i18n/ptb/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"wordHighlight": "Cor de fundo de um símbolo durante o acesso de leitura, como ao ler uma variável. A cor não deve ser opaca para não ocultar as decorações subjacentes.",
-	"wordHighlightStrong": "Cor de fundo de um símbolo durante o acesso de escrita, como ao escrever uma variável. A cor não deve ser opaca para não ocultar as decorações subjacentes.",
-	"wordHighlightBorder": "Cor de fundo de um símbolo durante acesso de leitura, como ao ler uma variável.",
-	"wordHighlightStrongBorder": "Cor de fundo de um símbolo durante acesso de escrita, como ao escrever uma variável.",
-	"overviewRulerWordHighlightForeground": "Visão geral da cor do marcador da régua para destaques de símbolos. A cor não deve ser opaca para não esconder decorações subjacentes.",
-	"overviewRulerWordHighlightStrongForeground": "Visão geral da cor do marcador da régua para destaques de símbolos de acesso de escrita. A cor não deve ser opaca para não esconder decorações subjacentes.",
-	"wordHighlight.next.label": "Ir para o próximo símbolo em destaque",
-	"wordHighlight.previous.label": "Ir para o símbolo de destaque anterior"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/editor/contrib/zoneWidget/browser/peekViewWidget.i18n.json b/i18n/ptb/src/vs/editor/contrib/zoneWidget/browser/peekViewWidget.i18n.json
deleted file mode 100644
index 41ad7313b7d..00000000000
--- a/i18n/ptb/src/vs/editor/contrib/zoneWidget/browser/peekViewWidget.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"label.close": "Fechar"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/editor/electron-browser/textMate/TMSyntax.i18n.json b/i18n/ptb/src/vs/editor/electron-browser/textMate/TMSyntax.i18n.json
deleted file mode 100644
index dfef3cc47a5..00000000000
--- a/i18n/ptb/src/vs/editor/electron-browser/textMate/TMSyntax.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"invalid.language": "Linguagem desconhecida em `contributes.{0}.language`. Valor fornecido: {1}",
-	"invalid.scopeName": "Esperada uma string em 'contributes.{0}.scopeName'. Valor informado: {1}",
-	"invalid.path.0": "Esperada uma string em `contributes.{0}.path`. Valor informado: {1}",
-	"invalid.injectTo": "Valor inválido em `contributes.{0}.injectTo`. Deve ser uma matriz de nomes de escopo de idioma. Valor fornecido: {1}",
-	"invalid.embeddedLanguages": "Valor inválido em `contributes.{0}.embeddedLanguages`. Deve ser um objeto de mapeamento do nome do escopo para a linguagem. Valor informado: {1}",
-	"invalid.path.1": "É esperado que `contributes.{0}.path` ({1}) seja incluído na pasta da extensão ({2}). Isto pode tornar a extensão não portável.",
-	"no-tm-grammar": "Nenhuma gramática TM registrada para este idioma."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/editor/node/languageConfigurationExtensionPoint.i18n.json b/i18n/ptb/src/vs/editor/node/languageConfigurationExtensionPoint.i18n.json
deleted file mode 100644
index 04aa2bc703f..00000000000
--- a/i18n/ptb/src/vs/editor/node/languageConfigurationExtensionPoint.i18n.json
+++ /dev/null
@@ -1,23 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"parseErrors": "Erros parseando {0}: {1}",
-	"schema.openBracket": "O colchete de abertura de caractere ou sequência de caracteres.",
-	"schema.closeBracket": "O colchete de fechamento de caractere ou sequência de caracteres.",
-	"schema.comments": "Define o símbolo dos comentários",
-	"schema.blockComments": "Define como comentários em bloco são marcados.",
-	"schema.blockComment.begin": "A sequência de caracteres que inicia um comentário em bloco.",
-	"schema.blockComment.end": "A sequência de caracteres que termina um comentário de bloco.",
-	"schema.lineComment": "A sequência de caracteres que inicia um comentário de linha.",
-	"schema.brackets": "Define os símbolos de colchetes que aumentam ou diminuem a indentação.",
-	"schema.autoClosingPairs": "Define os pares de colchetes. Quando é introduzido um colchete de abertura, o colchete de fechamento é inserido automaticamente.",
-	"schema.autoClosingPairs.notIn": "Define uma lista de escopos onde os auto pares são desativados.",
-	"schema.surroundingPairs": "Define os pares de colchetes que podem ser usados para cercar uma seqüência selecionada.",
-	"schema.wordPattern": "A definição da palavra para a linguagem.",
-	"schema.wordPattern.pattern": "O padrão RegExp usado para coincidir com as palavras.",
-	"schema.wordPattern.flags": "Os sinalizadores RegExp usados para coincidir com as palavras.",
-	"schema.wordPattern.flags.errorMessage": "Deve corresponder ao padrão `/^([gimuy]+)$/`."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/editor/node/textMate/TMGrammars.i18n.json b/i18n/ptb/src/vs/editor/node/textMate/TMGrammars.i18n.json
deleted file mode 100644
index 7707ea3401f..00000000000
--- a/i18n/ptb/src/vs/editor/node/textMate/TMGrammars.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"vscode.extension.contributes.grammars": "Contibui aos toquenizadores textmate",
-	"vscode.extension.contributes.grammars.language": "Identificador da linguagem para qual a sintaxe contribui.",
-	"vscode.extension.contributes.grammars.scopeName": "Nome do escopo Textmate usado pelo arquivo tmLanguage.",
-	"vscode.extension.contributes.grammars.path": "Caminho para o arquivo tmLanguage. O caminho é relativo a pasta da extensão e geralmente começa com './syntaxes/'.",
-	"vscode.extension.contributes.grammars.embeddedLanguages": "Um mapeamento no nome do escopo para o Id da linguagem se esta gramática contenha linguagens embutidas.",
-	"vscode.extension.contributes.grammars.injectTo": "Lista de nomes de escopos de linguagem aos quais esta gramática é injetada."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/platform/actions/browser/menuItemActionItem.i18n.json b/i18n/ptb/src/vs/platform/actions/browser/menuItemActionItem.i18n.json
deleted file mode 100644
index 0d4e76110bb..00000000000
--- a/i18n/ptb/src/vs/platform/actions/browser/menuItemActionItem.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"titleAndKb": "{0} ({1})"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json b/i18n/ptb/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
deleted file mode 100644
index 2aa222eaf70..00000000000
--- a/i18n/ptb/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"requirearray": "os itens de menu devem ser um array",
-	"requirestring": "a propriedade `{0}` é obrigatória e deve ser do tipo `string`",
-	"optstring": "a propriedade `{0}` é opcional ou deve ser do tipo `string`",
-	"vscode.extension.contributes.menuItem.command": "Identificador do comando para ser executado. O comando deve ser declarado na seção de 'Comandos'",
-	"vscode.extension.contributes.menuItem.alt": "O identificador de um comando alternativo para executar. O comando deve ser declarado na sessão 'Comandos'",
-	"vscode.extension.contributes.menuItem.when": "Condição, que deve ser verdadeira, para mostrar esse item",
-	"vscode.extension.contributes.menuItem.group": "Grupo ao qual pertence este comando",
-	"vscode.extension.contributes.menus": "Contribui itens de menu ao editor",
-	"menus.commandPalette": "Paleta de comandos",
-	"menus.touchBar": "A barra de toque (somente macOS)",
-	"menus.editorTitle": "Meno do título editor",
-	"menus.editorContext": "Mostrar o menu de contexto do editor",
-	"menus.explorerContext": "Menu no contexto de explorador de arquivos",
-	"menus.editorTabContext": "Mostrar o menu de contexto do editor",
-	"menus.debugCallstackContext": "O menu de contexto de pilha de chamadas de depuração",
-	"menus.scmTitle": "O menu de título do controle de fonte",
-	"menus.scmSourceControl": "O menu do Controle de Código Fonte",
-	"menus.resourceGroupContext": "O menu de contexto do grupo de recursos de controle de fonte",
-	"menus.resourceStateContext": "O menu de contexto de estado de recursos do controle de fonte",
-	"view.viewTitle": "O menu de título da visualização contribuída",
-	"view.itemContext": "O menu de contexto do item da visualização contribuída",
-	"nonempty": "Esperado um valor não vazio",
-	"opticon": "a propriedade '{0}' é opcional ou pode ser do tipo 'string'",
-	"requireStringOrObject": "a propriedade '{0}' é obrigatória e deve ser do tipo 'string'",
-	"requirestrings": "a propriedade `{0}` é obrigatória e deve ser do tipo `string`",
-	"vscode.extension.contributes.commandType.command": "Indentificador de comando para executar",
-	"vscode.extension.contributes.commandType.title": "Título para o qual o comando é representado na UI",
-	"vscode.extension.contributes.commandType.category": "(Opcional) Sequência de categoria será agrupada na interface de usuário",
-	"vscode.extension.contributes.commandType.icon": "(Opcional) Icone utilizado para representar o comando na interface de usuário. Um arquivo ou configuração do tema.",
-	"vscode.extension.contributes.commandType.icon.light": "Caminho do Ícone quando o tema light for utilizado",
-	"vscode.extension.contributes.commandType.icon.dark": "Caminho do ícone quando o tema dark for utilizado",
-	"vscode.extension.contributes.commands": "Contribui comandos à paleta de comandos",
-	"dup": "Comando '{0}' aparece multiplas vezes na sessão 'comandos'\n",
-	"menuId.invalid": "'{0}' nao é um identificador de menu válido ",
-	"missing.command": "Identificador do comando para ser executado. O comando deve ser declarado na seção de 'Comandos'",
-	"missing.altCommand": "Referências ao item de menu no alt-command '{0}' qual nao é definido na sessão 'comandos'",
-	"dupe.command": "Itens de referencias do mesmo comando como padrão e alt-command"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/platform/configuration/common/configurationRegistry.i18n.json b/i18n/ptb/src/vs/platform/configuration/common/configurationRegistry.i18n.json
deleted file mode 100644
index 1fbb5c16c29..00000000000
--- a/i18n/ptb/src/vs/platform/configuration/common/configurationRegistry.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"defaultConfigurations.title": "Sobreposições da Configuração Padrão",
-	"overrideSettings.description": "Definir que configurações do editor sejam substituídas para idioma {0}.",
-	"overrideSettings.defaultDescription": "Definir que configurações do editor sejam substituídas para um idioma.",
-	"config.property.languageDefault": "Não é possível registrar '{0}'. Isto corresponde a propriedade padrão '\\\\[.*\\\\]$' para descrever configurações do editor específico de linguagem. Use a contribuição 'configurationDefaults'.",
-	"config.property.duplicate": "Não é possível registrar '{0}'. Esta propriedade já está registrada."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/platform/dialogs/common/dialogs.i18n.json b/i18n/ptb/src/vs/platform/dialogs/common/dialogs.i18n.json
deleted file mode 100644
index f3c382a82fa..00000000000
--- a/i18n/ptb/src/vs/platform/dialogs/common/dialogs.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"moreFile": "... 1 arquivo adicional não está mostrado",
-	"moreFiles": "... {0} arquivos adicionais não estão mostrados"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/platform/dialogs/node/dialogService.i18n.json b/i18n/ptb/src/vs/platform/dialogs/node/dialogService.i18n.json
deleted file mode 100644
index 4a277edc564..00000000000
--- a/i18n/ptb/src/vs/platform/dialogs/node/dialogService.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"cancel": "Cancelar"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/platform/environment/node/argv.i18n.json b/i18n/ptb/src/vs/platform/environment/node/argv.i18n.json
deleted file mode 100644
index a3aea9d9c8c..00000000000
--- a/i18n/ptb/src/vs/platform/environment/node/argv.i18n.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"gotoValidation": "Argumentos no modo '--goto' deve ser no formato de 'Arquivo(:LINHA(:CARACTERE))'.",
-	"diff": "Comparar dois arquivos entre si.",
-	"add": "Adicione pasta(s) para a última janela ativa.",
-	"goto": "Abra um arquivo no caminho sobre a linha especificada e a posição do caractere.",
-	"newWindow": "Obriga a abrir uma nova janela.",
-	"reuseWindow": "Obriga a abrir um arquivo ou pasta na última janela ativa.",
-	"wait": "Espere pelos arquivos a serem fechados antes de retornar.",
-	"locale": "Para localização utilize (ex. en-US ou zh-TW).",
-	"userDataDir": "Especifica o diretório em que os dados do usuário são mantidos. Pode ser usado para abrir várias instâncias distintas do Code.",
-	"version": "Versão de impressão",
-	"help": "Uso de impressão.",
-	"extensionHomePath": "Defina o caminho raíz para as extensões.",
-	"listExtensions": "Lista de extensões instaladas",
-	"showVersions": "Exibir versões de extensões instaladas, quando estiver usando --list-extension",
-	"installExtension": "Instala uma extensão.",
-	"uninstallExtension": "Desinstala uma extensão.",
-	"experimentalApis": "Habilita recursos propostos a API para uma extensão.",
-	"verbose": "Imprimir a saída detalhada (Implica -- esperar).",
-	"log": "Nível de log a ser utilizado. O padrão é 'info'. Os valores permitidos são 'critical', 'error', 'warn', 'info', 'debug', 'trace', 'off'.",
-	"status": "Utilização do processo de impressão e informações de diagnóstico.",
-	"performance": "Comece com o 'Desenvolvedor: Desempenho de inicialização' comando habilitado.",
-	"prof-startup": "Rodar o CPU profiler durante a inicialização",
-	"disableExtensions": "Desabilita todas as extensões instaladas.",
-	"inspect-extensions": "Permite a depuração e profiling de extensões. Verifique as ferramentas de desenvolvedor para obter o URI da conexão.",
-	"inspect-brk-extensions": "Permite a depuração e profiling de extensões com o host de extensão sendo pausado após o início. Verifique as ferramentas de desenvolvedor para obter o URI da conexão.",
-	"disableGPU": "Desabilita aceleração de hardware via GPU.",
-	"uploadLogs": "Envia os registros de atividade da sessão atual para um destino seguro.",
-	"maxMemory": "Tamanho máximo de memória para uma janela (em Mbytes).",
-	"usage": "Uso",
-	"options": "opções",
-	"paths": "caminhos",
-	"stdinWindows": "Para ler a saída de outro programa, adicione '-' ao final (ex. 'echo Hello World | {0} -')",
-	"stdinUnix": "Para ler do stdin, adicione '-' ao final (ex. 'ps aux | grep code | {0} -')",
-	"optionsUpperCase": "Opções",
-	"extensionsManagement": "Gerenciamento de Extensões",
-	"troubleshooting": "Solução de problemas"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/platform/extensionManagement/common/extensionEnablementService.i18n.json b/i18n/ptb/src/vs/platform/extensionManagement/common/extensionEnablementService.i18n.json
deleted file mode 100644
index a00dc3f1a6c..00000000000
--- a/i18n/ptb/src/vs/platform/extensionManagement/common/extensionEnablementService.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noWorkspace": "Não há espaço de trabalho."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/platform/extensionManagement/common/extensionManagement.i18n.json b/i18n/ptb/src/vs/platform/extensionManagement/common/extensionManagement.i18n.json
deleted file mode 100644
index 599a159bb40..00000000000
--- a/i18n/ptb/src/vs/platform/extensionManagement/common/extensionManagement.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"extensions": "Extensões",
-	"preferences": "Preferências"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/platform/extensionManagement/node/extensionGalleryService.i18n.json b/i18n/ptb/src/vs/platform/extensionManagement/node/extensionGalleryService.i18n.json
deleted file mode 100644
index 3098cddf8d6..00000000000
--- a/i18n/ptb/src/vs/platform/extensionManagement/node/extensionGalleryService.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"notCompatibleDownload": "Não foi possível baixar porque a extensão compatível com a versão atual '{0}' do VS Code não foi encontrada."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json b/i18n/ptb/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
deleted file mode 100644
index 69dfaa48d2b..00000000000
--- a/i18n/ptb/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"invalidManifest": "Extensão inválida: pacote.json nao é um arquivo JSON válido",
-	"incompatible": "Não é possível instalar a Extensão '{0}' que não é compatível com o Code '{1}'.",
-	"restartCode": "Por favor reinicie Code antes de reinstalar {0}.",
-	"installingOutdatedExtension": "Uma nova versão desta extensão já está instalada. Você deseja sobrescrever esta instalação com a versão mais antiga?",
-	"override": "Sobrescrever",
-	"cancel": "Cancelar",
-	"errorInstallingDependencies": "Erro ao instalar dependências. {0}",
-	"MarketPlaceDisabled": "Loja não está habilitada.",
-	"removeError": "Erro ao remover a extensão: {0}. por favor, Saia e Inicie o VS Code antes de tentar novamente.",
-	"Not a Marketplace extension": "Somente Extensões da Loja podem ser reinstaladas",
-	"notFoundCompatible": "Não foi possível instalar '{0}; não existe nenhuma versão compatível com o VSCode '{1}'.",
-	"malicious extension": "Não foi possível instalar a extensão, pois foi relatada como problemática.",
-	"notFoundCompatibleDependency": "Não foi possível instalar porque a extensão dependente '{0}' compatível com a versão atual '{1}' do VS Code não foi encontrada.",
-	"quitCode": "Não foi possível instalar a extensão. Por favor, saia e reinicie o VS Code antes de reinstalar.",
-	"exitCode": "Não foi possível instalar a extensão. Por favor, saia e reinicie o VS Code antes de reinstalar.",
-	"renameError": "Erro desconhecido ao renomear {0} para {1}",
-	"uninstallDependeciesConfirmation": "Gostaria de desinstalar '{0}' somente, ou suas dependências também?",
-	"uninstallOnly": "Somente Extensão",
-	"uninstallAll": "Desinstalar Tudo",
-	"singleDependentError": "Não foi possível desinstalar a extensão '{0}'. A extensão '{1}' depende dela.",
-	"twoDependentsError": "Não foi possível desinstalar a extensão '{0}'. As extensões '{1}' e '{2}' dependem dela.",
-	"multipleDependentsError": "Não foi possível desinstalar a extensão '{0}'. As extensões '{1}' e '{2}' e outras dependem dela.",
-	"notExists": "Não foi possível encontrar a extensão"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/platform/extensions/common/abstractExtensionService.i18n.json b/i18n/ptb/src/vs/platform/extensions/common/abstractExtensionService.i18n.json
deleted file mode 100644
index d521fce97ff..00000000000
--- a/i18n/ptb/src/vs/platform/extensions/common/abstractExtensionService.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"unknownDep": "Extensão '{1}' falhou ao ativar. Motivo: dependência desconhecida '{0}'.",
-	"failedDep1": "Extensão '{1}' falhou ao ativar. Motivo: a dependência '{0}' falhou ao ativar.",
-	"failedDep2": "Extensão '{0}' falhou ao ativar. Motivo: mais de 10 níveis de dependências (provavelmente um laço de dependência).",
-	"activationError": "Ativação da extensão `{0}` falhou: {1}."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/platform/extensions/common/extensionsRegistry.i18n.json b/i18n/ptb/src/vs/platform/extensions/common/extensionsRegistry.i18n.json
deleted file mode 100644
index f12b0743598..00000000000
--- a/i18n/ptb/src/vs/platform/extensions/common/extensionsRegistry.i18n.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.engines.vscode": "Para extensões do VS Code, especifica a versão do VS Code que a extensão é compatível. Não pode ser *. Por exemplo: ^0.10.5 indica compatibilidade com uma versão mínima de 0.10.5 para o VS Code.",
-	"vscode.extension.publisher": "O editor da extensão do VS Code.",
-	"vscode.extension.displayName": "O nome de exibição para a extensão do VS Code.",
-	"vscode.extension.categories": "As categorias usadas pela galeria do VS Code para categorizar a extensão.",
-	"vscode.extension.galleryBanner": "Banner usado na loja VS Code.",
-	"vscode.extension.galleryBanner.color": "A cor do banner usado no cabeçalho de página da loja VS Code.",
-	"vscode.extension.galleryBanner.theme": "A cor do tema usada para o fonte usado no banner.",
-	"vscode.extension.contributes": "Todas as contribuições da extensão VS Code representadas por este pacote.",
-	"vscode.extension.preview": "Configura a extensão para ser marcada como pré-visualização na Loja.",
-	"vscode.extension.activationEvents": "Eventos de ativação para a extensão VS Code.",
-	"vscode.extension.activationEvents.onLanguage": "Um evento de ativação emitido sempre que um arquivo que resolve para a linguagem especificada é aberto.",
-	"vscode.extension.activationEvents.onCommand": "Um evento de ativação emitido sempre que o comando especificado for invocado.",
-	"vscode.extension.activationEvents.onDebug": "Um evento de ativação emitido sempre que um usuário está prestes a iniciar a depuração ou a definir as configurações de depuração.",
-	"vscode.extension.activationEvents.onDebugInitialConfigurations": "Um evento de ativação é emitido sempre que um \"launch.json\" precisa ser criado (e todos os métodos provideDebugConfigurations precisam ser chamados).",
-	"vscode.extension.activationEvents.onDebugResolve": "Um evento de ativação emitido quando uma sessão de debug com um tipo específico está para ser iniciada (e um método resolveDebugConfiguration correspondente precisa ser chamado).",
-	"vscode.extension.activationEvents.workspaceContains": "Um evento de ativação emitido quando uma pasta que contém pelo menos um arquivo correspondente ao padrão global especificado é aberta.",
-	"vscode.extension.activationEvents.onView": "Um evento de ativação emitido sempre que o modo de visualização especificado é expandido.",
-	"vscode.extension.activationEvents.star": "Um evento de ativação emitido na inicialização do VS Code. Para garantir uma ótima experiência de usuário, por favor, use este evento de ativação em sua extensão somente quando nenhuma outra combinação de eventos de ativação funcionar em seu caso de uso.",
-	"vscode.extension.badges": "Matriz de emblemas a mostrar na barra lateral da página da extensão na Loja.",
-	"vscode.extension.badges.url": "URL da imagem do emblema.",
-	"vscode.extension.badges.href": "Link do emblema.",
-	"vscode.extension.badges.description": "Descrição do emblema.",
-	"vscode.extension.extensionDependencies": "Dependências para outras extensões. O identificador de uma extensão sempre é ${publisher}. ${nome}. Por exemplo: vscode.csharp.",
-	"vscode.extension.scripts.prepublish": "Script a ser executado antes do pacote ser publicado como uma extensão VS Code.",
-	"vscode.extension.icon": "O caminho para um ícone de 128x128 pixels."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/platform/extensions/node/extensionValidator.i18n.json b/i18n/ptb/src/vs/platform/extensions/node/extensionValidator.i18n.json
deleted file mode 100644
index d39a4b618e1..00000000000
--- a/i18n/ptb/src/vs/platform/extensions/node/extensionValidator.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"versionSyntax": "Não foi possível analisar o valor {0} de `engines.vscode`. Por favor, utilize por exemplo: ^1.22.0, ^1.22.x, etc.",
-	"versionSpecificity1": "Versão especificada em 'engines.vscode' ({0}) não é específica o suficiente. Para versões do vscode anteriores a 1.0.0, por favor defina no mínimo a versão principal e secundária desejada. Por exemplo, ^ 0.10.0, 0.10.x, 0.11.0, etc.",
-	"versionSpecificity2": "Versão especificada em 'engines.vscode' ({0}) não é específica o suficiente. Para as versões do vscode posteriores a 1.0.0, por favor defina no mínimo a versão principal do desejado. Por exemplo, ^ 1.10.0, 1.10.x 1. XX, 2.x.x, etc.",
-	"versionMismatch": "Extensão não é compatível com Code {0}. A extensão requer: {1}."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/platform/history/electron-main/historyMainService.i18n.json b/i18n/ptb/src/vs/platform/history/electron-main/historyMainService.i18n.json
deleted file mode 100644
index 9f4e32a311d..00000000000
--- a/i18n/ptb/src/vs/platform/history/electron-main/historyMainService.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"newWindow": "Nova Janela",
-	"newWindowDesc": "Abrir uma nova janela",
-	"recentFolders": "Espaços de trabalho recentes",
-	"folderDesc": "{0} {1}",
-	"codeWorkspace": "Área de trabalho de código"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/platform/integrity/node/integrityServiceImpl.i18n.json b/i18n/ptb/src/vs/platform/integrity/node/integrityServiceImpl.i18n.json
deleted file mode 100644
index a3c2b5abd84..00000000000
--- a/i18n/ptb/src/vs/platform/integrity/node/integrityServiceImpl.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"integrity.prompt": "Sua instalação de {0} parece estar corrompida. Favor reinstalar.",
-	"integrity.moreInformation": "Mais informações",
-	"integrity.dontShowAgain": "Não mostrar novamente"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/platform/issue/electron-main/issueService.i18n.json b/i18n/ptb/src/vs/platform/issue/electron-main/issueService.i18n.json
deleted file mode 100644
index a1040e27fa1..00000000000
--- a/i18n/ptb/src/vs/platform/issue/electron-main/issueService.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"issueReporter": "Notificador de Problemas",
-	"processExplorer": "Explorador de Processos"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/platform/jsonschemas/common/jsonValidationExtensionPoint.i18n.json b/i18n/ptb/src/vs/platform/jsonschemas/common/jsonValidationExtensionPoint.i18n.json
deleted file mode 100644
index f033dcfee55..00000000000
--- a/i18n/ptb/src/vs/platform/jsonschemas/common/jsonValidationExtensionPoint.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"contributes.jsonValidation": "Contribui à configuração do schema json.",
-	"contributes.jsonValidation.fileMatch": "O padrão de arquivo a corresponder, por exemplo \"package.json\" ou \"*.launch\".",
-	"contributes.jsonValidation.url": "Um esquema de URL ('http:', 'https:') ou caminho relativo à pasta de extensão('./').",
-	"invalid.jsonValidation": "'configuration.jsonValidation' deve ser uma matriz",
-	"invalid.fileMatch": "'configuration.jsonValidation.fileMatch' deve ser definido",
-	"invalid.url": "'configuration.jsonValidation.url' deve ser uma URL ou caminho relativo",
-	"invalid.url.fileschema": "'configuration.jsonValidation.url' é uma URL relativa inválida: {0}",
-	"invalid.url.schema": "'configuration.jsonValidation.url' deve começar com ' http:', ' https: 'ou'. /' para os esquemas de referência localizados na extensão"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/platform/keybinding/common/abstractKeybindingService.i18n.json b/i18n/ptb/src/vs/platform/keybinding/common/abstractKeybindingService.i18n.json
deleted file mode 100644
index 74f3039037d..00000000000
--- a/i18n/ptb/src/vs/platform/keybinding/common/abstractKeybindingService.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"first.chord": "({0}) foi pressionado. Aguardando segunda tecla de pressionamento simultâneo...",
-	"missing.chord": "A combinação de chave ({0}, {1}) não é um comando."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/platform/keybinding/common/keybindingLabels.i18n.json b/i18n/ptb/src/vs/platform/keybinding/common/keybindingLabels.i18n.json
deleted file mode 100644
index bf2baf83906..00000000000
--- a/i18n/ptb/src/vs/platform/keybinding/common/keybindingLabels.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"ctrlKey": "Ctrl",
-	"shiftKey": "Shift",
-	"altKey": "Alt",
-	"windowsKey": "Windows",
-	"ctrlKey.long": "Controle",
-	"shiftKey.long": "Shift",
-	"altKey.long": "Alt",
-	"cmdKey.long": "Comando",
-	"windowsKey.long": "Windows"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/platform/list/browser/listService.i18n.json b/i18n/ptb/src/vs/platform/list/browser/listService.i18n.json
deleted file mode 100644
index e21fa3376d2..00000000000
--- a/i18n/ptb/src/vs/platform/list/browser/listService.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"workbenchConfigurationTitle": "Área de Trabalho",
-	"multiSelectModifier.ctrlCmd": "Mapeia para 'Control' no Windows e Linux e para 'Command' no macOS.",
-	"multiSelectModifier.alt": "Mapeia para 'Alt' no Windows e Linux e 'Option' no macOS.",
-	"multiSelectModifier": "O modificador deve ser usado para adicionar um item nas listas e árvores para uma multi-seleção com o mouse (por exemplo, no explorador, editores abertos e exibição scm). 'ctrlCmd' mapeia para 'Control' no Windows e Linux e 'Command' no macOS. Os gestos do mouse 'Aberto ao lado' - se suportado - irá adaptar-se de tal forma que eles não entrem em conflito com o modificador de várias seleções.",
-	"openMode.singleClick": "Abre os itens em um único clique do mouse.",
-	"openMode.doubleClick": "Abre os itens com duplo clique do mouse. ",
-	"openModeModifier": "Controla como abrir itens em árvores e listas usando o mouse (se suportado). Definido como 'singleClick' para abrir itens com um único clique do mouse e 'doubleClick' para abrir somente através do duplo clique do mouse. Para os pais com filhos em árvores, essa configuração controla se um único clique expande o pai ou um clique duplo. Note que algumas árvores e listas podem optar por ignorar essa configuração, se não for aplicável. ",
-	"horizontalScrolling setting": "Controla se as árvores suportam a rolagem horizontal na área de trabalho."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/platform/localizations/common/localizations.i18n.json b/i18n/ptb/src/vs/platform/localizations/common/localizations.i18n.json
deleted file mode 100644
index e8f51c0e5c9..00000000000
--- a/i18n/ptb/src/vs/platform/localizations/common/localizations.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.contributes.localizations": "Contribui localizações ao editor",
-	"vscode.extension.contributes.localizations.languageId": "Id do idioma em que as strings de exibição estão traduzidas.",
-	"vscode.extension.contributes.localizations.languageName": "Nome do idioma em Inglês.",
-	"vscode.extension.contributes.localizations.languageNameLocalized": "Nome do idioma no idioma de contribuição.",
-	"vscode.extension.contributes.localizations.translations": "Lista de traduções associadas ao idioma.",
-	"vscode.extension.contributes.localizations.translations.id": "Id do VS Code ou Extensão para o qual essa tradução teve contribuição. Id do VS Code é sempre `vscode` e da extensão deve ser no formato `publisherId.extensionName`.",
-	"vscode.extension.contributes.localizations.translations.id.pattern": "Id deve ser `vscode` ou no formato `publisherId.extensionName` para traduzir VS code ou uma extensão, respectivamente.",
-	"vscode.extension.contributes.localizations.translations.path": "Um caminho relativo para um arquivo contendo traduções para o idioma."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/platform/markers/common/markers.i18n.json b/i18n/ptb/src/vs/platform/markers/common/markers.i18n.json
deleted file mode 100644
index 1b82ec1834e..00000000000
--- a/i18n/ptb/src/vs/platform/markers/common/markers.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"sev.error": "Erro",
-	"sev.warning": "Aviso",
-	"sev.info": "Informações"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/platform/markers/common/problemMatcher.i18n.json b/i18n/ptb/src/vs/platform/markers/common/problemMatcher.i18n.json
deleted file mode 100644
index 84c0fae373e..00000000000
--- a/i18n/ptb/src/vs/platform/markers/common/problemMatcher.i18n.json
+++ /dev/null
@@ -1,72 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"ProblemPatternParser.loopProperty.notLast": "A propriedade loop só é suportada na última linha correspondente.",
-	"ProblemPatternParser.problemPattern.missingRegExp": "Está faltando uma expressão regular a problema padrão.",
-	"ProblemPatternParser.problemPattern.missingProperty": "O problema padrão é inválido. Ele deve ter ao menos um arquivo, mensagem e linha ou local de grupo de correspondência.",
-	"ProblemPatternParser.invalidRegexp": "Erro: a cadeia de caracteres {0} não é uma expressão regular válida.\n",
-	"ProblemPatternSchema.regexp": "A expressão regular para procurar um erro, aviso ou informação na saída.",
-	"ProblemPatternSchema.file": "O índice do grupo de correspondência do arquivo. Se omitido, será usado 1.",
-	"ProblemPatternSchema.location": "O índice de grupo de correspondência da localização do problema. Padrões de localização válidos são: (linha), (linha, coluna) e (startLine, startColumn, endLine, endColumn). Se omitido (linha, coluna) é assumido.",
-	"ProblemPatternSchema.line": "O índice de grupo de correspondência da linha do problema. O padrão é 2",
-	"ProblemPatternSchema.column": "O índice de grupo de correspondência de caractere da linha do problema. O padrão é 3",
-	"ProblemPatternSchema.endLine": "O índice de grupo de correspondência de linha final do problema. O padrão é indefinido",
-	"ProblemPatternSchema.endColumn": "O índice de grupo de correspondência de caráter final de linha do problema. O padrão é indefinido",
-	"ProblemPatternSchema.severity": "O índice de grupo de correspondência da gravidade do problema. O padrão é indefinido",
-	"ProblemPatternSchema.code": "O índice de grupo de correspondência do código do problema. O padrão é indefinido",
-	"ProblemPatternSchema.message": "O índice de grupo de correspondência da mensagem. Se omitido o padrão é 4 se o local for especificado. Caso contrário o padrão é 5.",
-	"ProblemPatternSchema.loop": "Em um loop de correspondência multi linha indica se este padrão é executado em um loop enquanto houver correspondências. Somente pode ser especificado no último padrão em um padrão de linha múltiplas.",
-	"NamedProblemPatternSchema.name": "O nome do modelo de problema.",
-	"NamedMultiLineProblemPatternSchema.name": "O nome do modelo de problema multi-linhas.",
-	"NamedMultiLineProblemPatternSchema.patterns": "Os padrões atuais.",
-	"ProblemPatternExtPoint": "Contribui aos modelos de problema",
-	"ProblemPatternRegistry.error": "Modelo de problema inválido. O  modelo será ignorado.",
-	"ProblemMatcherParser.noProblemMatcher": "Erro: a descrição não pode ser convertida em uma correspondência de problema:\n{0}\n\n",
-	"ProblemMatcherParser.noProblemPattern": "Erro: a descrição nao define um padrão de problema válido: {0}\n",
-	"ProblemMatcherParser.noOwner": "Erro: a descriçao não define um proprietário:\n{0}\n",
-	"ProblemMatcherParser.noFileLocation": "Erro: a descrição não define uma localização de arquivo:\n{0}\n",
-	"ProblemMatcherParser.unknownSeverity": "Info: severidade {0} desconhecida. Valores válidos são erro, aviso e info.\n",
-	"ProblemMatcherParser.noDefinedPatter": "Erro: o padrão com o identificador {0} não existe.",
-	"ProblemMatcherParser.noIdentifier": "Erro: a propriedade padrão se refere a um identificador vazio.",
-	"ProblemMatcherParser.noValidIdentifier": "Erro: a propriedade padrão {0} não é uma variável de padrões válida.",
-	"ProblemMatcherParser.problemPattern.watchingMatcher": "Um problema de correspondência deve obrigatoriamente definir padrão inicial e um padrão final para monitoramento.",
-	"ProblemMatcherParser.invalidRegexp": "Erro: a cadeia de caracteres {0} não é uma expressão regular válida. ",
-	"WatchingPatternSchema.regexp": "A expressão regular para detectar o início ou o fim de uma tarefa em segundo plano.",
-	"WatchingPatternSchema.file": "O índice do grupo de correspondência do arquivo. Pode ser omitido.",
-	"PatternTypeSchema.name": "O nome de um padrão pré-definido ou contribuído.",
-	"PatternTypeSchema.description": "Um padrão de problema ou o nome de um padrão de problema pré-definido ou contribuído. Pode ser omitido se base for especificada.",
-	"ProblemMatcherSchema.base": "O nome de uma correspondência de problema base a ser utilizado.",
-	"ProblemMatcherSchema.owner": "O proprietário de um problema dentro do código. Pode ser omitido se base for especificada. Default para 'externo' se omitido e base não for especificada.",
-	"ProblemMatcherSchema.severity": "A severidade padrão para captura de problemas. É utilizada se o padrão não definir um grupo correspondente para severidade.",
-	"ProblemMatcherSchema.applyTo": "Controla se um problema reportado em um documento de texto é aplicado somente para aberto, fechado ou todos os documentos.",
-	"ProblemMatcherSchema.fileLocation": "Define como os nomes de arquivos reportados em um padrão de problema devem ser interpretados.",
-	"ProblemMatcherSchema.background": "Padrões para monitorar o início e o término de um pesquisador ativo em uma tarefa em segundo plano.",
-	"ProblemMatcherSchema.background.activeOnStart": "Se configurado para verdadeiro, o monitor em segundo plano está em modo ativo quando a tarefa inicia. Isto é igual a emissão de uma linha que corresponde ao beginPattern",
-	"ProblemMatcherSchema.background.beginsPattern": "Se houver correspondência na saída o início de uma tarefa em segundo plano é sinalizada.",
-	"ProblemMatcherSchema.background.endsPattern": "Se houver correspondência na saída o final de uma tarefa em segundo plano é sinalizada.",
-	"ProblemMatcherSchema.watching.deprecated": "A propriedade watching foi descontinuada. Use background no lugar dela.",
-	"ProblemMatcherSchema.watching": "Padrões para monitorar o início e o término de um pesquisador observando.",
-	"ProblemMatcherSchema.watching.activeOnStart": "Se configurado para verdadeiro, o monitoramento está em modo ativo quando a tarefa inicia. Isto é igual a emissão de uma linha que corresponde ao beginPattern",
-	"ProblemMatcherSchema.watching.beginsPattern": "Se houver correspondência na saída o início de uma tarefa observada é sinalizada.",
-	"ProblemMatcherSchema.watching.endsPattern": "Se houver correspondência na saída o final de uma tarefa observada é sinalizada.",
-	"LegacyProblemMatcherSchema.watchedBegin.deprecated": "Esta propriedade está descontinuada. Ao invés, use a propriedade de observação.",
-	"LegacyProblemMatcherSchema.watchedBegin": "Uma expressão regular sinalizando que uma tarefa observada é ativada através da observação.",
-	"LegacyProblemMatcherSchema.watchedEnd.deprecated": "Esta propriedade está descontinuada. Ao invés, use a propriedade de observação.",
-	"LegacyProblemMatcherSchema.watchedEnd": "Uma expressão regular sinalizando que uma tarefa observada terminou a execução.",
-	"NamedProblemMatcherSchema.name": "O nome do correspondente do problema usado para se referir a ele.",
-	"NamedProblemMatcherSchema.label": "Um rótulo legível para o correspondente do problema.",
-	"ProblemMatcherExtPoint": "Contribui aos correspondentes de problema",
-	"msCompile": "Problemas do compilador Microsoft",
-	"lessCompile": "Menos problemas",
-	"gulp-tsc": "Problemas do Gulp TSC",
-	"jshint": "Problemas JSHint",
-	"jshint-stylish": "Problemas de estilo JSHint",
-	"eslint-compact": "Problemas compactos ESLint",
-	"eslint-stylish": "Problemas de estilo ESLint",
-	"go": "Problemas Go"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/platform/message/common/message.i18n.json b/i18n/ptb/src/vs/platform/message/common/message.i18n.json
deleted file mode 100644
index c464e8e6468..00000000000
--- a/i18n/ptb/src/vs/platform/message/common/message.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"close": "Fechar",
-	"later": "Mais tarde",
-	"cancel": "Cancelar",
-	"moreFile": "... 1 arquivo adicional não está mostrado",
-	"moreFiles": "... {0} arquivos adicionais não estão mostrados"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/platform/node/minimalTranslations.i18n.json b/i18n/ptb/src/vs/platform/node/minimalTranslations.i18n.json
deleted file mode 100644
index 65ddd57ca57..00000000000
--- a/i18n/ptb/src/vs/platform/node/minimalTranslations.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"searchMarketplace": "Pesquisar na Loja"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/platform/request/node/request.i18n.json b/i18n/ptb/src/vs/platform/request/node/request.i18n.json
deleted file mode 100644
index b18c7c21dbd..00000000000
--- a/i18n/ptb/src/vs/platform/request/node/request.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"httpConfigurationTitle": "HTTP",
-	"proxy": "As configurações de proxy a usar. Se não forem configuradas, serão obtidas das variáveis de ambiente http_proxy e https_proxy",
-	"strictSSL": "Se o certificado do servidor de proxy deve ser verificado contra a lista de autoridades de certificação fornecida.",
-	"proxyAuthorization": "O valor para enviar como o cabeçalho de 'autorização Proxy' para cada solicitação de rede."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/platform/telemetry/common/telemetryService.i18n.json b/i18n/ptb/src/vs/platform/telemetry/common/telemetryService.i18n.json
deleted file mode 100644
index ec88e9dc374..00000000000
--- a/i18n/ptb/src/vs/platform/telemetry/common/telemetryService.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"telemetryConfigurationTitle": "Telemetria",
-	"telemetry.enableTelemetry": "Permitir que os dados de uso e erros sejam enviados à Microsoft."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/platform/theme/common/colorExtensionPoint.i18n.json b/i18n/ptb/src/vs/platform/theme/common/colorExtensionPoint.i18n.json
deleted file mode 100644
index 16386f1dd26..00000000000
--- a/i18n/ptb/src/vs/platform/theme/common/colorExtensionPoint.i18n.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"contributes.color": "Contribui com a extensão de cores temáticas definidas",
-	"contributes.color.id": "O identificador da cor temática",
-	"contributes.color.id.format": "Identificadores devem estar no formato aa [.bb] *",
-	"contributes.color.description": "A descrição da cor temática",
-	"contributes.defaults.light": "A cor padrão para temas claros. Um valor de cor em hexadecimal (#RRGGBB[AA]) ou o identificador de uma cor temática que fornece o padrão.",
-	"contributes.defaults.dark": "A cor padrão para temas escuros. Um valor de cor em hexadecimal (#RRGGBB[AA]) ou o identificador de uma cor temática que fornece o padrão.",
-	"contributes.defaults.highContrast": "A cor padrão para temas de alto contraste. Um valor de cor em hexadecimal (#RRGGBB[AA]) ou o identificador de uma cor temática que fornece o padrão.",
-	"invalid.colorConfiguration": "'configuration.colors' deve ser uma matriz",
-	"invalid.default.colorType": "{0} deve ser um valor de cor em hexadecimal (#RRGGBB [AA] ou #RGB[A]) ou o identificador de uma cor temática que fornece o padrão.",
-	"invalid.id": "'configuration.colors.id' deve ser definido e não pode estar vazio",
-	"invalid.id.format": "'configuration.colors.id' deve seguir a palavra [.word] *",
-	"invalid.description": "'configuration.colors.description' deve ser definido e não pode estar vazio",
-	"invalid.defaults": "'configuration.colors.defaults' deve ser definido e deve conter 'claro', 'escuro' e 'Alto Contraste'"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/platform/theme/common/colorRegistry.i18n.json b/i18n/ptb/src/vs/platform/theme/common/colorRegistry.i18n.json
deleted file mode 100644
index 260c1b4a3e4..00000000000
--- a/i18n/ptb/src/vs/platform/theme/common/colorRegistry.i18n.json
+++ /dev/null
@@ -1,93 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"schema.colors": "Cores usadas no workbench.",
-	"foreground": "Cor de primeiro plano geral. Essa cor é só usada se não for substituída por um componente.",
-	"errorForeground": "Cor de primeiro plano geral para mensagens de erro. Essa cor é só usada se não for substituída por um componente.",
-	"descriptionForeground": "Cor de primeiro plano para a descrição do texto provendo informação adicional, por exemplo para uma etiqueta.",
-	"focusBorder": "Cor geral da borda para elementos focalizados. Essa cor é usada somente se não for substituída por um componente.",
-	"contrastBorder": "Uma borda extra em torno de elementos para separá-los dos outros de maior contraste.",
-	"activeContrastBorder": "Uma borda extra em torno de elementos ativos para separá-los dos outros de maior contraste.",
-	"selectionBackground": "A cor de fundo das seleções de texto na área de trabalho (por exemplo, para campos de entrada ou áreas de texto). Note que isto não se aplica a seleções dentro do editor.",
-	"textSeparatorForeground": "Cor para separadores de texto.",
-	"textLinkForeground": "Cor de primeiro plano para links no texto.",
-	"textPreformatForeground": "Cor de primeiro plano para segmentos de texto pré-formatados.",
-	"textBlockQuoteBackground": "Cor de fundo para blocos de citações no texto.",
-	"textBlockQuoteBorder": "Cor da borda para blocos de citações no texto.",
-	"textCodeBlockBackground": "Cor de fundo para blocos de código no texto.",
-	"widgetShadow": "Cor de sombra ferramentas como localizar/substituir dentro do editor.",
-	"inputBoxBackground": "Cor de fundo da caixa de entrada.",
-	"inputBoxForeground": "Cor de primeiro plano da caixa de entrada.",
-	"inputBoxBorder": "Borda da caixa de entrada.",
-	"inputBoxActiveOptionBorder": "Cor da borda das opções ativas em campos de entrada.",
-	"inputPlaceholderForeground": "Cor de primeiro plano da caixa de entrada para o texto de espaço reservado.",
-	"inputValidationInfoBackground": "Cor de fundo de validação de entrada para a severidade de informações.",
-	"inputValidationInfoBorder": "Cor da borda de validação de entrada para a severidade de informações.",
-	"inputValidationWarningBorder": "Cor da borda de validação para a severidade de avisos.",
-	"inputValidationErrorBackground": "Cor de fundo de validação de entrada para a severidade do erro.",
-	"inputValidationErrorBorder": "Cor da borda de validação de entrada para a severidade do erro.",
-	"dropdownBackground": "Cor de fundo do menu suspenso.",
-	"dropdownListBackground": "Fundo da lista do menu suspenso.",
-	"dropdownForeground": "Cor de primeiro plano do menu suspenso.",
-	"dropdownBorder": "Borda do menu suspenso.",
-	"listFocusBackground": "Cor de fundo para o item focalizado de Lista/árvore quando a lista/árvore está ativa. Uma árvore/lista de ativa tem o foco do teclado, uma inativa não.",
-	"listFocusForeground": "Cor de fundo da Lista/árvore para o item focalizado quando a lista/árvore está ativa. Uma árvore/lista ativa tem o foco do teclado, uma inativa não.",
-	"listActiveSelectionBackground": "Cor de fundo para o item selecionado de Lista/árvore quando a lista/árvore está ativa. Uma lista/árvore ativa tem o foco do teclado, uma inativa não.",
-	"listActiveSelectionForeground": "Cor de primeiro plano para o item selecionado de Lista/árvore quando a lista/árvore está ativa. Uma lista/árvore ativa tem o foco do teclado, uma inativa não.",
-	"listInactiveSelectionBackground": "Cor de fundo para o item selecionado de Lista/árvore quando a lista/árvore está inativa. Uma lista/árvore ativa tem o foco do teclado, uma inativa não.",
-	"listInactiveSelectionForeground": "Cor de primeiro plano para Lista/árvore para o item selecionado quando a lista/árvore está inativa. Uma árvore/lista ativa tem o foco do teclado, um inativo não.",
-	"listHoverBackground": "Cor de fundo de Lista/árvore quando pairando sobre itens usando o mouse.",
-	"listHoverForeground": "Primeiro plano da Lista/Árvoce quando passar sobre itens usando o mouse.",
-	"listDropBackground": "Cor de fundo ao arrastar e soltar de Lista/árvore quando movendo itens usando o mouse.",
-	"highlight": "Cor de primeiro plano de Lista/árvore de destaques de correspondências ao pesquisar na  árvore/lista.",
-	"invalidItemForeground": "Cor de primeiro plano da lista/árvore para itens inválidos, por exemplo, uma raiz não resolvida no explorador.",
-	"pickerGroupForeground": "Seletor rápido de cor para rótulos de agrupamento.",
-	"pickerGroupBorder": "Seletor rápido de cor para bordas de agrupamentos.",
-	"buttonForeground": "Cor de primeiro plano do botão.",
-	"buttonBackground": "Cor de fundo do botão.",
-	"buttonHoverBackground": "Cor de fundo de botão quando flutuar sobre ele.",
-	"badgeBackground": "Cor de fundo do distintivo. Distintivos são rótulos de pequenas informações, por exemplo, para a contagem de resultados de pesquisa.",
-	"badgeForeground": "Cor de primeiro plano do distintivo. Distintivos são rótulos de pequenas informações, por exemplo, para a contagem de resultados de pesquisa.",
-	"scrollbarShadow": "Sombra da barra de rolagem para indicar que a visualização está sendo rolada.",
-	"scrollbarSliderBackground": "Cor de fundo da barra de rolagem.",
-	"scrollbarSliderHoverBackground": "Cor de fundo da barra de rolagem quando o cursor do mouse estiver sobre ela.",
-	"progressBarBackground": "Cor de fundo da barra de progresso que pode ser mostrada em operações de execução demorada.",
-	"editorBackground": "Cor de plano de fundo do editor.",
-	"editorForeground": "Cor de primeiro plano padrão do editor.",
-	"editorWidgetBackground": "Cor de plano de fundo das ferramentas de edição, como pesquisar/substituir.",
-	"editorWidgetBorder": "Cor da borda das ferramentas do editor. A cor é usada somente se a ferramenta escolhe ter uma borda e a cor não é substituída por uma ferramenta.",
-	"editorSelectionBackground": "Cor de seleção do editor.",
-	"editorSelectionForeground": "Cor do texto selecionado para alto contraste.",
-	"editorInactiveSelection": "Cor da seleção em um editor inativo. A cor não deve ser opaca para não esconder decorações subjacentes.",
-	"editorSelectionHighlight": "Cor para regiões com o mesmo conteúdo da seleção. A cor não deve ser opaca para não esconder decorações subjacentes.",
-	"editorSelectionHighlightBorder": "Cor da borda para regiões com o mesmo conteúdo da seleção.",
-	"editorFindMatch": "Cor da correspondência de pesquisa atual.",
-	"findMatchHighlight": "Cor dos outros termos que correspondem ao da pesquisa. A cor não deve ser opaca para não esconder as decorações subjacentes.",
-	"editorFindMatchBorder": "Cor da borda da correspondência de pesquisa atual.",
-	"findMatchHighlightBorder": "Cor da borda dos outros resultados de pesquisa.",
-	"findRangeHighlightBorder": "Cor da borda da faixa limitando a pesquisa. A cor não deve ser opaca para não esconder decorações subjacentes.",
-	"hoverHighlight": "Destaque abaixo da palavra para qual um flutuador é mostrado. A cor não deve ser opaca para não esconder decorações subjacentes.",
-	"hoverBackground": "Cor de fundo para o item flutuante do editor",
-	"hoverBorder": "Cor da borda para o item flutuante do editor.",
-	"activeLinkForeground": "Cor dos links ativos.",
-	"diffEditorInserted": "Cor de fundo para o texto que foi inserido. A cor não deve ser opaca para não esconder as decorações subjacentes.",
-	"diffEditorRemoved": "Cor de fundo para o texto que foi removido. A cor não deve ser opaca para não esconder as decorações subjacentes.",
-	"diffEditorInsertedOutline": "Cor de contorno para o texto que foi inserido.",
-	"diffEditorRemovedOutline": "Cor de contorno para o texto que foi removido.",
-	"mergeCurrentHeaderBackground": "Fundo do cabeçalho atual em conflitos de merge inline. A cor não deve ser opaca para não esconder decorações subjacentes.",
-	"mergeCurrentContentBackground": "Fundo do conteúdo atual em conflitos de merge inline. A cor não deve ser opaca para não esconder decorações subjacentes.",
-	"mergeIncomingHeaderBackground": "Fundo do cabeçalho entrante em conflitos de merge inline. A cor não deve ser opaca para não esconder decorações subjacentes.",
-	"mergeIncomingContentBackground": "Fundo do conteúdo entrante em conflitos de merge inline. A cor não deve ser opaca para não esconder decorações subjacentes.",
-	"mergeCommonHeaderBackground": "Fundo comum do cabeçalho antepassado em conflitos de merge inline. A cor não deve ser opaca para não esconder decorações subjacentes.",
-	"mergeBorder": "Cor da borda dos cabeçalhos e separadores estão em conflito de mesclagem em linha.",
-	"overviewRulerCurrentContentForeground": "Cor de fundo de régua de visuaização atual em conflito de mesclagem em linha.",
-	"overviewRulerIncomingContentForeground": "Cor de fundo de régua de visuaização de entrada em conflito de mesclagem em linha.",
-	"overviewRulerCommonContentForeground": "Ancestral comum da cor da régua de visão geral para conflitos de mesclagem inline.",
-	"overviewRulerFindMatchForeground": "Visão geral da cor do marcador da régua para correspondências de localização. A cor não deve ser opaca para não esconder decorações subjacentes.",
-	"overviewRulerSelectionHighlightForeground": "Visão geral da cor do marcador da régua para destaques de seleção. A cor não deve ser opaca para não esconder decorações subjacentes."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/platform/update/node/update.config.contribution.i18n.json b/i18n/ptb/src/vs/platform/update/node/update.config.contribution.i18n.json
deleted file mode 100644
index f0141d66744..00000000000
--- a/i18n/ptb/src/vs/platform/update/node/update.config.contribution.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"updateConfigurationTitle": "Atualizar",
-	"updateChannel": "Configurar se você recebe atualizações automáticas de um canal de atualização. Requer uma reinicialização depois da mudança.",
-	"enableWindowsBackgroundUpdates": "Ativa as atualizações no plano de fundo no Windows."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/platform/url/electron-browser/inactiveExtensionUrlHandler.i18n.json b/i18n/ptb/src/vs/platform/url/electron-browser/inactiveExtensionUrlHandler.i18n.json
deleted file mode 100644
index 35229bd6699..00000000000
--- a/i18n/ptb/src/vs/platform/url/electron-browser/inactiveExtensionUrlHandler.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	]
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/platform/windows/electron-main/windowsService.i18n.json b/i18n/ptb/src/vs/platform/windows/electron-main/windowsService.i18n.json
deleted file mode 100644
index c0ca4251a4d..00000000000
--- a/i18n/ptb/src/vs/platform/windows/electron-main/windowsService.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"aboutDetail": "Versão {0}\nConfirmação {1}\nData {2}\nShell {3}\nRenderizador {4}\nNó {5}\nArquitetura {6}",
-	"okButton": "OK",
-	"copy": "&&Copiar"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/platform/workspaces/common/workspaces.i18n.json b/i18n/ptb/src/vs/platform/workspaces/common/workspaces.i18n.json
deleted file mode 100644
index 3b72fc565ec..00000000000
--- a/i18n/ptb/src/vs/platform/workspaces/common/workspaces.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"codeWorkspace": "Área de Trabalho de Código",
-	"untitledWorkspace": "Sem título (espaço de trabalho)",
-	"workspaceNameVerbose": "{0} (Espaço de trabalho)",
-	"workspaceName": "{0} (Espaço de trabalho) "
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/api/browser/localizationsExtensionPoint.i18n.json b/i18n/ptb/src/vs/workbench/api/browser/localizationsExtensionPoint.i18n.json
deleted file mode 100644
index 8a48f27ad30..00000000000
--- a/i18n/ptb/src/vs/workbench/api/browser/localizationsExtensionPoint.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"requirearray": "localizações devem ser uma matriz",
-	"requirestring": "a propriedade `{0}` é obrigatória e deve ser do tipo `string`",
-	"optstring": "a propriedade `{0}` é opcional ou deve ser do tipo `string`",
-	"vscode.extension.contributes.localizations": "Contribui localizações ao editor",
-	"vscode.extension.contributes.localizations.languageId": "Id do idioma em que as strings de exibição estão traduzidas.",
-	"vscode.extension.contributes.localizations.languageName": "Nome do idioma em que as strings de exibição estão traduzidas.",
-	"vscode.extension.contributes.localizations.translations": "Um caminho relativo para a pasta contendo todos os arquivos de tradução para o idioma contribuído."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/api/browser/viewsContainersExtensionPoint.i18n.json b/i18n/ptb/src/vs/workbench/api/browser/viewsContainersExtensionPoint.i18n.json
deleted file mode 100644
index 7fc82963178..00000000000
--- a/i18n/ptb/src/vs/workbench/api/browser/viewsContainersExtensionPoint.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.contributes.views.containers.id": "ID exclusivo usado para identificar o contêiner no qual as visualizações podem ser contribuídas usando o ponto de contribuição \"visualizações\"",
-	"vscode.extension.contributes.views.containers.title": "Sequência legível humana usada para renderizar o contêiner",
-	"vscode.extension.contributes.viewsContainers": "Contribui com os contêineres de visualizações para o editor",
-	"test": "Teste",
-	"requirearray": "visualizações de contêineres devem ser uma matriz",
-	"requirestring": "a propriedade `{0}` é obrigatória e deve ser do tipo `string`",
-	"showViewlet": "Mostrar {0}",
-	"view": "Exibir"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json b/i18n/ptb/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json
deleted file mode 100644
index cd8962aa3a7..00000000000
--- a/i18n/ptb/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"requirearray": "visualizações devem ser uma matriz",
-	"requirestring": "a propriedade `{0}` é obrigatória e deve ser do tipo `string`",
-	"optstring": "a propriedade `{0}` é opcional ou deve ser do tipo `string`",
-	"vscode.extension.contributes.view.id": "Identificador da visualiozação. Use isto para registrar um provedor de dados através de 'vscode.window.registerTreeDataProviderForView' API. Também para acionar ativando sua extensão registrando o evento 'onView: ${id}' para 'activationEvents'.",
-	"vscode.extension.contributes.view.name": "O nome legível da visualização. Será mostrado",
-	"vscode.extension.contributes.view.when": "Condição que deve ser verdadeira para mostrar esta visualização",
-	"vscode.extension.contributes.views": "Contribui visualizações ao editor",
-	"duplicateView1": "Não é possível registrar vários modos de exibição com a mesma id '{0}' no local '{1}'",
-	"duplicateView2": "Uma exibição com id '{0}' já está registrada no local '{1}'"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/api/electron-browser/mainThreadExtensionService.i18n.json b/i18n/ptb/src/vs/workbench/api/electron-browser/mainThreadExtensionService.i18n.json
deleted file mode 100644
index d45294dd317..00000000000
--- a/i18n/ptb/src/vs/workbench/api/electron-browser/mainThreadExtensionService.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"overwritingExtension": "Sobrescrevendo extensão {0} por {1}.",
-	"extensionUnderDevelopment": "Carregando extensão de desenvolvimento em {0}"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/api/electron-browser/mainThreadMessageService.i18n.json b/i18n/ptb/src/vs/workbench/api/electron-browser/mainThreadMessageService.i18n.json
deleted file mode 100644
index f318947e97c..00000000000
--- a/i18n/ptb/src/vs/workbench/api/electron-browser/mainThreadMessageService.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"extensionSource": "{0} (Extensão)",
-	"defaultSource": "Extensão",
-	"manageExtension": "Gerenciar Extensão",
-	"cancel": "Cancelar",
-	"ok": "OK"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json b/i18n/ptb/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
deleted file mode 100644
index bc8cba57378..00000000000
--- a/i18n/ptb/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"saveParticipants": "Executando Salvamento de Participantes..."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json b/i18n/ptb/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json
deleted file mode 100644
index ee8688cdc85..00000000000
--- a/i18n/ptb/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"task.label": "{0}: {1}"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/api/electron-browser/mainThreadWebview.i18n.json b/i18n/ptb/src/vs/workbench/api/electron-browser/mainThreadWebview.i18n.json
deleted file mode 100644
index 35229bd6699..00000000000
--- a/i18n/ptb/src/vs/workbench/api/electron-browser/mainThreadWebview.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	]
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/api/electron-browser/mainThreadWorkspace.i18n.json b/i18n/ptb/src/vs/workbench/api/electron-browser/mainThreadWorkspace.i18n.json
deleted file mode 100644
index c4a05f29269..00000000000
--- a/i18n/ptb/src/vs/workbench/api/electron-browser/mainThreadWorkspace.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"folderStatusMessageAddSingleFolder": "Extensão '{0}' adicionou 1 pasta no espaço de trabalho",
-	"folderStatusMessageAddMultipleFolders": "Extensão '{0}' adicionou {1} pastas no espaço de trabalho",
-	"folderStatusMessageRemoveSingleFolder": "Extensão '{0}' removeu 1 pasta do espaço de trabalho.",
-	"folderStatusMessageRemoveMultipleFolders": "Extensão '{0}' removeu {1} pasta do espaço de trabalho.",
-	"folderStatusChangeFolder": "Extensão '{0}' mudou pastas do espaço de trabalho"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/api/node/extHostDiagnostics.i18n.json b/i18n/ptb/src/vs/workbench/api/node/extHostDiagnostics.i18n.json
deleted file mode 100644
index c28c241ac40..00000000000
--- a/i18n/ptb/src/vs/workbench/api/node/extHostDiagnostics.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"limitHit": "Não apresentando {0} erros e avisos a mais."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/api/node/extHostExtensionActivator.i18n.json b/i18n/ptb/src/vs/workbench/api/node/extHostExtensionActivator.i18n.json
deleted file mode 100644
index 890eb2c0240..00000000000
--- a/i18n/ptb/src/vs/workbench/api/node/extHostExtensionActivator.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"unknownDep": "Extensão '{1}' falhou ao ativar. Motivo: dependência desconhecida '{0}'.",
-	"failedDep1": "Extensão '{1}' falhou ao ativar. Motivo: a dependência '{0}' falhou ao ativar.",
-	"failedDep2": "Extensão '{0}' falhou ao ativar. Motivo: mais de 10 níveis de dependências (provavelmente um círculo de dependência).",
-	"activationError": "Ativação da extensão '{0}' falhou: {1}."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/api/node/extHostProgress.i18n.json b/i18n/ptb/src/vs/workbench/api/node/extHostProgress.i18n.json
deleted file mode 100644
index d53bcb288c2..00000000000
--- a/i18n/ptb/src/vs/workbench/api/node/extHostProgress.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"extensionSource": "{0} (Extensão)"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/api/node/extHostTask.i18n.json b/i18n/ptb/src/vs/workbench/api/node/extHostTask.i18n.json
deleted file mode 100644
index ee8688cdc85..00000000000
--- a/i18n/ptb/src/vs/workbench/api/node/extHostTask.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"task.label": "{0}: {1}"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/api/node/extHostTreeViews.i18n.json b/i18n/ptb/src/vs/workbench/api/node/extHostTreeViews.i18n.json
deleted file mode 100644
index fdc114a3fe7..00000000000
--- a/i18n/ptb/src/vs/workbench/api/node/extHostTreeViews.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"treeView.notRegistered": "Nenhuma visualização de árvore com id '{0}' registrado.",
-	"treeView.duplicateElement": "Elemento com id {0} já está registrado"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/api/node/extHostWorkspace.i18n.json b/i18n/ptb/src/vs/workbench/api/node/extHostWorkspace.i18n.json
deleted file mode 100644
index 8275b3b7079..00000000000
--- a/i18n/ptb/src/vs/workbench/api/node/extHostWorkspace.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"updateerror": "Extensão '{0}' falhou ao atualizar pastas do espaço de trabalho: {1}"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/browser/actions/configureLocale.i18n.json b/i18n/ptb/src/vs/workbench/browser/actions/configureLocale.i18n.json
deleted file mode 100644
index 80686b2c898..00000000000
--- a/i18n/ptb/src/vs/workbench/browser/actions/configureLocale.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"configureLocale": "Configurar Idioma",
-	"displayLanguage": "Define o idioma de exibição do VSCode.",
-	"doc": "Veja {0} para obter uma lista dos idiomas suportados.",
-	"restart": "Modificar o valor requer reinicialização do VSCode.",
-	"fail.createSettings": "Não foi possível criar '{0}' ({1}).",
-	"JsonSchema.locale": "O idioma da interface do usuário a ser usada."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/browser/actions/fileActions.i18n.json b/i18n/ptb/src/vs/workbench/browser/actions/fileActions.i18n.json
deleted file mode 100644
index b8e87ac4f59..00000000000
--- a/i18n/ptb/src/vs/workbench/browser/actions/fileActions.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"openFolder": "Abrir Pasta...",
-	"openFileFolder": "Abrir...",
-	"addFolderToWorkspace": "Adicionar pasta ao espaço de trabalho...",
-	"add": "Adicionar",
-	"addFolderToWorkspaceTitle": "Adicionar pasta ao espaço de trabalho",
-	"removeFolderFromWorkspace": "Remover pasta da área de trabalho"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/browser/actions/toggleActivityBarVisibility.i18n.json b/i18n/ptb/src/vs/workbench/browser/actions/toggleActivityBarVisibility.i18n.json
deleted file mode 100644
index 83e631a97db..00000000000
--- a/i18n/ptb/src/vs/workbench/browser/actions/toggleActivityBarVisibility.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleActivityBar": "Alternar Visibilidade da Barra de Atividades",
-	"view": "Exibir"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/browser/actions/toggleCenteredLayout.i18n.json b/i18n/ptb/src/vs/workbench/browser/actions/toggleCenteredLayout.i18n.json
deleted file mode 100644
index d886b80eefb..00000000000
--- a/i18n/ptb/src/vs/workbench/browser/actions/toggleCenteredLayout.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleCenteredLayout": "Alternar Layout Centralizado",
-	"view": "Exibir"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/browser/actions/toggleEditorLayout.i18n.json b/i18n/ptb/src/vs/workbench/browser/actions/toggleEditorLayout.i18n.json
deleted file mode 100644
index 5dd06e2ac18..00000000000
--- a/i18n/ptb/src/vs/workbench/browser/actions/toggleEditorLayout.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleEditorGroupLayout": "Alternar Layout Vertical/Horizontal do Grupo de Editor",
-	"horizontalLayout": "Layout do Grupo de Editor Horizontal",
-	"verticalLayout": "Layout do Grupo de Editor Vertical",
-	"view": "Exibir"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/browser/actions/toggleSidebarPosition.i18n.json b/i18n/ptb/src/vs/workbench/browser/actions/toggleSidebarPosition.i18n.json
deleted file mode 100644
index 592ef38b7fd..00000000000
--- a/i18n/ptb/src/vs/workbench/browser/actions/toggleSidebarPosition.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleSidebarPosition": "Alternar a Posição da Barra Lateral",
-	"view": "Exibir"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/browser/actions/toggleSidebarVisibility.i18n.json b/i18n/ptb/src/vs/workbench/browser/actions/toggleSidebarVisibility.i18n.json
deleted file mode 100644
index 9b78b265d49..00000000000
--- a/i18n/ptb/src/vs/workbench/browser/actions/toggleSidebarVisibility.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleSidebar": "Alternar Visibilidade da Barra Lateral",
-	"view": "Exibir"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/browser/actions/toggleStatusbarVisibility.i18n.json b/i18n/ptb/src/vs/workbench/browser/actions/toggleStatusbarVisibility.i18n.json
deleted file mode 100644
index 520c7f4e1cf..00000000000
--- a/i18n/ptb/src/vs/workbench/browser/actions/toggleStatusbarVisibility.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleStatusbar": "Alternar Visibilidade da Barra de Status",
-	"view": "Exibir"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/browser/actions/toggleTabsVisibility.i18n.json b/i18n/ptb/src/vs/workbench/browser/actions/toggleTabsVisibility.i18n.json
deleted file mode 100644
index 3befe1a4208..00000000000
--- a/i18n/ptb/src/vs/workbench/browser/actions/toggleTabsVisibility.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleTabs": "Alternar Visibilidade da Aba",
-	"view": "Exibir"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/browser/actions/toggleZenMode.i18n.json b/i18n/ptb/src/vs/workbench/browser/actions/toggleZenMode.i18n.json
deleted file mode 100644
index 4dec6780313..00000000000
--- a/i18n/ptb/src/vs/workbench/browser/actions/toggleZenMode.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleZenMode": "Alternar Modo Zen",
-	"view": "Exibir"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/browser/actions/workspaceActions.i18n.json b/i18n/ptb/src/vs/workbench/browser/actions/workspaceActions.i18n.json
deleted file mode 100644
index c0131be8c0f..00000000000
--- a/i18n/ptb/src/vs/workbench/browser/actions/workspaceActions.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openFile": "Abrir arquivo...",
-	"openFolder": "Abrir Pasta...",
-	"openFileFolder": "Abrir...",
-	"globalRemoveFolderFromWorkspace": "Remover pasta da área de trabalho",
-	"saveWorkspaceAsAction": "Salvar o espaço de trabalho como...",
-	"save": "&&Salvar",
-	"saveWorkspace": "Salvar o espaço de trabalho",
-	"openWorkspaceAction": "Abrir o Espaço de Trabalho...",
-	"openWorkspaceConfigFile": "Abrir o Arquivo de Configuração do Espaço de Trabalho"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/browser/actions/workspaceCommands.i18n.json b/i18n/ptb/src/vs/workbench/browser/actions/workspaceCommands.i18n.json
deleted file mode 100644
index 2ea045e264e..00000000000
--- a/i18n/ptb/src/vs/workbench/browser/actions/workspaceCommands.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"addFolderToWorkspace": "Adicionar pasta ao espaço de trabalho...",
-	"add": "&&Adicionar",
-	"addFolderToWorkspaceTitle": "Adicionar pasta ao espaço de trabalho",
-	"workspaceFolderPickerPlaceholder": "Selecione a pasta do espaço de trabalho"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/browser/parts/activitybar/activitybarActions.i18n.json b/i18n/ptb/src/vs/workbench/browser/parts/activitybar/activitybarActions.i18n.json
deleted file mode 100644
index 5a931aa160b..00000000000
--- a/i18n/ptb/src/vs/workbench/browser/parts/activitybar/activitybarActions.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"badgeTitle": "{0} - {1}",
-	"titleKeybinding": "{0} ({1})",
-	"removeFromActivityBar": "Ocultar da barra de atividade",
-	"keepInActivityBar": "Manter na Barra de Atividades",
-	"additionalViews": "Visualizações Adicionais",
-	"numberBadge": "{0} ({1})",
-	"manageExtension": "Gerenciar Extensão",
-	"toggle": "Alternar Visualização Fixa"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/browser/parts/activitybar/activitybarPart.i18n.json b/i18n/ptb/src/vs/workbench/browser/parts/activitybar/activitybarPart.i18n.json
deleted file mode 100644
index 1dd58ef4640..00000000000
--- a/i18n/ptb/src/vs/workbench/browser/parts/activitybar/activitybarPart.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hideActivitBar": "Ocultar a Barra de Atividades",
-	"globalActions": "Ações globais"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/browser/parts/compositePart.i18n.json b/i18n/ptb/src/vs/workbench/browser/parts/compositePart.i18n.json
deleted file mode 100644
index 66f353fb9e7..00000000000
--- a/i18n/ptb/src/vs/workbench/browser/parts/compositePart.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"ariaCompositeToolbarLabel": "{0} ações ",
-	"titleTooltip": "{0} ({1})"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/browser/parts/compositebar/compositeBar.i18n.json b/i18n/ptb/src/vs/workbench/browser/parts/compositebar/compositeBar.i18n.json
deleted file mode 100644
index 98dec68c12e..00000000000
--- a/i18n/ptb/src/vs/workbench/browser/parts/compositebar/compositeBar.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"activityBarAriaLabel": "Chave do Modo de exibição Ativo"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/browser/parts/compositebar/compositeBarActions.i18n.json b/i18n/ptb/src/vs/workbench/browser/parts/compositebar/compositeBarActions.i18n.json
deleted file mode 100644
index c8312338aad..00000000000
--- a/i18n/ptb/src/vs/workbench/browser/parts/compositebar/compositeBarActions.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"largeNumberBadge": "+ de 10k",
-	"badgeTitle": "{0} - {1}",
-	"additionalViews": "Visualizações Adicionais",
-	"numberBadge": "{0} ({1})",
-	"manageExtension": "Gerenciar Extensão",
-	"titleKeybinding": "{0} ({1})",
-	"hide": "Ocultar",
-	"keep": "Manter",
-	"toggle": "Alternar Visualização Fixa"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/browser/parts/editor/binaryDiffEditor.i18n.json b/i18n/ptb/src/vs/workbench/browser/parts/editor/binaryDiffEditor.i18n.json
deleted file mode 100644
index ea1317f6659..00000000000
--- a/i18n/ptb/src/vs/workbench/browser/parts/editor/binaryDiffEditor.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"metadataDiff": "{0} ↔ {1}"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/browser/parts/editor/binaryEditor.i18n.json b/i18n/ptb/src/vs/workbench/browser/parts/editor/binaryEditor.i18n.json
deleted file mode 100644
index b4880b8febf..00000000000
--- a/i18n/ptb/src/vs/workbench/browser/parts/editor/binaryEditor.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"binaryEditor": "Visualizador binário"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json b/i18n/ptb/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json
deleted file mode 100644
index 3991d555141..00000000000
--- a/i18n/ptb/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"textEditor": "Editor de Texto",
-	"textDiffEditor": "Editor de Diferentes Textos",
-	"binaryDiffEditor": "Editor de Diferença Binária",
-	"sideBySideEditor": "Editor Lado a lado",
-	"groupOnePicker": "Mostrar editores no primeiro grupo",
-	"groupTwoPicker": "Mostrar editores no segundo grupo",
-	"groupThreePicker": "Mostrar editores no terceiro grupo",
-	"allEditorsPicker": "Mostrar todos editores abertos",
-	"view": "Exibir",
-	"file": "Arquivo",
-	"close": "Fechar",
-	"closeOthers": "Fechar Outros",
-	"closeRight": "Fechar à direita",
-	"closeAllSaved": "Fechar Salvos",
-	"closeAll": "Fechar todos",
-	"keepOpen": "Manter aberto",
-	"toggleInlineView": "Alternar para exibição embutida",
-	"showOpenedEditors": "Mostrar editores abertos",
-	"keepEditor": "Manter editor",
-	"closeEditorsInGroup": "Fechar todos editores no grupo",
-	"closeSavedEditors": "Fechar Editores Salvos em Grupo",
-	"closeOtherEditors": "Fechar outros editores",
-	"closeRightEditors": "Fechar editores à direita"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/browser/parts/editor/editorActions.i18n.json b/i18n/ptb/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
deleted file mode 100644
index 8f7c2c32373..00000000000
--- a/i18n/ptb/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
+++ /dev/null
@@ -1,58 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"splitEditor": "Dividir editor",
-	"joinTwoGroups": "Juntar editores de dois grupos",
-	"navigateEditorGroups": "Navegar entre grupos de editores",
-	"focusActiveEditorGroup": "Focalizar grupo de editores ativo",
-	"focusFirstEditorGroup": "Focalizar o primeiro grupo de editores",
-	"focusSecondEditorGroup": "Focalizar o segundo grupo de editores",
-	"focusThirdEditorGroup": "Focalizar o terceiro grupo de editores",
-	"focusPreviousGroup": "Focalizar grupo anterior",
-	"focusNextGroup": "Focalizar próximo grupo",
-	"openToSide": "Aberto para o lado",
-	"closeEditor": "Fechar editor",
-	"closeOneEditor": "Fechar",
-	"revertAndCloseActiveEditor": "Reverter e fechar editor",
-	"closeEditorsToTheLeft": "Fechar editores à esquerda ",
-	"closeAllEditors": "Fechar todos editores",
-	"closeEditorsInOtherGroups": "Fechar editores nos outros grupos",
-	"moveActiveGroupLeft": "Mover grupo de editores para esquerda",
-	"moveActiveGroupRight": "Mover grupo de editores para direita",
-	"minimizeOtherEditorGroups": "Minimizar outros grupos de editores",
-	"evenEditorGroups": "Igualar larguras de grupos de editores",
-	"maximizeEditor": "Maximizar grupo de editor e ocultar barra lateral",
-	"openNextEditor": "Abrir próximo editor",
-	"openPreviousEditor": "Abrir editor anterior",
-	"nextEditorInGroup": "Abrir próximo editor no grupo",
-	"openPreviousEditorInGroup": "Abrir editor anterior no grupo",
-	"lastEditorInGroup": "Abrir Último Editor do Grupo",
-	"navigateNext": "Avançar",
-	"navigatePrevious": "Voltar",
-	"navigateLast": "Ir para o último",
-	"reopenClosedEditor": "Reabrir Editor Fechado",
-	"clearRecentFiles": "Limpar Abertos Recentemente",
-	"showEditorsInFirstGroup": "Mostrar editores no primeiro grupo",
-	"showEditorsInSecondGroup": "Mostrar editores no segundo grupo",
-	"showEditorsInThirdGroup": "Mostrar editores no terceiro grupo",
-	"showAllEditors": "Mostrar todos editores",
-	"openPreviousRecentlyUsedEditorInGroup": "Abrir o Editor Anterior Recentemente Usado no Grupo",
-	"openNextRecentlyUsedEditorInGroup": "Abrir o Próximo Editor Recentemente Usado no Grupo",
-	"navigateEditorHistoryByInput": "Abrir o Editor Anterior do Histórico",
-	"openNextRecentlyUsedEditor": "Abrir o Próximo Editor Recentemente Utilizado",
-	"openPreviousRecentlyUsedEditor": "Abrir o Editor Anterior Recentemente Utilizado",
-	"clearEditorHistory": "Limpar Histórico do Editor",
-	"focusLastEditorInStack": "Abrir Último Editor do Grupo",
-	"moveEditorLeft": "Mover o Editor para a Esquerda",
-	"moveEditorRight": "Mover o Editor para a Direita",
-	"moveEditorToPreviousGroup": "Mover o Editor para o Grupo Anterior",
-	"moveEditorToNextGroup": "Mover o Editor para o Próximo Grupo",
-	"moveEditorToFirstGroup": "Mover o Editor para o Primeiro Grupo",
-	"moveEditorToSecondGroup": "Mover o Editor para o Segundo Grupo",
-	"moveEditorToThirdGroup": "Mover o Editor para o Terceiro Grupo"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json b/i18n/ptb/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json
deleted file mode 100644
index 126b3f4b4ed..00000000000
--- a/i18n/ptb/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"editorCommand.activeEditorMove.description": "Mover o editor ativo por guias ou grupos",
-	"editorCommand.activeEditorMove.arg.name": "Argumento de movimento do editor ativo",
-	"editorCommand.activeEditorMove.arg.description": "Propriedades do argumento:\n* 'to': Valor do tipo sequencia de caracteres fornecendo onde se mover.\n\t* 'by': sequência de valor, proporcionando a unidade para o movimento. Por guia ou por grupo.\n\t* 'value': valor numérico, fornecendo quantas posições ou uma posição absoluta para mover."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/browser/parts/editor/editorPart.i18n.json b/i18n/ptb/src/vs/workbench/browser/parts/editor/editorPart.i18n.json
deleted file mode 100644
index 6717c3f4cdb..00000000000
--- a/i18n/ptb/src/vs/workbench/browser/parts/editor/editorPart.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"groupOneVertical": "Esquerda",
-	"groupTwoVertical": "Centro",
-	"groupThreeVertical": "Direita",
-	"groupOneHorizontal": "Topo",
-	"groupTwoHorizontal": "Centro",
-	"groupThreeHorizontal": "Rodapé",
-	"editorOpenError": "Não foi possível abrir '{0}': {1}."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/browser/parts/editor/editorPicker.i18n.json b/i18n/ptb/src/vs/workbench/browser/parts/editor/editorPicker.i18n.json
deleted file mode 100644
index 83bae8ba390..00000000000
--- a/i18n/ptb/src/vs/workbench/browser/parts/editor/editorPicker.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"entryAriaLabel": "{0}, seletor de grupo editor",
-	"groupLabel": "Grupo: {0}",
-	"noResultsFoundInGroup": "Não foi encontrado nennhum editor aberto no grupo",
-	"noOpenedEditors": "Lista de editores abertos está atualmente vazia no grupo",
-	"noResultsFound": "Não foi encontrado editor correspondente aberto",
-	"noOpenedEditorsAllGroups": "A lista de editores abertos está atualmente vazia"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json b/i18n/ptb/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json
deleted file mode 100644
index 086dcb9f4da..00000000000
--- a/i18n/ptb/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json
+++ /dev/null
@@ -1,58 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"singleSelectionRange": "Ln {0}, {1} Col ({2} selecionado)",
-	"singleSelection": "Ln {0}, {1} Col",
-	"multiSelectionRange": "{0} seleções ({1} caracteres selecionados)",
-	"multiSelection": "{0} seleções",
-	"endOfLineLineFeed": "LF",
-	"endOfLineCarriageReturnLineFeed": "CRLF",
-	"tabFocusModeEnabled": "Tabulação Move o Foco",
-	"screenReaderDetected": "Leitor de tela otimizado",
-	"screenReaderDetectedExtra": "Se você não estiver usando um leitor de tela, por favor altere a configuração `editor.accessibilitySupport` para \"desligado\".",
-	"disableTabMode": "Desativar o modo de acessibilidade",
-	"gotoLine": "Ir para linha",
-	"selectEncoding": "Selecionar a codificação",
-	"selectEOL": "Selecionar a sequência de fim de linha",
-	"selectLanguageMode": "Selecionar modo de idioma",
-	"fileInfo": "Informações do arquivo",
-	"spacesSize": "Espaços: {0}",
-	"tabSize": "Tamanho de Tabulação: {0}",
-	"showLanguageExtensions": "Pesquisar extensões na loja para '{0}'...",
-	"changeMode": "Alterar o modo de linguagem",
-	"noEditor": "Nenhum editor de texto ativo neste momento",
-	"languageDescription": "({0}) - linguagem configurada",
-	"languageDescriptionConfigured": "({0})",
-	"languagesPicks": "linguagens (identificador)",
-	"configureModeSettings": "Configurar '{0}' configurações baseadas em linguagem...",
-	"configureAssociationsExt": "Configurar a associação de arquivo para '{0}'...",
-	"autoDetect": "Detecção automática",
-	"pickLanguage": "Selecionar o modo do idioma",
-	"currentAssociation": "Associação atual",
-	"pickLanguageToConfigure": "Selecionar o modo de linguagem para associar a '{0}'",
-	"changeIndentation": "Alterar a indentação",
-	"noWritableCodeEditor": "O editor de código ativo é somente leitura.",
-	"indentView": "alterar visualização",
-	"indentConvert": "converter arquivo",
-	"pickAction": "Selecionar ação",
-	"changeEndOfLine": "Alterar sequência de final de linha",
-	"pickEndOfLine": "Selecionar sequência de final de linha",
-	"changeEncoding": "Alterar a codificação do arquivo",
-	"noFileEditor": "Nenhum arquivo ativo neste momento",
-	"saveWithEncoding": "Salvar com codificação",
-	"reopenWithEncoding": "Reabrir com codificação",
-	"guessedEncoding": "Adivinhado a partir do conteúdo",
-	"pickEncodingForReopen": "Selecione a codificaçãodo arquivo para reabrir o arquivo.",
-	"pickEncodingForSave": "Selecione a codificação do arquivo para Salvar Com",
-	"screenReaderDetectedExplanation.title": "Leitor de tela otimizado",
-	"screenReaderDetectedExplanation.question": "Você está usando um leitor de tela para operar o VS Code?",
-	"screenReaderDetectedExplanation.answerYes": "Sim",
-	"screenReaderDetectedExplanation.answerNo": "Não",
-	"screenReaderDetectedExplanation.body1": "O VS Code agora está otimizado para uso com um leitor de tela.",
-	"screenReaderDetectedExplanation.body2": "Alguns recursos do editor terão comportamento diferente: por exemplo, quebra de linha, cruzamento, etc."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/browser/parts/editor/resourceViewer.i18n.json b/i18n/ptb/src/vs/workbench/browser/parts/editor/resourceViewer.i18n.json
deleted file mode 100644
index d65e8370bed..00000000000
--- a/i18n/ptb/src/vs/workbench/browser/parts/editor/resourceViewer.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"sizeB": "{0}B",
-	"sizeKB": "{0}KB",
-	"sizeMB": "{0}MB",
-	"sizeGB": "{0}GB",
-	"sizeTB": "{0}TB",
-	"resourceOpenExternalButton": "Abrir imagem usando um programa externo?",
-	"zoom.action.fit.label": "Toda a imagem",
-	"imgMeta": "{0}x{1} {2}"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/browser/parts/editor/tabsTitleControl.i18n.json b/i18n/ptb/src/vs/workbench/browser/parts/editor/tabsTitleControl.i18n.json
deleted file mode 100644
index a4757cd1f1f..00000000000
--- a/i18n/ptb/src/vs/workbench/browser/parts/editor/tabsTitleControl.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"araLabelTabActions": "Ações de tablulação"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json b/i18n/ptb/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json
deleted file mode 100644
index 05ac26584d4..00000000000
--- a/i18n/ptb/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"textDiffEditor": "Editor de Diferentes Textos",
-	"readonlyEditorWithInputAriaLabel": "{0}. Editor de comparação de texto somente leitura.",
-	"readonlyEditorAriaLabel": "Editor de comparação de texto somente leitura.",
-	"editableEditorWithInputAriaLabel": "{0}. Editor de comparação de arquivos texto.",
-	"editableEditorAriaLabel": "Editor de comparação de arquivos texto.",
-	"navigate.next.label": "Próxima Alteração",
-	"navigate.prev.label": "Alteração Anterior",
-	"toggleIgnoreTrimWhitespace.label": "Ignore espaços em branco"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/browser/parts/editor/textEditor.i18n.json b/i18n/ptb/src/vs/workbench/browser/parts/editor/textEditor.i18n.json
deleted file mode 100644
index 2149e3bd82b..00000000000
--- a/i18n/ptb/src/vs/workbench/browser/parts/editor/textEditor.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"editorLabelWithGroup": "{0}, Grupo {1}."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/browser/parts/editor/textResourceEditor.i18n.json b/i18n/ptb/src/vs/workbench/browser/parts/editor/textResourceEditor.i18n.json
deleted file mode 100644
index 3b0b5695367..00000000000
--- a/i18n/ptb/src/vs/workbench/browser/parts/editor/textResourceEditor.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"textEditor": "Editor de texto",
-	"readonlyEditorWithInputAriaLabel": "{0}. Editor de texto somente leitura.",
-	"readonlyEditorAriaLabel": "Editor de texto somente leitura.",
-	"untitledFileEditorWithInputAriaLabel": "{0}. Editor de texto de arquivo sem nome.",
-	"untitledFileEditorAriaLabel": "Editor de texto de arquivo sem nome."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/browser/parts/editor/titleControl.i18n.json b/i18n/ptb/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
deleted file mode 100644
index 4b815cd265a..00000000000
--- a/i18n/ptb/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"araLabelEditorActions": "Ações de editor"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/browser/parts/notifications/notificationsActions.i18n.json b/i18n/ptb/src/vs/workbench/browser/parts/notifications/notificationsActions.i18n.json
deleted file mode 100644
index 970ea3ec097..00000000000
--- a/i18n/ptb/src/vs/workbench/browser/parts/notifications/notificationsActions.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"clearNotification": "Limpar Notificação",
-	"clearNotifications": "Limpar Todas as Notificações",
-	"hideNotificationsCenter": "Ocultar Notificações",
-	"expandNotification": "Expandir Notificação",
-	"collapseNotification": "Recolher Notificação",
-	"configureNotification": "Configurar Notificação",
-	"copyNotification": "Copiar Texto"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/browser/parts/notifications/notificationsAlerts.i18n.json b/i18n/ptb/src/vs/workbench/browser/parts/notifications/notificationsAlerts.i18n.json
deleted file mode 100644
index 123e573a4b2..00000000000
--- a/i18n/ptb/src/vs/workbench/browser/parts/notifications/notificationsAlerts.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"alertErrorMessage": "Erro: {0}",
-	"alertWarningMessage": "Aviso: {0}",
-	"alertInfoMessage": "Informações: {0}"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json b/i18n/ptb/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json
deleted file mode 100644
index 0f4a30c299f..00000000000
--- a/i18n/ptb/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"notificationsEmpty": "Nenhuma nova notificação",
-	"notifications": "Notificações",
-	"notificationsToolbar": "Ações da Central de Notificações",
-	"notificationsList": "Lista de Notificações"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/browser/parts/notifications/notificationsCommands.i18n.json b/i18n/ptb/src/vs/workbench/browser/parts/notifications/notificationsCommands.i18n.json
deleted file mode 100644
index 385de8923dc..00000000000
--- a/i18n/ptb/src/vs/workbench/browser/parts/notifications/notificationsCommands.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"notifications": "Notificações",
-	"showNotifications": "Exibir Notificações",
-	"hideNotifications": "Ocultar Notificações",
-	"clearAllNotifications": "Limpar Todas as Notificações"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/browser/parts/notifications/notificationsStatus.i18n.json b/i18n/ptb/src/vs/workbench/browser/parts/notifications/notificationsStatus.i18n.json
deleted file mode 100644
index c73d363c135..00000000000
--- a/i18n/ptb/src/vs/workbench/browser/parts/notifications/notificationsStatus.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hideNotifications": "Ocultar Notificações",
-	"zeroNotifications": "Sem Notificações",
-	"noNotifications": "Sem Novas Notificações",
-	"oneNotification": "1 Nova Notificação",
-	"notifications": "{0} Novas Notificações"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/browser/parts/notifications/notificationsToasts.i18n.json b/i18n/ptb/src/vs/workbench/browser/parts/notifications/notificationsToasts.i18n.json
deleted file mode 100644
index 35229bd6699..00000000000
--- a/i18n/ptb/src/vs/workbench/browser/parts/notifications/notificationsToasts.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	]
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/browser/parts/notifications/notificationsViewer.i18n.json b/i18n/ptb/src/vs/workbench/browser/parts/notifications/notificationsViewer.i18n.json
deleted file mode 100644
index f17a63cda47..00000000000
--- a/i18n/ptb/src/vs/workbench/browser/parts/notifications/notificationsViewer.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"notificationActions": "Ações da Notificação",
-	"notificationSource": "Fonte: {0}"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/browser/parts/panel/panelActions.i18n.json b/i18n/ptb/src/vs/workbench/browser/parts/panel/panelActions.i18n.json
deleted file mode 100644
index b6d76f37c6a..00000000000
--- a/i18n/ptb/src/vs/workbench/browser/parts/panel/panelActions.i18n.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"closePanel": "Fechar Painel",
-	"togglePanel": "Alternar Painel",
-	"focusPanel": "Foco no Painel",
-	"toggledPanelPosition": "Alternar posição do painel",
-	"moveToRight": "Mover para direita",
-	"moveToBottom": "Mover para baixo",
-	"toggleMaximizedPanel": "Alternar Painel Maximizado",
-	"maximizePanel": "Maximizar Tamanho do Painel",
-	"minimizePanel": "Restaurar tamanho do Painel",
-	"view": "Exibir"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/browser/parts/panel/panelPart.i18n.json b/i18n/ptb/src/vs/workbench/browser/parts/panel/panelPart.i18n.json
deleted file mode 100644
index 35229bd6699..00000000000
--- a/i18n/ptb/src/vs/workbench/browser/parts/panel/panelPart.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	]
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/browser/parts/quickinput/quickInput.i18n.json b/i18n/ptb/src/vs/workbench/browser/parts/quickinput/quickInput.i18n.json
deleted file mode 100644
index 8029abcb9f0..00000000000
--- a/i18n/ptb/src/vs/workbench/browser/parts/quickinput/quickInput.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"inputModeEntryDescription": "{0} (Pressione 'Enter' para confirmar ou 'Esc' para cancelar)",
-	"inputModeEntry": "Pressione 'Enter' para confirmar o texto digitado ou 'Esc' para cancelar",
-	"quickInput.countSelected": "{0} Selecionado",
-	"ok": "OK"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/browser/parts/quickinput/quickInputBox.i18n.json b/i18n/ptb/src/vs/workbench/browser/parts/quickinput/quickInputBox.i18n.json
deleted file mode 100644
index 35229bd6699..00000000000
--- a/i18n/ptb/src/vs/workbench/browser/parts/quickinput/quickInputBox.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	]
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/browser/parts/quickopen/quickOpenController.i18n.json b/i18n/ptb/src/vs/workbench/browser/parts/quickopen/quickOpenController.i18n.json
deleted file mode 100644
index 37128b73c7c..00000000000
--- a/i18n/ptb/src/vs/workbench/browser/parts/quickopen/quickOpenController.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"emptyPicks": "Não há entradas a serem escolhidas",
-	"quickOpenInput": "Digite '?' para obter ajuda sobre as ações que você pode realizar a partir daqui",
-	"historyMatches": "aberto recentemente",
-	"noResultsFound1": "Nenhum resultado encontrado",
-	"canNotRunPlaceholder": "Esse manipulador de abertura rápida não pode ser usado no contexto atual",
-	"entryAriaLabel": "{0}, recentemente aberto",
-	"removeFromEditorHistory": "Remover do Histórico",
-	"pickHistory": "Selecionar uma entrada do editor para remover do histórico"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/browser/parts/quickopen/quickopen.contribution.i18n.json b/i18n/ptb/src/vs/workbench/browser/parts/quickopen/quickopen.contribution.i18n.json
deleted file mode 100644
index 57f5524e1be..00000000000
--- a/i18n/ptb/src/vs/workbench/browser/parts/quickopen/quickopen.contribution.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"quickOpen": "Ir para o Arquivo...",
-	"quickNavigateNext": "Navegar ao próximo em modo de abertura rápida",
-	"quickNavigatePrevious": "Navegar ao anterior em modo de abertura rápida",
-	"quickSelectNext": "Selecionar próximo em modo de abertura rápida",
-	"quickSelectPrevious": "Selecionar anterior em modo de abertura rápida"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/browser/parts/quickopen/quickopen.i18n.json b/i18n/ptb/src/vs/workbench/browser/parts/quickopen/quickopen.i18n.json
deleted file mode 100644
index 058d1de2438..00000000000
--- a/i18n/ptb/src/vs/workbench/browser/parts/quickopen/quickopen.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"quickOpen": "Ir para o Arquivo...",
-	"quickNavigateNext": "Navegar ao próximo em modo de abertura rápida",
-	"quickNavigatePrevious": "Navegar ao anterior em modo de abertura rápida",
-	"quickSelectNext": "Selecionar próximo em modo de abertura rápida",
-	"quickSelectPrevious": "Selecionar anterior em modo de abertura rápida"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/browser/parts/sidebar/sidebarPart.i18n.json b/i18n/ptb/src/vs/workbench/browser/parts/sidebar/sidebarPart.i18n.json
deleted file mode 100644
index 1d1bf098f11..00000000000
--- a/i18n/ptb/src/vs/workbench/browser/parts/sidebar/sidebarPart.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"focusSideBar": "Foco na Barra Lateral",
-	"viewCategory": "Exibir"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/browser/parts/statusbar/statusbarPart.i18n.json b/i18n/ptb/src/vs/workbench/browser/parts/statusbar/statusbarPart.i18n.json
deleted file mode 100644
index 9aef843497b..00000000000
--- a/i18n/ptb/src/vs/workbench/browser/parts/statusbar/statusbarPart.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"manageExtension": "Gerenciar Extensão"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/browser/parts/titlebar/titlebarPart.i18n.json b/i18n/ptb/src/vs/workbench/browser/parts/titlebar/titlebarPart.i18n.json
deleted file mode 100644
index 55c41655d21..00000000000
--- a/i18n/ptb/src/vs/workbench/browser/parts/titlebar/titlebarPart.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"patchedWindowTitle": "[Sem Suporte]",
-	"userIsAdmin": "[Administrador]",
-	"userIsSudo": "[Superusuário]",
-	"devExtensionWindowTitlePrefix": "[Host de Desenvolvimento de Extensão]"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/browser/parts/views/panelViewlet.i18n.json b/i18n/ptb/src/vs/workbench/browser/parts/views/panelViewlet.i18n.json
deleted file mode 100644
index d1559b7dca7..00000000000
--- a/i18n/ptb/src/vs/workbench/browser/parts/views/panelViewlet.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"viewToolbarAriaLabel": "{0} ações "
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/browser/parts/views/views.i18n.json b/i18n/ptb/src/vs/workbench/browser/parts/views/views.i18n.json
deleted file mode 100644
index d210a742451..00000000000
--- a/i18n/ptb/src/vs/workbench/browser/parts/views/views.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"viewToolbarAriaLabel": "{0} ações ",
-	"hideView": "Ocultar a Barra Lateral"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/browser/parts/views/viewsRegistry.i18n.json b/i18n/ptb/src/vs/workbench/browser/parts/views/viewsRegistry.i18n.json
deleted file mode 100644
index b7201e3d4af..00000000000
--- a/i18n/ptb/src/vs/workbench/browser/parts/views/viewsRegistry.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"duplicateId": "Uma exibição com id '{0}' já está registrada na localização '{1}'"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/browser/parts/views/viewsViewlet.i18n.json b/i18n/ptb/src/vs/workbench/browser/parts/views/viewsViewlet.i18n.json
deleted file mode 100644
index 0683270a7fa..00000000000
--- a/i18n/ptb/src/vs/workbench/browser/parts/views/viewsViewlet.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hideView": "Ocultar"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/browser/quickopen.i18n.json b/i18n/ptb/src/vs/workbench/browser/quickopen.i18n.json
deleted file mode 100644
index abe943a5bc4..00000000000
--- a/i18n/ptb/src/vs/workbench/browser/quickopen.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noResultsMatching": "Nenhum resultado encontrado",
-	"noResultsFound2": "Nenhum resultado encontrado"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/browser/viewlet.i18n.json b/i18n/ptb/src/vs/workbench/browser/viewlet.i18n.json
deleted file mode 100644
index d3bee3ce826..00000000000
--- a/i18n/ptb/src/vs/workbench/browser/viewlet.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"compositePart.hideSideBarLabel": "Ocultar a Barra Lateral",
-	"collapse": "Recolher tudo"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/common/theme.i18n.json b/i18n/ptb/src/vs/workbench/common/theme.i18n.json
deleted file mode 100644
index 431c9c090b9..00000000000
--- a/i18n/ptb/src/vs/workbench/common/theme.i18n.json
+++ /dev/null
@@ -1,60 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"tabActiveBackground": "Cor de fundo da guia ativa. As guias são os recipientes para editores na área do editor. Várias guias podem ser abertas em um grupo de editores. Podem haver vários grupos de editor.",
-	"tabInactiveBackground": "Cor de fundo da guia inativa. As guias são os recipientes para editores na área do editor. Várias guias podem ser abertas em um grupo de editores. Podem haver vários grupos de editor.",
-	"tabHoverBackground": "Cor de fundo da guia ao passar o mouse. As guias são os contêineres para editores na área do editor. Várias guias podem ser abertas em um grupo de editor. Podem existir vários grupos de editor.",
-	"tabUnfocusedHoverBackground": "Cor de fundo da guia em um grupo fora de foco ao passar o mouse. As guias são os contêineres para editores na área do editor. Várias guias podem ser abertas em um grupo de editor. Podem existir vários grupos de editor.",
-	"tabBorder": "Borda para separar uma guia das outras. As guias são os recipientes para editores na área do editor. Várias guias podem ser abertas em um grupo de editores. Podem haver vários grupos de editor.",
-	"tabHoverBorder": "Borda para destacar guias ao passar o mouse. As guias são os contêineres para editores na área do editor. Várias guias podem ser abertas em um grupo de editor. Podem existir vários grupos de editor.",
-	"tabUnfocusedHoverBorder": "Borda para destacar guias em um grupo fora de foco ao passar o mouse. As guias são os contêineres para editores na área do editor. Várias guias podem ser abertas em um grupo de editor. Podem existir vários grupos de editor.",
-	"tabActiveForeground": "Cor de primeiro plano da guia ativa em um grupo ativo. As guias são os recipientes para editores na área do editor. Várias guias podem ser abertas em um grupo de editores. Podem haver vários grupos de editor.",
-	"tabInactiveForeground": "Cor de primeiro plano da guia inativa em um grupo ativo. As guias são os recipientes para editores na área do editor. Várias guias podem ser abertas em um grupo de editores. Podem haver vários grupos de editor.",
-	"tabUnfocusedActiveForeground": "Cor de primeiro plano da aba ativa em um grupo fora de foco. As guias são os recipientes para editores na área do editor. Várias guias podem ser abertas em um grupo de editores. Podem haver vários grupos de editores.",
-	"tabUnfocusedInactiveForeground": "Cor de primeiro plano da aba inativa em um grupo fora de foco. As guias são os recipientes para editores na área do editor. Várias guias podem ser abertas em um grupo de editores. Podem haver vários grupos de editores.",
-	"editorGroupBackground": "Cor de fundo de um grupo de editor. Grupos de editor são os recipientes dos editores. A cor de fundo é mostrada ao arrastar o editor de grupos ao redor.",
-	"tabsContainerBackground": "Cor de fundo do cabeçalho do título do grupo de editor quando as guias são habilitadas. Grupos de editor são os recipientes dos editores.",
-	"tabsContainerBorder": "Cor da borda do cabeçalho do título do grupo de editor quando as guias estão habilitadas. Grupos de editor são os recipientes dos editores.",
-	"editorGroupHeaderBackground": "Cor de fundo do título no cabeçalho do grupo de editor quando guias estiverem desabilitadas (`\"workbench.editor.showTabs\": false`). Grupos de editor são os contêineres dos editores.",
-	"editorGroupBorder": "Cor para separar múltiplos grupos de editor de outro. Grupos de editor são os recipientes dos editores.",
-	"editorDragAndDropBackground": "Cor de fundo ao arrastar editores. A cor deve ter transparência para que o conteúdo do editor ainda possa ser visto.",
-	"panelBackground": "Cor de fundo do painel. Os painéis são mostrados abaixo da área do editor e contém visualizações como saída e terminal integrado.",
-	"panelBorder": "Cor da borda do painel para separar o painel do editor. Os painéis são exibidos abaixo da área do editor e contém visualizações como saída e terminal integrado.",
-	"panelActiveTitleForeground": "Cor do título para o painel ativo. Os painéis são mostrados abaixo da área do editor e contém visualizações como saída e terminal integrado.",
-	"panelInactiveTitleForeground": "Cor do título para o painel inativo. Os painéis são mostrados abaixo da área do editor e contém visualizações como saída e terminal integrado.",
-	"panelActiveTitleBorder": "Cor da borda para o título do painel ativo. Os painéis são mostrados abaixo da área do editor e contém visualizações como saída e terminal integrado.",
-	"panelDragAndDropBackground": "Cor de resposta ao arrastar e soltar itens de título de painel. A cor deve possuir transparência para que os registros no painel ainda possam brilhar através dela. Os painéis são exibidos abaixo da área do editor e contém visualizações como a saída e o terminal integrado.",
-	"statusBarForeground": "Cor de primeiro plano da barra de status quando um espaço de trabalho é aberto. A barra de status é mostrada na parte inferior da janela.",
-	"statusBarNoFolderForeground": "Cor do primeiro plano da barra de status quando nenhuma pasta está aberta. A barra de status é mostrada na parte inferior da janela.",
-	"statusBarBackground": "Cor de fundo da barra de status quando um espaço de trabalho é aberto. A barra de status é mostrada na parte inferior da janela.",
-	"statusBarNoFolderBackground": "Cor de fundo da barra de status quando nenhuma pasta está aberta. A barra de status é mostrada na parte inferior da janela.",
-	"statusBarBorder": "Cor da borda da barra de status que separa a barra lateral e o editor.A barra de status é mostrada na parte inferior da janela.",
-	"statusBarNoFolderBorder": "Cor da borda da barra de status separando para a barra lateral e editor quando nenhuma pasta é aberta. A barra de status é mostrada na parte inferior da janela.",
-	"statusBarItemActiveBackground": "Cor de fundo do item da barra de status quando você clicado. A barra de status é mostrada na parte inferior da janela.",
-	"statusBarItemHoverBackground": "Cor de fundo do item da barra de status quando estiver passando sobre ele. A barra de status é mostrada na parte inferior da janela.",
-	"statusBarProminentItemBackground": "Cor de fundo de itens proeminentes na barra de status. Itens proeminentes destacam-se de outros itens na barra de status para indicar importância. Altere o modo `Alternar Tecla Tab Move o Foco` da paleta de comandos para ver um exemplo. A barra de status é exibida na parte inferior da janela.",
-	"statusBarProminentItemHoverBackground": "Cor de fundo de itens proeminentes na barra de status ao passar o mouse sobre sobre eles. Itens proeminentes destacam-se de outros itens na barra de status para indicar importância. Altere o modo `Alternar Tecla Tab Move o Foco` da paleta de comandos para ver um exemplo. A barra de status é exibida na parte inferior da janela.",
-	"activityBarBackground": "Cor de fundo da barra de atividades. Barra de atividade está visível à esquerda ou à direita e permite alternar entre as visualizações da barra lateral.",
-	"activityBarForeground": "Cor de primeiro plano da barra de atividades (por exemplo, usada para os ícones). A barra de atividades está visível à esquerda ou à direita e permite alternar entre as visualizações da barra lateral.",
-	"activityBarBorder": "Cor da borda da barra de atividades separando a barra lateral. A barra de atividade é mostrada à esquerda ou à direita e permite alternar entre as visualizações da barra lateral.",
-	"activityBarDragAndDropBackground": "Cor de feedback de arrastar e soltar para os itens da barra de atividades. A cor deve ter transparência para que as entradas de bar de atividade ainda possam brilhar. A barra de atividade está visível à esquerda ou à direita e permite para alternar entre as visualizações da barra lateral.",
-	"activityBarBadgeBackground": "Cor de fundo da notificação de atividade. A barra de atividade está visível à esquerda ou à direita e permite alternar entre as visualizações da barra lateral.",
-	"activityBarBadgeForeground": "Cor de primeiro plano da notificação de atividade. A barra de atividade está visível à esquerda ou à direita e permite alternar entre as visualizações da barra lateral.",
-	"sideBarBackground": "Cor de fundo da barra lateral. A barra lateral é o recipiente para visualizações como explorador e pesquisa.",
-	"sideBarForeground": "Cor de primeiro plano da barra lateral. A barra lateral é o recipiente para visualizações como o explorador e a busca.",
-	"sideBarBorder": "Cor da borda da barra lateral separando o editor. A barra lateral é o recipiente para visualizações como explorador e pesquisa.",
-	"sideBarTitleForeground": "Cor de primeiro plano do título da barra lateral. A barra lateral é o recipiente para visualizações como explorador e pesquisa.",
-	"sideBarDragAndDropBackground": "Cor de feedback de arrastar e soltar para as seções da barra lateral. A cor deve ter transparência para que as seções de barra lateral ainda possam se destacar. A barra lateral é o recipiente para visões como explorador e pesquisa.",
-	"sideBarSectionHeaderBackground": "Cor de fundo do cabeçalho de seção lateral. A barra lateral é o recipiente para visões como explorador e pesquisa.",
-	"sideBarSectionHeaderForeground": "Cor de primeiro plano do cabeçalho de seção da barra lateral. A barra lateral é o recipiente para visualizações como o explorador e pesquisa.",
-	"titleBarActiveForeground": "Cor da barra de título do primeiro plano quando a janela está ativa. Observe que essa cor atualmente somente é suportada no macOS.",
-	"titleBarInactiveForeground": "Cor de primeiro plano da barra de título quando a janela está inativa. Observe que essa cor atualmente somente é suportada no macOS.",
-	"titleBarActiveBackground": "Cor de fundo da barra de título quando a janela está ativa. Observe que essa cor atualmente somente é suportada no macOS.",
-	"titleBarInactiveBackground": "Cor de fundo de barra de título quando a janela está inativa. Observe que essa cor é atualmente somente suportada no macOS.",
-	"titleBarBorder": "Cor da borda da barra de título. Observe que essa cor é atualmente somente suportados no macOS."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/common/views.i18n.json b/i18n/ptb/src/vs/workbench/common/views.i18n.json
deleted file mode 100644
index 35229bd6699..00000000000
--- a/i18n/ptb/src/vs/workbench/common/views.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	]
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/electron-browser/actions.i18n.json b/i18n/ptb/src/vs/workbench/electron-browser/actions.i18n.json
deleted file mode 100644
index 62b4a14f179..00000000000
--- a/i18n/ptb/src/vs/workbench/electron-browser/actions.i18n.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"closeWindow": "Fechar Janela",
-	"closeWorkspace": "Fechar o espaço de trabalho",
-	"noWorkspaceOpened": "Não há nenhum espaço de trabalho aberto nessa instância para ser fechado.",
-	"newWindow": "Nova Janela",
-	"toggleFullScreen": "Alternar Tela Inteira",
-	"toggleMenuBar": "Alternar Barra de Menus",
-	"toggleDevTools": "Alternar Ferramentas do Desenvolvedor",
-	"zoomIn": "Ampliar",
-	"zoomOut": "Reduzir",
-	"zoomReset": "Reinicializar Zoom",
-	"appPerf": "Desempenho de inicialização",
-	"reloadWindow": "Recarregar Janela",
-	"reloadWindowWithExntesionsDisabled": "Recarregar Janela Com Extensões Desabilitadas",
-	"switchWindowPlaceHolder": "Selecionar uma janela para onde alternar",
-	"current": "Janela Atual",
-	"close": "Fechar Janela",
-	"switchWindow": "Alternar a janela...",
-	"quickSwitchWindow": "Troca Rápida de Janela...",
-	"workspaces": "espaços de trabalho",
-	"files": "arquivos",
-	"openRecentPlaceHolderMac": "Selecione para abrir (segure tecla Cmd para abrir em uma nova janela)",
-	"openRecentPlaceHolder": "Selecione para abrir (segure tecla Ctrl para abrir em uma nova janela)",
-	"remove": "Remover os Abertos Recentemente",
-	"openRecent": "Abrir Recente...",
-	"quickOpenRecent": "Abertura Rápida de Recente...",
-	"reportIssueInEnglish": "Reportar Problema",
-	"openProcessExplorer": "Abrir Explorador de Processos",
-	"reportPerformanceIssue": "Reportar Problema de Desempenho",
-	"keybindingsReference": "Referência de Atalhos de Teclado",
-	"openDocumentationUrl": "Documentação",
-	"openIntroductoryVideosUrl": "Vídeos Introdutórios",
-	"openTipsAndTricksUrl": "Dicas e truques",
-	"toggleSharedProcess": "Alternar processo compartilhado",
-	"navigateLeft": "Navegar para a Visualização à Esquerda",
-	"navigateRight": "Navegar para a Visualização à Direita",
-	"navigateUp": "Navegar para a Visualização Acima",
-	"navigateDown": "Navegar para a Visualização Abaixo",
-	"increaseViewSize": "Aumentar o Tamanho da Visualização Atual",
-	"decreaseViewSize": "Diminuir o Tamanho da Visualização Atual",
-	"showPreviousTab": "Mostrar a guia da janela anterior",
-	"showNextWindowTab": "Mostrar guia da próxima janela",
-	"moveWindowTabToNewWindow": "Mover a guia da janela para a nova janela",
-	"mergeAllWindowTabs": "Mesclar todas as janelas",
-	"toggleWindowTabsBar": "Alternar a Barra de Guias da Janela",
-	"about": "Sobre {0}",
-	"inspect context keys": "Inspecionar Chaves de Contexto"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/electron-browser/commands.i18n.json b/i18n/ptb/src/vs/workbench/electron-browser/commands.i18n.json
deleted file mode 100644
index 983899514ca..00000000000
--- a/i18n/ptb/src/vs/workbench/electron-browser/commands.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"diffLeftRightLabel": "{0} ⟷ {1}"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/electron-browser/configureLocale.i18n.json b/i18n/ptb/src/vs/workbench/electron-browser/configureLocale.i18n.json
deleted file mode 100644
index 80686b2c898..00000000000
--- a/i18n/ptb/src/vs/workbench/electron-browser/configureLocale.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"configureLocale": "Configurar Idioma",
-	"displayLanguage": "Define o idioma de exibição do VSCode.",
-	"doc": "Veja {0} para obter uma lista dos idiomas suportados.",
-	"restart": "Modificar o valor requer reinicialização do VSCode.",
-	"fail.createSettings": "Não foi possível criar '{0}' ({1}).",
-	"JsonSchema.locale": "O idioma da interface do usuário a ser usada."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/electron-browser/crashReporter.i18n.json b/i18n/ptb/src/vs/workbench/electron-browser/crashReporter.i18n.json
deleted file mode 100644
index 10b7a7ff108..00000000000
--- a/i18n/ptb/src/vs/workbench/electron-browser/crashReporter.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"telemetryConfigurationTitle": "Telemetria",
-	"telemetry.enableCrashReporting": "Ativar o envio de relatórios de incidentes à Microsoft.\nEsta opção requer reinicialização para ser efetivada."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/electron-browser/extensionHost.i18n.json b/i18n/ptb/src/vs/workbench/electron-browser/extensionHost.i18n.json
deleted file mode 100644
index a27bb9c728f..00000000000
--- a/i18n/ptb/src/vs/workbench/electron-browser/extensionHost.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"extensionHostProcess.startupFailDebug": "O host de extensão não iniciou em 10 segundos, ele pode ser interrompido na primeira linha e precisa de um depurador para continuar.",
-	"extensionHostProcess.startupFail": "Host de extensão não começou em 10 segundos, isso pode ser um problema.",
-	"extensionHostProcess.error": "Erro do host de extensão: {0}",
-	"devTools": "Ferramentas do Desenvolvedor",
-	"extensionHostProcess.crash": "Host de extensão foi encerrado inesperadamente. Por favor recarregar a janela para recuperar."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/electron-browser/main.contribution.i18n.json b/i18n/ptb/src/vs/workbench/electron-browser/main.contribution.i18n.json
deleted file mode 100644
index 15dd21d37a3..00000000000
--- a/i18n/ptb/src/vs/workbench/electron-browser/main.contribution.i18n.json
+++ /dev/null
@@ -1,84 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"view": "Exibir",
-	"help": "Ajuda",
-	"file": "Arquivo",
-	"workspaces": "Espaços de trabalho",
-	"developer": "Desenvolvedor",
-	"workbenchConfigurationTitle": "Área de Trabalho",
-	"showEditorTabs": "Controla se os editores abertos devem ou não serem exibidos em abas.",
-	"workbench.editor.labelFormat.default": "Mostra o nome do arquivo. Quando guias estiverem ativadas e dois arquivos em um grupo tiverem o mesmo nome, a seção de distinção para cada caminho de arquivo é adicionada. Quando guias estiverem desativadas, o caminho relativo para a pasta do espaço de trabalho é exibida se o editor estiver ativo.",
-	"workbench.editor.labelFormat.short": "Mostrar o nome do arquivo seguido pelo nome do diretório.",
-	"workbench.editor.labelFormat.medium": "Mostra o nome do arquivo seguido de seu caminho relativo para a pasta de trabalho.",
-	"workbench.editor.labelFormat.long": "Mostrar o nome do arquivo seguido pelo seu caminho absoluto.",
-	"tabDescription": "Controla o formato do rótulo para um editor. Alterar essa configuração pode por exemplo tornar mais fácil entender a localização de um arquivo:\n- curto: 'parent'\n- médio: 'workspace/src/parent'\n- longa: '/ home/user/workspace/src/parent'\n- padrão: '... /parent, quando outra guia compartilha o mesmo título, ou o caminho relativo do espaço de trabalho se as guias estão desabilitadas",
-	"editorTabCloseButton": "Controla a posição dos botões de fechar das abas do editor ou os desabilita quando configurados para 'desligado'.",
-	"tabSizing": "Controla o tamanho das guias do editor. Configure para 'fit' para manter as guias sempre com o tamanho suficiente para mostrar o rótulo do editor completo. Configure para 'shrink' para permitir que as guias sejam menores quando o espaço disponível não seja suficiente para mostrar todas as guias juntas.",
-	"showIcons": "Controla se os editores abertos devem ou não ser exibidos com um ícone. Requer um tema de ícone para ser habilitado. ",
-	"enablePreview": "Controla se editores abertos mostram uma visualização. Editores de visualização são reutilizados até que eles sejam mantidos (por exemplo, através do duplo clique ou edição) e aparecerem com um estilo de fonte em itálico.",
-	"enablePreviewFromQuickOpen": "Controla se os editores abertos da Abertura Rápida são exibidos como visualização. Os editores de visualização são reutilizados até serem preservados (por exemplo, através de um duplo clique ou edição).",
-	"closeOnFileDelete": "Controla se os editores que mostram um arquivo devem fechar automaticamente quanto o arquivo é apagado ou renomeado por algum outro processo. Desativar isso manterá o editor aberto como sujo neste evento. Note que apagar do aplicativo sempre fechará o editor e os arquivos sujos nunca fecharão para preservar seus dados.",
-	"editorOpenPositioning": "Controla onde os editores serão abertos. Escolha 'esquerda' ou 'direita' para abrir os editores à esquerda ou à direita do editor ativo. Selecione 'primeiro' ou 'último' para abrir os editores independentemente do ativo no momento.",
-	"revealIfOpen": "Controla se um editor é exibido em qualquer um dos grupos,  se aberto. Se desabilitado, um editor será aberto preferencialmente no grupo de editores ativo. Se habilitado, um editor já aberto será exibido no grupo de editores ativo, ao invés de ser aberto novamente. Note que há alguns casos onde esta configuração é ignorada, por exemplo, quando for forçada a abertura de um editor em um grupo específico ou ao lado do grupo atualmente ativo.",
-	"swipeToNavigate": "Navegue entre arquivos abertos usando o deslizamento horizontal de três dedos.",
-	"commandHistory": "Controla o número de comandos usados recentemente a serem mantidos no histórico da paleta de comando. Definir como 0 para desativar o histórico de comandos.",
-	"preserveInput": "Controla se a última entrada digitada na paleta de comandos deve ser restaurada ao abri-la da próxima vez.",
-	"closeOnFocusLost": "Controla se Abertura Rápida deve fechar automaticamente caso perca o foco.",
-	"openDefaultSettings": "Controla se a abertura de configurações também abre um editor mostrando todas as configurações padrão.",
-	"sideBarLocation": "Controla a localização da barra lateral. Ele pode ser exibido à esquerda ou à direita da área de trabalho.",
-	"panelDefaultLocation": "Controla o local padrão do painel. Pode ser visualizado na parte inferior ou no lado direito da área de trabalho.",
-	"statusBarVisibility": "Controla a visibilidade da barra de status na parte inferior da área de trabalho.",
-	"activityBarVisibility": "Controla a visibilidade da barra de atividades na área de trabalho.",
-	"viewVisibility": "Controla a visibilidade das ações do cabeçalho de exibição. Ações de cabeçalho de exibição podem ser sempre visíveis ou somente visíveis quando a exibição tiver o foco ou quando passar o mouse.",
-	"fontAliasing": "Controla o método de aliasing da fonte na área de trabalho.\n- default: Suavização de fonte por Sub-pixel. Na maioria das telas não-retina, este fornecerá o texto mais nítido\n- antialiased: Suavização da fontes no nível do pixel, oposto ao subpixel. Pode fazer a fonte parecer mais fina/clara no geral.\n- none: Desabilita a suavização de fonte. O texto será mostrado com bordas pixeladas.\n- auto: Aplica `default` ou `antialiased` automaticamente baseado no DPI das telas.",
-	"workbench.fontAliasing.default": "Suavização de fonte subpixel. Na maioria dos monitores não-retina isto mostrará o texto mais nítido.",
-	"workbench.fontAliasing.antialiased": "Suavizar a fonte no nível do pixel, em oposição a subpixel. Pode fazer com que a fonte apareça mais clara de uma forma geral.",
-	"workbench.fontAliasing.none": "Desabilita a suavização de fonte. Texto será mostrado com bordas irregulares.",
-	"workbench.fontAliasing.auto": "Aplica `default` ou `antialiased` automaticamente, baseado no DPI das telas.",
-	"enableNaturalLanguageSettingsSearch": "Controla se deve habilitar o modo de busca de linguagem natural para as configurações.",
-	"windowConfigurationTitle": "Janela",
-	"window.openFilesInNewWindow.on": "Arquivos serão abertos em uma nova janela",
-	"window.openFilesInNewWindow.off": "Arquivos serão abertos em uma nova janela com a pasta de arquivos aberta ou com a última janela ativa.",
-	"window.openFilesInNewWindow.defaultMac": "Arquivos serão abertos na janela com a pasta dos arquivos aberta ou a última janela ativa, a menos que tenha sido aberta pelo Dock ou pelo Finder",
-	"window.openFilesInNewWindow.default": "Arquivos serão abertos em uma nova janela, a menos que escolhidos  dentro do aplicativo (por exemplo, através do menu de arquivo)",
-	"window.openFoldersInNewWindow.on": "As pastas serão abertas em uma nova janela",
-	"window.openFoldersInNewWindow.off": "As pastas substituirão a última janela ativa",
-	"window.openFoldersInNewWindow.default": "As pastas serão abertas em uma nova janela, a menos que uma pasta seja selecionada dentro do aplicativo (por exemplo, através do menu Arquivo)",
-	"openFoldersInNewWindow": "Controla se as pastas devem ser abertas em uma nova janela ou substituir a última janela ativa\n- padrão: as pastas serão abertas em uma nova janela, a menos que seja selecionada dentro do aplicativo (por exemplo, através do menu Arquivo)\n- ligado: as pastas serão abertas em uma nova janela\n- desligado: as pastas substituirão a última janela ativa\nNote que ainda podem haver casos em que esta configuração será ignorada (por exemplo, quando estiver usando as opções de linha de comando -new-window ou -reuse-window).",
-	"window.openWithoutArgumentsInNewWindow.on": "Abrir uma nova janela vazia",
-	"window.reopenFolders.all": "Reabrir todas as janelas.",
-	"window.reopenFolders.folders": "Reabrir todas as pastas. Espaços de trabalho vazios não serão restaurados.",
-	"window.reopenFolders.one": "Reabrir a última janela ativa.",
-	"window.reopenFolders.none": "Nunca reabrir uma janela. Sempre começar com uma janela vazia.",
-	"restoreWindows": "Controla como as janelas serão reabertas após uma reinicialização. Selecione 'nenhum' para sempre iniciar com uma área de trabalho vazia, 'um' para reabrir a última janela que você trabalhou, 'pastas' para reabrir todas as janelas que tinham pastas abertas ou 'todos' para reabrir todas as janelas da sua última sessão.",
-	"restoreFullscreen": "Controla se uma janela deve ser restaurada em modo de tela cheia se ela foi finalizada em modo de tela cheia.",
-	"zoomLevel": "Ajusta o nível de zoom da janela. O tamanho original é 0 e cada aumento (por exemplo, 1) ou redução (por exemplo, -1) representa um zoom 20% maior ou menor. Você também pode digitar decimais para ajustar o nível de zoom com uma granularidade mais fina.",
-	"window.newWindowDimensions.default": "Abrir novas janelas no centro da tela.",
-	"window.newWindowDimensions.inherit": "Abrir novas janelas com a mesma dimensão da última janela ativa.",
-	"window.newWindowDimensions.maximized": "Abrir novas janelas maximizadas.",
-	"window.newWindowDimensions.fullscreen": "Abrir novas janelas em modo de tela cheia.",
-	"newWindowDimensions": "Controla as dimensões ao abrir uma nova janela quando pelo menos uma janela já está aberta. Por padrão, uma nova janela será aberta no centro da tela com pequena dimensão. Quando definido como 'inherit', a janela vai ter as mesmas dimensões que a última janela que estava ativa. Quando definido como 'maximized', a janela abrirá maximizada e em tela cheia se configurado para 'fullscreen'. Observe que essa configuração não tem um impacto sobre a primeira janela que é aberta. A primeira janela sempre irá restaurar o tamanho e a localização como você deixou antes de fechar.",
-	"closeWhenEmpty": "Controla se o fechamento do último editor também deve fechar a janela. Essa configuração só se aplica para as janelas que não mostram pastas.",
-	"window.menuBarVisibility.default": "O menu está oculto apenas em modo de tela cheia.",
-	"window.menuBarVisibility.visible": "O menu está sempre visivel mesmo quando em modo de tela cheia.",
-	"window.menuBarVisibility.toggle": "O menu está oculto, mas pode ser mostrado através da tecla Alt.",
-	"window.menuBarVisibility.hidden": "O menu está sempre oculto.",
-	"menuBarVisibility": "Controla a visibilidade da barra de menu. Uma configuração 'alternar' significa que a barra de menus está oculta e pressionar a tecla Alt irá mostrá-la. Por padrão, a barra de menu será visível, a menos que a janela esteja em modo de tela cheia.",
-	"enableMenuBarMnemonics": "Se habilitado, os menus principais podem ser abertos através de atalhos de tecla Alt. Desativar mnemônicos permite vincular esses atalhos de tecla Alt para comandos do editor.",
-	"autoDetectHighContrast": "Se habilitado, irá mudar automaticamente para o tema de alto contraste se o Windows estiver utilizando um tema de alto contraste, e para o tema escuro ao mudar de um tema de alto contraste do Windows.",
-	"titleBarStyle": "Ajusta a aparência da barra de título da janela. As alterações exigem um reinício completo.",
-	"window.nativeTabs": "Habilita as abas da janela do macOS Sierra. Note que as alterações exigem um reinício completo e que as abas nativas desabilitarão um estilo de barra de título customizado, se configurado.",
-	"zenModeConfigurationTitle": "Modo Zen",
-	"zenMode.fullScreen": "Controla se a ativação do modo Zen também coloca o espaço de trabalho em modo de tela cheia.",
-	"zenMode.centerLayout": "Controla se ativar o Modo Zen também centraliza o layout.",
-	"zenMode.hideTabs": "Controla se a ativação do modo Zen também oculta as abas do espaço de trabalho.",
-	"zenMode.hideStatusBar": "Controla se a ativação do modo Zen também oculta a barra de status no rodapé do espaço de trabalho.",
-	"zenMode.hideActivityBar": "Controla se a ativação do modo Zen também oculta a barra de atividades à esquerda do espaço de trabalho.",
-	"zenMode.restore": "Controla se uma janela deve ser restaurada para o modo zen se ela foi finalizada no modo zen."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/electron-browser/main.i18n.json b/i18n/ptb/src/vs/workbench/electron-browser/main.i18n.json
deleted file mode 100644
index 57e628c09b0..00000000000
--- a/i18n/ptb/src/vs/workbench/electron-browser/main.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"loaderError": "Falha ao carregar o arquivo necessário. Você não está mais conectado à Internet ou o servidor que você está conectado está offline. Atualize o navegador e tente novamente.",
-	"loaderErrorNative": "Falha ao carregar um arquivo necessário. Reinicie o aplicativo para tentar novamente. Detalhes: {0}"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/electron-browser/shell.i18n.json b/i18n/ptb/src/vs/workbench/electron-browser/shell.i18n.json
deleted file mode 100644
index 951a140a2ea..00000000000
--- a/i18n/ptb/src/vs/workbench/electron-browser/shell.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"runningAsRoot": "Não é recomendado executar Code como 'root'."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/electron-browser/window.i18n.json b/i18n/ptb/src/vs/workbench/electron-browser/window.i18n.json
deleted file mode 100644
index 676a0758385..00000000000
--- a/i18n/ptb/src/vs/workbench/electron-browser/window.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"undo": "Desfazer",
-	"redo": "Refazer",
-	"cut": "Recortar",
-	"copy": "Copiar",
-	"paste": "Colar",
-	"selectAll": "Selecionar Tudo",
-	"runningAsRoot": "Não é recomendado executar {0} como usuário root."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/electron-browser/workbench.i18n.json b/i18n/ptb/src/vs/workbench/electron-browser/workbench.i18n.json
deleted file mode 100644
index 5886ea7e99e..00000000000
--- a/i18n/ptb/src/vs/workbench/electron-browser/workbench.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"developer": "Desenvolvedor",
-	"file": "Arquivo"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/node/extensionHostMain.i18n.json b/i18n/ptb/src/vs/workbench/node/extensionHostMain.i18n.json
deleted file mode 100644
index 7744aacdb48..00000000000
--- a/i18n/ptb/src/vs/workbench/node/extensionHostMain.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"extensionTestError": "Caminho {0} não aponta para um executor de testes com extensão válida."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/node/extensionPoints.i18n.json b/i18n/ptb/src/vs/workbench/node/extensionPoints.i18n.json
deleted file mode 100644
index 18d7b3f26c8..00000000000
--- a/i18n/ptb/src/vs/workbench/node/extensionPoints.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"jsonParseFail": "Falha ao analisar {0}: {1}.",
-	"fileReadFail": "Não foi possível ler o arquivo {0}: {1}.",
-	"jsonsParseFail": "Falha ao analisar {0} ou {1}: {2}.",
-	"missingNLSKey": "Não foi possível encontrar a mensagem para a chave {0}."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/cli/electron-browser/cli.contribution.i18n.json b/i18n/ptb/src/vs/workbench/parts/cli/electron-browser/cli.contribution.i18n.json
deleted file mode 100644
index 6b74953da99..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/cli/electron-browser/cli.contribution.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"install": "Instalar o comando '{0}' em PATH",
-	"not available": "Este comando não está disponível",
-	"successIn": "Comando shell '{0}' instalado com sucesso em PATH.",
-	"ok": "OK",
-	"cancel2": "Cancelar",
-	"warnEscalation": "O código solicitará com 'osascript' pelos privilégios de Administrador para instalar o comando shell.",
-	"cantCreateBinFolder": "Não é possível criar '/usr/local/bin'.",
-	"aborted": "Abortado",
-	"uninstall": "Desinstalar o comando '{0}' de PATH",
-	"successFrom": "Comando shell '{0}' desinstalado com sucesso de PATH.",
-	"shellCommand": "Comando shell"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/codeEditor/electron-browser/accessibility.i18n.json b/i18n/ptb/src/vs/workbench/parts/codeEditor/electron-browser/accessibility.i18n.json
deleted file mode 100644
index f303d70e00a..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/codeEditor/electron-browser/accessibility.i18n.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"emergencyConfOn": "Modificando a configuração 'editor.accessibilitySupport' para 'on'.",
-	"openingDocs": "Abrindo a página de documentação de Acessibilidade do VS Code.",
-	"introMsg": "Obrigado por testar a opção de acessibilidade do VS Code.",
-	"status": "Status",
-	"changeConfigToOnMac": "Para configurar o editor para ser permanentemente otimizado para uso com um leitor de tela pressione Command+E agora.",
-	"changeConfigToOnWinLinux": "Para configurar o editor para ser permanentemente otimizado para uso com um leitor de tela pressione Control+E agora.",
-	"auto_unknown": "O editor está configurado para usar as APIs de plataforma para detectar quando está conectado a um leitor de tela, mas o tempo de execução atual não oferece suporte a isso.",
-	"auto_on": "O editor detectou automaticamente que foi anexado um leitor de tela.",
-	"auto_off": "O editor está configurado para detectar automaticamente quando um leitor de tela é anexado, o que não é o caso neste momento.",
-	"configuredOn": "O editor está configurado para ser permanentemente otimizado para uso com um leitor de tela - você pode mudar isso editando a configuração 'editor.accessibilitySupport'.",
-	"configuredOff": "O editor está configurado para nunca ser otimizado para uso com um Leitor de Tela.",
-	"tabFocusModeOnMsg": "Pressionando Tab no editor corrente irá mover o foco para o próximo elemento focável. Mude este comportamento ao pressionar {0}.",
-	"tabFocusModeOnMsgNoKb": "Pressionando Tab no editor corrente irá mover o foco para o próximo elemento focável. O comando {0} não pode ser ativado atualmente por uma tecla.",
-	"tabFocusModeOffMsg": "Pressionando Tab no editor atual irá inserir um caractere Tab. Mude este comportamente ao pressionar {0}.",
-	"tabFocusModeOffMsgNoKb": "Pressionando Tab no editor atual irá inserir um caractere Tab. O comando {0} não pode ser ativado atualmente por uma tecla.",
-	"openDocMac": "Pressione Command+H agora para abrir uma janela do navegador com mais informação do VS Code relacionada à Acessibilidade.",
-	"openDocWinLinux": "Pressione Ctrl+H para abrir uma janela do navegador com mais informação do VS Code relacionada à acessibilidade.",
-	"outroMsg": "Você pode ignorar esta dica de ferramenta e retornar ao editor pressionando Escape ou Shift+Escape.",
-	"ShowAccessibilityHelpAction": "Mostrar ajuda de acessibilidade"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/codeEditor/electron-browser/inspectKeybindings.i18n.json b/i18n/ptb/src/vs/workbench/parts/codeEditor/electron-browser/inspectKeybindings.i18n.json
deleted file mode 100644
index e88e1439bf7..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/codeEditor/electron-browser/inspectKeybindings.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"workbench.action.inspectKeyMap": "Desenvolvedor: Inspecionar Mapeamentos de Chave"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/codeEditor/electron-browser/inspectTMScopes.i18n.json b/i18n/ptb/src/vs/workbench/parts/codeEditor/electron-browser/inspectTMScopes.i18n.json
deleted file mode 100644
index e715c4d667f..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/codeEditor/electron-browser/inspectTMScopes.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"inspectTMScopes": "Desenvolvedor: Inspecionar escopos TM",
-	"inspectTMScopesWidget.loading": "Carregando..."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/codeEditor/electron-browser/languageConfiguration/languageConfigurationExtensionPoint.i18n.json b/i18n/ptb/src/vs/workbench/parts/codeEditor/electron-browser/languageConfiguration/languageConfigurationExtensionPoint.i18n.json
deleted file mode 100644
index e975273e6da..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/codeEditor/electron-browser/languageConfiguration/languageConfigurationExtensionPoint.i18n.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"parseErrors": "Erros parseando {0}: {1}",
-	"schema.openBracket": "O colchete de abertura de caractere ou sequência de caracteres.",
-	"schema.closeBracket": "O colchete de fechamento de caractere ou sequência de caracteres.",
-	"schema.comments": "Define o símbolo dos comentários",
-	"schema.blockComments": "Define como comentários em bloco são marcados.",
-	"schema.blockComment.begin": "A sequência de caracteres que inicia um comentário em bloco.",
-	"schema.blockComment.end": "A sequência de caracteres que termina um comentário de bloco.",
-	"schema.lineComment": "A sequência de caracteres que inicia um comentário de linha.",
-	"schema.brackets": "Define os símbolos de colchetes que aumentam ou diminuem a indentação.",
-	"schema.autoClosingPairs": "Define os pares de colchetes. Quando é introduzido um colchete de abertura, o colchete de fechamento é inserido automaticamente.",
-	"schema.autoClosingPairs.notIn": "Define uma lista de escopos onde os auto pares são desativados.",
-	"schema.surroundingPairs": "Define os pares de colchetes que podem ser usados para cercar uma seqüência selecionada.",
-	"schema.wordPattern": "A definição da palavra para a linguagem.",
-	"schema.wordPattern.pattern": "O padrão RegExp usado para coincidir com as palavras.",
-	"schema.wordPattern.flags": "Os sinalizadores RegExp usados para coincidir com as palavras.",
-	"schema.wordPattern.flags.errorMessage": "Deve corresponder ao padrão `/^([gimuy]+)$/`.",
-	"schema.indentationRules": "Configurações de recuo da linguagem.",
-	"schema.indentationRules.increaseIndentPattern": "Se uma linha corresponder a esse padrão, então todas as linhas depois dela devem ser recuadas uma vez (até que outra regra corresponda).",
-	"schema.indentationRules.increaseIndentPattern.pattern": "O padrão RegExp para increaseIndentPattern.",
-	"schema.indentationRules.increaseIndentPattern.flags": "Os rótulos RegExp para increaseIndentPattern.",
-	"schema.indentationRules.increaseIndentPattern.errorMessage": "Deve corresponder ao padrão `/^([gimuy]+)$/`.",
-	"schema.indentationRules.decreaseIndentPattern": "Se uma linha corresponder a esse padrão, então todas as linhas após ela devem ser aproximadas uma vez (até que outra regra corresponda).",
-	"schema.indentationRules.decreaseIndentPattern.pattern": "O padrão RegExp para decreaseIndentPattern.",
-	"schema.indentationRules.decreaseIndentPattern.flags": "Os rótulos RegExp para decreaseIndentPattern.",
-	"schema.indentationRules.decreaseIndentPattern.errorMessage": "Deve corresponder ao padrão `/^([gimuy]+)$/`.",
-	"schema.indentationRules.indentNextLinePattern": "Se uma linha corresponder a esse padrão, então **apenas a próxima linha** após ela deve ser recuada uma vez.",
-	"schema.indentationRules.indentNextLinePattern.pattern": "O padrão RegExp para indentNextLinePattern.",
-	"schema.indentationRules.indentNextLinePattern.flags": "Os rótulos RegExp para indentNextLinePattern.",
-	"schema.indentationRules.indentNextLinePattern.errorMessage": "Deve corresponder ao padrão `/^([gimuy]+)$/`.",
-	"schema.indentationRules.unIndentedLinePattern": "Se uma linha corresponder a esse padrão, então seu recuo não deve ser mudado e ela não deve ser avaliada contra as outras regras.",
-	"schema.indentationRules.unIndentedLinePattern.pattern": "O padrão RegExp para unIndentedLinePattern.",
-	"schema.indentationRules.unIndentedLinePattern.flags": "Os rótulos RegExp para unIndentedLinePattern.",
-	"schema.indentationRules.unIndentedLinePattern.errorMessage": "Deve corresponder ao padrão `/^([gimuy]+)$/`.",
-	"schema.folding": "As configurações de dobragem da linguagem.",
-	"schema.folding.offSide": "O enquadramento para a regra de impedimento se blocos nessa linguagem são expressados pela sua identação. Se definido, linhas em branco pertencem ao bloco subsequente.",
-	"schema.folding.markers": "Linguagem específica de marcadores de aninhamento como '#region' e '#endregion'. As expressões regulares de início e final serão testadas contra o conteúdo de todas as linhas e devem ser planejadas de forma eficiente",
-	"schema.folding.markers.start": "O padrão RegExp para o marcador de início. O regexp deve começar com '^'.",
-	"schema.folding.markers.end": "O padrão RegExp para o marcador final. O regexp deve começar com '^'."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/codeEditor/electron-browser/largeFileOptimizations.i18n.json b/i18n/ptb/src/vs/workbench/parts/codeEditor/electron-browser/largeFileOptimizations.i18n.json
deleted file mode 100644
index 35229bd6699..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/codeEditor/electron-browser/largeFileOptimizations.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	]
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/codeEditor/electron-browser/textMate/inspectTMScopes.i18n.json b/i18n/ptb/src/vs/workbench/parts/codeEditor/electron-browser/textMate/inspectTMScopes.i18n.json
deleted file mode 100644
index b56de7034a6..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/codeEditor/electron-browser/textMate/inspectTMScopes.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"inspectTMScopes": "Desenvolvedor: Inspecionar escopos TM",
-	"inspectTMScopesWidget.loading": "Carregando..."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/codeEditor/electron-browser/toggleMinimap.i18n.json b/i18n/ptb/src/vs/workbench/parts/codeEditor/electron-browser/toggleMinimap.i18n.json
deleted file mode 100644
index c5b6891ce22..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/codeEditor/electron-browser/toggleMinimap.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleMinimap": "Visualização: Ativar/Desativar Minimapa"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/codeEditor/electron-browser/toggleMultiCursorModifier.i18n.json b/i18n/ptb/src/vs/workbench/parts/codeEditor/electron-browser/toggleMultiCursorModifier.i18n.json
deleted file mode 100644
index f4def0064ed..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/codeEditor/electron-browser/toggleMultiCursorModifier.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleLocation": "Alternar Modificador de Multi-Cursor"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderControlCharacter.i18n.json b/i18n/ptb/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderControlCharacter.i18n.json
deleted file mode 100644
index 0919c0b47b3..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderControlCharacter.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleRenderControlCharacters": "Visualização: Ativar/Desativar Caracteres de Controle"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderWhitespace.i18n.json b/i18n/ptb/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderWhitespace.i18n.json
deleted file mode 100644
index c3d132e73dc..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderWhitespace.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleRenderWhitespace": "Visualização: Ativar/Desativar Renderização de Espaços em Branco"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/codeEditor/electron-browser/toggleWordWrap.i18n.json b/i18n/ptb/src/vs/workbench/parts/codeEditor/electron-browser/toggleWordWrap.i18n.json
deleted file mode 100644
index 3db807a6ff7..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/codeEditor/electron-browser/toggleWordWrap.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggle.wordwrap": "Visualizar: Alternar Quebra de Linha",
-	"wordWrap.notInDiffEditor": "Não pode alternar quebra de linha em um editor diff.",
-	"unwrapMinified": "Desabilitar empacotamento para este arquivo",
-	"wrapMinified": "Habilitar empacotamento para este arquivo"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/codeEditor/electron-browser/wordWrapMigration.i18n.json b/i18n/ptb/src/vs/workbench/parts/codeEditor/electron-browser/wordWrapMigration.i18n.json
deleted file mode 100644
index e5f77642993..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/codeEditor/electron-browser/wordWrapMigration.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"wordWrapMigration.ok": "OK",
-	"wordWrapMigration.dontShowAgain": "Não mostrar novamente",
-	"wordWrapMigration.openSettings": "Abrir configurações",
-	"wordWrapMigration.prompt": "A configuração `editor.wrappingColumn` foi descontinuada e substituída pela configuração `editor.wordWrap`"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/debug/browser/breakpointWidget.i18n.json b/i18n/ptb/src/vs/workbench/parts/debug/browser/breakpointWidget.i18n.json
deleted file mode 100644
index 9c0da9a9432..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/debug/browser/breakpointWidget.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"breakpointWidgetExpressionPlaceholder": "Parar quando a expressão for avaliada como true. 'Enter' para aceitar, 'esc' para cancelar.",
-	"breakpointWidgetAriaLabel": "O programa só vai parar aqui se esta condição for verdadeira. Pressione Enter para aceitar ou Escape para cancelar.",
-	"breakpointWidgetHitCountPlaceholder": "Parar quando contagem de ocorrências condição for alcançada. 'Enter' para aceitar, 'esc' para cancelar.",
-	"breakpointWidgetHitCountAriaLabel": "O programa só vai parar aqui, se a contagem de ocorrências for alcançada. Pressione Enter para aceitar ou Escape para cancelar.",
-	"expression": "Expressão",
-	"hitCount": "Contagem de ocorrências"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json b/i18n/ptb/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
deleted file mode 100644
index 4c94ccc38fb..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"editBreakpoint": "Editar {0}...",
-	"functionBreakpointsNotSupported": "Pontos de parada de função não são suportados por este tipo de depuração",
-	"functionBreakpointPlaceholder": "Função de parada",
-	"functionBreakPointInputAriaLabel": "Digitar Ponto de Parada de Função",
-	"breakpointDisabledHover": "Ponto de interrupção desativado",
-	"breakpointUnverifieddHover": "Ponto de Parada não Verificado",
-	"functionBreakpointUnsupported": "Função de ponto de parada não é suportado por este tipo de debug",
-	"breakpointDirtydHover": "Ponto de parada não verificado. O arquivo foi modificado, por favor reinicie a sessão de depuração.",
-	"conditionalBreakpointUnsupported": "Pontos de parada condicionais não são suportados por esse tipo de depurador",
-	"hitBreakpointUnsupported": "Pontos de parada condicionais não são suportados por este tipo de debug"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/debug/browser/debugActionItems.i18n.json b/i18n/ptb/src/vs/workbench/parts/debug/browser/debugActionItems.i18n.json
deleted file mode 100644
index 29f343f7eb4..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/debug/browser/debugActionItems.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noConfigurations": "Sem configurações",
-	"addConfigTo": "Adicione Config ({0})...",
-	"addConfiguration": "Adicionar Configuração..."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/debug/browser/debugActions.i18n.json b/i18n/ptb/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
deleted file mode 100644
index 336eeed6227..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openLaunchJson": "Abrir {0}",
-	"launchJsonNeedsConfigurtion": "Configurar ou corrigir 'launch.json'",
-	"noFolderDebugConfig": "Primeiro abra uma pasta para fazer uma configuração de depuração avançada.",
-	"startDebug": "Iniciar Depuração",
-	"startWithoutDebugging": "Iniciar Sem Depuração",
-	"selectAndStartDebugging": "Selecionar e Iniciar a Depuração",
-	"restartDebug": "Reiniciar",
-	"reconnectDebug": "Reconectar",
-	"stepOverDebug": "Pular Sobre",
-	"stepIntoDebug": "Pular Dentro",
-	"stepOutDebug": "Pular Fora",
-	"stopDebug": "Parar",
-	"disconnectDebug": "Desconectar",
-	"continueDebug": "Continuar",
-	"pauseDebug": "Pausa",
-	"terminateThread": "Finalizar Tarefa",
-	"restartFrame": "Reiniciar o Frame",
-	"removeBreakpoint": "Remover Ponto de Parada",
-	"removeAllBreakpoints": "Remover Todos os Pontos de Parada",
-	"enableAllBreakpoints": "Habilitar Todos os Pontos de Parada",
-	"disableAllBreakpoints": "Desabilitar Todos Pontos de Parada",
-	"activateBreakpoints": "Ativar Pontos de Parada",
-	"deactivateBreakpoints": "Desativar Pontos de Parada",
-	"reapplyAllBreakpoints": "Reaplicar Todos os Pontos de Parada",
-	"addFunctionBreakpoint": "Adicionar Ponto de Parada de Função",
-	"setValue": "Definir Valor",
-	"addWatchExpression": "Adicionar Expressão",
-	"editWatchExpression": "Editar expressão",
-	"addToWatchExpressions": "Adicionar ao monitoramento",
-	"removeWatchExpression": "Remover Expressão",
-	"removeAllWatchExpressions": "Remover Todas as Expressões",
-	"clearRepl": "Limpar console",
-	"debugConsoleAction": "Console do Depurador",
-	"unreadOutput": "Nova Saída no Console de Depuração",
-	"debugFocusConsole": "Foco no Console de Depuração",
-	"stepBackDebug": "Passo para trás",
-	"reverseContinue": "Reverter"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/debug/browser/debugActionsWidget.i18n.json b/i18n/ptb/src/vs/workbench/parts/debug/browser/debugActionsWidget.i18n.json
deleted file mode 100644
index 7cf5bc7303c..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/debug/browser/debugActionsWidget.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"debugToolBarBackground": "Cor de fundo da barra de ferramentas de depuração.",
-	"debugToolBarBorder": "Cor da borda da barra de ferramentas de depuração."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/debug/browser/debugCommands.i18n.json b/i18n/ptb/src/vs/workbench/parts/debug/browser/debugCommands.i18n.json
deleted file mode 100644
index b967138c3c1..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/debug/browser/debugCommands.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noFolderDebugConfig": "Primeiro abra uma pasta para fazer uma configuração de depuração avançada.",
-	"debug": "Depurar"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/debug/browser/debugContentProvider.i18n.json b/i18n/ptb/src/vs/workbench/parts/debug/browser/debugContentProvider.i18n.json
deleted file mode 100644
index ae25f330896..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/debug/browser/debugContentProvider.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"unable": "Não é possível resolver o recurso sem uma sessão de depuração",
-	"canNotResolveSource": "Não foi possível resolver o recurso {0}, não há resposta da extensão do debug."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json b/i18n/ptb/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
deleted file mode 100644
index d1c7af084af..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleBreakpointAction": "Depurar: Alternar Ponto de Parada",
-	"conditionalBreakpointEditorAction": "Depurar: Adicionar Ponto de Interrupção Condicional...",
-	"runToCursor": "Executar até o Cursor",
-	"debugEvaluate": "Depurar: Avaliar",
-	"debugAddToWatch": "Depurar: Adicionar ao monitoramento",
-	"showDebugHover": "Mostrar Item Flutuante"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/debug/browser/debugEditorModelManager.i18n.json b/i18n/ptb/src/vs/workbench/parts/debug/browser/debugEditorModelManager.i18n.json
deleted file mode 100644
index 9d049961336..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/debug/browser/debugEditorModelManager.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"breakpointDisabledHover": "Ponto de Parada Desativado",
-	"breakpointUnverifieddHover": "Ponto de Parada Não Verificado",
-	"breakpointDirtydHover": "Ponto de parada não verificado. O arquivo foi modificado, por favor reinicie a sessão de depuração.",
-	"breakpointUnsupported": "Pontos de parada condicionais não são suportados por esse tipo de depurador"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/debug/browser/debugQuickOpen.i18n.json b/i18n/ptb/src/vs/workbench/parts/debug/browser/debugQuickOpen.i18n.json
deleted file mode 100644
index 950969040d9..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/debug/browser/debugQuickOpen.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"entryAriaLabel": "depurar {0}",
-	"debugAriaLabel": "Digite um nome de uma configuração de lançamento para ser executado.",
-	"addConfigTo": "Adicionar Configuração ({0})...",
-	"addConfiguration": "Adicionar Configuração...",
-	"noConfigurationsMatching": "Não há configurações de depuração correspondentes",
-	"noConfigurationsFound": "Configurações de depuração não encontradas. Por favor, crie um arquivo 'launch.json'."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/debug/browser/debugStatus.i18n.json b/i18n/ptb/src/vs/workbench/parts/debug/browser/debugStatus.i18n.json
deleted file mode 100644
index 770870bd07f..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/debug/browser/debugStatus.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"selectAndStartDebug": "Selecionar e Iniciar a Configuração do Depurador"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/debug/browser/debugViewlet.i18n.json b/i18n/ptb/src/vs/workbench/parts/debug/browser/debugViewlet.i18n.json
deleted file mode 100644
index 90b013634f9..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/debug/browser/debugViewlet.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"debugFocusVariablesView": "Foco em Variáveis",
-	"debugFocusWatchView": "Foco em Monitoramento",
-	"debugFocusCallStackView": "Foco em Pilha de Chamadas",
-	"debugFocusBreakpointsView": "Foco em Pontos de Interrupção"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/debug/browser/exceptionWidget.i18n.json b/i18n/ptb/src/vs/workbench/parts/debug/browser/exceptionWidget.i18n.json
deleted file mode 100644
index 1accf6587a9..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/debug/browser/exceptionWidget.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"debugExceptionWidgetBorder": "Cor da borda da ferramenta de exceção.",
-	"debugExceptionWidgetBackground": "Cor de fundo da ferramenta de exceção.",
-	"exceptionThrownWithId": "Ocorreu exceção: {0}",
-	"exceptionThrown": "Ocorreu exceção."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/debug/browser/linkDetector.i18n.json b/i18n/ptb/src/vs/workbench/parts/debug/browser/linkDetector.i18n.json
deleted file mode 100644
index d80cfc88da7..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/debug/browser/linkDetector.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"fileLinkMac": "Clique para seguir (Cmd + clique abre ao lado)",
-	"fileLink": "Clique para seguir (Cmd + clique abre ao lado)"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/debug/browser/statusbarColorProvider.i18n.json b/i18n/ptb/src/vs/workbench/parts/debug/browser/statusbarColorProvider.i18n.json
deleted file mode 100644
index 36dac78d9fc..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/debug/browser/statusbarColorProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"statusBarDebuggingBackground": "Cor de fundo da barra de status quando um programa está sendo depurado. A barra de status é mostrada na parte inferior da janela",
-	"statusBarDebuggingForeground": "Cor de primeiro plano da barra de status quando um programa está sendo depurado. A barra de status é mostrada na parte inferior da janela",
-	"statusBarDebuggingBorder": "Cor da borda da barra de status separando para a barra lateral e editor quando um programa está sendo depurado. A barra de status é mostrada na parte inferior da janela"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/debug/common/debug.i18n.json b/i18n/ptb/src/vs/workbench/parts/debug/common/debug.i18n.json
deleted file mode 100644
index 9c6b1eb71b2..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/debug/common/debug.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"internalConsoleOptions": "Controla o comportamento do console depuração interna."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/debug/common/debugModel.i18n.json b/i18n/ptb/src/vs/workbench/parts/debug/common/debugModel.i18n.json
deleted file mode 100644
index 034d3aaec19..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/debug/common/debugModel.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"notAvailable": "não disponível",
-	"startDebugFirst": "Por favor, inicie uma sessão de depuração para avaliar"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/debug/common/debugSchemas.i18n.json b/i18n/ptb/src/vs/workbench/parts/debug/common/debugSchemas.i18n.json
deleted file mode 100644
index cb32880c0c0..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/debug/common/debugSchemas.i18n.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.contributes.debuggers": "Contribui adaptadores de depuração.",
-	"vscode.extension.contributes.debuggers.type": "Identificador único para esse adaptador de depuração.",
-	"vscode.extension.contributes.debuggers.label": "Nome de exibição para esse adaptador de depuração.",
-	"vscode.extension.contributes.debuggers.program": "Caminho para o programa adaptador de depuração. O caminho pode ser absoluto ou relativo à pasta de extensão.",
-	"vscode.extension.contributes.debuggers.args": "Argumentos opcionais a serem informados para o adaptador.",
-	"vscode.extension.contributes.debuggers.runtime": "Runtime opcional no caso do atributo do programa não ser um executável, mas requerer um runtime.",
-	"vscode.extension.contributes.debuggers.runtimeArgs": "Argumentos opcionais do runtime.",
-	"vscode.extension.contributes.debuggers.variables": "Mapeamento de variáveis interativas (por exemplo ${action.pickProcess}) em 'launch.json' para um comando.",
-	"vscode.extension.contributes.debuggers.initialConfigurations": "Configurações para gerar o 'launch.json' inicial.",
-	"vscode.extension.contributes.debuggers.languages": "Lista de idiomas para os quais a extensão de depuração pode ser considerada o \"depurador padrão\".",
-	"vscode.extension.contributes.debuggers.adapterExecutableCommand": "Se especificado VS Code chamará este comando para determinar o caminho do executável do adaptador de depuração e os argumentos para passar.",
-	"vscode.extension.contributes.debuggers.configurationSnippets": "Trechos de código para adicionar novas configurações em 'launch.json'.",
-	"vscode.extension.contributes.debuggers.configurationAttributes": "Configurações de esquema JSON para validar 'launch.json'.",
-	"vscode.extension.contributes.debuggers.windows": "Configurações específicas do Windows.",
-	"vscode.extension.contributes.debuggers.windows.runtime": "Runtime usado para Windows.",
-	"vscode.extension.contributes.debuggers.osx": "Configurações específicas para macOS.",
-	"vscode.extension.contributes.debuggers.osx.runtime": "Runtime usado para o macOS.",
-	"vscode.extension.contributes.debuggers.linux": "Configurações específicas do Linux.",
-	"vscode.extension.contributes.debuggers.linux.runtime": "Runtime usado para o Linux.",
-	"vscode.extension.contributes.breakpoints": "Contribui aos pontos de interrupção.",
-	"vscode.extension.contributes.breakpoints.language": "Permitir pontos de parada para este idioma.",
-	"app.launch.json.title": "Executar",
-	"app.launch.json.version": "Versão deste formato de arquivo.",
-	"app.launch.json.configurations": "Lista de configurações. Adicionar novas configurações ou editar as existentes usando o IntelliSense.",
-	"app.launch.json.compounds": "Lista de compostos. Cada composto faz referência a várias configurações que vão ser executadas juntas.",
-	"app.launch.json.compound.name": "Nome do composto. Aparece no menu drop-down da configuração de execução.",
-	"useUniqueNames": "Por favor, use nomes únicos de configuração.",
-	"app.launch.json.compounds.configurations": "Nomes das configurações que serão iniciadas como parte deste composto."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/debug/common/debugSource.i18n.json b/i18n/ptb/src/vs/workbench/parts/debug/common/debugSource.i18n.json
deleted file mode 100644
index 0c9476560da..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/debug/common/debugSource.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"unknownSource": "Fonte desconhecida"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json b/i18n/ptb/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
deleted file mode 100644
index 1770196e491..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"breakpointWidgetHitCountPlaceholder": "Parar quando contagem de ocorrências condição for alcançada. 'Enter' para aceitar, 'esc' para cancelar.",
-	"breakpointWidgetExpressionPlaceholder": "Parar quando a expressão for avaliada como true. 'Enter' para aceitar, 'esc' para cancelar.",
-	"expression": "Expressão",
-	"hitCount": "Contagem de ocorrências",
-	"logMessage": "Mensagem de log"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/debug/electron-browser/breakpointsView.i18n.json b/i18n/ptb/src/vs/workbench/parts/debug/electron-browser/breakpointsView.i18n.json
deleted file mode 100644
index 06a451b492d..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/debug/electron-browser/breakpointsView.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"editConditionalBreakpoint": "Editar o Ponto de Parada...",
-	"functionBreakpointsNotSupported": "Pontos de parada de função não são suportados por este tipo de depuração",
-	"functionBreakpointPlaceholder": "Função de parada",
-	"functionBreakPointInputAriaLabel": "Digitar Ponto de Parada de Função"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/debug/electron-browser/callStackView.i18n.json b/i18n/ptb/src/vs/workbench/parts/debug/electron-browser/callStackView.i18n.json
deleted file mode 100644
index 629d36f440e..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/debug/electron-browser/callStackView.i18n.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"callstackSection": "Seção de Pilha de Chamada",
-	"debugStopped": "Pausado em {0}",
-	"callStackAriaLabel": "Depurar a Pilha de Chamadas",
-	"paused": "Em pausa",
-	"running": "Em execução",
-	"thread": "Thread",
-	"pausedOn": "Pausado em {0}",
-	"loadMoreStackFrames": "Carregar mais segmentos de pilha",
-	"threadAriaLabel": "Thread {0}, pilha de chamadas, depuração",
-	"stackFrameAriaLabel": "Segmento de Pilha {0} linha {1} {2}, pilha de chamadas, depuração"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json b/i18n/ptb/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
deleted file mode 100644
index 5396071d235..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleDebugViewlet": "Visualizar Depurador",
-	"toggleDebugPanel": "Console do Depurador",
-	"debug": "Depurar",
-	"debugPanel": "Console do Depurador",
-	"variables": "Variáveis",
-	"watch": "Monitoramento",
-	"callStack": "Pilha de Chamadas",
-	"breakpoints": "Pontos de Parada",
-	"view": "Exibir",
-	"debugCategory": "Depurar",
-	"debugCommands": "Configuração do Depurador",
-	"debugConfigurationTitle": "Depurar",
-	"allowBreakpointsEverywhere": "Permite definir um ponto de interrupção em qualquer arquivo.",
-	"openExplorerOnEnd": "Automaticamente abre a visualização do explorador no final de uma sessão de depuração",
-	"inlineValues": "Mostrar valores de variáveis em linha no editor durante a depuração",
-	"never": "Nunca mostrar debug na barra de status",
-	"always": "Sempre mostrar depurar na barra de status",
-	"onFirstSessionStart": "Mostrar depurar na barra de status somente após a depuração ser iniciada pela primeira vez",
-	"showInStatusBar": "Controla quando a barra de status de depuração deve ser visível",
-	"openDebug": "Controla se a visualização de depuração deve ser aberta no início da sessão de depuração.",
-	"launch": "Configuração global do lançamento do depurador. Deve ser usado como uma alternativa para o arquivo 'launch.json' que é compartilhado entre os espaços de trabalho"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/debug/electron-browser/debugCommands.i18n.json b/i18n/ptb/src/vs/workbench/parts/debug/electron-browser/debugCommands.i18n.json
deleted file mode 100644
index eee873a81a5..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/debug/electron-browser/debugCommands.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noFolderDebugConfig": "Primeiro abra uma pasta para fazer uma configuração de depuração avançada."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json b/i18n/ptb/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json
deleted file mode 100644
index 09a259f9132..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"selectDebug": "Selecione o ambiente",
-	"DebugConfig.failed": "Não é possível criar o arquivo 'launch.json' dentro da pasta '.vscode' ({0}).",
-	"workspace": "espaço de trabalho",
-	"user settings": "configurações de usuário"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json b/i18n/ptb/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
deleted file mode 100644
index c27b6170525..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"editBreakpoint": "Editar {0}...",
-	"disableBreakpoint": "Desabilitar {0}",
-	"removeBreakpoints": "Remover pontos de interrupção",
-	"removeLineBreakpoint": "Remover ponto de interrupção de linha",
-	"editBreakpoints": "Editar pontos de interrupção",
-	"editLineBrekapoint": "Editar o ponto de interrupção de linha",
-	"enableDisableBreakpoints": "Habilitar/Desabilitar pontos de interrupção",
-	"disableBreakpointOnLine": "Desabilitar ponto de interrupção de linha",
-	"enableBreakpointOnLine": "Habilitar o ponto de interrupção de linha",
-	"addBreakpoint": "Adicionar ponto de interrupção",
-	"addConditionalBreakpoint": "Adicionar Ponto de Parada Condicional...",
-	"disableLogPoint": "Desabilitar {0}",
-	"cancel": "Cancelar",
-	"addConfiguration": "Adicionar Configuração..."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/debug/electron-browser/debugHover.i18n.json b/i18n/ptb/src/vs/workbench/parts/debug/electron-browser/debugHover.i18n.json
deleted file mode 100644
index b8bb53d9128..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/debug/electron-browser/debugHover.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"treeAriaLabel": "Depurar passando o mouse por cima"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json b/i18n/ptb/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
deleted file mode 100644
index 7ae7f7f9b75..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"snapshotObj": "Apenas valores primitivos são mostrados para este objeto.",
-	"debuggingPaused": "Depuração pausada, razão {0}, {1} {2}",
-	"debuggingStarted": "Depuração Iniciada.",
-	"debuggingStopped": "Depuração parada.",
-	"breakpointAdded": "Adicionado ponto de interrupção, linha {0}, arquivo {1}",
-	"breakpointRemoved": "Ponto de interrupção removido, linha {0}, arquivo {1}",
-	"compoundMustHaveConfigurations": "Composição deve ter o atributo \"configurations\" definido para iniciar várias configurações.",
-	"noConfigurationNameInWorkspace": "Não foi possível encontrar a configuração de inicialização '{0}' na área de trabalho.",
-	"multipleConfigurationNamesInWorkspace": "Existem múltiplas configurações de lançamento '{0}' na área de trabalho. Use o nome da pasta para qualificar a configuração.",
-	"noFolderWithName": "Não é possível encontrar a pasta com nome '{0}' para configuração '{1}' no composto '{2}'.",
-	"configMissing": "Configuração '{0}' não tem 'launch.json'.",
-	"launchJsonDoesNotExist": "'launch.json' não existe.",
-	"debugRequestNotSupported": "Atributo '{0}' tem um valor sem suporte '{1}' na configuração de debug escolhida.",
-	"debugRequesMissing": "Atributo '{0}' está faltando para a configuração de depuração escolhida.",
-	"debugTypeNotSupported": "Tipo de depuração configurado '{0}' não é suportado.",
-	"debugTypeMissing": "Falta a propriedade 'type' para a configuração de lançamento escolhida.",
-	"debugAnyway": "Depurar mesmo assim",
-	"preLaunchTaskErrors": "Erros de build foram detectados durante a preLaunchTask '{0}'.",
-	"preLaunchTaskError": "Erro de build foi detectado durante a preLaunchTask '{0}'.",
-	"preLaunchTaskExitCode": "A preLaunchTask '{0}' encerrada com código de saída {1}.",
-	"showErrors": "Mostrar erros",
-	"noFolderWorkspaceDebugError": "O arquivo ativo não pode ser depurado. Certifique-se de que ele está salvo no disco e que tem uma extensão de depuração instalada para esse tipo de arquivo.",
-	"cancel": "Cancelar",
-	"DebugTaskNotFound": "Não foi possível encontrar a tarefa '{0}'.",
-	"taskNotTracked": "A tarefa '{0}' não pode ser rastreada."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/debug/electron-browser/debugViewer.i18n.json b/i18n/ptb/src/vs/workbench/parts/debug/electron-browser/debugViewer.i18n.json
deleted file mode 100644
index ae47cc6a47d..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/debug/electron-browser/debugViewer.i18n.json
+++ /dev/null
@@ -1,28 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"process": "Processar",
-	"paused": "Em pausa",
-	"running": "Em execução",
-	"thread": "Thread",
-	"pausedOn": "Pausado em {0}",
-	"loadMoreStackFrames": "Carregar mais segmentos de pilha",
-	"threadAriaLabel": "Thread {0}, pilha de chamadas, depuração",
-	"stackFrameAriaLabel": "Segmento de Pilha {0} linha {1} {2}, pilha de chamadas, depuração",
-	"variableValueAriaLabel": "Digite o novo valor da variável",
-	"variableScopeAriaLabel": "Escopo {0}, variáveis, depuração",
-	"variableAriaLabel": "{0} valor {1}, variáveis, depuração",
-	"watchExpressionPlaceholder": "Expressão para monitorar",
-	"watchExpressionInputAriaLabel": "Digitar expressão a monitorar",
-	"watchExpressionAriaLabel": "{0} valor {1}, monitorar, depuração",
-	"watchVariableAriaLabel": "{0} valor {1}, monitorar, depuração",
-	"functionBreakpointPlaceholder": "Função de parada",
-	"functionBreakPointInputAriaLabel": "Digitar Ponto de Parada de Função",
-	"functionBreakpointsNotSupported": "Pontos de parada de função não são suportados por este tipo de depuração",
-	"breakpointAriaLabel": "Ponto de parada linha {0} {1}, pontos de parada, depuração",
-	"functionBreakpointAriaLabel": "Ponto de parada de função {0}, pontos de parada, depuração",
-	"exceptionBreakpointAriaLabel": "Ponto de parada de exceção {0}, pontos de parada, depuração"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/debug/electron-browser/debugViews.i18n.json b/i18n/ptb/src/vs/workbench/parts/debug/electron-browser/debugViews.i18n.json
deleted file mode 100644
index c981f42161e..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/debug/electron-browser/debugViews.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"variablesSection": "Seção de variáveis",
-	"variablesAriaTreeLabel": "Variáveis de Depuração",
-	"expressionsSection": "Seção de Expressões",
-	"watchAriaTreeLabel": "Depurar Expressões Monitoradas",
-	"callstackSection": "Seção de Pilha de Chamada",
-	"debugStopped": "Pausado em {0}",
-	"callStackAriaLabel": "Depurar a Pilha de Chamadas",
-	"breakpointsSection": "Seção de Pontos de Parada",
-	"breakpointsAriaTreeLabel": "Depurar os Pontos de Parada"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/debug/electron-browser/electronDebugActions.i18n.json b/i18n/ptb/src/vs/workbench/parts/debug/electron-browser/electronDebugActions.i18n.json
deleted file mode 100644
index 549e00ee363..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/debug/electron-browser/electronDebugActions.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"copyValue": "Copiar valor",
-	"copyAsExpression": "Copiar como Expressão",
-	"copy": "Copiar",
-	"copyAll": "Copiar todos",
-	"copyStackTrace": "Copiar Pilha de Chamadas"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/debug/electron-browser/rawDebugSession.i18n.json b/i18n/ptb/src/vs/workbench/parts/debug/electron-browser/rawDebugSession.i18n.json
deleted file mode 100644
index 3b712f1be09..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/debug/electron-browser/rawDebugSession.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"moreInfo": "Mais Informações",
-	"debugAdapterCrash": "Processo do adaptador de depuração foi finalizado inesperadamente"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/debug/electron-browser/repl.i18n.json b/i18n/ptb/src/vs/workbench/parts/debug/electron-browser/repl.i18n.json
deleted file mode 100644
index f18b2dccf5a..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/debug/electron-browser/repl.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"replAriaLabel": "Ler o Painel de Impressão Eval",
-	"actions.repl.historyPrevious": "História anterior",
-	"actions.repl.historyNext": "Próxima história",
-	"actions.repl.acceptInput": "REPL Aceitar Entrada",
-	"actions.repl.copyAll": "Depurar: Copiar Todos os Consoles"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/debug/electron-browser/replViewer.i18n.json b/i18n/ptb/src/vs/workbench/parts/debug/electron-browser/replViewer.i18n.json
deleted file mode 100644
index 4776197ea55..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/debug/electron-browser/replViewer.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"stateCapture": "Estado do objeto é capturado na primeira avaliação",
-	"replVariableAriaLabel": "Variável {0} tem valor {1}, ler a impressão do valor do loop, depurar",
-	"replExpressionAriaLabel": "Expressão {0} tem valor {1}, ler o laço de avaliação de impressão, depurar",
-	"replValueOutputAriaLabel": " impressão da avaliação do laço de leitura, depurar",
-	"replRawObjectAriaLabel": "Variável repl {0} tem valor {1}, ler o loop de avaliação de impressão e depuração"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/debug/electron-browser/statusbarColorProvider.i18n.json b/i18n/ptb/src/vs/workbench/parts/debug/electron-browser/statusbarColorProvider.i18n.json
deleted file mode 100644
index 36dac78d9fc..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/debug/electron-browser/statusbarColorProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"statusBarDebuggingBackground": "Cor de fundo da barra de status quando um programa está sendo depurado. A barra de status é mostrada na parte inferior da janela",
-	"statusBarDebuggingForeground": "Cor de primeiro plano da barra de status quando um programa está sendo depurado. A barra de status é mostrada na parte inferior da janela",
-	"statusBarDebuggingBorder": "Cor da borda da barra de status separando para a barra lateral e editor quando um programa está sendo depurado. A barra de status é mostrada na parte inferior da janela"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json b/i18n/ptb/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json
deleted file mode 100644
index 53b616809b4..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"debug.terminal.title": "depurado"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/debug/electron-browser/variablesView.i18n.json b/i18n/ptb/src/vs/workbench/parts/debug/electron-browser/variablesView.i18n.json
deleted file mode 100644
index 746b222228f..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/debug/electron-browser/variablesView.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"variablesSection": "Seção de variáveis",
-	"variablesAriaTreeLabel": "Variáveis de Depuração",
-	"variableValueAriaLabel": "Digite o novo valor da variável",
-	"variableScopeAriaLabel": "Escopo {0}, variáveis, depuração",
-	"variableAriaLabel": "{0} valor {1}, variáveis, depuração"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/debug/electron-browser/watchExpressionsView.i18n.json b/i18n/ptb/src/vs/workbench/parts/debug/electron-browser/watchExpressionsView.i18n.json
deleted file mode 100644
index c84a051043b..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/debug/electron-browser/watchExpressionsView.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"expressionsSection": "Seção de Expressões",
-	"watchAriaTreeLabel": "Depurar Expressões Monitoradas",
-	"watchExpressionPlaceholder": "Expressão para monitorar",
-	"watchExpressionInputAriaLabel": "Digitar expressão a monitorar",
-	"watchExpressionAriaLabel": "{0} valor {1}, monitorar, depuração",
-	"watchVariableAriaLabel": "{0} valor {1}, monitorar, depuração"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json b/i18n/ptb/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
deleted file mode 100644
index 18e436b0f51..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"debugAdapterBinNotFound": "Executável do adaptador de depuração '{0}' não existe.",
-	"debugAdapterCannotDetermineExecutable": "Não é possível determinar o executável para o adaptador de depuração '{0}'.",
-	"unableToLaunchDebugAdapter": "Não é possível executar o adaptador de depuração de '{0}'.",
-	"unableToLaunchDebugAdapterNoArgs": "Não é possível executar o adaptador de depuração."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/debug/node/debugger.i18n.json b/i18n/ptb/src/vs/workbench/parts/debug/node/debugger.i18n.json
deleted file mode 100644
index ddf29b94374..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/debug/node/debugger.i18n.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"launch.config.comment2": "Passe o mouse para ver as descrições dos atributos existentes.",
-	"launch.config.comment3": "Para obter mais informações, visite: {0}",
-	"debugType": "Tipo de configuração.",
-	"debugTypeNotRecognised": "O tipo de depuração não é reconhecido. Certifique-se de que você tem uma extensão de depuração correspondente instalada e que ela está habilitada.",
-	"node2NotSupported": "\"node2\" não é mais suportado, use \"node\" ao invés e defina o atributo \"protocol\" para \"inspector\".",
-	"debugName": "Nome da configuração; aparece no menu drop-down da configuração de lançamento. ",
-	"debugRequest": "Requer o tipo de configuração. Pode ser \"launch\" ou \"attach\".",
-	"debugServer": "Somente para o desenvolvimento de extensão de depuração: se uma porta é especificada, o VS Code tenta se conectar a um adaptador de depuração executando em modo de servidor",
-	"debugPrelaunchTask": "Tarefa para ser executada antes de começar a sessão de depuração.",
-	"debugPostDebugTask": "Tarefa para ser executada após término da sessão de debug.",
-	"debugWindowsConfiguration": "Atributos de configuração de lançamento específicos do Windows.",
-	"debugOSXConfiguration": "Atributos de configuração de lançamento específicos do OS X.",
-	"debugLinuxConfiguration": "Atributos de configuração de lançamento específicos do Linux.",
-	"deprecatedVariables": "'env.', 'config.' e 'command.' foram descontinuados, use ' env:', ' config:' e ' command:' em vez disso."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/debug/node/terminals.i18n.json b/i18n/ptb/src/vs/workbench/parts/debug/node/terminals.i18n.json
deleted file mode 100644
index 0043a4db9f3..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/debug/node/terminals.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"console.title": "Console VS Code",
-	"mac.terminal.script.failed": "Script '{0}' falhou com código de saída {1}",
-	"mac.terminal.type.not.supported": "'{0}' não suportado",
-	"press.any.key": "Pressione qualquer tecla para continuar...",
-	"linux.term.failed": "'{0}' falhou com código de saída {1}"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/emmet/browser/actions/showEmmetCommands.i18n.json b/i18n/ptb/src/vs/workbench/parts/emmet/browser/actions/showEmmetCommands.i18n.json
deleted file mode 100644
index 11f88516f42..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/emmet/browser/actions/showEmmetCommands.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"showEmmetCommands": "Mostrar Comandos do Emmet"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/emmet/electron-browser/actions/balance.i18n.json b/i18n/ptb/src/vs/workbench/parts/emmet/electron-browser/actions/balance.i18n.json
deleted file mode 100644
index 1dc5e1e3b69..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/emmet/electron-browser/actions/balance.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"balanceInward": "Emmet: Saldo (interno)",
-	"balanceOutward": "Emmet: Saldo (externo)"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/emmet/electron-browser/actions/editPoints.i18n.json b/i18n/ptb/src/vs/workbench/parts/emmet/electron-browser/actions/editPoints.i18n.json
deleted file mode 100644
index d9e3601f991..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/emmet/electron-browser/actions/editPoints.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"previousEditPoint": "Emmet: Ir para o Ponto de Edição Anterior",
-	"nextEditPoint": "Emmet: Ir para o Próximo Ponto de Edição"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/emmet/electron-browser/actions/evaluateMath.i18n.json b/i18n/ptb/src/vs/workbench/parts/emmet/electron-browser/actions/evaluateMath.i18n.json
deleted file mode 100644
index b4a6a03e213..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/emmet/electron-browser/actions/evaluateMath.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"evaluateMathExpression": "Emmet: Avaliar a expressão matemática"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/emmet/electron-browser/actions/expandAbbreviation.i18n.json b/i18n/ptb/src/vs/workbench/parts/emmet/electron-browser/actions/expandAbbreviation.i18n.json
deleted file mode 100644
index 13a4687f0d1..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/emmet/electron-browser/actions/expandAbbreviation.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"expandAbbreviationAction": "Emmet: Expandir Abreviação"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/emmet/electron-browser/actions/incrementDecrement.i18n.json b/i18n/ptb/src/vs/workbench/parts/emmet/electron-browser/actions/incrementDecrement.i18n.json
deleted file mode 100644
index 306332a4af2..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/emmet/electron-browser/actions/incrementDecrement.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"incrementNumberByOneTenth": "Emmet: Incremento de 0.1",
-	"incrementNumberByOne": "Emmet: Incremento de 1",
-	"incrementNumberByTen": "Emmet: Incremento de 10",
-	"decrementNumberByOneTenth": "Emmet: Decréscimo por 0.1",
-	"decrementNumberByOne": "Emmet: Decréscimo por 1",
-	"decrementNumberByTen": "Emmet: Decréscimo por 10"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/emmet/electron-browser/actions/matchingPair.i18n.json b/i18n/ptb/src/vs/workbench/parts/emmet/electron-browser/actions/matchingPair.i18n.json
deleted file mode 100644
index 6a742c4d5f9..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/emmet/electron-browser/actions/matchingPair.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"matchingPair": "Emmet: Ir para o par de correspondência"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/emmet/electron-browser/actions/mergeLines.i18n.json b/i18n/ptb/src/vs/workbench/parts/emmet/electron-browser/actions/mergeLines.i18n.json
deleted file mode 100644
index 22ed3f5f533..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/emmet/electron-browser/actions/mergeLines.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"mergeLines": "Emmet: Mesclar linhas"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/emmet/electron-browser/actions/reflectCssValue.i18n.json b/i18n/ptb/src/vs/workbench/parts/emmet/electron-browser/actions/reflectCssValue.i18n.json
deleted file mode 100644
index bc0eefc2e00..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/emmet/electron-browser/actions/reflectCssValue.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"reflectCSSValue": "Emmet: Refletir valor CSS"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/emmet/electron-browser/actions/removeTag.i18n.json b/i18n/ptb/src/vs/workbench/parts/emmet/electron-browser/actions/removeTag.i18n.json
deleted file mode 100644
index a30414b08d2..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/emmet/electron-browser/actions/removeTag.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"removeTag": "Emmet: Remover Rótulo"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/emmet/electron-browser/actions/selectItem.i18n.json b/i18n/ptb/src/vs/workbench/parts/emmet/electron-browser/actions/selectItem.i18n.json
deleted file mode 100644
index 1343e2d6b36..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/emmet/electron-browser/actions/selectItem.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"selectPreviousItem": "Emmet: Selecione o Item anterior",
-	"selectNextItem": "Emmet: Selecione o próximo Item"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/emmet/electron-browser/actions/splitJoinTag.i18n.json b/i18n/ptb/src/vs/workbench/parts/emmet/electron-browser/actions/splitJoinTag.i18n.json
deleted file mode 100644
index ea04346ea7c..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/emmet/electron-browser/actions/splitJoinTag.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"splitJoinTag": "Emmet: Dividir/Juntar Rótulo"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/emmet/electron-browser/actions/toggleComment.i18n.json b/i18n/ptb/src/vs/workbench/parts/emmet/electron-browser/actions/toggleComment.i18n.json
deleted file mode 100644
index 366cb874a0c..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/emmet/electron-browser/actions/toggleComment.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"toggleComment": "Emmet: Alternar Comentário"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/emmet/electron-browser/actions/updateImageSize.i18n.json b/i18n/ptb/src/vs/workbench/parts/emmet/electron-browser/actions/updateImageSize.i18n.json
deleted file mode 100644
index 1eff88ade9d..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/emmet/electron-browser/actions/updateImageSize.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"updateImageSize": "Emmet: Atualizar o Tamanho da Imagem"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/emmet/electron-browser/actions/updateTag.i18n.json b/i18n/ptb/src/vs/workbench/parts/emmet/electron-browser/actions/updateTag.i18n.json
deleted file mode 100644
index 963a85e1671..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/emmet/electron-browser/actions/updateTag.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"updateTag": "Emmet: Atualizar Rótulo",
-	"enterTag": "Insira o Rótulo",
-	"tag": "Rótulo"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/emmet/electron-browser/actions/wrapWithAbbreviation.i18n.json b/i18n/ptb/src/vs/workbench/parts/emmet/electron-browser/actions/wrapWithAbbreviation.i18n.json
deleted file mode 100644
index 501253b7dcb..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/emmet/electron-browser/actions/wrapWithAbbreviation.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"wrapWithAbbreviationAction": "Emmet: Envelope com a abreviatura",
-	"enterAbbreviation": "Digite a abreviação",
-	"abbreviation": "Abreviação"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/emmet/electron-browser/emmet.contribution.i18n.json b/i18n/ptb/src/vs/workbench/parts/emmet/electron-browser/emmet.contribution.i18n.json
deleted file mode 100644
index 5188de485d3..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/emmet/electron-browser/emmet.contribution.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"emmetConfigurationTitle": "Emmet",
-	"triggerExpansionOnTab": "Quando habilitado, abreviações emmet são expandidas ao pressionar TAB. Não aplicável quando emmet.useNewemmet é definido como true.",
-	"emmetPreferences": "Preferências usadas para modificar o comportamento de algumas ações e resolvedores do Emmet. Não aplicável quando emmet.useNewemmet é definido como true.",
-	"emmetSyntaxProfiles": "Definir o perfil para a sintaxe especificada ou usar seu próprio perfil com regras específicas.",
-	"emmetExclude": "Uma matriz de línguagens onde abreviaturas emmet não devem ser expandidas.",
-	"emmetExtensionsPath": "Caminho para uma pasta que contém perfis emmet, trechos e preferências. Somente perfis são honrados do caminho das extensões quando emmet.useNewEmmet estiver definida como true.",
-	"useNewEmmet": "Experimente os novos módulos emmet (que irão substituir a antiga biblioteca unica emmet) para todos os recursos emmet."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json b/i18n/ptb/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
deleted file mode 100644
index 6af6df4d312..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"terminalConfigurationTitle": "Terminal Externo",
-	"explorer.openInTerminalKind": "Personaliza o tipo de terminal para executar.",
-	"terminal.external.windowsExec": "Personalizar qual terminal executar no Windows.",
-	"terminal.external.osxExec": "Personalizar qual aplicativo de terminal executar no OS X.",
-	"terminal.external.linuxExec": "Personalizar qual terminal executar no Linux.",
-	"globalConsoleActionWin": "Abrir Novo Prompt de Comando",
-	"globalConsoleActionMacLinux": "Abrir Novo Terminal",
-	"scopedConsoleActionWin": "Abrir no Prompt de Comando",
-	"scopedConsoleActionMacLinux": "Abrir no Terminal"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/execution/electron-browser/terminal.contribution.i18n.json b/i18n/ptb/src/vs/workbench/parts/execution/electron-browser/terminal.contribution.i18n.json
deleted file mode 100644
index 95274daf750..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/execution/electron-browser/terminal.contribution.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"terminalConfigurationTitle": "Terminal Externo",
-	"terminal.external.windowsExec": "Personalizar qual terminal executar no Windows.",
-	"terminal.external.osxExec": "Personalizar qual aplicativo de terminal executar no OS X.",
-	"terminal.external.linuxExec": "Personalizar qual terminal executar no Linux.",
-	"globalConsoleActionWin": "Abrir Novo Prompt de Comando",
-	"globalConsoleActionMacLinux": "Abrir Novo Terminal",
-	"scopedConsoleActionWin": "Abrir no Prompt de Comando",
-	"scopedConsoleActionMacLinux": "Abrir no Terminal"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/execution/electron-browser/terminalService.i18n.json b/i18n/ptb/src/vs/workbench/parts/execution/electron-browser/terminalService.i18n.json
deleted file mode 100644
index 0043a4db9f3..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/execution/electron-browser/terminalService.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"console.title": "Console VS Code",
-	"mac.terminal.script.failed": "Script '{0}' falhou com código de saída {1}",
-	"mac.terminal.type.not.supported": "'{0}' não suportado",
-	"press.any.key": "Pressione qualquer tecla para continuar...",
-	"linux.term.failed": "'{0}' falhou com código de saída {1}"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/explorers/browser/treeExplorer.contribution.i18n.json b/i18n/ptb/src/vs/workbench/parts/explorers/browser/treeExplorer.contribution.i18n.json
deleted file mode 100644
index d79e3c4ca0a..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/explorers/browser/treeExplorer.contribution.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"vscode.extension.contributes.view": "Contribui ao modo de exibição personalizado",
-	"vscode.extension.contributes.view.id": "Identificação única usada para identificar a vista criada por vscode.workspace.createTreeView",
-	"vscode.extension.contributes.view.label": "Sequência de caracteres legível usada para processar a visualização",
-	"vscode.extension.contributes.view.icon": "Caminho para o ícone da visualização",
-	"vscode.extension.contributes.views": "Contribui com visualizações personalizadas",
-	"showViewlet": "Mostrar {0}",
-	"view": "Exibir"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/explorers/browser/treeExplorerActions.i18n.json b/i18n/ptb/src/vs/workbench/parts/explorers/browser/treeExplorerActions.i18n.json
deleted file mode 100644
index 37735d10007..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/explorers/browser/treeExplorerActions.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"refresh": "Atualizar"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/explorers/browser/treeExplorerService.i18n.json b/i18n/ptb/src/vs/workbench/parts/explorers/browser/treeExplorerService.i18n.json
deleted file mode 100644
index 7b7f16b3812..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/explorers/browser/treeExplorerService.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"treeExplorer.noMatchingProviderId": "Não há TreeExplorerNodeProvider com id {providerId} registrado."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/explorers/browser/views/treeExplorerView.i18n.json b/i18n/ptb/src/vs/workbench/parts/explorers/browser/views/treeExplorerView.i18n.json
deleted file mode 100644
index 0e7f5f9cd92..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/explorers/browser/views/treeExplorerView.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"treeExplorerViewlet.tree": "Seção do Explorador da Árvore"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/extensions/browser/dependenciesViewer.i18n.json b/i18n/ptb/src/vs/workbench/parts/extensions/browser/dependenciesViewer.i18n.json
deleted file mode 100644
index d89e3681bd8..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/extensions/browser/dependenciesViewer.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"error": "Erro",
-	"Unknown Dependency": "Dependência Desconhecida:"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json b/i18n/ptb/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json
deleted file mode 100644
index e3b5d73f941..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"name": "Nome da extensão",
-	"extension id": "Identificador da extensão",
-	"preview": "Visualizar",
-	"builtin": "Intrínseco",
-	"publisher": "Nome do editor",
-	"install count": "Quantidade de Instalações",
-	"rating": "Avaliação",
-	"repository": "Repositório",
-	"license": "Licença",
-	"details": "Detalhes",
-	"contributions": "Contribuições",
-	"changelog": "Registro de Alterações",
-	"dependencies": "Dependências",
-	"noReadme": "README não disponível.",
-	"noChangelog": "Registro de Alterações não disponível.",
-	"noContributions": "Sem Contribuições",
-	"noDependencies": "Sem Dependências",
-	"settings": "Configurações ({0})",
-	"setting name": "Nome",
-	"description": "Descrição",
-	"default": "Valor padrão",
-	"debuggers": "Depuradores ({0})",
-	"debugger name": "Nome",
-	"debugger type": "Tipo",
-	"views": "Visualizações ({0})",
-	"view id": "ID",
-	"view name": "Nome",
-	"view location": "Onde",
-	"localizations": "Localizações ({0})",
-	"localizations language id": "Id do Idioma",
-	"localizations language name": "Nome do Idioma",
-	"localizations localized language name": "Nome do Idioma (Localizado)",
-	"colorThemes": "Temas de cores ({0})",
-	"iconThemes": "Temas de ícones ({0})",
-	"colors": "Cores ({0})",
-	"colorId": "Id",
-	"defaultDark": "Padrão Escuro",
-	"defaultLight": "Padrão Claro",
-	"defaultHC": "Padrão de alto contraste",
-	"JSON Validation": "Validação JSON ({0})",
-	"commands": "Comandos ({0})",
-	"command name": "Nome",
-	"keyboard shortcuts": "Atalhos de Teclado",
-	"menuContexts": "Contextos de Menu",
-	"languages": "Linguagens ({0})",
-	"language id": "ID",
-	"language name": "Nome",
-	"file extensions": "Extensões de Arquivo",
-	"grammar": "Gramática",
-	"snippets": "Trechos"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json b/i18n/ptb/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
deleted file mode 100644
index 86302d2d217..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"download": "Baixar manualmente",
-	"installAction": "Instalar",
-	"installing": "Instalando",
-	"failedToInstall": "Falha ao instalar '{0}'.",
-	"uninstallAction": "Desinstalar",
-	"Uninstalling": "Desinstalando",
-	"updateAction": "Atualizar",
-	"updateTo": "Atualizar para {0}",
-	"failedToUpdate": "Falha ao atualizar '{0}'.",
-	"ManageExtensionAction.uninstallingTooltip": "Desinstalando",
-	"enableForWorkspaceAction": "Habilitar (Espaço de Trabalho)",
-	"enableGloballyAction": "Habilitar",
-	"enableAction": "Habilitar",
-	"disableForWorkspaceAction": "Desabilitar (Espaço de Trabalho)",
-	"disableGloballyAction": "Desabilitar",
-	"disableAction": "Desabilitar",
-	"checkForUpdates": "Verificar Atualizações",
-	"enableAutoUpdate": "Habilitar Extensões Auto-Atualizáveis",
-	"disableAutoUpdate": "Desabilitar Extensões Auto-Atualizáveis",
-	"updateAll": "Atualizar Todas as Extensões",
-	"reloadAction": "Recarregar",
-	"postUpdateTooltip": "Recarregar para atualizar",
-	"postUpdateMessage": "Recarregar esta janela para ativar a extensão atualizada '{0}'?",
-	"postEnableTooltip": "Recarregar para ativar",
-	"postEnableMessage": "Recarregar esta janela para ativar a extensão '{0}'?",
-	"postDisableTooltip": "Recarregar para desativar",
-	"postDisableMessage": "Recarregar esta janela para desativar a extensão '{0}'?",
-	"postUninstallTooltip": "Recarregar para desativar",
-	"postUninstallMessage": "Recarregar esta janela para desativar a extensão desinstalada '{0}'?",
-	"toggleExtensionsViewlet": "Mostrar Extensões",
-	"installExtensions": "Instalar Extensões",
-	"showEnabledExtensions": "Mostrar extensões habilitadas",
-	"showInstalledExtensions": "Mostrar Extensões Instaladas",
-	"showDisabledExtensions": "Mostrar Extensões Desabilitadas",
-	"clearExtensionsInput": "Limpar Entrada de Extensões",
-	"showBuiltInExtensions": "Mostrar Extensões Internas",
-	"showOutdatedExtensions": "Mostrar Extensões Desatualizadas",
-	"showPopularExtensions": "Mostrar Extensões Populares",
-	"showRecommendedExtensions": "Mostrar Extensões Recomendadas",
-	"installWorkspaceRecommendedExtensions": "Instalar todos os espaço de trabalho recomendado extensões",
-	"allExtensionsInstalled": "Todas as extensões recomendadas para este espaço de trabalho já foram instaladas",
-	"installRecommendedExtension": "Instalar a extensão recomendada",
-	"extensionInstalled": "A extensão recomendada já foi instalada",
-	"showRecommendedKeymapExtensionsShort": "Mapeamentos de Teclado",
-	"showLanguageExtensionsShort": "Extensões de Linguagem",
-	"showAzureExtensionsShort": "Extensões do Azure",
-	"OpenExtensionsFile.failed": "Não foi possível criar o arquivo 'extensions.json' na pasta '.vscode' ({0}).",
-	"configureWorkspaceRecommendedExtensions": "Configurar Extensões Recomendadas (Espaço de Trabalho)",
-	"configureWorkspaceFolderRecommendedExtensions": "Configurar as Extensões Recomendadas (Pasta do Espaço de Trabalho)",
-	"malicious tooltip": "Esta extensão foi relatada como problemática.",
-	"malicious": "Malicioso",
-	"disabled": "Desativado",
-	"disabled globally": "Desativado",
-	"disableAll": "Desabilitar Todas as Extensões Instaladas",
-	"disableAllWorkspace": "Desabilitar Todas as Extensões Instaladas para este Espaço de Trabalho",
-	"enableAll": "Ativar Todas as Extensões",
-	"openExtensionsFolder": "Abrir a Pasta de Extensões",
-	"installVSIX": "Instalar do VSIX...",
-	"installFromVSIX": "Instalar a partir do VSIX",
-	"installButton": "&&Instalar",
-	"InstallVSIXAction.success": "A extensão foi instalada com sucesso. Recarregue para ativá-la.",
-	"InstallVSIXAction.reloadNow": "Recarregar Agora",
-	"ReinstallAction.reloadNow": "Recarregar Agora",
-	"extensionButtonProminentBackground": "Cor de fundo do botão para a ações de extensão que se destacam (por exemplo, o botão de instalar).",
-	"extensionButtonProminentForeground": "Cor de primeiro plano do botão para a ações de extensão que se destacam (por exemplo, o botão de instalar).",
-	"extensionButtonProminentHoverBackground": "Cor de fundo ao passar o mouse sobre o botão para a ações de extensão que se destacam (por exemplo, o botão de instalar)."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/extensions/browser/extensionsList.i18n.json b/i18n/ptb/src/vs/workbench/parts/extensions/browser/extensionsList.i18n.json
deleted file mode 100644
index eb6f8e39a71..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/extensions/browser/extensionsList.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"recommended": "Recomendado"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/extensions/browser/extensionsQuickOpen.i18n.json b/i18n/ptb/src/vs/workbench/parts/extensions/browser/extensionsQuickOpen.i18n.json
deleted file mode 100644
index da6c485eba7..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/extensions/browser/extensionsQuickOpen.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"manage": "Pressione Enter para gerenciar suas extensões.",
-	"notfound": "Extensão '{0}' não encontrada na Loja.",
-	"install": "Pressione Enter para instalar '{0}' da Loja.",
-	"searchFor": "Pressione Enter para pesquisar por '{0}' na Loja.",
-	"noExtensionsToInstall": "Digite um nome de extensão"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/extensions/browser/extensionsWidgets.i18n.json b/i18n/ptb/src/vs/workbench/parts/extensions/browser/extensionsWidgets.i18n.json
deleted file mode 100644
index 7e7aea384bb..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/extensions/browser/extensionsWidgets.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"ratedByUsers": "Avaliado por {0} usuários",
-	"ratedBySingleUser": "Avaliado por 1 usuário"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/extensions/common/extensionsFileTemplate.i18n.json b/i18n/ptb/src/vs/workbench/parts/extensions/common/extensionsFileTemplate.i18n.json
deleted file mode 100644
index 9763e6e1458..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/extensions/common/extensionsFileTemplate.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"app.extensions.json.title": "Extensões",
-	"app.extensions.json.recommendations": "Lista de recomendações de extensões. O identificador de uma extensão é sempre ' ${publisher}. ${nome}'. Por exemplo: 'vscode.csharp'.",
-	"app.extension.identifier.errorMessage": "Formato esperado '${editor}.${nome}'. Exemplo: 'vscode.csharp'."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/extensions/common/extensionsInput.i18n.json b/i18n/ptb/src/vs/workbench/parts/extensions/common/extensionsInput.i18n.json
deleted file mode 100644
index 1acd20c6801..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/extensions/common/extensionsInput.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"extensionsInputName": "Extensão: {0}"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json b/i18n/ptb/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
deleted file mode 100644
index e6df41a65a6..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"name": "Nome da extensão",
-	"extension id": "Identificador da extensão",
-	"preview": "Visualizar",
-	"builtin": "Intrínseco",
-	"publisher": "Nome do editor",
-	"install count": "Quantidade de Instalações",
-	"rating": "Avaliação",
-	"license": "Licença",
-	"details": "Detalhes",
-	"contributions": "Contribuições",
-	"changelog": "Registro de Alterações",
-	"dependencies": "Dependências",
-	"noReadme": "README não disponível.",
-	"noChangelog": "Registro de Alterações não disponível.",
-	"noContributions": "Sem Contribuições",
-	"noDependencies": "Sem Dependências",
-	"settings": "Configurações ({0})",
-	"setting name": "Nome",
-	"description": "Descrição",
-	"default": "Valor padrão",
-	"debuggers": "Depuradores ({0})",
-	"debugger name": "Nome",
-	"debugger type": "Tipo",
-	"view container id": "ID",
-	"view container location": "Onde",
-	"views": "Visualizações ({0})",
-	"view id": "ID",
-	"view name": "Nome",
-	"view location": "Onde",
-	"localizations": "Localizações ({0})",
-	"localizations language id": "Id do Idioma",
-	"colorThemes": "Temas de cores ({0})",
-	"iconThemes": "Temas de ícones ({0})",
-	"colors": "Cores ({0})",
-	"colorId": "Id",
-	"defaultDark": "Padrão Escuro",
-	"defaultLight": "Padrão Claro",
-	"defaultHC": "Padrão de Alto Contraste",
-	"JSON Validation": "Validação JSON ({0})",
-	"schema": "Esquema",
-	"commands": "Comandos ({0})",
-	"command name": "Nome",
-	"keyboard shortcuts": "Atalhos de Teclado",
-	"menuContexts": "Contextos de Menu",
-	"languages": "Linguagens ({0})",
-	"language id": "ID",
-	"language name": "Nome",
-	"file extensions": "Extensões de Arquivo",
-	"grammar": "Gramática",
-	"snippets": "Trechos"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/extensions/electron-browser/extensionProfileService.i18n.json b/i18n/ptb/src/vs/workbench/parts/extensions/electron-browser/extensionProfileService.i18n.json
deleted file mode 100644
index 24347d5855b..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/extensions/electron-browser/extensionProfileService.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"restart3": "Reiniciar",
-	"cancel": "Cancelar",
-	"selectAndStartDebug": "Clique para parar a perfilação."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json b/i18n/ptb/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
deleted file mode 100644
index ddb9ffa28f8..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"neverShowAgain": "Não mostrar novamente",
-	"searchMarketplace": "Pesquisar na Loja",
-	"dynamicWorkspaceRecommendation": "Esta extensão pode interessá-lo porque é popular entre os usuários do repositório {0}.",
-	"exeBasedRecommendation": "Esta extensão é recomendada porque você tem {0} instalado.",
-	"fileBasedRecommendation": "Esta extensão é recomendada baseada nos arquivos que você abriu recentemente.",
-	"workspaceRecommendation": "Esta extensão é recomendada pelos usuários da área de trabalho atual.",
-	"reallyRecommended2": "A extensão {0} é recomendada para este tipo de arquivo.",
-	"reallyRecommendedExtensionPack": "O pacote de extensão '{0}' é recomendado para este tipo de arquivo.",
-	"install": "Instalar",
-	"showRecommendations": "Mostrar Recomendações",
-	"showLanguageExtensions": "A Loja tem extensões que podem ajudar com arquivos '.{0}'",
-	"workspaceRecommended": "Este espaço de trabalho possui recomendações de extensão.",
-	"installAll": "Instalar Tudo",
-	"ignoreExtensionRecommendations": "Você quer ignorar todas as recomendações de extensão?",
-	"ignoreAll": "Sim, Ignorar Tudo",
-	"no": "Não"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/extensions/electron-browser/extensions.contribution.i18n.json b/i18n/ptb/src/vs/workbench/parts/extensions/electron-browser/extensions.contribution.i18n.json
deleted file mode 100644
index 1437e9762ae..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/extensions/electron-browser/extensions.contribution.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"extensionsCommands": "Gerenciar Extensões",
-	"galleryExtensionsCommands": "Instalar Extensões da Galeria",
-	"extension": "Extensão",
-	"runtimeExtension": "Extensões em Execução",
-	"extensions": "Extensões",
-	"view": "Exibir",
-	"developer": "Desenvolvedor",
-	"extensionsConfigurationTitle": "Extensões",
-	"extensionsAutoUpdate": "Atualizar extensões automaticamente",
-	"extensionsIgnoreRecommendations": "Se definido como verdadeiro, as notificações para recomendações de extensão irão parar de aparecer.",
-	"extensionsShowRecommendationsOnlyOnDemand": "Se configurado como verdadeira, as recomendações não serão localizadas ou mostradas a menos que sejam especificamente solicitadas pelo usuário."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.i18n.json b/i18n/ptb/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.i18n.json
deleted file mode 100644
index 7255cc8d78b..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openExtensionsFolder": "Abrir a Pasta de Extensões",
-	"installVSIX": "Instalar do VSIX...",
-	"installFromVSIX": "Instalar a partir do VSIX",
-	"installButton": "&&Instalar",
-	"InstallVSIXAction.success": "A extensão foi instalada com sucesso. Recarregue para ativá-la.",
-	"InstallVSIXAction.reloadNow": "Recarregar Agora"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/extensions/electron-browser/extensionsUtils.i18n.json b/i18n/ptb/src/vs/workbench/parts/extensions/electron-browser/extensionsUtils.i18n.json
deleted file mode 100644
index af3364f4bd8..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/extensions/electron-browser/extensionsUtils.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"disableOtherKeymapsConfirmation": "Desabilitar outros mapeamentos de teclado ({0}) para evitar conflitos entre as combinações de teclas?",
-	"yes": "Sim",
-	"no": "Não"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json b/i18n/ptb/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
deleted file mode 100644
index 5d4dd840e84..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"marketPlace": "Loja",
-	"installedExtensions": "Instalado",
-	"searchInstalledExtensions": "Instalado",
-	"recommendedExtensions": "Recomendado",
-	"otherRecommendedExtensions": "Outras recomendações",
-	"workspaceRecommendedExtensions": "Recomendações do Espaço de Trabalho",
-	"builtInExtensions": "Funcionalidades",
-	"builtInThemesExtensions": "Temas",
-	"searchExtensions": "Pesquisar Extensões na Loja",
-	"sort by installs": "Ordenar por: Quantidade de Instalações",
-	"sort by rating": "Ordenar por: Avaliação",
-	"sort by name": "Ordenar por: Nome",
-	"suggestProxyError": "A Loja retornou 'ECONNREFUSED'. Por favor, verifique a configuração de 'http.proxy'.",
-	"extensions": "Extensões",
-	"outdatedExtensions": "{0} Extensões Desatualizadas",
-	"malicious warning": "Nós desinstalamos '{0}' qual foi reportado ser problemático.",
-	"reloadNow": "Recarregar Agora"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/extensions/electron-browser/extensionsViews.i18n.json b/i18n/ptb/src/vs/workbench/parts/extensions/electron-browser/extensionsViews.i18n.json
deleted file mode 100644
index 4285107c42e..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/extensions/electron-browser/extensionsViews.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"extensions": "Extensões",
-	"no extensions found": "Nenhuma extensão encontrada.",
-	"suggestProxyError": "A Loja retornou 'ECONNREFUSED'. Por favor, verifique a configuração de 'http.proxy'."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/extensions/electron-browser/runtimeExtensionsEditor.i18n.json b/i18n/ptb/src/vs/workbench/parts/extensions/electron-browser/runtimeExtensionsEditor.i18n.json
deleted file mode 100644
index 6f0b7a68d7c..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/extensions/electron-browser/runtimeExtensionsEditor.i18n.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"starActivation": "Ativado ao iniciar",
-	"workspaceContainsGlobActivation": "Ativado porque existe um arquivo {0} correspondente em seu espaço de trabalho",
-	"workspaceContainsFileActivation": "Ativado porque o arquivo {0} existe no seu espaço de trabalho",
-	"languageActivation": "Ativado porque você abriu um arquivo {0}",
-	"workspaceGenericActivation": "Ativado em {0}",
-	"errors": "{0} erros não capturados",
-	"extensionsInputName": "Executando extensões",
-	"showRuntimeExtensions": "Mostrar extensões em execução",
-	"reportExtensionIssue": "Reportar Problema",
-	"extensionHostProfileStart": "Iniciar o Perfil de Host de Extensão",
-	"extensionHostProfileStop": "Parar o Perfil de Host de Extensão",
-	"saveExtensionHostProfile": "Salvar o Perfil de Host de Extensão"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.i18n.json b/i18n/ptb/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.i18n.json
deleted file mode 100644
index 891a02ad110..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.i18n.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"installingVSIXExtension": "Instalando extensão do VSIX...",
-	"malicious": "Esta extensão é relatada como problemática.",
-	"installingMarketPlaceExtension": "Instalando extensão da Loja...",
-	"uninstallingExtension": "Desinstalando extensão...",
-	"enable": "Sim",
-	"doNotEnable": "Não",
-	"yes": "Sim",
-	"no": "Não",
-	"cancel": "Cancelar",
-	"singleDependentError": "Não é possível desabilitar a extensão '{0}'. A extensão '{1}' depende dela.",
-	"twoDependentsError": "Não é possível desabilitar a extensão '{0}'. As extensões '{1}' e '{2}' dependem dela.",
-	"multipleDependentsError": "Não é possível desabilitar a extensão '{0}'. As extensões '{1}', '{2}' e outras dependem dela.",
-	"installConfirmation": "Gostaria de instalar a extensão '{0}'?",
-	"install": "Instalar"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json b/i18n/ptb/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json
deleted file mode 100644
index 48850302ad7..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"workbenchConfigurationTitle": "Área de Trabalho",
-	"feedbackVisibility": "Controla a visibilidade do feedback no Twitter (smiley) na barra de status na região inferior da área de trabalho."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/feedback/electron-browser/feedback.i18n.json b/i18n/ptb/src/vs/workbench/parts/feedback/electron-browser/feedback.i18n.json
deleted file mode 100644
index eae32d78e47..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/feedback/electron-browser/feedback.i18n.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"sendFeedback": "Tweetar Feedback",
-	"label.sendASmile": "Tweete feedback para nós",
-	"patchedVersion1": "Sua instalação está corrompida.",
-	"patchedVersion2": "Por favor especificar isso ao enviar um bug.",
-	"sentiment": "Como foi sua experiência?",
-	"smileCaption": "Feliz",
-	"frownCaption": "Triste",
-	"other ways to contact us": "Outras maneiras de nos contatar",
-	"submit a bug": "Submeter um bug",
-	"request a missing feature": "Solicitar um recurso ausente",
-	"tell us why?": "Diga-nos porquê?",
-	"commentsHeader": "Comentários",
-	"showFeedback": "Mostrar Smiley de Feedback na Barra de Status",
-	"tweet": "Tweetar",
-	"character left": "caractere à esquerda",
-	"characters left": "caracteres à esquerda",
-	"feedbackSending": "Enviando",
-	"feedbackSent": "Obrigado",
-	"feedbackSendingError": "Tentar novamente"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json b/i18n/ptb/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json
deleted file mode 100644
index ad2caa896d3..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hide": "Ocultar"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/files/browser/editors/binaryFileEditor.i18n.json b/i18n/ptb/src/vs/workbench/parts/files/browser/editors/binaryFileEditor.i18n.json
deleted file mode 100644
index 7b0e608ee70..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/files/browser/editors/binaryFileEditor.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"binaryFileEditor": "Visualizador de Arquivo Binário"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/files/browser/editors/textFileEditor.i18n.json b/i18n/ptb/src/vs/workbench/parts/files/browser/editors/textFileEditor.i18n.json
deleted file mode 100644
index c8f71181708..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/files/browser/editors/textFileEditor.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"textFileEditor": "Editor de Arquivo de Texto",
-	"createFile": "Criar arquivo",
-	"fileEditorWithInputAriaLabel": "{0}. Editor de Arquivo de Texto.",
-	"fileEditorAriaLabel": "Editor de Arquivo de Texto"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/files/browser/explorerViewlet.i18n.json b/i18n/ptb/src/vs/workbench/parts/files/browser/explorerViewlet.i18n.json
deleted file mode 100644
index 18b7465dc08..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/files/browser/explorerViewlet.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"folders": "Pastas"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/files/browser/fileActions.contribution.i18n.json b/i18n/ptb/src/vs/workbench/parts/files/browser/fileActions.contribution.i18n.json
deleted file mode 100644
index 464da97e4e9..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/files/browser/fileActions.contribution.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"filesCategory": "Arquivo",
-	"revealInSideBar": "Revelar na Barra Lateral",
-	"acceptLocalChanges": "Usar suas alterações e substituir o conteúdo do disco",
-	"revertLocalChanges": "Descartar as alterações e reverter para o conteúdo no disco"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/files/browser/fileActions.i18n.json b/i18n/ptb/src/vs/workbench/parts/files/browser/fileActions.i18n.json
deleted file mode 100644
index 7c8e3e05c0a..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/files/browser/fileActions.i18n.json
+++ /dev/null
@@ -1,75 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"retry": "Tentar novamente",
-	"rename": "Renomear",
-	"newFile": "Novo Arquivo",
-	"newFolder": "Nova Pasta",
-	"openFolderFirst": "Abrir uma pasta primeiro para criar arquivos ou pastas dentro dele.",
-	"newUntitledFile": "Novo Arquivo Sem Título",
-	"createNewFile": "Novo Arquivo",
-	"createNewFolder": "Nova Pasta",
-	"deleteButtonLabelRecycleBin": "&&Mover para Lixeira",
-	"deleteButtonLabelTrash": "&&Mover para o Lixo",
-	"deleteButtonLabel": "&&Excluir",
-	"dirtyMessageFolderOneDelete": "Você está excluindo uma pasta com alterações não salvas em 1 arquivo. Você quer continuar?",
-	"dirtyMessageFolderDelete": "Você está excluindo uma pasta com alterações não salvas em {0} arquivos. Você quer continuar?",
-	"dirtyMessageFileDelete": "Você está excluindo um arquivo com alterações não salvas. Você quer continuar?",
-	"dirtyWarning": "Suas alterações serão perdidas se você não salvá-las.",
-	"confirmMoveTrashMessageFolder": "Tem certeza de que deseja excluir '{0}' e seu conteúdo?",
-	"confirmMoveTrashMessageFile": "Tem certeza de que deseja excluir '{0}'?",
-	"undoBin": "Você pode restaurar da lixeira.",
-	"undoTrash": "Você pode restaurar a partir do lixo.",
-	"doNotAskAgain": "Não me pergunte novamente",
-	"confirmDeleteMessageFolder": "Tem certeza de que deseja excluir permanentemente '{0}' e seu conteúdo?",
-	"confirmDeleteMessageFile": "Tem certeza de que deseja excluir permanentemente '{0}'?",
-	"irreversible": "Esta ação é irreversível!",
-	"permDelete": "Excluir permanentemente",
-	"delete": "Excluir",
-	"importFiles": "Importar Arquivos",
-	"confirmOverwrite": "Um arquivo ou pasta com o mesmo nome já existe na pasta de destino. Você quer substituí-lo?",
-	"replaceButtonLabel": "&&Substituir",
-	"copyFile": "Copiar",
-	"pasteFile": "Colar",
-	"duplicateFile": "Duplicar",
-	"openToSide": "Aberto para o lado",
-	"compareSource": "Selecione para comparar",
-	"globalCompareFile": "Compare o Arquivo Ativo Com...",
-	"openFileToCompare": "Abrir um arquivo primeiro para compará-lo com outro arquivo.",
-	"compareWith": "Comparar '{0}' com '{1}'",
-	"compareFiles": "Comparar Arquivos",
-	"refresh": "Atualizar",
-	"save": "Salvar",
-	"saveAs": "Salvar como...",
-	"saveAll": "Salvar Todos",
-	"saveAllInGroup": "Salvar Todos no Grupo",
-	"saveFiles": "Salvar todos os arquivos",
-	"revert": "Reverter Arquivo",
-	"focusOpenEditors": "Foco na Visualização dos Editores Abertos",
-	"focusFilesExplorer": "Foco no Explorador de Arquivos",
-	"showInExplorer": "Revelar o Arquivo Ativo na Barra Lateral",
-	"openFileToShow": "Abrir um arquivo primeiro para mostrá-lo no explorer",
-	"collapseExplorerFolders": "Esconder Pastas no Explorador",
-	"refreshExplorer": "Atualizar Explorador",
-	"openFileInNewWindow": "Abrir o Arquivo Ativo em uma Nova Janela",
-	"openFileToShowInNewWindow": "Abrir um arquivo primeiro para abrir em uma nova janela",
-	"revealInWindows": "Revelar no Explorer",
-	"revealInMac": "Revelar no Finder",
-	"openContainer": "Abrir a Pasta",
-	"revealActiveFileInWindows": "Revelar Arquivo Ativo no Windows Explorer",
-	"revealActiveFileInMac": "Revelar Arquivo Ativo no Finder",
-	"openActiveFileContainer": "Abrir a Pasta do Arquivo Ativo.",
-	"copyPath": "Copiar Caminho",
-	"copyPathOfActive": "Copiar Caminho do Arquivo Ativo",
-	"emptyFileNameError": "Um nome de arquivo ou pasta deve ser fornecido.",
-	"fileNameExistsError": "Um arquivo ou pasta **{0}** já existe neste local. Escolha um nome diferente.",
-	"invalidFileNameError": "O nome **{0}** não é válido como um nome de arquivo ou pasta. Por favor, escolha um nome diferente.",
-	"filePathTooLongError": "O nome **{0}** resulta em um caminho muito longo. Escolha um nome mais curto.",
-	"compareWithSaved": "Comparar arquivo ativo com salvo",
-	"modifiedLabel": "{0} (em disco) ↔ {1}",
-	"compareWithClipboard": "Compare o Arquivo Ativo com a Área de Transferência",
-	"clipboardComparisonLabel": "Área de transferência ↔ {0}"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/files/browser/fileCommands.i18n.json b/i18n/ptb/src/vs/workbench/parts/files/browser/fileCommands.i18n.json
deleted file mode 100644
index 2e61a1656c8..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/files/browser/fileCommands.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"openFileToCopy": "Abrir um arquivo primeiro para copiar seu caminho",
-	"openFileToReveal": "Abrir um arquivo primeiro para revelar"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/files/browser/files.contribution.i18n.json b/i18n/ptb/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
deleted file mode 100644
index 0e95d226253..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
+++ /dev/null
@@ -1,53 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"showExplorerViewlet": "Mostrar Explorer",
-	"explore": "Explorador",
-	"view": "Exibir",
-	"textFileEditor": "Editor de Arquivo de Texto",
-	"binaryFileEditor": "Editor de Arquivo Binário",
-	"filesConfigurationTitle": "Arquivos",
-	"exclude": "Configure padrões glob para excluir os arquivos e pastas. Por exemplo, o explorador de arquivos decide quais arquivos e pastas mostrar ou ocultar baseado nessa configuração.",
-	"files.exclude.boolean": "O padrão glob com o qual combinar os caminhos de arquivo. Defina para verdadeiro ou falso para habilitar ou desabilitar o padrão.",
-	"files.exclude.when": "Verificação adicional nos irmãos de um arquivo correspondente. Use $(basename) como variável para o nome do arquivo correspondente.",
-	"associations": "Configurar as associações de arquivo para linguagens (por exemplo, \"* Extension\": \"html\"). Estas têm precedência sobre as associações padrão das linguagens instaladas.",
-	"encoding": "O conjunto de codificação de caracteres padrão a ser usado ao ler e gravar arquivos. Essa configuração também pode ser configurada por linguagem.",
-	"autoGuessEncoding": "Quando habilitado, tentará adivinhar o conjunto de codificação de caracteres ao abrir arquivos. Essa configuração também pode ser configurada por linguagem.",
-	"eol": "O caractere padrão de fim de linha. Use \\n para LF e \\r\\n para CRLF.",
-	"trimTrailingWhitespace": "Quando habilitado, removerá espaços em branco à direita ao salvar um arquivo.",
-	"insertFinalNewline": "Quando habilitado, inseririrá uma nova linha no final do arquivo quando salvá-lo.",
-	"trimFinalNewlines": "Quando habilitado, removerá todas as novas linhas após a nova linha no final do arquivo ao salvá-lo.",
-	"files.autoSave.off": "Um arquivo sujo nunca é automaticamente salvo.",
-	"files.autoSave.afterDelay": "Um arquivo sujo é salvo automaticamente após configurado em 'files.autoSaveDelay'.",
-	"files.autoSave.onFocusChange": "Um arquivo sujo é salvo automaticamente quando o editor perde o foco.",
-	"files.autoSave.onWindowChange": "Um arquivo sujo é salvo automaticamente quando a janela perde o foco.",
-	"autoSave": "Controla o auto-salvamento de arquivos sujos. Aceita os valores: '{0}', '{1}', '{2}' (editor perde o foco), '{3}' (janela perde o foco). Se definido como '{4}', você pode configurar o atraso em 'files.autoSaveDelay'.",
-	"autoSaveDelay": "Controla o atraso em milissegundos depois que um arquivo sujo é salvo automaticamente. Só se aplica quando 'files.autoSave' for definida como '{0}'",
-	"watcherExclude": "Configure padrões glob de caminhos de arquivo para excluir do monitoramento de arquivo. Padrões devem corresponder a caminhos absolutos (ou seja, prefixo com ** ou o caminho completo para combinar corretamente). Alterar essa configuração requer uma reinicialização. Quando o Code estiver consumindo muito tempo de cpu na inicialização, você pode excluir pastas grandes para reduzir a carga inicial.",
-	"hotExit.off": "Desabilitar a saída à quente.",
-	"hotExit.onExit": "Saída à quente será acionada quando o aplicativo for fechado, ou seja, quando a última janela é fechada no Windows/Linux ou quando o comando workbench.action.quit é acionado (paleta de comandos, keybinding, menu). Todas as janelas com backups serão restauradas na próxima execução.",
-	"hotExit.onExitAndWindowClose": "Saída à quente será acionada quando o aplicativo for fechado, ou seja, quando a última janela é fechada no Windows/Linux ou quando o comando workbench.action.quit é acionado (paleta de comando, keybinding, menu), e também para qualquer janela com uma pasta aberta independentemente se é a última janela. Todas as janelas sem pastas abertas serão restauradas no próximo lançamento. Para restaurar janelas de pastas como eram antes do desligamento configure \"window.restoreWindows\" para \"todos\".",
-	"hotExit": "Controla se os arquivos não salvos são lembrados entre as sessões, permitindo salvar alerta ao sair do editor seja ignorada.",
-	"useExperimentalFileWatcher": "Usar o novo monitor experimental de arquivo.",
-	"defaultLanguage": "O modo de linguagem padrão que é atribuída para novos arquivos.",
-	"editorConfigurationTitle": "Editor",
-	"formatOnSave": "Formata um arquivo no salvamento. Um formatador deve estar disponível, o arquivo não deve ser salvo automaticamente e editor não deve ser desligado.",
-	"explorerConfigurationTitle": "Explorador de arquivos",
-	"openEditorsVisible": "Número de editores mostrado no painel Abrir Editores. Configurá-lo para 0 irá ocultar o painel.",
-	"dynamicHeight": "Controla se a altura da seção de editores abertos deve adaptar-se dinamicamente para o número de elementos ou não.",
-	"autoReveal": "Controla se o explorador deve automaticamente revelar e selecionar arquivos ao abri-los.",
-	"enableDragAndDrop": "Controla se o explorador deve permitir mover arquivos e pastas através de arrastar e soltar.",
-	"confirmDragAndDrop": "Controla se o explorer deve pedir a confirmação ao mover arquivos ou pastas através de arrastar e soltar.",
-	"confirmDelete": "Controla se o explorador deve pedir a confirmação ao excluir um arquivo por meio do lixo.",
-	"sortOrder.default": "Arquivos e pastas são classificadas por seus nomes, em ordem alfabética. Pastas são exibidas acima dos arquivos.",
-	"sortOrder.mixed": "Arquivos e pastas são classificadas por seus nomes, em ordem alfabética. Arquivos são misturados com pastas.",
-	"sortOrder.filesFirst": "Arquivos e pastas são classificadas por seus nomes, em ordem alfabética. Os arquivos são exibidos acima das pastas.",
-	"sortOrder.type": "Arquivos e pastas são classificadas de acordo com suas extensões, em ordem alfabética. Pastas são exibidas acima dos arquivos.",
-	"sortOrder.modified": "Arquivos e pastas são classificados de acordo com a data da última modificação, em ordem decrescente. Pastas são exibidas acima dos arquivos.",
-	"sortOrder": "Controla a ordem de classificação dos arquivos e pastas no explorador. Além da classificação padrão, você pode definir a ordem para 'mixed' (arquivos e pastas misturados), 'type' (por tipo de arquivo), 'modified' (pela data da última modificação) ou 'filesFirst' (exibe os arquivos acima das pastas).",
-	"explorer.decorations.colors": "Controles se as decorações de arquivo devem usar cores.",
-	"explorer.decorations.badges": "Controles se as decorações de arquivo devem usar identificações."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/files/browser/saveErrorHandler.i18n.json b/i18n/ptb/src/vs/workbench/parts/files/browser/saveErrorHandler.i18n.json
deleted file mode 100644
index 09a29894643..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/files/browser/saveErrorHandler.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"userGuide": "Use as ações na barra de ferramentas de editor para a direita para **desfazer** suas alterações ou **substituir** o conteúdo no disco com as alterações",
-	"discard": "Descartar",
-	"overwrite": "Sobrescrever",
-	"retry": "Tentar novamente",
-	"readonlySaveError": "Falha ao salvar '{0}': O arquivo está protegido contra gravação. Selecione 'Substituir' para remover a proteção.",
-	"genericSaveError": "Erro ao salvar '{0}': {1}",
-	"staleSaveError": "Falha ao salvar '{0}': O conteúdo no disco é mais recente. Clique em **Comparar** para comparar a sua versão com a do disco.",
-	"compareChanges": "Comparar",
-	"saveConflictDiffLabel": "{0} (no disco) ↔ {1} (em {2}) - Resolver conflitos de salvamento"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/files/browser/views/emptyView.i18n.json b/i18n/ptb/src/vs/workbench/parts/files/browser/views/emptyView.i18n.json
deleted file mode 100644
index 69f48bde47d..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/files/browser/views/emptyView.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"noWorkspace": "Nenhuma Pasta Aberta",
-	"explorerSection": "Seção de Explorador de Arquivos",
-	"noWorkspaceHelp": "Você ainda não adicionou uma pasta no espaço de trabalho.",
-	"addFolder": "Adicionar pasta",
-	"noFolderHelp": "Você ainda não abriu uma pasta.",
-	"openFolder": "Abrir Pasta"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/files/browser/views/explorerDecorationsProvider.i18n.json b/i18n/ptb/src/vs/workbench/parts/files/browser/views/explorerDecorationsProvider.i18n.json
deleted file mode 100644
index 36d4c36aa75..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/files/browser/views/explorerDecorationsProvider.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"label": "Explorador",
-	"canNotResolve": "Não foi possível resolver a pasta da área de trabalho"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/files/browser/views/explorerView.i18n.json b/i18n/ptb/src/vs/workbench/parts/files/browser/views/explorerView.i18n.json
deleted file mode 100644
index 4753a88bd4c..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/files/browser/views/explorerView.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"explorerSection": "Seção de Explorador de Arquivos",
-	"treeAriaLabel": "Explorador de Arquivos"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/files/browser/views/explorerViewer.i18n.json b/i18n/ptb/src/vs/workbench/parts/files/browser/views/explorerViewer.i18n.json
deleted file mode 100644
index 14fa61ade5f..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/files/browser/views/explorerViewer.i18n.json
+++ /dev/null
@@ -1,19 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"fileInputAriaLabel": "Digite o Nome do arquivo. Pressione Enter para confirmar ou Escape para cancelar.",
-	"filesExplorerViewerAriaLabel": "{0}, Explorador de Arquivos",
-	"dropFolders": "Você quer adicionar as pastas no espaço de trabalho?",
-	"dropFolder": "Você quer adicionar a pasta no espaço de trabalho?",
-	"addFolders": "&& Adicionar pastas",
-	"addFolder": "&& Adicionar pasta",
-	"confirmMove": "Tem certeza que deseja mover '{0}'?",
-	"doNotAskAgain": "Não me pergunte novamente",
-	"moveButtonLabel": "&&Mover",
-	"confirmOverwriteMessage": "'{0}' já existe na pasta de destino. Deseja substituí-lo?",
-	"irreversible": "Esta ação é irreversível!",
-	"replaceButtonLabel": "&&Substituir"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/files/browser/views/openEditorsView.i18n.json b/i18n/ptb/src/vs/workbench/parts/files/browser/views/openEditorsView.i18n.json
deleted file mode 100644
index 11563199929..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/files/browser/views/openEditorsView.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"openEditors": "Abrir Editores",
-	"openEditosrSection": "Abrir Seção de Editores",
-	"treeAriaLabel": "Abrir Editores: Lista de Arquivos Ativos",
-	"dirtyCounter": "{0} não salvos"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/files/browser/views/openEditorsViewer.i18n.json b/i18n/ptb/src/vs/workbench/parts/files/browser/views/openEditorsViewer.i18n.json
deleted file mode 100644
index 5564dee7aea..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/files/browser/views/openEditorsViewer.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"editorGroupAriaLabel": "{0}, Agrupar Editor",
-	"openEditorAriaLabel": "{0}, Abrir Editor",
-	"saveAll": "Salvar Todos",
-	"closeAllUnmodified": "Fechar Não Modificados",
-	"closeAll": "Fechar todos",
-	"compareWithSaved": "Comparar com o salvo",
-	"close": "Fechar",
-	"closeOthers": "Fechar Outros"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/files/common/dirtyFilesTracker.i18n.json b/i18n/ptb/src/vs/workbench/parts/files/common/dirtyFilesTracker.i18n.json
deleted file mode 100644
index ebb3d8be9b3..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/files/common/dirtyFilesTracker.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"dirtyFile": "1 arquivo não salvo",
-	"dirtyFiles": "{0} arquivos não salvos"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/files/common/editors/fileEditorInput.i18n.json b/i18n/ptb/src/vs/workbench/parts/files/common/editors/fileEditorInput.i18n.json
deleted file mode 100644
index 01c41f75e67..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/files/common/editors/fileEditorInput.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"orphanedFile": "{0} (excluído do disco)"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/files/electron-browser/explorerViewlet.i18n.json b/i18n/ptb/src/vs/workbench/parts/files/electron-browser/explorerViewlet.i18n.json
deleted file mode 100644
index 8cbf8c1595a..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/files/electron-browser/explorerViewlet.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"folders": "Pastas"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json b/i18n/ptb/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
deleted file mode 100644
index e1ba064de6a..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"filesCategory": "Arquivo",
-	"revealInSideBar": "Revelar na Barra Lateral",
-	"acceptLocalChanges": "Usar suas alterações e substituir o conteúdo do disco",
-	"revertLocalChanges": "Descartar as alterações e reverter para o conteúdo no disco",
-	"copyPathOfActive": "Copiar Caminho do Arquivo Ativo",
-	"saveAllInGroup": "Salvar Todos no Grupo",
-	"saveFiles": "Salvar todos os arquivos",
-	"revert": "Reverter Arquivo",
-	"compareActiveWithSaved": "Comparar o Arquivo Ativo com o Arquivo Salvo",
-	"closeEditor": "Fechar Editor",
-	"view": "Exibir",
-	"openToSide": "Aberto para o lado",
-	"revealInWindows": "Revelar no Explorer",
-	"revealInMac": "Revelar no Finder",
-	"openContainer": "Abrir a Pasta",
-	"copyPath": "Copiar Caminho",
-	"saveAll": "Salvar Todos",
-	"compareWithSaved": "Comparar com o salvo",
-	"compareWithSelected": "Comparar com o Selecionado",
-	"compareSource": "Selecione para comparar",
-	"compareSelected": "Comparar Selecionado",
-	"close": "Fechar",
-	"closeOthers": "Fechar Outros",
-	"closeSaved": "Fechar Salvo",
-	"closeAll": "Fechar todos",
-	"deleteFile": "Excluir permanentemente"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json b/i18n/ptb/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
deleted file mode 100644
index 6f4dc9047cd..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
+++ /dev/null
@@ -1,60 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"newFile": "Novo Arquivo",
-	"newFolder": "Nova Pasta",
-	"rename": "Renomear",
-	"delete": "Excluir",
-	"copyFile": "Copiar",
-	"pasteFile": "Colar",
-	"retry": "Tentar novamente",
-	"newUntitledFile": "Novo Arquivo Sem Título",
-	"createNewFile": "Novo Arquivo",
-	"createNewFolder": "Nova Pasta",
-	"deleteButtonLabelRecycleBin": "&&Mover para Lixeira",
-	"deleteButtonLabelTrash": "&&Mover para o Lixo",
-	"deleteButtonLabel": "&&Excluir",
-	"dirtyMessageFilesDelete": "Você está excluindo arquivos com alterações não salvas. Você quer continuar?",
-	"dirtyMessageFolderOneDelete": "Você está excluindo uma pasta com alterações não salvas em 1 arquivo. Você quer continuar?",
-	"dirtyMessageFolderDelete": "Você está excluindo uma pasta com alterações não salvas em {0} arquivos. Você quer continuar?",
-	"dirtyMessageFileDelete": "Você está excluindo um arquivo com alterações não salvas. Você quer continuar?",
-	"dirtyWarning": "Suas alterações serão perdidas se você não salvá-las.",
-	"doNotAskAgain": "Não me pergunte novamente",
-	"irreversible": "Esta ação é irreversível!",
-	"deletePermanentlyButtonLabel": "&&Excluir Permanentemente",
-	"retryButtonLabel": "&&Tentar Novamente",
-	"confirmMoveTrashMessageMultiple": "Você tem certeza que deseja excluir os seguintes {0} arquivos?",
-	"confirmMoveTrashMessageFolder": "Tem certeza de que deseja excluir '{0}' e seu conteúdo?",
-	"confirmMoveTrashMessageFile": "Tem certeza de que deseja excluir '{0}'?",
-	"confirmDeleteMessageMultiple": "Você tem certeza que deseja excluir permanentemente os seguintes {0} arquivos?",
-	"confirmDeleteMessageFolder": "Tem certeza de que deseja excluir permanentemente '{0}' e seu conteúdo?",
-	"confirmDeleteMessageFile": "Tem certeza de que deseja excluir permanentemente '{0}'?",
-	"confirmOverwrite": "Um arquivo ou pasta com o mesmo nome já existe na pasta de destino. Você quer substituí-lo?",
-	"replaceButtonLabel": "&&Substituir",
-	"fileDeleted": "Arquivo para colar foi excluído ou movido no meio-tempo",
-	"duplicateFile": "Duplicar",
-	"globalCompareFile": "Compare o Arquivo Ativo Com...",
-	"openFileToCompare": "Abrir um arquivo primeiro para compará-lo com outro arquivo.",
-	"refresh": "Atualizar",
-	"saveAllInGroup": "Salvar Todos no Grupo",
-	"focusOpenEditors": "Foco na Visualização dos Editores Abertos",
-	"focusFilesExplorer": "Foco no Explorador de Arquivos",
-	"showInExplorer": "Revelar o Arquivo Ativo na Barra Lateral",
-	"openFileToShow": "Abrir um arquivo primeiro para mostrá-lo no explorer",
-	"collapseExplorerFolders": "Esconder Pastas no Explorador",
-	"refreshExplorer": "Atualizar Explorador",
-	"openFileInNewWindow": "Abrir o Arquivo Ativo em uma Nova Janela",
-	"openFileToShowInNewWindow": "Abrir um arquivo primeiro para abrir em uma nova janela",
-	"copyPath": "Copiar Caminho",
-	"emptyFileNameError": "Um nome de arquivo ou pasta deve ser fornecido.",
-	"fileNameExistsError": "Um arquivo ou pasta **{0}** já existe neste local. Escolha um nome diferente.",
-	"invalidFileNameError": "O nome **{0}** não é válido como um nome de arquivo ou pasta. Por favor, escolha um nome diferente.",
-	"filePathTooLongError": "O nome **{0}** resulta em um caminho muito longo. Escolha um nome mais curto.",
-	"compareWithClipboard": "Compare o Arquivo Ativo com a Área de Transferência",
-	"clipboardComparisonLabel": "Área de Transferência ↔ {0}"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json b/i18n/ptb/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
deleted file mode 100644
index da3989cd895..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"revealInWindows": "Revelar no Explorer",
-	"revealInMac": "Revelar no Finder",
-	"openContainer": "Abrir a Pasta",
-	"saveAs": "Salvar como...",
-	"save": "Salvar",
-	"saveAll": "Salvar Todos",
-	"removeFolderFromWorkspace": "Remover pasta da área de trabalho",
-	"genericRevertError": "Falha ao reverter '{0}': {1}",
-	"modifiedLabel": "{0} (em disco) ↔ {1}",
-	"openFileToReveal": "Abrir um arquivo primeiro para revelar",
-	"openFileToCopy": "Abrir um arquivo primeiro para copiar seu caminho"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json b/i18n/ptb/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
deleted file mode 100644
index 8c362a6a140..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"showExplorerViewlet": "Mostrar Explorer",
-	"explore": "Explorador",
-	"view": "Exibir",
-	"textFileEditor": "Editor de Arquivo de Texto",
-	"binaryFileEditor": "Editor de Arquivo Binário",
-	"filesConfigurationTitle": "Arquivos",
-	"exclude": "Configure padrões glob para excluir os arquivos e pastas. Por exemplo, o explorador de arquivos decide quais arquivos e pastas mostrar ou ocultar baseado nessa configuração.",
-	"files.exclude.boolean": "O padrão glob com o qual combinar os caminhos de arquivo. Defina para verdadeiro ou falso para habilitar ou desabilitar o padrão.",
-	"files.exclude.when": "Verificação adicional nos irmãos de um arquivo correspondente. Use $(basename) como variável para o nome do arquivo correspondente.",
-	"associations": "Configurar as associações de arquivo para linguagens (por exemplo, \"* Extension\": \"html\"). Estas têm precedência sobre as associações padrão das linguagens instaladas.",
-	"encoding": "O conjunto de codificação de caracteres padrão a ser usado ao ler e gravar arquivos. Essa configuração também pode ser configurada por linguagem.",
-	"autoGuessEncoding": "Quando habilitado, tentará adivinhar o conjunto de codificação de caracteres ao abrir arquivos. Essa configuração também pode ser configurada por linguagem.",
-	"eol": "O caractere padrão de fim de linha. Use \\n para LF e \\r\\n para CRLF.",
-	"trimTrailingWhitespace": "Quando habilitado, removerá espaços em branco à direita ao salvar um arquivo.",
-	"insertFinalNewline": "Quando habilitado, inseririrá uma nova linha no final do arquivo quando salvá-lo.",
-	"trimFinalNewlines": "Quando habilitado, removerá todas as novas linhas após a nova linha no final do arquivo ao salvá-lo.",
-	"files.autoSave.off": "Um arquivo sujo nunca é automaticamente salvo.",
-	"files.autoSave.afterDelay": "Um arquivo sujo é salvo automaticamente após configurado em 'files.autoSaveDelay'.",
-	"files.autoSave.onFocusChange": "Um arquivo sujo é salvo automaticamente quando o editor perde o foco.",
-	"files.autoSave.onWindowChange": "Um arquivo sujo é salvo automaticamente quando a janela perde o foco.",
-	"autoSave": "Controla o auto-salvamento de arquivos sujos. Aceita os valores: '{0}', '{1}', '{2}' (editor perde o foco), '{3}' (janela perde o foco). Se definido como '{4}', você pode configurar o atraso em 'files.autoSaveDelay'.",
-	"autoSaveDelay": "Controla o atraso em milissegundos depois que um arquivo sujo é salvo automaticamente. Só se aplica quando 'files.autoSave' for definida como '{0}'",
-	"watcherExclude": "Configure padrões glob de caminhos de arquivo para excluir do monitoramento de arquivo. Padrões devem corresponder a caminhos absolutos (ou seja, prefixo com ** ou o caminho completo para combinar corretamente). Alterar essa configuração requer uma reinicialização. Quando o Code estiver consumindo muito tempo de cpu na inicialização, você pode excluir pastas grandes para reduzir a carga inicial.",
-	"hotExit.off": "Desabilitar a saída à quente.",
-	"hotExit.onExit": "Saída à quente será acionada quando o aplicativo for fechado, ou seja, quando a última janela é fechada no Windows/Linux ou quando o comando workbench.action.quit é acionado (paleta de comandos, keybinding, menu). Todas as janelas com backups serão restauradas na próxima execução.",
-	"hotExit.onExitAndWindowClose": "Saída à quente será acionada quando o aplicativo for fechado, ou seja, quando a última janela é fechada no Windows/Linux ou quando o comando workbench.action.quit é acionado (paleta de comando, keybinding, menu), e também para qualquer janela com uma pasta aberta independentemente se é a última janela. Todas as janelas sem pastas abertas serão restauradas no próximo lançamento. Para restaurar janelas de pastas como eram antes do desligamento configure \"window.restoreWindows\" para \"todos\".",
-	"hotExit": "Controla se os arquivos não salvos são lembrados entre as sessões, permitindo salvar alerta ao sair do editor seja ignorada.",
-	"useExperimentalFileWatcher": "Usar o novo monitor experimental de arquivo.",
-	"defaultLanguage": "O modo de linguagem padrão que é atribuída para novos arquivos.",
-	"editorConfigurationTitle": "Editor",
-	"formatOnSave": "Formata um arquivo no salvamento. Um formatador deve estar disponível, o arquivo não deve ser salvo automaticamente e editor não deve ser desligado.",
-	"explorerConfigurationTitle": "Explorador de arquivos",
-	"openEditorsVisible": "Número de editores mostrados no painel Editores Abertos.",
-	"autoReveal": "Controla se o explorador deve automaticamente revelar e selecionar arquivos ao abri-los.",
-	"enableDragAndDrop": "Controla se o explorador deve permitir mover arquivos e pastas através de arrastar e soltar.",
-	"confirmDragAndDrop": "Controla se o explorer deve pedir a confirmação ao mover arquivos ou pastas através de arrastar e soltar.",
-	"confirmDelete": "Controla se o explorador deve pedir a confirmação ao excluir um arquivo por meio do lixo.",
-	"sortOrder.default": "Arquivos e pastas são classificadas por seus nomes, em ordem alfabética. Pastas são exibidas acima dos arquivos.",
-	"sortOrder.mixed": "Arquivos e pastas são classificadas por seus nomes, em ordem alfabética. Arquivos são misturados com pastas.",
-	"sortOrder.filesFirst": "Arquivos e pastas são classificadas por seus nomes, em ordem alfabética. Os arquivos são exibidos acima das pastas.",
-	"sortOrder.type": "Arquivos e pastas são classificadas de acordo com suas extensões, em ordem alfabética. Pastas são exibidas acima dos arquivos.",
-	"sortOrder.modified": "Arquivos e pastas são classificados de acordo com a data da última modificação, em ordem decrescente. Pastas são exibidas acima dos arquivos.",
-	"sortOrder": "Controla a ordem de classificação dos arquivos e pastas no explorador. Além da classificação padrão, você pode definir a ordem para 'mixed' (arquivos e pastas misturados), 'type' (por tipo de arquivo), 'modified' (pela data da última modificação) ou 'filesFirst' (exibe os arquivos acima das pastas).",
-	"explorer.decorations.colors": "Controles se as decorações de arquivo devem usar cores.",
-	"explorer.decorations.badges": "Controles se as decorações de arquivo devem usar identificações."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json b/i18n/ptb/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json
deleted file mode 100644
index 4c80942ead8..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"retry": "Tentar novamente",
-	"discard": "Descartar",
-	"readonlySaveErrorAdmin": "Falha ao salvar '{0}': O arquivo está protegido contra gravação. Selecione 'Sobrescrever como Admin' para tentar novamente como administrador.",
-	"readonlySaveError": "Falha ao salvar '{0}': O arquivo está protegido contra gravação. Selecione 'Sobrescrever' para tentar remover a proteção.",
-	"permissionDeniedSaveError": "Falha ao salvar '{0}': Permissões insuficientes. Selecione 'Tentar novamente como Admin' para tentar novamente como administrador.",
-	"genericSaveError": "Erro ao salvar '{0}': {1}",
-	"learnMore": "Saiba Mais",
-	"dontShowAgain": "Não mostrar novamente",
-	"compareChanges": "Comparar",
-	"saveConflictDiffLabel": "{0} (no disco) ↔ {1} (em {2}) - Resolver conflitos de salvamento",
-	"overwriteElevated": "Sobrescrever como Admin...",
-	"saveElevated": "Tentar novamente como Admin...",
-	"overwrite": "Sobrescrever"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/files/electron-browser/views/emptyView.i18n.json b/i18n/ptb/src/vs/workbench/parts/files/electron-browser/views/emptyView.i18n.json
deleted file mode 100644
index cb2c656cc6e..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/files/electron-browser/views/emptyView.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noWorkspace": "Nenhuma Pasta Aberta",
-	"explorerSection": "Seção de Explorador de Arquivos",
-	"noWorkspaceHelp": "Você ainda não adicionou uma pasta ao espaço de trabalho.",
-	"addFolder": "Adicionar Pasta",
-	"noFolderHelp": "Você ainda não abriu uma pasta.",
-	"openFolder": "Abrir Pasta"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/files/electron-browser/views/explorerDecorationsProvider.i18n.json b/i18n/ptb/src/vs/workbench/parts/files/electron-browser/views/explorerDecorationsProvider.i18n.json
deleted file mode 100644
index 74ce21b3fd6..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/files/electron-browser/views/explorerDecorationsProvider.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"label": "Explorador",
-	"canNotResolve": "Não foi possível resolver a pasta da área de trabalho"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/files/electron-browser/views/explorerView.i18n.json b/i18n/ptb/src/vs/workbench/parts/files/electron-browser/views/explorerView.i18n.json
deleted file mode 100644
index 91f1c85dbd8..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/files/electron-browser/views/explorerView.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"explorerSection": "Seção de Explorador de Arquivos",
-	"treeAriaLabel": "Explorador de Arquivos"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json b/i18n/ptb/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
deleted file mode 100644
index d918ced097a..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"fileInputAriaLabel": "Digite o Nome do arquivo. Pressione Enter para confirmar ou Escape para cancelar.",
-	"filesExplorerViewerAriaLabel": "{0}, Explorador de Arquivos",
-	"dropFolders": "Você deseja adicionar as pastas ao espaço de trabalho?",
-	"dropFolder": "Você quer adicionar a pasta no espaço de trabalho?",
-	"addFolders": "&&Adicionar Pastas",
-	"addFolder": "&&Adicionar Pasta",
-	"confirmMultiMove": "Você tem certeza que deseja mover os seguintes {0} arquivos?",
-	"confirmMove": "Tem certeza que deseja mover '{0}'?",
-	"doNotAskAgain": "Não me pergunte novamente",
-	"moveButtonLabel": "&&Mover",
-	"confirmOverwriteMessage": "'{0}' já existe na pasta de destino. Deseja substituí-lo?",
-	"irreversible": "Esta ação é irreversível!",
-	"replaceButtonLabel": "&&Substituir"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json b/i18n/ptb/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json
deleted file mode 100644
index e4ceea553e3..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openEditors": "Editores Abertos",
-	"openEditosrSection": "Abrir Seção de Editores",
-	"dirtyCounter": "{0} não salvos"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/files/electron-browser/views/openEditorsViewer.i18n.json b/i18n/ptb/src/vs/workbench/parts/files/electron-browser/views/openEditorsViewer.i18n.json
deleted file mode 100644
index 5564dee7aea..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/files/electron-browser/views/openEditorsViewer.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"editorGroupAriaLabel": "{0}, Agrupar Editor",
-	"openEditorAriaLabel": "{0}, Abrir Editor",
-	"saveAll": "Salvar Todos",
-	"closeAllUnmodified": "Fechar Não Modificados",
-	"closeAll": "Fechar todos",
-	"compareWithSaved": "Comparar com o salvo",
-	"close": "Fechar",
-	"closeOthers": "Fechar Outros"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/html/browser/html.contribution.i18n.json b/i18n/ptb/src/vs/workbench/parts/html/browser/html.contribution.i18n.json
deleted file mode 100644
index 2f618f306d5..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/html/browser/html.contribution.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"html.editor.label": "Visualização Html"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/html/browser/htmlPreviewPart.i18n.json b/i18n/ptb/src/vs/workbench/parts/html/browser/htmlPreviewPart.i18n.json
deleted file mode 100644
index 478273f97f8..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/html/browser/htmlPreviewPart.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"html.voidInput": "Entrada inválida do editor."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/html/browser/webview.contribution.i18n.json b/i18n/ptb/src/vs/workbench/parts/html/browser/webview.contribution.i18n.json
deleted file mode 100644
index 1bdb832ea43..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/html/browser/webview.contribution.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"developer": "Desenvolvedor"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/html/browser/webview.i18n.json b/i18n/ptb/src/vs/workbench/parts/html/browser/webview.i18n.json
deleted file mode 100644
index 2ef4463deb9..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/html/browser/webview.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"devtools.webview": "Desenvolvedor: Ferramentas Webview"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/html/browser/webviewCommands.i18n.json b/i18n/ptb/src/vs/workbench/parts/html/browser/webviewCommands.i18n.json
deleted file mode 100644
index c07b92b70e4..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/html/browser/webviewCommands.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"editor.action.webvieweditor.showFind": "Focalizar Ferramenta de Pesquisa",
-	"refreshWebviewLabel": "Recarregar Webviews"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json b/i18n/ptb/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json
deleted file mode 100644
index 2f618f306d5..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"html.editor.label": "Visualização Html"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json b/i18n/ptb/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json
deleted file mode 100644
index 478273f97f8..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"html.voidInput": "Entrada inválida do editor."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json b/i18n/ptb/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json
deleted file mode 100644
index 1bdb832ea43..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"developer": "Desenvolvedor"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json b/i18n/ptb/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json
deleted file mode 100644
index c9dceaeb492..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"refreshWebviewLabel": "Recarregar Webviews"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json b/i18n/ptb/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
deleted file mode 100644
index 32575a778b5..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"updateLocale": "Gostaria de alternar o idioma da interface do usuário do VS Code para {0} e reiniciar?",
-	"yes": "Sim",
-	"no": "Não",
-	"neverAgain": "Não mostrar novamente",
-	"JsonSchema.locale": "O idioma da interface do usuário a ser usada.",
-	"vscode.extension.contributes.localizations": "Contribui localizações ao editor",
-	"vscode.extension.contributes.localizations.languageId": "Id do idioma em que as strings de exibição estão traduzidas.",
-	"vscode.extension.contributes.localizations.languageName": "Nome do idioma em Inglês.",
-	"vscode.extension.contributes.localizations.languageNameLocalized": "Nome do idioma no idioma de contribuição.",
-	"vscode.extension.contributes.localizations.translations": "Lista de traduções associadas ao idioma.",
-	"vscode.extension.contributes.localizations.translations.id": "Id do VS Code ou Extensão para o qual essa tradução teve contribuição. Id do VS Code é sempre `vscode` e da extensão deve ser no formato `publisherId.extensionName`.",
-	"vscode.extension.contributes.localizations.translations.id.pattern": "Id deve ser `vscode` ou no formato `publisherId.extensionName` para traduzir VS code ou uma extensão, respectivamente.",
-	"vscode.extension.contributes.localizations.translations.path": "Um caminho relativo para um arquivo contendo traduções para o idioma."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/localizations/browser/localizationsActions.i18n.json b/i18n/ptb/src/vs/workbench/parts/localizations/browser/localizationsActions.i18n.json
deleted file mode 100644
index 3490c90bd29..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/localizations/browser/localizationsActions.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"configureLocale": "Configurar Idioma",
-	"displayLanguage": "Define o idioma de exibição do VSCode.",
-	"doc": "Veja {0} para obter uma lista dos idiomas suportados.",
-	"restart": "Modificar o valor requer reinicialização do VSCode.",
-	"fail.createSettings": "Não foi possível criar '{0}' ({1})."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/localizations/electron-browser/localizations.contribution.i18n.json b/i18n/ptb/src/vs/workbench/parts/localizations/electron-browser/localizations.contribution.i18n.json
deleted file mode 100644
index b30f63cfba0..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/localizations/electron-browser/localizations.contribution.i18n.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"updateLocale": "Gostaria de alternar o idioma da interface do usuário do VS Code para {0} e reiniciar?",
-	"yes": "Sim",
-	"no": "Não",
-	"neverAgain": "Não mostrar novamente",
-	"install": "Instalar",
-	"more information": "Mais Informações...",
-	"JsonSchema.locale": "O idioma da interface do usuário a ser usada.",
-	"vscode.extension.contributes.localizations": "Contribui localizações ao editor",
-	"vscode.extension.contributes.localizations.languageId": "Id do idioma em que as strings de exibição estão traduzidas.",
-	"vscode.extension.contributes.localizations.languageName": "Nome do idioma em Inglês.",
-	"vscode.extension.contributes.localizations.languageNameLocalized": "Nome do idioma no idioma de contribuição.",
-	"vscode.extension.contributes.localizations.translations": "Lista de traduções associadas ao idioma.",
-	"vscode.extension.contributes.localizations.translations.id": "Id do VS Code ou Extensão para o qual essa tradução teve contribuição. Id do VS Code é sempre `vscode` e da extensão deve ser no formato `publisherId.extensionName`.",
-	"vscode.extension.contributes.localizations.translations.id.pattern": "Id deve ser `vscode` ou no formato `publisherId.extensionName` para traduzir VS code ou uma extensão, respectivamente.",
-	"vscode.extension.contributes.localizations.translations.path": "Um caminho relativo para um arquivo contendo traduções para o idioma."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/localizations/electron-browser/localizationsActions.i18n.json b/i18n/ptb/src/vs/workbench/parts/localizations/electron-browser/localizationsActions.i18n.json
deleted file mode 100644
index cb900a924bf..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/localizations/electron-browser/localizationsActions.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayLanguage": "Define o idioma de exibição do VSCode.",
-	"doc": "Veja {0} para obter uma lista dos idiomas suportados.",
-	"restart": "Modificar o valor requer reinicialização do VSCode.",
-	"fail.createSettings": "Não foi possível criar '{0}' ({1})."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json b/i18n/ptb/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json
deleted file mode 100644
index 6539931b21c..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"mainLog": "Log (Principal)",
-	"sharedLog": "Log (Compartilhado)",
-	"rendererLog": "Log (Janela)",
-	"extensionsLog": "Log (Host de Extensão)",
-	"developer": "Desenvolvedor"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json b/i18n/ptb/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json
deleted file mode 100644
index 2eb83b4affd..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openLogsFolder": "Abrir Pasta de Logs",
-	"showLogs": "Exibir Logs...",
-	"rendererProcess": "Janela ({0})",
-	"emptyWindow": "Janela",
-	"extensionHost": "Host de Extensão",
-	"sharedProcess": "Compartilhado",
-	"mainProcess": "Principal",
-	"selectProcess": "Selecione o Log para o processo",
-	"openLogFile": "Abrir Arquivo de Log...",
-	"setLogLevel": "Definir Nível de Log...",
-	"trace": "Rastreamento",
-	"debug": "Depurar",
-	"info": "Informações",
-	"warn": "Aviso",
-	"err": "Erro",
-	"critical": "Crítico",
-	"off": "Desligado",
-	"selectLogLevel": "Selecione o nível de log",
-	"default and current": "Padrão & Atual",
-	"default": "Valor padrão",
-	"current": "Atual"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/markers/browser/markersFileDecorations.i18n.json b/i18n/ptb/src/vs/workbench/parts/markers/browser/markersFileDecorations.i18n.json
deleted file mode 100644
index 96bd5448cf6..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/markers/browser/markersFileDecorations.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"label": "Problemas",
-	"tooltip.1": "1 problema neste arquivo",
-	"tooltip.N": "{0} problemas neste arquivo",
-	"markers.showOnFile": "Mostre erros e avisos no arquivos e pasta."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/markers/browser/markersPanel.i18n.json b/i18n/ptb/src/vs/workbench/parts/markers/browser/markersPanel.i18n.json
deleted file mode 100644
index b5d8f47647e..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/markers/browser/markersPanel.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"totalProblems": "Total {0} Problemas",
-	"filteredProblems": "Mostrando {0} de {1} Problemas"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/markers/common/markers.i18n.json b/i18n/ptb/src/vs/workbench/parts/markers/common/markers.i18n.json
deleted file mode 100644
index b5d8f47647e..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/markers/common/markers.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"totalProblems": "Total {0} Problemas",
-	"filteredProblems": "Mostrando {0} de {1} Problemas"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/markers/common/messages.i18n.json b/i18n/ptb/src/vs/workbench/parts/markers/common/messages.i18n.json
deleted file mode 100644
index 598c8bf75e3..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/markers/common/messages.i18n.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"viewCategory": "Exibir",
-	"problems.view.toggle.label": "Esconder/exibir Problemas (Erros, Avisos, Infos)",
-	"problems.view.focus.label": "Focar Problemas (Erros, Avisos, Infos)",
-	"problems.panel.configuration.title": "Visualização de Problemas",
-	"problems.panel.configuration.autoreveal": "Controla se a visaulização de problemas evela os arquivos automaticamente ao abri-los",
-	"markers.panel.title.problems": "Problemas",
-	"markers.panel.aria.label.problems.tree": "Problemas agrupados por arquivos",
-	"markers.panel.no.problems.build": "Nenhum problema foi detectado na área de trabalho até agora.",
-	"markers.panel.no.problems.filters": "Nenhum resultado encontrado com os critérios de filtro fornecidos",
-	"markers.panel.action.filter": "Problemas de Filtro",
-	"markers.panel.filter.placeholder": "Filtrar por tipo ou texto",
-	"markers.panel.filter.errors": "erros",
-	"markers.panel.filter.warnings": "avisos",
-	"markers.panel.filter.infos": "informações",
-	"markers.panel.single.error.label": "1 Erro",
-	"markers.panel.multiple.errors.label": "{0} Erros",
-	"markers.panel.single.warning.label": "1 Aviso",
-	"markers.panel.multiple.warnings.label": "{0} Avisos",
-	"markers.panel.single.info.label": "1 Informação",
-	"markers.panel.multiple.infos.label": "{0} Informações",
-	"markers.panel.single.unknown.label": "1 Desconhecido",
-	"markers.panel.multiple.unknowns.label": "{0} Desconhecidos",
-	"markers.panel.at.ln.col.number": "({0}, {1})",
-	"problems.tree.aria.label.resource": "{0} com {1} problemas",
-	"problems.tree.aria.label.error.marker": "Erro gerado por {0}: {1} na linha {2} e caractere {3}",
-	"problems.tree.aria.label.error.marker.nosource": "Erro: {0} na linha {1} e caractere {2}",
-	"problems.tree.aria.label.warning.marker": "Aviso gerado por {0}: {1} na linha {2} e caractere {3}",
-	"problems.tree.aria.label.warning.marker.nosource": "Aviso: {0} na linha {1} e caractere {2}",
-	"problems.tree.aria.label.info.marker": "Informação gerada por {0}: {1} na linha {2} e caractere {3}",
-	"problems.tree.aria.label.info.marker.nosource": "Informação: {0} na linha {1} e caractere {2}",
-	"problems.tree.aria.label.marker": "Problema gerado por {0}: {1} na linha {2} e caractere {3}",
-	"problems.tree.aria.label.marker.nosource": "Problema: {0} na linha {1} e caractere {2}",
-	"errors.warnings.show.label": "Mostrar Erros e Avisos"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json b/i18n/ptb/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json
deleted file mode 100644
index ed26614c2ca..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"copyMarker": "Copiar",
-	"copyMessage": "Copiar Mensagem"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/markers/electron-browser/markers.i18n.json b/i18n/ptb/src/vs/workbench/parts/markers/electron-browser/markers.i18n.json
deleted file mode 100644
index 8323facb36a..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/markers/electron-browser/markers.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"totalProblems": "Total {0} Problemas"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/markers/electron-browser/markersElectronContributions.i18n.json b/i18n/ptb/src/vs/workbench/parts/markers/electron-browser/markersElectronContributions.i18n.json
deleted file mode 100644
index eabec09f0df..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/markers/electron-browser/markersElectronContributions.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"copyMarker": "Copiar",
-	"copyMarkerMessage": "Mensagem de cópia"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.i18n.json b/i18n/ptb/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.i18n.json
deleted file mode 100644
index 4af5054b913..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"label": "Problemas",
-	"tooltip.1": "1 problema neste arquivo",
-	"tooltip.N": "{0} problemas neste arquivo"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/markers/electron-browser/markersPanel.i18n.json b/i18n/ptb/src/vs/workbench/parts/markers/electron-browser/markersPanel.i18n.json
deleted file mode 100644
index 35229bd6699..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/markers/electron-browser/markersPanel.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	]
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/markers/electron-browser/markersPanelActions.i18n.json b/i18n/ptb/src/vs/workbench/parts/markers/electron-browser/markersPanelActions.i18n.json
deleted file mode 100644
index 35229bd6699..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/markers/electron-browser/markersPanelActions.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	]
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json b/i18n/ptb/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
deleted file mode 100644
index 4c8c7d44a47..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"viewCategory": "Exibir",
-	"problems.view.toggle.label": "Esconder/exibir Problemas (Erros, Avisos, Infos)",
-	"problems.view.focus.label": "Focar Problemas (Erros, Avisos, Infos)",
-	"problems.panel.configuration.title": "Visualização de Problemas",
-	"problems.panel.configuration.autoreveal": "Controla se a visaulização de problemas evela os arquivos automaticamente ao abri-los",
-	"markers.panel.title.problems": "Problemas",
-	"markers.panel.aria.label.problems.tree": "Problemas agrupados por arquivos",
-	"markers.panel.no.problems.build": "Nenhum problema foi detectado na área de trabalho até agora.",
-	"markers.panel.action.filter": "Problemas de Filtro",
-	"markers.panel.filter.ariaLabel": "Problemas de Filtro",
-	"markers.panel.filter.errors": "erros",
-	"markers.panel.filter.warnings": "avisos",
-	"markers.panel.filter.infos": "informações",
-	"markers.panel.single.error.label": "1 Erro",
-	"markers.panel.multiple.errors.label": "{0} Erros",
-	"markers.panel.single.warning.label": "1 Aviso",
-	"markers.panel.multiple.warnings.label": "{0} Avisos",
-	"markers.panel.single.info.label": "1 Informação",
-	"markers.panel.multiple.infos.label": "{0} Informações",
-	"markers.panel.single.unknown.label": "1 Desconhecido",
-	"markers.panel.multiple.unknowns.label": "{0} Desconhecidos",
-	"markers.panel.at.ln.col.number": "({0}, {1})",
-	"problems.tree.aria.label.resource": "{0} com {1} problemas",
-	"errors.warnings.show.label": "Mostrar Erros e Avisos"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/nps/electron-browser/nps.contribution.i18n.json b/i18n/ptb/src/vs/workbench/parts/nps/electron-browser/nps.contribution.i18n.json
deleted file mode 100644
index d232299820d..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/nps/electron-browser/nps.contribution.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"surveyQuestion": "Você se importaria em responder uma rápida pesquisa?",
-	"takeSurvey": "Responder a pesquisa",
-	"remindLater": "Lembrar mais tarde",
-	"neverAgain": "Não mostrar novamente"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/outline/electron-browser/outline.contribution.i18n.json b/i18n/ptb/src/vs/workbench/parts/outline/electron-browser/outline.contribution.i18n.json
deleted file mode 100644
index fb4fcc45258..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/outline/electron-browser/outline.contribution.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"category.focus": "Arquivo"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/outline/electron-browser/outlinePanel.i18n.json b/i18n/ptb/src/vs/workbench/parts/outline/electron-browser/outlinePanel.i18n.json
deleted file mode 100644
index d2d4353b7b5..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/outline/electron-browser/outlinePanel.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"collapse": "Recolher tudo",
-	"sortByName": "Ordenar por: Nome"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/outline/electron-browser/outlineTree.i18n.json b/i18n/ptb/src/vs/workbench/parts/outline/electron-browser/outlineTree.i18n.json
deleted file mode 100644
index 35229bd6699..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/outline/electron-browser/outlineTree.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	]
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/output/browser/output.contribution.i18n.json b/i18n/ptb/src/vs/workbench/parts/output/browser/output.contribution.i18n.json
deleted file mode 100644
index e36bdadf4e9..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/output/browser/output.contribution.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"output": "Saída",
-	"viewCategory": "Exibir",
-	"clearOutput.label": "Limpar saída"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/output/browser/outputActions.i18n.json b/i18n/ptb/src/vs/workbench/parts/output/browser/outputActions.i18n.json
deleted file mode 100644
index 71d77d2ad9b..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/output/browser/outputActions.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleOutput": "Alternar Saída",
-	"clearOutput": "Limpar saída",
-	"toggleOutputScrollLock": "Alternar Scroll Lock de Saída",
-	"switchToOutput.label": "Mudar para Saída",
-	"openInLogViewer": "Abrir Arquivo de Log"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/output/browser/outputPanel.i18n.json b/i18n/ptb/src/vs/workbench/parts/output/browser/outputPanel.i18n.json
deleted file mode 100644
index 0f4dee4e4c4..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/output/browser/outputPanel.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"output": "Saída",
-	"outputPanelWithInputAriaLabel": "{0}, Painel de saída",
-	"outputPanelAriaLabel": "Painel de saída"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/output/common/output.i18n.json b/i18n/ptb/src/vs/workbench/parts/output/common/output.i18n.json
deleted file mode 100644
index a083a6e7d9d..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/output/common/output.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"output": "Saída",
-	"channel": "para '{0}'"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json b/i18n/ptb/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
deleted file mode 100644
index 9b707612469..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"output": "Saída",
-	"logViewer": "Visualizador do Log",
-	"viewCategory": "Exibir",
-	"clearOutput.label": "Limpar saída",
-	"openActiveLogOutputFile": "Exibir: Abrir Arquivo de Saída de Log Ativo"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json b/i18n/ptb/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json
deleted file mode 100644
index 2c09c09b92b..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"output": "{0} - Saída",
-	"channel": "Canal de saída para '{0}'"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/performance/electron-browser/performance.contribution.i18n.json b/i18n/ptb/src/vs/workbench/parts/performance/electron-browser/performance.contribution.i18n.json
deleted file mode 100644
index 886f4120ac9..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/performance/electron-browser/performance.contribution.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"prof.message": "Perfis criados com sucesso.",
-	"prof.detail": "Por favor, crie um problema e anexe manualmente os seguintes arquivos:\n{0}",
-	"prof.restartAndFileIssue": "Criar Problema e Reiniciar",
-	"prof.restart": "Reiniciar",
-	"prof.thanks": "Obrigado por nos ajudar.",
-	"prof.detail.restart": "É necessário um reinício final para continuar a usar '{0}'. Novamente, obrigado pela sua contribuição."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/performance/electron-browser/startupProfiler.i18n.json b/i18n/ptb/src/vs/workbench/parts/performance/electron-browser/startupProfiler.i18n.json
deleted file mode 100644
index 6a02b11f758..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/performance/electron-browser/startupProfiler.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"prof.message": "Perfis criados com sucesso.",
-	"prof.detail": "Por favor, crie um problema e anexe manualmente os seguintes arquivos:\n{0}",
-	"prof.restartAndFileIssue": "Criar Problema e Reiniciar",
-	"prof.restart": "Reiniciar",
-	"prof.thanks": "Obrigado por nos ajudar.",
-	"prof.detail.restart": "É necessário um reinício final para continuar a usar '{0}'. Novamente, obrigado pela sua contribuição."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/preferences/browser/keybindingWidgets.i18n.json b/i18n/ptb/src/vs/workbench/parts/preferences/browser/keybindingWidgets.i18n.json
deleted file mode 100644
index 816068b02b7..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/preferences/browser/keybindingWidgets.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"defineKeybinding.initial": "Pressione a combinação de teclas desejada e pressione ENTER.",
-	"defineKeybinding.chordsTo": "Acorde para"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json b/i18n/ptb/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
deleted file mode 100644
index b2078df07b5..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"SearchKeybindings.AriaLabel": "Pesquisar keybindings",
-	"SearchKeybindings.Placeholder": "Pesquisar keybindings",
-	"sortByPrecedene": "Ordenar por precedência",
-	"header-message": "Para personalizações avançadas abrir e editar",
-	"keybindings-file-name": "keybindings.json",
-	"keybindingsLabel": "Keybindings",
-	"changeLabel": "Alterar Keybinding",
-	"addLabel": "Adicionar Keybinding",
-	"removeLabel": "Remover Keybinding",
-	"resetLabel": "Redefinir Keybinding",
-	"showSameKeybindings": "Mostras as Mesmas Keybindings",
-	"copyLabel": "Copiar",
-	"copyCommandLabel": "Copiar Comando",
-	"command": "Comando",
-	"keybinding": "KeyBinding",
-	"source": "Fonte",
-	"when": "Quando",
-	"editKeybindingLabelWithKey": "Alterar Keybinding {0}",
-	"editKeybindingLabel": "Alterar Keybinding",
-	"addKeybindingLabelWithKey": "Adicionar Keybinding {0}",
-	"addKeybindingLabel": "Adicionar Keybinding",
-	"title": "{0} ({1})",
-	"commandAriaLabel": "Comando é {0}.",
-	"keybindingAriaLabel": "KeyBinding é {0}.",
-	"noKeybinding": "Nenhum Keybinding atribuído.",
-	"sourceAriaLabel": "Fonte é {0}.",
-	"whenAriaLabel": "Quando é {0}.",
-	"noWhen": "Sem contexto Quando."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/preferences/browser/keybindingsEditorContribution.i18n.json b/i18n/ptb/src/vs/workbench/parts/preferences/browser/keybindingsEditorContribution.i18n.json
deleted file mode 100644
index 4047a223c65..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/preferences/browser/keybindingsEditorContribution.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"defineKeybinding.start": "Definir Keybinding",
-	"defineKeybinding.kbLayoutErrorMessage": "Você não será capaz de produzir esta combinação de teclas sob seu layout de teclado atual.",
-	"defineKeybinding.kbLayoutLocalAndUSMessage": "**{0}** para o seu layout de teclado atual (**{1}** para US padrão).",
-	"defineKeybinding.kbLayoutLocalMessage": "**{0}** para o seu layout de teclado atual."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/preferences/browser/preferences.contribution.i18n.json b/i18n/ptb/src/vs/workbench/parts/preferences/browser/preferences.contribution.i18n.json
deleted file mode 100644
index 40e6d0841da..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/preferences/browser/preferences.contribution.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"defaultPreferencesEditor": "Editor de Preferências Padrão",
-	"keybindingsEditor": "Editor de Keybindings",
-	"preferences": "Preferências"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json b/i18n/ptb/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
deleted file mode 100644
index adf9b0ba020..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openRawDefaultSettings": "Abrir Configurações Padrão Raw",
-	"openSettings": "Abrir configurações",
-	"openGlobalSettings": "Abra as Configurações de Usuário",
-	"openGlobalKeybindings": "Abrir Atalhos de Teclado",
-	"openGlobalKeybindingsFile": "Abrir Arquivo de Atalhos de Teclado",
-	"openWorkspaceSettings": "Abrir as configurações do espaço de trabalho",
-	"openFolderSettings": "Abrir configurações da pasta",
-	"configureLanguageBasedSettings": "Definir Configurações Específicas de Linguagem...",
-	"languageDescriptionConfigured": "({0})",
-	"pickLanguage": "Selecionar Linguagem"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json b/i18n/ptb/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
deleted file mode 100644
index 6036183487d..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"SearchSettingsWidget.AriaLabel": "Configurações de Pesquisa",
-	"SearchSettingsWidget.Placeholder": "Configurações de Pesquisa",
-	"noSettingsFound": "Nenhum resultado",
-	"oneSettingFound": "1 Configuração Encontrada",
-	"settingsFound": "{0} Configurações Encontradas",
-	"totalSettingsMessage": "Total {0} Configurações",
-	"nlpResult": "Resultados da Linguagem Natural",
-	"filterResult": "Resultados Filtrados",
-	"defaultSettings": "Configurações Padrão",
-	"defaultFolderSettings": "Configuração Padrão da Pasta",
-	"defaultEditorReadonly": "Editar no editor do lado direito para substituir os padrões.",
-	"preferencesAriaLabel": "Preferências padrão. Editor de texto somente leitura."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json b/i18n/ptb/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
deleted file mode 100644
index d9d0d18805d..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"emptyUserSettingsHeader": "Coloque as suas configurações aqui para substituir as configurações padrão.",
-	"emptyWorkspaceSettingsHeader": "Coloque as suas configurações aqui para substituir as configurações de usuário.",
-	"emptyFolderSettingsHeader": "Coloque as suas configurações de pasta aqui para substituir aqueles das configurações do espaço de trabalho.",
-	"reportSettingsSearchIssue": "Reportar Problema",
-	"newExtensionLabel": "Mostrar Extensão \"{0}\"",
-	"editTtile": "Editar",
-	"replaceDefaultValue": "Substituir nas Configurações",
-	"copyDefaultValue": "Copiar para Configurações"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/preferences/browser/preferencesService.i18n.json b/i18n/ptb/src/vs/workbench/parts/preferences/browser/preferencesService.i18n.json
deleted file mode 100644
index be283113558..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/preferences/browser/preferencesService.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openFolderFirst": "Abrir uma pasta primeiro para criar configurações de espaço de trabalho",
-	"emptyKeybindingsHeader": "Coloque suas chaves de ligações neste arquivo para substituir os padrões",
-	"defaultKeybindings": "Keybindings Padrão",
-	"folderSettingsName": "{0} (configurações de pasta)",
-	"fail.createSettings": "Não foi possível criar '{0}' ({1})."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json b/i18n/ptb/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
deleted file mode 100644
index 01c8a007893..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"defaultSettings": "Coloque suas configurações no editor do lado direito para substituir.",
-	"noSettingsFound": "Não há configurações encontradas.",
-	"settingsSwitcherBarAriaLabel": "Chave de Configurações",
-	"userSettings": "Configurações de Usuário",
-	"workspaceSettings": "Configurações de Espaço de Trabalho",
-	"folderSettings": "Configurações da Pasta"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/preferences/browser/settingsEditor2.i18n.json b/i18n/ptb/src/vs/workbench/parts/preferences/browser/settingsEditor2.i18n.json
deleted file mode 100644
index 313ebae8564..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/preferences/browser/settingsEditor2.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"previewWarning": "Visualizar",
-	"SearchSettings.AriaLabel": "Configurações de Pesquisa",
-	"SearchSettings.Placeholder": "Configurações de Pesquisa",
-	"advancedCustomizationLabel": "Para personalizações avançadas abrir e editar",
-	"treeAriaLabel": "Configurações"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/preferences/browser/settingsTree.i18n.json b/i18n/ptb/src/vs/workbench/parts/preferences/browser/settingsTree.i18n.json
deleted file mode 100644
index e71de4f526f..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/preferences/browser/settingsTree.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"workspace": "Espaço de trabalho",
-	"user": "Usuário",
-	"configured": "Modificado"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/preferences/common/keybindingsEditorModel.i18n.json b/i18n/ptb/src/vs/workbench/parts/preferences/common/keybindingsEditorModel.i18n.json
deleted file mode 100644
index 8c9767d9fd9..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/preferences/common/keybindingsEditorModel.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"default": "Valor padrão",
-	"user": "Usuário",
-	"meta": "meta",
-	"option": "opção"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/preferences/common/preferences.i18n.json b/i18n/ptb/src/vs/workbench/parts/preferences/common/preferences.i18n.json
deleted file mode 100644
index d8eca9d3f26..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/preferences/common/preferences.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"userSettingsTarget": "Configurações de Usuário",
-	"workspaceSettingsTarget": "Configurações de Espaço de Trabalho"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json b/i18n/ptb/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json
deleted file mode 100644
index cc122314c69..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"commonlyUsed": "Comumente Utilizado",
-	"defaultKeybindingsHeader": "Substituir as chaves de ligações, colocando-os em seu arquivo de chave ligações."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/preferences/electron-browser/preferences.contribution.i18n.json b/i18n/ptb/src/vs/workbench/parts/preferences/electron-browser/preferences.contribution.i18n.json
deleted file mode 100644
index 2137ce3030d..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/preferences/electron-browser/preferences.contribution.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"defaultPreferencesEditor": "Editor de Preferências Padrão",
-	"keybindingsEditor": "Editor de Keybindings",
-	"preferences": "Preferências"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/quickopen/browser/commandsHandler.i18n.json b/i18n/ptb/src/vs/workbench/parts/quickopen/browser/commandsHandler.i18n.json
deleted file mode 100644
index e74888f7428..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/quickopen/browser/commandsHandler.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"showTriggerActions": "Mostrar todos os comandos",
-	"clearCommandHistory": "Limpar o Histórico de Comandos",
-	"showCommands.label": "Paleta de comandos...",
-	"entryAriaLabelWithKey": "{0}, {1}, comandos",
-	"entryAriaLabel": "{0}, comandos",
-	"actionNotEnabled": "O comando '{0}' não está habilitado no contexto atual.",
-	"canNotRun": "Comando '{0}' resultou em um erro.",
-	"recentlyUsed": "usados recentemente",
-	"morecCommands": "outros comandos",
-	"cat.title": "{0}: {1}",
-	"noCommandsMatching": "Não há comandos correspondentes"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/quickopen/browser/gotoLineHandler.i18n.json b/i18n/ptb/src/vs/workbench/parts/quickopen/browser/gotoLineHandler.i18n.json
deleted file mode 100644
index 2d2b2c2e007..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/quickopen/browser/gotoLineHandler.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"gotoLine": "Ir para linha...",
-	"gotoLineLabelEmptyWithLimit": "Digite um número de linha entre 1 e {0} para navegar para lá",
-	"gotoLineLabelEmpty": "Digite um número de linha para navegar para lá",
-	"gotoLineColumnLabel": "Ir para linha {0} e caractere {1}",
-	"gotoLineLabel": "Ir para linha {0}",
-	"gotoLineHandlerAriaLabel": "Digite um número de linha para navegar.",
-	"cannotRunGotoLine": "Abrir um arquivo de texto primeiro para ir a uma linha"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/quickopen/browser/gotoSymbolHandler.i18n.json b/i18n/ptb/src/vs/workbench/parts/quickopen/browser/gotoSymbolHandler.i18n.json
deleted file mode 100644
index bd0e54abaca..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/quickopen/browser/gotoSymbolHandler.i18n.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"gotoSymbol": "Ir para o Símbolo no Arquivo...",
-	"symbols": "símbolos ({0})",
-	"method": "métodos ({0})",
-	"function": "funções ({0})",
-	"_constructor": "construtores ({0})",
-	"variable": "variáveis ({0})",
-	"class": "classes ({0})",
-	"interface": "interfaces ({0})",
-	"namespace": "namespaces ({0})",
-	"package": "pacotes ({0})",
-	"modules": "módulos ({0})",
-	"property": "propriedades ({0})",
-	"enum": "enumerações ({0})",
-	"string": "cadeias de caracteres ({0})",
-	"rule": "regras ({0})",
-	"file": "arquivos ({0})",
-	"array": "matrizes ({0})",
-	"number": "números ({0})",
-	"boolean": "booleanos ({0})",
-	"object": "objetos ({0})",
-	"key": "chaves ({0})",
-	"entryAriaLabel": "{0}, símbolos",
-	"noSymbolsMatching": "Não há símbolos correspondentes",
-	"noSymbolsFound": "Nenhum símbolo encontrado",
-	"gotoSymbolHandlerAriaLabel": "Tipo para reduzir os símbolos do editor ativo atual.",
-	"cannotRunGotoSymbolInFile": "Não há informações de símbolo para o arquivo",
-	"cannotRunGotoSymbol": "Abrir um arquivo de texto primeiro para ir a um símbolo"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/quickopen/browser/helpHandler.i18n.json b/i18n/ptb/src/vs/workbench/parts/quickopen/browser/helpHandler.i18n.json
deleted file mode 100644
index f1a684b97f0..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/quickopen/browser/helpHandler.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"entryAriaLabel": "{0}, ajuda do seletor",
-	"globalCommands": "comandos globais",
-	"editorCommands": "comandos do editor"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json b/i18n/ptb/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json
deleted file mode 100644
index 1abc4b0dbcf..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"view": "Exibir",
-	"commandsHandlerDescriptionDefault": "Exibir e executar comandos",
-	"gotoLineDescriptionMac": "Ir para linha",
-	"gotoLineDescriptionWin": "Ir para linha",
-	"gotoSymbolDescription": "Ir para o Símbolo no Arquivo",
-	"gotoSymbolDescriptionScoped": "Ir para o Símbolo no Arquivo Por Categoria",
-	"helpDescription": "Mostrar ajuda",
-	"viewPickerDescription": "Abrir Visualização"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/quickopen/browser/viewPickerHandler.i18n.json b/i18n/ptb/src/vs/workbench/parts/quickopen/browser/viewPickerHandler.i18n.json
deleted file mode 100644
index 2c3789ccf67..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/quickopen/browser/viewPickerHandler.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"entryAriaLabel": "{0}, visualizar seletor",
-	"views": "Modos de exibição",
-	"panels": "Painéis",
-	"terminals": "Terminal",
-	"terminalTitle": "{0}: {1}",
-	"channels": "Saída",
-	"openView": "Abrir Visualização",
-	"quickOpenView": "Abrir Visualização Rápida"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.i18n.json b/i18n/ptb/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.i18n.json
deleted file mode 100644
index 6efbf6def8e..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"relaunchSettingMessage": "Uma configuração que requer uma reinicialização foi alterada.",
-	"relaunchSettingDetail": "Pressione o botão de reinicialização para reiniciar {0} e habilitar a configuração.",
-	"restart": "&&Reiniciar"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.i18n.json b/i18n/ptb/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.i18n.json
deleted file mode 100644
index 5474cd46ba9..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.i18n.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"changes": "{0} de {1} mudanças",
-	"change": "{0} de {1} mudança",
-	"show previous change": "Mostrar a Alteração Anterior",
-	"show next change": "Mostrar a Próxima Alteração",
-	"move to previous change": "Ir para a Alteração Anterior",
-	"move to next change": "Ir para a Próxima Alteração",
-	"editorGutterModifiedBackground": "Cor de fundo da dobra do editor para as linhas que estão modificadas.",
-	"editorGutterAddedBackground": "Cor de fundo da dobra do editor para as linhas que estão adicionadas.",
-	"editorGutterDeletedBackground": "Cor de fundo da dobra do editor para as linhas que estão excluídas.",
-	"overviewRulerModifiedForeground": "Visão geral da cor do marcador da régua para conteúdo modificado.",
-	"overviewRulerAddedForeground": "Visão geral da cor do marcador da régua para conteúdo adicionado.",
-	"overviewRulerDeletedForeground": "Visão geral da cor do marcador da régua para conteúdo excluído."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json b/i18n/ptb/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
deleted file mode 100644
index 5186f0aaae9..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleGitViewlet": "Mostrar Git",
-	"source control": "Controle de código-fonte",
-	"toggleSCMViewlet": "Mostrar SCM",
-	"view": "Exibir",
-	"scmConfigurationTitle": "SCM",
-	"alwaysShowProviders": "Se deverá sempre mostrar a seção Provedor de Controle de Código Fonte.",
-	"diffDecorations": "Controla decorações do diff no editor.",
-	"diffGutterWidth": "Controla a largura(px) das decorações diff no gutter (adicionada e modificada)."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/scm/electron-browser/scmActivity.i18n.json b/i18n/ptb/src/vs/workbench/parts/scm/electron-browser/scmActivity.i18n.json
deleted file mode 100644
index 80fafb45400..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/scm/electron-browser/scmActivity.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"scmPendingChangesBadge": "{0} alterações pendentes"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/scm/electron-browser/scmMenus.i18n.json b/i18n/ptb/src/vs/workbench/parts/scm/electron-browser/scmMenus.i18n.json
deleted file mode 100644
index 5b93869e8d8..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/scm/electron-browser/scmMenus.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"installAdditionalSCMProviders": "Instalar provedores de SCM adicionais...",
-	"switch provider": "Mudar Provedor SCM..."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json b/i18n/ptb/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
deleted file mode 100644
index dfb6a734a7b..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"scm providers": "Provedores de Controle de Código Fonte",
-	"hideRepository": "Ocultar",
-	"installAdditionalSCMProviders": "Instalar provedores de SCM adicionais...",
-	"no open repo": "Não existem provedores de controle de código fonte ativos.",
-	"source control": "Controle de código-fonte",
-	"viewletTitle": "{0}: {1}",
-	"hideView": "Ocultar"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/search/browser/openAnythingHandler.i18n.json b/i18n/ptb/src/vs/workbench/parts/search/browser/openAnythingHandler.i18n.json
deleted file mode 100644
index 31838ac1f69..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/search/browser/openAnythingHandler.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"fileAndTypeResults": "resultados do arquivo e símbolo",
-	"fileResults": "resultados do arquivo"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/search/browser/openFileHandler.i18n.json b/i18n/ptb/src/vs/workbench/parts/search/browser/openFileHandler.i18n.json
deleted file mode 100644
index 5e15f0f73c7..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/search/browser/openFileHandler.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"entryAriaLabel": "{0}, seletor de arquivo",
-	"searchResults": "resultados da pesquisa"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/search/browser/openSymbolHandler.i18n.json b/i18n/ptb/src/vs/workbench/parts/search/browser/openSymbolHandler.i18n.json
deleted file mode 100644
index 9255b0c0b93..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/search/browser/openSymbolHandler.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"entryAriaLabel": "{0}, selecionador de símbolos",
-	"symbols": "resultados de símbolo",
-	"noSymbolsMatching": "Não há símbolos correspondentes",
-	"noSymbolsWithoutInput": "Digitar para pesquisar símbolos"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/search/browser/patternInputWidget.i18n.json b/i18n/ptb/src/vs/workbench/parts/search/browser/patternInputWidget.i18n.json
deleted file mode 100644
index 2636d4ee1cd..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/search/browser/patternInputWidget.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"defaultLabel": "entrada",
-	"useExcludesAndIgnoreFilesDescription": "Usar excluir configurações e ignorar arquivos"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/search/browser/replaceService.i18n.json b/i18n/ptb/src/vs/workbench/parts/search/browser/replaceService.i18n.json
deleted file mode 100644
index b2041432b73..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/search/browser/replaceService.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"fileReplaceChanges": "{0} ↔ {1} (Substituir Preview)"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/search/browser/search.contribution.i18n.json b/i18n/ptb/src/vs/workbench/parts/search/browser/search.contribution.i18n.json
deleted file mode 100644
index b7b7494e9e4..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/search/browser/search.contribution.i18n.json
+++ /dev/null
@@ -1,22 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"showTriggerActions": "Ir para Símbolo no Espaço de Trabalho...",
-	"name": "Pesquisar",
-	"search": "Pesquisar",
-	"view": "Exibir",
-	"openAnythingHandlerDescription": "Ir para o Arquivo",
-	"openSymbolDescriptionNormal": "Ir para o Símbolo em Área de Trabalho",
-	"searchOutputChannelTitle": "Pesquisar",
-	"searchConfigurationTitle": "Pesquisar",
-	"exclude": "Configure os padrões glob para excluir arquivos e pastas nas pesquisas. Herda todos os padrões glob da configuração files.exclude.",
-	"exclude.boolean": "O padrão glob com o qual combinar os caminhos de arquivo. Defina para verdadeiro ou falso para habilitar ou desabilitar o padrão.",
-	"exclude.when": "Verificação adicional nos irmãos de um arquivo correspondente. Use $(basename) como variável para o nome do arquivo correspondente.",
-	"useRipgrep": "Controla se utiliza ripgrep em buscas de texto e de arquivo",
-	"useIgnoreFiles": "Controla se utiliza arquivos .gitignore e .ignore por padrão ao fazer pesquisas de arquivos.",
-	"search.quickOpen.includeSymbols": "Configurar para incluir resultados de uma pesquisa símbolo global nos resultados do arquivo para Abertura Rápida.",
-	"search.followSymlinks": "Controla quando seguir symlinks ao realizar uma busca."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/search/browser/searchActions.i18n.json b/i18n/ptb/src/vs/workbench/parts/search/browser/searchActions.i18n.json
deleted file mode 100644
index ba5b86d8773..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/search/browser/searchActions.i18n.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"nextSearchIncludePattern": "Mostrar a Próxima Busca Incluindo Padrões",
-	"previousSearchIncludePattern": "Mostrar a Busca Anterior Incluindo Padrões",
-	"nextSearchExcludePattern": "Mostrar a Próxima Busca Excluindo Padrões",
-	"previousSearchExcludePattern": "Mostrar a Busca Anterior Excluindo Padrões",
-	"nextSearchTerm": "Mostrar o Próximo Termo de Pesquisa",
-	"previousSearchTerm": "Mostrar Termo de Pesquisa Anterior",
-	"findInFiles": "Localizar nos Arquivos",
-	"replaceInFiles": "Substituir nos Arquivos",
-	"RefreshAction.label": "Atualizar",
-	"CollapseDeepestExpandedLevelAction.label": "Recolher tudo",
-	"ClearSearchResultsAction.label": "Limpar",
-	"CancelSearchAction.label": "Cancelar Pesquisa",
-	"FocusNextSearchResult.label": "Focalizar o Próximo Resultado da Pesquisa",
-	"FocusPreviousSearchResult.label": "Focalizar o Resultado da Pesquisa Anterior",
-	"RemoveAction.label": "Ignorar",
-	"file.replaceAll.label": "Substituir Tudo",
-	"match.replace.label": "Substituir"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/search/browser/searchResultsView.i18n.json b/i18n/ptb/src/vs/workbench/parts/search/browser/searchResultsView.i18n.json
deleted file mode 100644
index a7af6c9de19..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/search/browser/searchResultsView.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"searchFolderMatch.other.label": "Outros arquivos",
-	"searchFileMatches": "{0} arquivos encontrados",
-	"searchFileMatch": "arquivo {0} encontrado",
-	"searchMatches": "{0} correspondências encontradas",
-	"searchMatch": "{0} correspondência encontrada",
-	"folderMatchAriaLabel": "{0} correspondências na pasta raiz {1}, Resultado da pesquisa",
-	"fileMatchAriaLabel": "{0} correspondências no arquivo {1} da pasta {2}, Resultado da pesquisa",
-	"replacePreviewResultAria": "Substitua o termo {0} pelo termo {1} na coluna posição {2} correspondente ao texto {3}",
-	"searchResultAria": "Encontrado o termo {0} na posição da coluna {1} correspondente ao texto {2}"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/search/browser/searchView.i18n.json b/i18n/ptb/src/vs/workbench/parts/search/browser/searchView.i18n.json
deleted file mode 100644
index b3ae6818505..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/search/browser/searchView.i18n.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"moreSearch": "Alternar Detalhes da Pesquisa",
-	"searchScope.includes": "arquivos a serem incluídos",
-	"label.includes": "Pesquisa Padrões de Inclusão",
-	"searchScope.excludes": "arquivos a serem excluídos",
-	"label.excludes": "Pesquisa de Padrões de Exclusão",
-	"replaceAll.confirmation.title": "Substituir Tudo",
-	"replaceAll.confirm.button": "&&Substituir",
-	"replaceAll.occurrence.file.message": "Substituída {0} ocorrência no arquivo {1} com '{2}'.",
-	"removeAll.occurrence.file.message": "Substituída {0} ocorrência no arquivo {1}'.",
-	"replaceAll.occurrence.files.message": "Substituída {0} ocorrência no arquivo {1} com '{2}'.",
-	"removeAll.occurrence.files.message": "Substituída {0} ocorrência nos arquivos {1}",
-	"replaceAll.occurrences.file.message": "Substituídas {0} ocorrências no arquivo {1} com '{2}'.",
-	"removeAll.occurrences.file.message": "Substituídas {0} ocorrências nos arquivo {1}.",
-	"replaceAll.occurrences.files.message": "Substituídas {0} ocorrências nos arquivos {1} com '{2}'.",
-	"removeAll.occurrences.files.message": "Substituídas {0} ocorrências nos arquivos {1}.",
-	"removeAll.occurrence.file.confirmation.message": "Substituir {0} ocorrências no arquivo {1} com '{2}'?",
-	"replaceAll.occurrence.file.confirmation.message": "Substituir {0} ocorrência no arquivo {1}?",
-	"removeAll.occurrence.files.confirmation.message": "Substituir {0} ocorrência nos arquivos {1} com '{2}'?",
-	"replaceAll.occurrence.files.confirmation.message": "Substituir {0} ocorrência nos arquivos {1}?",
-	"removeAll.occurrences.file.confirmation.message": "Substituir {0} ocorrências no arquivo {1} com '{2}'?",
-	"replaceAll.occurrences.file.confirmation.message": "Substituir {0} ocorrências no arquivo {1}?",
-	"removeAll.occurrences.files.confirmation.message": "Substituir {0} ocorrências nos arquivos {1} com '{2}'?",
-	"replaceAll.occurrences.files.confirmation.message": "Substituir {0} ocorrências nos arquivos {1}?",
-	"treeAriaLabel": "Resultados da Pesquisa",
-	"searchPathNotFoundError": "Caminho de pesquisa não encontrado: {0}",
-	"searchMaxResultsWarning": "O conjunto de resultados contém apenas um subconjunto de todas as correspondências. Seja mais específico na sua pesquisa para diminuir o número de resultados.",
-	"searchCanceled": "Pesquisa foi cancelada antes de qualquer resultado ser encontrado - ",
-	"noResultsIncludesExcludes": "Nenhum resultado encontrado em '{0}' excluindo '{1}' - ",
-	"noResultsIncludes": "Nenhum resultado encontrado em '{0}' -",
-	"noResultsExcludes": "Nenhum resultado encontrado excluindo '{0}' -",
-	"noResultsFound": "Nenhum resultado encontrado. Revise suas configurações para exclusões configuradas e arquivos ignorados - ",
-	"rerunSearch.message": "Pesquisar novamente",
-	"rerunSearchInAll.message": "Pesquisar novamente em todos os arquivos",
-	"openSettings.message": "Abrir configurações",
-	"openSettings.learnMore": "Saiba Mais",
-	"ariaSearchResultsStatus": "Pesquisa retornou {0} resultados em {1} arquivos",
-	"search.file.result": "{0} resultado no arquivo {1}",
-	"search.files.result": "{0} resultado nos arquivos {1}",
-	"search.file.results": "{0} resultados no arquivo {1}",
-	"search.files.results": "{0} resultados nos arquivos {1}",
-	"searchWithoutFolder": "Você ainda não abriu uma pasta. Somente arquivos abertos são pesquisados - ",
-	"openFolder": "Abrir Pasta"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json b/i18n/ptb/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
deleted file mode 100644
index b3ae6818505..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"moreSearch": "Alternar Detalhes da Pesquisa",
-	"searchScope.includes": "arquivos a serem incluídos",
-	"label.includes": "Pesquisa Padrões de Inclusão",
-	"searchScope.excludes": "arquivos a serem excluídos",
-	"label.excludes": "Pesquisa de Padrões de Exclusão",
-	"replaceAll.confirmation.title": "Substituir Tudo",
-	"replaceAll.confirm.button": "&&Substituir",
-	"replaceAll.occurrence.file.message": "Substituída {0} ocorrência no arquivo {1} com '{2}'.",
-	"removeAll.occurrence.file.message": "Substituída {0} ocorrência no arquivo {1}'.",
-	"replaceAll.occurrence.files.message": "Substituída {0} ocorrência no arquivo {1} com '{2}'.",
-	"removeAll.occurrence.files.message": "Substituída {0} ocorrência nos arquivos {1}",
-	"replaceAll.occurrences.file.message": "Substituídas {0} ocorrências no arquivo {1} com '{2}'.",
-	"removeAll.occurrences.file.message": "Substituídas {0} ocorrências nos arquivo {1}.",
-	"replaceAll.occurrences.files.message": "Substituídas {0} ocorrências nos arquivos {1} com '{2}'.",
-	"removeAll.occurrences.files.message": "Substituídas {0} ocorrências nos arquivos {1}.",
-	"removeAll.occurrence.file.confirmation.message": "Substituir {0} ocorrências no arquivo {1} com '{2}'?",
-	"replaceAll.occurrence.file.confirmation.message": "Substituir {0} ocorrência no arquivo {1}?",
-	"removeAll.occurrence.files.confirmation.message": "Substituir {0} ocorrência nos arquivos {1} com '{2}'?",
-	"replaceAll.occurrence.files.confirmation.message": "Substituir {0} ocorrência nos arquivos {1}?",
-	"removeAll.occurrences.file.confirmation.message": "Substituir {0} ocorrências no arquivo {1} com '{2}'?",
-	"replaceAll.occurrences.file.confirmation.message": "Substituir {0} ocorrências no arquivo {1}?",
-	"removeAll.occurrences.files.confirmation.message": "Substituir {0} ocorrências nos arquivos {1} com '{2}'?",
-	"replaceAll.occurrences.files.confirmation.message": "Substituir {0} ocorrências nos arquivos {1}?",
-	"treeAriaLabel": "Resultados da Pesquisa",
-	"searchPathNotFoundError": "Caminho de pesquisa não encontrado: {0}",
-	"searchMaxResultsWarning": "O conjunto de resultados contém apenas um subconjunto de todas as correspondências. Seja mais específico na sua pesquisa para diminuir o número de resultados.",
-	"searchCanceled": "Pesquisa foi cancelada antes de qualquer resultado ser encontrado - ",
-	"noResultsIncludesExcludes": "Nenhum resultado encontrado em '{0}' excluindo '{1}' - ",
-	"noResultsIncludes": "Nenhum resultado encontrado em '{0}' -",
-	"noResultsExcludes": "Nenhum resultado encontrado excluindo '{0}' -",
-	"noResultsFound": "Nenhum resultado encontrado. Revise suas configurações para exclusões configuradas e arquivos ignorados - ",
-	"rerunSearch.message": "Pesquisar novamente",
-	"rerunSearchInAll.message": "Pesquisar novamente em todos os arquivos",
-	"openSettings.message": "Abrir configurações",
-	"openSettings.learnMore": "Saiba Mais",
-	"ariaSearchResultsStatus": "Pesquisa retornou {0} resultados em {1} arquivos",
-	"search.file.result": "{0} resultado no arquivo {1}",
-	"search.files.result": "{0} resultado nos arquivos {1}",
-	"search.file.results": "{0} resultados no arquivo {1}",
-	"search.files.results": "{0} resultados nos arquivos {1}",
-	"searchWithoutFolder": "Você ainda não abriu uma pasta. Somente arquivos abertos são pesquisados - ",
-	"openFolder": "Abrir Pasta"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/search/browser/searchWidget.i18n.json b/i18n/ptb/src/vs/workbench/parts/search/browser/searchWidget.i18n.json
deleted file mode 100644
index 0e17d262270..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/search/browser/searchWidget.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"search.action.replaceAll.disabled.label": "Substituir Todos (Submeter Pesquisa para Habilitar)",
-	"search.action.replaceAll.enabled.label": "Substituir Tudo",
-	"search.replace.toggle.button.title": "Alternar Substituir",
-	"label.Search": "Pesquisar: Digite o termo de pesquisa e pressione Enter para pesquisar ou Escape para cancelar",
-	"search.placeHolder": "Pesquisar",
-	"label.Replace": "Substituir: Digite o termo a ser substituído e pressione Enter para visualizar ou Escape para cancelar",
-	"search.replace.placeHolder": "Substituir",
-	"regexp.validationFailure": "A expressão corresponde a tudo",
-	"regexp.backreferenceValidationFailure": "Referências anteriores não são suportadas"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/search/common/queryBuilder.i18n.json b/i18n/ptb/src/vs/workbench/parts/search/common/queryBuilder.i18n.json
deleted file mode 100644
index 5c6e545f88c..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/search/common/queryBuilder.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"search.noWorkspaceWithName": "Nenhuma pasta no espaço de trabalho com o nome: {0}"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json b/i18n/ptb/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
deleted file mode 100644
index 08831e79b99..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"search": "Pesquisar",
-	"copyMatchLabel": "Copiar",
-	"copyPathLabel": "Copiar Caminho",
-	"copyAllLabel": "Copiar todos",
-	"clearSearchHistoryLabel": "Limpar Histórico de Pesquisa",
-	"findInFolder": "Procurar na pasta...",
-	"findInWorkspace": "Procurar no Espaço de Trabalho...",
-	"showTriggerActions": "Ir para Símbolo no Espaço de Trabalho...",
-	"name": "Pesquisar",
-	"showSearchViewl": "Mostrar Busca",
-	"view": "Exibir",
-	"findInFiles": "Localizar nos Arquivos",
-	"openAnythingHandlerDescription": "Ir para o Arquivo",
-	"openSymbolDescriptionNormal": "Ir para o Símbolo em Área de Trabalho",
-	"searchConfigurationTitle": "Pesquisar",
-	"exclude": "Configure os padrões glob para excluir arquivos e pastas nas pesquisas. Herda todos os padrões glob da configuração files.exclude.",
-	"exclude.boolean": "O padrão glob com o qual combinar os caminhos de arquivo. Defina para verdadeiro ou falso para habilitar ou desabilitar o padrão.",
-	"exclude.when": "Verificação adicional nos irmãos de um arquivo correspondente. Use $(basename) como variável para o nome do arquivo correspondente.",
-	"useRipgrep": "Controla se utiliza ripgrep em buscas de texto e de arquivo",
-	"useIgnoreFiles": "Controla se utiliza arquivos .gitignore e .ignore por padrão ao fazer pesquisas de arquivos.",
-	"search.quickOpen.includeSymbols": "Configurar para incluir resultados de uma pesquisa símbolo global nos resultados do arquivo para Abertura Rápida.",
-	"search.followSymlinks": "Controla quando seguir symlinks ao realizar uma busca.",
-	"search.smartCase": "Faz pesquisas do tipo case-insensitive se o termo for totalmente minúsculo, caso contrário, faz pesquisas do tipo case-sensitive.",
-	"search.globalFindClipboard": "Controla se a visualização de busca deve ler ou modificar a área de transferência de busca compartilhada no macOS"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/search/electron-browser/searchActions.i18n.json b/i18n/ptb/src/vs/workbench/parts/search/electron-browser/searchActions.i18n.json
deleted file mode 100644
index a25c73a96fa..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/search/electron-browser/searchActions.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"findInFolder": "Procurar na pasta...",
-	"findInWorkspace": "Procurar no Espaço de Trabalho..."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/snippets/electron-browser/TMSnippets.i18n.json b/i18n/ptb/src/vs/workbench/parts/snippets/electron-browser/TMSnippets.i18n.json
deleted file mode 100644
index b98cf8d0937..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/snippets/electron-browser/TMSnippets.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"vscode.extension.contributes.snippets": "Contribui aos trechos de código.",
-	"vscode.extension.contributes.snippets-language": "Identificador de linguagem para o qual este trecho de código contribui.",
-	"vscode.extension.contributes.snippets-path": "Caminho do arquivo de trechos de código. O caminho é relativo à pasta de extensão e normalmente começa com '. /snippets/'.",
-	"invalid.language": "Linguagem desconhecida em `contributes.{0}.language`. Valor fornecido: {1}",
-	"invalid.path.0": "Esperada uma string em `contributes.{0}.path`. Valor informado: {1}",
-	"invalid.path.1": "É esperado que `contributes.{0}.path` ({1}) seja incluído na pasta da extensão ({2}). Isto pode tornar a extensão não portável.",
-	"badVariableUse": "O trecho de código \"{0}\" muito provavelmente confunde as variáveis de trecho de código e espaços reservados do trecho de código. Consulte https://code.visualstudio.com/docs/editor/userdefinedsnippets#_snippet-syntax para obter mais detalhes."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json b/i18n/ptb/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json
deleted file mode 100644
index 76910c87bbe..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"global.scope": "(global)",
-	"global.1": "({0})",
-	"new.global": "Novo Arquivo de Trechos de Código Global...",
-	"group.global": "Trechos de código existentes",
-	"new.global.sep": "Novos Trechos de Código",
-	"openSnippet.pickLanguage": "Selecionar Arquivo de Trechos de Código ou Criar Trechos de Código",
-	"openSnippet.label": "Configurar Trechos de Código do Usuário",
-	"preferences": "Preferências"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/snippets/electron-browser/insertSnippet.i18n.json b/i18n/ptb/src/vs/workbench/parts/snippets/electron-browser/insertSnippet.i18n.json
deleted file mode 100644
index 8ffa6aefda2..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/snippets/electron-browser/insertSnippet.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"snippet.suggestions.label": "Inserir trecho de código",
-	"sep.userSnippet": "Trecho de código do usuário",
-	"sep.extSnippet": "Trechos de Código de Extensão"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json b/i18n/ptb/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json
deleted file mode 100644
index c9ce0ad1543..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"snippetSchema.json.default": "Trecho de código vazio",
-	"snippetSchema.json": "Configuração do trecho do usuário",
-	"snippetSchema.json.prefix": "O prefixo usado ao selecionar o trecho no intelliSense",
-	"snippetSchema.json.body": "O conteúdo do trecho. Use '$1', '${1:defaultText}' para definir as posições do cursor, use '$0' para a posição final do cursor. Insira valores de variáveis com '${varName}' e '${varName:defaultText}', por exemplo ' Este é o arquivo: $TM_FILENAME'.",
-	"snippetSchema.json.description": "A descrição do trecho.",
-	"snippetSchema.json.scope": "Uma lista de nomes de linguagem para a qual este trecho de código aplica-se, por exemplo 'typescript,javascript'."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json b/i18n/ptb/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json
deleted file mode 100644
index 338e6baa050..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"source.snippetGlobal": "Trecho de Código Global do Usuário",
-	"source.snippet": "Trecho de código do usuário"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json b/i18n/ptb/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
deleted file mode 100644
index 45d06c4ce6e..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"invalid.path.0": "Esperada uma string em `contributes.{0}.path`. Valor informado: {1}",
-	"invalid.language.0": "Quando a linguagem for omitida, o valor de `contributes.{0}.path` deve ser um arquivo-`.code-snippets`. Valor definido: {1}",
-	"invalid.language": "Linguagem desconhecida em `contributes.{0}.language`. Valor fornecido: {1}",
-	"invalid.path.1": "É esperado que `contributes.{0}.path` ({1}) seja incluído na pasta da extensão ({2}). Isto pode tornar a extensão não portável.",
-	"vscode.extension.contributes.snippets": "Contribui aos trechos de código.",
-	"vscode.extension.contributes.snippets-language": "Identificador de linguagem para o qual este trecho de código contribui.",
-	"vscode.extension.contributes.snippets-path": "Caminho do arquivo de trechos de código. O caminho é relativo à pasta de extensão e normalmente começa com '. /snippets/'.",
-	"badVariableUse": "Um ou mais trechos da extensão '{0}' provavelmente se confundem com trechos de código de variáveis e trechos de código de espaços reservados (veja https://code.visualstudio.com/docs/editor/userdefinedsnippets#_snippet-syntax para mais detalhes)",
-	"badFile": "O arquivo de trechos \"{0}\" não pôde ser lido.",
-	"detail.snippet": "{0} ({1})",
-	"snippetSuggest.longLabel": "{0}, {1}"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/snippets/electron-browser/tabCompletion.i18n.json b/i18n/ptb/src/vs/workbench/parts/snippets/electron-browser/tabCompletion.i18n.json
deleted file mode 100644
index d1ff7ca2454..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/snippets/electron-browser/tabCompletion.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"tabCompletion": "Inserir trechos de código quando seu prefixo corresponder. Funciona melhor quando  'quickSuggestions' não está habilitado."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/surveys/electron-browser/languageSurveys.contribution.i18n.json b/i18n/ptb/src/vs/workbench/parts/surveys/electron-browser/languageSurveys.contribution.i18n.json
deleted file mode 100644
index 79f168bdecb..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/surveys/electron-browser/languageSurveys.contribution.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"helpUs": "Nos ajude a melhorar o nosso apoio para {0}",
-	"takeShortSurvey": "Responda a uma pesquisa curta",
-	"remindLater": "Lembrar mais tarde",
-	"neverAgain": "Não mostrar novamente"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/surveys/electron-browser/nps.contribution.i18n.json b/i18n/ptb/src/vs/workbench/parts/surveys/electron-browser/nps.contribution.i18n.json
deleted file mode 100644
index 0e5b3cbd493..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/surveys/electron-browser/nps.contribution.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"surveyQuestion": "Você deseja responder a uma pequena pesquisa?",
-	"takeSurvey": "Responder a pesquisa",
-	"remindLater": "Lembrar mais tarde",
-	"neverAgain": "Não mostrar novamente"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/tasks/browser/buildQuickOpen.i18n.json b/i18n/ptb/src/vs/workbench/parts/tasks/browser/buildQuickOpen.i18n.json
deleted file mode 100644
index ccd588d4527..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/tasks/browser/buildQuickOpen.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"tasksAriaLabel": "Digite o nome de uma tarefa de compilação",
-	"noTasksMatching": "Não há tarefas correspondentes",
-	"noTasksFound": "Tarefas de compilação não encontradas"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/tasks/browser/quickOpen.i18n.json b/i18n/ptb/src/vs/workbench/parts/tasks/browser/quickOpen.i18n.json
deleted file mode 100644
index b747b35e985..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/tasks/browser/quickOpen.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"entryAriaLabel": "{0}, tarefas",
-	"recentlyUsed": "tarefas recentemente utilizadas",
-	"configured": "tarefas configuradas",
-	"detected": "tarefas detectadas",
-	"customizeTask": "Configurar a tarefa"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/tasks/browser/restartQuickOpen.i18n.json b/i18n/ptb/src/vs/workbench/parts/tasks/browser/restartQuickOpen.i18n.json
deleted file mode 100644
index 4009d3b8154..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/tasks/browser/restartQuickOpen.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"tasksAriaLabel": "Digite o nome de uma tarefa para reiniciar",
-	"noTasksMatching": "Não há tarefas correspondentes",
-	"noTasksFound": "Não há tarefa para ser reiniciada"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/tasks/browser/taskQuickOpen.i18n.json b/i18n/ptb/src/vs/workbench/parts/tasks/browser/taskQuickOpen.i18n.json
deleted file mode 100644
index 58792db1101..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/tasks/browser/taskQuickOpen.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"tasksAriaLabel": "Digite o nome de uma tarefa para executar",
-	"noTasksMatching": "Não há tarefas correspondentes",
-	"noTasksFound": "Não há tarefas encontradas"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/tasks/browser/terminateQuickOpen.i18n.json b/i18n/ptb/src/vs/workbench/parts/tasks/browser/terminateQuickOpen.i18n.json
deleted file mode 100644
index 9c5ee4b4b59..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/tasks/browser/terminateQuickOpen.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"tasksAriaLabel": "Digite o nome de uma tarefa para finalizar",
-	"noTasksMatching": "Não há tarefas correspondentes",
-	"noTasksFound": "Nenhuma tarefa para finalizar encontrada"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/tasks/browser/testQuickOpen.i18n.json b/i18n/ptb/src/vs/workbench/parts/tasks/browser/testQuickOpen.i18n.json
deleted file mode 100644
index 07d53a8ee39..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/tasks/browser/testQuickOpen.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"tasksAriaLabel": "Digite o nome de uma tarefa de teste",
-	"noTasksMatching": "Não há tarefas correspondentes",
-	"noTasksFound": "Tarefas de teste não encontradas"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json b/i18n/ptb/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json
deleted file mode 100644
index 0b8fcaa9359..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"ProblemPatternParser.loopProperty.notLast": "A propriedade loop só é suportada na última linha correspondente.",
-	"ProblemPatternParser.problemPattern.kindProperty.notFirst": "O padrão de problema é inválido. O tipo de propriedade deve ser informado somente no primeiro elemento.",
-	"ProblemPatternParser.problemPattern.missingRegExp": "Está faltando uma expressão regular a problema padrão.",
-	"ProblemPatternParser.problemPattern.missingProperty": "O padrão de problema é inválido. Ele deve ter ao menos um arquivo e uma mensagem. ",
-	"ProblemPatternParser.problemPattern.missingLocation": "O padrão de problema é inválido. Ele deve ter ao menos um tipo: \"arquivo\", uma linha ou um grupo de correspondência de localização. ",
-	"ProblemPatternParser.invalidRegexp": "Erro: a cadeia de caracteres {0} não é uma expressão regular válida. ",
-	"ProblemPatternSchema.regexp": "A expressão regular para procurar um erro, aviso ou informação na saída.",
-	"ProblemPatternSchema.kind": "Se o padrão corresponde a uma localização (arquivo e linha) ou somente um arquivo.",
-	"ProblemPatternSchema.file": "O índice do grupo de correspondência do arquivo. Se omitido, será usado 1.",
-	"ProblemPatternSchema.location": "O índice de grupo de correspondência da localização do problema. Padrões de localização válidos são: (linha), (linha, coluna) e (startLine, startColumn, endLine, endColumn). Se omitido (linha, coluna) é assumido.",
-	"ProblemPatternSchema.line": "O índice de grupo de correspondência da linha do problema. O padrão é 2",
-	"ProblemPatternSchema.column": "O índice de grupo de correspondência de caractere da linha do problema. O padrão é 3",
-	"ProblemPatternSchema.endLine": "O índice de grupo de correspondência de linha final do problema. O padrão é indefinido",
-	"ProblemPatternSchema.endColumn": "O índice de grupo de correspondência de caráter final de linha do problema. O padrão é indefinido",
-	"ProblemPatternSchema.severity": "O índice de grupo de correspondência da gravidade do problema. O padrão é indefinido",
-	"ProblemPatternSchema.code": "O índice de grupo de correspondência do código do problema. O padrão é indefinido",
-	"ProblemPatternSchema.message": "O índice de grupo de correspondência da mensagem. Se omitido o padrão é 4 se o local for especificado. Caso contrário o padrão é 5.",
-	"ProblemPatternSchema.loop": "Em um loop de correspondência multi linha indica se este padrão é executado em um loop enquanto houver correspondências. Somente pode ser especificado no último padrão em um padrão de linha múltiplas.",
-	"NamedProblemPatternSchema.name": "O nome do modelo de problema.",
-	"NamedMultiLineProblemPatternSchema.name": "O nome do modelo de problema multi-linhas.",
-	"NamedMultiLineProblemPatternSchema.patterns": "Os padrões atuais.",
-	"ProblemPatternExtPoint": "Contribui aos modelos de problema",
-	"ProblemPatternRegistry.error": "Modelo de problema inválido. O  modelo será ignorado.",
-	"ProblemMatcherParser.noProblemMatcher": "Erro: a descrição não pode ser convertida em uma correspondência de problema:\n{0}\n\n",
-	"ProblemMatcherParser.noProblemPattern": "Erro: a descrição nao define um padrão de problema válido: {0}\n",
-	"ProblemMatcherParser.noOwner": "Erro: a descriçao não define um proprietário:\n{0}\n",
-	"ProblemMatcherParser.noFileLocation": "Erro: a descrição não define uma localização de arquivo:\n{0}\n",
-	"ProblemMatcherParser.unknownSeverity": "Info: severidade {0} desconhecida. Valores válidos são erro, aviso e info.\n",
-	"ProblemMatcherParser.noDefinedPatter": "Erro: o padrão com o identificador {0} não existe.",
-	"ProblemMatcherParser.noIdentifier": "Erro: a propriedade padrão se refere a um identificador vazio.",
-	"ProblemMatcherParser.noValidIdentifier": "Erro: a propriedade padrão {0} não é uma variável de padrões válida.",
-	"ProblemMatcherParser.problemPattern.watchingMatcher": "Um problema de correspondência deve obrigatoriamente definir padrão inicial e um padrão final para monitoramento.",
-	"ProblemMatcherParser.invalidRegexp": "Erro: a cadeia de caracteres {0} não é uma expressão regular válida. ",
-	"WatchingPatternSchema.regexp": "A expressão regular para detectar o início ou o fim de uma tarefa em segundo plano.",
-	"WatchingPatternSchema.file": "O índice do grupo de correspondência do arquivo. Pode ser omitido.",
-	"PatternTypeSchema.name": "O nome de um padrão pré-definido ou contribuído.",
-	"PatternTypeSchema.description": "Um padrão de problema ou o nome de um padrão de problema pré-definido ou contribuído. Pode ser omitido se base for especificada.",
-	"ProblemMatcherSchema.base": "O nome de uma correspondência de problema base a ser utilizado.",
-	"ProblemMatcherSchema.owner": "O proprietário de um problema dentro do código. Pode ser omitido se base for especificada. Default para 'externo' se omitido e base não for especificada.",
-	"ProblemMatcherSchema.severity": "A severidade padrão para captura de problemas. É utilizada se o padrão não definir um grupo correspondente para severidade.",
-	"ProblemMatcherSchema.applyTo": "Controla se um problema reportado em um documento de texto é aplicado somente para aberto, fechado ou todos os documentos.",
-	"ProblemMatcherSchema.fileLocation": "Define como os nomes de arquivos reportados em um padrão de problema devem ser interpretados.",
-	"ProblemMatcherSchema.background": "Padrões para monitorar o início e o término de um pesquisador ativo em uma tarefa em segundo plano.",
-	"ProblemMatcherSchema.background.activeOnStart": "Se configurado para verdadeiro, o monitor em segundo plano está em modo ativo quando a tarefa inicia. Isto é igual a emissão de uma linha que corresponde ao beginPattern",
-	"ProblemMatcherSchema.background.beginsPattern": "Se houver correspondência na saída o início de uma tarefa em segundo plano é sinalizada.",
-	"ProblemMatcherSchema.background.endsPattern": "Se houver correspondência na saída o final de uma tarefa em segundo plano é sinalizada.",
-	"ProblemMatcherSchema.watching.deprecated": "A propriedade watching foi descontinuada. Use background no lugar dela.",
-	"ProblemMatcherSchema.watching": "Padrões para monitorar o início e o término de um pesquisador observando.",
-	"ProblemMatcherSchema.watching.activeOnStart": "Se configurado para verdadeiro, o monitoramento está em modo ativo quando a tarefa inicia. Isto é igual a emissão de uma linha que corresponde ao beginPattern",
-	"ProblemMatcherSchema.watching.beginsPattern": "Se houver correspondência na saída o início de uma tarefa observada é sinalizada.",
-	"ProblemMatcherSchema.watching.endsPattern": "Se houver correspondência na saída o final de uma tarefa observada é sinalizada.",
-	"LegacyProblemMatcherSchema.watchedBegin.deprecated": "Esta propriedade está descontinuada. Ao invés, use a propriedade de observação.",
-	"LegacyProblemMatcherSchema.watchedBegin": "Uma expressão regular sinalizando que uma tarefa observada é ativada através da observação.",
-	"LegacyProblemMatcherSchema.watchedEnd.deprecated": "Esta propriedade está descontinuada. Ao invés, use a propriedade de observação.",
-	"LegacyProblemMatcherSchema.watchedEnd": "Uma expressão regular sinalizando que uma tarefa observada terminou a execução.",
-	"NamedProblemMatcherSchema.name": "O nome do correspondente do problema usado para se referir a ele.",
-	"NamedProblemMatcherSchema.label": "Um rótulo legível para o correspondente do problema.",
-	"ProblemMatcherExtPoint": "Contribui aos correspondentes de problema",
-	"msCompile": "Problemas do compilador Microsoft",
-	"lessCompile": "Menos problemas",
-	"gulp-tsc": "Problemas do Gulp TSC",
-	"jshint": "Problemas JSHint",
-	"jshint-stylish": "Problemas de estilo JSHint",
-	"eslint-compact": "Problemas compactos ESLint",
-	"eslint-stylish": "Problemas de estilo ESLint",
-	"go": "Problemas Go"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/tasks/common/taskConfiguration.i18n.json b/i18n/ptb/src/vs/workbench/parts/tasks/common/taskConfiguration.i18n.json
deleted file mode 100644
index 928e36c4c9b..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/tasks/common/taskConfiguration.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"ConfigurationParser.invalidCWD": "Aviso: options.cwd deve ser do tipo string. Ignorando valor {0}\n",
-	"ConfigurationParser.noargs": "Erro: Argumentos do comando devem ser uma matriz de strings. Valor informado é:\n{0}",
-	"ConfigurationParser.noShell": "Aviso: A configuração do shell somente é suportada quando estiver executando tarefas no terminal.",
-	"ConfigurationParser.noName": "Erro: Problem Matcher no escopo declarado deve ter um nome:\n{0}\n",
-	"ConfigurationParser.unknownMatcherKind": "Aviso: a correspondência de problema definido é desconhecido. Tipos suportados são string | ProblemMatcher | (string | ProblemMatcher)[].\n{0}\n",
-	"ConfigurationParser.invalidVaraibleReference": "Erro: ProblemMatcher inválido referência: {0}\n",
-	"ConfigurationParser.noTaskName": "Erro: tarefas devem fornecer uma propriedade taskName. A tarefa será ignorada.\n{0}\n",
-	"taskConfiguration.shellArgs": "Aviso: a tarefa '{0}' é um comando do shell e o nome de comando ou um dos seus argumentos tem  espaços sem escape. Para garantir a linha de comando correta por favor mesclar argumentos no comando.",
-	"taskConfiguration.noCommandOrDependsOn": "Erro: a tarefa '{0}' não especifica nem um comando nem uma propriedade dependsOn. A tarefa será ignorada. Sua definição é: \n{1}",
-	"taskConfiguration.noCommand": "Erro: a tarefa '{0}' não define um comando. A tarefa será ignorada. Sua definição é: {1}"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/tasks/common/taskDefinitionRegistry.i18n.json b/i18n/ptb/src/vs/workbench/parts/tasks/common/taskDefinitionRegistry.i18n.json
deleted file mode 100644
index 3c0b1590993..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/tasks/common/taskDefinitionRegistry.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"TaskDefinition.properties": "Propriedades adicionais do tipo de tarefa",
-	"TaskTypeConfiguration.noType": "A propriedade necessária 'taskType' está faltando na configuração do tipo de tarefa ",
-	"TaskDefinitionExtPoint": "Contribui com os tipos de tarefa"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/tasks/common/taskTemplates.i18n.json b/i18n/ptb/src/vs/workbench/parts/tasks/common/taskTemplates.i18n.json
deleted file mode 100644
index f6afa73d706..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/tasks/common/taskTemplates.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"dotnetCore": "Executa comando de compilação do .NET Core",
-	"msbuild": "Executa a compilação destino",
-	"externalCommand": "Exemplo para executar um comando externo arbitrário",
-	"Maven": "Executa comandos comuns específicos"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/tasks/common/taskTypeRegistry.i18n.json b/i18n/ptb/src/vs/workbench/parts/tasks/common/taskTypeRegistry.i18n.json
deleted file mode 100644
index 8b6ad71cd4e..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/tasks/common/taskTypeRegistry.i18n.json
+++ /dev/null
@@ -1,6 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/tasks/electron-browser/jsonSchemaCommon.i18n.json b/i18n/ptb/src/vs/workbench/parts/tasks/electron-browser/jsonSchemaCommon.i18n.json
deleted file mode 100644
index 4217e50c4f6..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/tasks/electron-browser/jsonSchemaCommon.i18n.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"JsonSchema.options": "Opções de comando adicionais",
-	"JsonSchema.options.cwd": "O diretório de trabalho atual do programa executado ou do script. Se omitido raiz de espaço de trabalho atual do código é usado.",
-	"JsonSchema.options.env": "O ambiente do programa executado ou comando shell. Se omitido o ambiente do processo pai é usado.",
-	"JsonSchema.shellConfiguration": "Configura a shell a ser usada.",
-	"JsonSchema.shell.executable": "O shell a ser usado.",
-	"JsonSchema.shell.args": "Os argumentos shell.",
-	"JsonSchema.command": "O comando a ser executado. Pode ser um programa externo ou um comando shell.",
-	"JsonSchema.tasks.args": "Argumentos passados para o comando quando esta tarefa é invocada.",
-	"JsonSchema.tasks.taskName": "Nome da tarefa",
-	"JsonSchema.tasks.windows": "Configuração de comando específica do Windows",
-	"JsonSchema.tasks.mac": "Configuração de comando específica do Mac",
-	"JsonSchema.tasks.linux": "Configuração de comando específica do Linux",
-	"JsonSchema.tasks.suppressTaskName": "Controla se o nome de tarefa é adicionado como um argumento para o comando. Se omitido o valor definido globalmente é usado.",
-	"JsonSchema.tasks.showOutput": "Controla se a saída da execução de tarefas é mostrada ou não. Se omitido o valor definido globalmente é usado.",
-	"JsonSchema.echoCommand": "Controla se o comando executado é enviado para a saída. O padrão é false.",
-	"JsonSchema.tasks.watching.deprecation": "Descontinuado. Use isBackground.",
-	"JsonSchema.tasks.watching": "Se a tarefa executada é mantida viva e está monitorando o sistema de arquivos.",
-	"JsonSchema.tasks.background": "Se a tarefa executada é mantida viva e é executado em segundo plano.",
-	"JsonSchema.tasks.promptOnClose": "Se o usuário é solicitado quando VS Code fecha com uma tarefa sendo executada.",
-	"JsonSchema.tasks.build": "Esta tarefa é mapeada para o comando de compilação padrão do código.",
-	"JsonSchema.tasks.test": "Esta tarefa é mapeada para o comando de teste padrão do código.",
-	"JsonSchema.tasks.matchers": "O problema matcher(s) a seu utilizado. Pode ser uma sequência de caracteres ou uma definição de problem matcher ou uma matriz de sequências de caracteres e problem matchers.",
-	"JsonSchema.args": "Argumentos adicionais passados para o comando.",
-	"JsonSchema.showOutput": "Controla se a saída da execução de tarefas é mostrada ou não. Se omitido 'sempre' é usado.",
-	"JsonSchema.watching.deprecation": "Descontinuado. Use isBackground.",
-	"JsonSchema.watching": "Se a tarefa executada é mantida viva e está monitorando o sistema de arquivos.",
-	"JsonSchema.background": "Se a tarefa executada é mantida viva e é executado em segundo plano.",
-	"JsonSchema.promptOnClose": "Se o usuário é solicitado quando VS Code fecha com uma tarefa de segundo plano em execução.",
-	"JsonSchema.suppressTaskName": "Controla se o nome de tarefa é adicionado como um argumento para o comando. O padrão é false.",
-	"JsonSchema.taskSelector": "Prefixo para indicar que um argumento é tarefa.",
-	"JsonSchema.matchers": "A correspondência de problemas a ser utilizada. Pode ser uma sequência de caracteres ou uma definição de correspondência de problemas ou uma matriz de sequências de caracteres e correspondência de problemas.",
-	"JsonSchema.tasks": "As configurações de tarefa. Normalmente são ampliações de tarefas já definidas na execução de tarefa externa."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v1.i18n.json b/i18n/ptb/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v1.i18n.json
deleted file mode 100644
index 8b79dcacefa..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v1.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"JsonSchema.version": "Número da versão do config",
-	"JsonSchema._runner": "O runner já se formou. Use a propriedade runner oficial",
-	"JsonSchema.runner": "Define se a tarefa é executada como um processo e a saída é mostrada na janela de saída ou dentro do terminal.",
-	"JsonSchema.windows": "Configuração de comando específica do Windows",
-	"JsonSchema.mac": "Configuração de comando específica do Mac",
-	"JsonSchema.linux": "Configuração de comando específica do Linux",
-	"JsonSchema.shell": "Especifica se o comando é um comando shell ou um programa externo. O padrão é falso se omitido."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json b/i18n/ptb/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
deleted file mode 100644
index 7cef3aef4bd..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"JsonSchema.shell": "Especifica se o comando é um comando shell ou um programa externo. O padrão é falso se omitido.",
-	"JsonSchema.tasks.isShellCommand.deprecated": "A propriedade isShellCommand é obsoleta. Use a propriedade type da tarefa e a propriedade shell nas opções. Veja também as notas de versão 1.14.",
-	"JsonSchema.tasks.dependsOn.string": "Outra tarefa da qual esta tarefa depende.",
-	"JsonSchema.tasks.dependsOn.array": "A outra tarefa que esta tarefa depende.",
-	"JsonSchema.tasks.presentation": "Configura o painel que é usado para apresentar a saída da tarefa e ler sua entrada.",
-	"JsonSchema.tasks.presentation.echo": "Controla se o comando executado é ecoado para o painel. Padrão é true.",
-	"JsonSchema.tasks.presentation.focus": "Controla se o painel ganha foco. O padrão é false. Se definido como true, o painel é revelado também.",
-	"JsonSchema.tasks.presentation.reveal.always": "Sempre revela o terminal quando esta tarefa é executada.",
-	"JsonSchema.tasks.presentation.reveal.silent": "Só revela o terminal se nenhum problema correspondente está associado com a tarefa e erros ocorrem ao executá-la.",
-	"JsonSchema.tasks.presentation.reveal.never": "Nunca revela o terminal quando esta tarefa é executada.",
-	"JsonSchema.tasks.presentation.reveals": "Controla se o painel executando a tarefa é revelado ou não. O padrão é \"always\".",
-	"JsonSchema.tasks.presentation.instance": "Controla se o painel é compartilhado entre tarefas, dedicado a esta tarefa ou um novo é criado em cada execução.",
-	"JsonSchema.tasks.terminal": "A propriedade terminal é obsoleta. Use presentation em seu lugar.",
-	"JsonSchema.tasks.group.kind": "Grupo de execução da tarefa.",
-	"JsonSchema.tasks.group.isDefault": "Define-se essa tarefa é a tarefa do padrão do grupo.",
-	"JsonSchema.tasks.group.defaultBuild": "Marca a tarefa como a tarefa de compilação padrão.",
-	"JsonSchema.tasks.group.defaultTest": "Marca a tarefa como a tarefa de teste padrão.",
-	"JsonSchema.tasks.group.build": "Marca a tarefa como uma tarefa de compilação acessível através do comando 'Executar Tarefa de Compilação'.",
-	"JsonSchema.tasks.group.test": "Marca a tarefa como uma tarefa de teste acessível através do comando 'Executar Tarefa de Teste'.",
-	"JsonSchema.tasks.group.none": "Atribui a tarefa para nenhum grupo",
-	"JsonSchema.tasks.group": "Define a que grupo de execução desta tarefa pertence. Suporta \"build\" para adicioná-lo ao grupo de compilação e \"test\" para adicioná-lo ao grupo de teste.",
-	"JsonSchema.tasks.type": "Define quando a tarefa é executada como um processo ou como um comando dentro do shell.",
-	"JsonSchema.command": "O comando a ser executado. Pode ser um programa externo ou um comando shell.",
-	"JsonSchema.tasks.args": "Argumentos passados para o comando quando esta tarefa é invocada.",
-	"JsonSchema.tasks.label": "O rótulo da tarefa na interface do usuário.",
-	"JsonSchema.version": "O número da versão do config.",
-	"JsonSchema.tasks.identifier": "Um identificador definido pelo usuário para fazer referência a tarefa em launch.json ou uma cláusula dependsOn.",
-	"JsonSchema.tasks.taskLabel": "A etiqueta da tarefa",
-	"JsonSchema.tasks.taskName": "Nome da tarefa",
-	"JsonSchema.tasks.taskName.deprecated": "A propriedade name da tarefa é obsoleta. Use a propriedade label.",
-	"JsonSchema.tasks.background": "Se a tarefa executada é mantida viva e é executado em segundo plano.",
-	"JsonSchema.tasks.promptOnClose": "Se o usuário é solicitado quando VS Code fecha com uma tarefa sendo executada.",
-	"JsonSchema.tasks.matchers": "A correspondência de problemas a ser utilizada. Pode ser uma sequência de caracteres ou uma definição de correspondência de problemas ou uma matriz de sequências de caracteres e correspondência de problemas.",
-	"JsonSchema.customizations.customizes.type": "O tipo de tarefa a ser personalizada",
-	"JsonSchema.tasks.customize.deprecated": "A propriedade customize é obsoleta. Consulte as notas de versão 1.14 sobre como migrar para a nova abordagem de personalização de tarefa",
-	"JsonSchema.tasks.showOputput.deprecated": "A propriedade showOutput é obsoleta. Use a propriedade reveal dentro da propriedade presentation. Ver também as notas de versão 1.14.",
-	"JsonSchema.tasks.echoCommand.deprecated": "A propriedade echoCommand é obsoleta. Use a propriedade echo dentro da propriedade presentation. Ver também as notas de versão 1.14.",
-	"JsonSchema.tasks.suppressTaskName.deprecated": "A propriedade suppressTaskName é obsoleta. Ao invés, coloque o comando junto com seus argumentos dentro de uma tarefa. Veja também as notas de lançamento da versão 1.14.",
-	"JsonSchema.tasks.isBuildCommand.deprecated": "A propriedade isBuildCommand é obsoleta. Use a propriedade group em seu lugar. Ver também as notas de versão 1.14.",
-	"JsonSchema.tasks.isTestCommand.deprecated": "A propriedade isTestCommand é obsoleta. Use a propriedade group em seu lugar. Ver também as notas de versão 1.14.",
-	"JsonSchema.tasks.taskSelector.deprecated": "A propriedade taskSelector é obsoleta. Ao invés, coloque o comando junto com seus argumentos dentro de uma tarefa. Veja também as notas de lançamento da versão 1.14.",
-	"JsonSchema.windows": "Configuração de comando específica do Windows",
-	"JsonSchema.mac": "Configuração de comando específica do Mac",
-	"JsonSchema.linux": "Configuração de comando específica do Linux"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json b/i18n/ptb/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
deleted file mode 100644
index c3c8aff5499..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
+++ /dev/null
@@ -1,86 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"tasksCategory": "Tarefas",
-	"ConfigureTaskRunnerAction.label": "Configurar a tarefa",
-	"totalErrors": "{0} Erros",
-	"totalWarnings": "{0} Avisos",
-	"totalInfos": "{0} Informações",
-	"problems": "Problemas",
-	"building": "Compilando...",
-	"manyProblems": "10K+",
-	"runningTasks": "Mostrar tarefas em execução",
-	"tasks": "Tarefas",
-	"TaskSystem.noHotSwap": "Alterar o mecanismo de execução da tarefa com uma tarefa ativa executando exige que a janela seja recarregada",
-	"reloadWindow": "Recarregar Janela",
-	"TaskServer.folderIgnored": "A pasta {0} é ignorada desde que use a versão de tarefas 0.1.0",
-	"TaskService.noBuildTask1": "Nenhuma tarefa de compilação definida. Marque uma tarefa com 'isBuildCommand' no arquivo tasks.json.",
-	"TaskService.noBuildTask2": "Nenhuma tarefa de compilação definida. Marque uma tarefa como um grupo 'build' no arquivo tasks.json.",
-	"TaskService.noTestTask1": "Nenhuma tarefa de teste definida. Marque uma tarefa com 'isTestCommand' no arquivo tasks.json.",
-	"TaskService.noTestTask2": "Nenhuma tarefa de teste definida. Marque uma tarefa com um grupo 'teste' no arquivo tasks.json.",
-	"TaskServer.noTask": "Tarefa {0} requisitada para execução não encontrada.",
-	"TaskService.associate": "associar",
-	"TaskService.attachProblemMatcher.continueWithout": "Continuar sem examinar a saída da tarefa",
-	"TaskService.attachProblemMatcher.never": "Nunca verificar a saída da tarefa",
-	"TaskService.attachProblemMatcher.learnMoreAbout": "Saiba mais sobre como verificar a saída de uma tarefa",
-	"selectProblemMatcher": "Selecione quais tipos de erros e avisos da saída da tarefa você deseja verificar",
-	"customizeParseErrors": "A configuração da tarefa atual tem erros. Por favor, corrija os erros primeiro antes de personalizar uma tarefa.",
-	"moreThanOneBuildTask": "Há muitas tarefas de compilação definidas em tasks.json. Executando a primeira.\n",
-	"terminateTask": "Finalizar Tarefa",
-	"restartTask": "Reiniciar Tarefa",
-	"TaskSystem.active": "Já existe uma tarefa sendo executada. Finalize-a antes de executar outra tarefa.",
-	"TaskSystem.restartFailed": "Falha ao finalizar e reiniciar a tarefa {0}",
-	"TaskService.noConfiguration": "Erro: A deteção de tarefa {0} não contribuiu para uma tarefa para a seguinte configuração: {1} a tarefa será ignorada.\n",
-	"TaskSystem.configurationErrors": "Erro: A configuração da tarefa informada possui erros de validação e não pode ser utilizada. Por favor, corrija os erros primeiro.",
-	"taskService.ignoreingFolder": "Ignorar as configurações de tarefa para a pasta de trabalho {0}. Suporte a tarefas de espaço de trabalho de múltiplas pastas requer que todas as pastas usem a versão de tarefas 2.0.0\n",
-	"TaskSystem.invalidTaskJson": "Erro: O conteúdo do arquivo tasks.json possui erros de sintaxe. Por favor, corrija-os antes de executar uma tarefa.\n",
-	"TaskSystem.runningTask": "Há uma tarefa sendo executada. Deseja finalizá-la?",
-	"TaskSystem.terminateTask": "&&Finalizar Tarefa",
-	"TaskSystem.noProcess": "A tarefa executada não existe mais. Se a tarefa produziu processos em background, finalizar o VS Code pode resultar em processos órfãos. Para evitar isso inicie o último processo em background com uma flag de espera.",
-	"TaskSystem.exitAnyways": "&&Sair de qualquer maneira",
-	"TerminateAction.label": "Finalizar Tarefa",
-	"TaskSystem.unknownError": "Ocorreu um erro enquanto a tarefa estava sendo executada. Verifique o log de tarefas para detalhes.",
-	"TaskService.noWorkspace": "Tarefas somente estão disponíveis em uma pasta da área de trabalho.",
-	"recentlyUsed": "tarefas recentemente utilizadas",
-	"configured": "tarefas configuradas",
-	"detected": "tarefas detectadas",
-	"TaskService.notAgain": "Não mostrar novamente",
-	"TaskService.pickRunTask": "Selecione a tarefa a ser executada",
-	"TaslService.noEntryToRun": "Nenhuma tarefa para executar foi encontrada. Configure Tarefas...",
-	"TaskService.fetchingBuildTasks": "Buscando tarefas de compilação...",
-	"TaskService.pickBuildTask": "Selecione a tarefa de compilação para executar",
-	"TaskService.noBuildTask": "Nenhuma tarefa de compilação para executar foi encontrada. Configure a tarefa de compilação... \n",
-	"TaskService.fetchingTestTasks": "Buscando tarefas de teste...",
-	"TaskService.pickTestTask": "Selecione a tarefa de teste para executar",
-	"TaskService.noTestTaskTerminal": "Nenhuma tarefa de teste para executar foi encontrada. Configure Tarefas...",
-	"TaskService.tastToTerminate": "Selecione a tarefa para terminar",
-	"TaskService.noTaskRunning": "Nenhuma tarefa está atualmente em execução",
-	"TerminateAction.noProcess": "O processo executado não existe mais. Se a tarefa produziu processos em background, finalizar o VS Code pode resultar em processos órfãos.",
-	"TerminateAction.failed": "Falha ao finalizar a tarefa sendo executada",
-	"TaskService.tastToRestart": "Selecione a tarefa para reiniciar",
-	"TaskService.noTaskToRestart": "Nenhuma tarefa para reiniciar",
-	"TaskService.template": "Selecione um Modelo de Tarefa",
-	"TaskService.createJsonFile": "Criar arquivo tasks.json a partir de modelo",
-	"TaskService.openJsonFile": "Abrir arquivo tasks.json",
-	"TaskService.pickTask": "Selecione uma tarefa para configurar",
-	"TaskService.defaultBuildTaskExists": "{0} já está marcada como a tarefa de compilação padrão",
-	"TaskService.pickDefaultBuildTask": "Selecione a tarefa a ser usada como a tarefa de compilação padrão",
-	"TaskService.defaultTestTaskExists": "{0} já está marcado como a tarefa de teste padrão.",
-	"TaskService.pickDefaultTestTask": "Selecione a tarefa a ser usada como a tarefa de teste padrão",
-	"TaskService.pickShowTask": "Selecione a tarefa para mostrar sua saída",
-	"TaskService.noTaskIsRunning": "Nenhuma tarefa em execução",
-	"ShowLogAction.label": "Visualizar o Log de Tarefas",
-	"RunTaskAction.label": "Executar Tarefa",
-	"RestartTaskAction.label": "Reiniciar Tarefa em Execução",
-	"ShowTasksAction.label": "Mostrar tarefas em execução",
-	"BuildAction.label": "Executar Tarefa de compilação",
-	"TestAction.label": "Executar Tarefa de Teste",
-	"ConfigureDefaultBuildTask.label": "Configurar Tarefa de Compilação Padrão",
-	"ConfigureDefaultTestTask.label": "Configurar Tarefa de Teste Padrão",
-	"quickOpen.task": "Executar Tarefa"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/tasks/electron-browser/taskPanel.i18n.json b/i18n/ptb/src/vs/workbench/parts/tasks/electron-browser/taskPanel.i18n.json
deleted file mode 100644
index 417f3ee968f..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/tasks/electron-browser/taskPanel.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"tasks": "Tarefas"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.i18n.json b/i18n/ptb/src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.i18n.json
deleted file mode 100644
index bfdc016e337..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"TerminalTaskSystem.unknownError": "Um erro desconhecido ocorreu durante a execução de uma tarefa. Consulte o log de saída de tarefa para obter detalhes.",
-	"dependencyFailed": "Não foi possível resolver a tarefa dependente '{0}' na pasta de espaço de trabalho '{1}'",
-	"TerminalTaskSystem.terminalName": "Tarefa - {0}",
-	"closeTerminal": "Pressione qualquer tecla para fechar o terminal.",
-	"reuseTerminal": "Terminal será reutilizado pelas tarefas, pressione qualquer tecla para fechar.",
-	"unkownProblemMatcher": "Problem matcher {0} não pode ser resolvido. O matcher será ignorado"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/tasks/node/processRunnerDetector.i18n.json b/i18n/ptb/src/vs/workbench/parts/tasks/node/processRunnerDetector.i18n.json
deleted file mode 100644
index 59897e2aee6..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/tasks/node/processRunnerDetector.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"TaskSystemDetector.noGulpTasks": "Executando gulp..-tarefas-simples não listam nenhuma tarefa. Você executou a instalação do npm?",
-	"TaskSystemDetector.noJakeTasks": "Executando jake..-tarefas não listam nenhuma tarefa. Você instalou o npm?",
-	"TaskSystemDetector.noGulpProgram": "Gulp não está instalado no seu sistema. Execute npm install -g gulp para instalá-lo.",
-	"TaskSystemDetector.noJakeProgram": "Jake não está instalado no seu sistema. Execute npm install -g jake para instalá-lo.",
-	"TaskSystemDetector.noGruntProgram": "Grunhido não está instalado no seu sistema. Execute npm install -g grunt para instalá-lo.",
-	"TaskSystemDetector.noProgram": "Programa {0} não foi encontrado. Mensagem é {1}",
-	"TaskSystemDetector.buildTaskDetected": "Tarefa de construção chamada '{0}' detectada.",
-	"TaskSystemDetector.testTaskDetected": "Tarefa de teste chamada '{0}' detectada."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/tasks/node/processTaskSystem.i18n.json b/i18n/ptb/src/vs/workbench/parts/tasks/node/processTaskSystem.i18n.json
deleted file mode 100644
index 7dbd22c59ef..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/tasks/node/processTaskSystem.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"TaskRunnerSystem.unknownError": "Um erro desconhecido ocorreu durante a execução de uma tarefa. Consulte o log de saída de tarefa para obter detalhes.",
-	"TaskRunnerSystem.watchingBuildTaskFinished": "\nTarefas de compilação de monitoramento terminaram.",
-	"TaskRunnerSystem.childProcessError": "Falha ao iniciar o programa externo {0} {1}.",
-	"TaskRunnerSystem.cancelRequested": "\nA tarefa '{0}' foi finalizada por solicitação do usuário.",
-	"unkownProblemMatcher": "Problema matcher {0} não pode ser resolvido. O matcher será ignorado"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json b/i18n/ptb/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
deleted file mode 100644
index 2b141ba44a3..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"ConfigurationParser.invalidCWD": "Aviso: options.cwd deve ser do tipo string. Ignorando valor {0}\n",
-	"ConfigurationParser.noargs": "Erro: Argumentos do comando devem ser uma matriz de strings. Valor informado é:\n{0}",
-	"ConfigurationParser.noShell": "Aviso: A configuração do shell somente é suportada quando estiver executando tarefas no terminal.",
-	"ConfigurationParser.noName": "Erro: Problem Matcher no escopo declarado deve ter um nome:\n{0}\n",
-	"ConfigurationParser.unknownMatcherKind": "Aviso: a correspondência de problema definido é desconhecido. Tipos suportados são string | ProblemMatcher | (string | ProblemMatcher)[].\n{0}\n",
-	"ConfigurationParser.invalidVaraibleReference": "Erro: ProblemMatcher inválido referência: {0}\n",
-	"ConfigurationParser.noTaskType": "Erro: configuração de tarefas deve ter uma propriedade de tipo. A configuração será ignorada.\n{0}\n",
-	"ConfigurationParser.noTypeDefinition": "Erro: não há nenhum tipo de tarefa registrado '{0}'. Você esqueceu de instalar uma extensão que fornece um provedor de tarefa correspondente?",
-	"ConfigurationParser.missingRequiredProperty": "Erro: a configuração de tarefa '{0}' não possui a propriedade obrigatória '{1}'. A configuração de tarefa será ignorada.",
-	"ConfigurationParser.notCustom": "Erro: tarefas não está declarada como uma tarefa personalizada. A configuração será ignorada.\n{0}\n",
-	"ConfigurationParser.noTaskName": "Erro: uma tarefa deve fornecer uma propriedade de rótulo. A tarefa será ignorada.\n{0}\n",
-	"taskConfiguration.noCommandOrDependsOn": "Erro: a tarefa '{0}' não especifica nem um comando nem uma propriedade dependsOn. A tarefa será ignorada. Sua definição é: \n{1}",
-	"taskConfiguration.noCommand": "Erro: a tarefa '{0}' não define um comando. A tarefa será ignorada. Sua definição é: {1}",
-	"TaskParse.noOsSpecificGlobalTasks": "Tarefa versão 2.0.0 não oferece suporte a tarefas globais específicas do sistema operacional. Converta-as em uma tarefa com um comando específico do sistema operacional. Tarefas afetadas:\n{0}"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.i18n.json b/i18n/ptb/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.i18n.json
deleted file mode 100644
index 9784eaf453f..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"termEntryAriaLabel": "{0}, seletor de terminal",
-	"termCreateEntryAriaLabel": "{0}, criar novo terminal",
-	"workbench.action.terminal.newplus": "$(plus) criar novo Terminal Integrado",
-	"noTerminalsMatching": "Não há terminais correspondentes",
-	"noTerminalsFound": "Não há terminais abertos"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/terminal/common/terminalColorRegistry.i18n.json b/i18n/ptb/src/vs/workbench/parts/terminal/common/terminalColorRegistry.i18n.json
deleted file mode 100644
index eb2f070aafe..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/terminal/common/terminalColorRegistry.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"terminal.background": "A cor de fundo do terminal, isso permite colorir o terminal com uma cor diferente do painel.",
-	"terminal.foreground": "A cor de primeiro plano do terminal.",
-	"terminal.ansiColor": "'{0}' cor ANSI no terminal."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json b/i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
deleted file mode 100644
index a7fcbfe8b12..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"quickOpen.terminal": "Mostrar Todos os Terminais Abertos",
-	"terminal": "Terminal",
-	"terminalIntegratedConfigurationTitle": "Terminal Integrado",
-	"terminal.integrated.shell.linux": "O caminho do shell que o terminal usa no Linux.",
-	"terminal.integrated.shellArgs.linux": "Os argumentos de linha de comando a serem usados no terminal do Linux.",
-	"terminal.integrated.shell.osx": "O caminho do shell que o terminal usa no OS X.",
-	"terminal.integrated.shellArgs.osx": "Os argumentos de linha de comando a serem usados no terminal do OS X.",
-	"terminal.integrated.shell.windows": "O caminho do shell que o terminal utiliza no Windows. Quando estiver usando shells fornecidos com o Windows (cmd, PowerShell ou Bash no Ubuntu).",
-	"terminal.integrated.shellArgs.windows": "Os argumentos de linha de comando a serem utilizados no terminal do Windows.",
-	"terminal.integrated.macOptionIsMeta": "Tratar a tecla option como a tecla meta no terminal no macOS.",
-	"terminal.integrated.copyOnSelection": "Quando ativado, texto selecionado no terminal será copiado para a área de transferência.",
-	"terminal.integrated.fontFamily": "Controla a família de fontes do terminal, este padrão é o valor do editor.fontFamily.",
-	"terminal.integrated.fontSize": "Controla o tamanho da fonte em pixels do terminal.",
-	"terminal.integrated.lineHeight": "Controla a altura da linha do terminal, este número é multiplicado pelo tamanho da fonte do terminal para obter a altura real da linha em pixels.",
-	"terminal.integrated.fontWeight": "A espessura da fonte a usar no terminal para textos não-negritos.",
-	"terminal.integrated.fontWeightBold": "A espessura da fonte a ser usada no terminal para texto em negrito.",
-	"terminal.integrated.cursorBlinking": "Controla se o cursor do terminal pisca.",
-	"terminal.integrated.cursorStyle": "Controla o estilo do cursor do terminal.",
-	"terminal.integrated.scrollback": "Controla a quantidade máxima de linhas que o terminal mantém em seu buffer.",
-	"terminal.integrated.setLocaleVariables": "Controla se as variáveis locais são definidas na inicialização do terminal, este padrão é verdadeiro no OS X e falso em outras plataformas.",
-	"terminal.integrated.cwd": "Um caminho de início explícito onde o terminal será lançado, isso é usado como o diretório de trabalho atual (cwd) para o processo shell. Isto pode ser particularmente útil em configurações de espaço de trabalho se o diretório raiz não é um cwd conveniente.",
-	"terminal.integrated.confirmOnExit": "Confirmar na saída se ainda houverem sessões de terminal ativas.",
-	"terminal.integrated.enableBell": "Se o sino do terminal está habilitado ou não.",
-	"terminal.integrated.commandsToSkipShell": "Um conjunto de IDs de comando, cujas combinações de teclas não serão enviadas para o shell e sempre serão tratadas por código. Isto permite o uso de combinações de teclas que normalmente seriam consumidas pelo shell para agir da mesma forma quando o terminal não é focado, por exemplo ctrl+p para Execução Rápida.",
-	"terminal.integrated.env.osx": "Objeto com variáveis de ambiente que serão adicionadas ao VS Code e utilizadas pelo terminal no Mac OS X",
-	"terminal.integrated.env.linux": "Objeto com variáveis de ambiente que serão adicionadas ao VS Code e utilizadas pelo terminal no Linux",
-	"terminal.integrated.env.windows": "Objeto com variáveis de ambiente que serão adicionadas ao VS Code e utilizadas pelo terminal no Windows",
-	"terminal.integrated.showExitAlert": "Mostrar alerta 'O processo terminal foi encerrado com código de saída' quando o código de saída é diferente de zero.",
-	"terminal.integrated.experimentalRestore": "Se deseja restaurar sessões de terminal para a área de trabalho automaticamente quando executa o VS Code. Essa é uma configuração experimental; Ele pode ser falho e pode mudar no futuro.",
-	"terminalCategory": "Terminal",
-	"viewCategory": "Exibir"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json b/i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
deleted file mode 100644
index 5844af8cc38..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"workbench.action.terminal.toggleTerminal": "Alternar Terminal Integrado",
-	"workbench.action.terminal.kill": "Finalizar a Instância de Terminal Ativa",
-	"workbench.action.terminal.kill.short": "Encerrar Terminal",
-	"workbench.action.terminal.quickKill": "Finalizar a instância do Terminal",
-	"workbench.action.terminal.copySelection": "Copiar Seleção",
-	"workbench.action.terminal.selectAll": "Selecionar Tudo",
-	"workbench.action.terminal.deleteWordLeft": "Excluir Palavra à Esquerda",
-	"workbench.action.terminal.deleteWordRight": "Excluir Palavra à Direita",
-	"workbench.action.terminal.moveToLineStart": "Mover Para Início da Linha",
-	"workbench.action.terminal.moveToLineEnd": "Mover Para Fim da Linha",
-	"workbench.action.terminal.new": "Criar Novo Terminal Integrado",
-	"workbench.action.terminal.new.short": "Novo Terminal",
-	"workbench.action.terminal.newWorkspacePlaceholder": "Selecione o diretório de trabalho atual para novo terminal",
-	"workbench.action.terminal.newInActiveWorkspace": "Criar Novo Terminal Integrado (No Espaço de Trabalho Ativo)",
-	"workbench.action.terminal.split": "Dividir Terminal",
-	"workbench.action.terminal.focusPreviousPane": "Focar Painel Anterior",
-	"workbench.action.terminal.focusNextPane": "Foco próximo painel",
-	"workbench.action.terminal.resizePaneLeft": "Redimensionar Painel à Esquerda",
-	"workbench.action.terminal.resizePaneRight": "Redimensionar Painel à Direita",
-	"workbench.action.terminal.resizePaneUp": "Redimensionar Painel Superior",
-	"workbench.action.terminal.resizePaneDown": "Redimensionar Painel Inferior",
-	"workbench.action.terminal.focus": "Focalizar Terminal",
-	"workbench.action.terminal.focusNext": "Focalizar Próximo Terminal",
-	"workbench.action.terminal.focusPrevious": "Focalizar Terminal Anterior",
-	"workbench.action.terminal.paste": "Colar no Terminal Ativo",
-	"workbench.action.terminal.DefaultShell": "Selecionar Shell Padrão",
-	"workbench.action.terminal.runSelectedText": "Executar Texto Selecionado no Terminal Ativo",
-	"workbench.action.terminal.runActiveFile": "Executar Arquivo Ativo no Terminal Ativo",
-	"workbench.action.terminal.runActiveFile.noFile": "Apenas arquivos em disco podem ser executados no terminal",
-	"workbench.action.terminal.switchTerminal": "Alternar Terminal",
-	"workbench.action.terminal.scrollDown": "Rolar para Baixo (Linha)",
-	"workbench.action.terminal.scrollDownPage": "Rolar para Baixo (Página)",
-	"workbench.action.terminal.scrollToBottom": "Rolar para baixo",
-	"workbench.action.terminal.scrollUp": "Rolar para Cima (Linha)",
-	"workbench.action.terminal.scrollUpPage": "Rolar para Cima (Página)",
-	"workbench.action.terminal.scrollToTop": "Rolar para cima",
-	"workbench.action.terminal.clear": "Limpar",
-	"workbench.action.terminal.allowWorkspaceShell": "Permitir a Configuração de Shell da Área de Trabalho",
-	"workbench.action.terminal.disallowWorkspaceShell": "Não Permitir a Configuração de Shell da Área de Trabalho",
-	"workbench.action.terminal.rename": "Renomear",
-	"workbench.action.terminal.rename.prompt": "Digite o nome do terminal",
-	"workbench.action.terminal.focusFindWidget": "Focalizar Ferramenta de Pesquisa",
-	"workbench.action.terminal.hideFindWidget": "Ocultar Ferramenta de Pesquisa",
-	"nextTerminalFindTerm": "Mostrar Próximo Termo de Busca",
-	"previousTerminalFindTerm": "Mostrar Termo de Busca Anterior",
-	"quickOpenTerm": "Alternar o Terminal Ativo"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json b/i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
deleted file mode 100644
index a9e83e391ee..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"terminal.background": "A cor de fundo do terminal, isso permite colorir o terminal com uma cor diferente do painel.",
-	"terminal.foreground": "A cor de primeiro plano do terminal.",
-	"terminalCursor.foreground": "A cor de primeiro plano do cursor do terminal.",
-	"terminalCursor.background": "A cor de fundo do cursor do terminal. Permite personalizar a cor de um personagem sobreposto por um cursor de bloco.",
-	"terminal.selectionBackground": "A cor de fundo de seleção do terminal.",
-	"terminal.ansiColor": "'{0}' cor ANSI no terminal."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminalConfigHelper.i18n.json b/i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminalConfigHelper.i18n.json
deleted file mode 100644
index e830d715a0d..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminalConfigHelper.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"terminal.integrated.allowWorkspaceShell": "Você permite {0} (definido como uma configuração de espaço de trabalho) a ser executado no terminal?",
-	"allow": "Permitir",
-	"disallow": "Não permitir"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminalFindWidget.i18n.json b/i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminalFindWidget.i18n.json
deleted file mode 100644
index 9172767f770..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminalFindWidget.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"label.find": "Localizar",
-	"placeholder.find": "Localizar",
-	"label.previousMatchButton": "Correspondência anterior",
-	"label.nextMatchButton": "Próxima correspondência",
-	"label.closeButton": "Fechar"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json b/i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json
deleted file mode 100644
index 60f3bd6d888..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"terminal.integrated.a11yBlankLine": "Linha em branco",
-	"terminal.integrated.a11yPromptLabel": "Entrada do terminal",
-	"yes": "Sim",
-	"no": "Não",
-	"dontShowAgain": "Não mostrar novamente",
-	"terminal.integrated.copySelection.noSelection": "O terminal não tem nenhuma seleção para copiar",
-	"terminal.integrated.exitedWithCode": "O processo terminal encerrado com código de saída: {0}",
-	"terminal.integrated.waitOnExit": "Pressione qualquer tecla para fechar o terminal"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminalLinkHandler.i18n.json b/i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminalLinkHandler.i18n.json
deleted file mode 100644
index d4d85dca8f9..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminalLinkHandler.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"terminalLinkHandler.followLinkAlt": "Alt + clique para seguir o link",
-	"terminalLinkHandler.followLinkCmd": "Cmd + clique para seguir o link",
-	"terminalLinkHandler.followLinkCtrl": "Ctrl + clique para seguir o link"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json b/i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json
deleted file mode 100644
index dbdfa88d94b..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"copy": "Copiar",
-	"split": "Dividir",
-	"paste": "Colar",
-	"selectAll": "Selecionar Tudo",
-	"clear": "Limpar"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json b/i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
deleted file mode 100644
index 1463cb4fa9e..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"terminal.integrated.chooseWindowsShellInfo": "Você pode alterar o terminal shell padrão selecionando o botão Personalizar.",
-	"customize": "Personalizar",
-	"never again": "Não mostrar novamente",
-	"terminal.integrated.chooseWindowsShell": "Selecione o seu terminal shell preferido, você pode alterar isso mais tarde em suas configurações",
-	"terminalService.terminalCloseConfirmationSingular": "Há uma sessão ativa de terminal, você quer finalizá-la?",
-	"terminalService.terminalCloseConfirmationPlural": "Existem {0} sessões ativas de terminal, você quer finalizá-las?"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/themes/electron-browser/themes.contribution.i18n.json b/i18n/ptb/src/vs/workbench/parts/themes/electron-browser/themes.contribution.i18n.json
deleted file mode 100644
index ea291d886ff..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/themes/electron-browser/themes.contribution.i18n.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"selectTheme.label": "Tema de Cores",
-	"themes.category.light": "temas claros",
-	"themes.category.dark": "temas escuros",
-	"themes.category.hc": "temas de alto contraste",
-	"installColorThemes": "Instalar temas de cor adicionais...",
-	"themes.selectTheme": "Selecione o tema de cor (teclas cima/baixo para visualização)",
-	"selectIconTheme.label": "Arquivo de Ícone do Tema",
-	"noIconThemeLabel": "Nenhum",
-	"noIconThemeDesc": "Desabilitar ícones de arquivos",
-	"installIconThemes": "Instalar Temas de Ícones de Arquivos Adicionais...",
-	"themes.selectIconTheme": "Selecionar Tema de Ícones de Arquivos",
-	"generateColorTheme.label": "Gerar Tema de Cores a Partir das Configurações Atuais",
-	"preferences": "Preferências",
-	"developer": "Desenvolvedor"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/trust/electron-browser/unsupportedWorkspaceSettings.contribution.i18n.json b/i18n/ptb/src/vs/workbench/parts/trust/electron-browser/unsupportedWorkspaceSettings.contribution.i18n.json
deleted file mode 100644
index de16a43b9aa..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/trust/electron-browser/unsupportedWorkspaceSettings.contribution.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openWorkspaceSettings": "Abrir as configurações do espaço de trabalho",
-	"dontShowAgain": "Não mostrar novamente",
-	"unsupportedWorkspaceSettings": "Esta área de trabalho contém configurações que só podem ser definidas nas configurações do usuário. ({0}). Clique [aqui]({1}) para mais informações."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json b/i18n/ptb/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json
deleted file mode 100644
index 4290f9be0ba..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"releaseNotesInputName": "Notas da Versão: {0}",
-	"unassigned": "Não atribuído"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/update/electron-browser/releaseNotesInput.i18n.json b/i18n/ptb/src/vs/workbench/parts/update/electron-browser/releaseNotesInput.i18n.json
deleted file mode 100644
index 7a9a3e21738..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/update/electron-browser/releaseNotesInput.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"releaseNotesInputName": "Notas da Versão: {0}"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/update/electron-browser/update.contribution.i18n.json b/i18n/ptb/src/vs/workbench/parts/update/electron-browser/update.contribution.i18n.json
deleted file mode 100644
index 1e3efb198af..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/update/electron-browser/update.contribution.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"release notes": "Notas da versão"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/update/electron-browser/update.i18n.json b/i18n/ptb/src/vs/workbench/parts/update/electron-browser/update.i18n.json
deleted file mode 100644
index da6e72a8a98..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/update/electron-browser/update.i18n.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"releaseNotes": "Notas da Versão",
-	"showReleaseNotes": "Mostrar Notas da Versão",
-	"read the release notes": "Bem-vindo a {0} v{1}! Gostaria de ler as Notas da Versão?",
-	"licenseChanged": "Nossos termos de licença mudaram, por favor, clique [aqui]({0}) para revisá-los.",
-	"neveragain": "Não mostrar novamente",
-	"64bitisavailable": "{0} para Windows de 64 bits está agora disponível! Clique [aqui]({0}) para maiores informações.",
-	"updateIsReady": "Nova atualização de {0} disponível.",
-	"noUpdatesAvailable": "Não há nenhuma atualização disponível no momento.",
-	"ok": "OK",
-	"thereIsUpdateAvailable": "Há uma atualização disponível.",
-	"download now": "Baixar agora",
-	"later": "Mais tarde",
-	"installUpdate": "Instalar Atualização",
-	"updateAvailableAfterRestart": "Reinicie o {0} para aplicar a atualização mais recente.",
-	"updateNow": "Atualizar Agora",
-	"commandPalette": "Paleta de comandos...",
-	"settings": "Configurações",
-	"keyboardShortcuts": "Atalhos de Teclado",
-	"showExtensions": "Gerenciar Extensões",
-	"userSnippets": "Trecho de código do usuário",
-	"selectTheme.label": "Tema de Cores",
-	"themes.selectIconTheme.label": "Arquivo de Ícone do Tema",
-	"checkForUpdates": "Verificar atualizações...",
-	"checkingForUpdates": "Verificando Atualizações...",
-	"DownloadingUpdate": "Baixando Atualização...",
-	"installUpdate...": "Instalar Atualização...",
-	"installingUpdate": "Instalando Atualização...",
-	"restartToUpdate": "Reinicie para Atualizar..."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/url/electron-browser/url.contribution.i18n.json b/i18n/ptb/src/vs/workbench/parts/url/electron-browser/url.contribution.i18n.json
deleted file mode 100644
index 549c77a4531..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/url/electron-browser/url.contribution.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openUrl": "Abrir URL",
-	"developer": "Desenvolvedor"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/views/browser/views.i18n.json b/i18n/ptb/src/vs/workbench/parts/views/browser/views.i18n.json
deleted file mode 100644
index d210a742451..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/views/browser/views.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"viewToolbarAriaLabel": "{0} ações ",
-	"hideView": "Ocultar a Barra Lateral"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/views/browser/viewsExtensionPoint.i18n.json b/i18n/ptb/src/vs/workbench/parts/views/browser/viewsExtensionPoint.i18n.json
deleted file mode 100644
index fe9bcf24664..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/views/browser/viewsExtensionPoint.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"requirearray": "visualizações devem ser uma matriz",
-	"requirestring": "a propriedade `{0}` é obrigatória e deve ser do tipo `string`",
-	"optstring": "a propriedade `{0}` é opcional ou deve ser do tipo `string`",
-	"vscode.extension.contributes.view.id": "Identificador da visualiozação. Use isto para registrar um provedor de dados através de 'vscode.window.registerTreeDataProviderForView' API. Também para acionar ativando sua extensão registrando o evento 'onView: ${id}' para 'activationEvents'.",
-	"vscode.extension.contributes.view.name": "O nome legível da visualização. Será mostrado",
-	"vscode.extension.contributes.view.when": "Condição que deve ser verdadeira para mostrar esta visualização",
-	"vscode.extension.contributes.views": "Contribui visualizações ao editor",
-	"views.explorer": "Visualização do explorador",
-	"views.debug": "Visualizar Depurador",
-	"locationId.invalid": "'{0}' não é um local válido de visualização"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/watermark/electron-browser/watermark.i18n.json b/i18n/ptb/src/vs/workbench/parts/watermark/electron-browser/watermark.i18n.json
deleted file mode 100644
index 9b8d45183a1..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/watermark/electron-browser/watermark.i18n.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"watermark.showCommands": "Mostrar todos os comandos",
-	"watermark.quickOpen": "Ir para o Arquivo",
-	"watermark.openFile": "Abrir Arquivo",
-	"watermark.openFolder": "Abrir Pasta",
-	"watermark.openFileFolder": "Abrir Arquivo ou Pasta",
-	"watermark.openRecent": "Abrir Recente",
-	"watermark.newUntitledFile": "Novo Arquivo Sem Título",
-	"watermark.toggleTerminal": "Alternar Terminal",
-	"watermark.findInFiles": "Localizar nos Arquivos",
-	"watermark.startDebugging": "Iniciar Depuração",
-	"watermark.unboundCommand": "não vinculado",
-	"workbenchConfigurationTitle": "Área de Trabalho",
-	"tips.enabled": "Quando habilitado, mostrará as dicas de marca d'água quando nenhum editor estiver aberto."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json b/i18n/ptb/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json
deleted file mode 100644
index 0169a443115..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"webview.editor.label": "editor webview",
-	"developer": "Desenvolvedor"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/webview/electron-browser/webviewCommands.i18n.json b/i18n/ptb/src/vs/workbench/parts/webview/electron-browser/webviewCommands.i18n.json
deleted file mode 100644
index 3533d84f530..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/webview/electron-browser/webviewCommands.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openToolsLabel": "Abrir Ferramentas de Desenvolvedor do Webview",
-	"refreshWebviewLabel": "Recarregar Webviews"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json b/i18n/ptb/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json
deleted file mode 100644
index 69d43b6f302..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"telemetryOptOut.optOutNotice": "Ajude a melhorar o VS Code permitindo que a Microsoft colete dados de uso. Leia nossa [política de privacidade]({0}) e saiba como [optar por sair]({1}).",
-	"telemetryOptOut.optInNotice": "Ajude a melhorar o VS Code permitindo que a Microsoft colete dados de uso. Leia nossa [política de privacidade]({0}) e saiba como [optar por isso]({1}).",
-	"telemetryOptOut.readMore": "Ler Mais"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/welcome/overlay/browser/welcomeOverlay.i18n.json b/i18n/ptb/src/vs/workbench/parts/welcome/overlay/browser/welcomeOverlay.i18n.json
deleted file mode 100644
index 9a4db06b808..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/welcome/overlay/browser/welcomeOverlay.i18n.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"welcomeOverlay.explorer": "Explorador de arquivos",
-	"welcomeOverlay.search": "Pesquisar em arquivos",
-	"welcomeOverlay.git": "Gerenciamento de código fonte",
-	"welcomeOverlay.debug": "Executar e depurar",
-	"welcomeOverlay.extensions": "Gerenciar extensões",
-	"welcomeOverlay.problems": "Visualizar erros e avisos",
-	"welcomeOverlay.commandPalette": "Encontrar e executar todos os comandos",
-	"welcomeOverlay": "Visão geral da Interface do usuário",
-	"hideWelcomeOverlay": "Esconder a visão geral da Interface",
-	"help": "Ajuda"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json b/i18n/ptb/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
deleted file mode 100644
index 39c7626f423..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"welcomePage.vscode": "Visual Studio Code",
-	"welcomePage.editingEvolved": "Edição evoluída",
-	"welcomePage.start": "Início",
-	"welcomePage.newFile": "Novo arquivo",
-	"welcomePage.openFolder": "Abrir pasta...",
-	"welcomePage.addWorkspaceFolder": "Adicionar pasta do espaço de trabalho...",
-	"welcomePage.recent": "Recente",
-	"welcomePage.moreRecent": "Mais...",
-	"welcomePage.noRecentFolders": "Não há pastas recentes",
-	"welcomePage.help": "Ajuda",
-	"welcomePage.keybindingsCheatsheet": "Folha de dicas de teclado para impressão",
-	"welcomePage.introductoryVideos": "Vídeos introdutórios",
-	"welcomePage.tipsAndTricks": "Dicas e truques",
-	"welcomePage.productDocumentation": "Documentação do produto",
-	"welcomePage.gitHubRepository": "Repositório GitHub",
-	"welcomePage.stackOverflow": "Stack Overflow",
-	"welcomePage.showOnStartup": "Mostrar a página de boas-vindas na inicialização",
-	"welcomePage.customize": "Personalizar",
-	"welcomePage.installExtensionPacks": "Ferramentas e linguagens",
-	"welcomePage.installExtensionPacksDescription": "Instalar o suporte para {0} e {1}",
-	"welcomePage.moreExtensions": "mais",
-	"welcomePage.others": "outros",
-	"welcomePage.colorTheme": "Tema de cores",
-	"welcomePage.colorThemeDescription": "Fazer o editor e seu código parecer do jeito que você gosta",
-	"welcomePage.learn": "Aprender",
-	"welcomePage.showCommands": "Encontrar e executar todos os comandos",
-	"welcomePage.showCommandsDescription": "Comandos de acesso rápido e de pesquisa da paleta de comando ({0})",
-	"welcomePage.interfaceOverview": "Visão geral da interface",
-	"welcomePage.interfaceOverviewDescription": "Obter uma sobreposição visual, destacando os principais componentes da interface do usuário",
-	"welcomePage.interactivePlayground": "Playground interativo",
-	"welcomePage.interactivePlaygroundDescription": "Experimente as características essenciais do editor em um curto passo-a-passo"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.contribution.i18n.json b/i18n/ptb/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.contribution.i18n.json
deleted file mode 100644
index b1f5ab2e498..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.contribution.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"workbenchConfigurationTitle": "Área de Trabalho",
-	"workbench.startupEditor.none": "Iniciar sem um editor.",
-	"workbench.startupEditor.welcomePage": "Abrir a página de boas-vindas (padrão).",
-	"workbench.startupEditor.newUntitledFile": "Abrir um novo arquivo sem título.",
-	"workbench.startupEditor": "Controla qual editor é mostrado na inicialização, se nenhum for restaurado a partir da sessão anterior. Selecione 'none' para iniciar sem um editor, 'welcomePage' para abrir a página de boas-vindas (padrão), 'newUntitledFile' para abrir um novo arquivo sem título (apenas quando estiver abrindo um espaço de trabalho vazio).",
-	"help": "Ajuda"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json b/i18n/ptb/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json
deleted file mode 100644
index b9b063e2717..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"welcomePage": "Bem-vindo",
-	"welcomePage.javaScript": "JavaScript",
-	"welcomePage.typeScript": "TypeScript",
-	"welcomePage.python": "Python",
-	"welcomePage.php": "PHP",
-	"welcomePage.azure": "Azure",
-	"welcomePage.showAzureExtensions": "Mostrar extensões de Azure",
-	"welcomePage.docker": "Docker",
-	"welcomePage.vim": "Vim",
-	"welcomePage.sublime": "Sublime",
-	"welcomePage.atom": "Atom",
-	"welcomePage.extensionPackAlreadyInstalled": "Suporte para {0} já está instalado.",
-	"welcomePage.willReloadAfterInstallingExtensionPack": "A janela irá recarregar depois de instalar o suporte adicional para {0}.",
-	"welcomePage.installingExtensionPack": "Instalando o suporte adicional para {0}...",
-	"welcomePage.extensionPackNotFound": "Suporte para {0} com o id {1} não pôde ser encontrado.",
-	"welcomePage.keymapAlreadyInstalled": "Os atalhos de teclado de {0} já estão instalados.",
-	"welcomePage.willReloadAfterInstallingKeymap": "A janela irá recarregar depois de instalar os {0} atalhos de teclado.",
-	"welcomePage.installingKeymap": "Instalando os {0} atalhos de teclado...",
-	"welcomePage.keymapNotFound": "Os {0} atalhos de teclado com o id {1} não podem ser encontrados.",
-	"welcome.title": "Bem-vindo",
-	"welcomePage.openFolderWithPath": "Abrir pasta {0} com o caminho {1}",
-	"welcomePage.extensionListSeparator": ", ",
-	"welcomePage.installKeymap": "Instalar {0} keymap",
-	"welcomePage.installExtensionPack": "Instalar o suporte adicional para {0}",
-	"welcomePage.installedKeymap": "Mapeamento de tecla '{0}' já está instalado.",
-	"welcomePage.installedExtensionPack": "Suporte {0} já está instalado.",
-	"ok": "OK",
-	"details": "Detalhes",
-	"welcomePage.buttonBackground": "Cor de fundo para os botões na página de boas-vindas.",
-	"welcomePage.buttonHoverBackground": "Cor de fundo ao passar o mouse sobre os botões na página de boas-vindas."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/welcome/walkThrough/electron-browser/editor/editorWalkThrough.i18n.json b/i18n/ptb/src/vs/workbench/parts/welcome/walkThrough/electron-browser/editor/editorWalkThrough.i18n.json
deleted file mode 100644
index e3b2a1ead2d..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/welcome/walkThrough/electron-browser/editor/editorWalkThrough.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"editorWalkThrough.title": "Playground Interativo",
-	"editorWalkThrough": "Playground Interativo"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThrough.contribution.i18n.json b/i18n/ptb/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThrough.contribution.i18n.json
deleted file mode 100644
index b6d64ea0c4c..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThrough.contribution.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"walkThrough.editor.label": "Playground Interativo",
-	"help": "Ajuda"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughActions.i18n.json b/i18n/ptb/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughActions.i18n.json
deleted file mode 100644
index 4fc0198cc7c..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughActions.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"editorWalkThrough.arrowUp": "Rolar para Cima (Linha)",
-	"editorWalkThrough.arrowDown": "Rolar para Baixo (Linha)",
-	"editorWalkThrough.pageUp": "Rolar para Cima (Página)",
-	"editorWalkThrough.pageDown": "Rolar para Baixo (Página)"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughPart.i18n.json b/i18n/ptb/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughPart.i18n.json
deleted file mode 100644
index a5cb97940f0..00000000000
--- a/i18n/ptb/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughPart.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"walkThrough.unboundCommand": "não vinculado",
-	"walkThrough.gitNotFound": "Parece que o Git não está instalado no seu sistema.",
-	"walkThrough.embeddedEditorBackground": "Cor de fundo para os editores incorporados no Playground Interativo."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/services/actions/electron-browser/menusExtensionPoint.i18n.json b/i18n/ptb/src/vs/workbench/services/actions/electron-browser/menusExtensionPoint.i18n.json
deleted file mode 100644
index 2aa222eaf70..00000000000
--- a/i18n/ptb/src/vs/workbench/services/actions/electron-browser/menusExtensionPoint.i18n.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"requirearray": "os itens de menu devem ser um array",
-	"requirestring": "a propriedade `{0}` é obrigatória e deve ser do tipo `string`",
-	"optstring": "a propriedade `{0}` é opcional ou deve ser do tipo `string`",
-	"vscode.extension.contributes.menuItem.command": "Identificador do comando para ser executado. O comando deve ser declarado na seção de 'Comandos'",
-	"vscode.extension.contributes.menuItem.alt": "O identificador de um comando alternativo para executar. O comando deve ser declarado na sessão 'Comandos'",
-	"vscode.extension.contributes.menuItem.when": "Condição, que deve ser verdadeira, para mostrar esse item",
-	"vscode.extension.contributes.menuItem.group": "Grupo ao qual pertence este comando",
-	"vscode.extension.contributes.menus": "Contribui itens de menu ao editor",
-	"menus.commandPalette": "Paleta de comandos",
-	"menus.touchBar": "A barra de toque (somente macOS)",
-	"menus.editorTitle": "Meno do título editor",
-	"menus.editorContext": "Mostrar o menu de contexto do editor",
-	"menus.explorerContext": "Menu no contexto de explorador de arquivos",
-	"menus.editorTabContext": "Mostrar o menu de contexto do editor",
-	"menus.debugCallstackContext": "O menu de contexto de pilha de chamadas de depuração",
-	"menus.scmTitle": "O menu de título do controle de fonte",
-	"menus.scmSourceControl": "O menu do Controle de Código Fonte",
-	"menus.resourceGroupContext": "O menu de contexto do grupo de recursos de controle de fonte",
-	"menus.resourceStateContext": "O menu de contexto de estado de recursos do controle de fonte",
-	"view.viewTitle": "O menu de título da visualização contribuída",
-	"view.itemContext": "O menu de contexto do item da visualização contribuída",
-	"nonempty": "Esperado um valor não vazio",
-	"opticon": "a propriedade '{0}' é opcional ou pode ser do tipo 'string'",
-	"requireStringOrObject": "a propriedade '{0}' é obrigatória e deve ser do tipo 'string'",
-	"requirestrings": "a propriedade `{0}` é obrigatória e deve ser do tipo `string`",
-	"vscode.extension.contributes.commandType.command": "Indentificador de comando para executar",
-	"vscode.extension.contributes.commandType.title": "Título para o qual o comando é representado na UI",
-	"vscode.extension.contributes.commandType.category": "(Opcional) Sequência de categoria será agrupada na interface de usuário",
-	"vscode.extension.contributes.commandType.icon": "(Opcional) Icone utilizado para representar o comando na interface de usuário. Um arquivo ou configuração do tema.",
-	"vscode.extension.contributes.commandType.icon.light": "Caminho do Ícone quando o tema light for utilizado",
-	"vscode.extension.contributes.commandType.icon.dark": "Caminho do ícone quando o tema dark for utilizado",
-	"vscode.extension.contributes.commands": "Contribui comandos à paleta de comandos",
-	"dup": "Comando '{0}' aparece multiplas vezes na sessão 'comandos'\n",
-	"menuId.invalid": "'{0}' nao é um identificador de menu válido ",
-	"missing.command": "Identificador do comando para ser executado. O comando deve ser declarado na seção de 'Comandos'",
-	"missing.altCommand": "Referências ao item de menu no alt-command '{0}' qual nao é definido na sessão 'comandos'",
-	"dupe.command": "Itens de referencias do mesmo comando como padrão e alt-command"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/services/bulkEdit/electron-browser/bulkEditService.i18n.json b/i18n/ptb/src/vs/workbench/services/bulkEdit/electron-browser/bulkEditService.i18n.json
deleted file mode 100644
index f86add7197c..00000000000
--- a/i18n/ptb/src/vs/workbench/services/bulkEdit/electron-browser/bulkEditService.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"summary.0": "Não foram feitas edições",
-	"summary.nm": "Feitas {0} edições de texto em {1} arquivos",
-	"summary.n0": "Feitas {0} edições de texto em um arquivo",
-	"conflict": "Estes arquivos foram alterados nesse meio tempo: {0}"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/services/configuration/common/configurationExtensionPoint.i18n.json b/i18n/ptb/src/vs/workbench/services/configuration/common/configurationExtensionPoint.i18n.json
deleted file mode 100644
index 6f4f8c59178..00000000000
--- a/i18n/ptb/src/vs/workbench/services/configuration/common/configurationExtensionPoint.i18n.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.contributes.configuration.title": "Um resumo das configurações. Este rótulo será usado no arquivo de configurações como um comentário de separação.",
-	"vscode.extension.contributes.configuration.properties": "Descrição das propriedades de configuração.",
-	"scope.window.description": "Janela de configuração específica que pode ser configurada nas configurações do usuário ou área de trabalho.",
-	"scope.resource.description": "Configuração específica do recurso que pode ser configurada nas configurações do usuário, espaço de trabalho ou pasta.",
-	"scope.description": "Escopo em que a configuração é aplicável. Escopos disponíveis são 'window' e 'resource'.",
-	"vscode.extension.contributes.defaultConfiguration": "Contribui às definições de configuração padrão do editor por linguagem.",
-	"vscode.extension.contributes.configuration": "Contribui às definições de configuração.",
-	"invalid.title": "'configuration.title' deve ser um string",
-	"invalid.properties": "'configuration.properties' deve ser um objeto",
-	"invalid.allOf": "'configuration.allOf' está obsoleto e não deve ser usado. Em vez disso, passe várias seções de configuração como uma matriz para o ponto de contribuição  'configuration'.",
-	"workspaceConfig.folders.description": "Lista de pastas a serem carregadas no espaço de trabalho.",
-	"workspaceConfig.path.description": "Um caminho para um arquivo. Por exemplo, '/root /pastaA' ou './pastaA' para um caminho relativo que será determinado de acordo com o local do arquivo no espaço de trabalho.",
-	"workspaceConfig.name.description": "Um nome opcional para a pasta. ",
-	"workspaceConfig.uri.description": "URI da pasta",
-	"workspaceConfig.settings.description": "Configurações de espaço de trabalho",
-	"workspaceConfig.launch.description": "Configurações de inicialização do espaço de trabalho",
-	"workspaceConfig.extensions.description": "Extensões para o espaço de trabalho",
-	"unknownWorkspaceProperty": "Propriedade de configuração do espaço de trabalho desconhecida"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/services/configuration/node/configuration.i18n.json b/i18n/ptb/src/vs/workbench/services/configuration/node/configuration.i18n.json
deleted file mode 100644
index 2cd5ff9947e..00000000000
--- a/i18n/ptb/src/vs/workbench/services/configuration/node/configuration.i18n.json
+++ /dev/null
@@ -1,24 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"vscode.extension.contributes.configuration.title": "Um resumo das configurações. Este rótulo será usado no arquivo de configurações como um comentário de separação.",
-	"vscode.extension.contributes.configuration.properties": "Descrição das propriedades de configuração.",
-	"scope.window.description": "Janela de configuração específica que pode ser configurada nas configurações do usuário ou área de trabalho.",
-	"scope.resource.description": "Configuração específica do recurso que pode ser configurada nas configurações do usuário, espaço de trabalho ou pasta.",
-	"scope.description": "Escopo em que a configuração é aplicável. Escopos disponíveis são 'janela' e 'recurso'.",
-	"vscode.extension.contributes.configuration": "Contribui às definições de configuração.",
-	"invalid.title": "'configuration.title' deve ser um string",
-	"vscode.extension.contributes.defaultConfiguration": "Contribui às definições de configuração padrão do editor por linguagem.",
-	"invalid.properties": "'configuration.properties' deve ser um objeto",
-	"invalid.allOf": "'configuration.allOf' está obsoleto e não deve ser usado. Em vez disso, passe várias seções de configuração como uma matriz para o ponto de contribuição  'configuration'.",
-	"workspaceConfig.folders.description": "Lista de pastas a serem carregadas no espaço de trabalho.",
-	"workspaceConfig.path.description": "Um caminho para um arquivo. Por exemplo, '/root /pastaA' ou './pastaA' para um caminho relativo que será determinado de acordo com o local do arquivo no espaço de trabalho.",
-	"workspaceConfig.name.description": "Um nome opcional para a pasta. ",
-	"workspaceConfig.uri.description": "URI da pasta",
-	"workspaceConfig.settings.description": "Configurações de espaço de trabalho",
-	"workspaceConfig.extensions.description": "Extensões para o espaço de trabalho",
-	"unknownWorkspaceProperty": "Propriedade de configuração do espaço de trabalho desconhecida"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json b/i18n/ptb/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
deleted file mode 100644
index 68215b632ce..00000000000
--- a/i18n/ptb/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openTasksConfiguration": "Abrir Configuração de Tarefas",
-	"openLaunchConfiguration": "Abrir Configuração de Execução",
-	"open": "Abrir configurações",
-	"saveAndRetry": "Salvar e tentar novamente",
-	"errorUnknownKey": "Não é possível gravar {0} porque {1} não é uma configuração registrada.",
-	"errorInvalidFolderConfiguration": "Não é possível gravar as configurações da pasta porque {0} não suporta o escopo de recurso de pasta.",
-	"errorInvalidUserTarget": "Não é possível gravar as configurações do usuário porque {0} não oferece suporte para o escopo global.",
-	"errorInvalidWorkspaceTarget": "Não é possível gravar as configurações do espaço de trabalho porque {0} não oferece suporte para o escopo de espaço de trabalho em um espaço de trabalho de múltiplas pastas.",
-	"errorInvalidFolderTarget": "Não é possível gravar as configurações da pasta porque nenhum recurso é fornecido.",
-	"errorNoWorkspaceOpened": "Não é possível gravar {0} porque nenhum espaço de trabalho está aberto. Por favor, abra um espaço de trabalho primeiro e tente novamente.",
-	"errorInvalidTaskConfiguration": "Não é possível escrever no arquivo de configuração de tarefas. Por favor, abra o arquivo para corrigir erros/avisos e tente novamente.",
-	"errorInvalidLaunchConfiguration": "Não é possível escrever no arquivo de configuração de lançamento. Por favor, abra o arquivo para corrigir erros/avisos e tente novamente.",
-	"errorInvalidConfiguration": "Não é possível escrever nas configurações do usuário. Por favor, abra as configurações do usuário para corrigir erros/avisos e tente novamente.",
-	"errorInvalidConfigurationWorkspace": "Não é possível escrever nas configurações do espaço de trabalho. Por favor, abra as configurações do espaço de trabalho para corrigir erros/avisos no arquivo e tente novamente.",
-	"errorInvalidConfigurationFolder": "Não é possível escrever nas configurações de pasta. Por favor, abra as configurações da pasta '{0}' para corrigir erros/avisos e tente novamente.",
-	"userTarget": "Configurações de Usuário",
-	"workspaceTarget": "Configurações de Espaço de Trabalho",
-	"folderTarget": "Configurações de pasta"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/services/configuration/node/configurationService.i18n.json b/i18n/ptb/src/vs/workbench/services/configuration/node/configurationService.i18n.json
deleted file mode 100644
index 54475988a3a..00000000000
--- a/i18n/ptb/src/vs/workbench/services/configuration/node/configurationService.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"unsupportedWindowSetting": "Essa configuração não pode ser aplicada agora. Será aplicada quando você abrir esta pasta diretamente."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/services/configuration/node/jsonEditingService.i18n.json b/i18n/ptb/src/vs/workbench/services/configuration/node/jsonEditingService.i18n.json
deleted file mode 100644
index 137721dd024..00000000000
--- a/i18n/ptb/src/vs/workbench/services/configuration/node/jsonEditingService.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"errorInvalidFile": "Não é possível gravar no arquivo. Por favor, abra-o para corrigir seus erros/avisos e tente novamente.",
-	"errorFileDirty": "Não é possível gravar no arquivo porque ele foi alterado. Por favor, salve-o e tente novamente."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json b/i18n/ptb/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
deleted file mode 100644
index 35229bd6699..00000000000
--- a/i18n/ptb/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	]
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/services/configurationResolver/node/variableResolver.i18n.json b/i18n/ptb/src/vs/workbench/services/configurationResolver/node/variableResolver.i18n.json
deleted file mode 100644
index 35229bd6699..00000000000
--- a/i18n/ptb/src/vs/workbench/services/configurationResolver/node/variableResolver.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	]
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/services/crashReporter/common/crashReporterService.i18n.json b/i18n/ptb/src/vs/workbench/services/crashReporter/common/crashReporterService.i18n.json
deleted file mode 100644
index 63fd1d1955d..00000000000
--- a/i18n/ptb/src/vs/workbench/services/crashReporter/common/crashReporterService.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"telemetryConfigurationTitle": "Telemetria",
-	"telemetry.enableCrashReporting": "Ativar o envio de relatórios de incidentes à Microsoft. Esta opção requer reinicialização para ser efetiva."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/services/crashReporter/electron-browser/crashReporterService.i18n.json b/i18n/ptb/src/vs/workbench/services/crashReporter/electron-browser/crashReporterService.i18n.json
deleted file mode 100644
index 5d7a088d276..00000000000
--- a/i18n/ptb/src/vs/workbench/services/crashReporter/electron-browser/crashReporterService.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"telemetryConfigurationTitle": "Telemetria",
-	"telemetry.enableCrashReporting": "Ativar o envio de relatórios de incidentes à Microsoft. Esta opção requer reinicialização para ser efetiva."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/services/decorations/browser/decorationsService.i18n.json b/i18n/ptb/src/vs/workbench/services/decorations/browser/decorationsService.i18n.json
deleted file mode 100644
index 4c337128753..00000000000
--- a/i18n/ptb/src/vs/workbench/services/decorations/browser/decorationsService.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"bubbleTitle": "Contém itens enfatizados"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json b/i18n/ptb/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json
deleted file mode 100644
index 7fbcc0a8081..00000000000
--- a/i18n/ptb/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"yesButton": "&&Sim",
-	"cancelButton": "Cancelar"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/services/dialogs/electron-browser/dialogs.i18n.json b/i18n/ptb/src/vs/workbench/services/dialogs/electron-browser/dialogs.i18n.json
deleted file mode 100644
index 26b63fec4fc..00000000000
--- a/i18n/ptb/src/vs/workbench/services/dialogs/electron-browser/dialogs.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"yesButton": "&&Sim",
-	"cancelButton": "Cancelar",
-	"moreFile": "... 1 arquivo adicional não está mostrado",
-	"moreFiles": "... {0} arquivos adicionais não estão mostrados"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/services/editor/browser/editorService.i18n.json b/i18n/ptb/src/vs/workbench/services/editor/browser/editorService.i18n.json
deleted file mode 100644
index 50e968f8ee3..00000000000
--- a/i18n/ptb/src/vs/workbench/services/editor/browser/editorService.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"compareLabels": "{0} ↔ {1}"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/services/editor/common/editorService.i18n.json b/i18n/ptb/src/vs/workbench/services/editor/common/editorService.i18n.json
deleted file mode 100644
index ca1ee0161c1..00000000000
--- a/i18n/ptb/src/vs/workbench/services/editor/common/editorService.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"compareLabels": "{0} ↔ {1}"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/services/extensions/common/extensionsRegistry.i18n.json b/i18n/ptb/src/vs/workbench/services/extensions/common/extensionsRegistry.i18n.json
deleted file mode 100644
index 4dbdaaac4b5..00000000000
--- a/i18n/ptb/src/vs/workbench/services/extensions/common/extensionsRegistry.i18n.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.engines.vscode": "Para extensões do VS Code, especifica a versão do VS Code que a extensão é compatível. Não pode ser *. Por exemplo: ^0.10.5 indica compatibilidade com uma versão mínima de 0.10.5 para o VS Code.",
-	"vscode.extension.publisher": "O editor da extensão do VS Code.",
-	"vscode.extension.displayName": "O nome de exibição para a extensão do VS Code.",
-	"vscode.extension.categories": "As categorias usadas pela galeria do VS Code para categorizar a extensão.",
-	"vscode.extension.galleryBanner": "Banner usado na loja VS Code.",
-	"vscode.extension.galleryBanner.color": "A cor do banner usado no cabeçalho de página da loja VS Code.",
-	"vscode.extension.galleryBanner.theme": "A cor do tema usada para o fonte usado no banner.",
-	"vscode.extension.contributes": "Todas as contribuições da extensão VS Code representadas por este pacote.",
-	"vscode.extension.preview": "Configura a extensão para ser marcada como pré-visualização na Loja.",
-	"vscode.extension.activationEvents": "Eventos de ativação para a extensão VS Code.",
-	"vscode.extension.activationEvents.onLanguage": "Um evento de ativação emitido sempre que um arquivo que resolve para a linguagem especificada é aberto.",
-	"vscode.extension.activationEvents.onCommand": "Um evento de ativação emitido sempre que o comando especificado for invocado.",
-	"vscode.extension.activationEvents.onDebug": "Um evento de ativação emitido sempre que um usuário está prestes a iniciar a depuração ou a definir as configurações de depuração.",
-	"vscode.extension.activationEvents.onDebugInitialConfigurations": "Um evento de ativação é emitido sempre que um \"launch.json\" precisa ser criado (e todos os métodos provideDebugConfigurations precisam ser chamados).",
-	"vscode.extension.activationEvents.onDebugResolve": "Um evento de ativação emitido quando uma sessão de debug com um tipo específico está para ser iniciada (e um método resolveDebugConfiguration correspondente precisa ser chamado).",
-	"vscode.extension.activationEvents.workspaceContains": "Um evento de ativação emitido quando uma pasta que contém pelo menos um arquivo correspondente ao padrão global especificado é aberta.",
-	"vscode.extension.activationEvents.onView": "Um evento de ativação emitido sempre que o modo de visualização especificado é expandido.",
-	"vscode.extension.activationEvents.star": "Um evento de ativação emitido na inicialização do VS Code. Para garantir uma ótima experiência de usuário, por favor, use este evento de ativação em sua extensão somente quando nenhuma outra combinação de eventos de ativação funcionar em seu caso de uso.",
-	"vscode.extension.badges": "Matriz de emblemas a mostrar na barra lateral da página da extensão na Loja.",
-	"vscode.extension.badges.url": "URL da imagem do emblema.",
-	"vscode.extension.badges.href": "Link do emblema.",
-	"vscode.extension.badges.description": "Descrição do emblema.",
-	"vscode.extension.extensionDependencies": "Dependências para outras extensões. O identificador de uma extensão sempre é ${publisher}. ${nome}. Por exemplo: vscode.csharp.",
-	"vscode.extension.scripts.prepublish": "Script a ser executado antes do pacote ser publicado como uma extensão VS Code.",
-	"vscode.extension.scripts.uninstall": "Desinstala o hook para a extensão do VS Code. O script que é executado quando a extensão é completamente desinstalada do VS Code e é quando o VS Code é reiniciado (desligar e iniciar) depois que a extensão for desinstalada. Somente scripts Node são suportados.",
-	"vscode.extension.icon": "O caminho para um ícone de 128x128 pixels."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/services/extensions/electron-browser/extensionHost.i18n.json b/i18n/ptb/src/vs/workbench/services/extensions/electron-browser/extensionHost.i18n.json
deleted file mode 100644
index 3867f612998..00000000000
--- a/i18n/ptb/src/vs/workbench/services/extensions/electron-browser/extensionHost.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"extensionHostProcess.startupFailDebug": "O host de extensão não iniciou em 10 segundos, ele pode ser interrompido na primeira linha e precisa de um depurador para continuar.",
-	"extensionHostProcess.startupFail": "Host de extensão não começou em 10 segundos, isso pode ser um problema.",
-	"reloadWindow": "Recarregar Janela",
-	"extensionHostProcess.error": "Erro do host de extensão: {0}"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/services/extensions/electron-browser/extensionHostProfiler.i18n.json b/i18n/ptb/src/vs/workbench/services/extensions/electron-browser/extensionHostProfiler.i18n.json
deleted file mode 100644
index 319153a4a8c..00000000000
--- a/i18n/ptb/src/vs/workbench/services/extensions/electron-browser/extensionHostProfiler.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"message": "$(zap) Perfil de Host de Extensão..."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/services/extensions/electron-browser/extensionPoints.i18n.json b/i18n/ptb/src/vs/workbench/services/extensions/electron-browser/extensionPoints.i18n.json
deleted file mode 100644
index 0f83744e99a..00000000000
--- a/i18n/ptb/src/vs/workbench/services/extensions/electron-browser/extensionPoints.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"jsonParseFail": "Falha ao analisar {0}: {1}.",
-	"fileReadFail": "Não foi possível ler o arquivo {0}: {1}.",
-	"jsonsParseReportErrors": "Falha ao analisar {0}: {1}.",
-	"missingNLSKey": "Não foi possível encontrar a mensagem para a chave {0}."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json b/i18n/ptb/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json
deleted file mode 100644
index f274e33cf84..00000000000
--- a/i18n/ptb/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"extensionHostProcess.crash": "Host de extensão foi encerrado inesperadamente.",
-	"extensionHostProcess.unresponsiveCrash": "Host de extensão encerrado porque não foi responsivo.",
-	"restart": "Reinicie o Host de extensão",
-	"overwritingExtension": "Sobrescrevendo extensão {0} por {1}.",
-	"extensionUnderDevelopment": "Carregando extensão de desenvolvimento em {0}",
-	"extensionCache.invalid": "Extensões foram modificadas no disco. Por favor atualize a janela.",
-	"reloadWindow": "Recarregar Janela"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/services/extensions/node/extensionPoints.i18n.json b/i18n/ptb/src/vs/workbench/services/extensions/node/extensionPoints.i18n.json
deleted file mode 100644
index afe11703efc..00000000000
--- a/i18n/ptb/src/vs/workbench/services/extensions/node/extensionPoints.i18n.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"jsonParseFail": "Falha ao analisar {0}: {1}.",
-	"fileReadFail": "Não foi possível ler o arquivo {0}: {1}.",
-	"jsonsParseReportErrors": "Falha ao analisar {0}: {1}.",
-	"missingNLSKey": "Não foi possível encontrar a mensagem para a chave {0}.",
-	"notSemver": "Versão da extensão não é compatível a semver",
-	"extensionDescription.empty": "Descrição de extensão vazia obtida",
-	"extensionDescription.publisher": "a propriedade `{0}` é obrigatória e deve ser do tipo `string`",
-	"extensionDescription.name": "a propriedade `{0}` é obrigatória e deve ser do tipo `string`",
-	"extensionDescription.version": "a propriedade `{0}` é obrigatória e deve ser do tipo `string`",
-	"extensionDescription.engines": "a propriedade `{0}` é obrigatória e deve ser do tipo `object`",
-	"extensionDescription.engines.vscode": "a propriedade `{0}` é obrigatória e deve ser do tipo `string`",
-	"extensionDescription.extensionDependencies": "a propriedade `{0}` pode ser omitida ou deve ser do tipo `string[]`",
-	"extensionDescription.activationEvents1": "a propriedade `{0}` pode ser omitida ou deve ser do tipo `string[]`",
-	"extensionDescription.activationEvents2": "Propriedades '{0}' e '{1}' devem ser especificadas ou devem ambas ser omitidas",
-	"extensionDescription.main1": "a propriedade `{0}` é opcional ou deve ser do tipo `string`",
-	"extensionDescription.main2": "Esperado 'main' ({0}) ser incluído dentro da pasta da extensão ({1}). Isto pode fazer a extensão não-portável.",
-	"extensionDescription.main3": "Propriedades '{0}' e '{1}' devem ser especificadas ou devem ambas ser omitidas"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/services/files/electron-browser/fileService.i18n.json b/i18n/ptb/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
deleted file mode 100644
index f77f09d67b9..00000000000
--- a/i18n/ptb/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"netVersionError": "O Microsoft .NET Framework 4.5 é necessário. Por favor siga o link para instalá-lo.",
-	"installNet": "Baixar o .NET Framework 4.5",
-	"neverShowAgain": "Não mostrar novamente",
-	"learnMore": "Instruções",
-	"fileInvalidPath": "Recurso de arquivo inválido ({0})",
-	"fileIsDirectoryError": "Arquivo é um diretório",
-	"fileNotModifiedError": "Arquivo não modificado desde",
-	"fileTooLargeError": "Arquivo muito grande para abrir",
-	"fileNotFoundError": "Arquivo não encontrado ({0})",
-	"fileBinaryError": "Arquivo parece ser binário e não pode ser aberto como texto",
-	"filePermission": "Permissão negada ao escrever no arquivo ({0})",
-	"fileExists": "Arquivo a ser criado já existe ({0})",
-	"fileModifiedError": "Arquivo Modificado Desde",
-	"fileReadOnlyError": "Arquivo é Somente Leitura",
-	"fileMoveConflict": "Não é possível mover/copiar. Arquivo já existe no destino.",
-	"unableToMoveCopyError": "Não é possível mover/copiar. Arquivo poderia substituir a pasta em que está contida.",
-	"binFailed": "Falha ao mover '{0}' para a lixeira",
-	"trashFailed": "Falha em mover '{0}' para a lixeira"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json b/i18n/ptb/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
deleted file mode 100644
index 6789efd2040..00000000000
--- a/i18n/ptb/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"fileNotFoundError": "Arquivo não encontrado ({0})",
-	"fileIsDirectoryError": "Arquivo é um diretório",
-	"fileNotModifiedError": "Arquivo não modificado desde",
-	"fileBinaryError": "Arquivo parece ser binário e não pode ser aberto como texto",
-	"fileMoveConflict": "Não é possível mover/copiar. Arquivo já existe no destino."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/services/files/node/fileService.i18n.json b/i18n/ptb/src/vs/workbench/services/files/node/fileService.i18n.json
deleted file mode 100644
index 29bfbb0d040..00000000000
--- a/i18n/ptb/src/vs/workbench/services/files/node/fileService.i18n.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"fileInvalidPath": "Recurso de arquivo inválido ({0})",
-	"fileIsDirectoryError": "Arquivo é um diretório",
-	"fileNotModifiedError": "Arquivo não modificado desde",
-	"fileTooLargeError": "Arquivo muito grande para abrir",
-	"fileNotFoundError": "Arquivo não encontrado ({0})",
-	"fileBinaryError": "Arquivo parece ser binário e não pode ser aberto como texto",
-	"filePermission": "Permissão negada ao escrever no arquivo ({0})",
-	"fileExists": "Arquivo a ser criado já existe ({0})",
-	"fileMoveConflict": "Não é possível mover/copiar. Arquivo já existe no destino.",
-	"unableToMoveCopyError": "Não é possível mover/copiar. Arquivo poderia substituir a pasta em que está contida.",
-	"foldersCopyError": "Pastas não podem ser copiadas para a área de trabalho. Por favor selecione arquivos individuais para serem copiados.",
-	"fileModifiedError": "Arquivo Modificado Desde",
-	"fileReadOnlyError": "Arquivo é Somente Leitura"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/services/jsonschemas/common/jsonValidationExtensionPoint.i18n.json b/i18n/ptb/src/vs/workbench/services/jsonschemas/common/jsonValidationExtensionPoint.i18n.json
deleted file mode 100644
index f033dcfee55..00000000000
--- a/i18n/ptb/src/vs/workbench/services/jsonschemas/common/jsonValidationExtensionPoint.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"contributes.jsonValidation": "Contribui à configuração do schema json.",
-	"contributes.jsonValidation.fileMatch": "O padrão de arquivo a corresponder, por exemplo \"package.json\" ou \"*.launch\".",
-	"contributes.jsonValidation.url": "Um esquema de URL ('http:', 'https:') ou caminho relativo à pasta de extensão('./').",
-	"invalid.jsonValidation": "'configuration.jsonValidation' deve ser uma matriz",
-	"invalid.fileMatch": "'configuration.jsonValidation.fileMatch' deve ser definido",
-	"invalid.url": "'configuration.jsonValidation.url' deve ser uma URL ou caminho relativo",
-	"invalid.url.fileschema": "'configuration.jsonValidation.url' é uma URL relativa inválida: {0}",
-	"invalid.url.schema": "'configuration.jsonValidation.url' deve começar com ' http:', ' https: 'ou'. /' para os esquemas de referência localizados na extensão"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/services/keybinding/common/keybindingEditing.i18n.json b/i18n/ptb/src/vs/workbench/services/keybinding/common/keybindingEditing.i18n.json
deleted file mode 100644
index fd057d15e08..00000000000
--- a/i18n/ptb/src/vs/workbench/services/keybinding/common/keybindingEditing.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"errorKeybindingsFileDirty": "Não é possível escrever no arquivo de configuração porque o arquivo está sujo. Por favor, salve-o primeiro e tente novamente.",
-	"parseErrors": "Não é possível escrever no arquivo de configuração. Por favor, abra o arquivo para corrigir erros/avisos e tente novamente.",
-	"errorInvalidConfiguration": "Não foi possível gravar no arquivo de configuração. Ele possui um objeto que não é do tipo Matriz. Por favor, abra o arquivo para limpar e tentar novamente.",
-	"emptyKeybindingsHeader": "Coloque suas combinações de teclas neste arquivo para substituir os padrões"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/services/keybinding/electron-browser/keybindingService.i18n.json b/i18n/ptb/src/vs/workbench/services/keybinding/electron-browser/keybindingService.i18n.json
deleted file mode 100644
index 4de199c4c2f..00000000000
--- a/i18n/ptb/src/vs/workbench/services/keybinding/electron-browser/keybindingService.i18n.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"nonempty": "Esperado um valor não vazio",
-	"requirestring": "a propriedade `{0}` é obrigatória e deve ser do tipo `string`",
-	"optstring": "a propriedade `{0}` é opcional ou pode ser do tipo `string`",
-	"vscode.extension.contributes.keybindings.command": "Identificador do comando a ser executado quando keybinding é acionado.",
-	"vscode.extension.contributes.keybindings.key": "Tecla ou sequência de teclas (teclas separadas com o sinal de adição e sequências com espaço, por exemplo Ctrl+O e Ctrl+L L).",
-	"vscode.extension.contributes.keybindings.mac": "Chave específica Mac ou sequência de teclas.",
-	"vscode.extension.contributes.keybindings.linux": "Chave específica Linux ou sequência de teclas.",
-	"vscode.extension.contributes.keybindings.win": "Chave específica Windows ou sequência de teclas.",
-	"vscode.extension.contributes.keybindings.when": "Condição quando a chave está ativa.",
-	"vscode.extension.contributes.keybindings": "Contribui para Atalhos de Teclado.",
-	"invalid.keybindings": "Inválido `contributes.{0}`: {1}",
-	"unboundCommands": "Aqui estão outros comandos disponíveis: ",
-	"keybindings.json.title": "Configuração de combinações de teclas",
-	"keybindings.json.key": "Tecla ou sequência de teclas (separados por espaço)",
-	"keybindings.json.command": "Nome do comando a ser executado",
-	"keybindings.json.when": "Condição quando a chave está ativa.",
-	"keybindings.json.args": "Argumentos a serem passados para o comando para executar.",
-	"keyboardConfigurationTitle": "Teclado",
-	"dispatch": "Controla a lógica de pressionamentos de teclas a ser usada para envio, se será 'code' (recomendado) ou 'keyCode'.",
-	"touchbar.enabled": "Habilita os botões do touchbar do macOS no teclado se disponível."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/services/message/browser/messageList.i18n.json b/i18n/ptb/src/vs/workbench/services/message/browser/messageList.i18n.json
deleted file mode 100644
index 771fbe93eef..00000000000
--- a/i18n/ptb/src/vs/workbench/services/message/browser/messageList.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"alertErrorMessage": "Erro: {0}",
-	"alertWarningMessage": "Aviso: {0}",
-	"alertInfoMessage": "Informações: {0}",
-	"error": "Erro",
-	"warning": "Aviso",
-	"info": "Informações",
-	"close": "Fechar"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/services/message/electron-browser/messageService.i18n.json b/i18n/ptb/src/vs/workbench/services/message/electron-browser/messageService.i18n.json
deleted file mode 100644
index 7fbcc0a8081..00000000000
--- a/i18n/ptb/src/vs/workbench/services/message/electron-browser/messageService.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"yesButton": "&&Sim",
-	"cancelButton": "Cancelar"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/services/mode/common/workbenchModeService.i18n.json b/i18n/ptb/src/vs/workbench/services/mode/common/workbenchModeService.i18n.json
deleted file mode 100644
index 8a57a7b68e7..00000000000
--- a/i18n/ptb/src/vs/workbench/services/mode/common/workbenchModeService.i18n.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.contributes.languages": "Contribui às declarações de linguagem.",
-	"vscode.extension.contributes.languages.id": "ID da linguagem",
-	"vscode.extension.contributes.languages.aliases": "Aliases de nome para esta linguagem.",
-	"vscode.extension.contributes.languages.extensions": "Extensões de arquivos associadas a esta linguagem",
-	"vscode.extension.contributes.languages.filenames": "Nome dos arquivos associados a esta linguagem",
-	"vscode.extension.contributes.languages.filenamePatterns": "Padrão glob de nomes de arquivos associados a linguagem.",
-	"vscode.extension.contributes.languages.mimetypes": "Tipos Mime associados à linguagem.",
-	"vscode.extension.contributes.languages.firstLine": "Uma expressão regular que coincide com a primeira linha de um arquivo da linguaguem.",
-	"vscode.extension.contributes.languages.configuration": "Um caminho relativo para um arquivo contendo opções de configuração para a linguagem.",
-	"invalid": "Inválido 'contributes.{0}`. Matriz esperada.",
-	"invalid.empty": "Valor em branco para` contributes.{0}`",
-	"require.id": "a propriedade `{0}` é obrigatória e deve ser do tipo `string`",
-	"opt.extensions": "a propriedade `{0}` pode ser omitida e deve ser do tipo `string[]`",
-	"opt.filenames": "a propriedade `{0}` pode ser omitida e deve ser do tipo `string[]`",
-	"opt.firstLine": "a propriedade `{0}` pode ser omitida e deve ser do tipo `string`",
-	"opt.configuration": "a propriedade `{0}` pode ser omitida e deve ser do tipo `string`",
-	"opt.aliases": "a propriedade `{0}` pode ser omitida e deve ser do tipo `string[]`",
-	"opt.mimetypes": "a propriedade `{0}` pode ser omitida e deve ser do tipo `string[]`"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/services/progress/browser/progressService2.i18n.json b/i18n/ptb/src/vs/workbench/services/progress/browser/progressService2.i18n.json
deleted file mode 100644
index 10f4afca07b..00000000000
--- a/i18n/ptb/src/vs/workbench/services/progress/browser/progressService2.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"progress.subtitle": "{0} - {1}",
-	"progress.title": "{0}: {1}",
-	"cancel": "Cancelar"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/services/textMate/electron-browser/TMGrammars.i18n.json b/i18n/ptb/src/vs/workbench/services/textMate/electron-browser/TMGrammars.i18n.json
deleted file mode 100644
index c681b9ec189..00000000000
--- a/i18n/ptb/src/vs/workbench/services/textMate/electron-browser/TMGrammars.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.contributes.grammars": "Contibui aos toquenizadores textmate",
-	"vscode.extension.contributes.grammars.language": "Identificador da linguagem para qual a sintaxe contribui.",
-	"vscode.extension.contributes.grammars.scopeName": "Nome do escopo Textmate usado pelo arquivo tmLanguage.",
-	"vscode.extension.contributes.grammars.path": "Caminho para o arquivo tmLanguage. O caminho é relativo a pasta da extensão e geralmente começa com './syntaxes/'.",
-	"vscode.extension.contributes.grammars.embeddedLanguages": "Um mapeamento no nome do escopo para o Id da linguagem se esta gramática contenha linguagens embutidas.",
-	"vscode.extension.contributes.grammars.tokenTypes": "Um mapa do nome do escopo para tipos de token.",
-	"vscode.extension.contributes.grammars.injectTo": "Lista de nomes de escopos de linguagem aos quais esta gramática é injetada."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/services/textMate/electron-browser/TMSyntax.i18n.json b/i18n/ptb/src/vs/workbench/services/textMate/electron-browser/TMSyntax.i18n.json
deleted file mode 100644
index fc5c4449fc2..00000000000
--- a/i18n/ptb/src/vs/workbench/services/textMate/electron-browser/TMSyntax.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"invalid.language": "Linguagem desconhecida em `contributes.{0}.language`. Valor fornecido: {1}",
-	"invalid.scopeName": "Esperada uma string em 'contributes.{0}.scopeName'. Valor informado: {1}",
-	"invalid.path.0": "Esperada uma string em `contributes.{0}.path`. Valor informado: {1}",
-	"invalid.injectTo": "Valor inválido em `contributes.{0}.injectTo`. Deve ser uma matriz de nomes de escopo de idioma. Valor fornecido: {1}",
-	"invalid.embeddedLanguages": "Valor inválido em `contributes.{0}.embeddedLanguages`. Deve ser um objeto de mapeamento do nome do escopo para a linguagem. Valor informado: {1}",
-	"invalid.path.1": "É esperado que `contributes.{0}.path` ({1}) seja incluído na pasta da extensão ({2}). Isto pode tornar a extensão não portável.",
-	"no-tm-grammar": "Nenhuma gramática TM registrada para este idioma."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/services/textfile/common/textFileEditorModel.i18n.json b/i18n/ptb/src/vs/workbench/services/textfile/common/textFileEditorModel.i18n.json
deleted file mode 100644
index e4579c779da..00000000000
--- a/i18n/ptb/src/vs/workbench/services/textfile/common/textFileEditorModel.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"saveFileFirst": "O arquivo está alterado. Por favor, salvá-lo primeiro antes reabri-lo com outra codificação.",
-	"genericSaveError": "Erro ao salvar '{0}': {1}"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/services/textfile/common/textFileService.i18n.json b/i18n/ptb/src/vs/workbench/services/textfile/common/textFileService.i18n.json
deleted file mode 100644
index e059f6d831b..00000000000
--- a/i18n/ptb/src/vs/workbench/services/textfile/common/textFileService.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"files.backup.failSave": "Arquivos que estão com problemas não podem ser escritos na localização de backup (erro: {0}). Tente salvar seus arquivos primeiro e depois sair."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json b/i18n/ptb/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json
deleted file mode 100644
index 7522dc2b84c..00000000000
--- a/i18n/ptb/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"saveChangesMessage": "Você quer salvar as alterações feitas para {0}?",
-	"saveChangesMessages": "Você quer salvar as alterações para os seguintes {0} arquivos?",
-	"saveAll": "&&Salvar tudo",
-	"save": "&&Salvar",
-	"dontSave": "&&Não Salvar",
-	"cancel": "Cancelar",
-	"saveChangesDetail": "Suas alterações serão perdidas se você não salvá-las.",
-	"allFiles": "Todos os arquivos",
-	"noExt": "Sem extensão"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/services/themes/common/colorExtensionPoint.i18n.json b/i18n/ptb/src/vs/workbench/services/themes/common/colorExtensionPoint.i18n.json
deleted file mode 100644
index aa4536a72c5..00000000000
--- a/i18n/ptb/src/vs/workbench/services/themes/common/colorExtensionPoint.i18n.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"contributes.color": "Contribui com a extensão de cores temáticas definidas",
-	"contributes.color.id": "O identificador da cor temática",
-	"contributes.color.id.format": "Identificadores devem estar no formato aa[.bb]*",
-	"contributes.color.description": "A descrição da cor temática",
-	"contributes.defaults.light": "A cor padrão para temas claros. Um valor de cor em hexadecimal (#RRGGBB[AA]) ou o identificador de uma cor temática que fornece o padrão.",
-	"contributes.defaults.dark": "A cor padrão para temas escuros. Um valor de cor em hexadecimal (#RRGGBB[AA]) ou o identificador de uma cor temática que fornece o padrão.",
-	"contributes.defaults.highContrast": "A cor padrão para temas de alto contraste. Um valor de cor em hexadecimal (#RRGGBB[AA]) ou o identificador de uma cor temática que fornece o padrão.",
-	"invalid.colorConfiguration": "'configuration.colors' deve ser uma matriz",
-	"invalid.default.colorType": "{0} deve ser um valor de cor em hexadecimal (#RRGGBB [AA] ou #RGB[A]) ou o identificador de uma cor temática que fornece o padrão.",
-	"invalid.id": "'configuration.colors.id' deve ser definido e não pode estar vazio",
-	"invalid.id.format": "'configuration.colors.id' deve seguir a palavra [.word] *",
-	"invalid.description": "'configuration.colors.description' deve ser definido e não pode estar vazio",
-	"invalid.defaults": "'configuration.colors.defaults' deve ser definido e deve conter 'claro', 'escuro' e 'Alto Contraste'"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/services/themes/common/colorThemeSchema.i18n.json b/i18n/ptb/src/vs/workbench/services/themes/common/colorThemeSchema.i18n.json
deleted file mode 100644
index 76671d7901f..00000000000
--- a/i18n/ptb/src/vs/workbench/services/themes/common/colorThemeSchema.i18n.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"schema.token.settings": "Cores e estilos para o token.",
-	"schema.token.foreground": "Cor do primeiro plano para o token.",
-	"schema.token.background.warning": "Atualmente as cores de fundo do token não são suportadas.",
-	"schema.token.fontStyle": "Estilo da fonte da regra: 'itálico', 'negrito', 'sublinhado' ou uma combinação. Cadeia de caracteres vazia desfaz configurações herdadas.",
-	"schema.fontStyle.error": "O estilo da fonte deve ser 'itálico', 'negrito' ou 'sublinhado', uma combinação ou cadeia de caracteres vazia.",
-	"schema.token.fontStyle.none": "Nenhum (limpar estilo herdado)",
-	"schema.properties.name": "Descrição da regra.",
-	"schema.properties.scope": "Seletor de escopo que bate com esta regra.",
-	"schema.tokenColors.path": "Caminho para um arquivo tmTheme (relativo ao arquivo atual).",
-	"schema.colors": "Cores para o realce de sintaxe"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/services/themes/common/fileIconThemeSchema.i18n.json b/i18n/ptb/src/vs/workbench/services/themes/common/fileIconThemeSchema.i18n.json
deleted file mode 100644
index 0cdf07df447..00000000000
--- a/i18n/ptb/src/vs/workbench/services/themes/common/fileIconThemeSchema.i18n.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"schema.folderExpanded": "O ícone de pasta para pastas expandidas. O ícone da pasta expandido é opcional. Se não definido, o ícone definido para a pasta será mostrado.",
-	"schema.folder": "O ícone de pasta para pastas colapsadas, e se folderExpanded não estiver definido, também para pastas expandidas.",
-	"schema.file": "O ícone de arquivo padrão, indicado para todos os arquivos que não correspondem a qualquer extensão, nome de arquivo ou idioma.",
-	"schema.folderNames": "Associa os nomes de pasta à ícones. A chave do objeto é o nome da pasta, não incluindo quaisquer segmentos de caminho. Nenhum padrão ou curinga são permitidos. O nome da pasta de correspondência diferencia maiusculas de minúsculas.",
-	"schema.folderName": "A ID da definição do ícone para associação.",
-	"schema.folderNamesExpanded": "Associa os nomes de pasta a ícones para pastas expandidas. A chave do objeto é o nome da pasta, não incluindo quaisquer segmentos do caminho. Padrões ou curingas não são permitidas. A correspondência do nome de pastas não diferencia maiusculas de minúsculas.",
-	"schema.folderNameExpanded": "A ID da definição do ícone para a associação.",
-	"schema.fileExtensions": "Associa as extensões de arquivo aos ícones. A chave do objeto é o nome da extensão do arquivo. O nome da extensão é o último segmento de um nome de arquivo após o último ponto (não incluindo o ponto). As extensões não diferenciam maiúsculas de minúsculas.",
-	"schema.fileExtension": "A ID da definição do ícone para a associação.",
-	"schema.fileNames": "Associa os nomes de arquivo à ícones. A chave do objeto é o nome completo do arquivo, mas não incluindo quaisquer segmentos do caminho. O nome do arquivo pode incluir pontos e uma extensão de arquivo. Nenhum padrão ou curinga é permitido. A correspondência de nome de arquivo não diferencia maiúsculas de minúsculas.",
-	"schema.fileName": "A ID da definição do ícone para a associação.",
-	"schema.languageIds": "Associa idiomas a ícones. A chave do objeto é o id de idioma definido no ponto de contribuição de linguagem.",
-	"schema.languageId": "O ID da definição do ícone para a associação.",
-	"schema.fonts": "Fontes que são usadas nas definições de ícone.",
-	"schema.id": "O ID da fonte.",
-	"schema.font-path": "O caminho do fonte, relativo ao arquivo de tema de ícone atual.",
-	"schema.font-format": "O formato da fonte.",
-	"schema.font-weight": "O peso da fonte.",
-	"schema.font-sstyle": "O estilo da fonte.",
-	"schema.font-size": "O tamanho padrão da fonte.",
-	"schema.iconDefinitions": "Descrição de todos os ícones que podem ser usados quando associar arquivos de ícones.",
-	"schema.iconDefinition": "Uma definição de ícone. A chave do objeto é o ID da definição.",
-	"schema.iconPath": "Ao usar um SVG ou PNG: O caminho para a imagem. O caminho é relativo ao arquivo de configuração do ícone.",
-	"schema.fontCharacter": "Ao usar uma fonte glyph: O caractere na fonte para usar.",
-	"schema.fontColor": "Ao usar uma fonte glyph: A cor a ser utilizada.",
-	"schema.fontSize": "Quando estiver utilizando uma fonte: O tamanho da fonte em porcentagem para a fonte de texto. Se não for definido, o padrão é o tamanho na definição de fonte.",
-	"schema.fontId": "Quando estiver utilizando uma fonte: A identificação da fonte. Se não for definido, o padrão é a primeira definição de fonte.",
-	"schema.light": "Associações opcionais para ícones de arquivo em temas de cor clara.",
-	"schema.highContrast": "Associações opcionais para ícones de arquivo em temas de alto contraste.",
-	"schema.hidesExplorerArrows": "Define se as setas do explorador de arquivos devem ser ocultadas quando este tema está ativo."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/services/themes/electron-browser/colorThemeData.i18n.json b/i18n/ptb/src/vs/workbench/services/themes/electron-browser/colorThemeData.i18n.json
deleted file mode 100644
index a5e50c537df..00000000000
--- a/i18n/ptb/src/vs/workbench/services/themes/electron-browser/colorThemeData.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"error.cannotparsejson": "Problemas ao analisar o arquivo de tema JSON: {0}",
-	"error.invalidformat.colors": "Problema ao analisar o arquivo de tema de cor: {0}. A propriedade 'colors' não é do tipo 'object'.",
-	"error.invalidformat.tokenColors": "Problema ao ler o arquivo do tema de cores: {0}. Propriedade 'tokenColors' deve ser também uma matriz especificando cores ou um caminho para um arquivo de tema do TextMate",
-	"error.plist.invalidformat": "Problema ao analisar o arquivo tmTheme: {0}. 'settings' não é uma matriz.",
-	"error.cannotparse": "Problemas ao analisar o arquivo tmTheme: {0}",
-	"error.cannotload": "Problemas ao carregar o arquivo tmTheme {0}: {1}"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/services/themes/electron-browser/colorThemeStore.i18n.json b/i18n/ptb/src/vs/workbench/services/themes/electron-browser/colorThemeStore.i18n.json
deleted file mode 100644
index 267fb385535..00000000000
--- a/i18n/ptb/src/vs/workbench/services/themes/electron-browser/colorThemeStore.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.contributes.themes": "Contribui com temas de cores do textmate.",
-	"vscode.extension.contributes.themes.id": "ID do tema do ícone como usado em configurações do usuário.",
-	"vscode.extension.contributes.themes.label": "Etiqueta da cor do tema como mostrado na interface do usuário.",
-	"vscode.extension.contributes.themes.uiTheme": "Tema base de definição das cores do editor: 'vs' é o tema de cor clara, 'vs-dark' é o tema de cor escura. 'hc preto' é o tema escuro de alto contraste.",
-	"vscode.extension.contributes.themes.path": "Caminho do arquivo tmTheme. O caminho é relativo à pasta de extensão e é normalmente './themes/themeFile.tmTheme'.",
-	"reqarray": "Ponto de extensão '{0}' deve ser uma matriz.",
-	"reqpath": "Esperada uma string em `contributes.{0}.path`. Valor informado: {1}",
-	"invalid.path.1": "É esperado que `contributes.{0}.path` ({1}) seja incluído na pasta da extensão ({2}). Isto pode tornar a extensão não portável."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/services/themes/electron-browser/fileIconThemeData.i18n.json b/i18n/ptb/src/vs/workbench/services/themes/electron-browser/fileIconThemeData.i18n.json
deleted file mode 100644
index e61cffffc79..00000000000
--- a/i18n/ptb/src/vs/workbench/services/themes/electron-browser/fileIconThemeData.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"error.cannotparseicontheme": "Problemas de análise do arquivo de ícones: {0}"
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/services/themes/electron-browser/fileIconThemeStore.i18n.json b/i18n/ptb/src/vs/workbench/services/themes/electron-browser/fileIconThemeStore.i18n.json
deleted file mode 100644
index 23d3c81ba81..00000000000
--- a/i18n/ptb/src/vs/workbench/services/themes/electron-browser/fileIconThemeStore.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.contributes.iconThemes": "Contribui com temas de ícones de arquivo.",
-	"vscode.extension.contributes.iconThemes.id": "ID do tema do ícone como usado em configurações do usuário.",
-	"vscode.extension.contributes.iconThemes.label": "Etiqueta do tema do ícone como mostrado na interface do usuário.",
-	"vscode.extension.contributes.iconThemes.path": "Caminho do arquivo de definição do tema do ícone. O caminho é relativo à pasta de extensão e é normalmente './icons/awesome-icon-theme.json'.",
-	"reqarray": "Ponto de extensão '{0}' deve ser uma matriz.",
-	"reqpath": "Esperada uma string em `contributes.{0}.path`. Valor informado: {1}",
-	"reqid": "Esperada sequência em 'contributes.{0}.ID'. Valor fornecido: {1}",
-	"invalid.path.1": "É esperado que `contributes.{0}.path` ({1}) seja incluído na pasta da extensão ({2}). Isto pode tornar a extensão não portável."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json b/i18n/ptb/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
deleted file mode 100644
index effaee068b3..00000000000
--- a/i18n/ptb/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"error.cannotloadtheme": "Não é possível carregar {0}: {1}",
-	"colorTheme": "Especifica o tema de cores usado no espaço de trabalho.",
-	"colorThemeError": "Tema é desconhecido ou não está instalado.",
-	"iconTheme": "Especifica o tema de ícones usado no espaço de trabalho ou 'null' para não mostrar qualquer arquivo de ícones.",
-	"noIconThemeDesc": "Nenhum arquivo de ícones",
-	"iconThemeError": "Arquivo de tema de ícones é desconhecido ou não está instalado.",
-	"workbenchColors": "Substitui as cores do tema do tema de cores atualmente selecionado.",
-	"editorColors.comments": "Define as cores e estilos para os comentários",
-	"editorColors.strings": "Define as cores e estilos para textos literais.",
-	"editorColors.keywords": "Define as cores e estilos para palavras-chave.",
-	"editorColors.numbers": "Define as cores e estilos para literais numéricos.",
-	"editorColors.types": "Define as cores e estilos para declarações de tipo e referências.",
-	"editorColors.functions": "Define as cores e estilos para declarações de funções e referências.",
-	"editorColors.variables": "Define as cores e estilos para declarações de variáveis e referências.",
-	"editorColors.textMateRules": "Define as cores e estilos usando regras de temas textmate (avançado).",
-	"editorColors": "Substitui as cores e o estilo da fonte do editor do tema de cores atualmente selecionado."
-}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json b/i18n/ptb/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json
deleted file mode 100644
index df3c6fe6d65..00000000000
--- a/i18n/ptb/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"errorInvalidTaskConfiguration": "Não é possível escrever no arquivo de configuração. Por favor, abra o arquivo para corrigir erros/avisos nele e tente novamente.",
-	"errorWorkspaceConfigurationFileDirty": "Não é possível escrever no arquivo de configuração do espaço de trabalho porque o arquivo está sujo. Por favor, salve-o e tente novamente.",
-	"openWorkspaceConfigurationFile": "Abrir Configuração do Espaço de Trabalho"
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/azure-account/out/azure-account.i18n.json b/i18n/rus/extensions/azure-account/out/azure-account.i18n.json
deleted file mode 100644
index d91c6279d44..00000000000
--- a/i18n/rus/extensions/azure-account/out/azure-account.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"azure-account.copyAndOpen": "Скопировать и открыть",
-	"azure-account.close": "Закрыть",
-	"azure-account.login": "Вход",
-	"azure-account.loginFirst": "Вы не вошли в систему. Сначала войдите в систему.",
-	"azure-account.userCodeFailed": "Не удалось получить код пользователя",
-	"azure-account.tokenFailed": "Получение маркера с кодом устройства",
-	"azure-account.tokenFromRefreshTokenFailed": "Получение маркера с маркером обновления"
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/azure-account/out/extension.i18n.json b/i18n/rus/extensions/azure-account/out/extension.i18n.json
deleted file mode 100644
index d1f24dd3a8c..00000000000
--- a/i18n/rus/extensions/azure-account/out/extension.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"azure-account.loggingIn": "Azure: выполняется вход...",
-	"azure-account.loggedIn": "Azure: {0}"
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/bat/package.i18n.json b/i18n/rus/extensions/bat/package.i18n.json
deleted file mode 100644
index 9ac3009d7cc..00000000000
--- a/i18n/rus/extensions/bat/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Основы языка Windows Bat",
-	"description": "Предоставляет фрагменты кода, подсветку синтаксиса, выделение парных скобок и сворачивание кода в пакетных файлах Windows."
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/clojure/package.i18n.json b/i18n/rus/extensions/clojure/package.i18n.json
deleted file mode 100644
index ed9a27f5f47..00000000000
--- a/i18n/rus/extensions/clojure/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Основы языка Clojure",
-	"description": "Предоставляет подсветку синтаксиса и выделение парных скобок в файлах Clojure."
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/coffeescript/package.i18n.json b/i18n/rus/extensions/coffeescript/package.i18n.json
deleted file mode 100644
index 0155146163e..00000000000
--- a/i18n/rus/extensions/coffeescript/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Основы языка CoffeeScript",
-	"description": "Предоставляет фрагменты кода, подсветку синтаксиса, выделение парных скобок и сворачивание кода в файлах CoffeeScript."
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/configuration-editing/out/extension.i18n.json b/i18n/rus/extensions/configuration-editing/out/extension.i18n.json
deleted file mode 100644
index 4aae82c4910..00000000000
--- a/i18n/rus/extensions/configuration-editing/out/extension.i18n.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"workspaceFolder": "Путь к папке открыт в VS Code",
-	"workspaceFolderBasename": "Имя папки, открытой в VS Code, без каких-либо слешей (/)",
-	"relativeFile": "Текущий открытый файл относительно ${workspaceFolder}",
-	"file": "Текущий открытый файл",
-	"cwd": "Текущий рабочий каталог средства запуска задачи при запуске",
-	"lineNumber": "Номер текущей выбранной строки в активном файле",
-	"selectedText": "Текущий выделенный текст в активном файле ",
-	"fileDirname": "Имя директории текущего открытого файла",
-	"fileExtname": "Расширение текущего открытого файла",
-	"fileBasename": "Базовое имя текущего открытого файла",
-	"fileBasenameNoExtension": "Базовое имя текущего открытого файла без расширения",
-	"exampleExtension": "Пример"
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json b/i18n/rus/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json
deleted file mode 100644
index e34b2279c4b..00000000000
--- a/i18n/rus/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"activeEditorShort": "имя файла (например, myFile.txt)",
-	"activeEditorMedium": "путь к файлу относительно папки рабочей области (например, myFolder/myFile.txt)",
-	"activeEditorLong": "полный путь к файлу (например, \"/Users/Development/myProject/myFolder/myFile.txt\")",
-	"rootName": "имя рабочей области (например, myFolder или myWorkspace)",
-	"rootPath": "путь к рабочей области (например, /Users/Development/myWorkspace)",
-	"folderName": "имя папки рабочей области, в которой содержится файл (например, myFolder)",
-	"folderPath": "путь к папке рабочей области, в которой содержится файл (например, /Users/Development/myFolder)",
-	"appName": "например, VS Code",
-	"dirty": "индикатор dirty, если активный редактор является \"грязным\"",
-	"separator": "условный разделитель (-), который отображается, только если окружен переменными со значениями",
-	"assocLabelFile": "Файлы с расширением",
-	"assocDescriptionFile": "Сопоставить все файлы, соответствующие стандартной маске в имени файла, с языком с указанным идентификатором.",
-	"assocLabelPath": "Файлы с путем",
-	"assocDescriptionPath": "Сопоставить все файлы, соответствующие стандартной маске в абсолютном пути, с языком с указанным идентификатором.",
-	"fileLabel": "Файлы по расширению",
-	"fileDescription": "Сопоставление всех файлов с определенным расширением.",
-	"filesLabel": "Файлы с несколькими расширениями",
-	"filesDescription": "Сопоставление всех файлов с любым из расширений файлов.",
-	"derivedLabel": "Файлы с элементами того же уровня по имени",
-	"derivedDescription": "Сопоставление файлов с одноранговыми элементами с тем же именем, но разными расширениями.",
-	"topFolderLabel": "Папка по имени (верхний уровень)",
-	"topFolderDescription": "Сопоставление папки верхнего уровня с определенным именем.",
-	"topFoldersLabel": "Папки с несколькими именами (верхний уровень)",
-	"topFoldersDescription": "Сопоставление нескольких папок верхнего уровня.",
-	"folderLabel": "Папка по имени (любое расположение)",
-	"folderDescription": "Сопоставление папки с определенным именем в любом расположении.",
-	"falseDescription": "Отключение шаблона.",
-	"trueDescription": "Включение шаблона.",
-	"siblingsDescription": "Сопоставление файлов с одноранговыми элементами с тем же именем, но разными расширениями.",
-	"languageSpecificEditorSettings": "Параметры редактора, определяемые языком",
-	"languageSpecificEditorSettingsDescription": "Переопределить параметры редактора для языка"
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/configuration-editing/package.i18n.json b/i18n/rus/extensions/configuration-editing/package.i18n.json
deleted file mode 100644
index c2659f57724..00000000000
--- a/i18n/rus/extensions/configuration-editing/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Изменение конфигурации",
-	"description": "Предоставляет возможности (такие как IntelliSense и автоматическое исправление) для конфигурационных файлов, таких как файлы параметров, файлы запуска и файлы рекомендаций для расширений."
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/cpp/package.i18n.json b/i18n/rus/extensions/cpp/package.i18n.json
deleted file mode 100644
index 65ad3a85384..00000000000
--- a/i18n/rus/extensions/cpp/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Основы языка C/C++",
-	"description": "Предоставляет фрагменты кода, подсветку синтаксиса, выделение парных скобок и сворачивание кода в файлах C/C++."
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/csharp/package.i18n.json b/i18n/rus/extensions/csharp/package.i18n.json
deleted file mode 100644
index b245c241737..00000000000
--- a/i18n/rus/extensions/csharp/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Основы языка C#",
-	"description": "Предоставляет фрагменты кода, подсветку синтаксиса, выделение парных скобок и сворачивание кода в файлах C#."
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/css-language-features/client/out/cssMain.i18n.json b/i18n/rus/extensions/css-language-features/client/out/cssMain.i18n.json
deleted file mode 100644
index 01ee817cdcd..00000000000
--- a/i18n/rus/extensions/css-language-features/client/out/cssMain.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"cssserver.name": "Языковой сервер CSS",
-	"folding.start": "Начало сворачиваемого региона",
-	"folding.end": "Окончание сворачиваемого региона"
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/css-language-features/package.i18n.json b/i18n/rus/extensions/css-language-features/package.i18n.json
deleted file mode 100644
index 13b750e8b52..00000000000
--- a/i18n/rus/extensions/css-language-features/package.i18n.json
+++ /dev/null
@@ -1,81 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Возможности языка CSS",
-	"description": "Предоставляет широкую поддержку языка для файлов CSS, LESS и SCSS.",
-	"css.title": "CSS",
-	"css.lint.argumentsInColorFunction.desc": "Недопустимое число параметров",
-	"css.lint.boxModel.desc": "Не использовать ширину или высоту при использовании поля или границы",
-	"css.lint.compatibleVendorPrefixes.desc": "При использовании зависящего от поставщика префикса также указывайте все остальные свойства поставщика",
-	"css.lint.duplicateProperties.desc": "Не использовать дублирующиеся определения стилей",
-	"css.lint.emptyRules.desc": "Не использовать пустые наборы правил",
-	"css.lint.float.desc": "Старайтесь не использовать \"float\". Из-за элементов \"float\" работа кода CSS может легко нарушиться, если изменить один из аспектов разметки.",
-	"css.lint.fontFaceProperties.desc": "Правило @font-face должно определять свойства src и font-family",
-	"css.lint.hexColorLength.desc": "Цвета в шестнадцатеричном формате должны содержать три или шесть шестнадцатеричных чисел",
-	"css.lint.idSelector.desc": "Селекторы не должны содержать идентификаторов, потому что эти правила слишком тесно связаны с HTML.",
-	"css.lint.ieHack.desc": "Полезные советы для Internet Explorer требуются только при поддержке Internet Explorer 7 и более ранних версий",
-	"css.lint.important.desc": "Старайтесь не использовать !important, так как это признак того, что весь код CSS стал неуправляемым и его надо переработать.",
-	"css.lint.importStatement.desc": "Операторы импорта не загружаются параллельно",
-	"css.lint.propertyIgnoredDueToDisplay.desc": "Свойство проигнорировано из-за значения свойства display. Например, при \"display: inline\" свойства width, height, margin-top, margin-bottom и float не работают",
-	"css.lint.universalSelector.desc": "Универсальный селектор (*) работает медленно",
-	"css.lint.unknownProperties.desc": "Неизвестное свойство.",
-	"css.lint.unknownVendorSpecificProperties.desc": "Неизвестное свойство поставщика.",
-	"css.lint.vendorPrefix.desc": "При использовании зависящего от поставщика префикса также указывайте стандартное свойство",
-	"css.lint.zeroUnits.desc": "Для нуля не требуется единица измерения",
-	"css.trace.server.desc": "Отслеживает обмен данными между VS Code и языковым сервером CSS.",
-	"css.validate.title": "Управляет проверкой CSS и серьезностью проблем.",
-	"css.validate.desc": "Включает или отключает все проверки",
-	"less.title": "LESS",
-	"less.lint.argumentsInColorFunction.desc": "Недопустимое число параметров",
-	"less.lint.boxModel.desc": "Не использовать ширину или высоту при использовании поля или границы",
-	"less.lint.compatibleVendorPrefixes.desc": "При использовании зависящего от поставщика префикса также указывайте все остальные свойства поставщика",
-	"less.lint.duplicateProperties.desc": "Не использовать дублирующиеся определения стилей",
-	"less.lint.emptyRules.desc": "Не использовать пустые наборы правил",
-	"less.lint.float.desc": "Старайтесь не использовать \"float\". Из-за элементов \"float\" работа кода CSS может легко нарушиться, если изменить один из аспектов разметки.",
-	"less.lint.fontFaceProperties.desc": "Правило @font-face должно определять свойства src и font-family",
-	"less.lint.hexColorLength.desc": "Цвета в шестнадцатеричном формате должны содержать три или шесть шестнадцатеричных чисел",
-	"less.lint.idSelector.desc": "Селекторы не должны содержать идентификаторов, потому что эти правила слишком тесно связаны с HTML.",
-	"less.lint.ieHack.desc": "Полезные советы для Internet Explorer требуются только при поддержке Internet Explorer 7 и более ранних версий",
-	"less.lint.important.desc": "Старайтесь не использовать !important, так как это признак того, что весь код CSS стал неуправляемым и его надо переработать.",
-	"less.lint.importStatement.desc": "Операторы импорта не загружаются параллельно",
-	"less.lint.propertyIgnoredDueToDisplay.desc": "Свойство проигнорировано из-за значения свойства display. Например, при \"display: inline\" свойства width, height, margin-top, margin-bottom и float не работают",
-	"less.lint.universalSelector.desc": "Универсальный селектор (*) работает медленно",
-	"less.lint.unknownProperties.desc": "Неизвестное свойство.",
-	"less.lint.unknownVendorSpecificProperties.desc": "Неизвестное свойство поставщика.",
-	"less.lint.vendorPrefix.desc": "При использовании зависящего от поставщика префикса также указывайте стандартное свойство",
-	"less.lint.zeroUnits.desc": "Для нуля не требуется единица измерения",
-	"less.validate.title": "Управляет проверкой LESS и уровнями серьезности проблем. ",
-	"less.validate.desc": "Включает или отключает все проверки",
-	"scss.title": "SCSS (SASS)",
-	"scss.lint.argumentsInColorFunction.desc": "Недопустимое число параметров",
-	"scss.lint.boxModel.desc": "Не использовать ширину или высоту при использовании поля или границы",
-	"scss.lint.compatibleVendorPrefixes.desc": "При использовании зависящего от поставщика префикса также указывайте все остальные свойства поставщика",
-	"scss.lint.duplicateProperties.desc": "Не использовать дублирующиеся определения стилей",
-	"scss.lint.emptyRules.desc": "Не использовать пустые наборы правил",
-	"scss.lint.float.desc": "Старайтесь не использовать \"float\". Из-за элементов \"float\" работа кода CSS может легко нарушиться, если изменить один из аспектов разметки.",
-	"scss.lint.fontFaceProperties.desc": "Правило @font-face должно определять свойства src и font-family",
-	"scss.lint.hexColorLength.desc": "Цвета в шестнадцатеричном формате должны содержать три или шесть шестнадцатеричных чисел",
-	"scss.lint.idSelector.desc": "Селекторы не должны содержать идентификаторов, потому что эти правила слишком тесно связаны с HTML.",
-	"scss.lint.ieHack.desc": "Полезные советы для Internet Explorer требуются только при поддержке Internet Explorer 7 и более ранних версий",
-	"scss.lint.important.desc": "Старайтесь не использовать !important, так как это признак того, что весь код CSS стал неуправляемым и его надо переработать.",
-	"scss.lint.importStatement.desc": "Операторы импорта не загружаются параллельно",
-	"scss.lint.propertyIgnoredDueToDisplay.desc": "Свойство проигнорировано из-за значения свойства display. Например, при \"display: inline\" свойства width, height, margin-top, margin-bottom и float не работают",
-	"scss.lint.universalSelector.desc": "Универсальный селектор (*) работает медленно",
-	"scss.lint.unknownProperties.desc": "Неизвестное свойство.",
-	"scss.lint.unknownVendorSpecificProperties.desc": "Неизвестное свойство поставщика.",
-	"scss.lint.vendorPrefix.desc": "При использовании зависящего от поставщика префикса также указывайте стандартное свойство",
-	"scss.lint.zeroUnits.desc": "Для нуля не требуется единица измерения",
-	"scss.validate.title": "Управляет проверкой SCSS и уровнями серьезности проблем.",
-	"scss.validate.desc": "Включает или отключает все проверки",
-	"less.colorDecorators.enable.desc": "Включает или отключает декораторы цвета",
-	"scss.colorDecorators.enable.desc": "Включает или отключает декораторы цвета",
-	"css.colorDecorators.enable.desc": "Включает или отключает декораторы цвета",
-	"css.colorDecorators.enable.deprecationMessage": "Параметр \"css.colorDecorators.enable\" устарел. Теперь вместо него используется параметр \"editor.colorDecorators\". ",
-	"scss.colorDecorators.enable.deprecationMessage": "Параметр \"scss.colorDecorators.enable\" устарел. Теперь вместо него используется параметр \"editor.colorDecorators\". ",
-	"less.colorDecorators.enable.deprecationMessage": "Параметр \"less.colorDecorators.enable\" устарел. Теперь вместо него используется параметр \"editor.colorDecorators\". "
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/css/client/out/cssMain.i18n.json b/i18n/rus/extensions/css/client/out/cssMain.i18n.json
deleted file mode 100644
index 01ee817cdcd..00000000000
--- a/i18n/rus/extensions/css/client/out/cssMain.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"cssserver.name": "Языковой сервер CSS",
-	"folding.start": "Начало сворачиваемого региона",
-	"folding.end": "Окончание сворачиваемого региона"
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/css/package.i18n.json b/i18n/rus/extensions/css/package.i18n.json
deleted file mode 100644
index f94884afe4a..00000000000
--- a/i18n/rus/extensions/css/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Основы языка CSS",
-	"description": "Предоставляет подсветку синтаксиса и выделение парных скобок в файлах CSS, LESS и SCSS."
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/diff/package.i18n.json b/i18n/rus/extensions/diff/package.i18n.json
deleted file mode 100644
index 35229bd6699..00000000000
--- a/i18n/rus/extensions/diff/package.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	]
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/docker/package.i18n.json b/i18n/rus/extensions/docker/package.i18n.json
deleted file mode 100644
index 3d96d44aac7..00000000000
--- a/i18n/rus/extensions/docker/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Основы языка Docker",
-	"description": "Предоставляет подсветку синтаксиса и выделение парных скобок в файлах Docker."
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/emmet/package.i18n.json b/i18n/rus/extensions/emmet/package.i18n.json
deleted file mode 100644
index e8a08df3b0f..00000000000
--- a/i18n/rus/extensions/emmet/package.i18n.json
+++ /dev/null
@@ -1,65 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"description": "Поддержка Emmet для VS Code",
-	"command.wrapWithAbbreviation": "Перенести с сокращением",
-	"command.wrapIndividualLinesWithAbbreviation": "Перенести отдельные строки с сокращением",
-	"command.removeTag": "Удалить тег",
-	"command.updateTag": "Обновить тег",
-	"command.matchTag": "Перейти к соответствующей паре",
-	"command.balanceIn": "Баланс (входящий)",
-	"command.balanceOut": "Баланс (исходящий)",
-	"command.prevEditPoint": "Перейти к предыдущей точке изменения",
-	"command.nextEditPoint": "Перейти к следующей точке изменения",
-	"command.mergeLines": "Объединить строки",
-	"command.selectPrevItem": "Выбрать предыдущий элемент",
-	"command.selectNextItem": "Выбрать следующий элемент",
-	"command.splitJoinTag": "Разделить/объединить тег",
-	"command.toggleComment": "Переключить комментарий",
-	"command.evaluateMathExpression": "Вычислить математическое выражение",
-	"command.updateImageSize": "Обновить размер изображения",
-	"command.reflectCSSValue": "Отражать значение CSS",
-	"command.incrementNumberByOne": "Увеличить значение на 1",
-	"command.decrementNumberByOne": "Уменьшить значение на 1",
-	"command.incrementNumberByOneTenth": "Увеличить значение на 0.1",
-	"command.decrementNumberByOneTenth": "Уменьшить значение на 0.1",
-	"command.incrementNumberByTen": "Увеличить значение на 10",
-	"command.decrementNumberByTen": "Уменьшить значение на 10",
-	"emmetSyntaxProfiles": "Задайте профиль для указанного синтаксиса или используйте свой собственный профиль с определенными правилами.",
-	"emmetExclude": "Массив языков, в которых не должны развертываться сокращения Emmet.",
-	"emmetExtensionsPath": "Путь к папке, содержащей профили Emmet и фрагменты кода.",
-	"emmetShowExpandedAbbreviation": "Отображает развернутые сокращения Emmet в виде предложений.\nПараметр \"inMarkupAndStylesheetFilesOnly\" применяется к html, haml, jade, slim, xml, xsl, css, scss, sass, less и stylus .\nПараметр \"always\" применяется ко всем частям файла независимо от разметки и стилей.",
-	"emmetShowAbbreviationSuggestions": "Отображает возможные сокращения Emmet в виде предложений. Не применяется в таблицах стилей или если параметр emmet.showExpandedAbbreviation имеет значение \"never\".",
-	"emmetIncludeLanguages": "Включает сокращения Emmet в языках, которые не поддерживаются по умолчанию. Здесь можно указать связь между не поддерживаемым и поддерживаемым языками.\nПример: {\"vue-html\": \"html\", \"javascript\": \"javascriptreact\"}",
-	"emmetVariables": "Переменные, которые будут использоваться во фрагментах Emmet",
-	"emmetTriggerExpansionOnTab": "Если этот параметр установлен, сокращения Emmet разворачиваются при нажатии клавиши TAB.",
-	"emmetPreferences": "Настройки, которые используются для изменения поведения некоторых действий и сопоставителей Emmet.",
-	"emmetPreferencesIntUnit": "Единица по умолчанию для целочисленных значений",
-	"emmetPreferencesFloatUnit": "Единица по умолчанию для значений с плавающей запятой",
-	"emmetPreferencesCssAfter": "Символ, который будет помещен в конце свойства CSS при развертывании сокращений CSS",
-	"emmetPreferencesSassAfter": "Символ, который будет помещен в конце свойства CSS при развертывании сокращений CSS в файлах Sass",
-	"emmetPreferencesStylusAfter": "Символ, который будет помещен в конце свойства CSS при развертывании сокращений CSS в файлах Stylus",
-	"emmetPreferencesCssBetween": "Символ, который будет помещен между свойством CSS и значением при развертывании сокращений CSS",
-	"emmetPreferencesSassBetween": "Символ, который будет помещен между свойством CSS и значением при развертывании сокращений CSS в файлах Sass",
-	"emmetPreferencesStylusBetween": "Символ, который будет помещен между свойством CSS и значением при развертывании сокращений CSS в файлах Stylus",
-	"emmetShowSuggestionsAsSnippets": "Если этот параметр имеет значение true, предложения Emmet будут отображаться в виде фрагментов, которые можно упорядочить с помощью параметра editor.snippetSuggestions.",
-	"emmetPreferencesBemElementSeparator": "Разделитель элемента для классов, используемый с фильтром BEM",
-	"emmetPreferencesBemModifierSeparator": "Разделитель модификатора для классов, используемый с фильтром BEM",
-	"emmetPreferencesFilterCommentBefore": "Определение комментария, который должен быть размещен перед соответствующим элементом при применении фильтра комментария.",
-	"emmetPreferencesFilterCommentAfter": "Определение комментария, который должен быть размещен после соответствующего элемента при применении фильтра комментария. ",
-	"emmetPreferencesFilterCommentTrigger": "Разделителями запятыми список имен атрибутов, которые должны присутствовать в сокращении для применения фильтра комментария",
-	"emmetPreferencesFormatNoIndentTags": "Массив имен тегов, для которых не следует использовать внутренние отступы",
-	"emmetPreferencesFormatForceIndentTags": "Массив имен тегов, для которых всегда следует использовать внутренние отступы",
-	"emmetPreferencesAllowCompactBoolean": "Если этот параметр имеет значение true, формируется компактная запись логических атрибутов",
-	"emmetPreferencesCssWebkitProperties": "Разделенный запятыми список свойств CSS, которые получают префикс разработчика \"webkit\" при использовании в сокращениях Emmet, которые начинаются с \"-\". Чтобы префикс  \"webkit\" никогда не подставлялся, установите в качестве этого параметра пустое значение.",
-	"emmetPreferencesCssMozProperties": "Разделенный запятыми список свойств CSS, которые получают префикс разработчика \"moz\" при использовании в сокращениях Emmet, которые начинаются с \"-\". Чтобы префикс \"moz\" никогда не подставлялся, установите в качестве этого параметра пустое значение. ",
-	"emmetPreferencesCssOProperties": "Разделенный запятыми список свойств CSS, которые получают префикс разработчика \"o\" при использовании в сокращениях Emmet, которые начинаются с \"-\". Чтобы префикс \"o\" никогда не подставлялся, установите в качестве этого параметра пустое значение. ",
-	"emmetPreferencesCssMsProperties": "Разделенный запятыми список свойств CSS, которые получают префикс разработчика \"ms\" при использовании в сокращениях Emmet, которые начинаются с \"-\". Чтобы префикс \"ms\" никогда не подставлялся, установите в качестве этого параметра пустое значение. ",
-	"emmetPreferencesCssFuzzySearchMinScore": "Минимальное количество очков для нечеткого соответствия сокращения (от 0 до 1). При указании более низких значений возможно увеличение числа ложных срабатываний, при указании более высоких значений - уменьшение числа возможных соответствий.",
-	"emmetOptimizeStylesheetParsing": "Если значение равно false, весь файл анализируется для определения, является ли текущая позиция допустимой для расширения сокращений Emmet. Когда присвоено значение true, только содержимое вокруг текущей позиции в файлах css/scss/less подвергается синтаксическому анализу."
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/extension-editing/out/extensionLinter.i18n.json b/i18n/rus/extensions/extension-editing/out/extensionLinter.i18n.json
deleted file mode 100644
index da9798c3142..00000000000
--- a/i18n/rus/extensions/extension-editing/out/extensionLinter.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"httpsRequired": "Изображения должны использовать протокол HTTPS.",
-	"svgsNotValid": "Файлы SVG не являются допустимым источником изображений.",
-	"embeddedSvgsNotValid": "Встроенные файлы SVG не являются допустимым источником изображений.",
-	"dataUrlsNotValid": "URL-адреса данных не являются допустимым источником изображений.",
-	"relativeUrlRequiresHttpsRepository": "Для использования относительных URL-адресов изображений необходимо указать в файле package.json репозиторий, обращение к которому осуществляется по протоколу HTTPS.",
-	"relativeIconUrlRequiresHttpsRepository": "Для этого значка необходимо указать в файле package.json репозиторий, обращение к которому осуществляется по протоколу HTTPS.",
-	"relativeBadgeUrlRequiresHttpsRepository": "Для использования относительных URL-адресов эмблем необходимо указать в файле package.json репозиторий, обращение к которому осуществляется по протоколу HTTPS. "
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/extension-editing/out/packageDocumentHelper.i18n.json b/i18n/rus/extensions/extension-editing/out/packageDocumentHelper.i18n.json
deleted file mode 100644
index f711023e7d6..00000000000
--- a/i18n/rus/extensions/extension-editing/out/packageDocumentHelper.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"languageSpecificEditorSettings": "Параметры редактора, определяемые языком",
-	"languageSpecificEditorSettingsDescription": "Переопределить параметры редактора для языка"
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/extension-editing/package.i18n.json b/i18n/rus/extensions/extension-editing/package.i18n.json
deleted file mode 100644
index 2ba8e0cacfc..00000000000
--- a/i18n/rus/extensions/extension-editing/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Изменение файла пакета",
-	"description": "Предоставляет IntelliSense для точек расширения VS Code и возможности жанров в файлах package.json."
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/fsharp/package.i18n.json b/i18n/rus/extensions/fsharp/package.i18n.json
deleted file mode 100644
index b862379da28..00000000000
--- a/i18n/rus/extensions/fsharp/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Основы языка F#",
-	"description": "Предоставляет фрагменты кода, подсветку синтаксиса, выделение парных скобок и сворачивание кода в файлах F#."
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/git/out/askpass-main.i18n.json b/i18n/rus/extensions/git/out/askpass-main.i18n.json
deleted file mode 100644
index a9f991ebfb6..00000000000
--- a/i18n/rus/extensions/git/out/askpass-main.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"missOrInvalid": "Учетные данные отсутствуют или недопустимы."
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/git/out/autofetch.i18n.json b/i18n/rus/extensions/git/out/autofetch.i18n.json
deleted file mode 100644
index 674a3834cc1..00000000000
--- a/i18n/rus/extensions/git/out/autofetch.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"yes": "Да",
-	"no": "Нет",
-	"not now": "Спросить меня позже",
-	"suggest auto fetch": "Вы хотите, чтобы среда Code [периодически выполняла команду \"git fetch\"]({0})?"
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/git/out/commands.i18n.json b/i18n/rus/extensions/git/out/commands.i18n.json
deleted file mode 100644
index bdd7adadfad..00000000000
--- a/i18n/rus/extensions/git/out/commands.i18n.json
+++ /dev/null
@@ -1,91 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"tag at": "Тег в {0}",
-	"remote branch at": "Удаленная ветвь в {0}",
-	"create branch": "$(plus) Создать новую ветвь",
-	"repourl": "URL-адрес репозитория",
-	"selectFolder": "Выбрать расположение репозитория",
-	"cloning": "Клонирование репозитория Git \"{0}\"...",
-	"proposeopen": "Вы хотите открыть клонированный репозиторий?",
-	"openrepo": "Открыть репозиторий",
-	"add": "Добавить в рабочую область",
-	"proposeopen2": "Вы хотите открыть клонированный репозиторий, или добавить его в текущую рабочую область?",
-	"init": "Выберите папку рабочей области для инициализации репозитория Git",
-	"init repo": "Инициализировать репозиторий",
-	"create repo": "Инициализировать репозиторий",
-	"are you sure": "В '{0}' будет создан репозиторий Git. Вы действительно хотите продолжить?",
-	"HEAD not available": "Версия HEAD '{0}' недоступна.",
-	"confirm stage files with merge conflicts": "Вы действительно хотите перенести в промежуточный этап файлы с конфликтами слияния ({0})?",
-	"confirm stage file with merge conflicts": "Вы действительно хотите перенести в промежуточный этап файлы с конфликтами слияния ({0})?",
-	"yes": "Да",
-	"confirm revert": "Вы действительно хотите отменить выбранные изменения в {0}?",
-	"revert": "Отменить изменения",
-	"discard": "Отменить изменения",
-	"confirm delete": "Вы действительно хотите удалить {0}?",
-	"delete file": "Удалить файл",
-	"confirm discard": "Вы действительно хотите отменить изменения в {0}?",
-	"confirm discard multiple": "Вы действительно хотите отменить изменения в файлах ({0})?",
-	"warn untracked": "Это приведет к удалению неотслеживаемых файлов ({0})!",
-	"confirm discard all single": "Вы действительно хотите отменить изменения в {0}?",
-	"confirm discard all": "Вы действительно хотите отменить все изменения в {0} файлах?\nОтменить эти действия нельзя!\nВаши текущие изменения будут утеряны.",
-	"discardAll multiple": "Отменить изменения в одном файле",
-	"discardAll": "Отменить изменения во всех файлах ({0})",
-	"confirm delete multiple": "Вы действительно хотите удалить файлы ({0})?",
-	"delete files": "Удалить файлы",
-	"there are untracked files single": "При отмене изменений для этого неотслеживаемого файла этот файл будет удален с диска: {0}.",
-	"there are untracked files": "Существует {0} неотслеживаемых файлов, которые будут удалены с диска в случае отмены изменений.",
-	"confirm discard all 2": "{0}\n\nОтменить это действие нельзя, текущие изменения будут утеряны.",
-	"yes discard tracked": "Отменить изменения для отслеживаемого файла",
-	"yes discard tracked multiple": "Отменить изменения для отслеживаемых файлов ({0})",
-	"unsaved files single": "Следующий файл не сохранен: {0}.\n\nВы хотите сохранить его перед тем как продолжить?",
-	"unsaved files": "Некоторые файлы ({0}) не сохранены.\n\nВы хотите сохранить их перед тем как продолжить?",
-	"save and commit": "Сохранить все и зафиксировать",
-	"commit": "Все равно зафиксировать",
-	"no staged changes": "Отсутствуют промежуточные изменения для фиксации.\n\nВы хотите сделать все изменения промежуточными и зафиксировать их напрямую?",
-	"always": "Всегда",
-	"no changes": "Нет изменений для фиксации.",
-	"commit message": "Сообщение о фиксации",
-	"provide commit message": "Введите сообщение фиксации.",
-	"select a ref to checkout": "Выберите ссылку для подсчета",
-	"branch name": "Имя ветви",
-	"provide branch name": "Укажите имя ветви.",
-	"select branch to delete": "Выберите ветвь для удаления",
-	"confirm force delete branch": "Ветвь '{0}' объединена не полностью. Удалить ее?",
-	"delete branch": "Удалить ветвь",
-	"invalid branch name": "Недопустимое имя ветви",
-	"branch already exists": "Ветви с именем '{0}' уже существует",
-	"select a branch to merge from": "Выберите ветвь для слияния",
-	"merge conflicts": "Обнаружены конфликты слияния. Устраните их перед фиксацией.",
-	"tag name": "Имя тега",
-	"provide tag name": "Укажите имя тега",
-	"tag message": "Сообщение",
-	"provide tag message": "Укажите сообщение для аннотирования тега",
-	"no remotes to fetch": "Для этого репозитория не настроены удаленные репозитории для получения данных.",
-	"no remotes to pull": "Для вашего репозитория не настроены удаленные репозитории для получения данных.",
-	"pick remote pull repo": "Выберите удаленный компьютер, с которого следует загрузить ветвь",
-	"no remotes to push": "Для вашего репозитория не настроены удаленные репозитории для отправки данных.",
-	"nobranch": "Извлеките ветвь, чтобы передать данные в удаленный репозиторий.",
-	"confirm publish branch": "В ветви '{0}' отсутствует восходящая ветвь. Вы хотите опубликовать эту ветвь?",
-	"ok": "ОК",
-	"push with tags success": "Файлы с тегами успешно отправлены.",
-	"pick remote": "Выберите удаленный сервер, на котором нужно опубликовать ветвь \"{0}\":",
-	"sync is unpredictable": "Это действие отправляет фиксации в \"{0}/{1}\" и извлекает их из этого расположения.",
-	"never again": "ОК, больше не показывать",
-	"no remotes to publish": "Для вашего репозитория не настроены удаленные репозитории для публикации.",
-	"no changes stash": "Отсутствуют изменения, которые необходимо спрятать.",
-	"provide stash message": "Укажите сообщение о скрытии",
-	"stash message": "Сообщение о скрытии",
-	"no stashes": "Отсутствуют спрятанные изменения, которые необходимо восстановить.",
-	"pick stash to pop": "Выберите спрятанное изменение для отображения",
-	"clean repo": "Очистите рабочее дерево репозитория перед извлечением.",
-	"cant push": "Не удается отправить ссылки в удаленный репозиторий. Сначала выберите \"Извлечь\", чтобы интегрировать изменения.",
-	"git error details": "Git: {0}",
-	"git error": "Ошибка Git",
-	"open git log": "Открыть журнал GIT"
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/git/out/main.i18n.json b/i18n/rus/extensions/git/out/main.i18n.json
deleted file mode 100644
index 3d91096bb1a..00000000000
--- a/i18n/rus/extensions/git/out/main.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"looking": "Поиск Git в: {0}",
-	"using git": "Использование GIT {0} из {1}",
-	"downloadgit": "Скачать Git",
-	"neverShowAgain": "Больше не показывать",
-	"notfound": "Git не найден. Установите Git или укажите путь к нему в параметре 'git.path'.",
-	"updateGit": "Обновить Git",
-	"git20": "У вас установлен Git {0}. Код лучше всего работает с Git >= 2."
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/git/out/model.i18n.json b/i18n/rus/extensions/git/out/model.i18n.json
deleted file mode 100644
index bfef65f2afd..00000000000
--- a/i18n/rus/extensions/git/out/model.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"too many submodules": "В репозитории '{0}' есть подмодули ({1}), которые не будут открыты автоматически. Вы можете открыть каждый подмодуль вручную, открыв соответствующий файл.",
-	"no repositories": "Доступные репозитории отсутствуют",
-	"pick repo": "Выберите репозиторий"
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/git/out/repository.i18n.json b/i18n/rus/extensions/git/out/repository.i18n.json
deleted file mode 100644
index 27ed60f95b9..00000000000
--- a/i18n/rus/extensions/git/out/repository.i18n.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"open": "Открыть",
-	"index modified": "Индекс изменен",
-	"modified": "Изменено",
-	"index added": "Индекс добавлен",
-	"index deleted": "Индекс удален",
-	"deleted": "Удалено",
-	"index renamed": "Индекс переименован",
-	"index copied": "Индекс скопирован",
-	"untracked": "Не отслеживается",
-	"ignored": "Проигнорировано",
-	"both deleted": "Удалено обеими сторонами",
-	"added by us": "Добавлено нами",
-	"deleted by them": "Удалено ими",
-	"added by them": "Добавлено ими",
-	"deleted by us": "Удалено нами",
-	"both added": "Добавлено обеими сторонами",
-	"both modified": "Изменено обеими сторонами",
-	"commitMessage": "Сообщение (чтобы зафиксировать, нажмите кнопку {0})",
-	"commit": "Commit",
-	"merge changes": "Объединить изменения",
-	"staged changes": "Промежуточно сохраненные изменения",
-	"changes": "Изменения",
-	"commitMessageCountdown": "Осталось {0} знаков в текущей строке",
-	"commitMessageWarning": "символов {0} над {1} в текущей строке",
-	"neveragain": "Больше не показывать",
-	"huge": "Репозиторий git в '{0}' имеет очень много активных изменений, только часть функций Git будет доступна."
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/git/out/scmProvider.i18n.json b/i18n/rus/extensions/git/out/scmProvider.i18n.json
deleted file mode 100644
index 7fded37328a..00000000000
--- a/i18n/rus/extensions/git/out/scmProvider.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"commit": "Commit"
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/git/out/statusbar.i18n.json b/i18n/rus/extensions/git/out/statusbar.i18n.json
deleted file mode 100644
index 3ac365ffb53..00000000000
--- a/i18n/rus/extensions/git/out/statusbar.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"checkout": "Извлечь...",
-	"sync changes": "Синхронизировать изменения",
-	"publish changes": "Опубликовать изменения",
-	"syncing changes": "Синхронизация изменений..."
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/git/package.i18n.json b/i18n/rus/extensions/git/package.i18n.json
deleted file mode 100644
index f033330e3d5..00000000000
--- a/i18n/rus/extensions/git/package.i18n.json
+++ /dev/null
@@ -1,87 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "GIT",
-	"description": "Интеграция SCM в Git",
-	"command.clone": "Клонировать",
-	"command.init": "Инициализировать репозиторий",
-	"command.close": "Закрыть репозиторий",
-	"command.refresh": "Обновить",
-	"command.openChange": "Открыть изменения",
-	"command.openFile": "Открыть файл",
-	"command.openHEADFile": "Открыть файл (заголовок)",
-	"command.stage": "Хранить промежуточные изменения",
-	"command.stageAll": "Хранить все промежуточные изменения",
-	"command.stageSelectedRanges": "Разместить выбранные диапазоны",
-	"command.revertSelectedRanges": "Отменить выбранные диапазоны",
-	"command.stageChange": "Сохранить изменение",
-	"command.revertChange": "Отменить изменение",
-	"command.unstage": "Отменить хранение промежуточных изменений",
-	"command.unstageAll": "Отменить хранение всех промежуточных изменений",
-	"command.unstageSelectedRanges": "Отменить размещение выбранных диапазонов",
-	"command.clean": "Отменить изменения",
-	"command.cleanAll": "Отменить все изменения",
-	"command.commit": "Commit",
-	"command.commitStaged": "Зафиксировать промежуточно сохраненные изменения",
-	"command.commitStagedSigned": "Зафиксировать промежуточные элементы (завершено)",
-	"command.commitStagedAmend": "Зафиксировать промежуточные (изменение)",
-	"command.commitAll": "Зафиксировать все",
-	"command.commitAllSigned": "Зафиксировать все (завершено)",
-	"command.commitAllAmend": "Зафиксировать все (изменение)",
-	"command.undoCommit": "Отменить последнюю фиксацию",
-	"command.checkout": "Извлечь в...",
-	"command.branch": "Создать ветвь...",
-	"command.deleteBranch": "Удалить ветвь...",
-	"command.renameBranch": "Переименовать ветвь...",
-	"command.merge": "Объединить ветвь...",
-	"command.createTag": "Создать тег",
-	"command.fetch": "Получить",
-	"command.pull": "Получить",
-	"command.pullRebase": "Получить (переместить изменения из одной ветви в другую)",
-	"command.pullFrom": "Загрузить с...",
-	"command.push": "Отправить",
-	"command.pushTo": "Отправить в:",
-	"command.pushWithTags": "Отправить с тегами",
-	"command.sync": "Синхронизация",
-	"command.syncRebase": "Синхронизация (перемещение изменений из одной ветви в другую)",
-	"command.publish": "Опубликовать ветвь",
-	"command.showOutput": "Показать выходные данные GIT",
-	"command.ignore": "Добавить файл в .gitignore",
-	"command.stashIncludeUntracked": "Спрятать (включить неотслеживаемые)",
-	"command.stash": "Спрятать",
-	"command.stashPop": "Извлечь спрятанное",
-	"command.stashPopLatest": "Извлечь последнее спрятанное",
-	"config.enabled": "Включен ли GIT",
-	"config.path": "Путь к исполняемому файлу GIT",
-	"config.autoRepositoryDetection": "Следует ли обнаруживать репозитории автоматически",
-	"config.autorefresh": "Включено ли автоматическое обновление",
-	"config.autofetch": "Включено ли автоматическое получение",
-	"config.enableLongCommitWarning": "Следует ли предупреждать о длинных сообщениях о фиксации",
-	"config.confirmSync": "Подтвердите синхронизацию репозиториев GIT.",
-	"config.countBadge": "\nУправляет счетчиком Git. При указании значения \"all\" подсчитываются все изменения, при указании значения \"tracked\" — только отслеживаемые изменения, при указании значения \"off\" счетчик отключается.",
-	"config.checkoutType": "Определяет типы ветвей, которые выводятся при выборе пункта меню \"Извлечь в...\". При указании значения \"all\" отображаются все ссылки, \"local\" — только локальные ветви, \"tags\" — только теги, а \"remote\" — только удаленные ветви.",
-	"config.ignoreLegacyWarning": "Игнорирует предупреждение об устаревшей версии Git",
-	"config.ignoreMissingGitWarning": "Игнорирует предупреждение об отсутствии Git",
-	"config.ignoreLimitWarning": "Игнорировать предупреждение, когда в репозитории слишком много изменений",
-	"config.defaultCloneDirectory": "Расположение по умолчанию, в которое будет клонирован репозиторий Git",
-	"config.enableSmartCommit": "Зафиксировать все изменения при отсутствии промежуточных изменений.",
-	"config.enableCommitSigning": "Включает подписывание фиксации с GPG.",
-	"config.discardAllScope": "Определяет, какие изменения отменяются с помощью команды \"Отменить все изменения\". При указании значения \"all\" отменяются все изменения, при указании значения \"tracked\" отменяются изменения только в отслеживаемых файлах, при указании значения \"prompt\" отображается окно подтверждения каждый раз при выполнении действия.",
-	"config.decorations.enabled": "Управляет тем, используются ли цвета и эмблемы Git в проводнике и открытых представлениях редактора.",
-	"config.promptToSaveFilesBeforeCommit": "Определяет, должен ли Git проверять несохраненные файлы перед фиксацией.",
-	"config.showInlineOpenFileAction": "Определяет, должно ли отображаться интерактивное действие \"Открыть файл\" в представлении \"Изменения Git\".",
-	"config.inputValidation": "Определяет, следует ли проверять введенные данные в сообщении фиксации.",
-	"config.detectSubmodules": "Определяет, следует ли автоматически определять подмодули Git.",
-	"config.detectSubmodulesLimit": "Управляет ограничением на количество обнаруженных подмодулей Git.",
-	"colors.modified": "Цвет измененных ресурсов.",
-	"colors.deleted": "Цвет удаленных ресурсов.",
-	"colors.untracked": "Цвет неотслеживаемых ресурсов.",
-	"colors.ignored": "Цвет игнорируемых ресурсов.",
-	"colors.conflict": "Цвет ресурсов с конфликтами.",
-	"colors.submodule": "Цвет ресурсов подмодуля."
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/go/package.i18n.json b/i18n/rus/extensions/go/package.i18n.json
deleted file mode 100644
index 0cc4f6e091c..00000000000
--- a/i18n/rus/extensions/go/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Основы языка Go",
-	"description": "Предоставляет подсветку синтаксиса и выделение парных скобок в файлах Go."
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/groovy/package.i18n.json b/i18n/rus/extensions/groovy/package.i18n.json
deleted file mode 100644
index 44f08597876..00000000000
--- a/i18n/rus/extensions/groovy/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Основы языка Groovy",
-	"description": "Предоставляет фрагменты кода, подсветку синтаксиса и выделение парных скобок в файлах Groovy."
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/grunt/out/main.i18n.json b/i18n/rus/extensions/grunt/out/main.i18n.json
deleted file mode 100644
index 41900393afd..00000000000
--- a/i18n/rus/extensions/grunt/out/main.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"execFailed": "Не удалось автоматически определить задания Grunt для папки {0}. Ошибка: {1}"
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/grunt/package.i18n.json b/i18n/rus/extensions/grunt/package.i18n.json
deleted file mode 100644
index 2504e925152..00000000000
--- a/i18n/rus/extensions/grunt/package.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"description": "Разрешение для добавления возможностей Grunt в VSCode.",
-	"displayName": "Поддержка Grunt для VSCode",
-	"config.grunt.autoDetect": "Включает или отключает автоматическое определние заданий Grunt. Значение по умолчанию — \"включено\".",
-	"grunt.taskDefinition.type.description": "Задача Grunt для изменения. ",
-	"grunt.taskDefinition.file.description": "Файл Grunt, в котором находится задача. Можно опустить."
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/gulp/out/main.i18n.json b/i18n/rus/extensions/gulp/out/main.i18n.json
deleted file mode 100644
index 08a7f70824a..00000000000
--- a/i18n/rus/extensions/gulp/out/main.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"execFailed": "Не удалось автоматически определить задания gulp для папки {0}. Ошибка: {1}"
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/gulp/package.i18n.json b/i18n/rus/extensions/gulp/package.i18n.json
deleted file mode 100644
index 7f722b7833a..00000000000
--- a/i18n/rus/extensions/gulp/package.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"description": "Разрешение для добавления возможностей Gulp в VSCode.",
-	"displayName": "Поддержка Gulp для VSCode",
-	"config.gulp.autoDetect": "Включает или отключает автоматическое определение заданий Gulp. Значение по умолчанию — \"включено\".",
-	"gulp.taskDefinition.type.description": "Задача Gulp для изменения.",
-	"gulp.taskDefinition.file.description": "Файл Gulp, в котором находится задача. Можно опустить."
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/handlebars/package.i18n.json b/i18n/rus/extensions/handlebars/package.i18n.json
deleted file mode 100644
index 1662c9c5694..00000000000
--- a/i18n/rus/extensions/handlebars/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Основы языка Handlebars",
-	"description": "Предоставляет подсветку синтаксиса и выделение парных скобок в файлах Handlebars."
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/hlsl/package.i18n.json b/i18n/rus/extensions/hlsl/package.i18n.json
deleted file mode 100644
index ca51def45b1..00000000000
--- a/i18n/rus/extensions/hlsl/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Основы языка HLSL",
-	"description": "Предоставляет подсветку синтаксиса и выделение парных скобок в файлах HLSL."
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/html-language-features/client/out/htmlMain.i18n.json b/i18n/rus/extensions/html-language-features/client/out/htmlMain.i18n.json
deleted file mode 100644
index 113482bb267..00000000000
--- a/i18n/rus/extensions/html-language-features/client/out/htmlMain.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"htmlserver.name": "Языковой сервер HTML",
-	"folding.start": "Начало сворачиваемого региона",
-	"folding.end": "Окончание сворачиваемого региона"
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/html-language-features/package.i18n.json b/i18n/rus/extensions/html-language-features/package.i18n.json
deleted file mode 100644
index ffedf2c26a3..00000000000
--- a/i18n/rus/extensions/html-language-features/package.i18n.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Возможности языка HTML",
-	"description": "Предоставляет широкую поддержку языка для файлов HTML, Razor и Handlebar.",
-	"html.format.enable.desc": "Включить/отключить модуль форматирования HTML по умолчанию",
-	"html.format.wrapLineLength.desc": "Максимальное число символов на строку (0 — отключить).",
-	"html.format.unformatted.desc": "Список тегов, которые не следует повторно форматировать, с разделителями-запятыми. Значение \"NULL\" по умолчанию означает все теги, перечисленные на странице https://www.w3.org/TR/html5/dom.html#phrasing-content.",
-	"html.format.contentUnformatted.desc": "Разделенный запятыми список тегов, в которых формат содержимого не должен изменяться. Значение null задается по умолчанию для тега pre.",
-	"html.format.indentInnerHtml.desc": "Отступ в разделах <head> и <body>.",
-	"html.format.preserveNewLines.desc": "Следует ли сохранять разрывы строк перед элементами. Работает только перед элементами, а не внутри тегов или для текста.",
-	"html.format.maxPreserveNewLines.desc": "Максимальное число разрывов строк для сохранения в блоке. Чтобы указать неограниченное число строк, используйте \"null\".",
-	"html.format.indentHandlebars.desc": "Формат и отступ {{#foo}} и {{/foo}}.",
-	"html.format.endWithNewline.desc": "Завершение символом новой строки.",
-	"html.format.extraLiners.desc": "Список тегов с разделителями-запятыми и дополнительными новыми строками между ними. Значение \"null\" по умолчанию ставится для \"head, body, /html\".",
-	"html.format.wrapAttributes.desc": "Перенос атрибутов.",
-	"html.format.wrapAttributes.auto": "Перенос атрибутов только при превышении длины строки.",
-	"html.format.wrapAttributes.force": "Перенос всех атрибутов, кроме первого.",
-	"html.format.wrapAttributes.forcealign": "Перенос всех атрибутов, кроме первого, и сохранение выравнивания.",
-	"html.format.wrapAttributes.forcemultiline": "Перенос всех атрибутов.",
-	"html.suggest.angular1.desc": "Определяет, будет ли встроенная поддержка языка HTML предлагать теги и свойства Angular 1.",
-	"html.suggest.ionic.desc": "Определяет, будет ли встроенная поддержка языка HTML предлагать теги, свойства и значения Ionic.",
-	"html.suggest.html5.desc": "Определяет, будет ли встроенная поддержка языка HTML предлагать теги, свойства и значения HTML5.",
-	"html.trace.server.desc": "Отслеживает обмен данными между VS Code и языковым сервером HTML. ",
-	"html.validate.scripts": "Определяет, будет ли встроенная поддержка языка HTML проверять внедренные сценарии.",
-	"html.validate.styles": "Определяет, будет ли встроенная поддержка языка HTML проверять внедренные стили.",
-	"html.autoClosingTags": "Включить или отключить автоматическое закрытие тегов HTML. "
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/html/client/out/htmlMain.i18n.json b/i18n/rus/extensions/html/client/out/htmlMain.i18n.json
deleted file mode 100644
index 113482bb267..00000000000
--- a/i18n/rus/extensions/html/client/out/htmlMain.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"htmlserver.name": "Языковой сервер HTML",
-	"folding.start": "Начало сворачиваемого региона",
-	"folding.end": "Окончание сворачиваемого региона"
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/html/package.i18n.json b/i18n/rus/extensions/html/package.i18n.json
deleted file mode 100644
index 42837cfec9d..00000000000
--- a/i18n/rus/extensions/html/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Основы языка HTML",
-	"description": "Обеспечивает подсветку синтаксиса, выделение парных скобок и сниппеты в HTML-файлах."
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/ini/package.i18n.json b/i18n/rus/extensions/ini/package.i18n.json
deleted file mode 100644
index c69b4bb1ee6..00000000000
--- a/i18n/rus/extensions/ini/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Основы языка Ini",
-	"description": "Предоставляет подсветку синтаксиса и выделение парных скобок в файлах Ini."
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/jake/out/main.i18n.json b/i18n/rus/extensions/jake/out/main.i18n.json
deleted file mode 100644
index 9870397c070..00000000000
--- a/i18n/rus/extensions/jake/out/main.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"execFailed": "Не удалось автоматически определить задания Jake для папки {0}. Ошибка: {1}"
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/jake/package.i18n.json b/i18n/rus/extensions/jake/package.i18n.json
deleted file mode 100644
index ab0adebfd19..00000000000
--- a/i18n/rus/extensions/jake/package.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"description": "Разрешение для добавления возможностей Jake в VSCode.",
-	"displayName": "Поддержка Jake для VSCode",
-	"jake.taskDefinition.type.description": "Задача Jake для изменения.",
-	"jake.taskDefinition.file.description": "Файл Jake, в котором находится задача. Можно опустить.",
-	"config.jake.autoDetect": "Включает или отключает автоматическое определение заданий Jake. Значение по умолчанию — \"включено\"."
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/java/package.i18n.json b/i18n/rus/extensions/java/package.i18n.json
deleted file mode 100644
index 89065dbdbb7..00000000000
--- a/i18n/rus/extensions/java/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Основы языка Java",
-	"description": "Предоставляет фрагменты кода, подсветку синтаксиса, выделение парных скобок и сворачивание кода в файлах Java."
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/javascript/out/features/bowerJSONContribution.i18n.json b/i18n/rus/extensions/javascript/out/features/bowerJSONContribution.i18n.json
deleted file mode 100644
index a72b0dc2f3a..00000000000
--- a/i18n/rus/extensions/javascript/out/features/bowerJSONContribution.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"json.bower.default": "Bower.json по умолчанию",
-	"json.bower.error.repoaccess": "Сбой запроса в репозиторий Bower: {0}",
-	"json.bower.latest.version": "последняя"
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/javascript/out/features/packageJSONContribution.i18n.json b/i18n/rus/extensions/javascript/out/features/packageJSONContribution.i18n.json
deleted file mode 100644
index 461ca9da365..00000000000
--- a/i18n/rus/extensions/javascript/out/features/packageJSONContribution.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"json.package.default": "Файл package.json по умолчанию",
-	"json.npm.error.repoaccess": "Сбой запроса в репозиторий NPM: {0}",
-	"json.npm.latestversion": "Последняя версия пакета на данный момент",
-	"json.npm.majorversion": "Соответствует последнему основному номеру версии (1.x.x).",
-	"json.npm.minorversion": "Соответствует последнему дополнительному номеру версии (1.2.x).",
-	"json.npm.version.hover": "Последняя версия: {0}"
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/javascript/package.i18n.json b/i18n/rus/extensions/javascript/package.i18n.json
deleted file mode 100644
index 40babee160e..00000000000
--- a/i18n/rus/extensions/javascript/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Основы языка JavaScript",
-	"description": "Предоставляет фрагменты кода, подсветку синтаксиса, выделение парных скобок и сворачивание кода в файлах JavaScript."
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/json-language-features/client/out/jsonMain.i18n.json b/i18n/rus/extensions/json-language-features/client/out/jsonMain.i18n.json
deleted file mode 100644
index ae46a81e4e9..00000000000
--- a/i18n/rus/extensions/json-language-features/client/out/jsonMain.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"jsonserver.name": "Языковой сервер JSON"
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/json-language-features/package.i18n.json b/i18n/rus/extensions/json-language-features/package.i18n.json
deleted file mode 100644
index c12c7e1110d..00000000000
--- a/i18n/rus/extensions/json-language-features/package.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Возможности языка JSON",
-	"description": "Предоставляет широкую поддержку языка для файлов JSON.",
-	"json.schemas.desc": "Связь схем с JSON-файлами в текущем проекте",
-	"json.schemas.url.desc": "URL-адрес схемы или относительный путь к ней в текущем каталоге",
-	"json.schemas.fileMatch.desc": "Массив шаблонов файлов, с которым выполняется сравнение, при разрешении JSON-файлов в схемах.",
-	"json.schemas.fileMatch.item.desc": "Шаблон файла, который может содержать \"*\" и с которым выполняется сравнение, при разрешении JSON-файлов в схемах.",
-	"json.schemas.schema.desc": "Определение схемы для указанного URL-адреса. Схему необходимо указать только для того, чтобы не обращаться по URL-адресу схемы.",
-	"json.format.enable.desc": "Включение или отключение модуля форматирования JSON по умолчанию (требуется перезагрузка)",
-	"json.tracing.desc": "Отслеживает связь между VS Code и языковым сервером JSON.",
-	"json.colorDecorators.enable.desc": "Включает или отключает декораторы цвета",
-	"json.colorDecorators.enable.deprecationMessage": "Параметр \"json.colorDecorators.enable\" устарел. Теперь вместо него используется параметр \"editor.colorDecorators\"."
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/json/client/out/jsonMain.i18n.json b/i18n/rus/extensions/json/client/out/jsonMain.i18n.json
deleted file mode 100644
index ae46a81e4e9..00000000000
--- a/i18n/rus/extensions/json/client/out/jsonMain.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"jsonserver.name": "Языковой сервер JSON"
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/json/package.i18n.json b/i18n/rus/extensions/json/package.i18n.json
deleted file mode 100644
index 85f61bdfc1a..00000000000
--- a/i18n/rus/extensions/json/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Основы языка JSON",
-	"description": "Обеспечивает подсветку синтаксиса и выделение парных скобок в файлах JSON."
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/less/package.i18n.json b/i18n/rus/extensions/less/package.i18n.json
deleted file mode 100644
index eac08cd4a1e..00000000000
--- a/i18n/rus/extensions/less/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Основы языка Less",
-	"description": "Предоставляет подсветку синтаксиса, выделение парных скобок и сворачивание кода в файлах Less."
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/log/package.i18n.json b/i18n/rus/extensions/log/package.i18n.json
deleted file mode 100644
index ec12c8a5b37..00000000000
--- a/i18n/rus/extensions/log/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Журнал",
-	"description": "Предоставляет подсветку синтаксиса для файлов с расширением .log."
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/lua/package.i18n.json b/i18n/rus/extensions/lua/package.i18n.json
deleted file mode 100644
index 780caae1742..00000000000
--- a/i18n/rus/extensions/lua/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Основы языка Lua",
-	"description": "Предоставляет подсветку синтаксиса и выделение парных скобок в файлах Lua."
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/make/package.i18n.json b/i18n/rus/extensions/make/package.i18n.json
deleted file mode 100644
index bc2f2b27d4a..00000000000
--- a/i18n/rus/extensions/make/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Основы языка Make",
-	"description": "Предоставляет фрагменты кода, подсветку синтаксиса, выделение парных скобок и сворачивание кода в файлах Make."
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/markdown-basics/package.i18n.json b/i18n/rus/extensions/markdown-basics/package.i18n.json
deleted file mode 100644
index d41fad11200..00000000000
--- a/i18n/rus/extensions/markdown-basics/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Основы языка Markdown",
-	"description": "Предоставляет фрагменты кода и подсветку синтаксиса для файлов Markdown."
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json b/i18n/rus/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json
deleted file mode 100644
index b4a71726277..00000000000
--- a/i18n/rus/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"onPreviewStyleLoadError": "Не удалось загрузить 'markdown.styles': {0}"
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/markdown-language-features/out/features/preview.i18n.json b/i18n/rus/extensions/markdown-language-features/out/features/preview.i18n.json
deleted file mode 100644
index 5788adc61fe..00000000000
--- a/i18n/rus/extensions/markdown-language-features/out/features/preview.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"lockedPreviewTitle": "[Предварительный просмотр] {0}",
-	"previewTitle": "Открыть {0} для предварительного просмотра"
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/markdown-language-features/out/features/previewContentProvider.i18n.json b/i18n/rus/extensions/markdown-language-features/out/features/previewContentProvider.i18n.json
deleted file mode 100644
index 01fb924a326..00000000000
--- a/i18n/rus/extensions/markdown-language-features/out/features/previewContentProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"preview.securityMessage.text": "Некоторое содержимое в этом документе было отключено",
-	"preview.securityMessage.title": "В предварительном просмотре Markdown было отключено потенциально опасное или ненадежное содержимое. Чтобы разрешить ненадежное содержимое или включить сценарии, измените параметры безопасности предварительного просмотра Markdown.",
-	"preview.securityMessage.label": "Предупреждение безопасности об отключении содержимого"
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/markdown-language-features/out/security.i18n.json b/i18n/rus/extensions/markdown-language-features/out/security.i18n.json
deleted file mode 100644
index d51d2ea286d..00000000000
--- a/i18n/rus/extensions/markdown-language-features/out/security.i18n.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"strict.title": "Строгий",
-	"strict.description": "Загружать только безопасное содержимое",
-	"insecureLocalContent.title": "Разрешить небезопасное локальное содержимое",
-	"insecureLocalContent.description": "Включить загрузку содержимого через HTTP из localhost",
-	"insecureContent.title": "Разрешить небезопасное содержимое",
-	"insecureContent.description": "Включить загрузку содержимого через HTTP",
-	"disable.title": "Отключить",
-	"disable.description": "Разрешить все содержимое и выполнение сценариев. Не рекомендуется",
-	"moreInfo.title": "Дополнительные сведения",
-	"enableSecurityWarning.title": "Включить предварительный просмотр предупреждений системы безопасности в этой рабочей области",
-	"disableSecurityWarning.title": "Отключить предварительный просмотр предупреждений системы безопасности в этой рабочей области",
-	"toggleSecurityWarning.description": "Не влияет на уровень безопасности содержимого",
-	"preview.showPreviewSecuritySelector.title": "Установите параметры безопасности для предварительного просмотра Markdown в этой рабочей области"
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/markdown-language-features/package.i18n.json b/i18n/rus/extensions/markdown-language-features/package.i18n.json
deleted file mode 100644
index 0c205858212..00000000000
--- a/i18n/rus/extensions/markdown-language-features/package.i18n.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Возможности языка Markdown",
-	"description": "Предоставляет широкую поддержку языка для Markdown.",
-	"markdown.preview.breaks.desc": "Определяет, как переносы строк отображаются в области предварительного просмотра файла Markdown. Если установить этот параметр в значение 'true', <br>будут создаваться для каждой новой строки.",
-	"markdown.preview.linkify": "Включить или отключить преобразование текста в URL для предварительного просмотра Markdown.",
-	"markdown.preview.doubleClickToSwitchToEditor.desc": "Двойной щелчок в области предварительного просмотра Markdown в редакторе.",
-	"markdown.preview.fontFamily.desc": "Определяет семейство шрифтов, используемое в области предварительного просмотра файла Markdown.",
-	"markdown.preview.fontSize.desc": "Определяет размер шрифта (в пикселях), используемый в области предварительного просмотра файла Markdown.",
-	"markdown.preview.lineHeight.desc": "Определяет высоту строки, используемую в области предварительного просмотра файла Markdown. Это значение задается относительно размера шрифта.",
-	"markdown.preview.markEditorSelection.desc": "Выделение выбранного в текущем редакторе в предпросмотре Markdown.",
-	"markdown.preview.scrollEditorWithPreview.desc": "Обновить представление редактора при прокрутке предварительного просмотра Markdown.",
-	"markdown.preview.scrollPreviewWithEditor.desc": "Обновить представление предварительного просмотра при прокрутке редактора Markdown.",
-	"markdown.preview.scrollPreviewWithEditorSelection.desc": "[Устаревшая функция] Прокрутка предварительного просмотра Markdown до выбранной строки в редакторе.",
-	"markdown.preview.scrollPreviewWithEditorSelection.deprecationMessage": "Этот параметр был заменен на 'markdown.preview.scrollPreviewWithEditor' и больше не используется.",
-	"markdown.preview.title": "Открыть область предварительного просмотра",
-	"markdown.previewFrontMatter.dec": "Определяет обработку титульных листов YAML в области предварительного просмотра файла Markdown. Значение \"скрыть\" удаляет титульные листы. В противном случае титульные листы обрабатываются как содержимое файла Markdown.",
-	"markdown.previewSide.title": "Открыть область предварительного просмотра сбоку",
-	"markdown.showLockedPreviewToSide.title": "Открыть заблокированную область предварительного просмотра сбоку",
-	"markdown.showSource.title": "Показать источник",
-	"markdown.styles.dec": "Список URL-адресов или локальных путей к таблицам стилей CSS, используемых из области предварительного просмотра файла Markdown. Относительные пути интерпретируются относительно папки, открытой в проводнике. Если папка не открыта, они интерпретируются относительно расположения файла Markdown. Все символы '\\' должны записываться в виде '\\\\'.",
-	"markdown.showPreviewSecuritySelector.title": "Изменить параметры безопасности для предварительного просмотра",
-	"markdown.trace.desc": "Включить ведение журнала отладки для расширения Markdown.",
-	"markdown.preview.refresh.title": "Обновить область предварительного просмотра",
-	"markdown.preview.toggleLock.title": "Включить/отключить блокировку области предварительного просмотра"
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/markdown/out/commands.i18n.json b/i18n/rus/extensions/markdown/out/commands.i18n.json
deleted file mode 100644
index e57835dcf96..00000000000
--- a/i18n/rus/extensions/markdown/out/commands.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"previewTitle": "Предварительный просмотр {0}",
-	"onPreviewStyleLoadError": "Не удалось загрузить 'markdown.styles': {0}"
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/markdown/out/commands/onPreviewStyleLoadError.i18n.json b/i18n/rus/extensions/markdown/out/commands/onPreviewStyleLoadError.i18n.json
deleted file mode 100644
index b4a71726277..00000000000
--- a/i18n/rus/extensions/markdown/out/commands/onPreviewStyleLoadError.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"onPreviewStyleLoadError": "Не удалось загрузить 'markdown.styles': {0}"
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/markdown/out/extension.i18n.json b/i18n/rus/extensions/markdown/out/extension.i18n.json
deleted file mode 100644
index 5a81b95de6e..00000000000
--- a/i18n/rus/extensions/markdown/out/extension.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"onPreviewStyleLoadError": "Не удалось загрузить 'markdown.styles': {0}",
-	"previewTitle": "Предварительный просмотр {0}"
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/markdown/out/features/preview.i18n.json b/i18n/rus/extensions/markdown/out/features/preview.i18n.json
deleted file mode 100644
index b3ffeb70b7a..00000000000
--- a/i18n/rus/extensions/markdown/out/features/preview.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"lockedPreviewTitle": "[Предварительный просмотр] {0}",
-	"previewTitle": "Предварительный просмотр {0}"
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/markdown/out/features/previewContentProvider.i18n.json b/i18n/rus/extensions/markdown/out/features/previewContentProvider.i18n.json
deleted file mode 100644
index 01fb924a326..00000000000
--- a/i18n/rus/extensions/markdown/out/features/previewContentProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"preview.securityMessage.text": "Некоторое содержимое в этом документе было отключено",
-	"preview.securityMessage.title": "В предварительном просмотре Markdown было отключено потенциально опасное или ненадежное содержимое. Чтобы разрешить ненадежное содержимое или включить сценарии, измените параметры безопасности предварительного просмотра Markdown.",
-	"preview.securityMessage.label": "Предупреждение безопасности об отключении содержимого"
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/markdown/out/previewContentProvider.i18n.json b/i18n/rus/extensions/markdown/out/previewContentProvider.i18n.json
deleted file mode 100644
index 62ff186c858..00000000000
--- a/i18n/rus/extensions/markdown/out/previewContentProvider.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"preview.securityMessage.text": "Некоторое содержимое в этом документе было отключено",
-	"preview.securityMessage.title": "В предварительном просмотре Markdown было отключено потенциально опасное или ненадежное содержимое. Чтобы разрешить ненадежное содержимое или включить сценарии, измените параметры безопасности предварительного просмотра Markdown.",
-	"preview.securityMessage.label": "Предупреждение безопасности об отключении содержимого"
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/markdown/out/security.i18n.json b/i18n/rus/extensions/markdown/out/security.i18n.json
deleted file mode 100644
index e57fedc24d6..00000000000
--- a/i18n/rus/extensions/markdown/out/security.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"strict.title": "Строгий",
-	"strict.description": "Загружать только безопасное содержимое",
-	"insecureContent.title": "Разрешить небезопасное содержимое",
-	"insecureContent.description": "Включить загрузку содержимого через HTTP",
-	"disable.title": "Отключить",
-	"disable.description": "Разрешить все содержимое и выполнение сценариев. Не рекомендуется",
-	"moreInfo.title": "Дополнительные сведения",
-	"enableSecurityWarning.title": "Включить предварительный просмотр предупреждений системы безопасности в этой рабочей области",
-	"disableSecurityWarning.title": "Отключить предварительный просмотр предупреждений системы безопасности в этой рабочей области",
-	"toggleSecurityWarning.description": "Не влияет на уровень безопасности содержимого",
-	"preview.showPreviewSecuritySelector.title": "Установите параметры безопасности для предварительного просмотра Markdown в этой рабочей области"
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/markdown/package.i18n.json b/i18n/rus/extensions/markdown/package.i18n.json
deleted file mode 100644
index 0c205858212..00000000000
--- a/i18n/rus/extensions/markdown/package.i18n.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Возможности языка Markdown",
-	"description": "Предоставляет широкую поддержку языка для Markdown.",
-	"markdown.preview.breaks.desc": "Определяет, как переносы строк отображаются в области предварительного просмотра файла Markdown. Если установить этот параметр в значение 'true', <br>будут создаваться для каждой новой строки.",
-	"markdown.preview.linkify": "Включить или отключить преобразование текста в URL для предварительного просмотра Markdown.",
-	"markdown.preview.doubleClickToSwitchToEditor.desc": "Двойной щелчок в области предварительного просмотра Markdown в редакторе.",
-	"markdown.preview.fontFamily.desc": "Определяет семейство шрифтов, используемое в области предварительного просмотра файла Markdown.",
-	"markdown.preview.fontSize.desc": "Определяет размер шрифта (в пикселях), используемый в области предварительного просмотра файла Markdown.",
-	"markdown.preview.lineHeight.desc": "Определяет высоту строки, используемую в области предварительного просмотра файла Markdown. Это значение задается относительно размера шрифта.",
-	"markdown.preview.markEditorSelection.desc": "Выделение выбранного в текущем редакторе в предпросмотре Markdown.",
-	"markdown.preview.scrollEditorWithPreview.desc": "Обновить представление редактора при прокрутке предварительного просмотра Markdown.",
-	"markdown.preview.scrollPreviewWithEditor.desc": "Обновить представление предварительного просмотра при прокрутке редактора Markdown.",
-	"markdown.preview.scrollPreviewWithEditorSelection.desc": "[Устаревшая функция] Прокрутка предварительного просмотра Markdown до выбранной строки в редакторе.",
-	"markdown.preview.scrollPreviewWithEditorSelection.deprecationMessage": "Этот параметр был заменен на 'markdown.preview.scrollPreviewWithEditor' и больше не используется.",
-	"markdown.preview.title": "Открыть область предварительного просмотра",
-	"markdown.previewFrontMatter.dec": "Определяет обработку титульных листов YAML в области предварительного просмотра файла Markdown. Значение \"скрыть\" удаляет титульные листы. В противном случае титульные листы обрабатываются как содержимое файла Markdown.",
-	"markdown.previewSide.title": "Открыть область предварительного просмотра сбоку",
-	"markdown.showLockedPreviewToSide.title": "Открыть заблокированную область предварительного просмотра сбоку",
-	"markdown.showSource.title": "Показать источник",
-	"markdown.styles.dec": "Список URL-адресов или локальных путей к таблицам стилей CSS, используемых из области предварительного просмотра файла Markdown. Относительные пути интерпретируются относительно папки, открытой в проводнике. Если папка не открыта, они интерпретируются относительно расположения файла Markdown. Все символы '\\' должны записываться в виде '\\\\'.",
-	"markdown.showPreviewSecuritySelector.title": "Изменить параметры безопасности для предварительного просмотра",
-	"markdown.trace.desc": "Включить ведение журнала отладки для расширения Markdown.",
-	"markdown.preview.refresh.title": "Обновить область предварительного просмотра",
-	"markdown.preview.toggleLock.title": "Включить/отключить блокировку области предварительного просмотра"
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/merge-conflict/out/codelensProvider.i18n.json b/i18n/rus/extensions/merge-conflict/out/codelensProvider.i18n.json
deleted file mode 100644
index d480fc71c6b..00000000000
--- a/i18n/rus/extensions/merge-conflict/out/codelensProvider.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"acceptCurrentChange": "Принять текущее изменение",
-	"acceptIncomingChange": "Принять входящее изменение",
-	"acceptBothChanges": "Принять оба изменения",
-	"compareChanges": "Сравнить изменения"
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/merge-conflict/out/commandHandler.i18n.json b/i18n/rus/extensions/merge-conflict/out/commandHandler.i18n.json
deleted file mode 100644
index bfbfdfd654b..00000000000
--- a/i18n/rus/extensions/merge-conflict/out/commandHandler.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"cursorNotInConflict": "Курсор не находится на конфликте объединения",
-	"compareChangesTitle": "{0}: текущие изменения ⟷ входящие изменения",
-	"cursorOnCommonAncestorsRange": "Курсор редактора находится в блоке общих предков. Переместите его в блок \"Текущее\" или \"Входящее\"",
-	"cursorOnSplitterRange": "Курсор редактора находится на разделителе блока объединения конфликтов. Переместите его в блок \"Текущее\" или \"Входящее\"",
-	"noConflicts": "Конфликтов объединения в этом файле не обнаружено",
-	"noOtherConflictsInThisFile": "Других конфликтов объединения в этом файле не обнаружено"
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/merge-conflict/out/mergeDecorator.i18n.json b/i18n/rus/extensions/merge-conflict/out/mergeDecorator.i18n.json
deleted file mode 100644
index 4f367289770..00000000000
--- a/i18n/rus/extensions/merge-conflict/out/mergeDecorator.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"currentChange": "(текущее изменение)",
-	"incomingChange": "(входящее изменение)"
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/merge-conflict/package.i18n.json b/i18n/rus/extensions/merge-conflict/package.i18n.json
deleted file mode 100644
index 617fa5e579f..00000000000
--- a/i18n/rus/extensions/merge-conflict/package.i18n.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Объединить конфликт",
-	"description": "Выделение и команды для внутренних конфликтов слияния.",
-	"command.category": "Объединить конфликт",
-	"command.accept.all-current": "Принять все текущие",
-	"command.accept.all-incoming": "Принять все входящие",
-	"command.accept.all-both": "Принять все входящие и текущие",
-	"command.accept.current": "Принять текущее",
-	"command.accept.incoming": "Принять входящее",
-	"command.accept.selection": "Принять выделенное",
-	"command.accept.both": "Принять оба",
-	"command.next": "Следующий конфликт",
-	"command.previous": "Предыдущий конфликт",
-	"command.compare": "Сравнить текущий конфликт",
-	"config.title": "Объединить конфликт",
-	"config.codeLensEnabled": "Включить/отключить блок объединения конфликтов CodeLens в редакторе",
-	"config.decoratorsEnabled": "Включить/отключить декораторы объединения конфликтов в редакторе"
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/npm/out/features/bowerJSONContribution.i18n.json b/i18n/rus/extensions/npm/out/features/bowerJSONContribution.i18n.json
deleted file mode 100644
index a72b0dc2f3a..00000000000
--- a/i18n/rus/extensions/npm/out/features/bowerJSONContribution.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"json.bower.default": "Bower.json по умолчанию",
-	"json.bower.error.repoaccess": "Сбой запроса в репозиторий Bower: {0}",
-	"json.bower.latest.version": "последняя"
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/npm/out/features/packageJSONContribution.i18n.json b/i18n/rus/extensions/npm/out/features/packageJSONContribution.i18n.json
deleted file mode 100644
index 461ca9da365..00000000000
--- a/i18n/rus/extensions/npm/out/features/packageJSONContribution.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"json.package.default": "Файл package.json по умолчанию",
-	"json.npm.error.repoaccess": "Сбой запроса в репозиторий NPM: {0}",
-	"json.npm.latestversion": "Последняя версия пакета на данный момент",
-	"json.npm.majorversion": "Соответствует последнему основному номеру версии (1.x.x).",
-	"json.npm.minorversion": "Соответствует последнему дополнительному номеру версии (1.2.x).",
-	"json.npm.version.hover": "Последняя версия: {0}"
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/npm/out/main.i18n.json b/i18n/rus/extensions/npm/out/main.i18n.json
deleted file mode 100644
index df41ba3c218..00000000000
--- a/i18n/rus/extensions/npm/out/main.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"npm.parseError": "Определение задач npm: не удалось проанализировать файл {0} "
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/npm/out/npmView.i18n.json b/i18n/rus/extensions/npm/out/npmView.i18n.json
deleted file mode 100644
index 1d9c06d37c0..00000000000
--- a/i18n/rus/extensions/npm/out/npmView.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noScripts": "Сценарии не найдены",
-	"noDebugOptions": "Не удалось запустить \"{0}\" для отладки, так как в сценариях отсутствует параметр отладки узла, например, \"--inspect-brk\".",
-	"learnMore": "Дополнительные сведения",
-	"ok": "ОК",
-	"scriptInvalid": "Не удалось найти сценарий \"{0}\". Попробуйте обновить представление."
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/npm/out/tasks.i18n.json b/i18n/rus/extensions/npm/out/tasks.i18n.json
deleted file mode 100644
index df41ba3c218..00000000000
--- a/i18n/rus/extensions/npm/out/tasks.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"npm.parseError": "Определение задач npm: не удалось проанализировать файл {0} "
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/npm/package.i18n.json b/i18n/rus/extensions/npm/package.i18n.json
deleted file mode 100644
index 8d7baa6e0dc..00000000000
--- a/i18n/rus/extensions/npm/package.i18n.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"description": "Расширение для добавления поддержки задач в скрипты npm.",
-	"displayName": "Поддержка Npm для VSCode",
-	"config.npm.autoDetect": "Включает или отключает автоматическое определение сценариев npm. Значение по умолчанию — \"включено\".",
-	"config.npm.runSilent": "Запускать команды npm с параметром '--silent'.",
-	"config.npm.packageManager": "Диспетчер пакетов, используемый для запуска сценариев.",
-	"config.npm.exclude": "Настройте стандартные маски для папок, которые должны быть обработаны с помощью автоматического определения сценария.",
-	"config.npm.enableScriptExplorer": "Включить представление обозревателя для сценариев npm.",
-	"config.npm.scriptExplorerAction": "Действие по умолчанию при щелчке в обозревателе сценариев. Допустимые значения: 'open' или 'run', значение по умолчанию – 'open'.",
-	"npm.parseError": "Определение задач npm: не удалось проанализировать файл {0}",
-	"taskdef.script": "Скрипт npm для изменения.",
-	"taskdef.path": "Путь к папке с файлом package.json, который содержит сценарий. Этот параметр можно опустить.",
-	"view.name": "Сценарии NPM",
-	"command.refresh": "Обновить",
-	"command.run": "Запустить",
-	"command.debug": "Отладка",
-	"command.openScript": "Открыть",
-	"command.runInstall": "Запустить установку"
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/objective-c/package.i18n.json b/i18n/rus/extensions/objective-c/package.i18n.json
deleted file mode 100644
index a000c1340b4..00000000000
--- a/i18n/rus/extensions/objective-c/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Основы языка Objective-C",
-	"description": "Предоставляет подсветку синтаксиса и выделение парных скобок в файлах Objective-C."
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/package-json/out/features/bowerJSONContribution.i18n.json b/i18n/rus/extensions/package-json/out/features/bowerJSONContribution.i18n.json
deleted file mode 100644
index a72b0dc2f3a..00000000000
--- a/i18n/rus/extensions/package-json/out/features/bowerJSONContribution.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"json.bower.default": "Bower.json по умолчанию",
-	"json.bower.error.repoaccess": "Сбой запроса в репозиторий Bower: {0}",
-	"json.bower.latest.version": "последняя"
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/package-json/out/features/packageJSONContribution.i18n.json b/i18n/rus/extensions/package-json/out/features/packageJSONContribution.i18n.json
deleted file mode 100644
index 461ca9da365..00000000000
--- a/i18n/rus/extensions/package-json/out/features/packageJSONContribution.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"json.package.default": "Файл package.json по умолчанию",
-	"json.npm.error.repoaccess": "Сбой запроса в репозиторий NPM: {0}",
-	"json.npm.latestversion": "Последняя версия пакета на данный момент",
-	"json.npm.majorversion": "Соответствует последнему основному номеру версии (1.x.x).",
-	"json.npm.minorversion": "Соответствует последнему дополнительному номеру версии (1.2.x).",
-	"json.npm.version.hover": "Последняя версия: {0}"
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/package-json/package.i18n.json b/i18n/rus/extensions/package-json/package.i18n.json
deleted file mode 100644
index 35229bd6699..00000000000
--- a/i18n/rus/extensions/package-json/package.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	]
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/perl/package.i18n.json b/i18n/rus/extensions/perl/package.i18n.json
deleted file mode 100644
index 6760f0734fa..00000000000
--- a/i18n/rus/extensions/perl/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Основы языка Perl",
-	"description": "Предоставляет подсветку синтаксиса и выделение парных скобок в файлах Perl."
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/php-language-features/out/features/validationProvider.i18n.json b/i18n/rus/extensions/php-language-features/out/features/validationProvider.i18n.json
deleted file mode 100644
index 5696440e52e..00000000000
--- a/i18n/rus/extensions/php-language-features/out/features/validationProvider.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"php.useExecutablePath": "Разрешить выполнять {0} (определяется как параметр рабочей области) для обработки PHP-файлов через lint?",
-	"php.yes": "Разрешить",
-	"php.no": "Запретить",
-	"wrongExecutable": "Не удается проверить, так как {0} не является допустимым исполняемым PHP-файлом. Используйте параметр php.validate.executablePath, чтобы настроить исполняемый PHP-файл.",
-	"noExecutable": "Не удается проверить, так как не задан исполняемый PHP-файл. Используйте параметр php.validate.executablePath, чтобы настроить исполняемый PHP-файл.",
-	"unknownReason": "Не удалось запустить PHP-файл, используя путь {0}. Причина неизвестна."
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/php-language-features/package.i18n.json b/i18n/rus/extensions/php-language-features/package.i18n.json
deleted file mode 100644
index b0eb11ff036..00000000000
--- a/i18n/rus/extensions/php-language-features/package.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"configuration.suggest.basic": "Указывает, включены ли встроенные языковые предложения для PHP. Поддержка предлагает глобальные значения и переменные PHP.",
-	"configuration.validate.enable": "Включение или отключение встроенной проверки PHP.",
-	"configuration.validate.executablePath": "Указывает на исполняемый файл PHP.",
-	"configuration.validate.run": "Запускается ли анализатор кода при сохранении или при печати.",
-	"configuration.title": "PHP",
-	"commands.categroy.php": "PHP",
-	"command.untrustValidationExecutable": "Запретить исполняемый файл проверки PHP (определяется как параметр рабочей области)",
-	"displayName": "Функции языка PHP",
-	"description": "Предоставляет широкую поддержку возможностей языка для файлов PHP."
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/php/out/features/validationProvider.i18n.json b/i18n/rus/extensions/php/out/features/validationProvider.i18n.json
deleted file mode 100644
index 5696440e52e..00000000000
--- a/i18n/rus/extensions/php/out/features/validationProvider.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"php.useExecutablePath": "Разрешить выполнять {0} (определяется как параметр рабочей области) для обработки PHP-файлов через lint?",
-	"php.yes": "Разрешить",
-	"php.no": "Запретить",
-	"wrongExecutable": "Не удается проверить, так как {0} не является допустимым исполняемым PHP-файлом. Используйте параметр php.validate.executablePath, чтобы настроить исполняемый PHP-файл.",
-	"noExecutable": "Не удается проверить, так как не задан исполняемый PHP-файл. Используйте параметр php.validate.executablePath, чтобы настроить исполняемый PHP-файл.",
-	"unknownReason": "Не удалось запустить PHP-файл, используя путь {0}. Причина неизвестна."
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/php/package.i18n.json b/i18n/rus/extensions/php/package.i18n.json
deleted file mode 100644
index 1e2e55fbb4c..00000000000
--- a/i18n/rus/extensions/php/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Основы языка PHP",
-	"description": "Предоставляет подсветку синтаксиса и выделение парных скобок в файлах PHP."
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/powershell/package.i18n.json b/i18n/rus/extensions/powershell/package.i18n.json
deleted file mode 100644
index ec529ae6dbc..00000000000
--- a/i18n/rus/extensions/powershell/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Основы языка PowerShell",
-	"description": "Предоставляет фрагменты кода, подсветку синтаксиса, выделение парных скобок и сворачивание кода в файлах PowerShell."
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/pug/package.i18n.json b/i18n/rus/extensions/pug/package.i18n.json
deleted file mode 100644
index 99c7c505fe2..00000000000
--- a/i18n/rus/extensions/pug/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Основы языка Pug",
-	"description": "Предоставляет подсветку синтаксиса и выделение парных скобок в файлах Pug."
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/python/package.i18n.json b/i18n/rus/extensions/python/package.i18n.json
deleted file mode 100644
index 0f6eed5d902..00000000000
--- a/i18n/rus/extensions/python/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Основы языка Python",
-	"description": "Предоставляет подсветку синтаксиса, выделение парных скобок и сворачивание кода в файлах Python."
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/r/package.i18n.json b/i18n/rus/extensions/r/package.i18n.json
deleted file mode 100644
index 5c028bcb4b5..00000000000
--- a/i18n/rus/extensions/r/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Основы языка R",
-	"description": "Предоставляет подсветку синтаксиса и выделение парных скобок в файлах R."
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/razor/package.i18n.json b/i18n/rus/extensions/razor/package.i18n.json
deleted file mode 100644
index 5da19e87799..00000000000
--- a/i18n/rus/extensions/razor/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Основы языка Razor",
-	"description": "Предоставляет подсветку синтаксиса, выделение парных скобок и сворачивание кода в файлах Razor."
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/ruby/package.i18n.json b/i18n/rus/extensions/ruby/package.i18n.json
deleted file mode 100644
index 8d0f7630e69..00000000000
--- a/i18n/rus/extensions/ruby/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Основы языка Ruby",
-	"description": "Предоставляет подсветку синтаксиса и выделение парных скобок в файлах Ruby."
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/rust/package.i18n.json b/i18n/rus/extensions/rust/package.i18n.json
deleted file mode 100644
index ac434a47c56..00000000000
--- a/i18n/rus/extensions/rust/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Основы языка Rust",
-	"description": "Предоставляет подсветку синтаксиса и выделение парных скобок в файлах Rust."
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/scss/package.i18n.json b/i18n/rus/extensions/scss/package.i18n.json
deleted file mode 100644
index fba9306f6a8..00000000000
--- a/i18n/rus/extensions/scss/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Основы языка SCSS",
-	"description": "Предоставляет фрагменты кода, подсветку синтаксиса, выделение парных скобок и сворачивание кода в файлах SCSS."
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/search-rg/package.i18n.json b/i18n/rus/extensions/search-rg/package.i18n.json
deleted file mode 100644
index dd7a66691d7..00000000000
--- a/i18n/rus/extensions/search-rg/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Поиск (ripgrep)",
-	"description": "Поиск с использованием ripgrep."
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/shaderlab/package.i18n.json b/i18n/rus/extensions/shaderlab/package.i18n.json
deleted file mode 100644
index 3d8d0675660..00000000000
--- a/i18n/rus/extensions/shaderlab/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Основы языка Shaderlab",
-	"description": "Предоставляет подсветку синтаксиса и выделение парных скобок в файлах Shaderlab."
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/shellscript/package.i18n.json b/i18n/rus/extensions/shellscript/package.i18n.json
deleted file mode 100644
index 7953de535b9..00000000000
--- a/i18n/rus/extensions/shellscript/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Основы языка сценариев оболочки",
-	"description": "Предоставляет подсветку синтаксиса и выделение парных скобок в файлах сценариев оболочки."
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/sql/package.i18n.json b/i18n/rus/extensions/sql/package.i18n.json
deleted file mode 100644
index 69c1ea6424b..00000000000
--- a/i18n/rus/extensions/sql/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Основы языка SQL",
-	"description": "Предоставляет подсветку синтаксиса и выделение парных скобок в файлах SQL."
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/swift/package.i18n.json b/i18n/rus/extensions/swift/package.i18n.json
deleted file mode 100644
index 3e90fe04638..00000000000
--- a/i18n/rus/extensions/swift/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Основы языка Swift",
-	"description": "Предоставляет фрагменты кода, подсветку синтаксиса и выделение парных скобок в файлах Swift."
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/theme-abyss/package.i18n.json b/i18n/rus/extensions/theme-abyss/package.i18n.json
deleted file mode 100644
index bfe7b7b115b..00000000000
--- a/i18n/rus/extensions/theme-abyss/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Тема хаоса",
-	"description": "Тема хаоса для Visual Studio Code"
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/theme-defaults/package.i18n.json b/i18n/rus/extensions/theme-defaults/package.i18n.json
deleted file mode 100644
index 399920c9425..00000000000
--- a/i18n/rus/extensions/theme-defaults/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Темы по умолчанию",
-	"description": "Темная и светлая темы по умолчанию (Plus и Visual Studio)"
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/theme-kimbie-dark/package.i18n.json b/i18n/rus/extensions/theme-kimbie-dark/package.i18n.json
deleted file mode 100644
index de8e9f3c9db..00000000000
--- a/i18n/rus/extensions/theme-kimbie-dark/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Темная тема Kimbie",
-	"description": "Темная тема Kimbie для Visual Studio Code"
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/theme-monokai-dimmed/package.i18n.json b/i18n/rus/extensions/theme-monokai-dimmed/package.i18n.json
deleted file mode 100644
index d715d2db947..00000000000
--- a/i18n/rus/extensions/theme-monokai-dimmed/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Тема Monokai с уменьшенной яркостью",
-	"description": "Тема Monokai с уменьшенной яркостью для Visual Studio Code"
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/theme-monokai/package.i18n.json b/i18n/rus/extensions/theme-monokai/package.i18n.json
deleted file mode 100644
index 90569446473..00000000000
--- a/i18n/rus/extensions/theme-monokai/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Тема Monokai",
-	"description": "Тема Monokai для Visual Studio Code"
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/theme-quietlight/package.i18n.json b/i18n/rus/extensions/theme-quietlight/package.i18n.json
deleted file mode 100644
index d4961dad77f..00000000000
--- a/i18n/rus/extensions/theme-quietlight/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Тихая светлая тема",
-	"description": "Тихая светлая тема для Visual Studio Code"
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/theme-red/package.i18n.json b/i18n/rus/extensions/theme-red/package.i18n.json
deleted file mode 100644
index 1b7c422e636..00000000000
--- a/i18n/rus/extensions/theme-red/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Красная тема",
-	"description": "Красная тема для Visual Studio Code"
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/theme-seti/package.i18n.json b/i18n/rus/extensions/theme-seti/package.i18n.json
deleted file mode 100644
index 7a527f9864f..00000000000
--- a/i18n/rus/extensions/theme-seti/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Тема значков файлов Seti",
-	"description": "Тема значков файлов на основе значков файлов пользовательского интерфейса Seti"
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/theme-solarized-dark/package.i18n.json b/i18n/rus/extensions/theme-solarized-dark/package.i18n.json
deleted file mode 100644
index cbdc9c9ecc2..00000000000
--- a/i18n/rus/extensions/theme-solarized-dark/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Солнечная темная тема",
-	"description": "Солнечная темная тема для Visual Studio Code"
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/theme-solarized-light/package.i18n.json b/i18n/rus/extensions/theme-solarized-light/package.i18n.json
deleted file mode 100644
index 140d1521148..00000000000
--- a/i18n/rus/extensions/theme-solarized-light/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Солнечная светлая тема",
-	"description": "Солнечная светлая тема для Visual Studio Code"
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/theme-tomorrow-night-blue/package.i18n.json b/i18n/rus/extensions/theme-tomorrow-night-blue/package.i18n.json
deleted file mode 100644
index a34cd6fdc8c..00000000000
--- a/i18n/rus/extensions/theme-tomorrow-night-blue/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Синяя вечерняя тема",
-	"description": "Синяя вечерняя тема для Visual Studio Code"
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/typescript-basics/package.i18n.json b/i18n/rus/extensions/typescript-basics/package.i18n.json
deleted file mode 100644
index 9723a8eba00..00000000000
--- a/i18n/rus/extensions/typescript-basics/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Основы языка TypeScript",
-	"description": "Предоставляет фрагменты кода, подсветку синтаксиса, выделение парных скобок и сворачивание кода в файлах TypeScript."
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/typescript-language-features/out/commands.i18n.json b/i18n/rus/extensions/typescript-language-features/out/commands.i18n.json
deleted file mode 100644
index c2ebfd19241..00000000000
--- a/i18n/rus/extensions/typescript-language-features/out/commands.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"typescript.projectConfigNoWorkspace": "Откройте папку в VS Code, чтобы использовать проект JavaScript или TypeScript.",
-	"typescript.projectConfigUnsupportedFile": "Не удалось определить проект TypeScript или JavaScript. Неподдерживаемый тип файла",
-	"typescript.projectConfigCouldNotGetInfo": "Не удалось определить проект TypeScript или JavaScript.",
-	"typescript.noTypeScriptProjectConfig": "Файл не является частью проекта TypeScript. Дополнительные сведения см. [здесь]({0}).",
-	"typescript.noJavaScriptProjectConfig": "Файл не является частью проекта JavaScript. Дополнительные сведения см. [здесь]({0}).",
-	"typescript.configureTsconfigQuickPick": "Настроить tsconfig.json",
-	"typescript.configureJsconfigQuickPick": "Настроить jsconfig.json"
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/typescript-language-features/out/features/completionItemProvider.i18n.json b/i18n/rus/extensions/typescript-language-features/out/features/completionItemProvider.i18n.json
deleted file mode 100644
index 3df8eafb051..00000000000
--- a/i18n/rus/extensions/typescript-language-features/out/features/completionItemProvider.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"selectCodeAction": "Выберите применяемое действие кода",
-	"acquiringTypingsLabel": "Получение typings...",
-	"acquiringTypingsDetail": "Получение определений typings для IntelliSense.",
-	"autoImportLabel": "Автоматический импорт из {0}"
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/typescript-language-features/out/features/directiveCommentCompletionProvider.i18n.json b/i18n/rus/extensions/typescript-language-features/out/features/directiveCommentCompletionProvider.i18n.json
deleted file mode 100644
index 3add3405e17..00000000000
--- a/i18n/rus/extensions/typescript-language-features/out/features/directiveCommentCompletionProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"ts-check": "Включает семантическую проверку в JavaScript файле. Необходимо расположить в самом начале файла.",
-	"ts-nocheck": "Отключает семантическую проверку в JavaScript файле. Необходимо расположить в самом начале файла.",
-	"ts-ignore": "Отключает вывод ошибок @ts-check для следующей строки файла."
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/typescript-language-features/out/features/implementationsCodeLensProvider.i18n.json b/i18n/rus/extensions/typescript-language-features/out/features/implementationsCodeLensProvider.i18n.json
deleted file mode 100644
index 8f5e9d5ec4f..00000000000
--- a/i18n/rus/extensions/typescript-language-features/out/features/implementationsCodeLensProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"oneImplementationLabel": "1 реализация",
-	"manyImplementationLabel": "Реализации {0}",
-	"implementationsErrorLabel": "Не удалось определить реализации."
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/typescript-language-features/out/features/jsDocCompletionProvider.i18n.json b/i18n/rus/extensions/typescript-language-features/out/features/jsDocCompletionProvider.i18n.json
deleted file mode 100644
index b4cad43043f..00000000000
--- a/i18n/rus/extensions/typescript-language-features/out/features/jsDocCompletionProvider.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"typescript.jsDocCompletionItem.documentation": "Комментарий JSDoc"
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/typescript-language-features/out/features/organizeImports.i18n.json b/i18n/rus/extensions/typescript-language-features/out/features/organizeImports.i18n.json
deleted file mode 100644
index 1787a125fae..00000000000
--- a/i18n/rus/extensions/typescript-language-features/out/features/organizeImports.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"oraganizeImportsAction.title": "Организация импортов"
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/typescript-language-features/out/features/quickFixProvider.i18n.json b/i18n/rus/extensions/typescript-language-features/out/features/quickFixProvider.i18n.json
deleted file mode 100644
index 72b696f9b0a..00000000000
--- a/i18n/rus/extensions/typescript-language-features/out/features/quickFixProvider.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"fixAllInFileLabel": "{0} (Исправить все в файле)"
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/typescript-language-features/out/features/referencesCodeLensProvider.i18n.json b/i18n/rus/extensions/typescript-language-features/out/features/referencesCodeLensProvider.i18n.json
deleted file mode 100644
index 63583231cd7..00000000000
--- a/i18n/rus/extensions/typescript-language-features/out/features/referencesCodeLensProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"oneReferenceLabel": "1 ссылка",
-	"manyReferenceLabel": "Ссылок: {0}",
-	"referenceErrorLabel": "Не удалось определить ссылки."
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/typescript-language-features/out/features/taskProvider.i18n.json b/i18n/rus/extensions/typescript-language-features/out/features/taskProvider.i18n.json
deleted file mode 100644
index a641634e077..00000000000
--- a/i18n/rus/extensions/typescript-language-features/out/features/taskProvider.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"buildTscLabel": "сборка – {0}",
-	"buildAndWatchTscLabel": "отслеживание – {0}"
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/typescript-language-features/out/features/updatePathsOnRename.i18n.json b/i18n/rus/extensions/typescript-language-features/out/features/updatePathsOnRename.i18n.json
deleted file mode 100644
index 4d667fdc7db..00000000000
--- a/i18n/rus/extensions/typescript-language-features/out/features/updatePathsOnRename.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"prompt": "Вы хотите обновить импорты для перемещенного файла: '{0}'?",
-	"reject.title": "Нет",
-	"accept.title": "Да",
-	"always.title": "Да, всегда обновлять импорты",
-	"never.title": "Нет, никогда не обновлять импорты"
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/typescript-language-features/out/typescriptServiceClient.i18n.json b/i18n/rus/extensions/typescript-language-features/out/typescriptServiceClient.i18n.json
deleted file mode 100644
index 0a42c8c6746..00000000000
--- a/i18n/rus/extensions/typescript-language-features/out/typescriptServiceClient.i18n.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noServerFound": "Путь {0} не указывает на допустимый файл программы установки tsserver. Выполняется откат до пакетной версии TypeScript.",
-	"serverCouldNotBeStarted": "Не удалось запустить языковой сервер TypeScript. Сообщение об ошибке: \"{0}\".",
-	"typescript.openTsServerLog.notSupported": "Для ведения журнала сервера TS требуется TS 2.2.2+",
-	"typescript.openTsServerLog.loggingNotEnabled": "Вход в TS Server отключен. Задайте \"typescript.tsserver.log\" и перезагрузите VS Code, чтобы включить ведение журнала",
-	"typescript.openTsServerLog.enableAndReloadOption": "Войдите и перезагрузите TS server",
-	"typescript.openTsServerLog.noLogFile": "Сервер TS не начал ведение журнала.",
-	"openTsServerLog.openFileFailedFailed": "Не удалось открыть файл журнала сервера TS",
-	"serverDiedAfterStart": "Языковая служба TypeScript пять раз завершила работу сразу после запуска. Служба не будет перезапущена.",
-	"serverDiedReportIssue": "Сообщить об ошибке",
-	"serverDied": "Языковая служба TypeScript пять раз непредвиденно завершила работу за последние пять минут."
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/typescript-language-features/out/utils/api.i18n.json b/i18n/rus/extensions/typescript-language-features/out/utils/api.i18n.json
deleted file mode 100644
index 9e87774a838..00000000000
--- a/i18n/rus/extensions/typescript-language-features/out/utils/api.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"invalidVersion": "Недопустимая версия"
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/typescript-language-features/out/utils/logger.i18n.json b/i18n/rus/extensions/typescript-language-features/out/utils/logger.i18n.json
deleted file mode 100644
index 8f5ef5415b9..00000000000
--- a/i18n/rus/extensions/typescript-language-features/out/utils/logger.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"channelName": "TypeScript"
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/typescript-language-features/out/utils/projectStatus.i18n.json b/i18n/rus/extensions/typescript-language-features/out/utils/projectStatus.i18n.json
deleted file mode 100644
index 54d1199165b..00000000000
--- a/i18n/rus/extensions/typescript-language-features/out/utils/projectStatus.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hintExclude": "Чтобы включить языковые функции JavaScript/TypeScript IntelliSense во всем проекте, исключите папки с большим числом файлов, например: {0}.",
-	"hintExclude.generic": "Чтобы включить языковые функции JavaScript/TypeScript IntelliSense во всем проекте, исключите большие папки с исходными файлами, с которыми вы не работаете.",
-	"large.label": "Настройка исключений",
-	"hintExclude.tooltip": "Чтобы включить языковые функции JavaScript/TypeScript IntelliSense во всем проекте, исключите большие папки с исходными файлами, с которыми вы не работаете."
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/typescript-language-features/out/utils/typingsStatus.i18n.json b/i18n/rus/extensions/typescript-language-features/out/utils/typingsStatus.i18n.json
deleted file mode 100644
index f5ffd76a57b..00000000000
--- a/i18n/rus/extensions/typescript-language-features/out/utils/typingsStatus.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"installingPackages": "Получение данных для повышения эффективности IntelliSense TypeScript",
-	"typesInstallerInitializationFailed.title": "Не удалось установить файлы типизации для языка JavaScript. Убедитесь, что NPM установлен или укажите путь к файлу 'typescript.npm' в параметрах среды пользователя. Дополнительные сведения см. [здесь]({0}).",
-	"typesInstallerInitializationFailed.doNotCheckAgain": "Больше не показывать"
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/typescript-language-features/out/utils/versionPicker.i18n.json b/i18n/rus/extensions/typescript-language-features/out/utils/versionPicker.i18n.json
deleted file mode 100644
index f475eb8cead..00000000000
--- a/i18n/rus/extensions/typescript-language-features/out/utils/versionPicker.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"useVSCodeVersionOption": "Использовать версию VS Code",
-	"useWorkspaceVersionOption": "Использовать версию рабочей области",
-	"learnMore": "Дополнительные сведения",
-	"selectTsVersion": "Выберите версию TypeScript, используемую для языковых функций JavaScript и TypeScript."
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/typescript-language-features/out/utils/versionProvider.i18n.json b/i18n/rus/extensions/typescript-language-features/out/utils/versionProvider.i18n.json
deleted file mode 100644
index 5de17783d56..00000000000
--- a/i18n/rus/extensions/typescript-language-features/out/utils/versionProvider.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"couldNotLoadTsVersion": "Не удалось загрузить версию TypeScript по этому пути",
-	"noBundledServerFound": "Файл tsserver VSCode был удален другим приложением, например, в результате ошибочного срабатывания средства обнаружения вирусов. Переустановите VSCode."
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/typescript-language-features/package.i18n.json b/i18n/rus/extensions/typescript-language-features/package.i18n.json
deleted file mode 100644
index 378947c53af..00000000000
--- a/i18n/rus/extensions/typescript-language-features/package.i18n.json
+++ /dev/null
@@ -1,67 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Возможности языков TypeScript и JavaScript",
-	"description": "Предоставляет широкую поддержку языка для JavaScript и TypeScript.",
-	"reloadProjects.title": "Перезагрузить проект",
-	"configuration.typescript": "TypeScript",
-	"typescript.useCodeSnippetsOnMethodSuggest.dec": "Дополните функции сигнатурами их параметров.",
-	"typescript.tsdk.desc": "Указывает путь к папке, содержащей файлы tsserver и lib*.d.ts, которые необходимо использовать.",
-	"typescript.disableAutomaticTypeAcquisition": "Отключает автоматическое получение типов. Требуется TypeScript 2.0.6 и более поздней версии.",
-	"typescript.tsserver.log": "Включает ведение журнала для сервера TS. Этот журнал можно использовать для диагностики проблем сервера TS. В журнале могут содержаться пути к файлам, исходный код и другие сведения из вашего проекта, в том числе носящие конфиденциальный характер.",
-	"typescript.tsserver.pluginPaths": "Дополнительные пути для обнаружения подключаемых модулей языковой службы TypeScript. Требуется TypeScript версии 2.3.0 или более поздней версии.",
-	"typescript.tsserver.pluginPaths.item": "Абсолютный или относительный путь. Относительный путь должен быть указан относительно папок рабочей области.",
-	"typescript.tsserver.trace": "Включает трассировку сообщений, отправляемых на сервер TS. Эту трассировку можно использовать для диагностики проблем сервера TS. Трассировка может содержать пути к файлам, исходный код и другие сведения из вашего проекта, в том числе конфиденциальные данные.",
-	"typescript.validate.enable": "Включение или отключение проверки TypeScript.",
-	"typescript.format.enable": "Включение или отключение модуля форматирования TypeScript по умолчанию.",
-	"javascript.format.enable": "Включение или отключение модуля форматирования JavaScript по умолчанию.",
-	"format.insertSpaceAfterCommaDelimiter": "Определяет метод обработки пробелов после разделителя-запятой.",
-	"format.insertSpaceAfterConstructor": "Определяет метод обработки пробелов после ключевого слова constructor. Требуется TypeScript 2.3.0 или более поздней версии.",
-	"format.insertSpaceAfterSemicolonInForStatements": " Определяет метод обработки пробелов после точки с запятой в операторе for.",
-	"format.insertSpaceBeforeAndAfterBinaryOperators": "Определяет метод обработки пробелов после двоичного оператора.",
-	"format.insertSpaceAfterKeywordsInControlFlowStatements": "Определяет метод обработки пробелов после ключевых слов в операторе управления потоком выполнения.",
-	"format.insertSpaceAfterFunctionKeywordForAnonymousFunctions": "Определяет метод обработки пробелов после ключевого слова function у анонимных функций.",
-	"format.insertSpaceBeforeFunctionParenthesis": "Определяет метод обработки пробелов перед скобками аргумента функции. Требует TypeScript >= 2.1.5.",
-	"format.insertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis": "Определяет метод обработки пробелов после открытия и до закрытия непустых круглых скобок.",
-	"format.insertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets": "Определяет метод обработки пробелов после открытия и до закрытия непустых квадратных скобок.",
-	"format.insertSpaceAfterOpeningAndBeforeClosingNonemptyBraces": "Определяет метод обработки пробелов после открытия и до закрытия непустых квадратных скобок. Требуется TypeScript 2.3.0 или более поздней версии.",
-	"format.insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces": "Определяет метод обработки пробелов после открытия и до закрытия скобок в строке шаблона. Требуется TypeScript 2.0.6 или более поздней версии.",
-	"format.insertSpaceAfterOpeningAndBeforeClosingJsxExpressionBraces": "Определяет метод обработки пробелов после открытия и до закрытия скобок выражения JSX. Требуется TypeScript 2.0.6 или более поздней версии.",
-	"format.insertSpaceAfterTypeAssertion": "Определяет метод обработки пробелов после утверждений типа в TypeScript. Требуется TypeScript 2.4 или более поздней версии.",
-	"format.placeOpenBraceOnNewLineForFunctions": "Определяет, ставится ли открывающая фигурная скобка с новой строки в функциях.",
-	"format.placeOpenBraceOnNewLineForControlBlocks": "Определяет, ставится ли открывающая фигурная скобка с новой строки в блоках управления.",
-	"javascript.validate.enable": "Включение или отключение проверки JavaScript.",
-	"goToProjectConfig.title": "Перейти к конфигурации проекта",
-	"javascript.referencesCodeLens.enabled": "Включить/отключить ссылки CodeLens для файлов JavaScript.",
-	"typescript.referencesCodeLens.enabled": "Включить/отключить ссылки CodeLens для файлов TypeScript. Требуется TypeScript версии 2.0.6 или более поздней версии.",
-	"typescript.implementationsCodeLens.enabled": "Включить или отключить CodeLens для реализаций. Требуется TypeScript >= 2.2.0.",
-	"typescript.openTsServerLog.title": "Открыть журнал сервера TS",
-	"typescript.restartTsServer": "Перезапустить сервер TS",
-	"typescript.selectTypeScriptVersion.title": "Выберите версию TypeScript.",
-	"typescript.reportStyleChecksAsWarnings": "Отображать ошибки при проверке стиля в виде предупреждений",
-	"jsDocCompletion.enabled": "Включить или отключить JSDoc коментарии",
-	"javascript.implicitProjectConfig.checkJs": "Включает/отключает семантическую проверку файлов JavaScript. Этот параметр может переопределяться в файле jsconfig.json или tsconfig.json. Требуется TypeScript 2.3.1 или более поздней версии.",
-	"typescript.npm": "Указывает путь к исполняемому файлу NPM, используемому для автоматического получения типа. Требуется TypeScript версии 2.3.4 или более поздней версии.",
-	"typescript.check.npmIsInstalled": "Проверяет, установлен ли NPM для автоматического получения типов.",
-	"javascript.nameSuggestions": "Включить/отключить использование уникальных имен из файла в списках предложений JavaScript.",
-	"typescript.tsc.autoDetect": "Управляет автоматическим обнаружением задач tsc. При указании значения 'off' эта функция отключается. При указании значения 'build' создаются задачи компиляции для однократного запуска. При указании значения 'watch' создаются только задачи компиляции и наблюдения. При указании значения 'on' создаются как задачи сборки, так и задачи наблюдения. По умолчанию используется значение 'on'.",
-	"typescript.problemMatchers.tsc.label": "Проблемы TypeScript",
-	"typescript.problemMatchers.tscWatch.label": "Проблемы TypeScript (режим наблюдения)",
-	"typescript.quickSuggestionsForPaths": "Включить/отключить краткие предложения при вводе пути импорта.",
-	"typescript.locale": "Устанавливает языковой стандарт, используемый для сообщений об ошибках JavaScript и TypeScript. Требуется TypeScript 2.6.0 или более поздней версии. Значение по умолчанию — 'null'. При указании значения null используется языковой стандарт VS Code.",
-	"javascript.implicitProjectConfig.experimentalDecorators": "Включает/отключает параметр 'experimentalDecorators' для файлов JavaScript, которые не являются частью проекта. Этот параметр может переопределяться в файле jsconfig.json или tsconfig.json. Требуется TypeScript 2.3.1 или более поздней версии.",
-	"typescript.autoImportSuggestions.enabled": "Включить/отключить предложения автоматического импорта. Требуется TypeScript 2.6.1 или более поздней версии",
-	"typescript.experimental.syntaxFolding": "Включает/отключает маркеры свертывания с учетом синтаксиса.",
-	"taskDefinition.tsconfig.description": "Файл tsconfig, который определяет сборку TS.",
-	"javascript.suggestionActions.enabled": "Включить/отключить предложения диагностики для файлов JavaScript в редакторе. Требуется TypeScript версии 2.8 или более поздней версии.",
-	"typescript.suggestionActions.enabled": "Включить/отключить предложения диагностики для файлов TypeScript в редакторе. Требуется TypeScript версии 2.8 или более поздней версии",
-	"typescript.preferences.quoteStyle": "Предпочтительный стиль кавычек для быстрых исправлений. Допустимые значения: 'single' (одинарные кавычки), 'double' (двойные кавычки) и 'auto' (использовать тип кавычек из предыдущих операций импорта). Требуется TypeScript версии 2.9 или более поздней версии",
-	"typescript.preferences.importModuleSpecifier": "Предпочитаемый стиль пути для автоматического импорта:\n- \"relative\": относительный путь по отношению к расположению файла.\n- \"non-relative\": относительный путь по отношению к 'baseUrl', указанному в файле 'jsconfig.json' или 'tsconfig.json'.\n- \"auto\": использовать самый короткий тип пути.\nТребуется TypeScript версии 2.9 или более поздней версии",
-	"typescript.showUnused": "Включить/отключить выделение неиспользуемых переменных в коде. Требуется TypeScript версии 2.9 или более поздней версии",
-	"typescript.updateImportsOnFileMove.enabled": "Включить/отключить автоматическое обновление путей импорта при переименовании или перемещении файлов в VS Code. Допустимые значения: 'prompt' (выдавать запрос при каждом переименовании), 'always' (обновлять пути автоматически) и 'never' (никогда не изменять пути и не выдавать запросы). Требуется TypeScript версии 2.9 или более поздней версии"
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/typescript/out/commands.i18n.json b/i18n/rus/extensions/typescript/out/commands.i18n.json
deleted file mode 100644
index c2ebfd19241..00000000000
--- a/i18n/rus/extensions/typescript/out/commands.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"typescript.projectConfigNoWorkspace": "Откройте папку в VS Code, чтобы использовать проект JavaScript или TypeScript.",
-	"typescript.projectConfigUnsupportedFile": "Не удалось определить проект TypeScript или JavaScript. Неподдерживаемый тип файла",
-	"typescript.projectConfigCouldNotGetInfo": "Не удалось определить проект TypeScript или JavaScript.",
-	"typescript.noTypeScriptProjectConfig": "Файл не является частью проекта TypeScript. Дополнительные сведения см. [здесь]({0}).",
-	"typescript.noJavaScriptProjectConfig": "Файл не является частью проекта JavaScript. Дополнительные сведения см. [здесь]({0}).",
-	"typescript.configureTsconfigQuickPick": "Настроить tsconfig.json",
-	"typescript.configureJsconfigQuickPick": "Настроить jsconfig.json"
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/typescript/out/features/bufferSyncSupport.i18n.json b/i18n/rus/extensions/typescript/out/features/bufferSyncSupport.i18n.json
deleted file mode 100644
index 14d34e0b45e..00000000000
--- a/i18n/rus/extensions/typescript/out/features/bufferSyncSupport.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"moreInformation": "Дополнительные сведения",
-	"doNotCheckAgain": "Больше не проверять",
-	"close": "Закрыть",
-	"updateTscCheck": "Значение параметра пользователя \"typescript.check.tscVersion\" изменено на false."
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/typescript/out/features/completionItemProvider.i18n.json b/i18n/rus/extensions/typescript/out/features/completionItemProvider.i18n.json
deleted file mode 100644
index 3df8eafb051..00000000000
--- a/i18n/rus/extensions/typescript/out/features/completionItemProvider.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"selectCodeAction": "Выберите применяемое действие кода",
-	"acquiringTypingsLabel": "Получение typings...",
-	"acquiringTypingsDetail": "Получение определений typings для IntelliSense.",
-	"autoImportLabel": "Автоматический импорт из {0}"
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/typescript/out/features/directiveCommentCompletionProvider.i18n.json b/i18n/rus/extensions/typescript/out/features/directiveCommentCompletionProvider.i18n.json
deleted file mode 100644
index 3add3405e17..00000000000
--- a/i18n/rus/extensions/typescript/out/features/directiveCommentCompletionProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"ts-check": "Включает семантическую проверку в JavaScript файле. Необходимо расположить в самом начале файла.",
-	"ts-nocheck": "Отключает семантическую проверку в JavaScript файле. Необходимо расположить в самом начале файла.",
-	"ts-ignore": "Отключает вывод ошибок @ts-check для следующей строки файла."
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/typescript/out/features/implementationsCodeLensProvider.i18n.json b/i18n/rus/extensions/typescript/out/features/implementationsCodeLensProvider.i18n.json
deleted file mode 100644
index 8f5e9d5ec4f..00000000000
--- a/i18n/rus/extensions/typescript/out/features/implementationsCodeLensProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"oneImplementationLabel": "1 реализация",
-	"manyImplementationLabel": "Реализации {0}",
-	"implementationsErrorLabel": "Не удалось определить реализации."
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/typescript/out/features/jsDocCompletionProvider.i18n.json b/i18n/rus/extensions/typescript/out/features/jsDocCompletionProvider.i18n.json
deleted file mode 100644
index b4cad43043f..00000000000
--- a/i18n/rus/extensions/typescript/out/features/jsDocCompletionProvider.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"typescript.jsDocCompletionItem.documentation": "Комментарий JSDoc"
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/typescript/out/features/quickFixProvider.i18n.json b/i18n/rus/extensions/typescript/out/features/quickFixProvider.i18n.json
deleted file mode 100644
index 72b696f9b0a..00000000000
--- a/i18n/rus/extensions/typescript/out/features/quickFixProvider.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"fixAllInFileLabel": "{0} (Исправить все в файле)"
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/typescript/out/features/referencesCodeLensProvider.i18n.json b/i18n/rus/extensions/typescript/out/features/referencesCodeLensProvider.i18n.json
deleted file mode 100644
index 63583231cd7..00000000000
--- a/i18n/rus/extensions/typescript/out/features/referencesCodeLensProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"oneReferenceLabel": "1 ссылка",
-	"manyReferenceLabel": "Ссылок: {0}",
-	"referenceErrorLabel": "Не удалось определить ссылки."
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/typescript/out/features/taskProvider.i18n.json b/i18n/rus/extensions/typescript/out/features/taskProvider.i18n.json
deleted file mode 100644
index a641634e077..00000000000
--- a/i18n/rus/extensions/typescript/out/features/taskProvider.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"buildTscLabel": "сборка – {0}",
-	"buildAndWatchTscLabel": "отслеживание – {0}"
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/typescript/out/typescriptMain.i18n.json b/i18n/rus/extensions/typescript/out/typescriptMain.i18n.json
deleted file mode 100644
index 719d56f4f92..00000000000
--- a/i18n/rus/extensions/typescript/out/typescriptMain.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"typescript.projectConfigNoWorkspace": "Откройте папку в VS Code, чтобы использовать проект JavaScript или TypeScript.",
-	"typescript.projectConfigUnsupportedFile": "Не удалось определить проект TypeScript или JavaScript. Неподдерживаемый тип файла",
-	"typescript.projectConfigCouldNotGetInfo": "Не удалось определить проект TypeScript или JavaScript.",
-	"typescript.noTypeScriptProjectConfig": "Файл не является частью проекта TypeScript.",
-	"typescript.noJavaScriptProjectConfig": "Файл не является частью проекта JavaScript.",
-	"typescript.configureTsconfigQuickPick": "Настроить tsconfig.json",
-	"typescript.configureJsconfigQuickPick": "Настроить jsconfig.json",
-	"typescript.projectConfigLearnMore": "Дополнительные сведения"
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/typescript/out/typescriptServiceClient.i18n.json b/i18n/rus/extensions/typescript/out/typescriptServiceClient.i18n.json
deleted file mode 100644
index 0a42c8c6746..00000000000
--- a/i18n/rus/extensions/typescript/out/typescriptServiceClient.i18n.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noServerFound": "Путь {0} не указывает на допустимый файл программы установки tsserver. Выполняется откат до пакетной версии TypeScript.",
-	"serverCouldNotBeStarted": "Не удалось запустить языковой сервер TypeScript. Сообщение об ошибке: \"{0}\".",
-	"typescript.openTsServerLog.notSupported": "Для ведения журнала сервера TS требуется TS 2.2.2+",
-	"typescript.openTsServerLog.loggingNotEnabled": "Вход в TS Server отключен. Задайте \"typescript.tsserver.log\" и перезагрузите VS Code, чтобы включить ведение журнала",
-	"typescript.openTsServerLog.enableAndReloadOption": "Войдите и перезагрузите TS server",
-	"typescript.openTsServerLog.noLogFile": "Сервер TS не начал ведение журнала.",
-	"openTsServerLog.openFileFailedFailed": "Не удалось открыть файл журнала сервера TS",
-	"serverDiedAfterStart": "Языковая служба TypeScript пять раз завершила работу сразу после запуска. Служба не будет перезапущена.",
-	"serverDiedReportIssue": "Сообщить об ошибке",
-	"serverDied": "Языковая служба TypeScript пять раз непредвиденно завершила работу за последние пять минут."
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/typescript/out/utils/api.i18n.json b/i18n/rus/extensions/typescript/out/utils/api.i18n.json
deleted file mode 100644
index 9e87774a838..00000000000
--- a/i18n/rus/extensions/typescript/out/utils/api.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"invalidVersion": "Недопустимая версия"
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/typescript/out/utils/logger.i18n.json b/i18n/rus/extensions/typescript/out/utils/logger.i18n.json
deleted file mode 100644
index 8f5ef5415b9..00000000000
--- a/i18n/rus/extensions/typescript/out/utils/logger.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"channelName": "TypeScript"
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/typescript/out/utils/projectStatus.i18n.json b/i18n/rus/extensions/typescript/out/utils/projectStatus.i18n.json
deleted file mode 100644
index 54d1199165b..00000000000
--- a/i18n/rus/extensions/typescript/out/utils/projectStatus.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hintExclude": "Чтобы включить языковые функции JavaScript/TypeScript IntelliSense во всем проекте, исключите папки с большим числом файлов, например: {0}.",
-	"hintExclude.generic": "Чтобы включить языковые функции JavaScript/TypeScript IntelliSense во всем проекте, исключите большие папки с исходными файлами, с которыми вы не работаете.",
-	"large.label": "Настройка исключений",
-	"hintExclude.tooltip": "Чтобы включить языковые функции JavaScript/TypeScript IntelliSense во всем проекте, исключите большие папки с исходными файлами, с которыми вы не работаете."
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/typescript/out/utils/typingsStatus.i18n.json b/i18n/rus/extensions/typescript/out/utils/typingsStatus.i18n.json
deleted file mode 100644
index f5ffd76a57b..00000000000
--- a/i18n/rus/extensions/typescript/out/utils/typingsStatus.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"installingPackages": "Получение данных для повышения эффективности IntelliSense TypeScript",
-	"typesInstallerInitializationFailed.title": "Не удалось установить файлы типизации для языка JavaScript. Убедитесь, что NPM установлен или укажите путь к файлу 'typescript.npm' в параметрах среды пользователя. Дополнительные сведения см. [здесь]({0}).",
-	"typesInstallerInitializationFailed.doNotCheckAgain": "Больше не показывать"
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/typescript/out/utils/versionPicker.i18n.json b/i18n/rus/extensions/typescript/out/utils/versionPicker.i18n.json
deleted file mode 100644
index f475eb8cead..00000000000
--- a/i18n/rus/extensions/typescript/out/utils/versionPicker.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"useVSCodeVersionOption": "Использовать версию VS Code",
-	"useWorkspaceVersionOption": "Использовать версию рабочей области",
-	"learnMore": "Дополнительные сведения",
-	"selectTsVersion": "Выберите версию TypeScript, используемую для языковых функций JavaScript и TypeScript."
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/typescript/out/utils/versionProvider.i18n.json b/i18n/rus/extensions/typescript/out/utils/versionProvider.i18n.json
deleted file mode 100644
index 5de17783d56..00000000000
--- a/i18n/rus/extensions/typescript/out/utils/versionProvider.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"couldNotLoadTsVersion": "Не удалось загрузить версию TypeScript по этому пути",
-	"noBundledServerFound": "Файл tsserver VSCode был удален другим приложением, например, в результате ошибочного срабатывания средства обнаружения вирусов. Переустановите VSCode."
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/typescript/package.i18n.json b/i18n/rus/extensions/typescript/package.i18n.json
deleted file mode 100644
index f85ab4719ef..00000000000
--- a/i18n/rus/extensions/typescript/package.i18n.json
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Возможности языков TypeScript и JavaScript",
-	"description": "Предоставляет широкую поддержку языка для JavaScript и TypeScript.",
-	"typescript.reloadProjects.title": "Перезагрузить проект",
-	"javascript.reloadProjects.title": "Перезагрузить проект",
-	"configuration.typescript": "TypeScript",
-	"typescript.useCodeSnippetsOnMethodSuggest.dec": "Дополните функции сигнатурами их параметров.",
-	"typescript.tsdk.desc": "Указывает путь к папке, содержащей файлы tsserver и lib*.d.ts, которые необходимо использовать.",
-	"typescript.disableAutomaticTypeAcquisition": "Отключает автоматическое получение типов. Требуется TypeScript 2.0.6 и более поздней версии.",
-	"typescript.tsserver.log": "Включает ведение журнала для сервера TS. Этот журнал можно использовать для диагностики проблем сервера TS. В журнале могут содержаться пути к файлам, исходный код и другие сведения из вашего проекта, в том числе носящие конфиденциальный характер.",
-	"typescript.tsserver.trace": "Включает трассировку сообщений, отправляемых на сервер TS. Эту трассировку можно использовать для диагностики проблем сервера TS. Трассировка может содержать пути к файлам, исходный код и другие сведения из вашего проекта, в том числе конфиденциальные данные.",
-	"typescript.validate.enable": "Включение или отключение проверки TypeScript.",
-	"typescript.format.enable": "Включение или отключение модуля форматирования TypeScript по умолчанию.",
-	"javascript.format.enable": "Включение или отключение модуля форматирования JavaScript по умолчанию.",
-	"format.insertSpaceAfterCommaDelimiter": "Определяет метод обработки пробелов после разделителя-запятой.",
-	"format.insertSpaceAfterConstructor": "Определяет метод обработки пробелов после ключевого слова constructor. Требуется TypeScript 2.3.0 или более поздней версии.",
-	"format.insertSpaceAfterSemicolonInForStatements": " Определяет метод обработки пробелов после точки с запятой в операторе for.",
-	"format.insertSpaceBeforeAndAfterBinaryOperators": "Определяет метод обработки пробелов после двоичного оператора.",
-	"format.insertSpaceAfterKeywordsInControlFlowStatements": "Определяет метод обработки пробелов после ключевых слов в операторе управления потоком выполнения.",
-	"format.insertSpaceAfterFunctionKeywordForAnonymousFunctions": "Определяет метод обработки пробелов после ключевого слова function у анонимных функций.",
-	"format.insertSpaceBeforeFunctionParenthesis": "Определяет метод обработки пробелов перед скобками аргумента функции. Требует TypeScript >= 2.1.5.",
-	"format.insertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis": "Определяет метод обработки пробелов после открытия и до закрытия непустых круглых скобок.",
-	"format.insertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets": "Определяет метод обработки пробелов после открытия и до закрытия непустых квадратных скобок.",
-	"format.insertSpaceAfterOpeningAndBeforeClosingNonemptyBraces": "Определяет метод обработки пробелов после открытия и до закрытия непустых скобок. Требуется TypeScript 2.3.0 или более поздней версии.",
-	"format.insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces": "Определяет метод обработки пробелов после открытия и до закрытия скобок в строке шаблона. Требуется TypeScript 2.0.6 или более поздней версии.",
-	"format.insertSpaceAfterOpeningAndBeforeClosingJsxExpressionBraces": "Определяет метод обработки пробелов после открытия и до закрытия скобок выражения JSX. Требуется TypeScript 2.0.6 или более поздней версии.",
-	"format.insertSpaceAfterTypeAssertion": "Определяет метод обработки пробелов после утверждений типа в TypeScript. Требуется TypeScript 2.4 или более поздней версии.",
-	"format.placeOpenBraceOnNewLineForFunctions": "Определяет, ставится ли открывающая фигурная скобка с новой строки в функциях.",
-	"format.placeOpenBraceOnNewLineForControlBlocks": "Определяет, ставится ли открывающая фигурная скобка с новой строки в блоках управления.",
-	"javascript.validate.enable": "Включение или отключение проверки JavaScript.",
-	"typescript.goToProjectConfig.title": "Перейти к конфигурации проекта",
-	"javascript.goToProjectConfig.title": "Перейти к конфигурации проекта",
-	"javascript.referencesCodeLens.enabled": "Включить/отключить ссылки CodeLens для файлов JavaScript.",
-	"typescript.referencesCodeLens.enabled": "Включить/отключить ссылки CodeLens для файлов TypeScript. Требуется TypeScript версии 2.0.6 или более поздней версии.",
-	"typescript.implementationsCodeLens.enabled": "Включить или отключить CodeLens для реализаций. Требуется TypeScript >= 2.2.0.",
-	"typescript.openTsServerLog.title": "Открыть журнал сервера TS",
-	"typescript.restartTsServer": "Перезапустить сервер TS",
-	"typescript.selectTypeScriptVersion.title": "Выберите версию TypeScript.",
-	"typescript.reportStyleChecksAsWarnings": "Отображать ошибки при проверке стиля в виде предупреждений",
-	"jsDocCompletion.enabled": "Включить или отключить JSDoc коментарии",
-	"javascript.implicitProjectConfig.checkJs": "Включает/отключает семантическую проверку файлов JavaScript. Этот параметр может переопределяться в файле jsconfig.json или tsconfig.json. Требуется TypeScript 2.3.1 или более поздней версии.",
-	"typescript.npm": "Указывает путь к исполняемому файлу NPM, используемому для автоматического получения типа. Требуется TypeScript версии 2.3.4 или более поздней версии.",
-	"typescript.check.npmIsInstalled": "Проверяет, установлен ли NPM для автоматического получения типов.",
-	"javascript.nameSuggestions": "Включить/отключить использование уникальных имен из файла в списках предложений JavaScript.",
-	"typescript.tsc.autoDetect": "Управляет автоматическим обнаружением задач tsc. При указании значения 'off' эта функция отключается. При указании значения 'build' создаются задачи компиляции для однократного запуска. При указании значения 'watch' создаются только задачи компиляции и наблюдения. При указании значения 'on' создаются как задачи сборки, так и задачи наблюдения. По умолчанию используется значение 'on'.",
-	"typescript.problemMatchers.tsc.label": "Проблемы TypeScript",
-	"typescript.problemMatchers.tscWatch.label": "Проблемы TypeScript (режим наблюдения)",
-	"typescript.quickSuggestionsForPaths": "Включить/отключить краткие предложения при вводе пути импорта.",
-	"typescript.locale": "Устанавливает языковой стандарт, используемый для сообщений об ошибках TypeScript. Требуется TypeScript 2.6.0 или более поздней версии. Значение по умолчанию — 'null'. При указании значения null для сообщений об ошибках TypeScript используется языковой стандарт VS Code.",
-	"javascript.implicitProjectConfig.experimentalDecorators": "Включает/отключает параметр 'experimentalDecorators' для файлов JavaScript, которые не являются частью проекта. Этот параметр может переопределяться в файле jsconfig.json или tsconfig.json. Требуется TypeScript 2.3.1 или более поздней версии.",
-	"typescript.autoImportSuggestions.enabled": "Включить/отключить предложения автоматического импорта. Требуется TypeScript 2.6.1 или более поздней версии",
-	"typescript.experimental.syntaxFolding": "Включает/отключает маркеры свертывания с учетом синтаксиса.",
-	"taskDefinition.tsconfig.description": "Файл tsconfig, который определяет сборку TS."
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/vb/package.i18n.json b/i18n/rus/extensions/vb/package.i18n.json
deleted file mode 100644
index a0a6cd9091c..00000000000
--- a/i18n/rus/extensions/vb/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Основы языка Visual Basic",
-	"description": "Предоставляет фрагменты кода, подсветку синтаксиса, выделение парных скобок и сворачивание кода в файлах Visual Basic."
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/xml/package.i18n.json b/i18n/rus/extensions/xml/package.i18n.json
deleted file mode 100644
index 698a8b81274..00000000000
--- a/i18n/rus/extensions/xml/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Основы языка XML",
-	"description": "Предоставляет подсветку синтаксиса и выделение парных скобок в файлах XML."
-}
\ No newline at end of file
diff --git a/i18n/rus/extensions/yaml/package.i18n.json b/i18n/rus/extensions/yaml/package.i18n.json
deleted file mode 100644
index 2ffd27b8c6a..00000000000
--- a/i18n/rus/extensions/yaml/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Основы языка YAML",
-	"description": "Предоставляет подсветку синтаксиса и выделение парных скобок в файлах YAML."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/base/browser/ui/actionbar/actionbar.i18n.json b/i18n/rus/src/vs/base/browser/ui/actionbar/actionbar.i18n.json
deleted file mode 100644
index 309631273fe..00000000000
--- a/i18n/rus/src/vs/base/browser/ui/actionbar/actionbar.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"titleLabel": "{0} ({1})"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/base/browser/ui/aria/aria.i18n.json b/i18n/rus/src/vs/base/browser/ui/aria/aria.i18n.json
deleted file mode 100644
index 6cfd726b0e0..00000000000
--- a/i18n/rus/src/vs/base/browser/ui/aria/aria.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"repeated": "{0} (произошло снова)"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/base/browser/ui/findinput/findInput.i18n.json b/i18n/rus/src/vs/base/browser/ui/findinput/findInput.i18n.json
deleted file mode 100644
index a83333e4c56..00000000000
--- a/i18n/rus/src/vs/base/browser/ui/findinput/findInput.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"defaultLabel": "ввод"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/base/browser/ui/findinput/findInputCheckboxes.i18n.json b/i18n/rus/src/vs/base/browser/ui/findinput/findInputCheckboxes.i18n.json
deleted file mode 100644
index 83d50975fd5..00000000000
--- a/i18n/rus/src/vs/base/browser/ui/findinput/findInputCheckboxes.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"caseDescription": "С учетом регистра",
-	"wordsDescription": "Слово целиком",
-	"regexDescription": "Использовать регулярное выражение"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/base/browser/ui/inputbox/inputBox.i18n.json b/i18n/rus/src/vs/base/browser/ui/inputbox/inputBox.i18n.json
deleted file mode 100644
index d1f3b418774..00000000000
--- a/i18n/rus/src/vs/base/browser/ui/inputbox/inputBox.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"alertErrorMessage": "Ошибка: {0}",
-	"alertWarningMessage": "Предупреждение: {0}",
-	"alertInfoMessage": "Сведения: {0}"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/base/browser/ui/resourceviewer/resourceViewer.i18n.json b/i18n/rus/src/vs/base/browser/ui/resourceviewer/resourceViewer.i18n.json
deleted file mode 100644
index ea2de842c25..00000000000
--- a/i18n/rus/src/vs/base/browser/ui/resourceviewer/resourceViewer.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"imgMeta": "{0}x{1} {2}",
-	"largeImageError": "Изображение слишком велико для отображения в редакторе. ",
-	"resourceOpenExternalButton": "Открыть изображение с помощью внешней программы?",
-	"nativeBinaryError": "Файл не будет отображен в редакторе, так как он двоичный, очень большой или использует неподдерживаемую кодировку текста.",
-	"sizeB": "{0} Б",
-	"sizeKB": "{0} КБ",
-	"sizeMB": "{0} МБ",
-	"sizeGB": "{0} ГБ",
-	"sizeTB": "{0} ТБ"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json b/i18n/rus/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json
deleted file mode 100644
index 750d811d866..00000000000
--- a/i18n/rus/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"selectAriaOption": "{0}"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/base/browser/ui/toolbar/toolbar.i18n.json b/i18n/rus/src/vs/base/browser/ui/toolbar/toolbar.i18n.json
deleted file mode 100644
index 406bec71be8..00000000000
--- a/i18n/rus/src/vs/base/browser/ui/toolbar/toolbar.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"more": "Еще"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/base/common/errorMessage.i18n.json b/i18n/rus/src/vs/base/common/errorMessage.i18n.json
deleted file mode 100644
index f8ae1b47f93..00000000000
--- a/i18n/rus/src/vs/base/common/errorMessage.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"stackTrace.format": "{0}: {1}",
-	"error.defaultMessage": "Произошла неизвестная ошибка. Подробные сведения см. в журнале.",
-	"nodeExceptionMessage": "Произошла системная ошибка ({0})",
-	"error.moreErrors": "{0} (всего ошибок: {1})"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/base/common/json.i18n.json b/i18n/rus/src/vs/base/common/json.i18n.json
deleted file mode 100644
index ec94fb83023..00000000000
--- a/i18n/rus/src/vs/base/common/json.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"error.invalidSymbol": "Недопустимый символ",
-	"error.invalidNumberFormat": "Недопустимый числовой формат",
-	"error.propertyNameExpected": "Требуется имя свойства",
-	"error.valueExpected": "Требуется значение",
-	"error.colonExpected": "Требуется двоеточие",
-	"error.commaExpected": "Требуется запятая",
-	"error.closeBraceExpected": "Требуется закрывающая фигурная скобка",
-	"error.closeBracketExpected": "Требуется закрывающая квадратная скобка",
-	"error.endOfFileExpected": "Ожидается конец файла"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/base/common/jsonErrorMessages.i18n.json b/i18n/rus/src/vs/base/common/jsonErrorMessages.i18n.json
deleted file mode 100644
index c3110008a34..00000000000
--- a/i18n/rus/src/vs/base/common/jsonErrorMessages.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"error.invalidSymbol": "Недопустимый символ",
-	"error.invalidNumberFormat": "Недопустимый числовой формат",
-	"error.propertyNameExpected": "Требуется имя свойства",
-	"error.valueExpected": "Требуется значение",
-	"error.colonExpected": "Требуется двоеточие",
-	"error.commaExpected": "Требуется запятая",
-	"error.closeBraceExpected": "Требуется закрывающая фигурная скобка",
-	"error.closeBracketExpected": "Требуется закрывающая квадратная скобка",
-	"error.endOfFileExpected": "Ожидается конец файла"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/base/common/keybindingLabels.i18n.json b/i18n/rus/src/vs/base/common/keybindingLabels.i18n.json
deleted file mode 100644
index b07a3d0f82a..00000000000
--- a/i18n/rus/src/vs/base/common/keybindingLabels.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"ctrlKey": "CTRL",
-	"shiftKey": "SHIFT",
-	"altKey": "ALT",
-	"windowsKey": "Клавиша Windows",
-	"ctrlKey.long": "CTRL",
-	"shiftKey.long": "SHIFT",
-	"altKey.long": "ALT",
-	"cmdKey.long": "Команда",
-	"windowsKey.long": "Клавиша Windows"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/base/common/processes.i18n.json b/i18n/rus/src/vs/base/common/processes.i18n.json
deleted file mode 100644
index 3eb24fd548f..00000000000
--- a/i18n/rus/src/vs/base/common/processes.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"ExecutableParser.commandMissing": "Ошибка: в исполняемых данных должна определяться команда типа string.",
-	"ExecutableParser.isShellCommand": "Предупреждение: isShellCommand должен иметь тип boolean. Игнорируется значение {0}.",
-	"ExecutableParser.args": "Предупреждение: аргументы должны иметь тип string[]. Игнорируется значение {0}.",
-	"ExecutableParser.invalidCWD": "Предупреждение: options.cwd должен иметь тип string. Игнорируется значение {0}."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/base/common/severity.i18n.json b/i18n/rus/src/vs/base/common/severity.i18n.json
deleted file mode 100644
index eaeabe67095..00000000000
--- a/i18n/rus/src/vs/base/common/severity.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"sev.error": "Ошибка",
-	"sev.warning": "Предупреждение",
-	"sev.info": "Сведения"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/base/node/processes.i18n.json b/i18n/rus/src/vs/base/node/processes.i18n.json
deleted file mode 100644
index 4971daf4f3d..00000000000
--- a/i18n/rus/src/vs/base/node/processes.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"TaskRunner.UNC": "Не удается выполнить команду оболочки на диске UNC."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/base/node/ps.i18n.json b/i18n/rus/src/vs/base/node/ps.i18n.json
deleted file mode 100644
index 83e49b47cbf..00000000000
--- a/i18n/rus/src/vs/base/node/ps.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"collecting": "Сбор информации о процессоре и памяти. Это может занять пару секунд."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/base/node/zip.i18n.json b/i18n/rus/src/vs/base/node/zip.i18n.json
deleted file mode 100644
index d4e29cd759b..00000000000
--- a/i18n/rus/src/vs/base/node/zip.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"incompleteExtract": "Операция не завершена. Найдено {0} из {1} записей",
-	"notFound": "{0} не найдено в ZIP-архиве."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/base/parts/quickopen/browser/quickOpenModel.i18n.json b/i18n/rus/src/vs/base/parts/quickopen/browser/quickOpenModel.i18n.json
deleted file mode 100644
index 06a6d56b605..00000000000
--- a/i18n/rus/src/vs/base/parts/quickopen/browser/quickOpenModel.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"quickOpenAriaLabelEntry": "{0}, средство выбора",
-	"quickOpenAriaLabel": "средство выбора"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/base/parts/quickopen/browser/quickOpenWidget.i18n.json b/i18n/rus/src/vs/base/parts/quickopen/browser/quickOpenWidget.i18n.json
deleted file mode 100644
index 2fc5a65f0c9..00000000000
--- a/i18n/rus/src/vs/base/parts/quickopen/browser/quickOpenWidget.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"quickOpenAriaLabel": "Средство быстрого выбора. Введите, чтобы сузить результаты.",
-	"treeAriaLabel": "Средство быстрого выбора"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/base/parts/tree/browser/treeDefaults.i18n.json b/i18n/rus/src/vs/base/parts/tree/browser/treeDefaults.i18n.json
deleted file mode 100644
index 2c6970ced73..00000000000
--- a/i18n/rus/src/vs/base/parts/tree/browser/treeDefaults.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"collapse": "Свернуть"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json b/i18n/rus/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
deleted file mode 100644
index 6d3f99cb3bb..00000000000
--- a/i18n/rus/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hide": "скрыть",
-	"show": "показать",
-	"previewOnGitHub": "Предварительный просмотр в GitHub",
-	"loadingData": "Загрузка данных...",
-	"rateLimited": "Превышено ограничение на количество запросов GitHub. Подождите.",
-	"similarIssues": "Похожие проблемы",
-	"open": "Открыть",
-	"closed": "Закрыто",
-	"noSimilarIssues": "Подобные задачи не найдены",
-	"settingsSearchIssue": "Проблема с параметрами поиска",
-	"bugReporter": "Отчет об ошибках",
-	"featureRequest": "Запрос функции",
-	"performanceIssue": "Проблема с производительностью",
-	"stepsToReproduce": "Действия для воспроизведения проблемы",
-	"bugDescription": "Опишите действия для точного воспроизведения проблемы. Включите фактические и ожидаемые результаты. Поддерживается разметка Markdown в стиле GitHub. Вы можете отредактировать текст проблемы и добавить снимки экрана при просмотре проблемы в GitHub.",
-	"performanceIssueDesciption": "Когда возникла эта проблема с производительностью? Происходит ли она при запуске или после указанной серии действий? Поддерживается разметка Markdown в стиле GitHub. Вы можете отредактировать текст проблемы и добавить снимки экрана при просмотре проблемы в GitHub.",
-	"description": "Описание",
-	"featureRequestDescription": "Опишите функцию, которую хотели бы увидеть. Поддерживается разметка Markdown в стиле GitHub. Вы можете отредактировать текст проблемы и добавить снимки экрана при просмотре проблемы в GitHub.",
-	"expectedResults": "Ожидаемые результаты",
-	"settingsSearchResultsDescription": "Укажите результаты, которые должны быть получены для этого поискового запроса. Поддерживается разметка Markdown в стиле GitHub. Вы можете отредактировать текст проблемы и добавить снимки экрана при просмотре проблемы в GitHub.",
-	"pasteData": "Мы скопировали необходимые данные в буфер обмена, так как у них был слишком большой размер для отправки. Вставьте эти данные.",
-	"disabledExtensions": "Расширения отключены"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json b/i18n/rus/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
deleted file mode 100644
index cd7ea704ca0..00000000000
--- a/i18n/rus/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"completeInEnglish": "Заполните форму на английском языке.",
-	"issueTypeLabel": "Это",
-	"issueSourceLabel": "Файл в",
-	"vscode": "Visual Studio Code",
-	"extension": "Расширение",
-	"disableExtensionsLabelText": "Попробуйте воспроизвести проблему после {0}. Если проблема появляется только когда расширения включены, то это скорее всего проблема с расширением.",
-	"disableExtensions": "отключение всех расширений и перезагрузка окна",
-	"chooseExtension": "Расширение",
-	"issueTitleLabel": "Название",
-	"issueTitleRequired": "Введите название.",
-	"titleLengthValidation": "Название слишком длинное.",
-	"details": "Укажите сведения.",
-	"sendSystemInfo": "Включить сведения о моей системе ({0})",
-	"show": "показать",
-	"sendProcessInfo": "Включить сведения о запущенных процессах ({0})",
-	"sendWorkspaceInfo": "Включить метаданные рабочей области ({0})",
-	"sendExtensions": "Включить сведения об активных расширениях ({0})",
-	"sendSearchedExtensions": "Отправить сведения о расширениях, для которых выполнялся поиск ({0})",
-	"sendSettingsSearchDetails": "Отправить сведения о параметрах поиска ({0})"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/code/electron-browser/processExplorer/processExplorerMain.i18n.json b/i18n/rus/src/vs/code/electron-browser/processExplorer/processExplorerMain.i18n.json
deleted file mode 100644
index 7531671318a..00000000000
--- a/i18n/rus/src/vs/code/electron-browser/processExplorer/processExplorerMain.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"cpu": "Загрузка ЦП (%)",
-	"memory": "Память (МБ)",
-	"pid": "идентификатор процесса",
-	"name": "Имя",
-	"killProcess": "Завершить процесс",
-	"forceKillProcess": "Принудительно убить процесс",
-	"copy": "Копировать",
-	"copyAll": "Копировать все"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/code/electron-main/auth.i18n.json b/i18n/rus/src/vs/code/electron-main/auth.i18n.json
deleted file mode 100644
index ba63a0fa319..00000000000
--- a/i18n/rus/src/vs/code/electron-main/auth.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"authRequire": "Требуется проверка подлинности прокси-сервера",
-	"proxyauth": "Прокси-сервер {0} требует проверки подлинности."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/code/electron-main/logUploader.i18n.json b/i18n/rus/src/vs/code/electron-main/logUploader.i18n.json
deleted file mode 100644
index 34e056e905a..00000000000
--- a/i18n/rus/src/vs/code/electron-main/logUploader.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"invalidEndpoint": "Недопустимая конечная точка средства отправки журнала",
-	"beginUploading": "Отправка...",
-	"didUploadLogs": "Отправка успешно завершена! Идентификатор файла журнала: {0}",
-	"logUploadPromptHeader": "Вы собираетесь отправить журналы сеанса в защищенную конечную точку Майкрософт, доступ к которой есть только у участников команды VS Code из Майкрософт.",
-	"logUploadPromptBody": "Журналы сеансов могут содержать личную информацию, например, полные пути и содержимое файлов. Просмотрите файлы журналов и удалите из них личную информацию здесь: '{0}'",
-	"logUploadPromptBodyDetails": "Нажимая кнопку \"Продолжить\", вы подтверждаете, что просмотрели файлы журналов сеанса, удалили из них личную информацию и соглашаетесь с тем, что Майкрософт будет использовать эти файлы для отладки VS Code.",
-	"logUploadPromptAcceptInstructions": "Чтобы продолжить отправку, запустите код с параметром \"--upload-logs={0}\"",
-	"postError": "Ошибка размещения журналов: {0}",
-	"responseError": "Ошибка размещения журналов. Получено {0} — {1}",
-	"parseError": "Ошибка разбора ответа",
-	"zipError": "Ошибка архивирования журналов: {0}"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/code/electron-main/main.i18n.json b/i18n/rus/src/vs/code/electron-main/main.i18n.json
deleted file mode 100644
index f870935460b..00000000000
--- a/i18n/rus/src/vs/code/electron-main/main.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"secondInstanceNoResponse": "Еще один экземпляр {0} запущен, но не отвечает",
-	"secondInstanceNoResponseDetail": "Закройте все остальные экземпляры и повторите попытку.",
-	"secondInstanceAdmin": "Уже запущен второй экземпляр {0} от имени администратора.",
-	"secondInstanceAdminDetail": "Закройте другой экземпляр и повторите попытку.",
-	"close": "&&Закрыть"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/code/electron-main/menus.i18n.json b/i18n/rus/src/vs/code/electron-main/menus.i18n.json
deleted file mode 100644
index 6c6420ff3ff..00000000000
--- a/i18n/rus/src/vs/code/electron-main/menus.i18n.json
+++ /dev/null
@@ -1,193 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"mFile": "&&Файл",
-	"mEdit": "&&Правка",
-	"mSelection": "&&Выделение",
-	"mView": "В&&ид",
-	"mGoto": "Перей&&ти",
-	"mDebug": "&&Отладка",
-	"mWindow": "Окно",
-	"mHelp": "&&Справка",
-	"mTask": "&&Задачи",
-	"miNewWindow": "&&Новое окно",
-	"mAbout": "О программе {0}",
-	"mServices": "Службы",
-	"mHide": "Скрыть {0}",
-	"mHideOthers": "Скрыть другие",
-	"mShowAll": "Показать все",
-	"miQuit": "Выйти из {0}",
-	"miNewFile": "&&Новый файл",
-	"miOpen": "Открыть...",
-	"miOpenWorkspace": "Открыть рабочую &&область...",
-	"miOpenFolder": "Открыть &&папку...",
-	"miOpenFile": "&&Открыть файл...",
-	"miOpenRecent": "Открыть &&последние",
-	"miSaveWorkspaceAs": "Сохранить рабочую область как...",
-	"miAddFolderToWorkspace": "Доб&&авить папку в рабочую область...",
-	"miSave": "Сохранить",
-	"miSaveAs": "Сохранить &&как...",
-	"miSaveAll": "Сохранить &&все",
-	"miAutoSave": "Автосохранение",
-	"miRevert": "Отменить &&изменения в файле",
-	"miCloseWindow": "Закрыть &&окно",
-	"miCloseWorkspace": "Закрыть &&рабочую область",
-	"miCloseFolder": "Закрыть &&папку",
-	"miCloseEditor": "&&Закрыть редактор",
-	"miExit": "В&&ыход",
-	"miOpenSettings": "&&Параметры",
-	"miOpenKeymap": "&&Сочетания клавиш",
-	"miOpenKeymapExtensions": "&&Расширения раскладки клавиатуры",
-	"miOpenSnippets": "&&Фрагменты кода пользователя",
-	"miSelectColorTheme": "Цветовая &&тема",
-	"miSelectIconTheme": "Тема значка &&файла",
-	"miPreferences": "Параметры",
-	"miReopenClosedEditor": "&&Повторно открыть закрытый редактор",
-	"miMore": "&&Дополнительные сведения...",
-	"miClearRecentOpen": "&&Очистить недавно открытые",
-	"miUndo": "Отменить",
-	"miRedo": "Вернуть",
-	"miCut": "Вы&&резать",
-	"miCopy": "Копировать",
-	"miPaste": "Вставить",
-	"miFind": "Найти",
-	"miReplace": "Заменить",
-	"miFindInFiles": "Найти в &&файлах",
-	"miReplaceInFiles": "Заменить &&в файлах",
-	"miEmmetExpandAbbreviation": "Emmet: ра&&звернуть сокращение",
-	"miShowEmmetCommands": "E&&mmet...",
-	"miToggleLineComment": "Переключить комментарий &&строки",
-	"miToggleBlockComment": "Переключить комментарий &&блока",
-	"miMultiCursorAlt": "Для работы в режиме нескольких курсоров нажмите левую кнопку мыши, удерживая клавишу ALT",
-	"miMultiCursorCmd": "Для работы в режиме нескольких курсоров нажмите левую кнопку мыши, удерживая клавишу COMMAND ",
-	"miMultiCursorCtrl": "Для работы в режиме нескольких курсоров нажмите левую кнопку мыши, удерживая клавишу CTRL",
-	"miInsertCursorAbove": "Добавить курсор &&выше",
-	"miInsertCursorBelow": "Добавить курсор &&ниже",
-	"miInsertCursorAtEndOfEachLineSelected": "Добавить курсоры в &&окончания строк",
-	"miAddSelectionToNextFindMatch": "Добавить &&следующее вхождение",
-	"miAddSelectionToPreviousFindMatch": "Добавить &&предыдущее вхождение",
-	"miSelectHighlights": "Выбрать все &&вхождения",
-	"miCopyLinesUp": "&&Копировать на строку выше",
-	"miCopyLinesDown": "Копировать на строку &&ниже",
-	"miMoveLinesUp": "Переместить на с&&троку выше",
-	"miMoveLinesDown": "&&Переместить на строку ниже",
-	"miSelectAll": "&&Выделить все",
-	"miSmartSelectGrow": "&&Развернуть выделение",
-	"miSmartSelectShrink": "&&Сжать выделение",
-	"miViewExplorer": "Проводник",
-	"miViewSearch": "Поиск",
-	"miViewSCM": "S&&CM",
-	"miViewDebug": "Отладка",
-	"miViewExtensions": "Р&&асширения",
-	"miToggleOutput": "Вывод",
-	"miToggleDebugConsole": "Ко&&нсоль отладки",
-	"miToggleIntegratedTerminal": "&&Интегрированный терминал",
-	"miMarker": "Проблемы",
-	"miCommandPalette": "&&Палитра команд...",
-	"miOpenView": "&&Открыть представление...",
-	"miToggleFullScreen": "Включить/выключить полно&&экранный режим",
-	"miToggleZenMode": "Включить/отключить режим \"Дзен\"",
-	"miToggleCenteredLayout": "Включить/отключить расположение по центру",
-	"miToggleMenuBar": "Показать/скрыть строку &&меню",
-	"miSplitEditor": "Разделить &&редактор",
-	"miToggleEditorLayout": "Переключить &&структуру группы редакторов",
-	"miToggleSidebar": "Показать/скрыть &&боковую панель",
-	"miMoveSidebarRight": "&&Переместить боковую панель вправо",
-	"miMoveSidebarLeft": "&&Переместить боковую панель влево",
-	"miTogglePanel": "Показать/скрыть п&&анель",
-	"miHideStatusbar": "&&Скрыть строку состояния",
-	"miShowStatusbar": "&&Показать строку состояния",
-	"miHideActivityBar": "Скрыть &&панель действий",
-	"miShowActivityBar": "Показать &&панель действий",
-	"miToggleWordWrap": "&&Включить/выключить перенос текста",
-	"miToggleMinimap": "Переключить мини-карту",
-	"miToggleRenderWhitespace": "Показать/&&скрыть символы пробелов",
-	"miToggleRenderControlCharacters": "Переключить &&управляющие символы",
-	"miZoomIn": "&&Увеличить",
-	"miZoomOut": "У&&меньшить",
-	"miZoomReset": "&&Сбросить масштаб",
-	"miBack": "&&Назад",
-	"miForward": "&&Вперед",
-	"miNextEditor": "&&Следующий редактор",
-	"miPreviousEditor": "&&Предыдущий редактор",
-	"miNextEditorInGroup": "&&Следующий используемый редактор в группе",
-	"miPreviousEditorInGroup": "&&Предыдущий используемый редактор в группе",
-	"miSwitchEditor": "Переключить р&&едактор",
-	"miFocusFirstGroup": "&&Первая группа",
-	"miFocusSecondGroup": "&&Вторая группа",
-	"miFocusThirdGroup": "&&Третья группа",
-	"miNextGroup": "&&Следующая группа",
-	"miPreviousGroup": "&&Предыдущая группа",
-	"miSwitchGroup": "Переключить &&группу",
-	"miGotoFile": "Перейти к &&файлу...",
-	"miGotoSymbolInFile": "Перейти к &&символу в файле...",
-	"miGotoSymbolInWorkspace": "Перейти к символу в &&рабочей области...",
-	"miGotoDefinition": "Перейти к &&определению",
-	"miGotoTypeDefinition": "Перейти к &&определению типа",
-	"miGotoImplementation": "Перейти к &&реализации",
-	"miGotoLine": "Перейти к &&строке...",
-	"miStartDebugging": "&&Запустить отладку",
-	"miStartWithoutDebugging": "Начать &&без отладки",
-	"miStopDebugging": "&&Остановить отладку",
-	"miRestart Debugging": "&&Перезапустить отладку",
-	"miOpenConfigurations": "От&&крыть конфигурации",
-	"miAddConfiguration": "Добавить конфигурацию...",
-	"miStepOver": "Шаг с о&&бходом",
-	"miStepInto": "Ш&&аг с заходом",
-	"miStepOut": "Шаг с &&выходом",
-	"miContinue": "&&Продолжить",
-	"miToggleBreakpoint": "Перек&&лючить точку останова",
-	"miConditionalBreakpoint": "У&&словная точка останова...",
-	"miInlineBreakpoint": "Внутренняя точ&&ка останова",
-	"miFunctionBreakpoint": "&&Точка останова функции...",
-	"miLogPoint": "&&Точка журнала...",
-	"miNewBreakpoint": "&&Новая точка останова",
-	"miEnableAllBreakpoints": "Включить все точки останова",
-	"miDisableAllBreakpoints": "Отключить &&все точки останова",
-	"miRemoveAllBreakpoints": "&&Удалить &&все точки останова",
-	"miInstallAdditionalDebuggers": "У&&становить дополнительные отладчики...",
-	"mMinimize": "Свернуть",
-	"mZoom": "Изменить масштаб",
-	"mBringToFront": "Переместить все на передний план",
-	"miSwitchWindow": "Переключить &&окно...",
-	"mShowPreviousTab": "Показать предыдущую вкладку",
-	"mShowNextTab": "Показать следующую вкладку",
-	"mMoveTabToNewWindow": "Переместить вкладку в новое окно",
-	"mMergeAllWindows": "Объединить все окна",
-	"miToggleDevTools": "&&Показать/скрыть средства разработчика",
-	"miAccessibilityOptions": "Специальные &&возможности",
-	"miOpenProcessExplorerer": "Открыть &&обозреватель процессов",
-	"miReportIssue": "Сообщить о &&проблеме",
-	"miWelcome": "&&Приветствие",
-	"miInteractivePlayground": "&&Интерактивная площадка",
-	"miDocumentation": "&&Документация",
-	"miReleaseNotes": "&&Заметки о выпуске",
-	"miKeyboardShortcuts": "С&&правочник по сочетаниям клавиш",
-	"miIntroductoryVideos": "Вступительные в&&идео",
-	"miTipsAndTricks": "&&Советы и рекомендации",
-	"miTwitter": "&&Присоединяйтесь к нам в Twitter",
-	"miUserVoice": "&&Поиск запросов функций",
-	"miLicense": "Просмотреть &&лицензию",
-	"miPrivacyStatement": "&&Заявление о конфиденциальности",
-	"miAbout": "&&О программе",
-	"miRunTask": "&&Запустить задачу...",
-	"miBuildTask": "Запустить &&задачу сборки...",
-	"miRunningTask": "Показать выполняющ&&иеся задачи...",
-	"miRestartTask": "П&&ерезапустить запущенную задачу...",
-	"miTerminateTask": "&&Завершить задачу...",
-	"miConfigureTask": "&&Настроить задачи...",
-	"miConfigureBuildTask": "Настроить задачу сборки по у&&молчанию...",
-	"accessibilityOptionsWindowTitle": "Специальные возможности",
-	"miCheckForUpdates": "Проверить наличие обновлений...",
-	"miCheckingForUpdates": "Идет проверка наличия обновлений...",
-	"miDownloadUpdate": "Скачать доступное обновление",
-	"miDownloadingUpdate": "Скачивается обновление...",
-	"miInstallUpdate": "Установить обновление...",
-	"miInstallingUpdate": "Идет установка обновления...",
-	"miRestartToUpdate": "Перезапустить программу для обновления..."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/code/electron-main/window.i18n.json b/i18n/rus/src/vs/code/electron-main/window.i18n.json
deleted file mode 100644
index c8ded116278..00000000000
--- a/i18n/rus/src/vs/code/electron-main/window.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hiddenMenuBar": "Вы по-прежнему можете получить доступ к строке меню, нажав клавишу ALT."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/code/electron-main/windows.i18n.json b/i18n/rus/src/vs/code/electron-main/windows.i18n.json
deleted file mode 100644
index d379d233127..00000000000
--- a/i18n/rus/src/vs/code/electron-main/windows.i18n.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"ok": "ОК",
-	"pathNotExistTitle": "Путь не существует.",
-	"pathNotExistDetail": "Путь \"{0}\" больше не существует на диске.",
-	"reopen": "&&Открыть повторно",
-	"wait": "&&Подождать",
-	"close": "&&Закрыть",
-	"appStalled": "Окно не отвечает",
-	"appStalledDetail": "Вы можете повторно открыть окно, закрыть его или продолжить ожидание.",
-	"appCrashed": "Сбой окна",
-	"appCrashedDetail": "Приносим извинения за неудобство! Вы можете повторно открыть окно, чтобы продолжить работу с того места, на котором остановились.",
-	"open": "Открыть",
-	"openFolder": "Открыть папку",
-	"openFile": "Открыть файл",
-	"workspaceOpenedMessage": "Не удается сохранить рабочую область '{0}'",
-	"workspaceOpenedDetail": "Эта рабочая область уже открыта в другом окне. Закройте это окно и повторите попытку.",
-	"openWorkspace": "&&Открыть...",
-	"openWorkspaceTitle": "Открыть рабочую область",
-	"save": "Сохранить",
-	"doNotSave": "&&Не сохранять",
-	"cancel": "Отмена",
-	"saveWorkspaceMessage": "Вы хотите сохранить конфигурацию рабочей области в файле?",
-	"saveWorkspaceDetail": "Сохраните рабочую область, если хотите открыть ее позже.",
-	"saveWorkspace": "Сохранить рабочую область"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/code/node/cliProcessMain.i18n.json b/i18n/rus/src/vs/code/node/cliProcessMain.i18n.json
deleted file mode 100644
index 4424d0ecbc0..00000000000
--- a/i18n/rus/src/vs/code/node/cliProcessMain.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"notFound": "Расширение \"{0}\" не найдено.",
-	"notInstalled": "Расширение \"{0}\" не установлено.",
-	"useId": "Используйте полный идентификатор расширения, включающий издателя, например: {0}",
-	"successVsixInstall": "Расширение \"{0}\" успешно установлено.",
-	"cancelVsixInstall": "Установка расширения '{0}' отменена.",
-	"alreadyInstalled": "Расширение \"{0}\" уже установлено.",
-	"foundExtension": "Найдено \"{0}\" в Marketplace.",
-	"installing": "Установка...",
-	"successInstall": "Расширение \"{0}\" версии {1} успешно установлено.",
-	"uninstalling": "Удаление {0}...",
-	"successUninstall": "Расширение \"{0}\" успешно удалено."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/editor/browser/services/bulkEdit.i18n.json b/i18n/rus/src/vs/editor/browser/services/bulkEdit.i18n.json
deleted file mode 100644
index a2b4834beae..00000000000
--- a/i18n/rus/src/vs/editor/browser/services/bulkEdit.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"summary.0": "Нет изменений",
-	"summary.nm": "Сделано изменений {0} в {1} файлах",
-	"summary.n0": "Сделано изменений {0} в одном файле",
-	"conflict": "Следующие файлы были изменены: {0}"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/editor/browser/widget/codeEditorWidget.i18n.json b/i18n/rus/src/vs/editor/browser/widget/codeEditorWidget.i18n.json
deleted file mode 100644
index b56dc782df0..00000000000
--- a/i18n/rus/src/vs/editor/browser/widget/codeEditorWidget.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"cursors.maximum": "Количество курсоров ограничено {0}."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/editor/browser/widget/diffEditorWidget.i18n.json b/i18n/rus/src/vs/editor/browser/widget/diffEditorWidget.i18n.json
deleted file mode 100644
index 4a2dc357dde..00000000000
--- a/i18n/rus/src/vs/editor/browser/widget/diffEditorWidget.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"diff.tooLarge": "Нельзя сравнить файлы, потому что один из файлов слишком большой."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/editor/browser/widget/diffReview.i18n.json b/i18n/rus/src/vs/editor/browser/widget/diffReview.i18n.json
deleted file mode 100644
index 874a4a98a8e..00000000000
--- a/i18n/rus/src/vs/editor/browser/widget/diffReview.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"label.close": "Закрыть",
-	"no_lines": "строки отсутствуют",
-	"one_line": "1 строка",
-	"more_lines": "строк: {0}",
-	"header": "Различие {0} из {1}; исходная версия: {2}, {3}, измененная версия: {4}, {5}",
-	"blankLine": "пустой",
-	"equalLine": "Исходная версия: {0}, измененная версия: {1}: {2}",
-	"insertLine": "+ измененная версия: {0}: {1}",
-	"deleteLine": "- исходная версия: {0}: {1}",
-	"editor.action.diffReview.next": "Перейти к следующему различию",
-	"editor.action.diffReview.prev": "Перейти к предыдущему различию"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/editor/common/commonCodeEditor.i18n.json b/i18n/rus/src/vs/editor/common/commonCodeEditor.i18n.json
deleted file mode 100644
index b56dc782df0..00000000000
--- a/i18n/rus/src/vs/editor/common/commonCodeEditor.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"cursors.maximum": "Количество курсоров ограничено {0}."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/editor/common/config/commonEditorConfig.i18n.json b/i18n/rus/src/vs/editor/common/config/commonEditorConfig.i18n.json
deleted file mode 100644
index 66cf48db0f5..00000000000
--- a/i18n/rus/src/vs/editor/common/config/commonEditorConfig.i18n.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"editorConfigurationTitle": "Редактор",
-	"fontFamily": "Определяет семейство шрифтов.",
-	"fontWeight": "Управляет насыщенностью шрифта.",
-	"fontSize": "Управляет размером шрифта в пикселях.",
-	"lineHeight": "Управляет высотой строк. Укажите 0 для вычисления высоты строки по размеру шрифта.",
-	"letterSpacing": "Управляет интервалом между буквами в пикселях.",
-	"lineNumbers.off": "Номера строк не отображаются.",
-	"lineNumbers.on": "Отображаются абсолютные номера строк.",
-	"lineNumbers.relative": "Отображаемые номера строк вычисляются как расстояние в строках до положения курсора.",
-	"lineNumbers.interval": "Номера строк отображаются каждые 10 строк.",
-	"lineNumbers": "Управляет отображением номеров строк.",
-	"rulers": "Отображать вертикальные линейки после определенного числа моноширинных символов. Для отображения нескольких линеек укажите несколько значений. Если не указано ни одного значения, вертикальные линейки отображаться не будут.",
-	"wordSeparators": "Символы, которые будут использоваться как разделители слов при выполнении навигации или других операций, связанных со словами.",
-	"tabSize": "Число пробелов в табуляции. Этот параметр переопределяется на основе содержимого файла, если установлен параметр \"editor.detectIndentation\".",
-	"tabSize.errorMessage": "Ожидается число. Обратите внимание, что значение auto заменено параметром editor.detectIndentation.",
-	"insertSpaces": "Вставлять пробелы при нажатии клавиши TAB. Этот параметр переопределяется на основе содержимого файла, если установлен параметр \"editor.detectIndentation\". ",
-	"insertSpaces.errorMessage": "Ожидается логическое значение. Обратите внимание, что значение auto заменено параметром editor.detectIndentation.",
-	"detectIndentation": "При открытии файла editor.tabSize и editor.insertSpaces будут определяться на основе содержимого файла.",
-	"roundedSelection": "Определяет, будут ли выделения иметь скругленные углы.",
-	"scrollBeyondLastLine": "Определяет, будет ли содержимое редактора прокручиваться за последнюю строку.",
-	"scrollBeyondLastColumn": "Управляет количеством дополнительных символов, на которое содержимое редактора будет прокручиваться по горизонтали.",
-	"smoothScrolling": "Определяет, будет ли использоваться анимация при прокрутке содержимого редактора",
-	"minimap.enabled": "Определяет, отображается ли мини-карта",
-	"minimap.side": "Определяет, с какой стороны будет отображаться мини-карта.",
-	"minimap.showSlider": "Определяет, будет ли автоматически скрываться ползунок мини-карты",
-	"minimap.renderCharacters": "Отображает фактические символы в строке вместо цветных блоков.",
-	"minimap.maxColumn": "Ограничивает ширину мини-карты для отображения числа столбцов не больше определенного.",
-	"find.seedSearchStringFromSelection": "Определяет, можно ли передать строку поиска в мини-приложение поиска из текста, выделенного в редакторе",
-	"find.autoFindInSelection": "Определяет, будет ли снят флажок \"Поиск в выделенном\", когда в редакторе выбрано несколько символов или строк текста",
-	"find.globalFindClipboard": "Определяет, должно ли мини-приложение поиска считывать или изменять общий буфер обмена поиска в macOS",
-	"wordWrap.off": "Строки не будут переноситься никогда.",
-	"wordWrap.on": "Строки будут переноситься по ширине окна просмотра.",
-	"wordWrap.wordWrapColumn": "Строки будут переноситься по \"editor.wordWrapColumn\".",
-	"wordWrap.bounded": "Строки будут перенесены по минимальному значению из двух: ширина окна просмотра и \"editor.wordWrapColumn\".",
-	"wordWrap": "Определяет, как должны переноситься строки. Допустимые значения:\n - \"off\" (отключить перенос);\n - \"on\" (перенос окна просмотра);\n - \"wordWrapColumn\" (перенос в \"editor.wordWrapColumn\");\n - \"bounded\" (перенос при минимальной ширине окна просмотра и \"editor.wordWrapColumn\").",
-	"wordWrapColumn": "Определяет столбец переноса редактора, если значение \"editor.wordWrap\" — \"wordWrapColumn\" или \"bounded\".",
-	"wrappingIndent": "Управляет отступом строк с переносом по словам. Допустимые значения: 'none', 'same', 'indent' и 'deepIndent'.",
-	"mouseWheelScrollSensitivity": "Множитель, используемый для параметров deltaX и deltaY событий прокрутки колесика мыши.",
-	"multiCursorModifier.ctrlCmd": "Соответствует клавише CTRL в Windows и Linux и клавише COMMAND в macOS.",
-	"multiCursorModifier.alt": "Соответствует клавише ALT в Windows и Linux и клавише OPTION в macOS.",
-	"multiCursorModifier": "Модификатор, который будет использоваться для добавления нескольких курсоров с помощью мыши. \"ctrlCmd\" соответствует клавише CTRL в Windows и Linux и клавише COMMAND в macOS. Жесты мыши \"Перейти к определению\" и \"Открыть ссылку\" будут изменены так, чтобы они не конфликтовали с несколькими курсорами.",
-	"multiCursorMergeOverlapping": "Объединить несколько курсоров, когда они перекрываются.",
-	"quickSuggestions.strings": "Разрешение кратких предложений в строках.",
-	"quickSuggestions.comments": "Разрешение кратких предложений в комментариях.",
-	"quickSuggestions.other": "Разрешение кратких предложений вне строк и комментариев.",
-	"quickSuggestions": "Определяет, должны ли при вводе текста автоматически отображаться предложения",
-	"quickSuggestionsDelay": "Управляет длительностью задержки (в мс), перед отображением кратких предложений.",
-	"parameterHints": "Включает всплывающее окно с документацией по параметру и сведениями о типе, которое отображается во время набора",
-	"autoClosingBrackets": "Определяет, должен ли редактор автоматически закрывать скобки после открытия.",
-	"formatOnType": "Управляет параметром, определяющим, должен ли редактор автоматически форматировать строку после ввода.",
-	"formatOnPaste": "Определяет, будет ли редактор автоматически форматировать вставленное содержимое. Модуль форматирования должен быть доступен и иметь возможность форматировать диапазон в документе.",
-	"autoIndent": "Определяет, должен ли редактор автоматически изменять отступ при вводе текста, вставке текста или перемещении строк. Для использования этого параметра должны быть доступны правила отступа для данного языка.",
-	"suggestOnTriggerCharacters": "Определяет, должны ли при вводе триггерных символов автоматически отображаться предложения.",
-	"acceptSuggestionOnEnter": "Определяет, будут ли предложения приниматься клавишей ВВОД в дополнение к клавише TAB. Это помогает избежать неоднозначности между вставкой новых строк и принятием предложений. Значение \"smart\" означает, что при изменении текста предложения будут приниматься только при нажатии клавиши ВВОД.",
-	"acceptSuggestionOnCommitCharacter": "Определяет, будут ли предложения приниматься символами фиксации. Например, в JavaScript точка с запятой (\";\") может быть символом фиксации, принимающим предложение и вводящим данный символ.",
-	"snippetSuggestions.top": "Отображать предложения фрагментов поверх других предложений.",
-	"snippetSuggestions.bottom": "Отображать предложения фрагментов под другими предложениями.",
-	"snippetSuggestions.inline": "Отображать предложения фрагментов рядом с другими предложениями.",
-	"snippetSuggestions.none": "Не отображать предложения фрагментов.",
-	"snippetSuggestions": "Управляет отображением фрагментов вместе с другими предложениями и их сортировкой.",
-	"emptySelectionClipboard": "Управляет тем, копируется ли текущая строка при копировании без выделения.",
-	"wordBasedSuggestions": "Определяет, следует ли оценивать завершения на основе слов в документе.",
-	"suggestSelection.first": "Всегда выбирать первое предложение.",
-	"suggestSelection.recentlyUsed": "Выбирать недавно использованные предложения, если введенному тексту не соответствует конкретное предложение, например, при вводе текста \"console.|\" будет выбрано предложение \"console.log\", так как \"log\" использовалось недавно.",
-	"suggestSelection.recentlyUsedByPrefix": "Выбирать предложения на основе предыдущих префиксов, которые завершали эти предложения, например, выбирать предложение \"console\" для \"co\" и предложение \"const\" для \"con\".",
-	"suggestSelection": "Управляет предварительным выбором предложений при отображении списка предложений.",
-	"suggestFontSize": "Размер шрифта мини-приложения предложений",
-	"suggestLineHeight": "Высота строки мини-приложения с предложениями",
-	"selectionHighlight": "Определяет, будет ли редактор выделять фрагменты, совпадающие с выделенным текстом.",
-	"occurrencesHighlight": "Определяет, должен ли редактор выделять экземпляры семантических символов.",
-	"overviewRulerLanes": "Определяет, сколько украшений могут отображаться на одном месте в обзорной линейке.",
-	"overviewRulerBorder": "Определяет, следует ли рисовать границу на обзорной линейке.",
-	"cursorBlinking": "Управляет стилем анимации курсора.",
-	"mouseWheelZoom": "Изменение размера шрифта в редакторе при нажатой клавише CTRL и движении колесика мыши",
-	"cursorStyle": "Определяет стиль курсора. Допустимые значения: \"block\", \"block-outline\", \"line\", \"line-thin\", \"underline\" и \"underline-thin\"",
-	"cursorWidth": "Управляет шириной курсора, когда для параметра editor.cursorStyle установлено значение 'line'",
-	"fontLigatures": "Включает лигатуры шрифта.",
-	"hideCursorInOverviewRuler": "Управляет скрытием курсора в обзорной линейке.",
-	"renderWhitespace": "Определяет, должен ли редактор обрабатывать символы пробела; возможные значения: \"none\", \"boundary\" и \"all\". Параметр \"boundary\" не обрабатывает единичные пробелы между словами.",
-	"renderControlCharacters": "Определяет, должны ли в редакторе отображаться управляющие символы.",
-	"renderIndentGuides": "Определяет, должны ли в редакторе отображаться направляющие отступа.",
-	"renderLineHighlight": "Определяет, должен ли редактор выделять текущую строку. Возможные значения: none, gutter, line и all.",
-	"codeLens": "Управляет отображением CodeLens в редакторе",
-	"folding": "Определяет, включено ли сворачивание кода в редакторе.",
-	"foldingStrategyAuto": "Использовать стратегию сворачивания для конкретного языка, если она доступна; в противном случае использовать стратегию на основе отступов",
-	"foldingStrategyIndentation": "Всегда использовать стратегию сворачивания на основе отступов",
-	"foldingStrategy": "Управляет тем, как вычисляются диапазоны сворачивания. При указании параметра 'auto' используется стратегия сворачивания на основе языка, если она доступна. При указании параметра 'indentation' принудительно используется стратегия на основе отступов.",
-	"showFoldingControls": "Определяет, будут ли автоматически скрываться элементы управления свертыванием на полях.",
-	"matchBrackets": "Выделяет соответствующие скобки при выборе одной из них.",
-	"glyphMargin": "Управляет отображением вертикальных полей глифа в редакторе. Поля глифа в основном используются для отладки.",
-	"useTabStops": "Вставка и удаление пробелов после позиции табуляции",
-	"trimAutoWhitespace": "Удалить автоматически вставляемый конечный пробел",
-	"stablePeek": "Оставлять быстрые редакторы открытыми, даже если дважды щелкнуто их содержимое или нажата клавиша ESC.",
-	"dragAndDrop": "Определяет, следует ли редактору разрешить перемещение выделенных элементов с помощью перетаскивания.",
-	"accessibilitySupport.auto": "Редактор будет определять, подключено ли средство чтения с экрана, с помощью API-интерфейсов платформы.",
-	"accessibilitySupport.on": "Редактор будет оптимизирован для использования со средством чтения с экрана в постоянном режиме.",
-	"accessibilitySupport.off": "Редактор никогда не будет оптимизироваться для использования со средством чтения с экрана.",
-	"accessibilitySupport": "Определяет, следует ли запустить редактор в режиме оптимизации для средства чтения с экрана.",
-	"links": "Определяет, должен ли редактор определять ссылки и делать их доступными для щелчка",
-	"colorDecorators": "Определяет, должны ли в редакторе отображаться внутренние декораторы цвета и средство выбора цвета.",
-	"codeActions": "Включает индикатор действия кода",
-	"codeActionsOnSave.organizeImports": "Упорядочить импорты при сохранении?",
-	"codeActionsOnSave": "Типы действий кода, которые будут выполнены при сохранении.",
-	"codeActionsOnSaveTimeout": "Время ожидания для действий кода, которые будут выполнены при сохранении.",
-	"selectionClipboard": "Контролирует, следует ли поддерживать первичный буфер обмена Linux.",
-	"sideBySide": "Определяет, как редактор несовпадений отображает отличия: рядом или в тексте.",
-	"ignoreTrimWhitespace": "Определяет, должен ли редактор несовпадений трактовать несовпадения символов-разделителей как различия.",
-	"largeFileOptimizations": "Специальная обработка для больших файлов с отключением некоторых функций, которые интенсивно используют память.",
-	"renderIndicators": "Определяет отображение редактором несовпадений индикаторов +/- для добавленных или удаленных изменений"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/editor/common/config/defaultConfig.i18n.json b/i18n/rus/src/vs/editor/common/config/defaultConfig.i18n.json
deleted file mode 100644
index 90b3992a47d..00000000000
--- a/i18n/rus/src/vs/editor/common/config/defaultConfig.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"editorViewAccessibleLabel": "Содержимое редактора"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/editor/common/config/editorOptions.i18n.json b/i18n/rus/src/vs/editor/common/config/editorOptions.i18n.json
deleted file mode 100644
index f0a929b23cb..00000000000
--- a/i18n/rus/src/vs/editor/common/config/editorOptions.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"accessibilityOffAriaLabel": "Редактор сейчас недоступен. Чтобы открыть список действий, нажмите ALT+F1.",
-	"editorViewAccessibleLabel": "Содержимое редактора"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/editor/common/controller/cursor.i18n.json b/i18n/rus/src/vs/editor/common/controller/cursor.i18n.json
deleted file mode 100644
index df99354e610..00000000000
--- a/i18n/rus/src/vs/editor/common/controller/cursor.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"corrupt.commands": "Неожиданное исключение при выполнении команды."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/editor/common/model/textModelWithTokens.i18n.json b/i18n/rus/src/vs/editor/common/model/textModelWithTokens.i18n.json
deleted file mode 100644
index 1256b38bcf5..00000000000
--- a/i18n/rus/src/vs/editor/common/model/textModelWithTokens.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"mode.tokenizationSupportFailed": "Не удалось разметить входные данные."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/editor/common/modes/modesRegistry.i18n.json b/i18n/rus/src/vs/editor/common/modes/modesRegistry.i18n.json
deleted file mode 100644
index 5173a9ec9e0..00000000000
--- a/i18n/rus/src/vs/editor/common/modes/modesRegistry.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"plainText.alias": "Обычный текст"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/editor/common/services/bulkEdit.i18n.json b/i18n/rus/src/vs/editor/common/services/bulkEdit.i18n.json
deleted file mode 100644
index fc197d1c5c6..00000000000
--- a/i18n/rus/src/vs/editor/common/services/bulkEdit.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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}",
-	"summary.0": "Нет изменений",
-	"summary.nm": "Сделано изменений {0} в {1} файлах",
-	"summary.n0": "Сделано изменений {0} в одном файле"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/editor/common/services/modeServiceImpl.i18n.json b/i18n/rus/src/vs/editor/common/services/modeServiceImpl.i18n.json
deleted file mode 100644
index 6c9e4452650..00000000000
--- a/i18n/rus/src/vs/editor/common/services/modeServiceImpl.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"vscode.extension.contributes.languages": "Добавляет объявления языка.",
-	"vscode.extension.contributes.languages.id": "Идентификатор языка.",
-	"vscode.extension.contributes.languages.aliases": "Псевдонимы имен для языка.",
-	"vscode.extension.contributes.languages.extensions": "Расширения имен файлов, связанные с языком.",
-	"vscode.extension.contributes.languages.filenames": "Имена файлов, связанные с языком.",
-	"vscode.extension.contributes.languages.filenamePatterns": "Стандартные маски имен файлов, связанные с языком.",
-	"vscode.extension.contributes.languages.mimetypes": "Типы MIME, связанные с языком.",
-	"vscode.extension.contributes.languages.firstLine": "Регулярное выражение, соответствующее первой строке файла языка.",
-	"vscode.extension.contributes.languages.configuration": "Относительный путь к файлу, содержащему параметры конфигурации для языка."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/editor/common/services/modelServiceImpl.i18n.json b/i18n/rus/src/vs/editor/common/services/modelServiceImpl.i18n.json
deleted file mode 100644
index e12a9398484..00000000000
--- a/i18n/rus/src/vs/editor/common/services/modelServiceImpl.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"diagAndSourceMultiline": "[{0}]\n{1}",
-	"diagAndSource": "[{0}] {1}"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/editor/common/view/editorColorRegistry.i18n.json b/i18n/rus/src/vs/editor/common/view/editorColorRegistry.i18n.json
deleted file mode 100644
index 9d3bc679fc1..00000000000
--- a/i18n/rus/src/vs/editor/common/view/editorColorRegistry.i18n.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"lineHighlight": "Цвет фона для выделения строки в позиции курсора.",
-	"lineHighlightBorderBox": "Цвет фона границ вокруг строки в позиции курсора.",
-	"rangeHighlight": "Фоновый цвет выбранных диапазонов, например, в функциях быстрого открытия и поиска. Цвет должен быть прозрачным чтобы не перекрывать основных знаков отличия.",
-	"rangeHighlightBorder": "Цвет фона обводки выделения.",
-	"caret": "Цвет курсора редактора.",
-	"editorCursorBackground": "Цвет фона курсора редактора. Позволяет настраивать цвет символа, перекрываемого прямоугольным курсором.",
-	"editorWhitespaces": "Цвет пробелов в редакторе.",
-	"editorIndentGuides": "Цвет направляющих для отступов редактора.",
-	"editorActiveIndentGuide": "Цвет активных направляющих для отступов редактора.",
-	"editorLineNumbers": "Цвет номеров строк редактора.",
-	"editorActiveLineNumber": "Цвет номера активной строки редактора",
-	"deprecatedEditorActiveLineNumber": "Параметр 'Id' является устаревшим. Используйте вместо него параметр 'editorLineNumber.activeForeground'.",
-	"editorRuler": "Цвет линейки редактора.",
-	"editorCodeLensForeground": "Цвет переднего плана элемента CodeLens в редакторе",
-	"editorBracketMatchBackground": "Цвет фона парных скобок",
-	"editorBracketMatchBorder": "Цвет прямоугольников парных скобок",
-	"editorOverviewRulerBorder": "Цвет границы для линейки в окне просмотра.",
-	"editorGutter": "Цвет фона поля в редакторе. В поле размещаются отступы глифов и номера строк.",
-	"errorForeground": "Цвет волнистой линии для выделения ошибок в редакторе.",
-	"errorBorder": "Цвет границ волнистой линии для выделения ошибок в редакторе.",
-	"warningForeground": "Цвет волнистой линии для выделения предупреждений в редакторе.",
-	"warningBorder": "Цвет границ волнистой линии для выделения предупреждений в редакторе.",
-	"infoForeground": "Цвет волнистой линии для выделения информационных сообщений в редакторе.",
-	"infoBorder": "Цвет границ волнистой линии для выделения информационных сообщений в редакторе. ",
-	"hintForeground": "Цвет волнистой линии для выделения подсказок в редакторе.",
-	"hintBorder": "Цвет границ волнистой линии для выделения подсказок в редакторе. ",
-	"unnecessaryForeground": "Цвет переднего плана ненужного кода в редакторе.",
-	"overviewRulerRangeHighlight": "Цвет метки линейки в окне просмотра для выделений диапазонов. Цвет должен быть прозрачным, чтобы не перекрывать основные знаки отличия.",
-	"overviewRuleError": "Цвет метки линейки в окне просмотра для ошибок.",
-	"overviewRuleWarning": "Цвет метки линейки в окне просмотра для предупреждений.",
-	"overviewRuleInfo": "Цвет метки линейки в окне просмотра для информационных сообщений."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/editor/contrib/accessibility/browser/accessibility.i18n.json b/i18n/rus/src/vs/editor/contrib/accessibility/browser/accessibility.i18n.json
deleted file mode 100644
index c1c8cf82405..00000000000
--- a/i18n/rus/src/vs/editor/contrib/accessibility/browser/accessibility.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"introMsg": "Благодарим за ознакомление со специальными возможностями VS Code.",
-	"status": "Состояние:",
-	"tabFocusModeOnMsg": "При нажатии клавиши TAB в текущем редакторе фокус ввода переместится на следующий элемент, способный его принять. Чтобы изменить это поведение, нажмите клавишу {0}.",
-	"tabFocusModeOnMsgNoKb": "При нажатии клавиши TAB в текущем редакторе фокус ввода переместится на следующий элемент, способный его принять. Команду {0} сейчас невозможно выполнить с помощью настраиваемого сочетания клавиш.",
-	"tabFocusModeOffMsg": "При нажатии клавиши TAB в текущем редакторе будет вставлен символ табуляции. Чтобы изменить это поведение, нажмите клавишу {0}.",
-	"tabFocusModeOffMsgNoKb": "При нажатии клавиши TAB в текущем редакторе будет вставлен символ табуляции. Команду {0} сейчас невозможно выполнить с помощью настраиваемого сочетания клавиш.",
-	"outroMsg": "Вы можете закрыть эту подсказку и вернуться в редактор, нажав клавишу ESCAPE.",
-	"ShowAccessibilityHelpAction": "Показать справку по специальным возможностям"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/editor/contrib/bracketMatching/bracketMatching.i18n.json b/i18n/rus/src/vs/editor/contrib/bracketMatching/bracketMatching.i18n.json
deleted file mode 100644
index ccd0f3d736d..00000000000
--- a/i18n/rus/src/vs/editor/contrib/bracketMatching/bracketMatching.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"overviewRulerBracketMatchForeground": "Цвет метки линейки в окне просмотра для пар скобок.",
-	"smartSelect.jumpBracket": "Перейти к скобке",
-	"smartSelect.selectToBracket": "Выбрать скобку"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/editor/contrib/bracketMatching/common/bracketMatching.i18n.json b/i18n/rus/src/vs/editor/contrib/bracketMatching/common/bracketMatching.i18n.json
deleted file mode 100644
index b1e1079e98b..00000000000
--- a/i18n/rus/src/vs/editor/contrib/bracketMatching/common/bracketMatching.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"smartSelect.jumpBracket": "Перейти к скобке"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/editor/contrib/caretOperations/caretOperations.i18n.json b/i18n/rus/src/vs/editor/contrib/caretOperations/caretOperations.i18n.json
deleted file mode 100644
index 75241f80c69..00000000000
--- a/i18n/rus/src/vs/editor/contrib/caretOperations/caretOperations.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"caret.moveLeft": "Переместить курсор влево",
-	"caret.moveRight": "Переместить курсор вправо"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/editor/contrib/caretOperations/common/caretOperations.i18n.json b/i18n/rus/src/vs/editor/contrib/caretOperations/common/caretOperations.i18n.json
deleted file mode 100644
index 75a9728d2c7..00000000000
--- a/i18n/rus/src/vs/editor/contrib/caretOperations/common/caretOperations.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"caret.moveLeft": "Переместить курсор влево",
-	"caret.moveRight": "Переместить курсор вправо"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/editor/contrib/caretOperations/common/transpose.i18n.json b/i18n/rus/src/vs/editor/contrib/caretOperations/common/transpose.i18n.json
deleted file mode 100644
index f747bcfde4d..00000000000
--- a/i18n/rus/src/vs/editor/contrib/caretOperations/common/transpose.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"transposeLetters.label": "Транспортировать буквы"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/editor/contrib/caretOperations/transpose.i18n.json b/i18n/rus/src/vs/editor/contrib/caretOperations/transpose.i18n.json
deleted file mode 100644
index 287f2fc3854..00000000000
--- a/i18n/rus/src/vs/editor/contrib/caretOperations/transpose.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"transposeLetters.label": "Транспортировать буквы"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/editor/contrib/clipboard/browser/clipboard.i18n.json b/i18n/rus/src/vs/editor/contrib/clipboard/browser/clipboard.i18n.json
deleted file mode 100644
index 390f04f8581..00000000000
--- a/i18n/rus/src/vs/editor/contrib/clipboard/browser/clipboard.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"actions.clipboard.cutLabel": "Вырезать",
-	"actions.clipboard.copyLabel": "Копировать",
-	"actions.clipboard.pasteLabel": "Вставить",
-	"actions.clipboard.copyWithSyntaxHighlightingLabel": "Копировать с выделением синтаксиса"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/editor/contrib/clipboard/clipboard.i18n.json b/i18n/rus/src/vs/editor/contrib/clipboard/clipboard.i18n.json
deleted file mode 100644
index 0a6c40a6e80..00000000000
--- a/i18n/rus/src/vs/editor/contrib/clipboard/clipboard.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"actions.clipboard.cutLabel": "Вырезать",
-	"actions.clipboard.copyLabel": "Копировать",
-	"actions.clipboard.pasteLabel": "Вставить",
-	"actions.clipboard.copyWithSyntaxHighlightingLabel": "Копировать с выделением синтаксиса"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/editor/contrib/codeAction/codeActionCommands.i18n.json b/i18n/rus/src/vs/editor/contrib/codeAction/codeActionCommands.i18n.json
deleted file mode 100644
index 7137b191cac..00000000000
--- a/i18n/rus/src/vs/editor/contrib/codeAction/codeActionCommands.i18n.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"quickFixWithKb": "Показать исправления ({0})",
-	"quickFix": "Показать исправления",
-	"quickfix.trigger.label": "Быстрое исправление...",
-	"editor.action.quickFix.noneMessage": "Доступные действия кода отсутствуют",
-	"refactor.label": "Рефакторинг...",
-	"editor.action.refactor.noneMessage": "Доступные операции рефакторинга отсутствуют",
-	"source.label": "Исходное действие...",
-	"editor.action.source.noneMessage": "Доступные исходные действия отсутствуют",
-	"organizeImports.label": "Организация импортов",
-	"editor.action.organize.noneMessage": "Действие для упорядочения импортов отсутствует"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/editor/contrib/comment/comment.i18n.json b/i18n/rus/src/vs/editor/contrib/comment/comment.i18n.json
deleted file mode 100644
index 4bf805f70ea..00000000000
--- a/i18n/rus/src/vs/editor/contrib/comment/comment.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"comment.line": "Закомментировать или раскомментировать строку",
-	"comment.line.add": "Закомментировать строку",
-	"comment.line.remove": "Раскомментировать строку",
-	"comment.block": "Закомментировать или раскомментировать блок"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/editor/contrib/comment/common/comment.i18n.json b/i18n/rus/src/vs/editor/contrib/comment/common/comment.i18n.json
deleted file mode 100644
index 58b80b36af4..00000000000
--- a/i18n/rus/src/vs/editor/contrib/comment/common/comment.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"comment.line": "Закомментировать или раскомментировать строку",
-	"comment.line.add": "Закомментировать строку",
-	"comment.line.remove": "Раскомментировать строку",
-	"comment.block": "Закомментировать или раскомментировать блок"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/editor/contrib/contextmenu/browser/contextmenu.i18n.json b/i18n/rus/src/vs/editor/contrib/contextmenu/browser/contextmenu.i18n.json
deleted file mode 100644
index 1d813732e52..00000000000
--- a/i18n/rus/src/vs/editor/contrib/contextmenu/browser/contextmenu.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"action.showContextMenu.label": "Показать контекстное меню редактора"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/editor/contrib/contextmenu/contextmenu.i18n.json b/i18n/rus/src/vs/editor/contrib/contextmenu/contextmenu.i18n.json
deleted file mode 100644
index 50180533dae..00000000000
--- a/i18n/rus/src/vs/editor/contrib/contextmenu/contextmenu.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"action.showContextMenu.label": "Показать контекстное меню редактора"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/editor/contrib/find/browser/findWidget.i18n.json b/i18n/rus/src/vs/editor/contrib/find/browser/findWidget.i18n.json
deleted file mode 100644
index 42b7cc3e8ea..00000000000
--- a/i18n/rus/src/vs/editor/contrib/find/browser/findWidget.i18n.json
+++ /dev/null
@@ -1,21 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"label.find": "Найти",
-	"placeholder.find": "Найти",
-	"label.previousMatchButton": "Предыдущее соответствие",
-	"label.nextMatchButton": "Следующее соответствие",
-	"label.toggleSelectionFind": "Найти в выделении",
-	"label.closeButton": "Закрыть",
-	"label.replace": "Заменить",
-	"placeholder.replace": "Заменить",
-	"label.replaceButton": "Заменить",
-	"label.replaceAllButton": "Заменить все",
-	"label.toggleReplaceButton": "Режим \"Переключение замены\"",
-	"title.matchesCountLimit": "Отображаются только первые {0} результатов, но все операции поиска выполняются со всем текстом.",
-	"label.matchesLocation": "{0} из {1}",
-	"label.noResults": "Нет результатов"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/editor/contrib/find/browser/simpleFindWidget.i18n.json b/i18n/rus/src/vs/editor/contrib/find/browser/simpleFindWidget.i18n.json
deleted file mode 100644
index e03b15626d2..00000000000
--- a/i18n/rus/src/vs/editor/contrib/find/browser/simpleFindWidget.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"label.find": "Найти",
-	"placeholder.find": "Найти",
-	"label.previousMatchButton": "Предыдущее соответствие",
-	"label.nextMatchButton": "Следующее соответствие",
-	"label.closeButton": "Закрыть"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/editor/contrib/find/common/findController.i18n.json b/i18n/rus/src/vs/editor/contrib/find/common/findController.i18n.json
deleted file mode 100644
index 5c6f87afd29..00000000000
--- a/i18n/rus/src/vs/editor/contrib/find/common/findController.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"startFindAction": "Найти",
-	"findNextMatchAction": "Найти далее",
-	"findPreviousMatchAction": "Найти ранее",
-	"nextSelectionMatchFindAction": "Найти следующее выделение",
-	"previousSelectionMatchFindAction": "Найти предыдущее выделение",
-	"startReplace": "Заменить",
-	"showNextFindTermAction": "Показать следующий найденный термин",
-	"showPreviousFindTermAction": "Показать предыдущий найденный термин"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/editor/contrib/find/findController.i18n.json b/i18n/rus/src/vs/editor/contrib/find/findController.i18n.json
deleted file mode 100644
index 85cdd2add99..00000000000
--- a/i18n/rus/src/vs/editor/contrib/find/findController.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"startFindAction": "Найти",
-	"startFindWithSelectionAction": "Найти в выбранном",
-	"findNextMatchAction": "Найти далее",
-	"findPreviousMatchAction": "Найти ранее",
-	"nextSelectionMatchFindAction": "Найти следующее выделение",
-	"previousSelectionMatchFindAction": "Найти предыдущее выделение",
-	"startReplace": "Заменить",
-	"showNextFindTermAction": "Показать следующий найденный термин",
-	"showPreviousFindTermAction": "Показать предыдущий найденный термин"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/editor/contrib/find/findWidget.i18n.json b/i18n/rus/src/vs/editor/contrib/find/findWidget.i18n.json
deleted file mode 100644
index 57f1fe998d4..00000000000
--- a/i18n/rus/src/vs/editor/contrib/find/findWidget.i18n.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"label.find": "Найти",
-	"placeholder.find": "Найти",
-	"label.previousMatchButton": "Предыдущее соответствие",
-	"label.nextMatchButton": "Следующее соответствие",
-	"label.toggleSelectionFind": "Найти в выделении",
-	"label.closeButton": "Закрыть",
-	"label.replace": "Заменить",
-	"placeholder.replace": "Заменить",
-	"label.replaceButton": "Заменить",
-	"label.replaceAllButton": "Заменить все",
-	"label.toggleReplaceButton": "Режим \"Переключение замены\"",
-	"title.matchesCountLimit": "Отображаются только первые {0} результатов, но все операции поиска выполняются со всем текстом.",
-	"label.matchesLocation": "{0} из {1}",
-	"label.noResults": "Нет результатов"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/editor/contrib/find/simpleFindWidget.i18n.json b/i18n/rus/src/vs/editor/contrib/find/simpleFindWidget.i18n.json
deleted file mode 100644
index f6572bba1fe..00000000000
--- a/i18n/rus/src/vs/editor/contrib/find/simpleFindWidget.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"label.find": "Найти",
-	"placeholder.find": "Найти",
-	"label.previousMatchButton": "Предыдущее соответствие",
-	"label.nextMatchButton": "Следующее соответствие",
-	"label.closeButton": "Закрыть"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/editor/contrib/folding/browser/folding.i18n.json b/i18n/rus/src/vs/editor/contrib/folding/browser/folding.i18n.json
deleted file mode 100644
index 5fe065ae0dc..00000000000
--- a/i18n/rus/src/vs/editor/contrib/folding/browser/folding.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"unfoldAction.label": "Развернуть",
-	"unFoldRecursivelyAction.label": "Развернуть рекурсивно",
-	"foldAction.label": "Свернуть",
-	"foldRecursivelyAction.label": "Свернуть рекурсивно",
-	"foldAllAction.label": "Свернуть все",
-	"unfoldAllAction.label": "Развернуть все",
-	"foldLevelAction.label": "Уровень папки {0}"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/editor/contrib/folding/folding.i18n.json b/i18n/rus/src/vs/editor/contrib/folding/folding.i18n.json
deleted file mode 100644
index b3b82ea4669..00000000000
--- a/i18n/rus/src/vs/editor/contrib/folding/folding.i18n.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"unfoldAction.label": "Развернуть",
-	"unFoldRecursivelyAction.label": "Развернуть рекурсивно",
-	"foldAction.label": "Свернуть",
-	"foldRecursivelyAction.label": "Свернуть рекурсивно",
-	"foldAllBlockComments.label": "Свернуть все блоки комментариев",
-	"foldAllMarkerRegions.label": "Свернуть все регионы",
-	"unfoldAllMarkerRegions.label": "Развернуть все регионы",
-	"foldAllAction.label": "Свернуть все",
-	"unfoldAllAction.label": "Развернуть все",
-	"foldLevelAction.label": "Уровень папки {0}"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/editor/contrib/fontZoom/fontZoom.i18n.json b/i18n/rus/src/vs/editor/contrib/fontZoom/fontZoom.i18n.json
deleted file mode 100644
index e65377b6d3d..00000000000
--- a/i18n/rus/src/vs/editor/contrib/fontZoom/fontZoom.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"EditorFontZoomIn.label": "Увеличить шрифт редактора",
-	"EditorFontZoomOut.label": "Уменьшить шрифт редактора",
-	"EditorFontZoomReset.label": "Сбросить масштаб шрифта редактора"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/editor/contrib/format/browser/formatActions.i18n.json b/i18n/rus/src/vs/editor/contrib/format/browser/formatActions.i18n.json
deleted file mode 100644
index 5ff5028a8fb..00000000000
--- a/i18n/rus/src/vs/editor/contrib/format/browser/formatActions.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"hint11": "Внесена одна правка форматирования в строке {0}.",
-	"hintn1": "Внесены правки форматирования ({0}) в строке {1}.",
-	"hint1n": "Внесена одна правка форматирования между строками {0} и {1}.",
-	"hintnn": "Внесены правки форматирования ({0}) между строками {1} и {2}.",
-	"no.provider": "К сожалению, модуль форматирования для файлов '{0}' не установлен.",
-	"formatDocument.label": "Форматировать документ",
-	"formatSelection.label": "Форматировать выбранный фрагмент"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/editor/contrib/format/formatActions.i18n.json b/i18n/rus/src/vs/editor/contrib/format/formatActions.i18n.json
deleted file mode 100644
index f69c3cad071..00000000000
--- a/i18n/rus/src/vs/editor/contrib/format/formatActions.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hint11": "Внесена одна правка форматирования в строке {0}.",
-	"hintn1": "Внесены правки форматирования ({0}) в строке {1}.",
-	"hint1n": "Внесена одна правка форматирования между строками {0} и {1}.",
-	"hintnn": "Внесены правки форматирования ({0}) между строками {1} и {2}.",
-	"no.provider": "Модуль форматирования для файлов '{0}' не установлен.",
-	"formatDocument.label": "Форматировать документ",
-	"no.documentprovider": "Модуль форматирования документов для файлов '{0}' не установлен.",
-	"formatSelection.label": "Форматировать выбранный фрагмент",
-	"no.selectionprovider": "Модуль форматирования выделения для файлов '{0}' не установлен. "
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.i18n.json b/i18n/rus/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.i18n.json
deleted file mode 100644
index 39e4e0a5e2e..00000000000
--- a/i18n/rus/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.i18n.json
+++ /dev/null
@@ -1,24 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"noResultWord": "Определение для \"{0}\" не найдено.",
-	"generic.noResults": "Определения не найдены.",
-	"meta.title": " — определения {0}",
-	"actions.goToDecl.label": "Перейти к определению",
-	"actions.goToDeclToSide.label": "Открыть определение сбоку",
-	"actions.previewDecl.label": "Показать определение",
-	"goToImplementation.noResultWord": "Не найдена реализация для \"{0}\".",
-	"goToImplementation.generic.noResults": "Не найдена реализация.",
-	"meta.implementations.title": "— {0} реализаций",
-	"actions.goToImplementation.label": "Перейти к реализации",
-	"actions.peekImplementation.label": "Показать реализацию",
-	"goToTypeDefinition.noResultWord": "Не найдено определение типа для \"{0}\".",
-	"goToTypeDefinition.generic.noResults": "Не найдено определение типа.",
-	"meta.typeDefinitions.title": "— {0} определений типов",
-	"actions.goToTypeDefinition.label": "Перейти к определению типа",
-	"actions.peekTypeDefinition.label": "Показать определение типа",
-	"multipleResults": "Щелкните, чтобы отобразить определения ({0})."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/editor/contrib/goToDeclaration/browser/goToDeclarationCommands.i18n.json b/i18n/rus/src/vs/editor/contrib/goToDeclaration/browser/goToDeclarationCommands.i18n.json
deleted file mode 100644
index e61942e5d18..00000000000
--- a/i18n/rus/src/vs/editor/contrib/goToDeclaration/browser/goToDeclarationCommands.i18n.json
+++ /dev/null
@@ -1,23 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"noResultWord": "Определение для \"{0}\" не найдено.",
-	"generic.noResults": "Определения не найдены.",
-	"meta.title": " — определения {0}",
-	"actions.goToDecl.label": "Перейти к определению",
-	"actions.goToDeclToSide.label": "Открыть определение сбоку",
-	"actions.previewDecl.label": "Показать определение",
-	"goToImplementation.noResultWord": "Не найдена реализация для \"{0}\".",
-	"goToImplementation.generic.noResults": "Не найдена реализация.",
-	"meta.implementations.title": "— {0} реализаций",
-	"actions.goToImplementation.label": "Перейти к реализации",
-	"actions.peekImplementation.label": "Показать реализацию",
-	"goToTypeDefinition.noResultWord": "Не найдено определение типа для \"{0}\".",
-	"goToTypeDefinition.generic.noResults": "Не найдено определение типа.",
-	"meta.typeDefinitions.title": "— {0} определений типов",
-	"actions.goToTypeDefinition.label": "Перейти к определению типа",
-	"actions.peekTypeDefinition.label": "Показать определение типа"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/editor/contrib/goToDeclaration/browser/goToDeclarationMouse.i18n.json b/i18n/rus/src/vs/editor/contrib/goToDeclaration/browser/goToDeclarationMouse.i18n.json
deleted file mode 100644
index a403ef380f2..00000000000
--- a/i18n/rus/src/vs/editor/contrib/goToDeclaration/browser/goToDeclarationMouse.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"multipleResults": "Щелкните, чтобы отобразить определения ({0})."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/editor/contrib/goToDeclaration/goToDeclarationCommands.i18n.json b/i18n/rus/src/vs/editor/contrib/goToDeclaration/goToDeclarationCommands.i18n.json
deleted file mode 100644
index 09533b7d610..00000000000
--- a/i18n/rus/src/vs/editor/contrib/goToDeclaration/goToDeclarationCommands.i18n.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noResultWord": "Определение для \"{0}\" не найдено.",
-	"generic.noResults": "Определения не найдены.",
-	"meta.title": " — определения {0}",
-	"actions.goToDecl.label": "Перейти к определению",
-	"actions.goToDeclToSide.label": "Открыть определение сбоку",
-	"actions.previewDecl.label": "Показать определение",
-	"goToImplementation.noResultWord": "Не найдена реализация для \"{0}\".",
-	"goToImplementation.generic.noResults": "Не найдена реализация.",
-	"meta.implementations.title": "— {0} реализаций",
-	"actions.goToImplementation.label": "Перейти к реализации",
-	"actions.peekImplementation.label": "Показать реализацию",
-	"goToTypeDefinition.noResultWord": "Не найдено определение типа для \"{0}\".",
-	"goToTypeDefinition.generic.noResults": "Не найдено определение типа.",
-	"meta.typeDefinitions.title": "— {0} определений типов",
-	"actions.goToTypeDefinition.label": "Перейти к определению типа",
-	"actions.peekTypeDefinition.label": "Показать определение типа"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/editor/contrib/goToDeclaration/goToDeclarationMouse.i18n.json b/i18n/rus/src/vs/editor/contrib/goToDeclaration/goToDeclarationMouse.i18n.json
deleted file mode 100644
index 439e28bae4e..00000000000
--- a/i18n/rus/src/vs/editor/contrib/goToDeclaration/goToDeclarationMouse.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"multipleResults": "Щелкните, чтобы отобразить определения ({0})."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/editor/contrib/goToDefinition/goToDefinitionCommands.i18n.json b/i18n/rus/src/vs/editor/contrib/goToDefinition/goToDefinitionCommands.i18n.json
deleted file mode 100644
index 09533b7d610..00000000000
--- a/i18n/rus/src/vs/editor/contrib/goToDefinition/goToDefinitionCommands.i18n.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noResultWord": "Определение для \"{0}\" не найдено.",
-	"generic.noResults": "Определения не найдены.",
-	"meta.title": " — определения {0}",
-	"actions.goToDecl.label": "Перейти к определению",
-	"actions.goToDeclToSide.label": "Открыть определение сбоку",
-	"actions.previewDecl.label": "Показать определение",
-	"goToImplementation.noResultWord": "Не найдена реализация для \"{0}\".",
-	"goToImplementation.generic.noResults": "Не найдена реализация.",
-	"meta.implementations.title": "— {0} реализаций",
-	"actions.goToImplementation.label": "Перейти к реализации",
-	"actions.peekImplementation.label": "Показать реализацию",
-	"goToTypeDefinition.noResultWord": "Не найдено определение типа для \"{0}\".",
-	"goToTypeDefinition.generic.noResults": "Не найдено определение типа.",
-	"meta.typeDefinitions.title": "— {0} определений типов",
-	"actions.goToTypeDefinition.label": "Перейти к определению типа",
-	"actions.peekTypeDefinition.label": "Показать определение типа"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/editor/contrib/goToDefinition/goToDefinitionMouse.i18n.json b/i18n/rus/src/vs/editor/contrib/goToDefinition/goToDefinitionMouse.i18n.json
deleted file mode 100644
index 439e28bae4e..00000000000
--- a/i18n/rus/src/vs/editor/contrib/goToDefinition/goToDefinitionMouse.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"multipleResults": "Щелкните, чтобы отобразить определения ({0})."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/editor/contrib/gotoError/browser/gotoError.i18n.json b/i18n/rus/src/vs/editor/contrib/gotoError/browser/gotoError.i18n.json
deleted file mode 100644
index 5ca181d11bd..00000000000
--- a/i18n/rus/src/vs/editor/contrib/gotoError/browser/gotoError.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"title.wo_source": "({0}/{1})",
-	"markerAction.next.label": "Перейти к следующей ошибке или предупреждению",
-	"markerAction.previous.label": "Перейти к предыдущей ошибке или предупреждению",
-	"editorMarkerNavigationError": "Цвет ошибки в мини-приложении навигации по меткам редактора.",
-	"editorMarkerNavigationWarning": "Цвет предупреждения в мини-приложении навигации по меткам редактора.",
-	"editorMarkerNavigationInfo": "Цвет информационного сообщения в мини-приложении навигации по меткам редактора.",
-	"editorMarkerNavigationBackground": "Фон мини-приложения навигации по меткам редактора."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/editor/contrib/gotoError/gotoError.i18n.json b/i18n/rus/src/vs/editor/contrib/gotoError/gotoError.i18n.json
deleted file mode 100644
index 7a40f2cf145..00000000000
--- a/i18n/rus/src/vs/editor/contrib/gotoError/gotoError.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"markerAction.next.label": "Перейти к Следующей Проблеме (Ошибке, Предупреждению, Информации)",
-	"markerAction.previous.label": "Перейти к Предыдущей Проблеме (Ошибке, Предупреждению, Информации)",
-	"markerAction.nextInFiles.label": "Перейти к следующей проблеме в файлах (ошибки, предупреждения, информационные сообщения)",
-	"markerAction.previousInFiles.label": "Перейти к предыдущей проблеме в файлах (ошибки, предупреждения, информационные сообщения)"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json b/i18n/rus/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json
deleted file mode 100644
index 696263e5f65..00000000000
--- a/i18n/rus/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"title.wo_source": "({0}/{1})",
-	"editorMarkerNavigationError": "Цвет ошибки в мини-приложении навигации по меткам редактора.",
-	"editorMarkerNavigationWarning": "Цвет предупреждения в мини-приложении навигации по меткам редактора.",
-	"editorMarkerNavigationInfo": "Цвет информационного сообщения в мини-приложении навигации по меткам редактора.",
-	"editorMarkerNavigationBackground": "Фон мини-приложения навигации по меткам редактора."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/editor/contrib/hover/browser/hover.i18n.json b/i18n/rus/src/vs/editor/contrib/hover/browser/hover.i18n.json
deleted file mode 100644
index 61fdcdb90de..00000000000
--- a/i18n/rus/src/vs/editor/contrib/hover/browser/hover.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"showHover": "Показать при наведении"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/editor/contrib/hover/browser/modesContentHover.i18n.json b/i18n/rus/src/vs/editor/contrib/hover/browser/modesContentHover.i18n.json
deleted file mode 100644
index afb4cd39d72..00000000000
--- a/i18n/rus/src/vs/editor/contrib/hover/browser/modesContentHover.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"modesContentHover.loading": "Идет загрузка..."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/editor/contrib/hover/hover.i18n.json b/i18n/rus/src/vs/editor/contrib/hover/hover.i18n.json
deleted file mode 100644
index 8abe163b64e..00000000000
--- a/i18n/rus/src/vs/editor/contrib/hover/hover.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"showHover": "Показать при наведении"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/editor/contrib/hover/modesContentHover.i18n.json b/i18n/rus/src/vs/editor/contrib/hover/modesContentHover.i18n.json
deleted file mode 100644
index 2e63fed4935..00000000000
--- a/i18n/rus/src/vs/editor/contrib/hover/modesContentHover.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"modesContentHover.loading": "Идет загрузка..."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/editor/contrib/inPlaceReplace/common/inPlaceReplace.i18n.json b/i18n/rus/src/vs/editor/contrib/inPlaceReplace/common/inPlaceReplace.i18n.json
deleted file mode 100644
index 49cfabc0148..00000000000
--- a/i18n/rus/src/vs/editor/contrib/inPlaceReplace/common/inPlaceReplace.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"InPlaceReplaceAction.previous.label": "Заменить предыдущим значением",
-	"InPlaceReplaceAction.next.label": "Заменить следующим значением"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/editor/contrib/inPlaceReplace/inPlaceReplace.i18n.json b/i18n/rus/src/vs/editor/contrib/inPlaceReplace/inPlaceReplace.i18n.json
deleted file mode 100644
index 68ee668d2da..00000000000
--- a/i18n/rus/src/vs/editor/contrib/inPlaceReplace/inPlaceReplace.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"InPlaceReplaceAction.previous.label": "Заменить предыдущим значением",
-	"InPlaceReplaceAction.next.label": "Заменить следующим значением"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/editor/contrib/indentation/common/indentation.i18n.json b/i18n/rus/src/vs/editor/contrib/indentation/common/indentation.i18n.json
deleted file mode 100644
index 6f61e049156..00000000000
--- a/i18n/rus/src/vs/editor/contrib/indentation/common/indentation.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"indentationToSpaces": "Преобразовать отступ в пробелы",
-	"indentationToTabs": "Преобразовать отступ в шаги табуляции",
-	"configuredTabSize": "Настроенный размер шага табуляции",
-	"selectTabWidth": "Выбрать размер шага табуляции для текущего файла",
-	"indentUsingTabs": "Отступ с использованием табуляции",
-	"indentUsingSpaces": "Отступ с использованием пробелов",
-	"detectIndentation": "Определение отступа от содержимого",
-	"editor.reindentlines": "Повторно расставить отступы строк"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/editor/contrib/indentation/indentation.i18n.json b/i18n/rus/src/vs/editor/contrib/indentation/indentation.i18n.json
deleted file mode 100644
index 54c2cf9ba0a..00000000000
--- a/i18n/rus/src/vs/editor/contrib/indentation/indentation.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"indentationToSpaces": "Преобразовать отступ в пробелы",
-	"indentationToTabs": "Преобразовать отступ в шаги табуляции",
-	"configuredTabSize": "Настроенный размер шага табуляции",
-	"selectTabWidth": "Выбрать размер шага табуляции для текущего файла",
-	"indentUsingTabs": "Отступ с использованием табуляции",
-	"indentUsingSpaces": "Отступ с использованием пробелов",
-	"detectIndentation": "Определение отступа от содержимого",
-	"editor.reindentlines": "Повторно расставить отступы строк",
-	"editor.reindentselectedlines": "Повторно расставить отступы для выбранных строк"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/editor/contrib/inspectTMScopes/electron-browser/inspectTMScopes.i18n.json b/i18n/rus/src/vs/editor/contrib/inspectTMScopes/electron-browser/inspectTMScopes.i18n.json
deleted file mode 100644
index 86deb3a5055..00000000000
--- a/i18n/rus/src/vs/editor/contrib/inspectTMScopes/electron-browser/inspectTMScopes.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"inspectTMScopes": "Разработчик: проверка областей TM",
-	"inspectTMScopesWidget.loading": "Идет загрузка..."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/editor/contrib/linesOperations/common/linesOperations.i18n.json b/i18n/rus/src/vs/editor/contrib/linesOperations/common/linesOperations.i18n.json
deleted file mode 100644
index 26b632bbca2..00000000000
--- a/i18n/rus/src/vs/editor/contrib/linesOperations/common/linesOperations.i18n.json
+++ /dev/null
@@ -1,25 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"lines.copyUp": "Копировать строку сверху",
-	"lines.copyDown": "Копировать строку снизу",
-	"lines.moveUp": "Переместить строку вверх",
-	"lines.moveDown": "Переместить строку вниз",
-	"lines.sortAscending": "Сортировка строк по возрастанию",
-	"lines.sortDescending": "Сортировка строк по убыванию",
-	"lines.trimTrailingWhitespace": "Удалить конечные символы-разделители",
-	"lines.delete": "Удалить строку",
-	"lines.indent": "Увеличить отступ",
-	"lines.outdent": "Уменьшить отступ",
-	"lines.insertBefore": "Вставить строку выше",
-	"lines.insertAfter": "Вставить строку ниже",
-	"lines.deleteAllLeft": "Удалить все слева",
-	"lines.deleteAllRight": "Удалить все справа",
-	"lines.joinLines": "_Объединить строки",
-	"editor.transpose": "Транспонировать символы вокруг курсора",
-	"editor.transformToUppercase": "Преобразовать в верхний регистр",
-	"editor.transformToLowercase": "Преобразовать в нижний регистр"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/editor/contrib/linesOperations/linesOperations.i18n.json b/i18n/rus/src/vs/editor/contrib/linesOperations/linesOperations.i18n.json
deleted file mode 100644
index 1d07fa3fc72..00000000000
--- a/i18n/rus/src/vs/editor/contrib/linesOperations/linesOperations.i18n.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"lines.copyUp": "Копировать строку сверху",
-	"lines.copyDown": "Копировать строку снизу",
-	"lines.moveUp": "Переместить строку вверх",
-	"lines.moveDown": "Переместить строку вниз",
-	"lines.sortAscending": "Сортировка строк по возрастанию",
-	"lines.sortDescending": "Сортировка строк по убыванию",
-	"lines.trimTrailingWhitespace": "Удалить конечные символы-разделители",
-	"lines.delete": "Удалить строку",
-	"lines.indent": "Увеличить отступ",
-	"lines.outdent": "Уменьшить отступ",
-	"lines.insertBefore": "Вставить строку выше",
-	"lines.insertAfter": "Вставить строку ниже",
-	"lines.deleteAllLeft": "Удалить все слева",
-	"lines.deleteAllRight": "Удалить все справа",
-	"lines.joinLines": "_Объединить строки",
-	"editor.transpose": "Транспонировать символы вокруг курсора",
-	"editor.transformToUppercase": "Преобразовать в верхний регистр",
-	"editor.transformToLowercase": "Преобразовать в нижний регистр"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/editor/contrib/links/browser/links.i18n.json b/i18n/rus/src/vs/editor/contrib/links/browser/links.i18n.json
deleted file mode 100644
index 0e2b04db373..00000000000
--- a/i18n/rus/src/vs/editor/contrib/links/browser/links.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"links.navigate.mac": "Щелкните с нажатой клавишей Cmd, чтобы перейти по ссылке",
-	"links.navigate": "Щелкните с нажатой клавишей Ctrl, чтобы перейти по ссылке",
-	"links.command.mac": "Для выполнения команды щелкните ее, удерживая нажатой клавишу CMD",
-	"links.command": "Для выполнения команды щелкните ее, удерживая нажатой клавишу CTRL",
-	"links.navigate.al": "Щелкните с нажатой клавишей ALT, чтобы перейти по ссылке.",
-	"links.command.al": "Для выполнения команды щелкните ее, удерживая нажатой клавишу ALT",
-	"invalid.url": "Не удалось открыть ссылку, так как она имеет неправильный формат: {0}",
-	"missing.url": "Не удалось открыть ссылку, у нее отсутствует целевой объект.",
-	"label": "Открыть ссылку"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/editor/contrib/links/links.i18n.json b/i18n/rus/src/vs/editor/contrib/links/links.i18n.json
deleted file mode 100644
index a5006271253..00000000000
--- a/i18n/rus/src/vs/editor/contrib/links/links.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"links.navigate.mac": "Щелкните с нажатой клавишей Cmd, чтобы перейти по ссылке",
-	"links.navigate": "Щелкните с нажатой клавишей Ctrl, чтобы перейти по ссылке",
-	"links.command.mac": "Для выполнения команды щелкните ее, удерживая нажатой клавишу CMD",
-	"links.command": "Для выполнения команды щелкните ее, удерживая нажатой клавишу CTRL",
-	"links.navigate.al.mac": "Чтобы перейти по ссылке, щелкните по ней, удерживая клавишу OPTION",
-	"links.navigate.al": "Щелкните с нажатой клавишей ALT, чтобы перейти по ссылке.",
-	"links.command.al.mac": "Чтобы выполнить команду, щелкните по ней, удерживая клавишу OPTION ",
-	"links.command.al": "Для выполнения команды щелкните ее, удерживая нажатой клавишу ALT",
-	"invalid.url": "Не удалось открыть ссылку, так как она имеет неправильный формат: {0}",
-	"missing.url": "Не удалось открыть ссылку, у нее отсутствует целевой объект.",
-	"label": "Открыть ссылку"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/editor/contrib/message/messageController.i18n.json b/i18n/rus/src/vs/editor/contrib/message/messageController.i18n.json
deleted file mode 100644
index deab62e9c44..00000000000
--- a/i18n/rus/src/vs/editor/contrib/message/messageController.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"editor.readonly": "Не удается выполнить изменение в редакторе только для чтения"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/editor/contrib/multicursor/common/multicursor.i18n.json b/i18n/rus/src/vs/editor/contrib/multicursor/common/multicursor.i18n.json
deleted file mode 100644
index 660193a943e..00000000000
--- a/i18n/rus/src/vs/editor/contrib/multicursor/common/multicursor.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"mutlicursor.insertAbove": "Добавить курсор выше",
-	"mutlicursor.insertBelow": "Добавить курсор ниже",
-	"mutlicursor.insertAtEndOfEachLineSelected": "Добавить курсоры к окончаниям строк",
-	"addSelectionToNextFindMatch": "Добавить выделение в следующее найденное совпадение",
-	"addSelectionToPreviousFindMatch": "Добавить выделенный фрагмент в предыдущее найденное совпадение",
-	"moveSelectionToNextFindMatch": "Переместить последнее выделение в следующее найденное совпадение",
-	"moveSelectionToPreviousFindMatch": "Переместить последний выделенный фрагмент в предыдущее найденное совпадение",
-	"selectAllOccurrencesOfFindMatch": "Выбрать все вхождения найденных совпадений",
-	"changeAll.label": "Изменить все вхождения"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/editor/contrib/multicursor/multicursor.i18n.json b/i18n/rus/src/vs/editor/contrib/multicursor/multicursor.i18n.json
deleted file mode 100644
index 3aa9d2083a6..00000000000
--- a/i18n/rus/src/vs/editor/contrib/multicursor/multicursor.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"mutlicursor.insertAbove": "Добавить курсор выше",
-	"mutlicursor.insertBelow": "Добавить курсор ниже",
-	"mutlicursor.insertAtEndOfEachLineSelected": "Добавить курсоры к окончаниям строк",
-	"addSelectionToNextFindMatch": "Добавить выделение в следующее найденное совпадение",
-	"addSelectionToPreviousFindMatch": "Добавить выделенный фрагмент в предыдущее найденное совпадение",
-	"moveSelectionToNextFindMatch": "Переместить последнее выделение в следующее найденное совпадение",
-	"moveSelectionToPreviousFindMatch": "Переместить последний выделенный фрагмент в предыдущее найденное совпадение",
-	"selectAllOccurrencesOfFindMatch": "Выбрать все вхождения найденных совпадений",
-	"changeAll.label": "Изменить все вхождения"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/editor/contrib/parameterHints/browser/parameterHints.i18n.json b/i18n/rus/src/vs/editor/contrib/parameterHints/browser/parameterHints.i18n.json
deleted file mode 100644
index cd5e78cf6b8..00000000000
--- a/i18n/rus/src/vs/editor/contrib/parameterHints/browser/parameterHints.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"parameterHints.trigger.label": "Переключить подсказки к параметрам"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/editor/contrib/parameterHints/browser/parameterHintsWidget.i18n.json b/i18n/rus/src/vs/editor/contrib/parameterHints/browser/parameterHintsWidget.i18n.json
deleted file mode 100644
index c4092de0c2f..00000000000
--- a/i18n/rus/src/vs/editor/contrib/parameterHints/browser/parameterHintsWidget.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"hint": "{0}, подсказка"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/editor/contrib/parameterHints/parameterHints.i18n.json b/i18n/rus/src/vs/editor/contrib/parameterHints/parameterHints.i18n.json
deleted file mode 100644
index b5730f752d2..00000000000
--- a/i18n/rus/src/vs/editor/contrib/parameterHints/parameterHints.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"parameterHints.trigger.label": "Переключить подсказки к параметрам"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/editor/contrib/parameterHints/parameterHintsWidget.i18n.json b/i18n/rus/src/vs/editor/contrib/parameterHints/parameterHintsWidget.i18n.json
deleted file mode 100644
index 8fd3f3ca92c..00000000000
--- a/i18n/rus/src/vs/editor/contrib/parameterHints/parameterHintsWidget.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hint": "{0}, подсказка"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/editor/contrib/quickFix/browser/quickFixCommands.i18n.json b/i18n/rus/src/vs/editor/contrib/quickFix/browser/quickFixCommands.i18n.json
deleted file mode 100644
index f12b3174d4c..00000000000
--- a/i18n/rus/src/vs/editor/contrib/quickFix/browser/quickFixCommands.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"quickFixWithKb": "Показать исправления ({0})",
-	"quickFix": "Показать исправления",
-	"quickfix.trigger.label": "Быстрое исправление"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/editor/contrib/quickFix/quickFixCommands.i18n.json b/i18n/rus/src/vs/editor/contrib/quickFix/quickFixCommands.i18n.json
deleted file mode 100644
index a98aebe345f..00000000000
--- a/i18n/rus/src/vs/editor/contrib/quickFix/quickFixCommands.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"quickFixWithKb": "Показать исправления ({0})",
-	"quickFix": "Показать исправления",
-	"quickfix.trigger.label": "Быстрое исправление",
-	"refactor.label": "Рефакторинг"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/editor/contrib/referenceSearch/browser/peekViewWidget.i18n.json b/i18n/rus/src/vs/editor/contrib/referenceSearch/browser/peekViewWidget.i18n.json
deleted file mode 100644
index 6f6dde161df..00000000000
--- a/i18n/rus/src/vs/editor/contrib/referenceSearch/browser/peekViewWidget.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"label.close": "Закрыть"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/editor/contrib/referenceSearch/browser/referenceSearch.i18n.json b/i18n/rus/src/vs/editor/contrib/referenceSearch/browser/referenceSearch.i18n.json
deleted file mode 100644
index 32ab4f7dea8..00000000000
--- a/i18n/rus/src/vs/editor/contrib/referenceSearch/browser/referenceSearch.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"meta.titleReference": " — ссылки {0}",
-	"references.action.label": "Найти все ссылки"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/editor/contrib/referenceSearch/browser/referencesController.i18n.json b/i18n/rus/src/vs/editor/contrib/referenceSearch/browser/referencesController.i18n.json
deleted file mode 100644
index bc424e9b7e3..00000000000
--- a/i18n/rus/src/vs/editor/contrib/referenceSearch/browser/referencesController.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"labelLoading": "Идет загрузка..."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/editor/contrib/referenceSearch/browser/referencesModel.i18n.json b/i18n/rus/src/vs/editor/contrib/referenceSearch/browser/referencesModel.i18n.json
deleted file mode 100644
index 88bbf853904..00000000000
--- a/i18n/rus/src/vs/editor/contrib/referenceSearch/browser/referencesModel.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"aria.oneReference": "ссылка в {0} в строке {1} и символе {2}",
-	"aria.fileReferences.1": "1 символ в {0}, полный путь: {1}",
-	"aria.fileReferences.N": "{0} символов в {1}, полный путь: {2} ",
-	"aria.result.0": "Результаты не найдены",
-	"aria.result.1": "Обнаружен 1 символ в {0}",
-	"aria.result.n1": "Обнаружено {0} символов в {1}",
-	"aria.result.nm": "Обнаружено {0} символов в {1} файлах"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/editor/contrib/referenceSearch/browser/referencesWidget.i18n.json b/i18n/rus/src/vs/editor/contrib/referenceSearch/browser/referencesWidget.i18n.json
deleted file mode 100644
index 9b523c27fc1..00000000000
--- a/i18n/rus/src/vs/editor/contrib/referenceSearch/browser/referencesWidget.i18n.json
+++ /dev/null
@@ -1,27 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"referencesFailre": "Не удалось разрешить файл.",
-	"referencesCount": "Ссылок: {0}",
-	"referenceCount": "{0} ссылка",
-	"missingPreviewMessage": "предварительный просмотр недоступен",
-	"treeAriaLabel": "Ссылки",
-	"noResults": "Результаты отсутствуют",
-	"peekView.alternateTitle": "Ссылки",
-	"peekViewTitleBackground": "Цвет фона области заголовка быстрого редактора.",
-	"peekViewTitleForeground": "Цвет заголовка быстрого редактора.",
-	"peekViewTitleInfoForeground": "Цвет сведений о заголовке быстрого редактора.",
-	"peekViewBorder": "Цвет границ быстрого редактора и массива.",
-	"peekViewResultsBackground": "Цвет фона в списке результатов представления быстрого редактора.",
-	"peekViewResultsMatchForeground": "Цвет переднего плана узлов строки в списке результатов быстрого редактора.",
-	"peekViewResultsFileForeground": "Цвет переднего плана узлов файла в списке результатов быстрого редактора.",
-	"peekViewResultsSelectionBackground": "Цвет фона выбранной записи в списке результатов быстрого редактора.",
-	"peekViewResultsSelectionForeground": "Цвет переднего плана выбранной записи в списке результатов быстрого редактора.",
-	"peekViewEditorBackground": "Цвет фона быстрого редактора.",
-	"peekViewEditorGutterBackground": "Цвет фона поля в окне быстрого редактора.",
-	"peekViewResultsMatchHighlight": "Цвет выделения совпадений в списке результатов быстрого редактора.",
-	"peekViewEditorMatchHighlight": "Цвет выделения совпадений в быстром редакторе."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/editor/contrib/referenceSearch/peekViewWidget.i18n.json b/i18n/rus/src/vs/editor/contrib/referenceSearch/peekViewWidget.i18n.json
deleted file mode 100644
index 27a5cf1d6cc..00000000000
--- a/i18n/rus/src/vs/editor/contrib/referenceSearch/peekViewWidget.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"label.close": "Закрыть"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/editor/contrib/referenceSearch/referenceSearch.i18n.json b/i18n/rus/src/vs/editor/contrib/referenceSearch/referenceSearch.i18n.json
deleted file mode 100644
index 05a8b96d98a..00000000000
--- a/i18n/rus/src/vs/editor/contrib/referenceSearch/referenceSearch.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"meta.titleReference": " — ссылки {0}",
-	"references.action.label": "Найти все ссылки"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/editor/contrib/referenceSearch/referencesController.i18n.json b/i18n/rus/src/vs/editor/contrib/referenceSearch/referencesController.i18n.json
deleted file mode 100644
index 57bdb818d34..00000000000
--- a/i18n/rus/src/vs/editor/contrib/referenceSearch/referencesController.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"labelLoading": "Идет загрузка..."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/editor/contrib/referenceSearch/referencesModel.i18n.json b/i18n/rus/src/vs/editor/contrib/referenceSearch/referencesModel.i18n.json
deleted file mode 100644
index 7c9fd54099d..00000000000
--- a/i18n/rus/src/vs/editor/contrib/referenceSearch/referencesModel.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"aria.oneReference": "ссылка в {0} в строке {1} и символе {2}",
-	"aria.fileReferences.1": "1 символ в {0}, полный путь: {1}",
-	"aria.fileReferences.N": "{0} символов в {1}, полный путь: {2} ",
-	"aria.result.0": "Результаты не найдены",
-	"aria.result.1": "Обнаружен 1 символ в {0}",
-	"aria.result.n1": "Обнаружено {0} символов в {1}",
-	"aria.result.nm": "Обнаружено {0} символов в {1} файлах"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/editor/contrib/referenceSearch/referencesWidget.i18n.json b/i18n/rus/src/vs/editor/contrib/referenceSearch/referencesWidget.i18n.json
deleted file mode 100644
index 3d401e0a0ee..00000000000
--- a/i18n/rus/src/vs/editor/contrib/referenceSearch/referencesWidget.i18n.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"referencesFailre": "Не удалось разрешить файл.",
-	"referencesCount": "Ссылок: {0}",
-	"referenceCount": "{0} ссылка",
-	"missingPreviewMessage": "предварительный просмотр недоступен",
-	"treeAriaLabel": "Ссылки",
-	"noResults": "Результаты отсутствуют",
-	"peekView.alternateTitle": "Ссылки",
-	"peekViewTitleBackground": "Цвет фона области заголовка быстрого редактора.",
-	"peekViewTitleForeground": "Цвет заголовка быстрого редактора.",
-	"peekViewTitleInfoForeground": "Цвет сведений о заголовке быстрого редактора.",
-	"peekViewBorder": "Цвет границ быстрого редактора и массива.",
-	"peekViewResultsBackground": "Цвет фона в списке результатов представления быстрого редактора.",
-	"peekViewResultsMatchForeground": "Цвет переднего плана узлов строки в списке результатов быстрого редактора.",
-	"peekViewResultsFileForeground": "Цвет переднего плана узлов файла в списке результатов быстрого редактора.",
-	"peekViewResultsSelectionBackground": "Цвет фона выбранной записи в списке результатов быстрого редактора.",
-	"peekViewResultsSelectionForeground": "Цвет переднего плана выбранной записи в списке результатов быстрого редактора.",
-	"peekViewEditorBackground": "Цвет фона быстрого редактора.",
-	"peekViewEditorGutterBackground": "Цвет фона поля в окне быстрого редактора.",
-	"peekViewResultsMatchHighlight": "Цвет выделения совпадений в списке результатов быстрого редактора.",
-	"peekViewEditorMatchHighlight": "Цвет выделения совпадений в быстром редакторе.",
-	"peekViewEditorMatchHighlightBorder": "Граница выделения совпадений в быстром редакторе."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/editor/contrib/rename/browser/rename.i18n.json b/i18n/rus/src/vs/editor/contrib/rename/browser/rename.i18n.json
deleted file mode 100644
index 10cdfc7238d..00000000000
--- a/i18n/rus/src/vs/editor/contrib/rename/browser/rename.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"no result": "Результаты отсутствуют.",
-	"aria": "«{0}» успешно переименован в «{1}». Сводка: {2}",
-	"rename.failed": "Не удалось переименовать.",
-	"rename.label": "Переименовать символ"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/editor/contrib/rename/browser/renameInputField.i18n.json b/i18n/rus/src/vs/editor/contrib/rename/browser/renameInputField.i18n.json
deleted file mode 100644
index 8d52949bcbb..00000000000
--- a/i18n/rus/src/vs/editor/contrib/rename/browser/renameInputField.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"renameAriaLabel": "Введите новое имя для входных данных и нажмите клавишу ВВОД для подтверждения."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/editor/contrib/rename/rename.i18n.json b/i18n/rus/src/vs/editor/contrib/rename/rename.i18n.json
deleted file mode 100644
index b471b2afdb3..00000000000
--- a/i18n/rus/src/vs/editor/contrib/rename/rename.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"no result": "Результаты отсутствуют.",
-	"aria": "«{0}» успешно переименован в «{1}». Сводка: {2}",
-	"rename.failed": "Не удалось выполнить переименование.",
-	"rename.label": "Переименовать символ"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/editor/contrib/rename/renameInputField.i18n.json b/i18n/rus/src/vs/editor/contrib/rename/renameInputField.i18n.json
deleted file mode 100644
index 42060de1727..00000000000
--- a/i18n/rus/src/vs/editor/contrib/rename/renameInputField.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"renameAriaLabel": "Введите новое имя для входных данных и нажмите клавишу ВВОД для подтверждения."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/editor/contrib/smartSelect/common/smartSelect.i18n.json b/i18n/rus/src/vs/editor/contrib/smartSelect/common/smartSelect.i18n.json
deleted file mode 100644
index 937d51a9e11..00000000000
--- a/i18n/rus/src/vs/editor/contrib/smartSelect/common/smartSelect.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"smartSelect.grow": "Развернуть выделение",
-	"smartSelect.shrink": "Сжать выделение"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/editor/contrib/smartSelect/smartSelect.i18n.json b/i18n/rus/src/vs/editor/contrib/smartSelect/smartSelect.i18n.json
deleted file mode 100644
index de42b0131c9..00000000000
--- a/i18n/rus/src/vs/editor/contrib/smartSelect/smartSelect.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"smartSelect.grow": "Развернуть выделение",
-	"smartSelect.shrink": "Сжать выделение"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/editor/contrib/snippet/snippetVariables.i18n.json b/i18n/rus/src/vs/editor/contrib/snippet/snippetVariables.i18n.json
deleted file mode 100644
index 5831d974e53..00000000000
--- a/i18n/rus/src/vs/editor/contrib/snippet/snippetVariables.i18n.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"Sunday": "Воскресенье",
-	"Monday": "Понедельник",
-	"Tuesday": "Вторник",
-	"Wednesday": "Среда",
-	"Thursday": "Четверг",
-	"Friday": "Пятница",
-	"Saturday": "Суббота",
-	"SundayShort": "Вс",
-	"MondayShort": "Пн",
-	"TuesdayShort": "Вт",
-	"WednesdayShort": "Ср",
-	"ThursdayShort": "Чт",
-	"FridayShort": "Пт",
-	"SaturdayShort": "Сб",
-	"January": "Январь",
-	"February": "Февраль",
-	"March": "Март",
-	"April": "Апрель",
-	"May": "Май",
-	"June": "Июнь",
-	"July": "Июль",
-	"August": "Август",
-	"September": "Сентябрь",
-	"October": "Октябрь",
-	"November": "Ноябрь",
-	"December": "Декабрь",
-	"JanuaryShort": "Янв",
-	"FebruaryShort": "Фев",
-	"MarchShort": "Мар",
-	"AprilShort": "Апр",
-	"MayShort": "Май",
-	"JuneShort": "Июн",
-	"JulyShort": "Июл",
-	"AugustShort": "Авг",
-	"SeptemberShort": "Сен",
-	"OctoberShort": "Окт",
-	"NovemberShort": "Ноя",
-	"DecemberShort": "Дек"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/editor/contrib/suggest/browser/suggestController.i18n.json b/i18n/rus/src/vs/editor/contrib/suggest/browser/suggestController.i18n.json
deleted file mode 100644
index b93db54e42c..00000000000
--- a/i18n/rus/src/vs/editor/contrib/suggest/browser/suggestController.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"arai.alert.snippet": "При принятии \"{0}\" был добавлен следующий текст: \"{1}\"",
-	"suggest.trigger.label": "Переключить предложение"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/editor/contrib/suggest/browser/suggestWidget.i18n.json b/i18n/rus/src/vs/editor/contrib/suggest/browser/suggestWidget.i18n.json
deleted file mode 100644
index ef1bb257b47..00000000000
--- a/i18n/rus/src/vs/editor/contrib/suggest/browser/suggestWidget.i18n.json
+++ /dev/null
@@ -1,21 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"editorSuggestWidgetBackground": "Цвет фона виджета подсказок.",
-	"editorSuggestWidgetBorder": "Цвет границ виджета подсказок.",
-	"editorSuggestWidgetForeground": "Цвет переднего плана мини-приложения предложений.",
-	"editorSuggestWidgetSelectedBackground": "Фоновый цвет выбранной записи в мини-приложении предложений.",
-	"editorSuggestWidgetHighlightForeground": "Цвет выделения соответствия в мини-приложении предложений.",
-	"readMore": "Подробнее...{0}",
-	"suggestionWithDetailsAriaLabel": "{0}, предложение, содержит данные",
-	"suggestionAriaLabel": "{0}, предложение",
-	"readLess": "Кратко...{0}",
-	"suggestWidget.loading": "Идет загрузка...",
-	"suggestWidget.noSuggestions": "Предложения отсутствуют.",
-	"suggestionAriaAccepted": "{0}, принято",
-	"ariaCurrentSuggestionWithDetails": "{0}, предложение, содержит данные",
-	"ariaCurrentSuggestion": "{0}, предложение"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/editor/contrib/suggest/suggestController.i18n.json b/i18n/rus/src/vs/editor/contrib/suggest/suggestController.i18n.json
deleted file mode 100644
index 18f1da5b27a..00000000000
--- a/i18n/rus/src/vs/editor/contrib/suggest/suggestController.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"arai.alert.snippet": "При принятии \"{0}\" был добавлен следующий текст: \"{1}\"",
-	"suggest.trigger.label": "Переключить предложение"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/editor/contrib/suggest/suggestWidget.i18n.json b/i18n/rus/src/vs/editor/contrib/suggest/suggestWidget.i18n.json
deleted file mode 100644
index 2419defb4c0..00000000000
--- a/i18n/rus/src/vs/editor/contrib/suggest/suggestWidget.i18n.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"editorSuggestWidgetBackground": "Цвет фона виджета подсказок.",
-	"editorSuggestWidgetBorder": "Цвет границ виджета подсказок.",
-	"editorSuggestWidgetForeground": "Цвет переднего плана мини-приложения предложений.",
-	"editorSuggestWidgetSelectedBackground": "Фоновый цвет выбранной записи в мини-приложении предложений.",
-	"editorSuggestWidgetHighlightForeground": "Цвет выделения соответствия в мини-приложении предложений.",
-	"readMore": "Подробнее...{0}",
-	"suggestionWithDetailsAriaLabel": "{0}, предложение, содержит данные",
-	"suggestionAriaLabel": "{0}, предложение",
-	"readLess": "Кратко...{0}",
-	"suggestWidget.loading": "Идет загрузка...",
-	"suggestWidget.noSuggestions": "Предложения отсутствуют.",
-	"suggestionAriaAccepted": "{0}, принято",
-	"ariaCurrentSuggestionWithDetails": "{0}, предложение, содержит данные",
-	"ariaCurrentSuggestion": "{0}, предложение"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/editor/contrib/toggleTabFocusMode/common/toggleTabFocusMode.i18n.json b/i18n/rus/src/vs/editor/contrib/toggleTabFocusMode/common/toggleTabFocusMode.i18n.json
deleted file mode 100644
index f9af3519019..00000000000
--- a/i18n/rus/src/vs/editor/contrib/toggleTabFocusMode/common/toggleTabFocusMode.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"toggle.tabMovesFocus": "Переключение клавиши TAB перемещает фокус."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/editor/contrib/toggleTabFocusMode/toggleTabFocusMode.i18n.json b/i18n/rus/src/vs/editor/contrib/toggleTabFocusMode/toggleTabFocusMode.i18n.json
deleted file mode 100644
index 094fb0ea884..00000000000
--- a/i18n/rus/src/vs/editor/contrib/toggleTabFocusMode/toggleTabFocusMode.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggle.tabMovesFocus": "Переключение клавиши TAB перемещает фокус."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/editor/contrib/wordHighlighter/common/wordHighlighter.i18n.json b/i18n/rus/src/vs/editor/contrib/wordHighlighter/common/wordHighlighter.i18n.json
deleted file mode 100644
index ab058cc24db..00000000000
--- a/i18n/rus/src/vs/editor/contrib/wordHighlighter/common/wordHighlighter.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"wordHighlight": "Цвет фона символа при доступе на чтение, например считывании переменной.",
-	"wordHighlightStrong": "Цвет фона символа при доступе на запись, например записи переменной.",
-	"overviewRulerWordHighlightForeground": "Цвет метки линейки в окне просмотра для выделений символов.",
-	"overviewRulerWordHighlightStrongForeground": "Цвет метки линейки в окне просмотра для выделений символов, доступных для записи. ",
-	"wordHighlight.next.label": "Перейти к следующему выделению символов",
-	"wordHighlight.previous.label": "Перейти к предыдущему выделению символов"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json b/i18n/rus/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
deleted file mode 100644
index 5b31b385ffd..00000000000
--- a/i18n/rus/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"wordHighlight": "Фон символа при доступе для чтения, например при чтении переменной. Цвет должен быть прозрачным чтобы не перекрывать основных знаков отличия.",
-	"wordHighlightStrong": "Фон символа при доступе для записи, например при записи переменной. Цвет должен быть прозрачным чтобы не перекрывать основных знаков отличия.",
-	"wordHighlightBorder": "Цвет границы символа при доступе на чтение, например, при считывании переменной.",
-	"wordHighlightStrongBorder": "Цвет границы символа при доступе на запись, например, при записи переменной. ",
-	"overviewRulerWordHighlightForeground": "Цвет метки линейки в окне просмотра для выделения символов. Цвет не должен был прозрачным, чтобы не перекрывать основные знаки отличия.",
-	"overviewRulerWordHighlightStrongForeground": "Цвет метки линейки в окне просмотра для выделения символов с доступом на запись. Цвет не должен был прозрачным, чтобы не перекрывать основные знаки отличия.",
-	"wordHighlight.next.label": "Перейти к следующему выделению символов",
-	"wordHighlight.previous.label": "Перейти к предыдущему выделению символов"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/editor/contrib/zoneWidget/browser/peekViewWidget.i18n.json b/i18n/rus/src/vs/editor/contrib/zoneWidget/browser/peekViewWidget.i18n.json
deleted file mode 100644
index 6f6dde161df..00000000000
--- a/i18n/rus/src/vs/editor/contrib/zoneWidget/browser/peekViewWidget.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"label.close": "Закрыть"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/editor/electron-browser/textMate/TMSyntax.i18n.json b/i18n/rus/src/vs/editor/electron-browser/textMate/TMSyntax.i18n.json
deleted file mode 100644
index e3e7f8549df..00000000000
--- a/i18n/rus/src/vs/editor/electron-browser/textMate/TMSyntax.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"invalid.language": "Неизвестный язык в contributes.{0}.language. Указанное значение: {1}",
-	"invalid.scopeName": "В contributes.{0}.scopeName требуется строка. Указанное значение: {1}",
-	"invalid.path.0": "В contributes.{0}.path требуется строка. Указанное значение: {1}",
-	"invalid.injectTo": "Недопустимое значение в \"contributes.{0}.injectTo\". Должен быть задан массив имен языковых областей. Указанное значение: {1}",
-	"invalid.embeddedLanguages": "Недопустимое значение в \"contributes.{0}.embeddedLanguages\". Оно должно быть сопоставлением объекта между именем области и языком. Указанное значение: {1}.",
-	"invalid.path.1": "contributes.{0}.path ({1}) должен был быть включен в папку расширения ({2}). Это может сделать расширение непереносимым.",
-	"no-tm-grammar": "Нет грамматики TM, зарегистрированной для этого языка."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/editor/node/languageConfigurationExtensionPoint.i18n.json b/i18n/rus/src/vs/editor/node/languageConfigurationExtensionPoint.i18n.json
deleted file mode 100644
index ddeb7dc0a68..00000000000
--- a/i18n/rus/src/vs/editor/node/languageConfigurationExtensionPoint.i18n.json
+++ /dev/null
@@ -1,23 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"parseErrors": "Ошибок при анализе {0}: {1}",
-	"schema.openBracket": "Открывающий символ скобки или строковая последовательность.",
-	"schema.closeBracket": "Закрывающий символ скобки или строковая последовательность.",
-	"schema.comments": "Определяет символы комментариев",
-	"schema.blockComments": "Определяет способ маркировки комментариев.",
-	"schema.blockComment.begin": "Последовательность символов, открывающая блок комментариев.",
-	"schema.blockComment.end": "Последовательность символов, закрывающая блок комментариев.",
-	"schema.lineComment": "Последовательность символов, с которой начинается строка комментария.",
-	"schema.brackets": "Определяет символы скобок, увеличивающие или уменьшающие отступ.",
-	"schema.autoClosingPairs": "Определяет пары скобок. Когда введена открывающая скобка, автоматически добавляется закрывающая.",
-	"schema.autoClosingPairs.notIn": "Определяет список областей, где автоматические пары отключены.",
-	"schema.surroundingPairs": "Определяет пары скобок, в которые заключается выбранная строка.",
-	"schema.wordPattern": "Определение слова для языка.",
-	"schema.wordPattern.pattern": "Шаблон регулярного выражения, используемый для сопоставления слов.",
-	"schema.wordPattern.flags": "Флаги регулярного выражения, используемого для сопоставления слов.",
-	"schema.wordPattern.flags.errorMessage": "Должно соответствовать шаблону \"/^([gimuy]+)$/\"."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/editor/node/textMate/TMGrammars.i18n.json b/i18n/rus/src/vs/editor/node/textMate/TMGrammars.i18n.json
deleted file mode 100644
index 914bf43b33e..00000000000
--- a/i18n/rus/src/vs/editor/node/textMate/TMGrammars.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"vscode.extension.contributes.grammars": "Добавляет разметчики TextMate.",
-	"vscode.extension.contributes.grammars.language": "Идентификатор языка, для которого добавляется этот синтаксис.",
-	"vscode.extension.contributes.grammars.scopeName": "Имя области TextMate, используемое в файле tmLanguage.",
-	"vscode.extension.contributes.grammars.path": "Путь к файлу tmLanguage. Путь указывается относительно папки расширения и обычно начинается с \"./syntaxes/\".",
-	"vscode.extension.contributes.grammars.embeddedLanguages": "Сопоставление имени области и идентификатора языка, если грамматика содержит внедренные языки.",
-	"vscode.extension.contributes.grammars.injectTo": "Список имен языковых областей, в которые вставляется эта грамматика."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/platform/actions/browser/menuItemActionItem.i18n.json b/i18n/rus/src/vs/platform/actions/browser/menuItemActionItem.i18n.json
deleted file mode 100644
index 0d4e76110bb..00000000000
--- a/i18n/rus/src/vs/platform/actions/browser/menuItemActionItem.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"titleAndKb": "{0} ({1})"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json b/i18n/rus/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
deleted file mode 100644
index c6bce4e5b08..00000000000
--- a/i18n/rus/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"requirearray": "элементы меню должны быть массивом",
-	"requirestring": "свойство \"{0}\" является обязательным и должно иметь тип string",
-	"optstring": "свойство \"{0}\" может быть опущено или должно иметь тип string",
-	"vscode.extension.contributes.menuItem.command": "Идентификатор команды, которую нужно выполнить. Эта команда должна быть объявлена в разделе commands",
-	"vscode.extension.contributes.menuItem.alt": "Идентификатор альтернативной команды, которую нужно выполнить. Эта команда должна быть объявлена в разделе commands",
-	"vscode.extension.contributes.menuItem.when": "Условие, которое должно иметь значение True, чтобы отображался этот элемент",
-	"vscode.extension.contributes.menuItem.group": "Группа, к которой принадлежит эта команда",
-	"vscode.extension.contributes.menus": "Добавляет элементы меню в редактор",
-	"menus.commandPalette": "Палитра команд",
-	"menus.touchBar": "Сенсорная панель (только для macOS)",
-	"menus.editorTitle": "Главное меню редактора",
-	"menus.editorContext": "Контекстное меню редактора",
-	"menus.explorerContext": "Контекстное меню проводника",
-	"menus.editorTabContext": "Контекстное меню вкладок редактора",
-	"menus.debugCallstackContext": "Контекстное меню стека вызовов при отладке",
-	"menus.scmTitle": "Меню заголовков для системы управления версиями",
-	"menus.scmSourceControl": "Меню \"Система управления версиями\"",
-	"menus.resourceGroupContext": "Контекстное меню группы ресурсов для системы управления версиями",
-	"menus.resourceStateContext": "Контекстное меню состояния ресурсов для системы управления версиями",
-	"view.viewTitle": "Меню заголовка для окна участников",
-	"view.itemContext": "Контекстное меню элемента для окна участников",
-	"nonempty": "требуется непустое значение.",
-	"opticon": "Свойство icon может быть пропущено или должно быть строкой или литералом, например \"{dark, light}\"",
-	"requireStringOrObject": "Свойство \"{0}\" обязательно и должно иметь тип \"string\" или \"object\"",
-	"requirestrings": "Свойства \"{0}\" и \"{1}\" обязательны и должны иметь тип \"string\"",
-	"vscode.extension.contributes.commandType.command": "Идентификатор выполняемой команды",
-	"vscode.extension.contributes.commandType.title": "Название команды в пользовательском интерфейсе",
-	"vscode.extension.contributes.commandType.category": "(Необязательно.) Строка категорий, по которым команды группируются в пользовательском интерфейсе",
-	"vscode.extension.contributes.commandType.icon": "(Дополнительно) Значок, который используется для представления команды в пользовательском интерфейсе. Это путь к файлу или конфигурация с возможностью применения тем",
-	"vscode.extension.contributes.commandType.icon.light": "Путь к значку, если используется светлая тема",
-	"vscode.extension.contributes.commandType.icon.dark": "Путь к значку, если используется темная тема",
-	"vscode.extension.contributes.commands": "Добавляет команды в палитру команд.",
-	"dup": "Команда \"{0}\" встречается несколько раз в разделе commands.",
-	"menuId.invalid": "\"{0}\" не является допустимым идентификатором меню",
-	"missing.command": "Элемент меню ссылается на команду \"{0}\", которая не определена в разделе commands.",
-	"missing.altCommand": "Элемент меню ссылается на альтернативную команду \"{0}\", которая не определена в разделе commands.",
-	"dupe.command": "Элемент меню ссылается на одну и ту же команду как команду по умолчанию и альтернативную команду"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/platform/configuration/common/configurationRegistry.i18n.json b/i18n/rus/src/vs/platform/configuration/common/configurationRegistry.i18n.json
deleted file mode 100644
index 8dfe0011ea2..00000000000
--- a/i18n/rus/src/vs/platform/configuration/common/configurationRegistry.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"defaultConfigurations.title": "Переопределения конфигурации по умолчанию",
-	"overrideSettings.description": "Настройка переопределяемых параметров редактора для языка {0}.",
-	"overrideSettings.defaultDescription": "Настройка параметров редактора, переопределяемых для языка.",
-	"config.property.languageDefault": "Невозможно зарегистрировать \"{0}\". Оно соответствует шаблону свойства '\\\\[.*\\\\]$' для описания параметров редактора, определяемых языком. Используйте участие configurationDefaults.",
-	"config.property.duplicate": "Невозможно зарегистрировать \"{0}\". Это свойство уже зарегистрировано."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/platform/dialogs/common/dialogs.i18n.json b/i18n/rus/src/vs/platform/dialogs/common/dialogs.i18n.json
deleted file mode 100644
index cd5317488f4..00000000000
--- a/i18n/rus/src/vs/platform/dialogs/common/dialogs.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"moreFile": "...1 дополнительный файл не показан",
-	"moreFiles": "...не показано дополнительных файлов: {0}"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/platform/dialogs/node/dialogService.i18n.json b/i18n/rus/src/vs/platform/dialogs/node/dialogService.i18n.json
deleted file mode 100644
index a9e4b3696ae..00000000000
--- a/i18n/rus/src/vs/platform/dialogs/node/dialogService.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"cancel": "Отмена"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/platform/environment/node/argv.i18n.json b/i18n/rus/src/vs/platform/environment/node/argv.i18n.json
deleted file mode 100644
index 60e5e887ae4..00000000000
--- a/i18n/rus/src/vs/platform/environment/node/argv.i18n.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"gotoValidation": "Аргументы в режиме \"--goto\" должны быть в формате \"ФАЙЛ(:СТРОКА(:СИМВОЛ))\".",
-	"diff": "Сравнение двух файлов друг с другом",
-	"add": "Добавление папок в последнее активное окно.",
-	"goto": "Открытие файла по указанному пути с выделением указанного символа в указанной строке.",
-	"newWindow": "Принудительно открыть новое окно.",
-	"reuseWindow": "Принудительно открыть файл или папку в последнем активном окне.",
-	"wait": "Дождаться закрытия файлов перед возвратом.",
-	"locale": "Языковой стандарт, который следует использовать (например, en-US или zh-TW).",
-	"userDataDir": "Указывает каталог, в котором хранятся данные пользователей. Может использоваться для открытия нескольких отдельных экземпляров Code.",
-	"version": "Печать версии.",
-	"help": "Распечатать данные об использовании.",
-	"extensionHomePath": "Задайте корневой путь для расширений.",
-	"listExtensions": "Перечислить существующие расширения.",
-	"showVersions": "Показать версии установленных расширений при указании параметра --list-extension.",
-	"installExtension": "Устанавливает расширение.",
-	"uninstallExtension": "Удаляет расширение.",
-	"experimentalApis": "Включает предложенные функции API для расширения.",
-	"verbose": "Печать подробного вывода (подразумевает использование параметра \"--wait\").",
-	"log": "Используемый уровень ведения журнала. Значение по умолчанию — \"info\". Допустимые значения: \"critical\", \"error\", \"warn\", \"info\", \"debug\", \"trace\", \"off\".",
-	"status": "Выводить сведения об использовании процесса и диагностическую информацию.",
-	"performance": "Запустите с включенной командой \"Developer: Startup Performance\".",
-	"prof-startup": "Запустить профилировщик ЦП при запуске",
-	"disableExtensions": "Отключить все установленные расширения.",
-	"inspect-extensions": "Разрешить отладку и профилирование расширений. Проверьте URI подключения для инструментов разработчика.",
-	"inspect-brk-extensions": "Разрешить отладку и профилирование расширений, когда узел расширения приостановлен после запуска. Проверьте URI подключения для инструментов разработчика. ",
-	"disableGPU": "Отключить аппаратное ускорение GPU.",
-	"uploadLogs": "Отправляет журналы из текущего сеанса в защищенную конечную точку.",
-	"maxMemory": "Максимальный размер памяти для окна (в МБ).",
-	"usage": "Использование",
-	"options": "параметры",
-	"paths": "пути",
-	"stdinWindows": "Чтобы прочитать вывод другой программы, добавьте '-' (например 'echo Hello World | {0} -')",
-	"stdinUnix": "Чтобы получить данные с stdin, добавьте '-' (например, 'ps aux | grep code | {0} -')\n",
-	"optionsUpperCase": "Параметры",
-	"extensionsManagement": "Управление расширениями",
-	"troubleshooting": "Устранение неполадок"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/platform/extensionManagement/common/extensionEnablementService.i18n.json b/i18n/rus/src/vs/platform/extensionManagement/common/extensionEnablementService.i18n.json
deleted file mode 100644
index d0794aefc2c..00000000000
--- a/i18n/rus/src/vs/platform/extensionManagement/common/extensionEnablementService.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noWorkspace": "Нет рабочей области."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/platform/extensionManagement/common/extensionManagement.i18n.json b/i18n/rus/src/vs/platform/extensionManagement/common/extensionManagement.i18n.json
deleted file mode 100644
index 78213ff27d7..00000000000
--- a/i18n/rus/src/vs/platform/extensionManagement/common/extensionManagement.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"extensions": "Расширения",
-	"preferences": "Параметры"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/platform/extensionManagement/node/extensionGalleryService.i18n.json b/i18n/rus/src/vs/platform/extensionManagement/node/extensionGalleryService.i18n.json
deleted file mode 100644
index 2f7bf232b66..00000000000
--- a/i18n/rus/src/vs/platform/extensionManagement/node/extensionGalleryService.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"notCompatibleDownload": "Не удается выполнить скачивание, так как не найдено расширение, совместимое с текущей версией VS Code '{0}'. "
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json b/i18n/rus/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
deleted file mode 100644
index b5b010a1ed0..00000000000
--- a/i18n/rus/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"invalidManifest": "Недопустимое расширение: package.json не является файлом JSON.",
-	"incompatible": "Не удалось установить расширение '{0}', так как оно не совместимо с Code '{1}'.",
-	"restartCode": "Перезапустите код перед переустановкой {0}.",
-	"installingOutdatedExtension": "Уже установлена более новая версия этого расширения. Вы хотите переопределить ее более старой версией?",
-	"override": "Переопределить",
-	"cancel": "Отмена",
-	"errorInstallingDependencies": "Ошибка при установке зависимостей. {0}",
-	"MarketPlaceDisabled": "Marketplace не включен",
-	"removeError": "Ошибка при удалении расширения: {0}. Закройте и снова откройте VS Code, затем повторите попытку.",
-	"Not a Marketplace extension": "Можно переустановить только расширения из Marketplace",
-	"notFoundCompatible": "Невозможно установить '{0}'; нет версии, совместимой с VS Code '{1}'.",
-	"malicious extension": "Не удается установить расширение, так как оно помечено как проблемное.",
-	"notFoundCompatibleDependency": "Не удается выполнить установку, так как не найдено зависимое расширение '{0}', совместимое с текущей версией VS Code '{1}'. ",
-	"quitCode": "Невозможно установить расширение. Пожалуйста, выйдите и зайдите в VS Code перед переустановкой.",
-	"exitCode": "Невозможно установить расширение. Пожалуйста, выйдите и зайдите в VS Code перед переустановкой.",
-	"renameError": "Неизвестная ошибка при переименовании {0} в {1}",
-	"uninstallDependeciesConfirmation": "Вы хотите удалить \"{0}\" отдельно или вместе с зависимостями?",
-	"uninstallOnly": "Только расширение",
-	"uninstallAll": "Удалить все",
-	"singleDependentError": "Не удается удалить расширение \"{0}\". От него зависит расширение \"{1}\".",
-	"twoDependentsError": "Не удается удалить расширение \"{0}\". От него зависят расширения \"{1}\" и \"{2}\".",
-	"multipleDependentsError": "Не удается удалить расширение \"{0}\". От него зависят расширения \"{1}\", \"{2}\" и другие.",
-	"notExists": "Не удалось найти расширение"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/platform/extensions/common/abstractExtensionService.i18n.json b/i18n/rus/src/vs/platform/extensions/common/abstractExtensionService.i18n.json
deleted file mode 100644
index 6dd5f17dccf..00000000000
--- a/i18n/rus/src/vs/platform/extensions/common/abstractExtensionService.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"unknownDep": "Не удалось активировать расширение \"{1}\". Причина: неизвестный зависимый компонент \"{0}\".",
-	"failedDep1": "Не удалось активировать расширение \"{1}\". Причина: ошибка активации зависимого компонента \"{0}\".",
-	"failedDep2": "Не удалось активировать расширение \"{0}\". Причина: более 10 уровней зависимостей (скорее всего, цикл зависимостей).",
-	"activationError": "Ошибка активации расширения \"{0}\": {1}."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/platform/extensions/common/extensionsRegistry.i18n.json b/i18n/rus/src/vs/platform/extensions/common/extensionsRegistry.i18n.json
deleted file mode 100644
index 8d9d6a48ce3..00000000000
--- a/i18n/rus/src/vs/platform/extensions/common/extensionsRegistry.i18n.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.engines.vscode": "Для расширений VS Code указывает версию VS Code, с которой совместимо расширение. Она не может быть задана как \"*\". Например, ^0.10.5 сообщает о совместимости с минимальной версией VS Code 0.10.5.",
-	"vscode.extension.publisher": "Издатель расширения VS Code.",
-	"vscode.extension.displayName": "Отображаемое имя расширения, используемого в коллекции VS Code.",
-	"vscode.extension.categories": "Категории, используемые коллекцией VS Code для классификации расширения.",
-	"vscode.extension.galleryBanner": "Баннер, используемый в магазине VS Code.",
-	"vscode.extension.galleryBanner.color": "Цвет баннера в заголовке страницы магазина VS Code.",
-	"vscode.extension.galleryBanner.theme": "Цветовая тема для шрифта, используемого в баннере.",
-	"vscode.extension.contributes": "Все публикации расширения VS Code, представленные этим пакетом.",
-	"vscode.extension.preview": "Добавляет метку \"Предварительная версия\" для расширения в Marketplace.",
-	"vscode.extension.activationEvents": "События активации для расширения кода VS Code.",
-	"vscode.extension.activationEvents.onLanguage": "Событие активации выдается каждый раз, когда открывается файл, который разрешается к указанному языку.",
-	"vscode.extension.activationEvents.onCommand": "Событие активации выдается каждый раз при вызове указанной команды.",
-	"vscode.extension.activationEvents.onDebug": "Событие активации выдается каждый раз, когда пользователь запускает отладку или собирается установить конфигурацию отладки.",
-	"vscode.extension.activationEvents.onDebugInitialConfigurations": "Событие активации выдается каждый раз, когда необходимо создать файл \"launch.json\" (и вызывать все методы provideDebugConfigurations).",
-	"vscode.extension.activationEvents.onDebugResolve": "Событие активации выдается каждый раз при запуске сеанса отладки указанного типа (и при вызове соответствующего метода resolveDebugConfiguration).",
-	"vscode.extension.activationEvents.workspaceContains": "Событие активации выдается каждый раз при открытии папки, содержащей по крайней мере один файл, который соответствует указанной стандартной маске.",
-	"vscode.extension.activationEvents.onView": "Событие активации выдается каждый раз при развертывании указанного окна.",
-	"vscode.extension.activationEvents.star": "Событие активации выдается при запуске VS Code. Для удобства пользователя используйте это событие в своем расширении только в том случае, если другие сочетания событий не подходят.",
-	"vscode.extension.badges": "Массив эмблем, отображаемых на боковой панели страницы расширения Marketplace.",
-	"vscode.extension.badges.url": "URL-адрес изображения эмблемы.",
-	"vscode.extension.badges.href": "Ссылка на эмблему.",
-	"vscode.extension.badges.description": "Описание эмблемы.",
-	"vscode.extension.extensionDependencies": "Зависимости от других расширений. Идентификатор расширения — всегда ${publisher}.${name}. Например: vscode.csharp.",
-	"vscode.extension.scripts.prepublish": "Скрипт, выполняемый перед публикацией пакета в качестве расширения VS Code.",
-	"vscode.extension.icon": "Путь к значку размером 128 x 128 пикселей."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/platform/extensions/node/extensionValidator.i18n.json b/i18n/rus/src/vs/platform/extensions/node/extensionValidator.i18n.json
deleted file mode 100644
index 99a26298848..00000000000
--- a/i18n/rus/src/vs/platform/extensions/node/extensionValidator.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"versionSyntax": "Не удалось проанализировать значение engines.vscode {0}. Используйте такие значения как ^1.22.0, ^1.22.x и т.д.",
-	"versionSpecificity1": "Версия, указанная в engines.vscode ({0}), недостаточно конкретная. Для версий vscode до 1.0.0 укажите по крайней мере основной и дополнительный номер версии. Например, 0.10.0, 0.10.x, 0.11.0 и т. д.",
-	"versionSpecificity2": "Версия, указанная в engines.vscode ({0}), недостаточно конкретная. Для версий vscode после 1.0.0 укажите по крайней мере основной номер версии. Например, 1.10.0, 1.10.x, 1.x.x, 2.x.x и т. д.",
-	"versionMismatch": "Расширение несовместимо с кодом \"{0}\". Расширению требуется: {1}."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/platform/history/electron-main/historyMainService.i18n.json b/i18n/rus/src/vs/platform/history/electron-main/historyMainService.i18n.json
deleted file mode 100644
index 4930aa8449c..00000000000
--- a/i18n/rus/src/vs/platform/history/electron-main/historyMainService.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"newWindow": "Новое окно",
-	"newWindowDesc": "Открывает новое окно",
-	"recentFolders": "Последние рабочие области",
-	"folderDesc": "{0} {1}",
-	"codeWorkspace": "Рабочая область кода"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/platform/integrity/node/integrityServiceImpl.i18n.json b/i18n/rus/src/vs/platform/integrity/node/integrityServiceImpl.i18n.json
deleted file mode 100644
index 954eb473437..00000000000
--- a/i18n/rus/src/vs/platform/integrity/node/integrityServiceImpl.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"integrity.prompt": "Похоже, ваша установка {0} повреждена. Повторите установку.",
-	"integrity.moreInformation": "Дополнительные сведения",
-	"integrity.dontShowAgain": "Больше не показывать"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/platform/issue/electron-main/issueService.i18n.json b/i18n/rus/src/vs/platform/issue/electron-main/issueService.i18n.json
deleted file mode 100644
index dc9424fc0d6..00000000000
--- a/i18n/rus/src/vs/platform/issue/electron-main/issueService.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"issueReporter": "Средство создания отчетов о неполадках",
-	"processExplorer": "Обозреватель процессов"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/platform/jsonschemas/common/jsonValidationExtensionPoint.i18n.json b/i18n/rus/src/vs/platform/jsonschemas/common/jsonValidationExtensionPoint.i18n.json
deleted file mode 100644
index 7c0be2dbcb6..00000000000
--- a/i18n/rus/src/vs/platform/jsonschemas/common/jsonValidationExtensionPoint.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"contributes.jsonValidation": "Добавляет конфигурацию схемы JSON.",
-	"contributes.jsonValidation.fileMatch": "Шаблон файла для сопоставления, например \"package.json\" или \"*.launch\".",
-	"contributes.jsonValidation.url": "URL-адрес схемы (\"http:\", \"https:\") или относительный путь к папке расширения (\"./\").",
-	"invalid.jsonValidation": "configuration.jsonValidation должно быть массивом",
-	"invalid.fileMatch": "Необходимо определить configuration.jsonValidation.fileMatch",
-	"invalid.url": "Значение configuration.jsonValidation.url должно быть URL-адресом или относительным путем",
-	"invalid.url.fileschema": "Значение configuration.jsonValidation.url является недопустимым относительным URL-адресом: {0}",
-	"invalid.url.schema": "Значение configuration.jsonValidation.url должно начинаться с \"http:\", \"https:\" или \"./\" для ссылки на схемы, содержащиеся в расширении"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/platform/keybinding/common/abstractKeybindingService.i18n.json b/i18n/rus/src/vs/platform/keybinding/common/abstractKeybindingService.i18n.json
deleted file mode 100644
index f9a5eb3aa14..00000000000
--- a/i18n/rus/src/vs/platform/keybinding/common/abstractKeybindingService.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"first.chord": "Была нажата клавиша ({0}). Ожидание нажатия второй клавиши сочетания...",
-	"missing.chord": "Сочетание клавиш ({0} и {1}) не является командой."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/platform/keybinding/common/keybindingLabels.i18n.json b/i18n/rus/src/vs/platform/keybinding/common/keybindingLabels.i18n.json
deleted file mode 100644
index 94c6d7cf755..00000000000
--- a/i18n/rus/src/vs/platform/keybinding/common/keybindingLabels.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"ctrlKey": "CTRL",
-	"shiftKey": "SHIFT",
-	"altKey": "ALT",
-	"windowsKey": "Клавиша Windows",
-	"ctrlKey.long": "CTRL",
-	"shiftKey.long": "SHIFT",
-	"altKey.long": "ALT",
-	"cmdKey.long": "Команда",
-	"windowsKey.long": "Клавиша Windows"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/platform/list/browser/listService.i18n.json b/i18n/rus/src/vs/platform/list/browser/listService.i18n.json
deleted file mode 100644
index b9fbce4eef3..00000000000
--- a/i18n/rus/src/vs/platform/list/browser/listService.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"workbenchConfigurationTitle": "Рабочее место",
-	"multiSelectModifier.ctrlCmd": "Соответствует клавише CTRL в Windows и Linux и клавише COMMAND в macOS.",
-	"multiSelectModifier.alt": "Соответствует клавише ALT в Windows и Linux и клавише OPTION в macOS.",
-	"multiSelectModifier": "Модификатор, который будет использоваться для добавления элементов в деревьях и списках в элемент множественного выбора с помощью мыши (например, в проводнике, в открытых редакторах и в представлении scm). \"ctrlCmd\" соответствует клавише CTRL в Windows и Linux и клавише COMMAND в macOS. Жесты мыши  \"Открыть сбоку\" (если они поддерживаются), будут изменены таким образом, чтобы они не конфликтовали с модификатором элемента множественного выбора.",
-	"openMode.singleClick": "Открывает элемент одним щелчком мыши.",
-	"openMode.doubleClick": "Открывает элемент двойным щелчком мыши.",
-	"openModeModifier": "Управляет тем, как открывать элементы в деревьях и списках с помощью мыши (если поддерживается). Укажите значение \"singleClick\", чтобы открывать элементы одним щелчком мыши, и \"doubleClick\", чтобы открывать их только двойным щелчком мыши. Для родительских элементов с дочерними элементами в деревьях этот параметр управляет тем, будет ли родительский элемент разворачиваться по одинарному или по двойному щелчку мыши. Обратите внимание, что этот параметр может игнорироваться в некоторых деревьях и списках, если он не применяется к ним. ",
-	"horizontalScrolling setting": "Определяет, поддерживают ли древа горизонтальную прокрутку в рабочей области."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/platform/localizations/common/localizations.i18n.json b/i18n/rus/src/vs/platform/localizations/common/localizations.i18n.json
deleted file mode 100644
index 3a9dc5f5581..00000000000
--- a/i18n/rus/src/vs/platform/localizations/common/localizations.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.contributes.localizations": "Добавляет локализации в редактор",
-	"vscode.extension.contributes.localizations.languageId": "Идентификатор языка, на который будут переведены отображаемые строки.",
-	"vscode.extension.contributes.localizations.languageName": "Название языка на английском языке.",
-	"vscode.extension.contributes.localizations.languageNameLocalized": "Название языка на предоставленном языке.",
-	"vscode.extension.contributes.localizations.translations": "Список переводов, связанных с языком.",
-	"vscode.extension.contributes.localizations.translations.id": "Идентификатор VS Code или расширения, для которого предоставляется этот перевод. Идентификатор VS Code всегда имеет формат \"vscode\", а идентификатор расширения должен иметь формат \"publisherId.extensionName\".",
-	"vscode.extension.contributes.localizations.translations.id.pattern": "Идентификатор должен иметь формат \"vscode\" или \"publisherId.extensionName\" для перевода VS Code или расширения соответственно.",
-	"vscode.extension.contributes.localizations.translations.path": "Относительный путь к файлу, содержащему переводы для языка."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/platform/markers/common/markers.i18n.json b/i18n/rus/src/vs/platform/markers/common/markers.i18n.json
deleted file mode 100644
index eaeabe67095..00000000000
--- a/i18n/rus/src/vs/platform/markers/common/markers.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"sev.error": "Ошибка",
-	"sev.warning": "Предупреждение",
-	"sev.info": "Сведения"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/platform/markers/common/problemMatcher.i18n.json b/i18n/rus/src/vs/platform/markers/common/problemMatcher.i18n.json
deleted file mode 100644
index be88b464fa6..00000000000
--- a/i18n/rus/src/vs/platform/markers/common/problemMatcher.i18n.json
+++ /dev/null
@@ -1,72 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"ProblemPatternParser.loopProperty.notLast": "Свойство loop поддерживается только в сопоставителе последней строки.",
-	"ProblemPatternParser.problemPattern.missingRegExp": "В шаблоне проблем отсутствует регулярное выражение.",
-	"ProblemPatternParser.problemPattern.missingProperty": "Недопустимый шаблон проблемы. Шаблон должен содержать по крайней мере файл, сообщение и группу сопоставления строк или расположений.",
-	"ProblemPatternParser.invalidRegexp": "Ошибка: строка {0} не является допустимым регулярным выражением.\n",
-	"ProblemPatternSchema.regexp": "Регулярное выражение для поиска ошибки, предупреждения или информации в выходных данных.",
-	"ProblemPatternSchema.file": "Индекс группы сопоставления для имени файла. Если он не указан, используется значение 1.",
-	"ProblemPatternSchema.location": "Индекс группы сопоставления для расположения проблемы. Допустимые шаблоны расположения: (строка), (строка,столбец) и (начальная_строка,начальный_столбец,конечная_строка,конечный_столбец). Если индекс не указан, предполагается шаблон (строка,столбец).",
-	"ProblemPatternSchema.line": "Индекс группы сопоставления для строки проблемы. Значение по умолчанию — 2.",
-	"ProblemPatternSchema.column": "Индекс группы сопоставления для символа в строке проблемы. Значение по умолчанию — 3",
-	"ProblemPatternSchema.endLine": "Индекс группы сопоставления для конечной строки проблемы. По умолчанию не определен.",
-	"ProblemPatternSchema.endColumn": "Индекс группы сопоставления для конечного символа проблемы. По умолчанию не определен.",
-	"ProblemPatternSchema.severity": "Индекс группы сопоставления для серьезности проблемы. По умолчанию не определен.",
-	"ProblemPatternSchema.code": "Индекс группы сопоставления для кода проблемы. По умолчанию не определен.",
-	"ProblemPatternSchema.message": "Индекс группы сопоставления для сообщения. Если он не указан, значение по умолчанию — 4 при незаданном расположении. В противном случае значение по умолчанию — 5.",
-	"ProblemPatternSchema.loop": "В цикле многострочного сопоставителя указывает, выполняется ли этот шаблон в цикле, пока он соответствует. Может указываться только для последнего шаблона в многострочном шаблоне.",
-	"NamedProblemPatternSchema.name": "Имя шаблона проблем.",
-	"NamedMultiLineProblemPatternSchema.name": "Имя шаблона многострочных проблем.",
-	"NamedMultiLineProblemPatternSchema.patterns": "Фактические шаблоны.",
-	"ProblemPatternExtPoint": "Публикует шаблоны проблем",
-	"ProblemPatternRegistry.error": "Недопустимый шаблон проблем. Он будет пропущен.",
-	"ProblemMatcherParser.noProblemMatcher": "Ошибка: описание невозможно преобразовать в сопоставитель проблем:\n{0}\n",
-	"ProblemMatcherParser.noProblemPattern": "Ошибка: в описании не задан допустимый шаблон проблемы:\n{0}\n",
-	"ProblemMatcherParser.noOwner": "Ошибка: в описании не задан владелец:\n{0}\n",
-	"ProblemMatcherParser.noFileLocation": "Ошибка: в описании не указано расположение файла:\n{0}\n",
-	"ProblemMatcherParser.unknownSeverity": "Информация: неизвестная степень серьезности {0}. Допустимые значения: ошибка, предупреждение и информация.\n",
-	"ProblemMatcherParser.noDefinedPatter": "Ошибка: шаблон с идентификатором {0} не существует.",
-	"ProblemMatcherParser.noIdentifier": "Ошибка: свойство шаблона ссылается на пустой идентификатор.",
-	"ProblemMatcherParser.noValidIdentifier": "Ошибка: свойство шаблона {0} не является допустимым именем переменной шаблона.",
-	"ProblemMatcherParser.problemPattern.watchingMatcher": "В сопоставителе проблем должны быть определены как начальный, так и конечный шаблоны для отслеживания.",
-	"ProblemMatcherParser.invalidRegexp": "Ошибка: строка {0} не является допустимым регулярным выражением.\n",
-	"WatchingPatternSchema.regexp": "Регулярное выражение для обнаружения начала или конца фоновой задачи.",
-	"WatchingPatternSchema.file": "Индекс группы сопоставления для имени файла. Может быть опущен.",
-	"PatternTypeSchema.name": "Имя добавленного или предопределенного шаблона",
-	"PatternTypeSchema.description": "Шаблон проблем либо имя добавленного или предопределенного шаблона проблем. Его можно опустить, если указано базовое значение.",
-	"ProblemMatcherSchema.base": "Имя используемого базового сопоставителя проблем.",
-	"ProblemMatcherSchema.owner": "Владелец проблемы в Code. Можно опустить, если указан элемент base. Если владелец опущен, а элемент base не указан, значение по умолчанию — \"внешний\".",
-	"ProblemMatcherSchema.severity": "Серьезность по умолчанию для выявленных проблем. Используется, если в шаблоне не определена группа сопоставления для серьезности.",
-	"ProblemMatcherSchema.applyTo": "Определяет, относится ли проблема, о которой сообщается для текстового документа, только к открытым, только к закрытым или ко всем документам.",
-	"ProblemMatcherSchema.fileLocation": "Определяет способ интерпретации имен файлов, указываемых в шаблоне проблемы.",
-	"ProblemMatcherSchema.background": "Шаблоны для отслеживания начала и окончания фоновой задачи.",
-	"ProblemMatcherSchema.background.activeOnStart": "Если задано значение true, средство мониторинга фоновых задач будет находиться в активном режиме при запуске задачи. Это аналогично выдаче строки, соответствующей шаблону начала.",
-	"ProblemMatcherSchema.background.beginsPattern": "При наличии соответствия в выходных данных выдается сигнал о запуске фоновой задачи.",
-	"ProblemMatcherSchema.background.endsPattern": "При наличии соответствия в выходных данных выдается сигнал о завершении фоновой задачи.",
-	"ProblemMatcherSchema.watching.deprecated": "Это свойство для отслеживания устарело. Используйте цвет фона.",
-	"ProblemMatcherSchema.watching": "Шаблоны для отслеживания начала и окончания шаблона отслеживания.",
-	"ProblemMatcherSchema.watching.activeOnStart": "Если задано значение true, наблюдатель находится в активном режиме, когда задача запускается. Это равносильно выдаче строки, соответствующей шаблону начала.",
-	"ProblemMatcherSchema.watching.beginsPattern": "При соответствии в выходных данных сообщает о запуске задачи наблюдения.",
-	"ProblemMatcherSchema.watching.endsPattern": "При соответствии в выходных данных сообщает о завершении задачи наблюдения.",
-	"LegacyProblemMatcherSchema.watchedBegin.deprecated": "Это свойство устарело. Используйте свойство просмотра.",
-	"LegacyProblemMatcherSchema.watchedBegin": "Регулярное выражение, сообщающее о том, что отслеживаемая задача начинает выполняться в результате активации отслеживания файлов.",
-	"LegacyProblemMatcherSchema.watchedEnd.deprecated": "Это свойство устарело. Используйте свойство просмотра.",
-	"LegacyProblemMatcherSchema.watchedEnd": "Регулярное выражение, сообщающее о том, что отслеживаемая задача завершает выполнение.",
-	"NamedProblemMatcherSchema.name": "Имя сопоставителя проблем, используемого для ссылки.",
-	"NamedProblemMatcherSchema.label": "Метка сопоставителя проблем в удобном для чтения формате.",
-	"ProblemMatcherExtPoint": "Публикует сопоставители проблем",
-	"msCompile": "Проблемы компилятора Microsoft",
-	"lessCompile": "Скрыть проблемы",
-	"gulp-tsc": "Проблемы TSC для Gulp",
-	"jshint": "Проблемы JSHint",
-	"jshint-stylish": "Проблемы JSHint, связанные со стилем",
-	"eslint-compact": "Проблемы ESLint, связанные с компактностью",
-	"eslint-stylish": "Проблемы ESLint, связанные со стилем",
-	"go": "Перейти к проблемам"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/platform/message/common/message.i18n.json b/i18n/rus/src/vs/platform/message/common/message.i18n.json
deleted file mode 100644
index d2165310fe5..00000000000
--- a/i18n/rus/src/vs/platform/message/common/message.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"close": "Закрыть",
-	"later": "Позже",
-	"cancel": "Отмена",
-	"moreFile": "...1 дополнительный файл не показан",
-	"moreFiles": "...не показано дополнительных файлов: {0}"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/platform/node/minimalTranslations.i18n.json b/i18n/rus/src/vs/platform/node/minimalTranslations.i18n.json
deleted file mode 100644
index ef1cc0c9ead..00000000000
--- a/i18n/rus/src/vs/platform/node/minimalTranslations.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"showLanguagePackExtensions": "Среда VS Code доступна на следующем языке: {0}. Чтобы начать работу, найдите необходимые языковые пакеты в Marketplace. ",
-	"searchMarketplace": "Поиск в Marketplace",
-	"installAndRestartMessage": "Среда VS Code доступна на следующем языке: {0}. Чтобы начать работу, установите языковой пакет. После установки потребуется перезапустить среду. ",
-	"installAndRestart": "Установить и перезапустить"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/platform/request/node/request.i18n.json b/i18n/rus/src/vs/platform/request/node/request.i18n.json
deleted file mode 100644
index d22fddb6eba..00000000000
--- a/i18n/rus/src/vs/platform/request/node/request.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"httpConfigurationTitle": "HTTP",
-	"proxy": "Используемый параметр прокси. Если он не задан, он будет взят из переменных среды http_proxy и https_proxy.",
-	"strictSSL": "Должен ли сертификат прокси-сервера проверяться по списку предоставленных ЦС.",
-	"proxyAuthorization": "Значение, отправляемое как заголовок \"Proxy-Authorization\" для каждого сетевого запроса."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/platform/telemetry/common/telemetryService.i18n.json b/i18n/rus/src/vs/platform/telemetry/common/telemetryService.i18n.json
deleted file mode 100644
index dc4bf923217..00000000000
--- a/i18n/rus/src/vs/platform/telemetry/common/telemetryService.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"telemetryConfigurationTitle": "Телеметрия",
-	"telemetry.enableTelemetry": "Разрешить отправку сведений об использовании и ошибках в корпорацию Майкрософт."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/platform/theme/common/colorExtensionPoint.i18n.json b/i18n/rus/src/vs/platform/theme/common/colorExtensionPoint.i18n.json
deleted file mode 100644
index ce0c503ab7e..00000000000
--- a/i18n/rus/src/vs/platform/theme/common/colorExtensionPoint.i18n.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"contributes.color": "Добавляет цвета тем, определяемые расширением ",
-	"contributes.color.id": "Идентификатор цвета темы",
-	"contributes.color.id.format": "Идентификаторы необходимо указывать в форме aa [.bb]*",
-	"contributes.color.description": "Описание цвета темы",
-	"contributes.defaults.light": "Цвет по умолчанию для светлых тем. Укажите значение цвета в шестнадцатеричном формате (#RRGGBB[AA]) или идентификатор цвета темы.",
-	"contributes.defaults.dark": "Цвет по умолчанию для темных тем. Укажите значение цвета в шестнадцатеричном формате (#RRGGBB[AA]) или идентификатор цвета темы.",
-	"contributes.defaults.highContrast": "Цвет по умолчанию для тем с высоким контрастом. Укажите значение цвета в шестнадцатеричном формате (#RRGGBB[AA]) или идентификатор цвета темы.",
-	"invalid.colorConfiguration": "'configuration.colors' должен быть массивом",
-	"invalid.default.colorType": "{0} должен представлять собой значение цвета в шестнадцатеричном формате (#RRGGBB[AA] или #RGB[A]) или идентификатор цвета темы.",
-	"invalid.id": "Параметр 'configuration.colors.id' должен быть указан и не может быть пустым",
-	"invalid.id.format": "Параметр 'configuration.colors.id' должен следовать за word[.word]*",
-	"invalid.description": "Параметр 'configuration.colors.description' должен быть указан и не может быть пустым",
-	"invalid.defaults": "'configuration.colors.defaults' может быть указан и может содержать значения 'light', 'dark' и 'highContrast'"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/platform/theme/common/colorRegistry.i18n.json b/i18n/rus/src/vs/platform/theme/common/colorRegistry.i18n.json
deleted file mode 100644
index a203da5726c..00000000000
--- a/i18n/rus/src/vs/platform/theme/common/colorRegistry.i18n.json
+++ /dev/null
@@ -1,101 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"schema.colors": "Цвета, используемые на рабочем месте.",
-	"foreground": "Общий цвет переднего плана. Этот цвет используется, только если его не переопределит компонент.",
-	"errorForeground": "Общий цвет переднего плана для сообщений об ошибках. Этот цвет используется только если его не переопределяет компонент.",
-	"descriptionForeground": "Цвет текста элемента, содержащего пояснения, например, для метки.",
-	"focusBorder": "Общий цвет границ для элементов с фокусом. Этот цвет используется только в том случае, если не переопределен в компоненте.",
-	"contrastBorder": "Дополнительная граница вокруг элементов, которая отделяет их от других элементов для улучшения контраста.",
-	"activeContrastBorder": "Дополнительная граница вокруг активных элементов, которая отделяет их от других элементов для улучшения контраста.",
-	"selectionBackground": "Цвет фона выделенного текста в рабочей области (например, в полях ввода или в текстовых полях). Не применяется к выделенному тексту в редакторе.",
-	"textSeparatorForeground": "Цвет для разделителей текста.",
-	"textLinkForeground": "Цвет переднего плана для ссылок в тексте.",
-	"textLinkActiveForeground": "Цвет переднего плана для ссылок в тексте при щелчке и при наведении курсора мыши.",
-	"textPreformatForeground": "Цвет текста фиксированного формата.",
-	"textBlockQuoteBackground": "Цвет фона для блоков с цитатами в тексте.",
-	"textBlockQuoteBorder": "Цвет границ для блоков с цитатами в тексте.",
-	"textCodeBlockBackground": "Цвет фона для программного кода в тексте.",
-	"widgetShadow": "Цвет тени мини-приложений редактора, таких как \"Найти/заменить\".",
-	"inputBoxBackground": "Фон поля ввода.",
-	"inputBoxForeground": "Передний план поля ввода.",
-	"inputBoxBorder": "Граница поля ввода.",
-	"inputBoxActiveOptionBorder": "Цвет границ активированных параметров в полях ввода.",
-	"inputPlaceholderForeground": "Цвет фона поясняющего текста в элементе ввода.",
-	"inputValidationInfoBackground": "Фоновый цвет проверки ввода для уровня серьезности \"Сведения\".",
-	"inputValidationInfoBorder": "Цвет границы проверки ввода для уровня серьезности \"Сведения\".",
-	"inputValidationWarningBackground": "Фоновый цвет проверки ввода для уровня серьезности \"Предупреждение\".",
-	"inputValidationWarningBorder": "Цвет границы проверки ввода для уровня серьезности \"Предупреждение\".",
-	"inputValidationErrorBackground": "Фоновый цвет проверки ввода для уровня серьезности \"Ошибка\".",
-	"inputValidationErrorBorder": "Цвет границы проверки ввода для уровня серьезности \"Ошибка\".",
-	"dropdownBackground": "Фон раскрывающегося списка.",
-	"dropdownListBackground": "Цвет фона раскрывающегося списка.",
-	"dropdownForeground": "Передний план раскрывающегося списка.",
-	"dropdownBorder": "Граница раскрывающегося списка.",
-	"listFocusBackground": "Фоновый цвет находящегося в фокусе элемента List/Tree, когда элемент List/Tree активен. На активном элементе List/Tree есть фокус клавиатуры, на неактивном — нет.",
-	"listFocusForeground": "Цвет переднего плана находящегося в фокусе элемента List/Tree, когда элемент List/Tree активен. На активном элементе List/Tree есть фокус клавиатуры, на неактивном — нет.",
-	"listActiveSelectionBackground": "Фоновый цвет выбранного элемента List/Tree, когда элемент List/Tree активен. На активном элементе List/Tree есть фокус клавиатуры, на неактивном — нет.",
-	"listActiveSelectionForeground": "Цвет переднего плана выбранного элемента List/Tree, когда элемент List/Tree активен. На активном элементе List/Tree есть фокус клавиатуры, на неактивном — нет.",
-	"listInactiveSelectionBackground": "Фоновый цвет выбранного элемента List/Tree, когда элемент List/Tree неактивен. На активном элементе List/Tree есть фокус клавиатуры, на неактивном — нет.",
-	"listInactiveSelectionForeground": "Цвет текста выбранного элемента List/Tree, когда элемент List/Tree неактивен. На активном элементе List/Tree есть фокус клавиатуры, на неактивном — нет.",
-	"listHoverBackground": "Фоновый цвет элементов List/Tree при наведении курсора мыши.",
-	"listHoverForeground": "Цвет переднего плана элементов List/Tree при наведении курсора мыши.",
-	"listDropBackground": "Фоновый цвет элементов List/Tree при перемещении с помощью мыши.",
-	"highlight": "Цвет переднего плана для выделения соответствия при поиске по элементу List/Tree.",
-	"invalidItemForeground": "Цвет переднего плана списка/дерева для недопустимых элементов, например, для неразрешенного корневого узла в проводнике.",
-	"listErrorForeground": "Цвет переднего плана элементов списка, содержащих ошибки.",
-	"listWarningForeground": "Цвет переднего плана элементов списка, содержащих предупреждения.",
-	"pickerGroupForeground": "Цвет средства быстрого выбора для группировки меток.",
-	"pickerGroupBorder": "Цвет средства быстрого выбора для группировки границ.",
-	"buttonForeground": "Цвет переднего плана кнопки.",
-	"buttonBackground": "Цвет фона кнопки.",
-	"buttonHoverBackground": "Цвет фона кнопки при наведении.",
-	"badgeBackground": "Цвет фона бэджа. Бэджи - небольшие информационные элементы,  отображающие количество, например, результатов поиска.",
-	"badgeForeground": "Цвет текста бэджа. Бэджи - небольшие информационные элементы, отображающие количество, например, результатов поиска.",
-	"scrollbarShadow": "Цвет тени полосы прокрутки, которая свидетельствует о том, что содержимое прокручивается.",
-	"scrollbarSliderBackground": "Цвет фона ползунка полосы прокрутки.",
-	"scrollbarSliderHoverBackground": "Цвет фона ползунка полосы прокрутки при наведении курсора.",
-	"scrollbarSliderActiveBackground": "Цвет фона ползунка полосы прокрутки при щелчке по нему.",
-	"progressBarBackground": "Цвет фона индикатора выполнения, который может отображаться для длительных операций.",
-	"editorBackground": "Цвет фона редактора.",
-	"editorForeground": "Цвет переднего плана редактора по умолчанию.",
-	"editorWidgetBackground": "Цвет фона виджетов редактора, таких как найти/заменить.",
-	"editorWidgetBorder": "Цвет границы мини-приложений редактора. Этот цвет используется только в том случае, если у мини-приложения есть граница и если этот цвет не переопределен мини-приложением.",
-	"editorSelectionBackground": "Цвет выделения редактора.",
-	"editorSelectionForeground": "Цвет выделенного текста в режиме высокого контраста.",
-	"editorInactiveSelection": "Цвет выбора в не активном редакторе. Цвет должен быть прозрачным, чтобы не перекрывать основные знаки отличия.",
-	"editorSelectionHighlight": "Цвет регионов с тем же содержимым, что и в выделении. Цвет должен быть прозрачным, чтобы не перекрывать основные знаки отличия.",
-	"editorSelectionHighlightBorder": "Цвет границы регионов с тем же содержимым, что и в выделении.",
-	"editorFindMatch": "Цвет текущего поиска совпадений.",
-	"findMatchHighlight": "Цвет для других результатов поиска. Цвет должен быть прозрачным, чтобы не перекрывать основные знаки отличия.",
-	"findRangeHighlight": "Цвет диапазона для ограничения поиска. Цвет должен быть прозрачным, чтобы не перекрывать основные знаки отличия.",
-	"editorFindMatchBorder": "Цвет границы текущего результата поиска.",
-	"findMatchHighlightBorder": "Цвет границы других результатов поиска.",
-	"findRangeHighlightBorder": "Цвет границы диапазона для ограничения поиска. Цвет должен быть прозрачным, чтобы не перекрывать основные знаки отличия.",
-	"findWidgetResizeBorder": "Цвет границ панели изменения размера для мини-приложения поиска.",
-	"hoverHighlight": "Выделение под словом, для которого показано наведение. Цвет должен быть прозрачным, чтобы не перекрывать основные знаки отличия.",
-	"hoverBackground": "Цвет фона при наведении указателя на редактор.",
-	"hoverBorder": "Цвет границ при наведении указателя на редактор.",
-	"activeLinkForeground": "Цвет активных ссылок.",
-	"diffEditorInserted": "Цвет фона для вставленного текста. Цвет должен быть прозрачным, чтобы не перекрывать основные знаки отличия.",
-	"diffEditorRemoved": "Цвет фона для удаленного текста. Цвет должен быть прозрачным, чтобы не перекрывать основные знаки отличия. ",
-	"diffEditorInsertedOutline": "Цвет контура для добавленных строк.",
-	"diffEditorRemovedOutline": "Цвет контура для удаленных строк.",
-	"mergeCurrentHeaderBackground": "Фон текущего заголовка при конфликтах встроеного слияния. Цвет должен быть прозрачным, чтобы не перекрывать основные знаки отличия.",
-	"mergeCurrentContentBackground": "Фон текущего содержания при конфликтах встроеного слияния. Цвет должен быть прозрачным, чтобы не перекрывать основные знаки отличия.",
-	"mergeIncomingHeaderBackground": "Фон измененного заголовка при конфликтах встроенного слияния. Цвет должен быть прозрачным, чтобы не перекрывать основные знаки отличия.",
-	"mergeIncomingContentBackground": "Фон измененного содержания при конфликтах встроенного слияния. Цвет должен быть прозрачным, чтобы не перекрывать основные знаки отличия.",
-	"mergeCommonHeaderBackground": "Фон заголовка для общего предшественника при конфликтах внутреннего слияния. Цвет должен быть прозрачным, чтобы не перекрывать основные знаки отличия.",
-	"mergeCommonContentBackground": "Фон содержания общего предшественника при конфликтах внутреннего слияния. Цвет должен быть прозрачным, чтобы не перекрывать основные знаки отличия.",
-	"mergeBorder": "Цвет границы заголовков и разделителя во внутренних конфликтах слияния.",
-	"overviewRulerCurrentContentForeground": "Цвет переднего плана линейки текущего окна во внутренних конфликтах слияния.",
-	"overviewRulerIncomingContentForeground": "Цвет переднего плана линейки входящего окна во внутренних конфликтах слияния.",
-	"overviewRulerCommonContentForeground": "Цвет переднего плана для обзорной линейки для общего предка во внутренних конфликтах слияния. ",
-	"overviewRulerFindMatchForeground": "Цвет метки линейки в окне просмотра для результатов поиска. Цвет не должен был прозрачным, чтобы не перекрывать основные знаки отличия.",
-	"overviewRulerSelectionHighlightForeground": "Цвет метки линейки в окне просмотра для выделения. Цвет не должен был прозрачным, чтобы не перекрывать основные знаки отличия."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/platform/update/node/update.config.contribution.i18n.json b/i18n/rus/src/vs/platform/update/node/update.config.contribution.i18n.json
deleted file mode 100644
index f09e901c30a..00000000000
--- a/i18n/rus/src/vs/platform/update/node/update.config.contribution.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"updateConfigurationTitle": "Обновить",
-	"updateChannel": "Настройте канал обновления, по которому вы будете получать обновления. После изменения значения необходим перезапуск.",
-	"enableWindowsBackgroundUpdates": "Включает обновления Windows в фоновом режиме."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/platform/url/electron-browser/inactiveExtensionUrlHandler.i18n.json b/i18n/rus/src/vs/platform/url/electron-browser/inactiveExtensionUrlHandler.i18n.json
deleted file mode 100644
index 60446b0bda7..00000000000
--- a/i18n/rus/src/vs/platform/url/electron-browser/inactiveExtensionUrlHandler.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"confirmUrl": "Разрешить расширению открыть этот URL-адрес?"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/platform/windows/electron-main/windowsService.i18n.json b/i18n/rus/src/vs/platform/windows/electron-main/windowsService.i18n.json
deleted file mode 100644
index 37a5669b00c..00000000000
--- a/i18n/rus/src/vs/platform/windows/electron-main/windowsService.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"aboutDetail": "Версия {0}\nФиксация {1}\nДата {2}\nОболочка {3}\nОтрисовщик {4}\nУзел {5}\nАрхитектура {6}",
-	"okButton": "ОК",
-	"copy": "Копировать"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/platform/workspaces/common/workspaces.i18n.json b/i18n/rus/src/vs/platform/workspaces/common/workspaces.i18n.json
deleted file mode 100644
index 4eb95a0c543..00000000000
--- a/i18n/rus/src/vs/platform/workspaces/common/workspaces.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"codeWorkspace": "Рабочая область кода",
-	"untitledWorkspace": "(Рабочая область) без названия",
-	"workspaceNameVerbose": "{0} (рабочая область)",
-	"workspaceName": "{0} (рабочая область)"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/api/browser/localizationsExtensionPoint.i18n.json b/i18n/rus/src/vs/workbench/api/browser/localizationsExtensionPoint.i18n.json
deleted file mode 100644
index f29fb16c1dc..00000000000
--- a/i18n/rus/src/vs/workbench/api/browser/localizationsExtensionPoint.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"requirestring": "свойство \"{0}\" является обязательным и должно иметь тип string",
-	"optstring": "свойство \"{0}\" может быть опущено или должно иметь тип string"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/api/browser/viewsContainersExtensionPoint.i18n.json b/i18n/rus/src/vs/workbench/api/browser/viewsContainersExtensionPoint.i18n.json
deleted file mode 100644
index 38da1fad976..00000000000
--- a/i18n/rus/src/vs/workbench/api/browser/viewsContainersExtensionPoint.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.contributes.views.containers.id": "Уникальный идентификатор, используемый для идентификации контейнера, в котором могут быть размещены представления с помощью точки вклада 'views'",
-	"vscode.extension.contributes.views.containers.title": "Строка в понятном формате, используемая для отображения контейнера",
-	"vscode.extension.contributes.views.containers.icon": "Путь к значку контейнера. Значки имеют размер 24x24, расположены в центре прямоугольника размером 50x40 и имеют цвет заливки rgb (215, 218, 224) или #d7dae0. Для значков рекомендуется использовать формат SVG, хотя допускается любой тип изображения.",
-	"vscode.extension.contributes.viewsContainers": "Добавляет контейнеры представлений в редактор",
-	"views.container.activitybar": "Добавляет контейнеры представлений на панель действий",
-	"test": "Проверить",
-	"requirearray": "Контейнер представлений должен быть массивом",
-	"requireidstring": "Свойство '{0}' является обязательным и должно иметь тип 'string'. Оно может содержать только буквенно-цифровые символы и символы '_' и '-'.",
-	"requirestring": "свойство \"{0}\" является обязательным и должно иметь тип string",
-	"showViewlet": "Показать {0}",
-	"view": "Просмотр"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json b/i18n/rus/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json
deleted file mode 100644
index 5beb5d197c9..00000000000
--- a/i18n/rus/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"requirearray": "представления должны быть массивом",
-	"requirestring": "свойство \"{0}\" является обязательным и должно иметь тип string",
-	"optstring": "свойство \"{0}\" может быть опущено или должно иметь тип string",
-	"vscode.extension.contributes.view.id": "Идентификатор представления. Используйте его для регистрации поставщика данных с помощью API-интерфейса \"vscode.window.registerTreeDataProviderForView\", а также для активации расширения с помощью регистрации события \"onView:${id}\" в \"activationEvents\".",
-	"vscode.extension.contributes.view.name": "Понятное имя представления. Будет отображаться на экране",
-	"vscode.extension.contributes.view.when": "Условие, которое должно иметь значение 'true', чтобы отображалось это представление",
-	"vscode.extension.contributes.views": "Добавляет представления в редактор",
-	"views.explorer": "Добавляет представления в контейнер обозревателя на панели действий",
-	"views.debug": "Добавляет представления в контейнер отладки на панели действий",
-	"views.scm": "Добавляет представления в контейнер диспетчера служб на панели действий ",
-	"views.test": "Добавляет представления в контейнер проверки на панели действий ",
-	"views.contributed": "Добавляет представления в контейнер добавленных представлений",
-	"ViewContainerDoesnotExist": "Контейнер представлений '{0}' не существует, и все представления, зарегистрированные в этом контейнере, будут добавлены в обозреватель.",
-	"duplicateView1": "Не удается зарегистрировать несколько представлений с одинаковым идентификатором '{0}' в расположении '{1}'",
-	"duplicateView2": "Представление с идентификатором '{0}' уже зарегистрировано в расположении '{1}'"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/api/electron-browser/mainThreadExtensionService.i18n.json b/i18n/rus/src/vs/workbench/api/electron-browser/mainThreadExtensionService.i18n.json
deleted file mode 100644
index b44407fa3f2..00000000000
--- a/i18n/rus/src/vs/workbench/api/electron-browser/mainThreadExtensionService.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"overwritingExtension": "Идет перезапись расширения {0} на {1}.",
-	"extensionUnderDevelopment": "Идет загрузка расширения разработки в {0}."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/api/electron-browser/mainThreadMessageService.i18n.json b/i18n/rus/src/vs/workbench/api/electron-browser/mainThreadMessageService.i18n.json
deleted file mode 100644
index 280ed50cb8c..00000000000
--- a/i18n/rus/src/vs/workbench/api/electron-browser/mainThreadMessageService.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"extensionSource": "{0} (расширение)",
-	"defaultSource": "Расширение",
-	"manageExtension": "Управление расширениями",
-	"cancel": "Отмена",
-	"ok": "ОК"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json b/i18n/rus/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
deleted file mode 100644
index b7b1c72487e..00000000000
--- a/i18n/rus/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"timeout.formatOnSave": "Форматирование при сохранении прервано через {0} мс",
-	"codeActionsOnSave.didTimeout": "Метод codeActionsOnSave прерван через {0} мс",
-	"timeout.onWillSave": "Событие onWillSaveTextDocument-event прервано по истечении 1750 мс",
-	"saveParticipants": "Сохранение участников..."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json b/i18n/rus/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json
deleted file mode 100644
index ee8688cdc85..00000000000
--- a/i18n/rus/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"task.label": "{0}: {1}"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/api/electron-browser/mainThreadWebview.i18n.json b/i18n/rus/src/vs/workbench/api/electron-browser/mainThreadWebview.i18n.json
deleted file mode 100644
index a45e83f2603..00000000000
--- a/i18n/rus/src/vs/workbench/api/electron-browser/mainThreadWebview.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"errorMessage": "Ошибка при восстановлении представления: {0}"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/api/electron-browser/mainThreadWorkspace.i18n.json b/i18n/rus/src/vs/workbench/api/electron-browser/mainThreadWorkspace.i18n.json
deleted file mode 100644
index b98c8daeb90..00000000000
--- a/i18n/rus/src/vs/workbench/api/electron-browser/mainThreadWorkspace.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"folderStatusMessageAddSingleFolder": "Расширение \"{0}\" добавило одну папку в рабочую область",
-	"folderStatusMessageAddMultipleFolders": "Расширение \"{0}\" добавило папки ({1}) в рабочую область",
-	"folderStatusMessageRemoveSingleFolder": "Расширение \"{0}\" удалило одну папку из рабочей области",
-	"folderStatusMessageRemoveMultipleFolders": "Расширение \"{0}\" удалило папки ({1}) из рабочей области",
-	"folderStatusChangeFolder": "Расширение \"{0}\" изменило папки рабочей области "
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/api/node/extHostDiagnostics.i18n.json b/i18n/rus/src/vs/workbench/api/node/extHostDiagnostics.i18n.json
deleted file mode 100644
index 447e00cdca5..00000000000
--- a/i18n/rus/src/vs/workbench/api/node/extHostDiagnostics.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"limitHit": "Не отображается еще несколько ошибок и предупреждений ({0})."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/api/node/extHostExplorerView.i18n.json b/i18n/rus/src/vs/workbench/api/node/extHostExplorerView.i18n.json
deleted file mode 100644
index 69ab93e32fa..00000000000
--- a/i18n/rus/src/vs/workbench/api/node/extHostExplorerView.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"treeExplorer.notRegistered": "TreeExplorerNodeProvider с идентификатором \"{0}\" не зарегистрирован.",
-	"treeExplorer.failedToProvideRootNode": "TreeExplorerNodeProvider \"{0}\" не удалось предоставить корневой узел."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/api/node/extHostExtensionActivator.i18n.json b/i18n/rus/src/vs/workbench/api/node/extHostExtensionActivator.i18n.json
deleted file mode 100644
index bb59edd906f..00000000000
--- a/i18n/rus/src/vs/workbench/api/node/extHostExtensionActivator.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"unknownDep": "Не удалось активировать расширение \"{1}\". Причина: неизвестная зависимость \"{0}\".",
-	"failedDep1": "Не удалось активировать расширение \"{1}\". Причина: не удалось активировать зависимость \"{0}\".",
-	"failedDep2": "Не удалось активировать расширение \"{0}\". Причина: более 10 уровней зависимостей (вероятна циклическая зависимость).",
-	"activationError": "Не удалось активировать расширение '{0}': {1}."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/api/node/extHostProgress.i18n.json b/i18n/rus/src/vs/workbench/api/node/extHostProgress.i18n.json
deleted file mode 100644
index 06bdf111ede..00000000000
--- a/i18n/rus/src/vs/workbench/api/node/extHostProgress.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"extensionSource": "{0} (расширение)"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/api/node/extHostTask.i18n.json b/i18n/rus/src/vs/workbench/api/node/extHostTask.i18n.json
deleted file mode 100644
index ee8688cdc85..00000000000
--- a/i18n/rus/src/vs/workbench/api/node/extHostTask.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"task.label": "{0}: {1}"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/api/node/extHostTreeExplorers.i18n.json b/i18n/rus/src/vs/workbench/api/node/extHostTreeExplorers.i18n.json
deleted file mode 100644
index dfbb0c5cc14..00000000000
--- a/i18n/rus/src/vs/workbench/api/node/extHostTreeExplorers.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"treeExplorer.notRegistered": "TreeExplorerNodeProvider с идентификатором \"{0}\" не зарегистрирован.",
-	"treeExplorer.failedToProvideRootNode": "TreeExplorerNodeProvider \"{0}\" не удалось предоставить корневой узел.",
-	"treeExplorer.failedToResolveChildren": "TreeExplorerNodeProvider \"{0}\" не удалось выполнить операцию resolveChildren."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/api/node/extHostTreeView.i18n.json b/i18n/rus/src/vs/workbench/api/node/extHostTreeView.i18n.json
deleted file mode 100644
index 69ab93e32fa..00000000000
--- a/i18n/rus/src/vs/workbench/api/node/extHostTreeView.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"treeExplorer.notRegistered": "TreeExplorerNodeProvider с идентификатором \"{0}\" не зарегистрирован.",
-	"treeExplorer.failedToProvideRootNode": "TreeExplorerNodeProvider \"{0}\" не удалось предоставить корневой узел."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/api/node/extHostTreeViews.i18n.json b/i18n/rus/src/vs/workbench/api/node/extHostTreeViews.i18n.json
deleted file mode 100644
index efe7bffddd0..00000000000
--- a/i18n/rus/src/vs/workbench/api/node/extHostTreeViews.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"treeView.notRegistered": "Отсутствует зарегистрированное представление в виде дерева с идентификатором '{0}'.",
-	"treeView.duplicateElement": "Элемент с идентификационным номером {0} уже зарегестрирован"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/api/node/extHostWorkspace.i18n.json b/i18n/rus/src/vs/workbench/api/node/extHostWorkspace.i18n.json
deleted file mode 100644
index aed5a76d9f1..00000000000
--- a/i18n/rus/src/vs/workbench/api/node/extHostWorkspace.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"updateerror": "Расширению \"{0}\" не удалось обновить папки рабочей области: {1}"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/api/node/mainThreadExtensionService.i18n.json b/i18n/rus/src/vs/workbench/api/node/mainThreadExtensionService.i18n.json
deleted file mode 100644
index b44407fa3f2..00000000000
--- a/i18n/rus/src/vs/workbench/api/node/mainThreadExtensionService.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"overwritingExtension": "Идет перезапись расширения {0} на {1}.",
-	"extensionUnderDevelopment": "Идет загрузка расширения разработки в {0}."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/api/node/mainThreadMessageService.i18n.json b/i18n/rus/src/vs/workbench/api/node/mainThreadMessageService.i18n.json
deleted file mode 100644
index f2dc9ba9a20..00000000000
--- a/i18n/rus/src/vs/workbench/api/node/mainThreadMessageService.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"close": "Закрыть",
-	"cancel": "Отмена",
-	"ok": "ОК"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/browser/actions/configureLocale.i18n.json b/i18n/rus/src/vs/workbench/browser/actions/configureLocale.i18n.json
deleted file mode 100644
index b6db31f0ebd..00000000000
--- a/i18n/rus/src/vs/workbench/browser/actions/configureLocale.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"configureLocale": "Настроить язык",
-	"displayLanguage": "Определяет язык интерфейса VSCode.",
-	"doc": "Список поддерживаемых языков см. в {0}.",
-	"restart": "Для изменения значения требуется перезапуск VSCode.",
-	"fail.createSettings": "Невозможно создать \"{0}\" ({1}).",
-	"JsonSchema.locale": "Язык пользовательского интерфейса."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/browser/actions/fileActions.i18n.json b/i18n/rus/src/vs/workbench/browser/actions/fileActions.i18n.json
deleted file mode 100644
index 6e8dd1b1869..00000000000
--- a/i18n/rus/src/vs/workbench/browser/actions/fileActions.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"openFolder": "Открыть папку...",
-	"openFileFolder": "Открыть..."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/browser/actions/toggleActivityBarVisibility.i18n.json b/i18n/rus/src/vs/workbench/browser/actions/toggleActivityBarVisibility.i18n.json
deleted file mode 100644
index a0fa0ef3296..00000000000
--- a/i18n/rus/src/vs/workbench/browser/actions/toggleActivityBarVisibility.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleActivityBar": "Показать или скрыть панель действий",
-	"view": "Просмотреть"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/browser/actions/toggleCenteredLayout.i18n.json b/i18n/rus/src/vs/workbench/browser/actions/toggleCenteredLayout.i18n.json
deleted file mode 100644
index f16af4babd6..00000000000
--- a/i18n/rus/src/vs/workbench/browser/actions/toggleCenteredLayout.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleCenteredLayout": "Включить/отключить расположение по центру",
-	"view": "Просмотр"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/browser/actions/toggleEditorLayout.i18n.json b/i18n/rus/src/vs/workbench/browser/actions/toggleEditorLayout.i18n.json
deleted file mode 100644
index 0542e33ac79..00000000000
--- a/i18n/rus/src/vs/workbench/browser/actions/toggleEditorLayout.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleEditorGroupLayout": "Переключить вертикальную или горизонтальную структуру группы редакторов",
-	"horizontalLayout": "Горизонтальная структура группы редакторов",
-	"verticalLayout": "Вертикальная структура группы редакторов",
-	"view": "Просмотреть"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/browser/actions/toggleSidebarPosition.i18n.json b/i18n/rus/src/vs/workbench/browser/actions/toggleSidebarPosition.i18n.json
deleted file mode 100644
index 3aa543538b7..00000000000
--- a/i18n/rus/src/vs/workbench/browser/actions/toggleSidebarPosition.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleSidebarPosition": "Изменить положение боковой панели",
-	"view": "Просмотреть"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/browser/actions/toggleSidebarVisibility.i18n.json b/i18n/rus/src/vs/workbench/browser/actions/toggleSidebarVisibility.i18n.json
deleted file mode 100644
index cf938e23ae7..00000000000
--- a/i18n/rus/src/vs/workbench/browser/actions/toggleSidebarVisibility.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleSidebar": "Изменить видимость боковой панели",
-	"view": "Просмотреть"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/browser/actions/toggleStatusbarVisibility.i18n.json b/i18n/rus/src/vs/workbench/browser/actions/toggleStatusbarVisibility.i18n.json
deleted file mode 100644
index 51fc784c3fa..00000000000
--- a/i18n/rus/src/vs/workbench/browser/actions/toggleStatusbarVisibility.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleStatusbar": "Переключить видимость строки состояния",
-	"view": "Просмотреть"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/browser/actions/toggleTabsVisibility.i18n.json b/i18n/rus/src/vs/workbench/browser/actions/toggleTabsVisibility.i18n.json
deleted file mode 100644
index b0719d0207e..00000000000
--- a/i18n/rus/src/vs/workbench/browser/actions/toggleTabsVisibility.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleTabs": "Изменить видимость вкладки",
-	"view": "Просмотр"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/browser/actions/toggleZenMode.i18n.json b/i18n/rus/src/vs/workbench/browser/actions/toggleZenMode.i18n.json
deleted file mode 100644
index f6f23b5341c..00000000000
--- a/i18n/rus/src/vs/workbench/browser/actions/toggleZenMode.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleZenMode": "Включить/отключить режим \"Дзен\"",
-	"view": "Просмотреть"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/browser/actions/workspaceActions.i18n.json b/i18n/rus/src/vs/workbench/browser/actions/workspaceActions.i18n.json
deleted file mode 100644
index c446918f739..00000000000
--- a/i18n/rus/src/vs/workbench/browser/actions/workspaceActions.i18n.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openFile": "Открыть файл...",
-	"openFolder": "Открыть папку...",
-	"openFileFolder": "Открыть...",
-	"globalRemoveFolderFromWorkspace": "Удалить папку из рабочей области...",
-	"saveWorkspaceAsAction": "Сохранить рабочую область как...",
-	"save": "Сохранить",
-	"saveWorkspace": "Сохранить рабочую область",
-	"openWorkspaceAction": "Открыть рабочую область...",
-	"openWorkspaceConfigFile": "Открыть файл конфигурации рабочей области",
-	"duplicateWorkspaceInNewWindow": "Создать копию рабочей области в новом окне"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/browser/actions/workspaceCommands.i18n.json b/i18n/rus/src/vs/workbench/browser/actions/workspaceCommands.i18n.json
deleted file mode 100644
index 29ba2b2f4f0..00000000000
--- a/i18n/rus/src/vs/workbench/browser/actions/workspaceCommands.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"addFolderToWorkspace": "Добавить папку в рабочую область...",
-	"add": "&&Добавить",
-	"addFolderToWorkspaceTitle": "Добавить папку в рабочую область",
-	"workspaceFolderPickerPlaceholder": "Выберите папку рабочей области"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/browser/parts/activitybar/activitybarActions.i18n.json b/i18n/rus/src/vs/workbench/browser/parts/activitybar/activitybarActions.i18n.json
deleted file mode 100644
index 8339670f4f7..00000000000
--- a/i18n/rus/src/vs/workbench/browser/parts/activitybar/activitybarActions.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"badgeTitle": "{0} - {1}",
-	"titleKeybinding": "{0} ({1})",
-	"removeFromActivityBar": "Скрыть с панели действий",
-	"keepInActivityBar": "Хранить в панели действий",
-	"additionalViews": "Дополнительные представления",
-	"numberBadge": "{0} ({1})",
-	"manageExtension": "Управление расширениями",
-	"toggle": "Переключить закрепленное представление"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/browser/parts/activitybar/activitybarPart.i18n.json b/i18n/rus/src/vs/workbench/browser/parts/activitybar/activitybarPart.i18n.json
deleted file mode 100644
index 10b380c7b29..00000000000
--- a/i18n/rus/src/vs/workbench/browser/parts/activitybar/activitybarPart.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hideActivitBar": "Скрыть панель действий",
-	"globalActions": "Глобальные действия"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/browser/parts/compositePart.i18n.json b/i18n/rus/src/vs/workbench/browser/parts/compositePart.i18n.json
deleted file mode 100644
index f309b4d64a0..00000000000
--- a/i18n/rus/src/vs/workbench/browser/parts/compositePart.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"ariaCompositeToolbarLabel": "Действий: {0}",
-	"titleTooltip": "{0} ({1})"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/browser/parts/compositebar/compositeBar.i18n.json b/i18n/rus/src/vs/workbench/browser/parts/compositebar/compositeBar.i18n.json
deleted file mode 100644
index cf1351a88fb..00000000000
--- a/i18n/rus/src/vs/workbench/browser/parts/compositebar/compositeBar.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"activityBarAriaLabel": "Переключатель активного представления"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/browser/parts/compositebar/compositeBarActions.i18n.json b/i18n/rus/src/vs/workbench/browser/parts/compositebar/compositeBarActions.i18n.json
deleted file mode 100644
index 0eca2304bb5..00000000000
--- a/i18n/rus/src/vs/workbench/browser/parts/compositebar/compositeBarActions.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"largeNumberBadge": "10000 и выше",
-	"badgeTitle": "{0} - {1}",
-	"additionalViews": "Дополнительные представления",
-	"numberBadge": "{0} ({1})",
-	"manageExtension": "Управление расширениями",
-	"titleKeybinding": "{0} ({1})",
-	"hide": "Скрыть",
-	"keep": "Оставить открытым",
-	"toggle": "Переключить закрепленное представление"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/browser/parts/editor/binaryDiffEditor.i18n.json b/i18n/rus/src/vs/workbench/browser/parts/editor/binaryDiffEditor.i18n.json
deleted file mode 100644
index ea1317f6659..00000000000
--- a/i18n/rus/src/vs/workbench/browser/parts/editor/binaryDiffEditor.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"metadataDiff": "{0} ↔ {1}"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/browser/parts/editor/binaryEditor.i18n.json b/i18n/rus/src/vs/workbench/browser/parts/editor/binaryEditor.i18n.json
deleted file mode 100644
index 335fdf0ac04..00000000000
--- a/i18n/rus/src/vs/workbench/browser/parts/editor/binaryEditor.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"binaryEditor": "Средство просмотра двоичных объектов"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json b/i18n/rus/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json
deleted file mode 100644
index 0dbd953e79a..00000000000
--- a/i18n/rus/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"textEditor": "Текстовый редактор",
-	"textDiffEditor": "Редактор текстовых несовпадений",
-	"binaryDiffEditor": "Редактор двоичных несовпадений",
-	"sideBySideEditor": "Параллельный редактор",
-	"groupOnePicker": "Показать редакторы в первой группе",
-	"groupTwoPicker": "Показать редакторы во второй группе",
-	"groupThreePicker": "Показать редакторы в третьей группе",
-	"allEditorsPicker": "Показать все открытые редакторы",
-	"view": "Просмотр",
-	"file": "Файл",
-	"close": "Закрыть",
-	"closeOthers": "Закрыть другие",
-	"closeRight": "Закрыть справа",
-	"closeAllSaved": "Закрыть сохраненные",
-	"closeAll": "Закрыть все",
-	"keepOpen": "Оставить открытым",
-	"toggleInlineView": "Переключить интерактивное представление",
-	"showOpenedEditors": "Показать открытые редакторы",
-	"keepEditor": "Сохранить редактор",
-	"closeEditorsInGroup": "Закрыть все редакторы в группе",
-	"closeSavedEditors": "Закрыть сохраненные редакторы в группе",
-	"closeOtherEditors": "Закрыть другие редакторы",
-	"closeRightEditors": "Закрыть редакторы справа"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/browser/parts/editor/editorActions.i18n.json b/i18n/rus/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
deleted file mode 100644
index 99aca234c7b..00000000000
--- a/i18n/rus/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
+++ /dev/null
@@ -1,58 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"splitEditor": "Разделить редактор",
-	"joinTwoGroups": "Объединить редакторы из двух групп",
-	"navigateEditorGroups": "Переход между группами редакторов",
-	"focusActiveEditorGroup": "Сфокусироваться на активной группе редактора",
-	"focusFirstEditorGroup": "Фокус на первую группу редакторов",
-	"focusSecondEditorGroup": "Фокус на вторую группу редакторов",
-	"focusThirdEditorGroup": "Фокус на третью группу редакторов",
-	"focusPreviousGroup": "Фокус на предыдущую группу",
-	"focusNextGroup": "Фокус на следующую группу",
-	"openToSide": "Открыть сбоку",
-	"closeEditor": "Закрыть редактор",
-	"closeOneEditor": "Закрыть",
-	"revertAndCloseActiveEditor": "Отменить изменения и закрыть редактор",
-	"closeEditorsToTheLeft": "Закрыть редакторы слева",
-	"closeAllEditors": "Закрыть все редакторы",
-	"closeEditorsInOtherGroups": "Закрыть редакторы в других группах",
-	"moveActiveGroupLeft": "Переместить группу редакторов влево",
-	"moveActiveGroupRight": "Переместить группу редакторов вправо",
-	"minimizeOtherEditorGroups": "Свернуть другие группы редакторов",
-	"evenEditorGroups": "Уравнять ширину групп редакторов",
-	"maximizeEditor": "Развернуть группу редакторов и скрыть боковую панель",
-	"openNextEditor": "Открыть следующий редактор",
-	"openPreviousEditor": "Открыть предыдущий редактор",
-	"nextEditorInGroup": "Открыть следующий редактор в группе",
-	"openPreviousEditorInGroup": "Открыть предыдущий редактор в группе",
-	"lastEditorInGroup": "Открыть последний редактор в группе",
-	"navigateNext": "Далее",
-	"navigatePrevious": "Назад",
-	"navigateLast": "Перейти к последнему",
-	"reopenClosedEditor": "Открыть закрытый редактор",
-	"clearRecentFiles": "Очистить недавно открытые",
-	"showEditorsInFirstGroup": "Показать редакторы в первой группе",
-	"showEditorsInSecondGroup": "Показать редакторы во второй группе",
-	"showEditorsInThirdGroup": "Показать редакторы в третьей группе",
-	"showAllEditors": "Показать все редакторы",
-	"openPreviousRecentlyUsedEditorInGroup": "Открыть предыдущий недавно использованный редактор в группе",
-	"openNextRecentlyUsedEditorInGroup": "Открыть следующий недавно использованный редактор в группе",
-	"navigateEditorHistoryByInput": "Открыть предыдущий редактор из журнала",
-	"openNextRecentlyUsedEditor": "Открыть следующий недавно использованный редактор",
-	"openPreviousRecentlyUsedEditor": "Открыть предыдущий недавно использованный редактор",
-	"clearEditorHistory": "Очистить журнал редактора",
-	"focusLastEditorInStack": "Открыть последний редактор в группе",
-	"moveEditorLeft": "Переместить редактор влево",
-	"moveEditorRight": "Переместить редактор вправо",
-	"moveEditorToPreviousGroup": "Переместить редактор в предыдущую группу",
-	"moveEditorToNextGroup": "Переместить редактор в следующую группу",
-	"moveEditorToFirstGroup": "Переместить редактор в первую группу",
-	"moveEditorToSecondGroup": "Переместить редактор во вторую группу",
-	"moveEditorToThirdGroup": "Переместить редактор в третью группу"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json b/i18n/rus/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json
deleted file mode 100644
index dc07ab24638..00000000000
--- a/i18n/rus/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"editorCommand.activeEditorMove.description": "Перемещение активного редактора по вкладкам или группам",
-	"editorCommand.activeEditorMove.arg.name": "Аргумент перемещения активного редактора",
-	"editorCommand.activeEditorMove.arg.description": "Свойства аргумента:\n\t* 'to': строковое значение, указывающее направление перемещения.\n\t* 'by': строковое значение, указывающее единицу перемещения (вкладка или группа).\n\t* 'value': числовое значение, указывающее количество позиций перемещения или абсолютную позицию для перемещения."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/browser/parts/editor/editorPart.i18n.json b/i18n/rus/src/vs/workbench/browser/parts/editor/editorPart.i18n.json
deleted file mode 100644
index 20fb28ccad8..00000000000
--- a/i18n/rus/src/vs/workbench/browser/parts/editor/editorPart.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"groupOneVertical": "Слева",
-	"groupTwoVertical": "По центру",
-	"groupThreeVertical": "Справа",
-	"groupOneHorizontal": "По верхнему краю",
-	"groupTwoHorizontal": "По центру",
-	"groupThreeHorizontal": "По нижнему краю",
-	"editorOpenError": "Невозможно открыть \"{0}\": {1}."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/browser/parts/editor/editorPicker.i18n.json b/i18n/rus/src/vs/workbench/browser/parts/editor/editorPicker.i18n.json
deleted file mode 100644
index 789ca19ef00..00000000000
--- a/i18n/rus/src/vs/workbench/browser/parts/editor/editorPicker.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"entryAriaLabel": "{0}, выбор группы редакторов",
-	"groupLabel": "Группа: {0}",
-	"noResultsFoundInGroup": "Соответствующие открытые редакторы не найдены в группе",
-	"noOpenedEditors": "Список открытых редакторов в группе сейчас пуст.",
-	"noResultsFound": "Соответствующие открытые редакторы не найдены",
-	"noOpenedEditorsAllGroups": "Список открытых редакторов сейчас пуст."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json b/i18n/rus/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json
deleted file mode 100644
index 27ce51b004b..00000000000
--- a/i18n/rus/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"singleSelectionRange": "Строка {0}, столбец {1} (выбрано {2})",
-	"singleSelection": "Строка {0}, столбец {1}",
-	"multiSelectionRange": "Выделений: {0} (выделено символов: {1})",
-	"multiSelection": "Выделений: {0}",
-	"endOfLineLineFeed": "LF",
-	"endOfLineCarriageReturnLineFeed": "CRLF",
-	"tabFocusModeEnabled": "Клавиша TAB перемещает фокус",
-	"screenReaderDetected": "Средство чтения с экрана оптимизировано",
-	"screenReaderDetectedExtra": "Если вы не используете средство чтения с экрана, измените значение параметра \"editor.accessibilitySupport\" на \"off\".",
-	"disableTabMode": "Отключить режим специальных возможностей",
-	"gotoLine": "Перейти к строке",
-	"selectIndentation": "Выберите отступ",
-	"selectEncoding": "Выберите кодировку",
-	"selectEOL": "Выберите последовательность конца строки",
-	"selectLanguageMode": "Выберите языковой режим",
-	"fileInfo": "Сведения о файле",
-	"spacesSize": "Пробелов: {0}",
-	"tabSize": "Размер интервала табуляции: {0}",
-	"showLanguageExtensions": "Поиск \"{0}\" среди расширений Marketplace...",
-	"changeMode": "Изменить языковой режим",
-	"noEditor": "В данный момент нет активного текстового редактора",
-	"languageDescription": "({0}) — настроенный язык",
-	"languageDescriptionConfigured": "({0})",
-	"languagesPicks": "языки (идентификатор)",
-	"configureModeSettings": "Настройка параметров, определяемых языком \"{0}\"...",
-	"configureAssociationsExt": "Настройка сопоставлений файлов для \"{0}\"...",
-	"autoDetect": "Автоматическое обнаружение",
-	"pickLanguage": "Выберите языковой режим",
-	"currentAssociation": "Текущая связь",
-	"pickLanguageToConfigure": "Выберите языковой режим для связи с \"{0}\".",
-	"changeIndentation": "Изменить отступ",
-	"noWritableCodeEditor": "Активный редактор кода доступен только для чтения.",
-	"indentView": "изменить представление",
-	"indentConvert": "преобразовать файл",
-	"pickAction": "Выберите действие",
-	"changeEndOfLine": "Изменить последовательность конца строки",
-	"pickEndOfLine": "Выберите последовательность конца строки",
-	"changeEncoding": "Изменить кодировку файла",
-	"noFileEditor": "В данный момент нет активного файла",
-	"saveWithEncoding": "Сохранить в кодировке",
-	"reopenWithEncoding": "Повторно открыть в кодировке",
-	"guessedEncoding": "Предположение на основе содержимого",
-	"pickEncodingForReopen": "Выберите кодировку файла для его повторного открытия",
-	"pickEncodingForSave": "Выберите кодировку файла для его сохранения",
-	"screenReaderDetectedExplanation.title": "Средство чтения с экрана оптимизировано",
-	"screenReaderDetectedExplanation.question": "Вы используете средство чтения с экрана в VS Code?",
-	"screenReaderDetectedExplanation.answerYes": "Да",
-	"screenReaderDetectedExplanation.answerNo": "Нет",
-	"screenReaderDetectedExplanation.body1": "Теперь среда VS Code оптимизирована для средства чтения с экрана.",
-	"screenReaderDetectedExplanation.body2": "Некоторые функции редактора (например, перенос слов, сворачивание и т.д.) будут работать по-другому."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/browser/parts/editor/resourceViewer.i18n.json b/i18n/rus/src/vs/workbench/browser/parts/editor/resourceViewer.i18n.json
deleted file mode 100644
index c1693a871d9..00000000000
--- a/i18n/rus/src/vs/workbench/browser/parts/editor/resourceViewer.i18n.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"sizeB": "{0} Б",
-	"sizeKB": "{0} КБ",
-	"sizeMB": "{0} МБ",
-	"sizeGB": "{0} ГБ",
-	"sizeTB": "{0} ТБ",
-	"largeImageError": "Изображение не отображается в редакторе, так как имеет слишком большой размер ({0}).",
-	"resourceOpenExternalButton": "Открыть изображение с помощью внешней программы?",
-	"nativeFileTooLargeError": "Файл не отображается в редакторе, так как имеет слишком большой размер ({0}).",
-	"nativeBinaryError": "Файл не отображается в редакторе, так как является двоичным или использует неподдерживаемую кодировку текста.",
-	"openAsText": "Открыть его в любом случае?",
-	"zoom.action.fit.label": "Все изображение",
-	"imgMeta": "{0}x{1} {2}"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/browser/parts/editor/tabsTitleControl.i18n.json b/i18n/rus/src/vs/workbench/browser/parts/editor/tabsTitleControl.i18n.json
deleted file mode 100644
index 3992c00e2c6..00000000000
--- a/i18n/rus/src/vs/workbench/browser/parts/editor/tabsTitleControl.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"araLabelTabActions": "Действия вкладки"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json b/i18n/rus/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json
deleted file mode 100644
index ce74baadb43..00000000000
--- a/i18n/rus/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"textDiffEditor": "Редактор текстовых несовпадений",
-	"readonlyEditorWithInputAriaLabel": "{0}. Редактор сравнения текста только для чтения.",
-	"readonlyEditorAriaLabel": "Редактор сравнения текста только для чтения.",
-	"editableEditorWithInputAriaLabel": "{0}. Редактор сравнения текстовых файлов.",
-	"editableEditorAriaLabel": "Редактор сравнения текстовых файлов.",
-	"navigate.next.label": "Следующее исправление",
-	"navigate.prev.label": "Предыдущее исправление",
-	"toggleIgnoreTrimWhitespace.label": "Игнорировать удаление пробелов"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/browser/parts/editor/textEditor.i18n.json b/i18n/rus/src/vs/workbench/browser/parts/editor/textEditor.i18n.json
deleted file mode 100644
index ee2db4397bf..00000000000
--- a/i18n/rus/src/vs/workbench/browser/parts/editor/textEditor.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"editorLabelWithGroup": "{0}, группа {1}."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/browser/parts/editor/textResourceEditor.i18n.json b/i18n/rus/src/vs/workbench/browser/parts/editor/textResourceEditor.i18n.json
deleted file mode 100644
index 1dd07dcb557..00000000000
--- a/i18n/rus/src/vs/workbench/browser/parts/editor/textResourceEditor.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"textEditor": "Текстовый редактор",
-	"readonlyEditorWithInputAriaLabel": "{0}. Текстовый редактор только для чтения.",
-	"readonlyEditorAriaLabel": "Текстовый редактор только для чтения.",
-	"untitledFileEditorWithInputAriaLabel": "{0}. Текстовый редактор файлов без названия.",
-	"untitledFileEditorAriaLabel": "Текстовый редактор файлов без названия."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/browser/parts/editor/titleControl.i18n.json b/i18n/rus/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
deleted file mode 100644
index 9d49f9d5c3c..00000000000
--- a/i18n/rus/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"araLabelEditorActions": "Действия редактора"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/browser/parts/notifications/notificationsActions.i18n.json b/i18n/rus/src/vs/workbench/browser/parts/notifications/notificationsActions.i18n.json
deleted file mode 100644
index 12259aa7123..00000000000
--- a/i18n/rus/src/vs/workbench/browser/parts/notifications/notificationsActions.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"clearNotification": "Очистить уведомления",
-	"clearNotifications": "Очистить все уведомления",
-	"hideNotificationsCenter": "Скрыть уведомления",
-	"expandNotification": "Развернуть уведомление",
-	"collapseNotification": "Свернуть уведомление",
-	"configureNotification": "Настроить уведомление",
-	"copyNotification": "Копировать текст"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/browser/parts/notifications/notificationsAlerts.i18n.json b/i18n/rus/src/vs/workbench/browser/parts/notifications/notificationsAlerts.i18n.json
deleted file mode 100644
index d1f3b418774..00000000000
--- a/i18n/rus/src/vs/workbench/browser/parts/notifications/notificationsAlerts.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"alertErrorMessage": "Ошибка: {0}",
-	"alertWarningMessage": "Предупреждение: {0}",
-	"alertInfoMessage": "Сведения: {0}"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json b/i18n/rus/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json
deleted file mode 100644
index d6c896929e7..00000000000
--- a/i18n/rus/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"notificationsEmpty": "Новые уведомления отсутствуют",
-	"notifications": "Уведомления",
-	"notificationsToolbar": "Действия центра уведомлений",
-	"notificationsList": "Список уведомлений"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/browser/parts/notifications/notificationsCommands.i18n.json b/i18n/rus/src/vs/workbench/browser/parts/notifications/notificationsCommands.i18n.json
deleted file mode 100644
index 7ec63b9c7fe..00000000000
--- a/i18n/rus/src/vs/workbench/browser/parts/notifications/notificationsCommands.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"notifications": "Уведомления",
-	"showNotifications": "Показать уведомления",
-	"hideNotifications": "Скрыть уведомления",
-	"clearAllNotifications": "Очистить все уведомления"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/browser/parts/notifications/notificationsStatus.i18n.json b/i18n/rus/src/vs/workbench/browser/parts/notifications/notificationsStatus.i18n.json
deleted file mode 100644
index e2a1f25b4cc..00000000000
--- a/i18n/rus/src/vs/workbench/browser/parts/notifications/notificationsStatus.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hideNotifications": "Скрыть уведомления",
-	"zeroNotifications": "Уведомления отсутствуют",
-	"noNotifications": "Новые уведомления отсутствуют",
-	"oneNotification": "1 новое уведомление",
-	"notifications": "Новые уведомления: {0}"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/browser/parts/notifications/notificationsToasts.i18n.json b/i18n/rus/src/vs/workbench/browser/parts/notifications/notificationsToasts.i18n.json
deleted file mode 100644
index af97b5dc012..00000000000
--- a/i18n/rus/src/vs/workbench/browser/parts/notifications/notificationsToasts.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"notificationsToast": "Всплывающее уведомление"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/browser/parts/notifications/notificationsViewer.i18n.json b/i18n/rus/src/vs/workbench/browser/parts/notifications/notificationsViewer.i18n.json
deleted file mode 100644
index 2d7637d0a5e..00000000000
--- a/i18n/rus/src/vs/workbench/browser/parts/notifications/notificationsViewer.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"notificationActions": "Действия уведомления",
-	"notificationSource": "Источник: {0}"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/browser/parts/panel/panelActions.i18n.json b/i18n/rus/src/vs/workbench/browser/parts/panel/panelActions.i18n.json
deleted file mode 100644
index 92f2c95b2dd..00000000000
--- a/i18n/rus/src/vs/workbench/browser/parts/panel/panelActions.i18n.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"closePanel": "Закрыть панель",
-	"togglePanel": "Переключить панель",
-	"focusPanel": "Фокус на панель",
-	"toggledPanelPosition": "Переключить положение панели",
-	"moveToRight": "Переместить вправо",
-	"moveToBottom": "Переместить вниз",
-	"toggleMaximizedPanel": "Переключить развернутую панель",
-	"maximizePanel": "Развернуть панель",
-	"minimizePanel": "Восстановить размер панели",
-	"view": "Просмотр"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/browser/parts/panel/panelPart.i18n.json b/i18n/rus/src/vs/workbench/browser/parts/panel/panelPart.i18n.json
deleted file mode 100644
index 9d7f5bc1e6f..00000000000
--- a/i18n/rus/src/vs/workbench/browser/parts/panel/panelPart.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hidePanel": "Скрыть панель"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/browser/parts/quickinput/quickInput.i18n.json b/i18n/rus/src/vs/workbench/browser/parts/quickinput/quickInput.i18n.json
deleted file mode 100644
index 531da4af798..00000000000
--- a/i18n/rus/src/vs/workbench/browser/parts/quickinput/quickInput.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"inputModeEntryDescription": "{0} (нажмите клавишу ВВОД, чтобы подтвердить введенные данные, или ESCAPE для отмены)",
-	"inputModeEntry": "Нажмите клавишу ВВОД, чтобы подтвердить введенные данные, или ESCAPE для отмены",
-	"quickInput.countSelected": "{0} выбрано",
-	"ok": "ОК"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/browser/parts/quickinput/quickInputBox.i18n.json b/i18n/rus/src/vs/workbench/browser/parts/quickinput/quickInputBox.i18n.json
deleted file mode 100644
index e0dfe281c38..00000000000
--- a/i18n/rus/src/vs/workbench/browser/parts/quickinput/quickInputBox.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"quickInputBox.ariaLabel": "Введите текст, чтобы уменьшить число результатов."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/browser/parts/quickopen/quickOpenController.i18n.json b/i18n/rus/src/vs/workbench/browser/parts/quickopen/quickOpenController.i18n.json
deleted file mode 100644
index e4e639b0ec2..00000000000
--- a/i18n/rus/src/vs/workbench/browser/parts/quickopen/quickOpenController.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"emptyPicks": "Нет записей для выбора",
-	"quickOpenInput": "Введите \"?\", чтобы узнать, какие отсюда можно выполнить действия",
-	"historyMatches": "недавно открывавшиеся",
-	"noResultsFound1": "Результаты не найдены",
-	"canNotRunPlaceholder": "Этот обработчик Quick Open нельзя использовать в текущем контексте.",
-	"entryAriaLabel": "{0}, недавно открывавшиеся",
-	"removeFromEditorHistory": "Удалить из журнала",
-	"pickHistory": "Выбор записи редактора, удаляемой из журнала"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/browser/parts/quickopen/quickopen.contribution.i18n.json b/i18n/rus/src/vs/workbench/browser/parts/quickopen/quickopen.contribution.i18n.json
deleted file mode 100644
index b00914a4167..00000000000
--- a/i18n/rus/src/vs/workbench/browser/parts/quickopen/quickopen.contribution.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"quickOpen": "Перейти к файлу...",
-	"quickNavigateNext": "Перейти к следующему элементу в Quick Open.",
-	"quickNavigatePrevious": "Перейти к предыдущему элементу в Quick Open.",
-	"quickSelectNext": "Выбрать следующее в Quick Open",
-	"quickSelectPrevious": "Выбрать предыдущее в Quick Open"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/browser/parts/quickopen/quickopen.i18n.json b/i18n/rus/src/vs/workbench/browser/parts/quickopen/quickopen.i18n.json
deleted file mode 100644
index fd3044ab7ab..00000000000
--- a/i18n/rus/src/vs/workbench/browser/parts/quickopen/quickopen.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"quickOpen": "Перейти к файлу...",
-	"quickNavigateNext": "Перейти к следующему элементу в Quick Open.",
-	"quickNavigatePrevious": "Перейти к предыдущему элементу в Quick Open.",
-	"quickSelectNext": "Выбрать следующее в Quick Open",
-	"quickSelectPrevious": "Выбрать предыдущее в Quick Open"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/browser/parts/sidebar/sidebarPart.i18n.json b/i18n/rus/src/vs/workbench/browser/parts/sidebar/sidebarPart.i18n.json
deleted file mode 100644
index 1ef0f05df26..00000000000
--- a/i18n/rus/src/vs/workbench/browser/parts/sidebar/sidebarPart.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"focusSideBar": "Перевести фокус на боковую панель",
-	"viewCategory": "Просмотреть"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/browser/parts/statusbar/statusbarPart.i18n.json b/i18n/rus/src/vs/workbench/browser/parts/statusbar/statusbarPart.i18n.json
deleted file mode 100644
index 69e54469712..00000000000
--- a/i18n/rus/src/vs/workbench/browser/parts/statusbar/statusbarPart.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"manageExtension": "Управление расширениями"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/browser/parts/titlebar/titlebarPart.i18n.json b/i18n/rus/src/vs/workbench/browser/parts/titlebar/titlebarPart.i18n.json
deleted file mode 100644
index 2497bac4cf4..00000000000
--- a/i18n/rus/src/vs/workbench/browser/parts/titlebar/titlebarPart.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"patchedWindowTitle": "[Не поддерживается]",
-	"userIsAdmin": "[Администратор]",
-	"userIsSudo": "[Супер пользователь]",
-	"devExtensionWindowTitlePrefix": "[Узел разработки расширения]"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/browser/parts/views/panelViewlet.i18n.json b/i18n/rus/src/vs/workbench/browser/parts/views/panelViewlet.i18n.json
deleted file mode 100644
index 7d61f43aa10..00000000000
--- a/i18n/rus/src/vs/workbench/browser/parts/views/panelViewlet.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"viewToolbarAriaLabel": "Действий: {0}"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/browser/parts/views/views.i18n.json b/i18n/rus/src/vs/workbench/browser/parts/views/views.i18n.json
deleted file mode 100644
index b0fa6d5e7e3..00000000000
--- a/i18n/rus/src/vs/workbench/browser/parts/views/views.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"viewToolbarAriaLabel": "Действий: {0}",
-	"hideView": "Скрыть из боковой панели"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/browser/parts/views/viewsRegistry.i18n.json b/i18n/rus/src/vs/workbench/browser/parts/views/viewsRegistry.i18n.json
deleted file mode 100644
index 2feabab41e5..00000000000
--- a/i18n/rus/src/vs/workbench/browser/parts/views/viewsRegistry.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"duplicateId": "Представление с идентификатором '{0}' уже зарегистрировано в расположении '{1}'"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/browser/parts/views/viewsViewlet.i18n.json b/i18n/rus/src/vs/workbench/browser/parts/views/viewsViewlet.i18n.json
deleted file mode 100644
index 9037375af55..00000000000
--- a/i18n/rus/src/vs/workbench/browser/parts/views/viewsViewlet.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"cannot toggle": "Не удается переключить видимость для представления {0}",
-	"cannot show": "Представление {0} не может быть показано, так как оно скрыто в условии 'when'",
-	"hideView": "Скрыть"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/browser/quickopen.i18n.json b/i18n/rus/src/vs/workbench/browser/quickopen.i18n.json
deleted file mode 100644
index 323b12c7aa4..00000000000
--- a/i18n/rus/src/vs/workbench/browser/quickopen.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noResultsMatching": "Нет соответствующих результатов",
-	"noResultsFound2": "Результаты не найдены"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/browser/viewlet.i18n.json b/i18n/rus/src/vs/workbench/browser/viewlet.i18n.json
deleted file mode 100644
index 972a0f529e7..00000000000
--- a/i18n/rus/src/vs/workbench/browser/viewlet.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"compositePart.hideSideBarLabel": "Скрыть боковую панель",
-	"collapse": "Свернуть все"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/common/theme.i18n.json b/i18n/rus/src/vs/workbench/common/theme.i18n.json
deleted file mode 100644
index 1ea38452a6e..00000000000
--- a/i18n/rus/src/vs/workbench/common/theme.i18n.json
+++ /dev/null
@@ -1,72 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"tabActiveBackground": "Цвет фона активной вкладки. Вкладки — это контейнеры для редакторов в области редактора. В одной группе редакторов можно открыть несколько вкладок. Может присутствовать несколько групп редакторов.",
-	"tabInactiveBackground": "Цвет фона неактивной вкладки. Вкладки — это контейнеры для редакторов в области редактора. В одной группе редакторов можно открыть несколько вкладок. Может присутствовать несколько групп редакторов.",
-	"tabHoverBackground": "Цвет фона вкладки при наведении. Вкладки — это контейнеры для редакторов в области редактора. В одной группе редакторов можно открыть несколько вкладок. Может присутствовать несколько групп редакторов.",
-	"tabUnfocusedHoverBackground": "Цвет фона вкладки в группе, не имеющей фокуса, при наведении. Вкладки — это контейнеры для редакторов в области редактора. В одной группе редакторов можно открыть несколько вкладок. Также можно открыть несколько групп редакторов.",
-	"tabBorder": "Граница для разделения вкладок. Вкладки — это контейнеры для редакторов в области редакторов. В одной группе редакторов можно открыть несколько вкладок. Может быть несколько групп редакторов.",
-	"tabActiveBorder": "Граница в нижней части активной вкладки. Вкладки — это контейнеры для редакторов в области редакторов. В одной группе редакторов можно открыть несколько вкладок. Также можно открыть несколько групп редакторов. ",
-	"tabActiveBorderTop": "Граница в верхней части активной вкладки. Вкладки — это контейнеры для редакторов в области редакторов. В одной группе редакторов можно открыть несколько вкладок. Также можно открыть несколько групп редакторов. ",
-	"tabActiveUnfocusedBorder": "Граница нижней части активной вкладки в группе, не имеющей фокуса. Вкладки — это контейнеры для редакторов в области редакторов. В одной группе редакторов можно открыть несколько вкладок. Также можно открыть несколько групп редакторов.",
-	"tabActiveUnfocusedBorderTop": "Граница верхней части активной вкладки в группе, не имеющей фокуса. Вкладки — это контейнеры для редакторов в области редакторов. В одной группе редакторов можно открыть несколько вкладок. Также можно открыть несколько групп редакторов.",
-	"tabHoverBorder": "Граница для выделения вкладок при наведении курсора. Вкладки — это контейнеры для редакторов в области редакторов. В одной группе редакторов можно открыть несколько вкладок. Также можно открыть несколько групп редакторов. ",
-	"tabUnfocusedHoverBorder": "Граница для выделения вкладок в группе, не имеющей фокуса, при наведении. Вкладки — это контейнеры для редакторов в области редакторов. В одной группе редакторов можно открыть несколько вкладок. Также можно открыть несколько групп редакторов.",
-	"tabActiveForeground": "Цвет переднего плана активной вкладки в активной группе. Вкладки — это контейнеры для редакторов в области редактора. В одной группе редакторов можно открыть несколько вкладок. Может присутствовать несколько групп редакторов.",
-	"tabInactiveForeground": "Цвет переднего плана неактивной вкладки в активной группе. Вкладки — это контейнеры для редакторов в области редактора. В одной группе редакторов можно открыть несколько вкладок. Может присутствовать несколько групп редакторов.",
-	"tabUnfocusedActiveForeground": "Цвет переднего плана активной вкладки в группе,  не имеющей фокуса. Вкладки — это контейнеры для редакторов в области редактора. В одной группе редакторов можно открыть несколько вкладок. Также можно открыть несколько групп редакторов.",
-	"tabUnfocusedInactiveForeground": "Цвет переднего плана неактивной вкладки в группе, не имеющей фокуса. Вкладки — это контейнеры для редакторов в области редактора. В одной группе редакторов можно открыть несколько вкладок. Также можно открыть несколько групп редакторов.",
-	"editorGroupBackground": "Цвет фона группы редакторов. Группы редакторов представляют собой контейнеры редакторов. Цвет фона отображается при перетаскивании групп редакторов.",
-	"tabsContainerBackground": "Цвет фона для заголовка группы редакторов, когда вкладки включены. Группы редакторов представляют собой контейнеры редакторов.",
-	"tabsContainerBorder": "Цвет границы для заголовка группы редакторов, когда вкладки включены. Группы редакторов представляют собой контейнеры редакторов.",
-	"editorGroupHeaderBackground": "Цвет фона для заголовка группы редакторов, когда вкладки отключены (`\"workbench.editor.showTabs\": false`). Группы редакторов представляют собой контейнеры редакторов.",
-	"editorGroupBorder": "Цвет для разделения нескольких групп редакторов. Группы редакторов — это контейнеры редакторов.",
-	"editorDragAndDropBackground": "Цвет фона при перетаскивании редакторов. Этот цвет должен обладать прозрачностью, чтобы содержимое редактора оставалось видимым.",
-	"panelBackground": "Цвет фона панели. Панели показаны под областью редактора и содержат такие представления, как выходные данные и встроенный терминал.",
-	"panelBorder": "Цвет границы панели, отделяющей ее от редактора. Панели находятся под областью редактора и содержат такие представления, как выходные данные и встроенный терминал.",
-	"panelActiveTitleForeground": "Цвет заголовка для активной панели. Панели отображаются под областью редактора и содержат такие представления, как окно вывода и встроенный терминал.",
-	"panelInactiveTitleForeground": "Цвет заголовка для неактивной панели. Панели отображаются под областью редактора и содержат такие представления, как окно вывода и встроенный терминал.",
-	"panelActiveTitleBorder": "Цвет границ для заголовка активной панели. Панели отображаются под областью редактора и содержат такие представления, как окно вывода и встроенный терминал.",
-	"panelDragAndDropBackground": "Цвет элементов заголовка панели при перетаскивании. Этот цвет должен иметь прозрачность, чтобы содержимое панели оставалось видимым. Панели находятся под областью редактора и содержат такие представления, как выходные данные и встроенный терминал. ",
-	"statusBarForeground": "Цвет переднего плана строки состояния, когда открыта рабочая область. Строка состояния отображается в нижней части окна.",
-	"statusBarNoFolderForeground": "Цвет переднего плана строки состояния, если папка не открыта. Строка состояния отображается в нижней части окна.",
-	"statusBarBackground": "Цвет фона строки состояния, когда открыта рабочая область. Строка состояния отображается в нижней части окна.",
-	"statusBarNoFolderBackground": "Цвет фона панели состояния, если папка не открыта. Панель состояния отображается внизу окна.",
-	"statusBarBorder": "Цвет границы строки состояния, который распространяется на боковую панель и редактор. Строка состояния расположена в нижней части окна.",
-	"statusBarNoFolderBorder": "Цвет границы строки состояния, который распространяется на боковую панель и редактор, когда открытые папки отсутствуют. Строка состояния расположена в нижней части окна.",
-	"statusBarItemActiveBackground": "Цвет фона элементов панели состояния при щелчке. Панель состояния отображается внизу окна.",
-	"statusBarItemHoverBackground": "Цвет фона элементов панели состояния при наведении. Панель состояния отображается внизу окна.",
-	"statusBarProminentItemBackground": "Цвет фона приоритетных элементов панели состояния. Приоритетные элементы выделяются на фоне других элементов панели состояния, чтобы подчеркнуть их значение. Чтобы просмотреть пример, измените режим \"Toggle Tab Key Moves Focus\" из палитры команд. Панель состояния отображается в нижней части окна.",
-	"statusBarProminentItemHoverBackground": "Цвет фона приоритетных элементов панели состояния при наведении. Приоритетные элементы выделяются на фоне других элементов панели состояния, чтобы подчеркнуть их значение. Чтобы просмотреть пример, измените режим \"Toggle Tab Key Moves Focus\" из палитры команд. Панель состояния отображается в нижней части окна.",
-	"activityBarBackground": "Цвет фона панели действий. Панель действий отображается слева или справа и позволяет переключаться между представлениями боковой панели.",
-	"activityBarForeground": "Цвет переднего плана панели действий (например, цвет, используемый для значков). Панель действий отображается слева или справа и позволяет переключаться между представлениями боковой панели.",
-	"activityBarBorder": "Цвет границы панели действий, который распространяется на боковую панель. Панель действий отображается слева или справа и позволяет переключаться между представлениями в боковой панели.",
-	"activityBarDragAndDropBackground": "Цвет панели обратной связи при перетаскивании для элементов панели действий. Цвет должен обладать прозрачностью, чтобы содержимое панели действий оставалось видимым. Панель действий отображается с правого или с левого края и позволяет переключаться между представлениями в боковой панели.",
-	"activityBarBadgeBackground": "Цвет фона значка уведомлений о действиях. Панель действий отображается слева или справа и позволяет переключаться между представлениями боковой панели.",
-	"activityBarBadgeForeground": "Цвет переднего плана значка уведомлений о действиях. Панель действий отображается слева или справа и позволяет переключаться между представлениями боковой панели.",
-	"sideBarBackground": "Цвет фона боковой панели. Боковая панель — это контейнер таких представлений, как проводник и поиск.",
-	"sideBarForeground": "Цвет переднего плана боковой панели. Боковая панель — это контейнер для таких представлений, как проводник и поиск.",
-	"sideBarBorder": "Цвет границы боковой панели со стороны редактора. Боковая панель — это контейнер для таких представлений, как проводник и поиск.",
-	"sideBarTitleForeground": "Цвет переднего плана заголовка боковой панели. Боковая панель — это контейнер для таких представлений, как проводник и поиск.",
-	"sideBarDragAndDropBackground": "Цвет элементов боковой панели при перетаскивании. Цвет должен обладать прозрачностью, чтобы содержимое элементов боковой панели оставалось видимым. Боковая панель предоставляет собой контейнер для таких представлений как проводник и поиск.",
-	"sideBarSectionHeaderBackground": "Цвет фона для заголовка раздела боковой панели. Боковая панель — это контейнер для таких представлений, как проводник и поиск.",
-	"sideBarSectionHeaderForeground": "Цвет переднего плана для заголовка раздела боковой панели. Боковая панель — это контейнер для таких представлений, как проводник и поиск.",
-	"titleBarActiveForeground": "Передний план панели заголовка, если окно активно. Обратите внимание, что этот цвет сейчас поддерживается только в macOS.",
-	"titleBarInactiveForeground": "Передний план панели заголовка, если окно неактивно. Обратите внимание, что этот цвет сейчас поддерживается только в macOS.",
-	"titleBarActiveBackground": "Фон панели заголовка, если окно активно. Обратите внимание, что этот цвет сейчас поддерживается только в macOS.",
-	"titleBarInactiveBackground": "Фон панели заголовка, если окно неактивно. Обратите внимание, что этот цвет сейчас поддерживается только в macOS.",
-	"titleBarBorder": "Цвет границы панели заголовка. Обратите внимание, что этот цвет сейчас поддерживается только в macOS.",
-	"notificationCenterBorder": "Цвет границы центра уведомлений. Уведомления появляются в нижней правой части окна. ",
-	"notificationToastBorder": "Цвет границы всплывающего уведомления. Уведомления появляются в нижней правой части окна.",
-	"notificationsForeground": "Цвет переднего плана уведомления. Уведомления появляются в нижней правой части окна.",
-	"notificationsBackground": "Цвет фона всплывающего уведомления. Уведомления появляются в нижней правой части окна.",
-	"notificationsLink": "Цвет переднего плана для ссылок в уведомлении. Уведомления появляются в нижней правой части окна.",
-	"notificationCenterHeaderForeground": "Цвет переднего плана заголовка в центре уведомлений. Уведомления появляются в нижней правой части окна. ",
-	"notificationCenterHeaderBackground": "Цвет фона заголовка в центре уведомлений. Уведомления появляются в нижней правой части окна. ",
-	"notificationsBorder": "Цвет границы уведомления, которая отделяет это уведомление от других в центре уведомлений. Уведомления появляются в нижней правой части окна. "
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/common/views.i18n.json b/i18n/rus/src/vs/workbench/common/views.i18n.json
deleted file mode 100644
index 69f15ecbcb8..00000000000
--- a/i18n/rus/src/vs/workbench/common/views.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"duplicateId": "Представление с идентификатором '{0}' уже зарегистрировано в расположении '{1}'"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/electron-browser/actions.i18n.json b/i18n/rus/src/vs/workbench/electron-browser/actions.i18n.json
deleted file mode 100644
index 266dadc0ddc..00000000000
--- a/i18n/rus/src/vs/workbench/electron-browser/actions.i18n.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"closeWindow": "Закрыть окно",
-	"closeWorkspace": "Закрыть рабочую область",
-	"noWorkspaceOpened": "В этом экземпляре отсутствуют открытые рабочие области.",
-	"newWindow": "Новое окно",
-	"toggleFullScreen": "Полноэкранный режим",
-	"toggleMenuBar": "Переключить строку меню",
-	"toggleDevTools": "Переключить средства разработчика",
-	"zoomIn": "Увеличить",
-	"zoomOut": "Уменьшить",
-	"zoomReset": "Сбросить масштаб",
-	"appPerf": "Производительность запуска",
-	"reloadWindow": "Перезагрузить окно",
-	"reloadWindowWithExntesionsDisabled": "Перезагрузить окно с отключенными расширениями",
-	"switchWindowPlaceHolder": "Выберите окно, в которое нужно переключиться",
-	"current": "Текущее окно",
-	"close": "Закрыть окно",
-	"switchWindow": "Переключить окно...",
-	"quickSwitchWindow": "Быстро переключить окно...",
-	"workspaces": "рабочие области",
-	"files": "файлы",
-	"openRecentPlaceHolderMac": "Выберите, чтобы открыть (чтобы открыть в новом окне, удерживайте клавишу CMD)",
-	"openRecentPlaceHolder": "Выберите, чтобы открыть (чтобы открыть в новом окне, удерживайте клавишу CTRL)",
-	"remove": "Удалить из последних открытых",
-	"openRecent": "Открыть последние...",
-	"quickOpenRecent": "Быстро открыть последние...",
-	"reportIssueInEnglish": "Сообщить об ошибке",
-	"openProcessExplorer": "Открыть обозреватель процессов ",
-	"reportPerformanceIssue": "Сообщать о проблемах производительности",
-	"keybindingsReference": "Справочник по сочетаниям клавиш",
-	"openDocumentationUrl": "Документация",
-	"openIntroductoryVideosUrl": "Вступительные видео",
-	"openTipsAndTricksUrl": "Советы и рекомендации",
-	"toggleSharedProcess": "Переключить общий процесс",
-	"navigateLeft": "Перейти к представлению слева",
-	"navigateRight": "Перейти к представлению справа",
-	"navigateUp": "Перейти к представлению вверху",
-	"navigateDown": "Перейти к представлению внизу",
-	"increaseViewSize": "Увеличить размер текущего представления",
-	"decreaseViewSize": "Уменьшить размер текущего представления",
-	"showPreviousTab": "Показать предыдущую вкладку в окне",
-	"showNextWindowTab": "Показать следующую вкладку в окне",
-	"moveWindowTabToNewWindow": "Переместить вкладку окна в новое окно",
-	"mergeAllWindowTabs": "Объединить все окна",
-	"toggleWindowTabsBar": "Переключить панель вкладок окна",
-	"about": "О программе {0}",
-	"inspect context keys": "Проверить ключи контекста"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/electron-browser/commands.i18n.json b/i18n/rus/src/vs/workbench/electron-browser/commands.i18n.json
deleted file mode 100644
index 983899514ca..00000000000
--- a/i18n/rus/src/vs/workbench/electron-browser/commands.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"diffLeftRightLabel": "{0} ⟷ {1}"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/electron-browser/configureLocale.i18n.json b/i18n/rus/src/vs/workbench/electron-browser/configureLocale.i18n.json
deleted file mode 100644
index b6db31f0ebd..00000000000
--- a/i18n/rus/src/vs/workbench/electron-browser/configureLocale.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"configureLocale": "Настроить язык",
-	"displayLanguage": "Определяет язык интерфейса VSCode.",
-	"doc": "Список поддерживаемых языков см. в {0}.",
-	"restart": "Для изменения значения требуется перезапуск VSCode.",
-	"fail.createSettings": "Невозможно создать \"{0}\" ({1}).",
-	"JsonSchema.locale": "Язык пользовательского интерфейса."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/electron-browser/crashReporter.i18n.json b/i18n/rus/src/vs/workbench/electron-browser/crashReporter.i18n.json
deleted file mode 100644
index b9b24e91bdb..00000000000
--- a/i18n/rus/src/vs/workbench/electron-browser/crashReporter.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"telemetryConfigurationTitle": "Телеметрия",
-	"telemetry.enableCrashReporting": "Разрешить отправку отчетов о сбоях в Майкрософт.\nЧтобы этот параметр вступил в силу, требуется перезагрузка."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/electron-browser/extensionHost.i18n.json b/i18n/rus/src/vs/workbench/electron-browser/extensionHost.i18n.json
deleted file mode 100644
index 38a0c548e3e..00000000000
--- a/i18n/rus/src/vs/workbench/electron-browser/extensionHost.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"extensionHostProcess.startupFailDebug": "Хост-процесс для расширений не был запущен в течение 10 секунд. Возможно, он был остановлен в первой строке, а для продолжения требуется отладчик.",
-	"extensionHostProcess.startupFail": "Хост-процесс для расширений не запустился спустя 10 секунд. Возможно, произошла ошибка.",
-	"extensionHostProcess.error": "Ошибка в хост-процессе для расширений: {0}",
-	"devTools": "Средства разработчика",
-	"extensionHostProcess.crash": "Хост-процесс для расширений неожиданно завершил работу. Загрузите окно повторно для восстановления."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/electron-browser/main.contribution.i18n.json b/i18n/rus/src/vs/workbench/electron-browser/main.contribution.i18n.json
deleted file mode 100644
index bdb5e10a72a..00000000000
--- a/i18n/rus/src/vs/workbench/electron-browser/main.contribution.i18n.json
+++ /dev/null
@@ -1,91 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"view": "Просмотреть",
-	"help": "Справка",
-	"file": "Файл",
-	"workspaces": "Рабочие области",
-	"developer": "Разработчик",
-	"workbenchConfigurationTitle": "Workbench",
-	"showEditorTabs": "Определяет, должны ли открытые редакторы отображаться на вкладках или нет.",
-	"workbench.editor.labelFormat.default": "Отображать имя файла. Если вкладки включены и в одной группе есть два файла с одинаковыми именами, то к имени каждого из этих файлов будут добавлены различающиеся части пути. Если вкладки отключены, то для активного редактора отображается путь по отношению к папке рабочей области.",
-	"workbench.editor.labelFormat.short": "Отображать имя файла и имя каталога.",
-	"workbench.editor.labelFormat.medium": "Отображать имя файла и путь к файлу относительно папки рабочей области.",
-	"workbench.editor.labelFormat.long": "Отображать имя файла и абсолютный путь.",
-	"tabDescription": "Определяет формат метки редактора. Изменив этот параметр, можно сделать более наглядным расположение файла:\n- короткий формат: 'parent'\n- средний формат: 'workspace/src/parent'\n- длинный формат: '/home/user/workspace/src/parent'\n- по умолчанию: '.../parent', если другая вкладка имеет такой же заголовок или относительный путь к рабочей области, если вкладки отключены",
-	"editorTabCloseButton": "Определяет положение кнопок закрытия вкладок редактора или отключает их, если задано значение off.",
-	"tabSizing": "Управляет размером вкладок редактора. При установке значения \"fit\" вкладки будут оставаться достаточно большими, чтобы в них можно было разместить полную метку редактора. При установке значения \"shrink\" вкладки будут сжиматься, если доступного места на экране недостаточно. Это позволяет отображать все вкладки в одном окне.",
-	"showIcons": "Определяет, должны ли открытые редакторы отображаться со значком. Требует включить тему значков.",
-	"enablePreview": "Определяет, отображаются ли открытые редакторы в режиме предварительного просмотра. Редакторы в режиме предварительного просмотра можно использовать, пока они открыты (например, с помощью двойного щелчка мыши или изменения). Текст в таких редакторах отображается курсивом.",
-	"enablePreviewFromQuickOpen": "Определяет, отображаются ли редакторы из Quick Open в режиме предварительного просмотра. Редакторы в режиме предварительного просмотра повторно используются до сохранения (например, с помощью двойного щелчка или изменения).",
-	"closeOnFileDelete": "Определяет, следует ли автоматически закрывать редакторы, когда отображаемый в них файл удален или переименован другим процессом. При отключении этой функции редактор остается открытым в качестве черновика. Обратите внимание, что при удалении из приложения редактор закрывается всегда и что файлы черновиков никогда не закрываются для сохранения данных.",
-	"editorOpenPositioning": "Определяет место открытия редакторов. Выберите 'left' или 'right', чтобы открывать редакторы слева или справа от активного редактора. Выберите 'first' или 'last', чтобы открывать редакторы независимо от активного редактора.",
-	"revealIfOpen": "Определяет, отображается ли редактор в какой-либо из видимых групп при открытии. Если функция отключена, редактор открывается в текущей активной группе редакторов. Если функция включена, вместо открытия уже открытый редактор будет отображен в текущей активной группе редакторов. Обратите внимание, что в некоторых случаях этот параметр игнорируется, например при принудительном открытии редактора в определенной группе или сбоку от текущей активной группы редакторов.",
-	"swipeToNavigate": "Переключайтесь между открытыми файлами, проводя по экрану по горизонтали тремя пальцами.",
-	"commandHistory": "Определяет количество недавно использованных команд, которые следует хранить в журнале палитры команд. Установите значение 0, чтобы отключить журнал команд.",
-	"preserveInput": "Определяет, следует ли восстановить последнюю введенную команду в палитре команд при следующем открытии палитры.",
-	"closeOnFocusLost": "Управляет автоматическим закрытием Quick Open при потере фокуса.",
-	"openDefaultSettings": "Управляет открытием редактора с отображением всех настроек по умолчанию при открытии настроек.",
-	"sideBarLocation": "Определяет расположение боковой панели: слева или справа от рабочего места.",
-	"panelDefaultLocation": "Определяет расположение панели по умолчанию. Она может находиться снизу или справа от рабочего места.",
-	"statusBarVisibility": "Управляет видимостью строки состояния в нижней части рабочего места.",
-	"activityBarVisibility": "Управляет видимостью панели действий на рабочем месте.",
-	"viewVisibility": "Управляет видимостью действий в заголовке представления. Действия в заголовке представления могут быть видимы всегда или видимы только тогда, когда представление получает фокус или на него наводится курсор мыши.",
-	"fontAliasing": "Управляет методом сглаживания шрифтов в рабочей области.\n- default: субпиксельное сглаживание шрифтов; позволит добиться максимальной четкости текста на большинстве дисплеев за исключением Retina\n- antialiased: сглаживание шрифтов на уровне пикселей, в отличие от субпиксельного сглаживания; позволит сделать шрифт более светлым в целом\n- none: сглаживание шрифтов отключено; текст будет отображаться с неровными острыми краями\n- auto: автоматически применяется режим \"default\" или \"antialiased\" в зависимости от разрешения дисплея (количество точек на дюйм).",
-	"workbench.fontAliasing.default": "Субпиксельное сглаживание шрифтов; позволит добиться максимальной четкости текста на большинстве дисплеев за исключением Retina.",
-	"workbench.fontAliasing.antialiased": "Сглаживание шрифтов на уровне пикселей, в отличие от субпиксельного сглаживания. Может сделать шрифт светлее в целом.",
-	"workbench.fontAliasing.none": "Отключает сглаживание шрифтов; текст будет отображаться с неровными острыми краями.",
-	"workbench.fontAliasing.auto": "Автоматически применяется режим \"default\" или \"antialiased\" в зависимости от разрешения дисплея (количество точек на дюйм).",
-	"enableNaturalLanguageSettingsSearch": "Определяет, следует ли включить режим поиска естественного языка для параметров.",
-	"windowConfigurationTitle": "Окно",
-	"window.openFilesInNewWindow.on": "Файлы будут открываться в новом окне.",
-	"window.openFilesInNewWindow.off": "Файлы будут открываться в окне с открытой папкой файлов или последнем активном окне.",
-	"window.openFilesInNewWindow.defaultMac": "Файлы будут открыты в новом окне с открытой папкой файлов или в последнем активном окне, если они не были открыты с помощью панели Dock или поиска",
-	"window.openFilesInNewWindow.default": "Файлы будут открыты в новом окне, если они не были выбраны в приложении (например, из меню \"Файл\")",
-	"openFilesInNewWindowMac": "Определяет, будут ли файлы открываться в новом окне.\n- default: файлы будут открываться в окне с открытой папкой файлов или последнем активном окне, если они не открываются из панели Dock или системы поиска.\n- on: файлы будут открываться в новом окне.\n- off: файлы будут открываться в окне с открытой папкой файлов или последнем активном окне.\nОбратите внимание, что возможны случаи, когда этот параметр игнорируется (например, при использовании параметра командной строки -new-window или -reuse-window).",
-	"openFilesInNewWindow": "Определяет, будут ли файлы открываться в новом окне.\n- default: файлы будут открываться в новом окне, если они не выбраны в приложении (например, из меню \"Файл\").\n- on: файлы будут открываться в новом окне.\n- off: файлы будут открываться в окне с открытой папкой файлов или последнем активном окне.\nОбратите внимание, что возможны случаи, когда этот параметр игнорируется (например, при использовании параметра командной строки -new-window или -reuse-window).",
-	"window.openFoldersInNewWindow.on": "Папки будут открываться в новом окне.",
-	"window.openFoldersInNewWindow.off": "Папки будут заменять последнее активное окно.",
-	"window.openFoldersInNewWindow.default": "Папки будут открываться в новом окне, если папка не выбрана в приложении (например, в меню \"Файл\").",
-	"openFoldersInNewWindow": "Определяет, будут ли папки открываться в новом окне или заменять последнее активное окно.\n- default: папки будут открываться в новом окне, если папка не выбрана из приложения (например, из меню \"Файл\").\n- on: папки будут открываться в новом окне.\n- off: папки будут заменять последнее активное окно.\nОбратите внимание, что возможны случаи, когда этот параметр игнорируется (например, при использовании параметра командной строки -new-window или -reuse-window).",
-	"window.openWithoutArgumentsInNewWindow.on": "Открыть новое пустое окно",
-	"window.openWithoutArgumentsInNewWindow.off": "Перенести фокус на последний активный запущенный экземпляр",
-	"openWithoutArgumentsInNewWindow": "Определяет, следует ли открыть второй активный экземпляр без аргументов или перевести выделение на последний запущенный экземпляр.\n- on: открыть новое пустое окно.\n- off: перевести выделение на последний запущенный экземпляр.\nОбратите внимание, что возможны случаи, когда этот параметр игнорируется (например, при использовании параметра командной строки -new-window или -reuse-window).",
-	"window.reopenFolders.all": "Повторно открыть все окна.",
-	"window.reopenFolders.folders": "Повторно откройте все папки. Пустые рабочие области не будут восстановлены.",
-	"window.reopenFolders.one": "Повторно открыть последнее активное окно.",
-	"window.reopenFolders.none": "Никогда не открывать окно повторно. Всегда начинать с пустого окна.",
-	"restoreWindows": "Управляет повторным открытием окон после перезапуска. Выберите 'none', чтобы всегда начинать с пустой рабочей области; 'one', чтобы открыть последнее окно, с которым вы работали; 'folders', чтобы открыть все окна с открытыми папками, и 'all', чтобы открыть все окна последнего сеанса.",
-	"restoreFullscreen": "Определяет, должно ли окно восстанавливаться в полноэкранном режиме, если оно было закрыто в полноэкранном режиме.",
-	"zoomLevel": "Настройте масштаб окна. Исходный размер равен 0. Увеличение или уменьшение значения на 1 означает увеличение или уменьшение окна на 20 %. Чтобы более точно задать масштаб, можно также ввести десятичное число.",
-	"title": "Определяет заголовок окна в зависимости от активного редактора. Подстановка переменных выполняется на основе контекста:\n${activeEditorShort}: имя файла (например, myFile.txt)\n${activeEditorMedium}: путь к файлу относительно папки рабочей области (например, myFolder/myFile.txt)\n${activeEditorLong}: полный путь к файлу (например, /Users/Development/myProject/myFolder/myFile.txt)\n${folderName}: имя папки рабочей области, в которой находится файл (например, myFolder)\n${folderPath}: путь к папке рабочей области, в которой находится файл (например, /Users/Development/myFolder)\n${rootName}: имя рабочей области (например, myFolder или myWorkspace)\n${rootPath}: путь к папке рабочей области (например, /Users/Development/myWorkspace)\n${appName}: например, VS Code\n${dirty}: индикатор изменения файла в активном редакторе\n${separator}: условный разделитель (\" - \"), который отображается, только если окружен переменными со значениями или статическим текстом",
-	"window.newWindowDimensions.default": "Открывать новые окна в центре экрана.",
-	"window.newWindowDimensions.inherit": "Открывать новые окна того же размера, что и последнее активное окно.",
-	"window.newWindowDimensions.maximized": "Открывать новые окна в развернутом состоянии.",
-	"window.newWindowDimensions.fullscreen": "Открывать новые окна в полноэкранном режиме.",
-	"newWindowDimensions": "Определяет размеры нового открывающегося окна, если по крайней мере одно окно уже открыто. По умолчанию новое окно будет открыто в центре экрана в уменьшенном размере. Если указано значение \"inherit\", размеры нового окна будут равны размерам последнего активного окна. Если указано значение \"maximized\", окно будет открыто в максимальном размере, а если указано значение \"fullscreen\", окно будет открыто в полноэкранном режиме. Обратите внимание, что этот параметр не влияет на первое открываемое окно. Размеры и расположение первого окна всегда будут совпдаать с размерами и расположением этого окна перед закрытием.",
-	"closeWhenEmpty": "Определяет, следует ли закрыть окно при закрытии последнего редактора. Этот параметр применяется только к окнам, в которых нет открытых папок.",
-	"window.menuBarVisibility.default": "Меню скрыто только в полноэкранном режиме.",
-	"window.menuBarVisibility.visible": "Меню всегда видимо, даже в полноэкранном режиме.",
-	"window.menuBarVisibility.toggle": "Меню скрыто, но его можно вывести с помощью клавиши ALT.",
-	"window.menuBarVisibility.hidden": "Меню всегда скрыто.",
-	"menuBarVisibility": "Определяет видимость строки меню. Значение toggle указывает, что строка меню скрыта и для ее вывода нужно один раз нажать клавишу ALT. По умолчанию строка меню не будет отображаться только в полноэкранном режиме.",
-	"enableMenuBarMnemonics": "Если этот параметр установлен, главные меню можно открыть с помощью сочетаний клавиш с клавишей ALT. Отключение назначенных клавиш позволит связать эти сочетания клавиш с клавишей ALT с командами редактора.",
-	"autoDetectHighContrast": "Если включено, будет выполняться автоматический переход к высококонтрастной теме, если в Windows используется тема высокой контрастности, или к темной теме при выходе из темы высокой контрастности Windows.",
-	"titleBarStyle": "Настройка внешнего вида заголовка окна. Чтобы применить изменения, потребуется полный перезапуск.",
-	"window.nativeTabs": "Включает вкладки окна macOS Sierra. Обратите внимание, что для применения этих изменений потребуется полная перезагрузка, и что для всех внутренних вкладок будет отключен пользовательский стиль заголовка, если он был настроен.",
-	"window.smoothScrollingWorkaround": "Включите это обходное решение, если после восстановления свернутого окна кода VS Code прокрутка не выполняется плавно. Это обходное решение для проблемы (https://github.com/Microsoft/vscode/issues/13612), при которой возникают задержки прокрутки на устройствах с сенсорными панелями высокой точности, такими как устройства Surface от Майкрософт. Включение этого обходного решения может привести к небольшому дрожанию элементов окна во время восстановления, но не имеет других негативных последствий.",
-	"window.clickThroughInactive": "Если этот параметр включен, то при щелчке в неактивном окне будут активированы как оно, так и элемент управления, на котором находился курсор мыши в момент щелчка, если этот элемент управления должен активироваться по щелчку мыши. Если этот параметр отключен, то при щелчке в любом месте неактивного окна будет активировано только окно, и для активации элемента управления на нем будет нужно щелкнуть еще раз.",
-	"zenModeConfigurationTitle": "Режим Zen",
-	"zenMode.fullScreen": "Определяет, будет ли переключение в режим Zen переключать рабочее пространство в полноэкранный режим.",
-	"zenMode.centerLayout": "Определяет, будет ли также выполняться выравнивание по центру при включении режима Zen.",
-	"zenMode.hideTabs": "Определяет, будет ли включение режима Zen также скрывать вкладки рабочего места.",
-	"zenMode.hideStatusBar": "Определяет, будет ли включение режима Zen также скрывать строку состояния в нижней части рабочего места.",
-	"zenMode.hideActivityBar": "Определяет, будет ли при включении режима Zen скрыта панель действий в левой части рабочей области.",
-	"zenMode.restore": "Определяет, должно ли окно восстанавливаться в режиме Zen, если закрылось в режиме Zen."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/electron-browser/main.i18n.json b/i18n/rus/src/vs/workbench/electron-browser/main.i18n.json
deleted file mode 100644
index 87f7975f305..00000000000
--- a/i18n/rus/src/vs/workbench/electron-browser/main.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"loaderError": "Сбой загрузки требуемого файла. Утеряно подключение к Интернету, либо сервер, к которому вы подключены, перешел в автономный режим. Обновите содержимое браузера, чтобы повторить попытку.",
-	"loaderErrorNative": "Не удалось загрузить требуемый файл. Перезапустите приложение, чтобы повторить попытку. Дополнительные сведения: {0}."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/electron-browser/shell.i18n.json b/i18n/rus/src/vs/workbench/electron-browser/shell.i18n.json
deleted file mode 100644
index 39183187ef0..00000000000
--- a/i18n/rus/src/vs/workbench/electron-browser/shell.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"runningAsRoot": "Не рекомендуется запускать код с правами администратора."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/electron-browser/window.i18n.json b/i18n/rus/src/vs/workbench/electron-browser/window.i18n.json
deleted file mode 100644
index 1b50f4f1a79..00000000000
--- a/i18n/rus/src/vs/workbench/electron-browser/window.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"undo": "Отменить",
-	"redo": "Вернуть",
-	"cut": "Вырезать",
-	"copy": "Копировать",
-	"paste": "Вставить",
-	"selectAll": "Выбрать все",
-	"runningAsRoot": "Не рекомендуется запускать {0} в качестве корневого пользователя."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/electron-browser/workbench.i18n.json b/i18n/rus/src/vs/workbench/electron-browser/workbench.i18n.json
deleted file mode 100644
index f952c4f27e5..00000000000
--- a/i18n/rus/src/vs/workbench/electron-browser/workbench.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"developer": "Разработчик",
-	"file": "Файл"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/node/extensionHostMain.i18n.json b/i18n/rus/src/vs/workbench/node/extensionHostMain.i18n.json
deleted file mode 100644
index 02f22f0adf5..00000000000
--- a/i18n/rus/src/vs/workbench/node/extensionHostMain.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"extensionTestError": "Путь \"{0}\" не указывает на допустимый модуль выполнения тестов расширения."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/node/extensionPoints.i18n.json b/i18n/rus/src/vs/workbench/node/extensionPoints.i18n.json
deleted file mode 100644
index b3a07f32520..00000000000
--- a/i18n/rus/src/vs/workbench/node/extensionPoints.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"jsonParseFail": "Не удалось проанализировать {0}: {1}.",
-	"fileReadFail": "Не удается прочитать файл {0}: {1}.",
-	"jsonsParseFail": "Не удалось проанализировать {0} или {1}: {2}.",
-	"missingNLSKey": "Не удалось найти сообщение для ключа {0}."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/cli/electron-browser/cli.contribution.i18n.json b/i18n/rus/src/vs/workbench/parts/cli/electron-browser/cli.contribution.i18n.json
deleted file mode 100644
index 636a290acb4..00000000000
--- a/i18n/rus/src/vs/workbench/parts/cli/electron-browser/cli.contribution.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"install": "Установить путь к команде \"{0}\" в PATH",
-	"not available": "Эта команда недоступна.",
-	"successIn": "Путь к команде оболочки \"{0}\" успешно установлен в PATH.",
-	"ok": "ОК",
-	"cancel2": "Отмена",
-	"warnEscalation": "Редактор Code запросит права администратора для установки команды оболочки с помощью osascript.",
-	"cantCreateBinFolder": "Не удается создать папку \"/usr/local/bin\".",
-	"aborted": "Прервано",
-	"uninstall": "Удалить путь к команде \"{0}\" из PATH",
-	"successFrom": "Путь к команде оболочки \"{0}\" успешно удален из PATH.",
-	"shellCommand": "Команда оболочки"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/codeEditor/electron-browser/accessibility.i18n.json b/i18n/rus/src/vs/workbench/parts/codeEditor/electron-browser/accessibility.i18n.json
deleted file mode 100644
index 8acefb4ab00..00000000000
--- a/i18n/rus/src/vs/workbench/parts/codeEditor/electron-browser/accessibility.i18n.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"emergencyConfOn": "Установка значения \"on\" для параметра \"editor.accessibilitySupport\".",
-	"openingDocs": "Открывается страница документации по специальным возможностям VS Code.",
-	"introMsg": "Благодарим за ознакомление со специальными возможностями VS Code.",
-	"status": "Состояние:",
-	"changeConfigToOnMac": "Чтобы включить постоянную оптимизацию редактора для использования со средствами чтения с экрана, нажмите COMMMAND+E.",
-	"changeConfigToOnWinLinux": "Чтобы включить постоянную оптимизацию редактора для использования со средствами чтения с экрана, нажмите CTRL+E.",
-	"auto_unknown": "В редакторе настроено определение средства чтения с экрана с помощью API платформы, но текущая среда выполнения это не поддерживает.",
-	"auto_on": "Редактор автоматически определил, что средство чтения с экрана подключено.",
-	"auto_off": "В редакторе настроено автоматическое определение средства чтения с экрана, но сейчас это средство не подключено.",
-	"configuredOn": "Постоянная оптимизацию редактора для использования со средствами чтения с экрана включена. Чтобы ее отключить, измените параметр \"editor.accessibilitySupport\".",
-	"configuredOff": "Для редактора не настроена оптимизация для использования со средствами чтения с экрана.",
-	"tabFocusModeOnMsg": "При нажатии клавиши TAB в текущем редакторе фокус ввода переместится на следующий элемент, способный его принять. Чтобы изменить это поведение, нажмите клавишу {0}.",
-	"tabFocusModeOnMsgNoKb": "При нажатии клавиши TAB в текущем редакторе фокус ввода переместится на следующий элемент, способный его принять. Команду {0} сейчас невозможно выполнить с помощью настраиваемого сочетания клавиш.",
-	"tabFocusModeOffMsg": "При нажатии клавиши TAB в текущем редакторе будет вставлен символ табуляции. Чтобы изменить это поведение, нажмите клавишу {0}.",
-	"tabFocusModeOffMsgNoKb": "При нажатии клавиши TAB в текущем редакторе будет вставлен символ табуляции. Команду {0} сейчас невозможно выполнить с помощью настраиваемого сочетания клавиш.",
-	"openDocMac": "Нажмите COMMAND+H, чтобы открыть окно браузера с дополнительными сведениями о специальных возможностях VS Code.",
-	"openDocWinLinux": "Нажмите CTRL+H, чтобы открыть окно браузера с дополнительными сведениями о специальных возможностях VS Code.",
-	"outroMsg": "Вы можете закрыть эту подсказку и вернуться в редактор, нажав клавиши ESCAPE или SHIFT+ESCAPE.",
-	"ShowAccessibilityHelpAction": "Показать справку по специальным возможностям"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/codeEditor/electron-browser/inspectKeybindings.i18n.json b/i18n/rus/src/vs/workbench/parts/codeEditor/electron-browser/inspectKeybindings.i18n.json
deleted file mode 100644
index cc1804002d4..00000000000
--- a/i18n/rus/src/vs/workbench/parts/codeEditor/electron-browser/inspectKeybindings.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"workbench.action.inspectKeyMap": "Разработчик: исследование сопоставлений ключей"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/codeEditor/electron-browser/inspectTMScopes.i18n.json b/i18n/rus/src/vs/workbench/parts/codeEditor/electron-browser/inspectTMScopes.i18n.json
deleted file mode 100644
index 86deb3a5055..00000000000
--- a/i18n/rus/src/vs/workbench/parts/codeEditor/electron-browser/inspectTMScopes.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"inspectTMScopes": "Разработчик: проверка областей TM",
-	"inspectTMScopesWidget.loading": "Идет загрузка..."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/codeEditor/electron-browser/languageConfiguration/languageConfigurationExtensionPoint.i18n.json b/i18n/rus/src/vs/workbench/parts/codeEditor/electron-browser/languageConfiguration/languageConfigurationExtensionPoint.i18n.json
deleted file mode 100644
index c29cfd8de53..00000000000
--- a/i18n/rus/src/vs/workbench/parts/codeEditor/electron-browser/languageConfiguration/languageConfigurationExtensionPoint.i18n.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"parseErrors": "Ошибок при анализе {0}: {1}",
-	"schema.openBracket": "Открывающий символ скобки или строковая последовательность.",
-	"schema.closeBracket": "Закрывающий символ скобки или строковая последовательность.",
-	"schema.comments": "Определяет символы комментариев",
-	"schema.blockComments": "Определяет способ маркировки комментариев.",
-	"schema.blockComment.begin": "Последовательность символов, открывающая блок комментариев.",
-	"schema.blockComment.end": "Последовательность символов, закрывающая блок комментариев.",
-	"schema.lineComment": "Последовательность символов, с которой начинается строка комментария.",
-	"schema.brackets": "Определяет символы скобок, увеличивающие или уменьшающие отступ.",
-	"schema.autoClosingPairs": "Определяет пары скобок. Когда введена открывающая скобка, автоматически добавляется закрывающая.",
-	"schema.autoClosingPairs.notIn": "Определяет список областей, где автоматические пары отключены.",
-	"schema.surroundingPairs": "Определяет пары скобок, в которые заключается выбранная строка.",
-	"schema.wordPattern": "Определение слова для языка.",
-	"schema.wordPattern.pattern": "Шаблон регулярного выражения, используемый для сопоставления слов.",
-	"schema.wordPattern.flags": "Флаги регулярного выражения, используемого для сопоставления слов.",
-	"schema.wordPattern.flags.errorMessage": "Должно соответствовать шаблону \"/^([gimuy]+)$/\".",
-	"schema.indentationRules": "Параметры отступов языка.",
-	"schema.indentationRules.increaseIndentPattern": "Если строка соответствует шаблону, то ко всем следующим строкам необходимо применить одинарный отступ (если не применяется другое правило).",
-	"schema.indentationRules.increaseIndentPattern.pattern": "Шаблон регулярного выражения для increaseIndentPattern.",
-	"schema.indentationRules.increaseIndentPattern.flags": "Флаги регулярного выражения для  increaseIndentPattern.",
-	"schema.indentationRules.increaseIndentPattern.errorMessage": "Должно соответствовать шаблону \"/^([gimuy]+)$/\".",
-	"schema.indentationRules.decreaseIndentPattern": "Если строка соответствует шаблону, то для всех следующих строк нужно уменьшить количество отступов на один (если не применяется другое правило). ",
-	"schema.indentationRules.decreaseIndentPattern.pattern": "Шаблон регулярного выражения для decreaseIndentPattern.",
-	"schema.indentationRules.decreaseIndentPattern.flags": "Флаги регулярного выражения для decreaseIndentPattern.",
-	"schema.indentationRules.decreaseIndentPattern.errorMessage": "Должно соответствовать шаблону \"/^([gimuy]+)$/\".",
-	"schema.indentationRules.indentNextLinePattern": "Если строка соответствует шаблону, то необходимо применить одинарный отступ **только к следующей строке**.",
-	"schema.indentationRules.indentNextLinePattern.pattern": "Шаблон регулярного выражения для indentNextLinePattern.",
-	"schema.indentationRules.indentNextLinePattern.flags": "Флаги регулярного выражения для indentNextLinePattern.",
-	"schema.indentationRules.indentNextLinePattern.errorMessage": "Должно соответствовать шаблону \"/^([gimuy]+)$/\".",
-	"schema.indentationRules.unIndentedLinePattern": "Если строка соответствует шаблону, то отступ для этой строки не следует изменять и проверять на соответствие другим правилам.",
-	"schema.indentationRules.unIndentedLinePattern.pattern": "Шаблон регулярного выражения для unIndentedLinePattern.",
-	"schema.indentationRules.unIndentedLinePattern.flags": "Флаги регулярного выражения для unIndentedLinePattern.",
-	"schema.indentationRules.unIndentedLinePattern.errorMessage": "Должно соответствовать шаблону \"/^([gimuy]+)$/\".",
-	"schema.folding": "Параметры сворачивания языка.",
-	"schema.folding.offSide": "Язык придерживается правила отступов, если блоки в этом языке определяются отступами. Если этот параметр установлен, пустые строки будут принадлежать последующему блоку.",
-	"schema.folding.markers": "Метки свертывания для конкретного языка, например, '#region' и '#endregion'. Регулярные выражения начала и окончания будут применены к содержимому всех строк. Их следует тщательно продумать.",
-	"schema.folding.markers.start": "Шаблон регулярного выражения для метки начала. Регулярное выражение должно начинаться с '^'.",
-	"schema.folding.markers.end": "Шаблон регулярного выражения для метки окончания. Регулярное выражение должно начинаться с '^'. "
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/codeEditor/electron-browser/largeFileOptimizations.i18n.json b/i18n/rus/src/vs/workbench/parts/codeEditor/electron-browser/largeFileOptimizations.i18n.json
deleted file mode 100644
index c914868ba4e..00000000000
--- a/i18n/rus/src/vs/workbench/parts/codeEditor/electron-browser/largeFileOptimizations.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"largeFile": "{0}: этот файл имеет слишком большой размер, поэтому для него были отключены разметка, перенос и свертывание, чтобы уменьшить объем используемой памяти и предотвратить зависание или неожиданное завершение работы программы.",
-	"neverShowAgain": "ОК. Больше не показывать",
-	"removeOptimizations": "Принудительно включить функции",
-	"reopenFilePrompt": "Откройте файл повторно, чтобы изменение этого параметра вступило в силу."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/codeEditor/electron-browser/textMate/inspectTMScopes.i18n.json b/i18n/rus/src/vs/workbench/parts/codeEditor/electron-browser/textMate/inspectTMScopes.i18n.json
deleted file mode 100644
index cd80af9433a..00000000000
--- a/i18n/rus/src/vs/workbench/parts/codeEditor/electron-browser/textMate/inspectTMScopes.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"inspectTMScopes": "Разработчик: проверка областей TM",
-	"inspectTMScopesWidget.loading": "Идет загрузка..."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/codeEditor/electron-browser/toggleMinimap.i18n.json b/i18n/rus/src/vs/workbench/parts/codeEditor/electron-browser/toggleMinimap.i18n.json
deleted file mode 100644
index 6be7fe83a1d..00000000000
--- a/i18n/rus/src/vs/workbench/parts/codeEditor/electron-browser/toggleMinimap.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleMinimap": "Вид: переключить мини-карту"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/codeEditor/electron-browser/toggleMultiCursorModifier.i18n.json b/i18n/rus/src/vs/workbench/parts/codeEditor/electron-browser/toggleMultiCursorModifier.i18n.json
deleted file mode 100644
index 7f0602742fa..00000000000
--- a/i18n/rus/src/vs/workbench/parts/codeEditor/electron-browser/toggleMultiCursorModifier.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleLocation": "Включить или отключить режим с несколькими курсорами"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderControlCharacter.i18n.json b/i18n/rus/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderControlCharacter.i18n.json
deleted file mode 100644
index 90a64f813d2..00000000000
--- a/i18n/rus/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderControlCharacter.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleRenderControlCharacters": "Вид: переключить управляющие символы"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderWhitespace.i18n.json b/i18n/rus/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderWhitespace.i18n.json
deleted file mode 100644
index 4d54311b671..00000000000
--- a/i18n/rus/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderWhitespace.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleRenderWhitespace": "Вид: включить или отключить вывод пробелов"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/codeEditor/electron-browser/toggleWordWrap.i18n.json b/i18n/rus/src/vs/workbench/parts/codeEditor/electron-browser/toggleWordWrap.i18n.json
deleted file mode 100644
index 82480dc4564..00000000000
--- a/i18n/rus/src/vs/workbench/parts/codeEditor/electron-browser/toggleWordWrap.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggle.wordwrap": "Вид: переключение режима переноса по словам",
-	"wordWrap.notInDiffEditor": "Не удается переключить перенос по словам в редакторе несовпадений.",
-	"unwrapMinified": "Отключить перенос для этого файла",
-	"wrapMinified": "Включить перенос для этого файла"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/codeEditor/electron-browser/wordWrapMigration.i18n.json b/i18n/rus/src/vs/workbench/parts/codeEditor/electron-browser/wordWrapMigration.i18n.json
deleted file mode 100644
index 6087a179298..00000000000
--- a/i18n/rus/src/vs/workbench/parts/codeEditor/electron-browser/wordWrapMigration.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"wordWrapMigration.ok": "ОК",
-	"wordWrapMigration.dontShowAgain": "Больше не показывать",
-	"wordWrapMigration.openSettings": "Открыть параметры",
-	"wordWrapMigration.prompt": "Параметр \"editor.wrappingColumn\" устарел и заменен на \"editor.wordWrap\"."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/debug/browser/breakpointWidget.i18n.json b/i18n/rus/src/vs/workbench/parts/debug/browser/breakpointWidget.i18n.json
deleted file mode 100644
index 5d2acafb378..00000000000
--- a/i18n/rus/src/vs/workbench/parts/debug/browser/breakpointWidget.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"breakpointWidgetExpressionPlaceholder": "Прервать выполнение, если выражение равно true. Нажмите клавишу ВВОД, чтобы принять, или ESC для отмены.",
-	"breakpointWidgetAriaLabel": "Выполнение программы прервется в этом месте, только если условие выполнится. Нажмите клавишу ВВОД для принятия или ESC для отмены.",
-	"breakpointWidgetHitCountPlaceholder": "Прервать при определенном количестве обращений. Нажмите клавишу ВВОД, чтобы принять, или ESC для отмены.",
-	"breakpointWidgetHitCountAriaLabel": "Выполнение программы прервется в этом месте, только если достигнуто определенное количество обращений. Нажмите клавишу ВВОД для принятия или ESC для отмены.",
-	"expression": "Выражение",
-	"hitCount": "Количество обращений"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json b/i18n/rus/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
deleted file mode 100644
index c7d82826666..00000000000
--- a/i18n/rus/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"logPoint": "Точка журнала",
-	"breakpoint": "Точка останова",
-	"editBreakpoint": "Изменить {0}...",
-	"removeBreakpoint": "Удалить {0}",
-	"functionBreakpointsNotSupported": "Точки останова функций не поддерживаются в этом типе отладки",
-	"functionBreakpointPlaceholder": "Функция, в которой производится останов",
-	"functionBreakPointInputAriaLabel": "Введите точку останова в функции",
-	"breakpointDisabledHover": "Отключенная точка останова",
-	"breakpointUnverifieddHover": "Непроверенная точка останова",
-	"functionBreakpointUnsupported": "Точки останова функций не поддерживаются в этом типе отладки",
-	"breakpointDirtydHover": "Непроверенная точка останова. Файл был изменен, перезапустите сеанс отладки.",
-	"logBreakpointUnsupported": "Точки журнала не поддерживаются для этого типа отладки",
-	"conditionalBreakpointUnsupported": "Условные точки останова не поддерживаются этим типом отладки",
-	"hitBreakpointUnsupported": "Останавливаться на условных точках останова, которые не поддерживаются этим типом отладки"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/debug/browser/debugActionItems.i18n.json b/i18n/rus/src/vs/workbench/parts/debug/browser/debugActionItems.i18n.json
deleted file mode 100644
index 4f96620576f..00000000000
--- a/i18n/rus/src/vs/workbench/parts/debug/browser/debugActionItems.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noConfigurations": "Нет конфигураций",
-	"addConfigTo": "Добавить конфигурацию ({0})...",
-	"addConfiguration": "Добавить конфигурацию..."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/debug/browser/debugActions.i18n.json b/i18n/rus/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
deleted file mode 100644
index 0b8d433c4e5..00000000000
--- a/i18n/rus/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openLaunchJson": "Открыть {0}",
-	"launchJsonNeedsConfigurtion": "Настройте или исправьте \"launch.json\"",
-	"noFolderDebugConfig": "Чтобы перейти к расширенной конфигурации отладки, сначала откройте папку.",
-	"startDebug": "Начать отладку",
-	"startWithoutDebugging": "Начать без отладки",
-	"selectAndStartDebugging": "Выбрать и начать отладку",
-	"restartDebug": "Перезапустить",
-	"reconnectDebug": "Повторно подключить",
-	"stepOverDebug": "Шаг с обходом",
-	"stepIntoDebug": "Шаг с заходом",
-	"stepOutDebug": "Шаг с выходом",
-	"stopDebug": "Остановить",
-	"disconnectDebug": "Отключить",
-	"continueDebug": "Продолжить",
-	"pauseDebug": "Приостановить",
-	"terminateThread": "Завершить поток",
-	"restartFrame": "Перезапустить кадр",
-	"removeBreakpoint": "Удалить точку останова",
-	"removeAllBreakpoints": "Удалить все точки останова",
-	"enableAllBreakpoints": "Включить все точки останова",
-	"disableAllBreakpoints": "Отключить все точки останова",
-	"activateBreakpoints": "Активировать точки останова",
-	"deactivateBreakpoints": "Отключить точки останова",
-	"reapplyAllBreakpoints": "Повторно применить все точки останова",
-	"addFunctionBreakpoint": "Добавить точку останова в функции",
-	"setValue": "Задать значение",
-	"addWatchExpression": "Добавить выражение",
-	"editWatchExpression": "Изменить выражение",
-	"addToWatchExpressions": "Добавить контрольное значение",
-	"removeWatchExpression": "Удалить выражение",
-	"removeAllWatchExpressions": "Удалить все выражения",
-	"clearRepl": "Очистить консоль",
-	"debugConsoleAction": "Консоль отладки",
-	"unreadOutput": "Новые выходные данные в консоли отладки",
-	"debugFocusConsole": "Фокус консоли отладки",
-	"focusSession": "Перевести фокус на сеанс",
-	"stepBackDebug": "На шаг назад",
-	"reverseContinue": "Обратно"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/debug/browser/debugActionsWidget.i18n.json b/i18n/rus/src/vs/workbench/parts/debug/browser/debugActionsWidget.i18n.json
deleted file mode 100644
index adbbf477cfc..00000000000
--- a/i18n/rus/src/vs/workbench/parts/debug/browser/debugActionsWidget.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"debugToolBarBackground": "Цвет фона для панели инструментов отладки.",
-	"debugToolBarBorder": "Цвет границы для панели инструментов отладки."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/debug/browser/debugCommands.i18n.json b/i18n/rus/src/vs/workbench/parts/debug/browser/debugCommands.i18n.json
deleted file mode 100644
index 5be62956db3..00000000000
--- a/i18n/rus/src/vs/workbench/parts/debug/browser/debugCommands.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noFolderDebugConfig": "Перед расширенной настройкой отладки откройте папку.",
-	"inlineBreakpoint": "Внутренняя точка останова",
-	"debug": "Отладка",
-	"addInlineBreakpoint": "Добавить внутреннюю точку останова"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/debug/browser/debugContentProvider.i18n.json b/i18n/rus/src/vs/workbench/parts/debug/browser/debugContentProvider.i18n.json
deleted file mode 100644
index 5fcfb55be67..00000000000
--- a/i18n/rus/src/vs/workbench/parts/debug/browser/debugContentProvider.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"unable": "Не удается разрешить ресурс без сеанса отладки.",
-	"canNotResolveSource": "Не удалось разрешить ресурс {0}, расширение отладки не отвечает."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json b/i18n/rus/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
deleted file mode 100644
index 529030b0956..00000000000
--- a/i18n/rus/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleBreakpointAction": "Отладка: переключить точку останова",
-	"conditionalBreakpointEditorAction": "Отладка: добавить условную точку останова…",
-	"logPointEditorAction": "Отладка: добавить точку журнала... ",
-	"runToCursor": "Выполнить до курсора",
-	"debugEvaluate": "Отладка: вычисление",
-	"debugAddToWatch": "Отладка: добавить контрольное значение",
-	"showDebugHover": "Отладка: показать при наведении",
-	"goToNextBreakpoint": "Отладка: перейти к следующей точке останова",
-	"goToPreviousBreakpoint": "Отладка: перейти к предыдущей точке останова"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/debug/browser/debugEditorModelManager.i18n.json b/i18n/rus/src/vs/workbench/parts/debug/browser/debugEditorModelManager.i18n.json
deleted file mode 100644
index 97b2c210b9f..00000000000
--- a/i18n/rus/src/vs/workbench/parts/debug/browser/debugEditorModelManager.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"breakpointDisabledHover": "Отключенная точка останова",
-	"breakpointUnverifieddHover": "Непроверенная точка останова",
-	"breakpointDirtydHover": "Непроверенная точка останова. Файл был изменен, перезапустите сеанс отладки.",
-	"breakpointUnsupported": "Условные точки останова не поддерживаются этим типом отладки"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/debug/browser/debugQuickOpen.i18n.json b/i18n/rus/src/vs/workbench/parts/debug/browser/debugQuickOpen.i18n.json
deleted file mode 100644
index c7284ee93b1..00000000000
--- a/i18n/rus/src/vs/workbench/parts/debug/browser/debugQuickOpen.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"entryAriaLabel": "Отладка: {0}",
-	"debugAriaLabel": "Введите имя используемой конфигурации запуска.",
-	"addConfigTo": "Добавить конфигурацию ({0})...",
-	"addConfiguration": "Добавить конфигурацию...",
-	"noConfigurationsMatching": "Нет соответствующих конфигураций отладки.",
-	"noConfigurationsFound": "Конфигурации отладки не найдены. Создайте файл \"launch.json\"."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/debug/browser/debugStatus.i18n.json b/i18n/rus/src/vs/workbench/parts/debug/browser/debugStatus.i18n.json
deleted file mode 100644
index 6ff61694550..00000000000
--- a/i18n/rus/src/vs/workbench/parts/debug/browser/debugStatus.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"selectAndStartDebug": "Выбрать и запустить конфигурацию отладки"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/debug/browser/debugViewlet.i18n.json b/i18n/rus/src/vs/workbench/parts/debug/browser/debugViewlet.i18n.json
deleted file mode 100644
index 489e93468ef..00000000000
--- a/i18n/rus/src/vs/workbench/parts/debug/browser/debugViewlet.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"startAdditionalSession": "Запустить дополнительный сеанс",
-	"debugFocusVariablesView": "Перейти в область переменных",
-	"debugFocusWatchView": "Перейти в область контрольных значений",
-	"debugFocusCallStackView": "Перейти в область стека вызовов",
-	"debugFocusBreakpointsView": "Перейти в область контрольных точек"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/debug/browser/exceptionWidget.i18n.json b/i18n/rus/src/vs/workbench/parts/debug/browser/exceptionWidget.i18n.json
deleted file mode 100644
index 3138a3aa6e7..00000000000
--- a/i18n/rus/src/vs/workbench/parts/debug/browser/exceptionWidget.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"debugExceptionWidgetBorder": "Цвет границ мини-приложения исключений.",
-	"debugExceptionWidgetBackground": "Цвет фона мини-приложения исключений.",
-	"exceptionThrownWithId": "Возникло исключение: {0}",
-	"exceptionThrown": "Произошло исключение."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/debug/browser/linkDetector.i18n.json b/i18n/rus/src/vs/workbench/parts/debug/browser/linkDetector.i18n.json
deleted file mode 100644
index 2a518e85b54..00000000000
--- a/i18n/rus/src/vs/workbench/parts/debug/browser/linkDetector.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"fileLinkMac": "Щелкните, чтобы отслеживать (чтобы открыть сбоку экрана, щелкните, удерживая клавишу CMD)",
-	"fileLink": "Щелкните, чтобы отслеживать (чтобы открыть сбоку экрана, щелкните, удерживая клавишу CTRL)"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/debug/browser/statusbarColorProvider.i18n.json b/i18n/rus/src/vs/workbench/parts/debug/browser/statusbarColorProvider.i18n.json
deleted file mode 100644
index 6c1558c0034..00000000000
--- a/i18n/rus/src/vs/workbench/parts/debug/browser/statusbarColorProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"statusBarDebuggingBackground": "Цвет фона панели состояния при отладке программы. Панель состояния показана внизу окна.",
-	"statusBarDebuggingForeground": "Цвет переднего плана строки состояния при отладке программы. Строка состояния расположена в нижней части окна.",
-	"statusBarDebuggingBorder": "Цвет границы строки состояния, который распространяется на боковую панель и редактор при отладке программы. Строка состояния расположена в нижней части окна."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/debug/common/debug.i18n.json b/i18n/rus/src/vs/workbench/parts/debug/common/debug.i18n.json
deleted file mode 100644
index 4db962dd4cf..00000000000
--- a/i18n/rus/src/vs/workbench/parts/debug/common/debug.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"internalConsoleOptions": "Управляет поведением внутренней консоли отладки."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/debug/common/debugModel.i18n.json b/i18n/rus/src/vs/workbench/parts/debug/common/debugModel.i18n.json
deleted file mode 100644
index cb5abfad606..00000000000
--- a/i18n/rus/src/vs/workbench/parts/debug/common/debugModel.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"notAvailable": "недоступно",
-	"startDebugFirst": "Чтобы произвести вычисление, начните сеанс отладки"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/debug/common/debugSchemas.i18n.json b/i18n/rus/src/vs/workbench/parts/debug/common/debugSchemas.i18n.json
deleted file mode 100644
index 4b03de0a749..00000000000
--- a/i18n/rus/src/vs/workbench/parts/debug/common/debugSchemas.i18n.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.contributes.debuggers": "Добавляет адаптеры отладки.",
-	"vscode.extension.contributes.debuggers.type": "Уникальный идентификатор этого адаптера отладки.",
-	"vscode.extension.contributes.debuggers.label": "Отображаемое имя этого адаптера отладки.",
-	"vscode.extension.contributes.debuggers.program": "Путь к программе адаптера отладки. Путь указывается либо как абсолютный, либо относительно папки расширения.",
-	"vscode.extension.contributes.debuggers.args": "Необязательные аргументы для передачи адаптеру.",
-	"vscode.extension.contributes.debuggers.runtime": "Дополнительная среда выполнения, используемая в том случае, если атрибут program не указывает на исполняемый файл, но среда выполнения требуется.",
-	"vscode.extension.contributes.debuggers.runtimeArgs": "Аргументы дополнительной среды выполнения.",
-	"vscode.extension.contributes.debuggers.variables": "Сопоставление интерактивных переменных (например, ${action.pickProcess}) в \"launch.json\" для команды.",
-	"vscode.extension.contributes.debuggers.initialConfigurations": "Конфигурации для создания первоначального файла launch.json.",
-	"vscode.extension.contributes.debuggers.languages": "Список языков, для которых расширение отладки может считаться \"отладчиком по умолчанию\".",
-	"vscode.extension.contributes.debuggers.adapterExecutableCommand": "Если задано, VS Code будет вызывать эту команду, чтобы определить путь к исполняемому файлу адаптера отладки и передаваемые аргументы.",
-	"vscode.extension.contributes.debuggers.configurationSnippets": "Фрагменты для добавления новых конфигураций в launch.json.",
-	"vscode.extension.contributes.debuggers.configurationAttributes": "Конфигурации схемы JSON для проверки launch.json.",
-	"vscode.extension.contributes.debuggers.windows": "Параметры, связанные с Windows.",
-	"vscode.extension.contributes.debuggers.windows.runtime": "Среда выполнения, используемая для Windows.",
-	"vscode.extension.contributes.debuggers.osx": "Параметры, связанные с macOS.",
-	"vscode.extension.contributes.debuggers.osx.runtime": "Среда выполнения, используемая для macOS.",
-	"vscode.extension.contributes.debuggers.linux": "Параметры, связанные с Linux.",
-	"vscode.extension.contributes.debuggers.linux.runtime": "Среда выполнения, используемая для Linux.",
-	"vscode.extension.contributes.breakpoints": "Добавляет точки останова.",
-	"vscode.extension.contributes.breakpoints.language": "Разрешить точки останова для этого языка.",
-	"app.launch.json.title": "Запустить",
-	"app.launch.json.version": "Версия этого формата файла.",
-	"app.launch.json.configurations": "Список конфигураций. Добавьте новые конфигурации или измените существующие с помощью IntelliSense.",
-	"app.launch.json.compounds": "Список составных объектов. Каждый из них ссылается на несколько конфигураций, которые будут запущены вместе.",
-	"app.launch.json.compound.name": "Имя составного объекта. Отображается в раскрывающемся меню запуска конфигурации.",
-	"useUniqueNames": "Используйте уникальное имя конфигурации.",
-	"app.launch.json.compound.folder": "Имя папки, в которой расположен составной объект.",
-	"app.launch.json.compounds.configurations": "Имена конфигураций, которые будут запущены как часть этого составного объекта."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/debug/common/debugSource.i18n.json b/i18n/rus/src/vs/workbench/parts/debug/common/debugSource.i18n.json
deleted file mode 100644
index 44793279407..00000000000
--- a/i18n/rus/src/vs/workbench/parts/debug/common/debugSource.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"unknownSource": "Неизвестный источник"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json b/i18n/rus/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
deleted file mode 100644
index 0c479344e19..00000000000
--- a/i18n/rus/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"breakpointWidgetLogMessagePlaceholder": "Сообщение, которое должно быть записано в журнал при срабатывании точки останова. Выражения в фигурных скобках {} интерполируются. Нажмите клавишу ВВОД, чтобы принять, или ESC, чтобы отменить действие.",
-	"breakpointWidgetHitCountPlaceholder": "Прервать при определенном количестве обращений. Нажмите клавишу ВВОД, чтобы принять, или ESC для отмены.",
-	"breakpointWidgetExpressionPlaceholder": "Прервать выполнение, если выражение равно true. Нажмите клавишу ВВОД, чтобы принять, или ESC для отмены.",
-	"expression": "Выражение",
-	"hitCount": "Количество обращений",
-	"logMessage": "Сообщение журнала"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/debug/electron-browser/breakpointsView.i18n.json b/i18n/rus/src/vs/workbench/parts/debug/electron-browser/breakpointsView.i18n.json
deleted file mode 100644
index 2f403ed3336..00000000000
--- a/i18n/rus/src/vs/workbench/parts/debug/electron-browser/breakpointsView.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"editConditionalBreakpoint": "Изменить точку останова…",
-	"functionBreakpointsNotSupported": "Точки останова функций не поддерживаются в этом типе отладки",
-	"functionBreakpointPlaceholder": "Функция, в которой производится останов",
-	"functionBreakPointInputAriaLabel": "Введите точку останова в функции"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/debug/electron-browser/callStackView.i18n.json b/i18n/rus/src/vs/workbench/parts/debug/electron-browser/callStackView.i18n.json
deleted file mode 100644
index 9854100b729..00000000000
--- a/i18n/rus/src/vs/workbench/parts/debug/electron-browser/callStackView.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"callstackSection": "Раздел стека вызовов",
-	"debugStopped": "Приостановлено на {0}",
-	"callStackAriaLabel": "Отладка стека вызовов",
-	"session": "Сеанс",
-	"paused": "Приостановлено",
-	"running": "Работает",
-	"thread": "Поток",
-	"pausedOn": "Приостановлено на {0}",
-	"loadMoreStackFrames": "Загрузить больше кадров стека",
-	"threadAriaLabel": "Поток {0}, стек вызовов, отладка",
-	"stackFrameAriaLabel": "Кадр стека {0}, строка {1} {2}, стек вызовов, отладка"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json b/i18n/rus/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
deleted file mode 100644
index c40c0450d63..00000000000
--- a/i18n/rus/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleDebugViewlet": "Показать отладочные сведения",
-	"toggleDebugPanel": "Консоль отладки",
-	"debug": "Отладка",
-	"debugPanel": "Консоль отладки",
-	"variables": "Переменные",
-	"watch": "Контрольное значение",
-	"callStack": "Стек вызовов",
-	"breakpoints": "Точки останова",
-	"view": "Просмотреть",
-	"debugCategory": "Отладка",
-	"debugCommands": "Конфигурация отладки",
-	"debugConfigurationTitle": "Отладка",
-	"allowBreakpointsEverywhere": "Разрешает задание точки останова в любом файле",
-	"openExplorerOnEnd": "Автоматически открывать представление обозревателя в конце сеанса отладки",
-	"inlineValues": "Показывать значения переменных в редакторе во время отладки",
-	"toolBarLocation": "Управляет расположением панели инструментов отладки. Допустимые значения: \"floating\" (может находиться во всех представлениях), \"docked\" (закреплена в представлении отладки) или \"hidden\" (скрыта).",
-	"never": "Никогда не отображать отладку в строке состояния",
-	"always": "Всегда отображать отладку в строке состояния",
-	"onFirstSessionStart": "Отображать отладку в строке состояния только после первого запуска отладки",
-	"showInStatusBar": "Определяет видимость для строки состояния отладки",
-	"openDebug": "Определяет, следует ли открыть представление отладки в начале сеанса отладки.",
-	"enableAllHovers": "Управляет тем, должны ли отображаться всплывающие сообщения, не связанные с отладкой, во время отладки. Если этот параметр имеет значение true, будут вызваны поставщики всплывающих сообщений, и сообщения будут отображены. Обычные всплывающие сообщения не будут отображаться, даже если этот параметр имеет значение true.",
-	"launch": "Глобальная конфигурация запуска отладки. Должна использоваться в качестве альтернативы для конфигурации \"launch.json\", которая является общей для рабочих пространств"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/debug/electron-browser/debugCommands.i18n.json b/i18n/rus/src/vs/workbench/parts/debug/electron-browser/debugCommands.i18n.json
deleted file mode 100644
index e8f815cc9f3..00000000000
--- a/i18n/rus/src/vs/workbench/parts/debug/electron-browser/debugCommands.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noFolderDebugConfig": "Перед расширенной настройкой отладки откройте папку."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json b/i18n/rus/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json
deleted file mode 100644
index 0ae1d13f646..00000000000
--- a/i18n/rus/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"debugNoType": "Параметр 'type' отладчика является обязательным и должен иметь тип 'string'.",
-	"selectDebug": "Выбор среды",
-	"DebugConfig.failed": "Не удается создать файл launch.json в папке .vscode ({0}).",
-	"workspace": "рабочая область",
-	"user settings": "параметры пользователя"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json b/i18n/rus/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
deleted file mode 100644
index 23861effe72..00000000000
--- a/i18n/rus/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"logPoint": "Точка журнала",
-	"breakpoint": "Точка останова",
-	"removeBreakpoint": "Удалить {0}",
-	"editBreakpoint": "Изменить {0}...",
-	"disableBreakpoint": "Отключить {0}",
-	"enableBreakpoint": "Включить {0}",
-	"removeBreakpoints": "Удалить точки останова",
-	"removeInlineBreakpointOnColumn": "Удалить внутреннюю точку останова в столбце {0}",
-	"removeLineBreakpoint": "Удалить точку останова из строки",
-	"editBreakpoints": "Изменить точки останова",
-	"editInlineBreakpointOnColumn": "Изменить внутреннюю точку останова в столбце {0}",
-	"editLineBrekapoint": "Изменить точку останова в строке",
-	"enableDisableBreakpoints": "Включить или отключить точки останова",
-	"disableInlineColumnBreakpoint": "Отключить внутреннюю точку останова в столбце {0} ",
-	"disableBreakpointOnLine": "Отключить точку останова в строке",
-	"enableBreakpoints": "Включить внутреннюю точку останова в столбце {0} ",
-	"enableBreakpointOnLine": "Включить точку останова в строке",
-	"addBreakpoint": "Добавить точку останова",
-	"addConditionalBreakpoint": "Добавить условную точку останова…",
-	"addLogPoint": "Добавить точку журнала...",
-	"breakpointHasCondition": "Этот {0} содержит {1}, который будет утерян при удалении. Попробуйте отключить {0} вместо удаления.",
-	"message": "сообщение",
-	"condition": "Условие",
-	"removeLogPoint": "Удалить {0}",
-	"disableLogPoint": "Отключить {0}",
-	"cancel": "Отмена",
-	"addConfiguration": "Добавить конфигурацию..."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/debug/electron-browser/debugHover.i18n.json b/i18n/rus/src/vs/workbench/parts/debug/electron-browser/debugHover.i18n.json
deleted file mode 100644
index 4b1abca8551..00000000000
--- a/i18n/rus/src/vs/workbench/parts/debug/electron-browser/debugHover.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"treeAriaLabel": "Отладка при наведении"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json b/i18n/rus/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
deleted file mode 100644
index 23eb63e486d..00000000000
--- a/i18n/rus/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"snapshotObj": "Для этого объекта показаны только значения-примитивы.",
-	"debuggingPaused": "Отладка была приостановлена, причина {0}, {1} {2}",
-	"debuggingStarted": "Отладка началась.",
-	"debuggingStopped": "Отладка остановилась.",
-	"breakpointAdded": "Добавлена точка останова: строка {0}, файл {1}",
-	"breakpointRemoved": "Удалена точка останова: строка {0}, файл {1}",
-	"compoundMustHaveConfigurations": "Для составного элемента должен быть задан атрибут configurations для запуска нескольких конфигураций.",
-	"noConfigurationNameInWorkspace": "Не удалось найти конфигурацию запуска \"{0}\" в рабочей области.",
-	"multipleConfigurationNamesInWorkspace": "В рабочей области есть несколько конфигураций запуска \"{0}\". Используйте имя папки для определения конфигурации.",
-	"noFolderWithName": "Не удается найти папку с именем '{0}' для конфигурации '{1}' в составном объекте '{2}'.",
-	"configMissing": "Конфигурация \"{0}\" отсутствует в launch.json.",
-	"launchJsonDoesNotExist": "Файл \"launch.json\" не существует.",
-	"debugRequestNotSupported": "Атрибут '{0}' имеет неподдерживаемое значение '{1}' в выбранной конфигурации отладки.",
-	"debugRequesMissing": "В выбранной конфигурации отладки отсутствует атрибут '{0}'.",
-	"debugTypeNotSupported": "Настроенный тип отладки \"{0}\" не поддерживается.",
-	"debugTypeMissing": "Отсутствует свойство \"type\" для выбранной конфигурации запуска.",
-	"debugAnyway": "Принудительная отладка",
-	"preLaunchTaskErrors": "При выполнении предварительной задачи \"{0}\" обнаружены ошибки.",
-	"preLaunchTaskError": "При выполнении предварительной задачи \"{0}\" обнаружена ошибка.",
-	"preLaunchTaskExitCode": "Выполнение предварительной задачи \"{0}\" завершено с кодом выхода {1}.",
-	"showErrors": "Показывать ошибки",
-	"noFolderWorkspaceDebugError": "Нельзя выполнить отладку активного файла. Убедитесь, что файл сохранен на диске и установлено расширение отладки для этого типа файла.",
-	"cancel": "Отмена",
-	"DebugTaskNotFound": "Не удалось найти задачу \"{0}\".",
-	"taskNotTracked": "Не удается отследить задачу \"{0}\"."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/debug/electron-browser/debugViewer.i18n.json b/i18n/rus/src/vs/workbench/parts/debug/electron-browser/debugViewer.i18n.json
deleted file mode 100644
index f3c486dd1bb..00000000000
--- a/i18n/rus/src/vs/workbench/parts/debug/electron-browser/debugViewer.i18n.json
+++ /dev/null
@@ -1,28 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"process": "Процесс",
-	"paused": "Приостановлено",
-	"running": "Работает",
-	"thread": "Поток",
-	"pausedOn": "Приостановлено на {0}",
-	"loadMoreStackFrames": "Загрузить больше кадров стека",
-	"threadAriaLabel": "Поток {0}, стек вызовов, отладка",
-	"stackFrameAriaLabel": "Кадр стека {0}, строка {1} {2}, стек вызовов, отладка",
-	"variableValueAriaLabel": "Введите новое значение переменной",
-	"variableScopeAriaLabel": "Область {0}, переменные, отладка",
-	"variableAriaLabel": "{0} значение {1}, переменные, отладка",
-	"watchExpressionPlaceholder": "Выражение с контрольным значением",
-	"watchExpressionInputAriaLabel": "Введите выражение контрольного значения",
-	"watchExpressionAriaLabel": "{0} значение {1}, контрольное значение, отладка",
-	"watchVariableAriaLabel": "{0} значение {1}, контрольное значение, отладка",
-	"functionBreakpointPlaceholder": "Функция, в которой производится останов",
-	"functionBreakPointInputAriaLabel": "Введите точку останова в функции",
-	"functionBreakpointsNotSupported": "Точки останова функций не поддерживаются в этом типе отладки",
-	"breakpointAriaLabel": "Строка точки останова {0} {1}, точки останова, отладка",
-	"functionBreakpointAriaLabel": "Точка останова в функции {0}, точки останова, отладка",
-	"exceptionBreakpointAriaLabel": "Точка останова в исключении {0}, точки останова, отладка"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/debug/electron-browser/debugViews.i18n.json b/i18n/rus/src/vs/workbench/parts/debug/electron-browser/debugViews.i18n.json
deleted file mode 100644
index 5773174ff02..00000000000
--- a/i18n/rus/src/vs/workbench/parts/debug/electron-browser/debugViews.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"variablesSection": "Раздел переменных",
-	"variablesAriaTreeLabel": "Отладка переменных",
-	"expressionsSection": "Раздел выражений",
-	"watchAriaTreeLabel": "Отладка выражений контрольных значений",
-	"callstackSection": "Раздел стека вызовов",
-	"debugStopped": "Приостановлено на {0}",
-	"callStackAriaLabel": "Отладка стека вызовов",
-	"breakpointsSection": "Раздел точек останова",
-	"breakpointsAriaTreeLabel": "Отладка точек останова"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/debug/electron-browser/electronDebugActions.i18n.json b/i18n/rus/src/vs/workbench/parts/debug/electron-browser/electronDebugActions.i18n.json
deleted file mode 100644
index f9ca08db354..00000000000
--- a/i18n/rus/src/vs/workbench/parts/debug/electron-browser/electronDebugActions.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"copyValue": "Копировать значение",
-	"copyAsExpression": "Копировать как выражение",
-	"copy": "Копировать",
-	"copyAll": "Копировать все",
-	"copyStackTrace": "Копировать стек вызовов"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/debug/electron-browser/rawDebugSession.i18n.json b/i18n/rus/src/vs/workbench/parts/debug/electron-browser/rawDebugSession.i18n.json
deleted file mode 100644
index b28b6560832..00000000000
--- a/i18n/rus/src/vs/workbench/parts/debug/electron-browser/rawDebugSession.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"moreInfo": "Подробнее",
-	"debugAdapterCrash": "Процесс адаптера отладки неожиданно завершился"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/debug/electron-browser/repl.i18n.json b/i18n/rus/src/vs/workbench/parts/debug/electron-browser/repl.i18n.json
deleted file mode 100644
index 5733d0943b1..00000000000
--- a/i18n/rus/src/vs/workbench/parts/debug/electron-browser/repl.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"replAriaLabel": "Панель read–eval–print loop",
-	"actions.repl.historyPrevious": "Журнал — назад",
-	"actions.repl.historyNext": "Журнал — далее",
-	"actions.repl.acceptInput": "Прием входных данных REPL",
-	"actions.repl.copyAll": "Отладка: скопировать все содержимое консоли"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/debug/electron-browser/replViewer.i18n.json b/i18n/rus/src/vs/workbench/parts/debug/electron-browser/replViewer.i18n.json
deleted file mode 100644
index b22dfeae910..00000000000
--- a/i18n/rus/src/vs/workbench/parts/debug/electron-browser/replViewer.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"stateCapture": "Состояние объекта записывается после первого вычисления",
-	"replVariableAriaLabel": "Переменная \"{0}\" имеет значение \"{1}\", read–eval–print loop, отладка",
-	"replExpressionAriaLabel": "Выражение \"{0}\" имеет значение \"{1}\", read–eval–print loop, отладка",
-	"replValueOutputAriaLabel": "{0}, read–eval–print loop, отладка",
-	"replRawObjectAriaLabel": "Переменная REPL \"{0}\" имеет значение \"{1}\", read–eval–print loop, отладка"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/debug/electron-browser/statusbarColorProvider.i18n.json b/i18n/rus/src/vs/workbench/parts/debug/electron-browser/statusbarColorProvider.i18n.json
deleted file mode 100644
index 6c1558c0034..00000000000
--- a/i18n/rus/src/vs/workbench/parts/debug/electron-browser/statusbarColorProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"statusBarDebuggingBackground": "Цвет фона панели состояния при отладке программы. Панель состояния показана внизу окна.",
-	"statusBarDebuggingForeground": "Цвет переднего плана строки состояния при отладке программы. Строка состояния расположена в нижней части окна.",
-	"statusBarDebuggingBorder": "Цвет границы строки состояния, который распространяется на боковую панель и редактор при отладке программы. Строка состояния расположена в нижней части окна."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json b/i18n/rus/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json
deleted file mode 100644
index f8d06534f60..00000000000
--- a/i18n/rus/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"debug.terminal.title": "отлаживаемый объект"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/debug/electron-browser/variablesView.i18n.json b/i18n/rus/src/vs/workbench/parts/debug/electron-browser/variablesView.i18n.json
deleted file mode 100644
index f0c7f6b50d2..00000000000
--- a/i18n/rus/src/vs/workbench/parts/debug/electron-browser/variablesView.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"variablesSection": "Раздел переменных",
-	"variablesAriaTreeLabel": "Отладка переменных",
-	"variableValueAriaLabel": "Введите новое значение переменной",
-	"variableScopeAriaLabel": "Область {0}, переменные, отладка",
-	"variableAriaLabel": "{0} значение {1}, переменные, отладка"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/debug/electron-browser/watchExpressionsView.i18n.json b/i18n/rus/src/vs/workbench/parts/debug/electron-browser/watchExpressionsView.i18n.json
deleted file mode 100644
index c1e892ad413..00000000000
--- a/i18n/rus/src/vs/workbench/parts/debug/electron-browser/watchExpressionsView.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"expressionsSection": "Раздел выражений",
-	"watchAriaTreeLabel": "Отладка выражений контрольных значений",
-	"watchExpressionPlaceholder": "Выражение с контрольным значением",
-	"watchExpressionInputAriaLabel": "Введите выражение контрольного значения",
-	"watchExpressionAriaLabel": "{0} значение {1}, контрольное значение, отладка",
-	"watchVariableAriaLabel": "{0} значение {1}, контрольное значение, отладка"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json b/i18n/rus/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
deleted file mode 100644
index 4d4a7ed83f0..00000000000
--- a/i18n/rus/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"debugAdapterBinNotFound": "Исполняемый файл адаптера отладки \"{0}\" не существует.",
-	"debugAdapterCannotDetermineExecutable": "Невозможно определить исполняемый файл для адаптера отладки \"{0}\".",
-	"unableToLaunchDebugAdapter": "Не удается запустить адаптер отладки из \"{0}\".",
-	"unableToLaunchDebugAdapterNoArgs": "Не удается запустить адаптер отладки."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/debug/node/debugger.i18n.json b/i18n/rus/src/vs/workbench/parts/debug/node/debugger.i18n.json
deleted file mode 100644
index 3ac477e5e53..00000000000
--- a/i18n/rus/src/vs/workbench/parts/debug/node/debugger.i18n.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"launch.config.comment1": "Используйте IntelliSense, чтобы узнать о возможных атрибутах.",
-	"launch.config.comment2": "Наведите указатель мыши, чтобы просмотреть описания существующих атрибутов.",
-	"launch.config.comment3": "Для получения дополнительной информации посетите: {0}",
-	"debugType": "Тип конфигурации.",
-	"debugTypeNotRecognised": "Не удается распознать тип отладки. Убедитесь, что соответствующее расширение отладки установлено и включено.",
-	"node2NotSupported": "Значение \"node2\" больше не поддерживается; используйте \"node\" и задайте для атрибута \"protocol\" значение \"inspector\".",
-	"debugName": "Имя конфигурации; отображается в раскрывающемся меню конфигурации запуска.",
-	"debugRequest": "Запросите тип конфигурации. Возможные типы: \"запуск\" и \"подключение\".",
-	"debugServer": "Только для разработки расширений отладки: если указан порт, VS Code пытается подключиться к адаптеру отладки, запущенному в режиме сервера.",
-	"debugPrelaunchTask": "Задача, выполняемая перед началом сеанса отладки.",
-	"debugPostDebugTask": "Задача, которая будет запущена после завершения сеанса отладки.",
-	"debugWindowsConfiguration": "Атрибуты конфигурации запуска для Windows.",
-	"debugOSXConfiguration": "Атрибуты конфигурации запуска для OS X.",
-	"debugLinuxConfiguration": "Атрибуты конфигурации запуска для Linux.",
-	"deprecatedVariables": "\"env.\", \"config.\" и \"command.\" устарели, используйте \"env:\", \"config:\" и \"command:\"."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/debug/node/terminals.i18n.json b/i18n/rus/src/vs/workbench/parts/debug/node/terminals.i18n.json
deleted file mode 100644
index 1402209c14c..00000000000
--- a/i18n/rus/src/vs/workbench/parts/debug/node/terminals.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"console.title": "Консоль VS Code",
-	"mac.terminal.script.failed": "Сбой скрипта \"{0}\" с кодом выхода {1}",
-	"mac.terminal.type.not.supported": "\"{0}\" не поддерживается",
-	"press.any.key": "Для продолжения нажмите любую клавишу...",
-	"linux.term.failed": "Сбой \"{0}\" с кодом выхода {1}"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/emmet/browser/actions/showEmmetCommands.i18n.json b/i18n/rus/src/vs/workbench/parts/emmet/browser/actions/showEmmetCommands.i18n.json
deleted file mode 100644
index 420077f5772..00000000000
--- a/i18n/rus/src/vs/workbench/parts/emmet/browser/actions/showEmmetCommands.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"showEmmetCommands": "Показать команды Emmet"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/emmet/electron-browser/actions/balance.i18n.json b/i18n/rus/src/vs/workbench/parts/emmet/electron-browser/actions/balance.i18n.json
deleted file mode 100644
index 6f2d64eeffb..00000000000
--- a/i18n/rus/src/vs/workbench/parts/emmet/electron-browser/actions/balance.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"balanceInward": "Emmet: баланс (входящий)",
-	"balanceOutward": "Emmet: баланс (исходящий)"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/emmet/electron-browser/actions/editPoints.i18n.json b/i18n/rus/src/vs/workbench/parts/emmet/electron-browser/actions/editPoints.i18n.json
deleted file mode 100644
index c7a704d9506..00000000000
--- a/i18n/rus/src/vs/workbench/parts/emmet/electron-browser/actions/editPoints.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"previousEditPoint": "Emmet: перейти к предыдущей точке изменения",
-	"nextEditPoint": "Emmet: перейти к следующей точке изменения"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/emmet/electron-browser/actions/evaluateMath.i18n.json b/i18n/rus/src/vs/workbench/parts/emmet/electron-browser/actions/evaluateMath.i18n.json
deleted file mode 100644
index 24098651eac..00000000000
--- a/i18n/rus/src/vs/workbench/parts/emmet/electron-browser/actions/evaluateMath.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"evaluateMathExpression": "Emmet: вычисление математического выражения"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/emmet/electron-browser/actions/expandAbbreviation.i18n.json b/i18n/rus/src/vs/workbench/parts/emmet/electron-browser/actions/expandAbbreviation.i18n.json
deleted file mode 100644
index 7521e88e935..00000000000
--- a/i18n/rus/src/vs/workbench/parts/emmet/electron-browser/actions/expandAbbreviation.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"expandAbbreviationAction": "Emmet: расшифровать аббревиатуру"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/emmet/electron-browser/actions/incrementDecrement.i18n.json b/i18n/rus/src/vs/workbench/parts/emmet/electron-browser/actions/incrementDecrement.i18n.json
deleted file mode 100644
index 1befe3f2264..00000000000
--- a/i18n/rus/src/vs/workbench/parts/emmet/electron-browser/actions/incrementDecrement.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"incrementNumberByOneTenth": "Emmet: увеличение значения на 0,1",
-	"incrementNumberByOne": "Emmet: увеличение значения на 1",
-	"incrementNumberByTen": "Emmet: увеличение значения на 10",
-	"decrementNumberByOneTenth": "Emmet: уменьшение значения на 0,1",
-	"decrementNumberByOne": "Emmet: уменьшение значения на 1",
-	"decrementNumberByTen": "Emmet: уменьшение значения на 10"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/emmet/electron-browser/actions/matchingPair.i18n.json b/i18n/rus/src/vs/workbench/parts/emmet/electron-browser/actions/matchingPair.i18n.json
deleted file mode 100644
index 526b5d5303f..00000000000
--- a/i18n/rus/src/vs/workbench/parts/emmet/electron-browser/actions/matchingPair.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"matchingPair": "Emmet: перейти к соответствующей паре"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/emmet/electron-browser/actions/mergeLines.i18n.json b/i18n/rus/src/vs/workbench/parts/emmet/electron-browser/actions/mergeLines.i18n.json
deleted file mode 100644
index 81f00b3edbc..00000000000
--- a/i18n/rus/src/vs/workbench/parts/emmet/electron-browser/actions/mergeLines.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"mergeLines": "Emmet: объединение строк"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/emmet/electron-browser/actions/reflectCssValue.i18n.json b/i18n/rus/src/vs/workbench/parts/emmet/electron-browser/actions/reflectCssValue.i18n.json
deleted file mode 100644
index 4673022a248..00000000000
--- a/i18n/rus/src/vs/workbench/parts/emmet/electron-browser/actions/reflectCssValue.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"reflectCSSValue": "Emmet: отражение значения CSS"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/emmet/electron-browser/actions/removeTag.i18n.json b/i18n/rus/src/vs/workbench/parts/emmet/electron-browser/actions/removeTag.i18n.json
deleted file mode 100644
index 99b383ac902..00000000000
--- a/i18n/rus/src/vs/workbench/parts/emmet/electron-browser/actions/removeTag.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"removeTag": "Emmet: удаление тега"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/emmet/electron-browser/actions/selectItem.i18n.json b/i18n/rus/src/vs/workbench/parts/emmet/electron-browser/actions/selectItem.i18n.json
deleted file mode 100644
index 50ca8bd70b7..00000000000
--- a/i18n/rus/src/vs/workbench/parts/emmet/electron-browser/actions/selectItem.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"selectPreviousItem": "Emmet: выбор предыдущего элемента",
-	"selectNextItem": "Emmet: выбор следующего элемента"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/emmet/electron-browser/actions/splitJoinTag.i18n.json b/i18n/rus/src/vs/workbench/parts/emmet/electron-browser/actions/splitJoinTag.i18n.json
deleted file mode 100644
index b2b30614cea..00000000000
--- a/i18n/rus/src/vs/workbench/parts/emmet/electron-browser/actions/splitJoinTag.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"splitJoinTag": "Emmet: разделение и объединение тегов"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/emmet/electron-browser/actions/toggleComment.i18n.json b/i18n/rus/src/vs/workbench/parts/emmet/electron-browser/actions/toggleComment.i18n.json
deleted file mode 100644
index 0bb940b0c93..00000000000
--- a/i18n/rus/src/vs/workbench/parts/emmet/electron-browser/actions/toggleComment.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"toggleComment": "Emmet: переключение комментариев"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/emmet/electron-browser/actions/updateImageSize.i18n.json b/i18n/rus/src/vs/workbench/parts/emmet/electron-browser/actions/updateImageSize.i18n.json
deleted file mode 100644
index 8c273b41250..00000000000
--- a/i18n/rus/src/vs/workbench/parts/emmet/electron-browser/actions/updateImageSize.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"updateImageSize": "Emmet: изменение размера изображения"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/emmet/electron-browser/actions/updateTag.i18n.json b/i18n/rus/src/vs/workbench/parts/emmet/electron-browser/actions/updateTag.i18n.json
deleted file mode 100644
index 3c3bd54c27a..00000000000
--- a/i18n/rus/src/vs/workbench/parts/emmet/electron-browser/actions/updateTag.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"updateTag": "Emmet: изменение тега",
-	"enterTag": "Ввод тега",
-	"tag": "Тег"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/emmet/electron-browser/actions/wrapWithAbbreviation.i18n.json b/i18n/rus/src/vs/workbench/parts/emmet/electron-browser/actions/wrapWithAbbreviation.i18n.json
deleted file mode 100644
index f493f727ad3..00000000000
--- a/i18n/rus/src/vs/workbench/parts/emmet/electron-browser/actions/wrapWithAbbreviation.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"wrapWithAbbreviationAction": "Emmet: перенос с сокращением",
-	"enterAbbreviation": "Ввод сокращения",
-	"abbreviation": "Сокращение"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/emmet/electron-browser/emmet.contribution.i18n.json b/i18n/rus/src/vs/workbench/parts/emmet/electron-browser/emmet.contribution.i18n.json
deleted file mode 100644
index 41da05e341f..00000000000
--- a/i18n/rus/src/vs/workbench/parts/emmet/electron-browser/emmet.contribution.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"emmetConfigurationTitle": "Emmet",
-	"triggerExpansionOnTab": "Если этот параметр установлен, сокращения Emmet разворачиваются при нажатии клавиши TAB. Не применяется, если параметр emmet.useNewemmet имеет значение 'true'.",
-	"emmetPreferences": "Настройки, которые используются для изменения поведения некоторых действий и сопоставителей Emmet. Не применяется, если параметр emmet.useNewemmet имеет значение 'true'.",
-	"emmetSyntaxProfiles": "Задайте профиль для указанного синтаксиса или используйте свой собственный профиль с определенными правилами.",
-	"emmetExclude": "Массив языков, в которых не должны развертываться сокращения Emmet.",
-	"emmetExtensionsPath": "Путь к папке, содержащей профили Emmet, фрагменты кода и настройки. Если параметр emmet.useNewemmet имеет значение 'true', используются только профили для пути расширения.",
-	"useNewEmmet": "Попробуйте новые модули emmet (которые в конечном итоге заменят устаревшую библиотеку emmet), чтобы ознакомиться со всеми функциями emmet."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/emmet/node/actions/balance.i18n.json b/i18n/rus/src/vs/workbench/parts/emmet/node/actions/balance.i18n.json
deleted file mode 100644
index 6f2d64eeffb..00000000000
--- a/i18n/rus/src/vs/workbench/parts/emmet/node/actions/balance.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"balanceInward": "Emmet: баланс (входящий)",
-	"balanceOutward": "Emmet: баланс (исходящий)"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/emmet/node/actions/editPoints.i18n.json b/i18n/rus/src/vs/workbench/parts/emmet/node/actions/editPoints.i18n.json
deleted file mode 100644
index 4a07fdffeba..00000000000
--- a/i18n/rus/src/vs/workbench/parts/emmet/node/actions/editPoints.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"previousEditPoint": "Emmet: предыдущая точка изменения",
-	"nextEditPoint": "Emmet: следующая точка изменения"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/emmet/node/actions/evaluateMath.i18n.json b/i18n/rus/src/vs/workbench/parts/emmet/node/actions/evaluateMath.i18n.json
deleted file mode 100644
index 24098651eac..00000000000
--- a/i18n/rus/src/vs/workbench/parts/emmet/node/actions/evaluateMath.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"evaluateMathExpression": "Emmet: вычисление математического выражения"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/emmet/node/actions/expandAbbreviation.i18n.json b/i18n/rus/src/vs/workbench/parts/emmet/node/actions/expandAbbreviation.i18n.json
deleted file mode 100644
index 982ec325649..00000000000
--- a/i18n/rus/src/vs/workbench/parts/emmet/node/actions/expandAbbreviation.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"expandAbbreviationAction": "Emmet: расшифровать аббревиатуру"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/emmet/node/actions/incrementDecrement.i18n.json b/i18n/rus/src/vs/workbench/parts/emmet/node/actions/incrementDecrement.i18n.json
deleted file mode 100644
index 1befe3f2264..00000000000
--- a/i18n/rus/src/vs/workbench/parts/emmet/node/actions/incrementDecrement.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"incrementNumberByOneTenth": "Emmet: увеличение значения на 0,1",
-	"incrementNumberByOne": "Emmet: увеличение значения на 1",
-	"incrementNumberByTen": "Emmet: увеличение значения на 10",
-	"decrementNumberByOneTenth": "Emmet: уменьшение значения на 0,1",
-	"decrementNumberByOne": "Emmet: уменьшение значения на 1",
-	"decrementNumberByTen": "Emmet: уменьшение значения на 10"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/emmet/node/actions/matchingPair.i18n.json b/i18n/rus/src/vs/workbench/parts/emmet/node/actions/matchingPair.i18n.json
deleted file mode 100644
index 526b5d5303f..00000000000
--- a/i18n/rus/src/vs/workbench/parts/emmet/node/actions/matchingPair.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"matchingPair": "Emmet: перейти к соответствующей паре"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/emmet/node/actions/mergeLines.i18n.json b/i18n/rus/src/vs/workbench/parts/emmet/node/actions/mergeLines.i18n.json
deleted file mode 100644
index 81f00b3edbc..00000000000
--- a/i18n/rus/src/vs/workbench/parts/emmet/node/actions/mergeLines.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"mergeLines": "Emmet: объединение строк"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/emmet/node/actions/reflectCssValue.i18n.json b/i18n/rus/src/vs/workbench/parts/emmet/node/actions/reflectCssValue.i18n.json
deleted file mode 100644
index 4673022a248..00000000000
--- a/i18n/rus/src/vs/workbench/parts/emmet/node/actions/reflectCssValue.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"reflectCSSValue": "Emmet: отражение значения CSS"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/emmet/node/actions/removeTag.i18n.json b/i18n/rus/src/vs/workbench/parts/emmet/node/actions/removeTag.i18n.json
deleted file mode 100644
index 99b383ac902..00000000000
--- a/i18n/rus/src/vs/workbench/parts/emmet/node/actions/removeTag.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"removeTag": "Emmet: удаление тега"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/emmet/node/actions/selectItem.i18n.json b/i18n/rus/src/vs/workbench/parts/emmet/node/actions/selectItem.i18n.json
deleted file mode 100644
index 50ca8bd70b7..00000000000
--- a/i18n/rus/src/vs/workbench/parts/emmet/node/actions/selectItem.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"selectPreviousItem": "Emmet: выбор предыдущего элемента",
-	"selectNextItem": "Emmet: выбор следующего элемента"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/emmet/node/actions/splitJoinTag.i18n.json b/i18n/rus/src/vs/workbench/parts/emmet/node/actions/splitJoinTag.i18n.json
deleted file mode 100644
index b2b30614cea..00000000000
--- a/i18n/rus/src/vs/workbench/parts/emmet/node/actions/splitJoinTag.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"splitJoinTag": "Emmet: разделение и объединение тегов"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/emmet/node/actions/toggleComment.i18n.json b/i18n/rus/src/vs/workbench/parts/emmet/node/actions/toggleComment.i18n.json
deleted file mode 100644
index 0bb940b0c93..00000000000
--- a/i18n/rus/src/vs/workbench/parts/emmet/node/actions/toggleComment.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"toggleComment": "Emmet: переключение комментариев"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/emmet/node/actions/updateImageSize.i18n.json b/i18n/rus/src/vs/workbench/parts/emmet/node/actions/updateImageSize.i18n.json
deleted file mode 100644
index 8c273b41250..00000000000
--- a/i18n/rus/src/vs/workbench/parts/emmet/node/actions/updateImageSize.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"updateImageSize": "Emmet: изменение размера изображения"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/emmet/node/actions/updateTag.i18n.json b/i18n/rus/src/vs/workbench/parts/emmet/node/actions/updateTag.i18n.json
deleted file mode 100644
index 3c3bd54c27a..00000000000
--- a/i18n/rus/src/vs/workbench/parts/emmet/node/actions/updateTag.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"updateTag": "Emmet: изменение тега",
-	"enterTag": "Ввод тега",
-	"tag": "Тег"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/emmet/node/actions/wrapWithAbbreviation.i18n.json b/i18n/rus/src/vs/workbench/parts/emmet/node/actions/wrapWithAbbreviation.i18n.json
deleted file mode 100644
index f493f727ad3..00000000000
--- a/i18n/rus/src/vs/workbench/parts/emmet/node/actions/wrapWithAbbreviation.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"wrapWithAbbreviationAction": "Emmet: перенос с сокращением",
-	"enterAbbreviation": "Ввод сокращения",
-	"abbreviation": "Сокращение"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/emmet/node/emmet.contribution.i18n.json b/i18n/rus/src/vs/workbench/parts/emmet/node/emmet.contribution.i18n.json
deleted file mode 100644
index b632b35fef6..00000000000
--- a/i18n/rus/src/vs/workbench/parts/emmet/node/emmet.contribution.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"emmetConfigurationTitle": "Emmet",
-	"triggerExpansionOnTab": "Если включено, сокращения Emmet разворачиваются при нажатии клавиши TAB.",
-	"emmetPreferences": "Настройки, которые используются для изменения поведения некоторых действий и сопоставителей Emmet.",
-	"emmetSyntaxProfiles": "Задайте профиль для указанного синтаксиса или используйте свой собственный профиль с определенными правилами.",
-	"emmetExclude": "Массив языков, в которых не должны развертываться сокращения Emmet.",
-	"emmetExtensionsPath": "Путь к папке, содержащей профили Emmet, фрагменты кода и настройки"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json b/i18n/rus/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
deleted file mode 100644
index aed4ddc96e0..00000000000
--- a/i18n/rus/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"terminalConfigurationTitle": "Внешний терминал",
-	"explorer.openInTerminalKind": "Определяет тип терминала, который следует запустить.",
-	"terminal.external.windowsExec": "Настройка терминала, который будет запущен в Windows.",
-	"terminal.external.osxExec": "Настройка приложения терминала для запуска в OS X.",
-	"terminal.external.linuxExec": "Настройка терминала для запуска в Linux.",
-	"globalConsoleActionWin": "Открыть новую командную строку",
-	"globalConsoleActionMacLinux": "Открыть новый терминал",
-	"scopedConsoleActionWin": "Открыть в командной строке",
-	"scopedConsoleActionMacLinux": "Открыть в терминале"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/execution/electron-browser/terminal.contribution.i18n.json b/i18n/rus/src/vs/workbench/parts/execution/electron-browser/terminal.contribution.i18n.json
deleted file mode 100644
index 1c0c2422628..00000000000
--- a/i18n/rus/src/vs/workbench/parts/execution/electron-browser/terminal.contribution.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"terminalConfigurationTitle": "Внешний терминал",
-	"terminal.external.windowsExec": "Настройка терминала, который будет запущен в Windows.",
-	"terminal.external.osxExec": "Настройка приложения терминала для запуска в OS X.",
-	"terminal.external.linuxExec": "Настройка терминала для запуска в Linux.",
-	"globalConsoleActionWin": "Открыть новую командную строку",
-	"globalConsoleActionMacLinux": "Открыть новый терминал",
-	"scopedConsoleActionWin": "Открыть в командной строке",
-	"scopedConsoleActionMacLinux": "Открыть в терминале"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/execution/electron-browser/terminalService.i18n.json b/i18n/rus/src/vs/workbench/parts/execution/electron-browser/terminalService.i18n.json
deleted file mode 100644
index 1402209c14c..00000000000
--- a/i18n/rus/src/vs/workbench/parts/execution/electron-browser/terminalService.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"console.title": "Консоль VS Code",
-	"mac.terminal.script.failed": "Сбой скрипта \"{0}\" с кодом выхода {1}",
-	"mac.terminal.type.not.supported": "\"{0}\" не поддерживается",
-	"press.any.key": "Для продолжения нажмите любую клавишу...",
-	"linux.term.failed": "Сбой \"{0}\" с кодом выхода {1}"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/explorers/browser/treeExplorer.contribution.i18n.json b/i18n/rus/src/vs/workbench/parts/explorers/browser/treeExplorer.contribution.i18n.json
deleted file mode 100644
index 2322bd36fa8..00000000000
--- a/i18n/rus/src/vs/workbench/parts/explorers/browser/treeExplorer.contribution.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"vscode.extension.contributes.view": "Добавляет пользовательское представление",
-	"vscode.extension.contributes.view.id": "Уникальный идентификатор представления, созданного с помощью vscode.workspace.createTreeView",
-	"vscode.extension.contributes.view.label": "Строка для отображения представления в понятном для пользователя формате",
-	"vscode.extension.contributes.view.icon": "Путь к значку представления",
-	"vscode.extension.contributes.views": "Добавляет пользовательские представления",
-	"showViewlet": "Показать {0}",
-	"view": "Просмотреть"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/explorers/browser/treeExplorerActions.i18n.json b/i18n/rus/src/vs/workbench/parts/explorers/browser/treeExplorerActions.i18n.json
deleted file mode 100644
index 3eaef578513..00000000000
--- a/i18n/rus/src/vs/workbench/parts/explorers/browser/treeExplorerActions.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"refresh": "Обновить"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/explorers/browser/treeExplorerService.i18n.json b/i18n/rus/src/vs/workbench/parts/explorers/browser/treeExplorerService.i18n.json
deleted file mode 100644
index d4c16bc33a6..00000000000
--- a/i18n/rus/src/vs/workbench/parts/explorers/browser/treeExplorerService.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"treeExplorer.noMatchingProviderId": "TreeExplorerNodeProvider с идентификатором {providerId} не зарегистрирован."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/explorers/browser/views/treeExplorerView.i18n.json b/i18n/rus/src/vs/workbench/parts/explorers/browser/views/treeExplorerView.i18n.json
deleted file mode 100644
index 8b848ed9c59..00000000000
--- a/i18n/rus/src/vs/workbench/parts/explorers/browser/views/treeExplorerView.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"treeExplorerViewlet.tree": "Раздел обозревателя дерева"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/extensions/browser/dependenciesViewer.i18n.json b/i18n/rus/src/vs/workbench/parts/extensions/browser/dependenciesViewer.i18n.json
deleted file mode 100644
index 5242b6341d0..00000000000
--- a/i18n/rus/src/vs/workbench/parts/extensions/browser/dependenciesViewer.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"error": "Ошибка",
-	"Unknown Dependency": "Неизвестная зависимость:"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json b/i18n/rus/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json
deleted file mode 100644
index 80214fe3339..00000000000
--- a/i18n/rus/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"name": "Имя расширения",
-	"extension id": "Идентификатор расширений",
-	"preview": "Предварительный просмотр",
-	"builtin": "Встроенное",
-	"publisher": "Имя издателя",
-	"install count": "Число установок",
-	"rating": "Оценка",
-	"repository": "Репозиторий",
-	"license": "Лицензия",
-	"details": "Подробности",
-	"contributions": "Вклады",
-	"changelog": "Журнал изменений",
-	"dependencies": "Зависимости",
-	"noReadme": "Файл сведений недоступен.",
-	"noChangelog": "Журнал изменений недоступен.",
-	"noContributions": "Нет публикаций",
-	"noDependencies": "Нет зависимостей",
-	"settings": "Параметры ({0})",
-	"setting name": "Имя",
-	"description": "Описание",
-	"default": "По умолчанию",
-	"debuggers": "Отладчики ({0})",
-	"debugger name": "Имя",
-	"debugger type": "Тип",
-	"views": "Представления ({0})",
-	"view id": "Идентификатор",
-	"view name": "Имя",
-	"view location": "Где",
-	"localizations": "Локализации ({0})",
-	"localizations language id": "Идентификатор языка",
-	"localizations language name": "Название языка",
-	"localizations localized language name": "Название языка (локализованное)",
-	"colorThemes": "Цветовые темы ({0})",
-	"iconThemes": "Темы значков ({0})",
-	"colors": "Цвета ({0})",
-	"colorId": "Идентификатор",
-	"defaultDark": "Темная по умолчанию",
-	"defaultLight": "Светлая по умолчанию",
-	"defaultHC": "С высоким контрастом по умолчанию",
-	"JSON Validation": "Проверка JSON ({0})",
-	"fileMatch": "Сопоставление файла",
-	"schema": "Схема",
-	"commands": "Команды ({0})",
-	"command name": "Имя",
-	"keyboard shortcuts": "Сочетания клавиш",
-	"menuContexts": "Контексты меню",
-	"languages": "Языки ({0})",
-	"language id": "Идентификатор",
-	"language name": "Имя",
-	"file extensions": "Расширения файлов",
-	"grammar": "Грамматика",
-	"snippets": "Фрагменты"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json b/i18n/rus/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
deleted file mode 100644
index bd475832dcf..00000000000
--- a/i18n/rus/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
+++ /dev/null
@@ -1,81 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"download": "Скачать вручную",
-	"install vsix": "После скачивания установите загруженный VSIX '{0}' вручную.",
-	"installAction": "Установить",
-	"installing": "Идет установка",
-	"failedToInstall": "Не удалось установить \"{0}\".",
-	"uninstallAction": "Удаление",
-	"Uninstalling": "Идет удаление",
-	"updateAction": "Обновить",
-	"updateTo": "Обновить до {0}",
-	"failedToUpdate": "Не удалось обновить \"{0}\".",
-	"ManageExtensionAction.uninstallingTooltip": "Идет удаление",
-	"enableForWorkspaceAction": "Включить (рабочая область)",
-	"enableGloballyAction": "Включить",
-	"enableAction": "Включить",
-	"disableForWorkspaceAction": "Отключить (рабочая область)",
-	"disableGloballyAction": "Отключить",
-	"disableAction": "Отключить",
-	"checkForUpdates": "Проверка обновлений",
-	"enableAutoUpdate": "Включить автоматическое обновление расширений",
-	"disableAutoUpdate": "Отключить автоматическое обновление расширений",
-	"updateAll": "Обновить все расширения",
-	"reloadAction": "Перезагрузка",
-	"postUpdateTooltip": "Обновление окна для обновления",
-	"postUpdateMessage": "Обновить это окно, чтобы активировать обновленное расширение \"{0}\"?",
-	"postEnableTooltip": "Обновление для активации",
-	"postEnableMessage": "Обновить это окно, чтобы активировать расширение \"{0}\"?",
-	"postDisableTooltip": "Перезагрузка для деактивации",
-	"postDisableMessage": "Обновить это окно, чтобы отключить расширение \"{0}\"?",
-	"postUninstallTooltip": "Перезагрузка для деактивации",
-	"postUninstallMessage": "Обновить это окно, чтобы отключить удаленное расширение \"{0}\"?",
-	"toggleExtensionsViewlet": "Показать расширения",
-	"installExtensions": "Установить расширения",
-	"showEnabledExtensions": "Показать включенные расширения",
-	"showInstalledExtensions": "Показать установленные расширения",
-	"showDisabledExtensions": "Показать отключенные расширения",
-	"clearExtensionsInput": "Очистить входные данные расширений",
-	"showBuiltInExtensions": "Показать встроенные расширения",
-	"showOutdatedExtensions": "Показать устаревшие расширения",
-	"showPopularExtensions": "Показать популярные расширения",
-	"showRecommendedExtensions": "Показать рекомендуемые расширения",
-	"installWorkspaceRecommendedExtensions": "Установить все рекомендуемые расширения рабочей области",
-	"allExtensionsInstalled": "Все рекомендуемые расширения для этой рабочей области уже установлены",
-	"installRecommendedExtension": "Установить рекомендуемое расширение",
-	"extensionInstalled": "Рекомендуемое расширение уже установлено",
-	"showRecommendedKeymapExtensionsShort": "Раскладки клавиатуры",
-	"showLanguageExtensionsShort": "Расширения языка",
-	"showAzureExtensionsShort": "Расширения Azure",
-	"OpenExtensionsFile.failed": "Не удается создать файл \"extensions.json\" в папке \".vscode\" ({0}).",
-	"configureWorkspaceRecommendedExtensions": "Настроить рекомендуемые расширения (рабочая область)",
-	"configureWorkspaceFolderRecommendedExtensions": "Настроить рекомендуемые расширения (папка рабочей области)",
-	"malicious tooltip": "Это расширение помечено как проблемное.",
-	"malicious": "Вредоносный",
-	"disabled": "Отключено",
-	"disabled globally": "Отключено",
-	"disabled workspace": "Отключено для этой рабочей области",
-	"disableAll": "Отключить все установленные расширения",
-	"disableAllWorkspace": "Отключить все установленные расширения для этой рабочей области",
-	"enableAll": "Включить все расширения",
-	"enableAllWorkspace": "Включить все расширения для этой рабочей области",
-	"openExtensionsFolder": "Открыть папку расширений",
-	"installVSIX": "Установка из VSIX...",
-	"installFromVSIX": "Установить из VSIX",
-	"installButton": "&&Установить",
-	"InstallVSIXAction.success": "Расширение успешно установлено. Для его включения требуется перезапуск.",
-	"InstallVSIXAction.reloadNow": "Перезагрузить",
-	"reinstall": "Переустановить расширение...",
-	"selectExtension": "Выберите расширение для повторной установки",
-	"ReinstallAction.success": "Повторная установка расширения успешно выполнена.",
-	"ReinstallAction.reloadNow": "Перезагрузить",
-	"extensionButtonProminentBackground": "Цвет фона кнопок, соответствующих основным действиям расширения (например, кнопка \"Установить\").",
-	"extensionButtonProminentForeground": "Цвет переднего плана кнопок, соответствующих основным действиям расширения (например, кнопка \"Установить\").",
-	"extensionButtonProminentHoverBackground": "Цвет фона кнопок, соответствующих основным действиям расширения, при наведении мыши (например, кнопка \"Установить\")."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/extensions/browser/extensionsList.i18n.json b/i18n/rus/src/vs/workbench/parts/extensions/browser/extensionsList.i18n.json
deleted file mode 100644
index 7c1105b7ad4..00000000000
--- a/i18n/rus/src/vs/workbench/parts/extensions/browser/extensionsList.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"recommended": "Рекомендуемое"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/extensions/browser/extensionsQuickOpen.i18n.json b/i18n/rus/src/vs/workbench/parts/extensions/browser/extensionsQuickOpen.i18n.json
deleted file mode 100644
index 4981c77a46f..00000000000
--- a/i18n/rus/src/vs/workbench/parts/extensions/browser/extensionsQuickOpen.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"manage": "Нажмите клавишу ВВОД для управления расширениями.",
-	"notfound": "Расширение '{0}' не найдено в Marketplace.",
-	"install": "Чтобы установить '{0}' из Marketplace, нажмите клавишу ВВОД.",
-	"searchFor": "Нажмите клавишу ВВОД для поиска \"{0}\" в Marketplace.",
-	"noExtensionsToInstall": "Введите имя расширения"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/extensions/browser/extensionsWidgets.i18n.json b/i18n/rus/src/vs/workbench/parts/extensions/browser/extensionsWidgets.i18n.json
deleted file mode 100644
index 5b792d74f3b..00000000000
--- a/i18n/rus/src/vs/workbench/parts/extensions/browser/extensionsWidgets.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"ratedByUsers": "Оценено пользователями: {0} ",
-	"ratedBySingleUser": "Оценено 1 пользователем"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/extensions/common/extensionsFileTemplate.i18n.json b/i18n/rus/src/vs/workbench/parts/extensions/common/extensionsFileTemplate.i18n.json
deleted file mode 100644
index dba59b9c704..00000000000
--- a/i18n/rus/src/vs/workbench/parts/extensions/common/extensionsFileTemplate.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"app.extensions.json.title": "Расширения",
-	"app.extensions.json.recommendations": "Список рекомендаций по расширениям. Идентификатор расширения — всегда \"${publisher}.${name}\". Например, \"vscode.csharp\".",
-	"app.extension.identifier.errorMessage": "Ожидается формат \"${publisher}.${name}\". Пример: \"vscode.csharp\"."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/extensions/common/extensionsInput.i18n.json b/i18n/rus/src/vs/workbench/parts/extensions/common/extensionsInput.i18n.json
deleted file mode 100644
index 3731d04e243..00000000000
--- a/i18n/rus/src/vs/workbench/parts/extensions/common/extensionsInput.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"extensionsInputName": "Расширение: {0}"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json b/i18n/rus/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
deleted file mode 100644
index f164fde4366..00000000000
--- a/i18n/rus/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
+++ /dev/null
@@ -1,69 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"name": "Имя расширения",
-	"extension id": "Идентификатор расширений",
-	"preview": "Предварительный просмотр",
-	"builtin": "Встроенное",
-	"publisher": "Имя издателя",
-	"install count": "Число установок",
-	"rating": "Оценка",
-	"repository": "Репозиторий",
-	"license": "Лицензия",
-	"details": "Подробности",
-	"detailstooltip": "Сведения о расширении, полученные из файла 'README.md' расширения",
-	"contributions": "Вклады",
-	"contributionstooltip": "Выводит список изменений в VS Code для этого расширения",
-	"changelog": "Журнал изменений",
-	"changelogtooltip": "История обновления расширения, полученная из файла 'CHANGELOG.md' расширения",
-	"dependencies": "Зависимости",
-	"dependenciestooltip": "Выводит список расширений, от которых зависит это расширение",
-	"noReadme": "Файл сведений недоступен.",
-	"noChangelog": "Журнал изменений недоступен.",
-	"noContributions": "Нет публикаций",
-	"noDependencies": "Нет зависимостей",
-	"settings": "Параметры ({0})",
-	"setting name": "Имя",
-	"description": "Описание",
-	"default": "По умолчанию",
-	"debuggers": "Отладчики ({0})",
-	"debugger name": "Имя",
-	"debugger type": "Тип",
-	"viewContainers": "Просмотреть контейнеры ({0})",
-	"view container id": "Идентификатор",
-	"view container title": "Название",
-	"view container location": "Где",
-	"views": "Представления ({0})",
-	"view id": "Идентификатор",
-	"view name": "Имя",
-	"view location": "Где",
-	"localizations": "Локализации ({0})",
-	"localizations language id": "Идентификатор языка",
-	"localizations language name": "Название языка",
-	"localizations localized language name": "Название языка (локализованное)",
-	"colorThemes": "Цветовые темы ({0})",
-	"iconThemes": "Темы значков ({0})",
-	"colors": "Цвета ({0})",
-	"colorId": "Идентификатор",
-	"defaultDark": "Темная по умолчанию",
-	"defaultLight": "Светлая по умолчанию",
-	"defaultHC": "С высоким контрастом по умолчанию",
-	"JSON Validation": "Проверка JSON ({0})",
-	"fileMatch": "Сопоставление файла",
-	"schema": "Схема",
-	"commands": "Команды ({0})",
-	"command name": "Имя",
-	"keyboard shortcuts": "Сочетания клавиш",
-	"menuContexts": "Контексты меню",
-	"languages": "Языки ({0})",
-	"language id": "Идентификатор",
-	"language name": "Имя",
-	"file extensions": "Расширения файлов",
-	"grammar": "Грамматика",
-	"snippets": "Фрагменты"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/extensions/electron-browser/extensionProfileService.i18n.json b/i18n/rus/src/vs/workbench/parts/extensions/electron-browser/extensionProfileService.i18n.json
deleted file mode 100644
index 6ecb81772e0..00000000000
--- a/i18n/rus/src/vs/workbench/parts/extensions/electron-browser/extensionProfileService.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"restart1": "Расширения профиля",
-	"restart2": "Для профилирования расширений требуется перезапуск. Вы действительно хотите перезапустить \"{0}\" сейчас?",
-	"restart3": "Перезапустить",
-	"cancel": "Отмена",
-	"selectAndStartDebug": "Щелкните здесь, чтобы остановить профилирование."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json b/i18n/rus/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
deleted file mode 100644
index 11278b85abb..00000000000
--- a/i18n/rus/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"neverShowAgain": "Больше не показывать",
-	"searchMarketplace": "Поиск в Marketplace",
-	"dynamicWorkspaceRecommendation": "Это расширение может вас заинтересовать, потому что оно популярно среди пользователей репозитория {0}.",
-	"exeBasedRecommendation": "Рекомендуется использовать это расширение, так как установлено {0}.",
-	"fileBasedRecommendation": "Рекомендуется использовать это расширение (на основе недавно открытых файлов).",
-	"workspaceRecommendation": "Это расширение рекомендуется пользователями текущей рабочей области.",
-	"reallyRecommended2": "Для этого типа файлов рекомендуется использовать расширение '{0}'.",
-	"reallyRecommendedExtensionPack": "Для этого типа файлов рекомендуется использовать пакет расширений '{0}'.",
-	"install": "Установить",
-	"showRecommendations": "Показать рекомендации",
-	"showLanguageExtensions": "В Marketplace есть расширения для работы с файлами '.{0}'",
-	"workspaceRecommended": "Эта рабочая область включает рекомендации по расширениям.",
-	"installAll": "Установить все",
-	"ignoreExtensionRecommendations": "Вы действительно хотите проигнорировать все рекомендации по расширениям?",
-	"ignoreAll": "Да, игнорировать все",
-	"no": "Нет"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/extensions/electron-browser/extensions.contribution.i18n.json b/i18n/rus/src/vs/workbench/parts/extensions/electron-browser/extensions.contribution.i18n.json
deleted file mode 100644
index 1afe3284b6e..00000000000
--- a/i18n/rus/src/vs/workbench/parts/extensions/electron-browser/extensions.contribution.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"extensionsCommands": "Управление расширениями",
-	"galleryExtensionsCommands": "Установить расширения из коллекции",
-	"extension": "Расширение",
-	"runtimeExtension": "Запущенные расширения",
-	"extensions": "Расширения",
-	"view": "Просмотреть",
-	"developer": "Разработчик",
-	"extensionsConfigurationTitle": "Расширения",
-	"extensionsAutoUpdate": "Автоматически обновлять расширения",
-	"extensionsIgnoreRecommendations": "Если этот параметр установлен в значение true, оповещения о рекомендациях по расширениям перестанут отображаться.",
-	"extensionsShowRecommendationsOnlyOnDemand": "Если этот параметр установлен в true, рекомендации не будут извлекаться или отображаться до тех пор, пока пользователь не откроет их явно."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.i18n.json b/i18n/rus/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.i18n.json
deleted file mode 100644
index e4f4310c781..00000000000
--- a/i18n/rus/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openExtensionsFolder": "Открыть папку расширений",
-	"installVSIX": "Установка из VSIX...",
-	"installFromVSIX": "Установить из VSIX",
-	"installButton": "&&Установить",
-	"InstallVSIXAction.reloadNow": "Перезагрузить"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/extensions/electron-browser/extensionsUtils.i18n.json b/i18n/rus/src/vs/workbench/parts/extensions/electron-browser/extensionsUtils.i18n.json
deleted file mode 100644
index dbb0453fcc6..00000000000
--- a/i18n/rus/src/vs/workbench/parts/extensions/electron-browser/extensionsUtils.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"disableOtherKeymapsConfirmation": "Отключить другие раскладки клавиатуры ({0}), чтобы избежать конфликта между настраиваемыми сочетаниями клавиш?",
-	"yes": "Да",
-	"no": "Нет"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json b/i18n/rus/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
deleted file mode 100644
index 2237c231d50..00000000000
--- a/i18n/rus/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"marketPlace": "Marketplace",
-	"installedExtensions": "Установлено",
-	"searchInstalledExtensions": "Установлено",
-	"recommendedExtensions": "Рекомендуемое",
-	"otherRecommendedExtensions": "Другие рекомендации",
-	"workspaceRecommendedExtensions": "Рекомендации рабочей области",
-	"builtInExtensions": "Функции",
-	"builtInThemesExtensions": "Темы",
-	"builtInBasicsExtensions": "Языки программирования",
-	"searchExtensions": "Поиск расширений в Marketplace",
-	"sort by installs": "Сортировать по: числу установок",
-	"sort by rating": "Сортировать по: рейтинг",
-	"sort by name": "Сортировать по: название",
-	"suggestProxyError": "Marketplace вернул значение \"ECONNREFUSED\". Проверьте параметр \"http.proxy\".",
-	"extensions": "Расширения",
-	"outdatedExtensions": "Устаревшие расширения: {0}",
-	"malicious warning": "Мы удалили расширение '{0}', которое вызывало проблемы.",
-	"reloadNow": "Перезагрузить"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/extensions/electron-browser/extensionsViews.i18n.json b/i18n/rus/src/vs/workbench/parts/extensions/electron-browser/extensionsViews.i18n.json
deleted file mode 100644
index 6518c5dfd48..00000000000
--- a/i18n/rus/src/vs/workbench/parts/extensions/electron-browser/extensionsViews.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"extensions": "Расширения",
-	"no extensions found": "Расширений не найдено.",
-	"suggestProxyError": "Marketplace вернул значение \"ECONNREFUSED\". Проверьте параметр \"http.proxy\"."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/extensions/electron-browser/keymapExtensions.i18n.json b/i18n/rus/src/vs/workbench/parts/extensions/electron-browser/keymapExtensions.i18n.json
deleted file mode 100644
index 906d10fee6b..00000000000
--- a/i18n/rus/src/vs/workbench/parts/extensions/electron-browser/keymapExtensions.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"disableOtherKeymapsConfirmation": "Отключить другие раскладки клавиатуры, чтобы избежать конфликта между настраиваемыми сочетаниями клавиш?",
-	"yes": "Да",
-	"no": "Нет"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/extensions/electron-browser/runtimeExtensionsEditor.i18n.json b/i18n/rus/src/vs/workbench/parts/extensions/electron-browser/runtimeExtensionsEditor.i18n.json
deleted file mode 100644
index acd05048f3a..00000000000
--- a/i18n/rus/src/vs/workbench/parts/extensions/electron-browser/runtimeExtensionsEditor.i18n.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"starActivation": "Активируется при запуске",
-	"workspaceContainsGlobActivation": "Активируется, так как соответствующий файл {0} отсутствует в вашей рабочей области",
-	"workspaceContainsFileActivation": "Активируется, так как файл {0} отсутствует в вашей рабочей области",
-	"languageActivation": "Активируется, так как был открыт файл {0}",
-	"workspaceGenericActivation": "Активируется при {0}",
-	"errors": "Необработанных ошибок: {0}",
-	"extensionsInputName": "Запущенные расширения",
-	"showRuntimeExtensions": "Показать запущенные расширения",
-	"reportExtensionIssue": "Сообщить об ошибке",
-	"extensionHostProfileStart": "Запустить профиль узла расширения",
-	"extensionHostProfileStop": "Остановить профиль узла расширения",
-	"saveExtensionHostProfile": "Сохранить профиль узла расширения"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.i18n.json b/i18n/rus/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.i18n.json
deleted file mode 100644
index 0a02049f6be..00000000000
--- a/i18n/rus/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.i18n.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"installingVSIXExtension": "Установка расширений из VSIX...",
-	"malicious": "Это расширение помечено как проблемное.",
-	"installingMarketPlaceExtension": "Установка расширения из Marketplace...",
-	"uninstallingExtension": "Удаление расширения...",
-	"enableDependeciesConfirmation": "При включении расширения также будут включены его зависимости. Вы действительно хотите продолжить?",
-	"enable": "Да",
-	"doNotEnable": "Нет",
-	"disableDependeciesConfirmation": "Вы хотели бы также отключить зависимости расширения?",
-	"yes": "Да",
-	"no": "Нет",
-	"cancel": "Отмена",
-	"singleDependentError": "Невозможно отключить расширение \"{0}\". От него зависит расширение \"{1}\".",
-	"twoDependentsError": "Невозможно отключить расширение \"{0}\". От него зависят расширения \"{1}\" и \"{2}\".",
-	"multipleDependentsError": "Невозможно отключить расширение \"{0}\". От него зависят расширения \"{1}\", \"{2}\" и другие.",
-	"installConfirmation": "Вы хотите установить расширение '{0}'?",
-	"install": "Установить"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json b/i18n/rus/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json
deleted file mode 100644
index a559dd5de9c..00000000000
--- a/i18n/rus/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"workbenchConfigurationTitle": "Рабочее место",
-	"feedbackVisibility": "Определяет, отображается ли отзыв Twitter (смайлик) на панели состояния в нижней части рабочего места."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/feedback/electron-browser/feedback.i18n.json b/i18n/rus/src/vs/workbench/parts/feedback/electron-browser/feedback.i18n.json
deleted file mode 100644
index e0dd8cc5cc0..00000000000
--- a/i18n/rus/src/vs/workbench/parts/feedback/electron-browser/feedback.i18n.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"sendFeedback": "Отправить твит с отзывом",
-	"label.sendASmile": "Отправьте нам твит со своим отзывом.",
-	"patchedVersion1": "Установка повреждена.",
-	"patchedVersion2": "Сообщите об этом при отправке ошибки.",
-	"sentiment": "Каковы ваши впечатления?",
-	"smileCaption": "Хорошо",
-	"frownCaption": "Плохо",
-	"other ways to contact us": "Другие способы связаться с нами",
-	"submit a bug": "Сообщить об ошибке",
-	"request a missing feature": "Запросить отсутствующую возможность",
-	"tell us why?": "Расскажите нам о причинах",
-	"commentsHeader": "Комментарии",
-	"showFeedback": "Отображать смайлик отзыва в строке состояния",
-	"tweet": "Твит",
-	"character left": "символ остался",
-	"characters left": "симв. осталось",
-	"feedbackSending": "Отправляется",
-	"feedbackSent": "Спасибо",
-	"feedbackSendingError": "Повторите попытку"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json b/i18n/rus/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json
deleted file mode 100644
index 956ea0325cf..00000000000
--- a/i18n/rus/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hide": "Скрыть"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/files/browser/editors/binaryFileEditor.i18n.json b/i18n/rus/src/vs/workbench/parts/files/browser/editors/binaryFileEditor.i18n.json
deleted file mode 100644
index 559f6a491e5..00000000000
--- a/i18n/rus/src/vs/workbench/parts/files/browser/editors/binaryFileEditor.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"binaryFileEditor": "Средство просмотра двоичных файлов"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/files/browser/editors/textFileEditor.i18n.json b/i18n/rus/src/vs/workbench/parts/files/browser/editors/textFileEditor.i18n.json
deleted file mode 100644
index ffe2bcbd534..00000000000
--- a/i18n/rus/src/vs/workbench/parts/files/browser/editors/textFileEditor.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"textFileEditor": "Редактор текстовых файлов",
-	"createFile": "Создать файл",
-	"relaunchWithIncreasedMemoryLimit": "Перезапустить с объемом памяти {0} МБ",
-	"configureMemoryLimit": "Настроить ограничение памяти",
-	"fileEditorWithInputAriaLabel": "{0}. Редактор текстовых файлов.",
-	"fileEditorAriaLabel": "Редактор текстовых файлов."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/files/browser/explorerViewlet.i18n.json b/i18n/rus/src/vs/workbench/parts/files/browser/explorerViewlet.i18n.json
deleted file mode 100644
index a01d559fbf1..00000000000
--- a/i18n/rus/src/vs/workbench/parts/files/browser/explorerViewlet.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"folders": "Папки"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/files/browser/fileActions.contribution.i18n.json b/i18n/rus/src/vs/workbench/parts/files/browser/fileActions.contribution.i18n.json
deleted file mode 100644
index 821930bfc87..00000000000
--- a/i18n/rus/src/vs/workbench/parts/files/browser/fileActions.contribution.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"filesCategory": "Файл",
-	"revealInSideBar": "Показать в боковой панели",
-	"acceptLocalChanges": "Использовать изменения и перезаписать содержимое диска",
-	"revertLocalChanges": "Отменить изменения и вернуться к содержимому на диске"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/files/browser/fileActions.i18n.json b/i18n/rus/src/vs/workbench/parts/files/browser/fileActions.i18n.json
deleted file mode 100644
index 12bee9cd2a3..00000000000
--- a/i18n/rus/src/vs/workbench/parts/files/browser/fileActions.i18n.json
+++ /dev/null
@@ -1,73 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"retry": "Повторить попытку",
-	"rename": "Переименовать",
-	"newFile": "Создать файл",
-	"newFolder": "Создать папку",
-	"openFolderFirst": "Сначала откройте папку, в которой будут созданы файлы и папки.",
-	"newUntitledFile": "Новый файл без имени",
-	"createNewFile": "Создать файл",
-	"createNewFolder": "Создать папку",
-	"deleteButtonLabelRecycleBin": "&&Переместить в корзину",
-	"deleteButtonLabelTrash": "&&Переместить в удаленные",
-	"deleteButtonLabel": "&&Удалить",
-	"dirtyMessageFolderOneDelete": "Вы удаляете папку с несохраненными изменениями в одном файле. Вы хотите продолжить?",
-	"dirtyMessageFolderDelete": "Вы удаляете папку с несохраненными изменениями в нескольких файлах ({0}). Вы хотите продолжить?",
-	"dirtyMessageFileDelete": "Вы удаляете файл с несохраненными изменениями. Вы хотите продолжить?",
-	"dirtyWarning": "Если не сохранить изменения, они будут утеряны.",
-	"confirmMoveTrashMessageFolder": "Вы действительно хотите удалить папку \"{0}\" и ее содержимое?",
-	"confirmMoveTrashMessageFile": "Вы действительно хотите удалить \"{0}\"?",
-	"undoBin": "Вы можете выполнить восстановление из корзины.",
-	"undoTrash": "Вы можете выполнить восстановление из корзины.",
-	"doNotAskAgain": "Больше не спрашивать",
-	"confirmDeleteMessageFolder": "Вы действительно хотите удалить папку \"{0}\" и ее содержимое без возможности восстановления?",
-	"confirmDeleteMessageFile": "Вы действительно хотите удалить \"{0}\" без возможности восстановления?",
-	"irreversible": "Это действие необратимо!",
-	"permDelete": "Удалить навсегда",
-	"delete": "Удалить",
-	"importFiles": "Импорт файлов",
-	"confirmOverwrite": "Файл или папка с таким именем уже существует в конечной папке. Заменить их?",
-	"replaceButtonLabel": "Заменить",
-	"copyFile": "Копировать",
-	"pasteFile": "Вставить",
-	"duplicateFile": "Дублировать",
-	"openToSide": "Открыть сбоку",
-	"compareSource": "Выбрать для сравнения",
-	"globalCompareFile": "Сравнить активный файл с...",
-	"openFileToCompare": "Чтобы сравнить файл с другим файлом, сначала откройте его.",
-	"compareWith": "Сравнить '{0}' с '{1}'",
-	"compareFiles": "Сравнить файлы",
-	"refresh": "Обновить",
-	"save": "Сохранить",
-	"saveAs": "Сохранить как...",
-	"saveAll": "Сохранить все",
-	"saveAllInGroup": "Сохранить все в группе",
-	"saveFiles": "Сохранить все файлы",
-	"revert": "Отменить изменения в файле",
-	"focusOpenEditors": "Фокус на представлении открытых редакторов",
-	"focusFilesExplorer": "Фокус на проводнике",
-	"showInExplorer": "Показать активный файл в боковой панели",
-	"openFileToShow": "Сначала откройте файл для отображения в обозревателе.",
-	"collapseExplorerFolders": "Свернуть папки в проводнике",
-	"refreshExplorer": "Обновить окно проводника",
-	"openFileInNewWindow": "Открыть активный файл в новом окне",
-	"openFileToShowInNewWindow": "Чтобы открыть файл в новом окне, сначала откройте его.",
-	"revealInWindows": "Отобразить в проводнике",
-	"revealInMac": "Отобразить в Finder",
-	"openContainer": "Открыть содержащую папку",
-	"revealActiveFileInWindows": "Отобразить активный файл в проводнике",
-	"revealActiveFileInMac": "Отобразить активный файл в Finder",
-	"openActiveFileContainer": "Открыть папку, содержащую активный файл",
-	"copyPath": "Скопировать путь",
-	"copyPathOfActive": "Копировать путь к активному файлу",
-	"emptyFileNameError": "Необходимо указать имя файла или папки.",
-	"fileNameExistsError": "Файл или папка **{0}** уже существует в данном расположении. Выберите другое имя.",
-	"invalidFileNameError": "Имя **{0}** недопустимо для файла или папки. Выберите другое имя.",
-	"filePathTooLongError": "Из-за использования имени **{0}** путь слишком длинный. Выберите более короткое имя.",
-	"compareWithSaved": "Сравнить активный файл с сохраненным",
-	"modifiedLabel": "{0} (на диске) ↔ {1}"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/files/browser/fileCommands.i18n.json b/i18n/rus/src/vs/workbench/parts/files/browser/fileCommands.i18n.json
deleted file mode 100644
index f51fb88b34b..00000000000
--- a/i18n/rus/src/vs/workbench/parts/files/browser/fileCommands.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"openFileToCopy": "Чтобы скопировать путь к файлу, сначала откройте его",
-	"openFileToReveal": "Чтобы отобразить файл, сначала откройте его"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/files/browser/files.contribution.i18n.json b/i18n/rus/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
deleted file mode 100644
index a4725d2faef..00000000000
--- a/i18n/rus/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
+++ /dev/null
@@ -1,53 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"showExplorerViewlet": "Показать проводник",
-	"explore": "Проводник",
-	"view": "Просмотреть",
-	"textFileEditor": "Редактор текстовых файлов",
-	"binaryFileEditor": "Редактор двоичных файлов",
-	"filesConfigurationTitle": "Файлы",
-	"exclude": "Настройте стандартные маски для исключения файлов и папок. Этот параметр влияет, например, на скрытые и отображаемые файлы в проводнике.",
-	"files.exclude.boolean": "Стандартная маска, соответствующая путям к файлам. Задайте значение true или false, чтобы включить или отключить маску.",
-	"files.exclude.when": "Дополнительная проверка элементов того же уровня соответствующего файла. Используйте $(basename) в качестве переменной для соответствующего имени файла.",
-	"associations": "Настройте сопоставления файлов с языками (например, \"*.extension\": \"html\"). У них будет приоритет перед заданными по умолчанию сопоставлениями установленных языков.",
-	"encoding": "Кодировка по умолчанию, используемая при чтении и записи файлов. Этот параметр также можно настроить для отдельных языков.",
-	"autoGuessEncoding": "Если этот параметр установлен, то при открытии файла будет предпринята попытка определить кодировку символов. Этот параметр также можно настроить для отдельных языков.",
-	"eol": "Символ конца строки по умолчанию. Используйте \\n для LF и \\r\\n для CRLF.",
-	"trimTrailingWhitespace": "Если этот параметр включен, при сохранении файла будут удалены концевые пробелы.",
-	"insertFinalNewline": "Если этот параметр включен, при сохранении файла в его конец вставляется финальная новая строка.",
-	"trimFinalNewlines": "Если этот параметр установлен, то при сохранении файла будут удалены все новые строки за последней новой строкой в конце файла.",
-	"files.autoSave.off": "\"Грязный\" файл не сохраняется автоматически.",
-	"files.autoSave.afterDelay": "\"Грязный\" файл автоматически сохраняется по истечении срока \"files.autoSaveDelay\".",
-	"files.autoSave.onFocusChange": "\"Грязный\" файл автоматически сохраняется при потере фокуса редактором.",
-	"files.autoSave.onWindowChange": "\"Грязный\" файл автоматически сохраняется при потере фокуса окном.",
-	"autoSave": "Управляет автоматическим сохранением \"грязных\" файлов. Допустимые значения: \"{0}\", \"{1}\", \"{2}\" (редактор теряет фокус) и \"{3}\" (окно теряет фокус). Если задано значение \"{4}\", можно настроить задержку в \"files.autoSaveDelay\".",
-	"autoSaveDelay": "Определяет задержку в мс, после которой измененный файл сохраняется автоматически. Действует, только если параметр \"files.autoSave\" имеет значение \"{0}\".",
-	"watcherExclude": "Настройте стандартные маски путей файлов, которые следует исключить из списка отслеживаемых файлов. Пути должны соответствовать полным путям (т.е. для правильного сопоставления необходимо указывать ** в начале неполного пути или указывать полные пути). После изменения этого параметра потребуется перезагрузка. Если отображается сообщение \"Код потребляет большое количество процессорного времени при запуске\" можно исключить большие папки, чтобы уменьшить начальную нагрузку.",
-	"hotExit.off": "Отключите \"горячий\" выход.",
-	"hotExit.onExit": "Функция \"горячий выход\" будет активирована при закрытии приложения, то есть при закрытии последнего окна в Windows или Linux или при активации команды workbench.action.quit (палитра команд, настраиваемое сочетание клавиш, меню). Все окна с резервными копиями будут восстановлены при следующем запуске.",
-	"hotExit.onExitAndWindowClose": "Функция \"горячий выход\" будет активирована при закрытии приложения, то есть при закрытии последнего окна в Windows или Linux или при активации команды workbench.action.quit (с помощью палитры команд, настраиваемого сочетания клавиш или пункта меню), а также для любых окон с открытыми папками независимо от того, является ли это окно последним. Все окна без открытых папок будут восстановлены при следующем запуске. Чтобы восстановить исходное состояние окон с папками, установите параметр \"window.restoreWindows\" в значение \"all\".",
-	"hotExit": "Определяет, запоминаются ли несохраненные файлы между сеансами. В этом случае приглашение на их сохранение при выходе из редактора не появляется.",
-	"useExperimentalFileWatcher": "Использовать новое экспериментальное средство наблюдения за файлами.",
-	"defaultLanguage": "Режим языка по умолчанию, который назначается новым файлам.",
-	"editorConfigurationTitle": "Редактор",
-	"formatOnSave": "Форматирование файла при сохранении. Модуль форматирования должен быть доступен, файл не должен сохраняться автоматически, а работа редактора не должна завершаться.",
-	"explorerConfigurationTitle": "Проводник",
-	"openEditorsVisible": "Число редакторов, отображаемых на панели открытых редакторов. Задайте значение 0, чтобы скрыть панель.",
-	"dynamicHeight": "Определяет, будет ли высота раздела открытых редакторов динамически адаптироваться к количеству элементов.",
-	"autoReveal": "Определяет, будет ли проводник автоматически отображать и выбирать файлы при их открытии.",
-	"enableDragAndDrop": "Определяет, разрешено ли перемещение файлов и папок перетаскиванием в проводнике.",
-	"confirmDragAndDrop": "Определяет, должно ли запрашиваться подтверждение при перемещении файлов и папок в проводнике.",
-	"confirmDelete": "Определяет, должно ли запрашиваться подтверждение при удалении файла в корзину.",
-	"sortOrder.default": "Файлы и папки сортируются по именам в алфавитном порядке. Папки отображаются перед файлами.",
-	"sortOrder.mixed": "Файлы и папки сортируются по именам в алфавитном порядке. Файлы чередуются с папками.",
-	"sortOrder.filesFirst": "Файлы и папки сортируются по именам в алфавитном порядке. Файлы отображаются перед папками. ",
-	"sortOrder.type": "Файлы и папки сортируются по расширениям в алфавитном порядке. Папки отображаются перед файлами.",
-	"sortOrder.modified": "Файлы и папки сортируются по дате последнего изменения в порядке убывания. Папки отображаются перед файлами.",
-	"sortOrder": "Управляет порядком сортировки файлов и папок в проводнике. Наряду с сортировкой по умолчанию можно установить следующие варианты сортировки: 'mixed' (файлы и папки сортируются вместе), 'type' (по типу файла), 'modified' (по дате последнего изменения) и 'filesFirst' (сортировать файлы перед папками).",
-	"explorer.decorations.colors": "Определяет, следует ли использовать цвета в декораторах файла.",
-	"explorer.decorations.badges": "Определяет, следует ли использовать эмблемы в декораторах файла. "
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/files/browser/saveErrorHandler.i18n.json b/i18n/rus/src/vs/workbench/parts/files/browser/saveErrorHandler.i18n.json
deleted file mode 100644
index d5622eec39a..00000000000
--- a/i18n/rus/src/vs/workbench/parts/files/browser/saveErrorHandler.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"userGuide": "Используйте команды на панели инструментов редактора справа для **отмены** изменений или **перезаписи** содержимого на диске с учетом этих изменений",
-	"discard": "Отмена",
-	"overwrite": "Перезаписать",
-	"retry": "Повторить попытку",
-	"readonlySaveError": "Не удалось сохранить \"{0}\": файл защищен от записи. Чтобы снять защиту, нажмите \"Перезаписать\".",
-	"genericSaveError": "Не удалось сохранить \"{0}\": {1}",
-	"staleSaveError": "Не удалось сохранить \"{0}\": содержимое на диске более новое. Чтобы сравнить свою версию с версией на диске, нажмите **Сравнить**.",
-	"compareChanges": "Сравнить",
-	"saveConflictDiffLabel": "{0} (на диске) ↔ {1} (в {2}) - Разрешить конфликт сохранения"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/files/browser/views/emptyView.i18n.json b/i18n/rus/src/vs/workbench/parts/files/browser/views/emptyView.i18n.json
deleted file mode 100644
index 82dd74c7e2d..00000000000
--- a/i18n/rus/src/vs/workbench/parts/files/browser/views/emptyView.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"noWorkspace": "Нет открытой папки",
-	"explorerSection": "Раздел проводника",
-	"noWorkspaceHelp": "Вы еще не добавили папку в рабочую область.",
-	"addFolder": "Добавить папку",
-	"noFolderHelp": "Вы еще не открыли папку.",
-	"openFolder": "Открыть папку"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/files/browser/views/explorerDecorationsProvider.i18n.json b/i18n/rus/src/vs/workbench/parts/files/browser/views/explorerDecorationsProvider.i18n.json
deleted file mode 100644
index 3a4c179faa0..00000000000
--- a/i18n/rus/src/vs/workbench/parts/files/browser/views/explorerDecorationsProvider.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"label": "Проводник",
-	"canNotResolve": "Не удается разрешить папку рабочей области"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/files/browser/views/explorerView.i18n.json b/i18n/rus/src/vs/workbench/parts/files/browser/views/explorerView.i18n.json
deleted file mode 100644
index d89fe12ed35..00000000000
--- a/i18n/rus/src/vs/workbench/parts/files/browser/views/explorerView.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"explorerSection": "Раздел проводника",
-	"treeAriaLabel": "Проводник"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/files/browser/views/explorerViewer.i18n.json b/i18n/rus/src/vs/workbench/parts/files/browser/views/explorerViewer.i18n.json
deleted file mode 100644
index 564af43edc0..00000000000
--- a/i18n/rus/src/vs/workbench/parts/files/browser/views/explorerViewer.i18n.json
+++ /dev/null
@@ -1,19 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"fileInputAriaLabel": "Введите имя файла. Нажмите клавишу ВВОД, чтобы подтвердить введенные данные, или ESCAPE для отмены.",
-	"filesExplorerViewerAriaLabel": "{0}, Проводник",
-	"dropFolders": "Вы хотите добавить папки в рабочую область?",
-	"dropFolder": "Вы хотите добавить папку в рабочую область?",
-	"addFolders": "&&Добавить папки",
-	"addFolder": "&&Добавить папку",
-	"confirmMove": "Вы действительно хотите переместить '{0}'?",
-	"doNotAskAgain": "Больше не спрашивать",
-	"moveButtonLabel": "&&Переместить",
-	"confirmOverwriteMessage": "{0} уже существует в целевой папке. Заменить его?",
-	"irreversible": "Это действие необратимо!",
-	"replaceButtonLabel": "&&Заменить"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/files/browser/views/openEditorsView.i18n.json b/i18n/rus/src/vs/workbench/parts/files/browser/views/openEditorsView.i18n.json
deleted file mode 100644
index 908990efe61..00000000000
--- a/i18n/rus/src/vs/workbench/parts/files/browser/views/openEditorsView.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"openEditors": "Открытые редакторы",
-	"openEditosrSection": "Раздел открытых редакторов",
-	"treeAriaLabel": "Открытые редакторы: список активных файлов",
-	"dirtyCounter": "Не сохранено: {0}"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/files/browser/views/openEditorsViewer.i18n.json b/i18n/rus/src/vs/workbench/parts/files/browser/views/openEditorsViewer.i18n.json
deleted file mode 100644
index 863c0a79ec8..00000000000
--- a/i18n/rus/src/vs/workbench/parts/files/browser/views/openEditorsViewer.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"editorGroupAriaLabel": "{0}, группа редакторов",
-	"openEditorAriaLabel": "{0}, открытый редактор",
-	"saveAll": "Сохранить все",
-	"closeAllUnmodified": "Закрыть без изменений",
-	"closeAll": "Закрыть все",
-	"compareWithSaved": "Сравнить с сохраненным",
-	"close": "Закрыть",
-	"closeOthers": "Закрыть другие"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/files/common/dirtyFilesTracker.i18n.json b/i18n/rus/src/vs/workbench/parts/files/common/dirtyFilesTracker.i18n.json
deleted file mode 100644
index d94fb37ebe7..00000000000
--- a/i18n/rus/src/vs/workbench/parts/files/common/dirtyFilesTracker.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"dirtyFile": "1 несохраненный файл",
-	"dirtyFiles": "Несохраненных файлов: {0}"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/files/common/editors/fileEditorInput.i18n.json b/i18n/rus/src/vs/workbench/parts/files/common/editors/fileEditorInput.i18n.json
deleted file mode 100644
index a6f396bbe8c..00000000000
--- a/i18n/rus/src/vs/workbench/parts/files/common/editors/fileEditorInput.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"orphanedFile": "{0} (deleted from disk)"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/files/electron-browser/explorerViewlet.i18n.json b/i18n/rus/src/vs/workbench/parts/files/electron-browser/explorerViewlet.i18n.json
deleted file mode 100644
index 6325a9f4791..00000000000
--- a/i18n/rus/src/vs/workbench/parts/files/electron-browser/explorerViewlet.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"folders": "Папки"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json b/i18n/rus/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
deleted file mode 100644
index 54559890c50..00000000000
--- a/i18n/rus/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"filesCategory": "Файл",
-	"revealInSideBar": "Показать в боковой панели",
-	"acceptLocalChanges": "Использовать изменения и перезаписать содержимое диска",
-	"revertLocalChanges": "Отменить изменения и вернуться к содержимому на диске",
-	"copyPathOfActive": "Копировать путь к активному файлу",
-	"saveAllInGroup": "Сохранить все в группе",
-	"saveFiles": "Сохранить все файлы",
-	"revert": "Отменить изменения в файле",
-	"compareActiveWithSaved": "Сравнить активный файл с сохраненным",
-	"closeEditor": "Закрыть редактор",
-	"view": "Просмотр",
-	"openToSide": "Открыть сбоку",
-	"revealInWindows": "Отобразить в проводнике",
-	"revealInMac": "Отобразить в Finder",
-	"openContainer": "Открыть содержащую папку",
-	"copyPath": "Скопировать путь",
-	"saveAll": "Сохранить все",
-	"compareWithSaved": "Сравнить с сохраненным",
-	"compareWithSelected": "Сравнить с выбранным",
-	"compareSource": "Выбрать для сравнения",
-	"compareSelected": "Сравнить выбранное",
-	"close": "Закрыть",
-	"closeOthers": "Закрыть другие",
-	"closeSaved": "Закрыть сохраненное",
-	"closeAll": "Закрыть все",
-	"deleteFile": "Удалить навсегда"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json b/i18n/rus/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
deleted file mode 100644
index 2c38d133121..00000000000
--- a/i18n/rus/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
+++ /dev/null
@@ -1,72 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"newFile": "Создать файл",
-	"newFolder": "Создать папку",
-	"rename": "Переименовать",
-	"delete": "Удалить",
-	"copyFile": "Копировать",
-	"pasteFile": "Вставить",
-	"retry": "Повторить попытку",
-	"renameWhenSourcePathIsParentOfTargetError": "Для добавления дочерних элементов к существующей папке используйте команды \"Создать папку\" или \"Создать файл\"",
-	"newUntitledFile": "Новый файл без имени",
-	"createNewFile": "Создать файл",
-	"createNewFolder": "Создать папку",
-	"deleteButtonLabelRecycleBin": "&&Переместить в корзину",
-	"deleteButtonLabelTrash": "&&Переместить в удаленные",
-	"deleteButtonLabel": "&&Удалить",
-	"dirtyMessageFilesDelete": "Вы удаляете файлы с несохраненными изменениями. Вы хотите продолжить?",
-	"dirtyMessageFolderOneDelete": "Вы удаляете папку с несохраненными изменениями в одном файле. Вы хотите продолжить?",
-	"dirtyMessageFolderDelete": "Вы удаляете папку с несохраненными изменениями в нескольких файлах ({0}). Вы хотите продолжить?",
-	"dirtyMessageFileDelete": "Вы удаляете файл с несохраненными изменениями. Вы хотите продолжить?",
-	"dirtyWarning": "Если не сохранить изменения, они будут утеряны.",
-	"undoBin": "Вы можете выполнить восстановление из корзины.",
-	"undoTrash": "Вы можете выполнить восстановление из корзины.",
-	"doNotAskAgain": "Больше не спрашивать",
-	"irreversible": "Это действие необратимо.",
-	"binFailed": "Не удалось выполнить удаление в корзину. Вы хотите выполнить удаление навсегда?",
-	"trashFailed": "Не удалось выполнить удаление в корзину. Вы действительно хотите выполнить удаление навсегда?",
-	"deletePermanentlyButtonLabel": "&&Удалить навсегда",
-	"retryButtonLabel": "&&Повторить",
-	"confirmMoveTrashMessageFilesAndDirectories": "Вы уверены, что вы хотите удалить следующие файлы и каталоги ({0}) и их содержимое?",
-	"confirmMoveTrashMessageMultipleDirectories": "Вы уверены, что вы хотите удалить следующие каталоги ({0}) и их содержимое? ",
-	"confirmMoveTrashMessageMultiple": "Вы действительно хотите удалить следующие файлы ({0})?",
-	"confirmMoveTrashMessageFolder": "Вы действительно хотите удалить папку \"{0}\" и ее содержимое?",
-	"confirmMoveTrashMessageFile": "Вы действительно хотите удалить \"{0}\"?",
-	"confirmDeleteMessageFilesAndDirectories": "Вы уверены, что вы хотите удалить следующие файлы и каталоги ({0}) и их содержимое без возможности восстановления?",
-	"confirmDeleteMessageMultipleDirectories": "Вы уверены, что вы хотите удалить следующие каталоги ({0}) и их содержимое без возможности восстановления? ",
-	"confirmDeleteMessageMultiple": "Вы действительно хотите удалить следующие файлы ({0}) без возможности восстановления?",
-	"confirmDeleteMessageFolder": "Вы действительно хотите удалить папку \"{0}\" и ее содержимое без возможности восстановления?",
-	"confirmDeleteMessageFile": "Вы действительно хотите удалить \"{0}\" без возможности восстановления?",
-	"addFiles": "Добавить файлы",
-	"confirmOverwrite": "Файл или папка с таким именем уже существует в конечной папке. Заменить их?",
-	"replaceButtonLabel": "Заменить",
-	"fileIsAncestor": "Файл для вставки является предком папки назначения",
-	"fileDeleted": "Файл для вставки был удален или перемещен в другое место",
-	"duplicateFile": "Дублировать",
-	"globalCompareFile": "Сравнить активный файл с...",
-	"openFileToCompare": "Чтобы сравнить файл с другим файлом, сначала откройте его.",
-	"refresh": "Обновить",
-	"saveAllInGroup": "Сохранить все в группе",
-	"focusOpenEditors": "Фокус на представлении открытых редакторов",
-	"focusFilesExplorer": "Фокус на проводнике",
-	"showInExplorer": "Показать активный файл в боковой панели",
-	"openFileToShow": "Сначала откройте файл для отображения в обозревателе.",
-	"collapseExplorerFolders": "Свернуть папки в проводнике",
-	"refreshExplorer": "Обновить окно проводника",
-	"openFileInNewWindow": "Открыть активный файл в новом окне",
-	"openFileToShowInNewWindow": "Чтобы открыть файл в новом окне, сначала откройте его.",
-	"copyPath": "Скопировать путь",
-	"emptyFileNameError": "Необходимо указать имя файла или папки.",
-	"fileNameStartsWithSlashError": "Имя папки или файла не может начинаться с косой черты.",
-	"fileNameExistsError": "Файл или папка **{0}** уже существует в данном расположении. Выберите другое имя.",
-	"invalidFileNameError": "Имя **{0}** недопустимо для файла или папки. Выберите другое имя.",
-	"filePathTooLongError": "Из-за использования имени **{0}** путь слишком длинный. Выберите более короткое имя.",
-	"compareWithClipboard": "Сравнить активный файл с буфером обмена",
-	"clipboardComparisonLabel": "Буфер обмена ↔ {0}"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json b/i18n/rus/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
deleted file mode 100644
index 0f4e31686b5..00000000000
--- a/i18n/rus/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"revealInWindows": "Отобразить в проводнике",
-	"revealInMac": "Отобразить в Finder",
-	"openContainer": "Открыть содержащую папку",
-	"saveAs": "Сохранить как...",
-	"save": "Сохранить",
-	"saveAll": "Сохранить все",
-	"removeFolderFromWorkspace": "Удалить папку из рабочей области",
-	"genericRevertError": "Не удалось отменить изменения \"{0}\": {1}",
-	"modifiedLabel": "{0} (на диске) ↔ {1}",
-	"openFileToReveal": "Чтобы отобразить файл, сначала откройте его",
-	"openFileToCopy": "Чтобы скопировать путь к файлу, сначала откройте его"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json b/i18n/rus/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
deleted file mode 100644
index 8abc8c89790..00000000000
--- a/i18n/rus/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"showExplorerViewlet": "Показать проводник",
-	"explore": "Проводник",
-	"view": "Просмотр",
-	"textFileEditor": "Редактор текстовых файлов",
-	"binaryFileEditor": "Редактор двоичных файлов",
-	"filesConfigurationTitle": "Файлы",
-	"exclude": "Настройте стандартные маски для исключения файлов и папок. Этот параметр влияет, например, на скрытые и отображаемые файлы в проводнике.",
-	"files.exclude.boolean": "Стандартная маска, соответствующая путям к файлам. Задайте значение true или false, чтобы включить или отключить маску.",
-	"files.exclude.when": "Дополнительная проверка элементов того же уровня соответствующего файла. Используйте $(basename) в качестве переменной для соответствующего имени файла.",
-	"associations": "Настройте сопоставления файлов с языками (например, \"*.extension\": \"html\"). У них будет приоритет перед заданными по умолчанию сопоставлениями установленных языков.",
-	"encoding": "Кодировка по умолчанию, используемая при чтении и записи файлов. Этот параметр также можно настроить для отдельных языков.",
-	"autoGuessEncoding": "Если этот параметр установлен, то при открытии файла будет предпринята попытка определить кодировку символов. Этот параметр также можно настроить для отдельных языков.",
-	"eol": "Символ конца строки по умолчанию. Используйте \\n для LF и \\r\\n для CRLF.",
-	"trimTrailingWhitespace": "Если этот параметр включен, при сохранении файла будут удалены концевые пробелы.",
-	"insertFinalNewline": "Если этот параметр включен, при сохранении файла в его конец вставляется финальная новая строка.",
-	"trimFinalNewlines": "Если этот параметр установлен, то при сохранении файла будут удалены все новые строки за последней новой строкой в конце файла.",
-	"files.autoSave.off": "\"Грязный\" файл не сохраняется автоматически.",
-	"files.autoSave.afterDelay": "\"Грязный\" файл автоматически сохраняется по истечении срока \"files.autoSaveDelay\".",
-	"files.autoSave.onFocusChange": "\"Грязный\" файл автоматически сохраняется при потере фокуса редактором.",
-	"files.autoSave.onWindowChange": "\"Грязный\" файл автоматически сохраняется при потере фокуса окном.",
-	"autoSave": "Управляет автоматическим сохранением \"грязных\" файлов. Допустимые значения: \"{0}\", \"{1}\", \"{2}\" (редактор теряет фокус) и \"{3}\" (окно теряет фокус). Если задано значение \"{4}\", можно настроить задержку в \"files.autoSaveDelay\".",
-	"autoSaveDelay": "Определяет задержку в мс, после которой измененный файл сохраняется автоматически. Действует, только если параметр \"files.autoSave\" имеет значение \"{0}\".",
-	"watcherExclude": "Настройте стандартные маски путей файлов, которые следует исключить из списка отслеживаемых файлов. Пути должны соответствовать полным путям (т.е. для правильного сопоставления необходимо указывать ** в начале неполного пути или указывать полные пути). После изменения этого параметра потребуется перезагрузка. Если отображается сообщение \"Код потребляет большое количество процессорного времени при запуске\" можно исключить большие папки, чтобы уменьшить начальную нагрузку.",
-	"hotExit.off": "Отключите \"горячий\" выход.",
-	"hotExit.onExit": "Функция \"горячий выход\" будет активирована при закрытии приложения, то есть при закрытии последнего окна в Windows или Linux или при активации команды workbench.action.quit (палитра команд, настраиваемое сочетание клавиш, меню). Все окна с резервными копиями будут восстановлены при следующем запуске.",
-	"hotExit.onExitAndWindowClose": "Функция \"горячий выход\" будет активирована при закрытии приложения, то есть при закрытии последнего окна в Windows или Linux или при активации команды workbench.action.quit (с помощью палитры команд, настраиваемого сочетания клавиш или пункта меню), а также для любых окон с открытыми папками независимо от того, является ли это окно последним. Все окна без открытых папок будут восстановлены при следующем запуске. Чтобы восстановить исходное состояние окон с папками, установите параметр \"window.restoreWindows\" в значение \"all\".",
-	"hotExit": "Определяет, запоминаются ли несохраненные файлы между сеансами. В этом случае приглашение на их сохранение при выходе из редактора не появляется.",
-	"useExperimentalFileWatcher": "Использовать новое экспериментальное средство наблюдения за файлами.",
-	"defaultLanguage": "Режим языка по умолчанию, который назначается новым файлам.",
-	"maxMemoryForLargeFilesMB": "Управляет объемом памяти, который доступен VS Code после перезапуска при попытке открытия больших файлов. Действие этого параметра аналогично указанию параметра --max-memory=<новый размер> в командной строке.",
-	"editorConfigurationTitle": "Редактор",
-	"formatOnSave": "Форматирование файла при сохранении. Модуль форматирования должен быть доступен, файл не должен сохраняться автоматически, а работа редактора не должна завершаться.",
-	"formatOnSaveTimeout": "Время ожидания форматирования при сохранении. Указывает ограничение времени в миллисекундах для команд форматирования при сохранении. Команды, выполнение которых превышает указанное время ожидания, будут отменены.",
-	"explorerConfigurationTitle": "Проводник",
-	"openEditorsVisible": "Число редакторов, отображаемых на панели \"Открытые редакторы\".",
-	"autoReveal": "Определяет, будет ли проводник автоматически отображать и выбирать файлы при их открытии.",
-	"enableDragAndDrop": "Определяет, разрешено ли перемещение файлов и папок перетаскиванием в проводнике.",
-	"confirmDragAndDrop": "Определяет, должно ли запрашиваться подтверждение при перемещении файлов и папок в проводнике.",
-	"confirmDelete": "Определяет, должно ли запрашиваться подтверждение при удалении файла в корзину.",
-	"sortOrder.default": "Файлы и папки сортируются по именам в алфавитном порядке. Папки отображаются перед файлами.",
-	"sortOrder.mixed": "Файлы и папки сортируются по именам в алфавитном порядке. Файлы чередуются с папками.",
-	"sortOrder.filesFirst": "Файлы и папки сортируются по именам в алфавитном порядке. Файлы отображаются перед папками. ",
-	"sortOrder.type": "Файлы и папки сортируются по расширениям в алфавитном порядке. Папки отображаются перед файлами.",
-	"sortOrder.modified": "Файлы и папки сортируются по дате последнего изменения в порядке убывания. Папки отображаются перед файлами.",
-	"sortOrder": "Управляет порядком сортировки файлов и папок в проводнике. Наряду с сортировкой по умолчанию можно установить следующие варианты сортировки: 'mixed' (файлы и папки сортируются вместе), 'type' (по типу файла), 'modified' (по дате последнего изменения) и 'filesFirst' (сортировать файлы перед папками).",
-	"explorer.decorations.colors": "Определяет, следует ли использовать цвета в декораторах файла.",
-	"explorer.decorations.badges": "Определяет, следует ли использовать эмблемы в декораторах файла. "
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json b/i18n/rus/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json
deleted file mode 100644
index 2c555771b4a..00000000000
--- a/i18n/rus/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"userGuide": "Используйте команды на панели инструментов редактора, чтобы отменить изменения или перезаписать содержимое на диске.",
-	"staleSaveError": "Не удалось сохранить \"{0}\": содержимое на диске было изменено. Сравните свою версию с версией на диске.",
-	"retry": "Повторить попытку",
-	"discard": "Отмена",
-	"readonlySaveErrorAdmin": "Не удалось сохранить \"{0}\": файл защищен от записи. Чтобы повторить попытку с правами администратора, выберите \"Перезаписать с правами администратора\".",
-	"readonlySaveError": "Не удалось сохранить \"{0}\": файл защищен от записи. Чтобы попытаться снять защиту, выберите \"Перезаписать\".",
-	"permissionDeniedSaveError": "Не удалось сохранить \"{0}\": недостаточные разрешения. Чтобы повторить попытку с правами администратора, выберите \"Повторить попытку с правами администратора\".",
-	"genericSaveError": "Не удалось сохранить \"{0}\": {1}",
-	"learnMore": "Дополнительные сведения",
-	"dontShowAgain": "Больше не показывать",
-	"compareChanges": "Сравнить",
-	"saveConflictDiffLabel": "{0} (на диске) ↔ {1} (в {2}) - Разрешить конфликт сохранения",
-	"overwriteElevated": "Перезаписать с правами администратора....",
-	"saveElevated": "Повторить с правами администратора....",
-	"overwrite": "Перезаписать"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/files/electron-browser/views/emptyView.i18n.json b/i18n/rus/src/vs/workbench/parts/files/electron-browser/views/emptyView.i18n.json
deleted file mode 100644
index e7c88b4ecc3..00000000000
--- a/i18n/rus/src/vs/workbench/parts/files/electron-browser/views/emptyView.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noWorkspace": "Нет открытой папки",
-	"explorerSection": "Раздел проводника",
-	"noWorkspaceHelp": "Вы еще не добавили папку в рабочую область.",
-	"addFolder": "Добавить папку",
-	"noFolderHelp": "Вы еще не открыли папку.",
-	"openFolder": "Открыть папку"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/files/electron-browser/views/explorerDecorationsProvider.i18n.json b/i18n/rus/src/vs/workbench/parts/files/electron-browser/views/explorerDecorationsProvider.i18n.json
deleted file mode 100644
index 4cdbf97ba12..00000000000
--- a/i18n/rus/src/vs/workbench/parts/files/electron-browser/views/explorerDecorationsProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"label": "Проводник",
-	"canNotResolve": "Не удается разрешить папку рабочей области",
-	"symbolicLlink": "Символическая ссылка"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/files/electron-browser/views/explorerView.i18n.json b/i18n/rus/src/vs/workbench/parts/files/electron-browser/views/explorerView.i18n.json
deleted file mode 100644
index b896324307d..00000000000
--- a/i18n/rus/src/vs/workbench/parts/files/electron-browser/views/explorerView.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"explorerSection": "Раздел проводника",
-	"treeAriaLabel": "Проводник"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json b/i18n/rus/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
deleted file mode 100644
index b30660862fb..00000000000
--- a/i18n/rus/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"fileInputAriaLabel": "Введите имя файла. Нажмите клавишу ВВОД, чтобы подтвердить введенные данные, или ESCAPE для отмены.",
-	"createFileFromExplorerInfoMessage": "Создать файл **{0}** в **{1}**",
-	"renameFileFromExplorerInfoMessage": "Переместить и переименовать в **{0}**",
-	"createFolderFromExplorerInfoMessage": "Создать папку **{0}** в **{1}**",
-	"filesExplorerViewerAriaLabel": "{0}, Проводник",
-	"dropFolders": "Вы хотите действительно добавить папки в эту рабочую область?",
-	"dropFolder": "Вы хотите действительно добавить папку в эту рабочую область?",
-	"addFolders": "&&Добавить папки",
-	"addFolder": "&&Добавить папку",
-	"confirmRootsMove": "Вы действительно хотите изменить порядок нескольких корневых папок в рабочей области?",
-	"confirmMultiMove": "Вы действительно хотите переместить следующие файлы ({0})?",
-	"confirmRootMove": "Вы действительно хотите изменить порядок корневой папки \"{0}\" в рабочей области?",
-	"confirmMove": "Вы действительно хотите переместить '{0}'?",
-	"doNotAskAgain": "Больше не спрашивать",
-	"moveButtonLabel": "&&Переместить",
-	"confirmOverwriteMessage": "{0} уже существует в целевой папке. Заменить его?",
-	"irreversible": "Это действие необратимо.",
-	"replaceButtonLabel": "Заменить"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json b/i18n/rus/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json
deleted file mode 100644
index 521498e7453..00000000000
--- a/i18n/rus/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openEditors": "Открытые редакторы",
-	"openEditosrSection": "Раздел открытых редакторов",
-	"dirtyCounter": "Не сохранено: {0}"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/files/electron-browser/views/openEditorsViewer.i18n.json b/i18n/rus/src/vs/workbench/parts/files/electron-browser/views/openEditorsViewer.i18n.json
deleted file mode 100644
index 863c0a79ec8..00000000000
--- a/i18n/rus/src/vs/workbench/parts/files/electron-browser/views/openEditorsViewer.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"editorGroupAriaLabel": "{0}, группа редакторов",
-	"openEditorAriaLabel": "{0}, открытый редактор",
-	"saveAll": "Сохранить все",
-	"closeAllUnmodified": "Закрыть без изменений",
-	"closeAll": "Закрыть все",
-	"compareWithSaved": "Сравнить с сохраненным",
-	"close": "Закрыть",
-	"closeOthers": "Закрыть другие"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/git/browser/gitActions.contribution.i18n.json b/i18n/rus/src/vs/workbench/parts/git/browser/gitActions.contribution.i18n.json
deleted file mode 100644
index 7ed929cb007..00000000000
--- a/i18n/rus/src/vs/workbench/parts/git/browser/gitActions.contribution.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"switchToChangesView": "Переключиться в представление изменений",
-	"openInEditor": "Переключиться в представление редактора",
-	"workbenchStage": "Промежуточное сохранение",
-	"workbenchUnstage": "Отменить промежуточное сохранение",
-	"stageSelectedLines": "Промежуточно сохранить выделенные строки",
-	"unstageSelectedLines": "Отменить промежуточное сохранение выбранных строк",
-	"revertSelectedLines": "Отменить выбранные строки",
-	"confirmRevertMessage": "Действительно отменить выбранные изменения?",
-	"irreversible": "Это действие необратимо.",
-	"revertChangesLabel": "&&Отменить изменения",
-	"openChange": "Открыть изменение",
-	"openFile": "Открыть файл",
-	"git": "GIT"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/git/browser/gitActions.i18n.json b/i18n/rus/src/vs/workbench/parts/git/browser/gitActions.i18n.json
deleted file mode 100644
index a6f185e1685..00000000000
--- a/i18n/rus/src/vs/workbench/parts/git/browser/gitActions.i18n.json
+++ /dev/null
@@ -1,46 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"openChange": "Открыть изменение",
-	"openFile": "Открыть файл",
-	"init": "Инициализация",
-	"refresh": "Обновить",
-	"stageChanges": "Промежуточное сохранение",
-	"stageAllChanges": "Промежуточно сохранить все",
-	"confirmUndoMessage": "Действительно отменить все изменения?",
-	"confirmUndoAllOne": "Имеются изменения в файле ({0}), промежуточное сохранение которых не выполнено.\n\nЭто действие необратимо!",
-	"confirmUndoAllMultiple": "Имеются изменения в файлах ({0}), промежуточное сохранение которых не выполнено.\n\nЭто действие необратимо!",
-	"cleanChangesLabel": "&&Отменить изменения",
-	"confirmUndo": "Действительно отменить изменения в {0}?",
-	"irreversible": "Это действие необратимо.",
-	"undoChanges": "Очистить",
-	"undoAllChanges": "Очистить все",
-	"unstage": "Отменить промежуточное сохранение",
-	"unstageAllChanges": "Отменить промежуточное сохранение всего",
-	"dirtyTreeCheckout": "Невозможно получить для изменения. Сначала нужно зафиксировать или спрятать работу.",
-	"commitStaged": "Зафиксировать промежуточно сохраненные изменения",
-	"commitStagedAmend": "Зафиксировать промежуточные (изменение)",
-	"commitStagedSignedOff": "Зафиксировать промежуточные элементы (завершено)",
-	"commit": "Commit",
-	"commitMessage": "Сообщение о фиксации",
-	"commitAll": "Зафиксировать все",
-	"commitAllSignedOff": "Зафиксировать все (завершено)",
-	"commitAll2": "Зафиксировать все",
-	"commitStaged2": "Зафиксировать промежуточно сохраненные изменения",
-	"dirtyTreePull": "Невозможно получить. Зафиксируйте или спрячьте работу.",
-	"authFailed": "Сбой аутентификации для команды git remote.",
-	"pushToRemote": "Отправить в:",
-	"pushToRemotePickMessage": "Выберите удаленный компьютер, на который следует отправить ветвь \"{0}\":",
-	"publish": "Опубликовать",
-	"confirmPublishMessage": "Действительно опубликовать \"{0}\" в \"{1}\"?",
-	"confirmPublishMessageButton": "Опубликовать",
-	"publishPickMessage": "Выберите удаленный сервер, на котором нужно опубликовать ветвь \"{0}\":",
-	"sync is unpredictable": "Это действие отправляет фиксации в \"{0}\" и извлекает их из этого расположения.",
-	"ok": "ОК",
-	"cancel": "Отмена",
-	"never again": "ОК. Больше не показывать",
-	"undoLastCommit": "Отменить последнюю фиксацию"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/git/browser/gitQuickOpen.i18n.json b/i18n/rus/src/vs/workbench/parts/git/browser/gitQuickOpen.i18n.json
deleted file mode 100644
index d958321c326..00000000000
--- a/i18n/rus/src/vs/workbench/parts/git/browser/gitQuickOpen.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"refAriaLabel": "{0}, GIT",
-	"checkoutBranch": "Ветвь в {0}",
-	"checkoutRemoteBranch": "Удаленная ветвь в {0}",
-	"checkoutTag": "Тег в {0}",
-	"alreadyCheckedOut": "Ветвь {0} уже является текущей ветвью",
-	"branchAriaLabel": "{0}, ветвь GIT",
-	"createBranch": "Создать ветвь {0}",
-	"noBranches": "Нет других ветвей",
-	"notValidBranchName": "Укажите допустимое имя ветви"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/git/browser/gitServices.i18n.json b/i18n/rus/src/vs/workbench/parts/git/browser/gitServices.i18n.json
deleted file mode 100644
index 715f5cff5c1..00000000000
--- a/i18n/rus/src/vs/workbench/parts/git/browser/gitServices.i18n.json
+++ /dev/null
@@ -1,30 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"cantOpen": "Невозможно открыть этот ресурс GIT.",
-	"gitIndexChanges": "{0} (index) ↔ {1}",
-	"gitIndexChangesDesc": "{0} — изменения в индексе",
-	"gitIndexChangesRenamed": "{0} ← {1}",
-	"gitIndexChangesRenamedDesc": "{0} — переименовано — изменения в индексе",
-	"workingTreeChanges": "{0} (HEAD) ↔ {1}",
-	"workingTreeChangesDesc": "{0} — изменения в рабочем дереве",
-	"gitMergeChanges": "{0} (merge) ↔ {1}",
-	"gitMergeChangesDesc": "{0} — объединить изменения",
-	"updateGit": "Вероятно, у вас установлен GIT {0}. Код лучше всего работает с GIT >=2.0.0.",
-	"download": "Скачать",
-	"neverShowAgain": "Больше не показывать",
-	"configureUsernameEmail": "Настройте ваши имя пользователя и электронную почту GIT.",
-	"badConfigFile": "GIT {0}",
-	"unmergedChanges": "Перед сохранением необходимо сначала разрешить необъединенные изменения.",
-	"showOutput": "Показать выходные данные",
-	"cancel": "Отмена",
-	"checkNativeConsole": "Ошибка при выполнении операции GIT. Проверьте выходные данные или используйте консоль для проверки состояния репозитория.",
-	"changesFromIndex": "{0} (index)",
-	"changesFromIndexDesc": "{0} — изменения в индексе",
-	"changesFromTree": "{0} ({1})",
-	"changesFromTreeDesc": "{0} — изменения в {1}",
-	"cantOpenResource": "Невозможно открыть этот ресурс GIT."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/git/browser/gitWidgets.i18n.json b/i18n/rus/src/vs/workbench/parts/git/browser/gitWidgets.i18n.json
deleted file mode 100644
index ab90565130b..00000000000
--- a/i18n/rus/src/vs/workbench/parts/git/browser/gitWidgets.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"publishBranch": "Опубликовать ветвь",
-	"syncBranch": "Синхронизировать изменения",
-	"gitNotEnabled": "GIT недоступен в этой рабочей области."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/git/browser/gitWorkbenchContributions.i18n.json b/i18n/rus/src/vs/workbench/parts/git/browser/gitWorkbenchContributions.i18n.json
deleted file mode 100644
index 3b06e5513ee..00000000000
--- a/i18n/rus/src/vs/workbench/parts/git/browser/gitWorkbenchContributions.i18n.json
+++ /dev/null
@@ -1,23 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"gitProgressBadge": "Состояние выполнения GIT",
-	"gitPendingChangesBadge": "Ожидающие изменения: {0}",
-	"toggleGitViewlet": "Показать GIT",
-	"git": "GIT",
-	"view": "Просмотреть",
-	"gitCommands": "Команды GIT",
-	"gitConfigurationTitle": "GIT",
-	"gitEnabled": "С поддержкой GIT",
-	"gitPath": "Путь к исполняемому файлу GIT",
-	"gitAutoRefresh": "Включено ли автоматическое обновление",
-	"gitAutoFetch": "Включено ли автоматическое получение.",
-	"gitLongCommit": "Следует ли предупреждать о длинных сообщениях о фиксации.",
-	"gitLargeRepos": "Всегда разрешать Code управлять большими репозиториями.",
-	"confirmSync": "Подтвердите синхронизацию репозиториев Git.",
-	"countBadge": "Управляет счетчиком эмблем Git.",
-	"checkoutType": "Определяет, какие типы ветвей вносятся в список."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/git/browser/views/changes/changesView.i18n.json b/i18n/rus/src/vs/workbench/parts/git/browser/views/changes/changesView.i18n.json
deleted file mode 100644
index 65c71bdc9ff..00000000000
--- a/i18n/rus/src/vs/workbench/parts/git/browser/views/changes/changesView.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"needMessage": "Предоставьте сообщение фиксации. В любом случае можно нажать кнопку **{0}**, чтобы зафиксировать изменения. При наличии промежуточно сохраненных изменений зафиксированы будут только они. В противном случае фиксируются все изменения.",
-	"nothingToCommit": "Как только появятся изменения для фиксации, введите сообщение фиксации и нажмите кнопку **{0}**, чтобы зафиксировать изменения. При наличии промежуточно сохраненных изменений зафиксированы будут только они. В противном случае фиксируются все изменения.",
-	"longCommit": "Рекомендуется, чтобы первая строка фиксации была короче 50 символов. Используйте новые строки для дополнительных сведений.",
-	"commitMessage": "Сообщение (чтобы зафиксировать, нажмите {0})",
-	"commitMessageAriaLabel": "GIT: введите сообщение фиксации и нажмите {0}, чтобы выполнить фиксацию",
-	"treeAriaLabel": "Представление изменений GIT",
-	"showOutput": "Показать выходные данные GIT"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/git/browser/views/changes/changesViewer.i18n.json b/i18n/rus/src/vs/workbench/parts/git/browser/views/changes/changesViewer.i18n.json
deleted file mode 100644
index 81906ccf361..00000000000
--- a/i18n/rus/src/vs/workbench/parts/git/browser/views/changes/changesViewer.i18n.json
+++ /dev/null
@@ -1,38 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"stagedChanges": "Промежуточно сохраненные изменения",
-	"allChanges": "Изменения",
-	"mergeChanges": "Объединить изменения",
-	"outsideOfWorkspace": "Этот файл находится за пределами текущей рабочей области.",
-	"modified-char": "M",
-	"added-char": "A",
-	"deleted-char": "D",
-	"renamed-char": "R",
-	"copied-char": "C",
-	"untracked-char": "U",
-	"ignored-char": "!",
-	"title-index-modified": "Изменено в индексе",
-	"title-modified": "Изменено",
-	"title-index-added": "Добавлено в индекс",
-	"title-index-deleted": "Удалено из индекса",
-	"title-deleted": "Удалено",
-	"title-index-renamed": "Переименовано в индексе",
-	"title-index-copied": "Скопировано в индекс",
-	"title-untracked": "Не отслеживается",
-	"title-ignored": "Проигнорировано",
-	"title-conflict-both-deleted": "Конфликт: оба удалены",
-	"title-conflict-added-by-us": "Конфликт: добавлено нами",
-	"title-conflict-deleted-by-them": "Конфликт: удалено ими",
-	"title-conflict-added-by-them": "Конфликт: добавлено ими",
-	"title-conflict-deleted-by-us": "Конфликт: удалено нами",
-	"title-conflict-both-added": "Конфликт: оба добавлены",
-	"title-conflict-both-modified": "Конфликт: оба изменены",
-	"fileStatusAriaLabel": "Файл {0} в папке {1} имеет состояние {2}, GIT",
-	"ariaLabelStagedChanges": "Промежуточно сохраненные изменения, GIT",
-	"ariaLabelChanges": "Изменения, GIT",
-	"ariaLabelMerge": "Объединение, GIT"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/git/browser/views/disabled/disabledView.i18n.json b/i18n/rus/src/vs/workbench/parts/git/browser/views/disabled/disabledView.i18n.json
deleted file mode 100644
index 090b9065710..00000000000
--- a/i18n/rus/src/vs/workbench/parts/git/browser/views/disabled/disabledView.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"disabled": "GIT отключен в параметрах."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/git/browser/views/empty/emptyView.i18n.json b/i18n/rus/src/vs/workbench/parts/git/browser/views/empty/emptyView.i18n.json
deleted file mode 100644
index 2cab2e6564b..00000000000
--- a/i18n/rus/src/vs/workbench/parts/git/browser/views/empty/emptyView.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"noGit": "Эта рабочая область еще не находится в системе управления версиями GIT.",
-	"gitinit": "Инициализировать репозиторий GIT"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/git/browser/views/gitless/gitlessView.i18n.json b/i18n/rus/src/vs/workbench/parts/git/browser/views/gitless/gitlessView.i18n.json
deleted file mode 100644
index e9492301870..00000000000
--- a/i18n/rus/src/vs/workbench/parts/git/browser/views/gitless/gitlessView.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"macInstallWith": "Вы можете установить его с {0}, скачать его с сайта {1} или установить средства разработчика командной строки {2}, просто введя {3} в окне терминала.",
-	"winInstallWith": "Вы можете установить его с {0} или скачать его с сайта {1}.",
-	"linuxDownloadFrom": "Его можно скачать по адресу {0}.",
-	"downloadFrom": "Его можно скачать по адресу {0}.",
-	"looksLike": "Похоже, GIT не установлен в вашей системе.",
-	"pleaseRestart": "После установки GIT перезапустите VSCode."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/git/browser/views/huge/hugeView.i18n.json b/i18n/rus/src/vs/workbench/parts/git/browser/views/huge/hugeView.i18n.json
deleted file mode 100644
index 78bd1d73962..00000000000
--- a/i18n/rus/src/vs/workbench/parts/git/browser/views/huge/hugeView.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"huge": "Репозиторий включает много активных изменений.\nЭто может замедлить работу Code.",
-	"setting": "Вы можете навсегда отключить это предупреждение с помощью следующего параметра:",
-	"allo": "Разрешать большие репозитории"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/git/browser/views/notroot/notrootView.i18n.json b/i18n/rus/src/vs/workbench/parts/git/browser/views/notroot/notrootView.i18n.json
deleted file mode 100644
index d1252391345..00000000000
--- a/i18n/rus/src/vs/workbench/parts/git/browser/views/notroot/notrootView.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"wrongRoot": "Кажется, каталог находится в репозитории GIT.",
-	"pleaseRestart": "Чтобы получить доступ к возможностям GIT, откройте корневой каталог репозитория."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/git/browser/views/noworkspace/noworkspaceView.i18n.json b/i18n/rus/src/vs/workbench/parts/git/browser/views/noworkspace/noworkspaceView.i18n.json
deleted file mode 100644
index 05d887226cf..00000000000
--- a/i18n/rus/src/vs/workbench/parts/git/browser/views/noworkspace/noworkspaceView.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"noWorkspaceHelp": "Вы еще не открыли папку.",
-	"pleaseRestart": "Чтобы получить доступ к возможностям GIT, откройте папку с репозиторием GIT.",
-	"openFolder": "Открыть папку"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/git/electron-browser/git.contribution.i18n.json b/i18n/rus/src/vs/workbench/parts/git/electron-browser/git.contribution.i18n.json
deleted file mode 100644
index fbbd90f78c7..00000000000
--- a/i18n/rus/src/vs/workbench/parts/git/electron-browser/git.contribution.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"toggleSCMViewlet": "Показать SCM",
-	"git": "GIT"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/git/electron-browser/gitActions.i18n.json b/i18n/rus/src/vs/workbench/parts/git/electron-browser/gitActions.i18n.json
deleted file mode 100644
index 3e5c26ff3e7..00000000000
--- a/i18n/rus/src/vs/workbench/parts/git/electron-browser/gitActions.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"valid": "Укажите допустимый URL-адрес репозитория GIT",
-	"url": "URL-адрес репозитория",
-	"directory": "Каталог-назначение для клонирования",
-	"cloning": "Клонирование репозитория \"{0}\"...",
-	"already exists": "Целевой репозиторий уже существует, выберите другой каталог-назначение для клонирования."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/git/electron-main/askpassService.i18n.json b/i18n/rus/src/vs/workbench/parts/git/electron-main/askpassService.i18n.json
deleted file mode 100644
index fa15e3b391d..00000000000
--- a/i18n/rus/src/vs/workbench/parts/git/electron-main/askpassService.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"git": "GIT"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/git/node/git.lib.i18n.json b/i18n/rus/src/vs/workbench/parts/git/node/git.lib.i18n.json
deleted file mode 100644
index d92e24ffc20..00000000000
--- a/i18n/rus/src/vs/workbench/parts/git/node/git.lib.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"errorBuffer": "Невозможно открыть файл из GIT.",
-	"fileBinaryError": "Похоже, файл является двоичным, и его нельзя открыть как текстовый."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/html/browser/html.contribution.i18n.json b/i18n/rus/src/vs/workbench/parts/html/browser/html.contribution.i18n.json
deleted file mode 100644
index 36cadcfcce5..00000000000
--- a/i18n/rus/src/vs/workbench/parts/html/browser/html.contribution.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"html.editor.label": "Предварительный просмотр HTML"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/html/browser/htmlPreviewPart.i18n.json b/i18n/rus/src/vs/workbench/parts/html/browser/htmlPreviewPart.i18n.json
deleted file mode 100644
index a80ebf7aef9..00000000000
--- a/i18n/rus/src/vs/workbench/parts/html/browser/htmlPreviewPart.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"html.voidInput": "Недопустимые входные данные для редактора."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/html/browser/webview.contribution.i18n.json b/i18n/rus/src/vs/workbench/parts/html/browser/webview.contribution.i18n.json
deleted file mode 100644
index e4db582c42e..00000000000
--- a/i18n/rus/src/vs/workbench/parts/html/browser/webview.contribution.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"developer": "Разработчик"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/html/browser/webview.i18n.json b/i18n/rus/src/vs/workbench/parts/html/browser/webview.i18n.json
deleted file mode 100644
index 52332c6dd96..00000000000
--- a/i18n/rus/src/vs/workbench/parts/html/browser/webview.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"devtools.webview": "Разработчик: средства Webview"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/html/browser/webviewCommands.i18n.json b/i18n/rus/src/vs/workbench/parts/html/browser/webviewCommands.i18n.json
deleted file mode 100644
index 02cc2d82d38..00000000000
--- a/i18n/rus/src/vs/workbench/parts/html/browser/webviewCommands.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"editor.action.webvieweditor.showFind": "Выделить мини-приложение поиска",
-	"openToolsLabel": "Открыть инструменты разработчика веб-представлений",
-	"refreshWebviewLabel": "Перезагрузить веб-представления"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json b/i18n/rus/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json
deleted file mode 100644
index 36cadcfcce5..00000000000
--- a/i18n/rus/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"html.editor.label": "Предварительный просмотр HTML"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json b/i18n/rus/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json
deleted file mode 100644
index a80ebf7aef9..00000000000
--- a/i18n/rus/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"html.voidInput": "Недопустимые входные данные для редактора."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json b/i18n/rus/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json
deleted file mode 100644
index e4db582c42e..00000000000
--- a/i18n/rus/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"developer": "Разработчик"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json b/i18n/rus/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json
deleted file mode 100644
index 18d62a09459..00000000000
--- a/i18n/rus/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openToolsLabel": "Открыть инструменты разработчика веб-представлений",
-	"refreshWebviewLabel": "Перезагрузить веб-представления"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json b/i18n/rus/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
deleted file mode 100644
index a63d4097358..00000000000
--- a/i18n/rus/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"updateLocale": "Вы хотели бы изменить язык пользовательского интерфейса VS Code на {0} и перезапустить VS Code?",
-	"yes": "Да",
-	"no": "Нет",
-	"neverAgain": "Больше не показывать",
-	"JsonSchema.locale": "Язык пользовательского интерфейса.",
-	"vscode.extension.contributes.localizations": "Добавляет локализации в редактор",
-	"vscode.extension.contributes.localizations.languageId": "Идентификатор языка, на который будут переведены отображаемые строки.",
-	"vscode.extension.contributes.localizations.languageName": "Название языка на английском языке.",
-	"vscode.extension.contributes.localizations.languageNameLocalized": "Название языка на предоставленном языке.",
-	"vscode.extension.contributes.localizations.translations": "Список переводов, связанных с языком.",
-	"vscode.extension.contributes.localizations.translations.id": "Идентификатор VS Code или расширения, для которого предоставляется этот перевод. Идентификатор VS Code всегда имеет формат \"vscode\", а идентификатор расширения должен иметь формат \"publisherId.extensionName\".",
-	"vscode.extension.contributes.localizations.translations.id.pattern": "Идентификатор должен иметь формат \"vscode\" или \"publisherId.extensionName\" для перевода VS Code или расширения соответственно.",
-	"vscode.extension.contributes.localizations.translations.path": "Относительный путь к файлу, содержащему переводы для языка."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/localizations/browser/localizationsActions.i18n.json b/i18n/rus/src/vs/workbench/parts/localizations/browser/localizationsActions.i18n.json
deleted file mode 100644
index d4a882b6b25..00000000000
--- a/i18n/rus/src/vs/workbench/parts/localizations/browser/localizationsActions.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"configureLocale": "Настроить язык",
-	"displayLanguage": "Определяет язык интерфейса VSCode.",
-	"doc": "Список поддерживаемых языков см. в {0}.",
-	"restart": "Для изменения значения требуется перезапуск VSCode.",
-	"fail.createSettings": "Невозможно создать \"{0}\" ({1})."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/localizations/electron-browser/localizations.contribution.i18n.json b/i18n/rus/src/vs/workbench/parts/localizations/electron-browser/localizations.contribution.i18n.json
deleted file mode 100644
index 92e148db1bc..00000000000
--- a/i18n/rus/src/vs/workbench/parts/localizations/electron-browser/localizations.contribution.i18n.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"updateLocale": "Вы хотели бы изменить язык пользовательского интерфейса VS Code на {0} и перезапустить VS Code?",
-	"activateLanguagePack": "Вы хотите перезапустить VS Code, чтобы активировать установленный языковой пакет?",
-	"yes": "Да",
-	"no": "Нет",
-	"neverAgain": "Больше не показывать",
-	"install language pack": "В ближайшем будущем VS Code будет поддерживать языковые пакеты только в виде расширений Marketplace. Установите расширение '{0}', чтобы продолжить использование текущего языка.",
-	"install": "Установить",
-	"more information": "Дополнительные сведения...",
-	"JsonSchema.locale": "Язык пользовательского интерфейса.",
-	"vscode.extension.contributes.localizations": "Добавляет локализации в редактор",
-	"vscode.extension.contributes.localizations.languageId": "Идентификатор языка, на который будут переведены отображаемые строки.",
-	"vscode.extension.contributes.localizations.languageName": "Название языка на английском языке.",
-	"vscode.extension.contributes.localizations.languageNameLocalized": "Название языка на предоставленном языке.",
-	"vscode.extension.contributes.localizations.translations": "Список переводов, связанных с языком.",
-	"vscode.extension.contributes.localizations.translations.id": "Идентификатор VS Code или расширения, для которого предоставляется этот перевод. Идентификатор VS Code всегда имеет формат \"vscode\", а идентификатор расширения должен иметь формат \"publisherId.extensionName\".",
-	"vscode.extension.contributes.localizations.translations.id.pattern": "Идентификатор должен иметь формат \"vscode\" или \"publisherId.extensionName\" для перевода VS Code или расширения соответственно.",
-	"vscode.extension.contributes.localizations.translations.path": "Относительный путь к файлу, содержащему переводы для языка."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/localizations/electron-browser/localizationsActions.i18n.json b/i18n/rus/src/vs/workbench/parts/localizations/electron-browser/localizationsActions.i18n.json
deleted file mode 100644
index aa48aa0a269..00000000000
--- a/i18n/rus/src/vs/workbench/parts/localizations/electron-browser/localizationsActions.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"configureLocale": "Настройка языка интерфейса",
-	"displayLanguage": "Определяет язык интерфейса VSCode.",
-	"doc": "Список поддерживаемых языков см. в {0}.",
-	"restart": "Для изменения значения требуется перезапуск VSCode.",
-	"fail.createSettings": "Невозможно создать \"{0}\" ({1})."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json b/i18n/rus/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json
deleted file mode 100644
index e75467d6715..00000000000
--- a/i18n/rus/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"mainLog": "Лог (Основной)",
-	"sharedLog": "Лог (общий)",
-	"rendererLog": "Журнал (окно)",
-	"extensionsLog": "Журнал (узел расширения)",
-	"developer": "Разработчик"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json b/i18n/rus/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json
deleted file mode 100644
index 0e35df99244..00000000000
--- a/i18n/rus/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openLogsFolder": "Открыть папку журналов",
-	"showLogs": "Показать журналы...",
-	"rendererProcess": "Окно ({0})",
-	"emptyWindow": "Окно",
-	"extensionHost": "Узел расширения",
-	"sharedProcess": "Общий",
-	"mainProcess": "Главный",
-	"selectProcess": "Выберите журнал для обработки",
-	"openLogFile": "Открыть лог",
-	"setLogLevel": "Установите уровень ведения журнала...",
-	"trace": "Трассировка",
-	"debug": "Отладка",
-	"info": "Сведения",
-	"warn": "Предупреждение",
-	"err": "Ошибка",
-	"critical": "Критично",
-	"off": "Отключено",
-	"selectLogLevel": "Установите уровень ведения журнала",
-	"default and current": "По умолчанию и текущий",
-	"default": "По умолчанию",
-	"current": "Текущий"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/markers/browser/markersFileDecorations.i18n.json b/i18n/rus/src/vs/workbench/parts/markers/browser/markersFileDecorations.i18n.json
deleted file mode 100644
index e99ea342272..00000000000
--- a/i18n/rus/src/vs/workbench/parts/markers/browser/markersFileDecorations.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"label": "Проблемы",
-	"tooltip.1": "Проблем в этом файле: 1",
-	"tooltip.N": "Проблем в этом файле: {0}",
-	"markers.showOnFile": "Показывать ошибки и предупреждения для файлов и папки."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/markers/browser/markersPanel.i18n.json b/i18n/rus/src/vs/workbench/parts/markers/browser/markersPanel.i18n.json
deleted file mode 100644
index 9f1e9238a73..00000000000
--- a/i18n/rus/src/vs/workbench/parts/markers/browser/markersPanel.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"totalProblems": "Всего проблем: {0}",
-	"filteredProblems": "Показано проблем: {0} из {1}"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/markers/common/markers.i18n.json b/i18n/rus/src/vs/workbench/parts/markers/common/markers.i18n.json
deleted file mode 100644
index 9f1e9238a73..00000000000
--- a/i18n/rus/src/vs/workbench/parts/markers/common/markers.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"totalProblems": "Всего проблем: {0}",
-	"filteredProblems": "Показано проблем: {0} из {1}"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/markers/common/messages.i18n.json b/i18n/rus/src/vs/workbench/parts/markers/common/messages.i18n.json
deleted file mode 100644
index a1ef2cd59b1..00000000000
--- a/i18n/rus/src/vs/workbench/parts/markers/common/messages.i18n.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"viewCategory": "Просмотреть",
-	"problems.view.toggle.label": "Включить или отключить сообщения о проблемах (ошибки, предупреждения, информационные сообщения)",
-	"problems.view.focus.label": "Перевести фокус на сообщения о проблемах (ошибки, предупреждения, информационные сообщения) ",
-	"problems.panel.configuration.title": "Представление \"Проблемы\"",
-	"problems.panel.configuration.autoreveal": "Определяет, следует ли представлению \"Проблемы\" отображать файлы при их открытии",
-	"markers.panel.title.problems": "Проблемы",
-	"markers.panel.aria.label.problems.tree": "Проблемы, сгруппированные по файлам",
-	"markers.panel.no.problems.build": "В рабочей области проблемы пока не обнаружены.",
-	"markers.panel.no.problems.filters": "Для указанного условия фильтра результаты не обнаружены",
-	"markers.panel.action.filter": "Фильтр проблем",
-	"markers.panel.filter.placeholder": "Фильтровать по типу или тексту",
-	"markers.panel.filter.errors": "ошибки",
-	"markers.panel.filter.warnings": "предупреждения",
-	"markers.panel.filter.infos": "сообщения",
-	"markers.panel.single.error.label": "1 ошибка",
-	"markers.panel.multiple.errors.label": "Ошибок: {0}",
-	"markers.panel.single.warning.label": "1 предупреждение",
-	"markers.panel.multiple.warnings.label": "Предупреждения: {0}",
-	"markers.panel.single.info.label": "1 сообщение",
-	"markers.panel.multiple.infos.label": "Сообщения: {0}",
-	"markers.panel.single.unknown.label": "1 неизвестный",
-	"markers.panel.multiple.unknowns.label": "Неизвестные: {0}",
-	"markers.panel.at.ln.col.number": "({0}, {1})",
-	"problems.tree.aria.label.resource": "{0} с проблемами ({1})",
-	"problems.tree.aria.label.error.marker": "Ошибка, созданная {0}: {1} в строке {2} и символе {3}",
-	"problems.tree.aria.label.error.marker.nosource": "Ошибка: {0} в строке {1} и символе {2}",
-	"problems.tree.aria.label.warning.marker": "Предупреждение, созданное {0}: {1} в строке {2} и символе {3}",
-	"problems.tree.aria.label.warning.marker.nosource": "Предупреждение: {0} в строке {1} и символе {2}",
-	"problems.tree.aria.label.info.marker": "Информационное сообщение, созданное {0}: {1} в строке {2} и символе {3}",
-	"problems.tree.aria.label.info.marker.nosource": "Информационное сообщение: {0} в строке {1} и символе {2}",
-	"problems.tree.aria.label.marker": "Проблема, созданная {0}: {1} в строке {2} и символе {3}",
-	"problems.tree.aria.label.marker.nosource": "Проблема: {0} в строке {1} и символе {2}",
-	"errors.warnings.show.label": "Показать ошибки и предупреждения"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json b/i18n/rus/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json
deleted file mode 100644
index 8bfb35ec63c..00000000000
--- a/i18n/rus/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"copyMarker": "Копировать",
-	"copyMessage": "Копировать сообщение"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/markers/electron-browser/markers.i18n.json b/i18n/rus/src/vs/workbench/parts/markers/electron-browser/markers.i18n.json
deleted file mode 100644
index 44eeaa06f3b..00000000000
--- a/i18n/rus/src/vs/workbench/parts/markers/electron-browser/markers.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"totalProblems": "Всего проблем: {0}"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/markers/electron-browser/markersElectronContributions.i18n.json b/i18n/rus/src/vs/workbench/parts/markers/electron-browser/markersElectronContributions.i18n.json
deleted file mode 100644
index 5c59b0255d7..00000000000
--- a/i18n/rus/src/vs/workbench/parts/markers/electron-browser/markersElectronContributions.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"copyMarker": "Копировать",
-	"copyMarkerMessage": "Копировать сообщение"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.i18n.json b/i18n/rus/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.i18n.json
deleted file mode 100644
index e99ea342272..00000000000
--- a/i18n/rus/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"label": "Проблемы",
-	"tooltip.1": "Проблем в этом файле: 1",
-	"tooltip.N": "Проблем в этом файле: {0}",
-	"markers.showOnFile": "Показывать ошибки и предупреждения для файлов и папки."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/markers/electron-browser/markersPanel.i18n.json b/i18n/rus/src/vs/workbench/parts/markers/electron-browser/markersPanel.i18n.json
deleted file mode 100644
index 214db1a2f20..00000000000
--- a/i18n/rus/src/vs/workbench/parts/markers/electron-browser/markersPanel.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"disableFilesExclude": "Отключить фильтр исключения файлов.",
-	"clearFilter": "Очистить фильтр."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/markers/electron-browser/markersPanelActions.i18n.json b/i18n/rus/src/vs/workbench/parts/markers/electron-browser/markersPanelActions.i18n.json
deleted file mode 100644
index ea464c71d98..00000000000
--- a/i18n/rus/src/vs/workbench/parts/markers/electron-browser/markersPanelActions.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"showing filtered problems": "Показано: {0} из {1}"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json b/i18n/rus/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
deleted file mode 100644
index 0d3a91c0c65..00000000000
--- a/i18n/rus/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"viewCategory": "Просмотр",
-	"problems.view.toggle.label": "Включить или отключить сообщения о проблемах (ошибки, предупреждения, информационные сообщения)",
-	"problems.view.focus.label": "Перевести фокус на сообщения о проблемах (ошибки, предупреждения, информационные сообщения) ",
-	"problems.panel.configuration.title": "Представление \"Проблемы\"",
-	"problems.panel.configuration.autoreveal": "Определяет, следует ли представлению \"Проблемы\" отображать файлы при их открытии",
-	"markers.panel.title.problems": "Проблемы",
-	"markers.panel.aria.label.problems.tree": "Проблемы, сгруппированные по файлам",
-	"markers.panel.no.problems.build": "В рабочей области проблемы пока не обнаружены.",
-	"markers.panel.no.problems.filters": "Для указанного условия фильтра результаты не обнаружены.",
-	"markers.panel.no.problems.file.exclusions": "Все ошибки скрыты, так как включен фильтр исключения файлов.",
-	"markers.panel.action.useFilesExclude": "Фильтр, использующий параметр исключения файлов",
-	"markers.panel.action.donotUseFilesExclude": "Не использовать параметр исключения файлов",
-	"markers.panel.action.filter": "Фильтр проблем",
-	"markers.panel.filter.ariaLabel": "Фильтр проблем",
-	"markers.panel.filter.placeholder": "Фильтр. Например: text, **/*.ts, !**/node_modules/**",
-	"markers.panel.filter.errors": "ошибки",
-	"markers.panel.filter.warnings": "предупреждения",
-	"markers.panel.filter.infos": "сообщения",
-	"markers.panel.single.error.label": "1 ошибка",
-	"markers.panel.multiple.errors.label": "Ошибок: {0}",
-	"markers.panel.single.warning.label": "1 предупреждение",
-	"markers.panel.multiple.warnings.label": "Предупреждения: {0}",
-	"markers.panel.single.info.label": "1 сообщение",
-	"markers.panel.multiple.infos.label": "Сообщения: {0}",
-	"markers.panel.single.unknown.label": "1 неизвестный",
-	"markers.panel.multiple.unknowns.label": "Неизвестные: {0}",
-	"markers.panel.at.ln.col.number": "({0}, {1})",
-	"problems.tree.aria.label.resource": "{0} с проблемами ({1})",
-	"problems.tree.aria.label.marker.relatedInformation": "У этой проблемы есть ссылки на несколько расположений ({0}).",
-	"problems.tree.aria.label.error.marker": "Ошибка выдана {0}: {1}, строка {2}, символ {3}.{4}",
-	"problems.tree.aria.label.error.marker.nosource": "Ошибка: {0}, строка {1}, символ {2}.{3}",
-	"problems.tree.aria.label.warning.marker": "Предупреждение выдано {0}: {1}, строка {2}, символ {3}.{4}",
-	"problems.tree.aria.label.warning.marker.nosource": "Предупреждение: {0}, строка {1}, символ {2}.{3} ",
-	"problems.tree.aria.label.info.marker": "Информационное сообщение выдано {0}: {1}, строка {2}, символ {3}.{4}",
-	"problems.tree.aria.label.info.marker.nosource": "Информационное сообщение: {0}, строка {1}, символ {2}.{3} ",
-	"problems.tree.aria.label.marker": "Проблема выдана {0}: {1}, строка {2}, символ {3}.{4}",
-	"problems.tree.aria.label.marker.nosource": "Проблема: {0}, строка {1}, символ {2}.{3} ",
-	"problems.tree.aria.label.relatedinfo.message": "{0}, строка {1}, символ {2} в {3}",
-	"errors.warnings.show.label": "Показать ошибки и предупреждения"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/nps/electron-browser/nps.contribution.i18n.json b/i18n/rus/src/vs/workbench/parts/nps/electron-browser/nps.contribution.i18n.json
deleted file mode 100644
index 10c206f9d2f..00000000000
--- a/i18n/rus/src/vs/workbench/parts/nps/electron-browser/nps.contribution.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"surveyQuestion": "Вас не затруднит пройти краткий опрос?",
-	"takeSurvey": "Пройти опрос",
-	"remindLater": "Напомнить мне позже",
-	"neverAgain": "Больше не показывать"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/outline/electron-browser/outline.contribution.i18n.json b/i18n/rus/src/vs/workbench/parts/outline/electron-browser/outline.contribution.i18n.json
deleted file mode 100644
index 1580bc9dbc1..00000000000
--- a/i18n/rus/src/vs/workbench/parts/outline/electron-browser/outline.contribution.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"name": "Структура",
-	"category.focus": "Файл",
-	"label.focus": "Фокус на структуре"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/outline/electron-browser/outlinePanel.i18n.json b/i18n/rus/src/vs/workbench/parts/outline/electron-browser/outlinePanel.i18n.json
deleted file mode 100644
index b3e074126f7..00000000000
--- a/i18n/rus/src/vs/workbench/parts/outline/electron-browser/outlinePanel.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"filter": "Фильтр",
-	"collapse": "Свернуть все",
-	"sortByPosition": "Сортировать по: положение",
-	"sortByName": "Сортировать по: название",
-	"sortByKind": "Сортировать по: тип",
-	"live": "Следовать за курсором",
-	"no-editor": "Отсутствуют открытые редакторы, которые могут предоставить сведения о структуре.",
-	"too-many-symbols": "Этот файл имеет слишком большой размер для отображения структуры. Приносим свои извинения."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/outline/electron-browser/outlineTree.i18n.json b/i18n/rus/src/vs/workbench/parts/outline/electron-browser/outlineTree.i18n.json
deleted file mode 100644
index 575278452f9..00000000000
--- a/i18n/rus/src/vs/workbench/parts/outline/electron-browser/outlineTree.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"outline.title": "строка {0} в {1}"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/output/browser/output.contribution.i18n.json b/i18n/rus/src/vs/workbench/parts/output/browser/output.contribution.i18n.json
deleted file mode 100644
index 8814ab63470..00000000000
--- a/i18n/rus/src/vs/workbench/parts/output/browser/output.contribution.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"output": "Вывод",
-	"viewCategory": "Просмотреть",
-	"clearOutput.label": "Очистить выходные данные"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/output/browser/outputActions.i18n.json b/i18n/rus/src/vs/workbench/parts/output/browser/outputActions.i18n.json
deleted file mode 100644
index 67574542705..00000000000
--- a/i18n/rus/src/vs/workbench/parts/output/browser/outputActions.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleOutput": "Переключить выходные данные",
-	"clearOutput": "Очистить выходные данные",
-	"toggleOutputScrollLock": "Включить/отключить SCROLL LOCK для вывода",
-	"switchToOutput.label": "Переключиться на выходные данные",
-	"openInLogViewer": "Открыть файл журнала"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/output/browser/outputPanel.i18n.json b/i18n/rus/src/vs/workbench/parts/output/browser/outputPanel.i18n.json
deleted file mode 100644
index 4c0d790cc5a..00000000000
--- a/i18n/rus/src/vs/workbench/parts/output/browser/outputPanel.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"output": "Вывод",
-	"outputPanelWithInputAriaLabel": "{0}, панель выходных данных",
-	"outputPanelAriaLabel": "Панель выходных данных"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/output/common/output.i18n.json b/i18n/rus/src/vs/workbench/parts/output/common/output.i18n.json
deleted file mode 100644
index 71e21e93962..00000000000
--- a/i18n/rus/src/vs/workbench/parts/output/common/output.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"output": "Вывод",
-	"channel": "для \"{0}\""
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json b/i18n/rus/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
deleted file mode 100644
index 66e8e86a36d..00000000000
--- a/i18n/rus/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"output": "Вывод",
-	"logViewer": "Средство просмотра журналов",
-	"viewCategory": "Просмотр",
-	"clearOutput.label": "Очистить выходные данные",
-	"openActiveLogOutputFile": "Просмотр: открыть активный выходной файл журнала"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json b/i18n/rus/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json
deleted file mode 100644
index 78ebecbf38b..00000000000
--- a/i18n/rus/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"output": "{0} - выходные данные",
-	"channel": "Канал выходных данных для '{0}'"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/performance/electron-browser/performance.contribution.i18n.json b/i18n/rus/src/vs/workbench/parts/performance/electron-browser/performance.contribution.i18n.json
deleted file mode 100644
index e53e26469ea..00000000000
--- a/i18n/rus/src/vs/workbench/parts/performance/electron-browser/performance.contribution.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"prof.message": "Профили успешно созданы.",
-	"prof.detail": "Создайте проблему и вручную вложите следующие файлы:\n{0}",
-	"prof.restartAndFileIssue": "Создать проблему и выполнить перезапуск",
-	"prof.restart": "Перезапустить",
-	"prof.thanks": "Спасибо за помощь.",
-	"prof.detail.restart": "Для продолжения работы с '{0}' необходимо еще раз перезагрузить систему. Благодарим вас за участие."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/performance/electron-browser/startupProfiler.i18n.json b/i18n/rus/src/vs/workbench/parts/performance/electron-browser/startupProfiler.i18n.json
deleted file mode 100644
index a62e4624c0d..00000000000
--- a/i18n/rus/src/vs/workbench/parts/performance/electron-browser/startupProfiler.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"prof.message": "Профили успешно созданы.",
-	"prof.detail": "Создайте проблему и вручную вложите следующие файлы:\n{0}",
-	"prof.restartAndFileIssue": "Создать проблему и выполнить перезапуск",
-	"prof.restart": "Перезапустить",
-	"prof.thanks": "Спасибо за помощь.",
-	"prof.detail.restart": "Для продолжения работы с '{0}' необходимо еще раз перезагрузить систему. Благодарим вас за участие."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/preferences/browser/keybindingWidgets.i18n.json b/i18n/rus/src/vs/workbench/parts/preferences/browser/keybindingWidgets.i18n.json
deleted file mode 100644
index 4fa277f04cc..00000000000
--- a/i18n/rus/src/vs/workbench/parts/preferences/browser/keybindingWidgets.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"defineKeybinding.oneExists": "Это сочетание клавиш назначено одной имеющейся команде",
-	"defineKeybinding.existing": "Это сочетание клавиш назначено нескольким имеющимся командам ({0}}",
-	"defineKeybinding.initial": "Нажмите нужное сочетание клавиш, а затем клавишу ВВОД.",
-	"defineKeybinding.chordsTo": "Аккорд для"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json b/i18n/rus/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
deleted file mode 100644
index b1ff2f3c4a2..00000000000
--- a/i18n/rus/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"showDefaultKeybindings": "Показать сочетания клавиш по умолчанию",
-	"showUserKeybindings": "Показать пользовательские сочетания клавиш",
-	"SearchKeybindings.AriaLabel": "Поиск настраиваемых сочетаний клавиш",
-	"SearchKeybindings.Placeholder": "Поиск настраиваемых сочетаний клавиш",
-	"sortByPrecedene": "Сортировать по приоритету",
-	"header-message": "Для использования расширенных настроек откройте и измените",
-	"keybindings-file-name": "keybindings.json",
-	"keybindingsLabel": "Настраиваемые сочетания клавиш",
-	"changeLabel": "Изменить настраиваемое сочетание клавиш",
-	"addLabel": "Добавить настраиваемое сочетание клавиш",
-	"removeLabel": "Удаление настраиваемого сочетания клавиш",
-	"resetLabel": "Сбросить настраиваемое сочетание клавиш",
-	"showSameKeybindings": "Показывать одинаковые настраиваемые сочетания клавиш",
-	"copyLabel": "Копировать",
-	"copyCommandLabel": "Команда копирования",
-	"error": "При изменении сочетания клавиш произошла ошибка \"{0}\". Откройте файл \"keybindings.json\" и проверьте его на наличие ошибок.",
-	"command": "Команда",
-	"keybinding": "Настраиваемое сочетание клавиш",
-	"source": "Источник",
-	"when": "Когда",
-	"editKeybindingLabelWithKey": "Изменить настраиваемое сочетание клавиш {0}",
-	"editKeybindingLabel": "Изменить настраиваемое сочетание клавиш",
-	"addKeybindingLabelWithKey": "Добавить настраиваемое сочетание клавиш {0}",
-	"addKeybindingLabel": "Добавить настраиваемое сочетание клавиш",
-	"title": "{0} ({1})",
-	"commandAriaLabel": "Команда: {0}.",
-	"keybindingAriaLabel": "Настраиваемое сочетание клавиш: {0}.",
-	"noKeybinding": "Нет назначенных настраиваемых сочетаний клавиш.",
-	"sourceAriaLabel": "Источник: {0}.",
-	"whenAriaLabel": "Когда: {0}.",
-	"noWhen": "Нет контекста \"Когда\"."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/preferences/browser/keybindingsEditorContribution.i18n.json b/i18n/rus/src/vs/workbench/parts/preferences/browser/keybindingsEditorContribution.i18n.json
deleted file mode 100644
index 17902309471..00000000000
--- a/i18n/rus/src/vs/workbench/parts/preferences/browser/keybindingsEditorContribution.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"defineKeybinding.start": "Определить назначение клавиш",
-	"defineKeybinding.kbLayoutErrorMessage": "Вы не сможете нажать это сочетание клавиш в текущей раскладке клавиатуры.",
-	"defineKeybinding.kbLayoutLocalAndUSMessage": "**{0}** для текущей раскладки клавиатуры (**{1}** для стандартной раскладки клавиатуры \"Английский, США\")",
-	"defineKeybinding.kbLayoutLocalMessage": "**{0}** для текущей раскладки клавиатуры."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/preferences/browser/preferences.contribution.i18n.json b/i18n/rus/src/vs/workbench/parts/preferences/browser/preferences.contribution.i18n.json
deleted file mode 100644
index afbf76af53c..00000000000
--- a/i18n/rus/src/vs/workbench/parts/preferences/browser/preferences.contribution.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"defaultPreferencesEditor": "Редактор настроек по умолчанию",
-	"keybindingsEditor": "Редактор настраиваемых сочетаний клавиш",
-	"preferences": "Параметры"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json b/i18n/rus/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
deleted file mode 100644
index 73f5287abad..00000000000
--- a/i18n/rus/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openRawDefaultSettings": "Открыть исходные параметры по умолчанию",
-	"openSettings2": "Открыть параметры (предварительная версия)",
-	"openSettings": "Открыть параметры",
-	"openGlobalSettings": "Открыть пользовательские параметры",
-	"openGlobalKeybindings": "Открыть сочетания клавиш",
-	"openGlobalKeybindingsFile": "Открыть файл сочетаний клавиш",
-	"openWorkspaceSettings": "Открыть параметры рабочей области",
-	"openFolderSettings": "Открыть параметры папок",
-	"configureLanguageBasedSettings": "Настроить параметры языка...",
-	"languageDescriptionConfigured": "({0})",
-	"pickLanguage": "Выбрать язык"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json b/i18n/rus/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
deleted file mode 100644
index 14f251a84e0..00000000000
--- a/i18n/rus/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"SearchSettingsWidget.AriaLabel": "Параметры поиска",
-	"SearchSettingsWidget.Placeholder": "Параметры поиска",
-	"noSettingsFound": "Нет результатов",
-	"oneSettingFound": "Найден один параметр",
-	"settingsFound": "Найдено параметров: {0}",
-	"totalSettingsMessage": "Всего параметров: {0}",
-	"nlpResult": "Результаты естественного языка",
-	"filterResult": "Отфильтрованные результаты",
-	"defaultSettings": "Параметры по умолчанию",
-	"defaultUserSettings": "Параметры пользователя по умолчанию",
-	"defaultWorkspaceSettings": "Параметры рабочей области по умолчанию",
-	"defaultFolderSettings": "Параметры папок по умолчанию",
-	"defaultEditorReadonly": "Редактировать в правой области редактора, чтобы переопределить значения по умолчанию.",
-	"preferencesAriaLabel": "Параметры по умолчанию. Текстовый редактор только для чтения."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json b/i18n/rus/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
deleted file mode 100644
index b457921fc6f..00000000000
--- a/i18n/rus/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"emptyUserSettingsHeader": "Укажите параметры здесь, чтобы перезаписать параметры по умолчанию.",
-	"emptyWorkspaceSettingsHeader": "Укажите параметры здесь, чтобы перезаписать параметры пользователей.",
-	"emptyFolderSettingsHeader": "Укажите параметры папок здесь, чтобы перезаписать параметры рабочих областей.",
-	"reportSettingsSearchIssue": "Сообщить об ошибке",
-	"newExtensionLabel": "Показать расширение «{0}»",
-	"editTtile": "Изменить",
-	"replaceDefaultValue": "Заменить в параметрах",
-	"copyDefaultValue": "Копировать в параметры"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/preferences/browser/preferencesService.i18n.json b/i18n/rus/src/vs/workbench/parts/preferences/browser/preferencesService.i18n.json
deleted file mode 100644
index 7e702c2b5e9..00000000000
--- a/i18n/rus/src/vs/workbench/parts/preferences/browser/preferencesService.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openFolderFirst": "Чтобы создать параметры рабочей области, сначала откройте папку",
-	"emptyKeybindingsHeader": "Поместите настраиваемые сочетания клавиш в этот файл, чтобы перезаписать клавиши по умолчанию.",
-	"defaultKeybindings": "Настраиваемые сочетания клавиш по умолчанию",
-	"folderSettingsName": "{0} (Параметры папок)",
-	"fail.createSettings": "Невозможно создать \"{0}\" ({1})."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json b/i18n/rus/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
deleted file mode 100644
index 2639f8a70dc..00000000000
--- a/i18n/rus/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"defaultSettings": "Чтобы переопределить параметры по умолчанию, укажите свои параметры в области справа.",
-	"noSettingsFound": "Параметры не найдены.",
-	"settingsSwitcherBarAriaLabel": "Переключатель параметров",
-	"userSettings": "Параметры пользователя",
-	"workspaceSettings": "Параметры рабочей области",
-	"folderSettings": "Параметры папок"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/preferences/browser/settingsEditor2.i18n.json b/i18n/rus/src/vs/workbench/parts/preferences/browser/settingsEditor2.i18n.json
deleted file mode 100644
index d65409a7c4e..00000000000
--- a/i18n/rus/src/vs/workbench/parts/preferences/browser/settingsEditor2.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"previewWarning": "Предварительная версия",
-	"previewLabel": "Это предварительная версия нашего нового редактора параметров",
-	"SearchSettings.AriaLabel": "Параметры поиска",
-	"SearchSettings.Placeholder": "Параметры поиска",
-	"advancedCustomizationLabel": "Для использования расширенных настроек откройте и измените",
-	"openSettingsLabel": "settings.json",
-	"showOverriddenOnly": "Отображать только измененные",
-	"treeAriaLabel": "Параметры",
-	"feedbackButtonLabel": "Оставить отзыв"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/preferences/browser/settingsTree.i18n.json b/i18n/rus/src/vs/workbench/parts/preferences/browser/settingsTree.i18n.json
deleted file mode 100644
index 4585a186d1c..00000000000
--- a/i18n/rus/src/vs/workbench/parts/preferences/browser/settingsTree.i18n.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"modifiedItemForeground": "Цвет переднего плана для измененного параметра.",
-	"workspace": "Рабочая область",
-	"user": "Пользователь",
-	"resetButtonTitle": "сбросить",
-	"configured": "Изменено",
-	"alsoConfiguredIn": "Также изменен в",
-	"configuredIn": "Изменен в",
-	"editInSettingsJson": "Изменить в settings.json",
-	"settingRowAriaLabel": "{0} {1}, параметр",
-	"groupRowAriaLabel": "{0}, группа"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/preferences/common/keybindingsEditorModel.i18n.json b/i18n/rus/src/vs/workbench/parts/preferences/common/keybindingsEditorModel.i18n.json
deleted file mode 100644
index 8d92fac910c..00000000000
--- a/i18n/rus/src/vs/workbench/parts/preferences/common/keybindingsEditorModel.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"default": "По умолчанию",
-	"user": "Пользователь",
-	"meta": "meta",
-	"option": "параметр"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/preferences/common/preferences.i18n.json b/i18n/rus/src/vs/workbench/parts/preferences/common/preferences.i18n.json
deleted file mode 100644
index b56ee6a792a..00000000000
--- a/i18n/rus/src/vs/workbench/parts/preferences/common/preferences.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"userSettingsTarget": "Параметры пользователя",
-	"workspaceSettingsTarget": "Параметры рабочей области"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json b/i18n/rus/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json
deleted file mode 100644
index 483c3b52c9f..00000000000
--- a/i18n/rus/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"commonlyUsed": "Часто используемые",
-	"defaultKeybindingsHeader": "Перезапишите настраиваемое сочетание клавиш, поместив их в файл настраиваемых сочетаний клавиш."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/preferences/electron-browser/preferences.contribution.i18n.json b/i18n/rus/src/vs/workbench/parts/preferences/electron-browser/preferences.contribution.i18n.json
deleted file mode 100644
index bbfa5acfb92..00000000000
--- a/i18n/rus/src/vs/workbench/parts/preferences/electron-browser/preferences.contribution.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"defaultPreferencesEditor": "Редактор настроек по умолчанию",
-	"settingsEditor2": "Редактор параметров 2",
-	"keybindingsEditor": "Редактор настраиваемых сочетаний клавиш",
-	"preferences": "Параметры"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/quickopen/browser/commandsHandler.i18n.json b/i18n/rus/src/vs/workbench/parts/quickopen/browser/commandsHandler.i18n.json
deleted file mode 100644
index cc5b834693b..00000000000
--- a/i18n/rus/src/vs/workbench/parts/quickopen/browser/commandsHandler.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"showTriggerActions": "Показать все команды",
-	"clearCommandHistory": "Очистить журнал команд",
-	"showCommands.label": "Палитра команд...",
-	"entryAriaLabelWithKey": "{0}, {1}, команды",
-	"entryAriaLabel": "{0}, команды",
-	"actionNotEnabled": "Команда {0} не разрешена в текущем контексте.",
-	"canNotRun": "При выполнении команды \"{0}\" произошла ошибка.",
-	"recentlyUsed": "недавно использованные",
-	"morecCommands": "другие команды",
-	"cat.title": "{0}: {1}",
-	"noCommandsMatching": "Нет соответствующих команд"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/quickopen/browser/gotoLineHandler.i18n.json b/i18n/rus/src/vs/workbench/parts/quickopen/browser/gotoLineHandler.i18n.json
deleted file mode 100644
index 1fe4f2ae1e7..00000000000
--- a/i18n/rus/src/vs/workbench/parts/quickopen/browser/gotoLineHandler.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"gotoLine": "Перейти к строке...",
-	"gotoLineLabelEmptyWithLimit": "Введите номер строки от 1 до {0} для перехода",
-	"gotoLineLabelEmpty": "Введите номер строки для перехода",
-	"gotoLineColumnLabel": "Перейти к строке {0} и символу {1}",
-	"gotoLineLabel": "Перейти к строке {0}",
-	"gotoLineHandlerAriaLabel": "Введите номер строки, к которой нужно перейти.",
-	"cannotRunGotoLine": "Чтобы перейти к строке, сначала откройте текстовый файл"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/quickopen/browser/gotoSymbolHandler.i18n.json b/i18n/rus/src/vs/workbench/parts/quickopen/browser/gotoSymbolHandler.i18n.json
deleted file mode 100644
index 3c52f50ee34..00000000000
--- a/i18n/rus/src/vs/workbench/parts/quickopen/browser/gotoSymbolHandler.i18n.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"gotoSymbol": "Перейти к символу в файле...",
-	"symbols": "символы ({0})",
-	"method": "методы ({0})",
-	"function": "функции ({0})",
-	"_constructor": "конструкторы ({0})",
-	"variable": "переменные ({0})",
-	"class": "классы ({0})",
-	"interface": "интерфейсы ({0})",
-	"namespace": "пространства имен ({0})",
-	"package": "пакеты ({0})",
-	"modules": "модули ({0})",
-	"property": "свойства ({0})",
-	"enum": "перечисления ({0})",
-	"string": "строки ({0})",
-	"rule": "правила ({0})",
-	"file": "файлы ({0})",
-	"array": "массивы ({0})",
-	"number": "числа ({0})",
-	"boolean": "логические значения ({0})",
-	"object": "объекты ({0})",
-	"key": "ключи ({0})",
-	"entryAriaLabel": "{0}, символы",
-	"noSymbolsMatching": "Нет соответствующих символов",
-	"noSymbolsFound": "Символы не найдены",
-	"gotoSymbolHandlerAriaLabel": "Введите, чтобы ограничить символы активного в настоящий момент редактора.",
-	"cannotRunGotoSymbolInFile": "Нет символьной информации для файла.",
-	"cannotRunGotoSymbol": "Чтобы перейти к символу, сначала откройте текстовый файл"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/quickopen/browser/helpHandler.i18n.json b/i18n/rus/src/vs/workbench/parts/quickopen/browser/helpHandler.i18n.json
deleted file mode 100644
index 36ae86f85bd..00000000000
--- a/i18n/rus/src/vs/workbench/parts/quickopen/browser/helpHandler.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"entryAriaLabel": "{0}, справка по средству выбора",
-	"globalCommands": "глобальные команды",
-	"editorCommands": "команды редактора"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json b/i18n/rus/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json
deleted file mode 100644
index c4999d23f08..00000000000
--- a/i18n/rus/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"view": "Просмотр",
-	"commandsHandlerDescriptionDefault": "Показать и выполнить команды",
-	"gotoLineDescriptionMac": "Перейти к строке",
-	"gotoLineDescriptionWin": "Перейти к строке",
-	"gotoSymbolDescription": "Перейти к символу в файле",
-	"gotoSymbolDescriptionScoped": "Перейти к символу в файле по категории",
-	"helpDescription": "Показать справку",
-	"viewPickerDescription": "Открыть представление"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/quickopen/browser/viewPickerHandler.i18n.json b/i18n/rus/src/vs/workbench/parts/quickopen/browser/viewPickerHandler.i18n.json
deleted file mode 100644
index b813298f21c..00000000000
--- a/i18n/rus/src/vs/workbench/parts/quickopen/browser/viewPickerHandler.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"entryAriaLabel": "{0}, средство выбора представлений",
-	"views": "Представления",
-	"panels": "Панели",
-	"terminals": "Терминал",
-	"terminalTitle": "{0}: {1}",
-	"channels": "Вывод",
-	"openView": "Открыть представление",
-	"quickOpenView": "Быстрое открытие представления"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.i18n.json b/i18n/rus/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.i18n.json
deleted file mode 100644
index a0702c99bc6..00000000000
--- a/i18n/rus/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"relaunchSettingMessage": "После изменения параметра необходима выполнить перезагрузку, чтобы изменения вступили в силу.",
-	"relaunchSettingDetail": "Нажмите кнопку \"Перезагрузить\", чтобы перезагрузить {0} и включить параметр.",
-	"restart": "&&Перезапустить"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.i18n.json b/i18n/rus/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.i18n.json
deleted file mode 100644
index ea48fd0d000..00000000000
--- a/i18n/rus/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.i18n.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"changes": "{0} из {1} изменений",
-	"change": "{0} из {1} изменения",
-	"show previous change": "Показать предыдущее изменение",
-	"show next change": "Показать следующее изменение",
-	"move to previous change": "Перейти к предыдущему изменению",
-	"move to next change": "Перейти к следующему изменению",
-	"editorGutterModifiedBackground": "Цвет фона полей редактора для измененных строк.",
-	"editorGutterAddedBackground": "Цвет фона полей редактора для добавленных строк.",
-	"editorGutterDeletedBackground": "Цвет фона полей редактора для удаленных строк.",
-	"overviewRulerModifiedForeground": "Цвет метки линейки в окне просмотра для измененного содержимого.",
-	"overviewRulerAddedForeground": "Цвет метки линейки в окне просмотра для добавленного содержимого. ",
-	"overviewRulerDeletedForeground": "Цвет метки линейки в окне просмотра для удаленного содержимого. "
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json b/i18n/rus/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
deleted file mode 100644
index 39961b3a4e8..00000000000
--- a/i18n/rus/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleGitViewlet": "Показать GIT",
-	"source control": "Система управления версиями",
-	"toggleSCMViewlet": "Показать SCM",
-	"view": "Просмотреть",
-	"scmConfigurationTitle": "SCM",
-	"alwaysShowProviders": "Всегда отображать хранилище исходного кода",
-	"diffDecorations": "Управляет декораторами diff в редакторе.",
-	"diffGutterWidth": "Управляет шириной (в пикселах) декораторов diff в поле (добавление и изменение)."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/scm/electron-browser/scmActivity.i18n.json b/i18n/rus/src/vs/workbench/parts/scm/electron-browser/scmActivity.i18n.json
deleted file mode 100644
index 105a7a408ea..00000000000
--- a/i18n/rus/src/vs/workbench/parts/scm/electron-browser/scmActivity.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"scmPendingChangesBadge": "Ожидающие изменения: {0}"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/scm/electron-browser/scmMenus.i18n.json b/i18n/rus/src/vs/workbench/parts/scm/electron-browser/scmMenus.i18n.json
deleted file mode 100644
index f345f2df7fa..00000000000
--- a/i18n/rus/src/vs/workbench/parts/scm/electron-browser/scmMenus.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"installAdditionalSCMProviders": "Установить дополнительных поставщиков SCM...",
-	"switch provider": "Переключить поставщик SCM..."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json b/i18n/rus/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
deleted file mode 100644
index 6b3cd3ed9a8..00000000000
--- a/i18n/rus/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"scm providers": "Поставщики систем управления версиями",
-	"hideRepository": "Скрыть",
-	"installAdditionalSCMProviders": "Установить дополнительных поставщиков SCM...",
-	"no open repo": "Отсутствуют активные поставщики систем управления версиями.",
-	"source control": "Система управления версиями",
-	"viewletTitle": "{0}: {1}",
-	"hideView": "Скрыть"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/search/browser/openAnythingHandler.i18n.json b/i18n/rus/src/vs/workbench/parts/search/browser/openAnythingHandler.i18n.json
deleted file mode 100644
index 3c1ec3285ef..00000000000
--- a/i18n/rus/src/vs/workbench/parts/search/browser/openAnythingHandler.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"fileAndTypeResults": "результаты файлов и символов",
-	"fileResults": "файлы по запросу"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/search/browser/openFileHandler.i18n.json b/i18n/rus/src/vs/workbench/parts/search/browser/openFileHandler.i18n.json
deleted file mode 100644
index 2a420381ebe..00000000000
--- a/i18n/rus/src/vs/workbench/parts/search/browser/openFileHandler.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"entryAriaLabel": "{0}, средство выбора файлов",
-	"searchResults": "результаты поиска"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/search/browser/openSymbolHandler.i18n.json b/i18n/rus/src/vs/workbench/parts/search/browser/openSymbolHandler.i18n.json
deleted file mode 100644
index 47379045c7a..00000000000
--- a/i18n/rus/src/vs/workbench/parts/search/browser/openSymbolHandler.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"entryAriaLabel": "{0}, средство выбора символов",
-	"symbols": "результаты символов",
-	"noSymbolsMatching": "Нет соответствующих символов",
-	"noSymbolsWithoutInput": "Введите запрос, чтобы найти символы"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/search/browser/patternInputWidget.i18n.json b/i18n/rus/src/vs/workbench/parts/search/browser/patternInputWidget.i18n.json
deleted file mode 100644
index 0e3c7ad7cb5..00000000000
--- a/i18n/rus/src/vs/workbench/parts/search/browser/patternInputWidget.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"defaultLabel": "ввод",
-	"useExcludesAndIgnoreFilesDescription": "Использовать параметры исключения и игнорировать файлы"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/search/browser/replaceService.i18n.json b/i18n/rus/src/vs/workbench/parts/search/browser/replaceService.i18n.json
deleted file mode 100644
index ab627c3bfae..00000000000
--- a/i18n/rus/src/vs/workbench/parts/search/browser/replaceService.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"fileReplaceChanges": "{0} ↔ {1} (заменить предварительную версию)"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/search/browser/search.contribution.i18n.json b/i18n/rus/src/vs/workbench/parts/search/browser/search.contribution.i18n.json
deleted file mode 100644
index fb91734ab3b..00000000000
--- a/i18n/rus/src/vs/workbench/parts/search/browser/search.contribution.i18n.json
+++ /dev/null
@@ -1,22 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"showTriggerActions": "Перейти к символу в рабочей области...",
-	"name": "Поиск",
-	"search": "Поиск",
-	"view": "Просмотр",
-	"openAnythingHandlerDescription": "Перейти к файлу",
-	"openSymbolDescriptionNormal": "Перейти к символу в рабочей области",
-	"searchOutputChannelTitle": "Поиск",
-	"searchConfigurationTitle": "Поиск",
-	"exclude": "Настройте стандартные маски для исключения файлов и папок при поиске. Все стандартные маски наследуются от параметра file.exclude.",
-	"exclude.boolean": "Стандартная маска, соответствующая путям к файлам. Задайте значение true или false, чтобы включить или отключить маску.",
-	"exclude.when": "Дополнительная проверка элементов того же уровня соответствующего файла. Используйте $(basename) в качестве переменной для соответствующего имени файла.",
-	"useRipgrep": "Определяет, следует ли использовать ripgrep в текстовом поиске и в поиске по файлам",
-	"useIgnoreFiles": "Определяет, следует ли использовать GITIGNORE- и IGNORE-файлы по умолчанию при поиске файлов.",
-	"search.quickOpen.includeSymbols": "Настройте для включения результатов поиска глобальных символов в файлы по запросу для Quick Open.",
-	"search.followSymlinks": "Определяет, нужно ли следовать символическим ссылкам при поиске."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/search/browser/searchActions.i18n.json b/i18n/rus/src/vs/workbench/parts/search/browser/searchActions.i18n.json
deleted file mode 100644
index 012af24286a..00000000000
--- a/i18n/rus/src/vs/workbench/parts/search/browser/searchActions.i18n.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"nextSearchIncludePattern": "Показать следующий шаблон включения в поиск",
-	"previousSearchIncludePattern": "Показать предыдущий шаблон включения в поиск ",
-	"nextSearchExcludePattern": "Показать следующий шаблон исключения из поиска",
-	"previousSearchExcludePattern": "Показать предыдущий шаблон исключения из поиска",
-	"nextSearchTerm": "Показать следующее условие поиска",
-	"previousSearchTerm": "Показать предыдущее условие поиска",
-	"nextReplaceTerm": "Показать следующее условие поиска и замены",
-	"previousReplaceTerm": "Показать предыдущее условие поиска и замены",
-	"findInFiles": "Найти в файлах",
-	"replaceInFiles": "Заменить в файлах",
-	"RefreshAction.label": "Обновить",
-	"CollapseDeepestExpandedLevelAction.label": "Свернуть все",
-	"ClearSearchResultsAction.label": "Очистить",
-	"CancelSearchAction.label": "Отменить поиск",
-	"FocusNextSearchResult.label": "Перейти к следующему результату поиска.",
-	"FocusPreviousSearchResult.label": "Перейти к предыдущему результату поиска.",
-	"RemoveAction.label": "Отклонить",
-	"file.replaceAll.label": "Заменить все",
-	"match.replace.label": "Заменить"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/search/browser/searchResultsView.i18n.json b/i18n/rus/src/vs/workbench/parts/search/browser/searchResultsView.i18n.json
deleted file mode 100644
index d3adc19c362..00000000000
--- a/i18n/rus/src/vs/workbench/parts/search/browser/searchResultsView.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"searchFolderMatch.other.label": "Другие файлы",
-	"searchFileMatches": "Найдено файлов: {0}",
-	"searchFileMatch": "Найден {0} файл",
-	"searchMatches": "Найдено соответствий: {0}",
-	"searchMatch": "Найдено соответствие: {0}",
-	"folderMatchAriaLabel": "Совпадений в корневой папке {1}: {0}, результат поиска",
-	"fileMatchAriaLabel": "Совпадений в файле {1} папки {2}: {0}, результат поиска",
-	"replacePreviewResultAria": "Заменить термин {0} на {1} в столбце {2} и строке {3}",
-	"searchResultAria": "Обнаружен термин {0} в столбце {1} и строке {2}"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/search/browser/searchView.i18n.json b/i18n/rus/src/vs/workbench/parts/search/browser/searchView.i18n.json
deleted file mode 100644
index b197ab3521e..00000000000
--- a/i18n/rus/src/vs/workbench/parts/search/browser/searchView.i18n.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"moreSearch": "Переключить сведения о поиске",
-	"searchScope.includes": "включаемые файлы",
-	"label.includes": "Шаблоны включения в поиск",
-	"searchScope.excludes": "исключаемые файлы",
-	"label.excludes": "Шаблоны исключения из поиска",
-	"replaceAll.confirmation.title": "Заменить все",
-	"replaceAll.confirm.button": "Заменить",
-	"replaceAll.occurrence.file.message": "Вхождение {0} заменено в {1} файле на \"{2}\".",
-	"removeAll.occurrence.file.message": "Вхождение {0} заменено в {1} файле.",
-	"replaceAll.occurrence.files.message": "Вхождение {0} заменено на \"{2}\" в следующем числе файлов: {1}.",
-	"removeAll.occurrence.files.message": "Вхождение {0} заменено в следующем числе файлов: {1}.",
-	"replaceAll.occurrences.file.message": "Вхождения ({0}) заменены в {1} файле на \"{2}\".",
-	"removeAll.occurrences.file.message": "Вхождения ({0}) заменены в {1} файле.",
-	"replaceAll.occurrences.files.message": "Вхождения ({0}) заменены на \"{2}\" в следующем числе файлов: {1}.",
-	"removeAll.occurrences.files.message": "Вхождения ({0}) заменены в следующем числе файлов: {1}.",
-	"removeAll.occurrence.file.confirmation.message": "Заменить вхождение {0} в {1} файле на \"{2}\"?",
-	"replaceAll.occurrence.file.confirmation.message": "Заменить вхождение {0} в {1} файле?",
-	"removeAll.occurrence.files.confirmation.message": "Заменить вхождение {0} на \"{2}\" в следующем числе файлов: {1}?",
-	"replaceAll.occurrence.files.confirmation.message": "Заменить вхождение {0} в следующем числе файлов: {1}?",
-	"removeAll.occurrences.file.confirmation.message": "Заменить вхождения ({0}) в {1} файле на \"{2}\"?",
-	"replaceAll.occurrences.file.confirmation.message": "Заменить вхождения ({0}) в {1} файле?",
-	"removeAll.occurrences.files.confirmation.message": "Заменить вхождения ({0}) на \"{2}\" в следующем числе файлов: {1}?",
-	"replaceAll.occurrences.files.confirmation.message": "Заменить вхождения ({0}) в следующем числе файлов: {1}?",
-	"treeAriaLabel": "Результаты поиска",
-	"searchPathNotFoundError": "Путь поиска не найден: {0}",
-	"searchMaxResultsWarning": "Результирующий набор включает только подмножество всех соответствий. Чтобы уменьшить число результатов, сузьте условия поиска.",
-	"searchCanceled": "Поиск был отменен до того, как были найдены какие-либо результаты — ",
-	"noResultsIncludesExcludes": "Не найдено результатов в \"{0}\", исключая \"{1}\", — ",
-	"noResultsIncludes": "Результаты в \"{0}\" не найдены — ",
-	"noResultsExcludes": "Результаты не найдены за исключением \"{0}\" — ",
-	"noResultsFound": "Ничего не найдено. Проверьте параметры исключений и пропуска файлов.",
-	"rerunSearch.message": "Выполнить поиск еще раз",
-	"rerunSearchInAll.message": "Выполните поиск во всех файлах",
-	"openSettings.message": "Открыть параметры",
-	"openSettings.learnMore": "Дополнительные сведения",
-	"ariaSearchResultsStatus": "Поиск вернул результатов: {0} в файлах: {1}",
-	"search.file.result": "{0} результат в {1} файле",
-	"search.files.result": "{0} результат в следующем числе файлов: {1}",
-	"search.file.results": "Результатов: {0} в {1} файле",
-	"search.files.results": "Результатов: {0} в следующем числе файлов: {1}",
-	"searchWithoutFolder": "Папка еще не открыта. Выполняется поиск только по открытым файлам — ",
-	"openFolder": "Открыть папку"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json b/i18n/rus/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
deleted file mode 100644
index b197ab3521e..00000000000
--- a/i18n/rus/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"moreSearch": "Переключить сведения о поиске",
-	"searchScope.includes": "включаемые файлы",
-	"label.includes": "Шаблоны включения в поиск",
-	"searchScope.excludes": "исключаемые файлы",
-	"label.excludes": "Шаблоны исключения из поиска",
-	"replaceAll.confirmation.title": "Заменить все",
-	"replaceAll.confirm.button": "Заменить",
-	"replaceAll.occurrence.file.message": "Вхождение {0} заменено в {1} файле на \"{2}\".",
-	"removeAll.occurrence.file.message": "Вхождение {0} заменено в {1} файле.",
-	"replaceAll.occurrence.files.message": "Вхождение {0} заменено на \"{2}\" в следующем числе файлов: {1}.",
-	"removeAll.occurrence.files.message": "Вхождение {0} заменено в следующем числе файлов: {1}.",
-	"replaceAll.occurrences.file.message": "Вхождения ({0}) заменены в {1} файле на \"{2}\".",
-	"removeAll.occurrences.file.message": "Вхождения ({0}) заменены в {1} файле.",
-	"replaceAll.occurrences.files.message": "Вхождения ({0}) заменены на \"{2}\" в следующем числе файлов: {1}.",
-	"removeAll.occurrences.files.message": "Вхождения ({0}) заменены в следующем числе файлов: {1}.",
-	"removeAll.occurrence.file.confirmation.message": "Заменить вхождение {0} в {1} файле на \"{2}\"?",
-	"replaceAll.occurrence.file.confirmation.message": "Заменить вхождение {0} в {1} файле?",
-	"removeAll.occurrence.files.confirmation.message": "Заменить вхождение {0} на \"{2}\" в следующем числе файлов: {1}?",
-	"replaceAll.occurrence.files.confirmation.message": "Заменить вхождение {0} в следующем числе файлов: {1}?",
-	"removeAll.occurrences.file.confirmation.message": "Заменить вхождения ({0}) в {1} файле на \"{2}\"?",
-	"replaceAll.occurrences.file.confirmation.message": "Заменить вхождения ({0}) в {1} файле?",
-	"removeAll.occurrences.files.confirmation.message": "Заменить вхождения ({0}) на \"{2}\" в следующем числе файлов: {1}?",
-	"replaceAll.occurrences.files.confirmation.message": "Заменить вхождения ({0}) в следующем числе файлов: {1}?",
-	"treeAriaLabel": "Результаты поиска",
-	"searchPathNotFoundError": "Путь поиска не найден: {0}",
-	"searchMaxResultsWarning": "Результирующий набор включает только подмножество всех соответствий. Чтобы уменьшить число результатов, сузьте условия поиска.",
-	"searchCanceled": "Поиск был отменен до того, как были найдены какие-либо результаты — ",
-	"noResultsIncludesExcludes": "Не найдено результатов в \"{0}\", исключая \"{1}\", — ",
-	"noResultsIncludes": "Результаты в \"{0}\" не найдены — ",
-	"noResultsExcludes": "Результаты не найдены за исключением \"{0}\" — ",
-	"noResultsFound": "Ничего не найдено. Проверьте параметры исключений и пропуска файлов.",
-	"rerunSearch.message": "Выполнить поиск еще раз",
-	"rerunSearchInAll.message": "Выполните поиск во всех файлах",
-	"openSettings.message": "Открыть параметры",
-	"openSettings.learnMore": "Дополнительные сведения",
-	"ariaSearchResultsStatus": "Поиск вернул результатов: {0} в файлах: {1}",
-	"search.file.result": "{0} результат в {1} файле",
-	"search.files.result": "{0} результат в следующем числе файлов: {1}",
-	"search.file.results": "Результатов: {0} в {1} файле",
-	"search.files.results": "Результатов: {0} в следующем числе файлов: {1}",
-	"searchWithoutFolder": "Папка еще не открыта. Выполняется поиск только по открытым файлам — ",
-	"openFolder": "Открыть папку"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/search/browser/searchWidget.i18n.json b/i18n/rus/src/vs/workbench/parts/search/browser/searchWidget.i18n.json
deleted file mode 100644
index 3a958eab763..00000000000
--- a/i18n/rus/src/vs/workbench/parts/search/browser/searchWidget.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"search.action.replaceAll.disabled.label": "Заменить все (отправить поиск для включения)",
-	"search.action.replaceAll.enabled.label": "Заменить все",
-	"search.replace.toggle.button.title": "Переключение замены",
-	"label.Search": "Поиск: введите условие поиска и нажмите клавишу ВВОД, чтобы выполнить поиск, или ESCAPE для отмены",
-	"search.placeHolder": "Поиск",
-	"label.Replace": "Замена: введите термин для замены и нажмите ВВОД для просмотра или ESC для отмены",
-	"search.replace.placeHolder": "Заменить",
-	"regexp.validationFailure": "Выражение соответствует чему угодно",
-	"regexp.backreferenceValidationFailure": "Обратные ссылки не поддерживаются"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/search/common/queryBuilder.i18n.json b/i18n/rus/src/vs/workbench/parts/search/common/queryBuilder.i18n.json
deleted file mode 100644
index ca725ca0f8e..00000000000
--- a/i18n/rus/src/vs/workbench/parts/search/common/queryBuilder.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"search.noWorkspaceWithName": "В рабочей области отсутствуют папки с указанным именем: {0}"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json b/i18n/rus/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
deleted file mode 100644
index 113d804b270..00000000000
--- a/i18n/rus/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"search": "Поиск",
-	"copyMatchLabel": "Копировать",
-	"copyPathLabel": "Скопировать путь",
-	"copyAllLabel": "Копировать все",
-	"clearSearchHistoryLabel": "Очистить историю поиска",
-	"toggleSearchViewPositionLabel": "Переключить положение представления поиска",
-	"findInFolder": "Найти в папке...",
-	"findInWorkspace": "Найти в рабочей области...",
-	"showTriggerActions": "Перейти к символу в рабочей области...",
-	"name": "Поиск",
-	"showSearchViewl": "Показать средство поиска",
-	"view": "Просмотр",
-	"findInFiles": "Найти в файлах",
-	"openAnythingHandlerDescription": "Перейти к файлу",
-	"openSymbolDescriptionNormal": "Перейти к символу в рабочей области",
-	"searchConfigurationTitle": "Поиск",
-	"exclude": "Настройте стандартные маски для исключения файлов и папок при поиске. Все стандартные маски наследуются от параметра file.exclude.",
-	"exclude.boolean": "Стандартная маска, соответствующая путям к файлам. Задайте значение true или false, чтобы включить или отключить маску.",
-	"exclude.when": "Дополнительная проверка элементов того же уровня соответствующего файла. Используйте $(basename) в качестве переменной для соответствующего имени файла.",
-	"useRipgrep": "Определяет, следует ли использовать ripgrep в текстовом поиске и в поиске по файлам",
-	"useIgnoreFiles": "Определяет, следует ли использовать GITIGNORE- и IGNORE-файлы по умолчанию при поиске файлов.",
-	"search.quickOpen.includeSymbols": "Настройте для включения результатов поиска глобальных символов в файлы по запросу для Quick Open.",
-	"search.followSymlinks": "Определяет, нужно ли следовать символическим ссылкам при поиске.",
-	"search.smartCase": "Выполняет поиск без учета регистра, если шаблон состоит только из букв нижнего регистра; в противном случае выполняет поиск с учетом регистра",
-	"search.globalFindClipboard": "Определяет, должно ли представление поиска считывать или изменять общий буфер обмена поиска в macOS",
-	"search.location": "Управляет тем, будет ли панель поиска отображаться в виде представления в боковой колонке или в виде панели в области панели, чтобы освободить пространство по горизонтали."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/search/electron-browser/searchActions.i18n.json b/i18n/rus/src/vs/workbench/parts/search/electron-browser/searchActions.i18n.json
deleted file mode 100644
index 576dd7ba274..00000000000
--- a/i18n/rus/src/vs/workbench/parts/search/electron-browser/searchActions.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"findInFolder": "Найти в папке...",
-	"findInWorkspace": "Найти в рабочей области..."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/snippets/electron-browser/TMSnippets.i18n.json b/i18n/rus/src/vs/workbench/parts/snippets/electron-browser/TMSnippets.i18n.json
deleted file mode 100644
index 1ed22c6e056..00000000000
--- a/i18n/rus/src/vs/workbench/parts/snippets/electron-browser/TMSnippets.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"vscode.extension.contributes.snippets": "Добавляет фрагменты.",
-	"vscode.extension.contributes.snippets-language": "Идентификатор языка, для которого добавляется этот фрагмент.",
-	"vscode.extension.contributes.snippets-path": "Путь к файлу фрагментов. Путь указывается относительно папки расширения и обычно начинается с \"./snippets/\".",
-	"invalid.language": "Неизвестный язык в contributes.{0}.language. Указанное значение: {1}",
-	"invalid.path.0": "В contributes.{0}.path требуется строка. Указанное значение: {1}",
-	"invalid.path.1": "contributes.{0}.path ({1}) должен был быть включен в папку расширения ({2}). Это может сделать расширение непереносимым.",
-	"badVariableUse": "Похоже, во фрагменте \"{0}\" перепутаны переменные и заполнители. Дополнительные сведения см. на странице https://code.visualstudio.com/docs/editor/userdefinedsnippets#_snippet-syntax."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json b/i18n/rus/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json
deleted file mode 100644
index be81058c120..00000000000
--- a/i18n/rus/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"global.scope": "(глобальный)",
-	"global.1": "({0})",
-	"new.global": "Новый файл с глобальным фрагментом кода ",
-	"group.global": "Существующие фрагменты кода",
-	"new.global.sep": "Новые фрагменты кода",
-	"openSnippet.pickLanguage": "Выберите файл фрагментов кода или создайте фрагменты",
-	"openSnippet.label": "Настроить пользовательские фрагменты кода",
-	"preferences": "Параметры"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/snippets/electron-browser/insertSnippet.i18n.json b/i18n/rus/src/vs/workbench/parts/snippets/electron-browser/insertSnippet.i18n.json
deleted file mode 100644
index e024fba5eea..00000000000
--- a/i18n/rus/src/vs/workbench/parts/snippets/electron-browser/insertSnippet.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"snippet.suggestions.label": "Вставить фрагмент кода",
-	"sep.userSnippet": "Фрагменты кода пользователя",
-	"sep.extSnippet": "Фрагменты кода расширения"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json b/i18n/rus/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json
deleted file mode 100644
index 4a2946695c1..00000000000
--- a/i18n/rus/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"snippetSchema.json.default": "Пустой фрагмент",
-	"snippetSchema.json": "Настройка фрагмента пользователя",
-	"snippetSchema.json.prefix": "Префикс, используемый при выборе фрагмента в Intellisense.",
-	"snippetSchema.json.body": "Содержимое фрагмента. Используйте '$1', '${1:defaultText}' для определения положения курсора и '$0' для определения конечного положения курсора. Для вставки переменных используйте синтаксис '${varName}' и '${varName:defaultText}', например, \"Это файл: $TM_FILENAME\".",
-	"snippetSchema.json.description": "Описание фрагмента.",
-	"snippetSchema.json.scope": "Список языков к которым относится этот фрагмент кода, например 'typescript,javascript'"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json b/i18n/rus/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json
deleted file mode 100644
index c1919f596fc..00000000000
--- a/i18n/rus/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"source.snippetGlobal": "Глобальный пользовательский фрагмент кода",
-	"source.snippet": "Фрагмент кода пользователя"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json b/i18n/rus/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
deleted file mode 100644
index 6a37d94b67d..00000000000
--- a/i18n/rus/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"invalid.path.0": "В contributes.{0}.path требуется строка. Указанное значение: {1}",
-	"invalid.language.0": "Если язык не указан, то в качестве значения параметра \"contributes.{0}.path\" необходимо указать файл \".code-snippets\". Указанное значение: {1}",
-	"invalid.language": "Неизвестный язык в contributes.{0}.language. Указанное значение: {1}",
-	"invalid.path.1": "contributes.{0}.path ({1}) должен был быть включен в папку расширения ({2}). Это может сделать расширение непереносимым.",
-	"vscode.extension.contributes.snippets": "Добавляет фрагменты.",
-	"vscode.extension.contributes.snippets-language": "Идентификатор языка, для которого добавляется этот фрагмент.",
-	"vscode.extension.contributes.snippets-path": "Путь к файлу фрагментов. Путь указывается относительно папки расширения и обычно начинается с \"./snippets/\".",
-	"badVariableUse": "Похоже, что в одном или нескольких фрагментах расширения \"{0}\" перепутаны переменные и заполнители. Дополнительные сведения см. на странице https://code.visualstudio.com/docs/editor/userdefinedsnippets#_snippet-syntax.",
-	"badFile": "Не удалось прочитать файл фрагмента \"{0}\".",
-	"detail.snippet": "{0} ({1})",
-	"snippetSuggest.longLabel": "{0}, {1}"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/snippets/electron-browser/tabCompletion.i18n.json b/i18n/rus/src/vs/workbench/parts/snippets/electron-browser/tabCompletion.i18n.json
deleted file mode 100644
index 12064636028..00000000000
--- a/i18n/rus/src/vs/workbench/parts/snippets/electron-browser/tabCompletion.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"tabCompletion": "Вставка фрагментов при совпадении их префиксов. Функция работает оптимально, если параметр \"quickSuggestions\" отключен."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/surveys/electron-browser/languageSurveys.contribution.i18n.json b/i18n/rus/src/vs/workbench/parts/surveys/electron-browser/languageSurveys.contribution.i18n.json
deleted file mode 100644
index 794340391f4..00000000000
--- a/i18n/rus/src/vs/workbench/parts/surveys/electron-browser/languageSurveys.contribution.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"helpUs": "Помогите нам улучшить поддержку {0}",
-	"takeShortSurvey": "Пройдите краткий опрос",
-	"remindLater": "Напомнить мне позже",
-	"neverAgain": "Больше не показывать"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/surveys/electron-browser/nps.contribution.i18n.json b/i18n/rus/src/vs/workbench/parts/surveys/electron-browser/nps.contribution.i18n.json
deleted file mode 100644
index ac0dc50d4a0..00000000000
--- a/i18n/rus/src/vs/workbench/parts/surveys/electron-browser/nps.contribution.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"surveyQuestion": "Вас не затруднит пройти краткий опрос?",
-	"takeSurvey": "Пройти опрос",
-	"remindLater": "Напомнить мне позже",
-	"neverAgain": "Больше не показывать"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/tasks/browser/buildQuickOpen.i18n.json b/i18n/rus/src/vs/workbench/parts/tasks/browser/buildQuickOpen.i18n.json
deleted file mode 100644
index 2037e5496b9..00000000000
--- a/i18n/rus/src/vs/workbench/parts/tasks/browser/buildQuickOpen.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"noTasksMatching": "Нет соответствующих задач"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/tasks/browser/quickOpen.i18n.json b/i18n/rus/src/vs/workbench/parts/tasks/browser/quickOpen.i18n.json
deleted file mode 100644
index 7db7c27ac5c..00000000000
--- a/i18n/rus/src/vs/workbench/parts/tasks/browser/quickOpen.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"entryAriaLabel": "{0}, задачи",
-	"recentlyUsed": "недавно использованные задачи",
-	"configured": "настроенные задачи",
-	"detected": "обнаруженные задачи",
-	"customizeTask": "Настроить задачу"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/tasks/browser/restartQuickOpen.i18n.json b/i18n/rus/src/vs/workbench/parts/tasks/browser/restartQuickOpen.i18n.json
deleted file mode 100644
index b24656f0f48..00000000000
--- a/i18n/rus/src/vs/workbench/parts/tasks/browser/restartQuickOpen.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"tasksAriaLabel": "Введите имя задачи для перезапуска",
-	"noTasksMatching": "Нет соответствующих задач",
-	"noTasksFound": "Задачи для перезапуска не найдены"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/tasks/browser/taskQuickOpen.i18n.json b/i18n/rus/src/vs/workbench/parts/tasks/browser/taskQuickOpen.i18n.json
deleted file mode 100644
index 79e40ad9cbb..00000000000
--- a/i18n/rus/src/vs/workbench/parts/tasks/browser/taskQuickOpen.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"tasksAriaLabel": "Введите имя задачи, которую нужно выполнить",
-	"noTasksMatching": "Нет соответствующих задач",
-	"noTasksFound": "Задачи не найдены"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/tasks/browser/terminateQuickOpen.i18n.json b/i18n/rus/src/vs/workbench/parts/tasks/browser/terminateQuickOpen.i18n.json
deleted file mode 100644
index 0b45bcb05db..00000000000
--- a/i18n/rus/src/vs/workbench/parts/tasks/browser/terminateQuickOpen.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"tasksAriaLabel": "Type the name of a task to terminate",
-	"noTasksMatching": "Нет соответствующих задач",
-	"noTasksFound": "No tasks to terminate found"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/tasks/browser/testQuickOpen.i18n.json b/i18n/rus/src/vs/workbench/parts/tasks/browser/testQuickOpen.i18n.json
deleted file mode 100644
index 2037e5496b9..00000000000
--- a/i18n/rus/src/vs/workbench/parts/tasks/browser/testQuickOpen.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"noTasksMatching": "Нет соответствующих задач"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json b/i18n/rus/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json
deleted file mode 100644
index 9e1a9301226..00000000000
--- a/i18n/rus/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json
+++ /dev/null
@@ -1,76 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"ProblemPatternParser.loopProperty.notLast": "Свойство loop поддерживается только в сопоставителе последней строки.",
-	"ProblemPatternParser.problemPattern.kindProperty.notFirst": "Шаблон проблемы является недопустимым. Свойство kind должно быть указано только для первого элемента.",
-	"ProblemPatternParser.problemPattern.missingRegExp": "В шаблоне проблем отсутствует регулярное выражение.",
-	"ProblemPatternParser.problemPattern.missingProperty": "Шаблон проблемы является недопустимым. Он должен включать файл и сообщение.",
-	"ProblemPatternParser.problemPattern.missingLocation": "Шаблон проблемы является недопустимым. Он должен иметь тип \"file\" или группу соответствия строки или расположения.",
-	"ProblemPatternParser.invalidRegexp": "Ошибка: строка {0} не является допустимым регулярным выражением.\n",
-	"ProblemPatternSchema.regexp": "Регулярное выражение для поиска ошибки, предупреждения или информации в выходных данных.",
-	"ProblemPatternSchema.kind": "соответствует ли шаблон расположению (файл и строка) или только файлу.",
-	"ProblemPatternSchema.file": "Индекс группы сопоставления для имени файла. Если он не указан, используется значение 1.",
-	"ProblemPatternSchema.location": "Индекс группы сопоставления для расположения проблемы. Допустимые шаблоны расположения: (строка), (строка,столбец) и (начальная_строка,начальный_столбец,конечная_строка,конечный_столбец). Если индекс не указан, предполагается шаблон (строка,столбец).",
-	"ProblemPatternSchema.line": "Индекс группы сопоставления для строки проблемы. Значение по умолчанию — 2.",
-	"ProblemPatternSchema.column": "Индекс группы сопоставления для символа в строке проблемы. Значение по умолчанию — 3",
-	"ProblemPatternSchema.endLine": "Индекс группы сопоставления для конечной строки проблемы. По умолчанию не определен.",
-	"ProblemPatternSchema.endColumn": "Индекс группы сопоставления для конечного символа проблемы. По умолчанию не определен.",
-	"ProblemPatternSchema.severity": "Индекс группы сопоставления для серьезности проблемы. По умолчанию не определен.",
-	"ProblemPatternSchema.code": "Индекс группы сопоставления для кода проблемы. По умолчанию не определен.",
-	"ProblemPatternSchema.message": "Индекс группы сопоставления для сообщения. Если он не указан, значение по умолчанию — 4 при незаданном расположении. В противном случае значение по умолчанию — 5.",
-	"ProblemPatternSchema.loop": "В цикле многострочного сопоставителя указывает, выполняется ли этот шаблон в цикле, пока он соответствует. Может указываться только для последнего шаблона в многострочном шаблоне.",
-	"NamedProblemPatternSchema.name": "Имя шаблона проблем.",
-	"NamedMultiLineProblemPatternSchema.name": "Имя шаблона многострочных проблем.",
-	"NamedMultiLineProblemPatternSchema.patterns": "Фактические шаблоны.",
-	"ProblemPatternExtPoint": "Публикует шаблоны проблем",
-	"ProblemPatternRegistry.error": "Недопустимый шаблон проблем. Он будет пропущен.",
-	"ProblemMatcherParser.noProblemMatcher": "Ошибка: описание невозможно преобразовать в сопоставитель проблем:\n{0}\n",
-	"ProblemMatcherParser.noProblemPattern": "Ошибка: в описании не задан допустимый шаблон проблемы:\n{0}\n",
-	"ProblemMatcherParser.noOwner": "Ошибка: в описании не задан владелец:\n{0}\n",
-	"ProblemMatcherParser.noFileLocation": "Ошибка: в описании не указано расположение файла:\n{0}\n",
-	"ProblemMatcherParser.unknownSeverity": "Информация: неизвестная степень серьезности {0}. Допустимые значения: ошибка, предупреждение и информация.\n",
-	"ProblemMatcherParser.noDefinedPatter": "Ошибка: шаблон с идентификатором {0} не существует.",
-	"ProblemMatcherParser.noIdentifier": "Ошибка: свойство шаблона ссылается на пустой идентификатор.",
-	"ProblemMatcherParser.noValidIdentifier": "Ошибка: свойство шаблона {0} не является допустимым именем переменной шаблона.",
-	"ProblemMatcherParser.problemPattern.watchingMatcher": "В сопоставителе проблем должны быть определены как начальный, так и конечный шаблоны для отслеживания.",
-	"ProblemMatcherParser.invalidRegexp": "Ошибка: строка {0} не является допустимым регулярным выражением.\n",
-	"WatchingPatternSchema.regexp": "Регулярное выражение для обнаружения начала или конца фоновой задачи.",
-	"WatchingPatternSchema.file": "Индекс группы сопоставления для имени файла. Может быть опущен.",
-	"PatternTypeSchema.name": "Имя добавленного или предопределенного шаблона",
-	"PatternTypeSchema.description": "Шаблон проблем либо имя добавленного или предопределенного шаблона проблем. Его можно опустить, если указано базовое значение.",
-	"ProblemMatcherSchema.base": "Имя используемого базового сопоставителя проблем.",
-	"ProblemMatcherSchema.owner": "Владелец проблемы в Code. Можно опустить, если указан элемент base. Если владелец опущен, а элемент base не указан, значение по умолчанию — \"внешний\".",
-	"ProblemMatcherSchema.source": "Строка, описывающая источник диагностических сведений, в удобном формате, например, \"typescript\" или \"super lint\".",
-	"ProblemMatcherSchema.severity": "Серьезность по умолчанию для выявленных проблем. Используется, если в шаблоне не определена группа сопоставления для серьезности.",
-	"ProblemMatcherSchema.applyTo": "Определяет, относится ли проблема, о которой сообщается для текстового документа, только к открытым, только к закрытым или ко всем документам.",
-	"ProblemMatcherSchema.fileLocation": "Определяет способ интерпретации имен файлов, указываемых в шаблоне проблемы.",
-	"ProblemMatcherSchema.background": "Шаблоны для отслеживания начала и окончания фоновой задачи.",
-	"ProblemMatcherSchema.background.activeOnStart": "Если задано значение true, средство мониторинга фоновых задач будет находиться в активном режиме при запуске задачи. Это аналогично выдаче строки, соответствующей шаблону начала.",
-	"ProblemMatcherSchema.background.beginsPattern": "При наличии соответствия в выходных данных выдается сигнал о запуске фоновой задачи.",
-	"ProblemMatcherSchema.background.endsPattern": "При наличии соответствия в выходных данных выдается сигнал о завершении фоновой задачи.",
-	"ProblemMatcherSchema.watching.deprecated": "Это свойство для отслеживания устарело. Используйте цвет фона.",
-	"ProblemMatcherSchema.watching": "Шаблоны для отслеживания начала и окончания шаблона отслеживания.",
-	"ProblemMatcherSchema.watching.activeOnStart": "Если задано значение true, наблюдатель находится в активном режиме, когда задача запускается. Это равносильно выдаче строки, соответствующей шаблону начала.",
-	"ProblemMatcherSchema.watching.beginsPattern": "При соответствии в выходных данных сообщает о запуске задачи наблюдения.",
-	"ProblemMatcherSchema.watching.endsPattern": "При соответствии в выходных данных сообщает о завершении задачи наблюдения.",
-	"LegacyProblemMatcherSchema.watchedBegin.deprecated": "Это свойство устарело. Используйте свойство просмотра.",
-	"LegacyProblemMatcherSchema.watchedBegin": "Регулярное выражение, сообщающее о том, что отслеживаемая задача начинает выполняться в результате активации отслеживания файлов.",
-	"LegacyProblemMatcherSchema.watchedEnd.deprecated": "Это свойство устарело. Используйте свойство просмотра.",
-	"LegacyProblemMatcherSchema.watchedEnd": "Регулярное выражение, сообщающее о том, что отслеживаемая задача завершает выполнение.",
-	"NamedProblemMatcherSchema.name": "Имя сопоставителя проблем, используемого для ссылки.",
-	"NamedProblemMatcherSchema.label": "Метка сопоставителя проблем в удобном для чтения формате.",
-	"ProblemMatcherExtPoint": "Публикует сопоставители проблем",
-	"msCompile": "Проблемы компилятора Microsoft",
-	"lessCompile": "Скрыть проблемы",
-	"gulp-tsc": "Проблемы TSC для Gulp",
-	"jshint": "Проблемы JSHint",
-	"jshint-stylish": "Проблемы JSHint, связанные со стилем",
-	"eslint-compact": "Проблемы ESLint, связанные с компактностью",
-	"eslint-stylish": "Проблемы ESLint, связанные со стилем",
-	"go": "Перейти к проблемам"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/tasks/common/taskConfiguration.i18n.json b/i18n/rus/src/vs/workbench/parts/tasks/common/taskConfiguration.i18n.json
deleted file mode 100644
index 90eadea7cc8..00000000000
--- a/i18n/rus/src/vs/workbench/parts/tasks/common/taskConfiguration.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"ConfigurationParser.invalidCWD": "Предупреждение: options.cwd должен иметь тип string. Игнорируется значение {0}\n",
-	"ConfigurationParser.noargs": "Ошибка: аргументы команды должны представлять собой массив строк. Указанное значение:\n{0}",
-	"ConfigurationParser.noShell": "Предупреждение: конфигурация оболочки поддерживается только при выполнении задач в терминале.",
-	"ConfigurationParser.noName": "Ошибка: сопоставитель проблем в области объявления должен иметь имя:\n{0}\n",
-	"ConfigurationParser.unknownMatcherKind": "Предупреждение: определен неизвестный сопоставитель проблем. Поддерживаемые типы: строка | СопоставительПроблем | (строка | СопоставительПроблем)[].\n{0}\n",
-	"ConfigurationParser.invalidVaraibleReference": "Ошибка: недопустимая ссылка на problemMatcher: {0}\n",
-	"ConfigurationParser.noTaskName": "Ошибка: задачи должны предоставлять свойство taskName. Задача будет проигнорирована.\n{0}\n",
-	"taskConfiguration.shellArgs": "Предупреждение: задача \"{0}\" является командой оболочки, и имя команды или одного из ее аргументов включает пробелы без escape-последовательности. Чтобы обеспечить правильную расстановку кавычек в командной строке, объедините аргументы в команде.",
-	"taskConfiguration.noCommandOrDependsOn": "Ошибка: в задаче \"{0}\" не указаны ни команда, ни свойство dependsOn. Задача будет проигнорирована. Определение задачи:\n{1}",
-	"taskConfiguration.noCommand": "Ошибка: задача \"{0}\" не определяет команду. Задача будет игнорироваться. Ее определение:\n{1}"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/tasks/common/taskDefinitionRegistry.i18n.json b/i18n/rus/src/vs/workbench/parts/tasks/common/taskDefinitionRegistry.i18n.json
deleted file mode 100644
index 2d4ee7c907c..00000000000
--- a/i18n/rus/src/vs/workbench/parts/tasks/common/taskDefinitionRegistry.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"TaskDefinition.description": "Фактический тип задачи. Обратите внимание, что типы, начинающиеся с символа '$', зарезервированы для внутреннего использования.",
-	"TaskDefinition.properties": "Дополнительные свойства типа задачи",
-	"TaskTypeConfiguration.noType": "В конфигурации типа задачи отсутствует обязательное свойство 'taskType'",
-	"TaskDefinitionExtPoint": "Добавляет типы задачи"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/tasks/common/taskTemplates.i18n.json b/i18n/rus/src/vs/workbench/parts/tasks/common/taskTemplates.i18n.json
deleted file mode 100644
index 691904b40ec..00000000000
--- a/i18n/rus/src/vs/workbench/parts/tasks/common/taskTemplates.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"dotnetCore": "Выполняет команду сборки .NET Core",
-	"msbuild": "Выполняет целевой объект сборки",
-	"externalCommand": "Пример для запуска произвольной внешней команды",
-	"Maven": "Выполняет стандартные команды Maven"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/tasks/common/taskTypeRegistry.i18n.json b/i18n/rus/src/vs/workbench/parts/tasks/common/taskTypeRegistry.i18n.json
deleted file mode 100644
index 8b6ad71cd4e..00000000000
--- a/i18n/rus/src/vs/workbench/parts/tasks/common/taskTypeRegistry.i18n.json
+++ /dev/null
@@ -1,6 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/tasks/electron-browser/jsonSchemaCommon.i18n.json b/i18n/rus/src/vs/workbench/parts/tasks/electron-browser/jsonSchemaCommon.i18n.json
deleted file mode 100644
index b2b34792486..00000000000
--- a/i18n/rus/src/vs/workbench/parts/tasks/electron-browser/jsonSchemaCommon.i18n.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"JsonSchema.options": "Дополнительные параметры команды",
-	"JsonSchema.options.cwd": "Текущий рабочий каталог выполняемой программы или сценария. Если этот параметр опущен, используется корневой каталог текущей рабочей области Code.",
-	"JsonSchema.options.env": "Среда выполняемой программы или оболочки. Если этот параметр опущен, используется среда родительского процесса.",
-	"JsonSchema.shellConfiguration": "Задает используемую оболочку.",
-	"JsonSchema.shell.executable": "Используемая оболочка.",
-	"JsonSchema.shell.args": "Аргументы оболочки.",
-	"JsonSchema.command": "Выполняемая команда. Это может быть внешняя программа или команда оболочки.",
-	"JsonSchema.tasks.args": "Аргументы, передаваемые в команду при вызове этой задачи.",
-	"JsonSchema.tasks.taskName": "Имя задачи",
-	"JsonSchema.tasks.windows": "Настройка команд Windows",
-	"JsonSchema.tasks.mac": "Настройка команд Mac",
-	"JsonSchema.tasks.linux": "Настройка команд Linux",
-	"JsonSchema.tasks.suppressTaskName": "Определяет, добавляется ли имя задачи в команду в качестве аргумента. Если опущено, используется глобальное значение.",
-	"JsonSchema.tasks.showOutput": "Определяет, выводятся ли выходные данные выполняющейся задачи. Если опущено, используется глобальное значение.",
-	"JsonSchema.echoCommand": "Определяет, переносится ли выполняемая команда в выходные данные. Значение по умолчанию — false.",
-	"JsonSchema.tasks.watching.deprecation": "Устарело. Используйте isBackground.",
-	"JsonSchema.tasks.watching": "Должна ли выполняемая задача оставаться активной и наблюдать за файловой системой.",
-	"JsonSchema.tasks.background": "Поддерживается ли выполняющаяся задача в работающем состоянии и исполняется ли она в фоновом режиме.",
-	"JsonSchema.tasks.promptOnClose": "Отображается ли для пользователя приглашение, если VS Code закрывается с выполняющейся задачей.",
-	"JsonSchema.tasks.build": "Сопоставляет эту задачу с командой сборки Code по умолчанию.",
-	"JsonSchema.tasks.test": "Сопоставляет эту задачу с командой тестирования по умолчанию в Code.",
-	"JsonSchema.tasks.matchers": "Используемые сопоставители проблем. Это может быть строка, определение сопоставителя проблем или массив строк и сопоставителей проблем.",
-	"JsonSchema.args": "Дополнительные аргументы, передаваемые в команду.",
-	"JsonSchema.showOutput": "Определяет, выводятся ли выходные данные выполняющейся задачи. Если опущено, используется значение \"всегда\".",
-	"JsonSchema.watching.deprecation": "Устарело. Используйте isBackground.",
-	"JsonSchema.watching": "Должна ли выполняемая задача оставаться активной и наблюдать за файловой системой.",
-	"JsonSchema.background": "Поддерживается ли выполняющаяся задача в работающем состоянии и исполняется ли она в фоновом режиме.",
-	"JsonSchema.promptOnClose": "Определяет, получает ли пользователь запрос при закрытии редактора VS Code в тот момент, когда выполняется фоновая задача.",
-	"JsonSchema.suppressTaskName": "Определяет, добавляется ли имя задачи в команду в качестве аргумента. Значение по умолчанию — false.",
-	"JsonSchema.taskSelector": "Префикс, указывающий на то, что аргумент является задачей.",
-	"JsonSchema.matchers": "Используемые сопоставители проблем. Это может быть строка, определение сопоставителя проблем или массив строк и сопоставителей проблем.",
-	"JsonSchema.tasks": "Конфигурации задачи. Обычно это дополнительные параметры задачи, уже определенной во внешнем средстве запуска задач."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v1.i18n.json b/i18n/rus/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v1.i18n.json
deleted file mode 100644
index 2c4c0434573..00000000000
--- a/i18n/rus/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v1.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"JsonSchema.version": "Номер версии конфигурации",
-	"JsonSchema._runner": "Средство запуска завершило работу. Используйте официальное свойство средства запуска",
-	"JsonSchema.runner": "Определяет, следует ли запустить задачу в качестве процесса с отображением выходных данных задачи в окне вывода или в терминале.",
-	"JsonSchema.windows": "Настройка команд Windows",
-	"JsonSchema.mac": "Настройка команд Mac",
-	"JsonSchema.linux": "Настройка команд Linux",
-	"JsonSchema.shell": "Указывает, является ли команда командой оболочки или внешней программой. Если опущено, значение по умолчанию — false."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json b/i18n/rus/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
deleted file mode 100644
index 5406c69914a..00000000000
--- a/i18n/rus/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"JsonSchema.shell": "Указывает, является ли команда командой оболочки или внешней программой. Если опущено, значение по умолчанию — false.",
-	"JsonSchema.tasks.isShellCommand.deprecated": "Свойство isShellCommand является устаревшим. Используйте свойство типа задачи и свойство оболочки в параметрах. Также см. заметки о выпуске для версии 1.14.",
-	"JsonSchema.tasks.dependsOn.string": "Другая задача, от которой зависит эта задача.",
-	"JsonSchema.tasks.dependsOn.array": "Другие задачи, от которых зависит эта задача.",
-	"JsonSchema.tasks.presentation": "Настраивает панель, которая используется для представления выходных данных задачи и считывает входные данные задачи.",
-	"JsonSchema.tasks.presentation.echo": "Определяет, стоит ли отправлять выходные данные выполняемой команды на панель. Значение по умолчанию — true.",
-	"JsonSchema.tasks.presentation.focus": "Определяет, принимает ли панель фокус. По умолчанию — false. Если установлено значение true, панель также отображается.",
-	"JsonSchema.tasks.presentation.reveal.always": "Всегда открывать окно терминала при выполнении этой задачи.",
-	"JsonSchema.tasks.presentation.reveal.silent": "Отображать окно терминала только в том случае, если с этой задачей не связан сопоставитель проблем и при выполнении задачи возникли ошибки.",
-	"JsonSchema.tasks.presentation.reveal.never": "Никогда не открывать окно терминала при выполнении этой задачи.",
-	"JsonSchema.tasks.presentation.reveals": "Определяет, отображается ли панель, на которой запущена задача. Значение по умолчанию — \"always\".",
-	"JsonSchema.tasks.presentation.instance": "Определяет, является ли панель общей для нескольких задач, ограничена ли она только одной задачей или создается отдельно для каждого запуска задачи.",
-	"JsonSchema.tasks.terminal": "Свойство terminal является устаревшим. Используйте свойство presentation",
-	"JsonSchema.tasks.group.kind": "Группа выполнения задачи",
-	"JsonSchema.tasks.group.isDefault": "Определяет, является ли эта задача задачей по умолчанию в группе.",
-	"JsonSchema.tasks.group.defaultBuild": "Отмечает задачу как задачу сборки по умолчанию.",
-	"JsonSchema.tasks.group.defaultTest": "Отмечает задачу как задачу тестирования по умолчанию.",
-	"JsonSchema.tasks.group.build": "Отмечает задачу как задачу сборки, доступ к которой осуществляется с помощью команды \"Запустить задачу сборки\".",
-	"JsonSchema.tasks.group.test": "Отмечает задачу как задачу тестирования, доступ к которой осуществляется с помощью команды \"Запустить задачу тестирования\".",
-	"JsonSchema.tasks.group.none": "Отменяет связь задачи со всеми группами",
-	"JsonSchema.tasks.group": "Определяет, к какой группе выполнения принадлежит эта задача. Поддерживаемые значения: \"build\" для добавления задачи к группе сборки и \"test\" для добавления задачи к группе тестирования.",
-	"JsonSchema.tasks.type": "Определяет, выполняется ли задача в виде процесса или в виде команды оболочки.",
-	"JsonSchema.commandArray": "Команда оболочки, которая будет выполнена. Элементы массива будут объединены с помощью пробела",
-	"JsonSchema.command.quotedString.value": "Фактическое значение команды",
-	"JsonSchema.tasks.quoting.escape": "Экранирует символы с помощью escape-символа оболочки (например, \"`\" в PowerShell и\"\\\" в bash).",
-	"JsonSchema.tasks.quoting.strong": "Заключает аргумент в кавычки с использованием символа двойной кавычки (например, \" в PowerShell и bash).",
-	"JsonSchema.tasks.quoting.weak": "Заключает аргумент в кавычки с использованием символа одинарной кавычки (например, ' в PowerShell и bash).",
-	"JsonSchema.command.quotesString.quote": "Указывает, как значение команды должно быть заключено в кавычки.",
-	"JsonSchema.command": "Выполняемая команда. Это может быть внешняя программа или команда оболочки.",
-	"JsonSchema.args.quotedString.value": "Фактическое значение аргумента.",
-	"JsonSchema.args.quotesString.quote": "Указывает, как значение аргумента должно быть заключено в кавычки.",
-	"JsonSchema.tasks.args": "Аргументы, передаваемые в команду при вызове этой задачи.",
-	"JsonSchema.tasks.label": "Метка пользовательского интерфейса задачи",
-	"JsonSchema.version": "Номер версии конфигурации.",
-	"JsonSchema.tasks.identifier": "Пользовательский идентификатор задачи в файле launch.json или в предложении dependsOn.",
-	"JsonSchema.tasks.taskLabel": "Метка задачи",
-	"JsonSchema.tasks.taskName": "Имя задачи",
-	"JsonSchema.tasks.taskName.deprecated": "Свойство name задачи является устаревшим. Используйте свойство label.",
-	"JsonSchema.tasks.background": "Поддерживается ли выполняющаяся задача в работающем состоянии и исполняется ли она в фоновом режиме.",
-	"JsonSchema.tasks.promptOnClose": "Отображается ли для пользователя приглашение, если VS Code закрывается с выполняющейся задачей.",
-	"JsonSchema.tasks.matchers": "Используемые сопоставители проблем. Это может быть строка, определение сопоставителя проблем или массив строк и сопоставителей проблем.",
-	"JsonSchema.customizations.customizes.type": "Тип задачи, который будет изменен",
-	"JsonSchema.tasks.customize.deprecated": "Свойство customize является устаревшим. Сведения о том, как перейти на новый подход к изменению задач, см. в заметках о выпуске для версии 1.14.",
-	"JsonSchema.tasks.showOputput.deprecated": "Свойство showOutput является устаревшим. Используйте свойство reveal в свойстве presentation вместо этого свойства. Также см. заметки о выпуске для версии 1.14.",
-	"JsonSchema.tasks.echoCommand.deprecated": "Свойство echoCommand является устаревшим. Используйте свойство echo в свойстве presentation вместо этого свойства. Также см. заметки о выпуске для версии 1.14.",
-	"JsonSchema.tasks.suppressTaskName.deprecated": "Свойство suppressTaskName является устаревшим. Вместо использования этого свойства включите команду с аргументами в задачу. Также см. заметки о выпуске для версии 1.14.",
-	"JsonSchema.tasks.isBuildCommand.deprecated": "Свойство isBuildCommand является устаревшим. Используйте свойство group вместо этого свойства. Также см. заметки о выпуске для версии 1.14. ",
-	"JsonSchema.tasks.isTestCommand.deprecated": "Свойство isTestCommand является устаревшим. Используйте свойство group вместо этого свойства. Также см. заметки о выпуске для версии 1.14. ",
-	"JsonSchema.tasks.taskSelector.deprecated": "Свойство taskSelector является устаревшим. Вместо использования этого свойства включите команду с аргументами в задачу. Также см. заметки о выпуске для версии 1.14.",
-	"JsonSchema.windows": "Настройка команд Windows",
-	"JsonSchema.mac": "Настройка команд Mac",
-	"JsonSchema.linux": "Настройка команд Linux"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json b/i18n/rus/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
deleted file mode 100644
index 3ad2e6ca5f3..00000000000
--- a/i18n/rus/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
+++ /dev/null
@@ -1,89 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"tasksCategory": "Задачи",
-	"ConfigureTaskRunnerAction.label": "Настроить задачу",
-	"totalErrors": "Ошибок: {0}",
-	"totalWarnings": "Предупреждения: {0}",
-	"totalInfos": "Сообщения: {0}",
-	"problems": "Проблемы",
-	"building": "Сборка...",
-	"manyProblems": "Более 10 тысяч",
-	"runningTasks": "Показать выполняемые задачи",
-	"tasks": "Задачи",
-	"TaskSystem.noHotSwap": "Чтобы изменить подсистему выполнения задач, в которой запущена активная задача, необходимо перезагрузить окно",
-	"reloadWindow": "Перезагрузить окно",
-	"TaskServer.folderIgnored": "Папка {0} будет проигнорирована, так как в ней используется версия задач 0.1.0",
-	"TaskService.noBuildTask1": "Задача сборки не определена. Отметьте задачу с помощью \"isBuildCommand\" в файле tasks.json.",
-	"TaskService.noBuildTask2": "Задача сборки не определена. Отметьте задачу с помощью группы 'build' в файле tasks.json.",
-	"TaskService.noTestTask1": "Задача теста не определена. Отметьте задачу с помощью \"isTestCommand\" в файле tasks.json.",
-	"TaskService.noTestTask2": "Задача теста не определена. Отметьте задачу с помощью группы 'test' в файле tasks.json.",
-	"TaskServer.noTask": "Запрошенная задача {0} для выполнения не найдена.",
-	"TaskService.associate": "связать",
-	"TaskService.attachProblemMatcher.continueWithout": "Продолжить без проверки выходных данных задачи",
-	"TaskService.attachProblemMatcher.never": "Никогда не проверять выходные данные задачи",
-	"TaskService.attachProblemMatcher.learnMoreAbout": "Дополнительные сведения о проверке выходных данных задачи",
-	"selectProblemMatcher": "Выберите, на какие ошибки и предупреждения следует проверять выходные данные задачи",
-	"customizeParseErrors": "В конфигурации текущей задачи есть ошибки. Исправьте ошибки перед изменением задачи.",
-	"moreThanOneBuildTask": "В файле tasks.json определено несколько задач сборки. Выполняется первая задача.\n",
-	"TaskSystem.activeSame.background": "Задача '{0}' уже активна и находится в фоновом режиме.",
-	"TaskSystem.activeSame.noBackground": "Задача '{0}' уже выполняется.",
-	"terminateTask": "Завершить задачу",
-	"restartTask": "Перезапустить задачу",
-	"TaskSystem.active": "Уже выполняется задача. Завершите ее, прежде чем выполнять другую задачу.",
-	"TaskSystem.restartFailed": "Не удалось завершить и перезапустить задачу {0}",
-	"TaskService.noConfiguration": "Ошибка: в определении задачи {0} не выявлена задача для следующей конфигурации:\n{1}\nЗадача будет проигнорирована.\n",
-	"TaskSystem.configurationErrors": "Ошибка: в конфигурации указанной задачи при проверке были выявлены ошибки, и ее невозможно использовать. Сначала устраните ошибки.",
-	"taskService.ignoreingFolder": "Конфигурации задач для папки рабочей области {0} будут проигнорированы. Для задач рабочей области с несколькими папками необходимо, чтобы во всех папках использовалась версия задачи 2.0.0\n",
-	"TaskSystem.invalidTaskJson": "Ошибка: в содержимом файла tasks.json есть синтаксические ошибки. Исправьте их, прежде чем выполнять задачу.\n",
-	"TaskSystem.runningTask": "Имеется выполняющаяся задача. Завершить ее?",
-	"TaskSystem.terminateTask": "&&Завершить задачу",
-	"TaskSystem.noProcess": "Запущенная задача больше не существует. Если задача породила фоновые процессы, выход из Visual Studio Code может привести к появлению потерянных процессов. Чтобы избежать этого, запустите последний фоновый процесс с флагом ожидания.",
-	"TaskSystem.exitAnyways": "&&Выйти",
-	"TerminateAction.label": "Завершить задачу",
-	"TaskSystem.unknownError": "При выполнении задачи произошла ошибка. Подробности см. в журнале задач.",
-	"TaskService.noWorkspace": "Задачи доступны только в папке рабочей области.",
-	"recentlyUsed": "недавно использованные задачи",
-	"configured": "настроенные задачи",
-	"detected": "обнаруженные задачи",
-	"TaskService.ignoredFolder": "Следующие папки рабочей области будут проигнорированы, так как в них используется версия задач 0.1.0: {0}",
-	"TaskService.notAgain": "Больше не показывать",
-	"TaskService.pickRunTask": "Выберите задачу для запуска",
-	"TaslService.noEntryToRun": "Задача для запуска не найдена. Настройте задачи...",
-	"TaskService.fetchingBuildTasks": "Получение задач сборки...",
-	"TaskService.pickBuildTask": "Выберите задачу сборки для запуска",
-	"TaskService.noBuildTask": "Задача сборки для запуска отсутствует. Настройте задачи сборки...",
-	"TaskService.fetchingTestTasks": "Получение задач тестирования...",
-	"TaskService.pickTestTask": "Выберите задачу тестирования для запуска",
-	"TaskService.noTestTaskTerminal": "Тестовая задача для запуска не найдена. Настройте задачи...",
-	"TaskService.tastToTerminate": "Выберите задачи для завершения",
-	"TaskService.noTaskRunning": "Ни одной задачи не запущено",
-	"TerminateAction.noProcess": "Запущенный процесс больше не существует. Если задача породила фоновые задачи, выход из Visual Studio Code может привести к появлению потерянных процессов.",
-	"TerminateAction.failed": "Не удалось завершить запущенную задачу",
-	"TaskService.tastToRestart": "Выберите задачу для перезапуска",
-	"TaskService.noTaskToRestart": "Задачи для перезапуска не найдены",
-	"TaskService.template": "Выберите шаблон задачи",
-	"TaskService.createJsonFile": "Создать файл tasks.json из шаблона",
-	"TaskService.openJsonFile": "Открыть файл tasks.json",
-	"TaskService.pickTask": "Выберите задачу для настройки",
-	"TaskService.defaultBuildTaskExists": "Задача {0} уже помечена как задача сборки по умолчанию",
-	"TaskService.pickDefaultBuildTask": "Выберите задачу, которая будет использоваться в качестве задачи сборки по умолчанию.",
-	"TaskService.defaultTestTaskExists": "{0} уже помечена как задача сборки по умолчанию. ",
-	"TaskService.pickDefaultTestTask": "Выберите задачу, которая будет использоваться в качестве задачи тестирования по умолчанию. ",
-	"TaskService.pickShowTask": "Выберите задачу, выходные данные для которой нужно отобразить",
-	"TaskService.noTaskIsRunning": "Ни одной задачи не запущено",
-	"ShowLogAction.label": "Показать журнал задач",
-	"RunTaskAction.label": "Выполнить задачу",
-	"RestartTaskAction.label": "Перезапустить запущенную задачу",
-	"ShowTasksAction.label": "Показать выполняющиеся задачи",
-	"BuildAction.label": "Выполнить задачу сборки",
-	"TestAction.label": "Выполнить задачу тестирования",
-	"ConfigureDefaultBuildTask.label": "Настроить задачу сборки по умолчанию",
-	"ConfigureDefaultTestTask.label": "Настроить задачу тестирования по умолчанию",
-	"quickOpen.task": "Выполнить задачу"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/tasks/electron-browser/taskPanel.i18n.json b/i18n/rus/src/vs/workbench/parts/tasks/electron-browser/taskPanel.i18n.json
deleted file mode 100644
index a182bfb7e7f..00000000000
--- a/i18n/rus/src/vs/workbench/parts/tasks/electron-browser/taskPanel.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"tasks": "Задачи"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.i18n.json b/i18n/rus/src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.i18n.json
deleted file mode 100644
index 85438793d7f..00000000000
--- a/i18n/rus/src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"TerminalTaskSystem.unknownError": "При выполнении задачи произошла неизвестная ошибка. Подробности см. в журнале выходных данных задач.",
-	"dependencyFailed": "Не удалось разрешить зависимую задачу '{0}' в папке рабочей области '{1}'",
-	"TerminalTaskSystem.terminalName": "Задача — {0}",
-	"closeTerminal": "Нажмите любую клавишу, чтобы закрыть терминал.",
-	"reuseTerminal": "Терминал будет повторно использоваться задачами. Чтобы закрыть его, нажмите любую клавишу.",
-	"TerminalTaskSystem": "Не удается выполнить команду оболочки на диске UNC с помощью cmd.exe.",
-	"unkownProblemMatcher": "Не удается разрешить сопоставитель проблем {0}. Сопоставитель будет проигнорирован"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/tasks/node/processRunnerDetector.i18n.json b/i18n/rus/src/vs/workbench/parts/tasks/node/processRunnerDetector.i18n.json
deleted file mode 100644
index 384dd003f43..00000000000
--- a/i18n/rus/src/vs/workbench/parts/tasks/node/processRunnerDetector.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"TaskSystemDetector.noGulpTasks": "В результате выполнения команды gulp --tasks-simple не было выведено ни одной задачи. Выполнили ли вы команду npm install?",
-	"TaskSystemDetector.noJakeTasks": "В результате выполнения команды jake --tasks не было выведено ни одной задачи. Выполнили ли вы команду npm install?",
-	"TaskSystemDetector.noGulpProgram": "Gulp не установлен в вашей системе. Чтобы установить его, выполните команду npm install -g gulp.",
-	"TaskSystemDetector.noJakeProgram": "Jake не установлен в вашей системе. Чтобы установить его, выполните команду npm install -g jake.",
-	"TaskSystemDetector.noGruntProgram": "Grunt не установлен в вашей системе. Чтобы установить его, выполните команду npm install -g grunt.",
-	"TaskSystemDetector.noProgram": "Программа {0} не найдена. Сообщение: {1}",
-	"TaskSystemDetector.buildTaskDetected": "Обнаружена задача сборки \"{0}\".",
-	"TaskSystemDetector.testTaskDetected": "Обнаружена задача тестирования \"{0}\"."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/tasks/node/processTaskSystem.i18n.json b/i18n/rus/src/vs/workbench/parts/tasks/node/processTaskSystem.i18n.json
deleted file mode 100644
index 577fafc0f41..00000000000
--- a/i18n/rus/src/vs/workbench/parts/tasks/node/processTaskSystem.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"TaskRunnerSystem.unknownError": "При выполнении задачи произошла неизвестная ошибка. Подробности см. в журнале выходных данных задач.",
-	"TaskRunnerSystem.watchingBuildTaskFinished": "\nОтслеживание задач сборки завершено.",
-	"TaskRunnerSystem.childProcessError": "Failed to launch external program {0} {1}.",
-	"TaskRunnerSystem.cancelRequested": "\nЗадача \"{0}\" была завершена по запросу пользователя.",
-	"unkownProblemMatcher": "Не удается разрешить сопоставитель проблем {0}. Сопоставитель будет проигнорирован"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json b/i18n/rus/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
deleted file mode 100644
index b7b348484d2..00000000000
--- a/i18n/rus/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"ConfigurationParser.invalidCWD": "Предупреждение: options.cwd должен иметь тип string. Игнорируется значение {0}\n",
-	"ConfigurationParser.inValidArg": "Ошибка: аргумент команды должен представлять строку или строку в кавычках. Указанное значение:\n{0}",
-	"ConfigurationParser.noargs": "Ошибка: аргументы команды должны представлять собой массив строк. Указанное значение:\n{0}",
-	"ConfigurationParser.noShell": "Предупреждение: конфигурация оболочки поддерживается только при выполнении задач в терминале.",
-	"ConfigurationParser.noName": "Ошибка: сопоставитель проблем в области объявления должен иметь имя:\n{0}\n",
-	"ConfigurationParser.unknownMatcherKind": "Предупреждение: определен неизвестный сопоставитель проблем. Поддерживаемые типы: строка | СопоставительПроблем | (строка | СопоставительПроблем)[].\n{0}\n",
-	"ConfigurationParser.invalidVaraibleReference": "Ошибка: недопустимая ссылка на problemMatcher: {0}\n",
-	"ConfigurationParser.noTaskType": "Ошибка: в конфигурации задач должно присутствовать свойство типа. Конфигурация будет проигнорирована.\n{0}\n",
-	"ConfigurationParser.noTypeDefinition": "Ошибка: тип задачи '{0}' не зарегистрирован. Возможно, вы не установили расширение, которое предоставляет соответствующий поставщик задач.",
-	"ConfigurationParser.missingRequiredProperty": "Ошибка: в конфигурации задачи '{0}' отсутствует необходимое свойство '{1}'. Конфигурация задачи будет проигнорирована.",
-	"ConfigurationParser.notCustom": "Ошибка: задачи не объявлены в качестве пользовательской задачи. Конфигурация будет проигнорирована.\n{0}\n",
-	"ConfigurationParser.noTaskName": "Ошибка: в задаче должно быть указано свойство метки. Задача будет проигнорирована.\n{0}\n",
-	"taskConfiguration.noCommandOrDependsOn": "Ошибка: в задаче \"{0}\" не указаны ни команда, ни свойство dependsOn. Задача будет проигнорирована. Определение задачи:\n{1}",
-	"taskConfiguration.noCommand": "Ошибка: задача \"{0}\" не определяет команду. Задача будет игнорироваться. Ее определение:\n{1}",
-	"TaskParse.noOsSpecificGlobalTasks": "Версия задач 2.0.0 не поддерживает глобальные задачи для конкретных ОС. Преобразуйте их в задачи с помощью команд для конкретных ОС.\nЗатронутые задачи: {0}"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.i18n.json b/i18n/rus/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.i18n.json
deleted file mode 100644
index f97f741a841..00000000000
--- a/i18n/rus/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"termEntryAriaLabel": "{0}, средство выбора терминалов",
-	"termCreateEntryAriaLabel": "{0}, создать новый терминал",
-	"workbench.action.terminal.newplus": "$(plus) Создать новый интегрированный терминал",
-	"noTerminalsMatching": "Терминалы, соответствующие условию, отсутствуют",
-	"noTerminalsFound": "Открытые терминалы отсутствуют"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/terminal/common/terminalColorRegistry.i18n.json b/i18n/rus/src/vs/workbench/parts/terminal/common/terminalColorRegistry.i18n.json
deleted file mode 100644
index aca12bf1061..00000000000
--- a/i18n/rus/src/vs/workbench/parts/terminal/common/terminalColorRegistry.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"terminal.background": "Цвет фона терминала. С его помощью можно указать цвет терминала, отличный от цвета панели.",
-	"terminal.foreground": "Цвет переднего плана терминала.",
-	"terminalCursor.foreground": "Цвет переднего плана курсора терминала.",
-	"terminalCursor.background": "Цвет фона курсора терминала. Позволяет выбрать цвет символа, который перекрывается блочным курсором.",
-	"terminal.selectionBackground": "Цвет фона выделения терминала.",
-	"terminal.border": "Цвет границы, которая отделяет области в терминале. По умолчанию используется panel.border.",
-	"terminal.ansiColor": "Цвет ANSI \"{0}\" в терминале."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json b/i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
deleted file mode 100644
index e05b07ca1e0..00000000000
--- a/i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"quickOpen.terminal": "Показать все открытые терминалы",
-	"terminal": "Терминал",
-	"terminalIntegratedConfigurationTitle": "Интегрированный терминал",
-	"terminal.integrated.shell.linux": "Путь оболочки, который используется терминалом в Linux.",
-	"terminal.integrated.shellArgs.linux": "Аргументы командной строки, которые следует использовать в терминале Linux.",
-	"terminal.integrated.shell.osx": "Путь оболочки, который используется терминалом в OS X.",
-	"terminal.integrated.shellArgs.osx": "Аргументы командной строки, которые следует использовать в терминале OS X.",
-	"terminal.integrated.shell.windows": "Путь к оболочке, который используется терминалом в Windows. Для оболочек, входящих в состав ОС Windows (cmd, PowerShell или Bash в Ubuntu).",
-	"terminal.integrated.shellArgs.windows": "Аргументы командной строки, используемые в терминале Windows.",
-	"terminal.integrated.macOptionIsMeta": "Считать клавишу OPTION метаклавишей в терминале macOS.",
-	"terminal.integrated.copyOnSelection": "Если задано, текст выделенный в терминале будет скопирован в буфер обмена",
-	"terminal.integrated.fontFamily": "Определяет семейство шрифтов терминала, значение по умолчанию — editor.fontFamily.",
-	"terminal.integrated.fontSize": "Определяет размер шрифта (в пикселях) для терминала.",
-	"terminal.integrated.letterSpacing": "Управляет межсимвольным интервалом в терминале. Это целочисленное значение, которое представляет собой количество дополнительных пикселей между символами.",
-	"terminal.integrated.lineHeight": "Определяет высоту строки терминала; это число умножается на размер шрифта терминала, что дает фактическую высоту строки в пикселях.",
-	"terminal.integrated.fontWeight": "Размер шрифта в терминале для нежирного текста.",
-	"terminal.integrated.fontWeightBold": "Размер шрифта в терминале для полужирного текста. ",
-	"terminal.integrated.cursorBlinking": "Управляет миганием курсора терминала.",
-	"terminal.integrated.cursorStyle": "Определяет стиль курсора терминала.",
-	"terminal.integrated.scrollback": "Определяет предельное число строк в буфере терминала.",
-	"terminal.integrated.setLocaleVariables": "Управляет заданием переменных при запуске терминала, значение по умолчанию: \"True\" для OS X и \"False\" для других платформ.",
-	"terminal.integrated.rendererType": "Управляет отображением терминала. Допустимые значения: \"canvas\" (использование стандартного быстрого модуля отображения на основе холста), \"dom\" (использование резервного модуля отображения на основе DOM) и \"auto\" (модуль отображения определяется средой VS Code). После изменения этого параметра необходимо перезапустить VS, чтобы изменения вступили в силу.",
-	"terminal.integrated.rightClickBehavior": "Управляет тем, как терминал реагирует на щелчок правой кнопкой мыши. Возможные значения: \"default\", \"copyPaste\" и \"selectWord\". При выборе варианта \"default\" будет отображаться контекстное меню, при выборе варианта \"copyPaste\" выделенный текст будет скопирован, а при отсутствии выделенного текста – вставлен, при выборе варианта \"selectWord\" будет выбрано слово, над которым находится курсор, и будет отображено контекстное меню.",
-	"terminal.integrated.cwd": "Путь явного запуска, по которому будет запущен терминал. Используется в качестве текущего рабочего каталога (cwd) для процесса оболочки. Это может быть особенно удобно в параметрах рабочей области, если корневой каталог не является подходящим каталогом cwd.",
-	"terminal.integrated.confirmOnExit": "Указывает, следует ли при выходе выводить подтверждение об имеющихся активных сеансах терминала.",
-	"terminal.integrated.enableBell": "Определяет, включен ли \"звонок\" терминала.",
-	"terminal.integrated.commandsToSkipShell": "Набор идентификаторов команд, настраиваемые сочетания клавиш которых не будут передаваться в оболочку, а вместо этого будут всегда обрабатываться Code. Это позволяет использовать настраиваемые сочетания клавиш, которые при обычных условиях были бы использованы оболочкой и работали бы так же, как если бы терминал не имел фокуса, например клавиши CTRL+P запускали бы Quick Open.",
-	"terminal.integrated.env.osx": "Объект с переменными среды, которые будут добавлены к процессу VS Code для использования в терминале OS X",
-	"terminal.integrated.env.linux": "Объект с переменными среды, которые будут добавлены к процессу VS Code для использования в терминале Linux ",
-	"terminal.integrated.env.windows": "Объект с переменными среды, которые будут добавлены к процессу VS Code для использования в терминале Windows",
-	"terminal.integrated.showExitAlert": "Отображать предупреждение \"Процесс терминала завершен с кодом выхода\", если код выхода не равен нулю.",
-	"terminal.integrated.experimentalRestore": "Восстанавливать ли сеансы терминала для рабочей области автоматически при запуске VS Code. Это экспериментальный параметр; он может приводить к ошибкам и может быть изменен в будущем.",
-	"terminalCategory": "Терминал",
-	"viewCategory": "Просмотреть"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json b/i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
deleted file mode 100644
index ea0d455fc7f..00000000000
--- a/i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
+++ /dev/null
@@ -1,63 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"workbench.action.terminal.toggleTerminal": "Переключить интегрированный терминал",
-	"workbench.action.terminal.kill": "Завершить активный экземпляр терминала",
-	"workbench.action.terminal.kill.short": "Завершить работу терминала",
-	"workbench.action.terminal.quickKill": "Завершить работу экземпляра терминала",
-	"workbench.action.terminal.copySelection": "Скопировать выделение",
-	"workbench.action.terminal.selectAll": "Выбрать все",
-	"workbench.action.terminal.deleteWordLeft": "Удалить слово слева",
-	"workbench.action.terminal.deleteWordRight": "Удалить слово справа",
-	"workbench.action.terminal.moveToLineStart": "Перейти к началу строки",
-	"workbench.action.terminal.moveToLineEnd": "Перейти к концу строки",
-	"workbench.action.terminal.new": "Создание нового интегрированного терминала",
-	"workbench.action.terminal.new.short": "Новый терминал",
-	"workbench.action.terminal.newWorkspacePlaceholder": "Выбрать текущий рабочий каталог для нового терминала",
-	"workbench.action.terminal.newInActiveWorkspace": "Создать новый интегрированный терминал (в активной рабочей области)",
-	"workbench.action.terminal.split": "Разделить терминал",
-	"workbench.action.terminal.splitInActiveWorkspace": "Разбить окно терминала (в активной рабочей области)",
-	"workbench.action.terminal.focusPreviousPane": "Перейти на предыдущую область",
-	"workbench.action.terminal.focusNextPane": "Перейти на следующую область",
-	"workbench.action.terminal.resizePaneLeft": "Изменить размер области слева",
-	"workbench.action.terminal.resizePaneRight": "Изменить размер области справа",
-	"workbench.action.terminal.resizePaneUp": "Изменить размер области вверху",
-	"workbench.action.terminal.resizePaneDown": "Изменить размер области внизу",
-	"workbench.action.terminal.focus": "Фокус на терминале",
-	"workbench.action.terminal.focusNext": "Фокус на следующем терминале",
-	"workbench.action.terminal.focusPrevious": "Фокус на предыдущем терминале",
-	"workbench.action.terminal.paste": "Вставить в активный терминал",
-	"workbench.action.terminal.DefaultShell": "Выбрать оболочку по умолчанию",
-	"workbench.action.terminal.runSelectedText": "Запуск выбранного текста в активном терминале",
-	"workbench.action.terminal.runActiveFile": "Запуск активного файла в активном терминале",
-	"workbench.action.terminal.runActiveFile.noFile": "Только файлы на диске можно запустить в терминале",
-	"workbench.action.terminal.switchTerminal": "Переключить терминал",
-	"workbench.action.terminal.scrollDown": "Прокрутить вниз (построчно)",
-	"workbench.action.terminal.scrollDownPage": "Прокрутить вниз (на страницу)",
-	"workbench.action.terminal.scrollToBottom": "Прокрутить до нижней границы",
-	"workbench.action.terminal.scrollUp": "Прокрутить вверх (построчно)",
-	"workbench.action.terminal.scrollUpPage": "Прокрутить вверх (страницу)",
-	"workbench.action.terminal.scrollToTop": "Прокрутить до верхней границы",
-	"workbench.action.terminal.clear": "Очистить",
-	"workbench.action.terminal.clearSelection": "Очистить выбранное",
-	"workbench.action.terminal.allowWorkspaceShell": "Разрешить настройку оболочки в рабочей области",
-	"workbench.action.terminal.disallowWorkspaceShell": "Запретить настройку оболочки в рабочей области",
-	"workbench.action.terminal.rename": "Переименовать",
-	"workbench.action.terminal.rename.prompt": "Введите название терминала",
-	"workbench.action.terminal.focusFindWidget": "Выделить мини-приложение поиска",
-	"workbench.action.terminal.hideFindWidget": "Скрыть мини-приложение поиска",
-	"nextTerminalFindTerm": "Показать следующий найденный термин",
-	"previousTerminalFindTerm": "Показать предыдущий найденный термин",
-	"quickOpenTerm": "Переключить активный терминал",
-	"workbench.action.terminal.scrollToPreviousCommand": "Перейти к предыдущей команде",
-	"workbench.action.terminal.scrollToNextCommand": "Перейти к следующей команде",
-	"workbench.action.terminal.selectToPreviousCommand": "Выбрать предыдущую команду",
-	"workbench.action.terminal.selectToNextCommand": "Выбрать следующую команду",
-	"workbench.action.terminal.selectToPreviousLine": "Выделить текст до предыдущей строки",
-	"workbench.action.terminal.selectToNextLine": "Выделить текст до следующей строки"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json b/i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
deleted file mode 100644
index aca12bf1061..00000000000
--- a/i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"terminal.background": "Цвет фона терминала. С его помощью можно указать цвет терминала, отличный от цвета панели.",
-	"terminal.foreground": "Цвет переднего плана терминала.",
-	"terminalCursor.foreground": "Цвет переднего плана курсора терминала.",
-	"terminalCursor.background": "Цвет фона курсора терминала. Позволяет выбрать цвет символа, который перекрывается блочным курсором.",
-	"terminal.selectionBackground": "Цвет фона выделения терминала.",
-	"terminal.border": "Цвет границы, которая отделяет области в терминале. По умолчанию используется panel.border.",
-	"terminal.ansiColor": "Цвет ANSI \"{0}\" в терминале."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalConfigHelper.i18n.json b/i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalConfigHelper.i18n.json
deleted file mode 100644
index f849491552e..00000000000
--- a/i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalConfigHelper.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"terminal.integrated.allowWorkspaceShell": "Вы хотите разрешить запуск {0} (определяется как параметр рабочей области) в терминале?",
-	"allow": "Allow",
-	"disallow": "Disallow"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalFindWidget.i18n.json b/i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalFindWidget.i18n.json
deleted file mode 100644
index e03b15626d2..00000000000
--- a/i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalFindWidget.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"label.find": "Найти",
-	"placeholder.find": "Найти",
-	"label.previousMatchButton": "Предыдущее соответствие",
-	"label.nextMatchButton": "Следующее соответствие",
-	"label.closeButton": "Закрыть"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json b/i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json
deleted file mode 100644
index ff481cfdd88..00000000000
--- a/i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"terminal.integrated.a11yBlankLine": "Пустая строка",
-	"terminal.integrated.a11yPromptLabel": "Ввод терминала",
-	"terminal.integrated.a11yTooMuchOutput": "Объем выходных данных слишком велик для создания оповещения; проверьте строки вручную",
-	"yes": "Да",
-	"terminal.rendererInAllNewTerminals": "Во всех созданных терминалах будет использоваться модуль отображения, не связанный с GPU.",
-	"no": "Нет",
-	"dontShowAgain": "Больше не показывать",
-	"terminal.slowRendering": "Стандартный модуль отображения для встроенного терминала работает медленно. Вы хотите переключиться на альтернативный модуль отображения на основе DOM, который может повысить производительность? [Дополнительные сведения о параметрах терминала](https://code.visualstudio.com/docs/editor/integrated-terminal#_changing-how-the-terminal-is-rendered).",
-	"terminal.integrated.copySelection.noSelection": "В терминале отсутствует выделенный текст для копирования",
-	"terminal.integrated.exitedWithCode": "Процесс терминала завершен с кодом выхода: {0}",
-	"terminal.integrated.waitOnExit": "Нажмите любую клавишу, чтобы закрыть терминал.",
-	"terminal.integrated.launchFailed": "Не удалось запустить команду процесса терминала \"{0}{1}\" (код выхода: {2})",
-	"terminal.integrated.launchFailedExtHost": "Не удалось запустить процесс терминала (код выхода: {0})"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalLinkHandler.i18n.json b/i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalLinkHandler.i18n.json
deleted file mode 100644
index 89034422189..00000000000
--- a/i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalLinkHandler.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"terminalLinkHandler.followLinkAlt": "Щелкните с нажатой клавишей ALT, чтобы перейти по ссылке.",
-	"terminalLinkHandler.followLinkCmd": "Щелкните с нажатой клавишей Cmd, чтобы перейти по ссылке",
-	"terminalLinkHandler.followLinkCtrl": "Щелкните с нажатой клавишей Ctrl, чтобы перейти по ссылке"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json b/i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json
deleted file mode 100644
index ef726c94ace..00000000000
--- a/i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"terminal.useMonospace": "Использовать моноширинные шрифты",
-	"terminal.monospaceOnly": "Этот терминал поддерживает только моноширинные шрифты.",
-	"copy": "Копировать",
-	"split": "Разделить",
-	"paste": "Вставить",
-	"selectAll": "Выбрать все",
-	"clear": "Очистить"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json b/i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
deleted file mode 100644
index cc8f5ba6255..00000000000
--- a/i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"terminal.integrated.chooseWindowsShellInfo": "Вы можете изменить оболочку терминала по умолчанию, нажав кнопку \"Настроить\".",
-	"customize": "Настроить",
-	"never again": "Больше не показывать",
-	"terminal.integrated.chooseWindowsShell": "Выберите предпочитаемую оболочку терминала. Ее можно позже изменить в параметрах",
-	"terminalService.terminalCloseConfirmationSingular": "Есть активный сеанс терминала, завершить его?",
-	"terminalService.terminalCloseConfirmationPlural": "Есть несколько активных сеансов терминала ({0}), завершить их?"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/themes/electron-browser/themes.contribution.i18n.json b/i18n/rus/src/vs/workbench/parts/themes/electron-browser/themes.contribution.i18n.json
deleted file mode 100644
index d000914c955..00000000000
--- a/i18n/rus/src/vs/workbench/parts/themes/electron-browser/themes.contribution.i18n.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"selectTheme.label": "Цветовая тема",
-	"themes.category.light": "светлые темы",
-	"themes.category.dark": "темные темы",
-	"themes.category.hc": "темы с высоким контрастом",
-	"installColorThemes": "Установить дополнительные цветовые темы...",
-	"themes.selectTheme": "Выберите цветовую тему (используйте клавиши стрелок вверх и вниз для предварительного просмотра)",
-	"selectIconTheme.label": "Тема значков файлов",
-	"noIconThemeLabel": "Нет",
-	"noIconThemeDesc": "Отключить значки файлов",
-	"installIconThemes": "Установить дополнительные темы значков файлов...",
-	"themes.selectIconTheme": "Выбрать тему значка файла",
-	"generateColorTheme.label": "Создать цветовую тему на основе текущих параметров",
-	"preferences": "Параметры",
-	"developer": "Разработчик"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/trust/electron-browser/unsupportedWorkspaceSettings.contribution.i18n.json b/i18n/rus/src/vs/workbench/parts/trust/electron-browser/unsupportedWorkspaceSettings.contribution.i18n.json
deleted file mode 100644
index a9d5c44acd5..00000000000
--- a/i18n/rus/src/vs/workbench/parts/trust/electron-browser/unsupportedWorkspaceSettings.contribution.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openWorkspaceSettings": "Открыть параметры рабочей области",
-	"dontShowAgain": "Больше не показывать",
-	"unsupportedWorkspaceSettings": "Эта рабочая область содержит параметры, которые можно задать только в параметрах пользователя. ({0}) Дополнительные сведения см. [здесь]({1})."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json b/i18n/rus/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json
deleted file mode 100644
index 52d5c03cd56..00000000000
--- a/i18n/rus/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"releaseNotesInputName": "Заметки о выпуске: {0}",
-	"unassigned": "не присвоено"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/update/electron-browser/releaseNotesInput.i18n.json b/i18n/rus/src/vs/workbench/parts/update/electron-browser/releaseNotesInput.i18n.json
deleted file mode 100644
index 0d02862c2ca..00000000000
--- a/i18n/rus/src/vs/workbench/parts/update/electron-browser/releaseNotesInput.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"releaseNotesInputName": "Заметки о выпуске: {0}"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/update/electron-browser/update.contribution.i18n.json b/i18n/rus/src/vs/workbench/parts/update/electron-browser/update.contribution.i18n.json
deleted file mode 100644
index d0026de322c..00000000000
--- a/i18n/rus/src/vs/workbench/parts/update/electron-browser/update.contribution.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"release notes": "Заметки о выпуске"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/update/electron-browser/update.i18n.json b/i18n/rus/src/vs/workbench/parts/update/electron-browser/update.i18n.json
deleted file mode 100644
index 0aa45675119..00000000000
--- a/i18n/rus/src/vs/workbench/parts/update/electron-browser/update.i18n.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"releaseNotes": "Заметки о выпуске",
-	"showReleaseNotes": "Показать заметки о выпуске",
-	"read the release notes": "Вас приветствует {0} v{1}! Вы хотите прочитать заметки о выпуске?",
-	"licenseChanged": "Наши условия лицензии изменились. Чтобы ознакомиться с ними, щелкните [здесь]({0}).",
-	"neveragain": "Больше не показывать",
-	"64bitisavailable": "{0} для 64-разрядной версии Windows теперь доступен! Дополнительные сведения см. [здесь]({1}).",
-	"updateIsReady": "Доступно новое обновление {0}.",
-	"noUpdatesAvailable": "Доступные обновления отсутствуют.",
-	"ok": "ОК",
-	"thereIsUpdateAvailable": "Доступно обновление.",
-	"download now": "Скачать сейчас",
-	"later": "Позже",
-	"updateAvailable": "Доступно обновление: {0} {1}",
-	"installUpdate": "Установить обновление",
-	"updateInstalling": "{0} {1} устанавливается в фоновом режиме, мы сообщим вам о завершении.",
-	"updateAvailableAfterRestart": "Перезапустите {0}, чтобы применить последнее обновление.",
-	"updateNow": "Обновить сейчас",
-	"commandPalette": "Палитра команд...",
-	"settings": "Параметры",
-	"keyboardShortcuts": "Сочетания клавиш",
-	"showExtensions": "Управление расширениями",
-	"userSnippets": "Фрагменты кода пользователя",
-	"selectTheme.label": "Цветовая тема",
-	"themes.selectIconTheme.label": "Тема значков файлов",
-	"checkForUpdates": "Проверить наличие обновлений...",
-	"checkingForUpdates": "Идет проверка наличия обновлений...",
-	"DownloadingUpdate": "Скачивается обновление...",
-	"installUpdate...": "Установить обновление...",
-	"installingUpdate": "Идет установка обновления...",
-	"restartToUpdate": "Перезапустить для обновления..."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/url/electron-browser/url.contribution.i18n.json b/i18n/rus/src/vs/workbench/parts/url/electron-browser/url.contribution.i18n.json
deleted file mode 100644
index 2c18fffece4..00000000000
--- a/i18n/rus/src/vs/workbench/parts/url/electron-browser/url.contribution.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openUrl": "Открыть URL",
-	"developer": "Разработчик"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/views/browser/views.i18n.json b/i18n/rus/src/vs/workbench/parts/views/browser/views.i18n.json
deleted file mode 100644
index b0fa6d5e7e3..00000000000
--- a/i18n/rus/src/vs/workbench/parts/views/browser/views.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"viewToolbarAriaLabel": "Действий: {0}",
-	"hideView": "Скрыть из боковой панели"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/views/browser/viewsExtensionPoint.i18n.json b/i18n/rus/src/vs/workbench/parts/views/browser/viewsExtensionPoint.i18n.json
deleted file mode 100644
index 1ad62d4bc9b..00000000000
--- a/i18n/rus/src/vs/workbench/parts/views/browser/viewsExtensionPoint.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"requirearray": "представления должны быть массивом",
-	"requirestring": "свойство \"{0}\" является обязательным и должно иметь тип string",
-	"optstring": "свойство \"{0}\" может быть опущено или должно иметь тип string",
-	"vscode.extension.contributes.view.id": "Идентификатор представления. Используйте его для регистрации поставщика данных с помощью API-интерфейса \"vscode.window.registerTreeDataProviderForView\", а также для активации расширения с помощью регистрации события \"onView:${id}\" в \"activationEvents\".",
-	"vscode.extension.contributes.view.name": "Понятное имя представления. Будет отображаться на экране",
-	"vscode.extension.contributes.view.when": "Условие, которое должно иметь значение 'true', чтобы отображалось это представление",
-	"vscode.extension.contributes.views": "Добавляет представления в редактор",
-	"views.explorer": "Представление проводника",
-	"views.debug": "Представление отладки",
-	"locationId.invalid": "\"{0}\" не является допустимым расположением представления"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/watermark/electron-browser/watermark.i18n.json b/i18n/rus/src/vs/workbench/parts/watermark/electron-browser/watermark.i18n.json
deleted file mode 100644
index 3f1335b5065..00000000000
--- a/i18n/rus/src/vs/workbench/parts/watermark/electron-browser/watermark.i18n.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"watermark.showCommands": "Показать все команды",
-	"watermark.quickOpen": "Перейти к файлу",
-	"watermark.openFile": "Открыть файл",
-	"watermark.openFolder": "Открыть папку",
-	"watermark.openFileFolder": "Открыть файл или папку",
-	"watermark.openRecent": "Открыть последние",
-	"watermark.newUntitledFile": "Новый файл без имени",
-	"watermark.toggleTerminal": "Терминал",
-	"watermark.findInFiles": "Найти в файлах",
-	"watermark.startDebugging": "Начать отладку",
-	"watermark.unboundCommand": "свободный",
-	"workbenchConfigurationTitle": "Рабочее место",
-	"tips.enabled": "Если параметр включен, на подложке появляются советы, если нет открытых редакторов."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json b/i18n/rus/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json
deleted file mode 100644
index dfb29cabd85..00000000000
--- a/i18n/rus/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"webview.editor.label": "Редактор веб-представления",
-	"developer": "Разработчик"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/webview/electron-browser/webviewCommands.i18n.json b/i18n/rus/src/vs/workbench/parts/webview/electron-browser/webviewCommands.i18n.json
deleted file mode 100644
index 18d62a09459..00000000000
--- a/i18n/rus/src/vs/workbench/parts/webview/electron-browser/webviewCommands.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openToolsLabel": "Открыть инструменты разработчика веб-представлений",
-	"refreshWebviewLabel": "Перезагрузить веб-представления"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json b/i18n/rus/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json
deleted file mode 100644
index 1f214477976..00000000000
--- a/i18n/rus/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"telemetryOptOut.optOutNotice": "Помогите улучшить VS Code, разрешив корпорации Майкрософт сбор данных об использовании. Прочтите наше [заявление о конфиденциальности]({0}) и узнайте, как [явно отказаться от него]({1}).",
-	"telemetryOptOut.optInNotice": "Помогите улучшить VS Code, разрешив корпорации Майкрософт сбор данных об использовании. Прочтите наше [заявление о конфиденциальности]({0}) и узнайте, как [его принять]({1}). ",
-	"telemetryOptOut.readMore": "Подробнее"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/welcome/overlay/browser/welcomeOverlay.i18n.json b/i18n/rus/src/vs/workbench/parts/welcome/overlay/browser/welcomeOverlay.i18n.json
deleted file mode 100644
index 142411deb01..00000000000
--- a/i18n/rus/src/vs/workbench/parts/welcome/overlay/browser/welcomeOverlay.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"welcomeOverlay.explorer": "Проводник",
-	"welcomeOverlay.search": "Поиск по файлам",
-	"welcomeOverlay.git": "Управление исходным кодом",
-	"welcomeOverlay.debug": "Запуск и отладка",
-	"welcomeOverlay.extensions": "Управление расширениями",
-	"welcomeOverlay.problems": "Просмотр ошибок и предупреждений",
-	"welcomeOverlay.commandPalette": "Найти и выполнить все команды.",
-	"welcomeOverlay.notifications": "Отображать уведомления",
-	"welcomeOverlay": "Обзор пользовательского интерфейса",
-	"hideWelcomeOverlay": "Скрыть наложение интерфейса",
-	"help": "Справка"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json b/i18n/rus/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
deleted file mode 100644
index 7ec1bcab6e5..00000000000
--- a/i18n/rus/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"welcomePage.vscode": "Visual Studio Code",
-	"welcomePage.editingEvolved": "Улучшенное редактирование",
-	"welcomePage.start": "Запустить",
-	"welcomePage.newFile": "Создать файл",
-	"welcomePage.openFolder": "Открыть папку...",
-	"welcomePage.addWorkspaceFolder": "Добавить папку в рабочую область...",
-	"welcomePage.recent": "Последние",
-	"welcomePage.moreRecent": "Дополнительные сведения...",
-	"welcomePage.noRecentFolders": "Нет последних папок.",
-	"welcomePage.help": "Справка",
-	"welcomePage.keybindingsCheatsheet": "Список сочетаний клавиш в печатном виде",
-	"welcomePage.introductoryVideos": "Вступительные видео",
-	"welcomePage.tipsAndTricks": "Советы и рекомендации",
-	"welcomePage.productDocumentation": "Документация по продукту",
-	"welcomePage.gitHubRepository": "Репозиторий GitHub",
-	"welcomePage.stackOverflow": "Stack Overflow",
-	"welcomePage.showOnStartup": "Отображать страницу приветствия при запуске",
-	"welcomePage.customize": "Настроить",
-	"welcomePage.installExtensionPacks": "Средства и языки",
-	"welcomePage.installExtensionPacksDescription": "Установить поддержку для {0} и {1}",
-	"welcomePage.moreExtensions": "Еще",
-	"welcomePage.installKeymapDescription": "Параметры и настраиваемые сочетания клавиш",
-	"welcomePage.installKeymapExtension": "Установить параметры и настраиваемые сочетания клавиш из {0} и {1}",
-	"welcomePage.others": "Другие",
-	"welcomePage.colorTheme": "Цветовая тема",
-	"welcomePage.colorThemeDescription": "Настройте редактор и код удобным образом.",
-	"welcomePage.learn": "Подробнее",
-	"welcomePage.showCommands": "Найти и выполнить все команды.",
-	"welcomePage.showCommandsDescription": "Быстро обращайтесь к командам и выполняйте поиск по командам с помощью палитры команд ({0})",
-	"welcomePage.interfaceOverview": "Общие сведения об интерфейсе",
-	"welcomePage.interfaceOverviewDescription": "Используйте визуальное наложение с выделением основных компонентов пользовательского интерфейса.",
-	"welcomePage.interactivePlayground": "Интерактивная площадка",
-	"welcomePage.interactivePlaygroundDescription": "Опробуйте основные функции редактора в ходе краткого пошагового руководства."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.contribution.i18n.json b/i18n/rus/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.contribution.i18n.json
deleted file mode 100644
index 472304cddee..00000000000
--- a/i18n/rus/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.contribution.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"workbenchConfigurationTitle": "Рабочее место",
-	"workbench.startupEditor.none": "Запустить без редактора.",
-	"workbench.startupEditor.welcomePage": "Откройте страницу приветствия (по умолчанию).",
-	"workbench.startupEditor.newUntitledFile": "Открыть новый файл без названия.",
-	"workbench.startupEditor": "Определяет, какой редактор отображается при запуске, если редактор не был восстановлен из предыдущего сеанса. Укажите 'none', чтобы не запускать редактор, 'welcomePage', чтобы открыть страницу приветствия (по умолчанию), и 'newUntitledFile', чтобы открыть новый файл без названия (только при открытии пустой рабочей области).",
-	"help": "Справка"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json b/i18n/rus/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json
deleted file mode 100644
index 196b7c7b83c..00000000000
--- a/i18n/rus/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"welcomePage": "Добро пожаловать",
-	"welcomePage.javaScript": "JavaScript",
-	"welcomePage.typeScript": "TypeScript",
-	"welcomePage.python": "Python",
-	"welcomePage.php": "PHP",
-	"welcomePage.azure": "Azure",
-	"welcomePage.showAzureExtensions": "Показать расширения Azure",
-	"welcomePage.docker": "Docker",
-	"welcomePage.vim": "Vim",
-	"welcomePage.sublime": "Sublime",
-	"welcomePage.atom": "Atom",
-	"welcomePage.extensionPackAlreadyInstalled": "Поддержка {0} уже добавлена.",
-	"welcomePage.willReloadAfterInstallingExtensionPack": "После установки дополнительной поддержки для {0} окно будет перезагружено.",
-	"welcomePage.installingExtensionPack": "Установка дополнительной поддержки для {0}...",
-	"welcomePage.extensionPackNotFound": "Не удается найти поддержку для {0} с идентификатором {1}.",
-	"welcomePage.keymapAlreadyInstalled": "Сочетания клавиш {0} уже установлены.",
-	"welcomePage.willReloadAfterInstallingKeymap": "Окно перезагрузится после установки сочетаний клавиш {0}.",
-	"welcomePage.installingKeymap": "Устанавливаются сочетания клавиш {0}...",
-	"welcomePage.keymapNotFound": "Не удалось найти сочетания клавиш {0} с идентификатором {1}.",
-	"welcome.title": "Добро пожаловать",
-	"welcomePage.openFolderWithPath": "Открыть папку {0} с путем {1}",
-	"welcomePage.extensionListSeparator": ",",
-	"welcomePage.installKeymap": "Установить раскладку клавиатуры {0}",
-	"welcomePage.installExtensionPack": "Установить дополнительную поддержку для {0}",
-	"welcomePage.installedKeymap": "Раскладка клавиатуры {0} уже установлена",
-	"welcomePage.installedExtensionPack": "Поддержка {0} уже установлена",
-	"ok": "ОК",
-	"details": "Подробности",
-	"welcomePage.buttonBackground": "Цвет фона кнопок на странице приветствия.",
-	"welcomePage.buttonHoverBackground": "Цвет фона при наведении указателя для кнопок на странице приветствия."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/welcome/walkThrough/electron-browser/editor/editorWalkThrough.i18n.json b/i18n/rus/src/vs/workbench/parts/welcome/walkThrough/electron-browser/editor/editorWalkThrough.i18n.json
deleted file mode 100644
index c5fd42fdce8..00000000000
--- a/i18n/rus/src/vs/workbench/parts/welcome/walkThrough/electron-browser/editor/editorWalkThrough.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"editorWalkThrough.title": "Интерактивная площадка",
-	"editorWalkThrough": "Интерактивная площадка"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThrough.contribution.i18n.json b/i18n/rus/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThrough.contribution.i18n.json
deleted file mode 100644
index f2f39555f12..00000000000
--- a/i18n/rus/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThrough.contribution.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"walkThrough.editor.label": "Интерактивная площадка",
-	"help": "Справка"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughActions.i18n.json b/i18n/rus/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughActions.i18n.json
deleted file mode 100644
index 227864f7649..00000000000
--- a/i18n/rus/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughActions.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"editorWalkThrough.arrowUp": "Прокрутить вверх (построчно)",
-	"editorWalkThrough.arrowDown": "Прокрутить вниз (построчно)",
-	"editorWalkThrough.pageUp": "Прокрутить вверх (на страницу)",
-	"editorWalkThrough.pageDown": "Прокрутить вниз (страницу)"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughPart.i18n.json b/i18n/rus/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughPart.i18n.json
deleted file mode 100644
index 7c7a6229804..00000000000
--- a/i18n/rus/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughPart.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"walkThrough.unboundCommand": "свободный",
-	"walkThrough.gitNotFound": "Похоже, Git не установлен в вашей системе.",
-	"walkThrough.embeddedEditorBackground": "Цвет фона встроенных редакторов для интерактивных площадок."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/services/actions/electron-browser/menusExtensionPoint.i18n.json b/i18n/rus/src/vs/workbench/services/actions/electron-browser/menusExtensionPoint.i18n.json
deleted file mode 100644
index c6bce4e5b08..00000000000
--- a/i18n/rus/src/vs/workbench/services/actions/electron-browser/menusExtensionPoint.i18n.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"requirearray": "элементы меню должны быть массивом",
-	"requirestring": "свойство \"{0}\" является обязательным и должно иметь тип string",
-	"optstring": "свойство \"{0}\" может быть опущено или должно иметь тип string",
-	"vscode.extension.contributes.menuItem.command": "Идентификатор команды, которую нужно выполнить. Эта команда должна быть объявлена в разделе commands",
-	"vscode.extension.contributes.menuItem.alt": "Идентификатор альтернативной команды, которую нужно выполнить. Эта команда должна быть объявлена в разделе commands",
-	"vscode.extension.contributes.menuItem.when": "Условие, которое должно иметь значение True, чтобы отображался этот элемент",
-	"vscode.extension.contributes.menuItem.group": "Группа, к которой принадлежит эта команда",
-	"vscode.extension.contributes.menus": "Добавляет элементы меню в редактор",
-	"menus.commandPalette": "Палитра команд",
-	"menus.touchBar": "Сенсорная панель (только для macOS)",
-	"menus.editorTitle": "Главное меню редактора",
-	"menus.editorContext": "Контекстное меню редактора",
-	"menus.explorerContext": "Контекстное меню проводника",
-	"menus.editorTabContext": "Контекстное меню вкладок редактора",
-	"menus.debugCallstackContext": "Контекстное меню стека вызовов при отладке",
-	"menus.scmTitle": "Меню заголовков для системы управления версиями",
-	"menus.scmSourceControl": "Меню \"Система управления версиями\"",
-	"menus.resourceGroupContext": "Контекстное меню группы ресурсов для системы управления версиями",
-	"menus.resourceStateContext": "Контекстное меню состояния ресурсов для системы управления версиями",
-	"view.viewTitle": "Меню заголовка для окна участников",
-	"view.itemContext": "Контекстное меню элемента для окна участников",
-	"nonempty": "требуется непустое значение.",
-	"opticon": "Свойство icon может быть пропущено или должно быть строкой или литералом, например \"{dark, light}\"",
-	"requireStringOrObject": "Свойство \"{0}\" обязательно и должно иметь тип \"string\" или \"object\"",
-	"requirestrings": "Свойства \"{0}\" и \"{1}\" обязательны и должны иметь тип \"string\"",
-	"vscode.extension.contributes.commandType.command": "Идентификатор выполняемой команды",
-	"vscode.extension.contributes.commandType.title": "Название команды в пользовательском интерфейсе",
-	"vscode.extension.contributes.commandType.category": "(Необязательно.) Строка категорий, по которым команды группируются в пользовательском интерфейсе",
-	"vscode.extension.contributes.commandType.icon": "(Дополнительно) Значок, который используется для представления команды в пользовательском интерфейсе. Это путь к файлу или конфигурация с возможностью применения тем",
-	"vscode.extension.contributes.commandType.icon.light": "Путь к значку, если используется светлая тема",
-	"vscode.extension.contributes.commandType.icon.dark": "Путь к значку, если используется темная тема",
-	"vscode.extension.contributes.commands": "Добавляет команды в палитру команд.",
-	"dup": "Команда \"{0}\" встречается несколько раз в разделе commands.",
-	"menuId.invalid": "\"{0}\" не является допустимым идентификатором меню",
-	"missing.command": "Элемент меню ссылается на команду \"{0}\", которая не определена в разделе commands.",
-	"missing.altCommand": "Элемент меню ссылается на альтернативную команду \"{0}\", которая не определена в разделе commands.",
-	"dupe.command": "Элемент меню ссылается на одну и ту же команду как команду по умолчанию и альтернативную команду"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/services/bulkEdit/electron-browser/bulkEditService.i18n.json b/i18n/rus/src/vs/workbench/services/bulkEdit/electron-browser/bulkEditService.i18n.json
deleted file mode 100644
index a2b4834beae..00000000000
--- a/i18n/rus/src/vs/workbench/services/bulkEdit/electron-browser/bulkEditService.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"summary.0": "Нет изменений",
-	"summary.nm": "Сделано изменений {0} в {1} файлах",
-	"summary.n0": "Сделано изменений {0} в одном файле",
-	"conflict": "Следующие файлы были изменены: {0}"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/services/configuration/common/configurationExtensionPoint.i18n.json b/i18n/rus/src/vs/workbench/services/configuration/common/configurationExtensionPoint.i18n.json
deleted file mode 100644
index da59adfec73..00000000000
--- a/i18n/rus/src/vs/workbench/services/configuration/common/configurationExtensionPoint.i18n.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.contributes.configuration.title": "Краткая сводка параметров. Эта метка будет использоваться в файле параметров в качестве разделяющего комментария.",
-	"vscode.extension.contributes.configuration.properties": "Описание свойств конфигурации.",
-	"scope.application.description": "Конфигурация для конкретного приложения, которая может быть задана только в параметрах пользователя.",
-	"scope.window.description": "Конфигурация окна, которая может быть задана в параметрах пользователя или рабочей области.",
-	"scope.resource.description": "Конфигурации ресурсов, которые могут быть заданы в параметрах пользователей, рабочих областей или папок.",
-	"scope.description": "Область, в которой применяется конфигурация. Доступные области — 'window' и 'resource'.",
-	"vscode.extension.contributes.defaultConfiguration": "Предоставляет параметры конфигурации редактора по умолчанию в соответствии с языком.",
-	"vscode.extension.contributes.configuration": "Добавляет параметры конфигурации.",
-	"invalid.title": "configuration.title должно быть строкой",
-	"invalid.properties": "configuration.properties должно быть объектом",
-	"invalid.property": "Параметр 'configuration.property' должен быть объектом",
-	"invalid.allOf": "Параметр 'configuration.allOf' является устаревшим, и использовать его не рекомендуется. Вместо этого передайте несколько параметров в виде массива в точку вклада 'configuration'.",
-	"workspaceConfig.folders.description": "Список папок, которые будут загружены в рабочую область.",
-	"workspaceConfig.path.description": "Путь к файлу, например, \"/root/folderA\" или \"./folderA\" для пути по отношению к файлу рабочей области.",
-	"workspaceConfig.name.description": "Необязательное имя папки.",
-	"workspaceConfig.uri.description": "URI папки",
-	"workspaceConfig.settings.description": "Параметры рабочей области",
-	"workspaceConfig.launch.description": "Конфигурации запуска рабочей области",
-	"workspaceConfig.extensions.description": "Расширения рабочей области",
-	"unknownWorkspaceProperty": "Неизвестное свойство рабочей области"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/services/configuration/node/configuration.i18n.json b/i18n/rus/src/vs/workbench/services/configuration/node/configuration.i18n.json
deleted file mode 100644
index 8915524eb9b..00000000000
--- a/i18n/rus/src/vs/workbench/services/configuration/node/configuration.i18n.json
+++ /dev/null
@@ -1,24 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"vscode.extension.contributes.configuration.title": "Краткая сводка параметров. Эта метка будет использоваться в файле параметров в качестве разделяющего комментария.",
-	"vscode.extension.contributes.configuration.properties": "Описание свойств конфигурации.",
-	"scope.window.description": "Конфигурация окна, которая может быть задана в параметрах пользователя или рабочей области.",
-	"scope.resource.description": "Конфигурации ресурсов, которые могут быть заданы в параметрах пользователей, рабочих областей или папок.",
-	"scope.description": "Область, в которой применяется конфигурация. Доступные области — 'window' и 'resource'.",
-	"vscode.extension.contributes.configuration": "Добавляет параметры конфигурации.",
-	"invalid.title": "configuration.title должно быть строкой",
-	"vscode.extension.contributes.defaultConfiguration": "Предоставляет параметры конфигурации редактора по умолчанию в соответствии с языком.",
-	"invalid.properties": "configuration.properties должно быть объектом",
-	"invalid.allOf": "Параметр 'configuration.allOf' является устаревшим, и использовать его не рекомендуется. Вместо этого передайте несколько параметров в виде массива в точку вклада 'configuration'.",
-	"workspaceConfig.folders.description": "Список папок, которые будут загружены в рабочую область.",
-	"workspaceConfig.path.description": "Путь к файлу, например, \"/root/folderA\" или \"./folderA\" для пути по отношению к файлу рабочей области.",
-	"workspaceConfig.name.description": "Необязательное имя папки.",
-	"workspaceConfig.uri.description": "URI папки",
-	"workspaceConfig.settings.description": "Параметры рабочей области",
-	"workspaceConfig.extensions.description": "Расширения рабочей области",
-	"unknownWorkspaceProperty": "Неизвестное свойство рабочей области"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json b/i18n/rus/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
deleted file mode 100644
index 466dfbc590c..00000000000
--- a/i18n/rus/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openTasksConfiguration": "Открыть конфигурацию задач",
-	"openLaunchConfiguration": "Открыть конфигурацию запуска",
-	"open": "Открыть параметры",
-	"saveAndRetry": "Сохранить и повторить",
-	"errorUnknownKey": "Не удалось записать в {0}, так как {1} не является зарегистрированной конфигурацией.",
-	"errorInvalidWorkspaceConfigurationApplication": "Не удается записать {0} в параметры рабочей области. Этот параметр можно записать только в параметры пользователя.",
-	"errorInvalidFolderConfiguration": "Не удается изменить параметры папок, так как {0} не поддерживает область ресурсов папок. ",
-	"errorInvalidUserTarget": "Не удается изменить параметры пользователей, так как {0} не поддерживает глобальную область.",
-	"errorInvalidWorkspaceTarget": "Не удается изменить параметры рабочей области, так как {0} не поддерживает рабочие области в в рабочей области из нескольких папок.",
-	"errorInvalidFolderTarget": "Не удается изменить параметры папок, так как ресурс не указан.",
-	"errorNoWorkspaceOpened": "Не удается записать в {0}, так как не открыта ни одна рабочая область. Откройте рабочую область и повторите попытку.",
-	"errorInvalidTaskConfiguration": "Не удается записать файл конфигурации задач. Откройте файл, исправьте ошибки и предупреждения и повторите попытку.",
-	"errorInvalidLaunchConfiguration": "Не удается записать файл конфигурации запуска. Откройте файл, исправьте ошибки и предупреждения и повторите попытку.",
-	"errorInvalidConfiguration": "Не удается выполнить запись в файл параметров пользователя. Откройте параметры пользователя, исправьте ошибки и предупреждения и повторите попытку. ",
-	"errorInvalidConfigurationWorkspace": "Не удается выполнить запись в файл параметров рабочей области. Откройте параметры рабочей области, исправьте ошибки и предупреждения и повторите попытку. ",
-	"errorInvalidConfigurationFolder": "Не удается записать параметры папки. Откройте параметры папки '{0}', исправьте ошибки и предупреждения и повторите попытку. ",
-	"errorTasksConfigurationFileDirty": "Не удается записать файл конфигурации задач, так как файл был изменен. Сохраните файл и повторите попытку.",
-	"errorLaunchConfigurationFileDirty": "Не удается записать файл конфигурации запуска, так как файл был изменен. Сохраните файл и повторите попытку.",
-	"errorConfigurationFileDirty": "Не удается записать параметры пользователя, так как файл был изменен. Сохраните файл параметров пользователя и повторите попытку.",
-	"errorConfigurationFileDirtyWorkspace": "Не удается записать параметры рабочей области, так как файл был изменен. Сохраните файл параметров рабочей области и повторите попытку. ",
-	"errorConfigurationFileDirtyFolder": "Не удается записать параметры папки, так как файл был изменен. Сохраните файл параметров папки '{0}' и повторите попытку.",
-	"userTarget": "Параметры пользователя",
-	"workspaceTarget": "Параметры рабочей области",
-	"folderTarget": "Параметры папок"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/services/configuration/node/configurationService.i18n.json b/i18n/rus/src/vs/workbench/services/configuration/node/configurationService.i18n.json
deleted file mode 100644
index 96f827a5c64..00000000000
--- a/i18n/rus/src/vs/workbench/services/configuration/node/configurationService.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"unsupportedApplicationSetting": "Этот параметр может применяться только в параметрах пользователя",
-	"unsupportedWindowSetting": "Сейчас применить этот параметр нельзя. Он будет применен, когда вы откроете эту папку напрямую."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/services/configuration/node/jsonEditingService.i18n.json b/i18n/rus/src/vs/workbench/services/configuration/node/jsonEditingService.i18n.json
deleted file mode 100644
index b7d0271fbd9..00000000000
--- a/i18n/rus/src/vs/workbench/services/configuration/node/jsonEditingService.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"errorInvalidFile": "Не удается выполнить запись в файл. Откройте файл, исправьте ошибки и предупреждения в файле и повторите попытку.",
-	"errorFileDirty": "Не удается записать сведения в файл, так как файл был изменен. Сохраните файл и повторите попытку."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json b/i18n/rus/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
deleted file mode 100644
index 200628838fe..00000000000
--- a/i18n/rus/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"stringsOnlySupported": "Команда {0} не возвратила строку. Команды, используемые для замены переменных, могут возвращать только строковые значения."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/services/configurationResolver/node/variableResolver.i18n.json b/i18n/rus/src/vs/workbench/services/configurationResolver/node/variableResolver.i18n.json
deleted file mode 100644
index b4123518642..00000000000
--- a/i18n/rus/src/vs/workbench/services/configurationResolver/node/variableResolver.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"missingEnvVarName": "Не удалось разрешить '{0}', так как не указано имя переменной среды. ",
-	"configNotFound": "Не удалось разрешить '{0}', так как параметр '{1}' не найден.",
-	"configNoString": "Не удалось разрешить '{0}', так как '{1}' является структурированным значением.",
-	"missingConfigName": "Не удается разрешить '{0}', так как не указано имя параметров.",
-	"noValueForCommand": "Не удалось разрешить '{0}', так как не указано значение команды.",
-	"canNotFindFolder": "Не удается разрешить '{0}'. Отсутствует папка '{1}'.",
-	"canNotResolveWorkspaceFolderMultiRoot": "Не удалось разрешить папку '{0}' в рабочей области с несколькими папками. Определите область действия этой переменной, указав \":\" и имя папки.",
-	"canNotResolveWorkspaceFolder": "Не удается разрешить '{0}'. Откройте папку.",
-	"canNotResolveFile": "Не удается разрешить '{0}'. Откройте редактор. ",
-	"canNotResolveLineNumber": "Не удается разрешить '{0}'. Убедитесь, что в активном редакторе выбрана строка.",
-	"canNotResolveSelectedText": "Не удается разрешить '{0}'. Убедитесь, что в активном редакторе выбран какой-либо текст."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/services/crashReporter/common/crashReporterService.i18n.json b/i18n/rus/src/vs/workbench/services/crashReporter/common/crashReporterService.i18n.json
deleted file mode 100644
index b9b24e91bdb..00000000000
--- a/i18n/rus/src/vs/workbench/services/crashReporter/common/crashReporterService.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"telemetryConfigurationTitle": "Телеметрия",
-	"telemetry.enableCrashReporting": "Разрешить отправку отчетов о сбоях в Майкрософт.\nЧтобы этот параметр вступил в силу, требуется перезагрузка."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/services/crashReporter/electron-browser/crashReporterService.i18n.json b/i18n/rus/src/vs/workbench/services/crashReporter/electron-browser/crashReporterService.i18n.json
deleted file mode 100644
index 3f8c134bd88..00000000000
--- a/i18n/rus/src/vs/workbench/services/crashReporter/electron-browser/crashReporterService.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"telemetryConfigurationTitle": "Телеметрия",
-	"telemetry.enableCrashReporting": "Разрешить отправку отчетов о сбоях в Майкрософт.\nЧтобы этот параметр вступил в силу, требуется перезагрузка."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/services/decorations/browser/decorationsService.i18n.json b/i18n/rus/src/vs/workbench/services/decorations/browser/decorationsService.i18n.json
deleted file mode 100644
index 35596266216..00000000000
--- a/i18n/rus/src/vs/workbench/services/decorations/browser/decorationsService.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"bubbleTitle": "Содержит выделенные элементы"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json b/i18n/rus/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json
deleted file mode 100644
index 360b3b18b2b..00000000000
--- a/i18n/rus/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"yesButton": "&&Да",
-	"cancelButton": "Отмена"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/services/dialogs/electron-browser/dialogs.i18n.json b/i18n/rus/src/vs/workbench/services/dialogs/electron-browser/dialogs.i18n.json
deleted file mode 100644
index cd4f9864855..00000000000
--- a/i18n/rus/src/vs/workbench/services/dialogs/electron-browser/dialogs.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"yesButton": "&&Да",
-	"cancelButton": "Отмена",
-	"moreFile": "...1 дополнительный файл не показан",
-	"moreFiles": "...не показано дополнительных файлов: {0}"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/services/editor/browser/editorService.i18n.json b/i18n/rus/src/vs/workbench/services/editor/browser/editorService.i18n.json
deleted file mode 100644
index 50e968f8ee3..00000000000
--- a/i18n/rus/src/vs/workbench/services/editor/browser/editorService.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"compareLabels": "{0} ↔ {1}"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/services/editor/common/editorService.i18n.json b/i18n/rus/src/vs/workbench/services/editor/common/editorService.i18n.json
deleted file mode 100644
index ca1ee0161c1..00000000000
--- a/i18n/rus/src/vs/workbench/services/editor/common/editorService.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"compareLabels": "{0} ↔ {1}"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/services/extensions/common/extensionsRegistry.i18n.json b/i18n/rus/src/vs/workbench/services/extensions/common/extensionsRegistry.i18n.json
deleted file mode 100644
index 33b2d118ad1..00000000000
--- a/i18n/rus/src/vs/workbench/services/extensions/common/extensionsRegistry.i18n.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.engines": "Совместимость с подсистемой.",
-	"vscode.extension.engines.vscode": "Для расширений VS Code указывает версию VS Code, с которой совместимо расширение. Она не может быть задана как \"*\". Например, ^0.10.5 сообщает о совместимости с минимальной версией VS Code 0.10.5.",
-	"vscode.extension.publisher": "Издатель расширения VS Code.",
-	"vscode.extension.displayName": "Отображаемое имя расширения, используемого в коллекции VS Code.",
-	"vscode.extension.categories": "Категории, используемые коллекцией VS Code для классификации расширения.",
-	"vscode.extension.category.languages.deprecated": "Используйте \"Языки программирования\"",
-	"vscode.extension.galleryBanner": "Баннер, используемый в магазине VS Code.",
-	"vscode.extension.galleryBanner.color": "Цвет баннера в заголовке страницы магазина VS Code.",
-	"vscode.extension.galleryBanner.theme": "Цветовая тема для шрифта, используемого в баннере.",
-	"vscode.extension.contributes": "Все публикации расширения VS Code, представленные этим пакетом.",
-	"vscode.extension.preview": "Добавляет метку \"Предварительная версия\" для расширения в Marketplace.",
-	"vscode.extension.activationEvents": "События активации для расширения кода VS Code.",
-	"vscode.extension.activationEvents.onLanguage": "Событие активации выдается каждый раз, когда открывается файл, который разрешается к указанному языку.",
-	"vscode.extension.activationEvents.onCommand": "Событие активации выдается каждый раз при вызове указанной команды.",
-	"vscode.extension.activationEvents.onDebug": "Событие активации выдается каждый раз, когда пользователь запускает отладку или собирается установить конфигурацию отладки.",
-	"vscode.extension.activationEvents.onDebugInitialConfigurations": "Событие активации выдается каждый раз, когда необходимо создать файл \"launch.json\" (и вызывать все методы provideDebugConfigurations).",
-	"vscode.extension.activationEvents.onDebugResolve": "Событие активации выдается каждый раз при запуске сеанса отладки указанного типа (и при вызове соответствующего метода resolveDebugConfiguration).",
-	"vscode.extension.activationEvents.workspaceContains": "Событие активации выдается каждый раз при открытии папки, содержащей по крайней мере один файл, который соответствует указанной стандартной маске.",
-	"vscode.extension.activationEvents.onView": "Событие активации выдается каждый раз при развертывании указанного окна.",
-	"vscode.extension.activationEvents.onUri": "Событие активации, которое выдается каждый раз при открытии системного URI этого расширения.",
-	"vscode.extension.activationEvents.star": "Событие активации выдается при запуске VS Code. Для удобства пользователя используйте это событие в своем расширении только в том случае, если другие сочетания событий не подходят.",
-	"vscode.extension.badges": "Массив эмблем, отображаемых на боковой панели страницы расширения Marketplace.",
-	"vscode.extension.badges.url": "URL-адрес изображения эмблемы.",
-	"vscode.extension.badges.href": "Ссылка на эмблему.",
-	"vscode.extension.badges.description": "Описание эмблемы.",
-	"vscode.extension.markdown": "Управляет подсистемой отображения Markdown, используемой в Marketplace. Допустимые значения: 'github' (по умолчанию) или 'standard' (стандартный).",
-	"vscode.extension.qna": "Управляет ссылкой на раздел \"Часто задаваемые вопросы\" в Marketplace. Установите значение 'marketplace', чтобы включить раздел часто задаваемых вопросов Marketplace по умолчанию. Установите значение 'false', чтобы вообще отключить раздел \"Часто задаваемые вопросы\". Вы также можете указать строку с URL-адресом пользовательского сайта с часто задаваемыми вопросами.",
-	"vscode.extension.extensionDependencies": "Зависимости от других расширений. Идентификатор расширения — всегда ${publisher}.${name}. Например: vscode.csharp.",
-	"vscode.extension.scripts.prepublish": "Скрипт, выполняемый перед публикацией пакета в качестве расширения VS Code.",
-	"vscode.extension.scripts.uninstall": "Удалить обработчик для расширения VS Code. Скрипт, который выполняется после полного удаления расширения из VS Code, когда VS Code перезапускается (выключается и запускается) после удаления расширения. Поддерживаются только скрипты Node.",
-	"vscode.extension.icon": "Путь к значку размером 128 x 128 пикселей."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/services/extensions/electron-browser/extensionHost.i18n.json b/i18n/rus/src/vs/workbench/services/extensions/electron-browser/extensionHost.i18n.json
deleted file mode 100644
index 90d7d9c8283..00000000000
--- a/i18n/rus/src/vs/workbench/services/extensions/electron-browser/extensionHost.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"extensionHostProcess.startupFailDebug": "Хост-процесс для расширений не был запущен в течение 10 секунд. Возможно, он был остановлен в первой строке, а для продолжения требуется отладчик.",
-	"extensionHostProcess.startupFail": "Хост-процесс для расширений не запустился спустя 10 секунд. Возможно, произошла ошибка.",
-	"reloadWindow": "Перезагрузить окно",
-	"extensionHostProcess.error": "Ошибка в хост-процессе для расширений: {0}"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/services/extensions/electron-browser/extensionHostProfiler.i18n.json b/i18n/rus/src/vs/workbench/services/extensions/electron-browser/extensionHostProfiler.i18n.json
deleted file mode 100644
index c1172f56193..00000000000
--- a/i18n/rus/src/vs/workbench/services/extensions/electron-browser/extensionHostProfiler.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"message": "$(zap) Профилирование узла расширений..."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/services/extensions/electron-browser/extensionPoints.i18n.json b/i18n/rus/src/vs/workbench/services/extensions/electron-browser/extensionPoints.i18n.json
deleted file mode 100644
index 91df8772837..00000000000
--- a/i18n/rus/src/vs/workbench/services/extensions/electron-browser/extensionPoints.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"jsonParseFail": "Не удалось проанализировать {0}: {1}.",
-	"fileReadFail": "Не удается прочитать файл {0}: {1}.",
-	"jsonsParseReportErrors": "Не удалось проанализировать {0}: {1}.",
-	"missingNLSKey": "Не удалось найти сообщение для ключа {0}."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json b/i18n/rus/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json
deleted file mode 100644
index 563d0e6d58b..00000000000
--- a/i18n/rus/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"extensionsDisabled": "Все расширения отключены.",
-	"extensionHostProcess.crash": "Хост-процесс для расширений неожиданно завершил работу.",
-	"extensionHostProcess.unresponsiveCrash": "Работа хост-процесса для расширений была завершена, так как он перестал отвечать на запросы.",
-	"devTools": "Открыть инструменты разработчика",
-	"restart": "Перезапустить хост-процесс для расширений",
-	"overwritingExtension": "Идет перезапись расширения {0} на {1}.",
-	"extensionUnderDevelopment": "Идет загрузка расширения разработки в {0}.",
-	"extensionCache.invalid": "Расширения были изменены на диске. Обновите окно.",
-	"reloadWindow": "Перезагрузить окно"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/services/extensions/node/extensionPoints.i18n.json b/i18n/rus/src/vs/workbench/services/extensions/node/extensionPoints.i18n.json
deleted file mode 100644
index ad62fd4cfde..00000000000
--- a/i18n/rus/src/vs/workbench/services/extensions/node/extensionPoints.i18n.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"jsonParseFail": "Не удалось проанализировать {0}: {1}.",
-	"fileReadFail": "Не удается прочитать файл {0}: {1}.",
-	"jsonsParseReportErrors": "Не удалось проанализировать {0}: {1}.",
-	"missingNLSKey": "Не удалось найти сообщение для ключа {0}.",
-	"notSemver": "Версия расширения несовместима с semver.",
-	"extensionDescription.empty": "Пустое описание расширения",
-	"extensionDescription.publisher": "свойство \"{0}\" является обязательным и должно иметь тип string",
-	"extensionDescription.name": "свойство \"{0}\" является обязательным и должно иметь тип string",
-	"extensionDescription.version": "свойство \"{0}\" является обязательным и должно иметь тип string",
-	"extensionDescription.engines": "свойство \"{0}\" является обязательным и должно быть типа object",
-	"extensionDescription.engines.vscode": "свойство \"{0}\" является обязательным и должно иметь тип string",
-	"extensionDescription.extensionDependencies": "свойство \"{0}\" может быть опущено или должно быть типа \"string []\"",
-	"extensionDescription.activationEvents1": "свойство \"{0}\" может быть опущено или должно быть типа \"string []\"",
-	"extensionDescription.activationEvents2": "оба свойства, \"{0}\" и \"{1}\", должны быть либо указаны, либо опущены",
-	"extensionDescription.main1": "свойство \"{0}\" может быть опущено или должно иметь тип string",
-	"extensionDescription.main2": "Ожидается, что функция main ({0}) будет включена в папку расширения ({1}). Из-за этого расширение может стать непереносимым.",
-	"extensionDescription.main3": "оба свойства, \"{0}\" и \"{1}\", должны быть либо указаны, либо опущены"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/services/files/electron-browser/fileService.i18n.json b/i18n/rus/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
deleted file mode 100644
index 8ebd66bbd86..00000000000
--- a/i18n/rus/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"netVersionError": "Требуется платформа Microsoft .NET Framework 4.5. Нажмите ссылку, чтобы установить ее.",
-	"installNet": "Скачать .NET Framework 4.5",
-	"neverShowAgain": "Больше не показывать",
-	"enospcError": "{0} не удалось проследить изменения файлов в этой большой рабочей области. Для решения проблемы воспользуйтесь ссылкой на инструкции.",
-	"learnMore": "Инструкции",
-	"fileInvalidPath": "Недопустимый ресурс файла ({0})",
-	"fileIsDirectoryError": "Файл является каталогом",
-	"fileNotModifiedError": "undefined",
-	"fileTooLargeForHeapError": "Чтобы открыть файл такого размера, необходимо перезапустить VS Code, увеличив допустимый объем используемой памяти",
-	"fileTooLargeError": "Не удается открыть файл, так как он имеет слишком большой размер",
-	"fileNotFoundError": "Файл не найден ({0})",
-	"fileBinaryError": "Похоже, файл является двоичным, и его нельзя открыть как текстовый.",
-	"filePermission": "Отсутствует разрешение на запись в файл ({0})",
-	"fileExists": "Создаваемый файл уже существует ({0})",
-	"fileModifiedError": "Файл изменен с",
-	"fileReadOnlyError": "Файл доступен только для чтения",
-	"fileMoveConflict": "Невозможно переместить или скопировать файл, так как он уже существует в папке назначения.",
-	"unableToMoveCopyError": "Невозможно переместить или скопировать файл, так как он заменил бы папку, в которой содержится.",
-	"binFailed": "Не удалось переместить \"{0}\" в корзину",
-	"trashFailed": "Не удалось переместить \"{0}\" в корзину."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json b/i18n/rus/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
deleted file mode 100644
index 2c983a39d57..00000000000
--- a/i18n/rus/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"invalidPath": "Путь к ресурсу '{0}' должен быть абсолютным",
-	"fileNotFoundError": "Файл не найден ({0})",
-	"fileIsDirectoryError": "Файл является каталогом",
-	"fileNotModifiedError": "undefined",
-	"fileBinaryError": "Похоже, файл является двоичным, и его нельзя открыть как текстовый.",
-	"err.create": "Не удалось создать файл {0}",
-	"fileMoveConflict": "Невозможно переместить или скопировать файл, так как он уже существует в папке назначения."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/services/files/node/fileService.i18n.json b/i18n/rus/src/vs/workbench/services/files/node/fileService.i18n.json
deleted file mode 100644
index 10de0847f46..00000000000
--- a/i18n/rus/src/vs/workbench/services/files/node/fileService.i18n.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"fileInvalidPath": "Недопустимый ресурс файла ({0})",
-	"fileIsDirectoryError": "Файл является каталогом",
-	"fileNotModifiedError": "undefined",
-	"fileTooLargeError": "Не удается открыть файл, так как он имеет слишком большой размер",
-	"fileNotFoundError": "Файл не найден ({0})",
-	"fileBinaryError": "Похоже, файл является двоичным, и его нельзя открыть как текстовый.",
-	"filePermission": "Отсутствует разрешение на запись в файл ({0})",
-	"fileExists": "Создаваемый файл уже существует ({0})",
-	"fileMoveConflict": "Невозможно переместить или скопировать файл, так как он уже существует в папке назначения.",
-	"unableToMoveCopyError": "Невозможно переместить или скопировать файл, так как он заменил бы папку, в которой содержится.",
-	"foldersCopyError": "Папки нельзя копировать в рабочую область. Выберите отдельные файлы, чтобы скопировать их.",
-	"fileModifiedError": "Файл изменен с",
-	"fileReadOnlyError": "Файл доступен только для чтения"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/services/jsonschemas/common/jsonValidationExtensionPoint.i18n.json b/i18n/rus/src/vs/workbench/services/jsonschemas/common/jsonValidationExtensionPoint.i18n.json
deleted file mode 100644
index 7c0be2dbcb6..00000000000
--- a/i18n/rus/src/vs/workbench/services/jsonschemas/common/jsonValidationExtensionPoint.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"contributes.jsonValidation": "Добавляет конфигурацию схемы JSON.",
-	"contributes.jsonValidation.fileMatch": "Шаблон файла для сопоставления, например \"package.json\" или \"*.launch\".",
-	"contributes.jsonValidation.url": "URL-адрес схемы (\"http:\", \"https:\") или относительный путь к папке расширения (\"./\").",
-	"invalid.jsonValidation": "configuration.jsonValidation должно быть массивом",
-	"invalid.fileMatch": "Необходимо определить configuration.jsonValidation.fileMatch",
-	"invalid.url": "Значение configuration.jsonValidation.url должно быть URL-адресом или относительным путем",
-	"invalid.url.fileschema": "Значение configuration.jsonValidation.url является недопустимым относительным URL-адресом: {0}",
-	"invalid.url.schema": "Значение configuration.jsonValidation.url должно начинаться с \"http:\", \"https:\" или \"./\" для ссылки на схемы, содержащиеся в расширении"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/services/keybinding/common/keybindingEditing.i18n.json b/i18n/rus/src/vs/workbench/services/keybinding/common/keybindingEditing.i18n.json
deleted file mode 100644
index a5b5df9f70c..00000000000
--- a/i18n/rus/src/vs/workbench/services/keybinding/common/keybindingEditing.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"errorKeybindingsFileDirty": "Не удается записать файл конфигурации сочетаний клавиш, так как файл был изменен. Сохраните файл и повторите попытку.",
-	"parseErrors": "Не удается записать файл конфигурации сочетаний клавиш. Откройте файл, исправьте ошибки и предупреждения и повторите попытку.",
-	"errorInvalidConfiguration": "Не удалось записать файл конфигурации сочетаний клавиш. Этот файл содержит объект, тип которого отличен от Array. Откройте файл, удалите этот объект и повторите попытку.",
-	"emptyKeybindingsHeader": "Поместите настраиваемые сочетания клавиш в этот файл, чтобы перезаписать клавиши по умолчанию."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/services/keybinding/electron-browser/keybindingService.i18n.json b/i18n/rus/src/vs/workbench/services/keybinding/electron-browser/keybindingService.i18n.json
deleted file mode 100644
index 920221aaf1f..00000000000
--- a/i18n/rus/src/vs/workbench/services/keybinding/electron-browser/keybindingService.i18n.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"nonempty": "требуется непустое значение.",
-	"requirestring": "свойство \"{0}\" является обязательным и должно иметь тип string",
-	"optstring": "свойство \"{0}\" может быть опущено или должно иметь тип string",
-	"vscode.extension.contributes.keybindings.command": "Идентификатор команды, выполняемой при нажатии настраиваемого сочетания клавиш.",
-	"vscode.extension.contributes.keybindings.key": "Клавиша или последовательность клавиш (клавиши разделяются знаком плюс, а последовательности — пробелом, например CTRL+O или CTRL+L L для сочетания).",
-	"vscode.extension.contributes.keybindings.mac": "Клавиша или последовательность клавиш для Mac.",
-	"vscode.extension.contributes.keybindings.linux": "Клавиша или последовательность клавиш для Linux.",
-	"vscode.extension.contributes.keybindings.win": "Клавиша или последовательность клавиш для Windows.",
-	"vscode.extension.contributes.keybindings.when": "Условие, когда клавиша нажата.",
-	"vscode.extension.contributes.keybindings": "Добавляет настраиваемые сочетания клавиш.",
-	"invalid.keybindings": "Недопустимое значение \"contributes.{0}\": {1}",
-	"unboundCommands": "Доступные команды: ",
-	"keybindings.json.title": "Настройка настраиваемых сочетаний клавиш",
-	"keybindings.json.key": "Клавиша или последовательность клавиш (через пробел)",
-	"keybindings.json.command": "Имя выполняемой команды",
-	"keybindings.json.when": "Условие, когда клавиша нажата.",
-	"keybindings.json.args": "Аргументы, передаваемые в выполняемую команду.",
-	"keyboardConfigurationTitle": "Клавиатура",
-	"dispatch": "Управляет логикой диспетчеризации для нажатий клавиш \"code\" (рекомендуется) или \"keyCode\".",
-	"touchbar.enabled": "Включает кнопки сенсорной панели macOS на клавиатуре, если они доступны."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/services/message/browser/messageList.i18n.json b/i18n/rus/src/vs/workbench/services/message/browser/messageList.i18n.json
deleted file mode 100644
index 19e2ce668eb..00000000000
--- a/i18n/rus/src/vs/workbench/services/message/browser/messageList.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"alertErrorMessage": "Ошибка: {0}",
-	"alertWarningMessage": "Предупреждение: {0}",
-	"alertInfoMessage": "Сведения: {0}",
-	"error": "Ошибка",
-	"warning": "Предупреждение",
-	"info": "Сведения",
-	"close": "Закрыть"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/services/message/electron-browser/messageService.i18n.json b/i18n/rus/src/vs/workbench/services/message/electron-browser/messageService.i18n.json
deleted file mode 100644
index 360b3b18b2b..00000000000
--- a/i18n/rus/src/vs/workbench/services/message/electron-browser/messageService.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"yesButton": "&&Да",
-	"cancelButton": "Отмена"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/services/mode/common/workbenchModeService.i18n.json b/i18n/rus/src/vs/workbench/services/mode/common/workbenchModeService.i18n.json
deleted file mode 100644
index 6f79123bafb..00000000000
--- a/i18n/rus/src/vs/workbench/services/mode/common/workbenchModeService.i18n.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.contributes.languages": "Добавляет объявления языка.",
-	"vscode.extension.contributes.languages.id": "Идентификатор языка.",
-	"vscode.extension.contributes.languages.aliases": "Псевдонимы имен для языка.",
-	"vscode.extension.contributes.languages.extensions": "Расширения имен файлов, связанные с языком.",
-	"vscode.extension.contributes.languages.filenames": "Имена файлов, связанные с языком.",
-	"vscode.extension.contributes.languages.filenamePatterns": "Стандартные маски имен файлов, связанные с языком.",
-	"vscode.extension.contributes.languages.mimetypes": "Типы MIME, связанные с языком.",
-	"vscode.extension.contributes.languages.firstLine": "Регулярное выражение, соответствующее первой строке файла языка.",
-	"vscode.extension.contributes.languages.configuration": "Относительный путь к файлу, содержащему параметры конфигурации для языка.",
-	"invalid": "Недопустимое значение contributes.{0}. Требуется массив.",
-	"invalid.empty": "Пустое значение contributes.{0}",
-	"require.id": "свойство \"{0}\" является обязательным и должно иметь тип string",
-	"opt.extensions": "свойство \"{0}\" может быть опущено и должно иметь тип string[]",
-	"opt.filenames": "свойство \"{0}\" может быть опущено и должно иметь тип string[]",
-	"opt.firstLine": "свойство \"{0}\" может быть опущено и должно иметь тип string",
-	"opt.configuration": "свойство \"{0}\" может быть опущено и должно иметь тип string",
-	"opt.aliases": "свойство \"{0}\" может быть опущено и должно иметь тип string[]",
-	"opt.mimetypes": "свойство \"{0}\" может быть опущено и должно иметь тип string[]"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/services/progress/browser/progressService2.i18n.json b/i18n/rus/src/vs/workbench/services/progress/browser/progressService2.i18n.json
deleted file mode 100644
index ba82447f37b..00000000000
--- a/i18n/rus/src/vs/workbench/services/progress/browser/progressService2.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"progress.subtitle": "{0} - {1}",
-	"progress.title": "{0}: {1}",
-	"cancel": "Отмена"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/services/textMate/electron-browser/TMGrammars.i18n.json b/i18n/rus/src/vs/workbench/services/textMate/electron-browser/TMGrammars.i18n.json
deleted file mode 100644
index a51daf45d2b..00000000000
--- a/i18n/rus/src/vs/workbench/services/textMate/electron-browser/TMGrammars.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.contributes.grammars": "Добавляет разметчики TextMate.",
-	"vscode.extension.contributes.grammars.language": "Идентификатор языка, для которого добавляется этот синтаксис.",
-	"vscode.extension.contributes.grammars.scopeName": "Имя области TextMate, используемое в файле tmLanguage.",
-	"vscode.extension.contributes.grammars.path": "Путь к файлу tmLanguage. Путь указывается относительно папки расширения и обычно начинается с \"./syntaxes/\".",
-	"vscode.extension.contributes.grammars.embeddedLanguages": "Сопоставление имени области и идентификатора языка, если грамматика содержит внедренные языки.",
-	"vscode.extension.contributes.grammars.tokenTypes": "Сопоставление имени области с типами маркеров.",
-	"vscode.extension.contributes.grammars.injectTo": "Список имен языковых областей, в которые вставляется эта грамматика."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/services/textMate/electron-browser/TMSyntax.i18n.json b/i18n/rus/src/vs/workbench/services/textMate/electron-browser/TMSyntax.i18n.json
deleted file mode 100644
index 40ffdebf725..00000000000
--- a/i18n/rus/src/vs/workbench/services/textMate/electron-browser/TMSyntax.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"invalid.language": "Неизвестный язык в contributes.{0}.language. Указанное значение: {1}",
-	"invalid.scopeName": "В contributes.{0}.scopeName требуется строка. Указанное значение: {1}",
-	"invalid.path.0": "В contributes.{0}.path требуется строка. Указанное значение: {1}",
-	"invalid.injectTo": "Недопустимое значение в \"contributes.{0}.injectTo\". Должен быть задан массив имен языковых областей. Указанное значение: {1}",
-	"invalid.embeddedLanguages": "Недопустимое значение в \"contributes.{0}.embeddedLanguages\". Оно должно быть сопоставлением объекта между именем области и языком. Указанное значение: {1}.",
-	"invalid.tokenTypes": "Недопустимое значение в \"contributes.{0}.tokenTypes\". Необходимо указать сопоставление объекта между именем объекта и типом маркера. Указанное значение: {1}.",
-	"invalid.path.1": "contributes.{0}.path ({1}) должен был быть включен в папку расширения ({2}). Это может сделать расширение непереносимым.",
-	"no-tm-grammar": "Нет грамматики TM, зарегистрированной для этого языка."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/services/textfile/common/textFileEditorModel.i18n.json b/i18n/rus/src/vs/workbench/services/textfile/common/textFileEditorModel.i18n.json
deleted file mode 100644
index 08210c97ac7..00000000000
--- a/i18n/rus/src/vs/workbench/services/textfile/common/textFileEditorModel.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"saveFileFirst": "Файл изменен. Сохраните его, прежде чем открыть его вновь в другой кодировке.",
-	"genericSaveError": "Не удалось сохранить \"{0}\": {1}"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/services/textfile/common/textFileService.i18n.json b/i18n/rus/src/vs/workbench/services/textfile/common/textFileService.i18n.json
deleted file mode 100644
index 9a0f25eff08..00000000000
--- a/i18n/rus/src/vs/workbench/services/textfile/common/textFileService.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"files.backup.failSave": "Не удалось записать измененные файлы в расположение резервной копии (ошибка: {0}). Попробуйте сохранить файлы и выйти."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json b/i18n/rus/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json
deleted file mode 100644
index c95c2d23f40..00000000000
--- a/i18n/rus/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"saveChangesMessage": "Сохранить изменения, внесенные в {0}?",
-	"saveChangesMessages": "Сохранить изменения в указанных файлах ({0})?",
-	"saveAll": "&&Сохранить все",
-	"save": "&&Сохранить",
-	"dontSave": "&&Не сохранять",
-	"cancel": "Отмена",
-	"saveChangesDetail": "Если не сохранить изменения, они будут утеряны.",
-	"allFiles": "Все файлы",
-	"noExt": "Нет расширений"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/services/themes/common/colorExtensionPoint.i18n.json b/i18n/rus/src/vs/workbench/services/themes/common/colorExtensionPoint.i18n.json
deleted file mode 100644
index ce0c503ab7e..00000000000
--- a/i18n/rus/src/vs/workbench/services/themes/common/colorExtensionPoint.i18n.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"contributes.color": "Добавляет цвета тем, определяемые расширением ",
-	"contributes.color.id": "Идентификатор цвета темы",
-	"contributes.color.id.format": "Идентификаторы необходимо указывать в форме aa [.bb]*",
-	"contributes.color.description": "Описание цвета темы",
-	"contributes.defaults.light": "Цвет по умолчанию для светлых тем. Укажите значение цвета в шестнадцатеричном формате (#RRGGBB[AA]) или идентификатор цвета темы.",
-	"contributes.defaults.dark": "Цвет по умолчанию для темных тем. Укажите значение цвета в шестнадцатеричном формате (#RRGGBB[AA]) или идентификатор цвета темы.",
-	"contributes.defaults.highContrast": "Цвет по умолчанию для тем с высоким контрастом. Укажите значение цвета в шестнадцатеричном формате (#RRGGBB[AA]) или идентификатор цвета темы.",
-	"invalid.colorConfiguration": "'configuration.colors' должен быть массивом",
-	"invalid.default.colorType": "{0} должен представлять собой значение цвета в шестнадцатеричном формате (#RRGGBB[AA] или #RGB[A]) или идентификатор цвета темы.",
-	"invalid.id": "Параметр 'configuration.colors.id' должен быть указан и не может быть пустым",
-	"invalid.id.format": "Параметр 'configuration.colors.id' должен следовать за word[.word]*",
-	"invalid.description": "Параметр 'configuration.colors.description' должен быть указан и не может быть пустым",
-	"invalid.defaults": "'configuration.colors.defaults' может быть указан и может содержать значения 'light', 'dark' и 'highContrast'"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/services/themes/common/colorThemeSchema.i18n.json b/i18n/rus/src/vs/workbench/services/themes/common/colorThemeSchema.i18n.json
deleted file mode 100644
index 52a5a5e9b5c..00000000000
--- a/i18n/rus/src/vs/workbench/services/themes/common/colorThemeSchema.i18n.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"schema.token.settings": "Цвета и стили для маркера.",
-	"schema.token.foreground": "Цвет переднего плана для маркера.",
-	"schema.token.background.warning": "Цвет фона маркера сейчас не поддерживается.",
-	"schema.token.fontStyle": "Стиль шрифта для правила: 'italic', 'bold', 'underline' или их сочетание. Если указана пустая строка, то унаследованные настройки отменяются.",
-	"schema.fontStyle.error": "Стиль шрифта может иметь значения 'italic', 'bold' и 'underline', сочетание этих свойств или содержать пустую строку.",
-	"schema.token.fontStyle.none": "Нет (очистить унаследованный стиль)",
-	"schema.properties.name": "Описание правила.",
-	"schema.properties.scope": "Переключатель области, для которой проверяется это правило.",
-	"schema.tokenColors.path": "Путь к файлу tmTheme (относительно текущего файла).",
-	"schema.colors": "Цвета для выделения синтаксических конструкций"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/services/themes/common/fileIconThemeSchema.i18n.json b/i18n/rus/src/vs/workbench/services/themes/common/fileIconThemeSchema.i18n.json
deleted file mode 100644
index fe543360ae7..00000000000
--- a/i18n/rus/src/vs/workbench/services/themes/common/fileIconThemeSchema.i18n.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"schema.folderExpanded": "Значок папки для развернутых папок. Значок развернутой папки используется по желанию. Если он не задан, будет отображаться значок, заданный для папки.",
-	"schema.folder": "Значок папки для свернутых папок, а также если не задан параметр folderExpanded для развернутых папок.",
-	"schema.file": "Значок файла по умолчанию, отображаемый для всех файлов, которые не соответствуют известному расширению, имени файла или коду языка.",
-	"schema.folderNames": "Сопоставляет имена папок со значками. Ключ объекта — имя папки, не включая сегменты пути. Не допускается использование шаблонов или подстановочных знаков. Имена папок сопоставляются без учета регистра.",
-	"schema.folderName": "Идентификатор определения значка для сопоставления.",
-	"schema.folderNamesExpanded": "Сопоставляет имена папок со значками для развернутых папок. Ключ объекта — имя папки, не включая сегменты пути. Не допускается использование шаблонов или подстановочных знаков. Имена папок сопоставляются без учета регистра.",
-	"schema.folderNameExpanded": "Идентификатор определения значка для сопоставления.",
-	"schema.fileExtensions": "Сопоставляет расширения файлов со значками. Ключ объекта — имя расширения файла. Имя расширения представляет собой последний сегмент имени файла после последней точки (не включая точку). Расширения сопоставляются без учета регистра.",
-	"schema.fileExtension": "Идентификатор определения значка для сопоставления.",
-	"schema.fileNames": "Сопоставляет имена файлов со значками. Ключ объекта — полное имя файла, не включая сегменты пути. Имя файла может содержать точки и возможное расширение файла. Не допускается использование шаблонов или подстановочных знаков. Имена файлов сопоставляются без учета регистра.",
-	"schema.fileName": "Идентификатор определения значка для сопоставления.",
-	"schema.languageIds": "Сопоставляет языки и значки. Ключ объекта — идентификатор языка, как определено в точке публикации для языка.",
-	"schema.languageId": "Идентификатор определения значка для сопоставления.",
-	"schema.fonts": "Шрифты, используемые в определениях значков.",
-	"schema.id": "Идентификатор шрифта.",
-	"schema.src": "Расположение шрифта.",
-	"schema.font-path": "Путь к шрифту относительно текущего файла темы значка.",
-	"schema.font-format": "Формат шрифта.",
-	"schema.font-weight": "Насыщенность шрифта.",
-	"schema.font-sstyle": "Стиль шрифта.",
-	"schema.font-size": "Размер шрифта по умолчанию.",
-	"schema.iconDefinitions": "Описание всех значков, которые можно использовать при сопоставлении файлов и значков.",
-	"schema.iconDefinition": "Определение значка. Ключ объекта — идентификатор определения.",
-	"schema.iconPath": "При использовании SVG или PNG: путь к изображению. Путь задается относительно файла набора значков.",
-	"schema.fontCharacter": "При использовании шрифта с глифами: используемый символ в шрифте.",
-	"schema.fontColor": "При использовании шрифта с глифами: используемый цвет.",
-	"schema.fontSize": "При использовании шрифта: размер шрифта в процентах от шрифта текста. Если не задан, по умолчанию используется размер в определении шрифта.",
-	"schema.fontId": "При использовании шрифта: идентификатор шрифта. Если не задан, по умолчанию используется первое определение шрифта.",
-	"schema.light": "Дополнительные сопоставления для значков файлов в светлых цветных темах.",
-	"schema.highContrast": "Дополнительные сопоставления для значков файлов в контрастных цветных темах.",
-	"schema.hidesExplorerArrows": "Определяет, следует ли скрыть стрелки проводника, если эта тема активна."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/services/themes/electron-browser/colorThemeData.i18n.json b/i18n/rus/src/vs/workbench/services/themes/electron-browser/colorThemeData.i18n.json
deleted file mode 100644
index abc05e5e3b0..00000000000
--- a/i18n/rus/src/vs/workbench/services/themes/electron-browser/colorThemeData.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"error.cannotparsejson": "Возникли проблемы при анализе файла JSON THEME: {0}.",
-	"error.invalidformat.colors": "Ошибка при анализе файла цветовой темы: {0}. Свойство 'colors' не имеет тип 'object'.",
-	"error.invalidformat.tokenColors": "Ошибка при анализе файла цветовой темы: {0}. Свойство 'tokenColors' должно содержать массив цветов или путь к файлу темы TextMate",
-	"error.plist.invalidformat": "Ошибка при анализе файла tmTheme: {0}. 'settings' не является массивом.",
-	"error.cannotparse": "Ошибка при анализе файла tmTheme: {0}",
-	"error.cannotload": "Ошибка при загрузке файла tmTheme {0}: {1}"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/services/themes/electron-browser/colorThemeStore.i18n.json b/i18n/rus/src/vs/workbench/services/themes/electron-browser/colorThemeStore.i18n.json
deleted file mode 100644
index a1faadb508d..00000000000
--- a/i18n/rus/src/vs/workbench/services/themes/electron-browser/colorThemeStore.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.contributes.themes": "Contributes textmate color themes.",
-	"vscode.extension.contributes.themes.id": "Идентификатор темы значка, как используется в параметрах пользователя.",
-	"vscode.extension.contributes.themes.label": "Метка цветовой схемы, отображаемая в пользовательском интерфейсе.",
-	"vscode.extension.contributes.themes.uiTheme": "Базовая тема, определяющая цвета оформления редактора: \"vs\" — светлая цветовая тема, \"vs-dark\" — темная цветовая тема. \"hc-black\" — темная высококонтрастная тема.",
-	"vscode.extension.contributes.themes.path": "Путь к файлу tmTheme. Путь указывается относительно папки расширения и имеет вид \"./themes/themeFile.tmTheme\".",
-	"reqarray": "Extension point `{0}` must be an array.",
-	"reqpath": "В contributes.{0}.path требуется строка. Указанное значение: {1}",
-	"invalid.path.1": "contributes.{0}.path ({1}) должен был быть включен в папку расширения ({2}). Это может сделать расширение непереносимым."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/services/themes/electron-browser/fileIconThemeData.i18n.json b/i18n/rus/src/vs/workbench/services/themes/electron-browser/fileIconThemeData.i18n.json
deleted file mode 100644
index 8582255d004..00000000000
--- a/i18n/rus/src/vs/workbench/services/themes/electron-browser/fileIconThemeData.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"error.cannotparseicontheme": "Problems parsing file icons file: {0}"
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/services/themes/electron-browser/fileIconThemeStore.i18n.json b/i18n/rus/src/vs/workbench/services/themes/electron-browser/fileIconThemeStore.i18n.json
deleted file mode 100644
index 871ce0b194c..00000000000
--- a/i18n/rus/src/vs/workbench/services/themes/electron-browser/fileIconThemeStore.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.contributes.iconThemes": "Contributes file icon themes.",
-	"vscode.extension.contributes.iconThemes.id": "Идентификатор темы значка, как используется в параметрах пользователя.",
-	"vscode.extension.contributes.iconThemes.label": "Метка темы значка, как отображается в пользовательском интерфейсе.",
-	"vscode.extension.contributes.iconThemes.path": "Путь к файлу определения темы значка. Путь задается относительно папки расширения и, как правило, имеет следующий вид: \"./icons/awesome-icon-theme.json\".",
-	"reqarray": "Extension point `{0}` must be an array.",
-	"reqpath": "В contributes.{0}.path требуется строка. Указанное значение: {1}",
-	"reqid": "Ожидалась строка в \"contributes.{0}.id\". Указанное значение: {1}",
-	"invalid.path.1": "contributes.{0}.path ({1}) должен был быть включен в папку расширения ({2}). Это может сделать расширение непереносимым."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json b/i18n/rus/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
deleted file mode 100644
index 73e5413908f..00000000000
--- a/i18n/rus/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"error.cannotloadtheme": "Unable to load {0}: {1}",
-	"colorTheme": "Specifies the color theme used in the workbench.",
-	"colorThemeError": "Theme is unknown or not installed.",
-	"iconTheme": "Указывает тему значков, используемую в рабочей области. Чтобы значки файлов не отображались, используйте значение 'null'.",
-	"noIconThemeDesc": "No file icons",
-	"iconThemeError": "File icon theme is unknown or not installed.",
-	"workbenchColors": "Переопределяет цвета из выбранной цветовой темы.",
-	"editorColors.comments": "Задает цвета и стили для комментариев",
-	"editorColors.strings": "Задает цвета и стили для строковых литералов.",
-	"editorColors.keywords": "Задает цвета и стили для ключевых слов.",
-	"editorColors.numbers": "Задает цвета и стили для числовых литералов. ",
-	"editorColors.types": "Задает цвета и стили для объявлений типов и ссылок. ",
-	"editorColors.functions": "Задает цвета и стили для объявлений функций и ссылок. ",
-	"editorColors.variables": "Задает цвета и стили для объявлений переменных и для ссылок. ",
-	"editorColors.textMateRules": "Задает цвета и стили с использованием правил оформления textmate (расширенный параметр).",
-	"editorColors": "Переопределяет цвета редактора и стиль шрифта из текущей выбранной цветовой темы."
-}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json b/i18n/rus/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json
deleted file mode 100644
index 680471e1ac0..00000000000
--- a/i18n/rus/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"errorInvalidTaskConfiguration": "Не удается записать файл конфигурации рабочей области. Откройте файл, исправьте ошибки и предупреждения и повторите попытку.",
-	"errorWorkspaceConfigurationFileDirty": "Не удается записать файл конфигурации рабочей области, так как файл был изменен. Сохраните файл и повторите попытку.",
-	"openWorkspaceConfigurationFile": "Открыть конфигурацию рабочей области"
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/azure-account/out/azure-account.i18n.json b/i18n/trk/extensions/azure-account/out/azure-account.i18n.json
deleted file mode 100644
index 83a29fc7089..00000000000
--- a/i18n/trk/extensions/azure-account/out/azure-account.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"azure-account.copyAndOpen": "Kopyala & Aç",
-	"azure-account.close": "Kapat",
-	"azure-account.login": "Oturum Aç",
-	"azure-account.loginFirst": "Oturum açılmamış, ilk olarak oturum açın.",
-	"azure-account.userCodeFailed": "Kullanıcı kodu alımı başarısız oldu",
-	"azure-account.tokenFailed": "Cihaz kodu ile anahtar alınıyor",
-	"azure-account.tokenFromRefreshTokenFailed": "Yenileme anahtarı ile anahtar alınıyor"
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/azure-account/out/extension.i18n.json b/i18n/trk/extensions/azure-account/out/extension.i18n.json
deleted file mode 100644
index 68e607e17d3..00000000000
--- a/i18n/trk/extensions/azure-account/out/extension.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"azure-account.loggingIn": "Azure: Oturum açılıyor...",
-	"azure-account.loggedIn": "Azure: {0}"
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/bat/package.i18n.json b/i18n/trk/extensions/bat/package.i18n.json
deleted file mode 100644
index 6bf2c73d4dd..00000000000
--- a/i18n/trk/extensions/bat/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Windows Bat Dil Temelleri",
-	"description": "Windows batch dosyaları için kod parçacıkları, söz dizimi vurgulama, ayraç eşleştirme ve katlama sağlar."
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/clojure/package.i18n.json b/i18n/trk/extensions/clojure/package.i18n.json
deleted file mode 100644
index 2572ac70fb3..00000000000
--- a/i18n/trk/extensions/clojure/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Clojure Dil Temelleri",
-	"description": "Clojure dosyaları için söz dizimi vurgulama ve ayraç eşleştirme sağlar."
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/coffeescript/package.i18n.json b/i18n/trk/extensions/coffeescript/package.i18n.json
deleted file mode 100644
index e0e25085df9..00000000000
--- a/i18n/trk/extensions/coffeescript/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "CoffeeScript Dil Temelleri",
-	"description": "CoffeeScript dosyaları için kod parçacıkları, söz dizimi vurgulama, ayraç eşleştirme ve katlama sağlar."
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/configuration-editing/out/extension.i18n.json b/i18n/trk/extensions/configuration-editing/out/extension.i18n.json
deleted file mode 100644
index 5b6160ceb4f..00000000000
--- a/i18n/trk/extensions/configuration-editing/out/extension.i18n.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"workspaceFolder": "VS Code'da açık olan klasörün yolu",
-	"workspaceFolderBasename": "VS Code'da açık olan klasörün hiçbir eğik çizgi (/) içermeyen yolu",
-	"relativeFile": "Şu an açık olan dosyanın ${workspaceFolder} klasörüne göreli yolu",
-	"file": "Şu an açık olan dosya",
-	"cwd": "Görev çalıştırıcısının şu an geçerli olan başlangıçtaki çalışma dizini",
-	"lineNumber": "Aktif dosyadaki şu an seçili olan satır numarası",
-	"selectedText": "Aktif dosyadaki şu an seçili metin",
-	"fileDirname": "Şu an açık olan dosyanın bulunduğu dizinin adı",
-	"fileExtname": "Şu an açık olan dosyanın uzantısı",
-	"fileBasename": "Şu an açık olan dosyanın adı",
-	"fileBasenameNoExtension": "Şu an açık olan dosyanın uzantı içermeyen adı",
-	"exampleExtension": "Örnek"
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json b/i18n/trk/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json
deleted file mode 100644
index e59dd324cdf..00000000000
--- a/i18n/trk/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"activeEditorShort": "dosya adı (ör. dosyam.txt)",
-	"activeEditorMedium": "çalışma alanı klasörüne göreli dosyanın yolu (ör. klasorum/dosyam.txt)",
-	"activeEditorLong": "dosyanın tam yolu (ör. /Users/Development/myProject/myFolder/myFile.txt)",
-	"rootName": "çalışma alanının adı (ör. klasorum veya calismaAlanim)",
-	"rootPath": "çalışma alanının yolu (ör. /Users/Development/myWorkspace)",
-	"folderName": "dosyayı içeren çalışma alanı klasörünün adı (ör. myFolder)",
-	"folderPath": "dosyayı içeren çalışma alanı klasörünün yolu (ör. /Users/Development/myFolder)",
-	"appName": "ör. VS Code",
-	"dirty": "değişiklik göstergesi, aktif düzenleyici kaydedilmemiş değişiklikler içeriyorsa",
-	"separator": "koşullu ayırıcı ('-') sadece değişkenler tarafından değerlerle çevrildiğinde gösterir",
-	"assocLabelFile": "Uzantılı Dosyalar",
-	"assocDescriptionFile": "Dosya adında glob deseniyle eşleşen tüm dosyaları belirtilen tanımlayıcıya sahip olan dile eşleyin.",
-	"assocLabelPath": "Yollu Dosyalar",
-	"assocDescriptionPath": "Dosya yolunda mutlak yol glob deseniyle eşleşen tüm dosyaları belirtilen tanımlayıcıya sahip olan dile eşleyin.",
-	"fileLabel": "Uzantıya Göre Dosyalar",
-	"fileDescription": "Belirli bir dosya uzantısına sahip tüm dosyaları eşleştirin.",
-	"filesLabel": "Birden Çok Uzantılı Dosyalar",
-	"filesDescription": "Tüm dosyaları herhangi bir dosya uzantısıyla eşleştirin.",
-	"derivedLabel": "Ada Göre Eşdüzeyi Olan Dosyalar",
-	"derivedDescription": "Aynı ada ancak farklı bir uzantıya sahip eşdüzeyi olan dosyaları eşleştirin.",
-	"topFolderLabel": "Ada Göre Klasör (En Üst Düzey)",
-	"topFolderDescription": "En üst düzeydeki bir klasörü belirli bir ad ile eşleştirin.",
-	"topFoldersLabel": "Birden Çok Ada Sahip Klasör (En Üst Düzey)",
-	"topFoldersDescription": "Birden çok en üst düzey klasörü eşleştirin.",
-	"folderLabel": "Ada Göre Klasör (Herhangi Bir Konum)",
-	"folderDescription": "Bir klasörü herhangi bir konumdaki belirli bir ad ile eşleştirin.",
-	"falseDescription": "Deseni devre dışı bırakın.",
-	"trueDescription": "Deseni etkinleştirin.",
-	"siblingsDescription": "Aynı ada ancak farklı bir uzantıya sahip eşdüzeyi olan dosyaları eşleştirin.",
-	"languageSpecificEditorSettings": "Dile özel düzenleyici ayarları",
-	"languageSpecificEditorSettingsDescription": "Dil için düzenleyici ayarlarını geçersiz kıl"
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/configuration-editing/package.i18n.json b/i18n/trk/extensions/configuration-editing/package.i18n.json
deleted file mode 100644
index 3cd37f51aad..00000000000
--- a/i18n/trk/extensions/configuration-editing/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Yapılandırma Düzenleme",
-	"description": "Ayarlar, başlatma, önerilen eklenti dosyaları gibi yapılandırma dosyalarında gelişmiş kod tamamlama (IntelliSense), otomatik düzeltme gibi yetenekler sağlar."
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/cpp/package.i18n.json b/i18n/trk/extensions/cpp/package.i18n.json
deleted file mode 100644
index 5cc9d44b99d..00000000000
--- a/i18n/trk/extensions/cpp/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "C/C++ Dil Temelleri",
-	"description": "C/C++ dosyaları için kod parçacıkları, söz dizimi vurgulama, ayraç eşleştirme ve katlama sağlar."
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/csharp/package.i18n.json b/i18n/trk/extensions/csharp/package.i18n.json
deleted file mode 100644
index 5cc0540a102..00000000000
--- a/i18n/trk/extensions/csharp/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "C# Dil Temelleri",
-	"description": "C# dosyaları için kod parçacıkları, söz dizimi vurgulama, ayraç eşleştirme ve katlama sağlar."
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/css-language-features/client/out/cssMain.i18n.json b/i18n/trk/extensions/css-language-features/client/out/cssMain.i18n.json
deleted file mode 100644
index 5d438afc47c..00000000000
--- a/i18n/trk/extensions/css-language-features/client/out/cssMain.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"cssserver.name": "CSS Dil Sunucusu",
-	"folding.start": "Katlama Bölgesi Başlangıcı",
-	"folding.end": "Katlama Bölgesi Sonu"
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/css-language-features/package.i18n.json b/i18n/trk/extensions/css-language-features/package.i18n.json
deleted file mode 100644
index 5a93ed1e786..00000000000
--- a/i18n/trk/extensions/css-language-features/package.i18n.json
+++ /dev/null
@@ -1,81 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "CSS Dili Özellikleri",
-	"description": "CSS, LESS, SCSS dosyaları için zengin dil desteği sağlar.",
-	"css.title": "CSS",
-	"css.lint.argumentsInColorFunction.desc": "Geçersiz sayıda parametre",
-	"css.lint.boxModel.desc": "Doldurma veya kenarlık kullanırken genişlik veya yükseklik kullanmayın",
-	"css.lint.compatibleVendorPrefixes.desc": "Satıcıya özgü bir ön ek kullanırken satıcıya özgü diğer tüm özellikleri de dahil ettiğinizden emin olun",
-	"css.lint.duplicateProperties.desc": "Yinelenen stil tanımları kullanmayın",
-	"css.lint.emptyRules.desc": "Boş kural kümeleri kullanmayın",
-	"css.lint.float.desc": "'float' kullanmaktan kaçının. Float'lar, düzenin herhangi bir unsuru değiştiğinde kolayca bozulan kırılgan CSS ile sonuçlanır.",
-	"css.lint.fontFaceProperties.desc": "@font-face kuralı 'src' ve 'font-family' özelliklerini tanımlamalıdır",
-	"css.lint.hexColorLength.desc": "Onaltılık renkler üç veya altı onaltılık sayıdan oluşmalıdır",
-	"css.lint.idSelector.desc": " ID'ler HTML'e çok sıkı bağlı olduğundan, seçiciler ID içermemelidir. ",
-	"css.lint.ieHack.desc": "IE izinsiz girişleri yalnızca IE7 ve daha eski sürümler desteklenirken gereklidir",
-	"css.lint.important.desc": "!important kullanmaktan kaçının. Tüm CSS'nin belirginlik düzeyi üzerindeki denetimin kaybedildiğinin ve yeniden düzenlenmesi gerektiğinin bir belirtisidir.",
-	"css.lint.importStatement.desc": "İçe aktarma deyimleri paralel olarak yüklenmez",
-	"css.lint.propertyIgnoredDueToDisplay.desc": "Özellik gösterim nedeniyle yoksayıldı. Örn. 'display: inline' ile width, height, margin-top, margin-bottom ve float özelliklerinin hiçbir etkisi olmaz",
-	"css.lint.universalSelector.desc": "Evrensel seçici (*) yavaş olarak bilinir",
-	"css.lint.unknownProperties.desc": "Bilinmeyen özellik.",
-	"css.lint.unknownVendorSpecificProperties.desc": "Bilinmeyen satıcıya özel özellik.",
-	"css.lint.vendorPrefix.desc": "Satıcıya özgü bir ön ek kullanırken standart özelliği de dahil edin",
-	"css.lint.zeroUnits.desc": "Sıfır için birim gerekmez",
-	"css.trace.server.desc": "VS Code ve CSS dil sunucusu arasındaki iletişimi izler.",
-	"css.validate.title": "CSS doğrulamasını ve sorunların önem derecelerini denetler.",
-	"css.validate.desc": "Tüm doğrulamaları etkinleştirir veya devre dışı bırakır",
-	"less.title": "LESS",
-	"less.lint.argumentsInColorFunction.desc": "Geçersiz sayıda parametre",
-	"less.lint.boxModel.desc": "Doldurma veya kenarlık kullanırken genişlik veya yükseklik kullanmayın",
-	"less.lint.compatibleVendorPrefixes.desc": "Satıcıya özgü bir ön ek kullanırken satıcıya özgü diğer tüm özellikleri de dahil ettiğinizden emin olun",
-	"less.lint.duplicateProperties.desc": "Yinelenen stil tanımları kullanmayın",
-	"less.lint.emptyRules.desc": "Boş kural kümeleri kullanmayın",
-	"less.lint.float.desc": "'float' kullanmaktan kaçının. Float'lar, düzenin herhangi bir unsuru değiştiğinde kolayca bozulan kırılgan CSS ile sonuçlanır.",
-	"less.lint.fontFaceProperties.desc": "@font-face kuralı 'src' ve 'font-family' özelliklerini tanımlamalıdır",
-	"less.lint.hexColorLength.desc": "Onaltılık renkler üç veya altı onaltılık sayıdan oluşmalıdır",
-	"less.lint.idSelector.desc": " ID'ler HTML'e çok sıkı bağlı olduğundan, seçiciler ID içermemelidir. ",
-	"less.lint.ieHack.desc": "IE izinsiz girişleri yalnızca IE7 ve daha eski sürümler desteklenirken gereklidir",
-	"less.lint.important.desc": "!important kullanmaktan kaçının. Tüm CSS'nin belirginlik düzeyi üzerindeki denetimin kaybedildiğinin ve yeniden düzenlenmesi gerektiğinin bir belirtisidir.",
-	"less.lint.importStatement.desc": "İçe aktarma deyimleri paralel olarak yüklenmez",
-	"less.lint.propertyIgnoredDueToDisplay.desc": "Özellik gösterim nedeniyle yoksayıldı. Örn. 'display: inline' ile width, height, margin-top, margin-bottom ve float özelliklerinin hiçbir etkisi olmaz",
-	"less.lint.universalSelector.desc": "Evrensel seçici (*) yavaş olarak bilinir",
-	"less.lint.unknownProperties.desc": "Bilinmeyen özellik.",
-	"less.lint.unknownVendorSpecificProperties.desc": "Bilinmeyen satıcıya özel özellik.",
-	"less.lint.vendorPrefix.desc": "Satıcıya özgü bir ön ek kullanırken standart özelliği de dahil edin",
-	"less.lint.zeroUnits.desc": "Sıfır için birim gerekmez",
-	"less.validate.title": "LESS doğrulamasını ve sorunların önem derecelerini denetler.",
-	"less.validate.desc": "Tüm doğrulamaları etkinleştirir veya devre dışı bırakır",
-	"scss.title": "SCSS (Sass)",
-	"scss.lint.argumentsInColorFunction.desc": "Geçersiz sayıda parametre",
-	"scss.lint.boxModel.desc": "Doldurma veya kenarlık kullanırken genişlik veya yükseklik kullanmayın",
-	"scss.lint.compatibleVendorPrefixes.desc": "Satıcıya özgü bir ön ek kullanırken satıcıya özgü diğer tüm özellikleri de dahil ettiğinizden emin olun",
-	"scss.lint.duplicateProperties.desc": "Yinelenen stil tanımları kullanmayın",
-	"scss.lint.emptyRules.desc": "Boş kural kümeleri kullanmayın",
-	"scss.lint.float.desc": "'float' kullanmaktan kaçının. Float'lar, düzenin herhangi bir unsuru değiştiğinde kolayca bozulan kırılgan CSS ile sonuçlanır.",
-	"scss.lint.fontFaceProperties.desc": "@font-face kuralı 'src' ve 'font-family' özelliklerini tanımlamalıdır",
-	"scss.lint.hexColorLength.desc": "Onaltılık renkler üç veya altı onaltılık sayıdan oluşmalıdır",
-	"scss.lint.idSelector.desc": " ID'ler HTML'e çok sıkı bağlı olduğundan, seçiciler ID içermemelidir. ",
-	"scss.lint.ieHack.desc": "IE izinsiz girişleri yalnızca IE7 ve daha eski sürümler desteklenirken gereklidir",
-	"scss.lint.important.desc": "!important kullanmaktan kaçının. Tüm CSS'nin belirginlik düzeyi üzerindeki denetimin kaybedildiğinin ve yeniden düzenlenmesi gerektiğinin bir belirtisidir.",
-	"scss.lint.importStatement.desc": "İçe aktarma deyimleri paralel olarak yüklenmez",
-	"scss.lint.propertyIgnoredDueToDisplay.desc": "Özellik gösterim nedeniyle yoksayıldı. Örn. 'display: inline' ile width, height, margin-top, margin-bottom ve float özelliklerinin hiçbir etkisi olmaz",
-	"scss.lint.universalSelector.desc": "Evrensel seçici (*) yavaş olarak bilinir",
-	"scss.lint.unknownProperties.desc": "Bilinmeyen özellik.",
-	"scss.lint.unknownVendorSpecificProperties.desc": "Bilinmeyen satıcıya özel özellik.",
-	"scss.lint.vendorPrefix.desc": "Satıcıya özgü bir ön ek kullanırken standart özelliği de dahil edin",
-	"scss.lint.zeroUnits.desc": "Sıfır için birim gerekmez",
-	"scss.validate.title": "SCSS doğrulamasını ve sorunların önem derecelerini denetler.",
-	"scss.validate.desc": "Tüm doğrulamaları etkinleştirir veya devre dışı bırakır",
-	"less.colorDecorators.enable.desc": "Renk dekoratörlerini etkinleştirir veya devre dışı bırakır",
-	"scss.colorDecorators.enable.desc": "Renk dekoratörlerini etkinleştirir veya devre dışı bırakır",
-	"css.colorDecorators.enable.desc": "Renk dekoratörlerini etkinleştirir veya devre dışı bırakır",
-	"css.colorDecorators.enable.deprecationMessage": "`css.colorDecorators.enable` ayarı, `editor.colorDecorators` yüzünden kullanım dışıdır.",
-	"scss.colorDecorators.enable.deprecationMessage": "`scss.colorDecorators.enable` ayarı, `editor.colorDecorators` yüzünden kullanım dışıdır.",
-	"less.colorDecorators.enable.deprecationMessage": "`less.colorDecorators.enable` ayarı, `editor.colorDecorators` yüzünden kullanım dışıdır."
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/css/client/out/cssMain.i18n.json b/i18n/trk/extensions/css/client/out/cssMain.i18n.json
deleted file mode 100644
index 5d438afc47c..00000000000
--- a/i18n/trk/extensions/css/client/out/cssMain.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"cssserver.name": "CSS Dil Sunucusu",
-	"folding.start": "Katlama Bölgesi Başlangıcı",
-	"folding.end": "Katlama Bölgesi Sonu"
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/css/package.i18n.json b/i18n/trk/extensions/css/package.i18n.json
deleted file mode 100644
index 66b4b1f0603..00000000000
--- a/i18n/trk/extensions/css/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "CSS Dil Temelleri",
-	"description": "CSS, LESS ve SCSS dosyaları için söz dizimi vurgulama ve ayraç eşleştirme sağlar."
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/diff/package.i18n.json b/i18n/trk/extensions/diff/package.i18n.json
deleted file mode 100644
index 35229bd6699..00000000000
--- a/i18n/trk/extensions/diff/package.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	]
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/docker/package.i18n.json b/i18n/trk/extensions/docker/package.i18n.json
deleted file mode 100644
index c1d50a16c53..00000000000
--- a/i18n/trk/extensions/docker/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Docker Dil Temelleri",
-	"description": "Docker dosyaları için söz dizimi vurgulama ve ayraç eşleştirme sağlar."
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/emmet/package.i18n.json b/i18n/trk/extensions/emmet/package.i18n.json
deleted file mode 100644
index da0ca75d8cf..00000000000
--- a/i18n/trk/extensions/emmet/package.i18n.json
+++ /dev/null
@@ -1,65 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"description": "VS Code için Emmet desteği",
-	"command.wrapWithAbbreviation": "Kısaltma ile Sarmala",
-	"command.wrapIndividualLinesWithAbbreviation": "Her Bir Satırı Kısaltma ile Sarmala",
-	"command.removeTag": "Etiketi Kaldır",
-	"command.updateTag": "Etiketi Güncelle",
-	"command.matchTag": "Eşleşen Çifte Git",
-	"command.balanceIn": "Dengele (İçe Doğru)",
-	"command.balanceOut": "Dengele (Dışa Doğru)",
-	"command.prevEditPoint": "Önceki Düzenleme Noktasına Git",
-	"command.nextEditPoint": "Sonraki Düzenleme Noktasına Git",
-	"command.mergeLines": "Satırları Birleştir",
-	"command.selectPrevItem": "Bir Önceki Ögeyi Seç",
-	"command.selectNextItem": "Bir Sonraki Ögeyi Seç",
-	"command.splitJoinTag": "Etiketi Böl/Birleştir",
-	"command.toggleComment": "Yorumu Aç/Kapat",
-	"command.evaluateMathExpression": "Matematik İfadesini Değerlendir",
-	"command.updateImageSize": "Görüntü Boyutunu Güncelle",
-	"command.reflectCSSValue": "CSS Değerini Yansıt",
-	"command.incrementNumberByOne": "1 Arttır",
-	"command.decrementNumberByOne": "1 Azalt",
-	"command.incrementNumberByOneTenth": "0.1 Arttır",
-	"command.decrementNumberByOneTenth": "0.1 Azalt",
-	"command.incrementNumberByTen": "10 Arttır",
-	"command.decrementNumberByTen": "10 Azalt",
-	"emmetSyntaxProfiles": "Belirtilen sentaks için profil tanımlayın veya kendi profilinizi belirli kurallarla kullanın.",
-	"emmetExclude": "Emmet kısaltmalarının genişletilmeyeceği bir diller dizisi.",
-	"emmetExtensionsPath": "Emmet profileri ve parçacıklarını içeren bir klasör yolu.'",
-	"emmetShowExpandedAbbreviation": "Genişletilmiş Emmet kısaltmalarını öneriler olarak gösterir.\n\"inMarkupAndStylesheetFilesOnly\" seçeneği\" html, haml, jade, xml, xsl, css, scss, sass, less ve stylus'a uygulanır.\n\"always\" seçeneği işaretleme/css'den bağımsız olarak dosyanın tüm bölümlerine uygulanır.",
-	"emmetShowAbbreviationSuggestions": "Olası Emmet kısaltmalarını öneriler olarak gösterir. Stil dosyalarında veya emmet.showExpandedAbbreviation'a \"never\" değeri atandığında uygulanamaz.",
-	"emmetIncludeLanguages": "Varsayılan olarak desteklenmeyen dillerde Emmet kısaltmalarını etkinleştirin. Burada dil ile desteklenen emmet destekli dil arasında bir eşleme ekleyin.\nÖr: {\"vue-html\": \"html\", \"javascript\": \"javascriptreact\"}",
-	"emmetVariables": "Emmet parçacıklarında kullanılacak değişkenler",
-	"emmetTriggerExpansionOnTab": "Etkinleştirildiğinde, Emmet kısaltmaları TAB tuşuna basıldığında genişletilir.",
-	"emmetPreferences": "Emmet'in bazı eylemleri ve çözümleyicilerinin davranışını değiştirmek için kullanılacak tercihler.",
-	"emmetPreferencesIntUnit": "Tam sayı değerleri için varsayılan birim",
-	"emmetPreferencesFloatUnit": "Ondalık sayı değerleri için varsayılan birim",
-	"emmetPreferencesCssAfter": "CSS kısaltmaları genişletilirken CSS özelliğinin sonuna koyulacak sembol",
-	"emmetPreferencesSassAfter": "Sass dosyalarında CSS kısaltmaları genişletilirken CSS özelliğinin sonuna koyulacak sembol",
-	"emmetPreferencesStylusAfter": "Stylus dosyalarında CSS kısaltmaları genişletilirken CSS özelliğinin sonuna koyulacak sembol",
-	"emmetPreferencesCssBetween": "CSS kısaltmaları genişletilirken CSS özelliği ve değerinin arasına koyulacak sembol",
-	"emmetPreferencesSassBetween": "Sass dosyalarında CSS kısaltmaları genişletilirken CSS özelliği ve değerinin arasına koyulacak sembol",
-	"emmetPreferencesStylusBetween": "Stylus dosyalarında CSS kısaltmaları genişletilirken CSS özelliği ve değerinin arasına koyulacak sembol",
-	"emmetShowSuggestionsAsSnippets": "Doğruysa, Emmet önerileri, editor.snippetSuggestions ayarı ile sıralayabilmenizi sağlayan parçacıklar olarak gösterilir.",
-	"emmetPreferencesBemElementSeparator": "BEM filtresi kullanırken sınıflar için kullanılacak öge ayrıcı",
-	"emmetPreferencesBemModifierSeparator": "BEM filtresi kullanırken sınıflar için kullanılacak niteleyici ayrıcı",
-	"emmetPreferencesFilterCommentBefore": "Yorum filtresi uygulandığında eşleşen ögenin önüne konulması gereken yorumun tanımı.",
-	"emmetPreferencesFilterCommentAfter": "Yorum filtresi uygulandığında eşleşen ögenin ardına konulması gereken yorumun tanımı.",
-	"emmetPreferencesFilterCommentTrigger": "Yorum filterinin uygulanması için kısaltmada bulunması gereken virgülle ayrılmış öznitelik adları listesi",
-	"emmetPreferencesFormatNoIndentTags": "İçe girintilenmemesi gereken bir etiket adları dizisi",
-	"emmetPreferencesFormatForceIndentTags": "Her zaman içe girintilenmesi gereken bir etiket adları dizisi",
-	"emmetPreferencesAllowCompactBoolean": "Doğruysa, boole niteliklerinin öz gösterimi üretilir",
-	"emmetPreferencesCssWebkitProperties": "`-` ile başlayan Emmet kısaltmasında kullanıldığında 'webkit' önekini alacak virgülle ayrılmış CSS özellikleri. 'webkit' önekinden her zaman kaçınmak için boş bir dize olarak ayarlayın.",
-	"emmetPreferencesCssMozProperties": "`-` ile başlayan Emmet kısaltmasında kullanıldığında 'moz' önekini alacak virgülle ayrılmış CSS özellikleri. 'moz' önekinden her zaman kaçınmak için boş bir dize olarak ayarlayın.",
-	"emmetPreferencesCssOProperties": "`-` ile başlayan Emmet kısaltmasında kullanıldığında 'o' önekini alacak virgülle ayrılmış CSS özellikleri. 'o' önekinden her zaman kaçınmak için boş bir dize olarak ayarlayın.",
-	"emmetPreferencesCssMsProperties": "`-` ile başlayan Emmet kısaltmasında kullanıldığında 'ms' önekini alacak virgülle ayrılmış CSS özellikleri. 'ms' önekinden her zaman kaçınmak için boş bir dize olarak ayarlayın.",
-	"emmetPreferencesCssFuzzySearchMinScore": "Bulanık eşleştirilmiş kısaltmaların elde etmesi gereken minimum puan (0'dan 1'e kadar). Düşük değerler birçok yanlış pozitif eşleşme oluşturabilir, daha yüksek değerler olası eşleşmeleri azaltabilir.",
-	"emmetOptimizeStylesheetParsing": "\"false\" değeri atandığında, Emmet kısaltmalarının genişletilmesinde o anki konumun geçerli olup olmadığını belirlemek için tüm dosya ayrıştırılır. \"true\" değeri atandığında, css/scss/less dosyalarında sadece o anki konumun çevresi ayrıştırılır."
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/extension-editing/out/extensionLinter.i18n.json b/i18n/trk/extensions/extension-editing/out/extensionLinter.i18n.json
deleted file mode 100644
index 548a560533a..00000000000
--- a/i18n/trk/extensions/extension-editing/out/extensionLinter.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"httpsRequired": "Resimler HTTPS protokolünü kullanmalıdır.",
-	"svgsNotValid": "SVG'ler geçerli bir resim kaynağı değil.",
-	"embeddedSvgsNotValid": "Gömülü SVG'ler geçerli bir resim kaynağı değil.",
-	"dataUrlsNotValid": "Veri URL'leri geçerli bir resim kaynağı değil.",
-	"relativeUrlRequiresHttpsRepository": "Göreli görüntü URL'leri, HTTPS protokollü bir deponun bu package.json'da belirtilmesini gerektiriyor.",
-	"relativeIconUrlRequiresHttpsRepository": "Bir simge, HTTPS protokollü bir deponun bu package.json'da belirtilmesini gerektiriyor.",
-	"relativeBadgeUrlRequiresHttpsRepository": "Göreli gösterge URL'leri, HTTPS protokollü bir deponun bu package.json'da belirtilmesini gerektiriyor."
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/extension-editing/out/packageDocumentHelper.i18n.json b/i18n/trk/extensions/extension-editing/out/packageDocumentHelper.i18n.json
deleted file mode 100644
index a375b8fef19..00000000000
--- a/i18n/trk/extensions/extension-editing/out/packageDocumentHelper.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"languageSpecificEditorSettings": "Dile özel düzenleyici ayarları",
-	"languageSpecificEditorSettingsDescription": "Dil için düzenleyici ayarlarını geçersiz kıl"
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/extension-editing/package.i18n.json b/i18n/trk/extensions/extension-editing/package.i18n.json
deleted file mode 100644
index 5a79e5fc185..00000000000
--- a/i18n/trk/extensions/extension-editing/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Paket Dosyası Düzenleme",
-	"description": "package.json dosyalarında VS Code eklenti noktaları için gelişmiş kod tamamlama(IntelliSense) ve doğrulama yetenekleri sağlar."
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/fsharp/package.i18n.json b/i18n/trk/extensions/fsharp/package.i18n.json
deleted file mode 100644
index a8bda6cee3e..00000000000
--- a/i18n/trk/extensions/fsharp/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "F# Dil Temelleri",
-	"description": "F# dosyaları için kod parçacıkları, söz dizimi vurgulama, ayraç eşleştirme ve katlama sağlar."
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/git/out/askpass-main.i18n.json b/i18n/trk/extensions/git/out/askpass-main.i18n.json
deleted file mode 100644
index 8e761ff13da..00000000000
--- a/i18n/trk/extensions/git/out/askpass-main.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"missOrInvalid": "Eksik veya geçersiz kimlik bilgisi."
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/git/out/autofetch.i18n.json b/i18n/trk/extensions/git/out/autofetch.i18n.json
deleted file mode 100644
index e8cd01ea688..00000000000
--- a/i18n/trk/extensions/git/out/autofetch.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"yes": "Evet",
-	"no": "Hayır",
-	"not now": "Daha sonra hatırlat",
-	"suggest auto fetch": "Code'un [düzenli olarak 'git fetch' komutunu çalıştırmasını]({0}) ister misiniz?"
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/git/out/commands.i18n.json b/i18n/trk/extensions/git/out/commands.i18n.json
deleted file mode 100644
index 6794dc4934c..00000000000
--- a/i18n/trk/extensions/git/out/commands.i18n.json
+++ /dev/null
@@ -1,91 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"tag at": "{0} üzerindeki etiket",
-	"remote branch at": "{0} üzerindeki uzak dal",
-	"create branch": "$(plus) Yeni dal oluştur",
-	"repourl": "Depo URL'si",
-	"selectFolder": "Depo Konumunu Seç",
-	"cloning": "'{0}' git deposu kopyalanıyor...",
-	"proposeopen": "Kopyalanan depoyu açmak ister misiniz?",
-	"openrepo": "Depoyu Aç",
-	"add": "Çalışma Alanına Ekle",
-	"proposeopen2": "Kopyalanan depoyu açmak veya geçerli çalışma alanına eklemek ister misiniz?",
-	"init": "Git deposunun oluşturulacağı çalışma alanı klasörünü seçin",
-	"init repo": "Depo Oluştur",
-	"create repo": "Depo Oluştur",
-	"are you sure": "Bu, '{0}' dizininde bir Git deposu oluşturacak. Devam etmek istediğinizden emin misiniz?",
-	"HEAD not available": "'{0}'e ait HEAD sürümü mevcut değil.",
-	"confirm stage files with merge conflicts": "Birleştirme çakışmaları bulunan {0} dosyayı hazırlamak istediğinizden emin misiniz?",
-	"confirm stage file with merge conflicts": "Birleştirme çakışmaları bulunan {0} klasörünü hazırlamak istediğinizden emin misiniz?",
-	"yes": "Evet",
-	"confirm revert": "{0} üzerindeki seçili değişiklikleri geri almak istediğinizden emin misiniz?",
-	"revert": "Değişiklikleri Geri Al",
-	"discard": "Değişiklikleri Göz Ardı Et",
-	"confirm delete": "{0} dosyasını SİLMEK istediğinizden emin misiniz?",
-	"delete file": "Dosyayı Sil",
-	"confirm discard": "{0} üzerindeki seçili değişiklikleri göz ardı etmek istediğinizden emin misiniz?",
-	"confirm discard multiple": "{0} dosyadaki değişiklikleri göz ardı etmek istediğinizden emin misiniz?",
-	"warn untracked": "Bu, izlenmeyen {0} dosyayı SİLECEK!",
-	"confirm discard all single": "{0} üzerindeki seçili değişiklikleri göz ardı etmek istediğinizden emin misiniz?",
-	"confirm discard all": "{0} dosyadaki TÜM değişiklikleri göz ardı etmek istediğinizden emin misiniz?\nBu GERİ DÖNDÜRÜLEMEZ!\nMevcut çalışma grubunuz TAMAMEN KAYBOLACAK.",
-	"discardAll multiple": "1 Dosyayı Göz Ardı Et",
-	"discardAll": "{0} Dosyanın Tamamını Göz Ardı Et",
-	"confirm delete multiple": "{0} dosyayı SİLMEK istediğinizden emin misiniz?",
-	"delete files": "Dosyaları Sil",
-	"there are untracked files single": "Şu izlenmeyen dosya göz ardı edilirse DİSKTEN SİLİNECEK: {0}.",
-	"there are untracked files": "Göz ardı edilirse DİSKTEN SİLİNECEK {0} izlenmeyen dosya var.",
-	"confirm discard all 2": "{0}\n\nBu GERİ DÖNDÜRÜLEMEZ, mevcut çalışma grubunuz TAMAMEN KAYBOLACAK.",
-	"yes discard tracked": "İzlenen 1 Dosyayı Göz Ardı Et",
-	"yes discard tracked multiple": "İzlenen {0} Dosyayı Göz Ardı Et",
-	"unsaved files single": "Aşağıdaki dosya kaydedilmemiş: {0}.\n\nCommit'lemeden önce kaydetmek ister misiniz?",
-	"unsaved files": "{0} kaydedilmemiş dosya var.\n\nCommit'lemeden önce kaydetmek ister misiniz?",
-	"save and commit": "Tümünü Kaydet & Commit'le",
-	"commit": "Yine de Commit'le",
-	"no staged changes": "Commit'lenecek hazırlanmış değişiklik yok.\n\nTüm değişikliklerinizi otomatik olarak hazırlamak ve direkt olarak commit'lemek ister misiniz?",
-	"always": "Daima",
-	"no changes": "Commit'lenecek değişiklik yok.",
-	"commit message": "Commit mesajı",
-	"provide commit message": "Lütfen bir commit mesajı belirtin.",
-	"select a ref to checkout": "Geçiş yapılacak bir başvuru seçin",
-	"branch name": "Dal adı",
-	"provide branch name": "Lütfen bir dal adı belirtin",
-	"select branch to delete": "Silinecek dalı seçin",
-	"confirm force delete branch": "'{0}' dalı tamamen birleştirilmemiş. Yine de silinsin mi?",
-	"delete branch": "Dalı Sil",
-	"invalid branch name": "Geçersiz dal adı",
-	"branch already exists": "'{0}' adında bir dal zaten mevcut",
-	"select a branch to merge from": "Birleştirilmesi için bir dal seçin",
-	"merge conflicts": "Birleştirme çakışmaları var. Commit'lemeden önce bunları çözün.",
-	"tag name": "Etiket adı",
-	"provide tag name": "Lütfen bir etiket adı belirtin",
-	"tag message": "Mesaj",
-	"provide tag message": "Lütfen etikete açıklama yapmak için bir mesaj belirtin",
-	"no remotes to fetch": "Bu depoda alma işleminin yapılacağı hiçbir uzak uçbirim yapılandırılmamış.",
-	"no remotes to pull": "Deponuzda çekme işleminin yapılacağı hiçbir uzak uçbirim yapılandırılmamış.",
-	"pick remote pull repo": "Dalın çekileceği bir uzak uçbirim seçin",
-	"no remotes to push": "Deponuzda gönderimin yapılacağı hiçbir uzak uçbirim yapılandırılmamış.",
-	"nobranch": "Lütfen uzak uçbirime gönderilecek dala geçiş yapın.",
-	"confirm publish branch": "'{0}' dalında bir ana depo(upstream) dalı bulunmuyor. Bu dalı yayınlamak ister misiniz?",
-	"ok": "Tamam",
-	"push with tags success": "Başarılı bir şekilde etiketlerle gönderildi.",
-	"pick remote": "'{0}' dalının yayınlanacağı bir uzak uçbirim seçin:",
-	"sync is unpredictable": "Bu eylem, '{0}/{1}' deposuna commitleri gönderecek ve alacaktır.",
-	"never again": "Tamam, Tekrar Gösterme",
-	"no remotes to publish": "Deponuzda yayınlamanın yapılacağı hiçbir uzak uçbirim yapılandırılmamış.",
-	"no changes stash": "Geçici olarak saklanacak bir değişiklik yok.",
-	"provide stash message": "İsteğe bağlı olarak bir geçici olarak saklama mesajı belirtin",
-	"stash message": "Geçici olarak saklama mesajı",
-	"no stashes": "Geri yüklenecek geçici değişiklik yok.",
-	"pick stash to pop": "Geri yüklenecek ögeyi seçin",
-	"clean repo": "Geçiş yapmadan önce deponuzdaki çalışma ağacınızı temizleyin.",
-	"cant push": "Başvurular uzak uçbirime gönderilemiyor. Değişikliklerinizi entegre etmeden, ilk olarak 'Çek'i çalıştırmayı deneyin. ",
-	"git error details": "Git: {0}",
-	"git error": "Git hatası",
-	"open git log": "Git Günlüğünü Aç"
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/git/out/main.i18n.json b/i18n/trk/extensions/git/out/main.i18n.json
deleted file mode 100644
index 22cc3828e0d..00000000000
--- a/i18n/trk/extensions/git/out/main.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"looking": "Git, şu konumda aranıyor: {0}",
-	"using git": "{1} yolundaki git {0} kullanılıyor",
-	"downloadgit": "Git'i İndir",
-	"neverShowAgain": "Tekrar Gösterme",
-	"notfound": "Git bulunamadı. Git'i kurun veya 'git.path' ayarı ile yapılandırın.",
-	"updateGit": "Git'i Güncelle",
-	"git20": "git {0} yüklemiş olarak görünüyorsunuz. Code, git >= 2 ile en iyi şekilde çalışır"
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/git/out/model.i18n.json b/i18n/trk/extensions/git/out/model.i18n.json
deleted file mode 100644
index 2751f7326c1..00000000000
--- a/i18n/trk/extensions/git/out/model.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"too many submodules": "'{0}' deposu otomatik olarak açılmayacak {1} alt modül içeriyor. İçlerindeki bir dosyayı açarak her birini tek tek açabilirsiniz.",
-	"no repositories": "Mevcut depo yok",
-	"pick repo": "Bir depo seçin"
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/git/out/repository.i18n.json b/i18n/trk/extensions/git/out/repository.i18n.json
deleted file mode 100644
index 88e17ba3d7d..00000000000
--- a/i18n/trk/extensions/git/out/repository.i18n.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"open": "Aç",
-	"index modified": "Dizin Değiştirildi",
-	"modified": "Değiştirilmiş",
-	"index added": "Dizin Eklendi",
-	"index deleted": "Dizin Silindi",
-	"deleted": "Silindi",
-	"index renamed": "Dizin Yeniden Adlandırıldı",
-	"index copied": "Dizin Kopyalandı",
-	"untracked": "İzlenmedi",
-	"ignored": "Yok Sayıldı",
-	"both deleted": "Her İkimiz de Sildik",
-	"added by us": "Bizim Tarafımızdan Eklendi",
-	"deleted by them": "Onlar Tarafından Silindi",
-	"added by them": "Onlar Tarafından Eklendi",
-	"deleted by us": "Bizim Tarafımızdan Silindi",
-	"both added": "Her İkimiz de Ekledik",
-	"both modified": "Her İkimiz de Değiştirdik",
-	"commitMessage": "Mesaj (commit'lemek için {0} tuşlarına basın)",
-	"commit": "Commit'le",
-	"merge changes": "Değişiklikleri Birleştir",
-	"staged changes": "Hazırlanmış Değişiklikler",
-	"changes": "Değişiklikler",
-	"commitMessageCountdown": "geçerli satırda {0} karakter kaldı",
-	"commitMessageWarning": "geçerli satırda {1} üzerinde {0} karakter",
-	"neveragain": "Tekrar Gösterme",
-	"huge": "'{0}' yolundaki git deposunda çok fazla aktif değişikliklik var, Git özelliklerinin yalnızca bir alt kümesi etkinleştirilecektir."
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/git/out/scmProvider.i18n.json b/i18n/trk/extensions/git/out/scmProvider.i18n.json
deleted file mode 100644
index 9d509d1398a..00000000000
--- a/i18n/trk/extensions/git/out/scmProvider.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"commit": "Commit'le"
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/git/out/statusbar.i18n.json b/i18n/trk/extensions/git/out/statusbar.i18n.json
deleted file mode 100644
index 927c48aacf3..00000000000
--- a/i18n/trk/extensions/git/out/statusbar.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"checkout": "Geçiş yap...",
-	"sync changes": "Değişiklikleri Senkronize Et",
-	"publish changes": "Değişiklikleri Yayınla",
-	"syncing changes": "Değişiklikler Senkronize Ediliyor..."
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/git/package.i18n.json b/i18n/trk/extensions/git/package.i18n.json
deleted file mode 100644
index c440a7230c6..00000000000
--- a/i18n/trk/extensions/git/package.i18n.json
+++ /dev/null
@@ -1,87 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Git",
-	"description": "Git Entegrasyonu",
-	"command.clone": "Kopyala",
-	"command.init": "Depo Oluştur",
-	"command.close": "Depoyu Kapat",
-	"command.refresh": "Yenile",
-	"command.openChange": "Değişiklikleri Aç",
-	"command.openFile": "Dosya Aç",
-	"command.openHEADFile": "Dosya Aç (HEAD)",
-	"command.stage": "Değişiklikleri Hazırla",
-	"command.stageAll": "Tüm Değişiklikleri Hazırla",
-	"command.stageSelectedRanges": "Seçili Aralığı Hazırla",
-	"command.revertSelectedRanges": "Seçili Aralığı Geri Al",
-	"command.stageChange": "Değişikliği Hazırla",
-	"command.revertChange": "Değişikliği Geri Al",
-	"command.unstage": "Değişiklikleri Hazırlık Alanından Geri Al",
-	"command.unstageAll": "Tüm Değişiklikleri Hazırlık Alanından Geri Al",
-	"command.unstageSelectedRanges": "Seçili Alanı Hazırlık Alanından Geri Al",
-	"command.clean": "Değişiklikleri Göz Ardı Et",
-	"command.cleanAll": "Tüm Değişiklikleri Göz Ardı Et",
-	"command.commit": "Commit'le",
-	"command.commitStaged": "Hazırlananları Commit'le",
-	"command.commitStagedSigned": "Hazırlananları Commit'le (İmzalı)",
-	"command.commitStagedAmend": "Hazırlananları Commit'le (Değiştir)",
-	"command.commitAll": "Tümünü Commit'le",
-	"command.commitAllSigned": "Tümünü Commit'le (İmzalı)",
-	"command.commitAllAmend": "Tümünü Commit'le (Değiştir)",
-	"command.undoCommit": "Son Commit'i Geri Al",
-	"command.checkout": "Geçiş yap...",
-	"command.branch": "Dal Oluştur...",
-	"command.deleteBranch": "Dalı Sil...",
-	"command.renameBranch": "Dalı Yeniden Adlandır...",
-	"command.merge": "Dalı Birleştir...",
-	"command.createTag": "Etiket Oluştur",
-	"command.fetch": "Al",
-	"command.pull": "Çek",
-	"command.pullRebase": "Çek (Yeniden Adresle)",
-	"command.pullFrom": "Şuradan Çek...",
-	"command.push": "Gönder",
-	"command.pushTo": "Gönder...",
-	"command.pushWithTags": "Etiketlerle Gönder",
-	"command.sync": "Senkronize Et",
-	"command.syncRebase": "Eşitle (Yeniden Adresle)",
-	"command.publish": "Dalı Yayınla",
-	"command.showOutput": "Git Çıktısını Göster",
-	"command.ignore": ".gitignore'a Dosya Ekle",
-	"command.stashIncludeUntracked": "Geçici Olarak Sakla(İzlenmeyenleri Dahil Et)",
-	"command.stash": "Geçici Olarak Sakla",
-	"command.stashPop": "Geçici Olarak Saklananı Geri Yükle...",
-	"command.stashPopLatest": "En Son Geçici Olarak Saklananı Geri Yükle",
-	"config.enabled": "Git'in etkinleştirilip etkinleştirilmediği",
-	"config.path": "Çalıştırılabilir Git dosyasının yolu",
-	"config.autoRepositoryDetection": "Depoların otomatik olarak algılanıp algılanmayacağı",
-	"config.autorefresh": "Otomatik yenilemenin etkinleştirilip etkinleştirilmediği",
-	"config.autofetch": "Otomatik getirmenin etkinleştirilip etkinleştirilmediği",
-	"config.enableLongCommitWarning": "Uzun commit mesajları hakkında uyarıda bulunulup bulunulmayacağı",
-	"config.confirmSync": "Git depolarını senkronize etmeden önce onaylayın",
-	"config.countBadge": "Git gösterge sayacını denetler. `all` tüm değişiklikleri sayar. `tracked` sadece izlenen değişikliklikleri sayar. `off` ise kapatır.",
-	"config.checkoutType": "`Geçiş Yap...` çalıştırılırken listelenecek dal türlerini denetler. `all` tüm başvuruları gösterir, `local` sadece yerel dalları gösterir, `tags` sadece etiketleri gösterir ve `remote` sadece uzak uçbirim dallarını gösterir.",
-	"config.ignoreLegacyWarning": "Eski Git uyarısını görmezden gelir",
-	"config.ignoreMissingGitWarning": "Git mevcut olmadığında uyarıyı yok sayar",
-	"config.ignoreLimitWarning": "Bir depoda çok fazla değişiklik var uyarısını görmezden gelir",
-	"config.defaultCloneDirectory": "Bir git deposunun kopyalanacağı varsayılan konum",
-	"config.enableSmartCommit": "Hazırlanan değişiklik yoksa tüm değişiklikleri commit'le.",
-	"config.enableCommitSigning": "GPG ile commit imzalamayı etkinleştirir.",
-	"config.discardAllScope": "`Tüm Değişiklikleri Göz Ardı Et` komutuyla hangi değişikliklerin göz ardı edileceğini denetler. `all` tüm değişiklikleri göz ardı eder. `tracked` sadece izlenen dosyaları göz ardı eder. `prompt` eylem her çalıştığında bir onay penceresi gösterir.",
-	"config.decorations.enabled": "Git'in gezgine ve açık düzenleyiciler görünümüne renkler ve göstergeler ile ekleme yapıp yapmadığını denetler.",
-	"config.promptToSaveFilesBeforeCommit": "Commit'lemeden önce Git'in kaydedilmemiş dosyaları kontrol edip etmeyeceğini denetler.",
-	"config.showInlineOpenFileAction": "Git değişiklikleri görünümünde satır içi Dosyayı Aç eyleminin gösterilip gösterilmeyeceğini denetler.",
-	"config.inputValidation": "Commit mesajı doğrulamasının ne zaman gösterileceğini kontrol eder.",
-	"config.detectSubmodules": "Git alt modüllerin otomatik olarak tespit edilip edilmeyeceğini denetler.",
-	"config.detectSubmodulesLimit": "Algılanan git alt modüllerinin limitini denetler.",
-	"colors.modified": "Değiştirilen kaynakların rengi.",
-	"colors.deleted": "Silinen kaynakların rengi.",
-	"colors.untracked": "İzlenmeyen kaynakların rengi.",
-	"colors.ignored": "Yok sayılan kaynakların rengi.",
-	"colors.conflict": "Çakışma içeren kaynakların rengi.",
-	"colors.submodule": "Alt modül kaynaklarının rengi."
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/go/package.i18n.json b/i18n/trk/extensions/go/package.i18n.json
deleted file mode 100644
index 2343407bc9e..00000000000
--- a/i18n/trk/extensions/go/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Go Dil Temelleri",
-	"description": "Go dosyaları için söz dizimi vurgulama ve ayraç eşleştirme sağlar."
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/groovy/package.i18n.json b/i18n/trk/extensions/groovy/package.i18n.json
deleted file mode 100644
index 76d58aa3cc5..00000000000
--- a/i18n/trk/extensions/groovy/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Groovy Dil Temelleri",
-	"description": "Groovy dosyaları için kod parçacıkları, söz dizimi vurgulama ve ayraç eşleştirme sağlar."
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/grunt/out/main.i18n.json b/i18n/trk/extensions/grunt/out/main.i18n.json
deleted file mode 100644
index d3cd0c98812..00000000000
--- a/i18n/trk/extensions/grunt/out/main.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"execFailed": "{0} klasörü için Grunt otomatik tespiti hata ile sonuçlandı: {1}"
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/grunt/package.i18n.json b/i18n/trk/extensions/grunt/package.i18n.json
deleted file mode 100644
index b8f835d427a..00000000000
--- a/i18n/trk/extensions/grunt/package.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"description": "VSCode'a Grunt yetenekleri kazandıracak eklenti.",
-	"displayName": "VSCode için Grunt desteği",
-	"config.grunt.autoDetect": "Grunt görevlerinin otomatik olarak algılanıp algılanmayacağını denetler. Varsayılan olarak açıktır.",
-	"grunt.taskDefinition.type.description": "Özelleştirilecek Grunt görevi.",
-	"grunt.taskDefinition.file.description": "Görevi sağlayan Grunt dosyası. Atlanabilir."
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/gulp/out/main.i18n.json b/i18n/trk/extensions/gulp/out/main.i18n.json
deleted file mode 100644
index cdcef9fdb98..00000000000
--- a/i18n/trk/extensions/gulp/out/main.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"execFailed": "{0} klasörü için gulp otomatik tespiti hata ile sonuçlandı: {1}"
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/gulp/package.i18n.json b/i18n/trk/extensions/gulp/package.i18n.json
deleted file mode 100644
index 1b1e3130be3..00000000000
--- a/i18n/trk/extensions/gulp/package.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"description": "VSCode'a Gulp yetenekleri kazandıracak eklenti.",
-	"displayName": "VSCode için Gulp desteği",
-	"config.gulp.autoDetect": "Gulp görevlerinin otomatik olarak algılanıp algılanmayacağını denetler. Varsayılan olarak açıktır.",
-	"gulp.taskDefinition.type.description": "Özelleştirilecek Gulp görevi.",
-	"gulp.taskDefinition.file.description": "Görevi sağlayan Gulp dosyası. Atlanabilir."
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/handlebars/package.i18n.json b/i18n/trk/extensions/handlebars/package.i18n.json
deleted file mode 100644
index a682e230854..00000000000
--- a/i18n/trk/extensions/handlebars/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Handlebars Dil Temelleri",
-	"description": "Handlebars dosyaları için söz dizimi vurgulama ve ayraç eşleştirme sağlar."
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/hlsl/package.i18n.json b/i18n/trk/extensions/hlsl/package.i18n.json
deleted file mode 100644
index c0f8cb84f31..00000000000
--- a/i18n/trk/extensions/hlsl/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "HLSL Dil Temelleri",
-	"description": "HLSL dosyaları için söz dizimi vurgulama ve ayraç eşleştirme sağlar."
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/html-language-features/client/out/htmlMain.i18n.json b/i18n/trk/extensions/html-language-features/client/out/htmlMain.i18n.json
deleted file mode 100644
index cd480d42123..00000000000
--- a/i18n/trk/extensions/html-language-features/client/out/htmlMain.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"htmlserver.name": "HTML Dil Sunucusu",
-	"folding.start": "Katlama Bölgesi Başlangıcı",
-	"folding.end": "Katlama Bölgesi Sonu"
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/html-language-features/package.i18n.json b/i18n/trk/extensions/html-language-features/package.i18n.json
deleted file mode 100644
index 00e0da3830a..00000000000
--- a/i18n/trk/extensions/html-language-features/package.i18n.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "HTML Dili Özellikleri",
-	"description": "HTML, Razor ve Handlebar dosyaları için zengin dil desteği sağlar.",
-	"html.format.enable.desc": "Varsayılan HTML biçimlendiricisini etkinleştirin/devre dışı bırakın",
-	"html.format.wrapLineLength.desc": "Satır başına en fazla karakter miktarı (0 = devre dışı bırak)",
-	"html.format.unformatted.desc": "Yeniden biçimlendirilmeyecek virgülle ayrılmış etiketler listesi. 'null' değeri, https://www.w3.org/TR/html5/dom.html#phrasing-content adresinde listelenen tüm etiketleri varsayılan olarak belirler.",
-	"html.format.contentUnformatted.desc": "İçeriğin yeniden biçimlendirilmeyeceği virgülle ayrılmış etiketler listesi. 'null' değeri, 'pre' etiketini varsayılan olarak belirler.",
-	"html.format.indentInnerHtml.desc": "<head> ve <body> bölümlerini girintile.",
-	"html.format.preserveNewLines.desc": "Ögelerden önceki mevcut satır sonlarının korunup korunmayacağı. Yalnızca ögelerden önce çalışır, etiketler içinde veya metinde çalışmaz.",
-	"html.format.maxPreserveNewLines.desc": "Bir öbekte korunacak maksimum satır sonu sayısı. Sınırsız için 'null' değerini kullanın.",
-	"html.format.indentHandlebars.desc": "{{#foo}} ve {{/foo}}'yu biçimlendir ve girintile.",
-	"html.format.endWithNewline.desc": "Boş bir satırla bitir.",
-	"html.format.extraLiners.desc": "Kendilerinden önce ek bir boş satır bulunması gereken virgülle ayrılmış etiketler listesi. 'null' değeri, \"head, body, /html\" değerini varsayılan olarak belirler.",
-	"html.format.wrapAttributes.desc": "Öznitelikleri sarmala.",
-	"html.format.wrapAttributes.auto": "Öznitelikleri sadece satır uzunluğu aşıldığında sarmala.",
-	"html.format.wrapAttributes.force": "İlki hariç tüm öznitelikleri sarmala.",
-	"html.format.wrapAttributes.forcealign": "İlki hariç tüm öznitelikleri sarmala ve hizada tut.",
-	"html.format.wrapAttributes.forcemultiline": "Tüm öznitelikleri sarmala.",
-	"html.suggest.angular1.desc": "Yerleşik HTML dili desteğinin Angular V1 etiketlerini ve özelliklerini önerip önermeyeceğini yapılandırır.",
-	"html.suggest.ionic.desc": "Yerleşik HTML dili desteğinin Ionic etiketlerini, özelliklerini ve değerlerini önerip önermeyeceğini yapılandırır.",
-	"html.suggest.html5.desc": "Yerleşik HTML dili desteğinin HTML5 etiketlerini, özelliklerini ve değerlerini önerip önermeyeceğini yapılandırır.",
-	"html.trace.server.desc": "VS Code ve HTML dil sunucusu arasındaki iletişimi izler.",
-	"html.validate.scripts": "Yerleşik HTML dili desteğinin HTML5 gömülü betikleri doğrulayıp doğrulamayacağını yapılandırır.",
-	"html.validate.styles": "Yerleşik HTML dili desteğinin HTML5 gömülü stilleri doğrulayıp doğrulamayacağını yapılandırır.",
-	"html.autoClosingTags": "HTML etiketlerinin otomatik kapatılmasını etkinleştirin/devre dışı bırakın"
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/html/client/out/htmlMain.i18n.json b/i18n/trk/extensions/html/client/out/htmlMain.i18n.json
deleted file mode 100644
index cd480d42123..00000000000
--- a/i18n/trk/extensions/html/client/out/htmlMain.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"htmlserver.name": "HTML Dil Sunucusu",
-	"folding.start": "Katlama Bölgesi Başlangıcı",
-	"folding.end": "Katlama Bölgesi Sonu"
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/html/package.i18n.json b/i18n/trk/extensions/html/package.i18n.json
deleted file mode 100644
index 7b449502bb0..00000000000
--- a/i18n/trk/extensions/html/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "HTML Dil Temelleri",
-	"description": "HTML dosyaları için söz dizimi vurgulama, ayraç eşleştirme ve kod parçacıkları sağlar."
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/ini/package.i18n.json b/i18n/trk/extensions/ini/package.i18n.json
deleted file mode 100644
index 8713ec61257..00000000000
--- a/i18n/trk/extensions/ini/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Ini Dil Temelleri",
-	"description": "Ini dosyaları için söz dizimi vurgulama ve ayraç eşleştirme sağlar."
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/jake/out/main.i18n.json b/i18n/trk/extensions/jake/out/main.i18n.json
deleted file mode 100644
index 7934a6441a6..00000000000
--- a/i18n/trk/extensions/jake/out/main.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"execFailed": "{0} klasörü için Jake otomatik tespiti hata ile sonuçlandı: {1}"
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/jake/package.i18n.json b/i18n/trk/extensions/jake/package.i18n.json
deleted file mode 100644
index ce05ea2af68..00000000000
--- a/i18n/trk/extensions/jake/package.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"description": "VSCode'a Jake yetenekleri kazandıracak eklenti.",
-	"displayName": "VSCode için Jake desteği",
-	"jake.taskDefinition.type.description": "Özelleştirilecek Jake görevi.",
-	"jake.taskDefinition.file.description": "Görevi sağlayan Jake dosyası. Atlanabilir.",
-	"config.jake.autoDetect": "Jake görevlerinin otomatik olarak algılanıp algılanmayacağını denetler. Varsayılan olarak açıktır."
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/java/package.i18n.json b/i18n/trk/extensions/java/package.i18n.json
deleted file mode 100644
index 567ade67dd6..00000000000
--- a/i18n/trk/extensions/java/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Java Dil Temelleri",
-	"description": "Java dosyaları için kod parçacıkları, söz dizimi vurgulama, ayraç eşleştirme ve katlama sağlar."
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/javascript/out/features/bowerJSONContribution.i18n.json b/i18n/trk/extensions/javascript/out/features/bowerJSONContribution.i18n.json
deleted file mode 100644
index ae01d6f1cbc..00000000000
--- a/i18n/trk/extensions/javascript/out/features/bowerJSONContribution.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"json.bower.default": "Varsayılan bower.json",
-	"json.bower.error.repoaccess": "Bower deposuna yapılan istek başarısız oldu: {0}",
-	"json.bower.latest.version": "en son"
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/javascript/out/features/packageJSONContribution.i18n.json b/i18n/trk/extensions/javascript/out/features/packageJSONContribution.i18n.json
deleted file mode 100644
index 8261a835a50..00000000000
--- a/i18n/trk/extensions/javascript/out/features/packageJSONContribution.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"json.package.default": "Varsayılan package.json",
-	"json.npm.error.repoaccess": "NPM deposuna yapılan istek başarısız oldu: {0}",
-	"json.npm.latestversion": "Paketin şu andaki en son sürümü",
-	"json.npm.majorversion": "En son birincil sürümle eşleşiyor (1.x.x)",
-	"json.npm.minorversion": "En son ikincil sürümle eşleşiyor (1.2.x)",
-	"json.npm.version.hover": "En son sürüm: {0}"
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/javascript/package.i18n.json b/i18n/trk/extensions/javascript/package.i18n.json
deleted file mode 100644
index 4c96222a248..00000000000
--- a/i18n/trk/extensions/javascript/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "JavaScript Dil Temelleri",
-	"description": "JavaScript dosyaları için kod parçacıkları, söz dizimi vurgulama, ayraç eşleştirme ve katlama sağlar."
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/json-language-features/client/out/jsonMain.i18n.json b/i18n/trk/extensions/json-language-features/client/out/jsonMain.i18n.json
deleted file mode 100644
index 34990f71588..00000000000
--- a/i18n/trk/extensions/json-language-features/client/out/jsonMain.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"jsonserver.name": "JSON Dil Sunucusu"
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/json-language-features/package.i18n.json b/i18n/trk/extensions/json-language-features/package.i18n.json
deleted file mode 100644
index 94799976a72..00000000000
--- a/i18n/trk/extensions/json-language-features/package.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "JSON Dili Özellikleri",
-	"description": "JSON dosyaları için zengin dil desteği sağlar.",
-	"json.schemas.desc": "Şemaları geçerli projedeki JSON dosyalarıyla ilişkilendir",
-	"json.schemas.url.desc": "Bir şemanın URL'si veya geçerli dizindeki bir şemanın göreli yolu",
-	"json.schemas.fileMatch.desc": "JSON dosyaları şemalara çözümlenirken eşleşme için kullanılacak bir dosya düzenleri dizisi.",
-	"json.schemas.fileMatch.item.desc": "JSON dosyaları şemalara çözümlenirken eşleşme için '*' içerebilen bir dosya düzeni.",
-	"json.schemas.schema.desc": "Verilen URL için şema tanımı. Şema, yalnızca şema URL'sine erişimi önlemek için sağlanmalıdır.",
-	"json.format.enable.desc": "Varsayılan JSON biçimlendiricisini etkinleştirin/devre dışı bırakın (yeniden başlatma gerektirir)",
-	"json.tracing.desc": "VS Code ve JSON dil sunucusu arasındaki iletişimi izler.",
-	"json.colorDecorators.enable.desc": "Renk dekoratörlerini etkinleştirir veya devre dışı bırakır",
-	"json.colorDecorators.enable.deprecationMessage": "`json.colorDecorators.enable` ayarı, `editor.colorDecorators` yüzünden kullanım dışıdır."
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/json/client/out/jsonMain.i18n.json b/i18n/trk/extensions/json/client/out/jsonMain.i18n.json
deleted file mode 100644
index 34990f71588..00000000000
--- a/i18n/trk/extensions/json/client/out/jsonMain.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"jsonserver.name": "JSON Dil Sunucusu"
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/json/package.i18n.json b/i18n/trk/extensions/json/package.i18n.json
deleted file mode 100644
index edd35777010..00000000000
--- a/i18n/trk/extensions/json/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "JSON Dil Temelleri",
-	"description": "JSON dosyaları için söz dizimi vurgulama ve ayraç eşleştirme sağlar."
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/less/package.i18n.json b/i18n/trk/extensions/less/package.i18n.json
deleted file mode 100644
index a97348b7a7b..00000000000
--- a/i18n/trk/extensions/less/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Less Dil Temelleri",
-	"description": "Less dosyaları için söz dizimi vurgulama, ayraç eşleştirme ve katlama sağlar."
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/log/package.i18n.json b/i18n/trk/extensions/log/package.i18n.json
deleted file mode 100644
index bbb9f4811b7..00000000000
--- a/i18n/trk/extensions/log/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Günlük",
-	"description": ".log uzantılı dosyalar için söz dizimi vurgulama özelliği sağlar."
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/lua/package.i18n.json b/i18n/trk/extensions/lua/package.i18n.json
deleted file mode 100644
index 7ae08a135c8..00000000000
--- a/i18n/trk/extensions/lua/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Lua Dil Temelleri",
-	"description": "Lua dosyaları için söz dizimi vurgulama ve ayraç eşleştirme sağlar."
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/make/package.i18n.json b/i18n/trk/extensions/make/package.i18n.json
deleted file mode 100644
index 3d9a608fb39..00000000000
--- a/i18n/trk/extensions/make/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Make Dil Temelleri",
-	"description": "Make dosyaları için söz dizimi vurgulama ve ayraç eşleştirme sağlar."
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/markdown-basics/package.i18n.json b/i18n/trk/extensions/markdown-basics/package.i18n.json
deleted file mode 100644
index c24d4dc7691..00000000000
--- a/i18n/trk/extensions/markdown-basics/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Markdown Dil Temelleri",
-	"description": "Markdown için kod parçacıkları ve söz dizimi vurgulama sağlar."
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json b/i18n/trk/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json
deleted file mode 100644
index 44f66398a79..00000000000
--- a/i18n/trk/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"onPreviewStyleLoadError": "'markdown.styles' yüklenemedi: {0}"
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/markdown-language-features/out/features/preview.i18n.json b/i18n/trk/extensions/markdown-language-features/out/features/preview.i18n.json
deleted file mode 100644
index 3a5b0eca0e2..00000000000
--- a/i18n/trk/extensions/markdown-language-features/out/features/preview.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"lockedPreviewTitle": "[Önizleme] {0}",
-	"previewTitle": "{0} Önizlemesi"
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/markdown-language-features/out/features/previewContentProvider.i18n.json b/i18n/trk/extensions/markdown-language-features/out/features/previewContentProvider.i18n.json
deleted file mode 100644
index 76db8cd58cf..00000000000
--- a/i18n/trk/extensions/markdown-language-features/out/features/previewContentProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"preview.securityMessage.text": "Bu belgedeki bazı içerikler devre dışı bırakıldı",
-	"preview.securityMessage.title": "Markdown önizlemesinde potansiyel olarak tehlikeli veya güvenli olmayan içerik devre dışı bırakıldı. Güvenli olmayan içeriğe izin vermek veya betikleri etkinleştirmek için Markdown önizleme güvenlik ayarını değiştirin",
-	"preview.securityMessage.label": "İçerik Devre Dışı Güvenlik Uyarısı"
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/markdown-language-features/out/security.i18n.json b/i18n/trk/extensions/markdown-language-features/out/security.i18n.json
deleted file mode 100644
index e905bb535f0..00000000000
--- a/i18n/trk/extensions/markdown-language-features/out/security.i18n.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"strict.title": "Katı",
-	"strict.description": "Sadece güvenli içeriği yükle",
-	"insecureLocalContent.title": "Güvenli olmayan yerel içeriğe izin ver",
-	"insecureLocalContent.description": "localhost'tan http üzerinde sunulan içeriğin yüklenmesini etkinleştir",
-	"insecureContent.title": "Güvenli olmayan içeriğe izin ver",
-	"insecureContent.description": "Http üzerinden içerik yüklemeyi etkinleştir",
-	"disable.title": "Devre Dışı Bırak",
-	"disable.description": "Tüm içeriğe ve betik yürütmeye izin ver. Tavsiye edilmez",
-	"moreInfo.title": "Daha Fazla Bilgi",
-	"enableSecurityWarning.title": "Bu çalışma alanında önizleme güvenlik uyarılarını etkinleştir",
-	"disableSecurityWarning.title": "Bu çalışma alanında önizleme güvenlik uyarılarını devre dışı bırak",
-	"toggleSecurityWarning.description": "İçerik güvenlik seviyesini etkilemez",
-	"preview.showPreviewSecuritySelector.title": "Bu çalışma alanında Markdown önizlemeleri için güvenlik ayarlarını seçin"
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/markdown-language-features/package.i18n.json b/i18n/trk/extensions/markdown-language-features/package.i18n.json
deleted file mode 100644
index c7a539dac45..00000000000
--- a/i18n/trk/extensions/markdown-language-features/package.i18n.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Markdown Dili Özellikleri",
-	"description": "Markdown için zengin dil desteği sağlar.",
-	"markdown.preview.breaks.desc": "Markdown önizlemesinde satır sonlarının nasıl gösterileceğini ayarlar. 'true' olarak ayarlamak, her yeni satırda bir <br> oluşturur.",
-	"markdown.preview.linkify": "Markdown önizlemesinde URL benzeri metinlerin bağlantıya çevrilmesini etkinleştir veya devre dışı bırak.",
-	"markdown.preview.doubleClickToSwitchToEditor.desc": "Düzenleyiciye geçiş yapmak için Markdown önizlemesine çift tıklayın.",
-	"markdown.preview.fontFamily.desc": "Markdown önizlemesinde kullanılan yazı tipi ailesini denetler.",
-	"markdown.preview.fontSize.desc": "Markdown önizlemesinde kullanılan yazı tipi boyutunu piksel olarak denetler.",
-	"markdown.preview.lineHeight.desc": "Markdown önizlemesinde kullanılan satır yüksekliğini denetler. Bu sayı yazı tipi boyutuna görecelidir.",
-	"markdown.preview.markEditorSelection.desc": "Markdown önizlemesinde geçerli düzenleyici seçimini işaretle.",
-	"markdown.preview.scrollEditorWithPreview.desc": "Markdown önizlemesi kaydırıldığında, düzenleyicinin görünümünü güncelle.",
-	"markdown.preview.scrollPreviewWithEditor.desc": "Markdown düzenleyicisi kaydırıldığında, önizlemenin görünümünü güncelle.",
-	"markdown.preview.scrollPreviewWithEditorSelection.desc": "[Kullanım Dışı] Düzenleyicide seçili satırın görünmesi için Markdown önizlemesini kaydırır.",
-	"markdown.preview.scrollPreviewWithEditorSelection.deprecationMessage": "Bu ayar 'markdown.preview.scrollPreviewWithEditor' ile değiştirildi ve artık hiçbir etkisi bulunmamaktadır.",
-	"markdown.preview.title": "Önizlemeyi Aç",
-	"markdown.previewFrontMatter.dec": "YAML ön maddesinin Markdown önizlemesinde nasıl gösterilmesi gerektiğini ayarlar. 'hide' ön maddeyi kaldırır. Diğer türlü; ön madde, Markdown içeriği olarak sayılır.",
-	"markdown.previewSide.title": "Önizlemeyi Yana Aç",
-	"markdown.showLockedPreviewToSide.title": "Kilitlenmiş Önizlemeyi Yana Aç",
-	"markdown.showSource.title": "Kaynağı Göster",
-	"markdown.styles.dec": "Markdown önizlemesinde kullanılmak üzere CSS stil dosyalarını işaret eden bir URL'ler veya yerel yollar listesi. Göreli yollar, gezginde açılan klasöre göreli olarak yorumlanır.",
-	"markdown.showPreviewSecuritySelector.title": "Önizleme Güvenlik Ayarlarını Değiştir",
-	"markdown.trace.desc": "Markdown eklentisi için hata ayıklama günlüğünü etkinleştir.",
-	"markdown.preview.refresh.title": "Önizlemeyi Yenile",
-	"markdown.preview.toggleLock.title": "Önizleme Kilitlemeyi Aç/Kapat"
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/markdown/out/commands.i18n.json b/i18n/trk/extensions/markdown/out/commands.i18n.json
deleted file mode 100644
index 062136d45f3..00000000000
--- a/i18n/trk/extensions/markdown/out/commands.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"previewTitle": "{0} Önizlemesi",
-	"onPreviewStyleLoadError": "'markdown.styles' yüklenemedi: {0}"
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/markdown/out/commands/onPreviewStyleLoadError.i18n.json b/i18n/trk/extensions/markdown/out/commands/onPreviewStyleLoadError.i18n.json
deleted file mode 100644
index 44f66398a79..00000000000
--- a/i18n/trk/extensions/markdown/out/commands/onPreviewStyleLoadError.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"onPreviewStyleLoadError": "'markdown.styles' yüklenemedi: {0}"
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/markdown/out/extension.i18n.json b/i18n/trk/extensions/markdown/out/extension.i18n.json
deleted file mode 100644
index 6579d484719..00000000000
--- a/i18n/trk/extensions/markdown/out/extension.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"onPreviewStyleLoadError": "'markdown.styles' yüklenemedi: {0}",
-	"previewTitle": "Önizleme {0}"
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/markdown/out/features/preview.i18n.json b/i18n/trk/extensions/markdown/out/features/preview.i18n.json
deleted file mode 100644
index 3a5b0eca0e2..00000000000
--- a/i18n/trk/extensions/markdown/out/features/preview.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"lockedPreviewTitle": "[Önizleme] {0}",
-	"previewTitle": "{0} Önizlemesi"
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/markdown/out/features/previewContentProvider.i18n.json b/i18n/trk/extensions/markdown/out/features/previewContentProvider.i18n.json
deleted file mode 100644
index 76db8cd58cf..00000000000
--- a/i18n/trk/extensions/markdown/out/features/previewContentProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"preview.securityMessage.text": "Bu belgedeki bazı içerikler devre dışı bırakıldı",
-	"preview.securityMessage.title": "Markdown önizlemesinde potansiyel olarak tehlikeli veya güvenli olmayan içerik devre dışı bırakıldı. Güvenli olmayan içeriğe izin vermek veya betikleri etkinleştirmek için Markdown önizleme güvenlik ayarını değiştirin",
-	"preview.securityMessage.label": "İçerik Devre Dışı Güvenlik Uyarısı"
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/markdown/out/previewContentProvider.i18n.json b/i18n/trk/extensions/markdown/out/previewContentProvider.i18n.json
deleted file mode 100644
index 04c06b0e2dd..00000000000
--- a/i18n/trk/extensions/markdown/out/previewContentProvider.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"preview.securityMessage.text": "Bu belgedeki bazı içerikler devre dışı bırakıldı",
-	"preview.securityMessage.title": "Markdown önizlemesinde potansiyel olarak tehlikeli veya güvenli olmayan içerik devre dışı bırakıldı. Güvenli olmayan içeriğe izin vermek veya betikleri etkinleştirmek için Markdown önizleme güvenlik ayarını değiştirin",
-	"preview.securityMessage.label": "İçerik Devre Dışı Güvenlik Uyarısı"
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/markdown/out/security.i18n.json b/i18n/trk/extensions/markdown/out/security.i18n.json
deleted file mode 100644
index df9d9eb7615..00000000000
--- a/i18n/trk/extensions/markdown/out/security.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"strict.title": "Katı",
-	"strict.description": "Sadece güvenli içeriği yükle",
-	"insecureContent.title": "Güvenli olmayan içeriğe izin ver",
-	"insecureContent.description": "Http üzerinden içerik yüklemeyi etkinleştir",
-	"disable.title": "Devre Dışı Bırak",
-	"disable.description": "Tüm içeriğe ve betik yürütmeye izin ver. Tavsiye edilmez",
-	"moreInfo.title": "Daha Fazla Bilgi",
-	"enableSecurityWarning.title": "Bu çalışma alanında önizleme güvenlik uyarılarını etkinleştir",
-	"disableSecurityWarning.title": "Bu çalışma alanında önizleme güvenlik uyarılarını devre dışı bırak",
-	"toggleSecurityWarning.description": "İçerik güvenlik seviyesini etkilemez",
-	"preview.showPreviewSecuritySelector.title": "Bu çalışma alanında Markdown önizlemeleri için güvenlik ayarlarını seçin"
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/markdown/package.i18n.json b/i18n/trk/extensions/markdown/package.i18n.json
deleted file mode 100644
index c7a539dac45..00000000000
--- a/i18n/trk/extensions/markdown/package.i18n.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Markdown Dili Özellikleri",
-	"description": "Markdown için zengin dil desteği sağlar.",
-	"markdown.preview.breaks.desc": "Markdown önizlemesinde satır sonlarının nasıl gösterileceğini ayarlar. 'true' olarak ayarlamak, her yeni satırda bir <br> oluşturur.",
-	"markdown.preview.linkify": "Markdown önizlemesinde URL benzeri metinlerin bağlantıya çevrilmesini etkinleştir veya devre dışı bırak.",
-	"markdown.preview.doubleClickToSwitchToEditor.desc": "Düzenleyiciye geçiş yapmak için Markdown önizlemesine çift tıklayın.",
-	"markdown.preview.fontFamily.desc": "Markdown önizlemesinde kullanılan yazı tipi ailesini denetler.",
-	"markdown.preview.fontSize.desc": "Markdown önizlemesinde kullanılan yazı tipi boyutunu piksel olarak denetler.",
-	"markdown.preview.lineHeight.desc": "Markdown önizlemesinde kullanılan satır yüksekliğini denetler. Bu sayı yazı tipi boyutuna görecelidir.",
-	"markdown.preview.markEditorSelection.desc": "Markdown önizlemesinde geçerli düzenleyici seçimini işaretle.",
-	"markdown.preview.scrollEditorWithPreview.desc": "Markdown önizlemesi kaydırıldığında, düzenleyicinin görünümünü güncelle.",
-	"markdown.preview.scrollPreviewWithEditor.desc": "Markdown düzenleyicisi kaydırıldığında, önizlemenin görünümünü güncelle.",
-	"markdown.preview.scrollPreviewWithEditorSelection.desc": "[Kullanım Dışı] Düzenleyicide seçili satırın görünmesi için Markdown önizlemesini kaydırır.",
-	"markdown.preview.scrollPreviewWithEditorSelection.deprecationMessage": "Bu ayar 'markdown.preview.scrollPreviewWithEditor' ile değiştirildi ve artık hiçbir etkisi bulunmamaktadır.",
-	"markdown.preview.title": "Önizlemeyi Aç",
-	"markdown.previewFrontMatter.dec": "YAML ön maddesinin Markdown önizlemesinde nasıl gösterilmesi gerektiğini ayarlar. 'hide' ön maddeyi kaldırır. Diğer türlü; ön madde, Markdown içeriği olarak sayılır.",
-	"markdown.previewSide.title": "Önizlemeyi Yana Aç",
-	"markdown.showLockedPreviewToSide.title": "Kilitlenmiş Önizlemeyi Yana Aç",
-	"markdown.showSource.title": "Kaynağı Göster",
-	"markdown.styles.dec": "Markdown önizlemesinde kullanılmak üzere CSS stil dosyalarını işaret eden bir URL'ler veya yerel yollar listesi. Göreli yollar, gezginde açılan klasöre göreli olarak yorumlanır.",
-	"markdown.showPreviewSecuritySelector.title": "Önizleme Güvenlik Ayarlarını Değiştir",
-	"markdown.trace.desc": "Markdown eklentisi için hata ayıklama günlüğünü etkinleştir.",
-	"markdown.preview.refresh.title": "Önizlemeyi Yenile",
-	"markdown.preview.toggleLock.title": "Önizleme Kilitlemeyi Aç/Kapat"
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/merge-conflict/out/codelensProvider.i18n.json b/i18n/trk/extensions/merge-conflict/out/codelensProvider.i18n.json
deleted file mode 100644
index cbb6bd565f0..00000000000
--- a/i18n/trk/extensions/merge-conflict/out/codelensProvider.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"acceptCurrentChange": "Mevcut Değişikliği Kabul Et",
-	"acceptIncomingChange": "Gelen Değişikliği Kabul Et",
-	"acceptBothChanges": "Her İki Değişikliği de Kabul Et",
-	"compareChanges": "Değişiklikleri Karşılaştır"
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/merge-conflict/out/commandHandler.i18n.json b/i18n/trk/extensions/merge-conflict/out/commandHandler.i18n.json
deleted file mode 100644
index 66c08747a6f..00000000000
--- a/i18n/trk/extensions/merge-conflict/out/commandHandler.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"cursorNotInConflict": "Düzenleyici imleci birleştirme çakışması içinde değil",
-	"compareChangesTitle": "{0}: Mevcut Değişiklikler ⟷ Gelen Değişiklikler",
-	"cursorOnCommonAncestorsRange": "Düzenleyici imleci ortak atalar bloğunda, imleci lütfen \"mevcut\" veya \"gelen\" bloğundan birine getirin",
-	"cursorOnSplitterRange": "Düzenleyici imleci birleştirme çakışması ayırıcısında, imleci lütfen \"mevcut\" veya \"gelen\" bloğundan birine getirin",
-	"noConflicts": "Bu dosyada birleştirme çakışması bulunamadı",
-	"noOtherConflictsInThisFile": "Bu dosyada başka birleştirme çakışması bulunamadı"
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/merge-conflict/out/mergeDecorator.i18n.json b/i18n/trk/extensions/merge-conflict/out/mergeDecorator.i18n.json
deleted file mode 100644
index 21dfafcb391..00000000000
--- a/i18n/trk/extensions/merge-conflict/out/mergeDecorator.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"currentChange": "(Mevcut Değişiklik)",
-	"incomingChange": "(Gelen Değişiklik)"
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/merge-conflict/package.i18n.json b/i18n/trk/extensions/merge-conflict/package.i18n.json
deleted file mode 100644
index e3eba21dddf..00000000000
--- a/i18n/trk/extensions/merge-conflict/package.i18n.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Birleştirme Çakışması",
-	"description": "Satır içi birleştirme çakışmaları için vurgulama ve komutlar.",
-	"command.category": "Birleştirme Çakışması",
-	"command.accept.all-current": "Mevcut Olan Tümünü Kabul Et",
-	"command.accept.all-incoming": "Gelen Tümünü Kabul Et",
-	"command.accept.all-both": "Tümünü Birden Kabul Et",
-	"command.accept.current": "Mevcut Olanı Kabul Et",
-	"command.accept.incoming": "Geleni Kabul Et",
-	"command.accept.selection": "Seçimi Kabul Et",
-	"command.accept.both": "Her İkisini de Kabul Et",
-	"command.next": "Sonraki Çakışma",
-	"command.previous": "Önceki Çakışma",
-	"command.compare": "Geçerli Çakışmayı Karşılaştır",
-	"config.title": "Birleştirme Çakışması",
-	"config.codeLensEnabled": "Düzenleyicideki birleştirme çakışması bloğu kod objektifini etkinleştir veya devre dışı bırak",
-	"config.decoratorsEnabled": "Düzenleyicideki birleştirme çakışması dekoratörlerini etkinleştir veya devre dışı bırak"
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/npm/out/features/bowerJSONContribution.i18n.json b/i18n/trk/extensions/npm/out/features/bowerJSONContribution.i18n.json
deleted file mode 100644
index ae01d6f1cbc..00000000000
--- a/i18n/trk/extensions/npm/out/features/bowerJSONContribution.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"json.bower.default": "Varsayılan bower.json",
-	"json.bower.error.repoaccess": "Bower deposuna yapılan istek başarısız oldu: {0}",
-	"json.bower.latest.version": "en son"
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/npm/out/features/packageJSONContribution.i18n.json b/i18n/trk/extensions/npm/out/features/packageJSONContribution.i18n.json
deleted file mode 100644
index 8261a835a50..00000000000
--- a/i18n/trk/extensions/npm/out/features/packageJSONContribution.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"json.package.default": "Varsayılan package.json",
-	"json.npm.error.repoaccess": "NPM deposuna yapılan istek başarısız oldu: {0}",
-	"json.npm.latestversion": "Paketin şu andaki en son sürümü",
-	"json.npm.majorversion": "En son birincil sürümle eşleşiyor (1.x.x)",
-	"json.npm.minorversion": "En son ikincil sürümle eşleşiyor (1.2.x)",
-	"json.npm.version.hover": "En son sürüm: {0}"
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/npm/out/main.i18n.json b/i18n/trk/extensions/npm/out/main.i18n.json
deleted file mode 100644
index 30e9e07e3ad..00000000000
--- a/i18n/trk/extensions/npm/out/main.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"npm.parseError": "Npm görev algılama: {0} dosyası ayrıştırılamadı"
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/npm/out/npmView.i18n.json b/i18n/trk/extensions/npm/out/npmView.i18n.json
deleted file mode 100644
index 88033f32275..00000000000
--- a/i18n/trk/extensions/npm/out/npmView.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noScripts": "Betik bulunamadı",
-	"noDebugOptions": "Betiklerde node hata ayıklama seçeneği(ör. \"--inspect-brk\") eksik olduğundan hata ayıklamak için \"{0}\" başlatılamadı.",
-	"learnMore": "Daha Fazla Bilgi Edin",
-	"ok": "Tamam",
-	"scriptInvalid": "\"{0}\" betik dosyası bulunamadı. Görünümü yenilemeyi deneyin."
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/npm/out/tasks.i18n.json b/i18n/trk/extensions/npm/out/tasks.i18n.json
deleted file mode 100644
index 30e9e07e3ad..00000000000
--- a/i18n/trk/extensions/npm/out/tasks.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"npm.parseError": "Npm görev algılama: {0} dosyası ayrıştırılamadı"
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/npm/package.i18n.json b/i18n/trk/extensions/npm/package.i18n.json
deleted file mode 100644
index 2139346855f..00000000000
--- a/i18n/trk/extensions/npm/package.i18n.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"description": "Npm betikleri için görev desteği sağlayacak eklenti.",
-	"displayName": "VSCode için npm desteği",
-	"config.npm.autoDetect": "Npm betiklerinin otomatik olarak algılanıp algılanmayacağını denetler. Varsayılan olarak açıktır.",
-	"config.npm.runSilent": "npm komutlarını `--silent`(sessiz) seçeneğiyle çalıştır.",
-	"config.npm.packageManager": "Betikleri çalıştırmada kullanılacak paket yöneticisi.",
-	"config.npm.exclude": "Otomatik betik algılamadan hariç tutulacak klasörler için glob desenlerini yapılandırın.",
-	"config.npm.enableScriptExplorer": "npm betikleri için gezgin görünümünü etkinleştir.",
-	"config.npm.scriptExplorerAction": "Betik gezgininde kullanılan varsayılan tıklama eylemi: 'open' (aç) veya 'run' (çalıştır), varsayılan 'open'dır.",
-	"npm.parseError": "Npm görev algılama: {0} dosyası ayrıştırılamadı",
-	"taskdef.script": "Özelleştirilecek npm betiği.",
-	"taskdef.path": "Betiği sağlayan package.json dosyasını içeren klasör yolu. Atlanabilir.",
-	"view.name": "Npm Betikleri",
-	"command.refresh": "Yenile",
-	"command.run": "Çalıştır",
-	"command.debug": "Hata Ayıkla",
-	"command.openScript": "Aç",
-	"command.runInstall": "Kurulumu Çalıştır"
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/objective-c/package.i18n.json b/i18n/trk/extensions/objective-c/package.i18n.json
deleted file mode 100644
index 7ddc4caced5..00000000000
--- a/i18n/trk/extensions/objective-c/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Objective-C Dil Temelleri",
-	"description": "Objective-C dosyaları için söz dizimi vurgulama ve ayraç eşleştirme sağlar."
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/package-json/out/features/bowerJSONContribution.i18n.json b/i18n/trk/extensions/package-json/out/features/bowerJSONContribution.i18n.json
deleted file mode 100644
index ae01d6f1cbc..00000000000
--- a/i18n/trk/extensions/package-json/out/features/bowerJSONContribution.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"json.bower.default": "Varsayılan bower.json",
-	"json.bower.error.repoaccess": "Bower deposuna yapılan istek başarısız oldu: {0}",
-	"json.bower.latest.version": "en son"
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/package-json/out/features/packageJSONContribution.i18n.json b/i18n/trk/extensions/package-json/out/features/packageJSONContribution.i18n.json
deleted file mode 100644
index 8261a835a50..00000000000
--- a/i18n/trk/extensions/package-json/out/features/packageJSONContribution.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"json.package.default": "Varsayılan package.json",
-	"json.npm.error.repoaccess": "NPM deposuna yapılan istek başarısız oldu: {0}",
-	"json.npm.latestversion": "Paketin şu andaki en son sürümü",
-	"json.npm.majorversion": "En son birincil sürümle eşleşiyor (1.x.x)",
-	"json.npm.minorversion": "En son ikincil sürümle eşleşiyor (1.2.x)",
-	"json.npm.version.hover": "En son sürüm: {0}"
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/package-json/package.i18n.json b/i18n/trk/extensions/package-json/package.i18n.json
deleted file mode 100644
index 35229bd6699..00000000000
--- a/i18n/trk/extensions/package-json/package.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	]
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/perl/package.i18n.json b/i18n/trk/extensions/perl/package.i18n.json
deleted file mode 100644
index d3149bf6562..00000000000
--- a/i18n/trk/extensions/perl/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Perl Dil Temelleri",
-	"description": "Perl dosyaları için söz dizimi vurgulama ve ayraç eşleştirme sağlar."
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/php-language-features/out/features/validationProvider.i18n.json b/i18n/trk/extensions/php-language-features/out/features/validationProvider.i18n.json
deleted file mode 100644
index d882c2764da..00000000000
--- a/i18n/trk/extensions/php-language-features/out/features/validationProvider.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"php.useExecutablePath": "{0} (çalışma alanı ayarı olarak tanımlı) yürütülebilir dosyasına PHP dosyalarını doğrulama izni veriyor musunuz?",
-	"php.yes": "İzin Ver",
-	"php.no": "İzin Verme",
-	"wrongExecutable": "{0} geçerli bir php yürütülebilir dosyası olmadığı için doğrulanamıyor. PHP yürütülebilir dosyasını yapılandırmak için 'php.validate.executablePath' ayarını kullanın.",
-	"noExecutable": "Hiçbir PHP yürütülebilir dosyası ayarlanmadığı için doğrulanamıyor. PHP yürütülebilir dosyasını yapılandırmak için 'php.validate.executablePath' ayarını kullanın.",
-	"unknownReason": "{0} yolu kullanılarak php çalıştırılamadı. Sebep bilinmiyor."
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/php-language-features/package.i18n.json b/i18n/trk/extensions/php-language-features/package.i18n.json
deleted file mode 100644
index 9ee5b59f86c..00000000000
--- a/i18n/trk/extensions/php-language-features/package.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"configuration.suggest.basic": "Yerleşik PHP dili önerilerinin etkinleştirilip etkinleştirilmediğini yapılandırır. Destek, PHP globalleri ve değişkenleri önerir.",
-	"configuration.validate.enable": "Yerleşik PHP doğrulamasını etkinleştir/devre dışı bırak.",
-	"configuration.validate.executablePath": "PHP çalıştırılabilir dosyasına işaret eder.",
-	"configuration.validate.run": "Doğrulayıcının kayıt esnasında mı tuşlama esnasında mı çalışacağı.",
-	"configuration.title": "PHP",
-	"commands.categroy.php": "PHP",
-	"command.untrustValidationExecutable": "PHP doğrulama yürütülebilir dosyasına izin verme (çalışma alanı ayarı olarak tanımlanır)",
-	"displayName": "PHP Dil Özellikleri",
-	"description": "PHP dosyaları için zengin dil desteği sağlar."
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/php/out/features/validationProvider.i18n.json b/i18n/trk/extensions/php/out/features/validationProvider.i18n.json
deleted file mode 100644
index d882c2764da..00000000000
--- a/i18n/trk/extensions/php/out/features/validationProvider.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"php.useExecutablePath": "{0} (çalışma alanı ayarı olarak tanımlı) yürütülebilir dosyasına PHP dosyalarını doğrulama izni veriyor musunuz?",
-	"php.yes": "İzin Ver",
-	"php.no": "İzin Verme",
-	"wrongExecutable": "{0} geçerli bir php yürütülebilir dosyası olmadığı için doğrulanamıyor. PHP yürütülebilir dosyasını yapılandırmak için 'php.validate.executablePath' ayarını kullanın.",
-	"noExecutable": "Hiçbir PHP yürütülebilir dosyası ayarlanmadığı için doğrulanamıyor. PHP yürütülebilir dosyasını yapılandırmak için 'php.validate.executablePath' ayarını kullanın.",
-	"unknownReason": "{0} yolu kullanılarak php çalıştırılamadı. Sebep bilinmiyor."
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/php/package.i18n.json b/i18n/trk/extensions/php/package.i18n.json
deleted file mode 100644
index 42f1e7562a4..00000000000
--- a/i18n/trk/extensions/php/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "PHP  Dil Temelleri",
-	"description": "PHP dosyaları için söz dizimi vurgulama ve ayraç eşleştirme sağlar."
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/powershell/package.i18n.json b/i18n/trk/extensions/powershell/package.i18n.json
deleted file mode 100644
index fcfc93a438b..00000000000
--- a/i18n/trk/extensions/powershell/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Powershell Dil Temelleri",
-	"description": "Powershell dosyaları için kod parçacıkları, söz dizimi vurgulama, ayraç eşleştirme ve katlama sağlar."
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/pug/package.i18n.json b/i18n/trk/extensions/pug/package.i18n.json
deleted file mode 100644
index 3f2416760bc..00000000000
--- a/i18n/trk/extensions/pug/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Pug Dil Temelleri",
-	"description": "Pug dosyaları için söz dizimi vurgulama ve ayraç eşleştirme sağlar."
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/python/package.i18n.json b/i18n/trk/extensions/python/package.i18n.json
deleted file mode 100644
index cbe9b3cc295..00000000000
--- a/i18n/trk/extensions/python/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Python Dil Temelleri",
-	"description": "Python dosyaları için söz dizimi vurgulama, ayraç eşleştirme ve katlama sağlar."
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/r/package.i18n.json b/i18n/trk/extensions/r/package.i18n.json
deleted file mode 100644
index c1873b042a0..00000000000
--- a/i18n/trk/extensions/r/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "R Dil Temelleri",
-	"description": "R dosyaları için söz dizimi vurgulama ve ayraç eşleştirme sağlar."
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/razor/package.i18n.json b/i18n/trk/extensions/razor/package.i18n.json
deleted file mode 100644
index b97a89a157f..00000000000
--- a/i18n/trk/extensions/razor/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Razor Dil Temelleri",
-	"description": "Razor dosyaları için söz dizimi vurgulama, ayraç eşleştirme ve katlama sağlar."
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/ruby/package.i18n.json b/i18n/trk/extensions/ruby/package.i18n.json
deleted file mode 100644
index 22cf0a8bc53..00000000000
--- a/i18n/trk/extensions/ruby/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Ruby Dil Temelleri",
-	"description": "Ruby dosyaları için söz dizimi vurgulama ve ayraç eşleştirme sağlar."
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/rust/package.i18n.json b/i18n/trk/extensions/rust/package.i18n.json
deleted file mode 100644
index 0d9b2ff22f9..00000000000
--- a/i18n/trk/extensions/rust/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Rust Dil Temelleri",
-	"description": "Rust dosyaları için söz dizimi vurgulama ve ayraç eşleştirme sağlar."
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/scss/package.i18n.json b/i18n/trk/extensions/scss/package.i18n.json
deleted file mode 100644
index 588851aae27..00000000000
--- a/i18n/trk/extensions/scss/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "SCSS Dil Temelleri",
-	"description": "SCSS dosyaları için söz dizimi vurgulama, ayraç eşleştirme ve katlama sağlar."
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/search-rg/package.i18n.json b/i18n/trk/extensions/search-rg/package.i18n.json
deleted file mode 100644
index 9cf48637cb8..00000000000
--- a/i18n/trk/extensions/search-rg/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Ara (ripgrep)",
-	"description": "Ripgrep kullanarak aramayı sağlar."
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/shaderlab/package.i18n.json b/i18n/trk/extensions/shaderlab/package.i18n.json
deleted file mode 100644
index 678227c86e9..00000000000
--- a/i18n/trk/extensions/shaderlab/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Shaderlab Dil Temelleri",
-	"description": "Shaderlab dosyaları için söz dizimi vurgulama ve ayraç eşleştirme sağlar."
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/shellscript/package.i18n.json b/i18n/trk/extensions/shellscript/package.i18n.json
deleted file mode 100644
index 58c5cdc5f3c..00000000000
--- a/i18n/trk/extensions/shellscript/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Shell Script Dil Temelleri",
-	"description": "Shell Script dosyaları için söz dizimi vurgulama ve ayraç eşleştirme sağlar."
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/sql/package.i18n.json b/i18n/trk/extensions/sql/package.i18n.json
deleted file mode 100644
index 788ab43c24d..00000000000
--- a/i18n/trk/extensions/sql/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "SQL Dil Temelleri",
-	"description": "SQL dosyaları için söz dizimi vurgulama ve ayraç eşleştirme sağlar."
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/swift/package.i18n.json b/i18n/trk/extensions/swift/package.i18n.json
deleted file mode 100644
index 1969cabe2b8..00000000000
--- a/i18n/trk/extensions/swift/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Swift Dil Temelleri",
-	"description": "Swift dosyaları için kod parçacıkları, söz dizimi vurgulama ve ayraç eşleştirme sağlar."
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/theme-abyss/package.i18n.json b/i18n/trk/extensions/theme-abyss/package.i18n.json
deleted file mode 100644
index c3cde68785a..00000000000
--- a/i18n/trk/extensions/theme-abyss/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Abyss Teması",
-	"description": "Visual Studio Code için Abyss teması"
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/theme-defaults/package.i18n.json b/i18n/trk/extensions/theme-defaults/package.i18n.json
deleted file mode 100644
index 52dcb980e12..00000000000
--- a/i18n/trk/extensions/theme-defaults/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Varsayılan Temalar",
-	"description": "Varsayılan açık ve koyu temalar (Plus ve Visual Studio)"
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/theme-kimbie-dark/package.i18n.json b/i18n/trk/extensions/theme-kimbie-dark/package.i18n.json
deleted file mode 100644
index f729474095e..00000000000
--- a/i18n/trk/extensions/theme-kimbie-dark/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Kimbie Dark Teması",
-	"description": "Visual Studio Code için Kimbie Dark teması"
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/theme-monokai-dimmed/package.i18n.json b/i18n/trk/extensions/theme-monokai-dimmed/package.i18n.json
deleted file mode 100644
index 4f576ccbb6e..00000000000
--- a/i18n/trk/extensions/theme-monokai-dimmed/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Monokai Dimmed Teması",
-	"description": "Visual Studio Code için Monokai dimmed teması"
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/theme-monokai/package.i18n.json b/i18n/trk/extensions/theme-monokai/package.i18n.json
deleted file mode 100644
index 95c8cb28561..00000000000
--- a/i18n/trk/extensions/theme-monokai/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Monokai Teması",
-	"description": "Visual Studio Code için Monokai teması"
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/theme-quietlight/package.i18n.json b/i18n/trk/extensions/theme-quietlight/package.i18n.json
deleted file mode 100644
index 441909f8c6c..00000000000
--- a/i18n/trk/extensions/theme-quietlight/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Quiet Light Teması",
-	"description": "Visual Studio Code için Quiet Light teması"
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/theme-red/package.i18n.json b/i18n/trk/extensions/theme-red/package.i18n.json
deleted file mode 100644
index de0f11ce126..00000000000
--- a/i18n/trk/extensions/theme-red/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Red Teması",
-	"description": "Visual Studio Code için Red teması"
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/theme-seti/package.i18n.json b/i18n/trk/extensions/theme-seti/package.i18n.json
deleted file mode 100644
index 21b0389fcc7..00000000000
--- a/i18n/trk/extensions/theme-seti/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Seti Dosya Simgesi Teması",
-	"description": "Seti UI dosya simgelerinden yapılmış bir dosya simge teması"
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/theme-solarized-dark/package.i18n.json b/i18n/trk/extensions/theme-solarized-dark/package.i18n.json
deleted file mode 100644
index 4a991dba9de..00000000000
--- a/i18n/trk/extensions/theme-solarized-dark/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Solarized Dark Teması",
-	"description": "Visual Studio Code için Solarized Dark teması"
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/theme-solarized-light/package.i18n.json b/i18n/trk/extensions/theme-solarized-light/package.i18n.json
deleted file mode 100644
index dc7cd9342ed..00000000000
--- a/i18n/trk/extensions/theme-solarized-light/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Solarized Light Teması",
-	"description": "Visual Studio Code için Solarized Light teması"
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/theme-tomorrow-night-blue/package.i18n.json b/i18n/trk/extensions/theme-tomorrow-night-blue/package.i18n.json
deleted file mode 100644
index 918f89ab378..00000000000
--- a/i18n/trk/extensions/theme-tomorrow-night-blue/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Tomorrow Night Blue Teması",
-	"description": "Visual Studio Code için Tomorrow Night Blue teması"
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/typescript-basics/package.i18n.json b/i18n/trk/extensions/typescript-basics/package.i18n.json
deleted file mode 100644
index bc6e9285885..00000000000
--- a/i18n/trk/extensions/typescript-basics/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "TypeScript Dil Temelleri",
-	"description": "TypeScript dosyaları için kod parçacıkları, söz dizimi vurgulama, ayraç eşleştirme ve katlama sağlar."
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/typescript-language-features/out/commands.i18n.json b/i18n/trk/extensions/typescript-language-features/out/commands.i18n.json
deleted file mode 100644
index 8893bf346b3..00000000000
--- a/i18n/trk/extensions/typescript-language-features/out/commands.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"typescript.projectConfigNoWorkspace": "Bir TypeScript veya JavaScript projesini kullanmak için lütfen bir klasör açın",
-	"typescript.projectConfigUnsupportedFile": "TypeScript mi yoksa JavaScript mi projesi olduğu tespit edilemedi. Desteklenmeyen dosya türü",
-	"typescript.projectConfigCouldNotGetInfo": "TypeScript mi yoksa JavaScript mi projesi olduğu tespit edilemedi",
-	"typescript.noTypeScriptProjectConfig": "Dosya bir TypeScript projesinin parçası değil. Daha fazla bilgi almak için [buraya]({0}) tıklayın.",
-	"typescript.noJavaScriptProjectConfig": "Dosya bir JavaScript projesinin parçası değil. Daha fazla bilgi almak için [buraya]({0}) tıklayın.",
-	"typescript.configureTsconfigQuickPick": "tsconfig.json'u yapılandır",
-	"typescript.configureJsconfigQuickPick": "jsconfig.json'u yapılandır"
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/typescript-language-features/out/features/completionItemProvider.i18n.json b/i18n/trk/extensions/typescript-language-features/out/features/completionItemProvider.i18n.json
deleted file mode 100644
index 73c28f59b2d..00000000000
--- a/i18n/trk/extensions/typescript-language-features/out/features/completionItemProvider.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"selectCodeAction": "Uygulanacak kod eylemini seçin",
-	"acquiringTypingsLabel": "Tuşlamalar alınıyor...",
-	"acquiringTypingsDetail": "IntelliSense için tuşlama tanımları alınıyor...",
-	"autoImportLabel": "{0} kaynağından otomatik içe aktar"
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/typescript-language-features/out/features/directiveCommentCompletionProvider.i18n.json b/i18n/trk/extensions/typescript-language-features/out/features/directiveCommentCompletionProvider.i18n.json
deleted file mode 100644
index 9125b191bf7..00000000000
--- a/i18n/trk/extensions/typescript-language-features/out/features/directiveCommentCompletionProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"ts-check": "Bir JavaScript dosyasının anlamsal kontrolünü etkinleştirir. Bir dosyanın en üstünde olmalıdır.",
-	"ts-nocheck": "Bir JavaScript dosyasının anlamsal kontrolünü devre dışı bırakır. Bir dosyanın en üstünde olmalıdır.",
-	"ts-ignore": "Bir dosyanın sonraki satırında @ts-check hatalarını bastırır."
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/typescript-language-features/out/features/implementationsCodeLensProvider.i18n.json b/i18n/trk/extensions/typescript-language-features/out/features/implementationsCodeLensProvider.i18n.json
deleted file mode 100644
index 3561a581bac..00000000000
--- a/i18n/trk/extensions/typescript-language-features/out/features/implementationsCodeLensProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"oneImplementationLabel": "1 uygulama",
-	"manyImplementationLabel": "{0} uygulama",
-	"implementationsErrorLabel": "Uygulamalar belirlenemedi"
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/typescript-language-features/out/features/jsDocCompletionProvider.i18n.json b/i18n/trk/extensions/typescript-language-features/out/features/jsDocCompletionProvider.i18n.json
deleted file mode 100644
index d6c29560283..00000000000
--- a/i18n/trk/extensions/typescript-language-features/out/features/jsDocCompletionProvider.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"typescript.jsDocCompletionItem.documentation": "JSDoc yorumu"
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/typescript-language-features/out/features/organizeImports.i18n.json b/i18n/trk/extensions/typescript-language-features/out/features/organizeImports.i18n.json
deleted file mode 100644
index 4f692e9af12..00000000000
--- a/i18n/trk/extensions/typescript-language-features/out/features/organizeImports.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"oraganizeImportsAction.title": "İçe Aktarımları Düzenle"
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/typescript-language-features/out/features/quickFixProvider.i18n.json b/i18n/trk/extensions/typescript-language-features/out/features/quickFixProvider.i18n.json
deleted file mode 100644
index 323d1a99391..00000000000
--- a/i18n/trk/extensions/typescript-language-features/out/features/quickFixProvider.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"fixAllInFileLabel": "{0} (Dosyadaki tümünü düzelt)"
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/typescript-language-features/out/features/referencesCodeLensProvider.i18n.json b/i18n/trk/extensions/typescript-language-features/out/features/referencesCodeLensProvider.i18n.json
deleted file mode 100644
index 48ebde68477..00000000000
--- a/i18n/trk/extensions/typescript-language-features/out/features/referencesCodeLensProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"oneReferenceLabel": "1 başvuru",
-	"manyReferenceLabel": "{0} başvuru",
-	"referenceErrorLabel": "Başvurular belirlenemedi"
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/typescript-language-features/out/features/taskProvider.i18n.json b/i18n/trk/extensions/typescript-language-features/out/features/taskProvider.i18n.json
deleted file mode 100644
index e69846fe634..00000000000
--- a/i18n/trk/extensions/typescript-language-features/out/features/taskProvider.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"buildTscLabel": "derleme - {0}",
-	"buildAndWatchTscLabel": "izleme - {0}"
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/typescript-language-features/out/features/updatePathsOnRename.i18n.json b/i18n/trk/extensions/typescript-language-features/out/features/updatePathsOnRename.i18n.json
deleted file mode 100644
index 28226fe1ad6..00000000000
--- a/i18n/trk/extensions/typescript-language-features/out/features/updatePathsOnRename.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"prompt": "Taşınan dosya için içe aktarımlar otomatik olarak güncellensin mi: '{0}'?",
-	"reject.title": "Hayır",
-	"accept.title": "Evet",
-	"always.title": "Evet, her zaman içe aktarımları güncelle",
-	"never.title": "Hayır, hiçbir zaman içe aktarımları güncelleme"
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/typescript-language-features/out/typescriptServiceClient.i18n.json b/i18n/trk/extensions/typescript-language-features/out/typescriptServiceClient.i18n.json
deleted file mode 100644
index d378e70d327..00000000000
--- a/i18n/trk/extensions/typescript-language-features/out/typescriptServiceClient.i18n.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noServerFound": "{0} yolu geçerli bir tsserver kurulumuna işaret etmiyor. Paketlenmiş TypeScript sürümüne geri dönülüyor.",
-	"serverCouldNotBeStarted": "TypeScript dil sunucusu başlatılamadı. Hata mesajı: {0}",
-	"typescript.openTsServerLog.notSupported": "TS Sunucu günlüğü için TS 2.2.2+ gerekiyor",
-	"typescript.openTsServerLog.loggingNotEnabled": "TS Sunucu günlüğü kapalı. Lütfen `typescript.tsserver.log` ögesini ayarlayın ve günlüğe yazmayı etkinleştirmek için TS sunucusunu yeniden başlatın",
-	"typescript.openTsServerLog.enableAndReloadOption": "Günlüğe yazmayı etkinleştir ve TS sunucusunu yeniden başlat",
-	"typescript.openTsServerLog.noLogFile": "TS sunucu günlüğe yazmaya başlamadı.",
-	"openTsServerLog.openFileFailedFailed": "TS Sunucu günlük dosyası açılamadı",
-	"serverDiedAfterStart": "TypeScript dil hizmeti, başladıktan hemen sonra 5 kez kapandı. Hizmet yeniden başlatılmayacaktır.",
-	"serverDiedReportIssue": "Sorun Bildir",
-	"serverDied": "TypeScript dil hizmeti, son 5 dakikada 5 kez beklenmedik şekilde kapandı."
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/typescript-language-features/out/utils/api.i18n.json b/i18n/trk/extensions/typescript-language-features/out/utils/api.i18n.json
deleted file mode 100644
index 4a8a4fba715..00000000000
--- a/i18n/trk/extensions/typescript-language-features/out/utils/api.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"invalidVersion": "geçersiz sürüm"
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/typescript-language-features/out/utils/logger.i18n.json b/i18n/trk/extensions/typescript-language-features/out/utils/logger.i18n.json
deleted file mode 100644
index 8f5ef5415b9..00000000000
--- a/i18n/trk/extensions/typescript-language-features/out/utils/logger.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"channelName": "TypeScript"
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/typescript-language-features/out/utils/projectStatus.i18n.json b/i18n/trk/extensions/typescript-language-features/out/utils/projectStatus.i18n.json
deleted file mode 100644
index 61c40dd9a35..00000000000
--- a/i18n/trk/extensions/typescript-language-features/out/utils/projectStatus.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hintExclude": "Proje çapında JavaScript/TypeScript dil özelliklerini etkinleştirmek için, şunlar gibi birçok dosyaya sahip klasörleri hariç tutun: {0}",
-	"hintExclude.generic": "Proje çapında JavaScript/TypeScript dil özelliklerini etkinleştirmek için, üzerinde çalışmadığınız kaynak dosyalar içeren büyük klasörleri hariç tutun.",
-	"large.label": "Hariç Tutmaları Yapılandır",
-	"hintExclude.tooltip": "Proje çapında JavaScript/TypeScript dil özelliklerini etkinleştirmek için, üzerinde çalışmadığınız kaynak dosyalar içeren büyük klasörleri hariç tutun."
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/typescript-language-features/out/utils/typingsStatus.i18n.json b/i18n/trk/extensions/typescript-language-features/out/utils/typingsStatus.i18n.json
deleted file mode 100644
index 6f7d1c56095..00000000000
--- a/i18n/trk/extensions/typescript-language-features/out/utils/typingsStatus.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"installingPackages": "Daha iyi TypeScript IntelliSense için veri alınıyor",
-	"typesInstallerInitializationFailed.title": "JavaScript dil özellikleri için tuşlama dosyaları yüklenemedi. Lütfen NPM'in yüklenmiş olduğundan emin olun veya kullanıcı ayarlarınızdaki 'typescript.npm' ögesini yapılandırın. Daha fazla bilgi almak için [buraya]({0}) tıklayın.",
-	"typesInstallerInitializationFailed.doNotCheckAgain": "Tekrar Gösterme"
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/typescript-language-features/out/utils/versionPicker.i18n.json b/i18n/trk/extensions/typescript-language-features/out/utils/versionPicker.i18n.json
deleted file mode 100644
index bbccc6cfbc1..00000000000
--- a/i18n/trk/extensions/typescript-language-features/out/utils/versionPicker.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"useVSCodeVersionOption": "VS Code'un Sürümünü Kullan",
-	"useWorkspaceVersionOption": "Çalışma Alanı Sürümünü Kullan",
-	"learnMore": "Daha Fazla Bilgi Edin",
-	"selectTsVersion": "JavaScript ve TypeScript dil özellikleri için kullanılacak TypeScript sürümünü seçin"
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/typescript-language-features/out/utils/versionProvider.i18n.json b/i18n/trk/extensions/typescript-language-features/out/utils/versionProvider.i18n.json
deleted file mode 100644
index 86f606ebb3a..00000000000
--- a/i18n/trk/extensions/typescript-language-features/out/utils/versionProvider.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"couldNotLoadTsVersion": "Bu yolda TypeScript sürümü yüklenemedi",
-	"noBundledServerFound": "VS Code'un tsserver'ı hatalı bir virüs tespit aracı gibi bir uygulama tarafından silindi. Lütfen VS Code'u yeniden yükleyin."
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/typescript-language-features/package.i18n.json b/i18n/trk/extensions/typescript-language-features/package.i18n.json
deleted file mode 100644
index fd84f313410..00000000000
--- a/i18n/trk/extensions/typescript-language-features/package.i18n.json
+++ /dev/null
@@ -1,67 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "TypeScript ve JavaScript Dili Özellikleri",
-	"description": "JavaScript ve TypeScript için zengin dil desteği sağlar.",
-	"reloadProjects.title": "Projeyi Yeniden Yükle",
-	"configuration.typescript": "TypeScript",
-	"typescript.useCodeSnippetsOnMethodSuggest.dec": "İşlevleri parametre imzalarıyla tamamlayın.",
-	"typescript.tsdk.desc": "Kullanılacak tsserver ve lib*.d.ts dosyalarını içeren klasör yolunu belirtir.",
-	"typescript.disableAutomaticTypeAcquisition": "Otomatik tür kazanımını devre dışı bırakır. TypeScript >= 2.0.6 gerektirir.",
-	"typescript.tsserver.log": "TS sunucusunun bir dosyaya günlük yazmasını etkinleştirir. Bu günlük, TS Sunucu sorunlarını teşhis etmek için kullanılabilir. Günlük dosya yollarını, kaynak kodunu ve projenizdeki diğer muhtemel hassas bilgileri içerebilir.",
-	"typescript.tsserver.pluginPaths": "Typescript Dil Hizmeti eklentilerinin aranacağı ek yollar. TypeScript >= 2.3.0 gerektirir.",
-	"typescript.tsserver.pluginPaths.item": "Mutlak veya göreli bir yol. Göreli yol, çalışma alanı klasörü veya klasörlerine göre çözümlenecektir.",
-	"typescript.tsserver.trace": "TS sunucusuna gönderilen mesajları izlemeyi etkinleştirir. Bu izleme, TS Sunucu sorunlarını teşhis etmek için kullanılabilir. İzleme; dosya yollarını, kaynak kodunu ve projenizdeki diğer muhtemel hassas bilgileri içerebilir.",
-	"typescript.validate.enable": "TypeScript doğrulamasını etkinleştir veya devre dışı bırak.",
-	"typescript.format.enable": "Varsayılan TypeScript biçimlendiricisini etkinleştirin/devre dışı bırakın.",
-	"javascript.format.enable": "Varsayılan JavaScript biçimlendiricisini etkinleştir veya devre dışı bırak.",
-	"format.insertSpaceAfterCommaDelimiter": "Virgül sınırlayıcısından sonra boşluk eklenmesini tanımlar.",
-	"format.insertSpaceAfterConstructor": "Oluşturucu anahtar kelimesinden sonra boşluk eklenip eklenmeyeceğini tanımlar. TypeScript >= 2.3.0 gerektirir.",
-	"format.insertSpaceAfterSemicolonInForStatements": "Bir ifade için noktalı virgülden sonra boşluk eklenmesini tanımlar.",
-	"format.insertSpaceBeforeAndAfterBinaryOperators": "Bir ikili operatöründen sonra boşluk eklenmesini tanımlar.",
-	"format.insertSpaceAfterKeywordsInControlFlowStatements": "Bir kontrol akışı ifadesi için anahtar kelimelerden sonra boşluk eklenmesini tanımlar.",
-	"format.insertSpaceAfterFunctionKeywordForAnonymousFunctions": "Anonim fonksiyonlar için \"function\" anahtar kelimesinden sonra boşluk eklenmesini tanımlar.",
-	"format.insertSpaceBeforeFunctionParenthesis": "Fonksiyon argüman parantezlerinden önce boşluk eklenmesini tanımlar. TypeScript >= 2.1.5 gerektirir.",
-	"format.insertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis": "Boş olmayan parantezler açıldıktan sonra ve kapatılmadan önce boşluk eklenmesini tanımlar.",
-	"format.insertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets": "Boş olmayan köşeli parantezler açıldıktan sonra ve kapatılmadan önce boşluk eklenmesini tanımlar.",
-	"format.insertSpaceAfterOpeningAndBeforeClosingNonemptyBraces": "Boş olmayan küme parantezleri açıldıktan sonra ve kapatılmadan önce boşluk eklenmesini tanımlar. TypeScript >= 2.3.0 gerektirir.",
-	"format.insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces": "Şablon dizesi ayraçları açıldıktan sonra ve kapatılmadan önce boşluk eklenmesini tanımlar. TypeScript >= 2.0.6 gerektirir.",
-	"format.insertSpaceAfterOpeningAndBeforeClosingJsxExpressionBraces": "JSX ifadesi ayraçları açıldıktan sonra ve kapatılmadan önce boşluk eklenmesini tanımlar. TypeScript >= 2.0.6 gerektirir.",
-	"format.insertSpaceAfterTypeAssertion": "TypeScript'te tür iddialarından sonra boşluk eklenip eklenmeyeceğini tanımlar. TypeScript >= 2.4 gerektirir.",
-	"format.placeOpenBraceOnNewLineForFunctions": "Fonksiyonlarda bir açılış ayracının yeni satıra koyulup koyulmayacağını tanımlar.",
-	"format.placeOpenBraceOnNewLineForControlBlocks": "Kontrol bloklarında bir açılış ayracının yeni satıra koyulup koyulmayacağını tanımlar.",
-	"javascript.validate.enable": "JavaScript doğrulamasını etkinleştir veya devre dışı bırak.",
-	"goToProjectConfig.title": "Proje Yapılandırmasına Git",
-	"javascript.referencesCodeLens.enabled": "JavaScript dosyalarında başvuru kod objektifini etkinleştir veya devre dışı bırak.",
-	"typescript.referencesCodeLens.enabled": "TypeScript dosyalarında başvuru kod objektifini etkinleştir veya devre dışı bırak. TypeScript >= 2.0.6 gerektirir.",
-	"typescript.implementationsCodeLens.enabled": "Uygulama kod objektifini etkinleştir veya devre dışı bırak. TypeScript >= 2.2.0 gerektirir.",
-	"typescript.openTsServerLog.title": "TS Sunucu günlüğünü aç",
-	"typescript.restartTsServer": "TS sunucusunu yeniden başlat",
-	"typescript.selectTypeScriptVersion.title": "TypeScript Sürümünü Seç",
-	"typescript.reportStyleChecksAsWarnings": "Stil kontrollerini uyarı olarak bildir",
-	"jsDocCompletion.enabled": "Otomatik JSDoc yorumlarını etkinleştir veya devre dışı bırak.",
-	"javascript.implicitProjectConfig.checkJs": "JavaScript dosyalarının anlamsal kontrolünü etkinleştir veya devre dışı bırak. Mevcut jsconfig.json veya tsconfig.json dosyaları bu ayarı geçersiz kılar. TypeScript >= 2.3.1 gerektirir.",
-	"typescript.npm": "Otomatik Tür Kazanımı için kullanılacak NPM yürütülebilir dosyasının yolunu belirtir. TypeScript >= 2.3.4 gerektirir.",
-	"typescript.check.npmIsInstalled": "Otomatik Tür Kazanımı için NPM'in yüklü olup olmadığını kontrol et.",
-	"javascript.nameSuggestions": "JavaScript öneri listelerindeki dosyadan benzersiz adları eklemeyi etkinleştir veya devre dışı bırak.",
-	"typescript.tsc.autoDetect": "tsc görevlerinin otomatik algılanmasını denetler. 'off' bu özelliği devre dışı bırakır. 'build' sadece bir kez çalışan derleme görevleri oluşturur. 'watch' sadece derleme ve izleme görevleri oluşturur. 'on' derleme ve izleme görevlerinin her ikisini de oluşturur. Varsayılan 'on'dur. ",
-	"typescript.problemMatchers.tsc.label": "TypeScript sorunları",
-	"typescript.problemMatchers.tscWatch.label": "TypeScript sorunları (izleme modu)",
-	"typescript.quickSuggestionsForPaths": "Bir içe aktarım yolu girerken hızlı önerileri etkinleştir/devre dışı bırak.",
-	"typescript.locale": "JavaScript ve TypeScript hatalarını bildirirken kullanılarak dili(bölgeyi) ayarlar. TypeScript >= 2.6.0 gerektirir.  varsayılan değer 'null', VS Code'un dil(bölge) ayarlarını kullanır.",
-	"javascript.implicitProjectConfig.experimentalDecorators": "Bir projenin parçası olmayan JavaScript dosyaları için deneysel dekoratörler ('experimentalDecorators') özelliğini etkinleştir veya devre dışı bırak. Mevcut jsconfig.json veya tsconfig.json dosyaları bu ayarı geçersiz kılar. TypeScript >= 2.3.1 gerektirir.",
-	"typescript.autoImportSuggestions.enabled": "Otomatik içe aktarım önerilerini etkinleştir/devre dışı bırak. TypeScript >= 2.6.1 gerektirir.",
-	"typescript.experimental.syntaxFolding": "Sözdimine duyarlı katlama işaretleyicilerini etkinleştirin/devre dışı bırakın.",
-	"taskDefinition.tsconfig.description": "TS derlemesini tanımlayan tsconfig dosyası.",
-	"javascript.suggestionActions.enabled": "Düzenleyicideki JavaScript dosyalarında öneri tanılamayı etkinleştir veya devre dışı bırak. TypeScript >= 2.8 gerektirir.",
-	"typescript.suggestionActions.enabled": "Düzenleyicideki TypeScript dosyalarında öneri tanılamayı etkinleştir veya devre dışı bırak. TypeScript >= 2.8 gerektirir.",
-	"typescript.preferences.quoteStyle": "Hızlı düzeltmeler için tercih edilen tırnak stili: Tek tırnak için 'single', çift tırnak için 'double', veya mevcut olan içe aktarımlardan tespit etmek için 'auto'. TypeScript >= 2.9 gerektirir.",
-	"typescript.preferences.importModuleSpecifier": "Otomatik içe aktaırmlar için tercih edilen yol stili:\n- \"relative\" dosya konumuna göreli yol.\n- \"non-relative\" 'jsconfig.json' / 'tsconfig.json' dosyanızda yapılandırdığınız 'baseUrl' ayarına göre yol.\n- \"auto\" en kısa yol türü.\nTypeScript >= 2.9 gerektirir.",
-	"typescript.showUnused": "Koddaki kullanılmayan değişkenlerin vurgulanmasını etkinleştir veya devre dışı bırak. TypeScript >= 2.9 gerektirir.",
-	"typescript.updateImportsOnFileMove.enabled": "VS Code'da bir dosyanın adını değiştirdiğinizde veya dosyayı taşıdığınızda içe aktarımların otomatik güncellenmesini etkinleştirin veya devre dışı bırakın. Olası değerler: tüm yeniden adlandırmalarda onay için 'prompt', her zaman yolların otomatik olarak güncellenmesi için 'always', yolların hiçbir zaman değişmemesi ve hiçbir zaman onay istenmemesi için 'never'. TypeScript >= 2.9 gerektirir."
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/typescript/out/commands.i18n.json b/i18n/trk/extensions/typescript/out/commands.i18n.json
deleted file mode 100644
index 8893bf346b3..00000000000
--- a/i18n/trk/extensions/typescript/out/commands.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"typescript.projectConfigNoWorkspace": "Bir TypeScript veya JavaScript projesini kullanmak için lütfen bir klasör açın",
-	"typescript.projectConfigUnsupportedFile": "TypeScript mi yoksa JavaScript mi projesi olduğu tespit edilemedi. Desteklenmeyen dosya türü",
-	"typescript.projectConfigCouldNotGetInfo": "TypeScript mi yoksa JavaScript mi projesi olduğu tespit edilemedi",
-	"typescript.noTypeScriptProjectConfig": "Dosya bir TypeScript projesinin parçası değil. Daha fazla bilgi almak için [buraya]({0}) tıklayın.",
-	"typescript.noJavaScriptProjectConfig": "Dosya bir JavaScript projesinin parçası değil. Daha fazla bilgi almak için [buraya]({0}) tıklayın.",
-	"typescript.configureTsconfigQuickPick": "tsconfig.json'u yapılandır",
-	"typescript.configureJsconfigQuickPick": "jsconfig.json'u yapılandır"
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/typescript/out/features/bufferSyncSupport.i18n.json b/i18n/trk/extensions/typescript/out/features/bufferSyncSupport.i18n.json
deleted file mode 100644
index a496aae13e0..00000000000
--- a/i18n/trk/extensions/typescript/out/features/bufferSyncSupport.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"versionMismatch": "Düzenleyici özellikleri için TypeScript ({1}) kullanılıyor. TypeScript ({0}) makinanızda global olarak yüklenmiş durumda. VS Code'daki hatalar TSC hatalarından farklı olabilir",
-	"moreInformation": "Daha Fazla Bilgi",
-	"doNotCheckAgain": "Tekrar Kontrol Etme",
-	"close": "Kapat",
-	"updateTscCheck": "Kullanıcı ayarı 'typescript.check.tscVersion', \"false\" olarak güncellendi"
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/typescript/out/features/completionItemProvider.i18n.json b/i18n/trk/extensions/typescript/out/features/completionItemProvider.i18n.json
deleted file mode 100644
index 73c28f59b2d..00000000000
--- a/i18n/trk/extensions/typescript/out/features/completionItemProvider.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"selectCodeAction": "Uygulanacak kod eylemini seçin",
-	"acquiringTypingsLabel": "Tuşlamalar alınıyor...",
-	"acquiringTypingsDetail": "IntelliSense için tuşlama tanımları alınıyor...",
-	"autoImportLabel": "{0} kaynağından otomatik içe aktar"
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/typescript/out/features/directiveCommentCompletionProvider.i18n.json b/i18n/trk/extensions/typescript/out/features/directiveCommentCompletionProvider.i18n.json
deleted file mode 100644
index 9125b191bf7..00000000000
--- a/i18n/trk/extensions/typescript/out/features/directiveCommentCompletionProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"ts-check": "Bir JavaScript dosyasının anlamsal kontrolünü etkinleştirir. Bir dosyanın en üstünde olmalıdır.",
-	"ts-nocheck": "Bir JavaScript dosyasının anlamsal kontrolünü devre dışı bırakır. Bir dosyanın en üstünde olmalıdır.",
-	"ts-ignore": "Bir dosyanın sonraki satırında @ts-check hatalarını bastırır."
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/typescript/out/features/implementationsCodeLensProvider.i18n.json b/i18n/trk/extensions/typescript/out/features/implementationsCodeLensProvider.i18n.json
deleted file mode 100644
index 3561a581bac..00000000000
--- a/i18n/trk/extensions/typescript/out/features/implementationsCodeLensProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"oneImplementationLabel": "1 uygulama",
-	"manyImplementationLabel": "{0} uygulama",
-	"implementationsErrorLabel": "Uygulamalar belirlenemedi"
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/typescript/out/features/jsDocCompletionProvider.i18n.json b/i18n/trk/extensions/typescript/out/features/jsDocCompletionProvider.i18n.json
deleted file mode 100644
index d6c29560283..00000000000
--- a/i18n/trk/extensions/typescript/out/features/jsDocCompletionProvider.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"typescript.jsDocCompletionItem.documentation": "JSDoc yorumu"
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/typescript/out/features/quickFixProvider.i18n.json b/i18n/trk/extensions/typescript/out/features/quickFixProvider.i18n.json
deleted file mode 100644
index 323d1a99391..00000000000
--- a/i18n/trk/extensions/typescript/out/features/quickFixProvider.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"fixAllInFileLabel": "{0} (Dosyadaki tümünü düzelt)"
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/typescript/out/features/referencesCodeLensProvider.i18n.json b/i18n/trk/extensions/typescript/out/features/referencesCodeLensProvider.i18n.json
deleted file mode 100644
index 48ebde68477..00000000000
--- a/i18n/trk/extensions/typescript/out/features/referencesCodeLensProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"oneReferenceLabel": "1 başvuru",
-	"manyReferenceLabel": "{0} başvuru",
-	"referenceErrorLabel": "Başvurular belirlenemedi"
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/typescript/out/features/taskProvider.i18n.json b/i18n/trk/extensions/typescript/out/features/taskProvider.i18n.json
deleted file mode 100644
index e69846fe634..00000000000
--- a/i18n/trk/extensions/typescript/out/features/taskProvider.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"buildTscLabel": "derleme - {0}",
-	"buildAndWatchTscLabel": "izleme - {0}"
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/typescript/out/typescriptMain.i18n.json b/i18n/trk/extensions/typescript/out/typescriptMain.i18n.json
deleted file mode 100644
index 2751d3bb07c..00000000000
--- a/i18n/trk/extensions/typescript/out/typescriptMain.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"typescript.projectConfigNoWorkspace": "Bir TypeScript veya JavaScript projesini kullanmak için lütfen bir klasör açın",
-	"typescript.projectConfigUnsupportedFile": "TypeScript mi yoksa JavaScript mi projesi olduğu tespit edilemedi. Desteklenmeyen dosya türü",
-	"typescript.projectConfigCouldNotGetInfo": "TypeScript mi yoksa JavaScript mi projesi olduğu tespit edilemedi",
-	"typescript.noTypeScriptProjectConfig": "Dosya bir TypeScript projesinin bir parçası değil",
-	"typescript.noJavaScriptProjectConfig": "Dosya bir JavaScript projesinin bir parçası değil",
-	"typescript.configureTsconfigQuickPick": "tsconfig.json'u yapılandır",
-	"typescript.configureJsconfigQuickPick": "jsconfig.json'u yapılandır",
-	"typescript.projectConfigLearnMore": "Daha Fazla Bilgi Edin"
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/typescript/out/typescriptServiceClient.i18n.json b/i18n/trk/extensions/typescript/out/typescriptServiceClient.i18n.json
deleted file mode 100644
index d378e70d327..00000000000
--- a/i18n/trk/extensions/typescript/out/typescriptServiceClient.i18n.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noServerFound": "{0} yolu geçerli bir tsserver kurulumuna işaret etmiyor. Paketlenmiş TypeScript sürümüne geri dönülüyor.",
-	"serverCouldNotBeStarted": "TypeScript dil sunucusu başlatılamadı. Hata mesajı: {0}",
-	"typescript.openTsServerLog.notSupported": "TS Sunucu günlüğü için TS 2.2.2+ gerekiyor",
-	"typescript.openTsServerLog.loggingNotEnabled": "TS Sunucu günlüğü kapalı. Lütfen `typescript.tsserver.log` ögesini ayarlayın ve günlüğe yazmayı etkinleştirmek için TS sunucusunu yeniden başlatın",
-	"typescript.openTsServerLog.enableAndReloadOption": "Günlüğe yazmayı etkinleştir ve TS sunucusunu yeniden başlat",
-	"typescript.openTsServerLog.noLogFile": "TS sunucu günlüğe yazmaya başlamadı.",
-	"openTsServerLog.openFileFailedFailed": "TS Sunucu günlük dosyası açılamadı",
-	"serverDiedAfterStart": "TypeScript dil hizmeti, başladıktan hemen sonra 5 kez kapandı. Hizmet yeniden başlatılmayacaktır.",
-	"serverDiedReportIssue": "Sorun Bildir",
-	"serverDied": "TypeScript dil hizmeti, son 5 dakikada 5 kez beklenmedik şekilde kapandı."
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/typescript/out/utils/api.i18n.json b/i18n/trk/extensions/typescript/out/utils/api.i18n.json
deleted file mode 100644
index 4a8a4fba715..00000000000
--- a/i18n/trk/extensions/typescript/out/utils/api.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"invalidVersion": "geçersiz sürüm"
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/typescript/out/utils/logger.i18n.json b/i18n/trk/extensions/typescript/out/utils/logger.i18n.json
deleted file mode 100644
index 8f5ef5415b9..00000000000
--- a/i18n/trk/extensions/typescript/out/utils/logger.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"channelName": "TypeScript"
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/typescript/out/utils/projectStatus.i18n.json b/i18n/trk/extensions/typescript/out/utils/projectStatus.i18n.json
deleted file mode 100644
index 61c40dd9a35..00000000000
--- a/i18n/trk/extensions/typescript/out/utils/projectStatus.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hintExclude": "Proje çapında JavaScript/TypeScript dil özelliklerini etkinleştirmek için, şunlar gibi birçok dosyaya sahip klasörleri hariç tutun: {0}",
-	"hintExclude.generic": "Proje çapında JavaScript/TypeScript dil özelliklerini etkinleştirmek için, üzerinde çalışmadığınız kaynak dosyalar içeren büyük klasörleri hariç tutun.",
-	"large.label": "Hariç Tutmaları Yapılandır",
-	"hintExclude.tooltip": "Proje çapında JavaScript/TypeScript dil özelliklerini etkinleştirmek için, üzerinde çalışmadığınız kaynak dosyalar içeren büyük klasörleri hariç tutun."
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/typescript/out/utils/typingsStatus.i18n.json b/i18n/trk/extensions/typescript/out/utils/typingsStatus.i18n.json
deleted file mode 100644
index 6f7d1c56095..00000000000
--- a/i18n/trk/extensions/typescript/out/utils/typingsStatus.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"installingPackages": "Daha iyi TypeScript IntelliSense için veri alınıyor",
-	"typesInstallerInitializationFailed.title": "JavaScript dil özellikleri için tuşlama dosyaları yüklenemedi. Lütfen NPM'in yüklenmiş olduğundan emin olun veya kullanıcı ayarlarınızdaki 'typescript.npm' ögesini yapılandırın. Daha fazla bilgi almak için [buraya]({0}) tıklayın.",
-	"typesInstallerInitializationFailed.doNotCheckAgain": "Tekrar Gösterme"
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/typescript/out/utils/versionPicker.i18n.json b/i18n/trk/extensions/typescript/out/utils/versionPicker.i18n.json
deleted file mode 100644
index bbccc6cfbc1..00000000000
--- a/i18n/trk/extensions/typescript/out/utils/versionPicker.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"useVSCodeVersionOption": "VS Code'un Sürümünü Kullan",
-	"useWorkspaceVersionOption": "Çalışma Alanı Sürümünü Kullan",
-	"learnMore": "Daha Fazla Bilgi Edin",
-	"selectTsVersion": "JavaScript ve TypeScript dil özellikleri için kullanılacak TypeScript sürümünü seçin"
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/typescript/out/utils/versionProvider.i18n.json b/i18n/trk/extensions/typescript/out/utils/versionProvider.i18n.json
deleted file mode 100644
index 86f606ebb3a..00000000000
--- a/i18n/trk/extensions/typescript/out/utils/versionProvider.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"couldNotLoadTsVersion": "Bu yolda TypeScript sürümü yüklenemedi",
-	"noBundledServerFound": "VS Code'un tsserver'ı hatalı bir virüs tespit aracı gibi bir uygulama tarafından silindi. Lütfen VS Code'u yeniden yükleyin."
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/typescript/package.i18n.json b/i18n/trk/extensions/typescript/package.i18n.json
deleted file mode 100644
index 58f0a5a249c..00000000000
--- a/i18n/trk/extensions/typescript/package.i18n.json
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "TypeScript ve JavaScript Dili Özellikleri",
-	"description": "JavaScript ve TypeScript için zengin dil desteği sağlar.",
-	"typescript.reloadProjects.title": "Projeyi Yeniden Yükle",
-	"javascript.reloadProjects.title": "Projeyi Yeniden Yükle",
-	"configuration.typescript": "TypeScript",
-	"typescript.useCodeSnippetsOnMethodSuggest.dec": "İşlevleri parametre imzalarıyla tamamlayın.",
-	"typescript.tsdk.desc": "Kullanılacak tsserver ve lib*.d.ts dosyalarını içeren klasör yolunu belirtir.",
-	"typescript.disableAutomaticTypeAcquisition": "Otomatik tür kazanımını devre dışı bırakır. TypeScript >= 2.0.6 gerektirir.",
-	"typescript.tsserver.log": "TS sunucusunun bir dosyaya günlük yazmasını etkinleştirir. Bu günlük, TS Sunucu sorunlarını teşhis etmek için kullanılabilir. Günlük dosya yollarını, kaynak kodunu ve projenizdeki diğer muhtemel hassas bilgileri içerebilir.",
-	"typescript.tsserver.trace": "TS sunucusuna gönderilen mesajları izlemeyi etkinleştirir. Bu izleme, TS Sunucu sorunlarını teşhis etmek için kullanılabilir. İzleme; dosya yollarını, kaynak kodunu ve projenizdeki diğer muhtemel hassas bilgileri içerebilir.",
-	"typescript.validate.enable": "TypeScript doğrulamasını etkinleştir veya devre dışı bırak.",
-	"typescript.format.enable": "Varsayılan TypeScript biçimlendiricisini etkinleştirin/devre dışı bırakın.",
-	"javascript.format.enable": "Varsayılan JavaScript biçimlendiricisini etkinleştir veya devre dışı bırak.",
-	"format.insertSpaceAfterCommaDelimiter": "Virgül sınırlayıcısından sonra boşluk eklenmesini tanımlar.",
-	"format.insertSpaceAfterConstructor": "Oluşturucu anahtar kelimesinden sonra boşluk eklenip eklenmeyeceğini tanımlar. TypeScript >= 2.3.0 gerektirir.",
-	"format.insertSpaceAfterSemicolonInForStatements": "Bir ifade için noktalı virgülden sonra boşluk eklenmesini tanımlar.",
-	"format.insertSpaceBeforeAndAfterBinaryOperators": "Bir ikili operatöründen sonra boşluk eklenmesini tanımlar.",
-	"format.insertSpaceAfterKeywordsInControlFlowStatements": "Bir kontrol akışı ifadesi için anahtar kelimelerden sonra boşluk eklenmesini tanımlar.",
-	"format.insertSpaceAfterFunctionKeywordForAnonymousFunctions": "Anonim fonksiyonlar için \"function\" anahtar kelimesinden sonra boşluk eklenmesini tanımlar.",
-	"format.insertSpaceBeforeFunctionParenthesis": "Fonksiyon argüman parantezlerinden önce boşluk eklenmesini tanımlar. TypeScript >= 2.1.5 gerektirir.",
-	"format.insertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis": "Boş olmayan parantezler açıldıktan sonra ve kapatılmadan önce boşluk eklenmesini tanımlar.",
-	"format.insertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets": "Boş olmayan köşeli parantezler açıldıktan sonra ve kapatılmadan önce boşluk eklenmesini tanımlar.",
-	"format.insertSpaceAfterOpeningAndBeforeClosingNonemptyBraces": "Boş olmayan küme parantezleri açıldıktan sonra ve kapatılmadan önce boşluk eklenmesini tanımlar. TypeScript >= 2.3.0 gerektirir.",
-	"format.insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces": "Şablon dizesi ayraçları açıldıktan sonra ve kapatılmadan önce boşluk eklenmesini tanımlar. TypeScript >= 2.0.6 gerektirir.",
-	"format.insertSpaceAfterOpeningAndBeforeClosingJsxExpressionBraces": "JSX ifadesi ayraçları açıldıktan sonra ve kapatılmadan önce boşluk eklenmesini tanımlar. TypeScript >= 2.0.6 gerektirir.",
-	"format.insertSpaceAfterTypeAssertion": "TypeScript'te tür iddialarından sonra boşluk eklenip eklenmeyeceğini tanımlar. TypeScript >= 2.4 gerektirir.",
-	"format.placeOpenBraceOnNewLineForFunctions": "Fonksiyonlarda bir açılış ayracının yeni satıra koyulup koyulmayacağını tanımlar.",
-	"format.placeOpenBraceOnNewLineForControlBlocks": "Kontrol bloklarında bir açılış ayracının yeni satıra koyulup koyulmayacağını tanımlar.",
-	"javascript.validate.enable": "JavaScript doğrulamasını etkinleştir veya devre dışı bırak.",
-	"typescript.goToProjectConfig.title": "Proje Yapılandırmasına Git",
-	"javascript.goToProjectConfig.title": "Proje Yapılandırmasına Git",
-	"javascript.referencesCodeLens.enabled": "JavaScript dosyalarında başvuru kod objektifini etkinleştir veya devre dışı bırak.",
-	"typescript.referencesCodeLens.enabled": "TypeScript dosyalarında başvuru kod objektifini etkinleştir veya devre dışı bırak. TypeScript >= 2.0.6 gerektirir.",
-	"typescript.implementationsCodeLens.enabled": "Uygulama kod objektifini etkinleştir veya devre dışı bırak. TypeScript >= 2.2.0 gerektirir.",
-	"typescript.openTsServerLog.title": "TS Sunucu günlüğünü aç",
-	"typescript.restartTsServer": "TS sunucusunu yeniden başlat",
-	"typescript.selectTypeScriptVersion.title": "TypeScript Sürümünü Seç",
-	"typescript.reportStyleChecksAsWarnings": "Stil kontrollerini uyarı olarak bildir",
-	"jsDocCompletion.enabled": "Otomatik JSDoc yorumlarını etkinleştir veya devre dışı bırak.",
-	"javascript.implicitProjectConfig.checkJs": "JavaScript dosyalarının anlamsal kontrolünü etkinleştir veya devre dışı bırak. Mevcut jsconfig.json veya tsconfig.json dosyaları bu ayarı geçersiz kılar. TypeScript >= 2.3.1 gerektirir.",
-	"typescript.npm": "Otomatik Tür Kazanımı için kullanılacak NPM yürütülebilir dosyasının yolunu belirtir. TypeScript >= 2.3.4 gerektirir.",
-	"typescript.check.npmIsInstalled": "Otomatik Tür Kazanımı için NPM'in yüklü olup olmadığını kontrol et.",
-	"javascript.nameSuggestions": "JavaScript öneri listelerindeki dosyadan benzersiz adları eklemeyi etkinleştir veya devre dışı bırak.",
-	"typescript.tsc.autoDetect": "tsc görevlerinin otomatik algılanmasını denetler. 'off' bu özelliği devre dışı bırakır. 'build' sadece bir kez çalışan derleme görevleri oluşturur. 'watch' sadece derleme ve izleme görevleri oluşturur. 'on' derleme ve izleme görevlerinin her ikisini de oluşturur. Varsayılan 'on'dur. ",
-	"typescript.problemMatchers.tsc.label": "TypeScript sorunları",
-	"typescript.problemMatchers.tscWatch.label": "TypeScript sorunları (izleme modu)",
-	"typescript.quickSuggestionsForPaths": "Bir içe aktarım yolu girerken hızlı önerileri etkinleştir/devre dışı bırak.",
-	"typescript.locale": "TypeScript hatalarını bildirirken kullanılarak dili(bölgeyi) ayarlar. TypeScript >= 2.6.0 gerektirir. 'null' varsayılanı, TypeScript hataları için VS Code'un dil(bölge) ayarlarını kullanır.",
-	"javascript.implicitProjectConfig.experimentalDecorators": "Bir projenin parçası olmayan JavaScript dosyaları için deneysel dekoratörler ('experimentalDecorators') özelliğini etkinleştir veya devre dışı bırak. Mevcut jsconfig.json veya tsconfig.json dosyaları bu ayarı geçersiz kılar. TypeScript >= 2.3.1 gerektirir.",
-	"typescript.autoImportSuggestions.enabled": "Otomatik içe aktarım önerilerini etkinleştir/devre dışı bırak. TypeScript >= 2.6.1 gerektirir.",
-	"typescript.experimental.syntaxFolding": "Sözdizimi duyarlı katlama işaretçilerini etkinleştirin/devre dışı bırakın.",
-	"taskDefinition.tsconfig.description": "TS derlemesini tanımlayan tsconfig dosyası."
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/vb/package.i18n.json b/i18n/trk/extensions/vb/package.i18n.json
deleted file mode 100644
index 6129c6cf9bf..00000000000
--- a/i18n/trk/extensions/vb/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "Visual Basic Dil Temelleri",
-	"description": "Visual Basic dosyaları için kod parçacıkları, söz dizimi vurgulama, ayraç eşleştirme ve katlama sağlar."
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/xml/package.i18n.json b/i18n/trk/extensions/xml/package.i18n.json
deleted file mode 100644
index 753147c11b1..00000000000
--- a/i18n/trk/extensions/xml/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "XML Dil Temelleri",
-	"description": "XML dosyaları için söz dizimi vurgulama ve ayraç eşleştirme sağlar."
-}
\ No newline at end of file
diff --git a/i18n/trk/extensions/yaml/package.i18n.json b/i18n/trk/extensions/yaml/package.i18n.json
deleted file mode 100644
index 4aa6fd72d2a..00000000000
--- a/i18n/trk/extensions/yaml/package.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"displayName": "YAML Dil Temelleri",
-	"description": "YAML dosyaları için söz dizimi vurgulama ve ayraç eşleştirme sağlar."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/base/browser/ui/actionbar/actionbar.i18n.json b/i18n/trk/src/vs/base/browser/ui/actionbar/actionbar.i18n.json
deleted file mode 100644
index 309631273fe..00000000000
--- a/i18n/trk/src/vs/base/browser/ui/actionbar/actionbar.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"titleLabel": "{0} ({1})"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/base/browser/ui/aria/aria.i18n.json b/i18n/trk/src/vs/base/browser/ui/aria/aria.i18n.json
deleted file mode 100644
index 29cdce3bef6..00000000000
--- a/i18n/trk/src/vs/base/browser/ui/aria/aria.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"repeated": "{0} (tekrar oluştu)"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/base/browser/ui/findinput/findInput.i18n.json b/i18n/trk/src/vs/base/browser/ui/findinput/findInput.i18n.json
deleted file mode 100644
index 44406a33cc5..00000000000
--- a/i18n/trk/src/vs/base/browser/ui/findinput/findInput.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"defaultLabel": "giriş"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/base/browser/ui/findinput/findInputCheckboxes.i18n.json b/i18n/trk/src/vs/base/browser/ui/findinput/findInputCheckboxes.i18n.json
deleted file mode 100644
index e283aa2791c..00000000000
--- a/i18n/trk/src/vs/base/browser/ui/findinput/findInputCheckboxes.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"caseDescription": "Büyük/Küçük Harf Eşleştir",
-	"wordsDescription": "Sözcüğün Tamamını Eşleştir",
-	"regexDescription": "Normal İfade Kullan"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/base/browser/ui/inputbox/inputBox.i18n.json b/i18n/trk/src/vs/base/browser/ui/inputbox/inputBox.i18n.json
deleted file mode 100644
index 44c4485868c..00000000000
--- a/i18n/trk/src/vs/base/browser/ui/inputbox/inputBox.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"alertErrorMessage": "Hata: {0}",
-	"alertWarningMessage": "Uyarı: {0}",
-	"alertInfoMessage": "Bilgi: {0}"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/base/browser/ui/resourceviewer/resourceViewer.i18n.json b/i18n/trk/src/vs/base/browser/ui/resourceviewer/resourceViewer.i18n.json
deleted file mode 100644
index 91ef167cea2..00000000000
--- a/i18n/trk/src/vs/base/browser/ui/resourceviewer/resourceViewer.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"imgMeta": "{0}x{1} {2}",
-	"largeImageError": "Resim, düzenleyicide görüntülemek için çok büyük.",
-	"resourceOpenExternalButton": "Harici program kullanarak resmi aç",
-	"nativeBinaryError": "Dosya ikili olduğu, çok büyük olduğu veya desteklenmeyen bir metin kodlaması kullandığı için düzenleyicide görüntülenemiyor.",
-	"sizeB": "{0}B",
-	"sizeKB": "{0}KB",
-	"sizeMB": "{0}MB",
-	"sizeGB": "{0}GB",
-	"sizeTB": "{0}TB"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json b/i18n/trk/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json
deleted file mode 100644
index 750d811d866..00000000000
--- a/i18n/trk/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"selectAriaOption": "{0}"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/base/browser/ui/toolbar/toolbar.i18n.json b/i18n/trk/src/vs/base/browser/ui/toolbar/toolbar.i18n.json
deleted file mode 100644
index 30a1abba7c6..00000000000
--- a/i18n/trk/src/vs/base/browser/ui/toolbar/toolbar.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"more": "Diğer"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/base/common/errorMessage.i18n.json b/i18n/trk/src/vs/base/common/errorMessage.i18n.json
deleted file mode 100644
index f646f5234be..00000000000
--- a/i18n/trk/src/vs/base/common/errorMessage.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"stackTrace.format": "{0}: {1}",
-	"error.defaultMessage": "Bilinmeyen bir hata oluştu. Daha fazla ayrıntı için lütfen günlüğe başvurun.",
-	"nodeExceptionMessage": "Bir sistem hatası oluştu ({0})",
-	"error.moreErrors": "{0} (toplam {1} hata)"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/base/common/jsonErrorMessages.i18n.json b/i18n/trk/src/vs/base/common/jsonErrorMessages.i18n.json
deleted file mode 100644
index 550fe95f826..00000000000
--- a/i18n/trk/src/vs/base/common/jsonErrorMessages.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"error.invalidSymbol": "Geçersiz sembol",
-	"error.invalidNumberFormat": "Geçersiz sayı biçimi",
-	"error.propertyNameExpected": "Özellik adı bekleniyor",
-	"error.valueExpected": "Değer bekleniyor",
-	"error.colonExpected": "İki nokta üst üste bekleniyor",
-	"error.commaExpected": "Virgül bekleniyor",
-	"error.closeBraceExpected": "Kapanış ayracı bekleniyor",
-	"error.closeBracketExpected": "Kapanış köşeli ayracı bekleniyor",
-	"error.endOfFileExpected": "Dosya sonu bekleniyor"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/base/common/keybindingLabels.i18n.json b/i18n/trk/src/vs/base/common/keybindingLabels.i18n.json
deleted file mode 100644
index 88f9db8bef5..00000000000
--- a/i18n/trk/src/vs/base/common/keybindingLabels.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"ctrlKey": "Ctrl",
-	"shiftKey": "Shift",
-	"altKey": "Alt",
-	"windowsKey": "Windows",
-	"ctrlKey.long": "Control",
-	"shiftKey.long": "Shift",
-	"altKey.long": "Alt",
-	"cmdKey.long": "Command",
-	"windowsKey.long": "Windows"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/base/common/processes.i18n.json b/i18n/trk/src/vs/base/common/processes.i18n.json
deleted file mode 100644
index 3ffd209b1c9..00000000000
--- a/i18n/trk/src/vs/base/common/processes.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"ExecutableParser.commandMissing": "Hata: yürütülebilir bilgi dize türünde bir komut tanımlamalıdır.",
-	"ExecutableParser.isShellCommand": "Uyarı: isShellCommand boole türünde olmalıdır. {0} değeri yok sayıldı.",
-	"ExecutableParser.args": "Uyarı: argümanlar \"string[]\" türünde olmalıdır. {0} değeri yok sayıldı.",
-	"ExecutableParser.invalidCWD": "Uyarı: options.cwd dize türünde olmalıdır. {0} değeri yok sayıldı."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/base/common/severity.i18n.json b/i18n/trk/src/vs/base/common/severity.i18n.json
deleted file mode 100644
index bc3e8108119..00000000000
--- a/i18n/trk/src/vs/base/common/severity.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"sev.error": "Hata",
-	"sev.warning": "Uyarı",
-	"sev.info": "Bilgi"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/base/node/processes.i18n.json b/i18n/trk/src/vs/base/node/processes.i18n.json
deleted file mode 100644
index 0debe2b0adb..00000000000
--- a/i18n/trk/src/vs/base/node/processes.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"TaskRunner.UNC": "UNC sürücüsünde kabuk komutu yürütülemez."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/base/node/ps.i18n.json b/i18n/trk/src/vs/base/node/ps.i18n.json
deleted file mode 100644
index 36b27f91f65..00000000000
--- a/i18n/trk/src/vs/base/node/ps.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"collecting": "CPU ve bellek bilgisi toplanıyor. Bu işlem birkaç saniye sürebilir."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/base/node/zip.i18n.json b/i18n/trk/src/vs/base/node/zip.i18n.json
deleted file mode 100644
index d3dbd75d2e6..00000000000
--- a/i18n/trk/src/vs/base/node/zip.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"incompleteExtract": "Tamamlanmamış. {1} girdinin {0} tanesi bulundu. ",
-	"notFound": "{0}, zip içerisinde bulunamadı."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/base/parts/quickopen/browser/quickOpenModel.i18n.json b/i18n/trk/src/vs/base/parts/quickopen/browser/quickOpenModel.i18n.json
deleted file mode 100644
index 4f8f48556e6..00000000000
--- a/i18n/trk/src/vs/base/parts/quickopen/browser/quickOpenModel.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"quickOpenAriaLabelEntry": "{0}, seçici",
-	"quickOpenAriaLabel": "seçici"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/base/parts/quickopen/browser/quickOpenWidget.i18n.json b/i18n/trk/src/vs/base/parts/quickopen/browser/quickOpenWidget.i18n.json
deleted file mode 100644
index 5edc8863774..00000000000
--- a/i18n/trk/src/vs/base/parts/quickopen/browser/quickOpenWidget.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"quickOpenAriaLabel": "Hızlı seçici. Sonuçları daraltmak için yazmaya başlayın.",
-	"treeAriaLabel": "Hızlı Seçici"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/base/parts/tree/browser/treeDefaults.i18n.json b/i18n/trk/src/vs/base/parts/tree/browser/treeDefaults.i18n.json
deleted file mode 100644
index 58e9ed9bb0d..00000000000
--- a/i18n/trk/src/vs/base/parts/tree/browser/treeDefaults.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"collapse": "Daralt"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json b/i18n/trk/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
deleted file mode 100644
index 1998afc436b..00000000000
--- a/i18n/trk/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hide": "gizle",
-	"show": "göster",
-	"previewOnGitHub": "GitHub'da Önizle",
-	"loadingData": "Veri yükleniyor...",
-	"rateLimited": "GitHub sorgu sınırı aşıldı. Lütfen bekleyin.",
-	"similarIssues": "Benzer sorunlar",
-	"open": "Aç",
-	"closed": "Kapalı",
-	"noSimilarIssues": "Benzer bir sorun bulunmadı",
-	"settingsSearchIssue": "Ayar Arama Sorunu",
-	"bugReporter": "Hata Raporu",
-	"featureRequest": "Özellik İsteği",
-	"performanceIssue": "Performans Sorunu",
-	"stepsToReproduce": "Yeniden oluşturma adımları",
-	"bugDescription": "Sorunu güvenilir şekilde yeniden oluşturmak için gerekli adımları paylaşın. Lütfen gerçekleşen ve beklenen sonuçları ekleyin. GitHub-tarzı Markdown'ı destekliyoruz. GitHub'da önizleme yaptığımızda sorununuzu düzenleyebilecek ve ekran görüntüleri ekleyebileceksiniz.",
-	"performanceIssueDesciption": "Bu performans sorunu ne zaman oluştu? Başlangıçta mı yoksa belirli eylemlerden sonra mı oluşuyor? GitHub-tarzı Markdown'ı destekliyoruz. GitHub'da önizleme yaptığımızda sorununuzu düzenleyebilecek ve ekran görüntüleri ekleyebileceksiniz.",
-	"description": "Açıklama",
-	"featureRequestDescription": "Lütfen görmek istediğiniz özelliği açıklayın. GitHub-tarzı Markdown'ı destekliyoruz. GitHub'da önizleme yaptığımızda sorununuzu düzenleyebilecek ve ekran görüntüleri ekleyebileceksiniz.",
-	"expectedResults": "Beklenen Sonuçlar",
-	"settingsSearchResultsDescription": "Lütfen bu sorgu ile arama yaptığınızda beklediğiniz sonuçları listeleyin. GitHub-tarzı Markdown'ı destekliyoruz. GitHub'da önizleme yaptığımızda sorununuzu düzenleyebilecek ve ekran görüntüleri ekleyebileceksiniz.",
-	"pasteData": "İhtiyaç duyulan veri gönderilemeyecek kadar büyük olduğu için, bu veriyi panonuza kopyaladık. Lütfen yapıştırın.",
-	"disabledExtensions": "Eklentiler devre dışı"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json b/i18n/trk/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
deleted file mode 100644
index cc635c3213a..00000000000
--- a/i18n/trk/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"completeInEnglish": "Lütfen formu İngilizce olarak doldurunuz.",
-	"issueTypeLabel": "Bu bir",
-	"issueSourceLabel": "Dosya konumu: ",
-	"vscode": "Visual Studio Code",
-	"extension": "Eklenti",
-	"disableExtensionsLabelText": "Sorunu {0} sonrasında yeniden oluşturmaya çalışın. Sorun sadece eklentiler aktifken yeniden oluşturulabiliyorsa, büyük olasılıkla eklenti ile ilgili bir sorundur.",
-	"disableExtensions": "tüm eklentileri devre dışı bırakıp pencereyi yeniden yükleyin",
-	"chooseExtension": "Eklenti",
-	"issueTitleLabel": "Başlık",
-	"issueTitleRequired": "Lütfen bir başlık girin.",
-	"titleLengthValidation": "Başlık çok uzun.",
-	"details": "Lütfen detayları giriniz.",
-	"sendSystemInfo": "Sistem bilgilerimi dahil et ({0})",
-	"show": "göster",
-	"sendProcessInfo": "Şu anda çalışan işlemlerimi dahil et ({0})",
-	"sendWorkspaceInfo": "Çalışma alanımın meta verilerini dahil et ({0})",
-	"sendExtensions": " Aktif eklentilerimi dahil et ({0})",
-	"sendSearchedExtensions": "Aranan eklentileri gönder ({0})",
-	"sendSettingsSearchDetails": "Ayar arama detaylarını gönder ({0})"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/code/electron-browser/processExplorer/processExplorerMain.i18n.json b/i18n/trk/src/vs/code/electron-browser/processExplorer/processExplorerMain.i18n.json
deleted file mode 100644
index 3e8bfd40d94..00000000000
--- a/i18n/trk/src/vs/code/electron-browser/processExplorer/processExplorerMain.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"cpu": "İşlemci %",
-	"memory": "Bellek (MB)",
-	"pid": "pid",
-	"name": "Adı",
-	"killProcess": "İşlemi Sonlandır",
-	"forceKillProcess": "İşlemi Sonlanmaya Zorla",
-	"copy": "Kopyala",
-	"copyAll": "Tümünü Kopyala"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/code/electron-main/auth.i18n.json b/i18n/trk/src/vs/code/electron-main/auth.i18n.json
deleted file mode 100644
index a88d8126178..00000000000
--- a/i18n/trk/src/vs/code/electron-main/auth.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"authRequire": "Proxy Kimlik Doğrulaması Gerekli",
-	"proxyauth": "{0} proxy'si kimlik doğrulama gerektiriyor."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/code/electron-main/logUploader.i18n.json b/i18n/trk/src/vs/code/electron-main/logUploader.i18n.json
deleted file mode 100644
index 46016d747af..00000000000
--- a/i18n/trk/src/vs/code/electron-main/logUploader.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"invalidEndpoint": "Geçersiz günlük yükleme uçbirimi",
-	"beginUploading": "Karşıya yükleniyor...",
-	"didUploadLogs": "Yükleme başarılı! Günlük dosyası ID'si: {0}",
-	"logUploadPromptHeader": "Oturum günlüklerinizi sadece VS Code takımının Microsoft üyelerince erişilebilecek güvenli bir Microsoft uçbirimine yüklemek üzeresiniz.",
-	"logUploadPromptBody": "Oturum günlükleri, tam yollar ve dosya içerikleri gibi kişisel bilgiler içerebilir. Lütfen oturum günlüklerinizi şuradan inceleyin ve düzenleme yapın: '{0}'",
-	"logUploadPromptBodyDetails": "Devam ederek oturum günlük dosyalarınızın Microsoft tarafından VS Code'un hatalarının ayıklanmasında kullanılması için incelediğinizi ve düzenlemelerinizi yaptığınızı onaylıyorsunuz.",
-	"logUploadPromptAcceptInstructions": "Yüklemeye devam etmek için lütfen code'u '--upload-logs={0}' ile çalıştırın",
-	"postError": "Günlükler gönderilirken hata oluştu: {0}",
-	"responseError": "Günlükler gönderilirken hata oluştu: {0} alındı — {1}",
-	"parseError": "Cevap ayrıştırılamadı",
-	"zipError": "Günlükler sıkıştırlırken hata oluştu: {0}"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/code/electron-main/main.i18n.json b/i18n/trk/src/vs/code/electron-main/main.i18n.json
deleted file mode 100644
index 45b994daa42..00000000000
--- a/i18n/trk/src/vs/code/electron-main/main.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"secondInstanceNoResponse": "{0}'un başka bir örneği çalışıyor ancak yanıt vermiyor",
-	"secondInstanceNoResponseDetail": "Lütfen diğer tüm örnekleri kapatın ve tekrar deneyin.",
-	"secondInstanceAdmin": "{0}'un ikinci bir örneği zaten yönetici olarak çalışıyor.",
-	"secondInstanceAdminDetail": "Lütfen diğer örneği kapatın ve tekrar deneyin.",
-	"close": "&&Kapat"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/code/electron-main/menus.i18n.json b/i18n/trk/src/vs/code/electron-main/menus.i18n.json
deleted file mode 100644
index ace3ab96e0f..00000000000
--- a/i18n/trk/src/vs/code/electron-main/menus.i18n.json
+++ /dev/null
@@ -1,192 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"mFile": "&&Dosya",
-	"mEdit": "Dü&&zen",
-	"mSelection": "&&Seçim",
-	"mView": "&&Görünüm",
-	"mGoto": "G&&it",
-	"mDebug": "&&Hata Ayıklama",
-	"mWindow": "Pencere",
-	"mHelp": "&&Yardım",
-	"mTask": "Gö&&revler",
-	"miNewWindow": "Yeni &&Pencere",
-	"mAbout": "{0} Hakkında",
-	"mServices": "Hizmetler",
-	"mHide": "{0} ögesini gizle",
-	"mHideOthers": "Diğerlerini Gizle",
-	"mShowAll": "Tümünü Göster",
-	"miQuit": "{0} Ögesinden Çık",
-	"miNewFile": "&&Yeni Dosya",
-	"miOpen": "&&Aç...",
-	"miOpenWorkspace": "Ça&&lışma Alanı Aç...",
-	"miOpenFolder": "&&Klasör Aç...",
-	"miOpenFile": "&&Dosya Aç...",
-	"miOpenRecent": "&&Son Kullanılanları Aç",
-	"miSaveWorkspaceAs": "Çalışma Alanını Farklı Kaydet...",
-	"miAddFolderToWorkspace": "Çalışma Alanına Klasör &&Ekle...",
-	"miSave": "&&Kaydet",
-	"miSaveAs": "&&Farklı Kaydet",
-	"miSaveAll": "&&Tümünü Kaydet",
-	"miAutoSave": "Otomatik Kaydet",
-	"miRevert": "Dosyayı &&Geri Al",
-	"miCloseWindow": "Pen&&cereyi Kapat",
-	"miCloseWorkspace": "Ça&&lışma Alanını Kapat",
-	"miCloseFolder": "K&&lasörü Kapat",
-	"miCloseEditor": "Dü&&zenleyiciyi Kapat",
-	"miExit": "Çı&&kış",
-	"miOpenSettings": "&&Ayarlar",
-	"miOpenKeymap": "&&Klavye Kısayolları",
-	"miOpenKeymapExtensions": "&&Tuş Haritası Eklentileri",
-	"miOpenSnippets": "Kullanıcı &&Parçacıkları",
-	"miSelectColorTheme": "&&Renk Teması",
-	"miSelectIconTheme": "&&Dosya Simgesi Teması",
-	"miPreferences": "T&&ercihler",
-	"miReopenClosedEditor": "&&Kapatılan Düzenleyiciyi Tekrar Aç",
-	"miMore": "&&Daha Fazlası...",
-	"miClearRecentOpen": "Son Açılanları &&Temizle",
-	"miUndo": "&&Geri Al",
-	"miRedo": "&&Yinele",
-	"miCut": "&&Kes",
-	"miCopy": "K&&opyala",
-	"miPaste": "Y&&apıştır",
-	"miFind": "&&Bul",
-	"miReplace": "&&Değiştir",
-	"miFindInFiles": "Dosyalarda B&&ul",
-	"miReplaceInFiles": "Dosyalarda Değiş&&tir",
-	"miEmmetExpandAbbreviation": "Emmet: Kı&&saltmayı Genişlet",
-	"miShowEmmetCommands": "E&&mmet...",
-	"miToggleLineComment": "Satı&&r Yorumunu Aç/Kapat",
-	"miToggleBlockComment": "Yorum B&&loğunu Aç/Kapat",
-	"miMultiCursorAlt": "Birden Fazla İmleç İçin Alt+Tıklamaya Geçiş Yap",
-	"miMultiCursorCmd": "Birden Fazla İmleç İçin Cmd+Tıklamaya Geçiş Yap",
-	"miMultiCursorCtrl": "Birden Fazla İmleç İçin Ctrl+Tıklamaya Geçiş Yap",
-	"miInsertCursorAbove": "Yukarıya &&İmleç Ekle",
-	"miInsertCursorBelow": "Aşağıya İ&&mleç Ekle",
-	"miInsertCursorAtEndOfEachLineSelected": "&&Satır Sonlarına İmleç Ekle",
-	"miAddSelectionToNextFindMatch": "S&&onraki Tekrarlamayı Ekle",
-	"miAddSelectionToPreviousFindMatch": "Ö&&nceki Tekrarlamayı Ekle",
-	"miSelectHighlights": "Tüm T&&ekrarlamaları Değiştir",
-	"miCopyLinesUp": "Satırı &&Yukarı Kopyala",
-	"miCopyLinesDown": "Satırı &&Aşağı Kopyala",
-	"miMoveLinesUp": "Satırı Y&&ukarı Taşı",
-	"miMoveLinesDown": "Satı&&rı Aşağı Taşı",
-	"miSelectAll": "&&Tümünü Seç",
-	"miSmartSelectGrow": "Seçimi &&Genişlet",
-	"miSmartSelectShrink": "Seçimi &&Daralt",
-	"miViewExplorer": "&&Gezgin",
-	"miViewSearch": "&&Arama",
-	"miViewSCM": "&&SCM",
-	"miViewDebug": "&&Hata Ayıklama",
-	"miViewExtensions": "&&Eklentiler",
-	"miToggleOutput": "Çı&&ktı",
-	"miToggleDebugConsole": "Hata &&Ayıklama Konsolu",
-	"miToggleIntegratedTerminal": "Entegre &&Terminal",
-	"miMarker": "S&&orunlar",
-	"miCommandPalette": "Komut &&Paleti...",
-	"miOpenView": "&&Görünümü Aç...",
-	"miToggleFullScreen": "Tam Ekra&&nı Aç/Kapat",
-	"miToggleZenMode": "Zen Modunu Aç/Kapat",
-	"miToggleCenteredLayout": "Ortalanmış Düzeni Aç/Kapat",
-	"miToggleMenuBar": "&&Menü Çubuğunu Gizle/Göster",
-	"miSplitEditor": "Düzenleyiciyi &&Böl",
-	"miToggleEditorLayout": "Dü&&zenleyici Grubu Düzenini Değiştir",
-	"miToggleSidebar": "Ke&&nar Çubuğunu Aç/Kapat",
-	"miMoveSidebarRight": "Kenar Çubuğunu S&&ağa Taşı",
-	"miMoveSidebarLeft": "Kenar Çubuğunu S&&ola Taşı",
-	"miTogglePanel": "&&Paneli Aç/Kapat",
-	"miHideStatusbar": "&&Durum Çubuğunu Gizle",
-	"miShowStatusbar": "&&Durum Çubuğunu Göster",
-	"miHideActivityBar": "Etkinlik Ç&&ubuğunu Gizle",
-	"miShowActivityBar": "Etkinlik Ç&&ubuğunu Göster",
-	"miToggleWordWrap": "&&Sözcük Kaydırmasını Aç/Kapat",
-	"miToggleMinimap": "&&Mini Haritayı Aç/Kapat",
-	"miToggleRenderWhitespace": "&&Boşlukları Görüntülemeyi Aç/Kapat",
-	"miToggleRenderControlCharacters": "&&Kontrol Karakterlerini Aç/Kapat",
-	"miZoomIn": "&&Yakınlaştır",
-	"miZoomOut": "&&Uzaklaştır",
-	"miZoomReset": "Yakınlaştırmayı Sı&&fırla",
-	"miBack": "&&Geri",
-	"miForward": "&&İleri",
-	"miNextEditor": "&&Sonraki Düzenleyici",
-	"miPreviousEditor": "Ö&&nceki Düzenleyici",
-	"miNextEditorInGroup": "&&Grupta Sonraki Kullanılan Düzenleyici",
-	"miPreviousEditorInGroup": "G&&rupta Önceki Kullanılan Düzenleyici",
-	"miSwitchEditor": "&&Düzenleyici Değiştir",
-	"miFocusFirstGroup": "İ&&lk Grup",
-	"miFocusSecondGroup": "İ&&kinci Grup",
-	"miFocusThirdGroup": "Üçün&&cü Grup",
-	"miNextGroup": "Sonraki Gr&&up",
-	"miPreviousGroup": "Önceki Gru&&p",
-	"miSwitchGroup": "Grup &&Değiştir",
-	"miGotoFile": "D&&osyaya Git...",
-	"miGotoSymbolInFile": "Dosyada S&&embole Git...",
-	"miGotoSymbolInWorkspace": "Çalışma &&Alanında Sembole Git...",
-	"miGotoDefinition": "&&Tanıma Git",
-	"miGotoTypeDefinition": "Tü&&r Tanımına Git",
-	"miGotoImplementation": "U&&ygulamaya Git",
-	"miGotoLine": "&&Satıra Git...",
-	"miStartDebugging": "&&Hata Ayıklamaya Başla",
-	"miStartWithoutDebugging": "Hata Ayıklama &&Olmadan Başlat",
-	"miStopDebugging": "Hata Ayıklamayı D&&urdur",
-	"miRestart Debugging": "Hata Ayıklamayı &&Yeniden Başlat",
-	"miOpenConfigurations": "Ya&&pılandırmaları Aç",
-	"miAddConfiguration": "Yapı&&landırma Ekle...",
-	"miStepOver": "&&Adım At",
-	"miStepInto": "&&İçine Adımla",
-	"miStepOut": "&&Dışına Adımla",
-	"miContinue": "De&&vam Et",
-	"miToggleBreakpoint": "Kesme &&Noktası Ekle/Kaldır",
-	"miConditionalBreakpoint": "&&Koşullu Kesme Noktası...",
-	"miFunctionBreakpoint": "&&Fonksiyon Kesme Noktası",
-	"miLogPoint": "&&Günlük Noktası...",
-	"miNewBreakpoint": "&&Yeni Kesme Noktası",
-	"miEnableAllBreakpoints": "Tüm Kesme Noktalarını Etkinleştir",
-	"miDisableAllBreakpoints": "&&Tüm Kesme Noktalarını Devre Dışı Bırak",
-	"miRemoveAllBreakpoints": "Tüm Kesme Noktalarını Kaldı&&r",
-	"miInstallAdditionalDebuggers": "&&Ek Hata Ayıklayıcıları Yükle",
-	"mMinimize": "Simge Durumuna Küçült",
-	"mZoom": "Yakınlaştırma",
-	"mBringToFront": "Tümünü Öne Getir",
-	"miSwitchWindow": "&&Pencere Değiştir...",
-	"mShowPreviousTab": "Önceki Sekmeyi Göster",
-	"mShowNextTab": "Sonraki Sekmeyi Göster",
-	"mMoveTabToNewWindow": "Sekmeyi Yeni Pencereye Taşı",
-	"mMergeAllWindows": "Tüm Pencereleri Birleştir",
-	"miToggleDevTools": "&&Geliştirici Araçlarını Aç/Kapat",
-	"miAccessibilityOptions": "&&Erişilebilirlik Seçenekleri",
-	"miOpenProcessExplorerer": "İşlem &&Yöneticisini Aç",
-	"miReportIssue": "&&Sorun Bildir",
-	"miWelcome": "&&Hoş Geldiniz",
-	"miInteractivePlayground": "&&İnteraktif Oyun Alanı",
-	"miDocumentation": "&&Belgeler",
-	"miReleaseNotes": "&&Sürüm Notları",
-	"miKeyboardShortcuts": "&&Klavye Kısayolları Başvurusu",
-	"miIntroductoryVideos": "Tanıtım &&Videoları",
-	"miTipsAndTricks": "&&İpuçları ve Püf noktaları",
-	"miTwitter": "&&Twitter'da Bize Katıl",
-	"miUserVoice": "Ö&&zellik İsteklerini Ara",
-	"miLicense": "&&Lisansı Görüntüle",
-	"miPrivacyStatement": "Gizlilik &&Beyanı",
-	"miAbout": "H&&akkında",
-	"miRunTask": "Görevi Ç&&alıştır",
-	"miBuildTask": "&&Derleme Görevini Çalıştır...",
-	"miRunningTask": "Ça&&lışan Görevleri Göster...",
-	"miRestartTask": "Çalışan Görevi &&Yeniden Başlat...",
-	"miTerminateTask": "&&Görevi Sonlandır...",
-	"miConfigureTask": "Görevleri Ya&&pılandır...",
-	"miConfigureBuildTask": "&&Varsayılan Derleme Görevini Yapılandır...",
-	"accessibilityOptionsWindowTitle": "Erişilebilirlik Seçenekleri",
-	"miCheckForUpdates": "Güncelleştirmeleri Denetle...",
-	"miCheckingForUpdates": "Güncelleştirmeler Denetleniyor...",
-	"miDownloadUpdate": "Mevcut Güncelleştirmeyi İndir",
-	"miDownloadingUpdate": "Güncelleştirme İndiriliyor...",
-	"miInstallUpdate": "Güncelleştirmeyi Yükle...",
-	"miInstallingUpdate": "Güncelleştirme Yükleniyor...",
-	"miRestartToUpdate": "Güncelleştirmek için Yeniden Başlat..."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/code/electron-main/window.i18n.json b/i18n/trk/src/vs/code/electron-main/window.i18n.json
deleted file mode 100644
index 3238dacea6a..00000000000
--- a/i18n/trk/src/vs/code/electron-main/window.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hiddenMenuBar": "Menü çubuğuna hâlâ Alt tuşuna basarak erişebilirsiniz."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/code/electron-main/windows.i18n.json b/i18n/trk/src/vs/code/electron-main/windows.i18n.json
deleted file mode 100644
index 689291cc880..00000000000
--- a/i18n/trk/src/vs/code/electron-main/windows.i18n.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"ok": "Tamam",
-	"pathNotExistTitle": "Yol yok",
-	"pathNotExistDetail": "'{0}' yolu artık diskte değil.",
-	"reopen": "&&Yeniden Aç",
-	"wait": "&&Beklemeye Devam Et",
-	"close": "&&Kapat",
-	"appStalled": "Pencere artık yanıt vermiyor",
-	"appStalledDetail": "Pencereyi yeniden açabilir, kapatabilir veya bekleyebilirsiniz.",
-	"appCrashed": "Pencere kilitlendi",
-	"appCrashedDetail": "Verdiğimiz rahatsızlıktan dolayı özür dileriz! Pencereyi yeniden açıp kaldığınız yerden devam edebilirsiniz.",
-	"open": "Aç",
-	"openFolder": "Klasör Aç",
-	"openFile": "Dosya Aç",
-	"workspaceOpenedMessage": "Çalışma alanı '{0}' kaydedilemiyor",
-	"workspaceOpenedDetail": "Çalışma alanı zaten başka bir pencerede açılmış. Lütfen ilk olarak o pencereyi kapatın ve tekrar deneyin.",
-	"openWorkspace": "&&Aç",
-	"openWorkspaceTitle": "Çalışma Alanı Aç",
-	"save": "&&Kaydet",
-	"doNotSave": "Kaydet&&me",
-	"cancel": "İptal",
-	"saveWorkspaceMessage": "Çalışma alanı yapılandırmanızı bir dosya olarak kaydetmek istiyor musunuz?",
-	"saveWorkspaceDetail": "Yeniden açmayı planlıyorsanız, çalışma alanınızı kaydedin.",
-	"saveWorkspace": "Çalışma Alanını Kaydet"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/code/node/cliProcessMain.i18n.json b/i18n/trk/src/vs/code/node/cliProcessMain.i18n.json
deleted file mode 100644
index 4ff5a870b05..00000000000
--- a/i18n/trk/src/vs/code/node/cliProcessMain.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"notFound": "'{0}' eklentisi bulunamadı.",
-	"notInstalled": "'{0}' eklentisi yüklü değil.",
-	"useId": "Eklentinin tam ID'sini, yayıncı da dahil olmak üzere kullandığınızdan emin olun, ör: {0}",
-	"successVsixInstall": "'{0}' eklentisi başarıyla yüklendi.",
-	"cancelVsixInstall": "'{0}' eklentisini yükleme işlemi iptal edildi.",
-	"alreadyInstalled": "'{0}' eklentisi zaten yüklü.",
-	"foundExtension": "'{0}' markette bulundu.",
-	"installing": "Yükleniyor...",
-	"successInstall": "'{0}' v{1} eklentisi başarıyla kuruldu!",
-	"uninstalling": "{0} kaldırılıyor...",
-	"successUninstall": "'{0}' eklentisi başarıyla kaldırıldı!"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/editor/browser/services/bulkEdit.i18n.json b/i18n/trk/src/vs/editor/browser/services/bulkEdit.i18n.json
deleted file mode 100644
index bdfef4d2c99..00000000000
--- a/i18n/trk/src/vs/editor/browser/services/bulkEdit.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"summary.0": "Düzenleme yapılmadı",
-	"summary.nm": "{1} dosyada {0} metin düzenlemesi yapıldı",
-	"summary.n0": "Bir dosyada {0} metin düzenlemesi yapıldı",
-	"conflict": "Bu dosyalar bu arada değiştirildi: {0}"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/editor/browser/widget/codeEditorWidget.i18n.json b/i18n/trk/src/vs/editor/browser/widget/codeEditorWidget.i18n.json
deleted file mode 100644
index 782a6d9ff8f..00000000000
--- a/i18n/trk/src/vs/editor/browser/widget/codeEditorWidget.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"cursors.maximum": "İmleç sayısı {0} ile sınırlandırılmış durumda."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/editor/browser/widget/diffEditorWidget.i18n.json b/i18n/trk/src/vs/editor/browser/widget/diffEditorWidget.i18n.json
deleted file mode 100644
index b08577e1af6..00000000000
--- a/i18n/trk/src/vs/editor/browser/widget/diffEditorWidget.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"diff.tooLarge": "Bir dosya çok büyük olduğu için dosyaları karşılaştıramazsınız."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/editor/browser/widget/diffReview.i18n.json b/i18n/trk/src/vs/editor/browser/widget/diffReview.i18n.json
deleted file mode 100644
index c2e800b7ebe..00000000000
--- a/i18n/trk/src/vs/editor/browser/widget/diffReview.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"label.close": "Kapat",
-	"no_lines": "hiçbir satır",
-	"one_line": "1 satır",
-	"more_lines": "{0} satır",
-	"header": "Farklılık {0}/{1}: orijinal {2}, {3}, değiştirilen {4}, {5}",
-	"blankLine": "boş",
-	"equalLine": "orijinal {0}, değiştirilen {1}: {2}",
-	"insertLine": "+ değiştirilen {0}: {1}",
-	"deleteLine": "- orijinal {0}: {1}",
-	"editor.action.diffReview.next": "Sonraki Farka Git",
-	"editor.action.diffReview.prev": "Sonraki Farka Git"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/editor/common/commonCodeEditor.i18n.json b/i18n/trk/src/vs/editor/common/commonCodeEditor.i18n.json
deleted file mode 100644
index 782a6d9ff8f..00000000000
--- a/i18n/trk/src/vs/editor/common/commonCodeEditor.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"cursors.maximum": "İmleç sayısı {0} ile sınırlandırılmış durumda."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/editor/common/config/commonEditorConfig.i18n.json b/i18n/trk/src/vs/editor/common/config/commonEditorConfig.i18n.json
deleted file mode 100644
index 80d2362504c..00000000000
--- a/i18n/trk/src/vs/editor/common/config/commonEditorConfig.i18n.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"editorConfigurationTitle": "Düzenleyici",
-	"fontFamily": "Yazı tipi ailesini denetler.",
-	"fontWeight": "Yazı tipi kalınlığını denetler.",
-	"fontSize": "Yazı tipi boyutunu piksel olarak denetler.",
-	"lineHeight": "Satır yüksekliğini denetler. lineHeight değerini, fontSize değeri kullanarak hesaplamak için 0 girin.",
-	"letterSpacing": "Harfler arası boşluğu pixel olarak denetler.",
-	"lineNumbers.off": "Satır numaraları gösterilmez.",
-	"lineNumbers.on": "Satır numaraları mutlak sayı olarak gösterilir.",
-	"lineNumbers.relative": "Satır numaraları imlecin konumuna olan uzaklık olarak gösterilir.",
-	"lineNumbers.interval": "Satır numaraları her 10 satırda bir gösterilir.",
-	"lineNumbers": "Satır numaralarının görüntülenmesini denetler.",
-	"rulers": "Belirli bir eşit genişlikli karakterlerden sonra dikey cetveller göster. Birden çok cetvel için birden çok değer kullanın. Dizi boş ise cetvel gösterilmez",
-	"wordSeparators": "Sözcüklerle ilgili gezinti veya işlem yaparken kelime ayırıcı olarak kullanılacak karakterler",
-	"tabSize": "Bir sekmenin eşit olduğu boşluk sayısı. Bu ayar, `editor.detectIndentation` açıkken dosya içeriğine bağlı olarak geçersiz kılınır.",
-	"tabSize.errorMessage": "'sayı' bekleniyor. \"auto\" değerinin `editor.detectIndentation` ile değiştirildiğini unutmayın.",
-	"insertSpaces": "Tab tuşuna basınca boşluk ekle. Bu ayar, `editor.detectIndentation` açıkken dosya içeriğine bağlı olarak geçersiz kılınır.",
-	"insertSpaces.errorMessage": "'boole' bekleniyor. \"auto\" değerinin `editor.detectIndentation` ile değiştirildiğini unutmayın.",
-	"detectIndentation": "Bir dosyayı açarken, `editor.tabSize` ve `editor.insertSpaces` dosya içeriğine bağlı olarak algılanır.",
-	"roundedSelection": "Seçimlerin köşelerinin yuvarlak olup olmayacağını denetler",
-	"scrollBeyondLastLine": "Düzenleyicinin son satırın ötesine ilerleyip ilerlemeyeceğini denetler",
-	"scrollBeyondLastColumn": "Düzenleyicinin yatay olarak kaydıracağına ek karakter sayısı",
-	"smoothScrolling": "Düzenleyicinin bir animasyon kullanarak kaydırıp kaydırmayacağını denetler",
-	"minimap.enabled": "Mini haritanın gösterilip gösterilmeyeceğini denetler",
-	"minimap.side": "Mini haritanın görüntüleneceği tarafı denetler.",
-	"minimap.showSlider": "Mini harita kaydıracının otomatik olarak gizlenip gizlenmeyeceğini denetler.",
-	"minimap.renderCharacters": "(Renk blokları yerine) Bir satırdaki gerçek harfleri göster",
-	"minimap.maxColumn": "Hazırlanacak mini haritanın azami genişliğini belirli sayıda sütunla sınırla",
-	"find.seedSearchStringFromSelection": "Bulma Araç Çubuğu'ndaki arama metninin, düzenleyicideki seçili alandan beslenmesini denetler",
-	"find.autoFindInSelection": "Seçimde bul işaretçisinin, editördeki metnin birden çok karakteri veya satırı seçildiğinde açılmasını denetler.",
-	"find.globalFindClipboard": "macOS'da Bulma Aracı'nın paylaşılan panoyu okuyup okumamasını veya değiştirip değiştirmemesini denetler",
-	"wordWrap.off": "Satırlar hiçbir zaman bir sonraki satıra kaydırılmayacak.",
-	"wordWrap.on": "Satırlar görüntü alanı genişliğinde bir sonraki satıra kaydırılacak.",
-	"wordWrap.wordWrapColumn": "Satırlar `editor.wordWrapColumn` değerinde bir sonraki satıra kaydırılacak.",
-	"wordWrap.bounded": "Satırlar en düşük görüntü alanı genişliğinde ve `editor.wordWrapColumn` değerinde bir sonraki satıra kaydırılacak.",
-	"wordWrap": "Satırların bir sonraki satıra nasıl kaydırılacağını denetler. Seçenekler:\n - 'off' (kaydırmayı devre dışı bırak),\n - 'on' (görüntü alanında kaydır),\n - 'wordWrapColumn' (`editor.wordWrapColumn` değerinde kaydır) veya\n - 'bounded' (en düşük görüntü alanı genişliğinde ve `editor.wordWrapColumn` değerinde kaydır).",
-	"wordWrapColumn": "`editor.wordWrap` ögesi, 'wordWrapColumn' veya 'bounded' iken düzenleyicinin kaydırma sütununu denetler.",
-	"wrappingIndent": "Kaydırılan satır girintisini denetler. 'none', 'same', 'indent' veya 'deepIndent' değerlerinden biri olabilir.",
-	"mouseWheelScrollSensitivity": "Fare tekerleği kaydırma olaylarında `deltaX` ve `deltaY` üzerinde kullanılan bir çarpan",
-	"multiCursorModifier.ctrlCmd": "Windows ve Linux'da `Control` ve macOS'de `Command` ile eşleşir.",
-	"multiCursorModifier.alt": "Windows ve Linux'da `Alt` ve macOS'de `Option` ile eşleşir.",
-	"multiCursorModifier": "Fare ile birden çok imleç eklenmesinde kullanılacak değiştirici. `ctrlCmd` Windows ve Linux'da `Control` ve macOS'de `Command` ile eşleşir. Tanıma Git ve Bağlantıyı Aç fare hareketleri, birden çok imleç değiştiricisi ile çakışmayacak şekilde uyum sağlarlar.",
-	"multiCursorMergeOverlapping": "Üst üste geldiğinde çoklu imleçleri birleştir.",
-	"quickSuggestions.strings": "Dizelerin içinde hızlı önerileri etkinleştir.",
-	"quickSuggestions.comments": "Yorumların içinde hızlı önerileri etkinleştir.",
-	"quickSuggestions.other": "Dizeler ve yorumlar dışında hızlı önerileri etkinleştirin.",
-	"quickSuggestions": "Yazarken önerilerin otomatik olarak gösterilip gösterilmeyeceğini denetler",
-	"quickSuggestionsDelay": "Hızlı önerilerin gösterilmesinden önce kaç ms bekleneceğini denetler",
-	"parameterHints": "Siz tuşlara bastıkça parametre belgelerini ve tür bilgisini gösteren açılır pencereyi etkinleştirir.",
-	"autoClosingBrackets": "Düzenleyicinin köşeli ayracı açtıktan sonra otomatik olarak kapatıp kapatmayacağını denetler",
-	"formatOnType": "Düzenleyicinin satırı yazıldıktan sonra otomatik biçimlendirip biçimlendirmeyeceğini denetler",
-	"formatOnPaste": "Düzenleyicinin yapıştırılan içeriği otomatik olarak biçimlendirip biçimlendirmeyeceğini denetler. Bir biçimlendirici mevcut olmalı ve belgede bir aralığı biçimlendirebilmelidir.",
-	"autoIndent": "Düzenleyicinin, kullanıcılar tuşlara bastığında, satırları yapıştırdığında veya taşıdığında girintiyi otomatik olarak ayarlayıp ayarlamayacağını denetler. Dilin girintileme kuralları mevcut olmalıdır.",
-	"suggestOnTriggerCharacters": "Tetikleyici karakterler yazılırken otomatik olarak öneri gösterilip gösterilmeyeceğini denetler",
-	"acceptSuggestionOnEnter": "'Tab' tuşuna ek olarak - önerilerin 'Enter' tuşuna basıldığında kabul edilmesini denetler. Yeni satır ekleme ya da öneri kabul etme arasındaki belirsizlikten kaçınmaya yardımcı olur. 'smart' değeri, bir öneri metinsel değişiklik yapıyorsa, onu sadece Enter tuşu ile kabul etmeyi ifade eder",
-	"acceptSuggestionOnCommitCharacter": "Önerilerin tamamlama karakterlerinde kabul edilip edilmeyeceğini denetler. Örnek olarak; JavaScript'te noktalı virgül(';') öneri kabul eden ve o karakteri giren tamamlama karakteri olabilir.",
-	"snippetSuggestions.top": "Parçacık önerilerini diğer önerilerin üstünde göster.",
-	"snippetSuggestions.bottom": "Parçacık önerilerini diğer önerilerin altında göster.",
-	"snippetSuggestions.inline": "Parçacık önerilerini diğer önerilerle birlikte göster.",
-	"snippetSuggestions.none": "Parçacık önerilerini gösterme.",
-	"snippetSuggestions": "Parçacıkların diğer önerilerle gösterilip gösterilmeyeceğini ve bunların nasıl sıralanacaklarını denetler.",
-	"emptySelectionClipboard": "Bir seçim olmadan geçerli satırı kopyalayıp kopyalamamayı denetler.",
-	"wordBasedSuggestions": "Tamamlamaların belgedeki sözcüklere dayalı olarak hesaplanıp hesaplanmayacağını denetler.",
-	"suggestSelection.first": "Her zaman ilk öneriyi seç.",
-	"suggestSelection.recentlyUsed": "Devamını yazarak başka bir tanesini tamamlamadığınız sürece son zamanlarda kullanılan önerileri seçin, ör. `console.| -> console.log` çünkü `log` son zamanlarda seçilmiştir.",
-	"suggestSelection.recentlyUsedByPrefix": "Öneklere dayanan ve daha önce tamamlama yaptığınız önerileri seçin, ör. `co -> console` ve `con -> const`.",
-	"suggestSelection": "Öneri listesi gösterilirken ön seçiminin nasıl yapılacağını denetler.",
-	"suggestFontSize": "Öneri aracının yazı tipi boyutu",
-	"suggestLineHeight": "Öneri aracının satır yüksekliği",
-	"selectionHighlight": "Düzenleyicinin seçime benzer eşleşmeleri vurgulayıp vurgulamayacağını denetler",
-	"occurrencesHighlight": "Düzenleyicinin semantik sembol tekrarlamalarını vurgulayıp vurgulamayacağını denetler",
-	"overviewRulerLanes": "Genel bakış cetvelinde aynı konumda gösterilebilecek süsleme sayısını denetler",
-	"overviewRulerBorder": "Genel bakış cetvelinin etrafına bir kenarlık çizilmesi gerekip gerekmediğini denetler.",
-	"cursorBlinking": "İmleç animasyon stilini denetler.",
-	"mouseWheelZoom": "Ctrl tuşuna basarken fare tekerleği ile düzenleyici yazı tipini yakınlaştırın",
-	"cursorStyle": "İmleç stilini denetler, kabul edilen değerler: 'block', 'block-outline', 'line', 'line-thin', 'underline' ve 'underline-thin'",
-	"cursorWidth": "editor.cursorStyle, 'line' olarak ayarlandığında imlecin genişliğini denetler",
-	"fontLigatures": "Yazı tipi ligatürlerini etkinleştirir",
-	"hideCursorInOverviewRuler": "İmlecin genel bakış cetvelinde gizlenip gizlenmeyeceğini denetler.",
-	"renderWhitespace": "Düzenleyicinin boşluk karakterlerini nasıl göstereceğini denetler, seçenekler: 'none', 'boundary', ve 'all'. 'boundary' seçeneği sözcükler arasındaki tek boşlukları göstermez.",
-	"renderControlCharacters": "Düzenleyicinin kontrol karakterlerini gösterip göstermemesini denetler",
-	"renderIndentGuides": "Düzenleyicinin girinti kılavuzlarını gösterip göstermemesini denetler",
-	"renderLineHighlight": "Düzenleyicinin geçerli satır vurgusunu nasıl göstereceğini denetler, seçenekler: 'none', 'gutter', 'line', ve 'all'.",
-	"codeLens": "Düzenleyicinin Kod Objektifi gösterip göstermeyeceğini denetler",
-	"folding": "Düzenleyicide kod katlamanın etkin olup olmadığını denetler",
-	"foldingStrategyAuto": "Mevcutsa dile özel katlama stratejisi kullan, mevcut değilse girintileme tabanlı stratejiyi kullan.",
-	"foldingStrategyIndentation": "Daima girintileme tabanlı katlama stratejisini kullan",
-	"foldingStrategy": "Katlama aralıklarının hesaplanma şeklini denetler. 'auto' seçimi, mevcutsa dile özel katlama stratejisi kullanır. 'indentation' ise girintileme tabanlı katlama stratejisinin kullanılmasını zorlar.",
-	"showFoldingControls": "Oluktaki kat kontrollerinin otomatik olarak gizlenip gizlenmeyeceğini denetler.",
-	"matchBrackets": "Eşleşen ayraçları, onlardan biri seçildiğinde vurgula.",
-	"glyphMargin": "Düzenleyicinin dikey glif boşluğunu oluşturup oluşturmayacağını kontrol eder. Glif boşluğu çoğunlukla hata ayıklamak için kullanılır.",
-	"useTabStops": "Boşluk ekleme ve silme sekme duraklarını izler",
-	"trimAutoWhitespace": "Sondaki otomatik eklenen boşluğu kaldır",
-	"stablePeek": "Gözetleme düzenleyicilerini, içeriklerine çift tıklandığında veya Escape tuşuna basıldığında bile açık tut.",
-	"dragAndDrop": "Düzenleyicinin seçimleri sürükleyip bırakarak taşımaya izin verip vermeyeceğini denetler.",
-	"accessibilitySupport.auto": "Düzenleyici, bir Ekran Okuyucu'nun ne zaman bağlandığını algılamak için platform API'larını kullanacaktır.",
-	"accessibilitySupport.on": "Düzenleyici bir Ekran Okuyucu ile kullanılmak üzere kalıcı olarak optimize edilecektir.",
-	"accessibilitySupport.off": "Düzenleyici hiçbir zaman bir Ekran Okuyucu ile kullanılmak üzere optimize edilmeyecektir.",
-	"accessibilitySupport": "Düzenleyicinin ekran okuyucular için optimize edilmiş bir modda çalışıp çalışmayacağını denetler.",
-	"links": "Düzenleyicinin bağlantıları otomatik algılayıp, onları tıklanabilir yapıp yapmayacağını denetler",
-	"colorDecorators": "Düzenleyicinin satır içi renk dekoratörlerini ve renk seçiciyi gösterip göstermemesini denetler.",
-	"codeActions": "Kod eylemleri ampulunu etkinleştirir",
-	"codeActionsOnSave.organizeImports": "Kaydederken \"içe aktarımları düzenle\" çalıştırılsın mı?",
-	"codeActionsOnSave": "Kaydetme esnasında çalıştırılacak kod eylem türleri.",
-	"codeActionsOnSaveTimeout": "Kaydetme esnasında çalıştırılacak kod eylem türleri için zaman aşımı.",
-	"selectionClipboard": "Linux birincil panosunun desteklenip desteklenmeyeceğini denetler.",
-	"sideBySide": "Karşılaştırma düzenleyicisinin farklılıkları yan yana mı yoksa satır içinde mi göstereceğini denetler",
-	"ignoreTrimWhitespace": "Karşılaştırma düzenleyicisinin baştaki veya sondaki boşluklardaki değişmeleri farklılık olarak gösterip göstermemesini denetler",
-	"largeFileOptimizations": "Yoğun bellek kullanan belirli özellikleri devre dışı bırakacak şekilde büyük dosyalarla özel olarak ilgilenilmesi.",
-	"renderIndicators": "Karşılaştırma düzenleyicisinin ekleme/çıkarma değişiklikleri için +/- göstergeleri gösterip göstermemesini denetler."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/editor/common/config/editorOptions.i18n.json b/i18n/trk/src/vs/editor/common/config/editorOptions.i18n.json
deleted file mode 100644
index 8dff732b87d..00000000000
--- a/i18n/trk/src/vs/editor/common/config/editorOptions.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"accessibilityOffAriaLabel": "Düzenleyici şu an erişilebilir değil. Seçenekler için lütfen Alt+F1'e basın.",
-	"editorViewAccessibleLabel": "Düzenleyici içeriği"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/editor/common/controller/cursor.i18n.json b/i18n/trk/src/vs/editor/common/controller/cursor.i18n.json
deleted file mode 100644
index 4a52770d871..00000000000
--- a/i18n/trk/src/vs/editor/common/controller/cursor.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"corrupt.commands": "Komut yürütülürken beklenmeyen özel durum oluştu."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/editor/common/model/textModelWithTokens.i18n.json b/i18n/trk/src/vs/editor/common/model/textModelWithTokens.i18n.json
deleted file mode 100644
index 4884bc2418f..00000000000
--- a/i18n/trk/src/vs/editor/common/model/textModelWithTokens.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"mode.tokenizationSupportFailed": "Mod, girdiyi belirteçlere ayırırken başarısız oldu."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/editor/common/modes/modesRegistry.i18n.json b/i18n/trk/src/vs/editor/common/modes/modesRegistry.i18n.json
deleted file mode 100644
index 59fd18bb41c..00000000000
--- a/i18n/trk/src/vs/editor/common/modes/modesRegistry.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"plainText.alias": "Düz Metin"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/editor/common/services/bulkEdit.i18n.json b/i18n/trk/src/vs/editor/common/services/bulkEdit.i18n.json
deleted file mode 100644
index b081029e080..00000000000
--- a/i18n/trk/src/vs/editor/common/services/bulkEdit.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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": "Bu dosyalar bu arada değiştirildi: {0}",
-	"summary.0": "Düzenleme yapılmadı",
-	"summary.nm": "{1} dosyada {0} metin düzenlemesi yapıldı",
-	"summary.n0": "Bir dosyada {0} metin düzenlemesi yapıldı"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/editor/common/services/modeServiceImpl.i18n.json b/i18n/trk/src/vs/editor/common/services/modeServiceImpl.i18n.json
deleted file mode 100644
index 55d69fef903..00000000000
--- a/i18n/trk/src/vs/editor/common/services/modeServiceImpl.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"vscode.extension.contributes.languages": "Dil bildirimlerine ekleme yapar.",
-	"vscode.extension.contributes.languages.id": "Dilin ID'si.",
-	"vscode.extension.contributes.languages.aliases": "Dilin takma adları.",
-	"vscode.extension.contributes.languages.extensions": "Dil ile ilişkili dosya uzantıları.",
-	"vscode.extension.contributes.languages.filenames": "Dil ile ilişkili dosya adları.",
-	"vscode.extension.contributes.languages.filenamePatterns": "Dil ile ilişkili dosya adı glob desenleri.",
-	"vscode.extension.contributes.languages.mimetypes": "Dil ile ilişkili MIME türleri.",
-	"vscode.extension.contributes.languages.firstLine": "Dilin bir dosyasının ilk satırıyla eşleşen bir düzenli ifade.",
-	"vscode.extension.contributes.languages.configuration": "Dil için yapılandırma seçenekleri içeren dosyaya, bir göreli yol."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/editor/common/services/modelServiceImpl.i18n.json b/i18n/trk/src/vs/editor/common/services/modelServiceImpl.i18n.json
deleted file mode 100644
index e12a9398484..00000000000
--- a/i18n/trk/src/vs/editor/common/services/modelServiceImpl.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"diagAndSourceMultiline": "[{0}]\n{1}",
-	"diagAndSource": "[{0}] {1}"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/editor/common/view/editorColorRegistry.i18n.json b/i18n/trk/src/vs/editor/common/view/editorColorRegistry.i18n.json
deleted file mode 100644
index 2cef84bd724..00000000000
--- a/i18n/trk/src/vs/editor/common/view/editorColorRegistry.i18n.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"lineHighlight": "İmlecin bulunduğu satırın vurgusunun arka plan rengi.",
-	"lineHighlightBorderBox": "İmlecin bulunduğu satırın kenarlığının arka plan rengi.",
-	"rangeHighlight": "Hızlı açma veya arama özellikleri gibi vurgulanan aralıkların arka plan rengi. Altta yer alan süslemeleri gizlememek için renk opak olmamalıdır.",
-	"rangeHighlightBorder": "Vurgulanmış alanın etrafındaki kenarlıkların arka plan rengi.",
-	"caret": "Düzenleyici imlecinin rengi.",
-	"editorCursorBackground": "Düzenleyici imlecinin arka plan rengi. Bir blok imlecinin kapladığı bir karakterin rengini özelleştirmeyi sağlar.",
-	"editorWhitespaces": "Düzenleyicideki boşluk karakterlerinin rengi.",
-	"editorIndentGuides": "Düzenleyici girinti kılavuzlarının rengi.",
-	"editorActiveIndentGuide": "Aktif düzenleyici girinti kılavuzlarının rengi.",
-	"editorLineNumbers": "Düzenleyici satır numaralarının rengi.",
-	"editorActiveLineNumber": "Düzenleyici etkin satır numara rengi",
-	"deprecatedEditorActiveLineNumber": "Id kullanımdan kaldırıldı. Bunun yerine 'editorLineNumber.activeForeground' kullanın.",
-	"editorRuler": "Düzenleyici cetvellerinin rengi.",
-	"editorCodeLensForeground": "Düzenleyici kod objektiflerinin ön plan rengi",
-	"editorBracketMatchBackground": "Eşleşen parantezlerin arka plan rengi",
-	"editorBracketMatchBorder": "Eşleşen parantez kutularının rengi",
-	"editorOverviewRulerBorder": "Genel bakış cetvelinin kenarlık rengi.",
-	"editorGutter": "Düzenleyici oluğunun arka plan rengi. Oluk, glif boşluklarını ve satır numaralarını içerir.",
-	"errorForeground": "Düzenleyicideki hata karalamalarının ön plan rengi.",
-	"errorBorder": "Düzenleyicideki hata karalamalarının kenarlık rengi.",
-	"warningForeground": "Düzenleyicideki uyarı karalamalarının ön plan rengi.",
-	"warningBorder": "Düzenleyicideki uyarı karalamalarının kenarlık rengi.",
-	"infoForeground": "Düzenleyicideki bilgilendirme karalamalarının ön plan rengi.",
-	"infoBorder": "Düzenleyicideki bilgilendirme karalamalarının kenarlık rengi.",
-	"hintForeground": "Düzenleyicideki ipucu karalamalarının ön plan rengi.",
-	"hintBorder": "Düzenleyicideki ipucu karalamalarının kenarlık rengi.",
-	"unnecessaryForeground": "Düzenleyicide gereksiz kodun ön plan rengi.",
-	"overviewRulerRangeHighlight": "Aralık vurguları için genel bakış cetvelinin işaretleyici rengi. Altta yer alan süslemeleri gizlememek için renk opak olmamalıdır.",
-	"overviewRuleError": "Hatalar için genel bakış cetvelinin işaretleyici rengi.",
-	"overviewRuleWarning": "Uyarılar için genel bakış cetvelinin işaretleyici rengi.",
-	"overviewRuleInfo": "Bilgilendirmeler için genel bakış cetvelinin işaretleyici rengi."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/editor/contrib/bracketMatching/bracketMatching.i18n.json b/i18n/trk/src/vs/editor/contrib/bracketMatching/bracketMatching.i18n.json
deleted file mode 100644
index 4dcdf3f519f..00000000000
--- a/i18n/trk/src/vs/editor/contrib/bracketMatching/bracketMatching.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"overviewRulerBracketMatchForeground": "Eşleşen ayraçlar için genel bakış cetvelinin işaretleyici rengi.",
-	"smartSelect.jumpBracket": "Ayraca Git",
-	"smartSelect.selectToBracket": "Ayraca Kadar Seç"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/editor/contrib/bracketMatching/common/bracketMatching.i18n.json b/i18n/trk/src/vs/editor/contrib/bracketMatching/common/bracketMatching.i18n.json
deleted file mode 100644
index 1c4928f4039..00000000000
--- a/i18n/trk/src/vs/editor/contrib/bracketMatching/common/bracketMatching.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"smartSelect.jumpBracket": "Ayraca Git"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/editor/contrib/caretOperations/caretOperations.i18n.json b/i18n/trk/src/vs/editor/contrib/caretOperations/caretOperations.i18n.json
deleted file mode 100644
index 24711c1bc5d..00000000000
--- a/i18n/trk/src/vs/editor/contrib/caretOperations/caretOperations.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"caret.moveLeft": "İmleci Sola Taşı",
-	"caret.moveRight": "İmleci Sağa Taşı"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/editor/contrib/caretOperations/common/caretOperations.i18n.json b/i18n/trk/src/vs/editor/contrib/caretOperations/common/caretOperations.i18n.json
deleted file mode 100644
index c5196837029..00000000000
--- a/i18n/trk/src/vs/editor/contrib/caretOperations/common/caretOperations.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"caret.moveLeft": "İmleci Sola Taşı",
-	"caret.moveRight": "İmleci Sağa Taşı"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/editor/contrib/caretOperations/common/transpose.i18n.json b/i18n/trk/src/vs/editor/contrib/caretOperations/common/transpose.i18n.json
deleted file mode 100644
index 5ee978f2342..00000000000
--- a/i18n/trk/src/vs/editor/contrib/caretOperations/common/transpose.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"transposeLetters.label": "Harfleri Birbirleriyle Değiştir"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/editor/contrib/caretOperations/transpose.i18n.json b/i18n/trk/src/vs/editor/contrib/caretOperations/transpose.i18n.json
deleted file mode 100644
index ae289c12f1a..00000000000
--- a/i18n/trk/src/vs/editor/contrib/caretOperations/transpose.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"transposeLetters.label": "Harfleri Birbirleriyle Değiştir"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/editor/contrib/clipboard/browser/clipboard.i18n.json b/i18n/trk/src/vs/editor/contrib/clipboard/browser/clipboard.i18n.json
deleted file mode 100644
index 768e8e3511f..00000000000
--- a/i18n/trk/src/vs/editor/contrib/clipboard/browser/clipboard.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"actions.clipboard.cutLabel": "Kes",
-	"actions.clipboard.copyLabel": "Kopyala",
-	"actions.clipboard.pasteLabel": "Yapıştır",
-	"actions.clipboard.copyWithSyntaxHighlightingLabel": "Sentaks Vurgulaması İle Kopyala"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/editor/contrib/clipboard/clipboard.i18n.json b/i18n/trk/src/vs/editor/contrib/clipboard/clipboard.i18n.json
deleted file mode 100644
index f11a68efee1..00000000000
--- a/i18n/trk/src/vs/editor/contrib/clipboard/clipboard.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"actions.clipboard.cutLabel": "Kes",
-	"actions.clipboard.copyLabel": "Kopyala",
-	"actions.clipboard.pasteLabel": "Yapıştır",
-	"actions.clipboard.copyWithSyntaxHighlightingLabel": "Sentaks Vurgulaması İle Kopyala"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/editor/contrib/codeAction/codeActionCommands.i18n.json b/i18n/trk/src/vs/editor/contrib/codeAction/codeActionCommands.i18n.json
deleted file mode 100644
index ef87b0b1733..00000000000
--- a/i18n/trk/src/vs/editor/contrib/codeAction/codeActionCommands.i18n.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"quickFixWithKb": "Düzeltmeleri Göster ({0})",
-	"quickFix": "Düzeltmeleri Göster",
-	"quickfix.trigger.label": "Hızlı Düzeltme...",
-	"editor.action.quickFix.noneMessage": "Hiçbir kod eylemi mevcut değil",
-	"refactor.label": "Elden Geçir...",
-	"editor.action.refactor.noneMessage": "Elden geçirme mevcut değil",
-	"source.label": "Kaynak Eylemi...",
-	"editor.action.source.noneMessage": "Hiçbir kaynak eylemi mevcut değil",
-	"organizeImports.label": "İçe Aktarımları Düzenle",
-	"editor.action.organize.noneMessage": "İçe aktarımları düzenle eylemi mevcut değil"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/editor/contrib/comment/comment.i18n.json b/i18n/trk/src/vs/editor/contrib/comment/comment.i18n.json
deleted file mode 100644
index 436ee3b2dbf..00000000000
--- a/i18n/trk/src/vs/editor/contrib/comment/comment.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"comment.line": "Satır Yorumunu Aç/Kapat",
-	"comment.line.add": "Satır Açıklaması Ekle",
-	"comment.line.remove": "Satır Açıklamasını Kaldır",
-	"comment.block": "Yorum Bloğunu Aç/Kapat"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/editor/contrib/comment/common/comment.i18n.json b/i18n/trk/src/vs/editor/contrib/comment/common/comment.i18n.json
deleted file mode 100644
index 30ac850837c..00000000000
--- a/i18n/trk/src/vs/editor/contrib/comment/common/comment.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"comment.line": "Satır Yorumunu Aç/Kapat",
-	"comment.line.add": "Satır Açıklaması Ekle",
-	"comment.line.remove": "Satır Açıklamasını Kaldır",
-	"comment.block": "Yorum Bloğunu Aç/Kapat"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/editor/contrib/contextmenu/browser/contextmenu.i18n.json b/i18n/trk/src/vs/editor/contrib/contextmenu/browser/contextmenu.i18n.json
deleted file mode 100644
index fbed2327052..00000000000
--- a/i18n/trk/src/vs/editor/contrib/contextmenu/browser/contextmenu.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"action.showContextMenu.label": "Düzenleyici Bağlam Menüsünü Göster"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/editor/contrib/contextmenu/contextmenu.i18n.json b/i18n/trk/src/vs/editor/contrib/contextmenu/contextmenu.i18n.json
deleted file mode 100644
index ad7c850a5e9..00000000000
--- a/i18n/trk/src/vs/editor/contrib/contextmenu/contextmenu.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"action.showContextMenu.label": "Düzenleyici Bağlam Menüsünü Göster"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/editor/contrib/find/browser/findWidget.i18n.json b/i18n/trk/src/vs/editor/contrib/find/browser/findWidget.i18n.json
deleted file mode 100644
index 265b74d65a5..00000000000
--- a/i18n/trk/src/vs/editor/contrib/find/browser/findWidget.i18n.json
+++ /dev/null
@@ -1,21 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"label.find": "Bul",
-	"placeholder.find": "Bul",
-	"label.previousMatchButton": "Önceki eşleşme",
-	"label.nextMatchButton": "Sonraki eşleşme",
-	"label.toggleSelectionFind": "Seçimde bul",
-	"label.closeButton": "Kapat",
-	"label.replace": "Değiştir",
-	"placeholder.replace": "Değiştir",
-	"label.replaceButton": "Değiştir",
-	"label.replaceAllButton": "Tümünü Değiştir",
-	"label.toggleReplaceButton": "Değiştirme modunu değiştir",
-	"title.matchesCountLimit": "Sadece ilk {0} sonuç vurgulandı, fakat metnin tamamında tüm arama işlemleri çalışıyor.",
-	"label.matchesLocation": "{0}/{1}",
-	"label.noResults": "Sonuç Yok"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/editor/contrib/find/browser/simpleFindWidget.i18n.json b/i18n/trk/src/vs/editor/contrib/find/browser/simpleFindWidget.i18n.json
deleted file mode 100644
index baad53fc2a4..00000000000
--- a/i18n/trk/src/vs/editor/contrib/find/browser/simpleFindWidget.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"label.find": "Bul",
-	"placeholder.find": "Bul",
-	"label.previousMatchButton": "Önceki eşleşme",
-	"label.nextMatchButton": "Sonraki eşleşme",
-	"label.closeButton": "Kapat"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/editor/contrib/find/common/findController.i18n.json b/i18n/trk/src/vs/editor/contrib/find/common/findController.i18n.json
deleted file mode 100644
index d6d3fc6ccf3..00000000000
--- a/i18n/trk/src/vs/editor/contrib/find/common/findController.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"startFindAction": "Bul",
-	"findNextMatchAction": "Sonrakini Bul",
-	"findPreviousMatchAction": "Öncekini Bul",
-	"nextSelectionMatchFindAction": "Sonraki Seçimi Bul",
-	"previousSelectionMatchFindAction": "Önceki Seçimi Bul",
-	"startReplace": "Değiştir",
-	"showNextFindTermAction": "Sonraki Arama Terimini Göster",
-	"showPreviousFindTermAction": "Önceki Arama Terimini Göster"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/editor/contrib/find/findController.i18n.json b/i18n/trk/src/vs/editor/contrib/find/findController.i18n.json
deleted file mode 100644
index f3288f46b97..00000000000
--- a/i18n/trk/src/vs/editor/contrib/find/findController.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"startFindAction": "Bul",
-	"startFindWithSelectionAction": "Seçimdekini Bul",
-	"findNextMatchAction": "Sonrakini Bul",
-	"findPreviousMatchAction": "Öncekini Bul",
-	"nextSelectionMatchFindAction": "Sonraki Seçimi Bul",
-	"previousSelectionMatchFindAction": "Önceki Seçimi Bul",
-	"startReplace": "Değiştir",
-	"showNextFindTermAction": "Sonraki Arama Terimini Göster",
-	"showPreviousFindTermAction": "Önceki Arama Terimini Göster"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/editor/contrib/find/findWidget.i18n.json b/i18n/trk/src/vs/editor/contrib/find/findWidget.i18n.json
deleted file mode 100644
index b4995384085..00000000000
--- a/i18n/trk/src/vs/editor/contrib/find/findWidget.i18n.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"label.find": "Bul",
-	"placeholder.find": "Bul",
-	"label.previousMatchButton": "Önceki eşleşme",
-	"label.nextMatchButton": "Sonraki eşleşme",
-	"label.toggleSelectionFind": "Seçimde bul",
-	"label.closeButton": "Kapat",
-	"label.replace": "Değiştir",
-	"placeholder.replace": "Değiştir",
-	"label.replaceButton": "Değiştir",
-	"label.replaceAllButton": "Tümünü Değiştir",
-	"label.toggleReplaceButton": "Değiştirme modunu değiştir",
-	"title.matchesCountLimit": "Sadece ilk {0} sonuç vurgulandı, fakat metnin tamamında tüm arama işlemleri çalışıyor.",
-	"label.matchesLocation": "{0}/{1}",
-	"label.noResults": "Sonuç Yok"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/editor/contrib/find/simpleFindWidget.i18n.json b/i18n/trk/src/vs/editor/contrib/find/simpleFindWidget.i18n.json
deleted file mode 100644
index 55b51e917db..00000000000
--- a/i18n/trk/src/vs/editor/contrib/find/simpleFindWidget.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"label.find": "Bul",
-	"placeholder.find": "Bul",
-	"label.previousMatchButton": "Önceki eşleşme",
-	"label.nextMatchButton": "Sonraki eşleşme",
-	"label.closeButton": "Kapat"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/editor/contrib/folding/browser/folding.i18n.json b/i18n/trk/src/vs/editor/contrib/folding/browser/folding.i18n.json
deleted file mode 100644
index 084b78eafff..00000000000
--- a/i18n/trk/src/vs/editor/contrib/folding/browser/folding.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"unfoldAction.label": "Katlamayı Aç",
-	"unFoldRecursivelyAction.label": "Katlamaları Özyinelemeli Olarak Aç",
-	"foldAction.label": "Katla",
-	"foldRecursivelyAction.label": "Özyinelemeli Olarak Katla",
-	"foldAllAction.label": "Hepsini Katla",
-	"unfoldAllAction.label": "Tüm Katlamaları Aç",
-	"foldLevelAction.label": "{0}. Düzeyi Katla"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/editor/contrib/folding/folding.i18n.json b/i18n/trk/src/vs/editor/contrib/folding/folding.i18n.json
deleted file mode 100644
index 6391e4c6c42..00000000000
--- a/i18n/trk/src/vs/editor/contrib/folding/folding.i18n.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"unfoldAction.label": "Katlamayı Aç",
-	"unFoldRecursivelyAction.label": "Katlamaları Özyinelemeli Olarak Aç",
-	"foldAction.label": "Katla",
-	"foldRecursivelyAction.label": "Özyinelemeli Olarak Katla",
-	"foldAllBlockComments.label": "Tüm Yorum Bloklarını Katla",
-	"foldAllMarkerRegions.label": "Tüm Bölgeleri Katla",
-	"unfoldAllMarkerRegions.label": "Tüm Bölgelerdeki Katlamayı Aç",
-	"foldAllAction.label": "Hepsini Katla",
-	"unfoldAllAction.label": "Tüm Katlamaları Aç",
-	"foldLevelAction.label": "{0}. Düzeyi Katla"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/editor/contrib/fontZoom/fontZoom.i18n.json b/i18n/trk/src/vs/editor/contrib/fontZoom/fontZoom.i18n.json
deleted file mode 100644
index d3b04670fbe..00000000000
--- a/i18n/trk/src/vs/editor/contrib/fontZoom/fontZoom.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"EditorFontZoomIn.label": "Editör Yazı Tipi Yakınlaştır",
-	"EditorFontZoomOut.label": "Editör Yazı Tipi Küçült",
-	"EditorFontZoomReset.label": "Editör Yazı Tipi Sıfırla"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/editor/contrib/format/browser/formatActions.i18n.json b/i18n/trk/src/vs/editor/contrib/format/browser/formatActions.i18n.json
deleted file mode 100644
index 52d2abe3a3d..00000000000
--- a/i18n/trk/src/vs/editor/contrib/format/browser/formatActions.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"hint11": "{0}. satırda 1 biçimlendirme düzenlemesi yapıldı",
-	"hintn1": "{1}. satırda {0} biçimlendirme düzenlemesi yapıldı",
-	"hint1n": "{0} ve {1} satırları arasında 1 biçimlendirme düzenlemesi yapıldı",
-	"hintnn": "{1} ve {2} satırları arasında {0} biçimlendirme düzenlemesi yapıldı",
-	"no.provider": "Maalesef, '{0}' dosyaları için yüklenmiş bir biçimlendirici yok.",
-	"formatDocument.label": "Belgeyi Biçimlendir",
-	"formatSelection.label": "Seçimi Biçimlendir"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/editor/contrib/format/formatActions.i18n.json b/i18n/trk/src/vs/editor/contrib/format/formatActions.i18n.json
deleted file mode 100644
index ac6899d0f4b..00000000000
--- a/i18n/trk/src/vs/editor/contrib/format/formatActions.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hint11": "{0}. satırda 1 biçimlendirme düzenlemesi yapıldı",
-	"hintn1": "{1}. satırda {0} biçimlendirme düzenlemesi yapıldı",
-	"hint1n": "{0} ve {1} satırları arasında 1 biçimlendirme düzenlemesi yapıldı",
-	"hintnn": "{1} ve {2} satırları arasında {0} biçimlendirme düzenlemesi yapıldı",
-	"no.provider": "'{0}' dosyaları için yüklenmiş bir biçimlendirici yok.",
-	"formatDocument.label": "Belgeyi Biçimlendir",
-	"no.documentprovider": "'{0}' dosyaları için yüklenmiş bir doküman biçimlendiricisi yok.",
-	"formatSelection.label": "Seçimi Biçimlendir",
-	"no.selectionprovider": "'{0}' dosyaları için yüklenmiş bir seçim biçimlendiricisi yok."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/editor/contrib/goToDeclaration/browser/goToDeclarationCommands.i18n.json b/i18n/trk/src/vs/editor/contrib/goToDeclaration/browser/goToDeclarationCommands.i18n.json
deleted file mode 100644
index fae99c4c772..00000000000
--- a/i18n/trk/src/vs/editor/contrib/goToDeclaration/browser/goToDeclarationCommands.i18n.json
+++ /dev/null
@@ -1,23 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"noResultWord": "'{0}' için tanım bulunamadı",
-	"generic.noResults": "Tanım bulunamadı",
-	"meta.title": " – {0} tanım",
-	"actions.goToDecl.label": "Tanıma Git",
-	"actions.goToDeclToSide.label": "Tanımı Yana Aç",
-	"actions.previewDecl.label": "Tanıma Göz At",
-	"goToImplementation.noResultWord": "'{0}' için uygulama bulunamadı",
-	"goToImplementation.generic.noResults": "Uygulama bulunamadı",
-	"meta.implementations.title": " – {0} uygulama",
-	"actions.goToImplementation.label": "Uygulamaya Git",
-	"actions.peekImplementation.label": "Uygulamaya Göz At",
-	"goToTypeDefinition.noResultWord": "'{0}' için tür tanımı bulunamadı",
-	"goToTypeDefinition.generic.noResults": "Tür tanımı bulunamadı",
-	"meta.typeDefinitions.title": " – {0} tür tanımı",
-	"actions.goToTypeDefinition.label": "Tür Tanımına Git",
-	"actions.peekTypeDefinition.label": "Tür Tanımına Göz At"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/editor/contrib/goToDeclaration/browser/goToDeclarationMouse.i18n.json b/i18n/trk/src/vs/editor/contrib/goToDeclaration/browser/goToDeclarationMouse.i18n.json
deleted file mode 100644
index 010de11a57d..00000000000
--- a/i18n/trk/src/vs/editor/contrib/goToDeclaration/browser/goToDeclarationMouse.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"multipleResults": "{0} tanımı göstermek için tıklayın."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/editor/contrib/goToDeclaration/goToDeclarationCommands.i18n.json b/i18n/trk/src/vs/editor/contrib/goToDeclaration/goToDeclarationCommands.i18n.json
deleted file mode 100644
index 34c727b4134..00000000000
--- a/i18n/trk/src/vs/editor/contrib/goToDeclaration/goToDeclarationCommands.i18n.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noResultWord": "'{0}' için tanım bulunamadı",
-	"generic.noResults": "Tanım bulunamadı",
-	"meta.title": " – {0} tanım",
-	"actions.goToDecl.label": "Tanıma Git",
-	"actions.goToDeclToSide.label": "Tanımı Yana Aç",
-	"actions.previewDecl.label": "Tanıma Göz At",
-	"goToImplementation.noResultWord": "'{0}' için uygulama bulunamadı",
-	"goToImplementation.generic.noResults": "Uygulama bulunamadı",
-	"meta.implementations.title": " – {0} uygulama",
-	"actions.goToImplementation.label": "Uygulamaya Git",
-	"actions.peekImplementation.label": "Uygulamaya Göz At",
-	"goToTypeDefinition.noResultWord": "'{0}' için tür tanımı bulunamadı",
-	"goToTypeDefinition.generic.noResults": "Tür tanımı bulunamadı",
-	"meta.typeDefinitions.title": " – {0} tür tanımı",
-	"actions.goToTypeDefinition.label": "Tür Tanımına Git",
-	"actions.peekTypeDefinition.label": "Tür Tanımına Göz At"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/editor/contrib/goToDeclaration/goToDeclarationMouse.i18n.json b/i18n/trk/src/vs/editor/contrib/goToDeclaration/goToDeclarationMouse.i18n.json
deleted file mode 100644
index 0fbfea46ae5..00000000000
--- a/i18n/trk/src/vs/editor/contrib/goToDeclaration/goToDeclarationMouse.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"multipleResults": "{0} tanımı göstermek için tıklayın."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/editor/contrib/goToDefinition/goToDefinitionCommands.i18n.json b/i18n/trk/src/vs/editor/contrib/goToDefinition/goToDefinitionCommands.i18n.json
deleted file mode 100644
index 34c727b4134..00000000000
--- a/i18n/trk/src/vs/editor/contrib/goToDefinition/goToDefinitionCommands.i18n.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noResultWord": "'{0}' için tanım bulunamadı",
-	"generic.noResults": "Tanım bulunamadı",
-	"meta.title": " – {0} tanım",
-	"actions.goToDecl.label": "Tanıma Git",
-	"actions.goToDeclToSide.label": "Tanımı Yana Aç",
-	"actions.previewDecl.label": "Tanıma Göz At",
-	"goToImplementation.noResultWord": "'{0}' için uygulama bulunamadı",
-	"goToImplementation.generic.noResults": "Uygulama bulunamadı",
-	"meta.implementations.title": " – {0} uygulama",
-	"actions.goToImplementation.label": "Uygulamaya Git",
-	"actions.peekImplementation.label": "Uygulamaya Göz At",
-	"goToTypeDefinition.noResultWord": "'{0}' için tür tanımı bulunamadı",
-	"goToTypeDefinition.generic.noResults": "Tür tanımı bulunamadı",
-	"meta.typeDefinitions.title": " – {0} tür tanımı",
-	"actions.goToTypeDefinition.label": "Tür Tanımına Git",
-	"actions.peekTypeDefinition.label": "Tür Tanımına Göz At"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/editor/contrib/goToDefinition/goToDefinitionMouse.i18n.json b/i18n/trk/src/vs/editor/contrib/goToDefinition/goToDefinitionMouse.i18n.json
deleted file mode 100644
index 0fbfea46ae5..00000000000
--- a/i18n/trk/src/vs/editor/contrib/goToDefinition/goToDefinitionMouse.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"multipleResults": "{0} tanımı göstermek için tıklayın."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/editor/contrib/gotoError/browser/gotoError.i18n.json b/i18n/trk/src/vs/editor/contrib/gotoError/browser/gotoError.i18n.json
deleted file mode 100644
index 6bc3935d6f4..00000000000
--- a/i18n/trk/src/vs/editor/contrib/gotoError/browser/gotoError.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"title.wo_source": "({0}/{1})",
-	"markerAction.next.label": "Sonraki Hata veya Uyarıya Git",
-	"markerAction.previous.label": "Önceki Hata veya Uyarıya Git",
-	"editorMarkerNavigationError": "Düzenleyicinin işaretçi gezinti aracının hata rengi.",
-	"editorMarkerNavigationWarning": "Düzenleyicinin işaretçi gezinti aracının uyarı rengi.",
-	"editorMarkerNavigationInfo": "Düzenleyicinin işaretçi gezinti aracının bilgilendirme rengi.",
-	"editorMarkerNavigationBackground": "Düzenleyicinin işaretçi gezinti aracının arka planı."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/editor/contrib/gotoError/gotoError.i18n.json b/i18n/trk/src/vs/editor/contrib/gotoError/gotoError.i18n.json
deleted file mode 100644
index 8f00d61b2f9..00000000000
--- a/i18n/trk/src/vs/editor/contrib/gotoError/gotoError.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"markerAction.next.label": "Sonraki Soruna Git (Hata, Uyarı, Bilgi)",
-	"markerAction.previous.label": "Önceki Soruna Git (Hata, Uyarı, Bilgi)",
-	"markerAction.nextInFiles.label": "Dosyalarda Sonraki Soruna Git (Hata, Uyarı, Bilgi)",
-	"markerAction.previousInFiles.label": "Dosyalarda Önceki Soruna Git (Hata, Uyarı, Bilgi)"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json b/i18n/trk/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json
deleted file mode 100644
index c3b60a4637d..00000000000
--- a/i18n/trk/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"title.wo_source": "({0}/{1})",
-	"editorMarkerNavigationError": "Düzenleyicinin işaretçi gezinti aracının hata rengi.",
-	"editorMarkerNavigationWarning": "Düzenleyicinin işaretçi gezinti aracının uyarı rengi.",
-	"editorMarkerNavigationInfo": "Düzenleyicinin işaretçi gezinti aracının bilgilendirme rengi.",
-	"editorMarkerNavigationBackground": "Düzenleyicinin işaretçi gezinti aracının arka planı."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/editor/contrib/hover/browser/hover.i18n.json b/i18n/trk/src/vs/editor/contrib/hover/browser/hover.i18n.json
deleted file mode 100644
index e1a33122702..00000000000
--- a/i18n/trk/src/vs/editor/contrib/hover/browser/hover.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"showHover": "Bağlantı Vurgusunu Göster"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/editor/contrib/hover/browser/modesContentHover.i18n.json b/i18n/trk/src/vs/editor/contrib/hover/browser/modesContentHover.i18n.json
deleted file mode 100644
index 1b70c63296f..00000000000
--- a/i18n/trk/src/vs/editor/contrib/hover/browser/modesContentHover.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"modesContentHover.loading": "Yükleniyor..."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/editor/contrib/hover/hover.i18n.json b/i18n/trk/src/vs/editor/contrib/hover/hover.i18n.json
deleted file mode 100644
index 79b1ee67b2f..00000000000
--- a/i18n/trk/src/vs/editor/contrib/hover/hover.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"showHover": "Bağlantı Vurgusunu Göster"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/editor/contrib/hover/modesContentHover.i18n.json b/i18n/trk/src/vs/editor/contrib/hover/modesContentHover.i18n.json
deleted file mode 100644
index 36434db5ab5..00000000000
--- a/i18n/trk/src/vs/editor/contrib/hover/modesContentHover.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"modesContentHover.loading": "Yükleniyor..."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/editor/contrib/inPlaceReplace/common/inPlaceReplace.i18n.json b/i18n/trk/src/vs/editor/contrib/inPlaceReplace/common/inPlaceReplace.i18n.json
deleted file mode 100644
index bb4caacacb1..00000000000
--- a/i18n/trk/src/vs/editor/contrib/inPlaceReplace/common/inPlaceReplace.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"InPlaceReplaceAction.previous.label": "Önceki Değerle Değiştir",
-	"InPlaceReplaceAction.next.label": "Sonraki Değerle Değiştir"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/editor/contrib/inPlaceReplace/inPlaceReplace.i18n.json b/i18n/trk/src/vs/editor/contrib/inPlaceReplace/inPlaceReplace.i18n.json
deleted file mode 100644
index c0427c864e9..00000000000
--- a/i18n/trk/src/vs/editor/contrib/inPlaceReplace/inPlaceReplace.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"InPlaceReplaceAction.previous.label": "Önceki Değerle Değiştir",
-	"InPlaceReplaceAction.next.label": "Sonraki Değerle Değiştir"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/editor/contrib/indentation/common/indentation.i18n.json b/i18n/trk/src/vs/editor/contrib/indentation/common/indentation.i18n.json
deleted file mode 100644
index 76b8b3c8391..00000000000
--- a/i18n/trk/src/vs/editor/contrib/indentation/common/indentation.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"indentationToSpaces": "Girintiyi Boşluklara Dönüştür",
-	"indentationToTabs": "Girintiyi Sekmelere Dönüştür",
-	"configuredTabSize": "Yapılandırılmış Sekme Boyutu",
-	"selectTabWidth": "Geçerli Dosya İçin Sekme Boyutunu Seç",
-	"indentUsingTabs": "Sekme Kullanarak Girintile",
-	"indentUsingSpaces": "Boşluk Kullanarak Girintile",
-	"detectIndentation": "Girintiyi, İçeriği Kontrol Ederek Algıla",
-	"editor.reindentlines": "Satır Girintilerini Yeniden Ayarla"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/editor/contrib/indentation/indentation.i18n.json b/i18n/trk/src/vs/editor/contrib/indentation/indentation.i18n.json
deleted file mode 100644
index 67b5b68b41d..00000000000
--- a/i18n/trk/src/vs/editor/contrib/indentation/indentation.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"indentationToSpaces": "Girintiyi Boşluklara Dönüştür",
-	"indentationToTabs": "Girintiyi Sekmelere Dönüştür",
-	"configuredTabSize": "Yapılandırılmış Sekme Boyutu",
-	"selectTabWidth": "Geçerli Dosya İçin Sekme Boyutunu Seç",
-	"indentUsingTabs": "Sekme Kullanarak Girintile",
-	"indentUsingSpaces": "Boşluk Kullanarak Girintile",
-	"detectIndentation": "Girintiyi, İçeriği Kontrol Ederek Algıla",
-	"editor.reindentlines": "Satır Girintilerini Yeniden Ayarla",
-	"editor.reindentselectedlines": "Seçili Satırların Girintilerini Yeniden Ayarla"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/editor/contrib/linesOperations/common/linesOperations.i18n.json b/i18n/trk/src/vs/editor/contrib/linesOperations/common/linesOperations.i18n.json
deleted file mode 100644
index 4ae7163c50c..00000000000
--- a/i18n/trk/src/vs/editor/contrib/linesOperations/common/linesOperations.i18n.json
+++ /dev/null
@@ -1,25 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"lines.copyUp": "Satırı Yukarı Kopyala",
-	"lines.copyDown": "Satırı Aşağı Kopyala",
-	"lines.moveUp": "Satırı Yukarı Taşı",
-	"lines.moveDown": "Satırı Aşağı Taşı",
-	"lines.sortAscending": "Satırları Artan Şekilde Sırala",
-	"lines.sortDescending": "Satırları Azalan Şekilde Sırala",
-	"lines.trimTrailingWhitespace": "Sondaki Boşluğu Kırp",
-	"lines.delete": "Satırı Sil",
-	"lines.indent": "Satırı Girintile",
-	"lines.outdent": "Satırın Girintisini Azalt",
-	"lines.insertBefore": "Üste Satır Ekle",
-	"lines.insertAfter": "Alta Satır Ekle",
-	"lines.deleteAllLeft": "Soldaki Her Şeyi Sil",
-	"lines.deleteAllRight": "Sağdaki Her Şeyi Sil",
-	"lines.joinLines": "Satırları Birleştir",
-	"editor.transpose": "İmlecin etrafındaki karakterleri birbirleriyle değiştir",
-	"editor.transformToUppercase": "Büyük Harfe Dönüştür",
-	"editor.transformToLowercase": "Küçük Harfe Dönüştür"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/editor/contrib/linesOperations/linesOperations.i18n.json b/i18n/trk/src/vs/editor/contrib/linesOperations/linesOperations.i18n.json
deleted file mode 100644
index 34169b73889..00000000000
--- a/i18n/trk/src/vs/editor/contrib/linesOperations/linesOperations.i18n.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"lines.copyUp": "Satırı Yukarı Kopyala",
-	"lines.copyDown": "Satırı Aşağı Kopyala",
-	"lines.moveUp": "Satırı Yukarı Taşı",
-	"lines.moveDown": "Satırı Aşağı Taşı",
-	"lines.sortAscending": "Satırları Artan Şekilde Sırala",
-	"lines.sortDescending": "Satırları Azalan Şekilde Sırala",
-	"lines.trimTrailingWhitespace": "Sondaki Boşluğu Kırp",
-	"lines.delete": "Satırı Sil",
-	"lines.indent": "Satırı Girintile",
-	"lines.outdent": "Satırın Girintisini Azalt",
-	"lines.insertBefore": "Üste Satır Ekle",
-	"lines.insertAfter": "Alta Satır Ekle",
-	"lines.deleteAllLeft": "Soldaki Her Şeyi Sil",
-	"lines.deleteAllRight": "Sağdaki Her Şeyi Sil",
-	"lines.joinLines": "Satırları Birleştir",
-	"editor.transpose": "İmlecin etrafındaki karakterleri birbirleriyle değiştir",
-	"editor.transformToUppercase": "Büyük Harfe Dönüştür",
-	"editor.transformToLowercase": "Küçük Harfe Dönüştür"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/editor/contrib/links/browser/links.i18n.json b/i18n/trk/src/vs/editor/contrib/links/browser/links.i18n.json
deleted file mode 100644
index 7f51a75306c..00000000000
--- a/i18n/trk/src/vs/editor/contrib/links/browser/links.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"links.navigate.mac": "Bağlantıyı izlemek için Cmd tuşuna basarak tıklayın",
-	"links.navigate": "Bağlantıyı izlemek için Ctrl tuşuna basarak tıklayın",
-	"links.command.mac": "Komutu yürütmek için Cmd + tıklama yapın",
-	"links.command": "Komutu yürütmek için Ctrl + tıklama yapın",
-	"links.navigate.al": "Bağlantıyı izlemek için Alt tuşuna basarak tıklayın",
-	"links.command.al": "Komutu yürütmek için Alt + tıklama yapın",
-	"invalid.url": "Üzgünüz, bu bağlantı iyi oluşturulmamış olduğu için açılamadı: {0}",
-	"missing.url": "Üzgünüz; bu bağlantı, hedefi eksik olduğu için açılamadı.",
-	"label": "Bağlantıyı Aç"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/editor/contrib/links/links.i18n.json b/i18n/trk/src/vs/editor/contrib/links/links.i18n.json
deleted file mode 100644
index d6596ab7e09..00000000000
--- a/i18n/trk/src/vs/editor/contrib/links/links.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"links.navigate.mac": "Bağlantıyı izlemek için Cmd tuşuna basarak tıklayın",
-	"links.navigate": "Bağlantıyı izlemek için Ctrl tuşuna basarak tıklayın",
-	"links.command.mac": "Komutu çalıştırmak için Cmd tuşuna basarak tıklayın",
-	"links.command": "Komutu çalıştırmak için Ctrl tuşuna basarak tıklayın",
-	"links.navigate.al.mac": "Bağlantıyı izlemek için Option tuşuna basarak tıklayın",
-	"links.navigate.al": "Bağlantıyı izlemek için Alt tuşuna basarak tıklayın",
-	"links.command.al.mac": "Komutu çalıştırmak için Option tuşuna basarak tıklayın ",
-	"links.command.al": "Komutu çalıştırmak için Alt tuşuna basarak tıklayın",
-	"invalid.url": "Bu bağlantı iyi oluştrulmamış olduğu için açılamadı: {0}",
-	"missing.url": "Bu bağlantı hedefi eksik olduğu için açılamadı.",
-	"label": "Bağlantıyı Aç"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/editor/contrib/message/messageController.i18n.json b/i18n/trk/src/vs/editor/contrib/message/messageController.i18n.json
deleted file mode 100644
index 61231658c0d..00000000000
--- a/i18n/trk/src/vs/editor/contrib/message/messageController.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"editor.readonly": "Salt okunur düzenleyicide düzenleme yapılamıyor"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/editor/contrib/multicursor/common/multicursor.i18n.json b/i18n/trk/src/vs/editor/contrib/multicursor/common/multicursor.i18n.json
deleted file mode 100644
index 899e10e4b02..00000000000
--- a/i18n/trk/src/vs/editor/contrib/multicursor/common/multicursor.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"mutlicursor.insertAbove": "Yukarıya İmleç Ekle",
-	"mutlicursor.insertBelow": "Aşağıya İmleç Ekle",
-	"mutlicursor.insertAtEndOfEachLineSelected": "Satır Sonlarına İmleç Ekle",
-	"addSelectionToNextFindMatch": "Seçimi Sonraki Bulunan Eşleşmeye Ekle",
-	"addSelectionToPreviousFindMatch": "Seçimi Önceki Bulunan Eşleşmeye Ekle",
-	"moveSelectionToNextFindMatch": "Son Seçimi Sonraki Bulunan Eşleşmeye Taşı",
-	"moveSelectionToPreviousFindMatch": "Son Seçimi Önceki Bulunan Eşleşmeye Taşı",
-	"selectAllOccurrencesOfFindMatch": "Bulunan Eşleşmenin Tüm Tekrarlamalarını Seç",
-	"changeAll.label": "Tüm Tekrarlamaları Değiştir"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/editor/contrib/multicursor/multicursor.i18n.json b/i18n/trk/src/vs/editor/contrib/multicursor/multicursor.i18n.json
deleted file mode 100644
index 16d2537cee5..00000000000
--- a/i18n/trk/src/vs/editor/contrib/multicursor/multicursor.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"mutlicursor.insertAbove": "Yukarıya İmleç Ekle",
-	"mutlicursor.insertBelow": "Aşağıya İmleç Ekle",
-	"mutlicursor.insertAtEndOfEachLineSelected": "Satır Sonlarına İmleç Ekle",
-	"addSelectionToNextFindMatch": "Seçimi Sonraki Bulunan Eşleşmeye Ekle",
-	"addSelectionToPreviousFindMatch": "Seçimi Önceki Bulunan Eşleşmeye Ekle",
-	"moveSelectionToNextFindMatch": "Son Seçimi Sonraki Bulunan Eşleşmeye Taşı",
-	"moveSelectionToPreviousFindMatch": "Son Seçimi Önceki Bulunan Eşleşmeye Taşı",
-	"selectAllOccurrencesOfFindMatch": "Bulunan Eşleşmenin Tüm Tekrarlamalarını Seç",
-	"changeAll.label": "Tüm Tekrarlamaları Değiştir"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/editor/contrib/parameterHints/browser/parameterHints.i18n.json b/i18n/trk/src/vs/editor/contrib/parameterHints/browser/parameterHints.i18n.json
deleted file mode 100644
index b7a4e43b2b6..00000000000
--- a/i18n/trk/src/vs/editor/contrib/parameterHints/browser/parameterHints.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"parameterHints.trigger.label": "Parametre İpuçlarını Tetikle"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/editor/contrib/parameterHints/browser/parameterHintsWidget.i18n.json b/i18n/trk/src/vs/editor/contrib/parameterHints/browser/parameterHintsWidget.i18n.json
deleted file mode 100644
index ed56fe64626..00000000000
--- a/i18n/trk/src/vs/editor/contrib/parameterHints/browser/parameterHintsWidget.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"hint": "{0}, ipucu"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/editor/contrib/parameterHints/parameterHints.i18n.json b/i18n/trk/src/vs/editor/contrib/parameterHints/parameterHints.i18n.json
deleted file mode 100644
index 9fdef68a94d..00000000000
--- a/i18n/trk/src/vs/editor/contrib/parameterHints/parameterHints.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"parameterHints.trigger.label": "Parametre İpuçlarını Tetikle"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/editor/contrib/parameterHints/parameterHintsWidget.i18n.json b/i18n/trk/src/vs/editor/contrib/parameterHints/parameterHintsWidget.i18n.json
deleted file mode 100644
index fe6619c538c..00000000000
--- a/i18n/trk/src/vs/editor/contrib/parameterHints/parameterHintsWidget.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hint": "{0}, ipucu"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/editor/contrib/quickFix/browser/quickFixCommands.i18n.json b/i18n/trk/src/vs/editor/contrib/quickFix/browser/quickFixCommands.i18n.json
deleted file mode 100644
index 86586e96e0a..00000000000
--- a/i18n/trk/src/vs/editor/contrib/quickFix/browser/quickFixCommands.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"quickFixWithKb": "Düzeltmeleri Göster ({0})",
-	"quickFix": "Düzeltmeleri Göster",
-	"quickfix.trigger.label": "Hızlı Düzeltme"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/editor/contrib/quickFix/quickFixCommands.i18n.json b/i18n/trk/src/vs/editor/contrib/quickFix/quickFixCommands.i18n.json
deleted file mode 100644
index be911653722..00000000000
--- a/i18n/trk/src/vs/editor/contrib/quickFix/quickFixCommands.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"quickFixWithKb": "Düzeltmeleri Göster ({0})",
-	"quickFix": "Düzeltmeleri Göster",
-	"quickfix.trigger.label": "Hızlı Düzeltme",
-	"refactor.label": "Yeniden Düzenle"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/editor/contrib/referenceSearch/browser/peekViewWidget.i18n.json b/i18n/trk/src/vs/editor/contrib/referenceSearch/browser/peekViewWidget.i18n.json
deleted file mode 100644
index 8a312782515..00000000000
--- a/i18n/trk/src/vs/editor/contrib/referenceSearch/browser/peekViewWidget.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"label.close": "Kapat"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/editor/contrib/referenceSearch/browser/referenceSearch.i18n.json b/i18n/trk/src/vs/editor/contrib/referenceSearch/browser/referenceSearch.i18n.json
deleted file mode 100644
index 9ddf0e9fbe0..00000000000
--- a/i18n/trk/src/vs/editor/contrib/referenceSearch/browser/referenceSearch.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"meta.titleReference": "– {0} başvuru",
-	"references.action.label": "Tüm Başvuruları Bul"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/editor/contrib/referenceSearch/browser/referencesController.i18n.json b/i18n/trk/src/vs/editor/contrib/referenceSearch/browser/referencesController.i18n.json
deleted file mode 100644
index 14c77e0d644..00000000000
--- a/i18n/trk/src/vs/editor/contrib/referenceSearch/browser/referencesController.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"labelLoading": "Yükleniyor..."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/editor/contrib/referenceSearch/browser/referencesModel.i18n.json b/i18n/trk/src/vs/editor/contrib/referenceSearch/browser/referencesModel.i18n.json
deleted file mode 100644
index a3b4193dbe7..00000000000
--- a/i18n/trk/src/vs/editor/contrib/referenceSearch/browser/referencesModel.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"aria.oneReference": "{0} yolunda, {1}. satır {2}. sütundaki sembol",
-	"aria.fileReferences.1": "{0} içinde 1 sembol, tam yol {1}",
-	"aria.fileReferences.N": "{1} içinde {0} sembol, tam yol {2}",
-	"aria.result.0": "Sonuç bulunamadı",
-	"aria.result.1": "{0} yolunda 1 sembol bulundu",
-	"aria.result.n1": "{1} yolunda {0} sembol bulundu",
-	"aria.result.nm": "{1} dosyada {0} sembol bulundu"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/editor/contrib/referenceSearch/browser/referencesWidget.i18n.json b/i18n/trk/src/vs/editor/contrib/referenceSearch/browser/referencesWidget.i18n.json
deleted file mode 100644
index 6165a40b9f9..00000000000
--- a/i18n/trk/src/vs/editor/contrib/referenceSearch/browser/referencesWidget.i18n.json
+++ /dev/null
@@ -1,27 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"referencesFailre": "Dosya çözümlenemedi.",
-	"referencesCount": "{0} başvuru",
-	"referenceCount": "{0} başvuru",
-	"missingPreviewMessage": "önizleme yok",
-	"treeAriaLabel": "Başvurular",
-	"noResults": "Sonuç yok",
-	"peekView.alternateTitle": "Başvurular",
-	"peekViewTitleBackground": "Gözetleme görünümü başlık alanının arka plan rengi.",
-	"peekViewTitleForeground": "Gözetleme görünümü başlığının rengi.",
-	"peekViewTitleInfoForeground": "Gözetleme görünümü başlık bilgisinin rengi.",
-	"peekViewBorder": "Gözetleme görünümü kenarlıkları ve ok işaretinin rengi.",
-	"peekViewResultsBackground": "Gözetleme görünümü sonuç listesinin arka plan rengi.",
-	"peekViewResultsMatchForeground": "Gözetleme görünümü sonuç listesindeki satır düğümlerinin ön plan rengi.",
-	"peekViewResultsFileForeground": "Gözetleme görünümü sonuç listesindeki dosya düğümlerinin ön plan rengi.",
-	"peekViewResultsSelectionBackground": "Gözetleme görünümü sonuç listesindeki seçilen girdinin arka plan rengi.",
-	"peekViewResultsSelectionForeground": "Gözetleme görünümü sonuç listesindeki seçilen girdinin ön plan rengi.",
-	"peekViewEditorBackground": "Gözetleme görünümü düzenleyicisinin arka plan rengi.",
-	"peekViewEditorGutterBackground": "Gözetleme görünümü düzenleyicisindeki oluğun arka plan rengi.",
-	"peekViewResultsMatchHighlight": "Gözetleme görünümü sonuç listesindeki eşleşme vurgusu rengi.",
-	"peekViewEditorMatchHighlight": "Gözetleme görünümü düzenleyicisindeki eşleşme vurgusu rengi."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/editor/contrib/referenceSearch/peekViewWidget.i18n.json b/i18n/trk/src/vs/editor/contrib/referenceSearch/peekViewWidget.i18n.json
deleted file mode 100644
index e815a981a9b..00000000000
--- a/i18n/trk/src/vs/editor/contrib/referenceSearch/peekViewWidget.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"label.close": "Kapat"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/editor/contrib/referenceSearch/referenceSearch.i18n.json b/i18n/trk/src/vs/editor/contrib/referenceSearch/referenceSearch.i18n.json
deleted file mode 100644
index 2c1a258c583..00000000000
--- a/i18n/trk/src/vs/editor/contrib/referenceSearch/referenceSearch.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"meta.titleReference": "– {0} başvuru",
-	"references.action.label": "Tüm Başvuruları Bul"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/editor/contrib/referenceSearch/referencesController.i18n.json b/i18n/trk/src/vs/editor/contrib/referenceSearch/referencesController.i18n.json
deleted file mode 100644
index 47dc331804f..00000000000
--- a/i18n/trk/src/vs/editor/contrib/referenceSearch/referencesController.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"labelLoading": "Yükleniyor..."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/editor/contrib/referenceSearch/referencesModel.i18n.json b/i18n/trk/src/vs/editor/contrib/referenceSearch/referencesModel.i18n.json
deleted file mode 100644
index 9ac5d4c11c1..00000000000
--- a/i18n/trk/src/vs/editor/contrib/referenceSearch/referencesModel.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"aria.oneReference": "{0} yolunda, {1}. satır {2}. sütundaki sembol",
-	"aria.fileReferences.1": "{0} içinde 1 sembol, tam yol {1}",
-	"aria.fileReferences.N": "{1} içinde {0} sembol, tam yol {2}",
-	"aria.result.0": "Sonuç bulunamadı",
-	"aria.result.1": "{0} yolunda 1 sembol bulundu",
-	"aria.result.n1": "{1} yolunda {0} sembol bulundu",
-	"aria.result.nm": "{1} dosyada {0} sembol bulundu"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/editor/contrib/referenceSearch/referencesWidget.i18n.json b/i18n/trk/src/vs/editor/contrib/referenceSearch/referencesWidget.i18n.json
deleted file mode 100644
index 48d7ac620e6..00000000000
--- a/i18n/trk/src/vs/editor/contrib/referenceSearch/referencesWidget.i18n.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"referencesFailre": "Dosya çözümlenemedi.",
-	"referencesCount": "{0} başvuru",
-	"referenceCount": "{0} başvuru",
-	"missingPreviewMessage": "önizleme yok",
-	"treeAriaLabel": "Başvurular",
-	"noResults": "Sonuç yok",
-	"peekView.alternateTitle": "Başvurular",
-	"peekViewTitleBackground": "Gözetleme görünümü başlık alanının arka plan rengi.",
-	"peekViewTitleForeground": "Gözetleme görünümü başlığının rengi.",
-	"peekViewTitleInfoForeground": "Gözetleme görünümü başlık bilgisinin rengi.",
-	"peekViewBorder": "Gözetleme görünümü kenarlıkları ve ok işaretinin rengi.",
-	"peekViewResultsBackground": "Gözetleme görünümü sonuç listesinin arka plan rengi.",
-	"peekViewResultsMatchForeground": "Gözetleme görünümü sonuç listesindeki satır düğümlerinin ön plan rengi.",
-	"peekViewResultsFileForeground": "Gözetleme görünümü sonuç listesindeki dosya düğümlerinin ön plan rengi.",
-	"peekViewResultsSelectionBackground": "Gözetleme görünümü sonuç listesindeki seçilen girdinin arka plan rengi.",
-	"peekViewResultsSelectionForeground": "Gözetleme görünümü sonuç listesindeki seçilen girdinin ön plan rengi.",
-	"peekViewEditorBackground": "Gözetleme görünümü düzenleyicisinin arka plan rengi.",
-	"peekViewEditorGutterBackground": "Gözetleme görünümü düzenleyicisindeki oluğun arka plan rengi.",
-	"peekViewResultsMatchHighlight": "Gözetleme görünümü sonuç listesindeki eşleşme vurgusu rengi.",
-	"peekViewEditorMatchHighlight": "Gözetleme görünümü düzenleyicisindeki eşleşme vurgusu rengi.",
-	"peekViewEditorMatchHighlightBorder": "Gözetleme görünümü düzenleyicisindeki eşleşme vurgusu kenarlığı."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/editor/contrib/rename/browser/rename.i18n.json b/i18n/trk/src/vs/editor/contrib/rename/browser/rename.i18n.json
deleted file mode 100644
index 4440b96d71b..00000000000
--- a/i18n/trk/src/vs/editor/contrib/rename/browser/rename.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"no result": "Sonuç yok.",
-	"aria": "'{0}', '{1}' olarak başarıyla yeniden adlandırıldı. Özet: {2}",
-	"rename.failed": "Üzgünüz, yeniden adlandırma işlemi başarısız oldu.",
-	"rename.label": "Sembolü Yeniden Adlandır"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/editor/contrib/rename/browser/renameInputField.i18n.json b/i18n/trk/src/vs/editor/contrib/rename/browser/renameInputField.i18n.json
deleted file mode 100644
index eea4501c3d8..00000000000
--- a/i18n/trk/src/vs/editor/contrib/rename/browser/renameInputField.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"renameAriaLabel": "Girdiyi yeniden adlandır. Yeni adı girin ve işlemek için Enter'a basın."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/editor/contrib/rename/rename.i18n.json b/i18n/trk/src/vs/editor/contrib/rename/rename.i18n.json
deleted file mode 100644
index 498c45ded3d..00000000000
--- a/i18n/trk/src/vs/editor/contrib/rename/rename.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"no result": "Sonuç yok.",
-	"aria": "'{0}', '{1}' olarak başarıyla yeniden adlandırıldı. Özet: {2}",
-	"rename.failed": "Yeniden adlandırma işlemi başarısız oldu.",
-	"rename.label": "Sembolü Yeniden Adlandır"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/editor/contrib/rename/renameInputField.i18n.json b/i18n/trk/src/vs/editor/contrib/rename/renameInputField.i18n.json
deleted file mode 100644
index 6005e6bb49b..00000000000
--- a/i18n/trk/src/vs/editor/contrib/rename/renameInputField.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"renameAriaLabel": "Girdiyi yeniden adlandır. Yeni adı girin ve işlemek için Enter'a basın."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/editor/contrib/smartSelect/common/smartSelect.i18n.json b/i18n/trk/src/vs/editor/contrib/smartSelect/common/smartSelect.i18n.json
deleted file mode 100644
index b63d95ca271..00000000000
--- a/i18n/trk/src/vs/editor/contrib/smartSelect/common/smartSelect.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"smartSelect.grow": "Seçimi Genişlet",
-	"smartSelect.shrink": "Seçimi Daralt"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/editor/contrib/smartSelect/smartSelect.i18n.json b/i18n/trk/src/vs/editor/contrib/smartSelect/smartSelect.i18n.json
deleted file mode 100644
index 044d99df5c4..00000000000
--- a/i18n/trk/src/vs/editor/contrib/smartSelect/smartSelect.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"smartSelect.grow": "Seçimi Genişlet",
-	"smartSelect.shrink": "Seçimi Daralt"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/editor/contrib/snippet/snippetVariables.i18n.json b/i18n/trk/src/vs/editor/contrib/snippet/snippetVariables.i18n.json
deleted file mode 100644
index 635fee26cd5..00000000000
--- a/i18n/trk/src/vs/editor/contrib/snippet/snippetVariables.i18n.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"Sunday": "Pazar",
-	"Monday": "Pazartesi",
-	"Tuesday": "Salı",
-	"Wednesday": "Çarşamba",
-	"Thursday": "Perşembe",
-	"Friday": "Cuma",
-	"Saturday": "Cumartesi",
-	"SundayShort": "Paz",
-	"MondayShort": "Pzt",
-	"TuesdayShort": "Sal",
-	"WednesdayShort": "Çar",
-	"ThursdayShort": "Per",
-	"FridayShort": "Cum",
-	"SaturdayShort": "Cmt",
-	"January": "Ocak",
-	"February": "Şubat",
-	"March": "Mart",
-	"April": "Nisan",
-	"May": "Mayıs",
-	"June": "Haziran",
-	"July": "Temmuz",
-	"August": "Ağustos",
-	"September": "Eylül",
-	"October": "Ekim",
-	"November": "Kasım",
-	"December": "Aralık",
-	"JanuaryShort": "Oca",
-	"FebruaryShort": "Şub",
-	"MarchShort": "Mar",
-	"AprilShort": "Nis",
-	"MayShort": "May",
-	"JuneShort": "Haz",
-	"JulyShort": "Tem",
-	"AugustShort": "Ağu",
-	"SeptemberShort": "Eyl",
-	"OctoberShort": "Eki",
-	"NovemberShort": "Kas",
-	"DecemberShort": "Ara"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/editor/contrib/suggest/browser/suggestController.i18n.json b/i18n/trk/src/vs/editor/contrib/suggest/browser/suggestController.i18n.json
deleted file mode 100644
index d6c0cfacacb..00000000000
--- a/i18n/trk/src/vs/editor/contrib/suggest/browser/suggestController.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"arai.alert.snippet": "'{0}' kabul edildiği için şu metin eklendi: {1}",
-	"suggest.trigger.label": "Öneriyi Tetikle"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/editor/contrib/suggest/browser/suggestWidget.i18n.json b/i18n/trk/src/vs/editor/contrib/suggest/browser/suggestWidget.i18n.json
deleted file mode 100644
index 657260a0049..00000000000
--- a/i18n/trk/src/vs/editor/contrib/suggest/browser/suggestWidget.i18n.json
+++ /dev/null
@@ -1,21 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"editorSuggestWidgetBackground": "Öneri aracının arka plan rengi.",
-	"editorSuggestWidgetBorder": "Öneri aracının kenarlık rengi.",
-	"editorSuggestWidgetForeground": "Öneri aracının ön plan rengi.",
-	"editorSuggestWidgetSelectedBackground": "Öneri aracındaki seçilen girdinin arka plan rengi.",
-	"editorSuggestWidgetHighlightForeground": "Öneri aracındaki eşleşme vurgularının rengi.",
-	"readMore": "Devamını Oku...{0}",
-	"suggestionWithDetailsAriaLabel": "{0}, öneri, detaylı",
-	"suggestionAriaLabel": "{0}, öneri",
-	"readLess": "Daha azını oku...{0}",
-	"suggestWidget.loading": "Yükleniyor...",
-	"suggestWidget.noSuggestions": "Öneri yok.",
-	"suggestionAriaAccepted": "{0}, kabul edildi",
-	"ariaCurrentSuggestionWithDetails": "{0}, öneri, detaylı",
-	"ariaCurrentSuggestion": "{0}, öneri"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/editor/contrib/suggest/suggestController.i18n.json b/i18n/trk/src/vs/editor/contrib/suggest/suggestController.i18n.json
deleted file mode 100644
index abb55b764a6..00000000000
--- a/i18n/trk/src/vs/editor/contrib/suggest/suggestController.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"arai.alert.snippet": "'{0}' kabul edildiği için şu metin eklendi: {1}",
-	"suggest.trigger.label": "Öneriyi Tetikle"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/editor/contrib/suggest/suggestWidget.i18n.json b/i18n/trk/src/vs/editor/contrib/suggest/suggestWidget.i18n.json
deleted file mode 100644
index 0aa2448d2c6..00000000000
--- a/i18n/trk/src/vs/editor/contrib/suggest/suggestWidget.i18n.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"editorSuggestWidgetBackground": "Öneri aracının arka plan rengi.",
-	"editorSuggestWidgetBorder": "Öneri aracının kenarlık rengi.",
-	"editorSuggestWidgetForeground": "Öneri aracının ön plan rengi.",
-	"editorSuggestWidgetSelectedBackground": "Öneri aracındaki seçilen girdinin arka plan rengi.",
-	"editorSuggestWidgetHighlightForeground": "Öneri aracındaki eşleşme vurgularının rengi.",
-	"readMore": "Devamını Oku...{0}",
-	"suggestionWithDetailsAriaLabel": "{0}, öneri, detaylı",
-	"suggestionAriaLabel": "{0}, öneri",
-	"readLess": "Daha azını oku...{0}",
-	"suggestWidget.loading": "Yükleniyor...",
-	"suggestWidget.noSuggestions": "Öneri yok.",
-	"suggestionAriaAccepted": "{0}, kabul edildi",
-	"ariaCurrentSuggestionWithDetails": "{0}, öneri, detaylı",
-	"ariaCurrentSuggestion": "{0}, öneri"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/editor/contrib/toggleTabFocusMode/common/toggleTabFocusMode.i18n.json b/i18n/trk/src/vs/editor/contrib/toggleTabFocusMode/common/toggleTabFocusMode.i18n.json
deleted file mode 100644
index 720f500431f..00000000000
--- a/i18n/trk/src/vs/editor/contrib/toggleTabFocusMode/common/toggleTabFocusMode.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"toggle.tabMovesFocus": "Tab Tuşu İle Odak Değiştirmeyi Aç/Kapat"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/editor/contrib/toggleTabFocusMode/toggleTabFocusMode.i18n.json b/i18n/trk/src/vs/editor/contrib/toggleTabFocusMode/toggleTabFocusMode.i18n.json
deleted file mode 100644
index 8880451c552..00000000000
--- a/i18n/trk/src/vs/editor/contrib/toggleTabFocusMode/toggleTabFocusMode.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggle.tabMovesFocus": "Tab Tuşu İle Odak Değiştirmeyi Aç/Kapat"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/editor/contrib/wordHighlighter/common/wordHighlighter.i18n.json b/i18n/trk/src/vs/editor/contrib/wordHighlighter/common/wordHighlighter.i18n.json
deleted file mode 100644
index 6faf663326d..00000000000
--- a/i18n/trk/src/vs/editor/contrib/wordHighlighter/common/wordHighlighter.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"wordHighlight": "Bir değişkeni okumak gibi, okuma-erişimi sırasındaki bir sembolün arka plan rengi.",
-	"wordHighlightStrong": "Bir değişkene yazmak gibi, yazma-erişimi sırasındaki bir sembolün arka plan rengi.",
-	"overviewRulerWordHighlightForeground": "Sembol vurguları için genel bakış cetvelinin işaretleyici rengi.",
-	"overviewRulerWordHighlightStrongForeground": "Yazma erişimli sembol vurguları için genel bakış cetvelinin işaretleyici rengi.",
-	"wordHighlight.next.label": "Sonraki Sembol Vurgusuna Git",
-	"wordHighlight.previous.label": "Önceki Sembol Vurgusuna Git"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json b/i18n/trk/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
deleted file mode 100644
index 5d14aeee198..00000000000
--- a/i18n/trk/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"wordHighlight": "Bir değişkeni okumak gibi, okuma-erişimi sırasındaki bir sembolün arka plan rengi. Altta yer alan süslemeleri gizlememek için renk opak olmamalıdır.",
-	"wordHighlightStrong": "Bir değişkene yazmak gibi, yazma-erişimi sırasındaki bir sembolün arka plan rengi. Altta yer alan süslemeleri gizlememek için renk opak olmamalıdır.",
-	"wordHighlightBorder": "Bir değişken okunurken ki gibi, bir sembolün okuma-erişimi sırasındaki kenarlık rengi.",
-	"wordHighlightStrongBorder": "Bir değişkene yazılırken ki gibi, bir sembolün yazma erişimi sırasındaki kenarlık rengi.",
-	"overviewRulerWordHighlightForeground": "Sembol vurguları için genel bakış cetvelinin işaretleyici rengi. Altta yer alan süslemeleri gizlememek için renk mat olmamalıdır.",
-	"overviewRulerWordHighlightStrongForeground": "Yazma erişimli sembol vurguları için genel bakış cetvelinin işaretleyici rengi. Altta yer alan süslemeleri gizlememek için renk mat olmamalıdır.",
-	"wordHighlight.next.label": "Sonraki Sembol Vurgusuna Git",
-	"wordHighlight.previous.label": "Önceki Sembol Vurgusuna Git"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/editor/contrib/zoneWidget/browser/peekViewWidget.i18n.json b/i18n/trk/src/vs/editor/contrib/zoneWidget/browser/peekViewWidget.i18n.json
deleted file mode 100644
index 8a312782515..00000000000
--- a/i18n/trk/src/vs/editor/contrib/zoneWidget/browser/peekViewWidget.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"label.close": "Kapat"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/editor/electron-browser/textMate/TMSyntax.i18n.json b/i18n/trk/src/vs/editor/electron-browser/textMate/TMSyntax.i18n.json
deleted file mode 100644
index cd8f883eda7..00000000000
--- a/i18n/trk/src/vs/editor/electron-browser/textMate/TMSyntax.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"invalid.language": "`contributes.{0}.language` ögesinde bilinmeyen dil. Sağlanan değer: {1}",
-	"invalid.scopeName": "`contributes.{0}.scopeName` ögesinde dize bekleniyor. Sağlanan değer: {1}",
-	"invalid.path.0": "`contributes.{0}.path` ögesinde dize bekleniyor. Sağlanan değer: {1}",
-	"invalid.injectTo": "`contributes.{0}.injectTo` ögesinde geçersiz değer. Dil kapsam adlarından oluşan bir dizi olmalıdır. Sağlanan değer: {1}",
-	"invalid.embeddedLanguages": "`contributes.{0}.embeddedLanguages` ögesinde geçersiz değer. Kapsam adından dile kadar olan bir nesne haritası olmalıdır. Sağlanan değer: {1}",
-	"invalid.path.1": "`contributes.{0}.path` ögesinin ({1}) eklentinin klasöründe ({2}) yer alması bekleniyor. Bu, eklentiyi taşınamaz yapabilir.",
-	"no-tm-grammar": "Bu dil için kayıtlı bir TM Grameri yok."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/editor/node/languageConfigurationExtensionPoint.i18n.json b/i18n/trk/src/vs/editor/node/languageConfigurationExtensionPoint.i18n.json
deleted file mode 100644
index 270182c4a47..00000000000
--- a/i18n/trk/src/vs/editor/node/languageConfigurationExtensionPoint.i18n.json
+++ /dev/null
@@ -1,23 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"parseErrors": "{0} için ayrıştırma hataları: {1}",
-	"schema.openBracket": "Açılış ayracı karakteri veya dize sırası.",
-	"schema.closeBracket": "Kapanış ayracı karakteri veya dize sırası.",
-	"schema.comments": "Yorum sembollerini tanımlar.",
-	"schema.blockComments": "Blok açıklamalarının nasıl işaretlendiğini tanımlar.",
-	"schema.blockComment.begin": "Blok açıklamasını başlatan karakter dizisi.",
-	"schema.blockComment.end": "Blok açıklamasını bitiren karakter dizisi.",
-	"schema.lineComment": "Satır açıklamasını başlatan karakter dizisi.",
-	"schema.brackets": "Girintiyi artıran veya azaltan ayraç sembollerini tanımlar.",
-	"schema.autoClosingPairs": "Ayraç çiftlerini tanımlar. Bir açılış ayracı girildiğinde, kapanış ayracı otomatik olarak eklenir.",
-	"schema.autoClosingPairs.notIn": "Otomatik çiftlerin devre dışı bırakıldığı bir kapsamlar listesi tanımlar.",
-	"schema.surroundingPairs": "Seçili bir dizeyi çevrelemek için kullanılabilecek ayraç çiftlerini tanımlar.",
-	"schema.wordPattern": "Dilin kelime tanımı.",
-	"schema.wordPattern.pattern": "Sözcükleri eşleştirmek için kullanılacak Düzenli İfade.",
-	"schema.wordPattern.flags": "Sözcükleri eşleştirmek için kullanılacak Düzenli İfade işaretleri.",
-	"schema.wordPattern.flags.errorMessage": "`/^([gimuy]+)$/` kalıbı ile eşleşmelidir."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/editor/node/textMate/TMGrammars.i18n.json b/i18n/trk/src/vs/editor/node/textMate/TMGrammars.i18n.json
deleted file mode 100644
index 60439bb3b95..00000000000
--- a/i18n/trk/src/vs/editor/node/textMate/TMGrammars.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"vscode.extension.contributes.grammars": "textmate tokenizerlere ekleme yapar.",
-	"vscode.extension.contributes.grammars.language": "Bu söz diziminin ekleneceği dil tanımlayıcısı.",
-	"vscode.extension.contributes.grammars.scopeName": "tmLanguage dosyası tarafından kullanılan Textmate kapsam adı.",
-	"vscode.extension.contributes.grammars.path": "tmLanguage dosyasının yolu. Yol, eklenti klasörüne görecelidir ve genellikle './syntaxes/' ile başlar.",
-	"vscode.extension.contributes.grammars.embeddedLanguages": "Bu dil bilgisinin gömülü dilleri içermesi durumundaki bir dil kimliğinin kapsam adı haritası.",
-	"vscode.extension.contributes.grammars.injectTo": "Bu dil bilgisinin yerleştirileceği dil kapsam adları listesi."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/platform/actions/browser/menuItemActionItem.i18n.json b/i18n/trk/src/vs/platform/actions/browser/menuItemActionItem.i18n.json
deleted file mode 100644
index 0d4e76110bb..00000000000
--- a/i18n/trk/src/vs/platform/actions/browser/menuItemActionItem.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"titleAndKb": "{0} ({1})"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json b/i18n/trk/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
deleted file mode 100644
index cf0aa1dfaf2..00000000000
--- a/i18n/trk/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"requirearray": "menü ögeleri bir dizi olmalıdır",
-	"requirestring": "`{0}` özelliği zorunludur ve `string` türünde olmalıdır",
-	"optstring": "`{0}` özelliği atlanabilir veya `string` türünde olmalıdır",
-	"vscode.extension.contributes.menuItem.command": "Yürütülecek komutun tanımlayıcısı. Komut 'commands' bölümünde tanımlanmalıdır",
-	"vscode.extension.contributes.menuItem.alt": "Yürütülecek alternatif bir komutun tanımlayıcısı. Komut 'commands' bölümünde tanımlanmalıdır",
-	"vscode.extension.contributes.menuItem.when": "Bu ögeyi göstermek için doğru olması gereken koşul",
-	"vscode.extension.contributes.menuItem.group": "Bu komutun ait olduğu gruba ekle",
-	"vscode.extension.contributes.menus": "Düzenleyiciye menü ögeleri ekler",
-	"menus.commandPalette": "Komut Paleti",
-	"menus.touchBar": "Touch bar (sadece macOS)",
-	"menus.editorTitle": "Düzenleyici başlık menüsü",
-	"menus.editorContext": "Düzenleyici bağlam menüsü",
-	"menus.explorerContext": "Dosya gezgini bağlam menüsü",
-	"menus.editorTabContext": "Düzenleyici sekmeleri bağlam menüsü",
-	"menus.debugCallstackContext": "Hata ayıklama çağrı yığını bağlam menüsü",
-	"menus.scmTitle": "Kaynak Denetimi başlık menüsü",
-	"menus.scmSourceControl": "Kaynak Denetimi menüsü",
-	"menus.resourceGroupContext": "Kaynak Denetimi kaynak grubu bağlam menüsü",
-	"menus.resourceStateContext": "Kaynak Denetimi kaynak durumu bağlam menüsü",
-	"view.viewTitle": "Katkıda bulunan görünümü başlık menüsü",
-	"view.itemContext": "Katkıda bulunan görünümü öge bağlam menüsü",
-	"nonempty": "boş olmayan değer beklendi.",
-	"opticon": "`icon` özelliği atlanabilir veya bir dize ya da `{dark, light}` gibi bir değişmez değer olmalıdır",
-	"requireStringOrObject": "`{0}` özelliği zorunludur ve `string` veya `object` türünde olmalıdır",
-	"requirestrings": "`{0}` ve `{1}` özellikleri zorunludur ve `string` türünde olmalıdır",
-	"vscode.extension.contributes.commandType.command": "Yürütülecek komutun tanımlayıcısı",
-	"vscode.extension.contributes.commandType.title": "Komutu kullanıcı arayüzünde temsil edecek başlık",
-	"vscode.extension.contributes.commandType.category": "(İsteğe Bağlı) Kullanıcı arayüzünde komutun gruplanacağı kategori dizesi",
-	"vscode.extension.contributes.commandType.icon": "(İsteğe Bağlı) Komutun, Kullanıcı Arayüzü'nde temsil edilmesinde kullanılacak simge. Bir dosya yolu veya tema olarak kullanılabilir bir yapılandırmadır",
-	"vscode.extension.contributes.commandType.icon.light": "Açık bir tema kullanıldığındaki simge yolu",
-	"vscode.extension.contributes.commandType.icon.dark": "Koyu bir tema kullanıldığındaki simge yolu",
-	"vscode.extension.contributes.commands": "Komut paletine komutlar ekler.",
-	"dup": "`{0}` komutu `commands` bölümünde birden çok kez görünüyor.",
-	"menuId.invalid": "`{0}` geçerli bir menü tanımlayıcısı değil",
-	"missing.command": "Menü ögesi, 'commands' bölümünde tanımlanmamış bir `{0}` komutuna başvuruyor.",
-	"missing.altCommand": "Menü ögesi, 'commands' bölümünde tanımlanmamış bir `{0}` alternatif komutuna başvuruyor.",
-	"dupe.command": "Menü ögesi, aynı varsayılan ve alternatif komutlarına başvuruyor"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/platform/configuration/common/configurationRegistry.i18n.json b/i18n/trk/src/vs/platform/configuration/common/configurationRegistry.i18n.json
deleted file mode 100644
index 7787f571d63..00000000000
--- a/i18n/trk/src/vs/platform/configuration/common/configurationRegistry.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"defaultConfigurations.title": "Varsayılan Yapılandırma Geçersiz Kılmaları",
-	"overrideSettings.description": "{0} dili için geçersiz kılınacak düzenleyici ayarlarını yapılandırın.",
-	"overrideSettings.defaultDescription": "Bir dil için geçersiz kılınacak düzenleyici ayarlarını yapılandırın.",
-	"config.property.languageDefault": "'{0}' kaydedilemiyor. Bu, dile özgü düzenleyici ayarlarını tanımlamak için '\\\\[.*\\\\]$' özellik kalıbı ile eşleşir. 'configurationDefaults' ögesini kullanın.",
-	"config.property.duplicate": "'{0}' kaydedilemiyor. Bu özellik zaten kayıtlı."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/platform/dialogs/common/dialogs.i18n.json b/i18n/trk/src/vs/platform/dialogs/common/dialogs.i18n.json
deleted file mode 100644
index 0bc4bb5dea3..00000000000
--- a/i18n/trk/src/vs/platform/dialogs/common/dialogs.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"moreFile": "...1 ek dosya gösterilmiyor",
-	"moreFiles": "...{0} ek dosya gösterilmiyor"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/platform/dialogs/node/dialogService.i18n.json b/i18n/trk/src/vs/platform/dialogs/node/dialogService.i18n.json
deleted file mode 100644
index 40e62eb8c37..00000000000
--- a/i18n/trk/src/vs/platform/dialogs/node/dialogService.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"cancel": "İptal"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/platform/environment/node/argv.i18n.json b/i18n/trk/src/vs/platform/environment/node/argv.i18n.json
deleted file mode 100644
index de45d35b28e..00000000000
--- a/i18n/trk/src/vs/platform/environment/node/argv.i18n.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"gotoValidation": "`--goto` modundaki argümanlar `FILE(:LINE(:CHARACTER))` biçiminde olmalıdır.",
-	"diff": "İki dosyayı birbiriyle karşılaştır.",
-	"add": "Son aktif pencereye klasör(ler) ekle.",
-	"goto": "Konumdaki bir dosyayı belirtilen satır ve sütunda aç.",
-	"newWindow": "Yeni pencere açmaya zorla.",
-	"reuseWindow": "Bir dosya veya klasörü son aktif pencerede açmaya zorlayın.",
-	"wait": "Geri dönmeden önce dosyaların kapanmasını bekle.",
-	"locale": "Kullanılacak yerel dil (örnek: en-US veya zh-TW).",
-	"userDataDir": "Kullanıcı verilerinin tutulacağı klasörü belirtir. Code'un farklı örneklerini açmak için kullanılabilir.",
-	"version": "Sürümü göster.",
-	"help": "Kullanımı göster.",
-	"extensionHomePath": "Eklentilerin kök dizinini belirle.",
-	"listExtensions": "Yüklü eklentileri listele.",
-	"showVersions": "--list-extensions'u kullanırken, yüklü eklentilerin sürümlerini gösterir.",
-	"installExtension": "Bir eklenti yükler.",
-	"uninstallExtension": "Bir eklentiyi kaldırır.",
-	"experimentalApis": "Bir eklenti için önerilen API özelliklerini etkinleştirir.",
-	"verbose": "Ayrıntılı çıktı oluştur (--wait anlamına gelir).",
-	"log": "Kullanılacak günlüğe yazma düzeyi. Varsayılan değer 'info'dur. İzin verilen değerler 'critical', 'error', 'warn', 'info', 'debug', 'trace', 'off' şeklindedir.",
-	"status": "İşlem kullanımını ve tanılama bilgilerini yazdır.",
-	"performance": "'Geliştirici: Başlangıç Performansı' komutu etkinleştirilmiş olarak başlat.",
-	"prof-startup": "Başlangıç sırasında CPU profil oluşturucusunu çalıştır",
-	"disableExtensions": "Yüklü tüm eklentileri devre dışı bırak.",
-	"inspect-extensions": "Eklentilerde hata ayıklama ve ayrımlamaya izin ver. Bağlantı URI'ı için geliştirici araçlarını kontrol edin.",
-	"inspect-brk-extensions": "Eklentilerde hata ayıklama ve ayrımlamaya eklenti sunucusu başladıktan hemen sonra duraklatılacak şekilde izin ver. Bağlantı URI'ı için geliştirici araçlarını kontrol edin.",
-	"disableGPU": "GPU donanım hızlandırmasını devre dışı bırak.",
-	"uploadLogs": "Geçerli oturumdaki günlükleri güvenli bir uçbirime yükler.",
-	"maxMemory": "Bir pencere için maksimum bellek miktarı (Mbyte olarak).",
-	"usage": "Kullanım",
-	"options": "seçenekler",
-	"paths": "yollar",
-	"stdinWindows": "Başka bir programın çıktısını okumak için '-'  karakterini ekleyin. (ör. 'echo Hello World | {0} -')",
-	"stdinUnix": "stdin'den okutmak için '-' karakterini ekleyin (ör. 'ps aux | grep code | {0} -')",
-	"optionsUpperCase": "Seçenekler",
-	"extensionsManagement": "Eklenti Yönetimi",
-	"troubleshooting": "Sorun giderme"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/platform/extensionManagement/common/extensionEnablementService.i18n.json b/i18n/trk/src/vs/platform/extensionManagement/common/extensionEnablementService.i18n.json
deleted file mode 100644
index a318e469bc3..00000000000
--- a/i18n/trk/src/vs/platform/extensionManagement/common/extensionEnablementService.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noWorkspace": "Çalışma alanı yok."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/platform/extensionManagement/common/extensionManagement.i18n.json b/i18n/trk/src/vs/platform/extensionManagement/common/extensionManagement.i18n.json
deleted file mode 100644
index 7f6f573a935..00000000000
--- a/i18n/trk/src/vs/platform/extensionManagement/common/extensionManagement.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"extensions": "Eklentiler",
-	"preferences": "Tercihler"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/platform/extensionManagement/node/extensionGalleryService.i18n.json b/i18n/trk/src/vs/platform/extensionManagement/node/extensionGalleryService.i18n.json
deleted file mode 100644
index c64bf0cfd44..00000000000
--- a/i18n/trk/src/vs/platform/extensionManagement/node/extensionGalleryService.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"notCompatibleDownload": "İndirme başarısız oldu çünkü, eklentinin uyumlu olduğu VS Code'un '{0}' sürümü bulunamadı."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json b/i18n/trk/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
deleted file mode 100644
index 8beb681b332..00000000000
--- a/i18n/trk/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"invalidManifest": "Eklenti geçersiz: package.json bir JSON dosyası değil.",
-	"incompatible": "VS Code '{1}' ile uyumlu olmadığı için '{0}' eklentisi yüklenemiyor.",
-	"restartCode": "{0} eklentisini yeniden yüklemeden önce lütfen Code'u yeniden başlatın.",
-	"installingOutdatedExtension": "Bu eklentinin daha yeni bir sürümü zaten yüklü. Bunu, daha eski bir sürümle geçersiz kılmak ister misiniz?",
-	"override": "Geçersiz Kıl",
-	"cancel": "İptal",
-	"errorInstallingDependencies": "Bağımlılıklar yüklenirken hata oluştu. {0}",
-	"MarketPlaceDisabled": "Market etkin değil",
-	"removeError": "Eklenti kaldırılırken hata oluştu: {0}. Yeniden yüklemeden önce lütfen VS Code'dan çıkın ve tekrar açın.",
-	"Not a Marketplace extension": "Sadece Market Eklentileri yeniden yüklenebilir",
-	"notFoundCompatible": "'{0}' yüklenemiyor; VS Code '{1}' ile uyumlu mevcut bir sürümü yok.",
-	"malicious extension": "Eklenti sorunlu olarak bildirildiği için yüklenemiyor.",
-	"notFoundCompatibleDependency": "Yükleme başarısız oldu çünkü, bağımlılığı bulunan '{0}' eklentisinin uyumlu olduğu VS Code'un '{1}' sürümü bulunamadı.",
-	"quitCode": "Eklenti yüklenemedi. Lütfen yeniden yüklemeden önce VS Code'u sonlandırın ve tekrar başlatın.",
-	"exitCode": "Eklenti yüklenemedi. Lütfen yeniden yüklemeden önce VS Code'u sonlandırın ve tekrar başlatın.",
-	"renameError": "{0}, {1} olarak yeniden adlandırılırken bilinmeyen hata oluştu",
-	"uninstallDependeciesConfirmation": "Yalnızca '{0}' eklentisini mi yoksa bağımlılıklarını da kaldırmak ister misiniz?",
-	"uninstallOnly": "Sadece Eklenti",
-	"uninstallAll": "Tümünü Kaldır",
-	"singleDependentError": "'{0}' eklentisi kaldırılamıyor. '{1}' eklentisi buna bağlı.",
-	"twoDependentsError": "'{0}' eklentisi kaldırılamıyor. '{1}' ve '{2}' eklentileri buna bağlı.",
-	"multipleDependentsError": "'{0}' eklentisi kaldırılamıyor. '{1}, '{2}' eklentileri ve diğerleri buna bağlı.",
-	"notExists": "Eklenti bulunamadı"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/platform/extensions/common/abstractExtensionService.i18n.json b/i18n/trk/src/vs/platform/extensions/common/abstractExtensionService.i18n.json
deleted file mode 100644
index f48bbd60795..00000000000
--- a/i18n/trk/src/vs/platform/extensions/common/abstractExtensionService.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"unknownDep": "`{1}` eklentisi etkinleştirilemedi. Neden: bilinmeyen bağımlılık `{0}`.",
-	"failedDep1": "`{1}` eklentisi etkinleştirilemedi. Neden: bağımlılık `{0}` etkinleştirilemedi.",
-	"failedDep2": "`{0}` eklentisi etkinleştirilemedi. Neden: 10'dan fazla bağımlılık düzeyi (büyük olasılıkla bağımlılık döngüsü).",
-	"activationError": "`{0}` eklentisi etkinleştirilemedi: {1}."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/platform/extensions/common/extensionsRegistry.i18n.json b/i18n/trk/src/vs/platform/extensions/common/extensionsRegistry.i18n.json
deleted file mode 100644
index 1a1b99ac221..00000000000
--- a/i18n/trk/src/vs/platform/extensions/common/extensionsRegistry.i18n.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.engines.vscode": "Eklentinin uyumlu olduğu VS Code sürümünü belirten VS Code eklentileri için. * olamaz. Örneğin: ^0.10.5 uyumlu olduğu minimum VS Code sürümünün 0.10.5 olduğunu gösterir.",
-	"vscode.extension.publisher": "VS Code eklentisinin yayıncısı.",
-	"vscode.extension.displayName": "VS Code galerisinde kullanılan eklentinin görünen adı.",
-	"vscode.extension.categories": "Bu eklentiyi kategorize etmek için VS Code galerisi tarafından kullanılan kategoriler.",
-	"vscode.extension.galleryBanner": "VS Code markette kullanılan afiş.",
-	"vscode.extension.galleryBanner.color": "VS Code marketteki sayfa başlığındaki afiş rengi.",
-	"vscode.extension.galleryBanner.theme": "Afişte kullanılan yazı tipi için renk teması.",
-	"vscode.extension.contributes": "Bu paketin temsil ettiği VS Code eklentisinin tüm katkıları.",
-	"vscode.extension.preview": "Markette eklentinin Önizleme olarak işaretlenmesini sağlar.",
-	"vscode.extension.activationEvents": "VS Code eklentisi için etkinleştirme olayları.",
-	"vscode.extension.activationEvents.onLanguage": "Belirtilen dilde çözümlenen bir dosya her açıldığında bir etkinleştirme olayı yayınlanır.",
-	"vscode.extension.activationEvents.onCommand": "Belirtilen komut her çağrıldığında bir etkinleştirme olayı yayınlanır.",
-	"vscode.extension.activationEvents.onDebug": "Bir kullanıcının hata ayıklamaya başlamak veya hata ayıklama yapılandırmasını ayarlamak üzere olduğu her an bir etkinleştirme olayı yayınlanır.",
-	"vscode.extension.activationEvents.onDebugInitialConfigurations": "Bir \"launch.json\" dosyasının oluşturulması(ve tüm provideDebugConfigurations metodlarının çağrılması) gerektiği zaman etkinleştirme olayı yayınlanır.",
-	"vscode.extension.activationEvents.onDebugResolve": "Belirtilen türde bir hata ayıklama oturumu başlamaya yaklaştığında (ve buna karşılık gelen bir resolveDebugConfiguration metodunun çağrılması gerektiğinde) bir etkinleştirme olayı yayınlanır.",
-	"vscode.extension.activationEvents.workspaceContains": "Belirtilen glob deseni ile eşleşen en az bir dosya içeren bir klasör her açıldığında bir etkinleştirme olayı yayınlanır.",
-	"vscode.extension.activationEvents.onView": "Belirtilen görünüm her genişletildiğinde bir etkinleştirme olayı yayınlanır.",
-	"vscode.extension.activationEvents.star": "VS Code başlatıldığında yayılan etkinleştirme olayı. Mükemmel bir son kullanıcı deneyimi sağlandığından emin olmak için, lütfen bu etkinleştirme olayını eklentinizde sadece kullanım durumunuzda başka hiçbir aktivasyon olayı kombinasyonu çalışmıyorsa kullanın.",
-	"vscode.extension.badges": "Marketin eklenti sayfasının kenar çubuğunda görüntülenecek göstergeler dizisi.",
-	"vscode.extension.badges.url": "Gösterge resmi URL'si.",
-	"vscode.extension.badges.href": "Gösterge bağlantısı.",
-	"vscode.extension.badges.description": "Gösterge açıklaması.",
-	"vscode.extension.extensionDependencies": "Diğer uzantılara bağımlılıklar. Bir uzantının tanımlayıcısı her zaman ${publisher}.${name} biçimindedir. Örneğin: vscode.csharp.",
-	"vscode.extension.scripts.prepublish": "Paket, bir VS Code eklentisi olarak yayımlamadan önce çalıştırılacak betik.",
-	"vscode.extension.icon": "128x128 piksellik bir simgenin yolu."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/platform/extensions/node/extensionValidator.i18n.json b/i18n/trk/src/vs/platform/extensions/node/extensionValidator.i18n.json
deleted file mode 100644
index d519d31725f..00000000000
--- a/i18n/trk/src/vs/platform/extensions/node/extensionValidator.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"versionSyntax": "`engines.vscode` değeri {0} ayrıştırılamadı. Lütfen örnekte verilenlere benzer ifadeler kullanın: ^1.22.0, ^1.22.x, vb.",
-	"versionSpecificity1": "`engines.vscode`da belirtilen sürüm ({0}) yeterince belirli değil. vscode 1.0.0'dan önceki sürümler için, lütfen istenecek minimum majör ve minör sürüm numarasını tanımlayın. Örneğin: ^0.10.0, 0.10.x, 0.11.0, vb.",
-	"versionSpecificity2": "`engines.vscode`da belirtilen sürüm ({0}) yeterince belirli değil. vscode 1.0.0'dan sonraki sürümler için, lütfen istenecek minimum majör sürüm numarasını tanımlayın. Örneğin: ^1.10.0, 1.10.x, 1.x.x, 2.x.x, vb.",
-	"versionMismatch": "Eklenti, Code {0} ile uyumlu değil. Gereken sürüm: {1}."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/platform/history/electron-main/historyMainService.i18n.json b/i18n/trk/src/vs/platform/history/electron-main/historyMainService.i18n.json
deleted file mode 100644
index 97bc5af347f..00000000000
--- a/i18n/trk/src/vs/platform/history/electron-main/historyMainService.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"newWindow": "Yeni Pencere",
-	"newWindowDesc": "Yeni bir pencere açar",
-	"recentFolders": "Son Çalışma Alanları",
-	"folderDesc": "{0} {1}",
-	"codeWorkspace": "Code Çalışma Alanı"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/platform/integrity/node/integrityServiceImpl.i18n.json b/i18n/trk/src/vs/platform/integrity/node/integrityServiceImpl.i18n.json
deleted file mode 100644
index 6cac235b96e..00000000000
--- a/i18n/trk/src/vs/platform/integrity/node/integrityServiceImpl.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"integrity.prompt": "{0} kurulumunuz bozuk görünüyor. Lütfen yeniden yükleyin.",
-	"integrity.moreInformation": "Daha Fazla Bilgi",
-	"integrity.dontShowAgain": "Tekrar Gösterme"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/platform/issue/electron-main/issueService.i18n.json b/i18n/trk/src/vs/platform/issue/electron-main/issueService.i18n.json
deleted file mode 100644
index 28f82768afe..00000000000
--- a/i18n/trk/src/vs/platform/issue/electron-main/issueService.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"issueReporter": "Sorun Bildirici",
-	"processExplorer": "İşlem Yöneticisi"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/platform/jsonschemas/common/jsonValidationExtensionPoint.i18n.json b/i18n/trk/src/vs/platform/jsonschemas/common/jsonValidationExtensionPoint.i18n.json
deleted file mode 100644
index 94bd17df159..00000000000
--- a/i18n/trk/src/vs/platform/jsonschemas/common/jsonValidationExtensionPoint.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"contributes.jsonValidation": "json şema yapılandırmasına ekleme yapar.",
-	"contributes.jsonValidation.fileMatch": "Eşleşecek dosya örüntüsü, örneğin \"package.json\" veya \"*.launch\".",
-	"contributes.jsonValidation.url": "Bir şema URL'si ('http:', 'https:') veya eklenti klasörüne ('./') göreceli yol.",
-	"invalid.jsonValidation": "'configuration.jsonValidation' bir dizi olmalıdır",
-	"invalid.fileMatch": "'configuration.jsonValidation.fileMatch' tanımlanmalıdır",
-	"invalid.url": "'configuration.jsonValidation.url' bir URL veya göreli yol olmalıdır",
-	"invalid.url.fileschema": "'configuration.jsonValidation.url' geçersiz bir göreli URL'dir: {0}",
-	"invalid.url.schema": "'configuration.jsonValidation.url' ögesi eklentide bulunan şemalara başvurmak için 'http:', 'https:' veya './' ile başlamalıdır"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/platform/keybinding/common/abstractKeybindingService.i18n.json b/i18n/trk/src/vs/platform/keybinding/common/abstractKeybindingService.i18n.json
deleted file mode 100644
index d7fca59b3eb..00000000000
--- a/i18n/trk/src/vs/platform/keybinding/common/abstractKeybindingService.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"first.chord": "({0}) tuşuna basıldı. İkinci tuş bekleniyor...",
-	"missing.chord": "({0}, {1}) tuş bileşimi bir komut değil."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/platform/list/browser/listService.i18n.json b/i18n/trk/src/vs/platform/list/browser/listService.i18n.json
deleted file mode 100644
index ad10361dfb6..00000000000
--- a/i18n/trk/src/vs/platform/list/browser/listService.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"workbenchConfigurationTitle": "Çalışma Ekranı",
-	"multiSelectModifier.ctrlCmd": "Windows ve Linux'da `Control` ve macOS'de `Command` ile eşleşir.",
-	"multiSelectModifier.alt": "Windows ve Linux'da `Alt` ve macOS'de `Option` ile eşleşir.",
-	"multiSelectModifier": "Ağaç veya listelerdeki bir ögenin çoklu seçime fare ile eklenmesinde kullanılacak değiştirici(örneğin gezgin, açık düzenleyiciler ve scm görünümlerinde). `ctrlCmd` Windows ve Linux'da `Control` ve macOS'de `Command` ile eşleşir. 'Yana Aç' fare hareketleri - destekleniyorsa - birden çok seçim değiştiricisi ile çakışmayacak şekilde uyum sağlarlar.",
-	"openMode.singleClick": "Tek tıklamayla ögeleri aç.",
-	"openMode.doubleClick": "Çift tıklamayla ögeleri aç.",
-	"openModeModifier": "Ağaç ve listelerdeki ögelerin (destekleniyorsa) fare ile nasıl açılacağını denetler. Ögeleri tek tıklamayla açmak için `singleClick`, çift tıklamayla açmak için `doubleClick` olarak ayarlayın. Ağaçlardaki alt ögeler içeren ögeler için bu ayar üst ögenin tek veya çift tıklama tarafından genişletilmesini denetler. Bazı ağaç veya listelerin, bu ayar uygulanamaz ise görmezden gelmeyi seçebileceklerini unutmayın.",
-	"horizontalScrolling setting": "Çalışma ekranındaki ağaçların yatay kaydırmayı destekleyip desteklemeyeceğini denetler."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/platform/localizations/common/localizations.i18n.json b/i18n/trk/src/vs/platform/localizations/common/localizations.i18n.json
deleted file mode 100644
index b6cafbaebda..00000000000
--- a/i18n/trk/src/vs/platform/localizations/common/localizations.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.contributes.localizations": "Düzenleyiciye yerelleştirmeleri ekler",
-	"vscode.extension.contributes.localizations.languageId": "Görüntülenen dizelerin çevrileceği dilin kimliği.",
-	"vscode.extension.contributes.localizations.languageName": "Dilin İngilizcedeki adı.",
-	"vscode.extension.contributes.localizations.languageNameLocalized": "Dilin eklenen dildeki adı.",
-	"vscode.extension.contributes.localizations.translations": "Bu dille ilişkili çevirilerin listesi.",
-	"vscode.extension.contributes.localizations.translations.id": "Bu çevirinin ekleneceği VS Code veya Eklenti kimliği. VS Code kimliği her zaman `vscode` şeklindedir ve eklenti ise `yayinciAdi.eklentiAdi` biçiminde olmalıdır.",
-	"vscode.extension.contributes.localizations.translations.id.pattern": "Kimlik, VS Code çevirisi için `vscode` olmalı veya eklenti çevirisi için `yayinciAdi.eklentiAdi` biçiminde olmalıdır.",
-	"vscode.extension.contributes.localizations.translations.path": "Dilin çevirilerini içeren dosyaya göreli yol."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/platform/markers/common/markers.i18n.json b/i18n/trk/src/vs/platform/markers/common/markers.i18n.json
deleted file mode 100644
index bc3e8108119..00000000000
--- a/i18n/trk/src/vs/platform/markers/common/markers.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"sev.error": "Hata",
-	"sev.warning": "Uyarı",
-	"sev.info": "Bilgi"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/platform/markers/common/problemMatcher.i18n.json b/i18n/trk/src/vs/platform/markers/common/problemMatcher.i18n.json
deleted file mode 100644
index e578dc2b0d9..00000000000
--- a/i18n/trk/src/vs/platform/markers/common/problemMatcher.i18n.json
+++ /dev/null
@@ -1,72 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"ProblemPatternParser.loopProperty.notLast": "Döngü özelliği yalnızca son satır eşleştiricisinde desteklenir.",
-	"ProblemPatternParser.problemPattern.missingRegExp": "Sorun modelinde bir düzenli ifade eksik.",
-	"ProblemPatternParser.problemPattern.missingProperty": "Sorun modeli hatalı. En az bir dosya, mesaj ve satır veya konum eşleşme grubu bulundurmalıdır.",
-	"ProblemPatternParser.invalidRegexp": "Hata: Dize {0}, geçerli bir düzenli ifade değil.\n",
-	"ProblemPatternSchema.regexp": "Çıktıda bir hata, uyarı veya bilgi bulan düzenli ifade.",
-	"ProblemPatternSchema.file": "Dosya adının eşleştirme grubu indeksi. Atlanırsa 1 kullanılır.",
-	"ProblemPatternSchema.location": "Sorunun bulunduğu yerin eşleşme grubu indeksi. Geçerli konum örüntüleri şunlardır: (line), (line,column) ve (startLine,startColumn,endLine,endColumn). Atlanmışsa (line,column) varsayılır.",
-	"ProblemPatternSchema.line": "Sorunun satırının eşleştirme grubu indeksi. Varsayılan değeri 2'dir",
-	"ProblemPatternSchema.column": "Sorunun satır karakterinin eşleştirme grubu indeksi. Varsayılan değeri 3'tür",
-	"ProblemPatternSchema.endLine": "Sorunun satır sonunun eşleştirme grubu indeksi. Varsayılan değeri tanımsızdır",
-	"ProblemPatternSchema.endColumn": "Sorunun satır sonu karakterinin eşleştirme grubu indeksi. Varsayılan değeri tanımsızdır",
-	"ProblemPatternSchema.severity": "Sorunun öneminin eşleştirme grubu indeksi. Varsayılan değeri tanımsızdır",
-	"ProblemPatternSchema.code": "Sorunun kodunun eşleştirme grubu indeksi. Varsayılan değeri tanımsızdır",
-	"ProblemPatternSchema.message": "Mesajın eşleştirme grubu indeksi. Atlanırsa konum belirtildiğinde varsayılan olarak 4 kullanılır. Aksi taktirde varsayılan olarak 5 kullanılır.",
-	"ProblemPatternSchema.loop": "Birden çok satırlı eşleşmede döngü, bu kalıbın eşleştiği sürece bir döngüde yürütülüp yürütülmeyeceğini gösterir. Yalnızca birden çok satırlı bir kalıbın son kalıbında belirtilebilir.",
-	"NamedProblemPatternSchema.name": "Sorun modelinin adı.",
-	"NamedMultiLineProblemPatternSchema.name": "Birden çok satırlı sorun modelinin adı.",
-	"NamedMultiLineProblemPatternSchema.patterns": "Gerçek modeller.",
-	"ProblemPatternExtPoint": "Sorun modellerine ekleme yapar",
-	"ProblemPatternRegistry.error": "Geçersiz sorun modeli. Model yok sayılacaktır.",
-	"ProblemMatcherParser.noProblemMatcher": "Hata: açıklama bir sorun eşleştiricisine dönüştürülemez:\n{0}\n",
-	"ProblemMatcherParser.noProblemPattern": "Hata: açıklama geçerli bir sorun modeli tanımlamıyor:\n{0}\n",
-	"ProblemMatcherParser.noOwner": "Hata: açıklama bir sahip tanımlamıyor:\n{0}\n",
-	"ProblemMatcherParser.noFileLocation": "Hata: açıklama bir dosya yolu tanımlamıyor:\n{0}\n",
-	"ProblemMatcherParser.unknownSeverity": "Bilgi: bilinmeyen önem derecesi {0}. Geçerli değerler: error, warning ve info.\n",
-	"ProblemMatcherParser.noDefinedPatter": "Hata: tanımlayıcısı {0} olan model mevcut değil.",
-	"ProblemMatcherParser.noIdentifier": "Hata: model özelliği boş bir tanımlayıcıya karşılık geliyor.",
-	"ProblemMatcherParser.noValidIdentifier": "Hata: model özelliği {0} geçerli bir model değişkeni adı değil.",
-	"ProblemMatcherParser.problemPattern.watchingMatcher": "Bir sorun eşleştiricisi izlenecek bir başlangıç örüntüsü ve bir bitiş örüntüsü tanımlamalıdır.",
-	"ProblemMatcherParser.invalidRegexp": "Hata: Dize {0}, geçerli bir düzenli ifade değil.\n",
-	"WatchingPatternSchema.regexp": "Bir arka plan görevinin başlangıcını ve sonunu tespit edecek düzenli ifade.",
-	"WatchingPatternSchema.file": "Dosya adının eşleştirme grubu indeksi. Atlanabilir.",
-	"PatternTypeSchema.name": "Katkıda bulunulan veya ön tanımlı modelin adı",
-	"PatternTypeSchema.description": "Bir sorun modeli veya bir katkıda bulunulan veya ön tanımlı sorun modelinin adı. Temel model belirtildiyse atlanabilir.",
-	"ProblemMatcherSchema.base": "Kullanılacak temel sorun eşleştiricisinin adı.",
-	"ProblemMatcherSchema.owner": "Code'un içindeki sorunun sahibi. Temel model belirtildiyse atlanabilir. Atlanırsa ve temel belirtilmemişse 'external' varsayılır.",
-	"ProblemMatcherSchema.severity": "Sorun yakalamanın varsayılan önem derecesi. Model, önem derecesi için bir eşleme grubu tanımlamazsa kullanılır.",
-	"ProblemMatcherSchema.applyTo": "Bir metin belgesinde bildirilen bir sorunun sadece açık, kapalı veya tüm belgelere uygulanıp uygulanmadığını denetler.",
-	"ProblemMatcherSchema.fileLocation": "Bir sorun modelinde bildirilen dosya adlarının nasıl yorumlanacağını tanımlar.",
-	"ProblemMatcherSchema.background": "Bir arka plan görevinde aktif bir eşleştiricinin başlangıcını ve sonunu izlemek için kullanılan kalıplar.",
-	"ProblemMatcherSchema.background.activeOnStart": "\"true\" olarak ayarlanırsa, görev başladığında arka plan izleyicisi etkin modda olur. Bu, beginsPattern ile başlayan bir satırın verilmesi demektir",
-	"ProblemMatcherSchema.background.beginsPattern": "Çıktıda eşleşmesi halinde, arka plan görevinin başlatılması sinyali verilir.",
-	"ProblemMatcherSchema.background.endsPattern": "Çıktıda eşleşmesi halinde, arka plan görevinin sonu sinyali verilir.",
-	"ProblemMatcherSchema.watching.deprecated": "İzleme özelliği kullanım dışıdır. Onun yerine arka planı kullanın.",
-	"ProblemMatcherSchema.watching": "Bir izleme eşleştiricisinin başlangıcını ve sonunu izlemek için kullanılan kalıplar.",
-	"ProblemMatcherSchema.watching.activeOnStart": "\"true\" olarak ayarlanırsa, görev başladığında izleyici etkin modda olur. Bu, beginsPattern ile başlayan bir satırın verilmesi demektir",
-	"ProblemMatcherSchema.watching.beginsPattern": "Çıktıda eşleşmesi halinde, izleme görevinin başlatılması sinyali verilir.",
-	"ProblemMatcherSchema.watching.endsPattern": "Çıktıda eşleşmesi halinde, izleme görevinin sonu sinyali verilir.",
-	"LegacyProblemMatcherSchema.watchedBegin.deprecated": "Bu özellik kullanım dışıdır. Bunun yerine 'watching' özelliğini kullanın.",
-	"LegacyProblemMatcherSchema.watchedBegin": "İzlenen görevlerin yürütülmeye başlanmasının, dosya izleyerek tetiklendiğini işaret eden bir düzenli ifade.",
-	"LegacyProblemMatcherSchema.watchedEnd.deprecated": "Bu özellik kullanım dışıdır. Bunun yerine 'watching' özelliğini kullanın.",
-	"LegacyProblemMatcherSchema.watchedEnd": "İzlenen görevlerin yürütülmesinin sona erdiğini işaret eden bir düzenli ifade.",
-	"NamedProblemMatcherSchema.name": "Başvuru yapılırken kullanılacak sorun eşleştiricisinin adı.",
-	"NamedProblemMatcherSchema.label": "Sorun eşleştiricisinin insanlar tarafından okunabilir etiketi.",
-	"ProblemMatcherExtPoint": "Sorun eşleştiricilerine ekleme yapar",
-	"msCompile": "Microsoft derleyici sorunları",
-	"lessCompile": "Less sorunları",
-	"gulp-tsc": "Gulp TSC Sorunları",
-	"jshint": "JSHint sorunları",
-	"jshint-stylish": "JSHint stylish sorunları",
-	"eslint-compact": "ESLint compact sorunları",
-	"eslint-stylish": "ESLint stylish sorunları",
-	"go": "Go sorunları"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/platform/message/common/message.i18n.json b/i18n/trk/src/vs/platform/message/common/message.i18n.json
deleted file mode 100644
index e202ce636d4..00000000000
--- a/i18n/trk/src/vs/platform/message/common/message.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"close": "Kapat",
-	"later": "Daha Sonra",
-	"cancel": "İptal",
-	"moreFile": "...1 ek dosya gösterilmiyor",
-	"moreFiles": "...{0} ek dosya gösterilmiyor"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/platform/node/minimalTranslations.i18n.json b/i18n/trk/src/vs/platform/node/minimalTranslations.i18n.json
deleted file mode 100644
index 210da6e06a2..00000000000
--- a/i18n/trk/src/vs/platform/node/minimalTranslations.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"showLanguagePackExtensions": "VS Code {0} dilinde mevcuttur. Başlamak için Market'te dil paketlerini arayın.",
-	"searchMarketplace": "Marketi Ara",
-	"installAndRestartMessage": "VS Code {0} dilinde mevcuttur. Başlamak için dil paketini yükleyin. Yeniden başlatma gerektirir.",
-	"installAndRestart": "Yükle ve Yeniden Başlat"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/platform/request/node/request.i18n.json b/i18n/trk/src/vs/platform/request/node/request.i18n.json
deleted file mode 100644
index f08cfd421ea..00000000000
--- a/i18n/trk/src/vs/platform/request/node/request.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"httpConfigurationTitle": "HTTP",
-	"proxy": "Kullanılacak proxy ayarı. Ayarlanmazsa, http_proxy ve https_proxy ortam değişkenlerinden alınır",
-	"strictSSL": "Proxy sunucu sertifikasının verilen Sertifika Yetkilileri listesine göre doğrulanması gerekip gerekmediği.",
-	"proxyAuthorization": "Her ağ isteği için 'Proxy-Authorization' başlığı olarak gönderilecek değer."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/platform/telemetry/common/telemetryService.i18n.json b/i18n/trk/src/vs/platform/telemetry/common/telemetryService.i18n.json
deleted file mode 100644
index b40266621c2..00000000000
--- a/i18n/trk/src/vs/platform/telemetry/common/telemetryService.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"telemetryConfigurationTitle": "Telemetri",
-	"telemetry.enableTelemetry": "Kullanım verileri ve hataların Microsoft'a gönderilmesini etkinleştirin."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/platform/theme/common/colorExtensionPoint.i18n.json b/i18n/trk/src/vs/platform/theme/common/colorExtensionPoint.i18n.json
deleted file mode 100644
index 99a30f5c966..00000000000
--- a/i18n/trk/src/vs/platform/theme/common/colorExtensionPoint.i18n.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"contributes.color": "Eklenti tarafından tanımlanan tema olarak kullanılabilir renklere ekleme yapar",
-	"contributes.color.id": "Tema olarak kullanılabilir rengin tanımlayıcısı",
-	"contributes.color.id.format": "Tanımlayıcılar aa[.bb]* biçiminde olmalıdır",
-	"contributes.color.description": "Tema olarak kullanılabilir rengin açıklaması",
-	"contributes.defaults.light": "Açık temaların varsayılan rengi. Ya hex biçiminde bir renk değeri (#RRGGBB[AA]) ya da varsayılanı sağlayan bir tema olarak kullanılabilir rengin tanımlayıcısı olabilir.",
-	"contributes.defaults.dark": "Koyu temaların varsayılan rengi. Ya hex biçiminde bir renk değeri (#RRGGBB[AA]) ya da varsayılanı sağlayan bir tema olarak kullanılabilir rengin tanımlayıcısı olabilir.",
-	"contributes.defaults.highContrast": "Yüksek karşıtlık temalarının varsayılan rengi. Ya hex biçiminde bir renk değeri (#RRGGBB[AA]) ya da varsayılanı sağlayan bir tema olarak kullanılabilir rengin tanımlayıcısı olabilir.",
-	"invalid.colorConfiguration": "'configuration.colors' bir dizi olmalıdır",
-	"invalid.default.colorType": "{0}, ya hex biçiminde bir renk değeri (#RRGGBB[AA] veya #RGB[A]) ya da varsayılanı sağlayan bir tema olarak kullanılabilir rengin tanımlayıcısı olabilir.",
-	"invalid.id": "'configuration.colors.id' tanımlanmalı ve boş olmamalıdır",
-	"invalid.id.format": "'configuration.colors.id' sözcük[.sözcük]* şeklinde olmalıdır",
-	"invalid.description": "'configuration.colors.description' tanımlanmalı ve boş olmamalıdır",
-	"invalid.defaults": "'configuration.colors.defaults' tanımlanmalı ve 'light', 'dark' ve 'highContrast' değerlerini içermelidir"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/platform/theme/common/colorRegistry.i18n.json b/i18n/trk/src/vs/platform/theme/common/colorRegistry.i18n.json
deleted file mode 100644
index fdc69c2c9e4..00000000000
--- a/i18n/trk/src/vs/platform/theme/common/colorRegistry.i18n.json
+++ /dev/null
@@ -1,101 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"schema.colors": "Çalışma ekranında kullanılan renkler.",
-	"foreground": "Genel ön plan rengi. Bu renk, bir bileşen tarafından geçersiz kılınmadıkça kullanılır.",
-	"errorForeground": "Hata mesajları için genel ön plan rengi. Bu renk, bir bileşen tarafından geçersiz kılınmadıkça kullanılır.",
-	"descriptionForeground": "Ek bilgi sağlayan açıklama metni(örneğin bir etiket) için ön plan rengi.",
-	"focusBorder": "Odaklanılan ögeler için genel kenarlık rengi. Bu renk, bir bileşen tarafından geçersiz kılınmadıkça kullanılır.",
-	"contrastBorder": "Daha yüksek karşıtlık için, ögelerin etrafında onları diğerlerinden ayıracak ekstra bir kenarlık.",
-	"activeContrastBorder": "Daha yüksek karşıtlık için, aktif ögelerin etrafında onları diğerlerinden ayıracak ekstra bir kenarlık.",
-	"selectionBackground": "Çalışma ekranındaki metin seçimlerinin arka plan rengi(örneğin girdi alanları veya metin alanları). Bunun, düzenleyicideki seçimlere uygulanmayacağını unutmayın.",
-	"textSeparatorForeground": "Metin ayırıcıların rengi.",
-	"textLinkForeground": "Metindeki bağlantıların ön plan rengi.",
-	"textLinkActiveForeground": "Tıklandığında ve fareyle üzerine gelindiğinde metinlerdeki bağlantılar için ön plan rengi.",
-	"textPreformatForeground": "Önceden biçimlendirilmiş metin parçalarının ön plan rengi.",
-	"textBlockQuoteBackground": "Metindeki alıntı bloklarının arka plan rengi.",
-	"textBlockQuoteBorder": "Metindeki alıntı bloklarının kenarlık rengi.",
-	"textCodeBlockBackground": "Metindeki kod bloklarının arka plan rengi.",
-	"widgetShadow": "Bul/değiştir gibi düzenleyici içindeki araçların gölge rengi.",
-	"inputBoxBackground": "Giriş kutusu arka planı.",
-	"inputBoxForeground": "Giriş kutusu ön planı.",
-	"inputBoxBorder": "Giriş kutusu kenarlığı.",
-	"inputBoxActiveOptionBorder": "Girdi alanlarındaki aktif seçeneklerin kenarlık rengi.",
-	"inputPlaceholderForeground": "Yer tutucu metin için girdi kutusu ön plan rengi.",
-	"inputValidationInfoBackground": "Bilgi önem derecesi için girdi doğrulama arka plan rengi.",
-	"inputValidationInfoBorder": "Bilgi önem derecesi için girdi doğrulama kenarlık rengi.",
-	"inputValidationWarningBackground": "Uyarı önem derecesi için girdi doğrulama arka plan rengi.",
-	"inputValidationWarningBorder": "Uyarı önem derecesi için girdi doğrulama kenarlık rengi.",
-	"inputValidationErrorBackground": "Hata önem derecesi için girdi doğrulama arka plan rengi.",
-	"inputValidationErrorBorder": "Hata önem derecesi için girdi doğrulama kenarlık rengi.",
-	"dropdownBackground": "Açılır kutu arka planı.",
-	"dropdownListBackground": "Açılır kutu listesi arka planı.",
-	"dropdownForeground": "Açılır kutu ön planı.",
-	"dropdownBorder": "Açılır kutu kenarlığı.",
-	"listFocusBackground": "Liste/Ağaç aktifken odaklanılan ögenin Lise/Ağaç arka plan rengi. Bir aktif liste/ağaç, klavye odağındadır; pasif olan odakta değildir.",
-	"listFocusForeground": "Liste/Ağaç aktifken odaklanılan ögenin Lise/Ağaç ön plan rengi. Bir aktif liste/ağaç, klavye odağındadır; pasif olan odakta değildir.",
-	"listActiveSelectionBackground": "Liste/Ağaç aktifken seçilen ögenin Lise/Ağaç arka plan rengi. Bir aktif liste/ağaç, klavye odağındadır; pasif olan odakta değildir.",
-	"listActiveSelectionForeground": "Liste/Ağaç aktifken seçilen ögenin Lise/Ağaç ön plan rengi. Bir aktif liste/ağaç, klavye odağındadır; pasif olan odakta değildir.",
-	"listInactiveSelectionBackground": "Liste/Ağaç pasifken seçilen ögenin Lise/Ağaç arka plan rengi. Bir aktif liste/ağaç, klavye odağındadır; pasif olan odakta değildir.",
-	"listInactiveSelectionForeground": "Liste/Ağaç pasifken seçilen ögenin Lise/Ağaç ön plan rengi. Bir aktif liste/ağaç, klavye odağındadır; pasif olan odakta değildir.",
-	"listHoverBackground": "Fare ile ögelerin üzerine gelindiğinde Liste/Ağaç arka planı.",
-	"listHoverForeground": "Fare ile ögelerin üzerine gelindiğinde Liste/Ağaç ön planı.",
-	"listDropBackground": "Fare ile ögeler taşınırken Liste/Ağaç sürükle ve bırak arka planı.",
-	"highlight": "Liste/Ağaç içinde arama yaparken eşleşme vurgularının Liste/Ağaç ön plan rengi.",
-	"invalidItemForeground": "Gezginde çözümlenmemiş bir kök klasör gibi geçersiz ögeler için Liste/Ağaç ön plan rengi.",
-	"listErrorForeground": "Hata içeren liste ögelerinin ön plan rengi.",
-	"listWarningForeground": "Uyarı içeren liste ögelerinin ön plan rengi.",
-	"pickerGroupForeground": "Gruplama etiketleri için hızlı seçici rengi.",
-	"pickerGroupBorder": "Gruplama kenarlıkları için hızlı seçici rengi.",
-	"buttonForeground": "Buton ön plan rengi.",
-	"buttonBackground": "Buton arka plan rengi.",
-	"buttonHoverBackground": "Fareyle üzerine gelindiğinde buton arka plan rengi.",
-	"badgeBackground": "Gösterge arka plan rengi. Göstergeler küçük bilgi etiketleridir, ör. arama sonucu sayısı için.",
-	"badgeForeground": "Gösterge ön plan rengi. Göstergeler küçük bilgi etiketleridir, ör. arama sonucu sayısı için.",
-	"scrollbarShadow": "Görünümün kaydırıldığını belirtmek için kaydırma çubuğu gölgesi.",
-	"scrollbarSliderBackground": "Kaydırma çubuğu kaydıracının arka plan rengi.",
-	"scrollbarSliderHoverBackground": "Fareyle üzerine gelindiğinde kaydırma çubuğu kaydıracının arka plan rengi.",
-	"scrollbarSliderActiveBackground": "Tıklandığında kaydırma çubuğu kaydırıcısı arka plan rengi.",
-	"progressBarBackground": "Uzun süren işlemleri gösterebilen ilerleme çubuğunun arka plan rengi.",
-	"editorBackground": "Düzenleyici arka plan rengi.",
-	"editorForeground": "Düzenleyici varsayılan ön plan rengi.",
-	"editorWidgetBackground": "Bul/değiştir gibi düzenleyici araçlarının arka plan rengi.",
-	"editorWidgetBorder": "Editör araçlarının kenarlık rengi. Renk, araç bir kenarlığı olmasına karar verdiğinde ve renk hiçbir eklenti tarafından geçersiz kılınmadığında kullanılır.",
-	"editorSelectionBackground": "Düzenleyici seçiminin rengi.",
-	"editorSelectionForeground": "Yüksek karşıtlık için seçilen metnin rengi.",
-	"editorInactiveSelection": "Aktif olmayan bir düzenleyicideki seçimin rengi. Altta yer alan süslemeleri gizlememek için renk opak olmamalıdır.",
-	"editorSelectionHighlight": "Seçimle aynı içeriğe sahip bölgelerin rengi. Altta yer alan süslemeleri gizlememek için renk opak olmamalıdır.",
-	"editorSelectionHighlightBorder": "Seçimle aynı içeriğe sahip bölgelerin kenarlık rengi.",
-	"editorFindMatch": "Geçerli arama eşleşmesinin rengi.",
-	"findMatchHighlight": "Diğer arama eşleşmelerinin rengi. Altta yer alan süslemeleri gizlememek için renk opak olmamalıdır.",
-	"findRangeHighlight": "Aramayı sınırlandıran aralığın rengi. Altta yer alan süslemeleri gizlememek için renk opak olmamalıdır.",
-	"editorFindMatchBorder": "Geçerli arama eşleşmesinin kenarlık rengi.",
-	"findMatchHighlightBorder": "Diğer arama eşleşmelerinin kenarlık rengi.",
-	"findRangeHighlightBorder": "Aramayı sınırlandıran aralığın kenarlık rengi. Altta yer alan süslemeleri gizlememek için renk opak olmamalıdır.",
-	"findWidgetResizeBorder": "Gereç bulmak için yeniden boyutlandırma çubuğunun kenarlık rengi.",
-	"hoverHighlight": "Sözcüğün altında yer alan bağlantı vurgusu. Altta yer alan süslemeleri gizlememek için renk opak olmamalıdır.",
-	"hoverBackground": "Düzenleyici bağlantı vurgusunun arka plan rengi.",
-	"hoverBorder": "Düzenleyici bağlantı vurgusunun kenarlık rengi.",
-	"activeLinkForeground": "Aktif bağlantıların rengi.",
-	"diffEditorInserted": "Eklenmiş metin için arka plan rengi. Altta yer alan süslemeleri gizlememek için renk opak olmamalıdır.",
-	"diffEditorRemoved": "Kaldırılmış metin için arka plan rengi. Altta yer alan süslemeleri gizlememek için renk opak olmamalıdır.",
-	"diffEditorInsertedOutline": "Eklenen metnin ana hat rengi.",
-	"diffEditorRemovedOutline": "Çıkarılan metnin ana hat rengi.",
-	"mergeCurrentHeaderBackground": "Satır içi birleştirme çakışmalarında \"mevcut olan\" üstbilgisi arka planı. Altta yer alan süslemeleri gizlememek için renk opak olmamalıdır.",
-	"mergeCurrentContentBackground": "Satır içi birleştirme çakışmalarında mevcut olan içeriğin arka planı. Altta yer alan süslemeleri gizlememek için renk opak olmamalıdır.",
-	"mergeIncomingHeaderBackground": "Satır içi birleştirme çakışmalarında \"gelen değişiklik\" üstbilgisi arka planı. Altta yer alan süslemeleri gizlememek için renk opak olmamalıdır.",
-	"mergeIncomingContentBackground": "Satır içi birleştirme çakışmalarında gelen değişiklik içeriğinin arka planı. Altta yer alan süslemeleri gizlememek için renk opak olmamalıdır.",
-	"mergeCommonHeaderBackground": "Satır içi birleştirme çakışmalarında ortak ata üstbilgisi arka planı. Altta yer alan süslemeleri gizlememek için renk opak olmamalıdır.",
-	"mergeCommonContentBackground": "Satır içi birleştirme çakışmalarında ortak ata içeriğinin arka planı. Altta yer alan süslemeleri gizlememek için renk opak olmamalıdır.",
-	"mergeBorder": "Satır içi birleştirme çakışmalarında üst bilgi ve ayırıcıdaki kenarlık rengi.",
-	"overviewRulerCurrentContentForeground": "Satır içi birleştirme çakışmalarında \"mevcut olan\" için genel bakış cetveli ön planı.",
-	"overviewRulerIncomingContentForeground": "Satır içi birleştirme çakışmalarında gelen genel bakış cetveli ön planı.",
-	"overviewRulerCommonContentForeground": "Satır içi birleştirme çakışmalarında ortak ata genel bakış cetveli ön planı.",
-	"overviewRulerFindMatchForeground": "Bulunan eşler için genel bakış cetvelinin işaretleyici rengi. Altta yer alan süslemeleri gizlememek için renk opak olmamalıdır.",
-	"overviewRulerSelectionHighlightForeground": "Seçim vurguları için genel bakış cetvelinin işaretleyici rengi. Altta yer alan süslemeleri gizlememek için renk opak olmamalıdır."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/platform/update/node/update.config.contribution.i18n.json b/i18n/trk/src/vs/platform/update/node/update.config.contribution.i18n.json
deleted file mode 100644
index e0eaedd320f..00000000000
--- a/i18n/trk/src/vs/platform/update/node/update.config.contribution.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"updateConfigurationTitle": "Güncelle",
-	"updateChannel": "Güncelleştirme kanalından otomatik güncelleştirmeler alıp almayacağınızı ayarlayın. Değişiklikten sonra yeniden başlatma gerektirir.",
-	"enableWindowsBackgroundUpdates": "Windows arka plan güncelleştirmelerini etkinleştirir."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/platform/url/electron-browser/inactiveExtensionUrlHandler.i18n.json b/i18n/trk/src/vs/platform/url/electron-browser/inactiveExtensionUrlHandler.i18n.json
deleted file mode 100644
index c4def8b43b0..00000000000
--- a/i18n/trk/src/vs/platform/url/electron-browser/inactiveExtensionUrlHandler.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"confirmUrl": "Bir uzantının bu URL'yi açmasına izin verilsin mi?"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/platform/windows/electron-main/windowsService.i18n.json b/i18n/trk/src/vs/platform/windows/electron-main/windowsService.i18n.json
deleted file mode 100644
index a6d2b39f11e..00000000000
--- a/i18n/trk/src/vs/platform/windows/electron-main/windowsService.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"aboutDetail": "Sürüm {0}\nCommit {1}\nTarih {2}\nKabuk {3}\nRender Alan {4}\nNode {5}\nMimari {6}",
-	"okButton": "Tamam",
-	"copy": "K&&opyala"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/platform/workspaces/common/workspaces.i18n.json b/i18n/trk/src/vs/platform/workspaces/common/workspaces.i18n.json
deleted file mode 100644
index bc99a3fde22..00000000000
--- a/i18n/trk/src/vs/platform/workspaces/common/workspaces.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"codeWorkspace": "Code Çalışma Alanı",
-	"untitledWorkspace": "İsimsiz (Çalışma Alanı)",
-	"workspaceNameVerbose": "{0} (Çalışma Alanı)",
-	"workspaceName": "{0} (Çalışma Alanı)"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/api/browser/localizationsExtensionPoint.i18n.json b/i18n/trk/src/vs/workbench/api/browser/localizationsExtensionPoint.i18n.json
deleted file mode 100644
index 9fad4e4b4ca..00000000000
--- a/i18n/trk/src/vs/workbench/api/browser/localizationsExtensionPoint.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"requirestring": "`{0}` özelliği zorunludur ve `string` türünde olmalıdır",
-	"optstring": "`{0}` özelliği atlanabilir veya `string` türünde olmalıdır"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/api/browser/viewsContainersExtensionPoint.i18n.json b/i18n/trk/src/vs/workbench/api/browser/viewsContainersExtensionPoint.i18n.json
deleted file mode 100644
index b527b7de844..00000000000
--- a/i18n/trk/src/vs/workbench/api/browser/viewsContainersExtensionPoint.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.contributes.views.containers.id": "'views' (görünümler) ekleme noktası kullanılarak ekleme yapılabilecek görünümlerde, kapsayıcıyı tanımlamakta kullanılacak benzersiz ID",
-	"vscode.extension.contributes.views.containers.title": "Kapsayıcıda gösterilecek insanlar tarafından okunabilir dize",
-	"vscode.extension.contributes.views.containers.icon": "Kapsayıcı simgesinin yolu. Simgeler, 50x40'lık bir blok içinde 24x24 olarak ortalanmış ve 'rgb(215, 218, 224)' veya '#d7dae0' dolgu rengine sahiptir. Simgelerin SVG formatında olması tavsiye edilir ancak herhangi bir resim dosyası türü kabul edilir.",
-	"vscode.extension.contributes.viewsContainers": "Görünüm kapsayıcılarını düzenleyiciye ekler.",
-	"views.container.activitybar": "Etkinlik Çubuğu'na görünüm kapsayıcıları ekle",
-	"test": "Test",
-	"requirearray": "görünüm kapsayıcıları bir dizi olmalıdır",
-	"requireidstring": "`{0}` özelliği zorunludur ve `string` türünde olmalıdır. Sadece abecesayısal(alphanumeric), '_', ve '-' karakterlerine izin verilir.",
-	"requirestring": "`{0}` özelliği zorunludur ve `string` türünde olmalıdır",
-	"showViewlet": "{0}'i Göster",
-	"view": "Görüntüle"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json b/i18n/trk/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json
deleted file mode 100644
index 3c92c8ee5f9..00000000000
--- a/i18n/trk/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"requirearray": "görünümler bir dizi olmalıdır",
-	"requirestring": "`{0}` özelliği zorunludur ve `string` türünde olmalıdır",
-	"optstring": "`{0}` özelliği atlanabilir veya `string` türünde olmalıdır",
-	"vscode.extension.contributes.view.id": "Görünümün tanımlayıcısı. Bunu, `vscode.window.registerTreeDataProviderForView` API ile bir veri sağlayıcısı kaydetmek için kullanın. Ayrıca `onView:${id}` olayını `activationEvents` ögesine kaydederek eklentinizi etkinleştirmeyi tetikleyin.",
-	"vscode.extension.contributes.view.name": "Görünümün insanlar tarafından okunabilir adı. Gösterilecektir",
-	"vscode.extension.contributes.view.when": "Bu görünümü göstermek için doğru olması gereken koşul",
-	"vscode.extension.contributes.views": "Görünümleri düzenleyiciye ekler.",
-	"views.explorer": "Etkinlik Çubuğu'ndaki Gezgin kapsayıcısına görünümler ekler",
-	"views.debug": "Etkinlik Çubuğu'ndaki Hata Ayıklama kapsayıcısına görünümler ekler",
-	"views.scm": "Etkinlik Çubuğu'ndaki SCM kapsayıcısına görünümler ekler",
-	"views.test": "Etkinlik Çubuğu'ndaki Test kapsayıcısına görünümler ekler",
-	"views.contributed": "Görünümleri katkıda bulunan görünümü kapsayıcısına ekler",
-	"ViewContainerDoesnotExist": "'{0}' görünüm kapsayıcısı mevcut değil ve ona kayıtlı tüm görünümler 'Explorer'a eklenecektir.",
-	"duplicateView1": "`{1}` konumunda aynı `{0}` id'sine sahip birden çok görünüm kaydedilemiyor",
-	"duplicateView2": "`{0}` id'sine sahip bir görünüm `{1}` konumunda zaten kayıtlı"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/api/electron-browser/mainThreadExtensionService.i18n.json b/i18n/trk/src/vs/workbench/api/electron-browser/mainThreadExtensionService.i18n.json
deleted file mode 100644
index 0a8ef8463d3..00000000000
--- a/i18n/trk/src/vs/workbench/api/electron-browser/mainThreadExtensionService.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"overwritingExtension": "{0} eklentisinin üzerine {1} yazılıyor.",
-	"extensionUnderDevelopment": "{0} konumundaki geliştirme eklentisi yükleniyor"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/api/electron-browser/mainThreadMessageService.i18n.json b/i18n/trk/src/vs/workbench/api/electron-browser/mainThreadMessageService.i18n.json
deleted file mode 100644
index 465bcf90b54..00000000000
--- a/i18n/trk/src/vs/workbench/api/electron-browser/mainThreadMessageService.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"extensionSource": "{0} (Eklenti)",
-	"defaultSource": "Eklenti",
-	"manageExtension": "Eklentiyi Yönet",
-	"cancel": "İptal",
-	"ok": "Tamam"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json b/i18n/trk/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
deleted file mode 100644
index 15d5c003a77..00000000000
--- a/i18n/trk/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"timeout.formatOnSave": "Kaydederken biçimlendirme {0}ms sonrasında durduruldu",
-	"codeActionsOnSave.didTimeout": "{0}ms sonra codeActionsOnSave durduruldu",
-	"timeout.onWillSave": "onWillSaveTextDocument olayı 1750ms sonrasında durduruldu",
-	"saveParticipants": "Katılımcıların Kaydedilmesi İşlemi Çalıştırılıyor..."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json b/i18n/trk/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json
deleted file mode 100644
index ee8688cdc85..00000000000
--- a/i18n/trk/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"task.label": "{0}: {1}"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/api/electron-browser/mainThreadWebview.i18n.json b/i18n/trk/src/vs/workbench/api/electron-browser/mainThreadWebview.i18n.json
deleted file mode 100644
index d58fb353ecc..00000000000
--- a/i18n/trk/src/vs/workbench/api/electron-browser/mainThreadWebview.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"errorMessage": "Görünüm geri yüklenirken bir hata oluştu:{0}"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/api/electron-browser/mainThreadWorkspace.i18n.json b/i18n/trk/src/vs/workbench/api/electron-browser/mainThreadWorkspace.i18n.json
deleted file mode 100644
index 5d1720a3df1..00000000000
--- a/i18n/trk/src/vs/workbench/api/electron-browser/mainThreadWorkspace.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"folderStatusMessageAddSingleFolder": "'{0}' eklentisi çalışma alanına 1 klasör ekledi",
-	"folderStatusMessageAddMultipleFolders": "'{0}' eklentisi çalışma alanına {1} klasör ekledi",
-	"folderStatusMessageRemoveSingleFolder": "'{0}' eklentisi çalışma alanından 1 klasör kaldırdı",
-	"folderStatusMessageRemoveMultipleFolders": "'{0}' eklentisi çalışma alanından {1} klasör kaldırdı",
-	"folderStatusChangeFolder": "'{0}' eklentisi çalışma alanındaki klasörleri değiştirdi"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/api/node/extHostDiagnostics.i18n.json b/i18n/trk/src/vs/workbench/api/node/extHostDiagnostics.i18n.json
deleted file mode 100644
index ed20f6839d1..00000000000
--- a/i18n/trk/src/vs/workbench/api/node/extHostDiagnostics.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"limitHit": "Diğer {0} hata ve uyarılar gösterilmiyor."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/api/node/extHostExtensionActivator.i18n.json b/i18n/trk/src/vs/workbench/api/node/extHostExtensionActivator.i18n.json
deleted file mode 100644
index be3c5de903c..00000000000
--- a/i18n/trk/src/vs/workbench/api/node/extHostExtensionActivator.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"unknownDep": "'{1}' eklentisi etkinleştirilemedi. Neden: bilinmeyen bağımlılık '{0}'.",
-	"failedDep1": "'{1}' eklentisi etkinleştirilemedi. Neden: bağımlılık '{0}' etkinleştirilemedi.",
-	"failedDep2": "'{0}' eklentisi etkinleştirilemedi. Neden: 10'dan fazla bağımlılık düzeyi (büyük olasılıkla bağımlılık döngüsü).",
-	"activationError": "'{0}' eklentisi etkinleştirilemedi: {1}."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/api/node/extHostProgress.i18n.json b/i18n/trk/src/vs/workbench/api/node/extHostProgress.i18n.json
deleted file mode 100644
index b8ebfa4861f..00000000000
--- a/i18n/trk/src/vs/workbench/api/node/extHostProgress.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"extensionSource": "{0} (Eklenti)"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/api/node/extHostTask.i18n.json b/i18n/trk/src/vs/workbench/api/node/extHostTask.i18n.json
deleted file mode 100644
index ee8688cdc85..00000000000
--- a/i18n/trk/src/vs/workbench/api/node/extHostTask.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"task.label": "{0}: {1}"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/api/node/extHostTreeViews.i18n.json b/i18n/trk/src/vs/workbench/api/node/extHostTreeViews.i18n.json
deleted file mode 100644
index 45dce70f0b9..00000000000
--- a/i18n/trk/src/vs/workbench/api/node/extHostTreeViews.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"treeView.notRegistered": "Kayıtlı '{0}' Id'li ağaç görünümü yok.",
-	"treeView.duplicateElement": "{0} id'sine sahip bir öge zaten kayıtlı"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/api/node/extHostWorkspace.i18n.json b/i18n/trk/src/vs/workbench/api/node/extHostWorkspace.i18n.json
deleted file mode 100644
index c8e9b71ccda..00000000000
--- a/i18n/trk/src/vs/workbench/api/node/extHostWorkspace.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"updateerror": "'{0}' eklentisinin çalışma alanındaki klasörleri güncellemesi başarısız oldu: {1}"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/browser/actions/configureLocale.i18n.json b/i18n/trk/src/vs/workbench/browser/actions/configureLocale.i18n.json
deleted file mode 100644
index d7620dc687c..00000000000
--- a/i18n/trk/src/vs/workbench/browser/actions/configureLocale.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"configureLocale": "Dili Yapılandır",
-	"displayLanguage": "VSCode'un görüntüleme dilini tanımlar.",
-	"doc": "Desteklenen dillerin listesi için göz atın: {0}",
-	"restart": "Değeri değiştirirseniz VSCode'u yeniden başlatmanız gerekir.",
-	"fail.createSettings": " '{0}' oluşturulamadı ({1}).",
-	"JsonSchema.locale": "Kullanılacak Kullanıcı Arayüzü Dili."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/browser/actions/fileActions.i18n.json b/i18n/trk/src/vs/workbench/browser/actions/fileActions.i18n.json
deleted file mode 100644
index dd1f86a2b56..00000000000
--- a/i18n/trk/src/vs/workbench/browser/actions/fileActions.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"openFolder": "Klasör Aç...",
-	"openFileFolder": "Aç...",
-	"addFolderToWorkspace": "Çalışma Alanına Klasör Ekle...",
-	"add": "Ekle",
-	"addFolderToWorkspaceTitle": "Çalışma Alanına Klasör Ekle",
-	"removeFolderFromWorkspace": "Çalışma Alanından Klasör Kaldır"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/browser/actions/toggleActivityBarVisibility.i18n.json b/i18n/trk/src/vs/workbench/browser/actions/toggleActivityBarVisibility.i18n.json
deleted file mode 100644
index 693109980eb..00000000000
--- a/i18n/trk/src/vs/workbench/browser/actions/toggleActivityBarVisibility.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleActivityBar": "Etkinlik Çubuğunu Gizle/Göster",
-	"view": "Görüntüle"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/browser/actions/toggleCenteredLayout.i18n.json b/i18n/trk/src/vs/workbench/browser/actions/toggleCenteredLayout.i18n.json
deleted file mode 100644
index c4e35172967..00000000000
--- a/i18n/trk/src/vs/workbench/browser/actions/toggleCenteredLayout.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleCenteredLayout": "Ortalanmış Düzeni Aç/Kapat",
-	"view": "Görüntüle"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/browser/actions/toggleEditorLayout.i18n.json b/i18n/trk/src/vs/workbench/browser/actions/toggleEditorLayout.i18n.json
deleted file mode 100644
index 6d7faa28e94..00000000000
--- a/i18n/trk/src/vs/workbench/browser/actions/toggleEditorLayout.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleEditorGroupLayout": "Düzenleyici Grubunu Dikey/Yatay Düzende Değiştir",
-	"horizontalLayout": "Yatay Düzenleyici Grubu Düzeni",
-	"verticalLayout": "Dikey Düzenleyici Grubu Düzeni",
-	"view": "Görüntüle"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/browser/actions/toggleSidebarPosition.i18n.json b/i18n/trk/src/vs/workbench/browser/actions/toggleSidebarPosition.i18n.json
deleted file mode 100644
index 64026c9f1be..00000000000
--- a/i18n/trk/src/vs/workbench/browser/actions/toggleSidebarPosition.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleSidebarPosition": "Kenar Çubuğu Konumunu Değiştir",
-	"view": "Görüntüle"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/browser/actions/toggleSidebarVisibility.i18n.json b/i18n/trk/src/vs/workbench/browser/actions/toggleSidebarVisibility.i18n.json
deleted file mode 100644
index 866d576aa9b..00000000000
--- a/i18n/trk/src/vs/workbench/browser/actions/toggleSidebarVisibility.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleSidebar": "Kenar Çubuğunu Gizle/Göster",
-	"view": "Görüntüle"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/browser/actions/toggleStatusbarVisibility.i18n.json b/i18n/trk/src/vs/workbench/browser/actions/toggleStatusbarVisibility.i18n.json
deleted file mode 100644
index e6118929b66..00000000000
--- a/i18n/trk/src/vs/workbench/browser/actions/toggleStatusbarVisibility.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleStatusbar": "Durum Çubuğunu Gizle/Göster",
-	"view": "Görüntüle"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/browser/actions/toggleTabsVisibility.i18n.json b/i18n/trk/src/vs/workbench/browser/actions/toggleTabsVisibility.i18n.json
deleted file mode 100644
index 3bd4d207687..00000000000
--- a/i18n/trk/src/vs/workbench/browser/actions/toggleTabsVisibility.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleTabs": "Sekme Görünürlüğünü Aç/Kapat",
-	"view": "Görüntüle"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/browser/actions/toggleZenMode.i18n.json b/i18n/trk/src/vs/workbench/browser/actions/toggleZenMode.i18n.json
deleted file mode 100644
index b4985ae48fa..00000000000
--- a/i18n/trk/src/vs/workbench/browser/actions/toggleZenMode.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleZenMode": "Zen Modunu Aç/Kapat",
-	"view": "Görüntüle"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/browser/actions/workspaceActions.i18n.json b/i18n/trk/src/vs/workbench/browser/actions/workspaceActions.i18n.json
deleted file mode 100644
index ca5ef369836..00000000000
--- a/i18n/trk/src/vs/workbench/browser/actions/workspaceActions.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openFile": "Dosya Aç...",
-	"openFolder": "Klasör Aç...",
-	"openFileFolder": "Aç...",
-	"globalRemoveFolderFromWorkspace": "Çalışma Alanından Klasör Kaldır...",
-	"saveWorkspaceAsAction": "Çalışma Alanını Farklı Kaydet...",
-	"save": "&&Kaydet",
-	"saveWorkspace": "Çalışma Alanını Kaydet",
-	"openWorkspaceAction": "Çalışma Alanı Aç...",
-	"openWorkspaceConfigFile": "Çalışma Alanı Yapılandırma Dosyasını Aç"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/browser/actions/workspaceCommands.i18n.json b/i18n/trk/src/vs/workbench/browser/actions/workspaceCommands.i18n.json
deleted file mode 100644
index 1986c3bda9b..00000000000
--- a/i18n/trk/src/vs/workbench/browser/actions/workspaceCommands.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"addFolderToWorkspace": "Çalışma Alanına Klasör Ekle...",
-	"add": "&&Ekle",
-	"addFolderToWorkspaceTitle": "Çalışma Alanına Klasör Ekle",
-	"workspaceFolderPickerPlaceholder": "Çalışma alanı klasörü seçin"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/browser/parts/activitybar/activitybarActions.i18n.json b/i18n/trk/src/vs/workbench/browser/parts/activitybar/activitybarActions.i18n.json
deleted file mode 100644
index 4dac5bcdce6..00000000000
--- a/i18n/trk/src/vs/workbench/browser/parts/activitybar/activitybarActions.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"badgeTitle": "{0} - {1}",
-	"titleKeybinding": "{0} ({1})",
-	"removeFromActivityBar": "Etkinlik Çubuğunda Gizle",
-	"keepInActivityBar": "Etkinlik Çubuğunda Tut",
-	"additionalViews": "Ek Görünümler",
-	"numberBadge": "{0} ({1})",
-	"manageExtension": "Eklentiyi Yönet",
-	"toggle": "Görünüm Sabitlemeyi Aç/Kapat"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/browser/parts/activitybar/activitybarPart.i18n.json b/i18n/trk/src/vs/workbench/browser/parts/activitybar/activitybarPart.i18n.json
deleted file mode 100644
index 96ef0834702..00000000000
--- a/i18n/trk/src/vs/workbench/browser/parts/activitybar/activitybarPart.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hideActivitBar": "Etkinlik Çubuğunu Gizle",
-	"globalActions": "Global Eylemler"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/browser/parts/compositePart.i18n.json b/i18n/trk/src/vs/workbench/browser/parts/compositePart.i18n.json
deleted file mode 100644
index 130c499c395..00000000000
--- a/i18n/trk/src/vs/workbench/browser/parts/compositePart.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"ariaCompositeToolbarLabel": "{0} eylem",
-	"titleTooltip": "{0} ({1})"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/browser/parts/compositebar/compositeBar.i18n.json b/i18n/trk/src/vs/workbench/browser/parts/compositebar/compositeBar.i18n.json
deleted file mode 100644
index 6d881925398..00000000000
--- a/i18n/trk/src/vs/workbench/browser/parts/compositebar/compositeBar.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"activityBarAriaLabel": "Aktif Görünüm Değiştirici"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/browser/parts/compositebar/compositeBarActions.i18n.json b/i18n/trk/src/vs/workbench/browser/parts/compositebar/compositeBarActions.i18n.json
deleted file mode 100644
index 8bec25a13df..00000000000
--- a/i18n/trk/src/vs/workbench/browser/parts/compositebar/compositeBarActions.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"largeNumberBadge": "10k+",
-	"badgeTitle": "{0} - {1}",
-	"additionalViews": "Ek Görünümler",
-	"numberBadge": "{0} ({1})",
-	"manageExtension": "Eklentiyi Yönet",
-	"titleKeybinding": "{0} ({1})",
-	"hide": "Gizle",
-	"keep": "Yerinde Tut",
-	"toggle": "Görünüm Sabitlemeyi Aç/Kapat"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/browser/parts/editor/binaryDiffEditor.i18n.json b/i18n/trk/src/vs/workbench/browser/parts/editor/binaryDiffEditor.i18n.json
deleted file mode 100644
index ea1317f6659..00000000000
--- a/i18n/trk/src/vs/workbench/browser/parts/editor/binaryDiffEditor.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"metadataDiff": "{0} ↔ {1}"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/browser/parts/editor/binaryEditor.i18n.json b/i18n/trk/src/vs/workbench/browser/parts/editor/binaryEditor.i18n.json
deleted file mode 100644
index 982f104745e..00000000000
--- a/i18n/trk/src/vs/workbench/browser/parts/editor/binaryEditor.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"binaryEditor": "İkili Görüntüleyici"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json b/i18n/trk/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json
deleted file mode 100644
index 00ae5c22030..00000000000
--- a/i18n/trk/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"textEditor": "Metin Düzenleyicisi",
-	"textDiffEditor": "Metin Diff Düzenleyicisi",
-	"binaryDiffEditor": "İkili Diff Düzenleyicisi",
-	"sideBySideEditor": "Yan Yana Düzenleyici",
-	"groupOnePicker": "İlk Gruptaki Düzenleyicileri Göster",
-	"groupTwoPicker": "İkinci Gruptaki Düzenleyicileri Göster",
-	"groupThreePicker": "Üçüncü Gruptaki Düzenleyicileri Göster",
-	"allEditorsPicker": "Açık Tüm Düzenleyicileri Göster",
-	"view": "Görüntüle",
-	"file": "Dosya",
-	"close": "Kapat",
-	"closeOthers": "Diğerlerini Kapat",
-	"closeRight": "Sağdakileri Kapat",
-	"closeAllSaved": "Kaydedilenleri Kapat",
-	"closeAll": "Tümünü Kapat",
-	"keepOpen": "Açık Tut",
-	"toggleInlineView": "Satır İçi Görünümü Aç/Kapat",
-	"showOpenedEditors": "Açık Düzenleyicileri Göster",
-	"keepEditor": "Düzenleyiciyi Tut",
-	"closeEditorsInGroup": "Gruptaki Tüm Düzenleyicileri Kapat",
-	"closeSavedEditors": "Gruptaki Kaydedilmiş Düzenleyicileri Kapat",
-	"closeOtherEditors": "Diğer Düzenleyicileri Kapat",
-	"closeRightEditors": "Düzenleyicinin Sağındakileri Kapat"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/browser/parts/editor/editorActions.i18n.json b/i18n/trk/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
deleted file mode 100644
index 90a1b3244f9..00000000000
--- a/i18n/trk/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
+++ /dev/null
@@ -1,58 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"splitEditor": "Düzenleyiciyi Böl",
-	"joinTwoGroups": "İki Gruptaki Düzenleyicileri Birleştir",
-	"navigateEditorGroups": "Düzenleyici Grupları Arasında Gezin",
-	"focusActiveEditorGroup": "Aktif Düzenleyici Grubuna Odakla",
-	"focusFirstEditorGroup": "İlk Düzenleyici Grubuna Odakla",
-	"focusSecondEditorGroup": "İkinci Düzenleyici Grubuna Odakla",
-	"focusThirdEditorGroup": "Üçüncü Düzenleyici Grubuna Odakla",
-	"focusPreviousGroup": "Önceki Gruba Odakla",
-	"focusNextGroup": "Sonraki Gruba Odakla",
-	"openToSide": "Yana Aç",
-	"closeEditor": "Düzenleyiciyi Kapat",
-	"closeOneEditor": "Kapat",
-	"revertAndCloseActiveEditor": "Geri Al ve Düzenleyiciyi Kapat",
-	"closeEditorsToTheLeft": "Düzenleyicinin Solundakileri Kapat",
-	"closeAllEditors": "Tüm Düzenleyicileri Kapat",
-	"closeEditorsInOtherGroups": "Diğer Gruplardaki Tüm Düzenleyicileri Kapat",
-	"moveActiveGroupLeft": "Düzenleyici Grubunu Sola Taşı",
-	"moveActiveGroupRight": "Düzenleyici Grubunu Sağa Taşı",
-	"minimizeOtherEditorGroups": "Diğer Düzenleyici Gruplarını Küçült",
-	"evenEditorGroups": "Düzenleyici Grup Genişliklerini Eşitle",
-	"maximizeEditor": "Düzenleyici Grubunu Olabildiğince Genişlet ve Kenar Çubuğunu Gizle",
-	"openNextEditor": "Sonraki Düzenleyiciyi Aç",
-	"openPreviousEditor": "Önceki Düzenleyiciyi Aç",
-	"nextEditorInGroup": "Gruptaki Sonraki Düzenleyiciyi Aç",
-	"openPreviousEditorInGroup": "Gruptaki Önceki Düzenleyiciyi Aç",
-	"lastEditorInGroup": "Gruptaki Son Düzenleyiciyi Aç",
-	"navigateNext": "İleri Git",
-	"navigatePrevious": "Geri Dön",
-	"navigateLast": "Bir Öncekine Git",
-	"reopenClosedEditor": "Kapatılan Düzenleyiciyi Yeniden Aç",
-	"clearRecentFiles": "Son Açılanları Temizle",
-	"showEditorsInFirstGroup": "İlk Gruptaki Düzenleyicileri Göster",
-	"showEditorsInSecondGroup": "İkinci Gruptaki Düzenleyicileri Göster",
-	"showEditorsInThirdGroup": "Üçüncü Gruptaki Düzenleyicileri Göster",
-	"showAllEditors": "Tüm Düzenleyicileri Göster",
-	"openPreviousRecentlyUsedEditorInGroup": "Gruptaki Son Kullanılan Önceki Düzenleyiciyi Aç",
-	"openNextRecentlyUsedEditorInGroup": "Gruptaki Son Kullanılan Sonraki Düzenleyiciyi Aç",
-	"navigateEditorHistoryByInput": "Geçmişteki Önceki Düzenleyiciyi Aç",
-	"openNextRecentlyUsedEditor": "Son Kullanılan Sonraki Düzenleyiciyi Aç",
-	"openPreviousRecentlyUsedEditor": "Son Kullanılan Önceki Düzenleyiciyi Aç",
-	"clearEditorHistory": "Düzenleyici Geçmişini Temizle",
-	"focusLastEditorInStack": "Gruptaki Son Düzenleyiciyi Aç",
-	"moveEditorLeft": "Düzenleyiciyi Sola Taşı",
-	"moveEditorRight": "Düzenleyiciyi Sağa Taşı",
-	"moveEditorToPreviousGroup": "Düzenleyiciyi Önceki Gruba Taşı",
-	"moveEditorToNextGroup": "Düzenleyiciyi Sonraki Gruba Taşı",
-	"moveEditorToFirstGroup": "Düzenleyiciyi İlk Gruba Taşı",
-	"moveEditorToSecondGroup": "Düzenleyiciyi İkinci Gruba Taşı",
-	"moveEditorToThirdGroup": "Düzenleyiciyi Üçüncü Gruba Taşı"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json b/i18n/trk/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json
deleted file mode 100644
index c70ebf42960..00000000000
--- a/i18n/trk/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"editorCommand.activeEditorMove.description": "Aktif düzenleyiciyi sekmeler veya gruplar halinde taşıyın",
-	"editorCommand.activeEditorMove.arg.name": "Aktif düzenleyici taşıma argümanı",
-	"editorCommand.activeEditorMove.arg.description": "Argüman Özellikleri:\n\t* 'to': Nereye taşınacağını belirten dize değeri.\n\t* 'by': Kaç birim taşınacağını belirten dize değeri. Sekme veya gruba göre.\n\t* 'value': Kaç tane pozisyonun taşınacağını belirten sayı değeri."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/browser/parts/editor/editorPart.i18n.json b/i18n/trk/src/vs/workbench/browser/parts/editor/editorPart.i18n.json
deleted file mode 100644
index 9d8fef9d2ae..00000000000
--- a/i18n/trk/src/vs/workbench/browser/parts/editor/editorPart.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"groupOneVertical": "Sol",
-	"groupTwoVertical": "Orta",
-	"groupThreeVertical": "Sağ",
-	"groupOneHorizontal": "En Üst",
-	"groupTwoHorizontal": "Orta",
-	"groupThreeHorizontal": "En Alt",
-	"editorOpenError": "'{0}' açılamadı: {1}."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/browser/parts/editor/editorPicker.i18n.json b/i18n/trk/src/vs/workbench/browser/parts/editor/editorPicker.i18n.json
deleted file mode 100644
index 0c06889a9be..00000000000
--- a/i18n/trk/src/vs/workbench/browser/parts/editor/editorPicker.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"entryAriaLabel": "{0}, düzenleyici grubu seçici",
-	"groupLabel": "Grup: {0}",
-	"noResultsFoundInGroup": "Grupta eşleşen açık düzenleyici bulunamadı",
-	"noOpenedEditors": "Gruptaki açık düzenleyiciler listesi şu an boş",
-	"noResultsFound": "Eşleşen açık düzenleyici bulunamadı",
-	"noOpenedEditorsAllGroups": "Açık düzenleyiciler listesi şu an boş"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json b/i18n/trk/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json
deleted file mode 100644
index 6c864a500a2..00000000000
--- a/i18n/trk/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"singleSelectionRange": "Sat {0}, Süt {1} ({2} seçili)",
-	"singleSelection": "Sat {0}, Süt {1}",
-	"multiSelectionRange": "{0} seçim ({1} karakter seçildi)",
-	"multiSelection": "{0} seçim",
-	"endOfLineLineFeed": "LF",
-	"endOfLineCarriageReturnLineFeed": "CRLF",
-	"tabFocusModeEnabled": "Tab Odak Değiştirir",
-	"screenReaderDetected": "Ekran Okuyucu En İyi Duruma Getirildi",
-	"screenReaderDetectedExtra": "Bir Ekran Okuyucu kullanmıyorsanız, lütfen `editor.accessibilitySupport` ayarını \"off\" olarak değiştirin",
-	"disableTabMode": "Erişilebilirlik Modunu Devre Dışı Bırak",
-	"gotoLine": "Satıra Git",
-	"selectIndentation": "Girinti Seç",
-	"selectEncoding": "Kodlamayı Seç",
-	"selectEOL": "Satır Sonu Sıralamasını Seç",
-	"selectLanguageMode": "Dil Modunu Seç",
-	"fileInfo": "Dosya Bilgisi",
-	"spacesSize": "Boşluk: {0}",
-	"tabSize": "Sekme Boyutu: {0}",
-	"showLanguageExtensions": "'{0}' için Market Eklentilerini Ara...",
-	"changeMode": "Dil Modunu Değiştir",
-	"noEditor": "Şu an aktif metin düzenleyici yok",
-	"languageDescription": "({0}) - Yapılandırılan Dil",
-	"languageDescriptionConfigured": "({0})",
-	"languagesPicks": "diller (tanımlayıcı)",
-	"configureModeSettings": "'{0}' dili tabanlı ayarları yapılandır...",
-	"configureAssociationsExt": "'{0}' için Dosya İlişkilendirmesini Yapılandır...",
-	"autoDetect": "Otomatik Algıla",
-	"pickLanguage": "Dil Modunu Seç",
-	"currentAssociation": "Geçerli İlişkilendirme",
-	"pickLanguageToConfigure": "'{0}' ile İlişkilendirilecek Dil Modunu Seç",
-	"changeIndentation": "Girintiyi Değiştir",
-	"noWritableCodeEditor": "Aktif kod düzenleyici salt okunur.",
-	"indentView": "görünümü değiştir",
-	"indentConvert": "dosyayı dönüştür",
-	"pickAction": "Eylem Seçin",
-	"changeEndOfLine": "Satır Sonu Sıralamasını Değiştir",
-	"pickEndOfLine": "Satır Sonu Sıralamasını Seç",
-	"changeEncoding": "Dosya Kodlamasını Değiştir",
-	"noFileEditor": "Şu an aktif dosya yok",
-	"saveWithEncoding": "Kodlama ile Kaydet",
-	"reopenWithEncoding": "Kodlama ile Yeniden Aç",
-	"guessedEncoding": "İçerikten tahmin edildi",
-	"pickEncodingForReopen": "Dosyayı Yeniden Açmak İçin Dosya Kodlaması Seçin",
-	"pickEncodingForSave": "Kaydedilecek Dosya Kodlamasını Seçin",
-	"screenReaderDetectedExplanation.title": "Ekran Okuyucu En İyi Duruma Getirildi",
-	"screenReaderDetectedExplanation.question": "VS Code'u çalıştırmak için ekran okuyucu kullanıyor musunuz?",
-	"screenReaderDetectedExplanation.answerYes": "Evet",
-	"screenReaderDetectedExplanation.answerNo": "Hayır",
-	"screenReaderDetectedExplanation.body1": "VS Code, ekran okuyucu ile kullanılmak için uygun hale getirilmiştir.",
-	"screenReaderDetectedExplanation.body2": "Bazı düzenleyici özellikleri farklı bir davranış sergileyecektir: ör. sözcük kaydırma, katlama, vb."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/browser/parts/editor/resourceViewer.i18n.json b/i18n/trk/src/vs/workbench/browser/parts/editor/resourceViewer.i18n.json
deleted file mode 100644
index 0baf6629e0e..00000000000
--- a/i18n/trk/src/vs/workbench/browser/parts/editor/resourceViewer.i18n.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"sizeB": "{0}B",
-	"sizeKB": "{0}KB",
-	"sizeMB": "{0}MB",
-	"sizeGB": "{0}GB",
-	"sizeTB": "{0}TB",
-	"largeImageError": "Görüntü çok büyük olduğu için düzenleyicide görüntülenemiyor ({0}).",
-	"resourceOpenExternalButton": "Harici program kullanarak resmi aç",
-	"nativeFileTooLargeError": "Dosya çok büyük olduğu için düzenleyicide görüntülenemiyor ({0}).",
-	"nativeBinaryError": "Dosya ikili olduğu veya desteklenmeyen bir metin kodlaması kullandığı için düzenleyicide görüntülenemiyor.",
-	"openAsText": "Yine de açmak ister misiniz?",
-	"zoom.action.fit.label": "Resmin Tamamı",
-	"imgMeta": "{0}x{1} {2}"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/browser/parts/editor/tabsTitleControl.i18n.json b/i18n/trk/src/vs/workbench/browser/parts/editor/tabsTitleControl.i18n.json
deleted file mode 100644
index 6fdba7d93d2..00000000000
--- a/i18n/trk/src/vs/workbench/browser/parts/editor/tabsTitleControl.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"araLabelTabActions": "Sekme eylemleri"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json b/i18n/trk/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json
deleted file mode 100644
index f0597ecc363..00000000000
--- a/i18n/trk/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"textDiffEditor": "Metin Diff Düzenleyicisi",
-	"readonlyEditorWithInputAriaLabel": "{0}. Salt okunur metin dosyası karşılaştırma düzenleyicisi.",
-	"readonlyEditorAriaLabel": "Salt okunur metin dosyası karşılaştırma düzenleyicisi.",
-	"editableEditorWithInputAriaLabel": "{0}. Metin dosyası karşılaştırma düzenleyicisi.",
-	"editableEditorAriaLabel": "Metin dosyası karşılaştırma düzenleyicisi.",
-	"navigate.next.label": "Sonraki Değişiklik",
-	"navigate.prev.label": "Önceki Değişiklik",
-	"toggleIgnoreTrimWhitespace.label": "Kırpma Boşluğunu Yoksay"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/browser/parts/editor/textEditor.i18n.json b/i18n/trk/src/vs/workbench/browser/parts/editor/textEditor.i18n.json
deleted file mode 100644
index 7e29630aca9..00000000000
--- a/i18n/trk/src/vs/workbench/browser/parts/editor/textEditor.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"editorLabelWithGroup": "{0}, Grup {1}."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/browser/parts/editor/textResourceEditor.i18n.json b/i18n/trk/src/vs/workbench/browser/parts/editor/textResourceEditor.i18n.json
deleted file mode 100644
index f80fbe8128e..00000000000
--- a/i18n/trk/src/vs/workbench/browser/parts/editor/textResourceEditor.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"textEditor": "Metin Düzenleyicisi",
-	"readonlyEditorWithInputAriaLabel": "{0}. Salt okunur metin düzenleyici.",
-	"readonlyEditorAriaLabel": "Salt okunur metin düzenleyici.",
-	"untitledFileEditorWithInputAriaLabel": "{0}. İsimsiz dosya metin düzenleyici.",
-	"untitledFileEditorAriaLabel": "İsimsiz dosya metin düzenleyici."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/browser/parts/editor/titleControl.i18n.json b/i18n/trk/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
deleted file mode 100644
index 4c89a16f31a..00000000000
--- a/i18n/trk/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"araLabelEditorActions": "Düzenleyici eylemleri"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/browser/parts/notifications/notificationsActions.i18n.json b/i18n/trk/src/vs/workbench/browser/parts/notifications/notificationsActions.i18n.json
deleted file mode 100644
index 705cd56a0bc..00000000000
--- a/i18n/trk/src/vs/workbench/browser/parts/notifications/notificationsActions.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"clearNotification": "Bildirimi Temizle",
-	"clearNotifications": "Tüm Bildirimleri Temizle",
-	"hideNotificationsCenter": "Bildirimleri Gizle",
-	"expandNotification": "Bildirimi Genişlet",
-	"collapseNotification": "Bildirimi Daralt",
-	"configureNotification": "Bildirimi Yapılandır",
-	"copyNotification": "Metni Kopyala"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/browser/parts/notifications/notificationsAlerts.i18n.json b/i18n/trk/src/vs/workbench/browser/parts/notifications/notificationsAlerts.i18n.json
deleted file mode 100644
index 44c4485868c..00000000000
--- a/i18n/trk/src/vs/workbench/browser/parts/notifications/notificationsAlerts.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"alertErrorMessage": "Hata: {0}",
-	"alertWarningMessage": "Uyarı: {0}",
-	"alertInfoMessage": "Bilgi: {0}"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json b/i18n/trk/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json
deleted file mode 100644
index 05ae29fe427..00000000000
--- a/i18n/trk/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"notificationsEmpty": "Yeni bildirim yok",
-	"notifications": "Bildirimler",
-	"notificationsToolbar": "Bildirim Merkezi Eylemleri",
-	"notificationsList": "Bildirim Listesi"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/browser/parts/notifications/notificationsCommands.i18n.json b/i18n/trk/src/vs/workbench/browser/parts/notifications/notificationsCommands.i18n.json
deleted file mode 100644
index 05d19266308..00000000000
--- a/i18n/trk/src/vs/workbench/browser/parts/notifications/notificationsCommands.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"notifications": "Bildirimler",
-	"showNotifications": "Bildirimleri Göster",
-	"hideNotifications": "Bildirimleri Gizle",
-	"clearAllNotifications": "Tüm Bildirimleri Temizle"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/browser/parts/notifications/notificationsStatus.i18n.json b/i18n/trk/src/vs/workbench/browser/parts/notifications/notificationsStatus.i18n.json
deleted file mode 100644
index 7add4db416e..00000000000
--- a/i18n/trk/src/vs/workbench/browser/parts/notifications/notificationsStatus.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hideNotifications": "Bildirimleri Gizle",
-	"zeroNotifications": "Bildirim Yok",
-	"noNotifications": "Yeni Bildirim Yok",
-	"oneNotification": "1 Yeni Bildirim",
-	"notifications": "{0} Yeni Bildirim"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/browser/parts/notifications/notificationsToasts.i18n.json b/i18n/trk/src/vs/workbench/browser/parts/notifications/notificationsToasts.i18n.json
deleted file mode 100644
index 3a0f8735d68..00000000000
--- a/i18n/trk/src/vs/workbench/browser/parts/notifications/notificationsToasts.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"notificationsToast": "Bildirim Kutusu"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/browser/parts/notifications/notificationsViewer.i18n.json b/i18n/trk/src/vs/workbench/browser/parts/notifications/notificationsViewer.i18n.json
deleted file mode 100644
index 887069497f3..00000000000
--- a/i18n/trk/src/vs/workbench/browser/parts/notifications/notificationsViewer.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"notificationActions": "Bildirim Eylemleri",
-	"notificationSource": "Kaynak: {0}"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/browser/parts/panel/panelActions.i18n.json b/i18n/trk/src/vs/workbench/browser/parts/panel/panelActions.i18n.json
deleted file mode 100644
index fc66e665854..00000000000
--- a/i18n/trk/src/vs/workbench/browser/parts/panel/panelActions.i18n.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"closePanel": "Paneli Kapat",
-	"togglePanel": "Paneli Aç/Kapat",
-	"focusPanel": "Panele Odakla",
-	"toggledPanelPosition": "Panel Konumunu Değiştir",
-	"moveToRight": "Sağa Taşı",
-	"moveToBottom": "En Alta Taşı",
-	"toggleMaximizedPanel": "Panelin Ekranı Kaplamasını Aç/Kapat",
-	"maximizePanel": "Panel Boyutunu Olabildiğince Genişlet",
-	"minimizePanel": "Panel Boyutunu Geri Al",
-	"view": "Görüntüle"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/browser/parts/panel/panelPart.i18n.json b/i18n/trk/src/vs/workbench/browser/parts/panel/panelPart.i18n.json
deleted file mode 100644
index cf7847169c6..00000000000
--- a/i18n/trk/src/vs/workbench/browser/parts/panel/panelPart.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hidePanel": "Paneli Gizle"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/browser/parts/quickinput/quickInput.i18n.json b/i18n/trk/src/vs/workbench/browser/parts/quickinput/quickInput.i18n.json
deleted file mode 100644
index 29901080c8f..00000000000
--- a/i18n/trk/src/vs/workbench/browser/parts/quickinput/quickInput.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"inputModeEntryDescription": "{0} (Onaylamak için 'Enter' veya iptal etmek için 'Escape' tuşuna basın)",
-	"inputModeEntry": "Girdinizi onaylamak için 'Enter' veya iptal etmek için 'Escape' tuşuna basın",
-	"quickInput.countSelected": "{0} Seçili",
-	"ok": "Tamam"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/browser/parts/quickinput/quickInputBox.i18n.json b/i18n/trk/src/vs/workbench/browser/parts/quickinput/quickInputBox.i18n.json
deleted file mode 100644
index 411049d886c..00000000000
--- a/i18n/trk/src/vs/workbench/browser/parts/quickinput/quickInputBox.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"quickInputBox.ariaLabel": "Sonuçları daraltmak için yazmaya başlayın."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/browser/parts/quickopen/quickOpenController.i18n.json b/i18n/trk/src/vs/workbench/browser/parts/quickopen/quickOpenController.i18n.json
deleted file mode 100644
index 2367998bce1..00000000000
--- a/i18n/trk/src/vs/workbench/browser/parts/quickopen/quickOpenController.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"emptyPicks": "Seçilecek girdi yok",
-	"quickOpenInput": "Buradan gerçekleştirebileceğiniz eylemler hakkında yardım almak için '?' yazın",
-	"historyMatches": "yakınlarda açıldı",
-	"noResultsFound1": "Sonuç bulunamadı",
-	"canNotRunPlaceholder": "Bu hızlı açma işleyicisi geçerli bağlamda kullanılamaz",
-	"entryAriaLabel": "{0}, yakınlarda açıldı",
-	"removeFromEditorHistory": "Geçmişten Kaldır",
-	"pickHistory": "Geçmişten kaldırmak için bir düzenleyici girdisi seçin"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/browser/parts/quickopen/quickopen.i18n.json b/i18n/trk/src/vs/workbench/browser/parts/quickopen/quickopen.i18n.json
deleted file mode 100644
index 7c00b625be5..00000000000
--- a/i18n/trk/src/vs/workbench/browser/parts/quickopen/quickopen.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"quickOpen": "Dosyaya Git...",
-	"quickNavigateNext": "Hızlı Açta Sonrakine Git",
-	"quickNavigatePrevious": "Hızlı Açta Öncekine Git",
-	"quickSelectNext": "Hızlı Açta Sonrakini Seç",
-	"quickSelectPrevious": "Hızlı Açta Öncekini Seç"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/browser/parts/sidebar/sidebarPart.i18n.json b/i18n/trk/src/vs/workbench/browser/parts/sidebar/sidebarPart.i18n.json
deleted file mode 100644
index 8344108cfb2..00000000000
--- a/i18n/trk/src/vs/workbench/browser/parts/sidebar/sidebarPart.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"focusSideBar": "Kenar Çubuğuna Odakla",
-	"viewCategory": "Görüntüle"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/browser/parts/statusbar/statusbarPart.i18n.json b/i18n/trk/src/vs/workbench/browser/parts/statusbar/statusbarPart.i18n.json
deleted file mode 100644
index cbc6dbdf7e6..00000000000
--- a/i18n/trk/src/vs/workbench/browser/parts/statusbar/statusbarPart.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"manageExtension": "Eklentiyi Yönet"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/browser/parts/titlebar/titlebarPart.i18n.json b/i18n/trk/src/vs/workbench/browser/parts/titlebar/titlebarPart.i18n.json
deleted file mode 100644
index d037c5d4f78..00000000000
--- a/i18n/trk/src/vs/workbench/browser/parts/titlebar/titlebarPart.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"patchedWindowTitle": "[Desteklenmiyor]",
-	"userIsAdmin": "[Yönetici]",
-	"userIsSudo": "[Süper Kullanıcı]",
-	"devExtensionWindowTitlePrefix": "[Eklenti Geliştirme Sunucusu]"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/browser/parts/views/panelViewlet.i18n.json b/i18n/trk/src/vs/workbench/browser/parts/views/panelViewlet.i18n.json
deleted file mode 100644
index cdb3ee7c614..00000000000
--- a/i18n/trk/src/vs/workbench/browser/parts/views/panelViewlet.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"viewToolbarAriaLabel": "{0} eylem"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/browser/parts/views/views.i18n.json b/i18n/trk/src/vs/workbench/browser/parts/views/views.i18n.json
deleted file mode 100644
index fe27ce7154b..00000000000
--- a/i18n/trk/src/vs/workbench/browser/parts/views/views.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"viewToolbarAriaLabel": "{0} eylem",
-	"hideView": "Kenar Çubuğunda Gizle"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/browser/parts/views/viewsRegistry.i18n.json b/i18n/trk/src/vs/workbench/browser/parts/views/viewsRegistry.i18n.json
deleted file mode 100644
index d412455fd99..00000000000
--- a/i18n/trk/src/vs/workbench/browser/parts/views/viewsRegistry.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"duplicateId": "`{0}` kimliğine sahip bir görünüm `{1}` konumunda zaten kayıtlı"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/browser/parts/views/viewsViewlet.i18n.json b/i18n/trk/src/vs/workbench/browser/parts/views/viewsViewlet.i18n.json
deleted file mode 100644
index e77d9b82be0..00000000000
--- a/i18n/trk/src/vs/workbench/browser/parts/views/viewsViewlet.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hideView": "Gizle"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/browser/quickopen.i18n.json b/i18n/trk/src/vs/workbench/browser/quickopen.i18n.json
deleted file mode 100644
index f70c4e7b889..00000000000
--- a/i18n/trk/src/vs/workbench/browser/quickopen.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noResultsMatching": "Eşleşen sonuç yok",
-	"noResultsFound2": "Sonuç bulunamadı"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/browser/viewlet.i18n.json b/i18n/trk/src/vs/workbench/browser/viewlet.i18n.json
deleted file mode 100644
index 913aaf30ae5..00000000000
--- a/i18n/trk/src/vs/workbench/browser/viewlet.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"compositePart.hideSideBarLabel": "Kenar Çubuğunu Gizle",
-	"collapse": "Tümünü Daralt"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/common/theme.i18n.json b/i18n/trk/src/vs/workbench/common/theme.i18n.json
deleted file mode 100644
index c3e69879379..00000000000
--- a/i18n/trk/src/vs/workbench/common/theme.i18n.json
+++ /dev/null
@@ -1,72 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"tabActiveBackground": "Aktif sekme arka plan rengi. Sekmeler, düzenleyici alanındaki düzenleyicilerin kapsayıcılarıdır. Bir düzenleyici grubunda birden fazla sekme açılabilir. Birden fazla düzenleyici grupları var olabilir.",
-	"tabInactiveBackground": "Pasif sekme arka plan rengi. Sekmeler, düzenleyici alanındaki düzenleyicilerin kapsayıcılarıdır. Bir düzenleyici grubunda birden fazla sekme açılabilir. Birden fazla düzenleyici grupları var olabilir.",
-	"tabHoverBackground": "Fareyle üzerine gelindiğinde sekme arka plan rengi. Sekmeler, düzenleyici alanındaki düzenleyicilerin kapsayıcılarıdır. Bir düzenleyici grubunda birden fazla sekme açılabilir. Birden fazla düzenleyici grupları var olabilir.",
-	"tabUnfocusedHoverBackground": "Fareyle üzerine gelindiğinde odaklanılmamış bir gruptaki aktif sekmenin arka plan rengi. Sekmeler, düzenleyici alanındaki düzenleyicilerin kapsayıcılarıdır. Bir düzenleyici grubunda birden fazla sekme açılabilir. Birden fazla düzenleyici grupları var olabilir.",
-	"tabBorder": "Sekmeleri birbirinden ayıran kenarlığın rengi. Sekmeler, düzenleyici alanındaki düzenleyicilerin kapsayıcılarıdır. Bir düzenleyici grubunda birden fazla sekme açılabilir. Birden fazla düzenleyici grupları var olabilir.",
-	"tabActiveBorder": "Aktif bir sekmenin altındaki kenarlık. Sekmeler, düzenleyici alanındaki düzenleyicilerin kapsayıcılarıdır. Bir düzenleyici grubunda birden fazla sekme açılabilir. Birden fazla düzenleyici grupları var olabilir.",
-	"tabActiveBorderTop": "Aktif bir sekmenin üstündeki kenarlık. Sekmeler, düzenleyici alanındaki düzenleyicilerin kapsayıcılarıdır. Bir düzenleyici grubunda birden fazla sekme açılabilir. Birden fazla düzenleyici grupları var olabilir.",
-	"tabActiveUnfocusedBorder": "Odaklanılmamış bir gruptaki aktif bir sekmenin altındaki kenarlık. Sekmeler, düzenleyici alanındaki düzenleyicilerin kapsayıcılarıdır. Bir düzenleyici grubunda birden fazla sekme açılabilir. Birden fazla düzenleyici grupları var olabilir.",
-	"tabActiveUnfocusedBorderTop": "Odaklanılmamış bir gruptaki aktif bir sekmenin üstündeki kenarlık. Sekmeler, düzenleyici alanındaki düzenleyicilerin kapsayıcılarıdır. Bir düzenleyici grubunda birden fazla sekme açılabilir. Birden fazla düzenleyici grupları var olabilir.",
-	"tabHoverBorder": "Fareyle üzerine gelindiğinde sekmeleri vurgulayacak kenarlık. Sekmeler, düzenleyici alanındaki düzenleyicilerin kapsayıcılarıdır. Bir düzenleyici grubunda birden fazla sekme açılabilir. Birden fazla düzenleyici grupları var olabilir.",
-	"tabUnfocusedHoverBorder": "Fareyle üzerine gelindiğinde odaklanılmamış bir gruptaki sekmeleri vurgulayacak kenarlık. Sekmeler, düzenleyici alanındaki düzenleyicilerin kapsayıcılarıdır. Bir düzenleyici grubunda birden fazla sekme açılabilir. Birden fazla düzenleyici grupları var olabilir.",
-	"tabActiveForeground": "Aktif bir gruptaki aktif sekmenin ön plan rengi. Sekmeler, düzenleyici alanındaki düzenleyicilerin kapsayıcılarıdır. Bir düzenleyici grubunda birden fazla sekme açılabilir. Birden fazla düzenleyici grupları var olabilir.",
-	"tabInactiveForeground": "Aktif bir gruptaki pasif sekmenin ön plan rengi. Sekmeler, düzenleyici alanındaki düzenleyicilerin kapsayıcılarıdır. Bir düzenleyici grubunda birden fazla sekme açılabilir. Birden fazla düzenleyici grupları var olabilir.",
-	"tabUnfocusedActiveForeground": "Odaklanılmamış bir gruptaki aktif sekmenin ön plan rengi. Sekmeler, düzenleyici alanındaki düzenleyicilerin kapsayıcılarıdır. Bir düzenleyici grubunda birden fazla sekme açılabilir. Birden fazla düzenleyici grupları var olabilir.",
-	"tabUnfocusedInactiveForeground": "Odaklanılmamış bir gruptaki pasif sekmenin ön plan rengi. Sekmeler, düzenleyici alanındaki düzenleyicilerin kapsayıcılarıdır. Bir düzenleyici grubunda birden fazla sekme açılabilir. Birden fazla düzenleyici grupları var olabilir.",
-	"editorGroupBackground": "Bir düzenleyici grubunun arka plan rengi. Düzenleyici grupları, düzenleyicilerin kapsayıcılarıdır. Arka plan rengi, düzenleyici grubunu sürüklerken gösterilir.",
-	"tabsContainerBackground": "Sekmeler etkinleştirilmiş durumdayken, düzenleyici grubu başlık üstbilgisi arka plan rengi. Düzenleyici grupları, düzenleyicilerin kapsayıcılarıdır. ",
-	"tabsContainerBorder": "Sekmeler etkinleştirilmiş durumdayken, düzenleyici grubu başlık üstbilgisi kenarlık rengi. Düzenleyici grupları, düzenleyicilerin kapsayıcılarıdır. ",
-	"editorGroupHeaderBackground": "Sekmeler devre dışı iken, düzenleyici grubu başlık üstbilgisi arka plan rengi (`\"workbench.editor.showTabs\": false`). Düzenleyici grupları, düzenleyicilerin kapsayıcılarıdır. ",
-	"editorGroupBorder": "Birden fazla düzenleyici grubunu birbirinden ayıracak renk. Düzenleyici grupları, düzenleyicilerin kapsayıcılarıdır. ",
-	"editorDragAndDropBackground": "Düzenleyici grubunu sürüklerken gösterilecek arka plan rengi. Düzenleyici içeriğinin hâlâ iyi görünmeye devam edebilmesi için renk şeffaf olmalıdır.",
-	"panelBackground": "Panel arka plan rengi. Paneller düzenleyici alanının altında gösterilir ve çıktı ve entegre terminal gibi görünümler içerir.",
-	"panelBorder": "Paneli düzenleyiciden ayıran kenarlık rengi. Paneller düzenleyici alanının altında gösterilir ve çıktı ve entegre terminal gibi görünümler içerir.",
-	"panelActiveTitleForeground": "Aktif panelin başlık rengi. Paneller düzenleyici alanının altında gösterilir ve çıktı ve entegre terminal gibi görünümler içerir.",
-	"panelInactiveTitleForeground": "Pasif panelin başlık rengi. Paneller düzenleyici alanının altında gösterilir ve çıktı ve entegre terminal gibi görünümler içerir.",
-	"panelActiveTitleBorder": "Aktif başlığının kenarlık rengi. Paneller düzenleyici alanının altında gösterilir ve çıktı ve entegre terminal gibi görünümler içerir.",
-	"panelDragAndDropBackground": "Panel başlığı ögeleri için sürükle bırak geri bildirim rengi. Panel ögelerinin hâlâ iyi görünmeye devam edebilmesi için renk şeffaf olmalıdır. Paneller, düzenleyici alanının altında gösterilir, çıktı ve entegre terminal gibi görünümler içerir.",
-	"statusBarForeground": "Bir çalışma alanı açıkken durum çubuğu ön plan rengi. Durum çubuğu, pencerenin alt kısmında gösterilir.",
-	"statusBarNoFolderForeground": "Hiçbir klasör açık değilken durum çubuğu ön plan rengi. Durum çubuğu, pencerenin alt kısmında gösterilir.",
-	"statusBarBackground": "Bir çalışma alanı açıkken durum çubuğu arka plan rengi. Durum çubuğu, pencerenin alt kısmında gösterilir.",
-	"statusBarNoFolderBackground": "Hiçbir klasör açık değilken durum çubuğu arka plan rengi. Durum çubuğu, pencerenin alt kısmında gösterilir.",
-	"statusBarBorder": "Durum çubuğunu kenar çubuğundan ve düzenleyiciden ayıran kenarlık rengi. Durum çubuğu, pencerenin alt kısmında gösterilir.",
-	"statusBarNoFolderBorder": "Hiçbir klasör açık olmadığında durum çubuğunu kenar çubuğundan ve düzenleyiciden ayıran kenarlık rengi. Durum çubuğu, pencerenin alt kısmında gösterilir.",
-	"statusBarItemActiveBackground": "Durum çubuğu ögesi tıklanırken arka plan rengi. Durum çubuğu, pencerenin alt kısmında gösterilir.",
-	"statusBarItemHoverBackground": "Durum çubuğu ögesinin mouse ile üzerine gelindiğindeki arka plan rengi. Durum çubuğu, pencerenin alt kısmında gösterilir.",
-	"statusBarProminentItemBackground": "Durum çubuğu belirgin ögelerinin arka plan rengi. Belirgin ögeler, önemi belirtmek için diğer durum çubuğu girdilerinden öne çıkarılır. Bir örnek görmek için komut paletinden `Tab Tuşu İle Odak Değiştirmeyi Aç/Kapat` ile modu değiştirin. Durum çubuğu, pencerenin alt kısmında gösterilir.",
-	"statusBarProminentItemHoverBackground": "Fareyle üzerine gelindiğinde durum çubuğu belirgin ögelerinin arka plan rengi. Belirgin ögeler, önemi belirtmek için diğer durum çubuğu girdilerinden öne çıkarılır. Bir örnek görmek için komut paletinden `Tab Tuşu İle Odak Değiştirmeyi Aç/Kapat` ile modu değiştirin. Durum çubuğu, pencerenin alt kısmında gösterilir.",
-	"activityBarBackground": "Etkinlik çubuğu arka plan rengi. Etkinlik çubuğu, en sol veya en sağda gösterilir ve kenar çubuğunun görünümleriyle yer değiştirmeye izin verir.",
-	"activityBarForeground": "Etkinlik çubuğu ön plan rengi (ör. simgeler için kullanılır). Etkinlik çubuğu, en sol veya en sağda gösterilir ve kenar çubuğunun görünümleriyle yer değiştirmeye izin verir.",
-	"activityBarBorder": "Etkinlik çubuğunu kenar çubuğundan ayıran kenarlığın rengi. Etkinlik çubuğu, en sol veya en sağda gösterilir ve kenar çubuğunun görünümleriyle yer değiştirmeye izin verir.",
-	"activityBarDragAndDropBackground": "Etkinlik çubuğu ögeleri için sürükle bırak geri bildirim rengi. Etkinlik çubuğu girdilerinin hâlâ iyi görünmeye devam edebilmesi için renk şeffaf olmalıdır. Etkinlik çubuğu, en sol veya en sağda gösterilir ve kenar çubuğunun görünümleriyle yer değiştirmeye izin verir.",
-	"activityBarBadgeBackground": "Etkinlik çubuğu bildirim göstergesi arka plan rengi. Etkinlik çubuğu, en sol veya en sağda gösterilir ve kenar çubuğunun görünümleriyle yer değiştirmeye izin verir.",
-	"activityBarBadgeForeground": "Etkinlik çubuğu bildirim göstergesi ön plan rengi. Etkinlik çubuğu, en sol veya en sağda gösterilir ve kenar çubuğunun görünümleriyle yer değiştirmeye izin verir.",
-	"sideBarBackground": "Kenar çubuğu arka plan rengi. Kenar çubuğu, gezgin ve arama gibi görünümlerin kapsayıcısıdır.",
-	"sideBarForeground": "Kenar çubuğu ön plan rengi. Kenar çubuğu, gezgin ve arama gibi görünümlerin kapsayıcısıdır.",
-	"sideBarBorder": "Kenar çubuğunu düzenleyiciden ayıran taraftaki kenarlığın rengi. Kenar çubuğu, gezgin ve arama gibi görünümlerin kapsayıcısıdır.",
-	"sideBarTitleForeground": "Kenar çubuğu başlığı ön plan rengi. Kenar çubuğu, gezgin ve arama gibi görünümlerin kapsayıcısıdır.",
-	"sideBarDragAndDropBackground": "Kenar çubuğu bölümleri için sürükle bırak geri bildirim rengi. Kenar çubuğu bölümlerinin hâlâ iyi görünmeye devam edebilmesi için renk şeffaf olmalıdır. Kenar çubuğu, gezgin ve arama gibi görünümlerin kapsayıcısıdır.",
-	"sideBarSectionHeaderBackground": "Kenar çubuğu bölüm başlığı arka plan rengi. Kenar çubuğu, gezgin ve arama gibi görünümlerin kapsayıcısıdır.",
-	"sideBarSectionHeaderForeground": "Kenar çubuğu bölüm başlığı ön plan rengi. Kenar çubuğu, gezgin ve arama gibi görünümlerin kapsayıcısıdır.",
-	"titleBarActiveForeground": "Pencere aktifken başlık çubuğu ön planı. Bu rengin sadece macOS'da destekleneceğini unutmayın.",
-	"titleBarInactiveForeground": "Pencere pasifken başlık çubuğu ön planı. Bu rengin sadece macOS'da destekleneceğini unutmayın.",
-	"titleBarActiveBackground": "Pencere aktifken başlık çubuğu arka planı. Bu rengin sadece macOS'da destekleneceğini unutmayın.",
-	"titleBarInactiveBackground": "Pencere pasifken başlık çubuğu arka planı. Bu rengin sadece macOS'da destekleneceğini unutmayın.",
-	"titleBarBorder": "Başlık çubuğu kenarlık rengi. Bu rengin sadece macOS'da destekleneceğini unutmayın.",
-	"notificationCenterBorder": "Bildirim merkezi kenarlık rengi. Bildirimler pencerenin sağ alt kısmından kayarak içeri girer.",
-	"notificationToastBorder": "Bildirim kutusu kenarlık rengi. Bildirimler pencerenin sağ alt kısmından kayarak içeri girer.",
-	"notificationsForeground": "Bildirim ön plan rengi. Bildirimler pencerenin sağ alt kısmından kayarak içeri girer.",
-	"notificationsBackground": "Bildirim arka plan rengi. Bildirimler pencerenin sağ alt kısmından kayarak içeri girer.",
-	"notificationsLink": "Bildirim linkleri ön plan rengi. Bildirimler pencerenin sağ alt kısmından kayarak içeri girer.",
-	"notificationCenterHeaderForeground": "Bildirim merkezi üstbilgi ön plan rengi. Bildirimler pencerenin sağ alt kısmından kayarak içeri girer.",
-	"notificationCenterHeaderBackground": "Bildirim merkezi üstbilgi arka plan rengi. Bildirimler pencerenin sağ alt kısmından kayarak içeri girer.",
-	"notificationsBorder": "Bildirim merkezinde bildirimleri diğer bildirimlerden ayıracak kenarlık rengi. Bildirimler pencerenin sağ alt kısmından kayarak içeri girer."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/common/views.i18n.json b/i18n/trk/src/vs/workbench/common/views.i18n.json
deleted file mode 100644
index 352d616cb23..00000000000
--- a/i18n/trk/src/vs/workbench/common/views.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"duplicateId": "'{0}' id'sine sahip bir görünüm '{1}' konumunda zaten kayıtlı"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/electron-browser/actions.i18n.json b/i18n/trk/src/vs/workbench/electron-browser/actions.i18n.json
deleted file mode 100644
index 44732b7e617..00000000000
--- a/i18n/trk/src/vs/workbench/electron-browser/actions.i18n.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"closeWindow": "Pencereyi Kapat",
-	"closeWorkspace": "Çalışma Alanını Kapat",
-	"noWorkspaceOpened": "Şu an bu örnekte kapatmak için açık bir çalışma alanı bulunmuyor.",
-	"newWindow": "Yeni Pencere",
-	"toggleFullScreen": "Tam Ekranı Aç/Kapat",
-	"toggleMenuBar": "Menü Çubuğunu Gizle/Göster",
-	"toggleDevTools": "Geliştirici Araçlarını Aç/Kapat",
-	"zoomIn": "Yakınlaştır",
-	"zoomOut": "Uzaklaştır",
-	"zoomReset": "Yakınlaştırmayı Sıfırla",
-	"appPerf": "Başlangıç Performansı",
-	"reloadWindow": "Pencereyi Yeniden Yükle",
-	"reloadWindowWithExntesionsDisabled": "Pencereyi Eklentiler Devre Dışı Olarak Yeniden Başlat",
-	"switchWindowPlaceHolder": "Geçilecek pencereyi seçin",
-	"current": "Geçerli Pencere",
-	"close": "Pencereyi Kapat",
-	"switchWindow": "Pencere Değiştir...",
-	"quickSwitchWindow": "Hızlı Pencere Değiştir...",
-	"workspaces": "çalışma alanları",
-	"files": "dosyalar",
-	"openRecentPlaceHolderMac": "Açmak için seçin (yeni pencerede açmak için Cmd tuşunu basılı tutun)",
-	"openRecentPlaceHolder": "Açmak için seçin (yeni pencerede açmak için Ctrl tuşunu basılı tutun)",
-	"remove": "Son Açılanlardan Kaldır",
-	"openRecent": "Son Kullanılanları Aç...",
-	"quickOpenRecent": "Son Kullanılanları Hızlı Aç...",
-	"reportIssueInEnglish": "Sorun Bildir",
-	"openProcessExplorer": "İşlem Yöneticisini Aç",
-	"reportPerformanceIssue": "Performans Sorunu Bildir",
-	"keybindingsReference": "Klavye Kısayolları Başvurusu",
-	"openDocumentationUrl": "Belgeler",
-	"openIntroductoryVideosUrl": "Tanıtım Videoları",
-	"openTipsAndTricksUrl": "İpuçları ve Püf noktaları",
-	"toggleSharedProcess": "Paylaşılan İşlemi Göster/Gizle",
-	"navigateLeft": "Soldaki Görünüme Git",
-	"navigateRight": "Sağdaki Görünüme Git",
-	"navigateUp": "Üstteki Görünüme Git",
-	"navigateDown": "Alttaki Görünüme Git",
-	"increaseViewSize": "Geçerli Görünüm Boyutunu Artır",
-	"decreaseViewSize": "Geçerli Görünüm Boyutunu Azalt",
-	"showPreviousTab": "Önceki Pencere Sekmesini Göster",
-	"showNextWindowTab": "Sonraki Pencere Sekmesini Göster",
-	"moveWindowTabToNewWindow": "Pencere Sekmesini Yeni Pencereye Taşı",
-	"mergeAllWindowTabs": "Tüm Pencereleri Birleştir",
-	"toggleWindowTabsBar": "Pencere Sekmeleri Çubuğunu Gizle/Göster",
-	"about": "{0} Hakkında",
-	"inspect context keys": "Bağlam Anahtarlarını Denetle"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/electron-browser/commands.i18n.json b/i18n/trk/src/vs/workbench/electron-browser/commands.i18n.json
deleted file mode 100644
index 983899514ca..00000000000
--- a/i18n/trk/src/vs/workbench/electron-browser/commands.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"diffLeftRightLabel": "{0} ⟷ {1}"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/electron-browser/configureLocale.i18n.json b/i18n/trk/src/vs/workbench/electron-browser/configureLocale.i18n.json
deleted file mode 100644
index d7620dc687c..00000000000
--- a/i18n/trk/src/vs/workbench/electron-browser/configureLocale.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"configureLocale": "Dili Yapılandır",
-	"displayLanguage": "VSCode'un görüntüleme dilini tanımlar.",
-	"doc": "Desteklenen dillerin listesi için göz atın: {0}",
-	"restart": "Değeri değiştirirseniz VSCode'u yeniden başlatmanız gerekir.",
-	"fail.createSettings": " '{0}' oluşturulamadı ({1}).",
-	"JsonSchema.locale": "Kullanılacak Kullanıcı Arayüzü Dili."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/electron-browser/extensionHost.i18n.json b/i18n/trk/src/vs/workbench/electron-browser/extensionHost.i18n.json
deleted file mode 100644
index b6f1f59af2d..00000000000
--- a/i18n/trk/src/vs/workbench/electron-browser/extensionHost.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"extensionHostProcess.startupFailDebug": "Eklenti sunucusu 10 saniye içinde başlamadı, ilk satırda durdurulmuş olabilir ve devam etmesi için bir hata ayıklayıcıya ihtiyacı olabilir.",
-	"extensionHostProcess.startupFail": "Eklenti sunucusu 10 saniye içinde başlamadı, bu bir sorun olabilir.",
-	"extensionHostProcess.error": "Eklenti sunucusundan hata: {0}",
-	"devTools": "Geliştirici Araçları",
-	"extensionHostProcess.crash": "Eklenti sunucusu beklenmeyen biçimde sonlandırıldı. Lütfen kurtarmak için pencereyi yeniden yükleyin."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/electron-browser/main.contribution.i18n.json b/i18n/trk/src/vs/workbench/electron-browser/main.contribution.i18n.json
deleted file mode 100644
index 6083c93c0aa..00000000000
--- a/i18n/trk/src/vs/workbench/electron-browser/main.contribution.i18n.json
+++ /dev/null
@@ -1,91 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"view": "Görüntüle",
-	"help": "Yardım",
-	"file": "Dosya",
-	"workspaces": "Çalışma Alanları",
-	"developer": "Geliştirici",
-	"workbenchConfigurationTitle": "Çalışma Ekranı",
-	"showEditorTabs": "Açık düzenleyicilerin sekmelerde gösterilip gösterilmeyeceğini denetler",
-	"workbench.editor.labelFormat.default": "Dosyanın adını göster. Sekmeler etkinleştirilmiş ve bir grupta iki dosya aynı ada sahiplerse, her dosyanın yolundaki ayırt edici bölümler eklenir. Sekmeler devre dışı ve düzenleyici aktifse, çalışma alanı klasörüne göreli yol gösterilir.",
-	"workbench.editor.labelFormat.short": "Dosyanın adını ve ardından dizin adını göster.",
-	"workbench.editor.labelFormat.medium": "Dosyanın adını ve ardından çalışma alanı klasörüne göreli yolunu göster.",
-	"workbench.editor.labelFormat.long": "Dosyanın adını ve ardından mutlak yolunu göster.",
-	"tabDescription": "Bir düzenleyici için etiketin biçimini denetler. Bu ayarı değiştirmek; örneğin, bir dosyanın konumunun daha kolay anlaşılmasını sağlar:\n- short: 'ustklasor'\n- medium: 'calismaalani/src/ustklasor'\n- long: '/home/user/calismaalani/src/ustklasor'\n- default: diğer bir sekme aynı başlığı paylaşıyorsa '.../ustklasor' veya sekmeler devre dışı ise göreli çalışma alanı yolu",
-	"editorTabCloseButton": "Düzenleyici sekmelerinin kapat butonlarının konumunu denetler veya 'off' değeri atandığında devre dışı bırakır.",
-	"tabSizing": "Düzenleyici sekmelerinin boyutlarını denetler. Sekmelerin her zaman tam düzenleyici etiketini gösterecek kadar büyük tutmak için 'fit' olarak ayarlayın. Mevcut alan bir seferde tüm sekmeleri göstermek için yeterli olmadığında sekmelerin küçülmesini sağlamak için 'shrink' olarak ayarlayın.",
-	"showIcons": "Açık düzenleyicilerin bir simge ile gösterilip gösterilmemelerini denetler. Bu, bir simge temasının etkinleştirilmesini de gerektirir.",
-	"enablePreview": "Açık düzenleyicilerin önizleme olarak gösterilip gösterilmeyeceğini denetler. Önizleme düzenleyicileri kalıcı olarak açılana kadar (ör. çift tıklama veya düzenleme ile) tekrar kullanılırlar ve italik yazı tipiyle gösterilirler.",
-	"enablePreviewFromQuickOpen": "Hızlı Aç'taki açık düzenleyicilerin önizleme olarak gösterilip gösterilmeyeceğini denetler. Önizleme düzenleyicileri kalıcı olarak açılana kadar (ör. çift tıklama veya düzenleme ile) tekrar kullanılırlar.",
-	"closeOnFileDelete": "Düzenleyicinin gösterdiği bir dosyanın, başka bir işlem tarafından silinmesi veya yeniden adlandırması durumunda dosyayı otomatik olarak kapatıp kapatmamasını denetler. Bunu devre dışı bırakmak, böyle bir durumda düzenleyicinin kaydedilmemiş değişiklikler içeriyor durumunda kalmasını sağlar. Uygulama içinde silmek, düzenleyiciyi her zaman kapatır ve kaydedilmemiş değişiklikler içeren dosyalar, verilerinizin korunması için otomatik olarak kapatılmaz.",
-	"editorOpenPositioning": "Düzenleyicilerin nerede açılacağını denetler. Düzenleyicileri, şu an geçerli olanın soluna veya sağına açmak için 'left' veya 'right' seçeneklerinden birini seçin. Düzenleyicileri, geçerli olandan bağımsız bir şekilde açmak için 'first' veya 'last' seçeneklerinden birini seçin.",
-	"revealIfOpen": "Düzenleyicinin görünen gruplardan herhangi birinde açıldıysa ortaya çıkarılıp çıkarılmayacağını denetler. Devre dışı bırakılırsa; bir düzenleyici, o an aktif düzenleyici grubunda açılmayı tercih edecektir. Etkinleştirilirse; o an aktif düzenleyici grubunda tekrar açılmak yerine, zaten açık olan düzenleyici ortaya çıkarılacaktır. Bu ayarın yok sayılacağı bazı durumların olduğunu unutmayın, ör. bir düzenleyiciyi, belirli bir grupta veya o an aktif grubun yanına açmaya zorladığınızda. ",
-	"swipeToNavigate": "Yatay olarak üç parmakla kaydırma ile açık dosyalar arasında gezinin.",
-	"commandHistory": "Komut paleti geçmişinde tutulacak son kullanılan komutların sayısını denetler. Komut geçmişini kapatmak için 0 olarak ayarlayın.",
-	"preserveInput": "Komut paletine son girilen girdinin, bir sonraki açılışta tekrar yer alıp almayacağını denetler.",
-	"closeOnFocusLost": "Hızlı Aç'ın odağını kaybettiğinde otomatik olarak kapanıp kapanmayacağını denetler.",
-	"openDefaultSettings": "Ayarları açmanın ayrıca tüm varsayılan ayarları gösteren bir düzenleyici açıp açmayacağını denetler.",
-	"sideBarLocation": "Kenar çubuğunun konumunu denetler. Çalışma ekranının ya solunda ya da sağında gösterilebilir.",
-	"panelDefaultLocation": "Panelin varsayılan konumunu denetler. Çalışma ekranının ya altında ya da sağında gösterilebilir.",
-	"statusBarVisibility": "Çalışma ekranının altındaki durum çubuğunun görünürlüğünü denetler.",
-	"activityBarVisibility": "Çalışma ekranındaki etkinlik çubuğunun görünürlüğünü denetler.",
-	"viewVisibility": "Görünüm üstbilgi eylemlerinin görünürlüğünü denetler. Görünüm üstbilgi eylemleri ya her zaman görünür ya da sadece o görünüme odaklanıldığında veya fareyle üzerine gelindiğinde görünebilir.",
-	"fontAliasing": "Çalışma ekranındaki yazı tipi yumuşatma yöntemini denetler.\n- default: Alt-piksel yazı tipi yumuşatma. Bu, çoğu retina olmayan ekranda en keskin metni verir\n- antialiased: Alt-pikselin tersine, pikselin seviyesine göre yazı tipini yumuşat. Yazı tipinin genel olarak daha açık görünmesini sağlayabilir\n- none: Yazı tipi yumuşatmayı devre dışı bırakır. Metin pürüzlü keskin kenarlarla gösterilir.\n- auto: Ekranların DPI'ına göre otomatik olarak `default` veya`antialiased`ı uygular.",
-	"workbench.fontAliasing.default": "Alt-piksel yazı tipi yumuşatma. Bu, çoğu retina olmayan ekranda en keskin metni verir.",
-	"workbench.fontAliasing.antialiased": "Alt-pikselin tersine, pikselin seviyesine göre yazı tipini yumuşat. Yazı tipinin genel olarak daha açık görünmesini sağlayabilir.",
-	"workbench.fontAliasing.none": "Yazı tipi yumuşatmayı devre dışı bırakır. Metin pürüzlü keskin kenarlarla gösterilir.",
-	"workbench.fontAliasing.auto": "Ekranların DPI'ına göre otomatik olarak `default` veya `antialiased`ı uygular.",
-	"enableNaturalLanguageSettingsSearch": "Ayarlar için doğal dil arama modunun etkinleştirilip etkinleştirilmeyeceğini denetler.",
-	"windowConfigurationTitle": "Pencere",
-	"window.openFilesInNewWindow.on": "Dosyalar yeni bir pencerede açılacak",
-	"window.openFilesInNewWindow.off": "Dosyalar, dosyaların klasörünün olduğu pencerede veya son aktif pencerede açılacak",
-	"window.openFilesInNewWindow.defaultMac": "Dosyalar, Dock veya Finder'dan açılmadıkça, dosyaların klasörünün olduğu pencerede veya son aktif pencerede açılacak",
-	"window.openFilesInNewWindow.default": "Dosyalar, uygulama içinden seçilmedikçe (ör. Dosya menüsünden) yeni bir pencerede açılır",
-	"openFilesInNewWindowMac": "Dosyaların yeni bir pencerede açılıp açılmayacağını denetler.\n- default: dosyalar, Dock veya Finder'dan açılmadıkça, dosyaların klasörünün olduğu pencerede veya son aktif pencerede açılacak\n- on: dosyalar yeni bir pencerede açılacak\n- off: dosyalar, dosyaların klasörünün olduğu pencerede veya son aktif pencerede açılacak\nBu ayarın halen yok sayılacağı durumlar olabilir (ör. -new-window veya -reuse-window komut satırı seçenekleri kullanılırken).",
-	"openFilesInNewWindow": "Dosyaların yeni bir pencerede açılıp açılmayacağını denetler.\n- default: dosyalar, uygulama içinden seçilmedikçe (ör. Dosya menüsünden) yeni bir pencerede açılır\n- on: dosyalar yeni bir pencerede açılır\n- off: dosyalar, dosyaların klasörünün olduğu pencerede veya son aktif pencerede açılır\nBu ayarın halen yok sayılacağı durumlar olabilir (ör. -new-window veya -reuse-window komut satırı seçenekleri kullanılırken).",
-	"window.openFoldersInNewWindow.on": "Klasörler yeni bir pencerede açılacak",
-	"window.openFoldersInNewWindow.off": "Klasörler son aktif pencereyi değiştirir",
-	"window.openFoldersInNewWindow.default": "Klasörler, bir klasör uygulama içinden seçilmedikçe (ör. Dosya menüsünden) yeni bir pencerede açılır",
-	"openFoldersInNewWindow": "Klasörlerin yeni bir pencerede mi açılacağını yoksa son aktif pencereyi mi değiştireceğini denetler.\n- default: klasörler, bir klasör uygulama içinden seçilmedikçe (ör. Dosya menüsünden) yeni bir pencerede açılır\n- on: klasörler yeni bir pencerede açılır\n- off: klasörler son aktif pencereyi değiştirir\nBu ayarın halen yok sayılacağı durumlar olabilir (ör. -new-window veya -reuse-window komut satırı seçenekleri kullanılırken).",
-	"window.openWithoutArgumentsInNewWindow.on": "Yeni bir pencere aç",
-	"window.openWithoutArgumentsInNewWindow.off": "Son aktif çalışan örneğe odakla",
-	"openWithoutArgumentsInNewWindow": "Yeni bir örnek argümansız olarak başlatılırken boş bir yeni pencerenin açılıp açılmamasını veya son çalışan örneğe odaklanıp odaklanmamasını denetler.\n- on: boş bir yeni pencere aç\n- off: son çalışan örneğe odakla\nBu ayarın halen yok sayılacağı durumlar olabilir (ör. -new-window veya -reuse-window komut satırı seçenekleri kullanılırken).",
-	"window.reopenFolders.all": "Tüm pencereleri yeniden aç.",
-	"window.reopenFolders.folders": "Tüm klasörleri yeniden aç. Boş çalışma alanları geri yüklenmeyecektir.",
-	"window.reopenFolders.one": "Son aktif pencereyi yeniden aç.",
-	"window.reopenFolders.none": "Asla bir pencereyi yeniden açma. Her zaman boş bir pencereyle başla.",
-	"restoreWindows": "Pencerelerin, bir yeniden başlatma sonrası nasıl yeniden açılacağını denetler. Her zaman boş bir çalışma alanı ile başlamak için 'none', üzerinde çalıştığınız son pencereyi yeniden açmak için 'one', açık klasör bulunduran tüm pencereleri yeniden açmak için 'folders' veya son oturumunuzdaki tüm pencereleri yeniden açmak için 'all' seçeneğini seçin.",
-	"restoreFullscreen": "Bir pencere tam ekran modundayken çıkıldıysa, bu pencerenin tam ekran moduna geri dönüp dönmeyeceğini denetler.",
-	"zoomLevel": "Pencerenin yakınlaştırma düzeyini ayarlayın. Orijinal boyut 0'dır ve üstündeki (ör. 1) veya altındaki (ör. -1) her artırma 20% daha fazla veya az yakınlaştırmayı temsil eder. Yakınlaştırma düzeyini daha ince ayrıntılarla ayarlamak için ondalık değerler de girebilirsiniz.",
-	"title": "Pencere başlığını aktif düzenleyiciye bağlı olarak denetler. Değişkenler, bağlama göre değiştirilir:\n${activeEditorShort}: dosyanın adı (ör. myFile.txt)\n${activeEditorMedium}: çalışma alanı klasörüne göreli dosyanın yolu (ör. myFolder/myFile.txt)\n${activeEditorLong}: dosyanın tam yolu (ör. /Users/Development/myProject/myFolder/myFile.txt)\n${folderName}: dosyayı içeren çalışma alanı klasörünün adı (ör. myFolder)\n${folderPath}: dosyayı içeren çalışma alanı klasörünün yolu (ör. /Users/Development/myFolder)\n${rootName}: çalışma alanının adı (ör. myFolder veya myWorkspace)\n${rootPath}: çalışma alanının yolu (ör. /Users/Development/myWorkspace)\n${appName}: ör. VS Code\n${dirty}: etkin düzenleyici kaydedilmemiş değişiklikler içeriyorsa, değişiklik göstergesi\n${separator}: şartlı ayırıcı (\" - \") yalnızca değer veya statik metin içeren değişkenlerle çevrili olduğunda gösterilir",
-	"window.newWindowDimensions.default": "Yeni pencereleri ekranın ortasında açın.",
-	"window.newWindowDimensions.inherit": "Yeni pencereleri son aktif pencere ile aynı ölçülerde açın.",
-	"window.newWindowDimensions.maximized": "Yeni pencereleri ekranı kapla modunda açın.",
-	"window.newWindowDimensions.fullscreen": "Yeni pencereleri tam ekran modunda açın.",
-	"newWindowDimensions": "En az bir pencere açıkken, açılacak yeni bir pencerenin boyutlarını denetler. Varsayılan olarak; yeni pencere ekranın ortasında küçük bir boyutta açılır. 'inherit' değeri atandığında, pencere aktif olan son pencere ile aynı boyutları alacaktır. 'maximized' değeri atandığında, ekranı kaplar biçimde açılır ve 'fullscreen' değeri atandığında, tam ekran olarak açılır. Bu ayarın açılan ilk pencere üzerinde bir etkisi olmadığını unutmayın. İlk pencere, daima boyutunu ve konumunu kapanmadan önce bıraktığınız şekilde geri yükler.",
-	"closeWhenEmpty": "Son düzenleyiciyi kapatmanın pencereyi de kapatıp kapatmayacağını denetler. Bu ayar sadece klasör göstermeyen pencereler için uygulanır.",
-	"window.menuBarVisibility.default": "Menü, sadece tam ekran modunda gizlenir.",
-	"window.menuBarVisibility.visible": "Menü, tam ekran modunda bile daima görünür.",
-	"window.menuBarVisibility.toggle": "Menü gizlidir, fakat Alt tuşuyla görüntülenebilir.",
-	"window.menuBarVisibility.hidden": "Menü daima gizlidir.",
-	"menuBarVisibility": "Menü çubuğunun gizliliğini denetleyin. 'toggle' ayarı, menü çubuğu gizlidir ve Alt tuşuna bir kez basıldığında gösterilir anlamına gelir. Varsayılan olarak; menü çubuğu, pencere tam ekran değilse görünür durumdadır.",
-	"enableMenuBarMnemonics": "Etkinleştirilirse, ana menüler Alt tuşu kısayollarıyla açılabilir. Anımsatıcıları devre dışı bırakmak, bu Alt tuşu kısayollarının düzenleyici komutlarının yerine kullanılmasını sağlar.",
-	"autoDetectHighContrast": "Etkinleştirilirse; eğer Windows bir yüksek karşıtlık teması kullanıyorsa, otomatik olarak yüksek karşıtlık temasına geçiş yapılır; ve Windows, yüksek karşıtlık temasını kullanmayı bıraktığında koyu temaya geçiş yapılır.",
-	"titleBarStyle": "Pencere başlık çubuğunun görünümünü ayarlayın. Değişikliklerin uygulanması için tam yeniden başlatma gerekir.",
-	"window.nativeTabs": "macOS Sierra pencere sekmelerini etkinleştirir. Değişikliklerin uygulanması için tam yeniden başlatma gerekeceğini ve yerel sekmelerin, eğer yapılandırılmışsa özel başlık çubuğu stilini devre dışı bıracağını unutmayın.",
-	"window.smoothScrollingWorkaround": "Simge durumuna küçültülmüş bir VS Code penceresini tekrar açtıktan sonra kaydırma artık pürüzsüz değilse bu geçici çözümü etkinleştirin. Bu, Microsoft'un Surface cihazları gibi hassas trackpad'ler içeren cihazlarda yaşanan kaydırma gecikmesi sorunu (https://github.com/Microsoft/vscode/issues/13612) için geçici bir çözümdür.",
-	"window.clickThroughInactive": "Etkinleştirilirse, aktif olmayan bir pencereye tıklandığında hem pencere etkinleştirilir hem de farenin üzerinde bulunduğu öge tıklanabilir durumdaysa tetiklenir. Devre dışı bırakılırsa, aktif olmayan bir pencerenin herhangi bir yerine tıklandığında sadece o pencere etkinleştirilir ve öge için ikinci bir tıklama gerekir.",
-	"zenModeConfigurationTitle": "Zen Modu",
-	"zenMode.fullScreen": "Zen Moduna geçmenin ayrıca çalışma ekranını tam ekran moduna geçirip geçirmeyeceğini denetler.",
-	"zenMode.centerLayout": "Zen Modu'nun aktif edilmesinin düzeni ortalayıp ortalamayacağını denetler.",
-	"zenMode.hideTabs": "Zen Moduna geçmenin ayrıca çalışma ekranı sekmelerini gizleyip gizlemeyeceğini denetler.",
-	"zenMode.hideStatusBar": "Zen Moduna geçmenin ayrıca çalışma ekranının altındaki durum çubuğunu gizleyip gizlemeyeceğini denetler.",
-	"zenMode.hideActivityBar": "Zen Moduna geçmenin ayrıca çalışma ekranının solundaki etkinlik çubuğunu gizleyip gizlemeyeceğini denetler.",
-	"zenMode.restore": "Bir pencere Zen modundayken çıkıldıysa, bu pencerenin Zen moduna geri dönüp dönmeyeceğini denetler."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/electron-browser/main.i18n.json b/i18n/trk/src/vs/workbench/electron-browser/main.i18n.json
deleted file mode 100644
index 0e9528365b1..00000000000
--- a/i18n/trk/src/vs/workbench/electron-browser/main.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"loaderError": "Gerekli bir dosya yüklenemedi. Artık İnternet'e bağlı değilsiniz veya bağlı olduğunuz sunucu çevrimdışı. Yeniden denemek için lütfen tarayıcıyı yenileyin.",
-	"loaderErrorNative": "Gerekli bir dosya yüklenemedi. Yeniden denemek için lütfen uygulamayı yeniden başlatın. Ayrıntılar: {0}"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/electron-browser/shell.i18n.json b/i18n/trk/src/vs/workbench/electron-browser/shell.i18n.json
deleted file mode 100644
index ef01873077f..00000000000
--- a/i18n/trk/src/vs/workbench/electron-browser/shell.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"runningAsRoot": "Code'u 'root' olarak çalıştırmamanız önerilir."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/electron-browser/window.i18n.json b/i18n/trk/src/vs/workbench/electron-browser/window.i18n.json
deleted file mode 100644
index 861c7f35ac0..00000000000
--- a/i18n/trk/src/vs/workbench/electron-browser/window.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"undo": "Geri Al",
-	"redo": "Yinele",
-	"cut": "Kes",
-	"copy": "Kopyala",
-	"paste": "Yapıştır",
-	"selectAll": "Tümünü Seç",
-	"runningAsRoot": "[0] uygulamasını root olarak çalıştırmanız önerilmez."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/electron-browser/workbench.i18n.json b/i18n/trk/src/vs/workbench/electron-browser/workbench.i18n.json
deleted file mode 100644
index a2fa7679eb7..00000000000
--- a/i18n/trk/src/vs/workbench/electron-browser/workbench.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"developer": "Geliştirici",
-	"file": "Dosya"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/node/extensionHostMain.i18n.json b/i18n/trk/src/vs/workbench/node/extensionHostMain.i18n.json
deleted file mode 100644
index 8abce2522b0..00000000000
--- a/i18n/trk/src/vs/workbench/node/extensionHostMain.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"extensionTestError": "{0} yolu, geçerli bir eklenti test çalıştırıcısına işaret etmiyor."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/node/extensionPoints.i18n.json b/i18n/trk/src/vs/workbench/node/extensionPoints.i18n.json
deleted file mode 100644
index 17cb5965e96..00000000000
--- a/i18n/trk/src/vs/workbench/node/extensionPoints.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"jsonParseFail": "{0} ayrıştırılamadı: {1}.",
-	"fileReadFail": "{0} dosyası okunamadı: {1}.",
-	"jsonsParseFail": "{0} veya {1} ayrıştırılamadı: {2}.",
-	"missingNLSKey": "{0} anahtarı için mesaj bulunamadı."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/cli/electron-browser/cli.contribution.i18n.json b/i18n/trk/src/vs/workbench/parts/cli/electron-browser/cli.contribution.i18n.json
deleted file mode 100644
index c9553a344a8..00000000000
--- a/i18n/trk/src/vs/workbench/parts/cli/electron-browser/cli.contribution.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"install": "'{0}' kabuk komutunu PATH'e yükle",
-	"not available": "Bu komut mevcut değil",
-	"successIn": "'{0}' kabuk komutu PATH'e başarıyla yüklendi.",
-	"ok": "Tamam",
-	"cancel2": "İptal",
-	"warnEscalation": "Code, şimdi kabuk komutunu yüklemek üzere yönetici ayrıcalıkları için 'osascript' ile izin isteyecektir.",
-	"cantCreateBinFolder": "'/usr/local/bin' oluşturulamadı.",
-	"aborted": "Durduruldu",
-	"uninstall": "'{0}' kabuk komutunu PATH'den kaldır",
-	"successFrom": "'{0}' kabuk komutu PATH'den başarıyla kaldırıldı.",
-	"shellCommand": "Kabuk Komutu"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/codeEditor/electron-browser/accessibility.i18n.json b/i18n/trk/src/vs/workbench/parts/codeEditor/electron-browser/accessibility.i18n.json
deleted file mode 100644
index 703805d8b30..00000000000
--- a/i18n/trk/src/vs/workbench/parts/codeEditor/electron-browser/accessibility.i18n.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"emergencyConfOn": "Şu an `editor.accessibilitySupport` ayarı 'on' olarak değiştiriliyor.",
-	"openingDocs": "Şu an VS Code Erişilebilirlik belgeleri sayfası açılıyor.",
-	"introMsg": "VS Code'un erişilebilirlik seçeneklerini denediğiniz için teşekkür ederiz.",
-	"status": "Durum:",
-	"changeConfigToOnMac": "Düzenleyicinin kalıcı olarak bir Ekran Okuyucu ile kullanılmak üzere optimize edilmesini ayarlamak için Command+E tuşlarına basın.",
-	"changeConfigToOnWinLinux": "Düzenleyicinin kalıcı olarak bir Ekran Okuyucu ile kullanılmak üzere optimize edilmesini ayarlamak için Control+E tuşlarına basın.",
-	"auto_unknown": "Düzenleyici, bir Ekran Okuyucu'nun ne zaman bağlandığını algılamak için platform API'larını kullanmak üzere ayarlanmış, fakat geçerli çalışma zamanı bunu desteklemiyor.",
-	"auto_on": "Düzenleyici, bir Ekran Okuyucu'nun bağlandığını otomatik olarak algıladı.",
-	"auto_off": "Düzenleyici, bir Ekran Okuyucu'nun ne zaman bağlandığını otomatik olarak algılamak için yapılandırılmış, şu anki durum böyle değil.",
-	"configuredOn": "Düzenleyici kalıcı olarak bir Ekran Okuyucu ile kullanılmak üzere optimize edilmesi için yapılandırılmış - bunu, `editor.accessibilitySupport` ayarını düzenleyerek değiştirebilirsiniz.",
-	"configuredOff": "Düzenleyici hiçbir zaman bir Ekran Okuyucu ile kullanılmak üzere optimize edilmemesi için yapılandırılmış.",
-	"tabFocusModeOnMsg": "Geçerli düzenleyicide Tab tuşuna basmak odağı bir sonraki odaklanabilir ögeye kaydıracaktır. {0} tuşuna basarak bu davranışı açıp kapatın.",
-	"tabFocusModeOnMsgNoKb": "Geçerli düzenleyicide Tab tuşuna basmak odağı bir sonraki odaklanabilir ögeye kaydıracaktır. {0} komutu, şu an bir tuş bağı ile tetiklenemez.",
-	"tabFocusModeOffMsg": "Geçerli düzenleyicide Tab tuşuna basmak bir sekme karakteri ekleyecektir. {0} tuşuna basarak bu davranışı açıp kapatın.",
-	"tabFocusModeOffMsgNoKb": "Geçerli düzenleyicide Tab tuşuna basmak bir sekme karakteri ekleyecektir. {0} komutu, şu an bir tuş bağı ile tetiklenemez.",
-	"openDocMac": "Erişilebilirlik ile ilgili daha fazla VS Code bilgisi içeren bir tarayıcı penceresi açmak için Command+H tuşlarına basın.",
-	"openDocWinLinux": "Erişilebilirlik ile ilgili daha fazla VS Code bilgisi içeren bir tarayıcı penceresi açmak için Control+H tuşlarına basın.",
-	"outroMsg": "Escape veya Shift+Escape tuşlarına basarak bu ipucunu kapatabilir ve düzenleyiciye dönebilirsiniz.",
-	"ShowAccessibilityHelpAction": "Erişilebilirlik Yardımını Göster"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/codeEditor/electron-browser/inspectKeybindings.i18n.json b/i18n/trk/src/vs/workbench/parts/codeEditor/electron-browser/inspectKeybindings.i18n.json
deleted file mode 100644
index b374bb1f831..00000000000
--- a/i18n/trk/src/vs/workbench/parts/codeEditor/electron-browser/inspectKeybindings.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"workbench.action.inspectKeyMap": "Geliştirici: Tuş Eşlemelerini Denetle"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/codeEditor/electron-browser/inspectTMScopes.i18n.json b/i18n/trk/src/vs/workbench/parts/codeEditor/electron-browser/inspectTMScopes.i18n.json
deleted file mode 100644
index 3566cd50ef9..00000000000
--- a/i18n/trk/src/vs/workbench/parts/codeEditor/electron-browser/inspectTMScopes.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"inspectTMScopes": "Geliştirici: TM Kapsamlarını Denetle",
-	"inspectTMScopesWidget.loading": "Yükleniyor..."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/codeEditor/electron-browser/languageConfiguration/languageConfigurationExtensionPoint.i18n.json b/i18n/trk/src/vs/workbench/parts/codeEditor/electron-browser/languageConfiguration/languageConfigurationExtensionPoint.i18n.json
deleted file mode 100644
index 5d30e897735..00000000000
--- a/i18n/trk/src/vs/workbench/parts/codeEditor/electron-browser/languageConfiguration/languageConfigurationExtensionPoint.i18n.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"parseErrors": "{0} için ayrıştırma hataları: {1}",
-	"schema.openBracket": "Açılış ayracı karakteri veya dize sırası.",
-	"schema.closeBracket": "Kapanış ayracı karakteri veya dize sırası.",
-	"schema.comments": "Yorum sembollerini tanımlar.",
-	"schema.blockComments": "Blok açıklamalarının nasıl işaretlendiğini tanımlar.",
-	"schema.blockComment.begin": "Blok açıklamasını başlatan karakter dizisi.",
-	"schema.blockComment.end": "Blok açıklamasını bitiren karakter dizisi.",
-	"schema.lineComment": "Satır açıklamasını başlatan karakter dizisi.",
-	"schema.brackets": "Girintiyi artıran veya azaltan ayraç sembollerini tanımlar.",
-	"schema.autoClosingPairs": "Ayraç çiftlerini tanımlar. Bir açılış ayracı girildiğinde, kapanış ayracı otomatik olarak eklenir.",
-	"schema.autoClosingPairs.notIn": "Otomatik çiftlerin devre dışı bırakıldığı bir kapsamlar listesi tanımlar.",
-	"schema.surroundingPairs": "Seçili bir dizeyi çevrelemek için kullanılabilecek ayraç çiftlerini tanımlar.",
-	"schema.wordPattern": "Dilin kelime tanımı.",
-	"schema.wordPattern.pattern": "Sözcükleri eşleştirmek için kullanılacak Düzenli İfade.",
-	"schema.wordPattern.flags": "Sözcükleri eşleştirmek için kullanılacak Düzenli İfade işaretleri.",
-	"schema.wordPattern.flags.errorMessage": "`/^([gimuy]+)$/` kalıbı ile eşleşmelidir.",
-	"schema.indentationRules": "Dilin girintileme ayarları.",
-	"schema.indentationRules.increaseIndentPattern": "Bir satır bu kalıpla eşleşirse, ondan sonraki tüm satırlar (başka bir kuralla eşleşmedikçe) bir kez girintilenmelidir.",
-	"schema.indentationRules.increaseIndentPattern.pattern": "increaseIndentPattern için Düzenli İfade.",
-	"schema.indentationRules.increaseIndentPattern.flags": "increaseIndentPattern için Düzenli İfade işaretleri.",
-	"schema.indentationRules.increaseIndentPattern.errorMessage": "`/^([gimuy]+)$/` kalıbı ile eşleşmelidir.",
-	"schema.indentationRules.decreaseIndentPattern": "Bir satır bu kalıpla eşleşirse, ondan sonraki tüm satırların (başka bir kuralla eşleşmedikçe) girintisi bir kez azaltılmalıdır.",
-	"schema.indentationRules.decreaseIndentPattern.pattern": "decreaseIndentPattern için Düzenli İfade.",
-	"schema.indentationRules.decreaseIndentPattern.flags": "decreaseIndentPattern için Düzenli İfade işaretleri.",
-	"schema.indentationRules.decreaseIndentPattern.errorMessage": "`/^([gimuy]+)$/` kalıbı ile eşleşmelidir.",
-	"schema.indentationRules.indentNextLinePattern": "Bir satır bu kalıpla eşleşirse, ondan **sadece bir sonraki satır** bir kez girintilenmelidir.",
-	"schema.indentationRules.indentNextLinePattern.pattern": "indentNextLinePattern için Düzenli İfade.",
-	"schema.indentationRules.indentNextLinePattern.flags": "indentNextLinePattern için Düzenli İfade işaretleri.",
-	"schema.indentationRules.indentNextLinePattern.errorMessage": "`/^([gimuy]+)$/` kalıbı ile eşleşmelidir.",
-	"schema.indentationRules.unIndentedLinePattern": "Bir satır bu kalıpla eşleşirse, o satırın girintisi değiştirilmemelidir ve diğer kurallara karşı değerlendirilmemelidir.",
-	"schema.indentationRules.unIndentedLinePattern.pattern": "unIndentedLinePattern için Düzenli İfade.",
-	"schema.indentationRules.unIndentedLinePattern.flags": "unIndentedLinePattern için Düzenli İfade işaretleri.",
-	"schema.indentationRules.unIndentedLinePattern.errorMessage": "`/^([gimuy]+)$/` kalıbı ile eşleşmelidir.",
-	"schema.folding": "Dilin katlama ayarları.",
-	"schema.folding.offSide": "Bir dildeki bloklar girintilendirmeleriyle ifade edilirse, o dil için off-side kuralı uygulanır. Eğer ayarlanırsa, boş satırlar sonraki bloğa ait olur.",
-	"schema.folding.markers": "'#region' ve '#endregion' gibi dile özgü katlama işaretçileri. Başlangıç ve bitiş düzenli ifadeleri tüm satırlardaki içeriklere karşı test edilecektir ve verimli olacak şekilde tasarlanmalıdır",
-	"schema.folding.markers.start": "Başlangıç işaretçisi için Düzenli İfade kalıbı. Düzenli ifade '^' ile başlamalıdır.",
-	"schema.folding.markers.end": "Bitiş işaretçisi için Düzenli İfade kalıbı. Düzenli ifade '^' ile başlamalıdır."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/codeEditor/electron-browser/largeFileOptimizations.i18n.json b/i18n/trk/src/vs/workbench/parts/codeEditor/electron-browser/largeFileOptimizations.i18n.json
deleted file mode 100644
index 5eadf9a5ef1..00000000000
--- a/i18n/trk/src/vs/workbench/parts/codeEditor/electron-browser/largeFileOptimizations.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"neverShowAgain": "Tamam. Tekrar Gösterme",
-	"removeOptimizations": "Özellikleri zorla etkinleştir",
-	"reopenFilePrompt": "Bu ayarın yürürlüğe girmesi için lütfen dosyayı yeniden açın."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/codeEditor/electron-browser/textMate/inspectTMScopes.i18n.json b/i18n/trk/src/vs/workbench/parts/codeEditor/electron-browser/textMate/inspectTMScopes.i18n.json
deleted file mode 100644
index 38376e6bd87..00000000000
--- a/i18n/trk/src/vs/workbench/parts/codeEditor/electron-browser/textMate/inspectTMScopes.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"inspectTMScopes": "Geliştirici: TM Kapsamlarını Denetle",
-	"inspectTMScopesWidget.loading": "Yükleniyor..."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/codeEditor/electron-browser/toggleMinimap.i18n.json b/i18n/trk/src/vs/workbench/parts/codeEditor/electron-browser/toggleMinimap.i18n.json
deleted file mode 100644
index b60e378b48d..00000000000
--- a/i18n/trk/src/vs/workbench/parts/codeEditor/electron-browser/toggleMinimap.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleMinimap": "Görünüm: Mini Haritayı Aç/Kapat"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/codeEditor/electron-browser/toggleMultiCursorModifier.i18n.json b/i18n/trk/src/vs/workbench/parts/codeEditor/electron-browser/toggleMultiCursorModifier.i18n.json
deleted file mode 100644
index 6ede8011f02..00000000000
--- a/i18n/trk/src/vs/workbench/parts/codeEditor/electron-browser/toggleMultiCursorModifier.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleLocation": "Çoklu İmleç Değiştiricisini Aç/Kapat"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderControlCharacter.i18n.json b/i18n/trk/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderControlCharacter.i18n.json
deleted file mode 100644
index 453a7859ffd..00000000000
--- a/i18n/trk/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderControlCharacter.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleRenderControlCharacters": "Görünüm: Kontrol Karakterlerini Aç/Kapat"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderWhitespace.i18n.json b/i18n/trk/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderWhitespace.i18n.json
deleted file mode 100644
index d6d94607f83..00000000000
--- a/i18n/trk/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderWhitespace.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleRenderWhitespace": "Görünüm: Boşlukları Görüntülemeyi Aç/Kapat"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/codeEditor/electron-browser/toggleWordWrap.i18n.json b/i18n/trk/src/vs/workbench/parts/codeEditor/electron-browser/toggleWordWrap.i18n.json
deleted file mode 100644
index d35ee067abd..00000000000
--- a/i18n/trk/src/vs/workbench/parts/codeEditor/electron-browser/toggleWordWrap.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggle.wordwrap": "Görünüm: Sözcük Kaydırmasını Aç/Kapat",
-	"wordWrap.notInDiffEditor": "Diff düzenleyicisinde sözcük kaydırma açılıp kapatılamıyor",
-	"unwrapMinified": "Bu dosya için sonraki satıra kaydırmayı devre dışı bırak",
-	"wrapMinified": "Bu dosya için sonraki satıra kaydırmayı etkinleştir"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/codeEditor/electron-browser/wordWrapMigration.i18n.json b/i18n/trk/src/vs/workbench/parts/codeEditor/electron-browser/wordWrapMigration.i18n.json
deleted file mode 100644
index 36714e1e60d..00000000000
--- a/i18n/trk/src/vs/workbench/parts/codeEditor/electron-browser/wordWrapMigration.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"wordWrapMigration.ok": "Tamam",
-	"wordWrapMigration.dontShowAgain": "Tekrar Gösterme",
-	"wordWrapMigration.openSettings": "Ayarları Aç",
-	"wordWrapMigration.prompt": "`editor.wrappingColumn` ayarı, `editor.wordWrap` yüzünden kullanım dışıdır."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/debug/browser/breakpointWidget.i18n.json b/i18n/trk/src/vs/workbench/parts/debug/browser/breakpointWidget.i18n.json
deleted file mode 100644
index 129fc64ea6a..00000000000
--- a/i18n/trk/src/vs/workbench/parts/debug/browser/breakpointWidget.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"breakpointWidgetExpressionPlaceholder": "İfade değerlendirmesi doğru olduğunda mola ver. Kabul etmek için 'Enter', iptal etmek için 'Esc' tuşuna basın.",
-	"breakpointWidgetAriaLabel": "Program, burada sadece bu koşul doğruysa durur. Kabul etmek için Enter veya iptal etmek için Escape tuşuna basın. ",
-	"breakpointWidgetHitCountPlaceholder": "İsabet sayısı koşulu sağlandığında mola ver. Kabul etmek için 'Enter', iptal etmek için 'Esc' tuşuna basın.",
-	"breakpointWidgetHitCountAriaLabel": "Program, burada sadece isabet sayısı koşulu sağlandığında durur. Kabul etmek için Enter veya iptal etmek için Escape tuşuna basın. ",
-	"expression": "İfade",
-	"hitCount": "İsabet Sayısı"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json b/i18n/trk/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
deleted file mode 100644
index 896aab5629d..00000000000
--- a/i18n/trk/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"logPoint": "Günlük Noktası",
-	"breakpoint": "Kesme Noktası",
-	"editBreakpoint": "Düzenle: {0}...",
-	"removeBreakpoint": "Kaldır: {0}",
-	"functionBreakpointsNotSupported": "Fonksiyon kesme noktaları bu hata ayıklama türü tarafından desteklenmiyor",
-	"functionBreakpointPlaceholder": "Mola verilecek fonksiyon",
-	"functionBreakPointInputAriaLabel": "Fonksiyon kesme noktasını girin",
-	"breakpointDisabledHover": "Devre dışı bırakılmış kesme noktası",
-	"breakpointUnverifieddHover": "Doğrulanmamış kesme noktası",
-	"functionBreakpointUnsupported": "Fonksiyon kesme noktaları bu hata ayıklama türü tarafından desteklenmiyor",
-	"breakpointDirtydHover": "Doğrulanmamış Kesme Noktası Dosya düzenlendi, lütfen hata ayıklama oturumunu yeniden başlatın.",
-	"logBreakpointUnsupported": "Günlük noktaları bu hata ayıklama türü tarafından desteklenmiyor",
-	"conditionalBreakpointUnsupported": "Koşullu kesme noktaları bu hata ayıklama türü tarafından desteklenmiyor",
-	"hitBreakpointUnsupported": "Koşullu kesme noktalarına isabet etme bu hata ayıklama türü tarafından desteklenmiyor"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/debug/browser/debugActionItems.i18n.json b/i18n/trk/src/vs/workbench/parts/debug/browser/debugActionItems.i18n.json
deleted file mode 100644
index c226196cdb7..00000000000
--- a/i18n/trk/src/vs/workbench/parts/debug/browser/debugActionItems.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noConfigurations": "Yapılandırma Yok",
-	"addConfigTo": "Yapılandırma Ekle ({0})...",
-	"addConfiguration": "Yapılandırma Ekle..."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/debug/browser/debugActions.i18n.json b/i18n/trk/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
deleted file mode 100644
index 7f7bbb5c84b..00000000000
--- a/i18n/trk/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openLaunchJson": "{0} Dosyasını Aç",
-	"launchJsonNeedsConfigurtion": "'launch.json'u Yapılandır veya Düzelt",
-	"noFolderDebugConfig": "Gelişmiş hata ayıklama yapılandırması yapmak için lütfen ilk olarak bir klasör açın.",
-	"startDebug": "Hata Ayıklamaya Başla",
-	"startWithoutDebugging": "Hata Ayıklama Olmadan Başlat",
-	"selectAndStartDebugging": "Seç ve Hata Ayıklamaya Başla",
-	"restartDebug": "Yeniden Başlat",
-	"reconnectDebug": "Yeniden Bağlan",
-	"stepOverDebug": "Adım At",
-	"stepIntoDebug": "İçine Adımla",
-	"stepOutDebug": "Dışına Adımla",
-	"stopDebug": "Durdur",
-	"disconnectDebug": "Bağlantıyı Kes",
-	"continueDebug": "Devam Et",
-	"pauseDebug": "Duraklat",
-	"terminateThread": "İş Parçacığını Sonlandır",
-	"restartFrame": "Çerçeveyi Yeniden Başlat",
-	"removeBreakpoint": "Kesme Noktasını Kaldır",
-	"removeAllBreakpoints": "Tüm Kesme Noktalarını Kaldır",
-	"enableAllBreakpoints": "Tüm Kesme Noktalarını Etkinleştir",
-	"disableAllBreakpoints": "Tüm Kesme Noktalarını Devre Dışı Bırak",
-	"activateBreakpoints": "Kesme Noktalarını Etkinleştir",
-	"deactivateBreakpoints": "Kesme Noktalarını Devre Dışı Bırak",
-	"reapplyAllBreakpoints": "Tüm Kesme Noktalarını Yeniden Uygula",
-	"addFunctionBreakpoint": "Fonksiyon Kesme Noktası Ekle",
-	"setValue": "Değeri Ayarla",
-	"addWatchExpression": "İfade Ekle",
-	"editWatchExpression": "İfadeyi Düzenle",
-	"addToWatchExpressions": "İzlemeye Ekle",
-	"removeWatchExpression": "İfadeyi Kaldır",
-	"removeAllWatchExpressions": "Tüm İfadeleri Kaldır",
-	"clearRepl": "Konsolu Temizle",
-	"debugConsoleAction": "Hata Ayıklama Konsolu",
-	"unreadOutput": "Hata Ayıklama Konsolunda Yeni Çıktı",
-	"debugFocusConsole": "Hata Ayıklama Konsoluna Odakla",
-	"focusSession": "Oturuma Odakla",
-	"stepBackDebug": "Geri Adım At",
-	"reverseContinue": "Tersine Çevir"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/debug/browser/debugActionsWidget.i18n.json b/i18n/trk/src/vs/workbench/parts/debug/browser/debugActionsWidget.i18n.json
deleted file mode 100644
index 3d7ac474b05..00000000000
--- a/i18n/trk/src/vs/workbench/parts/debug/browser/debugActionsWidget.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"debugToolBarBackground": "Hata ayıklama araç çubuğu arka plan rengi.",
-	"debugToolBarBorder": "Hata ayıklama araç çubuğu kenarlık rengi."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/debug/browser/debugCommands.i18n.json b/i18n/trk/src/vs/workbench/parts/debug/browser/debugCommands.i18n.json
deleted file mode 100644
index 64d6f8c64c3..00000000000
--- a/i18n/trk/src/vs/workbench/parts/debug/browser/debugCommands.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noFolderDebugConfig": "Gelişmiş hata ayıklama yapılandırması yapmak için lütfen ilk olarak bir klasör açın.",
-	"inlineBreakpoint": "Satır İçi Kesme Noktası",
-	"debug": "Hata Ayıklama",
-	"addInlineBreakpoint": "Satır İçi Kesme Noktası Ekle"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/debug/browser/debugContentProvider.i18n.json b/i18n/trk/src/vs/workbench/parts/debug/browser/debugContentProvider.i18n.json
deleted file mode 100644
index febccb3860d..00000000000
--- a/i18n/trk/src/vs/workbench/parts/debug/browser/debugContentProvider.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"unable": "Hata ayıklama oturumu olmadan kaynak çözümlenemiyor",
-	"canNotResolveSource": "{0} kaynağı çözümlenemedi, hata ayıklama eklentisi yanıt vermedi."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json b/i18n/trk/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
deleted file mode 100644
index 107e35dc98e..00000000000
--- a/i18n/trk/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleBreakpointAction": "Hata Ayıklama: Kesme Noktası Ekle/Kaldır",
-	"conditionalBreakpointEditorAction": "Hata Ayıklama: Koşullu Kesme Noktası Ekle...",
-	"logPointEditorAction": "Hata Ayıklama: Günlük Noktası Ekle...",
-	"runToCursor": "İmlece Kadar Çalıştır",
-	"debugEvaluate": "Hata Ayıklama: Değerlendir",
-	"debugAddToWatch": "Hata Ayıklama: İzlemeye Ekle",
-	"showDebugHover": "Hata Ayıklama: Bağlantı Vurgusunu Göster",
-	"goToNextBreakpoint": "Hata Ayıklama: Sonraki Kesme Noktasına Git",
-	"goToPreviousBreakpoint": "Hata Ayıklama: Önceki Kesme Noktasına Git"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/debug/browser/debugEditorModelManager.i18n.json b/i18n/trk/src/vs/workbench/parts/debug/browser/debugEditorModelManager.i18n.json
deleted file mode 100644
index fed061f6353..00000000000
--- a/i18n/trk/src/vs/workbench/parts/debug/browser/debugEditorModelManager.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"breakpointDisabledHover": "Devre Dışı Bırakılmış Kesme Noktası",
-	"breakpointUnverifieddHover": "Doğrulanmamış Kesme Noktası",
-	"breakpointDirtydHover": "Doğrulanmamış Kesme Noktası Dosya düzenlendi, lütfen hata ayıklama oturumunu yeniden başlatın.",
-	"breakpointUnsupported": "Koşullu kesme noktaları bu hata ayıklama türü tarafından desteklenmiyor"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/debug/browser/debugQuickOpen.i18n.json b/i18n/trk/src/vs/workbench/parts/debug/browser/debugQuickOpen.i18n.json
deleted file mode 100644
index a73bb7021cd..00000000000
--- a/i18n/trk/src/vs/workbench/parts/debug/browser/debugQuickOpen.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"entryAriaLabel": "{0}, hata ayıklama",
-	"debugAriaLabel": "Çalıştırılacak bir başlatma yapılandırması adı girin.",
-	"addConfigTo": "Yapılandırma Ekle ({0})...",
-	"addConfiguration": "Yapı&&landırma Ekle...",
-	"noConfigurationsMatching": "Eşleyen hata ayıklama yapılandırması yok",
-	"noConfigurationsFound": "Hiçbir hata ayıklama yapılandırması bulunamadı. Lütfen bir 'launch.json' dosyası oluşturun."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/debug/browser/debugStatus.i18n.json b/i18n/trk/src/vs/workbench/parts/debug/browser/debugStatus.i18n.json
deleted file mode 100644
index 542e8b8284a..00000000000
--- a/i18n/trk/src/vs/workbench/parts/debug/browser/debugStatus.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"selectAndStartDebug": "Seçin ve hata ayıklama yapılandırmasını başlatın"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/debug/browser/debugViewlet.i18n.json b/i18n/trk/src/vs/workbench/parts/debug/browser/debugViewlet.i18n.json
deleted file mode 100644
index 9c2648bf857..00000000000
--- a/i18n/trk/src/vs/workbench/parts/debug/browser/debugViewlet.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"startAdditionalSession": "Ek Oturum Başlat",
-	"debugFocusVariablesView": "Değişkenlere Odakla",
-	"debugFocusWatchView": "İzlemeye Odakla",
-	"debugFocusCallStackView": "Çağrı Yığınına Odakla",
-	"debugFocusBreakpointsView": "Kesme Noktalarına Odakla"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/debug/browser/exceptionWidget.i18n.json b/i18n/trk/src/vs/workbench/parts/debug/browser/exceptionWidget.i18n.json
deleted file mode 100644
index 343a4aa828b..00000000000
--- a/i18n/trk/src/vs/workbench/parts/debug/browser/exceptionWidget.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"debugExceptionWidgetBorder": "İstisna aracı kenarlık rengi.",
-	"debugExceptionWidgetBackground": "İstisna aracı arka plan rengi.",
-	"exceptionThrownWithId": "İstisna oluştu: {0}",
-	"exceptionThrown": "İstisna oluştu."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/debug/browser/linkDetector.i18n.json b/i18n/trk/src/vs/workbench/parts/debug/browser/linkDetector.i18n.json
deleted file mode 100644
index 74f3978468c..00000000000
--- a/i18n/trk/src/vs/workbench/parts/debug/browser/linkDetector.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"fileLinkMac": "Takip etmek için tıklayın (Cmd + tıklama yana açar)",
-	"fileLink": "Takip etmek için tıklayın (Ctrl + tıklama yana açar)"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/debug/browser/statusbarColorProvider.i18n.json b/i18n/trk/src/vs/workbench/parts/debug/browser/statusbarColorProvider.i18n.json
deleted file mode 100644
index 59bb3e919c8..00000000000
--- a/i18n/trk/src/vs/workbench/parts/debug/browser/statusbarColorProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"statusBarDebuggingBackground": "Bir programda hata ayıklama yapılırken durum çubuğu arka plan rengi. Durum çubuğu, pencerenin alt kısmında gösterilir.",
-	"statusBarDebuggingForeground": "Bir programda hata ayıklama yapılırken durum çubuğu ön plan rengi. Durum çubuğu, pencerenin alt kısmında gösterilir.",
-	"statusBarDebuggingBorder": "Bir programda hata ayıklama yapılırken, durum çubuğunu kenar çubuğundan ve düzenleyiciden ayıran kenarlık rengi. Durum çubuğu, pencerenin alt kısmında gösterilir."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/debug/common/debug.i18n.json b/i18n/trk/src/vs/workbench/parts/debug/common/debug.i18n.json
deleted file mode 100644
index ab75de25b20..00000000000
--- a/i18n/trk/src/vs/workbench/parts/debug/common/debug.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"internalConsoleOptions": "Dahili hata ayıklama konsolunun davranışlarını denetler."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/debug/common/debugModel.i18n.json b/i18n/trk/src/vs/workbench/parts/debug/common/debugModel.i18n.json
deleted file mode 100644
index a970c2c6059..00000000000
--- a/i18n/trk/src/vs/workbench/parts/debug/common/debugModel.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"notAvailable": "mevcut değil",
-	"startDebugFirst": "Lütfen değerlendirilecek bir hata ayıklama oturumu başlatın"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/debug/common/debugSchemas.i18n.json b/i18n/trk/src/vs/workbench/parts/debug/common/debugSchemas.i18n.json
deleted file mode 100644
index 003dff404d9..00000000000
--- a/i18n/trk/src/vs/workbench/parts/debug/common/debugSchemas.i18n.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.contributes.debuggers": "Hata ayıklama bağdaştırıcılarına ekleme yapar.",
-	"vscode.extension.contributes.debuggers.type": "Bu hata ayıklama bağdaştırıcısnın benzersiz tanımlayıcısı.",
-	"vscode.extension.contributes.debuggers.label": "Bu hata ayıklama bağdaştırıcısnın görünen adı.",
-	"vscode.extension.contributes.debuggers.program": "Hata ayıklama bağdaştırıcı programının yolu. Yol, ya mutlak ya da eklenti klasörüne görelidir.",
-	"vscode.extension.contributes.debuggers.args": "Bağdaştırıcıya iletilecek ek argümanlar.",
-	"vscode.extension.contributes.debuggers.runtime": "Program özniteliğinin yürütülebilir olmadığı halde bir çalışma zamanını gerektirmesi durumu için isteğe bağlı çalışma zamanı.",
-	"vscode.extension.contributes.debuggers.runtimeArgs": "İsteğe bağlı çalışma zamanı argümanları.",
-	"vscode.extension.contributes.debuggers.variables": "`launch.json` dosyasındaki interaktif değişkenlerin (ör. ${action.pickProcess}) bir komuta eşlenmesi.",
-	"vscode.extension.contributes.debuggers.initialConfigurations": "İlk 'launch.json' dosyasının üretimi için yapılandırmalar.",
-	"vscode.extension.contributes.debuggers.languages": "Hata ayıklama eklentisinin, \"varsayılan hata ayıklayıcı\" olarak değerlendirilebileceği diller listesi.",
-	"vscode.extension.contributes.debuggers.adapterExecutableCommand": "Belirtilirse; VS Code, hata ayıklama bağdaştırıcısı yürütülebilir dosyasının yolunu ve ona gönderilecek argümanları belirlemek için bu komutu çağırır.",
-	"vscode.extension.contributes.debuggers.configurationSnippets": "'launch.json' dosyasına yeni yapılandırmalar ekleme parçacıkları.",
-	"vscode.extension.contributes.debuggers.configurationAttributes": "'launch.json' dosyasını doğrulayacak JSON şema yapılandırmaları.",
-	"vscode.extension.contributes.debuggers.windows": "Windows'a özel ayarlar.",
-	"vscode.extension.contributes.debuggers.windows.runtime": "Windows'da kullanılacak çalışma zamanı.",
-	"vscode.extension.contributes.debuggers.osx": "macOS'e özel ayarlar.",
-	"vscode.extension.contributes.debuggers.osx.runtime": "macOS'de kullanılacak çalışma zamanı.",
-	"vscode.extension.contributes.debuggers.linux": "Linux'a özel ayarlar.",
-	"vscode.extension.contributes.debuggers.linux.runtime": "Linux'da kullanılacak çalışma zamanı.",
-	"vscode.extension.contributes.breakpoints": "Kesme noktalarına ekleme yapar.",
-	"vscode.extension.contributes.breakpoints.language": "Bu dil için kesme noktalarını etkinleştir.",
-	"app.launch.json.title": "Başlat",
-	"app.launch.json.version": "Bu dosya biçiminin sürümü.",
-	"app.launch.json.configurations": "Yapılandırma listesi. IntelliSense kullanarak yeni yapılandırmalar ekleyin veya mevcut olanları düzenleyin.",
-	"app.launch.json.compounds": "Bileşikler listesi. Her bileşik, birlikte çalıştırılacak birden çok yapılandırmaya başvurur.",
-	"app.launch.json.compound.name": "Bileşiğin adı. Başlatma yapılandırması açılır kutu menüsünde görünür.",
-	"useUniqueNames": "Lütfen benzersiz yapılandırma adları kullanın.",
-	"app.launch.json.compound.folder": "Bileşiğin bulunduğu klasörün adı.",
-	"app.launch.json.compounds.configurations": "Bu bileşiğin parçası olarak başlatılacak yapılandırmaların adları."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/debug/common/debugSource.i18n.json b/i18n/trk/src/vs/workbench/parts/debug/common/debugSource.i18n.json
deleted file mode 100644
index 2cacf1edcbe..00000000000
--- a/i18n/trk/src/vs/workbench/parts/debug/common/debugSource.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"unknownSource": "Bilinmeyen Kaynak"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json b/i18n/trk/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
deleted file mode 100644
index 6f0d63fe4b5..00000000000
--- a/i18n/trk/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"breakpointWidgetLogMessagePlaceholder": "Bu kesme noktası isabet aldığında günlüğe kaydedilecek mesaj. {} arasındaki ifadeler hesaplanmaktadır. Kabul etmek için 'Enter', iptal etmek için 'Esc' tuşuna basın.",
-	"breakpointWidgetHitCountPlaceholder": "İsabet sayısı koşulu sağlandığında mola ver. Kabul etmek için 'Enter', iptal etmek için 'Esc' tuşuna basın.",
-	"breakpointWidgetExpressionPlaceholder": "İfade değerlendirmesi doğru olduğunda mola ver. Kabul etmek için 'Enter', iptal etmek için 'Esc' tuşuna basın.",
-	"expression": "İfade",
-	"hitCount": "İsabet Sayısı",
-	"logMessage": "Günlük Mesajı"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/debug/electron-browser/breakpointsView.i18n.json b/i18n/trk/src/vs/workbench/parts/debug/electron-browser/breakpointsView.i18n.json
deleted file mode 100644
index 538391e383c..00000000000
--- a/i18n/trk/src/vs/workbench/parts/debug/electron-browser/breakpointsView.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"editConditionalBreakpoint": "Kesme Noktasını Düzenle...",
-	"functionBreakpointsNotSupported": "Fonksiyon kesme noktaları bu hata ayıklama türü tarafından desteklenmiyor",
-	"functionBreakpointPlaceholder": "Mola verilecek fonksiyon",
-	"functionBreakPointInputAriaLabel": "Fonksiyon kesme noktasını girin"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/debug/electron-browser/callStackView.i18n.json b/i18n/trk/src/vs/workbench/parts/debug/electron-browser/callStackView.i18n.json
deleted file mode 100644
index ed6bb4b58ea..00000000000
--- a/i18n/trk/src/vs/workbench/parts/debug/electron-browser/callStackView.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"callstackSection": "Çağrı Yığını Bölümü",
-	"debugStopped": "{0} Üzerinde Duraklatıldı",
-	"callStackAriaLabel": "Hata Ayıklama Çağrı Yığını",
-	"session": "Oturum",
-	"paused": "Duraklatıldı",
-	"running": "Çalışıyor",
-	"thread": "İş Parçacığı",
-	"pausedOn": "{0} Üzerinde Duraklatıldı",
-	"loadMoreStackFrames": "Daha Fazla Yığın Çerçevesi Yükleyin",
-	"threadAriaLabel": "{0} iş parçacığı, çağrı yığını, hata ayıklama",
-	"stackFrameAriaLabel": "Yığın Çerçevesi {0} satır {1} {2}, çağrı yığını, hata ayıklama"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json b/i18n/trk/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
deleted file mode 100644
index fc9660712fb..00000000000
--- a/i18n/trk/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleDebugViewlet": "Hata Ayıklamayı Göster",
-	"toggleDebugPanel": "Hata Ayıklama Konsolu",
-	"debug": "Hata Ayıklama",
-	"debugPanel": "Hata Ayıklama Konsolu",
-	"variables": "Değişkenler",
-	"watch": "İzle",
-	"callStack": "Çağrı Yığını",
-	"breakpoints": "Kesme Noktaları",
-	"view": "Görüntüle",
-	"debugCategory": "Hata Ayıklama",
-	"debugCommands": "Hata Ayıklama Yapılandırması",
-	"debugConfigurationTitle": "Hata Ayıklama",
-	"allowBreakpointsEverywhere": "Herhangi bir dosyada kesme noktası ayarlamaya izin verir",
-	"openExplorerOnEnd": "Bir hata ayıklama oturumunun sonunda otomatik olarak gezgin görünümünü açın",
-	"inlineValues": "Hata ayıklama sırasında değişken değerlerini düzenleyicide satır içinde göster",
-	"never": "Hata ayıklamayı durum çubuğunda asla gösterme",
-	"always": "Hata ayıklamayı durum çubuğunda her zaman göster",
-	"onFirstSessionStart": "Hata ayıklamayı sadece ilk kez başladıktan sonra durum çubuğunda göster",
-	"showInStatusBar": "Hata ayıklama durum çubuğunun ne zaman görünür olacağını denetler",
-	"openDebug": "Hata ayıklama görünümünün, hata ayıklama oturumu başlangıcında açılıp açılmayacağını denetler.",
-	"launch": "Global hata ayıklama başlatma yapılandırması. Çalışma alanlarında paylaşılan 'launch.json'a alternatif olarak kullanılmalıdır"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/debug/electron-browser/debugCommands.i18n.json b/i18n/trk/src/vs/workbench/parts/debug/electron-browser/debugCommands.i18n.json
deleted file mode 100644
index eede4cce4e5..00000000000
--- a/i18n/trk/src/vs/workbench/parts/debug/electron-browser/debugCommands.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noFolderDebugConfig": "Gelişmiş hata ayıklama yapılandırması yapmak için lütfen ilk olarak bir klasör açın."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json b/i18n/trk/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json
deleted file mode 100644
index 60d165f6930..00000000000
--- a/i18n/trk/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"debugNoType": "Hata ayıklayıcının 'type' ögesi atlanamaz ve 'dize' türünde olmalıdır.",
-	"selectDebug": "Ortam Seçin",
-	"DebugConfig.failed": " '.vscode' klasörü içinde 'launch.json' dosyası oluşturulamıyor ({0}).",
-	"workspace": "çalışma alanı",
-	"user settings": "kullanıcı ayarları"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json b/i18n/trk/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
deleted file mode 100644
index 37a431b186d..00000000000
--- a/i18n/trk/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"logPoint": "Günlük Noktası",
-	"breakpoint": "Kesme Noktası",
-	"removeBreakpoint": "Kaldır: {0}",
-	"editBreakpoint": "Düzenle: {0}...",
-	"disableBreakpoint": "Devre Dışı Bırak: {0}",
-	"enableBreakpoint": "Etkinleştir: {0}",
-	"removeBreakpoints": "Kesme Noktalarını Kaldır",
-	"removeInlineBreakpointOnColumn": "{0}. Sütundaki Satır İçi Kesme Noktasını Kaldır",
-	"removeLineBreakpoint": "Satır Kesme Noktasını Kaldır",
-	"editBreakpoints": "Kesme Noktalarını Düzenle",
-	"editInlineBreakpointOnColumn": "{0}. Sütundaki Satır İçi Kesme Noktasını Düzenle",
-	"editLineBrekapoint": "Satır Kesme Noktasını Düzenle",
-	"enableDisableBreakpoints": "Kesme Noktalarını Etkinleştir/Devre Dışı Bırak",
-	"disableInlineColumnBreakpoint": "{0}. Sütundaki Satır İçi Kesme Noktasını Devre Dışı Bırak",
-	"disableBreakpointOnLine": "Satır Kesme Noktasını Devre Dışı Bırak",
-	"enableBreakpointOnLine": "Satır Kesme Noktasını Etkinleştir",
-	"addBreakpoint": "Kesme Noktası Ekle",
-	"addConditionalBreakpoint": "Koşullu Kesme Noktası Ekle...",
-	"addLogPoint": "Günlük Noktası Ekle...",
-	"breakpointHasCondition": "Bu {0}, kaldırıldığında kaybolacak bir {1}'e sahip. Bunun yerine {0}'i kaldırmayı düşünün.",
-	"message": "mesaj",
-	"condition": "koşul",
-	"removeLogPoint": "Kaldır: {0}",
-	"disableLogPoint": "Devre Dışı Bırak: {0}",
-	"cancel": "İptal",
-	"addConfiguration": "Yapılandırma Ekle..."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/debug/electron-browser/debugHover.i18n.json b/i18n/trk/src/vs/workbench/parts/debug/electron-browser/debugHover.i18n.json
deleted file mode 100644
index 5dcbf579070..00000000000
--- a/i18n/trk/src/vs/workbench/parts/debug/electron-browser/debugHover.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"treeAriaLabel": "Hata Ayıklama Bağlantı Vurgusu"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json b/i18n/trk/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
deleted file mode 100644
index 3b4248d45e7..00000000000
--- a/i18n/trk/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"snapshotObj": "Bu nesne için sadece ilkel türler gösterilir.",
-	"debuggingPaused": "Hata ayıklama duraklatıldı, sebep {0}, {1} {2}",
-	"debuggingStarted": "Hata ayıklama başlatıldı.",
-	"debuggingStopped": "Hata ayıklama durduruldu.",
-	"breakpointAdded": "Kesme noktası eklendi, {0}. satır, {1} dosyası",
-	"breakpointRemoved": "Kesme noktası kaldırıldı, {0}. satır, {1} dosyası",
-	"compoundMustHaveConfigurations": "Bileşik, birden çok yapılandırmayı başlatmak için \"configurations\" özniteliği bulundurmalıdır.",
-	"noConfigurationNameInWorkspace": "Çalışma alanında '{0}' başlatma yapılandırması bulunamadı.",
-	"multipleConfigurationNamesInWorkspace": "Çalışma alanında birden fazla '{0}' başlatma yapılandırması var. Yapılandırmayı belirtmek için klasör adını kullanın.",
-	"noFolderWithName": "'{2}' bileşiğindeki '{1}' yapılandırması için '{0}' adlı klasör bulunamadı.",
-	"configMissing": "'launch.json' dosyasında '{0}' yapılandırması eksik.",
-	"launchJsonDoesNotExist": "'launch.json' mevcut değil.",
-	"debugRequestNotSupported": "Seçilen hata ayıklama yapılandırılmasındaki '{0}' özniteliği desteklenmeyen '{1}' değeri içeriyor.",
-	"debugRequesMissing": "'{0}' özniteliği seçilen hata ayıklama yapılandırılmasında eksik.",
-	"debugTypeNotSupported": "Yapılandırılan hata ayıklama türü '{0}', desteklenmiyor.",
-	"debugTypeMissing": "Seçilen başlatma yapılandırması için 'type' özelliği eksik.",
-	"debugAnyway": "Yine de Hata Ayıkla",
-	"preLaunchTaskErrors": "'{0}' ön başlatma görevi sırasında derleme hataları algılandı.",
-	"preLaunchTaskError": "'{0}' ön başlatma görevi sırasında derleme hatası algılandı.",
-	"preLaunchTaskExitCode": "'{0}' ön başlatma görevi {1} çıkış koduyla sonlandı.",
-	"showErrors": "Hataları Göster",
-	"noFolderWorkspaceDebugError": "Aktif dosyada hata ayıklama yapılamıyor. Lütfen, dosyanın diskte kayıtlı olduğundan ve bu dosya türü için hata ayıklama eklentinizin olduğundan emin olun.",
-	"cancel": "İptal",
-	"DebugTaskNotFound": "'{0}' görevi bulunamadı.",
-	"taskNotTracked": "'{0}' görevi izlenemez."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/debug/electron-browser/debugViewer.i18n.json b/i18n/trk/src/vs/workbench/parts/debug/electron-browser/debugViewer.i18n.json
deleted file mode 100644
index 823377981dd..00000000000
--- a/i18n/trk/src/vs/workbench/parts/debug/electron-browser/debugViewer.i18n.json
+++ /dev/null
@@ -1,28 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"process": "İşlem",
-	"paused": "Duraklatıldı",
-	"running": "Çalışıyor",
-	"thread": "İş Parçacığı",
-	"pausedOn": "{0} Üzerinde Duraklatıldı",
-	"loadMoreStackFrames": "Daha Fazla Yığın Çerçevesi Yükleyin",
-	"threadAriaLabel": "{0} iş parçacığı, çağrı yığını, hata ayıklama",
-	"stackFrameAriaLabel": "Yığın Çerçevesi {0} satır {1} {2}, çağrı yığını, hata ayıklama",
-	"variableValueAriaLabel": "Yeni değişken adını girin",
-	"variableScopeAriaLabel": "{0} kapsamı, değişkenler, hata ayıklama",
-	"variableAriaLabel": "{0} değeri {1}, değişkenler, hata ayıklama",
-	"watchExpressionPlaceholder": "İzlenecek ifade",
-	"watchExpressionInputAriaLabel": "İzleme ifadesi girin",
-	"watchExpressionAriaLabel": "{0} değeri {1}, izleme, hata ayıklama",
-	"watchVariableAriaLabel": "{0} değeri {1}, izleme, hata ayıklama",
-	"functionBreakpointPlaceholder": "Mola verilecek fonksiyon",
-	"functionBreakPointInputAriaLabel": "Fonksiyon kesme noktasını girin",
-	"functionBreakpointsNotSupported": "Fonksiyon kesme noktaları bu hata ayıklama türü tarafından desteklenmiyor",
-	"breakpointAriaLabel": "Kesme noktası satır {0} {1}, kesme noktaları, hata ayıklama",
-	"functionBreakpointAriaLabel": "Fonksiyon kesme noktası {0}, kesme noktaları, hata ayıklama",
-	"exceptionBreakpointAriaLabel": "İstisna kesme noktası {0}, kesme noktaları, hata ayıklama"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/debug/electron-browser/debugViews.i18n.json b/i18n/trk/src/vs/workbench/parts/debug/electron-browser/debugViews.i18n.json
deleted file mode 100644
index 8a92525c7f5..00000000000
--- a/i18n/trk/src/vs/workbench/parts/debug/electron-browser/debugViews.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"variablesSection": "Değişkenler Bölümü",
-	"variablesAriaTreeLabel": "Hata Ayıklama Değişkenleri",
-	"expressionsSection": "İfadeler Bölümü",
-	"watchAriaTreeLabel": "Hata Ayıklama İzleme İfadeleri",
-	"callstackSection": "Çağrı Yığını Bölümü",
-	"debugStopped": "{0} Üzerinde Duraklatıldı",
-	"callStackAriaLabel": "Hata Ayıklama Çağrı Yığını",
-	"breakpointsSection": "Kesme Noktaları Bölümü",
-	"breakpointsAriaTreeLabel": "Hata Ayıklama Kesme Noktaları"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/debug/electron-browser/electronDebugActions.i18n.json b/i18n/trk/src/vs/workbench/parts/debug/electron-browser/electronDebugActions.i18n.json
deleted file mode 100644
index 3e237227946..00000000000
--- a/i18n/trk/src/vs/workbench/parts/debug/electron-browser/electronDebugActions.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"copyValue": "Değeri Kopyala",
-	"copyAsExpression": "İfade Olarak Kopyala",
-	"copy": "Kopyala",
-	"copyAll": "Tümünü Kopyala",
-	"copyStackTrace": "Çağrı Yığınını Kopyala"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/debug/electron-browser/rawDebugSession.i18n.json b/i18n/trk/src/vs/workbench/parts/debug/electron-browser/rawDebugSession.i18n.json
deleted file mode 100644
index 9ae9577ae78..00000000000
--- a/i18n/trk/src/vs/workbench/parts/debug/electron-browser/rawDebugSession.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"moreInfo": "Daha Fazla Bilgi",
-	"debugAdapterCrash": "Hata ayıklama bağdaştırıcısı beklenmeyen biçimde sonlandırıldı"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/debug/electron-browser/repl.i18n.json b/i18n/trk/src/vs/workbench/parts/debug/electron-browser/repl.i18n.json
deleted file mode 100644
index 729552c7bf4..00000000000
--- a/i18n/trk/src/vs/workbench/parts/debug/electron-browser/repl.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"replAriaLabel": "Oku Değerlendir Yaz Döngüsü Paneli",
-	"actions.repl.historyPrevious": "Önceki Geçmiş",
-	"actions.repl.historyNext": "Sonraki Geçmiş",
-	"actions.repl.acceptInput": "REPL Girdiyi Kabul Et",
-	"actions.repl.copyAll": "Hata Ayıklama: Konsol Tümünü Kopyala"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/debug/electron-browser/replViewer.i18n.json b/i18n/trk/src/vs/workbench/parts/debug/electron-browser/replViewer.i18n.json
deleted file mode 100644
index 3ee3ca5f9d3..00000000000
--- a/i18n/trk/src/vs/workbench/parts/debug/electron-browser/replViewer.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"stateCapture": "Nesne durumu ilk değerlendirmeden alındı",
-	"replVariableAriaLabel": "{0} değişkeni, {1} değerine sahip, oku değerlendir yaz döngüsü, hata ayıklama",
-	"replExpressionAriaLabel": "{0} ifadesi, {1} değerine sahip, oku değerlendir yaz döngüsü, hata ayıklama",
-	"replValueOutputAriaLabel": "{0}, oku değerlendir yaz döngüsü, hata ayıklama",
-	"replRawObjectAriaLabel": "{0} repl değişkeni, {1} değerine sahip, oku değerlendir yaz döngüsü, hata ayıklama"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/debug/electron-browser/statusbarColorProvider.i18n.json b/i18n/trk/src/vs/workbench/parts/debug/electron-browser/statusbarColorProvider.i18n.json
deleted file mode 100644
index 59bb3e919c8..00000000000
--- a/i18n/trk/src/vs/workbench/parts/debug/electron-browser/statusbarColorProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"statusBarDebuggingBackground": "Bir programda hata ayıklama yapılırken durum çubuğu arka plan rengi. Durum çubuğu, pencerenin alt kısmında gösterilir.",
-	"statusBarDebuggingForeground": "Bir programda hata ayıklama yapılırken durum çubuğu ön plan rengi. Durum çubuğu, pencerenin alt kısmında gösterilir.",
-	"statusBarDebuggingBorder": "Bir programda hata ayıklama yapılırken, durum çubuğunu kenar çubuğundan ve düzenleyiciden ayıran kenarlık rengi. Durum çubuğu, pencerenin alt kısmında gösterilir."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json b/i18n/trk/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json
deleted file mode 100644
index 3563efca10a..00000000000
--- a/i18n/trk/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"debug.terminal.title": "hata ayıklanan"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/debug/electron-browser/variablesView.i18n.json b/i18n/trk/src/vs/workbench/parts/debug/electron-browser/variablesView.i18n.json
deleted file mode 100644
index 7b777405dee..00000000000
--- a/i18n/trk/src/vs/workbench/parts/debug/electron-browser/variablesView.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"variablesSection": "Değişkenler Bölümü",
-	"variablesAriaTreeLabel": "Hata Ayıklama Değişkenleri",
-	"variableValueAriaLabel": "Yeni değişken adını girin",
-	"variableScopeAriaLabel": "{0} kapsamı, değişkenler, hata ayıklama",
-	"variableAriaLabel": "{0} değeri {1}, değişkenler, hata ayıklama"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/debug/electron-browser/watchExpressionsView.i18n.json b/i18n/trk/src/vs/workbench/parts/debug/electron-browser/watchExpressionsView.i18n.json
deleted file mode 100644
index e1ef3c03e56..00000000000
--- a/i18n/trk/src/vs/workbench/parts/debug/electron-browser/watchExpressionsView.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"expressionsSection": "İfadeler Bölümü",
-	"watchAriaTreeLabel": "Hata Ayıklama İzleme İfadeleri",
-	"watchExpressionPlaceholder": "İzlenecek ifade",
-	"watchExpressionInputAriaLabel": "İzleme ifadesi girin",
-	"watchExpressionAriaLabel": "{0} değeri {1}, izleme, hata ayıklama",
-	"watchVariableAriaLabel": "{0} değeri {1}, izleme, hata ayıklama"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json b/i18n/trk/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
deleted file mode 100644
index a61ef28f2c1..00000000000
--- a/i18n/trk/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"debugAdapterBinNotFound": "Hata ayıklama bağdaştırıcısı yürütülebilir dosyası '{0}', mevcut değil.",
-	"debugAdapterCannotDetermineExecutable": "Hata ayıklama bağdaştırıcısı yürütülebilir dosyası '{0}' belirlenemedi.",
-	"unableToLaunchDebugAdapter": "'{0}' tarafından hata ayıklama bağdaştırıcısı başlatılamadı.",
-	"unableToLaunchDebugAdapterNoArgs": "Hata ayıklama bağdaştırıcısı başlatılamıyor."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/debug/node/debugger.i18n.json b/i18n/trk/src/vs/workbench/parts/debug/node/debugger.i18n.json
deleted file mode 100644
index 46a2a813e18..00000000000
--- a/i18n/trk/src/vs/workbench/parts/debug/node/debugger.i18n.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"launch.config.comment1": "Olası öznitelikler hakkında bilgi edinmek için IntelliSense kullanın.",
-	"launch.config.comment2": "Mevcut özniteliklerin açıklamalarını görmek için fare ile üzerine gelin.",
-	"launch.config.comment3": "Daha fazla bilgi için ziyaret edin: {0}",
-	"debugType": "Yapılandırma türü.",
-	"debugTypeNotRecognised": "Hata ayıklama türü tanınmıyor. Karşılık gelen hata ayıklama uzantısı yüklemiş olduğunuzdan ve etkinleştirildiğinden emin olun.",
-	"node2NotSupported": "\"node2\" artık desteklenmiyor, bunun yerine \"node\" kullanın ve \"protocol\" özniteliğini \"inspector\" olarak ayarlayın.",
-	"debugName": "Yapılandırmanın adı; başlatma yapılandırması açılır kutu menüsünde görünür.",
-	"debugRequest": "Yapılandırmanın istek türü. \"launch\" veya \"attach\" olabilir.",
-	"debugServer": "Sadece eklenti geliştirme hata ayıklaması için: eğer port belirtildiyse; Vs Code, bir hata ayıklama bağdaştırıcısına sunucu modunda bağlanmayı dener",
-	"debugPrelaunchTask": "Hata ayıklama oturumu başlamadan önce çalıştırılacak görev.",
-	"debugPostDebugTask": "Hata ayıklama oturumu bittikten sonra çalıştırılacak görev.",
-	"debugWindowsConfiguration": "Windows'a özel başlangıç yapılandırması öznitelikleri.",
-	"debugOSXConfiguration": "OS X'e özel başlangıç yapılandırması öznitelikleri.",
-	"debugLinuxConfiguration": "Linux'a özel başlangıç yapılandırması öznitelikleri.",
-	"deprecatedVariables": "'env.', 'config.' ve 'command.' kullanım dışıdır, bunların yerine 'env:', 'config:' ve 'command:' kulanın."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/debug/node/terminals.i18n.json b/i18n/trk/src/vs/workbench/parts/debug/node/terminals.i18n.json
deleted file mode 100644
index 4fbca0dfa72..00000000000
--- a/i18n/trk/src/vs/workbench/parts/debug/node/terminals.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"console.title": "VS Code Konsolu",
-	"mac.terminal.script.failed": "'{0}' betiği, {1} çıkış koduyla başarısız oldu",
-	"mac.terminal.type.not.supported": "'{0}' desteklenmiyor",
-	"press.any.key": "Devam etmek için bir tuşa basın ...",
-	"linux.term.failed": "'{0}', {1} çıkış koduyla başarısız oldu"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/emmet/browser/actions/showEmmetCommands.i18n.json b/i18n/trk/src/vs/workbench/parts/emmet/browser/actions/showEmmetCommands.i18n.json
deleted file mode 100644
index 0e2755b10d9..00000000000
--- a/i18n/trk/src/vs/workbench/parts/emmet/browser/actions/showEmmetCommands.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"showEmmetCommands": "Emmet Komutlarını Göster"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/emmet/electron-browser/actions/balance.i18n.json b/i18n/trk/src/vs/workbench/parts/emmet/electron-browser/actions/balance.i18n.json
deleted file mode 100644
index 7f2cf686977..00000000000
--- a/i18n/trk/src/vs/workbench/parts/emmet/electron-browser/actions/balance.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"balanceInward": "Emmet: Dengele (içe)",
-	"balanceOutward": "Emmet: Dengele (dışa)"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/emmet/electron-browser/actions/editPoints.i18n.json b/i18n/trk/src/vs/workbench/parts/emmet/electron-browser/actions/editPoints.i18n.json
deleted file mode 100644
index 7832e967688..00000000000
--- a/i18n/trk/src/vs/workbench/parts/emmet/electron-browser/actions/editPoints.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"previousEditPoint": "Emmet: Önceki Düzenleme Noktasına Git",
-	"nextEditPoint": "Emmet: Sonraki Düzenleme Noktasına Git"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/emmet/electron-browser/actions/evaluateMath.i18n.json b/i18n/trk/src/vs/workbench/parts/emmet/electron-browser/actions/evaluateMath.i18n.json
deleted file mode 100644
index 77713e86bc0..00000000000
--- a/i18n/trk/src/vs/workbench/parts/emmet/electron-browser/actions/evaluateMath.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"evaluateMathExpression": "Emmet: Matematik İfadesini Değerlendir"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/emmet/electron-browser/actions/expandAbbreviation.i18n.json b/i18n/trk/src/vs/workbench/parts/emmet/electron-browser/actions/expandAbbreviation.i18n.json
deleted file mode 100644
index ed298bb7079..00000000000
--- a/i18n/trk/src/vs/workbench/parts/emmet/electron-browser/actions/expandAbbreviation.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"expandAbbreviationAction": "Emmet: Kısaltmayı Genişlet"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/emmet/electron-browser/actions/incrementDecrement.i18n.json b/i18n/trk/src/vs/workbench/parts/emmet/electron-browser/actions/incrementDecrement.i18n.json
deleted file mode 100644
index 6692ba5badb..00000000000
--- a/i18n/trk/src/vs/workbench/parts/emmet/electron-browser/actions/incrementDecrement.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"incrementNumberByOneTenth": "Emmet: 0.1 Arttır",
-	"incrementNumberByOne": "Emmet: 1 Arttır",
-	"incrementNumberByTen": "Emmet: 10 Arttır",
-	"decrementNumberByOneTenth": "Emmet: 0.1 Azalt",
-	"decrementNumberByOne": "Emmet: 1 Azalt",
-	"decrementNumberByTen": "Emmet: 10 Azalt"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/emmet/electron-browser/actions/matchingPair.i18n.json b/i18n/trk/src/vs/workbench/parts/emmet/electron-browser/actions/matchingPair.i18n.json
deleted file mode 100644
index 0bae8eb938d..00000000000
--- a/i18n/trk/src/vs/workbench/parts/emmet/electron-browser/actions/matchingPair.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"matchingPair": "Emmet: Eşleşen Çifte Git"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/emmet/electron-browser/actions/mergeLines.i18n.json b/i18n/trk/src/vs/workbench/parts/emmet/electron-browser/actions/mergeLines.i18n.json
deleted file mode 100644
index a083c13f1e5..00000000000
--- a/i18n/trk/src/vs/workbench/parts/emmet/electron-browser/actions/mergeLines.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"mergeLines": "Emmet: Satırları Birleştir"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/emmet/electron-browser/actions/reflectCssValue.i18n.json b/i18n/trk/src/vs/workbench/parts/emmet/electron-browser/actions/reflectCssValue.i18n.json
deleted file mode 100644
index 8cceaedbe4b..00000000000
--- a/i18n/trk/src/vs/workbench/parts/emmet/electron-browser/actions/reflectCssValue.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"reflectCSSValue": "Emmet: CSS Değerini Yansıt"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/emmet/electron-browser/actions/removeTag.i18n.json b/i18n/trk/src/vs/workbench/parts/emmet/electron-browser/actions/removeTag.i18n.json
deleted file mode 100644
index 13f4115a719..00000000000
--- a/i18n/trk/src/vs/workbench/parts/emmet/electron-browser/actions/removeTag.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"removeTag": "Emmet: Etiketi Sil"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/emmet/electron-browser/actions/selectItem.i18n.json b/i18n/trk/src/vs/workbench/parts/emmet/electron-browser/actions/selectItem.i18n.json
deleted file mode 100644
index 2507b6d025b..00000000000
--- a/i18n/trk/src/vs/workbench/parts/emmet/electron-browser/actions/selectItem.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"selectPreviousItem": "Emmet: Önceki Ögeyi Seç",
-	"selectNextItem": "Emmet: Sonraki Ögeyi Seç"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/emmet/electron-browser/actions/splitJoinTag.i18n.json b/i18n/trk/src/vs/workbench/parts/emmet/electron-browser/actions/splitJoinTag.i18n.json
deleted file mode 100644
index c64d4ead154..00000000000
--- a/i18n/trk/src/vs/workbench/parts/emmet/electron-browser/actions/splitJoinTag.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"splitJoinTag": "Emmet: Etiketi Böl/Birleştir"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/emmet/electron-browser/actions/toggleComment.i18n.json b/i18n/trk/src/vs/workbench/parts/emmet/electron-browser/actions/toggleComment.i18n.json
deleted file mode 100644
index 4f88ade10dc..00000000000
--- a/i18n/trk/src/vs/workbench/parts/emmet/electron-browser/actions/toggleComment.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"toggleComment": "Emmet: Yorumu Aç/Kapat"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/emmet/electron-browser/actions/updateImageSize.i18n.json b/i18n/trk/src/vs/workbench/parts/emmet/electron-browser/actions/updateImageSize.i18n.json
deleted file mode 100644
index 862f8163fb4..00000000000
--- a/i18n/trk/src/vs/workbench/parts/emmet/electron-browser/actions/updateImageSize.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"updateImageSize": "Emmet: Görüntü Boyutunu Güncelle"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/emmet/electron-browser/actions/updateTag.i18n.json b/i18n/trk/src/vs/workbench/parts/emmet/electron-browser/actions/updateTag.i18n.json
deleted file mode 100644
index 48f15952492..00000000000
--- a/i18n/trk/src/vs/workbench/parts/emmet/electron-browser/actions/updateTag.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"updateTag": "Emmet: Etiketi Güncelle",
-	"enterTag": "Etiketi Gir",
-	"tag": "Etiket"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/emmet/electron-browser/actions/wrapWithAbbreviation.i18n.json b/i18n/trk/src/vs/workbench/parts/emmet/electron-browser/actions/wrapWithAbbreviation.i18n.json
deleted file mode 100644
index 678b349f571..00000000000
--- a/i18n/trk/src/vs/workbench/parts/emmet/electron-browser/actions/wrapWithAbbreviation.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"wrapWithAbbreviationAction": "Emmet: Kısaltma ile Sarmala",
-	"enterAbbreviation": "Kısaltmayı Gir",
-	"abbreviation": "Kısaltma"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/emmet/electron-browser/emmet.contribution.i18n.json b/i18n/trk/src/vs/workbench/parts/emmet/electron-browser/emmet.contribution.i18n.json
deleted file mode 100644
index 55701eb8ca7..00000000000
--- a/i18n/trk/src/vs/workbench/parts/emmet/electron-browser/emmet.contribution.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"emmetConfigurationTitle": "Emmet",
-	"triggerExpansionOnTab": "Etkinleştirildiğinde, emmet kısaltmaları TAB tuşuna basıldığında genişletilir. emmet.useNewemmet, 'true' olarak ayarlandığında geçerli değildir.",
-	"emmetPreferences": "Emmet'in bazı eylemleri ve çözümleyicilerinin davranışını değiştirmek için kullanılacak tercihler. emmet.useNewemmet, 'true' olarak ayarlandığında geçerli değildir.",
-	"emmetSyntaxProfiles": "Belirtilen sentaks için profil tanımlayın veya kendi profilinizi belirli kurallarla kullanın.",
-	"emmetExclude": "Emmet kısaltmalarının genişletilmeyeceği bir diller dizisi.",
-	"emmetExtensionsPath": "Emmet profileri, parçacıkları ve tercihlerini içeren bir klasör yolu. emmet.useNewEmmet, 'true' olarak ayarlandığında, yalnızca profiller eklentiler yolundan kabul edilir.",
-	"useNewEmmet": "Tüm emmet özellikleri için yeni emmet modüllerini deneyin(sonunda eski tekil emmet kütüphanesinin yerini alacaktır)."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json b/i18n/trk/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
deleted file mode 100644
index 54479d956c0..00000000000
--- a/i18n/trk/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"terminalConfigurationTitle": "Harici Terminal",
-	"explorer.openInTerminalKind": "Başlatılacak terminal türünü özelleştirir.",
-	"terminal.external.windowsExec": "Windows'da hangi terminalin çalışacağını ayarlar.",
-	"terminal.external.osxExec": "OS X'de hangi terminalin çalışacağını ayarlar.",
-	"terminal.external.linuxExec": "Linux'da hangi terminalin çalışacağını ayarlar.",
-	"globalConsoleActionWin": "Yeni Komut İstemi Aç",
-	"globalConsoleActionMacLinux": "Yeni Terminal Aç",
-	"scopedConsoleActionWin": "Komut İsteminde Aç",
-	"scopedConsoleActionMacLinux": "Terminalde Aç"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/execution/electron-browser/terminal.contribution.i18n.json b/i18n/trk/src/vs/workbench/parts/execution/electron-browser/terminal.contribution.i18n.json
deleted file mode 100644
index 72d4755b5b4..00000000000
--- a/i18n/trk/src/vs/workbench/parts/execution/electron-browser/terminal.contribution.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"terminalConfigurationTitle": "Harici Terminal",
-	"terminal.external.windowsExec": "Windows'da hangi terminalin çalışacağını ayarlar.",
-	"terminal.external.osxExec": "OS X'de hangi terminalin çalışacağını ayarlar.",
-	"terminal.external.linuxExec": "Linux'da hangi terminalin çalışacağını ayarlar.",
-	"globalConsoleActionWin": "Yeni Komut İstemi Aç",
-	"globalConsoleActionMacLinux": "Yeni Terminal Aç",
-	"scopedConsoleActionWin": "Komut İsteminde Aç",
-	"scopedConsoleActionMacLinux": "Terminalde Aç"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/execution/electron-browser/terminalService.i18n.json b/i18n/trk/src/vs/workbench/parts/execution/electron-browser/terminalService.i18n.json
deleted file mode 100644
index 4fbca0dfa72..00000000000
--- a/i18n/trk/src/vs/workbench/parts/execution/electron-browser/terminalService.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"console.title": "VS Code Konsolu",
-	"mac.terminal.script.failed": "'{0}' betiği, {1} çıkış koduyla başarısız oldu",
-	"mac.terminal.type.not.supported": "'{0}' desteklenmiyor",
-	"press.any.key": "Devam etmek için bir tuşa basın ...",
-	"linux.term.failed": "'{0}', {1} çıkış koduyla başarısız oldu"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/explorers/browser/treeExplorer.contribution.i18n.json b/i18n/trk/src/vs/workbench/parts/explorers/browser/treeExplorer.contribution.i18n.json
deleted file mode 100644
index 1341aa7a5fa..00000000000
--- a/i18n/trk/src/vs/workbench/parts/explorers/browser/treeExplorer.contribution.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"vscode.extension.contributes.view": "Özel görünüme ekleme yapar",
-	"vscode.extension.contributes.view.id": "vscode.workspace.createTreeView aracılığıyla oluşturulan görünümü tanımlamak için kullanılan benzersiz kimlik",
-	"vscode.extension.contributes.view.label": "Görünümde gösterilecek insanlar tarafından okunabilir dize",
-	"vscode.extension.contributes.view.icon": "Görünüm simgesinin yolu",
-	"vscode.extension.contributes.views": "Özel görünümlere ekleme yapar",
-	"showViewlet": "{0}'i Göster",
-	"view": "Görüntüle"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/explorers/browser/treeExplorerActions.i18n.json b/i18n/trk/src/vs/workbench/parts/explorers/browser/treeExplorerActions.i18n.json
deleted file mode 100644
index f9ce5d1c2d7..00000000000
--- a/i18n/trk/src/vs/workbench/parts/explorers/browser/treeExplorerActions.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"refresh": "Yenile"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/explorers/browser/treeExplorerService.i18n.json b/i18n/trk/src/vs/workbench/parts/explorers/browser/treeExplorerService.i18n.json
deleted file mode 100644
index 25fbff908a0..00000000000
--- a/i18n/trk/src/vs/workbench/parts/explorers/browser/treeExplorerService.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"treeExplorer.noMatchingProviderId": "{providerId} kimliği ile kayıtlı \"TreeExplorerNodeProvider\" yok."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/explorers/browser/views/treeExplorerView.i18n.json b/i18n/trk/src/vs/workbench/parts/explorers/browser/views/treeExplorerView.i18n.json
deleted file mode 100644
index bc360a62ef3..00000000000
--- a/i18n/trk/src/vs/workbench/parts/explorers/browser/views/treeExplorerView.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"treeExplorerViewlet.tree": "Ağaç Gezgini Bölümü"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/extensions/browser/dependenciesViewer.i18n.json b/i18n/trk/src/vs/workbench/parts/extensions/browser/dependenciesViewer.i18n.json
deleted file mode 100644
index 685a6dd6cfa..00000000000
--- a/i18n/trk/src/vs/workbench/parts/extensions/browser/dependenciesViewer.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"error": "Hata",
-	"Unknown Dependency": "Bilinmeyen Bağımlılık:"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json b/i18n/trk/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json
deleted file mode 100644
index e72bf637256..00000000000
--- a/i18n/trk/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"name": "Eklenti adı",
-	"extension id": "Eklenti tanımlayıcısı",
-	"preview": "Önizleme",
-	"builtin": "Yerleşik",
-	"publisher": "Yayıncı adı",
-	"install count": "Yüklenme sayısı",
-	"rating": "Derecelendirme",
-	"repository": "Depo",
-	"license": "Lisans",
-	"details": "Detaylar",
-	"contributions": "Eklemeler",
-	"changelog": "Değişim Günlüğü",
-	"dependencies": "Bağımlılıklar",
-	"noReadme": "README dosyası yok.",
-	"noChangelog": "Değişim günlüğü yok.",
-	"noContributions": "Hiçbir Ekleme Yapmıyor",
-	"noDependencies": "Bağımlılık Yok",
-	"settings": "Ayarlar ({0})",
-	"setting name": "Adı",
-	"description": "Açıklama",
-	"default": "Varsayılan",
-	"debuggers": "Hata Ayıklayıcılar ({0})",
-	"debugger name": "Adı",
-	"debugger type": "Tür",
-	"views": "Görünümler ({0})",
-	"view id": "ID",
-	"view name": "Adı",
-	"view location": "Yeri",
-	"localizations": "Çeviriler ({0})",
-	"localizations language id": "Dil Kimliği",
-	"localizations language name": "Dil Adı",
-	"localizations localized language name": "Dil Adı (Çevrilen Dilde)",
-	"colorThemes": "Renk Temaları ({0})",
-	"iconThemes": "Simge Temaları ({0})",
-	"colors": "Renkler ({0})",
-	"colorId": "Kimlik",
-	"defaultDark": "Koyu Varsayılan",
-	"defaultLight": "Açık Varsayılan",
-	"defaultHC": "Yüksek Karşıtlık Varsayılan",
-	"JSON Validation": "JSON Doğrulama ({0})",
-	"fileMatch": "Dosya Eşleşmesi",
-	"schema": "Şema",
-	"commands": "Komutlar ({0})",
-	"command name": "Adı",
-	"keyboard shortcuts": "Klavye Kısayolları",
-	"menuContexts": "Menü Bağlamları",
-	"languages": "Diller ({0})",
-	"language id": "ID",
-	"language name": "Adı",
-	"file extensions": "Dosya Uzantıları",
-	"grammar": "Gramer",
-	"snippets": "Parçacıklar"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json b/i18n/trk/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
deleted file mode 100644
index 69722eca3ee..00000000000
--- a/i18n/trk/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
+++ /dev/null
@@ -1,81 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"download": "Manuel Olarak İndir",
-	"install vsix": "İndirildiğinde lütfen '{0}' ögesinin indirilen VSIX dosyasını manuel olarak yükleyin.",
-	"installAction": "Yükle",
-	"installing": "Yükleniyor",
-	"failedToInstall": "'{0}' yüklenemedi.",
-	"uninstallAction": "Kaldır",
-	"Uninstalling": "Kaldırılıyor",
-	"updateAction": "Güncelle",
-	"updateTo": "{0} sürümüne güncelle",
-	"failedToUpdate": "'{0}' güncellenemedi.",
-	"ManageExtensionAction.uninstallingTooltip": "Kaldırılıyor",
-	"enableForWorkspaceAction": "Etkinleştir (Çalışma Alanı)",
-	"enableGloballyAction": "Etkinleştir",
-	"enableAction": "Etkinleştir",
-	"disableForWorkspaceAction": "Devre Dışı Bırak (Çalışma Alanı)",
-	"disableGloballyAction": "Devre Dışı Bırak",
-	"disableAction": "Devre Dışı Bırak",
-	"checkForUpdates": "Güncelleştirmeleri Denetle",
-	"enableAutoUpdate": "Eklentileri Otomatik Olarak Güncelleştirmeyi Etkinleştir",
-	"disableAutoUpdate": "Eklentileri Otomatik Olarak Güncelleştirmeyi Devre Dışı Bırak",
-	"updateAll": "Tüm Eklentileri Güncelle",
-	"reloadAction": "Pencereyi Yeniden Yükle",
-	"postUpdateTooltip": "Güncellemek için yeniden yükleyin",
-	"postUpdateMessage": "Güncellenen '{0}' eklentisini etkinleştirmek için bu pencere yeniden yüklensin mi?",
-	"postEnableTooltip": "Etkinleştirmek için yeniden yükleyin",
-	"postEnableMessage": "'{0}' eklentisini etkinleştirmek için bu pencere yeniden yüklensin mi?",
-	"postDisableTooltip": "Devre dışı bırakmak için yeniden yükleyin",
-	"postDisableMessage": "'{0}' eklentisini devre dışı bırakmak için bu pencere yeniden yüklensin mi?",
-	"postUninstallTooltip": "Devre dışı bırakmak için yeniden yükleyin",
-	"postUninstallMessage": "Kaldırılan '{0}' eklentisini devre dışı bırakmak için bu pencere yeniden yüklensin mi?",
-	"toggleExtensionsViewlet": "Eklentileri Göster",
-	"installExtensions": "Eklenti Yükle",
-	"showEnabledExtensions": "Etkinleştirilmiş Eklentileri Göster",
-	"showInstalledExtensions": "Yüklenen Eklentileri Göster",
-	"showDisabledExtensions": "Devre Dışı Bırakılan Eklentileri Göster",
-	"clearExtensionsInput": "Eklenti Girdisini Temizle",
-	"showBuiltInExtensions": "Yerleşik Eklentileri Göster",
-	"showOutdatedExtensions": "Eski Eklentileri Göster",
-	"showPopularExtensions": "Popüler Eklentileri Göster",
-	"showRecommendedExtensions": "Tavsiye Edilen Eklentileri Göster",
-	"installWorkspaceRecommendedExtensions": "Çalışma Alanının Tavsiye Ettiği Tüm Eklentileri Yükle",
-	"allExtensionsInstalled": "Bu çalışma alanı için tavsiye edilen tüm eklentiler zaten yüklü",
-	"installRecommendedExtension": "Tavsiye Edilen Eklentiyi Yükle",
-	"extensionInstalled": "Tavsiye edilen eklenti zaten yüklü",
-	"showRecommendedKeymapExtensionsShort": "Tuş Haritaları",
-	"showLanguageExtensionsShort": "Dil Eklentileri",
-	"showAzureExtensionsShort": "Azure Eklentileri",
-	"OpenExtensionsFile.failed": " '.vscode' klasörü içinde 'extensions.json' dosyası oluşturulamıyor ({0}).",
-	"configureWorkspaceRecommendedExtensions": "Tavsiye Edilen Eklentileri Yapılandır (Çalışma Alanı)",
-	"configureWorkspaceFolderRecommendedExtensions": "Tavsiye Edilen Eklentileri Yapılandır (Çalışma Alanı Klasörü)",
-	"malicious tooltip": "Bu eklentinin sorunlu olduğu bildirildi.",
-	"malicious": "Kötü amaçlı",
-	"disabled": "Devre Dışı",
-	"disabled globally": "Devre Dışı",
-	"disabled workspace": "Bu Çalışma Alanı için Devre Dışı Bırakılmış",
-	"disableAll": "Yüklü Tüm Eklentileri Devre Dışı Bırak",
-	"disableAllWorkspace": "Bu Çalışma Alanı için Yüklü Tüm Eklentileri Devre Dışı Bırak",
-	"enableAll": "Tüm Eklentileri Etkinleştir",
-	"enableAllWorkspace": "Bu Çalışma Alanı için Tüm Eklentileri Etkinleştir",
-	"openExtensionsFolder": "Eklentiler Klasörünü Aç",
-	"installVSIX": "VSIX'ten yükle...",
-	"installFromVSIX": "VSIX'den Yükle",
-	"installButton": "&&Yükle",
-	"InstallVSIXAction.success": "Eklenti başarıyla yüklendi. Etkinleştirmek için pencereyi yeniden yükleyin.",
-	"InstallVSIXAction.reloadNow": "Şimdi Yeniden Yükle",
-	"reinstall": "Eklentiyi Yeniden Yükle...",
-	"selectExtension": "Yeniden Yüklenecek Eklentiyi Seçin",
-	"ReinstallAction.success": "Eklenti başarıyla yeniden yüklendi.",
-	"ReinstallAction.reloadNow": "Şimdi Yeniden Yükle",
-	"extensionButtonProminentBackground": "Dikkat çeken eklenti eylemleri için buton arka plan rengi (ör. yükle butonu)",
-	"extensionButtonProminentForeground": "Dikkat çeken eklenti eylemleri için buton ön plan rengi (ör. yükle butonu)",
-	"extensionButtonProminentHoverBackground": "Dikkat çeken eklenti eylemleri için buton bağlantı vurgusu arka plan rengi (ör. yükle butonu)"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/extensions/browser/extensionsList.i18n.json b/i18n/trk/src/vs/workbench/parts/extensions/browser/extensionsList.i18n.json
deleted file mode 100644
index cb67809c37e..00000000000
--- a/i18n/trk/src/vs/workbench/parts/extensions/browser/extensionsList.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"recommended": "Tavsiye Edilen"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/extensions/browser/extensionsQuickOpen.i18n.json b/i18n/trk/src/vs/workbench/parts/extensions/browser/extensionsQuickOpen.i18n.json
deleted file mode 100644
index 6c3275a87ab..00000000000
--- a/i18n/trk/src/vs/workbench/parts/extensions/browser/extensionsQuickOpen.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"manage": "Eklentilerinizi yönetmek için Enter'a basın.",
-	"notfound": "'{0}' eklentisi markette bulunamadı.",
-	"install": "Marketten '{0}' eklentisini yüklemek için Enter'a basın.",
-	"searchFor": "Markette '{0}' için arama yapmak için Enter'a basın.",
-	"noExtensionsToInstall": "Bir eklenti adı girin"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/extensions/browser/extensionsWidgets.i18n.json b/i18n/trk/src/vs/workbench/parts/extensions/browser/extensionsWidgets.i18n.json
deleted file mode 100644
index 7922afa176b..00000000000
--- a/i18n/trk/src/vs/workbench/parts/extensions/browser/extensionsWidgets.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"ratedByUsers": "{0} kullanıcı tarafından derecelendirildi",
-	"ratedBySingleUser": "1 kullanıcı tarafından derecelendirildi"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/extensions/common/extensionsFileTemplate.i18n.json b/i18n/trk/src/vs/workbench/parts/extensions/common/extensionsFileTemplate.i18n.json
deleted file mode 100644
index 8bd4abd4605..00000000000
--- a/i18n/trk/src/vs/workbench/parts/extensions/common/extensionsFileTemplate.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"app.extensions.json.title": "Eklentiler",
-	"app.extensions.json.recommendations": "Eklenti tavsiyelerinin listesi. Bir eklentinin tanımlayıcısı daima '${yayinci}.${ad}' şeklindedir. Örnek: 'vscode.csharp'.",
-	"app.extension.identifier.errorMessage": "'${yayinci}.${ad}' biçimi bekleniyor. Örnek: 'vscode.csharp'."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/extensions/common/extensionsInput.i18n.json b/i18n/trk/src/vs/workbench/parts/extensions/common/extensionsInput.i18n.json
deleted file mode 100644
index 5a79529a26f..00000000000
--- a/i18n/trk/src/vs/workbench/parts/extensions/common/extensionsInput.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"extensionsInputName": "Eklenti: {0}"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json b/i18n/trk/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
deleted file mode 100644
index 5f574d5497b..00000000000
--- a/i18n/trk/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
+++ /dev/null
@@ -1,65 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"name": "Eklenti adı",
-	"extension id": "Eklenti tanımlayıcısı",
-	"preview": "Önizleme",
-	"builtin": "Yerleşik",
-	"publisher": "Yayıncı adı",
-	"install count": "Yüklenme sayısı",
-	"rating": "Derecelendirme",
-	"repository": "Depo",
-	"license": "Lisans",
-	"details": "Detaylar",
-	"contributions": "Eklemeler",
-	"changelog": "Değişim Günlüğü",
-	"dependencies": "Bağımlılıklar",
-	"dependenciestooltip": "Bu eklentinin bağımlı olduğu eklentileri listele",
-	"noReadme": "README dosyası yok.",
-	"noChangelog": "Değişim günlüğü yok.",
-	"noContributions": "Hiçbir Ekleme Yapmıyor",
-	"noDependencies": "Bağımlılık Yok",
-	"settings": "Ayarlar ({0})",
-	"setting name": "Adı",
-	"description": "Açıklama",
-	"default": "Varsayılan",
-	"debuggers": "Hata Ayıklayıcılar ({0})",
-	"debugger name": "Adı",
-	"debugger type": "Tür",
-	"view container id": "ID",
-	"view container title": "Başlık",
-	"view container location": "Yeri",
-	"views": "Görünümler ({0})",
-	"view id": "ID",
-	"view name": "Adı",
-	"view location": "Yeri",
-	"localizations": "Çeviriler ({0})",
-	"localizations language id": "Dil Id'si",
-	"localizations language name": "Dil Adı",
-	"localizations localized language name": "Dil Adı (Yerelleştirilmiş)",
-	"colorThemes": "Renk Temaları ({0})",
-	"iconThemes": "Simge Temaları ({0})",
-	"colors": "Renkler ({0})",
-	"colorId": "Id",
-	"defaultDark": "Koyu Varsayılan",
-	"defaultLight": "Açık Varsayılan",
-	"defaultHC": "Yüksek Karşıtlık Varsayılan",
-	"JSON Validation": "JSON Doğrulama ({0})",
-	"fileMatch": "Dosya Eşleşmesi",
-	"schema": "Şema",
-	"commands": "Komutlar ({0})",
-	"command name": "Adı",
-	"keyboard shortcuts": "Klavye Kısayolları",
-	"menuContexts": "Menü Bağlamları",
-	"languages": "Diller ({0})",
-	"language id": "ID",
-	"language name": "Adı",
-	"file extensions": "Dosya Uzantıları",
-	"grammar": "Gramer",
-	"snippets": "Parçacıklar"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/extensions/electron-browser/extensionProfileService.i18n.json b/i18n/trk/src/vs/workbench/parts/extensions/electron-browser/extensionProfileService.i18n.json
deleted file mode 100644
index 31455f2520d..00000000000
--- a/i18n/trk/src/vs/workbench/parts/extensions/electron-browser/extensionProfileService.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"restart1": "Eklentileri Ayrımla",
-	"restart2": "Eklentileri ayrımlamak için yeniden başlatma gereklidir. '{0}'u yeniden başlatmak istiyor musunuz?",
-	"restart3": "Yeniden Başlat",
-	"cancel": "İptal",
-	"selectAndStartDebug": "Ayrımlamayı durdurmak için tıklayın."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json b/i18n/trk/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
deleted file mode 100644
index c1fd4a38b55..00000000000
--- a/i18n/trk/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"neverShowAgain": "Tekrar Gösterme",
-	"searchMarketplace": "Marketi Ara",
-	"dynamicWorkspaceRecommendation": "Bu eklenti {0} deposundaki kullanıcılar arasında popüler olduğu için ilginizi çekebilir.",
-	"exeBasedRecommendation": "Bu eklenti, sizde {0} kurulu olduğu için tavsiye ediliyor.",
-	"fileBasedRecommendation": "Bu eklenti yakınlarda açtığınız dosyalara dayanarak tavsiye ediliyor.",
-	"workspaceRecommendation": "Bu eklenti geçerli çalışma alanı kullanıcıları tarafından tavsiye ediliyor.",
-	"reallyRecommended2": "'{0}' eklentisi bu dosya türü için tavsiye edilir.",
-	"reallyRecommendedExtensionPack": "'{0}' eklenti paketi bu dosya türü için tavsiye edilir.",
-	"install": "Yükle",
-	"showRecommendations": "Tavsiyeleri Göster",
-	"showLanguageExtensions": "Markette '.{0}' dosyaları için yardımcı olabilecek eklentiler bulunuyor",
-	"workspaceRecommended": "Bu çalışma alanı bazı eklentileri tavsiye ediyor.",
-	"installAll": "Tümünü Yükle",
-	"ignoreExtensionRecommendations": "Tüm eklenti tavsiyelerini yok saymak istiyor musunuz?",
-	"ignoreAll": "Evet, Tümünü Yok Say",
-	"no": "Hayır"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/extensions/electron-browser/extensions.contribution.i18n.json b/i18n/trk/src/vs/workbench/parts/extensions/electron-browser/extensions.contribution.i18n.json
deleted file mode 100644
index 85e9f33569f..00000000000
--- a/i18n/trk/src/vs/workbench/parts/extensions/electron-browser/extensions.contribution.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"extensionsCommands": "Eklentileri Yönet",
-	"galleryExtensionsCommands": "Galeri Eklentileri Yükle",
-	"extension": "Eklenti",
-	"runtimeExtension": "Eklentiler Çalıştırılıyor",
-	"extensions": "Eklentiler",
-	"view": "Görüntüle",
-	"developer": "Geliştirici",
-	"extensionsConfigurationTitle": "Eklentiler",
-	"extensionsAutoUpdate": "Eklentileri otomatik olarak güncelle",
-	"extensionsIgnoreRecommendations": "\"true\" değeri atanırsa, eklenti tavsiyeleri bildirimleri artık gösterilmez.",
-	"extensionsShowRecommendationsOnlyOnDemand": "\"true\" değeri atanırsa, kullanıcı tarafından özel olarak istenmedikçe tavsiyeler alınmaz ve gösterilmez."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.i18n.json b/i18n/trk/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.i18n.json
deleted file mode 100644
index 575fe186a63..00000000000
--- a/i18n/trk/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openExtensionsFolder": "Eklentiler Klasörünü Aç",
-	"installVSIX": "VSIX'ten yükle...",
-	"installFromVSIX": "VSIX'den Yükle",
-	"installButton": "&&Yükle",
-	"InstallVSIXAction.reloadNow": "Şimdi Yeniden Yükle"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/extensions/electron-browser/extensionsUtils.i18n.json b/i18n/trk/src/vs/workbench/parts/extensions/electron-browser/extensionsUtils.i18n.json
deleted file mode 100644
index 30c88b423ce..00000000000
--- a/i18n/trk/src/vs/workbench/parts/extensions/electron-browser/extensionsUtils.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"disableOtherKeymapsConfirmation": "Tuş bağlamlarında çakışmalardan kaçınmak için diğer tuş haritaları ({0}) devre dışı bırakılsın mı?",
-	"yes": "Evet",
-	"no": "Hayır"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json b/i18n/trk/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
deleted file mode 100644
index 059c3d6e6d6..00000000000
--- a/i18n/trk/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"marketPlace": "Market",
-	"installedExtensions": "Yüklü",
-	"searchInstalledExtensions": "Yüklü",
-	"recommendedExtensions": "Tavsiye Edilen",
-	"otherRecommendedExtensions": "Diğer Tavsiyeler",
-	"workspaceRecommendedExtensions": "Çalışma Alanı Tavsiyeleri",
-	"builtInExtensions": "Özellikler",
-	"builtInThemesExtensions": "Temalar",
-	"builtInBasicsExtensions": "Programlama Dilleri",
-	"searchExtensions": "Markette Eklenti Ara",
-	"sort by installs": "Sırala: Yüklenme Sayısına Göre",
-	"sort by rating": "Sırala: Derecelendirmeye Göre",
-	"sort by name": "Sırala: Ada Göre",
-	"suggestProxyError": "Market, 'ECONNREFUSED' döndürdü. Lütfen 'http.proxy' ayarını kontrol edin.",
-	"extensions": "Eklentiler",
-	"outdatedExtensions": "{0} Eski Eklenti",
-	"malicious warning": "'{0}' eklentisini sorunlu olarak bildirildiği için kaldırdık.",
-	"reloadNow": "Şimdi Yeniden Yükle"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/extensions/electron-browser/extensionsViews.i18n.json b/i18n/trk/src/vs/workbench/parts/extensions/electron-browser/extensionsViews.i18n.json
deleted file mode 100644
index 777bc4bd5c0..00000000000
--- a/i18n/trk/src/vs/workbench/parts/extensions/electron-browser/extensionsViews.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"extensions": "Eklentiler",
-	"no extensions found": "Eklenti yok.",
-	"suggestProxyError": "Market, 'ECONNREFUSED' döndürdü. Lütfen 'http.proxy' ayarını kontrol edin."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/extensions/electron-browser/runtimeExtensionsEditor.i18n.json b/i18n/trk/src/vs/workbench/parts/extensions/electron-browser/runtimeExtensionsEditor.i18n.json
deleted file mode 100644
index 63bc2d3216f..00000000000
--- a/i18n/trk/src/vs/workbench/parts/extensions/electron-browser/runtimeExtensionsEditor.i18n.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"starActivation": "Başlangıçta etkinleştirildi",
-	"workspaceContainsGlobActivation": "Çalışma alanınızda bir {0} dosya eşleşmesi mevcut olduğu için etkinleştirildi",
-	"workspaceContainsFileActivation": "Çalışma alanınızda {0} dosyası mevcut olduğu için etkinleştirildi",
-	"languageActivation": "{0} dosyasını açtığınız için etkinleştirildi",
-	"workspaceGenericActivation": "{0} eyleminden dolayı etkinleştirildi",
-	"errors": "{0} yakalanmayan hata",
-	"extensionsInputName": "Eklentiler Çalıştırılıyor",
-	"showRuntimeExtensions": "Çalışan Eklentileri Göster",
-	"reportExtensionIssue": "Sorun Bildir",
-	"extensionHostProfileStart": "Eklenti Sunucusu Ayrımlamayı Başlat",
-	"extensionHostProfileStop": "Eklenti Sunucusu Ayrımlamayı Durdur",
-	"saveExtensionHostProfile": "Eklenti Sunucusu Ayrımlamayı Kaydet"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.i18n.json b/i18n/trk/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.i18n.json
deleted file mode 100644
index 56c41f04369..00000000000
--- a/i18n/trk/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.i18n.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"installingVSIXExtension": "VSIX'den eklenti yükle...",
-	"malicious": "Bu eklentinin sorunlu olduğu bildirildi.",
-	"installingMarketPlaceExtension": "Marketten eklenti yükleniyor...",
-	"uninstallingExtension": "Eklenti kaldırılıyor...",
-	"enableDependeciesConfirmation": "Bir eklentiyi etkinleştirdiğinizde onun bağımlılıkları da etkinleştirilir. Devam etmek istiyor musunuz?",
-	"enable": "Evet",
-	"doNotEnable": "Hayır",
-	"disableDependeciesConfirmation": "Eklentinin bağımlılıklarını da devre dışı bırakmak ister misiniz?",
-	"yes": "Evet",
-	"no": "Hayır",
-	"cancel": "İptal",
-	"singleDependentError": "'{0}' eklentisi devre dışı bırakılamıyor. '{1}' eklentisi buna bağlı.",
-	"twoDependentsError": "'{0}' eklentisi devre dışı bırakılamıyor. '{1}' ve '{2}' eklentileri buna bağlı.",
-	"multipleDependentsError": "'{0}' eklentisi devre dışı bırakılamıyor. '{1}, '{2}' eklentileri ve diğerleri buna bağlı.",
-	"installConfirmation": "'{0}' eklentisini yüklemek ister misiniz?",
-	"install": "Yükle"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json b/i18n/trk/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json
deleted file mode 100644
index 2cb4c52d6df..00000000000
--- a/i18n/trk/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"workbenchConfigurationTitle": "Çalışma Ekranı",
-	"feedbackVisibility": "Çalışma ekranının altındaki durum çubuğunda bulunan Twitter geri bildiriminin (gülen yüz) görünürlüğünü denetler."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/feedback/electron-browser/feedback.i18n.json b/i18n/trk/src/vs/workbench/parts/feedback/electron-browser/feedback.i18n.json
deleted file mode 100644
index bfd7bcf27b2..00000000000
--- a/i18n/trk/src/vs/workbench/parts/feedback/electron-browser/feedback.i18n.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"sendFeedback": "Geri Bildirimi Tweet'le",
-	"label.sendASmile": "Geri bildiriminizi bize Tweet'leyin.",
-	"patchedVersion1": "Kurulumunuz bozuk.",
-	"patchedVersion2": "Eğer bir hata gönderiyorsanız bunu belirtin.",
-	"sentiment": "Deneyiminiz nasıldı?",
-	"smileCaption": "Mutlu",
-	"frownCaption": "Üzgün",
-	"other ways to contact us": "Bize ulaşmanın diğer yolları",
-	"submit a bug": "Bir hata gönder",
-	"request a missing feature": "Eksik bir özellik talebinde bulun",
-	"tell us why?": "Bize nedenini söyleyin:",
-	"commentsHeader": "Açıklamalar",
-	"showFeedback": "Durum Çubuğunda Geri Bildirim Gülen Yüzünü Göster",
-	"tweet": "Tweet'le",
-	"character left": "karakter kaldı",
-	"characters left": "karakter kaldı",
-	"feedbackSending": "Gönderiliyor",
-	"feedbackSent": "Teşekkürler",
-	"feedbackSendingError": "Yeniden dene"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json b/i18n/trk/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json
deleted file mode 100644
index b49d8e0fcad..00000000000
--- a/i18n/trk/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"hide": "Gizle"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/files/browser/editors/binaryFileEditor.i18n.json b/i18n/trk/src/vs/workbench/parts/files/browser/editors/binaryFileEditor.i18n.json
deleted file mode 100644
index 461f3b2d806..00000000000
--- a/i18n/trk/src/vs/workbench/parts/files/browser/editors/binaryFileEditor.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"binaryFileEditor": "İkili Dosya Görüntüleyici"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/files/browser/editors/textFileEditor.i18n.json b/i18n/trk/src/vs/workbench/parts/files/browser/editors/textFileEditor.i18n.json
deleted file mode 100644
index 9c34b1e8cf0..00000000000
--- a/i18n/trk/src/vs/workbench/parts/files/browser/editors/textFileEditor.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"textFileEditor": "Metin Dosyası Düzenleyicisi",
-	"createFile": "Dosya Oluştur",
-	"relaunchWithIncreasedMemoryLimit": "{0} MB ile Yeniden Başlat",
-	"configureMemoryLimit": "Bellek Sınırını Yapılandır",
-	"fileEditorWithInputAriaLabel": "{0}. Metin dosyası düzenleyici.",
-	"fileEditorAriaLabel": "Metin dosyası düzenleyici."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/files/browser/explorerViewlet.i18n.json b/i18n/trk/src/vs/workbench/parts/files/browser/explorerViewlet.i18n.json
deleted file mode 100644
index 090a3012753..00000000000
--- a/i18n/trk/src/vs/workbench/parts/files/browser/explorerViewlet.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"folders": "Klasörler"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/files/browser/fileActions.contribution.i18n.json b/i18n/trk/src/vs/workbench/parts/files/browser/fileActions.contribution.i18n.json
deleted file mode 100644
index 09b50f5c819..00000000000
--- a/i18n/trk/src/vs/workbench/parts/files/browser/fileActions.contribution.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"filesCategory": "Dosya",
-	"revealInSideBar": "Kenar Çubuğunda Ortaya Çıkar",
-	"acceptLocalChanges": "Değişikliklerinizi kullanın ve diskteki içeriklerin üzerine yazın",
-	"revertLocalChanges": "Değişikliklerinizi göz ardı edin ve diskteki içeriğe geri dönün"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/files/browser/fileActions.i18n.json b/i18n/trk/src/vs/workbench/parts/files/browser/fileActions.i18n.json
deleted file mode 100644
index c6dceab7516..00000000000
--- a/i18n/trk/src/vs/workbench/parts/files/browser/fileActions.i18n.json
+++ /dev/null
@@ -1,73 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"retry": "Yeniden Dene",
-	"rename": "Yeniden Adlandır",
-	"newFile": "Yeni Dosya",
-	"newFolder": "Yeni Klasör",
-	"openFolderFirst": "İçinde dosyalar veya klasörler oluşturmak için ilk olarak bir klasör açın.",
-	"newUntitledFile": "Yeni İsimsiz Dosya",
-	"createNewFile": "Yeni Dosya",
-	"createNewFolder": "Yeni Klasör",
-	"deleteButtonLabelRecycleBin": "&&Geri Dönüşüm Kutusuna Taşı",
-	"deleteButtonLabelTrash": "&&Çöp Kutusuna Taşı",
-	"deleteButtonLabel": "&&Sil",
-	"dirtyMessageFolderOneDelete": "1 dosyada kaydedilmemiş değişiklik barındıran bir klasörü siliyorsunuz. Devam etmek istiyor musunuz?",
-	"dirtyMessageFolderDelete": "{0} dosyada kaydedilmemiş değişiklik barındıran bir klasörü siliyorsunuz. Devam etmek istiyor musunuz?",
-	"dirtyMessageFileDelete": "Kaydedilmemiş değişiklik barındıran bir dosyayı siliyorsunuz. Devam etmek istiyor musunuz?",
-	"dirtyWarning": "Değişiklikleriniz, kaydetmezseniz kaybolur.",
-	"confirmMoveTrashMessageFolder": "'{0}' ve içindekileri silmek istediğinizden emin misiniz?",
-	"confirmMoveTrashMessageFile": "'{0}' öğesini silmek istediğinize emin misiniz?",
-	"undoBin": "Geri dönüşüm kutusundan geri alabilirsiniz.",
-	"undoTrash": "Çöp kutusundan geri alabilirsiniz.",
-	"doNotAskAgain": "Bir daha sorma",
-	"confirmDeleteMessageFolder": "'{0}' öğesini ve içindekileri kalıcı olarak silmek istediğinizden emin misiniz?",
-	"confirmDeleteMessageFile": "'{0}' öğesini kalıcı olarak silmek istediğinizden emin misiniz?",
-	"irreversible": "Bu eylem geri döndürülemez!",
-	"permDelete": "Kalıcı Olarak Sil",
-	"delete": "Sil",
-	"importFiles": "Dosya İçe Aktar",
-	"confirmOverwrite": "Hedef klasörde aynı ada sahip bir dosya veya klasör zaten var. Değiştirmek istiyor musunuz?",
-	"replaceButtonLabel": "&&Değiştir",
-	"copyFile": "Kopyala",
-	"pasteFile": "Yapıştır",
-	"duplicateFile": "Çoğalt",
-	"openToSide": "Yana Aç",
-	"compareSource": "Karşılaştırma İçin Seç",
-	"globalCompareFile": "Aktif Dosyayı Karşılaştır...",
-	"openFileToCompare": "Bir başka dosya ile karşılaştırmak için ilk olarak bir dosya açın.",
-	"compareWith": "'{0}' dosyasını '{1}' ile karşılaştır",
-	"compareFiles": "Dosyaları Karşılaştır",
-	"refresh": "Yenile",
-	"save": "Kaydet",
-	"saveAs": "Farklı Kaydet...",
-	"saveAll": "Tümünü Kaydet",
-	"saveAllInGroup": "Gruptaki Tümünü Kadet",
-	"saveFiles": "Tüm Dosyaları Kaydet",
-	"revert": "Dosyayı Geri Döndür",
-	"focusOpenEditors": "Açık Düzenleyiciler Görünümüne Odakla",
-	"focusFilesExplorer": "Dosya Gezginine Odakla",
-	"showInExplorer": "Aktif Dosyayı Kenar Çubuğunda Ortaya Çıkar",
-	"openFileToShow": "Gezginde göstermek için ilk olarak bir dosya açın",
-	"collapseExplorerFolders": "Gezgindeki Klasörleri Daralt",
-	"refreshExplorer": "Gezgini Yenile",
-	"openFileInNewWindow": "Aktif Dosyayı Yeni Pencerede Aç",
-	"openFileToShowInNewWindow": "Yeni pencerede açmak için ilk olarak bir dosya açın",
-	"revealInWindows": "Gezginde Ortaya Çıkar",
-	"revealInMac": "Finder'da Ortaya Çıkar",
-	"openContainer": "İçeren Klasörü Aç",
-	"revealActiveFileInWindows": "Aktif Dosyayı Windows Gezgini'nde Ortaya Çıkar",
-	"revealActiveFileInMac": "Aktif Dosyayı Finder'da Ortaya Çıkar",
-	"openActiveFileContainer": "Aktif Dosyayı İçeren Klasörü Aç",
-	"copyPath": "Yolu Kopyala",
-	"copyPathOfActive": "Aktif Dosyanın Yolunu Kopyala",
-	"emptyFileNameError": "Bir dosya veya klasör adı sağlanması gerekiyor.",
-	"fileNameExistsError": "Bu konumda bir **{0}** dosyası veya klasörü zaten mevcut. Lütfen başka bir ad seçin.",
-	"invalidFileNameError": "**{0}** adı, bir dosya veya klasör adı olarak geçerli değildir. Lütfen başka bir ad seçin.",
-	"filePathTooLongError": "**{0}** adı çok uzun bir yol ile sonuçlanıyor. Lütfen daha kısa bir ad seçin.",
-	"compareWithSaved": "Aktif Dosyayı Kaydedilenle Karşılaştır",
-	"modifiedLabel": "{0} (diskte) ↔ {1}"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/files/browser/fileCommands.i18n.json b/i18n/trk/src/vs/workbench/parts/files/browser/fileCommands.i18n.json
deleted file mode 100644
index 699305824d3..00000000000
--- a/i18n/trk/src/vs/workbench/parts/files/browser/fileCommands.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"openFileToCopy": "Yolunu kopyalamak için ilk olarak bir dosya açın",
-	"openFileToReveal": "Ortaya çıkarmak için ilk olarak bir dosya açın"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/files/browser/files.contribution.i18n.json b/i18n/trk/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
deleted file mode 100644
index 4948cddf5c4..00000000000
--- a/i18n/trk/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
+++ /dev/null
@@ -1,53 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"showExplorerViewlet": "Gezgini Göster",
-	"explore": "Gezgin",
-	"view": "Görüntüle",
-	"textFileEditor": "Metin Dosyası Düzenleyicisi",
-	"binaryFileEditor": "İkili Dosya Düzenleyicisi",
-	"filesConfigurationTitle": "Dosyalar",
-	"exclude": "Dosyaları ve klasörleri hariç tutmak için glob desenlerini yapılandırın. Örnek olarak, dosya gezgini bu ayara bağlı olarak hangi dosya ve klasörlerin gösterileceğine karar verir.",
-	"files.exclude.boolean": "Dosya yollarının eşleştirileceği glob deseni. Deseni etkinleştirmek veya devre dışı bırakmak için true veya false olarak ayarlayın.",
-	"files.exclude.when": "Eşleşen bir dosyanın eşdüzey dosyalarında ek denetim. Eşleşen dosya adı için değişken olarak $(basename) kullanın.",
-	"associations": "Dillerle dosya ilişkilendirmelerini yapılandırın (ör. \"*.uzanti\": \"html\"). Bunların, kurulu olan dillerin varsayılan ilişkilendirmeleri karşısında önceliği vardır.",
-	"encoding": "Dosyalar okunurken ve yazılırken kullanılacak varsayılan karakter kümesi kodlaması. Bu ayar her bir dil için de yapılandırılabilir.",
-	"autoGuessEncoding": "Etkinleştirildiğinde, dosyaları açarken karakter kümesini tahmin etmeye çalışır. Bu ayar her bir dil için de yapılandırılabilir.",
-	"eol": "Varsayılan satır sonu karakteri. LF için \\n ve CRLF için \\r\\n kullan.",
-	"trimTrailingWhitespace": "Etkinleştirildiğinde, bir dosyayı kaydettiğinizde sondaki boşluk kırpılır.",
-	"insertFinalNewline": "Etkinleştirildiğinde, bir dosyayı kaydederken dosya sonuna bir boş satır ekler.",
-	"trimFinalNewlines": "Etkinleştirildiğinde, bir dosyayı kaydederken dosya sonundaki birden fazla boş satırı kırparak tek boş satıra çevirir",
-	"files.autoSave.off": "Kaydedilmemiş değişiklikler içeren bir dosya hiçbir zaman otomatik olarak kaydedilmez.",
-	"files.autoSave.afterDelay": "Kaydedilmemiş değişiklikler içeren bir dosya, 'files.autoSaveDelay' ayarlandıktan sonra otomatik olarak kaydedilir.",
-	"files.autoSave.onFocusChange": "Kaydedilmemiş değişiklikler içeren bir dosya, düzenleyici odaktan çıktığı an otomatik olarak kaydedilir.",
-	"files.autoSave.onWindowChange": "Kaydedilmemiş değişiklikler içeren bir dosya, pencere odaktan çıktığı an otomatik olarak kaydedilir.",
-	"autoSave": "Kaydedilmemiş değişiklikler içeren dosyaların otomatik kaydedilmesini denetler. Kabul edilen değerler:  '{0}', '{1}', '{2}' (düzenleyici odaktan çıktığında), '{3}' (pencere odaktan çıktığında). '{4}' olarak ayarlanırsa, gecikmeyi 'files.autoSaveDelay' ile ayarlayabilirsiniz.",
-	"autoSaveDelay": "Kaydedilmemiş değişiklikler içeren bir dosyanın kaç ms gecikmeli otomatik olarak kaydedileceğini denetler. Sadece 'files.autoSave', '{0}' olarak ayarlandığında uygulanır.",
-	"watcherExclude": "Dosya izlemeden hariç tutulacak dosya yollarının glob desenlerini yapılandırın. Desenler mutlak yollarla eşleşmelidir (ör. ** ile ön ek veya düzgün eşleştirmek için tam yol). Bu ayar değiştiğinde yeniden başlatma gerektirir. Code'un başlangıçta çok fazla CPU zamanı harcadığını görürseniz, başlangıç yüklemesini azaltmak için büyük klasörleri hariç tutabilirsiniz.",
-	"hotExit.off": "Hızlı çıkışı devre dışı bırak.",
-	"hotExit.onExit": "Hızlı çıkış, uygulama kapandığında tetiklenir, yani Windows/Linux'da son pencere kapandığında veya workbench.action.quit komutu tetiklendiği zaman (komut paleti, tuş bağı, menü). Bir sonraki başlatmada tüm pencereler yedekleriyle geri yüklenir.",
-	"hotExit.onExitAndWindowClose": "Hızlı çıkış, uygulama kapandığında tetiklenir, yani Windows/Linux'da son pencere kapandığında veya workbench.action.quit komutu tetiklendiği zaman (komut paleti, tuş bağı, menü), ve ayrıca son pencere olmasından bağımsız açık bir klasör bulunan herhangi bir pencere varsa. Bir sonraki başlatmada tüm pencereler yedekleriyle geri yüklenir. Klasör pencerelerini kapatılmadan önceki konumlarına geri yüklemek için \"window.restoreWindows\" ögesini \"all\" olarak ayarlayın.",
-	"hotExit": "Oturumlar arasında kaydedilmemiş dosyaların hatırlanıp hatırlanmayacağını denetler, düzenleyiciden çıkarken kaydetmek için izin istenmesi atlanacaktır.",
-	"useExperimentalFileWatcher": "Yeni deneysel dosya izleyicisini kullanın.",
-	"defaultLanguage": "Yeni dosyalara atanan varsayılan dil modu.",
-	"editorConfigurationTitle": "Düzenleyici",
-	"formatOnSave": "Dosyayı kaydederken biçimlendir. Bir biçimlendirici mevcut olmalıdır, dosya otomatik olarak kaydedilmemelidir, ve düzenleyici kapanmıyor olmalıdır.",
-	"explorerConfigurationTitle": "Dosya Gezgini",
-	"openEditorsVisible": "Açık Editörler bölmesinde gösterilen düzenleyici sayısı. Bölmeyi gizlemek için 0 olarak ayarlayın.",
-	"dynamicHeight": "Açık düzenleyiciler bölümü yüksekliğinin öge sayısına göre dinamik olarak uyarlanıp uyarlanmayacağını denetler.",
-	"autoReveal": "Gezginin dosyaları açarken, onları otomatik olarak ortaya çıkartmasını ve seçmesini denetler.",
-	"enableDragAndDrop": "Gezgeinin sürükle bırak ile dosyaları ve klasörleri taşımaya izin verip vermeyeceğini denetler.",
-	"confirmDragAndDrop": "Gezginin, sürükle bırak ile dosyalar ve klasörlerin taşındığı zaman onay isteyip istemeyeceğini denetler.",
-	"confirmDelete": "Gezginin, geri dönüşüm kutusu ile dosya silineceği zaman onay isteyip istemeyeceğini denetler.",
-	"sortOrder.default": "Dosya ve klasörler adlarına göre, alfabetik olarak sıralanırlar. Klasörler dosyalardan önce görüntülenir.",
-	"sortOrder.mixed": "Dosya ve klasörler adlarına göre, alfabetik olarak sıralanırlar. Dosyalar ve klasörler iç içe bulunur.",
-	"sortOrder.filesFirst": "Dosya ve klasörler adlarına göre, alfabetik olarak sıralanırlar. Dosyalar klasörlerden önce görüntülenir.",
-	"sortOrder.type": "Dosya ve klasörler uzantılarına göre, alfabetik olarak sıralanırlar. Klasörler dosyalardan önce görüntülenir.",
-	"sortOrder.modified": "Dosya ve klasörler son değiştirilme tarihine göre, azalan düzende sıralanırlar. Klasörler dosyalardan önce görüntülenir.",
-	"sortOrder": "Gezginde dosya ve klasörlerin sıralamasını denetler. Varsayılan sıralamaya ek olarak, sıralamayı; 'mixed' (dosya ve klasörler karışık olarak sıralanır), 'type' (dosya türüne göre), 'modified' (son düzenlenme tarihine göre) veya 'filesFirst' (dosyaları klasörlerden önce sırala) olarak ayarlayabilirsiniz.",
-	"explorer.decorations.colors": "Dosya süslemelerinin renkleri kullanıp kullanmayacağını denetler.",
-	"explorer.decorations.badges": "Dosya süslemelerinin göstergeleri kullanıp kullanmayacağını denetler."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/files/browser/saveErrorHandler.i18n.json b/i18n/trk/src/vs/workbench/parts/files/browser/saveErrorHandler.i18n.json
deleted file mode 100644
index 660d16789d0..00000000000
--- a/i18n/trk/src/vs/workbench/parts/files/browser/saveErrorHandler.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"userGuide": "Değişikliklerinizi **geri al**mak veya diskteki içeriğin **üzerine yaz**mak için düzenleyicideki araç çubuğunu kullanabilirsiniz",
-	"discard": "At",
-	"overwrite": "Üzerine Yaz",
-	"retry": "Yeniden Dene",
-	"readonlySaveError": "'{0}' kaydedilemedi: Dosya yazmaya karşı korunuyor. Korumayı kaldırmak için 'Üzerine Yaz'ı seçin.",
-	"genericSaveError": "'{0}' kaydedilemedi: ({1}).",
-	"staleSaveError": "'{0}' kaydedilemedi: Diskteki içerik daha yeni. Sizdeki sürüm ile disktekini karşılaştırmak için **Karşılaştır**a tıklayın.",
-	"compareChanges": "Karşılaştır",
-	"saveConflictDiffLabel": "{0} (diskte) ↔ {1} ({2} uygulamasında) - Kaydetme çakışmasını çöz"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/files/browser/views/emptyView.i18n.json b/i18n/trk/src/vs/workbench/parts/files/browser/views/emptyView.i18n.json
deleted file mode 100644
index 78cbb2f07ff..00000000000
--- a/i18n/trk/src/vs/workbench/parts/files/browser/views/emptyView.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"noWorkspace": "Açık Klasör Yok",
-	"explorerSection": "Dosya Gezgini Bölümü",
-	"noWorkspaceHelp": "Çalışma alanına hâlâ bir klasör eklemediniz.",
-	"addFolder": "Klasör Ekle",
-	"noFolderHelp": "Henüz bir klasör açmadınız.",
-	"openFolder": "Klasör Aç"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/files/browser/views/explorerDecorationsProvider.i18n.json b/i18n/trk/src/vs/workbench/parts/files/browser/views/explorerDecorationsProvider.i18n.json
deleted file mode 100644
index 5e24e43299f..00000000000
--- a/i18n/trk/src/vs/workbench/parts/files/browser/views/explorerDecorationsProvider.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"label": "Gezgin",
-	"canNotResolve": "Çalışma alanı klasörü çözümlenemiyor"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/files/browser/views/explorerView.i18n.json b/i18n/trk/src/vs/workbench/parts/files/browser/views/explorerView.i18n.json
deleted file mode 100644
index d8b937fc203..00000000000
--- a/i18n/trk/src/vs/workbench/parts/files/browser/views/explorerView.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"explorerSection": "Dosya Gezgini Bölümü",
-	"treeAriaLabel": "Dosya Gezgini"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/files/browser/views/explorerViewer.i18n.json b/i18n/trk/src/vs/workbench/parts/files/browser/views/explorerViewer.i18n.json
deleted file mode 100644
index c2e160be13c..00000000000
--- a/i18n/trk/src/vs/workbench/parts/files/browser/views/explorerViewer.i18n.json
+++ /dev/null
@@ -1,19 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"fileInputAriaLabel": "Dosya adı girin. Onaylamak için Enter'a, iptal etmek için Escape tuşuna basın.",
-	"filesExplorerViewerAriaLabel": "{0}, Dosya Gezgini",
-	"dropFolders": "Çalışma alanına klasörleri eklemek istiyor musunuz?",
-	"dropFolder": "Klasörü çalışma alanına eklemek istiyor musunuz?",
-	"addFolders": "Klasörleri &&Ekle",
-	"addFolder": "Klasörü &&Ekle",
-	"confirmMove": "'{0}' ögesini taşımak istediğinizden emin misiniz?",
-	"doNotAskAgain": "Bir daha sorma",
-	"moveButtonLabel": "&&Taşı",
-	"confirmOverwriteMessage": "'{0}' hedef klasörde zaten mevcut. Değiştirmek istiyor musunuz?",
-	"irreversible": "Bu eylem geri döndürülemez!",
-	"replaceButtonLabel": "&&Değiştir"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/files/browser/views/openEditorsView.i18n.json b/i18n/trk/src/vs/workbench/parts/files/browser/views/openEditorsView.i18n.json
deleted file mode 100644
index aa9de346ffc..00000000000
--- a/i18n/trk/src/vs/workbench/parts/files/browser/views/openEditorsView.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"openEditors": "Açık Düzenleyiciler",
-	"openEditosrSection": "Açık Düzenleyiciler Bölümü",
-	"treeAriaLabel": "Açık Düzenleyiciler: Aktif Dosyaların Listesi",
-	"dirtyCounter": "{0} kaydedilmemiş"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/files/browser/views/openEditorsViewer.i18n.json b/i18n/trk/src/vs/workbench/parts/files/browser/views/openEditorsViewer.i18n.json
deleted file mode 100644
index f22af02df4b..00000000000
--- a/i18n/trk/src/vs/workbench/parts/files/browser/views/openEditorsViewer.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"editorGroupAriaLabel": "{0}, Düzenleyici Grubu",
-	"openEditorAriaLabel": "{0}, Açık Düzenleyici",
-	"saveAll": "Tümünü Kaydet",
-	"closeAllUnmodified": "Değiştirilmeyenleri Kapat",
-	"closeAll": "Tümünü Kapat",
-	"compareWithSaved": "Kaydedilenle Karşılaştır",
-	"close": "Kapat",
-	"closeOthers": "Diğerlerini Kapat"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/files/common/dirtyFilesTracker.i18n.json b/i18n/trk/src/vs/workbench/parts/files/common/dirtyFilesTracker.i18n.json
deleted file mode 100644
index f39994923d8..00000000000
--- a/i18n/trk/src/vs/workbench/parts/files/common/dirtyFilesTracker.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"dirtyFile": "1 kaydedilmemiş dosya",
-	"dirtyFiles": "{0} kaydedilmemiş dosya"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/files/common/editors/fileEditorInput.i18n.json b/i18n/trk/src/vs/workbench/parts/files/common/editors/fileEditorInput.i18n.json
deleted file mode 100644
index 75d4d8a2285..00000000000
--- a/i18n/trk/src/vs/workbench/parts/files/common/editors/fileEditorInput.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"orphanedFile": "{0} (diskten silindi)"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/files/electron-browser/explorerViewlet.i18n.json b/i18n/trk/src/vs/workbench/parts/files/electron-browser/explorerViewlet.i18n.json
deleted file mode 100644
index aad1649fde3..00000000000
--- a/i18n/trk/src/vs/workbench/parts/files/electron-browser/explorerViewlet.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"folders": "Klasörler"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json b/i18n/trk/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
deleted file mode 100644
index c82aabc8a92..00000000000
--- a/i18n/trk/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"filesCategory": "Dosya",
-	"revealInSideBar": "Kenar Çubuğunda Ortaya Çıkar",
-	"acceptLocalChanges": "Değişikliklerinizi kullanın ve diskteki içeriklerin üzerine yazın",
-	"revertLocalChanges": "Değişikliklerinizi göz ardı edin ve diskteki içeriğe geri dönün",
-	"copyPathOfActive": "Aktif Dosyanın Yolunu Kopyala",
-	"saveAllInGroup": "Gruptaki Tümünü Kadet",
-	"saveFiles": "Tüm Dosyaları Kaydet",
-	"revert": "Dosyayı Geri Döndür",
-	"compareActiveWithSaved": "Aktif Dosyayı Kaydedilenle Karşılaştır",
-	"closeEditor": "Düzenleyiciyi Kapat",
-	"view": "Görüntüle",
-	"openToSide": "Yana Aç",
-	"revealInWindows": "Gezginde Ortaya Çıkar",
-	"revealInMac": "Finder'da Ortaya Çıkar",
-	"openContainer": "İçeren Klasörü Aç",
-	"copyPath": "Yolu Kopyala",
-	"saveAll": "Tümünü Kaydet",
-	"compareWithSaved": "Kaydedilenle Karşılaştır",
-	"compareWithSelected": "Seçilenle Karşılaştır",
-	"compareSource": "Karşılaştırma İçin Seç",
-	"compareSelected": "Seçilenle Karşılaştır",
-	"close": "Kapat",
-	"closeOthers": "Diğerlerini Kapat",
-	"closeSaved": "Kaydedilenleri Kapat",
-	"closeAll": "Tümünü Kapat",
-	"deleteFile": "Kalıcı Olarak Sil"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json b/i18n/trk/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
deleted file mode 100644
index 43e3bf4348f..00000000000
--- a/i18n/trk/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
+++ /dev/null
@@ -1,72 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"newFile": "Yeni Dosya",
-	"newFolder": "Yeni Klasör",
-	"rename": "Yeniden Adlandır",
-	"delete": "Sil",
-	"copyFile": "Kopyala",
-	"pasteFile": "Yapıştır",
-	"retry": "Yeniden Dene",
-	"renameWhenSourcePathIsParentOfTargetError": "Var olan bir klasöre dosya veya klasör eklemek için lütfen 'Yeni Klasör' veya 'Yeni Dosya' komutunu kullanın",
-	"newUntitledFile": "Yeni İsimsiz Dosya",
-	"createNewFile": "Yeni Dosya",
-	"createNewFolder": "Yeni Klasör",
-	"deleteButtonLabelRecycleBin": "&&Geri Dönüşüm Kutusuna Taşı",
-	"deleteButtonLabelTrash": "&&Çöp Kutusuna Taşı",
-	"deleteButtonLabel": "&&Sil",
-	"dirtyMessageFilesDelete": "Kaydedilmemiş değişiklik barındıran dosyaları siliyorsunuz. Devam etmek istiyor musunuz?",
-	"dirtyMessageFolderOneDelete": "1 dosyada kaydedilmemiş değişiklik barındıran bir klasörü siliyorsunuz. Devam etmek istiyor musunuz?",
-	"dirtyMessageFolderDelete": "{0} dosyada kaydedilmemiş değişiklik barındıran bir klasörü siliyorsunuz. Devam etmek istiyor musunuz?",
-	"dirtyMessageFileDelete": "Kaydedilmemiş değişiklik barındıran bir dosyayı siliyorsunuz. Devam etmek istiyor musunuz?",
-	"dirtyWarning": "Değişiklikleriniz, kaydetmezseniz kaybolur.",
-	"undoBin": "Geri Dönüşüm Kutusu'ndan geri alabilirsiniz.",
-	"undoTrash": "Çöp Kutusu'ndan geri alabilirsiniz.",
-	"doNotAskAgain": "Bir daha sorma",
-	"irreversible": "Bu eylem geri döndürülemez!",
-	"binFailed": "Geri Dönüşüm Kutusu'nu kullanarak silme başarısız oldu. Bunun yerine, kalıcı olarak silmek ister misiniz?",
-	"trashFailed": "Çöp Kutusu'nu kullanarak silme başarısız oldu. Bunun yerine, kalıcı olarak silmek ister misiniz?",
-	"deletePermanentlyButtonLabel": "&&Kalıcı Olarak Sil",
-	"retryButtonLabel": "&&Yeniden Dene",
-	"confirmMoveTrashMessageFilesAndDirectories": "Aşağıdaki {0} dosyayı/dizini ve içindekileri silmek istediğinizden emin misiniz?",
-	"confirmMoveTrashMessageMultipleDirectories": "Aşağıdaki {0} dizini ve içindekileri silmek istediğinizden emin misiniz?",
-	"confirmMoveTrashMessageMultiple": "Aşağıdaki {0} dosyayı silmek istediğinizden emin misiniz?",
-	"confirmMoveTrashMessageFolder": "'{0}' ve içindekileri silmek istediğinizden emin misiniz?",
-	"confirmMoveTrashMessageFile": "'{0}' ögesini silmek istediğinizden emin misiniz?",
-	"confirmDeleteMessageFilesAndDirectories": "Aşağıdaki {0} dosyayı/dizini ve içindekileri kalıcı olarak silmek istediğinizden emin misiniz?",
-	"confirmDeleteMessageMultipleDirectories": "Aşağıdaki {0} dizini ve içindekileri kalıcı olarak silmek istediğinizden emin misiniz?",
-	"confirmDeleteMessageMultiple": "Aşağıdaki {0} dosyayı kalıcı olarak silmek istediğinizden emin misiniz?",
-	"confirmDeleteMessageFolder": "'{0}' ögesini ve içindekileri kalıcı olarak silmek istediğinizden emin misiniz?",
-	"confirmDeleteMessageFile": "'{0}' ögesini kalıcı olarak silmek istediğinizden emin misiniz?",
-	"addFiles": "Dosya Ekle",
-	"confirmOverwrite": "Hedef klasörde aynı ada sahip bir dosya veya klasör zaten var. Değiştirmek istiyor musunuz?",
-	"replaceButtonLabel": "&&Değiştir",
-	"fileIsAncestor": "Yapıştırılacak dosya hedef klasörün atalarından biridir",
-	"fileDeleted": "Yapıştırılacak dosya bu arada silindi veya taşındı",
-	"duplicateFile": "Çoğalt",
-	"globalCompareFile": "Aktif Dosyayı Karşılaştır...",
-	"openFileToCompare": "Bir başka dosya ile karşılaştırmak için ilk olarak bir dosya açın.",
-	"refresh": "Yenile",
-	"saveAllInGroup": "Gruptaki Tümünü Kadet",
-	"focusOpenEditors": "Açık Düzenleyiciler Görünümüne Odakla",
-	"focusFilesExplorer": "Dosya Gezginine Odakla",
-	"showInExplorer": "Aktif Dosyayı Kenar Çubuğunda Ortaya Çıkar",
-	"openFileToShow": "Gezginde göstermek için ilk olarak bir dosya açın",
-	"collapseExplorerFolders": "Gezgindeki Klasörleri Daralt",
-	"refreshExplorer": "Gezgini Yenile",
-	"openFileInNewWindow": "Aktif Dosyayı Yeni Pencerede Aç",
-	"openFileToShowInNewWindow": "Yeni pencerede açmak için ilk olarak bir dosya açın",
-	"copyPath": "Yolu Kopyala",
-	"emptyFileNameError": "Bir dosya veya klasör adı sağlanması gerekiyor.",
-	"fileNameStartsWithSlashError": "Bir dosya veya klasör adı eğik çizgi(slash) ile başlayamaz.",
-	"fileNameExistsError": "Bu konumda bir **{0}** dosyası veya klasörü zaten mevcut. Lütfen başka bir ad seçin.",
-	"invalidFileNameError": "**{0}** adı, bir dosya veya klasör adı olarak geçerli değildir. Lütfen başka bir ad seçin.",
-	"filePathTooLongError": "**{0}** adı çok uzun bir yol ile sonuçlanıyor. Lütfen daha kısa bir ad seçin.",
-	"compareWithClipboard": "Aktif Dosyayı Panodakiyle Karşılaştır",
-	"clipboardComparisonLabel": "Pano ↔ {0}"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json b/i18n/trk/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
deleted file mode 100644
index c5a258c69c3..00000000000
--- a/i18n/trk/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"revealInWindows": "Gezginde Ortaya Çıkar",
-	"revealInMac": "Finder'da Ortaya Çıkar",
-	"openContainer": "İçeren Klasörü Aç",
-	"saveAs": "Farklı Kaydet...",
-	"save": "Kaydet",
-	"saveAll": "Tümünü Kaydet",
-	"removeFolderFromWorkspace": "Çalışma Alanından Klasör Kaldır",
-	"genericRevertError": "'{0}' geri döndürülemedi: {1}",
-	"modifiedLabel": "{0} (diskte) ↔ {1}",
-	"openFileToReveal": "Ortaya çıkarmak için ilk olarak bir dosya açın",
-	"openFileToCopy": "Yolunu kopyalamak için ilk olarak bir dosya açın"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json b/i18n/trk/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
deleted file mode 100644
index 193fd22e931..00000000000
--- a/i18n/trk/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"showExplorerViewlet": "Gezgini Göster",
-	"explore": "Gezgin",
-	"view": "Görüntüle",
-	"textFileEditor": "Metin Dosyası Düzenleyicisi",
-	"binaryFileEditor": "İkili Dosya Düzenleyicisi",
-	"filesConfigurationTitle": "Dosyalar",
-	"exclude": "Dosyaları ve klasörleri hariç tutmak için glob desenlerini yapılandırın. Örnek olarak, dosya gezgini bu ayara bağlı olarak hangi dosya ve klasörlerin gösterileceğine karar verir.",
-	"files.exclude.boolean": "Dosya yollarının eşleştirileceği glob deseni. Deseni etkinleştirmek veya devre dışı bırakmak için true veya false olarak ayarlayın.",
-	"files.exclude.when": "Eşleşen bir dosyanın eşdüzey dosyalarında ek denetim. Eşleşen dosya adı için değişken olarak $(basename) kullanın.",
-	"associations": "Dillerle dosya ilişkilendirmelerini yapılandırın (ör. \"*.uzanti\": \"html\"). Bunların, kurulu olan dillerin varsayılan ilişkilendirmeleri karşısında önceliği vardır.",
-	"encoding": "Dosyalar okunurken ve yazılırken kullanılacak varsayılan karakter kümesi kodlaması. Bu ayar her bir dil için de yapılandırılabilir.",
-	"autoGuessEncoding": "Etkinleştirildiğinde, dosyaları açarken karakter kümesini tahmin etmeye çalışır. Bu ayar her bir dil için de yapılandırılabilir.",
-	"eol": "Varsayılan satır sonu karakteri. LF için \\n ve CRLF için \\r\\n kullan.",
-	"trimTrailingWhitespace": "Etkinleştirildiğinde, bir dosyayı kaydettiğinizde sondaki boşluk kırpılır.",
-	"insertFinalNewline": "Etkinleştirildiğinde, bir dosyayı kaydederken dosya sonuna bir boş satır ekler.",
-	"trimFinalNewlines": "Etkinleştirildiğinde, bir dosyayı kaydederken dosya sonundaki birden fazla boş satırı kırparak tek boş satıra çevirir",
-	"files.autoSave.off": "Kaydedilmemiş değişiklikler içeren bir dosya hiçbir zaman otomatik olarak kaydedilmez.",
-	"files.autoSave.afterDelay": "Kaydedilmemiş değişiklikler içeren bir dosya, 'files.autoSaveDelay' ayarlandıktan sonra otomatik olarak kaydedilir.",
-	"files.autoSave.onFocusChange": "Kaydedilmemiş değişiklikler içeren bir dosya, düzenleyici odaktan çıktığı an otomatik olarak kaydedilir.",
-	"files.autoSave.onWindowChange": "Kaydedilmemiş değişiklikler içeren bir dosya, pencere odaktan çıktığı an otomatik olarak kaydedilir.",
-	"autoSave": "Kaydedilmemiş değişiklikler içeren dosyaların otomatik kaydedilmesini denetler. Kabul edilen değerler:  '{0}', '{1}', '{2}' (düzenleyici odaktan çıktığında), '{3}' (pencere odaktan çıktığında). '{4}' olarak ayarlanırsa, gecikmeyi 'files.autoSaveDelay' ile ayarlayabilirsiniz.",
-	"autoSaveDelay": "Kaydedilmemiş değişiklikler içeren bir dosyanın kaç ms gecikmeli otomatik olarak kaydedileceğini denetler. Sadece 'files.autoSave', '{0}' olarak ayarlandığında uygulanır.",
-	"watcherExclude": "Dosya izlemeden hariç tutulacak dosya yollarının glob desenlerini yapılandırın. Desenler mutlak yollarla eşleşmelidir (ör. ** ile ön ek veya düzgün eşleştirmek için tam yol). Bu ayar değiştiğinde yeniden başlatma gerektirir. Code'un başlangıçta çok fazla CPU zamanı harcadığını görürseniz, başlangıç yüklemesini azaltmak için büyük klasörleri hariç tutabilirsiniz.",
-	"hotExit.off": "Hızlı çıkışı devre dışı bırak.",
-	"hotExit.onExit": "Hızlı çıkış, uygulama kapandığında tetiklenir, yani Windows/Linux'da son pencere kapandığında veya workbench.action.quit komutu tetiklendiği zaman (komut paleti, tuş bağı, menü). Bir sonraki başlatmada tüm pencereler yedekleriyle geri yüklenir.",
-	"hotExit.onExitAndWindowClose": "Hızlı çıkış, uygulama kapandığında tetiklenir, yani Windows/Linux'da son pencere kapandığında veya workbench.action.quit komutu tetiklendiği zaman (komut paleti, tuş bağı, menü), ve ayrıca son pencere olmasından bağımsız açık bir klasör bulunan herhangi bir pencere varsa. Bir sonraki başlatmada tüm pencereler yedekleriyle geri yüklenir. Klasör pencerelerini kapatılmadan önceki konumlarına geri yüklemek için \"window.restoreWindows\" ögesini \"all\" olarak ayarlayın.",
-	"hotExit": "Oturumlar arasında kaydedilmemiş dosyaların hatırlanıp hatırlanmayacağını denetler, düzenleyiciden çıkarken kaydetmek için izin istenmesi atlanacaktır.",
-	"useExperimentalFileWatcher": "Yeni deneysel dosya izleyicisini kullanın.",
-	"defaultLanguage": "Yeni dosyalara atanan varsayılan dil modu.",
-	"maxMemoryForLargeFilesMB": "Büyük dosyaları açmaya çalışırken, yeniden başlatma sonrası VS Code için mevcut olacak bellek miktarını denetler. Komut satırında belirtilen --max-memory=YENİBOYUT ile aynı etkiyi gösterir.",
-	"editorConfigurationTitle": "Düzenleyici",
-	"formatOnSave": "Dosyayı kaydederken biçimlendir. Bir biçimlendirici mevcut olmalıdır, dosya otomatik olarak kaydedilmemelidir, ve düzenleyici kapanmıyor olmalıdır.",
-	"formatOnSaveTimeout": "Dosyayı kaydederken biçimlendirme zaman aşımı. formatOnSave komutlarında kullanılacak milisaniye cinsinden zaman limiti. Belirtilen zaman aşımından daha uzun süren komutlar iptal edilecektir.",
-	"explorerConfigurationTitle": "Dosya Gezgini",
-	"openEditorsVisible": "Açık Düzenleyiciler bölmesinde gösterilen düzenleyici sayısı.",
-	"autoReveal": "Gezginin dosyaları açarken, onları otomatik olarak ortaya çıkartmasını ve seçmesini denetler.",
-	"enableDragAndDrop": "Gezgeinin sürükle bırak ile dosyaları ve klasörleri taşımaya izin verip vermeyeceğini denetler.",
-	"confirmDragAndDrop": "Gezginin, sürükle bırak ile dosyalar ve klasörlerin taşındığı zaman onay isteyip istemeyeceğini denetler.",
-	"confirmDelete": "Gezginin, geri dönüşüm kutusu ile dosya silineceği zaman onay isteyip istemeyeceğini denetler.",
-	"sortOrder.default": "Dosya ve klasörler adlarına göre, alfabetik olarak sıralanırlar. Klasörler dosyalardan önce görüntülenir.",
-	"sortOrder.mixed": "Dosya ve klasörler adlarına göre, alfabetik olarak sıralanırlar. Dosyalar ve klasörler iç içe bulunur.",
-	"sortOrder.filesFirst": "Dosya ve klasörler adlarına göre, alfabetik olarak sıralanırlar. Dosyalar klasörlerden önce görüntülenir.",
-	"sortOrder.type": "Dosya ve klasörler uzantılarına göre, alfabetik olarak sıralanırlar. Klasörler dosyalardan önce görüntülenir.",
-	"sortOrder.modified": "Dosya ve klasörler son değiştirilme tarihine göre, azalan düzende sıralanırlar. Klasörler dosyalardan önce görüntülenir.",
-	"sortOrder": "Gezginde dosya ve klasörlerin sıralamasını denetler. Varsayılan sıralamaya ek olarak, sıralamayı; 'mixed' (dosya ve klasörler karışık olarak sıralanır), 'type' (dosya türüne göre), 'modified' (son düzenlenme tarihine göre) veya 'filesFirst' (dosyaları klasörlerden önce sırala) olarak ayarlayabilirsiniz.",
-	"explorer.decorations.colors": "Dosya süslemelerinin renkleri kullanıp kullanmayacağını denetler.",
-	"explorer.decorations.badges": "Dosya süslemelerinin göstergeleri kullanıp kullanmayacağını denetler."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json b/i18n/trk/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json
deleted file mode 100644
index ba53583a6bd..00000000000
--- a/i18n/trk/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"userGuide": "Değişikliklerinizi geri almak veya diskteki içeriğin üzerine yazmak için düzenleyicideki araç çubuğundaki eylemleri kullanabilirsiniz.",
-	"staleSaveError": "'{0}' kaydedilemedi: Diskteki içerik daha yeni. Lütfen sizdeki sürüm ile disktekini karşılaştırın.",
-	"retry": "Yeniden Dene",
-	"discard": "At",
-	"readonlySaveErrorAdmin": "'{0}' kaydedilemedi: Dosya yazmaya karşı korunuyor. Yönetici olarak denemek için 'Yönetici Olarak Üzerine Yaz'ı seçin.",
-	"readonlySaveError": "'{0}' kaydedilemedi: Dosya yazmaya karşı korunuyor. Korumayı kaldırmayı denemek için 'Üzerine Yaz'ı seçin.",
-	"permissionDeniedSaveError": "'{0}' kaydedilemedi: Yetersiz yetki. Yönetici olarak denemek için 'Yönetici Olarak Yeniden Dene'yi seçin.",
-	"genericSaveError": "'{0}' kaydedilemedi: ({1}).",
-	"learnMore": "Daha Fazla Bilgi Edin",
-	"dontShowAgain": "Tekrar Gösterme",
-	"compareChanges": "Karşılaştır",
-	"saveConflictDiffLabel": "{0} (diskte) ↔ {1} ({2} uygulamasında) - Kaydetme çakışmasını çöz",
-	"overwriteElevated": "Yönetici Olarak Üzerine Yaz...",
-	"saveElevated": "Yönetici Olarak Yeniden Dene...",
-	"overwrite": "Üzerine Yaz"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/files/electron-browser/views/emptyView.i18n.json b/i18n/trk/src/vs/workbench/parts/files/electron-browser/views/emptyView.i18n.json
deleted file mode 100644
index 642f9cf9bf2..00000000000
--- a/i18n/trk/src/vs/workbench/parts/files/electron-browser/views/emptyView.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"noWorkspace": "Açık Klasör Yok",
-	"explorerSection": "Dosya Gezgini Bölümü",
-	"noWorkspaceHelp": "Çalışma alanına hâlâ bir klasör eklemediniz.",
-	"addFolder": "Klasör Ekle",
-	"noFolderHelp": "Henüz bir klasör açmadınız.",
-	"openFolder": "Klasör Aç"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/files/electron-browser/views/explorerDecorationsProvider.i18n.json b/i18n/trk/src/vs/workbench/parts/files/electron-browser/views/explorerDecorationsProvider.i18n.json
deleted file mode 100644
index 5c93c1866ca..00000000000
--- a/i18n/trk/src/vs/workbench/parts/files/electron-browser/views/explorerDecorationsProvider.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"label": "Gezgin",
-	"canNotResolve": "Çalışma alanı klasörü çözümlenemiyor",
-	"symbolicLlink": "Sembolik Link"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/files/electron-browser/views/explorerView.i18n.json b/i18n/trk/src/vs/workbench/parts/files/electron-browser/views/explorerView.i18n.json
deleted file mode 100644
index 290a2700891..00000000000
--- a/i18n/trk/src/vs/workbench/parts/files/electron-browser/views/explorerView.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"explorerSection": "Dosya Gezgini Bölümü",
-	"treeAriaLabel": "Dosya Gezgini"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json b/i18n/trk/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
deleted file mode 100644
index af5f75f59c7..00000000000
--- a/i18n/trk/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"fileInputAriaLabel": "Dosya adı girin. Onaylamak için Enter'a, iptal etmek için Escape tuşuna basın.",
-	"createFileFromExplorerInfoMessage": "**{1}** konumunda **{0}** adlı dosya oluştur",
-	"renameFileFromExplorerInfoMessage": "Taşı ve **{0}** olarak yeniden adlandır",
-	"createFolderFromExplorerInfoMessage": "**{1}** konumunda **{0}** adlı klasör oluştur",
-	"filesExplorerViewerAriaLabel": "{0}, Dosya Gezgini",
-	"dropFolders": "Klasörleri çalışma alanına eklemek istiyor musunuz?",
-	"dropFolder": "Klasörü çalışma alanına eklemek istiyor musunuz?",
-	"addFolders": "Klasörleri &&Ekle",
-	"addFolder": "Klasörü &&Ekle",
-	"confirmRootsMove": "Çalışma alanınızdaki birden çok kök dizinin sırasını değiştirmek istediğinizden emin misiniz?",
-	"confirmMultiMove": "Aşağıdaki {0} dosyayı taşımak istediğinizden emin misiniz?",
-	"confirmRootMove": "Çalışma alanınızdaki '{0}' kök dizininin sırasını değiştirmek istediğinizden emin misiniz?",
-	"confirmMove": "'{0}' ögesini taşımak istediğinizden emin misiniz?",
-	"doNotAskAgain": "Bir daha sorma",
-	"moveButtonLabel": "&&Taşı",
-	"confirmOverwriteMessage": "'{0}' hedef klasörde zaten mevcut. Değiştirmek istiyor musunuz?",
-	"irreversible": "Bu eylem geri döndürülemez!",
-	"replaceButtonLabel": "&&Değiştir"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json b/i18n/trk/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json
deleted file mode 100644
index 65b6a337676..00000000000
--- a/i18n/trk/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openEditors": "Açık Düzenleyiciler",
-	"openEditosrSection": "Açık Düzenleyiciler Bölümü",
-	"dirtyCounter": "{0} kaydedilmemiş"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/files/electron-browser/views/openEditorsViewer.i18n.json b/i18n/trk/src/vs/workbench/parts/files/electron-browser/views/openEditorsViewer.i18n.json
deleted file mode 100644
index f22af02df4b..00000000000
--- a/i18n/trk/src/vs/workbench/parts/files/electron-browser/views/openEditorsViewer.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"editorGroupAriaLabel": "{0}, Düzenleyici Grubu",
-	"openEditorAriaLabel": "{0}, Açık Düzenleyici",
-	"saveAll": "Tümünü Kaydet",
-	"closeAllUnmodified": "Değiştirilmeyenleri Kapat",
-	"closeAll": "Tümünü Kapat",
-	"compareWithSaved": "Kaydedilenle Karşılaştır",
-	"close": "Kapat",
-	"closeOthers": "Diğerlerini Kapat"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/html/browser/html.contribution.i18n.json b/i18n/trk/src/vs/workbench/parts/html/browser/html.contribution.i18n.json
deleted file mode 100644
index 7c90e93cddd..00000000000
--- a/i18n/trk/src/vs/workbench/parts/html/browser/html.contribution.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"html.editor.label": "Html Önizlemesi"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/html/browser/htmlPreviewPart.i18n.json b/i18n/trk/src/vs/workbench/parts/html/browser/htmlPreviewPart.i18n.json
deleted file mode 100644
index a11acc39795..00000000000
--- a/i18n/trk/src/vs/workbench/parts/html/browser/htmlPreviewPart.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"html.voidInput": "Geçersiz düzenleyici girdisi."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/html/browser/webview.contribution.i18n.json b/i18n/trk/src/vs/workbench/parts/html/browser/webview.contribution.i18n.json
deleted file mode 100644
index af6d69fa60e..00000000000
--- a/i18n/trk/src/vs/workbench/parts/html/browser/webview.contribution.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"developer": "Geliştirici"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/html/browser/webview.i18n.json b/i18n/trk/src/vs/workbench/parts/html/browser/webview.i18n.json
deleted file mode 100644
index cc23f3edf72..00000000000
--- a/i18n/trk/src/vs/workbench/parts/html/browser/webview.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"devtools.webview": "Geliştirici: Web Görünümü Araçları"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/html/browser/webviewCommands.i18n.json b/i18n/trk/src/vs/workbench/parts/html/browser/webviewCommands.i18n.json
deleted file mode 100644
index cb54b2131e6..00000000000
--- a/i18n/trk/src/vs/workbench/parts/html/browser/webviewCommands.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"editor.action.webvieweditor.showFind": "Bulma Aracına Odakla",
-	"openToolsLabel": "Web Görünümü Geliştirici Araçlarını Aç",
-	"refreshWebviewLabel": "Web Görünümlerini Yeniden Yükle"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json b/i18n/trk/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json
deleted file mode 100644
index 7c90e93cddd..00000000000
--- a/i18n/trk/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"html.editor.label": "Html Önizlemesi"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json b/i18n/trk/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json
deleted file mode 100644
index a11acc39795..00000000000
--- a/i18n/trk/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"html.voidInput": "Geçersiz düzenleyici girdisi."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json b/i18n/trk/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json
deleted file mode 100644
index af6d69fa60e..00000000000
--- a/i18n/trk/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"developer": "Geliştirici"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json b/i18n/trk/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json
deleted file mode 100644
index 13712f3e4c5..00000000000
--- a/i18n/trk/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openToolsLabel": "Web Görünümü Geliştirici Araçlarını Aç",
-	"refreshWebviewLabel": "Web Görünümlerini Yeniden Yükle"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json b/i18n/trk/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
deleted file mode 100644
index ea26bcd9db3..00000000000
--- a/i18n/trk/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"updateLocale": "VS Code'un kullanıcı arayüzü dilini {0} olarak değiştirip yeniden başlatmak ister misiniz?",
-	"yes": "Evet",
-	"no": "Hayır",
-	"neverAgain": "Tekrar Gösterme",
-	"JsonSchema.locale": "Kullanılacak Kullanıcı Arayüzü Dili.",
-	"vscode.extension.contributes.localizations": "Düzenleyiciye yerelleştirmeleri ekler",
-	"vscode.extension.contributes.localizations.languageId": "Görüntülenen dizelerin çevrileceği dilin id'si.",
-	"vscode.extension.contributes.localizations.languageName": "Dilin İngilizcedeki adı.",
-	"vscode.extension.contributes.localizations.languageNameLocalized": "Dilin eklenen dildeki adı.",
-	"vscode.extension.contributes.localizations.translations": "Bu dille ilişkili çevirilerin listesi.",
-	"vscode.extension.contributes.localizations.translations.id": "Bu çevirinin ekleneceği VS Code veya Eklenti id'si. VS Code id'si her zaman`vscode` şeklindedir ve eklenti `yayinciAdi.eklentiAdi` formatında olmalıdır.",
-	"vscode.extension.contributes.localizations.translations.id.pattern": "Id, VS Code çevirisi için `vscode` olmalı veya eklenti çevirisi için `yayinciAdi.eklentiAdi` biçiminde olmalıdır.",
-	"vscode.extension.contributes.localizations.translations.path": "Dilin çevirilerini içeren dosyaya göreli yol."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/localizations/browser/localizationsActions.i18n.json b/i18n/trk/src/vs/workbench/parts/localizations/browser/localizationsActions.i18n.json
deleted file mode 100644
index 9cd3515ce98..00000000000
--- a/i18n/trk/src/vs/workbench/parts/localizations/browser/localizationsActions.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"configureLocale": "Dili Yapılandır",
-	"displayLanguage": "VSCode'un görüntüleme dilini tanımlar.",
-	"doc": "Desteklenen dillerin listesi için göz atın: {0}",
-	"restart": "Değeri değiştirirseniz VSCode'u yeniden başlatmanız gerekir.",
-	"fail.createSettings": " '{0}' oluşturulamadı ({1})."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/localizations/electron-browser/localizations.contribution.i18n.json b/i18n/trk/src/vs/workbench/parts/localizations/electron-browser/localizations.contribution.i18n.json
deleted file mode 100644
index 0e5a1f747b0..00000000000
--- a/i18n/trk/src/vs/workbench/parts/localizations/electron-browser/localizations.contribution.i18n.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"updateLocale": "VS Code'un kullanıcı arayüzü dilini {0} olarak değiştirip yeniden başlatmak ister misiniz?",
-	"activateLanguagePack": "Az önce yüklenen dil paketini etkinleştirmek için VS Code'u yeniden başlatmak ister misiniz?",
-	"yes": "Evet",
-	"no": "Hayır",
-	"neverAgain": "Tekrar Gösterme",
-	"install language pack": "Yakın gelecekte, VS Code dil paketlerini sadece Market uzantısı biçiminde destekleyecektir. Şu an yapılandırmada yer alan dili kullanmaya devam etmek için lütfen '{0}' eklentisini yükleyin.",
-	"install": "Yükle",
-	"more information": "Daha Fazla Bilgi...",
-	"JsonSchema.locale": "Kullanılacak Kullanıcı Arayüzü Dili.",
-	"vscode.extension.contributes.localizations": "Düzenleyiciye yerelleştirmeleri ekler",
-	"vscode.extension.contributes.localizations.languageId": "Görüntülenen dizelerin çevrileceği dilin id'si.",
-	"vscode.extension.contributes.localizations.languageName": "Dilin İngilizcedeki adı.",
-	"vscode.extension.contributes.localizations.languageNameLocalized": "Dilin eklenen dildeki adı.",
-	"vscode.extension.contributes.localizations.translations": "Bu dille ilişkili çevirilerin listesi.",
-	"vscode.extension.contributes.localizations.translations.id": "Bu çevirinin ekleneceği VS Code veya Eklenti id'si. VS Code id'si her zaman`vscode` şeklindedir ve eklenti `yayinciAdi.eklentiAdi` formatında olmalıdır.",
-	"vscode.extension.contributes.localizations.translations.id.pattern": "Id, VS Code çevirisi için `vscode` olmalı veya eklenti çevirisi için `yayinciAdi.eklentiAdi` biçiminde olmalıdır.",
-	"vscode.extension.contributes.localizations.translations.path": "Dilin çevirilerini içeren dosyaya göreli yol."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/localizations/electron-browser/localizationsActions.i18n.json b/i18n/trk/src/vs/workbench/parts/localizations/electron-browser/localizationsActions.i18n.json
deleted file mode 100644
index 25c7d2f27ba..00000000000
--- a/i18n/trk/src/vs/workbench/parts/localizations/electron-browser/localizationsActions.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"configureLocale": "Görüntüleme Dilini Yapılandır",
-	"displayLanguage": "VSCode'un görüntüleme dilini tanımlar.",
-	"doc": "Desteklenen dillerin listesi için göz atın: {0}",
-	"restart": "Değeri değiştirirseniz VSCode'u yeniden başlatmanız gerekir.",
-	"fail.createSettings": " '{0}' oluşturulamadı ({1})."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json b/i18n/trk/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json
deleted file mode 100644
index e9f359925ec..00000000000
--- a/i18n/trk/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"mainLog": "Günlük (Temel)",
-	"sharedLog": "Günlük (Ortak)",
-	"rendererLog": "Günlük (Pencere)",
-	"extensionsLog": "Günlük (Eklenti Sunucusu)",
-	"developer": "Geliştirici"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json b/i18n/trk/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json
deleted file mode 100644
index d594b47dfcb..00000000000
--- a/i18n/trk/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openLogsFolder": "Günlük Klasörünü Aç",
-	"showLogs": "Günlükleri Göster...",
-	"rendererProcess": "Pencere ({0})",
-	"emptyWindow": "Pencere",
-	"extensionHost": "Eklenti Sunucusu",
-	"sharedProcess": "Ortak",
-	"mainProcess": "Temel",
-	"selectProcess": "İşlem için Günlük Seçin",
-	"openLogFile": "Günlük Dosyasını Aç...",
-	"setLogLevel": "Günlük Düzeyini Ayarla...",
-	"trace": "İzle",
-	"debug": "Hata Ayıklama",
-	"info": "Bilgi",
-	"warn": "Uyarı",
-	"err": "Hata",
-	"critical": "Kritik",
-	"off": "Kapalı",
-	"selectLogLevel": "Günlük düzeyini seçin",
-	"default and current": "Varsayılan & Geçerli Olan",
-	"default": "Varsayılan",
-	"current": "Geçerli Olan"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/markers/browser/markersFileDecorations.i18n.json b/i18n/trk/src/vs/workbench/parts/markers/browser/markersFileDecorations.i18n.json
deleted file mode 100644
index a2b9d4cb87b..00000000000
--- a/i18n/trk/src/vs/workbench/parts/markers/browser/markersFileDecorations.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"label": "Sorunlar",
-	"tooltip.1": "Bu dosyada 1 sorun var",
-	"tooltip.N": "Bu dosyada {0} sorun var",
-	"markers.showOnFile": "Dosya ve klasörlerde Hata & Uyarıları göster."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/markers/browser/markersPanel.i18n.json b/i18n/trk/src/vs/workbench/parts/markers/browser/markersPanel.i18n.json
deleted file mode 100644
index 03c12e0efce..00000000000
--- a/i18n/trk/src/vs/workbench/parts/markers/browser/markersPanel.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"totalProblems": "Toplam {0} Sorun",
-	"filteredProblems": "{1} Sorundan {0} Tanesi Gösteriliyor"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/markers/common/markers.i18n.json b/i18n/trk/src/vs/workbench/parts/markers/common/markers.i18n.json
deleted file mode 100644
index 03c12e0efce..00000000000
--- a/i18n/trk/src/vs/workbench/parts/markers/common/markers.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"totalProblems": "Toplam {0} Sorun",
-	"filteredProblems": "{1} Sorundan {0} Tanesi Gösteriliyor"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/markers/common/messages.i18n.json b/i18n/trk/src/vs/workbench/parts/markers/common/messages.i18n.json
deleted file mode 100644
index 6f51355c9d1..00000000000
--- a/i18n/trk/src/vs/workbench/parts/markers/common/messages.i18n.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"viewCategory": "Görüntüle",
-	"problems.view.toggle.label": "Sorunları Aç/Kapat (Hatalar, Uyarılar, Bilgiler)",
-	"problems.view.focus.label": "Sorunlara Odakla (Hatalar, Uyarılar, Bilgiler)",
-	"problems.panel.configuration.title": "Sorunlar Görünümü",
-	"problems.panel.configuration.autoreveal": "Sorunlar görünümünün; dosyalar açılırken, dosyaları otomatik olarak ortaya çıkarıp çıkarmayacağını denetler.",
-	"markers.panel.title.problems": "Sorunlar",
-	"markers.panel.aria.label.problems.tree": "Dosyalara göre gruplandırılmış sorunlar",
-	"markers.panel.no.problems.build": "Şu ana kadar çalışma alanında herhangi bir sorun tespit edilmedi.",
-	"markers.panel.no.problems.filters": "Belirtilen süzgeç ölçütleriyle sonuç bulunamadı",
-	"markers.panel.action.filter": "Sorunları Süz",
-	"markers.panel.filter.placeholder": "Türe veya metne göre süz",
-	"markers.panel.filter.errors": "hatalar",
-	"markers.panel.filter.warnings": "uyarılar",
-	"markers.panel.filter.infos": "bilgilendirmeler",
-	"markers.panel.single.error.label": "1 Hata",
-	"markers.panel.multiple.errors.label": "{0} Hata",
-	"markers.panel.single.warning.label": "1 Uyarı",
-	"markers.panel.multiple.warnings.label": "{0} Uyarı",
-	"markers.panel.single.info.label": "1 Bilgilendirme",
-	"markers.panel.multiple.infos.label": "{0} Bilgilendirme",
-	"markers.panel.single.unknown.label": "1 Bilinmeyen",
-	"markers.panel.multiple.unknowns.label": "{0} Bilinmeyen",
-	"markers.panel.at.ln.col.number": "({0}, {1})",
-	"problems.tree.aria.label.resource": "{0} {1} sorun içeriyor",
-	"problems.tree.aria.label.error.marker": "{0} tarafından oluşturulan hata: {2}. satırın {3}. karakterinde {1}",
-	"problems.tree.aria.label.error.marker.nosource": "Hata: {1}. satırın {2}. karakterinde {0}",
-	"problems.tree.aria.label.warning.marker": "{0} tarafından oluşturulan uyarı: {2}. satırın {3}. karakterinde {1}",
-	"problems.tree.aria.label.warning.marker.nosource": "Uyarı: {1}. satırın {2}. karakterinde {0}",
-	"problems.tree.aria.label.info.marker": "{0} tarafından oluşturulan bilgilendirme: {2}. satırın {3}. karakterinde {1}",
-	"problems.tree.aria.label.info.marker.nosource": "Bilgilendirme: {1}. satırın {2}. karakterinde {0}",
-	"problems.tree.aria.label.marker": "{0} tarafından oluşturulan sorun: {2}. satırın {3}. karakterinde {1}",
-	"problems.tree.aria.label.marker.nosource": "Sorun: {1}. satırın {2}. karakterinde {0}",
-	"errors.warnings.show.label": "Hataları ve Uyarıları Göster"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json b/i18n/trk/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json
deleted file mode 100644
index 45570f731d6..00000000000
--- a/i18n/trk/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"copyMarker": "Kopyala",
-	"copyMessage": "Mesajı Kopyala"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/markers/electron-browser/markers.i18n.json b/i18n/trk/src/vs/workbench/parts/markers/electron-browser/markers.i18n.json
deleted file mode 100644
index a84cf939af0..00000000000
--- a/i18n/trk/src/vs/workbench/parts/markers/electron-browser/markers.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"totalProblems": "Toplam {0} Sorun"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/markers/electron-browser/markersElectronContributions.i18n.json b/i18n/trk/src/vs/workbench/parts/markers/electron-browser/markersElectronContributions.i18n.json
deleted file mode 100644
index 0bdba9b12bf..00000000000
--- a/i18n/trk/src/vs/workbench/parts/markers/electron-browser/markersElectronContributions.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"copyMarker": "Kopyala",
-	"copyMarkerMessage": "Mesajı Kopyala"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.i18n.json b/i18n/trk/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.i18n.json
deleted file mode 100644
index a2b9d4cb87b..00000000000
--- a/i18n/trk/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"label": "Sorunlar",
-	"tooltip.1": "Bu dosyada 1 sorun var",
-	"tooltip.N": "Bu dosyada {0} sorun var",
-	"markers.showOnFile": "Dosya ve klasörlerde Hata & Uyarıları göster."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/markers/electron-browser/markersPanel.i18n.json b/i18n/trk/src/vs/workbench/parts/markers/electron-browser/markersPanel.i18n.json
deleted file mode 100644
index 9f3ba8354ed..00000000000
--- a/i18n/trk/src/vs/workbench/parts/markers/electron-browser/markersPanel.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"disableFilesExclude": "Dosya Hariç Tutma Filtresini Devre Dışı Bırak.",
-	"clearFilter": "Filtreyi Temizle."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/markers/electron-browser/markersPanelActions.i18n.json b/i18n/trk/src/vs/workbench/parts/markers/electron-browser/markersPanelActions.i18n.json
deleted file mode 100644
index c04a09e8c04..00000000000
--- a/i18n/trk/src/vs/workbench/parts/markers/electron-browser/markersPanelActions.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"showing filtered problems": "{0}/{1} gösteriliyor"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json b/i18n/trk/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
deleted file mode 100644
index 45e5f83680c..00000000000
--- a/i18n/trk/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"viewCategory": "Görüntüle",
-	"problems.view.toggle.label": "Sorunları Aç/Kapat (Hatalar, Uyarılar, Bilgiler)",
-	"problems.view.focus.label": "Sorunlara Odakla (Hatalar, Uyarılar, Bilgiler)",
-	"problems.panel.configuration.title": "Sorunlar Görünümü",
-	"problems.panel.configuration.autoreveal": "Sorunlar görünümünün; dosyalar açılırken, dosyaları otomatik olarak ortaya çıkarıp çıkarmayacağını denetler.",
-	"markers.panel.title.problems": "Sorunlar",
-	"markers.panel.aria.label.problems.tree": "Dosyalara göre gruplandırılmış sorunlar",
-	"markers.panel.no.problems.build": "Şu ana kadar çalışma alanında herhangi bir sorun tespit edilmedi.",
-	"markers.panel.no.problems.filters": "Belirtilen filtre ölçütleriyle sonuç bulunamadı.",
-	"markers.panel.no.problems.file.exclusions": "Dosya hariç tutma filtresi etkinleştirildiği için tüm sorunlar gizlenmiştir.",
-	"markers.panel.action.useFilesExclude": "Dosya Hariç Tutma Ayarını kullanarak filtrele",
-	"markers.panel.action.donotUseFilesExclude": "Dosya Hariç Tutma Ayarını kullanma",
-	"markers.panel.action.filter": "Sorunları Filtrele",
-	"markers.panel.filter.ariaLabel": "Sorunları Filtrele",
-	"markers.panel.filter.placeholder": "Filtre. Ör: metin, **/*.ts, !**/node_modules/**",
-	"markers.panel.filter.errors": "hatalar",
-	"markers.panel.filter.warnings": "uyarılar",
-	"markers.panel.filter.infos": "bilgilendirmeler",
-	"markers.panel.single.error.label": "1 Hata",
-	"markers.panel.multiple.errors.label": "{0} Hata",
-	"markers.panel.single.warning.label": "1 Uyarı",
-	"markers.panel.multiple.warnings.label": "{0} Uyarı",
-	"markers.panel.single.info.label": "1 Bilgilendirme",
-	"markers.panel.multiple.infos.label": "{0} Bilgilendirme",
-	"markers.panel.single.unknown.label": "1 Bilinmeyen",
-	"markers.panel.multiple.unknowns.label": "{0} Bilinmeyen",
-	"markers.panel.at.ln.col.number": "({0}, {1})",
-	"problems.tree.aria.label.resource": "{0} {1} sorun içeriyor",
-	"problems.tree.aria.label.marker.relatedInformation": "Bu sorun {0} konumla ilişkilidir.",
-	"problems.tree.aria.label.error.marker": "{0} tarafından oluşturulan hata: {2}. satırın {3}. karakterinde {1}.{4}",
-	"problems.tree.aria.label.error.marker.nosource": "Hata: {1}. satırın {2}. karakterinde {0}.{3}",
-	"problems.tree.aria.label.warning.marker": "{0} tarafından oluşturulan uyarı: {2}. satırın {3}. karakterinde {1}.{4}",
-	"problems.tree.aria.label.warning.marker.nosource": "Uyarı: {1}. satırın {2}. karakterinde {0}.{3}",
-	"problems.tree.aria.label.info.marker": "{0} tarafından oluşturulan bilgilendirme: {2}. satırın {3}. karakterinde {1}.{4}",
-	"problems.tree.aria.label.info.marker.nosource": "Bilgilendirme: {1}. satırın {2}. karakterinde {0}.{3}",
-	"problems.tree.aria.label.marker": "{0} tarafından oluşturulan sorun: {2}. satırın {3}. karakterinde {1}.{4}",
-	"problems.tree.aria.label.marker.nosource": "Sorun: {1}. satırın {2}. karakterinde {0}.{3}",
-	"problems.tree.aria.label.relatedinfo.message": "{3} dosyasının {1}. satırın {2}. karakterinde {0}",
-	"errors.warnings.show.label": "Hataları ve Uyarıları Göster"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/nps/electron-browser/nps.contribution.i18n.json b/i18n/trk/src/vs/workbench/parts/nps/electron-browser/nps.contribution.i18n.json
deleted file mode 100644
index 821add9841d..00000000000
--- a/i18n/trk/src/vs/workbench/parts/nps/electron-browser/nps.contribution.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"surveyQuestion": "Hızlı bir geri bildirim anketine katılmak ister misiniz?",
-	"takeSurvey": "Ankete Katıl",
-	"remindLater": "Daha Sonra Hatırlat",
-	"neverAgain": "Tekrar Gösterme"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/outline/electron-browser/outline.contribution.i18n.json b/i18n/trk/src/vs/workbench/parts/outline/electron-browser/outline.contribution.i18n.json
deleted file mode 100644
index 5ee6f823861..00000000000
--- a/i18n/trk/src/vs/workbench/parts/outline/electron-browser/outline.contribution.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"name": "Ana Hat",
-	"category.focus": "Dosya",
-	"label.focus": "Ana Hata Odakla"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/outline/electron-browser/outlinePanel.i18n.json b/i18n/trk/src/vs/workbench/parts/outline/electron-browser/outlinePanel.i18n.json
deleted file mode 100644
index b87f59f8079..00000000000
--- a/i18n/trk/src/vs/workbench/parts/outline/electron-browser/outlinePanel.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"filter": "Filtre",
-	"collapse": "Tümünü Daralt",
-	"sortByPosition": "Sırala: Konuma Göre",
-	"sortByName": "Sırala: Ada Göre",
-	"sortByKind": "Sırala: Türe Göre",
-	"live": "İmleci İzle",
-	"no-editor": "Ana hat bilgisi sağlayabilecek açık bir düzenleyici yok.",
-	"too-many-symbols": "Üzgünüz, ancak bu dosya bir ana hat göstermek için çok büyük."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/outline/electron-browser/outlineTree.i18n.json b/i18n/trk/src/vs/workbench/parts/outline/electron-browser/outlineTree.i18n.json
deleted file mode 100644
index 35229bd6699..00000000000
--- a/i18n/trk/src/vs/workbench/parts/outline/electron-browser/outlineTree.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	]
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/output/browser/output.contribution.i18n.json b/i18n/trk/src/vs/workbench/parts/output/browser/output.contribution.i18n.json
deleted file mode 100644
index fe8f6125b1a..00000000000
--- a/i18n/trk/src/vs/workbench/parts/output/browser/output.contribution.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"output": "Çıktı",
-	"viewCategory": "Görüntüle",
-	"clearOutput.label": "Çıktıyı Temizle"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/output/browser/outputActions.i18n.json b/i18n/trk/src/vs/workbench/parts/output/browser/outputActions.i18n.json
deleted file mode 100644
index 3d310c952c0..00000000000
--- a/i18n/trk/src/vs/workbench/parts/output/browser/outputActions.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleOutput": "Çıktıyı Aç/Kapat",
-	"clearOutput": "Çıktıyı Temizle",
-	"toggleOutputScrollLock": "Çıktı Kaydırma Kilidini Aç/Kapat",
-	"switchToOutput.label": "Çıktıya Geçiş Yap",
-	"openInLogViewer": "Günlük Dosyasını Aç"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/output/browser/outputPanel.i18n.json b/i18n/trk/src/vs/workbench/parts/output/browser/outputPanel.i18n.json
deleted file mode 100644
index c548498486a..00000000000
--- a/i18n/trk/src/vs/workbench/parts/output/browser/outputPanel.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"output": "Çıktı",
-	"outputPanelWithInputAriaLabel": "{0}, Çıktı paneli",
-	"outputPanelAriaLabel": "Çıktı paneli"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/output/common/output.i18n.json b/i18n/trk/src/vs/workbench/parts/output/common/output.i18n.json
deleted file mode 100644
index cfbabebaa61..00000000000
--- a/i18n/trk/src/vs/workbench/parts/output/common/output.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"output": "Çıktı",
-	"channel": "'{0}' için"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json b/i18n/trk/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
deleted file mode 100644
index 3aa95c60f2d..00000000000
--- a/i18n/trk/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"output": "Çıktı",
-	"logViewer": "Günlük Görüntüleyici",
-	"viewCategory": "Görüntüle",
-	"clearOutput.label": "Çıktıyı Temizle",
-	"openActiveLogOutputFile": "Görüntüle: Aktif Günlük Dosyasını Aç"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json b/i18n/trk/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json
deleted file mode 100644
index b87f8651833..00000000000
--- a/i18n/trk/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"output": "{0} - Çıktı",
-	"channel": "'{0}' için çıktı kanalı"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/performance/electron-browser/performance.contribution.i18n.json b/i18n/trk/src/vs/workbench/parts/performance/electron-browser/performance.contribution.i18n.json
deleted file mode 100644
index af8637daeca..00000000000
--- a/i18n/trk/src/vs/workbench/parts/performance/electron-browser/performance.contribution.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"prof.message": "Profiller başarıyla oluşturuldu.",
-	"prof.detail": "Lütfen bir sorun (bildirimi) oluşturun ve aşağıdaki dosyaları manuel olarak ekleyin:\n{0}",
-	"prof.restartAndFileIssue": "Sorun Oluştur ve Yeniden Başlat",
-	"prof.restart": "Yeniden Başlat",
-	"prof.thanks": "Bize yardımcı olduğunuz için teşekkürler.",
-	"prof.detail.restart": "'{0}' uygulamasını kullanmaya devam etmek için son bir yeniden başlatma gerekiyor. Katkılarınız için tekrar teşekkür ederiz."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/performance/electron-browser/startupProfiler.i18n.json b/i18n/trk/src/vs/workbench/parts/performance/electron-browser/startupProfiler.i18n.json
deleted file mode 100644
index fa284781416..00000000000
--- a/i18n/trk/src/vs/workbench/parts/performance/electron-browser/startupProfiler.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"prof.message": "Profiller başarıyla oluşturuldu.",
-	"prof.detail": "Lütfen bir sorun (bildirimi) oluşturun ve aşağıdaki dosyaları manuel olarak ekleyin:\n{0}",
-	"prof.restartAndFileIssue": "Sorun Oluştur ve Yeniden Başlat",
-	"prof.restart": "Yeniden Başlat",
-	"prof.thanks": "Bize yardımcı olduğunuz için teşekkürler.",
-	"prof.detail.restart": "'{0}' uygulamasını kullanmaya devam etmek için son bir yeniden başlatma gerekiyor. Katkılarınız için tekrar teşekkür ederiz."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/preferences/browser/keybindingWidgets.i18n.json b/i18n/trk/src/vs/workbench/parts/preferences/browser/keybindingWidgets.i18n.json
deleted file mode 100644
index 4bb542ab40b..00000000000
--- a/i18n/trk/src/vs/workbench/parts/preferences/browser/keybindingWidgets.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"defineKeybinding.oneExists": "Bu tuş bağına sahip 1 mevcut komut var",
-	"defineKeybinding.existing": "Bu tuş bağına sahip {0} mevcut komut var",
-	"defineKeybinding.initial": "İstenen tuş kombinasyonuna basın ve daha sonra ENTER'a basın.",
-	"defineKeybinding.chordsTo": "ardından"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json b/i18n/trk/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
deleted file mode 100644
index 467358d0b9f..00000000000
--- a/i18n/trk/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"showDefaultKeybindings": "Varsayılan Tuş Bağlarını Göster",
-	"showUserKeybindings": "Kullanıcı Tuş Bağlarını Göster",
-	"SearchKeybindings.AriaLabel": "Tuş bağlarını ara",
-	"SearchKeybindings.Placeholder": "Tuş bağlarını ara",
-	"sortByPrecedene": "Önceliğe Göre Sırala",
-	"header-message": "Gelişmiş özelleştirmeler için açın ve düzenleyin:",
-	"keybindings-file-name": "keybindings.json",
-	"keybindingsLabel": "Tuş bağları",
-	"changeLabel": "Tuş Bağını Değiştir",
-	"addLabel": "Tuş Bağını Ekle",
-	"removeLabel": "Tuş Bağını Kaldır",
-	"resetLabel": "Tuş Bağını Sıfırla",
-	"showSameKeybindings": "Aynı Tuş Bağlarını Göster",
-	"copyLabel": "Kopyala",
-	"copyCommandLabel": "Komutu Kopyala",
-	"error": "Tuş bağını düzenlerken '{0}' hatası. Lütfen 'keybindings.json' dosyasını açın ve hataları kontrol edin.",
-	"command": "Command",
-	"keybinding": "Tuş bağı",
-	"source": "Kaynak",
-	"when": "Koşul",
-	"editKeybindingLabelWithKey": "{0} Tuş Bağını Değiştir",
-	"editKeybindingLabel": "Tuş Bağını Değiştir",
-	"addKeybindingLabelWithKey": "{0} Tuş Bağını Ekle",
-	"addKeybindingLabel": "Tuş Bağını Ekle",
-	"title": "{0} ({1})",
-	"commandAriaLabel": "Komut {0}'dır.",
-	"keybindingAriaLabel": "Tuş bağı {0}'dır.",
-	"noKeybinding": "Tuş bağı atanmamış.",
-	"sourceAriaLabel": "Kaynak {0}'dır.",
-	"whenAriaLabel": "Koşul {0} şeklindedir.",
-	"noWhen": "Koşul içeriği yok."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/preferences/browser/keybindingsEditorContribution.i18n.json b/i18n/trk/src/vs/workbench/parts/preferences/browser/keybindingsEditorContribution.i18n.json
deleted file mode 100644
index 872bdebba35..00000000000
--- a/i18n/trk/src/vs/workbench/parts/preferences/browser/keybindingsEditorContribution.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"defineKeybinding.start": "Tuş Bağı Tanımla",
-	"defineKeybinding.kbLayoutErrorMessage": "Bu tuş kombinasyonunu geçerli klavye düzeninizde üretemeyeceksiniz.",
-	"defineKeybinding.kbLayoutLocalAndUSMessage": "Geçerli klavye düzeniniz için **{0}** (Birleşik Devletler standardı için **{1}**).",
-	"defineKeybinding.kbLayoutLocalMessage": "Geçerli klavye düzeniniz için **{0}**."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/preferences/browser/preferences.contribution.i18n.json b/i18n/trk/src/vs/workbench/parts/preferences/browser/preferences.contribution.i18n.json
deleted file mode 100644
index 76c31109169..00000000000
--- a/i18n/trk/src/vs/workbench/parts/preferences/browser/preferences.contribution.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"defaultPreferencesEditor": "Varsayılan Tercihler Düzenleyicisi",
-	"keybindingsEditor": "Tuş Bağları Düzenleyicisi",
-	"preferences": "Tercihler"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json b/i18n/trk/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
deleted file mode 100644
index 079d9ce3535..00000000000
--- a/i18n/trk/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openRawDefaultSettings": "Ham Varsayılan Ayarları Aç",
-	"openSettings2": "Ayarları Aç (Önizleme)",
-	"openSettings": "Ayarları Aç",
-	"openGlobalSettings": "Kullanıcı Ayarlarını Aç",
-	"openGlobalKeybindings": "Klavye Kısayollarını Aç",
-	"openGlobalKeybindingsFile": "Klavye Kısayolları Dosyasını Aç",
-	"openWorkspaceSettings": "Çalışma Alanı Ayarlarını Aç",
-	"openFolderSettings": "Klasör Ayarlarını Aç",
-	"configureLanguageBasedSettings": "Dile Özel Ayarları Yapılandır...",
-	"languageDescriptionConfigured": "({0})",
-	"pickLanguage": "Dili Seç"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json b/i18n/trk/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
deleted file mode 100644
index 1d3adb46194..00000000000
--- a/i18n/trk/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"SearchSettingsWidget.AriaLabel": "Ayarları ara",
-	"SearchSettingsWidget.Placeholder": "Ayarları Ara",
-	"noSettingsFound": "Sonuç Yok",
-	"oneSettingFound": "1 Ayar Bulundu",
-	"settingsFound": "{0} Ayar Bulundu",
-	"totalSettingsMessage": "Toplam {0} Ayar",
-	"nlpResult": "Doğal Dil Sonuçları",
-	"filterResult": "Filtrelenmiş Sonuçlar",
-	"defaultSettings": "Varsayılan Ayarlar",
-	"defaultUserSettings": "Varsayılan Kullanıcı Ayarları",
-	"defaultWorkspaceSettings": "Varsayılan Çalışma Alanı Ayarları",
-	"defaultFolderSettings": "Varsayılan Klasör Ayarları",
-	"defaultEditorReadonly": "Varsayılan ayarları geçersiz kılmak için sağ taraftaki düzeyicide düzenleme yapın.",
-	"preferencesAriaLabel": "Varsayılan tercihler. Salt okunabilir metin editörü."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json b/i18n/trk/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
deleted file mode 100644
index a0bd993aafd..00000000000
--- a/i18n/trk/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"emptyUserSettingsHeader": "Varsayılan ayarların üzerine yazmak için ayarlarınızı buraya yerleştirin.",
-	"emptyWorkspaceSettingsHeader": "Varsayılan kullanıcı ayarlarının üzerine yazmak için ayarlarınızı buraya yerleştirin.",
-	"emptyFolderSettingsHeader": "Çalışma alanı ayarlarındakilerin üzerine yazmak için klasör ayarlarınızı buraya yerleştirin.",
-	"reportSettingsSearchIssue": "Sorun Bildir",
-	"newExtensionLabel": "\"{0}\" Eklentisini Göster",
-	"editTtile": "Düzenle",
-	"replaceDefaultValue": "Ayarlarda Değiştir",
-	"copyDefaultValue": "Ayarlara Kopyala"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/preferences/browser/preferencesService.i18n.json b/i18n/trk/src/vs/workbench/parts/preferences/browser/preferencesService.i18n.json
deleted file mode 100644
index 5cf702a19df..00000000000
--- a/i18n/trk/src/vs/workbench/parts/preferences/browser/preferencesService.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openFolderFirst": "Çalışma alanı ayarları oluşturmak için ilk olarak bir klasör açın",
-	"emptyKeybindingsHeader": "Varsayılanların üzerine yazmak için tuş bağlarınızı bu dosyaya yerleştirin",
-	"defaultKeybindings": "Varsayılan Tuş Bağları",
-	"folderSettingsName": "{0} (Klasör Ayarları)",
-	"fail.createSettings": " '{0}' oluşturulamadı ({1})."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json b/i18n/trk/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
deleted file mode 100644
index 1afe539c474..00000000000
--- a/i18n/trk/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"defaultSettings": "Geçersiz kılmak için ayarlarınızı sağ taraftaki düzeyiciye ekleyin.",
-	"noSettingsFound": "Hiçbir Ayar Bulunamadı.",
-	"settingsSwitcherBarAriaLabel": "Ayar Değiştirici",
-	"userSettings": "Kullanıcı Ayarları",
-	"workspaceSettings": "Çalışma Alanı Ayarları",
-	"folderSettings": "Klasör Ayarları"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/preferences/browser/settingsEditor2.i18n.json b/i18n/trk/src/vs/workbench/parts/preferences/browser/settingsEditor2.i18n.json
deleted file mode 100644
index 0149502b36f..00000000000
--- a/i18n/trk/src/vs/workbench/parts/preferences/browser/settingsEditor2.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"previewWarning": "Önizleme",
-	"previewLabel": "Bu yeni ayar düzenleyicimizin bir önizlemesidir",
-	"SearchSettings.AriaLabel": "Ayarları ara",
-	"SearchSettings.Placeholder": "Ayarları ara",
-	"advancedCustomizationLabel": "Gelişmiş özelleştirmeler için açın ve düzenleyin:",
-	"openSettingsLabel": "settings.json",
-	"showOverriddenOnly": "Sadece değiştirilmişleri göster",
-	"treeAriaLabel": "Ayarlar",
-	"feedbackButtonLabel": "Geri Bildirim Verin"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/preferences/browser/settingsTree.i18n.json b/i18n/trk/src/vs/workbench/parts/preferences/browser/settingsTree.i18n.json
deleted file mode 100644
index a144e79e607..00000000000
--- a/i18n/trk/src/vs/workbench/parts/preferences/browser/settingsTree.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"workspace": "Çalışma Alanı",
-	"user": "Kullanıcı",
-	"configured": "Değiştirilmiş",
-	"settingRowAriaLabel": "{0} {1}, Ayar",
-	"groupRowAriaLabel": "{0}, grup"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/preferences/common/keybindingsEditorModel.i18n.json b/i18n/trk/src/vs/workbench/parts/preferences/common/keybindingsEditorModel.i18n.json
deleted file mode 100644
index 4beddeaaf1b..00000000000
--- a/i18n/trk/src/vs/workbench/parts/preferences/common/keybindingsEditorModel.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"default": "Varsayılan",
-	"user": "Kullanıcı",
-	"meta": "meta",
-	"option": "seçenek"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/preferences/common/preferences.i18n.json b/i18n/trk/src/vs/workbench/parts/preferences/common/preferences.i18n.json
deleted file mode 100644
index e5b6826a251..00000000000
--- a/i18n/trk/src/vs/workbench/parts/preferences/common/preferences.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"userSettingsTarget": "Kullanıcı Ayarları",
-	"workspaceSettingsTarget": "Çalışma Alanı Ayarları"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json b/i18n/trk/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json
deleted file mode 100644
index d820bb4fe88..00000000000
--- a/i18n/trk/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"commonlyUsed": "Yaygın Olarak Kullanılan",
-	"defaultKeybindingsHeader": "Tuş bağları dosyanıza yerleştirerek tuş bağlarının üzerine yazın."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/preferences/electron-browser/preferences.contribution.i18n.json b/i18n/trk/src/vs/workbench/parts/preferences/electron-browser/preferences.contribution.i18n.json
deleted file mode 100644
index 0e771b8f895..00000000000
--- a/i18n/trk/src/vs/workbench/parts/preferences/electron-browser/preferences.contribution.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"defaultPreferencesEditor": "Varsayılan Tercihler Düzenleyicisi",
-	"settingsEditor2": "Ayar Düzenleyici 2",
-	"keybindingsEditor": "Tuş Bağları Düzenleyicisi",
-	"preferences": "Tercihler"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/quickopen/browser/commandsHandler.i18n.json b/i18n/trk/src/vs/workbench/parts/quickopen/browser/commandsHandler.i18n.json
deleted file mode 100644
index ed723b554b6..00000000000
--- a/i18n/trk/src/vs/workbench/parts/quickopen/browser/commandsHandler.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"showTriggerActions": "Tüm Komutları Göster",
-	"clearCommandHistory": "Komut Geçmişini Temizle",
-	"showCommands.label": "Komut Paleti...",
-	"entryAriaLabelWithKey": "{0}, {1}, komutlar",
-	"entryAriaLabel": "{0}, komutlar",
-	"actionNotEnabled": "'{0}' komutu geçerli bağlamda etkin değil.",
-	"canNotRun": "'{0}' komutu hata ile sonuçlandı.",
-	"recentlyUsed": "yakınlarda kullanıldı",
-	"morecCommands": "diğer komutlar",
-	"cat.title": "{0}: {1}",
-	"noCommandsMatching": "Eşleşen komut yok"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/quickopen/browser/gotoLineHandler.i18n.json b/i18n/trk/src/vs/workbench/parts/quickopen/browser/gotoLineHandler.i18n.json
deleted file mode 100644
index ea170a3729c..00000000000
--- a/i18n/trk/src/vs/workbench/parts/quickopen/browser/gotoLineHandler.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"gotoLine": "Satıra Git...",
-	"gotoLineLabelEmptyWithLimit": "Gitmek için 1 ile {0} arasında bir satır numarası yazın",
-	"gotoLineLabelEmpty": "Gidilecek satır numarasını yazın",
-	"gotoLineColumnLabel": "{0}. satırın {1}. karakterine git",
-	"gotoLineLabel": "{0} satırına git",
-	"gotoLineHandlerAriaLabel": "Gidilecek satır numarasını yazın.",
-	"cannotRunGotoLine": "Satıra gitmek için ilk olarak bir metin dosyası açın"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/quickopen/browser/gotoSymbolHandler.i18n.json b/i18n/trk/src/vs/workbench/parts/quickopen/browser/gotoSymbolHandler.i18n.json
deleted file mode 100644
index c4e8263777f..00000000000
--- a/i18n/trk/src/vs/workbench/parts/quickopen/browser/gotoSymbolHandler.i18n.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"gotoSymbol": "Dosyada Sembole Git...",
-	"symbols": "semboller ({0})",
-	"method": "yöntemler ({0})",
-	"function": "fonksiyonlar ({0})",
-	"_constructor": "oluşturucular ({0})",
-	"variable": "değişkenler ({0})",
-	"class": "sınıflar ({0})",
-	"interface": "arayüzler ({0})",
-	"namespace": "isim uzayları ({0})",
-	"package": "paketler ({0})",
-	"modules": "modüller ({0})",
-	"property": "özellikler ({0})",
-	"enum": "numaralandırmalar ({0})",
-	"string": "dizeler ({0})",
-	"rule": "kurallar ({0})",
-	"file": "dosyalar ({0})",
-	"array": "diziler ({0})",
-	"number": "sayılar ({0})",
-	"boolean": "boole değerleri ({0})",
-	"object": "nesneler ({0})",
-	"key": "anahtarlar ({0})",
-	"entryAriaLabel": "{0}, semboller",
-	"noSymbolsMatching": "Eşleşen sembol yok",
-	"noSymbolsFound": "Sembol bulunamadı",
-	"gotoSymbolHandlerAriaLabel": "Geçerli düzenleyicideki sembolleri daraltmak için yazmaya başlayın.",
-	"cannotRunGotoSymbolInFile": "Dosya için sembol bilgisi yok",
-	"cannotRunGotoSymbol": "Sembole gitmek için ilk olarak bir metin dosyası açın"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/quickopen/browser/helpHandler.i18n.json b/i18n/trk/src/vs/workbench/parts/quickopen/browser/helpHandler.i18n.json
deleted file mode 100644
index bfb70687c87..00000000000
--- a/i18n/trk/src/vs/workbench/parts/quickopen/browser/helpHandler.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"entryAriaLabel": "{0}, seçici yardımı",
-	"globalCommands": "genel komutlar",
-	"editorCommands": "düzenleyici komutları"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json b/i18n/trk/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json
deleted file mode 100644
index b5212eb95dd..00000000000
--- a/i18n/trk/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"view": "Görüntüle",
-	"commandsHandlerDescriptionDefault": "Komutları Göster ve Çalıştır",
-	"gotoLineDescriptionMac": "Satıra Git",
-	"gotoLineDescriptionWin": "Satıra Git",
-	"gotoSymbolDescription": "Dosyada Sembole Git",
-	"gotoSymbolDescriptionScoped": "Kategoriye Göre Dosyada Sembole Git",
-	"helpDescription": "Yardımı Göster",
-	"viewPickerDescription": "Görünümü Aç"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/quickopen/browser/viewPickerHandler.i18n.json b/i18n/trk/src/vs/workbench/parts/quickopen/browser/viewPickerHandler.i18n.json
deleted file mode 100644
index f9ae558ddf5..00000000000
--- a/i18n/trk/src/vs/workbench/parts/quickopen/browser/viewPickerHandler.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"entryAriaLabel": "{0}, görünüm seçici",
-	"views": "Görünümler",
-	"panels": "Paneller",
-	"terminals": "Terminal",
-	"terminalTitle": "{0}: {1}",
-	"channels": "Çıktı",
-	"openView": "Görünümü Aç",
-	"quickOpenView": "Görünümü Hızlı Aç"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.i18n.json b/i18n/trk/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.i18n.json
deleted file mode 100644
index 9c54c33d17f..00000000000
--- a/i18n/trk/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"relaunchSettingMessage": "Yürürlüğe girmesi için yeniden başlatma gerektiren bir ayar değişti.",
-	"relaunchSettingDetail": "{0} uygulamasını yeniden başlatmak ve bu ayarı etkinleştirmek için lütfen yeniden başlat butonuna basın.",
-	"restart": "&&Yeniden Başlat"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.i18n.json b/i18n/trk/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.i18n.json
deleted file mode 100644
index 0b56ea19d5b..00000000000
--- a/i18n/trk/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.i18n.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"changes": "{0}/{1} değişiklik",
-	"change": "{0}/{1} değişiklik",
-	"show previous change": "Önceki Değişikliği Göster",
-	"show next change": "Sonraki Değişikliği Göster",
-	"move to previous change": "Önceki Değişikliğe Git",
-	"move to next change": "Sonraki Değişikliğe Git",
-	"editorGutterModifiedBackground": "Değiştirilen satırlar için düzenleyici oluğu arka plan rengi.",
-	"editorGutterAddedBackground": "Eklenen satırlar için düzenleyici oluğu arka plan rengi.",
-	"editorGutterDeletedBackground": "Silinen satırlar için düzenleyici oluğu arka plan rengi.",
-	"overviewRulerModifiedForeground": "Değiştirilen içerik için genel bakış cetvelinin işaretleyici rengi.",
-	"overviewRulerAddedForeground": "Eklenen içerik için genel bakış cetvelinin işaretleyici rengi.",
-	"overviewRulerDeletedForeground": "Silinen içerik için genel bakış cetvelinin işaretleyici rengi."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json b/i18n/trk/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
deleted file mode 100644
index 486ac598226..00000000000
--- a/i18n/trk/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"toggleGitViewlet": "Git'i Göster",
-	"source control": "Kaynak Kontrolü",
-	"toggleSCMViewlet": "SCM'yi Göster",
-	"view": "Görüntüle",
-	"scmConfigurationTitle": "SCM",
-	"alwaysShowProviders": "Kaynak Kontrolü Sağlayıcısı bölümünün her zaman gösterilip gösterilmeyeceği.",
-	"diffDecorations": "Düzenleyicideki farklar(diff) dekoratörlerini denetler.",
-	"diffGutterWidth": "Oluktaki farklar(diff) dekoratörlerinin (eklendi & düzenlendi) genişliğini(px) denetler."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/scm/electron-browser/scmActivity.i18n.json b/i18n/trk/src/vs/workbench/parts/scm/electron-browser/scmActivity.i18n.json
deleted file mode 100644
index 8fe3d8d8063..00000000000
--- a/i18n/trk/src/vs/workbench/parts/scm/electron-browser/scmActivity.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"scmPendingChangesBadge": "{0} bekleyen değişiklik"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/scm/electron-browser/scmMenus.i18n.json b/i18n/trk/src/vs/workbench/parts/scm/electron-browser/scmMenus.i18n.json
deleted file mode 100644
index 560a8a41990..00000000000
--- a/i18n/trk/src/vs/workbench/parts/scm/electron-browser/scmMenus.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"installAdditionalSCMProviders": "Ek SCM Sağlayıcıları Yükle...",
-	"switch provider": "SCM Sağlayıcısı Değiştir..."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json b/i18n/trk/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
deleted file mode 100644
index d7ca189ea44..00000000000
--- a/i18n/trk/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"scm providers": "Kaynak Kontrolü Sağlayıcıları",
-	"hideRepository": "Gizle",
-	"installAdditionalSCMProviders": "Ek SCM Sağlayıcıları Yükle...",
-	"no open repo": "Aktif bir kaynak kontrolü sağlayıcısı yok.",
-	"source control": "Kaynak Kontrolü",
-	"viewletTitle": "{0}: {1}",
-	"hideView": "Gizle"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/search/browser/openAnythingHandler.i18n.json b/i18n/trk/src/vs/workbench/parts/search/browser/openAnythingHandler.i18n.json
deleted file mode 100644
index b3ead119062..00000000000
--- a/i18n/trk/src/vs/workbench/parts/search/browser/openAnythingHandler.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"fileAndTypeResults": "dosya ve sembol sonuçları",
-	"fileResults": "dosya sonuçları"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/search/browser/openFileHandler.i18n.json b/i18n/trk/src/vs/workbench/parts/search/browser/openFileHandler.i18n.json
deleted file mode 100644
index 0897543b703..00000000000
--- a/i18n/trk/src/vs/workbench/parts/search/browser/openFileHandler.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"entryAriaLabel": "{0}, dosya seçici",
-	"searchResults": "arama sonuçları"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/search/browser/openSymbolHandler.i18n.json b/i18n/trk/src/vs/workbench/parts/search/browser/openSymbolHandler.i18n.json
deleted file mode 100644
index 663e6bb880e..00000000000
--- a/i18n/trk/src/vs/workbench/parts/search/browser/openSymbolHandler.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"entryAriaLabel": "{0}, sembol seçici",
-	"symbols": "sembol sonuçları",
-	"noSymbolsMatching": "Eşleşen sembol yok",
-	"noSymbolsWithoutInput": "Sembolleri aramak için yazmaya başlayın"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/search/browser/patternInputWidget.i18n.json b/i18n/trk/src/vs/workbench/parts/search/browser/patternInputWidget.i18n.json
deleted file mode 100644
index 17422445524..00000000000
--- a/i18n/trk/src/vs/workbench/parts/search/browser/patternInputWidget.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"defaultLabel": "giriş",
-	"useExcludesAndIgnoreFilesDescription": "Hariç Tutma Ayarlarını ve Yok Sayma Dosyalarını Kullan"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/search/browser/replaceService.i18n.json b/i18n/trk/src/vs/workbench/parts/search/browser/replaceService.i18n.json
deleted file mode 100644
index 76c710d59e6..00000000000
--- a/i18n/trk/src/vs/workbench/parts/search/browser/replaceService.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"fileReplaceChanges": "{0} ↔ {1} (Değiştirme Önizlemesi)"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/search/browser/search.contribution.i18n.json b/i18n/trk/src/vs/workbench/parts/search/browser/search.contribution.i18n.json
deleted file mode 100644
index fd6f32d47d6..00000000000
--- a/i18n/trk/src/vs/workbench/parts/search/browser/search.contribution.i18n.json
+++ /dev/null
@@ -1,22 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"showTriggerActions": "Çalışma Alanında Sembole Git...",
-	"name": "Ara",
-	"search": "Ara",
-	"view": "Görüntüle",
-	"openAnythingHandlerDescription": "Dosyaya Git",
-	"openSymbolDescriptionNormal": "Çalışma Alanında Sembole Git",
-	"searchOutputChannelTitle": "Ara",
-	"searchConfigurationTitle": "Ara",
-	"exclude": "Aramalarda dosyaları ve klasörleri hariç tutmak için glob desenlerini yapılandırın. files.exclude ayarından, tüm glob desenlerini devralır.",
-	"exclude.boolean": "Dosya yollarının eşleştirileceği glob deseni. Deseni etkinleştirmek veya devre dışı bırakmak için true veya false olarak ayarlayın.",
-	"exclude.when": "Eşleşen bir dosyanın eşdüzey dosyalarında ek denetim. Eşleşen dosya adı için değişken olarak $(basename) kullanın.",
-	"useRipgrep": "Metin ve dosya aramasında Ripgrep kullanılıp kullanılmayacağını denetler",
-	"useIgnoreFiles": "Dosyaları ararken .gitignore ve .ignore dosyalarının kullanılıp kullanılmayacağını denetler.",
-	"search.quickOpen.includeSymbols": "Dosya sonuçlarındaki bir global sembol aramasının sonuçlarının Hızlı Aç'a dahil edilip edilmeyeceğini yapılandırın.",
-	"search.followSymlinks": "Arama yaparken sembolik linklerin takip edilip edilmeyeceğini denetler."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/search/browser/searchActions.i18n.json b/i18n/trk/src/vs/workbench/parts/search/browser/searchActions.i18n.json
deleted file mode 100644
index 79f2510cc1f..00000000000
--- a/i18n/trk/src/vs/workbench/parts/search/browser/searchActions.i18n.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"nextSearchIncludePattern": "Sonraki Aramaya Dahil Edilen Kalıbı Göster",
-	"previousSearchIncludePattern": "Önceki Aramaya Dahil Edilen Kalıbı Göster",
-	"nextSearchExcludePattern": "Sonraki Aramada Hariç Tutulan Kalıbı Göster",
-	"previousSearchExcludePattern": "Önceki Aramada Hariç Tutulan Kalıbı Göster",
-	"nextSearchTerm": "Sonraki Arama Terimini Göster",
-	"previousSearchTerm": "Önceki Arama Terimini Göster",
-	"findInFiles": "Dosyalarda Bul",
-	"replaceInFiles": "Dosyalardakileri Değiştir",
-	"RefreshAction.label": "Yenile",
-	"CollapseDeepestExpandedLevelAction.label": "Tümünü Daralt",
-	"ClearSearchResultsAction.label": "Temizle",
-	"CancelSearchAction.label": "Aramayı İptal Et",
-	"FocusNextSearchResult.label": "Sonraki Arama Sonucuna Odakla",
-	"FocusPreviousSearchResult.label": "Önceki Arama Sonucuna Odakla",
-	"RemoveAction.label": "Sonlandır",
-	"file.replaceAll.label": "Tümünü Değiştir",
-	"match.replace.label": "Değiştir"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/search/browser/searchResultsView.i18n.json b/i18n/trk/src/vs/workbench/parts/search/browser/searchResultsView.i18n.json
deleted file mode 100644
index 902a84a6206..00000000000
--- a/i18n/trk/src/vs/workbench/parts/search/browser/searchResultsView.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"searchFolderMatch.other.label": "Diğer dosyalar",
-	"searchFileMatches": "{0} dosya bulundu",
-	"searchFileMatch": "{0} dosya bulundu",
-	"searchMatches": "{0} eşleşme bulundu",
-	"searchMatch": "{0} eşleşme bulundu",
-	"folderMatchAriaLabel": "{1} kök dizininde {0} eşleşme, Arama sonucu",
-	"fileMatchAriaLabel": "{2} klasöründeki {1} dosyasında {0} eşleşme, Arama sonucu",
-	"replacePreviewResultAria": "{3} metinli satırdaki {2}. sütunda {1} ile arama terimi {0}",
-	"searchResultAria": "{2} metinli satırdaki {1}. sütunda terim {0} bulundu"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/search/browser/searchView.i18n.json b/i18n/trk/src/vs/workbench/parts/search/browser/searchView.i18n.json
deleted file mode 100644
index fc38590cc30..00000000000
--- a/i18n/trk/src/vs/workbench/parts/search/browser/searchView.i18n.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"moreSearch": "Arama Detaylarını Aç/Kapat",
-	"searchScope.includes": "dahil edilecek dosyalar",
-	"label.includes": "Aramaya Dahil Edilen Kalıplar",
-	"searchScope.excludes": "hariç tutulacak klasörler",
-	"label.excludes": "Aramada Hariç Tutulan Kalıplar",
-	"replaceAll.confirmation.title": "Tümünü Değiştir",
-	"replaceAll.confirm.button": "&&Değiştir",
-	"replaceAll.occurrence.file.message": "{1} dosyadaki {0} tekrarlama '{2}' ile değiştirildi.",
-	"removeAll.occurrence.file.message": "{1} dosyadaki {0} tekrarlama değiştirildi.",
-	"replaceAll.occurrence.files.message": "{1} dosyadaki {0} tekrarlama '{2}' ile değiştirildi.",
-	"removeAll.occurrence.files.message": "{1} dosyadaki {0} tekrarlama değiştirildi.",
-	"replaceAll.occurrences.file.message": "{1} dosyadaki {0} tekrarlama '{2}' ile değiştirildi.",
-	"removeAll.occurrences.file.message": "{1} dosyadaki {0} tekrarlama değiştirildi.",
-	"replaceAll.occurrences.files.message": "{1} dosyadaki {0} tekrarlama '{2}' ile değiştirildi.",
-	"removeAll.occurrences.files.message": "{1} dosyadaki {0} tekrarlama değiştirildi.",
-	"removeAll.occurrence.file.confirmation.message": "{1} dosyadaki {0} tekralama '{2}' ile değiştirilsin mi?",
-	"replaceAll.occurrence.file.confirmation.message": "{1} dosyadaki {0} tekrarlama değiştirilsin mi?",
-	"removeAll.occurrence.files.confirmation.message": "{1} dosyadaki {0} tekralama '{2}' ile değiştirilsin mi?",
-	"replaceAll.occurrence.files.confirmation.message": "{1} dosyadaki {0} tekrarlama değiştirilsin mi?",
-	"removeAll.occurrences.file.confirmation.message": "{1} dosyadaki {0} tekralama '{2}' ile değiştirilsin mi?",
-	"replaceAll.occurrences.file.confirmation.message": "{1} dosyadaki {0} tekrarlama değiştirilsin mi?",
-	"removeAll.occurrences.files.confirmation.message": "{1} dosyadaki {0} tekralama '{2}' ile değiştirilsin mi?",
-	"replaceAll.occurrences.files.confirmation.message": "{1} dosyadaki {0} tekrarlama değiştirilsin mi?",
-	"treeAriaLabel": "Arama Sonuçları",
-	"searchPathNotFoundError": "Arama yolu bulunamadı: {0}",
-	"searchMaxResultsWarning": "Sonuç kümesi yalnızca tüm eşleşmelerin bir alt kümesini içerir. Lütfen sonuçları daraltmak için aramanızda daha fazla ayrıntı belirtin.",
-	"searchCanceled": "Arama, hiçbir sonuç bulunamadan iptal edildi - ",
-	"noResultsIncludesExcludes": "'{0}' içinde '{1}' hariç tutularak sonuç bulunamadı - ",
-	"noResultsIncludes": "'{0}' içinde sonuç bulunamadı - ",
-	"noResultsExcludes": "'{0}' hariç tutularak sonuç bulunamadı - ",
-	"noResultsFound": "Sonuç bulunamadı. Yapılandırılan hariç tutmalar ve yok sayma dosyaları için ayarlarınızı gözden geçirin - ",
-	"rerunSearch.message": "Yeniden ara",
-	"rerunSearchInAll.message": "Tüm dosyalarda yeniden ara",
-	"openSettings.message": "Ayarları Aç",
-	"openSettings.learnMore": "Daha Fazla Bilgi Edin",
-	"ariaSearchResultsStatus": "Arama ile {1} dosyada {0} sonuç bulundu",
-	"search.file.result": "{1} dosyada {0} sonuç",
-	"search.files.result": "{1} dosyada {0} sonuç",
-	"search.file.results": "{1} dosyada {0} sonuç",
-	"search.files.results": "{1} dosyada {0} sonuç",
-	"searchWithoutFolder": "Henüz bir klasör açmadınız. Şu an sadece açık dosyalar aranıyor - ",
-	"openFolder": "Klasör Aç"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json b/i18n/trk/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
deleted file mode 100644
index fc38590cc30..00000000000
--- a/i18n/trk/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"moreSearch": "Arama Detaylarını Aç/Kapat",
-	"searchScope.includes": "dahil edilecek dosyalar",
-	"label.includes": "Aramaya Dahil Edilen Kalıplar",
-	"searchScope.excludes": "hariç tutulacak klasörler",
-	"label.excludes": "Aramada Hariç Tutulan Kalıplar",
-	"replaceAll.confirmation.title": "Tümünü Değiştir",
-	"replaceAll.confirm.button": "&&Değiştir",
-	"replaceAll.occurrence.file.message": "{1} dosyadaki {0} tekrarlama '{2}' ile değiştirildi.",
-	"removeAll.occurrence.file.message": "{1} dosyadaki {0} tekrarlama değiştirildi.",
-	"replaceAll.occurrence.files.message": "{1} dosyadaki {0} tekrarlama '{2}' ile değiştirildi.",
-	"removeAll.occurrence.files.message": "{1} dosyadaki {0} tekrarlama değiştirildi.",
-	"replaceAll.occurrences.file.message": "{1} dosyadaki {0} tekrarlama '{2}' ile değiştirildi.",
-	"removeAll.occurrences.file.message": "{1} dosyadaki {0} tekrarlama değiştirildi.",
-	"replaceAll.occurrences.files.message": "{1} dosyadaki {0} tekrarlama '{2}' ile değiştirildi.",
-	"removeAll.occurrences.files.message": "{1} dosyadaki {0} tekrarlama değiştirildi.",
-	"removeAll.occurrence.file.confirmation.message": "{1} dosyadaki {0} tekralama '{2}' ile değiştirilsin mi?",
-	"replaceAll.occurrence.file.confirmation.message": "{1} dosyadaki {0} tekrarlama değiştirilsin mi?",
-	"removeAll.occurrence.files.confirmation.message": "{1} dosyadaki {0} tekralama '{2}' ile değiştirilsin mi?",
-	"replaceAll.occurrence.files.confirmation.message": "{1} dosyadaki {0} tekrarlama değiştirilsin mi?",
-	"removeAll.occurrences.file.confirmation.message": "{1} dosyadaki {0} tekralama '{2}' ile değiştirilsin mi?",
-	"replaceAll.occurrences.file.confirmation.message": "{1} dosyadaki {0} tekrarlama değiştirilsin mi?",
-	"removeAll.occurrences.files.confirmation.message": "{1} dosyadaki {0} tekralama '{2}' ile değiştirilsin mi?",
-	"replaceAll.occurrences.files.confirmation.message": "{1} dosyadaki {0} tekrarlama değiştirilsin mi?",
-	"treeAriaLabel": "Arama Sonuçları",
-	"searchPathNotFoundError": "Arama yolu bulunamadı: {0}",
-	"searchMaxResultsWarning": "Sonuç kümesi yalnızca tüm eşleşmelerin bir alt kümesini içerir. Lütfen sonuçları daraltmak için aramanızda daha fazla ayrıntı belirtin.",
-	"searchCanceled": "Arama, hiçbir sonuç bulunamadan iptal edildi - ",
-	"noResultsIncludesExcludes": "'{0}' içinde '{1}' hariç tutularak sonuç bulunamadı - ",
-	"noResultsIncludes": "'{0}' içinde sonuç bulunamadı - ",
-	"noResultsExcludes": "'{0}' hariç tutularak sonuç bulunamadı - ",
-	"noResultsFound": "Sonuç bulunamadı. Yapılandırılan hariç tutmalar ve yok sayma dosyaları için ayarlarınızı gözden geçirin - ",
-	"rerunSearch.message": "Yeniden ara",
-	"rerunSearchInAll.message": "Tüm dosyalarda yeniden ara",
-	"openSettings.message": "Ayarları Aç",
-	"openSettings.learnMore": "Daha Fazla Bilgi Edin",
-	"ariaSearchResultsStatus": "Arama ile {1} dosyada {0} sonuç bulundu",
-	"search.file.result": "{1} dosyada {0} sonuç",
-	"search.files.result": "{1} dosyada {0} sonuç",
-	"search.file.results": "{1} dosyada {0} sonuç",
-	"search.files.results": "{1} dosyada {0} sonuç",
-	"searchWithoutFolder": "Henüz bir klasör açmadınız. Şu an sadece açık dosyalar aranıyor - ",
-	"openFolder": "Klasör Aç"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/search/browser/searchWidget.i18n.json b/i18n/trk/src/vs/workbench/parts/search/browser/searchWidget.i18n.json
deleted file mode 100644
index da3d353e079..00000000000
--- a/i18n/trk/src/vs/workbench/parts/search/browser/searchWidget.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"search.action.replaceAll.disabled.label": "Tümünü Değiştir (Etkinleştirmek İçin Aramayı Gönderin)",
-	"search.action.replaceAll.enabled.label": "Tümünü Değiştir",
-	"search.replace.toggle.button.title": "Değiştirmeyi Aç/Kapat",
-	"label.Search": "Ara: Arama Terimi girin ve aramak için Enter'a, iptal etmek için Escape tuşuna basın",
-	"search.placeHolder": "Ara",
-	"label.Replace": "Değiştir: Değiştirme terimini girin ve önizlemek için Enter'a, iptal etmek için Escape tuşuna basın",
-	"search.replace.placeHolder": "Değiştir",
-	"regexp.validationFailure": "İfade her öge ile eşleşiyor",
-	"regexp.backreferenceValidationFailure": "Geribaşvurular desteklenmiyor"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/search/common/queryBuilder.i18n.json b/i18n/trk/src/vs/workbench/parts/search/common/queryBuilder.i18n.json
deleted file mode 100644
index 17ebc206f04..00000000000
--- a/i18n/trk/src/vs/workbench/parts/search/common/queryBuilder.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"search.noWorkspaceWithName": "Çalışma alanında belirtilen isimde klasör yok: {0}"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json b/i18n/trk/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
deleted file mode 100644
index 9e04840f3ef..00000000000
--- a/i18n/trk/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"search": "Ara",
-	"copyMatchLabel": "Kopyala",
-	"copyPathLabel": "Yolu Kopyala",
-	"copyAllLabel": "Tümünü Kopyala",
-	"clearSearchHistoryLabel": "Arama Geçmişini Temizle",
-	"toggleSearchViewPositionLabel": "Arama Görünümü Konumunu Değiştir",
-	"findInFolder": "Klasörde Bul...",
-	"findInWorkspace": "Çalışma Alanında Bul...",
-	"showTriggerActions": "Çalışma Alanında Sembole Git...",
-	"name": "Ara",
-	"showSearchViewl": "Aramayı Göster",
-	"view": "Görüntüle",
-	"findInFiles": "Dosyalarda Bul",
-	"openAnythingHandlerDescription": "Dosyaya Git",
-	"openSymbolDescriptionNormal": "Çalışma Alanında Sembole Git",
-	"searchConfigurationTitle": "Ara",
-	"exclude": "Aramalarda dosyaları ve klasörleri hariç tutmak için glob desenlerini yapılandırın. files.exclude ayarından, tüm glob desenlerini devralır.",
-	"exclude.boolean": "Dosya yollarının eşleştirileceği glob deseni. Deseni etkinleştirmek veya devre dışı bırakmak için true veya false olarak ayarlayın.",
-	"exclude.when": "Eşleşen bir dosyanın eşdüzey dosyalarında ek denetim. Eşleşen dosya adı için değişken olarak $(basename) kullanın.",
-	"useRipgrep": "Metin ve dosya aramasında Ripgrep kullanılıp kullanılmayacağını denetler",
-	"useIgnoreFiles": "Dosyaları ararken .gitignore ve .ignore dosyalarının kullanılıp kullanılmayacağını denetler.",
-	"search.quickOpen.includeSymbols": "Dosya sonuçlarındaki bir global sembol aramasının sonuçlarının Hızlı Aç'a dahil edilip edilmeyeceğini yapılandırın.",
-	"search.followSymlinks": "Arama yaparken sembolik linklerin takip edilip edilmeyeceğini denetler.",
-	"search.smartCase": "Örüntü tamamen küçük harflerden oluşuyorsa büyük küçük harf duyarlılığı olmadan arar, diğer durumda ise büyük küçük harf duyarlılığı ile arar",
-	"search.globalFindClipboard": "macOS'de arama görünümünün paylaşılan panoyu okuyup okumamasını veya değiştirip değiştirmemesini denetler",
-	"search.location": "Aramanın kenar çubuğunda bir görünüm olarak mı yoksa daha fazla yatay boşluk için panel alanında bir panel olarak mı gösterileceğini denetler."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/search/electron-browser/searchActions.i18n.json b/i18n/trk/src/vs/workbench/parts/search/electron-browser/searchActions.i18n.json
deleted file mode 100644
index e2063bd2f0e..00000000000
--- a/i18n/trk/src/vs/workbench/parts/search/electron-browser/searchActions.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"findInFolder": "Klasörde Bul...",
-	"findInWorkspace": "Çalışma Alanında Bul..."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/snippets/electron-browser/TMSnippets.i18n.json b/i18n/trk/src/vs/workbench/parts/snippets/electron-browser/TMSnippets.i18n.json
deleted file mode 100644
index 07bddc32f48..00000000000
--- a/i18n/trk/src/vs/workbench/parts/snippets/electron-browser/TMSnippets.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"vscode.extension.contributes.snippets": "Parçacıklara ekleme yapar.",
-	"vscode.extension.contributes.snippets-language": "Bu parçacığın ekleneceği dilin tanımlayıcısı.",
-	"vscode.extension.contributes.snippets-path": "Parçacıklar dosyasının yolu. Yol, eklenti klasörüne görecelidir ve genellikle './snippets/' ile başlar.",
-	"invalid.language": "`contributes.{0}.language` ögesinde bilinmeyen dil. Sağlanan değer: {1}",
-	"invalid.path.0": "`contributes.{0}.path` ögesinde dize bekleniyor. Sağlanan değer: {1}",
-	"invalid.path.1": "`contributes.{0}.path` ögesinin ({1}) eklentinin klasöründe ({2}) yer alması bekleniyor. Bu, eklentiyi taşınamaz yapabilir.",
-	"badVariableUse": "\"{0}\"-parçacığı yüksek olasılıkla parçacık değişkenleri ile parçacık yer tutucularını karıştırıyor. Daha fazla bilgi için https://code.visualstudio.com/docs/editor/userdefinedsnippets#_snippet-syntax adresini ziyaret edin."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json b/i18n/trk/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json
deleted file mode 100644
index 370e3ca46f1..00000000000
--- a/i18n/trk/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"global.scope": "(global)",
-	"global.1": "({0})",
-	"new.global": "Yeni Global Parçacıklar dosyası...",
-	"group.global": "Mevcut Parçacıklar",
-	"new.global.sep": "Yeni Parçacıklar",
-	"openSnippet.pickLanguage": "Parçacıklar Dosyası Seç veya Parçacık Oluştur",
-	"openSnippet.label": "Kullanıcı Parçacıklarını Yapılandır",
-	"preferences": "Tercihler"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/snippets/electron-browser/insertSnippet.i18n.json b/i18n/trk/src/vs/workbench/parts/snippets/electron-browser/insertSnippet.i18n.json
deleted file mode 100644
index 68f121358fc..00000000000
--- a/i18n/trk/src/vs/workbench/parts/snippets/electron-browser/insertSnippet.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"snippet.suggestions.label": "Parçacık Ekle",
-	"sep.userSnippet": "Kullanıcı Parçacıkları",
-	"sep.extSnippet": "Eklenti Parçacıkları"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json b/i18n/trk/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json
deleted file mode 100644
index 61a732f0568..00000000000
--- a/i18n/trk/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"snippetSchema.json.default": "Boş parçacık",
-	"snippetSchema.json": "Kullanıcı parçacığı yapılandırması",
-	"snippetSchema.json.prefix": "Parçacığı IntelliSense'de seçerken kullanılacak ön ek",
-	"snippetSchema.json.body": "Parçacık içeriği. İmleç konumlarını tanımlamak için '$1', '${1:varsayilanMetin}' kullanın, en son imleç konumu için '$0' kullanın. Değişken değerlerini '${degiskenAdi}' ve '${degiskenAdi:varsayilanMetin}' ile ekleyin, ör. 'Bu bir dosyadır: $TM_FILENAME'.",
-	"snippetSchema.json.description": "Parçacık açıklaması.",
-	"snippetSchema.json.scope": "Bu parçacığın uygulanacağı dillerin bir listesi, ör: 'typescript,javascript'."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json b/i18n/trk/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json
deleted file mode 100644
index 334b2419218..00000000000
--- a/i18n/trk/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"source.snippetGlobal": "Global Kullanıcı Parçacığı",
-	"source.snippet": "Kullanıcı Parçacığı"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json b/i18n/trk/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
deleted file mode 100644
index c12f98f1f7d..00000000000
--- a/i18n/trk/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"invalid.path.0": "`contributes.{0}.path` ögesinde dize bekleniyor. Sağlanan değer: {1}",
-	"invalid.language.0": "Dil atlanırken `contributes.{0}.path`in değeri bir `.code-snippets` dosyası olmalıdır. Belirtilen değer {1}",
-	"invalid.language": "`contributes.{0}.language` ögesinde bilinmeyen dil. Sağlanan değer: {1}",
-	"invalid.path.1": "`contributes.{0}.path` ögesinin ({1}) eklentinin klasöründe ({2}) yer alması bekleniyor. Bu, eklentiyi taşınamaz yapabilir.",
-	"vscode.extension.contributes.snippets": "Parçacıklara ekleme yapar.",
-	"vscode.extension.contributes.snippets-language": "Bu parçacığın ekleneceği dilin tanımlayıcısı.",
-	"vscode.extension.contributes.snippets-path": "Parçacıklar dosyasının yolu. Yol, eklenti klasörüne görecelidir ve genellikle './snippets/' ile başlar.",
-	"badVariableUse": "'{0}' eklentisindeki bir veya daha çok parçacık yüksek olasılıkla parçacık değişkenleri ile parçacık yer tutucularını karıştırıyor (daha fazla bilgi için https://code.visualstudio.com/docs/editor/userdefinedsnippets#_snippet-syntax adresini ziyaret edin).",
-	"badFile": "Parçacık dosyası \"{0}\" okunamadı.",
-	"detail.snippet": "{0} ({1})",
-	"snippetSuggest.longLabel": "{0}, {1}"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/snippets/electron-browser/tabCompletion.i18n.json b/i18n/trk/src/vs/workbench/parts/snippets/electron-browser/tabCompletion.i18n.json
deleted file mode 100644
index a20d1dd0add..00000000000
--- a/i18n/trk/src/vs/workbench/parts/snippets/electron-browser/tabCompletion.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"tabCompletion": "Ön ekleri eşleştiğinde parçacıkları ekleyin. 'quickSuggestions' etkinleştirilmediği zaman en iyi şekilde çalışır."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/surveys/electron-browser/languageSurveys.contribution.i18n.json b/i18n/trk/src/vs/workbench/parts/surveys/electron-browser/languageSurveys.contribution.i18n.json
deleted file mode 100644
index bcad8d50b1f..00000000000
--- a/i18n/trk/src/vs/workbench/parts/surveys/electron-browser/languageSurveys.contribution.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"helpUs": "{0} için hizmetimizi iyileştirmemize yardımcı olun",
-	"takeShortSurvey": "Kısa Ankete Katıl",
-	"remindLater": "Daha Sonra Hatırlat",
-	"neverAgain": "Tekrar Gösterme"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/surveys/electron-browser/nps.contribution.i18n.json b/i18n/trk/src/vs/workbench/parts/surveys/electron-browser/nps.contribution.i18n.json
deleted file mode 100644
index eea9d76b733..00000000000
--- a/i18n/trk/src/vs/workbench/parts/surveys/electron-browser/nps.contribution.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"surveyQuestion": "Hızlı bir geri bildirim anketine katılmak ister misiniz?",
-	"takeSurvey": "Ankete Katıl",
-	"remindLater": "Daha Sonra Hatırlat",
-	"neverAgain": "Tekrar Gösterme"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/tasks/browser/buildQuickOpen.i18n.json b/i18n/trk/src/vs/workbench/parts/tasks/browser/buildQuickOpen.i18n.json
deleted file mode 100644
index 6d47af97b30..00000000000
--- a/i18n/trk/src/vs/workbench/parts/tasks/browser/buildQuickOpen.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"tasksAriaLabel": "Bir derleme görevinin adını girin",
-	"noTasksMatching": "Eşleşen görev yok",
-	"noTasksFound": "Derleme görevi bulunamadı"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/tasks/browser/quickOpen.i18n.json b/i18n/trk/src/vs/workbench/parts/tasks/browser/quickOpen.i18n.json
deleted file mode 100644
index cca81e2e840..00000000000
--- a/i18n/trk/src/vs/workbench/parts/tasks/browser/quickOpen.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"entryAriaLabel": "{0}, görevler",
-	"recentlyUsed": "yakınlarda kullanılan görevler",
-	"configured": "yapılandırılmış görevler",
-	"detected": "algılanan görevler",
-	"customizeTask": "Görevi Yapılandır"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/tasks/browser/restartQuickOpen.i18n.json b/i18n/trk/src/vs/workbench/parts/tasks/browser/restartQuickOpen.i18n.json
deleted file mode 100644
index d0d2568cfbd..00000000000
--- a/i18n/trk/src/vs/workbench/parts/tasks/browser/restartQuickOpen.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"tasksAriaLabel": "Yeniden başlatılacak görevin adını girin",
-	"noTasksMatching": "Eşleşen görev yok",
-	"noTasksFound": "Yeniden başlatılacak bir görev bulunamadı"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/tasks/browser/taskQuickOpen.i18n.json b/i18n/trk/src/vs/workbench/parts/tasks/browser/taskQuickOpen.i18n.json
deleted file mode 100644
index 85acc41f134..00000000000
--- a/i18n/trk/src/vs/workbench/parts/tasks/browser/taskQuickOpen.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"tasksAriaLabel": "Çalıştırılacak görevin adını girin",
-	"noTasksMatching": "Eşleşen görev yok",
-	"noTasksFound": "Görev bulunamadı"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/tasks/browser/terminateQuickOpen.i18n.json b/i18n/trk/src/vs/workbench/parts/tasks/browser/terminateQuickOpen.i18n.json
deleted file mode 100644
index 94241e91741..00000000000
--- a/i18n/trk/src/vs/workbench/parts/tasks/browser/terminateQuickOpen.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"tasksAriaLabel": "Sonlandırılacak görevin adını girin",
-	"noTasksMatching": "Eşleşen görev yok",
-	"noTasksFound": "Sonlandırılacak bir görev bulunamadı"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/tasks/browser/testQuickOpen.i18n.json b/i18n/trk/src/vs/workbench/parts/tasks/browser/testQuickOpen.i18n.json
deleted file mode 100644
index a68d96b3def..00000000000
--- a/i18n/trk/src/vs/workbench/parts/tasks/browser/testQuickOpen.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"tasksAriaLabel": "Bir test görevinin adını girin",
-	"noTasksMatching": "Eşleşen görev yok",
-	"noTasksFound": "Test görevi bulunamadı"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json b/i18n/trk/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json
deleted file mode 100644
index 386f5eb3c84..00000000000
--- a/i18n/trk/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json
+++ /dev/null
@@ -1,76 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"ProblemPatternParser.loopProperty.notLast": "Döngü özelliği yalnızca son satır eşleştiricisinde desteklenir.",
-	"ProblemPatternParser.problemPattern.kindProperty.notFirst": "Problem şablonu geçersiz. Tür özelliği yalnızca ilk ögede belirtilmelidir.",
-	"ProblemPatternParser.problemPattern.missingRegExp": "Sorun modelinde bir düzenli ifade eksik.",
-	"ProblemPatternParser.problemPattern.missingProperty": "Problem şablonu geçersiz. En az bir dosya ve mesaj bulundurmalıdır.",
-	"ProblemPatternParser.problemPattern.missingLocation": "Problem şablonu geçersiz. Ya \"dosya\" ya satır ya da konum eşleşme grubu, türlerinden birini bulundurmalıdır.",
-	"ProblemPatternParser.invalidRegexp": "Hata: Dize {0}, geçerli bir düzenli ifade değil.\n",
-	"ProblemPatternSchema.regexp": "Çıktıda bir hata, uyarı veya bilgi bulan düzenli ifade.",
-	"ProblemPatternSchema.kind": "şablonun bir konum (dosya ve satır) veya yalnızca bir dosya ile eşleşip eşleşmediği",
-	"ProblemPatternSchema.file": "Dosya adının eşleştirme grubu indeksi. Atlanırsa 1 kullanılır.",
-	"ProblemPatternSchema.location": "Sorunun bulunduğu yerin eşleşme grubu indeksi. Geçerli konum örüntüleri şunlardır: (line), (line,column) ve (startLine,startColumn,endLine,endColumn). Atlanmışsa (line,column) varsayılır.",
-	"ProblemPatternSchema.line": "Sorunun satırının eşleştirme grubu indeksi. Varsayılan değeri 2'dir",
-	"ProblemPatternSchema.column": "Sorunun satır karakterinin eşleştirme grubu indeksi. Varsayılan değeri 3'tür",
-	"ProblemPatternSchema.endLine": "Sorunun satır sonunun eşleştirme grubu indeksi. Varsayılan değeri tanımsızdır",
-	"ProblemPatternSchema.endColumn": "Sorunun satır sonu karakterinin eşleştirme grubu indeksi. Varsayılan değeri tanımsızdır",
-	"ProblemPatternSchema.severity": "Sorunun öneminin eşleştirme grubu indeksi. Varsayılan değeri tanımsızdır",
-	"ProblemPatternSchema.code": "Sorunun kodunun eşleştirme grubu indeksi. Varsayılan değeri tanımsızdır",
-	"ProblemPatternSchema.message": "Mesajın eşleştirme grubu indeksi. Atlanırsa konum belirtildiğinde varsayılan olarak 4 kullanılır. Aksi taktirde varsayılan olarak 5 kullanılır.",
-	"ProblemPatternSchema.loop": "Birden çok satırlı eşleşmede döngü, bu kalıbın eşleştiği sürece bir döngüde yürütülüp yürütülmeyeceğini gösterir. Yalnızca birden çok satırlı bir kalıbın son kalıbında belirtilebilir.",
-	"NamedProblemPatternSchema.name": "Sorun modelinin adı.",
-	"NamedMultiLineProblemPatternSchema.name": "Birden çok satırlı sorun modelinin adı.",
-	"NamedMultiLineProblemPatternSchema.patterns": "Gerçek modeller.",
-	"ProblemPatternExtPoint": "Sorun modellerine ekleme yapar",
-	"ProblemPatternRegistry.error": "Geçersiz sorun modeli. Model yok sayılacaktır.",
-	"ProblemMatcherParser.noProblemMatcher": "Hata: açıklama bir sorun eşleştiricisine dönüştürülemez:\n{0}\n",
-	"ProblemMatcherParser.noProblemPattern": "Hata: açıklama geçerli bir sorun modeli tanımlamıyor:\n{0}\n",
-	"ProblemMatcherParser.noOwner": "Hata: açıklama bir sahip tanımlamıyor:\n{0}\n",
-	"ProblemMatcherParser.noFileLocation": "Hata: açıklama bir dosya yolu tanımlamıyor:\n{0}\n",
-	"ProblemMatcherParser.unknownSeverity": "Bilgi: bilinmeyen önem derecesi {0}. Geçerli değerler: error, warning ve info.\n",
-	"ProblemMatcherParser.noDefinedPatter": "Hata: tanımlayıcısı {0} olan model mevcut değil.",
-	"ProblemMatcherParser.noIdentifier": "Hata: model özelliği boş bir tanımlayıcıya karşılık geliyor.",
-	"ProblemMatcherParser.noValidIdentifier": "Hata: model özelliği {0} geçerli bir model değişkeni adı değil.",
-	"ProblemMatcherParser.problemPattern.watchingMatcher": "Bir sorun eşleştiricisi izlenecek bir başlangıç örüntüsü ve bir bitiş örüntüsü tanımlamalıdır.",
-	"ProblemMatcherParser.invalidRegexp": "Hata: Dize {0}, geçerli bir düzenli ifade değil.\n",
-	"WatchingPatternSchema.regexp": "Bir arka plan görevinin başlangıcını ve sonunu tespit edecek düzenli ifade.",
-	"WatchingPatternSchema.file": "Dosya adının eşleştirme grubu indeksi. Atlanabilir.",
-	"PatternTypeSchema.name": "Katkıda bulunulan veya ön tanımlı modelin adı",
-	"PatternTypeSchema.description": "Bir sorun modeli veya bir katkıda bulunulan veya ön tanımlı sorun modelinin adı. Temel model belirtildiyse atlanabilir.",
-	"ProblemMatcherSchema.base": "Kullanılacak temel sorun eşleştiricisinin adı.",
-	"ProblemMatcherSchema.owner": "Code'un içindeki sorunun sahibi. Temel model belirtildiyse atlanabilir. Atlanırsa ve temel belirtilmemişse 'external' varsayılır.",
-	"ProblemMatcherSchema.source": "Bu tanılama bilgilerinin kaynağını açıklayan insan tarafından okunabilir bir dize, ör. 'typescript' veya 'super lint'.",
-	"ProblemMatcherSchema.severity": "Sorun yakalamanın varsayılan önem derecesi. Model, önem derecesi için bir eşleme grubu tanımlamazsa kullanılır.",
-	"ProblemMatcherSchema.applyTo": "Bir metin belgesinde bildirilen bir sorunun sadece açık, kapalı veya tüm belgelere uygulanıp uygulanmadığını denetler.",
-	"ProblemMatcherSchema.fileLocation": "Bir sorun modelinde bildirilen dosya adlarının nasıl yorumlanacağını tanımlar.",
-	"ProblemMatcherSchema.background": "Bir arka plan görevinde aktif bir eşleştiricinin başlangıcını ve sonunu izlemek için kullanılan kalıplar.",
-	"ProblemMatcherSchema.background.activeOnStart": "\"true\" değeri atanırsa, görev başladığında arka plan izleyicisi etkin modda olur. Bu, beginsPattern ile başlayan bir satırın verilmesi demektir",
-	"ProblemMatcherSchema.background.beginsPattern": "Çıktıda eşleşmesi halinde, arka plan görevinin başlatılması sinyali verilir.",
-	"ProblemMatcherSchema.background.endsPattern": "Çıktıda eşleşmesi halinde, arka plan görevinin sonu sinyali verilir.",
-	"ProblemMatcherSchema.watching.deprecated": "İzleme özelliği kullanım dışıdır. Onun yerine arka planı kullanın.",
-	"ProblemMatcherSchema.watching": "Bir izleme eşleştiricisinin başlangıcını ve sonunu izlemek için kullanılan kalıplar.",
-	"ProblemMatcherSchema.watching.activeOnStart": "\"true\" değeri atanırsa, görev başladığında izleyici etkin modda olur. Bu, beginsPattern ile başlayan bir satırın verilmesi demektir",
-	"ProblemMatcherSchema.watching.beginsPattern": "Çıktıda eşleşmesi halinde, izleme görevinin başlatılması sinyali verilir.",
-	"ProblemMatcherSchema.watching.endsPattern": "Çıktıda eşleşmesi halinde, izleme görevinin sonu sinyali verilir.",
-	"LegacyProblemMatcherSchema.watchedBegin.deprecated": "Bu özellik kullanım dışıdır. Bunun yerine 'watching' özelliğini kullanın.",
-	"LegacyProblemMatcherSchema.watchedBegin": "İzlenen görevlerin yürütülmeye başlanmasının, dosya izleyerek tetiklendiğini işaret eden bir düzenli ifade.",
-	"LegacyProblemMatcherSchema.watchedEnd.deprecated": "Bu özellik kullanım dışıdır. Bunun yerine 'watching' özelliğini kullanın.",
-	"LegacyProblemMatcherSchema.watchedEnd": "İzlenen görevlerin yürütülmesinin sona erdiğini işaret eden bir düzenli ifade.",
-	"NamedProblemMatcherSchema.name": "Başvuru yapılırken kullanılacak sorun eşleştiricisinin adı.",
-	"NamedProblemMatcherSchema.label": "Sorun eşleştiricisinin insanlar tarafından okunabilir etiketi.",
-	"ProblemMatcherExtPoint": "Sorun eşleştiricilerine ekleme yapar",
-	"msCompile": "Microsoft derleyici sorunları",
-	"lessCompile": "Less sorunları",
-	"gulp-tsc": "Gulp TSC Sorunları",
-	"jshint": "JSHint sorunları",
-	"jshint-stylish": "JSHint stylish sorunları",
-	"eslint-compact": "ESLint compact sorunları",
-	"eslint-stylish": "ESLint stylish sorunları",
-	"go": "Go sorunları"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/tasks/common/taskConfiguration.i18n.json b/i18n/trk/src/vs/workbench/parts/tasks/common/taskConfiguration.i18n.json
deleted file mode 100644
index 204c5be86e6..00000000000
--- a/i18n/trk/src/vs/workbench/parts/tasks/common/taskConfiguration.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"ConfigurationParser.invalidCWD": "Uyarı: options.cwd dize türünde olmalıdır. {0} değeri yok sayıldı.\n",
-	"ConfigurationParser.noargs": "Hata: komut argümanları dizelerden oluşan bir dizi olmalıdır. Belirtilen değer:\n{0}",
-	"ConfigurationParser.noShell": "Uyarı: kabuk yapılandırması sadece görevler terminalde çalıştırılırken desteklenir.",
-	"ConfigurationParser.noName": "Hata: Kapsam bildiriminde Sorun Eşleştirici'nin bir adı olmalıdır:\n{0}\n",
-	"ConfigurationParser.unknownMatcherKind": "Uyarı: tanımlanan sorun eşleştirici bilinmiyor. Desteklenen türler: dize | ProblemMatcher | (dize | ProblemMatcher)[].\n{0}\n",
-	"ConfigurationParser.invalidVaraibleReference": "Hata: Geçersiz problemMatcher başvusu: {0}\n",
-	"ConfigurationParser.noTaskName": "Hata: görevler bir taskName özelliği belirtmelidir. Görev yok sayılacaktır.\n{0}\n",
-	"taskConfiguration.shellArgs": "Uyarı: '{0}' görevi bir kabuk komutudur ve komut adı veya argümanlarından biri kaçış karakteri içermeyen boşluklar içeriyor. Doğru komut satırı alıntılamasını sağlamak için lütfen argümanları komutlarla birleştirin.",
-	"taskConfiguration.noCommandOrDependsOn": "Hata: '{0}' görevi bir komut veya dependsOn özelliği belirtmiyor. Görev yok sayılacaktır. Görevin tanımı:\n{1}",
-	"taskConfiguration.noCommand": "Hata: '{0}' görevi bir komut tanımlamıyor. Görev yok sayılacaktır. Görevin tanımı:\n{1}"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/tasks/common/taskDefinitionRegistry.i18n.json b/i18n/trk/src/vs/workbench/parts/tasks/common/taskDefinitionRegistry.i18n.json
deleted file mode 100644
index e7582c80872..00000000000
--- a/i18n/trk/src/vs/workbench/parts/tasks/common/taskDefinitionRegistry.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"TaskDefinition.description": "Gerçek görev türü. '$' ile başlayan türlerin dahili kullanım için ayrılmış olduğunu unutmayın.",
-	"TaskDefinition.properties": "Görev türünün ek özellikleri",
-	"TaskTypeConfiguration.noType": "Görev türü yapılandırmasında gerekli olan 'taskType' özelliği eksik",
-	"TaskDefinitionExtPoint": "Görev türlerine ekleme yapar"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/tasks/common/taskTemplates.i18n.json b/i18n/trk/src/vs/workbench/parts/tasks/common/taskTemplates.i18n.json
deleted file mode 100644
index 376ca4b26bc..00000000000
--- a/i18n/trk/src/vs/workbench/parts/tasks/common/taskTemplates.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"dotnetCore": ".NET Core derleme komutu çalıştırır",
-	"msbuild": "Derleme hedefini çalıştırır",
-	"externalCommand": "İsteğe bağlı bir harici komut çalıştırma örneği",
-	"Maven": "Yaygın maven komutlarını çalıştırır"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/tasks/common/taskTypeRegistry.i18n.json b/i18n/trk/src/vs/workbench/parts/tasks/common/taskTypeRegistry.i18n.json
deleted file mode 100644
index 8b6ad71cd4e..00000000000
--- a/i18n/trk/src/vs/workbench/parts/tasks/common/taskTypeRegistry.i18n.json
+++ /dev/null
@@ -1,6 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/tasks/electron-browser/jsonSchemaCommon.i18n.json b/i18n/trk/src/vs/workbench/parts/tasks/electron-browser/jsonSchemaCommon.i18n.json
deleted file mode 100644
index 1c2cb56ebc6..00000000000
--- a/i18n/trk/src/vs/workbench/parts/tasks/electron-browser/jsonSchemaCommon.i18n.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"JsonSchema.options": "Ek komut seçenekleri",
-	"JsonSchema.options.cwd": "Çalıştırılan program veya betiğin geçerli çalışma klasörü. Atlanırsa Code'un geçerli çalışma alanının kök dizini kullanılır.",
-	"JsonSchema.options.env": "Çalıştırılan program veya kabuğun ortamı. Atlanırsa üst işlemin ortamı kullanılır.",
-	"JsonSchema.shellConfiguration": "Kullanılacak kabuğu özelleştirir.",
-	"JsonSchema.shell.executable": "Kullanılacak kabuk.",
-	"JsonSchema.shell.args": "Kabuk argümanları.",
-	"JsonSchema.command": "Çalıştırılacak komut. Harici bir program veya bir kabuk komutu olabilir.",
-	"JsonSchema.tasks.args": "Bu görev çağrıldığında, komuta iletilecek argümanlar.",
-	"JsonSchema.tasks.taskName": "Görevin adı",
-	"JsonSchema.tasks.windows": "Windows'a özel komut yapılandırması",
-	"JsonSchema.tasks.mac": "Mac'e özel komut yapılandırması",
-	"JsonSchema.tasks.linux": "Linux'a özel komut yapılandırması",
-	"JsonSchema.tasks.suppressTaskName": "Görev adının komuta argüman olarak eklenip eklenmeyeceğini denetler. Atlanırsa global olarak tanımlanan değer kullanılır.",
-	"JsonSchema.tasks.showOutput": "Çalışan görev çıktısının görünüp görünmeyeceğini denetler. Atlanırsa global olarak tanımlanan değer kullanılır.",
-	"JsonSchema.echoCommand": "Çalıştırılan komutun çıktıya yazdırılıp yazdırılmayacağını denetler. Varsayılan olarak kapalıdır.",
-	"JsonSchema.tasks.watching.deprecation": "Kullanım dışı. Bunun yerine isBackground ögesini kullanın.",
-	"JsonSchema.tasks.watching": "Çalıştırılan görevin etkin tutulup tutulmadığı ve dosya sistemini izleyip izlemediği.",
-	"JsonSchema.tasks.background": "Çalıştırılan görevin etkin tutulup tutulmadığı ve arka planda çalışıp çalışmadığı.",
-	"JsonSchema.tasks.promptOnClose": "VS Code'un çalışan bir görevle kapatılırken kullanıcının uyarılıp uyarılmayacağı.",
-	"JsonSchema.tasks.build": "Bu görevi, Code'un varsayılan derleme komutuna eşler.",
-	"JsonSchema.tasks.test": "Bu görevi, Code'un varsayılan test komutuna eşler.",
-	"JsonSchema.tasks.matchers": "Kullanılacak problem eşleştirici(leri). Bir dize veya bir problem eşleştirici tanımı veya bir dize ve problem eşleştiricileri dizisi.",
-	"JsonSchema.args": "Komuta iletilecek ek argümanlar.",
-	"JsonSchema.showOutput": "Çalışan görev çıktısının görünüp görünmeyeceğini denetler. Atlanırsa \"daima\" olarak varsayılır.",
-	"JsonSchema.watching.deprecation": "Kullanım dışı. Bunun yerine isBackground ögesini kullanın.",
-	"JsonSchema.watching": "Çalıştırılan görevin etkin tutulup tutulmadığı ve dosya sistemini izleyip izlemediği.",
-	"JsonSchema.background": "Çalıştırılan görevin etkin tutulup tutulmadığı ve arka planda çalışıp çalışmadığı.",
-	"JsonSchema.promptOnClose": "VS Code'un arka planda çalışan bir görevle kapatılırken kullanıcının uyarılıp uyarılmayacağı.",
-	"JsonSchema.suppressTaskName": "Görev adının komuta argüman olarak eklenip eklenmeyeceğini denetler. Varsayılan olarak kapalıdır.",
-	"JsonSchema.taskSelector": "Bir argümanın, görev olduğunu gösterecek ön ek.",
-	"JsonSchema.matchers": "Kullanılacak problem eşleştirici(leri). Bir dize veya bir problem eşleştirici tanımı veya bir dize ve problem eşleştiricileri dizisi.",
-	"JsonSchema.tasks": "Görev yapılandırmaları. Genellikle harici görev çalıştırıcısında tanımlı görevin zenginleştirilmesidir."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v1.i18n.json b/i18n/trk/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v1.i18n.json
deleted file mode 100644
index 2de4f72c382..00000000000
--- a/i18n/trk/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v1.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"JsonSchema.version": "Yapılandırmanın sürüm numarası.",
-	"JsonSchema._runner": "\"runner\" görevini tamamladı. Resmi runner özelliğini kullanın",
-	"JsonSchema.runner": "Görevin bir işlem olarak çalıştırılıp çalıştırılmayacağını ve çıktının, çıktı penceresinde veya terminalin içinde gösterilip gösterilmeyeceğini denetler.",
-	"JsonSchema.windows": "Windows'a özel komut yapılandırması",
-	"JsonSchema.mac": "Mac'e özel komut yapılandırması",
-	"JsonSchema.linux": "Linux'a özel komut yapılandırması",
-	"JsonSchema.shell": "Komutun bir kabuk komutu veya harici bir program olup olmadığını belirtir. Atlanırsa hayır olarak kabul edilir."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json b/i18n/trk/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
deleted file mode 100644
index 05f7e742aff..00000000000
--- a/i18n/trk/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
+++ /dev/null
@@ -1,60 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"JsonSchema.shell": "Komutun bir kabuk komutu veya harici bir program olup olmadığını belirtir. Atlanırsa hayır olarak kabul edilir.",
-	"JsonSchema.tasks.isShellCommand.deprecated": "isShellCommand özelliği kullanım dışıdır. Bunun yerine görevin 'type' özelliğini ve 'options' özelliğindeki 'shell' özelliğini kullanın. Ayrıca 1.14 sürüm notlarına bakın.",
-	"JsonSchema.tasks.dependsOn.string": "Bu görevin bağlı olduğu başka bir görev.",
-	"JsonSchema.tasks.dependsOn.array": "Bu görevin bağlı olduğu diğer görevler.",
-	"JsonSchema.tasks.presentation": "Görevin çıktısını gösterip, girdisini okumak için kullanılacak paneli yapılandırır.",
-	"JsonSchema.tasks.presentation.echo": "Çalıştırılan komutun panele yazdırılıp yazdırılmayacağını denetler. Varsayılan olarak açıktır.",
-	"JsonSchema.tasks.presentation.focus": "Panelin, kendisine odaklanmaya izin verip vermeyeceğini denetler. Varsayılan olarak kapalıdır. Eğer \"true\" değeri atanırsa panel de açığa çıkar.",
-	"JsonSchema.tasks.presentation.reveal.always": "Bu görev yürütülürken terminali her zaman ortaya çıkarır.",
-	"JsonSchema.tasks.presentation.reveal.silent": "Sadece hiçbir sorun eşleştiricisi görevle ilişkilendirilmemiş ve görev çalıştırılırken hata oluşuyorsa terminali ortaya çıkar.",
-	"JsonSchema.tasks.presentation.reveal.never": "Bu görev yürütülürken terminali hiçbir zaman ortaya çıkarmaz.",
-	"JsonSchema.tasks.presentation.reveals": "Panelin çalıştırdığı görevin ortaya çıkarılıp çıkarılmayacağını denetler. Varsayılan \"always\"tir.",
-	"JsonSchema.tasks.presentation.instance": "Panelin görevler arasında paylaşılacağı mı, bu göreve mi tahsis edileceği yoksa her çalıştırmada yeni bir panel mi oluşturulacağını denetler.",
-	"JsonSchema.tasks.terminal": "'terminal' özelliği kullanım dışıdır. Bunun yerine 'presentation' özelliğini kullanın.",
-	"JsonSchema.tasks.group.kind": "Görevin yürütme grubu.",
-	"JsonSchema.tasks.group.isDefault": "Bu görevin, gruptaki varsayılan görev olup olmadığını tanımlar.",
-	"JsonSchema.tasks.group.defaultBuild": "Görevi varsayılan derleme görevi olarak işaretler.",
-	"JsonSchema.tasks.group.defaultTest": "Görevi varsayılan test görevi olarak işaretler.",
-	"JsonSchema.tasks.group.build": "Görevi 'Derleme Görevini Çalıştır' komutu ile ulaşılabilecek şekilde bir derleme görevi olarak işaretler.",
-	"JsonSchema.tasks.group.test": "Görevi 'Test Görevini Çalıştır' komutu ile ulaşılabilecek şekilde bir test görevi olarak işaretler.",
-	"JsonSchema.tasks.group.none": "Görevi grupsuz olarak atar",
-	"JsonSchema.tasks.group": "Bu görevin ait olduğu çalıştırma grubunu tanımlar. Derleme grubuna eklemek için \"build\"ı ve test grubuna eklemek için \"test\"i destekler.",
-	"JsonSchema.tasks.type": "Görevin bir işlem olarak veya bir kabukta komut olarak çalıştırılıp çalıştırılmayacağını tanımlar.",
-	"JsonSchema.command.quotedString.value": "Gerçek komut değeri",
-	"JsonSchema.tasks.quoting.escape": "Kaçış karakteri olarak kabuğun kaçış karakterini kullanır (ör. PowerShell için ` ve bash için \\).",
-	"JsonSchema.tasks.quoting.strong": "Argümanı kabuğun güçlü alıntı karakteri ile alıntı haline getirir (ör. PowerShell ve bash için \").",
-	"JsonSchema.tasks.quoting.weak": "Argümanı kabuğun zayıf alıntı karakteri ile alıntı haline getirir (ör. PowerShell ve bash için ').",
-	"JsonSchema.command.quotesString.quote": "Komut değerinin tırnak içine nasıl alınacağı.",
-	"JsonSchema.command": "Çalıştırılacak komut. Harici bir program veya bir kabuk komutu olabilir.",
-	"JsonSchema.args.quotedString.value": "Gerçek argüman değeri",
-	"JsonSchema.args.quotesString.quote": "Gerçek argüman değerinin tırnak içine nasıl alınacağı.",
-	"JsonSchema.tasks.args": "Bu görev çağrıldığında, komuta iletilecek argümanlar.",
-	"JsonSchema.tasks.label": "Görevin kullanıcı arayüzü etiketi",
-	"JsonSchema.version": "Yapılandırmanın sürüm numarası.",
-	"JsonSchema.tasks.identifier": "launch.json veya dependsOn maddesindeki göreve atıfta başvuracak, kullanıcı tanımlı bir tanımlayıcı.",
-	"JsonSchema.tasks.taskLabel": "Görevin etiketi",
-	"JsonSchema.tasks.taskName": "Görevin adı",
-	"JsonSchema.tasks.taskName.deprecated": "Görevin 'name' özelliği kullanım dışıdır. Bunun yerine label özelliğini kullanın.",
-	"JsonSchema.tasks.background": "Çalıştırılan görevin etkin tutulup tutulmadığı ve arka planda çalışıp çalışmadığı.",
-	"JsonSchema.tasks.promptOnClose": "VS Code'un çalışan bir görevle kapatılırken kullanıcının uyarılıp uyarılmayacağı.",
-	"JsonSchema.tasks.matchers": "Kullanılacak problem eşleştirici(leri). Bir dize veya bir problem eşleştirici tanımı veya bir dize ve problem eşleştiricileri dizisi.",
-	"JsonSchema.customizations.customizes.type": "Özelleştirilecek görev türü",
-	"JsonSchema.tasks.customize.deprecated": "customize özelliği kullanım dışıdır. Yeni görev özelleştirme yaklaşımına nasıl geçiş yapılacağı için 1.14 sürüm notlarına bakın",
-	"JsonSchema.tasks.showOputput.deprecated": "showOutput özelliği kullanım dışıdır. Bunun yerine presentation özelliğinin içindeki reveal özelliğini kullanın. Ayrıca 1.14 sürüm notlarına bakın.",
-	"JsonSchema.tasks.echoCommand.deprecated": "'echoCommand' özelliği kullanım dışıdır. Bunun yerine 'presentation' özelliğinin içindeki 'echo' özelliğini kullanın. Ayrıca 1.14 sürüm notlarına bakın.",
-	"JsonSchema.tasks.suppressTaskName.deprecated": "'suppressTaskName' özelliği kullanım dışıdır. Bunun yerine, komutu argümanlarıyla görevin içine ekleyin. Ayrıca 1.14 sürüm notlarına bakın.",
-	"JsonSchema.tasks.isBuildCommand.deprecated": "'isBuildCommand' özelliği kullanım dışıdır. Bunun yerine 'group' özelliğini kullanın. Ayrıca 1.14 sürüm notlarına bakın.",
-	"JsonSchema.tasks.isTestCommand.deprecated": "'isTestCommand' özelliği kullanım dışıdır. Bunun yerine 'group' özelliğini kullanın. Ayrıca 1.14 sürüm notlarına bakın.",
-	"JsonSchema.tasks.taskSelector.deprecated": "'taskSelector' özelliği kullanım dışıdır. Bunun yerine, komutu argümanlarıyla görevin içine ekleyin. Ayrıca 1.14 sürüm notlarına bakın.",
-	"JsonSchema.windows": "Windows'a özel komut yapılandırması",
-	"JsonSchema.mac": "Mac'e özel komut yapılandırması",
-	"JsonSchema.linux": "Linux'a özel komut yapılandırması"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json b/i18n/trk/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
deleted file mode 100644
index d266928557d..00000000000
--- a/i18n/trk/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
+++ /dev/null
@@ -1,89 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"tasksCategory": "Görevler",
-	"ConfigureTaskRunnerAction.label": "Görevi Yapılandır",
-	"totalErrors": "{0} Hata",
-	"totalWarnings": "{0} Uyarı",
-	"totalInfos": "{0} Bilgilendirme",
-	"problems": "Sorunlar",
-	"building": "Derleniyor...",
-	"manyProblems": "10b+",
-	"runningTasks": "Çalışan Görevleri Göster",
-	"tasks": "Görevler",
-	"TaskSystem.noHotSwap": "Aktif bir görev çalıştıran görev yürütme motorunu değiştirmek pencereyi yeniden yüklemeyi gerektirir",
-	"reloadWindow": "Pencereyi Yeniden Yükle",
-	"TaskServer.folderIgnored": "{0} klasörü, 0.1.0 görev sürümünü kullandığı için yok sayıldı.",
-	"TaskService.noBuildTask1": "Derleme görevi tanımlanmamış. tasks.json dosyasındaki bir görevi 'isBuildCommand' ile işaretleyin.",
-	"TaskService.noBuildTask2": "Derleme görevi tanımlanmamış. tasks.json dosyasındaki bir görevi, bir 'build' grubu olarak işaretleyin.",
-	"TaskService.noTestTask1": "Test görevi tanımlanmamış. tasks.json dosyasındaki bir testi 'isTestCommand' ile işaretleyin.",
-	"TaskService.noTestTask2": "Test görevi tanımlanmamış. tasks.json dosyasındaki bir görevi, bir 'test' grubu olarak işaretleyin.",
-	"TaskServer.noTask": " Çalıştırılmak istenen {0} görevi bulunamadı.",
-	"TaskService.associate": "ilişkili",
-	"TaskService.attachProblemMatcher.continueWithout": "Görev çıktısını taramadan devam et",
-	"TaskService.attachProblemMatcher.never": "Hiçbir zaman görev çıktısını tarama",
-	"TaskService.attachProblemMatcher.learnMoreAbout": "Görev çıktısını tarama hakkında daha fazla bilgi edin",
-	"selectProblemMatcher": "Görev çıktısında taranacak hata ve uyarı türlerini seçin",
-	"customizeParseErrors": "Geçerli görev yapılandırmasında hatalar var. Lütfen, bir görevi özelleştirmeden önce ilk olarak hataları düzeltin.",
-	"moreThanOneBuildTask": "tasks.json dosyasında tanımlı çok fazla derleme görevi var. İlk görev çalıştırılıyor.",
-	"TaskSystem.activeSame.background": "'{0}' görevi zaten aktif ve arka plan modunda.",
-	"TaskSystem.activeSame.noBackground": "'{0}' görevi zaten aktif.",
-	"terminateTask": "Görevi Sonlandır",
-	"restartTask": "Görevi Yeniden Başlat",
-	"TaskSystem.active": "Çalışan bir görev zaten var. Bir başkasını çalıştırmadan önce bu görevi sonlandırın.",
-	"TaskSystem.restartFailed": "{0} görevini sonlandırma ve yeniden başlatma başarısız oldu",
-	"TaskService.noConfiguration": "Hata: {0} görev algılaması aşağıdaki yapılandırma için bir görev eklemesi yapmıyor:\n{1}\nYapılandırma yok sayılacaktır.\n",
-	"TaskSystem.configurationErrors": "Hata: belirtilen görev yapılandırmasında doğrulama hataları var ve kullanılamıyor. Lütfen ilk olarak hataları düzeltin.",
-	"taskService.ignoreingFolder": "{0} çalışma alanı klasörü için görev yapılandırmaları yok sayılıyor. Birden çok klasörlü çalışma alanı görevi desteği, tüm klasörlerin 2.0.0 görev sürümünü kullanmasını gerektirir\n",
-	"TaskSystem.invalidTaskJson": "Hata: tasks.json dosyasının içeriğinde sentaks hataları var. Lütfen, bir görevi çalıştırmadan önce hataları düzeltin.\n",
-	"TaskSystem.runningTask": "Çalışan bir görev var. Bu görevi sonlandırmak istiyor musunuz?",
-	"TaskSystem.terminateTask": "&&Görevi Sonlandır",
-	"TaskSystem.noProcess": "Başlatılan görev artık mevcut değil. Eğer görev arka plan işlemleri oluşturduysa, VS Code'dan çıkmak işlemlerin sahipsiz kalmasına neden olabilir. Bunu önlemek için son arka plan işlemini bekle işaretçisiyle başlatın.",
-	"TaskSystem.exitAnyways": "Yine de &&Çık",
-	"TerminateAction.label": "Görevi Sonlandır",
-	"TaskSystem.unknownError": "Bir görev çalıştırılırken hata oluştu. Detaylar için görev günlüğüne bakın.",
-	"TaskService.noWorkspace": "Görevler, sadece çalışma alanı klasöründe mevcuttur.",
-	"recentlyUsed": "yakınlarda kullanılan görevler",
-	"configured": "yapılandırılmış görevler",
-	"detected": "algılanan görevler",
-	"TaskService.ignoredFolder": "0.1.0 görev sürümünü kullandıkları için şu çalışma alanı klasörleri yok sayıldı: {0}",
-	"TaskService.notAgain": "Tekrar Gösterme",
-	"TaskService.pickRunTask": "Çalıştırılacak görevi seçin",
-	"TaslService.noEntryToRun": "Çalıştırılacak hiçbir görev bulunamadı. Görevleri Yapılandır...",
-	"TaskService.fetchingBuildTasks": "Derleme görevleri alınıyor...",
-	"TaskService.pickBuildTask": "Çalıştırılacak derleme görevini seçin",
-	"TaskService.noBuildTask": "Çalıştırılacak hiçbir derleme görevi bulunamadı. Derleme Görevini Yapılandır...",
-	"TaskService.fetchingTestTasks": "Test görevleri alınıyor...",
-	"TaskService.pickTestTask": "Çalıştırılacak test görevini seçin",
-	"TaskService.noTestTaskTerminal": "Çalıştırılacak hiçbir test görevi bulunamadı. Görevleri Yapılandır...",
-	"TaskService.tastToTerminate": "Sonlandırılacak görevi seçin",
-	"TaskService.noTaskRunning": "Şu an çalışan bir görev yok",
-	"TerminateAction.noProcess": "Başlatılan işlem artık mevcut değil. Eğer görev arka plan görevleri oluşturduysa, VS Code'dan çıkmak işlemlerin sahipsiz kalmasına neden olabilir.",
-	"TerminateAction.failed": "Çalışan görevi sonlandırma başarısız oldu.",
-	"TaskService.tastToRestart": "Yeniden başlatılacak görevi seçin",
-	"TaskService.noTaskToRestart": "Yeniden başlatılacak bir görev yok",
-	"TaskService.template": "Bir Görev Şablonu Seçin",
-	"TaskService.createJsonFile": "Şablondan tasks.json dosyası oluştur",
-	"TaskService.openJsonFile": "tasks.json dosyasını aç",
-	"TaskService.pickTask": "Yapılandırmak için bir görev seçin",
-	"TaskService.defaultBuildTaskExists": "{0} zaten varsayılan derleme görevi olarak işaretlenmiş",
-	"TaskService.pickDefaultBuildTask": "Varsayılan derleme görevi olarak kullanılacak görevi seçin",
-	"TaskService.defaultTestTaskExists": "{0} zaten varsayılan test görevi olarak işaretlenmiş.",
-	"TaskService.pickDefaultTestTask": "Varsayılan test görevi olarak kullanılacak görevi seçin",
-	"TaskService.pickShowTask": "Çıktısını göstermek için görev seçin",
-	"TaskService.noTaskIsRunning": "Çalışan bir görev yok",
-	"ShowLogAction.label": "Görev Günlüğünü Göster",
-	"RunTaskAction.label": "Görevi Çalıştır",
-	"RestartTaskAction.label": "Çalışan Görevi Yeniden Başlat",
-	"ShowTasksAction.label": "Çalışan Görevleri Göster",
-	"BuildAction.label": "Derleme Görevini Çalıştır",
-	"TestAction.label": "Test Görevini Çalıştır",
-	"ConfigureDefaultBuildTask.label": "Varsayılan Derleme Görevini Yapılandır",
-	"ConfigureDefaultTestTask.label": "Varsayılan Test Görevini Yapılandır",
-	"quickOpen.task": "Görevi Çalıştır"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/tasks/electron-browser/taskPanel.i18n.json b/i18n/trk/src/vs/workbench/parts/tasks/electron-browser/taskPanel.i18n.json
deleted file mode 100644
index 3ccc17b2b32..00000000000
--- a/i18n/trk/src/vs/workbench/parts/tasks/electron-browser/taskPanel.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"tasks": "Görevler"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.i18n.json b/i18n/trk/src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.i18n.json
deleted file mode 100644
index 1f10ca399e7..00000000000
--- a/i18n/trk/src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"TerminalTaskSystem.unknownError": "Görev çalıştırılırken bir hata oluştu. Detaylar için görev çıktısı günlüğüne bakın.",
-	"dependencyFailed": "'{1}' çalışma alanı klasöründe, '{0}' bağımlı görevi çözümlenemiyor",
-	"TerminalTaskSystem.terminalName": "Görev - {0}",
-	"closeTerminal": "Terminali kapatmak için lütfen bir tuşa basın.",
-	"reuseTerminal": "Terminal görevler tarafından tekrar kullanılacak, kapatmak için herhangi bir tuşa basın.",
-	"TerminalTaskSystem": "cmd.exe kullanarak UNC sürücüsünde kabuk komutu yürütülemiyor.",
-	"unkownProblemMatcher": "{0} sorun eşleştirici çözümlenemiyor. Eşleştirici yok sayılacaktır."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/tasks/node/processRunnerDetector.i18n.json b/i18n/trk/src/vs/workbench/parts/tasks/node/processRunnerDetector.i18n.json
deleted file mode 100644
index 53669494622..00000000000
--- a/i18n/trk/src/vs/workbench/parts/tasks/node/processRunnerDetector.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"TaskSystemDetector.noGulpTasks": "gulp --tasks-simple komutu çalıştırıldığında herhangi bir görev listelemedi. npm install komutunu çalıştırdınız mı?",
-	"TaskSystemDetector.noJakeTasks": "jake --tasks komutu çalıştırıldığında herhangi bir görev listelemedi. npm install komutunu çalıştırdınız mı?",
-	"TaskSystemDetector.noGulpProgram": "Gulp, sisteminizde yüklü değil. Yüklemek için npm install -g gulp komutunu çalıştırın.",
-	"TaskSystemDetector.noJakeProgram": "Jake, sisteminizde yüklü değil. Yüklemek için npm install -g jake komutunu çalıştırın.",
-	"TaskSystemDetector.noGruntProgram": "Grunt, sisteminizde yüklü değil. Yüklemek için npm install -g grunt komutunu çalıştırın.",
-	"TaskSystemDetector.noProgram": "{0} programı bulunamadı. Mesaj: {1}",
-	"TaskSystemDetector.buildTaskDetected": "'{0}' olarak adlandırılmış derleme görevi algılandı.",
-	"TaskSystemDetector.testTaskDetected": "'{0}' olarak adlandırılmış test görevi algılandı."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/tasks/node/processTaskSystem.i18n.json b/i18n/trk/src/vs/workbench/parts/tasks/node/processTaskSystem.i18n.json
deleted file mode 100644
index a188d4a77e8..00000000000
--- a/i18n/trk/src/vs/workbench/parts/tasks/node/processTaskSystem.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"TaskRunnerSystem.unknownError": "Görev çalıştırılırken bir hata oluştu. Detaylar için görev çıktısı günlüğüne bakın.",
-	"TaskRunnerSystem.watchingBuildTaskFinished": "\nDerleme görevlerinin izlenmesi bitti.",
-	"TaskRunnerSystem.childProcessError": "Harici program {0} {1} başlatılamadı.",
-	"TaskRunnerSystem.cancelRequested": "\n'{0}' görevi kullanıcı isteği üzerine sonlandırıldı.",
-	"unkownProblemMatcher": "{0} sorun eşleştirici çözümlenemiyor. Eşleştirici yok sayılacaktır."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json b/i18n/trk/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
deleted file mode 100644
index 22ab290691f..00000000000
--- a/i18n/trk/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"ConfigurationParser.invalidCWD": "Uyarı: options.cwd dize türünde olmalıdır. {0} değeri yok sayıldı.\n",
-	"ConfigurationParser.inValidArg": "Hata: komut argümanı bir dize veya tırnak içinde bir dize olmalıdır. Belirtilen değer:\n{0}",
-	"ConfigurationParser.noargs": "Hata: komut argümanları dizelerden oluşan bir dizi olmalıdır. Belirtilen değer:\n{0}",
-	"ConfigurationParser.noShell": "Uyarı: kabuk yapılandırması sadece görevler terminalde çalıştırılırken desteklenir.",
-	"ConfigurationParser.noName": "Hata: Kapsam bildiriminde Sorun Eşleştirici'nin bir adı olmalıdır:\n{0}\n",
-	"ConfigurationParser.unknownMatcherKind": "Uyarı: tanımlanan sorun eşleştirici bilinmiyor. Desteklenen türler: dize | ProblemMatcher | (dize | ProblemMatcher)[].\n{0}\n",
-	"ConfigurationParser.invalidVaraibleReference": "Hata: Geçersiz problemMatcher başvusu: {0}\n",
-	"ConfigurationParser.noTaskType": "Hata: 'tasks' yapılandırması bir 'type' özelliğine sahip olmalıdır. Yapılandırma yok sayılacaktır.\n{0}\n",
-	"ConfigurationParser.noTypeDefinition": "Hata: '{0}' olarak kayıtlı bir görev türü yok. İlgili görev sağlayıcısını içeren bir eklentiyi yüklemeyi mi unuttunuz?",
-	"ConfigurationParser.missingRequiredProperty": "Hata: ihtiyaç duyulan '{1}' özelliği, '{0}' görev yapılandırmasında eksik. Görev yapılandırması yok sayılacaktır.",
-	"ConfigurationParser.notCustom": "Hata: 'tasks' bir özel görev olarak tanımlanmamış. Yapılandırma yok sayılacaktır.\n{0}\n",
-	"ConfigurationParser.noTaskName": "Hata: bir görev, bir 'label' özelliği belirtmelidir. Görev yok sayılacaktır.\n{0}\n",
-	"taskConfiguration.noCommandOrDependsOn": "Hata: '{0}' görevi bir komut veya dependsOn özelliği belirtmiyor. Görev yok sayılacaktır. Görevin tanımı:\n{1}",
-	"taskConfiguration.noCommand": "Hata: '{0}' görevi bir komut tanımlamıyor. Görev yok sayılacaktır. Görevin tanımı:\n{1}",
-	"TaskParse.noOsSpecificGlobalTasks": "2.0.0 görev sürümü genel işletim sistemi özel görevlerini desteklemiyor. Bunları işletim sistemine özel komut içeren bir göreve çevirin. Etkilenen görevler:\n{0}"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.i18n.json b/i18n/trk/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.i18n.json
deleted file mode 100644
index 854c812cb04..00000000000
--- a/i18n/trk/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.i18n.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"termEntryAriaLabel": "{0}, terminal seçici",
-	"termCreateEntryAriaLabel": "{0}, yeni terminal oluştur",
-	"workbench.action.terminal.newplus": "$(plus) Yeni Entegre Terminal Oluştur",
-	"noTerminalsMatching": "Eşleşen terminal yok",
-	"noTerminalsFound": "Açık terminal yok"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/terminal/common/terminalColorRegistry.i18n.json b/i18n/trk/src/vs/workbench/parts/terminal/common/terminalColorRegistry.i18n.json
deleted file mode 100644
index 9ae8066e173..00000000000
--- a/i18n/trk/src/vs/workbench/parts/terminal/common/terminalColorRegistry.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"terminal.background": "Terminalin arka plan rengi; bu, terminalin panelden farklı olarak renklendirilmesini sağlar.",
-	"terminal.foreground": "Terminalin ön plan rengi.",
-	"terminalCursor.foreground": "Terminal imlecinin ön plan rengi.",
-	"terminalCursor.background": "Terminal imlecinin arka plan rengi. Bir blok imlecinin kapladığı bir karakterin rengini özelleştirmeyi sağlar.",
-	"terminal.selectionBackground": "Terminalin seçim arkaplanı rengi.",
-	"terminal.border": "Terminaldeki bölmeleri ayıran kenarlığın rengi. panel.border bunun için varsayılan olarak kullanılır.",
-	"terminal.ansiColor": "Terminalde '{0}' ANSI rengi."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json b/i18n/trk/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
deleted file mode 100644
index cadddf5c98c..00000000000
--- a/i18n/trk/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"quickOpen.terminal": "Tüm Açık Terminalleri Göster",
-	"terminal": "Terminal",
-	"terminalIntegratedConfigurationTitle": "Entegre Terminal",
-	"terminal.integrated.shell.linux": "Terminalin Linux'da kullandığı kabuğun yolu.",
-	"terminal.integrated.shellArgs.linux": "Linux terminalindeyken kullanılacak komut satırı argümanları.",
-	"terminal.integrated.shell.osx": "Terminalin OS X'de kullandığı kabuğun yolu.",
-	"terminal.integrated.shellArgs.osx": "OS X terminalindeyken kullanılacak komut satırı argümanları.",
-	"terminal.integrated.shell.windows": "Terminalin Windows'da kullandığı kabuğun yolu. Windows ile birlikte gelen kabukları kullanırken (cmd, PowerShell veya Bash on Ubuntu) uygulanır.",
-	"terminal.integrated.shellArgs.windows": "Windows terminalindeyken kullanılacak komut satırı argümanları.",
-	"terminal.integrated.macOptionIsMeta": "macOS'de terminalde option tuşuna, meta tuşu gibi davran.",
-	"terminal.integrated.copyOnSelection": "Ayarlandığında, terminalde seçilen metin panoya kopyalanır.",
-	"terminal.integrated.fontFamily": "Terminalin yazı tipi ailesini denetler; bu, varsayılan olarak editor.fontFamily'nin değeridir.",
-	"terminal.integrated.fontSize": "Terminaldeki yazı tipi boyutunu piksel olarak denetler.",
-	"terminal.integrated.lineHeight": "Terminalin satır yüksekliğini denetler, bu sayı gerçek satır yüksekliğini piksel olarak elde etmek için terminal yazı tipi boyutu ile çarpılır.",
-	"terminal.integrated.fontWeight": "Terminalde kalın olmayan metinler için kullanılacak yazı tipi kalınlığı.",
-	"terminal.integrated.fontWeightBold": "Terminalde kalın metinler için kullanılacak yazı tipi kalınlığı.",
-	"terminal.integrated.cursorBlinking": "Terminaldeki imlecin yanıp sönmesini denetler.",
-	"terminal.integrated.cursorStyle": "Terminaldeki imlecin stilini denetler.",
-	"terminal.integrated.scrollback": "Terminalin tamponunda tuttuğu maksimum satır sayısını denetler.",
-	"terminal.integrated.setLocaleVariables": "Terminal başlangıcında yereli içeren değişkenlerin ayarlanıp ayarlanmayacağını denetler; bu, OS X'de varsayılan olarak açıktır, diğer platformlarda kapalıdır.",
-	"terminal.integrated.rightClickBehavior": "Terminalin sağ tıklamaya nasıl tepki vereceğini denetler, olası değerler \"default\", \"copyPaste\" ve \"selectWord\"dür. \"default\" bağlam menüsünü gösterir, \"copyPaste\" bir seçim varsa kopyalar yoksa yapıştırır, \"selectWord\" imlecin altındaki sözcüğü seçer ve bağlam menüsünü gösterir.",
-	"terminal.integrated.cwd": "Terminalin nerede başlatılacağına ait açık bir yol; bu, kabuk işlemleri için geçerli çalışma klasörü (cwd) olarak kullanılır. Bu, çalışma alanı ayarlarında kök dizini uygun bir cwd değilse özellikle yararlı olabilir.",
-	"terminal.integrated.confirmOnExit": "Aktif terminal oturumları varken çıkışta onay istenip istenmeyeceği.",
-	"terminal.integrated.enableBell": "Terminal zilinin etkin olup olmadığı.",
-	"terminal.integrated.commandsToSkipShell": "Tuş bağlarının kabuğa gönderilmeyip bunun yerine her zaman Code tarafından işleneceği bir komut ID'leri kümesi. Bu, tuş bağlarının normalde kabuk tarafından terminal odakta değilken nasılsa öyle davranmasını sağlar, örnek olarak Hızlı Aç'ı başlatmak için ctrl+p.",
-	"terminal.integrated.env.osx": "OS X'deki terminal tarafından kullanılacak VS Code işlemine eklenecek ortam değişkenlerini içeren nesne",
-	"terminal.integrated.env.linux": "Linux'daki terminal tarafından kullanılacak VS Code işlemine eklenecek ortam değişkenlerini içeren nesne",
-	"terminal.integrated.env.windows": "Windows'daki terminal tarafından kullanılacak VS Code işlemine eklenecek ortam değişkenlerini içeren nesne",
-	"terminal.integrated.showExitAlert": "Çıkış kodu sıfır değilse `Terminal işlemi çıkış koduyla sonlandı` uyarısını göster.",
-	"terminal.integrated.experimentalRestore": "VS Code'u başlatırken, çalışma alanı için otomatik olarak terminal oturumlarının geri yüklenip yüklenmeyeceği. Bu deneysel bir ayardır; hatalı olabilir ve ilerleyen zamanlarda değişebilir.",
-	"terminalCategory": "Terminal",
-	"viewCategory": "Görüntüle"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json b/i18n/trk/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
deleted file mode 100644
index 0dfa05cd791..00000000000
--- a/i18n/trk/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
+++ /dev/null
@@ -1,63 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"workbench.action.terminal.toggleTerminal": "Entegre Terminali Aç/Kapat",
-	"workbench.action.terminal.kill": "Aktif Terminal Örneğini Sonlandır",
-	"workbench.action.terminal.kill.short": "Terminali Sonlandır",
-	"workbench.action.terminal.quickKill": "Terminal Örneğini Sonlandır",
-	"workbench.action.terminal.copySelection": "Seçimi Kopyala",
-	"workbench.action.terminal.selectAll": "Tümünü Seç",
-	"workbench.action.terminal.deleteWordLeft": "Soldaki Sözcüğü Sil",
-	"workbench.action.terminal.deleteWordRight": "Sağdaki Sözcüğü Sil",
-	"workbench.action.terminal.moveToLineStart": "Satır Başına Git",
-	"workbench.action.terminal.moveToLineEnd": "Satır Sonuna Git",
-	"workbench.action.terminal.new": "Yeni Entegre Terminal Oluştur",
-	"workbench.action.terminal.new.short": "Yeni Terminal",
-	"workbench.action.terminal.newWorkspacePlaceholder": "Yeni terminal için geçerli çalışma dizinini seçin",
-	"workbench.action.terminal.newInActiveWorkspace": "(Aktif Çalışma Alanında) Yeni Entegre Terminal Oluştur",
-	"workbench.action.terminal.split": "Terminali Böl",
-	"workbench.action.terminal.splitInActiveWorkspace": "(Aktif Çalışma Alanında) Terminali Böl",
-	"workbench.action.terminal.focusPreviousPane": "Önceki Bölmeye Odakla",
-	"workbench.action.terminal.focusNextPane": "Sonraki Bölmeye Odakla",
-	"workbench.action.terminal.resizePaneLeft": "Bölmeyi Sola Doğru Yeniden Boyutlandır",
-	"workbench.action.terminal.resizePaneRight": "Bölmeyi Sağa Doğru Yeniden Boyutlandır",
-	"workbench.action.terminal.resizePaneUp": "Bölmeyi Yukarı Doğru Yeniden Boyutlandır",
-	"workbench.action.terminal.resizePaneDown": "Bölmeyi Aşağı Doğru Yeniden Boyutlandır",
-	"workbench.action.terminal.focus": "Terminale Odakla",
-	"workbench.action.terminal.focusNext": "Sonraki Terminale Odakla",
-	"workbench.action.terminal.focusPrevious": "Önceki Terminale Odakla",
-	"workbench.action.terminal.paste": "Aktif Terminale Yapıştır",
-	"workbench.action.terminal.DefaultShell": "Varsayılan Kabuğu Seç",
-	"workbench.action.terminal.runSelectedText": "Seçili Metni Aktif Terminalde Çalıştır",
-	"workbench.action.terminal.runActiveFile": "Aktif Dosyayı Aktif Terminalde Çalıştır",
-	"workbench.action.terminal.runActiveFile.noFile": "Sadece diskteki dosyalar terminalde çalıştırılabilir",
-	"workbench.action.terminal.switchTerminal": "Terminali Değiştir",
-	"workbench.action.terminal.scrollDown": "Aşağı Kaydır (Satır)",
-	"workbench.action.terminal.scrollDownPage": "Aşağı Kaydır (Sayfa)",
-	"workbench.action.terminal.scrollToBottom": "En Alta Kaydır",
-	"workbench.action.terminal.scrollUp": "Yukarı Kaydır (Satır)",
-	"workbench.action.terminal.scrollUpPage": "Yukarı Kaydır (Sayfa)",
-	"workbench.action.terminal.scrollToTop": "En Üste Kaydır",
-	"workbench.action.terminal.clear": "Temizle",
-	"workbench.action.terminal.clearSelection": "Seçimi Temizle",
-	"workbench.action.terminal.allowWorkspaceShell": "Çalışma Alanı Kabuk Yapılandırmasına İzin Ver",
-	"workbench.action.terminal.disallowWorkspaceShell": "Çalışma Alanı Kabuk Yapılandırmasına İzin Verme",
-	"workbench.action.terminal.rename": "Yeniden Adlandır",
-	"workbench.action.terminal.rename.prompt": "Terminal adını girin",
-	"workbench.action.terminal.focusFindWidget": "Bulma Aracına Odakla",
-	"workbench.action.terminal.hideFindWidget": "Bulma Aracını Gizle",
-	"nextTerminalFindTerm": "Sonraki Arama Terimini Göster",
-	"previousTerminalFindTerm": "Önceki Arama Terimini Göster",
-	"quickOpenTerm": "Aktif Terminali Değiştir",
-	"workbench.action.terminal.scrollToPreviousCommand": "Önceki Komuta Kadar Kaydır",
-	"workbench.action.terminal.scrollToNextCommand": "Sonraki Komuta Kadar Kaydır",
-	"workbench.action.terminal.selectToPreviousCommand": "Önceki Komuta Kadar Seç",
-	"workbench.action.terminal.selectToNextCommand": "Sonraki Komuta Kadar Seç",
-	"workbench.action.terminal.selectToPreviousLine": "Önceki Satıra Kadar Seç",
-	"workbench.action.terminal.selectToNextLine": "Sonraki Satıra Kadar Seç"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json b/i18n/trk/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
deleted file mode 100644
index 9ae8066e173..00000000000
--- a/i18n/trk/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"terminal.background": "Terminalin arka plan rengi; bu, terminalin panelden farklı olarak renklendirilmesini sağlar.",
-	"terminal.foreground": "Terminalin ön plan rengi.",
-	"terminalCursor.foreground": "Terminal imlecinin ön plan rengi.",
-	"terminalCursor.background": "Terminal imlecinin arka plan rengi. Bir blok imlecinin kapladığı bir karakterin rengini özelleştirmeyi sağlar.",
-	"terminal.selectionBackground": "Terminalin seçim arkaplanı rengi.",
-	"terminal.border": "Terminaldeki bölmeleri ayıran kenarlığın rengi. panel.border bunun için varsayılan olarak kullanılır.",
-	"terminal.ansiColor": "Terminalde '{0}' ANSI rengi."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/terminal/electron-browser/terminalConfigHelper.i18n.json b/i18n/trk/src/vs/workbench/parts/terminal/electron-browser/terminalConfigHelper.i18n.json
deleted file mode 100644
index fe40ced76f3..00000000000
--- a/i18n/trk/src/vs/workbench/parts/terminal/electron-browser/terminalConfigHelper.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"terminal.integrated.allowWorkspaceShell": "{0} ögesinin (çalışma alanı ayarı olarak tanımlı) terminalde başlatılmasına izin  veriyor musunuz?",
-	"allow": "İzin Ver",
-	"disallow": "İzin Verme"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/terminal/electron-browser/terminalFindWidget.i18n.json b/i18n/trk/src/vs/workbench/parts/terminal/electron-browser/terminalFindWidget.i18n.json
deleted file mode 100644
index baad53fc2a4..00000000000
--- a/i18n/trk/src/vs/workbench/parts/terminal/electron-browser/terminalFindWidget.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"label.find": "Bul",
-	"placeholder.find": "Bul",
-	"label.previousMatchButton": "Önceki eşleşme",
-	"label.nextMatchButton": "Sonraki eşleşme",
-	"label.closeButton": "Kapat"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json b/i18n/trk/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json
deleted file mode 100644
index 69d4953e71c..00000000000
--- a/i18n/trk/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"terminal.integrated.a11yBlankLine": "Boş satır",
-	"terminal.integrated.a11yPromptLabel": "Terminal girdisi",
-	"terminal.integrated.a11yTooMuchOutput": "Gösterilecek çok fazla çıktı var, okumak için satırları manuel olarak gezin.",
-	"yes": "Evet",
-	"no": "Hayır",
-	"dontShowAgain": "Tekrar Gösterme",
-	"terminal.integrated.copySelection.noSelection": "Terminalde kopyalanacak bir seçim bulunmuyor",
-	"terminal.integrated.exitedWithCode": "Terminal işlemi şu çıkış koduyla sonlandı: {0}",
-	"terminal.integrated.waitOnExit": "Terminali kapatmak için lütfen bir tuşa basın",
-	"terminal.integrated.launchFailed": "Terminal işlem komutu '{0}{1}' başlatılamadı (çıkış kodu: {2})",
-	"terminal.integrated.launchFailedExtHost": "Terminal işlemi başlatılamadı (çıkış kodu: {0})"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/terminal/electron-browser/terminalLinkHandler.i18n.json b/i18n/trk/src/vs/workbench/parts/terminal/electron-browser/terminalLinkHandler.i18n.json
deleted file mode 100644
index 014118a8586..00000000000
--- a/i18n/trk/src/vs/workbench/parts/terminal/electron-browser/terminalLinkHandler.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"terminalLinkHandler.followLinkAlt": "Bağlantıyı izlemek için Alt tuşuna basarak tıklayın",
-	"terminalLinkHandler.followLinkCmd": "Bağlantıyı izlemek için Cmd tuşuna basarak tıklayın",
-	"terminalLinkHandler.followLinkCtrl": "Bağlantıyı izlemek için Ctrl tuşuna basarak tıklayın"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json b/i18n/trk/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json
deleted file mode 100644
index cc4292491fa..00000000000
--- a/i18n/trk/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"terminal.useMonospace": "'monospace' (tek aralıklı) kullan",
-	"terminal.monospaceOnly": "Terminal sadece tek aralıklı yazı tiplerini destekliyor.",
-	"copy": "Kopyala",
-	"split": "Böl",
-	"paste": "Yapıştır",
-	"selectAll": "Tümünü Seç",
-	"clear": "Temizle"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json b/i18n/trk/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
deleted file mode 100644
index fc73a2254fd..00000000000
--- a/i18n/trk/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"terminal.integrated.chooseWindowsShellInfo": "Özelleştir butonuna tıklayıp varsayılan terminal kabuğunu seçebilirsiniz.",
-	"customize": "Özelleştir",
-	"never again": "Tekrar Gösterme",
-	"terminal.integrated.chooseWindowsShell": "Tercih ettiğiniz terminal kabuğunu seçin, bunu daha sonra ayarlarınızdan değiştirebilirsiniz",
-	"terminalService.terminalCloseConfirmationSingular": "Aktif bir terminal oturumu var, sonlandırmak istiyor musunuz?",
-	"terminalService.terminalCloseConfirmationPlural": "{0} aktif terminal oturumu var, bunları sonlandırmak istiyor musunuz?"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/themes/electron-browser/themes.contribution.i18n.json b/i18n/trk/src/vs/workbench/parts/themes/electron-browser/themes.contribution.i18n.json
deleted file mode 100644
index 7991ab9d5a4..00000000000
--- a/i18n/trk/src/vs/workbench/parts/themes/electron-browser/themes.contribution.i18n.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"selectTheme.label": "Renk Teması",
-	"themes.category.light": "açık temalar",
-	"themes.category.dark": "koyu temalar",
-	"themes.category.hc": "yüksek karşıtlık temaları",
-	"installColorThemes": "Ek Renk Temaları Yükle...",
-	"themes.selectTheme": "Bir Renk Teması Seç (Yukarı/Aşağı Tuşlarıyla Önizleme Yap)",
-	"selectIconTheme.label": "Dosya Simgesi Teması",
-	"noIconThemeLabel": "Hiçbiri",
-	"noIconThemeDesc": "Dosya simgelerini devre dışı bırak",
-	"installIconThemes": "Ek Dosya Simgesi Temaları Yükle...",
-	"themes.selectIconTheme": "Dosya Simgesi Teması Seç",
-	"generateColorTheme.label": "Geçerli Ayarlardan Renk Teması Oluştur",
-	"preferences": "Tercihler",
-	"developer": "Geliştirici"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/trust/electron-browser/unsupportedWorkspaceSettings.contribution.i18n.json b/i18n/trk/src/vs/workbench/parts/trust/electron-browser/unsupportedWorkspaceSettings.contribution.i18n.json
deleted file mode 100644
index ecea8c0b753..00000000000
--- a/i18n/trk/src/vs/workbench/parts/trust/electron-browser/unsupportedWorkspaceSettings.contribution.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openWorkspaceSettings": "Çalışma Alanı Ayarlarını Aç",
-	"dontShowAgain": "Tekrar Gösterme",
-	"unsupportedWorkspaceSettings": "Bu çalışma alanı sadece Kullanıcı Ayarları'nda ayarlanabilen ayarlar içeriyor. ({0}). Daha fazla bilgi almak için [buraya]({0}) tıklayın."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json b/i18n/trk/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json
deleted file mode 100644
index 2cfd79cc9e0..00000000000
--- a/i18n/trk/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"releaseNotesInputName": "Sürüm Notları: {0}",
-	"unassigned": "atanmamış"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/update/electron-browser/releaseNotesInput.i18n.json b/i18n/trk/src/vs/workbench/parts/update/electron-browser/releaseNotesInput.i18n.json
deleted file mode 100644
index ab9d9115952..00000000000
--- a/i18n/trk/src/vs/workbench/parts/update/electron-browser/releaseNotesInput.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"releaseNotesInputName": "Sürüm Notları: {0}"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/update/electron-browser/update.contribution.i18n.json b/i18n/trk/src/vs/workbench/parts/update/electron-browser/update.contribution.i18n.json
deleted file mode 100644
index d22b047f38c..00000000000
--- a/i18n/trk/src/vs/workbench/parts/update/electron-browser/update.contribution.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"release notes": "Sürüm notları"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/update/electron-browser/update.i18n.json b/i18n/trk/src/vs/workbench/parts/update/electron-browser/update.i18n.json
deleted file mode 100644
index f7e01d490d6..00000000000
--- a/i18n/trk/src/vs/workbench/parts/update/electron-browser/update.i18n.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"releaseNotes": "Sürüm Notları",
-	"showReleaseNotes": "Sürüm Notlarını Göster",
-	"read the release notes": "{0} v{1} uygulamasına hoş geldiniz! Sürüm Notları'nı okumak ister misiniz?",
-	"licenseChanged": "Lisans koşullarımız değişti, lütfen [buraya]({0}) tıklayarak gözden geçirin.",
-	"neveragain": "Tekrar Gösterme",
-	"64bitisavailable": "64-bit Windows için {0} şu an mevcut! Daha fazla bilgi almak için [buraya]({0}) tıklayın.",
-	"updateIsReady": "Yeni {0} güncellemesi var.",
-	"noUpdatesAvailable": "Şu anda mevcut herhangi bir güncelleme yok.",
-	"ok": "Tamam",
-	"thereIsUpdateAvailable": "Bir güncelleştirme var.",
-	"download now": "Şimdi İndir",
-	"later": "Daha Sonra",
-	"updateAvailable": "Bir güncelleştirme var: {0} {1}",
-	"installUpdate": "Güncelleştirmeyi Yükle",
-	"updateInstalling": "{0} {1} arka planda yükleniyor, bittiğinde bilgi vereceğiz.",
-	"updateAvailableAfterRestart": "En son güncellemeyi uygulamak için {0} uygulamasını yeniden başlatın.",
-	"updateNow": "Şimdi Güncelle",
-	"commandPalette": "Komut Paleti...",
-	"settings": "Ayarlar",
-	"keyboardShortcuts": "Klavye Kısayolları",
-	"showExtensions": "Eklentileri Yönet",
-	"userSnippets": "Kullanıcı Parçacıkları",
-	"selectTheme.label": "Renk Teması",
-	"themes.selectIconTheme.label": "Dosya Simgesi Teması",
-	"checkForUpdates": "Güncelleştirmeleri Denetle...",
-	"checkingForUpdates": "Güncelleştirmeler Denetleniyor...",
-	"DownloadingUpdate": "Güncelleştirme İndiriliyor...",
-	"installUpdate...": "Güncelleştirmeyi Yükle...",
-	"installingUpdate": "Güncelleştirme Yükleniyor...",
-	"restartToUpdate": "Güncelleştirmek için Yeniden Başlatın..."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/url/electron-browser/url.contribution.i18n.json b/i18n/trk/src/vs/workbench/parts/url/electron-browser/url.contribution.i18n.json
deleted file mode 100644
index b2ceac0c291..00000000000
--- a/i18n/trk/src/vs/workbench/parts/url/electron-browser/url.contribution.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openUrl": "URL Aç",
-	"developer": "Geliştirici"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/views/browser/views.i18n.json b/i18n/trk/src/vs/workbench/parts/views/browser/views.i18n.json
deleted file mode 100644
index fe27ce7154b..00000000000
--- a/i18n/trk/src/vs/workbench/parts/views/browser/views.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"viewToolbarAriaLabel": "{0} eylem",
-	"hideView": "Kenar Çubuğunda Gizle"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/views/browser/viewsExtensionPoint.i18n.json b/i18n/trk/src/vs/workbench/parts/views/browser/viewsExtensionPoint.i18n.json
deleted file mode 100644
index eb1981b1969..00000000000
--- a/i18n/trk/src/vs/workbench/parts/views/browser/viewsExtensionPoint.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"requirearray": "görünümler bir dizi olmalıdır",
-	"requirestring": "`{0}` özelliği zorunludur ve `string` türünde olmalıdır",
-	"optstring": "`{0}` özelliği atlanabilir veya `string` türünde olmalıdır",
-	"vscode.extension.contributes.view.id": "Görünümün tanımlayıcısı. Bunu, `vscode.window.registerTreeDataProviderForView` API ile bir veri sağlayıcısı kaydetmek için kullanın. Ayrıca `onView:${id}` olayını `activationEvents` ögesine kaydederek eklentinizi etkinleştirmeyi tetikleyin.",
-	"vscode.extension.contributes.view.name": "Görünümün insanlar tarafından okunabilir adı. Gösterilecektir",
-	"vscode.extension.contributes.view.when": "Bu görünümü göstermek için doğru olması gereken koşul",
-	"vscode.extension.contributes.views": "Görünümleri düzenleyiciye ekler.",
-	"views.explorer": "Gezgin Görünümü",
-	"views.debug": "Hata Ayıklama Görünümü",
-	"locationId.invalid": "`{0}` geçerli bir görünüm konumu değil"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/watermark/electron-browser/watermark.i18n.json b/i18n/trk/src/vs/workbench/parts/watermark/electron-browser/watermark.i18n.json
deleted file mode 100644
index aa49f4e3f01..00000000000
--- a/i18n/trk/src/vs/workbench/parts/watermark/electron-browser/watermark.i18n.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"watermark.showCommands": "Tüm Komutları Göster",
-	"watermark.quickOpen": "Dosyaya Git",
-	"watermark.openFile": "Dosya Aç",
-	"watermark.openFolder": "Klasör Aç",
-	"watermark.openFileFolder": "Dosya veya Klasör Aç",
-	"watermark.openRecent": "Son Kullanılanları Aç",
-	"watermark.newUntitledFile": "Yeni İsimsiz Dosya",
-	"watermark.toggleTerminal": "Terminali Aç/Kapat",
-	"watermark.findInFiles": "Dosyalarda Bul",
-	"watermark.startDebugging": "Hata Ayıklamaya Başla",
-	"watermark.unboundCommand": "serbest",
-	"workbenchConfigurationTitle": "Çalışma Ekranı",
-	"tips.enabled": "Etkinleştirildiğinde, hiçbir düzenleyici açık değilken filigran ipuçları gösterir"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json b/i18n/trk/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json
deleted file mode 100644
index 402fef291ee..00000000000
--- a/i18n/trk/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"webview.editor.label": "web görünümü düzenleyicisi",
-	"developer": "Geliştirici"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/webview/electron-browser/webviewCommands.i18n.json b/i18n/trk/src/vs/workbench/parts/webview/electron-browser/webviewCommands.i18n.json
deleted file mode 100644
index 13712f3e4c5..00000000000
--- a/i18n/trk/src/vs/workbench/parts/webview/electron-browser/webviewCommands.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openToolsLabel": "Web Görünümü Geliştirici Araçlarını Aç",
-	"refreshWebviewLabel": "Web Görünümlerini Yeniden Yükle"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json b/i18n/trk/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json
deleted file mode 100644
index 06a856662b9..00000000000
--- a/i18n/trk/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"telemetryOptOut.optOutNotice": "Microsoft'un kullanım verilerini toplamasına izin vererek VS Code'u geliştirin. [Gizlilik beyanımızı]({0}) okuyun ve nasıl [vazgeçebileceğinizi]({1}) öğrenin.",
-	"telemetryOptOut.optInNotice": "Microsoft'un kullanım verilerini toplamasına izin vererek VS Code'u geliştirin. [Gizlilik beyanımızı]({0}) okuyun ve nasıl [etkinleştirebileceğinizi]({1}) öğrenin.",
-	"telemetryOptOut.readMore": "Devamını oku"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/welcome/overlay/browser/welcomeOverlay.i18n.json b/i18n/trk/src/vs/workbench/parts/welcome/overlay/browser/welcomeOverlay.i18n.json
deleted file mode 100644
index fe2617f494e..00000000000
--- a/i18n/trk/src/vs/workbench/parts/welcome/overlay/browser/welcomeOverlay.i18n.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"welcomeOverlay.explorer": "Dosya gezgini",
-	"welcomeOverlay.search": "Dosyalar arasında ara",
-	"welcomeOverlay.git": "Kaynak kodu yönetimi",
-	"welcomeOverlay.debug": "Başlat ve hata ayıkla",
-	"welcomeOverlay.extensions": "Eklentileri yönet",
-	"welcomeOverlay.problems": "Hataları ve uyarıları görüntüle",
-	"welcomeOverlay.commandPalette": "Tüm komutları bul ve çalıştır",
-	"welcomeOverlay.notifications": "Bildirimleri göster",
-	"welcomeOverlay": "Kullanıcı Arayüzüne Genel Bakış",
-	"hideWelcomeOverlay": "Arayüz Genel Bakışını Gizle",
-	"help": "Yardım"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json b/i18n/trk/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
deleted file mode 100644
index f17a8da753e..00000000000
--- a/i18n/trk/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"welcomePage.vscode": "Visual Studio Code",
-	"welcomePage.editingEvolved": "Düzenleme evrim geçirdi",
-	"welcomePage.start": "Başlangıç",
-	"welcomePage.newFile": "Yeni dosya",
-	"welcomePage.openFolder": "Klasör aç...",
-	"welcomePage.addWorkspaceFolder": "Çalışma alanı klasörü ekle...",
-	"welcomePage.recent": "Son Kullanılanlar",
-	"welcomePage.moreRecent": "Diğerleri...",
-	"welcomePage.noRecentFolders": "Son kullanılan klasör yok",
-	"welcomePage.help": "Yardım",
-	"welcomePage.keybindingsCheatsheet": "Yazdırılabilir klavye kopya kağıdı",
-	"welcomePage.introductoryVideos": "Tanıtım videoları",
-	"welcomePage.tipsAndTricks": "İpuçları ve Püf noktaları",
-	"welcomePage.productDocumentation": "Ürün belgeleri",
-	"welcomePage.gitHubRepository": "GitHub deposu",
-	"welcomePage.stackOverflow": "Stack Overflow",
-	"welcomePage.showOnStartup": "Başlangıçta hoş geldiniz sayfasını göster",
-	"welcomePage.customize": "Özelleştir",
-	"welcomePage.installExtensionPacks": "Araçlar ve diller",
-	"welcomePage.installExtensionPacksDescription": "{0} ve {1} için destek yükle",
-	"welcomePage.moreExtensions": "fazlası",
-	"welcomePage.installKeymapDescription": "Ayarlar ve tuş bağları",
-	"welcomePage.installKeymapExtension": "{0} ve {1} için ayarları ve klavye kısayollarını yükle",
-	"welcomePage.others": "diğerleri",
-	"welcomePage.colorTheme": "Renk teması",
-	"welcomePage.colorThemeDescription": "Düzenleyici ve kodlarınız sevdiğiniz şekilde görünsün",
-	"welcomePage.learn": "Öğren",
-	"welcomePage.showCommands": "Tüm komutları bul ve çalıştır",
-	"welcomePage.showCommandsDescription": "Komut Paleti'nden hızlıca komutlara erişin ve arayın ({0})",
-	"welcomePage.interfaceOverview": "Arayüze genel bakış",
-	"welcomePage.interfaceOverviewDescription": "Kullanıcı arayüzünün ana bileşenlerini vurgulayan bir kaplamayı görüntüleyin",
-	"welcomePage.interactivePlayground": "İnteraktif oyun alanı",
-	"welcomePage.interactivePlaygroundDescription": "Başlıca düzenleyici özelliklerini kısa örneklerle deneyin"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.contribution.i18n.json b/i18n/trk/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.contribution.i18n.json
deleted file mode 100644
index ea0f9e53fa2..00000000000
--- a/i18n/trk/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.contribution.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"workbenchConfigurationTitle": "Çalışma Ekranı",
-	"workbench.startupEditor.none": "Bir düzenleyici olmadan başlayın.",
-	"workbench.startupEditor.welcomePage": "Hoş Geldiniz sayfasını açın (varsayılan).",
-	"workbench.startupEditor.newUntitledFile": "Yeni bir isimsiz dosya açın.",
-	"workbench.startupEditor": "Önceki oturumdan hiçbiri düzenleyici geri yüklenmeyecekse, başlangıçta hangi düzenleyicinin gösterileceğini denetler. Bir düzenleyici olmadan başlamak için 'none', Hoş Geldiniz sayfasını açmak için 'welcomePage' (varsayılan), (sadece boş bir çalışma alanı açarken) yeni bir isimsiz dosya açmak için 'newUntitledFile'ı seçin.",
-	"help": "Yardım"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json b/i18n/trk/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json
deleted file mode 100644
index 5ee2b5b9060..00000000000
--- a/i18n/trk/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"welcomePage": "Hoş Geldiniz",
-	"welcomePage.javaScript": "JavaScript",
-	"welcomePage.typeScript": "TypeScript",
-	"welcomePage.python": "Python",
-	"welcomePage.php": "PHP",
-	"welcomePage.azure": "Azure",
-	"welcomePage.showAzureExtensions": "Azure eklentilerini göster",
-	"welcomePage.docker": "Docker",
-	"welcomePage.vim": "Vim",
-	"welcomePage.sublime": "Sublime",
-	"welcomePage.atom": "Atom",
-	"welcomePage.extensionPackAlreadyInstalled": "{0} desteği zaten yüklü.",
-	"welcomePage.willReloadAfterInstallingExtensionPack": "{0} ek desteği yüklendikten sonra pencere yeniden yüklenecektir.",
-	"welcomePage.installingExtensionPack": "{0} ek desteği yükleniyor...",
-	"welcomePage.extensionPackNotFound": "{1} Id'li {0} desteği bulunamadı.",
-	"welcomePage.keymapAlreadyInstalled": "{0} klavye kısayolları zaten yüklü.",
-	"welcomePage.willReloadAfterInstallingKeymap": "{0} klavye kısayolları yüklendikten sonra pencere yeniden yüklenecektir.",
-	"welcomePage.installingKeymap": "{0} klavye kısayolları yükleniyor...",
-	"welcomePage.keymapNotFound": "{1} Id'li {0} klavye kısayolları bulunamadı.",
-	"welcome.title": "Hoş Geldiniz",
-	"welcomePage.openFolderWithPath": "{1} yolundaki {0} klasörünü aç",
-	"welcomePage.extensionListSeparator": ", ",
-	"welcomePage.installKeymap": "{0} tuş haritasını yükle",
-	"welcomePage.installExtensionPack": "{0} ek desteği yükleniyor...",
-	"welcomePage.installedKeymap": "{0} tuş haritası zaten yüklü",
-	"welcomePage.installedExtensionPack": "{0} desteği zaten yüklü",
-	"ok": "Tamam",
-	"details": "Detaylar",
-	"welcomePage.buttonBackground": "Hoş geldiniz sayfasındaki butonların arka plan rengi.",
-	"welcomePage.buttonHoverBackground": "Hoş geldiniz sayfasındaki butonların bağlantı vurgusu arka plan rengi."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/welcome/walkThrough/electron-browser/editor/editorWalkThrough.i18n.json b/i18n/trk/src/vs/workbench/parts/welcome/walkThrough/electron-browser/editor/editorWalkThrough.i18n.json
deleted file mode 100644
index 6f7dcd3fdbb..00000000000
--- a/i18n/trk/src/vs/workbench/parts/welcome/walkThrough/electron-browser/editor/editorWalkThrough.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"editorWalkThrough.title": "İnteraktif Oyun Alanı",
-	"editorWalkThrough": "İnteraktif Oyun Alanı"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThrough.contribution.i18n.json b/i18n/trk/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThrough.contribution.i18n.json
deleted file mode 100644
index 3264007528c..00000000000
--- a/i18n/trk/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThrough.contribution.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"walkThrough.editor.label": "İnteraktif Oyun Alanı",
-	"help": "Yardım"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughActions.i18n.json b/i18n/trk/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughActions.i18n.json
deleted file mode 100644
index ffe19020984..00000000000
--- a/i18n/trk/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughActions.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"editorWalkThrough.arrowUp": "Yukarı Kaydır (Satır)",
-	"editorWalkThrough.arrowDown": "Aşağı Kaydır (Satır)",
-	"editorWalkThrough.pageUp": "Yukarı Kaydır (Sayfa)",
-	"editorWalkThrough.pageDown": "Aşağı Kaydır (Sayfa)"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughPart.i18n.json b/i18n/trk/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughPart.i18n.json
deleted file mode 100644
index 5ae3047cb0a..00000000000
--- a/i18n/trk/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughPart.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"walkThrough.unboundCommand": "serbest",
-	"walkThrough.gitNotFound": "Git, sisteminizde yüklü değil gibi görünüyor.",
-	"walkThrough.embeddedEditorBackground": "İnteraktif oyun alanındaki gömülü düzenleyicilerin arka plan rengi."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/services/actions/electron-browser/menusExtensionPoint.i18n.json b/i18n/trk/src/vs/workbench/services/actions/electron-browser/menusExtensionPoint.i18n.json
deleted file mode 100644
index c66c6f0404e..00000000000
--- a/i18n/trk/src/vs/workbench/services/actions/electron-browser/menusExtensionPoint.i18n.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"requirearray": "menü ögeleri bir dizi olmalıdır",
-	"requirestring": "`{0}` özelliği zorunludur ve `string` türünde olmalıdır",
-	"optstring": "`{0}` özelliği atlanabilir veya `string` türünde olmalıdır",
-	"vscode.extension.contributes.menuItem.command": "Yürütülecek komutun tanımlayıcısı. Komut 'commands' bölümünde tanımlanmalıdır",
-	"vscode.extension.contributes.menuItem.alt": "Yürütülecek alternatif bir komutun tanımlayıcısı. Komut 'commands' bölümünde tanımlanmalıdır",
-	"vscode.extension.contributes.menuItem.when": "Bu ögeyi göstermek için gereken koşul",
-	"vscode.extension.contributes.menuItem.group": "Bu komutun ait olduğu gruba ekle",
-	"vscode.extension.contributes.menus": "Düzenleyiciye menü ögeleri ekler",
-	"menus.commandPalette": "Komut Paleti",
-	"menus.touchBar": "Touch bar (sadece macOS)",
-	"menus.editorTitle": "Düzenleyici başlık menüsü",
-	"menus.editorContext": "Düzenleyici bağlam menüsü",
-	"menus.explorerContext": "Dosya gezgini bağlam menüsü",
-	"menus.editorTabContext": "Düzenleyici sekmeleri bağlam menüsü",
-	"menus.debugCallstackContext": "Hata ayıklama çağrı yığını bağlam menüsü",
-	"menus.scmTitle": "Kaynak Denetimi başlık menüsü",
-	"menus.scmSourceControl": "Kaynak Denetimi menüsü",
-	"menus.resourceGroupContext": "Kaynak Denetimi kaynak grubu bağlam menüsü",
-	"menus.resourceStateContext": "Kaynak Denetimi kaynak durumu bağlam menüsü",
-	"view.viewTitle": "Katkıda bulunan görünümü başlık menüsü",
-	"view.itemContext": "Katkıda bulunan görünümü öge bağlam menüsü",
-	"nonempty": "boş olmayan değer bekleniyordu.",
-	"opticon": "`icon` özelliği atlanabilir veya bir dize ya da `{dark, light}` gibi bir değişmez değer olmalıdır",
-	"requireStringOrObject": "`{0}` özelliği zorunludur ve `string` veya `object` türünde olmalıdır",
-	"requirestrings": "`{0}` ve `{1}` özellikleri zorunludur ve `string` türünde olmalıdır",
-	"vscode.extension.contributes.commandType.command": "Yürütülecek komutun tanımlayıcısı",
-	"vscode.extension.contributes.commandType.title": "Komutu kullanıcı arayüzünde temsil edecek başlık",
-	"vscode.extension.contributes.commandType.category": "(İsteğe Bağlı) Kullanıcı arayüzünde komutun gruplanacağı kategori dizesi",
-	"vscode.extension.contributes.commandType.icon": "(İsteğe Bağlı) Komutun, Kullanıcı Arayüzü'nde temsil edilmesinde kullanılacak simge. Bir dosya yolu veya tema olarak kullanılabilir bir yapılandırmadır",
-	"vscode.extension.contributes.commandType.icon.light": "Açık bir tema kullanıldığındaki simge yolu",
-	"vscode.extension.contributes.commandType.icon.dark": "Koyu bir tema kullanıldığındaki simge yolu",
-	"vscode.extension.contributes.commands": "Komut paletine komutlar ekler.",
-	"dup": "`{0}` komutu `commands` bölümünde birden çok kez görünüyor.",
-	"menuId.invalid": "`{0}` geçerli bir menü tanımlayıcısı değil",
-	"missing.command": "Menü ögesi, 'commands' bölümünde tanımlanmamış bir `{0}` komutuna başvuruyor.",
-	"missing.altCommand": "Menü ögesi, 'commands' bölümünde tanımlanmamış bir `{0}` alternatif komutuna başvuruyor.",
-	"dupe.command": "Menü ögesi, aynı varsayılan ve alternatif komutlarına başvuruyor"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/services/bulkEdit/electron-browser/bulkEditService.i18n.json b/i18n/trk/src/vs/workbench/services/bulkEdit/electron-browser/bulkEditService.i18n.json
deleted file mode 100644
index bdfef4d2c99..00000000000
--- a/i18n/trk/src/vs/workbench/services/bulkEdit/electron-browser/bulkEditService.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"summary.0": "Düzenleme yapılmadı",
-	"summary.nm": "{1} dosyada {0} metin düzenlemesi yapıldı",
-	"summary.n0": "Bir dosyada {0} metin düzenlemesi yapıldı",
-	"conflict": "Bu dosyalar bu arada değiştirildi: {0}"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/services/configuration/common/configurationExtensionPoint.i18n.json b/i18n/trk/src/vs/workbench/services/configuration/common/configurationExtensionPoint.i18n.json
deleted file mode 100644
index fe2396494aa..00000000000
--- a/i18n/trk/src/vs/workbench/services/configuration/common/configurationExtensionPoint.i18n.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.contributes.configuration.title": "Ayarların bir özeti. Bu etiket ayar dosyasında ayırıcı yorum olarak kullanılacaktır.",
-	"vscode.extension.contributes.configuration.properties": "Yapılandırma özelliklerinin açıklaması.",
-	"scope.application.description": "Sadece kullanıcı ayarlarında yapılandırılabilen, uygulamaya özel yapılandırma.",
-	"scope.window.description": "Kullanıcı veya çalışma alanında yapılandırılabilen Windows'a özel yapılandırma.",
-	"scope.resource.description": "Kullanıcı veya çalışma alanında yapılandırılabilen kaynağa özel yapılandırma.",
-	"scope.description": "Yapılandırmanın uygulanabilir olduğu kapsam. Mevcut kapsamlar 'window' ve 'resource'tır.",
-	"vscode.extension.contributes.defaultConfiguration": "Varsayılan düzenleyici yapılandırma ayarlarına dil bazında ekleme yapar.",
-	"vscode.extension.contributes.configuration": "Yapılandırma ayarlarına ekleme yapar.",
-	"invalid.title": "'configuration.title' bir dize olmalıdır",
-	"invalid.properties": "'configuration.properties' bir nesne olmalıdır",
-	"invalid.property": "'configuration.property' bir nesne olmalıdır",
-	"invalid.allOf": "'configuration.allOf' kullanım dışıdır ve artık kullanılmamalıdır. Bunun yerine, birden çok yapılandırma bölümlerini bir dizi olarak 'configuration' ekleme noktasına geçirin.",
-	"workspaceConfig.folders.description": "Çalışma alanına yüklenecek klasörler listesi.",
-	"workspaceConfig.path.description": "Bir dosya yolu. ör. `/root/folderA` veya çalışma alanı dosyasının konumuna karşı çözümlenecek göreceli bir yol için `./folderA`.",
-	"workspaceConfig.name.description": "Klasör için isteğe bağlı bir ad.",
-	"workspaceConfig.uri.description": "Klasörün URI'si",
-	"workspaceConfig.settings.description": "Çalışma alanı ayarları",
-	"workspaceConfig.launch.description": "Çalışma alanı başlatma yapılandırmaları",
-	"workspaceConfig.extensions.description": "Çalışma alanı eklentileri",
-	"unknownWorkspaceProperty": "Bilinmeyen çalışma alanı yapılandırması özelliği"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/services/configuration/node/configuration.i18n.json b/i18n/trk/src/vs/workbench/services/configuration/node/configuration.i18n.json
deleted file mode 100644
index 4c2ceda75b6..00000000000
--- a/i18n/trk/src/vs/workbench/services/configuration/node/configuration.i18n.json
+++ /dev/null
@@ -1,24 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"vscode.extension.contributes.configuration.title": "Ayarların bir özeti. Bu etiket ayar dosyasında ayırıcı yorum olarak kullanılacaktır.",
-	"vscode.extension.contributes.configuration.properties": "Yapılandırma özelliklerinin açıklaması.",
-	"scope.window.description": "Kullanıcı veya çalışma alanında yapılandırılabilen Windows'a özel yapılandırma.",
-	"scope.resource.description": "Kullanıcı veya çalışma alanında yapılandırılabilen kaynağa özel yapılandırma.",
-	"scope.description": "Yapılandırmanın uygulanabilir olduğu kapsam. Mevcut kapsamlar 'window' ve 'resource'tır.",
-	"vscode.extension.contributes.configuration": "Yapılandırma ayarlarına ekleme yapar.",
-	"invalid.title": "'configuration.title' bir dize olmalıdır",
-	"vscode.extension.contributes.defaultConfiguration": "Varsayılan düzenleyici yapılandırma ayarlarına dil bazında ekleme yapar.",
-	"invalid.properties": "'configuration.properties' bir nesne olmalıdır",
-	"invalid.allOf": "'configuration.allOf' kullanım dışıdır ve artık kullanılmamalıdır. Bunun yerine, birden çok yapılandırma bölümlerini bir dizi olarak 'configuration' ekleme noktasına geçirin.",
-	"workspaceConfig.folders.description": "Çalışma alanına yüklenecek klasörler listesi.",
-	"workspaceConfig.path.description": "Bir dosya yolu. ör. `/root/folderA` veya çalışma alanı dosyasının konumuna karşı çözümlenecek göreceli bir yol için `./folderA`.",
-	"workspaceConfig.name.description": "Klasör için isteğe bağlı bir ad.",
-	"workspaceConfig.uri.description": "Klasörün URI'si",
-	"workspaceConfig.settings.description": "Çalışma alanı ayarları",
-	"workspaceConfig.extensions.description": "Çalışma alanı eklentileri",
-	"unknownWorkspaceProperty": "Bilinmeyen çalışma alanı yapılandırması özelliği"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json b/i18n/trk/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
deleted file mode 100644
index 75fe13443d1..00000000000
--- a/i18n/trk/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"openTasksConfiguration": "Görev Yapılandırmasını Aç",
-	"openLaunchConfiguration": "Başlatma Yapılandırmasını Aç",
-	"open": "Ayarları Aç",
-	"saveAndRetry": "Kaydet ve Yeniden Dene",
-	"errorUnknownKey": "{0} dosyasına, {1} kayıtlı bir yapılandırma olmadığı için yazılamıyor.",
-	"errorInvalidWorkspaceConfigurationApplication": "{0}, Çalışma Alanı Ayarları'na yazılamadı. Bu ayar, sadece Kullanıcı Ayarları'na yazılabilir.",
-	"errorInvalidFolderConfiguration": "{0}, klasör kaynak kapsamını desteklemediği için klasör ayarlarına yazılamıyor.",
-	"errorInvalidUserTarget": "{0}, global kapsamı desteklemediği için kullanıcı ayarlarına yazılamıyor.",
-	"errorInvalidWorkspaceTarget": "{0}, birden çok klasörlü çalışma alanında çalışma alanı kapsamını desteklemediği için Çalışma Alanı Ayarları'na yazılamıyor.",
-	"errorInvalidFolderTarget": "Hiçbir kaynak belirtilmediği için klasör ayarlarına yazılamıyor.",
-	"errorNoWorkspaceOpened": "Hiçbir çalışma alanı açık olmadığı için {0}'a yazılamıyor. Lütfen ilk olarak bir çalışma alanı açın ve tekrar deneyin.",
-	"errorInvalidTaskConfiguration": "Görev yapılandırma dosyasına yazılamıyor. Lütfen dosyadaki hata/uyarıları düzeltmek için dosyayı açın ve tekrar deneyin.",
-	"errorInvalidLaunchConfiguration": "Başlangıç yapılandırması dosyasına yazılamıyor. Lütfen dosyadaki hata/uyarıları düzeltmek için dosyayı açın ve tekrar deneyin.",
-	"errorInvalidConfiguration": "Kullanıcı ayarlarına yazılamıyor. Lütfen dosyadaki hata/uyarıları düzeltmek için kullanıcı ayarlarını açın ve tekrar deneyin.",
-	"errorInvalidConfigurationWorkspace": "Çalışma alanı ayarlarına yazılamıyor. Lütfen dosyadaki hata/uyarıları düzeltmek için çalışma alanı ayarlarını açın ve tekrar deneyin.",
-	"errorInvalidConfigurationFolder": "Klasör ayarlarına yazılamıyor. Lütfen hata/uyarılarını düzeltmek için '{0}' klasör ayarlarını açın ve tekrar deneyin. ",
-	"errorTasksConfigurationFileDirty": "Kaydedilmemiş değişiklikler içerdiği için görev yapılandırma dosyasına yazılamıyor. Lütfen dosyayı kaydedin ve tekrar deneyin.",
-	"errorLaunchConfigurationFileDirty": "Kaydedilmemiş değişiklikler içerdiği için başlangıç yapılandırması dosyasına yazılamıyor. Lütfen dosyayı kaydedin ve tekrar deneyin.",
-	"errorConfigurationFileDirty": "Dosya kaydedilmemiş değişiklikler içerdiği için kullanıcı ayarlarına yazılamıyor. Lütfen ilk olarak kullanıcı ayarları dosyasını kaydedin ve tekrar deneyin.",
-	"errorConfigurationFileDirtyWorkspace": "Dosya kaydedilmemiş değişiklikler içerdiği için çalışma alanı ayarlarına yazılamıyor. Lütfen ilk olarak çalışma alanı ayarları dosyasını kaydedin ve tekrar deneyin.",
-	"errorConfigurationFileDirtyFolder": "Dosya kaydedilmemiş değişiklikler içerdiği için klasör ayarlarına yazılamıyor. Lütfen ilk olarak '{0}' klasör ayarları dosyasını kaydedin ve tekrar deneyin.",
-	"userTarget": "Kullanıcı Ayarları",
-	"workspaceTarget": "Çalışma Alanı Ayarları",
-	"folderTarget": "Klasör Ayarları"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/services/configuration/node/configurationService.i18n.json b/i18n/trk/src/vs/workbench/services/configuration/node/configurationService.i18n.json
deleted file mode 100644
index 830ee439bd6..00000000000
--- a/i18n/trk/src/vs/workbench/services/configuration/node/configurationService.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"unsupportedApplicationSetting": "Bu ayar, sadece Kullanıcı Ayarları'nda uygulanabilir.",
-	"unsupportedWindowSetting": "Bu ayar şu an uygulanamıyor. Ayar, bu klasörü açtığınızda uygulanacaktır."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/services/configuration/node/jsonEditingService.i18n.json b/i18n/trk/src/vs/workbench/services/configuration/node/jsonEditingService.i18n.json
deleted file mode 100644
index 5006e6648d5..00000000000
--- a/i18n/trk/src/vs/workbench/services/configuration/node/jsonEditingService.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"errorInvalidFile": "Dosyaya yazılamıyor. Lütfen dosyadaki hata/uyarıları düzeltmek için dosyayı açın ve tekrar deneyin.",
-	"errorFileDirty": "Dosya kaydedilmemiş değişiklikler içerdiği için dosyaya yazılamıyor. Lütfen dosyayı kaydedin ve tekrar deneyin."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json b/i18n/trk/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
deleted file mode 100644
index b0bba1118fb..00000000000
--- a/i18n/trk/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"stringsOnlySupported": "{0} komutu bir dize değeri döndürmedi. Değişken yer değiştirmesi için kullanılan komutların sonuçlarında sadece dizeler desteklenir."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/services/configurationResolver/node/variableResolver.i18n.json b/i18n/trk/src/vs/workbench/services/configurationResolver/node/variableResolver.i18n.json
deleted file mode 100644
index a36997f7e19..00000000000
--- a/i18n/trk/src/vs/workbench/services/configurationResolver/node/variableResolver.i18n.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"missingEnvVarName": "Hiçbir ortam değişkeni adı belirtilmediği için '{0}' çözümlenemiyor.",
-	"configNotFound": "'{1}' ayarı bulunamadığı için '{0}' çözümlenemiyor.",
-	"missingConfigName": "Hiçbir ayar adı belirtilmediği için '{0}' çözümlenemiyor.",
-	"noValueForCommand": "Komut değer içermediği için '{0}' çözümlenemiyor.",
-	"canNotFindFolder": "'{0}' çözümlenemiyor. '{1}' klasörü yok.",
-	"canNotResolveWorkspaceFolderMultiRoot": "'{0}', birden çok klasörlü çalışma alanında çözümlenemiyor. ':' ve bir çalışma alanı klasörü adı kullanarak bu değişkeni test edin.",
-	"canNotResolveWorkspaceFolder": "'{0}' çözümlenemiyor. Lütfen bir klasör açın.",
-	"canNotResolveFile": "'{0}' çözümlenemiyor. Lütfen bir düzenleyici açın.",
-	"canNotResolveLineNumber": "'{0}' çözümlenemiyor. Lütfen aktif düzenleyicide bir satırın seçili olduğundan emin olun.",
-	"canNotResolveSelectedText": "'{0}' çözümlenemiyor. Lütfen aktif düzenleyicide seçili metin olduğundan emin olun."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/services/crashReporter/common/crashReporterService.i18n.json b/i18n/trk/src/vs/workbench/services/crashReporter/common/crashReporterService.i18n.json
deleted file mode 100644
index 4289f712979..00000000000
--- a/i18n/trk/src/vs/workbench/services/crashReporter/common/crashReporterService.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"telemetryConfigurationTitle": "Telemetri",
-	"telemetry.enableCrashReporting": "Kilitlenme raporlarının Microsoft'a gönderilmesini etkinleştirin.\nBu seçeneğin yürürlüğe girmesi için yeniden başlatma gerekir."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/services/crashReporter/electron-browser/crashReporterService.i18n.json b/i18n/trk/src/vs/workbench/services/crashReporter/electron-browser/crashReporterService.i18n.json
deleted file mode 100644
index e18f1462af5..00000000000
--- a/i18n/trk/src/vs/workbench/services/crashReporter/electron-browser/crashReporterService.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"telemetryConfigurationTitle": "Telemetri",
-	"telemetry.enableCrashReporting": "Kilitlenme raporlarının Microsoft'a gönderilmesini etkinleştirin.\nBu seçeneğin yürürlüğe girmesi için yeniden başlatma gerekir."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/services/decorations/browser/decorationsService.i18n.json b/i18n/trk/src/vs/workbench/services/decorations/browser/decorationsService.i18n.json
deleted file mode 100644
index 40e6b9e3318..00000000000
--- a/i18n/trk/src/vs/workbench/services/decorations/browser/decorationsService.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"bubbleTitle": "Vurgulanan ögeler içeriyor"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json b/i18n/trk/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json
deleted file mode 100644
index c9b9ed878f8..00000000000
--- a/i18n/trk/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"yesButton": "&&Evet",
-	"cancelButton": "İptal"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/services/dialogs/electron-browser/dialogs.i18n.json b/i18n/trk/src/vs/workbench/services/dialogs/electron-browser/dialogs.i18n.json
deleted file mode 100644
index bda330fc6cb..00000000000
--- a/i18n/trk/src/vs/workbench/services/dialogs/electron-browser/dialogs.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"yesButton": "&&Evet",
-	"cancelButton": "İptal",
-	"moreFile": "...1 ek dosya gösterilmiyor",
-	"moreFiles": "...{0} ek dosya gösterilmiyor"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/services/editor/browser/editorService.i18n.json b/i18n/trk/src/vs/workbench/services/editor/browser/editorService.i18n.json
deleted file mode 100644
index 50e968f8ee3..00000000000
--- a/i18n/trk/src/vs/workbench/services/editor/browser/editorService.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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.
-{
-	"compareLabels": "{0} ↔ {1}"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/services/editor/common/editorService.i18n.json b/i18n/trk/src/vs/workbench/services/editor/common/editorService.i18n.json
deleted file mode 100644
index ca1ee0161c1..00000000000
--- a/i18n/trk/src/vs/workbench/services/editor/common/editorService.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"compareLabels": "{0} ↔ {1}"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/services/extensions/common/extensionsRegistry.i18n.json b/i18n/trk/src/vs/workbench/services/extensions/common/extensionsRegistry.i18n.json
deleted file mode 100644
index 334fc707777..00000000000
--- a/i18n/trk/src/vs/workbench/services/extensions/common/extensionsRegistry.i18n.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.engines": "Motor uyumluluğu.",
-	"vscode.extension.engines.vscode": "Eklentinin uyumlu olduğu VS Code sürümünü belirten VS Code eklentileri için. * olamaz. Örneğin: ^0.10.5 uyumlu olduğu minimum VS Code sürümünün 0.10.5 olduğunu gösterir.",
-	"vscode.extension.publisher": "VS Code eklentisinin yayıncısı.",
-	"vscode.extension.displayName": "VS Code galerisinde kullanılan eklentinin görünen adı.",
-	"vscode.extension.categories": "Bu eklentiyi kategorize etmek için VS Code galerisi tarafından kullanılan kategoriler.",
-	"vscode.extension.category.languages.deprecated": "Bunun yerine 'Programlama Dilleri'ni kullan",
-	"vscode.extension.galleryBanner": "VS Code markette kullanılan afiş.",
-	"vscode.extension.galleryBanner.color": "VS Code marketteki sayfa başlığındaki afiş rengi.",
-	"vscode.extension.galleryBanner.theme": "Afişte kullanılan yazı tipi için renk teması.",
-	"vscode.extension.contributes": "Bu paketin temsil ettiği VS Code eklentisinin tüm katkıları.",
-	"vscode.extension.preview": "Markette eklentinin Önizleme olarak işaretlenmesini sağlar.",
-	"vscode.extension.activationEvents": "VS Code eklentisi için etkinleştirme olayları.",
-	"vscode.extension.activationEvents.onLanguage": "Belirtilen dilde çözümlenen bir dosya her açıldığında bir etkinleştirme olayı yayınlanır.",
-	"vscode.extension.activationEvents.onCommand": "Belirtilen komut her çağrıldığında bir etkinleştirme olayı yayınlanır.",
-	"vscode.extension.activationEvents.onDebug": "Bir kullanıcının hata ayıklamaya başlamak veya hata ayıklama yapılandırmasını ayarlamak üzere olduğu her an bir etkinleştirme olayı yayınlanır.",
-	"vscode.extension.activationEvents.onDebugInitialConfigurations": "Bir \"launch.json\" dosyasının oluşturulması(ve tüm provideDebugConfigurations metodlarının çağrılması) gerektiği zaman etkinleştirme olayı yayınlanır.",
-	"vscode.extension.activationEvents.onDebugResolve": "Belirtilen türde bir hata ayıklama oturumu başlamaya yaklaştığında (ve buna karşılık gelen bir resolveDebugConfiguration metodunun çağrılması gerektiğinde) bir etkinleştirme olayı yayınlanır.",
-	"vscode.extension.activationEvents.workspaceContains": "Belirtilen glob deseni ile eşleşen en az bir dosya içeren bir klasör her açıldığında bir etkinleştirme olayı yayınlanır.",
-	"vscode.extension.activationEvents.onView": "Belirtilen görünüm her genişletildiğinde bir etkinleştirme olayı yayınlanır.",
-	"vscode.extension.activationEvents.onUri": "Sistem genelinde bu uzantıya yönelik bir Uri her açıldığında bir etkinleştirme olayı yayınlanır.",
-	"vscode.extension.activationEvents.star": "VS Code başlatıldığında yayılan etkinleştirme olayı. Mükemmel bir son kullanıcı deneyimi sağlandığından emin olmak için, lütfen bu etkinleştirme olayını eklentinizde sadece kullanım durumunuzda başka hiçbir aktivasyon olayı kombinasyonu çalışmıyorsa kullanın.",
-	"vscode.extension.badges": "Marketin eklenti sayfasının kenar çubuğunda görüntülenecek göstergeler dizisi.",
-	"vscode.extension.badges.url": "Gösterge resmi URL'si.",
-	"vscode.extension.badges.href": "Gösterge bağlantısı.",
-	"vscode.extension.badges.description": "Gösterge açıklaması.",
-	"vscode.extension.markdown": "Markette kullanılan Markdown render motorunu denetler. github (varsayılan) veya standard olabilir.",
-	"vscode.extension.qna": "Marketteki soru-cevap bağlantısını denetler. Varsayılan market soru-cevap sitesini etkinleştirmek için 'marketplace' değerini atayın. Özel bir soru-cevap sitesinin URL'ini sağlamak için bir dize değeri atayın. Soru-cevabı tamamen devre dışı bırakmak için 'false' değerini atayın.",
-	"vscode.extension.extensionDependencies": "Diğer uzantılara bağımlılıklar. Bir uzantının tanımlayıcısı her zaman ${publisher}.${name} biçimindedir. Örneğin: vscode.csharp.",
-	"vscode.extension.scripts.prepublish": "Paket, bir VS Code eklentisi olarak yayımlamadan önce çalıştırılacak betik.",
-	"vscode.extension.scripts.uninstall": "VS Code eklentisi için kaldırma betiği. VS Code, eklenti kaldırıldıktan sonra yeniden başlatıldığında (kapatıp açma) ve eklenti tamamen kaldırıldığında çalıştırılacak betik. Sadece Node betikleri desteklenir.",
-	"vscode.extension.icon": "128x128 piksellik bir simgenin yolu."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/services/extensions/electron-browser/extensionHost.i18n.json b/i18n/trk/src/vs/workbench/services/extensions/electron-browser/extensionHost.i18n.json
deleted file mode 100644
index 5fe056353b1..00000000000
--- a/i18n/trk/src/vs/workbench/services/extensions/electron-browser/extensionHost.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"extensionHostProcess.startupFailDebug": "Eklenti sunucusu 10 saniye içinde başlamadı, ilk satırda durdurulmuş olabilir ve devam etmesi için bir hata ayıklayıcıya ihtiyacı olabilir.",
-	"extensionHostProcess.startupFail": "Eklenti sunucusu 10 saniye içinde başlamadı, bu bir sorun olabilir.",
-	"reloadWindow": "Pencereyi Yeniden Yükle",
-	"extensionHostProcess.error": "Eklenti sunucusundan hata: {0}"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/services/extensions/electron-browser/extensionHostProfiler.i18n.json b/i18n/trk/src/vs/workbench/services/extensions/electron-browser/extensionHostProfiler.i18n.json
deleted file mode 100644
index 64684c9ab51..00000000000
--- a/i18n/trk/src/vs/workbench/services/extensions/electron-browser/extensionHostProfiler.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"message": "$(zap) Eklenti Sunucusu Ayrımlanıyor..."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/services/extensions/electron-browser/extensionPoints.i18n.json b/i18n/trk/src/vs/workbench/services/extensions/electron-browser/extensionPoints.i18n.json
deleted file mode 100644
index 8a25b192f20..00000000000
--- a/i18n/trk/src/vs/workbench/services/extensions/electron-browser/extensionPoints.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"jsonParseFail": "{0} ayrıştırılamadı: {1}.",
-	"fileReadFail": "{0} dosyası okunamadı: {1}.",
-	"jsonsParseReportErrors": "{0} ayrıştırılamadı: {1}.",
-	"missingNLSKey": "{0} anahtarı için mesaj bulunamadı."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json b/i18n/trk/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json
deleted file mode 100644
index ab5fc985132..00000000000
--- a/i18n/trk/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"extensionsDisabled": "Tüm eklentiler devre dışı.",
-	"extensionHostProcess.crash": "Eklenti sunucusu beklenmeyen biçimde sonlandırıldı.",
-	"extensionHostProcess.unresponsiveCrash": "Eklenti sunucusu yanıt vermediğinden sonlandırıldı.",
-	"devTools": "Geliştirici Araçlarını Aç",
-	"restart": "Eklenti Sunucusunu Yeniden Başlat",
-	"overwritingExtension": "{0} eklentisinin üzerine {1} yazılıyor.",
-	"extensionUnderDevelopment": "{0} konumundaki geliştirme eklentisi yükleniyor",
-	"extensionCache.invalid": "Eklentiler disk üzerinde değişime uğradı. Lütfen pencereyi yeniden yükleyin.",
-	"reloadWindow": "Pencereyi Yeniden Yükle"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/services/extensions/node/extensionPoints.i18n.json b/i18n/trk/src/vs/workbench/services/extensions/node/extensionPoints.i18n.json
deleted file mode 100644
index 48d606ed601..00000000000
--- a/i18n/trk/src/vs/workbench/services/extensions/node/extensionPoints.i18n.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"jsonParseFail": "{0} ayrıştırılamadı: {1}.",
-	"fileReadFail": "{0} dosyası okunamadı: {1}.",
-	"jsonsParseReportErrors": "{0} ayrıştırılamadı: {1}.",
-	"missingNLSKey": "{0} anahtarı için mesaj bulunamadı.",
-	"notSemver": "Eklenti sürümü semver ile uyumlu değil.",
-	"extensionDescription.empty": "Boş eklenti açıklaması alındı",
-	"extensionDescription.publisher": "`{0}` özelliği zorunludur ve `string` türünde olmalıdır",
-	"extensionDescription.name": "`{0}` özelliği zorunludur ve `string` türünde olmalıdır",
-	"extensionDescription.version": "`{0}` özelliği zorunludur ve `string` türünde olmalıdır",
-	"extensionDescription.engines": "`{0}` özelliği zorunludur ve `object` türünde olmalıdır",
-	"extensionDescription.engines.vscode": "`{0}` özelliği zorunludur ve `string` türünde olmalıdır",
-	"extensionDescription.extensionDependencies": "`{0}` özelliği atlanabilir veya `string[]` türünde olmalıdır",
-	"extensionDescription.activationEvents1": "`{0}` özelliği atlanabilir veya `string[]` türünde olmalıdır",
-	"extensionDescription.activationEvents2": "`{0}` ve `{1}` özelliklerinin ikisi birden belirtilmeli veya ikisi birden atlanmalıdır",
-	"extensionDescription.main1": "`{0}` özelliği atlanabilir veya `string` türünde olmalıdır",
-	"extensionDescription.main2": "`main` ({0}) yolunun eklentinin klasörü içine ({1}) eklenmiş olacağı beklendi. Bu, eklentiyi taşınamaz yapabilir.",
-	"extensionDescription.main3": "`{0}` ve `{1}` özelliklerinin ikisi birden belirtilmeli veya ikisi birden atlanmalıdır"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/services/files/electron-browser/fileService.i18n.json b/i18n/trk/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
deleted file mode 100644
index 844478e0633..00000000000
--- a/i18n/trk/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"netVersionError": "Microsoft .NET Framework 4.5 gerekli. Yüklemek için bağlantıyı izleyin.",
-	"installNet": ".NET Framework 4.5'i İndir",
-	"neverShowAgain": "Tekrar Gösterme",
-	"enospcError": "{0}, bu büyük çalışma alanındaki dosya değişikliklerini izleyemiyor. Bu sorunu çözmek için lütfen yönerge bağlantısını izleyin.",
-	"learnMore": "Talimatlar",
-	"fileInvalidPath": "Geçersiz dosya kaynağı ({0})",
-	"fileIsDirectoryError": "Dosya bir dizindir",
-	"fileNotModifiedError": "Dosya şu tarihten beri değiştirilmemiş:",
-	"fileTooLargeForHeapError": "Bu büyüklükte bir dosyayı açmak için, VS Code'u yeniden başlatmanız ve daha fazla bellek kullanmasına izin vermeniz gerekir",
-	"fileTooLargeError": "Dosya, açmak için çok büyük",
-	"fileNotFoundError": "Dosya bulunamadı ({0})",
-	"fileBinaryError": "Dosya ikili olarak görünüyor ve metin olarak açılamıyor",
-	"filePermission": "Dosya için yazma izni reddedildi ({0})",
-	"fileExists": "Oluşturulacak dosya zaten mevcut ({0})",
-	"fileModifiedError": "Dosya Şu Tarihten Beri Değiştiriliyor",
-	"fileReadOnlyError": "Dosya Salt Okunur",
-	"fileMoveConflict": "Taşıma/kopyalama yapılamadı. Dosya, hedefte zaten mevcut.",
-	"unableToMoveCopyError": "Taşıma/kopyalama yapılamadı. Dosya, içinde bulunduğu klasörü değiştiriyor.",
-	"binFailed": "'{0}' geri dönüşüm kutusuna taşınamadı",
-	"trashFailed": "'{0}' çöpe taşınamadı"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json b/i18n/trk/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
deleted file mode 100644
index 0178637fbdf..00000000000
--- a/i18n/trk/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"invalidPath": "'{0}' kaynağının yolu mutlak olmalıdır",
-	"fileNotFoundError": "Dosya bulunamadı ({0})",
-	"fileIsDirectoryError": "Dosya bir dizindir",
-	"fileNotModifiedError": "Dosya şu tarihten beri değiştirilmemiş:",
-	"fileBinaryError": "Dosya ikili olarak görünüyor ve metin olarak açılamıyor",
-	"err.create": "{0} dosyası oluşturulamadı",
-	"fileMoveConflict": "Taşıma/kopyalama yapılamadı. Dosya, hedefte zaten mevcut."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/services/files/node/fileService.i18n.json b/i18n/trk/src/vs/workbench/services/files/node/fileService.i18n.json
deleted file mode 100644
index 0032045d6c1..00000000000
--- a/i18n/trk/src/vs/workbench/services/files/node/fileService.i18n.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"fileInvalidPath": "Geçersiz dosya kaynağı ({0})",
-	"fileIsDirectoryError": "Dosya bir dizindir",
-	"fileNotModifiedError": "Dosya şu tarihten beri değiştirilmemiş:",
-	"fileTooLargeError": "Dosya, açmak için çok büyük",
-	"fileNotFoundError": "Dosya bulunamadı ({0})",
-	"fileBinaryError": "Dosya ikili olarak görünüyor ve metin olarak açılamıyor",
-	"filePermission": "Dosya için yazma izni reddedildi ({0})",
-	"fileExists": "Oluşturulacak dosya zaten mevcut ({0})",
-	"fileMoveConflict": "Taşıma/kopyalama yapılamadı. Dosya, hedefte zaten mevcut.",
-	"unableToMoveCopyError": "Taşıma/kopyalama yapılamadı. Dosya, içinde bulunduğu klasörü değiştiriyor.",
-	"foldersCopyError": "Klasörler çalışma alanına kopyalanamaz. Lütfen kopyalamak için dosyaları tek tek seçin.",
-	"fileModifiedError": "Dosya Şu Tarihten Beri Değiştiriliyor",
-	"fileReadOnlyError": "Dosya Salt Okunur"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/services/jsonschemas/common/jsonValidationExtensionPoint.i18n.json b/i18n/trk/src/vs/workbench/services/jsonschemas/common/jsonValidationExtensionPoint.i18n.json
deleted file mode 100644
index 94bd17df159..00000000000
--- a/i18n/trk/src/vs/workbench/services/jsonschemas/common/jsonValidationExtensionPoint.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"contributes.jsonValidation": "json şema yapılandırmasına ekleme yapar.",
-	"contributes.jsonValidation.fileMatch": "Eşleşecek dosya örüntüsü, örneğin \"package.json\" veya \"*.launch\".",
-	"contributes.jsonValidation.url": "Bir şema URL'si ('http:', 'https:') veya eklenti klasörüne ('./') göreceli yol.",
-	"invalid.jsonValidation": "'configuration.jsonValidation' bir dizi olmalıdır",
-	"invalid.fileMatch": "'configuration.jsonValidation.fileMatch' tanımlanmalıdır",
-	"invalid.url": "'configuration.jsonValidation.url' bir URL veya göreli yol olmalıdır",
-	"invalid.url.fileschema": "'configuration.jsonValidation.url' geçersiz bir göreli URL'dir: {0}",
-	"invalid.url.schema": "'configuration.jsonValidation.url' ögesi eklentide bulunan şemalara başvurmak için 'http:', 'https:' veya './' ile başlamalıdır"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/services/keybinding/common/keybindingEditing.i18n.json b/i18n/trk/src/vs/workbench/services/keybinding/common/keybindingEditing.i18n.json
deleted file mode 100644
index a1c3be5711a..00000000000
--- a/i18n/trk/src/vs/workbench/services/keybinding/common/keybindingEditing.i18n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"errorKeybindingsFileDirty": "Kaydedilmemiş değişiklikler içerdiği için tuş bağları yapılandırma dosyasına yazılamıyor. Lütfen dosyayı kaydedin ve tekrar deneyin.",
-	"parseErrors": "Tuş bağları yapılandırma dosyasına yazılamıyor. Lütfen dosyadaki hata/uyarıları düzeltmek için dosyayı açın ve tekrar deneyin.",
-	"errorInvalidConfiguration": "Tuş bağları yapılandırma dosyasına yazılamadı. Dosyada dizi olmayan bir nesne var. Temizlemek için lütfen dosyayı açın ve yeniden deneyin.",
-	"emptyKeybindingsHeader": "Varsayılanların üzerine yazmak için tuş bağlarınızı bu dosyaya yerleştirin"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/services/keybinding/electron-browser/keybindingService.i18n.json b/i18n/trk/src/vs/workbench/services/keybinding/electron-browser/keybindingService.i18n.json
deleted file mode 100644
index a7322862329..00000000000
--- a/i18n/trk/src/vs/workbench/services/keybinding/electron-browser/keybindingService.i18n.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"nonempty": "boş olmayan değer bekleniyordu.",
-	"requirestring": "`{0}` özelliği zorunludur ve `string` türünde olmalıdır",
-	"optstring": "`{0}` özelliği atlanabilir veya `string` türünde olmalıdır",
-	"vscode.extension.contributes.keybindings.command": "Tuş bağı tetiklendiğinde çalıştırılacak komutun tanımlayıcısı.",
-	"vscode.extension.contributes.keybindings.key": "Tuş veya tuş dizisi (tuşları artı işaretiyle veya boşluk dizisiyle ayırın, ör. bir akor için Ctrl+O ve Ctrl+L).",
-	"vscode.extension.contributes.keybindings.mac": "Mac'e özel tuş veya tuş dizisi.",
-	"vscode.extension.contributes.keybindings.linux": "Linux'a özel tuş veya tuş dizisi.",
-	"vscode.extension.contributes.keybindings.win": "Windows'a özel tuş veya tuş dizisi.",
-	"vscode.extension.contributes.keybindings.when": "Tuşun aktif olacağı koşul",
-	"vscode.extension.contributes.keybindings": "Tuş bağlarına ekleme yapar.",
-	"invalid.keybindings": "Geçersiz `contributes.{0}`: {1}",
-	"unboundCommands": "Kullanılabilen diğer komutlar şunlardır: ",
-	"keybindings.json.title": "Tuş bağları yapılandırması",
-	"keybindings.json.key": "Tuş veya tuş dizisi (boşluk ile ayrılmış olarak)",
-	"keybindings.json.command": "Yürütülecek komutun adı",
-	"keybindings.json.when": "Tuşun aktif olacağı koşul",
-	"keybindings.json.args": "Yürütülecek komuta iletilecek argümanlar.",
-	"keyboardConfigurationTitle": "Klavye",
-	"dispatch": "Tuş basımlarının ya `code` (önerilen) ya da `keyCode` kullanarak gönderilmesini denetler.",
-	"touchbar.enabled": "Varsa macOS dokunmatik çubuk düğmelerini etkinleştirir."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/services/message/browser/messageList.i18n.json b/i18n/trk/src/vs/workbench/services/message/browser/messageList.i18n.json
deleted file mode 100644
index 63ae13b3a84..00000000000
--- a/i18n/trk/src/vs/workbench/services/message/browser/messageList.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"alertErrorMessage": "Hata: {0}",
-	"alertWarningMessage": "Uyarı: {0}",
-	"alertInfoMessage": "Bilgi: {0}",
-	"error": "Hata",
-	"warning": "Uyar",
-	"info": "Bilgi",
-	"close": "Kapat"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/services/message/electron-browser/messageService.i18n.json b/i18n/trk/src/vs/workbench/services/message/electron-browser/messageService.i18n.json
deleted file mode 100644
index c9b9ed878f8..00000000000
--- a/i18n/trk/src/vs/workbench/services/message/electron-browser/messageService.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"yesButton": "&&Evet",
-	"cancelButton": "İptal"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/services/mode/common/workbenchModeService.i18n.json b/i18n/trk/src/vs/workbench/services/mode/common/workbenchModeService.i18n.json
deleted file mode 100644
index c62d9dda2b5..00000000000
--- a/i18n/trk/src/vs/workbench/services/mode/common/workbenchModeService.i18n.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.contributes.languages": "Dil bildirimlerine ekleme yapar.",
-	"vscode.extension.contributes.languages.id": "Dilin ID'si.",
-	"vscode.extension.contributes.languages.aliases": "Dilin takma adları.",
-	"vscode.extension.contributes.languages.extensions": "Dil ile ilişkili dosya uzantıları.",
-	"vscode.extension.contributes.languages.filenames": "Dil ile ilişkili dosya adları.",
-	"vscode.extension.contributes.languages.filenamePatterns": "Dil ile ilişkili dosya adı glob desenleri.",
-	"vscode.extension.contributes.languages.mimetypes": "Dil ile ilişkili MIME türleri.",
-	"vscode.extension.contributes.languages.firstLine": "Dilin bir dosyasının ilk satırıyla eşleşen düzenli ifade.",
-	"vscode.extension.contributes.languages.configuration": "Dil için yapılandırma seçenekleri içeren dosyaya, bir göreli yol.",
-	"invalid": "Geçersiz `contributes.{0}`. Bir dizi bekleniyordu.",
-	"invalid.empty": "`contributes.{0}` için boş değer",
-	"require.id": "`{0}` özelliği zorunludur ve `string` türünde olmalıdır",
-	"opt.extensions": "`{0}` özelliği atlanabilir veya `string[]` türünde olmalıdır",
-	"opt.filenames": "`{0}` özelliği atlanabilir veya `string[]` türünde olmalıdır",
-	"opt.firstLine": "`{0}` özelliği atlanabilir veya `string` türünde olmalıdır",
-	"opt.configuration": "`{0}` özelliği atlanabilir veya `string` türünde olmalıdır",
-	"opt.aliases": "`{0}` özelliği atlanabilir veya `string[]` türünde olmalıdır",
-	"opt.mimetypes": "`{0}` özelliği atlanabilir veya `string[]` türünde olmalıdır"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/services/progress/browser/progressService2.i18n.json b/i18n/trk/src/vs/workbench/services/progress/browser/progressService2.i18n.json
deleted file mode 100644
index 4e6920ae96e..00000000000
--- a/i18n/trk/src/vs/workbench/services/progress/browser/progressService2.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"progress.subtitle": "{0} - {1}",
-	"progress.title": "{0}: {1}",
-	"cancel": "İptal"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/services/textMate/electron-browser/TMGrammars.i18n.json b/i18n/trk/src/vs/workbench/services/textMate/electron-browser/TMGrammars.i18n.json
deleted file mode 100644
index 0de6a2517b4..00000000000
--- a/i18n/trk/src/vs/workbench/services/textMate/electron-browser/TMGrammars.i18n.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.contributes.grammars": "textmate tokenizerlere ekleme yapar.",
-	"vscode.extension.contributes.grammars.language": "Bu söz diziminin ekleneceği dil tanımlayıcısı.",
-	"vscode.extension.contributes.grammars.scopeName": "tmLanguage dosyası tarafından kullanılan Textmate kapsam adı.",
-	"vscode.extension.contributes.grammars.path": "tmLanguage dosyasının yolu. Yol, eklenti klasörüne görecelidir ve genellikle './syntaxes/' ile başlar.",
-	"vscode.extension.contributes.grammars.embeddedLanguages": "Bu dil bilgisinin gömülü dilleri içermesi durumundaki bir dil id'sinin kapsam adı haritası.",
-	"vscode.extension.contributes.grammars.tokenTypes": "Kapsam adından anahtar türüne kadar olan bir harita.",
-	"vscode.extension.contributes.grammars.injectTo": "Bu dil bilgisinin yerleştirileceği dil kapsam adları listesi."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/services/textMate/electron-browser/TMSyntax.i18n.json b/i18n/trk/src/vs/workbench/services/textMate/electron-browser/TMSyntax.i18n.json
deleted file mode 100644
index 75eba1ee007..00000000000
--- a/i18n/trk/src/vs/workbench/services/textMate/electron-browser/TMSyntax.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"invalid.language": "`contributes.{0}.language` ögesinde bilinmeyen dil. Sağlanan değer: {1}",
-	"invalid.scopeName": "`contributes.{0}.scopeName` ögesinde dize bekleniyor. Sağlanan değer: {1}",
-	"invalid.path.0": "`contributes.{0}.path` ögesinde dize bekleniyor. Sağlanan değer: {1}",
-	"invalid.injectTo": "`contributes.{0}.injectTo` ögesinde geçersiz değer. Dil kapsam adlarından oluşan bir dizi olmalıdır. Sağlanan değer: {1}",
-	"invalid.embeddedLanguages": "`contributes.{0}.embeddedLanguages` ögesinde geçersiz değer. Kapsam adından dile kadar olan bir nesne haritası olmalıdır. Sağlanan değer: {1}",
-	"invalid.tokenTypes": "`contributes.{0}.tokenTypes` ögesinde geçersiz değer. Kapsam adından anahtar türüne kadar olan bir nesne haritası olmalıdır. Sağlanan değer: {1}",
-	"invalid.path.1": "`contributes.{0}.path` ögesinin ({1}) eklentinin klasöründe ({2}) yer alması bekleniyor. Bu, eklentiyi taşınamaz yapabilir.",
-	"no-tm-grammar": "Bu dil için kayıtlı bir TM Grameri yok."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/services/textfile/common/textFileEditorModel.i18n.json b/i18n/trk/src/vs/workbench/services/textfile/common/textFileEditorModel.i18n.json
deleted file mode 100644
index 0f76bc426a2..00000000000
--- a/i18n/trk/src/vs/workbench/services/textfile/common/textFileEditorModel.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"saveFileFirst": "Dosya kaydedilmemiş değişiklikler içeriyor. Başka bir kodlama ile yeniden açmadan önce lütfen ilk olarak kaydedin.",
-	"genericSaveError": "'{0}' kaydedilemedi: ({1})."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/services/textfile/common/textFileService.i18n.json b/i18n/trk/src/vs/workbench/services/textfile/common/textFileService.i18n.json
deleted file mode 100644
index ffa12bdbe5e..00000000000
--- a/i18n/trk/src/vs/workbench/services/textfile/common/textFileService.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"files.backup.failSave": "Kaydedilmemiş değişiklikler içeren dosyalar yedekleme konumuna yazılamadı. (Hata: {0}). Önce dosyalarınızı kaydetmeyi deneyin ve ardından kapatın."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json b/i18n/trk/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json
deleted file mode 100644
index 4695dec6a6e..00000000000
--- a/i18n/trk/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"saveChangesMessage": "{0} dosyasına yaptığınız değişiklikleri kaydetmek istiyor musunuz?",
-	"saveChangesMessages": "Aşağıdaki {0} dosyaya yaptığınız değişiklikleri kaydetmek istiyor musunuz?",
-	"saveAll": "&&Tümünü Kaydet",
-	"save": "&&Kaydet",
-	"dontSave": "Kaydet&&me",
-	"cancel": "İptal",
-	"saveChangesDetail": "Değişiklikleriniz, kaydetmezseniz kaybolur.",
-	"allFiles": "Tüm Dosyalar",
-	"noExt": "Uzantısız"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/services/themes/common/colorExtensionPoint.i18n.json b/i18n/trk/src/vs/workbench/services/themes/common/colorExtensionPoint.i18n.json
deleted file mode 100644
index 99a30f5c966..00000000000
--- a/i18n/trk/src/vs/workbench/services/themes/common/colorExtensionPoint.i18n.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"contributes.color": "Eklenti tarafından tanımlanan tema olarak kullanılabilir renklere ekleme yapar",
-	"contributes.color.id": "Tema olarak kullanılabilir rengin tanımlayıcısı",
-	"contributes.color.id.format": "Tanımlayıcılar aa[.bb]* biçiminde olmalıdır",
-	"contributes.color.description": "Tema olarak kullanılabilir rengin açıklaması",
-	"contributes.defaults.light": "Açık temaların varsayılan rengi. Ya hex biçiminde bir renk değeri (#RRGGBB[AA]) ya da varsayılanı sağlayan bir tema olarak kullanılabilir rengin tanımlayıcısı olabilir.",
-	"contributes.defaults.dark": "Koyu temaların varsayılan rengi. Ya hex biçiminde bir renk değeri (#RRGGBB[AA]) ya da varsayılanı sağlayan bir tema olarak kullanılabilir rengin tanımlayıcısı olabilir.",
-	"contributes.defaults.highContrast": "Yüksek karşıtlık temalarının varsayılan rengi. Ya hex biçiminde bir renk değeri (#RRGGBB[AA]) ya da varsayılanı sağlayan bir tema olarak kullanılabilir rengin tanımlayıcısı olabilir.",
-	"invalid.colorConfiguration": "'configuration.colors' bir dizi olmalıdır",
-	"invalid.default.colorType": "{0}, ya hex biçiminde bir renk değeri (#RRGGBB[AA] veya #RGB[A]) ya da varsayılanı sağlayan bir tema olarak kullanılabilir rengin tanımlayıcısı olabilir.",
-	"invalid.id": "'configuration.colors.id' tanımlanmalı ve boş olmamalıdır",
-	"invalid.id.format": "'configuration.colors.id' sözcük[.sözcük]* şeklinde olmalıdır",
-	"invalid.description": "'configuration.colors.description' tanımlanmalı ve boş olmamalıdır",
-	"invalid.defaults": "'configuration.colors.defaults' tanımlanmalı ve 'light', 'dark' ve 'highContrast' değerlerini içermelidir"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/services/themes/common/colorThemeSchema.i18n.json b/i18n/trk/src/vs/workbench/services/themes/common/colorThemeSchema.i18n.json
deleted file mode 100644
index 728572b9745..00000000000
--- a/i18n/trk/src/vs/workbench/services/themes/common/colorThemeSchema.i18n.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"schema.token.settings": "Belirteç renkleri ve stilleri.",
-	"schema.token.foreground": "Belirteç ön plan rengi.",
-	"schema.token.background.warning": "Belirteç arka plan renkleri şu anda desteklenmiyor.",
-	"schema.token.fontStyle": "Kuralın yazı tipi stili: 'italic', 'bold' veya 'underline' ya da bunların bir kombinasyonu. Boş dize devralınan ayarları kaldırır.",
-	"schema.fontStyle.error": "Yazı tipi stili ya 'italic', 'bold' veya 'underline' ya da bunların bir kombinasyonu veya boş dize olmalıdır.",
-	"schema.token.fontStyle.none": "Hiçbiri (devralınan stili temizle)",
-	"schema.properties.name": "Kural açıklaması.",
-	"schema.properties.scope": "Bu kural karşısında eşleşecek kapsam seçicisi.",
-	"schema.tokenColors.path": "Bir tmTheme dosyasının yolu (geçerli dosyaya göreli).",
-	"schema.colors": "Sentaks vurgulaması renkleri"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/services/themes/common/fileIconThemeSchema.i18n.json b/i18n/trk/src/vs/workbench/services/themes/common/fileIconThemeSchema.i18n.json
deleted file mode 100644
index 41fb3455077..00000000000
--- a/i18n/trk/src/vs/workbench/services/themes/common/fileIconThemeSchema.i18n.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"schema.folderExpanded": "Genişletilmiş klasörler için klasör simgesi. Genişletilmiş klasör simgesi isteğe bağlıdır. Ayarlanmazsa, klasör için tanımlanan simge gösterilir.",
-	"schema.folder": "Daraltılmış klasörler için klasör simgesi; eğer folderExpanded ayarlanmamışsa, genişletilen klasörler için de kullanılır.",
-	"schema.file": "Varsayılan dosya simgesi, bir uzantı, dosya adı veya dil id'si ile eşleşmeyen tüm dosyalar için gösterilir.",
-	"schema.folderNames": "Klasör adlarını simgelerle ilişkilendirir. Nesne anahtarı, herhangi bir yol parçası içermeyen klasör adıdır. Örüntüler veya joker karakterlere izin verilmez. Klasör adı eşleştirme büyük/küçük harfe duyarlı değildir.",
-	"schema.folderName": "İlişkilendirilecek simge tanımı ID'si.",
-	"schema.folderNamesExpanded": "Klasör adlarını genişletilmiş klasör simgeleriyle ilişkilendirir. Nesne anahtarı, herhangi bir yol parçası içermeyen klasör adıdır. Örüntüler veya joker karakterlere izin verilmez. Klasör adı eşleştirme büyük/küçük harfe duyarlı değildir.",
-	"schema.folderNameExpanded": "İlişkilendirilecek simge tanımı ID'si.",
-	"schema.fileExtensions": "Dosya uzantılarını simgelerle ilişkilendirir. Nesne anahtarı, dosya uzantısı adıdır. Uzantı adı, bir dosya adındaki son noktadan sonraki kısmıdır(nokta dahil değil). Uzantılar büyük/küçük harf ayırt etmeksizin karşılaştırılır.",
-	"schema.fileExtension": "İlişkilendirilecek simge tanımı ID'si.",
-	"schema.fileNames": "Dosya adlarını simgelerle ilişkilendirir. Nesne anahtarı, herhangi bir yol parçası içermeyen tam dosya adıdır. Dosya adı noktalar ve olası bir dosya uzantısı içerebilir. Örüntüler veya joker karakterlere izin verilmez. Dosya adı eşleştirme büyük/küçük harfe duyarlı değildir.",
-	"schema.fileName": "İlişkilendirilecek simge tanımı ID'si.",
-	"schema.languageIds": "Dilleri simgelerle ilişkilendirir. Nesne anahtarı, dil ekleme noktasında tanımlanan dil id'sidir.",
-	"schema.languageId": "İlişkilendirilecek simge tanımı ID'si.",
-	"schema.fonts": "Simge tanımlarında kullanılacak yazı tipleri.",
-	"schema.id": "Yazı tipinin ID'si.",
-	"schema.src": "Yazı tipinin konumu.",
-	"schema.font-path": "Yazı tipi yolu, geçerli simge teması dosyasına göreli yol.",
-	"schema.font-format": "Yazı tipinin biçimi.",
-	"schema.font-weight": "Yazı tipinin kalınlığı.",
-	"schema.font-sstyle": "Yazı tipinin stili.",
-	"schema.font-size": "Yazı tipinin varsayılan boyutu.",
-	"schema.iconDefinitions": "Dosyalar simgelerle ilişkilendirirken kullanılabilecek tüm simgelerin açıklaması.",
-	"schema.iconDefinition": "Bir simge tanımı. Nesne anahtarı, tanımın ID'sidir.",
-	"schema.iconPath": "SVG veya PNG kullanırken: Görüntünün yolu. Yol, simge kümesi dosyasına görelidir.",
-	"schema.fontCharacter": "Glif yazı tipi kullanırken: Kullanılacak yazı tipindeki karakter.",
-	"schema.fontColor": "Glif yazı tipi kullanırken: Kullanılacak renk.",
-	"schema.fontSize": "Yazı tipi kullanırken: Metin yazı tipi yüzdesine göre yazı tipi boyutu. Ayarlanmazsa, yazı tipi tanımındaki boyut kullanılır.",
-	"schema.fontId": "Yazı tipi kullanırken: Yazı tipinin id'si. Ayarlanmazsa, ilk yazı tipi tanımı varsayılan olarak kullanılır.",
-	"schema.light": "Açık renk temalarındaki dosya simgeleri için isteğe bağlı ilişkilendirmeler.",
-	"schema.highContrast": "Yüksek karşıtlık renk temalarındaki dosya simgeleri için isteğe bağlı ilişkilendirmeler.",
-	"schema.hidesExplorerArrows": "Bu tema aktif olduğunda dosya gezgini ok işaretlerinin gizli olup olmayacağını yapılandırır."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/services/themes/electron-browser/colorThemeData.i18n.json b/i18n/trk/src/vs/workbench/services/themes/electron-browser/colorThemeData.i18n.json
deleted file mode 100644
index 67548d89edd..00000000000
--- a/i18n/trk/src/vs/workbench/services/themes/electron-browser/colorThemeData.i18n.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"error.cannotparsejson": "JSON tema dosyasını ayrıştırma sorunları: {0}",
-	"error.invalidformat.colors": "Renk teması dosyasını ayrıştırma sorunu: {0}. 'colors' özelliği 'nesne' türünde değil.",
-	"error.invalidformat.tokenColors": "Renk teması dosyasını ayrıştırma sorunu: {0}. 'tokenColors' özelliği ya renkleri belirten bir dizi ya da bir TextMate tema dosyasının yolunu içermelidir",
-	"error.plist.invalidformat": "tmTheme tema dosyasını ayrıştırma sorunları: {0}. 'settings' dizi değil",
-	"error.cannotparse": "tmTheme tema dosyasını ayrıştırma sorunları: {0}",
-	"error.cannotload": "{0} tmTheme tema dosyasını yükleme sorunları: {1}"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/services/themes/electron-browser/colorThemeStore.i18n.json b/i18n/trk/src/vs/workbench/services/themes/electron-browser/colorThemeStore.i18n.json
deleted file mode 100644
index 75644799bb3..00000000000
--- a/i18n/trk/src/vs/workbench/services/themes/electron-browser/colorThemeStore.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.contributes.themes": "Textmate renk temalarına ekleme yapar.",
-	"vscode.extension.contributes.themes.id": "Kullanıcı ayarlarında kullanılan simge teması Id'si.",
-	"vscode.extension.contributes.themes.label": "Kullanıcı arayüzünde görünen renk temasının etiketi.",
-	"vscode.extension.contributes.themes.uiTheme": "Editördeki renkleri tanımlayan temel tema: 'vs' açık renk temasıdır, 'vs-dark' koyu renk temasıdır. 'hc-black' ise yüksek kontrast temasıdır.",
-	"vscode.extension.contributes.themes.path": "tmLanguage dosyasının yolu. Yol, eklenti klasörüne görecelidir ve genellikle  './themes/themeFile.tmTheme'dir.",
-	"reqarray": "Eklenti noktası `{0}` bir dizi olmalıdır.",
-	"reqpath": "`contributes.{0}.path` ögesinde dize bekleniyor. Sağlanan değer: {1}",
-	"invalid.path.1": "`contributes.{0}.path` ögesinin ({1}) eklentinin klasöründe ({2}) yer alması bekleniyor. Bu, eklentiyi taşınamaz yapabilir."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/services/themes/electron-browser/fileIconThemeData.i18n.json b/i18n/trk/src/vs/workbench/services/themes/electron-browser/fileIconThemeData.i18n.json
deleted file mode 100644
index a4cd5ff8c5e..00000000000
--- a/i18n/trk/src/vs/workbench/services/themes/electron-browser/fileIconThemeData.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"error.cannotparseicontheme": "Dosya simgeleri dosyasını ayrıştırma sorunları: {0}"
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/services/themes/electron-browser/fileIconThemeStore.i18n.json b/i18n/trk/src/vs/workbench/services/themes/electron-browser/fileIconThemeStore.i18n.json
deleted file mode 100644
index 3f07f8e120a..00000000000
--- a/i18n/trk/src/vs/workbench/services/themes/electron-browser/fileIconThemeStore.i18n.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"vscode.extension.contributes.iconThemes": "Dosya simgesi temalarına ekleme yapar.",
-	"vscode.extension.contributes.iconThemes.id": "Kullanıcı ayarlarında kullanılan simge teması Id'si.",
-	"vscode.extension.contributes.iconThemes.label": "Kullanıcı arayüzünde görünen simge temasının etiketi.",
-	"vscode.extension.contributes.iconThemes.path": "Simge teması tanımlama dosyasının yolu. Yol, eklenti klasörüne görecelidir ve genellikle './icons/awesome-icon-theme.json'dur.",
-	"reqarray": "Eklenti noktası `{0}` bir dizi olmalıdır.",
-	"reqpath": "`contributes.{0}.path` ögesinde dize bekleniyor. Sağlanan değer: {1}",
-	"reqid": "`contributes.{0}.id` ögesinde dize bekleniyordu. Belirtilen değer: {1}",
-	"invalid.path.1": "`contributes.{0}.path` ögesinin ({1}) eklentinin klasöründe ({2}) yer alması bekleniyor. Bu, eklentiyi taşınamaz yapabilir."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json b/i18n/trk/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
deleted file mode 100644
index 62ba4066699..00000000000
--- a/i18n/trk/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"error.cannotloadtheme": "{0} yüklenemedi: {1}",
-	"colorTheme": "Çalışma ekranında kullanılan renk temasını belirtir.",
-	"colorThemeError": "Tema bilinmiyor veya yüklenmemiş.",
-	"iconTheme": "Çalışma ekranında kullanılan simge temasını veya hiçbir dosya simgesi göstermemek için 'null' belirtir.",
-	"noIconThemeDesc": "Dosya simgesi yok",
-	"iconThemeError": "Dosya simgesi teması bilinmiyor veya yüklenmemiş.",
-	"workbenchColors": "Şu an seçili renk temasındaki renkleri geçersiz kılar.",
-	"editorColors.comments": "Yorumların rengini ve stillerini ayarlar",
-	"editorColors.strings": "Dizelerin rengini ve stillerini ayarlar.",
-	"editorColors.keywords": "Anahtar sözcüklerin rengini ve stillerini ayarlar.",
-	"editorColors.numbers": "Numaraların rengini ve stillerini ayarlar.",
-	"editorColors.types": "Tür bildirimi ve başvurularının rengini ve stillerini ayarlar.",
-	"editorColors.functions": "Fonksiyon bildirimi ve başvurularının rengini ve stillerini ayarlar.",
-	"editorColors.variables": "Değişken bildirimi ve başvurularının rengini ve stillerini ayarlar.",
-	"editorColors.textMateRules": "Textmate tema kurallarını kullanarak renkleri ve stilleri ayarlar (gelişmiş).",
-	"editorColors": "Şu an seçili renk temasındaki düzenleyici renklerini ve yazı tipi stilini geçersiz kılar."
-}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json b/i18n/trk/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json
deleted file mode 100644
index e05f69c833c..00000000000
--- a/i18n/trk/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"": [
-		"--------------------------------------------------------------------------------------------",
-		"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."
-	],
-	"errorInvalidTaskConfiguration": "Çalışma alanı yapılandırma dosyasına yazılamıyor. Lütfen dosyadaki hata/uyarıları düzeltmek için dosyayı açın ve tekrar deneyin.",
-	"errorWorkspaceConfigurationFileDirty": "Kaydedilmemiş değişiklikler içerdiği için çalışma alanı yapılandırma dosyasına yazılamıyor. Lütfen dosyayı kaydedin ve tekrar deneyin.",
-	"openWorkspaceConfigurationFile": "Çalışma Alanı Yapılandırmasını Aç"
-}
\ No newline at end of file
diff --git a/package.json b/package.json
index ce824b24c2e..1e3462e0304 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "code-oss-dev",
-  "version": "1.25.0",
-  "distro": "680459b2b8617926a325b0e74e96429c21969bf5",
+  "version": "1.28.0",
+  "distro": "c140338a23ed045af10f275b62c2bb794ac81ce2",
   "author": {
     "name": "Microsoft Corporation"
   },
@@ -11,18 +11,18 @@
     "test": "mocha",
     "preinstall": "node build/npm/preinstall.js",
     "postinstall": "node build/npm/postinstall.js",
-    "compile": "gulp compile --max_old_space_size=4096",
-    "watch": "gulp watch --max_old_space_size=4096",
+    "compile": "gulp compile --max_old_space_size=4095",
+    "watch": "gulp watch --max_old_space_size=4095",
+    "watch-client": "gulp watch-client --max_old_space_size=4095",
     "monaco-editor-test": "mocha --only-monaco-editor",
     "precommit": "node build/gulpfile.hygiene.js",
-    "gulp": "gulp --max_old_space_size=4096",
+    "gulp": "gulp --max_old_space_size=4095",
     "7z": "7z",
     "update-grammars": "node build/npm/update-all-grammars.js",
     "update-localization-extension": "node build/npm/update-localization-extension.js",
-    "smoketest": "cd test/smoke && mocha",
+    "smoketest": "cd test/smoke && node test/index.js",
     "monaco-compile-check": "tsc -p src/tsconfig.monaco.json --noEmit",
-    "download-builtin-extensions": "node build/lib/builtInExtensions.js",
-    "check-monaco-editor-compilation": "tsc -p src/tsconfig.monaco.json --noEmit"
+    "download-builtin-extensions": "node build/lib/builtInExtensions.js"
   },
   "dependencies": {
     "applicationinsights": "0.18.0",
@@ -39,18 +39,20 @@
     "native-is-elevated": "^0.2.1",
     "native-keymap": "1.2.5",
     "native-watchdog": "0.3.0",
-    "node-pty": "0.7.4",
+    "node-pty": "0.7.7",
     "semver": "^5.5.0",
-    "spdlog": "0.6.0",
+    "spdlog": "0.7.2",
     "sudo-prompt": "8.2.0",
     "v8-inspect-profiler": "^0.0.8",
-    "vscode-chokidar": "1.6.2",
-    "vscode-debugprotocol": "1.28.0",
+    "vscode-chokidar": "1.6.4",
+    "vscode-debugprotocol": "1.32.0-pre.0",
     "vscode-nsfw": "1.0.17",
-    "vscode-ripgrep": "^1.0.1",
-    "vscode-textmate": "^3.3.3",
-    "vscode-xterm": "3.5.0-beta8",
-    "yauzl": "^2.9.1"
+    "vscode-ripgrep": "1.1.0",
+    "vscode-textmate": "^4.0.1",
+    "vscode-xterm": "3.8.0-beta2",
+    "winreg": "^1.2.4",
+    "yauzl": "^2.9.1",
+    "yazl": "^2.4.3"
   },
   "devDependencies": {
     "7zip": "0.0.6",
@@ -58,15 +60,16 @@
     "@types/minimist": "1.2.0",
     "@types/mocha": "2.2.39",
     "@types/sinon": "1.16.34",
+    "@types/webpack": "^4.4.10",
     "asar": "^0.14.0",
-    "azure-storage": "^0.3.1",
     "chromium-pickle-js": "^0.2.0",
     "clean-css": "3.4.6",
+    "copy-webpack-plugin": "^4.5.2",
     "coveralls": "^2.11.11",
     "cson-parser": "^1.3.3",
     "debounce": "^1.0.0",
     "documentdb": "^1.5.1",
-    "electron-mksnapshot": "~1.7.0",
+    "electron-mksnapshot": "~2.0.0",
     "eslint": "^3.4.0",
     "event-stream": "^3.1.7",
     "express": "^4.13.1",
@@ -101,10 +104,12 @@
     "istanbul": "^0.3.17",
     "jsdom-no-contextify": "^3.1.0",
     "lazy.js": "^0.4.2",
-    "mime": "1.2.11",
+    "merge-options": "^1.0.1",
+    "mime": "^1.4.1",
     "minimatch": "^2.0.10",
     "mkdirp": "^0.5.0",
     "mocha": "^2.2.5",
+    "mocha-junit-reporter": "^1.17.0",
     "object-assign": "^4.0.1",
     "optimist": "0.3.5",
     "p-all": "^1.0.0",
@@ -114,15 +119,19 @@
     "rimraf": "^2.2.8",
     "sinon": "^1.17.2",
     "source-map": "^0.4.4",
+    "ts-loader": "^4.4.2",
     "tslint": "^5.9.1",
-    "typescript": "2.9.1",
+    "typescript": "3.0.3",
     "typescript-formatter": "7.1.0",
     "uglify-es": "^3.0.18",
     "underscore": "^1.8.2",
     "vinyl": "^0.4.5",
     "vinyl-fs": "^2.4.3",
-    "vsce": "1.33.2",
-    "vscode-nls-dev": "3.0.7"
+    "vsce": "1.48.0",
+    "vscode-nls-dev": "3.2.2",
+    "webpack": "^4.16.5",
+    "webpack-cli": "^3.1.0",
+    "webpack-stream": "^5.1.1"
   },
   "repository": {
     "type": "git",
diff --git a/product.json b/product.json
index e1ff870df9f..ed3ced1c1be 100644
--- a/product.json
+++ b/product.json
@@ -11,6 +11,8 @@
 	"win32RegValueName": "CodeOSS",
 	"win32AppId": "{{E34003BB-9E10-4501-8C11-BE3FAA83F23F}",
 	"win32x64AppId": "{{D77B7E06-80BA-4137-BCF4-654B95CCEBC5}",
+	"win32UserAppId": "{{C6065F05-9603-4FC4-8101-B9781A25D88E}",
+	"win32x64UserAppId": "{{C6065F05-9603-4FC4-8101-B9781A25D88E}",
 	"win32AppUserModelId": "Microsoft.CodeOSS",
 	"win32ShellNameShort": "C&ode - OSS",
 	"darwinBundleIdentifier": "com.visualstudio.code.oss",
@@ -20,4 +22,4 @@
 		"ms-vscode.node-debug",
 		"ms-vscode.node-debug2"
 	]
-}
\ No newline at end of file
+}
diff --git a/resources/linux/debian/control.template b/resources/linux/debian/control.template
index 57f7c2075ff..92dbac93f45 100644
--- a/resources/linux/debian/control.template
+++ b/resources/linux/debian/control.template
@@ -1,7 +1,7 @@
 Package: @@NAME@@
 Version: @@VERSION@@
 Section: devel
-Depends: libnotify4, libnss3, gnupg, apt, libxkbfile1, libgconf-2-4, libsecret-1-0
+Depends: libnotify4, libnss3 (>= 2:3.26), gnupg, apt, libxkbfile1, libgconf-2-4, libsecret-1-0, libgtk-3-0 (>= 3.10.0)
 Priority: optional
 Architecture: @@ARCHITECTURE@@
 Maintainer: Microsoft Corporation <vscode-linux@microsoft.com>
diff --git a/resources/linux/rpm/dependencies.json b/resources/linux/rpm/dependencies.json
index e78bf4f85ca..c2ae8b8fe31 100644
--- a/resources/linux/rpm/dependencies.json
+++ b/resources/linux/rpm/dependencies.json
@@ -4,7 +4,7 @@
 		"libpthread.so.0(GLIBC_2.2.5)(64bit)",
 		"libpthread.so.0(GLIBC_2.3.2)(64bit)",
 		"libpthread.so.0(GLIBC_2.3.3)(64bit)",
-		"libgtk-x11-2.0.so.0()(64bit)",
+		"libgtk-3.so.0()(64bit)",
 		"libgdk-x11-2.0.so.0()(64bit)",
 		"libatk-1.0.so.0()(64bit)",
 		"libgio-2.0.so.0()(64bit)",
@@ -114,7 +114,7 @@
 		"libglib-2.0.so.0",
 		"libgmodule-2.0.so.0",
 		"libgobject-2.0.so.0",
-		"libgtk-x11-2.0.so.0",
+		"libgtk-3.so.0",
 		"libm.so.6",
 		"libm.so.6(GLIBC_2.0)",
 		"libm.so.6(GLIBC_2.1)",
diff --git a/scripts/code-cli.bat b/scripts/code-cli.bat
index f08ddb744e0..927e3e00d22 100644
--- a/scripts/code-cli.bat
+++ b/scripts/code-cli.bat
@@ -17,6 +17,12 @@ set CODE=".build\electron\%NAMESHORT%"
 node build\lib\electron.js
 if %errorlevel% neq 0 node .\node_modules\gulp\bin\gulp.js electron
 
+:: Manage build-in extensions
+if "%1"=="--builtin" goto builtin
+
+:: Sync built-in extensions
+node build\lib\builtInExtensions.js
+
 :: Build
 if not exist out node .\node_modules\gulp\bin\gulp.js compile
 
@@ -29,7 +35,14 @@ set ELECTRON_ENABLE_LOGGING=1
 set ELECTRON_ENABLE_STACK_DUMPING=1
 
 :: Launch Code
-%CODE% --debug=5874 out\cli.js . %*
+%CODE% --inspect=5874 out\cli.js . %*
+goto end
+
+:builtin
+%CODE% build/builtin
+
+:end
+
 popd
 
 endlocal
diff --git a/scripts/code-cli.sh b/scripts/code-cli.sh
index 89e518322fc..a7d61d5a897 100755
--- a/scripts/code-cli.sh
+++ b/scripts/code-cli.sh
@@ -24,6 +24,16 @@ function code() {
 	# Get electron
 	node build/lib/electron.js || ./node_modules/.bin/gulp electron
 
+
+	# Manage built-in extensions
+	if [[ "$1" == "--builtin" ]]; then
+		exec "$CODE" build/builtin
+		return
+	fi
+
+	# Sync built-in extensions
+	node build/lib/builtInExtensions.js
+
 	# Build
 	test -d out || ./node_modules/.bin/gulp compile
 
@@ -32,7 +42,7 @@ function code() {
 	VSCODE_DEV=1 \
 	ELECTRON_ENABLE_LOGGING=1 \
 	ELECTRON_ENABLE_STACK_DUMPING=1 \
-	"$CODE" --debug=5874 "$ROOT/out/cli.js" . "$@"
+	"$CODE" --inspect=5874 "$ROOT/out/cli.js" . "$@"
 }
 
 code "$@"
diff --git a/scripts/code.sh b/scripts/code.sh
index f6d103ceda5..26332faea6c 100755
--- a/scripts/code.sh
+++ b/scripts/code.sh
@@ -3,6 +3,10 @@
 if [[ "$OSTYPE" == "darwin"* ]]; then
 	realpath() { [[ $1 = /* ]] && echo "$1" || echo "$PWD/${1#./}"; }
 	ROOT=$(dirname "$(dirname "$(realpath "$0")")")
+
+	# On Linux with Electron 2.0.x running out of a VM causes
+	# a freeze so we only enable this flag on macOS
+	export ELECTRON_ENABLE_LOGGING=1
 else
 	ROOT=$(dirname "$(dirname "$(readlink -f $0)")")
 fi
@@ -40,7 +44,6 @@ function code() {
 	export NODE_ENV=development
 	export VSCODE_DEV=1
 	export VSCODE_CLI=1
-	export ELECTRON_ENABLE_LOGGING=1
 	export ELECTRON_ENABLE_STACK_DUMPING=1
 
 	# Launch Code
diff --git a/scripts/node-electron.sh b/scripts/node-electron.sh
index febdb7cb896..7216e92a6c6 100755
--- a/scripts/node-electron.sh
+++ b/scripts/node-electron.sh
@@ -7,26 +7,28 @@ else
 	ROOT=$(dirname $(dirname $(readlink -f $0)))
 fi
 
-cd $ROOT
+pushd $ROOT
 
 if [[ "$OSTYPE" == "darwin"* ]]; then
 	NAME=`node -p "require('./product.json').nameLong"`
-	CODE="./.build/electron/$NAME.app/Contents/MacOS/Electron"
+	CODE="$ROOT/.build/electron/$NAME.app/Contents/MacOS/Electron"
 else
 	NAME=`node -p "require('./product.json').applicationName"`
-	CODE=".build/electron/$NAME"
+	CODE="$ROOT/.build/electron/$NAME"
 fi
 
 # Get electron
 node build/lib/electron.js || ./node_modules/.bin/gulp electron
 
+popd
+
 export VSCODE_DEV=1
 if [[ "$OSTYPE" == "darwin"* ]]; then
-	cd $ROOT ; ulimit -n 4096 ; ELECTRON_RUN_AS_NODE=1 \
+	ulimit -n 4096 ; ELECTRON_RUN_AS_NODE=1 \
 		"$CODE" \
 		"$@"
 else
-	cd $ROOT ; ELECTRON_RUN_AS_NODE=1 \
+	ELECTRON_RUN_AS_NODE=1 \
 		"$CODE" \
 		"$@"
 fi
diff --git a/scripts/test-integration.bat b/scripts/test-integration.bat
index 4b8310ee04a..d01ef8ce356 100644
--- a/scripts/test-integration.bat
+++ b/scripts/test-integration.bat
@@ -18,6 +18,9 @@ if %errorlevel% neq 0 exit /b %errorlevel%
 call .\scripts\code.bat $%~dp0\..\extensions\emmet\test-fixtures --extensionDevelopmentPath=%~dp0\..\extensions\emmet --extensionTestsPath=%~dp0\..\extensions\emmet\out\test --disableExtensions --user-data-dir=%VSCODEUSERDATADIR% .
 if %errorlevel% neq 0 exit /b %errorlevel%
 
+call .\scripts\code.bat $%~dp0\..\extensions\search-rg\test-fixtures --extensionDevelopmentPath=%~dp0\..\extensions\search-rg --extensionTestsPath=%~dp0\..\extensions\search-rg\out\test --disableExtensions --user-data-dir=%VSCODEUSERDATADIR% .
+if %errorlevel% neq 0 exit /b %errorlevel%
+
 :: Integration & performance tests in AMD
 call .\scripts\test.bat --runGlob **\*.integrationTest.js %*
 if %errorlevel% neq 0 exit /b %errorlevel%
diff --git a/scripts/test-integration.sh b/scripts/test-integration.sh
index 9ed729093c0..dc5e38c31e5 100755
--- a/scripts/test-integration.sh
+++ b/scripts/test-integration.sh
@@ -17,6 +17,7 @@ cd $ROOT
 ./scripts/code.sh $ROOT/extensions/vscode-api-tests/testworkspace.code-workspace --extensionDevelopmentPath=$ROOT/extensions/vscode-api-tests --extensionTestsPath=$ROOT/extensions/vscode-api-tests/out/workspace-tests --disableExtensions --user-data-dir=$VSCODEUSERDATADIR --skip-getting-started
 ./scripts/code.sh $ROOT/extensions/vscode-colorize-tests/test --extensionDevelopmentPath=$ROOT/extensions/vscode-colorize-tests --extensionTestsPath=$ROOT/extensions/vscode-colorize-tests/out --disableExtensions --user-data-dir=$VSCODEUSERDATADIR --skip-getting-started
 ./scripts/code.sh $ROOT/extensions/markdown-language-features/test-fixtures --extensionDevelopmentPath=$ROOT/extensions/markdown-language-features --extensionTestsPath=$ROOT/extensions/markdown-language-features/out/test --disableExtensions --user-data-dir=$VSCODEUSERDATADIR --skip-getting-started
+./scripts/code.sh $ROOT/extensions/search-rg/test-fixtures --extensionDevelopmentPath=$ROOT/extensions/search-rg --extensionTestsPath=$ROOT/extensions/search-rg/out/test --disableExtensions --user-data-dir=$VSCODEUSERDATADIR --skip-getting-started
 
 mkdir $ROOT/extensions/emmet/test-fixtures
 ./scripts/code.sh $ROOT/extensions/emmet/test-fixtures --extensionDevelopmentPath=$ROOT/extensions/emmet --extensionTestsPath=$ROOT/extensions/emmet/out/test --disableExtensions --user-data-dir=$VSCODEUSERDATADIR --skip-getting-started .
@@ -25,7 +26,8 @@ rm -r $ROOT/extensions/emmet/test-fixtures
 # Integration tests in AMD
 ./scripts/test.sh --runGlob **/*.integrationTest.js "$@"
 
-# Tests in commonJS (HTML, CSS, JSON language server tests...)
-./scripts/node-electron.sh ./node_modules/mocha/bin/_mocha ./extensions/*/server/out/test/
+# Tests in commonJS
+cd $ROOT/extensions/css-language-features/server && $ROOT/scripts/node-electron.sh test/index.js
+cd $ROOT/extensions/html-language-features/server && $ROOT/scripts/node-electron.sh test/index.js
 
 rm -r $VSCODEUSERDATADIR
diff --git a/scripts/test.sh b/scripts/test.sh
index d88a28c5e2d..ac96627846f 100755
--- a/scripts/test.sh
+++ b/scripts/test.sh
@@ -4,6 +4,10 @@
 if [[ "$OSTYPE" == "darwin"* ]]; then
 	realpath() { [[ $1 = /* ]] && echo "$1" || echo "$PWD/${1#./}"; }
 	ROOT=$(dirname $(dirname $(realpath "$0")))
+
+	# On Linux with Electron 2.0.x running out of a VM causes
+	# a freeze so we only enable this flag on macOS
+	export ELECTRON_ENABLE_LOGGING=1
 else
 	ROOT=$(dirname $(dirname $(readlink -f $0)))
 fi
@@ -25,7 +29,6 @@ test -d node_modules || yarn
 node build/lib/electron.js || ./node_modules/.bin/gulp electron
 
 # Unit Tests
-export ELECTRON_ENABLE_LOGGING=1
 if [[ "$OSTYPE" == "darwin"* ]]; then
 	cd $ROOT ; ulimit -n 4096 ; \
 		"$CODE" \
diff --git a/src/bootstrap-amd.js b/src/bootstrap-amd.js
index f0015d389d3..85e0ef9c85e 100644
--- a/src/bootstrap-amd.js
+++ b/src/bootstrap-amd.js
@@ -3,56 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-var path = require('path');
-var fs = require('fs');
-var loader = require('./vs/loader');
+//@ts-check
+'use strict';
 
-function uriFromPath(_path) {
-	var pathName = path.resolve(_path).replace(/\\/g, '/');
+const loader = require('./vs/loader');
+const bootstrap = require('./bootstrap');
 
-	if (pathName.length > 0 && pathName.charAt(0) !== '/') {
-		pathName = '/' + pathName;
-	}
-
-	return encodeURI('file://' + pathName);
-}
-
-function readFile(file) {
-	return new Promise(function (resolve, reject) {
-		fs.readFile(file, 'utf8', function (err, data) {
-			if (err) {
-				reject(err);
-				return;
-			}
-			resolve(data);
-		});
-	});
-}
-
-var rawNlsConfig = process.env['VSCODE_NLS_CONFIG'];
-var nlsConfig = rawNlsConfig ? JSON.parse(rawNlsConfig) : { availableLanguages: {} };
-
-// We have a special location of the nls files. They come from a language pack
-if (nlsConfig._resolvedLanguagePackCoreLocation) {
-	let bundles = Object.create(null);
-	nlsConfig.loadBundle = function (bundle, language, cb) {
-		let result = bundles[bundle];
-		if (result) {
-			cb(undefined, result);
-			return;
-		}
-		let bundleFile = path.join(nlsConfig._resolvedLanguagePackCoreLocation, bundle.replace(/\//g, '!') + '.nls.json');
-		readFile(bundleFile).then(function (content) {
-			let json = JSON.parse(content);
-			bundles[bundle] = json;
-			cb(undefined, json);
-		})
-			.catch(cb);
-	};
-}
+// Bootstrap: NLS
+const nlsConfig = bootstrap.setupNLS();
 
+// Bootstrap: Loader
 loader.config({
-	baseUrl: uriFromPath(__dirname),
+	baseUrl: bootstrap.uriFromPath(__dirname),
 	catchError: true,
 	nodeRequire: require,
 	nodeMain: __filename,
@@ -60,13 +22,21 @@ loader.config({
 	nodeCachedDataDir: process.env['VSCODE_NODE_CACHED_DATA_DIR_' + process.pid]
 });
 
+// Running in Electron
+if (process.env['ELECTRON_RUN_AS_NODE'] || process.versions['electron']) {
+	loader.define('fs', ['original-fs'], function (originalFS) {
+		return originalFS;  // replace the patched electron fs with the original node fs for all AMD code
+	});
+}
+
+// Pseudo NLS support
 if (nlsConfig.pseudo) {
 	loader(['vs/nls'], function (nlsPlugin) {
 		nlsPlugin.setPseudoTranslation(nlsConfig.pseudo);
 	});
 }
 
-exports.bootstrap = function (entrypoint, onLoad, onError) {
+exports.load = function (entrypoint, onLoad, onError) {
 	if (!entrypoint) {
 		return;
 	}
diff --git a/src/bootstrap-fork.js b/src/bootstrap-fork.js
new file mode 100644
index 00000000000..e30cadb0fca
--- /dev/null
+++ b/src/bootstrap-fork.js
@@ -0,0 +1,197 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+//@ts-check
+'use strict';
+
+const bootstrap = require('./bootstrap');
+
+// Enable ASAR in our forked processes
+bootstrap.enableASARSupport();
+
+// Configure: pipe logging to parent process
+if (!!process.send && process.env.PIPE_LOGGING === 'true') {
+	pipeLoggingToParent();
+}
+
+// Disable IO if configured
+if (!process.env['VSCODE_ALLOW_IO']) {
+	disableSTDIO();
+}
+
+// Handle Exceptions
+if (!process.env['VSCODE_HANDLES_UNCAUGHT_ERRORS']) {
+	handleExceptions();
+}
+
+// Terminate when parent terminates
+if (process.env['VSCODE_PARENT_PID']) {
+	terminateWhenParentTerminates();
+}
+
+// Configure Crash Reporter
+configureCrashReporter();
+
+// Load AMD entry point
+require('./bootstrap-amd').load(process.env['AMD_ENTRYPOINT']);
+
+//#region Helpers
+
+function pipeLoggingToParent() {
+	const MAX_LENGTH = 100000;
+
+	// Prevent circular stringify and convert arguments to real array
+	function safeToArray(args) {
+		const seen = [];
+		const argsArray = [];
+
+		let res;
+
+		// Massage some arguments with special treatment
+		if (args.length) {
+			for (let i = 0; i < args.length; i++) {
+
+				// Any argument of type 'undefined' needs to be specially treated because
+				// JSON.stringify will simply ignore those. We replace them with the string
+				// 'undefined' which is not 100% right, but good enough to be logged to console
+				if (typeof args[i] === 'undefined') {
+					args[i] = 'undefined';
+				}
+
+				// Any argument that is an Error will be changed to be just the error stack/message
+				// itself because currently cannot serialize the error over entirely.
+				else if (args[i] instanceof Error) {
+					const errorObj = args[i];
+					if (errorObj.stack) {
+						args[i] = errorObj.stack;
+					} else {
+						args[i] = errorObj.toString();
+					}
+				}
+
+				argsArray.push(args[i]);
+			}
+		}
+
+		// Add the stack trace as payload if we are told so. We remove the message and the 2 top frames
+		// to start the stacktrace where the console message was being written
+		if (process.env.VSCODE_LOG_STACK === 'true') {
+			const stack = new Error().stack;
+			argsArray.push({ __$stack: stack.split('\n').slice(3).join('\n') });
+		}
+
+		try {
+			res = JSON.stringify(argsArray, function (key, value) {
+
+				// Objects get special treatment to prevent circles
+				if (isObject(value) || Array.isArray(value)) {
+					if (seen.indexOf(value) !== -1) {
+						return '[Circular]';
+					}
+
+					seen.push(value);
+				}
+
+				return value;
+			});
+		} catch (error) {
+			return 'Output omitted for an object that cannot be inspected (' + error.toString() + ')';
+		}
+
+		if (res && res.length > MAX_LENGTH) {
+			return 'Output omitted for a large object that exceeds the limits';
+		}
+
+		return res;
+	}
+
+	function safeSend(arg) {
+		try {
+			process.send(arg);
+		} catch (error) {
+			// Can happen if the parent channel is closed meanwhile
+		}
+	}
+
+	function isObject(obj) {
+		return typeof obj === 'object'
+			&& obj !== null
+			&& !Array.isArray(obj)
+			&& !(obj instanceof RegExp)
+			&& !(obj instanceof Date);
+	}
+
+	// Pass console logging to the outside so that we have it in the main side if told so
+	if (process.env.VERBOSE_LOGGING === 'true') {
+		console.log = function () { safeSend({ type: '__$console', severity: 'log', arguments: safeToArray(arguments) }); };
+		console.info = function () { safeSend({ type: '__$console', severity: 'log', arguments: safeToArray(arguments) }); };
+		console.warn = function () { safeSend({ type: '__$console', severity: 'warn', arguments: safeToArray(arguments) }); };
+	} else {
+		console.log = function () { /* ignore */ };
+		console.warn = function () { /* ignore */ };
+		console.info = function () { /* ignore */ };
+	}
+
+	console.error = function () { safeSend({ type: '__$console', severity: 'error', arguments: safeToArray(arguments) }); };
+}
+
+function disableSTDIO() {
+
+	// const stdout, stderr and stdin be no-op streams. This prevents an issue where we would get an EBADF
+	// error when we are inside a forked process and this process tries to access those channels.
+	const stream = require('stream');
+	const writable = new stream.Writable({
+		write: function () { /* No OP */ }
+	});
+
+	process['__defineGetter__']('stdout', function () { return writable; });
+	process['__defineGetter__']('stderr', function () { return writable; });
+	process['__defineGetter__']('stdin', function () { return writable; });
+}
+
+function handleExceptions() {
+
+	// Handle uncaught exceptions
+	// @ts-ignore
+	process.on('uncaughtException', function (err) {
+		console.error('Uncaught Exception: ', err);
+	});
+
+	// Handle unhandled promise rejections
+	// @ts-ignore
+	process.on('unhandledRejection', function (reason) {
+		console.error('Unhandled Promise Rejection: ', reason);
+	});
+}
+
+function terminateWhenParentTerminates() {
+	const parentPid = Number(process.env['VSCODE_PARENT_PID']);
+
+	if (typeof parentPid === 'number' && !isNaN(parentPid)) {
+		setInterval(function () {
+			try {
+				process.kill(parentPid, 0); // throws an exception if the main process doesn't exist anymore.
+			} catch (e) {
+				process.exit();
+			}
+		}, 5000);
+	}
+}
+
+function configureCrashReporter() {
+	const crashReporterOptionsRaw = process.env['CRASH_REPORTER_START_OPTIONS'];
+	if (typeof crashReporterOptionsRaw === 'string') {
+		try {
+			const crashReporterOptions = JSON.parse(crashReporterOptionsRaw);
+			if (crashReporterOptions) {
+				process['crashReporter'].start(crashReporterOptions);
+			}
+		} catch (error) {
+			console.error(error);
+		}
+	}
+}
+
+//#endregion
\ No newline at end of file
diff --git a/src/bootstrap-window.js b/src/bootstrap-window.js
new file mode 100644
index 00000000000..77c606a6774
--- /dev/null
+++ b/src/bootstrap-window.js
@@ -0,0 +1,200 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+//@ts-check
+'use strict';
+
+const bootstrap = require('./bootstrap');
+
+/**
+ * @param {object} destination
+ * @param {object} source
+ * @returns {object}
+ */
+exports.assign = function assign(destination, source) {
+	return Object.keys(source).reduce(function (r, key) { r[key] = source[key]; return r; }, destination);
+};
+
+/**
+ *
+ * @param {string[]} modulePaths
+ * @param {(result, configuration: object) => any} resultCallback
+ * @param {{ forceEnableDeveloperKeybindings?: boolean, removeDeveloperKeybindingsAfterLoad?: boolean, canModifyDOM?: (config: object) => void, beforeLoaderConfig?: (config: object, loaderConfig: object) => void, beforeRequire?: () => void }=} options
+ */
+exports.load = function (modulePaths, resultCallback, options) {
+
+	// @ts-ignore
+	const webFrame = require('electron').webFrame;
+	const path = require('path');
+
+	const args = parseURLQueryArgs();
+	const configuration = JSON.parse(args['config'] || '{}') || {};
+
+	// Error handler
+	// @ts-ignore
+	process.on('uncaughtException', function (error) {
+		onUnexpectedError(error, enableDeveloperTools);
+	});
+
+	// Developer tools
+	const enableDeveloperTools = (process.env['VSCODE_DEV'] || !!configuration.extensionDevelopmentPath) && !configuration.extensionTestsPath;
+	let developerToolsUnbind;
+	if (enableDeveloperTools || (options && options.forceEnableDeveloperKeybindings)) {
+		developerToolsUnbind = registerDeveloperKeybindings();
+	}
+
+	// Correctly inherit the parent's environment
+	exports.assign(process.env, configuration.userEnv);
+
+	// Enable ASAR support
+	bootstrap.enableASARSupport(path.join(configuration.appRoot, 'node_modules'));
+
+	// disable pinch zoom & apply zoom level early to avoid glitches
+	const zoomLevel = configuration.zoomLevel;
+	webFrame.setVisualZoomLevelLimits(1, 1);
+	if (typeof zoomLevel === 'number' && zoomLevel !== 0) {
+		webFrame.setZoomLevel(zoomLevel);
+	}
+
+	if (options && typeof options.canModifyDOM === 'function') {
+		options.canModifyDOM(configuration);
+	}
+
+	// Get the nls configuration into the process.env as early as possible.
+	const nlsConfig = bootstrap.setupNLS();
+
+	let locale = nlsConfig.availableLanguages['*'] || 'en';
+	if (locale === 'zh-tw') {
+		locale = 'zh-Hant';
+	} else if (locale === 'zh-cn') {
+		locale = 'zh-Hans';
+	}
+
+	window.document.documentElement.setAttribute('lang', locale);
+
+	// Load the loader
+	const amdLoader = require(configuration.appRoot + '/out/vs/loader.js');
+	const amdRequire = amdLoader.require;
+	const amdDefine = amdLoader.require.define;
+	const nodeRequire = amdLoader.require.nodeRequire;
+
+	window['nodeRequire'] = nodeRequire;
+	window['require'] = amdRequire;
+
+	// replace the patched electron fs with the original node fs for all AMD code
+	amdDefine('fs', ['original-fs'], function (originalFS) { return originalFS; });
+
+	window['MonacoEnvironment'] = {};
+
+	const loaderConfig = {
+		baseUrl: bootstrap.uriFromPath(configuration.appRoot) + '/out',
+		'vs/nls': nlsConfig,
+		nodeCachedDataDir: configuration.nodeCachedDataDir,
+		nodeModules: [/*BUILD->INSERT_NODE_MODULES*/]
+	};
+
+	if (options && typeof options.beforeLoaderConfig === 'function') {
+		options.beforeLoaderConfig(configuration, loaderConfig);
+	}
+
+	amdRequire.config(loaderConfig);
+
+	if (nlsConfig.pseudo) {
+		amdRequire(['vs/nls'], function (nlsPlugin) {
+			nlsPlugin.setPseudoTranslation(nlsConfig.pseudo);
+		});
+	}
+
+	if (options && typeof options.beforeRequire === 'function') {
+		options.beforeRequire();
+	}
+
+	amdRequire(modulePaths, result => {
+		try {
+			const callbackResult = resultCallback(result, configuration);
+			if (callbackResult && typeof callbackResult.then === 'function') {
+				callbackResult.then(() => {
+					if (developerToolsUnbind && options && options.removeDeveloperKeybindingsAfterLoad) {
+						developerToolsUnbind();
+					}
+				}, error => {
+					onUnexpectedError(error, enableDeveloperTools);
+				});
+			}
+		} catch (error) {
+			onUnexpectedError(error, enableDeveloperTools);
+		}
+	});
+};
+
+/**
+ * @returns {{[param: string]: string }}
+ */
+function parseURLQueryArgs() {
+	const search = window.location.search || '';
+
+	return search.split(/[?&]/)
+		.filter(function (param) { return !!param; })
+		.map(function (param) { return param.split('='); })
+		.filter(function (param) { return param.length === 2; })
+		.reduce(function (r, param) { r[param[0]] = decodeURIComponent(param[1]); return r; }, {});
+}
+
+/**
+ * @returns {() => void}
+ */
+function registerDeveloperKeybindings() {
+
+	// @ts-ignore
+	const ipc = require('electron').ipcRenderer;
+
+	const extractKey = function (e) {
+		return [
+			e.ctrlKey ? 'ctrl-' : '',
+			e.metaKey ? 'meta-' : '',
+			e.altKey ? 'alt-' : '',
+			e.shiftKey ? 'shift-' : '',
+			e.keyCode
+		].join('');
+	};
+
+	// Devtools & reload support
+	const TOGGLE_DEV_TOOLS_KB = (process.platform === 'darwin' ? 'meta-alt-73' : 'ctrl-shift-73'); // mac: Cmd-Alt-I, rest: Ctrl-Shift-I
+	const RELOAD_KB = (process.platform === 'darwin' ? 'meta-82' : 'ctrl-82'); // mac: Cmd-R, rest: Ctrl-R
+
+	let listener = function (e) {
+		const key = extractKey(e);
+		if (key === TOGGLE_DEV_TOOLS_KB) {
+			ipc.send('vscode:toggleDevTools');
+		} else if (key === RELOAD_KB) {
+			ipc.send('vscode:reloadWindow');
+		}
+	};
+
+	window.addEventListener('keydown', listener);
+
+	return function () {
+		if (listener) {
+			window.removeEventListener('keydown', listener);
+			listener = void 0;
+		}
+	};
+}
+
+function onUnexpectedError(error, enableDeveloperTools) {
+
+	// @ts-ignore
+	const ipc = require('electron').ipcRenderer;
+
+	if (enableDeveloperTools) {
+		ipc.send('vscode:openDevTools');
+	}
+
+	console.error('[uncaught exception]: ' + error);
+
+	if (error.stack) {
+		console.error(error.stack);
+	}
+}
\ No newline at end of file
diff --git a/src/bootstrap.js b/src/bootstrap.js
index 707513f7235..7aa1d4972cd 100644
--- a/src/bootstrap.js
+++ b/src/bootstrap.js
@@ -3,11 +3,38 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+//@ts-check
+'use strict';
+
+//#region global bootstrapping
+
+// increase number of stack frames(from 10, https://github.com/v8/v8/wiki/Stack-Trace-API)
+Error.stackTraceLimit = 100;
+
+// Workaround for Electron not installing a handler to ignore SIGPIPE
+// (https://github.com/electron/electron/issues/13254)
+// @ts-ignore
+process.on('SIGPIPE', () => {
+	console.error(new Error('Unexpected SIGPIPE'));
+});
+
+//#endregion
+
 //#region Add support for using node_modules.asar
-(function () {
-	const path = require('path');
+/**
+ * @param {string=} nodeModulesPath
+ */
+exports.enableASARSupport = function (nodeModulesPath) {
+
+	// @ts-ignore
 	const Module = require('module');
-	const NODE_MODULES_PATH = path.join(__dirname, '../node_modules');
+	const path = require('path');
+
+	let NODE_MODULES_PATH = nodeModulesPath;
+	if (!NODE_MODULES_PATH) {
+		NODE_MODULES_PATH = path.join(__dirname, '../node_modules');
+	}
+
 	const NODE_MODULES_ASAR_PATH = NODE_MODULES_PATH + '.asar';
 
 	const originalResolveLookupPaths = Module._resolveLookupPaths;
@@ -24,149 +51,170 @@
 
 		return result;
 	};
-})();
+};
 //#endregion
 
-// Will be defined if we got forked from another node process
-// In that case we override console.log/warn/error to be able
-// to send loading issues to the main side for logging.
-if (!!process.send && process.env.PIPE_LOGGING === 'true') {
-	var MAX_LENGTH = 100000;
+//#region URI helpers
+/**
+ * @param {string} _path
+ * @returns {string}
+ */
+exports.uriFromPath = function (_path) {
+	const path = require('path');
 
-	// Prevent circular stringify and convert arguments to real array
-	function safeToArray(args) {
-		var seen = [];
-		var res;
-		var argsArray = [];
+	let pathName = path.resolve(_path).replace(/\\/g, '/');
+	if (pathName.length > 0 && pathName.charAt(0) !== '/') {
+		pathName = '/' + pathName;
+	}
 
-		// Massage some arguments with special treatment
-		if (args.length) {
-			for (var i = 0; i < args.length; i++) {
+	return encodeURI('file://' + pathName).replace(/#/g, '%23');
+};
+//#endregion
 
-				// Any argument of type 'undefined' needs to be specially treated because
-				// JSON.stringify will simply ignore those. We replace them with the string
-				// 'undefined' which is not 100% right, but good enough to be logged to console
-				if (typeof args[i] === 'undefined') {
-					args[i] = 'undefined';
-				}
+//#region FS helpers
+/**
+ * @param {string} file
+ * @returns {Promise<string>}
+ */
+exports.readFile = function (file) {
+	const fs = require('fs');
 
-				// Any argument that is an Error will be changed to be just the error stack/message
-				// itself because currently cannot serialize the error over entirely.
-				else if (args[i] instanceof Error) {
-					var errorObj = args[i];
-					if (errorObj.stack) {
-						args[i] = errorObj.stack;
-					} else {
-						args[i] = errorObj.toString();
-					}
-				}
-
-				argsArray.push(args[i]);
+	return new Promise(function (resolve, reject) {
+		fs.readFile(file, 'utf8', function (err, data) {
+			if (err) {
+				reject(err);
+				return;
 			}
-		}
+			resolve(data);
+		});
+	});
+};
 
-		// Add the stack trace as payload if we are told so. We remove the message and the 2 top frames
-		// to start the stacktrace where the console message was being written
-		if (process.env.VSCODE_LOG_STACK === 'true') {
-			const stack = new Error().stack;
-			argsArray.push({ __$stack: stack.split('\n').slice(3).join('\n') });
-		}
+/**
+ * @param {string} file
+ * @param {string} content
+ * @returns {Promise<void>}
+ */
+exports.writeFile = function (file, content) {
+	const fs = require('fs');
 
+	return new Promise(function (resolve, reject) {
+		fs.writeFile(file, content, 'utf8', function (err) {
+			if (err) {
+				reject(err);
+				return;
+			}
+			resolve();
+		});
+	});
+};
+//#endregion
+
+//#region NLS helpers
+/**
+ * @returns {{locale?: string, availableLanguages: {[lang: string]: string;}, pseudo?: boolean }}
+ */
+exports.setupNLS = function () {
+	const path = require('path');
+
+	// Get the nls configuration into the process.env as early as possible.
+	let nlsConfig = { availableLanguages: {} };
+	if (process.env['VSCODE_NLS_CONFIG']) {
 		try {
-			res = JSON.stringify(argsArray, function (key, value) {
+			nlsConfig = JSON.parse(process.env['VSCODE_NLS_CONFIG']);
+		} catch (e) {
+			// Ignore
+		}
+	}
 
-				// Objects get special treatment to prevent circles
-				if (value && Object.prototype.toString.call(value) === '[object Object]') {
-					if (seen.indexOf(value) !== -1) {
-						return Object.create(null); // prevent circular references!
+	if (nlsConfig._resolvedLanguagePackCoreLocation) {
+		const bundles = Object.create(null);
+
+		nlsConfig.loadBundle = function (bundle, language, cb) {
+			let result = bundles[bundle];
+			if (result) {
+				cb(undefined, result);
+
+				return;
+			}
+
+			const bundleFile = path.join(nlsConfig._resolvedLanguagePackCoreLocation, bundle.replace(/\//g, '!') + '.nls.json');
+			exports.readFile(bundleFile).then(function (content) {
+				let json = JSON.parse(content);
+				bundles[bundle] = json;
+
+				cb(undefined, json);
+			}).catch((error) => {
+				try {
+					if (nlsConfig._corruptedFile) {
+						exports.writeFile(nlsConfig._corruptedFile, 'corrupted').catch(function (error) { console.error(error); });
 					}
-
-					seen.push(value);
+				} finally {
+					cb(error, undefined);
 				}
-
-				return value;
 			});
-		} catch (error) {
-			return 'Output omitted for an object that cannot be inspected (' + error.toString() + ')';
-		}
-
-		if (res && res.length > MAX_LENGTH) {
-			return 'Output omitted for a large object that exceeds the limits';
-		}
-
-		return res;
+		};
 	}
 
-	function safeSend(arg) {
-		try {
-			process.send(arg);
-		} catch (error) {
-			// Can happen if the parent channel is closed meanwhile
+	return nlsConfig;
+};
+//#endregion
+
+//#region Portable helpers
+/**
+ * @returns {{ portableDataPath: string, isPortable: boolean }}
+ */
+exports.configurePortable = function () {
+	// @ts-ignore
+	const product = require('../product.json');
+	const path = require('path');
+	const fs = require('fs');
+
+	const appRoot = path.dirname(__dirname);
+
+	function getApplicationPath() {
+		if (process.env['VSCODE_DEV']) {
+			return appRoot;
 		}
+
+		if (process.platform === 'darwin') {
+			return path.dirname(path.dirname(path.dirname(appRoot)));
+		}
+
+		return path.dirname(path.dirname(appRoot));
 	}
 
-	// Pass console logging to the outside so that we have it in the main side if told so
-	if (process.env.VERBOSE_LOGGING === 'true') {
-		console.log = function () { safeSend({ type: '__$console', severity: 'log', arguments: safeToArray(arguments) }); };
-		console.info = function () { safeSend({ type: '__$console', severity: 'log', arguments: safeToArray(arguments) }); };
-		console.warn = function () { safeSend({ type: '__$console', severity: 'warn', arguments: safeToArray(arguments) }); };
+	function getPortableDataPath() {
+		if (process.env['VSCODE_PORTABLE']) {
+			return process.env['VSCODE_PORTABLE'];
+		}
+
+		if (process.platform === 'win32' || process.platform === 'linux') {
+			return path.join(getApplicationPath(), 'data');
+		}
+
+		const portableDataName = product.portable || `${product.applicationName}-portable-data`;
+		return path.join(path.dirname(getApplicationPath()), portableDataName);
+	}
+
+	const portableDataPath = getPortableDataPath();
+	const isPortable = fs.existsSync(portableDataPath);
+	const portableTempPath = path.join(portableDataPath, 'tmp');
+	const isTempPortable = isPortable && fs.existsSync(portableTempPath);
+
+	if (isPortable) {
+		process.env['VSCODE_PORTABLE'] = portableDataPath;
 	} else {
-		console.log = function () { /* ignore */ };
-		console.warn = function () { /* ignore */ };
-		console.info = function () { /* ignore */ };
+		delete process.env['VSCODE_PORTABLE'];
 	}
 
-	console.error = function () { safeSend({ type: '__$console', severity: 'error', arguments: safeToArray(arguments) }); };
-}
-
-if (!process.env['VSCODE_ALLOW_IO']) {
-	// Let stdout, stderr and stdin be no-op streams. This prevents an issue where we would get an EBADF
-	// error when we are inside a forked process and this process tries to access those channels.
-	var stream = require('stream');
-	var writable = new stream.Writable({
-		write: function () { /* No OP */ }
-	});
-
-	process.__defineGetter__('stdout', function () { return writable; });
-	process.__defineGetter__('stderr', function () { return writable; });
-	process.__defineGetter__('stdin', function () { return writable; });
-}
-
-if (!process.env['VSCODE_HANDLES_UNCAUGHT_ERRORS']) {
-	// Handle uncaught exceptions
-	process.on('uncaughtException', function (err) {
-		console.error('Uncaught Exception: ', err.toString());
-		if (err.stack) {
-			console.error(err.stack);
-		}
-	});
-}
-
-// Kill oneself if one's parent dies. Much drama.
-if (process.env['VSCODE_PARENT_PID']) {
-	const parentPid = Number(process.env['VSCODE_PARENT_PID']);
-
-	if (typeof parentPid === 'number' && !isNaN(parentPid)) {
-		setInterval(function () {
-			try {
-				process.kill(parentPid, 0); // throws an exception if the main process doesn't exist anymore.
-			} catch (e) {
-				process.exit();
-			}
-		}, 5000);
+	if (isTempPortable) {
+		process.env[process.platform === 'win32' ? 'TEMP' : 'TMPDIR'] = portableTempPath;
 	}
-}
 
-const crashReporterOptionsRaw = process.env['CRASH_REPORTER_START_OPTIONS'];
-if (typeof crashReporterOptionsRaw === 'string') {
-	try {
-		const crashReporterOptions = JSON.parse(crashReporterOptionsRaw);
-		if (crashReporterOptions) {
-			process.crashReporter.start(crashReporterOptions);
-		}
-	} catch (error) {
-		console.error(error);
-	}
-}
-
-require('./bootstrap-amd').bootstrap(process.env['AMD_ENTRYPOINT']);
+	return {
+		portableDataPath,
+		isPortable
+	};
+};
+//#endregion
\ No newline at end of file
diff --git a/src/cli.js b/src/cli.js
index db7b6cce206..17db1b6a2f7 100644
--- a/src/cli.js
+++ b/src/cli.js
@@ -3,28 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-//#region Add support for using node_modules.asar
-(function () {
-	const path = require('path');
-	const Module = require('module');
-	const NODE_MODULES_PATH = path.join(__dirname, '../node_modules');
-	const NODE_MODULES_ASAR_PATH = NODE_MODULES_PATH + '.asar';
+//@ts-check
+'use strict';
 
-	const originalResolveLookupPaths = Module._resolveLookupPaths;
-	Module._resolveLookupPaths = function (request, parent, newReturn) {
-		const result = originalResolveLookupPaths(request, parent, newReturn);
+const bootstrap = require('./bootstrap');
 
-		const paths = newReturn ? result : result[1];
-		for (let i = 0, len = paths.length; i < len; i++) {
-			if (paths[i] === NODE_MODULES_PATH) {
-				paths.splice(i, 0, NODE_MODULES_ASAR_PATH);
-				break;
-			}
-		}
+// Enable portable support
+bootstrap.configurePortable();
 
-		return result;
-	};
-})();
-//#endregion
+// Enable ASAR support
+bootstrap.enableASARSupport();
 
-require('./bootstrap-amd').bootstrap('vs/code/node/cli');
\ No newline at end of file
+// Load CLI through AMD loader
+require('./bootstrap-amd').load('vs/code/node/cli');
\ No newline at end of file
diff --git a/src/main.js b/src/main.js
index beeae6f79be..fa3d97c42ac 100644
--- a/src/main.js
+++ b/src/main.js
@@ -2,60 +2,287 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
+
+//@ts-check
 'use strict';
 
-let perf = require('./vs/base/common/performance');
+const perf = require('./vs/base/common/performance');
 perf.mark('main:started');
 
-// Perf measurements
-global.perfStartTime = Date.now();
+const fs = require('fs');
+const path = require('path');
+const bootstrap = require('./bootstrap');
+const paths = require('./paths');
+// @ts-ignore
+const product = require('../product.json');
+// @ts-ignore
+const app = require('electron').app;
 
-Error.stackTraceLimit = 100; // increase number of stack frames (from 10, https://github.com/v8/v8/wiki/Stack-Trace-API)
+// Enable portable support
+const portable = bootstrap.configurePortable();
 
-//#region Add support for using node_modules.asar
-(function () {
-	const path = require('path');
-	const Module = require('module');
-	const NODE_MODULES_PATH = path.join(__dirname, '../node_modules');
-	const NODE_MODULES_ASAR_PATH = NODE_MODULES_PATH + '.asar';
+// Enable ASAR support
+bootstrap.enableASARSupport();
 
-	const originalResolveLookupPaths = Module._resolveLookupPaths;
-	Module._resolveLookupPaths = function (request, parent, newReturn) {
-		const result = originalResolveLookupPaths(request, parent, newReturn);
+// Set userData path before app 'ready' event and call to process.chdir
+const args = parseCLIArgs();
+const userDataPath = getUserDataPath(args);
+app.setPath('userData', userDataPath);
 
-		const paths = newReturn ? result : result[1];
-		for (let i = 0, len = paths.length; i < len; i++) {
-			if (paths[i] === NODE_MODULES_PATH) {
-				paths.splice(i, 0, NODE_MODULES_ASAR_PATH);
-				break;
-			}
-		}
+// Update cwd based on environment and platform
+setCurrentWorkingDirectory();
 
-		return result;
-	};
-})();
-//#endregion
+// Global app listeners
+registerListeners();
 
-let app = require('electron').app;
-let fs = require('fs');
-let path = require('path');
-let minimist = require('minimist');
-let paths = require('./paths');
-
-let args = minimist(process.argv, {
-	string: ['user-data-dir', 'locale']
+/**
+ * Support user defined locale
+ *
+ * @type {Promise}
+ */
+let nlsConfiguration = undefined;
+const userDefinedLocale = getUserDefinedLocale();
+userDefinedLocale.then((locale) => {
+	if (locale && !nlsConfiguration) {
+		nlsConfiguration = getNLSConfiguration(locale);
+	}
 });
 
+// Configure command line switches
+const nodeCachedDataDir = getNodeCachedDir();
+configureCommandlineSwitches(args, nodeCachedDataDir);
+
+// Load our code once ready
+app.once('ready', function () {
+	perf.mark('main:appReady');
+
+	Promise.all([nodeCachedDataDir.ensureExists(), userDefinedLocale]).then(([cachedDataDir, locale]) => {
+		if (locale && !nlsConfiguration) {
+			nlsConfiguration = getNLSConfiguration(locale);
+		}
+
+		if (!nlsConfiguration) {
+			nlsConfiguration = Promise.resolve(undefined);
+		}
+
+		// We first need to test a user defined locale. If it fails we try the app locale.
+		// If that fails we fall back to English.
+		nlsConfiguration.then((nlsConfig) => {
+
+			const startup = nlsConfig => {
+				nlsConfig._languagePackSupport = true;
+				process.env['VSCODE_NLS_CONFIG'] = JSON.stringify(nlsConfig);
+
+				if (cachedDataDir) {
+					process.env['VSCODE_NODE_CACHED_DATA_DIR_' + process.pid] = cachedDataDir;
+				}
+
+				// Load main in AMD
+				require('./bootstrap-amd').load('vs/code/electron-main/main');
+			};
+
+			// We recevied a valid nlsConfig from a user defined locale
+			if (nlsConfig) {
+				startup(nlsConfig);
+			}
+
+			// Try to use the app locale. Please note that the app locale is only
+			// valid after we have received the app ready event. This is why the
+			// code is here.
+			else {
+				let appLocale = app.getLocale();
+				if (!appLocale) {
+					startup({ locale: 'en', availableLanguages: {} });
+				} else {
+
+					// See above the comment about the loader and case sensitiviness
+					appLocale = appLocale.toLowerCase();
+
+					getNLSConfiguration(appLocale).then((nlsConfig) => {
+						if (!nlsConfig) {
+							nlsConfig = { locale: appLocale, availableLanguages: {} };
+						}
+
+						startup(nlsConfig);
+					});
+				}
+			}
+		});
+	}, console.error);
+});
+
+/**
+ * @typedef {import('minimist').ParsedArgs} ParsedArgs
+ *
+ * @param {ParsedArgs} cliArgs
+ * @param {{ jsFlags: () => string }} nodeCachedDataDir
+ */
+function configureCommandlineSwitches(cliArgs, nodeCachedDataDir) {
+
+	// TODO@Ben Electron 2.0.x: prevent localStorage migration from SQLite to LevelDB due to issues
+	app.commandLine.appendSwitch('disable-mojo-local-storage');
+
+	// Force pre-Chrome-60 color profile handling (for https://github.com/Microsoft/vscode/issues/51791)
+	app.commandLine.appendSwitch('disable-features', 'ColorCorrectRendering');
+
+	// Support JS Flags
+	const jsFlags = resolveJSFlags(cliArgs, nodeCachedDataDir.jsFlags());
+	if (jsFlags) {
+		app.commandLine.appendSwitch('--js-flags', jsFlags);
+	}
+}
+
+/**
+ * @param {ParsedArgs} cliArgs
+ * @param {string[]} jsFlags
+ * @returns {string}
+ */
+function resolveJSFlags(cliArgs, ...jsFlags) {
+	if (cliArgs['js-flags']) {
+		jsFlags.push(cliArgs['js-flags']);
+	}
+
+	if (cliArgs['max-memory'] && !/max_old_space_size=(\d+)/g.exec(cliArgs['js-flags'])) {
+		jsFlags.push(`--max_old_space_size=${cliArgs['max-memory']}`);
+	}
+
+	return jsFlags.length > 0 ? jsFlags.join(' ') : null;
+}
+
+/**
+ * @param {ParsedArgs} cliArgs
+ *
+ * @returns {string}
+ */
+function getUserDataPath(cliArgs) {
+	if (portable.isPortable) {
+		return path.join(portable.portableDataPath, 'user-data');
+	}
+
+	return path.resolve(cliArgs['user-data-dir'] || paths.getDefaultUserDataPath(process.platform));
+}
+
+/**
+ * @returns {ParsedArgs}
+ */
+function parseCLIArgs() {
+	const minimist = require('minimist');
+
+	return minimist(process.argv, {
+		string: [
+			'user-data-dir',
+			'locale',
+			'js-flags',
+			'max-memory'
+		]
+	});
+}
+
+function setCurrentWorkingDirectory() {
+	try {
+		if (process.platform === 'win32') {
+			process.env['VSCODE_CWD'] = process.cwd(); // remember as environment letiable
+			process.chdir(path.dirname(app.getPath('exe'))); // always set application folder as cwd
+		} else if (process.env['VSCODE_CWD']) {
+			process.chdir(process.env['VSCODE_CWD']);
+		}
+	} catch (err) {
+		console.error(err);
+	}
+}
+
+function registerListeners() {
+
+	/**
+	 * Mac: when someone drops a file to the not-yet running VSCode, the open-file event fires even before
+	 * the app-ready event. We listen very early for open-file and remember this upon startup as path to open.
+	 *
+	 * @type {string[]}
+	 */
+	const macOpenFiles = [];
+	global['macOpenFiles'] = macOpenFiles;
+	app.on('open-file', function (event, path) {
+		macOpenFiles.push(path);
+	});
+
+	/**
+	 * React to open-url requests.
+	 *
+	 * @type {string[]}
+	 */
+	const openUrls = [];
+	const onOpenUrl = function (event, url) {
+		event.preventDefault();
+
+		openUrls.push(url);
+	};
+
+	app.on('will-finish-launching', function () {
+		app.on('open-url', onOpenUrl);
+	});
+
+	global['getOpenUrls'] = function () {
+		app.removeListener('open-url', onOpenUrl);
+
+		return openUrls;
+	};
+}
+
+/**
+ * @returns {{ jsFlags: () => string; ensureExists: () => Promise<string | void>, _compute: () => string; }}
+ */
+function getNodeCachedDir() {
+	return new class {
+
+		constructor() {
+			this.value = this._compute();
+		}
+
+		jsFlags() {
+			return this.value ? '--nolazy' : undefined;
+		}
+
+		ensureExists() {
+			return mkdirp(this.value).then(() => this.value, () => { /*ignore*/ });
+		}
+
+		_compute() {
+			if (process.argv.indexOf('--no-cached-data') > 0) {
+				return undefined;
+			}
+
+			// IEnvironmentService.isBuilt
+			if (process.env['VSCODE_DEV']) {
+				return undefined;
+			}
+
+			// find commit id
+			const commit = product.commit;
+			if (!commit) {
+				return undefined;
+			}
+
+			return path.join(userDataPath, 'CachedData', commit);
+		}
+	};
+}
+
+//#region NLS Support
+/**
+ * @param {string} content
+ * @returns {string}
+ */
 function stripComments(content) {
-	let regexp = /("(?:[^\\\"]*(?:\\.)?)*")|('(?:[^\\\']*(?:\\.)?)*')|(\/\*(?:\r?\n|.)*?\*\/)|(\/{2,}.*?(?:(?:\r?\n)|$))/g;
-	let result = content.replace(regexp, function (match, m1, m2, m3, m4) {
+	const regexp = /("(?:[^\\\"]*(?:\\.)?)*")|('(?:[^\\\']*(?:\\.)?)*')|(\/\*(?:\r?\n|.)*?\*\/)|(\/{2,}.*?(?:(?:\r?\n)|$))/g;
+
+	return content.replace(regexp, function (match, m1, m2, m3, m4) {
 		// Only one of m1, m2, m3, m4 matches
 		if (m3) {
 			// A block comment. Replace with nothing
 			return '';
 		} else if (m4) {
 			// A line comment. If it ends in \r?\n then keep it.
-			let length_1 = m4.length;
+			const length_1 = m4.length;
 			if (length_1 > 2 && m4[length_1 - 1] === '\n') {
 				return m4[length_1 - 2] === '\r' ? '\r\n' : '\n';
 			}
@@ -67,137 +294,123 @@ function stripComments(content) {
 			return match;
 		}
 	});
-	return result;
-}
-
-let _commit;
-function getCommit() {
-	if (_commit) {
-		return _commit;
-	}
-	if (_commit === null) {
-		return undefined;
-	}
-	try {
-		let productJson = require(path.join(__dirname, '../product.json'));
-		if (productJson.commit) {
-			_commit = productJson.commit;
-		} else {
-			_commit = null;
-		}
-	} catch (exp) {
-		_commit = null;
-	}
-	return _commit || undefined;
-}
-
-function mkdirp(dir) {
-	return mkdir(dir)
-		.then(null, (err) => {
-			if (err && err.code === 'ENOENT') {
-				let parent = path.dirname(dir);
-				if (parent !== dir) { // if not arrived at root
-					return mkdirp(parent)
-						.then(() => {
-							return mkdir(dir);
-						});
-				}
-			}
-			throw err;
-		});
 }
 
+/**
+ * @param {string} dir
+ * @returns {Promise<string>}
+ */
 function mkdir(dir) {
-	return new Promise((resolve, reject) => {
-		fs.mkdir(dir, (err) => {
-			if (err && err.code !== 'EEXIST') {
-				reject(err);
-			} else {
-				resolve(dir);
-			}
-		});
-	});
+	return new Promise((c, e) => fs.mkdir(dir, err => (err && err.code !== 'EEXIST') ? e(err) : c(dir)));
 }
 
+/**
+ * @param {string} file
+ * @returns {Promise<boolean>}
+ */
 function exists(file) {
-	return new Promise((resolve) => {
-		fs.exists(file, (result) => {
-			resolve(result);
-		});
-	});
-}
-
-function readFile(file) {
-	return new Promise((resolve, reject) => {
-		fs.readFile(file, 'utf8', (err, data) => {
-			if (err) {
-				reject(err);
-				return;
-			}
-			resolve(data);
-		});
-	});
-}
-
-function writeFile(file, content) {
-	return new Promise((resolve, reject) => {
-		fs.writeFile(file, content, 'utf8', (err) => {
-			if (err) {
-				reject(err);
-				return;
-			}
-			resolve(undefined);
-		});
-	});
+	return new Promise(c => fs.exists(file, c));
 }
 
+/**
+ * @param {string} file
+ * @returns {Promise<void>}
+ */
 function touch(file) {
-	return new Promise((resolve, reject) => {
-		let d = new Date();
-		fs.utimes(file, d, d, (err) => {
-			if (err) {
-				reject(err);
-				return;
+	return new Promise((c, e) => { const d = new Date(); fs.utimes(file, d, d, err => err ? e(err) : c()); });
+}
+
+/**
+ * @param {string} file
+ * @returns {Promise<object>}
+ */
+function lstat(file) {
+	return new Promise((c, e) => fs.lstat(file, (err, stats) => err ? e(err) : c(stats)));
+}
+
+/**
+ * @param {string} dir
+ * @returns {Promise<string[]>}
+ */
+function readdir(dir) {
+	return new Promise((c, e) => fs.readdir(dir, (err, files) => err ? e(err) : c(files)));
+}
+
+/**
+ * @param {string} dir
+ * @returns {Promise<void>}
+ */
+function rmdir(dir) {
+	return new Promise((c, e) => fs.rmdir(dir, err => err ? e(err) : c(undefined)));
+}
+
+/**
+ * @param {string} file
+ * @returns {Promise<void>}
+ */
+function unlink(file) {
+	return new Promise((c, e) => fs.unlink(file, err => err ? e(err) : c(undefined)));
+}
+
+/**
+ * @param {string} dir
+ * @returns {Promise<string>}
+ */
+function mkdirp(dir) {
+	return mkdir(dir).then(null, err => {
+		if (err && err.code === 'ENOENT') {
+			const parent = path.dirname(dir);
+
+			if (parent !== dir) { // if not arrived at root
+				return mkdirp(parent).then(() => mkdir(dir));
 			}
-			resolve(undefined);
-		});
+		}
+
+		throw err;
 	});
 }
 
-function resolveJSFlags() {
-	let jsFlags = [];
-	if (args['js-flags']) {
-		jsFlags.push(args['js-flags']);
-	}
-	if (args['max-memory'] && !/max_old_space_size=(\d+)/g.exec(args['js-flags'])) {
-		jsFlags.push(`--max_old_space_size=${args['max-memory']}`);
-	}
-	if (jsFlags.length > 0) {
-		return jsFlags.join(' ');
-	} else {
-		return null;
-	}
+/**
+ * @param {string} location
+ * @returns {Promise<void>}
+ */
+function rimraf(location) {
+	return lstat(location).then(stat => {
+		if (stat.isDirectory() && !stat.isSymbolicLink()) {
+			return readdir(location)
+				.then(children => Promise.all(children.map(child => rimraf(path.join(location, child)))))
+				.then(() => rmdir(location));
+		} else {
+			return unlink(location);
+		}
+	}, err => {
+		if (err.code === 'ENOENT') {
+			return void 0;
+		}
+		throw err;
+	});
 }
 
 // Language tags are case insensitve however an amd loader is case sensitive
 // To make this work on case preserving & insensitive FS we do the following:
 // the language bundles have lower case language tags and we always lower case
 // the locale we receive from the user or OS.
-
+/**
+ * @returns {Promise<string>}
+ */
 function getUserDefinedLocale() {
-	let locale = args['locale'];
+	const locale = args['locale'];
 	if (locale) {
 		return Promise.resolve(locale.toLowerCase());
 	}
 
-	let userData = app.getPath('userData');
-	let localeConfig = path.join(userData, 'User', 'locale.json');
+	const localeConfig = path.join(userDataPath, 'User', 'locale.json');
 	return exists(localeConfig).then((result) => {
 		if (result) {
-			return readFile(localeConfig).then((content) => {
+			return bootstrap.readFile(localeConfig).then((content) => {
 				content = stripComments(content);
 				try {
-					let value = JSON.parse(content).locale;
+					const value = JSON.parse(content).locale;
 					return value && typeof value === 'string' ? value.toLowerCase() : undefined;
 				} catch (e) {
 					return undefined;
@@ -209,9 +422,11 @@ function getUserDefinedLocale() {
 	});
 }
 
+/**
+ * @returns {object}
+ */
 function getLanguagePackConfigurations() {
-	let userData = app.getPath('userData');
-	let configFile = path.join(userData, 'languagepacks.json');
+	const configFile = path.join(userDataPath, 'languagepacks.json');
 	try {
 		return require(configFile);
 	} catch (err) {
@@ -221,13 +436,17 @@ function getLanguagePackConfigurations() {
 	return undefined;
 }
 
+/**
+ * @param {object} config
+ * @param {string} locale
+ */
 function resolveLanguagePackLocale(config, locale) {
 	try {
 		while (locale) {
 			if (config[locale]) {
 				return locale;
 			} else {
-				let index = locale.lastIndexOf('-');
+				const index = locale.lastIndexOf('-');
 				if (index > 0) {
 					locale = locale.substring(0, index);
 				} else {
@@ -241,6 +460,9 @@ function resolveLanguagePackLocale(config, locale) {
 	return undefined;
 }
 
+/**
+ * @param {string} locale
+ */
 function getNLSConfiguration(locale) {
 	if (locale === 'pseudo') {
 		return Promise.resolve({ locale: locale, availableLanguages: {}, pseudo: true });
@@ -250,136 +472,118 @@ function getNLSConfiguration(locale) {
 		return Promise.resolve({ locale: locale, availableLanguages: {} });
 	}
 
-	let userData = app.getPath('userData');
-
 	// We have a built version so we have extracted nls file. Try to find
 	// the right file to use.
 
-	// Check if we have an English locale. If so fall to default since that is our
+	// Check if we have an English or English US locale. If so fall to default since that is our
 	// English translation (we don't ship *.nls.en.json files)
-	if (locale && (locale == 'en' || locale.startsWith('en-'))) {
+	if (locale && (locale === 'en' || locale === 'en-us')) {
 		return Promise.resolve({ locale: locale, availableLanguages: {} });
 	}
 
-	let initialLocale = locale;
-
-	function resolveLocale(locale) {
-		while (locale) {
-			let candidate = path.join(__dirname, 'vs', 'code', 'electron-main', 'main.nls.') + locale + '.js';
-			if (fs.existsSync(candidate)) {
-				return { locale: initialLocale, availableLanguages: { '*': locale } };
-			} else {
-				let index = locale.lastIndexOf('-');
-				if (index > 0) {
-					locale = locale.substring(0, index);
-				} else {
-					locale = undefined;
-				}
-			}
-		}
-		return undefined;
-	}
+	const initialLocale = locale;
 
 	perf.mark('nlsGeneration:start');
-	let defaultResult = function(locale) {
-		let isCoreLanguage = true;
-		if (locale) {
-			isCoreLanguage = ['de', 'es', 'fr', 'it', 'ja', 'ko', 'ru', 'zh-cn', 'zh-tw'].some((language) => {
-				return locale === language || locale.startsWith(language + '-');
-			});
-		}
-		if (isCoreLanguage) {
-			let result = resolveLocale(locale);
-			perf.mark('nlsGeneration:end');
-			return Promise.resolve(result);
-		} else  {
-			perf.mark('nlsGeneration:end');
-			return Promise.resolve({ locale: locale, availableLanguages: {} });
-		}
+
+	const defaultResult = function (locale) {
+		perf.mark('nlsGeneration:end');
+		return Promise.resolve({ locale: locale, availableLanguages: {} });
 	};
 	try {
-		let commit = getCommit();
+		const commit = product.commit;
 		if (!commit) {
-			return defaultResult(locale);
+			return defaultResult(initialLocale);
 		}
-		let configs = getLanguagePackConfigurations();
+		const configs = getLanguagePackConfigurations();
 		if (!configs) {
-			return defaultResult(locale);
+			return defaultResult(initialLocale);
 		}
-		let initialLocale = locale;
 		locale = resolveLanguagePackLocale(configs, locale);
 		if (!locale) {
 			return defaultResult(initialLocale);
 		}
-		let packConfig = configs[locale];
+		const packConfig = configs[locale];
 		let mainPack;
 		if (!packConfig || typeof packConfig.hash !== 'string' || !packConfig.translations || typeof (mainPack = packConfig.translations['vscode']) !== 'string') {
-			return defaultResult(locale);
+			return defaultResult(initialLocale);
 		}
 		return exists(mainPack).then((fileExists) => {
 			if (!fileExists) {
-				return defaultResult(locale);
+				return defaultResult(initialLocale);
 			}
-			let packId = packConfig.hash + '.' + locale;
-			let cacheRoot = path.join(userData, 'clp', packId);
-			let coreLocation = path.join(cacheRoot, commit);
-			let translationsConfigFile = path.join(cacheRoot, 'tcf.json');
-			let result = {
+			const packId = packConfig.hash + '.' + locale;
+			const cacheRoot = path.join(userDataPath, 'clp', packId);
+			const coreLocation = path.join(cacheRoot, commit);
+			const translationsConfigFile = path.join(cacheRoot, 'tcf.json');
+			const corruptedFile = path.join(cacheRoot, 'corrupted.info');
+			const result = {
 				locale: initialLocale,
 				availableLanguages: { '*': locale },
 				_languagePackId: packId,
 				_translationsConfigFile: translationsConfigFile,
 				_cacheRoot: cacheRoot,
-				_resolvedLanguagePackCoreLocation: coreLocation
+				_resolvedLanguagePackCoreLocation: coreLocation,
+				_corruptedFile: corruptedFile
 			};
-			return exists(coreLocation).then((fileExists) => {
-				if (fileExists) {
-					// We don't wait for this. No big harm if we can't touch
-					touch(coreLocation).catch(() => {});
-					perf.mark('nlsGeneration:end');
-					return result;
+			return exists(corruptedFile).then((corrupted) => {
+				// The nls cache directory is corrupted.
+				let toDelete;
+				if (corrupted) {
+					toDelete = rimraf(cacheRoot);
+				} else {
+					toDelete = Promise.resolve(undefined);
 				}
-				return mkdirp(coreLocation).then(() => {
-					return Promise.all([readFile(path.join(__dirname, 'nls.metadata.json')), readFile(mainPack)]);
-				}).then((values) => {
-					let metadata = JSON.parse(values[0]);
-					let packData = JSON.parse(values[1]).contents;
-					let bundles = Object.keys(metadata.bundles);
-					let writes = [];
-					for (let bundle of bundles) {
-						let modules = metadata.bundles[bundle];
-						let target = Object.create(null);
-						for (let module of modules) {
-							let keys = metadata.keys[module];
-							let defaultMessages = metadata.messages[module];
-							let translations = packData[module];
-							let targetStrings;
-							if (translations) {
-								targetStrings = [];
-								for (let i = 0; i < keys.length; i++) {
-									let elem = keys[i];
-									let key = typeof elem === 'string' ? elem : elem.key;
-									let translatedMessage = translations[key];
-									if (translatedMessage === undefined) {
-										translatedMessage = defaultMessages[i];
-									}
-									targetStrings.push(translatedMessage);
-								}
-							} else {
-								targetStrings = defaultMessages;
-							}
-							target[module] = targetStrings;
+				return toDelete.then(() => {
+					return exists(coreLocation).then((fileExists) => {
+						if (fileExists) {
+							// We don't wait for this. No big harm if we can't touch
+							touch(coreLocation).catch(() => { });
+							perf.mark('nlsGeneration:end');
+							return result;
 						}
-						writes.push(writeFile(path.join(coreLocation, bundle.replace(/\//g, '!') + '.nls.json'), JSON.stringify(target)));
-					}
-					writes.push(writeFile(translationsConfigFile, JSON.stringify(packConfig.translations)));
-					return Promise.all(writes);
-				}).then(() => {
-					perf.mark('nlsGeneration:end');
-					return result;
-				}).catch((err) => {
-					console.error('Generating translation files failed.', err);
-					return defaultResult(locale);
+						return mkdirp(coreLocation).then(() => {
+							return Promise.all([bootstrap.readFile(path.join(__dirname, 'nls.metadata.json')), bootstrap.readFile(mainPack)]);
+						}).then((values) => {
+							const metadata = JSON.parse(values[0]);
+							const packData = JSON.parse(values[1]).contents;
+							const bundles = Object.keys(metadata.bundles);
+							const writes = [];
+							for (let bundle of bundles) {
+								const modules = metadata.bundles[bundle];
+								const target = Object.create(null);
+								for (let module of modules) {
+									const keys = metadata.keys[module];
+									const defaultMessages = metadata.messages[module];
+									const translations = packData[module];
+									let targetStrings;
+									if (translations) {
+										targetStrings = [];
+										for (let i = 0; i < keys.length; i++) {
+											const elem = keys[i];
+											const key = typeof elem === 'string' ? elem : elem.key;
+											let translatedMessage = translations[key];
+											if (translatedMessage === undefined) {
+												translatedMessage = defaultMessages[i];
+											}
+											targetStrings.push(translatedMessage);
+										}
+									} else {
+										targetStrings = defaultMessages;
+									}
+									target[module] = targetStrings;
+								}
+								writes.push(bootstrap.writeFile(path.join(coreLocation, bundle.replace(/\//g, '!') + '.nls.json'), JSON.stringify(target)));
+							}
+							writes.push(bootstrap.writeFile(translationsConfigFile, JSON.stringify(packConfig.translations)));
+							return Promise.all(writes);
+						}).then(() => {
+							perf.mark('nlsGeneration:end');
+							return result;
+						}).catch((err) => {
+							console.error('Generating translation files failed.', err);
+							return defaultResult(locale);
+						});
+					});
 				});
 			});
 		});
@@ -388,134 +592,4 @@ function getNLSConfiguration(locale) {
 		return defaultResult(locale);
 	}
 }
-
-function getNodeCachedDataDir() {
-	// flag to disable cached data support
-	if (process.argv.indexOf('--no-cached-data') > 0) {
-		return Promise.resolve(undefined);
-	}
-
-	// IEnvironmentService.isBuilt
-	if (process.env['VSCODE_DEV']) {
-		return Promise.resolve(undefined);
-	}
-
-	// find commit id
-	let commit = getCommit();
-	if (!commit) {
-		return Promise.resolve(undefined);
-	}
-
-	let dir = path.join(app.getPath('userData'), 'CachedData', commit);
-
-	return mkdirp(dir).then(undefined, function () { /*ignore*/ });
-}
-
-// Set userData path before app 'ready' event and call to process.chdir
-let userData = path.resolve(args['user-data-dir'] || paths.getDefaultUserDataPath(process.platform));
-app.setPath('userData', userData);
-
-// Update cwd based on environment and platform
-try {
-	if (process.platform === 'win32') {
-		process.env['VSCODE_CWD'] = process.cwd(); // remember as environment letiable
-		process.chdir(path.dirname(app.getPath('exe'))); // always set application folder as cwd
-	} else if (process.env['VSCODE_CWD']) {
-		process.chdir(process.env['VSCODE_CWD']);
-	}
-} catch (err) {
-	console.error(err);
-}
-
-// Mac: when someone drops a file to the not-yet running VSCode, the open-file event fires even before
-// the app-ready event. We listen very early for open-file and remember this upon startup as path to open.
-global.macOpenFiles = [];
-app.on('open-file', function (event, path) {
-	global.macOpenFiles.push(path);
-});
-
-let openUrls = [];
-let onOpenUrl = function (event, url) {
-	event.preventDefault();
-	openUrls.push(url);
-};
-
-app.on('will-finish-launching', function () {
-	app.on('open-url', onOpenUrl);
-});
-
-global.getOpenUrls = function () {
-	app.removeListener('open-url', onOpenUrl);
-	return openUrls;
-};
-
-// use '<UserData>/CachedData'-directory to store
-// node/v8 cached data.
-let nodeCachedDataDir = getNodeCachedDataDir().then(function (value) {
-	if (value) {
-		// store the data directory
-		process.env['VSCODE_NODE_CACHED_DATA_DIR_' + process.pid] = value;
-
-		// tell v8 to not be lazy when parsing JavaScript. Generally this makes startup slower
-		// but because we generate cached data it makes subsequent startups much faster
-		let existingJSFlags = resolveJSFlags();
-		app.commandLine.appendSwitch('--js-flags', existingJSFlags ? existingJSFlags + ' --nolazy' : '--nolazy');
-	}
-	return value;
-});
-
-let nlsConfiguration = undefined;
-let userDefinedLocale = getUserDefinedLocale();
-userDefinedLocale.then((locale) => {
-	if (locale && !nlsConfiguration) {
-		nlsConfiguration = getNLSConfiguration(locale);
-	}
-});
-
-let jsFlags = resolveJSFlags();
-if (jsFlags) {
-	app.commandLine.appendSwitch('--js-flags', jsFlags);
-}
-
-// Load our code once ready
-app.once('ready', function () {
-	perf.mark('main:appReady');
-	Promise.all([nodeCachedDataDir, userDefinedLocale]).then((values) => {
-		let locale = values[1];
-		if (locale && !nlsConfiguration) {
-			nlsConfiguration = getNLSConfiguration(locale);
-		}
-		if (!nlsConfiguration) {
-			nlsConfiguration = Promise.resolve(undefined);
-		}
-		// We first need to test a user defined locale. If it fails we try the app locale.
-		// If that fails we fall back to English.
-		nlsConfiguration.then((nlsConfig) => {
-			let boot = (nlsConfig) => {
-				process.env['VSCODE_NLS_CONFIG'] = JSON.stringify(nlsConfig);
-				require('./bootstrap-amd').bootstrap('vs/code/electron-main/main');
-			};
-			// We recevied a valid nlsConfig from a user defined locale
-			if (nlsConfig) {
-				boot(nlsConfig);
-			} else {
-				// Try to use the app locale. Please note that the app locale is only
-				// valid after we have received the app ready event. This is why the
-				// code is here.
-				let appLocale = app.getLocale();
-				if (!appLocale) {
-					boot({ locale: 'en', availableLanguages: {} });
-				} else {
-					// See above the comment about the loader and case sensitiviness
-					appLocale = appLocale.toLowerCase();
-					getNLSConfiguration(appLocale).then((nlsConfig) => {
-						if (!nlsConfig) {
-							nlsConfig = { locale: appLocale, availableLanguages: {} };
-						}
-						boot(nlsConfig);
-					});
-				}
-			}
-		});
-	}, console.error);
-});
+//#endregion
\ No newline at end of file
diff --git a/src/paths.js b/src/paths.js
index 1fa7c625ee1..33c691bf72b 100644
--- a/src/paths.js
+++ b/src/paths.js
@@ -3,10 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-var path = require('path');
-var os = require('os');
-var pkg = require('../package.json');
+//@ts-check
+'use strict';
 
+// @ts-ignore
+const pkg = require('../package.json');
+const path = require('path');
+const os = require('os');
+
+/**
+ * @param {string} platform
+ * @returns {string}
+ */
 function getAppDataPath(platform) {
 	switch (platform) {
 		case 'win32': return process.env['VSCODE_APPDATA'] || process.env['APPDATA'] || path.join(process.env['USERPROFILE'], 'AppData', 'Roaming');
@@ -16,6 +24,10 @@ function getAppDataPath(platform) {
 	}
 }
 
+/**
+ * @param {string} platform
+ * @returns {string}
+ */
 function getDefaultUserDataPath(platform) {
 	return path.join(getAppDataPath(platform), pkg.name);
 }
diff --git a/src/tsconfig.json b/src/tsconfig.json
index d2b9e229c4a..408cad4917b 100644
--- a/src/tsconfig.json
+++ b/src/tsconfig.json
@@ -18,5 +18,10 @@
 		"typeRoots": [
 			"typings"
 		]
-	}
+	},
+	"exclude": [
+		"../out",
+		"../out-build",
+		"../out-vscode"
+	]
 }
diff --git a/src/typings/electron.d.ts b/src/typings/electron.d.ts
index daf41dbc736..a285a962ad7 100644
--- a/src/typings/electron.d.ts
+++ b/src/typings/electron.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Electron 1.7.9
+// Type definitions for Electron 2.0.5
 // Project: http://electron.atom.io/
 // Definitions by: The Electron Team <https://github.com/electron/electron>
 // Definitions: https://github.com/electron/electron-typescript-definitions
@@ -58,6 +58,7 @@ declare namespace Electron {
 		dialog: Dialog;
 		DownloadItem: typeof DownloadItem;
 		globalShortcut: GlobalShortcut;
+		inAppPurchase: InAppPurchase;
 		IncomingMessage: typeof IncomingMessage;
 		ipcMain: IpcMain;
 		Menu: typeof Menu;
@@ -94,6 +95,7 @@ declare namespace Electron {
 	const desktopCapturer: DesktopCapturer;
 	const dialog: Dialog;
 	const globalShortcut: GlobalShortcut;
+	const inAppPurchase: InAppPurchase;
 	const ipcMain: IpcMain;
 	const ipcRenderer: IpcRenderer;
 	type nativeImage = NativeImage;
@@ -102,7 +104,7 @@ declare namespace Electron {
 	const powerMonitor: PowerMonitor;
 	const powerSaveBlocker: PowerSaveBlocker;
 	const protocol: Protocol;
-	const remote: Remote;
+	// const remote: Remote; ### VSCODE CHANGE (we do not want to use remote)
 	const screen: Screen;
 	type session = Session;
 	const session: typeof Session;
@@ -157,12 +159,54 @@ declare namespace Electron {
 			hasVisibleWindows: boolean) => void): this;
 		removeListener(event: 'activate', listener: (event: Event,
 			hasVisibleWindows: boolean) => void): this;
+		/**
+		 * Emitted during Handoff after an activity from this device was successfully
+		 * resumed on another one.
+		 */
+		on(event: 'activity-was-continued', listener: (event: Event,
+			/**
+			 * A string identifying the activity. Maps to .
+			 */
+			type: string,
+			/**
+			 * Contains app-specific state stored by the activity.
+			 */
+			userInfo: any) => void): this;
+		once(event: 'activity-was-continued', listener: (event: Event,
+			/**
+			 * A string identifying the activity. Maps to .
+			 */
+			type: string,
+			/**
+			 * Contains app-specific state stored by the activity.
+			 */
+			userInfo: any) => void): this;
+		addListener(event: 'activity-was-continued', listener: (event: Event,
+			/**
+			 * A string identifying the activity. Maps to .
+			 */
+			type: string,
+			/**
+			 * Contains app-specific state stored by the activity.
+			 */
+			userInfo: any) => void): this;
+		removeListener(event: 'activity-was-continued', listener: (event: Event,
+			/**
+			 * A string identifying the activity. Maps to .
+			 */
+			type: string,
+			/**
+			 * Contains app-specific state stored by the activity.
+			 */
+			userInfo: any) => void): this;
 		/**
 		 * Emitted before the application starts closing its windows. Calling
 		 * event.preventDefault() will prevent the default behaviour, which is terminating
 		 * the application. Note: If application quit was initiated by
 		 * autoUpdater.quitAndInstall() then before-quit is emitted after emitting close
-		 * event on all windows and closing them.
+		 * event on all windows and closing them. Note: On Windows, this event will not be
+		 * emitted if the app is closed due to a shutdown/restart of the system or a user
+		 * logout.
 		 */
 		on(event: 'before-quit', listener: (event: Event) => void): this;
 		once(event: 'before-quit', listener: (event: Event) => void): this;
@@ -286,6 +330,46 @@ declare namespace Electron {
 			 * Contains app-specific state stored by the activity on another device.
 			 */
 			userInfo: any) => void): this;
+		/**
+		 * Emitted during Handoff when an activity from a different device fails to be
+		 * resumed.
+		 */
+		on(event: 'continue-activity-error', listener: (event: Event,
+			/**
+			 * A string identifying the activity. Maps to .
+			 */
+			type: string,
+			/**
+			 * A string with the error's localized description.
+			 */
+			error: string) => void): this;
+		once(event: 'continue-activity-error', listener: (event: Event,
+			/**
+			 * A string identifying the activity. Maps to .
+			 */
+			type: string,
+			/**
+			 * A string with the error's localized description.
+			 */
+			error: string) => void): this;
+		addListener(event: 'continue-activity-error', listener: (event: Event,
+			/**
+			 * A string identifying the activity. Maps to .
+			 */
+			type: string,
+			/**
+			 * A string with the error's localized description.
+			 */
+			error: string) => void): this;
+		removeListener(event: 'continue-activity-error', listener: (event: Event,
+			/**
+			 * A string identifying the activity. Maps to .
+			 */
+			type: string,
+			/**
+			 * A string with the error's localized description.
+			 */
+			error: string) => void): this;
 		/**
 		 * Emitted when the gpu process crashes or is killed.
 		 */
@@ -364,7 +448,9 @@ declare namespace Electron {
 		removeListener(event: 'open-url', listener: (event: Event,
 			url: string) => void): this;
 		/**
-		 * Emitted when the application is quitting.
+		 * Emitted when the application is quitting. Note: On Windows, this event will not
+		 * be emitted if the app is closed due to a shutdown/restart of the system or a
+		 * user logout.
 		 */
 		on(event: 'quit', listener: (event: Event,
 			exitCode: number) => void): this;
@@ -410,6 +496,49 @@ declare namespace Electron {
 			url: string,
 			certificateList: Certificate[],
 			callback: (certificate?: Certificate) => void) => void): this;
+		/**
+		 * Emitted when Handoff is about to be resumed on another device. If you need to
+		 * update the state to be transferred, you should call event.preventDefault()
+		 * immediately, construct a new userInfo dictionary and call
+		 * app.updateCurrentActiviy() in a timely manner. Otherwise the operation will fail
+		 * and continue-activity-error will be called.
+		 */
+		on(event: 'update-activity-state', listener: (event: Event,
+			/**
+			 * A string identifying the activity. Maps to .
+			 */
+			type: string,
+			/**
+			 * Contains app-specific state stored by the activity.
+			 */
+			userInfo: any) => void): this;
+		once(event: 'update-activity-state', listener: (event: Event,
+			/**
+			 * A string identifying the activity. Maps to .
+			 */
+			type: string,
+			/**
+			 * Contains app-specific state stored by the activity.
+			 */
+			userInfo: any) => void): this;
+		addListener(event: 'update-activity-state', listener: (event: Event,
+			/**
+			 * A string identifying the activity. Maps to .
+			 */
+			type: string,
+			/**
+			 * Contains app-specific state stored by the activity.
+			 */
+			userInfo: any) => void): this;
+		removeListener(event: 'update-activity-state', listener: (event: Event,
+			/**
+			 * A string identifying the activity. Maps to .
+			 */
+			type: string,
+			/**
+			 * Contains app-specific state stored by the activity.
+			 */
+			userInfo: any) => void): this;
 		/**
 		 * Emitted when a new webContents is created.
 		 */
@@ -421,6 +550,31 @@ declare namespace Electron {
 			webContents: WebContents) => void): this;
 		removeListener(event: 'web-contents-created', listener: (event: Event,
 			webContents: WebContents) => void): this;
+		/**
+		 * Emitted during Handoff before an activity from a different device wants to be
+		 * resumed. You should call event.preventDefault() if you want to handle this
+		 * event.
+		 */
+		on(event: 'will-continue-activity', listener: (event: Event,
+			/**
+			 * A string identifying the activity. Maps to .
+			 */
+			type: string) => void): this;
+		once(event: 'will-continue-activity', listener: (event: Event,
+			/**
+			 * A string identifying the activity. Maps to .
+			 */
+			type: string) => void): this;
+		addListener(event: 'will-continue-activity', listener: (event: Event,
+			/**
+			 * A string identifying the activity. Maps to .
+			 */
+			type: string) => void): this;
+		removeListener(event: 'will-continue-activity', listener: (event: Event,
+			/**
+			 * A string identifying the activity. Maps to .
+			 */
+			type: string) => void): this;
 		/**
 		 * Emitted when the application has finished basic startup. On Windows and Linux,
 		 * the will-finish-launching event is the same as the ready event; on macOS, this
@@ -437,7 +591,9 @@ declare namespace Electron {
 		 * Emitted when all windows have been closed and the application will quit. Calling
 		 * event.preventDefault() will prevent the default behaviour, which is terminating
 		 * the application. See the description of the window-all-closed event for the
-		 * differences between the will-quit and window-all-closed events.
+		 * differences between the will-quit and window-all-closed events. Note: On
+		 * Windows, this event will not be emitted if the app is closed due to a
+		 * shutdown/restart of the system or a user logout.
 		 */
 		on(event: 'will-quit', listener: (event: Event) => void): this;
 		once(event: 'will-quit', listener: (event: Event) => void): this;
@@ -482,7 +638,7 @@ declare namespace Electron {
 		 */
 		enableMixedSandbox(): void;
 		/**
-		 * Exits immediately with exitCode.  exitCode defaults to 0. All windows will be
+		 * Exits immediately with exitCode. exitCode defaults to 0. All windows will be
 		 * closed immediately without asking user and the before-quit and will-quit events
 		 * will not be emitted.
 		 */
@@ -492,7 +648,6 @@ declare namespace Electron {
 		 * the active app. On Windows, focuses on the application's first window.
 		 */
 		focus(): void;
-		getAppMemoryInfo(): ProcessMetric[];
 		getAppMetrics(): ProcessMetric[];
 		getAppPath(): string;
 		getBadgeCount(): number;
@@ -501,24 +656,24 @@ declare namespace Electron {
 		 * Fetches a path's associated icon. On Windows, there a 2 kinds of icons: On Linux
 		 * and macOS, icons depend on the application associated with file mime type.
 		 */
-		getFileIcon(path: string, options: FileIconOptions, callback: (error: Error, icon: NativeImage) => void): void;
+		getFileIcon(path: string, callback: (error: Error, icon: NativeImage) => void): void;
 		/**
 		 * Fetches a path's associated icon. On Windows, there a 2 kinds of icons: On Linux
 		 * and macOS, icons depend on the application associated with file mime type.
 		 */
-		getFileIcon(path: string, callback: (error: Error, icon: NativeImage) => void): void;
+		getFileIcon(path: string, options: FileIconOptions, callback: (error: Error, icon: NativeImage) => void): void;
 		getGPUFeatureStatus(): GPUFeatureStatus;
 		getJumpListSettings(): JumpListSettings;
 		/**
-		 * Note: When distributing your packaged app, you have to also ship the locales
-		 * folder. Note: On Windows you have to call it after the ready events gets
-		 * emitted.
+		 * To set the locale, you'll want to use a command line switch at app startup,
+		 * which may be found here. Note: When distributing your packaged app, you have to
+		 * also ship the locales folder. Note: On Windows you have to call it after the
+		 * ready events gets emitted.
 		 */
 		getLocale(): string;
 		/**
 		 * If you provided path and args options to app.setLoginItemSettings then you need
-		 * to pass the same arguments here for openAtLogin to be set correctly. Note: This
-		 * API has no effect on MAS builds.
+		 * to pass the same arguments here for openAtLogin to be set correctly.
 		 */
 		getLoginItemSettings(options?: LoginItemSettingsOptions): LoginItemSettings;
 		/**
@@ -544,6 +699,10 @@ declare namespace Electron {
 		 * net_error_list.
 		 */
 		importCertificate(options: ImportCertificateOptions, callback: (result: number) => void): void;
+		/**
+		 * Invalidates the current Handoff user activity.
+		 */
+		invalidateCurrentActivity(type: string): void;
 		isAccessibilitySupportEnabled(): boolean;
 		/**
 		 * This method checks if the current executable is the default handler for a
@@ -555,6 +714,7 @@ declare namespace Electron {
 		 * the Windows Registry and LSCopyDefaultHandlerForURLScheme internally.
 		 */
 		isDefaultProtocolClient(protocol: string, path?: string, args?: string[]): boolean;
+		isInApplicationsFolder(): boolean;
 		isReady(): boolean;
 		isUnityRunning(): boolean;
 		/**
@@ -578,6 +738,15 @@ declare namespace Electron {
 		 * instance starts:
 		 */
 		makeSingleInstance(callback: (argv: string[], workingDirectory: string) => void): boolean;
+		/**
+		 * No confirmation dialog will be presented by default, if you wish to allow the
+		 * user to confirm the operation you may do so using the dialog API. NOTE: This
+		 * method throws errors if anything other than the user causes the move to fail.
+		 * For instance if the user cancels the authorization dialog this method returns
+		 * false. If we fail to perform the copy then this method will throw an error. The
+		 * message in the error should be informative and tell you exactly what went wrong
+		 */
+		moveToApplicationsFolder(): boolean;
 		/**
 		 * Try to close all windows. The before-quit event will be emitted first. If all
 		 * windows are successfully closed, the will-quit event will be emitted and by
@@ -615,6 +784,15 @@ declare namespace Electron {
 		 * .plist file. See the Apple docs for more details.
 		 */
 		setAboutPanelOptions(options: AboutPanelOptionsOptions): void;
+		/**
+		 * Manually enables Chrome's accessibility support, allowing to expose
+		 * accessibility switch to users in application settings.
+		 * https://www.chromium.org/developers/design-documents/accessibility for more
+		 * details. Disabled by default. Note: Rendering accessibility tree can
+		 * significantly affect the performance of your app. It should not be enabled by
+		 * default.
+		 */
+		setAccessibilitySupportEnabled(enabled: boolean): void;
 		/**
 		 * Changes the Application User Model ID to id.
 		 */
@@ -660,8 +838,7 @@ declare namespace Electron {
 		/**
 		 * Set the app's login item settings. To work with Electron's autoUpdater on
 		 * Windows, which uses Squirrel, you'll want to set the launch path to Update.exe,
-		 * and pass arguments that specify your application name. For example: Note: This
-		 * API has no effect on MAS builds.
+		 * and pass arguments that specify your application name. For example:
 		 */
 		setLoginItemSettings(settings: Settings): void;
 		/**
@@ -694,6 +871,18 @@ declare namespace Electron {
 		 * them.
 		 */
 		show(): void;
+		/**
+		 * Start accessing a security scoped resource. With this method electron
+		 * applications that are packaged for the Mac App Store may reach outside their
+		 * sandbox to access files chosen by the user. See Apple's documentation for a
+		 * description of how this system works.
+		 */
+		startAccessingSecurityScopedResource(bookmarkData: string): Function;
+		/**
+		 * Updates the current activity if its type matches type, merging the entries from
+		 * userInfo into its current userInfo dictionary.
+		 */
+		updateCurrentActivity(type: string, userInfo: any): void;
 		commandLine: CommandLine;
 		dock: Dock;
 	}
@@ -763,16 +952,18 @@ declare namespace Electron {
 		getFeedURL(): string;
 		/**
 		 * Restarts the app and installs the update after it has been downloaded. It should
-		 * only be called after update-downloaded has been emitted. Note:
-		 * autoUpdater.quitAndInstall() will close all application windows first and only
-		 * emit before-quit event on app after that. This is different from the normal quit
-		 * event sequence.
+		 * only be called after update-downloaded has been emitted. Under the hood calling
+		 * autoUpdater.quitAndInstall() will close all application windows first, and
+		 * automatically call app.quit() after all windows have been closed. Note: If the
+		 * application is quit without calling this API after the update-downloaded event
+		 * has been emitted, the application will still be replaced by the updated one on
+		 * the next run.
 		 */
 		quitAndInstall(): void;
 		/**
 		 * Sets the url and initialize the auto updater.
 		 */
-		setFeedURL(url: string, requestHeaders?: any): void;
+		setFeedURL(options: FeedURLOptions): void;
 	}
 
 	interface BluetoothDevice {
@@ -789,6 +980,15 @@ declare namespace Electron {
 
 		constructor(options?: BrowserViewConstructorOptions);
 		static fromId(id: number): BrowserView;
+		static fromWebContents(webContents: WebContents): BrowserView | null;
+		static getAllViews(): BrowserView[];
+		/**
+		 * Force closing the view, the unload and beforeunload events won't be emitted for
+		 * the web page. After you're done with a view, call this function in order to free
+		 * memory and other resources as soon as possible.
+		 */
+		destroy(): void;
+		isDestroyed(): boolean;
 		setAutoResize(options: AutoResizeOptions): void;
 		setBackgroundColor(color: string): void;
 		/**
@@ -831,7 +1031,11 @@ declare namespace Electron {
 		 * cancel the close. Usually you would want to use the beforeunload handler to
 		 * decide whether the window should be closed, which will also be called when the
 		 * window is reloaded. In Electron, returning any value other than undefined would
-		 * cancel the close. For example:
+		 * cancel the close. For example: Note: There is a subtle difference between the
+		 * behaviors of window.onbeforeunload = handler and
+		 * window.addEventListener('beforeunload', handler). It is recommended to always
+		 * set the event.returnValue explicitly, instead of just returning a value, as the
+		 * former works more consistently within Electron.
 		 */
 		on(event: 'close', listener: (event: Event) => void): this;
 		once(event: 'close', listener: (event: Event) => void): this;
@@ -1056,6 +1260,7 @@ declare namespace Electron {
 		 * This API cannot be called before the ready event of the app module is emitted.
 		 */
 		static addExtension(path: string): void;
+		static fromBrowserView(browserView: BrowserView): BrowserWindow | null;
 		static fromId(id: number): BrowserWindow;
 		static fromWebContents(webContents: WebContents): BrowserWindow;
 		static getAllWindows(): BrowserWindow[];
@@ -1080,6 +1285,10 @@ declare namespace Electron {
 		 * ready event of the app module is emitted.
 		 */
 		static removeExtension(name: string): void;
+		/**
+		 * Adds a window as a tab on this window, after the tab for the window instance.
+		 */
+		addTabbedWindow(browserWindow: BrowserWindow): void;
 		/**
 		 * Removes focus from the window.
 		 */
@@ -1123,6 +1332,11 @@ declare namespace Electron {
 		focus(): void;
 		focusOnWebView(): void;
 		getBounds(): Rectangle;
+		/**
+		 * Note: The BrowserView API is currently experimental and may change or be removed
+		 * in future Electron releases.
+		 */
+		getBrowserView(): BrowserView | null;
 		getChildWindows(): BrowserWindow[];
 		getContentBounds(): Rectangle;
 		getContentSize(): number[];
@@ -1133,6 +1347,7 @@ declare namespace Electron {
 		 * (unsigned long) on Linux.
 		 */
 		getNativeWindowHandle(): Buffer;
+		getOpacity(): number;
 		getParentWindow(): BrowserWindow;
 		getPosition(): number[];
 		getRepresentedFilename(): string;
@@ -1184,12 +1399,18 @@ declare namespace Electron {
 		 */
 		isMovable(): boolean;
 		isResizable(): boolean;
+		isSimpleFullScreen(): boolean;
 		isVisible(): boolean;
 		/**
 		 * Note: This API always returns false on Windows.
 		 */
 		isVisibleOnAllWorkspaces(): boolean;
 		isWindowMessageHooked(message: number): boolean;
+		/**
+		 * Same as webContents.loadFile, filePath should be a path to an HTML file relative
+		 * to the root of your application.  See the webContents docs for more information.
+		 */
+		loadFile(filePath: string): void;
 		/**
 		 * Same as webContents.loadURL(url[, options]). The url can be a remote address
 		 * (e.g. http://) or a path to a local HTML file using the file:// protocol. To
@@ -1203,11 +1424,21 @@ declare namespace Electron {
 		 * being displayed already.
 		 */
 		maximize(): void;
+		/**
+		 * Merges all windows into one window with multiple tabs when native tabs are
+		 * enabled and there is more than one open window.
+		 */
+		mergeAllWindows(): void;
 		/**
 		 * Minimizes the window. On some platforms the minimized window will be shown in
 		 * the Dock.
 		 */
 		minimize(): void;
+		/**
+		 * Moves the current tab into a new window if native tabs are enabled and there is
+		 * more than one tab in the current window.
+		 */
+		moveTabToNewWindow(): void;
 		/**
 		 * Uses Quick Look to preview a file at a given path.
 		 */
@@ -1220,6 +1451,16 @@ declare namespace Electron {
 		 * Restores the window from minimized state to its previous state.
 		 */
 		restore(): void;
+		/**
+		 * Selects the next tab when native tabs are enabled and there are other tabs in
+		 * the window.
+		 */
+		selectNextTab(): void;
+		/**
+		 * Selects the previous tab when native tabs are enabled and there are other tabs
+		 * in the window.
+		 */
+		selectPreviousTab(): void;
 		/**
 		 * Sets whether the window should show always on top of other windows. After
 		 * setting this, the window is still a normal window, not a toolbox window which
@@ -1261,10 +1502,6 @@ declare namespace Electron {
 		 * Resizes and moves the window to the supplied bounds
 		 */
 		setBounds(bounds: Rectangle, animate?: boolean): void;
-		/**
-		 * Note: The BrowserView API is currently experimental and may change or be removed
-		 * in future Electron releases.
-		 */
 		setBrowserView(browserView: BrowserView): void;
 		/**
 		 * Sets whether the window can be manually closed by user. On Linux does nothing.
@@ -1290,6 +1527,10 @@ declare namespace Electron {
 		 * bar will become gray when set to true.
 		 */
 		setDocumentEdited(edited: boolean): void;
+		/**
+		 * Disable or enable the window.
+		 */
+		setEnabled(enable: boolean): void;
 		/**
 		 * Changes whether the window can be focused.
 		 */
@@ -1316,7 +1557,7 @@ declare namespace Electron {
 		 * window will be passed to the window below this window, but if this window has
 		 * focus, it will still receive keyboard events.
 		 */
-		setIgnoreMouseEvents(ignore: boolean): void;
+		setIgnoreMouseEvents(ignore: boolean, options?: IgnoreMouseEventsOptions): void;
 		/**
 		 * Enters or leaves the kiosk mode.
 		 */
@@ -1353,6 +1594,10 @@ declare namespace Electron {
 		 * Sets whether the window can be moved by user. On Linux does nothing.
 		 */
 		setMovable(movable: boolean): void;
+		/**
+		 * Sets the opacity of the window. On Linux does nothing.
+		 */
+		setOpacity(opacity: number): void;
 		/**
 		 * Sets a 16 x 16 pixel overlay onto the current taskbar icon, usually used to
 		 * convey some sort of application status or to passively notify the user.
@@ -1393,6 +1638,11 @@ declare namespace Electron {
 		 * HTML-rendered toolbar. For example:
 		 */
 		setSheetOffset(offsetY: number, offsetX?: number): void;
+		/**
+		 * Enters or leaves simple fullscreen mode. Simple fullscreen mode emulates the
+		 * native fullscreen behavior found in versions of Mac OS X prior to Lion (10.7).
+		 */
+		setSimpleFullScreen(flag: boolean): void;
 		/**
 		 * Resizes the window to width and height.
 		 */
@@ -1456,6 +1706,11 @@ declare namespace Electron {
 		 * Shows the window but doesn't focus on it.
 		 */
 		showInactive(): void;
+		/**
+		 * Toggles the visibility of the tab bar if native tabs are enabled and there is
+		 * only one tab in the current window.
+		 */
+		toggleTabBar(): void;
 		/**
 		 * Unhooks all of the window messages.
 		 */
@@ -1689,7 +1944,7 @@ declare namespace Electron {
 			 * An object representing the HTTP response message.
 			 */
 			response: IncomingMessage) => void): this;
-		constructor(options: any | string);
+		constructor(options: 'method' | 'url' | 'session' | 'partition' | 'protocol' | 'host' | 'hostname' | 'port' | 'path' | 'redirect');
 		/**
 		 * Cancels an ongoing HTTP transaction. If the request has already emitted the
 		 * close event, the abort operation will have no effect. Otherwise an ongoing event
@@ -1917,7 +2172,7 @@ declare namespace Electron {
 		 */
 		on(event: 'changed', listener: (event: Event,
 			/**
-			 * The cookie that was changed
+			 * The cookie that was changed.
 			 */
 			cookie: Cookie,
 			/**
@@ -1930,7 +2185,7 @@ declare namespace Electron {
 			removed: boolean) => void): this;
 		once(event: 'changed', listener: (event: Event,
 			/**
-			 * The cookie that was changed
+			 * The cookie that was changed.
 			 */
 			cookie: Cookie,
 			/**
@@ -1943,7 +2198,7 @@ declare namespace Electron {
 			removed: boolean) => void): this;
 		addListener(event: 'changed', listener: (event: Event,
 			/**
-			 * The cookie that was changed
+			 * The cookie that was changed.
 			 */
 			cookie: Cookie,
 			/**
@@ -1956,7 +2211,7 @@ declare namespace Electron {
 			removed: boolean) => void): this;
 		removeListener(event: 'changed', listener: (event: Event,
 			/**
-			 * The cookie that was changed
+			 * The cookie that was changed.
 			 */
 			cookie: Cookie,
 			/**
@@ -1972,8 +2227,8 @@ declare namespace Electron {
 		 */
 		flushStore(callback: Function): void;
 		/**
-		 * Sends a request to get all cookies matching details, callback will be called
-		 * with callback(error, cookies) on complete.
+		 * Sends a request to get all cookies matching filter, callback will be called with
+		 * callback(error, cookies) on complete.
 		 */
 		get(filter: Filter, callback: (error: Error, cookies: Cookie[]) => void): void;
 		/**
@@ -1994,7 +2249,7 @@ declare namespace Electron {
 
 		/**
 		 * The number of average idle cpu wakeups per second since the last call to
-		 * getCPUUsage. First call returns 0.
+		 * getCPUUsage. First call returns 0. Will always return 0 on Windows.
 		 */
 		idleWakeupsPerSecond: number;
 		/**
@@ -2007,19 +2262,31 @@ declare namespace Electron {
 
 		// Docs: http://electron.atom.io/docs/api/structures/crash-report
 
-		date: string;
-		ID: number;
+		date: Date;
+		id: string;
 	}
 
 	interface CrashReporter extends EventEmitter {
 
 		// Docs: http://electron.atom.io/docs/api/crash-reporter
 
+		/**
+		 * Set an extra parameter to be sent with the crash report. The values specified
+		 * here will be sent in addition to any values set via the extra option when start
+		 * was called. This API is only available on macOS, if you need to add/update extra
+		 * parameters on Linux and Windows after your first call to start you can call
+		 * start again with the updated extra options.
+		 */
+		addExtraParameter(key: string, value: string): void;
 		/**
 		 * Returns the date and ID of the last crash report. If no crash reports have been
 		 * sent or the crash reporter has not been started, null is returned.
 		 */
 		getLastCrashReport(): CrashReport;
+		/**
+		 * See all of the current parameters being passed to the crash reporter.
+		 */
+		getParameters(): void;
 		/**
 		 * Returns all uploaded crash reports. Each report contains the date and uploaded
 		 * ID.
@@ -2030,13 +2297,10 @@ declare namespace Electron {
 		 */
 		getUploadToServer(): boolean;
 		/**
-		 * Set an extra parameter to be sent with the crash report. The values specified
-		 * here will be sent in addition to any values set via the extra option when start
-		 * was called. This API is only available on macOS, if you need to add/update extra
-		 * parameters on Linux and Windows after your first call to start you can call
-		 * start again with the updated extra options.
+		 * Remove a extra parameter from the current set of parameters so that it will not
+		 * be sent with the crash report.
 		 */
-		setExtraParameter(key: string, value: string): void;
+		removeExtraParameter(key: string): void;
 		/**
 		 * This would normally be controlled by user preferences. This has no effect if
 		 * called before start is called. Note: This API can only be called from the main
@@ -2057,7 +2321,7 @@ declare namespace Electron {
 		 * well. This will start the process that will monitor and send the crash reports.
 		 * Replace submitURL, productName and crashesDirectory with appropriate values.
 		 * Note: If you need send additional/updated extra parameters after your first call
-		 * start you can call setExtraParameter on macOS or call start again with the
+		 * start you can call addExtraParameter on macOS or call start again with the
 		 * new/updated extra parameters on Linux and Windows. Note: On macOS, Electron uses
 		 * a new crashpad client for crash collection and reporting. If you want to enable
 		 * crash reporting, initializing crashpad from the main process using
@@ -2225,7 +2489,7 @@ declare namespace Electron {
 		/**
 		 * Displays a modal dialog that shows an error message. This API can be called
 		 * safely before the ready event the app module emits, it is usually used to report
-		 * errors in early stage of startup.  If called before the app readyevent on Linux,
+		 * errors in early stage of startup. If called before the app readyevent on Linux,
 		 * the message will be emitted to stderr, and no GUI dialog will appear.
 		 */
 		showErrorBox(title: string, content: string): void;
@@ -2253,11 +2517,11 @@ declare namespace Electron {
 		 * dots (e.g. 'png' is good but '.png' and '*.png' are bad). To show all files, use
 		 * the '*' wildcard (no other wildcard is supported). If a callback is passed, the
 		 * API call will be asynchronous and the result will be passed via
-		 * callback(filenames) Note: On Windows and Linux an open dialog can not be both a
+		 * callback(filenames). Note: On Windows and Linux an open dialog can not be both a
 		 * file selector and a directory selector, so if you set properties to ['openFile',
 		 * 'openDirectory'] on these platforms, a directory selector will be shown.
 		 */
-		showOpenDialog(browserWindow: BrowserWindow, options: OpenDialogOptions, callback?: (filePaths: string[]) => void): string[];
+		showOpenDialog(browserWindow: BrowserWindow, options: OpenDialogOptions, callback?: (filePaths: string[], bookmarks: string[]) => void): string[];
 		/**
 		 * The browserWindow argument allows the dialog to attach itself to a parent
 		 * window, making it modal. The filters specifies an array of file types that can
@@ -2266,27 +2530,27 @@ declare namespace Electron {
 		 * dots (e.g. 'png' is good but '.png' and '*.png' are bad). To show all files, use
 		 * the '*' wildcard (no other wildcard is supported). If a callback is passed, the
 		 * API call will be asynchronous and the result will be passed via
-		 * callback(filenames) Note: On Windows and Linux an open dialog can not be both a
+		 * callback(filenames). Note: On Windows and Linux an open dialog can not be both a
 		 * file selector and a directory selector, so if you set properties to ['openFile',
 		 * 'openDirectory'] on these platforms, a directory selector will be shown.
 		 */
-		showOpenDialog(options: OpenDialogOptions, callback?: (filePaths: string[]) => void): string[];
+		showOpenDialog(options: OpenDialogOptions, callback?: (filePaths: string[], bookmarks: string[]) => void): string[];
 		/**
 		 * The browserWindow argument allows the dialog to attach itself to a parent
 		 * window, making it modal. The filters specifies an array of file types that can
 		 * be displayed, see dialog.showOpenDialog for an example. If a callback is passed,
 		 * the API call will be asynchronous and the result will be passed via
-		 * callback(filename)
+		 * callback(filename).
 		 */
-		showSaveDialog(browserWindow: BrowserWindow, options: SaveDialogOptions, callback?: (filename: string) => void): string;
+		showSaveDialog(browserWindow: BrowserWindow, options: SaveDialogOptions, callback?: (filename: string, bookmark: string) => void): string;
 		/**
 		 * The browserWindow argument allows the dialog to attach itself to a parent
 		 * window, making it modal. The filters specifies an array of file types that can
 		 * be displayed, see dialog.showOpenDialog for an example. If a callback is passed,
 		 * the API call will be asynchronous and the result will be passed via
-		 * callback(filename)
+		 * callback(filename).
 		 */
-		showSaveDialog(options: SaveDialogOptions, callback?: (filename: string) => void): string;
+		showSaveDialog(options: SaveDialogOptions, callback?: (filename: string, bookmark: string) => void): string;
 	}
 
 	interface Display {
@@ -2325,33 +2589,54 @@ declare namespace Electron {
 		 * download that can't be resumed. The state can be one of following:
 		 */
 		on(event: 'done', listener: (event: Event,
-			state: string) => void): this;
+			/**
+			 * Can be `completed`, `cancelled` or `interrupted`.
+			 */
+			state: ('completed' | 'cancelled' | 'interrupted')) => void): this;
 		once(event: 'done', listener: (event: Event,
-			state: string) => void): this;
+			/**
+			 * Can be `completed`, `cancelled` or `interrupted`.
+			 */
+			state: ('completed' | 'cancelled' | 'interrupted')) => void): this;
 		addListener(event: 'done', listener: (event: Event,
-			state: string) => void): this;
+			/**
+			 * Can be `completed`, `cancelled` or `interrupted`.
+			 */
+			state: ('completed' | 'cancelled' | 'interrupted')) => void): this;
 		removeListener(event: 'done', listener: (event: Event,
-			state: string) => void): this;
+			/**
+			 * Can be `completed`, `cancelled` or `interrupted`.
+			 */
+			state: ('completed' | 'cancelled' | 'interrupted')) => void): this;
 		/**
 		 * Emitted when the download has been updated and is not done. The state can be one
 		 * of following:
 		 */
 		on(event: 'updated', listener: (event: Event,
-			state: string) => void): this;
+			/**
+			 * Can be `progressing` or `interrupted`.
+			 */
+			state: ('progressing' | 'interrupted')) => void): this;
 		once(event: 'updated', listener: (event: Event,
-			state: string) => void): this;
+			/**
+			 * Can be `progressing` or `interrupted`.
+			 */
+			state: ('progressing' | 'interrupted')) => void): this;
 		addListener(event: 'updated', listener: (event: Event,
-			state: string) => void): this;
+			/**
+			 * Can be `progressing` or `interrupted`.
+			 */
+			state: ('progressing' | 'interrupted')) => void): this;
 		removeListener(event: 'updated', listener: (event: Event,
-			state: string) => void): this;
+			/**
+			 * Can be `progressing` or `interrupted`.
+			 */
+			state: ('progressing' | 'interrupted')) => void): this;
 		/**
 		 * Cancels the download operation.
 		 */
 		cancel(): void;
-		/**
-		 * Resumes Boolean - Whether the download can resume.
-		 */
-		canResume(): void;
+		canResume(): boolean;
 		getContentDisposition(): string;
 		getETag(): string;
 		/**
@@ -2491,6 +2776,38 @@ declare namespace Electron {
 		webgl2: string;
 	}
 
+	interface InAppPurchase extends EventEmitter {
+
+		// Docs: http://electron.atom.io/docs/api/in-app-purchase
+
+		/**
+		 * Emitted when one or more transactions have been updated.
+		 */
+		on(event: 'transactions-updated', listener: (event: Event,
+			/**
+			 * Array of transactions.
+			 */
+			transactions: Transaction[]) => void): this;
+		once(event: 'transactions-updated', listener: (event: Event,
+			/**
+			 * Array of transactions.
+			 */
+			transactions: Transaction[]) => void): this;
+		addListener(event: 'transactions-updated', listener: (event: Event,
+			/**
+			 * Array of transactions.
+			 */
+			transactions: Transaction[]) => void): this;
+		removeListener(event: 'transactions-updated', listener: (event: Event,
+			/**
+			 * Array of transactions.
+			 */
+			transactions: Transaction[]) => void): this;
+		canMakePayments(): boolean;
+		getReceiptURL(): string;
+		purchaseProduct(productID: string, quantity?: number, callback?: (isProductValid: boolean) => void): void;
+	}
+
 	class IncomingMessage extends EventEmitter {
 
 		// Docs: http://electron.atom.io/docs/api/incoming-message
@@ -2624,7 +2941,7 @@ declare namespace Electron {
 		/**
 		 * Removes all listeners, or those of the specified channel.
 		 */
-		removeAllListeners(channel?: string): this;
+		removeAllListeners(channel: string): this;
 		/**
 		 * Removes the specified listener from the listener array for the specified
 		 * channel.
@@ -2645,7 +2962,11 @@ declare namespace Electron {
 		 * event.returnValue. Note: Sending a synchronous message will block the whole
 		 * renderer process, unless you know what you are doing you should never use it.
 		 */
-		sendSync(channel: string, ...args: any[]): any;
+		// sendSync(channel: string, ...args: any[]): any; ### VSCODE CHANGE (we do not want to use sendSync)
+		/**
+		 * Sends a message to a window with windowid via channel.
+		 */
+		sendTo(windowId: number, channel: string, ...args: any[]): void;
 		/**
 		 * Like ipcRenderer.send but the event will be sent to the <webview> element in the
 		 * host page instead of the main process.
@@ -2760,6 +3081,20 @@ declare namespace Electron {
 
 		// Docs: http://electron.atom.io/docs/api/menu
 
+		/**
+		 * Emitted when a popup is closed either manually or with menu.closePopup().
+		 */
+		on(event: 'menu-will-close', listener: (event: Event) => void): this;
+		once(event: 'menu-will-close', listener: (event: Event) => void): this;
+		addListener(event: 'menu-will-close', listener: (event: Event) => void): this;
+		removeListener(event: 'menu-will-close', listener: (event: Event) => void): this;
+		/**
+		 * Emitted when menu.popup() is called.
+		 */
+		on(event: 'menu-will-show', listener: (event: Event) => void): this;
+		once(event: 'menu-will-show', listener: (event: Event) => void): this;
+		addListener(event: 'menu-will-show', listener: (event: Event) => void): this;
+		removeListener(event: 'menu-will-show', listener: (event: Event) => void): this;
 		constructor();
 		/**
 		 * Generally, the template is just an array of options for constructing a MenuItem.
@@ -2772,7 +3107,7 @@ declare namespace Electron {
 		 * Note: The returned Menu instance doesn't support dynamic addition or removal of
 		 * menu items. Instance properties can still be dynamically modified.
 		 */
-		static getApplicationMenu(): Menu;
+		static getApplicationMenu(): Menu | null;
 		/**
 		 * Sends the action to the first responder of application. This is used for
 		 * emulating default macOS menu behaviors. Usually you would just use the role
@@ -2786,7 +3121,7 @@ declare namespace Electron {
 		 * Windows and Linux but has no effect on macOS. Note: This API has to be called
 		 * after the ready event of app module.
 		 */
-		static setApplicationMenu(menu: Menu): void;
+		static setApplicationMenu(menu: Menu | null): void;
 		/**
 		 * Appends the menuItem to the menu.
 		 */
@@ -2795,14 +3130,15 @@ declare namespace Electron {
 		 * Closes the context menu in the browserWindow.
 		 */
 		closePopup(browserWindow?: BrowserWindow): void;
+		getMenuItemById(id: string): MenuItem;
 		/**
 		 * Inserts the menuItem to the pos position of the menu.
 		 */
 		insert(pos: number, menuItem: MenuItem): void;
 		/**
-		 * Pops up this menu as a context menu in the browserWindow.
+		 * Pops up this menu as a context menu in the BrowserWindow.
 		 */
-		popup(browserWindow?: BrowserWindow, options?: PopupOptions): void;
+		popup(options: PopupOptions): void;
 		items: MenuItem[];
 	}
 
@@ -2848,6 +3184,13 @@ declare namespace Electron {
 		 * Creates a new NativeImage instance from dataURL.
 		 */
 		static createFromDataURL(dataURL: string): NativeImage;
+		/**
+		 * Creates a new NativeImage instance from the NSImage that maps to the given image
+		 * name. See NSImageName for a list of possible values. The hslShift is applied to
+		 * the image with the following rules This means that [-1, 0, 1] will make the
+		 * image completely white and [-1, 1, 0] will make the image completely black.
+		 */
+		static createFromNamedImage(imageName: string, hslShift: number[]): NativeImage;
 		/**
 		 * Creates a new NativeImage instance from a file located at path. This method
 		 * returns an empty image if the path does not exist, cannot be read, or is not a
@@ -2911,22 +3254,22 @@ declare namespace Electron {
 
 		on(event: 'action', listener: (event: Event,
 			/**
-			 * The index of the action that was activated
+			 * The index of the action that was activated.
 			 */
 			index: number) => void): this;
 		once(event: 'action', listener: (event: Event,
 			/**
-			 * The index of the action that was activated
+			 * The index of the action that was activated.
 			 */
 			index: number) => void): this;
 		addListener(event: 'action', listener: (event: Event,
 			/**
-			 * The index of the action that was activated
+			 * The index of the action that was activated.
 			 */
 			index: number) => void): this;
 		removeListener(event: 'action', listener: (event: Event,
 			/**
-			 * The index of the action that was activated
+			 * The index of the action that was activated.
 			 */
 			index: number) => void): this;
 		/**
@@ -2938,7 +3281,7 @@ declare namespace Electron {
 		removeListener(event: 'click', listener: (event: Event) => void): this;
 		/**
 		 * Emitted when the notification is closed by manual intervention from the user.
-		 * This event is not guarunteed to be emitted in all cases where the notification
+		 * This event is not guaranteed to be emitted in all cases where the notification
 		 * is closed.
 		 */
 		on(event: 'close', listener: (event: Event) => void): this;
@@ -2951,22 +3294,22 @@ declare namespace Electron {
 		 */
 		on(event: 'reply', listener: (event: Event,
 			/**
-			 * The string the user entered into the inline reply field
+			 * The string the user entered into the inline reply field.
 			 */
 			reply: string) => void): this;
 		once(event: 'reply', listener: (event: Event,
 			/**
-			 * The string the user entered into the inline reply field
+			 * The string the user entered into the inline reply field.
 			 */
 			reply: string) => void): this;
 		addListener(event: 'reply', listener: (event: Event,
 			/**
-			 * The string the user entered into the inline reply field
+			 * The string the user entered into the inline reply field.
 			 */
 			reply: string) => void): this;
 		removeListener(event: 'reply', listener: (event: Event,
 			/**
-			 * The string the user entered into the inline reply field
+			 * The string the user entered into the inline reply field.
 			 */
 			reply: string) => void): this;
 		/**
@@ -2980,11 +3323,17 @@ declare namespace Electron {
 		removeListener(event: 'show', listener: (event: Event) => void): this;
 		constructor(options: NotificationConstructorOptions);
 		static isSupported(): boolean;
+		/**
+		 * Dismisses the notification.
+		 */
+		close(): void;
 		/**
 		 * Immediately shows the notification to the user, please note this means unlike
 		 * the HTML5 Notification implementation, simply instantiating a new Notification
 		 * does not immediately show it to the user, you need to call this method before
-		 * the OS will display it.
+		 * the OS will display it. If the notification has been shown before, this method
+		 * will dismiss the previously shown notification and create a new one with
+		 * identical properties.
 		 */
 		show(): void;
 	}
@@ -3036,6 +3385,16 @@ declare namespace Electron {
 		once(event: 'resume', listener: Function): this;
 		addListener(event: 'resume', listener: Function): this;
 		removeListener(event: 'resume', listener: Function): this;
+		/**
+		 * Emitted when the system is about to reboot or shut down. If the event handler
+		 * invokes e.preventDefault(), Electron will attempt to delay system shutdown in
+		 * order for the app to exit cleanly. If e.preventDefault() is called, the app
+		 * should exit as soon as possible by calling something like app.quit().
+		 */
+		on(event: 'shutdown', listener: Function): this;
+		once(event: 'shutdown', listener: Function): this;
+		addListener(event: 'shutdown', listener: Function): this;
+		removeListener(event: 'shutdown', listener: Function): this;
 		/**
 		 * Emitted when the system is suspending.
 		 */
@@ -3118,6 +3477,11 @@ declare namespace Electron {
 		 * sends a new HTTP request as a response.
 		 */
 		interceptHttpProtocol(scheme: string, handler: (request: InterceptHttpProtocolRequest, callback: (redirectRequest: RedirectRequest) => void) => void, completion?: (error: Error) => void): void;
+		/**
+		 * Same as protocol.registerStreamProtocol, except that it replaces an existing
+		 * protocol handler.
+		 */
+		interceptStreamProtocol(scheme: string, handler: (request: InterceptStreamProtocolRequest, callback: (stream?: ReadableStream | StreamProtocolResponse) => void) => void, completion?: (error: Error) => void): void;
 		/**
 		 * Intercepts scheme protocol and uses handler as the protocol's new handler which
 		 * sends a String as a response.
@@ -3178,6 +3542,15 @@ declare namespace Electron {
 		 * the ready event of the app module gets emitted.
 		 */
 		registerStandardSchemes(schemes: string[], options?: RegisterStandardSchemesOptions): void;
+		/**
+		 * Registers a protocol of scheme that will send a Readable as a response. The
+		 * usage is similar to the other register{Any}Protocol, except that the callback
+		 * should be called with either a Readable object or an object that has the data,
+		 * statusCode, and headers properties. Example: It is possible to pass any object
+		 * that implements the readable stream API (emits data/end/error events). For
+		 * example, here's how a file could be returned:
+		 */
+		registerStreamProtocol(scheme: string, handler: (request: RegisterStreamProtocolRequest, callback: (stream?: ReadableStream | StreamProtocolResponse) => void) => void, completion?: (error: Error) => void): void;
 		/**
 		 * Registers a protocol of scheme that will send a String as a response. The usage
 		 * is the same with registerFileProtocol, except that the callback should be called
@@ -3380,7 +3753,7 @@ declare namespace Electron {
 		 * options, you have to ensure the Session with the partition has never been used
 		 * before. There is no way to change the options of an existing Session object.
 		 */
-		static fromPartition(partition: string, options: FromPartitionOptions): Session;
+		static fromPartition(partition: string, options?: FromPartitionOptions): Session;
 		/**
 		 * A Session object, the default session object of the app.
 		 */
@@ -3444,11 +3817,12 @@ declare namespace Electron {
 		 * Writes any unwritten DOMStorage data to disk.
 		 */
 		flushStorageData(): void;
-		getBlobData(identifier: string, callback: (result: Buffer) => void): Blob;
+		getBlobData(identifier: string, callback: (result: Buffer) => void): void;
 		/**
 		 * Callback is invoked with the session's current cache size.
 		 */
 		getCacheSize(callback: (size: number) => void): void;
+		getPreloads(): string[];
 		getUserAgent(): string;
 		/**
 		 * Resolves the proxy information for url. The callback will be called with
@@ -3471,9 +3845,14 @@ declare namespace Electron {
 		/**
 		 * Sets the handler which can be used to respond to permission requests for the
 		 * session. Calling callback(true) will allow the permission and callback(false)
-		 * will reject it.
+		 * will reject it. To clear the handler, call setPermissionRequestHandler(null).
 		 */
-		setPermissionRequestHandler(handler: (webContents: WebContents, permission: string, callback: (permissionGranted: boolean) => void) => void): void;
+		setPermissionRequestHandler(handler: (webContents: WebContents, permission: string, callback: (permissionGranted: boolean) => void, details: PermissionRequestHandlerDetails) => void | null): void;
+		/**
+		 * Adds scripts that will be executed on ALL web contents that are associated with
+		 * this session just before normal preload scripts run.
+		 */
+		setPreloads(preloads: string[]): void;
 		/**
 		 * Sets the proxy settings. When pacScript and proxyRules are provided together,
 		 * the proxyRules option is ignored and pacScript configuration is applied. The
@@ -3578,6 +3957,24 @@ declare namespace Electron {
 		width: number;
 	}
 
+	interface StreamProtocolResponse {
+
+		// Docs: http://electron.atom.io/docs/api/structures/stream-protocol-response
+
+		/**
+		 * A Node.js readable stream representing the response body
+		 */
+		data: ReadableStream;
+		/**
+		 * An object containing the response headers
+		 */
+		headers: Headers;
+		/**
+		 * The HTTP response code
+		 */
+		statusCode: number;
+	}
+
 	interface SystemPreferences extends EventEmitter {
 
 		// Docs: http://electron.atom.io/docs/api/system-preferences
@@ -3633,7 +4030,7 @@ declare namespace Electron {
 		getAccentColor(): string;
 		getColor(color: '3d-dark-shadow' | '3d-face' | '3d-highlight' | '3d-light' | '3d-shadow' | 'active-border' | 'active-caption' | 'active-caption-gradient' | 'app-workspace' | 'button-text' | 'caption-text' | 'desktop' | 'disabled-text' | 'highlight' | 'highlight-text' | 'hotlight' | 'inactive-border' | 'inactive-caption' | 'inactive-caption-gradient' | 'inactive-caption-text' | 'info-background' | 'info-text' | 'menu' | 'menu-highlight' | 'menubar' | 'menu-text' | 'scrollbar' | 'window' | 'window-frame' | 'window-text'): string;
 		/**
-		 * This API uses NSUserDefaults on macOS. Some popular key and types are:
+		 * Some popular key and types are:
 		 */
 		getUserDefault(key: string, type: 'string' | 'boolean' | 'integer' | 'float' | 'double' | 'url' | 'array' | 'dictionary'): any;
 		/**
@@ -3655,14 +4052,22 @@ declare namespace Electron {
 		 */
 		postNotification(event: string, userInfo: any): void;
 		/**
-		 * Set the value of key in system preferences. Note that type should match actual
-		 * type of value. An exception is thrown if they don't. This API uses
-		 * NSUserDefaults on macOS. Some popular key and types are:
+		 * Add the specified defaults to your application's NSUserDefaults.
+		 */
+		registerDefaults(defaults: any): void;
+		/**
+		 * Removes the key in NSUserDefaults. This can be used to restore the default or
+		 * global value of a key previously set with setUserDefault.
+		 */
+		removeUserDefault(key: string): void;
+		/**
+		 * Set the value of key in NSUserDefaults. Note that type should match actual type
+		 * of value. An exception is thrown if they don't. Some popular key and types are:
 		 */
 		setUserDefault(key: string, type: string, value: string): void;
 		/**
 		 * Same as subscribeNotification, but uses NSNotificationCenter for local defaults.
-		 * This is necessary for events such as NSUserDefaultsDidChangeNotification
+		 * This is necessary for events such as NSUserDefaultsDidChangeNotification.
 		 */
 		subscribeLocalNotification(event: string, callback: (event: string, userInfo: any) => void): void;
 		/**
@@ -3830,7 +4235,7 @@ declare namespace Electron {
 		// Docs: http://electron.atom.io/docs/api/touch-bar
 
 		constructor(options: TouchBarConstructorOptions);
-		escapeItem: any;
+		escapeItem: (TouchBarButton | TouchBarColorPicker | TouchBarGroup | TouchBarLabel | TouchBarPopover | TouchBarScrubber | TouchBarSegmentedControl | TouchBarSlider | TouchBarSpacer | null);
 		static TouchBarButton: typeof TouchBarButton;
 		static TouchBarColorPicker: typeof TouchBarColorPicker;
 		static TouchBarGroup: typeof TouchBarGroup;
@@ -3842,6 +4247,23 @@ declare namespace Electron {
 		static TouchBarSpacer: typeof TouchBarSpacer;
 	}
 
+	interface Transaction {
+
+		// Docs: http://electron.atom.io/docs/api/structures/transaction
+
+		errorCode: number;
+		errorMessage: string;
+		originalTransactionIdentifier: string;
+		payment: Payment;
+		transactionDate: string;
+		transactionIdentifier: string;
+		/**
+		 * The transaction sate ("purchasing", "purchased", "failed", "restored", or
+		 * "deferred")
+		 */
+		transactionState: string;
+	}
+
 	class Tray extends EventEmitter {
 
 		// Docs: http://electron.atom.io/docs/api/tray
@@ -3873,45 +4295,61 @@ declare namespace Electron {
 		 */
 		on(event: 'click', listener: (event: Event,
 			/**
-			 * The bounds of tray icon
+			 * The bounds of tray icon.
 			 */
-			bounds: Rectangle) => void): this;
+			bounds: Rectangle,
+			/**
+			 * The position of the event.
+			 */
+			position: Point) => void): this;
 		once(event: 'click', listener: (event: Event,
 			/**
-			 * The bounds of tray icon
+			 * The bounds of tray icon.
 			 */
-			bounds: Rectangle) => void): this;
+			bounds: Rectangle,
+			/**
+			 * The position of the event.
+			 */
+			position: Point) => void): this;
 		addListener(event: 'click', listener: (event: Event,
 			/**
-			 * The bounds of tray icon
+			 * The bounds of tray icon.
 			 */
-			bounds: Rectangle) => void): this;
+			bounds: Rectangle,
+			/**
+			 * The position of the event.
+			 */
+			position: Point) => void): this;
 		removeListener(event: 'click', listener: (event: Event,
 			/**
-			 * The bounds of tray icon
+			 * The bounds of tray icon.
 			 */
-			bounds: Rectangle) => void): this;
+			bounds: Rectangle,
+			/**
+			 * The position of the event.
+			 */
+			position: Point) => void): this;
 		/**
 		 * Emitted when the tray icon is double clicked.
 		 */
 		on(event: 'double-click', listener: (event: Event,
 			/**
-			 * The bounds of tray icon
+			 * The bounds of tray icon.
 			 */
 			bounds: Rectangle) => void): this;
 		once(event: 'double-click', listener: (event: Event,
 			/**
-			 * The bounds of tray icon
+			 * The bounds of tray icon.
 			 */
 			bounds: Rectangle) => void): this;
 		addListener(event: 'double-click', listener: (event: Event,
 			/**
-			 * The bounds of tray icon
+			 * The bounds of tray icon.
 			 */
 			bounds: Rectangle) => void): this;
 		removeListener(event: 'double-click', listener: (event: Event,
 			/**
-			 * The bounds of tray icon
+			 * The bounds of tray icon.
 			 */
 			bounds: Rectangle) => void): this;
 		/**
@@ -3970,22 +4408,22 @@ declare namespace Electron {
 		 */
 		on(event: 'drop-text', listener: (event: Event,
 			/**
-			 * the dropped text string
+			 * the dropped text string.
 			 */
 			text: string) => void): this;
 		once(event: 'drop-text', listener: (event: Event,
 			/**
-			 * the dropped text string
+			 * the dropped text string.
 			 */
 			text: string) => void): this;
 		addListener(event: 'drop-text', listener: (event: Event,
 			/**
-			 * the dropped text string
+			 * the dropped text string.
 			 */
 			text: string) => void): this;
 		removeListener(event: 'drop-text', listener: (event: Event,
 			/**
-			 * the dropped text string
+			 * the dropped text string.
 			 */
 			text: string) => void): this;
 		/**
@@ -3993,22 +4431,22 @@ declare namespace Electron {
 		 */
 		on(event: 'mouse-enter', listener: (event: Event,
 			/**
-			 * The position of the event
+			 * The position of the event.
 			 */
 			position: Point) => void): this;
 		once(event: 'mouse-enter', listener: (event: Event,
 			/**
-			 * The position of the event
+			 * The position of the event.
 			 */
 			position: Point) => void): this;
 		addListener(event: 'mouse-enter', listener: (event: Event,
 			/**
-			 * The position of the event
+			 * The position of the event.
 			 */
 			position: Point) => void): this;
 		removeListener(event: 'mouse-enter', listener: (event: Event,
 			/**
-			 * The position of the event
+			 * The position of the event.
 			 */
 			position: Point) => void): this;
 		/**
@@ -4016,22 +4454,45 @@ declare namespace Electron {
 		 */
 		on(event: 'mouse-leave', listener: (event: Event,
 			/**
-			 * The position of the event
+			 * The position of the event.
 			 */
 			position: Point) => void): this;
 		once(event: 'mouse-leave', listener: (event: Event,
 			/**
-			 * The position of the event
+			 * The position of the event.
 			 */
 			position: Point) => void): this;
 		addListener(event: 'mouse-leave', listener: (event: Event,
 			/**
-			 * The position of the event
+			 * The position of the event.
 			 */
 			position: Point) => void): this;
 		removeListener(event: 'mouse-leave', listener: (event: Event,
 			/**
-			 * The position of the event
+			 * The position of the event.
+			 */
+			position: Point) => void): this;
+		/**
+		 * Emitted when the mouse moves in the tray icon.
+		 */
+		on(event: 'mouse-move', listener: (event: Event,
+			/**
+			 * The position of the event.
+			 */
+			position: Point) => void): this;
+		once(event: 'mouse-move', listener: (event: Event,
+			/**
+			 * The position of the event.
+			 */
+			position: Point) => void): this;
+		addListener(event: 'mouse-move', listener: (event: Event,
+			/**
+			 * The position of the event.
+			 */
+			position: Point) => void): this;
+		removeListener(event: 'mouse-move', listener: (event: Event,
+			/**
+			 * The position of the event.
 			 */
 			position: Point) => void): this;
 		/**
@@ -4039,22 +4500,22 @@ declare namespace Electron {
 		 */
 		on(event: 'right-click', listener: (event: Event,
 			/**
-			 * The bounds of tray icon
+			 * The bounds of tray icon.
 			 */
 			bounds: Rectangle) => void): this;
 		once(event: 'right-click', listener: (event: Event,
 			/**
-			 * The bounds of tray icon
+			 * The bounds of tray icon.
 			 */
 			bounds: Rectangle) => void): this;
 		addListener(event: 'right-click', listener: (event: Event,
 			/**
-			 * The bounds of tray icon
+			 * The bounds of tray icon.
 			 */
 			bounds: Rectangle) => void): this;
 		removeListener(event: 'right-click', listener: (event: Event,
 			/**
-			 * The bounds of tray icon
+			 * The bounds of tray icon.
 			 */
 			bounds: Rectangle) => void): this;
 		constructor(image: NativeImage | string);
@@ -4096,7 +4557,8 @@ declare namespace Electron {
 		 */
 		setPressedImage(image: NativeImage): void;
 		/**
-		 * Sets the title displayed aside of the tray icon in the status bar.
+		 * Sets the title displayed aside of the tray icon in the status bar (Support ANSI
+		 * colors).
 		 */
 		setTitle(title: string): void;
 		/**
@@ -4150,7 +4612,7 @@ declare namespace Electron {
 		 */
 		length: number;
 		/**
-		 * Last Modification time in number of seconds sine the UNIX epoch.
+		 * Last Modification time in number of seconds since the UNIX epoch.
 		 */
 		modificationTime: number;
 		/**
@@ -4176,7 +4638,7 @@ declare namespace Electron {
 		 */
 		length: number;
 		/**
-		 * Last Modification time in number of seconds sine the UNIX epoch.
+		 * Last Modification time in number of seconds since the UNIX epoch.
 		 */
 		modificationTime: number;
 		/**
@@ -4217,22 +4679,22 @@ declare namespace Electron {
 		 */
 		on(event: 'before-input-event', listener: (event: Event,
 			/**
-			 * Input properties
+			 * Input properties.
 			 */
 			input: Input) => void): this;
 		once(event: 'before-input-event', listener: (event: Event,
 			/**
-			 * Input properties
+			 * Input properties.
 			 */
 			input: Input) => void): this;
 		addListener(event: 'before-input-event', listener: (event: Event,
 			/**
-			 * Input properties
+			 * Input properties.
 			 */
 			input: Input) => void): this;
 		removeListener(event: 'before-input-event', listener: (event: Event,
 			/**
-			 * Input properties
+			 * Input properties.
 			 */
 			input: Input) => void): this;
 		/**
@@ -4242,7 +4704,7 @@ declare namespace Electron {
 		on(event: 'certificate-error', listener: (event: Event,
 			url: string,
 			/**
-			 * The error code
+			 * The error code.
 			 */
 			error: string,
 			certificate: Certificate,
@@ -4250,7 +4712,7 @@ declare namespace Electron {
 		once(event: 'certificate-error', listener: (event: Event,
 			url: string,
 			/**
-			 * The error code
+			 * The error code.
 			 */
 			error: string,
 			certificate: Certificate,
@@ -4258,7 +4720,7 @@ declare namespace Electron {
 		addListener(event: 'certificate-error', listener: (event: Event,
 			url: string,
 			/**
-			 * The error code
+			 * The error code.
 			 */
 			error: string,
 			certificate: Certificate,
@@ -4266,11 +4728,31 @@ declare namespace Electron {
 		removeListener(event: 'certificate-error', listener: (event: Event,
 			url: string,
 			/**
-			 * The error code
+			 * The error code.
 			 */
 			error: string,
 			certificate: Certificate,
 			callback: (isTrusted: boolean) => void) => void): this;
+		/**
+		 * Emitted when the associated window logs a console message. Will not be emitted
+		 * for windows with offscreen rendering enabled.
+		 */
+		on(event: 'console-message', listener: (level: number,
+			message: string,
+			line: number,
+			sourceId: string) => void): this;
+		once(event: 'console-message', listener: (level: number,
+			message: string,
+			line: number,
+			sourceId: string) => void): this;
+		addListener(event: 'console-message', listener: (level: number,
+			message: string,
+			line: number,
+			sourceId: string) => void): this;
+		removeListener(event: 'console-message', listener: (level: number,
+			message: string,
+			line: number,
+			sourceId: string) => void): this;
 		/**
 		 * Emitted when there is a new context menu that needs to be handled.
 		 */
@@ -4300,69 +4782,69 @@ declare namespace Electron {
 		 * nwse-resize, col-resize, row-resize, m-panning, e-panning, n-panning,
 		 * ne-panning, nw-panning, s-panning, se-panning, sw-panning, w-panning, move,
 		 * vertical-text, cell, context-menu, alias, progress, nodrop, copy, none,
-		 * not-allowed, zoom-in, zoom-out, grab, grabbing, custom. If the type parameter is
-		 * custom, the image parameter will hold the custom cursor image in a NativeImage,
-		 * and scale, size and hotspot will hold additional information about the custom
-		 * cursor.
+		 * not-allowed, zoom-in, zoom-out, grab, grabbing or custom. If the type parameter
+		 * is custom, the image parameter will hold the custom cursor image in a
+		 * NativeImage, and scale, size and hotspot will hold additional information about
+		 * the custom cursor.
 		 */
 		on(event: 'cursor-changed', listener: (event: Event,
 			type: string,
 			image?: NativeImage,
 			/**
-			 * scaling factor for the custom cursor
+			 * scaling factor for the custom cursor.
 			 */
 			scale?: number,
 			/**
-			 * the size of the `image`
+			 * the size of the `image`.
 			 */
 			size?: Size,
 			/**
-			 * coordinates of the custom cursor's hotspot
+			 * coordinates of the custom cursor's hotspot.
 			 */
 			hotspot?: Point) => void): this;
 		once(event: 'cursor-changed', listener: (event: Event,
 			type: string,
 			image?: NativeImage,
 			/**
-			 * scaling factor for the custom cursor
+			 * scaling factor for the custom cursor.
 			 */
 			scale?: number,
 			/**
-			 * the size of the `image`
+			 * the size of the `image`.
 			 */
 			size?: Size,
 			/**
-			 * coordinates of the custom cursor's hotspot
+			 * coordinates of the custom cursor's hotspot.
 			 */
 			hotspot?: Point) => void): this;
 		addListener(event: 'cursor-changed', listener: (event: Event,
 			type: string,
 			image?: NativeImage,
 			/**
-			 * scaling factor for the custom cursor
+			 * scaling factor for the custom cursor.
 			 */
 			scale?: number,
 			/**
-			 * the size of the `image`
+			 * the size of the `image`.
 			 */
 			size?: Size,
 			/**
-			 * coordinates of the custom cursor's hotspot
+			 * coordinates of the custom cursor's hotspot.
 			 */
 			hotspot?: Point) => void): this;
 		removeListener(event: 'cursor-changed', listener: (event: Event,
 			type: string,
 			image?: NativeImage,
 			/**
-			 * scaling factor for the custom cursor
+			 * scaling factor for the custom cursor.
 			 */
 			scale?: number,
 			/**
-			 * the size of the `image`
+			 * the size of the `image`.
 			 */
 			size?: Size,
 			/**
-			 * coordinates of the custom cursor's hotspot
+			 * coordinates of the custom cursor's hotspot.
 			 */
 			hotspot?: Point) => void): this;
 		/**
@@ -4400,14 +4882,53 @@ declare namespace Electron {
 		once(event: 'devtools-reload-page', listener: Function): this;
 		addListener(event: 'devtools-reload-page', listener: Function): this;
 		removeListener(event: 'devtools-reload-page', listener: Function): this;
+		/**
+		 * Emitted when a <webview> has been attached to this web contents.
+		 */
+		on(event: 'did-attach-webview', listener: (event: Event,
+			/**
+			 * The guest web contents that is used by the `<webview>`.
+			 */
+			webContents: WebContents) => void): this;
+		once(event: 'did-attach-webview', listener: (event: Event,
+			/**
+			 * The guest web contents that is used by the `<webview>`.
+			 */
+			webContents: WebContents) => void): this;
+		addListener(event: 'did-attach-webview', listener: (event: Event,
+			/**
+			 * The guest web contents that is used by the `<webview>`.
+			 */
+			webContents: WebContents) => void): this;
+		removeListener(event: 'did-attach-webview', listener: (event: Event,
+			/**
+			 * The guest web contents that is used by the `<webview>`.
+			 */
+			webContents: WebContents) => void): this;
 		/**
 		 * Emitted when a page's theme color changes. This is usually due to encountering a
 		 * meta tag:
 		 */
-		on(event: 'did-change-theme-color', listener: Function): this;
-		once(event: 'did-change-theme-color', listener: Function): this;
-		addListener(event: 'did-change-theme-color', listener: Function): this;
-		removeListener(event: 'did-change-theme-color', listener: Function): this;
+		on(event: 'did-change-theme-color', listener: (event: Event,
+			/**
+			 * Theme color is in format of '#rrggbb'. It is `null` when no theme color is set.
+			 */
+			color: string | null) => void): this;
+		once(event: 'did-change-theme-color', listener: (event: Event,
+			/**
+			 * Theme color is in format of '#rrggbb'. It is `null` when no theme color is set.
+			 */
+			color: string | null) => void): this;
+		addListener(event: 'did-change-theme-color', listener: (event: Event,
+			/**
+			 * Theme color is in format of '#rrggbb'. It is `null` when no theme color is set.
+			 */
+			color: string | null) => void): this;
+		removeListener(event: 'did-change-theme-color', listener: (event: Event,
+			/**
+			 * Theme color is in format of '#rrggbb'. It is `null` when no theme color is set.
+			 */
+			color: string | null) => void): this;
 		/**
 		 * This event is like did-finish-load but emitted when the load failed or was
 		 * cancelled, e.g. window.stop() is invoked. The full list of error codes and their
@@ -4643,7 +5164,7 @@ declare namespace Electron {
 			 */
 			disposition: ('default' | 'foreground-tab' | 'background-tab' | 'new-window' | 'save-to-disk' | 'other'),
 			/**
-			 * The options which will be used for creating the new `BrowserWindow`.
+			 * The options which will be used for creating the new .
 			 */
 			options: any,
 			/**
@@ -4660,7 +5181,7 @@ declare namespace Electron {
 			 */
 			disposition: ('default' | 'foreground-tab' | 'background-tab' | 'new-window' | 'save-to-disk' | 'other'),
 			/**
-			 * The options which will be used for creating the new `BrowserWindow`.
+			 * The options which will be used for creating the new .
 			 */
 			options: any,
 			/**
@@ -4677,7 +5198,7 @@ declare namespace Electron {
 			 */
 			disposition: ('default' | 'foreground-tab' | 'background-tab' | 'new-window' | 'save-to-disk' | 'other'),
 			/**
-			 * The options which will be used for creating the new `BrowserWindow`.
+			 * The options which will be used for creating the new .
 			 */
 			options: any,
 			/**
@@ -4694,7 +5215,7 @@ declare namespace Electron {
 			 */
 			disposition: ('default' | 'foreground-tab' | 'background-tab' | 'new-window' | 'save-to-disk' | 'other'),
 			/**
-			 * The options which will be used for creating the new `BrowserWindow`.
+			 * The options which will be used for creating the new .
 			 */
 			options: any,
 			/**
@@ -4707,22 +5228,22 @@ declare namespace Electron {
 		 */
 		on(event: 'page-favicon-updated', listener: (event: Event,
 			/**
-			 * Array of URLs
+			 * Array of URLs.
 			 */
 			favicons: string[]) => void): this;
 		once(event: 'page-favicon-updated', listener: (event: Event,
 			/**
-			 * Array of URLs
+			 * Array of URLs.
 			 */
 			favicons: string[]) => void): this;
 		addListener(event: 'page-favicon-updated', listener: (event: Event,
 			/**
-			 * Array of URLs
+			 * Array of URLs.
 			 */
 			favicons: string[]) => void): this;
 		removeListener(event: 'page-favicon-updated', listener: (event: Event,
 			/**
-			 * Array of URLs
+			 * Array of URLs.
 			 */
 			favicons: string[]) => void): this;
 		/**
@@ -4771,8 +5292,8 @@ declare namespace Electron {
 		/**
 		 * Emitted when bluetooth device needs to be selected on call to
 		 * navigator.bluetooth.requestDevice. To use navigator.bluetooth api webBluetooth
-		 * should be enabled.  If event.preventDefault is not called, first available
-		 * device will be selected. callback should be called with deviceId to be selected,
+		 * should be enabled. If event.preventDefault is not called, first available device
+		 * will be selected. callback should be called with deviceId to be selected,
 		 * passing empty string to callback will cancel the request.
 		 */
 		on(event: 'select-bluetooth-device', listener: (event: Event,
@@ -4935,13 +5456,13 @@ declare namespace Electron {
 		 * called with callback(image). The image is an instance of NativeImage that stores
 		 * data of the snapshot. Omitting rect will capture the whole visible page.
 		 */
-		capturePage(rect: Rectangle, callback: (image: NativeImage) => void): void;
+		capturePage(callback: (image: NativeImage) => void): void;
 		/**
 		 * Captures a snapshot of the page within rect. Upon completion callback will be
 		 * called with callback(image). The image is an instance of NativeImage that stores
 		 * data of the snapshot. Omitting rect will capture the whole visible page.
 		 */
-		capturePage(callback: (image: NativeImage) => void): void;
+		capturePage(rect: Rectangle, callback: (image: NativeImage) => void): void;
 		/**
 		 * Clears the navigation history.
 		 */
@@ -4988,16 +5509,15 @@ declare namespace Electron {
 		 * requestFullScreen can only be invoked by a gesture from the user. Setting
 		 * userGesture to true will remove this limitation. If the result of the executed
 		 * code is a promise the callback result will be the resolved value of the promise.
-		 *  We recommend that you use the returned Promise to handle code that results in a
+		 * We recommend that you use the returned Promise to handle code that results in a
 		 * Promise.
 		 */
 		executeJavaScript(code: string, userGesture?: boolean, callback?: (result: any) => void): Promise<any>;
 		/**
-		 * Starts a request to find all matches for the text in the web page and returns an
-		 * Integer representing the request id used for the request. The result of the
-		 * request can be obtained by subscribing to found-in-page event.
+		 * Starts a request to find all matches for the text in the web page. The result of
+		 * the request can be obtained by subscribing to found-in-page event.
 		 */
-		findInPage(text: string, options?: FindInPageOptions): void;
+		findInPage(text: string, options?: FindInPageOptions): number;
 		/**
 		 * Focuses the web page.
 		 */
@@ -5076,6 +5596,12 @@ declare namespace Electron {
 		isOffscreen(): boolean;
 		isPainting(): boolean;
 		isWaitingForResponse(): boolean;
+		/**
+		 * Loads the given file in the window, filePath should be a path to an HTML file
+		 * relative to the root of your application.  For instance an app structure like
+		 * this: Would require code like this
+		 */
+		loadFile(filePath: string): void;
 		/**
 		 * Loads the url in the window. The url must contain the protocol prefix, e.g. the
 		 * http:// or file://. If the load should bypass http cache then use the pragma
@@ -5083,7 +5609,9 @@ declare namespace Electron {
 		 */
 		loadURL(url: string, options?: LoadURLOptions): void;
 		/**
-		 * Opens the devtools.
+		 * Opens the devtools. When contents is a <webview> tag, the mode would be detach
+		 * by default, explicitly passing an empty mode can force using last used dock
+		 * state.
 		 */
 		openDevTools(options?: OpenDevToolsOptions): void;
 		/**
@@ -5101,7 +5629,7 @@ declare namespace Electron {
 		 * webContents.print({silent: false, printBackground: false, deviceName: ''}). Use
 		 * page-break-before: always; CSS style to force to print to a new page.
 		 */
-		print(options?: PrintOptions): void;
+		print(options?: PrintOptions, callback?: (success: boolean) => void): void;
 		/**
 		 * Prints window's web page as PDF with Chromium's preview printing custom
 		 * settings. The callback will be called with callback(error, data) on completion.
@@ -5160,6 +5688,19 @@ declare namespace Electron {
 		 * Mute the audio on the current web page.
 		 */
 		setAudioMuted(muted: boolean): void;
+		/**
+		 * Uses the devToolsWebContents as the target WebContents to show devtools. The
+		 * devToolsWebContents must not have done any navigation, and it should not be used
+		 * for other purposes after the call. By default Electron manages the devtools by
+		 * creating an internal WebContents with native view, which developers have very
+		 * limited control of. With the setDevToolsWebContents method, developers can use
+		 * any WebContents to show the devtools in it, including BrowserWindow, BrowserView
+		 * and <webview> tag. Note that closing the devtools does not destroy the
+		 * devToolsWebContents, it is caller's responsibility to destroy
+		 * devToolsWebContents. An example of showing devtools in a <webview> tag: An
+		 * example of showing devtools in a BrowserWindow:
+		 */
+		setDevToolsWebContents(devToolsWebContents: WebContents): void;
 		/**
 		 * If offscreen rendering is enabled sets the frame rate to the specified number.
 		 * Only values between 1 and 60 are accepted.
@@ -5187,7 +5728,7 @@ declare namespace Electron {
 		setVisualZoomLevelLimits(minimumLevel: number, maximumLevel: number): void;
 		/**
 		 * Setting the WebRTC IP handling policy allows you to control which IPs are
-		 * exposed via WebRTC.  See BrowserLeaks for more details.
+		 * exposed via WebRTC. See BrowserLeaks for more details.
 		 */
 		setWebRTCIPHandlingPolicy(policy: 'default' | 'default_public_interface_only' | 'default_public_and_private_interfaces' | 'disable_non_proxied_udp'): void;
 		/**
@@ -5198,14 +5739,10 @@ declare namespace Electron {
 		/**
 		 * Changes the zoom level to the specified level. The original size is 0 and each
 		 * increment above or below represents zooming 20% larger or smaller to default
-		 * limits of 300% and 50% of original size, respectively.
+		 * limits of 300% and 50% of original size, respectively. The formula for this is
+		 * scale := 1.2 ^ level.
 		 */
 		setZoomLevel(level: number): void;
-		/**
-		 * Deprecated: Call setVisualZoomLevelLimits instead to set the visual zoom level
-		 * limits. This method will be removed in Electron 2.0.
-		 */
-		setZoomLevelLimits(minimumLevel: number, maximumLevel: number): void;
 		/**
 		 * Shows pop-up dictionary that searches the selected word on the page.
 		 */
@@ -5276,6 +5813,10 @@ declare namespace Electron {
 		 * userGesture to true will remove this limitation.
 		 */
 		executeJavaScript(code: string, userGesture?: boolean, callback?: (result: any) => void): Promise<any>;
+		/**
+		 * Work like executeJavaScript but evaluates scripts in isolated context.
+		 */
+		executeJavaScriptInIsolatedWorld(worldId: number, scripts: WebSource[], userGesture?: boolean, callback?: (result: any) => void): void;
 		/**
 		 * Returns an object describing usage information of Blink's internal memory
 		 * caches. This will generate:
@@ -5305,6 +5846,18 @@ declare namespace Electron {
 		 * cannot be corrupted by active network attackers.
 		 */
 		registerURLSchemeAsSecure(scheme: string): void;
+		/**
+		 * Set the content security policy of the isolated world.
+		 */
+		setIsolatedWorldContentSecurityPolicy(worldId: number, csp: string): void;
+		/**
+		 * Set the name of the isolated world. Useful in devtools.
+		 */
+		setIsolatedWorldHumanReadableName(worldId: number, name: string): void;
+		/**
+		 * Set the security origin of the isolated world.
+		 */
+		setIsolatedWorldSecurityOrigin(worldId: number, securityOrigin: string): void;
 		/**
 		 * Sets the maximum and minimum layout-based (i.e. non-visual) zoom level.
 		 */
@@ -5330,22 +5883,28 @@ declare namespace Electron {
 		 * limits of 300% and 50% of original size, respectively.
 		 */
 		setZoomLevel(level: number): void;
-		/**
-		 * Deprecated: Call setVisualZoomLevelLimits instead to set the visual zoom level
-		 * limits. This method will be removed in Electron 2.0.
-		 */
-		setZoomLevelLimits(minimumLevel: number, maximumLevel: number): void;
 	}
 
 	class WebRequest extends EventEmitter {
 
 		// Docs: http://electron.atom.io/docs/api/web-request
 
+		/**
+		 * The listener will be called with listener(details) when a server initiated
+		 * redirect is about to occur.
+		 */
+		onBeforeRedirect(listener: (details: OnBeforeRedirectDetails) => void): void;
 		/**
 		 * The listener will be called with listener(details) when a server initiated
 		 * redirect is about to occur.
 		 */
 		onBeforeRedirect(filter: OnBeforeRedirectFilter, listener: (details: OnBeforeRedirectDetails) => void): void;
+		/**
+		 * The listener will be called with listener(details, callback) when a request is
+		 * about to occur. The uploadData is an array of UploadData objects. The callback
+		 * has to be called with an response object.
+		 */
+		onBeforeRequest(listener: (details: OnBeforeRequestDetails, callback: (response: Response) => void) => void): void;
 		/**
 		 * The listener will be called with listener(details, callback) when a request is
 		 * about to occur. The uploadData is an array of UploadData objects. The callback
@@ -5359,10 +5918,25 @@ declare namespace Electron {
 		 * has to be called with an response object.
 		 */
 		onBeforeSendHeaders(filter: OnBeforeSendHeadersFilter, listener: Function): void;
+		/**
+		 * The listener will be called with listener(details, callback) before sending an
+		 * HTTP request, once the request headers are available. This may occur after a TCP
+		 * connection is made to the server, but before any http data is sent. The callback
+		 * has to be called with an response object.
+		 */
+		onBeforeSendHeaders(listener: Function): void;
 		/**
 		 * The listener will be called with listener(details) when a request is completed.
 		 */
 		onCompleted(filter: OnCompletedFilter, listener: (details: OnCompletedDetails) => void): void;
+		/**
+		 * The listener will be called with listener(details) when a request is completed.
+		 */
+		onCompleted(listener: (details: OnCompletedDetails) => void): void;
+		/**
+		 * The listener will be called with listener(details) when an error occurs.
+		 */
+		onErrorOccurred(listener: (details: OnErrorOccurredDetails) => void): void;
 		/**
 		 * The listener will be called with listener(details) when an error occurs.
 		 */
@@ -5373,6 +5947,18 @@ declare namespace Electron {
 		 * response object.
 		 */
 		onHeadersReceived(filter: OnHeadersReceivedFilter, listener: Function): void;
+		/**
+		 * The listener will be called with listener(details, callback) when HTTP response
+		 * headers of a request have been received. The callback has to be called with an
+		 * response object.
+		 */
+		onHeadersReceived(listener: Function): void;
+		/**
+		 * The listener will be called with listener(details) when first byte of the
+		 * response body is received. For HTTP requests, this means that the status line
+		 * and response headers are available.
+		 */
+		onResponseStarted(listener: (details: OnResponseStartedDetails) => void): void;
 		/**
 		 * The listener will be called with listener(details) when first byte of the
 		 * response body is received. For HTTP requests, this means that the status line
@@ -5385,6 +5971,24 @@ declare namespace Electron {
 		 * response are visible by the time this listener is fired.
 		 */
 		onSendHeaders(filter: OnSendHeadersFilter, listener: (details: OnSendHeadersDetails) => void): void;
+		/**
+		 * The listener will be called with listener(details) just before a request is
+		 * going to be sent to the server, modifications of previous onBeforeSendHeaders
+		 * response are visible by the time this listener is fired.
+		 */
+		onSendHeaders(listener: (details: OnSendHeadersDetails) => void): void;
+	}
+
+	interface WebSource {
+
+		// Docs: http://electron.atom.io/docs/api/structures/web-source
+
+		code: string;
+		/**
+		 * Default is 1.
+		 */
+		startLine?: number;
+		url?: string;
 	}
 
 	interface WebviewTag extends HTMLElement {
@@ -5575,6 +6179,10 @@ declare namespace Electron {
 		 */
 		addEventListener(event: 'devtools-focused', listener: (event: Event) => void, useCapture?: boolean): this;
 		removeEventListener(event: 'devtools-focused', listener: (event: Event) => void): this;
+		addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+		addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+		removeEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+		removeEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 		canGoBack(): boolean;
 		canGoForward(): boolean;
 		canGoToOffset(offset: number): boolean;
@@ -5613,13 +6221,12 @@ declare namespace Electron {
 		 * context in the page. HTML APIs like requestFullScreen, which require user
 		 * action, can take advantage of this option for automation.
 		 */
-		executeJavaScript(code: string, userGesture: boolean, callback?: (result: any) => void): void;
+		executeJavaScript(code: string, userGesture?: boolean, callback?: (result: any) => void): void;
 		/**
-		 * Starts a request to find all matches for the text in the web page and returns an
-		 * Integer representing the request id used for the request. The result of the
-		 * request can be obtained by subscribing to found-in-page event.
+		 * Starts a request to find all matches for the text in the web page. The result of
+		 * the request can be obtained by subscribing to found-in-page event.
 		 */
-		findInPage(text: string, options?: FindInPageOptions): void;
+		findInPage(text: string, options?: FindInPageOptions): number;
 		getTitle(): string;
 		getURL(): string;
 		getUserAgent(): string;
@@ -5767,7 +6374,7 @@ declare namespace Electron {
 		 * When this attribute is present the guest page will be allowed to open new
 		 * windows. Popups are disabled by default.
 		 */
-		allowpopups?: string;
+		// allowpopups?: string; ### VSCODE CHANGE (https://github.com/electron/electron/blob/master/docs/tutorial/security.md) ###
 		/**
 		 * When this attribute is present the webview container will automatically resize
 		 * within the bounds specified by the attributes minwidth, minheight, maxwidth, and
@@ -5800,7 +6407,7 @@ declare namespace Electron {
 		 * When this attribute is present the guest page will have web security disabled.
 		 * Web security is enabled by default.
 		 */
-		disablewebsecurity?: string;
+		// disablewebsecurity?: string; ### VSCODE CHANGE(https://github.com/electron/electron/blob/master/docs/tutorial/security.md) ###
 		/**
 		 * A value that links the webview to a specific webContents. When a webview first
 		 * loads a new webContents is created and this attribute is set to its instance
@@ -6062,6 +6669,10 @@ declare namespace Electron {
 		 * is true.
 		 */
 		fullscreenable?: boolean;
+		/**
+		 * Use pre-Lion fullscreen on macOS. Default is false.
+		 */
+		simpleFullscreen?: boolean;
 		/**
 		 * Whether to show the window in taskbar. Default is false.
 		 */
@@ -6115,7 +6726,7 @@ declare namespace Electron {
 		 */
 		enableLargerThanScreen?: boolean;
 		/**
-		 * Window's background color as Hexadecimal value, like #66CD00 or #FFF or
+		 * Window's background color as a hexadecimal value, like #66CD00 or #FFF or
 		 * #80FFFFFF (alpha is supported). Default is #FFF (white).
 		 */
 		backgroundColor?: string;
@@ -6124,6 +6735,11 @@ declare namespace Electron {
 		 * is true.
 		 */
 		hasShadow?: boolean;
+		/**
+		 * Set the initial opacity of the window, between 0.0 (fully transparent) and 1.0
+		 * (fully opaque). This is only implemented on Windows and macOS.
+		 */
+		opacity?: number;
 		/**
 		 * Forces using dark theme for the window, only works on some GTK+3 desktop
 		 * environments. Default is false.
@@ -6140,9 +6756,9 @@ declare namespace Electron {
 		/**
 		 * The style of window title bar. Default is default. Possible values are:
 		 */
-		titleBarStyle?: ('default' | 'hidden' | 'hidden-inset' | 'hiddenInset' | 'customButtonsOnHover');
+		titleBarStyle?: ('default' | 'hidden' | 'hiddenInset' | 'customButtonsOnHover');
 		/**
-		 * Shows the title in the tile bar in full screen mode on macOS for all
+		 * Shows the title in the title bar in full screen mode on macOS for all
 		 * titleBarStyle options. Default is false.
 		 */
 		fullscreenWindowTitle?: boolean;
@@ -6155,7 +6771,8 @@ declare namespace Electron {
 		/**
 		 * Add a type of vibrancy effect to the window, only on macOS. Can be
 		 * appearance-based, light, dark, titlebar, selection, menu, popover, sidebar,
-		 * medium-light or ultra-dark.
+		 * medium-light or ultra-dark. Please note that using frame: false in combination
+		 * with a vibrancy value requires that you use a non-default titleBarStyle as well.
 		 */
 		vibrancy?: ('appearance-based' | 'light' | 'dark' | 'titlebar' | 'selection' | 'menu' | 'popover' | 'sidebar' | 'medium-light' | 'ultra-dark');
 		/**
@@ -6196,7 +6813,11 @@ declare namespace Electron {
 		/**
 		 * Verification result from chromium.
 		 */
-		error: string;
+		verificationResult: string;
+		/**
+		 * Error code.
+		 */
+		errorCode: number;
 	}
 
 	interface ClearStorageDataOptions {
@@ -6206,7 +6827,7 @@ declare namespace Electron {
 		origin?: string;
 		/**
 		 * The types of storages to clear, can contain: appcache, cookies, filesystem,
-		 * indexdb, localstorage, shadercache, websql, serviceworkers
+		 * indexdb, localstorage, shadercache, websql, serviceworkers.
 		 */
 		storages?: string[];
 		/**
@@ -6253,11 +6874,11 @@ declare namespace Electron {
 
 	interface ContextMenuParams {
 		/**
-		 * x coordinate
+		 * x coordinate.
 		 */
 		x: number;
 		/**
-		 * y coordinate
+		 * y coordinate.
 		 */
 		y: number;
 		/**
@@ -6317,8 +6938,8 @@ declare namespace Electron {
 		 */
 		inputFieldType: string;
 		/**
-		 * Input source that invoked the context menu. Can be none, mouse, keyboard, touch,
-		 * touchMenu.
+		 * Input source that invoked the context menu. Can be none, mouse, keyboard, touch
+		 * or touchMenu.
 		 */
 		menuSourceType: ('none' | 'mouse' | 'keyboard' | 'touch' | 'touchMenu');
 		/**
@@ -6355,9 +6976,10 @@ declare namespace Electron {
 		 * properties are sent correctly. Nested objects are not supported and the property
 		 * names and values must be less than 64 characters long.
 		 */
-		extra?: any;
+		extra?: Extra;
 		/**
-		 * Only used when the crash reporter is used in a forked process (macOS only).
+		 * Directory to store the crashreports temporarily (only used when the crash
+		 * reporter is started via process.crashReporter.start).
 		 */
 		crashesDirectory?: string;
 	}
@@ -6502,9 +7124,12 @@ declare namespace Electron {
 	}
 
 	interface DisplayBalloonOptions {
+		/**
+		 * -
+		 */
 		icon?: NativeImage | string;
-		title?: string;
-		content?: string;
+		title: string;
+		content: string;
 	}
 
 	interface Dock {
@@ -6569,6 +7194,18 @@ declare namespace Electron {
 	interface Extensions {
 	}
 
+	interface FeedURLOptions {
+		url: string;
+		/**
+		 * HTTP request headers.
+		 */
+		headers?: Headers;
+		/**
+		 * Either json or default, see the README for more information.
+		 */
+		serverType?: string;
+	}
+
 	interface FileIconOptions {
 		size: ('small' | 'normal' | 'large');
 	}
@@ -6584,7 +7221,7 @@ declare namespace Electron {
 		 */
 		name?: string;
 		/**
-		 * Retrieves cookies whose domains match or are subdomains of domains
+		 * Retrieves cookies whose domains match or are subdomains of domains.
 		 */
 		domain?: string;
 		/**
@@ -6644,6 +7281,18 @@ declare namespace Electron {
 		name: string;
 	}
 
+	interface Headers {
+	}
+
+	interface IgnoreMouseEventsOptions {
+		/**
+		 * If true, forwards mouse move messages to Chromium, enabling mouse related events
+		 * such as mouseleave. Only used when ignore is true. If ignore is false,
+		 * forwarding is always disabled regardless of this value.
+		 */
+		forward?: boolean;
+	}
+
 	interface ImportCertificateOptions {
 		/**
 		 * Path for the pkcs12 file.
@@ -6657,35 +7306,35 @@ declare namespace Electron {
 
 	interface Input {
 		/**
-		 * Either keyUp or keyDown
+		 * Either keyUp or keyDown.
 		 */
 		type: string;
 		/**
-		 * Equivalent to
+		 * Equivalent to .
 		 */
 		key: string;
 		/**
-		 * Equivalent to
+		 * Equivalent to .
 		 */
 		code: string;
 		/**
-		 * Equivalent to
+		 * Equivalent to .
 		 */
 		isAutoRepeat: boolean;
 		/**
-		 * Equivalent to
+		 * Equivalent to .
 		 */
 		shift: boolean;
 		/**
-		 * Equivalent to
+		 * Equivalent to .
 		 */
 		control: boolean;
 		/**
-		 * Equivalent to
+		 * Equivalent to .
 		 */
 		alt: boolean;
 		/**
-		 * Equivalent to
+		 * Equivalent to .
 		 */
 		meta: boolean;
 	}
@@ -6711,6 +7360,14 @@ declare namespace Electron {
 		uploadData: UploadData[];
 	}
 
+	interface InterceptStreamProtocolRequest {
+		url: string;
+		headers: Headers;
+		referrer: string;
+		method: string;
+		uploadData: UploadData[];
+	}
+
 	interface InterceptStringProtocolRequest {
 		url: string;
 		referrer: string;
@@ -6767,6 +7424,9 @@ declare namespace Electron {
 		 * Extra headers separated by "\n"
 		 */
 		extraHeaders?: string;
+		/**
+		 * -
+		 */
 		postData?: UploadRawData[] | UploadFile[] | UploadFileSystem[] | UploadBlob[];
 		/**
 		 * Base url (with trailing path separator) for files to be loaded by the data url.
@@ -6783,25 +7443,25 @@ declare namespace Electron {
 		 */
 		openAtLogin: boolean;
 		/**
-		 * true if the app is set to open as hidden at login. This setting is only
-		 * supported on macOS.
+		 * true if the app is set to open as hidden at login. This setting is not available
+		 * on .
 		 */
 		openAsHidden: boolean;
 		/**
-		 * true if the app was opened at login automatically. This setting is only
-		 * supported on macOS.
+		 * true if the app was opened at login automatically. This setting is not available
+		 * on .
 		 */
 		wasOpenedAtLogin: boolean;
 		/**
 		 * true if the app was opened as a hidden login item. This indicates that the app
-		 * should not open any windows at startup. This setting is only supported on macOS.
+		 * should not open any windows at startup. This setting is not available on .
 		 */
 		wasOpenedAsHidden: boolean;
 		/**
 		 * true if the app was opened as a login item that should restore the state from
 		 * the previous session. This indicates that the app should restore the windows
-		 * that were open the last time the app was closed. This setting is only supported
-		 * on macOS.
+		 * that were open the last time the app was closed. This setting is not available
+		 * on .
 		 */
 		restoreState: boolean;
 	}
@@ -6827,7 +7487,7 @@ declare namespace Electron {
 		 * Define the action of the menu item, when specified the click property will be
 		 * ignored. See .
 		 */
-		role?: MenuItemRole;
+		role?: string;
 		/**
 		 * Can be normal, separator, submenu, checkbox or radio.
 		 */
@@ -6850,7 +7510,7 @@ declare namespace Electron {
 		checked?: boolean;
 		/**
 		 * Should be specified for submenu type menu items. If submenu is specified, the
-		 * type: 'submenu' can be omitted. If the value is not a Menu then it will be
+		 * type: 'submenu' can be omitted. If the value is not a then it will be
 		 * automatically converted to one using Menu.buildFromTemplate.
 		 */
 		submenu?: MenuItemConstructorOptions[] | Menu;
@@ -6940,7 +7600,7 @@ declare namespace Electron {
 		 */
 		disposition: ('default' | 'foreground-tab' | 'background-tab' | 'new-window' | 'save-to-disk' | 'other');
 		/**
-		 * The options which should be used for creating the new `BrowserWindow`.
+		 * The options which should be used for creating the new .
 		 */
 		options: Options;
 	}
@@ -6948,7 +7608,7 @@ declare namespace Electron {
 	interface NotificationConstructorOptions {
 		/**
 		 * A title for the notification, which will be shown at the top of the notification
-		 * window when it is shown
+		 * window when it is shown.
 		 */
 		title: string;
 		/**
@@ -6957,17 +7617,17 @@ declare namespace Electron {
 		subtitle?: string;
 		/**
 		 * The body text of the notification, which will be displayed below the title or
-		 * subtitle
+		 * subtitle.
 		 */
 		body: string;
 		/**
-		 * Whether or not to emit an OS notification noise when showing the notification
+		 * Whether or not to emit an OS notification noise when showing the notification.
 		 */
 		silent?: boolean;
 		/**
-		 * An icon to use in the notification
+		 * An icon to use in the notification.
 		 */
-		icon?: NativeImage;
+		icon?: string | NativeImage;
 		/**
 		 * Whether or not to add an inline reply option to the notification.
 		 */
@@ -6982,15 +7642,21 @@ declare namespace Electron {
 		sound?: string;
 		/**
 		 * Actions to add to the notification. Please read the available actions and
-		 * limitations in the NotificationAction documentation
+		 * limitations in the NotificationAction documentation.
 		 */
 		actions?: NotificationAction[];
+		/**
+		 * A custom title for the close button of an alert. An empty string will cause the
+		 * default localized text to be used.
+		 */
+		closeButtonText?: string;
 	}
 
 	interface OnBeforeRedirectDetails {
-		id: string;
+		id: number;
 		url: string;
 		method: string;
+		webContentsId?: number;
 		resourceType: string;
 		timestamp: number;
 		redirectURL: string;
@@ -7015,6 +7681,7 @@ declare namespace Electron {
 		id: number;
 		url: string;
 		method: string;
+		webContentsId?: number;
 		resourceType: string;
 		timestamp: number;
 		uploadData: UploadData[];
@@ -7040,6 +7707,7 @@ declare namespace Electron {
 		id: number;
 		url: string;
 		method: string;
+		webContentsId?: number;
 		resourceType: string;
 		timestamp: number;
 		responseHeaders: ResponseHeaders;
@@ -7060,6 +7728,7 @@ declare namespace Electron {
 		id: number;
 		url: string;
 		method: string;
+		webContentsId?: number;
 		resourceType: string;
 		timestamp: number;
 		fromCache: boolean;
@@ -7089,6 +7758,7 @@ declare namespace Electron {
 		id: number;
 		url: string;
 		method: string;
+		webContentsId?: number;
 		resourceType: string;
 		timestamp: number;
 		responseHeaders: ResponseHeaders;
@@ -7112,6 +7782,7 @@ declare namespace Electron {
 		id: number;
 		url: string;
 		method: string;
+		webContentsId?: number;
 		resourceType: string;
 		timestamp: number;
 		requestHeaders: RequestHeaders;
@@ -7152,6 +7823,10 @@ declare namespace Electron {
 		 * Message to display above input boxes.
 		 */
 		message?: string;
+		/**
+		 * Create when packaged for the Mac App Store.
+		 */
+		securityScopedBookmarks?: boolean;
 	}
 
 	interface OpenExternalOptions {
@@ -7175,50 +7850,56 @@ declare namespace Electron {
 
 	interface Parameters {
 		/**
-		 * Specify the screen type to emulate (default: desktop)
+		 * Specify the screen type to emulate (default: desktop):
 		 */
 		screenPosition: ('desktop' | 'mobile');
 		/**
-		 * Set the emulated screen size (screenPosition == mobile)
+		 * Set the emulated screen size (screenPosition == mobile).
 		 */
 		screenSize: Size;
 		/**
 		 * Position the view on the screen (screenPosition == mobile) (default: {x: 0, y:
-		 * 0})
+		 * 0}).
 		 */
 		viewPosition: Point;
 		/**
 		 * Set the device scale factor (if zero defaults to original device scale factor)
-		 * (default: 0)
+		 * (default: 0).
 		 */
 		deviceScaleFactor: number;
 		/**
 		 * Set the emulated view size (empty means no override)
 		 */
 		viewSize: Size;
-		/**
-		 * Whether emulated view should be scaled down if necessary to fit into available
-		 * space (default: false)
-		 */
-		fitToView: boolean;
-		/**
-		 * Offset of the emulated view inside available space (not in fit to view mode)
-		 * (default: {x: 0, y: 0})
-		 */
-		offset: Point;
 		/**
 		 * Scale of emulated view inside available space (not in fit to view mode)
-		 * (default: 1)
+		 * (default: 1).
 		 */
 		scale: number;
 	}
 
+	interface Payment {
+		productIdentifier: string;
+		quantity: number;
+	}
+
+	interface PermissionRequestHandlerDetails {
+		/**
+		 * The url of the openExternal request.
+		 */
+		externalURL: string;
+	}
+
 	interface PluginCrashedEvent extends Event {
 		name: string;
 		version: string;
 	}
 
 	interface PopupOptions {
+		/**
+		 * Default is the focused window.
+		 */
+		window?: BrowserWindow;
 		/**
 		 * Default is the current mouse cursor position. Must be declared if y is declared.
 		 */
@@ -7227,16 +7908,15 @@ declare namespace Electron {
 		 * Default is the current mouse cursor position. Must be declared if x is declared.
 		 */
 		y?: number;
-		/**
-		 * Set to true to have this method return immediately called, false to return after
-		 * the menu has been selected or closed. Defaults to false.
-		 */
-		async?: boolean;
 		/**
 		 * The index of the menu item to be positioned under the mouse cursor at the
 		 * specified coordinates. Default is -1.
 		 */
 		positioningItem?: number;
+		/**
+		 * Called when menu is closed.
+		 */
+		callback?: () => void;
 	}
 
 	interface PrintOptions {
@@ -7295,21 +7975,21 @@ declare namespace Electron {
 		privateBytes: number;
 		/**
 		 * The amount of memory shared between processes, typically memory consumed by the
-		 * Electron code itself
+		 * Electron code itself.
 		 */
 		sharedBytes: number;
 	}
 
 	interface ProgressBarOptions {
 		/**
-		 * Mode for the progress bar. Can be none, normal, indeterminate, error, or paused.
+		 * Mode for the progress bar. Can be none, normal, indeterminate, error or paused.
 		 */
-		mode: ('none' | 'normal' | 'indeterminate' | 'error');
+		mode: ('none' | 'normal' | 'indeterminate' | 'error' | 'paused');
 	}
 
 	interface Provider {
 		/**
-		 * Returns Boolean
+		 * Returns Boolean.
 		 */
 		spellCheck: (text: string) => void;
 	}
@@ -7354,6 +8034,14 @@ declare namespace Electron {
 		secure?: boolean;
 	}
 
+	interface RegisterStreamProtocolRequest {
+		url: string;
+		headers: Headers;
+		referrer: string;
+		method: string;
+		uploadData: UploadData[];
+	}
+
 	interface RegisterStringProtocolRequest {
 		url: string;
 		referrer: string;
@@ -7401,7 +8089,7 @@ declare namespace Electron {
 		 */
 		width?: number;
 		/**
-		 * Defaults to the image's height
+		 * Defaults to the image's height.
 		 */
 		height?: number;
 		/**
@@ -7472,6 +8160,11 @@ declare namespace Electron {
 		 * Show the tags input box, defaults to true.
 		 */
 		showsTagField?: boolean;
+		/**
+		 * Create a when packaged for the Mac App Store. If this option is enabled and the
+		 * file doesn't already exist a blank file will be created at the chosen path.
+		 */
+		securityScopedBookmarks?: boolean;
 	}
 
 	interface Settings {
@@ -7484,7 +8177,7 @@ declare namespace Electron {
 		 * true to open the app as hidden. Defaults to false. The user can edit this
 		 * setting from the System Preferences so
 		 * app.getLoginItemStatus().wasOpenedAsHidden should be checked when the app is
-		 * opened to know the current value. This setting is only supported on macOS.
+		 * opened to know the current value. This setting is not available on .
 		 */
 		openAsHidden?: boolean;
 		/**
@@ -7499,11 +8192,26 @@ declare namespace Electron {
 	}
 
 	interface SizeOptions {
+		/**
+		 * true to make the webview container automatically resize within the bounds
+		 * specified by the attributes normal, min and max.
+		 */
+		enableAutoSize?: boolean;
 		/**
 		 * Normal size of the page. This can be used in combination with the attribute to
 		 * manually resize the webview guest contents.
 		 */
-		normal?: Normal;
+		normal?: Size;
+		/**
+		 * Minimum size of the page. This can be used in combination with the attribute to
+		 * manually resize the webview guest contents.
+		 */
+		min?: Size;
+		/**
+		 * Maximium size of the page. This can be used in combination with the attribute to
+		 * manually resize the webview guest contents.
+		 */
+		max?: Size;
 	}
 
 	interface SourcesOptions {
@@ -7585,7 +8293,7 @@ declare namespace Electron {
 		/**
 		 * Can be left, right or overlay.
 		 */
-		iconPosition: ('left' | 'right' | 'overlay');
+		iconPosition?: ('left' | 'right' | 'overlay');
 		/**
 		 * Function to call when the button is clicked.
 		 */
@@ -7608,8 +8316,8 @@ declare namespace Electron {
 	}
 
 	interface TouchBarConstructorOptions {
-		items: (TouchBarButton | TouchBarColorPicker | TouchBarGroup | TouchBarLabel | TouchBarPopover | TouchBarScrubber | TouchBarSegmentedControl | TouchBarSlider | TouchBarSpacer)[];
-		escapeItem?: TouchBarButton | TouchBarColorPicker | TouchBarGroup | TouchBarLabel | TouchBarPopover | TouchBarScrubber | TouchBarSegmentedControl | TouchBarSlider | TouchBarSpacer;
+		items: Array<TouchBarButton | TouchBarColorPicker | TouchBarGroup | TouchBarLabel | TouchBarPopover | TouchBarScrubber | TouchBarSegmentedControl | TouchBarSlider | TouchBarSpacer>;
+		escapeItem?: TouchBarButton | TouchBarColorPicker | TouchBarGroup | TouchBarLabel | TouchBarPopover | TouchBarScrubber | TouchBarSegmentedControl | TouchBarSlider | TouchBarSpacer | null;
 	}
 
 	interface TouchBarGroupConstructorOptions {
@@ -7652,15 +8360,15 @@ declare namespace Electron {
 
 	interface TouchBarScrubberConstructorOptions {
 		/**
-		 * An array of items to place in this scrubber
+		 * An array of items to place in this scrubber.
 		 */
 		items: ScrubberItem[];
 		/**
-		 * Called when the user taps an item that was not the last tapped item
+		 * Called when the user taps an item that was not the last tapped item.
 		 */
 		select: (selectedIndex: number) => void;
 		/**
-		 * Called when the user taps any item
+		 * Called when the user taps any item.
 		 */
 		highlight: (highlightedIndex: number) => void;
 		/**
@@ -7704,7 +8412,7 @@ declare namespace Electron {
 		 */
 		selectedIndex?: number;
 		/**
-		 * Called when the user selects a new segment
+		 * Called when the user selects a new segment.
 		 */
 		change: (selectedIndex: number, isSelected: boolean) => void;
 	}
@@ -7809,9 +8517,6 @@ declare namespace Electron {
 		finalUpdate: boolean;
 	}
 
-	interface Headers {
-	}
-
 	interface MediaFlags {
 		/**
 		 * Whether the media element has crashed.
@@ -7847,11 +8552,6 @@ declare namespace Electron {
 		canRotate: boolean;
 	}
 
-	interface Normal {
-		width: number;
-		height: number;
-	}
-
 	interface Options {
 	}
 
@@ -7911,6 +8611,15 @@ declare namespace Electron {
 		 * session.
 		 */
 		partition?: string;
+		/**
+		 * When specified, web pages with the same affinity will run in the same renderer
+		 * process. Note that due to reusing the renderer process, certain webPreferences
+		 * options will also be shared between the web pages even when you specified
+		 * different values for them, including but not limited to preload, sandbox and
+		 * nodeIntegration. So it is suggested to use exact same webPreferences for web
+		 * pages with the same affinity.
+		 */
+		affinity?: string;
 		/**
 		 * The default zoom factor of the page, 3.0 represents 300%. Default is 1.0.
 		 */
@@ -7924,12 +8633,12 @@ declare namespace Electron {
 		 * websites by people), and set allowRunningInsecureContent to true if this options
 		 * has not been set by user. Default is true.
 		 */
-		webSecurity?: boolean;
+		// webSecurity?: boolean; ### VSCODE CHANGE (https://github.com/electron/electron/blob/master/docs/tutorial/security.md) ###
 		/**
 		 * Allow an https page to run JavaScript, CSS or plugins from http URLs. Default is
 		 * false.
 		 */
-		allowRunningInsecureContent?: boolean;
+		// allowRunningInsecureContent?: boolean; ### VSCODE CHANGE (https://github.com/electron/electron/blob/master/docs/tutorial/security.md) ###
 		/**
 		 * Enables image support. Default is true.
 		 */
@@ -7953,7 +8662,7 @@ declare namespace Electron {
 		/**
 		 * Enables Chromium's experimental features. Default is false.
 		 */
-		experimentalFeatures?: boolean;
+		// experimentalFeatures?: boolean; ### VSCODE CHANGE (https://github.com/electron/electron/blob/master/docs/tutorial/security.md) ###
 		/**
 		 * Enables Chromium's experimental canvas features. Default is false.
 		 */
@@ -7994,7 +8703,7 @@ declare namespace Electron {
 		defaultEncoding?: string;
 		/**
 		 * Whether to throttle animations and timers when the page becomes background. This
-		 * also affects the [Page Visibility API][#page-visibility]. Defaults to true.
+		 * also affects the . Defaults to true.
 		 */
 		backgroundThrottling?: boolean;
 		/**
@@ -8031,6 +8740,12 @@ declare namespace Electron {
 		 * alter the <webview>'s initial settings.
 		 */
 		webviewTag?: boolean;
+		/**
+		 * A list of strings that will be appended to process.argv in the renderer process
+		 * of this app. Useful for passing small bits of data down to renderer process
+		 * preload scripts.
+		 */
+		additionArguments?: string[];
 	}
 
 	interface DefaultFontFamily {
@@ -8059,24 +8774,6 @@ declare namespace Electron {
 		 */
 		fantasy?: string;
 	}
-
-	// ### BEGIN VSCODE ADDITION ###
-	type MenuItemRole = 'undo' | 'redo' | 'cut' | 'copy' | 'paste' | 'pasteandmatchstyle' | 'selectall' | 'delete' | 'minimize' | 'close' | 'quit' | 'togglefullscreen' | 'resetzoom' | 'zoomin' | 'zoomout' | 'about' | 'hide' | 'hideothers' | 'unhide' | 'startspeaking' | 'stopspeaking' | 'front' | 'zoom' | 'window' | 'help' | 'services';
-
-	interface LoginRequest {
-		method: string;
-		url: string;
-		referrer: string;
-	}
-
-	interface LoginAuthInfo {
-		isProxy: boolean;
-		scheme: string;
-		host: string;
-		port: number;
-		realm: string;
-	}
-	// ### END VSCODE ADDITION ###
 }
 
 declare module 'electron' {
@@ -8108,6 +8805,7 @@ declare namespace NodeJS {
 
 		// Docs: http://electron.atom.io/docs/api/process
 
+		// ### BEGIN VSCODE MODIFICATION ###
 		// /**
 		//  * Emitted when Electron has loaded its internal initialization script and is
 		//  * beginning to load the web page or the main script. It can be used by the preload
@@ -8118,6 +8816,8 @@ declare namespace NodeJS {
 		// once(event: 'loaded', listener: Function): this;
 		// addListener(event: 'loaded', listener: Function): this;
 		// removeListener(event: 'loaded', listener: Function): this;
+		// ### END VSCODE MODIFICATION ###
+
 		/**
 		 * Causes the main thread of the current process crash.
 		 */
@@ -8160,8 +8860,8 @@ declare namespace NodeJS {
 		noAsar?: boolean;
 		/**
 		 * A Boolean that controls whether or not deprecation warnings are printed to
-		 * stderr. Setting this to true will silence deprecation warnings.  This property
-		 * is used instead of the --no-deprecation command line flag.
+		 * stderr. Setting this to true will silence deprecation warnings. This property is
+		 * used instead of the --no-deprecation command line flag.
 		 */
 		noDeprecation?: boolean;
 		/**
@@ -8170,21 +8870,21 @@ declare namespace NodeJS {
 		resourcesPath?: string;
 		/**
 		 * A Boolean that controls whether or not deprecation warnings will be thrown as
-		 * exceptions.  Setting this to true will throw errors for deprecations.  This
+		 * exceptions. Setting this to true will throw errors for deprecations. This
 		 * property is used instead of the --throw-deprecation command line flag.
 		 */
 		throwDeprecation?: boolean;
 		/**
 		 * A Boolean that controls whether or not deprecations printed to stderr include
-		 * their stack trace.  Setting this to true will print  stack traces for
+		 * their stack trace. Setting this to true will print stack traces for
 		 * deprecations. This property is instead of the --trace-deprecation command line
 		 * flag.
 		 */
 		traceDeprecation?: boolean;
 		/**
 		 * A Boolean that controls whether or not process warnings printed to stderr
-		 * include their stack trace.  Setting this to true will print stack traces for
-		 * process warnings (including deprecations).  This property is instead of the
+		 * include their stack trace. Setting this to true will print stack traces for
+		 * process warnings (including deprecations). This property is instead of the
 		 * --trace-warnings command line flag.
 		 */
 		traceProcessWarnings?: boolean;
diff --git a/src/typings/iconv-lite.d.ts b/src/typings/iconv-lite.d.ts
index 2b66468d456..0ed342db377 100644
--- a/src/typings/iconv-lite.d.ts
+++ b/src/typings/iconv-lite.d.ts
@@ -6,9 +6,9 @@
 /// <reference path='./node.d.ts'/>
 
 declare module 'iconv-lite' {
-	export function decode(buffer: NodeBuffer, encoding: string): string;
+	export function decode(buffer: Buffer, encoding: string): string;
 
-	export function encode(content: string | NodeBuffer, encoding: string, options?: { addBOM?: boolean }): NodeBuffer;
+	export function encode(content: string | Buffer, encoding: string, options?: { addBOM?: boolean }): Buffer;
 
 	export function encodingExists(encoding: string): boolean;
 
diff --git a/src/typings/jschardet.d.ts b/src/typings/jschardet.d.ts
index 9c553b129eb..f252a47fd09 100644
--- a/src/typings/jschardet.d.ts
+++ b/src/typings/jschardet.d.ts
@@ -3,7 +3,7 @@ declare module 'jschardet' {
 		encoding: string,
 		confidence: number
 	}
-	export function detect(buffer: NodeBuffer): IDetectedMap;
+	export function detect(buffer: Buffer): IDetectedMap;
 
 	export const Constants: {
 		MINIMUM_THRESHOLD: number,
diff --git a/src/typings/node.d.ts b/src/typings/node.d.ts
index 1b6661edd71..c597abdda90 100644
--- a/src/typings/node.d.ts
+++ b/src/typings/node.d.ts
@@ -1,41 +1,67 @@
-// Type definitions for Node.js v7.x
+// Type definitions for Node.js 8.9.x
 // Project: http://nodejs.org/
 // Definitions by: Microsoft TypeScript <http://typescriptlang.org>
 //                 DefinitelyTyped <https://github.com/DefinitelyTyped/DefinitelyTyped>
 //                 Parambir Singh <https://github.com/parambirs>
-//                 Roberto Desideri <https://github.com/RobDesideri>
 //                 Christian Vaagland Tellnes <https://github.com/tellnes>
 //                 Wilco Bakker <https://github.com/WilcoBakker>
-//                 Daniel Imms <https://github.com/Tyriar>
+//                 Nicolas Voigt <https://github.com/octo-sniffle>
+//                 Chigozirim C. <https://github.com/smac89>
+//                 Flarna <https://github.com/Flarna>
+//                 Mariusz Wiktorczyk <https://github.com/mwiktorczyk>
+//                 wwwy3y3 <https://github.com/wwwy3y3>
+//                 Deividas Bakanas <https://github.com/DeividasBakanas>
+//                 Kelvin Jin <https://github.com/kjin>
+//                 Alvis HT Tang <https://github.com/alvis>
+//                 Sebastian Silbermann <https://github.com/eps1lon>
+//                 Hannes Magnusson <https://github.com/Hannes-Magnusson-CK>
+//                 Alberto Schiabel <https://github.com/jkomyno>
+//                 Huw <https://github.com/hoo29>
+//                 Nicolas Even <https://github.com/n-e>
+//                 Bruno Scheufler <https://github.com/brunoscheufler>
+//                 Hoàng Văn Khải <https://github.com/KSXGitHub>
+//                 Lishude <https://github.com/islishude>
+//                 Andrew Makarov <https://github.com/r3nya>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
 
-/************************************************
-*                                               *
-*               Node.js v7.x API                *
-*                                               *
-************************************************/
+// ### BEGIN VSCODE MODIFICATION ###
+// /** inspector module types */
+// /// <reference path="./inspector.d.ts" />
+// ### BEGIN VSCODE MODIFICATION ###
 
 // This needs to be global to avoid TS2403 in case lib.dom.d.ts is present in the same build
 interface Console {
-	Console: NodeJS.ConsoleConstructor;
-	assert(value: any, message?: string, ...optionalParams: any[]): void;
-	dir(obj: any, options?: NodeJS.InspectOptions): void;
-	error(message?: any, ...optionalParams: any[]): void;
-	info(message?: any, ...optionalParams: any[]): void;
-	log(message?: any, ...optionalParams: any[]): void;
-	time(label: string): void;
-	timeEnd(label: string): void;
-	trace(message?: any, ...optionalParams: any[]): void;
-	warn(message?: any, ...optionalParams: any[]): void;
+    Console: NodeJS.ConsoleConstructor;
+    assert(value: any, message?: string, ...optionalParams: any[]): void;
+    dir(obj: any, options?: NodeJS.InspectOptions): void;
+    debug(message?: any, ...optionalParams: any[]): void;
+    error(message?: any, ...optionalParams: any[]): void;
+    info(message?: any, ...optionalParams: any[]): void;
+    log(message?: any, ...optionalParams: any[]): void;
+    time(label: string): void;
+    timeEnd(label: string): void;
+    trace(message?: any, ...optionalParams: any[]): void;
+    warn(message?: any, ...optionalParams: any[]): void;
 }
 
 interface Error {
-	stack?: string;
+    stack?: string;
 }
 
+// Declare "static" methods in Error
 interface ErrorConstructor {
-	captureStackTrace(targetObject: Object, constructorOpt?: Function): void;
-	stackTraceLimit: number;
+    /** Create .stack property on a target object */
+    captureStackTrace(targetObject: Object, constructorOpt?: Function): void;
+
+    /**
+     * Optional override for formatting stack traces
+     *
+     * @see https://github.com/v8/v8/wiki/Stack%20Trace%20API#customizing-stack-traces
+     */
+    prepareStackTrace?: (err: Error, stackTraces: NodeJS.CallSite[]) => any;
+
+    stackTraceLimit: number;
 }
 
 // compat for TypeScript 1.8
@@ -49,55 +75,90 @@ interface WeakSetConstructor { }
 // Forward-declare needed types from lib.es2015.d.ts (in case users are using `--lib es5`)
 interface Iterable<T> { }
 interface Iterator<T> {
-	next(value?: any): IteratorResult<T>;
+    next(value?: any): IteratorResult<T>;
 }
 interface IteratorResult<T> { }
 interface SymbolConstructor {
-	readonly iterator: symbol;
+    readonly iterator: symbol;
 }
 declare var Symbol: SymbolConstructor;
 
+// Node.js ESNEXT support
+interface String {
+    /** Removes whitespace from the left end of a string. */
+    trimLeft(): string;
+    /** Removes whitespace from the right end of a string. */
+    trimRight(): string;
+}
+
 /************************************************
 *                                               *
 *                   GLOBAL                      *
 *                                               *
 ************************************************/
 declare var process: NodeJS.Process;
-declare var global: any;
+declare var global: NodeJS.Global;
 declare var console: Console;
 
-// Don't use these!! :)
+// ### BEGIN VSCODE MODIFICATION ###
 // declare var __filename: string;
 // declare var __dirname: string;
 
 // declare function setTimeout(callback: (...args: any[]) => void, ms: number, ...args: any[]): NodeJS.Timer;
+// declare namespace setTimeout {
+//     export function __promisify__(ms: number): Promise<void>;
+//     export function __promisify__<T>(ms: number, value: T): Promise<T>;
+// }
 // declare function clearTimeout(timeoutId: NodeJS.Timer): void;
 // declare function setInterval(callback: (...args: any[]) => void, ms: number, ...args: any[]): NodeJS.Timer;
 // declare function clearInterval(intervalId: NodeJS.Timer): void;
+// ### END VSCODE MODIFICATION ###
+
 declare function setImmediate(callback: (...args: any[]) => void, ...args: any[]): any;
+declare namespace setImmediate {
+    export function __promisify__(): Promise<void>;
+    export function __promisify__<T>(value: T): Promise<T>;
+}
 declare function clearImmediate(immediateId: any): void;
 
+// TODO: change to `type NodeRequireFunction = (id: string) => any;` in next mayor version.
 interface NodeRequireFunction {
-	(id: string): any;
+    /* tslint:disable-next-line:callable-types */
+    (id: string): any;
 }
 
+// ### BEGIN VSCODE MODIFICATION ###
 // interface NodeRequire extends NodeRequireFunction {
-//     resolve(id: string): string;
+//     resolve: RequireResolve;
 //     cache: any;
-//     extensions: any;
+//     extensions: NodeExtensions;
 //     main: NodeModule | undefined;
 // }
 
+// interface RequireResolve {
+//     (id: string, options?: { paths?: string[]; }): string;
+//     paths(request: string): string[] | null;
+// }
+
+// interface NodeExtensions {
+//     '.js': (m: NodeModule, filename: string) => any;
+//     '.json': (m: NodeModule, filename: string) => any;
+//     '.node': (m: NodeModule, filename: string) => any;
+//     [ext: string]: (m: NodeModule, filename: string) => any;
+// }
+
 // declare var require: NodeRequire;
+// ### END VSCODE MODIFICATION ###
 
 interface NodeModule {
-	exports: any;
-	require: NodeRequireFunction;
-	id: string;
-	filename: string;
-	loaded: boolean;
-	parent: NodeModule | null;
-	children: NodeModule[];
+    exports: any;
+    require: NodeRequireFunction;
+    id: string;
+    filename: string;
+    loaded: boolean;
+    parent: NodeModule | null;
+    children: NodeModule[];
+    paths: string[];
 }
 
 declare var module: NodeModule;
@@ -105,17 +166,16 @@ declare var module: NodeModule;
 // Same as module.exports
 declare var exports: any;
 declare var SlowBuffer: {
-	new(str: string, encoding?: string): Buffer;
-	new(size: number): Buffer;
-	new(size: Uint8Array): Buffer;
-	new(array: any[]): Buffer;
-	prototype: Buffer;
-	isBuffer(obj: any): boolean;
-	byteLength(string: string, encoding?: string): number;
-	concat(list: Buffer[], totalLength?: number): Buffer;
+    new(str: string, encoding?: string): Buffer;
+    new(size: number): Buffer;
+    new(size: Uint8Array): Buffer;
+    new(array: any[]): Buffer;
+    prototype: Buffer;
+    isBuffer(obj: any): boolean;
+    byteLength(string: string, encoding?: string): number;
+    concat(list: Buffer[], totalLength?: number): Buffer;
 };
 
-
 // Buffer class
 type BufferEncoding = "ascii" | "utf8" | "utf16le" | "ucs2" | "base64" | "latin1" | "binary" | "hex";
 interface Buffer extends NodeBuffer { }
@@ -132,19 +192,19 @@ declare var Buffer: {
      * @param str String to store in buffer.
      * @param encoding encoding to use, optional.  Default is 'utf8'
      */
-	new(str: string, encoding?: string): Buffer;
+    // new(str: string, encoding?: string): Buffer; ### VSCODE CHANGE (new Buffer() is deprecated)
     /**
      * Allocates a new buffer of {size} octets.
      *
      * @param size count of octets to allocate.
      */
-	new(size: number): Buffer;
+    // new(size: number): Buffer; ### VSCODE CHANGE (new Buffer() is deprecated)
     /**
      * Allocates a new buffer containing the given {array} of octets.
      *
      * @param array The octets to store.
      */
-	new(array: Uint8Array): Buffer;
+    // new(array: Uint8Array): Buffer; ### VSCODE CHANGE (new Buffer() is deprecated)
     /**
      * Produces a Buffer backed by the same allocated memory as
      * the given {ArrayBuffer}.
@@ -152,26 +212,20 @@ declare var Buffer: {
      *
      * @param arrayBuffer The ArrayBuffer with which to share memory.
      */
-	new(arrayBuffer: ArrayBuffer): Buffer;
+    // new(arrayBuffer: ArrayBuffer): Buffer; ### VSCODE CHANGE (new Buffer() is deprecated)
     /**
      * Allocates a new buffer containing the given {array} of octets.
      *
      * @param array The octets to store.
      */
-	new(array: any[]): Buffer;
+    // new(array: any[]): Buffer; ### VSCODE CHANGE (new Buffer() is deprecated)
     /**
      * Copies the passed {buffer} data onto a new {Buffer} instance.
      *
      * @param buffer The buffer to copy.
      */
-	new(buffer: Buffer): Buffer;
-	prototype: Buffer;
-    /**
-     * Allocates a new Buffer using an {array} of octets.
-     *
-     * @param array
-     */
-	from(array: any[]): Buffer;
+    // new(buffer: Buffer): Buffer; ### VSCODE CHANGE (new Buffer() is deprecated)
+    prototype: Buffer;
     /**
      * When passed a reference to the .buffer property of a TypedArray instance,
      * the newly created Buffer will share the same allocated memory as the TypedArray.
@@ -179,45 +233,40 @@ declare var Buffer: {
      * within the {arrayBuffer} that will be shared by the Buffer.
      *
      * @param arrayBuffer The .buffer property of a TypedArray or a new ArrayBuffer()
-     * @param byteOffset
-     * @param length
      */
-	from(arrayBuffer: ArrayBuffer, byteOffset?: number, length?: number): Buffer;
+    from(arrayBuffer: ArrayBuffer, byteOffset?: number, length?: number): Buffer;
     /**
-     * Copies the passed {buffer} data onto a new Buffer instance.
-     *
-     * @param buffer
+     * Creates a new Buffer using the passed {data}
+     * @param data data to create a new Buffer
      */
-	from(buffer: Buffer): Buffer;
+    from(data: any[] | string | Buffer | ArrayBuffer /*| TypedArray*/): Buffer;
     /**
      * Creates a new Buffer containing the given JavaScript string {str}.
      * If provided, the {encoding} parameter identifies the character encoding.
      * If not provided, {encoding} defaults to 'utf8'.
-     *
-     * @param str
      */
-	from(str: string, encoding?: string): Buffer;
+    from(str: string, encoding?: string): Buffer;
     /**
      * Returns true if {obj} is a Buffer
      *
      * @param obj object to test.
      */
-	isBuffer(obj: any): obj is Buffer;
+    isBuffer(obj: any): obj is Buffer;
     /**
      * Returns true if {encoding} is a valid encoding argument.
      * Valid string encodings in Node 0.12: 'ascii'|'utf8'|'utf16le'|'ucs2'(alias of 'utf16le')|'base64'|'binary'(deprecated)|'hex'
      *
      * @param encoding string to test.
      */
-	isEncoding(encoding: string): boolean;
+    isEncoding(encoding: string): boolean;
     /**
      * Gives the actual byte length of a string. encoding defaults to 'utf8'.
      * This is not the same as String.prototype.length since that returns the number of characters in a string.
      *
-     * @param string string to test.
+     * @param string string to test. (TypedArray is also allowed, but it is only available starting ES2017)
      * @param encoding encoding used to evaluate (defaults to 'utf8')
      */
-	byteLength(string: string, encoding?: string): number;
+    byteLength(string: string | Buffer | DataView | ArrayBuffer, encoding?: string): number;
     /**
      * Returns a buffer which is the result of concatenating all the buffers in the list together.
      *
@@ -229,11 +278,11 @@ declare var Buffer: {
      * @param totalLength Total length of the buffers when concatenated.
      *   If totalLength is not provided, it is read from the buffers in the list. However, this adds an additional loop to the function, so it is faster to provide the length explicitly.
      */
-	concat(list: Buffer[], totalLength?: number): Buffer;
+    concat(list: Buffer[], totalLength?: number): Buffer;
     /**
      * The same as buf1.compare(buf2).
      */
-	compare(buf1: Buffer, buf2: Buffer): number;
+    compare(buf1: Buffer, buf2: Buffer): number;
     /**
      * Allocates a new buffer of {size} octets.
      *
@@ -242,21 +291,25 @@ declare var Buffer: {
      *    If parameter is omitted, buffer will be filled with zeros.
      * @param encoding encoding used for call to buf.fill while initalizing
      */
-	alloc(size: number, fill?: string | Buffer | number, encoding?: string): Buffer;
+    alloc(size: number, fill?: string | Buffer | number, encoding?: string): Buffer;
     /**
      * Allocates a new buffer of {size} octets, leaving memory not initialized, so the contents
      * of the newly created Buffer are unknown and may contain sensitive data.
      *
      * @param size count of octets to allocate
      */
-	allocUnsafe(size: number): Buffer;
+    allocUnsafe(size: number): Buffer;
     /**
      * Allocates a new non-pooled buffer of {size} octets, leaving memory not initialized, so the contents
      * of the newly created Buffer are unknown and may contain sensitive data.
      *
      * @param size count of octets to allocate
      */
-	allocUnsafeSlow(size: number): Buffer;
+    allocUnsafeSlow(size: number): Buffer;
+    /**
+     * This is the number of bytes used to determine the size of pre-allocated, internal Buffer instances used for pooling. This value may be modified.
+     */
+    poolSize: number;
 };
 
 /************************************************
@@ -265,273 +318,506 @@ declare var Buffer: {
 *                                               *
 ************************************************/
 declare namespace NodeJS {
-	export interface InspectOptions {
-		showHidden?: boolean;
-		depth?: number | null;
-		colors?: boolean;
-		customInspect?: boolean;
-		showProxy?: boolean;
-		maxArrayLength?: number | null;
-		breakLength?: number;
-	}
+    export interface InspectOptions {
+        showHidden?: boolean;
+        depth?: number | null;
+        colors?: boolean;
+        customInspect?: boolean;
+        showProxy?: boolean;
+        maxArrayLength?: number | null;
+        breakLength?: number;
+    }
 
-	export interface ConsoleConstructor {
-		prototype: Console;
-		new(stdout: WritableStream, stderr?: WritableStream): Console;
-	}
+    export interface ConsoleConstructor {
+        prototype: Console;
+        new(stdout: WritableStream, stderr?: WritableStream): Console;
+    }
 
-	export interface ErrnoException extends Error {
-		errno?: number;
-		code?: string;
-		path?: string;
-		syscall?: string;
-		stack?: string;
-	}
+    export interface CallSite {
+        /**
+         * Value of "this"
+         */
+        getThis(): any;
 
-	export class EventEmitter {
-		addListener(event: string | symbol, listener: Function): this;
-		on(event: string | symbol, listener: Function): this;
-		once(event: string | symbol, listener: Function): this;
-		removeListener(event: string | symbol, listener: Function): this;
-		removeAllListeners(event?: string | symbol): this;
-		setMaxListeners(n: number): this;
-		getMaxListeners(): number;
-		listeners(event: string | symbol): Function[];
-		emit(event: string | symbol, ...args: any[]): boolean;
-		listenerCount(type: string | symbol): number;
-		// Added in Node 6...
-		prependListener(event: string | symbol, listener: Function): this;
-		prependOnceListener(event: string | symbol, listener: Function): this;
-		eventNames(): (string | symbol)[];
-	}
+        /**
+         * Type of "this" as a string.
+         * This is the name of the function stored in the constructor field of
+         * "this", if available.  Otherwise the object's [[Class]] internal
+         * property.
+         */
+        getTypeName(): string | null;
 
-	export interface ReadableStream extends EventEmitter {
-		readable: boolean;
-		read(size?: number): string | Buffer;
-		setEncoding(encoding: string | null): this;
-		pause(): this;
-		resume(): this;
-		isPaused(): boolean;
-		pipe<T extends WritableStream>(destination: T, options?: { end?: boolean; }): T;
-		unpipe<T extends WritableStream>(destination?: T): this;
-		unshift(chunk: string): void;
-		unshift(chunk: Buffer): void;
-		wrap(oldStream: ReadableStream): ReadableStream;
-	}
+        /**
+         * Current function
+         */
+        getFunction(): Function | undefined;
 
-	export interface WritableStream extends EventEmitter {
-		writable: boolean;
-		write(buffer: Buffer | string, cb?: Function): boolean;
-		write(str: string, encoding?: string, cb?: Function): boolean;
-		end(): void;
-		end(buffer: Buffer, cb?: Function): void;
-		end(str: string, cb?: Function): void;
-		end(str: string, encoding?: string, cb?: Function): void;
-	}
+        /**
+         * Name of the current function, typically its name property.
+         * If a name property is not available an attempt will be made to try
+         * to infer a name from the function's context.
+         */
+        getFunctionName(): string | null;
 
-	export interface ReadWriteStream extends ReadableStream, WritableStream { }
+        /**
+         * Name of the property [of "this" or one of its prototypes] that holds
+         * the current function
+         */
+        getMethodName(): string | null;
 
-	export interface Events extends EventEmitter { }
+        /**
+         * Name of the script [if this function was defined in a script]
+         */
+        getFileName(): string | null;
 
-	export interface Domain extends Events {
-		run(fn: Function): void;
-		add(emitter: Events): void;
-		remove(emitter: Events): void;
-		bind(cb: (err: Error, data: any) => any): any;
-		intercept(cb: (data: any) => any): any;
-		dispose(): void;
+        /**
+         * Current line number [if this function was defined in a script]
+         */
+        getLineNumber(): number | null;
 
-		addListener(event: string, listener: Function): this;
-		on(event: string, listener: Function): this;
-		once(event: string, listener: Function): this;
-		removeListener(event: string, listener: Function): this;
-		removeAllListeners(event?: string): this;
-	}
+        /**
+         * Current column number [if this function was defined in a script]
+         */
+        getColumnNumber(): number | null;
 
-	export interface MemoryUsage {
-		rss: number;
-		heapTotal: number;
-		heapUsed: number;
-	}
+        /**
+         * A call site object representing the location where eval was called
+         * [if this function was created using a call to eval]
+         */
+        getEvalOrigin(): string | undefined;
 
-	export interface CpuUsage {
-		user: number;
-		system: number;
-	}
+        /**
+         * Is this a toplevel invocation, that is, is "this" the global object?
+         */
+        isToplevel(): boolean;
 
-	export interface ProcessVersions {
-		http_parser: string;
-		node: string;
-		v8: string;
-		ares: string;
-		uv: string;
-		zlib: string;
-		modules: string;
-		openssl: string;
-	}
+        /**
+         * Does this call take place in code defined by a call to eval?
+         */
+        isEval(): boolean;
 
-	type Platform = 'aix'
-		| 'android'
-		| 'darwin'
-		| 'freebsd'
-		| 'linux'
-		| 'openbsd'
-		| 'sunos'
-		| 'win32';
+        /**
+         * Is this call in native V8 code?
+         */
+        isNative(): boolean;
 
-	export interface Socket extends ReadWriteStream {
-		isTTY?: true;
-	}
+        /**
+         * Is this a constructor call?
+         */
+        isConstructor(): boolean;
+    }
 
-	export interface WriteStream extends Socket {
-		columns?: number;
-		rows?: number;
-	}
-	export interface ReadStream extends Socket {
-		isRaw?: boolean;
-		setRawMode?(mode: boolean): void;
-	}
+    export interface ErrnoException extends Error {
+        errno?: number;
+        code?: string;
+        path?: string;
+        syscall?: string;
+        stack?: string;
+    }
 
-	export interface Process extends EventEmitter {
-		stdout: WriteStream;
-		stderr: WriteStream;
-		stdin: ReadStream;
-		openStdin(): Socket;
-		argv: string[];
-		argv0: string;
-		execArgv: string[];
-		execPath: string;
-		abort(): void;
-		chdir(directory: string): void;
-		cwd(): string;
-		emitWarning(warning: string | Error, name?: string, ctor?: Function): void;
-		env: any;
-		exit(code?: number): void;
-		exitCode: number;
-		getgid(): number;
-		setgid(id: number): void;
-		setgid(id: string): void;
-		getuid(): number;
-		setuid(id: number): void;
-		setuid(id: string): void;
-		version: string;
-		versions: ProcessVersions;
-		config: {
-			target_defaults: {
-				cflags: any[];
-				default_configuration: string;
-				defines: string[];
-				include_dirs: string[];
-				libraries: string[];
-			};
-			variables: {
-				clang: number;
-				host_arch: string;
-				node_install_npm: boolean;
-				node_install_waf: boolean;
-				node_prefix: string;
-				node_shared_openssl: boolean;
-				node_shared_v8: boolean;
-				node_shared_zlib: boolean;
-				node_use_dtrace: boolean;
-				node_use_etw: boolean;
-				node_use_openssl: boolean;
-				target_arch: string;
-				v8_no_strict_aliasing: number;
-				v8_use_snapshot: boolean;
-				visibility: string;
-			};
-		};
-		kill(pid: number, signal?: string | number): void;
-		pid: number;
-		title: string;
-		arch: string;
-		platform: Platform;
-		mainModule?: NodeModule;
-		memoryUsage(): MemoryUsage;
-		cpuUsage(previousValue?: CpuUsage): CpuUsage;
-		nextTick(callback: Function, ...args: any[]): void;
-		umask(mask?: number): number;
-		uptime(): number;
-		hrtime(time?: [number, number]): [number, number];
-		domain: Domain;
+    export class EventEmitter {
+        addListener(event: string | symbol, listener: (...args: any[]) => void): this;
+        on(event: string | symbol, listener: (...args: any[]) => void): this;
+        once(event: string | symbol, listener: (...args: any[]) => void): this;
+        removeListener(event: string | symbol, listener: (...args: any[]) => void): this;
+        removeAllListeners(event?: string | symbol): this;
+        setMaxListeners(n: number): this;
+        getMaxListeners(): number;
+        listeners(event: string | symbol): Function[];
+        emit(event: string | symbol, ...args: any[]): boolean;
+        listenerCount(type: string | symbol): number;
+        // Added in Node 6...
+        prependListener(event: string | symbol, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: string | symbol, listener: (...args: any[]) => void): this;
+        eventNames(): Array<string | symbol>;
+    }
 
-		// Worker
-		send?(message: any, sendHandle?: any): void;
-		disconnect(): void;
-		connected: boolean;
-	}
+    export interface ReadableStream extends EventEmitter {
+        readable: boolean;
+        read(size?: number): string | Buffer;
+        setEncoding(encoding: string): this;
+        pause(): this;
+        resume(): this;
+        isPaused(): boolean;
+        pipe<T extends WritableStream>(destination: T, options?: { end?: boolean; }): T;
+        unpipe<T extends WritableStream>(destination?: T): this;
+        unshift(chunk: string): void;
+        unshift(chunk: Buffer): void;
+        wrap(oldStream: ReadableStream): this;
+    }
 
-	export interface Global {
-		Array: typeof Array;
-		ArrayBuffer: typeof ArrayBuffer;
-		Boolean: typeof Boolean;
-		Buffer: typeof Buffer;
-		DataView: typeof DataView;
-		Date: typeof Date;
-		Error: typeof Error;
-		EvalError: typeof EvalError;
-		Float32Array: typeof Float32Array;
-		Float64Array: typeof Float64Array;
-		Function: typeof Function;
-		GLOBAL: Global;
-		Infinity: typeof Infinity;
-		Int16Array: typeof Int16Array;
-		Int32Array: typeof Int32Array;
-		Int8Array: typeof Int8Array;
-		Intl: typeof Intl;
-		JSON: typeof JSON;
-		Map: MapConstructor;
-		Math: typeof Math;
-		NaN: typeof NaN;
-		Number: typeof Number;
-		Object: typeof Object;
-		Promise: Function;
-		RangeError: typeof RangeError;
-		ReferenceError: typeof ReferenceError;
-		RegExp: typeof RegExp;
-		Set: SetConstructor;
-		String: typeof String;
-		Symbol: Function;
-		SyntaxError: typeof SyntaxError;
-		TypeError: typeof TypeError;
-		URIError: typeof URIError;
-		Uint16Array: typeof Uint16Array;
-		Uint32Array: typeof Uint32Array;
-		Uint8Array: typeof Uint8Array;
-		Uint8ClampedArray: Function;
-		WeakMap: WeakMapConstructor;
-		WeakSet: WeakSetConstructor;
-		clearImmediate: (immediateId: any) => void;
-		clearInterval: (intervalId: NodeJS.Timer) => void;
-		clearTimeout: (timeoutId: NodeJS.Timer) => void;
-		console: typeof console;
-		decodeURI: typeof decodeURI;
-		decodeURIComponent: typeof decodeURIComponent;
-		encodeURI: typeof encodeURI;
-		encodeURIComponent: typeof encodeURIComponent;
-		escape: (str: string) => string;
-		eval: typeof eval;
-		global: Global;
-		isFinite: typeof isFinite;
-		isNaN: typeof isNaN;
-		parseFloat: typeof parseFloat;
-		parseInt: typeof parseInt;
-		process: Process;
-		root: Global;
-		setImmediate: (callback: (...args: any[]) => void, ...args: any[]) => any;
-		setInterval: (callback: (...args: any[]) => void, ms: number, ...args: any[]) => NodeJS.Timer;
-		setTimeout: (callback: (...args: any[]) => void, ms: number, ...args: any[]) => NodeJS.Timer;
-		undefined: typeof undefined;
-		unescape: (str: string) => string;
-		gc: () => void;
-		v8debug?: any;
-	}
+    export interface WritableStream extends EventEmitter {
+        writable: boolean;
+        write(buffer: Buffer | string, cb?: Function): boolean;
+        write(str: string, encoding?: string, cb?: Function): boolean;
+        end(cb?: Function): void;
+        end(buffer: Buffer, cb?: Function): void;
+        end(str: string, cb?: Function): void;
+        end(str: string, encoding?: string, cb?: Function): void;
+    }
 
-	export interface Timer {
-		ref(): void;
-		unref(): void;
-	}
+    export interface ReadWriteStream extends ReadableStream, WritableStream { }
+
+    export interface Events extends EventEmitter { }
+
+    export interface Domain extends Events {
+        run(fn: Function): void;
+        add(emitter: Events): void;
+        remove(emitter: Events): void;
+        bind(cb: (err: Error, data: any) => any): any;
+        intercept(cb: (data: any) => any): any;
+        dispose(): void;
+
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        on(event: string, listener: (...args: any[]) => void): this;
+        once(event: string, listener: (...args: any[]) => void): this;
+        removeListener(event: string, listener: (...args: any[]) => void): this;
+        removeAllListeners(event?: string): this;
+    }
+
+    export interface MemoryUsage {
+        rss: number;
+        heapTotal: number;
+        heapUsed: number;
+        external: number;
+    }
+
+    export interface CpuUsage {
+        user: number;
+        system: number;
+    }
+
+    export interface ProcessVersions {
+        http_parser: string;
+        node: string;
+        v8: string;
+        ares: string;
+        uv: string;
+        zlib: string;
+        modules: string;
+        openssl: string;
+    }
+
+    type Platform = 'aix'
+        | 'android'
+        | 'darwin'
+        | 'freebsd'
+        | 'linux'
+        | 'openbsd'
+        | 'sunos'
+        | 'win32'
+        | 'cygwin';
+
+    type Signals =
+        "SIGABRT" | "SIGALRM" | "SIGBUS" | "SIGCHLD" | "SIGCONT" | "SIGFPE" | "SIGHUP" | "SIGILL" | "SIGINT" | "SIGIO" |
+        "SIGIOT" | "SIGKILL" | "SIGPIPE" | "SIGPOLL" | "SIGPROF" | "SIGPWR" | "SIGQUIT" | "SIGSEGV" | "SIGSTKFLT" |
+        "SIGSTOP" | "SIGSYS" | "SIGTERM" | "SIGTRAP" | "SIGTSTP" | "SIGTTIN" | "SIGTTOU" | "SIGUNUSED" | "SIGURG" |
+        "SIGUSR1" | "SIGUSR2" | "SIGVTALRM" | "SIGWINCH" | "SIGXCPU" | "SIGXFSZ" | "SIGBREAK" | "SIGLOST" | "SIGINFO";
+
+    type BeforeExitListener = (code: number) => void;
+    type DisconnectListener = () => void;
+    type ExitListener = (code: number) => void;
+    type RejectionHandledListener = (promise: Promise<any>) => void;
+    type UncaughtExceptionListener = (error: Error) => void;
+    type UnhandledRejectionListener = (reason: any, promise: Promise<any>) => void;
+    type WarningListener = (warning: Error) => void;
+    type MessageListener = (message: any, sendHandle: any) => void;
+    type SignalsListener = () => void;
+    type NewListenerListener = (type: string | symbol, listener: (...args: any[]) => void) => void;
+    type RemoveListenerListener = (type: string | symbol, listener: (...args: any[]) => void) => void;
+
+    export interface Socket extends ReadWriteStream {
+        isTTY?: true;
+    }
+
+    export interface ProcessEnv {
+        [key: string]: string | undefined;
+    }
+
+    export interface WriteStream extends Socket {
+        readonly writableHighWaterMark: number;
+        columns?: number;
+        rows?: number;
+        _write(chunk: any, encoding: string, callback: Function): void;
+        _destroy(err: Error, callback: Function): void;
+        _final(callback: Function): void;
+        setDefaultEncoding(encoding: string): this;
+        cork(): void;
+        uncork(): void;
+        destroy(error?: Error): void;
+    }
+    export interface ReadStream extends Socket {
+        readonly readableHighWaterMark: number;
+        isRaw?: boolean;
+        setRawMode?(mode: boolean): void;
+        _read(size: number): void;
+        _destroy(err: Error, callback: Function): void;
+        push(chunk: any, encoding?: string): boolean;
+        destroy(error?: Error): void;
+    }
+
+    export interface Process extends EventEmitter {
+        stdout: WriteStream;
+        stderr: WriteStream;
+        stdin: ReadStream;
+        openStdin(): Socket;
+        argv: string[];
+        argv0: string;
+        execArgv: string[];
+        execPath: string;
+        abort(): void;
+        chdir(directory: string): void;
+        cwd(): string;
+        debugPort: number;
+        emitWarning(warning: string | Error, name?: string, ctor?: Function): void;
+        env: ProcessEnv;
+        exit(code?: number): never;
+        exitCode: number;
+        getgid(): number;
+        setgid(id: number | string): void;
+        getuid(): number;
+        setuid(id: number | string): void;
+        geteuid(): number;
+        seteuid(id: number | string): void;
+        getegid(): number;
+        setegid(id: number | string): void;
+        getgroups(): number[];
+        setgroups(groups: Array<string | number>): void;
+        version: string;
+        versions: ProcessVersions;
+        config: {
+            target_defaults: {
+                cflags: any[];
+                default_configuration: string;
+                defines: string[];
+                include_dirs: string[];
+                libraries: string[];
+            };
+            variables: {
+                clang: number;
+                host_arch: string;
+                node_install_npm: boolean;
+                node_install_waf: boolean;
+                node_prefix: string;
+                node_shared_openssl: boolean;
+                node_shared_v8: boolean;
+                node_shared_zlib: boolean;
+                node_use_dtrace: boolean;
+                node_use_etw: boolean;
+                node_use_openssl: boolean;
+                target_arch: string;
+                v8_no_strict_aliasing: number;
+                v8_use_snapshot: boolean;
+                visibility: string;
+            };
+        };
+        kill(pid: number, signal?: string | number): void;
+        pid: number;
+        title: string;
+        arch: string;
+        platform: Platform;
+        mainModule?: NodeModule;
+        memoryUsage(): MemoryUsage;
+        cpuUsage(previousValue?: CpuUsage): CpuUsage;
+        nextTick(callback: Function, ...args: any[]): void;
+        umask(mask?: number): number;
+        uptime(): number;
+        hrtime(time?: [number, number]): [number, number];
+        domain: Domain;
+
+        // Worker
+        send?(message: any, sendHandle?: any): void;
+        disconnect(): void;
+        connected: boolean;
+
+        /**
+         * EventEmitter
+         *   1. beforeExit
+         *   2. disconnect
+         *   3. exit
+         *   4. message
+         *   5. rejectionHandled
+         *   6. uncaughtException
+         *   7. unhandledRejection
+         *   8. warning
+         *   9. message
+         *  10. <All OS Signals>
+         *  11. newListener/removeListener inherited from EventEmitter
+         */
+        addListener(event: "beforeExit", listener: BeforeExitListener): this;
+        addListener(event: "disconnect", listener: DisconnectListener): this;
+        addListener(event: "exit", listener: ExitListener): this;
+        addListener(event: "rejectionHandled", listener: RejectionHandledListener): this;
+        addListener(event: "uncaughtException", listener: UncaughtExceptionListener): this;
+        addListener(event: "unhandledRejection", listener: UnhandledRejectionListener): this;
+        addListener(event: "warning", listener: WarningListener): this;
+        addListener(event: "message", listener: MessageListener): this;
+        addListener(event: Signals, listener: SignalsListener): this;
+        addListener(event: "newListener", listener: NewListenerListener): this;
+        addListener(event: "removeListener", listener: RemoveListenerListener): this;
+
+        emit(event: "beforeExit", code: number): boolean;
+        emit(event: "disconnect"): boolean;
+        emit(event: "exit", code: number): boolean;
+        emit(event: "rejectionHandled", promise: Promise<any>): boolean;
+        emit(event: "uncaughtException", error: Error): boolean;
+        emit(event: "unhandledRejection", reason: any, promise: Promise<any>): boolean;
+        emit(event: "warning", warning: Error): boolean;
+        emit(event: "message", message: any, sendHandle: any): this;
+        emit(event: Signals): boolean;
+        emit(event: "newListener", eventName: string | symbol, listener: (...args: any[]) => void): this;
+        emit(event: "removeListener", eventName: string, listener: (...args: any[]) => void): this;
+
+        on(event: "beforeExit", listener: BeforeExitListener): this;
+        on(event: "disconnect", listener: DisconnectListener): this;
+        on(event: "exit", listener: ExitListener): this;
+        on(event: "rejectionHandled", listener: RejectionHandledListener): this;
+        on(event: "uncaughtException", listener: UncaughtExceptionListener): this;
+        on(event: "unhandledRejection", listener: UnhandledRejectionListener): this;
+        on(event: "warning", listener: WarningListener): this;
+        on(event: "message", listener: MessageListener): this;
+        on(event: Signals, listener: SignalsListener): this;
+        on(event: "newListener", listener: NewListenerListener): this;
+        on(event: "removeListener", listener: RemoveListenerListener): this;
+
+        once(event: "beforeExit", listener: BeforeExitListener): this;
+        once(event: "disconnect", listener: DisconnectListener): this;
+        once(event: "exit", listener: ExitListener): this;
+        once(event: "rejectionHandled", listener: RejectionHandledListener): this;
+        once(event: "uncaughtException", listener: UncaughtExceptionListener): this;
+        once(event: "unhandledRejection", listener: UnhandledRejectionListener): this;
+        once(event: "warning", listener: WarningListener): this;
+        once(event: "message", listener: MessageListener): this;
+        once(event: Signals, listener: SignalsListener): this;
+        once(event: "newListener", listener: NewListenerListener): this;
+        once(event: "removeListener", listener: RemoveListenerListener): this;
+
+        prependListener(event: "beforeExit", listener: BeforeExitListener): this;
+        prependListener(event: "disconnect", listener: DisconnectListener): this;
+        prependListener(event: "exit", listener: ExitListener): this;
+        prependListener(event: "rejectionHandled", listener: RejectionHandledListener): this;
+        prependListener(event: "uncaughtException", listener: UncaughtExceptionListener): this;
+        prependListener(event: "unhandledRejection", listener: UnhandledRejectionListener): this;
+        prependListener(event: "warning", listener: WarningListener): this;
+        prependListener(event: "message", listener: MessageListener): this;
+        prependListener(event: Signals, listener: SignalsListener): this;
+        prependListener(event: "newListener", listener: NewListenerListener): this;
+        prependListener(event: "removeListener", listener: RemoveListenerListener): this;
+
+        prependOnceListener(event: "beforeExit", listener: BeforeExitListener): this;
+        prependOnceListener(event: "disconnect", listener: DisconnectListener): this;
+        prependOnceListener(event: "exit", listener: ExitListener): this;
+        prependOnceListener(event: "rejectionHandled", listener: RejectionHandledListener): this;
+        prependOnceListener(event: "uncaughtException", listener: UncaughtExceptionListener): this;
+        prependOnceListener(event: "unhandledRejection", listener: UnhandledRejectionListener): this;
+        prependOnceListener(event: "warning", listener: WarningListener): this;
+        prependOnceListener(event: "message", listener: MessageListener): this;
+        prependOnceListener(event: Signals, listener: SignalsListener): this;
+        prependOnceListener(event: "newListener", listener: NewListenerListener): this;
+        prependOnceListener(event: "removeListener", listener: RemoveListenerListener): this;
+
+        listeners(event: "beforeExit"): BeforeExitListener[];
+        listeners(event: "disconnect"): DisconnectListener[];
+        listeners(event: "exit"): ExitListener[];
+        listeners(event: "rejectionHandled"): RejectionHandledListener[];
+        listeners(event: "uncaughtException"): UncaughtExceptionListener[];
+        listeners(event: "unhandledRejection"): UnhandledRejectionListener[];
+        listeners(event: "warning"): WarningListener[];
+        listeners(event: "message"): MessageListener[];
+        listeners(event: Signals): SignalsListener[];
+        listeners(event: "newListener"): NewListenerListener[];
+        listeners(event: "removeListener"): RemoveListenerListener[];
+    }
+
+    export interface Global {
+        Array: typeof Array;
+        ArrayBuffer: typeof ArrayBuffer;
+        Boolean: typeof Boolean;
+        Buffer: typeof Buffer;
+        DataView: typeof DataView;
+        Date: typeof Date;
+        Error: typeof Error;
+        EvalError: typeof EvalError;
+        Float32Array: typeof Float32Array;
+        Float64Array: typeof Float64Array;
+        Function: typeof Function;
+        GLOBAL: Global;
+        Infinity: typeof Infinity;
+        Int16Array: typeof Int16Array;
+        Int32Array: typeof Int32Array;
+        Int8Array: typeof Int8Array;
+        Intl: typeof Intl;
+        JSON: typeof JSON;
+        Map: MapConstructor;
+        Math: typeof Math;
+        NaN: typeof NaN;
+        Number: typeof Number;
+        Object: typeof Object;
+        Promise: Function;
+        RangeError: typeof RangeError;
+        ReferenceError: typeof ReferenceError;
+        RegExp: typeof RegExp;
+        Set: SetConstructor;
+        String: typeof String;
+        Symbol: Function;
+        SyntaxError: typeof SyntaxError;
+        TypeError: typeof TypeError;
+        URIError: typeof URIError;
+        Uint16Array: typeof Uint16Array;
+        Uint32Array: typeof Uint32Array;
+        Uint8Array: typeof Uint8Array;
+        Uint8ClampedArray: Function;
+        WeakMap: WeakMapConstructor;
+        WeakSet: WeakSetConstructor;
+        clearImmediate: (immediateId: any) => void;
+        clearInterval: (intervalId: NodeJS.Timer) => void;
+        clearTimeout: (timeoutId: NodeJS.Timer) => void;
+        console: typeof console;
+        decodeURI: typeof decodeURI;
+        decodeURIComponent: typeof decodeURIComponent;
+        encodeURI: typeof encodeURI;
+        encodeURIComponent: typeof encodeURIComponent;
+        escape: (str: string) => string;
+        eval: typeof eval;
+        global: Global;
+        isFinite: typeof isFinite;
+        isNaN: typeof isNaN;
+        parseFloat: typeof parseFloat;
+        parseInt: typeof parseInt;
+        process: Process;
+        root: Global;
+        setImmediate: (callback: (...args: any[]) => void, ...args: any[]) => any;
+        setInterval: (callback: (...args: any[]) => void, ms: number, ...args: any[]) => NodeJS.Timer;
+        setTimeout: (callback: (...args: any[]) => void, ms: number, ...args: any[]) => NodeJS.Timer;
+        undefined: typeof undefined;
+        unescape: (str: string) => string;
+        gc: () => void;
+        v8debug?: any;
+    }
+
+    export interface Timer {
+        ref(): void;
+        unref(): void;
+    }
+
+    class Module {
+        static runMain(): void;
+        static wrap(code: string): string;
+        static builtinModules: string[];
+
+        static Module: typeof Module;
+
+        exports: any;
+        require: NodeRequireFunction;
+        id: string;
+        filename: string;
+        loaded: boolean;
+        parent: Module | null;
+        children: Module[];
+        paths: string[];
+
+        constructor(id: string, parent?: Module);
+    }
 }
 
 interface IterableIterator<T> { }
@@ -540,59 +826,59 @@ interface IterableIterator<T> { }
  * @deprecated
  */
 interface NodeBuffer extends Uint8Array {
-	write(string: string, offset?: number, length?: number, encoding?: string): number;
-	toString(encoding?: string, start?: number, end?: number): string;
-	toJSON(): { type: 'Buffer', data: any[] };
-	equals(otherBuffer: Buffer): boolean;
-	compare(otherBuffer: Buffer, targetStart?: number, targetEnd?: number, sourceStart?: number, sourceEnd?: number): number;
-	copy(targetBuffer: Buffer, targetStart?: number, sourceStart?: number, sourceEnd?: number): number;
-	slice(start?: number, end?: number): Buffer;
-	writeUIntLE(value: number, offset: number, byteLength: number, noAssert?: boolean): number;
-	writeUIntBE(value: number, offset: number, byteLength: number, noAssert?: boolean): number;
-	writeIntLE(value: number, offset: number, byteLength: number, noAssert?: boolean): number;
-	writeIntBE(value: number, offset: number, byteLength: number, noAssert?: boolean): number;
-	readUIntLE(offset: number, byteLength: number, noAssert?: boolean): number;
-	readUIntBE(offset: number, byteLength: number, noAssert?: boolean): number;
-	readIntLE(offset: number, byteLength: number, noAssert?: boolean): number;
-	readIntBE(offset: number, byteLength: number, noAssert?: boolean): number;
-	readUInt8(offset: number, noAssert?: boolean): number;
-	readUInt16LE(offset: number, noAssert?: boolean): number;
-	readUInt16BE(offset: number, noAssert?: boolean): number;
-	readUInt32LE(offset: number, noAssert?: boolean): number;
-	readUInt32BE(offset: number, noAssert?: boolean): number;
-	readInt8(offset: number, noAssert?: boolean): number;
-	readInt16LE(offset: number, noAssert?: boolean): number;
-	readInt16BE(offset: number, noAssert?: boolean): number;
-	readInt32LE(offset: number, noAssert?: boolean): number;
-	readInt32BE(offset: number, noAssert?: boolean): number;
-	readFloatLE(offset: number, noAssert?: boolean): number;
-	readFloatBE(offset: number, noAssert?: boolean): number;
-	readDoubleLE(offset: number, noAssert?: boolean): number;
-	readDoubleBE(offset: number, noAssert?: boolean): number;
-	swap16(): Buffer;
-	swap32(): Buffer;
-	swap64(): Buffer;
-	writeUInt8(value: number, offset: number, noAssert?: boolean): number;
-	writeUInt16LE(value: number, offset: number, noAssert?: boolean): number;
-	writeUInt16BE(value: number, offset: number, noAssert?: boolean): number;
-	writeUInt32LE(value: number, offset: number, noAssert?: boolean): number;
-	writeUInt32BE(value: number, offset: number, noAssert?: boolean): number;
-	writeInt8(value: number, offset: number, noAssert?: boolean): number;
-	writeInt16LE(value: number, offset: number, noAssert?: boolean): number;
-	writeInt16BE(value: number, offset: number, noAssert?: boolean): number;
-	writeInt32LE(value: number, offset: number, noAssert?: boolean): number;
-	writeInt32BE(value: number, offset: number, noAssert?: boolean): number;
-	writeFloatLE(value: number, offset: number, noAssert?: boolean): number;
-	writeFloatBE(value: number, offset: number, noAssert?: boolean): number;
-	writeDoubleLE(value: number, offset: number, noAssert?: boolean): number;
-	writeDoubleBE(value: number, offset: number, noAssert?: boolean): number;
-	fill(value: any, offset?: number, end?: number): this;
-	indexOf(value: string | number | Buffer, byteOffset?: number, encoding?: string): number;
-	lastIndexOf(value: string | number | Buffer, byteOffset?: number, encoding?: string): number;
-	entries(): IterableIterator<[number, number]>;
-	includes(value: string | number | Buffer, byteOffset?: number, encoding?: string): boolean;
-	keys(): IterableIterator<number>;
-	values(): IterableIterator<number>;
+    write(string: string, offset?: number, length?: number, encoding?: string): number;
+    toString(encoding?: string, start?: number, end?: number): string;
+    toJSON(): { type: 'Buffer', data: any[] };
+    equals(otherBuffer: Buffer): boolean;
+    compare(otherBuffer: Buffer, targetStart?: number, targetEnd?: number, sourceStart?: number, sourceEnd?: number): number;
+    copy(targetBuffer: Buffer, targetStart?: number, sourceStart?: number, sourceEnd?: number): number;
+    slice(start?: number, end?: number): Buffer;
+    writeUIntLE(value: number, offset: number, byteLength: number, noAssert?: boolean): number;
+    writeUIntBE(value: number, offset: number, byteLength: number, noAssert?: boolean): number;
+    writeIntLE(value: number, offset: number, byteLength: number, noAssert?: boolean): number;
+    writeIntBE(value: number, offset: number, byteLength: number, noAssert?: boolean): number;
+    readUIntLE(offset: number, byteLength: number, noAssert?: boolean): number;
+    readUIntBE(offset: number, byteLength: number, noAssert?: boolean): number;
+    readIntLE(offset: number, byteLength: number, noAssert?: boolean): number;
+    readIntBE(offset: number, byteLength: number, noAssert?: boolean): number;
+    readUInt8(offset: number, noAssert?: boolean): number;
+    readUInt16LE(offset: number, noAssert?: boolean): number;
+    readUInt16BE(offset: number, noAssert?: boolean): number;
+    readUInt32LE(offset: number, noAssert?: boolean): number;
+    readUInt32BE(offset: number, noAssert?: boolean): number;
+    readInt8(offset: number, noAssert?: boolean): number;
+    readInt16LE(offset: number, noAssert?: boolean): number;
+    readInt16BE(offset: number, noAssert?: boolean): number;
+    readInt32LE(offset: number, noAssert?: boolean): number;
+    readInt32BE(offset: number, noAssert?: boolean): number;
+    readFloatLE(offset: number, noAssert?: boolean): number;
+    readFloatBE(offset: number, noAssert?: boolean): number;
+    readDoubleLE(offset: number, noAssert?: boolean): number;
+    readDoubleBE(offset: number, noAssert?: boolean): number;
+    swap16(): Buffer;
+    swap32(): Buffer;
+    swap64(): Buffer;
+    writeUInt8(value: number, offset: number, noAssert?: boolean): number;
+    writeUInt16LE(value: number, offset: number, noAssert?: boolean): number;
+    writeUInt16BE(value: number, offset: number, noAssert?: boolean): number;
+    writeUInt32LE(value: number, offset: number, noAssert?: boolean): number;
+    writeUInt32BE(value: number, offset: number, noAssert?: boolean): number;
+    writeInt8(value: number, offset: number, noAssert?: boolean): number;
+    writeInt16LE(value: number, offset: number, noAssert?: boolean): number;
+    writeInt16BE(value: number, offset: number, noAssert?: boolean): number;
+    writeInt32LE(value: number, offset: number, noAssert?: boolean): number;
+    writeInt32BE(value: number, offset: number, noAssert?: boolean): number;
+    writeFloatLE(value: number, offset: number, noAssert?: boolean): number;
+    writeFloatBE(value: number, offset: number, noAssert?: boolean): number;
+    writeDoubleLE(value: number, offset: number, noAssert?: boolean): number;
+    writeDoubleBE(value: number, offset: number, noAssert?: boolean): number;
+    fill(value: any, offset?: number, end?: number): this;
+    indexOf(value: string | number | Buffer, byteOffset?: number, encoding?: string): number;
+    lastIndexOf(value: string | number | Buffer, byteOffset?: number, encoding?: string): number;
+    entries(): IterableIterator<[number, number]>;
+    includes(value: string | number | Buffer, byteOffset?: number, encoding?: string): boolean;
+    keys(): IterableIterator<number>;
+    values(): IterableIterator<number>;
 }
 
 /************************************************
@@ -601,205 +887,271 @@ interface NodeBuffer extends Uint8Array {
 *                                               *
 ************************************************/
 declare module "buffer" {
-	export var INSPECT_MAX_BYTES: number;
-	var BuffType: typeof Buffer;
-	var SlowBuffType: typeof SlowBuffer;
-	export { BuffType as Buffer, SlowBuffType as SlowBuffer };
+    export var INSPECT_MAX_BYTES: number;
+    var BuffType: typeof Buffer;
+    var SlowBuffType: typeof SlowBuffer;
+    export { BuffType as Buffer, SlowBuffType as SlowBuffer };
 }
 
 declare module "querystring" {
-	export interface StringifyOptions {
-		encodeURIComponent?: Function;
-	}
+    export interface StringifyOptions {
+        encodeURIComponent?: Function;
+    }
 
-	export interface ParseOptions {
-		maxKeys?: number;
-		decodeURIComponent?: Function;
-	}
+    export interface ParseOptions {
+        maxKeys?: number;
+        decodeURIComponent?: Function;
+    }
 
-	export function stringify<T>(obj: T, sep?: string, eq?: string, options?: StringifyOptions): string;
-	export function parse(str: string, sep?: string, eq?: string, options?: ParseOptions): any;
-	export function parse<T extends {}>(str: string, sep?: string, eq?: string, options?: ParseOptions): T;
-	export function escape(str: string): string;
-	export function unescape(str: string): string;
+    interface ParsedUrlQuery { [key: string]: string | string[] | undefined; }
+
+    export function stringify<T>(obj: T, sep?: string, eq?: string, options?: StringifyOptions): string;
+    export function parse(str: string, sep?: string, eq?: string, options?: ParseOptions): ParsedUrlQuery;
+    export function parse<T extends {}>(str: string, sep?: string, eq?: string, options?: ParseOptions): T;
+    export function escape(str: string): string;
+    export function unescape(str: string): string;
 }
 
 declare module "events" {
-	class internal extends NodeJS.EventEmitter { }
+    class internal extends NodeJS.EventEmitter { }
 
-	namespace internal {
-		export class EventEmitter extends internal {
-			static listenerCount(emitter: EventEmitter, event: string | symbol): number; // deprecated
-			static defaultMaxListeners: number;
+    namespace internal {
+        export class EventEmitter extends internal {
+            static listenerCount(emitter: EventEmitter, event: string | symbol): number; // deprecated
+            static defaultMaxListeners: number;
 
-			addListener(event: string | symbol, listener: Function): this;
-			on(event: string | symbol, listener: Function): this;
-			once(event: string | symbol, listener: Function): this;
-			prependListener(event: string | symbol, listener: Function): this;
-			prependOnceListener(event: string | symbol, listener: Function): this;
-			removeListener(event: string | symbol, listener: Function): this;
-			removeAllListeners(event?: string | symbol): this;
-			setMaxListeners(n: number): this;
-			getMaxListeners(): number;
-			listeners(event: string | symbol): Function[];
-			emit(event: string | symbol, ...args: any[]): boolean;
-			eventNames(): (string | symbol)[];
-			listenerCount(type: string | symbol): number;
-		}
-	}
+            addListener(event: string | symbol, listener: (...args: any[]) => void): this;
+            on(event: string | symbol, listener: (...args: any[]) => void): this;
+            once(event: string | symbol, listener: (...args: any[]) => void): this;
+            prependListener(event: string | symbol, listener: (...args: any[]) => void): this;
+            prependOnceListener(event: string | symbol, listener: (...args: any[]) => void): this;
+            removeListener(event: string | symbol, listener: (...args: any[]) => void): this;
+            removeAllListeners(event?: string | symbol): this;
+            setMaxListeners(n: number): this;
+            getMaxListeners(): number;
+            listeners(event: string | symbol): Function[];
+            emit(event: string | symbol, ...args: any[]): boolean;
+            eventNames(): Array<string | symbol>;
+            listenerCount(type: string | symbol): number;
+        }
+    }
 
-	export = internal;
+    export = internal;
 }
 
 declare module "http" {
-	import * as events from "events";
-	import * as net from "net";
-	import * as stream from "stream";
+    import * as events from "events";
+    import * as net from "net";
+    import * as stream from "stream";
+    import { URL } from "url";
 
-	export interface RequestOptions {
-		protocol?: string;
-		host?: string;
-		hostname?: string;
-		family?: number;
-		port?: number;
-		localAddress?: string;
-		socketPath?: string;
-		method?: string;
-		path?: string;
-		headers?: { [key: string]: any };
-		auth?: string;
-		agent?: Agent | boolean;
-		timeout?: number;
-	}
+    // incoming headers will never contain number
+    export interface IncomingHttpHeaders {
+        'accept'?: string;
+        'access-control-allow-origin'?: string;
+        'access-control-allow-credentials'?: string;
+        'access-control-expose-headers'?: string;
+        'access-control-max-age'?: string;
+        'access-control-allow-methods'?: string;
+        'access-control-allow-headers'?: string;
+        'accept-patch'?: string;
+        'accept-ranges'?: string;
+        'authorization'?: string;
+        'age'?: string;
+        'allow'?: string;
+        'alt-svc'?: string;
+        'cache-control'?: string;
+        'connection'?: string;
+        'content-disposition'?: string;
+        'content-encoding'?: string;
+        'content-language'?: string;
+        'content-length'?: string;
+        'content-location'?: string;
+        'content-range'?: string;
+        'content-type'?: string;
+        'date'?: string;
+        'expires'?: string;
+        'host'?: string;
+        'last-modified'?: string;
+        'location'?: string;
+        'pragma'?: string;
+        'proxy-authenticate'?: string;
+        'public-key-pins'?: string;
+        'retry-after'?: string;
+        'set-cookie'?: string[];
+        'strict-transport-security'?: string;
+        'trailer'?: string;
+        'transfer-encoding'?: string;
+        'tk'?: string;
+        'upgrade'?: string;
+        'vary'?: string;
+        'via'?: string;
+        'warning'?: string;
+        'www-authenticate'?: string;
+        [header: string]: string | string[] | undefined;
+    }
 
-	export interface Server extends net.Server {
-		setTimeout(msecs: number, callback: Function): void;
-		maxHeadersCount: number;
-		timeout: number;
-		listening: boolean;
-	}
+    // outgoing headers allows numbers (as they are converted internally to strings)
+    export interface OutgoingHttpHeaders {
+        [header: string]: number | string | string[] | undefined;
+    }
+
+    export interface ClientRequestArgs {
+        protocol?: string;
+        host?: string;
+        hostname?: string;
+        family?: number;
+        port?: number | string;
+        defaultPort?: number | string;
+        localAddress?: string;
+        socketPath?: string;
+        method?: string;
+        path?: string;
+        headers?: OutgoingHttpHeaders;
+        auth?: string;
+        agent?: Agent | boolean;
+        _defaultAgent?: Agent;
+        timeout?: number;
+        // https://github.com/nodejs/node/blob/master/lib/_http_client.js#L278
+        createConnection?: (options: ClientRequestArgs, oncreate: (err: Error, socket: net.Socket) => void) => net.Socket;
+    }
+
+    export class Server extends net.Server {
+        constructor(requestListener?: (req: IncomingMessage, res: ServerResponse) => void);
+
+        setTimeout(msecs?: number, callback?: () => void): this;
+        setTimeout(callback: () => void): this;
+        maxHeadersCount: number;
+        timeout: number;
+        keepAliveTimeout: number;
+    }
     /**
      * @deprecated Use IncomingMessage
      */
-	export interface ServerRequest extends IncomingMessage {
-		connection: net.Socket;
-	}
-	export interface ServerResponse extends stream.Writable {
-		// Extended base methods
-		write(buffer: Buffer): boolean;
-		write(buffer: Buffer, cb?: Function): boolean;
-		write(str: string, cb?: Function): boolean;
-		write(str: string, encoding?: string, cb?: Function): boolean;
-		write(str: string, encoding?: string, fd?: string): boolean;
+    export class ServerRequest extends IncomingMessage {
+        connection: net.Socket;
+    }
 
-		writeContinue(): void;
-		writeHead(statusCode: number, reasonPhrase?: string, headers?: any): void;
-		writeHead(statusCode: number, headers?: any): void;
-		statusCode: number;
-		statusMessage: string;
-		headersSent: boolean;
-		setHeader(name: string, value: string | string[]): void;
-		setTimeout(msecs: number, callback: Function): ServerResponse;
-		sendDate: boolean;
-		getHeader(name: string): string;
-		removeHeader(name: string): void;
-		write(chunk: any, encoding?: string): any;
-		addTrailers(headers: any): void;
-		finished: boolean;
+    // https://github.com/nodejs/node/blob/master/lib/_http_outgoing.js
+    export class OutgoingMessage extends stream.Writable {
+        upgrading: boolean;
+        chunkedEncoding: boolean;
+        shouldKeepAlive: boolean;
+        useChunkedEncodingByDefault: boolean;
+        sendDate: boolean;
+        finished: boolean;
+        headersSent: boolean;
+        connection: net.Socket;
 
-		// Extended base methods
-		end(): void;
-		end(buffer: Buffer, cb?: Function): void;
-		end(str: string, cb?: Function): void;
-		end(str: string, encoding?: string, cb?: Function): void;
-		end(data?: any, encoding?: string): void;
-	}
-	export interface ClientRequest extends stream.Writable {
-		// Extended base methods
-		write(buffer: Buffer): boolean;
-		write(buffer: Buffer, cb?: Function): boolean;
-		write(str: string, cb?: Function): boolean;
-		write(str: string, encoding?: string, cb?: Function): boolean;
-		write(str: string, encoding?: string, fd?: string): boolean;
+        constructor();
 
-		write(chunk: any, encoding?: string): void;
-		abort(): void;
-		setTimeout(timeout: number, callback?: Function): void;
-		setNoDelay(noDelay?: boolean): void;
-		setSocketKeepAlive(enable?: boolean, initialDelay?: number): void;
+        setTimeout(msecs: number, callback?: () => void): this;
+        destroy(error: Error): void;
+        setHeader(name: string, value: number | string | string[]): void;
+        getHeader(name: string): number | string | string[] | undefined;
+        getHeaders(): OutgoingHttpHeaders;
+        getHeaderNames(): string[];
+        hasHeader(name: string): boolean;
+        removeHeader(name: string): void;
+        addTrailers(headers: OutgoingHttpHeaders | Array<[string, string]>): void;
+        flushHeaders(): void;
+    }
 
-		setHeader(name: string, value: string | string[]): void;
-		getHeader(name: string): string;
-		removeHeader(name: string): void;
-		addTrailers(headers: any): void;
+    // https://github.com/nodejs/node/blob/master/lib/_http_server.js#L108-L256
+    export class ServerResponse extends OutgoingMessage {
+        statusCode: number;
+        statusMessage: string;
 
-		// Extended base methods
-		end(): void;
-		end(buffer: Buffer, cb?: Function): void;
-		end(str: string, cb?: Function): void;
-		end(str: string, encoding?: string, cb?: Function): void;
-		end(data?: any, encoding?: string): void;
-	}
-	export interface IncomingMessage extends stream.Readable {
-		httpVersion: string;
-		httpVersionMajor: number;
-		httpVersionMinor: number;
-		connection: net.Socket;
-		headers: any;
-		rawHeaders: string[];
-		trailers: any;
-		rawTrailers: any;
-		setTimeout(msecs: number, callback: Function): NodeJS.Timer;
+        constructor(req: IncomingMessage);
+
+        assignSocket(socket: net.Socket): void;
+        detachSocket(socket: net.Socket): void;
+        // https://github.com/nodejs/node/blob/master/test/parallel/test-http-write-callbacks.js#L53
+        // no args in writeContinue callback
+        writeContinue(callback?: () => void): void;
+        writeHead(statusCode: number, reasonPhrase?: string, headers?: OutgoingHttpHeaders): void;
+        writeHead(statusCode: number, headers?: OutgoingHttpHeaders): void;
+    }
+
+    // https://github.com/nodejs/node/blob/master/lib/_http_client.js#L77
+    export class ClientRequest extends OutgoingMessage {
+        connection: net.Socket;
+        socket: net.Socket;
+        aborted: number;
+
+        constructor(url: string | URL | ClientRequestArgs, cb?: (res: IncomingMessage) => void);
+
+        abort(): void;
+        onSocket(socket: net.Socket): void;
+        setTimeout(timeout: number, callback?: () => void): this;
+        setNoDelay(noDelay?: boolean): void;
+        setSocketKeepAlive(enable?: boolean, initialDelay?: number): void;
+    }
+
+    export class IncomingMessage extends stream.Readable {
+        constructor(socket: net.Socket);
+
+        httpVersion: string;
+        httpVersionMajor: number;
+        httpVersionMinor: number;
+        connection: net.Socket;
+        headers: IncomingHttpHeaders;
+        rawHeaders: string[];
+        trailers: { [key: string]: string | undefined };
+        rawTrailers: string[];
+        setTimeout(msecs: number, callback: () => void): this;
         /**
          * Only valid for request obtained from http.Server.
          */
-		method?: string;
+        method?: string;
         /**
          * Only valid for request obtained from http.Server.
          */
-		url?: string;
+        url?: string;
         /**
          * Only valid for response obtained from http.ClientRequest.
          */
-		statusCode?: number;
+        statusCode?: number;
         /**
          * Only valid for response obtained from http.ClientRequest.
          */
-		statusMessage?: string;
-		socket: net.Socket;
-		destroy(error?: Error): void;
-	}
+        statusMessage?: string;
+        socket: net.Socket;
+        destroy(error?: Error): void;
+    }
+
     /**
      * @deprecated Use IncomingMessage
      */
-	export interface ClientResponse extends IncomingMessage { }
+    export class ClientResponse extends IncomingMessage { }
 
-	export interface AgentOptions {
+    export interface AgentOptions {
         /**
          * Keep sockets around in a pool to be used by other requests in the future. Default = false
          */
-		keepAlive?: boolean;
+        keepAlive?: boolean;
         /**
          * When using HTTP KeepAlive, how often to send TCP KeepAlive packets over sockets being kept alive. Default = 1000.
          * Only relevant if keepAlive is set to true.
          */
-		keepAliveMsecs?: number;
+        keepAliveMsecs?: number;
         /**
          * Maximum number of sockets to allow per host. Default for Node 0.10 is 5, default for Node 0.12 is Infinity
          */
-		maxSockets?: number;
+        maxSockets?: number;
         /**
          * Maximum number of sockets to leave open in a free state. Only relevant if keepAlive is set to true. Default = 256.
          */
-		maxFreeSockets?: number;
-	}
+        maxFreeSockets?: number;
+    }
 
-	export class Agent {
-		maxSockets: number;
-		sockets: any;
-		requests: any;
+    export class Agent {
+        maxFreeSockets: number;
+        maxSockets: number;
+        sockets: any;
+        requests: any;
 
-		constructor(opts?: AgentOptions);
+        constructor(opts?: AgentOptions);
 
         /**
          * Destroy any sockets that are currently in use by the agent.
@@ -807,62 +1159,61 @@ declare module "http" {
          * then it is best to explicitly shut down the agent when you know that it will no longer be used. Otherwise,
          * sockets may hang open for quite a long time before the server terminates them.
          */
-		destroy(): void;
-	}
+        destroy(): void;
+    }
 
-	export var METHODS: string[];
+    export var METHODS: string[];
 
-	export var STATUS_CODES: {
-		[errorCode: number]: string;
-		[errorCode: string]: string;
-	};
-	export function createServer(requestListener?: (request: IncomingMessage, response: ServerResponse) => void): Server;
-	export function createClient(port?: number, host?: string): any;
-	export function request(options: RequestOptions, callback?: (res: IncomingMessage) => void): ClientRequest;
-	export function get(options: any, callback?: (res: IncomingMessage) => void): ClientRequest;
-	export var globalAgent: Agent;
+    export var STATUS_CODES: {
+        [errorCode: number]: string | undefined;
+        [errorCode: string]: string | undefined;
+    };
+
+    export function createServer(requestListener?: (request: IncomingMessage, response: ServerResponse) => void): Server;
+    export function createClient(port?: number, host?: string): any;
+
+    // although RequestOptions are passed as ClientRequestArgs to ClientRequest directly,
+    // create interface RequestOptions would make the naming more clear to developers
+    export interface RequestOptions extends ClientRequestArgs { }
+    export function request(options: RequestOptions | string | URL, callback?: (res: IncomingMessage) => void): ClientRequest;
+    export function get(options: RequestOptions | string | URL, callback?: (res: IncomingMessage) => void): ClientRequest;
+    export var globalAgent: Agent;
 }
 
 declare module "cluster" {
-	import * as child from "child_process";
-	import * as events from "events";
-	import * as net from "net";
+    import * as child from "child_process";
+    import * as events from "events";
+    import * as net from "net";
 
-	// interfaces
-	export interface ClusterSettings {
-		execArgv?: string[]; // default: process.execArgv
-		exec?: string;
-		args?: string[];
-		silent?: boolean;
-		stdio?: any[];
-		uid?: number;
-		gid?: number;
-	}
+    // interfaces
+    export interface ClusterSettings {
+        execArgv?: string[]; // default: process.execArgv
+        exec?: string;
+        args?: string[];
+        silent?: boolean;
+        stdio?: any[];
+        uid?: number;
+        gid?: number;
+        inspectPort?: number | (() => number);
+    }
 
-	export interface ClusterSetupMasterSettings {
-		exec?: string;  // default: process.argv[1]
-		args?: string[];  // default: process.argv.slice(2)
-		silent?: boolean;  // default: false
-		stdio?: any[];
-	}
+    export interface Address {
+        address: string;
+        port: number;
+        addressType: number | "udp4" | "udp6";  // 4, 6, -1, "udp4", "udp6"
+    }
 
-	export interface Address {
-		address: string;
-		port: number;
-		addressType: number | "udp4" | "udp6";  // 4, 6, -1, "udp4", "udp6"
-	}
-
-	export class Worker extends events.EventEmitter {
-		id: string;
-		process: child.ChildProcess;
-		suicide: boolean;
-		send(message: any, sendHandle?: any, callback?: (error: Error) => void): boolean;
-		kill(signal?: string): void;
-		destroy(signal?: string): void;
-		disconnect(): void;
-		isConnected(): boolean;
-		isDead(): boolean;
-		exitedAfterDisconnect: boolean;
+    export class Worker extends events.EventEmitter {
+        id: number;
+        process: child.ChildProcess;
+        suicide: boolean;
+        send(message: any, sendHandle?: any, callback?: (error: Error) => void): boolean;
+        kill(signal?: string): void;
+        destroy(signal?: string): void;
+        disconnect(): void;
+        isConnected(): boolean;
+        isDead(): boolean;
+        exitedAfterDisconnect: boolean;
 
         /**
          * events.EventEmitter
@@ -873,68 +1224,68 @@ declare module "cluster" {
          *   5. message
          *   6. online
          */
-		addListener(event: string, listener: Function): this;
-		addListener(event: "disconnect", listener: () => void): this;
-		addListener(event: "error", listener: (error: Error) => void): this;
-		addListener(event: "exit", listener: (code: number, signal: string) => void): this;
-		addListener(event: "listening", listener: (address: Address) => void): this;
-		addListener(event: "message", listener: (message: any, handle: net.Socket | net.Server) => void): this;  // the handle is a net.Socket or net.Server object, or undefined.
-		addListener(event: "online", listener: () => void): this;
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        addListener(event: "disconnect", listener: () => void): this;
+        addListener(event: "error", listener: (error: Error) => void): this;
+        addListener(event: "exit", listener: (code: number, signal: string) => void): this;
+        addListener(event: "listening", listener: (address: Address) => void): this;
+        addListener(event: "message", listener: (message: any, handle: net.Socket | net.Server) => void): this;  // the handle is a net.Socket or net.Server object, or undefined.
+        addListener(event: "online", listener: () => void): this;
 
-		emit(event: string | symbol, ...args: any[]): boolean;
-		emit(event: "disconnect", listener: () => void): boolean
-		emit(event: "error", listener: (error: Error) => void): boolean
-		emit(event: "exit", listener: (code: number, signal: string) => void): boolean
-		emit(event: "listening", listener: (address: Address) => void): boolean
-		emit(event: "message", listener: (message: any, handle: net.Socket | net.Server) => void): boolean
-		emit(event: "online", listener: () => void): boolean
+        emit(event: string | symbol, ...args: any[]): boolean;
+        emit(event: "disconnect"): boolean;
+        emit(event: "error", error: Error): boolean;
+        emit(event: "exit", code: number, signal: string): boolean;
+        emit(event: "listening", address: Address): boolean;
+        emit(event: "message", message: any, handle: net.Socket | net.Server): boolean;
+        emit(event: "online"): boolean;
 
-		on(event: string, listener: Function): this;
-		on(event: "disconnect", listener: () => void): this;
-		on(event: "error", listener: (error: Error) => void): this;
-		on(event: "exit", listener: (code: number, signal: string) => void): this;
-		on(event: "listening", listener: (address: Address) => void): this;
-		on(event: "message", listener: (message: any, handle: net.Socket | net.Server) => void): this;  // the handle is a net.Socket or net.Server object, or undefined.
-		on(event: "online", listener: () => void): this;
+        on(event: string, listener: (...args: any[]) => void): this;
+        on(event: "disconnect", listener: () => void): this;
+        on(event: "error", listener: (error: Error) => void): this;
+        on(event: "exit", listener: (code: number, signal: string) => void): this;
+        on(event: "listening", listener: (address: Address) => void): this;
+        on(event: "message", listener: (message: any, handle: net.Socket | net.Server) => void): this;  // the handle is a net.Socket or net.Server object, or undefined.
+        on(event: "online", listener: () => void): this;
 
-		once(event: string, listener: Function): this;
-		once(event: "disconnect", listener: () => void): this;
-		once(event: "error", listener: (error: Error) => void): this;
-		once(event: "exit", listener: (code: number, signal: string) => void): this;
-		once(event: "listening", listener: (address: Address) => void): this;
-		once(event: "message", listener: (message: any, handle: net.Socket | net.Server) => void): this;  // the handle is a net.Socket or net.Server object, or undefined.
-		once(event: "online", listener: () => void): this;
+        once(event: string, listener: (...args: any[]) => void): this;
+        once(event: "disconnect", listener: () => void): this;
+        once(event: "error", listener: (error: Error) => void): this;
+        once(event: "exit", listener: (code: number, signal: string) => void): this;
+        once(event: "listening", listener: (address: Address) => void): this;
+        once(event: "message", listener: (message: any, handle: net.Socket | net.Server) => void): this;  // the handle is a net.Socket or net.Server object, or undefined.
+        once(event: "online", listener: () => void): this;
 
-		prependListener(event: string, listener: Function): this;
-		prependListener(event: "disconnect", listener: () => void): this;
-		prependListener(event: "error", listener: (error: Error) => void): this;
-		prependListener(event: "exit", listener: (code: number, signal: string) => void): this;
-		prependListener(event: "listening", listener: (address: Address) => void): this;
-		prependListener(event: "message", listener: (message: any, handle: net.Socket | net.Server) => void): this;  // the handle is a net.Socket or net.Server object, or undefined.
-		prependListener(event: "online", listener: () => void): this;
+        prependListener(event: string, listener: (...args: any[]) => void): this;
+        prependListener(event: "disconnect", listener: () => void): this;
+        prependListener(event: "error", listener: (error: Error) => void): this;
+        prependListener(event: "exit", listener: (code: number, signal: string) => void): this;
+        prependListener(event: "listening", listener: (address: Address) => void): this;
+        prependListener(event: "message", listener: (message: any, handle: net.Socket | net.Server) => void): this;  // the handle is a net.Socket or net.Server object, or undefined.
+        prependListener(event: "online", listener: () => void): this;
 
-		prependOnceListener(event: string, listener: Function): this;
-		prependOnceListener(event: "disconnect", listener: () => void): this;
-		prependOnceListener(event: "error", listener: (error: Error) => void): this;
-		prependOnceListener(event: "exit", listener: (code: number, signal: string) => void): this;
-		prependOnceListener(event: "listening", listener: (address: Address) => void): this;
-		prependOnceListener(event: "message", listener: (message: any, handle: net.Socket | net.Server) => void): this;  // the handle is a net.Socket or net.Server object, or undefined.
-		prependOnceListener(event: "online", listener: () => void): this;
-	}
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: "disconnect", listener: () => void): this;
+        prependOnceListener(event: "error", listener: (error: Error) => void): this;
+        prependOnceListener(event: "exit", listener: (code: number, signal: string) => void): this;
+        prependOnceListener(event: "listening", listener: (address: Address) => void): this;
+        prependOnceListener(event: "message", listener: (message: any, handle: net.Socket | net.Server) => void): this;  // the handle is a net.Socket or net.Server object, or undefined.
+        prependOnceListener(event: "online", listener: () => void): this;
+    }
 
-	export interface Cluster extends events.EventEmitter {
-		Worker: Worker;
-		disconnect(callback?: Function): void;
-		fork(env?: any): Worker;
-		isMaster: boolean;
-		isWorker: boolean;
-		// TODO: cluster.schedulingPolicy
-		settings: ClusterSettings;
-		setupMaster(settings?: ClusterSetupMasterSettings): void;
-		worker: Worker;
-		workers: {
-			[index: string]: Worker
-		};
+    export interface Cluster extends events.EventEmitter {
+        Worker: Worker;
+        disconnect(callback?: Function): void;
+        fork(env?: any): Worker;
+        isMaster: boolean;
+        isWorker: boolean;
+        // TODO: cluster.schedulingPolicy
+        settings: ClusterSettings;
+        setupMaster(settings?: ClusterSettings): void;
+        worker?: Worker;
+        workers?: {
+            [index: string]: Worker | undefined
+        };
 
         /**
          * events.EventEmitter
@@ -946,73 +1297,72 @@ declare module "cluster" {
          *   6. online
          *   7. setup
          */
-		addListener(event: string, listener: Function): this;
-		addListener(event: "disconnect", listener: (worker: Worker) => void): this;
-		addListener(event: "exit", listener: (worker: Worker, code: number, signal: string) => void): this;
-		addListener(event: "fork", listener: (worker: Worker) => void): this;
-		addListener(event: "listening", listener: (worker: Worker, address: Address) => void): this;
-		addListener(event: "message", listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): this;  // the handle is a net.Socket or net.Server object, or undefined.
-		addListener(event: "online", listener: (worker: Worker) => void): this;
-		addListener(event: "setup", listener: (settings: any) => void): this;
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        addListener(event: "disconnect", listener: (worker: Worker) => void): this;
+        addListener(event: "exit", listener: (worker: Worker, code: number, signal: string) => void): this;
+        addListener(event: "fork", listener: (worker: Worker) => void): this;
+        addListener(event: "listening", listener: (worker: Worker, address: Address) => void): this;
+        addListener(event: "message", listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): this;  // the handle is a net.Socket or net.Server object, or undefined.
+        addListener(event: "online", listener: (worker: Worker) => void): this;
+        addListener(event: "setup", listener: (settings: any) => void): this;
 
-		emit(event: string | symbol, ...args: any[]): boolean;
-		emit(event: "disconnect", listener: (worker: Worker) => void): boolean;
-		emit(event: "exit", listener: (worker: Worker, code: number, signal: string) => void): boolean;
-		emit(event: "fork", listener: (worker: Worker) => void): boolean;
-		emit(event: "listening", listener: (worker: Worker, address: Address) => void): boolean;
-		emit(event: "message", listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): boolean;
-		emit(event: "online", listener: (worker: Worker) => void): boolean;
-		emit(event: "setup", listener: (settings: any) => void): boolean;
+        emit(event: string | symbol, ...args: any[]): boolean;
+        emit(event: "disconnect", worker: Worker): boolean;
+        emit(event: "exit", worker: Worker, code: number, signal: string): boolean;
+        emit(event: "fork", worker: Worker): boolean;
+        emit(event: "listening", worker: Worker, address: Address): boolean;
+        emit(event: "message", worker: Worker, message: any, handle: net.Socket | net.Server): boolean;
+        emit(event: "online", worker: Worker): boolean;
+        emit(event: "setup", settings: any): boolean;
 
-		on(event: string, listener: Function): this;
-		on(event: "disconnect", listener: (worker: Worker) => void): this;
-		on(event: "exit", listener: (worker: Worker, code: number, signal: string) => void): this;
-		on(event: "fork", listener: (worker: Worker) => void): this;
-		on(event: "listening", listener: (worker: Worker, address: Address) => void): this;
-		on(event: "message", listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): this;  // the handle is a net.Socket or net.Server object, or undefined.
-		on(event: "online", listener: (worker: Worker) => void): this;
-		on(event: "setup", listener: (settings: any) => void): this;
+        on(event: string, listener: (...args: any[]) => void): this;
+        on(event: "disconnect", listener: (worker: Worker) => void): this;
+        on(event: "exit", listener: (worker: Worker, code: number, signal: string) => void): this;
+        on(event: "fork", listener: (worker: Worker) => void): this;
+        on(event: "listening", listener: (worker: Worker, address: Address) => void): this;
+        on(event: "message", listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): this;  // the handle is a net.Socket or net.Server object, or undefined.
+        on(event: "online", listener: (worker: Worker) => void): this;
+        on(event: "setup", listener: (settings: any) => void): this;
 
-		once(event: string, listener: Function): this;
-		once(event: "disconnect", listener: (worker: Worker) => void): this;
-		once(event: "exit", listener: (worker: Worker, code: number, signal: string) => void): this;
-		once(event: "fork", listener: (worker: Worker) => void): this;
-		once(event: "listening", listener: (worker: Worker, address: Address) => void): this;
-		once(event: "message", listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): this;  // the handle is a net.Socket or net.Server object, or undefined.
-		once(event: "online", listener: (worker: Worker) => void): this;
-		once(event: "setup", listener: (settings: any) => void): this;
+        once(event: string, listener: (...args: any[]) => void): this;
+        once(event: "disconnect", listener: (worker: Worker) => void): this;
+        once(event: "exit", listener: (worker: Worker, code: number, signal: string) => void): this;
+        once(event: "fork", listener: (worker: Worker) => void): this;
+        once(event: "listening", listener: (worker: Worker, address: Address) => void): this;
+        once(event: "message", listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): this;  // the handle is a net.Socket or net.Server object, or undefined.
+        once(event: "online", listener: (worker: Worker) => void): this;
+        once(event: "setup", listener: (settings: any) => void): this;
 
-		prependListener(event: string, listener: Function): this;
-		prependListener(event: "disconnect", listener: (worker: Worker) => void): this;
-		prependListener(event: "exit", listener: (worker: Worker, code: number, signal: string) => void): this;
-		prependListener(event: "fork", listener: (worker: Worker) => void): this;
-		prependListener(event: "listening", listener: (worker: Worker, address: Address) => void): this;
-		prependListener(event: "message", listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): this;  // the handle is a net.Socket or net.Server object, or undefined.
-		prependListener(event: "online", listener: (worker: Worker) => void): this;
-		prependListener(event: "setup", listener: (settings: any) => void): this;
+        prependListener(event: string, listener: (...args: any[]) => void): this;
+        prependListener(event: "disconnect", listener: (worker: Worker) => void): this;
+        prependListener(event: "exit", listener: (worker: Worker, code: number, signal: string) => void): this;
+        prependListener(event: "fork", listener: (worker: Worker) => void): this;
+        prependListener(event: "listening", listener: (worker: Worker, address: Address) => void): this;
+        prependListener(event: "message", listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): this;  // the handle is a net.Socket or net.Server object, or undefined.
+        prependListener(event: "online", listener: (worker: Worker) => void): this;
+        prependListener(event: "setup", listener: (settings: any) => void): this;
 
-		prependOnceListener(event: string, listener: Function): this;
-		prependOnceListener(event: "disconnect", listener: (worker: Worker) => void): this;
-		prependOnceListener(event: "exit", listener: (worker: Worker, code: number, signal: string) => void): this;
-		prependOnceListener(event: "fork", listener: (worker: Worker) => void): this;
-		prependOnceListener(event: "listening", listener: (worker: Worker, address: Address) => void): this;
-		prependOnceListener(event: "message", listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): this;  // the handle is a net.Socket or net.Server object, or undefined.
-		prependOnceListener(event: "online", listener: (worker: Worker) => void): this;
-		prependOnceListener(event: "setup", listener: (settings: any) => void): this;
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: "disconnect", listener: (worker: Worker) => void): this;
+        prependOnceListener(event: "exit", listener: (worker: Worker, code: number, signal: string) => void): this;
+        prependOnceListener(event: "fork", listener: (worker: Worker) => void): this;
+        prependOnceListener(event: "listening", listener: (worker: Worker, address: Address) => void): this;
+        prependOnceListener(event: "message", listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): this;  // the handle is a net.Socket or net.Server object, or undefined.
+        prependOnceListener(event: "online", listener: (worker: Worker) => void): this;
+        prependOnceListener(event: "setup", listener: (settings: any) => void): this;
+    }
 
-	}
-
-	export function disconnect(callback?: Function): void;
-	export function fork(env?: any): Worker;
-	export var isMaster: boolean;
-	export var isWorker: boolean;
-	// TODO: cluster.schedulingPolicy
-	export var settings: ClusterSettings;
-	export function setupMaster(settings?: ClusterSetupMasterSettings): void;
-	export var worker: Worker;
-	export var workers: {
-		[index: string]: Worker
-	};
+    export function disconnect(callback?: Function): void;
+    export function fork(env?: any): Worker;
+    export var isMaster: boolean;
+    export var isWorker: boolean;
+    // TODO: cluster.schedulingPolicy
+    export var settings: ClusterSettings;
+    export function setupMaster(settings?: ClusterSettings): void;
+    export var worker: Worker;
+    export var workers: {
+        [index: string]: Worker | undefined
+    };
 
     /**
      * events.EventEmitter
@@ -1024,499 +1374,522 @@ declare module "cluster" {
      *   6. online
      *   7. setup
      */
-	export function addListener(event: string, listener: Function): Cluster;
-	export function addListener(event: "disconnect", listener: (worker: Worker) => void): Cluster;
-	export function addListener(event: "exit", listener: (worker: Worker, code: number, signal: string) => void): Cluster;
-	export function addListener(event: "fork", listener: (worker: Worker) => void): Cluster;
-	export function addListener(event: "listening", listener: (worker: Worker, address: Address) => void): Cluster;
-	export function addListener(event: "message", listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): Cluster;  // the handle is a net.Socket or net.Server object, or undefined.
-	export function addListener(event: "online", listener: (worker: Worker) => void): Cluster;
-	export function addListener(event: "setup", listener: (settings: any) => void): Cluster;
+    export function addListener(event: string, listener: (...args: any[]) => void): Cluster;
+    export function addListener(event: "disconnect", listener: (worker: Worker) => void): Cluster;
+    export function addListener(event: "exit", listener: (worker: Worker, code: number, signal: string) => void): Cluster;
+    export function addListener(event: "fork", listener: (worker: Worker) => void): Cluster;
+    export function addListener(event: "listening", listener: (worker: Worker, address: Address) => void): Cluster;
+    export function addListener(event: "message", listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): Cluster;  // the handle is a net.Socket or net.Server object, or undefined.
+    export function addListener(event: "online", listener: (worker: Worker) => void): Cluster;
+    export function addListener(event: "setup", listener: (settings: any) => void): Cluster;
 
-	export function emit(event: string | symbol, ...args: any[]): boolean;
-	export function emit(event: "disconnect", listener: (worker: Worker) => void): boolean;
-	export function emit(event: "exit", listener: (worker: Worker, code: number, signal: string) => void): boolean;
-	export function emit(event: "fork", listener: (worker: Worker) => void): boolean;
-	export function emit(event: "listening", listener: (worker: Worker, address: Address) => void): boolean;
-	export function emit(event: "message", listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): boolean;
-	export function emit(event: "online", listener: (worker: Worker) => void): boolean;
-	export function emit(event: "setup", listener: (settings: any) => void): boolean;
+    export function emit(event: string | symbol, ...args: any[]): boolean;
+    export function emit(event: "disconnect", worker: Worker): boolean;
+    export function emit(event: "exit", worker: Worker, code: number, signal: string): boolean;
+    export function emit(event: "fork", worker: Worker): boolean;
+    export function emit(event: "listening", worker: Worker, address: Address): boolean;
+    export function emit(event: "message", worker: Worker, message: any, handle: net.Socket | net.Server): boolean;
+    export function emit(event: "online", worker: Worker): boolean;
+    export function emit(event: "setup", settings: any): boolean;
 
-	export function on(event: string, listener: Function): Cluster;
-	export function on(event: "disconnect", listener: (worker: Worker) => void): Cluster;
-	export function on(event: "exit", listener: (worker: Worker, code: number, signal: string) => void): Cluster;
-	export function on(event: "fork", listener: (worker: Worker) => void): Cluster;
-	export function on(event: "listening", listener: (worker: Worker, address: Address) => void): Cluster;
-	export function on(event: "message", listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): Cluster;  // the handle is a net.Socket or net.Server object, or undefined.
-	export function on(event: "online", listener: (worker: Worker) => void): Cluster;
-	export function on(event: "setup", listener: (settings: any) => void): Cluster;
+    export function on(event: string, listener: (...args: any[]) => void): Cluster;
+    export function on(event: "disconnect", listener: (worker: Worker) => void): Cluster;
+    export function on(event: "exit", listener: (worker: Worker, code: number, signal: string) => void): Cluster;
+    export function on(event: "fork", listener: (worker: Worker) => void): Cluster;
+    export function on(event: "listening", listener: (worker: Worker, address: Address) => void): Cluster;
+    export function on(event: "message", listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): Cluster;  // the handle is a net.Socket or net.Server object, or undefined.
+    export function on(event: "online", listener: (worker: Worker) => void): Cluster;
+    export function on(event: "setup", listener: (settings: any) => void): Cluster;
 
-	export function once(event: string, listener: Function): Cluster;
-	export function once(event: "disconnect", listener: (worker: Worker) => void): Cluster;
-	export function once(event: "exit", listener: (worker: Worker, code: number, signal: string) => void): Cluster;
-	export function once(event: "fork", listener: (worker: Worker) => void): Cluster;
-	export function once(event: "listening", listener: (worker: Worker, address: Address) => void): Cluster;
-	export function once(event: "message", listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): Cluster;  // the handle is a net.Socket or net.Server object, or undefined.
-	export function once(event: "online", listener: (worker: Worker) => void): Cluster;
-	export function once(event: "setup", listener: (settings: any) => void): Cluster;
+    export function once(event: string, listener: (...args: any[]) => void): Cluster;
+    export function once(event: "disconnect", listener: (worker: Worker) => void): Cluster;
+    export function once(event: "exit", listener: (worker: Worker, code: number, signal: string) => void): Cluster;
+    export function once(event: "fork", listener: (worker: Worker) => void): Cluster;
+    export function once(event: "listening", listener: (worker: Worker, address: Address) => void): Cluster;
+    export function once(event: "message", listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): Cluster;  // the handle is a net.Socket or net.Server object, or undefined.
+    export function once(event: "online", listener: (worker: Worker) => void): Cluster;
+    export function once(event: "setup", listener: (settings: any) => void): Cluster;
 
-	export function removeListener(event: string, listener: Function): Cluster;
-	export function removeAllListeners(event?: string): Cluster;
-	export function setMaxListeners(n: number): Cluster;
-	export function getMaxListeners(): number;
-	export function listeners(event: string): Function[];
-	export function listenerCount(type: string): number;
+    export function removeListener(event: string, listener: (...args: any[]) => void): Cluster;
+    export function removeAllListeners(event?: string): Cluster;
+    export function setMaxListeners(n: number): Cluster;
+    export function getMaxListeners(): number;
+    export function listeners(event: string): Function[];
+    export function listenerCount(type: string): number;
 
-	export function prependListener(event: string, listener: Function): Cluster;
-	export function prependListener(event: "disconnect", listener: (worker: Worker) => void): Cluster;
-	export function prependListener(event: "exit", listener: (worker: Worker, code: number, signal: string) => void): Cluster;
-	export function prependListener(event: "fork", listener: (worker: Worker) => void): Cluster;
-	export function prependListener(event: "listening", listener: (worker: Worker, address: Address) => void): Cluster;
-	export function prependListener(event: "message", listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): Cluster;  // the handle is a net.Socket or net.Server object, or undefined.
-	export function prependListener(event: "online", listener: (worker: Worker) => void): Cluster;
-	export function prependListener(event: "setup", listener: (settings: any) => void): Cluster;
+    export function prependListener(event: string, listener: (...args: any[]) => void): Cluster;
+    export function prependListener(event: "disconnect", listener: (worker: Worker) => void): Cluster;
+    export function prependListener(event: "exit", listener: (worker: Worker, code: number, signal: string) => void): Cluster;
+    export function prependListener(event: "fork", listener: (worker: Worker) => void): Cluster;
+    export function prependListener(event: "listening", listener: (worker: Worker, address: Address) => void): Cluster;
+    export function prependListener(event: "message", listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): Cluster;  // the handle is a net.Socket or net.Server object, or undefined.
+    export function prependListener(event: "online", listener: (worker: Worker) => void): Cluster;
+    export function prependListener(event: "setup", listener: (settings: any) => void): Cluster;
 
-	export function prependOnceListener(event: string, listener: Function): Cluster;
-	export function prependOnceListener(event: "disconnect", listener: (worker: Worker) => void): Cluster;
-	export function prependOnceListener(event: "exit", listener: (worker: Worker, code: number, signal: string) => void): Cluster;
-	export function prependOnceListener(event: "fork", listener: (worker: Worker) => void): Cluster;
-	export function prependOnceListener(event: "listening", listener: (worker: Worker, address: Address) => void): Cluster;
-	export function prependOnceListener(event: "message", listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): Cluster;  // the handle is a net.Socket or net.Server object, or undefined.
-	export function prependOnceListener(event: "online", listener: (worker: Worker) => void): Cluster;
-	export function prependOnceListener(event: "setup", listener: (settings: any) => void): Cluster;
+    export function prependOnceListener(event: string, listener: (...args: any[]) => void): Cluster;
+    export function prependOnceListener(event: "disconnect", listener: (worker: Worker) => void): Cluster;
+    export function prependOnceListener(event: "exit", listener: (worker: Worker, code: number, signal: string) => void): Cluster;
+    export function prependOnceListener(event: "fork", listener: (worker: Worker) => void): Cluster;
+    export function prependOnceListener(event: "listening", listener: (worker: Worker, address: Address) => void): Cluster;
+    export function prependOnceListener(event: "message", listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): Cluster;  // the handle is a net.Socket or net.Server object, or undefined.
+    export function prependOnceListener(event: "online", listener: (worker: Worker) => void): Cluster;
+    export function prependOnceListener(event: "setup", listener: (settings: any) => void): Cluster;
 
-	export function eventNames(): string[];
+    export function eventNames(): string[];
 }
 
 declare module "zlib" {
-	import * as stream from "stream";
+    import * as stream from "stream";
 
-	export interface ZlibOptions {
-		flush?: number; // default: zlib.constants.Z_NO_FLUSH
-		finishFlush?: number; // default: zlib.constants.Z_FINISH
-		chunkSize?: number; // default: 16*1024
-		windowBits?: number;
-		level?: number; // compression only
-		memLevel?: number; // compression only
-		strategy?: number; // compression only
-		dictionary?: any; // deflate/inflate only, empty dictionary by default
-	}
+    export interface ZlibOptions {
+        flush?: number; // default: zlib.constants.Z_NO_FLUSH
+        finishFlush?: number; // default: zlib.constants.Z_FINISH
+        chunkSize?: number; // default: 16*1024
+        windowBits?: number;
+        level?: number; // compression only
+        memLevel?: number; // compression only
+        strategy?: number; // compression only
+        dictionary?: any; // deflate/inflate only, empty dictionary by default
+    }
 
-	export interface Gzip extends stream.Transform { }
-	export interface Gunzip extends stream.Transform { }
-	export interface Deflate extends stream.Transform { }
-	export interface Inflate extends stream.Transform { }
-	export interface DeflateRaw extends stream.Transform { }
-	export interface InflateRaw extends stream.Transform { }
-	export interface Unzip extends stream.Transform { }
+    export interface Zlib {
+        readonly bytesRead: number;
+        close(callback?: () => void): void;
+        flush(kind?: number | (() => void), callback?: () => void): void;
+    }
 
-	export function createGzip(options?: ZlibOptions): Gzip;
-	export function createGunzip(options?: ZlibOptions): Gunzip;
-	export function createDeflate(options?: ZlibOptions): Deflate;
-	export function createInflate(options?: ZlibOptions): Inflate;
-	export function createDeflateRaw(options?: ZlibOptions): DeflateRaw;
-	export function createInflateRaw(options?: ZlibOptions): InflateRaw;
-	export function createUnzip(options?: ZlibOptions): Unzip;
+    export interface ZlibParams {
+        params(level: number, strategy: number, callback: () => void): void;
+    }
 
-	export function deflate(buf: Buffer | string, callback: (error: Error, result: Buffer) => void): void;
-	export function deflate(buf: Buffer | string, options: ZlibOptions, callback: (error: Error, result: Buffer) => void): void;
-	export function deflateSync(buf: Buffer | string, options?: ZlibOptions): Buffer;
-	export function deflateRaw(buf: Buffer | string, callback: (error: Error, result: Buffer) => void): void;
-	export function deflateRaw(buf: Buffer | string, options: ZlibOptions, callback: (error: Error, result: Buffer) => void): void;
-	export function deflateRawSync(buf: Buffer | string, options?: ZlibOptions): Buffer;
-	export function gzip(buf: Buffer | string, callback: (error: Error, result: Buffer) => void): void;
-	export function gzip(buf: Buffer | string, options: ZlibOptions, callback: (error: Error, result: Buffer) => void): void;
-	export function gzipSync(buf: Buffer | string, options?: ZlibOptions): Buffer;
-	export function gunzip(buf: Buffer | string, callback: (error: Error, result: Buffer) => void): void;
-	export function gunzip(buf: Buffer | string, options: ZlibOptions, callback: (error: Error, result: Buffer) => void): void;
-	export function gunzipSync(buf: Buffer | string, options?: ZlibOptions): Buffer;
-	export function inflate(buf: Buffer | string, callback: (error: Error, result: Buffer) => void): void;
-	export function inflate(buf: Buffer | string, options: ZlibOptions, callback: (error: Error, result: Buffer) => void): void;
-	export function inflateSync(buf: Buffer | string, options?: ZlibOptions): Buffer;
-	export function inflateRaw(buf: Buffer | string, callback: (error: Error, result: Buffer) => void): void;
-	export function inflateRaw(buf: Buffer | string, options: ZlibOptions, callback: (error: Error, result: Buffer) => void): void;
-	export function inflateRawSync(buf: Buffer | string, options?: ZlibOptions): Buffer;
-	export function unzip(buf: Buffer | string, callback: (error: Error, result: Buffer) => void): void;
-	export function unzip(buf: Buffer | string, options: ZlibOptions, callback: (error: Error, result: Buffer) => void): void;
-	export function unzipSync(buf: Buffer | string, options?: ZlibOptions): Buffer;
+    export interface ZlibReset {
+        reset(): void;
+    }
 
-	export namespace constants {
-		// Allowed flush values.
+    export interface Gzip extends stream.Transform, Zlib { }
+    export interface Gunzip extends stream.Transform, Zlib { }
+    export interface Deflate extends stream.Transform, Zlib, ZlibReset, ZlibParams { }
+    export interface Inflate extends stream.Transform, Zlib, ZlibReset { }
+    export interface DeflateRaw extends stream.Transform, Zlib, ZlibReset, ZlibParams { }
+    export interface InflateRaw extends stream.Transform, Zlib, ZlibReset { }
+    export interface Unzip extends stream.Transform, Zlib { }
 
-		export const Z_NO_FLUSH: number;
-		export const Z_PARTIAL_FLUSH: number;
-		export const Z_SYNC_FLUSH: number;
-		export const Z_FULL_FLUSH: number;
-		export const Z_FINISH: number;
-		export const Z_BLOCK: number;
-		export const Z_TREES: number;
+    export function createGzip(options?: ZlibOptions): Gzip;
+    export function createGunzip(options?: ZlibOptions): Gunzip;
+    export function createDeflate(options?: ZlibOptions): Deflate;
+    export function createInflate(options?: ZlibOptions): Inflate;
+    export function createDeflateRaw(options?: ZlibOptions): DeflateRaw;
+    export function createInflateRaw(options?: ZlibOptions): InflateRaw;
+    export function createUnzip(options?: ZlibOptions): Unzip;
 
-		// Return codes for the compression/decompression functions. Negative values are errors, positive values are used for special but normal events.
+    type InputType = string | Buffer | DataView /* | TypedArray */;
+    export function deflate(buf: InputType, callback: (error: Error | null, result: Buffer) => void): void;
+    export function deflate(buf: InputType, options: ZlibOptions, callback: (error: Error | null, result: Buffer) => void): void;
+    export function deflateSync(buf: InputType, options?: ZlibOptions): Buffer;
+    export function deflateRaw(buf: InputType, callback: (error: Error | null, result: Buffer) => void): void;
+    export function deflateRaw(buf: InputType, options: ZlibOptions, callback: (error: Error | null, result: Buffer) => void): void;
+    export function deflateRawSync(buf: InputType, options?: ZlibOptions): Buffer;
+    export function gzip(buf: InputType, callback: (error: Error | null, result: Buffer) => void): void;
+    export function gzip(buf: InputType, options: ZlibOptions, callback: (error: Error | null, result: Buffer) => void): void;
+    export function gzipSync(buf: InputType, options?: ZlibOptions): Buffer;
+    export function gunzip(buf: InputType, callback: (error: Error | null, result: Buffer) => void): void;
+    export function gunzip(buf: InputType, options: ZlibOptions, callback: (error: Error | null, result: Buffer) => void): void;
+    export function gunzipSync(buf: InputType, options?: ZlibOptions): Buffer;
+    export function inflate(buf: InputType, callback: (error: Error | null, result: Buffer) => void): void;
+    export function inflate(buf: InputType, options: ZlibOptions, callback: (error: Error | null, result: Buffer) => void): void;
+    export function inflateSync(buf: InputType, options?: ZlibOptions): Buffer;
+    export function inflateRaw(buf: InputType, callback: (error: Error | null, result: Buffer) => void): void;
+    export function inflateRaw(buf: InputType, options: ZlibOptions, callback: (error: Error | null, result: Buffer) => void): void;
+    export function inflateRawSync(buf: InputType, options?: ZlibOptions): Buffer;
+    export function unzip(buf: InputType, callback: (error: Error | null, result: Buffer) => void): void;
+    export function unzip(buf: InputType, options: ZlibOptions, callback: (error: Error | null, result: Buffer) => void): void;
+    export function unzipSync(buf: InputType, options?: ZlibOptions): Buffer;
 
-		export const Z_OK: number;
-		export const Z_STREAM_END: number;
-		export const Z_NEED_DICT: number;
-		export const Z_ERRNO: number;
-		export const Z_STREAM_ERROR: number;
-		export const Z_DATA_ERROR: number;
-		export const Z_MEM_ERROR: number;
-		export const Z_BUF_ERROR: number;
-		export const Z_VERSION_ERROR: number;
+    export namespace constants {
+        // Allowed flush values.
 
-		// Compression levels.
+        export const Z_NO_FLUSH: number;
+        export const Z_PARTIAL_FLUSH: number;
+        export const Z_SYNC_FLUSH: number;
+        export const Z_FULL_FLUSH: number;
+        export const Z_FINISH: number;
+        export const Z_BLOCK: number;
+        export const Z_TREES: number;
 
-		export const Z_NO_COMPRESSION: number;
-		export const Z_BEST_SPEED: number;
-		export const Z_BEST_COMPRESSION: number;
-		export const Z_DEFAULT_COMPRESSION: number;
+        // Return codes for the compression/decompression functions. Negative values are errors, positive values are used for special but normal events.
 
-		// Compression strategy.
+        export const Z_OK: number;
+        export const Z_STREAM_END: number;
+        export const Z_NEED_DICT: number;
+        export const Z_ERRNO: number;
+        export const Z_STREAM_ERROR: number;
+        export const Z_DATA_ERROR: number;
+        export const Z_MEM_ERROR: number;
+        export const Z_BUF_ERROR: number;
+        export const Z_VERSION_ERROR: number;
 
-		export const Z_FILTERED: number;
-		export const Z_HUFFMAN_ONLY: number;
-		export const Z_RLE: number;
-		export const Z_FIXED: number;
-		export const Z_DEFAULT_STRATEGY: number;
-	}
+        // Compression levels.
 
-	// Constants
-	export var Z_NO_FLUSH: number;
-	export var Z_PARTIAL_FLUSH: number;
-	export var Z_SYNC_FLUSH: number;
-	export var Z_FULL_FLUSH: number;
-	export var Z_FINISH: number;
-	export var Z_BLOCK: number;
-	export var Z_TREES: number;
-	export var Z_OK: number;
-	export var Z_STREAM_END: number;
-	export var Z_NEED_DICT: number;
-	export var Z_ERRNO: number;
-	export var Z_STREAM_ERROR: number;
-	export var Z_DATA_ERROR: number;
-	export var Z_MEM_ERROR: number;
-	export var Z_BUF_ERROR: number;
-	export var Z_VERSION_ERROR: number;
-	export var Z_NO_COMPRESSION: number;
-	export var Z_BEST_SPEED: number;
-	export var Z_BEST_COMPRESSION: number;
-	export var Z_DEFAULT_COMPRESSION: number;
-	export var Z_FILTERED: number;
-	export var Z_HUFFMAN_ONLY: number;
-	export var Z_RLE: number;
-	export var Z_FIXED: number;
-	export var Z_DEFAULT_STRATEGY: number;
-	export var Z_BINARY: number;
-	export var Z_TEXT: number;
-	export var Z_ASCII: number;
-	export var Z_UNKNOWN: number;
-	export var Z_DEFLATED: number;
+        export const Z_NO_COMPRESSION: number;
+        export const Z_BEST_SPEED: number;
+        export const Z_BEST_COMPRESSION: number;
+        export const Z_DEFAULT_COMPRESSION: number;
+
+        // Compression strategy.
+
+        export const Z_FILTERED: number;
+        export const Z_HUFFMAN_ONLY: number;
+        export const Z_RLE: number;
+        export const Z_FIXED: number;
+        export const Z_DEFAULT_STRATEGY: number;
+    }
+
+    // Constants
+    export var Z_NO_FLUSH: number;
+    export var Z_PARTIAL_FLUSH: number;
+    export var Z_SYNC_FLUSH: number;
+    export var Z_FULL_FLUSH: number;
+    export var Z_FINISH: number;
+    export var Z_BLOCK: number;
+    export var Z_TREES: number;
+    export var Z_OK: number;
+    export var Z_STREAM_END: number;
+    export var Z_NEED_DICT: number;
+    export var Z_ERRNO: number;
+    export var Z_STREAM_ERROR: number;
+    export var Z_DATA_ERROR: number;
+    export var Z_MEM_ERROR: number;
+    export var Z_BUF_ERROR: number;
+    export var Z_VERSION_ERROR: number;
+    export var Z_NO_COMPRESSION: number;
+    export var Z_BEST_SPEED: number;
+    export var Z_BEST_COMPRESSION: number;
+    export var Z_DEFAULT_COMPRESSION: number;
+    export var Z_FILTERED: number;
+    export var Z_HUFFMAN_ONLY: number;
+    export var Z_RLE: number;
+    export var Z_FIXED: number;
+    export var Z_DEFAULT_STRATEGY: number;
+    export var Z_BINARY: number;
+    export var Z_TEXT: number;
+    export var Z_ASCII: number;
+    export var Z_UNKNOWN: number;
+    export var Z_DEFLATED: number;
 }
 
 declare module "os" {
-	export interface CpuInfo {
-		model: string;
-		speed: number;
-		times: {
-			user: number;
-			nice: number;
-			sys: number;
-			idle: number;
-			irq: number;
-		};
-	}
+    export interface CpuInfo {
+        model: string;
+        speed: number;
+        times: {
+            user: number;
+            nice: number;
+            sys: number;
+            idle: number;
+            irq: number;
+        };
+    }
 
-	export interface NetworkInterfaceInfo {
-		address: string;
-		netmask: string;
-		family: string;
-		mac: string;
-		internal: boolean;
-	}
+    export interface NetworkInterfaceBase {
+        address: string;
+        netmask: string;
+        mac: string;
+        internal: boolean;
+    }
 
-	export function hostname(): string;
-	export function loadavg(): number[];
-	export function uptime(): number;
-	export function freemem(): number;
-	export function totalmem(): number;
-	export function cpus(): CpuInfo[];
-	export function type(): string;
-	export function release(): string;
-	export function networkInterfaces(): { [index: string]: NetworkInterfaceInfo[] };
-	export function homedir(): string;
-	export function userInfo(options?: { encoding: string }): { username: string, uid: number, gid: number, shell: any, homedir: string }
-	export var constants: {
-		UV_UDP_REUSEADDR: number,
-		signals: {
-			SIGHUP: number;
-			SIGINT: number;
-			SIGQUIT: number;
-			SIGILL: number;
-			SIGTRAP: number;
-			SIGABRT: number;
-			SIGIOT: number;
-			SIGBUS: number;
-			SIGFPE: number;
-			SIGKILL: number;
-			SIGUSR1: number;
-			SIGSEGV: number;
-			SIGUSR2: number;
-			SIGPIPE: number;
-			SIGALRM: number;
-			SIGTERM: number;
-			SIGCHLD: number;
-			SIGSTKFLT: number;
-			SIGCONT: number;
-			SIGSTOP: number;
-			SIGTSTP: number;
-			SIGTTIN: number;
-			SIGTTOU: number;
-			SIGURG: number;
-			SIGXCPU: number;
-			SIGXFSZ: number;
-			SIGVTALRM: number;
-			SIGPROF: number;
-			SIGWINCH: number;
-			SIGIO: number;
-			SIGPOLL: number;
-			SIGPWR: number;
-			SIGSYS: number;
-			SIGUNUSED: number;
-		},
-		errno: {
-			E2BIG: number;
-			EACCES: number;
-			EADDRINUSE: number;
-			EADDRNOTAVAIL: number;
-			EAFNOSUPPORT: number;
-			EAGAIN: number;
-			EALREADY: number;
-			EBADF: number;
-			EBADMSG: number;
-			EBUSY: number;
-			ECANCELED: number;
-			ECHILD: number;
-			ECONNABORTED: number;
-			ECONNREFUSED: number;
-			ECONNRESET: number;
-			EDEADLK: number;
-			EDESTADDRREQ: number;
-			EDOM: number;
-			EDQUOT: number;
-			EEXIST: number;
-			EFAULT: number;
-			EFBIG: number;
-			EHOSTUNREACH: number;
-			EIDRM: number;
-			EILSEQ: number;
-			EINPROGRESS: number;
-			EINTR: number;
-			EINVAL: number;
-			EIO: number;
-			EISCONN: number;
-			EISDIR: number;
-			ELOOP: number;
-			EMFILE: number;
-			EMLINK: number;
-			EMSGSIZE: number;
-			EMULTIHOP: number;
-			ENAMETOOLONG: number;
-			ENETDOWN: number;
-			ENETRESET: number;
-			ENETUNREACH: number;
-			ENFILE: number;
-			ENOBUFS: number;
-			ENODATA: number;
-			ENODEV: number;
-			ENOENT: number;
-			ENOEXEC: number;
-			ENOLCK: number;
-			ENOLINK: number;
-			ENOMEM: number;
-			ENOMSG: number;
-			ENOPROTOOPT: number;
-			ENOSPC: number;
-			ENOSR: number;
-			ENOSTR: number;
-			ENOSYS: number;
-			ENOTCONN: number;
-			ENOTDIR: number;
-			ENOTEMPTY: number;
-			ENOTSOCK: number;
-			ENOTSUP: number;
-			ENOTTY: number;
-			ENXIO: number;
-			EOPNOTSUPP: number;
-			EOVERFLOW: number;
-			EPERM: number;
-			EPIPE: number;
-			EPROTO: number;
-			EPROTONOSUPPORT: number;
-			EPROTOTYPE: number;
-			ERANGE: number;
-			EROFS: number;
-			ESPIPE: number;
-			ESRCH: number;
-			ESTALE: number;
-			ETIME: number;
-			ETIMEDOUT: number;
-			ETXTBSY: number;
-			EWOULDBLOCK: number;
-			EXDEV: number;
-		},
-	};
-	export function arch(): string;
-	export function platform(): NodeJS.Platform;
-	export function tmpdir(): string;
-	export var EOL: string;
-	export function endianness(): "BE" | "LE";
+    export interface NetworkInterfaceInfoIPv4 extends NetworkInterfaceBase {
+        family: "IPv4";
+    }
+
+    export interface NetworkInterfaceInfoIPv6 extends NetworkInterfaceBase {
+        family: "IPv6";
+        scopeid: number;
+    }
+
+    export type NetworkInterfaceInfo = NetworkInterfaceInfoIPv4 | NetworkInterfaceInfoIPv6;
+
+    export function hostname(): string;
+    export function loadavg(): number[];
+    export function uptime(): number;
+    export function freemem(): number;
+    export function totalmem(): number;
+    export function cpus(): CpuInfo[];
+    export function type(): string;
+    export function release(): string;
+    export function networkInterfaces(): { [index: string]: NetworkInterfaceInfo[] };
+    export function homedir(): string;
+    export function userInfo(options?: { encoding: string }): { username: string, uid: number, gid: number, shell: any, homedir: string };
+    export var constants: {
+        UV_UDP_REUSEADDR: number,
+        signals: {
+            SIGHUP: number;
+            SIGINT: number;
+            SIGQUIT: number;
+            SIGILL: number;
+            SIGTRAP: number;
+            SIGABRT: number;
+            SIGIOT: number;
+            SIGBUS: number;
+            SIGFPE: number;
+            SIGKILL: number;
+            SIGUSR1: number;
+            SIGSEGV: number;
+            SIGUSR2: number;
+            SIGPIPE: number;
+            SIGALRM: number;
+            SIGTERM: number;
+            SIGCHLD: number;
+            SIGSTKFLT: number;
+            SIGCONT: number;
+            SIGSTOP: number;
+            SIGTSTP: number;
+            SIGTTIN: number;
+            SIGTTOU: number;
+            SIGURG: number;
+            SIGXCPU: number;
+            SIGXFSZ: number;
+            SIGVTALRM: number;
+            SIGPROF: number;
+            SIGWINCH: number;
+            SIGIO: number;
+            SIGPOLL: number;
+            SIGPWR: number;
+            SIGSYS: number;
+            SIGUNUSED: number;
+        },
+        errno: {
+            E2BIG: number;
+            EACCES: number;
+            EADDRINUSE: number;
+            EADDRNOTAVAIL: number;
+            EAFNOSUPPORT: number;
+            EAGAIN: number;
+            EALREADY: number;
+            EBADF: number;
+            EBADMSG: number;
+            EBUSY: number;
+            ECANCELED: number;
+            ECHILD: number;
+            ECONNABORTED: number;
+            ECONNREFUSED: number;
+            ECONNRESET: number;
+            EDEADLK: number;
+            EDESTADDRREQ: number;
+            EDOM: number;
+            EDQUOT: number;
+            EEXIST: number;
+            EFAULT: number;
+            EFBIG: number;
+            EHOSTUNREACH: number;
+            EIDRM: number;
+            EILSEQ: number;
+            EINPROGRESS: number;
+            EINTR: number;
+            EINVAL: number;
+            EIO: number;
+            EISCONN: number;
+            EISDIR: number;
+            ELOOP: number;
+            EMFILE: number;
+            EMLINK: number;
+            EMSGSIZE: number;
+            EMULTIHOP: number;
+            ENAMETOOLONG: number;
+            ENETDOWN: number;
+            ENETRESET: number;
+            ENETUNREACH: number;
+            ENFILE: number;
+            ENOBUFS: number;
+            ENODATA: number;
+            ENODEV: number;
+            ENOENT: number;
+            ENOEXEC: number;
+            ENOLCK: number;
+            ENOLINK: number;
+            ENOMEM: number;
+            ENOMSG: number;
+            ENOPROTOOPT: number;
+            ENOSPC: number;
+            ENOSR: number;
+            ENOSTR: number;
+            ENOSYS: number;
+            ENOTCONN: number;
+            ENOTDIR: number;
+            ENOTEMPTY: number;
+            ENOTSOCK: number;
+            ENOTSUP: number;
+            ENOTTY: number;
+            ENXIO: number;
+            EOPNOTSUPP: number;
+            EOVERFLOW: number;
+            EPERM: number;
+            EPIPE: number;
+            EPROTO: number;
+            EPROTONOSUPPORT: number;
+            EPROTOTYPE: number;
+            ERANGE: number;
+            EROFS: number;
+            ESPIPE: number;
+            ESRCH: number;
+            ESTALE: number;
+            ETIME: number;
+            ETIMEDOUT: number;
+            ETXTBSY: number;
+            EWOULDBLOCK: number;
+            EXDEV: number;
+        },
+    };
+    export function arch(): string;
+    export function platform(): NodeJS.Platform;
+    export function tmpdir(): string;
+    export const EOL: string;
+    export function endianness(): "BE" | "LE";
 }
 
 declare module "https" {
-	import * as tls from "tls";
-	import * as events from "events";
-	import * as http from "http";
+    import * as tls from "tls";
+    import * as events from "events";
+    import * as http from "http";
+    import { URL } from "url";
 
-	export interface ServerOptions {
-		pfx?: any;
-		key?: any;
-		passphrase?: string;
-		cert?: any;
-		ca?: any;
-		crl?: any;
-		ciphers?: string;
-		honorCipherOrder?: boolean;
-		requestCert?: boolean;
-		rejectUnauthorized?: boolean;
-		NPNProtocols?: any;
-		SNICallback?: (servername: string, cb: (err: Error, ctx: tls.SecureContext) => any) => any;
-	}
+    export type ServerOptions = tls.SecureContextOptions & tls.TlsOptions;
 
-	export interface RequestOptions extends http.RequestOptions {
-		pfx?: any;
-		key?: any;
-		passphrase?: string;
-		cert?: any;
-		ca?: any;
-		ciphers?: string;
-		rejectUnauthorized?: boolean;
-		secureProtocol?: string;
-	}
+    // see https://nodejs.org/docs/latest-v8.x/api/https.html#https_https_request_options_callback
+    type extendedRequestKeys = "pfx" |
+        "key" |
+        "passphrase" |
+        "cert" |
+        "ca" |
+        "ciphers" |
+        "rejectUnauthorized" |
+        "secureProtocol" |
+        "servername";
 
-	export interface Agent extends http.Agent { }
+    export type RequestOptions = http.RequestOptions & Pick<tls.ConnectionOptions, extendedRequestKeys>;
 
-	export interface AgentOptions extends http.AgentOptions {
-		pfx?: any;
-		key?: any;
-		passphrase?: string;
-		cert?: any;
-		ca?: any;
-		ciphers?: string;
-		rejectUnauthorized?: boolean;
-		secureProtocol?: string;
-		maxCachedSessions?: number;
-	}
+    export interface AgentOptions extends http.AgentOptions, tls.ConnectionOptions {
+        rejectUnauthorized?: boolean;
+        maxCachedSessions?: number;
+    }
 
-	export var Agent: {
-		new(options?: AgentOptions): Agent;
-	};
-	export interface Server extends tls.Server { }
-	export function createServer(options: ServerOptions, requestListener?: Function): Server;
-	export function request(options: RequestOptions, callback?: (res: http.IncomingMessage) => void): http.ClientRequest;
-	export function get(options: RequestOptions, callback?: (res: http.IncomingMessage) => void): http.ClientRequest;
-	export var globalAgent: Agent;
+    export class Agent extends http.Agent {
+        constructor(options?: AgentOptions);
+        options: AgentOptions;
+    }
+
+    export class Server extends tls.Server {
+        setTimeout(callback: () => void): this;
+        setTimeout(msecs?: number, callback?: () => void): this;
+        timeout: number;
+        keepAliveTimeout: number;
+    }
+
+    export function createServer(options: ServerOptions, requestListener?: (req: http.IncomingMessage, res: http.ServerResponse) => void): Server;
+    export function request(options: RequestOptions | string | URL, callback?: (res: http.IncomingMessage) => void): http.ClientRequest;
+    export function get(options: RequestOptions | string | URL, callback?: (res: http.IncomingMessage) => void): http.ClientRequest;
+    export var globalAgent: Agent;
 }
 
 declare module "punycode" {
-	export function decode(string: string): string;
-	export function encode(string: string): string;
-	export function toUnicode(domain: string): string;
-	export function toASCII(domain: string): string;
-	export var ucs2: ucs2;
-	interface ucs2 {
-		decode(string: string): number[];
-		encode(codePoints: number[]): string;
-	}
-	export var version: any;
+    export function decode(string: string): string;
+    export function encode(string: string): string;
+    export function toUnicode(domain: string): string;
+    export function toASCII(domain: string): string;
+    export var ucs2: ucs2;
+    interface ucs2 {
+        decode(string: string): number[];
+        encode(codePoints: number[]): string;
+    }
+    export var version: any;
 }
 
 declare module "repl" {
-	import * as stream from "stream";
-	import * as readline from "readline";
+    import * as stream from "stream";
+    import * as readline from "readline";
 
-	export interface ReplOptions {
-		prompt?: string;
-		input?: NodeJS.ReadableStream;
-		output?: NodeJS.WritableStream;
-		terminal?: boolean;
-		eval?: Function;
-		useColors?: boolean;
-		useGlobal?: boolean;
-		ignoreUndefined?: boolean;
-		writer?: Function;
-		completer?: Function;
-		replMode?: any;
-		breakEvalOnSigint?: any;
-	}
+    export interface ReplOptions {
+        prompt?: string;
+        input?: NodeJS.ReadableStream;
+        output?: NodeJS.WritableStream;
+        terminal?: boolean;
+        eval?: Function;
+        useColors?: boolean;
+        useGlobal?: boolean;
+        ignoreUndefined?: boolean;
+        writer?: Function;
+        completer?: Function;
+        replMode?: any;
+        breakEvalOnSigint?: any;
+    }
 
-	export interface REPLServer extends readline.ReadLine {
-		context: any;
-		defineCommand(keyword: string, cmd: Function | { help: string, action: Function }): void;
-		displayPrompt(preserveCursor?: boolean): void;
+    export interface REPLServer extends readline.ReadLine {
+        context: any;
+        inputStream: NodeJS.ReadableStream;
+        outputStream: NodeJS.WritableStream;
+
+        defineCommand(keyword: string, cmd: Function | { help: string, action: Function }): void;
+        displayPrompt(preserveCursor?: boolean): void;
 
         /**
          * events.EventEmitter
          * 1. exit
          * 2. reset
-         **/
+         */
 
-		addListener(event: string, listener: Function): this;
-		addListener(event: "exit", listener: () => void): this;
-		addListener(event: "reset", listener: Function): this;
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        addListener(event: "exit", listener: () => void): this;
+        addListener(event: "reset", listener: (...args: any[]) => void): this;
 
-		emit(event: string | symbol, ...args: any[]): boolean;
-		emit(event: "exit"): boolean;
-		emit(event: "reset", context: any): boolean;
+        emit(event: string | symbol, ...args: any[]): boolean;
+        emit(event: "exit"): boolean;
+        emit(event: "reset", context: any): boolean;
 
-		on(event: string, listener: Function): this;
-		on(event: "exit", listener: () => void): this;
-		on(event: "reset", listener: Function): this;
+        on(event: string, listener: (...args: any[]) => void): this;
+        on(event: "exit", listener: () => void): this;
+        on(event: "reset", listener: (...args: any[]) => void): this;
 
-		once(event: string, listener: Function): this;
-		once(event: "exit", listener: () => void): this;
-		once(event: "reset", listener: Function): this;
+        once(event: string, listener: (...args: any[]) => void): this;
+        once(event: "exit", listener: () => void): this;
+        once(event: "reset", listener: (...args: any[]) => void): this;
 
-		prependListener(event: string, listener: Function): this;
-		prependListener(event: "exit", listener: () => void): this;
-		prependListener(event: "reset", listener: Function): this;
+        prependListener(event: string, listener: (...args: any[]) => void): this;
+        prependListener(event: "exit", listener: () => void): this;
+        prependListener(event: "reset", listener: (...args: any[]) => void): this;
 
-		prependOnceListener(event: string, listener: Function): this;
-		prependOnceListener(event: "exit", listener: () => void): this;
-		prependOnceListener(event: "reset", listener: Function): this;
-	}
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: "exit", listener: () => void): this;
+        prependOnceListener(event: "reset", listener: (...args: any[]) => void): this;
+    }
 
-	export function start(options?: string | ReplOptions): REPLServer;
+    export function start(options?: string | ReplOptions): REPLServer;
+
+    export class Recoverable extends SyntaxError {
+        err: Error;
+
+        constructor(err: Error);
+    }
 }
 
 declare module "readline" {
-	import * as events from "events";
-	import * as stream from "stream";
+    import * as events from "events";
+    import * as stream from "stream";
 
-	export interface Key {
-		sequence?: string;
-		name?: string;
-		ctrl?: boolean;
-		meta?: boolean;
-		shift?: boolean;
-	}
+    export interface Key {
+        sequence?: string;
+        name?: string;
+        ctrl?: boolean;
+        meta?: boolean;
+        shift?: boolean;
+    }
 
-	export interface ReadLine extends events.EventEmitter {
-		setPrompt(prompt: string): void;
-		prompt(preserveCursor?: boolean): void;
-		question(query: string, callback: (answer: string) => void): void;
-		pause(): ReadLine;
-		resume(): ReadLine;
-		close(): void;
-		write(data: string | Buffer, key?: Key): void;
+    export interface ReadLine extends events.EventEmitter {
+        setPrompt(prompt: string): void;
+        prompt(preserveCursor?: boolean): void;
+        question(query: string, callback: (answer: string) => void): void;
+        pause(): ReadLine;
+        resume(): ReadLine;
+        close(): void;
+        write(data: string | Buffer, key?: Key): void;
 
         /**
          * events.EventEmitter
@@ -1527,138 +1900,141 @@ declare module "readline" {
          * 5. SIGCONT
          * 6. SIGINT
          * 7. SIGTSTP
-         **/
+         */
 
-		addListener(event: string, listener: Function): this;
-		addListener(event: "close", listener: () => void): this;
-		addListener(event: "line", listener: (input: any) => void): this;
-		addListener(event: "pause", listener: () => void): this;
-		addListener(event: "resume", listener: () => void): this;
-		addListener(event: "SIGCONT", listener: () => void): this;
-		addListener(event: "SIGINT", listener: () => void): this;
-		addListener(event: "SIGTSTP", listener: () => void): this;
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        addListener(event: "close", listener: () => void): this;
+        addListener(event: "line", listener: (input: any) => void): this;
+        addListener(event: "pause", listener: () => void): this;
+        addListener(event: "resume", listener: () => void): this;
+        addListener(event: "SIGCONT", listener: () => void): this;
+        addListener(event: "SIGINT", listener: () => void): this;
+        addListener(event: "SIGTSTP", listener: () => void): this;
 
-		emit(event: string | symbol, ...args: any[]): boolean;
-		emit(event: "close"): boolean;
-		emit(event: "line", input: any): boolean;
-		emit(event: "pause"): boolean;
-		emit(event: "resume"): boolean;
-		emit(event: "SIGCONT"): boolean;
-		emit(event: "SIGINT"): boolean;
-		emit(event: "SIGTSTP"): boolean;
+        emit(event: string | symbol, ...args: any[]): boolean;
+        emit(event: "close"): boolean;
+        emit(event: "line", input: any): boolean;
+        emit(event: "pause"): boolean;
+        emit(event: "resume"): boolean;
+        emit(event: "SIGCONT"): boolean;
+        emit(event: "SIGINT"): boolean;
+        emit(event: "SIGTSTP"): boolean;
 
-		on(event: string, listener: Function): this;
-		on(event: "close", listener: () => void): this;
-		on(event: "line", listener: (input: any) => void): this;
-		on(event: "pause", listener: () => void): this;
-		on(event: "resume", listener: () => void): this;
-		on(event: "SIGCONT", listener: () => void): this;
-		on(event: "SIGINT", listener: () => void): this;
-		on(event: "SIGTSTP", listener: () => void): this;
+        on(event: string, listener: (...args: any[]) => void): this;
+        on(event: "close", listener: () => void): this;
+        on(event: "line", listener: (input: any) => void): this;
+        on(event: "pause", listener: () => void): this;
+        on(event: "resume", listener: () => void): this;
+        on(event: "SIGCONT", listener: () => void): this;
+        on(event: "SIGINT", listener: () => void): this;
+        on(event: "SIGTSTP", listener: () => void): this;
 
-		once(event: string, listener: Function): this;
-		once(event: "close", listener: () => void): this;
-		once(event: "line", listener: (input: any) => void): this;
-		once(event: "pause", listener: () => void): this;
-		once(event: "resume", listener: () => void): this;
-		once(event: "SIGCONT", listener: () => void): this;
-		once(event: "SIGINT", listener: () => void): this;
-		once(event: "SIGTSTP", listener: () => void): this;
+        once(event: string, listener: (...args: any[]) => void): this;
+        once(event: "close", listener: () => void): this;
+        once(event: "line", listener: (input: any) => void): this;
+        once(event: "pause", listener: () => void): this;
+        once(event: "resume", listener: () => void): this;
+        once(event: "SIGCONT", listener: () => void): this;
+        once(event: "SIGINT", listener: () => void): this;
+        once(event: "SIGTSTP", listener: () => void): this;
 
-		prependListener(event: string, listener: Function): this;
-		prependListener(event: "close", listener: () => void): this;
-		prependListener(event: "line", listener: (input: any) => void): this;
-		prependListener(event: "pause", listener: () => void): this;
-		prependListener(event: "resume", listener: () => void): this;
-		prependListener(event: "SIGCONT", listener: () => void): this;
-		prependListener(event: "SIGINT", listener: () => void): this;
-		prependListener(event: "SIGTSTP", listener: () => void): this;
+        prependListener(event: string, listener: (...args: any[]) => void): this;
+        prependListener(event: "close", listener: () => void): this;
+        prependListener(event: "line", listener: (input: any) => void): this;
+        prependListener(event: "pause", listener: () => void): this;
+        prependListener(event: "resume", listener: () => void): this;
+        prependListener(event: "SIGCONT", listener: () => void): this;
+        prependListener(event: "SIGINT", listener: () => void): this;
+        prependListener(event: "SIGTSTP", listener: () => void): this;
 
-		prependOnceListener(event: string, listener: Function): this;
-		prependOnceListener(event: "close", listener: () => void): this;
-		prependOnceListener(event: "line", listener: (input: any) => void): this;
-		prependOnceListener(event: "pause", listener: () => void): this;
-		prependOnceListener(event: "resume", listener: () => void): this;
-		prependOnceListener(event: "SIGCONT", listener: () => void): this;
-		prependOnceListener(event: "SIGINT", listener: () => void): this;
-		prependOnceListener(event: "SIGTSTP", listener: () => void): this;
-	}
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: "close", listener: () => void): this;
+        prependOnceListener(event: "line", listener: (input: any) => void): this;
+        prependOnceListener(event: "pause", listener: () => void): this;
+        prependOnceListener(event: "resume", listener: () => void): this;
+        prependOnceListener(event: "SIGCONT", listener: () => void): this;
+        prependOnceListener(event: "SIGINT", listener: () => void): this;
+        prependOnceListener(event: "SIGTSTP", listener: () => void): this;
+    }
 
-	type Completer = (line: string) => CompleterResult;
-	type AsyncCompleter = (line: string, callback: (err: any, result: CompleterResult) => void) => any;
+    type Completer = (line: string) => CompleterResult;
+    type AsyncCompleter = (line: string, callback: (err: any, result: CompleterResult) => void) => any;
 
-	export type CompleterResult = [string[], string];
+    export type CompleterResult = [string[], string];
 
-	export interface ReadLineOptions {
-		input: NodeJS.ReadableStream;
-		output?: NodeJS.WritableStream;
-		completer?: Completer | AsyncCompleter;
-		terminal?: boolean;
-		historySize?: number;
-		prompt?: string;
-		crlfDelay?: number;
-		removeHistoryDuplicates?: boolean;
-	}
+    export interface ReadLineOptions {
+        input: NodeJS.ReadableStream;
+        output?: NodeJS.WritableStream;
+        completer?: Completer | AsyncCompleter;
+        terminal?: boolean;
+        historySize?: number;
+        prompt?: string;
+        crlfDelay?: number;
+        removeHistoryDuplicates?: boolean;
+    }
 
-	export function createInterface(input: NodeJS.ReadableStream, output?: NodeJS.WritableStream, completer?: Completer | AsyncCompleter, terminal?: boolean): ReadLine;
-	export function createInterface(options: ReadLineOptions): ReadLine;
+    export function createInterface(input: NodeJS.ReadableStream, output?: NodeJS.WritableStream, completer?: Completer | AsyncCompleter, terminal?: boolean): ReadLine;
+    export function createInterface(options: ReadLineOptions): ReadLine;
 
-	export function cursorTo(stream: NodeJS.WritableStream, x: number, y: number): void;
-	export function moveCursor(stream: NodeJS.WritableStream, dx: number | string, dy: number | string): void;
-	export function clearLine(stream: NodeJS.WritableStream, dir: number): void;
-	export function clearScreenDown(stream: NodeJS.WritableStream): void;
+    export function cursorTo(stream: NodeJS.WritableStream, x: number, y?: number): void;
+    export function emitKeypressEvents(stream: NodeJS.ReadableStream, interface?: ReadLine): void;
+    export function moveCursor(stream: NodeJS.WritableStream, dx: number | string, dy: number | string): void;
+    export function clearLine(stream: NodeJS.WritableStream, dir: number): void;
+    export function clearScreenDown(stream: NodeJS.WritableStream): void;
 }
 
 declare module "vm" {
-	export interface Context { }
-	export interface ScriptOptions {
-		filename?: string;
-		lineOffset?: number;
-		columnOffset?: number;
-		displayErrors?: boolean;
-		timeout?: number;
-		cachedData?: Buffer;
-		produceCachedData?: boolean;
-	}
-	export interface RunningScriptOptions {
-		filename?: string;
-		lineOffset?: number;
-		columnOffset?: number;
-		displayErrors?: boolean;
-		timeout?: number;
-	}
-	export class Script {
-		constructor(code: string, options?: ScriptOptions);
-		runInContext(contextifiedSandbox: Context, options?: RunningScriptOptions): any;
-		runInNewContext(sandbox?: Context, options?: RunningScriptOptions): any;
-		runInThisContext(options?: RunningScriptOptions): any;
-	}
-	export function createContext(sandbox?: Context): Context;
-	export function isContext(sandbox: Context): boolean;
-	export function runInContext(code: string, contextifiedSandbox: Context, options?: RunningScriptOptions): any;
-	export function runInDebugContext(code: string): any;
-	export function runInNewContext(code: string, sandbox?: Context, options?: RunningScriptOptions): any;
-	export function runInThisContext(code: string, options?: RunningScriptOptions): any;
+    export interface Context { }
+    export interface ScriptOptions {
+        filename?: string;
+        lineOffset?: number;
+        columnOffset?: number;
+        displayErrors?: boolean;
+        timeout?: number;
+        cachedData?: Buffer;
+        produceCachedData?: boolean;
+    }
+    export interface RunningScriptOptions {
+        filename?: string;
+        lineOffset?: number;
+        columnOffset?: number;
+        displayErrors?: boolean;
+        timeout?: number;
+    }
+    export class Script {
+        constructor(code: string, options?: ScriptOptions);
+        runInContext(contextifiedSandbox: Context, options?: RunningScriptOptions): any;
+        runInNewContext(sandbox?: Context, options?: RunningScriptOptions): any;
+        runInThisContext(options?: RunningScriptOptions): any;
+    }
+    export function createContext(sandbox?: Context): Context;
+    export function isContext(sandbox: Context): boolean;
+    export function runInContext(code: string, contextifiedSandbox: Context, options?: RunningScriptOptions | string): any;
+    export function runInDebugContext(code: string): any;
+    export function runInNewContext(code: string, sandbox?: Context, options?: RunningScriptOptions | string): any;
+    export function runInThisContext(code: string, options?: RunningScriptOptions | string): any;
 }
 
 declare module "child_process" {
-	import * as events from "events";
-	import * as stream from "stream";
-	import * as net from "net";
+    import * as events from "events";
+    import * as stream from "stream";
+    import * as net from "net";
 
-	export interface ChildProcess extends events.EventEmitter {
-		stdin: stream.Writable;
-		stdout: stream.Readable;
-		stderr: stream.Readable;
-		stdio: [stream.Writable, stream.Readable, stream.Readable];
-		killed: boolean;
-		pid: number;
-		kill(signal?: string): void;
-		send(message: any, sendHandle?: any): boolean;
-		connected: boolean;
-		disconnect(): void;
-		unref(): void;
-		ref(): void;
+    export interface ChildProcess extends events.EventEmitter {
+        stdin: stream.Writable;
+        stdout: stream.Readable;
+        stderr: stream.Readable;
+        stdio: [stream.Writable, stream.Readable, stream.Readable];
+        killed: boolean;
+        pid: number;
+        kill(signal?: string): void;
+        send(message: any, callback?: (error: Error) => void): boolean;
+        send(message: any, sendHandle?: net.Socket | net.Server, callback?: (error: Error) => void): boolean;
+        send(message: any, sendHandle?: net.Socket | net.Server, options?: MessageOptions, callback?: (error: Error) => void): boolean;
+        connected: boolean;
+        disconnect(): void;
+        unref(): void;
+        ref(): void;
 
         /**
          * events.EventEmitter
@@ -1667,464 +2043,625 @@ declare module "child_process" {
          * 3. error
          * 4. exit
          * 5. message
-         **/
+         */
 
-		addListener(event: string, listener: Function): this;
-		addListener(event: "close", listener: (code: number, signal: string) => void): this;
-		addListener(event: "disconnect", listener: () => void): this;
-		addListener(event: "error", listener: (err: Error) => void): this;
-		addListener(event: "exit", listener: (code: number, signal: string) => void): this;
-		addListener(event: "message", listener: (message: any, sendHandle: net.Socket | net.Server) => void): this;
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        addListener(event: "close", listener: (code: number, signal: string) => void): this;
+        addListener(event: "disconnect", listener: () => void): this;
+        addListener(event: "error", listener: (err: Error) => void): this;
+        addListener(event: "exit", listener: (code: number, signal: string) => void): this;
+        addListener(event: "message", listener: (message: any, sendHandle: net.Socket | net.Server) => void): this;
 
-		emit(event: string | symbol, ...args: any[]): boolean;
-		emit(event: "close", code: number, signal: string): boolean;
-		emit(event: "disconnect"): boolean;
-		emit(event: "error", err: Error): boolean;
-		emit(event: "exit", code: number, signal: string): boolean;
-		emit(event: "message", message: any, sendHandle: net.Socket | net.Server): boolean;
+        emit(event: string | symbol, ...args: any[]): boolean;
+        emit(event: "close", code: number, signal: string): boolean;
+        emit(event: "disconnect"): boolean;
+        emit(event: "error", err: Error): boolean;
+        emit(event: "exit", code: number, signal: string): boolean;
+        emit(event: "message", message: any, sendHandle: net.Socket | net.Server): boolean;
 
-		on(event: string, listener: Function): this;
-		on(event: "close", listener: (code: number, signal: string) => void): this;
-		on(event: "disconnect", listener: () => void): this;
-		on(event: "error", listener: (err: Error) => void): this;
-		on(event: "exit", listener: (code: number, signal: string) => void): this;
-		on(event: "message", listener: (message: any, sendHandle: net.Socket | net.Server) => void): this;
+        on(event: string, listener: (...args: any[]) => void): this;
+        on(event: "close", listener: (code: number, signal: string) => void): this;
+        on(event: "disconnect", listener: () => void): this;
+        on(event: "error", listener: (err: Error) => void): this;
+        on(event: "exit", listener: (code: number, signal: string) => void): this;
+        on(event: "message", listener: (message: any, sendHandle: net.Socket | net.Server) => void): this;
 
-		once(event: string, listener: Function): this;
-		once(event: "close", listener: (code: number, signal: string) => void): this;
-		once(event: "disconnect", listener: () => void): this;
-		once(event: "error", listener: (err: Error) => void): this;
-		once(event: "exit", listener: (code: number, signal: string) => void): this;
-		once(event: "message", listener: (message: any, sendHandle: net.Socket | net.Server) => void): this;
+        once(event: string, listener: (...args: any[]) => void): this;
+        once(event: "close", listener: (code: number, signal: string) => void): this;
+        once(event: "disconnect", listener: () => void): this;
+        once(event: "error", listener: (err: Error) => void): this;
+        once(event: "exit", listener: (code: number, signal: string) => void): this;
+        once(event: "message", listener: (message: any, sendHandle: net.Socket | net.Server) => void): this;
 
-		prependListener(event: string, listener: Function): this;
-		prependListener(event: "close", listener: (code: number, signal: string) => void): this;
-		prependListener(event: "disconnect", listener: () => void): this;
-		prependListener(event: "error", listener: (err: Error) => void): this;
-		prependListener(event: "exit", listener: (code: number, signal: string) => void): this;
-		prependListener(event: "message", listener: (message: any, sendHandle: net.Socket | net.Server) => void): this;
+        prependListener(event: string, listener: (...args: any[]) => void): this;
+        prependListener(event: "close", listener: (code: number, signal: string) => void): this;
+        prependListener(event: "disconnect", listener: () => void): this;
+        prependListener(event: "error", listener: (err: Error) => void): this;
+        prependListener(event: "exit", listener: (code: number, signal: string) => void): this;
+        prependListener(event: "message", listener: (message: any, sendHandle: net.Socket | net.Server) => void): this;
 
-		prependOnceListener(event: string, listener: Function): this;
-		prependOnceListener(event: "close", listener: (code: number, signal: string) => void): this;
-		prependOnceListener(event: "disconnect", listener: () => void): this;
-		prependOnceListener(event: "error", listener: (err: Error) => void): this;
-		prependOnceListener(event: "exit", listener: (code: number, signal: string) => void): this;
-		prependOnceListener(event: "message", listener: (message: any, sendHandle: net.Socket | net.Server) => void): this;
-	}
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: "close", listener: (code: number, signal: string) => void): this;
+        prependOnceListener(event: "disconnect", listener: () => void): this;
+        prependOnceListener(event: "error", listener: (err: Error) => void): this;
+        prependOnceListener(event: "exit", listener: (code: number, signal: string) => void): this;
+        prependOnceListener(event: "message", listener: (message: any, sendHandle: net.Socket | net.Server) => void): this;
+    }
 
-	export interface SpawnOptions {
-		cwd?: string;
-		env?: any;
-		stdio?: any;
-		detached?: boolean;
-		uid?: number;
-		gid?: number;
-		shell?: boolean | string;
-		windowsVerbatimArguments?: boolean;
-	}
-	export function spawn(command: string, args?: string[], options?: SpawnOptions): ChildProcess;
+    export interface MessageOptions {
+        keepOpen?: boolean;
+    }
 
-	export interface ExecOptions {
-		cwd?: string;
-		env?: any;
-		shell?: string;
-		timeout?: number;
-		maxBuffer?: number;
-		killSignal?: string;
-		uid?: number;
-		gid?: number;
-	}
-	export interface ExecOptionsWithStringEncoding extends ExecOptions {
-		encoding: BufferEncoding;
-	}
-	export interface ExecOptionsWithBufferEncoding extends ExecOptions {
-		encoding: string; // specify `null`.
-	}
-	export function exec(command: string, callback?: (error: Error, stdout: string, stderr: string) => void): ChildProcess;
-	export function exec(command: string, options: ExecOptionsWithStringEncoding, callback?: (error: Error, stdout: string, stderr: string) => void): ChildProcess;
-	// usage. child_process.exec("tsc", {encoding: null as string}, (err, stdout, stderr) => {});
-	export function exec(command: string, options: ExecOptionsWithBufferEncoding, callback?: (error: Error, stdout: Buffer, stderr: Buffer) => void): ChildProcess;
-	export function exec(command: string, options: ExecOptions, callback?: (error: Error, stdout: string, stderr: string) => void): ChildProcess;
+    export interface SpawnOptions {
+        cwd?: string;
+        env?: any;
+        stdio?: any;
+        detached?: boolean;
+        uid?: number;
+        gid?: number;
+        shell?: boolean | string;
+        windowsVerbatimArguments?: boolean;
+        windowsHide?: boolean;
+    }
 
-	export interface ExecFileOptions {
-		cwd?: string;
-		env?: any;
-		timeout?: number;
-		maxBuffer?: number;
-		killSignal?: string;
-		uid?: number;
-		gid?: number;
-	}
-	export interface ExecFileOptionsWithStringEncoding extends ExecFileOptions {
-		encoding: BufferEncoding;
-	}
-	export interface ExecFileOptionsWithBufferEncoding extends ExecFileOptions {
-		encoding: string; // specify `null`.
-	}
-	export function execFile(file: string, callback?: (error: Error, stdout: string, stderr: string) => void): ChildProcess;
-	export function execFile(file: string, options?: ExecFileOptionsWithStringEncoding, callback?: (error: Error, stdout: string, stderr: string) => void): ChildProcess;
-	// usage. child_process.execFile("file.sh", {encoding: null as string}, (err, stdout, stderr) => {});
-	export function execFile(file: string, options?: ExecFileOptionsWithBufferEncoding, callback?: (error: Error, stdout: Buffer, stderr: Buffer) => void): ChildProcess;
-	export function execFile(file: string, options?: ExecFileOptions, callback?: (error: Error, stdout: string, stderr: string) => void): ChildProcess;
-	export function execFile(file: string, args?: string[], callback?: (error: Error, stdout: string, stderr: string) => void): ChildProcess;
-	export function execFile(file: string, args?: string[], options?: ExecFileOptionsWithStringEncoding, callback?: (error: Error, stdout: string, stderr: string) => void): ChildProcess;
-	// usage. child_process.execFile("file.sh", ["foo"], {encoding: null as string}, (err, stdout, stderr) => {});
-	export function execFile(file: string, args?: string[], options?: ExecFileOptionsWithBufferEncoding, callback?: (error: Error, stdout: Buffer, stderr: Buffer) => void): ChildProcess;
-	export function execFile(file: string, args?: string[], options?: ExecFileOptions, callback?: (error: Error, stdout: string, stderr: string) => void): ChildProcess;
+    export function spawn(command: string, args?: ReadonlyArray<string>, options?: SpawnOptions): ChildProcess;
 
-	export interface ForkOptions {
-		cwd?: string;
-		env?: any;
-		execPath?: string;
-		execArgv?: string[];
-		silent?: boolean;
-		stdio?: any[];
-		uid?: number;
-		gid?: number;
-	}
-	export function fork(modulePath: string, args?: string[], options?: ForkOptions): ChildProcess;
+    export interface ExecOptions {
+        cwd?: string;
+        env?: any;
+        shell?: string;
+        timeout?: number;
+        maxBuffer?: number;
+        killSignal?: string;
+        uid?: number;
+        gid?: number;
+        windowsHide?: boolean;
+    }
 
-	export interface SpawnSyncOptions {
-		cwd?: string;
-		input?: string | Buffer;
-		stdio?: any;
-		env?: any;
-		uid?: number;
-		gid?: number;
-		timeout?: number;
-		killSignal?: string;
-		maxBuffer?: number;
-		encoding?: string;
-		shell?: boolean | string;
-	}
-	export interface SpawnSyncOptionsWithStringEncoding extends SpawnSyncOptions {
-		encoding: BufferEncoding;
-	}
-	export interface SpawnSyncOptionsWithBufferEncoding extends SpawnSyncOptions {
-		encoding: string; // specify `null`.
-	}
-	export interface SpawnSyncReturns<T> {
-		pid: number;
-		output: string[];
-		stdout: T;
-		stderr: T;
-		status: number;
-		signal: string;
-		error: Error;
-	}
-	export function spawnSync(command: string): SpawnSyncReturns<Buffer>;
-	export function spawnSync(command: string, options?: SpawnSyncOptionsWithStringEncoding): SpawnSyncReturns<string>;
-	export function spawnSync(command: string, options?: SpawnSyncOptionsWithBufferEncoding): SpawnSyncReturns<Buffer>;
-	export function spawnSync(command: string, options?: SpawnSyncOptions): SpawnSyncReturns<Buffer>;
-	export function spawnSync(command: string, args?: string[], options?: SpawnSyncOptionsWithStringEncoding): SpawnSyncReturns<string>;
-	export function spawnSync(command: string, args?: string[], options?: SpawnSyncOptionsWithBufferEncoding): SpawnSyncReturns<Buffer>;
-	export function spawnSync(command: string, args?: string[], options?: SpawnSyncOptions): SpawnSyncReturns<Buffer>;
+    export interface ExecOptionsWithStringEncoding extends ExecOptions {
+        encoding: BufferEncoding;
+    }
 
-	export interface ExecSyncOptions {
-		cwd?: string;
-		input?: string | Buffer;
-		stdio?: any;
-		env?: any;
-		shell?: string;
-		uid?: number;
-		gid?: number;
-		timeout?: number;
-		killSignal?: string;
-		maxBuffer?: number;
-		encoding?: string;
-	}
-	export interface ExecSyncOptionsWithStringEncoding extends ExecSyncOptions {
-		encoding: BufferEncoding;
-	}
-	export interface ExecSyncOptionsWithBufferEncoding extends ExecSyncOptions {
-		encoding: string; // specify `null`.
-	}
-	export function execSync(command: string): Buffer;
-	export function execSync(command: string, options?: ExecSyncOptionsWithStringEncoding): string;
-	export function execSync(command: string, options?: ExecSyncOptionsWithBufferEncoding): Buffer;
-	export function execSync(command: string, options?: ExecSyncOptions): Buffer;
+    export interface ExecOptionsWithBufferEncoding extends ExecOptions {
+        encoding: string | null; // specify `null`.
+    }
 
-	export interface ExecFileSyncOptions {
-		cwd?: string;
-		input?: string | Buffer;
-		stdio?: any;
-		env?: any;
-		uid?: number;
-		gid?: number;
-		timeout?: number;
-		killSignal?: string;
-		maxBuffer?: number;
-		encoding?: string;
-	}
-	export interface ExecFileSyncOptionsWithStringEncoding extends ExecFileSyncOptions {
-		encoding: BufferEncoding;
-	}
-	export interface ExecFileSyncOptionsWithBufferEncoding extends ExecFileSyncOptions {
-		encoding: string; // specify `null`.
-	}
-	export function execFileSync(command: string): Buffer;
-	export function execFileSync(command: string, options?: ExecFileSyncOptionsWithStringEncoding): string;
-	export function execFileSync(command: string, options?: ExecFileSyncOptionsWithBufferEncoding): Buffer;
-	export function execFileSync(command: string, options?: ExecFileSyncOptions): Buffer;
-	export function execFileSync(command: string, args?: string[], options?: ExecFileSyncOptionsWithStringEncoding): string;
-	export function execFileSync(command: string, args?: string[], options?: ExecFileSyncOptionsWithBufferEncoding): Buffer;
-	export function execFileSync(command: string, args?: string[], options?: ExecFileSyncOptions): Buffer;
+    // no `options` definitely means stdout/stderr are `string`.
+    export function exec(command: string, callback?: (error: Error | null, stdout: string, stderr: string) => void): ChildProcess;
+
+    // `options` with `"buffer"` or `null` for `encoding` means stdout/stderr are definitely `Buffer`.
+    export function exec(command: string, options: { encoding: "buffer" | null } & ExecOptions, callback?: (error: Error | null, stdout: Buffer, stderr: Buffer) => void): ChildProcess;
+
+    // `options` with well known `encoding` means stdout/stderr are definitely `string`.
+    export function exec(command: string, options: { encoding: BufferEncoding } & ExecOptions, callback?: (error: Error | null, stdout: string, stderr: string) => void): ChildProcess;
+
+    // `options` with an `encoding` whose type is `string` means stdout/stderr could either be `Buffer` or `string`.
+    // There is no guarantee the `encoding` is unknown as `string` is a superset of `BufferEncoding`.
+    export function exec(command: string, options: { encoding: string } & ExecOptions, callback?: (error: Error | null, stdout: string | Buffer, stderr: string | Buffer) => void): ChildProcess;
+
+    // `options` without an `encoding` means stdout/stderr are definitely `string`.
+    export function exec(command: string, options: ExecOptions, callback?: (error: Error | null, stdout: string, stderr: string) => void): ChildProcess;
+
+    // fallback if nothing else matches. Worst case is always `string | Buffer`.
+    export function exec(command: string, options: ({ encoding?: string | null } & ExecOptions) | undefined | null, callback?: (error: Error | null, stdout: string | Buffer, stderr: string | Buffer) => void): ChildProcess;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace exec {
+        export function __promisify__(command: string): Promise<{ stdout: string, stderr: string }>;
+        export function __promisify__(command: string, options: { encoding: "buffer" | null } & ExecOptions): Promise<{ stdout: Buffer, stderr: Buffer }>;
+        export function __promisify__(command: string, options: { encoding: BufferEncoding } & ExecOptions): Promise<{ stdout: string, stderr: string }>;
+        export function __promisify__(command: string, options: ExecOptions): Promise<{ stdout: string, stderr: string }>;
+        export function __promisify__(command: string, options?: ({ encoding?: string | null } & ExecOptions) | null): Promise<{ stdout: string | Buffer, stderr: string | Buffer }>;
+    }
+
+    export interface ExecFileOptions {
+        cwd?: string;
+        env?: any;
+        timeout?: number;
+        maxBuffer?: number;
+        killSignal?: string;
+        uid?: number;
+        gid?: number;
+        windowsHide?: boolean;
+        windowsVerbatimArguments?: boolean;
+    }
+    export interface ExecFileOptionsWithStringEncoding extends ExecFileOptions {
+        encoding: BufferEncoding;
+    }
+    export interface ExecFileOptionsWithBufferEncoding extends ExecFileOptions {
+        encoding: 'buffer' | null;
+    }
+    export interface ExecFileOptionsWithOtherEncoding extends ExecFileOptions {
+        encoding: string;
+    }
+
+    export function execFile(file: string): ChildProcess;
+    export function execFile(file: string, options: ({ encoding?: string | null } & ExecFileOptions) | undefined | null): ChildProcess;
+    export function execFile(file: string, args: string[] | undefined | null): ChildProcess;
+    export function execFile(file: string, args: string[] | undefined | null, options: ({ encoding?: string | null } & ExecFileOptions) | undefined | null): ChildProcess;
+
+    // no `options` definitely means stdout/stderr are `string`.
+    export function execFile(file: string, callback: (error: Error | null, stdout: string, stderr: string) => void): ChildProcess;
+    export function execFile(file: string, args: string[] | undefined | null, callback: (error: Error | null, stdout: string, stderr: string) => void): ChildProcess;
+
+    // `options` with `"buffer"` or `null` for `encoding` means stdout/stderr are definitely `Buffer`.
+    export function execFile(file: string, options: ExecFileOptionsWithBufferEncoding, callback: (error: Error | null, stdout: Buffer, stderr: Buffer) => void): ChildProcess;
+    export function execFile(file: string, args: string[] | undefined | null, options: ExecFileOptionsWithBufferEncoding, callback: (error: Error | null, stdout: Buffer, stderr: Buffer) => void): ChildProcess;
+
+    // `options` with well known `encoding` means stdout/stderr are definitely `string`.
+    export function execFile(file: string, options: ExecFileOptionsWithStringEncoding, callback: (error: Error | null, stdout: string, stderr: string) => void): ChildProcess;
+    export function execFile(file: string, args: string[] | undefined | null, options: ExecFileOptionsWithStringEncoding, callback: (error: Error | null, stdout: string, stderr: string) => void): ChildProcess;
+
+    // `options` with an `encoding` whose type is `string` means stdout/stderr could either be `Buffer` or `string`.
+    // There is no guarantee the `encoding` is unknown as `string` is a superset of `BufferEncoding`.
+    export function execFile(file: string, options: ExecFileOptionsWithOtherEncoding, callback: (error: Error | null, stdout: string | Buffer, stderr: string | Buffer) => void): ChildProcess;
+    export function execFile(file: string, args: string[] | undefined | null, options: ExecFileOptionsWithOtherEncoding, callback: (error: Error | null, stdout: string | Buffer, stderr: string | Buffer) => void): ChildProcess;
+
+    // `options` without an `encoding` means stdout/stderr are definitely `string`.
+    export function execFile(file: string, options: ExecFileOptions, callback: (error: Error | null, stdout: string, stderr: string) => void): ChildProcess;
+    export function execFile(file: string, args: string[] | undefined | null, options: ExecFileOptions, callback: (error: Error | null, stdout: string, stderr: string) => void): ChildProcess;
+
+    // fallback if nothing else matches. Worst case is always `string | Buffer`.
+    export function execFile(file: string, options: ({ encoding?: string | null } & ExecFileOptions) | undefined | null, callback: ((error: Error | null, stdout: string | Buffer, stderr: string | Buffer) => void) | undefined | null): ChildProcess;
+    export function execFile(file: string, args: string[] | undefined | null, options: ({ encoding?: string | null } & ExecFileOptions) | undefined | null, callback: ((error: Error | null, stdout: string | Buffer, stderr: string | Buffer) => void) | undefined | null): ChildProcess;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace execFile {
+        export function __promisify__(file: string): Promise<{ stdout: string, stderr: string }>;
+        export function __promisify__(file: string, args: string[] | undefined | null): Promise<{ stdout: string, stderr: string }>;
+        export function __promisify__(file: string, options: ExecFileOptionsWithBufferEncoding): Promise<{ stdout: Buffer, stderr: Buffer }>;
+        export function __promisify__(file: string, args: string[] | undefined | null, options: ExecFileOptionsWithBufferEncoding): Promise<{ stdout: Buffer, stderr: Buffer }>;
+        export function __promisify__(file: string, options: ExecFileOptionsWithStringEncoding): Promise<{ stdout: string, stderr: string }>;
+        export function __promisify__(file: string, args: string[] | undefined | null, options: ExecFileOptionsWithStringEncoding): Promise<{ stdout: string, stderr: string }>;
+        export function __promisify__(file: string, options: ExecFileOptionsWithOtherEncoding): Promise<{ stdout: string | Buffer, stderr: string | Buffer }>;
+        export function __promisify__(file: string, args: string[] | undefined | null, options: ExecFileOptionsWithOtherEncoding): Promise<{ stdout: string | Buffer, stderr: string | Buffer }>;
+        export function __promisify__(file: string, options: ExecFileOptions): Promise<{ stdout: string, stderr: string }>;
+        export function __promisify__(file: string, args: string[] | undefined | null, options: ExecFileOptions): Promise<{ stdout: string, stderr: string }>;
+        export function __promisify__(file: string, options: ({ encoding?: string | null } & ExecFileOptions) | undefined | null): Promise<{ stdout: string | Buffer, stderr: string | Buffer }>;
+        export function __promisify__(file: string, args: string[] | undefined | null, options: ({ encoding?: string | null } & ExecFileOptions) | undefined | null): Promise<{ stdout: string | Buffer, stderr: string | Buffer }>;
+    }
+
+    export interface ForkOptions {
+        cwd?: string;
+        env?: any;
+        execPath?: string;
+        execArgv?: string[];
+        silent?: boolean;
+        stdio?: any[];
+        uid?: number;
+        gid?: number;
+        windowsVerbatimArguments?: boolean;
+    }
+    export function fork(modulePath: string, args?: string[], options?: ForkOptions): ChildProcess;
+
+    export interface SpawnSyncOptions {
+        cwd?: string;
+        input?: string | Buffer;
+        stdio?: any;
+        env?: any;
+        uid?: number;
+        gid?: number;
+        timeout?: number;
+        killSignal?: string;
+        maxBuffer?: number;
+        encoding?: string;
+        shell?: boolean | string;
+        windowsHide?: boolean;
+        windowsVerbatimArguments?: boolean;
+    }
+    export interface SpawnSyncOptionsWithStringEncoding extends SpawnSyncOptions {
+        encoding: BufferEncoding;
+    }
+    export interface SpawnSyncOptionsWithBufferEncoding extends SpawnSyncOptions {
+        encoding: string; // specify `null`.
+    }
+    export interface SpawnSyncReturns<T> {
+        pid: number;
+        output: string[];
+        stdout: T;
+        stderr: T;
+        status: number;
+        signal: string;
+        error: Error;
+    }
+    export function spawnSync(command: string): SpawnSyncReturns<Buffer>;
+    export function spawnSync(command: string, options?: SpawnSyncOptionsWithStringEncoding): SpawnSyncReturns<string>;
+    export function spawnSync(command: string, options?: SpawnSyncOptionsWithBufferEncoding): SpawnSyncReturns<Buffer>;
+    export function spawnSync(command: string, options?: SpawnSyncOptions): SpawnSyncReturns<Buffer>;
+    export function spawnSync(command: string, args?: string[], options?: SpawnSyncOptionsWithStringEncoding): SpawnSyncReturns<string>;
+    export function spawnSync(command: string, args?: string[], options?: SpawnSyncOptionsWithBufferEncoding): SpawnSyncReturns<Buffer>;
+    export function spawnSync(command: string, args?: string[], options?: SpawnSyncOptions): SpawnSyncReturns<Buffer>;
+
+    export interface ExecSyncOptions {
+        cwd?: string;
+        input?: string | Buffer;
+        stdio?: any;
+        env?: any;
+        shell?: string;
+        uid?: number;
+        gid?: number;
+        timeout?: number;
+        killSignal?: string;
+        maxBuffer?: number;
+        encoding?: string;
+        windowsHide?: boolean;
+    }
+    export interface ExecSyncOptionsWithStringEncoding extends ExecSyncOptions {
+        encoding: BufferEncoding;
+    }
+    export interface ExecSyncOptionsWithBufferEncoding extends ExecSyncOptions {
+        encoding: string; // specify `null`.
+    }
+    export function execSync(command: string): Buffer;
+    export function execSync(command: string, options?: ExecSyncOptionsWithStringEncoding): string;
+    export function execSync(command: string, options?: ExecSyncOptionsWithBufferEncoding): Buffer;
+    export function execSync(command: string, options?: ExecSyncOptions): Buffer;
+
+    export interface ExecFileSyncOptions {
+        cwd?: string;
+        input?: string | Buffer;
+        stdio?: any;
+        env?: any;
+        uid?: number;
+        gid?: number;
+        timeout?: number;
+        killSignal?: string;
+        maxBuffer?: number;
+        encoding?: string;
+        windowsHide?: boolean;
+    }
+    export interface ExecFileSyncOptionsWithStringEncoding extends ExecFileSyncOptions {
+        encoding: BufferEncoding;
+    }
+    export interface ExecFileSyncOptionsWithBufferEncoding extends ExecFileSyncOptions {
+        encoding: string; // specify `null`.
+    }
+    export function execFileSync(command: string): Buffer;
+    export function execFileSync(command: string, options?: ExecFileSyncOptionsWithStringEncoding): string;
+    export function execFileSync(command: string, options?: ExecFileSyncOptionsWithBufferEncoding): Buffer;
+    export function execFileSync(command: string, options?: ExecFileSyncOptions): Buffer;
+    export function execFileSync(command: string, args?: string[], options?: ExecFileSyncOptionsWithStringEncoding): string;
+    export function execFileSync(command: string, args?: string[], options?: ExecFileSyncOptionsWithBufferEncoding): Buffer;
+    export function execFileSync(command: string, args?: string[], options?: ExecFileSyncOptions): Buffer;
 }
 
 declare module "url" {
-	export interface Url {
-		href?: string;
-		protocol?: string;
-		auth?: string;
-		hostname?: string;
-		port?: string;
-		host?: string;
-		pathname?: string;
-		search?: string;
-		query?: string | any;
-		slashes?: boolean;
-		hash?: string;
-		path?: string;
-	}
+    import { ParsedUrlQuery } from 'querystring';
 
-	export interface UrlObject {
-		protocol?: string;
-		slashes?: boolean;
-		auth?: string;
-		host?: string;
-		hostname?: string;
-		port?: string | number;
-		pathname?: string;
-		search?: string;
-		query?: { [key: string]: any; };
-		hash?: string;
-	}
+    export interface UrlObjectCommon {
+        auth?: string;
+        hash?: string;
+        host?: string;
+        hostname?: string;
+        href?: string;
+        path?: string;
+        pathname?: string;
+        protocol?: string;
+        search?: string;
+        slashes?: boolean;
+    }
 
-	export function parse(urlStr: string, parseQueryString?: boolean, slashesDenoteHost?: boolean): Url;
-	export function format(URL: URL, options?: URLFormatOptions): string;
-	export function format(urlObject: UrlObject): string;
-	export function resolve(from: string, to: string): string;
+    // Input to `url.format`
+    export interface UrlObject extends UrlObjectCommon {
+        port?: string | number;
+        query?: string | null | { [key: string]: any };
+    }
 
-	export interface URLFormatOptions {
-		auth?: boolean;
-		fragment?: boolean;
-		search?: boolean;
-		unicode?: boolean;
-	}
+    // Output of `url.parse`
+    export interface Url extends UrlObjectCommon {
+        port?: string;
+        query?: string | null | ParsedUrlQuery;
+    }
 
-	export class URLSearchParams implements Iterable<string[]> {
-		constructor(init?: URLSearchParams | string | { [key: string]: string | string[] } | Iterable<string[]>);
-		append(name: string, value: string): void;
-		delete(name: string): void;
-		entries(): Iterator<string[]>;
-		forEach(callback: (value: string, name: string) => void): void;
-		get(name: string): string | null;
-		getAll(name: string): string[];
-		has(name: string): boolean;
-		keys(): Iterator<string>;
-		set(name: string, value: string): void;
-		sort(): void;
-		toString(): string;
-		values(): Iterator<string>;
-		[Symbol.iterator](): Iterator<string[]>;
-	}
+    export interface UrlWithParsedQuery extends Url {
+        query: ParsedUrlQuery;
+    }
 
-	export class URL {
-		constructor(input: string, base?: string | URL);
-		hash: string;
-		host: string;
-		hostname: string;
-		href: string;
-		readonly origin: string;
-		password: string;
-		pathname: string;
-		port: string;
-		protocol: string;
-		search: string;
-		readonly searchParams: URLSearchParams;
-		username: string;
-		toString(): string;
-		toJSON(): string;
-	}
+    export interface UrlWithStringQuery extends Url {
+        query: string | null;
+    }
+
+    export function parse(urlStr: string): UrlWithStringQuery;
+    export function parse(urlStr: string, parseQueryString: false | undefined, slashesDenoteHost?: boolean): UrlWithStringQuery;
+    export function parse(urlStr: string, parseQueryString: true, slashesDenoteHost?: boolean): UrlWithParsedQuery;
+    export function parse(urlStr: string, parseQueryString: boolean, slashesDenoteHost?: boolean): Url;
+
+    export function format(URL: URL, options?: URLFormatOptions): string;
+    export function format(urlObject: UrlObject | string): string;
+    export function resolve(from: string, to: string): string;
+
+    export function domainToASCII(domain: string): string;
+    export function domainToUnicode(domain: string): string;
+
+    export interface URLFormatOptions {
+        auth?: boolean;
+        fragment?: boolean;
+        search?: boolean;
+        unicode?: boolean;
+    }
+
+    export class URLSearchParams implements Iterable<[string, string]> {
+        constructor(init?: URLSearchParams | string | { [key: string]: string | string[] | undefined } | Iterable<[string, string]> | Array<[string, string]>);
+        append(name: string, value: string): void;
+        delete(name: string): void;
+        entries(): IterableIterator<[string, string]>;
+        forEach(callback: (value: string, name: string) => void): void;
+        get(name: string): string | null;
+        getAll(name: string): string[];
+        has(name: string): boolean;
+        keys(): IterableIterator<string>;
+        set(name: string, value: string): void;
+        sort(): void;
+        toString(): string;
+        values(): IterableIterator<string>;
+        [Symbol.iterator](): IterableIterator<[string, string]>;
+    }
+
+    export class URL {
+        constructor(input: string, base?: string | URL);
+        hash: string;
+        host: string;
+        hostname: string;
+        href: string;
+        readonly origin: string;
+        password: string;
+        pathname: string;
+        port: string;
+        protocol: string;
+        search: string;
+        readonly searchParams: URLSearchParams;
+        username: string;
+        toString(): string;
+        toJSON(): string;
+    }
 }
 
 declare module "dns" {
-	// Supported getaddrinfo flags.
-	export const ADDRCONFIG: number;
-	export const V4MAPPED: number;
+    // Supported getaddrinfo flags.
+    export const ADDRCONFIG: number;
+    export const V4MAPPED: number;
 
-	export interface LookupOptions {
-		family?: number;
-		hints?: number;
-		all?: boolean;
-	}
+    export interface LookupOptions {
+        family?: number;
+        hints?: number;
+        all?: boolean;
+    }
 
-	export interface LookupOneOptions extends LookupOptions {
-		all?: false;
-	}
+    export interface LookupOneOptions extends LookupOptions {
+        all?: false;
+    }
 
-	export interface LookupAllOptions extends LookupOptions {
-		all: true;
-	}
+    export interface LookupAllOptions extends LookupOptions {
+        all: true;
+    }
 
-	export interface LookupAddress {
-		address: string;
-		family: number;
-	}
+    export interface LookupAddress {
+        address: string;
+        family: number;
+    }
 
-	export function lookup(hostname: string, family: number, callback: (err: NodeJS.ErrnoException, address: string, family: number) => void): void;
-	export function lookup(hostname: string, options: LookupOneOptions, callback: (err: NodeJS.ErrnoException, address: string, family: number) => void): void;
-	export function lookup(hostname: string, options: LookupAllOptions, callback: (err: NodeJS.ErrnoException, addresses: LookupAddress[]) => void): void;
-	export function lookup(hostname: string, options: LookupOptions, callback: (err: NodeJS.ErrnoException, address: string | LookupAddress[], family: number) => void): void;
-	export function lookup(hostname: string, callback: (err: NodeJS.ErrnoException, address: string, family: number) => void): void;
+    export function lookup(hostname: string, family: number, callback: (err: NodeJS.ErrnoException, address: string, family: number) => void): void;
+    export function lookup(hostname: string, options: LookupOneOptions, callback: (err: NodeJS.ErrnoException, address: string, family: number) => void): void;
+    export function lookup(hostname: string, options: LookupAllOptions, callback: (err: NodeJS.ErrnoException, addresses: LookupAddress[]) => void): void;
+    export function lookup(hostname: string, options: LookupOptions, callback: (err: NodeJS.ErrnoException, address: string | LookupAddress[], family: number) => void): void;
+    export function lookup(hostname: string, callback: (err: NodeJS.ErrnoException, address: string, family: number) => void): void;
 
-	export interface ResolveOptions {
-		ttl: boolean;
-	}
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace lookup {
+        export function __promisify__(hostname: string, options: LookupAllOptions): Promise<{ address: LookupAddress[] }>;
+        export function __promisify__(hostname: string, options?: LookupOneOptions | number): Promise<{ address: string, family: number }>;
+        export function __promisify__(hostname: string, options?: LookupOptions | number): Promise<{ address: string | LookupAddress[], family?: number }>;
+    }
 
-	export interface ResolveWithTtlOptions extends ResolveOptions {
-		ttl: true;
-	}
+    export function lookupService(address: string, port: number, callback: (err: NodeJS.ErrnoException, hostname: string, service: string) => void): void;
 
-	export interface RecordWithTtl {
-		address: string;
-		ttl: number;
-	}
+    export namespace lookupService {
+        export function __promisify__(address: string, port: number): Promise<{ hostname: string, service: string }>;
+    }
 
-	export interface MxRecord {
-		priority: number;
-		exchange: string;
-	}
+    export interface ResolveOptions {
+        ttl: boolean;
+    }
 
-	export interface NaptrRecord {
-		flags: string;
-		service: string;
-		regexp: string;
-		replacement: string;
-		order: number;
-		preference: number;
-	}
+    export interface ResolveWithTtlOptions extends ResolveOptions {
+        ttl: true;
+    }
 
-	export interface SoaRecord {
-		nsname: string;
-		hostmaster: string;
-		serial: number;
-		refresh: number;
-		retry: number;
-		expire: number;
-		minttl: number;
-	}
+    export interface RecordWithTtl {
+        address: string;
+        ttl: number;
+    }
 
-	export interface SrvRecord {
-		priority: number;
-		weight: number;
-		port: number;
-		name: string;
-	}
+    export interface MxRecord {
+        priority: number;
+        exchange: string;
+    }
 
-	export function resolve(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: string[]) => void): void;
-	export function resolve(hostname: string, rrtype: "A", callback: (err: NodeJS.ErrnoException, addresses: string[]) => void): void;
-	export function resolve(hostname: string, rrtype: "AAAA", callback: (err: NodeJS.ErrnoException, addresses: string[]) => void): void;
-	export function resolve(hostname: string, rrtype: "CNAME", callback: (err: NodeJS.ErrnoException, addresses: string[]) => void): void;
-	export function resolve(hostname: string, rrtype: "MX", callback: (err: NodeJS.ErrnoException, addresses: MxRecord[]) => void): void;
-	export function resolve(hostname: string, rrtype: "NAPTR", callback: (err: NodeJS.ErrnoException, addresses: NaptrRecord[]) => void): void;
-	export function resolve(hostname: string, rrtype: "NS", callback: (err: NodeJS.ErrnoException, addresses: string[]) => void): void;
-	export function resolve(hostname: string, rrtype: "PTR", callback: (err: NodeJS.ErrnoException, addresses: string[]) => void): void;
-	export function resolve(hostname: string, rrtype: "SOA", callback: (err: NodeJS.ErrnoException, addresses: SoaRecord) => void): void;
-	export function resolve(hostname: string, rrtype: "SRV", callback: (err: NodeJS.ErrnoException, addresses: SrvRecord[]) => void): void;
-	export function resolve(hostname: string, rrtype: "TXT", callback: (err: NodeJS.ErrnoException, addresses: string[][]) => void): void;
-	export function resolve(hostname: string, rrtype: string, callback: (err: NodeJS.ErrnoException, addresses: string[] | MxRecord[] | NaptrRecord[] | SoaRecord | SrvRecord[] | string[][]) => void): void;
+    export interface NaptrRecord {
+        flags: string;
+        service: string;
+        regexp: string;
+        replacement: string;
+        order: number;
+        preference: number;
+    }
 
-	export function resolve4(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: string[]) => void): void;
-	export function resolve4(hostname: string, options: ResolveWithTtlOptions, callback: (err: NodeJS.ErrnoException, addresses: RecordWithTtl[]) => void): void;
-	export function resolve4(hostname: string, options: ResolveOptions, callback: (err: NodeJS.ErrnoException, addresses: string[] | RecordWithTtl[]) => void): void;
+    export interface SoaRecord {
+        nsname: string;
+        hostmaster: string;
+        serial: number;
+        refresh: number;
+        retry: number;
+        expire: number;
+        minttl: number;
+    }
 
-	export function resolve6(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: string[]) => void): void;
-	export function resolve6(hostname: string, options: ResolveWithTtlOptions, callback: (err: NodeJS.ErrnoException, addresses: RecordWithTtl[]) => void): void;
-	export function resolve6(hostname: string, options: ResolveOptions, callback: (err: NodeJS.ErrnoException, addresses: string[] | RecordWithTtl[]) => void): void;
+    export interface SrvRecord {
+        priority: number;
+        weight: number;
+        port: number;
+        name: string;
+    }
 
-	export function resolveCname(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: string[]) => void): void;
-	export function resolveMx(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: MxRecord[]) => void): void;
-	export function resolveNaptr(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: NaptrRecord[]) => void): void;
-	export function resolveNs(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: string[]) => void): void;
-	export function resolvePtr(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: string[]) => void): void;
-	export function resolveSoa(hostname: string, callback: (err: NodeJS.ErrnoException, address: SoaRecord) => void): void;
-	export function resolveSrv(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: SrvRecord[]) => void): void;
-	export function resolveTxt(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: string[][]) => void): void;
+    export function resolve(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: string[]) => void): void;
+    export function resolve(hostname: string, rrtype: "A", callback: (err: NodeJS.ErrnoException, addresses: string[]) => void): void;
+    export function resolve(hostname: string, rrtype: "AAAA", callback: (err: NodeJS.ErrnoException, addresses: string[]) => void): void;
+    export function resolve(hostname: string, rrtype: "CNAME", callback: (err: NodeJS.ErrnoException, addresses: string[]) => void): void;
+    export function resolve(hostname: string, rrtype: "MX", callback: (err: NodeJS.ErrnoException, addresses: MxRecord[]) => void): void;
+    export function resolve(hostname: string, rrtype: "NAPTR", callback: (err: NodeJS.ErrnoException, addresses: NaptrRecord[]) => void): void;
+    export function resolve(hostname: string, rrtype: "NS", callback: (err: NodeJS.ErrnoException, addresses: string[]) => void): void;
+    export function resolve(hostname: string, rrtype: "PTR", callback: (err: NodeJS.ErrnoException, addresses: string[]) => void): void;
+    export function resolve(hostname: string, rrtype: "SOA", callback: (err: NodeJS.ErrnoException, addresses: SoaRecord) => void): void;
+    export function resolve(hostname: string, rrtype: "SRV", callback: (err: NodeJS.ErrnoException, addresses: SrvRecord[]) => void): void;
+    export function resolve(hostname: string, rrtype: "TXT", callback: (err: NodeJS.ErrnoException, addresses: string[][]) => void): void;
+    export function resolve(hostname: string, rrtype: string, callback: (err: NodeJS.ErrnoException, addresses: string[] | MxRecord[] | NaptrRecord[] | SoaRecord | SrvRecord[] | string[][]) => void): void;
 
-	export function reverse(ip: string, callback: (err: NodeJS.ErrnoException, hostnames: string[]) => void): void;
-	export function setServers(servers: string[]): void;
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace resolve {
+        export function __promisify__(hostname: string, rrtype?: "A" | "AAAA" | "CNAME" | "NS" | "PTR"): Promise<string[]>;
+        export function __promisify__(hostname: string, rrtype: "MX"): Promise<MxRecord[]>;
+        export function __promisify__(hostname: string, rrtype: "NAPTR"): Promise<NaptrRecord[]>;
+        export function __promisify__(hostname: string, rrtype: "SOA"): Promise<SoaRecord>;
+        export function __promisify__(hostname: string, rrtype: "SRV"): Promise<SrvRecord[]>;
+        export function __promisify__(hostname: string, rrtype: "TXT"): Promise<string[][]>;
+        export function __promisify__(hostname: string, rrtype?: string): Promise<string[] | MxRecord[] | NaptrRecord[] | SoaRecord | SrvRecord[] | string[][]>;
+    }
 
-	//Error codes
-	export var NODATA: string;
-	export var FORMERR: string;
-	export var SERVFAIL: string;
-	export var NOTFOUND: string;
-	export var NOTIMP: string;
-	export var REFUSED: string;
-	export var BADQUERY: string;
-	export var BADNAME: string;
-	export var BADFAMILY: string;
-	export var BADRESP: string;
-	export var CONNREFUSED: string;
-	export var TIMEOUT: string;
-	export var EOF: string;
-	export var FILE: string;
-	export var NOMEM: string;
-	export var DESTRUCTION: string;
-	export var BADSTR: string;
-	export var BADFLAGS: string;
-	export var NONAME: string;
-	export var BADHINTS: string;
-	export var NOTINITIALIZED: string;
-	export var LOADIPHLPAPI: string;
-	export var ADDRGETNETWORKPARAMS: string;
-	export var CANCELLED: string;
+    export function resolve4(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: string[]) => void): void;
+    export function resolve4(hostname: string, options: ResolveWithTtlOptions, callback: (err: NodeJS.ErrnoException, addresses: RecordWithTtl[]) => void): void;
+    export function resolve4(hostname: string, options: ResolveOptions, callback: (err: NodeJS.ErrnoException, addresses: string[] | RecordWithTtl[]) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace resolve4 {
+        export function __promisify__(hostname: string): Promise<string[]>;
+        export function __promisify__(hostname: string, options: ResolveWithTtlOptions): Promise<RecordWithTtl[]>;
+        export function __promisify__(hostname: string, options?: ResolveOptions): Promise<string[] | RecordWithTtl[]>;
+    }
+
+    export function resolve6(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: string[]) => void): void;
+    export function resolve6(hostname: string, options: ResolveWithTtlOptions, callback: (err: NodeJS.ErrnoException, addresses: RecordWithTtl[]) => void): void;
+    export function resolve6(hostname: string, options: ResolveOptions, callback: (err: NodeJS.ErrnoException, addresses: string[] | RecordWithTtl[]) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace resolve6 {
+        export function __promisify__(hostname: string): Promise<string[]>;
+        export function __promisify__(hostname: string, options: ResolveWithTtlOptions): Promise<RecordWithTtl[]>;
+        export function __promisify__(hostname: string, options?: ResolveOptions): Promise<string[] | RecordWithTtl[]>;
+    }
+
+    export function resolveCname(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: string[]) => void): void;
+    export function resolveMx(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: MxRecord[]) => void): void;
+    export function resolveNaptr(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: NaptrRecord[]) => void): void;
+    export function resolveNs(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: string[]) => void): void;
+    export function resolvePtr(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: string[]) => void): void;
+    export function resolveSoa(hostname: string, callback: (err: NodeJS.ErrnoException, address: SoaRecord) => void): void;
+    export function resolveSrv(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: SrvRecord[]) => void): void;
+    export function resolveTxt(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: string[][]) => void): void;
+
+    export function reverse(ip: string, callback: (err: NodeJS.ErrnoException, hostnames: string[]) => void): void;
+    export function setServers(servers: string[]): void;
+
+    // Error codes
+    export var NODATA: string;
+    export var FORMERR: string;
+    export var SERVFAIL: string;
+    export var NOTFOUND: string;
+    export var NOTIMP: string;
+    export var REFUSED: string;
+    export var BADQUERY: string;
+    export var BADNAME: string;
+    export var BADFAMILY: string;
+    export var BADRESP: string;
+    export var CONNREFUSED: string;
+    export var TIMEOUT: string;
+    export var EOF: string;
+    export var FILE: string;
+    export var NOMEM: string;
+    export var DESTRUCTION: string;
+    export var BADSTR: string;
+    export var BADFLAGS: string;
+    export var NONAME: string;
+    export var BADHINTS: string;
+    export var NOTINITIALIZED: string;
+    export var LOADIPHLPAPI: string;
+    export var ADDRGETNETWORKPARAMS: string;
+    export var CANCELLED: string;
 }
 
 declare module "net" {
-	import * as stream from "stream";
-	import * as events from "events";
+    import * as stream from "stream";
+    import * as events from "events";
+    import * as dns from "dns";
 
-	export interface Socket extends stream.Duplex {
-		// Extended base methods
-		write(buffer: Buffer): boolean;
-		write(buffer: Buffer, cb?: Function): boolean;
-		write(str: string, cb?: Function): boolean;
-		write(str: string, encoding?: string, cb?: Function): boolean;
-		write(str: string, encoding?: string, fd?: string): boolean;
+    type LookupFunction = (hostname: string, options: dns.LookupOneOptions, callback: (err: NodeJS.ErrnoException | null, address: string, family: number) => void) => void;
 
-		connect(port: number, host?: string, connectionListener?: Function): void;
-		connect(path: string, connectionListener?: Function): void;
-		bufferSize: number;
-		setEncoding(encoding?: string): this;
-		write(data: any, encoding?: string, callback?: Function): void;
-		destroy(err?: any): void;
-		pause(): this;
-		resume(): this;
-		setTimeout(timeout: number, callback?: Function): void;
-		setNoDelay(noDelay?: boolean): void;
-		setKeepAlive(enable?: boolean, initialDelay?: number): void;
-		address(): { port: number; family: string; address: string; };
-		unref(): void;
-		ref(): void;
+    export interface SocketConstructorOpts {
+        fd?: number;
+        allowHalfOpen?: boolean;
+        readable?: boolean;
+        writable?: boolean;
+    }
 
-		remoteAddress: string;
-		remoteFamily: string;
-		remotePort: number;
-		localAddress: string;
-		localPort: number;
-		bytesRead: number;
-		bytesWritten: number;
-		connecting: boolean;
-		destroyed: boolean;
+    export interface TcpSocketConnectOpts {
+        port: number;
+        host?: string;
+        localAddress?: string;
+        localPort?: number;
+        hints?: number;
+        family?: number;
+        lookup?: LookupFunction;
+    }
 
-		// Extended base methods
-		end(): void;
-		end(buffer: Buffer, cb?: Function): void;
-		end(str: string, cb?: Function): void;
-		end(str: string, encoding?: string, cb?: Function): void;
-		end(data?: any, encoding?: string): void;
+    export interface IpcSocketConnectOpts {
+        path: string;
+    }
+
+    export type SocketConnectOpts = TcpSocketConnectOpts | IpcSocketConnectOpts;
+
+    export class Socket extends stream.Duplex {
+        constructor(options?: SocketConstructorOpts);
+
+        // Extended base methods
+        write(buffer: Buffer): boolean;
+        write(buffer: Buffer, cb?: Function): boolean;
+        write(str: string, cb?: Function): boolean;
+        write(str: string, encoding?: string, cb?: Function): boolean;
+        write(str: string, encoding?: string, fd?: string): boolean;
+        write(data: any, encoding?: string, callback?: Function): void;
+
+        connect(options: SocketConnectOpts, connectionListener?: Function): this;
+        connect(port: number, host: string, connectionListener?: Function): this;
+        connect(port: number, connectionListener?: Function): this;
+        connect(path: string, connectionListener?: Function): this;
+
+        bufferSize: number;
+        setEncoding(encoding?: string): this;
+        destroy(err?: any): void;
+        pause(): this;
+        resume(): this;
+        setTimeout(timeout: number, callback?: Function): this;
+        setNoDelay(noDelay?: boolean): this;
+        setKeepAlive(enable?: boolean, initialDelay?: number): this;
+        address(): { port: number; family: string; address: string; };
+        unref(): void;
+        ref(): void;
+
+        remoteAddress?: string;
+        remoteFamily?: string;
+        remotePort?: number;
+        localAddress: string;
+        localPort: number;
+        bytesRead: number;
+        bytesWritten: number;
+        connecting: boolean;
+        destroyed: boolean;
+
+        // Extended base methods
+        end(): void;
+        end(buffer: Buffer, cb?: Function): void;
+        end(str: string, cb?: Function): void;
+        end(str: string, encoding?: string, cb?: Function): void;
+        end(data?: any, encoding?: string): void;
 
         /**
          * events.EventEmitter
@@ -2137,97 +2674,97 @@ declare module "net" {
          *   7. lookup
          *   8. timeout
          */
-		addListener(event: string, listener: Function): this;
-		addListener(event: "close", listener: (had_error: boolean) => void): this;
-		addListener(event: "connect", listener: () => void): this;
-		addListener(event: "data", listener: (data: Buffer) => void): this;
-		addListener(event: "drain", listener: () => void): this;
-		addListener(event: "end", listener: () => void): this;
-		addListener(event: "error", listener: (err: Error) => void): this;
-		addListener(event: "lookup", listener: (err: Error, address: string, family: string | number, host: string) => void): this;
-		addListener(event: "timeout", listener: () => void): this;
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        addListener(event: "close", listener: (had_error: boolean) => void): this;
+        addListener(event: "connect", listener: () => void): this;
+        addListener(event: "data", listener: (data: Buffer) => void): this;
+        addListener(event: "drain", listener: () => void): this;
+        addListener(event: "end", listener: () => void): this;
+        addListener(event: "error", listener: (err: Error) => void): this;
+        addListener(event: "lookup", listener: (err: Error, address: string, family: string | number, host: string) => void): this;
+        addListener(event: "timeout", listener: () => void): this;
 
-		emit(event: string | symbol, ...args: any[]): boolean;
-		emit(event: "close", had_error: boolean): boolean;
-		emit(event: "connect"): boolean;
-		emit(event: "data", data: Buffer): boolean;
-		emit(event: "drain"): boolean;
-		emit(event: "end"): boolean;
-		emit(event: "error", err: Error): boolean;
-		emit(event: "lookup", err: Error, address: string, family: string | number, host: string): boolean;
-		emit(event: "timeout"): boolean;
+        emit(event: string | symbol, ...args: any[]): boolean;
+        emit(event: "close", had_error: boolean): boolean;
+        emit(event: "connect"): boolean;
+        emit(event: "data", data: Buffer): boolean;
+        emit(event: "drain"): boolean;
+        emit(event: "end"): boolean;
+        emit(event: "error", err: Error): boolean;
+        emit(event: "lookup", err: Error, address: string, family: string | number, host: string): boolean;
+        emit(event: "timeout"): boolean;
 
-		on(event: string, listener: Function): this;
-		on(event: "close", listener: (had_error: boolean) => void): this;
-		on(event: "connect", listener: () => void): this;
-		on(event: "data", listener: (data: Buffer) => void): this;
-		on(event: "drain", listener: () => void): this;
-		on(event: "end", listener: () => void): this;
-		on(event: "error", listener: (err: Error) => void): this;
-		on(event: "lookup", listener: (err: Error, address: string, family: string | number, host: string) => void): this;
-		on(event: "timeout", listener: () => void): this;
+        on(event: string, listener: (...args: any[]) => void): this;
+        on(event: "close", listener: (had_error: boolean) => void): this;
+        on(event: "connect", listener: () => void): this;
+        on(event: "data", listener: (data: Buffer) => void): this;
+        on(event: "drain", listener: () => void): this;
+        on(event: "end", listener: () => void): this;
+        on(event: "error", listener: (err: Error) => void): this;
+        on(event: "lookup", listener: (err: Error, address: string, family: string | number, host: string) => void): this;
+        on(event: "timeout", listener: () => void): this;
 
-		once(event: string, listener: Function): this;
-		once(event: "close", listener: (had_error: boolean) => void): this;
-		once(event: "connect", listener: () => void): this;
-		once(event: "data", listener: (data: Buffer) => void): this;
-		once(event: "drain", listener: () => void): this;
-		once(event: "end", listener: () => void): this;
-		once(event: "error", listener: (err: Error) => void): this;
-		once(event: "lookup", listener: (err: Error, address: string, family: string | number, host: string) => void): this;
-		once(event: "timeout", listener: () => void): this;
+        once(event: string, listener: (...args: any[]) => void): this;
+        once(event: "close", listener: (had_error: boolean) => void): this;
+        once(event: "connect", listener: () => void): this;
+        once(event: "data", listener: (data: Buffer) => void): this;
+        once(event: "drain", listener: () => void): this;
+        once(event: "end", listener: () => void): this;
+        once(event: "error", listener: (err: Error) => void): this;
+        once(event: "lookup", listener: (err: Error, address: string, family: string | number, host: string) => void): this;
+        once(event: "timeout", listener: () => void): this;
 
-		prependListener(event: string, listener: Function): this;
-		prependListener(event: "close", listener: (had_error: boolean) => void): this;
-		prependListener(event: "connect", listener: () => void): this;
-		prependListener(event: "data", listener: (data: Buffer) => void): this;
-		prependListener(event: "drain", listener: () => void): this;
-		prependListener(event: "end", listener: () => void): this;
-		prependListener(event: "error", listener: (err: Error) => void): this;
-		prependListener(event: "lookup", listener: (err: Error, address: string, family: string | number, host: string) => void): this;
-		prependListener(event: "timeout", listener: () => void): this;
+        prependListener(event: string, listener: (...args: any[]) => void): this;
+        prependListener(event: "close", listener: (had_error: boolean) => void): this;
+        prependListener(event: "connect", listener: () => void): this;
+        prependListener(event: "data", listener: (data: Buffer) => void): this;
+        prependListener(event: "drain", listener: () => void): this;
+        prependListener(event: "end", listener: () => void): this;
+        prependListener(event: "error", listener: (err: Error) => void): this;
+        prependListener(event: "lookup", listener: (err: Error, address: string, family: string | number, host: string) => void): this;
+        prependListener(event: "timeout", listener: () => void): this;
 
-		prependOnceListener(event: string, listener: Function): this;
-		prependOnceListener(event: "close", listener: (had_error: boolean) => void): this;
-		prependOnceListener(event: "connect", listener: () => void): this;
-		prependOnceListener(event: "data", listener: (data: Buffer) => void): this;
-		prependOnceListener(event: "drain", listener: () => void): this;
-		prependOnceListener(event: "end", listener: () => void): this;
-		prependOnceListener(event: "error", listener: (err: Error) => void): this;
-		prependOnceListener(event: "lookup", listener: (err: Error, address: string, family: string | number, host: string) => void): this;
-		prependOnceListener(event: "timeout", listener: () => void): this;
-	}
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: "close", listener: (had_error: boolean) => void): this;
+        prependOnceListener(event: "connect", listener: () => void): this;
+        prependOnceListener(event: "data", listener: (data: Buffer) => void): this;
+        prependOnceListener(event: "drain", listener: () => void): this;
+        prependOnceListener(event: "end", listener: () => void): this;
+        prependOnceListener(event: "error", listener: (err: Error) => void): this;
+        prependOnceListener(event: "lookup", listener: (err: Error, address: string, family: string | number, host: string) => void): this;
+        prependOnceListener(event: "timeout", listener: () => void): this;
+    }
 
-	export var Socket: {
-		new(options?: { fd?: number; allowHalfOpen?: boolean; readable?: boolean; writable?: boolean; }): Socket;
-	};
+    export interface ListenOptions {
+        port?: number;
+        host?: string;
+        backlog?: number;
+        path?: string;
+        exclusive?: boolean;
+    }
 
-	export interface ListenOptions {
-		port?: number;
-		host?: string;
-		backlog?: number;
-		path?: string;
-		exclusive?: boolean;
-	}
+    // https://github.com/nodejs/node/blob/master/lib/net.js
+    export class Server extends events.EventEmitter {
+        constructor(connectionListener?: (socket: Socket) => void);
+        constructor(options?: { allowHalfOpen?: boolean, pauseOnConnect?: boolean }, connectionListener?: (socket: Socket) => void);
 
-	export interface Server extends events.EventEmitter {
-		listen(port: number, hostname?: string, backlog?: number, listeningListener?: Function): Server;
-		listen(port: number, hostname?: string, listeningListener?: Function): Server;
-		listen(port: number, backlog?: number, listeningListener?: Function): Server;
-		listen(port: number, listeningListener?: Function): Server;
-		listen(path: string, backlog?: number, listeningListener?: Function): Server;
-		listen(path: string, listeningListener?: Function): Server;
-		listen(options: ListenOptions, listeningListener?: Function): Server;
-		listen(handle: any, backlog?: number, listeningListener?: Function): Server;
-		listen(handle: any, listeningListener?: Function): Server;
-		close(callback?: Function): Server;
-		address(): { port: number; family: string; address: string; };
-		getConnections(cb: (error: Error, count: number) => void): void;
-		ref(): Server;
-		unref(): Server;
-		maxConnections: number;
-		connections: number;
-		listening: boolean;
+        listen(port?: number, hostname?: string, backlog?: number, listeningListener?: Function): this;
+        listen(port?: number, hostname?: string, listeningListener?: Function): this;
+        listen(port?: number, backlog?: number, listeningListener?: Function): this;
+        listen(port?: number, listeningListener?: Function): this;
+        listen(path: string, backlog?: number, listeningListener?: Function): this;
+        listen(path: string, listeningListener?: Function): this;
+        listen(options: ListenOptions, listeningListener?: Function): this;
+        listen(handle: any, backlog?: number, listeningListener?: Function): this;
+        listen(handle: any, listeningListener?: Function): this;
+        close(callback?: Function): this;
+        address(): { port: number; family: string; address: string; };
+        getConnections(cb: (error: Error | null, count: number) => void): void;
+        ref(): this;
+        unref(): this;
+        maxConnections: number;
+        connections: number;
+        listening: boolean;
 
         /**
          * events.EventEmitter
@@ -2236,101 +2773,123 @@ declare module "net" {
          *   3. error
          *   4. listening
          */
-		addListener(event: string, listener: Function): this;
-		addListener(event: "close", listener: () => void): this;
-		addListener(event: "connection", listener: (socket: Socket) => void): this;
-		addListener(event: "error", listener: (err: Error) => void): this;
-		addListener(event: "listening", listener: () => void): this;
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        addListener(event: "close", listener: () => void): this;
+        addListener(event: "connection", listener: (socket: Socket) => void): this;
+        addListener(event: "error", listener: (err: Error) => void): this;
+        addListener(event: "listening", listener: () => void): this;
 
-		emit(event: string | symbol, ...args: any[]): boolean;
-		emit(event: "close"): boolean;
-		emit(event: "connection", socket: Socket): boolean;
-		emit(event: "error", err: Error): boolean;
-		emit(event: "listening"): boolean;
+        emit(event: string | symbol, ...args: any[]): boolean;
+        emit(event: "close"): boolean;
+        emit(event: "connection", socket: Socket): boolean;
+        emit(event: "error", err: Error): boolean;
+        emit(event: "listening"): boolean;
 
-		on(event: string, listener: Function): this;
-		on(event: "close", listener: () => void): this;
-		on(event: "connection", listener: (socket: Socket) => void): this;
-		on(event: "error", listener: (err: Error) => void): this;
-		on(event: "listening", listener: () => void): this;
+        on(event: string, listener: (...args: any[]) => void): this;
+        on(event: "close", listener: () => void): this;
+        on(event: "connection", listener: (socket: Socket) => void): this;
+        on(event: "error", listener: (err: Error) => void): this;
+        on(event: "listening", listener: () => void): this;
 
-		once(event: string, listener: Function): this;
-		once(event: "close", listener: () => void): this;
-		once(event: "connection", listener: (socket: Socket) => void): this;
-		once(event: "error", listener: (err: Error) => void): this;
-		once(event: "listening", listener: () => void): this;
+        once(event: string, listener: (...args: any[]) => void): this;
+        once(event: "close", listener: () => void): this;
+        once(event: "connection", listener: (socket: Socket) => void): this;
+        once(event: "error", listener: (err: Error) => void): this;
+        once(event: "listening", listener: () => void): this;
 
-		prependListener(event: string, listener: Function): this;
-		prependListener(event: "close", listener: () => void): this;
-		prependListener(event: "connection", listener: (socket: Socket) => void): this;
-		prependListener(event: "error", listener: (err: Error) => void): this;
-		prependListener(event: "listening", listener: () => void): this;
+        prependListener(event: string, listener: (...args: any[]) => void): this;
+        prependListener(event: "close", listener: () => void): this;
+        prependListener(event: "connection", listener: (socket: Socket) => void): this;
+        prependListener(event: "error", listener: (err: Error) => void): this;
+        prependListener(event: "listening", listener: () => void): this;
 
-		prependOnceListener(event: string, listener: Function): this;
-		prependOnceListener(event: "close", listener: () => void): this;
-		prependOnceListener(event: "connection", listener: (socket: Socket) => void): this;
-		prependOnceListener(event: "error", listener: (err: Error) => void): this;
-		prependOnceListener(event: "listening", listener: () => void): this;
-	}
-	export function createServer(connectionListener?: (socket: Socket) => void): Server;
-	export function createServer(options?: { allowHalfOpen?: boolean, pauseOnConnect?: boolean }, connectionListener?: (socket: Socket) => void): Server;
-	export function connect(options: { port: number, host?: string, localAddress?: string, localPort?: string, family?: number, allowHalfOpen?: boolean; }, connectionListener?: Function): Socket;
-	export function connect(port: number, host?: string, connectionListener?: Function): Socket;
-	export function connect(path: string, connectionListener?: Function): Socket;
-	export function createConnection(options: { port: number, host?: string, localAddress?: string, localPort?: string, family?: number, allowHalfOpen?: boolean; }, connectionListener?: Function): Socket;
-	export function createConnection(port: number, host?: string, connectionListener?: Function): Socket;
-	export function createConnection(path: string, connectionListener?: Function): Socket;
-	export function isIP(input: string): number;
-	export function isIPv4(input: string): boolean;
-	export function isIPv6(input: string): boolean;
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: "close", listener: () => void): this;
+        prependOnceListener(event: "connection", listener: (socket: Socket) => void): this;
+        prependOnceListener(event: "error", listener: (err: Error) => void): this;
+        prependOnceListener(event: "listening", listener: () => void): this;
+    }
+
+    export interface TcpNetConnectOpts extends TcpSocketConnectOpts, SocketConstructorOpts {
+        timeout?: number;
+    }
+
+    export interface IpcNetConnectOpts extends IpcSocketConnectOpts, SocketConstructorOpts {
+        timeout?: number;
+    }
+
+    export type NetConnectOpts = TcpNetConnectOpts | IpcNetConnectOpts;
+
+    export function createServer(connectionListener?: (socket: Socket) => void): Server;
+    export function createServer(options?: { allowHalfOpen?: boolean, pauseOnConnect?: boolean }, connectionListener?: (socket: Socket) => void): Server;
+    export function connect(options: NetConnectOpts, connectionListener?: Function): Socket;
+    export function connect(port: number, host?: string, connectionListener?: Function): Socket;
+    export function connect(path: string, connectionListener?: Function): Socket;
+    export function createConnection(options: NetConnectOpts, connectionListener?: Function): Socket;
+    export function createConnection(port: number, host?: string, connectionListener?: Function): Socket;
+    export function createConnection(path: string, connectionListener?: Function): Socket;
+    export function isIP(input: string): number;
+    export function isIPv4(input: string): boolean;
+    export function isIPv6(input: string): boolean;
 }
 
 declare module "dgram" {
-	import * as events from "events";
+    import * as events from "events";
+    import * as dns from "dns";
 
-	interface RemoteInfo {
-		address: string;
-		family: string;
-		port: number;
-	}
+    interface RemoteInfo {
+        address: string;
+        family: string;
+        port: number;
+    }
 
-	interface AddressInfo {
-		address: string;
-		family: string;
-		port: number;
-	}
+    interface AddressInfo {
+        address: string;
+        family: string;
+        port: number;
+    }
 
-	interface BindOptions {
-		port: number;
-		address?: string;
-		exclusive?: boolean;
-	}
+    interface BindOptions {
+        port: number;
+        address?: string;
+        exclusive?: boolean;
+    }
 
-	type SocketType = "udp4" | "udp6";
+    type SocketType = "udp4" | "udp6";
 
-	interface SocketOptions {
-		type: SocketType;
-		reuseAddr?: boolean;
-	}
+    interface SocketOptions {
+        type: SocketType;
+        reuseAddr?: boolean;
+        recvBufferSize?: number;
+        sendBufferSize?: number;
+        lookup?: (hostname: string, options: dns.LookupOneOptions, callback: (err: NodeJS.ErrnoException, address: string, family: number) => void) => void;
+    }
 
-	export function createSocket(type: SocketType, callback?: (msg: Buffer, rinfo: RemoteInfo) => void): Socket;
-	export function createSocket(options: SocketOptions, callback?: (msg: Buffer, rinfo: RemoteInfo) => void): Socket;
+    export function createSocket(type: SocketType, callback?: (msg: Buffer, rinfo: RemoteInfo) => void): Socket;
+    export function createSocket(options: SocketOptions, callback?: (msg: Buffer, rinfo: RemoteInfo) => void): Socket;
 
-	export interface Socket extends events.EventEmitter {
-		send(msg: Buffer | String | any[], port: number, address: string, callback?: (error: Error, bytes: number) => void): void;
-		send(msg: Buffer | String | any[], offset: number, length: number, port: number, address: string, callback?: (error: Error, bytes: number) => void): void;
-		bind(port?: number, address?: string, callback?: () => void): void;
-		bind(options: BindOptions, callback?: Function): void;
-		close(callback?: () => void): void;
-		address(): AddressInfo;
-		setBroadcast(flag: boolean): void;
-		setTTL(ttl: number): void;
-		setMulticastTTL(ttl: number): void;
-		setMulticastLoopback(flag: boolean): void;
-		addMembership(multicastAddress: string, multicastInterface?: string): void;
-		dropMembership(multicastAddress: string, multicastInterface?: string): void;
-		ref(): this;
-		unref(): this;
+    export class Socket extends events.EventEmitter {
+        send(msg: Buffer | string | Uint8Array | any[], port: number, address?: string, callback?: (error: Error | null, bytes: number) => void): void;
+        send(msg: Buffer | string | Uint8Array, offset: number, length: number, port: number, address?: string, callback?: (error: Error | null, bytes: number) => void): void;
+        bind(port?: number, address?: string, callback?: () => void): void;
+        bind(port?: number, callback?: () => void): void;
+        bind(callback?: () => void): void;
+        bind(options: BindOptions, callback?: Function): void;
+        close(callback?: () => void): void;
+        address(): AddressInfo;
+        setBroadcast(flag: boolean): void;
+        setTTL(ttl: number): void;
+        setMulticastTTL(ttl: number): void;
+        setMulticastInterface(multicastInterface: string): void;
+        setMulticastLoopback(flag: boolean): void;
+        addMembership(multicastAddress: string, multicastInterface?: string): void;
+        dropMembership(multicastAddress: string, multicastInterface?: string): void;
+        ref(): this;
+        unref(): this;
+        setRecvBufferSize(size: number): void;
+        setSendBufferSize(size: number): void;
+        getRecvBufferSize(): number;
+        getSendBufferSize(): number;
 
         /**
          * events.EventEmitter
@@ -2338,586 +2897,1738 @@ declare module "dgram" {
          * 2. error
          * 3. listening
          * 4. message
-         **/
-		addListener(event: string, listener: Function): this;
-		addListener(event: "close", listener: () => void): this;
-		addListener(event: "error", listener: (err: Error) => void): this;
-		addListener(event: "listening", listener: () => void): this;
-		addListener(event: "message", listener: (msg: Buffer, rinfo: AddressInfo) => void): this;
+         */
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        addListener(event: "close", listener: () => void): this;
+        addListener(event: "error", listener: (err: Error) => void): this;
+        addListener(event: "listening", listener: () => void): this;
+        addListener(event: "message", listener: (msg: Buffer, rinfo: AddressInfo) => void): this;
 
-		emit(event: string | symbol, ...args: any[]): boolean;
-		emit(event: "close"): boolean;
-		emit(event: "error", err: Error): boolean;
-		emit(event: "listening"): boolean;
-		emit(event: "message", msg: Buffer, rinfo: AddressInfo): boolean;
+        emit(event: string | symbol, ...args: any[]): boolean;
+        emit(event: "close"): boolean;
+        emit(event: "error", err: Error): boolean;
+        emit(event: "listening"): boolean;
+        emit(event: "message", msg: Buffer, rinfo: AddressInfo): boolean;
 
-		on(event: string, listener: Function): this;
-		on(event: "close", listener: () => void): this;
-		on(event: "error", listener: (err: Error) => void): this;
-		on(event: "listening", listener: () => void): this;
-		on(event: "message", listener: (msg: Buffer, rinfo: AddressInfo) => void): this;
+        on(event: string, listener: (...args: any[]) => void): this;
+        on(event: "close", listener: () => void): this;
+        on(event: "error", listener: (err: Error) => void): this;
+        on(event: "listening", listener: () => void): this;
+        on(event: "message", listener: (msg: Buffer, rinfo: AddressInfo) => void): this;
 
-		once(event: string, listener: Function): this;
-		once(event: "close", listener: () => void): this;
-		once(event: "error", listener: (err: Error) => void): this;
-		once(event: "listening", listener: () => void): this;
-		once(event: "message", listener: (msg: Buffer, rinfo: AddressInfo) => void): this;
+        once(event: string, listener: (...args: any[]) => void): this;
+        once(event: "close", listener: () => void): this;
+        once(event: "error", listener: (err: Error) => void): this;
+        once(event: "listening", listener: () => void): this;
+        once(event: "message", listener: (msg: Buffer, rinfo: AddressInfo) => void): this;
 
-		prependListener(event: string, listener: Function): this;
-		prependListener(event: "close", listener: () => void): this;
-		prependListener(event: "error", listener: (err: Error) => void): this;
-		prependListener(event: "listening", listener: () => void): this;
-		prependListener(event: "message", listener: (msg: Buffer, rinfo: AddressInfo) => void): this;
+        prependListener(event: string, listener: (...args: any[]) => void): this;
+        prependListener(event: "close", listener: () => void): this;
+        prependListener(event: "error", listener: (err: Error) => void): this;
+        prependListener(event: "listening", listener: () => void): this;
+        prependListener(event: "message", listener: (msg: Buffer, rinfo: AddressInfo) => void): this;
 
-		prependOnceListener(event: string, listener: Function): this;
-		prependOnceListener(event: "close", listener: () => void): this;
-		prependOnceListener(event: "error", listener: (err: Error) => void): this;
-		prependOnceListener(event: "listening", listener: () => void): this;
-		prependOnceListener(event: "message", listener: (msg: Buffer, rinfo: AddressInfo) => void): this;
-	}
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: "close", listener: () => void): this;
+        prependOnceListener(event: "error", listener: (err: Error) => void): this;
+        prependOnceListener(event: "listening", listener: () => void): this;
+        prependOnceListener(event: "message", listener: (msg: Buffer, rinfo: AddressInfo) => void): this;
+    }
 }
 
 declare module "fs" {
-	import * as stream from "stream";
-	import * as events from "events";
+    import * as stream from "stream";
+    import * as events from "events";
+    import { URL } from "url";
 
-	interface Stats {
-		isFile(): boolean;
-		isDirectory(): boolean;
-		isBlockDevice(): boolean;
-		isCharacterDevice(): boolean;
-		isSymbolicLink(): boolean;
-		isFIFO(): boolean;
-		isSocket(): boolean;
-		dev: number;
-		ino: number;
-		mode: number;
-		nlink: number;
-		uid: number;
-		gid: number;
-		rdev: number;
-		size: number;
-		blksize: number;
-		blocks: number;
-		atime: Date;
-		mtime: Date;
-		ctime: Date;
-		birthtime: Date;
-	}
+    /**
+     * Valid types for path values in "fs".
+     */
+    export type PathLike = string | Buffer | URL;
 
-	interface FSWatcher extends events.EventEmitter {
-		close(): void;
+    export class Stats {
+        isFile(): boolean;
+        isDirectory(): boolean;
+        isBlockDevice(): boolean;
+        isCharacterDevice(): boolean;
+        isSymbolicLink(): boolean;
+        isFIFO(): boolean;
+        isSocket(): boolean;
+        dev: number;
+        ino: number;
+        mode: number;
+        nlink: number;
+        uid: number;
+        gid: number;
+        rdev: number;
+        size: number;
+        blksize: number;
+        blocks: number;
+        atimeMs: number;
+        mtimeMs: number;
+        ctimeMs: number;
+        birthtimeMs: number;
+        atime: Date;
+        mtime: Date;
+        ctime: Date;
+        birthtime: Date;
+    }
+
+    export interface FSWatcher extends events.EventEmitter {
+        close(): void;
 
         /**
          * events.EventEmitter
          *   1. change
          *   2. error
          */
-		addListener(event: string, listener: Function): this;
-		addListener(event: "change", listener: (eventType: string, filename: string | Buffer) => void): this;
-		addListener(event: "error", listener: (error: Error) => void): this;
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        addListener(event: "change", listener: (eventType: string, filename: string | Buffer) => void): this;
+        addListener(event: "error", listener: (error: Error) => void): this;
 
-		on(event: string, listener: Function): this;
-		on(event: "change", listener: (eventType: string, filename: string | Buffer) => void): this;
-		on(event: "error", listener: (error: Error) => void): this;
+        on(event: string, listener: (...args: any[]) => void): this;
+        on(event: "change", listener: (eventType: string, filename: string | Buffer) => void): this;
+        on(event: "error", listener: (error: Error) => void): this;
 
-		once(event: string, listener: Function): this;
-		once(event: "change", listener: (eventType: string, filename: string | Buffer) => void): this;
-		once(event: "error", listener: (error: Error) => void): this;
+        once(event: string, listener: (...args: any[]) => void): this;
+        once(event: "change", listener: (eventType: string, filename: string | Buffer) => void): this;
+        once(event: "error", listener: (error: Error) => void): this;
 
-		prependListener(event: string, listener: Function): this;
-		prependListener(event: "change", listener: (eventType: string, filename: string | Buffer) => void): this;
-		prependListener(event: "error", listener: (error: Error) => void): this;
+        prependListener(event: string, listener: (...args: any[]) => void): this;
+        prependListener(event: "change", listener: (eventType: string, filename: string | Buffer) => void): this;
+        prependListener(event: "error", listener: (error: Error) => void): this;
 
-		prependOnceListener(event: string, listener: Function): this;
-		prependOnceListener(event: "change", listener: (eventType: string, filename: string | Buffer) => void): this;
-		prependOnceListener(event: "error", listener: (error: Error) => void): this;
-	}
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: "change", listener: (eventType: string, filename: string | Buffer) => void): this;
+        prependOnceListener(event: "error", listener: (error: Error) => void): this;
+    }
 
-	export interface ReadStream extends stream.Readable {
-		close(): void;
-		destroy(): void;
-		bytesRead: number;
-		path: string | Buffer;
+    export class ReadStream extends stream.Readable {
+        close(): void;
+        destroy(): void;
+        bytesRead: number;
+        path: string | Buffer;
 
         /**
          * events.EventEmitter
          *   1. open
          *   2. close
          */
-		addListener(event: string, listener: Function): this;
-		addListener(event: "open", listener: (fd: number) => void): this;
-		addListener(event: "close", listener: () => void): this;
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        addListener(event: "open", listener: (fd: number) => void): this;
+        addListener(event: "close", listener: () => void): this;
 
-		on(event: string, listener: Function): this;
-		on(event: "open", listener: (fd: number) => void): this;
-		on(event: "close", listener: () => void): this;
+        on(event: string, listener: (...args: any[]) => void): this;
+        on(event: "open", listener: (fd: number) => void): this;
+        on(event: "close", listener: () => void): this;
 
-		once(event: string, listener: Function): this;
-		once(event: "open", listener: (fd: number) => void): this;
-		once(event: "close", listener: () => void): this;
+        once(event: string, listener: (...args: any[]) => void): this;
+        once(event: "open", listener: (fd: number) => void): this;
+        once(event: "close", listener: () => void): this;
 
-		prependListener(event: string, listener: Function): this;
-		prependListener(event: "open", listener: (fd: number) => void): this;
-		prependListener(event: "close", listener: () => void): this;
+        prependListener(event: string, listener: (...args: any[]) => void): this;
+        prependListener(event: "open", listener: (fd: number) => void): this;
+        prependListener(event: "close", listener: () => void): this;
 
-		prependOnceListener(event: string, listener: Function): this;
-		prependOnceListener(event: "open", listener: (fd: number) => void): this;
-		prependOnceListener(event: "close", listener: () => void): this;
-	}
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: "open", listener: (fd: number) => void): this;
+        prependOnceListener(event: "close", listener: () => void): this;
+    }
 
-	export interface WriteStream extends stream.Writable {
-		close(): void;
-		bytesWritten: number;
-		path: string | Buffer;
+    export class WriteStream extends stream.Writable {
+        close(): void;
+        bytesWritten: number;
+        path: string | Buffer;
 
         /**
          * events.EventEmitter
          *   1. open
          *   2. close
          */
-		addListener(event: string, listener: Function): this;
-		addListener(event: "open", listener: (fd: number) => void): this;
-		addListener(event: "close", listener: () => void): this;
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        addListener(event: "open", listener: (fd: number) => void): this;
+        addListener(event: "close", listener: () => void): this;
 
-		on(event: string, listener: Function): this;
-		on(event: "open", listener: (fd: number) => void): this;
-		on(event: "close", listener: () => void): this;
+        on(event: string, listener: (...args: any[]) => void): this;
+        on(event: "open", listener: (fd: number) => void): this;
+        on(event: "close", listener: () => void): this;
 
-		once(event: string, listener: Function): this;
-		once(event: "open", listener: (fd: number) => void): this;
-		once(event: "close", listener: () => void): this;
+        once(event: string, listener: (...args: any[]) => void): this;
+        once(event: "open", listener: (fd: number) => void): this;
+        once(event: "close", listener: () => void): this;
 
-		prependListener(event: string, listener: Function): this;
-		prependListener(event: "open", listener: (fd: number) => void): this;
-		prependListener(event: "close", listener: () => void): this;
+        prependListener(event: string, listener: (...args: any[]) => void): this;
+        prependListener(event: "open", listener: (fd: number) => void): this;
+        prependListener(event: "close", listener: () => void): this;
 
-		prependOnceListener(event: string, listener: Function): this;
-		prependOnceListener(event: "open", listener: (fd: number) => void): this;
-		prependOnceListener(event: "close", listener: () => void): this;
-	}
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: "open", listener: (fd: number) => void): this;
+        prependOnceListener(event: "close", listener: () => void): this;
+    }
 
     /**
-     * Asynchronous rename.
-     * @param oldPath
-     * @param newPath
-     * @param callback No arguments other than a possible exception are given to the completion callback.
+     * Asynchronous rename(2) - Change the name or location of a file or directory.
+     * @param oldPath A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     * @param newPath A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
      */
-	export function rename(oldPath: string, newPath: string, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    export function rename(oldPath: PathLike, newPath: PathLike, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace rename {
+        /**
+         * Asynchronous rename(2) - Change the name or location of a file or directory.
+         * @param oldPath A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * URL support is _experimental_.
+         * @param newPath A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * URL support is _experimental_.
+         */
+        export function __promisify__(oldPath: PathLike, newPath: PathLike): Promise<void>;
+    }
+
     /**
-     * Synchronous rename
-     * @param oldPath
-     * @param newPath
+     * Synchronous rename(2) - Change the name or location of a file or directory.
+     * @param oldPath A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     * @param newPath A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
      */
-	export function renameSync(oldPath: string, newPath: string): void;
-	export function truncate(path: string | Buffer, callback?: (err?: NodeJS.ErrnoException) => void): void;
-	export function truncate(path: string | Buffer, len: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
-	export function truncateSync(path: string | Buffer, len?: number): void;
-	export function ftruncate(fd: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
-	export function ftruncate(fd: number, len: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
-	export function ftruncateSync(fd: number, len?: number): void;
-	export function chown(path: string | Buffer, uid: number, gid: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
-	export function chownSync(path: string | Buffer, uid: number, gid: number): void;
-	export function fchown(fd: number, uid: number, gid: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
-	export function fchownSync(fd: number, uid: number, gid: number): void;
-	export function lchown(path: string | Buffer, uid: number, gid: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
-	export function lchownSync(path: string | Buffer, uid: number, gid: number): void;
-	export function chmod(path: string | Buffer, mode: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
-	export function chmod(path: string | Buffer, mode: string, callback?: (err?: NodeJS.ErrnoException) => void): void;
-	export function chmodSync(path: string | Buffer, mode: number): void;
-	export function chmodSync(path: string | Buffer, mode: string): void;
-	export function fchmod(fd: number, mode: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
-	export function fchmod(fd: number, mode: string, callback?: (err?: NodeJS.ErrnoException) => void): void;
-	export function fchmodSync(fd: number, mode: number): void;
-	export function fchmodSync(fd: number, mode: string): void;
-	export function lchmod(path: string | Buffer, mode: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
-	export function lchmod(path: string | Buffer, mode: string, callback?: (err?: NodeJS.ErrnoException) => void): void;
-	export function lchmodSync(path: string | Buffer, mode: number): void;
-	export function lchmodSync(path: string | Buffer, mode: string): void;
-	export function stat(path: string | Buffer, callback?: (err: NodeJS.ErrnoException, stats: Stats) => any): void;
-	export function lstat(path: string | Buffer, callback?: (err: NodeJS.ErrnoException, stats: Stats) => any): void;
-	export function fstat(fd: number, callback?: (err: NodeJS.ErrnoException, stats: Stats) => any): void;
-	export function statSync(path: string | Buffer): Stats;
-	export function lstatSync(path: string | Buffer): Stats;
-	export function fstatSync(fd: number): Stats;
-	export function link(srcpath: string | Buffer, dstpath: string | Buffer, callback?: (err?: NodeJS.ErrnoException) => void): void;
-	export function linkSync(srcpath: string | Buffer, dstpath: string | Buffer): void;
-	export function symlink(srcpath: string | Buffer, dstpath: string | Buffer, type?: string, callback?: (err?: NodeJS.ErrnoException) => void): void;
-	export function symlinkSync(srcpath: string | Buffer, dstpath: string | Buffer, type?: string): void;
-	export function readlink(path: string | Buffer, callback?: (err: NodeJS.ErrnoException, linkString: string) => any): void;
-	export function readlinkSync(path: string | Buffer): string;
-	export function realpath(path: string | Buffer, callback?: (err: NodeJS.ErrnoException, resolvedPath: string) => any): void;
-	export function realpath(path: string | Buffer, cache: { [path: string]: string }, callback: (err: NodeJS.ErrnoException, resolvedPath: string) => any): void;
-	export function realpathSync(path: string | Buffer, cache?: { [path: string]: string }): string;
+    export function renameSync(oldPath: PathLike, newPath: PathLike): void;
+
     /**
-     * Asynchronous unlink - deletes the file specified in {path}
-     *
-     * @param path
-     * @param callback No arguments other than a possible exception are given to the completion callback.
+     * Asynchronous truncate(2) - Truncate a file to a specified length.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param len If not specified, defaults to `0`.
      */
-	export function unlink(path: string | Buffer, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    export function truncate(path: PathLike, len: number | undefined | null, callback: (err: NodeJS.ErrnoException) => void): void;
+
     /**
-     * Synchronous unlink - deletes the file specified in {path}
-     *
-     * @param path
+     * Asynchronous truncate(2) - Truncate a file to a specified length.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
      */
-	export function unlinkSync(path: string | Buffer): void;
+    export function truncate(path: PathLike, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace truncate {
+        /**
+         * Asynchronous truncate(2) - Truncate a file to a specified length.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param len If not specified, defaults to `0`.
+         */
+        export function __promisify__(path: PathLike, len?: number | null): Promise<void>;
+    }
+
     /**
-     * Asynchronous rmdir - removes the directory specified in {path}
-     *
-     * @param path
-     * @param callback No arguments other than a possible exception are given to the completion callback.
+     * Synchronous truncate(2) - Truncate a file to a specified length.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param len If not specified, defaults to `0`.
      */
-	export function rmdir(path: string | Buffer, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    export function truncateSync(path: PathLike, len?: number | null): void;
+
     /**
-     * Synchronous rmdir - removes the directory specified in {path}
-     *
-     * @param path
+     * Asynchronous ftruncate(2) - Truncate a file to a specified length.
+     * @param fd A file descriptor.
+     * @param len If not specified, defaults to `0`.
      */
-	export function rmdirSync(path: string | Buffer): void;
+    export function ftruncate(fd: number, len: number | undefined | null, callback: (err: NodeJS.ErrnoException) => void): void;
+
     /**
-     * Asynchronous mkdir - creates the directory specified in {path}.  Parameter {mode} defaults to 0777.
-     *
-     * @param path
-     * @param callback No arguments other than a possible exception are given to the completion callback.
+     * Asynchronous ftruncate(2) - Truncate a file to a specified length.
+     * @param fd A file descriptor.
      */
-	export function mkdir(path: string | Buffer, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    export function ftruncate(fd: number, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace ftruncate {
+        /**
+         * Asynchronous ftruncate(2) - Truncate a file to a specified length.
+         * @param fd A file descriptor.
+         * @param len If not specified, defaults to `0`.
+         */
+        export function __promisify__(fd: number, len?: number | null): Promise<void>;
+    }
+
     /**
-     * Asynchronous mkdir - creates the directory specified in {path}.  Parameter {mode} defaults to 0777.
-     *
-     * @param path
-     * @param mode
-     * @param callback No arguments other than a possible exception are given to the completion callback.
+     * Synchronous ftruncate(2) - Truncate a file to a specified length.
+     * @param fd A file descriptor.
+     * @param len If not specified, defaults to `0`.
      */
-	export function mkdir(path: string | Buffer, mode: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    export function ftruncateSync(fd: number, len?: number | null): void;
+
     /**
-     * Asynchronous mkdir - creates the directory specified in {path}.  Parameter {mode} defaults to 0777.
-     *
-     * @param path
-     * @param mode
-     * @param callback No arguments other than a possible exception are given to the completion callback.
+     * Asynchronous chown(2) - Change ownership of a file.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
      */
-	export function mkdir(path: string | Buffer, mode: string, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    export function chown(path: PathLike, uid: number, gid: number, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace chown {
+        /**
+         * Asynchronous chown(2) - Change ownership of a file.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         */
+        export function __promisify__(path: PathLike, uid: number, gid: number): Promise<void>;
+    }
+
     /**
-     * Synchronous mkdir - creates the directory specified in {path}.  Parameter {mode} defaults to 0777.
-     *
-     * @param path
-     * @param mode
-     * @param callback No arguments other than a possible exception are given to the completion callback.
+     * Synchronous chown(2) - Change ownership of a file.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
      */
-	export function mkdirSync(path: string | Buffer, mode?: number): void;
+    export function chownSync(path: PathLike, uid: number, gid: number): void;
+
     /**
-     * Synchronous mkdir - creates the directory specified in {path}.  Parameter {mode} defaults to 0777.
-     *
-     * @param path
-     * @param mode
-     * @param callback No arguments other than a possible exception are given to the completion callback.
+     * Asynchronous fchown(2) - Change ownership of a file.
+     * @param fd A file descriptor.
      */
-	export function mkdirSync(path: string | Buffer, mode?: string): void;
+    export function fchown(fd: number, uid: number, gid: number, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace fchown {
+        /**
+         * Asynchronous fchown(2) - Change ownership of a file.
+         * @param fd A file descriptor.
+         */
+        export function __promisify__(fd: number, uid: number, gid: number): Promise<void>;
+    }
+
     /**
-     * Asynchronous mkdtemp - Creates a unique temporary directory. Generates six random characters to be appended behind a required prefix to create a unique temporary directory.
-     *
-     * @param prefix
-     * @param callback The created folder path is passed as a string to the callback's second parameter.
+     * Synchronous fchown(2) - Change ownership of a file.
+     * @param fd A file descriptor.
      */
-	export function mkdtemp(prefix: string, callback?: (err: NodeJS.ErrnoException, folder: string) => void): void;
+    export function fchownSync(fd: number, uid: number, gid: number): void;
+
     /**
-     * Synchronous mkdtemp - Creates a unique temporary directory. Generates six random characters to be appended behind a required prefix to create a unique temporary directory.
-     *
-     * @param prefix
-     * @returns Returns the created folder path.
+     * Asynchronous lchown(2) - Change ownership of a file. Does not dereference symbolic links.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
      */
-	export function mkdtempSync(prefix: string): string;
-	export function readdir(path: string | Buffer, callback: (err: NodeJS.ErrnoException, files: string[]) => void): void;
-	export function readdir(path: string | Buffer, options: string | {}, callback: (err: NodeJS.ErrnoException, files: string[]) => void): void;
-	export function readdirSync(path: string | Buffer, options?: string | {}): string[];
-	export function close(fd: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
-	export function closeSync(fd: number): void;
-	export function open(path: string | Buffer, flags: string | number, callback: (err: NodeJS.ErrnoException, fd: number) => void): void;
-	export function open(path: string | Buffer, flags: string | number, mode: number, callback: (err: NodeJS.ErrnoException, fd: number) => void): void;
-	export function openSync(path: string | Buffer, flags: string | number, mode?: number): number;
-	export function utimes(path: string | Buffer, atime: number, mtime: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
-	export function utimes(path: string | Buffer, atime: Date, mtime: Date, callback?: (err?: NodeJS.ErrnoException) => void): void;
-	export function utimesSync(path: string | Buffer, atime: number, mtime: number): void;
-	export function utimesSync(path: string | Buffer, atime: Date, mtime: Date): void;
-	export function futimes(fd: number, atime: number, mtime: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
-	export function futimes(fd: number, atime: Date, mtime: Date, callback?: (err?: NodeJS.ErrnoException) => void): void;
-	export function futimesSync(fd: number, atime: number, mtime: number): void;
-	export function futimesSync(fd: number, atime: Date, mtime: Date): void;
-	export function fsync(fd: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
-	export function fsyncSync(fd: number): void;
-	export function write(fd: number, buffer: Buffer, offset: number, length: number, position: number | null, callback?: (err: NodeJS.ErrnoException, written: number, buffer: Buffer) => void): void;
-	export function write(fd: number, buffer: Buffer, offset: number, length: number, callback?: (err: NodeJS.ErrnoException, written: number, buffer: Buffer) => void): void;
-	export function write(fd: number, data: any, callback?: (err: NodeJS.ErrnoException, written: number, str: string) => void): void;
-	export function write(fd: number, data: any, offset: number, callback?: (err: NodeJS.ErrnoException, written: number, str: string) => void): void;
-	export function write(fd: number, data: any, offset: number, encoding: string, callback?: (err: NodeJS.ErrnoException, written: number, str: string) => void): void;
-	export function writeSync(fd: number, buffer: Buffer, offset: number, length: number, position?: number | null): number;
-	export function writeSync(fd: number, data: any, position?: number | null, enconding?: string): number;
-	export function read(fd: number, buffer: Buffer, offset: number, length: number, position: number | null, callback?: (err: NodeJS.ErrnoException, bytesRead: number, buffer: Buffer) => void): void;
-	export function readSync(fd: number, buffer: Buffer, offset: number, length: number, position: number | null): number;
+    export function lchown(path: PathLike, uid: number, gid: number, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace lchown {
+        /**
+         * Asynchronous lchown(2) - Change ownership of a file. Does not dereference symbolic links.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         */
+        export function __promisify__(path: PathLike, uid: number, gid: number): Promise<void>;
+    }
+
     /**
-     * Asynchronous readFile - Asynchronously reads the entire contents of a file.
-     *
-     * @param fileName
-     * @param encoding
-     * @param callback - The callback is passed two arguments (err, data), where data is the contents of the file.
+     * Synchronous lchown(2) - Change ownership of a file. Does not dereference symbolic links.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
      */
-	export function readFile(filename: string, encoding: null, callback: (err: NodeJS.ErrnoException, data: Buffer) => void): void;
-	export function readFile(filename: string, encoding: string, callback: (err: NodeJS.ErrnoException, data: string) => void): void;
-	export function readFile(filename: string, encoding: string | null, callback: (err: NodeJS.ErrnoException, data: string | Buffer) => void): void;
+    export function lchownSync(path: PathLike, uid: number, gid: number): void;
+
     /**
-     * Asynchronous readFile - Asynchronously reads the entire contents of a file.
-     *
-     * @param fileName
-     * @param options An object with optional {encoding} and {flag} properties.  If {encoding} is specified, readFile returns a string; otherwise it returns a Buffer.
-     * @param callback - The callback is passed two arguments (err, data), where data is the contents of the file.
+     * Asynchronous chmod(2) - Change permissions of a file.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param mode A file mode. If a string is passed, it is parsed as an octal integer.
      */
-	export function readFile(filename: string, options: { encoding: null; flag?: string; }, callback: (err: NodeJS.ErrnoException, data: Buffer) => void): void;
-	export function readFile(filename: string, options: { encoding: string; flag?: string; }, callback: (err: NodeJS.ErrnoException, data: string) => void): void;
-	export function readFile(filename: string, options: { encoding: string | null; flag?: string; }, callback: (err: NodeJS.ErrnoException, data: string | Buffer) => void): void;
+    export function chmod(path: PathLike, mode: string | number, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace chmod {
+        /**
+         * Asynchronous chmod(2) - Change permissions of a file.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param mode A file mode. If a string is passed, it is parsed as an octal integer.
+         */
+        export function __promisify__(path: PathLike, mode: string | number): Promise<void>;
+    }
+
     /**
-     * Asynchronous readFile - Asynchronously reads the entire contents of a file.
-     *
-     * @param fileName
-     * @param options An object with optional {encoding} and {flag} properties.  If {encoding} is specified, readFile returns a string; otherwise it returns a Buffer.
-     * @param callback - The callback is passed two arguments (err, data), where data is the contents of the file.
+     * Synchronous chmod(2) - Change permissions of a file.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param mode A file mode. If a string is passed, it is parsed as an octal integer.
      */
-	export function readFile(filename: string, options: { flag?: string; }, callback: (err: NodeJS.ErrnoException, data: Buffer) => void): void;
+    export function chmodSync(path: PathLike, mode: string | number): void;
+
     /**
-     * Asynchronous readFile - Asynchronously reads the entire contents of a file.
-     *
-     * @param fileName
-     * @param callback - The callback is passed two arguments (err, data), where data is the contents of the file.
+     * Asynchronous fchmod(2) - Change permissions of a file.
+     * @param fd A file descriptor.
+     * @param mode A file mode. If a string is passed, it is parsed as an octal integer.
      */
-	export function readFile(filename: string, callback: (err: NodeJS.ErrnoException, data: Buffer) => void): void;
+    export function fchmod(fd: number, mode: string | number, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace fchmod {
+        /**
+         * Asynchronous fchmod(2) - Change permissions of a file.
+         * @param fd A file descriptor.
+         * @param mode A file mode. If a string is passed, it is parsed as an octal integer.
+         */
+        export function __promisify__(fd: number, mode: string | number): Promise<void>;
+    }
+
     /**
-     * Synchronous readFile - Synchronously reads the entire contents of a file.
-     *
-     * @param fileName
-     * @param encoding
+     * Synchronous fchmod(2) - Change permissions of a file.
+     * @param fd A file descriptor.
+     * @param mode A file mode. If a string is passed, it is parsed as an octal integer.
      */
-	export function readFileSync(filename: string, encoding: null): Buffer;
-	export function readFileSync(filename: string, encoding: string): string;
-	export function readFileSync(filename: string, encoding: string | null): string | Buffer;
+    export function fchmodSync(fd: number, mode: string | number): void;
+
     /**
-     * Synchronous readFile - Synchronously reads the entire contents of a file.
-     *
-     * @param fileName
-     * @param options An object with optional {encoding} and {flag} properties.  If {encoding} is specified, readFileSync returns a string; otherwise it returns a Buffer.
+     * Asynchronous lchmod(2) - Change permissions of a file. Does not dereference symbolic links.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param mode A file mode. If a string is passed, it is parsed as an octal integer.
      */
-	export function readFileSync(filename: string, options: { encoding: null; flag?: string; }): Buffer;
-	export function readFileSync(filename: string, options: { encoding: string; flag?: string; }): string;
-	export function readFileSync(filename: string, options: { encoding: string | null; flag?: string; }): string | Buffer;
+    export function lchmod(path: PathLike, mode: string | number, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace lchmod {
+        /**
+         * Asynchronous lchmod(2) - Change permissions of a file. Does not dereference symbolic links.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param mode A file mode. If a string is passed, it is parsed as an octal integer.
+         */
+        export function __promisify__(path: PathLike, mode: string | number): Promise<void>;
+    }
+
     /**
-     * Synchronous readFile - Synchronously reads the entire contents of a file.
-     *
-     * @param fileName
-     * @param options An object with optional {encoding} and {flag} properties.  If {encoding} is specified, readFileSync returns a string; otherwise it returns a Buffer.
+     * Synchronous lchmod(2) - Change permissions of a file. Does not dereference symbolic links.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param mode A file mode. If a string is passed, it is parsed as an octal integer.
      */
-	export function readFileSync(filename: string, options?: { flag?: string; }): Buffer;
-	export function writeFile(filename: string | number, data: any, callback?: (err: NodeJS.ErrnoException) => void): void;
-	export function writeFile(filename: string | number, data: any, encoding: string, callback: (err: NodeJS.ErrnoException) => void): void;
-	export function writeFile(filename: string | number, data: any, options: { encoding?: string; mode?: number; flag?: string; }, callback?: (err: NodeJS.ErrnoException) => void): void;
-	export function writeFile(filename: string | number, data: any, options: { encoding?: string; mode?: string; flag?: string; }, callback?: (err: NodeJS.ErrnoException) => void): void;
-	export function writeFileSync(filename: string | number, data: any, encoding: string): void;
-	export function writeFileSync(filename: string | number, data: any, options?: { encoding?: string; mode?: number; flag?: string; }): void;
-	export function writeFileSync(filename: string | number, data: any, options?: { encoding?: string; mode?: string; flag?: string; }): void;
-	export function appendFile(filename: string, data: any, encoding: string, callback: (err: NodeJS.ErrnoException) => void): void;
-	export function appendFile(filename: string, data: any, options: { encoding?: string; mode?: number; flag?: string; }, callback?: (err: NodeJS.ErrnoException) => void): void;
-	export function appendFile(filename: string, data: any, options: { encoding?: string; mode?: string; flag?: string; }, callback?: (err: NodeJS.ErrnoException) => void): void;
-	export function appendFile(filename: string, data: any, callback?: (err: NodeJS.ErrnoException) => void): void;
-	export function appendFileSync(filename: string, data: any, encoding: string): void;
-	export function appendFileSync(filename: string, data: any, options?: { encoding?: string; mode?: number; flag?: string; }): void;
-	export function appendFileSync(filename: string, data: any, options?: { encoding?: string; mode?: string; flag?: string; }): void;
-	export function watchFile(filename: string, listener: (curr: Stats, prev: Stats) => void): void;
-	export function watchFile(filename: string, options: { persistent?: boolean; interval?: number; }, listener: (curr: Stats, prev: Stats) => void): void;
-	export function unwatchFile(filename: string, listener?: (curr: Stats, prev: Stats) => void): void;
-	export function watch(filename: string, listener?: (event: string, filename: string) => any): FSWatcher;
-	export function watch(filename: string, encoding: string, listener?: (event: string, filename: string | Buffer) => any): FSWatcher;
-	export function watch(filename: string, options: { persistent?: boolean; recursive?: boolean; encoding?: string }, listener?: (event: string, filename: string | Buffer) => any): FSWatcher;
-	export function exists(path: string | Buffer, callback?: (exists: boolean) => void): void;
-	export function existsSync(path: string | Buffer): boolean;
+    export function lchmodSync(path: PathLike, mode: string | number): void;
 
-	export namespace constants {
-		// File Access Constants
+    /**
+     * Asynchronous stat(2) - Get file status.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     */
+    export function stat(path: PathLike, callback: (err: NodeJS.ErrnoException, stats: Stats) => void): void;
 
-		/** Constant for fs.access(). File is visible to the calling process. */
-		export const F_OK: number;
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace stat {
+        /**
+         * Asynchronous stat(2) - Get file status.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         */
+        export function __promisify__(path: PathLike): Promise<Stats>;
+    }
 
-		/** Constant for fs.access(). File can be read by the calling process. */
-		export const R_OK: number;
+    /**
+     * Synchronous stat(2) - Get file status.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     */
+    export function statSync(path: PathLike): Stats;
 
-		/** Constant for fs.access(). File can be written by the calling process. */
-		export const W_OK: number;
+    /**
+     * Asynchronous fstat(2) - Get file status.
+     * @param fd A file descriptor.
+     */
+    export function fstat(fd: number, callback: (err: NodeJS.ErrnoException, stats: Stats) => void): void;
 
-		/** Constant for fs.access(). File can be executed by the calling process. */
-		export const X_OK: number;
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace fstat {
+        /**
+         * Asynchronous fstat(2) - Get file status.
+         * @param fd A file descriptor.
+         */
+        export function __promisify__(fd: number): Promise<Stats>;
+    }
 
-		// File Open Constants
+    /**
+     * Synchronous fstat(2) - Get file status.
+     * @param fd A file descriptor.
+     */
+    export function fstatSync(fd: number): Stats;
 
-		/** Constant for fs.open(). Flag indicating to open a file for read-only access. */
-		export const O_RDONLY: number;
+    /**
+     * Asynchronous lstat(2) - Get file status. Does not dereference symbolic links.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     */
+    export function lstat(path: PathLike, callback: (err: NodeJS.ErrnoException, stats: Stats) => void): void;
 
-		/** Constant for fs.open(). Flag indicating to open a file for write-only access. */
-		export const O_WRONLY: number;
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace lstat {
+        /**
+         * Asynchronous lstat(2) - Get file status. Does not dereference symbolic links.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         */
+        export function __promisify__(path: PathLike): Promise<Stats>;
+    }
 
-		/** Constant for fs.open(). Flag indicating to open a file for read-write access. */
-		export const O_RDWR: number;
+    /**
+     * Synchronous lstat(2) - Get file status. Does not dereference symbolic links.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     */
+    export function lstatSync(path: PathLike): Stats;
 
-		/** Constant for fs.open(). Flag indicating to create the file if it does not already exist. */
-		export const O_CREAT: number;
+    /**
+     * Asynchronous link(2) - Create a new link (also known as a hard link) to an existing file.
+     * @param existingPath A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param newPath A path to a file. If a URL is provided, it must use the `file:` protocol.
+     */
+    export function link(existingPath: PathLike, newPath: PathLike, callback: (err: NodeJS.ErrnoException) => void): void;
 
-		/** Constant for fs.open(). Flag indicating that opening a file should fail if the O_CREAT flag is set and the file already exists. */
-		export const O_EXCL: number;
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace link {
+        /**
+         * Asynchronous link(2) - Create a new link (also known as a hard link) to an existing file.
+         * @param existingPath A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param newPath A path to a file. If a URL is provided, it must use the `file:` protocol.
+         */
+        export function link(existingPath: PathLike, newPath: PathLike): Promise<void>;
+    }
 
-		/** Constant for fs.open(). Flag indicating that if path identifies a terminal device, opening the path shall not cause that terminal to become the controlling terminal for the process (if the process does not already have one). */
-		export const O_NOCTTY: number;
+    /**
+     * Synchronous link(2) - Create a new link (also known as a hard link) to an existing file.
+     * @param existingPath A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param newPath A path to a file. If a URL is provided, it must use the `file:` protocol.
+     */
+    export function linkSync(existingPath: PathLike, newPath: PathLike): void;
 
-		/** Constant for fs.open(). Flag indicating that if the file exists and is a regular file, and the file is opened successfully for write access, its length shall be truncated to zero. */
-		export const O_TRUNC: number;
+    /**
+     * Asynchronous symlink(2) - Create a new symbolic link to an existing file.
+     * @param target A path to an existing file. If a URL is provided, it must use the `file:` protocol.
+     * @param path A path to the new symlink. If a URL is provided, it must use the `file:` protocol.
+     * @param type May be set to `'dir'`, `'file'`, or `'junction'` (default is `'file'`) and is only available on Windows (ignored on other platforms).
+     * When using `'junction'`, the `target` argument will automatically be normalized to an absolute path.
+     */
+    export function symlink(target: PathLike, path: PathLike, type: symlink.Type | undefined | null, callback: (err: NodeJS.ErrnoException) => void): void;
 
-		/** Constant for fs.open(). Flag indicating that data will be appended to the end of the file. */
-		export const O_APPEND: number;
+    /**
+     * Asynchronous symlink(2) - Create a new symbolic link to an existing file.
+     * @param target A path to an existing file. If a URL is provided, it must use the `file:` protocol.
+     * @param path A path to the new symlink. If a URL is provided, it must use the `file:` protocol.
+     */
+    export function symlink(target: PathLike, path: PathLike, callback: (err: NodeJS.ErrnoException) => void): void;
 
-		/** Constant for fs.open(). Flag indicating that the open should fail if the path is not a directory. */
-		export const O_DIRECTORY: number;
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace symlink {
+        /**
+         * Asynchronous symlink(2) - Create a new symbolic link to an existing file.
+         * @param target A path to an existing file. If a URL is provided, it must use the `file:` protocol.
+         * @param path A path to the new symlink. If a URL is provided, it must use the `file:` protocol.
+         * @param type May be set to `'dir'`, `'file'`, or `'junction'` (default is `'file'`) and is only available on Windows (ignored on other platforms).
+         * When using `'junction'`, the `target` argument will automatically be normalized to an absolute path.
+         */
+        export function __promisify__(target: PathLike, path: PathLike, type?: string | null): Promise<void>;
 
-		/** Constant for fs.open(). Flag indicating reading accesses to the file system will no longer result in an update to the atime information associated with the file. This flag is available on Linux operating systems only. */
-		export const O_NOATIME: number;
+        export type Type = "dir" | "file" | "junction";
+    }
 
-		/** Constant for fs.open(). Flag indicating that the open should fail if the path is a symbolic link. */
-		export const O_NOFOLLOW: number;
+    /**
+     * Synchronous symlink(2) - Create a new symbolic link to an existing file.
+     * @param target A path to an existing file. If a URL is provided, it must use the `file:` protocol.
+     * @param path A path to the new symlink. If a URL is provided, it must use the `file:` protocol.
+     * @param type May be set to `'dir'`, `'file'`, or `'junction'` (default is `'file'`) and is only available on Windows (ignored on other platforms).
+     * When using `'junction'`, the `target` argument will automatically be normalized to an absolute path.
+     */
+    export function symlinkSync(target: PathLike, path: PathLike, type?: symlink.Type | null): void;
 
-		/** Constant for fs.open(). Flag indicating that the file is opened for synchronous I/O. */
-		export const O_SYNC: number;
+    /**
+     * Asynchronous readlink(2) - read value of a symbolic link.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    export function readlink(path: PathLike, options: { encoding?: BufferEncoding | null } | BufferEncoding | undefined | null, callback: (err: NodeJS.ErrnoException, linkString: string) => void): void;
 
-		/** Constant for fs.open(). Flag indicating to open the symbolic link itself rather than the resource it is pointing to. */
-		export const O_SYMLINK: number;
+    /**
+     * Asynchronous readlink(2) - read value of a symbolic link.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    export function readlink(path: PathLike, options: { encoding: "buffer" } | "buffer", callback: (err: NodeJS.ErrnoException, linkString: Buffer) => void): void;
 
-		/** Constant for fs.open(). When set, an attempt will be made to minimize caching effects of file I/O. */
-		export const O_DIRECT: number;
+    /**
+     * Asynchronous readlink(2) - read value of a symbolic link.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    export function readlink(path: PathLike, options: { encoding?: string | null } | string | undefined | null, callback: (err: NodeJS.ErrnoException, linkString: string | Buffer) => void): void;
 
-		/** Constant for fs.open(). Flag indicating to open the file in nonblocking mode when possible. */
-		export const O_NONBLOCK: number;
+    /**
+     * Asynchronous readlink(2) - read value of a symbolic link.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     */
+    export function readlink(path: PathLike, callback: (err: NodeJS.ErrnoException, linkString: string) => void): void;
 
-		// File Type Constants
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace readlink {
+        /**
+         * Asynchronous readlink(2) - read value of a symbolic link.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+         */
+        export function __promisify__(path: PathLike, options?: { encoding?: BufferEncoding | null } | BufferEncoding | null): Promise<string>;
 
-		/** Constant for fs.Stats mode property for determining a file's type. Bit mask used to extract the file type code. */
-		export const S_IFMT: number;
+        /**
+         * Asynchronous readlink(2) - read value of a symbolic link.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+         */
+        export function __promisify__(path: PathLike, options: { encoding: "buffer" } | "buffer"): Promise<Buffer>;
 
-		/** Constant for fs.Stats mode property for determining a file's type. File type constant for a regular file. */
-		export const S_IFREG: number;
+        /**
+         * Asynchronous readlink(2) - read value of a symbolic link.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+         */
+        export function __promisify__(path: PathLike, options?: { encoding?: string | null } | string | null): Promise<string | Buffer>;
+    }
 
-		/** Constant for fs.Stats mode property for determining a file's type. File type constant for a directory. */
-		export const S_IFDIR: number;
+    /**
+     * Synchronous readlink(2) - read value of a symbolic link.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    export function readlinkSync(path: PathLike, options?: { encoding?: BufferEncoding | null } | BufferEncoding | null): string;
 
-		/** Constant for fs.Stats mode property for determining a file's type. File type constant for a character-oriented device file. */
-		export const S_IFCHR: number;
+    /**
+     * Synchronous readlink(2) - read value of a symbolic link.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    export function readlinkSync(path: PathLike, options: { encoding: "buffer" } | "buffer"): Buffer;
 
-		/** Constant for fs.Stats mode property for determining a file's type. File type constant for a block-oriented device file. */
-		export const S_IFBLK: number;
+    /**
+     * Synchronous readlink(2) - read value of a symbolic link.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    export function readlinkSync(path: PathLike, options?: { encoding?: string | null } | string | null): string | Buffer;
 
-		/** Constant for fs.Stats mode property for determining a file's type. File type constant for a FIFO/pipe. */
-		export const S_IFIFO: number;
+    /**
+     * Asynchronous realpath(3) - return the canonicalized absolute pathname.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    export function realpath(path: PathLike, options: { encoding?: BufferEncoding | null } | BufferEncoding | undefined | null, callback: (err: NodeJS.ErrnoException, resolvedPath: string) => void): void;
 
-		/** Constant for fs.Stats mode property for determining a file's type. File type constant for a symbolic link. */
-		export const S_IFLNK: number;
+    /**
+     * Asynchronous realpath(3) - return the canonicalized absolute pathname.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    export function realpath(path: PathLike, options: { encoding: "buffer" } | "buffer", callback: (err: NodeJS.ErrnoException, resolvedPath: Buffer) => void): void;
 
-		/** Constant for fs.Stats mode property for determining a file's type. File type constant for a socket. */
-		export const S_IFSOCK: number;
+    /**
+     * Asynchronous realpath(3) - return the canonicalized absolute pathname.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    export function realpath(path: PathLike, options: { encoding?: string | null } | string | undefined | null, callback: (err: NodeJS.ErrnoException, resolvedPath: string | Buffer) => void): void;
 
-		// File Mode Constants
+    /**
+     * Asynchronous realpath(3) - return the canonicalized absolute pathname.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     */
+    export function realpath(path: PathLike, callback: (err: NodeJS.ErrnoException, resolvedPath: string) => void): void;
 
-		/** Constant for fs.Stats mode property for determining access permissions for a file. File mode indicating readable, writable and executable by owner. */
-		export const S_IRWXU: number;
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace realpath {
+        /**
+         * Asynchronous realpath(3) - return the canonicalized absolute pathname.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+         */
+        export function __promisify__(path: PathLike, options?: { encoding?: BufferEncoding | null } | BufferEncoding | null): Promise<string>;
 
-		/** Constant for fs.Stats mode property for determining access permissions for a file. File mode indicating readable by owner. */
-		export const S_IRUSR: number;
+        /**
+         * Asynchronous realpath(3) - return the canonicalized absolute pathname.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+         */
+        export function __promisify__(path: PathLike, options: { encoding: "buffer" } | "buffer"): Promise<Buffer>;
 
-		/** Constant for fs.Stats mode property for determining access permissions for a file. File mode indicating writable by owner. */
-		export const S_IWUSR: number;
+        /**
+         * Asynchronous realpath(3) - return the canonicalized absolute pathname.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+         */
+        export function __promisify__(path: PathLike, options?: { encoding?: string | null } | string | null): Promise<string | Buffer>;
+    }
 
-		/** Constant for fs.Stats mode property for determining access permissions for a file. File mode indicating executable by owner. */
-		export const S_IXUSR: number;
+    /**
+     * Synchronous realpath(3) - return the canonicalized absolute pathname.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    export function realpathSync(path: PathLike, options?: { encoding?: BufferEncoding | null } | BufferEncoding | null): string;
 
-		/** Constant for fs.Stats mode property for determining access permissions for a file. File mode indicating readable, writable and executable by group. */
-		export const S_IRWXG: number;
+    /**
+     * Synchronous realpath(3) - return the canonicalized absolute pathname.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    export function realpathSync(path: PathLike, options: { encoding: "buffer" } | "buffer"): Buffer;
 
-		/** Constant for fs.Stats mode property for determining access permissions for a file. File mode indicating readable by group. */
-		export const S_IRGRP: number;
+    /**
+     * Synchronous realpath(3) - return the canonicalized absolute pathname.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    export function realpathSync(path: PathLike, options?: { encoding?: string | null } | string | null): string | Buffer;
 
-		/** Constant for fs.Stats mode property for determining access permissions for a file. File mode indicating writable by group. */
-		export const S_IWGRP: number;
+    /**
+     * Asynchronous unlink(2) - delete a name and possibly the file it refers to.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     */
+    export function unlink(path: PathLike, callback: (err: NodeJS.ErrnoException) => void): void;
 
-		/** Constant for fs.Stats mode property for determining access permissions for a file. File mode indicating executable by group. */
-		export const S_IXGRP: number;
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace unlink {
+        /**
+         * Asynchronous unlink(2) - delete a name and possibly the file it refers to.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         */
+        export function __promisify__(path: PathLike): Promise<void>;
+    }
 
-		/** Constant for fs.Stats mode property for determining access permissions for a file. File mode indicating readable, writable and executable by others. */
-		export const S_IRWXO: number;
+    /**
+     * Synchronous unlink(2) - delete a name and possibly the file it refers to.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     */
+    export function unlinkSync(path: PathLike): void;
 
-		/** Constant for fs.Stats mode property for determining access permissions for a file. File mode indicating readable by others. */
-		export const S_IROTH: number;
+    /**
+     * Asynchronous rmdir(2) - delete a directory.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     */
+    export function rmdir(path: PathLike, callback: (err: NodeJS.ErrnoException) => void): void;
 
-		/** Constant for fs.Stats mode property for determining access permissions for a file. File mode indicating writable by others. */
-		export const S_IWOTH: number;
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace rmdir {
+        /**
+         * Asynchronous rmdir(2) - delete a directory.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         */
+        export function __promisify__(path: PathLike): Promise<void>;
+    }
 
-		/** Constant for fs.Stats mode property for determining access permissions for a file. File mode indicating executable by others. */
-		export const S_IXOTH: number;
-	}
+    /**
+     * Synchronous rmdir(2) - delete a directory.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     */
+    export function rmdirSync(path: PathLike): void;
 
-	/** Tests a user's permissions for the file specified by path. */
-	export function access(path: string | Buffer, callback: (err: NodeJS.ErrnoException) => void): void;
-	export function access(path: string | Buffer, mode: number, callback: (err: NodeJS.ErrnoException) => void): void;
-	/** Synchronous version of fs.access. This throws if any accessibility checks fail, and does nothing otherwise. */
-	export function accessSync(path: string | Buffer, mode?: number): void;
-	export function createReadStream(path: string | Buffer, options?: {
-		flags?: string;
-		encoding?: string;
-		fd?: number;
-		mode?: number;
-		autoClose?: boolean;
-		start?: number;
-		end?: number;
-	}): ReadStream;
-	export function createWriteStream(path: string | Buffer, options?: {
-		flags?: string;
-		encoding?: string;
-		fd?: number;
-		mode?: number;
-		autoClose?: boolean;
-		start?: number;
-	}): WriteStream;
-	export function fdatasync(fd: number, callback: Function): void;
-	export function fdatasyncSync(fd: number): void;
+    /**
+     * Asynchronous mkdir(2) - create a directory.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param mode A file mode. If a string is passed, it is parsed as an octal integer. If not specified, defaults to `0o777`.
+     */
+    export function mkdir(path: PathLike, mode: number | string | undefined | null, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    /**
+     * Asynchronous mkdir(2) - create a directory with a mode of `0o777`.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     */
+    export function mkdir(path: PathLike, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace mkdir {
+        /**
+         * Asynchronous mkdir(2) - create a directory.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param mode A file mode. If a string is passed, it is parsed as an octal integer. If not specified, defaults to `0o777`.
+         */
+        export function __promisify__(path: PathLike, mode?: number | string | null): Promise<void>;
+    }
+
+    /**
+     * Synchronous mkdir(2) - create a directory.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param mode A file mode. If a string is passed, it is parsed as an octal integer. If not specified, defaults to `0o777`.
+     */
+    export function mkdirSync(path: PathLike, mode?: number | string | null): void;
+
+    /**
+     * Asynchronously creates a unique temporary directory.
+     * Generates six random characters to be appended behind a required prefix to create a unique temporary directory.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    export function mkdtemp(prefix: string, options: { encoding?: BufferEncoding | null } | BufferEncoding | undefined | null, callback: (err: NodeJS.ErrnoException, folder: string) => void): void;
+
+    /**
+     * Asynchronously creates a unique temporary directory.
+     * Generates six random characters to be appended behind a required prefix to create a unique temporary directory.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    export function mkdtemp(prefix: string, options: "buffer" | { encoding: "buffer" }, callback: (err: NodeJS.ErrnoException, folder: Buffer) => void): void;
+
+    /**
+     * Asynchronously creates a unique temporary directory.
+     * Generates six random characters to be appended behind a required prefix to create a unique temporary directory.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    export function mkdtemp(prefix: string, options: { encoding?: string | null } | string | undefined | null, callback: (err: NodeJS.ErrnoException, folder: string | Buffer) => void): void;
+
+    /**
+     * Asynchronously creates a unique temporary directory.
+     * Generates six random characters to be appended behind a required prefix to create a unique temporary directory.
+     */
+    export function mkdtemp(prefix: string, callback: (err: NodeJS.ErrnoException, folder: string) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace mkdtemp {
+        /**
+         * Asynchronously creates a unique temporary directory.
+         * Generates six random characters to be appended behind a required prefix to create a unique temporary directory.
+         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+         */
+        export function __promisify__(prefix: string, options?: { encoding?: BufferEncoding | null } | BufferEncoding | null): Promise<string>;
+
+        /**
+         * Asynchronously creates a unique temporary directory.
+         * Generates six random characters to be appended behind a required prefix to create a unique temporary directory.
+         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+         */
+        export function __promisify__(prefix: string, options: { encoding: "buffer" } | "buffer"): Promise<Buffer>;
+
+        /**
+         * Asynchronously creates a unique temporary directory.
+         * Generates six random characters to be appended behind a required prefix to create a unique temporary directory.
+         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+         */
+        export function __promisify__(prefix: string, options?: { encoding?: string | null } | string | null): Promise<string | Buffer>;
+    }
+
+    /**
+     * Synchronously creates a unique temporary directory.
+     * Generates six random characters to be appended behind a required prefix to create a unique temporary directory.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    export function mkdtempSync(prefix: string, options?: { encoding?: BufferEncoding | null } | BufferEncoding | null): string;
+
+    /**
+     * Synchronously creates a unique temporary directory.
+     * Generates six random characters to be appended behind a required prefix to create a unique temporary directory.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    export function mkdtempSync(prefix: string, options: { encoding: "buffer" } | "buffer"): Buffer;
+
+    /**
+     * Synchronously creates a unique temporary directory.
+     * Generates six random characters to be appended behind a required prefix to create a unique temporary directory.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    export function mkdtempSync(prefix: string, options?: { encoding?: string | null } | string | null): string | Buffer;
+
+    /**
+     * Asynchronous readdir(3) - read a directory.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    export function readdir(path: PathLike, options: { encoding: BufferEncoding | null } | BufferEncoding | undefined | null, callback: (err: NodeJS.ErrnoException, files: string[]) => void): void;
+
+    /**
+     * Asynchronous readdir(3) - read a directory.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    export function readdir(path: PathLike, options: { encoding: "buffer" } | "buffer", callback: (err: NodeJS.ErrnoException, files: Buffer[]) => void): void;
+
+    /**
+     * Asynchronous readdir(3) - read a directory.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    export function readdir(path: PathLike, options: { encoding?: string | null } | string | undefined | null, callback: (err: NodeJS.ErrnoException, files: string[] | Buffer[]) => void): void;
+
+    /**
+     * Asynchronous readdir(3) - read a directory.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     */
+    export function readdir(path: PathLike, callback: (err: NodeJS.ErrnoException, files: string[]) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace readdir {
+        /**
+         * Asynchronous readdir(3) - read a directory.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+         */
+        export function __promisify__(path: PathLike, options?: { encoding: BufferEncoding | null } | BufferEncoding | null): Promise<string[]>;
+
+        /**
+         * Asynchronous readdir(3) - read a directory.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+         */
+        export function __promisify__(path: PathLike, options: "buffer" | { encoding: "buffer" }): Promise<Buffer[]>;
+
+        /**
+         * Asynchronous readdir(3) - read a directory.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+         */
+        export function __promisify__(path: PathLike, options?: { encoding?: string | null } | string | null): Promise<string[] | Buffer[]>;
+    }
+
+    /**
+     * Synchronous readdir(3) - read a directory.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    export function readdirSync(path: PathLike, options?: { encoding: BufferEncoding | null } | BufferEncoding | null): string[];
+
+    /**
+     * Synchronous readdir(3) - read a directory.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    export function readdirSync(path: PathLike, options: { encoding: "buffer" } | "buffer"): Buffer[];
+
+    /**
+     * Synchronous readdir(3) - read a directory.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    export function readdirSync(path: PathLike, options?: { encoding?: string | null } | string | null): string[] | Buffer[];
+
+    /**
+     * Asynchronous close(2) - close a file descriptor.
+     * @param fd A file descriptor.
+     */
+    export function close(fd: number, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace close {
+        /**
+         * Asynchronous close(2) - close a file descriptor.
+         * @param fd A file descriptor.
+         */
+        export function __promisify__(fd: number): Promise<void>;
+    }
+
+    /**
+     * Synchronous close(2) - close a file descriptor.
+     * @param fd A file descriptor.
+     */
+    export function closeSync(fd: number): void;
+
+    /**
+     * Asynchronous open(2) - open and possibly create a file.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param mode A file mode. If a string is passed, it is parsed as an octal integer. If not supplied, defaults to `0o666`.
+     */
+    export function open(path: PathLike, flags: string | number, mode: string | number | undefined | null, callback: (err: NodeJS.ErrnoException, fd: number) => void): void;
+
+    /**
+     * Asynchronous open(2) - open and possibly create a file. If the file is created, its mode will be `0o666`.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     */
+    export function open(path: PathLike, flags: string | number, callback: (err: NodeJS.ErrnoException, fd: number) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace open {
+        /**
+         * Asynchronous open(2) - open and possibly create a file.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param mode A file mode. If a string is passed, it is parsed as an octal integer. If not supplied, defaults to `0o666`.
+         */
+        export function __promisify__(path: PathLike, flags: string | number, mode?: string | number | null): Promise<number>;
+    }
+
+    /**
+     * Synchronous open(2) - open and possibly create a file, returning a file descriptor..
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param mode A file mode. If a string is passed, it is parsed as an octal integer. If not supplied, defaults to `0o666`.
+     */
+    export function openSync(path: PathLike, flags: string | number, mode?: string | number | null): number;
+
+    /**
+     * Asynchronously change file timestamps of the file referenced by the supplied path.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param atime The last access time. If a string is provided, it will be coerced to number.
+     * @param mtime The last modified time. If a string is provided, it will be coerced to number.
+     */
+    export function utimes(path: PathLike, atime: string | number | Date, mtime: string | number | Date, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace utimes {
+        /**
+         * Asynchronously change file timestamps of the file referenced by the supplied path.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param atime The last access time. If a string is provided, it will be coerced to number.
+         * @param mtime The last modified time. If a string is provided, it will be coerced to number.
+         */
+        export function __promisify__(path: PathLike, atime: string | number | Date, mtime: string | number | Date): Promise<void>;
+    }
+
+    /**
+     * Synchronously change file timestamps of the file referenced by the supplied path.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * @param atime The last access time. If a string is provided, it will be coerced to number.
+     * @param mtime The last modified time. If a string is provided, it will be coerced to number.
+     */
+    export function utimesSync(path: PathLike, atime: string | number | Date, mtime: string | number | Date): void;
+
+    /**
+     * Asynchronously change file timestamps of the file referenced by the supplied file descriptor.
+     * @param fd A file descriptor.
+     * @param atime The last access time. If a string is provided, it will be coerced to number.
+     * @param mtime The last modified time. If a string is provided, it will be coerced to number.
+     */
+    export function futimes(fd: number, atime: string | number | Date, mtime: string | number | Date, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace futimes {
+        /**
+         * Asynchronously change file timestamps of the file referenced by the supplied file descriptor.
+         * @param fd A file descriptor.
+         * @param atime The last access time. If a string is provided, it will be coerced to number.
+         * @param mtime The last modified time. If a string is provided, it will be coerced to number.
+         */
+        export function __promisify__(fd: number, atime: string | number | Date, mtime: string | number | Date): Promise<void>;
+    }
+
+    /**
+     * Synchronously change file timestamps of the file referenced by the supplied file descriptor.
+     * @param fd A file descriptor.
+     * @param atime The last access time. If a string is provided, it will be coerced to number.
+     * @param mtime The last modified time. If a string is provided, it will be coerced to number.
+     */
+    export function futimesSync(fd: number, atime: string | number | Date, mtime: string | number | Date): void;
+
+    /**
+     * Asynchronous fsync(2) - synchronize a file's in-core state with the underlying storage device.
+     * @param fd A file descriptor.
+     */
+    export function fsync(fd: number, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace fsync {
+        /**
+         * Asynchronous fsync(2) - synchronize a file's in-core state with the underlying storage device.
+         * @param fd A file descriptor.
+         */
+        export function __promisify__(fd: number): Promise<void>;
+    }
+
+    /**
+     * Synchronous fsync(2) - synchronize a file's in-core state with the underlying storage device.
+     * @param fd A file descriptor.
+     */
+    export function fsyncSync(fd: number): void;
+
+    /**
+     * Asynchronously writes `buffer` to the file referenced by the supplied file descriptor.
+     * @param fd A file descriptor.
+     * @param offset The part of the buffer to be written. If not supplied, defaults to `0`.
+     * @param length The number of bytes to write. If not supplied, defaults to `buffer.length - offset`.
+     * @param position The offset from the beginning of the file where this data should be written. If not supplied, defaults to the current position.
+     */
+    export function write<TBuffer extends Buffer | Uint8Array>(fd: number, buffer: TBuffer, offset: number | undefined | null, length: number | undefined | null, position: number | undefined | null, callback: (err: NodeJS.ErrnoException, written: number, buffer: TBuffer) => void): void;
+
+    /**
+     * Asynchronously writes `buffer` to the file referenced by the supplied file descriptor.
+     * @param fd A file descriptor.
+     * @param offset The part of the buffer to be written. If not supplied, defaults to `0`.
+     * @param length The number of bytes to write. If not supplied, defaults to `buffer.length - offset`.
+     */
+    export function write<TBuffer extends Buffer | Uint8Array>(fd: number, buffer: TBuffer, offset: number | undefined | null, length: number | undefined | null, callback: (err: NodeJS.ErrnoException, written: number, buffer: TBuffer) => void): void;
+
+    /**
+     * Asynchronously writes `buffer` to the file referenced by the supplied file descriptor.
+     * @param fd A file descriptor.
+     * @param offset The part of the buffer to be written. If not supplied, defaults to `0`.
+     */
+    export function write<TBuffer extends Buffer | Uint8Array>(fd: number, buffer: TBuffer, offset: number | undefined | null, callback: (err: NodeJS.ErrnoException, written: number, buffer: TBuffer) => void): void;
+
+    /**
+     * Asynchronously writes `buffer` to the file referenced by the supplied file descriptor.
+     * @param fd A file descriptor.
+     */
+    export function write<TBuffer extends Buffer | Uint8Array>(fd: number, buffer: TBuffer, callback: (err: NodeJS.ErrnoException, written: number, buffer: TBuffer) => void): void;
+
+    /**
+     * Asynchronously writes `string` to the file referenced by the supplied file descriptor.
+     * @param fd A file descriptor.
+     * @param string A string to write. If something other than a string is supplied it will be coerced to a string.
+     * @param position The offset from the beginning of the file where this data should be written. If not supplied, defaults to the current position.
+     * @param encoding The expected string encoding.
+     */
+    export function write(fd: number, string: any, position: number | undefined | null, encoding: string | undefined | null, callback: (err: NodeJS.ErrnoException, written: number, str: string) => void): void;
+
+    /**
+     * Asynchronously writes `string` to the file referenced by the supplied file descriptor.
+     * @param fd A file descriptor.
+     * @param string A string to write. If something other than a string is supplied it will be coerced to a string.
+     * @param position The offset from the beginning of the file where this data should be written. If not supplied, defaults to the current position.
+     */
+    export function write(fd: number, string: any, position: number | undefined | null, callback: (err: NodeJS.ErrnoException, written: number, str: string) => void): void;
+
+    /**
+     * Asynchronously writes `string` to the file referenced by the supplied file descriptor.
+     * @param fd A file descriptor.
+     * @param string A string to write. If something other than a string is supplied it will be coerced to a string.
+     */
+    export function write(fd: number, string: any, callback: (err: NodeJS.ErrnoException, written: number, str: string) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace write {
+        /**
+         * Asynchronously writes `buffer` to the file referenced by the supplied file descriptor.
+         * @param fd A file descriptor.
+         * @param offset The part of the buffer to be written. If not supplied, defaults to `0`.
+         * @param length The number of bytes to write. If not supplied, defaults to `buffer.length - offset`.
+         * @param position The offset from the beginning of the file where this data should be written. If not supplied, defaults to the current position.
+         */
+        export function __promisify__<TBuffer extends Buffer | Uint8Array>(fd: number, buffer?: TBuffer, offset?: number, length?: number, position?: number | null): Promise<{ bytesWritten: number, buffer: TBuffer }>;
+
+        /**
+         * Asynchronously writes `string` to the file referenced by the supplied file descriptor.
+         * @param fd A file descriptor.
+         * @param string A string to write. If something other than a string is supplied it will be coerced to a string.
+         * @param position The offset from the beginning of the file where this data should be written. If not supplied, defaults to the current position.
+         * @param encoding The expected string encoding.
+         */
+        export function __promisify__(fd: number, string: any, position?: number | null, encoding?: string | null): Promise<{ bytesWritten: number, buffer: string }>;
+    }
+
+    /**
+     * Synchronously writes `buffer` to the file referenced by the supplied file descriptor, returning the number of bytes written.
+     * @param fd A file descriptor.
+     * @param offset The part of the buffer to be written. If not supplied, defaults to `0`.
+     * @param length The number of bytes to write. If not supplied, defaults to `buffer.length - offset`.
+     * @param position The offset from the beginning of the file where this data should be written. If not supplied, defaults to the current position.
+     */
+    export function writeSync(fd: number, buffer: Buffer | Uint8Array, offset?: number | null, length?: number | null, position?: number | null): number;
+
+    /**
+     * Synchronously writes `string` to the file referenced by the supplied file descriptor, returning the number of bytes written.
+     * @param fd A file descriptor.
+     * @param string A string to write. If something other than a string is supplied it will be coerced to a string.
+     * @param position The offset from the beginning of the file where this data should be written. If not supplied, defaults to the current position.
+     * @param encoding The expected string encoding.
+     */
+    export function writeSync(fd: number, string: any, position?: number | null, encoding?: string | null): number;
+
+    /**
+     * Asynchronously reads data from the file referenced by the supplied file descriptor.
+     * @param fd A file descriptor.
+     * @param buffer The buffer that the data will be written to.
+     * @param offset The offset in the buffer at which to start writing.
+     * @param length The number of bytes to read.
+     * @param position The offset from the beginning of the file from which data should be read. If `null`, data will be read from the current position.
+     */
+    export function read<TBuffer extends Buffer | Uint8Array>(fd: number, buffer: TBuffer, offset: number, length: number, position: number | null, callback?: (err: NodeJS.ErrnoException, bytesRead: number, buffer: TBuffer) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace read {
+        /**
+         * @param fd A file descriptor.
+         * @param buffer The buffer that the data will be written to.
+         * @param offset The offset in the buffer at which to start writing.
+         * @param length The number of bytes to read.
+         * @param position The offset from the beginning of the file from which data should be read. If `null`, data will be read from the current position.
+         */
+        export function __promisify__<TBuffer extends Buffer | Uint8Array>(fd: number, buffer: TBuffer, offset: number, length: number, position: number | null): Promise<{ bytesRead: number, buffer: TBuffer }>;
+    }
+
+    /**
+     * Synchronously reads data from the file referenced by the supplied file descriptor, returning the number of bytes read.
+     * @param fd A file descriptor.
+     * @param buffer The buffer that the data will be written to.
+     * @param offset The offset in the buffer at which to start writing.
+     * @param length The number of bytes to read.
+     * @param position The offset from the beginning of the file from which data should be read. If `null`, data will be read from the current position.
+     */
+    export function readSync(fd: number, buffer: Buffer | Uint8Array, offset: number, length: number, position: number | null): number;
+
+    /**
+     * Asynchronously reads the entire contents of a file.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * If a file descriptor is provided, the underlying file will _not_ be closed automatically.
+     * @param options An object that may contain an optional flag.
+     * If a flag is not provided, it defaults to `'r'`.
+     */
+    export function readFile(path: PathLike | number, options: { encoding?: null; flag?: string; } | undefined | null, callback: (err: NodeJS.ErrnoException, data: Buffer) => void): void;
+
+    /**
+     * Asynchronously reads the entire contents of a file.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     * If a file descriptor is provided, the underlying file will _not_ be closed automatically.
+     * @param options Either the encoding for the result, or an object that contains the encoding and an optional flag.
+     * If a flag is not provided, it defaults to `'r'`.
+     */
+    export function readFile(path: PathLike | number, options: { encoding: string; flag?: string; } | string, callback: (err: NodeJS.ErrnoException, data: string) => void): void;
+
+    /**
+     * Asynchronously reads the entire contents of a file.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     * If a file descriptor is provided, the underlying file will _not_ be closed automatically.
+     * @param options Either the encoding for the result, or an object that contains the encoding and an optional flag.
+     * If a flag is not provided, it defaults to `'r'`.
+     */
+    export function readFile(path: PathLike | number, options: { encoding?: string | null; flag?: string; } | string | undefined | null, callback: (err: NodeJS.ErrnoException, data: string | Buffer) => void): void;
+
+    /**
+     * Asynchronously reads the entire contents of a file.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * If a file descriptor is provided, the underlying file will _not_ be closed automatically.
+     */
+    export function readFile(path: PathLike | number, callback: (err: NodeJS.ErrnoException, data: Buffer) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace readFile {
+        /**
+         * Asynchronously reads the entire contents of a file.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * If a file descriptor is provided, the underlying file will _not_ be closed automatically.
+         * @param options An object that may contain an optional flag.
+         * If a flag is not provided, it defaults to `'r'`.
+         */
+        export function __promisify__(path: PathLike | number, options?: { encoding?: null; flag?: string; } | null): Promise<Buffer>;
+
+        /**
+         * Asynchronously reads the entire contents of a file.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * URL support is _experimental_.
+         * If a file descriptor is provided, the underlying file will _not_ be closed automatically.
+         * @param options Either the encoding for the result, or an object that contains the encoding and an optional flag.
+         * If a flag is not provided, it defaults to `'r'`.
+         */
+        export function __promisify__(path: PathLike | number, options: { encoding: string; flag?: string; } | string): Promise<string>;
+
+        /**
+         * Asynchronously reads the entire contents of a file.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * URL support is _experimental_.
+         * If a file descriptor is provided, the underlying file will _not_ be closed automatically.
+         * @param options Either the encoding for the result, or an object that contains the encoding and an optional flag.
+         * If a flag is not provided, it defaults to `'r'`.
+         */
+        export function __promisify__(path: PathLike | number, options?: { encoding?: string | null; flag?: string; } | string | null): Promise<string | Buffer>;
+    }
+
+    /**
+     * Synchronously reads the entire contents of a file.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     * If a file descriptor is provided, the underlying file will _not_ be closed automatically.
+     * @param options An object that may contain an optional flag. If a flag is not provided, it defaults to `'r'`.
+     */
+    export function readFileSync(path: PathLike | number, options?: { encoding?: null; flag?: string; } | null): Buffer;
+
+    /**
+     * Synchronously reads the entire contents of a file.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     * If a file descriptor is provided, the underlying file will _not_ be closed automatically.
+     * @param options Either the encoding for the result, or an object that contains the encoding and an optional flag.
+     * If a flag is not provided, it defaults to `'r'`.
+     */
+    export function readFileSync(path: PathLike | number, options: { encoding: string; flag?: string; } | string): string;
+
+    /**
+     * Synchronously reads the entire contents of a file.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     * If a file descriptor is provided, the underlying file will _not_ be closed automatically.
+     * @param options Either the encoding for the result, or an object that contains the encoding and an optional flag.
+     * If a flag is not provided, it defaults to `'r'`.
+     */
+    export function readFileSync(path: PathLike | number, options?: { encoding?: string | null; flag?: string; } | string | null): string | Buffer;
+
+    /**
+     * Asynchronously writes data to a file, replacing the file if it already exists.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     * If a file descriptor is provided, the underlying file will _not_ be closed automatically.
+     * @param data The data to write. If something other than a Buffer or Uint8Array is provided, the value is coerced to a string.
+     * @param options Either the encoding for the file, or an object optionally specifying the encoding, file mode, and flag.
+     * If `encoding` is not supplied, the default of `'utf8'` is used.
+     * If `mode` is not supplied, the default of `0o666` is used.
+     * If `mode` is a string, it is parsed as an octal integer.
+     * If `flag` is not supplied, the default of `'w'` is used.
+     */
+    export function writeFile(path: PathLike | number, data: any, options: { encoding?: string | null; mode?: number | string; flag?: string; } | string | undefined | null, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    /**
+     * Asynchronously writes data to a file, replacing the file if it already exists.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     * If a file descriptor is provided, the underlying file will _not_ be closed automatically.
+     * @param data The data to write. If something other than a Buffer or Uint8Array is provided, the value is coerced to a string.
+     */
+    export function writeFile(path: PathLike | number, data: any, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace writeFile {
+        /**
+         * Asynchronously writes data to a file, replacing the file if it already exists.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * URL support is _experimental_.
+         * If a file descriptor is provided, the underlying file will _not_ be closed automatically.
+         * @param data The data to write. If something other than a Buffer or Uint8Array is provided, the value is coerced to a string.
+         * @param options Either the encoding for the file, or an object optionally specifying the encoding, file mode, and flag.
+         * If `encoding` is not supplied, the default of `'utf8'` is used.
+         * If `mode` is not supplied, the default of `0o666` is used.
+         * If `mode` is a string, it is parsed as an octal integer.
+         * If `flag` is not supplied, the default of `'w'` is used.
+         */
+        export function __promisify__(path: PathLike | number, data: any, options?: { encoding?: string | null; mode?: number | string; flag?: string; } | string | null): Promise<void>;
+    }
+
+    /**
+     * Synchronously writes data to a file, replacing the file if it already exists.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     * If a file descriptor is provided, the underlying file will _not_ be closed automatically.
+     * @param data The data to write. If something other than a Buffer or Uint8Array is provided, the value is coerced to a string.
+     * @param options Either the encoding for the file, or an object optionally specifying the encoding, file mode, and flag.
+     * If `encoding` is not supplied, the default of `'utf8'` is used.
+     * If `mode` is not supplied, the default of `0o666` is used.
+     * If `mode` is a string, it is parsed as an octal integer.
+     * If `flag` is not supplied, the default of `'w'` is used.
+     */
+    export function writeFileSync(path: PathLike | number, data: any, options?: { encoding?: string | null; mode?: number | string; flag?: string; } | string | null): void;
+
+    /**
+     * Asynchronously append data to a file, creating the file if it does not exist.
+     * @param file A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     * If a file descriptor is provided, the underlying file will _not_ be closed automatically.
+     * @param data The data to write. If something other than a Buffer or Uint8Array is provided, the value is coerced to a string.
+     * @param options Either the encoding for the file, or an object optionally specifying the encoding, file mode, and flag.
+     * If `encoding` is not supplied, the default of `'utf8'` is used.
+     * If `mode` is not supplied, the default of `0o666` is used.
+     * If `mode` is a string, it is parsed as an octal integer.
+     * If `flag` is not supplied, the default of `'a'` is used.
+     */
+    export function appendFile(file: PathLike | number, data: any, options: { encoding?: string | null, mode?: string | number, flag?: string } | string | undefined | null, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    /**
+     * Asynchronously append data to a file, creating the file if it does not exist.
+     * @param file A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     * If a file descriptor is provided, the underlying file will _not_ be closed automatically.
+     * @param data The data to write. If something other than a Buffer or Uint8Array is provided, the value is coerced to a string.
+     */
+    export function appendFile(file: PathLike | number, data: any, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace appendFile {
+        /**
+         * Asynchronously append data to a file, creating the file if it does not exist.
+         * @param file A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * URL support is _experimental_.
+         * If a file descriptor is provided, the underlying file will _not_ be closed automatically.
+         * @param data The data to write. If something other than a Buffer or Uint8Array is provided, the value is coerced to a string.
+         * @param options Either the encoding for the file, or an object optionally specifying the encoding, file mode, and flag.
+         * If `encoding` is not supplied, the default of `'utf8'` is used.
+         * If `mode` is not supplied, the default of `0o666` is used.
+         * If `mode` is a string, it is parsed as an octal integer.
+         * If `flag` is not supplied, the default of `'a'` is used.
+         */
+        export function __promisify__(file: PathLike | number, data: any, options?: { encoding?: string | null, mode?: string | number, flag?: string } | string | null): Promise<void>;
+    }
+
+    /**
+     * Synchronously append data to a file, creating the file if it does not exist.
+     * @param file A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     * If a file descriptor is provided, the underlying file will _not_ be closed automatically.
+     * @param data The data to write. If something other than a Buffer or Uint8Array is provided, the value is coerced to a string.
+     * @param options Either the encoding for the file, or an object optionally specifying the encoding, file mode, and flag.
+     * If `encoding` is not supplied, the default of `'utf8'` is used.
+     * If `mode` is not supplied, the default of `0o666` is used.
+     * If `mode` is a string, it is parsed as an octal integer.
+     * If `flag` is not supplied, the default of `'a'` is used.
+     */
+    export function appendFileSync(file: PathLike | number, data: any, options?: { encoding?: string | null; mode?: number | string; flag?: string; } | string | null): void;
+
+    /**
+     * Watch for changes on `filename`. The callback `listener` will be called each time the file is accessed.
+     */
+    export function watchFile(filename: PathLike, options: { persistent?: boolean; interval?: number; } | undefined, listener: (curr: Stats, prev: Stats) => void): void;
+
+    /**
+     * Watch for changes on `filename`. The callback `listener` will be called each time the file is accessed.
+     * @param filename A path to a file or directory. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     */
+    export function watchFile(filename: PathLike, listener: (curr: Stats, prev: Stats) => void): void;
+
+    /**
+     * Stop watching for changes on `filename`.
+     * @param filename A path to a file or directory. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     */
+    export function unwatchFile(filename: PathLike, listener?: (curr: Stats, prev: Stats) => void): void;
+
+    /**
+     * Watch for changes on `filename`, where `filename` is either a file or a directory, returning an `FSWatcher`.
+     * @param filename A path to a file or directory. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     * @param options Either the encoding for the filename provided to the listener, or an object optionally specifying encoding, persistent, and recursive options.
+     * If `encoding` is not supplied, the default of `'utf8'` is used.
+     * If `persistent` is not supplied, the default of `true` is used.
+     * If `recursive` is not supplied, the default of `false` is used.
+     */
+    export function watch(filename: PathLike, options: { encoding?: BufferEncoding | null, persistent?: boolean, recursive?: boolean } | BufferEncoding | undefined | null, listener?: (event: string, filename: string) => void): FSWatcher;
+
+    /**
+     * Watch for changes on `filename`, where `filename` is either a file or a directory, returning an `FSWatcher`.
+     * @param filename A path to a file or directory. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     * @param options Either the encoding for the filename provided to the listener, or an object optionally specifying encoding, persistent, and recursive options.
+     * If `encoding` is not supplied, the default of `'utf8'` is used.
+     * If `persistent` is not supplied, the default of `true` is used.
+     * If `recursive` is not supplied, the default of `false` is used.
+     */
+    export function watch(filename: PathLike, options: { encoding: "buffer", persistent?: boolean, recursive?: boolean } | "buffer", listener?: (event: string, filename: Buffer) => void): FSWatcher;
+
+    /**
+     * Watch for changes on `filename`, where `filename` is either a file or a directory, returning an `FSWatcher`.
+     * @param filename A path to a file or directory. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     * @param options Either the encoding for the filename provided to the listener, or an object optionally specifying encoding, persistent, and recursive options.
+     * If `encoding` is not supplied, the default of `'utf8'` is used.
+     * If `persistent` is not supplied, the default of `true` is used.
+     * If `recursive` is not supplied, the default of `false` is used.
+     */
+    export function watch(filename: PathLike, options: { encoding?: string | null, persistent?: boolean, recursive?: boolean } | string | null, listener?: (event: string, filename: string | Buffer) => void): FSWatcher;
+
+    /**
+     * Watch for changes on `filename`, where `filename` is either a file or a directory, returning an `FSWatcher`.
+     * @param filename A path to a file or directory. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     */
+    export function watch(filename: PathLike, listener?: (event: string, filename: string) => any): FSWatcher;
+
+    /**
+     * Asynchronously tests whether or not the given path exists by checking with the file system.
+     * @deprecated
+     * @param path A path to a file or directory. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     */
+    export function exists(path: PathLike, callback: (exists: boolean) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace exists {
+        /**
+         * @param path A path to a file or directory. If a URL is provided, it must use the `file:` protocol.
+         * URL support is _experimental_.
+         */
+        function __promisify__(path: PathLike): Promise<boolean>;
+    }
+
+    /**
+     * Synchronously tests whether or not the given path exists by checking with the file system.
+     * @param path A path to a file or directory. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     */
+    export function existsSync(path: PathLike): boolean;
+
+    export namespace constants {
+        // File Access Constants
+
+        /** Constant for fs.access(). File is visible to the calling process. */
+        export const F_OK: number;
+
+        /** Constant for fs.access(). File can be read by the calling process. */
+        export const R_OK: number;
+
+        /** Constant for fs.access(). File can be written by the calling process. */
+        export const W_OK: number;
+
+        /** Constant for fs.access(). File can be executed by the calling process. */
+        export const X_OK: number;
+
+        // File Open Constants
+
+        /** Constant for fs.open(). Flag indicating to open a file for read-only access. */
+        export const O_RDONLY: number;
+
+        /** Constant for fs.open(). Flag indicating to open a file for write-only access. */
+        export const O_WRONLY: number;
+
+        /** Constant for fs.open(). Flag indicating to open a file for read-write access. */
+        export const O_RDWR: number;
+
+        /** Constant for fs.open(). Flag indicating to create the file if it does not already exist. */
+        export const O_CREAT: number;
+
+        /** Constant for fs.open(). Flag indicating that opening a file should fail if the O_CREAT flag is set and the file already exists. */
+        export const O_EXCL: number;
+
+        /** Constant for fs.open(). Flag indicating that if path identifies a terminal device, opening the path shall not cause that terminal to become the controlling terminal for the process (if the process does not already have one). */
+        export const O_NOCTTY: number;
+
+        /** Constant for fs.open(). Flag indicating that if the file exists and is a regular file, and the file is opened successfully for write access, its length shall be truncated to zero. */
+        export const O_TRUNC: number;
+
+        /** Constant for fs.open(). Flag indicating that data will be appended to the end of the file. */
+        export const O_APPEND: number;
+
+        /** Constant for fs.open(). Flag indicating that the open should fail if the path is not a directory. */
+        export const O_DIRECTORY: number;
+
+        /** Constant for fs.open(). Flag indicating reading accesses to the file system will no longer result in an update to the atime information associated with the file. This flag is available on Linux operating systems only. */
+        export const O_NOATIME: number;
+
+        /** Constant for fs.open(). Flag indicating that the open should fail if the path is a symbolic link. */
+        export const O_NOFOLLOW: number;
+
+        /** Constant for fs.open(). Flag indicating that the file is opened for synchronous I/O. */
+        export const O_SYNC: number;
+
+        /** Constant for fs.open(). Flag indicating that the file is opened for synchronous I/O with write operations waiting for data integrity. */
+        export const O_DSYNC: number;
+
+        /** Constant for fs.open(). Flag indicating to open the symbolic link itself rather than the resource it is pointing to. */
+        export const O_SYMLINK: number;
+
+        /** Constant for fs.open(). When set, an attempt will be made to minimize caching effects of file I/O. */
+        export const O_DIRECT: number;
+
+        /** Constant for fs.open(). Flag indicating to open the file in nonblocking mode when possible. */
+        export const O_NONBLOCK: number;
+
+        // File Type Constants
+
+        /** Constant for fs.Stats mode property for determining a file's type. Bit mask used to extract the file type code. */
+        export const S_IFMT: number;
+
+        /** Constant for fs.Stats mode property for determining a file's type. File type constant for a regular file. */
+        export const S_IFREG: number;
+
+        /** Constant for fs.Stats mode property for determining a file's type. File type constant for a directory. */
+        export const S_IFDIR: number;
+
+        /** Constant for fs.Stats mode property for determining a file's type. File type constant for a character-oriented device file. */
+        export const S_IFCHR: number;
+
+        /** Constant for fs.Stats mode property for determining a file's type. File type constant for a block-oriented device file. */
+        export const S_IFBLK: number;
+
+        /** Constant for fs.Stats mode property for determining a file's type. File type constant for a FIFO/pipe. */
+        export const S_IFIFO: number;
+
+        /** Constant for fs.Stats mode property for determining a file's type. File type constant for a symbolic link. */
+        export const S_IFLNK: number;
+
+        /** Constant for fs.Stats mode property for determining a file's type. File type constant for a socket. */
+        export const S_IFSOCK: number;
+
+        // File Mode Constants
+
+        /** Constant for fs.Stats mode property for determining access permissions for a file. File mode indicating readable, writable and executable by owner. */
+        export const S_IRWXU: number;
+
+        /** Constant for fs.Stats mode property for determining access permissions for a file. File mode indicating readable by owner. */
+        export const S_IRUSR: number;
+
+        /** Constant for fs.Stats mode property for determining access permissions for a file. File mode indicating writable by owner. */
+        export const S_IWUSR: number;
+
+        /** Constant for fs.Stats mode property for determining access permissions for a file. File mode indicating executable by owner. */
+        export const S_IXUSR: number;
+
+        /** Constant for fs.Stats mode property for determining access permissions for a file. File mode indicating readable, writable and executable by group. */
+        export const S_IRWXG: number;
+
+        /** Constant for fs.Stats mode property for determining access permissions for a file. File mode indicating readable by group. */
+        export const S_IRGRP: number;
+
+        /** Constant for fs.Stats mode property for determining access permissions for a file. File mode indicating writable by group. */
+        export const S_IWGRP: number;
+
+        /** Constant for fs.Stats mode property for determining access permissions for a file. File mode indicating executable by group. */
+        export const S_IXGRP: number;
+
+        /** Constant for fs.Stats mode property for determining access permissions for a file. File mode indicating readable, writable and executable by others. */
+        export const S_IRWXO: number;
+
+        /** Constant for fs.Stats mode property for determining access permissions for a file. File mode indicating readable by others. */
+        export const S_IROTH: number;
+
+        /** Constant for fs.Stats mode property for determining access permissions for a file. File mode indicating writable by others. */
+        export const S_IWOTH: number;
+
+        /** Constant for fs.Stats mode property for determining access permissions for a file. File mode indicating executable by others. */
+        export const S_IXOTH: number;
+
+        /** Constant for fs.copyFile. Flag indicating the destination file should not be overwritten if it already exists. */
+        export const COPYFILE_EXCL: number;
+    }
+
+    /**
+     * Asynchronously tests a user's permissions for the file specified by path.
+     * @param path A path to a file or directory. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     */
+    export function access(path: PathLike, mode: number | undefined, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    /**
+     * Asynchronously tests a user's permissions for the file specified by path.
+     * @param path A path to a file or directory. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     */
+    export function access(path: PathLike, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace access {
+        /**
+         * Asynchronously tests a user's permissions for the file specified by path.
+         * @param path A path to a file or directory. If a URL is provided, it must use the `file:` protocol.
+         * URL support is _experimental_.
+         */
+        export function __promisify__(path: PathLike, mode?: number): Promise<void>;
+    }
+
+    /**
+     * Synchronously tests a user's permissions for the file specified by path.
+     * @param path A path to a file or directory. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     */
+    export function accessSync(path: PathLike, mode?: number): void;
+
+    /**
+     * Returns a new `ReadStream` object.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     */
+    export function createReadStream(path: PathLike, options?: string | {
+        flags?: string;
+        encoding?: string;
+        fd?: number;
+        mode?: number;
+        autoClose?: boolean;
+        start?: number;
+        end?: number;
+        highWaterMark?: number;
+    }): ReadStream;
+
+    /**
+     * Returns a new `WriteStream` object.
+     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+     * URL support is _experimental_.
+     */
+    export function createWriteStream(path: PathLike, options?: string | {
+        flags?: string;
+        encoding?: string;
+        fd?: number;
+        mode?: number;
+        autoClose?: boolean;
+        start?: number;
+    }): WriteStream;
+
+    /**
+     * Asynchronous fdatasync(2) - synchronize a file's in-core state with storage device.
+     * @param fd A file descriptor.
+     */
+    export function fdatasync(fd: number, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace fdatasync {
+        /**
+         * Asynchronous fdatasync(2) - synchronize a file's in-core state with storage device.
+         * @param fd A file descriptor.
+         */
+        export function __promisify__(fd: number): Promise<void>;
+    }
+
+    /**
+     * Synchronous fdatasync(2) - synchronize a file's in-core state with storage device.
+     * @param fd A file descriptor.
+     */
+    export function fdatasyncSync(fd: number): void;
+
+    /**
+     * Asynchronously copies src to dest. By default, dest is overwritten if it already exists.
+     * No arguments other than a possible exception are given to the callback function.
+     * Node.js makes no guarantees about the atomicity of the copy operation.
+     * If an error occurs after the destination file has been opened for writing, Node.js will attempt
+     * to remove the destination.
+     * @param src A path to the source file.
+     * @param dest A path to the destination file.
+     */
+    export function copyFile(src: PathLike, dest: PathLike, callback: (err: NodeJS.ErrnoException) => void): void;
+    /**
+     * Asynchronously copies src to dest. By default, dest is overwritten if it already exists.
+     * No arguments other than a possible exception are given to the callback function.
+     * Node.js makes no guarantees about the atomicity of the copy operation.
+     * If an error occurs after the destination file has been opened for writing, Node.js will attempt
+     * to remove the destination.
+     * @param src A path to the source file.
+     * @param dest A path to the destination file.
+     * @param flags An integer that specifies the behavior of the copy operation. The only supported flag is fs.constants.COPYFILE_EXCL, which causes the copy operation to fail if dest already exists.
+     */
+    export function copyFile(src: PathLike, dest: PathLike, flags: number, callback: (err: NodeJS.ErrnoException) => void): void;
+
+    // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
+    export namespace copyFile {
+        /**
+         * Asynchronously copies src to dest. By default, dest is overwritten if it already exists.
+         * No arguments other than a possible exception are given to the callback function.
+         * Node.js makes no guarantees about the atomicity of the copy operation.
+         * If an error occurs after the destination file has been opened for writing, Node.js will attempt
+         * to remove the destination.
+         * @param src A path to the source file.
+         * @param dest A path to the destination file.
+         * @param flags An optional integer that specifies the behavior of the copy operation. The only supported flag is fs.constants.COPYFILE_EXCL, which causes the copy operation to fail if dest already exists.
+         */
+        export function __promisify__(src: PathLike, dst: PathLike, flags?: number): Promise<void>;
+    }
+
+    /**
+     * Synchronously copies src to dest. By default, dest is overwritten if it already exists.
+     * Node.js makes no guarantees about the atomicity of the copy operation.
+     * If an error occurs after the destination file has been opened for writing, Node.js will attempt
+     * to remove the destination.
+     * @param src A path to the source file.
+     * @param dest A path to the destination file.
+     * @param flags An optional integer that specifies the behavior of the copy operation. The only supported flag is fs.constants.COPYFILE_EXCL, which causes the copy operation to fail if dest already exists.
+     */
+    export function copyFileSync(src: PathLike, dest: PathLike, flags?: number): void;
 }
 
 declare module "path" {
-
     /**
      * A parsed path object generated by path.parse() or consumed by path.format().
      */
-	export interface ParsedPath {
+    export interface ParsedPath {
         /**
          * The root of the path such as '/' or 'c:\'
          */
-		root: string;
+        root: string;
         /**
          * The full directory path such as '/home/user/dir' or 'c:\path\dir'
          */
-		dir: string;
+        dir: string;
         /**
          * The file name including extension (if any) such as 'index.html'
          */
-		base: string;
+        base: string;
         /**
          * The file extension (if any) such as '.html'
          */
-		ext: string;
+        ext: string;
         /**
          * The file name without extension (if any) such as 'index'
          */
-		name: string;
-	}
+        name: string;
+    }
+    export interface FormatInputPathObject {
+        /**
+         * The root of the path such as '/' or 'c:\'
+         */
+        root?: string;
+        /**
+         * The full directory path such as '/home/user/dir' or 'c:\path\dir'
+         */
+        dir?: string;
+        /**
+         * The file name including extension (if any) such as 'index.html'
+         */
+        base?: string;
+        /**
+         * The file extension (if any) such as '.html'
+         */
+        ext?: string;
+        /**
+         * The file name without extension (if any) such as 'index'
+         */
+        name?: string;
+    }
 
     /**
      * Normalize a string path, reducing '..' and '.' parts.
@@ -2925,14 +4636,14 @@ declare module "path" {
      *
      * @param p string path to normalize.
      */
-	export function normalize(p: string): string;
+    export function normalize(p: string): string;
     /**
      * Join all arguments together and normalize the resulting path.
      * Arguments must be strings. In v0.8, non-string arguments were silently ignored. In v0.10 and up, an exception is thrown.
      *
      * @param paths paths to join.
      */
-	export function join(...paths: string[]): string;
+    export function join(...paths: string[]): string;
     /**
      * The right-most parameter is considered {to}.  Other parameters are considered an array of {from}.
      *
@@ -2942,27 +4653,24 @@ declare module "path" {
      *
      * @param pathSegments string paths to join.  Non-string arguments are ignored.
      */
-	export function resolve(...pathSegments: any[]): string;
+    export function resolve(...pathSegments: string[]): string;
     /**
      * Determines whether {path} is an absolute path. An absolute path will always resolve to the same location, regardless of the working directory.
      *
      * @param path path to test.
      */
-	export function isAbsolute(path: string): boolean;
+    export function isAbsolute(path: string): boolean;
     /**
      * Solve the relative path from {from} to {to}.
      * At times we have two absolute paths, and we need to derive the relative path from one to the other. This is actually the reverse transform of path.resolve.
-     *
-     * @param from
-     * @param to
      */
-	export function relative(from: string, to: string): string;
+    export function relative(from: string, to: string): string;
     /**
      * Return the directory name of a path. Similar to the Unix dirname command.
      *
      * @param p the path to evaluate.
      */
-	export function dirname(p: string): string;
+    export function dirname(p: string): string;
     /**
      * Return the last portion of a path. Similar to the Unix basename command.
      * Often used to extract the file name from a fully qualified path.
@@ -2970,176 +4678,177 @@ declare module "path" {
      * @param p the path to evaluate.
      * @param ext optionally, an extension to remove from the result.
      */
-	export function basename(p: string, ext?: string): string;
+    export function basename(p: string, ext?: string): string;
     /**
      * Return the extension of the path, from the last '.' to end of string in the last portion of the path.
      * If there is no '.' in the last portion of the path or the first character of it is '.', then it returns an empty string
      *
      * @param p the path to evaluate.
      */
-	export function extname(p: string): string;
+    export function extname(p: string): string;
     /**
      * The platform-specific file separator. '\\' or '/'.
      */
-	export var sep: string;
+    export var sep: '\\' | '/';
     /**
      * The platform-specific file delimiter. ';' or ':'.
      */
-	export var delimiter: string;
+    export var delimiter: ';' | ':';
     /**
      * Returns an object from a path string - the opposite of format().
      *
      * @param pathString path to evaluate.
      */
-	export function parse(pathString: string): ParsedPath;
+    export function parse(pathString: string): ParsedPath;
     /**
      * Returns a path string from an object - the opposite of parse().
      *
      * @param pathString path to evaluate.
      */
-	export function format(pathObject: ParsedPath): string;
+    export function format(pathObject: FormatInputPathObject): string;
 
-	export module posix {
-		export function normalize(p: string): string;
-		export function join(...paths: any[]): string;
-		export function resolve(...pathSegments: any[]): string;
-		export function isAbsolute(p: string): boolean;
-		export function relative(from: string, to: string): string;
-		export function dirname(p: string): string;
-		export function basename(p: string, ext?: string): string;
-		export function extname(p: string): string;
-		export var sep: string;
-		export var delimiter: string;
-		export function parse(p: string): ParsedPath;
-		export function format(pP: ParsedPath): string;
-	}
+    export module posix {
+        export function normalize(p: string): string;
+        export function join(...paths: any[]): string;
+        export function resolve(...pathSegments: any[]): string;
+        export function isAbsolute(p: string): boolean;
+        export function relative(from: string, to: string): string;
+        export function dirname(p: string): string;
+        export function basename(p: string, ext?: string): string;
+        export function extname(p: string): string;
+        export var sep: string;
+        export var delimiter: string;
+        export function parse(p: string): ParsedPath;
+        export function format(pP: FormatInputPathObject): string;
+    }
 
-	export module win32 {
-		export function normalize(p: string): string;
-		export function join(...paths: any[]): string;
-		export function resolve(...pathSegments: any[]): string;
-		export function isAbsolute(p: string): boolean;
-		export function relative(from: string, to: string): string;
-		export function dirname(p: string): string;
-		export function basename(p: string, ext?: string): string;
-		export function extname(p: string): string;
-		export var sep: string;
-		export var delimiter: string;
-		export function parse(p: string): ParsedPath;
-		export function format(pP: ParsedPath): string;
-	}
+    export module win32 {
+        export function normalize(p: string): string;
+        export function join(...paths: any[]): string;
+        export function resolve(...pathSegments: any[]): string;
+        export function isAbsolute(p: string): boolean;
+        export function relative(from: string, to: string): string;
+        export function dirname(p: string): string;
+        export function basename(p: string, ext?: string): string;
+        export function extname(p: string): string;
+        export var sep: string;
+        export var delimiter: string;
+        export function parse(p: string): ParsedPath;
+        export function format(pP: FormatInputPathObject): string;
+    }
 }
 
 declare module "string_decoder" {
-	export interface NodeStringDecoder {
-		write(buffer: Buffer): string;
-		end(buffer?: Buffer): string;
-	}
-	export var StringDecoder: {
-		new(encoding?: string): NodeStringDecoder;
-	};
+    export interface NodeStringDecoder {
+        write(buffer: Buffer): string;
+        end(buffer?: Buffer): string;
+    }
+    export var StringDecoder: {
+        new(encoding?: string): NodeStringDecoder;
+    };
 }
 
 declare module "tls" {
-	import * as crypto from "crypto";
-	import * as net from "net";
-	import * as stream from "stream";
+    import * as crypto from "crypto";
+    import * as dns from "dns";
+    import * as net from "net";
+    import * as stream from "stream";
 
-	var CLIENT_RENEG_LIMIT: number;
-	var CLIENT_RENEG_WINDOW: number;
+    var CLIENT_RENEG_LIMIT: number;
+    var CLIENT_RENEG_WINDOW: number;
 
-	export interface Certificate {
+    export interface Certificate {
         /**
          * Country code.
          */
-		C: string;
+        C: string;
         /**
          * Street.
          */
-		ST: string;
+        ST: string;
         /**
          * Locality.
          */
-		L: string;
+        L: string;
         /**
          * Organization.
          */
-		O: string;
+        O: string;
         /**
          * Organizational unit.
          */
-		OU: string;
+        OU: string;
         /**
          * Common name.
          */
-		CN: string;
-	}
+        CN: string;
+    }
 
-	export interface PeerCertificate {
-		subject: Certificate;
-		issuer: Certificate;
-		subjectaltname: string;
-		infoAccess: { [index: string]: string[] };
-		modulus: string;
-		exponent: string;
-		valid_from: string;
-		valid_to: string;
-		fingerprint: string;
-		ext_key_usage: string[];
-		serialNumber: string;
-		raw: Buffer;
-	}
+    export interface PeerCertificate {
+        subject: Certificate;
+        issuer: Certificate;
+        subjectaltname: string;
+        infoAccess: { [index: string]: string[] | undefined };
+        modulus: string;
+        exponent: string;
+        valid_from: string;
+        valid_to: string;
+        fingerprint: string;
+        ext_key_usage: string[];
+        serialNumber: string;
+        raw: Buffer;
+    }
 
-	export interface DetailedPeerCertificate extends PeerCertificate {
-		issuerCertificate: DetailedPeerCertificate;
-	}
+    export interface DetailedPeerCertificate extends PeerCertificate {
+        issuerCertificate: DetailedPeerCertificate;
+    }
 
-	export interface CipherNameAndProtocol {
+    export interface CipherNameAndProtocol {
         /**
          * The cipher name.
          */
-		name: string;
+        name: string;
         /**
          * SSL/TLS protocol version.
          */
-		version: string;
-	}
+        version: string;
+    }
 
-	export class TLSSocket extends net.Socket {
+    export class TLSSocket extends net.Socket {
         /**
          * Construct a new tls.TLSSocket object from an existing TCP socket.
          */
-		constructor(socket: net.Socket, options?: {
+        constructor(socket: net.Socket, options?: {
             /**
              * An optional TLS context object from tls.createSecureContext()
              */
-			secureContext?: SecureContext,
+            secureContext?: SecureContext,
             /**
              * If true the TLS socket will be instantiated in server-mode.
              * Defaults to false.
              */
-			isServer?: boolean,
+            isServer?: boolean,
             /**
              * An optional net.Server instance.
              */
-			server?: net.Server,
+            server?: net.Server,
             /**
              * If true the server will request a certificate from clients that
              * connect and attempt to verify that certificate. Defaults to
              * false.
              */
-			requestCert?: boolean,
+            requestCert?: boolean,
             /**
              * If true the server will reject any connection which is not
              * authorized with the list of supplied CAs. This option only has an
              * effect if requestCert is true. Defaults to false.
              */
-			rejectUnauthorized?: boolean,
+            rejectUnauthorized?: boolean,
             /**
              * An array of strings or a Buffer naming possible NPN protocols.
              * (Protocols should be ordered by their priority.)
              */
-			NPNProtocols?: string[] | Buffer,
+            NPNProtocols?: string[] | Buffer[] | Uint8Array[] | Buffer | Uint8Array,
             /**
              * An array of strings or a Buffer naming possible ALPN protocols.
              * (Protocols should be ordered by their priority.) When the server
@@ -3147,7 +4856,7 @@ declare module "tls" {
              * precedence over NPN and the server does not send an NPN extension
              * to the client.
              */
-			ALPNProtocols?: string[] | Buffer,
+            ALPNProtocols?: string[] | Buffer[] | Uint8Array[] | Buffer | Uint8Array,
             /**
              * SNICallback(servername, cb) <Function> A function that will be
              * called if the client supports SNI TLS extension. Two arguments
@@ -3157,99 +4866,81 @@ declare module "tls" {
              * SecureContext.) If SNICallback wasn't provided the default callback
              * with high-level API will be used (see below).
              */
-			SNICallback?: Function,
+            SNICallback?: (servername: string, cb: (err: Error | null, ctx: SecureContext) => void) => void,
             /**
              * An optional Buffer instance containing a TLS session.
              */
-			session?: Buffer,
+            session?: Buffer,
             /**
              * If true, specifies that the OCSP status request extension will be
              * added to the client hello and an 'OCSPResponse' event will be
              * emitted on the socket before establishing a secure communication
              */
-			requestOCSP?: boolean
-		});
-        /**
-         * Returns the bound address, the address family name and port of the underlying socket as reported by
-         * the operating system.
-         * @returns {any} - An object with three properties, e.g. { port: 12346, family: 'IPv4', address: '127.0.0.1' }.
-         */
-		address(): { port: number; family: string; address: string };
+            requestOCSP?: boolean
+        });
+
         /**
          * A boolean that is true if the peer certificate was signed by one of the specified CAs, otherwise false.
          */
-		authorized: boolean;
+        authorized: boolean;
         /**
          * The reason why the peer's certificate has not been verified.
          * This property becomes available only when tlsSocket.authorized === false.
          */
-		authorizationError: Error;
+        authorizationError: Error;
         /**
          * Static boolean value, always true.
          * May be used to distinguish TLS sockets from regular ones.
          */
-		encrypted: boolean;
+        encrypted: boolean;
         /**
          * Returns an object representing the cipher name and the SSL/TLS protocol version of the current connection.
-         * @returns {CipherNameAndProtocol} - Returns an object representing the cipher name
+         * @returns Returns an object representing the cipher name
          * and the SSL/TLS protocol version of the current connection.
          */
-		getCipher(): CipherNameAndProtocol;
+        getCipher(): CipherNameAndProtocol;
         /**
          * Returns an object representing the peer's certificate.
          * The returned object has some properties corresponding to the field of the certificate.
          * If detailed argument is true the full chain with issuer property will be returned,
          * if false only the top certificate without issuer property.
          * If the peer does not provide a certificate, it returns null or an empty object.
-         * @param {boolean} detailed - If true; the full chain with issuer property will be returned.
-         * @returns {PeerCertificate | DetailedPeerCertificate} - An object representing the peer's certificate.
+         * @param detailed - If true; the full chain with issuer property will be returned.
+         * @returns An object representing the peer's certificate.
          */
-		getPeerCertificate(detailed: true): DetailedPeerCertificate;
-		getPeerCertificate(detailed?: false): PeerCertificate;
-		getPeerCertificate(detailed?: boolean): PeerCertificate | DetailedPeerCertificate;
+        getPeerCertificate(detailed: true): DetailedPeerCertificate;
+        getPeerCertificate(detailed?: false): PeerCertificate;
+        getPeerCertificate(detailed?: boolean): PeerCertificate | DetailedPeerCertificate;
+        /**
+         * Returns a string containing the negotiated SSL/TLS protocol version of the current connection.
+         * The value `'unknown'` will be returned for connected sockets that have not completed the handshaking process.
+         * The value `null` will be returned for server sockets or disconnected client sockets.
+         * See https://www.openssl.org/docs/man1.0.2/ssl/SSL_get_version.html for more information.
+         * @returns negotiated SSL/TLS protocol version of the current connection
+         */
+        getProtocol(): string | null;
         /**
          * Could be used to speed up handshake establishment when reconnecting to the server.
-         * @returns {any} - ASN.1 encoded TLS session or undefined if none was negotiated.
+         * @returns ASN.1 encoded TLS session or undefined if none was negotiated.
          */
-		getSession(): any;
+        getSession(): any;
         /**
          * NOTE: Works only with client TLS sockets.
          * Useful only for debugging, for session reuse provide session option to tls.connect().
-         * @returns {any} - TLS session ticket or undefined if none was negotiated.
+         * @returns TLS session ticket or undefined if none was negotiated.
          */
-		getTLSTicket(): any;
-        /**
-         * The string representation of the local IP address.
-         */
-		localAddress: string;
-        /**
-         * The numeric representation of the local port.
-         */
-		localPort: number;
-        /**
-         * The string representation of the remote IP address.
-         * For example, '74.125.127.100' or '2001:4860:a005::68'.
-         */
-		remoteAddress: string;
-        /**
-         * The string representation of the remote IP family. 'IPv4' or 'IPv6'.
-         */
-		remoteFamily: string;
-        /**
-         * The numeric representation of the remote port. For example, 443.
-         */
-		remotePort: number;
+        getTLSTicket(): any;
         /**
          * Initiate TLS renegotiation process.
          *
          * NOTE: Can be used to request peer's certificate after the secure connection has been established.
          * ANOTHER NOTE: When running as the server, socket will be destroyed with an error after handshakeTimeout timeout.
-         * @param {TlsOptions} options - The options may contain the following fields: rejectUnauthorized,
+         * @param options - The options may contain the following fields: rejectUnauthorized,
          * requestCert (See tls.createServer() for details).
-         * @param {Function} callback - callback(err) will be executed with null as err, once the renegotiation
+         * @param callback - callback(err) will be executed with null as err, once the renegotiation
          * is successfully completed.
          */
-		renegotiate(options: TlsOptions, callback: (err: Error) => any): any;
+        renegotiate(options: { rejectUnauthorized?: boolean, requestCert?: boolean }, callback: (err: Error | null) => void): any;
         /**
          * Set maximum TLS fragment size (default and maximum value is: 16384, minimum is: 512).
          * Smaller fragment size decreases buffering latency on the client: large fragments are buffered by
@@ -3257,97 +4948,74 @@ declare module "tls" {
          * large fragments can span multiple roundtrips, and their processing can be delayed due to packet
          * loss or reordering. However, smaller fragments add extra TLS framing bytes and CPU overhead,
          * which may decrease overall server throughput.
-         * @param {number} size - TLS fragment size (default and maximum value is: 16384, minimum is: 512).
-         * @returns {boolean} - Returns true on success, false otherwise.
+         * @param size - TLS fragment size (default and maximum value is: 16384, minimum is: 512).
+         * @returns Returns true on success, false otherwise.
          */
-		setMaxSendFragment(size: number): boolean;
+        setMaxSendFragment(size: number): boolean;
 
         /**
          * events.EventEmitter
          * 1. OCSPResponse
          * 2. secureConnect
-         **/
-		addListener(event: string, listener: Function): this;
-		addListener(event: "OCSPResponse", listener: (response: Buffer) => void): this;
-		addListener(event: "secureConnect", listener: () => void): this;
+         */
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        addListener(event: "OCSPResponse", listener: (response: Buffer) => void): this;
+        addListener(event: "secureConnect", listener: () => void): this;
 
-		emit(event: string | symbol, ...args: any[]): boolean;
-		emit(event: "OCSPResponse", response: Buffer): boolean;
-		emit(event: "secureConnect"): boolean;
+        emit(event: string | symbol, ...args: any[]): boolean;
+        emit(event: "OCSPResponse", response: Buffer): boolean;
+        emit(event: "secureConnect"): boolean;
 
-		on(event: string, listener: Function): this;
-		on(event: "OCSPResponse", listener: (response: Buffer) => void): this;
-		on(event: "secureConnect", listener: () => void): this;
+        on(event: string, listener: (...args: any[]) => void): this;
+        on(event: "OCSPResponse", listener: (response: Buffer) => void): this;
+        on(event: "secureConnect", listener: () => void): this;
 
-		once(event: string, listener: Function): this;
-		once(event: "OCSPResponse", listener: (response: Buffer) => void): this;
-		once(event: "secureConnect", listener: () => void): this;
+        once(event: string, listener: (...args: any[]) => void): this;
+        once(event: "OCSPResponse", listener: (response: Buffer) => void): this;
+        once(event: "secureConnect", listener: () => void): this;
 
-		prependListener(event: string, listener: Function): this;
-		prependListener(event: "OCSPResponse", listener: (response: Buffer) => void): this;
-		prependListener(event: "secureConnect", listener: () => void): this;
+        prependListener(event: string, listener: (...args: any[]) => void): this;
+        prependListener(event: "OCSPResponse", listener: (response: Buffer) => void): this;
+        prependListener(event: "secureConnect", listener: () => void): this;
 
-		prependOnceListener(event: string, listener: Function): this;
-		prependOnceListener(event: "OCSPResponse", listener: (response: Buffer) => void): this;
-		prependOnceListener(event: "secureConnect", listener: () => void): this;
-	}
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: "OCSPResponse", listener: (response: Buffer) => void): this;
+        prependOnceListener(event: "secureConnect", listener: () => void): this;
+    }
 
-	export interface TlsOptions {
-		host?: string;
-		port?: number;
-		pfx?: string | Buffer[];
-		key?: string | string[] | Buffer | any[];
-		passphrase?: string;
-		cert?: string | string[] | Buffer | Buffer[];
-		ca?: string | string[] | Buffer | Buffer[];
-		crl?: string | string[];
-		ciphers?: string;
-		honorCipherOrder?: boolean;
-		requestCert?: boolean;
-		rejectUnauthorized?: boolean;
-		NPNProtocols?: string[] | Buffer;
-		SNICallback?: (servername: string, cb: (err: Error, ctx: SecureContext) => any) => any;
-		ecdhCurve?: string;
-		dhparam?: string | Buffer;
-		handshakeTimeout?: number;
-		ALPNProtocols?: string[] | Buffer;
-		sessionTimeout?: number;
-		ticketKeys?: any;
-		sessionIdContext?: string;
-		secureProtocol?: string;
-	}
+    export interface TlsOptions extends SecureContextOptions {
+        handshakeTimeout?: number;
+        requestCert?: boolean;
+        rejectUnauthorized?: boolean;
+        NPNProtocols?: string[] | Buffer[] | Uint8Array[] | Buffer | Uint8Array;
+        ALPNProtocols?: string[] | Buffer[] | Uint8Array[] | Buffer | Uint8Array;
+        SNICallback?: (servername: string, cb: (err: Error | null, ctx: SecureContext) => void) => void;
+        sessionTimeout?: number;
+        ticketKeys?: Buffer;
+    }
 
-	export interface ConnectionOptions {
-		host?: string;
-		port?: number;
-		socket?: net.Socket;
-		pfx?: string | Buffer
-		key?: string | string[] | Buffer | Buffer[];
-		passphrase?: string;
-		cert?: string | string[] | Buffer | Buffer[];
-		ca?: string | Buffer | (string | Buffer)[];
-		rejectUnauthorized?: boolean;
-		NPNProtocols?: (string | Buffer)[];
-		servername?: string;
-		path?: string;
-		ALPNProtocols?: (string | Buffer)[];
-		checkServerIdentity?: (servername: string, cert: string | Buffer | (string | Buffer)[]) => any;
-		secureProtocol?: string;
-		secureContext?: Object;
-		session?: Buffer;
-		minDHSize?: number;
-	}
+    export interface ConnectionOptions extends SecureContextOptions {
+        host?: string;
+        port?: number;
+        path?: string; // Creates unix socket connection to path. If this option is specified, `host` and `port` are ignored.
+        socket?: net.Socket; // Establish secure connection on a given socket rather than creating a new socket
+        rejectUnauthorized?: boolean; // Defaults to true
+        NPNProtocols?: string[] | Buffer[] | Uint8Array[] | Buffer | Uint8Array;
+        ALPNProtocols?: string[] | Buffer[] | Uint8Array[] | Buffer | Uint8Array;
+        checkServerIdentity?: typeof checkServerIdentity;
+        servername?: string; // SNI TLS Extension
+        session?: Buffer;
+        minDHSize?: number;
+        secureContext?: SecureContext; // If not provided, the entire ConnectionOptions object will be passed to tls.createSecureContext()
+        lookup?: net.LookupFunction;
+    }
 
-	export interface Server extends net.Server {
-		close(callback?: Function): Server;
-		address(): { port: number; family: string; address: string; };
-		addContext(hostName: string, credentials: {
-			key: string;
-			cert: string;
-			ca: string;
-		}): void;
-		maxConnections: number;
-		connections: number;
+    export class Server extends net.Server {
+        addContext(hostName: string, credentials: {
+            key: string;
+            cert: string;
+            ca: string;
+        }): void;
 
         /**
          * events.EventEmitter
@@ -3356,1022 +5024,2216 @@ declare module "tls" {
          * 3. OCSPRequest
          * 4. resumeSession
          * 5. secureConnection
-         **/
-		addListener(event: string, listener: Function): this;
-		addListener(event: "tlsClientError", listener: (err: Error, tlsSocket: TLSSocket) => void): this;
-		addListener(event: "newSession", listener: (sessionId: any, sessionData: any, callback: (err: Error, resp: Buffer) => void) => void): this;
-		addListener(event: "OCSPRequest", listener: (certificate: Buffer, issuer: Buffer, callback: Function) => void): this;
-		addListener(event: "resumeSession", listener: (sessionId: any, callback: (err: Error, sessionData: any) => void) => void): this;
-		addListener(event: "secureConnection", listener: (tlsSocket: TLSSocket) => void): this;
+         */
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        addListener(event: "tlsClientError", listener: (err: Error, tlsSocket: TLSSocket) => void): this;
+        addListener(event: "newSession", listener: (sessionId: any, sessionData: any, callback: (err: Error, resp: Buffer) => void) => void): this;
+        addListener(event: "OCSPRequest", listener: (certificate: Buffer, issuer: Buffer, callback: Function) => void): this;
+        addListener(event: "resumeSession", listener: (sessionId: any, callback: (err: Error, sessionData: any) => void) => void): this;
+        addListener(event: "secureConnection", listener: (tlsSocket: TLSSocket) => void): this;
 
-		emit(event: string | symbol, ...args: any[]): boolean;
-		emit(event: "tlsClientError", err: Error, tlsSocket: TLSSocket): boolean;
-		emit(event: "newSession", sessionId: any, sessionData: any, callback: (err: Error, resp: Buffer) => void): boolean;
-		emit(event: "OCSPRequest", certificate: Buffer, issuer: Buffer, callback: Function): boolean;
-		emit(event: "resumeSession", sessionId: any, callback: (err: Error, sessionData: any) => void): boolean;
-		emit(event: "secureConnection", tlsSocket: TLSSocket): boolean;
+        emit(event: string | symbol, ...args: any[]): boolean;
+        emit(event: "tlsClientError", err: Error, tlsSocket: TLSSocket): boolean;
+        emit(event: "newSession", sessionId: any, sessionData: any, callback: (err: Error, resp: Buffer) => void): boolean;
+        emit(event: "OCSPRequest", certificate: Buffer, issuer: Buffer, callback: Function): boolean;
+        emit(event: "resumeSession", sessionId: any, callback: (err: Error, sessionData: any) => void): boolean;
+        emit(event: "secureConnection", tlsSocket: TLSSocket): boolean;
 
-		on(event: string, listener: Function): this;
-		on(event: "tlsClientError", listener: (err: Error, tlsSocket: TLSSocket) => void): this;
-		on(event: "newSession", listener: (sessionId: any, sessionData: any, callback: (err: Error, resp: Buffer) => void) => void): this;
-		on(event: "OCSPRequest", listener: (certificate: Buffer, issuer: Buffer, callback: Function) => void): this;
-		on(event: "resumeSession", listener: (sessionId: any, callback: (err: Error, sessionData: any) => void) => void): this;
-		on(event: "secureConnection", listener: (tlsSocket: TLSSocket) => void): this;
+        on(event: string, listener: (...args: any[]) => void): this;
+        on(event: "tlsClientError", listener: (err: Error, tlsSocket: TLSSocket) => void): this;
+        on(event: "newSession", listener: (sessionId: any, sessionData: any, callback: (err: Error, resp: Buffer) => void) => void): this;
+        on(event: "OCSPRequest", listener: (certificate: Buffer, issuer: Buffer, callback: Function) => void): this;
+        on(event: "resumeSession", listener: (sessionId: any, callback: (err: Error, sessionData: any) => void) => void): this;
+        on(event: "secureConnection", listener: (tlsSocket: TLSSocket) => void): this;
 
-		once(event: string, listener: Function): this;
-		once(event: "tlsClientError", listener: (err: Error, tlsSocket: TLSSocket) => void): this;
-		once(event: "newSession", listener: (sessionId: any, sessionData: any, callback: (err: Error, resp: Buffer) => void) => void): this;
-		once(event: "OCSPRequest", listener: (certificate: Buffer, issuer: Buffer, callback: Function) => void): this;
-		once(event: "resumeSession", listener: (sessionId: any, callback: (err: Error, sessionData: any) => void) => void): this;
-		once(event: "secureConnection", listener: (tlsSocket: TLSSocket) => void): this;
+        once(event: string, listener: (...args: any[]) => void): this;
+        once(event: "tlsClientError", listener: (err: Error, tlsSocket: TLSSocket) => void): this;
+        once(event: "newSession", listener: (sessionId: any, sessionData: any, callback: (err: Error, resp: Buffer) => void) => void): this;
+        once(event: "OCSPRequest", listener: (certificate: Buffer, issuer: Buffer, callback: Function) => void): this;
+        once(event: "resumeSession", listener: (sessionId: any, callback: (err: Error, sessionData: any) => void) => void): this;
+        once(event: "secureConnection", listener: (tlsSocket: TLSSocket) => void): this;
 
-		prependListener(event: string, listener: Function): this;
-		prependListener(event: "tlsClientError", listener: (err: Error, tlsSocket: TLSSocket) => void): this;
-		prependListener(event: "newSession", listener: (sessionId: any, sessionData: any, callback: (err: Error, resp: Buffer) => void) => void): this;
-		prependListener(event: "OCSPRequest", listener: (certificate: Buffer, issuer: Buffer, callback: Function) => void): this;
-		prependListener(event: "resumeSession", listener: (sessionId: any, callback: (err: Error, sessionData: any) => void) => void): this;
-		prependListener(event: "secureConnection", listener: (tlsSocket: TLSSocket) => void): this;
+        prependListener(event: string, listener: (...args: any[]) => void): this;
+        prependListener(event: "tlsClientError", listener: (err: Error, tlsSocket: TLSSocket) => void): this;
+        prependListener(event: "newSession", listener: (sessionId: any, sessionData: any, callback: (err: Error, resp: Buffer) => void) => void): this;
+        prependListener(event: "OCSPRequest", listener: (certificate: Buffer, issuer: Buffer, callback: Function) => void): this;
+        prependListener(event: "resumeSession", listener: (sessionId: any, callback: (err: Error, sessionData: any) => void) => void): this;
+        prependListener(event: "secureConnection", listener: (tlsSocket: TLSSocket) => void): this;
 
-		prependOnceListener(event: string, listener: Function): this;
-		prependOnceListener(event: "tlsClientError", listener: (err: Error, tlsSocket: TLSSocket) => void): this;
-		prependOnceListener(event: "newSession", listener: (sessionId: any, sessionData: any, callback: (err: Error, resp: Buffer) => void) => void): this;
-		prependOnceListener(event: "OCSPRequest", listener: (certificate: Buffer, issuer: Buffer, callback: Function) => void): this;
-		prependOnceListener(event: "resumeSession", listener: (sessionId: any, callback: (err: Error, sessionData: any) => void) => void): this;
-		prependOnceListener(event: "secureConnection", listener: (tlsSocket: TLSSocket) => void): this;
-	}
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: "tlsClientError", listener: (err: Error, tlsSocket: TLSSocket) => void): this;
+        prependOnceListener(event: "newSession", listener: (sessionId: any, sessionData: any, callback: (err: Error, resp: Buffer) => void) => void): this;
+        prependOnceListener(event: "OCSPRequest", listener: (certificate: Buffer, issuer: Buffer, callback: Function) => void): this;
+        prependOnceListener(event: "resumeSession", listener: (sessionId: any, callback: (err: Error, sessionData: any) => void) => void): this;
+        prependOnceListener(event: "secureConnection", listener: (tlsSocket: TLSSocket) => void): this;
+    }
 
-	export interface ClearTextStream extends stream.Duplex {
-		authorized: boolean;
-		authorizationError: Error;
-		getPeerCertificate(): any;
-		getCipher: {
-			name: string;
-			version: string;
-		};
-		address: {
-			port: number;
-			family: string;
-			address: string;
-		};
-		remoteAddress: string;
-		remotePort: number;
-	}
+    export interface ClearTextStream extends stream.Duplex {
+        authorized: boolean;
+        authorizationError: Error;
+        getPeerCertificate(): any;
+        getCipher: {
+            name: string;
+            version: string;
+        };
+        address: {
+            port: number;
+            family: string;
+            address: string;
+        };
+        remoteAddress: string;
+        remotePort: number;
+    }
 
-	export interface SecurePair {
-		encrypted: any;
-		cleartext: any;
-	}
+    export interface SecurePair {
+        encrypted: any;
+        cleartext: any;
+    }
 
-	export interface SecureContextOptions {
-		pfx?: string | Buffer;
-		key?: string | Buffer;
-		passphrase?: string;
-		cert?: string | Buffer;
-		ca?: string | Buffer;
-		crl?: string | string[]
-		ciphers?: string;
-		honorCipherOrder?: boolean;
-	}
+    export interface SecureContextOptions {
+        pfx?: string | Buffer | Array<string | Buffer | Object>;
+        key?: string | Buffer | Array<Buffer | Object>;
+        passphrase?: string;
+        cert?: string | Buffer | Array<string | Buffer>;
+        ca?: string | Buffer | Array<string | Buffer>;
+        ciphers?: string;
+        honorCipherOrder?: boolean;
+        ecdhCurve?: string;
+        crl?: string | Buffer | Array<string | Buffer>;
+        dhparam?: string | Buffer;
+        secureOptions?: number; // Value is a numeric bitmask of the `SSL_OP_*` options
+        secureProtocol?: string; // SSL Method, e.g. SSLv23_method
+        sessionIdContext?: string;
+    }
 
-	export interface SecureContext {
-		context: any;
-	}
+    export interface SecureContext {
+        context: any;
+    }
 
-	export function createServer(options: TlsOptions, secureConnectionListener?: (socket: TLSSocket) => void): Server;
-	export function connect(options: ConnectionOptions, secureConnectionListener?: () => void): TLSSocket;
-	export function connect(port: number, host?: string, options?: ConnectionOptions, secureConnectListener?: () => void): TLSSocket;
-	export function connect(port: number, options?: ConnectionOptions, secureConnectListener?: () => void): TLSSocket;
-	export function createSecurePair(credentials?: crypto.Credentials, isServer?: boolean, requestCert?: boolean, rejectUnauthorized?: boolean): SecurePair;
-	export function createSecureContext(details: SecureContextOptions): SecureContext;
+    /*
+     * Verifies the certificate `cert` is issued to host `host`.
+     * @host The hostname to verify the certificate against
+     * @cert PeerCertificate representing the peer's certificate
+     *
+     * Returns Error object, populating it with the reason, host and cert on failure.  On success, returns undefined.
+     */
+    export function checkServerIdentity(host: string, cert: PeerCertificate): Error | undefined;
+    export function createServer(options: TlsOptions, secureConnectionListener?: (socket: TLSSocket) => void): Server;
+    export function connect(options: ConnectionOptions, secureConnectionListener?: () => void): TLSSocket;
+    export function connect(port: number, host?: string, options?: ConnectionOptions, secureConnectListener?: () => void): TLSSocket;
+    export function connect(port: number, options?: ConnectionOptions, secureConnectListener?: () => void): TLSSocket;
+    export function createSecurePair(credentials?: crypto.Credentials, isServer?: boolean, requestCert?: boolean, rejectUnauthorized?: boolean): SecurePair;
+    export function createSecureContext(details: SecureContextOptions): SecureContext;
+    export function getCiphers(): string[];
+
+    export var DEFAULT_ECDH_CURVE: string;
 }
 
 declare module "crypto" {
-	export interface Certificate {
-		exportChallenge(spkac: string | Buffer): Buffer;
-		exportPublicKey(spkac: string | Buffer): Buffer;
-		verifySpkac(spkac: Buffer): boolean;
-	}
-	export var Certificate: {
-		new(): Certificate;
-		(): Certificate;
-	}
+    export interface Certificate {
+        exportChallenge(spkac: string | Buffer): Buffer;
+        exportPublicKey(spkac: string | Buffer): Buffer;
+        verifySpkac(spkac: Buffer): boolean;
+    }
+    export var Certificate: {
+        new(): Certificate;
+        (): Certificate;
+    };
 
-	export var fips: boolean;
+    export var fips: boolean;
 
-	export interface CredentialDetails {
-		pfx: string;
-		key: string;
-		passphrase: string;
-		cert: string;
-		ca: string | string[];
-		crl: string | string[];
-		ciphers: string;
-	}
-	export interface Credentials { context?: any; }
-	export function createCredentials(details: CredentialDetails): Credentials;
-	export function createHash(algorithm: string): Hash;
-	export function createHmac(algorithm: string, key: string | Buffer): Hmac;
+    export interface CredentialDetails {
+        pfx: string;
+        key: string;
+        passphrase: string;
+        cert: string;
+        ca: string | string[];
+        crl: string | string[];
+        ciphers: string;
+    }
+    export interface Credentials { context?: any; }
+    export function createCredentials(details: CredentialDetails): Credentials;
+    export function createHash(algorithm: string): Hash;
+    export function createHmac(algorithm: string, key: string | Buffer): Hmac;
 
-	type Utf8AsciiLatin1Encoding = "utf8" | "ascii" | "latin1";
-	type HexBase64Latin1Encoding = "latin1" | "hex" | "base64";
-	type Utf8AsciiBinaryEncoding = "utf8" | "ascii" | "binary";
-	type HexBase64BinaryEncoding = "binary" | "base64" | "hex";
-	type ECDHKeyFormat = "compressed" | "uncompressed" | "hybrid";
+    type Utf8AsciiLatin1Encoding = "utf8" | "ascii" | "latin1";
+    type HexBase64Latin1Encoding = "latin1" | "hex" | "base64";
+    type Utf8AsciiBinaryEncoding = "utf8" | "ascii" | "binary";
+    type HexBase64BinaryEncoding = "binary" | "base64" | "hex";
+    type ECDHKeyFormat = "compressed" | "uncompressed" | "hybrid";
 
-	export interface Hash extends NodeJS.ReadWriteStream {
-		update(data: string | Buffer): Hash;
-		update(data: string | Buffer, input_encoding: Utf8AsciiLatin1Encoding): Hash;
-		digest(): Buffer;
-		digest(encoding: HexBase64Latin1Encoding): string;
-	}
-	export interface Hmac extends NodeJS.ReadWriteStream {
-		update(data: string | Buffer): Hmac;
-		update(data: string | Buffer, input_encoding: Utf8AsciiLatin1Encoding): Hmac;
-		digest(): Buffer;
-		digest(encoding: HexBase64Latin1Encoding): string;
-	}
-	export function createCipher(algorithm: string, password: any): Cipher;
-	export function createCipheriv(algorithm: string, key: any, iv: any): Cipher;
-	export interface Cipher extends NodeJS.ReadWriteStream {
-		update(data: Buffer): Buffer;
-		update(data: string, input_encoding: Utf8AsciiBinaryEncoding): Buffer;
-		update(data: Buffer, input_encoding: any, output_encoding: HexBase64BinaryEncoding): string;
-		update(data: string, input_encoding: Utf8AsciiBinaryEncoding, output_encoding: HexBase64BinaryEncoding): string;
-		final(): Buffer;
-		final(output_encoding: string): string;
-		setAutoPadding(auto_padding?: boolean): void;
-		getAuthTag(): Buffer;
-		setAAD(buffer: Buffer): void;
-	}
-	export function createDecipher(algorithm: string, password: any): Decipher;
-	export function createDecipheriv(algorithm: string, key: any, iv: any): Decipher;
-	export interface Decipher extends NodeJS.ReadWriteStream {
-		update(data: Buffer): Buffer;
-		update(data: string, input_encoding: HexBase64BinaryEncoding): Buffer;
-		update(data: Buffer, input_encoding: any, output_encoding: Utf8AsciiBinaryEncoding): string;
-		update(data: string, input_encoding: HexBase64BinaryEncoding, output_encoding: Utf8AsciiBinaryEncoding): string;
-		final(): Buffer;
-		final(output_encoding: string): string;
-		setAutoPadding(auto_padding?: boolean): void;
-		setAuthTag(tag: Buffer): void;
-		setAAD(buffer: Buffer): void;
-	}
-	export function createSign(algorithm: string): Signer;
-	export interface Signer extends NodeJS.WritableStream {
-		update(data: string | Buffer): Signer;
-		update(data: string | Buffer, input_encoding: Utf8AsciiLatin1Encoding): Signer;
-		sign(private_key: string | { key: string; passphrase: string }): Buffer;
-		sign(private_key: string | { key: string; passphrase: string }, output_format: HexBase64Latin1Encoding): string;
-	}
-	export function createVerify(algorith: string): Verify;
-	export interface Verify extends NodeJS.WritableStream {
-		update(data: string | Buffer): Verify;
-		update(data: string | Buffer, input_encoding: Utf8AsciiLatin1Encoding): Verify;
-		verify(object: string, signature: Buffer): boolean;
-		verify(object: string, signature: string, signature_format: HexBase64Latin1Encoding): boolean;
-	}
-	export function createDiffieHellman(prime_length: number, generator?: number): DiffieHellman;
-	export function createDiffieHellman(prime: Buffer): DiffieHellman;
-	export function createDiffieHellman(prime: string, prime_encoding: HexBase64Latin1Encoding): DiffieHellman;
-	export function createDiffieHellman(prime: string, prime_encoding: HexBase64Latin1Encoding, generator: number | Buffer): DiffieHellman;
-	export function createDiffieHellman(prime: string, prime_encoding: HexBase64Latin1Encoding, generator: string, generator_encoding: HexBase64Latin1Encoding): DiffieHellman;
-	export interface DiffieHellman {
-		generateKeys(): Buffer;
-		generateKeys(encoding: HexBase64Latin1Encoding): string;
-		computeSecret(other_public_key: Buffer): Buffer;
-		computeSecret(other_public_key: string, input_encoding: HexBase64Latin1Encoding): Buffer;
-		computeSecret(other_public_key: string, input_encoding: HexBase64Latin1Encoding, output_encoding: HexBase64Latin1Encoding): string;
-		getPrime(): Buffer;
-		getPrime(encoding: HexBase64Latin1Encoding): string;
-		getGenerator(): Buffer;
-		getGenerator(encoding: HexBase64Latin1Encoding): string;
-		getPublicKey(): Buffer;
-		getPublicKey(encoding: HexBase64Latin1Encoding): string;
-		getPrivateKey(): Buffer;
-		getPrivateKey(encoding: HexBase64Latin1Encoding): string;
-		setPublicKey(public_key: Buffer): void;
-		setPublicKey(public_key: string, encoding: string): void;
-		setPrivateKey(private_key: Buffer): void;
-		setPrivateKey(private_key: string, encoding: string): void;
-		verifyError: number;
-	}
-	export function getDiffieHellman(group_name: string): DiffieHellman;
-	export function pbkdf2(password: string | Buffer, salt: string | Buffer, iterations: number, keylen: number, digest: string, callback: (err: Error, derivedKey: Buffer) => any): void;
-	export function pbkdf2Sync(password: string | Buffer, salt: string | Buffer, iterations: number, keylen: number, digest: string): Buffer;
-	export function randomBytes(size: number): Buffer;
-	export function randomBytes(size: number, callback: (err: Error, buf: Buffer) => void): void;
-	export function pseudoRandomBytes(size: number): Buffer;
-	export function pseudoRandomBytes(size: number, callback: (err: Error, buf: Buffer) => void): void;
-	export function randomFillSync(buffer: Buffer | Uint8Array, offset?: number, size?: number): Buffer;
-	export function randomFill(buffer: Buffer, callback: (err: Error, buf: Buffer) => void): void;
-	export function randomFill(buffer: Uint8Array, callback: (err: Error, buf: Uint8Array) => void): void;
-	export function randomFill(buffer: Buffer, offset: number, callback: (err: Error, buf: Buffer) => void): void;
-	export function randomFill(buffer: Uint8Array, offset: number, callback: (err: Error, buf: Uint8Array) => void): void;
-	export function randomFill(buffer: Buffer, offset: number, size: number, callback: (err: Error, buf: Buffer) => void): void;
-	export function randomFill(buffer: Uint8Array, offset: number, size: number, callback: (err: Error, buf: Uint8Array) => void): void;
-	export interface RsaPublicKey {
-		key: string;
-		padding?: number;
-	}
-	export interface RsaPrivateKey {
-		key: string;
-		passphrase?: string,
-		padding?: number;
-	}
-	export function publicEncrypt(public_key: string | RsaPublicKey, buffer: Buffer): Buffer
-	export function privateDecrypt(private_key: string | RsaPrivateKey, buffer: Buffer): Buffer
-	export function privateEncrypt(private_key: string | RsaPrivateKey, buffer: Buffer): Buffer
-	export function publicDecrypt(public_key: string | RsaPublicKey, buffer: Buffer): Buffer
-	export function getCiphers(): string[];
-	export function getCurves(): string[];
-	export function getHashes(): string[];
-	export interface ECDH {
-		generateKeys(): Buffer;
-		generateKeys(encoding: HexBase64Latin1Encoding): string;
-		generateKeys(encoding: HexBase64Latin1Encoding, format: ECDHKeyFormat): string;
-		computeSecret(other_public_key: Buffer): Buffer;
-		computeSecret(other_public_key: string, input_encoding: HexBase64Latin1Encoding): Buffer;
-		computeSecret(other_public_key: string, input_encoding: HexBase64Latin1Encoding, output_encoding: HexBase64Latin1Encoding): string;
-		getPrivateKey(): Buffer;
-		getPrivateKey(encoding: HexBase64Latin1Encoding): string;
-		getPublicKey(): Buffer;
-		getPublicKey(encoding: HexBase64Latin1Encoding): string;
-		getPublicKey(encoding: HexBase64Latin1Encoding, format: ECDHKeyFormat): string;
-		setPrivateKey(private_key: Buffer): void;
-		setPrivateKey(private_key: string, encoding: HexBase64Latin1Encoding): void;
-	}
-	export function createECDH(curve_name: string): ECDH;
-	export function timingSafeEqual(a: Buffer, b: Buffer): boolean;
-	export var DEFAULT_ENCODING: string;
+    export interface Hash extends NodeJS.ReadWriteStream {
+        update(data: string | Buffer | DataView): Hash;
+        update(data: string | Buffer | DataView, input_encoding: Utf8AsciiLatin1Encoding): Hash;
+        digest(): Buffer;
+        digest(encoding: HexBase64Latin1Encoding): string;
+    }
+    export interface Hmac extends NodeJS.ReadWriteStream {
+        update(data: string | Buffer | DataView): Hmac;
+        update(data: string | Buffer | DataView, input_encoding: Utf8AsciiLatin1Encoding): Hmac;
+        digest(): Buffer;
+        digest(encoding: HexBase64Latin1Encoding): string;
+    }
+    export function createCipher(algorithm: string, password: any): Cipher;
+    export function createCipheriv(algorithm: string, key: any, iv: any): Cipher;
+    export interface Cipher extends NodeJS.ReadWriteStream {
+        update(data: Buffer | DataView): Buffer;
+        update(data: string, input_encoding: Utf8AsciiBinaryEncoding): Buffer;
+        update(data: Buffer | DataView, input_encoding: any, output_encoding: HexBase64BinaryEncoding): string;
+        update(data: string, input_encoding: Utf8AsciiBinaryEncoding, output_encoding: HexBase64BinaryEncoding): string;
+        final(): Buffer;
+        final(output_encoding: string): string;
+        setAutoPadding(auto_padding?: boolean): this;
+        getAuthTag(): Buffer;
+        setAAD(buffer: Buffer): this;
+    }
+    export function createDecipher(algorithm: string, password: any): Decipher;
+    export function createDecipheriv(algorithm: string, key: any, iv: any): Decipher;
+    export interface Decipher extends NodeJS.ReadWriteStream {
+        update(data: Buffer | DataView): Buffer;
+        update(data: string, input_encoding: HexBase64BinaryEncoding): Buffer;
+        update(data: Buffer | DataView, input_encoding: any, output_encoding: Utf8AsciiBinaryEncoding): string;
+        update(data: string, input_encoding: HexBase64BinaryEncoding, output_encoding: Utf8AsciiBinaryEncoding): string;
+        final(): Buffer;
+        final(output_encoding: string): string;
+        setAutoPadding(auto_padding?: boolean): this;
+        setAuthTag(tag: Buffer): this;
+        setAAD(buffer: Buffer): this;
+    }
+    export function createSign(algorithm: string): Signer;
+    export interface Signer extends NodeJS.WritableStream {
+        update(data: string | Buffer | DataView): Signer;
+        update(data: string | Buffer | DataView, input_encoding: Utf8AsciiLatin1Encoding): Signer;
+        sign(private_key: string | { key: string; passphrase: string }): Buffer;
+        sign(private_key: string | { key: string; passphrase: string }, output_format: HexBase64Latin1Encoding): string;
+    }
+    export function createVerify(algorith: string): Verify;
+    export interface Verify extends NodeJS.WritableStream {
+        update(data: string | Buffer | DataView): Verify;
+        update(data: string | Buffer | DataView, input_encoding: Utf8AsciiLatin1Encoding): Verify;
+        verify(object: string | Object, signature: Buffer | DataView): boolean;
+        verify(object: string | Object, signature: string, signature_format: HexBase64Latin1Encoding): boolean;
+        // https://nodejs.org/api/crypto.html#crypto_verifier_verify_object_signature_signature_format
+        // The signature field accepts a TypedArray type, but it is only available starting ES2017
+    }
+    export function createDiffieHellman(prime_length: number, generator?: number): DiffieHellman;
+    export function createDiffieHellman(prime: Buffer): DiffieHellman;
+    export function createDiffieHellman(prime: string, prime_encoding: HexBase64Latin1Encoding): DiffieHellman;
+    export function createDiffieHellman(prime: string, prime_encoding: HexBase64Latin1Encoding, generator: number | Buffer): DiffieHellman;
+    export function createDiffieHellman(prime: string, prime_encoding: HexBase64Latin1Encoding, generator: string, generator_encoding: HexBase64Latin1Encoding): DiffieHellman;
+    export interface DiffieHellman {
+        generateKeys(): Buffer;
+        generateKeys(encoding: HexBase64Latin1Encoding): string;
+        computeSecret(other_public_key: Buffer): Buffer;
+        computeSecret(other_public_key: string, input_encoding: HexBase64Latin1Encoding): Buffer;
+        computeSecret(other_public_key: string, input_encoding: HexBase64Latin1Encoding, output_encoding: HexBase64Latin1Encoding): string;
+        getPrime(): Buffer;
+        getPrime(encoding: HexBase64Latin1Encoding): string;
+        getGenerator(): Buffer;
+        getGenerator(encoding: HexBase64Latin1Encoding): string;
+        getPublicKey(): Buffer;
+        getPublicKey(encoding: HexBase64Latin1Encoding): string;
+        getPrivateKey(): Buffer;
+        getPrivateKey(encoding: HexBase64Latin1Encoding): string;
+        setPublicKey(public_key: Buffer): void;
+        setPublicKey(public_key: string, encoding: string): void;
+        setPrivateKey(private_key: Buffer): void;
+        setPrivateKey(private_key: string, encoding: string): void;
+        verifyError: number;
+    }
+    export function getDiffieHellman(group_name: string): DiffieHellman;
+    export function pbkdf2(password: string | Buffer, salt: string | Buffer, iterations: number, keylen: number, digest: string, callback: (err: Error, derivedKey: Buffer) => any): void;
+    export function pbkdf2Sync(password: string | Buffer, salt: string | Buffer, iterations: number, keylen: number, digest: string): Buffer;
+    export function randomBytes(size: number): Buffer;
+    export function randomBytes(size: number, callback: (err: Error, buf: Buffer) => void): void;
+    export function pseudoRandomBytes(size: number): Buffer;
+    export function pseudoRandomBytes(size: number, callback: (err: Error, buf: Buffer) => void): void;
+    export function randomFillSync(buffer: Buffer | Uint8Array, offset?: number, size?: number): Buffer;
+    export function randomFill(buffer: Buffer, callback: (err: Error, buf: Buffer) => void): void;
+    export function randomFill(buffer: Uint8Array, callback: (err: Error, buf: Uint8Array) => void): void;
+    export function randomFill(buffer: Buffer, offset: number, callback: (err: Error, buf: Buffer) => void): void;
+    export function randomFill(buffer: Uint8Array, offset: number, callback: (err: Error, buf: Uint8Array) => void): void;
+    export function randomFill(buffer: Buffer, offset: number, size: number, callback: (err: Error, buf: Buffer) => void): void;
+    export function randomFill(buffer: Uint8Array, offset: number, size: number, callback: (err: Error, buf: Uint8Array) => void): void;
+    export interface RsaPublicKey {
+        key: string;
+        padding?: number;
+    }
+    export interface RsaPrivateKey {
+        key: string;
+        passphrase?: string;
+        padding?: number;
+    }
+    export function publicEncrypt(public_key: string | RsaPublicKey, buffer: Buffer): Buffer;
+    export function privateDecrypt(private_key: string | RsaPrivateKey, buffer: Buffer): Buffer;
+    export function privateEncrypt(private_key: string | RsaPrivateKey, buffer: Buffer): Buffer;
+    export function publicDecrypt(public_key: string | RsaPublicKey, buffer: Buffer): Buffer;
+    export function getCiphers(): string[];
+    export function getCurves(): string[];
+    export function getHashes(): string[];
+    export interface ECDH {
+        generateKeys(): Buffer;
+        generateKeys(encoding: HexBase64Latin1Encoding): string;
+        generateKeys(encoding: HexBase64Latin1Encoding, format: ECDHKeyFormat): string;
+        computeSecret(other_public_key: Buffer): Buffer;
+        computeSecret(other_public_key: string, input_encoding: HexBase64Latin1Encoding): Buffer;
+        computeSecret(other_public_key: string, input_encoding: HexBase64Latin1Encoding, output_encoding: HexBase64Latin1Encoding): string;
+        getPrivateKey(): Buffer;
+        getPrivateKey(encoding: HexBase64Latin1Encoding): string;
+        getPublicKey(): Buffer;
+        getPublicKey(encoding: HexBase64Latin1Encoding): string;
+        getPublicKey(encoding: HexBase64Latin1Encoding, format: ECDHKeyFormat): string;
+        setPrivateKey(private_key: Buffer): void;
+        setPrivateKey(private_key: string, encoding: HexBase64Latin1Encoding): void;
+    }
+    export function createECDH(curve_name: string): ECDH;
+    export function timingSafeEqual(a: Buffer, b: Buffer): boolean;
+    export var DEFAULT_ENCODING: string;
 }
 
 declare module "stream" {
-	import * as events from "events";
+    import * as events from "events";
 
-	class internal extends events.EventEmitter {
-		pipe<T extends NodeJS.WritableStream>(destination: T, options?: { end?: boolean; }): T;
-	}
+    class internal extends events.EventEmitter {
+        pipe<T extends NodeJS.WritableStream>(destination: T, options?: { end?: boolean; }): T;
+    }
 
-	namespace internal {
+    namespace internal {
+        export class Stream extends internal { }
 
-		export class Stream extends internal { }
+        export interface ReadableOptions {
+            highWaterMark?: number;
+            encoding?: string;
+            objectMode?: boolean;
+            read?: (this: Readable, size?: number) => any;
+            destroy?: (error?: Error) => any;
+        }
 
-		export interface ReadableOptions {
-			highWaterMark?: number;
-			encoding?: string;
-			objectMode?: boolean;
-			read?: (this: Readable, size?: number) => any;
-		}
-
-		export class Readable extends Stream implements NodeJS.ReadableStream {
-			readable: boolean;
-			constructor(opts?: ReadableOptions);
-			_read(size: number): void;
-			read(size?: number): any;
-			setEncoding(encoding: string): this;
-			pause(): this;
-			resume(): this;
-			isPaused(): boolean;
-			pipe<T extends NodeJS.WritableStream>(destination: T, options?: { end?: boolean; }): T;
-			unpipe<T extends NodeJS.WritableStream>(destination?: T): this;
-			unshift(chunk: any): void;
-			wrap(oldStream: NodeJS.ReadableStream): Readable;
-			push(chunk: any, encoding?: string): boolean;
+        export class Readable extends Stream implements NodeJS.ReadableStream {
+            readable: boolean;
+            readonly readableHighWaterMark: number;
+            constructor(opts?: ReadableOptions);
+            _read(size: number): void;
+            read(size?: number): any;
+            setEncoding(encoding: string): this;
+            pause(): this;
+            resume(): this;
+            isPaused(): boolean;
+            unpipe<T extends NodeJS.WritableStream>(destination?: T): this;
+            unshift(chunk: any): void;
+            wrap(oldStream: NodeJS.ReadableStream): this;
+            push(chunk: any, encoding?: string): boolean;
+            _destroy(err: Error, callback: Function): void;
+            destroy(error?: Error): void;
 
             /**
              * Event emitter
              * The defined events on documents including:
-             *   1. close
-             *   2. data
-             *   3. end
-             *   4. readable
-             *   5. error
-             **/
-			addListener(event: string, listener: Function): this;
-			addListener(event: string, listener: Function): this;
-			addListener(event: "close", listener: () => void): this;
-			addListener(event: "data", listener: (chunk: Buffer | string) => void): this;
-			addListener(event: "end", listener: () => void): this;
-			addListener(event: "readable", listener: () => void): this;
-			addListener(event: "error", listener: (err: Error) => void): this;
+             * 1. close
+             * 2. data
+             * 3. end
+             * 4. readable
+             * 5. error
+             */
+            addListener(event: string, listener: (...args: any[]) => void): this;
+            addListener(event: "close", listener: () => void): this;
+            addListener(event: "data", listener: (chunk: Buffer | string) => void): this;
+            addListener(event: "end", listener: () => void): this;
+            addListener(event: "readable", listener: () => void): this;
+            addListener(event: "error", listener: (err: Error) => void): this;
 
-			emit(event: string | symbol, ...args: any[]): boolean;
-			emit(event: "close"): boolean;
-			emit(event: "data", chunk: Buffer | string): boolean;
-			emit(event: "end"): boolean;
-			emit(event: "readable"): boolean;
-			emit(event: "error", err: Error): boolean;
+            emit(event: string | symbol, ...args: any[]): boolean;
+            emit(event: "close"): boolean;
+            emit(event: "data", chunk: Buffer | string): boolean;
+            emit(event: "end"): boolean;
+            emit(event: "readable"): boolean;
+            emit(event: "error", err: Error): boolean;
 
-			on(event: string, listener: Function): this;
-			on(event: "close", listener: () => void): this;
-			on(event: "data", listener: (chunk: Buffer | string) => void): this;
-			on(event: "end", listener: () => void): this;
-			on(event: "readable", listener: () => void): this;
-			on(event: "error", listener: (err: Error) => void): this;
+            on(event: string, listener: (...args: any[]) => void): this;
+            on(event: "close", listener: () => void): this;
+            on(event: "data", listener: (chunk: Buffer | string) => void): this;
+            on(event: "end", listener: () => void): this;
+            on(event: "readable", listener: () => void): this;
+            on(event: "error", listener: (err: Error) => void): this;
 
-			once(event: string, listener: Function): this;
-			once(event: "close", listener: () => void): this;
-			once(event: "data", listener: (chunk: Buffer | string) => void): this;
-			once(event: "end", listener: () => void): this;
-			once(event: "readable", listener: () => void): this;
-			once(event: "error", listener: (err: Error) => void): this;
+            once(event: string, listener: (...args: any[]) => void): this;
+            once(event: "close", listener: () => void): this;
+            once(event: "data", listener: (chunk: Buffer | string) => void): this;
+            once(event: "end", listener: () => void): this;
+            once(event: "readable", listener: () => void): this;
+            once(event: "error", listener: (err: Error) => void): this;
 
-			prependListener(event: string, listener: Function): this;
-			prependListener(event: "close", listener: () => void): this;
-			prependListener(event: "data", listener: (chunk: Buffer | string) => void): this;
-			prependListener(event: "end", listener: () => void): this;
-			prependListener(event: "readable", listener: () => void): this;
-			prependListener(event: "error", listener: (err: Error) => void): this;
+            prependListener(event: string, listener: (...args: any[]) => void): this;
+            prependListener(event: "close", listener: () => void): this;
+            prependListener(event: "data", listener: (chunk: Buffer | string) => void): this;
+            prependListener(event: "end", listener: () => void): this;
+            prependListener(event: "readable", listener: () => void): this;
+            prependListener(event: "error", listener: (err: Error) => void): this;
 
-			prependOnceListener(event: string, listener: Function): this;
-			prependOnceListener(event: "close", listener: () => void): this;
-			prependOnceListener(event: "data", listener: (chunk: Buffer | string) => void): this;
-			prependOnceListener(event: "end", listener: () => void): this;
-			prependOnceListener(event: "readable", listener: () => void): this;
-			prependOnceListener(event: "error", listener: (err: Error) => void): this;
+            prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+            prependOnceListener(event: "close", listener: () => void): this;
+            prependOnceListener(event: "data", listener: (chunk: Buffer | string) => void): this;
+            prependOnceListener(event: "end", listener: () => void): this;
+            prependOnceListener(event: "readable", listener: () => void): this;
+            prependOnceListener(event: "error", listener: (err: Error) => void): this;
 
-			removeListener(event: string, listener: Function): this;
-			removeListener(event: "close", listener: () => void): this;
-			removeListener(event: "data", listener: (chunk: Buffer | string) => void): this;
-			removeListener(event: "end", listener: () => void): this;
-			removeListener(event: "readable", listener: () => void): this;
-			removeListener(event: "error", listener: (err: Error) => void): this;
-		}
+            removeListener(event: string, listener: (...args: any[]) => void): this;
+            removeListener(event: "close", listener: () => void): this;
+            removeListener(event: "data", listener: (chunk: Buffer | string) => void): this;
+            removeListener(event: "end", listener: () => void): this;
+            removeListener(event: "readable", listener: () => void): this;
+            removeListener(event: "error", listener: (err: Error) => void): this;
+        }
 
-		export interface WritableOptions {
-			highWaterMark?: number;
-			decodeStrings?: boolean;
-			objectMode?: boolean;
-			write?: (chunk: string | Buffer, encoding: string, callback: Function) => any;
-			writev?: (chunks: { chunk: string | Buffer, encoding: string }[], callback: Function) => any;
-		}
+        export interface WritableOptions {
+            highWaterMark?: number;
+            decodeStrings?: boolean;
+            objectMode?: boolean;
+            write?: (chunk: any, encoding: string, callback: Function) => any;
+            writev?: (chunks: Array<{ chunk: any, encoding: string }>, callback: Function) => any;
+            destroy?: (error?: Error) => any;
+            final?: (callback: (error?: Error) => void) => void;
+        }
 
-		export class Writable extends Stream implements NodeJS.WritableStream {
-			writable: boolean;
-			constructor(opts?: WritableOptions);
-			_write(chunk: any, encoding: string, callback: Function): void;
-			write(chunk: any, cb?: Function): boolean;
-			write(chunk: any, encoding?: string, cb?: Function): boolean;
-			setDefaultEncoding(encoding: string): this;
-			end(): void;
-			end(chunk: any, cb?: Function): void;
-			end(chunk: any, encoding?: string, cb?: Function): void;
+        export class Writable extends Stream implements NodeJS.WritableStream {
+            writable: boolean;
+            readonly writableHighWaterMark: number;
+            constructor(opts?: WritableOptions);
+            _write(chunk: any, encoding: string, callback: (err?: Error) => void): void;
+            _writev?(chunks: Array<{ chunk: any, encoding: string }>, callback: (err?: Error) => void): void;
+            _destroy(err: Error, callback: Function): void;
+            _final(callback: Function): void;
+            write(chunk: any, cb?: Function): boolean;
+            write(chunk: any, encoding?: string, cb?: Function): boolean;
+            setDefaultEncoding(encoding: string): this;
+            end(cb?: Function): void;
+            end(chunk: any, cb?: Function): void;
+            end(chunk: any, encoding?: string, cb?: Function): void;
+            cork(): void;
+            uncork(): void;
+            destroy(error?: Error): void;
 
             /**
              * Event emitter
              * The defined events on documents including:
-             *   1. close
-             *   2. drain
-             *   3. error
-             *   4. finish
-             *   5. pipe
-             *   6. unpipe
-             **/
-			addListener(event: string, listener: Function): this;
-			addListener(event: "close", listener: () => void): this;
-			addListener(event: "drain", listener: () => void): this;
-			addListener(event: "error", listener: (err: Error) => void): this;
-			addListener(event: "finish", listener: () => void): this;
-			addListener(event: "pipe", listener: (src: Readable) => void): this;
-			addListener(event: "unpipe", listener: (src: Readable) => void): this;
+             * 1. close
+             * 2. drain
+             * 3. error
+             * 4. finish
+             * 5. pipe
+             * 6. unpipe
+             */
+            addListener(event: string, listener: (...args: any[]) => void): this;
+            addListener(event: "close", listener: () => void): this;
+            addListener(event: "drain", listener: () => void): this;
+            addListener(event: "error", listener: (err: Error) => void): this;
+            addListener(event: "finish", listener: () => void): this;
+            addListener(event: "pipe", listener: (src: Readable) => void): this;
+            addListener(event: "unpipe", listener: (src: Readable) => void): this;
 
-			emit(event: string | symbol, ...args: any[]): boolean;
-			emit(event: "close"): boolean;
-			emit(event: "drain", chunk: Buffer | string): boolean;
-			emit(event: "error", err: Error): boolean;
-			emit(event: "finish"): boolean;
-			emit(event: "pipe", src: Readable): boolean;
-			emit(event: "unpipe", src: Readable): boolean;
+            emit(event: string | symbol, ...args: any[]): boolean;
+            emit(event: "close"): boolean;
+            emit(event: "drain", chunk: Buffer | string): boolean;
+            emit(event: "error", err: Error): boolean;
+            emit(event: "finish"): boolean;
+            emit(event: "pipe", src: Readable): boolean;
+            emit(event: "unpipe", src: Readable): boolean;
 
-			on(event: string, listener: Function): this;
-			on(event: "close", listener: () => void): this;
-			on(event: "drain", listener: () => void): this;
-			on(event: "error", listener: (err: Error) => void): this;
-			on(event: "finish", listener: () => void): this;
-			on(event: "pipe", listener: (src: Readable) => void): this;
-			on(event: "unpipe", listener: (src: Readable) => void): this;
+            on(event: string, listener: (...args: any[]) => void): this;
+            on(event: "close", listener: () => void): this;
+            on(event: "drain", listener: () => void): this;
+            on(event: "error", listener: (err: Error) => void): this;
+            on(event: "finish", listener: () => void): this;
+            on(event: "pipe", listener: (src: Readable) => void): this;
+            on(event: "unpipe", listener: (src: Readable) => void): this;
 
-			once(event: string, listener: Function): this;
-			once(event: "close", listener: () => void): this;
-			once(event: "drain", listener: () => void): this;
-			once(event: "error", listener: (err: Error) => void): this;
-			once(event: "finish", listener: () => void): this;
-			once(event: "pipe", listener: (src: Readable) => void): this;
-			once(event: "unpipe", listener: (src: Readable) => void): this;
+            once(event: string, listener: (...args: any[]) => void): this;
+            once(event: "close", listener: () => void): this;
+            once(event: "drain", listener: () => void): this;
+            once(event: "error", listener: (err: Error) => void): this;
+            once(event: "finish", listener: () => void): this;
+            once(event: "pipe", listener: (src: Readable) => void): this;
+            once(event: "unpipe", listener: (src: Readable) => void): this;
 
-			prependListener(event: string, listener: Function): this;
-			prependListener(event: "close", listener: () => void): this;
-			prependListener(event: "drain", listener: () => void): this;
-			prependListener(event: "error", listener: (err: Error) => void): this;
-			prependListener(event: "finish", listener: () => void): this;
-			prependListener(event: "pipe", listener: (src: Readable) => void): this;
-			prependListener(event: "unpipe", listener: (src: Readable) => void): this;
+            prependListener(event: string, listener: (...args: any[]) => void): this;
+            prependListener(event: "close", listener: () => void): this;
+            prependListener(event: "drain", listener: () => void): this;
+            prependListener(event: "error", listener: (err: Error) => void): this;
+            prependListener(event: "finish", listener: () => void): this;
+            prependListener(event: "pipe", listener: (src: Readable) => void): this;
+            prependListener(event: "unpipe", listener: (src: Readable) => void): this;
 
-			prependOnceListener(event: string, listener: Function): this;
-			prependOnceListener(event: "close", listener: () => void): this;
-			prependOnceListener(event: "drain", listener: () => void): this;
-			prependOnceListener(event: "error", listener: (err: Error) => void): this;
-			prependOnceListener(event: "finish", listener: () => void): this;
-			prependOnceListener(event: "pipe", listener: (src: Readable) => void): this;
-			prependOnceListener(event: "unpipe", listener: (src: Readable) => void): this;
+            prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+            prependOnceListener(event: "close", listener: () => void): this;
+            prependOnceListener(event: "drain", listener: () => void): this;
+            prependOnceListener(event: "error", listener: (err: Error) => void): this;
+            prependOnceListener(event: "finish", listener: () => void): this;
+            prependOnceListener(event: "pipe", listener: (src: Readable) => void): this;
+            prependOnceListener(event: "unpipe", listener: (src: Readable) => void): this;
 
-			removeListener(event: string, listener: Function): this;
-			removeListener(event: "close", listener: () => void): this;
-			removeListener(event: "drain", listener: () => void): this;
-			removeListener(event: "error", listener: (err: Error) => void): this;
-			removeListener(event: "finish", listener: () => void): this;
-			removeListener(event: "pipe", listener: (src: Readable) => void): this;
-			removeListener(event: "unpipe", listener: (src: Readable) => void): this;
-		}
+            removeListener(event: string, listener: (...args: any[]) => void): this;
+            removeListener(event: "close", listener: () => void): this;
+            removeListener(event: "drain", listener: () => void): this;
+            removeListener(event: "error", listener: (err: Error) => void): this;
+            removeListener(event: "finish", listener: () => void): this;
+            removeListener(event: "pipe", listener: (src: Readable) => void): this;
+            removeListener(event: "unpipe", listener: (src: Readable) => void): this;
+        }
 
-		export interface DuplexOptions extends ReadableOptions, WritableOptions {
-			allowHalfOpen?: boolean;
-			readableObjectMode?: boolean;
-			writableObjectMode?: boolean;
-		}
+        export interface DuplexOptions extends ReadableOptions, WritableOptions {
+            allowHalfOpen?: boolean;
+            readableObjectMode?: boolean;
+            writableObjectMode?: boolean;
+        }
 
-		// Note: Duplex extends both Readable and Writable.
-		export class Duplex extends Readable implements Writable {
-			writable: boolean;
-			constructor(opts?: DuplexOptions);
-			_write(chunk: any, encoding: string, callback: Function): void;
-			write(chunk: any, cb?: Function): boolean;
-			write(chunk: any, encoding?: string, cb?: Function): boolean;
-			setDefaultEncoding(encoding: string): this;
-			end(): void;
-			end(chunk: any, cb?: Function): void;
-			end(chunk: any, encoding?: string, cb?: Function): void;
-		}
+        // Note: Duplex extends both Readable and Writable.
+        export class Duplex extends Readable implements Writable {
+            writable: boolean;
+            readonly writableHighWaterMark: number;
+            constructor(opts?: DuplexOptions);
+            _write(chunk: any, encoding: string, callback: (err?: Error) => void): void;
+            _writev?(chunks: Array<{ chunk: any, encoding: string }>, callback: (err?: Error) => void): void;
+            _destroy(err: Error, callback: Function): void;
+            _final(callback: Function): void;
+            write(chunk: any, cb?: Function): boolean;
+            write(chunk: any, encoding?: string, cb?: Function): boolean;
+            setDefaultEncoding(encoding: string): this;
+            end(cb?: Function): void;
+            end(chunk: any, cb?: Function): void;
+            end(chunk: any, encoding?: string, cb?: Function): void;
+            cork(): void;
+            uncork(): void;
+        }
 
-		export interface TransformOptions extends DuplexOptions {
-			transform?: (chunk: string | Buffer, encoding: string, callback: Function) => any;
-			flush?: (callback: Function) => any;
-		}
+        export interface TransformOptions extends DuplexOptions {
+            transform?: (chunk: string | Buffer, encoding: string, callback: Function) => any;
+            flush?: (callback: Function) => any;
+        }
 
-		export class Transform extends Duplex {
-			constructor(opts?: TransformOptions);
-			_transform(chunk: any, encoding: string, callback: Function): void;
-		}
+        export class Transform extends Duplex {
+            constructor(opts?: TransformOptions);
+            _transform(chunk: any, encoding: string, callback: Function): void;
+            destroy(error?: Error): void;
+        }
 
-		export class PassThrough extends Transform { }
-	}
+        export class PassThrough extends Transform { }
+    }
 
-	export = internal;
+    export = internal;
 }
 
 declare module "util" {
-	export interface InspectOptions extends NodeJS.InspectOptions { }
-	export function format(format: any, ...param: any[]): string;
-	export function debug(string: string): void;
-	export function error(...param: any[]): void;
-	export function puts(...param: any[]): void;
-	export function print(...param: any[]): void;
-	export function log(string: string): void;
-	export function inspect(object: any, showHidden?: boolean, depth?: number | null, color?: boolean): string;
-	export function inspect(object: any, options: InspectOptions): string;
-	export function isArray(object: any): object is any[];
-	export function isRegExp(object: any): object is RegExp;
-	export function isDate(object: any): object is Date;
-	export function isError(object: any): object is Error;
-	export function inherits(constructor: any, superConstructor: any): void;
-	export function debuglog(key: string): (msg: string, ...param: any[]) => void;
-	export function isBoolean(object: any): object is boolean;
-	export function isBuffer(object: any): object is Buffer;
-	export function isFunction(object: any): boolean;
-	export function isNull(object: any): object is null;
-	export function isNullOrUndefined(object: any): object is null | undefined;
-	export function isNumber(object: any): object is number;
-	export function isObject(object: any): boolean;
-	export function isPrimitive(object: any): boolean;
-	export function isString(object: any): object is string;
-	export function isSymbol(object: any): object is symbol;
-	export function isUndefined(object: any): object is undefined;
-	export function deprecate<T extends Function>(fn: T, message: string): T;
+    export interface InspectOptions extends NodeJS.InspectOptions { }
+    export function format(format: any, ...param: any[]): string;
+    export function debug(string: string): void;
+    export function error(...param: any[]): void;
+    export function puts(...param: any[]): void;
+    export function print(...param: any[]): void;
+    export function log(string: string): void;
+    export var inspect: {
+        (object: any, showHidden?: boolean, depth?: number | null, color?: boolean): string;
+        (object: any, options: InspectOptions): string;
+        colors: {
+            [color: string]: [number, number] | undefined
+        }
+        styles: {
+            [style: string]: string | undefined
+        }
+        defaultOptions: InspectOptions;
+        custom: symbol;
+    };
+    export function isArray(object: any): object is any[];
+    export function isRegExp(object: any): object is RegExp;
+    export function isDate(object: any): object is Date;
+    export function isError(object: any): object is Error;
+    export function inherits(constructor: any, superConstructor: any): void;
+    export function debuglog(key: string): (msg: string, ...param: any[]) => void;
+    export function isBoolean(object: any): object is boolean;
+    export function isBuffer(object: any): object is Buffer;
+    export function isFunction(object: any): boolean;
+    export function isNull(object: any): object is null;
+    export function isNullOrUndefined(object: any): object is null | undefined;
+    export function isNumber(object: any): object is number;
+    export function isObject(object: any): boolean;
+    export function isPrimitive(object: any): boolean;
+    export function isString(object: any): object is string;
+    export function isSymbol(object: any): object is symbol;
+    export function isUndefined(object: any): object is undefined;
+    export function deprecate<T extends Function>(fn: T, message: string): T;
+
+    export interface CustomPromisify<TCustom extends Function> extends Function {
+        __promisify__: TCustom;
+    }
+
+    export function callbackify(fn: () => Promise<void>): (callback: (err: NodeJS.ErrnoException) => void) => void;
+    export function callbackify<TResult>(fn: () => Promise<TResult>): (callback: (err: NodeJS.ErrnoException, result: TResult) => void) => void;
+    export function callbackify<T1>(fn: (arg1: T1) => Promise<void>): (arg1: T1, callback: (err: NodeJS.ErrnoException) => void) => void;
+    export function callbackify<T1, TResult>(fn: (arg1: T1) => Promise<TResult>): (arg1: T1, callback: (err: NodeJS.ErrnoException, result: TResult) => void) => void;
+    export function callbackify<T1, T2>(fn: (arg1: T1, arg2: T2) => Promise<void>): (arg1: T1, arg2: T2, callback: (err: NodeJS.ErrnoException) => void) => void;
+    export function callbackify<T1, T2, TResult>(fn: (arg1: T1, arg2: T2) => Promise<TResult>): (arg1: T1, arg2: T2, callback: (err: NodeJS.ErrnoException, result: TResult) => void) => void;
+    export function callbackify<T1, T2, T3>(fn: (arg1: T1, arg2: T2, arg3: T3) => Promise<void>): (arg1: T1, arg2: T2, arg3: T3, callback: (err: NodeJS.ErrnoException) => void) => void;
+    export function callbackify<T1, T2, T3, TResult>(fn: (arg1: T1, arg2: T2, arg3: T3) => Promise<TResult>): (arg1: T1, arg2: T2, arg3: T3, callback: (err: NodeJS.ErrnoException, result: TResult) => void) => void;
+    export function callbackify<T1, T2, T3, T4>(fn: (arg1: T1, arg2: T2, arg3: T3, arg4: T4) => Promise<void>): (arg1: T1, arg2: T2, arg3: T3, arg4: T4, callback: (err: NodeJS.ErrnoException) => void) => void;
+    export function callbackify<T1, T2, T3, T4, TResult>(fn: (arg1: T1, arg2: T2, arg3: T3, arg4: T4) => Promise<TResult>): (arg1: T1, arg2: T2, arg3: T3, arg4: T4, callback: (err: NodeJS.ErrnoException, result: TResult) => void) => void;
+    export function callbackify<T1, T2, T3, T4, T5>(fn: (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5) => Promise<void>): (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5, callback: (err: NodeJS.ErrnoException) => void) => void;
+    export function callbackify<T1, T2, T3, T4, T5, TResult>(fn: (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5) => Promise<TResult>): (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5, callback: (err: NodeJS.ErrnoException, result: TResult) => void) => void;
+    export function callbackify<T1, T2, T3, T4, T5, T6>(fn: (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5, arg6: T6) => Promise<void>): (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5, arg6: T6, callback: (err: NodeJS.ErrnoException) => void) => void;
+    export function callbackify<T1, T2, T3, T4, T5, T6, TResult>(fn: (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5, arg6: T6) => Promise<TResult>): (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5, arg6: T6, callback: (err: NodeJS.ErrnoException, result: TResult) => void) => void;
+
+    export function promisify<TCustom extends Function>(fn: CustomPromisify<TCustom>): TCustom;
+    export function promisify<TResult>(fn: (callback: (err: Error | null, result: TResult) => void) => void): () => Promise<TResult>;
+    export function promisify(fn: (callback: (err: Error | null) => void) => void): () => Promise<void>;
+    export function promisify<T1, TResult>(fn: (arg1: T1, callback: (err: Error | null, result: TResult) => void) => void): (arg1: T1) => Promise<TResult>;
+    export function promisify<T1>(fn: (arg1: T1, callback: (err: Error | null) => void) => void): (arg1: T1) => Promise<void>;
+    export function promisify<T1, T2, TResult>(fn: (arg1: T1, arg2: T2, callback: (err: Error | null, result: TResult) => void) => void): (arg1: T1, arg2: T2) => Promise<TResult>;
+    export function promisify<T1, T2>(fn: (arg1: T1, arg2: T2, callback: (err: Error | null) => void) => void): (arg1: T1, arg2: T2) => Promise<void>;
+    export function promisify<T1, T2, T3, TResult>(fn: (arg1: T1, arg2: T2, arg3: T3, callback: (err: Error | null, result: TResult) => void) => void): (arg1: T1, arg2: T2, arg3: T3) => Promise<TResult>;
+    export function promisify<T1, T2, T3>(fn: (arg1: T1, arg2: T2, arg3: T3, callback: (err: Error | null) => void) => void): (arg1: T1, arg2: T2, arg3: T3) => Promise<void>;
+    export function promisify<T1, T2, T3, T4, TResult>(fn: (arg1: T1, arg2: T2, arg3: T3, arg4: T4, callback: (err: Error | null, result: TResult) => void) => void): (arg1: T1, arg2: T2, arg3: T3, arg4: T4) => Promise<TResult>;
+    export function promisify<T1, T2, T3, T4>(fn: (arg1: T1, arg2: T2, arg3: T3, arg4: T4, callback: (err: Error | null) => void) => void): (arg1: T1, arg2: T2, arg3: T3, arg4: T4) => Promise<void>;
+    export function promisify<T1, T2, T3, T4, T5, TResult>(fn: (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5, callback: (err: Error | null, result: TResult) => void) => void): (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5) => Promise<TResult>;
+    export function promisify<T1, T2, T3, T4, T5>(fn: (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5, callback: (err: Error | null) => void) => void): (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5) => Promise<void>;
+    export function promisify(fn: Function): Function;
+    export namespace promisify {
+        const custom: symbol;
+    }
+
+    export class TextDecoder {
+        readonly encoding: string;
+        readonly fatal: boolean;
+        readonly ignoreBOM: boolean;
+        constructor(
+            encoding?: string,
+            options?: { fatal?: boolean; ignoreBOM?: boolean }
+        );
+        decode(
+            input?:
+                Int8Array
+                | Int16Array
+                | Int32Array
+                | Uint8Array
+                | Uint16Array
+                | Uint32Array
+                | Uint8ClampedArray
+                | Float32Array
+                | Float64Array
+                | DataView
+                | ArrayBuffer
+                | null,
+            options?: { stream?: boolean }
+        ): string;
+    }
+
+    export class TextEncoder {
+        readonly encoding: string;
+        constructor();
+        encode(input?: string): Uint8Array;
+    }
 }
 
 declare module "assert" {
-	function internal(value: any, message?: string): void;
-	namespace internal {
-		export class AssertionError implements Error {
-			name: string;
-			message: string;
-			actual: any;
-			expected: any;
-			operator: string;
-			generatedMessage: boolean;
+    function internal(value: any, message?: string): void;
+    namespace internal {
+        export class AssertionError implements Error {
+            name: string;
+            message: string;
+            actual: any;
+            expected: any;
+            operator: string;
+            generatedMessage: boolean;
 
-			constructor(options?: {
-				message?: string; actual?: any; expected?: any;
-				operator?: string; stackStartFunction?: Function
-			});
-		}
+            constructor(options?: {
+                message?: string; actual?: any; expected?: any;
+                operator?: string; stackStartFunction?: Function
+            });
+        }
 
-		export function fail(actual?: any, expected?: any, message?: string, operator?: string): void;
-		export function ok(value: any, message?: string): void;
-		export function equal(actual: any, expected: any, message?: string): void;
-		export function notEqual(actual: any, expected: any, message?: string): void;
-		export function deepEqual(actual: any, expected: any, message?: string): void;
-		export function notDeepEqual(acutal: any, expected: any, message?: string): void;
-		export function strictEqual(actual: any, expected: any, message?: string): void;
-		export function notStrictEqual(actual: any, expected: any, message?: string): void;
-		export function deepStrictEqual(actual: any, expected: any, message?: string): void;
-		export function notDeepStrictEqual(actual: any, expected: any, message?: string): void;
+        export function fail(message: string): never;
+        export function fail(actual: any, expected: any, message?: string, operator?: string): never;
+        export function ok(value: any, message?: string): void;
+        export function equal(actual: any, expected: any, message?: string): void;
+        export function notEqual(actual: any, expected: any, message?: string): void;
+        export function deepEqual(actual: any, expected: any, message?: string): void;
+        export function notDeepEqual(acutal: any, expected: any, message?: string): void;
+        export function strictEqual(actual: any, expected: any, message?: string): void;
+        export function notStrictEqual(actual: any, expected: any, message?: string): void;
+        export function deepStrictEqual(actual: any, expected: any, message?: string): void;
+        export function notDeepStrictEqual(actual: any, expected: any, message?: string): void;
 
-		export function throws(block: Function, message?: string): void;
-		export function throws(block: Function, error: Function, message?: string): void;
-		export function throws(block: Function, error: RegExp, message?: string): void;
-		export function throws(block: Function, error: (err: any) => boolean, message?: string): void;
+        export function throws(block: Function, message?: string): void;
+        export function throws(block: Function, error: Function, message?: string): void;
+        export function throws(block: Function, error: RegExp, message?: string): void;
+        export function throws(block: Function, error: (err: any) => boolean, message?: string): void;
 
-		export function doesNotThrow(block: Function, message?: string): void;
-		export function doesNotThrow(block: Function, error: Function, message?: string): void;
-		export function doesNotThrow(block: Function, error: RegExp, message?: string): void;
-		export function doesNotThrow(block: Function, error: (err: any) => boolean, message?: string): void;
+        export function doesNotThrow(block: Function, message?: string): void;
+        export function doesNotThrow(block: Function, error: Function, message?: string): void;
+        export function doesNotThrow(block: Function, error: RegExp, message?: string): void;
+        export function doesNotThrow(block: Function, error: (err: any) => boolean, message?: string): void;
 
-		export function ifError(value: any): void;
-	}
+        export function ifError(value: any): void;
+    }
 
-	export = internal;
+    export = internal;
 }
 
 declare module "tty" {
-	import * as net from "net";
+    import * as net from "net";
 
-	export function isatty(fd: number): boolean;
-	export interface ReadStream extends net.Socket {
-		isRaw: boolean;
-		setRawMode(mode: boolean): void;
-		isTTY: boolean;
-	}
-	export interface WriteStream extends net.Socket {
-		columns: number;
-		rows: number;
-		isTTY: boolean;
-	}
+    export function isatty(fd: number): boolean;
+    export class ReadStream extends net.Socket {
+        isRaw: boolean;
+        setRawMode(mode: boolean): void;
+        isTTY: boolean;
+    }
+    export class WriteStream extends net.Socket {
+        columns: number;
+        rows: number;
+        isTTY: boolean;
+    }
 }
 
 declare module "domain" {
-	import * as events from "events";
+    import * as events from "events";
 
-	export class Domain extends events.EventEmitter implements NodeJS.Domain {
-		run(fn: Function): void;
-		add(emitter: events.EventEmitter): void;
-		remove(emitter: events.EventEmitter): void;
-		bind(cb: (err: Error, data: any) => any): any;
-		intercept(cb: (data: any) => any): any;
-		dispose(): void;
-		members: any[];
-		enter(): void;
-		exit(): void;
-	}
+    export class Domain extends events.EventEmitter implements NodeJS.Domain {
+        run(fn: Function): void;
+        add(emitter: events.EventEmitter): void;
+        remove(emitter: events.EventEmitter): void;
+        bind(cb: (err: Error, data: any) => any): any;
+        intercept(cb: (data: any) => any): any;
+        dispose(): void;
+        members: any[];
+        enter(): void;
+        exit(): void;
+    }
 
-	export function create(): Domain;
+    export function create(): Domain;
 }
 
 declare module "constants" {
-	export var E2BIG: number;
-	export var EACCES: number;
-	export var EADDRINUSE: number;
-	export var EADDRNOTAVAIL: number;
-	export var EAFNOSUPPORT: number;
-	export var EAGAIN: number;
-	export var EALREADY: number;
-	export var EBADF: number;
-	export var EBADMSG: number;
-	export var EBUSY: number;
-	export var ECANCELED: number;
-	export var ECHILD: number;
-	export var ECONNABORTED: number;
-	export var ECONNREFUSED: number;
-	export var ECONNRESET: number;
-	export var EDEADLK: number;
-	export var EDESTADDRREQ: number;
-	export var EDOM: number;
-	export var EEXIST: number;
-	export var EFAULT: number;
-	export var EFBIG: number;
-	export var EHOSTUNREACH: number;
-	export var EIDRM: number;
-	export var EILSEQ: number;
-	export var EINPROGRESS: number;
-	export var EINTR: number;
-	export var EINVAL: number;
-	export var EIO: number;
-	export var EISCONN: number;
-	export var EISDIR: number;
-	export var ELOOP: number;
-	export var EMFILE: number;
-	export var EMLINK: number;
-	export var EMSGSIZE: number;
-	export var ENAMETOOLONG: number;
-	export var ENETDOWN: number;
-	export var ENETRESET: number;
-	export var ENETUNREACH: number;
-	export var ENFILE: number;
-	export var ENOBUFS: number;
-	export var ENODATA: number;
-	export var ENODEV: number;
-	export var ENOENT: number;
-	export var ENOEXEC: number;
-	export var ENOLCK: number;
-	export var ENOLINK: number;
-	export var ENOMEM: number;
-	export var ENOMSG: number;
-	export var ENOPROTOOPT: number;
-	export var ENOSPC: number;
-	export var ENOSR: number;
-	export var ENOSTR: number;
-	export var ENOSYS: number;
-	export var ENOTCONN: number;
-	export var ENOTDIR: number;
-	export var ENOTEMPTY: number;
-	export var ENOTSOCK: number;
-	export var ENOTSUP: number;
-	export var ENOTTY: number;
-	export var ENXIO: number;
-	export var EOPNOTSUPP: number;
-	export var EOVERFLOW: number;
-	export var EPERM: number;
-	export var EPIPE: number;
-	export var EPROTO: number;
-	export var EPROTONOSUPPORT: number;
-	export var EPROTOTYPE: number;
-	export var ERANGE: number;
-	export var EROFS: number;
-	export var ESPIPE: number;
-	export var ESRCH: number;
-	export var ETIME: number;
-	export var ETIMEDOUT: number;
-	export var ETXTBSY: number;
-	export var EWOULDBLOCK: number;
-	export var EXDEV: number;
-	export var WSAEINTR: number;
-	export var WSAEBADF: number;
-	export var WSAEACCES: number;
-	export var WSAEFAULT: number;
-	export var WSAEINVAL: number;
-	export var WSAEMFILE: number;
-	export var WSAEWOULDBLOCK: number;
-	export var WSAEINPROGRESS: number;
-	export var WSAEALREADY: number;
-	export var WSAENOTSOCK: number;
-	export var WSAEDESTADDRREQ: number;
-	export var WSAEMSGSIZE: number;
-	export var WSAEPROTOTYPE: number;
-	export var WSAENOPROTOOPT: number;
-	export var WSAEPROTONOSUPPORT: number;
-	export var WSAESOCKTNOSUPPORT: number;
-	export var WSAEOPNOTSUPP: number;
-	export var WSAEPFNOSUPPORT: number;
-	export var WSAEAFNOSUPPORT: number;
-	export var WSAEADDRINUSE: number;
-	export var WSAEADDRNOTAVAIL: number;
-	export var WSAENETDOWN: number;
-	export var WSAENETUNREACH: number;
-	export var WSAENETRESET: number;
-	export var WSAECONNABORTED: number;
-	export var WSAECONNRESET: number;
-	export var WSAENOBUFS: number;
-	export var WSAEISCONN: number;
-	export var WSAENOTCONN: number;
-	export var WSAESHUTDOWN: number;
-	export var WSAETOOMANYREFS: number;
-	export var WSAETIMEDOUT: number;
-	export var WSAECONNREFUSED: number;
-	export var WSAELOOP: number;
-	export var WSAENAMETOOLONG: number;
-	export var WSAEHOSTDOWN: number;
-	export var WSAEHOSTUNREACH: number;
-	export var WSAENOTEMPTY: number;
-	export var WSAEPROCLIM: number;
-	export var WSAEUSERS: number;
-	export var WSAEDQUOT: number;
-	export var WSAESTALE: number;
-	export var WSAEREMOTE: number;
-	export var WSASYSNOTREADY: number;
-	export var WSAVERNOTSUPPORTED: number;
-	export var WSANOTINITIALISED: number;
-	export var WSAEDISCON: number;
-	export var WSAENOMORE: number;
-	export var WSAECANCELLED: number;
-	export var WSAEINVALIDPROCTABLE: number;
-	export var WSAEINVALIDPROVIDER: number;
-	export var WSAEPROVIDERFAILEDINIT: number;
-	export var WSASYSCALLFAILURE: number;
-	export var WSASERVICE_NOT_FOUND: number;
-	export var WSATYPE_NOT_FOUND: number;
-	export var WSA_E_NO_MORE: number;
-	export var WSA_E_CANCELLED: number;
-	export var WSAEREFUSED: number;
-	export var SIGHUP: number;
-	export var SIGINT: number;
-	export var SIGILL: number;
-	export var SIGABRT: number;
-	export var SIGFPE: number;
-	export var SIGKILL: number;
-	export var SIGSEGV: number;
-	export var SIGTERM: number;
-	export var SIGBREAK: number;
-	export var SIGWINCH: number;
-	export var SSL_OP_ALL: number;
-	export var SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION: number;
-	export var SSL_OP_CIPHER_SERVER_PREFERENCE: number;
-	export var SSL_OP_CISCO_ANYCONNECT: number;
-	export var SSL_OP_COOKIE_EXCHANGE: number;
-	export var SSL_OP_CRYPTOPRO_TLSEXT_BUG: number;
-	export var SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS: number;
-	export var SSL_OP_EPHEMERAL_RSA: number;
-	export var SSL_OP_LEGACY_SERVER_CONNECT: number;
-	export var SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER: number;
-	export var SSL_OP_MICROSOFT_SESS_ID_BUG: number;
-	export var SSL_OP_MSIE_SSLV2_RSA_PADDING: number;
-	export var SSL_OP_NETSCAPE_CA_DN_BUG: number;
-	export var SSL_OP_NETSCAPE_CHALLENGE_BUG: number;
-	export var SSL_OP_NETSCAPE_DEMO_CIPHER_CHANGE_BUG: number;
-	export var SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG: number;
-	export var SSL_OP_NO_COMPRESSION: number;
-	export var SSL_OP_NO_QUERY_MTU: number;
-	export var SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION: number;
-	export var SSL_OP_NO_SSLv2: number;
-	export var SSL_OP_NO_SSLv3: number;
-	export var SSL_OP_NO_TICKET: number;
-	export var SSL_OP_NO_TLSv1: number;
-	export var SSL_OP_NO_TLSv1_1: number;
-	export var SSL_OP_NO_TLSv1_2: number;
-	export var SSL_OP_PKCS1_CHECK_1: number;
-	export var SSL_OP_PKCS1_CHECK_2: number;
-	export var SSL_OP_SINGLE_DH_USE: number;
-	export var SSL_OP_SINGLE_ECDH_USE: number;
-	export var SSL_OP_SSLEAY_080_CLIENT_DH_BUG: number;
-	export var SSL_OP_SSLREF2_REUSE_CERT_TYPE_BUG: number;
-	export var SSL_OP_TLS_BLOCK_PADDING_BUG: number;
-	export var SSL_OP_TLS_D5_BUG: number;
-	export var SSL_OP_TLS_ROLLBACK_BUG: number;
-	export var ENGINE_METHOD_DSA: number;
-	export var ENGINE_METHOD_DH: number;
-	export var ENGINE_METHOD_RAND: number;
-	export var ENGINE_METHOD_ECDH: number;
-	export var ENGINE_METHOD_ECDSA: number;
-	export var ENGINE_METHOD_CIPHERS: number;
-	export var ENGINE_METHOD_DIGESTS: number;
-	export var ENGINE_METHOD_STORE: number;
-	export var ENGINE_METHOD_PKEY_METHS: number;
-	export var ENGINE_METHOD_PKEY_ASN1_METHS: number;
-	export var ENGINE_METHOD_ALL: number;
-	export var ENGINE_METHOD_NONE: number;
-	export var DH_CHECK_P_NOT_SAFE_PRIME: number;
-	export var DH_CHECK_P_NOT_PRIME: number;
-	export var DH_UNABLE_TO_CHECK_GENERATOR: number;
-	export var DH_NOT_SUITABLE_GENERATOR: number;
-	export var NPN_ENABLED: number;
-	export var RSA_PKCS1_PADDING: number;
-	export var RSA_SSLV23_PADDING: number;
-	export var RSA_NO_PADDING: number;
-	export var RSA_PKCS1_OAEP_PADDING: number;
-	export var RSA_X931_PADDING: number;
-	export var RSA_PKCS1_PSS_PADDING: number;
-	export var POINT_CONVERSION_COMPRESSED: number;
-	export var POINT_CONVERSION_UNCOMPRESSED: number;
-	export var POINT_CONVERSION_HYBRID: number;
-	export var O_RDONLY: number;
-	export var O_WRONLY: number;
-	export var O_RDWR: number;
-	export var S_IFMT: number;
-	export var S_IFREG: number;
-	export var S_IFDIR: number;
-	export var S_IFCHR: number;
-	export var S_IFBLK: number;
-	export var S_IFIFO: number;
-	export var S_IFSOCK: number;
-	export var S_IRWXU: number;
-	export var S_IRUSR: number;
-	export var S_IWUSR: number;
-	export var S_IXUSR: number;
-	export var S_IRWXG: number;
-	export var S_IRGRP: number;
-	export var S_IWGRP: number;
-	export var S_IXGRP: number;
-	export var S_IRWXO: number;
-	export var S_IROTH: number;
-	export var S_IWOTH: number;
-	export var S_IXOTH: number;
-	export var S_IFLNK: number;
-	export var O_CREAT: number;
-	export var O_EXCL: number;
-	export var O_NOCTTY: number;
-	export var O_DIRECTORY: number;
-	export var O_NOATIME: number;
-	export var O_NOFOLLOW: number;
-	export var O_SYNC: number;
-	export var O_SYMLINK: number;
-	export var O_DIRECT: number;
-	export var O_NONBLOCK: number;
-	export var O_TRUNC: number;
-	export var O_APPEND: number;
-	export var F_OK: number;
-	export var R_OK: number;
-	export var W_OK: number;
-	export var X_OK: number;
-	export var UV_UDP_REUSEADDR: number;
-	export var SIGQUIT: number;
-	export var SIGTRAP: number;
-	export var SIGIOT: number;
-	export var SIGBUS: number;
-	export var SIGUSR1: number;
-	export var SIGUSR2: number;
-	export var SIGPIPE: number;
-	export var SIGALRM: number;
-	export var SIGCHLD: number;
-	export var SIGSTKFLT: number;
-	export var SIGCONT: number;
-	export var SIGSTOP: number;
-	export var SIGTSTP: number;
-	export var SIGTTIN: number;
-	export var SIGTTOU: number;
-	export var SIGURG: number;
-	export var SIGXCPU: number;
-	export var SIGXFSZ: number;
-	export var SIGVTALRM: number;
-	export var SIGPROF: number;
-	export var SIGIO: number;
-	export var SIGPOLL: number;
-	export var SIGPWR: number;
-	export var SIGSYS: number;
-	export var SIGUNUSED: number;
-	export var defaultCoreCipherList: string;
-	export var defaultCipherList: string;
-	export var ENGINE_METHOD_RSA: number;
-	export var ALPN_ENABLED: number;
+    export var E2BIG: number;
+    export var EACCES: number;
+    export var EADDRINUSE: number;
+    export var EADDRNOTAVAIL: number;
+    export var EAFNOSUPPORT: number;
+    export var EAGAIN: number;
+    export var EALREADY: number;
+    export var EBADF: number;
+    export var EBADMSG: number;
+    export var EBUSY: number;
+    export var ECANCELED: number;
+    export var ECHILD: number;
+    export var ECONNABORTED: number;
+    export var ECONNREFUSED: number;
+    export var ECONNRESET: number;
+    export var EDEADLK: number;
+    export var EDESTADDRREQ: number;
+    export var EDOM: number;
+    export var EEXIST: number;
+    export var EFAULT: number;
+    export var EFBIG: number;
+    export var EHOSTUNREACH: number;
+    export var EIDRM: number;
+    export var EILSEQ: number;
+    export var EINPROGRESS: number;
+    export var EINTR: number;
+    export var EINVAL: number;
+    export var EIO: number;
+    export var EISCONN: number;
+    export var EISDIR: number;
+    export var ELOOP: number;
+    export var EMFILE: number;
+    export var EMLINK: number;
+    export var EMSGSIZE: number;
+    export var ENAMETOOLONG: number;
+    export var ENETDOWN: number;
+    export var ENETRESET: number;
+    export var ENETUNREACH: number;
+    export var ENFILE: number;
+    export var ENOBUFS: number;
+    export var ENODATA: number;
+    export var ENODEV: number;
+    export var ENOENT: number;
+    export var ENOEXEC: number;
+    export var ENOLCK: number;
+    export var ENOLINK: number;
+    export var ENOMEM: number;
+    export var ENOMSG: number;
+    export var ENOPROTOOPT: number;
+    export var ENOSPC: number;
+    export var ENOSR: number;
+    export var ENOSTR: number;
+    export var ENOSYS: number;
+    export var ENOTCONN: number;
+    export var ENOTDIR: number;
+    export var ENOTEMPTY: number;
+    export var ENOTSOCK: number;
+    export var ENOTSUP: number;
+    export var ENOTTY: number;
+    export var ENXIO: number;
+    export var EOPNOTSUPP: number;
+    export var EOVERFLOW: number;
+    export var EPERM: number;
+    export var EPIPE: number;
+    export var EPROTO: number;
+    export var EPROTONOSUPPORT: number;
+    export var EPROTOTYPE: number;
+    export var ERANGE: number;
+    export var EROFS: number;
+    export var ESPIPE: number;
+    export var ESRCH: number;
+    export var ETIME: number;
+    export var ETIMEDOUT: number;
+    export var ETXTBSY: number;
+    export var EWOULDBLOCK: number;
+    export var EXDEV: number;
+    export var WSAEINTR: number;
+    export var WSAEBADF: number;
+    export var WSAEACCES: number;
+    export var WSAEFAULT: number;
+    export var WSAEINVAL: number;
+    export var WSAEMFILE: number;
+    export var WSAEWOULDBLOCK: number;
+    export var WSAEINPROGRESS: number;
+    export var WSAEALREADY: number;
+    export var WSAENOTSOCK: number;
+    export var WSAEDESTADDRREQ: number;
+    export var WSAEMSGSIZE: number;
+    export var WSAEPROTOTYPE: number;
+    export var WSAENOPROTOOPT: number;
+    export var WSAEPROTONOSUPPORT: number;
+    export var WSAESOCKTNOSUPPORT: number;
+    export var WSAEOPNOTSUPP: number;
+    export var WSAEPFNOSUPPORT: number;
+    export var WSAEAFNOSUPPORT: number;
+    export var WSAEADDRINUSE: number;
+    export var WSAEADDRNOTAVAIL: number;
+    export var WSAENETDOWN: number;
+    export var WSAENETUNREACH: number;
+    export var WSAENETRESET: number;
+    export var WSAECONNABORTED: number;
+    export var WSAECONNRESET: number;
+    export var WSAENOBUFS: number;
+    export var WSAEISCONN: number;
+    export var WSAENOTCONN: number;
+    export var WSAESHUTDOWN: number;
+    export var WSAETOOMANYREFS: number;
+    export var WSAETIMEDOUT: number;
+    export var WSAECONNREFUSED: number;
+    export var WSAELOOP: number;
+    export var WSAENAMETOOLONG: number;
+    export var WSAEHOSTDOWN: number;
+    export var WSAEHOSTUNREACH: number;
+    export var WSAENOTEMPTY: number;
+    export var WSAEPROCLIM: number;
+    export var WSAEUSERS: number;
+    export var WSAEDQUOT: number;
+    export var WSAESTALE: number;
+    export var WSAEREMOTE: number;
+    export var WSASYSNOTREADY: number;
+    export var WSAVERNOTSUPPORTED: number;
+    export var WSANOTINITIALISED: number;
+    export var WSAEDISCON: number;
+    export var WSAENOMORE: number;
+    export var WSAECANCELLED: number;
+    export var WSAEINVALIDPROCTABLE: number;
+    export var WSAEINVALIDPROVIDER: number;
+    export var WSAEPROVIDERFAILEDINIT: number;
+    export var WSASYSCALLFAILURE: number;
+    export var WSASERVICE_NOT_FOUND: number;
+    export var WSATYPE_NOT_FOUND: number;
+    export var WSA_E_NO_MORE: number;
+    export var WSA_E_CANCELLED: number;
+    export var WSAEREFUSED: number;
+    export var SIGHUP: number;
+    export var SIGINT: number;
+    export var SIGILL: number;
+    export var SIGABRT: number;
+    export var SIGFPE: number;
+    export var SIGKILL: number;
+    export var SIGSEGV: number;
+    export var SIGTERM: number;
+    export var SIGBREAK: number;
+    export var SIGWINCH: number;
+    export var SSL_OP_ALL: number;
+    export var SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION: number;
+    export var SSL_OP_CIPHER_SERVER_PREFERENCE: number;
+    export var SSL_OP_CISCO_ANYCONNECT: number;
+    export var SSL_OP_COOKIE_EXCHANGE: number;
+    export var SSL_OP_CRYPTOPRO_TLSEXT_BUG: number;
+    export var SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS: number;
+    export var SSL_OP_EPHEMERAL_RSA: number;
+    export var SSL_OP_LEGACY_SERVER_CONNECT: number;
+    export var SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER: number;
+    export var SSL_OP_MICROSOFT_SESS_ID_BUG: number;
+    export var SSL_OP_MSIE_SSLV2_RSA_PADDING: number;
+    export var SSL_OP_NETSCAPE_CA_DN_BUG: number;
+    export var SSL_OP_NETSCAPE_CHALLENGE_BUG: number;
+    export var SSL_OP_NETSCAPE_DEMO_CIPHER_CHANGE_BUG: number;
+    export var SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG: number;
+    export var SSL_OP_NO_COMPRESSION: number;
+    export var SSL_OP_NO_QUERY_MTU: number;
+    export var SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION: number;
+    export var SSL_OP_NO_SSLv2: number;
+    export var SSL_OP_NO_SSLv3: number;
+    export var SSL_OP_NO_TICKET: number;
+    export var SSL_OP_NO_TLSv1: number;
+    export var SSL_OP_NO_TLSv1_1: number;
+    export var SSL_OP_NO_TLSv1_2: number;
+    export var SSL_OP_PKCS1_CHECK_1: number;
+    export var SSL_OP_PKCS1_CHECK_2: number;
+    export var SSL_OP_SINGLE_DH_USE: number;
+    export var SSL_OP_SINGLE_ECDH_USE: number;
+    export var SSL_OP_SSLEAY_080_CLIENT_DH_BUG: number;
+    export var SSL_OP_SSLREF2_REUSE_CERT_TYPE_BUG: number;
+    export var SSL_OP_TLS_BLOCK_PADDING_BUG: number;
+    export var SSL_OP_TLS_D5_BUG: number;
+    export var SSL_OP_TLS_ROLLBACK_BUG: number;
+    export var ENGINE_METHOD_DSA: number;
+    export var ENGINE_METHOD_DH: number;
+    export var ENGINE_METHOD_RAND: number;
+    export var ENGINE_METHOD_ECDH: number;
+    export var ENGINE_METHOD_ECDSA: number;
+    export var ENGINE_METHOD_CIPHERS: number;
+    export var ENGINE_METHOD_DIGESTS: number;
+    export var ENGINE_METHOD_STORE: number;
+    export var ENGINE_METHOD_PKEY_METHS: number;
+    export var ENGINE_METHOD_PKEY_ASN1_METHS: number;
+    export var ENGINE_METHOD_ALL: number;
+    export var ENGINE_METHOD_NONE: number;
+    export var DH_CHECK_P_NOT_SAFE_PRIME: number;
+    export var DH_CHECK_P_NOT_PRIME: number;
+    export var DH_UNABLE_TO_CHECK_GENERATOR: number;
+    export var DH_NOT_SUITABLE_GENERATOR: number;
+    export var NPN_ENABLED: number;
+    export var RSA_PKCS1_PADDING: number;
+    export var RSA_SSLV23_PADDING: number;
+    export var RSA_NO_PADDING: number;
+    export var RSA_PKCS1_OAEP_PADDING: number;
+    export var RSA_X931_PADDING: number;
+    export var RSA_PKCS1_PSS_PADDING: number;
+    export var POINT_CONVERSION_COMPRESSED: number;
+    export var POINT_CONVERSION_UNCOMPRESSED: number;
+    export var POINT_CONVERSION_HYBRID: number;
+    export var O_RDONLY: number;
+    export var O_WRONLY: number;
+    export var O_RDWR: number;
+    export var S_IFMT: number;
+    export var S_IFREG: number;
+    export var S_IFDIR: number;
+    export var S_IFCHR: number;
+    export var S_IFBLK: number;
+    export var S_IFIFO: number;
+    export var S_IFSOCK: number;
+    export var S_IRWXU: number;
+    export var S_IRUSR: number;
+    export var S_IWUSR: number;
+    export var S_IXUSR: number;
+    export var S_IRWXG: number;
+    export var S_IRGRP: number;
+    export var S_IWGRP: number;
+    export var S_IXGRP: number;
+    export var S_IRWXO: number;
+    export var S_IROTH: number;
+    export var S_IWOTH: number;
+    export var S_IXOTH: number;
+    export var S_IFLNK: number;
+    export var O_CREAT: number;
+    export var O_EXCL: number;
+    export var O_NOCTTY: number;
+    export var O_DIRECTORY: number;
+    export var O_NOATIME: number;
+    export var O_NOFOLLOW: number;
+    export var O_SYNC: number;
+    export var O_DSYNC: number;
+    export var O_SYMLINK: number;
+    export var O_DIRECT: number;
+    export var O_NONBLOCK: number;
+    export var O_TRUNC: number;
+    export var O_APPEND: number;
+    export var F_OK: number;
+    export var R_OK: number;
+    export var W_OK: number;
+    export var X_OK: number;
+    export var UV_UDP_REUSEADDR: number;
+    export var SIGQUIT: number;
+    export var SIGTRAP: number;
+    export var SIGIOT: number;
+    export var SIGBUS: number;
+    export var SIGUSR1: number;
+    export var SIGUSR2: number;
+    export var SIGPIPE: number;
+    export var SIGALRM: number;
+    export var SIGCHLD: number;
+    export var SIGSTKFLT: number;
+    export var SIGCONT: number;
+    export var SIGSTOP: number;
+    export var SIGTSTP: number;
+    export var SIGTTIN: number;
+    export var SIGTTOU: number;
+    export var SIGURG: number;
+    export var SIGXCPU: number;
+    export var SIGXFSZ: number;
+    export var SIGVTALRM: number;
+    export var SIGPROF: number;
+    export var SIGIO: number;
+    export var SIGPOLL: number;
+    export var SIGPWR: number;
+    export var SIGSYS: number;
+    export var SIGUNUSED: number;
+    export var defaultCoreCipherList: string;
+    export var defaultCipherList: string;
+    export var ENGINE_METHOD_RSA: number;
+    export var ALPN_ENABLED: number;
+}
+
+declare module "module" {
+    export = NodeJS.Module;
 }
 
 declare module "process" {
-	export = process;
+    export = process;
 }
 
+// tslint:disable-next-line:no-declare-current-package
 declare module "v8" {
-	interface HeapSpaceInfo {
-		space_name: string;
-		space_size: number;
-		space_used_size: number;
-		space_available_size: number;
-		physical_space_size: number;
-	}
+    interface HeapSpaceInfo {
+        space_name: string;
+        space_size: number;
+        space_used_size: number;
+        space_available_size: number;
+        physical_space_size: number;
+    }
 
-	//** Signifies if the --zap_code_space option is enabled or not.  1 == enabled, 0 == disabled. */
-	type DoesZapCodeSpaceFlag = 0 | 1;
+    // ** Signifies if the --zap_code_space option is enabled or not.  1 == enabled, 0 == disabled. */
+    type DoesZapCodeSpaceFlag = 0 | 1;
 
-	interface HeapInfo {
-		total_heap_size: number;
-		total_heap_size_executable: number;
-		total_physical_size: number;
-		total_available_size: number;
-		used_heap_size: number;
-		heap_size_limit: number;
-		malloced_memory: number;
-		peak_malloced_memory: number;
-		does_zap_garbage: DoesZapCodeSpaceFlag;
-	}
+    interface HeapInfo {
+        total_heap_size: number;
+        total_heap_size_executable: number;
+        total_physical_size: number;
+        total_available_size: number;
+        used_heap_size: number;
+        heap_size_limit: number;
+        malloced_memory: number;
+        peak_malloced_memory: number;
+        does_zap_garbage: DoesZapCodeSpaceFlag;
+    }
 
-	export function getHeapStatistics(): HeapInfo;
-	export function getHeapSpaceStatistics(): HeapSpaceInfo[];
-	export function setFlagsFromString(flags: string): void;
+    export function getHeapStatistics(): HeapInfo;
+    export function getHeapSpaceStatistics(): HeapSpaceInfo[];
+    export function setFlagsFromString(flags: string): void;
 }
 
 declare module "timers" {
-	export function setTimeout(callback: (...args: any[]) => void, ms: number, ...args: any[]): NodeJS.Timer;
-	export function clearTimeout(timeoutId: NodeJS.Timer): void;
-	export function setInterval(callback: (...args: any[]) => void, ms: number, ...args: any[]): NodeJS.Timer;
-	export function clearInterval(intervalId: NodeJS.Timer): void;
-	export function setImmediate(callback: (...args: any[]) => void, ...args: any[]): any;
-	export function clearImmediate(immediateId: any): void;
+    export function setTimeout(callback: (...args: any[]) => void, ms: number, ...args: any[]): NodeJS.Timer;
+    export namespace setTimeout {
+        export function __promisify__(ms: number): Promise<void>;
+        export function __promisify__<T>(ms: number, value: T): Promise<T>;
+    }
+    export function clearTimeout(timeoutId: NodeJS.Timer): void;
+    export function setInterval(callback: (...args: any[]) => void, ms: number, ...args: any[]): NodeJS.Timer;
+    export function clearInterval(intervalId: NodeJS.Timer): void;
+    export function setImmediate(callback: (...args: any[]) => void, ...args: any[]): any;
+    export namespace setImmediate {
+        export function __promisify__(): Promise<void>;
+        export function __promisify__<T>(value: T): Promise<T>;
+    }
+    export function clearImmediate(immediateId: any): void;
 }
 
 declare module "console" {
-	export = console;
+    export = console;
 }
 
 /**
- * _debugger module is not documented.
- * Source code is at https://github.com/nodejs/node/blob/master/lib/_debugger.js
+ * Async Hooks module: https://nodejs.org/api/async_hooks.html
  */
-declare module "_debugger" {
-	export interface Packet {
-		raw: string;
-		headers: string[];
-		body: Message;
-	}
+declare module "async_hooks" {
+    /**
+     * Returns the asyncId of the current execution context.
+     */
+    export function executionAsyncId(): number;
+    /// @deprecated - replaced by executionAsyncId()
+    export function currentId(): number;
 
-	export interface Message {
-		seq: number;
-		type: string;
-	}
+    /**
+     * Returns the ID of the resource responsible for calling the callback that is currently being executed.
+     */
+    export function triggerAsyncId(): number;
+    /// @deprecated - replaced by triggerAsyncId()
+    export function triggerId(): number;
 
-	export interface RequestInfo {
-		command: string;
-		arguments: any;
-	}
+    export interface HookCallbacks {
+        /**
+         * Called when a class is constructed that has the possibility to emit an asynchronous event.
+         * @param asyncId a unique ID for the async resource
+         * @param type the type of the async resource
+         * @param triggerAsyncId the unique ID of the async resource in whose execution context this async resource was created
+         * @param resource reference to the resource representing the async operation, needs to be released during destroy
+         */
+        init?(asyncId: number, type: string, triggerAsyncId: number, resource: Object): void;
 
-	export interface Request extends Message, RequestInfo {
-	}
+        /**
+         * When an asynchronous operation is initiated or completes a callback is called to notify the user.
+         * The before callback is called just before said callback is executed.
+         * @param asyncId the unique identifier assigned to the resource about to execute the callback.
+         */
+        before?(asyncId: number): void;
 
-	export interface Event extends Message {
-		event: string;
-		body?: any;
-	}
+        /**
+         * Called immediately after the callback specified in before is completed.
+         * @param asyncId the unique identifier assigned to the resource which has executed the callback.
+         */
+        after?(asyncId: number): void;
 
-	export interface Response extends Message {
-		request_seq: number;
-		success: boolean;
-		/** Contains error message if success === false. */
-		message?: string;
-		/** Contains message body if success === true. */
-		body?: any;
-	}
+        /**
+         * Called when a promise has resolve() called. This may not be in the same execution id
+         * as the promise itself.
+         * @param asyncId the unique id for the promise that was resolve()d.
+         */
+        promiseResolve?(asyncId: number): void;
 
-	export interface BreakpointMessageBody {
-		type: string;
-		target: number;
-		line: number;
-	}
+        /**
+         * Called after the resource corresponding to asyncId is destroyed
+         * @param asyncId a unique ID for the async resource
+         */
+        destroy?(asyncId: number): void;
+    }
 
-	export class Protocol {
-		res: Packet;
-		state: string;
-		execute(data: string): void;
-		serialize(rq: Request): string;
-		onResponse: (pkt: Packet) => void;
-	}
+    export interface AsyncHook {
+        /**
+         * Enable the callbacks for a given AsyncHook instance. If no callbacks are provided enabling is a noop.
+         */
+        enable(): this;
 
-	export var NO_FRAME: number;
-	export var port: number;
+        /**
+         * Disable the callbacks for a given AsyncHook instance from the global pool of AsyncHook callbacks to be executed. Once a hook has been disabled it will not be called again until enabled.
+         */
+        disable(): this;
+    }
 
-	export interface ScriptDesc {
-		name: string;
-		id: number;
-		isNative?: boolean;
-		handle?: number;
-		type: string;
-		lineOffset?: number;
-		columnOffset?: number;
-		lineCount?: number;
-	}
+    /**
+     * Registers functions to be called for different lifetime events of each async operation.
+     * @param options the callbacks to register
+     * @return an AsyncHooks instance used for disabling and enabling hooks
+     */
+    export function createHook(options: HookCallbacks): AsyncHook;
 
-	export interface Breakpoint {
-		id: number;
-		scriptId: number;
-		script: ScriptDesc;
-		line: number;
-		condition?: string;
-		scriptReq?: string;
-	}
+    export interface AsyncResourceOptions {
+        /**
+         * The ID of the execution context that created this async event.
+         * Default: `executionAsyncId()`
+         */
+        triggerAsyncId?: number;
 
-	export interface RequestHandler {
-		(err: boolean, body: Message, res: Packet): void;
-		request_seq?: number;
-	}
+        /**
+         * Disables automatic `emitDestroy` when the object is garbage collected.
+         * This usually does not need to be set (even if `emitDestroy` is called
+         * manually), unless the resource's `asyncId` is retrieved and the
+         * sensitive API's `emitDestroy` is called with it.
+         * Default: `false`
+         */
+        requireManualDestroy?: boolean;
+    }
 
-	export interface ResponseBodyHandler {
-		(err: boolean, body?: any): void;
-		request_seq?: number;
-	}
+    /**
+     * The class AsyncResource was designed to be extended by the embedder's async resources.
+     * Using this users can easily trigger the lifetime events of their own resources.
+     */
+    export class AsyncResource {
+        /**
+         * AsyncResource() is meant to be extended. Instantiating a
+         * new AsyncResource() also triggers init. If triggerAsyncId is omitted then
+         * async_hook.executionAsyncId() is used.
+         * @param type The type of async event.
+         * @param triggerAsyncId The ID of the execution context that created
+         *   this async event (default: `executionAsyncId()`), or an
+         *   AsyncResourceOptions object (since 8.10)
+         */
+        constructor(type: string, triggerAsyncId?: number | AsyncResourceOptions);
 
-	export interface ExceptionInfo {
-		text: string;
-	}
+        /**
+         * Call AsyncHooks before callbacks.
+         */
+        emitBefore(): void;
 
-	export interface BreakResponse {
-		script?: ScriptDesc;
-		exception?: ExceptionInfo;
-		sourceLine: number;
-		sourceLineText: string;
-		sourceColumn: number;
-	}
+        /**
+         * Call AsyncHooks after callbacks
+         */
+        emitAfter(): void;
 
-	export function SourceInfo(body: BreakResponse): string;
+        /**
+         * Call AsyncHooks destroy callbacks.
+         */
+        emitDestroy(): void;
 
-	export interface ClientInstance extends NodeJS.EventEmitter {
-		protocol: Protocol;
-		scripts: ScriptDesc[];
-		handles: ScriptDesc[];
-		breakpoints: Breakpoint[];
-		currentSourceLine: number;
-		currentSourceColumn: number;
-		currentSourceLineText: string;
-		currentFrame: number;
-		currentScript: string;
+        /**
+         * @return the unique ID assigned to this AsyncResource instance.
+         */
+        asyncId(): number;
 
-		connect(port: number, host: string): void;
-		req(req: any, cb: RequestHandler): void;
-		reqFrameEval(code: string, frame: number, cb: RequestHandler): void;
-		mirrorObject(obj: any, depth: number, cb: ResponseBodyHandler): void;
-		setBreakpoint(rq: BreakpointMessageBody, cb: RequestHandler): void;
-		clearBreakpoint(rq: Request, cb: RequestHandler): void;
-		listbreakpoints(cb: RequestHandler): void;
-		reqSource(from: number, to: number, cb: RequestHandler): void;
-		reqScripts(cb: any): void;
-		reqContinue(cb: RequestHandler): void;
-	}
-
-	export var Client: {
-		new(): ClientInstance
-	}
+        /**
+         * @return the trigger ID for this AsyncResource instance.
+         */
+        triggerAsyncId(): number;
+    }
 }
+
+declare module "http2" {
+    import * as events from "events";
+    import * as fs from "fs";
+    import * as net from "net";
+    import * as stream from "stream";
+    import * as tls from "tls";
+    import * as url from "url";
+
+    import { IncomingHttpHeaders, OutgoingHttpHeaders } from "http";
+    export { IncomingHttpHeaders, OutgoingHttpHeaders } from "http";
+
+    // Http2Stream
+
+    export interface StreamPriorityOptions {
+        exclusive?: boolean;
+        parent?: number;
+        weight?: number;
+        silent?: boolean;
+    }
+
+    export interface StreamState {
+        localWindowSize?: number;
+        state?: number;
+        streamLocalClose?: number;
+        streamRemoteClose?: number;
+        sumDependencyWeight?: number;
+        weight?: number;
+    }
+
+    export interface ServerStreamResponseOptions {
+        endStream?: boolean;
+        getTrailers?: (trailers: OutgoingHttpHeaders) => void;
+    }
+
+    export interface StatOptions {
+        offset: number;
+        length: number;
+    }
+
+    export interface ServerStreamFileResponseOptions {
+        statCheck?: (stats: fs.Stats, headers: OutgoingHttpHeaders, statOptions: StatOptions) => void | boolean;
+        getTrailers?: (trailers: OutgoingHttpHeaders) => void;
+        offset?: number;
+        length?: number;
+    }
+
+    export interface ServerStreamFileResponseOptionsWithError extends ServerStreamFileResponseOptions {
+        onError?: (err: NodeJS.ErrnoException) => void;
+    }
+
+    export interface Http2Stream extends stream.Duplex {
+        readonly aborted: boolean;
+        readonly destroyed: boolean;
+        priority(options: StreamPriorityOptions): void;
+        readonly rstCode: number;
+        rstStream(code: number): void;
+        rstWithNoError(): void;
+        rstWithProtocolError(): void;
+        rstWithCancel(): void;
+        rstWithRefuse(): void;
+        rstWithInternalError(): void;
+        readonly session: Http2Session;
+        setTimeout(msecs: number, callback?: () => void): void;
+        readonly state: StreamState;
+
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        addListener(event: "aborted", listener: () => void): this;
+        addListener(event: "close", listener: () => void): this;
+        addListener(event: "data", listener: (chunk: Buffer | string) => void): this;
+        addListener(event: "drain", listener: () => void): this;
+        addListener(event: "end", listener: () => void): this;
+        addListener(event: "error", listener: (err: Error) => void): this;
+        addListener(event: "finish", listener: () => void): this;
+        addListener(event: "frameError", listener: (frameType: number, errorCode: number) => void): this;
+        addListener(event: "pipe", listener: (src: stream.Readable) => void): this;
+        addListener(event: "unpipe", listener: (src: stream.Readable) => void): this;
+        addListener(event: "streamClosed", listener: (code: number) => void): this;
+        addListener(event: "timeout", listener: () => void): this;
+        addListener(event: "trailers", listener: (trailers: IncomingHttpHeaders, flags: number) => void): this;
+
+        emit(event: string | symbol, ...args: any[]): boolean;
+        emit(event: "aborted"): boolean;
+        emit(event: "close"): boolean;
+        emit(event: "data", chunk: Buffer | string): boolean;
+        emit(event: "drain"): boolean;
+        emit(event: "end"): boolean;
+        emit(event: "error", err: Error): boolean;
+        emit(event: "finish"): boolean;
+        emit(event: "frameError", frameType: number, errorCode: number): boolean;
+        emit(event: "pipe", src: stream.Readable): boolean;
+        emit(event: "unpipe", src: stream.Readable): boolean;
+        emit(event: "streamClosed", code: number): boolean;
+        emit(event: "timeout"): boolean;
+        emit(event: "trailers", trailers: IncomingHttpHeaders, flags: number): boolean;
+
+        on(event: string, listener: (...args: any[]) => void): this;
+        on(event: "aborted", listener: () => void): this;
+        on(event: "close", listener: () => void): this;
+        on(event: "data", listener: (chunk: Buffer | string) => void): this;
+        on(event: "drain", listener: () => void): this;
+        on(event: "end", listener: () => void): this;
+        on(event: "error", listener: (err: Error) => void): this;
+        on(event: "finish", listener: () => void): this;
+        on(event: "frameError", listener: (frameType: number, errorCode: number) => void): this;
+        on(event: "pipe", listener: (src: stream.Readable) => void): this;
+        on(event: "unpipe", listener: (src: stream.Readable) => void): this;
+        on(event: "streamClosed", listener: (code: number) => void): this;
+        on(event: "timeout", listener: () => void): this;
+        on(event: "trailers", listener: (trailers: IncomingHttpHeaders, flags: number) => void): this;
+
+        once(event: string, listener: (...args: any[]) => void): this;
+        once(event: "aborted", listener: () => void): this;
+        once(event: "close", listener: () => void): this;
+        once(event: "data", listener: (chunk: Buffer | string) => void): this;
+        once(event: "drain", listener: () => void): this;
+        once(event: "end", listener: () => void): this;
+        once(event: "error", listener: (err: Error) => void): this;
+        once(event: "finish", listener: () => void): this;
+        once(event: "frameError", listener: (frameType: number, errorCode: number) => void): this;
+        once(event: "pipe", listener: (src: stream.Readable) => void): this;
+        once(event: "unpipe", listener: (src: stream.Readable) => void): this;
+        once(event: "streamClosed", listener: (code: number) => void): this;
+        once(event: "timeout", listener: () => void): this;
+        once(event: "trailers", listener: (trailers: IncomingHttpHeaders, flags: number) => void): this;
+
+        prependListener(event: string, listener: (...args: any[]) => void): this;
+        prependListener(event: "aborted", listener: () => void): this;
+        prependListener(event: "close", listener: () => void): this;
+        prependListener(event: "data", listener: (chunk: Buffer | string) => void): this;
+        prependListener(event: "drain", listener: () => void): this;
+        prependListener(event: "end", listener: () => void): this;
+        prependListener(event: "error", listener: (err: Error) => void): this;
+        prependListener(event: "finish", listener: () => void): this;
+        prependListener(event: "frameError", listener: (frameType: number, errorCode: number) => void): this;
+        prependListener(event: "pipe", listener: (src: stream.Readable) => void): this;
+        prependListener(event: "unpipe", listener: (src: stream.Readable) => void): this;
+        prependListener(event: "streamClosed", listener: (code: number) => void): this;
+        prependListener(event: "timeout", listener: () => void): this;
+        prependListener(event: "trailers", listener: (trailers: IncomingHttpHeaders, flags: number) => void): this;
+
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: "aborted", listener: () => void): this;
+        prependOnceListener(event: "close", listener: () => void): this;
+        prependOnceListener(event: "data", listener: (chunk: Buffer | string) => void): this;
+        prependOnceListener(event: "drain", listener: () => void): this;
+        prependOnceListener(event: "end", listener: () => void): this;
+        prependOnceListener(event: "error", listener: (err: Error) => void): this;
+        prependOnceListener(event: "finish", listener: () => void): this;
+        prependOnceListener(event: "frameError", listener: (frameType: number, errorCode: number) => void): this;
+        prependOnceListener(event: "pipe", listener: (src: stream.Readable) => void): this;
+        prependOnceListener(event: "unpipe", listener: (src: stream.Readable) => void): this;
+        prependOnceListener(event: "streamClosed", listener: (code: number) => void): this;
+        prependOnceListener(event: "timeout", listener: () => void): this;
+        prependOnceListener(event: "trailers", listener: (trailers: IncomingHttpHeaders, flags: number) => void): this;
+    }
+
+    export interface ClientHttp2Stream extends Http2Stream {
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        addListener(event: "headers", listener: (headers: IncomingHttpHeaders, flags: number) => void): this;
+        addListener(event: "push", listener: (headers: IncomingHttpHeaders, flags: number) => void): this;
+        addListener(event: "response", listener: (headers: IncomingHttpHeaders, flags: number) => void): this;
+
+        emit(event: string | symbol, ...args: any[]): boolean;
+        emit(event: "headers", headers: IncomingHttpHeaders, flags: number): boolean;
+        emit(event: "push", headers: IncomingHttpHeaders, flags: number): boolean;
+        emit(event: "response", headers: IncomingHttpHeaders, flags: number): boolean;
+
+        on(event: string, listener: (...args: any[]) => void): this;
+        on(event: "headers", listener: (headers: IncomingHttpHeaders, flags: number) => void): this;
+        on(event: "push", listener: (headers: IncomingHttpHeaders, flags: number) => void): this;
+        on(event: "response", listener: (headers: IncomingHttpHeaders, flags: number) => void): this;
+
+        once(event: string, listener: (...args: any[]) => void): this;
+        once(event: "headers", listener: (headers: IncomingHttpHeaders, flags: number) => void): this;
+        once(event: "push", listener: (headers: IncomingHttpHeaders, flags: number) => void): this;
+        once(event: "response", listener: (headers: IncomingHttpHeaders, flags: number) => void): this;
+
+        prependListener(event: string, listener: (...args: any[]) => void): this;
+        prependListener(event: "headers", listener: (headers: IncomingHttpHeaders, flags: number) => void): this;
+        prependListener(event: "push", listener: (headers: IncomingHttpHeaders, flags: number) => void): this;
+        prependListener(event: "response", listener: (headers: IncomingHttpHeaders, flags: number) => void): this;
+
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: "headers", listener: (headers: IncomingHttpHeaders, flags: number) => void): this;
+        prependOnceListener(event: "push", listener: (headers: IncomingHttpHeaders, flags: number) => void): this;
+        prependOnceListener(event: "response", listener: (headers: IncomingHttpHeaders, flags: number) => void): this;
+    }
+
+    export interface ServerHttp2Stream extends Http2Stream {
+        additionalHeaders(headers: OutgoingHttpHeaders): void;
+        readonly headersSent: boolean;
+        readonly pushAllowed: boolean;
+        pushStream(headers: OutgoingHttpHeaders, callback?: (pushStream: ServerHttp2Stream) => void): void;
+        pushStream(headers: OutgoingHttpHeaders, options?: StreamPriorityOptions, callback?: (pushStream: ServerHttp2Stream) => void): void;
+        respond(headers?: OutgoingHttpHeaders, options?: ServerStreamResponseOptions): void;
+        respondWithFD(fd: number, headers?: OutgoingHttpHeaders, options?: ServerStreamFileResponseOptions): void;
+        respondWithFile(path: string, headers?: OutgoingHttpHeaders, options?: ServerStreamFileResponseOptionsWithError): void;
+    }
+
+    // Http2Session
+
+    export interface Settings {
+        headerTableSize?: number;
+        enablePush?: boolean;
+        initialWindowSize?: number;
+        maxFrameSize?: number;
+        maxConcurrentStreams?: number;
+        maxHeaderListSize?: number;
+    }
+
+    export interface ClientSessionRequestOptions {
+        endStream?: boolean;
+        exclusive?: boolean;
+        parent?: number;
+        weight?: number;
+        getTrailers?: (trailers: OutgoingHttpHeaders, flags: number) => void;
+    }
+
+    export interface SessionShutdownOptions {
+        graceful?: boolean;
+        errorCode?: number;
+        lastStreamID?: number;
+        opaqueData?: Buffer | Uint8Array;
+    }
+
+    export interface SessionState {
+        effectiveLocalWindowSize?: number;
+        effectiveRecvDataLength?: number;
+        nextStreamID?: number;
+        localWindowSize?: number;
+        lastProcStreamID?: number;
+        remoteWindowSize?: number;
+        outboundQueueSize?: number;
+        deflateDynamicTableSize?: number;
+        inflateDynamicTableSize?: number;
+    }
+
+    export interface Http2Session extends events.EventEmitter {
+        destroy(): void;
+        readonly destroyed: boolean;
+        readonly localSettings: Settings;
+        readonly pendingSettingsAck: boolean;
+        readonly remoteSettings: Settings;
+        rstStream(stream: Http2Stream, code?: number): void;
+        setTimeout(msecs: number, callback?: () => void): void;
+        shutdown(callback?: () => void): void;
+        shutdown(options: SessionShutdownOptions, callback?: () => void): void;
+        readonly socket: net.Socket | tls.TLSSocket;
+        readonly state: SessionState;
+        priority(stream: Http2Stream, options: StreamPriorityOptions): void;
+        settings(settings: Settings): void;
+        readonly type: number;
+
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        addListener(event: "close", listener: () => void): this;
+        addListener(event: "error", listener: (err: Error) => void): this;
+        addListener(event: "frameError", listener: (frameType: number, errorCode: number, streamID: number) => void): this;
+        addListener(event: "goaway", listener: (errorCode: number, lastStreamID: number, opaqueData: Buffer) => void): this;
+        addListener(event: "localSettings", listener: (settings: Settings) => void): this;
+        addListener(event: "remoteSettings", listener: (settings: Settings) => void): this;
+        addListener(event: "socketError", listener: (err: Error) => void): this;
+        addListener(event: "timeout", listener: () => void): this;
+
+        emit(event: string | symbol, ...args: any[]): boolean;
+        emit(event: "close"): boolean;
+        emit(event: "error", err: Error): boolean;
+        emit(event: "frameError", frameType: number, errorCode: number, streamID: number): boolean;
+        emit(event: "goaway", errorCode: number, lastStreamID: number, opaqueData: Buffer): boolean;
+        emit(event: "localSettings", settings: Settings): boolean;
+        emit(event: "remoteSettings", settings: Settings): boolean;
+        emit(event: "socketError", err: Error): boolean;
+        emit(event: "timeout"): boolean;
+
+        on(event: string, listener: (...args: any[]) => void): this;
+        on(event: "close", listener: () => void): this;
+        on(event: "error", listener: (err: Error) => void): this;
+        on(event: "frameError", listener: (frameType: number, errorCode: number, streamID: number) => void): this;
+        on(event: "goaway", listener: (errorCode: number, lastStreamID: number, opaqueData: Buffer) => void): this;
+        on(event: "localSettings", listener: (settings: Settings) => void): this;
+        on(event: "remoteSettings", listener: (settings: Settings) => void): this;
+        on(event: "socketError", listener: (err: Error) => void): this;
+        on(event: "timeout", listener: () => void): this;
+
+        once(event: string, listener: (...args: any[]) => void): this;
+        once(event: "close", listener: () => void): this;
+        once(event: "error", listener: (err: Error) => void): this;
+        once(event: "frameError", listener: (frameType: number, errorCode: number, streamID: number) => void): this;
+        once(event: "goaway", listener: (errorCode: number, lastStreamID: number, opaqueData: Buffer) => void): this;
+        once(event: "localSettings", listener: (settings: Settings) => void): this;
+        once(event: "remoteSettings", listener: (settings: Settings) => void): this;
+        once(event: "socketError", listener: (err: Error) => void): this;
+        once(event: "timeout", listener: () => void): this;
+
+        prependListener(event: string, listener: (...args: any[]) => void): this;
+        prependListener(event: "close", listener: () => void): this;
+        prependListener(event: "error", listener: (err: Error) => void): this;
+        prependListener(event: "frameError", listener: (frameType: number, errorCode: number, streamID: number) => void): this;
+        prependListener(event: "goaway", listener: (errorCode: number, lastStreamID: number, opaqueData: Buffer) => void): this;
+        prependListener(event: "localSettings", listener: (settings: Settings) => void): this;
+        prependListener(event: "remoteSettings", listener: (settings: Settings) => void): this;
+        prependListener(event: "socketError", listener: (err: Error) => void): this;
+        prependListener(event: "timeout", listener: () => void): this;
+
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: "close", listener: () => void): this;
+        prependOnceListener(event: "error", listener: (err: Error) => void): this;
+        prependOnceListener(event: "frameError", listener: (frameType: number, errorCode: number, streamID: number) => void): this;
+        prependOnceListener(event: "goaway", listener: (errorCode: number, lastStreamID: number, opaqueData: Buffer) => void): this;
+        prependOnceListener(event: "localSettings", listener: (settings: Settings) => void): this;
+        prependOnceListener(event: "remoteSettings", listener: (settings: Settings) => void): this;
+        prependOnceListener(event: "socketError", listener: (err: Error) => void): this;
+        prependOnceListener(event: "timeout", listener: () => void): this;
+    }
+
+    export interface ClientHttp2Session extends Http2Session {
+        request(headers?: OutgoingHttpHeaders, options?: ClientSessionRequestOptions): ClientHttp2Stream;
+
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        addListener(event: "connect", listener: (session: ClientHttp2Session, socket: net.Socket | tls.TLSSocket) => void): this;
+        addListener(event: "stream", listener: (stream: ClientHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
+
+        emit(event: string | symbol, ...args: any[]): boolean;
+        emit(event: "connect", session: ClientHttp2Session, socket: net.Socket | tls.TLSSocket): boolean;
+        emit(event: "stream", stream: ClientHttp2Stream, headers: IncomingHttpHeaders, flags: number): boolean;
+
+        on(event: string, listener: (...args: any[]) => void): this;
+        on(event: "connect", listener: (session: ClientHttp2Session, socket: net.Socket | tls.TLSSocket) => void): this;
+        on(event: "stream", listener: (stream: ClientHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
+
+        once(event: string, listener: (...args: any[]) => void): this;
+        once(event: "connect", listener: (session: ClientHttp2Session, socket: net.Socket | tls.TLSSocket) => void): this;
+        once(event: "stream", listener: (stream: ClientHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
+
+        prependListener(event: string, listener: (...args: any[]) => void): this;
+        prependListener(event: "connect", listener: (session: ClientHttp2Session, socket: net.Socket | tls.TLSSocket) => void): this;
+        prependListener(event: "stream", listener: (stream: ClientHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
+
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: "connect", listener: (session: ClientHttp2Session, socket: net.Socket | tls.TLSSocket) => void): this;
+        prependOnceListener(event: "stream", listener: (stream: ClientHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
+    }
+
+    export interface ServerHttp2Session extends Http2Session {
+        readonly server: Http2Server | Http2SecureServer;
+
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        addListener(event: "connect", listener: (session: ServerHttp2Session, socket: net.Socket | tls.TLSSocket) => void): this;
+        addListener(event: "stream", listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
+
+        emit(event: string | symbol, ...args: any[]): boolean;
+        emit(event: "connect", session: ServerHttp2Session, socket: net.Socket | tls.TLSSocket): boolean;
+        emit(event: "stream", stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number): boolean;
+
+        on(event: string, listener: (...args: any[]) => void): this;
+        on(event: "connect", listener: (session: ServerHttp2Session, socket: net.Socket | tls.TLSSocket) => void): this;
+        on(event: "stream", listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
+
+        once(event: string, listener: (...args: any[]) => void): this;
+        once(event: "connect", listener: (session: ServerHttp2Session, socket: net.Socket | tls.TLSSocket) => void): this;
+        once(event: "stream", listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
+
+        prependListener(event: string, listener: (...args: any[]) => void): this;
+        prependListener(event: "connect", listener: (session: ServerHttp2Session, socket: net.Socket | tls.TLSSocket) => void): this;
+        prependListener(event: "stream", listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
+
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: "connect", listener: (session: ServerHttp2Session, socket: net.Socket | tls.TLSSocket) => void): this;
+        prependOnceListener(event: "stream", listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
+    }
+
+    // Http2Server
+
+    export interface SessionOptions {
+        maxDeflateDynamicTableSize?: number;
+        maxReservedRemoteStreams?: number;
+        maxSendHeaderBlockLength?: number;
+        paddingStrategy?: number;
+        peerMaxConcurrentStreams?: number;
+        selectPadding?: (frameLen: number, maxFrameLen: number) => number;
+        settings?: Settings;
+    }
+
+    export type ClientSessionOptions = SessionOptions;
+    export type ServerSessionOptions = SessionOptions;
+
+    export interface SecureClientSessionOptions extends ClientSessionOptions, tls.ConnectionOptions { }
+    export interface SecureServerSessionOptions extends ServerSessionOptions, tls.TlsOptions { }
+
+    export interface ServerOptions extends ServerSessionOptions {
+        allowHTTP1?: boolean;
+    }
+
+    export interface SecureServerOptions extends SecureServerSessionOptions {
+        allowHTTP1?: boolean;
+    }
+
+    export interface Http2Server extends net.Server {
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        addListener(event: "request", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
+        addListener(event: "sessionError", listener: (err: Error) => void): this;
+        addListener(event: "socketError", listener: (err: Error) => void): this;
+        addListener(event: "stream", listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
+        addListener(event: "timeout", listener: () => void): this;
+
+        emit(event: string | symbol, ...args: any[]): boolean;
+        emit(event: "request", request: Http2ServerRequest, response: Http2ServerResponse): boolean;
+        emit(event: "sessionError", err: Error): boolean;
+        emit(event: "socketError", err: Error): boolean;
+        emit(event: "stream", stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number): boolean;
+        emit(event: "timeout"): boolean;
+
+        on(event: string, listener: (...args: any[]) => void): this;
+        on(event: "request", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
+        on(event: "sessionError", listener: (err: Error) => void): this;
+        on(event: "socketError", listener: (err: Error) => void): this;
+        on(event: "stream", listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
+        on(event: "timeout", listener: () => void): this;
+
+        once(event: string, listener: (...args: any[]) => void): this;
+        once(event: "request", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
+        once(event: "sessionError", listener: (err: Error) => void): this;
+        once(event: "socketError", listener: (err: Error) => void): this;
+        once(event: "stream", listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
+        once(event: "timeout", listener: () => void): this;
+
+        prependListener(event: string, listener: (...args: any[]) => void): this;
+        prependListener(event: "request", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
+        prependListener(event: "sessionError", listener: (err: Error) => void): this;
+        prependListener(event: "socketError", listener: (err: Error) => void): this;
+        prependListener(event: "stream", listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
+        prependListener(event: "timeout", listener: () => void): this;
+
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: "request", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
+        prependOnceListener(event: "sessionError", listener: (err: Error) => void): this;
+        prependOnceListener(event: "socketError", listener: (err: Error) => void): this;
+        prependOnceListener(event: "stream", listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
+        prependOnceListener(event: "timeout", listener: () => void): this;
+    }
+
+    export interface Http2SecureServer extends tls.Server {
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        addListener(event: "request", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
+        addListener(event: "sessionError", listener: (err: Error) => void): this;
+        addListener(event: "socketError", listener: (err: Error) => void): this;
+        addListener(event: "stream", listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
+        addListener(event: "timeout", listener: () => void): this;
+        addListener(event: "unknownProtocol", listener: (socket: tls.TLSSocket) => void): this;
+
+        emit(event: string | symbol, ...args: any[]): boolean;
+        emit(event: "request", request: Http2ServerRequest, response: Http2ServerResponse): boolean;
+        emit(event: "sessionError", err: Error): boolean;
+        emit(event: "socketError", err: Error): boolean;
+        emit(event: "stream", stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number): boolean;
+        emit(event: "timeout"): boolean;
+        emit(event: "unknownProtocol", socket: tls.TLSSocket): boolean;
+
+        on(event: string, listener: (...args: any[]) => void): this;
+        on(event: "request", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
+        on(event: "sessionError", listener: (err: Error) => void): this;
+        on(event: "socketError", listener: (err: Error) => void): this;
+        on(event: "stream", listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
+        on(event: "timeout", listener: () => void): this;
+        on(event: "unknownProtocol", listener: (socket: tls.TLSSocket) => void): this;
+
+        once(event: string, listener: (...args: any[]) => void): this;
+        once(event: "request", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
+        once(event: "sessionError", listener: (err: Error) => void): this;
+        once(event: "socketError", listener: (err: Error) => void): this;
+        once(event: "stream", listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
+        once(event: "timeout", listener: () => void): this;
+        once(event: "unknownProtocol", listener: (socket: tls.TLSSocket) => void): this;
+
+        prependListener(event: string, listener: (...args: any[]) => void): this;
+        prependListener(event: "request", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
+        prependListener(event: "sessionError", listener: (err: Error) => void): this;
+        prependListener(event: "socketError", listener: (err: Error) => void): this;
+        prependListener(event: "stream", listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
+        prependListener(event: "timeout", listener: () => void): this;
+        prependListener(event: "unknownProtocol", listener: (socket: tls.TLSSocket) => void): this;
+
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: "request", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
+        prependOnceListener(event: "sessionError", listener: (err: Error) => void): this;
+        prependOnceListener(event: "socketError", listener: (err: Error) => void): this;
+        prependOnceListener(event: "stream", listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
+        prependOnceListener(event: "timeout", listener: () => void): this;
+        prependOnceListener(event: "unknownProtocol", listener: (socket: tls.TLSSocket) => void): this;
+    }
+
+    export interface Http2ServerRequest extends stream.Readable {
+        headers: IncomingHttpHeaders;
+        httpVersion: string;
+        method: string;
+        rawHeaders: string[];
+        rawTrailers: string[];
+        setTimeout(msecs: number, callback?: () => void): void;
+        socket: net.Socket | tls.TLSSocket;
+        stream: ServerHttp2Stream;
+        trailers: IncomingHttpHeaders;
+        url: string;
+
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        addListener(event: "aborted", listener: (hadError: boolean, code: number) => void): this;
+
+        emit(event: string | symbol, ...args: any[]): boolean;
+        emit(event: "aborted", hadError: boolean, code: number): boolean;
+
+        on(event: string, listener: (...args: any[]) => void): this;
+        on(event: "aborted", listener: (hadError: boolean, code: number) => void): this;
+
+        once(event: string, listener: (...args: any[]) => void): this;
+        once(event: "aborted", listener: (hadError: boolean, code: number) => void): this;
+
+        prependListener(event: string, listener: (...args: any[]) => void): this;
+        prependListener(event: "aborted", listener: (hadError: boolean, code: number) => void): this;
+
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: "aborted", listener: (hadError: boolean, code: number) => void): this;
+    }
+
+    export interface Http2ServerResponse extends events.EventEmitter {
+        addTrailers(trailers: OutgoingHttpHeaders): void;
+        connection: net.Socket | tls.TLSSocket;
+        end(callback?: () => void): void;
+        end(data?: string | Buffer, callback?: () => void): void;
+        end(data?: string | Buffer, encoding?: string, callback?: () => void): void;
+        readonly finished: boolean;
+        getHeader(name: string): string;
+        getHeaderNames(): string[];
+        getHeaders(): OutgoingHttpHeaders;
+        hasHeader(name: string): boolean;
+        readonly headersSent: boolean;
+        removeHeader(name: string): void;
+        sendDate: boolean;
+        setHeader(name: string, value: number | string | string[]): void;
+        setTimeout(msecs: number, callback?: () => void): void;
+        socket: net.Socket | tls.TLSSocket;
+        statusCode: number;
+        statusMessage: '';
+        stream: ServerHttp2Stream;
+        write(chunk: string | Buffer, callback?: (err: Error) => void): boolean;
+        write(chunk: string | Buffer, encoding?: string, callback?: (err: Error) => void): boolean;
+        writeContinue(): void;
+        writeHead(statusCode: number, headers?: OutgoingHttpHeaders): void;
+        writeHead(statusCode: number, statusMessage?: string, headers?: OutgoingHttpHeaders): void;
+        createPushResponse(headers: OutgoingHttpHeaders, callback: (err: Error | null, res: Http2ServerResponse) => void): void;
+
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        addListener(event: "aborted", listener: (hadError: boolean, code: number) => void): this;
+        addListener(event: "close", listener: () => void): this;
+        addListener(event: "drain", listener: () => void): this;
+        addListener(event: "error", listener: (error: Error) => void): this;
+        addListener(event: "finish", listener: () => void): this;
+
+        emit(event: string | symbol, ...args: any[]): boolean;
+        emit(event: "aborted", hadError: boolean, code: number): boolean;
+        emit(event: "close"): boolean;
+        emit(event: "drain"): boolean;
+        emit(event: "error", error: Error): boolean;
+        emit(event: "finish"): boolean;
+
+        on(event: string, listener: (...args: any[]) => void): this;
+        on(event: "aborted", listener: (hadError: boolean, code: number) => void): this;
+        on(event: "close", listener: () => void): this;
+        on(event: "drain", listener: () => void): this;
+        on(event: "error", listener: (error: Error) => void): this;
+        on(event: "finish", listener: () => void): this;
+
+        once(event: string, listener: (...args: any[]) => void): this;
+        once(event: "aborted", listener: (hadError: boolean, code: number) => void): this;
+        once(event: "close", listener: () => void): this;
+        once(event: "drain", listener: () => void): this;
+        once(event: "error", listener: (error: Error) => void): this;
+        once(event: "finish", listener: () => void): this;
+
+        prependListener(event: string, listener: (...args: any[]) => void): this;
+        prependListener(event: "aborted", listener: (hadError: boolean, code: number) => void): this;
+        prependListener(event: "close", listener: () => void): this;
+        prependListener(event: "drain", listener: () => void): this;
+        prependListener(event: "error", listener: (error: Error) => void): this;
+        prependListener(event: "finish", listener: () => void): this;
+
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: "aborted", listener: (hadError: boolean, code: number) => void): this;
+        prependOnceListener(event: "close", listener: () => void): this;
+        prependOnceListener(event: "drain", listener: () => void): this;
+        prependOnceListener(event: "error", listener: (error: Error) => void): this;
+        prependOnceListener(event: "finish", listener: () => void): this;
+    }
+
+    // Public API
+
+    export namespace constants {
+        export const NGHTTP2_SESSION_SERVER: number;
+        export const NGHTTP2_SESSION_CLIENT: number;
+        export const NGHTTP2_STREAM_STATE_IDLE: number;
+        export const NGHTTP2_STREAM_STATE_OPEN: number;
+        export const NGHTTP2_STREAM_STATE_RESERVED_LOCAL: number;
+        export const NGHTTP2_STREAM_STATE_RESERVED_REMOTE: number;
+        export const NGHTTP2_STREAM_STATE_HALF_CLOSED_LOCAL: number;
+        export const NGHTTP2_STREAM_STATE_HALF_CLOSED_REMOTE: number;
+        export const NGHTTP2_STREAM_STATE_CLOSED: number;
+        export const NGHTTP2_NO_ERROR: number;
+        export const NGHTTP2_PROTOCOL_ERROR: number;
+        export const NGHTTP2_INTERNAL_ERROR: number;
+        export const NGHTTP2_FLOW_CONTROL_ERROR: number;
+        export const NGHTTP2_SETTINGS_TIMEOUT: number;
+        export const NGHTTP2_STREAM_CLOSED: number;
+        export const NGHTTP2_FRAME_SIZE_ERROR: number;
+        export const NGHTTP2_REFUSED_STREAM: number;
+        export const NGHTTP2_CANCEL: number;
+        export const NGHTTP2_COMPRESSION_ERROR: number;
+        export const NGHTTP2_CONNECT_ERROR: number;
+        export const NGHTTP2_ENHANCE_YOUR_CALM: number;
+        export const NGHTTP2_INADEQUATE_SECURITY: number;
+        export const NGHTTP2_HTTP_1_1_REQUIRED: number;
+        export const NGHTTP2_ERR_FRAME_SIZE_ERROR: number;
+        export const NGHTTP2_FLAG_NONE: number;
+        export const NGHTTP2_FLAG_END_STREAM: number;
+        export const NGHTTP2_FLAG_END_HEADERS: number;
+        export const NGHTTP2_FLAG_ACK: number;
+        export const NGHTTP2_FLAG_PADDED: number;
+        export const NGHTTP2_FLAG_PRIORITY: number;
+        export const DEFAULT_SETTINGS_HEADER_TABLE_SIZE: number;
+        export const DEFAULT_SETTINGS_ENABLE_PUSH: number;
+        export const DEFAULT_SETTINGS_INITIAL_WINDOW_SIZE: number;
+        export const DEFAULT_SETTINGS_MAX_FRAME_SIZE: number;
+        export const MAX_MAX_FRAME_SIZE: number;
+        export const MIN_MAX_FRAME_SIZE: number;
+        export const MAX_INITIAL_WINDOW_SIZE: number;
+        export const NGHTTP2_DEFAULT_WEIGHT: number;
+        export const NGHTTP2_SETTINGS_HEADER_TABLE_SIZE: number;
+        export const NGHTTP2_SETTINGS_ENABLE_PUSH: number;
+        export const NGHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS: number;
+        export const NGHTTP2_SETTINGS_INITIAL_WINDOW_SIZE: number;
+        export const NGHTTP2_SETTINGS_MAX_FRAME_SIZE: number;
+        export const NGHTTP2_SETTINGS_MAX_HEADER_LIST_SIZE: number;
+        export const PADDING_STRATEGY_NONE: number;
+        export const PADDING_STRATEGY_MAX: number;
+        export const PADDING_STRATEGY_CALLBACK: number;
+        export const HTTP2_HEADER_STATUS: string;
+        export const HTTP2_HEADER_METHOD: string;
+        export const HTTP2_HEADER_AUTHORITY: string;
+        export const HTTP2_HEADER_SCHEME: string;
+        export const HTTP2_HEADER_PATH: string;
+        export const HTTP2_HEADER_ACCEPT_CHARSET: string;
+        export const HTTP2_HEADER_ACCEPT_ENCODING: string;
+        export const HTTP2_HEADER_ACCEPT_LANGUAGE: string;
+        export const HTTP2_HEADER_ACCEPT_RANGES: string;
+        export const HTTP2_HEADER_ACCEPT: string;
+        export const HTTP2_HEADER_ACCESS_CONTROL_ALLOW_ORIGIN: string;
+        export const HTTP2_HEADER_AGE: string;
+        export const HTTP2_HEADER_ALLOW: string;
+        export const HTTP2_HEADER_AUTHORIZATION: string;
+        export const HTTP2_HEADER_CACHE_CONTROL: string;
+        export const HTTP2_HEADER_CONNECTION: string;
+        export const HTTP2_HEADER_CONTENT_DISPOSITION: string;
+        export const HTTP2_HEADER_CONTENT_ENCODING: string;
+        export const HTTP2_HEADER_CONTENT_LANGUAGE: string;
+        export const HTTP2_HEADER_CONTENT_LENGTH: string;
+        export const HTTP2_HEADER_CONTENT_LOCATION: string;
+        export const HTTP2_HEADER_CONTENT_MD5: string;
+        export const HTTP2_HEADER_CONTENT_RANGE: string;
+        export const HTTP2_HEADER_CONTENT_TYPE: string;
+        export const HTTP2_HEADER_COOKIE: string;
+        export const HTTP2_HEADER_DATE: string;
+        export const HTTP2_HEADER_ETAG: string;
+        export const HTTP2_HEADER_EXPECT: string;
+        export const HTTP2_HEADER_EXPIRES: string;
+        export const HTTP2_HEADER_FROM: string;
+        export const HTTP2_HEADER_HOST: string;
+        export const HTTP2_HEADER_IF_MATCH: string;
+        export const HTTP2_HEADER_IF_MODIFIED_SINCE: string;
+        export const HTTP2_HEADER_IF_NONE_MATCH: string;
+        export const HTTP2_HEADER_IF_RANGE: string;
+        export const HTTP2_HEADER_IF_UNMODIFIED_SINCE: string;
+        export const HTTP2_HEADER_LAST_MODIFIED: string;
+        export const HTTP2_HEADER_LINK: string;
+        export const HTTP2_HEADER_LOCATION: string;
+        export const HTTP2_HEADER_MAX_FORWARDS: string;
+        export const HTTP2_HEADER_PREFER: string;
+        export const HTTP2_HEADER_PROXY_AUTHENTICATE: string;
+        export const HTTP2_HEADER_PROXY_AUTHORIZATION: string;
+        export const HTTP2_HEADER_RANGE: string;
+        export const HTTP2_HEADER_REFERER: string;
+        export const HTTP2_HEADER_REFRESH: string;
+        export const HTTP2_HEADER_RETRY_AFTER: string;
+        export const HTTP2_HEADER_SERVER: string;
+        export const HTTP2_HEADER_SET_COOKIE: string;
+        export const HTTP2_HEADER_STRICT_TRANSPORT_SECURITY: string;
+        export const HTTP2_HEADER_TRANSFER_ENCODING: string;
+        export const HTTP2_HEADER_TE: string;
+        export const HTTP2_HEADER_UPGRADE: string;
+        export const HTTP2_HEADER_USER_AGENT: string;
+        export const HTTP2_HEADER_VARY: string;
+        export const HTTP2_HEADER_VIA: string;
+        export const HTTP2_HEADER_WWW_AUTHENTICATE: string;
+        export const HTTP2_HEADER_HTTP2_SETTINGS: string;
+        export const HTTP2_HEADER_KEEP_ALIVE: string;
+        export const HTTP2_HEADER_PROXY_CONNECTION: string;
+        export const HTTP2_METHOD_ACL: string;
+        export const HTTP2_METHOD_BASELINE_CONTROL: string;
+        export const HTTP2_METHOD_BIND: string;
+        export const HTTP2_METHOD_CHECKIN: string;
+        export const HTTP2_METHOD_CHECKOUT: string;
+        export const HTTP2_METHOD_CONNECT: string;
+        export const HTTP2_METHOD_COPY: string;
+        export const HTTP2_METHOD_DELETE: string;
+        export const HTTP2_METHOD_GET: string;
+        export const HTTP2_METHOD_HEAD: string;
+        export const HTTP2_METHOD_LABEL: string;
+        export const HTTP2_METHOD_LINK: string;
+        export const HTTP2_METHOD_LOCK: string;
+        export const HTTP2_METHOD_MERGE: string;
+        export const HTTP2_METHOD_MKACTIVITY: string;
+        export const HTTP2_METHOD_MKCALENDAR: string;
+        export const HTTP2_METHOD_MKCOL: string;
+        export const HTTP2_METHOD_MKREDIRECTREF: string;
+        export const HTTP2_METHOD_MKWORKSPACE: string;
+        export const HTTP2_METHOD_MOVE: string;
+        export const HTTP2_METHOD_OPTIONS: string;
+        export const HTTP2_METHOD_ORDERPATCH: string;
+        export const HTTP2_METHOD_PATCH: string;
+        export const HTTP2_METHOD_POST: string;
+        export const HTTP2_METHOD_PRI: string;
+        export const HTTP2_METHOD_PROPFIND: string;
+        export const HTTP2_METHOD_PROPPATCH: string;
+        export const HTTP2_METHOD_PUT: string;
+        export const HTTP2_METHOD_REBIND: string;
+        export const HTTP2_METHOD_REPORT: string;
+        export const HTTP2_METHOD_SEARCH: string;
+        export const HTTP2_METHOD_TRACE: string;
+        export const HTTP2_METHOD_UNBIND: string;
+        export const HTTP2_METHOD_UNCHECKOUT: string;
+        export const HTTP2_METHOD_UNLINK: string;
+        export const HTTP2_METHOD_UNLOCK: string;
+        export const HTTP2_METHOD_UPDATE: string;
+        export const HTTP2_METHOD_UPDATEREDIRECTREF: string;
+        export const HTTP2_METHOD_VERSION_CONTROL: string;
+        export const HTTP_STATUS_CONTINUE: number;
+        export const HTTP_STATUS_SWITCHING_PROTOCOLS: number;
+        export const HTTP_STATUS_PROCESSING: number;
+        export const HTTP_STATUS_OK: number;
+        export const HTTP_STATUS_CREATED: number;
+        export const HTTP_STATUS_ACCEPTED: number;
+        export const HTTP_STATUS_NON_AUTHORITATIVE_INFORMATION: number;
+        export const HTTP_STATUS_NO_CONTENT: number;
+        export const HTTP_STATUS_RESET_CONTENT: number;
+        export const HTTP_STATUS_PARTIAL_CONTENT: number;
+        export const HTTP_STATUS_MULTI_STATUS: number;
+        export const HTTP_STATUS_ALREADY_REPORTED: number;
+        export const HTTP_STATUS_IM_USED: number;
+        export const HTTP_STATUS_MULTIPLE_CHOICES: number;
+        export const HTTP_STATUS_MOVED_PERMANENTLY: number;
+        export const HTTP_STATUS_FOUND: number;
+        export const HTTP_STATUS_SEE_OTHER: number;
+        export const HTTP_STATUS_NOT_MODIFIED: number;
+        export const HTTP_STATUS_USE_PROXY: number;
+        export const HTTP_STATUS_TEMPORARY_REDIRECT: number;
+        export const HTTP_STATUS_PERMANENT_REDIRECT: number;
+        export const HTTP_STATUS_BAD_REQUEST: number;
+        export const HTTP_STATUS_UNAUTHORIZED: number;
+        export const HTTP_STATUS_PAYMENT_REQUIRED: number;
+        export const HTTP_STATUS_FORBIDDEN: number;
+        export const HTTP_STATUS_NOT_FOUND: number;
+        export const HTTP_STATUS_METHOD_NOT_ALLOWED: number;
+        export const HTTP_STATUS_NOT_ACCEPTABLE: number;
+        export const HTTP_STATUS_PROXY_AUTHENTICATION_REQUIRED: number;
+        export const HTTP_STATUS_REQUEST_TIMEOUT: number;
+        export const HTTP_STATUS_CONFLICT: number;
+        export const HTTP_STATUS_GONE: number;
+        export const HTTP_STATUS_LENGTH_REQUIRED: number;
+        export const HTTP_STATUS_PRECONDITION_FAILED: number;
+        export const HTTP_STATUS_PAYLOAD_TOO_LARGE: number;
+        export const HTTP_STATUS_URI_TOO_LONG: number;
+        export const HTTP_STATUS_UNSUPPORTED_MEDIA_TYPE: number;
+        export const HTTP_STATUS_RANGE_NOT_SATISFIABLE: number;
+        export const HTTP_STATUS_EXPECTATION_FAILED: number;
+        export const HTTP_STATUS_TEAPOT: number;
+        export const HTTP_STATUS_MISDIRECTED_REQUEST: number;
+        export const HTTP_STATUS_UNPROCESSABLE_ENTITY: number;
+        export const HTTP_STATUS_LOCKED: number;
+        export const HTTP_STATUS_FAILED_DEPENDENCY: number;
+        export const HTTP_STATUS_UNORDERED_COLLECTION: number;
+        export const HTTP_STATUS_UPGRADE_REQUIRED: number;
+        export const HTTP_STATUS_PRECONDITION_REQUIRED: number;
+        export const HTTP_STATUS_TOO_MANY_REQUESTS: number;
+        export const HTTP_STATUS_REQUEST_HEADER_FIELDS_TOO_LARGE: number;
+        export const HTTP_STATUS_UNAVAILABLE_FOR_LEGAL_REASONS: number;
+        export const HTTP_STATUS_INTERNAL_SERVER_ERROR: number;
+        export const HTTP_STATUS_NOT_IMPLEMENTED: number;
+        export const HTTP_STATUS_BAD_GATEWAY: number;
+        export const HTTP_STATUS_SERVICE_UNAVAILABLE: number;
+        export const HTTP_STATUS_GATEWAY_TIMEOUT: number;
+        export const HTTP_STATUS_HTTP_VERSION_NOT_SUPPORTED: number;
+        export const HTTP_STATUS_VARIANT_ALSO_NEGOTIATES: number;
+        export const HTTP_STATUS_INSUFFICIENT_STORAGE: number;
+        export const HTTP_STATUS_LOOP_DETECTED: number;
+        export const HTTP_STATUS_BANDWIDTH_LIMIT_EXCEEDED: number;
+        export const HTTP_STATUS_NOT_EXTENDED: number;
+        export const HTTP_STATUS_NETWORK_AUTHENTICATION_REQUIRED: number;
+    }
+
+    export function getDefaultSettings(): Settings;
+    export function getPackedSettings(settings: Settings): Settings;
+    export function getUnpackedSettings(buf: Buffer | Uint8Array): Settings;
+
+    export function createServer(onRequestHandler?: (request: Http2ServerRequest, response: Http2ServerResponse) => void): Http2Server;
+    export function createServer(options: ServerOptions, onRequestHandler?: (request: Http2ServerRequest, response: Http2ServerResponse) => void): Http2Server;
+
+    export function createSecureServer(onRequestHandler?: (request: Http2ServerRequest, response: Http2ServerResponse) => void): Http2SecureServer;
+    export function createSecureServer(options: SecureServerOptions, onRequestHandler?: (request: Http2ServerRequest, response: Http2ServerResponse) => void): Http2SecureServer;
+
+    export function connect(authority: string | url.URL, listener?: (session: ClientHttp2Session, socket: net.Socket | tls.TLSSocket) => void): ClientHttp2Session;
+    export function connect(authority: string | url.URL, options?: ClientSessionOptions | SecureClientSessionOptions, listener?: (session: ClientHttp2Session, socket: net.Socket | tls.TLSSocket) => void): ClientHttp2Session;
+}
+
+declare module "perf_hooks" {
+    export interface PerformanceEntry {
+        /**
+         * The total number of milliseconds elapsed for this entry.
+         * This value will not be meaningful for all Performance Entry types.
+         */
+        readonly duration: number;
+
+        /**
+         * The name of the performance entry.
+         */
+        readonly name: string;
+
+        /**
+         * The high resolution millisecond timestamp marking the starting time of the Performance Entry.
+         */
+        readonly startTime: number;
+
+        /**
+         * The type of the performance entry.
+         * Currently it may be one of: 'node', 'mark', 'measure', 'gc', or 'function'.
+         */
+        readonly entryType: string;
+
+        /**
+         * When performanceEntry.entryType is equal to 'gc', the performance.kind property identifies
+         * the type of garbage collection operation that occurred.
+         * The value may be one of perf_hooks.constants.
+         */
+        readonly kind?: number;
+    }
+
+    export interface PerformanceNodeTiming extends PerformanceEntry {
+        /**
+         * The high resolution millisecond timestamp at which the Node.js process completed bootstrap.
+         */
+        readonly bootstrapComplete: number;
+
+        /**
+         * The high resolution millisecond timestamp at which cluster processing ended.
+         */
+        readonly clusterSetupEnd: number;
+
+        /**
+         * The high resolution millisecond timestamp at which cluster processing started.
+         */
+        readonly clusterSetupStart: number;
+
+        /**
+         * The high resolution millisecond timestamp at which the Node.js event loop exited.
+         */
+        readonly loopExit: number;
+
+        /**
+         * The high resolution millisecond timestamp at which the Node.js event loop started.
+         */
+        readonly loopStart: number;
+
+        /**
+         * The high resolution millisecond timestamp at which main module load ended.
+         */
+        readonly moduleLoadEnd: number;
+
+        /**
+         * The high resolution millisecond timestamp at which main module load started.
+         */
+        readonly moduleLoadStart: number;
+
+        /**
+         * The high resolution millisecond timestamp at which the Node.js process was initialized.
+         */
+        readonly nodeStart: number;
+
+        /**
+         * The high resolution millisecond timestamp at which preload module load ended.
+         */
+        readonly preloadModuleLoadEnd: number;
+
+        /**
+         * The high resolution millisecond timestamp at which preload module load started.
+         */
+        readonly preloadModuleLoadStart: number;
+
+        /**
+         * The high resolution millisecond timestamp at which third_party_main processing ended.
+         */
+        readonly thirdPartyMainEnd: number;
+
+        /**
+         * The high resolution millisecond timestamp at which third_party_main processing started.
+         */
+        readonly thirdPartyMainStart: number;
+
+        /**
+         * The high resolution millisecond timestamp at which the V8 platform was initialized.
+         */
+        readonly v8Start: number;
+    }
+
+    export interface Performance {
+        /**
+         * If name is not provided, removes all PerformanceFunction objects from the Performance Timeline.
+         * If name is provided, removes entries with name.
+         * @param name
+         */
+        clearFunctions(name?: string): void;
+
+        /**
+         * If name is not provided, removes all PerformanceMark objects from the Performance Timeline.
+         * If name is provided, removes only the named mark.
+         * @param name
+         */
+        clearMarks(name?: string): void;
+
+        /**
+         * If name is not provided, removes all PerformanceMeasure objects from the Performance Timeline.
+         * If name is provided, removes only objects whose performanceEntry.name matches name.
+         */
+        clearMeasures(name?: string): void;
+
+        /**
+         * Returns a list of all PerformanceEntry objects in chronological order with respect to performanceEntry.startTime.
+         * @return list of all PerformanceEntry objects
+         */
+        getEntries(): PerformanceEntry[];
+
+        /**
+         * Returns a list of all PerformanceEntry objects in chronological order with respect to performanceEntry.startTime
+         * whose performanceEntry.name is equal to name, and optionally, whose performanceEntry.entryType is equal to type.
+         * @param name
+         * @param type
+         * @return list of all PerformanceEntry objects
+         */
+        getEntriesByName(name: string, type?: string): PerformanceEntry[];
+
+        /**
+         * Returns a list of all PerformanceEntry objects in chronological order with respect to performanceEntry.startTime
+         * whose performanceEntry.entryType is equal to type.
+         * @param type
+         * @return list of all PerformanceEntry objects
+         */
+        getEntriesByType(type: string): PerformanceEntry[];
+
+        /**
+         * Creates a new PerformanceMark entry in the Performance Timeline.
+         * A PerformanceMark is a subclass of PerformanceEntry whose performanceEntry.entryType is always 'mark',
+         * and whose performanceEntry.duration is always 0.
+         * Performance marks are used to mark specific significant moments in the Performance Timeline.
+         * @param name
+         */
+        mark(name?: string): void;
+
+        /**
+         * Creates a new PerformanceMeasure entry in the Performance Timeline.
+         * A PerformanceMeasure is a subclass of PerformanceEntry whose performanceEntry.entryType is always 'measure',
+         * and whose performanceEntry.duration measures the number of milliseconds elapsed since startMark and endMark.
+         *
+         * The startMark argument may identify any existing PerformanceMark in the the Performance Timeline, or may identify
+         * any of the timestamp properties provided by the PerformanceNodeTiming class. If the named startMark does not exist,
+         * then startMark is set to timeOrigin by default.
+         *
+         * The endMark argument must identify any existing PerformanceMark in the the Performance Timeline or any of the timestamp
+         * properties provided by the PerformanceNodeTiming class. If the named endMark does not exist, an error will be thrown.
+         * @param name
+         * @param startMark
+         * @param endMark
+         */
+        measure(name: string, startMark: string, endMark: string): void;
+
+        /**
+         * An instance of the PerformanceNodeTiming class that provides performance metrics for specific Node.js operational milestones.
+         */
+        readonly nodeTiming: PerformanceNodeTiming;
+
+        /**
+         * @return the current high resolution millisecond timestamp
+         */
+        now(): number;
+
+        /**
+         * The timeOrigin specifies the high resolution millisecond timestamp from which all performance metric durations are measured.
+         */
+        readonly timeOrigin: number;
+
+        /**
+         * Wraps a function within a new function that measures the running time of the wrapped function.
+         * A PerformanceObserver must be subscribed to the 'function' event type in order for the timing details to be accessed.
+         * @param fn
+         */
+        timerify<T extends (...optionalParams: any[]) => any>(fn: T): T;
+    }
+
+    export interface PerformanceObserverEntryList {
+        /**
+         * @return a list of PerformanceEntry objects in chronological order with respect to performanceEntry.startTime.
+         */
+        getEntries(): PerformanceEntry[];
+
+        /**
+         * @return a list of PerformanceEntry objects in chronological order with respect to performanceEntry.startTime
+         * whose performanceEntry.name is equal to name, and optionally, whose performanceEntry.entryType is equal to type.
+         */
+        getEntriesByName(name: string, type?: string): PerformanceEntry[];
+
+        /**
+         * @return Returns a list of PerformanceEntry objects in chronological order with respect to performanceEntry.startTime
+         * whose performanceEntry.entryType is equal to type.
+         */
+        getEntriesByType(type: string): PerformanceEntry[];
+    }
+
+    export type PerformanceObserverCallback = (list: PerformanceObserverEntryList, observer: PerformanceObserver) => void;
+
+    export class PerformanceObserver {
+        constructor(callback: PerformanceObserverCallback);
+
+        /**
+         * Disconnects the PerformanceObserver instance from all notifications.
+         */
+        disconnect(): void;
+
+        /**
+         * Subscribes the PerformanceObserver instance to notifications of new PerformanceEntry instances identified by options.entryTypes.
+         * When options.buffered is false, the callback will be invoked once for every PerformanceEntry instance.
+         * Property buffered defaults to false.
+         * @param options
+         */
+        observe(options: { entryTypes: string[], buffered?: boolean }): void;
+    }
+
+    export namespace constants {
+        export const NODE_PERFORMANCE_GC_MAJOR: number;
+        export const NODE_PERFORMANCE_GC_MINOR: number;
+        export const NODE_PERFORMANCE_GC_INCREMENTAL: number;
+        export const NODE_PERFORMANCE_GC_WEAKCB: number;
+    }
+
+    const performance: Performance;
+}
\ No newline at end of file
diff --git a/src/typings/require.d.ts b/src/typings/require.d.ts
index 6278f80dfe7..028ee087293 100644
--- a/src/typings/require.d.ts
+++ b/src/typings/require.d.ts
@@ -3,6 +3,28 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+declare const enum LoaderEventType {
+	LoaderAvailable = 1,
+
+	BeginLoadingScript = 10,
+	EndLoadingScriptOK = 11,
+	EndLoadingScriptError = 12,
+
+	BeginInvokeFactory = 21,
+	EndInvokeFactory = 22,
+
+	NodeBeginEvaluatingScript = 31,
+	NodeEndEvaluatingScript = 32,
+
+	NodeBeginNativeRequire = 33,
+	NodeEndNativeRequire = 34
+}
+
+declare class LoaderEvent {
+	readonly type: LoaderEventType;
+	readonly timestamp: number;
+	readonly detail: string;
+}
 
 declare var define: {
 	(moduleName: string, dependencies: string[], callback: (...args: any[]) => any): any;
@@ -20,4 +42,5 @@ declare var require: {
 	config(data: any): any;
 	onError: Function;
 	__$__nodeRequire<T>(moduleName: string): T;
-};
\ No newline at end of file
+	getStats(): ReadonlyArray<LoaderEvent>
+};
diff --git a/src/typings/vscode-textmate.d.ts b/src/typings/vscode-textmate.d.ts
index c6a1f260558..816e6bfc237 100644
--- a/src/typings/vscode-textmate.d.ts
+++ b/src/typings/vscode-textmate.d.ts
@@ -23,13 +23,16 @@ declare module "vscode-textmate" {
 		readonly name?: string;
 		readonly settings: IRawThemeSetting[];
 	}
+	export interface Thenable<T> extends PromiseLike<T> {
+	}
 	/**
 	 * A registry helper that can locate grammar file paths given scope names.
 	 */
 	export interface RegistryOptions {
 		theme?: IRawTheme;
-		getFilePath(scopeName: string): string;
+		loadGrammar(scopeName: string): Thenable<IRawGrammar>;
 		getInjections?(scopeName: string): string[];
+		getOnigLib?(): Thenable<IOnigLib>;
 	}
 	/**
 	 * A map from scope name to a language id. Please do not use language id 0.
@@ -38,10 +41,10 @@ declare module "vscode-textmate" {
 		[scopeName: string]: number;
 	}
 	/**
-	 * A map from scope name to a token type.
+	 * A map from selectors to token types.
 	 */
 	export interface ITokenTypeMap {
-		[scopeName: string]: StandardTokenType;
+		[selector: string]: StandardTokenType;
 	}
 	export const enum StandardTokenType {
 		Other = 0,
@@ -72,25 +75,25 @@ declare module "vscode-textmate" {
 		 * Load the grammar for `scopeName` and all referenced included grammars asynchronously.
 		 * Please do not use language id 0.
 		 */
-		loadGrammarWithEmbeddedLanguages(initialScopeName: string, initialLanguage: number, embeddedLanguages: IEmbeddedLanguagesMap, callback: (err: any, grammar: IGrammar) => void): void;
+		loadGrammarWithEmbeddedLanguages(initialScopeName: string, initialLanguage: number, embeddedLanguages: IEmbeddedLanguagesMap): Thenable<IGrammar>;
 		/**
 		 * Load the grammar for `scopeName` and all referenced included grammars asynchronously.
 		 * Please do not use language id 0.
 		 */
-		loadGrammarWithConfiguration(initialScopeName: string, initialLanguage: number, configuration: IGrammarConfiguration, callback: (err: any, grammar: IGrammar) => void): void;
+		loadGrammarWithConfiguration(initialScopeName: string, initialLanguage: number, configuration: IGrammarConfiguration): Thenable<IGrammar>;
 		/**
 		 * Load the grammar for `scopeName` and all referenced included grammars asynchronously.
 		 */
-		loadGrammar(initialScopeName: string, callback: (err: any, grammar: IGrammar) => void): void;
-		private _loadGrammar(initialScopeName, callback);
+		loadGrammar(initialScopeName: string): Thenable<IGrammar>;
+		private _loadGrammar(initialScopeName, initialLanguage, embeddedLanguages, tokenTypes);
 		/**
-		 * Load the grammar at `path` synchronously.
+		 * Adds a rawGrammar.
 		 */
-		loadGrammarFromPathSync(path: string, initialLanguage?: number, embeddedLanguages?: IEmbeddedLanguagesMap): IGrammar;
+		addGrammar(rawGrammar: IRawGrammar, injections?: string[], initialLanguage?: number, embeddedLanguages?: IEmbeddedLanguagesMap): Thenable<IGrammar>;
 		/**
-		 * Get the grammar for `scopeName`. The grammar must first be created via `loadGrammar` or `loadGrammarFromPathSync`.
+		 * Get the grammar for `scopeName`. The grammar must first be created via `loadGrammar` or `addGrammar`.
 		 */
-		grammarForScopeName(scopeName: string, initialLanguage?: number, embeddedLanguages?: IEmbeddedLanguagesMap, tokenTypes?: ITokenTypeMap): IGrammar;
+		grammarForScopeName(scopeName: string, initialLanguage?: number, embeddedLanguages?: IEmbeddedLanguagesMap, tokenTypes?: ITokenTypeMap): Thenable<IGrammar>;
 	}
 	/**
 	 * A grammar
@@ -179,4 +182,75 @@ declare module "vscode-textmate" {
 		equals(other: StackElement): boolean;
 	}
 	export const INITIAL: StackElement;
+	export const parseRawGrammar: (content: string, filePath: string) => IRawGrammar;
+	export interface ILocation {
+		readonly filename: string;
+		readonly line: number;
+		readonly char: number;
+	}
+	export interface ILocatable {
+		readonly $vscodeTextmateLocation?: ILocation;
+	}
+	export interface IRawGrammar extends ILocatable {
+		repository: IRawRepository;
+		readonly scopeName: string;
+		readonly patterns: IRawRule[];
+		readonly injections?: {
+			[expression: string]: IRawRule;
+		};
+		readonly injectionSelector?: string;
+		readonly fileTypes?: string[];
+		readonly name?: string;
+		readonly firstLineMatch?: string;
+	}
+	export interface IRawRepositoryMap {
+		[name: string]: IRawRule;
+		$self: IRawRule;
+		$base: IRawRule;
+	}
+	export type IRawRepository = IRawRepositoryMap & ILocatable;
+	export interface IRawRule extends ILocatable {
+		id?: number;
+		readonly include?: string;
+		readonly name?: string;
+		readonly contentName?: string;
+		readonly match?: string;
+		readonly captures?: IRawCaptures;
+		readonly begin?: string;
+		readonly beginCaptures?: IRawCaptures;
+		readonly end?: string;
+		readonly endCaptures?: IRawCaptures;
+		readonly while?: string;
+		readonly whileCaptures?: IRawCaptures;
+		readonly patterns?: IRawRule[];
+		readonly repository?: IRawRepository;
+		readonly applyEndPatternLast?: boolean;
+	}
+	export interface IRawCapturesMap {
+		[captureId: string]: IRawRule;
+	}
+	export type IRawCaptures = IRawCapturesMap & ILocatable;
+	export interface IOnigLib {
+		createOnigScanner(sources: string[]): OnigScanner;
+		createOnigString(sources: string): OnigString;
+	}
+	export interface IOnigCaptureIndex {
+		start: number;
+		end: number;
+		length: number;
+	}
+	export interface IOnigMatch {
+		index: number;
+		captureIndices: IOnigCaptureIndex[];
+		scanner: OnigScanner;
+	}
+	export interface OnigScanner {
+		findNextMatchSync(string: string | OnigString, startPosition: number): IOnigMatch;
+	}
+	export interface OnigString {
+		readonly content: string;
+		readonly dispose?: () => void;
+	}
+
+
 }
diff --git a/src/typings/vscode-xterm.d.ts b/src/typings/vscode-xterm.d.ts
index 5620b484f4c..5f1e27de082 100644
--- a/src/typings/vscode-xterm.d.ts
+++ b/src/typings/vscode-xterm.d.ts
@@ -71,6 +71,24 @@ declare module 'vscode-xterm' {
 		 */
 		enableBold?: boolean;
 
+		/**
+		 * What character atlas implementation to use. The character atlas caches drawn characters,
+		 * speeding up rendering significantly. However, it can introduce some minor rendering
+		 * artifacts.
+		 *
+		 * - 'none': Don't use an atlas.
+		 * - 'static': Generate an atlas when the terminal starts or is reconfigured. This atlas will
+		 *   only contain ASCII characters in 16 colors.
+		 * - 'dynamic': Generate an atlas using a LRU cache as characters are requested. Limited to
+		 *   ASCII characters (for now), but supports 256 colors. For characters covered by the static
+		 *   cache, it's slightly slower in comparison, since there's more overhead involved in
+		 *   managing the cache.
+		 *
+		 * Currently defaults to 'static'. This option may be removed in the future. If it is, passed
+		 * parameters will be ignored.
+		 */
+		experimentalCharAtlas?: 'none' | 'static' | 'dynamic';
+
 		/**
 		 * The font size used to render text.
 		 */
@@ -106,6 +124,15 @@ declare module 'vscode-xterm' {
 		 */
 		macOptionIsMeta?: boolean;
 
+		/**
+		 * Whether holding a modifier key will force normal selection behavior,
+		 * regardless of whether the terminal is in mouse events mode. This will
+		 * also prevent mouse events from being emitted by the terminal. For example,
+		 * this allows you to use xterm.js' regular selection inside tmux with
+		 * mouse mode enabled.
+		 */
+		macOptionClickForcesSelection?: boolean;
+
 		/**
 		 * (EXPERIMENTAL) The type of renderer to use, this allows using the
 		 * fallback DOM renderer when canvas is too slow for the environment. The
@@ -652,19 +679,40 @@ declare module 'vscode-xterm' {
 
 // Modifications to official .d.ts below
 declare module 'vscode-xterm' {
-	interface Terminal {
+	interface TerminalCore {
+		debug: boolean;
+
 		buffer: {
 			y: number;
 			ybase: number;
 			ydisp: number;
 			x: number;
+			lines: any[];
+
+			translateBufferLineToString(lineIndex: number, trimRight: boolean): string;
 		};
 
+		handler(text: string): void;
+
 		/**
 		 * Emit an event on the terminal.
 		 */
 		emit(type: string, data: any): void;
 
+		charMeasure?: { height: number, width: number };
+
+		renderer: {
+			_renderLayers: any[];
+			onIntersectionChange: any;
+		};
+	}
+
+	interface Terminal {
+		_core: TerminalCore;
+
+		webLinksInit(handler?: (event: MouseEvent, uri: string) => void, options?: ILinkMatcherOptions): void;
+		winptyCompatInit(): void;
+
 		/**
 		 * Find the next instance of the term, then scroll to and select it. If it
 		 * doesn't exist, do nothing.
@@ -680,9 +728,5 @@ declare module 'vscode-xterm' {
 		 * @return Whether a result was found.
 		 */
 		findPrevious(term: string): boolean;
-
-		webLinksInit(handler?: (event: MouseEvent, uri: string) => void, options?: ILinkMatcherOptions): void;
-		winptyCompatInit(): void;
-		charMeasure?: { height: number, width: number };
 	}
 }
diff --git a/src/typings/winreg.d.ts b/src/typings/winreg.d.ts
new file mode 100644
index 00000000000..70047d8b50f
--- /dev/null
+++ b/src/typings/winreg.d.ts
@@ -0,0 +1,338 @@
+// Type definitions for Winreg v1.2.0
+// Project: http://fresc81.github.io/node-winreg/
+// Definitions by: RX14 <https://github.com/RX14>, BobBuehler <https://github.com/BobBuehler>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare var Winreg: WinregStatic;
+
+interface WinregStatic {
+    /**
+     * Creates a registry object, which provides access to a single registry key.
+     * Note: This class is returned by a call to ```require('winreg')```.
+     *
+     * @public
+     * @class
+     *
+     * @param {@link Options} options - the options
+     *
+     * @example
+     * var Registry = require('winreg')
+     * ,   autoStartCurrentUser = new Registry({
+     *       hive: Registry.HKCU,
+     *       key:  '\\Software\\Microsoft\\Windows\\CurrentVersion\\Run'
+     *     });
+     */
+    new (options: Winreg.Options): Winreg.Registry;
+
+    /**
+     * Registry hive key HKEY_LOCAL_MACHINE.
+     * Note: For writing to this hive your program has to run with admin privileges.
+     */
+    HKLM: string;
+
+    /**
+     * Registry hive key HKEY_CURRENT_USER.
+     */
+    HKCU: string;
+
+    /**
+     * Registry hive key HKEY_CLASSES_ROOT.
+     * Note: For writing to this hive your program has to run with admin privileges.
+     */
+    HKCR: string;
+
+    /**
+     * Registry hive key HKEY_USERS.
+     * Note: For writing to this hive your program has to run with admin privileges.
+     */
+    HKU: string;
+
+    /**
+     * Registry hive key HKEY_CURRENT_CONFIG.
+     * Note: For writing to this hive your program has to run with admin privileges.
+     */
+    HKCC: string;
+
+    /**
+     * Collection of available registry hive keys.
+     */
+    HIVES: Array<string>;
+
+    /**
+     * Registry value type STRING.
+     *
+     * Values of this type contain a string.
+     */
+    REG_SZ: string;
+
+    /**
+     * Registry value type MULTILINE_STRING.
+     *
+     * Values of this type contain a multiline string.
+     */
+    REG_MULTI_SZ: string;
+
+    /**
+     * Registry value type EXPANDABLE_STRING.
+     *
+     * Values of this type contain an expandable string.
+     */
+    REG_EXPAND_SZ: string;
+
+    /**
+     * Registry value type DOUBLE_WORD.
+     *
+     * Values of this type contain a double word (32 bit integer).
+     */
+    REG_DWORD: string;
+
+    /**
+     * Registry value type QUAD_WORD.
+     *
+     * Values of this type contain a quad word (64 bit integer).
+     */
+    REG_QWORD: string;
+
+    /**
+     * Registry value type BINARY.
+     *
+     * Values of this type contain a binary value.
+     */
+    REG_BINARY: string;
+
+    /**
+     * Registry value type UNKNOWN.
+     *
+     * Values of this type contain a value of an unknown type.
+     */
+    REG_NONE: string;
+
+    /**
+     * Collection of available registry value types.
+     */
+    REG_TYPES: Array<string>;
+
+    /**
+     * The name of the default value. May be used instead of the empty string literal for better readability.
+     */
+    DEFAULT_VALUE: string;
+}
+
+declare namespace Winreg {
+    export interface Options {
+        /**
+         * Optional hostname, must start with '\\' sequence.
+         */
+        host?: string;
+
+        /**
+         * Optional hive ID, default is HKLM.
+         */
+        hive?: string;
+
+        /**
+         * Optional key, default is the root key.
+         */
+        key?: string;
+
+        /**
+         * Optional registry hive architecture ('x86' or 'x64'; only valid on Windows 64 Bit Operating Systems).
+         */
+        arch?: string;
+    }
+
+    /**
+     * A registry object, which provides access to a single registry key.
+     */
+    export interface Registry {
+        /**
+         * The hostname.
+         * @readonly
+         */
+        host: string;
+
+        /**
+         * The hive id.
+         * @readonly
+         */
+        hive: string;
+
+        /**
+         * The registry key name.
+         * @readonly
+         */
+        key: string;
+
+        /**
+         * The full path to the registry key.
+         * @readonly
+         */
+        path: string;
+
+        /**
+         * The registry hive architecture ('x86' or 'x64').
+         * @readonly
+         */
+        arch: string;
+
+        /**
+         * Creates a new {@link Registry} instance that points to the parent registry key.
+         * @readonly
+         */
+        parent: Registry;
+
+        /**
+         * Retrieve all values from this registry key.
+         * @param {valuesCallback} cb - callback function
+         * @param {error=} cb.err - error object or null if successful
+         * @param {array=} cb.items - an array of {@link RegistryItem} objects
+         * @returns {Registry} this registry key object
+         */
+        values(cb: (err: Error, result: Array<Winreg.RegistryItem>) => void): Registry;
+
+        /**
+         * Retrieve all subkeys from this registry key.
+         * @param {function (err, items)} cb - callback function
+         * @param {error=} cb.err - error object or null if successful
+         * @param {array=} cb.items - an array of {@link Registry} objects
+         * @returns {Registry} this registry key object
+         */
+        keys(cb: (err: Error, result: Array<Registry>) => void): Registry;
+
+        /**
+         * Gets a named value from this registry key.
+         * @param {string} name - the value name, use {@link Registry.DEFAULT_VALUE} or an empty string for the default value
+         * @param {function (err, item)} cb - callback function
+         * @param {error=} cb.err - error object or null if successful
+         * @param {RegistryItem=} cb.item - the retrieved registry item
+         * @returns {Registry} this registry key object
+         */
+        get(name: string, cb: (err: Error, result: Winreg.RegistryItem) => void): Registry;
+
+        /**
+         * Sets a named value in this registry key, overwriting an already existing value.
+         * @param {string} name - the value name, use {@link Registry.DEFAULT_VALUE} or an empty string for the default value
+         * @param {string} type - the value type
+         * @param {string} value - the value
+         * @param {function (err)} cb - callback function
+         * @param {error=} cb.err - error object or null if successful
+         * @returns {Registry} this registry key object
+         */
+        set(name: string, type: string, value: string, cb: (err: Error) => void): Registry;
+
+        /**
+         * Remove a named value from this registry key. If name is empty, sets the default value of this key.
+         * Note: This key must be already existing.
+         * @param {string} name - the value name, use {@link Registry.DEFAULT_VALUE} or an empty string for the default value
+         * @param {function (err)} cb - callback function
+         * @param {error=} cb.err - error object or null if successful
+         * @returns {Registry} this registry key object
+         */
+        remove(name: string, cb: (err: Error) => void): Registry;
+
+        /**
+         * Remove all subkeys and values (including the default value) from this registry key.
+         * @param {function (err)} cb - callback function
+         * @param {error=} cb.err - error object or null if successful
+         * @returns {Registry} this registry key object
+         */
+        clear(cb: (err: Error) => void): Registry;
+
+        /**
+         * Alias for the clear method to keep it backward compatible.
+         * @method
+         * @deprecated Use {@link Registry#clear} or {@link Registry#destroy} in favour of this method.
+         * @param {function (err)} cb - callback function
+         * @param {error=} cb.err - error object or null if successful
+         * @returns {Registry} this registry key object
+         */
+        erase(cb: (err: Error) => void): Registry;
+
+        /**
+         * Delete this key and all subkeys from the registry.
+         * @param {function (err)} cb - callback function
+         * @param {error=} cb.err - error object or null if successful
+         * @returns {Registry} this registry key object
+         */
+        destroy(cb: (err: Error) => void): Registry;
+
+        /**
+         * Create this registry key. Note that this is a no-op if the key already exists.
+         * @param {function (err)} cb - callback function
+         * @param {error=} cb.err - error object or null if successful
+         * @returns {Registry} this registry key object
+         */
+        create(cb: (err: Error) => void): Registry;
+
+        /**
+         * Checks if this key already exists.
+         * @param {function (err, exists)} cb - callback function
+         * @param {error=} cb.err - error object or null if successful
+         * @param {boolean=} cb.exists - true if a registry key with this name already exists
+         * @returns {Registry} this registry key object
+         */
+        keyExists(cb: (err: Error, exists: boolean) => void): Registry;
+
+        /**
+         * Checks if a value with the given name already exists within this key.
+         * @param {string} name - the value name, use {@link Registry.DEFAULT_VALUE} or an empty string for the default value
+         * @param {function (err, exists)} cb - callback function
+         * @param {error=} cb.err - error object or null if successful
+         * @param {boolean=} cb.exists - true if a value with the given name was found in this key
+         * @returns {Registry} this registry key object
+         */
+        valueExists(name: string, cb: (err: Error, exists: boolean) => void): Registry;
+    }
+
+    /**
+     * A single registry value record.
+     * Objects of this type are created internally and returned by methods of {@link Registry} objects.
+     */
+    export interface RegistryItem {
+        /**
+         * The hostname.
+         * @readonly
+         */
+        host: string;
+
+        /**
+         * The hive id.
+         * @readonly
+         */
+        hive: string;
+
+        /**
+         * The registry key.
+         * @readonly
+         */
+        key: string;
+
+        /**
+         * The value name.
+         * @readonly
+         */
+        name: string;
+
+        /**
+         * The value type.
+         * @readonly
+         */
+        type: string;
+
+        /**
+         * The value.
+         * @readonly
+         */
+        value: string;
+
+        /**
+         * The hive architecture.
+         * @readonly
+         */
+        arch: string;
+    }
+}
+
+declare module "winreg" {
+    export = Winreg;
+}
\ No newline at end of file
diff --git a/src/typings/yazl.d.ts b/src/typings/yazl.d.ts
new file mode 100644
index 00000000000..0aa227a6c82
--- /dev/null
+++ b/src/typings/yazl.d.ts
@@ -0,0 +1,15 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+declare module 'yazl' {
+	import * as stream from 'stream';
+
+	class ZipFile {
+		outputStream: stream.Stream;
+		addBuffer(buffer: Buffer, path: string);
+		addFile(localPath: string, path: string);
+		end();
+	}
+}
\ No newline at end of file
diff --git a/src/vs/base/browser/browser.ts b/src/vs/base/browser/browser.ts
index 19c46188f3b..1c694eeac3f 100644
--- a/src/vs/base/browser/browser.ts
+++ b/src/vs/base/browser/browser.ts
@@ -35,7 +35,6 @@ class WindowManager {
 		this._onDidChangeZoomLevel.fire(this._zoomLevel);
 	}
 
-
 	// --- Zoom Factor
 	private _zoomFactor: number = 0;
 
@@ -46,7 +45,6 @@ class WindowManager {
 		this._zoomFactor = zoomFactor;
 	}
 
-
 	// --- Pixel Ratio
 	public getPixelRatio(): number {
 		let ctx = document.createElement('canvas').getContext('2d');
@@ -92,8 +90,6 @@ class WindowManager {
 	public getAccessibilitySupport(): Platform.AccessibilitySupport {
 		return this._accessibilitySupport;
 	}
-
-
 }
 
 /** A zoom index, e.g. 1, 2, 3 */
diff --git a/src/vs/base/browser/builder.css b/src/vs/base/browser/builder.css
deleted file mode 100644
index e440d5cf994..00000000000
--- a/src/vs/base/browser/builder.css
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-.monaco-builder-hidden {
-	display: none !important;
-}
\ No newline at end of file
diff --git a/src/vs/base/browser/builder.ts b/src/vs/base/browser/builder.ts
deleted file mode 100644
index b47acecc5ae..00000000000
--- a/src/vs/base/browser/builder.ts
+++ /dev/null
@@ -1,1435 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-'use strict';
-
-import 'vs/css!./builder';
-import { TPromise } from 'vs/base/common/winjs.base';
-import * as types from 'vs/base/common/types';
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
-import * as strings from 'vs/base/common/strings';
-import * as assert from 'vs/base/common/assert';
-import * as DOM from 'vs/base/browser/dom';
-
-/**
- * Welcome to the monaco builder. The recommended way to use it is:
- *
- * import Builder = require('vs/base/browser/builder');
- * let $ = Builder.$;
- * $(....).fn(...);
- *
- * See below for examples how to invoke the $():
- *
- * 	$()							- creates an offdom builder
- * 	$(builder)					- wraps the given builder
- * 	$(builder[])				- wraps the given builders into a multibuilder
- * 	$('div')					- creates a div
- * 	$('.big')					- creates a div with class `big`
- * 	$('#head')					- creates a div with id `head`
- * 	$('ul#head')				- creates an unordered list with id `head`
- * 	$('<a href="back"></a>')	- constructs a builder from the given HTML
- * 	$('a', { href: 'back'})		- constructs a builder, similarly to the Builder#element() call
- */
-export interface QuickBuilder {
-	(): Builder;
-	(builders: Builder[]): Builder;
-	(element: HTMLElement): Builder;
-	(element: HTMLElement[]): Builder;
-	(window: Window): Builder;
-	(htmlOrQuerySyntax: string): Builder; // Or, MultiBuilder
-	(name: string, args?: any, fn?: (builder: Builder) => any): Builder;
-	(one: string, two: string, three: string): Builder;
-	(builder: Builder): Builder;
-}
-
-// --- Implementation starts here
-
-let MS_DATA_KEY = '_msDataKey';
-let DATA_BINDING_ID = '__$binding';
-let LISTENER_BINDING_ID = '__$listeners';
-let VISIBILITY_BINDING_ID = '__$visibility';
-
-function data(element: any): any {
-	if (!element[MS_DATA_KEY]) {
-		element[MS_DATA_KEY] = {};
-	}
-
-	return element[MS_DATA_KEY];
-}
-
-function hasData(element: any): boolean {
-	return !!element[MS_DATA_KEY];
-}
-
-/**
- *  Wraps around the provided element to manipulate it and add more child elements.
- */
-export class Builder implements IDisposable {
-	private currentElement: HTMLElement;
-	private offdom: boolean;
-	private container: HTMLElement;
-	private createdElements: HTMLElement[];
-	private toUnbind: { [type: string]: IDisposable[]; };
-	private captureToUnbind: { [type: string]: IDisposable[]; };
-
-	constructor(element?: HTMLElement, offdom?: boolean) {
-		this.offdom = offdom;
-
-		this.container = element;
-
-		this.currentElement = element;
-		this.createdElements = [];
-
-		this.toUnbind = {};
-		this.captureToUnbind = {};
-	}
-
-	/**
-	 *  Returns a new builder that lets the current HTML Element of this builder be the container
-	 *  for future additions on the builder.
-	 */
-	public asContainer(): Builder {
-		return withBuilder(this, this.offdom);
-	}
-
-	/**
-	 *  Clones the builder providing the same properties as this one.
-	 */
-	public clone(): Builder {
-		let builder = new Builder(this.container, this.offdom);
-		builder.currentElement = this.currentElement;
-		builder.createdElements = this.createdElements;
-		builder.captureToUnbind = this.captureToUnbind;
-		builder.toUnbind = this.toUnbind;
-
-		return builder;
-	}
-
-	/**
-	 *  Inserts all created elements of this builder as children to the given container. If the
-	 *  container is not provided, the element that was passed into the Builder at construction
-	 *  time is being used. The caller can provide the index of insertion, or omit it to append
-	 *  at the end.
-	 *  This method is a no-op unless the builder was created with the offdom option to be true.
-	 */
-	public build(container?: Builder, index?: number): Builder;
-	public build(container?: HTMLElement, index?: number): Builder;
-	public build(container?: any, index?: number): Builder {
-		assert.ok(this.offdom, 'This builder was not created off-dom, so build() can not be called.');
-
-		// Use builders own container if present
-		if (!container) {
-			container = this.container;
-		}
-
-		// Handle case of passed in Builder
-		else if (container instanceof Builder) {
-			container = (<Builder>container).getHTMLElement();
-		}
-
-		assert.ok(container, 'Builder can only be build() with a container provided.');
-		assert.ok(DOM.isHTMLElement(container), 'The container must either be a HTMLElement or a Builder.');
-
-		let htmlContainer = <HTMLElement>container;
-
-		// Append
-		let i: number, len: number;
-		let childNodes = htmlContainer.childNodes;
-		if (types.isNumber(index) && index < childNodes.length) {
-			for (i = 0, len = this.createdElements.length; i < len; i++) {
-				htmlContainer.insertBefore(this.createdElements[i], childNodes[index++]);
-			}
-		} else {
-			for (i = 0, len = this.createdElements.length; i < len; i++) {
-				htmlContainer.appendChild(this.createdElements[i]);
-			}
-		}
-
-		return this;
-	}
-
-	/**
-	 *  Similar to #build, but does not require that the builder is off DOM, and instead
-	 *  attached the current element. If the current element has a parent, it will be
-	 *  detached from that parent.
-	 */
-	public appendTo(container?: Builder, index?: number): Builder;
-	public appendTo(container?: HTMLElement, index?: number): Builder;
-	public appendTo(container?: any, index?: number): Builder {
-
-		// Use builders own container if present
-		if (!container) {
-			container = this.container;
-		}
-
-		// Handle case of passed in Builder
-		else if (container instanceof Builder) {
-			container = (<Builder>container).getHTMLElement();
-		}
-
-		assert.ok(container, 'Builder can only be build() with a container provided.');
-		assert.ok(DOM.isHTMLElement(container), 'The container must either be a HTMLElement or a Builder.');
-
-		let htmlContainer = <HTMLElement>container;
-
-		// Remove node from parent, if needed
-		if (this.currentElement.parentNode) {
-			this.currentElement.parentNode.removeChild(this.currentElement);
-		}
-
-		let childNodes = htmlContainer.childNodes;
-		if (types.isNumber(index) && index < childNodes.length) {
-			htmlContainer.insertBefore(this.currentElement, childNodes[index]);
-		} else {
-			htmlContainer.appendChild(this.currentElement);
-		}
-
-		return this;
-	}
-
-	/**
-	 *  Performs the exact reverse operation of #append.
-	 *  Doing `a.append(b)` is the same as doing `b.appendTo(a)`, with the difference
-	 *  of the return value being the builder which called the operation (`a` in the
-	 *  first case; `b` in the second case).
-	 */
-	public append(child: HTMLElement, index?: number): Builder;
-	public append(child: Builder, index?: number): Builder;
-	public append(child: any, index?: number): Builder {
-		assert.ok(child, 'Need a child to append');
-
-		if (DOM.isHTMLElement(child)) {
-			child = withElement(child);
-		}
-
-		assert.ok(child instanceof Builder || child instanceof MultiBuilder, 'Need a child to append');
-
-		(<Builder>child).appendTo(this, index);
-
-		return this;
-	}
-
-	/**
-	 *  Removes the current element of this builder from its parent node.
-	 */
-	public offDOM(): Builder {
-		if (this.currentElement.parentNode) {
-			this.currentElement.parentNode.removeChild(this.currentElement);
-		}
-
-		return this;
-	}
-
-	/**
-	 *  Returns the HTML Element the builder is currently active on.
-	 */
-	public getHTMLElement(): HTMLElement {
-		return this.currentElement;
-	}
-
-	/**
-	 *  Returns the HTML Element the builder is building in.
-	 */
-	public getContainer(): HTMLElement {
-		return this.container;
-	}
-
-	// HTML Elements
-
-	/**
-	 *  Creates a new element of this kind as child of the current element or parent.
-	 *  Accepts an object literal as first parameter that can be used to describe the
-	 *  attributes of the element.
-	 *  Accepts a function as second parameter that can be used to create child elements
-	 *  of the element. The function will be called with a new builder created with the
-	 *  provided element.
-	 */
-	public div(attributes?: any, fn?: (builder: Builder) => void): Builder {
-		return this.doElement('div', attributes, fn);
-	}
-
-	/**
-	 *  Creates a new element of this kind as child of the current element or parent.
-	 *  Accepts an object literal as first parameter that can be used to describe the
-	 *  attributes of the element.
-	 *  Accepts a function as second parameter that can be used to create child elements
-	 *  of the element. The function will be called with a new builder created with the
-	 *  provided element.
-	 */
-	public p(attributes?: any, fn?: (builder: Builder) => void): Builder {
-		return this.doElement('p', attributes, fn);
-	}
-
-	/**
-	 *  Creates a new element of this kind as child of the current element or parent.
-	 *  Accepts an object literal as first parameter that can be used to describe the
-	 *  attributes of the element.
-	 *  Accepts a function as second parameter that can be used to create child elements
-	 *  of the element. The function will be called with a new builder created with the
-	 *  provided element.
-	 */
-	public ul(attributes?: any, fn?: (builder: Builder) => void): Builder {
-		return this.doElement('ul', attributes, fn);
-	}
-
-	/**
-	 *  Creates a new element of this kind as child of the current element or parent.
-	 *  Accepts an object literal as first parameter that can be used to describe the
-	 *  attributes of the element.
-	 *  Accepts a function as second parameter that can be used to create child elements
-	 *  of the element. The function will be called with a new builder created with the
-	 *  provided element.
-	 */
-	public li(attributes?: any, fn?: (builder: Builder) => void): Builder {
-		return this.doElement('li', attributes, fn);
-	}
-
-	/**
-	 *  Creates a new element of this kind as child of the current element or parent.
-	 *  Accepts an object literal as first parameter that can be used to describe the
-	 *  attributes of the element.
-	 *  Accepts a function as second parameter that can be used to create child elements
-	 *  of the element. The function will be called with a new builder created with the
-	 *  provided element.
-	 */
-	public span(attributes?: any, fn?: (builder: Builder) => void): Builder {
-		return this.doElement('span', attributes, fn);
-	}
-
-	/**
-	 *  Creates a new element of this kind as child of the current element or parent.
-	 *  Accepts an object literal as first parameter that can be used to describe the
-	 *  attributes of the element.
-	 *  Accepts a function as second parameter that can be used to create child elements
-	 *  of the element. The function will be called with a new builder created with the
-	 *  provided element.
-	 */
-	public img(attributes?: any, fn?: (builder: Builder) => void): Builder {
-		return this.doElement('img', attributes, fn);
-	}
-
-	/**
-	 *  Creates a new element of this kind as child of the current element or parent.
-	 *  Accepts an object literal as first parameter that can be used to describe the
-	 *  attributes of the element.
-	 *  Accepts a function as second parameter that can be used to create child elements
-	 *  of the element. The function will be called with a new builder created with the
-	 *  provided element.
-	 */
-	public a(attributes?: any, fn?: (builder: Builder) => void): Builder {
-		return this.doElement('a', attributes, fn);
-	}
-
-	/**
-	 *  Creates a new element of given tag name as child of the current element or parent.
-	 *  Accepts an object literal as first parameter that can be used to describe the
-	 *  attributes of the element.
-	 *  Accepts a function as second parameter that can be used to create child elements
-	 *  of the element. The function will be called with a new builder created with the
-	 *  provided element.
-	 */
-	public element(name: string, attributes?: any, fn?: (builder: Builder) => void): Builder {
-		return this.doElement(name, attributes, fn);
-	}
-
-	private doElement(name: string, attributesOrFn?: any, fn?: (builder: Builder) => void): Builder {
-
-		// Create Element
-		let element = document.createElement(name);
-		this.currentElement = element;
-
-		// Off-DOM: Remember in array of created elements
-		if (this.offdom) {
-			this.createdElements.push(element);
-		}
-
-		// Object (apply properties as attributes to HTML element)
-		if (types.isObject(attributesOrFn)) {
-			this.attr(attributesOrFn);
-		}
-
-		// Support second argument being function
-		if (types.isFunction(attributesOrFn)) {
-			fn = attributesOrFn;
-		}
-
-		// Apply Functions (Elements created in Functions will be added as child to current element)
-		if (types.isFunction(fn)) {
-			let builder = new Builder(element);
-			fn.call(builder, builder); // Set both 'this' and the first parameter to the new builder
-		}
-
-		// Add to parent
-		if (!this.offdom) {
-			this.container.appendChild(element);
-		}
-
-		return this;
-	}
-
-	/**
-	 *  Calls focus() on the current HTML element;
-	 */
-	public domFocus(): Builder {
-		this.currentElement.focus();
-
-		return this;
-	}
-
-	/**
-	 *  Calls blur() on the current HTML element;
-	 */
-	public domBlur(): Builder {
-		this.currentElement.blur();
-
-		return this;
-	}
-
-	/**
-	 *  Registers listener on event types on the current element.
-	 */
-	public on<E extends Event = Event>(type: string, fn: (e: E, builder: Builder, unbind: IDisposable) => void, listenerToUnbindContainer?: IDisposable[], useCapture?: boolean): Builder;
-	public on<E extends Event = Event>(typeArray: string[], fn: (e: E, builder: Builder, unbind: IDisposable) => void, listenerToUnbindContainer?: IDisposable[], useCapture?: boolean): Builder;
-	public on<E extends Event = Event>(arg1: any, fn: (e: E, builder: Builder, unbind: IDisposable) => void, listenerToUnbindContainer?: IDisposable[], useCapture?: boolean): Builder {
-
-		// Event Type Array
-		if (types.isArray(arg1)) {
-			arg1.forEach((type: string) => {
-				this.on(type, fn, listenerToUnbindContainer, useCapture);
-			});
-		}
-
-		// Single Event Type
-		else {
-			let type = arg1;
-
-			// Add Listener
-			let unbind: IDisposable = DOM.addDisposableListener(this.currentElement, type, (e) => {
-				fn(e, this, unbind); // Pass in Builder as Second Argument
-			}, useCapture || false);
-
-			// Remember for off() use
-			if (useCapture) {
-				if (!this.captureToUnbind[type]) {
-					this.captureToUnbind[type] = [];
-				}
-				this.captureToUnbind[type].push(unbind);
-			} else {
-				if (!this.toUnbind[type]) {
-					this.toUnbind[type] = [];
-				}
-				this.toUnbind[type].push(unbind);
-			}
-
-			// Bind to Element
-			let listenerBinding: IDisposable[] = this.getProperty(LISTENER_BINDING_ID, []);
-			listenerBinding.push(unbind);
-			this.setProperty(LISTENER_BINDING_ID, listenerBinding);
-
-			// Add to Array if passed in
-			if (listenerToUnbindContainer && types.isArray(listenerToUnbindContainer)) {
-				listenerToUnbindContainer.push(unbind);
-			}
-		}
-
-		return this;
-	}
-
-	/**
-	 *  Removes all listeners from all elements created by the builder for the given event type.
-	 */
-	public off(type: string, useCapture?: boolean): Builder;
-	public off(typeArray: string[], useCapture?: boolean): Builder;
-	public off(arg1: any, useCapture?: boolean): Builder {
-
-		// Event Type Array
-		if (types.isArray(arg1)) {
-			arg1.forEach((type: string) => {
-				this.off(type);
-			});
-		}
-
-		// Single Event Type
-		else {
-			let type = arg1;
-			if (useCapture) {
-				if (this.captureToUnbind[type]) {
-					this.captureToUnbind[type] = dispose(this.captureToUnbind[type]);
-				}
-			} else {
-				if (this.toUnbind[type]) {
-					this.toUnbind[type] = dispose(this.toUnbind[type]);
-				}
-			}
-		}
-
-		return this;
-	}
-
-	/**
-	 *  Registers listener on event types on the current element and removes
-	 *  them after first invocation.
-	 */
-	public once<E extends Event = Event>(type: string, fn: (e: E, builder: Builder, unbind: IDisposable) => void, listenerToUnbindContainer?: IDisposable[], useCapture?: boolean): Builder;
-	public once<E extends Event = Event>(typesArray: string[], fn: (e: E, builder: Builder, unbind: IDisposable) => void, listenerToUnbindContainer?: IDisposable[], useCapture?: boolean): Builder;
-	public once<E extends Event = Event>(arg1: any, fn: (e: E, builder: Builder, unbind: IDisposable) => void, listenerToUnbindContainer?: IDisposable[], useCapture?: boolean): Builder {
-
-		// Event Type Array
-		if (types.isArray(arg1)) {
-			arg1.forEach((type: string) => {
-				this.once(type, fn);
-			});
-		}
-
-		// Single Event Type
-		else {
-			let type = arg1;
-
-			// Add Listener
-			let unbind: IDisposable = DOM.addDisposableListener(this.currentElement, type, (e) => {
-				fn(e, this, unbind); // Pass in Builder as Second Argument
-				unbind.dispose();
-			}, useCapture || false);
-
-			// Add to Array if passed in
-			if (listenerToUnbindContainer && types.isArray(listenerToUnbindContainer)) {
-				listenerToUnbindContainer.push(unbind);
-			}
-		}
-
-		return this;
-	}
-
-	/**
-	 * 	This method has different characteristics based on the parameter provided:
-	 *  a) a single string passed in as argument will return the attribute value using the
-	 *  string as key from the current element of the builder.
-	 *  b) two strings passed in will set the value of an attribute identified by the first
-	 *  parameter to match the second parameter
-	 *  c) an object literal passed in will apply the properties of the literal as attributes
-	 *  to the current element of the builder.
-	 */
-	public attr(name: string): string;
-	public attr(name: string, value: string): Builder;
-	public attr(name: string, value: boolean): Builder;
-	public attr(name: string, value: number): Builder;
-	public attr(attributes: any): Builder;
-	public attr(firstP: any, secondP?: any): any {
-
-		// Apply Object Literal to Attributes of Element
-		if (types.isObject(firstP)) {
-			for (let prop in firstP) {
-				if (firstP.hasOwnProperty(prop)) {
-					let value = firstP[prop];
-					this.doSetAttr(prop, value);
-				}
-			}
-
-			return this;
-		}
-
-		// Get Attribute Value
-		if (types.isString(firstP) && !types.isString(secondP)) {
-			return this.currentElement.getAttribute(firstP);
-		}
-
-		// Set Attribute Value
-		if (types.isString(firstP)) {
-			if (!types.isString(secondP)) {
-				secondP = String(secondP);
-			}
-			this.doSetAttr(firstP, secondP);
-		}
-
-		return this;
-	}
-
-	private doSetAttr(prop: string, value: any): void {
-		if (prop === 'class') {
-			prop = 'addClass'; // Workaround for the issue that a function name can not be 'class' in ES
-		}
-
-		if ((<any>this)[prop]) {
-			if (types.isArray(value)) {
-				(<any>this)[prop].apply(this, value);
-			} else {
-				(<any>this)[prop].call(this, value);
-			}
-		} else {
-			this.currentElement.setAttribute(prop, value);
-		}
-	}
-
-	/**
-	 * Removes an attribute by the given name.
-	 */
-	public removeAttribute(prop: string): void {
-		this.currentElement.removeAttribute(prop);
-	}
-
-	/**
-	 *  Sets the id attribute to the value provided for the current HTML element of the builder.
-	 */
-	public id(id: string): Builder {
-		this.currentElement.setAttribute('id', id);
-
-		return this;
-	}
-
-	/**
-	 *  Sets the title attribute to the value provided for the current HTML element of the builder.
-	 */
-	public title(title: string): Builder {
-		this.currentElement.setAttribute('title', title);
-
-		return this;
-	}
-
-	/**
-	 *  Sets the type attribute to the value provided for the current HTML element of the builder.
-	 */
-	public type(type: string): Builder {
-		this.currentElement.setAttribute('type', type);
-
-		return this;
-	}
-
-	/**
-	 *  Sets the value attribute to the value provided for the current HTML element of the builder.
-	 */
-	public value(value: string): Builder {
-		this.currentElement.setAttribute('value', value);
-
-		return this;
-	}
-
-	/**
-	 *  Sets the tabindex attribute to the value provided for the current HTML element of the builder.
-	 */
-	public tabindex(index: number): Builder {
-		this.currentElement.setAttribute('tabindex', index.toString());
-
-		return this;
-	}
-
-	/**
-	 * 	This method has different characteristics based on the parameter provided:
-	 *  a) a single string passed in as argument will return the style value using the
-	 *  string as key from the current element of the builder.
-	 *  b) two strings passed in will set the style value identified by the first
-	 *  parameter to match the second parameter. The second parameter can be null
-	 *  to unset a style
-	 *  c) an object literal passed in will apply the properties of the literal as styles
-	 *  to the current element of the builder.
-	 */
-	public style(name: string): string;
-	public style(name: string, value: string): Builder;
-	public style(attributes: any): Builder;
-	public style(firstP: any, secondP?: any): any {
-
-		// Apply Object Literal to Styles of Element
-		if (types.isObject(firstP)) {
-			for (let prop in firstP) {
-				if (firstP.hasOwnProperty(prop)) {
-					let value = firstP[prop];
-					this.doSetStyle(prop, value);
-				}
-			}
-
-			return this;
-		}
-
-		const hasFirstP = types.isString(firstP);
-
-		// Get Style Value
-		if (hasFirstP && types.isUndefined(secondP)) {
-			return this.currentElement.style[this.cssKeyToJavaScriptProperty(firstP)];
-		}
-
-		// Set Style Value
-		else if (hasFirstP) {
-			this.doSetStyle(firstP, secondP);
-		}
-
-		return this;
-	}
-
-	private doSetStyle(key: string, value: string): void {
-		if (key.indexOf('-') >= 0) {
-			let segments = key.split('-');
-			key = segments[0];
-			for (let i = 1; i < segments.length; i++) {
-				let segment = segments[i];
-				key = key + segment.charAt(0).toUpperCase() + segment.substr(1);
-			}
-		}
-
-		this.currentElement.style[this.cssKeyToJavaScriptProperty(key)] = value;
-	}
-
-	private cssKeyToJavaScriptProperty(key: string): string {
-		// Automagically convert dashes as they are not allowed when programmatically
-		// setting a CSS style property
-
-		if (key.indexOf('-') >= 0) {
-			let segments = key.split('-');
-			key = segments[0];
-			for (let i = 1; i < segments.length; i++) {
-				let segment = segments[i];
-				key = key + segment.charAt(0).toUpperCase() + segment.substr(1);
-			}
-		}
-
-		// Float is special too
-		else if (key === 'float') {
-			key = 'cssFloat';
-		}
-
-		return key;
-	}
-
-	/**
-	 *  Returns the computed CSS style for the current HTML element of the builder.
-	 */
-	public getComputedStyle(): CSSStyleDeclaration {
-		return DOM.getComputedStyle(this.currentElement);
-	}
-
-	/**
-	 *  Adds the variable list of arguments as class names to the current HTML element of the builder.
-	 */
-	public addClass(...classes: string[]): Builder {
-		classes.forEach((nameValue: string) => {
-			let names = nameValue.split(' ');
-			names.forEach((name: string) => {
-				DOM.addClass(this.currentElement, name);
-			});
-		});
-
-		return this;
-	}
-
-	/**
-	 *  Sets the class name of the current HTML element of the builder to the provided className.
-	 *  If shouldAddClass is provided - for true class is added, for false class is removed.
-	 */
-	public setClass(className: string, shouldAddClass: boolean = null): Builder {
-		if (shouldAddClass === null) {
-			this.currentElement.className = className;
-		} else if (shouldAddClass) {
-			this.addClass(className);
-		} else {
-			this.removeClass(className);
-		}
-
-		return this;
-	}
-
-	/**
-	 *  Returns whether the current HTML element of the builder has the provided class assigned.
-	 */
-	public hasClass(className: string): boolean {
-		return DOM.hasClass(this.currentElement, className);
-	}
-
-	/**
-	 *  Removes the variable list of arguments as class names from the current HTML element of the builder.
-	 */
-	public removeClass(...classes: string[]): Builder {
-		classes.forEach((nameValue: string) => {
-			let names = nameValue.split(' ');
-			names.forEach((name: string) => {
-				DOM.removeClass(this.currentElement, name);
-			});
-		});
-
-		return this;
-	}
-
-	/**
-	 *  Adds or removes the provided className for the current HTML element of the builder.
-	 */
-	public toggleClass(className: string): Builder {
-		if (this.hasClass(className)) {
-			this.removeClass(className);
-		} else {
-			this.addClass(className);
-		}
-
-		return this;
-	}
-
-	/**
-	 *  Sets the CSS property color.
-	 */
-	public color(color: string): Builder {
-		this.currentElement.style.color = color;
-
-		return this;
-	}
-
-	/**
-	 *  Sets the CSS property padding.
-	 */
-	public padding(padding: string): Builder;
-	public padding(top: number, right?: number, bottom?: number, left?: number): Builder;
-	public padding(top: string, right?: string, bottom?: string, left?: string): Builder;
-	public padding(top: any, right?: any, bottom?: any, left?: any): Builder {
-		if (types.isString(top) && top.indexOf(' ') >= 0) {
-			return this.padding.apply(this, top.split(' '));
-		}
-
-		if (!types.isUndefinedOrNull(top)) {
-			this.currentElement.style.paddingTop = this.toPixel(top);
-		}
-
-		if (!types.isUndefinedOrNull(right)) {
-			this.currentElement.style.paddingRight = this.toPixel(right);
-		}
-
-		if (!types.isUndefinedOrNull(bottom)) {
-			this.currentElement.style.paddingBottom = this.toPixel(bottom);
-		}
-
-		if (!types.isUndefinedOrNull(left)) {
-			this.currentElement.style.paddingLeft = this.toPixel(left);
-		}
-
-		return this;
-	}
-
-	/**
-	 *  Sets the CSS property margin.
-	 */
-	public margin(margin: string): Builder;
-	public margin(top: number, right?: number, bottom?: number, left?: number): Builder;
-	public margin(top: string, right?: string, bottom?: string, left?: string): Builder;
-	public margin(top: any, right?: any, bottom?: any, left?: any): Builder {
-		if (types.isString(top) && top.indexOf(' ') >= 0) {
-			return this.margin.apply(this, top.split(' '));
-		}
-
-		if (!types.isUndefinedOrNull(top)) {
-			this.currentElement.style.marginTop = this.toPixel(top);
-		}
-
-		if (!types.isUndefinedOrNull(right)) {
-			this.currentElement.style.marginRight = this.toPixel(right);
-		}
-
-		if (!types.isUndefinedOrNull(bottom)) {
-			this.currentElement.style.marginBottom = this.toPixel(bottom);
-		}
-
-		if (!types.isUndefinedOrNull(left)) {
-			this.currentElement.style.marginLeft = this.toPixel(left);
-		}
-
-		return this;
-	}
-
-	/**
-	 *  Sets the CSS property position.
-	 */
-	public position(position: string): Builder;
-	public position(top: number, right?: number, bottom?: number, left?: number, position?: string): Builder;
-	public position(top: string, right?: string, bottom?: string, left?: string, position?: string): Builder;
-	public position(top: any, right?: any, bottom?: any, left?: any, position?: string): Builder {
-		if (types.isString(top) && top.indexOf(' ') >= 0) {
-			return this.position.apply(this, top.split(' '));
-		}
-
-		if (!types.isUndefinedOrNull(top)) {
-			this.currentElement.style.top = this.toPixel(top);
-		}
-
-		if (!types.isUndefinedOrNull(right)) {
-			this.currentElement.style.right = this.toPixel(right);
-		}
-
-		if (!types.isUndefinedOrNull(bottom)) {
-			this.currentElement.style.bottom = this.toPixel(bottom);
-		}
-
-		if (!types.isUndefinedOrNull(left)) {
-			this.currentElement.style.left = this.toPixel(left);
-		}
-
-		if (!position) {
-			position = 'absolute';
-		}
-
-		this.currentElement.style.position = position;
-
-		return this;
-	}
-
-	/**
-	 *  Sets the CSS property size.
-	 */
-	public size(size: string): Builder;
-	public size(width: number, height?: number): Builder;
-	public size(width: string, height?: string): Builder;
-	public size(width: any, height?: any): Builder {
-		if (types.isString(width) && width.indexOf(' ') >= 0) {
-			return this.size.apply(this, width.split(' '));
-		}
-
-		if (!types.isUndefinedOrNull(width)) {
-			this.currentElement.style.width = this.toPixel(width);
-		}
-
-		if (!types.isUndefinedOrNull(height)) {
-			this.currentElement.style.height = this.toPixel(height);
-		}
-
-		return this;
-	}
-
-	/**
-	 *  Sets the CSS property display.
-	 */
-	public display(display: string): Builder {
-		this.currentElement.style.display = display;
-
-		return this;
-	}
-
-	/**
-	 *  Shows the current element of the builder.
-	 */
-	public show(): Builder {
-		if (this.hasClass('monaco-builder-hidden')) {
-			this.removeClass('monaco-builder-hidden');
-		}
-
-		this.attr('aria-hidden', 'false');
-
-		// Cancel any pending showDelayed() invocation
-		this.cancelVisibilityPromise();
-
-		return this;
-	}
-
-	/**
-	 *  Shows the current builder element after the provided delay. If the builder
-	 *  was set to hidden using the hide() method before this method executed, the
-	 *  function will return without showing the current element. This is useful to
-	 *  only show the element when a specific delay is reached (e.g. for a long running
-	 *  operation.
-	 */
-	public showDelayed(delay: number): Builder {
-
-		// Cancel any pending showDelayed() invocation
-		this.cancelVisibilityPromise();
-
-		let promise = TPromise.timeout(delay);
-		this.setProperty(VISIBILITY_BINDING_ID, promise);
-
-		promise.done(() => {
-			this.removeProperty(VISIBILITY_BINDING_ID);
-			this.show();
-		});
-
-		return this;
-	}
-
-	/**
-	 *  Hides the current element of the builder.
-	 */
-	public hide(): Builder {
-		if (!this.hasClass('monaco-builder-hidden')) {
-			this.addClass('monaco-builder-hidden');
-		}
-		this.attr('aria-hidden', 'true');
-
-		// Cancel any pending showDelayed() invocation
-		this.cancelVisibilityPromise();
-
-		return this;
-	}
-
-	/**
-	 *  Returns true if the current element of the builder is hidden.
-	 */
-	public isHidden(): boolean {
-		return this.hasClass('monaco-builder-hidden') || this.currentElement.style.display === 'none';
-	}
-
-	private cancelVisibilityPromise(): void {
-		let promise: TPromise<void> = this.getProperty(VISIBILITY_BINDING_ID);
-		if (promise) {
-			promise.cancel();
-			this.removeProperty(VISIBILITY_BINDING_ID);
-		}
-	}
-
-	private toPixel(obj: any): string {
-		if (obj.toString().indexOf('px') === -1) {
-			return obj.toString() + 'px';
-		}
-
-		return obj;
-	}
-
-	/**
-	 *  Sets the innerHTML attribute.
-	 */
-	public innerHtml(html: string, append?: boolean): Builder {
-		if (append) {
-			this.currentElement.innerHTML += html;
-		} else {
-			this.currentElement.innerHTML = html;
-		}
-
-		return this;
-	}
-
-	/**
-	 *  Sets the textContent property of the element.
-	 *  All HTML special characters will be escaped.
-	 */
-	public text(text: string, append?: boolean): Builder {
-		if (append) {
-			// children is child Elements versus childNodes includes textNodes
-			if (this.currentElement.children.length === 0) {
-				this.currentElement.textContent += text;
-			}
-			else {
-				// if there are elements inside this node, append the string as a new text node
-				// to avoid wiping out the innerHTML and replacing it with only text content
-				this.currentElement.appendChild(document.createTextNode(text));
-			}
-		} else {
-			this.currentElement.textContent = text;
-		}
-
-		return this;
-	}
-
-	/**
-	 *  Sets the innerHTML attribute in escaped form.
-	 */
-	public safeInnerHtml(html: string, append?: boolean): Builder {
-		return this.innerHtml(strings.escape(html), append);
-	}
-
-	/**
-	 *  Allows to store arbritary data into the current element.
-	 */
-	public setProperty(key: string, value: any): Builder {
-		setPropertyOnElement(this.currentElement, key, value);
-
-		return this;
-	}
-
-	/**
-	 *  Allows to get arbritary data from the current element.
-	 */
-	public getProperty(key: string, fallback?: any): any {
-		return getPropertyFromElement(this.currentElement, key, fallback);
-	}
-
-	/**
-	 *  Removes a property from the current element that is stored under the given key.
-	 */
-	public removeProperty(key: string): Builder {
-		if (hasData(this.currentElement)) {
-			delete data(this.currentElement)[key];
-		}
-
-		return this;
-	}
-
-	/**
-	 * Returns a new builder with the child at the given index.
-	 */
-	public child(index = 0): Builder {
-		let children = this.currentElement.children;
-
-		return withElement(<HTMLElement>children.item(index));
-	}
-
-	/**
-	 * Recurse through all descendant nodes and remove their data binding.
-	 */
-	private unbindDescendants(current: HTMLElement): void {
-		if (current && current.children) {
-			for (let i = 0, length = current.children.length; i < length; i++) {
-				let element = current.children.item(i);
-
-				// Unbind
-				if (hasData(<HTMLElement>element)) {
-
-					// Listeners
-					let listeners: IDisposable[] = data(<HTMLElement>element)[LISTENER_BINDING_ID];
-					if (types.isArray(listeners)) {
-						while (listeners.length) {
-							listeners.pop().dispose();
-						}
-					}
-
-					// Delete Data Slot
-					delete element[MS_DATA_KEY];
-				}
-
-				// Recurse
-				this.unbindDescendants(<HTMLElement>element);
-			}
-		}
-	}
-
-	/**
-	 *  Removes all HTML elements from the current element of the builder. Will also clean up any
-	 *  event listners registered and also clear any data binding and properties stored
-	 *  to any child element.
-	 */
-	public empty(): Builder {
-		this.unbindDescendants(this.currentElement);
-
-		this.clearChildren();
-
-		if (this.offdom) {
-			this.createdElements = [];
-		}
-
-		return this;
-	}
-
-	/**
-	 *  Removes all HTML elements from the current element of the builder.
-	 */
-	public clearChildren(): Builder {
-
-		// Remove Elements
-		if (this.currentElement) {
-			DOM.clearNode(this.currentElement);
-		}
-
-		return this;
-	}
-
-	/**
-	 *  Removes the current HTML element and all its children from its parent and unbinds
-	 *  all listeners and properties set to the data slots.
-	 */
-	public destroy(): void {
-
-		if (this.currentElement) {
-
-			// Remove from parent
-			if (this.currentElement.parentNode) {
-				this.currentElement.parentNode.removeChild(this.currentElement);
-			}
-
-			// Empty to clear listeners and bindings from children
-			this.empty();
-
-			// Unbind
-			if (hasData(this.currentElement)) {
-
-				// Listeners
-				let listeners: IDisposable[] = data(this.currentElement)[LISTENER_BINDING_ID];
-				if (types.isArray(listeners)) {
-					while (listeners.length) {
-						listeners.pop().dispose();
-					}
-				}
-
-				// Delete Data Slot
-				delete this.currentElement[MS_DATA_KEY];
-			}
-		}
-
-		let type: string;
-
-		for (type in this.toUnbind) {
-			if (this.toUnbind.hasOwnProperty(type) && types.isArray(this.toUnbind[type])) {
-				this.toUnbind[type] = dispose(this.toUnbind[type]);
-			}
-		}
-
-		for (type in this.captureToUnbind) {
-			if (this.captureToUnbind.hasOwnProperty(type) && types.isArray(this.captureToUnbind[type])) {
-				this.captureToUnbind[type] = dispose(this.captureToUnbind[type]);
-			}
-		}
-
-		// Nullify fields
-		this.currentElement = null;
-		this.container = null;
-		this.offdom = null;
-		this.createdElements = null;
-		this.captureToUnbind = null;
-		this.toUnbind = null;
-	}
-
-	/**
-	 *  Removes the current HTML element and all its children from its parent and unbinds
-	 *  all listeners and properties set to the data slots.
-	 */
-	public dispose(): void {
-		this.destroy();
-	}
-
-	/**
-	 *  Gets the size (in pixels) of an element, including the margin.
-	 */
-	public getTotalSize(): DOM.Dimension {
-		let totalWidth = DOM.getTotalWidth(this.currentElement);
-		let totalHeight = DOM.getTotalHeight(this.currentElement);
-
-		return new DOM.Dimension(totalWidth, totalHeight);
-	}
-
-	/**
-	 *  Another variant of getting the inner dimensions of an element.
-	 */
-	public getClientArea(): DOM.Dimension {
-		return DOM.getClientArea(this.currentElement);
-	}
-}
-
-/**
- *  The multi builder provides the same methods as the builder, but allows to call
- *  them on an array of builders.
- */
-export class MultiBuilder extends Builder {
-
-	public length: number;
-
-	private builders: Builder[];
-
-	constructor(multiBuilder: MultiBuilder);
-	constructor(builder: Builder);
-	constructor(builders: Builder[]);
-	constructor(elements: HTMLElement[]);
-	constructor(builders: any) {
-		assert.ok(types.isArray(builders) || builders instanceof MultiBuilder, 'Expected Array or MultiBuilder as parameter');
-
-		super();
-		this.length = 0;
-		this.builders = [];
-
-		// Add Builders to Array
-		if (types.isArray(builders)) {
-			for (let i = 0; i < builders.length; i++) {
-				if (builders[i] instanceof HTMLElement) {
-					this.push(withElement(builders[i]));
-				} else {
-					this.push(builders[i]);
-				}
-			}
-		} else {
-			for (let i = 0; i < (<MultiBuilder>builders).length; i++) {
-				this.push((<MultiBuilder>builders).item(i));
-			}
-		}
-
-		// Mixin Builder functions to operate on all builders
-		let $outer = this;
-		let propertyFn = (prop: string) => {
-			(<any>$outer)[prop] = function (): any {
-				let args = Array.prototype.slice.call(arguments);
-
-				let returnValues: any[];
-				let mergeBuilders = false;
-
-				for (let i = 0; i < $outer.length; i++) {
-					let res = (<any>$outer.item(i))[prop].apply($outer.item(i), args);
-
-					// Merge MultiBuilders into one
-					if (res instanceof MultiBuilder) {
-						if (!returnValues) {
-							returnValues = [];
-						}
-						mergeBuilders = true;
-
-						for (let j = 0; j < (<MultiBuilder>res).length; j++) {
-							returnValues.push((<MultiBuilder>res).item(j));
-						}
-					}
-
-					// Any other Return Type (e.g. boolean, integer)
-					else if (!types.isUndefined(res) && !(res instanceof Builder)) {
-						if (!returnValues) {
-							returnValues = [];
-						}
-
-						returnValues.push(res);
-					}
-				}
-
-				if (returnValues && mergeBuilders) {
-					return new MultiBuilder(returnValues);
-				}
-
-				return returnValues || $outer;
-			};
-		};
-
-		for (let prop in Builder.prototype) {
-			if (prop !== 'clone' && prop !== 'and') { // Skip methods that are explicitly defined in MultiBuilder
-				if (Builder.prototype.hasOwnProperty(prop) && types.isFunction((<any>Builder).prototype[prop])) {
-					propertyFn(prop);
-				}
-			}
-		}
-	}
-
-	public item(i: number): Builder {
-		return this.builders[i];
-	}
-
-	public push(...items: Builder[]): void {
-		for (let i = 0; i < items.length; i++) {
-			this.builders.push(items[i]);
-		}
-
-		this.length = this.builders.length;
-	}
-
-	public clone(): MultiBuilder {
-		return new MultiBuilder(this);
-	}
-}
-
-function withBuilder(builder: Builder, offdom?: boolean): Builder {
-	if (builder instanceof MultiBuilder) {
-		return new MultiBuilder((<MultiBuilder>builder));
-	}
-
-	return new Builder(builder.getHTMLElement(), offdom);
-}
-
-export function withElement(element: HTMLElement, offdom?: boolean): Builder {
-	return new Builder(element, offdom);
-}
-
-function offDOM(): Builder {
-	return new Builder(null, true);
-}
-
-// Binding functions
-
-/**
- *  Allows to store arbritary data into element.
- */
-export function setPropertyOnElement(element: HTMLElement, key: string, value: any): void {
-	data(element)[key] = value;
-}
-
-/**
- *  Allows to get arbritary data from element.
- */
-export function getPropertyFromElement(element: HTMLElement, key: string, fallback?: any): any {
-	if (hasData(element)) {
-		let value = data(element)[key];
-		if (!types.isUndefined(value)) {
-			return value;
-		}
-	}
-
-	return fallback;
-}
-
-/**
- *  Adds the provided object as property to the given element. Call getBinding()
- *  to retrieve it again.
- */
-export function bindElement(element: HTMLElement, object: any): void {
-	setPropertyOnElement(element, DATA_BINDING_ID, object);
-}
-
-let SELECTOR_REGEX = /([\w\-]+)?(#([\w\-]+))?((.([\w\-]+))*)/;
-
-export const $: QuickBuilder = function (arg?: any): Builder {
-
-	// Off-DOM use
-	if (types.isUndefined(arg)) {
-		return offDOM();
-	}
-
-	// Falsified values cause error otherwise
-	if (!arg) {
-		throw new Error('Bad use of $');
-	}
-
-	// Wrap the given element
-	if (DOM.isHTMLElement(arg) || arg === window) {
-		return withElement(arg);
-	}
-
-	// Wrap the given builders
-	if (types.isArray(arg)) {
-		return new MultiBuilder(arg);
-	}
-
-	// Wrap the given builder
-	if (arg instanceof Builder) {
-		return withBuilder((<Builder>arg));
-	}
-
-	if (types.isString(arg)) {
-
-		// Use the argument as HTML code
-		if (arg[0] === '<') {
-			let element: Node;
-			let container = document.createElement('div');
-			container.innerHTML = strings.format.apply(strings, arguments);
-
-			if (container.children.length === 0) {
-				throw new Error('Bad use of $');
-			}
-
-			if (container.children.length === 1) {
-				element = container.firstChild;
-				container.removeChild(element);
-
-				return withElement(<HTMLElement>element);
-			}
-
-			let builders: Builder[] = [];
-			while (container.firstChild) {
-				element = container.firstChild;
-				container.removeChild(element);
-				builders.push(withElement(<HTMLElement>element));
-			}
-
-			return new MultiBuilder(builders);
-		}
-
-		// Use the argument as a selector constructor
-		else if (arguments.length === 1) {
-			let match = SELECTOR_REGEX.exec(arg);
-			if (!match) {
-				throw new Error('Bad use of $');
-			}
-
-			let tag = match[1] || 'div';
-			let id = match[3] || undefined;
-			let classes = (match[4] || '').replace(/\./g, ' ');
-
-			let props: any = {};
-			if (id) {
-				props['id'] = id;
-			}
-
-			if (classes) {
-				props['class'] = classes;
-			}
-
-			return offDOM().element(tag, props);
-		}
-
-		// Use the arguments as the arguments to Builder#element(...)
-		else {
-			let result = offDOM();
-			result.element.apply(result, arguments);
-			return result;
-		}
-	} else {
-		throw new Error('Bad use of $');
-	}
-};
diff --git a/src/vs/base/browser/contextmenu.ts b/src/vs/base/browser/contextmenu.ts
index 221334278e4..5dd631aa97f 100644
--- a/src/vs/base/browser/contextmenu.ts
+++ b/src/vs/base/browser/contextmenu.ts
@@ -4,21 +4,22 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import { IAction, IActionRunner, Action } from 'vs/base/common/actions';
+import { IAction, IActionRunner } from 'vs/base/common/actions';
 import { IActionItem } from 'vs/base/browser/ui/actionbar/actionbar';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { ResolvedKeybinding } from 'vs/base/common/keyCodes';
+import { SubmenuAction } from 'vs/base/browser/ui/menu/menu';
 
-export interface IEvent {
+export interface IContextMenuEvent {
 	shiftKey?: boolean;
 	ctrlKey?: boolean;
 	altKey?: boolean;
 	metaKey?: boolean;
 }
 
-export class ContextSubMenu extends Action {
+export class ContextSubMenu extends SubmenuAction {
 	constructor(label: string, public entries: (ContextSubMenu | IAction)[]) {
-		super('contextsubmenu', label, '', true);
+		super(label, entries, 'contextsubmenu');
 	}
 }
 
@@ -26,7 +27,7 @@ export interface IContextMenuDelegate {
 	getAnchor(): HTMLElement | { x: number; y: number; };
 	getActions(): TPromise<(IAction | ContextSubMenu)[]>;
 	getActionItem?(action: IAction): IActionItem;
-	getActionsContext?(event?: IEvent): any;
+	getActionsContext?(event?: IContextMenuEvent): any;
 	getKeyBinding?(action: IAction): ResolvedKeybinding;
 	getMenuClassName?(): string;
 	onHide?(didCancel: boolean): void;
diff --git a/src/vs/base/browser/dnd.ts b/src/vs/base/browser/dnd.ts
index a4bc02edd33..cc5e1202acd 100644
--- a/src/vs/base/browser/dnd.ts
+++ b/src/vs/base/browser/dnd.ts
@@ -5,19 +5,20 @@
 
 'use strict';
 
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
+import { Disposable } from 'vs/base/common/lifecycle';
 import { addDisposableListener } from 'vs/base/browser/dom';
 
 /**
  * A helper that will execute a provided function when the provided HTMLElement receives
  *  dragover event for 800ms. If the drag is aborted before, the callback will not be triggered.
  */
-export class DelayedDragHandler {
-	private toDispose: IDisposable[] = [];
+export class DelayedDragHandler extends Disposable {
 	private timeout: number;
 
 	constructor(container: HTMLElement, callback: () => void) {
-		this.toDispose.push(addDisposableListener(container, 'dragover', () => {
+		super();
+
+		this._register(addDisposableListener(container, 'dragover', () => {
 			if (!this.timeout) {
 				this.timeout = setTimeout(() => {
 					callback();
@@ -28,7 +29,7 @@ export class DelayedDragHandler {
 		}));
 
 		['dragleave', 'drop', 'dragend'].forEach(type => {
-			this.toDispose.push(addDisposableListener(container, type, () => {
+			this._register(addDisposableListener(container, type, () => {
 				this.clearDragTimeout();
 			}));
 		});
@@ -41,8 +42,9 @@ export class DelayedDragHandler {
 		}
 	}
 
-	public dispose(): void {
-		this.toDispose = dispose(this.toDispose);
+	dispose(): void {
+		super.dispose();
+
 		this.clearDragTimeout();
 	}
 }
diff --git a/src/vs/base/browser/dom.ts b/src/vs/base/browser/dom.ts
index 3856b7dbeb1..08be2a19ccb 100644
--- a/src/vs/base/browser/dom.ts
+++ b/src/vs/base/browser/dom.ts
@@ -16,7 +16,7 @@ import { CharCode } from 'vs/base/common/charCode';
 import { Event, Emitter } from 'vs/base/common/event';
 import { domEvent } from 'vs/base/browser/event';
 
-export function clearNode(node: HTMLElement) {
+export function clearNode(node: HTMLElement): void {
 	while (node.firstChild) {
 		node.removeChild(node.firstChild);
 	}
@@ -486,8 +486,8 @@ export function getClientArea(element: HTMLElement): Dimension {
 		return new Dimension(window.innerWidth, window.innerHeight);
 	}
 
-	// Try with document.body.clientWidth / document.body.clientHeigh
-	if (document.body && document.body.clientWidth && document.body.clientWidth) {
+	// Try with document.body.clientWidth / document.body.clientHeight
+	if (document.body && document.body.clientWidth && document.body.clientHeight) {
 		return new Dimension(document.body.clientWidth, document.body.clientHeight);
 	}
 
@@ -812,13 +812,14 @@ export function isHTMLElement(o: any): o is HTMLElement {
 export const EventType = {
 	// Mouse
 	CLICK: 'click',
-	AUXCLICK: 'auxclick', // >= Chrome 56
 	DBLCLICK: 'dblclick',
 	MOUSE_UP: 'mouseup',
 	MOUSE_DOWN: 'mousedown',
 	MOUSE_OVER: 'mouseover',
 	MOUSE_MOVE: 'mousemove',
 	MOUSE_OUT: 'mouseout',
+	MOUSE_ENTER: 'mouseenter',
+	MOUSE_LEAVE: 'mouseleave',
 	CONTEXT_MENU: 'contextmenu',
 	WHEEL: 'wheel',
 	// Keyboard
@@ -838,6 +839,8 @@ export const EventType = {
 	SUBMIT: 'submit',
 	RESET: 'reset',
 	FOCUS: 'focus',
+	FOCUS_IN: 'focusin',
+	FOCUS_OUT: 'focusout',
 	BLUR: 'blur',
 	INPUT: 'input',
 	// Local Storage
@@ -916,7 +919,7 @@ class FocusTracker implements IFocusTracker {
 	private disposables: IDisposable[] = [];
 
 	constructor(element: HTMLElement | Window) {
-		let hasFocus = false;
+		let hasFocus = isAncestor(document.activeElement, <HTMLElement>element);
 		let loosingFocus = false;
 
 		let onFocus = () => {
@@ -967,7 +970,6 @@ export function prepend<T extends Node>(parent: HTMLElement, child: T): T {
 
 const SELECTOR_REGEX = /([\w\-]+)?(#([\w\-]+))?((.([\w\-]+))*)/;
 
-// Similar to builder, but much more lightweight
 export function $<T extends HTMLElement>(description: string, attrs?: { [key: string]: any; }, ...children: (Node | string)[]): T {
 	let match = SELECTOR_REGEX.exec(description);
 
diff --git a/src/vs/base/browser/history.ts b/src/vs/base/browser/history.ts
new file mode 100644
index 00000000000..8c58bf64b00
--- /dev/null
+++ b/src/vs/base/browser/history.ts
@@ -0,0 +1,12 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+export interface IHistoryNavigationWidget {
+
+	showPreviousValue();
+
+	showNextValue();
+
+}
\ No newline at end of file
diff --git a/src/vs/base/browser/touch.ts b/src/vs/base/browser/touch.ts
index 5620c65ccb6..7dac4446b02 100644
--- a/src/vs/base/browser/touch.ts
+++ b/src/vs/base/browser/touch.ts
@@ -5,7 +5,7 @@
 'use strict';
 
 import * as arrays from 'vs/base/common/arrays';
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
+import { IDisposable, Disposable } from 'vs/base/common/lifecycle';
 import * as DomUtils from 'vs/base/browser/dom';
 import { memoize } from 'vs/base/common/decorators';
 
@@ -64,7 +64,7 @@ interface TouchEvent extends Event {
 	changedTouches: TouchList;
 }
 
-export class Gesture implements IDisposable {
+export class Gesture extends Disposable {
 
 	private static readonly SCROLL_FRICTION = -0.005;
 	private static INSTANCE: Gesture;
@@ -72,19 +72,19 @@ export class Gesture implements IDisposable {
 
 	private dispatched: boolean;
 	private targets: HTMLElement[];
-	private toDispose: IDisposable[];
 	private handle: IDisposable;
 
 	private activeTouches: { [id: number]: TouchData; };
 
 	private constructor() {
-		this.toDispose = [];
+		super();
+
 		this.activeTouches = {};
 		this.handle = null;
 		this.targets = [];
-		this.toDispose.push(DomUtils.addDisposableListener(document, 'touchstart', (e) => this.onTouchStart(e)));
-		this.toDispose.push(DomUtils.addDisposableListener(document, 'touchend', (e) => this.onTouchEnd(e)));
-		this.toDispose.push(DomUtils.addDisposableListener(document, 'touchmove', (e) => this.onTouchMove(e)));
+		this._register(DomUtils.addDisposableListener(document, 'touchstart', (e) => this.onTouchStart(e)));
+		this._register(DomUtils.addDisposableListener(document, 'touchend', (e) => this.onTouchEnd(e)));
+		this._register(DomUtils.addDisposableListener(document, 'touchmove', (e) => this.onTouchMove(e)));
 	}
 
 	public static addTarget(element: HTMLElement): void {
@@ -106,9 +106,10 @@ export class Gesture implements IDisposable {
 	public dispose(): void {
 		if (this.handle) {
 			this.handle.dispose();
-			dispose(this.toDispose);
 			this.handle = null;
 		}
+
+		super.dispose();
 	}
 
 	private onTouchStart(e: TouchEvent): void {
diff --git a/src/vs/base/browser/ui/actionbar/actionbar.css b/src/vs/base/browser/ui/actionbar/actionbar.css
index c5a2cf6ee23..4ff042d038f 100644
--- a/src/vs/base/browser/ui/actionbar/actionbar.css
+++ b/src/vs/base/browser/ui/actionbar/actionbar.css
@@ -54,7 +54,7 @@
 
 .monaco-action-bar .action-label {
 	font-size: 11px;
-	margin-right: 4px;  
+	margin-right: 4px;
 }
 
 .monaco-action-bar .action-label.octicon {
diff --git a/src/vs/base/browser/ui/actionbar/actionbar.ts b/src/vs/base/browser/ui/actionbar/actionbar.ts
index 83e23225d31..804c0ceae43 100644
--- a/src/vs/base/browser/ui/actionbar/actionbar.ts
+++ b/src/vs/base/browser/ui/actionbar/actionbar.ts
@@ -8,10 +8,9 @@
 import 'vs/css!./actionbar';
 import * as platform from 'vs/base/common/platform';
 import * as nls from 'vs/nls';
-import * as lifecycle from 'vs/base/common/lifecycle';
+import { Disposable, dispose } from 'vs/base/common/lifecycle';
 import { TPromise } from 'vs/base/common/winjs.base';
-import { Builder, $ } from 'vs/base/browser/builder';
-import { SelectBox } from 'vs/base/browser/ui/selectBox/selectBox';
+import { SelectBox, ISelectBoxOptions } from 'vs/base/browser/ui/selectBox/selectBox';
 import { IAction, IActionRunner, Action, IActionChangeEvent, ActionRunner, IRunEvent } from 'vs/base/common/actions';
 import * as DOM from 'vs/base/browser/dom';
 import * as types from 'vs/base/common/types';
@@ -36,77 +35,78 @@ export interface IBaseActionItemOptions {
 	isMenu?: boolean;
 }
 
-export class BaseActionItem implements IActionItem {
+export class BaseActionItem extends Disposable implements IActionItem {
 
-	public builder: Builder;
-	public _callOnDispose: lifecycle.IDisposable[];
-	public _context: any;
-	public _action: IAction;
+	element: HTMLElement;
+	_context: any;
+	_action: IAction;
 
 	private _actionRunner: IActionRunner;
 
 	constructor(context: any, action: IAction, protected options?: IBaseActionItemOptions) {
-		this._callOnDispose = [];
+		super();
+
 		this._context = context || this;
 		this._action = action;
 
 		if (action instanceof Action) {
-			this._callOnDispose.push(action.onDidChange(event => {
-				if (!this.builder) {
+			this._register(action.onDidChange(event => {
+				if (!this.element) {
 					// we have not been rendered yet, so there
 					// is no point in updating the UI
 					return;
 				}
-				this._handleActionChangeEvent(event);
+
+				this.handleActionChangeEvent(event);
 			}));
 		}
 	}
 
-	protected _handleActionChangeEvent(event: IActionChangeEvent): void {
+	private handleActionChangeEvent(event: IActionChangeEvent): void {
 		if (event.enabled !== void 0) {
-			this._updateEnabled();
+			this.updateEnabled();
 		}
+
 		if (event.checked !== void 0) {
-			this._updateChecked();
+			this.updateChecked();
 		}
+
 		if (event.class !== void 0) {
-			this._updateClass();
+			this.updateClass();
 		}
+
 		if (event.label !== void 0) {
-			this._updateLabel();
-			this._updateTooltip();
+			this.updateLabel();
+			this.updateTooltip();
 		}
+
 		if (event.tooltip !== void 0) {
-			this._updateTooltip();
+			this.updateTooltip();
 		}
 	}
 
-	public get callOnDispose() {
-		return this._callOnDispose;
-	}
-
-	public set actionRunner(actionRunner: IActionRunner) {
+	set actionRunner(actionRunner: IActionRunner) {
 		this._actionRunner = actionRunner;
 	}
 
-	public get actionRunner(): IActionRunner {
+	get actionRunner(): IActionRunner {
 		return this._actionRunner;
 	}
 
-	public getAction(): IAction {
+	getAction(): IAction {
 		return this._action;
 	}
 
-	public isEnabled(): boolean {
+	isEnabled(): boolean {
 		return this._action.enabled;
 	}
 
-	public setActionContext(newContext: any): void {
+	setActionContext(newContext: any): void {
 		this._context = newContext;
 	}
 
-	public render(container: HTMLElement): void {
-		this.builder = $(container);
+	render(container: HTMLElement): void {
+		this.element = container;
 		Gesture.addTarget(container);
 
 		const enableDragging = this.options && this.options.draggable;
@@ -114,20 +114,20 @@ export class BaseActionItem implements IActionItem {
 			container.draggable = true;
 		}
 
-		this.builder.on(EventType.Tap, e => this.onClick(e));
+		this._register(DOM.addDisposableListener(this.element, EventType.Tap, e => this.onClick(e)));
 
-		this.builder.on(DOM.EventType.MOUSE_DOWN, (e) => {
+		this._register(DOM.addDisposableListener(this.element, DOM.EventType.MOUSE_DOWN, e => {
 			if (!enableDragging) {
 				DOM.EventHelper.stop(e, true); // do not run when dragging is on because that would disable it
 			}
 
 			const mouseEvent = e as MouseEvent;
 			if (this._action.enabled && mouseEvent.button === 0) {
-				this.builder.addClass('active');
+				DOM.addClass(this.element, 'active');
 			}
-		});
+		}));
 
-		this.builder.on(DOM.EventType.CLICK, (e) => {
+		this._register(DOM.addDisposableListener(this.element, DOM.EventType.CLICK, e => {
 			DOM.EventHelper.stop(e, true);
 			// See https://developer.mozilla.org/en-US/Add-ons/WebExtensions/Interact_with_the_clipboard
 			// > Writing to the clipboard
@@ -142,15 +142,21 @@ export class BaseActionItem implements IActionItem {
 			} else {
 				platform.setImmediate(() => this.onClick(e));
 			}
-		});
+		}));
 
-		this.builder.on([DOM.EventType.MOUSE_UP, DOM.EventType.MOUSE_OUT], (e) => {
-			DOM.EventHelper.stop(e);
-			this.builder.removeClass('active');
+		this._register(DOM.addDisposableListener(this.element, DOM.EventType.DBLCLICK, e => {
+			DOM.EventHelper.stop(e, true);
+		}));
+
+		[DOM.EventType.MOUSE_UP, DOM.EventType.MOUSE_OUT].forEach(event => {
+			this._register(DOM.addDisposableListener(this.element, event, e => {
+				DOM.EventHelper.stop(e);
+				DOM.removeClass(this.element, 'active');
+			}));
 		});
 	}
 
-	public onClick(event: DOM.EventLike): void {
+	onClick(event: DOM.EventLike): void {
 		DOM.EventHelper.stop(event, true);
 
 		let context: any;
@@ -158,64 +164,68 @@ export class BaseActionItem implements IActionItem {
 			context = event;
 		} else {
 			context = this._context;
-			context.event = event;
+
+			if (types.isObject(context)) {
+				context.event = event;
+			}
 		}
 
 		this._actionRunner.run(this._action, context);
 	}
 
-	public focus(): void {
-		if (this.builder) {
-			this.builder.domFocus();
+	focus(): void {
+		if (this.element) {
+			this.element.focus();
+			DOM.addClass(this.element, 'focused');
 		}
 	}
 
-	public blur(): void {
-		if (this.builder) {
-			this.builder.domBlur();
+	blur(): void {
+		if (this.element) {
+			this.element.blur();
+			DOM.removeClass(this.element, 'focused');
 		}
 	}
 
-	protected _updateEnabled(): void {
+	protected updateEnabled(): void {
 		// implement in subclass
 	}
 
-	protected _updateLabel(): void {
+	protected updateLabel(): void {
 		// implement in subclass
 	}
 
-	protected _updateTooltip(): void {
+	protected updateTooltip(): void {
 		// implement in subclass
 	}
 
-	protected _updateClass(): void {
+	protected updateClass(): void {
 		// implement in subclass
 	}
 
-	protected _updateChecked(): void {
+	protected updateChecked(): void {
 		// implement in subclass
 	}
 
-	public dispose(): void {
-		if (this.builder) {
-			this.builder.destroy();
-			this.builder = null;
+	dispose(): void {
+		if (this.element) {
+			this.element.remove();
+			this.element = null;
 		}
 
-		this._callOnDispose = lifecycle.dispose(this._callOnDispose);
+		super.dispose();
 	}
 }
 
 export class Separator extends Action {
 
-	public static readonly ID = 'vs.actions.separator';
+	static readonly ID = 'vs.actions.separator';
 
-	constructor(label?: string, order?: number) {
+	constructor(label?: string) {
 		super(Separator.ID, label, label ? 'separator text' : 'separator');
 		this.checked = false;
 		this.radio = false;
 		this.enabled = false;
-		this.order = order;
 	}
 }
 
@@ -227,8 +237,9 @@ export interface IActionItemOptions extends IBaseActionItemOptions {
 
 export class ActionItem extends BaseActionItem {
 
-	protected $e: Builder;
+	protected label: HTMLElement;
 	protected options: IActionItemOptions;
+
 	private cssClass: string;
 
 	constructor(context: any, action: IAction, options: IActionItemOptions = {}) {
@@ -240,44 +251,44 @@ export class ActionItem extends BaseActionItem {
 		this.cssClass = '';
 	}
 
-	public render(container: HTMLElement): void {
+	render(container: HTMLElement): void {
 		super.render(container);
 
-		this.$e = $('a.action-label').appendTo(this.builder);
+		this.label = DOM.append(this.element, DOM.$('a.action-label'));
 		if (this._action.id === Separator.ID) {
-			// A separator is a presentation item
-			this.$e.attr({ role: 'presentation' });
+			this.label.setAttribute('role', 'presentation'); // A separator is a presentation item
 		} else {
 			if (this.options.isMenu) {
-				this.$e.attr({ role: 'menuitem' });
+				this.label.setAttribute('role', 'menuitem');
 			} else {
-				this.$e.attr({ role: 'button' });
+				this.label.setAttribute('role', 'button');
 			}
 		}
 
 		if (this.options.label && this.options.keybinding) {
-			$('span.keybinding').text(this.options.keybinding).appendTo(this.builder);
+			DOM.append(this.element, DOM.$('span.keybinding')).textContent = this.options.keybinding;
 		}
 
-		this._updateClass();
-		this._updateLabel();
-		this._updateTooltip();
-		this._updateEnabled();
-		this._updateChecked();
+		this.updateClass();
+		this.updateLabel();
+		this.updateTooltip();
+		this.updateEnabled();
+		this.updateChecked();
 	}
 
-	public focus(): void {
+	focus(): void {
 		super.focus();
-		this.$e.domFocus();
+
+		this.label.focus();
 	}
 
-	public _updateLabel(): void {
+	updateLabel(): void {
 		if (this.options.label) {
-			this.$e.text(this.getAction().label);
+			this.label.textContent = this.getAction().label;
 		}
 	}
 
-	public _updateTooltip(): void {
+	updateTooltip(): void {
 		let title: string = null;
 
 		if (this.getAction().tooltip) {
@@ -292,48 +303,52 @@ export class ActionItem extends BaseActionItem {
 		}
 
 		if (title) {
-			this.$e.attr({ title: title });
+			this.label.title = title;
 		}
 	}
 
-	public _updateClass(): void {
+	updateClass(): void {
 		if (this.cssClass) {
-			this.$e.removeClass(this.cssClass);
+			DOM.removeClasses(this.label, this.cssClass);
 		}
+
 		if (this.options.icon) {
 			this.cssClass = this.getAction().class;
-			this.$e.addClass('icon');
+			DOM.addClass(this.label, 'icon');
 			if (this.cssClass) {
-				this.$e.addClass(this.cssClass);
+				DOM.addClasses(this.label, this.cssClass);
 			}
-			this._updateEnabled();
+
+			this.updateEnabled();
 		} else {
-			this.$e.removeClass('icon');
+			DOM.removeClass(this.label, 'icon');
 		}
 	}
 
-	public _updateEnabled(): void {
+	updateEnabled(): void {
 		if (this.getAction().enabled) {
-			this.builder.removeClass('disabled');
-			this.$e.removeClass('disabled');
-			this.$e.attr({ tabindex: 0 });
+			this.label.removeAttribute('aria-disabled');
+			DOM.removeClass(this.element, 'disabled');
+			DOM.removeClass(this.label, 'disabled');
+			this.label.tabIndex = 0;
 		} else {
-			this.builder.addClass('disabled');
-			this.$e.addClass('disabled');
-			DOM.removeTabIndexAndUpdateFocus(this.$e.getHTMLElement());
+			this.label.setAttribute('aria-disabled', 'true');
+			DOM.addClass(this.element, 'disabled');
+			DOM.addClass(this.label, 'disabled');
+			DOM.removeTabIndexAndUpdateFocus(this.label);
 		}
 	}
 
-	public _updateChecked(): void {
+	updateChecked(): void {
 		if (this.getAction().checked) {
-			this.$e.addClass('checked');
+			DOM.addClass(this.label, 'checked');
 		} else {
-			this.$e.removeClass('checked');
+			DOM.removeClass(this.label, 'checked');
 		}
 	}
 }
 
-export enum ActionsOrientation {
+export const enum ActionsOrientation {
 	HORIZONTAL,
 	HORIZONTAL_REVERSE,
 	VERTICAL,
@@ -351,7 +366,6 @@ export interface IActionBarOptions {
 	actionRunner?: IActionRunner;
 	ariaLabel?: string;
 	animated?: boolean;
-	isMenu?: boolean;
 }
 
 let defaultOptions: IActionBarOptions = {
@@ -363,43 +377,48 @@ export interface IActionOptions extends IActionItemOptions {
 	index?: number;
 }
 
-export class ActionBar implements IActionRunner {
+export class ActionBar extends Disposable implements IActionRunner {
 
-	public options: IActionBarOptions;
+	options: IActionBarOptions;
 
 	private _actionRunner: IActionRunner;
 	private _context: any;
 
 	// Items
-	public items: IActionItem[];
-
-	private focusedItem: number;
+	items: IActionItem[];
+	protected focusedItem: number;
 	private focusTracker: DOM.IFocusTracker;
 
 	// Elements
-	public domNode: HTMLElement;
-	private actionsList: HTMLElement;
+	domNode: HTMLElement;
+	protected actionsList: HTMLElement;
 
-	private toDispose: lifecycle.IDisposable[];
+	private _onDidBlur = this._register(new Emitter<void>());
+	get onDidBlur(): Event<void> { return this._onDidBlur.event; }
 
-	private _onDidBlur = new Emitter<void>();
-	private _onDidCancel = new Emitter<void>();
-	private _onDidRun = new Emitter<IRunEvent>();
-	private _onDidBeforeRun = new Emitter<IRunEvent>();
+	private _onDidCancel = this._register(new Emitter<void>());
+	get onDidCancel(): Event<void> { return this._onDidCancel.event; }
+
+	private _onDidRun = this._register(new Emitter<IRunEvent>());
+	get onDidRun(): Event<IRunEvent> { return this._onDidRun.event; }
+
+	private _onDidBeforeRun = this._register(new Emitter<IRunEvent>());
+	get onDidBeforeRun(): Event<IRunEvent> { return this._onDidBeforeRun.event; }
 
 	constructor(container: HTMLElement, options: IActionBarOptions = defaultOptions) {
+		super();
+
 		this.options = options;
 		this._context = options.context;
-		this.toDispose = [];
 		this._actionRunner = this.options.actionRunner;
 
 		if (!this._actionRunner) {
 			this._actionRunner = new ActionRunner();
-			this.toDispose.push(this._actionRunner);
+			this._register(this._actionRunner);
 		}
 
-		this.toDispose.push(this._actionRunner.onDidRun(e => this._onDidRun.fire(e)));
-		this.toDispose.push(this._actionRunner.onDidBeforeRun(e => this._onDidBeforeRun.fire(e)));
+		this._register(this._actionRunner.onDidRun(e => this._onDidRun.fire(e)));
+		this._register(this._actionRunner.onDidBeforeRun(e => this._onDidBeforeRun.fire(e)));
 
 		this.items = [];
 		this.focusedItem = undefined;
@@ -436,7 +455,7 @@ export class ActionBar implements IActionRunner {
 				break;
 		}
 
-		$(this.domNode).on(DOM.EventType.KEY_DOWN, (e) => {
+		this._register(DOM.addDisposableListener(this.domNode, DOM.EventType.KEY_DOWN, e => {
 			let event = new StandardKeyboardEvent(e as KeyboardEvent);
 			let eventHandled = true;
 
@@ -456,9 +475,9 @@ export class ActionBar implements IActionRunner {
 				event.preventDefault();
 				event.stopPropagation();
 			}
-		});
+		}));
 
-		$(this.domNode).on(DOM.EventType.KEY_UP, (e) => {
+		this._register(DOM.addDisposableListener(this.domNode, DOM.EventType.KEY_UP, e => {
 			let event = new StandardKeyboardEvent(e as KeyboardEvent);
 
 			// Run action on Enter/Space
@@ -472,25 +491,22 @@ export class ActionBar implements IActionRunner {
 			else if (event.equals(KeyCode.Tab) || event.equals(KeyMod.Shift | KeyCode.Tab)) {
 				this.updateFocusedItem();
 			}
-		});
+		}));
 
-		this.focusTracker = DOM.trackFocus(this.domNode);
-		this.toDispose.push(this.focusTracker.onDidBlur(() => {
+		this.focusTracker = this._register(DOM.trackFocus(this.domNode));
+		this._register(this.focusTracker.onDidBlur(() => {
 			if (document.activeElement === this.domNode || !DOM.isAncestor(document.activeElement, this.domNode)) {
 				this._onDidBlur.fire();
 				this.focusedItem = undefined;
 			}
 		}));
 
-		this.toDispose.push(this.focusTracker.onDidFocus(() => this.updateFocusedItem()));
+		this._register(this.focusTracker.onDidFocus(() => this.updateFocusedItem()));
 
 		this.actionsList = document.createElement('ul');
 		this.actionsList.className = 'actions-container';
-		if (this.options.isMenu) {
-			this.actionsList.setAttribute('role', 'menubar');
-		} else {
-			this.actionsList.setAttribute('role', 'toolbar');
-		}
+		this.actionsList.setAttribute('role', 'toolbar');
+
 		if (this.options.ariaLabel) {
 			this.actionsList.setAttribute('aria-label', this.options.ariaLabel);
 		}
@@ -500,23 +516,7 @@ export class ActionBar implements IActionRunner {
 		container.appendChild(this.domNode);
 	}
 
-	public get onDidBlur(): Event<void> {
-		return this._onDidBlur.event;
-	}
-
-	public get onDidCancel(): Event<void> {
-		return this._onDidCancel.event;
-	}
-
-	public get onDidRun(): Event<IRunEvent> {
-		return this._onDidRun.event;
-	}
-
-	public get onDidBeforeRun(): Event<IRunEvent> {
-		return this._onDidBeforeRun.event;
-	}
-
-	public setAriaLabel(label: string): void {
+	setAriaLabel(label: string): void {
 		if (label) {
 			this.actionsList.setAttribute('aria-label', label);
 		} else {
@@ -534,32 +534,31 @@ export class ActionBar implements IActionRunner {
 		}
 	}
 
-	public get context(): any {
+	get context(): any {
 		return this._context;
 	}
 
-	public set context(context: any) {
+	set context(context: any) {
 		this._context = context;
 		this.items.forEach(i => i.setActionContext(context));
 	}
 
-	public get actionRunner(): IActionRunner {
+	get actionRunner(): IActionRunner {
 		return this._actionRunner;
 	}
 
-	public set actionRunner(actionRunner: IActionRunner) {
+	set actionRunner(actionRunner: IActionRunner) {
 		if (actionRunner) {
 			this._actionRunner = actionRunner;
 			this.items.forEach(item => item.actionRunner = actionRunner);
 		}
 	}
 
-	public getContainer(): HTMLElement {
+	getContainer(): HTMLElement {
 		return this.domNode;
 	}
 
-	public push(arg: IAction | IAction[], options: IActionOptions = {}): void {
-
+	push(arg: IAction | IAction[], options: IActionOptions = {}): void {
 		const actions: IAction[] = !Array.isArray(arg) ? [arg] : arg;
 
 		let index = types.isNumber(options.index) ? options.index : null;
@@ -570,10 +569,10 @@ export class ActionBar implements IActionRunner {
 			actionItemElement.setAttribute('role', 'presentation');
 
 			// Prevent native context menu on actions
-			$(actionItemElement).on(DOM.EventType.CONTEXT_MENU, (e: DOM.EventLike) => {
+			this._register(DOM.addDisposableListener(actionItemElement, DOM.EventType.CONTEXT_MENU, (e: DOM.EventLike) => {
 				e.preventDefault();
 				e.stopPropagation();
-			});
+			}));
 
 			let item: IActionItem = null;
 
@@ -597,11 +596,10 @@ export class ActionBar implements IActionRunner {
 				this.items.splice(index, 0, item);
 				index++;
 			}
-
 		});
 	}
 
-	public getWidth(index: number): number {
+	getWidth(index: number): number {
 		if (index >= 0 && index < this.actionsList.children.length) {
 			return this.actionsList.children.item(index).clientWidth;
 		}
@@ -609,7 +607,7 @@ export class ActionBar implements IActionRunner {
 		return 0;
 	}
 
-	public getHeight(index: number): number {
+	getHeight(index: number): number {
 		if (index >= 0 && index < this.actionsList.children.length) {
 			return this.actionsList.children.item(index).clientHeight;
 		}
@@ -617,32 +615,34 @@ export class ActionBar implements IActionRunner {
 		return 0;
 	}
 
-	public pull(index: number): void {
+	pull(index: number): void {
 		if (index >= 0 && index < this.items.length) {
 			this.items.splice(index, 1);
 			this.actionsList.removeChild(this.actionsList.childNodes[index]);
 		}
 	}
 
-	public clear(): void {
-		this.items = lifecycle.dispose(this.items);
-		$(this.actionsList).empty();
+	clear(): void {
+		this.items = dispose(this.items);
+		DOM.clearNode(this.actionsList);
 	}
 
-	public length(): number {
+	length(): number {
 		return this.items.length;
 	}
 
-	public isEmpty(): boolean {
+	isEmpty(): boolean {
 		return this.items.length === 0;
 	}
 
-	public focus(selectFirst?: boolean): void {
+	focus(selectFirst?: boolean): void {
 		if (selectFirst && typeof this.focusedItem === 'undefined') {
-			this.focusedItem = 0;
+			// Focus the first enabled item
+			this.focusedItem = this.items.length - 1;
+			this.focusNext();
+		} else {
+			this.updateFocus();
 		}
-
-		this.updateFocus();
 	}
 
 	private focusNext(): void {
@@ -690,10 +690,9 @@ export class ActionBar implements IActionRunner {
 		this.updateFocus(true);
 	}
 
-	private updateFocus(fromRight?: boolean): void {
+	protected updateFocus(fromRight?: boolean): void {
 		if (typeof this.focusedItem === 'undefined') {
-			this.domNode.focus();
-			return;
+			this.actionsList.focus();
 		}
 
 		for (let i = 0; i < this.items.length; i++) {
@@ -702,8 +701,12 @@ export class ActionBar implements IActionRunner {
 			let actionItem = <any>item;
 
 			if (i === this.focusedItem) {
-				if (types.isFunction(actionItem.focus)) {
-					actionItem.focus(fromRight);
+				if (types.isFunction(actionItem.isEnabled)) {
+					if (actionItem.isEnabled() && types.isFunction(actionItem.focus)) {
+						actionItem.focus(fromRight);
+					} else {
+						this.actionsList.focus();
+					}
 				}
 			} else {
 				if (types.isFunction(actionItem.blur)) {
@@ -722,7 +725,7 @@ export class ActionBar implements IActionRunner {
 		let actionItem = this.items[this.focusedItem];
 		if (actionItem instanceof BaseActionItem) {
 			const context = (actionItem._context === null || actionItem._context === undefined) ? event : actionItem._context;
-			this.run(actionItem._action, context).done();
+			this.run(actionItem._action, context);
 		}
 	}
 
@@ -734,78 +737,65 @@ export class ActionBar implements IActionRunner {
 		this._onDidCancel.fire();
 	}
 
-	public run(action: IAction, context?: any): TPromise<void> {
+	run(action: IAction, context?: any): TPromise<void> {
 		return this._actionRunner.run(action, context);
 	}
 
-	public dispose(): void {
+	dispose(): void {
 		if (this.items !== null) {
-			lifecycle.dispose(this.items);
+			dispose(this.items);
 		}
 		this.items = null;
 
-		if (this.focusTracker) {
-			this.focusTracker.dispose();
-			this.focusTracker = null;
-		}
+		this.getContainer().remove();
 
-		this.toDispose = lifecycle.dispose(this.toDispose);
-
-		$(this.getContainer()).destroy();
+		super.dispose();
 	}
 }
 
 export class SelectActionItem extends BaseActionItem {
 	protected selectBox: SelectBox;
-	protected toDispose: lifecycle.IDisposable[];
 
-	constructor(ctx: any, action: IAction, options: string[], selected: number, contextViewProvider: IContextViewProvider
-	) {
+	constructor(ctx: any, action: IAction, options: string[], selected: number, contextViewProvider: IContextViewProvider, selectBoxOptions?: ISelectBoxOptions) {
 		super(ctx, action);
-		this.selectBox = new SelectBox(options, selected, contextViewProvider);
 
-		this.toDispose = [];
-		this.toDispose.push(this.selectBox);
+		this.selectBox = new SelectBox(options, selected, contextViewProvider, null, selectBoxOptions);
+
+		this._register(this.selectBox);
 		this.registerListeners();
 	}
 
-	public setOptions(options: string[], selected?: number, disabled?: number): void {
+	setOptions(options: string[], selected?: number, disabled?: number): void {
 		this.selectBox.setOptions(options, selected, disabled);
 	}
 
-	public select(index: number): void {
+	select(index: number): void {
 		this.selectBox.select(index);
 	}
 
 	private registerListeners(): void {
-		this.toDispose.push(this.selectBox.onDidSelect(e => {
-			this.actionRunner.run(this._action, this.getActionContext(e.selected)).done();
+		this._register(this.selectBox.onDidSelect(e => {
+			this.actionRunner.run(this._action, this.getActionContext(e.selected, e.index));
 		}));
 	}
 
-	protected getActionContext(option: string) {
+	protected getActionContext(option: string, index: number) {
 		return option;
 	}
 
-	public focus(): void {
+	focus(): void {
 		if (this.selectBox) {
 			this.selectBox.focus();
 		}
 	}
 
-	public blur(): void {
+	blur(): void {
 		if (this.selectBox) {
 			this.selectBox.blur();
 		}
 	}
 
-	public render(container: HTMLElement): void {
+	render(container: HTMLElement): void {
 		this.selectBox.render(container);
 	}
-
-	public dispose(): void {
-		this.toDispose = lifecycle.dispose(this.toDispose);
-
-		super.dispose();
-	}
-}
+}
\ No newline at end of file
diff --git a/src/vs/base/browser/ui/aria/aria.ts b/src/vs/base/browser/ui/aria/aria.ts
index 9d59cecfdce..61c7dfd348d 100644
--- a/src/vs/base/browser/ui/aria/aria.ts
+++ b/src/vs/base/browser/ui/aria/aria.ts
@@ -50,13 +50,27 @@ export function status(msg: string): void {
 	}
 }
 
+let repeatedTimes = 0;
+let prevText: string | undefined = undefined;
 function insertMessage(target: HTMLElement, msg: string): void {
 	if (!ariaContainer) {
 		// console.warn('ARIA support needs a container. Call setARIAContainer() first.');
 		return;
 	}
-	if (target.textContent === msg) {
-		msg = nls.localize('repeated', "{0} (occurred again)", msg);
+
+	if (prevText === msg) {
+		repeatedTimes++;
+	}
+	else {
+		prevText = msg;
+		repeatedTimes = 0;
+	}
+
+
+	switch (repeatedTimes) {
+		case 0: break;
+		case 1: msg = nls.localize('repeated', "{0} (occurred again)", msg); break;
+		default: msg = nls.localize('repeatedNtimes', "{0} (occurred {1} times)", msg, repeatedTimes); break;
 	}
 
 	dom.clearNode(target);
diff --git a/src/vs/base/browser/ui/breadcrumbs/breadcrumbsWidget.css b/src/vs/base/browser/ui/breadcrumbs/breadcrumbsWidget.css
new file mode 100644
index 00000000000..afade1a3413
--- /dev/null
+++ b/src/vs/base/browser/ui/breadcrumbs/breadcrumbsWidget.css
@@ -0,0 +1,42 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+.monaco-breadcrumbs {
+	user-select: none;
+	display: flex;
+	flex-direction: row;
+	flex-wrap: nowrap;
+	justify-content: flex-start;
+	outline-style: none;
+}
+
+.monaco-breadcrumbs .monaco-breadcrumb-item {
+	display: flex;
+	align-items: center;
+	flex: 0 1 auto;
+	white-space: nowrap;
+	cursor: pointer;
+	align-self: center;
+	height: 100%;
+	outline: none;
+}
+
+.monaco-breadcrumbs .monaco-breadcrumb-item::before {
+	width: 14px;
+	height: 16px;
+	display: inline-block;
+	content: ' ';
+}
+
+.monaco-breadcrumbs .monaco-breadcrumb-item:not(:nth-child(2))::before {
+	background-image: url(./collapsed.svg);
+	opacity: .7;
+	background-size: 16px;
+	background-position: 50% 50%;
+}
+
+.vs-dark .monaco-breadcrumbs .monaco-breadcrumb-item:not(:nth-child(2))::before {
+	background-image: url(./collpased-dark.svg);
+}
diff --git a/src/vs/base/browser/ui/breadcrumbs/breadcrumbsWidget.ts b/src/vs/base/browser/ui/breadcrumbs/breadcrumbsWidget.ts
new file mode 100644
index 00000000000..cbf712942c8
--- /dev/null
+++ b/src/vs/base/browser/ui/breadcrumbs/breadcrumbsWidget.ts
@@ -0,0 +1,313 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+import * as dom from 'vs/base/browser/dom';
+import { IMouseEvent } from 'vs/base/browser/mouseEvent';
+import { DomScrollableElement } from 'vs/base/browser/ui/scrollbar/scrollableElement';
+import { commonPrefixLength } from 'vs/base/common/arrays';
+import { Color } from 'vs/base/common/color';
+import { Emitter, Event } from 'vs/base/common/event';
+import { dispose, IDisposable } from 'vs/base/common/lifecycle';
+import { ScrollbarVisibility } from 'vs/base/common/scrollable';
+import 'vs/css!./breadcrumbsWidget';
+
+export abstract class BreadcrumbsItem {
+	dispose(): void { }
+	abstract equals(other: BreadcrumbsItem): boolean;
+	abstract render(container: HTMLElement): void;
+}
+
+export class SimpleBreadcrumbsItem extends BreadcrumbsItem {
+
+	constructor(
+		readonly text: string,
+		readonly title: string = text
+	) {
+		super();
+	}
+
+	equals(other: this) {
+		return other === this || other instanceof SimpleBreadcrumbsItem && other.text === this.text && other.title === this.title;
+	}
+
+	render(container: HTMLElement): void {
+		let node = document.createElement('div');
+		node.title = this.title;
+		node.innerText = this.text;
+		container.appendChild(node);
+	}
+}
+
+export interface IBreadcrumbsWidgetStyles {
+	breadcrumbsBackground?: Color;
+	breadcrumbsForeground?: Color;
+	breadcrumbsHoverForeground?: Color;
+	breadcrumbsFocusForeground?: Color;
+	breadcrumbsFocusAndSelectionForeground?: Color;
+}
+
+export interface IBreadcrumbsItemEvent {
+	type: 'select' | 'focus';
+	item: BreadcrumbsItem;
+	node: HTMLElement;
+	payload: any;
+}
+
+export class BreadcrumbsWidget {
+
+	private readonly _disposables = new Array<IDisposable>();
+	private readonly _domNode: HTMLDivElement;
+	private readonly _styleElement: HTMLStyleElement;
+	private readonly _scrollable: DomScrollableElement;
+
+	private readonly _onDidSelectItem = new Emitter<IBreadcrumbsItemEvent>();
+	private readonly _onDidFocusItem = new Emitter<IBreadcrumbsItemEvent>();
+	private readonly _onDidChangeFocus = new Emitter<boolean>();
+
+	readonly onDidSelectItem: Event<IBreadcrumbsItemEvent> = this._onDidSelectItem.event;
+	readonly onDidFocusItem: Event<IBreadcrumbsItemEvent> = this._onDidFocusItem.event;
+	readonly onDidChangeFocus: Event<boolean> = this._onDidChangeFocus.event;
+
+	private readonly _items = new Array<BreadcrumbsItem>();
+	private readonly _nodes = new Array<HTMLDivElement>();
+	private readonly _freeNodes = new Array<HTMLDivElement>();
+
+	private _focusedItemIdx: number = -1;
+	private _selectedItemIdx: number = -1;
+
+	constructor(
+		container: HTMLElement
+	) {
+		this._domNode = document.createElement('div');
+		this._domNode.className = 'monaco-breadcrumbs';
+		this._domNode.tabIndex = 0;
+		this._domNode.setAttribute('role', 'list');
+		this._scrollable = new DomScrollableElement(this._domNode, {
+			vertical: ScrollbarVisibility.Hidden,
+			horizontal: ScrollbarVisibility.Auto,
+			horizontalScrollbarSize: 3,
+			useShadows: false,
+			scrollYToX: true
+		});
+		this._disposables.push(this._scrollable);
+		this._disposables.push(dom.addStandardDisposableListener(this._domNode, 'click', e => this._onClick(e)));
+		container.appendChild(this._scrollable.getDomNode());
+
+		this._styleElement = dom.createStyleSheet(this._domNode);
+
+		let focusTracker = dom.trackFocus(this._domNode);
+		this._disposables.push(focusTracker);
+		this._disposables.push(focusTracker.onDidBlur(_ => this._onDidChangeFocus.fire(false)));
+		this._disposables.push(focusTracker.onDidFocus(_ => this._onDidChangeFocus.fire(true)));
+	}
+
+	dispose(): void {
+		dispose(this._disposables);
+		this._onDidSelectItem.dispose();
+		this._onDidFocusItem.dispose();
+		this._onDidChangeFocus.dispose();
+		this._domNode.remove();
+		this._disposables.length = 0;
+		this._nodes.length = 0;
+		this._freeNodes.length = 0;
+	}
+
+	layout(dim: dom.Dimension): void {
+		if (dim) {
+			this._domNode.style.width = `${dim.width}px`;
+			this._domNode.style.height = `${dim.height}px`;
+		}
+		this._scrollable.setRevealOnScroll(false);
+		this._scrollable.scanDomNode();
+		this._scrollable.setRevealOnScroll(true);
+	}
+
+	style(style: IBreadcrumbsWidgetStyles): void {
+		let content = '';
+		if (style.breadcrumbsBackground) {
+			content += `.monaco-breadcrumbs { background-color: ${style.breadcrumbsBackground}}`;
+		}
+		if (style.breadcrumbsForeground) {
+			content += `.monaco-breadcrumbs .monaco-breadcrumb-item { color: ${style.breadcrumbsForeground}}\n`;
+		}
+		if (style.breadcrumbsFocusForeground) {
+			content += `.monaco-breadcrumbs .monaco-breadcrumb-item.focused { color: ${style.breadcrumbsFocusForeground}}\n`;
+		}
+		if (style.breadcrumbsFocusAndSelectionForeground) {
+			content += `.monaco-breadcrumbs .monaco-breadcrumb-item.focused.selected { color: ${style.breadcrumbsFocusAndSelectionForeground}}\n`;
+		}
+		if (style.breadcrumbsHoverForeground) {
+			content += `.monaco-breadcrumbs .monaco-breadcrumb-item:hover:not(.focused):not(.selected) { color: ${style.breadcrumbsHoverForeground}}\n`;
+		}
+		if (this._styleElement.innerHTML !== content) {
+			this._styleElement.innerHTML = content;
+		}
+	}
+
+	domFocus(): void {
+		let idx = this._focusedItemIdx >= 0 ? this._focusedItemIdx : this._items.length - 1;
+		if (idx >= 0 && idx < this._items.length) {
+			this._focus(idx, undefined);
+		} else {
+			this._domNode.focus();
+		}
+	}
+
+	isDOMFocused(): boolean {
+		let candidate = document.activeElement;
+		while (candidate) {
+			if (this._domNode === candidate) {
+				return true;
+			}
+			candidate = candidate.parentElement;
+		}
+		return false;
+	}
+
+	getFocused(): BreadcrumbsItem {
+		return this._items[this._focusedItemIdx];
+	}
+
+	setFocused(item: BreadcrumbsItem, payload?: any): void {
+		this._focus(this._items.indexOf(item), payload);
+	}
+
+	focusPrev(payload?: any): any {
+		if (this._focusedItemIdx > 0) {
+			this._focus(this._focusedItemIdx - 1, payload);
+		}
+	}
+
+	focusNext(payload?: any): any {
+		if (this._focusedItemIdx + 1 < this._nodes.length) {
+			this._focus(this._focusedItemIdx + 1, payload);
+		}
+	}
+
+	private _focus(nth: number, payload: any): void {
+		this._focusedItemIdx = -1;
+		for (let i = 0; i < this._nodes.length; i++) {
+			const node = this._nodes[i];
+			if (i !== nth) {
+				dom.removeClass(node, 'focused');
+			} else {
+				this._focusedItemIdx = i;
+				dom.addClass(node, 'focused');
+				node.focus();
+			}
+		}
+		this._reveal(this._focusedItemIdx, true);
+		this._onDidFocusItem.fire({ type: 'focus', item: this._items[this._focusedItemIdx], node: this._nodes[this._focusedItemIdx], payload });
+	}
+
+	reveal(item: BreadcrumbsItem): void {
+		let idx = this._items.indexOf(item);
+		if (idx >= 0) {
+			this._reveal(idx, false);
+		}
+	}
+
+	private _reveal(nth: number, minimal: boolean): void {
+		const node = this._nodes[nth];
+		if (node) {
+			const { width } = this._scrollable.getScrollDimensions();
+			const { scrollLeft } = this._scrollable.getScrollPosition();
+			if (!minimal || node.offsetLeft > scrollLeft + width || node.offsetLeft < scrollLeft) {
+				this._scrollable.setRevealOnScroll(false);
+				this._scrollable.setScrollPosition({ scrollLeft: node.offsetLeft });
+				this._scrollable.setRevealOnScroll(true);
+			}
+		}
+	}
+
+	getSelection(): BreadcrumbsItem {
+		return this._items[this._selectedItemIdx];
+	}
+
+	setSelection(item: BreadcrumbsItem, payload?: any): void {
+		this._select(this._items.indexOf(item), payload);
+	}
+
+	private _select(nth: number, payload: any): void {
+		this._selectedItemIdx = -1;
+		for (let i = 0; i < this._nodes.length; i++) {
+			const node = this._nodes[i];
+			if (i !== nth) {
+				dom.removeClass(node, 'selected');
+			} else {
+				this._selectedItemIdx = i;
+				dom.addClass(node, 'selected');
+			}
+		}
+		this._onDidSelectItem.fire({ type: 'select', item: this._items[this._selectedItemIdx], node: this._nodes[this._selectedItemIdx], payload });
+	}
+
+	getItems(): ReadonlyArray<BreadcrumbsItem> {
+		return this._items;
+	}
+
+	setItems(items: BreadcrumbsItem[]): void {
+		let prefix: number;
+		let removed: BreadcrumbsItem[];
+		try {
+			prefix = commonPrefixLength(this._items, items, (a, b) => a.equals(b));
+			removed = this._items.splice(prefix, this._items.length - prefix, ...items.slice(prefix));
+			this._render(prefix);
+			dispose(removed);
+			this._focus(-1, undefined);
+		} catch (e) {
+			let newError = new Error(`BreadcrumbsItem#setItems: newItems: ${items.length}, prefix: ${prefix}, removed: ${removed.length}`);
+			newError.name = e.name;
+			newError.stack = e.stack;
+			throw newError;
+		}
+	}
+
+	private _render(start: number): void {
+		for (; start < this._items.length && start < this._nodes.length; start++) {
+			let item = this._items[start];
+			let node = this._nodes[start];
+			this._renderItem(item, node);
+		}
+		// case a: more nodes -> remove them
+		while (start < this._nodes.length) {
+			const free = this._nodes.pop();
+			this._freeNodes.push(free);
+			free.remove();
+		}
+
+		// case b: more items -> render them
+		for (; start < this._items.length; start++) {
+			let item = this._items[start];
+			let node = this._freeNodes.length > 0 ? this._freeNodes.pop() : document.createElement('div');
+			this._renderItem(item, node);
+			this._domNode.appendChild(node);
+			this._nodes.push(node);
+		}
+		this.layout(undefined);
+	}
+
+	private _renderItem(item: BreadcrumbsItem, container: HTMLDivElement): void {
+		dom.clearNode(container);
+		container.className = '';
+		item.render(container);
+		container.tabIndex = -1;
+		container.setAttribute('role', 'listitem');
+		dom.addClass(container, 'monaco-breadcrumb-item');
+	}
+
+	private _onClick(event: IMouseEvent): void {
+		for (let el = event.target; el; el = el.parentElement) {
+			let idx = this._nodes.indexOf(el as any);
+			if (idx >= 0) {
+				this._focus(idx, event);
+				this._select(idx, event);
+				break;
+			}
+		}
+	}
+}
diff --git a/src/vs/base/browser/ui/breadcrumbs/collapsed.svg b/src/vs/base/browser/ui/breadcrumbs/collapsed.svg
new file mode 100755
index 00000000000..3a63808c358
--- /dev/null
+++ b/src/vs/base/browser/ui/breadcrumbs/collapsed.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><path fill="#646465" d="M6 4v8l4-4-4-4zm1 2.414L8.586 8 7 9.586V6.414z"/></svg>
\ No newline at end of file
diff --git a/src/vs/base/browser/ui/breadcrumbs/collpased-dark.svg b/src/vs/base/browser/ui/breadcrumbs/collpased-dark.svg
new file mode 100755
index 00000000000..cf5c3641aa7
--- /dev/null
+++ b/src/vs/base/browser/ui/breadcrumbs/collpased-dark.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><path fill="#E8E8E8" d="M6 4v8l4-4-4-4zm1 2.414L8.586 8 7 9.586V6.414z"/></svg>
\ No newline at end of file
diff --git a/src/vs/base/browser/ui/button/button.ts b/src/vs/base/browser/ui/button/button.ts
index 129009f5088..5bee0452536 100644
--- a/src/vs/base/browser/ui/button/button.ts
+++ b/src/vs/base/browser/ui/button/button.ts
@@ -7,14 +7,13 @@
 
 import 'vs/css!./button';
 import * as DOM from 'vs/base/browser/dom';
-import { Builder, $ } from 'vs/base/browser/builder';
 import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
 import { KeyCode } from 'vs/base/common/keyCodes';
 import { Color } from 'vs/base/common/color';
 import { mixin } from 'vs/base/common/objects';
 import { Event as BaseEvent, Emitter } from 'vs/base/common/event';
-import { dispose, IDisposable } from 'vs/base/common/lifecycle';
-import { Gesture, EventType } from 'vs/base/browser/touch';
+import { Disposable } from 'vs/base/common/lifecycle';
+import { Gesture } from 'vs/base/browser/touch';
 
 export interface IButtonOptions extends IButtonStyles {
 	title?: boolean;
@@ -33,9 +32,9 @@ const defaultOptions: IButtonStyles = {
 	buttonForeground: Color.white
 };
 
-export class Button {
+export class Button extends Disposable {
 
-	private $el: Builder;
+	private _element: HTMLElement;
 	private options: IButtonOptions;
 
 	private buttonBackground: Color;
@@ -43,12 +42,14 @@ export class Button {
 	private buttonForeground: Color;
 	private buttonBorder: Color;
 
-	private _onDidClick = new Emitter<any>();
-	readonly onDidClick: BaseEvent<Event> = this._onDidClick.event;
+	private _onDidClick = this._register(new Emitter<any>());
+	get onDidClick(): BaseEvent<Event> { return this._onDidClick.event; }
 
 	private focusTracker: DOM.IFocusTracker;
 
 	constructor(container: HTMLElement, options?: IButtonOptions) {
+		super();
+
 		this.options = options || Object.create(null);
 		mixin(this.options, defaultOptions, false);
 
@@ -57,52 +58,54 @@ export class Button {
 		this.buttonForeground = this.options.buttonForeground;
 		this.buttonBorder = this.options.buttonBorder;
 
-		this.$el = $('a.monaco-button').attr({
-			'tabIndex': '0',
-			'role': 'button'
-		}).appendTo(container);
+		this._element = document.createElement('a');
+		DOM.addClass(this._element, 'monaco-button');
+		this._element.tabIndex = 0;
+		this._element.setAttribute('role', 'button');
 
-		Gesture.addTarget(this.$el.getHTMLElement());
+		container.appendChild(this._element);
 
-		this.$el.on([DOM.EventType.CLICK, EventType.Tap], e => {
+		Gesture.addTarget(this._element);
+
+		this._register(DOM.addDisposableListener(this._element, DOM.EventType.CLICK, e => {
 			if (!this.enabled) {
 				DOM.EventHelper.stop(e);
 				return;
 			}
 
 			this._onDidClick.fire(e);
-		});
+		}));
 
-		this.$el.on(DOM.EventType.KEY_DOWN, e => {
-			let event = new StandardKeyboardEvent(e as KeyboardEvent);
+		this._register(DOM.addDisposableListener(this._element, DOM.EventType.KEY_DOWN, e => {
+			const event = new StandardKeyboardEvent(e as KeyboardEvent);
 			let eventHandled = false;
 			if (this.enabled && event.equals(KeyCode.Enter) || event.equals(KeyCode.Space)) {
 				this._onDidClick.fire(e);
 				eventHandled = true;
 			} else if (event.equals(KeyCode.Escape)) {
-				this.$el.domBlur();
+				this._element.blur();
 				eventHandled = true;
 			}
 
 			if (eventHandled) {
 				DOM.EventHelper.stop(event, true);
 			}
-		});
+		}));
 
-		this.$el.on(DOM.EventType.MOUSE_OVER, e => {
-			if (!this.$el.hasClass('disabled')) {
+		this._register(DOM.addDisposableListener(this._element, DOM.EventType.MOUSE_OVER, e => {
+			if (!DOM.hasClass(this._element, 'disabled')) {
 				this.setHoverBackground();
 			}
-		});
+		}));
 
-		this.$el.on(DOM.EventType.MOUSE_OUT, e => {
+		this._register(DOM.addDisposableListener(this._element, DOM.EventType.MOUSE_OUT, e => {
 			this.applyStyles(); // restore standard styles
-		});
+		}));
 
 		// Also set hover background when button is focused for feedback
-		this.focusTracker = DOM.trackFocus(this.$el.getHTMLElement());
-		this.focusTracker.onDidFocus(() => this.setHoverBackground());
-		this.focusTracker.onDidBlur(() => this.applyStyles()); // restore standard styles
+		this.focusTracker = this._register(DOM.trackFocus(this._element));
+		this._register(this.focusTracker.onDidFocus(() => this.setHoverBackground()));
+		this._register(this.focusTracker.onDidBlur(() => this.applyStyles())); // restore standard styles
 
 		this.applyStyles();
 	}
@@ -110,7 +113,7 @@ export class Button {
 	private setHoverBackground(): void {
 		const hoverBackground = this.buttonHoverBackground ? this.buttonHoverBackground.toString() : null;
 		if (hoverBackground) {
-			this.$el.style('background-color', hoverBackground);
+			this._element.style.backgroundColor = hoverBackground;
 		}
 	}
 
@@ -124,80 +127,64 @@ export class Button {
 	}
 
 	private applyStyles(): void {
-		if (this.$el) {
+		if (this._element) {
 			const background = this.buttonBackground ? this.buttonBackground.toString() : null;
 			const foreground = this.buttonForeground ? this.buttonForeground.toString() : null;
 			const border = this.buttonBorder ? this.buttonBorder.toString() : null;
 
-			this.$el.style('color', foreground);
-			this.$el.style('background-color', background);
+			this._element.style.color = foreground;
+			this._element.style.backgroundColor = background;
 
-			this.$el.style('border-width', border ? '1px' : null);
-			this.$el.style('border-style', border ? 'solid' : null);
-			this.$el.style('border-color', border);
+			this._element.style.borderWidth = border ? '1px' : null;
+			this._element.style.borderStyle = border ? 'solid' : null;
+			this._element.style.borderColor = border;
 		}
 	}
 
 	get element(): HTMLElement {
-		return this.$el.getHTMLElement();
+		return this._element;
 	}
 
 	set label(value: string) {
-		if (!this.$el.hasClass('monaco-text-button')) {
-			this.$el.addClass('monaco-text-button');
+		if (!DOM.hasClass(this._element, 'monaco-text-button')) {
+			DOM.addClass(this._element, 'monaco-text-button');
 		}
-		this.$el.text(value);
+		this._element.textContent = value;
 		if (this.options.title) {
-			this.$el.title(value);
+			this._element.title = value;
 		}
 	}
 
 	set icon(iconClassName: string) {
-		this.$el.addClass(iconClassName);
+		DOM.addClass(this._element, iconClassName);
 	}
 
 	set enabled(value: boolean) {
 		if (value) {
-			this.$el.removeClass('disabled');
-			this.$el.attr({
-				'aria-disabled': 'false',
-				'tabIndex': '0'
-			});
+			DOM.removeClass(this._element, 'disabled');
+			this._element.setAttribute('aria-disabled', String(false));
+			this._element.tabIndex = 0;
 		} else {
-			this.$el.addClass('disabled');
-			this.$el.attr('aria-disabled', String(true));
-			DOM.removeTabIndexAndUpdateFocus(this.$el.getHTMLElement());
+			DOM.addClass(this._element, 'disabled');
+			this._element.setAttribute('aria-disabled', String(true));
+			DOM.removeTabIndexAndUpdateFocus(this._element);
 		}
 	}
 
 	get enabled() {
-		return !this.$el.hasClass('disabled');
+		return !DOM.hasClass(this._element, 'disabled');
 	}
 
 	focus(): void {
-		this.$el.domFocus();
-	}
-
-	dispose(): void {
-		if (this.$el) {
-			this.$el.dispose();
-			this.$el = null;
-
-			this.focusTracker.dispose();
-			this.focusTracker = null;
-		}
-
-		this._onDidClick.dispose();
+		this._element.focus();
 	}
 }
 
-export class ButtonGroup {
-	private _buttons: Button[];
-	private toDispose: IDisposable[];
+export class ButtonGroup extends Disposable {
+	private _buttons: Button[] = [];
 
 	constructor(container: HTMLElement, count: number, options?: IButtonOptions) {
-		this._buttons = [];
-		this.toDispose = [];
+		super();
 
 		this.create(container, count, options);
 	}
@@ -208,13 +195,12 @@ export class ButtonGroup {
 
 	private create(container: HTMLElement, count: number, options?: IButtonOptions): void {
 		for (let index = 0; index < count; index++) {
-			const button = new Button(container, options);
+			const button = this._register(new Button(container, options));
 			this._buttons.push(button);
-			this.toDispose.push(button);
 
 			// Implement keyboard access in buttons if there are multiple
 			if (count > 1) {
-				$(button.element).on(DOM.EventType.KEY_DOWN, e => {
+				this._register(DOM.addDisposableListener(button.element, DOM.EventType.KEY_DOWN, e => {
 					const event = new StandardKeyboardEvent(e as KeyboardEvent);
 					let eventHandled = true;
 
@@ -232,12 +218,9 @@ export class ButtonGroup {
 						this._buttons[buttonIndexToFocus].focus();
 						DOM.EventHelper.stop(e, true);
 					}
-				}, this.toDispose);
+
+				}));
 			}
 		}
 	}
-
-	dispose(): void {
-		this.toDispose = dispose(this.toDispose);
-	}
 }
\ No newline at end of file
diff --git a/src/vs/base/browser/ui/centered/centeredViewLayout.ts b/src/vs/base/browser/ui/centered/centeredViewLayout.ts
new file mode 100644
index 00000000000..50cac7329f2
--- /dev/null
+++ b/src/vs/base/browser/ui/centered/centeredViewLayout.ts
@@ -0,0 +1,150 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { SplitView, Orientation, ISplitViewStyles, IView as ISplitViewView } from 'vs/base/browser/ui/splitview/splitview';
+import { $ } from 'vs/base/browser/dom';
+import { Event, mapEvent } from 'vs/base/common/event';
+import { IView } from 'vs/base/browser/ui/grid/gridview';
+import { IDisposable, dispose } from 'vs/base/common/lifecycle';
+import { Color } from 'vs/base/common/color';
+
+export interface CenteredViewState {
+	leftMarginRatio: number;
+	rightMarginRatio: number;
+}
+
+const GOLDEN_RATIO = {
+	leftMarginRatio: 0.1909,
+	rightMarginRatio: 0.1909
+};
+
+function createEmptyView(background: Color): ISplitViewView {
+	const element = $('.centered-layout-margin');
+	element.style.height = '100%';
+	element.style.backgroundColor = background.toString();
+
+	return {
+		element,
+		layout: () => undefined,
+		minimumSize: 60,
+		maximumSize: Number.POSITIVE_INFINITY,
+		onDidChange: Event.None
+	};
+}
+
+function toSplitViewView(view: IView, getHeight: () => number): ISplitViewView {
+	return {
+		element: view.element,
+		get maximumSize() { return view.maximumWidth; },
+		get minimumSize() { return view.minimumWidth; },
+		onDidChange: mapEvent(view.onDidChange, e => e && e.width),
+		layout: size => view.layout(size, getHeight())
+	};
+}
+
+export interface ICenteredViewStyles extends ISplitViewStyles {
+	background: Color;
+}
+
+export class CenteredViewLayout {
+
+	private splitView: SplitView;
+	private width: number = 0;
+	private height: number = 0;
+	private style: ICenteredViewStyles;
+	private didLayout = false;
+	private emptyViews: ISplitViewView[];
+	private splitViewDisposables: IDisposable[] = [];
+
+	constructor(private container: HTMLElement, private view: IView, public readonly state: CenteredViewState = GOLDEN_RATIO) {
+		this.container.appendChild(this.view.element);
+		// Make sure to hide the split view overflow like sashes #52892
+		this.container.style.overflow = 'hidden';
+	}
+
+	get minimumWidth(): number { return this.splitView ? this.splitView.minimumSize : this.view.minimumWidth; }
+	get maximumWidth(): number { return this.splitView ? this.splitView.maximumSize : this.view.maximumWidth; }
+	get minimumHeight(): number { return this.view.minimumHeight; }
+	get maximumHeight(): number { return this.view.maximumHeight; }
+
+	layout(width: number, height: number): void {
+		this.width = width;
+		this.height = height;
+		if (this.splitView) {
+			this.splitView.layout(width);
+			if (!this.didLayout) {
+				this.resizeMargins();
+			}
+		} else {
+			this.view.layout(width, height);
+		}
+		this.didLayout = true;
+	}
+
+	private resizeMargins(): void {
+		this.splitView.resizeView(0, this.state.leftMarginRatio * this.width);
+		this.splitView.resizeView(2, this.state.rightMarginRatio * this.width);
+	}
+
+	isActive(): boolean {
+		return !!this.splitView;
+	}
+
+	styles(style: ICenteredViewStyles): void {
+		this.style = style;
+		if (this.splitView) {
+			this.splitView.style(this.style);
+			this.emptyViews[0].element.style.backgroundColor = this.style.background.toString();
+			this.emptyViews[1].element.style.backgroundColor = this.style.background.toString();
+		}
+	}
+
+	activate(active: boolean): void {
+		if (active === this.isActive()) {
+			return;
+		}
+
+		if (active) {
+			this.container.removeChild(this.view.element);
+			this.splitView = new SplitView(this.container, {
+				inverseAltBehavior: true,
+				orientation: Orientation.HORIZONTAL,
+				styles: this.style
+			});
+
+			this.splitViewDisposables.push(this.splitView.onDidSashChange(() => {
+				this.state.leftMarginRatio = this.splitView.getViewSize(0) / this.width;
+				this.state.rightMarginRatio = this.splitView.getViewSize(2) / this.width;
+			}));
+			this.splitViewDisposables.push(this.splitView.onDidSashReset(() => {
+				this.state.leftMarginRatio = GOLDEN_RATIO.leftMarginRatio;
+				this.state.rightMarginRatio = GOLDEN_RATIO.rightMarginRatio;
+				this.resizeMargins();
+			}));
+
+			this.splitView.layout(this.width);
+			this.splitView.addView(toSplitViewView(this.view, () => this.height), 0);
+			this.emptyViews = [createEmptyView(this.style.background), createEmptyView(this.style.background)];
+			this.splitView.addView(this.emptyViews[0], this.state.leftMarginRatio * this.width, 0);
+			this.splitView.addView(this.emptyViews[1], this.state.rightMarginRatio * this.width, 2);
+		} else {
+			this.container.removeChild(this.splitView.el);
+			this.splitViewDisposables = dispose(this.splitViewDisposables);
+			this.splitView.dispose();
+			this.splitView = undefined;
+			this.emptyViews = undefined;
+			this.container.appendChild(this.view.element);
+		}
+	}
+
+	dispose(): void {
+		this.splitViewDisposables = dispose(this.splitViewDisposables);
+
+		if (this.splitView) {
+			this.splitView.dispose();
+			this.splitView = undefined;
+		}
+	}
+}
diff --git a/src/vs/base/browser/ui/checkbox/checkbox.ts b/src/vs/base/browser/ui/checkbox/checkbox.ts
index 8725ab207d0..1b1c5df8521 100644
--- a/src/vs/base/browser/ui/checkbox/checkbox.ts
+++ b/src/vs/base/browser/ui/checkbox/checkbox.ts
@@ -6,20 +6,18 @@
 'use strict';
 
 import 'vs/css!./checkbox';
-
 import * as DOM from 'vs/base/browser/dom';
-import * as objects from 'vs/base/common/objects';
-import { KeyCode } from 'vs/base/common/keyCodes';
-import { Widget } from 'vs/base/browser/ui/widget';
 import { IKeyboardEvent } from 'vs/base/browser/keyboardEvent';
+import { Widget } from 'vs/base/browser/ui/widget';
 import { Color } from 'vs/base/common/color';
+import { Emitter, Event } from 'vs/base/common/event';
+import { KeyCode } from 'vs/base/common/keyCodes';
+import * as objects from 'vs/base/common/objects';
 
 export interface ICheckboxOpts extends ICheckboxStyles {
 	readonly actionClassName: string;
 	readonly title: string;
 	readonly isChecked: boolean;
-	readonly onChange: (viaKeyboard: boolean) => void;
-	readonly onKeyDown?: (e: IKeyboardEvent) => void;
 }
 
 export interface ICheckboxStyles {
@@ -32,13 +30,20 @@ const defaultOpts = {
 
 export class Checkbox extends Widget {
 
+	private readonly _onChange = this._register(new Emitter<boolean>());
+	get onChange(): Event<boolean /* via keyboard */> { return this._onChange.event; }
+
+	private readonly _onKeyDown = this._register(new Emitter<IKeyboardEvent>());
+	get onKeyDown(): Event<IKeyboardEvent> { return this._onKeyDown.event; }
+
 	private readonly _opts: ICheckboxOpts;
-	public readonly domNode: HTMLElement;
+	readonly domNode: HTMLElement;
 
 	private _checked: boolean;
 
 	constructor(opts: ICheckboxOpts) {
 		super();
+
 		this._opts = objects.deepClone(opts);
 		objects.mixin(this._opts, defaultOpts, false);
 		this._checked = this._opts.isChecked;
@@ -55,37 +60,35 @@ export class Checkbox extends Widget {
 
 		this.onclick(this.domNode, (ev) => {
 			this.checked = !this._checked;
-			this._opts.onChange(false);
+			this._onChange.fire(false);
 			ev.preventDefault();
 		});
 
 		this.onkeydown(this.domNode, (keyboardEvent) => {
 			if (keyboardEvent.keyCode === KeyCode.Space || keyboardEvent.keyCode === KeyCode.Enter) {
 				this.checked = !this._checked;
-				this._opts.onChange(true);
+				this._onChange.fire(true);
 				keyboardEvent.preventDefault();
 				return;
 			}
 
-			if (this._opts.onKeyDown) {
-				this._opts.onKeyDown(keyboardEvent);
-			}
+			this._onKeyDown.fire(keyboardEvent);
 		});
 	}
 
-	public get enabled(): boolean {
+	get enabled(): boolean {
 		return this.domNode.getAttribute('aria-disabled') !== 'true';
 	}
 
-	public focus(): void {
+	focus(): void {
 		this.domNode.focus();
 	}
 
-	public get checked(): boolean {
+	get checked(): boolean {
 		return this._checked;
 	}
 
-	public set checked(newIsChecked: boolean) {
+	set checked(newIsChecked: boolean) {
 		this._checked = newIsChecked;
 		this.domNode.setAttribute('aria-checked', String(this._checked));
 		if (this._checked) {
@@ -97,11 +100,11 @@ export class Checkbox extends Widget {
 		this.applyStyles();
 	}
 
-	public width(): number {
+	width(): number {
 		return 2 /*marginleft*/ + 2 /*border*/ + 2 /*padding*/ + 16 /* icon width */;
 	}
 
-	public style(styles: ICheckboxStyles): void {
+	style(styles: ICheckboxStyles): void {
 		if (styles.inputActiveOptionBorder) {
 			this._opts.inputActiveOptionBorder = styles.inputActiveOptionBorder;
 		}
@@ -114,12 +117,12 @@ export class Checkbox extends Widget {
 		}
 	}
 
-	public enable(): void {
+	enable(): void {
 		this.domNode.tabIndex = 0;
 		this.domNode.setAttribute('aria-disabled', String(false));
 	}
 
-	public disable(): void {
+	disable(): void {
 		DOM.removeTabIndexAndUpdateFocus(this.domNode);
 		this.domNode.setAttribute('aria-disabled', String(true));
 	}
diff --git a/src/vs/base/browser/ui/contextview/contextview.css b/src/vs/base/browser/ui/contextview/contextview.css
index 84942adb3e6..af3ead17a6b 100644
--- a/src/vs/base/browser/ui/contextview/contextview.css
+++ b/src/vs/base/browser/ui/contextview/contextview.css
@@ -5,5 +5,5 @@
 
 .context-view {
 	position: absolute;
-	z-index: 1000;
+	z-index: 2000;
 }
\ No newline at end of file
diff --git a/src/vs/base/browser/ui/contextview/contextview.ts b/src/vs/base/browser/ui/contextview/contextview.ts
index b5b1c296425..511c9ac7309 100644
--- a/src/vs/base/browser/ui/contextview/contextview.ts
+++ b/src/vs/base/browser/ui/contextview/contextview.ts
@@ -6,9 +6,8 @@
 'use strict';
 
 import 'vs/css!./contextview';
-import { Builder, $ } from 'vs/base/browser/builder';
 import * as DOM from 'vs/base/browser/dom';
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
+import { IDisposable, dispose, toDisposable, combinedDisposable, Disposable } from 'vs/base/common/lifecycle';
 
 export interface IAnchor {
 	x: number;
@@ -17,11 +16,11 @@ export interface IAnchor {
 	height?: number;
 }
 
-export enum AnchorAlignment {
+export const enum AnchorAlignment {
 	LEFT, RIGHT
 }
 
-export enum AnchorPosition {
+export const enum AnchorPosition {
 	BELOW, ABOVE
 }
 
@@ -54,93 +53,96 @@ export interface ISize {
 
 export interface IView extends IPosition, ISize { }
 
-function layout(view: ISize, around: IView, viewport: IView, anchorPosition: AnchorPosition, anchorAlignment: AnchorAlignment): IPosition {
-
-	let chooseBiased = (a: number, aIsGood: boolean, b: number, bIsGood: boolean) => {
-		if (aIsGood) {
-			return a;
-		}
-		if (bIsGood) {
-			return b;
-		}
-		return a;
-	};
-
-	let chooseOne = (a: number, aIsGood: boolean, b: number, bIsGood: boolean, aIsPreferred: boolean) => {
-		if (aIsPreferred) {
-			return chooseBiased(a, aIsGood, b, bIsGood);
-		} else {
-			return chooseBiased(b, bIsGood, a, aIsGood);
-		}
-	};
-
-	let top = (() => {
-		// Compute both options (putting the segment above and below)
-		let posAbove = around.top - view.height;
-		let posBelow = around.top + around.height;
-
-		// Check for both options if they are good
-		let aboveIsGood = (posAbove >= viewport.top && posAbove + view.height <= viewport.top + viewport.height);
-		let belowIsGood = (posBelow >= viewport.top && posBelow + view.height <= viewport.top + viewport.height);
-
-		return chooseOne(posAbove, aboveIsGood, posBelow, belowIsGood, anchorPosition === AnchorPosition.ABOVE);
-	})();
-
-	let left = (() => {
-		// Compute both options (aligning left and right)
-		let posLeft = around.left;
-		let posRight = around.left + around.width - view.width;
-
-		// Check for both options if they are good
-		let leftIsGood = (posLeft >= viewport.left && posLeft + view.width <= viewport.left + viewport.width);
-		let rightIsGood = (posRight >= viewport.left && posRight + view.width <= viewport.left + viewport.width);
-
-		return chooseOne(posLeft, leftIsGood, posRight, rightIsGood, anchorAlignment === AnchorAlignment.LEFT);
-	})();
-
-	return { top: top, left: left };
+export const enum LayoutAnchorPosition {
+	Before,
+	After
 }
 
-export class ContextView {
+export interface ILayoutAnchor {
+	offset: number;
+	size: number;
+	position: LayoutAnchorPosition;
+}
+
+/**
+ * Lays out a one dimensional view next to an anchor in a viewport.
+ *
+ * @returns The view offset within the viewport.
+ */
+export function layout(viewportSize: number, viewSize: number, anchor: ILayoutAnchor): number {
+	const anchorEnd = anchor.offset + anchor.size;
+
+	if (anchor.position === LayoutAnchorPosition.Before) {
+		if (viewSize <= viewportSize - anchorEnd) {
+			return anchorEnd; // happy case, lay it out after the anchor
+		}
+
+		if (viewSize <= anchor.offset) {
+			return anchor.offset - viewSize; // ok case, lay it out before the anchor
+		}
+
+		return Math.max(viewportSize - viewSize, 0); // sad case, lay it over the anchor
+	} else {
+		if (viewSize <= anchor.offset) {
+			return anchor.offset - viewSize; // happy case, lay it out before the anchor
+		}
+
+		if (viewSize <= viewportSize - anchorEnd) {
+			return anchorEnd; // ok case, lay it out after the anchor
+		}
+
+		return 0; // sad case, lay it over the anchor
+	}
+}
+
+export class ContextView extends Disposable {
 
 	private static readonly BUBBLE_UP_EVENTS = ['click', 'keydown', 'focus', 'blur'];
 	private static readonly BUBBLE_DOWN_EVENTS = ['click'];
 
-	private $container: Builder;
-	private $view: Builder;
+	private container: HTMLElement;
+	private view: HTMLElement;
 	private delegate: IDelegate;
-	private toDispose: IDisposable[];
 	private toDisposeOnClean: IDisposable;
+	private toDisposeOnSetContainer: IDisposable;
 
 	constructor(container: HTMLElement) {
-		this.$view = $('.context-view').hide();
+		super();
+
+		this.view = DOM.$('.context-view');
+
+		DOM.hide(this.view);
+
 		this.setContainer(container);
 
-		this.toDispose = [{
-			dispose: () => {
-				this.setContainer(null);
-			}
-		}];
-
-		this.toDisposeOnClean = null;
+		this._register(toDisposable(() => this.setContainer(null)));
 	}
 
 	public setContainer(container: HTMLElement): void {
-		if (this.$container) {
-			this.$container.getHTMLElement().removeChild(this.$view.getHTMLElement());
-			this.$container.off(ContextView.BUBBLE_UP_EVENTS);
-			this.$container.off(ContextView.BUBBLE_DOWN_EVENTS, true);
-			this.$container = null;
+		if (this.container) {
+			this.toDisposeOnSetContainer = dispose(this.toDisposeOnSetContainer);
+			this.container.removeChild(this.view);
+			this.container = null;
 		}
 		if (container) {
-			this.$container = $(container);
-			this.$view.appendTo(this.$container);
-			this.$container.on(ContextView.BUBBLE_UP_EVENTS, (e: Event) => {
-				this.onDOMEvent(e, <HTMLElement>document.activeElement, false);
+			this.container = container;
+			this.container.appendChild(this.view);
+
+			const toDisposeOnSetContainer: IDisposable[] = [];
+
+			ContextView.BUBBLE_UP_EVENTS.forEach(event => {
+				toDisposeOnSetContainer.push(DOM.addStandardDisposableListener(this.container, event, (e: Event) => {
+					this.onDOMEvent(e, <HTMLElement>document.activeElement, false);
+				}));
 			});
-			this.$container.on(ContextView.BUBBLE_DOWN_EVENTS, (e: Event) => {
-				this.onDOMEvent(e, <HTMLElement>document.activeElement, true);
-			}, null, true);
+
+			ContextView.BUBBLE_DOWN_EVENTS.forEach(event => {
+				toDisposeOnSetContainer.push(DOM.addStandardDisposableListener(this.container, event, (e: Event) => {
+					this.onDOMEvent(e, <HTMLElement>document.activeElement, true);
+				}, true));
+			});
+
+			this.toDisposeOnSetContainer = combinedDisposable(toDisposeOnSetContainer);
 		}
 	}
 
@@ -150,10 +152,14 @@ export class ContextView {
 		}
 
 		// Show static box
-		this.$view.setClass('context-view').empty().style({ top: '0px', left: '0px' }).show();
+		DOM.clearNode(this.view);
+		this.view.className = 'context-view';
+		this.view.style.top = '0px';
+		this.view.style.left = '0px';
+		DOM.show(this.view);
 
 		// Render content
-		this.toDisposeOnClean = delegate.render(this.$view.getHTMLElement());
+		this.toDisposeOnClean = delegate.render(this.view);
 
 		// Set active delegate
 		this.delegate = delegate;
@@ -180,6 +186,11 @@ export class ContextView {
 	}
 
 	private doLayout(): void {
+		// Check that we still have a delegate - this.delegate.layout may have hidden
+		if (!this.isVisible()) {
+			return;
+		}
+
 		// Get anchor
 		let anchor = this.delegate.getAnchor();
 
@@ -207,30 +218,33 @@ export class ContextView {
 			};
 		}
 
-		let viewport = {
-			top: DOM.StandardWindow.scrollY,
-			left: DOM.StandardWindow.scrollX,
-			height: window.innerHeight,
-			width: window.innerWidth
-		};
+		const viewSizeWidth = DOM.getTotalWidth(this.view);
+		const viewSizeHeight = DOM.getTotalHeight(this.view);
 
-		// Get the view's size
-		let viewSize = this.$view.getTotalSize();
-		let view = { width: viewSize.width, height: viewSize.height };
+		const anchorPosition = this.delegate.anchorPosition || AnchorPosition.BELOW;
+		const anchorAlignment = this.delegate.anchorAlignment || AnchorAlignment.LEFT;
 
-		let anchorPosition = this.delegate.anchorPosition || AnchorPosition.BELOW;
-		let anchorAlignment = this.delegate.anchorAlignment || AnchorAlignment.LEFT;
+		const verticalAnchor: ILayoutAnchor = { offset: around.top, size: around.height, position: anchorPosition === AnchorPosition.BELOW ? LayoutAnchorPosition.Before : LayoutAnchorPosition.After };
 
-		let result = layout(view, around, viewport, anchorPosition, anchorAlignment);
+		let horizontalAnchor: ILayoutAnchor;
 
-		let containerPosition = DOM.getDomNodePagePosition(this.$container.getHTMLElement());
-		result.top -= containerPosition.top;
-		result.left -= containerPosition.left;
+		if (anchorAlignment === AnchorAlignment.LEFT) {
+			horizontalAnchor = { offset: around.left, size: 0, position: LayoutAnchorPosition.Before };
+		} else {
+			horizontalAnchor = { offset: around.left + around.width, size: 0, position: LayoutAnchorPosition.After };
+		}
 
-		this.$view.removeClass('top', 'bottom', 'left', 'right');
-		this.$view.addClass(anchorPosition === AnchorPosition.BELOW ? 'bottom' : 'top');
-		this.$view.addClass(anchorAlignment === AnchorAlignment.LEFT ? 'left' : 'right');
-		this.$view.style({ top: result.top + 'px', left: result.left + 'px', width: 'initial' });
+		const containerPosition = DOM.getDomNodePagePosition(this.container);
+		const top = layout(window.innerHeight, viewSizeHeight, verticalAnchor) - containerPosition.top;
+		const left = layout(window.innerWidth, viewSizeWidth, horizontalAnchor) - containerPosition.left;
+
+		DOM.removeClasses(this.view, 'top', 'bottom', 'left', 'right');
+		DOM.addClass(this.view, anchorPosition === AnchorPosition.BELOW ? 'bottom' : 'top');
+		DOM.addClass(this.view, anchorAlignment === AnchorAlignment.LEFT ? 'left' : 'right');
+
+		this.view.style.top = `${top}px`;
+		this.view.style.left = `${left}px`;
+		this.view.style.width = 'initial';
 	}
 
 	public hide(data?: any): void {
@@ -245,7 +259,7 @@ export class ContextView {
 			this.toDisposeOnClean = null;
 		}
 
-		this.$view.hide();
+		DOM.hide(this.view);
 	}
 
 	private isVisible(): boolean {
@@ -256,7 +270,7 @@ export class ContextView {
 		if (this.delegate) {
 			if (this.delegate.onDOMEvent) {
 				this.delegate.onDOMEvent(e, <HTMLElement>document.activeElement);
-			} else if (onCapture && !DOM.isAncestor(<HTMLElement>e.target, this.$container.getHTMLElement())) {
+			} else if (onCapture && !DOM.isAncestor(<HTMLElement>e.target, this.container)) {
 				this.hide();
 			}
 		}
@@ -265,6 +279,6 @@ export class ContextView {
 	public dispose(): void {
 		this.hide();
 
-		this.toDispose = dispose(this.toDispose);
+		super.dispose();
 	}
 }
\ No newline at end of file
diff --git a/src/vs/base/browser/ui/countBadge/countBadge.css b/src/vs/base/browser/ui/countBadge/countBadge.css
index e6f36db1adc..7429322f3e6 100644
--- a/src/vs/base/browser/ui/countBadge/countBadge.css
+++ b/src/vs/base/browser/ui/countBadge/countBadge.css
@@ -4,10 +4,13 @@
  *--------------------------------------------------------------------------------------------*/
 
 .monaco-count-badge {
-	padding: 0.2em 0.5em;
+	padding: 0.3em 0.5em;
 	border-radius: 1em;
 	font-size: 85%;
+	min-width: 1.6em;
+	line-height: 1em;
 	font-weight: normal;
 	text-align: center;
-	display: inline;
+	display: inline-block;
+	box-sizing: border-box;
 }
\ No newline at end of file
diff --git a/src/vs/base/browser/ui/dropdown/dropdown.ts b/src/vs/base/browser/ui/dropdown/dropdown.ts
index 969453f6942..b04f5355e9f 100644
--- a/src/vs/base/browser/ui/dropdown/dropdown.ts
+++ b/src/vs/base/browser/ui/dropdown/dropdown.ts
@@ -6,17 +6,17 @@
 'use strict';
 
 import 'vs/css!./dropdown';
-import { Builder, $ } from 'vs/base/browser/builder';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { Gesture, EventType as GestureEventType } from 'vs/base/browser/touch';
 import { ActionRunner, IAction, IActionRunner } from 'vs/base/common/actions';
 import { BaseActionItem, IActionItemProvider } from 'vs/base/browser/ui/actionbar/actionbar';
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
+import { IDisposable } from 'vs/base/common/lifecycle';
 import { IContextViewProvider, IAnchor } from 'vs/base/browser/ui/contextview/contextview';
 import { IMenuOptions } from 'vs/base/browser/ui/menu/menu';
-import { ResolvedKeybinding } from 'vs/base/common/keyCodes';
-import { EventHelper, EventType, removeClass, addClass } from 'vs/base/browser/dom';
+import { ResolvedKeybinding, KeyCode } from 'vs/base/common/keyCodes';
+import { EventHelper, EventType, removeClass, addClass, append, $, addDisposableListener, addClasses } from 'vs/base/browser/dom';
 import { IContextMenuDelegate } from 'vs/base/browser/contextmenu';
+import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
 
 export interface ILabelRenderer {
 	(container: HTMLElement): IDisposable;
@@ -28,74 +28,82 @@ export interface IBaseDropdownOptions {
 }
 
 export class BaseDropdown extends ActionRunner {
-	private _toDispose: IDisposable[];
-	private $el: Builder;
-	private $boxContainer: Builder;
-	private $label: Builder;
-	private $contents: Builder;
+	private _element: HTMLElement;
+	private boxContainer: HTMLElement;
+	private _label: HTMLElement;
+	private contents: HTMLElement;
 	private visible: boolean;
 
 	constructor(container: HTMLElement, options: IBaseDropdownOptions) {
 		super();
 
-		this._toDispose = [];
+		this._element = append(container, $('.monaco-dropdown'));
 
-		this.$el = $('.monaco-dropdown').appendTo(container);
-
-		this.$label = $('.dropdown-label');
+		this._label = append(this._element, $('.dropdown-label'));
 
 		let labelRenderer = options.labelRenderer;
 		if (!labelRenderer) {
 			labelRenderer = (container: HTMLElement): IDisposable => {
-				$(container).text(options.label || '');
+				container.textContent = options.label || '';
+
 				return null;
 			};
 		}
 
-		this.$label.on([EventType.CLICK, EventType.MOUSE_DOWN, GestureEventType.Tap], (e: Event) => {
-			EventHelper.stop(e, true); // prevent default click behaviour to trigger
-		}).on([EventType.MOUSE_DOWN, GestureEventType.Tap], (e: Event) => {
-			if (e instanceof MouseEvent && e.detail > 1) {
-				return; // prevent multiple clicks to open multiple context menus (https://github.com/Microsoft/vscode/issues/41363)
+		[EventType.CLICK, EventType.MOUSE_DOWN, GestureEventType.Tap].forEach(event => {
+			this._register(addDisposableListener(this._label, event, e => EventHelper.stop(e, true))); // prevent default click behaviour to trigger
+		});
+
+		[EventType.MOUSE_DOWN, GestureEventType.Tap].forEach(event => {
+			this._register(addDisposableListener(this._label, event, e => {
+				if (e instanceof MouseEvent && e.detail > 1) {
+					return; // prevent multiple clicks to open multiple context menus (https://github.com/Microsoft/vscode/issues/41363)
+				}
+
+				if (this.visible) {
+					this.hide();
+				} else {
+					this.show();
+				}
+			}));
+		});
+
+		this._register(addDisposableListener(this._label, EventType.KEY_UP, e => {
+			const event = new StandardKeyboardEvent(e as KeyboardEvent);
+			if (event.equals(KeyCode.Enter) || event.equals(KeyCode.Space)) {
+				if (this.visible) {
+					this.hide();
+				} else {
+					this.show();
+				}
 			}
+		}));
 
-			if (this.visible) {
-				this.hide();
-			} else {
-				this.show();
-			}
-		}).appendTo(this.$el);
-
-		let cleanupFn = labelRenderer(this.$label.getHTMLElement());
-
+		const cleanupFn = labelRenderer(this._label);
 		if (cleanupFn) {
-			this._toDispose.push(cleanupFn);
+			this._register(cleanupFn);
 		}
 
-		Gesture.addTarget(this.$label.getHTMLElement());
+		Gesture.addTarget(this._label);
 	}
 
-	public get toDispose(): IDisposable[] {
-		return this._toDispose;
+	get element(): HTMLElement {
+		return this._element;
 	}
 
-	public get element(): HTMLElement {
-		return this.$el.getHTMLElement();
+	get label(): HTMLElement {
+		return this._label;
 	}
 
-	public get label(): HTMLElement {
-		return this.$label.getHTMLElement();
+	set tooltip(tooltip: string) {
+		this._label.title = tooltip;
 	}
 
-	public set tooltip(tooltip: string) {
-		this.$label.title(tooltip);
-	}
-
-	public show(): void {
+	show(): void {
 		this.visible = true;
 	}
 
-	public hide(): void {
+	hide(): void {
 		this.visible = false;
 	}
 
@@ -103,25 +111,23 @@ export class BaseDropdown extends ActionRunner {
 		this.hide();
 	}
 
-	public dispose(): void {
+	dispose(): void {
 		super.dispose();
 		this.hide();
 
-		this._toDispose = dispose(this.toDispose);
-
-		if (this.$boxContainer) {
-			this.$boxContainer.destroy();
-			this.$boxContainer = null;
+		if (this.boxContainer) {
+			this.boxContainer.remove();
+			this.boxContainer = null;
 		}
 
-		if (this.$contents) {
-			this.$contents.destroy();
-			this.$contents = null;
+		if (this.contents) {
+			this.contents.remove();
+			this.contents = null;
 		}
 
-		if (this.$label) {
-			this.$label.destroy();
-			this.$label = null;
+		if (this._label) {
+			this._label.remove();
+			this._label = null;
 		}
 	}
 }
@@ -139,7 +145,7 @@ export class Dropdown extends BaseDropdown {
 		this.contextViewProvider = options.contextViewProvider;
 	}
 
-	public show(): void {
+	show(): void {
 		super.show();
 
 		addClass(this.element, 'active');
@@ -167,7 +173,7 @@ export class Dropdown extends BaseDropdown {
 		removeClass(this.element, 'active');
 	}
 
-	public hide(): void {
+	hide(): void {
 		super.hide();
 
 		if (this.contextViewProvider) {
@@ -211,11 +217,11 @@ export class DropdownMenu extends BaseDropdown {
 		this.menuClassName = options.menuClassName || '';
 	}
 
-	public set menuOptions(options: IMenuOptions) {
+	set menuOptions(options: IMenuOptions) {
 		this._menuOptions = options;
 	}
 
-	public get menuOptions(): IMenuOptions {
+	get menuOptions(): IMenuOptions {
 		return this._menuOptions;
 	}
 
@@ -231,7 +237,7 @@ export class DropdownMenu extends BaseDropdown {
 		this._actions = actions;
 	}
 
-	public show(): void {
+	show(): void {
 		super.show();
 
 		addClass(this.element, 'active');
@@ -248,7 +254,7 @@ export class DropdownMenu extends BaseDropdown {
 		});
 	}
 
-	public hide(): void {
+	hide(): void {
 		super.hide();
 	}
 
@@ -279,22 +285,20 @@ export class DropdownMenuActionItem extends BaseActionItem {
 		this.clazz = clazz;
 	}
 
-	public render(container: HTMLElement): void {
-		let labelRenderer: ILabelRenderer = (el: HTMLElement): IDisposable => {
-			this.builder = $('a.action-label').attr({
-				tabIndex: '0',
-				role: 'button',
-				'aria-haspopup': 'true',
-				title: this._action.label || '',
-				class: this.clazz
-			});
+	render(container: HTMLElement): void {
+		const labelRenderer: ILabelRenderer = (el: HTMLElement): IDisposable => {
+			this.element = append(el, $('a.action-label'));
+			addClasses(this.element, this.clazz);
 
-			this.builder.appendTo(el);
+			this.element.tabIndex = 0;
+			this.element.setAttribute('role', 'button');
+			this.element.setAttribute('aria-haspopup', 'true');
+			this.element.title = this._action.label || '';
 
 			return null;
 		};
 
-		let options: IDropdownMenuOptions = {
+		const options: IDropdownMenuOptions = {
 			contextMenuProvider: this.contextMenuProvider,
 			labelRenderer: labelRenderer
 		};
@@ -316,7 +320,7 @@ export class DropdownMenuActionItem extends BaseActionItem {
 		};
 	}
 
-	public setActionContext(newContext: any): void {
+	setActionContext(newContext: any): void {
 		super.setActionContext(newContext);
 
 		if (this.dropdownMenu) {
@@ -324,13 +328,13 @@ export class DropdownMenuActionItem extends BaseActionItem {
 		}
 	}
 
-	public show(): void {
+	show(): void {
 		if (this.dropdownMenu) {
 			this.dropdownMenu.show();
 		}
 	}
 
-	public dispose(): void {
+	dispose(): void {
 		this.dropdownMenu.dispose();
 
 		super.dispose();
diff --git a/src/vs/base/browser/ui/findinput/findInput.ts b/src/vs/base/browser/ui/findinput/findInput.ts
index 253f2424ed4..bff91179c7e 100644
--- a/src/vs/base/browser/ui/findinput/findInput.ts
+++ b/src/vs/base/browser/ui/findinput/findInput.ts
@@ -54,10 +54,13 @@ export class FindInput extends Widget {
 
 	private inputValidationInfoBorder: Color;
 	private inputValidationInfoBackground: Color;
+	private inputValidationInfoForeground: Color;
 	private inputValidationWarningBorder: Color;
 	private inputValidationWarningBackground: Color;
+	private inputValidationWarningForeground: Color;
 	private inputValidationErrorBorder: Color;
 	private inputValidationErrorBackground: Color;
+	private inputValidationErrorForeground: Color;
 
 	private regex: RegexCheckbox;
 	private wholeWords: WholeWordsCheckbox;
@@ -101,10 +104,13 @@ export class FindInput extends Widget {
 
 		this.inputValidationInfoBorder = options.inputValidationInfoBorder;
 		this.inputValidationInfoBackground = options.inputValidationInfoBackground;
+		this.inputValidationInfoForeground = options.inputValidationInfoForeground;
 		this.inputValidationWarningBorder = options.inputValidationWarningBorder;
 		this.inputValidationWarningBackground = options.inputValidationWarningBackground;
+		this.inputValidationWarningForeground = options.inputValidationWarningForeground;
 		this.inputValidationErrorBorder = options.inputValidationErrorBorder;
 		this.inputValidationErrorBackground = options.inputValidationErrorBackground;
+		this.inputValidationErrorForeground = options.inputValidationErrorForeground;
 
 		this.regex = null;
 		this.wholeWords = null;
@@ -178,10 +184,13 @@ export class FindInput extends Widget {
 		this.inputBorder = styles.inputBorder;
 
 		this.inputValidationInfoBackground = styles.inputValidationInfoBackground;
+		this.inputValidationInfoForeground = styles.inputValidationInfoForeground;
 		this.inputValidationInfoBorder = styles.inputValidationInfoBorder;
 		this.inputValidationWarningBackground = styles.inputValidationWarningBackground;
+		this.inputValidationWarningForeground = styles.inputValidationWarningForeground;
 		this.inputValidationWarningBorder = styles.inputValidationWarningBorder;
 		this.inputValidationErrorBackground = styles.inputValidationErrorBackground;
+		this.inputValidationErrorForeground = styles.inputValidationErrorForeground;
 		this.inputValidationErrorBorder = styles.inputValidationErrorBorder;
 
 		this.applyStyles();
@@ -201,10 +210,13 @@ export class FindInput extends Widget {
 				inputForeground: this.inputForeground,
 				inputBorder: this.inputBorder,
 				inputValidationInfoBackground: this.inputValidationInfoBackground,
+				inputValidationInfoForeground: this.inputValidationInfoForeground,
 				inputValidationInfoBorder: this.inputValidationInfoBorder,
 				inputValidationWarningBackground: this.inputValidationWarningBackground,
+				inputValidationWarningForeground: this.inputValidationWarningForeground,
 				inputValidationWarningBorder: this.inputValidationWarningBorder,
 				inputValidationErrorBackground: this.inputValidationErrorBackground,
+				inputValidationErrorForeground: this.inputValidationErrorForeground,
 				inputValidationErrorBorder: this.inputValidationErrorBorder
 			};
 			this.inputBox.style(inputBoxStyles);
@@ -282,10 +294,13 @@ export class FindInput extends Widget {
 			inputForeground: this.inputForeground,
 			inputBorder: this.inputBorder,
 			inputValidationInfoBackground: this.inputValidationInfoBackground,
+			inputValidationInfoForeground: this.inputValidationInfoForeground,
 			inputValidationInfoBorder: this.inputValidationInfoBorder,
 			inputValidationWarningBackground: this.inputValidationWarningBackground,
+			inputValidationWarningForeground: this.inputValidationWarningForeground,
 			inputValidationWarningBorder: this.inputValidationWarningBorder,
 			inputValidationErrorBackground: this.inputValidationErrorBackground,
+			inputValidationErrorForeground: this.inputValidationErrorForeground,
 			inputValidationErrorBorder: this.inputValidationErrorBorder,
 			history
 		}));
@@ -293,48 +308,50 @@ export class FindInput extends Widget {
 		this.regex = this._register(new RegexCheckbox({
 			appendTitle: appendRegexLabel,
 			isChecked: false,
-			onChange: (viaKeyboard) => {
-				this._onDidOptionChange.fire(viaKeyboard);
-				if (!viaKeyboard) {
-					this.inputBox.focus();
-				}
-				this.setInputWidth();
-				this.validate();
-			},
-			onKeyDown: (e) => {
-				this._onRegexKeyDown.fire(e);
-			},
 			inputActiveOptionBorder: this.inputActiveOptionBorder
 		}));
+		this._register(this.regex.onChange(viaKeyboard => {
+			this._onDidOptionChange.fire(viaKeyboard);
+			if (!viaKeyboard) {
+				this.inputBox.focus();
+			}
+			this.setInputWidth();
+			this.validate();
+		}));
+		this._register(this.regex.onKeyDown(e => {
+			this._onRegexKeyDown.fire(e);
+		}));
+
 		this.wholeWords = this._register(new WholeWordsCheckbox({
 			appendTitle: appendWholeWordsLabel,
 			isChecked: false,
-			onChange: (viaKeyboard) => {
-				this._onDidOptionChange.fire(viaKeyboard);
-				if (!viaKeyboard) {
-					this.inputBox.focus();
-				}
-				this.setInputWidth();
-				this.validate();
-			},
 			inputActiveOptionBorder: this.inputActiveOptionBorder
 		}));
+		this._register(this.wholeWords.onChange(viaKeyboard => {
+			this._onDidOptionChange.fire(viaKeyboard);
+			if (!viaKeyboard) {
+				this.inputBox.focus();
+			}
+			this.setInputWidth();
+			this.validate();
+		}));
+
 		this.caseSensitive = this._register(new CaseSensitiveCheckbox({
 			appendTitle: appendCaseSensitiveLabel,
 			isChecked: false,
-			onChange: (viaKeyboard) => {
-				this._onDidOptionChange.fire(viaKeyboard);
-				if (!viaKeyboard) {
-					this.inputBox.focus();
-				}
-				this.setInputWidth();
-				this.validate();
-			},
-			onKeyDown: (e) => {
-				this._onCaseSensitiveKeyDown.fire(e);
-			},
 			inputActiveOptionBorder: this.inputActiveOptionBorder
 		}));
+		this._register(this.caseSensitive.onChange(viaKeyboard => {
+			this._onDidOptionChange.fire(viaKeyboard);
+			if (!viaKeyboard) {
+				this.inputBox.focus();
+			}
+			this.setInputWidth();
+			this.validate();
+		}));
+		this._register(this.caseSensitive.onKeyDown(e => {
+			this._onCaseSensitiveKeyDown.fire(e);
+		}));
 
 		// Arrow-Key support to navigate between options
 		let indexes = [this.caseSensitive.domNode, this.wholeWords.domNode, this.regex.domNode];
diff --git a/src/vs/base/browser/ui/findinput/findInputCheckboxes.ts b/src/vs/base/browser/ui/findinput/findInputCheckboxes.ts
index aa26c1a5409..aa286a8e05c 100644
--- a/src/vs/base/browser/ui/findinput/findInputCheckboxes.ts
+++ b/src/vs/base/browser/ui/findinput/findInputCheckboxes.ts
@@ -4,18 +4,14 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import 'vs/css!./findInputCheckboxes';
-
-import * as nls from 'vs/nls';
 import { Checkbox } from 'vs/base/browser/ui/checkbox/checkbox';
-import { IKeyboardEvent } from 'vs/base/browser/keyboardEvent';
 import { Color } from 'vs/base/common/color';
+import 'vs/css!./findInputCheckboxes';
+import * as nls from 'vs/nls';
 
 export interface IFindInputCheckboxOpts {
 	readonly appendTitle: string;
 	readonly isChecked: boolean;
-	readonly onChange: (viaKeyboard: boolean) => void;
-	readonly onKeyDown?: (e: IKeyboardEvent) => void;
 	readonly inputActiveOptionBorder?: Color;
 }
 
@@ -29,8 +25,6 @@ export class CaseSensitiveCheckbox extends Checkbox {
 			actionClassName: 'monaco-case-sensitive',
 			title: NLS_CASE_SENSITIVE_CHECKBOX_LABEL + opts.appendTitle,
 			isChecked: opts.isChecked,
-			onChange: opts.onChange,
-			onKeyDown: opts.onKeyDown,
 			inputActiveOptionBorder: opts.inputActiveOptionBorder
 		});
 	}
@@ -42,8 +36,6 @@ export class WholeWordsCheckbox extends Checkbox {
 			actionClassName: 'monaco-whole-word',
 			title: NLS_WHOLE_WORD_CHECKBOX_LABEL + opts.appendTitle,
 			isChecked: opts.isChecked,
-			onChange: opts.onChange,
-			onKeyDown: opts.onKeyDown,
 			inputActiveOptionBorder: opts.inputActiveOptionBorder
 		});
 	}
@@ -55,8 +47,6 @@ export class RegexCheckbox extends Checkbox {
 			actionClassName: 'monaco-regex',
 			title: NLS_REGEX_CHECKBOX_LABEL + opts.appendTitle,
 			isChecked: opts.isChecked,
-			onChange: opts.onChange,
-			onKeyDown: opts.onKeyDown,
 			inputActiveOptionBorder: opts.inputActiveOptionBorder
 		});
 	}
diff --git a/src/vs/base/browser/ui/grid/grid.ts b/src/vs/base/browser/ui/grid/grid.ts
index e2b977a6cc8..32773241296 100644
--- a/src/vs/base/browser/ui/grid/grid.ts
+++ b/src/vs/base/browser/ui/grid/grid.ts
@@ -10,10 +10,11 @@ import { Orientation } from 'vs/base/browser/ui/sash/sash';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { tail2 as tail } from 'vs/base/common/arrays';
 import { orthogonal, IView, GridView, Sizing as GridViewSizing, Box, IGridViewStyles } from './gridview';
+import { Event } from 'vs/base/common/event';
 
 export { Orientation } from './gridview';
 
-export enum Direction {
+export const enum Direction {
 	Up,
 	Down,
 	Left,
@@ -167,7 +168,7 @@ function getGridLocation(element: HTMLElement): number[] {
 	return [...getGridLocation(ancestor), index];
 }
 
-export enum Sizing {
+export const enum Sizing {
 	Distribute = 'distribute',
 	Split = 'split'
 }
@@ -192,14 +193,16 @@ export class Grid<T extends IView> implements IDisposable {
 
 	get minimumWidth(): number { return this.gridview.minimumWidth; }
 	get minimumHeight(): number { return this.gridview.minimumHeight; }
-
 	get maximumWidth(): number { return this.gridview.maximumWidth; }
 	get maximumHeight(): number { return this.gridview.maximumHeight; }
+	get onDidChange(): Event<{ width: number; height: number; }> { return this.gridview.onDidChange; }
 
-	public sashResetSizing: Sizing = Sizing.Distribute;
+	get element(): HTMLElement { return this.gridview.element; }
 
-	constructor(container: HTMLElement, view: T, options: IGridOptions = {}) {
-		this.gridview = new GridView(container, options);
+	sashResetSizing: Sizing = Sizing.Distribute;
+
+	constructor(view: T, options: IGridOptions = {}) {
+		this.gridview = new GridView(options);
 		this.disposables.push(this.gridview);
 
 		this.gridview.onDidSashReset(this.doResetViewSize, this, this.disposables);
@@ -276,26 +279,28 @@ export class Grid<T extends IView> implements IDisposable {
 	getViewSize(view: T): number {
 		const location = this.getViewLocation(view);
 		const viewSize = this.gridview.getViewSize(location);
-
 		return getLocationOrientation(this.orientation, location) === Orientation.HORIZONTAL ? viewSize.width : viewSize.height;
 	}
 
+	// TODO@joao cleanup
+	getViewSize2(view: T): { width: number; height: number; } {
+		const location = this.getViewLocation(view);
+		return this.gridview.getViewSize(location);
+	}
+
+	maximizeViewSize(view: T): void {
+		const location = this.getViewLocation(view);
+		this.gridview.maximizeViewSize(location);
+	}
+
+	distributeViewSizes(): void {
+		this.gridview.distributeViewSizes();
+	}
+
 	getViews(): GridBranchNode<T> {
 		return this.gridview.getViews() as GridBranchNode<T>;
 	}
 
-	getOrientation(view: T): Orientation {
-		const location = this.getViewLocation(view);
-
-		return getLocationOrientation(this.orientation, location);
-	}
-
-	resetViewSize(view: T): void {
-		const location = this.getViewLocation(view);
-
-		this.doResetViewSize(location);
-	}
-
 	getNeighborViews(view: T, direction: Direction, wrap: boolean = false): T[] {
 		const location = this.getViewLocation(view);
 		const root = this.getViews();
@@ -362,12 +367,20 @@ interface InitialLayoutContext<T extends ISerializableView> {
 	root: GridBranchNode<T>;
 }
 
-export interface ISerializedNode {
-	type: 'branch' | 'leaf';
-	data: ISerializedNode[] | object;
+export interface ISerializedLeafNode {
+	type: 'leaf';
+	data: object;
 	size: number;
 }
 
+export interface ISerializedBranchNode {
+	type: 'branch';
+	data: ISerializedNode[];
+	size: number;
+}
+
+export type ISerializedNode = ISerializedLeafNode | ISerializedBranchNode;
+
 export interface ISerializedGrid {
 	root: ISerializedNode;
 	orientation: Orientation;
@@ -434,7 +447,7 @@ export class SerializableGrid<T extends ISerializableView> extends Grid<T> {
 		return SerializableGrid.getFirstLeaf(node.children[0]);
 	}
 
-	static deserialize<T extends ISerializableView>(container: HTMLElement, json: ISerializedGrid, deserializer: IViewDeserializer<T>, options: IGridOptions = {}): SerializableGrid<T> {
+	static deserialize<T extends ISerializableView>(json: ISerializedGrid, deserializer: IViewDeserializer<T>, options: IGridOptions = {}): SerializableGrid<T> {
 		if (typeof json.orientation !== 'number') {
 			throw new Error('Invalid JSON: \'orientation\' property must be a number.');
 		} else if (typeof json.width !== 'number') {
@@ -455,7 +468,7 @@ export class SerializableGrid<T extends ISerializableView> extends Grid<T> {
 			throw new Error('Invalid serialized state, first leaf not found');
 		}
 
-		const result = new SerializableGrid<T>(container, firstLeaf.view, options);
+		const result = new SerializableGrid<T>(firstLeaf.view, options);
 		result.orientation = orientation;
 		result.restoreViews(firstLeaf.view, orientation, root);
 		result.initialLayoutContext = { width, height, root };
@@ -487,6 +500,8 @@ export class SerializableGrid<T extends ISerializableView> extends Grid<T> {
 
 			this.restoreViewsSize([], this.initialLayoutContext.root, this.orientation, widthScale, heightScale);
 			this.initialLayoutContext = undefined;
+
+			this.gridview.trySet2x2();
 		}
 	}
 
@@ -535,4 +550,81 @@ export class SerializableGrid<T extends ISerializableView> extends Grid<T> {
 			this.restoreViewsSize(childLocation, child, orthogonal(orientation), widthScale, heightScale);
 		}
 	}
-}
\ No newline at end of file
+}
+
+export type GridNodeDescriptor = { size?: number, groups?: GridNodeDescriptor[] };
+export type GridDescriptor = { orientation: Orientation, groups?: GridNodeDescriptor[] };
+
+export function sanitizeGridNodeDescriptor(nodeDescriptor: GridNodeDescriptor): void {
+	if (nodeDescriptor.groups && nodeDescriptor.groups.length === 0) {
+		nodeDescriptor.groups = undefined;
+	}
+
+	if (!nodeDescriptor.groups) {
+		return;
+	}
+
+	let totalDefinedSize = 0;
+	let totalDefinedSizeCount = 0;
+
+	for (const child of nodeDescriptor.groups) {
+		sanitizeGridNodeDescriptor(child);
+
+		if (child.size) {
+			totalDefinedSize += child.size;
+			totalDefinedSizeCount++;
+		}
+	}
+
+	const totalUndefinedSize = totalDefinedSizeCount > 0 ? totalDefinedSize : 1;
+	const totalUndefinedSizeCount = nodeDescriptor.groups.length - totalDefinedSizeCount;
+	const eachUndefinedSize = totalUndefinedSize / totalUndefinedSizeCount;
+
+	for (const child of nodeDescriptor.groups) {
+		if (!child.size) {
+			child.size = eachUndefinedSize;
+		}
+	}
+}
+
+function createSerializedNode(nodeDescriptor: GridNodeDescriptor): ISerializedNode {
+	if (nodeDescriptor.groups) {
+		return { type: 'branch', data: nodeDescriptor.groups.map(c => createSerializedNode(c)), size: nodeDescriptor.size! };
+	} else {
+		return { type: 'leaf', data: null, size: nodeDescriptor.size! };
+	}
+}
+
+function getDimensions(node: ISerializedNode, orientation: Orientation): { width?: number, height?: number } {
+	if (node.type === 'branch') {
+		const childrenDimensions = node.data.map(c => getDimensions(c, orthogonal(orientation)));
+
+		if (orientation === Orientation.VERTICAL) {
+			const width = node.size || (childrenDimensions.length === 0 ? undefined : Math.max(...childrenDimensions.map(d => d.width || 0)));
+			const height = childrenDimensions.length === 0 ? undefined : childrenDimensions.reduce((r, d) => r + d.height, 0);
+			return { width, height };
+		} else {
+			const width = childrenDimensions.length === 0 ? undefined : childrenDimensions.reduce((r, d) => r + d.width, 0);
+			const height = node.size || (childrenDimensions.length === 0 ? undefined : Math.max(...childrenDimensions.map(d => d.height || 0)));
+			return { width, height };
+		}
+	} else {
+		const width = orientation === Orientation.VERTICAL ? node.size : undefined;
+		const height = orientation === Orientation.VERTICAL ? undefined : node.size;
+		return { width, height };
+	}
+}
+
+export function createSerializedGrid(gridDescriptor: GridDescriptor): ISerializedGrid {
+	sanitizeGridNodeDescriptor(gridDescriptor);
+
+	const root = createSerializedNode(gridDescriptor);
+	const { width, height } = getDimensions(root, gridDescriptor.orientation);
+
+	return {
+		root,
+		orientation: gridDescriptor.orientation,
+		width: width || 1,
+		height: height || 1
+	};
+}
diff --git a/src/vs/base/browser/ui/grid/gridview.ts b/src/vs/base/browser/ui/grid/gridview.ts
index 083156d7eb8..ee0a31a051a 100644
--- a/src/vs/base/browser/ui/grid/gridview.ts
+++ b/src/vs/base/browser/ui/grid/gridview.ts
@@ -9,8 +9,8 @@ import 'vs/css!./gridview';
 import { Event, anyEvent, Emitter, mapEvent, Relay } from 'vs/base/common/event';
 import { Orientation, Sash } from 'vs/base/browser/ui/sash/sash';
 import { SplitView, IView as ISplitView, Sizing, ISplitViewStyles } from 'vs/base/browser/ui/splitview/splitview';
-import { empty as EmptyDisposable, IDisposable } from 'vs/base/common/lifecycle';
-import { $, append } from 'vs/base/browser/dom';
+import { Disposable, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
+import { $ } from 'vs/base/browser/dom';
 import { tail2 as tail } from 'vs/base/common/arrays';
 import { Color } from 'vs/base/common/color';
 
@@ -27,14 +27,6 @@ export interface IView {
 	layout(width: number, height: number): void;
 }
 
-/*
-TODO:
-	- NEW: 	add a color to show a border where the sash is, similar to how other
-			widgets have a color (e.g. Button, with applyStyles). Challenge is that this
-			color has to be applied via JS and not CSS to not apply it to all views
-			NOT CSS
-*/
-
 export function orthogonal(orientation: Orientation): Orientation {
 	return orientation === Orientation.VERTICAL ? Orientation.HORIZONTAL : Orientation.VERTICAL;
 }
@@ -75,7 +67,7 @@ export interface IGridViewOptions {
 class BranchNode implements ISplitView, IDisposable {
 
 	readonly element: HTMLElement;
-	readonly children: Node[];
+	readonly children: Node[] = [];
 	private splitview: SplitView;
 
 	private _size: number;
@@ -104,11 +96,11 @@ class BranchNode implements ISplitView, IDisposable {
 	}
 
 	get minimumOrthogonalSize(): number {
-		return this.children.length === 0 ? 0 : this.children.reduce((r, c) => r + c.minimumSize, 0);
+		return this.splitview.minimumSize;
 	}
 
 	get maximumOrthogonalSize(): number {
-		return this.children.length === 0 ? Number.POSITIVE_INFINITY : this.children.reduce((r, c) => r + c.maximumSize, 0);
+		return this.splitview.maximumSize;
 	}
 
 	get minimumWidth(): number {
@@ -127,14 +119,15 @@ class BranchNode implements ISplitView, IDisposable {
 		return this.orientation === Orientation.HORIZONTAL ? this.maximumSize : this.maximumOrthogonalSize;
 	}
 
-	private _onDidChange: Emitter<number | undefined>;
-	get onDidChange(): Event<number | undefined> { return this._onDidChange.event; }
-	private childrenChangeDisposable: IDisposable = EmptyDisposable;
+	private _onDidChange = new Emitter<number | undefined>();
+	readonly onDidChange: Event<number | undefined> = this._onDidChange.event;
+
+	private childrenChangeDisposable: IDisposable = Disposable.None;
 
 	private _onDidSashReset = new Emitter<number[]>();
 	readonly onDidSashReset: Event<number[]> = this._onDidSashReset.event;
-	private splitviewSashResetDisposable: IDisposable = EmptyDisposable;
-	private childrenSashResetDisposable: IDisposable = EmptyDisposable;
+	private splitviewSashResetDisposable: IDisposable = Disposable.None;
+	private childrenSashResetDisposable: IDisposable = Disposable.None;
 
 	get orthogonalStartSash(): Sash | undefined { return this.splitview.orthogonalStartSash; }
 	set orthogonalStartSash(sash: Sash | undefined) { this.splitview.orthogonalStartSash = sash; }
@@ -151,9 +144,6 @@ class BranchNode implements ISplitView, IDisposable {
 		this._size = size;
 		this._orthogonalSize = orthogonalSize;
 
-		this._onDidChange = new Emitter<number | undefined>();
-		this.children = [];
-
 		this.element = $('.monaco-grid-branch-node');
 		this.splitview = new SplitView(this.element, { orientation, styles });
 		this.splitview.layout(size);
@@ -191,10 +181,21 @@ class BranchNode implements ISplitView, IDisposable {
 			throw new Error('Invalid index');
 		}
 
+		const first = index === 0;
+		const last = index === this.splitview.length;
 		this.splitview.addView(node, size, index);
 		this.children.splice(index, 0, node);
 		node.orthogonalStartSash = this.splitview.sashes[index - 1];
 		node.orthogonalEndSash = this.splitview.sashes[index];
+
+		if (!first) {
+			this.children[index - 1].orthogonalEndSash = this.splitview.sashes[index - 1];
+		}
+
+		if (!last) {
+			this.children[index + 1].orthogonalStartSash = this.splitview.sashes[index];
+		}
+
 		this.onDidChildrenChange();
 	}
 
@@ -203,8 +204,19 @@ class BranchNode implements ISplitView, IDisposable {
 			throw new Error('Invalid index');
 		}
 
+		const first = index === 0;
+		const last = index === this.splitview.length - 1;
 		this.splitview.removeView(index, sizing);
 		this.children.splice(index, 1);
+
+		if (!first) {
+			this.children[index - 1].orthogonalEndSash = this.splitview.sashes[index - 1];
+		}
+
+		if (!last) { // [0,1,2,3] (2) => [0,1,3]
+			this.children[index].orthogonalStartSash = this.splitview.sashes[Math.max(index - 1, 0)];
+		}
+
 		this.onDidChildrenChange();
 	}
 
@@ -234,8 +246,16 @@ class BranchNode implements ISplitView, IDisposable {
 		this.splitview.resizeView(index, size);
 	}
 
-	distributeViewSizes(): void {
+	distributeViewSizes(recursive = false): void {
 		this.splitview.distributeViewSizes();
+
+		if (recursive) {
+			for (const child of this.children) {
+				if (child instanceof BranchNode) {
+					child.distributeViewSizes(true);
+				}
+			}
+		}
 	}
 
 	getChildSize(index: number): number {
@@ -258,11 +278,63 @@ class BranchNode implements ISplitView, IDisposable {
 		this._onDidChange.fire();
 	}
 
+	trySet2x2(other: BranchNode): IDisposable {
+		if (this.children.length !== 2 || other.children.length !== 2) {
+			return Disposable.None;
+		}
+
+		if (this.getChildSize(0) !== other.getChildSize(0)) {
+			return Disposable.None;
+		}
+
+		const [firstChild, secondChild] = this.children;
+		const [otherFirstChild, otherSecondChild] = other.children;
+
+		if (!(firstChild instanceof LeafNode) || !(secondChild instanceof LeafNode)) {
+			return Disposable.None;
+		}
+
+		if (!(otherFirstChild instanceof LeafNode) || !(otherSecondChild instanceof LeafNode)) {
+			return Disposable.None;
+		}
+
+		if (this.orientation === Orientation.VERTICAL) {
+			secondChild.linkedWidthNode = otherFirstChild.linkedHeightNode = firstChild;
+			firstChild.linkedWidthNode = otherSecondChild.linkedHeightNode = secondChild;
+			otherSecondChild.linkedWidthNode = firstChild.linkedHeightNode = otherFirstChild;
+			otherFirstChild.linkedWidthNode = secondChild.linkedHeightNode = otherSecondChild;
+		} else {
+			otherFirstChild.linkedWidthNode = secondChild.linkedHeightNode = firstChild;
+			otherSecondChild.linkedWidthNode = firstChild.linkedHeightNode = secondChild;
+			firstChild.linkedWidthNode = otherSecondChild.linkedHeightNode = otherFirstChild;
+			secondChild.linkedWidthNode = otherFirstChild.linkedHeightNode = otherSecondChild;
+		}
+
+		const mySash = this.splitview.sashes[0];
+		const otherSash = other.splitview.sashes[0];
+		mySash.linkedSash = otherSash;
+		otherSash.linkedSash = mySash;
+
+		this._onDidChange.fire();
+		other._onDidChange.fire();
+
+		return toDisposable(() => {
+			mySash.linkedSash = otherSash.linkedSash = undefined;
+			firstChild.linkedHeightNode = firstChild.linkedWidthNode = undefined;
+			secondChild.linkedHeightNode = secondChild.linkedWidthNode = undefined;
+			otherFirstChild.linkedHeightNode = otherFirstChild.linkedWidthNode = undefined;
+			otherSecondChild.linkedHeightNode = otherSecondChild.linkedWidthNode = undefined;
+		});
+	}
+
 	dispose(): void {
 		for (const child of this.children) {
 			child.dispose();
 		}
 
+		this._onDidChange.dispose();
+		this._onDidSashReset.dispose();
+
 		this.splitviewSashResetDisposable.dispose();
 		this.childrenSashResetDisposable.dispose();
 		this.childrenChangeDisposable.dispose();
@@ -280,12 +352,37 @@ class LeafNode implements ISplitView, IDisposable {
 
 	readonly onDidSashReset: Event<number[]> = Event.None;
 
+	private _onDidLinkedWidthNodeChange = new Relay<number | undefined>();
+	private _linkedWidthNode: LeafNode | undefined = undefined;
+	get linkedWidthNode(): LeafNode | undefined { return this._linkedWidthNode; }
+	set linkedWidthNode(node: LeafNode | undefined) {
+		this._onDidLinkedWidthNodeChange.input = node ? node._onDidViewChange : Event.None;
+		this._linkedWidthNode = node;
+		this._onDidSetLinkedNode.fire();
+	}
+
+	private _onDidLinkedHeightNodeChange = new Relay<number | undefined>();
+	private _linkedHeightNode: LeafNode | undefined = undefined;
+	get linkedHeightNode(): LeafNode | undefined { return this._linkedHeightNode; }
+	set linkedHeightNode(node: LeafNode | undefined) {
+		this._onDidLinkedHeightNodeChange.input = node ? node._onDidViewChange : Event.None;
+		this._linkedHeightNode = node;
+		this._onDidSetLinkedNode.fire();
+	}
+
+	private _onDidSetLinkedNode = new Emitter<number | undefined>();
+	private _onDidViewChange: Event<number | undefined>;
+	readonly onDidChange: Event<number | undefined>;
+
 	constructor(
 		readonly view: IView,
 		readonly orientation: Orientation,
 		orthogonalSize: number = 0
 	) {
 		this._orthogonalSize = orthogonalSize;
+
+		this._onDidViewChange = mapEvent(this.view.onDidChange, this.orientation === Orientation.HORIZONTAL ? e => e && e.width : e => e && e.height);
+		this.onDidChange = anyEvent(this._onDidViewChange, this._onDidSetLinkedNode.event, this._onDidLinkedWidthNodeChange.event, this._onDidLinkedHeightNodeChange.event);
 	}
 
 	get width(): number {
@@ -300,24 +397,36 @@ class LeafNode implements ISplitView, IDisposable {
 		return this.view.element;
 	}
 
+	private get minimumWidth(): number {
+		return this.linkedWidthNode ? Math.max(this.linkedWidthNode.view.minimumWidth, this.view.minimumWidth) : this.view.minimumWidth;
+	}
+
+	private get maximumWidth(): number {
+		return this.linkedWidthNode ? Math.min(this.linkedWidthNode.view.maximumWidth, this.view.maximumWidth) : this.view.maximumWidth;
+	}
+
+	private get minimumHeight(): number {
+		return this.linkedHeightNode ? Math.max(this.linkedHeightNode.view.minimumHeight, this.view.minimumHeight) : this.view.minimumHeight;
+	}
+
+	private get maximumHeight(): number {
+		return this.linkedHeightNode ? Math.min(this.linkedHeightNode.view.maximumHeight, this.view.maximumHeight) : this.view.maximumHeight;
+	}
+
 	get minimumSize(): number {
-		return this.orientation === Orientation.HORIZONTAL ? this.view.minimumHeight : this.view.minimumWidth;
+		return this.orientation === Orientation.HORIZONTAL ? this.minimumHeight : this.minimumWidth;
 	}
 
 	get maximumSize(): number {
-		return this.orientation === Orientation.HORIZONTAL ? this.view.maximumHeight : this.view.maximumWidth;
+		return this.orientation === Orientation.HORIZONTAL ? this.maximumHeight : this.maximumWidth;
 	}
 
 	get minimumOrthogonalSize(): number {
-		return this.orientation === Orientation.HORIZONTAL ? this.view.minimumWidth : this.view.minimumHeight;
+		return this.orientation === Orientation.HORIZONTAL ? this.minimumWidth : this.minimumHeight;
 	}
 
 	get maximumOrthogonalSize(): number {
-		return this.orientation === Orientation.HORIZONTAL ? this.view.maximumWidth : this.view.maximumHeight;
-	}
-
-	get onDidChange(): Event<number> {
-		return mapEvent(this.view.onDidChange, this.orientation === Orientation.HORIZONTAL ? ({ width }) => width : ({ height }) => height);
+		return this.orientation === Orientation.HORIZONTAL ? this.maximumWidth : this.maximumHeight;
 	}
 
 	set orthogonalStartSash(sash: Sash) {
@@ -372,13 +481,15 @@ function flipNode<T extends Node>(node: T, size: number, orthogonalSize: number)
 
 export class GridView implements IDisposable {
 
-	private element: HTMLElement;
+	readonly element: HTMLElement;
 	private styles: IGridViewStyles;
 
 	private _root: BranchNode;
 	private onDidSashResetRelay = new Relay<number[]>();
 	readonly onDidSashReset: Event<number[]> = this.onDidSashResetRelay.event;
 
+	private disposable2x2: IDisposable = Disposable.None;
+
 	private get root(): BranchNode {
 		return this._root;
 	}
@@ -394,6 +505,7 @@ export class GridView implements IDisposable {
 		this._root = root;
 		this.element.appendChild(root.element);
 		this.onDidSashResetRelay.input = root.onDidSashReset;
+		this._onDidChange.input = mapEvent(root.onDidChange, () => undefined); // TODO
 	}
 
 	get orientation(): Orientation {
@@ -411,34 +523,21 @@ export class GridView implements IDisposable {
 		this.root.orthogonalLayout(orthogonalSize);
 	}
 
-	get width(): number {
-		return this.root.width;
-	}
+	get width(): number { return this.root.width; }
+	get height(): number { return this.root.height; }
 
-	get height(): number {
-		return this.root.height;
-	}
+	get minimumWidth(): number { return this.root.minimumWidth; }
+	get minimumHeight(): number { return this.root.minimumHeight; }
+	get maximumWidth(): number { return this.root.maximumHeight; }
+	get maximumHeight(): number { return this.root.maximumHeight; }
 
-	get minimumWidth(): number {
-		return this.root.minimumWidth;
-	}
+	private _onDidChange = new Relay<{ width: number; height: number; }>();
+	readonly onDidChange = this._onDidChange.event;
 
-	get minimumHeight(): number {
-		return this.root.minimumHeight;
-	}
-
-	get maximumWidth(): number {
-		return this.root.maximumHeight;
-	}
-
-	get maximumHeight(): number {
-		return this.root.maximumHeight;
-	}
-
-	constructor(container: HTMLElement, options: IGridViewOptions = {}) {
-		this.element = append(container, $('.monaco-grid-view'));
-		this.root = new BranchNode(Orientation.VERTICAL, this.styles);
+	constructor(options: IGridViewOptions = {}) {
+		this.element = $('.monaco-grid-view');
 		this.styles = options.styles || defaultStyles;
+		this.root = new BranchNode(Orientation.VERTICAL, this.styles);
 	}
 
 	style(styles: IGridViewStyles): void {
@@ -453,6 +552,9 @@ export class GridView implements IDisposable {
 	}
 
 	addView(view: IView, size: number | Sizing, location: number[]): void {
+		this.disposable2x2.dispose();
+		this.disposable2x2 = Disposable.None;
+
 		const [rest, index] = tail(location);
 		const [pathToParent, parent] = this.getNode(rest);
 
@@ -482,6 +584,9 @@ export class GridView implements IDisposable {
 	}
 
 	removeView(location: number[], sizing?: Sizing): IView {
+		this.disposable2x2.dispose();
+		this.disposable2x2 = Disposable.None;
+
 		const [rest, index] = tail(location);
 		const [pathToParent, parent] = this.getNode(rest);
 
@@ -600,7 +705,29 @@ export class GridView implements IDisposable {
 		parent.resizeChild(index, size);
 	}
 
-	distributeViewSizes(location: number[]): void {
+	getViewSize(location: number[]): { width: number; height: number; } {
+		const [, node] = this.getNode(location);
+		return { width: node.width, height: node.height };
+	}
+
+	maximizeViewSize(location: number[]): void {
+		const [ancestors, node] = this.getNode(location);
+
+		if (!(node instanceof LeafNode)) {
+			throw new Error('Invalid location');
+		}
+
+		for (let i = 0; i < ancestors.length; i++) {
+			ancestors[i].resizeChild(location[i], Number.POSITIVE_INFINITY);
+		}
+	}
+
+	distributeViewSizes(location?: number[]): void {
+		if (!location) {
+			this.root.distributeViewSizes(true);
+			return;
+		}
+
 		const [, node] = this.getNode(location);
 
 		if (!(node instanceof BranchNode)) {
@@ -610,11 +737,6 @@ export class GridView implements IDisposable {
 		node.distributeViewSizes();
 	}
 
-	getViewSize(location: number[]): { width: number; height: number; } {
-		const [, node] = this.getNode(location);
-		return { width: node.width, height: node.height };
-	}
-
 	getViews(): GridBranchNode {
 		return this._getViews(this.root, this.orientation, { top: 0, left: 0, width: this.width, height: this.height }) as GridBranchNode;
 	}
@@ -662,8 +784,29 @@ export class GridView implements IDisposable {
 		return this.getNode(rest, child, path);
 	}
 
+	trySet2x2(): void {
+		this.disposable2x2.dispose();
+		this.disposable2x2 = Disposable.None;
+
+		if (this.root.children.length !== 2) {
+			return;
+		}
+
+		const [first, second] = this.root.children;
+
+		if (!(first instanceof BranchNode) || !(second instanceof BranchNode)) {
+			return;
+		}
+
+		this.disposable2x2 = first.trySet2x2(second);
+	}
+
 	dispose(): void {
 		this.onDidSashResetRelay.dispose();
 		this.root.dispose();
+
+		if (this.element && this.element.parentElement) {
+			this.element.parentElement.removeChild(this.element);
+		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/vs/base/browser/ui/iconLabel/iconLabel.ts b/src/vs/base/browser/ui/iconLabel/iconLabel.ts
index 5fa3acf907c..74be56db003 100644
--- a/src/vs/base/browser/ui/iconLabel/iconLabel.ts
+++ b/src/vs/base/browser/ui/iconLabel/iconLabel.ts
@@ -9,10 +9,7 @@ import 'vs/css!./iconlabel';
 import * as dom from 'vs/base/browser/dom';
 import { HighlightedLabel } from 'vs/base/browser/ui/highlightedlabel/highlightedLabel';
 import { IMatch } from 'vs/base/common/filters';
-import uri from 'vs/base/common/uri';
-import * as paths from 'vs/base/common/paths';
-import { IWorkspaceFolderProvider, getPathLabel, IUserHomeProvider, getBaseLabel } from 'vs/base/common/labels';
-import { IDisposable, combinedDisposable } from 'vs/base/common/lifecycle';
+import { IDisposable, combinedDisposable, Disposable } from 'vs/base/common/lifecycle';
 
 export interface IIconLabelCreationOptions {
 	supportHighlights?: boolean;
@@ -22,6 +19,7 @@ export interface IIconLabelCreationOptions {
 export interface IIconLabelValueOptions {
 	title?: string;
 	descriptionTitle?: string;
+	hideIcon?: boolean;
 	extraClasses?: string[];
 	italic?: boolean;
 	matches?: IMatch[];
@@ -38,11 +36,11 @@ class FastLabelNode {
 	constructor(private _element: HTMLElement) {
 	}
 
-	public get element(): HTMLElement {
+	get element(): HTMLElement {
 		return this._element;
 	}
 
-	public set textContent(content: string) {
+	set textContent(content: string) {
 		if (this.disposed || content === this._textContent) {
 			return;
 		}
@@ -51,7 +49,7 @@ class FastLabelNode {
 		this._element.textContent = content;
 	}
 
-	public set className(className: string) {
+	set className(className: string) {
 		if (this.disposed || className === this._className) {
 			return;
 		}
@@ -60,7 +58,7 @@ class FastLabelNode {
 		this._element.className = className;
 	}
 
-	public set title(title: string) {
+	set title(title: string) {
 		if (this.disposed || title === this._title) {
 			return;
 		}
@@ -73,7 +71,7 @@ class FastLabelNode {
 		}
 	}
 
-	public set empty(empty: boolean) {
+	set empty(empty: boolean) {
 		if (this.disposed || empty === this._empty) {
 			return;
 		}
@@ -82,12 +80,12 @@ class FastLabelNode {
 		this._element.style.marginLeft = empty ? '0' : null;
 	}
 
-	public dispose(): void {
+	dispose(): void {
 		this.disposed = true;
 	}
 }
 
-export class IconLabel {
+export class IconLabel extends Disposable {
 	private domNode: FastLabelNode;
 	private labelDescriptionContainer: FastLabelNode;
 	private labelNode: FastLabelNode | HighlightedLabel;
@@ -95,34 +93,36 @@ export class IconLabel {
 	private descriptionNodeFactory: () => FastLabelNode | HighlightedLabel;
 
 	constructor(container: HTMLElement, options?: IIconLabelCreationOptions) {
-		this.domNode = new FastLabelNode(dom.append(container, dom.$('.monaco-icon-label')));
+		super();
 
-		this.labelDescriptionContainer = new FastLabelNode(dom.append(this.domNode.element, dom.$('.monaco-icon-label-description-container')));
+		this.domNode = this._register(new FastLabelNode(dom.append(container, dom.$('.monaco-icon-label'))));
+
+		this.labelDescriptionContainer = this._register(new FastLabelNode(dom.append(this.domNode.element, dom.$('.monaco-icon-label-description-container'))));
 
 		if (options && options.supportHighlights) {
-			this.labelNode = new HighlightedLabel(dom.append(this.labelDescriptionContainer.element, dom.$('a.label-name')));
+			this.labelNode = this._register(new HighlightedLabel(dom.append(this.labelDescriptionContainer.element, dom.$('a.label-name'))));
 		} else {
-			this.labelNode = new FastLabelNode(dom.append(this.labelDescriptionContainer.element, dom.$('a.label-name')));
+			this.labelNode = this._register(new FastLabelNode(dom.append(this.labelDescriptionContainer.element, dom.$('a.label-name'))));
 		}
 
 		if (options && options.supportDescriptionHighlights) {
-			this.descriptionNodeFactory = () => new HighlightedLabel(dom.append(this.labelDescriptionContainer.element, dom.$('span.label-description')));
+			this.descriptionNodeFactory = () => this._register(new HighlightedLabel(dom.append(this.labelDescriptionContainer.element, dom.$('span.label-description'))));
 		} else {
-			this.descriptionNodeFactory = () => new FastLabelNode(dom.append(this.labelDescriptionContainer.element, dom.$('span.label-description')));
+			this.descriptionNodeFactory = () => this._register(new FastLabelNode(dom.append(this.labelDescriptionContainer.element, dom.$('span.label-description'))));
 		}
 	}
 
-	public get element(): HTMLElement {
+	get element(): HTMLElement {
 		return this.domNode.element;
 	}
 
-	public onClick(callback: (event: MouseEvent) => void): IDisposable {
+	onClick(callback: (event: MouseEvent) => void): IDisposable {
 		return combinedDisposable([
 			dom.addDisposableListener(this.labelDescriptionContainer.element, dom.EventType.CLICK, (e: MouseEvent) => callback(e)),
 		]);
 	}
 
-	public setValue(label?: string, description?: string, options?: IIconLabelValueOptions): void {
+	setValue(label?: string, description?: string, options?: IIconLabelValueOptions): void {
 		const classes = ['monaco-icon-label'];
 		if (options) {
 			if (options.extraClasses) {
@@ -162,28 +162,5 @@ export class IconLabel {
 			}
 		}
 	}
-
-	public dispose(): void {
-		this.domNode.dispose();
-		this.labelNode.dispose();
-
-		if (this.descriptionNode) {
-			this.descriptionNode.dispose();
-		}
-	}
 }
 
-export class FileLabel extends IconLabel {
-
-	constructor(container: HTMLElement, file: uri, provider: IWorkspaceFolderProvider, userHome?: IUserHomeProvider) {
-		super(container);
-
-		this.setFile(file, provider, userHome);
-	}
-
-	public setFile(file: uri, provider: IWorkspaceFolderProvider, userHome: IUserHomeProvider): void {
-		const parent = paths.dirname(file.fsPath);
-
-		this.setValue(getBaseLabel(file), parent && parent !== '.' ? getPathLabel(parent, provider, userHome) : '', { title: file.fsPath });
-	}
-}
diff --git a/src/vs/base/browser/ui/iconLabel/iconlabel.css b/src/vs/base/browser/ui/iconLabel/iconlabel.css
index 66125a6d41a..651843fcc93 100644
--- a/src/vs/base/browser/ui/iconLabel/iconlabel.css
+++ b/src/vs/base/browser/ui/iconLabel/iconlabel.css
@@ -40,7 +40,7 @@
 }
 
 .monaco-icon-label > .monaco-icon-label-description-container > .label-description {
-	opacity: 0.7;
+	opacity: .7;
 	margin-left: 0.5em;
 	font-size: 0.9em;
 	white-space: pre; /* enable to show labels that include multiple whitespaces */
@@ -68,3 +68,10 @@
 {
 	color: inherit !important;
 }
+
+.monaco-tree-row.focused.selected .label-description,
+.monaco-tree-row.selected .label-description,
+.monaco-list-row.focused.selected .label-description,
+.monaco-list-row.selected .label-description {
+	opacity: .8;
+}
\ No newline at end of file
diff --git a/src/vs/base/browser/ui/inputbox/inputBox.ts b/src/vs/base/browser/ui/inputbox/inputBox.ts
index c80a9de7f6c..22f3f3ab7e1 100644
--- a/src/vs/base/browser/ui/inputbox/inputBox.ts
+++ b/src/vs/base/browser/ui/inputbox/inputBox.ts
@@ -19,6 +19,7 @@ import { Widget } from 'vs/base/browser/ui/widget';
 import { Color } from 'vs/base/common/color';
 import { mixin } from 'vs/base/common/objects';
 import { HistoryNavigator } from 'vs/base/common/history';
+import { IHistoryNavigationWidget } from 'vs/base/browser/history';
 
 const $ = dom.$;
 
@@ -37,10 +38,13 @@ export interface IInputBoxStyles {
 	inputBorder?: Color;
 	inputValidationInfoBorder?: Color;
 	inputValidationInfoBackground?: Color;
+	inputValidationInfoForeground?: Color;
 	inputValidationWarningBorder?: Color;
 	inputValidationWarningBackground?: Color;
+	inputValidationWarningForeground?: Color;
 	inputValidationErrorBorder?: Color;
 	inputValidationErrorBackground?: Color;
+	inputValidationErrorForeground?: Color;
 }
 
 export interface IInputValidator {
@@ -57,7 +61,7 @@ export interface IInputValidationOptions {
 	validation: IInputValidator;
 }
 
-export enum MessageType {
+export const enum MessageType {
 	INFO = 1,
 	WARNING = 2,
 	ERROR = 3
@@ -99,10 +103,13 @@ export class InputBox extends Widget {
 
 	private inputValidationInfoBorder: Color;
 	private inputValidationInfoBackground: Color;
+	private inputValidationInfoForeground: Color;
 	private inputValidationWarningBorder: Color;
 	private inputValidationWarningBackground: Color;
+	private inputValidationWarningForeground: Color;
 	private inputValidationErrorBorder: Color;
 	private inputValidationErrorBackground: Color;
+	private inputValidationErrorForeground: Color;
 
 	private _onDidChange = this._register(new Emitter<string>());
 	public readonly onDidChange: Event<string> = this._onDidChange.event;
@@ -127,10 +134,13 @@ export class InputBox extends Widget {
 
 		this.inputValidationInfoBorder = this.options.inputValidationInfoBorder;
 		this.inputValidationInfoBackground = this.options.inputValidationInfoBackground;
+		this.inputValidationInfoForeground = this.options.inputValidationInfoForeground;
 		this.inputValidationWarningBorder = this.options.inputValidationWarningBorder;
 		this.inputValidationWarningBackground = this.options.inputValidationWarningBackground;
+		this.inputValidationWarningForeground = this.options.inputValidationWarningForeground;
 		this.inputValidationErrorBorder = this.options.inputValidationErrorBorder;
 		this.inputValidationErrorBackground = this.options.inputValidationErrorBackground;
+		this.inputValidationErrorForeground = this.options.inputValidationErrorForeground;
 
 		if (this.options.validationOptions) {
 			this.validation = this.options.validationOptions.validation;
@@ -348,11 +358,11 @@ export class InputBox extends Widget {
 		return !errorMsg;
 	}
 
-	private stylesForType(type: MessageType): { border: Color; background: Color } {
+	private stylesForType(type: MessageType): { border: Color; background: Color; foreground: Color } {
 		switch (type) {
-			case MessageType.INFO: return { border: this.inputValidationInfoBorder, background: this.inputValidationInfoBackground };
-			case MessageType.WARNING: return { border: this.inputValidationWarningBorder, background: this.inputValidationWarningBackground };
-			default: return { border: this.inputValidationErrorBorder, background: this.inputValidationErrorBackground };
+			case MessageType.INFO: return { border: this.inputValidationInfoBorder, background: this.inputValidationInfoBackground, foreground: this.inputValidationInfoForeground };
+			case MessageType.WARNING: return { border: this.inputValidationWarningBorder, background: this.inputValidationWarningBackground, foreground: this.inputValidationWarningForeground };
+			default: return { border: this.inputValidationErrorBorder, background: this.inputValidationErrorBackground, foreground: this.inputValidationErrorForeground };
 		}
 	}
 
@@ -393,6 +403,7 @@ export class InputBox extends Widget {
 
 				const styles = this.stylesForType(this.message.type);
 				spanElement.style.backgroundColor = styles.background ? styles.background.toString() : null;
+				spanElement.style.color = styles.foreground ? styles.foreground.toString() : null;
 				spanElement.style.border = styles.border ? `1px solid ${styles.border}` : null;
 
 				dom.append(div, spanElement);
@@ -442,10 +453,13 @@ export class InputBox extends Widget {
 		this.inputBorder = styles.inputBorder;
 
 		this.inputValidationInfoBackground = styles.inputValidationInfoBackground;
+		this.inputValidationInfoForeground = styles.inputValidationInfoForeground;
 		this.inputValidationInfoBorder = styles.inputValidationInfoBorder;
 		this.inputValidationWarningBackground = styles.inputValidationWarningBackground;
+		this.inputValidationWarningForeground = styles.inputValidationWarningForeground;
 		this.inputValidationWarningBorder = styles.inputValidationWarningBorder;
 		this.inputValidationErrorBackground = styles.inputValidationErrorBackground;
+		this.inputValidationErrorForeground = styles.inputValidationErrorForeground;
 		this.inputValidationErrorBorder = styles.inputValidationErrorBorder;
 
 		this.applyStyles();
@@ -503,7 +517,7 @@ export interface IHistoryInputOptions extends IInputOptions {
 	history: string[];
 }
 
-export class HistoryInputBox extends InputBox {
+export class HistoryInputBox extends InputBox implements IHistoryNavigationWidget {
 
 	private readonly history: HistoryNavigator<string>;
 
@@ -512,9 +526,9 @@ export class HistoryInputBox extends InputBox {
 		this.history = new HistoryNavigator<string>(options.history, 100);
 	}
 
-	public addToHistory(value: string): void {
-		if (value !== this.history.current()) {
-			this.history.add(value);
+	public addToHistory(): void {
+		if (this.value && this.value !== this.getCurrentValue()) {
+			this.history.add(this.value);
 		}
 	}
 
@@ -522,27 +536,56 @@ export class HistoryInputBox extends InputBox {
 		return this.history.getHistory();
 	}
 
-	public showNextValue() {
-		let next = this.history.next();
+	public showNextValue(): void {
+		if (!this.history.has(this.value)) {
+			this.addToHistory();
+		}
+
+		let next = this.getNextValue();
+		if (next) {
+			next = next === this.value ? this.getNextValue() : next;
+		}
+
 		if (next) {
 			this.value = next;
+			aria.status(this.value);
 		}
 	}
 
-	public showPreviousValue() {
-		let previous;
-		if (this.value.length === 0) {
-			previous = this.history.current();
-		} else {
-			this.history.addIfNotPresent(this.value);
-			previous = this.history.previous();
+	public showPreviousValue(): void {
+		if (!this.history.has(this.value)) {
+			this.addToHistory();
 		}
+
+		let previous = this.getPreviousValue();
+		if (previous) {
+			previous = previous === this.value ? this.getPreviousValue() : previous;
+		}
+
 		if (previous) {
 			this.value = previous;
+			aria.status(this.value);
 		}
 	}
 
 	public clearHistory(): void {
 		this.history.clear();
 	}
-}
\ No newline at end of file
+
+	private getCurrentValue(): string {
+		let currentValue = this.history.current();
+		if (!currentValue) {
+			currentValue = this.history.last();
+			this.history.next();
+		}
+		return currentValue;
+	}
+
+	private getPreviousValue(): string {
+		return this.history.previous() || this.history.first();
+	}
+
+	private getNextValue(): string {
+		return this.history.next() || this.history.last();
+	}
+}
diff --git a/src/vs/base/browser/ui/list/list.ts b/src/vs/base/browser/ui/list/list.ts
index df2fbfde7d3..37ff5439232 100644
--- a/src/vs/base/browser/ui/list/list.ts
+++ b/src/vs/base/browser/ui/list/list.ts
@@ -5,7 +5,7 @@
 
 import { GestureEvent } from 'vs/base/browser/touch';
 
-export interface IDelegate<T> {
+export interface IVirtualDelegate<T> {
 	getHeight(element: T): number;
 	getTemplateId(element: T): string;
 }
@@ -14,6 +14,7 @@ export interface IRenderer<TElement, TTemplateData> {
 	templateId: string;
 	renderTemplate(container: HTMLElement): TTemplateData;
 	renderElement(element: TElement, index: number, templateData: TTemplateData): void;
+	disposeElement(element: TElement, index: number, templateData: TTemplateData): void;
 	disposeTemplate(templateData: TTemplateData): void;
 }
 
diff --git a/src/vs/base/browser/ui/list/listPaging.ts b/src/vs/base/browser/ui/list/listPaging.ts
index 53ea8be6a37..73f8ec7f4ca 100644
--- a/src/vs/base/browser/ui/list/listPaging.ts
+++ b/src/vs/base/browser/ui/list/listPaging.ts
@@ -6,10 +6,11 @@
 import 'vs/css!./list';
 import { IDisposable } from 'vs/base/common/lifecycle';
 import { range } from 'vs/base/common/arrays';
-import { IDelegate, IRenderer, IListEvent, IListOpenEvent } from './list';
+import { IVirtualDelegate, IRenderer, IListEvent, IListOpenEvent } from './list';
 import { List, IListStyles, IListOptions } from './listWidget';
 import { IPagedModel } from 'vs/base/common/paging';
 import { Event, mapEvent } from 'vs/base/common/event';
+import { CancellationTokenSource } from 'vs/base/common/cancellation';
 
 export interface IPagedRenderer<TElement, TTemplateData> extends IRenderer<TElement, TTemplateData> {
 	renderPlaceholder(index: number, templateData: TTemplateData): void;
@@ -43,11 +44,16 @@ class PagedRenderer<TElement, TTemplateData> implements IRenderer<number, ITempl
 			return this.renderer.renderElement(model.get(index), index, data.data);
 		}
 
-		const promise = model.resolve(index);
-		data.disposable = { dispose: () => promise.cancel() };
+		const cts = new CancellationTokenSource();
+		const promise = model.resolve(index, cts.token);
+		data.disposable = { dispose: () => cts.cancel() };
 
 		this.renderer.renderPlaceholder(index, data.data);
-		promise.done(entry => this.renderer.renderElement(entry, index, data.data));
+		promise.then(entry => this.renderer.renderElement(entry, index, data.data));
+	}
+
+	disposeElement(): void {
+		// noop
 	}
 
 	disposeTemplate(data: ITemplateData<TTemplateData>): void {
@@ -65,12 +71,12 @@ export class PagedList<T> implements IDisposable {
 
 	constructor(
 		container: HTMLElement,
-		delegate: IDelegate<number>,
+		virtualDelegate: IVirtualDelegate<number>,
 		renderers: IPagedRenderer<T, any>[],
 		options: IListOptions<any> = {}
 	) {
 		const pagedRenderers = renderers.map(r => new PagedRenderer<T, ITemplateData<T>>(r, () => this.model));
-		this.list = new List(container, delegate, pagedRenderers, options);
+		this.list = new List(container, virtualDelegate, pagedRenderers, options);
 	}
 
 	getHTMLElement(): HTMLElement {
diff --git a/src/vs/base/browser/ui/list/listView.ts b/src/vs/base/browser/ui/list/listView.ts
index 808cccb229c..92d8d99d64b 100644
--- a/src/vs/base/browser/ui/list/listView.ts
+++ b/src/vs/base/browser/ui/list/listView.ts
@@ -12,7 +12,7 @@ import { domEvent } from 'vs/base/browser/event';
 import { ScrollableElement } from 'vs/base/browser/ui/scrollbar/scrollableElement';
 import { ScrollEvent, ScrollbarVisibility } from 'vs/base/common/scrollable';
 import { RangeMap, IRange, relativeComplement, intersect, shift } from './rangeMap';
-import { IDelegate, IRenderer, IListMouseEvent, IListTouchEvent, IListGestureEvent } from './list';
+import { IVirtualDelegate, IRenderer, IListMouseEvent, IListTouchEvent, IListGestureEvent } from './list';
 import { RowCache, IRow } from './rowCache';
 import { isWindows } from 'vs/base/common/platform';
 import * as browser from 'vs/base/browser/browser';
@@ -72,7 +72,7 @@ export class ListView<T> implements ISpliceable<T>, IDisposable {
 
 	constructor(
 		container: HTMLElement,
-		private delegate: IDelegate<T>,
+		private virtualDelegate: IVirtualDelegate<T>,
 		renderers: IRenderer<T, any>[],
 		options: IListViewOptions = DefaultOptions
 	) {
@@ -156,8 +156,8 @@ export class ListView<T> implements ISpliceable<T>, IDisposable {
 		const inserted = elements.map<IItem<T>>(element => ({
 			id: String(this.itemId++),
 			element,
-			size: this.delegate.getHeight(element),
-			templateId: this.delegate.getTemplateId(element),
+			size: this.virtualDelegate.getHeight(element),
+			templateId: this.virtualDelegate.getTemplateId(element),
 			row: null
 		}));
 
@@ -311,6 +311,12 @@ export class ListView<T> implements ISpliceable<T>, IDisposable {
 
 	private removeItemFromDOM(index: number): void {
 		const item = this.items[index];
+		const renderer = this.renderers.get(item.templateId);
+
+		if (renderer.disposeElement) {
+			renderer.disposeElement(item.element, index, item.row.templateData);
+		}
+
 		this.cache.release(item.row);
 		item.row = null;
 	}
@@ -371,7 +377,12 @@ export class ListView<T> implements ISpliceable<T>, IDisposable {
 	}
 
 	private onScroll(e: ScrollEvent): void {
-		this.render(e.scrollTop, e.height);
+		try {
+			this.render(e.scrollTop, e.height);
+		} catch (err) {
+			console.log('Got bad scroll event:', e);
+			throw err;
+		}
 	}
 
 	private onTouchChange(event: GestureEvent): void {
@@ -484,7 +495,17 @@ export class ListView<T> implements ISpliceable<T>, IDisposable {
 	// Dispose
 
 	dispose() {
-		this.items = null;
+		if (this.items) {
+			for (const item of this.items) {
+				if (item.row) {
+					const renderer = this.renderers.get(item.row.templateId);
+					renderer.disposeTemplate(item.row.templateData);
+					item.row = null;
+				}
+			}
+
+			this.items = null;
+		}
 
 		if (this._domNode && this._domNode.parentElement) {
 			this._domNode.parentNode.removeChild(this._domNode);
diff --git a/src/vs/base/browser/ui/list/listWidget.ts b/src/vs/base/browser/ui/list/listWidget.ts
index a93a19f2be3..2fdd6e9d577 100644
--- a/src/vs/base/browser/ui/list/listWidget.ts
+++ b/src/vs/base/browser/ui/list/listWidget.ts
@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import 'vs/css!./list';
+import { localize } from 'vs/nls';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { isNumber } from 'vs/base/common/types';
 import { range, firstIndex } from 'vs/base/common/arrays';
@@ -15,29 +16,19 @@ import { KeyCode } from 'vs/base/common/keyCodes';
 import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
 import { Event, Emitter, EventBufferer, chain, mapEvent, anyEvent } from 'vs/base/common/event';
 import { domEvent } from 'vs/base/browser/event';
-import { IDelegate, IRenderer, IListEvent, IListContextMenuEvent, IListMouseEvent, IListTouchEvent, IListGestureEvent, IListOpenEvent } from './list';
+import { IVirtualDelegate, IRenderer, IListEvent, IListContextMenuEvent, IListMouseEvent, IListTouchEvent, IListGestureEvent, IListOpenEvent } from './list';
 import { ListView, IListViewOptions } from './listView';
 import { Color } from 'vs/base/common/color';
 import { mixin } from 'vs/base/common/objects';
 import { ScrollbarVisibility } from 'vs/base/common/scrollable';
 import { ISpliceable } from 'vs/base/common/sequence';
+import { CombinedSpliceable } from 'vs/base/browser/ui/list/splice';
 import { clamp } from 'vs/base/common/numbers';
 
 export interface IIdentityProvider<T> {
 	(element: T): string;
 }
 
-class CombinedSpliceable<T> implements ISpliceable<T> {
-
-	constructor(private spliceables: ISpliceable<T>[]) { }
-
-	splice(start: number, deleteCount: number, elements: T[]): void {
-		for (const spliceable of this.spliceables) {
-			spliceable.splice(start, deleteCount, elements);
-		}
-	}
-}
-
 interface ITraitChangeEvent {
 	indexes: number[];
 }
@@ -78,6 +69,10 @@ class TraitRenderer<T> implements IRenderer<T, ITraitTemplateData>
 		this.trait.renderIndex(index, templateData);
 	}
 
+	disposeElement(): void {
+		// noop
+	}
+
 	splice(start: number, deleteCount: number, insertCount: number): void {
 		const rendered: IRenderedContainer[] = [];
 
@@ -361,6 +356,11 @@ class DOMFocusController<T> implements IDisposable {
 			return;
 		}
 
+		const style = window.getComputedStyle(tabIndexElement);
+		if (style.visibility === 'hidden' || style.display === 'none') {
+			return;
+		}
+
 		e.preventDefault();
 		e.stopPropagation();
 		tabIndexElement.focus();
@@ -817,6 +817,14 @@ class PipelineRenderer<T> implements IRenderer<T, any> {
 		}
 	}
 
+	disposeElement(element: T, index: number, templateData: any[]): void {
+		let i = 0;
+
+		for (const renderer of this.renderers) {
+			renderer.disposeElement(element, index, templateData[i++]);
+		}
+	}
+
 	disposeTemplate(templateData: any[]): void {
 		let i = 0;
 
@@ -881,7 +889,7 @@ export class List<T> implements ISpliceable<T>, IDisposable {
 
 	constructor(
 		container: HTMLElement,
-		delegate: IDelegate<T>,
+		virtualDelegate: IVirtualDelegate<T>,
 		renderers: IRenderer<T, any>[],
 		options: IListOptions<T> = DefaultOptions
 	) {
@@ -892,7 +900,7 @@ export class List<T> implements ISpliceable<T>, IDisposable {
 
 		renderers = renderers.map(r => new PipelineRenderer(r.templateId, [this.focus.renderer, this.selection.renderer, r]));
 
-		this.view = new ListView(container, delegate, renderers, options);
+		this.view = new ListView(container, virtualDelegate, renderers, options);
 		this.view.domNode.setAttribute('role', 'tree');
 		DOM.addClass(this.view.domNode, this.idPrefix);
 		this.view.domNode.tabIndex = 0;
@@ -932,13 +940,21 @@ export class List<T> implements ISpliceable<T>, IDisposable {
 		this.onSelectionChange(this._onSelectionChange, this, this.disposables);
 
 		if (options.ariaLabel) {
-			this.view.domNode.setAttribute('aria-label', options.ariaLabel);
+			this.view.domNode.setAttribute('aria-label', localize('aria list', "{0}. Use the navigation keys to navigate.", options.ariaLabel));
 		}
 
 		this.style(options);
 	}
 
 	splice(start: number, deleteCount: number, elements: T[] = []): void {
+		if (start < 0 || start > this.view.length) {
+			throw new Error(`Invalid start index: ${start}`);
+		}
+
+		if (deleteCount < 0) {
+			throw new Error(`Invalid delete count: ${deleteCount}`);
+		}
+
 		if (deleteCount === 0 && elements.length === 0) {
 			return;
 		}
@@ -1206,5 +1222,9 @@ export class List<T> implements ISpliceable<T>, IDisposable {
 	dispose(): void {
 		this._onDidDispose.fire();
 		this.disposables = dispose(this.disposables);
+
+		this._onOpen.dispose();
+		this._onPin.dispose();
+		this._onDidDispose.dispose();
 	}
 }
diff --git a/src/vs/base/browser/ui/list/splice.ts b/src/vs/base/browser/ui/list/splice.ts
new file mode 100644
index 00000000000..254e25d6a7b
--- /dev/null
+++ b/src/vs/base/browser/ui/list/splice.ts
@@ -0,0 +1,21 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+import { ISpliceable } from 'vs/base/common/sequence';
+
+export interface ISpreadSpliceable<T> {
+	splice(start: number, deleteCount: number, ...elements: T[]): void;
+}
+
+export class CombinedSpliceable<T> implements ISpliceable<T> {
+
+	constructor(private spliceables: ISpliceable<T>[]) { }
+
+	splice(start: number, deleteCount: number, elements: T[]): void {
+		this.spliceables.forEach(s => s.splice(start, deleteCount, elements));
+	}
+}
\ No newline at end of file
diff --git a/src/vs/base/browser/ui/menu/check.svg b/src/vs/base/browser/ui/menu/check.svg
new file mode 100644
index 00000000000..3f365c4800e
--- /dev/null
+++ b/src/vs/base/browser/ui/menu/check.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="-2 -2 16 16" enable-background="new -2 -2 16 16"><polygon fill="#424242" points="9,0 4.5,9 3,6 0,6 3,12 6,12 12,0"/></svg>
\ No newline at end of file
diff --git a/src/vs/base/browser/ui/menu/menu.css b/src/vs/base/browser/ui/menu/menu.css
index a7ea384d888..83de3168ce3 100644
--- a/src/vs/base/browser/ui/menu/menu.css
+++ b/src/vs/base/browser/ui/menu/menu.css
@@ -5,6 +5,7 @@
 
 .monaco-menu .monaco-action-bar.vertical {
 	margin-left: 0;
+	overflow: visible;
 }
 
 .monaco-menu .monaco-action-bar.vertical .actions-container {
@@ -34,30 +35,45 @@
 	background-color: #E4E4E4;
 }
 
-.monaco-menu .monaco-action-bar.vertical .action-item:hover:not(.disabled) {
-	background-color: #EEE;
+.monaco-menu .monaco-action-bar.vertical .action-menu-item {
+	-ms-flex: 1 1 auto;
+	flex: 1 1 auto;
+	display: -ms-flexbox;
+	display: flex;
+	height: 2em;
+	align-items: center;
 }
 
 .monaco-menu .monaco-action-bar.vertical .action-label {
 	-ms-flex: 1 1 auto;
 	flex: 1 1 auto;
 	text-decoration: none;
-	padding: 0.8em 1em;
-	line-height: 1.1em;
+	padding: 0 1em;
 	background: none;
+	font-size: 12px;
+	line-height: 1;
 }
 
-.monaco-menu .monaco-action-bar.vertical .keybinding {
+.monaco-menu .monaco-action-bar.vertical .keybinding,
+.monaco-menu .monaco-action-bar.vertical .submenu-indicator {
 	display: inline-block;
 	-ms-flex: 2 1 auto;
 	flex: 2 1 auto;
-	padding: 0.8em 1em;
-	line-height: 1.1em;
-	font-size: 12px;
+	padding: 0 1em;
 	text-align: right;
+	font-size: 12px;
+	line-height: 1;
 }
 
-.monaco-menu .monaco-action-bar.vertical .action-item.disabled .keybinding {
+.monaco-menu .monaco-action-bar.vertical .submenu-indicator {
+	background-color: #646465;
+	height: 100%;
+	-webkit-mask: url('submenu.svg') no-repeat 90% 50%/14px 14px;
+	mask: url('submenu.svg') no-repeat 90% 50%/14px 14px;
+}
+
+.monaco-menu .monaco-action-bar.vertical .action-item.disabled .keybinding,
+.monaco-menu .monaco-action-bar.vertical .action-item.disabled .submenu-indicator {
 	opacity: 0.4;
 }
 
@@ -87,6 +103,20 @@
 	color: inherit;
 }
 
+.monaco-menu .monaco-action-bar.vertical .menu-item-check {
+	position: absolute;
+	visibility: hidden;
+	background-color: #646465;
+	-webkit-mask: url('check.svg') no-repeat 50% 56%/15px 15px;
+	mask: url('check.svg') no-repeat 50% 56%/15px 15px;
+	width: 1em;
+	height: 100%;
+}
+
+.monaco-menu .monaco-action-bar.vertical .action-menu-item.checked .menu-item-check {
+	visibility: visible;
+}
+
 /* Context Menu */
 
 .context-view.monaco-menu-container {
@@ -103,19 +133,21 @@
 	animation: fadeIn 0.083s linear;
 }
 
-.context-view.monaco-menu-container :focus {
+.context-view.monaco-menu-container :focus,
+.context-view.monaco-menu-container .monaco-action-bar.vertical:focus,
+.context-view.monaco-menu-container .monaco-action-bar.vertical :focus {
 	outline: 0;
 }
 
+.monaco-menu .monaco-action-bar.vertical .action-item {
+	border: 1px solid transparent; /* prevents jumping behaviour on hover or focus */
+}
+
 /* Dark theme */
 .vs-dark .monaco-menu .monaco-action-bar.vertical .action-item.focused {
 	background-color: #4B4C4D;
 }
 
-.vs-dark .monaco-menu .monaco-action-bar.vertical .action-item:hover:not(.disabled) {
-	background-color: #3A3A3A;
-}
-
 .vs-dark .context-view.monaco-menu-container {
 	box-shadow: 0 2px 8px #000;
 	color: #BBB;
@@ -135,7 +167,7 @@
 	border: 1px dotted #f38518;
 }
 
-.hc-black .monaco-menu .monaco-action-bar.vertical .action-item:hover:not(.disabled) {
-	background: none;
-	border: 1px dashed #f38518;
+.hc-black .monaco-menu .monaco-action-bar.vertical .menu-item-check,
+.hc-black .monaco-menu .monaco-action-bar.vertical .submenu-indicator {
+	background-color: white;
 }
\ No newline at end of file
diff --git a/src/vs/base/browser/ui/menu/menu.ts b/src/vs/base/browser/ui/menu/menu.ts
index 16c9a2a69a7..f3044f2dfc6 100644
--- a/src/vs/base/browser/ui/menu/menu.ts
+++ b/src/vs/base/browser/ui/menu/menu.ts
@@ -6,64 +6,538 @@
 'use strict';
 
 import 'vs/css!./menu';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { IActionRunner, IAction } from 'vs/base/common/actions';
-import { ActionBar, IActionItemProvider, ActionsOrientation } from 'vs/base/browser/ui/actionbar/actionbar';
-import { ResolvedKeybinding } from 'vs/base/common/keyCodes';
-import { Event } from 'vs/base/common/event';
-import { addClass } from 'vs/base/browser/dom';
+import * as nls from 'vs/nls';
+import * as strings from 'vs/base/common/strings';
+import { IActionRunner, IAction, Action } from 'vs/base/common/actions';
+import { ActionBar, IActionItemProvider, ActionsOrientation, Separator, ActionItem, IActionItemOptions, BaseActionItem } from 'vs/base/browser/ui/actionbar/actionbar';
+import { ResolvedKeybinding, KeyCode, KeyCodeUtils } from 'vs/base/common/keyCodes';
+import { addClass, EventType, EventHelper, EventLike, removeTabIndexAndUpdateFocus, isAncestor, hasClass, addDisposableListener, removeClass, append, $, addClasses, getClientArea, removeClasses } from 'vs/base/browser/dom';
+import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
+import { RunOnceScheduler } from 'vs/base/common/async';
+import { IDisposable, dispose } from 'vs/base/common/lifecycle';
+
+export const MENU_MNEMONIC_REGEX: RegExp = /\(&{1,2}(.)\)|&{1,2}(.)/;
+export const MENU_ESCAPED_MNEMONIC_REGEX: RegExp = /(?:&amp;){1,2}(.)/;
 
 export interface IMenuOptions {
 	context?: any;
 	actionItemProvider?: IActionItemProvider;
 	actionRunner?: IActionRunner;
 	getKeyBinding?: (action: IAction) => ResolvedKeybinding;
+	ariaLabel?: string;
+	enableMnemonics?: boolean;
 }
 
-export class Menu {
 
-	private actionBar: ActionBar;
-	private listener: IDisposable;
+export class SubmenuAction extends Action {
+	constructor(label: string, public entries: (SubmenuAction | IAction)[], cssClass?: string) {
+		super(!!cssClass ? cssClass : 'submenu', label, '', true);
+	}
+}
+
+interface ISubMenuData {
+	parent: Menu;
+	submenu?: Menu;
+}
+
+export class Menu extends ActionBar {
+	private mnemonics: Map<KeyCode, Array<MenuActionItem>>;
+	private menuDisposables: IDisposable[];
 
 	constructor(container: HTMLElement, actions: IAction[], options: IMenuOptions = {}) {
-		addClass(container, 'monaco-menu-container');
 
+		addClass(container, 'monaco-menu-container');
+		container.setAttribute('role', 'presentation');
 		let menuContainer = document.createElement('div');
 		addClass(menuContainer, 'monaco-menu');
+		menuContainer.setAttribute('role', 'presentation');
 		container.appendChild(menuContainer);
 
-		this.actionBar = new ActionBar(menuContainer, {
+		super(menuContainer, {
 			orientation: ActionsOrientation.VERTICAL,
-			actionItemProvider: options.actionItemProvider,
+			actionItemProvider: action => this.doGetActionItem(action, options, parentData),
 			context: options.context,
 			actionRunner: options.actionRunner,
-			isMenu: true
+			ariaLabel: options.ariaLabel
 		});
 
-		this.actionBar.push(actions, { icon: true, label: true });
-	}
+		this.actionsList.setAttribute('role', 'menu');
 
-	public get onDidCancel(): Event<void> {
-		return this.actionBar.onDidCancel;
-	}
+		this.actionsList.tabIndex = 0;
 
-	public get onDidBlur(): Event<void> {
-		return this.actionBar.onDidBlur;
-	}
+		this.menuDisposables = [];
 
-	public focus() {
-		this.actionBar.focus(true);
-	}
+		if (options.enableMnemonics) {
+			this.menuDisposables.push(addDisposableListener(menuContainer, EventType.KEY_DOWN, (e) => {
+				const key = KeyCodeUtils.fromString(e.key);
+				if (this.mnemonics.has(key)) {
+					EventHelper.stop(e, true);
+					const actions = this.mnemonics.get(key);
 
-	public dispose() {
-		if (this.actionBar) {
-			this.actionBar.dispose();
-			this.actionBar = null;
+					if (actions.length === 1) {
+						if (actions[0] instanceof SubmenuActionItem) {
+							this.focusItemByElement(actions[0].container);
+						}
+
+						actions[0].onClick(event);
+					}
+
+					if (actions.length > 1) {
+						const action = actions.shift();
+						this.focusItemByElement(action.container);
+
+						actions.push(action);
+						this.mnemonics.set(key, actions);
+					}
+				}
+			}));
 		}
 
-		if (this.listener) {
-			this.listener.dispose();
-			this.listener = null;
+		this._register(addDisposableListener(this.domNode, EventType.MOUSE_OUT, e => {
+			let relatedTarget = (e as MouseEvent).relatedTarget as HTMLElement;
+			if (!isAncestor(relatedTarget, this.domNode)) {
+				this.focusedItem = undefined;
+				this.updateFocus();
+				e.stopPropagation();
+			}
+		}));
+
+		this._register(addDisposableListener(this.actionsList, EventType.MOUSE_OUT, e => {
+			let target = e.target as HTMLElement;
+			if (!target || !isAncestor(target, this.actionsList) || target === this.actionsList) {
+				return;
+			}
+
+			while (target.parentElement !== this.actionsList) {
+				target = target.parentElement;
+			}
+
+			if (hasClass(target, 'action-item')) {
+				const lastFocusedItem = this.focusedItem;
+				this.setFocusedItem(target);
+
+				if (lastFocusedItem !== this.focusedItem) {
+					this.updateFocus();
+				}
+			}
+		}));
+
+		let parentData: ISubMenuData = {
+			parent: this
+		};
+
+		this.mnemonics = new Map<KeyCode, Array<MenuActionItem>>();
+
+		this.push(actions, { icon: true, label: true, isMenu: true });
+	}
+
+	private focusItemByElement(element: HTMLElement) {
+		const lastFocusedItem = this.focusedItem;
+		this.setFocusedItem(element);
+
+		if (lastFocusedItem !== this.focusedItem) {
+			this.updateFocus();
 		}
 	}
+
+	private setFocusedItem(element: HTMLElement): void {
+		for (let i = 0; i < this.actionsList.children.length; i++) {
+			let elem = this.actionsList.children[i];
+			if (element === elem) {
+				this.focusedItem = i;
+				break;
+			}
+		}
+	}
+
+	private doGetActionItem(action: IAction, options: IMenuOptions, parentData: ISubMenuData): BaseActionItem {
+		if (action instanceof Separator) {
+			return new ActionItem(options.context, action, { icon: true });
+		} else if (action instanceof SubmenuAction) {
+			const menuActionItem = new SubmenuActionItem(action, action.entries, parentData, options);
+
+			if (options.enableMnemonics) {
+				const mnemonic = menuActionItem.getMnemonic();
+				if (mnemonic && menuActionItem.isEnabled()) {
+					let actionItems = [];
+					if (this.mnemonics.has(mnemonic)) {
+						actionItems = this.mnemonics.get(mnemonic);
+					}
+
+					actionItems.push(menuActionItem);
+
+					this.mnemonics.set(mnemonic, actionItems);
+				}
+			}
+
+			return menuActionItem;
+		} else {
+			const menuItemOptions: IMenuItemOptions = { enableMnemonics: options.enableMnemonics };
+			if (options.getKeyBinding) {
+				const keybinding = options.getKeyBinding(action);
+				if (keybinding) {
+					menuItemOptions.keybinding = keybinding.getLabel();
+				}
+			}
+
+			const menuActionItem = new MenuActionItem(options.context, action, menuItemOptions);
+
+			if (options.enableMnemonics) {
+				const mnemonic = menuActionItem.getMnemonic();
+				if (mnemonic && menuActionItem.isEnabled()) {
+					let actionItems = [];
+					if (this.mnemonics.has(mnemonic)) {
+						actionItems = this.mnemonics.get(mnemonic);
+					}
+
+					actionItems.push(menuActionItem);
+
+					this.mnemonics.set(mnemonic, actionItems);
+				}
+			}
+
+			return menuActionItem;
+		}
+	}
+
+	public focus(selectFirst = true) {
+		super.focus(selectFirst);
+	}
+}
+
+interface IMenuItemOptions extends IActionItemOptions {
+	enableMnemonics?: boolean;
+}
+
+class MenuActionItem extends BaseActionItem {
+
+	public container: HTMLElement;
+
+	protected options: IMenuItemOptions;
+	protected item: HTMLElement;
+
+	private label: HTMLElement;
+	private check: HTMLElement;
+	private mnemonic: KeyCode;
+	private cssClass: string;
+
+	constructor(ctx: any, action: IAction, options: IMenuItemOptions = {}) {
+		options.isMenu = true;
+		super(action, action, options);
+
+		this.options = options;
+		this.options.icon = options.icon !== undefined ? options.icon : false;
+		this.options.label = options.label !== undefined ? options.label : true;
+		this.cssClass = '';
+
+		// Set mnemonic
+		if (this.options.label && options.enableMnemonics) {
+			let label = this.getAction().label;
+			if (label) {
+				let matches = MENU_MNEMONIC_REGEX.exec(label);
+				if (matches) {
+					this.mnemonic = KeyCodeUtils.fromString((!!matches[1] ? matches[1] : matches[2]).toLocaleLowerCase());
+				}
+			}
+		}
+	}
+
+	render(container: HTMLElement): void {
+		super.render(container);
+
+		this.container = container;
+
+		this.item = append(this.element, $('a.action-menu-item'));
+		if (this._action.id === Separator.ID) {
+			// A separator is a presentation item
+			this.item.setAttribute('role', 'presentation');
+		} else {
+			this.item.setAttribute('role', 'menuitem');
+			if (this.mnemonic) {
+				this.item.setAttribute('aria-keyshortcuts', `${this.mnemonic}`);
+			}
+		}
+
+		this.check = append(this.item, $('span.menu-item-check'));
+		this.check.setAttribute('role', 'none');
+
+		this.label = append(this.item, $('span.action-label'));
+
+		if (this.options.label && this.options.keybinding) {
+			append(this.item, $('span.keybinding')).textContent = this.options.keybinding;
+		}
+
+		this._register(addDisposableListener(this.element, EventType.MOUSE_UP, e => {
+			EventHelper.stop(e, true);
+			this.onClick(e);
+		}));
+
+		this.updateClass();
+		this.updateLabel();
+		this.updateTooltip();
+		this.updateEnabled();
+		this.updateChecked();
+	}
+
+	focus(): void {
+		super.focus();
+		this.item.focus();
+	}
+
+	updateLabel(): void {
+		if (this.options.label) {
+			let label = this.getAction().label;
+			if (label) {
+				const cleanLabel = cleanMnemonic(label);
+				if (!this.options.enableMnemonics) {
+					label = cleanLabel;
+				}
+
+				this.label.setAttribute('aria-label', cleanLabel);
+
+				const matches = MENU_MNEMONIC_REGEX.exec(label);
+
+				if (matches) {
+					label = strings.escape(label).replace(MENU_ESCAPED_MNEMONIC_REGEX, '<u aria-hidden="true">$1</u>');
+					this.item.setAttribute('aria-keyshortcuts', (!!matches[1] ? matches[1] : matches[2]).toLocaleLowerCase());
+				}
+			}
+
+			this.label.innerHTML = label.trim();
+		}
+	}
+
+	updateTooltip(): void {
+		let title: string = null;
+
+		if (this.getAction().tooltip) {
+			title = this.getAction().tooltip;
+
+		} else if (!this.options.label && this.getAction().label && this.options.icon) {
+			title = this.getAction().label;
+
+			if (this.options.keybinding) {
+				title = nls.localize({ key: 'titleLabel', comment: ['action title', 'action keybinding'] }, "{0} ({1})", title, this.options.keybinding);
+			}
+		}
+
+		if (title) {
+			this.item.title = title;
+		}
+	}
+
+	updateClass(): void {
+		if (this.cssClass) {
+			removeClasses(this.item, this.cssClass);
+		}
+		if (this.options.icon) {
+			this.cssClass = this.getAction().class;
+			addClass(this.label, 'icon');
+			if (this.cssClass) {
+				addClasses(this.label, this.cssClass);
+			}
+			this.updateEnabled();
+		} else {
+			removeClass(this.label, 'icon');
+		}
+	}
+
+	updateEnabled(): void {
+		if (this.getAction().enabled) {
+			removeClass(this.element, 'disabled');
+			removeClass(this.item, 'disabled');
+			this.item.tabIndex = 0;
+		} else {
+			addClass(this.element, 'disabled');
+			addClass(this.item, 'disabled');
+			removeTabIndexAndUpdateFocus(this.item);
+		}
+	}
+
+	updateChecked(): void {
+		if (this.getAction().checked) {
+			addClass(this.item, 'checked');
+			this.item.setAttribute('role', 'menuitemcheckbox');
+			this.item.setAttribute('aria-checked', 'true');
+		} else {
+			removeClass(this.item, 'checked');
+			this.item.setAttribute('role', 'menuitem');
+			this.item.setAttribute('aria-checked', 'false');
+		}
+	}
+
+	getMnemonic(): KeyCode {
+		return this.mnemonic;
+	}
+}
+
+class SubmenuActionItem extends MenuActionItem {
+	private mysubmenu: Menu;
+	private submenuContainer: HTMLElement;
+	private submenuDisposables: IDisposable[] = [];
+	private mouseOver: boolean;
+	private showScheduler: RunOnceScheduler;
+	private hideScheduler: RunOnceScheduler;
+
+	constructor(
+		action: IAction,
+		private submenuActions: IAction[],
+		private parentData: ISubMenuData,
+		private submenuOptions?: IMenuOptions
+	) {
+		super(action, action, submenuOptions);
+
+		this.showScheduler = new RunOnceScheduler(() => {
+			if (this.mouseOver) {
+				this.cleanupExistingSubmenu(false);
+				this.createSubmenu(false);
+			}
+		}, 250);
+
+		this.hideScheduler = new RunOnceScheduler(() => {
+			if ((!isAncestor(document.activeElement, this.element) && this.parentData.submenu === this.mysubmenu)) {
+				this.parentData.parent.focus(false);
+				this.cleanupExistingSubmenu(true);
+			}
+		}, 750);
+	}
+
+	render(container: HTMLElement): void {
+		super.render(container);
+
+		addClass(this.item, 'monaco-submenu-item');
+		this.item.setAttribute('aria-haspopup', 'true');
+
+		const submenuIndicator = append(this.item, $('span.submenu-indicator'));
+		submenuIndicator.setAttribute('aria-hidden', 'true');
+
+		this._register(addDisposableListener(this.element, EventType.KEY_UP, e => {
+			let event = new StandardKeyboardEvent(e as KeyboardEvent);
+			if (event.equals(KeyCode.RightArrow) || event.equals(KeyCode.Enter)) {
+				EventHelper.stop(e, true);
+
+				this.createSubmenu(true);
+			}
+		}));
+
+		this._register(addDisposableListener(this.element, EventType.KEY_DOWN, e => {
+			let event = new StandardKeyboardEvent(e as KeyboardEvent);
+			if (event.equals(KeyCode.RightArrow) || event.equals(KeyCode.Enter)) {
+				EventHelper.stop(e, true);
+			}
+		}));
+
+		this._register(addDisposableListener(this.element, EventType.MOUSE_OVER, e => {
+			if (!this.mouseOver) {
+				this.mouseOver = true;
+
+				this.showScheduler.schedule();
+			}
+		}));
+
+		this._register(addDisposableListener(this.element, EventType.MOUSE_LEAVE, e => {
+			this.mouseOver = false;
+		}));
+
+		this._register(addDisposableListener(this.element, EventType.FOCUS_OUT, e => {
+			if (!isAncestor(document.activeElement, this.element)) {
+				this.hideScheduler.schedule();
+			}
+		}));
+	}
+
+	onClick(e: EventLike): void {
+		// stop clicking from trying to run an action
+		EventHelper.stop(e, true);
+
+		this.cleanupExistingSubmenu(false);
+		this.createSubmenu(false);
+	}
+
+	private cleanupExistingSubmenu(force: boolean): void {
+		if (this.parentData.submenu && (force || (this.parentData.submenu !== this.mysubmenu))) {
+			this.parentData.submenu.dispose();
+			this.parentData.submenu = null;
+
+			if (this.submenuContainer) {
+				this.submenuDisposables = dispose(this.submenuDisposables);
+				this.submenuContainer = null;
+			}
+		}
+	}
+
+	private createSubmenu(selectFirstItem = true): void {
+		if (!this.parentData.submenu) {
+			this.submenuContainer = append(this.element, $('div.monaco-submenu'));
+			addClasses(this.submenuContainer, 'menubar-menu-items-holder', 'context-view');
+			this.submenuContainer.style.left = `${getClientArea(this.element).width}px`;
+
+			this.submenuDisposables.push(addDisposableListener(this.submenuContainer, EventType.KEY_UP, e => {
+				let event = new StandardKeyboardEvent(e as KeyboardEvent);
+				if (event.equals(KeyCode.LeftArrow)) {
+					EventHelper.stop(e, true);
+
+					this.parentData.parent.focus();
+					this.parentData.submenu.dispose();
+					this.parentData.submenu = null;
+
+					this.submenuDisposables = dispose(this.submenuDisposables);
+					this.submenuContainer = null;
+				}
+			}));
+
+			this.submenuDisposables.push(addDisposableListener(this.submenuContainer, EventType.KEY_DOWN, e => {
+				let event = new StandardKeyboardEvent(e as KeyboardEvent);
+				if (event.equals(KeyCode.LeftArrow)) {
+					EventHelper.stop(e, true);
+				}
+			}));
+
+			this.parentData.submenu = new Menu(this.submenuContainer, this.submenuActions, this.submenuOptions);
+
+			this.submenuDisposables.push(this.parentData.submenu.onDidCancel(() => {
+				this.parentData.parent.focus();
+				this.parentData.submenu.dispose();
+				this.parentData.submenu = null;
+
+				this.submenuDisposables = dispose(this.submenuDisposables);
+				this.submenuContainer = null;
+			}));
+
+			this.parentData.submenu.focus(selectFirstItem);
+
+			this.mysubmenu = this.parentData.submenu;
+		} else {
+			this.parentData.submenu.focus(false);
+		}
+	}
+
+	dispose(): void {
+		super.dispose();
+
+		this.hideScheduler.dispose();
+
+		if (this.mysubmenu) {
+			this.mysubmenu.dispose();
+			this.mysubmenu = null;
+		}
+
+		if (this.submenuContainer) {
+			this.submenuDisposables = dispose(this.submenuDisposables);
+			this.submenuContainer = null;
+		}
+	}
+}
+
+export function cleanMnemonic(label: string): string {
+	const regex = MENU_MNEMONIC_REGEX;
+
+	const matches = regex.exec(label);
+	if (!matches) {
+		return label;
+	}
+
+	const mnemonicInText = matches[0].charAt(0) === '&';
+
+	return label.replace(regex, mnemonicInText ? '$2' : '').trim();
 }
\ No newline at end of file
diff --git a/src/vs/base/browser/ui/menu/submenu.svg b/src/vs/base/browser/ui/menu/submenu.svg
new file mode 100644
index 00000000000..8eeac7b7b66
--- /dev/null
+++ b/src/vs/base/browser/ui/menu/submenu.svg
@@ -0,0 +1,3 @@
+<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M3.52051 13.3643L9.87793 7L3.52051 0.635742L4.13574 0.0205078L11.1221 7L4.13574 13.9795L3.52051 13.3643Z" fill="black"/>
+</svg>
diff --git a/src/vs/base/browser/ui/octiconLabel/octiconLabel.ts b/src/vs/base/browser/ui/octiconLabel/octiconLabel.ts
index e55a3c61e92..0b1154a98fd 100644
--- a/src/vs/base/browser/ui/octiconLabel/octiconLabel.ts
+++ b/src/vs/base/browser/ui/octiconLabel/octiconLabel.ts
@@ -2,14 +2,13 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-'use strict';
 
 import 'vs/css!./octicons/octicons';
 import 'vs/css!./octicons/octicons-animations';
 import { escape } from 'vs/base/common/strings';
 
 function expand(text: string): string {
-	return text.replace(/\$\(((.+?)(~(.*?))?)\)/g, (match, g1, name, g3, animation) => {
+	return text.replace(/\$\(((.+?)(~(.*?))?)\)/g, (_match, _g1, name, _g3, animation) => {
 		return `<span class="octicon octicon-${name} ${animation ? `octicon-animation-${animation}` : ''}"></span>`;
 	});
 }
@@ -20,11 +19,9 @@ export function renderOcticons(label: string): string {
 
 export class OcticonLabel {
 
-	private readonly _container: HTMLElement;
-
-	constructor(container: HTMLElement) {
-		this._container = container;
-	}
+	constructor(
+		private readonly _container: HTMLElement
+	) { }
 
 	set text(text: string) {
 		this._container.innerHTML = renderOcticons(text || '');
diff --git a/src/vs/base/browser/ui/progressbar/progressbar.ts b/src/vs/base/browser/ui/progressbar/progressbar.ts
index f1969feebac..5db9797a33a 100644
--- a/src/vs/base/browser/ui/progressbar/progressbar.ts
+++ b/src/vs/base/browser/ui/progressbar/progressbar.ts
@@ -6,13 +6,12 @@
 'use strict';
 
 import 'vs/css!./progressbar';
-import { TPromise, ValueCallback } from 'vs/base/common/winjs.base';
 import * as assert from 'vs/base/common/assert';
-import { Builder, $ } from 'vs/base/browser/builder';
-import * as DOM from 'vs/base/browser/dom';
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
+import { Disposable } from 'vs/base/common/lifecycle';
 import { Color } from 'vs/base/common/color';
 import { mixin } from 'vs/base/common/objects';
+import { removeClasses, addClass, hasClass, addClasses, removeClass, hide, show } from 'vs/base/browser/dom';
+import { RunOnceScheduler } from 'vs/base/common/async';
 
 const css_done = 'done';
 const css_active = 'active';
@@ -35,45 +34,38 @@ const defaultOpts = {
 /**
  * A progress bar with support for infinite or discrete progress.
  */
-export class ProgressBar {
+export class ProgressBar extends Disposable {
 	private options: IProgressBarOptions;
-	private toUnbind: IDisposable[];
 	private workedVal: number;
-	private element: Builder;
+	private element: HTMLElement;
 	private bit: HTMLElement;
 	private totalWork: number;
-	private animationStopToken: ValueCallback;
 	private progressBarBackground: Color;
+	private showDelayedScheduler: RunOnceScheduler;
 
 	constructor(container: HTMLElement, options?: IProgressBarOptions) {
+		super();
+
 		this.options = options || Object.create(null);
 		mixin(this.options, defaultOpts, false);
 
-		this.toUnbind = [];
 		this.workedVal = 0;
 
 		this.progressBarBackground = this.options.progressBarBackground;
 
+		this._register(this.showDelayedScheduler = new RunOnceScheduler(() => show(this.element), 0));
+
 		this.create(container);
 	}
 
 	private create(container: HTMLElement): void {
-		$(container).div({ 'class': css_progress_container }, builder => {
-			this.element = builder.clone();
+		this.element = document.createElement('div');
+		addClass(this.element, css_progress_container);
+		container.appendChild(this.element);
 
-			builder.div({ 'class': css_progress_bit }).on([DOM.EventType.ANIMATION_START, DOM.EventType.ANIMATION_END, DOM.EventType.ANIMATION_ITERATION], (e: Event) => {
-				switch (e.type) {
-					case DOM.EventType.ANIMATION_ITERATION:
-						if (this.animationStopToken) {
-							this.animationStopToken(null);
-						}
-						break;
-				}
-
-			}, this.toUnbind);
-
-			this.bit = builder.getHTMLElement();
-		});
+		this.bit = document.createElement('div');
+		addClass(this.bit, css_progress_bit);
+		this.element.appendChild(this.bit);
 
 		this.applyStyles();
 	}
@@ -81,9 +73,7 @@ export class ProgressBar {
 	private off(): void {
 		this.bit.style.width = 'inherit';
 		this.bit.style.opacity = '1';
-		this.element.removeClass(css_active);
-		this.element.removeClass(css_infinite);
-		this.element.removeClass(css_discrete);
+		removeClasses(this.element, css_active, css_infinite, css_discrete);
 
 		this.workedVal = 0;
 		this.totalWork = undefined;
@@ -92,26 +82,26 @@ export class ProgressBar {
 	/**
 	 * Indicates to the progress bar that all work is done.
 	 */
-	public done(): ProgressBar {
+	done(): ProgressBar {
 		return this.doDone(true);
 	}
 
 	/**
 	 * Stops the progressbar from showing any progress instantly without fading out.
 	 */
-	public stop(): ProgressBar {
+	stop(): ProgressBar {
 		return this.doDone(false);
 	}
 
 	private doDone(delayed: boolean): ProgressBar {
-		this.element.addClass(css_done);
+		addClass(this.element, css_done);
 
 		// let it grow to 100% width and hide afterwards
-		if (!this.element.hasClass(css_infinite)) {
+		if (!hasClass(this.element, css_infinite)) {
 			this.bit.style.width = 'inherit';
 
 			if (delayed) {
-				TPromise.timeout(200).then(() => this.off());
+				setTimeout(200, () => this.off());
 			} else {
 				this.off();
 			}
@@ -121,7 +111,7 @@ export class ProgressBar {
 		else {
 			this.bit.style.opacity = '0';
 			if (delayed) {
-				TPromise.timeout(200).then(() => this.off());
+				setTimeout(200, () => this.off());
 			} else {
 				this.off();
 			}
@@ -133,14 +123,12 @@ export class ProgressBar {
 	/**
 	 * Use this mode to indicate progress that has no total number of work units.
 	 */
-	public infinite(): ProgressBar {
+	infinite(): ProgressBar {
 		this.bit.style.width = '2%';
 		this.bit.style.opacity = '1';
 
-		this.element.removeClass(css_discrete);
-		this.element.removeClass(css_done);
-		this.element.addClass(css_active);
-		this.element.addClass(css_infinite);
+		removeClasses(this.element, css_discrete, css_done);
+		addClasses(this.element, css_active, css_infinite);
 
 		return this;
 	}
@@ -149,7 +137,7 @@ export class ProgressBar {
 	 * Tells the progress bar the total number of work. Use in combination with workedVal() to let
 	 * the progress bar show the actual progress based on the work that is done.
 	 */
-	public total(value: number): ProgressBar {
+	total(value: number): ProgressBar {
 		this.workedVal = 0;
 		this.totalWork = value;
 
@@ -159,14 +147,14 @@ export class ProgressBar {
 	/**
 	 * Finds out if this progress bar is configured with total work
 	 */
-	public hasTotal(): boolean {
+	hasTotal(): boolean {
 		return !isNaN(this.totalWork);
 	}
 
 	/**
 	 * Tells the progress bar that an increment of work has been completed.
 	 */
-	public worked(value: number): ProgressBar {
+	worked(value: number): ProgressBar {
 		value = Number(value);
 		assert.ok(!isNaN(value), 'Value is not a number');
 		value = Math.max(1, value);
@@ -177,7 +165,7 @@ export class ProgressBar {
 	/**
 	 * Tells the progress bar the total amount of work that has been completed.
 	 */
-	public setWorked(value: number): ProgressBar {
+	setWorked(value: number): ProgressBar {
 		value = Number(value);
 		assert.ok(!isNaN(value), 'Value is not a number');
 		value = Math.max(1, value);
@@ -191,20 +179,20 @@ export class ProgressBar {
 		this.workedVal = value;
 		this.workedVal = Math.min(this.totalWork, this.workedVal);
 
-		if (this.element.hasClass(css_infinite)) {
-			this.element.removeClass(css_infinite);
+		if (hasClass(this.element, css_infinite)) {
+			removeClass(this.element, css_infinite);
 		}
 
-		if (this.element.hasClass(css_done)) {
-			this.element.removeClass(css_done);
+		if (hasClass(this.element, css_done)) {
+			removeClass(this.element, css_done);
 		}
 
-		if (!this.element.hasClass(css_active)) {
-			this.element.addClass(css_active);
+		if (!hasClass(this.element, css_active)) {
+			addClass(this.element, css_active);
 		}
 
-		if (!this.element.hasClass(css_discrete)) {
-			this.element.addClass(css_discrete);
+		if (!hasClass(this.element, css_discrete)) {
+			addClass(this.element, css_discrete);
 		}
 
 		this.bit.style.width = 100 * (this.workedVal / this.totalWork) + '%';
@@ -212,23 +200,26 @@ export class ProgressBar {
 		return this;
 	}
 
-	public getContainer(): HTMLElement {
-		return this.element.getHTMLElement();
+	getContainer(): HTMLElement {
+		return this.element;
 	}
 
-	public show(delay?: number): void {
+	show(delay?: number): void {
+		this.showDelayedScheduler.cancel();
+
 		if (typeof delay === 'number') {
-			this.element.showDelayed(delay);
+			this.showDelayedScheduler.schedule(delay);
 		} else {
-			this.element.show();
+			show(this.element);
 		}
 	}
 
-	public hide(): void {
-		this.element.hide();
+	hide(): void {
+		hide(this.element);
+		this.showDelayedScheduler.cancel();
 	}
 
-	public style(styles: IProgressBarStyles): void {
+	style(styles: IProgressBarStyles): void {
 		this.progressBarBackground = styles.progressBarBackground;
 
 		this.applyStyles();
@@ -241,8 +232,4 @@ export class ProgressBar {
 			this.bit.style.backgroundColor = background;
 		}
 	}
-
-	public dispose(): void {
-		this.toUnbind = dispose(this.toUnbind);
-	}
 }
\ No newline at end of file
diff --git a/src/vs/base/browser/ui/sash/sash.css b/src/vs/base/browser/ui/sash/sash.css
index ed8ed64ced3..94ea3182c95 100644
--- a/src/vs/base/browser/ui/sash/sash.css
+++ b/src/vs/base/browser/ui/sash/sash.css
@@ -54,8 +54,8 @@
 .monaco-sash:not(.disabled).orthogonal-start::before,
 .monaco-sash:not(.disabled).orthogonal-end::after {
 	content: ' ';
-	height: 4px;
-	width: 4px;
+	height: 8px;
+	width: 8px;
 	z-index: 100;
 	display: block;
 	cursor: all-scroll;
@@ -63,19 +63,23 @@
 }
 
 .monaco-sash.orthogonal-start.vertical::before {
-	top: -2px;
+	left: -2px;
+	top: -4px;
 }
 
 .monaco-sash.orthogonal-end.vertical::after {
-	bottom: -2px;
+	left: -2px;
+	bottom: -4px;
 }
 
 .monaco-sash.orthogonal-start.horizontal::before {
-	left: -2px;
+	top: -2px;
+	left: -4px;
 }
 
 .monaco-sash.orthogonal-end.horizontal::after {
-	right: -2px;
+	top: -2px;
+	right: -4px;
 }
 
 .monaco-sash.disabled {
@@ -91,3 +95,14 @@
 .monaco-sash.touch.horizontal {
 	height: 20px;
 }
+
+/** Debug **/
+
+.monaco-sash.debug:not(.disabled) {
+	background: cyan;
+}
+
+.monaco-sash.debug:not(.disabled).orthogonal-start::before,
+.monaco-sash.debug:not(.disabled).orthogonal-end::after {
+	background: red;
+}
\ No newline at end of file
diff --git a/src/vs/base/browser/ui/sash/sash.ts b/src/vs/base/browser/ui/sash/sash.ts
index 5cdf5437d2b..5cfab80c7a0 100644
--- a/src/vs/base/browser/ui/sash/sash.ts
+++ b/src/vs/base/browser/ui/sash/sash.ts
@@ -6,16 +6,18 @@
 'use strict';
 
 import 'vs/css!./sash';
-import { IDisposable, Disposable, dispose } from 'vs/base/common/lifecycle';
+import { IDisposable, dispose, Disposable } from 'vs/base/common/lifecycle';
 import { isIPad } from 'vs/base/browser/browser';
 import { isMacintosh } from 'vs/base/common/platform';
 import * as types from 'vs/base/common/types';
 import { EventType, GestureEvent, Gesture } from 'vs/base/browser/touch';
 import { StandardMouseEvent } from 'vs/base/browser/mouseEvent';
 import { Event, Emitter } from 'vs/base/common/event';
-import { getElementsByTagName, EventHelper, createStyleSheet, addDisposableListener, Dimension, append, $, addClass, removeClass, toggleClass } from 'vs/base/browser/dom';
+import { getElementsByTagName, EventHelper, createStyleSheet, addDisposableListener, append, $, addClass, removeClass, toggleClass } from 'vs/base/browser/dom';
 import { domEvent } from 'vs/base/browser/event';
 
+const DEBUG = false;
+
 export interface ISashLayoutProvider { }
 
 export interface IVerticalSashLayoutProvider extends ISashLayoutProvider {
@@ -44,53 +46,57 @@ export interface ISashOptions {
 	orthogonalEndSash?: Sash;
 }
 
-export enum Orientation {
+export const enum Orientation {
 	VERTICAL,
 	HORIZONTAL
 }
 
-export enum SashState {
+export const enum SashState {
 	Disabled,
 	Minimum,
 	Maximum,
 	Enabled
 }
 
-export class Sash {
+export class Sash extends Disposable {
 
 	private el: HTMLElement;
 	private layoutProvider: ISashLayoutProvider;
 	private hidden: boolean;
 	private orientation: Orientation;
-	private disposables: IDisposable[] = [];
 
 	private _state: SashState = SashState.Enabled;
 	get state(): SashState { return this._state; }
 	set state(state: SashState) {
-		this._state = state;
+		if (this._state === state) {
+			return;
+		}
 
 		toggleClass(this.el, 'disabled', state === SashState.Disabled);
 		toggleClass(this.el, 'minimum', state === SashState.Minimum);
 		toggleClass(this.el, 'maximum', state === SashState.Maximum);
 
+		this._state = state;
 		this._onDidEnablementChange.fire(state);
 	}
 
-	private readonly _onDidEnablementChange = new Emitter<SashState>();
+	private readonly _onDidEnablementChange = this._register(new Emitter<SashState>());
 	readonly onDidEnablementChange: Event<SashState> = this._onDidEnablementChange.event;
 
-	private readonly _onDidStart = new Emitter<ISashEvent>();
+	private readonly _onDidStart = this._register(new Emitter<ISashEvent>());
 	readonly onDidStart: Event<ISashEvent> = this._onDidStart.event;
 
-	private readonly _onDidChange = new Emitter<ISashEvent>();
+	private readonly _onDidChange = this._register(new Emitter<ISashEvent>());
 	readonly onDidChange: Event<ISashEvent> = this._onDidChange.event;
 
-	private readonly _onDidReset = new Emitter<void>();
+	private readonly _onDidReset = this._register(new Emitter<void>());
 	readonly onDidReset: Event<void> = this._onDidReset.event;
 
-	private readonly _onDidEnd = new Emitter<void>();
+	private readonly _onDidEnd = this._register(new Emitter<void>());
 	readonly onDidEnd: Event<void> = this._onDidEnd.event;
 
+	linkedSash: Sash | undefined = undefined;
+
 	private orthogonalStartSashDisposables: IDisposable[] = [];
 	private _orthogonalStartSash: Sash | undefined;
 	get orthogonalStartSash(): Sash | undefined { return this._orthogonalStartSash; }
@@ -124,17 +130,19 @@ export class Sash {
 	}
 
 	constructor(container: HTMLElement, layoutProvider: ISashLayoutProvider, options: ISashOptions = {}) {
+		super();
+
 		this.el = append(container, $('.monaco-sash'));
 
 		if (isMacintosh) {
 			addClass(this.el, 'mac');
 		}
 
-		domEvent(this.el, 'mousedown')(this.onMouseDown, this, this.disposables);
-		domEvent(this.el, 'dblclick')(this.onMouseDoubleClick, this, this.disposables);
+		this._register(domEvent(this.el, 'mousedown')(this.onMouseDown, this));
+		this._register(domEvent(this.el, 'dblclick')(this.onMouseDoubleClick, this));
 
 		Gesture.addTarget(this.el);
-		domEvent(this.el, EventType.Start)(this.onTouchStart, this, this.disposables);
+		this._register(domEvent(this.el, EventType.Start)(this.onTouchStart, this));
 
 		if (isIPad) {
 			// see also http://ux.stackexchange.com/questions/39023/what-is-the-optimum-button-size-of-touch-screen-applications
@@ -148,6 +156,8 @@ export class Sash {
 
 		this.orthogonalStartSash = options.orthogonalStartSash;
 		this.orthogonalEndSash = options.orthogonalEndSash;
+
+		toggleClass(this.el, 'debug', DEBUG);
 	}
 
 	setOrientation(orientation: Orientation): void {
@@ -171,19 +181,24 @@ export class Sash {
 
 		let isMultisashResize = false;
 
+		if (this.linkedSash && !(e as any).__linkedSashEvent) {
+			(e as any).__linkedSashEvent = true;
+			this.linkedSash.onMouseDown(e);
+		}
+
 		if (!(e as any).__orthogonalSashEvent) {
 			let orthogonalSash: Sash | undefined;
 
 			if (this.orientation === Orientation.VERTICAL) {
-				if (e.offsetY <= 2) {
+				if (e.offsetY <= 4) {
 					orthogonalSash = this.orthogonalStartSash;
-				} else if (e.offsetY >= this.el.clientHeight - 2) {
+				} else if (e.offsetY >= this.el.clientHeight - 4) {
 					orthogonalSash = this.orthogonalEndSash;
 				}
 			} else {
-				if (e.offsetX <= 2) {
+				if (e.offsetX <= 4) {
 					orthogonalSash = this.orthogonalStartSash;
-				} else if (e.offsetX >= this.el.clientWidth - 2) {
+				} else if (e.offsetX >= this.el.clientWidth - 4) {
 					orthogonalSash = this.orthogonalEndSash;
 				}
 			}
@@ -290,7 +305,6 @@ export class Sash {
 		const startY = event.pageY;
 		const altKey = event.altKey;
 
-
 		this._onDidStart.fire({
 			startX: startX,
 			currentX: startX,
@@ -370,6 +384,8 @@ export class Sash {
 	}
 
 	dispose(): void {
+		super.dispose();
+
 		this.orthogonalStartSashDisposables = dispose(this.orthogonalStartSashDisposables);
 		this.orthogonalEndSashDisposables = dispose(this.orthogonalEndSashDisposables);
 
@@ -378,95 +394,5 @@ export class Sash {
 		}
 
 		this.el = null;
-		this.disposables = dispose(this.disposables);
-	}
-}
-
-/**
- * A simple Vertical Sash that computes the position of the sash when it is moved between the given dimension.
- * Triggers onPositionChange event when the position is changed
- */
-export class VSash extends Disposable implements IVerticalSashLayoutProvider {
-	private sash: Sash;
-	private ratio: number;
-	private startPosition: number;
-	private position: number;
-	private dimension: Dimension;
-
-	private readonly _onPositionChange: Emitter<number> = new Emitter<number>();
-	get onPositionChange(): Event<number> { return this._onPositionChange.event; }
-
-	constructor(container: HTMLElement, private minWidth: number) {
-		super();
-
-		this.ratio = 0.5;
-		this.sash = new Sash(container, this);
-
-		this._register(this.sash.onDidStart(() => this.onSashDragStart()));
-		this._register(this.sash.onDidChange((e: ISashEvent) => this.onSashDrag(e)));
-		this._register(this.sash.onDidEnd(() => this.onSashDragEnd()));
-		this._register(this.sash.onDidReset(() => this.onSashReset()));
-	}
-
-	getVerticalSashTop(): number {
-		return 0;
-	}
-
-	getVerticalSashLeft(): number {
-		return this.position;
-	}
-
-	getVerticalSashHeight(): number {
-		return this.dimension.height;
-	}
-
-	setDimenesion(dimension: Dimension) {
-		this.dimension = dimension;
-		this.compute(this.ratio);
-	}
-
-	private onSashDragStart(): void {
-		this.startPosition = this.position;
-	}
-
-	private onSashDrag(e: ISashEvent): void {
-		this.compute((this.startPosition + (e.currentX - e.startX)) / this.dimension.width);
-	}
-
-	private compute(ratio: number) {
-		this.computeSashPosition(ratio);
-		this.ratio = this.position / this.dimension.width;
-		this._onPositionChange.fire(this.position);
-	}
-
-	private onSashDragEnd(): void {
-		this.sash.layout();
-	}
-
-	private onSashReset(): void {
-		this.compute(0.5);
-		this._onPositionChange.fire(this.position);
-		this.sash.layout();
-	}
-
-	private computeSashPosition(sashRatio: number = this.ratio) {
-		const contentWidth = this.dimension.width;
-		let sashPosition = Math.floor((sashRatio || 0.5) * contentWidth);
-		const midPoint = Math.floor(0.5 * contentWidth);
-
-		if (contentWidth > this.minWidth * 2) {
-			if (sashPosition < this.minWidth) {
-				sashPosition = this.minWidth;
-			}
-			if (sashPosition > contentWidth - this.minWidth) {
-				sashPosition = contentWidth - this.minWidth;
-			}
-		} else {
-			sashPosition = midPoint;
-		}
-		if (this.position !== sashPosition) {
-			this.position = sashPosition;
-			this.sash.layout();
-		}
 	}
 }
diff --git a/src/vs/base/browser/ui/scrollbar/scrollableElement.ts b/src/vs/base/browser/ui/scrollbar/scrollableElement.ts
index 5aafe0bd8a0..3d2f82a5cc7 100644
--- a/src/vs/base/browser/ui/scrollbar/scrollableElement.ts
+++ b/src/vs/base/browser/ui/scrollbar/scrollableElement.ts
@@ -163,6 +163,8 @@ export abstract class AbstractScrollableElement extends Widget {
 	private readonly _hideTimeout: TimeoutTimer;
 	private _shouldRender: boolean;
 
+	private _revealOnScroll: boolean;
+
 	private readonly _onScroll = this._register(new Emitter<ScrollEvent>());
 	public readonly onScroll: Event<ScrollEvent> = this._onScroll.event;
 
@@ -221,6 +223,8 @@ export abstract class AbstractScrollableElement extends Widget {
 		this._mouseIsOver = false;
 
 		this._shouldRender = true;
+
+		this._revealOnScroll = true;
 	}
 
 	public dispose(): void {
@@ -286,6 +290,10 @@ export abstract class AbstractScrollableElement extends Widget {
 		}
 	}
 
+	public setRevealOnScroll(value: boolean) {
+		this._revealOnScroll = value;
+	}
+
 	// -------------------- mouse wheel scrolling --------------------
 
 	private _setListeningToMouseWheel(shouldListen: boolean): void {
@@ -382,7 +390,9 @@ export abstract class AbstractScrollableElement extends Widget {
 			this._shouldRender = true;
 		}
 
-		this._reveal();
+		if (this._revealOnScroll) {
+			this._reveal();
+		}
 
 		if (!this._options.lazyRender) {
 			this._render();
diff --git a/src/vs/base/browser/ui/selectBox/selectBox.ts b/src/vs/base/browser/ui/selectBox/selectBox.ts
index 28828be39de..40a4d7c9a35 100644
--- a/src/vs/base/browser/ui/selectBox/selectBox.ts
+++ b/src/vs/base/browser/ui/selectBox/selectBox.ts
@@ -5,7 +5,6 @@
 
 import 'vs/css!./selectBox';
 
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { Event } from 'vs/base/common/event';
 import { Widget } from 'vs/base/browser/ui/widget';
 import { Color } from 'vs/base/common/color';
@@ -15,6 +14,7 @@ import { IListStyles } from 'vs/base/browser/ui/list/listWidget';
 import { SelectBoxNative } from 'vs/base/browser/ui/selectBox/selectBoxNative';
 import { SelectBoxList } from 'vs/base/browser/ui/selectBox/selectBoxCustom';
 import { isMacintosh } from 'vs/base/common/platform';
+import { IContentActionHandler } from 'vs/base/browser/htmlContentRenderer';
 
 // Public SelectBox interface - Calls routed to appropriate select implementation class
 
@@ -24,6 +24,8 @@ export interface ISelectBoxDelegate {
 	readonly onDidSelect: Event<ISelectData>;
 	setOptions(options: string[], selected?: number, disabled?: number): void;
 	select(index: number): void;
+	setAriaLabel(label: string);
+	setDetailsProvider(provider: (index: number) => { details: string, isMarkdown: boolean });
 	focus(): void;
 	blur(): void;
 	dispose(): void;
@@ -35,7 +37,10 @@ export interface ISelectBoxDelegate {
 }
 
 export interface ISelectBoxOptions {
+	ariaLabel?: string;
 	minBottomMargin?: number;
+	hasDetails?: boolean;
+	markdownActionHandler?: IContentActionHandler;
 }
 
 export interface ISelectBoxStyles extends IListStyles {
@@ -43,6 +48,7 @@ export interface ISelectBoxStyles extends IListStyles {
 	selectListBackground?: Color;
 	selectForeground?: Color;
 	selectBorder?: Color;
+	selectListBorder?: Color;
 	focusBorder?: Color;
 }
 
@@ -58,25 +64,22 @@ export interface ISelectData {
 }
 
 export class SelectBox extends Widget implements ISelectBoxDelegate {
-	private toDispose: IDisposable[];
 	private styles: ISelectBoxStyles;
 	private selectBoxDelegate: ISelectBoxDelegate;
 
 	constructor(options: string[], selected: number, contextViewProvider: IContextViewProvider, styles: ISelectBoxStyles = deepClone(defaultStyles), selectBoxOptions?: ISelectBoxOptions) {
 		super();
 
-		this.toDispose = [];
-
 		mixin(this.styles, defaultStyles, false);
 
 		// Instantiate select implementation based on platform
-		if (isMacintosh) {
-			this.selectBoxDelegate = new SelectBoxNative(options, selected, styles);
+		if (isMacintosh && !(selectBoxOptions && selectBoxOptions.hasDetails)) {
+			this.selectBoxDelegate = new SelectBoxNative(options, selected, styles, selectBoxOptions);
 		} else {
 			this.selectBoxDelegate = new SelectBoxList(options, selected, contextViewProvider, styles, selectBoxOptions);
 		}
 
-		this.toDispose.push(this.selectBoxDelegate);
+		this._register(this.selectBoxDelegate);
 	}
 
 	// Public SelectBox Methods - routed through delegate interface
@@ -93,6 +96,14 @@ export class SelectBox extends Widget implements ISelectBoxDelegate {
 		this.selectBoxDelegate.select(index);
 	}
 
+	public setAriaLabel(label: string): void {
+		this.selectBoxDelegate.setAriaLabel(label);
+	}
+
+	public setDetailsProvider(provider: (index: number) => { details: string, isMarkdown: boolean }): void {
+		this.selectBoxDelegate.setDetailsProvider(provider);
+	}
+
 	public focus(): void {
 		this.selectBoxDelegate.focus();
 	}
@@ -114,9 +125,4 @@ export class SelectBox extends Widget implements ISelectBoxDelegate {
 	public applyStyles(): void {
 		this.selectBoxDelegate.applyStyles();
 	}
-
-	public dispose(): void {
-		this.toDispose = dispose(this.toDispose);
-		super.dispose();
-	}
 }
\ No newline at end of file
diff --git a/src/vs/base/browser/ui/selectBox/selectBoxCustom.css b/src/vs/base/browser/ui/selectBox/selectBoxCustom.css
index 362b7beab18..9bf02542ec4 100644
--- a/src/vs/base/browser/ui/selectBox/selectBoxCustom.css
+++ b/src/vs/base/browser/ui/selectBox/selectBoxCustom.css
@@ -3,10 +3,41 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+/* Use custom CSS vars to expose padding into parent select for padding calculation */
+.monaco-select-box-dropdown-padding {
+	--dropdown-padding-top: 1px;
+	--dropdown-padding-bottom: 1px;
+}
+
+.hc-black .monaco-select-box-dropdown-padding {
+	--dropdown-padding-top: 3px;
+	--dropdown-padding-bottom: 4px;
+}
+
 .monaco-select-box-dropdown-container {
 	display: none;
+	-webkit-box-sizing:	border-box;
+	-o-box-sizing:		border-box;
+	-moz-box-sizing:	border-box;
+	-ms-box-sizing:		border-box;
+	box-sizing:			border-box;
 }
 
+.monaco-select-box-dropdown-container > .select-box-details-pane > .select-box-description-markdown * {
+	margin: 0;
+}
+
+.monaco-select-box-dropdown-container > .select-box-details-pane > .select-box-description-markdown a:focus {
+	outline: 1px solid -webkit-focus-ring-color;
+	outline-offset: -1px;
+}
+
+.monaco-select-box-dropdown-container > .select-box-details-pane > .select-box-description-markdown code {
+	line-height: 15px; /** For some reason, this is needed, otherwise <code> will take up 20px height */
+	font-family: Menlo, Monaco, Consolas, "Droid Sans Mono", "Courier New", monospace, "Droid Sans Fallback";
+}
+
+
 .monaco-select-box-dropdown-container.visible {
 	display: flex;
 	flex-direction: column;
@@ -18,8 +49,8 @@
 .monaco-select-box-dropdown-container > .select-box-dropdown-list-container {
 	flex: 0 0 auto;
 	align-self: flex-start;
-	padding-bottom: 1px;
-	padding-top: 1px;
+	padding-top: var(--dropdown-padding-top);
+	padding-bottom: var(--dropdown-padding-bottom);
 	padding-left: 1px;
 	padding-right: 1px;
 	width: 100%;
@@ -31,9 +62,13 @@
 	box-sizing:			border-box;
 }
 
+.monaco-select-box-dropdown-container > .select-box-details-pane {
+	padding: 5px;
+}
+
 .hc-black .monaco-select-box-dropdown-container > .select-box-dropdown-list-container {
-	padding-bottom: 4px;
-	padding-top: 3px;
+	padding-top: var(--dropdown-padding-top);
+	padding-bottom: var(--dropdown-padding-bottom);
 }
 
 .monaco-select-box-dropdown-container > .select-box-dropdown-list-container .monaco-list .monaco-list-row > .option-text {
@@ -43,6 +78,10 @@
 	white-space: nowrap;
 }
 
+.monaco-select-box-dropdown-container > .select-box-dropdown-list-container .monaco-list .monaco-list-row > .option-text-description {
+	display: none;
+}
+
 .monaco-select-box-dropdown-container > .select-box-dropdown-container-width-control {
 	flex: 1 1 auto;
 	align-self: flex-start;
diff --git a/src/vs/base/browser/ui/selectBox/selectBoxCustom.ts b/src/vs/base/browser/ui/selectBox/selectBoxCustom.ts
index d77c5cfd599..38d320fa647 100644
--- a/src/vs/base/browser/ui/selectBox/selectBoxCustom.ts
+++ b/src/vs/base/browser/ui/selectBox/selectBoxCustom.ts
@@ -12,13 +12,14 @@ import { KeyCode, KeyCodeUtils } from 'vs/base/common/keyCodes';
 import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
 import * as dom from 'vs/base/browser/dom';
 import * as arrays from 'vs/base/common/arrays';
-import { IContextViewProvider } from 'vs/base/browser/ui/contextview/contextview';
+import { IContextViewProvider, AnchorPosition } from 'vs/base/browser/ui/contextview/contextview';
 import { List } from 'vs/base/browser/ui/list/listWidget';
-import { IDelegate, IRenderer } from 'vs/base/browser/ui/list/list';
+import { IVirtualDelegate, IRenderer, IListEvent } from 'vs/base/browser/ui/list/list';
 import { domEvent } from 'vs/base/browser/event';
 import { ScrollbarVisibility } from 'vs/base/common/scrollable';
 import { ISelectBoxDelegate, ISelectBoxOptions, ISelectBoxStyles, ISelectData } from 'vs/base/browser/ui/selectBox/selectBox';
 import { isMacintosh } from 'vs/base/common/platform';
+import { renderMarkdown } from 'vs/base/browser/htmlContentRenderer';
 
 const $ = dom.$;
 
@@ -26,12 +27,14 @@ const SELECT_OPTION_ENTRY_TEMPLATE_ID = 'selectOption.entry.template';
 
 export interface ISelectOptionItem {
 	optionText: string;
+	optionDescriptionText?: string;
 	optionDisabled: boolean;
 }
 
 interface ISelectListTemplateData {
 	root: HTMLElement;
 	optionText: HTMLElement;
+	optionDescriptionText: HTMLElement;
 	disposables: IDisposable[];
 }
 
@@ -46,6 +49,7 @@ class SelectListRenderer implements IRenderer<ISelectOptionItem, ISelectListTemp
 		data.disposables = [];
 		data.root = container;
 		data.optionText = dom.append(container, $('.option-text'));
+		data.optionDescriptionText = dom.append(container, $('.option-text-description'));
 
 		return data;
 	}
@@ -56,7 +60,17 @@ class SelectListRenderer implements IRenderer<ISelectOptionItem, ISelectListTemp
 		const optionDisabled = (<ISelectOptionItem>element).optionDisabled;
 
 		data.optionText.textContent = optionText;
-		data.root.setAttribute('aria-label', nls.localize('selectAriaOption', "{0}", optionText));
+		data.root.setAttribute('aria-label', nls.localize('selectAriaOption', "{0}", optionText) + ',.');
+
+		if (typeof element.optionDescriptionText === 'string') {
+			const optionDescriptionId = (optionText.replace(/ /g, '_').toLowerCase() + '_description_' + data.root.id);
+			data.root.setAttribute('aria-describedby', optionDescriptionId);
+			data.optionDescriptionText.id = optionDescriptionId;
+			data.optionDescriptionText.setAttribute('aria-label', element.optionDescriptionText);
+		}
+
+		// Workaround for list labels
+		data.root.setAttribute('aria-selected', 'true');
 
 		// pseudo-select disabled option
 		if (optionDisabled) {
@@ -67,14 +81,20 @@ class SelectListRenderer implements IRenderer<ISelectOptionItem, ISelectListTemp
 		}
 	}
 
+	disposeElement(): void {
+		// noop
+	}
+
 	disposeTemplate(templateData: ISelectListTemplateData): void {
 		templateData.disposables = dispose(templateData.disposables);
 	}
 }
 
-export class SelectBoxList implements ISelectBoxDelegate, IDelegate<ISelectOptionItem> {
+export class SelectBoxList implements ISelectBoxDelegate, IVirtualDelegate<ISelectOptionItem> {
 
 	private static readonly DEFAULT_DROPDOWN_MINIMUM_BOTTOM_MARGIN = 32;
+	private static readonly DEFAULT_DROPDOWN_MINIMUM_TOP_MARGIN = 2;
+	private static readonly DEFAULT_MINIMUM_VISIBLE_OPTIONS = 3;
 
 	private _isVisible: boolean;
 	private selectBoxOptions: ISelectBoxOptions;
@@ -93,6 +113,12 @@ export class SelectBoxList implements ISelectBoxDelegate, IDelegate<ISelectOptio
 	private selectDropDownListContainer: HTMLElement;
 	private widthControlElement: HTMLElement;
 	private _currentSelection: number;
+	private _dropDownPosition: AnchorPosition;
+	private detailsProvider: (index: number) => { details: string, isMarkdown: boolean };
+	private selectionDetailsPane: HTMLElement;
+	private _skipLayout: boolean = false;
+
+	private _sticky: boolean = false; // for dev purposes only
 
 	constructor(options: string[], selected: number, contextViewProvider: IContextViewProvider, styles: ISelectBoxStyles, selectBoxOptions?: ISelectBoxOptions) {
 
@@ -107,9 +133,16 @@ export class SelectBoxList implements ISelectBoxDelegate, IDelegate<ISelectOptio
 		}
 
 		this.selectElement = document.createElement('select');
-		this.selectElement.className = 'monaco-select-box';
+		// Use custom CSS vars for padding calculation
+		this.selectElement.className = 'monaco-select-box monaco-select-box-dropdown-padding';
+
+		if (typeof this.selectBoxOptions.ariaLabel === 'string') {
+			this.selectElement.setAttribute('aria-label', this.selectBoxOptions.ariaLabel);
+		}
 
 		this._onDidSelect = new Emitter<ISelectData>();
+		this.toDispose.push(this._onDidSelect);
+
 		this.styles = styles;
 
 		this.registerListeners();
@@ -133,9 +166,11 @@ export class SelectBoxList implements ISelectBoxDelegate, IDelegate<ISelectOptio
 		// SetUp ContextView container to hold select Dropdown
 		this.contextViewProvider = contextViewProvider;
 		this.selectDropDownContainer = dom.$('.monaco-select-box-dropdown-container');
-
+		// Use custom CSS vars for padding calculation (shared with parent select)
+		dom.addClass(this.selectDropDownContainer, 'monaco-select-box-dropdown-padding');
 		// Setup list for drop-down select
 		this.createSelectList(this.selectDropDownContainer);
+		this.selectionDetailsPane = dom.append(this.selectDropDownContainer, $('.select-box-details-pane'));
 
 		// Create span flex box item/div we can measure and control
 		let widthControlOuterDiv = dom.append(this.selectDropDownContainer, $('.select-box-dropdown-container-width-control'));
@@ -144,6 +179,9 @@ export class SelectBoxList implements ISelectBoxDelegate, IDelegate<ISelectOptio
 		this.widthControlElement.className = 'option-text-width-control';
 		dom.append(widthControlInnerDiv, this.widthControlElement);
 
+		// Always default to below position
+		this._dropDownPosition = AnchorPosition.BELOW;
+
 		// Inline stylesheet for themes
 		this.styleElement = dom.createStyleSheet(this.selectDropDownContainer);
 	}
@@ -154,6 +192,7 @@ export class SelectBoxList implements ISelectBoxDelegate, IDelegate<ISelectOptio
 
 		this.toDispose.push(dom.addStandardDisposableListener(this.selectElement, 'change', (e) => {
 			this.selectElement.title = e.target.value;
+			this.selected = e.target.selectedIndex;
 			this._onDidSelect.fire({
 				index: e.target.selectedIndex,
 				selected: e.target.value
@@ -229,7 +268,9 @@ export class SelectBoxList implements ISelectBoxDelegate, IDelegate<ISelectOptio
 					const element = this.options[index];
 					let optionDisabled: boolean;
 					index === this.disabledOptionIndex ? optionDisabled = true : optionDisabled = false;
-					listEntries.push({ optionText: element, optionDisabled: optionDisabled });
+					const optionDescription = this.detailsProvider ? this.detailsProvider(index) : { details: null, isMarkdown: false };
+
+					listEntries.push({ optionText: element, optionDisabled: optionDisabled, optionDescriptionText: optionDescription.details });
 				}
 
 				this.selectList.splice(0, this.selectList.length, listEntries);
@@ -238,6 +279,8 @@ export class SelectBoxList implements ISelectBoxDelegate, IDelegate<ISelectOptio
 
 		if (selected !== undefined) {
 			this.select(selected);
+			// Set current = selected since this is not necessarily a user exit
+			this._currentSelection = this.selected;
 		}
 	}
 
@@ -257,6 +300,24 @@ export class SelectBoxList implements ISelectBoxDelegate, IDelegate<ISelectOptio
 		this.selectElement.title = this.options[this.selected];
 	}
 
+	public setAriaLabel(label: string): void {
+		this.selectBoxOptions.ariaLabel = label;
+		this.selectElement.setAttribute('aria-label', this.selectBoxOptions.ariaLabel);
+		this.selectList.getHTMLElement().setAttribute('aria-label', this.selectBoxOptions.ariaLabel);
+	}
+
+	public setDetailsProvider(provider: (index: number) => { details: string, isMarkdown: boolean }): void {
+		this.detailsProvider = provider;
+
+
+		if (this.options) {
+			const currentOptions = this.options;
+			this.options = [];
+			this.setOptions(currentOptions, this.selected, this.disabledOptionIndex);
+		}
+
+	}
+
 	public focus(): void {
 		if (this.selectElement) {
 			this.selectElement.focus();
@@ -292,6 +353,17 @@ export class SelectBoxList implements ISelectBoxDelegate, IDelegate<ISelectOptio
 			content.push(`.monaco-select-box-dropdown-container > .select-box-dropdown-list-container .monaco-list .monaco-list-row.focused:not(:hover) { color: ${this.styles.listFocusForeground} !important; }`);
 		}
 
+		if (!this.styles.selectBorder.equals(this.styles.selectBackground)) {
+			content.push(`.monaco-select-box-dropdown-container { border: 1px solid ${this.styles.selectBorder} } `);
+			content.push(`.monaco-select-box-dropdown-container > .select-box-details-pane.border-top { border-top: 1px solid ${this.styles.selectBorder} } `);
+			content.push(`.monaco-select-box-dropdown-container > .select-box-details-pane.border-bottom { border-bottom: 1px solid ${this.styles.selectBorder} } `);
+
+		}
+		else if (this.styles.selectListBorder) {
+			content.push(`.monaco-select-box-dropdown-container > .select-box-details-pane.border-top { border-top: 1px solid ${this.styles.selectListBorder} } `);
+			content.push(`.monaco-select-box-dropdown-container > .select-box-details-pane.border-bottom { border-bottom: 1px solid ${this.styles.selectListBorder} } `);
+		}
+
 		// Hover foreground - ignore for disabled options
 		if (this.styles.listHoverForeground) {
 			content.push(`.monaco-select-box-dropdown-container > .select-box-dropdown-list-container .monaco-list .monaco-list-row:hover { color: ${this.styles.listHoverForeground} !important; }`);
@@ -307,6 +379,7 @@ export class SelectBoxList implements ISelectBoxDelegate, IDelegate<ISelectOptio
 		// Match quickOpen outline styles - ignore for disabled options
 		if (this.styles.listFocusOutline) {
 			content.push(`.monaco-select-box-dropdown-container > .select-box-dropdown-list-container .monaco-list .monaco-list-row.focused { outline: 1.6px dotted ${this.styles.listFocusOutline} !important; outline-offset: -1.6px !important; }`);
+
 		}
 
 		if (this.styles.listHoverOutline) {
@@ -342,6 +415,7 @@ export class SelectBoxList implements ISelectBoxDelegate, IDelegate<ISelectOptio
 
 			let listBackground = this.styles.selectListBackground ? this.styles.selectListBackground.toString() : background;
 			this.selectDropDownListContainer.style.backgroundColor = listBackground;
+			this.selectionDetailsPane.style.backgroundColor = listBackground;
 			const optionsBorder = this.styles.focusBorder ? this.styles.focusBorder.toString() : null;
 			this.selectDropDownContainer.style.outlineColor = optionsBorder;
 			this.selectDropDownContainer.style.outlineOffset = '-1px';
@@ -357,7 +431,6 @@ export class SelectBoxList implements ISelectBoxDelegate, IDelegate<ISelectOptio
 		return option;
 	}
 
-	// Non-native select list handling
 	// ContextView dropdown methods
 
 	private showSelectDropDown() {
@@ -365,8 +438,29 @@ export class SelectBoxList implements ISelectBoxDelegate, IDelegate<ISelectOptio
 			return;
 		}
 
-		this._isVisible = true;
 		this.cloneElementFont(this.selectElement, this.selectDropDownContainer);
+
+		// This allows us to flip the position based on measurement
+		// Set drop-down position above/below from required height and margins
+		// If pre-layout cannot fit at least one option do not show drop-down
+
+		this.contextViewProvider.showContextView({
+			getAnchor: () => this.selectElement,
+			render: (container: HTMLElement) => this.renderSelectDropDown(container, true),
+			layout: () => {
+				this.layoutSelectDropDown();
+			},
+			onHide: () => {
+				dom.toggleClass(this.selectDropDownContainer, 'visible', false);
+				dom.toggleClass(this.selectElement, 'synthetic-focus', false);
+			},
+			anchorPosition: this._dropDownPosition
+		});
+
+		// Hide so we can relay out
+		this._isVisible = true;
+		this.hideSelectDropDown(false);
+
 		this.contextViewProvider.showContextView({
 			getAnchor: () => this.selectElement,
 			render: (container: HTMLElement) => this.renderSelectDropDown(container),
@@ -374,9 +468,13 @@ export class SelectBoxList implements ISelectBoxDelegate, IDelegate<ISelectOptio
 			onHide: () => {
 				dom.toggleClass(this.selectDropDownContainer, 'visible', false);
 				dom.toggleClass(this.selectElement, 'synthetic-focus', false);
-			}
+			},
+			anchorPosition: this._dropDownPosition
 		});
+
+		// Track initial selection the case user escape, blur
 		this._currentSelection = this.selected;
+		this._isVisible = true;
 	}
 
 	private hideSelectDropDown(focusSelect: boolean) {
@@ -389,68 +487,218 @@ export class SelectBoxList implements ISelectBoxDelegate, IDelegate<ISelectOptio
 		if (focusSelect) {
 			this.selectElement.focus();
 		}
+
 		this.contextViewProvider.hideContextView();
 	}
 
-	private renderSelectDropDown(container: HTMLElement): IDisposable {
+	private renderSelectDropDown(container: HTMLElement, preLayoutPosition?: boolean): IDisposable {
 		container.appendChild(this.selectDropDownContainer);
 
-		this.layoutSelectDropDown();
+		// Pre-Layout allows us to change position
+		this.layoutSelectDropDown(preLayoutPosition);
+
 		return {
-			dispose: () => container.removeChild(this.selectDropDownContainer) // remove to take out the CSS rules we add
+			dispose: () => {
+				// contextView will dispose itself if moving from one View to another
+				try {
+					container.removeChild(this.selectDropDownContainer); // remove to take out the CSS rules we add
+				}
+				catch (error) {
+					// Ignore, removed already by change of focus
+				}
+			}
 		};
 	}
 
-	private layoutSelectDropDown() {
+	// Iterate over detailed descriptions, find max height
+	private measureMaxDetailsHeight(): number {
 
-		// Layout ContextView drop down select list and container
-		// Have to manage our vertical overflow, sizing
-		// Need to be visible to measure
-
-		dom.toggleClass(this.selectDropDownContainer, 'visible', true);
-
-		const selectWidth = dom.getTotalWidth(this.selectElement);
-		const selectPosition = dom.getDomNodePagePosition(this.selectElement);
-
-		// Set container height to max from select bottom to margin (default/minBottomMargin)
-		let maxSelectDropDownHeight = (window.innerHeight - selectPosition.top - selectPosition.height - this.selectBoxOptions.minBottomMargin);
-
-		if (maxSelectDropDownHeight < 0) {
-			maxSelectDropDownHeight = 0;
+		if (!this.detailsProvider) {
+			return 0;
 		}
 
-		// SetUp list dimensions and layout - account for container padding
-		if (this.selectList) {
-			this.selectList.layout();
-			let listHeight = this.selectList.contentHeight;
-			const listContainerHeight = dom.getTotalHeight(this.selectDropDownListContainer);
-			const totalVerticalListPadding = listContainerHeight - listHeight;
+		let maxDetailsPaneHeight = 0;
+		let description = { details: '', isMarkdown: false };
 
-			// Always show complete list items - never more than Max available vertical height
-			if (listContainerHeight > maxSelectDropDownHeight) {
-				listHeight = ((Math.floor((maxSelectDropDownHeight - totalVerticalListPadding) / this.getHeight())) * this.getHeight());
+		this.options.forEach((option, index) => {
+
+			this.selectionDetailsPane.innerText = '';
+
+			description = this.detailsProvider ? this.detailsProvider(index) : { details: '', isMarkdown: false };
+			if (description.details) {
+				if (description.isMarkdown) {
+					this.selectionDetailsPane.appendChild(this.renderDescriptionMarkdown(description.details));
+				} else {
+					this.selectionDetailsPane.innerText = description.details;
+				}
+				this.selectionDetailsPane.style.display = 'block';
+			} else {
+				this.selectionDetailsPane.style.display = 'none';
 			}
 
+			if (this.selectionDetailsPane.offsetHeight > maxDetailsPaneHeight) {
+				maxDetailsPaneHeight = this.selectionDetailsPane.offsetHeight;
+			}
+		});
+
+		// Reset description to selected
+		description = this.detailsProvider ? this.detailsProvider(this.selected) : { details: '', isMarkdown: false };
+		this.selectionDetailsPane.innerText = '';
+
+		if (description.details) {
+			if (description.isMarkdown) {
+				this.selectionDetailsPane.appendChild(this.renderDescriptionMarkdown(description.details));
+			} else {
+				this.selectionDetailsPane.innerText = description.details;
+			}
+			this.selectionDetailsPane.style.display = 'block';
+		}
+
+		return maxDetailsPaneHeight;
+	}
+
+	private layoutSelectDropDown(preLayoutPosition?: boolean): boolean {
+
+		// Avoid recursion from layout called in onListFocus
+		if (this._skipLayout) {
+			return false;
+		}
+
+		// Layout ContextView drop down select list and container
+		// Have to manage our vertical overflow, sizing, position below or above
+		// Position has to be determined and set prior to contextView instantiation
+
+		if (this.selectList) {
+
+			// Make visible to enable measurements
+			dom.toggleClass(this.selectDropDownContainer, 'visible', true);
+
+			const selectPosition = dom.getDomNodePagePosition(this.selectElement);
+			const styles = getComputedStyle(this.selectElement);
+			const verticalPadding = parseFloat(styles.getPropertyValue('--dropdown-padding-top')) + parseFloat(styles.getPropertyValue('--dropdown-padding-bottom'));
+			const maxSelectDropDownHeightBelow = (window.innerHeight - selectPosition.top - selectPosition.height - this.selectBoxOptions.minBottomMargin);
+			const maxSelectDropDownHeightAbove = (selectPosition.top - SelectBoxList.DEFAULT_DROPDOWN_MINIMUM_TOP_MARGIN);
+
+			// Determine optimal width - min(longest option), opt(parent select, excluding margins), max(ContextView controlled)
+			const selectWidth = this.selectElement.offsetWidth;
+			const selectMinWidth = this.setWidthControlElement(this.widthControlElement);
+			const selectOptimalWidth = Math.max(selectMinWidth, Math.round(selectWidth)).toString() + 'px';
+
+			this.selectDropDownContainer.style.width = selectOptimalWidth;
+
+			// Get initial list height and determine space ab1you knowove and below
+			this.selectList.layout();
+			let listHeight = this.selectList.contentHeight;
+
+			const maxDetailsPaneHeight = this.measureMaxDetailsHeight();
+
+			const minRequiredDropDownHeight = listHeight + verticalPadding + maxDetailsPaneHeight;
+			const maxVisibleOptionsBelow = ((Math.floor((maxSelectDropDownHeightBelow - verticalPadding - maxDetailsPaneHeight) / this.getHeight())));
+			const maxVisibleOptionsAbove = ((Math.floor((maxSelectDropDownHeightAbove - verticalPadding - maxDetailsPaneHeight) / this.getHeight())));
+
+			// If we are only doing pre-layout check/adjust position only
+			// Calculate vertical space available, flip up if insufficient
+			// Use reflected padding on parent select, ContextView style
+			// properties not available before DOM attachment
+
+			if (preLayoutPosition) {
+
+				// Check if select moved out of viewport , do not open
+				// If at least one option cannot be shown, don't open the drop-down or hide/remove if open
+
+				if ((selectPosition.top + selectPosition.height) > (window.innerHeight - 22)
+					|| selectPosition.top < SelectBoxList.DEFAULT_DROPDOWN_MINIMUM_TOP_MARGIN
+					|| ((maxVisibleOptionsBelow < 1) && (maxVisibleOptionsAbove < 1))) {
+					// Indicate we cannot open
+					return false;
+				}
+
+				// Determine if we have to flip up
+				// Always show complete list items - never more than Max available vertical height
+				if (maxVisibleOptionsBelow < SelectBoxList.DEFAULT_MINIMUM_VISIBLE_OPTIONS
+					&& maxVisibleOptionsAbove > maxVisibleOptionsBelow
+					&& this.options.length > maxVisibleOptionsBelow
+				) {
+					this._dropDownPosition = AnchorPosition.ABOVE;
+					this.selectDropDownContainer.removeChild(this.selectDropDownListContainer);
+					this.selectDropDownContainer.removeChild(this.selectionDetailsPane);
+					this.selectDropDownContainer.appendChild(this.selectionDetailsPane);
+					this.selectDropDownContainer.appendChild(this.selectDropDownListContainer);
+
+					dom.removeClass(this.selectionDetailsPane, 'border-top');
+					dom.addClass(this.selectionDetailsPane, 'border-bottom');
+
+				} else {
+					this._dropDownPosition = AnchorPosition.BELOW;
+					this.selectDropDownContainer.removeChild(this.selectDropDownListContainer);
+					this.selectDropDownContainer.removeChild(this.selectionDetailsPane);
+					this.selectDropDownContainer.appendChild(this.selectDropDownListContainer);
+					this.selectDropDownContainer.appendChild(this.selectionDetailsPane);
+
+					dom.removeClass(this.selectionDetailsPane, 'border-bottom');
+					dom.addClass(this.selectionDetailsPane, 'border-top');
+				}
+				// Do full layout on showSelectDropDown only
+				return true;
+			}
+
+			// Check if select out of viewport or cutting into status bar
+			if ((selectPosition.top + selectPosition.height) > (window.innerHeight - 22)
+				|| selectPosition.top < SelectBoxList.DEFAULT_DROPDOWN_MINIMUM_TOP_MARGIN
+				|| (this._dropDownPosition === AnchorPosition.BELOW && maxVisibleOptionsBelow < 1)
+				|| (this._dropDownPosition === AnchorPosition.ABOVE && maxVisibleOptionsAbove < 1)) {
+				// Cannot properly layout, close and hide
+				this.hideSelectDropDown(true);
+				return false;
+			}
+
+			// SetUp list dimensions and layout - account for container padding
+			// Use position to check above or below available space
+			if (this._dropDownPosition === AnchorPosition.BELOW) {
+				if (this._isVisible && maxVisibleOptionsBelow + maxVisibleOptionsAbove < 1) {
+					// If drop-down is visible, must be doing a DOM re-layout, hide since we don't fit
+					// Hide drop-down, hide contextview, focus on parent select
+					this.hideSelectDropDown(true);
+					return false;
+				}
+
+				// Adjust list height to max from select bottom to margin (default/minBottomMargin)
+				if (minRequiredDropDownHeight > maxSelectDropDownHeightBelow) {
+					listHeight = (maxVisibleOptionsBelow * this.getHeight());
+				}
+			} else {
+				if (minRequiredDropDownHeight > maxSelectDropDownHeightAbove) {
+					listHeight = (maxVisibleOptionsAbove * this.getHeight());
+				}
+			}
+
+			// Set adjusted list height and relayout
 			this.selectList.layout(listHeight);
 			this.selectList.domFocus();
 
 			// Finally set focus on selected item
-			this.selectList.setFocus([this.selected]);
-			this.selectList.reveal(this.selectList.getFocus()[0]);
+			if (this.selectList.length > 0) {
+				this.selectList.setFocus([this.selected || 0]);
+				this.selectList.reveal(this.selectList.getFocus()[0] || 0);
+			}
 
-			// Set final container height after adjustments
-			this.selectDropDownContainer.style.height = (listHeight + totalVerticalListPadding) + 'px';
+			if (this.detailsProvider) {
+				// Leave the selectDropDownContainer to size itself according to children (list + details) - #57447
+				this.selectList.getHTMLElement().style.height = (listHeight + verticalPadding) + 'px';
+			} else {
+				this.selectDropDownContainer.style.height = (listHeight + verticalPadding) + 'px';
+			}
 
-			// Determine optimal width - min(longest option), opt(parent select), max(ContextView controlled)
-			const selectMinWidth = this.setWidthControlElement(this.widthControlElement);
-			const selectOptimalWidth = Math.max(selectMinWidth, Math.round(selectWidth)).toString() + 'px';
-
-			this.selectDropDownContainer.style.minWidth = selectOptimalWidth;
+			this.selectDropDownContainer.style.width = selectOptimalWidth;
 
 			// Maintain focus outline on parent select as well as list container - tabindex for focus
 			this.selectDropDownListContainer.setAttribute('tabindex', '0');
 			dom.toggleClass(this.selectElement, 'synthetic-focus', true);
 			dom.toggleClass(this.selectDropDownContainer, 'synthetic-focus', true);
+
+			return true;
+		} else {
+			return false;
 		}
 	}
 
@@ -488,6 +736,7 @@ export class SelectBoxList implements ISelectBoxDelegate, IDelegate<ISelectOptio
 		this.listRenderer = new SelectListRenderer();
 
 		this.selectList = new List(this.selectDropDownListContainer, this, [this.listRenderer], {
+			ariaLabel: this.selectBoxOptions.ariaLabel,
 			useShadows: false,
 			selectOnMouseDown: false,
 			verticalScrollMode: ScrollbarVisibility.Visible,
@@ -516,14 +765,22 @@ export class SelectBoxList implements ISelectBoxDelegate, IDelegate<ISelectOptio
 			.filter(() => this.selectList.length > 0)
 			.on(e => this.onMouseUp(e), this, this.toDispose);
 
-		this.toDispose.push(this.selectList.onDidBlur(e => this.onListBlur()));
+		this.toDispose.push(
+			this.selectList.onDidBlur(e => this.onListBlur()),
+			this.selectList.onMouseOver(e => this.selectList.setFocus([e.index])),
+			this.selectList.onFocusChange(e => this.onListFocus(e))
+		);
+
+		this.selectList.getHTMLElement().setAttribute('aria-expanded', 'true');
 	}
 
 	// List methods
 
-	// List mouse controller - active exit, select option, fire onDidSelect, return focus to parent select
+	// List mouse controller - active exit, select option, fire onDidSelect if change, return focus to parent select
 	private onMouseUp(e: MouseEvent): void {
 
+		dom.EventHelper.stop(e);
+
 		// Check our mouse event is on an option (not scrollbar)
 		if (!e.toElement.classList.contains('option-text')) {
 			return;
@@ -540,59 +797,110 @@ export class SelectBoxList implements ISelectBoxDelegate, IDelegate<ISelectOptio
 
 			this.selectList.setFocus([this.selected]);
 			this.selectList.reveal(this.selectList.getFocus()[0]);
-			this._onDidSelect.fire({
-				index: this.selectElement.selectedIndex,
-				selected: this.selectElement.title
-			});
 
-			// Reset Selection Handler
-			this._currentSelection = -1;
+			// Only fire if selection change
+			if (this.selected !== this._currentSelection) {
+				// Set current = selected
+				this._currentSelection = this.selected;
+
+				this._onDidSelect.fire({
+					index: this.selectElement.selectedIndex,
+					selected: this.selectElement.title
+				});
+			}
+
 			this.hideSelectDropDown(true);
 		}
-		dom.EventHelper.stop(e);
 	}
 
-	// List Exit - passive - hide drop-down, fire onDidSelect
+	// List Exit - passive - implicit no selection change, hide drop-down
 	private onListBlur(): void {
-
-		if (this._currentSelection >= 0) {
+		if (this._sticky) { return; }
+		if (this.selected !== this._currentSelection) {
+			// Reset selected to current if no change
 			this.select(this._currentSelection);
 		}
 
-		this._onDidSelect.fire({
-			index: this.selectElement.selectedIndex,
-			selected: this.selectElement.title
-		});
-
 		this.hideSelectDropDown(false);
 	}
 
-	// List keyboard controller
-	// List exit - active - hide ContextView dropdown, return focus to parent select, fire onDidSelect
-	private onEscape(e: StandardKeyboardEvent): void {
-		dom.EventHelper.stop(e);
-		this.select(this._currentSelection);
 
-		this.hideSelectDropDown(true);
+	private renderDescriptionMarkdown(text: string): HTMLElement {
+		const cleanRenderedMarkdown = (element: Node) => {
+			for (let i = 0; i < element.childNodes.length; i++) {
+				const child = element.childNodes.item(i);
 
-		this._onDidSelect.fire({
-			index: this.selectElement.selectedIndex,
-			selected: this.selectElement.title
+				const tagName = (<Element>child).tagName && (<Element>child).tagName.toLowerCase();
+				if (tagName === 'img') {
+					element.removeChild(child);
+				} else {
+					cleanRenderedMarkdown(child);
+				}
+			}
+		};
+
+		const renderedMarkdown = renderMarkdown({ value: text }, {
+			actionHandler: this.selectBoxOptions.markdownActionHandler
 		});
+
+		renderedMarkdown.classList.add('select-box-description-markdown');
+		cleanRenderedMarkdown(renderedMarkdown);
+
+		return renderedMarkdown;
 	}
 
-	// List exit - active - hide ContextView dropdown, return focus to parent select, fire onDidSelect
+	// List Focus Change - passive - update details pane with newly focused element's data
+	private onListFocus(e: IListEvent<ISelectOptionItem>) {
+		// Skip during initial layout
+		if (!this._isVisible) {
+			return;
+		}
+		this.selectionDetailsPane.innerText = '';
+		const selectedIndex = e.indexes[0];
+		let description = this.detailsProvider ? this.detailsProvider(selectedIndex) : { details: '', isMarkdown: false };
+		if (description.details) {
+			if (description.isMarkdown) {
+				this.selectionDetailsPane.appendChild(this.renderDescriptionMarkdown(description.details));
+			} else {
+				this.selectionDetailsPane.innerText = description.details;
+			}
+			this.selectionDetailsPane.style.display = 'block';
+		} else {
+			this.selectionDetailsPane.style.display = 'none';
+		}
+
+		// Avoid recursion
+		this._skipLayout = true;
+		this.contextViewProvider.layout();
+		this._skipLayout = false;
+
+	}
+
+	// List keyboard controller
+
+	// List exit - active - hide ContextView dropdown, reset selection, return focus to parent select
+	private onEscape(e: StandardKeyboardEvent): void {
+		dom.EventHelper.stop(e);
+
+		// Reset selection to value when opened
+		this.select(this._currentSelection);
+		this.hideSelectDropDown(true);
+	}
+
+	// List exit - active - hide ContextView dropdown, return focus to parent select, fire onDidSelect if change
 	private onEnter(e: StandardKeyboardEvent): void {
 		dom.EventHelper.stop(e);
 
-		// Reset current selection
-		this._currentSelection = -1;
+		// Only fire if selection change
+		if (this.selected !== this._currentSelection) {
+			this._currentSelection = this.selected;
+			this._onDidSelect.fire({
+				index: this.selectElement.selectedIndex,
+				selected: this.selectElement.title
+			});
+		}
 
 		this.hideSelectDropDown(true);
-		this._onDidSelect.fire({
-			index: this.selectElement.selectedIndex,
-			selected: this.selectElement.title
-		});
 	}
 
 	// List navigation - have to handle a disabled option (jump over)
diff --git a/src/vs/base/browser/ui/selectBox/selectBoxNative.ts b/src/vs/base/browser/ui/selectBox/selectBoxNative.ts
index c16bd47e0f3..4f40f01aad6 100644
--- a/src/vs/base/browser/ui/selectBox/selectBoxNative.ts
+++ b/src/vs/base/browser/ui/selectBox/selectBoxNative.ts
@@ -8,31 +8,37 @@ import { Event, Emitter } from 'vs/base/common/event';
 import { KeyCode } from 'vs/base/common/keyCodes';
 import * as dom from 'vs/base/browser/dom';
 import * as arrays from 'vs/base/common/arrays';
-import { ISelectBoxDelegate, ISelectBoxStyles, ISelectData } from 'vs/base/browser/ui/selectBox/selectBox';
+import { ISelectBoxDelegate, ISelectBoxOptions, ISelectBoxStyles, ISelectData } from 'vs/base/browser/ui/selectBox/selectBox';
 import { isMacintosh } from 'vs/base/common/platform';
 
 export class SelectBoxNative implements ISelectBoxDelegate {
 
 	private selectElement: HTMLSelectElement;
+	private selectBoxOptions: ISelectBoxOptions;
 	private options: string[];
 	private selected: number;
 	private readonly _onDidSelect: Emitter<ISelectData>;
 	private toDispose: IDisposable[];
 	private styles: ISelectBoxStyles;
 
-	constructor(options: string[], selected: number, styles: ISelectBoxStyles) {
+	constructor(options: string[], selected: number, styles: ISelectBoxStyles, selectBoxOptions?: ISelectBoxOptions) {
 
 		this.toDispose = [];
+		this.selectBoxOptions = selectBoxOptions || Object.create(null);
 
 		this.selectElement = document.createElement('select');
 		this.selectElement.className = 'monaco-select-box';
 
+		if (typeof this.selectBoxOptions.ariaLabel === 'string') {
+			this.selectElement.setAttribute('aria-label', this.selectBoxOptions.ariaLabel);
+		}
+
 		this._onDidSelect = new Emitter<ISelectData>();
+		this.toDispose.push(this._onDidSelect);
 
 		this.styles = styles;
 
 		this.registerListeners();
-
 		this.setOptions(options, selected);
 	}
 
@@ -103,6 +109,15 @@ export class SelectBoxNative implements ISelectBoxDelegate {
 		this.selectElement.title = this.options[this.selected];
 	}
 
+	public setAriaLabel(label: string): void {
+		this.selectBoxOptions.ariaLabel = label;
+		this.selectElement.setAttribute('aria-label', label);
+	}
+
+	public setDetailsProvider(provider: any): void {
+		console.error('details are not available for native select boxes');
+	}
+
 	public focus(): void {
 		if (this.selectElement) {
 			this.selectElement.focus();
diff --git a/src/vs/base/browser/ui/splitview/panelview.ts b/src/vs/base/browser/ui/splitview/panelview.ts
index 31ad491bac6..78968d7def0 100644
--- a/src/vs/base/browser/ui/splitview/panelview.ts
+++ b/src/vs/base/browser/ui/splitview/panelview.ts
@@ -6,12 +6,12 @@
 'use strict';
 
 import 'vs/css!./panelview';
-import { IDisposable, dispose, combinedDisposable } from 'vs/base/common/lifecycle';
+import { IDisposable, dispose, combinedDisposable, Disposable } from 'vs/base/common/lifecycle';
 import { Event, Emitter, chain } from 'vs/base/common/event';
 import { domEvent } from 'vs/base/browser/event';
 import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
 import { KeyCode } from 'vs/base/common/keyCodes';
-import { $, append, addClass, removeClass, toggleClass, trackFocus } from 'vs/base/browser/dom';
+import { $, append, addClass, removeClass, toggleClass, trackFocus, scheduleAtNextAnimationFrame } from 'vs/base/browser/dom';
 import { firstIndex } from 'vs/base/common/arrays';
 import { Color, RGBA } from 'vs/base/common/color';
 import { SplitView, IView } from './splitview';
@@ -43,7 +43,11 @@ export abstract class Panel implements IView {
 
 	private static readonly HEADER_SIZE = 22;
 
+	readonly element: HTMLElement;
+
 	protected _expanded: boolean;
+	protected disposables: IDisposable[] = [];
+
 	private expandedSize: number | undefined = undefined;
 	private _headerVisible = true;
 	private _minimumBodySize: number;
@@ -51,9 +55,7 @@ export abstract class Panel implements IView {
 	private ariaHeaderLabel: string;
 	private styles: IPanelStyles = {};
 
-	readonly element: HTMLElement;
 	private header: HTMLElement;
-	protected disposables: IDisposable[] = [];
 
 	private _onDidChange = new Emitter<number | undefined>();
 	readonly onDidChange: Event<number | undefined> = this._onDidChange.event;
@@ -226,6 +228,8 @@ export abstract class Panel implements IView {
 
 	dispose(): void {
 		this.disposables = dispose(this.disposables);
+
+		this._onDidChange.dispose();
 	}
 }
 
@@ -233,24 +237,24 @@ interface IDndContext {
 	draggable: PanelDraggable | null;
 }
 
-class PanelDraggable implements IDisposable {
+class PanelDraggable extends Disposable {
 
 	private static readonly DefaultDragOverBackgroundColor = new Color(new RGBA(128, 128, 128, 0.5));
 
-	// see https://github.com/Microsoft/vscode/issues/14470
-	private dragOverCounter = 0;
-	private disposables: IDisposable[] = [];
+	private dragOverCounter = 0; // see https://github.com/Microsoft/vscode/issues/14470
 
-	private _onDidDrop = new Emitter<{ from: Panel, to: Panel }>();
+	private _onDidDrop = this._register(new Emitter<{ from: Panel, to: Panel }>());
 	readonly onDidDrop = this._onDidDrop.event;
 
 	constructor(private panel: Panel, private dnd: IPanelDndController, private context: IDndContext) {
+		super();
+
 		panel.draggableElement.draggable = true;
-		domEvent(panel.draggableElement, 'dragstart')(this.onDragStart, this, this.disposables);
-		domEvent(panel.dropTargetElement, 'dragenter')(this.onDragEnter, this, this.disposables);
-		domEvent(panel.dropTargetElement, 'dragleave')(this.onDragLeave, this, this.disposables);
-		domEvent(panel.dropTargetElement, 'dragend')(this.onDragEnd, this, this.disposables);
-		domEvent(panel.dropTargetElement, 'drop')(this.onDrop, this, this.disposables);
+		this._register(domEvent(panel.draggableElement, 'dragstart')(this.onDragStart, this));
+		this._register(domEvent(panel.dropTargetElement, 'dragenter')(this.onDragEnter, this));
+		this._register(domEvent(panel.dropTargetElement, 'dragleave')(this.onDragLeave, this));
+		this._register(domEvent(panel.dropTargetElement, 'dragend')(this.onDragEnd, this));
+		this._register(domEvent(panel.dropTargetElement, 'drop')(this.onDrop, this));
 	}
 
 	private onDragStart(e: DragEvent): void {
@@ -332,10 +336,6 @@ class PanelDraggable implements IDisposable {
 
 		this.panel.dropTargetElement.style.backgroundColor = backgroundColor;
 	}
-
-	dispose(): void {
-		this.disposables = dispose(this.disposables);
-	}
 }
 
 export interface IPanelDndController {
@@ -363,7 +363,7 @@ interface IPanelItem {
 	disposable: IDisposable;
 }
 
-export class PanelView implements IDisposable {
+export class PanelView extends Disposable {
 
 	private dnd: IPanelDndController | null;
 	private dndContext: IDndContext = { draggable: null };
@@ -372,21 +372,30 @@ export class PanelView implements IDisposable {
 	private splitview: SplitView;
 	private animationTimer: number | null = null;
 
-	private _onDidDrop = new Emitter<{ from: Panel, to: Panel }>();
+	private _onDidDrop = this._register(new Emitter<{ from: Panel, to: Panel }>());
 	readonly onDidDrop: Event<{ from: Panel, to: Panel }> = this._onDidDrop.event;
 
 	readonly onDidSashChange: Event<number>;
 
 	constructor(container: HTMLElement, options: IPanelViewOptions = {}) {
+		super();
+
 		this.dnd = options.dnd;
 		this.el = append(container, $('.monaco-panel-view'));
-		this.splitview = new SplitView(this.el);
+		this.splitview = this._register(new SplitView(this.el));
 		this.onDidSashChange = this.splitview.onDidSashChange;
 	}
 
 	addPanel(panel: Panel, size: number, index = this.splitview.length): void {
 		const disposables: IDisposable[] = [];
-		panel.onDidChange(this.setupAnimation, this, disposables);
+		disposables.push(
+			// fix https://github.com/Microsoft/vscode/issues/37129 by delaying the listener
+			// for changes to animate them. lots of views cause a onDidChange during their
+			// initial creation and this causes the view to animate even though it shows
+			// for the first time. animation should only be used to indicate new elements
+			// are added or existing ones removed in a view that is already showing
+			scheduleAtNextAnimationFrame(() => panel.onDidChange(this.setupAnimation, this, disposables))
+		);
 
 		const panelItem = { panel, disposable: combinedDisposable(disposables) };
 		this.panelItems.splice(index, 0, panelItem);
@@ -463,7 +472,8 @@ export class PanelView implements IDisposable {
 	}
 
 	dispose(): void {
+		super.dispose();
+
 		this.panelItems.forEach(i => i.disposable.dispose());
-		this.splitview.dispose();
 	}
 }
diff --git a/src/vs/base/browser/ui/splitview/splitview.css b/src/vs/base/browser/ui/splitview/splitview.css
index ed6006b4a11..69685242363 100644
--- a/src/vs/base/browser/ui/splitview/splitview.css
+++ b/src/vs/base/browser/ui/splitview/splitview.css
@@ -37,6 +37,7 @@
 
 .monaco-split-view2 > .split-view-container > .split-view-view {
 	white-space: initial;
+	flex: none;
 }
 
 .monaco-split-view2.vertical > .split-view-container > .split-view-view {
diff --git a/src/vs/base/browser/ui/splitview/splitview.ts b/src/vs/base/browser/ui/splitview/splitview.ts
index 17de29c0a7d..5efba9ac22d 100644
--- a/src/vs/base/browser/ui/splitview/splitview.ts
+++ b/src/vs/base/browser/ui/splitview/splitview.ts
@@ -6,14 +6,15 @@
 'use strict';
 
 import 'vs/css!./splitview';
-import { IDisposable, combinedDisposable, toDisposable } from 'vs/base/common/lifecycle';
+import { IDisposable, combinedDisposable, toDisposable, Disposable } from 'vs/base/common/lifecycle';
 import { Event, mapEvent, Emitter } from 'vs/base/common/event';
 import * as types from 'vs/base/common/types';
 import * as dom from 'vs/base/browser/dom';
 import { clamp } from 'vs/base/common/numbers';
-import { range, firstIndex } from 'vs/base/common/arrays';
+import { range, firstIndex, pushToStart, pushToEnd } from 'vs/base/common/arrays';
 import { Sash, Orientation, ISashEvent as IBaseSashEvent, SashState } from 'vs/base/browser/ui/sash/sash';
 import { Color } from 'vs/base/common/color';
+import { domEvent } from 'vs/base/browser/event';
 export { Orientation } from 'vs/base/browser/ui/sash/sash';
 
 export interface ISplitViewStyles {
@@ -29,6 +30,7 @@ export interface ISplitViewOptions {
 	styles?: ISplitViewStyles;
 	orthogonalStartSash?: Sash;
 	orthogonalEndSash?: Sash;
+	inverseAltBehavior?: boolean;
 }
 
 export interface IView {
@@ -43,6 +45,7 @@ interface ISashEvent {
 	sash: Sash;
 	start: number;
 	current: number;
+	alt: boolean;
 }
 
 interface IViewItem {
@@ -61,9 +64,12 @@ interface ISashItem {
 interface ISashDragState {
 	index: number;
 	start: number;
+	current: number;
 	sizes: number[];
 	minDelta: number;
 	maxDelta: number;
+	alt: boolean;
+	disposable: IDisposable;
 }
 
 enum State {
@@ -71,43 +77,6 @@ enum State {
 	Busy
 }
 
-function pushToStart<T>(arr: T[], value: T): T[] {
-	let didFindValue = false;
-
-	const result = arr.filter(v => {
-		if (v === value) {
-			didFindValue = true;
-			return false;
-		}
-
-		return true;
-	});
-
-	if (didFindValue) {
-		result.unshift(value);
-	}
-
-	return result;
-}
-function pushToEnd<T>(arr: T[], value: T): T[] {
-	let didFindValue = false;
-
-	const result = arr.filter(v => {
-		if (v === value) {
-			didFindValue = true;
-			return false;
-		}
-
-		return true;
-	});
-
-	if (didFindValue) {
-		result.push(value);
-	}
-
-	return result;
-}
-
 export type DistributeSizing = { type: 'distribute' };
 export type SplitSizing = { type: 'split', index: number };
 export type Sizing = DistributeSizing | SplitSizing;
@@ -117,28 +86,40 @@ export namespace Sizing {
 	export function Split(index: number): SplitSizing { return { type: 'split', index }; }
 }
 
-export class SplitView implements IDisposable {
+export class SplitView extends Disposable {
 
 	readonly orientation: Orientation;
-	private el: HTMLElement;
+	// TODO@Joao have the same pattern as grid here
+	readonly el: HTMLElement;
 	private sashContainer: HTMLElement;
 	private viewContainer: HTMLElement;
 	private size = 0;
 	private contentSize = 0;
+	private proportions: undefined | number[] = undefined;
 	private viewItems: IViewItem[] = [];
 	private sashItems: ISashItem[] = [];
 	private sashDragState: ISashDragState;
 	private state: State = State.Idle;
+	private inverseAltBehavior: boolean;
 
-	private _onDidSashChange = new Emitter<number>();
+	private _onDidSashChange = this._register(new Emitter<number>());
 	readonly onDidSashChange = this._onDidSashChange.event;
-	private _onDidSashReset = new Emitter<number>();
+
+	private _onDidSashReset = this._register(new Emitter<number>());
 	readonly onDidSashReset = this._onDidSashReset.event;
 
 	get length(): number {
 		return this.viewItems.length;
 	}
 
+	get minimumSize(): number {
+		return this.viewItems.reduce((r, item) => r + item.view.minimumSize, 0);
+	}
+
+	get maximumSize(): number {
+		return this.length === 0 ? Number.POSITIVE_INFINITY : this.viewItems.reduce((r, item) => r + item.view.maximumSize, 0);
+	}
+
 	private _orthogonalStartSash: Sash | undefined;
 	get orthogonalStartSash(): Sash | undefined { return this._orthogonalStartSash; }
 	set orthogonalStartSash(sash: Sash | undefined) {
@@ -164,7 +145,10 @@ export class SplitView implements IDisposable {
 	}
 
 	constructor(container: HTMLElement, options: ISplitViewOptions = {}) {
+		super();
+
 		this.orientation = types.isUndefined(options.orientation) ? Orientation.VERTICAL : options.orientation;
+		this.inverseAltBehavior = !!options.inverseAltBehavior;
 
 		this.el = document.createElement('div');
 		dom.addClass(this.el, 'monaco-split-view2');
@@ -208,11 +192,11 @@ export class SplitView implements IDisposable {
 		const disposable = combinedDisposable([onChangeDisposable, containerDisposable]);
 
 		const layoutContainer = this.orientation === Orientation.VERTICAL
-			? size => item.container.style.height = `${item.size}px`
-			: size => item.container.style.width = `${item.size}px`;
+			? () => item.container.style.height = `${item.size}px`
+			: () => item.container.style.width = `${item.size}px`;
 
 		const layout = () => {
-			layoutContainer(item.size);
+			layoutContainer();
 			item.view.layout(item.size, this.orientation);
 		};
 
@@ -238,18 +222,20 @@ export class SplitView implements IDisposable {
 				orthogonalStartSash: this.orthogonalStartSash,
 				orthogonalEndSash: this.orthogonalEndSash
 			});
+
 			const sashEventMapper = this.orientation === Orientation.VERTICAL
-				? (e: IBaseSashEvent) => ({ sash, start: e.startY, current: e.currentY })
-				: (e: IBaseSashEvent) => ({ sash, start: e.startX, current: e.currentX });
+				? (e: IBaseSashEvent) => ({ sash, start: e.startY, current: e.currentY, alt: e.altKey } as ISashEvent)
+				: (e: IBaseSashEvent) => ({ sash, start: e.startX, current: e.currentX, alt: e.altKey } as ISashEvent);
 
 			const onStart = mapEvent(sash.onDidStart, sashEventMapper);
 			const onStartDisposable = onStart(this.onSashStart, this);
 			const onChange = mapEvent(sash.onDidChange, sashEventMapper);
-			const onSashChangeDisposable = onChange(this.onSashChange, this);
-			const onEndDisposable = sash.onDidEnd(() => this._onDidSashChange.fire(firstIndex(this.sashItems, item => item.sash === sash)));
+			const onChangeDisposable = onChange(this.onSashChange, this);
+			const onEnd = mapEvent(sash.onDidEnd, () => firstIndex(this.sashItems, item => item.sash === sash));
+			const onEndDisposable = onEnd(this.onSashEnd, this);
 			const onDidResetDisposable = sash.onDidReset(() => this._onDidSashReset.fire(firstIndex(this.sashItems, item => item.sash === sash)));
 
-			const disposable = combinedDisposable([onStartDisposable, onSashChangeDisposable, onEndDisposable, onDidResetDisposable, sash]);
+			const disposable = combinedDisposable([onStartDisposable, onChangeDisposable, onEndDisposable, onDidResetDisposable, sash]);
 			const sashItem: ISashItem = { sash, disposable };
 
 			this.sashItems.splice(index - 1, 0, sashItem);
@@ -326,44 +312,111 @@ export class SplitView implements IDisposable {
 		const toSize = this.getViewSize(to);
 		const toView = this.removeView(to);
 		const fromView = this.removeView(from);
+
 		this.addView(toView, fromSize, from);
 		this.addView(fromView, toSize, to);
 	}
 
 	private relayout(lowPriorityIndex?: number, highPriorityIndex?: number): void {
 		const contentSize = this.viewItems.reduce((r, i) => r + i.size, 0);
+
 		this.resize(this.viewItems.length - 1, this.size - contentSize, undefined, lowPriorityIndex, highPriorityIndex);
+		this.distributeEmptySpace();
+		this.layoutViews();
+		this.saveProportions();
 	}
 
 	layout(size: number): void {
 		const previousSize = Math.max(this.size, this.contentSize);
 		this.size = size;
-		this.resize(this.viewItems.length - 1, size - previousSize);
+
+		if (!this.proportions) {
+			this.resize(this.viewItems.length - 1, size - previousSize);
+		} else {
+			for (let i = 0; i < this.viewItems.length; i++) {
+				const item = this.viewItems[i];
+				item.size = clamp(Math.round(this.proportions[i] * size), item.view.minimumSize, item.view.maximumSize);
+			}
+		}
+
+		this.distributeEmptySpace();
+		this.layoutViews();
 	}
 
-	private onSashStart({ sash, start, current }: ISashEvent): void {
+	private saveProportions(): void {
+		if (this.contentSize > 0) {
+			this.proportions = this.viewItems.map(i => i.size / this.contentSize);
+		}
+	}
+
+	private onSashStart({ sash, start, alt }: ISashEvent): void {
 		const index = firstIndex(this.sashItems, item => item.sash === sash);
-		const sizes = this.viewItems.map(i => i.size);
 
-		const upIndexes = range(index, -1);
-		const collapseUp = upIndexes.reduce((r, i) => r + (sizes[i] - this.viewItems[i].view.minimumSize), 0);
-		const expandUp = upIndexes.reduce((r, i) => r + (this.viewItems[i].view.maximumSize - sizes[i]), 0);
+		// This way, we can press Alt while we resize a sash, macOS style!
+		const disposable = combinedDisposable([
+			domEvent(document.body, 'keydown')(e => resetSashDragState(this.sashDragState.current, e.altKey)),
+			domEvent(document.body, 'keyup')(() => resetSashDragState(this.sashDragState.current, false))
+		]);
 
-		const downIndexes = range(index + 1, this.viewItems.length);
-		const collapseDown = downIndexes.reduce((r, i) => r + (sizes[i] - this.viewItems[i].view.minimumSize), 0);
-		const expandDown = downIndexes.reduce((r, i) => r + (this.viewItems[i].view.maximumSize - sizes[i]), 0);
+		const resetSashDragState = (start: number, alt: boolean) => {
+			const sizes = this.viewItems.map(i => i.size);
+			let minDelta = Number.NEGATIVE_INFINITY;
+			let maxDelta = Number.POSITIVE_INFINITY;
 
-		const minDelta = -Math.min(collapseUp, expandDown);
-		const maxDelta = Math.min(collapseDown, expandUp);
+			if (this.inverseAltBehavior) {
+				alt = !alt;
+			}
 
-		this.sashDragState = { start, index, sizes, minDelta, maxDelta };
+			if (alt) {
+				// When we're using the last sash with Alt, we're resizing
+				// the view to the left/up, instead of right/down as usual
+				// Thus, we must do the inverse of the usual
+				const isLastSash = index === this.sashItems.length - 1;
+
+				if (isLastSash) {
+					const viewItem = this.viewItems[index];
+					minDelta = (viewItem.view.minimumSize - viewItem.size) / 2;
+					maxDelta = (viewItem.view.maximumSize - viewItem.size) / 2;
+				} else {
+					const viewItem = this.viewItems[index + 1];
+					minDelta = (viewItem.size - viewItem.view.maximumSize) / 2;
+					maxDelta = (viewItem.size - viewItem.view.minimumSize) / 2;
+				}
+			}
+
+			this.sashDragState = { start, current: start, index, sizes, minDelta, maxDelta, alt, disposable };
+		};
+
+		resetSashDragState(start, alt);
 	}
 
 	private onSashChange({ current }: ISashEvent): void {
-		const { index, start, sizes, minDelta, maxDelta } = this.sashDragState;
-		const delta = clamp(current - start, minDelta, maxDelta);
+		const { index, start, sizes, alt, minDelta, maxDelta } = this.sashDragState;
+		this.sashDragState.current = current;
 
-		this.resize(index, delta, sizes);
+		const delta = current - start;
+		const newDelta = this.resize(index, delta, sizes, undefined, undefined, minDelta, maxDelta);
+
+		if (alt) {
+			const isLastSash = index === this.sashItems.length - 1;
+			const newSizes = this.viewItems.map(i => i.size);
+			const viewItemIndex = isLastSash ? index : index + 1;
+			const viewItem = this.viewItems[viewItemIndex];
+			const newMinDelta = viewItem.size - viewItem.view.maximumSize;
+			const newMaxDelta = viewItem.size - viewItem.view.minimumSize;
+			const resizeIndex = isLastSash ? index - 1 : index + 1;
+
+			this.resize(resizeIndex, -newDelta, newSizes, undefined, undefined, newMinDelta, newMaxDelta);
+		}
+
+		this.distributeEmptySpace();
+		this.layoutViews();
+	}
+
+	private onSashEnd(index: number): void {
+		this._onDidSashChange.fire(index);
+		this.sashDragState.disposable.dispose();
+		this.saveProportions();
 	}
 
 	private onViewChange(item: IViewItem, size: number | undefined): void {
@@ -375,8 +428,17 @@ export class SplitView implements IDisposable {
 
 		size = typeof size === 'number' ? size : item.size;
 		size = clamp(size, item.view.minimumSize, item.view.maximumSize);
-		item.size = size;
-		this.relayout(index);
+
+		if (this.inverseAltBehavior && index > 0) {
+			// In this case, we want the view to grow or shrink both sides equally
+			// so we just resize the "left" side by half and let `resize` do the clamping magic
+			this.resize(index - 1, Math.floor((item.size - size) / 2));
+			this.distributeEmptySpace();
+			this.layoutViews();
+		} else {
+			item.size = size;
+			this.relayout(index, undefined);
+		}
 	}
 
 	resizeView(index: number, size: number): void {
@@ -414,6 +476,9 @@ export class SplitView implements IDisposable {
 			this.resize(index - 1, deltaUp);
 		}
 
+		this.distributeEmptySpace();
+		this.layoutViews();
+		this.saveProportions();
 		this.state = State.Idle;
 	}
 
@@ -433,22 +498,30 @@ export class SplitView implements IDisposable {
 		return this.viewItems[index].size;
 	}
 
-	private resize(index: number, delta: number, sizes = this.viewItems.map(i => i.size), lowPriorityIndex?: number, highPriorityIndex?: number): void {
+	private resize(
+		index: number,
+		delta: number,
+		sizes = this.viewItems.map(i => i.size),
+		lowPriorityIndex?: number,
+		highPriorityIndex?: number,
+		overloadMinDelta: number = Number.NEGATIVE_INFINITY,
+		overloadMaxDelta: number = Number.POSITIVE_INFINITY
+	): number {
 		if (index < 0 || index >= this.viewItems.length) {
-			return;
+			return 0;
 		}
 
-		let upIndexes = range(index, -1);
-		let downIndexes = range(index + 1, this.viewItems.length);
+		const upIndexes = range(index, -1);
+		const downIndexes = range(index + 1, this.viewItems.length);
 
 		if (typeof highPriorityIndex === 'number') {
-			upIndexes = pushToStart(upIndexes, highPriorityIndex);
-			downIndexes = pushToStart(downIndexes, highPriorityIndex);
+			pushToStart(upIndexes, highPriorityIndex);
+			pushToStart(downIndexes, highPriorityIndex);
 		}
 
 		if (typeof lowPriorityIndex === 'number') {
-			upIndexes = pushToEnd(upIndexes, lowPriorityIndex);
-			downIndexes = pushToEnd(downIndexes, lowPriorityIndex);
+			pushToEnd(upIndexes, lowPriorityIndex);
+			pushToEnd(downIndexes, lowPriorityIndex);
 		}
 
 		const upItems = upIndexes.map(i => this.viewItems[i]);
@@ -457,7 +530,16 @@ export class SplitView implements IDisposable {
 		const downItems = downIndexes.map(i => this.viewItems[i]);
 		const downSizes = downIndexes.map(i => sizes[i]);
 
-		for (let i = 0, deltaUp = delta; deltaUp !== 0 && i < upItems.length; i++) {
+		const minDeltaUp = upIndexes.reduce((r, i) => r + (this.viewItems[i].view.minimumSize - sizes[i]), 0);
+		const maxDeltaUp = upIndexes.reduce((r, i) => r + (this.viewItems[i].view.maximumSize - sizes[i]), 0);
+		const maxDeltaDown = downIndexes.length === 0 ? Number.POSITIVE_INFINITY : downIndexes.reduce((r, i) => r + (sizes[i] - this.viewItems[i].view.minimumSize), 0);
+		const minDeltaDown = downIndexes.length === 0 ? Number.NEGATIVE_INFINITY : downIndexes.reduce((r, i) => r + (sizes[i] - this.viewItems[i].view.maximumSize), 0);
+		const minDelta = Math.max(minDeltaUp, minDeltaDown, overloadMinDelta);
+		const maxDelta = Math.min(maxDeltaDown, maxDeltaUp, overloadMaxDelta);
+
+		delta = clamp(delta, minDelta, maxDelta);
+
+		for (let i = 0, deltaUp = delta; i < upItems.length; i++) {
 			const item = upItems[i];
 			const size = clamp(upSizes[i] + deltaUp, item.view.minimumSize, item.view.maximumSize);
 			const viewDelta = size - upSizes[i];
@@ -466,7 +548,7 @@ export class SplitView implements IDisposable {
 			item.size = size;
 		}
 
-		for (let i = 0, deltaDown = delta; deltaDown !== 0 && i < downItems.length; i++) {
+		for (let i = 0, deltaDown = delta; i < downItems.length; i++) {
 			const item = downItems[i];
 			const size = clamp(downSizes[i] - deltaDown, item.view.minimumSize, item.view.maximumSize);
 			const viewDelta = size - downSizes[i];
@@ -475,10 +557,14 @@ export class SplitView implements IDisposable {
 			item.size = size;
 		}
 
+		return delta;
+	}
+
+	private distributeEmptySpace(): void {
 		let contentSize = this.viewItems.reduce((r, i) => r + i.size, 0);
 		let emptyDelta = this.size - contentSize;
 
-		for (let i = this.viewItems.length - 1; emptyDelta > 0 && i >= 0; i--) {
+		for (let i = this.viewItems.length - 1; emptyDelta !== 0 && i >= 0; i--) {
 			const item = this.viewItems[i];
 			const size = clamp(item.size + emptyDelta, item.view.minimumSize, item.view.maximumSize);
 			const viewDelta = size - item.size;
@@ -486,14 +572,16 @@ export class SplitView implements IDisposable {
 			emptyDelta -= viewDelta;
 			item.size = size;
 		}
-
-		this.contentSize = this.viewItems.reduce((r, i) => r + i.size, 0);
-
-		this.layoutViews();
 	}
 
 	private layoutViews(): void {
+		// Save new content size
+		this.contentSize = this.viewItems.reduce((r, i) => r + i.size, 0);
+
+		// Layout views
 		this.viewItems.forEach(item => item.layout());
+
+		// Layout sashes
 		this.sashItems.forEach(item => item.sash.layout());
 
 		// Update sashes enablement
@@ -541,6 +629,8 @@ export class SplitView implements IDisposable {
 	}
 
 	dispose(): void {
+		super.dispose();
+
 		this.viewItems.forEach(i => i.disposable.dispose());
 		this.viewItems = [];
 
diff --git a/src/vs/base/browser/ui/toolbar/toolbar.ts b/src/vs/base/browser/ui/toolbar/toolbar.ts
index cecc9f9831e..cc54e705b60 100644
--- a/src/vs/base/browser/ui/toolbar/toolbar.ts
+++ b/src/vs/base/browser/ui/toolbar/toolbar.ts
@@ -12,6 +12,7 @@ import { Action, IActionRunner, IAction } from 'vs/base/common/actions';
 import { ActionBar, ActionsOrientation, IActionItemProvider } from 'vs/base/browser/ui/actionbar/actionbar';
 import { IContextMenuProvider, DropdownMenuActionItem } from 'vs/base/browser/ui/dropdown/dropdown';
 import { ResolvedKeybinding } from 'vs/base/common/keyCodes';
+import { Disposable } from 'vs/base/common/lifecycle';
 
 export const CONTEXT = 'context.toolbar';
 
@@ -21,12 +22,13 @@ export interface IToolBarOptions {
 	ariaLabel?: string;
 	getKeyBinding?: (action: IAction) => ResolvedKeybinding;
 	actionRunner?: IActionRunner;
+	toggleMenuTitle?: string;
 }
 
 /**
  * A widget that combines an action bar for primary actions and a dropdown for secondary actions.
  */
-export class ToolBar {
+export class ToolBar extends Disposable {
 	private options: IToolBarOptions;
 	private actionBar: ActionBar;
 	private toggleMenuAction: ToggleMenuAction;
@@ -35,16 +37,18 @@ export class ToolBar {
 	private lookupKeybindings: boolean;
 
 	constructor(container: HTMLElement, contextMenuProvider: IContextMenuProvider, options: IToolBarOptions = { orientation: ActionsOrientation.HORIZONTAL }) {
+		super();
+
 		this.options = options;
 		this.lookupKeybindings = typeof this.options.getKeyBinding === 'function';
 
-		this.toggleMenuAction = new ToggleMenuAction(() => this.toggleMenuActionItem && this.toggleMenuActionItem.show());
+		this.toggleMenuAction = this._register(new ToggleMenuAction(() => this.toggleMenuActionItem && this.toggleMenuActionItem.show(), options.toggleMenuTitle));
 
 		let element = document.createElement('div');
 		element.className = 'monaco-toolbar';
 		container.appendChild(element);
 
-		this.actionBar = new ActionBar(element, {
+		this.actionBar = this._register(new ActionBar(element, {
 			orientation: options.orientation,
 			ariaLabel: options.ariaLabel,
 			actionRunner: options.actionRunner,
@@ -75,29 +79,29 @@ export class ToolBar {
 
 				return options.actionItemProvider ? options.actionItemProvider(action) : null;
 			}
-		});
+		}));
 	}
 
-	public set actionRunner(actionRunner: IActionRunner) {
+	set actionRunner(actionRunner: IActionRunner) {
 		this.actionBar.actionRunner = actionRunner;
 	}
 
-	public get actionRunner(): IActionRunner {
+	get actionRunner(): IActionRunner {
 		return this.actionBar.actionRunner;
 	}
 
-	public set context(context: any) {
+	set context(context: any) {
 		this.actionBar.context = context;
 		if (this.toggleMenuActionItem) {
 			this.toggleMenuActionItem.setActionContext(context);
 		}
 	}
 
-	public getContainer(): HTMLElement {
+	getContainer(): HTMLElement {
 		return this.actionBar.getContainer();
 	}
 
-	public getItemsWidth(): number {
+	getItemsWidth(): number {
 		let itemsWidth = 0;
 		for (let i = 0; i < this.actionBar.length(); i++) {
 			itemsWidth += this.actionBar.getWidth(i);
@@ -105,11 +109,11 @@ export class ToolBar {
 		return itemsWidth;
 	}
 
-	public setAriaLabel(label: string): void {
+	setAriaLabel(label: string): void {
 		this.actionBar.setAriaLabel(label);
 	}
 
-	public setActions(primaryActions: IAction[], secondaryActions?: IAction[]): () => void {
+	setActions(primaryActions: IAction[], secondaryActions?: IAction[]): () => void {
 		return () => {
 			let primaryActionsToSet = primaryActions ? primaryActions.slice(0) : [];
 
@@ -134,7 +138,7 @@ export class ToolBar {
 		return key ? key.getLabel() : void 0;
 	}
 
-	public addPrimaryAction(primaryAction: IAction): () => void {
+	addPrimaryAction(primaryAction: IAction): () => void {
 		return () => {
 
 			// Add after the "..." action if we have secondary actions
@@ -150,40 +154,41 @@ export class ToolBar {
 		};
 	}
 
-	public dispose(): void {
-		this.actionBar.dispose();
-		this.toggleMenuAction.dispose();
-
+	dispose(): void {
 		if (this.toggleMenuActionItem) {
 			this.toggleMenuActionItem.dispose();
+			this.toggleMenuActionItem = void 0;
 		}
+
+		super.dispose();
 	}
 }
 
 class ToggleMenuAction extends Action {
 
-	public static readonly ID = 'toolbar.toggle.more';
+	static readonly ID = 'toolbar.toggle.more';
 
 	private _menuActions: IAction[];
 	private toggleDropdownMenu: () => void;
 
-	constructor(toggleDropdownMenu: () => void) {
-		super(ToggleMenuAction.ID, nls.localize('more', "More"), null, true);
+	constructor(toggleDropdownMenu: () => void, title?: string) {
+		title = title || nls.localize('moreActions', "More Actions...");
+		super(ToggleMenuAction.ID, title, null, true);
 
 		this.toggleDropdownMenu = toggleDropdownMenu;
 	}
 
-	public run(): TPromise<any> {
+	run(): TPromise<any> {
 		this.toggleDropdownMenu();
 
 		return TPromise.as(true);
 	}
 
-	public get menuActions() {
+	get menuActions() {
 		return this._menuActions;
 	}
 
-	public set menuActions(actions: IAction[]) {
+	set menuActions(actions: IAction[]) {
 		this._menuActions = actions;
 	}
 }
\ No newline at end of file
diff --git a/src/vs/base/browser/ui/tree/tree.css b/src/vs/base/browser/ui/tree/tree.css
new file mode 100644
index 00000000000..ea0178046f7
--- /dev/null
+++ b/src/vs/base/browser/ui/tree/tree.css
@@ -0,0 +1,16 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+.monaco-tl-row {
+	display: flex;
+	height: 100%;
+	align-items: center;
+}
+
+.monaco-tl-row > .tl-twistie {
+	font-size: 10px;
+	text-align: right;
+	padding-right: 10px;
+}
\ No newline at end of file
diff --git a/src/vs/base/browser/ui/tree/tree.ts b/src/vs/base/browser/ui/tree/tree.ts
new file mode 100644
index 00000000000..1b020fee6e7
--- /dev/null
+++ b/src/vs/base/browser/ui/tree/tree.ts
@@ -0,0 +1,261 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import 'vs/css!./tree';
+import { IDisposable, dispose } from 'vs/base/common/lifecycle';
+import { IListOptions, List, IIdentityProvider, IMultipleSelectionController } from 'vs/base/browser/ui/list/listWidget';
+import { TreeModel, ITreeNode, ITreeElement, getNodeLocation } from 'vs/base/browser/ui/tree/treeModel';
+import { Iterator, ISequence } from 'vs/base/common/iterator';
+import { IVirtualDelegate, IRenderer, IListMouseEvent } from 'vs/base/browser/ui/list/list';
+import { append, $ } from 'vs/base/browser/dom';
+import { Event, Relay, chain } from 'vs/base/common/event';
+import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
+import { KeyCode } from 'vs/base/common/keyCodes';
+import { tail2 } from 'vs/base/common/arrays';
+
+function toTreeListOptions<T>(options?: IListOptions<T>): IListOptions<ITreeNode<T>> {
+	if (!options) {
+		return undefined;
+	}
+
+	let identityProvider: IIdentityProvider<ITreeNode<T>> | undefined = undefined;
+	let multipleSelectionController: IMultipleSelectionController<ITreeNode<T>> | undefined = undefined;
+
+	if (options.identityProvider) {
+		identityProvider = el => options.identityProvider(el.element);
+	}
+
+	if (options.multipleSelectionController) {
+		multipleSelectionController = {
+			isSelectionSingleChangeEvent(e) {
+				return options.multipleSelectionController.isSelectionSingleChangeEvent({ ...e, element: e.element } as any);
+			},
+			isSelectionRangeChangeEvent(e) {
+				return options.multipleSelectionController.isSelectionRangeChangeEvent({ ...e, element: e.element } as any);
+			}
+		};
+	}
+
+	return {
+		...options,
+		identityProvider,
+		multipleSelectionController
+	};
+}
+
+class TreeDelegate<T> implements IVirtualDelegate<ITreeNode<T>> {
+
+	constructor(private delegate: IVirtualDelegate<T>) { }
+
+	getHeight(element: ITreeNode<T>): number {
+		return this.delegate.getHeight(element.element);
+	}
+
+	getTemplateId(element: ITreeNode<T>): string {
+		return this.delegate.getTemplateId(element.element);
+	}
+}
+
+interface ITreeListTemplateData<T> {
+	twistie: HTMLElement;
+	count: HTMLElement;
+	templateData: T;
+}
+
+function renderTwistie<T>(node: ITreeNode<T>, twistie: HTMLElement): void {
+	if (node.children.length === 0 && !node.collapsible) {
+		twistie.innerText = '';
+	} else {
+		twistie.innerText = node.collapsed ? '▹' : '◢';
+	}
+}
+
+class TreeRenderer<T, TTemplateData> implements IRenderer<ITreeNode<T>, ITreeListTemplateData<TTemplateData>> {
+
+	readonly templateId: string;
+	private renderedNodes = new Map<ITreeNode<T>, ITreeListTemplateData<TTemplateData>>();
+	private disposables: IDisposable[] = [];
+
+	constructor(
+		private renderer: IRenderer<T, TTemplateData>,
+		onDidChangeCollapseState: Event<ITreeNode<T>>
+	) {
+		this.templateId = renderer.templateId;
+		onDidChangeCollapseState(this.onDidChangeCollapseState, this, this.disposables);
+	}
+
+	renderTemplate(container: HTMLElement): ITreeListTemplateData<TTemplateData> {
+		const el = append(container, $('.monaco-tl-row'));
+		const twistie = append(el, $('.tl-twistie'));
+		const contents = append(el, $('.tl-contents'));
+		const count = append(el, $('.tl-count'));
+		const templateData = this.renderer.renderTemplate(contents);
+
+		return { twistie, count, templateData };
+	}
+
+	renderElement(node: ITreeNode<T>, index: number, templateData: ITreeListTemplateData<TTemplateData>): void {
+		this.renderedNodes.set(node, templateData);
+
+		templateData.twistie.style.width = `${10 + node.depth * 10}px`;
+		renderTwistie(node, templateData.twistie);
+		templateData.count.textContent = `${node.visibleCount}`;
+
+		this.renderer.renderElement(node.element, index, templateData.templateData);
+	}
+
+	disposeElement(node: ITreeNode<T>): void {
+		this.renderedNodes.delete(node);
+	}
+
+	disposeTemplate(templateData: ITreeListTemplateData<TTemplateData>): void {
+		this.renderer.disposeTemplate(templateData.templateData);
+	}
+
+	private onDidChangeCollapseState(node: ITreeNode<T>): void {
+		const templateData = this.renderedNodes.get(node);
+
+		if (!templateData) {
+			return;
+		}
+
+		renderTwistie(node, templateData.twistie);
+		templateData.count.textContent = `${node.visibleCount}`;
+	}
+
+	dispose(): void {
+		this.renderedNodes.clear();
+		this.disposables = dispose(this.disposables);
+	}
+}
+
+function isInputElement(e: HTMLElement): boolean {
+	return e.tagName === 'INPUT' || e.tagName === 'TEXTAREA';
+}
+
+export interface ITreeOptions<T> extends IListOptions<T> { }
+
+export class Tree<T> implements IDisposable {
+
+	private view: List<ITreeNode<T>>;
+	private model: TreeModel<T>;
+	private disposables: IDisposable[] = [];
+
+	constructor(
+		container: HTMLElement,
+		delegate: IVirtualDelegate<T>,
+		renderers: IRenderer<T, any>[],
+		options?: ITreeOptions<T>
+	) {
+		const treeDelegate = new TreeDelegate(delegate);
+
+		const onDidChangeCollapseStateRelay = new Relay<ITreeNode<T>>();
+		const treeRenderers = renderers.map(r => new TreeRenderer(r, onDidChangeCollapseStateRelay.event));
+		this.disposables.push(...treeRenderers);
+
+		const treeOptions = toTreeListOptions(options);
+
+		this.view = new List(container, treeDelegate, treeRenderers, treeOptions);
+		this.model = new TreeModel<T>(this.view);
+		onDidChangeCollapseStateRelay.input = this.model.onDidChangeCollapseState;
+
+		this.view.onMouseClick(this.onMouseClick, this, this.disposables);
+
+		const onKeyDown = chain(this.view.onKeyDown)
+			.filter(e => !isInputElement(e.target as HTMLElement))
+			.map(e => new StandardKeyboardEvent(e));
+
+		onKeyDown.filter(e => e.keyCode === KeyCode.LeftArrow).on(this.onLeftArrow, this, this.disposables);
+		onKeyDown.filter(e => e.keyCode === KeyCode.RightArrow).on(this.onRightArrow, this, this.disposables);
+		onKeyDown.filter(e => e.keyCode === KeyCode.Space).on(this.onSpace, this, this.disposables);
+	}
+
+	splice(location: number[], deleteCount: number, toInsert: ISequence<ITreeElement<T>> = Iterator.empty()): Iterator<ITreeElement<T>> {
+		return this.model.splice(location, deleteCount, toInsert);
+	}
+
+	private onMouseClick(e: IListMouseEvent<ITreeNode<T>>): void {
+		const node = e.element;
+		const location = getNodeLocation(node);
+
+		this.model.toggleCollapsed(location);
+	}
+
+	private onLeftArrow(e: StandardKeyboardEvent): void {
+		e.preventDefault();
+		e.stopPropagation();
+
+		const nodes = this.view.getFocusedElements();
+
+		if (nodes.length === 0) {
+			return;
+		}
+
+		const node = nodes[0];
+		const location = getNodeLocation(node);
+		const didChange = this.model.setCollapsed(location, true);
+
+		if (!didChange) {
+			if (location.length === 1) {
+				return;
+			}
+
+			const [parentLocation] = tail2(location);
+			const parentListIndex = this.model.getListIndex(parentLocation);
+
+			this.view.reveal(parentListIndex);
+			this.view.setFocus([parentListIndex]);
+		}
+	}
+
+	private onRightArrow(e: StandardKeyboardEvent): void {
+		e.preventDefault();
+		e.stopPropagation();
+
+		const nodes = this.view.getFocusedElements();
+
+		if (nodes.length === 0) {
+			return;
+		}
+
+		const node = nodes[0];
+		const location = getNodeLocation(node);
+		const didChange = this.model.setCollapsed(location, false);
+
+		if (!didChange) {
+			if (node.children.length === 0) {
+				return;
+			}
+
+			const [focusedIndex] = this.view.getFocus();
+			const firstChildIndex = focusedIndex + 1;
+
+			this.view.reveal(firstChildIndex);
+			this.view.setFocus([firstChildIndex]);
+		}
+	}
+
+	private onSpace(e: StandardKeyboardEvent): void {
+		e.preventDefault();
+		e.stopPropagation();
+
+		const nodes = this.view.getFocusedElements();
+
+		if (nodes.length === 0) {
+			return;
+		}
+
+		const node = nodes[0];
+		const location = getNodeLocation(node);
+		this.model.toggleCollapsed(location);
+	}
+
+	dispose(): void {
+		this.disposables = dispose(this.disposables);
+		this.view.dispose();
+		this.view = null;
+		this.model = null;
+	}
+}
\ No newline at end of file
diff --git a/src/vs/base/browser/ui/tree/treeModel.ts b/src/vs/base/browser/ui/tree/treeModel.ts
new file mode 100644
index 00000000000..7d8e2b70c98
--- /dev/null
+++ b/src/vs/base/browser/ui/tree/treeModel.ts
@@ -0,0 +1,239 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+import { ISpliceable } from 'vs/base/common/sequence';
+import { Iterator, ISequence } from 'vs/base/common/iterator';
+import { Emitter, Event } from 'vs/base/common/event';
+
+export interface ITreeElement<T> {
+	readonly element: T;
+	readonly children?: Iterator<ITreeElement<T>> | ITreeElement<T>[];
+	readonly collapsible?: boolean;
+	readonly collapsed?: boolean;
+}
+
+export interface ITreeNode<T> {
+	readonly parent: IMutableTreeNode<T> | undefined;
+	readonly element: T;
+	readonly children: IMutableTreeNode<T>[];
+	readonly depth: number;
+	readonly collapsible: boolean;
+	readonly collapsed: boolean;
+	readonly visibleCount: number;
+}
+
+interface IMutableTreeNode<T> extends ITreeNode<T> {
+	collapsed: boolean;
+	visibleCount: number;
+}
+
+function visibleCountReducer<T>(result: number, node: IMutableTreeNode<T>): number {
+	return result + (node.collapsed ? 1 : node.visibleCount);
+}
+
+function getVisibleCount<T>(nodes: IMutableTreeNode<T>[]): number {
+	return nodes.reduce(visibleCountReducer, 0);
+}
+
+/**
+ * Recursively updates the visibleCount of a subtree, while collecting
+ * all the visible nodes in an array.
+ */
+function updateVisibleCount<T>(node: IMutableTreeNode<T>): ITreeNode<T>[] {
+	const previousVisibleCount = node.visibleCount;
+	const result: ITreeNode<T>[] = [];
+
+	function _updateVisibleCount(node: IMutableTreeNode<T>): number {
+		result.push(node);
+		node.visibleCount = 1;
+
+		if (!node.collapsed) {
+			for (const child of node.children) {
+				node.visibleCount += _updateVisibleCount(child);
+			}
+		}
+
+		return node.visibleCount;
+	}
+
+	_updateVisibleCount(node);
+
+	const visibleCountDiff = result.length - previousVisibleCount;
+	node = node.parent;
+
+	while (node) {
+		node.visibleCount += visibleCountDiff;
+		node = node.parent;
+	}
+
+	return result;
+}
+
+function getTreeElementIterator<T>(elements: Iterator<ITreeElement<T>> | ITreeElement<T>[] | undefined): Iterator<ITreeElement<T>> {
+	if (!elements) {
+		return Iterator.empty();
+	} else if (Array.isArray(elements)) {
+		return Iterator.iterate(elements);
+	} else {
+		return elements;
+	}
+}
+
+function treeElementToNode<T>(treeElement: ITreeElement<T>, parent: IMutableTreeNode<T>, visible: boolean, treeListElements: ITreeNode<T>[]): IMutableTreeNode<T> {
+	const depth = parent.depth + 1;
+	const { element, collapsible, collapsed } = treeElement;
+	const node = { parent, element, children: [], depth, collapsible: !!collapsible, collapsed: !!collapsed, visibleCount: 0 };
+
+	if (visible) {
+		treeListElements.push(node);
+	}
+
+	const children = getTreeElementIterator(treeElement.children);
+	node.children = Iterator.collect(Iterator.map(children, el => treeElementToNode(el, node, visible && !treeElement.collapsed, treeListElements)));
+	node.collapsible = node.collapsible || node.children.length > 0;
+	node.visibleCount = 1 + getVisibleCount(node.children);
+
+	return node;
+}
+
+function treeNodeToElement<T>(node: IMutableTreeNode<T>): ITreeElement<T> {
+	const { element, collapsed } = node;
+	const children = Iterator.map(Iterator.iterate(node.children), treeNodeToElement);
+
+	return { element, children, collapsed };
+}
+
+export function getNodeLocation<T>(node: ITreeNode<T>): number[] {
+	const location = [];
+
+	while (node.parent) {
+		location.push(node.parent.children.indexOf(node));
+		node = node.parent;
+	}
+
+	return location.reverse();
+}
+
+export class TreeModel<T> {
+
+	private root: IMutableTreeNode<T> = {
+		parent: undefined,
+		element: undefined,
+		children: [],
+		depth: 0,
+		collapsible: false,
+		collapsed: false,
+		visibleCount: 1
+	};
+
+	// TODO@joao can't we do without this?
+	private _onDidChangeCollapseState = new Emitter<ITreeNode<T>>();
+	readonly onDidChangeCollapseState: Event<ITreeNode<T>> = this._onDidChangeCollapseState.event;
+
+	constructor(private list: ISpliceable<ITreeNode<T>>) { }
+
+	splice(location: number[], deleteCount: number, toInsert?: ISequence<ITreeElement<T>>): Iterator<ITreeElement<T>> {
+		if (location.length === 0) {
+			throw new Error('Invalid tree location');
+		}
+
+		const { parentNode, listIndex, visible } = this.findParentNode(location);
+		const treeListElementsToInsert: ITreeNode<T>[] = [];
+		const elementsToInsert = getTreeElementIterator(toInsert);
+		const nodesToInsert = Iterator.collect(Iterator.map(elementsToInsert, el => treeElementToNode(el, parentNode, visible, treeListElementsToInsert)));
+		const lastIndex = location[location.length - 1];
+		const deletedNodes = parentNode.children.splice(lastIndex, deleteCount, ...nodesToInsert);
+		const visibleDeleteCount = getVisibleCount(deletedNodes);
+
+		parentNode.visibleCount += getVisibleCount(nodesToInsert) - visibleDeleteCount;
+
+		if (visible) {
+			this.list.splice(listIndex, visibleDeleteCount, treeListElementsToInsert);
+		}
+
+		return Iterator.map(Iterator.iterate(deletedNodes), treeNodeToElement);
+	}
+
+	getListIndex(location: number[]): number {
+		return this.findNode(location).listIndex;
+	}
+
+	setCollapsed(location: number[], collapsed: boolean): boolean {
+		return this._setCollapsed(location, collapsed);
+	}
+
+	toggleCollapsed(location: number[]): void {
+		this._setCollapsed(location);
+	}
+
+	private _setCollapsed(location: number[], collapsed?: boolean | undefined): boolean {
+		const { node, listIndex, visible } = this.findNode(location);
+
+		if (!node.collapsible) {
+			return false;
+		}
+
+		if (typeof collapsed === 'undefined') {
+			collapsed = !node.collapsed;
+		}
+
+		if (node.collapsed === collapsed) {
+			return false;
+		}
+
+		node.collapsed = collapsed;
+
+		if (visible) {
+			const previousVisibleCount = node.visibleCount;
+			const toInsert = updateVisibleCount(node);
+
+			this.list.splice(listIndex + 1, previousVisibleCount - 1, toInsert.slice(1));
+		}
+
+		this._onDidChangeCollapseState.fire(node);
+
+		return true;
+	}
+
+	isCollapsed(location: number[]): boolean {
+		return this.findNode(location).node.collapsed;
+	}
+
+	private findNode(location: number[]): { node: IMutableTreeNode<T>, listIndex: number, visible: boolean } {
+		const { parentNode, listIndex, visible } = this.findParentNode(location);
+		const index = location[location.length - 1];
+
+		if (index < 0 || index > parentNode.children.length) {
+			throw new Error('Invalid tree location');
+		}
+
+		const node = parentNode.children[index];
+
+		return { node, listIndex, visible };
+	}
+
+	private findParentNode(location: number[], node: IMutableTreeNode<T> = this.root, listIndex: number = 0, visible = true): { parentNode: IMutableTreeNode<T>; listIndex: number; visible: boolean; } {
+		const [index, ...rest] = location;
+
+		if (index < 0 || index > node.children.length) {
+			throw new Error('Invalid tree location');
+		}
+
+		// TODO@joao perf!
+		for (let i = 0; i < index; i++) {
+			listIndex += node.children[i].visibleCount;
+		}
+
+		visible = visible && !node.collapsed;
+
+		if (rest.length === 0) {
+			return { parentNode: node, listIndex, visible };
+		}
+
+		return this.findParentNode(rest, node.children[index], listIndex + 1, visible);
+	}
+}
\ No newline at end of file
diff --git a/src/vs/base/common/actions.ts b/src/vs/base/common/actions.ts
index a6d78296e69..73a65a16e64 100644
--- a/src/vs/base/common/actions.ts
+++ b/src/vs/base/common/actions.ts
@@ -5,8 +5,9 @@
 'use strict';
 
 import { TPromise } from 'vs/base/common/winjs.base';
-import { IDisposable, combinedDisposable } from 'vs/base/common/lifecycle';
+import { IDisposable, combinedDisposable, Disposable } from 'vs/base/common/lifecycle';
 import { Event, Emitter } from 'vs/base/common/event';
+import { isThenable } from 'vs/base/common/async';
 
 export interface ITelemetryData {
 	from?: string;
@@ -60,7 +61,6 @@ export class Action implements IAction {
 	protected _enabled: boolean;
 	protected _checked: boolean;
 	protected _radio: boolean;
-	protected _order: number;
 	protected _actionCallback: (event?: any) => TPromise<any>;
 
 	constructor(id: string, label: string = '', cssClass: string = '', enabled: boolean = true, actionCallback?: (event?: any) => TPromise<any>) {
@@ -173,14 +173,6 @@ export class Action implements IAction {
 		}
 	}
 
-	public get order(): number {
-		return this._order;
-	}
-
-	public set order(value: number) {
-		this._order = value;
-	}
-
 	public run(event?: any, data?: ITelemetryData): TPromise<any> {
 		if (this._actionCallback !== void 0) {
 			return this._actionCallback(event);
@@ -195,18 +187,13 @@ export interface IRunEvent {
 	error?: any;
 }
 
-export class ActionRunner implements IActionRunner {
+export class ActionRunner extends Disposable implements IActionRunner {
 
-	private _onDidBeforeRun = new Emitter<IRunEvent>();
-	private _onDidRun = new Emitter<IRunEvent>();
+	private _onDidBeforeRun = this._register(new Emitter<IRunEvent>());
+	public get onDidBeforeRun(): Event<IRunEvent> { return this._onDidBeforeRun.event; }
 
-	public get onDidRun(): Event<IRunEvent> {
-		return this._onDidRun.event;
-	}
-
-	public get onDidBeforeRun(): Event<IRunEvent> {
-		return this._onDidBeforeRun.event;
-	}
+	private _onDidRun = this._register(new Emitter<IRunEvent>());
+	public get onDidRun(): Event<IRunEvent> { return this._onDidRun.event; }
 
 	public run(action: IAction, context?: any): TPromise<any> {
 		if (!action.enabled) {
@@ -225,17 +212,12 @@ export class ActionRunner implements IActionRunner {
 	protected runAction(action: IAction, context?: any): TPromise<any> {
 		const res = context ? action.run(context) : action.run();
 
-		if (TPromise.is(res)) {
+		if (isThenable(res)) {
 			return res;
 		}
 
 		return TPromise.wrap(res);
 	}
-
-	public dispose(): void {
-		this._onDidBeforeRun.dispose();
-		this._onDidRun.dispose();
-	}
 }
 
 export class RadioGroup {
diff --git a/src/vs/base/common/amd.ts b/src/vs/base/common/amd.ts
new file mode 100644
index 00000000000..362a2e1e6f1
--- /dev/null
+++ b/src/vs/base/common/amd.ts
@@ -0,0 +1,12 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+import { URI } from 'vs/base/common/uri';
+
+export function getPathFromAmdModule(requirefn: typeof require, relativePath: string): string {
+	return URI.parse(requirefn.toUrl(relativePath)).fsPath;
+}
diff --git a/src/vs/base/common/arrays.ts b/src/vs/base/common/arrays.ts
index f9ddfdc71aa..53812c1bf97 100644
--- a/src/vs/base/common/arrays.ts
+++ b/src/vs/base/common/arrays.ts
@@ -4,15 +4,17 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import { TPromise } from 'vs/base/common/winjs.base';
+import { CancellationToken } from 'vs/base/common/cancellation';
+import { canceled } from 'vs/base/common/errors';
 import { ISplice } from 'vs/base/common/sequence';
+import { TPromise } from 'vs/base/common/winjs.base';
 
 /**
  * Returns the last element of an array.
  * @param array The array.
  * @param n Which element from the end (default is zero).
  */
-export function tail<T>(array: T[], n: number = 0): T {
+export function tail<T>(array: ArrayLike<T>, n: number = 0): T {
 	return array[array.length - (1 + n)];
 }
 
@@ -24,7 +26,15 @@ export function tail2<T>(arr: T[]): [T[], T] {
 	return [arr.slice(0, arr.length - 1), arr[arr.length - 1]];
 }
 
-export function equals<T>(one: T[], other: T[], itemEquals: (a: T, b: T) => boolean = (a, b) => a === b): boolean {
+export function equals<T>(one: ReadonlyArray<T>, other: ReadonlyArray<T>, itemEquals: (a: T, b: T) => boolean = (a, b) => a === b): boolean {
+	if (one === other) {
+		return true;
+	}
+
+	if (!one || !other) {
+		return false;
+	}
+
 	if (one.length !== other.length) {
 		return false;
 	}
@@ -77,48 +87,56 @@ export function findFirstInSorted<T>(array: T[], p: (x: T) => boolean): number {
 	return low;
 }
 
+type Compare<T> = (a: T, b: T) => number;
+
 /**
  * Like `Array#sort` but always stable. Usually runs a little slower `than Array#sort`
  * so only use this when actually needing stable sort.
  */
-export function mergeSort<T>(data: T[], compare: (a: T, b: T) => number): T[] {
-	_divideAndMerge(data, compare);
+export function mergeSort<T>(data: T[], compare: Compare<T>): T[] {
+	_sort(data, compare, 0, data.length - 1, []);
 	return data;
 }
 
-function _divideAndMerge<T>(data: T[], compare: (a: T, b: T) => number): void {
-	if (data.length <= 1) {
-		// sorted
-		return;
+function _merge<T>(a: T[], compare: Compare<T>, lo: number, mid: number, hi: number, aux: T[]): void {
+	let leftIdx = lo, rightIdx = mid + 1;
+	for (let i = lo; i <= hi; i++) {
+		aux[i] = a[i];
 	}
-	const p = (data.length / 2) | 0;
-	const left = data.slice(0, p);
-	const right = data.slice(p);
-
-	_divideAndMerge(left, compare);
-	_divideAndMerge(right, compare);
-
-	let leftIdx = 0;
-	let rightIdx = 0;
-	let i = 0;
-	while (leftIdx < left.length && rightIdx < right.length) {
-		let ret = compare(left[leftIdx], right[rightIdx]);
-		if (ret <= 0) {
-			// smaller_equal -> take left to preserve order
-			data[i++] = left[leftIdx++];
+	for (let i = lo; i <= hi; i++) {
+		if (leftIdx > mid) {
+			// left side consumed
+			a[i] = aux[rightIdx++];
+		} else if (rightIdx > hi) {
+			// right side consumed
+			a[i] = aux[leftIdx++];
+		} else if (compare(aux[rightIdx], aux[leftIdx]) < 0) {
+			// right element is less -> comes first
+			a[i] = aux[rightIdx++];
 		} else {
-			// greater -> take right
-			data[i++] = right[rightIdx++];
+			// left element comes first (less or equal)
+			a[i] = aux[leftIdx++];
 		}
 	}
-	while (leftIdx < left.length) {
-		data[i++] = left[leftIdx++];
-	}
-	while (rightIdx < right.length) {
-		data[i++] = right[rightIdx++];
-	}
 }
 
+function _sort<T>(a: T[], compare: Compare<T>, lo: number, hi: number, aux: T[]) {
+	if (hi <= lo) {
+		return;
+	}
+	let mid = lo + ((hi - lo) / 2) | 0;
+	_sort(a, compare, lo, mid, aux);
+	_sort(a, compare, mid + 1, hi, aux);
+	if (compare(a[mid], a[mid + 1]) <= 0) {
+		// left and right are sorted and if the last-left element is less
+		// or equals than the first-right element there is nothing else
+		// to do
+		return;
+	}
+	_merge(a, compare, lo, mid, hi, aux);
+}
+
+
 export function groupBy<T>(data: T[], compare: (a: T, b: T) => number): T[][] {
 	const result: T[][] = [];
 	let currentGroup: T[];
@@ -244,11 +262,11 @@ export function top<T>(array: T[], compare: (a: T, b: T) => number, n: number):
  * @param batch The number of elements to examine before yielding to the event loop.
  * @return The first n elemnts from array when sorted with compare.
  */
-export function topAsync<T>(array: T[], compare: (a: T, b: T) => number, n: number, batch: number): TPromise<T[]> {
+export function topAsync<T>(array: T[], compare: (a: T, b: T) => number, n: number, batch: number, token?: CancellationToken): TPromise<T[]> {
 	if (n === 0) {
 		return TPromise.as([]);
 	}
-	let canceled = false;
+
 	return new TPromise((resolve, reject) => {
 		(async () => {
 			const o = array.length;
@@ -257,16 +275,14 @@ export function topAsync<T>(array: T[], compare: (a: T, b: T) => number, n: numb
 				if (i > n) {
 					await new Promise(resolve => setTimeout(resolve)); // nextTick() would starve I/O.
 				}
-				if (canceled) {
-					throw new Error('canceled');
+				if (token && token.isCancellationRequested) {
+					throw canceled();
 				}
 				topStep(array, compare, result, i, m);
 			}
 			return result;
 		})()
 			.then(resolve, reject);
-	}, () => {
-		canceled = true;
 	});
 }
 
@@ -284,12 +300,27 @@ function topStep<T>(array: T[], compare: (a: T, b: T) => number, result: T[], i:
 /**
  * @returns a new array with all undefined or null values removed. The original array is not modified at all.
  */
-export function coalesce<T>(array: T[]): T[] {
+export function coalesce<T>(array: T[]): T[];
+export function coalesce<T>(array: T[], inplace: true): void;
+export function coalesce<T>(array: T[], inplace?: true): void | T[] {
 	if (!array) {
-		return array;
+		if (!inplace) {
+			return array;
+		}
 	}
+	if (!inplace) {
+		return array.filter(e => !!e);
 
-	return array.filter(e => !!e);
+	} else {
+		let to = 0;
+		for (let i = 0; i < array.length; i++) {
+			if (!!array[i]) {
+				array[to] = array[i];
+				to += 1;
+			}
+		}
+		array.length = to;
+	}
 }
 
 /**
@@ -451,15 +482,55 @@ export function arrayInsert<T>(target: T[], insertIndex: number, insertArr: T[])
  * Uses Fisher-Yates shuffle to shuffle the given array
  * @param array
  */
-export function shuffle<T>(array: T[]): void {
-	var i = 0
-		, j = 0
-		, temp = null;
+export function shuffle<T>(array: T[], seed?: number): void {
+	// Seeded random number generator in JS. Modified from:
+	// https://stackoverflow.com/questions/521295/seeding-the-random-number-generator-in-javascript
+	const random = () => {
+		var x = Math.sin(seed++) * 179426549; // throw away most significant digits and reduce any potential bias
+		return x - Math.floor(x);
+	};
 
-	for (i = array.length - 1; i > 0; i -= 1) {
-		j = Math.floor(Math.random() * (i + 1));
-		temp = array[i];
+	const rand = typeof seed === 'number' ? random : Math.random;
+
+	for (let i = array.length - 1; i > 0; i -= 1) {
+		let j = Math.floor(rand() * (i + 1));
+		let temp = array[i];
 		array[i] = array[j];
 		array[j] = temp;
 	}
 }
+
+/**
+ * Pushes an element to the start of the array, if found.
+ */
+export function pushToStart<T>(arr: T[], value: T): void {
+	const index = arr.indexOf(value);
+
+	if (index > -1) {
+		arr.splice(index, 1);
+		arr.unshift(value);
+	}
+}
+
+/**
+ * Pushes an element to the end of the array, if found.
+ */
+export function pushToEnd<T>(arr: T[], value: T): void {
+	const index = arr.indexOf(value);
+
+	if (index > -1) {
+		arr.splice(index, 1);
+		arr.push(value);
+	}
+}
+
+export function find<T>(arr: ArrayLike<T>, predicate: (value: T, index: number, arr: ArrayLike<T>) => any): T | undefined {
+	for (let i = 0; i < arr.length; i++) {
+		const element = arr[i];
+		if (predicate(element, i, arr)) {
+			return element;
+		}
+	}
+
+	return undefined;
+}
diff --git a/src/vs/base/common/async.ts b/src/vs/base/common/async.ts
index d9177bec2c9..f6a2fee985e 100644
--- a/src/vs/base/common/async.ts
+++ b/src/vs/base/common/async.ts
@@ -5,12 +5,12 @@
 
 'use strict';
 
-import * as errors from 'vs/base/common/errors';
-import { TPromise, ValueCallback, ErrorCallback, ProgressCallback } from 'vs/base/common/winjs.base';
 import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
-import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
-import { Event, Emitter } from 'vs/base/common/event';
-import URI from 'vs/base/common/uri';
+import * as errors from 'vs/base/common/errors';
+import { Emitter, Event } from 'vs/base/common/event';
+import { Disposable } from 'vs/base/common/lifecycle';
+import { URI } from 'vs/base/common/uri';
+import { ErrorCallback, TPromise, ValueCallback } from 'vs/base/common/winjs.base';
 
 export function isThenable<T>(obj: any): obj is Thenable<T> {
 	return obj && typeof (<Thenable<any>>obj).then === 'function';
@@ -24,90 +24,53 @@ export function toThenable<T>(arg: T | Thenable<T>): Thenable<T> {
 	}
 }
 
-export function toWinJsPromise<T>(arg: Thenable<T> | TPromise<T>): TPromise<T> {
-	if (arg instanceof TPromise) {
-		return arg;
-	}
-
-	return new TPromise((resolve, reject) => arg.then(resolve, reject));
+export interface CancelablePromise<T> extends Promise<T> {
+	cancel(): void;
 }
 
-export function asWinJsPromise<T>(callback: (token: CancellationToken) => T | TPromise<T> | Thenable<T>): TPromise<T> {
-	let source = new CancellationTokenSource();
-	return new TPromise<T>((resolve, reject, progress) => {
-		let item = callback(source.token);
-		if (item instanceof TPromise) {
-			item.then(result => {
-				source.dispose();
-				resolve(result);
-			}, err => {
-				source.dispose();
-				reject(err);
-			}, progress);
-		} else if (isThenable<T>(item)) {
-			item.then(result => {
-				source.dispose();
-				resolve(result);
-			}, err => {
-				source.dispose();
-				reject(err);
-			});
-		} else {
+export function createCancelablePromise<T>(callback: (token: CancellationToken) => Thenable<T>): CancelablePromise<T> {
+	const source = new CancellationTokenSource();
+
+	const thenable = callback(source.token);
+	const promise = new Promise<T>((resolve, reject) => {
+		source.token.onCancellationRequested(() => {
+			reject(errors.canceled());
+		});
+		Promise.resolve(thenable).then(value => {
 			source.dispose();
+			resolve(value);
+		}, err => {
+			source.dispose();
+			reject(err);
+		});
+	});
+
+	return new class implements CancelablePromise<T> {
+		cancel() {
+			source.cancel();
+		}
+		then<TResult1 = T, TResult2 = never>(resolve?: ((value: T) => TResult1 | Thenable<TResult1>) | undefined | null, reject?: ((reason: any) => TResult2 | Thenable<TResult2>) | undefined | null): Promise<TResult1 | TResult2> {
+			return promise.then(resolve, reject);
+		}
+		catch<TResult = never>(reject?: ((reason: any) => TResult | Thenable<TResult>) | undefined | null): Promise<T | TResult> {
+			return this.then(undefined, reject);
+		}
+	};
+}
+
+export function asThenable<T>(callback: () => T | TPromise<T> | Thenable<T>): Thenable<T> {
+	return new TPromise<T>((resolve, reject) => {
+		let item = callback();
+		if (item instanceof TPromise) {
+			item.then(resolve, reject);
+		} else if (isThenable<T>(item)) {
+			item.then(resolve, reject);
+		} else {
 			resolve(item);
 		}
-	}, () => {
-		source.cancel();
 	});
 }
 
-export function asWinJSImport<T>(importPromise: Thenable<T>): TPromise<T> {
-	return toWinJsPromise(importPromise); // workaround for https://github.com/Microsoft/vscode/issues/48205
-}
-
-/**
- * Hook a cancellation token to a WinJS Promise
- */
-export function wireCancellationToken<T>(token: CancellationToken, promise: TPromise<T>, resolveAsUndefinedWhenCancelled?: boolean): Thenable<T> {
-	const subscription = token.onCancellationRequested(() => promise.cancel());
-	if (resolveAsUndefinedWhenCancelled) {
-		promise = promise.then<T>(undefined, err => {
-			if (!errors.isPromiseCanceledError(err)) {
-				return TPromise.wrapError(err);
-			}
-			return undefined;
-		});
-	}
-	return always(promise, () => subscription.dispose());
-}
-
-export function asDisposablePromise<T>(input: Thenable<T>, cancelValue?: T, bucket?: IDisposable[]): { promise: Thenable<T> } & IDisposable {
-	let dispose: () => void;
-	let promise = new TPromise((resolve, reject) => {
-		dispose = function () {
-			resolve(cancelValue);
-			if (isWinJSPromise(input)) {
-				input.cancel();
-			}
-		};
-		input.then(resolve, err => {
-			if (errors.isPromiseCanceledError(err)) {
-				resolve(cancelValue);
-			} else {
-				reject(err);
-			}
-		});
-	});
-	let res = {
-		promise,
-		dispose
-	};
-	if (Array.isArray(bucket)) {
-		bucket.push(res);
-	}
-	return res;
-}
-
 export interface ITask<T> {
 	(): T;
 }
@@ -164,32 +127,26 @@ export class Throttler {
 					return result;
 				};
 
-				this.queuedPromise = new TPromise((c, e, p) => {
-					this.activePromise.then(onComplete, onComplete, p).done(c);
-				}, () => {
-					this.activePromise.cancel();
+				this.queuedPromise = new TPromise(c => {
+					this.activePromise.then(onComplete, onComplete).then(c);
 				});
 			}
 
-			return new TPromise((c, e, p) => {
-				this.queuedPromise.then(c, e, p);
-			}, () => {
-				// no-op
+			return new TPromise((c, e) => {
+				this.queuedPromise.then(c, e);
 			});
 		}
 
 		this.activePromise = promiseFactory();
 
-		return new TPromise((c, e, p) => {
-			this.activePromise.done((result: any) => {
+		return new TPromise((c, e) => {
+			this.activePromise.then((result: any) => {
 				this.activePromise = null;
 				c(result);
 			}, (err: any) => {
 				this.activePromise = null;
 				e(err);
-			}, p);
-		}, () => {
-			this.activePromise.cancel();
+			});
 		});
 	}
 }
@@ -231,13 +188,14 @@ export class Delayer<T> {
 
 	private timeout: number;
 	private completionPromise: TPromise;
-	private onSuccess: ValueCallback;
+	private doResolve: ValueCallback;
+	private doReject: (err: any) => void;
 	private task: ITask<T | TPromise<T>>;
 
 	constructor(public defaultDelay: number) {
 		this.timeout = null;
 		this.completionPromise = null;
-		this.onSuccess = null;
+		this.doResolve = null;
 		this.task = null;
 	}
 
@@ -246,13 +204,12 @@ export class Delayer<T> {
 		this.cancelTimeout();
 
 		if (!this.completionPromise) {
-			this.completionPromise = new TPromise((c) => {
-				this.onSuccess = c;
-			}, () => {
-				// no-op
+			this.completionPromise = new TPromise((c, e) => {
+				this.doResolve = c;
+				this.doReject = e;
 			}).then(() => {
 				this.completionPromise = null;
-				this.onSuccess = null;
+				this.doResolve = null;
 				const task = this.task;
 				this.task = null;
 
@@ -262,7 +219,7 @@ export class Delayer<T> {
 
 		this.timeout = setTimeout(() => {
 			this.timeout = null;
-			this.onSuccess(null);
+			this.doResolve(null);
 		}, delay);
 
 		return this.completionPromise;
@@ -276,7 +233,7 @@ export class Delayer<T> {
 		this.cancelTimeout();
 
 		if (this.completionPromise) {
-			this.completionPromise.cancel();
+			this.doReject(errors.canceled());
 			this.completionPromise = null;
 		}
 	}
@@ -322,10 +279,8 @@ export class Barrier {
 
 	constructor() {
 		this._isOpen = false;
-		this._promise = new TPromise<boolean>((c, e, p) => {
+		this._promise = new TPromise<boolean>((c, e) => {
 			this._completePromise = c;
-		}, () => {
-			console.warn('You should really not try to cancel this ready promise!');
 		});
 	}
 
@@ -343,37 +298,23 @@ export class Barrier {
 	}
 }
 
-export class ShallowCancelThenPromise<T> extends TPromise<T> {
-
-	constructor(outer: TPromise<T>) {
-
-		let completeCallback: ValueCallback,
-			errorCallback: ErrorCallback,
-			progressCallback: ProgressCallback;
-
-		super((c, e, p) => {
-			completeCallback = c;
-			errorCallback = e;
-			progressCallback = p;
-		}, () => {
-			// cancel this promise but not the
-			// outer promise
-			errorCallback(errors.canceled());
-		});
-
-		outer.then(completeCallback, errorCallback, progressCallback);
-	}
-}
-
 /**
  * Replacement for `WinJS.TPromise.timeout`.
  */
-export function timeout(n: number): Thenable<void> {
-	return new TPromise(resolve => setTimeout(resolve, n));
-}
+export function timeout(millis: number): CancelablePromise<void>;
+export function timeout(millis: number, token: CancellationToken): Thenable<void>;
+export function timeout(millis: number, token?: CancellationToken): CancelablePromise<void> | Thenable<void> {
+	if (!token) {
+		return createCancelablePromise(token => timeout(millis, token));
+	}
 
-function isWinJSPromise(candidate: any): candidate is TPromise {
-	return TPromise.is(candidate) && typeof (<TPromise>candidate).done === 'function';
+	return new Promise((resolve, reject) => {
+		const handle = setTimeout(resolve, millis);
+		token.onCancellationRequested(() => {
+			clearTimeout(handle);
+			reject(errors.canceled());
+		});
+	});
 }
 
 /**
@@ -381,39 +322,20 @@ function isWinJSPromise(candidate: any): candidate is TPromise {
  * the provided promise the provided function will always be called. This
  * method is comparable to a try-finally code block.
  * @param promise a promise
- * @param f a function that will be call in the success and error case.
+ * @param callback a function that will be call in the success and error case.
  */
-export function always<T>(thenable: TPromise<T>, f: Function): TPromise<T>;
-export function always<T>(promise: Thenable<T>, f: Function): Thenable<T>;
-export function always<T>(winjsPromiseOrThenable: Thenable<T> | TPromise<T>, f: Function): TPromise<T> | Thenable<T> {
-	if (isWinJSPromise(winjsPromiseOrThenable)) {
-		return new TPromise<T>((c, e, p) => {
-			winjsPromiseOrThenable.done((result) => {
-				try {
-					f(result);
-				} catch (e1) {
-					errors.onUnexpectedError(e1);
-				}
-				c(result);
-			}, (err) => {
-				try {
-					f(err);
-				} catch (e1) {
-					errors.onUnexpectedError(e1);
-				}
-				e(err);
-			}, (progress) => {
-				p(progress);
-			});
-		}, () => {
-			winjsPromiseOrThenable.cancel();
-		});
-
-	} else {
-		// simple
-		winjsPromiseOrThenable.then(_ => f(), _ => f());
-		return winjsPromiseOrThenable;
+export function always<T>(thenable: TPromise<T>, callback: () => void): TPromise<T>;
+export function always<T>(promise: Thenable<T>, callback: () => void): Thenable<T>;
+export function always<T>(winjsPromiseOrThenable: Thenable<T>, callback: () => void) {
+	function safeCallback() {
+		try {
+			callback();
+		} catch (err) {
+			errors.onUnexpectedError(err);
+		}
 	}
+	winjsPromiseOrThenable.then(_ => safeCallback(), _ => safeCallback());
+	return winjsPromiseOrThenable;
 }
 
 /**
@@ -423,16 +345,11 @@ export function always<T>(winjsPromiseOrThenable: Thenable<T> | TPromise<T>, f:
 
 export function sequence<T>(promiseFactories: ITask<Thenable<T>>[]): TPromise<T[]> {
 	const results: T[] = [];
+	let index = 0;
+	const len = promiseFactories.length;
 
-	// reverse since we start with last element using pop()
-	promiseFactories = promiseFactories.reverse();
-
-	function next(): Thenable<any> {
-		if (promiseFactories.length) {
-			return promiseFactories.pop()();
-		}
-
-		return null;
+	function next(): Thenable<T> | null {
+		return index < len ? promiseFactories[index++]() : null;
 	}
 
 	function thenHandler(result: any): Thenable<any> {
@@ -451,15 +368,38 @@ export function sequence<T>(promiseFactories: ITask<Thenable<T>>[]): TPromise<T[
 	return TPromise.as(null).then(thenHandler);
 }
 
-export function first<T>(promiseFactories: ITask<TPromise<T>>[], shouldStop: (t: T) => boolean = t => !!t): TPromise<T> {
-	promiseFactories = [...promiseFactories.reverse()];
+export function first2<T>(promiseFactories: ITask<Promise<T>>[], shouldStop: (t: T) => boolean = t => !!t, defaultValue: T = null): Promise<T> {
+
+	let index = 0;
+	const len = promiseFactories.length;
+
+	const loop = () => {
+		if (index >= len) {
+			return Promise.resolve(defaultValue);
+		}
+		const factory = promiseFactories[index++];
+		const promise = factory();
+		return promise.then(result => {
+			if (shouldStop(result)) {
+				return Promise.resolve(result);
+			}
+			return loop();
+		});
+	};
+
+	return loop();
+}
+
+export function first<T>(promiseFactories: ITask<TPromise<T>>[], shouldStop: (t: T) => boolean = t => !!t, defaultValue: T = null): TPromise<T> {
+	let index = 0;
+	const len = promiseFactories.length;
 
 	const loop: () => TPromise<T> = () => {
-		if (promiseFactories.length === 0) {
-			return TPromise.as(null);
+		if (index >= len) {
+			return TPromise.as(defaultValue);
 		}
 
-		const factory = promiseFactories.pop();
+		const factory = promiseFactories[index++];
 		const promise = factory();
 
 		return promise.then(result => {
@@ -478,7 +418,6 @@ interface ILimitedTaskFactory {
 	factory: ITask<TPromise>;
 	c: ValueCallback;
 	e: ErrorCallback;
-	p: ProgressCallback;
 }
 
 /**
@@ -507,14 +446,9 @@ export class Limiter<T> {
 	}
 
 	queue(promiseFactory: ITask<TPromise>): TPromise;
-	queue(promiseFactory: ITask<TPromise<T>>): TPromise<T> {
-		return new TPromise<T>((c, e, p) => {
-			this.outstandingPromises.push({
-				factory: promiseFactory,
-				c: c,
-				e: e,
-				p: p
-			});
+	queue(factory: ITask<TPromise<T>>): TPromise<T> {
+		return new TPromise<T>((c, e) => {
+			this.outstandingPromises.push({ factory, c, e });
 
 			this.consume();
 		});
@@ -526,8 +460,8 @@ export class Limiter<T> {
 			this.runningPromises++;
 
 			const promise = iLimitedTask.factory();
-			promise.done(iLimitedTask.c, iLimitedTask.e, iLimitedTask.p);
-			promise.done(() => this.consumed(), () => this.consumed());
+			promise.then(iLimitedTask.c, iLimitedTask.e);
+			promise.then(() => this.consumed(), () => this.consumed());
 		}
 	}
 
@@ -583,17 +517,18 @@ export class ResourceQueue {
 	}
 }
 
-export function setDisposableTimeout(handler: Function, timeout: number, ...args: any[]): IDisposable {
-	const handle = setTimeout(handler, timeout, ...args);
-	return { dispose() { clearTimeout(handle); } };
-}
-
 export class TimeoutTimer extends Disposable {
 	private _token: number;
 
-	constructor() {
+	constructor();
+	constructor(runner: () => void, timeout: number);
+	constructor(runner?: () => void, timeout?: number) {
 		super();
 		this._token = -1;
+
+		if (typeof runner === 'function' && typeof timeout === 'number') {
+			this.setIfNotSet(runner, timeout);
+		}
 	}
 
 	dispose(): void {
@@ -749,11 +684,11 @@ export class RunOnceWorker<T> extends RunOnceScheduler {
 export function nfcall(fn: Function, ...args: any[]): TPromise;
 export function nfcall<T>(fn: Function, ...args: any[]): TPromise<T>;
 export function nfcall(fn: Function, ...args: any[]): any {
-	return new TPromise((c, e) => fn(...args, (err: any, result: any) => err ? e(err) : c(result)), () => null);
+	return new TPromise((c, e) => fn(...args, (err: any, result: any) => err ? e(err) : c(result)));
 }
 
 export function ninvoke(thisArg: any, fn: Function, ...args: any[]): TPromise;
 export function ninvoke<T>(thisArg: any, fn: Function, ...args: any[]): TPromise<T>;
 export function ninvoke(thisArg: any, fn: Function, ...args: any[]): any {
-	return new TPromise((c, e) => fn.call(thisArg, ...args, (err: any, result: any) => err ? e(err) : c(result)), () => null);
+	return new TPromise((c, e) => fn.call(thisArg, ...args, (err: any, result: any) => err ? e(err) : c(result)));
 }
diff --git a/src/vs/base/common/cache.ts b/src/vs/base/common/cache.ts
index 65c468842ce..2be451e2eba 100644
--- a/src/vs/base/common/cache.ts
+++ b/src/vs/base/common/cache.ts
@@ -5,25 +5,37 @@
 
 'use strict';
 
-import { TPromise } from 'vs/base/common/winjs.base';
+import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
+import { always } from 'vs/base/common/async';
 
-export default class Cache<T> {
+export interface CacheResult<T> {
+	promise: Thenable<T>;
+	dispose(): void;
+}
 
-	private promise: TPromise<T> = null;
-	constructor(private task: () => TPromise<T>) { }
+export class Cache<T> {
 
-	get(): TPromise<T> {
-		if (this.promise) {
-			return this.promise;
+	private result: CacheResult<T> = null;
+	constructor(private task: (ct: CancellationToken) => Thenable<T>) { }
+
+	get(): CacheResult<T> {
+		if (this.result) {
+			return this.result;
 		}
 
-		const promise = this.task();
+		const cts = new CancellationTokenSource();
+		const promise = this.task(cts.token);
+		always(promise, () => cts.dispose());
 
-		this.promise = new TPromise<T>((c, e) => promise.done(c, e), () => {
-			this.promise = null;
-			promise.cancel();
-		});
+		this.result = {
+			promise,
+			dispose: () => {
+				this.result = null;
+				cts.cancel();
+				cts.dispose();
+			}
+		};
 
-		return this.promise;
+		return this.result;
 	}
 }
diff --git a/src/vs/base/common/cancellation.ts b/src/vs/base/common/cancellation.ts
index e132d57e5e8..17d3e621317 100644
--- a/src/vs/base/common/cancellation.ts
+++ b/src/vs/base/common/cancellation.ts
@@ -5,7 +5,7 @@
 
 'use strict';
 
-import { Event, Emitter } from 'vs/base/common/event';
+import { Emitter, Event } from 'vs/base/common/event';
 import { IDisposable } from 'vs/base/common/lifecycle';
 
 export interface CancellationToken {
@@ -24,6 +24,21 @@ const shortcutEvent = Object.freeze(function (callback, context?): IDisposable {
 
 export namespace CancellationToken {
 
+	export function isCancellationToken(thing: any): thing is CancellationToken {
+		if (thing === CancellationToken.None || thing === CancellationToken.Cancelled) {
+			return true;
+		}
+		if (thing instanceof MutableToken) {
+			return true;
+		}
+		if (!thing || typeof thing !== 'object') {
+			return false;
+		}
+		return typeof (thing as CancellationToken).isCancellationRequested === 'boolean'
+			&& typeof (thing as CancellationToken).onCancellationRequested === 'function';
+	}
+
+
 	export const None: CancellationToken = Object.freeze({
 		isCancellationRequested: false,
 		onCancellationRequested: Event.None
diff --git a/src/vs/base/common/decorators.ts b/src/vs/base/common/decorators.ts
index 719407fe245..3fac80e7c15 100644
--- a/src/vs/base/common/decorators.ts
+++ b/src/vs/base/common/decorators.ts
@@ -69,19 +69,23 @@ export interface IDebouceReducer<T> {
 export function debounce<T>(delay: number, reducer?: IDebouceReducer<T>, initialValueProvider?: () => T): Function {
 	return createDecorator((fn, key) => {
 		const timerKey = `$debounce$${key}`;
-		let result = initialValueProvider ? initialValueProvider() : void 0;
+		const resultKey = `$debounce$result$${key}`;
 
 		return function (this: any, ...args: any[]) {
+			if (!this[resultKey]) {
+				this[resultKey] = initialValueProvider ? initialValueProvider() : void 0;
+			}
+
 			clearTimeout(this[timerKey]);
 
 			if (reducer) {
-				result = reducer(result, ...args);
-				args = [result];
+				this[resultKey] = reducer(this[resultKey], ...args);
+				args = [this[resultKey]];
 			}
 
 			this[timerKey] = setTimeout(() => {
 				fn.apply(this, args);
-				result = initialValueProvider ? initialValueProvider() : void 0;
+				this[resultKey] = initialValueProvider ? initialValueProvider() : void 0;
 			}, delay);
 		};
 	});
diff --git a/src/vs/base/common/diagnostics.ts b/src/vs/base/common/diagnostics.ts
deleted file mode 100644
index 7ad7daa18d4..00000000000
--- a/src/vs/base/common/diagnostics.ts
+++ /dev/null
@@ -1,88 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-'use strict';
-
-import * as Platform from 'vs/base/common/platform';
-
-/**
- * To enable diagnostics, open a browser console and type: window.Monaco.Diagnostics.<diagnostics name> = true.
- * Then trigger an action that will write to diagnostics to see all cached output from the past.
- */
-
-const globals = Platform.globals;
-if (!globals.Monaco) {
-	globals.Monaco = {};
-}
-globals.Monaco.Diagnostics = {};
-
-const switches = globals.Monaco.Diagnostics;
-const map = new Map<string, Function[]>();
-const data: any[] = [];
-
-function fifo(array: any[], size: number) {
-	while (array.length > size) {
-		array.shift();
-	}
-}
-
-export function register(what: string, fn: Function): (...args: any[]) => void {
-
-	let disable = true; // Otherwise we have unreachable code.
-	if (disable) {
-		return () => {
-			// Intentional empty, disable for now because it is leaking memory
-		};
-	}
-
-	// register switch
-	const flag = switches[what] || false;
-	switches[what] = flag;
-
-	// register function
-	const tracers = map.get(what) || [];
-	tracers.push(fn);
-	map.set(what, tracers);
-
-	const result = function (...args: any[]) {
-
-		let idx: number;
-
-		if (switches[what] === true) {
-			// replay back-in-time functions
-			const allArgs = [arguments];
-			idx = data.indexOf(fn);
-			if (idx !== -1) {
-				allArgs.unshift.apply(allArgs, data[idx + 1] || []);
-				data[idx + 1] = [];
-			}
-
-			const doIt: () => void = function () {
-				const thisArguments = allArgs.shift();
-				fn.apply(fn, thisArguments);
-				if (allArgs.length > 0) {
-					setTimeout(doIt, 500);
-				}
-			};
-			doIt();
-
-		} else {
-			// know where to store
-			idx = data.indexOf(fn);
-			idx = idx !== -1 ? idx : data.length;
-			const dataIdx = idx + 1;
-
-			// store arguments
-			const allargs = data[dataIdx] || [];
-			allargs.push(arguments);
-			fifo(allargs, 50);
-
-			// store data
-			data[idx] = fn;
-			data[dataIdx] = allargs;
-		}
-	};
-
-	return result;
-}
diff --git a/src/vs/base/common/event.ts b/src/vs/base/common/event.ts
index 060b728bcc6..ac6ffd0e16a 100644
--- a/src/vs/base/common/event.ts
+++ b/src/vs/base/common/event.ts
@@ -4,11 +4,11 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import { IDisposable, toDisposable, combinedDisposable, empty as EmptyDisposable } from 'vs/base/common/lifecycle';
-import { TPromise } from 'vs/base/common/winjs.base';
-import { once as onceFn } from 'vs/base/common/functional';
 import { onUnexpectedError } from 'vs/base/common/errors';
+import { once as onceFn } from 'vs/base/common/functional';
+import { combinedDisposable, Disposable, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
 import { LinkedList } from 'vs/base/common/linkedList';
+import { TPromise } from 'vs/base/common/winjs.base';
 
 /**
  * To an event a function with one or zero parameters
@@ -58,9 +58,9 @@ export class Emitter<T> {
 	private static readonly _noop = function () { };
 
 	private _event: Event<T>;
-	private _listeners: LinkedList<Listener>;
-	private _deliveryQueue: [Listener, T][];
 	private _disposed: boolean;
+	private _deliveryQueue: [Listener, T][];
+	protected _listeners: LinkedList<Listener>;
 
 	constructor(private _options?: EmitterOptions) {
 
@@ -159,6 +159,52 @@ export class Emitter<T> {
 	}
 }
 
+export interface IWaitUntil {
+	waitUntil(thenable: Thenable<any>): void;
+}
+
+export class AsyncEmitter<T extends IWaitUntil> extends Emitter<T> {
+
+	private _asyncDeliveryQueue: [Listener, T, Thenable<any>[]][];
+
+	async fireAsync(eventFn: (thenables: Thenable<any>[], listener: Function) => T): Promise<void> {
+		if (!this._listeners) {
+			return;
+		}
+
+		// put all [listener,event]-pairs into delivery queue
+		// then emit all event. an inner/nested event might be
+		// the driver of this
+		if (!this._asyncDeliveryQueue) {
+			this._asyncDeliveryQueue = [];
+		}
+
+		for (let iter = this._listeners.iterator(), e = iter.next(); !e.done; e = iter.next()) {
+			let thenables: Thenable<void>[] = [];
+			this._asyncDeliveryQueue.push([e.value, eventFn(thenables, typeof e.value === 'function' ? e.value : e.value[0]), thenables]);
+		}
+
+		while (this._asyncDeliveryQueue.length > 0) {
+			const [listener, event, thenables] = this._asyncDeliveryQueue.shift();
+			try {
+				if (typeof listener === 'function') {
+					listener.call(undefined, event);
+				} else {
+					listener[0].call(listener[1], event);
+				}
+			} catch (e) {
+				onUnexpectedError(e);
+				continue;
+			}
+
+			// freeze thenables-collection to enforce sync-calls to
+			// wait until and then wait for all thenables to resolve
+			Object.freeze(thenables);
+			await Promise.all(thenables);
+		}
+	}
+}
+
 export class EventMultiplexer<T> implements IDisposable {
 
 	private readonly emitter: Emitter<T>;
@@ -231,7 +277,7 @@ export function fromCallback<T>(fn: (handler: (e: T) => void) => IDisposable): E
 	return emitter.event;
 }
 
-export function fromPromise<T =any>(promise: TPromise<T>): Event<T> {
+export function fromPromise<T =any>(promise: Thenable<T>): Event<T> {
 	const emitter = new Emitter<T>();
 	let shouldEmit = false;
 
@@ -249,22 +295,35 @@ export function fromPromise<T =any>(promise: TPromise<T>): Event<T> {
 	return emitter.event;
 }
 
-export function toPromise<T>(event: Event<T>): TPromise<T> {
-	return new TPromise(complete => {
-		const sub = event(e => {
-			sub.dispose();
-			complete(e);
-		});
-	});
+export function toPromise<T>(event: Event<T>): Thenable<T> {
+	return new TPromise(c => once(event)(c));
+}
+
+export function toNativePromise<T>(event: Event<T>): Thenable<T> {
+	return new Promise(c => once(event)(c));
 }
 
 export function once<T>(event: Event<T>): Event<T> {
 	return (listener, thisArgs = null, disposables?) => {
+		// we need this, in case the event fires during the listener call
+		let didFire = false;
+
 		const result = event(e => {
-			result.dispose();
+			if (didFire) {
+				return;
+			} else if (result) {
+				result.dispose();
+			} else {
+				didFire = true;
+			}
+
 			return listener.call(thisArgs, e);
 		}, null, disposables);
 
+		if (didFire) {
+			result.dispose();
+		}
+
 		return result;
 	};
 }
@@ -367,6 +426,7 @@ export interface IChainableEvent<T> {
 	filter(fn: (e: T) => boolean): IChainableEvent<T>;
 	latch(): IChainableEvent<T>;
 	on(listener: (e: T) => any, thisArgs?: any, disposables?: IDisposable[]): IDisposable;
+	once(listener: (e: T) => any, thisArgs?: any, disposables?: IDisposable[]): IDisposable;
 }
 
 export function mapEvent<I, O>(event: Event<I>, map: (i: I) => O): Event<O> {
@@ -377,6 +437,8 @@ export function forEach<I>(event: Event<I>, each: (i: I) => void): Event<I> {
 	return (listener, thisArgs = null, disposables?) => event(i => { each(i); listener.call(thisArgs, i); }, null, disposables);
 }
 
+export function filterEvent<T>(event: Event<T>, filter: (e: T) => boolean): Event<T>;
+export function filterEvent<T, R>(event: Event<T | R>, filter: (e: T | R) => e is R): Event<R>;
 export function filterEvent<T>(event: Event<T>, filter: (e: T) => boolean): Event<T> {
 	return (listener, thisArgs = null, disposables?) => event(e => filter(e) && listener.call(thisArgs, e), null, disposables);
 }
@@ -406,6 +468,10 @@ class ChainableEvent<T> implements IChainableEvent<T> {
 	on(listener: (e: T) => any, thisArgs: any, disposables: IDisposable[]) {
 		return this._event(listener, thisArgs, disposables);
 	}
+
+	once(listener: (e: T) => any, thisArgs: any, disposables: IDisposable[]) {
+		return once(this._event)(listener, thisArgs, disposables);
+	}
 }
 
 export function chain<T>(event: Event<T>): IChainableEvent<T> {
@@ -510,18 +576,34 @@ export function echo<T>(event: Event<T>, nextTick = false, buffer: T[] = []): Ev
 
 export class Relay<T> implements IDisposable {
 
-	private emitter = new Emitter<T>();
+	private listening = false;
+	private inputEvent: Event<T> = Event.None;
+	private inputEventListener: IDisposable = Disposable.None;
+
+	private emitter = new Emitter<T>({
+		onFirstListenerDidAdd: () => {
+			this.listening = true;
+			this.inputEventListener = this.inputEvent(this.emitter.fire, this.emitter);
+		},
+		onLastListenerRemove: () => {
+			this.listening = false;
+			this.inputEventListener.dispose();
+		}
+	});
+
 	readonly event: Event<T> = this.emitter.event;
 
-	private disposable: IDisposable = EmptyDisposable;
-
 	set input(event: Event<T>) {
-		this.disposable.dispose();
-		this.disposable = event(this.emitter.fire, this.emitter);
+		this.inputEvent = event;
+
+		if (this.listening) {
+			this.inputEventListener.dispose();
+			this.inputEventListener = event(this.emitter.fire, this.emitter);
+		}
 	}
 
 	dispose() {
-		this.disposable.dispose();
+		this.inputEventListener.dispose();
 		this.emitter.dispose();
 	}
 }
@@ -550,4 +632,4 @@ export function latch<T>(event: Event<T>): Event<T> {
 		cache = value;
 		return shouldEmit;
 	});
-}
\ No newline at end of file
+}
diff --git a/src/vs/base/common/filters.ts b/src/vs/base/common/filters.ts
index 5f052e2e02a..da02dae8613 100644
--- a/src/vs/base/common/filters.ts
+++ b/src/vs/base/common/filters.ts
@@ -4,9 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import * as strings from 'vs/base/common/strings';
-import { LRUCache } from 'vs/base/common/map';
 import { CharCode } from 'vs/base/common/charCode';
+import { LRUCache } from 'vs/base/common/map';
+import * as strings from 'vs/base/common/strings';
 
 export interface IFilter {
 	// Returns null if word doesn't match.
@@ -362,13 +362,19 @@ export function anyScore(pattern: string, word: string, patternMaxWhitespaceIgno
 
 //#region --- fuzzyScore ---
 
-export function createMatches(position: number[]): IMatch[] {
+export function createMatches(offsetOrScore: number[] | FuzzyScore): IMatch[] {
 	let ret: IMatch[] = [];
-	if (!position) {
+	if (!offsetOrScore) {
 		return ret;
 	}
+	let offsets: number[];
+	if (Array.isArray(offsetOrScore[1])) {
+		offsets = (offsetOrScore as FuzzyScore)[1];
+	} else {
+		offsets = offsetOrScore as number[];
+	}
 	let last: IMatch;
-	for (const pos of position) {
+	for (const pos of offsets) {
 		if (last && last.end === pos) {
 			last.end += 1;
 		} else {
diff --git a/src/vs/base/common/glob.ts b/src/vs/base/common/glob.ts
index cd8d81b84f3..8f22a244109 100644
--- a/src/vs/base/common/glob.ts
+++ b/src/vs/base/common/glob.ts
@@ -10,6 +10,7 @@ import * as paths from 'vs/base/common/paths';
 import { LRUCache } from 'vs/base/common/map';
 import { CharCode } from 'vs/base/common/charCode';
 import { TPromise } from 'vs/base/common/winjs.base';
+import { isThenable } from 'vs/base/common/async';
 
 export interface IExpression {
 	[pattern: string]: boolean | SiblingClause | any;
@@ -247,8 +248,8 @@ const T5 = /^([\w\.-]+(\/[\w\.-]+)*)\/?$/; 						   		// something/else
 
 export type ParsedPattern = (path: string, basename?: string) => boolean;
 
-// The ParsedExpression returns a Promise iff siblingsFn returns a Promise.
-export type ParsedExpression = (path: string, basename?: string, siblingsFn?: () => string[] | TPromise<string[]>) => string | TPromise<string> /* the matching pattern */;
+// The ParsedExpression returns a Promise iff hasSibling returns a Promise.
+export type ParsedExpression = (path: string, basename?: string, hasSibling?: (name: string) => boolean | TPromise<boolean>) => string | TPromise<string> /* the matching pattern */;
 
 export interface IGlobOptions {
 	/**
@@ -264,9 +265,8 @@ interface ParsedStringPattern {
 	allBasenames?: string[];
 	allPaths?: string[];
 }
-type SiblingsPattern = { siblings: string[], name: string };
 interface ParsedExpressionPattern {
-	(path: string, basename: string, siblingsPatternFn: () => SiblingsPattern | TPromise<SiblingsPattern>): string | TPromise<string> /* the matching pattern */;
+	(path: string, basename: string, name: string, hasSibling: (name: string) => boolean | TPromise<boolean>): string | TPromise<string> /* the matching pattern */;
 	requiresSiblings?: boolean;
 	allBasenames?: string[];
 	allPaths?: string[];
@@ -343,7 +343,7 @@ function wrapRelativePattern(parsedPattern: ParsedStringPattern, arg2: string |
 			return null;
 		}
 
-		return parsedPattern(paths.normalize(arg2.pathToRelative(arg2.base, path)), basename);
+		return parsedPattern(arg2.pathToRelative(arg2.base, path), basename);
 	};
 }
 
@@ -436,13 +436,13 @@ function toRegExp(pattern: string): ParsedStringPattern {
  * - character ranges (using [...])
  */
 export function match(pattern: string | IRelativePattern, path: string): boolean;
-export function match(expression: IExpression, path: string, siblingsFn?: () => string[]): string /* the matching pattern */;
-export function match(arg1: string | IExpression | IRelativePattern, path: string, siblingsFn?: () => string[]): any {
+export function match(expression: IExpression, path: string, hasSibling?: (name: string) => boolean): string /* the matching pattern */;
+export function match(arg1: string | IExpression | IRelativePattern, path: string, hasSibling?: (name: string) => boolean): any {
 	if (!arg1 || !path) {
 		return false;
 	}
 
-	return parse(<IExpression>arg1)(path, undefined, siblingsFn);
+	return parse(<IExpression>arg1)(path, undefined, hasSibling);
 }
 
 /**
@@ -482,6 +482,44 @@ export function parse(arg1: string | IExpression | IRelativePattern, options: IG
 	return parsedExpression(<IExpression>arg1, options);
 }
 
+export function hasSiblingPromiseFn(siblingsFn?: () => TPromise<string[]>) {
+	if (!siblingsFn) {
+		return undefined;
+	}
+
+	let siblings: TPromise<Record<string, true>>;
+	return (name: string) => {
+		if (!siblings) {
+			siblings = (siblingsFn() || TPromise.as([]))
+				.then(list => list ? listToMap(list) : {});
+		}
+		return siblings.then(map => !!map[name]);
+	};
+}
+
+export function hasSiblingFn(siblingsFn?: () => string[]) {
+	if (!siblingsFn) {
+		return undefined;
+	}
+
+	let siblings: Record<string, true>;
+	return (name: string) => {
+		if (!siblings) {
+			const list = siblingsFn();
+			siblings = list ? listToMap(list) : {};
+		}
+		return !!siblings[name];
+	};
+}
+
+function listToMap(list: string[]) {
+	const map: Record<string, true> = {};
+	for (const key of list) {
+		map[key] = true;
+	}
+	return map;
+}
+
 export function isRelativePattern(obj: any): obj is IRelativePattern {
 	const rp = obj as IRelativePattern;
 
@@ -493,8 +531,8 @@ export function isRelativePattern(obj: any): obj is IRelativePattern {
  */
 export function parseToAsync(expression: IExpression, options?: IGlobOptions): ParsedExpression {
 	const parsedExpression = parse(expression, options);
-	return (path: string, basename?: string, siblingsFn?: () => string[] | TPromise<string[]>): string | TPromise<string> => {
-		const result = parsedExpression(path, basename, siblingsFn);
+	return (path: string, basename?: string, hasSibling?: (name: string) => boolean | TPromise<boolean>): string | TPromise<string> => {
+		const result = parsedExpression(path, basename, hasSibling);
 		return result instanceof TPromise ? result : TPromise.as(result);
 	};
 }
@@ -522,7 +560,7 @@ function parsedExpression(expression: IExpression, options: IGlobOptions): Parse
 			return <ParsedStringPattern>parsedPatterns[0];
 		}
 
-		const resultExpression: ParsedStringPattern = function (path: string, basename: string, siblingsFn?: () => string[]) {
+		const resultExpression: ParsedStringPattern = function (path: string, basename: string) {
 			for (let i = 0, n = parsedPatterns.length; i < n; i++) {
 				// Pattern matches path
 				const result = (<ParsedStringPattern>parsedPatterns[i])(path, basename);
@@ -547,38 +585,21 @@ function parsedExpression(expression: IExpression, options: IGlobOptions): Parse
 		return resultExpression;
 	}
 
-	const resultExpression: ParsedStringPattern = function (path: string, basename: string, siblingsFn?: () => string[] | TPromise<string[]>) {
-		let siblingsPattern: SiblingsPattern | TPromise<SiblingsPattern>;
-		let siblingsResolved = !siblingsFn;
-
-		function siblingsToSiblingsPattern(siblings: string[]) {
-			if (siblings && siblings.length) {
-				if (!basename) {
-					basename = paths.basename(path);
-				}
-				const name = basename.substr(0, basename.length - paths.extname(path).length);
-				return { siblings, name };
-			}
-
-			return undefined;
-		}
-
-		function siblingsPatternFn() {
-			// Resolve siblings only once
-			if (!siblingsResolved) {
-				siblingsResolved = true;
-				const siblings = siblingsFn();
-				siblingsPattern = TPromise.is(siblings) ?
-					siblings.then(siblingsToSiblingsPattern) :
-					siblingsToSiblingsPattern(siblings);
-			}
-
-			return siblingsPattern;
-		}
+	const resultExpression: ParsedStringPattern = function (path: string, basename: string, hasSibling?: (name: string) => boolean | TPromise<boolean>) {
+		let name: string;
 
 		for (let i = 0, n = parsedPatterns.length; i < n; i++) {
 			// Pattern matches path
-			const result = (<ParsedExpressionPattern>parsedPatterns[i])(path, basename, siblingsPatternFn);
+			const parsedPattern = (<ParsedExpressionPattern>parsedPatterns[i]);
+			if (parsedPattern.requiresSiblings && hasSibling) {
+				if (!basename) {
+					basename = paths.basename(path);
+				}
+				if (!name) {
+					name = basename.substr(0, basename.length - paths.extname(path).length);
+				}
+			}
+			const result = parsedPattern(path, basename, name, hasSibling);
 			if (result) {
 				return result;
 			}
@@ -619,28 +640,16 @@ function parseExpressionPattern(pattern: string, value: any, options: IGlobOptio
 	if (value) {
 		const when = (<SiblingClause>value).when;
 		if (typeof when === 'string') {
-			const siblingsPatternToMatchingPattern = (siblingsPattern: SiblingsPattern): string => {
-				let clausePattern = when.replace('$(basename)', siblingsPattern.name);
-				if (siblingsPattern.siblings.indexOf(clausePattern) !== -1) {
-					return pattern;
-				} else {
-					return null; // pattern does not match in the end because the when clause is not satisfied
-				}
-			};
-
-			const result: ParsedExpressionPattern = (path: string, basename: string, siblingsPatternFn: () => SiblingsPattern | TPromise<SiblingsPattern>) => {
-				if (!parsedPattern(path, basename)) {
+			const result: ParsedExpressionPattern = (path: string, basename: string, name: string, hasSibling: (name: string) => boolean | TPromise<boolean>) => {
+				if (!hasSibling || !parsedPattern(path, basename)) {
 					return null;
 				}
 
-				const siblingsPattern = siblingsPatternFn();
-				if (!siblingsPattern) {
-					return null; // pattern is malformed or we don't have siblings
-				}
-
-				return TPromise.is(siblingsPattern) ?
-					siblingsPattern.then(siblingsPatternToMatchingPattern) :
-					siblingsPatternToMatchingPattern(siblingsPattern);
+				const clausePattern = when.replace('$(basename)', name);
+				const matched = hasSibling(clausePattern);
+				return isThenable(matched) ?
+					matched.then(m => m ? pattern : null) :
+					matched ? pattern : null;
 			};
 			result.requiresSiblings = true;
 			return result;
@@ -691,4 +700,4 @@ function aggregateBasenameMatches(parsedPatterns: (ParsedStringPattern | ParsedE
 	const aggregatedPatterns = parsedPatterns.filter(parsedPattern => !(<ParsedStringPattern>parsedPattern).basenames);
 	aggregatedPatterns.push(aggregate);
 	return aggregatedPatterns;
-}
\ No newline at end of file
+}
diff --git a/src/vs/base/common/history.ts b/src/vs/base/common/history.ts
index b9993be4f3f..5bc83979f67 100644
--- a/src/vs/base/common/history.ts
+++ b/src/vs/base/common/history.ts
@@ -27,26 +27,12 @@ export class HistoryNavigator<T> implements INavigator<T> {
 		this._onChange();
 	}
 
-	public addIfNotPresent(t: T) {
-		if (!this._history.has(t)) {
-			this.add(t);
-		}
-	}
-
 	public next(): T {
-		if (this._navigator.next()) {
-			return this._navigator.current();
-		}
-		this.last();
-		return null;
+		return this._navigator.next();
 	}
 
 	public previous(): T {
-		if (this._navigator.previous()) {
-			return this._navigator.current();
-		}
-		this.first();
-		return null;
+		return this._navigator.previous();
 	}
 
 	public current(): T {
@@ -65,6 +51,10 @@ export class HistoryNavigator<T> implements INavigator<T> {
 		return this._navigator.last();
 	}
 
+	public has(t: T): boolean {
+		return this._history.has(t);
+	}
+
 	public clear(): void {
 		this._initialize([]);
 		this._onChange();
@@ -72,8 +62,7 @@ export class HistoryNavigator<T> implements INavigator<T> {
 
 	private _onChange() {
 		this._reduceToLimit();
-		this._navigator = new ArrayNavigator(this._elements);
-		this._navigator.last();
+		this._navigator = new ArrayNavigator(this._elements, 0, this._elements.length, this._elements.length);
 	}
 
 	private _reduceToLimit() {
@@ -95,4 +84,4 @@ export class HistoryNavigator<T> implements INavigator<T> {
 		this._history.forEach(e => elements.push(e));
 		return elements;
 	}
-}
\ No newline at end of file
+}
diff --git a/src/vs/base/common/iterator.ts b/src/vs/base/common/iterator.ts
index 7f3c3de302c..9e6f3c57461 100644
--- a/src/vs/base/common/iterator.ts
+++ b/src/vs/base/common/iterator.ts
@@ -5,13 +5,86 @@
 
 'use strict';
 
-export interface IIteratorResult<T> {
+export interface IteratorResult<T> {
 	readonly done: boolean;
-	readonly value: T;
+	readonly value: T | undefined;
 }
 
-export interface IIterator<E> {
-	next(): IIteratorResult<E>;
+export interface Iterator<T> {
+	next(): IteratorResult<T>;
+}
+
+export module Iterator {
+	const _empty: Iterator<any> = {
+		next() {
+			return { done: true, value: undefined };
+		}
+	};
+
+	export function empty<T>(): Iterator<T> {
+		return _empty;
+	}
+
+	export function iterate<T>(array: T[], index = 0, length = array.length): Iterator<T> {
+		return {
+			next(): IteratorResult<T> {
+				if (index >= length) {
+					return { done: true, value: undefined };
+				}
+
+				return { done: false, value: array[index++] };
+			}
+		};
+	}
+
+	export function map<T, R>(iterator: Iterator<T>, fn: (t: T) => R): Iterator<R> {
+		return {
+			next() {
+				const { done, value } = iterator.next();
+				return { done, value: done ? undefined : fn(value) };
+			}
+		};
+	}
+
+	export function filter<T>(iterator: Iterator<T>, fn: (t: T) => boolean): Iterator<T> {
+		return {
+			next() {
+				while (true) {
+					const { done, value } = iterator.next();
+
+					if (done) {
+						return { done, value: undefined };
+					}
+
+					if (fn(value)) {
+						return { done, value };
+					}
+				}
+			}
+		};
+	}
+
+	export function forEach<T>(iterator: Iterator<T>, fn: (t: T) => void): void {
+		for (let next = iterator.next(); !next.done; next = iterator.next()) {
+			fn(next.value);
+		}
+	}
+
+	export function collect<T>(iterator: Iterator<T>): T[] {
+		const result: T[] = [];
+		forEach(iterator, value => result.push(value));
+		return result;
+	}
+}
+
+export type ISequence<T> = Iterator<T> | T[];
+
+export function getSequenceIterator<T>(arg: Iterator<T> | T[]): Iterator<T> {
+	if (Array.isArray(arg)) {
+		return Iterator.iterate(arg);
+	} else {
+		return arg;
+	}
 }
 
 export interface INextIterator<T> {
@@ -25,11 +98,11 @@ export class ArrayIterator<T> implements INextIterator<T> {
 	protected end: number;
 	protected index: number;
 
-	constructor(items: T[], start: number = 0, end: number = items.length) {
+	constructor(items: T[], start: number = 0, end: number = items.length, index = start - 1) {
 		this.items = items;
 		this.start = start;
 		this.end = end;
-		this.index = start - 1;
+		this.index = index;
 	}
 
 	public first(): T {
@@ -53,8 +126,8 @@ export class ArrayIterator<T> implements INextIterator<T> {
 
 export class ArrayNavigator<T> extends ArrayIterator<T> implements INavigator<T> {
 
-	constructor(items: T[], start: number = 0, end: number = items.length) {
-		super(items, start, end);
+	constructor(items: T[], start: number = 0, end: number = items.length, index = start - 1) {
+		super(items, start, end, index);
 	}
 
 	public current(): T {
diff --git a/src/vs/base/common/json.ts b/src/vs/base/common/json.ts
index ffa75f46095..1e685328189 100644
--- a/src/vs/base/common/json.ts
+++ b/src/vs/base/common/json.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-export enum ScanError {
+export const enum ScanError {
 	None,
 	UnexpectedEndOfComment,
 	UnexpectedEndOfString,
@@ -14,7 +14,7 @@ export enum ScanError {
 	InvalidCharacter
 }
 
-export enum SyntaxKind {
+export const enum SyntaxKind {
 	Unknown = 0,
 	OpenBraceToken,
 	CloseBraceToken,
@@ -407,6 +407,7 @@ export function createScanner(text: string, ignoreTrivia: boolean = false): JSON
 			case CharacterCodes.doubleQuote:
 			case CharacterCodes.colon:
 			case CharacterCodes.comma:
+			case CharacterCodes.slash:
 				return false;
 		}
 		return true;
@@ -590,7 +591,7 @@ export interface ParseError {
 	error: ParseErrorCode;
 }
 
-export enum ParseErrorCode {
+export const enum ParseErrorCode {
 	InvalidSymbol,
 	InvalidNumberFormat,
 	PropertyNameExpected,
@@ -628,7 +629,7 @@ export type JSONPath = Segment[];
 
 export interface ParseOptions {
 	disallowComments?: boolean;
-	allowTrailingComma?: boolean;
+	disallowTrailingComma?: boolean;
 }
 
 /**
@@ -817,7 +818,7 @@ export function visit(text: string, visitor: JSONVisitor, options?: ParseOptions
 		onError = toOneArgVisit(visitor.onError);
 
 	let disallowComments = options && options.disallowComments;
-	let allowTrailingComma = options && options.allowTrailingComma;
+	let disallowTrailingComma = options && options.disallowTrailingComma;
 	function scanNext(): SyntaxKind {
 		while (true) {
 			let token = _scanner.scan();
@@ -929,7 +930,7 @@ export function visit(text: string, visitor: JSONVisitor, options?: ParseOptions
 				}
 				onSeparator(',');
 				scanNext(); // consume comma
-				if (_scanner.getToken() === SyntaxKind.CloseBraceToken && allowTrailingComma) {
+				if (_scanner.getToken() === SyntaxKind.CloseBraceToken && !disallowTrailingComma) {
 					break;
 				}
 			} else if (needsComma) {
@@ -961,7 +962,7 @@ export function visit(text: string, visitor: JSONVisitor, options?: ParseOptions
 				}
 				onSeparator(',');
 				scanNext(); // consume comma
-				if (_scanner.getToken() === SyntaxKind.CloseBracketToken && allowTrailingComma) {
+				if (_scanner.getToken() === SyntaxKind.CloseBracketToken && !disallowTrailingComma) {
 					break;
 				}
 			} else if (needsComma) {
diff --git a/src/vs/base/common/jsonSchema.ts b/src/vs/base/common/jsonSchema.ts
index 5bec1537db2..2d7896606e2 100644
--- a/src/vs/base/common/jsonSchema.ts
+++ b/src/vs/base/common/jsonSchema.ts
@@ -46,6 +46,12 @@ export interface IJSONSchema {
 	contains?: IJSONSchema;
 	propertyNames?: IJSONSchema;
 
+	// schema draft 07
+	$comment?: string;
+	if?: IJSONSchema;
+	then?: IJSONSchema;
+	else?: IJSONSchema;
+
 	// VSCode extensions
 	defaultSnippets?: IJSONSchemaSnippet[]; // VSCode extension
 	errorMessage?: string; // VSCode extension
diff --git a/src/vs/base/common/keybindingLabels.ts b/src/vs/base/common/keybindingLabels.ts
index 29916e201d4..6cb492d858c 100644
--- a/src/vs/base/common/keybindingLabels.ts
+++ b/src/vs/base/common/keybindingLabels.ts
@@ -59,6 +59,13 @@ export const UILabelProvider = new ModifierLabelProvider(
 		altKey: nls.localize({ key: 'altKey', comment: ['This is the short form for the Alt key on the keyboard'] }, "Alt"),
 		metaKey: nls.localize({ key: 'windowsKey', comment: ['This is the short form for the Windows key on the keyboard'] }, "Windows"),
 		separator: '+',
+	},
+	{
+		ctrlKey: nls.localize({ key: 'ctrlKey', comment: ['This is the short form for the Control key on the keyboard'] }, "Ctrl"),
+		shiftKey: nls.localize({ key: 'shiftKey', comment: ['This is the short form for the Shift key on the keyboard'] }, "Shift"),
+		altKey: nls.localize({ key: 'altKey', comment: ['This is the short form for the Alt key on the keyboard'] }, "Alt"),
+		metaKey: nls.localize({ key: 'superKey', comment: ['This is the short form for the Super key on the keyboard'] }, "Super"),
+		separator: '+',
 	}
 );
 
@@ -79,6 +86,13 @@ export const AriaLabelProvider = new ModifierLabelProvider(
 		altKey: nls.localize({ key: 'altKey.long', comment: ['This is the long form for the Alt key on the keyboard'] }, "Alt"),
 		metaKey: nls.localize({ key: 'windowsKey.long', comment: ['This is the long form for the Windows key on the keyboard'] }, "Windows"),
 		separator: '+',
+	},
+	{
+		ctrlKey: nls.localize({ key: 'ctrlKey.long', comment: ['This is the long form for the Control key on the keyboard'] }, "Control"),
+		shiftKey: nls.localize({ key: 'shiftKey.long', comment: ['This is the long form for the Shift key on the keyboard'] }, "Shift"),
+		altKey: nls.localize({ key: 'altKey.long', comment: ['This is the long form for the Alt key on the keyboard'] }, "Alt"),
+		metaKey: nls.localize({ key: 'superKey.long', comment: ['This is the long form for the Super key on the keyboard'] }, "Super"),
+		separator: '+',
 	}
 );
 
diff --git a/src/vs/base/common/keybindingParser.ts b/src/vs/base/common/keybindingParser.ts
new file mode 100644
index 00000000000..35bc07d3aa7
--- /dev/null
+++ b/src/vs/base/common/keybindingParser.ts
@@ -0,0 +1,125 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+'use strict';
+
+import { Keybinding, SimpleKeybinding, ChordKeybinding, KeyCodeUtils } from 'vs/base/common/keyCodes';
+import { OperatingSystem } from 'vs/base/common/platform';
+import { ScanCodeBinding, ScanCodeUtils } from 'vs/base/common/scanCode';
+
+export class KeybindingParser {
+
+	private static _readModifiers(input: string) {
+		input = input.toLowerCase().trim();
+
+		let ctrl = false;
+		let shift = false;
+		let alt = false;
+		let meta = false;
+
+		let matchedModifier: boolean;
+
+		do {
+			matchedModifier = false;
+			if (/^ctrl(\+|\-)/.test(input)) {
+				ctrl = true;
+				input = input.substr('ctrl-'.length);
+				matchedModifier = true;
+			}
+			if (/^shift(\+|\-)/.test(input)) {
+				shift = true;
+				input = input.substr('shift-'.length);
+				matchedModifier = true;
+			}
+			if (/^alt(\+|\-)/.test(input)) {
+				alt = true;
+				input = input.substr('alt-'.length);
+				matchedModifier = true;
+			}
+			if (/^meta(\+|\-)/.test(input)) {
+				meta = true;
+				input = input.substr('meta-'.length);
+				matchedModifier = true;
+			}
+			if (/^win(\+|\-)/.test(input)) {
+				meta = true;
+				input = input.substr('win-'.length);
+				matchedModifier = true;
+			}
+			if (/^cmd(\+|\-)/.test(input)) {
+				meta = true;
+				input = input.substr('cmd-'.length);
+				matchedModifier = true;
+			}
+		} while (matchedModifier);
+
+		let key: string;
+
+		const firstSpaceIdx = input.indexOf(' ');
+		if (firstSpaceIdx > 0) {
+			key = input.substring(0, firstSpaceIdx);
+			input = input.substring(firstSpaceIdx);
+		} else {
+			key = input;
+			input = '';
+		}
+
+		return {
+			remains: input,
+			ctrl,
+			shift,
+			alt,
+			meta,
+			key
+		};
+	}
+
+	private static parseSimpleKeybinding(input: string): [SimpleKeybinding, string] {
+		const mods = this._readModifiers(input);
+		const keyCode = KeyCodeUtils.fromUserSettings(mods.key);
+		return [new SimpleKeybinding(mods.ctrl, mods.shift, mods.alt, mods.meta, keyCode), mods.remains];
+	}
+
+	public static parseKeybinding(input: string, OS: OperatingSystem): Keybinding {
+		if (!input) {
+			return null;
+		}
+
+		let [firstPart, remains] = this.parseSimpleKeybinding(input);
+		let chordPart: SimpleKeybinding = null;
+		if (remains.length > 0) {
+			[chordPart] = this.parseSimpleKeybinding(remains);
+		}
+
+		if (chordPart) {
+			return new ChordKeybinding(firstPart, chordPart);
+		}
+		return firstPart;
+	}
+
+	private static parseSimpleUserBinding(input: string): [SimpleKeybinding | ScanCodeBinding, string] {
+		const mods = this._readModifiers(input);
+		const scanCodeMatch = mods.key.match(/^\[([^\]]+)\]$/);
+		if (scanCodeMatch) {
+			const strScanCode = scanCodeMatch[1];
+			const scanCode = ScanCodeUtils.lowerCaseToEnum(strScanCode);
+			return [new ScanCodeBinding(mods.ctrl, mods.shift, mods.alt, mods.meta, scanCode), mods.remains];
+		}
+		const keyCode = KeyCodeUtils.fromUserSettings(mods.key);
+		return [new SimpleKeybinding(mods.ctrl, mods.shift, mods.alt, mods.meta, keyCode), mods.remains];
+	}
+
+	static parseUserBinding(input: string): [SimpleKeybinding | ScanCodeBinding, SimpleKeybinding | ScanCodeBinding] {
+		if (!input) {
+			return [null, null];
+		}
+
+		let [firstPart, remains] = this.parseSimpleUserBinding(input);
+		let chordPart: SimpleKeybinding | ScanCodeBinding = null;
+		if (remains.length > 0) {
+			[chordPart] = this.parseSimpleUserBinding(remains);
+		}
+		return [firstPart, chordPart];
+	}
+}
\ No newline at end of file
diff --git a/src/vs/base/common/labels.ts b/src/vs/base/common/labels.ts
index ade3020fcdc..41dd989c5f8 100644
--- a/src/vs/base/common/labels.ts
+++ b/src/vs/base/common/labels.ts
@@ -4,16 +4,17 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import URI from 'vs/base/common/uri';
-import { nativeSep, normalize, basename as pathsBasename, join, sep } from 'vs/base/common/paths';
-import { endsWith, ltrim, equalsIgnoreCase, startsWithIgnoreCase, rtrim, startsWith } from 'vs/base/common/strings';
+import { URI } from 'vs/base/common/uri';
+import { nativeSep, normalize, basename as pathsBasename, sep } from 'vs/base/common/paths';
+import { endsWith, ltrim, startsWithIgnoreCase, rtrim, startsWith } from 'vs/base/common/strings';
 import { Schemas } from 'vs/base/common/network';
 import { isLinux, isWindows, isMacintosh } from 'vs/base/common/platform';
+import { isEqual } from 'vs/base/common/resources';
 
 export interface IWorkspaceFolderProvider {
-	getWorkspaceFolder(resource: URI): { uri: URI };
+	getWorkspaceFolder(resource: URI): { uri: URI, name?: string };
 	getWorkspace(): {
-		folders: { uri: URI }[];
+		folders: { uri: URI, name?: string }[];
 	};
 }
 
@@ -21,7 +22,10 @@ export interface IUserHomeProvider {
 	userHome: string;
 }
 
-export function getPathLabel(resource: URI | string, rootProvider?: IWorkspaceFolderProvider, userHomeProvider?: IUserHomeProvider): string {
+/**
+ * @deprecated use LabelService instead
+ */
+export function getPathLabel(resource: URI | string, userHomeProvider: IUserHomeProvider, rootProvider?: IWorkspaceFolderProvider): string {
 	if (!resource) {
 		return null;
 	}
@@ -30,31 +34,31 @@ export function getPathLabel(resource: URI | string, rootProvider?: IWorkspaceFo
 		resource = URI.file(resource);
 	}
 
-	// return early if the resource is neither file:// nor untitled://
-	if (resource.scheme !== Schemas.file && resource.scheme !== Schemas.untitled) {
-		return resource.with({ query: null, fragment: null }).toString(true);
-	}
-
 	// return early if we can resolve a relative path label from the root
 	const baseResource = rootProvider ? rootProvider.getWorkspaceFolder(resource) : null;
 	if (baseResource) {
 		const hasMultipleRoots = rootProvider.getWorkspace().folders.length > 1;
 
 		let pathLabel: string;
-		if (isLinux ? baseResource.uri.fsPath === resource.fsPath : equalsIgnoreCase(baseResource.uri.fsPath, resource.fsPath)) {
-			pathLabel = ''; // no label if pathes are identical
+		if (isEqual(baseResource.uri, resource, !isLinux)) {
+			pathLabel = ''; // no label if paths are identical
 		} else {
-			pathLabel = normalize(ltrim(resource.fsPath.substr(baseResource.uri.fsPath.length), nativeSep), true);
+			pathLabel = normalize(ltrim(resource.path.substr(baseResource.uri.path.length), sep), true);
 		}
 
 		if (hasMultipleRoots) {
-			const rootName = pathsBasename(baseResource.uri.fsPath);
-			pathLabel = pathLabel ? join(rootName, pathLabel) : rootName; // always show root basename if there are multiple
+			const rootName = (baseResource && baseResource.name) ? baseResource.name : pathsBasename(baseResource.uri.fsPath);
+			pathLabel = pathLabel ? (rootName + ' • ' + pathLabel) : rootName; // always show root basename if there are multiple
 		}
 
 		return pathLabel;
 	}
 
+	// return if the resource is neither file:// nor untitled:// and no baseResource was provided
+	if (resource.scheme !== Schemas.file && resource.scheme !== Schemas.untitled) {
+		return resource.with({ query: null, fragment: null }).toString(true);
+	}
+
 	// convert c:\something => C:\something
 	if (hasDriveLetter(resource.fsPath)) {
 		return normalize(normalizeDriveLetter(resource.fsPath), true);
@@ -78,7 +82,7 @@ export function getBaseLabel(resource: URI | string): string {
 		resource = URI.file(resource);
 	}
 
-	const base = pathsBasename(resource.fsPath) || resource.fsPath /* can be empty string if '/' is passed in */;
+	const base = pathsBasename(resource.path) || (resource.scheme === Schemas.file ? resource.fsPath : resource.path) /* can be empty string if '/' is passed in */;
 
 	// convert c: => C:
 	if (hasDriveLetter(base)) {
diff --git a/src/vs/base/common/lifecycle.ts b/src/vs/base/common/lifecycle.ts
index f16ede05fb0..f2a5cf2da1d 100644
--- a/src/vs/base/common/lifecycle.ts
+++ b/src/vs/base/common/lifecycle.ts
@@ -7,10 +7,6 @@
 
 import { once } from 'vs/base/common/functional';
 
-export const empty: IDisposable = Object.freeze<IDisposable>({
-	dispose() { }
-});
-
 export interface IDisposable {
 	dispose(): void;
 }
@@ -24,7 +20,6 @@ export function dispose<T extends IDisposable>(disposable: T): T;
 export function dispose<T extends IDisposable>(...disposables: T[]): T[];
 export function dispose<T extends IDisposable>(disposables: T[]): T[];
 export function dispose<T extends IDisposable>(first: T | T[], ...rest: T[]): T | T[] {
-
 	if (Array.isArray(first)) {
 		first.forEach(d => d && d.dispose());
 		return [];
@@ -45,23 +40,16 @@ export function combinedDisposable(disposables: IDisposable[]): IDisposable {
 	return { dispose: () => dispose(disposables) };
 }
 
-export function toDisposable(...fns: (() => void)[]): IDisposable {
-	return {
-		dispose() {
-			for (const fn of fns) {
-				fn();
-			}
-		}
-	};
+export function toDisposable(fn: () => void): IDisposable {
+	return { dispose() { fn(); } };
 }
 
 export abstract class Disposable implements IDisposable {
 
-	protected _toDispose: IDisposable[];
+	static None = Object.freeze<IDisposable>({ dispose() { } });
 
-	constructor() {
-		this._toDispose = [];
-	}
+	protected _toDispose: IDisposable[] = [];
+	protected get toDispose(): IDisposable[] { return this._toDispose; }
 
 	public dispose(): void {
 		this._toDispose = dispose(this._toDispose);
@@ -69,6 +57,7 @@ export abstract class Disposable implements IDisposable {
 
 	protected _register<T extends IDisposable>(t: T): T {
 		this._toDispose.push(t);
+
 		return t;
 	}
 }
diff --git a/src/vs/base/common/linkedList.ts b/src/vs/base/common/linkedList.ts
index d40fd2a2861..9f44422e99c 100644
--- a/src/vs/base/common/linkedList.ts
+++ b/src/vs/base/common/linkedList.ts
@@ -5,7 +5,7 @@
 
 'use strict';
 
-import { IIterator } from 'vs/base/common/iterator';
+import { Iterator } from 'vs/base/common/iterator';
 
 class Node<E> {
 	element: E;
@@ -94,7 +94,7 @@ export class LinkedList<E> {
 		};
 	}
 
-	iterator(): IIterator<E> {
+	iterator(): Iterator<E> {
 		let element = {
 			done: undefined,
 			value: undefined,
diff --git a/src/vs/base/common/map.ts b/src/vs/base/common/map.ts
index e234c796330..dde158e8d4d 100644
--- a/src/vs/base/common/map.ts
+++ b/src/vs/base/common/map.ts
@@ -5,9 +5,9 @@
 
 'use strict';
 
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { CharCode } from 'vs/base/common/charCode';
-import { IIterator } from './iterator';
+import { Iterator } from './iterator';
 
 export function values<V = any>(set: Set<V>): V[];
 export function values<K = any, V = any>(map: Map<K, V>): V[];
@@ -306,7 +306,7 @@ export class TernarySearchTree<E> {
 		return node && node.value || candidate;
 	}
 
-	findSuperstr(key: string): IIterator<E> {
+	findSuperstr(key: string): Iterator<E> {
 		let iter = this._iter.reset(key);
 		let node = this._root;
 		while (node) {
@@ -333,7 +333,7 @@ export class TernarySearchTree<E> {
 		return undefined;
 	}
 
-	private _nodeIterator(node: TernarySearchTreeNode<E>): IIterator<E> {
+	private _nodeIterator(node: TernarySearchTreeNode<E>): Iterator<E> {
 		let res = {
 			done: false,
 			value: undefined
@@ -455,7 +455,7 @@ interface Item<K, V> {
 	value: V;
 }
 
-export enum Touch {
+export const enum Touch {
 	None = 0,
 	AsOld = 1,
 	AsNew = 2
diff --git a/src/vs/base/common/marked/marked.js b/src/vs/base/common/marked/marked.js
index b20380f19b7..92e7aaa8b53 100644
--- a/src/vs/base/common/marked/marked.js
+++ b/src/vs/base/common/marked/marked.js
@@ -35,7 +35,7 @@ var block = {
   def: /^ {0,3}\[(label)\]: *\n? *<?([^\s>]+)>?(?:(?: +\n? *| *\n *)(title))? *(?:\n+|$)/,
   table: noop,
   lheading: /^([^\n]+)\n *(=|-){2,} *(?:\n+|$)/,
-  paragraph: /^([^\n]+(?:\n(?!hr|heading|lheading| {0,3}>|<\/?(?:tag)(?: +|\\n|\/?>)|<(?:script|pre|style|!--))[^\n]+)+)/,
+  paragraph: /^([^\n]+(?:\n(?!hr|heading|lheading| {0,3}>|<\/?(?:tag)(?: +|\n|\/?>)|<(?:script|pre|style|!--))[^\n]+)*)/,
   text: /^[^\n]+/
 };
 
@@ -162,7 +162,7 @@ Lexer.rules = block;
  * Static Lex Method
  */
 
-Lexer.lex = function (src, options) {
+Lexer.lex = function(src, options) {
   var lexer = new Lexer(options);
   return lexer.lex(src);
 };
@@ -171,7 +171,7 @@ Lexer.lex = function (src, options) {
  * Preprocessing
  */
 
-Lexer.prototype.lex = function (src) {
+Lexer.prototype.lex = function(src) {
   src = src
     .replace(/\r\n|\r/g, '\n')
     .replace(/\t/g, '    ')
@@ -185,19 +185,21 @@ Lexer.prototype.lex = function (src) {
  * Lexing
  */
 
-Lexer.prototype.token = function (src, top) {
+Lexer.prototype.token = function(src, top) {
   src = src.replace(/^ +$/gm, '');
   var next,
-    loose,
-    cap,
-    bull,
-    b,
-    item,
-    space,
-    i,
-    tag,
-    l,
-    isordered;
+      loose,
+      cap,
+      bull,
+      b,
+      item,
+      space,
+      i,
+      tag,
+      l,
+      isordered,
+      istask,
+      ischecked;
 
   while (src) {
     // newline
@@ -217,7 +219,7 @@ Lexer.prototype.token = function (src, top) {
       this.tokens.push({
         type: 'code',
         text: !this.options.pedantic
-          ? cap.replace(/\n+$/, '')
+          ? rtrim(cap, '\n')
           : cap
       });
       continue;
@@ -365,10 +367,20 @@ Lexer.prototype.token = function (src, top) {
           if (!loose) loose = next;
         }
 
+        // Check for task list items
+        istask = /^\[[ xX]\] /.test(item);
+        ischecked = undefined;
+        if (istask) {
+          ischecked = item[1] !== ' ';
+          item = item.replace(/^\[[ xX]\] +/, '');
+        }
+
         this.tokens.push({
           type: loose
             ? 'loose_item_start'
-            : 'list_item_start'
+            : 'list_item_start',
+          task: istask,
+          checked: ischecked
         });
 
         // Recurse.
@@ -630,7 +642,7 @@ InlineLexer.rules = inline;
  * Static Lexing/Compiling Method
  */
 
-InlineLexer.output = function (src, links, options) {
+InlineLexer.output = function(src, links, options) {
   var inline = new InlineLexer(links, options);
   return inline.output(src);
 };
@@ -639,13 +651,13 @@ InlineLexer.output = function (src, links, options) {
  * Lexing/Compiling
  */
 
-InlineLexer.prototype.output = function (src) {
+InlineLexer.prototype.output = function(src) {
   var out = '',
-    link,
-    text,
-    href,
-    title,
-    cap;
+      link,
+      text,
+      href,
+      title,
+      cap;
 
   while (src) {
     // escape
@@ -732,7 +744,7 @@ InlineLexer.prototype.output = function (src) {
 
     // reflink, nolink
     if ((cap = this.rules.reflink.exec(src))
-      || (cap = this.rules.nolink.exec(src))) {
+        || (cap = this.rules.nolink.exec(src))) {
       src = src.substring(cap[0].length);
       link = (cap[2] || cap[1]).replace(/\s+/g, ' ');
       link = this.links[link.toLowerCase()];
@@ -797,7 +809,7 @@ InlineLexer.prototype.output = function (src) {
   return out;
 };
 
-InlineLexer.escapes = function (text) {
+InlineLexer.escapes = function(text) {
   return text ? text.replace(InlineLexer.rules._escapes, '$1') : text;
 }
 
@@ -805,9 +817,9 @@ InlineLexer.escapes = function (text) {
  * Compile Link
  */
 
-InlineLexer.prototype.outputLink = function (cap, link) {
+InlineLexer.prototype.outputLink = function(cap, link) {
   var href = link.href,
-    title = link.title ? escape(link.title) : null;
+      title = link.title ? escape(link.title) : null;
 
   return cap[0].charAt(0) !== '!'
     ? this.renderer.link(href, title, this.output(cap[1]))
@@ -818,7 +830,7 @@ InlineLexer.prototype.outputLink = function (cap, link) {
  * Smartypants Transformations
  */
 
-InlineLexer.prototype.smartypants = function (text) {
+InlineLexer.prototype.smartypants = function(text) {
   if (!this.options.smartypants) return text;
   return text
     // em-dashes
@@ -841,12 +853,12 @@ InlineLexer.prototype.smartypants = function (text) {
  * Mangle Links
  */
 
-InlineLexer.prototype.mangle = function (text) {
+InlineLexer.prototype.mangle = function(text) {
   if (!this.options.mangle) return text;
   var out = '',
-    l = text.length,
-    i = 0,
-    ch;
+      l = text.length,
+      i = 0,
+      ch;
 
   for (; i < l; i++) {
     ch = text.charCodeAt(i);
@@ -867,7 +879,7 @@ function Renderer(options) {
   this.options = options || marked.defaults;
 }
 
-Renderer.prototype.code = function (code, lang, escaped) {
+Renderer.prototype.code = function(code, lang, escaped) {
   if (this.options.highlight) {
     var out = this.options.highlight(code, lang);
     if (out != null && out !== code) {
@@ -879,7 +891,7 @@ Renderer.prototype.code = function (code, lang, escaped) {
   if (!lang) {
     return '<pre><code>'
       + (escaped ? code : escape(code, true))
-      + '\n</code></pre>';
+      + '</code></pre>';
   }
 
   return '<pre><code class="'
@@ -887,18 +899,18 @@ Renderer.prototype.code = function (code, lang, escaped) {
     + escape(lang, true)
     + '">'
     + (escaped ? code : escape(code, true))
-    + '\n</code></pre>\n';
+    + '</code></pre>\n';
 };
 
-Renderer.prototype.blockquote = function (quote) {
+Renderer.prototype.blockquote = function(quote) {
   return '<blockquote>\n' + quote + '</blockquote>\n';
 };
 
-Renderer.prototype.html = function (html) {
+Renderer.prototype.html = function(html) {
   return html;
 };
 
-Renderer.prototype.heading = function (text, level, raw) {
+Renderer.prototype.heading = function(text, level, raw) {
   if (this.options.headerIds) {
     return '<h'
       + level
@@ -915,25 +927,33 @@ Renderer.prototype.heading = function (text, level, raw) {
   return '<h' + level + '>' + text + '</h' + level + '>\n';
 };
 
-Renderer.prototype.hr = function () {
+Renderer.prototype.hr = function() {
   return this.options.xhtml ? '<hr/>\n' : '<hr>\n';
 };
 
-Renderer.prototype.list = function (body, ordered, start) {
+Renderer.prototype.list = function(body, ordered, start) {
   var type = ordered ? 'ol' : 'ul',
-    startatt = (ordered && start !== 1) ? (' start="' + start + '"') : '';
+      startatt = (ordered && start !== 1) ? (' start="' + start + '"') : '';
   return '<' + type + startatt + '>\n' + body + '</' + type + '>\n';
 };
 
-Renderer.prototype.listitem = function (text) {
+Renderer.prototype.listitem = function(text) {
   return '<li>' + text + '</li>\n';
 };
 
-Renderer.prototype.paragraph = function (text) {
+Renderer.prototype.checkbox = function(checked) {
+  return '<input '
+    + (checked ? 'checked="" ' : '')
+    + 'disabled="" type="checkbox"'
+    + (this.options.xhtml ? ' /' : '')
+    + '> ';
+}
+
+Renderer.prototype.paragraph = function(text) {
   return '<p>' + text + '</p>\n';
 };
 
-Renderer.prototype.table = function (header, body) {
+Renderer.prototype.table = function(header, body) {
   if (body) body = '<tbody>' + body + '</tbody>';
 
   return '<table>\n'
@@ -944,11 +964,11 @@ Renderer.prototype.table = function (header, body) {
     + '</table>\n';
 };
 
-Renderer.prototype.tablerow = function (content) {
+Renderer.prototype.tablerow = function(content) {
   return '<tr>\n' + content + '</tr>\n';
 };
 
-Renderer.prototype.tablecell = function (content, flags) {
+Renderer.prototype.tablecell = function(content, flags) {
   var type = flags.header ? 'th' : 'td';
   var tag = flags.align
     ? '<' + type + ' align="' + flags.align + '">'
@@ -957,27 +977,27 @@ Renderer.prototype.tablecell = function (content, flags) {
 };
 
 // span level renderer
-Renderer.prototype.strong = function (text) {
+Renderer.prototype.strong = function(text) {
   return '<strong>' + text + '</strong>';
 };
 
-Renderer.prototype.em = function (text) {
+Renderer.prototype.em = function(text) {
   return '<em>' + text + '</em>';
 };
 
-Renderer.prototype.codespan = function (text) {
+Renderer.prototype.codespan = function(text) {
   return '<code>' + text + '</code>';
 };
 
-Renderer.prototype.br = function () {
+Renderer.prototype.br = function() {
   return this.options.xhtml ? '<br/>' : '<br>';
 };
 
-Renderer.prototype.del = function (text) {
+Renderer.prototype.del = function(text) {
   return '<del>' + text + '</del>';
 };
 
-Renderer.prototype.link = function (href, title, text) {
+Renderer.prototype.link = function(href, title, text) {
   if (this.options.sanitize) {
     try {
       var prot = decodeURIComponent(unescape(href))
@@ -1006,7 +1026,7 @@ Renderer.prototype.link = function (href, title, text) {
   return out;
 };
 
-Renderer.prototype.image = function (href, title, text) {
+Renderer.prototype.image = function(href, title, text) {
   if (this.options.baseUrl && !originIndependentUrl.test(href)) {
     href = resolveUrl(this.options.baseUrl, href);
   }
@@ -1018,7 +1038,7 @@ Renderer.prototype.image = function (href, title, text) {
   return out;
 };
 
-Renderer.prototype.text = function (text) {
+Renderer.prototype.text = function(text) {
   return text;
 };
 
@@ -1027,24 +1047,24 @@ Renderer.prototype.text = function (text) {
  * returns only the textual part of the token
  */
 
-function TextRenderer() { }
+function TextRenderer() {}
 
 // no need for block level renderers
 
 TextRenderer.prototype.strong =
-  TextRenderer.prototype.em =
-  TextRenderer.prototype.codespan =
-  TextRenderer.prototype.del =
-  TextRenderer.prototype.text = function (text) {
-    return text;
-  }
+TextRenderer.prototype.em =
+TextRenderer.prototype.codespan =
+TextRenderer.prototype.del =
+TextRenderer.prototype.text = function (text) {
+  return text;
+}
 
 TextRenderer.prototype.link =
-  TextRenderer.prototype.image = function (href, title, text) {
-    return '' + text;
-  }
+TextRenderer.prototype.image = function(href, title, text) {
+  return '' + text;
+}
 
-TextRenderer.prototype.br = function () {
+TextRenderer.prototype.br = function() {
   return '';
 }
 
@@ -1065,7 +1085,7 @@ function Parser(options) {
  * Static Parse Method
  */
 
-Parser.parse = function (src, options) {
+Parser.parse = function(src, options) {
   var parser = new Parser(options);
   return parser.parse(src);
 };
@@ -1074,12 +1094,12 @@ Parser.parse = function (src, options) {
  * Parse Loop
  */
 
-Parser.prototype.parse = function (src) {
+Parser.prototype.parse = function(src) {
   this.inline = new InlineLexer(src.links, this.options);
   // use an InlineLexer with a TextRenderer to extract pure text
   this.inlineText = new InlineLexer(
     src.links,
-    merge({}, this.options, { renderer: new TextRenderer() })
+    merge({}, this.options, {renderer: new TextRenderer()})
   );
   this.tokens = src.reverse();
 
@@ -1095,7 +1115,7 @@ Parser.prototype.parse = function (src) {
  * Next Token
  */
 
-Parser.prototype.next = function () {
+Parser.prototype.next = function() {
   return this.token = this.tokens.pop();
 };
 
@@ -1103,7 +1123,7 @@ Parser.prototype.next = function () {
  * Preview Next Token
  */
 
-Parser.prototype.peek = function () {
+Parser.prototype.peek = function() {
   return this.tokens[this.tokens.length - 1] || 0;
 };
 
@@ -1111,7 +1131,7 @@ Parser.prototype.peek = function () {
  * Parse Text Tokens
  */
 
-Parser.prototype.parseText = function () {
+Parser.prototype.parseText = function() {
   var body = this.token.text;
 
   while (this.peek().type === 'text') {
@@ -1125,7 +1145,7 @@ Parser.prototype.parseText = function () {
  * Parse Current Token
  */
 
-Parser.prototype.tok = function () {
+Parser.prototype.tok = function() {
   switch (this.token.type) {
     case 'space': {
       return '';
@@ -1146,11 +1166,11 @@ Parser.prototype.tok = function () {
     }
     case 'table': {
       var header = '',
-        body = '',
-        i,
-        row,
-        cell,
-        j;
+          body = '',
+          i,
+          row,
+          cell,
+          j;
 
       // header
       cell = '';
@@ -1189,7 +1209,7 @@ Parser.prototype.tok = function () {
     case 'list_start': {
       body = '';
       var ordered = this.token.ordered,
-        start = this.token.start;
+          start = this.token.start;
 
       while (this.next().type !== 'list_end') {
         body += this.tok();
@@ -1200,6 +1220,10 @@ Parser.prototype.tok = function () {
     case 'list_item_start': {
       body = '';
 
+      if (this.token.task) {
+        body += this.renderer.checkbox(this.token.checked);
+      }
+
       while (this.next().type !== 'list_item_end') {
         body += this.token.type === 'text'
           ? this.parseText()
@@ -1218,7 +1242,7 @@ Parser.prototype.tok = function () {
       return this.renderer.listitem(body);
     }
     case 'html': {
-      // TODO parse inline content if parameter markdown=1
+      // TODO@matt parse inline content if parameter markdown=1
       return this.renderer.html(this.token.text);
     }
     case 'paragraph': {
@@ -1245,7 +1269,7 @@ function escape(html, encode) {
 
 function unescape(html) {
   // explicitly match decimal, hex, and named HTML entities
-  return html.replace(/&(#(?:\d+)|(?:#x[0-9A-Fa-f]+)|(?:\w+));?/ig, function (_, n) {
+  return html.replace(/&(#(?:\d+)|(?:#x[0-9A-Fa-f]+)|(?:\w+));?/ig, function(_, n) {
     n = n.toLowerCase();
     if (n === 'colon') return ':';
     if (n.charAt(0) === '#') {
@@ -1261,13 +1285,13 @@ function edit(regex, opt) {
   regex = regex.source || regex;
   opt = opt || '';
   return {
-    replace: function (name, val) {
+    replace: function(name, val) {
       val = val.source || val;
       val = val.replace(/(^|[^\[])\^/g, '$1');
       regex = regex.replace(name, val);
       return this;
     },
-    getRegex: function () {
+    getRegex: function() {
       return new RegExp(regex, opt);
     }
   };
@@ -1281,7 +1305,7 @@ function resolveUrl(base, href) {
     if (/^[^:]+:\/*[^/]*$/.test(base)) {
       baseUrls[' ' + base] = base + '/';
     } else {
-      baseUrls[' ' + base] = base.replace(/[^/]*$/, '');
+      baseUrls[' ' + base] = rtrim(base, '/', true);
     }
   }
   base = baseUrls[' ' + base];
@@ -1297,13 +1321,13 @@ function resolveUrl(base, href) {
 var baseUrls = {};
 var originIndependentUrl = /^$|^[a-z][a-z0-9+.-]*:|^[?#]/i;
 
-function noop() { }
+function noop() {}
 noop.exec = noop;
 
 function merge(obj) {
   var i = 1,
-    target,
-    key;
+      target,
+      key;
 
   for (; i < arguments.length; i++) {
     target = arguments[i];
@@ -1318,8 +1342,23 @@ function merge(obj) {
 }
 
 function splitCells(tableRow, count) {
-  var cells = tableRow.replace(/([^\\])\|/g, '$1 |').split(/ +\| */),
-    i = 0;
+  // ensure that every cell-delimiting pipe has a space
+  // before it to distinguish it from an escaped pipe
+  var row = tableRow.replace(/\|/g, function (match, offset, str) {
+        var escaped = false,
+            curr = offset;
+        while (--curr >= 0 && str[curr] === '\\') escaped = !escaped;
+        if (escaped) {
+          // odd number of slashes means | is escaped
+          // so we leave it alone
+          return '|';
+        } else {
+          // add space before unescaped |
+          return ' |';
+        }
+      }),
+      cells = row.split(/ \|/),
+      i = 0;
 
   if (cells.length > count) {
     cells.splice(count);
@@ -1328,11 +1367,38 @@ function splitCells(tableRow, count) {
   }
 
   for (; i < cells.length; i++) {
-    cells[i] = cells[i].replace(/\\\|/g, '|');
+    // leading or trailing whitespace is ignored per the gfm spec
+    cells[i] = cells[i].trim().replace(/\\\|/g, '|');
   }
   return cells;
 }
 
+// Remove trailing 'c's. Equivalent to str.replace(/c*$/, '').
+// /c*$/ is vulnerable to REDOS.
+// invert: Remove suffix of non-c chars instead. Default falsey.
+function rtrim(str, c, invert) {
+  if (str.length === 0) {
+    return '';
+  }
+
+  // Length of suffix matching the invert condition.
+  var suffLen = 0;
+
+  // Step left until we fail to match the invert condition.
+  while (suffLen < str.length) {
+    var currChar = str.charAt(str.length - suffLen - 1);
+    if (currChar === c && !invert) {
+      suffLen++;
+    } else if (currChar !== c && invert) {
+      suffLen++;
+    } else {
+      break;
+    }
+  }
+
+  return str.substr(0, str.length - suffLen);
+}
+
 /**
  * Marked
  */
@@ -1356,9 +1422,9 @@ function marked(src, opt, callback) {
     opt = merge({}, marked.defaults, opt || {});
 
     var highlight = opt.highlight,
-      tokens,
-      pending,
-      i = 0;
+        tokens,
+        pending,
+        i = 0;
 
     try {
       tokens = Lexer.lex(src, opt)
@@ -1368,7 +1434,7 @@ function marked(src, opt, callback) {
 
     pending = tokens.length;
 
-    var done = function (err) {
+    var done = function(err) {
       if (err) {
         opt.highlight = highlight;
         return callback(err);
@@ -1398,11 +1464,11 @@ function marked(src, opt, callback) {
     if (!pending) return done();
 
     for (; i < tokens.length; i++) {
-      (function (token) {
+      (function(token) {
         if (token.type !== 'code') {
           return --pending || done();
         }
-        return highlight(token.text, token.lang, function (err, code) {
+        return highlight(token.text, token.lang, function(err, code) {
           if (err) return done(err);
           if (code == null || code === token.text) {
             return --pending || done();
@@ -1435,10 +1501,10 @@ function marked(src, opt, callback) {
  */
 
 marked.options =
-  marked.setOptions = function (opt) {
-    merge(marked.defaults, opt);
-    return marked;
-  };
+marked.setOptions = function(opt) {
+  merge(marked.defaults, opt);
+  return marked;
+};
 
 marked.getDefaults = function () {
   return {
@@ -1448,7 +1514,7 @@ marked.getDefaults = function () {
     headerIds: true,
     headerPrefix: '',
     highlight: null,
-    langPrefix: 'lang-',
+    langPrefix: 'language-',
     mangle: true,
     pedantic: false,
     renderer: new Renderer(),
@@ -1460,7 +1526,7 @@ marked.getDefaults = function () {
     tables: true,
     xhtml: false
   };
-};
+}
 
 marked.defaults = marked.getDefaults();
 
diff --git a/src/vs/base/common/marshalling.ts b/src/vs/base/common/marshalling.ts
index 4d921569ba1..78e4bf07b47 100644
--- a/src/vs/base/common/marshalling.ts
+++ b/src/vs/base/common/marshalling.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 
 export function stringify(obj: any): string {
 	return JSON.stringify(obj, replacer);
diff --git a/src/vs/base/common/mime.ts b/src/vs/base/common/mime.ts
index f2eb135794a..0574c4bcdc6 100644
--- a/src/vs/base/common/mime.ts
+++ b/src/vs/base/common/mime.ts
@@ -225,19 +225,24 @@ export function isUnspecific(mime: string[] | string): boolean {
 	return mime.length === 1 && isUnspecific(mime[0]);
 }
 
+/**
+ * Returns a suggestion for the filename by the following logic:
+ * 1. If a relevant extension exists and is an actual filename extension (starting with a dot), suggest the prefix appended by the first one.
+ * 2. Otherwise, if there are other extensions, suggest the first one.
+ * 3. Otherwise, suggest the prefix.
+ */
 export function suggestFilename(langId: string, prefix: string): string {
-	for (let i = 0; i < registeredAssociations.length; i++) {
-		const association = registeredAssociations[i];
-		if (association.userConfigured) {
-			continue; // only support registered ones
-		}
+	const extensions = registeredAssociations
+		.filter(assoc => !assoc.userConfigured && assoc.extension && assoc.id === langId)
+		.map(assoc => assoc.extension);
+	const extensionsWithDotFirst = extensions
+		.filter(assoc => strings.startsWith(assoc, '.'));
 
-		if (association.id === langId && association.extension) {
-			return prefix + association.extension;
-		}
+	if (extensionsWithDotFirst.length > 0) {
+		return prefix + extensionsWithDotFirst[0];
 	}
 
-	return prefix; // without any known extension, just return the prefix
+	return extensions[0] || prefix;
 }
 
 interface MapExtToMediaMimes {
@@ -297,4 +302,4 @@ const mapExtToMediaMimes: MapExtToMediaMimes = {
 export function getMediaMime(path: string): string | undefined {
 	const ext = paths.extname(path);
 	return mapExtToMediaMimes[ext.toLowerCase()];
-}
\ No newline at end of file
+}
diff --git a/src/vs/base/common/numbers.ts b/src/vs/base/common/numbers.ts
index fa4932e9ec7..9c31e269491 100644
--- a/src/vs/base/common/numbers.ts
+++ b/src/vs/base/common/numbers.ts
@@ -11,4 +11,12 @@ export function clamp(value: number, min: number, max: number): number {
 
 export function rot(index: number, modulo: number): number {
 	return (modulo + (index % modulo)) % modulo;
-}
\ No newline at end of file
+}
+
+export class Counter {
+	private _next = 0;
+
+	getNext(): number {
+		return this._next++;
+	}
+}
diff --git a/src/vs/base/common/objects.ts b/src/vs/base/common/objects.ts
index 31769c963f1..513ac6c9240 100644
--- a/src/vs/base/common/objects.ts
+++ b/src/vs/base/common/objects.ts
@@ -225,6 +225,7 @@ export function getOrDefault<T, R>(obj: T, fn: (obj: T) => R, defaultValue: R =
 	return typeof result === 'undefined' ? defaultValue : result;
 }
 
+type obj = { [key: string]: any; };
 /**
  * Returns an object that has keys for each value that is different in the base object. Keys
  * that do not exist in the target but in the base object are not considered.
@@ -235,7 +236,6 @@ export function getOrDefault<T, R>(obj: T, fn: (obj: T) => R, defaultValue: R =
  * @param base the object to diff against
  * @param obj the object to use for diffing
  */
-export type obj = { [key: string]: any; };
 export function distinct(base: obj, target: obj): obj {
 	const result = Object.create(null);
 
diff --git a/src/vs/base/common/paging.ts b/src/vs/base/common/paging.ts
index 286fa69d08f..93e1e4dfa52 100644
--- a/src/vs/base/common/paging.ts
+++ b/src/vs/base/common/paging.ts
@@ -7,6 +7,9 @@
 
 import { TPromise } from 'vs/base/common/winjs.base';
 import { isArray } from 'vs/base/common/types';
+import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
+import { canceled } from 'vs/base/common/errors';
+import { range } from 'vs/base/common/arrays';
 
 /**
  * A Pager is a stateless abstraction over a paged collection.
@@ -15,16 +18,27 @@ export interface IPager<T> {
 	firstPage: T[];
 	total: number;
 	pageSize: number;
-	getPage(pageIndex: number): TPromise<T[]>;
+	getPage(pageIndex: number, cancellationToken: CancellationToken): Thenable<T[]>;
 }
 
 interface IPage<T> {
 	isResolved: boolean;
-	promise: TPromise<any>;
+	promise: Thenable<void>;
+	cts: CancellationTokenSource;
 	promiseIndexes: Set<number>;
 	elements: T[];
 }
 
+function createPage<T>(elements?: T[]): IPage<T> {
+	return {
+		isResolved: !!elements,
+		promise: null,
+		cts: null,
+		promiseIndexes: new Set<number>(),
+		elements: elements || []
+	};
+}
+
 /**
  * A PagedModel is a stateful model over an abstracted paged collection.
  */
@@ -32,7 +46,7 @@ export interface IPagedModel<T> {
 	length: number;
 	isResolved(index: number): boolean;
 	get(index: number): T;
-	resolve(index: number): TPromise<T>;
+	resolve(index: number, cancellationToken: CancellationToken): Thenable<T>;
 }
 
 export function singlePagePager<T>(elements: T[]): IPager<T> {
@@ -51,21 +65,21 @@ export class PagedModel<T> implements IPagedModel<T> {
 
 	get length(): number { return this.pager.total; }
 
-	constructor(arg: IPager<T> | T[], private pageTimeout: number = 500) {
+	constructor(arg: IPager<T> | T[]) {
 		this.pager = isArray(arg) ? singlePagePager<T>(arg) : arg;
 
-		this.pages = [{ isResolved: true, promise: null, promiseIndexes: new Set<number>(), elements: this.pager.firstPage.slice() }];
-
 		const totalPages = Math.ceil(this.pager.total / this.pager.pageSize);
 
-		for (let i = 0, len = totalPages - 1; i < len; i++) {
-			this.pages.push({ isResolved: false, promise: null, promiseIndexes: new Set<number>(), elements: [] });
-		}
+		this.pages = [
+			createPage(this.pager.firstPage.slice()),
+			...range(totalPages - 1).map(() => createPage<T>())
+		];
 	}
 
 	isResolved(index: number): boolean {
 		const pageIndex = Math.floor(index / this.pager.pageSize);
 		const page = this.pages[pageIndex];
+
 		return !!page.isResolved;
 	}
 
@@ -77,7 +91,11 @@ export class PagedModel<T> implements IPagedModel<T> {
 		return page.elements[indexInPage];
 	}
 
-	resolve(index: number): TPromise<T> {
+	resolve(index: number, cancellationToken: CancellationToken): Thenable<T> {
+		if (cancellationToken.isCancellationRequested) {
+			return TPromise.wrapError(canceled());
+		}
+
 		const pageIndex = Math.floor(index / this.pager.pageSize);
 		const indexInPage = index % this.pager.pageSize;
 		const page = this.pages[pageIndex];
@@ -87,33 +105,74 @@ export class PagedModel<T> implements IPagedModel<T> {
 		}
 
 		if (!page.promise) {
-			page.promise = TPromise.timeout(this.pageTimeout)
-				.then(() => this.pager.getPage(pageIndex))
+			page.cts = new CancellationTokenSource();
+			page.promise = this.pager.getPage(pageIndex, page.cts.token)
 				.then(elements => {
 					page.elements = elements;
 					page.isResolved = true;
 					page.promise = null;
+					page.cts = null;
 				}, err => {
 					page.isResolved = false;
 					page.promise = null;
+					page.cts = null;
 					return TPromise.wrapError(err);
 				});
 		}
 
-		return new TPromise<T>((c, e) => {
-			page.promiseIndexes.add(index);
-			page.promise.done(() => c(page.elements[indexInPage]));
-		}, () => {
-			if (!page.promise) {
+		cancellationToken.onCancellationRequested(() => {
+			if (!page.cts) {
 				return;
 			}
 
 			page.promiseIndexes.delete(index);
 
 			if (page.promiseIndexes.size === 0) {
-				page.promise.cancel();
+				page.cts.cancel();
 			}
 		});
+
+		page.promiseIndexes.add(index);
+
+		return page.promise.then(() => page.elements[indexInPage]);
+	}
+}
+
+export class DelayedPagedModel<T> implements IPagedModel<T> {
+
+	get length(): number { return this.model.length; }
+
+	constructor(private model: IPagedModel<T>, private timeout: number = 500) { }
+
+	isResolved(index: number): boolean {
+		return this.model.isResolved(index);
+	}
+
+	get(index: number): T {
+		return this.model.get(index);
+	}
+
+	resolve(index: number, cancellationToken: CancellationToken): Thenable<T> {
+		return new TPromise((c, e) => {
+			if (cancellationToken.isCancellationRequested) {
+				return e(canceled());
+			}
+
+			const timer = setTimeout(() => {
+				if (cancellationToken.isCancellationRequested) {
+					return e(canceled());
+				}
+
+				timeoutCancellation.dispose();
+				this.model.resolve(index, cancellationToken).then(c, e);
+			}, this.timeout);
+
+			const timeoutCancellation = cancellationToken.onCancellationRequested(() => {
+				clearTimeout(timer);
+				timeoutCancellation.dispose();
+				e(canceled());
+			});
+		});
 	}
 }
 
@@ -126,7 +185,7 @@ export function mapPager<T, R>(pager: IPager<T>, fn: (t: T) => R): IPager<R> {
 		firstPage: pager.firstPage.map(fn),
 		total: pager.total,
 		pageSize: pager.pageSize,
-		getPage: pageIndex => pager.getPage(pageIndex).then(r => r.map(fn))
+		getPage: (pageIndex, token) => pager.getPage(pageIndex, token).then(r => r.map(fn))
 	};
 }
 
@@ -138,8 +197,8 @@ export function mergePagers<T>(one: IPager<T>, other: IPager<T>): IPager<T> {
 		firstPage: [...one.firstPage, ...other.firstPage],
 		total: one.total + other.total,
 		pageSize: one.pageSize + other.pageSize,
-		getPage(pageIndex: number): TPromise<T[]> {
-			return TPromise.join([one.getPage(pageIndex), other.getPage(pageIndex)])
+		getPage(pageIndex: number, token): Thenable<T[]> {
+			return TPromise.join([one.getPage(pageIndex, token), other.getPage(pageIndex, token)])
 				.then(([onePage, otherPage]) => [...onePage, ...otherPage]);
 		}
 	};
diff --git a/src/vs/base/common/parsers.ts b/src/vs/base/common/parsers.ts
index e2ba887eb3f..69f164030ac 100644
--- a/src/vs/base/common/parsers.ts
+++ b/src/vs/base/common/parsers.ts
@@ -6,7 +6,7 @@
 
 import * as Types from 'vs/base/common/types';
 
-export enum ValidationState {
+export const enum ValidationState {
 	OK = 0,
 	Info = 1,
 	Warning = 2,
diff --git a/src/vs/base/common/paths.ts b/src/vs/base/common/paths.ts
index b8a144fd5ec..e5ed22fb7b9 100644
--- a/src/vs/base/common/paths.ts
+++ b/src/vs/base/common/paths.ts
@@ -19,9 +19,12 @@ export const sep = '/';
 export const nativeSep = isWindows ? '\\' : '/';
 
 /**
+ * @param path the path to get the dirname from
+ * @param separator the separator to use
  * @returns the directory name of a path.
+ *
  */
-export function dirname(path: string): string {
+export function dirname(path: string, separator = nativeSep): string {
 	const idx = ~path.lastIndexOf('/') || ~path.lastIndexOf('\\');
 	if (idx === 0) {
 		return '.';
@@ -32,7 +35,7 @@ export function dirname(path: string): string {
 	} else {
 		let res = path.substring(0, ~idx);
 		if (isWindows && res[res.length - 1] === ':') {
-			res += nativeSep; // make sure drive letters end with backslash
+			res += separator; // make sure drive letters end with backslash
 		}
 		return res;
 	}
@@ -53,7 +56,7 @@ export function basename(path: string): string {
 }
 
 /**
- * @returns {{.far}} from boo.far or the empty string.
+ * @returns `.far` from `boo.far` or the empty string.
  */
 export function extname(path: string): string {
 	path = basename(path);
@@ -328,7 +331,7 @@ export function isEqual(pathA: string, pathB: string, ignoreCase?: boolean): boo
 	return equalsIgnoreCase(pathA, pathB);
 }
 
-export function isEqualOrParent(path: string, candidate: string, ignoreCase?: boolean): boolean {
+export function isEqualOrParent(path: string, candidate: string, ignoreCase?: boolean, separator = nativeSep): boolean {
 	if (path === candidate) {
 		return true;
 	}
@@ -352,15 +355,15 @@ export function isEqualOrParent(path: string, candidate: string, ignoreCase?: bo
 		}
 
 		let sepOffset = candidate.length;
-		if (candidate.charAt(candidate.length - 1) === nativeSep) {
+		if (candidate.charAt(candidate.length - 1) === separator) {
 			sepOffset--; // adjust the expected sep offset in case our candidate already ends in separator character
 		}
 
-		return path.charAt(sepOffset) === nativeSep;
+		return path.charAt(sepOffset) === separator;
 	}
 
-	if (candidate.charAt(candidate.length - 1) !== nativeSep) {
-		candidate += nativeSep;
+	if (candidate.charAt(candidate.length - 1) !== separator) {
+		candidate += separator;
 	}
 
 	return path.indexOf(candidate) === 0;
diff --git a/src/vs/base/common/performance.js b/src/vs/base/common/performance.js
index baf730387ac..5590211c6d5 100644
--- a/src/vs/base/common/performance.js
+++ b/src/vs/base/common/performance.js
@@ -42,31 +42,33 @@ define([], function () {
 	function getEntries(type, name) {
 		const result = [];
 		const entries = global._performanceEntries;
-		for (let i = 0; i < entries.length; i += 4) {
+		for (let i = 0; i < entries.length; i += 5) {
 			if (entries[i] === type && (name === void 0 || entries[i + 1] === name)) {
 				result.push({
 					type: entries[i],
 					name: entries[i + 1],
 					startTime: entries[i + 2],
 					duration: entries[i + 3],
+					seq: entries[i + 4],
 				});
 			}
 		}
 
 		return result.sort((a, b) => {
-			return a.startTime - b.startTime;
+			return a.startTime - b.startTime || a.seq - b.seq;
 		});
 	}
 
 	function getEntry(type, name) {
 		const entries = global._performanceEntries;
-		for (let i = 0; i < entries.length; i += 4) {
+		for (let i = 0; i < entries.length; i += 5) {
 			if (entries[i] === type && entries[i + 1] === name) {
 				return {
 					type: entries[i],
 					name: entries[i + 1],
 					startTime: entries[i + 2],
 					duration: entries[i + 3],
+					seq: entries[i + 4],
 				};
 			}
 		}
@@ -74,25 +76,26 @@ define([], function () {
 
 	function getDuration(from, to) {
 		const entries = global._performanceEntries;
-		let name = from;
-		let startTime = 0;
-		for (let i = 0; i < entries.length; i += 4) {
-			if (entries[i + 1] === name) {
-				if (name === from) {
-					// found `from` (start of interval)
-					name = to;
-					startTime = entries[i + 2];
+		let target = to;
+		let endTime = 0;
+		for (let i = entries.length - 1; i >= 0; i -= 5) {
+			if (entries[i - 3] === target) {
+				if (target === to) {
+					// found `to` (end of interval)
+					endTime = entries[i - 2];
+					target = from;
 				} else {
-					// from `to` (end of interval)
-					return entries[i + 2] - startTime;
+					return endTime - entries[i - 2];
 				}
 			}
 		}
 		return 0;
 	}
 
+	let seq = 0;
+
 	function mark(name) {
-		global._performanceEntries.push('mark', name, _now(), 0);
+		global._performanceEntries.push('mark', name, _now(), 0, seq++);
 		if (typeof console.timeStamp === 'function') {
 			console.timeStamp(name);
 		}
@@ -121,9 +124,9 @@ define([], function () {
 
 	function _getLastStartTime(name) {
 		const entries = global._performanceEntries;
-		for (let i = entries.length - 1; i >= 0; i -= 4) {
-			if (entries[i - 2] === name) {
-				return entries[i - 1];
+		for (let i = entries.length - 1; i >= 0; i -= 5) {
+			if (entries[i - 3] === name) {
+				return entries[i - 2];
 			}
 		}
 
diff --git a/src/vs/base/common/platform.ts b/src/vs/base/common/platform.ts
index 0bb890d29bf..fc6b2c285bd 100644
--- a/src/vs/base/common/platform.ts
+++ b/src/vs/base/common/platform.ts
@@ -46,6 +46,8 @@ if (typeof process === 'object' && typeof process.nextTick === 'function' && typ
 	_isWindows = (process.platform === 'win32');
 	_isMacintosh = (process.platform === 'darwin');
 	_isLinux = (process.platform === 'linux');
+	_locale = LANGUAGE_DEFAULT;
+	_language = LANGUAGE_DEFAULT;
 	const rawNlsConfig = process.env['VSCODE_NLS_CONFIG'];
 	if (rawNlsConfig) {
 		try {
@@ -69,12 +71,20 @@ if (typeof process === 'object' && typeof process.nextTick === 'function' && typ
 	_language = _locale;
 }
 
-export enum Platform {
+export const enum Platform {
 	Web,
 	Mac,
 	Linux,
 	Windows
 }
+export function PlatformToString(platform: Platform) {
+	switch (platform) {
+		case Platform.Web: return 'Web';
+		case Platform.Mac: return 'Mac';
+		case Platform.Linux: return 'Linux';
+		case Platform.Windows: return 'Windows';
+	}
+}
 
 let _platform: Platform = Platform.Web;
 if (_isNative) {
diff --git a/src/vs/base/common/processes.ts b/src/vs/base/common/processes.ts
index adc3504949e..b8e90b27336 100644
--- a/src/vs/base/common/processes.ts
+++ b/src/vs/base/common/processes.ts
@@ -49,7 +49,7 @@ export interface ForkOptions extends CommandOptions {
 	execArgv?: string[];
 }
 
-export enum Source {
+export const enum Source {
 	stdout,
 	stderr
 }
@@ -79,7 +79,7 @@ export interface TerminateResponse {
 	error?: any;
 }
 
-export enum TerminateResponseCode {
+export const enum TerminateResponseCode {
 	Success = 0,
 	Unknown = 1,
 	AccessDenied = 2,
diff --git a/src/vs/base/common/resources.ts b/src/vs/base/common/resources.ts
index e7c4cb9d9c3..2a5d7d8b083 100644
--- a/src/vs/base/common/resources.ts
+++ b/src/vs/base/common/resources.ts
@@ -5,26 +5,48 @@
 'use strict';
 
 import * as paths from 'vs/base/common/paths';
-import uri from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { equalsIgnoreCase } from 'vs/base/common/strings';
+import { Schemas } from 'vs/base/common/network';
+import { isLinux, isWindows } from 'vs/base/common/platform';
+import { CharCode } from 'vs/base/common/charCode';
 
-export function basenameOrAuthority(resource: uri): string {
-	return paths.basename(resource.path) || resource.authority;
+export function getComparisonKey(resource: URI): string {
+	return hasToIgnoreCase(resource) ? resource.toString().toLowerCase() : resource.toString();
 }
 
-export function isEqualOrParent(resource: uri, candidate: uri, ignoreCase?: boolean): boolean {
-	if (resource.scheme === candidate.scheme && resource.authority === candidate.authority) {
-		if (resource.scheme === 'file') {
-			return paths.isEqualOrParent(resource.fsPath, candidate.fsPath, ignoreCase);
+export function hasToIgnoreCase(resource: URI): boolean {
+	// A file scheme resource is in the same platform as code, so ignore case for non linux platforms
+	// Resource can be from another platform. Lowering the case as an hack. Should come from File system provider
+	return resource && resource.scheme === Schemas.file ? !isLinux : true;
+}
+
+export function basenameOrAuthority(resource: URI): string {
+	return basename(resource) || resource.authority;
+}
+
+/**
+ * Tests wheter a `candidate` URI is a parent or equal of a given `base` URI.
+ * @param base A uri which is "longer"
+ * @param parentCandidate A uri which is "shorter" then `base`
+ */
+export function isEqualOrParent(base: URI, parentCandidate: URI, ignoreCase = hasToIgnoreCase(base)): boolean {
+	if (base.scheme === parentCandidate.scheme) {
+		if (base.scheme === Schemas.file) {
+			return paths.isEqualOrParent(fsPath(base), fsPath(parentCandidate), ignoreCase);
+		}
+		if (isEqualAuthority(base.authority, parentCandidate.authority, ignoreCase)) {
+			return paths.isEqualOrParent(base.path, parentCandidate.path, ignoreCase, '/');
 		}
-
-		return paths.isEqualOrParent(resource.path, candidate.path, ignoreCase);
 	}
-
 	return false;
 }
 
-export function isEqual(first: uri, second: uri, ignoreCase?: boolean): boolean {
+function isEqualAuthority(a1: string, a2: string, ignoreCase?: boolean) {
+	return a1 === a2 || ignoreCase && a1 && a2 && equalsIgnoreCase(a1, a2);
+}
+
+export function isEqual(first: URI, second: URI, ignoreCase = hasToIgnoreCase(first)): boolean {
 	const identityEquals = (first === second);
 	if (identityEquals) {
 		return true;
@@ -41,25 +63,97 @@ export function isEqual(first: uri, second: uri, ignoreCase?: boolean): boolean
 	return first.toString() === second.toString();
 }
 
-export function dirname(resource: uri): uri {
-	const dirname = paths.dirname(resource.path);
-	if (resource.authority && dirname && !paths.isAbsolute(dirname)) {
-		return null; // If a URI contains an authority component, then the path component must either be empty or begin with a slash ("/") character
-	}
+export function basename(resource: URI): string {
+	return paths.basename(resource.path);
+}
 
+/**
+ * Return a URI representing the directory of a URI path.
+ *
+ * @param resource The input URI.
+ * @returns The URI representing the directory of the input URI.
+ */
+export function dirname(resource: URI): URI {
+	let dirname = paths.dirname(resource.path, '/');
+	if (resource.authority && dirname.length && dirname.charCodeAt(0) !== CharCode.Slash) {
+		return null; // If a URI contains an authority component, then the path component must either be empty or begin with a CharCode.Slash ("/") character
+	}
 	return resource.with({
 		path: dirname
 	});
 }
 
-export function joinPath(resource: uri, pathFragment: string): uri {
-	const joinedPath = paths.join(resource.path || '/', pathFragment);
+/**
+ * Join a URI path with a path fragment and normalizes the resulting path.
+ *
+ * @param resource The input URI.
+ * @param pathFragment The path fragment to add to the URI path.
+ * @returns The resulting URI.
+ */
+export function joinPath(resource: URI, pathFragment: string): URI {
+	let joinedPath: string;
+	if (resource.scheme === Schemas.file) {
+		joinedPath = URI.file(paths.join(fsPath(resource), pathFragment)).path;
+	} else {
+		joinedPath = paths.join(resource.path, pathFragment);
+	}
 	return resource.with({
 		path: joinedPath
 	});
 }
 
-export function distinctParents<T>(items: T[], resourceAccessor: (item: T) => uri): T[] {
+/**
+ * Normalizes the path part of a URI: Resolves `.` and `..` elements with directory names.
+ *
+ * @param resource The URI to normalize the path.
+ * @returns The URI with the normalized path.
+ */
+export function normalizePath(resource: URI): URI {
+	let normalizedPath: string;
+	if (resource.scheme === Schemas.file) {
+		normalizedPath = URI.file(paths.normalize(fsPath(resource))).path;
+	} else {
+		normalizedPath = paths.normalize(resource.path);
+	}
+	return resource.with({
+		path: normalizedPath
+	});
+}
+
+/**
+ * Returns the fsPath of an URI where the drive letter is not normalized.
+ * See #56403.
+ */
+function fsPath(uri: URI): string {
+	let value: string;
+	if (uri.authority && uri.path.length > 1 && uri.scheme === 'file') {
+		// unc path: file://shares/c$/far/boo
+		value = `//${uri.authority}${uri.path}`;
+	} else if (
+		isWindows
+		&& uri.path.charCodeAt(0) === CharCode.Slash
+		&& (uri.path.charCodeAt(1) >= CharCode.A && uri.path.charCodeAt(1) <= CharCode.Z || uri.path.charCodeAt(1) >= CharCode.a && uri.path.charCodeAt(1) <= CharCode.z)
+		&& uri.path.charCodeAt(2) === CharCode.Colon
+	) {
+		value = uri.path.substr(1);
+	} else {
+		// other path
+		value = uri.path;
+	}
+	if (isWindows) {
+		value = value.replace(/\//g, '\\');
+	}
+	return value;
+}
+
+/**
+ * Returns true if the URI path is absolute.
+ */
+export function isAbsolutePath(resource: URI): boolean {
+	return paths.isAbsolute(resource.path);
+}
+
+export function distinctParents<T>(items: T[], resourceAccessor: (item: T) => URI): T[] {
 	const distinctParents: T[] = [];
 	for (let i = 0; i < items.length; i++) {
 		const candidateResource = resourceAccessor(items[i]);
@@ -78,3 +172,18 @@ export function distinctParents<T>(items: T[], resourceAccessor: (item: T) => ur
 
 	return distinctParents;
 }
+
+/**
+ * Tests wheter the given URL is a file URI created by `URI.parse` instead of `URI.file`.
+ * Such URI have no scheme or scheme that consist of a single letter (windows drive letter)
+ * @param candidate The URI to test
+ * @returns A corrected, real file URI if the input seems to be malformed.
+ * Undefined is returned if the input URI looks fine.
+ */
+export function isMalformedFileUri(candidate: URI): URI | undefined {
+	if (!candidate.scheme || isWindows && candidate.scheme.match(/^[a-zA-Z]$/)) {
+		return URI.file((candidate.scheme ? candidate.scheme + ':' : '') + candidate.path);
+	}
+	return void 0;
+}
+
diff --git a/src/vs/workbench/services/keybinding/common/scanCode.ts b/src/vs/base/common/scanCode.ts
similarity index 100%
rename from src/vs/workbench/services/keybinding/common/scanCode.ts
rename to src/vs/base/common/scanCode.ts
diff --git a/src/vs/base/common/scrollable.ts b/src/vs/base/common/scrollable.ts
index b943ced6ab1..23437967a6e 100644
--- a/src/vs/base/common/scrollable.ts
+++ b/src/vs/base/common/scrollable.ts
@@ -229,7 +229,7 @@ export class Scrollable extends Disposable {
 
 	/**
 	 * Returns the final scroll position that the instance will have once the smooth scroll animation concludes.
-	 * If no scroll animation is occuring, it will return the current scroll position instead.
+	 * If no scroll animation is occurring, it will return the current scroll position instead.
 	 */
 	public getFutureScrollPosition(): IScrollPosition {
 		if (this._smoothScrolling) {
diff --git a/src/vs/base/common/strings.ts b/src/vs/base/common/strings.ts
index ba293981009..5cb6ea76754 100644
--- a/src/vs/base/common/strings.ts
+++ b/src/vs/base/common/strings.ts
@@ -333,11 +333,11 @@ export function compareIgnoreCase(a: string, b: string): number {
 	}
 }
 
-function isLowerAsciiLetter(code: number): boolean {
+export function isLowerAsciiLetter(code: number): boolean {
 	return code >= CharCode.a && code <= CharCode.z;
 }
 
-function isUpperAsciiLetter(code: number): boolean {
+export function isUpperAsciiLetter(code: number): boolean {
 	return code >= CharCode.A && code <= CharCode.Z;
 }
 
@@ -685,3 +685,7 @@ export function containsUppercaseCharacter(target: string, ignoreEscapedChars =
 
 	return target.toLowerCase() !== target;
 }
+
+export function uppercaseFirstLetter(str: string): string {
+	return str.charAt(0).toUpperCase() + str.slice(1);
+}
\ No newline at end of file
diff --git a/src/vs/base/common/tree.ts b/src/vs/base/common/tree.ts
deleted file mode 100644
index 8133774b139..00000000000
--- a/src/vs/base/common/tree.ts
+++ /dev/null
@@ -1,57 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-'use strict';
-
-import { clamp } from './numbers';
-
-export interface ITreeNode<T> {
-	readonly element: T;
-	readonly children: ITreeNode<T>[];
-}
-
-function clone<T>(nodes: ITreeNode<T>[]): ITreeNode<T>[] {
-	return nodes.map(({ element, children }) => ({ element, children: clone(children) }));
-}
-
-export class Tree<T> {
-
-	private root: ITreeNode<T>[] = [];
-
-	splice(start: number[], deleteCount: number, nodes: ITreeNode<T>[] = []): ITreeNode<T>[] {
-		if (start.length === 0) {
-			throw new Error('invalid tree location');
-		}
-
-		const children = this.findChildren(start);
-		const index = start[start.length - 1];
-		return children.splice(index, deleteCount, ...clone(nodes));
-	}
-
-	getElement(location: number[]): T | undefined {
-		const node = this.findElement(location);
-		return node && node.element;
-	}
-
-	getNodes(): ITreeNode<T>[] {
-		return clone(this.root);
-	}
-
-	private findElement(location: number[]): ITreeNode<T> {
-		const children = this.findChildren(location);
-		const lastIndex = clamp(location[location.length - 1], 0, children.length);
-		return children[lastIndex];
-	}
-
-	private findChildren(location: number[], children: ITreeNode<T>[] = this.root): ITreeNode<T>[] {
-		if (location.length === 1) {
-			return children;
-		}
-
-		let [i, ...rest] = location;
-		i = clamp(i, 0, children.length);
-		return this.findChildren(rest, children[i].children);
-	}
-}
\ No newline at end of file
diff --git a/src/vs/base/common/uri.ts b/src/vs/base/common/uri.ts
index 412efc17388..24eb951892c 100644
--- a/src/vs/base/common/uri.ts
+++ b/src/vs/base/common/uri.ts
@@ -12,6 +12,13 @@ const _singleSlashStart = /^\//;
 const _doubleSlashStart = /^\/\//;
 
 function _validateUri(ret: URI): void {
+
+	// scheme, must be set
+	if (!ret.scheme) {
+		// throw new Error(`[UriError]: Scheme is missing: {scheme: "", authority: "${ret.authority}", path: "${ret.path}", query: "${ret.query}", fragment: "${ret.fragment}"}`);
+		console.warn(`[UriError]: Scheme is missing: {scheme: "", authority: "${ret.authority}", path: "${ret.path}", query: "${ret.query}", fragment: "${ret.fragment}"}`);
+	}
+
 	// scheme, https://tools.ietf.org/html/rfc3986#section-3.1
 	// ALPHA *( ALPHA / DIGIT / "+" / "-" / "." )
 	if (ret.scheme && !_schemePattern.test(ret.scheme)) {
@@ -63,7 +70,7 @@ const _regexp = /^(([^:/?#]+?):)?(\/\/([^/?#]*))?([^?#]*)(\?([^#]*))?(#(.*))?/;
 
 /**
  * Uniform Resource Identifier (URI) http://tools.ietf.org/html/rfc3986.
- * This class is a simple parser which creates the basic component paths
+ * This class is a simple parser which creates the basic component parts
  * (http://tools.ietf.org/html/rfc3986#section-3) with minimal validation
  * and encoding.
  *
@@ -74,10 +81,8 @@ const _regexp = /^(([^:/?#]+?):)?(\/\/([^/?#]*))?([^?#]*)(\?([^#]*))?(#(.*))?/;
  *        |   _____________________|__
  *       / \ /                        \
  *       urn:example:animal:ferret:nose
- *
- *
  */
-export default class URI implements UriComponents {
+export class URI implements UriComponents {
 
 	static isUri(thing: any): thing is URI {
 		if (thing instanceof URI) {
@@ -159,17 +164,38 @@ export default class URI implements UriComponents {
 
 	/**
 	 * Returns a string representing the corresponding file system path of this URI.
-	 * Will handle UNC paths and normalize windows drive letters to lower-case. Also
-	 * uses the platform specific path separator. Will *not* validate the path for
-	 * invalid characters and semantics. Will *not* look at the scheme of this URI.
+	 * Will handle UNC paths, normalizes windows drive letters to lower-case, and uses the
+	 * platform specific path separator.
+	 *
+	 * * Will *not* validate the path for invalid characters and semantics.
+	 * * Will *not* look at the scheme of this URI.
+	 * * The result shall *not* be used for display purposes but for accessing a file on disk.
+	 *
+	 *
+	 * The *difference* to `URI#path` is the use of the platform specific separator and the handling
+	 * of UNC paths. See the below sample of a file-uri with an authority (UNC path).
+	 *
+	 * ```ts
+		const u = URI.parse('file://server/c$/folder/file.txt')
+		u.authority === 'server'
+		u.path === '/shares/c$/file.txt'
+		u.fsPath === '\\server\c$\folder\file.txt'
+	```
+	 *
+	 * Using `URI#path` to read a file (using fs-apis) would not be enough because parts of the path,
+	 * namely the server name, would be missing. Therefore `URI#fsPath` exists - it's sugar to ease working
+	 * with URIs that represent files on disk (`file` scheme).
 	 */
 	get fsPath(): string {
+		// if (this.scheme !== 'file') {
+		// 	console.warn(`[UriError] calling fsPath with scheme ${this.scheme}`);
+		// }
 		return _makeFsPath(this);
 	}
 
 	// ---- modify to new -------------------------
 
-	public with(change: { scheme?: string; authority?: string; path?: string; query?: string; fragment?: string }): URI {
+	public with(change: { scheme?: string; authority?: string | null; path?: string | null; query?: string | null; fragment?: string | null }): URI {
 
 		if (!change) {
 			return this;
@@ -216,6 +242,12 @@ export default class URI implements UriComponents {
 
 	// ---- parse & validate ------------------------
 
+	/**
+	 * Creates a new URI from a string, e.g. `http://www.msft.com/some/path`,
+	 * `file:///usr/home`, or `scheme:with/path`.
+	 *
+	 * @param value A string which represents an URI (see `URI#toString`).
+	 */
 	public static parse(value: string): URI {
 		const match = _regexp.exec(value);
 		if (!match) {
@@ -230,6 +262,27 @@ export default class URI implements UriComponents {
 		);
 	}
 
+	/**
+	 * Creates a new URI from a file system path, e.g. `c:\my\files`,
+	 * `/usr/home`, or `\\server\share\some\path`.
+	 *
+	 * The *difference* between `URI#parse` and `URI#file` is that the latter treats the argument
+	 * as path, not as stringified-uri. E.g. `URI.file(path)` is **not the same as**
+	 * `URI.parse('file://' + path)` because the path might contain characters that are
+	 * interpreted (# and ?). See the following sample:
+	 * ```ts
+	const good = URI.file('/coding/c#/project1');
+	good.scheme === 'file';
+	good.path === '/coding/c#/project1';
+	good.fragment === '';
+	const bad = URI.parse('file://' + '/coding/c#/project1');
+	bad.scheme === 'file';
+	bad.path === '/coding/c'; // path is now broken
+	bad.fragment === '/project1';
+	```
+	 *
+	 * @param path A file system path (see `URI#fsPath`)
+	 */
 	public static file(path: string): URI {
 
 		let authority = _empty;
@@ -257,7 +310,7 @@ export default class URI implements UriComponents {
 		return new _URI('file', authority, path, _empty, _empty);
 	}
 
-	public static from(components: { scheme?: string; authority?: string; path?: string; query?: string; fragment?: string }): URI {
+	public static from(components: { scheme: string; authority?: string; path?: string; query?: string; fragment?: string }): URI {
 		return new _URI(
 			components.scheme,
 			components.authority,
@@ -270,6 +323,13 @@ export default class URI implements UriComponents {
 	// ---- printing/externalize ---------------------------
 
 	/**
+	 * Creates a string presentation for this URI. It's guardeed that calling
+	 * `URI.parse` with the result of this function creates an URI which is equal
+	 * to this URI.
+	 *
+	 * * The result shall *not* be used for display purposes but for externalization or transport.
+	 * * The result will be encoded using the percentage encoding and encoding happens mostly
+	 * ignore the scheme-specific encoding rules.
 	 *
 	 * @param skipEncoding Do not encode the result, default is `false`
 	 */
diff --git a/src/vs/base/common/uriIpc.ts b/src/vs/base/common/uriIpc.ts
new file mode 100644
index 00000000000..fd0fa60c8a6
--- /dev/null
+++ b/src/vs/base/common/uriIpc.ts
@@ -0,0 +1,18 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+import { URI, UriComponents } from 'vs/base/common/uri';
+
+export interface IURITransformer {
+	transformIncoming(uri: UriComponents): UriComponents;
+	transformOutgoing(uri: URI): URI;
+}
+
+export const DefaultURITransformer: IURITransformer = {
+	transformIncoming: (uri: UriComponents) => uri,
+	transformOutgoing: (uri: URI) => uri,
+};
\ No newline at end of file
diff --git a/src/vs/base/common/winjs.base.d.ts b/src/vs/base/common/winjs.base.d.ts
index b176120a06b..451ba709156 100644
--- a/src/vs/base/common/winjs.base.d.ts
+++ b/src/vs/base/common/winjs.base.d.ts
@@ -5,27 +5,14 @@
 /// Interfaces for WinJS
 
 export type ErrorCallback = (error: any) => void;
-export type ProgressCallback<TProgress = any> = (progress: TProgress) => void;
 
-export declare class Promise<T = any, TProgress = any> {
-	constructor(
-		executor: (
-			resolve: (value: T | PromiseLike<T>) => void,
-			reject: (reason: any) => void,
-			progress: (progress: TProgress) => void) => void,
-		oncancel?: () => void);
+export class Promise<T = any> {
+	constructor(executor: (resolve: (value: T | PromiseLike<T>) => void, reject: (reason: any) => void) => void);
 
 	public then<TResult1 = T, TResult2 = never>(
 		onfulfilled?: ((value: T) => TResult1 | PromiseLike<TResult1>) | null,
-		onrejected?: ((reason: any) => TResult2 | PromiseLike<TResult2>) | null,
-		onprogress?: (progress: TProgress) => void): Promise<TResult1 | TResult2, TProgress>;
+		onrejected?: ((reason: any) => TResult2 | PromiseLike<TResult2>) | null): Promise<TResult1 | TResult2>;
 
-	public done(
-		onfulfilled?: (value: T) => void,
-		onrejected?: (reason: any) => void,
-		onprogress?: (progress: TProgress) => void): void;
-
-	public cancel(): void;
 
 	public static as(value: null): Promise<null>;
 	public static as(value: undefined): Promise<undefined>;
@@ -33,13 +20,8 @@ export declare class Promise<T = any, TProgress = any> {
 	public static as<T, SomePromise extends PromiseLike<T>>(value: SomePromise): SomePromise;
 	public static as<T>(value: T): Promise<T>;
 
-	public static is(value: any): value is PromiseLike<any>;
-
-	public static timeout(delay: number): Promise<void>;
-
 	public static join<T1, T2>(promises: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>]): Promise<[T1, T2]>;
 	public static join<T>(promises: (T | PromiseLike<T>)[]): Promise<T[]>;
-	public static join<T>(promises: { [n: string]: T | PromiseLike<T> }): Promise<{ [n: string]: T }>;
 
 	public static any<T>(promises: (T | PromiseLike<T>)[]): Promise<{ key: string; value: Promise<T>; }>;
 
@@ -57,9 +39,7 @@ export type TValueCallback<T = any> = (value: T | PromiseLike<T>) => void;
 
 export {
 	Promise as TPromise,
-	Promise as PPromise,
-	TValueCallback as ValueCallback,
-	ProgressCallback as TProgressCallback
+	TValueCallback as ValueCallback
 };
 
 export interface IPromiseErrorDetail {
diff --git a/src/vs/base/common/winjs.base.js b/src/vs/base/common/winjs.base.js
index 49debfc7045..d8de83ddd3e 100644
--- a/src/vs/base/common/winjs.base.js
+++ b/src/vs/base/common/winjs.base.js
@@ -1038,6 +1038,12 @@ _winjs("WinJS/Promise/_StateMachine", ["WinJS/Core/_Global","WinJS/Core/_BaseCor
             /// error function.
             /// </returns>
             /// </signature>
+            // BEGIN monaco change
+            if (this.then !== Promise_then) {
+                this.then(onComplete, onError, onProgress);
+                return;
+            }
+            // END monaco change
             return this._state.then(this, onComplete, onError, onProgress);
         },
 
diff --git a/src/vs/base/common/winjs.polyfill.promise.ts b/src/vs/base/common/winjs.polyfill.promise.ts
index 6ebd06ea511..fb80ee9569b 100644
--- a/src/vs/base/common/winjs.polyfill.promise.ts
+++ b/src/vs/base/common/winjs.polyfill.promise.ts
@@ -5,6 +5,11 @@
 
 import { Promise as WinJSPromise } from './winjs.base';
 import * as platform from 'vs/base/common/platform';
+import { isThenable } from 'vs/base/common/async';
+
+function isWinJSPromise(candidate: any): candidate is WinJSPromise {
+	return isThenable(candidate) && typeof (candidate as any).done === 'function';
+}
 
 /**
  * A polyfill for the native promises. The implementation is based on
@@ -45,7 +50,7 @@ export class PolyfillPromise<T = any> implements Promise<T> {
 	constructor(callback: (resolve: (value?: T) => void, reject: (err?: any) => void) => any);
 	constructor(initOrPromise: WinJSPromise | ((resolve: (value?: T) => void, reject: (err?: any) => void) => any)) {
 
-		if (WinJSPromise.is(initOrPromise)) {
+		if (isWinJSPromise(initOrPromise)) {
 			this._winjsPromise = initOrPromise;
 		} else {
 			this._winjsPromise = new WinJSPromise((resolve, reject) => {
@@ -70,19 +75,47 @@ export class PolyfillPromise<T = any> implements Promise<T> {
 
 	then(onFulfilled?: any, onRejected?: any): PolyfillPromise {
 		let sync = true;
+		// To support chaining, we need to return the value of the
+		// onFulfilled and onRejected callback.
+		// WinJSPromise supports a flat-map style #then, ie. the callbacks
+		// passed to WinJSPromise#then can return a Promise.
 		let promise = new PolyfillPromise(this._winjsPromise.then(
 			onFulfilled && function (value) {
 				if (!sync) {
-					onFulfilled(value);
+					return onFulfilled(value);
 				} else {
-					platform.setImmediate(() => onFulfilled(value));
+					return new WinJSPromise((resolve, reject) => {
+						platform.setImmediate(() => {
+							let result;
+							try {
+								result = onFulfilled(value);
+							}
+							catch (err2) {
+								reject(err2);
+								return;
+							}
+							resolve(result);
+						});
+					});
 				}
 			},
 			onRejected && function (err) {
 				if (!sync) {
-					onRejected(err);
+					return onRejected(err);
 				} else {
-					platform.setImmediate(() => onRejected(err));
+					return new WinJSPromise((resolve, reject) => {
+						platform.setImmediate(() => {
+							let result;
+							try {
+								result = onRejected(err);
+							}
+							catch (err2) {
+								reject(err2);
+								return;
+							}
+							resolve(result);
+						});
+					});
 				}
 			}
 		));
diff --git a/src/vs/base/common/worker/simpleWorker.ts b/src/vs/base/common/worker/simpleWorker.ts
index ceaaa0ff541..52a38b74249 100644
--- a/src/vs/base/common/worker/simpleWorker.ts
+++ b/src/vs/base/common/worker/simpleWorker.ts
@@ -7,7 +7,6 @@
 import { transformErrorForSerialization } from 'vs/base/common/errors';
 import { Disposable } from 'vs/base/common/lifecycle';
 import { ErrorCallback, TPromise, ValueCallback } from 'vs/base/common/winjs.base';
-import { ShallowCancelThenPromise } from 'vs/base/common/async';
 import { isWeb } from 'vs/base/common/platform';
 
 const INITIALIZE = '$initialize';
@@ -91,11 +90,9 @@ class SimpleWorkerProtocol {
 			c: null,
 			e: null
 		};
-		let result = new TPromise<any>((c, e, p) => {
+		let result = new TPromise<any>((c, e) => {
 			reply.c = c;
 			reply.e = e;
-		}, () => {
-			// Cancel not supported
 		});
 		this._pendingReplies[req] = reply;
 
@@ -232,10 +229,10 @@ export class SimpleWorkerClient<T> extends Disposable {
 			loaderConfiguration = (<any>self).requirejs.s.contexts._.config;
 		}
 
-		this._lazyProxy = new TPromise<T>((c, e, p) => {
+		this._lazyProxy = new TPromise<T>((c, e) => {
 			lazyProxyFulfill = c;
 			lazyProxyReject = e;
-		}, () => { /* no cancel */ });
+		});
 
 		// Send initialize message
 		this._onModuleLoaded = this._protocol.sendMessage(INITIALIZE, [
@@ -268,17 +265,14 @@ export class SimpleWorkerClient<T> extends Disposable {
 	}
 
 	public getProxyObject(): TPromise<T> {
-		// Do not allow chaining promises to cancel the proxy creation
-		return new ShallowCancelThenPromise(this._lazyProxy);
+		return this._lazyProxy;
 	}
 
 	private _request(method: string, args: any[]): TPromise<any> {
-		return new TPromise<any>((c, e, p) => {
+		return new TPromise<any>((c, e) => {
 			this._onModuleLoaded.then(() => {
 				this._protocol.sendMessage(method, args).then(c, e);
 			}, e);
-		}, () => {
-			// Cancel intentionally not supported
 		});
 	}
 
@@ -363,7 +357,7 @@ export class SimpleWorkerServer {
 
 		let cc: ValueCallback;
 		let ee: ErrorCallback;
-		let r = new TPromise<any>((c, e, p) => {
+		let r = new TPromise<any>((c, e) => {
 			cc = c;
 			ee = e;
 		});
diff --git a/src/vs/base/node/config.ts b/src/vs/base/node/config.ts
index d08120cfbfc..31eea31a6bd 100644
--- a/src/vs/base/node/config.ts
+++ b/src/vs/base/node/config.ts
@@ -8,7 +8,7 @@
 import * as fs from 'fs';
 import { dirname, basename } from 'path';
 import * as objects from 'vs/base/common/objects';
-import { IDisposable, dispose, toDisposable } from 'vs/base/common/lifecycle';
+import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { Event, Emitter } from 'vs/base/common/event';
 import * as json from 'vs/base/common/json';
 import * as extfs from 'vs/base/node/extfs';
@@ -152,17 +152,10 @@ export class ConfigWatcher<T> implements IConfigWatcher<T>, IDisposable {
 			return; // avoid watchers that will never get disposed by checking for being disposed
 		}
 
-		const watcher = extfs.watch(path,
+		this.disposables.push(extfs.watch(path,
 			(type, file) => this.onConfigFileChange(type, file, isParentFolder),
 			(error: string) => this.options.onError(error)
-		);
-
-		if (watcher) {
-			this.disposables.push(toDisposable(() => {
-				watcher.removeAllListeners();
-				watcher.close();
-			}));
-		}
+		));
 	}
 
 	private onConfigFileChange(eventType: string, filename: string, isParentFolder: boolean): void {
diff --git a/src/vs/base/node/console.ts b/src/vs/base/node/console.ts
index 7e28ba2b392..6df45052a00 100644
--- a/src/vs/base/node/console.ts
+++ b/src/vs/base/node/console.ts
@@ -5,7 +5,7 @@
 
 'use strict';
 
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 
 export interface IRemoteConsoleLog {
 	type: string;
diff --git a/src/vs/base/node/crypto.ts b/src/vs/base/node/crypto.ts
index b658da126b6..4951a5dcc09 100644
--- a/src/vs/base/node/crypto.ts
+++ b/src/vs/base/node/crypto.ts
@@ -32,7 +32,7 @@ export function checksum(path: string, sha1hash: string): TPromise<void> {
 		input.once('error', done);
 		input.once('end', done);
 		hashStream.once('error', done);
-		hashStream.once('data', (data: NodeBuffer) => done(null, data.toString('hex')));
+		hashStream.once('data', (data: Buffer) => done(null, data.toString('hex')));
 	});
 
 	return promise.then(hash => {
diff --git a/src/vs/base/node/decoder.ts b/src/vs/base/node/decoder.ts
index de145fc29b2..9cfb1094995 100644
--- a/src/vs/base/node/decoder.ts
+++ b/src/vs/base/node/decoder.ts
@@ -25,7 +25,7 @@ export class LineDecoder {
 		this.remaining = null;
 	}
 
-	public write(buffer: NodeBuffer): string[] {
+	public write(buffer: Buffer): string[] {
 		let result: string[] = [];
 		let value = this.remaining
 			? this.remaining + this.stringDecoder.write(buffer)
diff --git a/src/vs/base/node/encoding.ts b/src/vs/base/node/encoding.ts
index 9913c16ff88..9a23a47d9c6 100644
--- a/src/vs/base/node/encoding.ts
+++ b/src/vs/base/node/encoding.ts
@@ -11,7 +11,6 @@ import { TPromise } from 'vs/base/common/winjs.base';
 import { isLinux, isMacintosh } from 'vs/base/common/platform';
 import { exec } from 'child_process';
 import { Readable, Writable, WritableOptions } from 'stream';
-import { asWinJSImport } from 'vs/base/common/async';
 
 export const UTF8 = 'utf8';
 export const UTF8_with_bom = 'utf8bom';
@@ -119,11 +118,11 @@ export function bomLength(encoding: string): number {
 	return 0;
 }
 
-export function decode(buffer: NodeBuffer, encoding: string): string {
+export function decode(buffer: Buffer, encoding: string): string {
 	return iconv.decode(buffer, toNodeEncoding(encoding));
 }
 
-export function encode(content: string | NodeBuffer, encoding: string, options?: { addBOM?: boolean }): NodeBuffer {
+export function encode(content: string | Buffer, encoding: string, options?: { addBOM?: boolean }): Buffer {
 	return iconv.encode(content, toNodeEncoding(encoding), options);
 }
 
@@ -147,7 +146,7 @@ function toNodeEncoding(enc: string): string {
 	return enc;
 }
 
-export function detectEncodingByBOMFromBuffer(buffer: NodeBuffer, bytesRead: number): string {
+export function detectEncodingByBOMFromBuffer(buffer: Buffer, bytesRead: number): string {
 	if (!buffer || bytesRead < 2) {
 		return null;
 	}
@@ -193,8 +192,8 @@ const IGNORE_ENCODINGS = ['ascii', 'utf-8', 'utf-16', 'utf-32'];
 /**
  * Guesses the encoding from buffer.
  */
-export function guessEncodingByBuffer(buffer: NodeBuffer): TPromise<string> {
-	return asWinJSImport(import('jschardet')).then(jschardet => {
+export function guessEncodingByBuffer(buffer: Buffer): TPromise<string> {
+	return TPromise.wrap(import('jschardet')).then(jschardet => {
 		jschardet.Constants.MINIMUM_THRESHOLD = MINIMUM_THRESHOLD;
 
 		const guessed = jschardet.detect(buffer);
diff --git a/src/vs/base/node/extfs.ts b/src/vs/base/node/extfs.ts
index 3ffedc2d347..11f190c54df 100644
--- a/src/vs/base/node/extfs.ts
+++ b/src/vs/base/node/extfs.ts
@@ -15,6 +15,8 @@ import * as uuid from 'vs/base/common/uuid';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { encode, encodeStream } from 'vs/base/node/encoding';
 import * as flow from 'vs/base/node/flow';
+import { CancellationToken } from 'vs/base/common/cancellation';
+import { IDisposable, toDisposable, Disposable } from 'vs/base/common/lifecycle';
 
 const loop = flow.loop;
 
@@ -93,7 +95,7 @@ export function copy(source: string, target: string, callback: (error: Error) =>
 			});
 		};
 
-		mkdirp(target, stat.mode & 511).done(proceed, proceed);
+		mkdirp(target, stat.mode & 511).then(proceed, proceed);
 	});
 }
 
@@ -129,18 +131,28 @@ function doCopyFile(source: string, target: string, mode: number, callback: (err
 	reader.pipe(writer);
 }
 
-export function mkdirp(path: string, mode?: number): TPromise<boolean> {
-	const mkdir = () => nfcall(fs.mkdir, path, mode)
-		.then(null, (err: NodeJS.ErrnoException) => {
-			if (err.code === 'EEXIST') {
-				return nfcall(fs.stat, path)
-					.then((stat: fs.Stats) => stat.isDirectory
-						? null
-						: TPromise.wrapError(new Error(`'${path}' exists and is not a directory.`)));
+export function mkdirp(path: string, mode?: number, token?: CancellationToken): TPromise<boolean> {
+	const mkdir = () => {
+		return nfcall(fs.mkdir, path, mode).then(null, (mkdirErr: NodeJS.ErrnoException) => {
+
+			// ENOENT: a parent folder does not exist yet
+			if (mkdirErr.code === 'ENOENT') {
+				return TPromise.wrapError(mkdirErr);
 			}
 
-			return TPromise.wrapError<boolean>(err);
+			// Any other error: check if folder exists and
+			// return normally in that case if its a folder
+			return nfcall(fs.stat, path).then((stat: fs.Stats) => {
+				if (!stat.isDirectory()) {
+					return TPromise.wrapError(new Error(`'${path}' exists and is not a directory.`));
+				}
+
+				return null;
+			}, statErr => {
+				return TPromise.wrapError(mkdirErr); // bubble up original mkdir error
+			});
 		});
+	};
 
 	// stop at root
 	if (path === paths.dirname(path)) {
@@ -149,10 +161,19 @@ export function mkdirp(path: string, mode?: number): TPromise<boolean> {
 
 	// recursively mkdir
 	return mkdir().then(null, (err: NodeJS.ErrnoException) => {
+
+		// Respect cancellation
+		if (token && token.isCancellationRequested) {
+			return TPromise.as(false);
+		}
+
+		// ENOENT: a parent folder does not exist yet, continue
+		// to create the parent folder and then try again.
 		if (err.code === 'ENOENT') {
 			return mkdirp(paths.dirname(path), mode).then(mkdir);
 		}
 
+		// Any other error
 		return TPromise.wrapError<boolean>(err);
 	});
 }
@@ -351,7 +372,7 @@ export interface IWriteFileOptions {
 }
 
 let canFlush = true;
-export function writeFileAndFlush(path: string, data: string | NodeBuffer | NodeJS.ReadableStream, options: IWriteFileOptions, callback: (error?: Error) => void): void {
+export function writeFileAndFlush(path: string, data: string | Buffer | NodeJS.ReadableStream, options: IWriteFileOptions, callback: (error?: Error) => void): void {
 	options = ensureOptions(options);
 
 	if (typeof data === 'string' || Buffer.isBuffer(data)) {
@@ -452,7 +473,7 @@ function doWriteFileStreamAndFlush(path: string, reader: NodeJS.ReadableStream,
 // not in some cache.
 //
 // See https://github.com/nodejs/node/blob/v5.10.0/lib/fs.js#L1194
-function doWriteFileAndFlush(path: string, data: string | NodeBuffer, options: IWriteFileOptions, callback: (error?: Error) => void): void {
+function doWriteFileAndFlush(path: string, data: string | Buffer, options: IWriteFileOptions, callback: (error?: Error) => void): void {
 	if (options.encoding) {
 		data = encode(data, options.encoding.charset, { addBOM: options.encoding.addBOM });
 	}
@@ -489,7 +510,7 @@ function doWriteFileAndFlush(path: string, data: string | NodeBuffer, options: I
 	});
 }
 
-export function writeFileAndFlushSync(path: string, data: string | NodeBuffer, options?: IWriteFileOptions): void {
+export function writeFileAndFlushSync(path: string, data: string | Buffer, options?: IWriteFileOptions): void {
 	options = ensureOptions(options);
 
 	if (options.encoding) {
@@ -620,7 +641,7 @@ function normalizePath(path: string): string {
 	return strings.rtrim(paths.normalize(path), paths.sep);
 }
 
-export function watch(path: string, onChange: (type: string, path?: string) => void, onError: (error: string) => void): fs.FSWatcher {
+export function watch(path: string, onChange: (type: string, path?: string) => void, onError: (error: string) => void): IDisposable {
 	try {
 		const watcher = fs.watch(path);
 
@@ -640,7 +661,10 @@ export function watch(path: string, onChange: (type: string, path?: string) => v
 
 		watcher.on('error', (code: number, signal: string) => onError(`Failed to watch ${path} for changes (${code}, ${signal})`));
 
-		return watcher;
+		return toDisposable(() => {
+			watcher.removeAllListeners();
+			watcher.close();
+		});
 	} catch (error) {
 		fs.exists(path, exists => {
 			if (exists) {
@@ -649,5 +673,41 @@ export function watch(path: string, onChange: (type: string, path?: string) => v
 		});
 	}
 
-	return void 0;
+	return Disposable.None;
 }
+
+export function sanitizeFilePath(candidate: string, cwd: string): string {
+
+	// Special case: allow to open a drive letter without trailing backslash
+	if (platform.isWindows && strings.endsWith(candidate, ':')) {
+		candidate += paths.sep;
+	}
+
+	// Ensure absolute
+	if (!paths.isAbsolute(candidate)) {
+		candidate = paths.join(cwd, candidate);
+	}
+
+	// Ensure normalized
+	candidate = paths.normalize(candidate);
+
+	// Ensure no trailing slash/backslash
+	if (platform.isWindows) {
+		candidate = strings.rtrim(candidate, paths.sep);
+
+		// Special case: allow to open drive root ('C:\')
+		if (strings.endsWith(candidate, ':')) {
+			candidate += paths.sep;
+		}
+
+	} else {
+		candidate = strings.rtrim(candidate, paths.sep);
+
+		// Special case: allow to open root ('/')
+		if (!candidate) {
+			candidate = paths.sep;
+		}
+	}
+
+	return candidate;
+}
\ No newline at end of file
diff --git a/src/vs/base/node/paths.ts b/src/vs/base/node/paths.ts
index dfdc28def8a..66930cdaf4b 100644
--- a/src/vs/base/node/paths.ts
+++ b/src/vs/base/node/paths.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import uri from 'vs/base/common/uri';
+import { getPathFromAmdModule } from 'vs/base/common/amd';
 
 interface IPaths {
 	getAppDataPath(platform: string): string;
 	getDefaultUserDataPath(platform: string): string;
 }
 
-const pathsPath = uri.parse(require.toUrl('paths')).fsPath;
+const pathsPath = getPathFromAmdModule(require, 'paths');
 const paths = require.__$__nodeRequire<IPaths>(pathsPath);
 export const getAppDataPath = paths.getAppDataPath;
-export const getDefaultUserDataPath = paths.getDefaultUserDataPath;
\ No newline at end of file
+export const getDefaultUserDataPath = paths.getDefaultUserDataPath;
diff --git a/src/vs/base/node/pfs.ts b/src/vs/base/node/pfs.ts
index 6172b9a30ad..7f2138fd34e 100644
--- a/src/vs/base/node/pfs.ts
+++ b/src/vs/base/node/pfs.ts
@@ -19,7 +19,7 @@ export function readdir(path: string): TPromise<string[]> {
 }
 
 export function exists(path: string): TPromise<boolean> {
-	return new TPromise(c => fs.exists(path, c), () => { });
+	return new TPromise(c => fs.exists(path, c));
 }
 
 export function chmod(path: string, mode: number): TPromise<boolean> {
@@ -98,7 +98,7 @@ export function readFile(path: string, encoding?: string): TPromise<Buffer | str
 const writeFilePathQueue: { [path: string]: Queue<void> } = Object.create(null);
 
 export function writeFile(path: string, data: string, options?: extfs.IWriteFileOptions): TPromise<void>;
-export function writeFile(path: string, data: NodeBuffer, options?: extfs.IWriteFileOptions): TPromise<void>;
+export function writeFile(path: string, data: Buffer, options?: extfs.IWriteFileOptions): TPromise<void>;
 export function writeFile(path: string, data: Uint8Array, options?: extfs.IWriteFileOptions): TPromise<void>;
 export function writeFile(path: string, data: NodeJS.ReadableStream, options?: extfs.IWriteFileOptions): TPromise<void>;
 export function writeFile(path: string, data: any, options?: extfs.IWriteFileOptions): TPromise<void> {
@@ -194,4 +194,4 @@ export function whenDeleted(path: string): TPromise<void> {
 
 export function copy(source: string, target: string): TPromise<void> {
 	return nfcall(extfs.copy, source, target);
-}
\ No newline at end of file
+}
diff --git a/src/vs/base/node/processes.ts b/src/vs/base/node/processes.ts
index ea32b4dce2f..53f90f70954 100644
--- a/src/vs/base/node/processes.ts
+++ b/src/vs/base/node/processes.ts
@@ -6,19 +6,20 @@
 
 import * as path from 'path';
 import * as cp from 'child_process';
-import { fork } from 'vs/base/node/stdFork';
 import * as nls from 'vs/nls';
-import { PPromise, TPromise, TValueCallback, TProgressCallback, ErrorCallback } from 'vs/base/common/winjs.base';
+import { TPromise, TValueCallback, ErrorCallback } from 'vs/base/common/winjs.base';
 import * as Types from 'vs/base/common/types';
 import { IStringDictionary } from 'vs/base/common/collections';
-import URI from 'vs/base/common/uri';
 import * as Objects from 'vs/base/common/objects';
 import * as TPath from 'vs/base/common/paths';
 import * as Platform from 'vs/base/common/platform';
 import { LineDecoder } from 'vs/base/node/decoder';
 import { CommandOptions, ForkOptions, SuccessData, Source, TerminateResponse, TerminateResponseCode, Executable } from 'vs/base/common/processes';
+import { getPathFromAmdModule } from 'vs/base/common/amd';
 export { CommandOptions, ForkOptions, SuccessData, Source, TerminateResponse, TerminateResponseCode };
 
+export type TProgressCallback<T> = (progress: T) => void;
+
 export interface LineData {
 	line: string;
 	source: Source;
@@ -52,7 +53,7 @@ export function terminateProcess(process: cp.ChildProcess, cwd?: string): Termin
 		}
 	} else if (Platform.isLinux || Platform.isMacintosh) {
 		try {
-			let cmd = URI.parse(require.toUrl('vs/base/node/terminateProcess.sh')).fsPath;
+			let cmd = getPathFromAmdModule(require, 'vs/base/node/terminateProcess.sh');
 			let result = cp.spawnSync(cmd, [process.pid.toString()]);
 			if (result.error) {
 				return { success: false, error: result.error };
@@ -72,7 +73,6 @@ export function getWindowsShell(): string {
 
 export abstract class AbstractProcess<TProgressData> {
 	private cmd: string;
-	private module: string;
 	private args: string[];
 	private options: CommandOptions | ForkOptions;
 	protected shell: boolean;
@@ -105,18 +105,12 @@ export abstract class AbstractProcess<TProgressData> {
 
 	public constructor(executable: Executable);
 	public constructor(cmd: string, args: string[], shell: boolean, options: CommandOptions);
-	public constructor(module: string, args: string[], options: ForkOptions);
-	public constructor(arg1: string | Executable, arg2?: string[], arg3?: boolean | ForkOptions, arg4?: CommandOptions) {
-		if (arg4) {
+	public constructor(arg1: string | Executable, arg2?: string[], arg3?: boolean, arg4?: CommandOptions) {
+		if (arg2 !== void 0 && arg3 !== void 0 && arg4 !== void 0) {
 			this.cmd = <string>arg1;
 			this.args = arg2;
-			this.shell = <boolean>arg3;
+			this.shell = arg3;
 			this.options = arg4;
-		} else if (arg3 && arg2) {
-			this.module = <string>arg1;
-			this.args = arg2;
-			this.shell = false;
-			this.options = <ForkOptions>arg3;
 		} else {
 			let executable = <Executable>arg1;
 			this.cmd = executable.command;
@@ -152,18 +146,16 @@ export abstract class AbstractProcess<TProgressData> {
 		return 'other';
 	}
 
-	public start(): PPromise<SuccessData, TProgressData> {
+	public start(pp: TProgressCallback<TProgressData>): TPromise<SuccessData> {
 		if (Platform.isWindows && ((this.options && this.options.cwd && TPath.isUNC(this.options.cwd)) || !this.options && !this.options.cwd && TPath.isUNC(process.cwd()))) {
 			return TPromise.wrapError(new Error(nls.localize('TaskRunner.UNC', 'Can\'t execute a shell command on a UNC drive.')));
 		}
 		return this.useExec().then((useExec) => {
 			let cc: TValueCallback<SuccessData>;
 			let ee: ErrorCallback;
-			let pp: TProgressCallback<TProgressData>;
-			let result = new PPromise<any, TProgressData>((c, e, p) => {
+			let result = new TPromise<any>((c, e) => {
 				cc = c;
 				ee = e;
-				pp = p;
 			});
 
 			if (useExec) {
@@ -233,24 +225,6 @@ export abstract class AbstractProcess<TProgressData> {
 				} else {
 					if (this.cmd) {
 						childProcess = cp.spawn(this.cmd, this.args, this.options);
-					} else if (this.module) {
-						this.childProcessPromise = new TPromise<cp.ChildProcess>((c, e, p) => {
-							fork(this.module, this.args, <ForkOptions>this.options, (error: any, childProcess: cp.ChildProcess) => {
-								if (error) {
-									e(error);
-									ee({ terminated: this.terminateRequested, error: error });
-									return;
-								}
-								this.childProcess = childProcess;
-								if (this.pidResolve) {
-									this.pidResolve(Types.isNumber(childProcess.pid) ? childProcess.pid : -1);
-									this.pidResolve = undefined;
-								}
-								this.childProcess.on('close', closeHandler);
-								this.handleSpawn(childProcess, cc, pp, ee, false);
-								c(childProcess);
-							});
-						});
 					}
 				}
 				if (childProcess) {
@@ -323,7 +297,7 @@ export abstract class AbstractProcess<TProgressData> {
 	}
 
 	private useExec(): TPromise<boolean> {
-		return new TPromise<boolean>((c, e, p) => {
+		return new TPromise<boolean>((c, e) => {
 			if (!this.shell || !Platform.isWindows) {
 				c(false);
 			}
@@ -345,7 +319,6 @@ export class LineProcess extends AbstractProcess<LineData> {
 
 	public constructor(executable: Executable);
 	public constructor(cmd: string, args: string[], shell: boolean, options: CommandOptions);
-	public constructor(module: string, args: string[], options: ForkOptions);
 	public constructor(arg1: string | Executable, arg2?: string[], arg3?: boolean | ForkOptions, arg4?: CommandOptions) {
 		super(<any>arg1, arg2, <any>arg3, arg4);
 	}
diff --git a/src/vs/base/node/proxy.ts b/src/vs/base/node/proxy.ts
index 5629b9032e7..d3d525ce0d0 100644
--- a/src/vs/base/node/proxy.ts
+++ b/src/vs/base/node/proxy.ts
@@ -8,8 +8,6 @@
 import { Url, parse as parseUrl } from 'url';
 import { isBoolean } from 'vs/base/common/types';
 import { Agent } from './request';
-import { TPromise } from 'vs/base/common/winjs.base';
-
 
 function getSystemProxyURI(requestURL: Url): string {
 	if (requestURL.protocol === 'http:') {
@@ -26,7 +24,7 @@ export interface IOptions {
 	strictSSL?: boolean;
 }
 
-export async function getProxyAgent(rawRequestURL: string, options: IOptions = {}): TPromise<Agent> {
+export async function getProxyAgent(rawRequestURL: string, options: IOptions = {}): Promise<Agent> {
 	const requestURL = parseUrl(rawRequestURL);
 	const proxyURL = options.proxyUrl || getSystemProxyURI(requestURL);
 
diff --git a/src/vs/base/node/ps.ts b/src/vs/base/node/ps.ts
index f0410cc42d4..488f8bf9bb0 100644
--- a/src/vs/base/node/ps.ts
+++ b/src/vs/base/node/ps.ts
@@ -6,7 +6,8 @@
 'use strict';
 
 import { exec } from 'child_process';
-import URI from 'vs/base/common/uri';
+
+import { getPathFromAmdModule } from 'vs/base/common/amd';
 
 export interface ProcessItem {
 	name: string;
@@ -59,7 +60,7 @@ export function listProcesses(rootPid: number): Promise<ProcessItem> {
 
 		function findName(cmd: string): string {
 
-			const RENDERER_PROCESS_HINT = /--disable-blink-features=Auxclick/;
+			const SHARED_PROCESS_HINT = /--disable-blink-features=Auxclick/;
 			const WINDOWS_WATCHER_HINT = /\\watcher\\win32\\CodeHelper\.exe/;
 			const WINDOWS_CRASH_REPORTER = /--crashes-directory/;
 			const WINDOWS_PTY = /\\pipe\\winpty-control/;
@@ -90,7 +91,7 @@ export function listProcesses(rootPid: number): Promise<ProcessItem> {
 			let matches = TYPE.exec(cmd);
 			if (matches && matches.length === 2) {
 				if (matches[1] === 'renderer') {
-					if (!RENDERER_PROCESS_HINT.exec(cmd)) {
+					if (SHARED_PROCESS_HINT.exec(cmd)) {
 						return 'shared-process';
 					}
 
@@ -206,7 +207,8 @@ export function listProcesses(rootPid: number): Promise<ProcessItem> {
 
 						// The cpu usage value reported on Linux is the average over the process lifetime,
 						// recalculate the usage over a one second interval
-						let cmd = URI.parse(require.toUrl('vs/base/node/cpuUsage.sh')).fsPath;
+						// JSON.stringify is needed to escape spaces, https://github.com/nodejs/node/issues/6803
+						let cmd = JSON.stringify(getPathFromAmdModule(require, 'vs/base/node/cpuUsage.sh'));
 						cmd += ' ' + pids.join(' ');
 
 						exec(cmd, {}, (err, stdout, stderr) => {
diff --git a/src/vs/base/node/request.ts b/src/vs/base/node/request.ts
index 79a067db70e..23da75d32ab 100644
--- a/src/vs/base/node/request.ts
+++ b/src/vs/base/node/request.ts
@@ -14,6 +14,8 @@ import { parse as parseUrl } from 'url';
 import { createWriteStream } from 'fs';
 import { assign } from 'vs/base/common/objects';
 import { createGunzip } from 'zlib';
+import { CancellationToken } from 'vs/base/common/cancellation';
+import { canceled } from 'vs/base/common/errors';
 
 export type Agent = any;
 
@@ -46,21 +48,21 @@ export interface IRequestContext {
 }
 
 export interface IRequestFunction {
-	(options: IRequestOptions): TPromise<IRequestContext>;
+	(options: IRequestOptions, token: CancellationToken): TPromise<IRequestContext>;
 }
 
-async function getNodeRequest(options: IRequestOptions): TPromise<IRawRequestFunction> {
+async function getNodeRequest(options: IRequestOptions): Promise<IRawRequestFunction> {
 	const endpoint = parseUrl(options.url);
 	const module = endpoint.protocol === 'https:' ? await import('https') : await import('http');
 	return module.request;
 }
 
-export function request(options: IRequestOptions): TPromise<IRequestContext> {
+export function request(options: IRequestOptions, token: CancellationToken): TPromise<IRequestContext> {
 	let req: http.ClientRequest;
 
 	const rawRequestPromise = options.getRawRequest
 		? TPromise.as(options.getRawRequest(options))
-		: getNodeRequest(options);
+		: TPromise.wrap(getNodeRequest(options));
 
 	return rawRequestPromise.then(rawRequest => {
 
@@ -88,7 +90,7 @@ export function request(options: IRequestOptions): TPromise<IRequestContext> {
 					request(assign({}, options, {
 						url: res.headers['location'],
 						followRedirects: followRedirects - 1
-					})).done(c, e);
+					}), token).then(c, e);
 				} else {
 					let stream: Stream = res;
 
@@ -116,7 +118,12 @@ export function request(options: IRequestOptions): TPromise<IRequestContext> {
 			}
 
 			req.end();
-		}, () => req && req.abort());
+
+			token.onCancellationRequested(() => {
+				req.abort();
+				e(canceled());
+			});
+		});
 	});
 }
 
diff --git a/src/vs/base/node/stdFork.ts b/src/vs/base/node/stdFork.ts
deleted file mode 100644
index c7c36559465..00000000000
--- a/src/vs/base/node/stdFork.ts
+++ /dev/null
@@ -1,140 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-'use strict';
-
-import * as path from 'path';
-import * as os from 'os';
-import * as net from 'net';
-import * as cp from 'child_process';
-import uri from 'vs/base/common/uri';
-
-export interface IForkOpts {
-	cwd?: string;
-	env?: any;
-	encoding?: string;
-	execArgv?: string[];
-}
-
-function makeRandomHexString(length: number): string {
-	let chars = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'];
-	let result = '';
-	for (let i = 0; i < length; i++) {
-		let idx = Math.floor(chars.length * Math.random());
-		result += chars[idx];
-	}
-	return result;
-}
-
-function generatePipeName(): string {
-	let randomName = 'vscode-std-' + makeRandomHexString(40);
-	if (process.platform === 'win32') {
-		return '\\\\.\\pipe\\' + randomName + '-sock';
-	}
-
-	// Mac/Unix: use socket file
-	return path.join(os.tmpdir(), randomName + '.sock');
-}
-
-function generatePatchedEnv(env: any, stdInPipeName: string, stdOutPipeName: string, stdErrPipeName: string): any {
-	// Set the two unique pipe names and the electron flag as process env
-
-	let newEnv: any = {};
-	for (let key in env) {
-		newEnv[key] = env[key];
-	}
-
-	newEnv['STDIN_PIPE_NAME'] = stdInPipeName;
-	newEnv['STDOUT_PIPE_NAME'] = stdOutPipeName;
-	newEnv['STDERR_PIPE_NAME'] = stdErrPipeName;
-	newEnv['ELECTRON_RUN_AS_NODE'] = '1';
-
-	return newEnv;
-}
-
-export function fork(modulePath: string, args: string[], options: IForkOpts, callback: (error: any, cp: cp.ChildProcess) => void): void {
-
-	let callbackCalled = false;
-	let resolve = (result: cp.ChildProcess) => {
-		if (callbackCalled) {
-			return;
-		}
-		callbackCalled = true;
-		callback(null, result);
-	};
-	let reject = (err: any) => {
-		if (callbackCalled) {
-			return;
-		}
-		callbackCalled = true;
-		callback(err, null);
-	};
-
-	// Generate three unique pipe names
-	let stdInPipeName = generatePipeName();
-	let stdOutPipeName = generatePipeName();
-	let stdErrPipeName = generatePipeName();
-
-	let newEnv = generatePatchedEnv(options.env || process.env, stdInPipeName, stdOutPipeName, stdErrPipeName);
-
-	let childProcess: cp.ChildProcess;
-
-	// Begin listening to stderr pipe
-	let stdErrServer = net.createServer((stdErrStream) => {
-		// From now on the childProcess.stderr is available for reading
-		childProcess.stderr = stdErrStream;
-	});
-	stdErrServer.listen(stdErrPipeName);
-
-	// Begin listening to stdout pipe
-	let stdOutServer = net.createServer((stdOutStream) => {
-		// The child process will write exactly one chunk with content `ready` when it has installed a listener to the stdin pipe
-
-		stdOutStream.once('data', (chunk: Buffer) => {
-			// The child process is sending me the `ready` chunk, time to connect to the stdin pipe
-			childProcess.stdin = <any>net.connect(stdInPipeName);
-
-			// From now on the childProcess.stdout is available for reading
-			childProcess.stdout = stdOutStream;
-
-			resolve(childProcess);
-		});
-	});
-	stdOutServer.listen(stdOutPipeName);
-
-	let serverClosed = false;
-	let closeServer = () => {
-		if (serverClosed) {
-			return;
-		}
-
-		serverClosed = true;
-		process.removeListener('exit', closeServer);
-		stdOutServer.close();
-		stdErrServer.close();
-	};
-
-	// Create the process
-	let bootstrapperPath = (uri.parse(require.toUrl('./stdForkStart.js')).fsPath);
-	childProcess = cp.fork(bootstrapperPath, [modulePath].concat(args), {
-		silent: true,
-		cwd: options.cwd,
-		env: newEnv,
-		execArgv: options.execArgv
-	});
-
-	childProcess.once('error', (err: Error) => {
-		closeServer();
-		reject(err);
-	});
-
-	childProcess.once('exit', (err: Error) => {
-		closeServer();
-		reject(err);
-	});
-
-	// On vscode exit still close server #7758
-	process.once('exit', closeServer);
-}
diff --git a/src/vs/base/node/stdForkStart.js b/src/vs/base/node/stdForkStart.js
deleted file mode 100644
index 42226f9a08d..00000000000
--- a/src/vs/base/node/stdForkStart.js
+++ /dev/null
@@ -1,197 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-const net = require('net');
-const fs = require('fs');
-// const stream = require('stream');
-// const util = require('util');
-
-var ENABLE_LOGGING = false;
-
-var log = (function () {
-	if (!ENABLE_LOGGING) {
-		return function () { };
-	}
-	var isFirst = true;
-	var LOG_LOCATION = 'C:\\stdFork.log';
-	return function log(str) {
-		if (isFirst) {
-			isFirst = false;
-			fs.writeFileSync(LOG_LOCATION, str + '\n');
-			return;
-		}
-		fs.appendFileSync(LOG_LOCATION, str + '\n');
-	};
-})();
-
-var stdInPipeName = process.env['STDIN_PIPE_NAME'];
-var stdOutPipeName = process.env['STDOUT_PIPE_NAME'];
-var stdErrPipeName = process.env['STDERR_PIPE_NAME'];
-
-log('STDIN_PIPE_NAME: ' + stdInPipeName);
-log('STDOUT_PIPE_NAME: ' + stdOutPipeName);
-log('STDERR_PIPE_NAME: ' + stdErrPipeName);
-log('ELECTRON_RUN_AS_NODE: ' + process.env['ELECTRON_RUN_AS_NODE']);
-
-// stdout redirection to named pipe
-(function () {
-	log('Beginning stdout redirection...');
-
-	// Create a writing stream to the stdout pipe
-	var stdOutStream = net.connect(stdOutPipeName);
-
-	// unref stdOutStream to behave like a normal standard out
-	stdOutStream.unref();
-
-	// handle process.stdout
-	process.__defineGetter__('stdout', function () { return stdOutStream; });
-
-	// Create a writing stream to the stderr pipe
-	var stdErrStream = net.connect(stdErrPipeName);
-
-	// unref stdErrStream to behave like a normal standard out
-	stdErrStream.unref();
-
-	// handle process.stderr
-	process.__defineGetter__('stderr', function () { return stdErrStream; });
-
-	var fsWriteSyncString = function (fd, str, position, encoding) {
-		//  fs.writeSync(fd, string[, position[, encoding]]);
-		var buf = Buffer.from(str, encoding || 'utf8');
-		return fsWriteSyncBuffer(fd, buf, 0, buf.length);
-	};
-
-	var fsWriteSyncBuffer = function (fd, buffer, off, len/* , position */) {
-		off = Math.abs(off | 0);
-		len = Math.abs(len | 0);
-
-		//  fs.writeSync(fd, buffer, offset, length[, position]);
-		var buffer_length = buffer.length;
-
-		if (off > buffer_length) {
-			throw new Error('offset out of bounds');
-		}
-		if (len > buffer_length) {
-			throw new Error('length out of bounds');
-		}
-		if (((off + len) | 0) < off) {
-			throw new Error('off + len overflow');
-		}
-		if (buffer_length - off < len) {
-			// Asking for more than is left over in the buffer
-			throw new Error('off + len > buffer.length');
-		}
-
-		var slicedBuffer = buffer;
-		if (off !== 0 || len !== buffer_length) {
-			slicedBuffer = buffer.slice(off, off + len);
-		}
-
-		if (fd === 1) {
-			stdOutStream.write(slicedBuffer);
-		} else {
-			stdErrStream.write(slicedBuffer);
-		}
-		return slicedBuffer.length;
-	};
-
-	// handle fs.writeSync(1, ...) and fs.writeSync(2, ...)
-	var originalWriteSync = fs.writeSync;
-	fs.writeSync = function (fd, data/* , position, encoding */) {
-		if (fd !== 1 && fd !== 2) {
-			return originalWriteSync.apply(fs, arguments);
-		}
-		// usage:
-		//  fs.writeSync(fd, buffer, offset, length[, position]);
-		// OR
-		//  fs.writeSync(fd, string[, position[, encoding]]);
-
-		if (data instanceof Buffer) {
-			return fsWriteSyncBuffer.apply(null, arguments);
-		}
-
-		// For compatibility reasons with fs.writeSync, writing null will write "null", etc
-		if (typeof data !== 'string') {
-			data += '';
-		}
-
-		return fsWriteSyncString.apply(null, arguments);
-	};
-
-	log('Finished defining process.stdout, process.stderr and fs.writeSync');
-})();
-
-// stdin redirection to named pipe
-(function () {
-
-	// Begin listening to stdin pipe
-	var server = net.createServer(function (stream) {
-		// Stop accepting new connections, keep the existing one alive
-		server.close();
-
-		log('Parent process has connected to my stdin. All should be good now.');
-
-		// handle process.stdin
-		process.__defineGetter__('stdin', function () {
-			return stream;
-		});
-
-		// Remove myself from process.argv
-		process.argv.splice(1, 1);
-
-		// Load the actual program
-		var program = process.argv[1];
-		log('Loading program: ' + program);
-
-		// Unset the custom environmental variables that should not get inherited
-		delete process.env['STDIN_PIPE_NAME'];
-		delete process.env['STDOUT_PIPE_NAME'];
-		delete process.env['STDERR_PIPE_NAME'];
-		delete process.env['ELECTRON_RUN_AS_NODE'];
-
-		require(program);
-
-		log('Finished loading program.');
-
-		var stdinIsReferenced = true;
-		var timer = setInterval(function () {
-			var listenerCount = (
-				stream.listeners('data').length +
-				stream.listeners('end').length +
-				stream.listeners('close').length +
-				stream.listeners('error').length
-			);
-			// log('listenerCount: ' + listenerCount);
-			if (listenerCount <= 1) {
-				// No more "actual" listeners, only internal node
-				if (stdinIsReferenced) {
-					stdinIsReferenced = false;
-					// log('unreferencing stream!!!');
-					stream.unref();
-				}
-			} else {
-				// There are "actual" listeners
-				if (!stdinIsReferenced) {
-					stdinIsReferenced = true;
-					stream.ref();
-				}
-			}
-			// log(
-			// 	'' + stream.listeners('data').length +
-			// 	' ' + stream.listeners('end').length +
-			// 	' ' + stream.listeners('close').length +
-			// 	' ' + stream.listeners('error').length
-			// );
-		}, 1000);
-		timer.unref();
-	});
-
-
-	server.listen(stdInPipeName, function () {
-		// signal via stdout that the parent process can now begin writing to stdin pipe
-		process.stdout.write('ready');
-	});
-
-})();
diff --git a/src/vs/base/node/stream.ts b/src/vs/base/node/stream.ts
index a9ba27bb005..a1919336918 100644
--- a/src/vs/base/node/stream.ts
+++ b/src/vs/base/node/stream.ts
@@ -10,7 +10,7 @@ import * as fs from 'fs';
 import { TPromise } from 'vs/base/common/winjs.base';
 
 export interface ReadResult {
-	buffer: NodeBuffer;
+	buffer: Buffer;
 	bytesRead: number;
 }
 
@@ -24,7 +24,7 @@ export function readExactlyByFile(file: string, totalBytes: number): TPromise<Re
 				return error(err);
 			}
 
-			function end(err: Error, resultBuffer: NodeBuffer, bytesRead: number): void {
+			function end(err: Error, resultBuffer: Buffer, bytesRead: number): void {
 				fs.close(fd, closeError => {
 					if (closeError) {
 						return error(closeError);
diff --git a/src/vs/base/node/zip.ts b/src/vs/base/node/zip.ts
deleted file mode 100644
index 0c575be1bef..00000000000
--- a/src/vs/base/node/zip.ts
+++ /dev/null
@@ -1,187 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import * as nls from 'vs/nls';
-import * as path from 'path';
-import { createWriteStream, WriteStream } from 'fs';
-import { Readable } from 'stream';
-import { nfcall, ninvoke, SimpleThrottler } from 'vs/base/common/async';
-import { mkdirp, rimraf } from 'vs/base/node/pfs';
-import { TPromise } from 'vs/base/common/winjs.base';
-import { open as _openZip, Entry, ZipFile } from 'yauzl';
-import { ILogService } from 'vs/platform/log/common/log';
-
-export interface IExtractOptions {
-	overwrite?: boolean;
-
-	/**
-	 * Source path within the ZIP archive. Only the files contained in this
-	 * path will be extracted.
-	 */
-	sourcePath?: string;
-}
-
-interface IOptions {
-	sourcePathRegex: RegExp;
-}
-
-export type ExtractErrorType = 'CorruptZip' | 'Incomplete';
-
-export class ExtractError extends Error {
-
-	readonly type: ExtractErrorType;
-	readonly cause: Error;
-
-	constructor(type: ExtractErrorType, cause: Error) {
-		let message = cause.message;
-
-		switch (type) {
-			case 'CorruptZip': message = `Corrupt ZIP: ${message}`; break;
-		}
-
-		super(message);
-		this.type = type;
-		this.cause = cause;
-	}
-}
-
-function modeFromEntry(entry: Entry) {
-	let attr = entry.externalFileAttributes >> 16 || 33188;
-
-	return [448 /* S_IRWXU */, 56 /* S_IRWXG */, 7 /* S_IRWXO */]
-		.map(mask => attr & mask)
-		.reduce((a, b) => a + b, attr & 61440 /* S_IFMT */);
-}
-
-function toExtractError(err: Error): ExtractError {
-	if (err instanceof ExtractError) {
-		return err;
-	}
-
-	let type: ExtractErrorType = void 0;
-
-	if (/end of central directory record signature not found/.test(err.message)) {
-		type = 'CorruptZip';
-	}
-
-	return new ExtractError(type, err);
-}
-
-function extractEntry(stream: Readable, fileName: string, mode: number, targetPath: string, options: IOptions): TPromise<void> {
-	const dirName = path.dirname(fileName);
-	const targetDirName = path.join(targetPath, dirName);
-	const targetFileName = path.join(targetPath, fileName);
-
-	let istream: WriteStream;
-	return mkdirp(targetDirName).then(() => new TPromise((c, e) => {
-		istream = createWriteStream(targetFileName, { mode });
-		istream.once('close', () => c(null));
-		istream.once('error', e);
-		stream.once('error', e);
-		stream.pipe(istream);
-	}, () => {
-		if (istream) {
-			istream.close();
-		}
-	}));
-}
-
-function extractZip(zipfile: ZipFile, targetPath: string, options: IOptions, logService: ILogService): TPromise<void> {
-	let isCanceled = false;
-	let last = TPromise.wrap<any>(null);
-	let extractedEntriesCount = 0;
-
-	return new TPromise((c, e) => {
-		const throttler = new SimpleThrottler();
-
-		const readNextEntry = () => {
-			extractedEntriesCount++;
-			zipfile.readEntry();
-		};
-
-		zipfile.once('error', e);
-		zipfile.once('close', () => last.then(() => {
-			if (isCanceled || zipfile.entryCount === extractedEntriesCount) {
-				c(null);
-			} else {
-				e(new ExtractError('Incomplete', new Error(nls.localize('incompleteExtract', "Incomplete. Found {0} of {1} entries", extractedEntriesCount, zipfile.entryCount))));
-			}
-		}, e));
-		zipfile.readEntry();
-		zipfile.on('entry', (entry: Entry) => {
-			logService.debug(targetPath, 'Found', entry.fileName);
-
-			if (isCanceled) {
-				return;
-			}
-
-			if (!options.sourcePathRegex.test(entry.fileName)) {
-				readNextEntry();
-				return;
-			}
-
-			const fileName = entry.fileName.replace(options.sourcePathRegex, '');
-
-			// directory file names end with '/'
-			if (/\/$/.test(fileName)) {
-				const targetFileName = path.join(targetPath, fileName);
-				last = mkdirp(targetFileName).then(() => readNextEntry());
-				return;
-			}
-
-			const stream = ninvoke(zipfile, zipfile.openReadStream, entry);
-			const mode = modeFromEntry(entry);
-
-			last = throttler.queue(() => stream.then(stream => extractEntry(stream, fileName, mode, targetPath, options).then(() => readNextEntry())));
-		});
-	}, () => {
-		logService.debug(targetPath, 'Cancelled.');
-		isCanceled = true;
-		last.cancel();
-		zipfile.close();
-	}).then(null, err => TPromise.wrapError(toExtractError(err)));
-}
-
-function openZip(zipFile: string, lazy: boolean = false): TPromise<ZipFile> {
-	return nfcall<ZipFile>(_openZip, zipFile, lazy ? { lazyEntries: true } : void 0)
-		.then(null, err => TPromise.wrapError(toExtractError(err)));
-}
-
-export function extract(zipPath: string, targetPath: string, options: IExtractOptions = {}, logService: ILogService): TPromise<void> {
-	const sourcePathRegex = new RegExp(options.sourcePath ? `^${options.sourcePath}` : '');
-
-	let promise = openZip(zipPath, true);
-
-	if (options.overwrite) {
-		promise = promise.then(zipfile => rimraf(targetPath).then(() => zipfile));
-	}
-
-	return promise.then(zipfile => extractZip(zipfile, targetPath, { sourcePathRegex }, logService));
-}
-
-function read(zipPath: string, filePath: string): TPromise<Readable> {
-	return openZip(zipPath).then(zipfile => {
-		return new TPromise<Readable>((c, e) => {
-			zipfile.on('entry', (entry: Entry) => {
-				if (entry.fileName === filePath) {
-					ninvoke<Readable>(zipfile, zipfile.openReadStream, entry).done(stream => c(stream), err => e(err));
-				}
-			});
-
-			zipfile.once('close', () => e(new Error(nls.localize('notFound', "{0} not found inside zip.", filePath))));
-		});
-	});
-}
-
-export function buffer(zipPath: string, filePath: string): TPromise<Buffer> {
-	return read(zipPath, filePath).then(stream => {
-		return new TPromise<Buffer>((c, e) => {
-			const buffers: Buffer[] = [];
-			stream.once('error', e);
-			stream.on('data', b => buffers.push(b as Buffer));
-			stream.on('end', () => c(Buffer.concat(buffers)));
-		});
-	});
-}
diff --git a/src/vs/base/parts/contextmenu/common/contextmenu.ts b/src/vs/base/parts/contextmenu/common/contextmenu.ts
new file mode 100644
index 00000000000..6998c66916f
--- /dev/null
+++ b/src/vs/base/parts/contextmenu/common/contextmenu.ts
@@ -0,0 +1,45 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+export interface ICommonContextMenuItem {
+	label?: string;
+
+	type?: 'normal' | 'separator' | 'submenu' | 'checkbox' | 'radio';
+
+	accelerator?: string;
+
+	enabled?: boolean;
+	visible?: boolean;
+	checked?: boolean;
+}
+
+export interface ISerializableContextMenuItem extends ICommonContextMenuItem {
+	id: number;
+	submenu?: ISerializableContextMenuItem[];
+}
+
+export interface IContextMenuItem extends ICommonContextMenuItem {
+	click?: (event: IContextMenuEvent) => void;
+	submenu?: IContextMenuItem[];
+}
+
+export interface IContextMenuEvent {
+	shiftKey?: boolean;
+	ctrlKey?: boolean;
+	altKey?: boolean;
+	metaKey?: boolean;
+}
+
+export interface IPopupOptions {
+	x?: number;
+	y?: number;
+	positioningItem?: number;
+	onHide?: () => void;
+}
+
+export const CONTEXT_MENU_CHANNEL = 'vscode:contextmenu';
+export const CONTEXT_MENU_CLOSE_CHANNEL = 'vscode:onCloseContextMenu';
\ No newline at end of file
diff --git a/src/vs/base/parts/contextmenu/electron-browser/contextmenu.ts b/src/vs/base/parts/contextmenu/electron-browser/contextmenu.ts
new file mode 100644
index 00000000000..f5e4d2b8dfe
--- /dev/null
+++ b/src/vs/base/parts/contextmenu/electron-browser/contextmenu.ts
@@ -0,0 +1,50 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+import { ipcRenderer, Event } from 'electron';
+import { IContextMenuItem, ISerializableContextMenuItem, CONTEXT_MENU_CLOSE_CHANNEL, CONTEXT_MENU_CHANNEL, IPopupOptions, IContextMenuEvent } from 'vs/base/parts/contextmenu/common/contextmenu';
+
+let onClickChannelIds = 0;
+
+export function popup(items: IContextMenuItem[], options?: IPopupOptions): void {
+	const processedItems: IContextMenuItem[] = [];
+
+	const onClickChannel = `vscode:onContextMenu${onClickChannelIds++}`;
+	const onClickChannelHandler = (event: Event, itemId: number, context: IContextMenuEvent) => processedItems[itemId].click(context);
+
+	ipcRenderer.once(onClickChannel, onClickChannelHandler);
+	ipcRenderer.once(CONTEXT_MENU_CLOSE_CHANNEL, () => {
+		ipcRenderer.removeListener(onClickChannel, onClickChannelHandler);
+
+		if (options && options.onHide) {
+			options.onHide();
+		}
+	});
+
+	ipcRenderer.send(CONTEXT_MENU_CHANNEL, items.map(item => createItem(item, processedItems)), onClickChannel, options);
+}
+
+function createItem(item: IContextMenuItem, processedItems: IContextMenuItem[]): ISerializableContextMenuItem {
+	const serializableItem = {
+		id: processedItems.length,
+		label: item.label,
+		type: item.type,
+		accelerator: item.accelerator,
+		checked: item.checked,
+		enabled: typeof item.enabled === 'boolean' ? item.enabled : true,
+		visible: typeof item.visible === 'boolean' ? item.visible : true
+	} as ISerializableContextMenuItem;
+
+	processedItems.push(item);
+
+	// Submenu
+	if (Array.isArray(item.submenu)) {
+		serializableItem.submenu = item.submenu.map(submenuItem => createItem(submenuItem, processedItems));
+	}
+
+	return serializableItem;
+}
\ No newline at end of file
diff --git a/src/vs/base/parts/contextmenu/electron-main/contextmenu.ts b/src/vs/base/parts/contextmenu/electron-main/contextmenu.ts
new file mode 100644
index 00000000000..5afeaad9c1c
--- /dev/null
+++ b/src/vs/base/parts/contextmenu/electron-main/contextmenu.ts
@@ -0,0 +1,65 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+import { Menu, MenuItem, BrowserWindow, Event, ipcMain } from 'electron';
+import { ISerializableContextMenuItem, CONTEXT_MENU_CLOSE_CHANNEL, CONTEXT_MENU_CHANNEL, IPopupOptions } from 'vs/base/parts/contextmenu/common/contextmenu';
+
+export function registerContextMenuListener(): void {
+	ipcMain.on(CONTEXT_MENU_CHANNEL, (event: Event, items: ISerializableContextMenuItem[], onClickChannel: string, options?: IPopupOptions) => {
+		const menu = createMenu(event, onClickChannel, items);
+
+		menu.popup({
+			window: BrowserWindow.fromWebContents(event.sender),
+			x: options ? options.x : void 0,
+			y: options ? options.y : void 0,
+			positioningItem: options ? options.positioningItem : void 0,
+			callback: () => {
+				event.sender.send(CONTEXT_MENU_CLOSE_CHANNEL);
+			}
+		});
+	});
+}
+
+function createMenu(event: Event, onClickChannel: string, items: ISerializableContextMenuItem[]): Menu {
+	const menu = new Menu();
+
+	items.forEach(item => {
+		let menuitem: MenuItem;
+
+		// Separator
+		if (item.type === 'separator') {
+			menuitem = new MenuItem({
+				type: item.type,
+			});
+		}
+
+		// Sub Menu
+		else if (Array.isArray(item.submenu)) {
+			menuitem = new MenuItem({
+				submenu: createMenu(event, onClickChannel, item.submenu),
+				label: item.label
+			});
+		}
+
+		// Normal Menu Item
+		else {
+			menuitem = new MenuItem({
+				label: item.label,
+				type: item.type,
+				accelerator: item.accelerator,
+				checked: item.checked,
+				enabled: item.enabled,
+				visible: item.visible,
+				click: (menuItem, win, contextmenuEvent) => event.sender.send(onClickChannel, item.id, contextmenuEvent)
+			});
+		}
+
+		menu.append(menuitem);
+	});
+
+	return menu;
+}
\ No newline at end of file
diff --git a/src/vs/base/parts/ipc/common/ipc.electron.ts b/src/vs/base/parts/ipc/common/ipc.electron.ts
deleted file mode 100644
index 43422887433..00000000000
--- a/src/vs/base/parts/ipc/common/ipc.electron.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
-import { IMessagePassingProtocol } from 'vs/base/parts/ipc/common/ipc';
-import { Event, Emitter } from 'vs/base/common/event';
-
-export interface Sender {
-	send(channel: string, ...args: any[]): void;
-}
-
-export class Protocol implements IMessagePassingProtocol {
-
-	private listener: IDisposable;
-
-	private _onMessage: Event<any>;
-	get onMessage(): Event<any> { return this._onMessage; }
-
-	constructor(private sender: Sender, onMessageEvent: Event<any>) {
-		const emitter = new Emitter<any>();
-		onMessageEvent(msg => emitter.fire(msg));
-		this._onMessage = emitter.event;
-	}
-
-	send(message: any): void {
-		try {
-			this.sender.send('ipc:message', message);
-		} catch (e) {
-			// systems are going down
-		}
-	}
-
-	dispose(): void {
-		this.listener = dispose(this.listener);
-	}
-}
\ No newline at end of file
diff --git a/src/vs/base/parts/ipc/common/ipc.ts b/src/vs/base/parts/ipc/common/ipc.ts
deleted file mode 100644
index a3985361b63..00000000000
--- a/src/vs/base/parts/ipc/common/ipc.ts
+++ /dev/null
@@ -1,502 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-'use strict';
-
-import { Promise, TPromise } from 'vs/base/common/winjs.base';
-import { IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { Event, Emitter, once, filterEvent } from 'vs/base/common/event';
-
-enum MessageType {
-	RequestCommon,
-	RequestCancel,
-	ResponseInitialize,
-	ResponseSuccess,
-	ResponseProgress,
-	ResponseError,
-	ResponseErrorObj
-}
-
-function isResponse(messageType: MessageType): boolean {
-	return messageType >= MessageType.ResponseInitialize;
-}
-
-interface IRawMessage {
-	id: number;
-	type: MessageType;
-}
-
-interface IRawRequest extends IRawMessage {
-	channelName?: string;
-	name?: string;
-	arg?: any;
-}
-
-interface IRequest {
-	raw: IRawRequest;
-	emitter?: Emitter<any>;
-	flush?: () => void;
-}
-
-interface IRawResponse extends IRawMessage {
-	data: any;
-}
-
-interface IHandler {
-	(response: IRawResponse): void;
-}
-
-export interface IMessagePassingProtocol {
-	send(request: any): void;
-	onMessage: Event<any>;
-}
-
-enum State {
-	Uninitialized,
-	Idle
-}
-
-/**
- * An `IChannel` is an abstraction over a collection of commands.
- * You can `call` several commands on a channel, each taking at
- * most one single argument. A `call` always returns a promise
- * with at most one single return value.
- */
-export interface IChannel {
-	call(command: string, arg?: any): TPromise<any>;
-}
-
-/**
- * An `IChannelServer` hosts a collection of channels. You are
- * able to register channels onto it, provided a channel name.
- */
-export interface IChannelServer {
-	registerChannel(channelName: string, channel: IChannel): void;
-}
-
-/**
- * An `IChannelClient` has access to a collection of channels. You
- * are able to get those channels, given their channel name.
- */
-export interface IChannelClient {
-	getChannel<T extends IChannel>(channelName: string): T;
-}
-
-/**
- * An `IClientRouter` is responsible for routing calls to specific
- * channels, in scenarios in which there are multiple possible
- * channels (each from a separate client) to pick from.
- */
-export interface IClientRouter {
-	route(command: string, arg: any): string;
-}
-
-/**
- * Similar to the `IChannelClient`, you can get channels from this
- * collection of channels. The difference being that in the
- * `IRoutingChannelClient`, there are multiple clients providing
- * the same channel. You'll need to pass in an `IClientRouter` in
- * order to pick the right one.
- */
-export interface IRoutingChannelClient {
-	getChannel<T extends IChannel>(channelName: string, router: IClientRouter): T;
-}
-
-export class ChannelServer implements IChannelServer, IDisposable {
-
-	private channels: { [name: string]: IChannel } = Object.create(null);
-	private activeRequests: { [id: number]: IDisposable; } = Object.create(null);
-	private protocolListener: IDisposable;
-
-	constructor(private protocol: IMessagePassingProtocol) {
-		this.protocolListener = this.protocol.onMessage(r => this.onMessage(r));
-		this.protocol.send(<IRawResponse>{ type: MessageType.ResponseInitialize });
-	}
-
-	registerChannel(channelName: string, channel: IChannel): void {
-		this.channels[channelName] = channel;
-	}
-
-	private onMessage(request: IRawRequest): void {
-		switch (request.type) {
-			case MessageType.RequestCommon:
-				this.onCommonRequest(request);
-				break;
-
-			case MessageType.RequestCancel:
-				this.onCancelRequest(request);
-				break;
-		}
-	}
-
-	private onCommonRequest(request: IRawRequest): void {
-		const channel = this.channels[request.channelName];
-		let promise: Promise;
-
-		try {
-			promise = channel.call(request.name, request.arg);
-		} catch (err) {
-			promise = TPromise.wrapError(err);
-		}
-
-		const id = request.id;
-
-		const requestPromise = promise.then(data => {
-			this.protocol.send(<IRawResponse>{ id, data, type: MessageType.ResponseSuccess });
-			delete this.activeRequests[request.id];
-		}, data => {
-			if (data instanceof Error) {
-				this.protocol.send(<IRawResponse>{
-					id, data: {
-						message: data.message,
-						name: data.name,
-						stack: data.stack ? (data.stack.split ? data.stack.split('\n') : data.stack) : void 0
-					}, type: MessageType.ResponseError
-				});
-			} else {
-				this.protocol.send(<IRawResponse>{ id, data, type: MessageType.ResponseErrorObj });
-			}
-
-			delete this.activeRequests[request.id];
-		}, data => {
-			this.protocol.send(<IRawResponse>{ id, data, type: MessageType.ResponseProgress });
-		});
-
-		this.activeRequests[request.id] = toDisposable(() => requestPromise.cancel());
-	}
-
-	private onCancelRequest(request: IRawRequest): void {
-		const disposable = this.activeRequests[request.id];
-
-		if (disposable) {
-			disposable.dispose();
-			delete this.activeRequests[request.id];
-		}
-	}
-
-	public dispose(): void {
-		this.protocolListener.dispose();
-		this.protocolListener = null;
-
-		Object.keys(this.activeRequests).forEach(id => {
-			this.activeRequests[<any>id].dispose();
-		});
-
-		this.activeRequests = null;
-	}
-}
-
-export class ChannelClient implements IChannelClient, IDisposable {
-
-	private state: State;
-	private activeRequests: Promise[];
-	private bufferedRequests: IRequest[];
-	private handlers: { [id: number]: IHandler; };
-	private lastRequestId: number;
-	private protocolListener: IDisposable;
-
-	constructor(private protocol: IMessagePassingProtocol) {
-		this.state = State.Uninitialized;
-		this.activeRequests = [];
-		this.bufferedRequests = [];
-		this.handlers = Object.create(null);
-		this.lastRequestId = 0;
-		this.protocolListener = this.protocol.onMessage(r => this.onMessage(r));
-	}
-
-	getChannel<T extends IChannel>(channelName: string): T {
-		const call = (command: string, arg: any) => this.request(channelName, command, arg);
-		return { call } as T;
-	}
-
-	private request(channelName: string, name: string, arg: any): Promise {
-		const request = {
-			raw: {
-				id: this.lastRequestId++,
-				type: MessageType.RequestCommon,
-				channelName,
-				name,
-				arg
-			}
-		};
-
-		const activeRequest = this.state === State.Uninitialized
-			? this.bufferRequest(request)
-			: this.doRequest(request);
-
-		this.activeRequests.push(activeRequest);
-
-		activeRequest
-			.then(null, _ => null)
-			.done(() => this.activeRequests = this.activeRequests.filter(i => i !== activeRequest));
-
-		return activeRequest;
-	}
-
-	private doRequest(request: IRequest): Promise {
-		const id = request.raw.id;
-
-		return new TPromise((c, e, p) => {
-			this.handlers[id] = response => {
-				switch (response.type) {
-					case MessageType.ResponseSuccess:
-						delete this.handlers[id];
-						c(response.data);
-						break;
-
-					case MessageType.ResponseError:
-						delete this.handlers[id];
-						const error = new Error(response.data.message);
-						(<any>error).stack = response.data.stack;
-						error.name = response.data.name;
-						e(error);
-						break;
-
-					case MessageType.ResponseErrorObj:
-						delete this.handlers[id];
-						e(response.data);
-						break;
-
-					case MessageType.ResponseProgress:
-						p(response.data);
-						break;
-				}
-			};
-
-			this.send(request.raw);
-		},
-			() => this.send({ id, type: MessageType.RequestCancel }));
-	}
-
-	private bufferRequest(request: IRequest): Promise {
-		let flushedRequest: Promise = null;
-
-		return new TPromise((c, e, p) => {
-			this.bufferedRequests.push(request);
-
-			request.flush = () => {
-				request.flush = null;
-				flushedRequest = this.doRequest(request).then(c, e, p);
-			};
-		}, () => {
-			request.flush = null;
-
-			if (this.state !== State.Uninitialized) {
-				if (flushedRequest) {
-					flushedRequest.cancel();
-					flushedRequest = null;
-				}
-
-				return;
-			}
-
-			const idx = this.bufferedRequests.indexOf(request);
-
-			if (idx === -1) {
-				return;
-			}
-
-			this.bufferedRequests.splice(idx, 1);
-		});
-	}
-
-	private onMessage(response: IRawResponse): void {
-		if (!isResponse(response.type)) {
-			return;
-		}
-
-		if (this.state === State.Uninitialized && response.type === MessageType.ResponseInitialize) {
-			this.state = State.Idle;
-			this.bufferedRequests.forEach(r => r.flush && r.flush());
-			this.bufferedRequests = null;
-			return;
-		}
-
-		const handler = this.handlers[response.id];
-		if (handler) {
-			handler(response);
-		}
-	}
-
-	private send(raw: IRawRequest) {
-		try {
-			this.protocol.send(raw);
-		} catch (err) {
-			// noop
-		}
-	}
-
-	dispose(): void {
-		this.protocolListener.dispose();
-		this.protocolListener = null;
-
-		this.activeRequests.forEach(r => r.cancel());
-		this.activeRequests = [];
-	}
-}
-
-export interface ClientConnectionEvent {
-	protocol: IMessagePassingProtocol;
-	onDidClientDisconnect: Event<void>;
-}
-
-/**
- * An `IPCServer` is both a channel server and a routing channel
- * client.
- *
- * As the owner of a protocol, you should extend both this
- * and the `IPCClient` classes to get IPC implementations
- * for your protocol.
- */
-export class IPCServer implements IChannelServer, IRoutingChannelClient, IDisposable {
-
-	private channels: { [name: string]: IChannel } = Object.create(null);
-	private channelClients: { [id: string]: ChannelClient; } = Object.create(null);
-	private onClientAdded = new Emitter<string>();
-
-	constructor(onDidClientConnect: Event<ClientConnectionEvent>) {
-		onDidClientConnect(({ protocol, onDidClientDisconnect }) => {
-			const onFirstMessage = once(protocol.onMessage);
-
-			onFirstMessage(id => {
-				const channelServer = new ChannelServer(protocol);
-				const channelClient = new ChannelClient(protocol);
-
-				Object.keys(this.channels)
-					.forEach(name => channelServer.registerChannel(name, this.channels[name]));
-
-				this.channelClients[id] = channelClient;
-				this.onClientAdded.fire(id);
-
-				onDidClientDisconnect(() => {
-					channelServer.dispose();
-					channelClient.dispose();
-					delete this.channelClients[id];
-				});
-			});
-		});
-	}
-
-	getChannel<T extends IChannel>(channelName: string, router: IClientRouter): T {
-		const call = (command: string, arg: any) => {
-			const id = router.route(command, arg);
-
-			if (!id) {
-				return TPromise.wrapError(new Error('Client id should be provided'));
-			}
-
-			return this.getClient(id).then(client => client.getChannel(channelName).call(command, arg));
-		};
-
-		return { call } as T;
-	}
-
-	registerChannel(channelName: string, channel: IChannel): void {
-		this.channels[channelName] = channel;
-	}
-
-	private getClient(clientId: string): TPromise<IChannelClient> {
-		const client = this.channelClients[clientId];
-
-		if (client) {
-			return TPromise.as(client);
-		}
-
-		return new TPromise<IChannelClient>(c => {
-			const onClient = once(filterEvent(this.onClientAdded.event, id => id === clientId));
-			onClient(() => c(this.channelClients[clientId]));
-		});
-	}
-
-	dispose(): void {
-		this.channels = Object.create(null);
-		this.channelClients = Object.create(null);
-		this.onClientAdded.dispose();
-	}
-}
-
-/**
- * An `IPCClient` is both a channel client and a channel server.
- *
- * As the owner of a protocol, you should extend both this
- * and the `IPCClient` classes to get IPC implementations
- * for your protocol.
- */
-export class IPCClient implements IChannelClient, IChannelServer, IDisposable {
-
-	private channelClient: ChannelClient;
-	private channelServer: ChannelServer;
-
-	constructor(protocol: IMessagePassingProtocol, id: string) {
-		protocol.send(id);
-		this.channelClient = new ChannelClient(protocol);
-		this.channelServer = new ChannelServer(protocol);
-	}
-
-	getChannel<T extends IChannel>(channelName: string): T {
-		return this.channelClient.getChannel(channelName) as T;
-	}
-
-	registerChannel(channelName: string, channel: IChannel): void {
-		this.channelServer.registerChannel(channelName, channel);
-	}
-
-	dispose(): void {
-		this.channelClient.dispose();
-		this.channelClient = null;
-		this.channelServer.dispose();
-		this.channelServer = null;
-	}
-}
-
-export function getDelayedChannel<T extends IChannel>(promise: TPromise<T>): T {
-	const call = (command: string, arg: any) => promise.then(c => c.call(command, arg));
-	return { call } as T;
-}
-
-export function getNextTickChannel<T extends IChannel>(channel: T): T {
-	let didTick = false;
-
-	const call = (command: string, arg: any) => {
-		if (didTick) {
-			return channel.call(command, arg);
-		}
-
-		return TPromise.timeout(0)
-			.then(() => didTick = true)
-			.then(() => channel.call(command, arg));
-	};
-
-	return { call } as T;
-}
-
-export type Serializer<T, R> = (obj: T) => R;
-export type Deserializer<T, R> = (raw: R) => T;
-
-export function eventToCall<T>(event: Event<T>, serializer: Serializer<T, any> = t => t): TPromise<void> {
-	let disposable: IDisposable;
-
-	return new TPromise(
-		(c, e, p) => disposable = event(t => p(serializer(t))),
-		() => disposable.dispose()
-	);
-}
-
-export function eventFromCall<T>(channel: IChannel, name: string, arg: any = null, deserializer: Deserializer<T, any> = t => t): Event<T> {
-	let promise: Promise;
-
-	const emitter = new Emitter<any>({
-		onFirstListenerAdd: () => {
-			promise = channel.call(name, arg)
-				.then(null, err => null, e => emitter.fire(deserializer(e)));
-		},
-		onLastListenerRemove: () => {
-			promise.cancel();
-			promise = null;
-		}
-	});
-
-	return emitter.event;
-}
diff --git a/src/vs/base/parts/ipc/electron-browser/ipc.electron-browser.ts b/src/vs/base/parts/ipc/electron-browser/ipc.electron-browser.ts
index 7e3ce8ddd1e..a61c756d6f0 100644
--- a/src/vs/base/parts/ipc/electron-browser/ipc.electron-browser.ts
+++ b/src/vs/base/parts/ipc/electron-browser/ipc.electron-browser.ts
@@ -4,14 +4,14 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { fromNodeEventEmitter } from 'vs/base/common/event';
-import { IPCClient } from 'vs/base/parts/ipc/common/ipc';
-import { Protocol } from 'vs/base/parts/ipc/common/ipc.electron';
+import { IPCClient } from 'vs/base/parts/ipc/node/ipc';
+import { Protocol } from 'vs/base/parts/ipc/node/ipc.electron';
 import { ipcRenderer } from 'electron';
 
 export class Client extends IPCClient {
 
 	private static createProtocol(): Protocol {
-		const onMessage = fromNodeEventEmitter<string>(ipcRenderer, 'ipc:message', (_, message) => message);
+		const onMessage = fromNodeEventEmitter<string>(ipcRenderer, 'ipc:message', (_, message: string) => message);
 		ipcRenderer.send('ipc:hello');
 		return new Protocol(ipcRenderer, onMessage);
 	}
diff --git a/src/vs/base/parts/ipc/electron-main/ipc.electron-main.ts b/src/vs/base/parts/ipc/electron-main/ipc.electron-main.ts
index af67f10d6ca..47da2f529f5 100644
--- a/src/vs/base/parts/ipc/electron-main/ipc.electron-main.ts
+++ b/src/vs/base/parts/ipc/electron-main/ipc.electron-main.ts
@@ -4,8 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { Event, filterEvent, mapEvent, fromNodeEventEmitter } from 'vs/base/common/event';
-import { IPCServer, ClientConnectionEvent } from 'vs/base/parts/ipc/common/ipc';
-import { Protocol } from 'vs/base/parts/ipc/common/ipc.electron';
+import { IPCServer, ClientConnectionEvent } from 'vs/base/parts/ipc/node/ipc';
+import { Protocol } from 'vs/base/parts/ipc/node/ipc.electron';
 import { ipcMain } from 'electron';
 
 interface WebContents extends Electron.WebContents {
@@ -17,8 +17,8 @@ interface IIPCEvent {
 	message: string;
 }
 
-function createScopedOnMessageEvent(senderId: number): Event<any> {
-	const onMessage = fromNodeEventEmitter<IIPCEvent>(ipcMain, 'ipc:message', (event, message) => ({ event, message }));
+function createScopedOnMessageEvent(senderId: number): Event<string> {
+	const onMessage = fromNodeEventEmitter<IIPCEvent>(ipcMain, 'ipc:message', (event, message: string) => ({ event, message }));
 	const onMessageFromSender = filterEvent(onMessage, ({ event }) => event.sender.getId() === senderId);
 	return mapEvent(onMessageFromSender, ({ message }) => message);
 }
diff --git a/src/vs/base/parts/ipc/node/ipc.cp.ts b/src/vs/base/parts/ipc/node/ipc.cp.ts
index b59747adc40..7aecc26c5cc 100644
--- a/src/vs/base/parts/ipc/node/ipc.cp.ts
+++ b/src/vs/base/parts/ipc/node/ipc.cp.ts
@@ -3,21 +3,27 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ChildProcess, fork } from 'child_process';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { TPromise } from 'vs/base/common/winjs.base';
-import { Delayer } from 'vs/base/common/async';
+import { ChildProcess, fork, ForkOptions } from 'child_process';
+import { IDisposable, toDisposable, dispose } from 'vs/base/common/lifecycle';
+import { Delayer, always, createCancelablePromise } from 'vs/base/common/async';
 import { deepClone, assign } from 'vs/base/common/objects';
-import { Emitter, fromNodeEventEmitter } from 'vs/base/common/event';
+import { Emitter, fromNodeEventEmitter, Event } from 'vs/base/common/event';
 import { createQueuedSender } from 'vs/base/node/processes';
-import { ChannelServer as IPCServer, ChannelClient as IPCClient, IChannelClient, IChannel } from 'vs/base/parts/ipc/common/ipc';
+import { ChannelServer as IPCServer, ChannelClient as IPCClient, IChannelClient, IChannel } from 'vs/base/parts/ipc/node/ipc';
 import { isRemoteConsoleLog, log } from 'vs/base/node/console';
+import { CancellationToken } from 'vs/base/common/cancellation';
+import * as errors from 'vs/base/common/errors';
+
+/**
+ * This implementation doesn't perform well since it uses base64 encoding for buffers.
+ * We should move all implementations to use named ipc.net, so we stop depending on cp.fork.
+ */
 
 export class Server extends IPCServer {
 	constructor() {
 		super({
-			send: r => { try { process.send(r); } catch (e) { /* not much to do */ } },
-			onMessage: fromNodeEventEmitter(process, 'message', msg => msg)
+			send: r => { try { process.send(r.toString('base64')); } catch (e) { /* not much to do */ } },
+			onMessage: fromNodeEventEmitter(process, 'message', msg => Buffer.from(msg, 'base64'))
 		});
 
 		process.once('disconnect', () => this.dispose());
@@ -74,58 +80,97 @@ export interface IIPCOptions {
 export class Client implements IChannelClient, IDisposable {
 
 	private disposeDelayer: Delayer<void>;
-	private activeRequests: TPromise<void>[];
+	private activeRequests = new Set<IDisposable>();
 	private child: ChildProcess;
 	private _client: IPCClient;
-	private channels: { [name: string]: IChannel };
+	private channels = new Map<string, IChannel>();
+
+	private _onDidProcessExit = new Emitter<{ code: number, signal: string }>();
+	readonly onDidProcessExit = this._onDidProcessExit.event;
 
 	constructor(private modulePath: string, private options: IIPCOptions) {
 		const timeout = options && options.timeout ? options.timeout : 60000;
 		this.disposeDelayer = new Delayer<void>(timeout);
-		this.activeRequests = [];
 		this.child = null;
 		this._client = null;
-		this.channels = Object.create(null);
 	}
 
 	getChannel<T extends IChannel>(channelName: string): T {
-		const call = (command: string, arg: any) => this.request(channelName, command, arg);
-		return { call } as T;
+		const that = this;
+
+		return {
+			call<T>(command: string, arg?: any, cancellationToken?: CancellationToken): Thenable<T> {
+				return that.requestPromise<T>(channelName, command, arg, cancellationToken);
+			},
+			listen(event: string, arg?: any) {
+				return that.requestEvent(channelName, event, arg);
+			}
+		} as T;
 	}
 
-	protected request(channelName: string, name: string, arg: any): TPromise<void> {
+	protected requestPromise<T>(channelName: string, name: string, arg?: any, cancellationToken = CancellationToken.None): Thenable<T> {
 		if (!this.disposeDelayer) {
-			return TPromise.wrapError(new Error('disposed'));
+			return Promise.reject(new Error('disposed'));
+		}
+
+		if (cancellationToken.isCancellationRequested) {
+			return Promise.reject(errors.canceled());
 		}
 
 		this.disposeDelayer.cancel();
 
-		const channel = this.channels[channelName] || (this.channels[channelName] = this.client.getChannel(channelName));
-		const request: TPromise<void> = channel.call(name, arg);
+		const channel = this.getCachedChannel(channelName);
+		const result = createCancelablePromise(token => channel.call<T>(name, arg, token));
+		const cancellationTokenListener = cancellationToken.onCancellationRequested(() => result.cancel());
 
-		// Progress doesn't propagate across 'then', we need to create a promise wrapper
-		const result = new TPromise<void>((c, e, p) => {
-			request.then(c, e, p).done(() => {
-				if (!this.activeRequests) {
-					return;
-				}
+		const disposable = toDisposable(() => result.cancel());
+		this.activeRequests.add(disposable);
 
-				this.activeRequests.splice(this.activeRequests.indexOf(result), 1);
+		always(result, () => {
+			cancellationTokenListener.dispose();
+			this.activeRequests.delete(disposable);
 
-				if (this.activeRequests.length === 0) {
+			if (this.activeRequests.size === 0) {
+				this.disposeDelayer.trigger(() => this.disposeClient());
+			}
+		});
+
+		return result;
+	}
+
+	protected requestEvent<T>(channelName: string, name: string, arg?: any): Event<T> {
+		if (!this.disposeDelayer) {
+			return Event.None;
+		}
+
+		this.disposeDelayer.cancel();
+
+		let listener: IDisposable;
+		const emitter = new Emitter<any>({
+			onFirstListenerAdd: () => {
+				const channel = this.getCachedChannel(channelName);
+				const event: Event<T> = channel.listen(name, arg);
+
+				listener = event(emitter.fire, emitter);
+				this.activeRequests.add(listener);
+			},
+			onLastListenerRemove: () => {
+				this.activeRequests.delete(listener);
+				listener.dispose();
+
+				if (this.activeRequests.size === 0 && this.disposeDelayer) {
 					this.disposeDelayer.trigger(() => this.disposeClient());
 				}
-			});
-		}, () => request.cancel());
+			}
+		});
 
-		this.activeRequests.push(result);
-		return result;
+		return emitter.event;
 	}
 
 	private get client(): IPCClient {
 		if (!this._client) {
 			const args = this.options && this.options.args ? this.options.args : [];
-			const forkOpts = Object.create(null);
+			const forkOpts: ForkOptions = Object.create(null);
 
 			forkOpts.env = assign(deepClone(process.env), { 'VSCODE_PARENT_PID': String(process.pid) });
 
@@ -147,7 +192,7 @@ export class Client implements IChannelClient, IDisposable {
 
 			this.child = fork(this.modulePath, args, forkOpts);
 
-			const onMessageEmitter = new Emitter<any>();
+			const onMessageEmitter = new Emitter<Buffer>();
 			const onRawMessage = fromNodeEventEmitter(this.child, 'message', msg => msg);
 
 			onRawMessage(msg => {
@@ -159,11 +204,11 @@ export class Client implements IChannelClient, IDisposable {
 				}
 
 				// Anything else goes to the outside
-				onMessageEmitter.fire(msg);
+				onMessageEmitter.fire(Buffer.from(msg, 'base64'));
 			});
 
 			const sender = this.options.useQueue ? createQueuedSender(this.child) : this.child;
-			const send = r => this.child && this.child.connected && sender.send(r);
+			const send = (r: Buffer) => this.child && this.child.connected && sender.send(r.toString('base64'));
 			const onMessage = onMessageEmitter.event;
 			const protocol = { send, onMessage };
 
@@ -177,35 +222,47 @@ export class Client implements IChannelClient, IDisposable {
 			this.child.on('exit', (code: any, signal: any) => {
 				process.removeListener('exit', onExit);
 
-				if (this.activeRequests) {
-					this.activeRequests.forEach(req => req.cancel());
-					this.activeRequests = [];
-				}
+				this.activeRequests.forEach(r => dispose(r));
+				this.activeRequests.clear();
 
 				if (code !== 0 && signal !== 'SIGTERM') {
-					console.warn('IPC "' + this.options.serverName + '" crashed with exit code ' + code);
+					console.warn('IPC "' + this.options.serverName + '" crashed with exit code ' + code + ' and signal ' + signal);
 					this.disposeDelayer.cancel();
 					this.disposeClient();
 				}
+
+				this._onDidProcessExit.fire({ code, signal });
 			});
 		}
 
 		return this._client;
 	}
 
+	private getCachedChannel(name: string): IChannel {
+		let channel = this.channels.get(name);
+
+		if (!channel) {
+			channel = this.client.getChannel(name);
+			this.channels.set(name, channel);
+		}
+
+		return channel;
+	}
+
 	private disposeClient() {
 		if (this._client) {
 			this.child.kill();
 			this.child = null;
 			this._client = null;
-			this.channels = Object.create(null);
+			this.channels.clear();
 		}
 	}
 
 	dispose() {
+		this._onDidProcessExit.dispose();
 		this.disposeDelayer.cancel();
 		this.disposeDelayer = null;
 		this.disposeClient();
-		this.activeRequests = null;
+		this.activeRequests.clear();
 	}
 }
diff --git a/src/vs/base/parts/ipc/node/ipc.electron.ts b/src/vs/base/parts/ipc/node/ipc.electron.ts
new file mode 100644
index 00000000000..56236c39d1c
--- /dev/null
+++ b/src/vs/base/parts/ipc/node/ipc.electron.ts
@@ -0,0 +1,41 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { IDisposable, dispose } from 'vs/base/common/lifecycle';
+import { IMessagePassingProtocol } from 'vs/base/parts/ipc/node/ipc';
+import { Event, Emitter } from 'vs/base/common/event';
+
+/**
+ * This implementation doesn't perform well since it uses base64 encoding for buffers.
+ * Electron 3.0 should have suport for buffers in IPC: https://github.com/electron/electron/pull/13055
+ */
+
+export interface Sender {
+	send(channel: string, msg: string): void;
+}
+
+export class Protocol implements IMessagePassingProtocol {
+
+	private listener: IDisposable;
+
+	private _onMessage = new Emitter<Buffer>();
+	get onMessage(): Event<Buffer> { return this._onMessage.event; }
+
+	constructor(private sender: Sender, onMessageEvent: Event<string>) {
+		onMessageEvent(msg => this._onMessage.fire(Buffer.from(msg, 'base64')));
+	}
+
+	send(message: Buffer): void {
+		try {
+			this.sender.send('ipc:message', message.toString('base64'));
+		} catch (e) {
+			// systems are going down
+		}
+	}
+
+	dispose(): void {
+		this.listener = dispose(this.listener);
+	}
+}
\ No newline at end of file
diff --git a/src/vs/base/parts/ipc/node/ipc.net.ts b/src/vs/base/parts/ipc/node/ipc.net.ts
index 499e8a52a06..c802f0bd42d 100644
--- a/src/vs/base/parts/ipc/node/ipc.net.ts
+++ b/src/vs/base/parts/ipc/node/ipc.net.ts
@@ -6,12 +6,13 @@
 'use strict';
 
 import { Socket, Server as NetServer, createConnection, createServer } from 'net';
-import { TPromise } from 'vs/base/common/winjs.base';
 import { Event, Emitter, once, mapEvent, fromNodeEventEmitter } from 'vs/base/common/event';
-import { IMessagePassingProtocol, ClientConnectionEvent, IPCServer, IPCClient } from 'vs/base/parts/ipc/common/ipc';
+import { IMessagePassingProtocol, ClientConnectionEvent, IPCServer, IPCClient } from 'vs/base/parts/ipc/node/ipc';
 import { join } from 'path';
 import { tmpdir } from 'os';
 import { generateUuid } from 'vs/base/common/uuid';
+import { IDisposable } from 'vs/base/common/lifecycle';
+import { TimeoutTimer } from 'vs/base/common/async';
 
 export function generateRandomPipeName(): string {
 	const randomSuffix = generateUuid();
@@ -23,45 +24,62 @@ export function generateRandomPipeName(): string {
 	}
 }
 
-export class Protocol implements IMessagePassingProtocol {
+/**
+ * A message has the following format:
+ *
+ * 		[bodyLen|message]
+ * 		[header^|data^^^]
+ * 		[u32be^^|buffer^]
+ */
 
-	private static readonly _headerLen = 17;
+export class Protocol implements IDisposable, IMessagePassingProtocol {
 
-	private _onMessage = new Emitter<any>();
+	private static readonly _headerLen = 4;
 
-	readonly onMessage: Event<any> = this._onMessage.event;
+	private _isDisposed: boolean;
+	private _chunks: Buffer[];
 
-	constructor(private _socket: Socket) {
+	private _firstChunkTimer: TimeoutTimer;
+	private _socketDataListener: (data: Buffer) => void;
+	private _socketEndListener: () => void;
+	private _socketCloseListener: () => void;
+
+	private _onMessage = new Emitter<Buffer>();
+	readonly onMessage: Event<Buffer> = this._onMessage.event;
+
+	private _onClose = new Emitter<void>();
+	readonly onClose: Event<void> = this._onClose.event;
+
+	constructor(private _socket: Socket, firstDataChunk?: Buffer) {
+		this._isDisposed = false;
+		this._chunks = [];
 
-		let chunks: Buffer[] = [];
 		let totalLength = 0;
 
 		const state = {
 			readHead: true,
-			bodyIsJson: false,
 			bodyLen: -1,
 		};
 
-		_socket.on('data', (data: Buffer) => {
+		const acceptChunk = (data: Buffer) => {
 
-			chunks.push(data);
+			this._chunks.push(data);
 			totalLength += data.length;
 
 			while (totalLength > 0) {
 
 				if (state.readHead) {
-					// expecting header -> read 17bytes for header
+					// expecting header -> read 5bytes for header
 					// information: `bodyIsJson` and `bodyLen`
 					if (totalLength >= Protocol._headerLen) {
-						const all = Buffer.concat(chunks);
+						const all = Buffer.concat(this._chunks);
 
-						state.bodyIsJson = all.readInt8(0) === 1;
-						state.bodyLen = all.readInt32BE(1);
+						state.bodyLen = all.readUInt32BE(0);
 						state.readHead = false;
 
 						const rest = all.slice(Protocol._headerLen);
 						totalLength = rest.length;
-						chunks = [rest];
+						this._chunks = [rest];
 
 					} else {
 						break;
@@ -73,45 +91,81 @@ export class Protocol implements IMessagePassingProtocol {
 					// the actual message or wait for more data
 					if (totalLength >= state.bodyLen) {
 
-						const all = Buffer.concat(chunks);
-						let message = all.toString('utf8', 0, state.bodyLen);
-						if (state.bodyIsJson) {
-							message = JSON.parse(message);
-						}
-						this._onMessage.fire(message);
+						const all = Buffer.concat(this._chunks);
+						const buffer = all.slice(0, state.bodyLen);
 
+						// ensure the getBuffer returns a valid value if invoked from the event listeners
 						const rest = all.slice(state.bodyLen);
 						totalLength = rest.length;
-						chunks = [rest];
+						this._chunks = [rest];
 
-						state.bodyIsJson = false;
 						state.bodyLen = -1;
 						state.readHead = true;
 
+						this._onMessage.fire(buffer);
+
+						if (this._isDisposed) {
+							// check if an event listener lead to our disposal
+							break;
+						}
 					} else {
 						break;
 					}
 				}
 			}
-		});
+		};
+
+		const acceptFirstDataChunk = () => {
+			if (firstDataChunk && firstDataChunk.length > 0) {
+				let tmp = firstDataChunk;
+				firstDataChunk = null;
+				acceptChunk(tmp);
+			}
+		};
+
+		// Make sure to always handle the firstDataChunk if no more `data` event comes in
+		this._firstChunkTimer = new TimeoutTimer();
+		this._firstChunkTimer.setIfNotSet(() => {
+			acceptFirstDataChunk();
+		}, 0);
+
+		this._socketDataListener = (data: Buffer) => {
+			acceptFirstDataChunk();
+			acceptChunk(data);
+		};
+		_socket.on('data', this._socketDataListener);
+
+		this._socketEndListener = () => {
+			acceptFirstDataChunk();
+		};
+		_socket.on('end', this._socketEndListener);
+
+		this._socketCloseListener = () => {
+			this._onClose.fire();
+		};
+		_socket.once('close', this._socketCloseListener);
 	}
 
-	public send(message: any): void {
+	dispose(): void {
+		this._isDisposed = true;
+		this._firstChunkTimer.dispose();
+		this._socket.removeListener('data', this._socketDataListener);
+		this._socket.removeListener('end', this._socketEndListener);
+		this._socket.removeListener('close', this._socketCloseListener);
+	}
 
-		// [bodyIsJson|bodyLen|message]
-		// |^header^^^^^^^^^^^|^data^^]
+	end(): void {
+		this._socket.end();
+	}
 
-		const header = Buffer.alloc(Protocol._headerLen);
+	getBuffer(): Buffer {
+		return Buffer.concat(this._chunks);
+	}
 
-		// ensure string
-		if (typeof message !== 'string') {
-			message = JSON.stringify(message);
-			header.writeInt8(1, 0);
-		}
-		const data = Buffer.from(message);
-		header.writeInt32BE(data.length, 1);
-
-		this._writeSoon(header, data);
+	send(buffer: Buffer): void {
+		const header = Buffer.allocUnsafe(Protocol._headerLen);
+		header.writeUInt32BE(buffer.length, 0, true);
+		this._writeSoon(header, buffer);
 	}
 
 	private _writeBuffer = new class {
@@ -176,25 +230,26 @@ export class Server extends IPCServer {
 
 export class Client extends IPCClient {
 
-	private _onClose = new Emitter<void>();
-	get onClose(): Event<void> { return this._onClose.event; }
+	static fromSocket(socket: Socket, id: string): Client {
+		return new Client(new Protocol(socket), id);
+	}
 
-	constructor(private socket: Socket, id: string) {
-		super(new Protocol(socket), id);
-		socket.once('close', () => this._onClose.fire());
+	get onClose(): Event<void> { return this.protocol.onClose; }
+
+	constructor(private protocol: Protocol, id: string) {
+		super(protocol, id);
 	}
 
 	dispose(): void {
 		super.dispose();
-		this.socket.end();
-		this.socket = null;
+		this.protocol.end();
 	}
 }
 
-export function serve(port: number): TPromise<Server>;
-export function serve(namedPipe: string): TPromise<Server>;
-export function serve(hook: any): TPromise<Server> {
-	return new TPromise<Server>((c, e) => {
+export function serve(port: number): Thenable<Server>;
+export function serve(namedPipe: string): Thenable<Server>;
+export function serve(hook: any): Thenable<Server> {
+	return new Promise<Server>((c, e) => {
 		const server = createServer();
 
 		server.on('error', e);
@@ -205,14 +260,14 @@ export function serve(hook: any): TPromise<Server> {
 	});
 }
 
-export function connect(options: { host: string, port: number }, clientId: string): TPromise<Client>;
-export function connect(port: number, clientId: string): TPromise<Client>;
-export function connect(namedPipe: string, clientId: string): TPromise<Client>;
-export function connect(hook: any, clientId: string): TPromise<Client> {
-	return new TPromise<Client>((c, e) => {
+export function connect(options: { host: string, port: number }, clientId: string): Thenable<Client>;
+export function connect(port: number, clientId: string): Thenable<Client>;
+export function connect(namedPipe: string, clientId: string): Thenable<Client>;
+export function connect(hook: any, clientId: string): Thenable<Client> {
+	return new Promise<Client>((c, e) => {
 		const socket = createConnection(hook, () => {
 			socket.removeListener('error', e);
-			c(new Client(socket, clientId));
+			c(Client.fromSocket(socket, clientId));
 		});
 
 		socket.once('error', e);
diff --git a/src/vs/base/parts/ipc/node/ipc.ts b/src/vs/base/parts/ipc/node/ipc.ts
new file mode 100644
index 00000000000..1d354dd28c2
--- /dev/null
+++ b/src/vs/base/parts/ipc/node/ipc.ts
@@ -0,0 +1,630 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+import { IDisposable, toDisposable, combinedDisposable } from 'vs/base/common/lifecycle';
+import { Event, Emitter, once, filterEvent, toNativePromise, Relay } from 'vs/base/common/event';
+import { always, CancelablePromise, createCancelablePromise, timeout } from 'vs/base/common/async';
+import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
+import * as errors from 'vs/base/common/errors';
+
+export const enum RequestType {
+	Promise = 100,
+	PromiseCancel = 101,
+	EventListen = 102,
+	EventDispose = 103
+}
+
+type IRawPromiseRequest = { type: RequestType.Promise; id: number; channelName: string; name: string; arg: any; };
+type IRawPromiseCancelRequest = { type: RequestType.PromiseCancel, id: number };
+type IRawEventListenRequest = { type: RequestType.EventListen; id: number; channelName: string; name: string; arg: any; };
+type IRawEventDisposeRequest = { type: RequestType.EventDispose, id: number };
+type IRawRequest = IRawPromiseRequest | IRawPromiseCancelRequest | IRawEventListenRequest | IRawEventDisposeRequest;
+
+export const enum ResponseType {
+	Initialize = 200,
+	PromiseSuccess = 201,
+	PromiseError = 202,
+	PromiseErrorObj = 203,
+	EventFire = 204
+}
+
+type IRawInitializeResponse = { type: ResponseType.Initialize };
+type IRawPromiseSuccessResponse = { type: ResponseType.PromiseSuccess; id: number; data: any };
+type IRawPromiseErrorResponse = { type: ResponseType.PromiseError; id: number; data: { message: string, name: string, stack: string[] | undefined } };
+type IRawPromiseErrorObjResponse = { type: ResponseType.PromiseErrorObj; id: number; data: any };
+type IRawEventFireResponse = { type: ResponseType.EventFire; id: number; data: any };
+type IRawResponse = IRawInitializeResponse | IRawPromiseSuccessResponse | IRawPromiseErrorResponse | IRawPromiseErrorObjResponse | IRawEventFireResponse;
+
+interface IHandler {
+	(response: IRawResponse): void;
+}
+
+export interface IMessagePassingProtocol {
+	send(buffer: Buffer): void;
+	onMessage: Event<Buffer>;
+}
+
+enum State {
+	Uninitialized,
+	Idle
+}
+
+/**
+ * An `IChannel` is an abstraction over a collection of commands.
+ * You can `call` several commands on a channel, each taking at
+ * most one single argument. A `call` always returns a promise
+ * with at most one single return value.
+ */
+export interface IChannel {
+	call<T>(command: string, arg?: any, cancellationToken?: CancellationToken): Thenable<T>;
+	listen<T>(event: string, arg?: any): Event<T>;
+}
+
+/**
+ * An `IChannelServer` hosts a collection of channels. You are
+ * able to register channels onto it, provided a channel name.
+ */
+export interface IChannelServer {
+	registerChannel(channelName: string, channel: IChannel): void;
+}
+
+/**
+ * An `IChannelClient` has access to a collection of channels. You
+ * are able to get those channels, given their channel name.
+ */
+export interface IChannelClient {
+	getChannel<T extends IChannel>(channelName: string): T;
+}
+
+/**
+ * An `IClientRouter` is responsible for routing calls to specific
+ * channels, in scenarios in which there are multiple possible
+ * channels (each from a separate client) to pick from.
+ */
+export interface IClientRouter {
+	routeCall(command: string, arg?: any, cancellationToken?: CancellationToken): Thenable<string>;
+	routeEvent(event: string, arg?: any): Thenable<string>;
+}
+
+/**
+ * Similar to the `IChannelClient`, you can get channels from this
+ * collection of channels. The difference being that in the
+ * `IRoutingChannelClient`, there are multiple clients providing
+ * the same channel. You'll need to pass in an `IClientRouter` in
+ * order to pick the right one.
+ */
+export interface IRoutingChannelClient {
+	getChannel<T extends IChannel>(channelName: string, router: IClientRouter): T;
+}
+
+enum BodyType {
+	Undefined,
+	String,
+	Buffer,
+	Object
+}
+
+const empty = Buffer.allocUnsafe(0);
+
+function serializeBody(body: any): { buffer: Buffer, type: BodyType } {
+	if (typeof body === 'undefined') {
+		return { buffer: empty, type: BodyType.Undefined };
+	} else if (typeof body === 'string') {
+		return { buffer: Buffer.from(body), type: BodyType.String };
+	} else if (Buffer.isBuffer(body)) {
+		return { buffer: body, type: BodyType.Buffer };
+	} else {
+		return { buffer: Buffer.from(JSON.stringify(body)), type: BodyType.Object };
+	}
+}
+
+function serialize(header: any, body: any = undefined): Buffer {
+	const headerSizeBuffer = Buffer.allocUnsafe(4);
+	const { buffer: bodyBuffer, type: bodyType } = serializeBody(body);
+	const headerBuffer = Buffer.from(JSON.stringify([header, bodyType]));
+	headerSizeBuffer.writeUInt32BE(headerBuffer.byteLength, 0);
+
+	return Buffer.concat([headerSizeBuffer, headerBuffer, bodyBuffer]);
+}
+
+function deserializeBody(bodyBuffer: Buffer, bodyType: BodyType): any {
+	switch (bodyType) {
+		case BodyType.Undefined: return undefined;
+		case BodyType.String: return bodyBuffer.toString();
+		case BodyType.Buffer: return bodyBuffer;
+		case BodyType.Object: return JSON.parse(bodyBuffer.toString());
+	}
+}
+
+function deserialize(buffer: Buffer): { header: any, body: any } {
+	const headerSize = buffer.readUInt32BE(0);
+	const headerBuffer = buffer.slice(4, 4 + headerSize);
+	const bodyBuffer = buffer.slice(4 + headerSize);
+	const [header, bodyType] = JSON.parse(headerBuffer.toString());
+	const body = deserializeBody(bodyBuffer, bodyType);
+
+	return { header, body };
+}
+
+export class ChannelServer implements IChannelServer, IDisposable {
+
+	private channels = new Map<string, IChannel>();
+	private activeRequests = new Map<number, IDisposable>();
+	private protocolListener: IDisposable;
+
+	constructor(private protocol: IMessagePassingProtocol) {
+		this.protocolListener = this.protocol.onMessage(msg => this.onRawMessage(msg));
+		this.sendResponse({ type: ResponseType.Initialize });
+	}
+
+	registerChannel(channelName: string, channel: IChannel): void {
+		this.channels.set(channelName, channel);
+	}
+
+	private sendResponse(response: IRawResponse): void {
+		switch (response.type) {
+			case ResponseType.Initialize:
+				return this.sendBuffer(serialize([response.type]));
+
+			case ResponseType.PromiseSuccess:
+			case ResponseType.PromiseError:
+			case ResponseType.EventFire:
+			case ResponseType.PromiseErrorObj:
+				return this.sendBuffer(serialize([response.type, response.id], response.data));
+		}
+	}
+
+	private sendBuffer(message: Buffer): void {
+		try {
+			this.protocol.send(message);
+		} catch (err) {
+			// noop
+		}
+	}
+
+	private onRawMessage(message: Buffer): void {
+		const { header, body } = deserialize(message);
+		const type = header[0] as RequestType;
+
+		switch (type) {
+			case RequestType.Promise:
+				return this.onPromise({ type, id: header[1], channelName: header[2], name: header[3], arg: body });
+			case RequestType.EventListen:
+				return this.onEventListen({ type, id: header[1], channelName: header[2], name: header[3], arg: body });
+			case RequestType.PromiseCancel:
+				return this.disposeActiveRequest({ type, id: header[1] });
+			case RequestType.EventDispose:
+				return this.disposeActiveRequest({ type, id: header[1] });
+		}
+	}
+
+	private onPromise(request: IRawPromiseRequest): void {
+		const channel = this.channels.get(request.channelName);
+		const cancellationTokenSource = new CancellationTokenSource();
+		let promise: Thenable<any>;
+
+		try {
+			promise = channel.call(request.name, request.arg, cancellationTokenSource.token);
+		} catch (err) {
+			promise = Promise.reject(err);
+		}
+
+		const id = request.id;
+
+		promise.then(data => {
+			this.sendResponse(<IRawResponse>{ id, data, type: ResponseType.PromiseSuccess });
+			this.activeRequests.delete(request.id);
+		}, err => {
+			if (err instanceof Error) {
+				this.sendResponse(<IRawResponse>{
+					id, data: {
+						message: err.message,
+						name: err.name,
+						stack: err.stack ? (err.stack.split ? err.stack.split('\n') : err.stack) : void 0
+					}, type: ResponseType.PromiseError
+				});
+			} else {
+				this.sendResponse(<IRawResponse>{ id, data: err, type: ResponseType.PromiseErrorObj });
+			}
+
+			this.activeRequests.delete(request.id);
+		});
+
+		const disposable = toDisposable(() => cancellationTokenSource.cancel());
+		this.activeRequests.set(request.id, disposable);
+	}
+
+	private onEventListen(request: IRawEventListenRequest): void {
+		const channel = this.channels.get(request.channelName);
+
+		const id = request.id;
+		const event = channel.listen(request.name, request.arg);
+		const disposable = event(data => this.sendResponse(<IRawResponse>{ id, data, type: ResponseType.EventFire }));
+
+		this.activeRequests.set(request.id, disposable);
+	}
+
+	private disposeActiveRequest(request: IRawRequest): void {
+		const disposable = this.activeRequests.get(request.id);
+
+		if (disposable) {
+			disposable.dispose();
+			this.activeRequests.delete(request.id);
+		}
+	}
+
+	public dispose(): void {
+		this.protocolListener.dispose();
+		this.protocolListener = null;
+		this.activeRequests.forEach(d => d.dispose());
+		this.activeRequests.clear();
+	}
+}
+
+export class ChannelClient implements IChannelClient, IDisposable {
+
+	private state: State = State.Uninitialized;
+	private activeRequests = new Set<IDisposable>();
+	private handlers = new Map<number, IHandler>();
+	private lastRequestId: number = 0;
+	private protocolListener: IDisposable;
+
+	private _onDidInitialize = new Emitter<void>();
+	readonly onDidInitialize = this._onDidInitialize.event;
+
+	constructor(private protocol: IMessagePassingProtocol) {
+		this.protocolListener = this.protocol.onMessage(msg => this.onBuffer(msg));
+	}
+
+	getChannel<T extends IChannel>(channelName: string): T {
+		const that = this;
+
+		return {
+			call(command: string, arg?: any, cancellationToken?: CancellationToken) {
+				return that.requestPromise(channelName, command, arg, cancellationToken);
+			},
+			listen(event: string, arg: any) {
+				return that.requestEvent(channelName, event, arg);
+			}
+		} as T;
+	}
+
+	private requestPromise(channelName: string, name: string, arg?: any, cancellationToken = CancellationToken.None): Thenable<any> {
+		const id = this.lastRequestId++;
+		const type = RequestType.Promise;
+		const request: IRawRequest = { id, type, channelName, name, arg };
+
+		if (cancellationToken.isCancellationRequested) {
+			return Promise.reject(errors.canceled());
+		}
+
+		let disposable: IDisposable;
+
+		const result = new Promise((c, e) => {
+			if (cancellationToken.isCancellationRequested) {
+				return e(errors.canceled());
+			}
+
+			let uninitializedPromise = createCancelablePromise(_ => this.whenInitialized());
+			uninitializedPromise.then(() => {
+				uninitializedPromise = null;
+
+				const handler: IHandler = response => {
+					switch (response.type) {
+						case ResponseType.PromiseSuccess:
+							this.handlers.delete(id);
+							c(response.data);
+							break;
+
+						case ResponseType.PromiseError:
+							this.handlers.delete(id);
+							const error = new Error(response.data.message);
+							(<any>error).stack = response.data.stack;
+							error.name = response.data.name;
+							e(error);
+							break;
+
+						case ResponseType.PromiseErrorObj:
+							this.handlers.delete(id);
+							e(response.data);
+							break;
+					}
+				};
+
+				this.handlers.set(id, handler);
+				this.sendRequest(request);
+			});
+
+			const cancel = () => {
+				if (uninitializedPromise) {
+					uninitializedPromise.cancel();
+					uninitializedPromise = null;
+				} else {
+					this.sendRequest({ id, type: RequestType.PromiseCancel });
+				}
+
+				e(errors.canceled());
+			};
+
+			const cancellationTokenListener = cancellationToken.onCancellationRequested(cancel);
+			disposable = combinedDisposable([toDisposable(cancel), cancellationTokenListener]);
+		});
+
+		this.activeRequests.add(disposable);
+		always(result, () => this.activeRequests.delete(disposable));
+
+		return result;
+	}
+
+	private requestEvent(channelName: string, name: string, arg?: any): Event<any> {
+		const id = this.lastRequestId++;
+		const type = RequestType.EventListen;
+		const request: IRawRequest = { id, type, channelName, name, arg };
+
+		let uninitializedPromise: CancelablePromise<void> | null = null;
+
+		const emitter = new Emitter<any>({
+			onFirstListenerAdd: () => {
+				uninitializedPromise = createCancelablePromise(_ => this.whenInitialized());
+				uninitializedPromise.then(() => {
+					uninitializedPromise = null;
+					this.activeRequests.add(emitter);
+					this.sendRequest(request);
+				});
+			},
+			onLastListenerRemove: () => {
+				if (uninitializedPromise) {
+					uninitializedPromise.cancel();
+					uninitializedPromise = null;
+				} else {
+					this.activeRequests.delete(emitter);
+					this.sendRequest({ id, type: RequestType.EventDispose });
+				}
+			}
+		});
+
+		const handler: IHandler = (res: IRawEventFireResponse) => emitter.fire(res.data);
+		this.handlers.set(id, handler);
+
+		return emitter.event;
+	}
+
+	private sendRequest(request: IRawRequest): void {
+		switch (request.type) {
+			case RequestType.Promise:
+			case RequestType.EventListen:
+				return this.sendBuffer(serialize([request.type, request.id, request.channelName, request.name], request.arg));
+
+			case RequestType.PromiseCancel:
+			case RequestType.EventDispose:
+				return this.sendBuffer(serialize([request.type, request.id]));
+		}
+	}
+
+	private sendBuffer(message: Buffer): void {
+		try {
+			this.protocol.send(message);
+		} catch (err) {
+			// noop
+		}
+	}
+
+	private onBuffer(message: Buffer): void {
+		const { header, body } = deserialize(message);
+		const type: ResponseType = header[0];
+
+		switch (type) {
+			case ResponseType.Initialize:
+				return this.onResponse({ type: header[0] });
+
+			case ResponseType.PromiseSuccess:
+			case ResponseType.PromiseError:
+			case ResponseType.EventFire:
+			case ResponseType.PromiseErrorObj:
+				return this.onResponse({ type: header[0], id: header[1], data: body });
+		}
+	}
+
+	private onResponse(response: IRawResponse): void {
+		if (response.type === ResponseType.Initialize) {
+			this.state = State.Idle;
+			this._onDidInitialize.fire();
+			return;
+		}
+
+		const handler = this.handlers.get(response.id);
+
+		if (handler) {
+			handler(response);
+		}
+	}
+
+	private whenInitialized(): Thenable<void> {
+		if (this.state === State.Idle) {
+			return Promise.resolve(null);
+		} else {
+			return toNativePromise(this.onDidInitialize);
+		}
+	}
+
+	dispose(): void {
+		this.protocolListener.dispose();
+		this.protocolListener = null;
+		this.activeRequests.forEach(p => p.dispose());
+		this.activeRequests.clear();
+	}
+}
+
+export interface ClientConnectionEvent {
+	protocol: IMessagePassingProtocol;
+	onDidClientDisconnect: Event<void>;
+}
+
+/**
+ * An `IPCServer` is both a channel server and a routing channel
+ * client.
+ *
+ * As the owner of a protocol, you should extend both this
+ * and the `IPCClient` classes to get IPC implementations
+ * for your protocol.
+ */
+export class IPCServer implements IChannelServer, IRoutingChannelClient, IDisposable {
+
+	private channels = new Map<string, IChannel>();
+	private channelClients = new Map<string, ChannelClient>();
+	private onClientAdded = new Emitter<string>();
+
+	constructor(onDidClientConnect: Event<ClientConnectionEvent>) {
+		onDidClientConnect(({ protocol, onDidClientDisconnect }) => {
+			const onFirstMessage = once(protocol.onMessage);
+
+			onFirstMessage(rawId => {
+				const channelServer = new ChannelServer(protocol);
+				const channelClient = new ChannelClient(protocol);
+
+				this.channels.forEach((channel, name) => channelServer.registerChannel(name, channel));
+
+				const id = rawId.toString();
+				this.channelClients.set(id, channelClient);
+				this.onClientAdded.fire(id);
+
+				onDidClientDisconnect(() => {
+					channelServer.dispose();
+					channelClient.dispose();
+					this.channelClients.delete(id);
+				});
+			});
+		});
+	}
+
+	getChannel<T extends IChannel>(channelName: string, router: IClientRouter): T {
+		const that = this;
+
+		return {
+			call(command: string, arg?: any, cancellationToken?: CancellationToken) {
+				const channelPromise = router.routeCall(command, arg)
+					.then(id => that.getClient(id))
+					.then(client => client.getChannel(channelName));
+
+				return getDelayedChannel(channelPromise)
+					.call(command, arg, cancellationToken);
+			},
+			listen(event: string, arg: any) {
+				const channelPromise = router.routeEvent(event, arg)
+					.then(id => that.getClient(id))
+					.then(client => client.getChannel(channelName));
+
+				return getDelayedChannel(channelPromise)
+					.listen(event, arg);
+			}
+		} as T;
+	}
+
+	registerChannel(channelName: string, channel: IChannel): void {
+		this.channels.set(channelName, channel);
+	}
+
+	private getClient(clientId: string): Thenable<IChannelClient> {
+		if (!clientId) {
+			return Promise.reject(new Error('Client id should be provided'));
+		}
+
+		const client = this.channelClients.get(clientId);
+
+		if (client) {
+			return Promise.resolve(client);
+		}
+
+		return new Promise<IChannelClient>(c => {
+			const onClient = once(filterEvent(this.onClientAdded.event, id => id === clientId));
+			onClient(() => c(this.channelClients.get(clientId)));
+		});
+	}
+
+	dispose(): void {
+		this.channels.clear();
+		this.channelClients.clear();
+		this.onClientAdded.dispose();
+	}
+}
+
+/**
+ * An `IPCClient` is both a channel client and a channel server.
+ *
+ * As the owner of a protocol, you should extend both this
+ * and the `IPCClient` classes to get IPC implementations
+ * for your protocol.
+ */
+export class IPCClient implements IChannelClient, IChannelServer, IDisposable {
+
+	private channelClient: ChannelClient;
+	private channelServer: ChannelServer;
+
+	constructor(protocol: IMessagePassingProtocol, id: string) {
+		protocol.send(Buffer.from(id));
+		this.channelClient = new ChannelClient(protocol);
+		this.channelServer = new ChannelServer(protocol);
+	}
+
+	getChannel<T extends IChannel>(channelName: string): T {
+		return this.channelClient.getChannel(channelName) as T;
+	}
+
+	registerChannel(channelName: string, channel: IChannel): void {
+		this.channelServer.registerChannel(channelName, channel);
+	}
+
+	dispose(): void {
+		this.channelClient.dispose();
+		this.channelClient = null;
+		this.channelServer.dispose();
+		this.channelServer = null;
+	}
+}
+
+export function getDelayedChannel<T extends IChannel>(promise: Thenable<T>): T {
+	return {
+		call(command: string, arg?: any, cancellationToken?: CancellationToken): Thenable<T> {
+			return promise.then(c => c.call(command, arg, cancellationToken));
+		},
+
+		listen<T>(event: string, arg?: any): Event<T> {
+			const relay = new Relay<any>();
+			promise.then(c => relay.input = c.listen(event, arg));
+			return relay.event;
+		}
+	} as T;
+}
+
+export function getNextTickChannel<T extends IChannel>(channel: T): T {
+	let didTick = false;
+
+	return {
+		call<T>(command: string, arg?: any, cancellationToken?: CancellationToken): Thenable<T> {
+			if (didTick) {
+				return channel.call(command, arg, cancellationToken);
+			}
+
+			return timeout(0)
+				.then(() => didTick = true)
+				.then(() => channel.call<T>(command, arg, cancellationToken));
+		},
+		listen<T>(event: string, arg?: any): Event<T> {
+			if (didTick) {
+				return channel.listen<T>(event, arg);
+			}
+
+			const relay = new Relay<T>();
+
+			timeout(0)
+				.then(() => didTick = true)
+				.then(() => relay.input = channel.listen<T>(event, arg));
+
+			return relay.event;
+		}
+	} as T;
+}
diff --git a/src/vs/base/parts/ipc/test/node/ipc.cp.test.ts b/src/vs/base/parts/ipc/test/node/ipc.cp.test.ts
new file mode 100644
index 00000000000..b3c1995f88a
--- /dev/null
+++ b/src/vs/base/parts/ipc/test/node/ipc.cp.test.ts
@@ -0,0 +1,83 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+import * as assert from 'assert';
+import { Client } from 'vs/base/parts/ipc/node/ipc.cp';
+import { always } from 'vs/base/common/async';
+import { ITestChannel, TestServiceClient } from './testService';
+import { getPathFromAmdModule } from 'vs/base/common/amd';
+
+function createClient(): Client {
+	return new Client(getPathFromAmdModule(require, 'bootstrap-fork'), {
+		serverName: 'TestServer',
+		env: { AMD_ENTRYPOINT: 'vs/base/parts/ipc/test/node/testApp', verbose: true }
+	});
+}
+
+suite('IPC, Child Process', () => {
+	test('createChannel', () => {
+		const client = createClient();
+		const channel = client.getChannel<ITestChannel>('test');
+		const service = new TestServiceClient(channel);
+
+		const result = service.pong('ping').then(r => {
+			assert.equal(r.incoming, 'ping');
+			assert.equal(r.outgoing, 'pong');
+		});
+
+		return always(result, () => client.dispose());
+	});
+
+	test('events', () => {
+		const client = createClient();
+		const channel = client.getChannel<ITestChannel>('test');
+		const service = new TestServiceClient(channel);
+
+		const event = new Promise((c, e) => {
+			service.onMarco(({ answer }) => {
+				try {
+					assert.equal(answer, 'polo');
+					c(null);
+				} catch (err) {
+					e(err);
+				}
+			});
+		});
+
+		const request = service.marco();
+		const result = Promise.all([request, event]);
+
+		return always(result, () => client.dispose());
+	});
+
+	test('event dispose', () => {
+		const client = createClient();
+		const channel = client.getChannel<ITestChannel>('test');
+		const service = new TestServiceClient(channel);
+
+		let count = 0;
+		const disposable = service.onMarco(() => count++);
+
+		const result = service.marco().then(answer => {
+			assert.equal(answer, 'polo');
+			assert.equal(count, 1);
+
+			return service.marco().then(answer => {
+				assert.equal(answer, 'polo');
+				assert.equal(count, 2);
+				disposable.dispose();
+
+				return service.marco().then(answer => {
+					assert.equal(answer, 'polo');
+					assert.equal(count, 2);
+				});
+			});
+		});
+
+		return always(result, () => client.dispose());
+	});
+});
diff --git a/src/vs/base/parts/ipc/test/node/ipc.net.test.ts b/src/vs/base/parts/ipc/test/node/ipc.net.test.ts
index 6b48161d026..c8797a60704 100644
--- a/src/vs/base/parts/ipc/test/node/ipc.net.test.ts
+++ b/src/vs/base/parts/ipc/test/node/ipc.net.test.ts
@@ -6,7 +6,6 @@
 'use strict';
 
 import * as assert from 'assert';
-import { TPromise } from 'vs/base/common/winjs.base';
 import { Socket } from 'net';
 import { EventEmitter } from 'events';
 import { Protocol } from 'vs/base/parts/ipc/node/ipc.net';
@@ -46,21 +45,23 @@ suite('IPC, Socket Protocol', () => {
 		const a = new Protocol(stream);
 		const b = new Protocol(stream);
 
-		return new TPromise(resolve => {
+		return new Promise(resolve => {
 			const sub = b.onMessage(data => {
 				sub.dispose();
-				assert.equal(data, 'foobarfarboo');
+				assert.equal(data.toString(), 'foobarfarboo');
 				resolve(null);
 			});
-			a.send('foobarfarboo');
+			a.send(Buffer.from('foobarfarboo'));
 		}).then(() => {
-			return new TPromise(resolve => {
+			return new Promise(resolve => {
 				const sub = b.onMessage(data => {
 					sub.dispose();
-					assert.equal(data, 123);
+					assert.equal(data.readInt8(0), 123);
 					resolve(null);
 				});
-				a.send(123);
+				const buffer = Buffer.allocUnsafe(1);
+				buffer.writeInt8(123, 0);
+				a.send(buffer);
 			});
 		});
 	});
@@ -78,13 +79,48 @@ suite('IPC, Socket Protocol', () => {
 			data: 'Hello World'.split('')
 		};
 
-		a.send(data);
+		a.send(Buffer.from(JSON.stringify(data)));
 
-		return new TPromise(resolve => {
+		return new Promise(resolve => {
 			b.onMessage(msg => {
-				assert.deepEqual(msg, data);
+				assert.deepEqual(JSON.parse(msg.toString()), data);
 				resolve(null);
 			});
 		});
 	});
+
+	test('can devolve to a socket and evolve again without losing data', () => {
+		let resolve: (v: void) => void;
+		let result = new Promise<void>((_resolve, _reject) => {
+			resolve = _resolve;
+		});
+		const sender = new Protocol(stream);
+		const receiver1 = new Protocol(stream);
+
+		assert.equal(stream.listenerCount('data'), 2);
+		assert.equal(stream.listenerCount('end'), 2);
+
+		receiver1.onMessage((msg) => {
+			assert.equal(JSON.parse(msg.toString()).value, 1);
+
+			let buffer = receiver1.getBuffer();
+			receiver1.dispose();
+
+			assert.equal(stream.listenerCount('data'), 1);
+			assert.equal(stream.listenerCount('end'), 1);
+
+			const receiver2 = new Protocol(stream, buffer);
+			receiver2.onMessage((msg) => {
+				assert.equal(JSON.parse(msg.toString()).value, 2);
+				resolve(void 0);
+			});
+		});
+
+		const msg1 = { value: 1 };
+		const msg2 = { value: 2 };
+		sender.send(Buffer.from(JSON.stringify(msg1)));
+		sender.send(Buffer.from(JSON.stringify(msg2)));
+
+		return result;
+	});
 });
diff --git a/src/vs/base/parts/ipc/test/node/ipc.perf.ts b/src/vs/base/parts/ipc/test/node/ipc.perf.ts
deleted file mode 100644
index 2e1fcbcbd83..00000000000
--- a/src/vs/base/parts/ipc/test/node/ipc.perf.ts
+++ /dev/null
@@ -1,114 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-'use strict';
-
-import * as assert from 'assert';
-import { Client } from 'vs/base/parts/ipc/node/ipc.cp';
-import uri from 'vs/base/common/uri';
-import { always } from 'vs/base/common/async';
-import { ITestChannel, TestServiceClient, ITestService } from './testService';
-
-function createClient(): Client {
-	return new Client(uri.parse(require.toUrl('bootstrap')).fsPath, {
-		serverName: 'TestServer',
-		env: { AMD_ENTRYPOINT: 'vs/base/parts/ipc/test/node/testApp', verbose: true }
-	});
-}
-
-// Rename to ipc.perf.test.ts and run with ./scripts/test.sh --grep IPC.performance --timeout 60000
-suite('IPC performance', () => {
-
-	test('increasing batch size', () => {
-		const client = createClient();
-		const channel = client.getChannel<ITestChannel>('test');
-		const service = new TestServiceClient(channel);
-
-		const runs = [
-			{ batches: 250000, size: 1 },
-			{ batches: 2500, size: 100 },
-			{ batches: 500, size: 500 },
-			{ batches: 250, size: 1000 },
-			{ batches: 50, size: 5000 },
-			{ batches: 25, size: 10000 },
-			// { batches: 10, size: 25000 },
-			// { batches: 5, size: 50000 },
-			// { batches: 1, size: 250000 },
-		];
-		const dataSizes = [
-			100,
-			250,
-		];
-		let i = 0, j = 0;
-		const result = measure(service, 10, 10, 250) // warm-up
-			.then(() => {
-				return (function nextRun() {
-					if (i >= runs.length) {
-						if (++j >= dataSizes.length) {
-							return;
-						}
-						i = 0;
-					}
-					const run = runs[i++];
-					return measure(service, run.batches, run.size, dataSizes[j])
-						.then(() => {
-							return nextRun();
-						});
-				})();
-			});
-
-		return always(result, () => client.dispose());
-	});
-
-	test('increasing raw data size', () => {
-		const client = createClient();
-		const channel = client.getChannel<ITestChannel>('test');
-		const service = new TestServiceClient(channel);
-
-		const runs = [
-			{ batches: 250000, dataSize: 100 },
-			{ batches: 25000, dataSize: 1000 },
-			{ batches: 2500, dataSize: 10000 },
-			{ batches: 1250, dataSize: 20000 },
-			{ batches: 500, dataSize: 50000 },
-			{ batches: 250, dataSize: 100000 },
-			{ batches: 125, dataSize: 200000 },
-			{ batches: 50, dataSize: 500000 },
-			{ batches: 25, dataSize: 1000000 },
-		];
-		let i = 0;
-		const result = measure(service, 10, 10, 250) // warm-up
-			.then(() => {
-				return (function nextRun() {
-					if (i >= runs.length) {
-						return;
-					}
-					const run = runs[i++];
-					return measure(service, run.batches, 1, run.dataSize)
-						.then(() => {
-							return nextRun();
-						});
-				})();
-			});
-
-		return always(result, () => client.dispose());
-	});
-
-	function measure(service: ITestService, batches: number, size: number, dataSize: number) {
-		const start = Date.now();
-		let hits = 0;
-		let count = 0;
-		return service.batchPerf(batches, size, dataSize)
-			.then(() => {
-				console.log(`Batches: ${batches}, size: ${size}, dataSize: ${dataSize}, n: ${batches * size * dataSize}, duration: ${Date.now() - start}`);
-				assert.strictEqual(hits, batches);
-				assert.strictEqual(count, batches * size);
-			}, err => assert.fail(err),
-				batch => {
-					hits++;
-					count += batch.length;
-				});
-	}
-});
\ No newline at end of file
diff --git a/src/vs/base/parts/ipc/test/node/ipc.test.ts b/src/vs/base/parts/ipc/test/node/ipc.test.ts
index bd9c57671ae..b799e83d866 100644
--- a/src/vs/base/parts/ipc/test/node/ipc.test.ts
+++ b/src/vs/base/parts/ipc/test/node/ipc.test.ts
@@ -6,115 +6,291 @@
 'use strict';
 
 import * as assert from 'assert';
-import { TPromise } from 'vs/base/common/winjs.base';
-import { Client } from 'vs/base/parts/ipc/node/ipc.cp';
-import uri from 'vs/base/common/uri';
-import { always } from 'vs/base/common/async';
-import { isPromiseCanceledError } from 'vs/base/common/errors';
-import { ITestChannel, TestServiceClient } from './testService';
+import { IMessagePassingProtocol, IPCServer, ClientConnectionEvent, IPCClient, IChannel } from 'vs/base/parts/ipc/node/ipc';
+import { Emitter, toNativePromise, Event } from 'vs/base/common/event';
+import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
+import { canceled } from 'vs/base/common/errors';
+import { timeout } from 'vs/base/common/async';
 
-function createClient(): Client {
-	return new Client(uri.parse(require.toUrl('bootstrap')).fsPath, {
-		serverName: 'TestServer',
-		env: { AMD_ENTRYPOINT: 'vs/base/parts/ipc/test/node/testApp', verbose: true }
+class QueueProtocol implements IMessagePassingProtocol {
+
+	private buffering = true;
+	private buffers: Buffer[] = [];
+
+	private _onMessage = new Emitter<Buffer>({
+		onFirstListenerDidAdd: () => {
+			for (const buffer of this.buffers) {
+				this._onMessage.fire(buffer);
+			}
+
+			this.buffers = [];
+			this.buffering = false;
+		},
+		onLastListenerRemove: () => {
+			this.buffering = true;
+		}
 	});
+
+	readonly onMessage = this._onMessage.event;
+	other: QueueProtocol;
+
+	send(buffer: Buffer): void {
+		this.other.receive(buffer);
+	}
+
+	protected receive(buffer: Buffer): void {
+		if (this.buffering) {
+			this.buffers.push(buffer);
+		} else {
+			this._onMessage.fire(buffer);
+		}
+	}
 }
 
-suite('IPC', () => {
-	suite('child process', () => {
+function createProtocolPair(): [IMessagePassingProtocol, IMessagePassingProtocol] {
+	const one = new QueueProtocol();
+	const other = new QueueProtocol();
+	one.other = other;
+	other.other = one;
 
-		test('createChannel', () => {
-			if (process.env['VSCODE_PID']) {
-				return undefined; // this test fails when run from within VS Code
-			}
+	return [one, other];
+}
 
-			const client = createClient();
-			const channel = client.getChannel<ITestChannel>('test');
-			const service = new TestServiceClient(channel);
+class TestIPCClient extends IPCClient {
 
-			const result = service.pong('ping').then(r => {
-				assert.equal(r.incoming, 'ping');
-				assert.equal(r.outgoing, 'pong');
-			});
+	private _onDidDisconnect = new Emitter<void>();
+	readonly onDidDisconnect = this._onDidDisconnect.event;
 
-			return always(result, () => client.dispose());
+	constructor(protocol: IMessagePassingProtocol, id: string) {
+		super(protocol, id);
+	}
+
+	dispose(): void {
+		this._onDidDisconnect.fire();
+		super.dispose();
+	}
+}
+
+class TestIPCServer extends IPCServer {
+
+	private onDidClientConnect: Emitter<ClientConnectionEvent>;
+
+	constructor() {
+		const onDidClientConnect = new Emitter<ClientConnectionEvent>();
+		super(onDidClientConnect.event);
+		this.onDidClientConnect = onDidClientConnect;
+	}
+
+	createConnection(id: string): IPCClient {
+		const [pc, ps] = createProtocolPair();
+		const client = new TestIPCClient(pc, id);
+
+		this.onDidClientConnect.fire({
+			protocol: ps,
+			onDidClientDisconnect: client.onDidDisconnect
 		});
 
-		test('cancellation', () => {
-			if (process.env['VSCODE_PID']) {
-				return undefined; // this test fails when run from within VS Code
-			}
+		return client;
+	}
+}
 
-			const client = createClient();
-			const channel = client.getChannel<ITestChannel>('test');
-			const service = new TestServiceClient(channel);
-			const res = service.cancelMe();
+const TestChannelId = 'testchannel';
 
-			setTimeout(() => res.cancel(), 50);
+interface ITestService {
+	marco(): Thenable<string>;
+	error(message: string): Thenable<void>;
+	neverComplete(): Thenable<void>;
+	neverCompleteCT(cancellationToken: CancellationToken): Thenable<void>;
 
-			const result = res.then(
-				() => assert.fail('Unexpected'),
-				err => assert.ok(err && isPromiseCanceledError(err))
+	pong: Event<string>;
+}
+
+class TestService implements ITestService {
+
+	private _pong = new Emitter<string>();
+	readonly pong = this._pong.event;
+
+	marco(): Thenable<string> {
+		return Promise.resolve('polo');
+	}
+
+	error(message: string): Thenable<void> {
+		return Promise.reject(new Error(message));
+	}
+
+	neverComplete(): Thenable<void> {
+		return new Promise(_ => { });
+	}
+
+	neverCompleteCT(cancellationToken: CancellationToken): Thenable<void> {
+		if (cancellationToken.isCancellationRequested) {
+			return Promise.reject(canceled());
+		}
+
+		return new Promise((_, e) => cancellationToken.onCancellationRequested(() => e(canceled())));
+	}
+
+	ping(msg: string): void {
+		this._pong.fire(msg);
+	}
+}
+
+interface ITestChannel extends IChannel {
+	call(command: 'marco'): Thenable<string>;
+	call(command: 'error'): Thenable<void>;
+	call(command: 'neverComplete'): Thenable<void>;
+	call(command: 'neverCompleteCT', arg: undefined, cancellationToken: CancellationToken): Thenable<void>;
+	call<T>(command: string, arg?: any, cancellationToken?: CancellationToken): Thenable<T>;
+
+	listen(event: 'pong'): Event<string>;
+	listen<T>(event: string, arg?: any): Event<T>;
+}
+
+class TestChannel implements ITestChannel {
+
+	constructor(private service: ITestService) { }
+
+	call(command: string, arg?: any, cancellationToken?: CancellationToken): Thenable<any> {
+		switch (command) {
+			case 'marco': return this.service.marco();
+			case 'error': return this.service.error(arg);
+			case 'neverComplete': return this.service.neverComplete();
+			case 'neverCompleteCT': return this.service.neverCompleteCT(cancellationToken);
+			default: return Promise.reject(new Error('not implemented'));
+		}
+	}
+
+	listen(event: string, arg?: any): Event<any> {
+		switch (event) {
+			case 'pong': return this.service.pong;
+			default: throw new Error('not implemented');
+		}
+	}
+}
+
+class TestChannelClient implements ITestService {
+
+	get pong(): Event<string> {
+		return this.channel.listen('pong');
+	}
+
+	constructor(private channel: ITestChannel) { }
+
+	marco(): Thenable<string> {
+		return this.channel.call('marco');
+	}
+
+	error(message: string): Thenable<void> {
+		return this.channel.call('error', message);
+	}
+
+	neverComplete(): Thenable<void> {
+		return this.channel.call('neverComplete');
+	}
+
+	neverCompleteCT(cancellationToken: CancellationToken): Thenable<void> {
+		return this.channel.call('neverCompleteCT', undefined, cancellationToken);
+	}
+}
+
+suite('Base IPC', function () {
+
+	test('createProtocolPair', async function () {
+		const [clientProtocol, serverProtocol] = createProtocolPair();
+
+		const b1 = Buffer.alloc(0);
+		clientProtocol.send(b1);
+
+		const b3 = Buffer.alloc(0);
+		serverProtocol.send(b3);
+
+		const b2 = await toNativePromise(serverProtocol.onMessage);
+		const b4 = await toNativePromise(clientProtocol.onMessage);
+
+		assert.strictEqual(b1, b2);
+		assert.strictEqual(b3, b4);
+	});
+
+	suite('one to one', function () {
+		let server: IPCServer;
+		let client: IPCClient;
+		let service: TestService;
+		let ipcService: ITestService;
+
+		setup(function () {
+			service = new TestService();
+			const testServer = new TestIPCServer();
+			server = testServer;
+
+			server.registerChannel(TestChannelId, new TestChannel(service));
+
+			client = testServer.createConnection('client1');
+			ipcService = new TestChannelClient(client.getChannel(TestChannelId));
+		});
+
+		teardown(function () {
+			client.dispose();
+			server.dispose();
+		});
+
+		test('call success', function () {
+			return ipcService.marco()
+				.then(r => assert.equal(r, 'polo'));
+		});
+
+		test('call error', function () {
+			return ipcService.error('nice error').then(
+				() => assert.fail('should not reach here'),
+				err => assert.equal(err.message, 'nice error')
+			);
+		});
+
+		test('cancel call with cancelled cancellation token', function () {
+			return ipcService.neverCompleteCT(CancellationToken.Cancelled).then(
+				_ => assert.fail('should not reach here'),
+				err => assert(err.message === 'Canceled')
+			);
+		});
+
+		test('cancel call with cancellation token (sync)', function () {
+			const cts = new CancellationTokenSource();
+			const promise = ipcService.neverCompleteCT(cts.token).then(
+				_ => assert.fail('should not reach here'),
+				err => assert(err.message === 'Canceled')
 			);
 
-			return always(result, () => client.dispose());
+			cts.cancel();
+
+			return promise;
 		});
 
-		test('events', () => {
-			if (process.env['VSCODE_PID']) {
-				return undefined; // this test fails when run from within VS Code
-			}
+		test('cancel call with cancellation token (async)', function () {
+			const cts = new CancellationTokenSource();
+			const promise = ipcService.neverCompleteCT(cts.token).then(
+				_ => assert.fail('should not reach here'),
+				err => assert(err.message === 'Canceled')
+			);
 
-			const client = createClient();
-			const channel = client.getChannel<ITestChannel>('test');
-			const service = new TestServiceClient(channel);
+			setTimeout(() => cts.cancel());
 
-			const event = new TPromise((c, e) => {
-				service.onMarco(({ answer }) => {
-					try {
-						assert.equal(answer, 'polo');
-						c(null);
-					} catch (err) {
-						e(err);
-					}
-				});
-			});
-
-			const request = service.marco();
-			const result = TPromise.join<any>([request, event]);
-
-			return always(result, () => client.dispose());
+			return promise;
 		});
 
-		test('event dispose', () => {
-			if (process.env['VSCODE_PID']) {
-				return undefined; // this test fails when run from within VS Code
-			}
+		test('listen to events', async function () {
+			const messages = [];
 
-			const client = createClient();
-			const channel = client.getChannel<ITestChannel>('test');
-			const service = new TestServiceClient(channel);
+			ipcService.pong(msg => messages.push(msg));
+			await timeout(0);
 
-			let count = 0;
-			const disposable = service.onMarco(() => count++);
+			assert.deepEqual(messages, []);
+			service.ping('hello');
+			await timeout(0);
 
-			const result = service.marco().then(answer => {
-				assert.equal(answer, 'polo');
-				assert.equal(count, 1);
+			assert.deepEqual(messages, ['hello']);
+			service.ping('world');
+			await timeout(0);
 
-				return service.marco().then(answer => {
-					assert.equal(answer, 'polo');
-					assert.equal(count, 2);
-					disposable.dispose();
-
-					return service.marco().then(answer => {
-						assert.equal(answer, 'polo');
-						assert.equal(count, 2);
-					});
-				});
-			});
-
-			return always(result, () => client.dispose());
+			assert.deepEqual(messages, ['hello', 'world']);
 		});
 	});
-});
\ No newline at end of file
+});
diff --git a/src/vs/base/parts/ipc/test/node/testService.ts b/src/vs/base/parts/ipc/test/node/testService.ts
index 453ea9c85e0..b958824415c 100644
--- a/src/vs/base/parts/ipc/test/node/testService.ts
+++ b/src/vs/base/parts/ipc/test/node/testService.ts
@@ -4,9 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import { TPromise, PPromise } from 'vs/base/common/winjs.base';
-import { IChannel, eventToCall, eventFromCall } from 'vs/base/parts/ipc/common/ipc';
+import { IChannel } from 'vs/base/parts/ipc/node/ipc';
 import { Event, Emitter } from 'vs/base/common/event';
+import { timeout } from 'vs/base/common/async';
 
 export interface IMarcoPoloEvent {
 	answer: string;
@@ -14,10 +14,9 @@ export interface IMarcoPoloEvent {
 
 export interface ITestService {
 	onMarco: Event<IMarcoPoloEvent>;
-	marco(): TPromise<string>;
-	pong(ping: string): TPromise<{ incoming: string, outgoing: string }>;
-	cancelMe(): TPromise<boolean>;
-	batchPerf(batches: number, size: number, dataSize: number): PPromise<any, any[]>;
+	marco(): Thenable<string>;
+	pong(ping: string): Thenable<{ incoming: string, outgoing: string }>;
+	cancelMe(): Thenable<boolean>;
 }
 
 export class TestService implements ITestService {
@@ -25,94 +24,67 @@ export class TestService implements ITestService {
 	private _onMarco = new Emitter<IMarcoPoloEvent>();
 	onMarco: Event<IMarcoPoloEvent> = this._onMarco.event;
 
-	private _data = 'abcdefghijklmnopqrstuvwxyz';
-
-	marco(): TPromise<string> {
+	marco(): Thenable<string> {
 		this._onMarco.fire({ answer: 'polo' });
-		return TPromise.as('polo');
+		return Promise.resolve('polo');
 	}
 
-	pong(ping: string): TPromise<{ incoming: string, outgoing: string }> {
-		return TPromise.as({ incoming: ping, outgoing: 'pong' });
+	pong(ping: string): Thenable<{ incoming: string, outgoing: string }> {
+		return Promise.resolve({ incoming: ping, outgoing: 'pong' });
 	}
 
-	cancelMe(): TPromise<boolean> {
-		return TPromise.timeout(100).then(() => true);
-	}
-
-	batchPerf(batches: number, size: number, dataSize: number): PPromise<any, any[]> {
-		while (this._data.length < dataSize) {
-			this._data += this._data;
-		}
-		const self = this;
-		return new PPromise<any, any[]>((complete, error, progress) => {
-			let j = 0;
-			function send() {
-				if (j >= batches) {
-					complete(null);
-					return;
-				}
-				j++;
-				const batch = [];
-				for (let i = 0; i < size; i++) {
-					batch.push({
-						prop: `${i}${self._data}`.substr(0, dataSize)
-					});
-				}
-				progress(batch);
-				process.nextTick(send);
-			}
-			process.nextTick(send);
-		});
+	cancelMe(): Thenable<boolean> {
+		return Promise.resolve(timeout(100)).then(() => true);
 	}
 }
 
 export interface ITestChannel extends IChannel {
-	call(command: 'marco'): TPromise<any>;
-	call(command: 'pong', ping: string): TPromise<any>;
-	call(command: 'cancelMe'): TPromise<any>;
-	call(command: 'batchPerf', args: { batches: number; size: number; dataSize: number; }): PPromise<any, any[]>;
-	call(command: string, ...args: any[]): TPromise<any>;
+	listen<IMarcoPoloEvent>(event: 'marco'): Event<IMarcoPoloEvent>;
+	listen<T>(event: string, arg?: any): Event<T>;
+
+	call(command: 'marco'): Thenable<any>;
+	call(command: 'pong', ping: string): Thenable<any>;
+	call(command: 'cancelMe'): Thenable<any>;
+	call(command: string, ...args: any[]): Thenable<any>;
 }
 
 export class TestChannel implements ITestChannel {
 
 	constructor(private testService: ITestService) { }
 
-	call(command: string, ...args: any[]): TPromise<any> {
+	listen(event: string, arg?: any): Event<any> {
+		switch (event) {
+			case 'marco': return this.testService.onMarco;
+		}
+
+		throw new Error('Event not found');
+	}
+
+	call(command: string, ...args: any[]): Thenable<any> {
 		switch (command) {
 			case 'pong': return this.testService.pong(args[0]);
 			case 'cancelMe': return this.testService.cancelMe();
 			case 'marco': return this.testService.marco();
-			case 'event:marco': return eventToCall(this.testService.onMarco);
-			case 'batchPerf': return this.testService.batchPerf(args[0].batches, args[0].size, args[0].dataSize);
-			default: return TPromise.wrapError(new Error('command not found'));
+			default: return Promise.reject(new Error('command not found'));
 		}
 	}
 }
 
 export class TestServiceClient implements ITestService {
 
-	private _onMarco: Event<IMarcoPoloEvent>;
-	get onMarco(): Event<IMarcoPoloEvent> { return this._onMarco; }
+	get onMarco(): Event<IMarcoPoloEvent> { return this.channel.listen('marco'); }
 
-	constructor(private channel: ITestChannel) {
-		this._onMarco = eventFromCall<IMarcoPoloEvent>(channel, 'event:marco');
-	}
+	constructor(private channel: ITestChannel) { }
 
-	marco(): TPromise<string> {
+	marco(): Thenable<string> {
 		return this.channel.call('marco');
 	}
 
-	pong(ping: string): TPromise<{ incoming: string, outgoing: string }> {
+	pong(ping: string): Thenable<{ incoming: string, outgoing: string }> {
 		return this.channel.call('pong', ping);
 	}
 
-	cancelMe(): TPromise<boolean> {
+	cancelMe(): Thenable<boolean> {
 		return this.channel.call('cancelMe');
 	}
-
-	batchPerf(batches: number, size: number, dataSize: number): PPromise<any, any[]> {
-		return this.channel.call('batchPerf', { batches, size, dataSize });
-	}
 }
\ No newline at end of file
diff --git a/src/vs/base/parts/quickopen/browser/quickOpenModel.ts b/src/vs/base/parts/quickopen/browser/quickOpenModel.ts
index db04c0b00dd..8b1c40062ac 100644
--- a/src/vs/base/parts/quickopen/browser/quickOpenModel.ts
+++ b/src/vs/base/parts/quickopen/browser/quickOpenModel.ts
@@ -8,7 +8,7 @@
 import * as nls from 'vs/nls';
 import { TPromise } from 'vs/base/common/winjs.base';
 import * as types from 'vs/base/common/types';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { ITree, IActionProvider } from 'vs/base/parts/tree/browser/tree';
 import { IconLabel, IIconLabelValueOptions } from 'vs/base/browser/ui/iconLabel/iconLabel';
 import { IQuickNavigateConfiguration, IModel, IDataSource, IFilter, IAccessiblityProvider, IRenderer, IRunner, Mode } from 'vs/base/parts/quickopen/common/quickOpen';
@@ -37,15 +37,15 @@ let IDS = 0;
 
 export class QuickOpenItemAccessorClass implements IItemAccessor<QuickOpenEntry> {
 
-	public getItemLabel(entry: QuickOpenEntry): string {
+	getItemLabel(entry: QuickOpenEntry): string {
 		return entry.getLabel();
 	}
 
-	public getItemDescription(entry: QuickOpenEntry): string {
+	getItemDescription(entry: QuickOpenEntry): string {
 		return entry.getDescription();
 	}
 
-	public getItemPath(entry: QuickOpenEntry): string {
+	getItemPath(entry: QuickOpenEntry): string {
 		const resource = entry.getResource();
 
 		return resource ? resource.fsPath : void 0;
@@ -70,70 +70,72 @@ export class QuickOpenEntry {
 	/**
 	 * A unique identifier for the entry
 	 */
-	public getId(): string {
+	getId(): string {
 		return this.id;
 	}
 
 	/**
 	 * The label of the entry to identify it from others in the list
 	 */
-	public getLabel(): string {
+	getLabel(): string {
 		return null;
 	}
 
 	/**
 	 * The options for the label to use for this entry
 	 */
-	public getLabelOptions(): IIconLabelValueOptions {
+	getLabelOptions(): IIconLabelValueOptions {
 		return null;
 	}
 
 	/**
 	 * The label of the entry to use when a screen reader wants to read about the entry
 	 */
-	public getAriaLabel(): string {
-		return this.getLabel();
+	getAriaLabel(): string {
+		return [this.getLabel(), this.getDescription(), this.getDetail()]
+			.filter(s => !!s)
+			.join(', ');
 	}
 
 	/**
 	 * Detail information about the entry that is optional and can be shown below the label
 	 */
-	public getDetail(): string {
+	getDetail(): string {
 		return null;
 	}
 
 	/**
 	 * The icon of the entry to identify it from others in the list
 	 */
-	public getIcon(): string {
+	getIcon(): string {
 		return null;
 	}
 
 	/**
 	 * A secondary description that is optional and can be shown right to the label
 	 */
-	public getDescription(): string {
+	getDescription(): string {
 		return null;
 	}
 
 	/**
 	 * A tooltip to show when hovering over the entry.
 	 */
-	public getTooltip(): string {
+	getTooltip(): string {
 		return null;
 	}
 
 	/**
 	 * A tooltip to show when hovering over the description portion of the entry.
 	 */
-	public getDescriptionTooltip(): string {
+	getDescriptionTooltip(): string {
 		return null;
 	}
 
 	/**
 	 * An optional keybinding to show for an entry.
 	 */
-	public getKeybinding(): ResolvedKeybinding {
+	getKeybinding(): ResolvedKeybinding {
 		return null;
 	}
 
@@ -141,28 +143,28 @@ export class QuickOpenEntry {
 	 * A resource for this entry. Resource URIs can be used to compare different kinds of entries and group
 	 * them together.
 	 */
-	public getResource(): URI {
+	getResource(): URI {
 		return null;
 	}
 
 	/**
 	 * Allows to reuse the same model while filtering. Hidden entries will not show up in the viewer.
 	 */
-	public isHidden(): boolean {
+	isHidden(): boolean {
 		return this.hidden;
 	}
 
 	/**
 	 * Allows to reuse the same model while filtering. Hidden entries will not show up in the viewer.
 	 */
-	public setHidden(hidden: boolean): void {
+	setHidden(hidden: boolean): void {
 		this.hidden = hidden;
 	}
 
 	/**
 	 * Allows to set highlight ranges that should show up for the entry label and optionally description if set.
 	 */
-	public setHighlights(labelHighlights: IHighlight[], descriptionHighlights?: IHighlight[], detailHighlights?: IHighlight[]): void {
+	setHighlights(labelHighlights: IHighlight[], descriptionHighlights?: IHighlight[], detailHighlights?: IHighlight[]): void {
 		this.labelHighlights = labelHighlights;
 		this.descriptionHighlights = descriptionHighlights;
 		this.detailHighlights = detailHighlights;
@@ -171,7 +173,7 @@ export class QuickOpenEntry {
 	/**
 	 * Allows to return highlight ranges that should show up for the entry label and description.
 	 */
-	public getHighlights(): [IHighlight[] /* Label */, IHighlight[] /* Description */, IHighlight[] /* Detail */] {
+	getHighlights(): [IHighlight[] /* Label */, IHighlight[] /* Description */, IHighlight[] /* Detail */] {
 		return [this.labelHighlights, this.descriptionHighlights, this.detailHighlights];
 	}
 
@@ -181,7 +183,7 @@ export class QuickOpenEntry {
 	 *
 	 * The context parameter provides additional context information how the run was triggered.
 	 */
-	public run(mode: Mode, context: IContext): boolean {
+	run(mode: Mode, context: IContext): boolean {
 		return false;
 	}
 
@@ -190,7 +192,7 @@ export class QuickOpenEntry {
 	 * and the resource of this entry is the same as the resource for an editor history, it will not show up
 	 * because it is considered to be a duplicate of an editor history.
 	 */
-	public mergeWithEditorHistory(): boolean {
+	mergeWithEditorHistory(): boolean {
 		return false;
 	}
 }
@@ -211,97 +213,97 @@ export class QuickOpenEntryGroup extends QuickOpenEntry {
 	/**
 	 * The label of the group or null if none.
 	 */
-	public getGroupLabel(): string {
+	getGroupLabel(): string {
 		return this.groupLabel;
 	}
 
-	public setGroupLabel(groupLabel: string): void {
+	setGroupLabel(groupLabel: string): void {
 		this.groupLabel = groupLabel;
 	}
 
 	/**
 	 * Whether to show a border on top of the group entry or not.
 	 */
-	public showBorder(): boolean {
+	showBorder(): boolean {
 		return this.withBorder;
 	}
 
-	public setShowBorder(showBorder: boolean): void {
+	setShowBorder(showBorder: boolean): void {
 		this.withBorder = showBorder;
 	}
 
-	public getLabel(): string {
+	getLabel(): string {
 		return this.entry ? this.entry.getLabel() : super.getLabel();
 	}
 
-	public getLabelOptions(): IIconLabelValueOptions {
+	getLabelOptions(): IIconLabelValueOptions {
 		return this.entry ? this.entry.getLabelOptions() : super.getLabelOptions();
 	}
 
-	public getAriaLabel(): string {
+	getAriaLabel(): string {
 		return this.entry ? this.entry.getAriaLabel() : super.getAriaLabel();
 	}
 
-	public getDetail(): string {
+	getDetail(): string {
 		return this.entry ? this.entry.getDetail() : super.getDetail();
 	}
 
-	public getResource(): URI {
+	getResource(): URI {
 		return this.entry ? this.entry.getResource() : super.getResource();
 	}
 
-	public getIcon(): string {
+	getIcon(): string {
 		return this.entry ? this.entry.getIcon() : super.getIcon();
 	}
 
-	public getDescription(): string {
+	getDescription(): string {
 		return this.entry ? this.entry.getDescription() : super.getDescription();
 	}
 
-	public getEntry(): QuickOpenEntry {
+	getEntry(): QuickOpenEntry {
 		return this.entry;
 	}
 
-	public getHighlights(): [IHighlight[], IHighlight[], IHighlight[]] {
+	getHighlights(): [IHighlight[], IHighlight[], IHighlight[]] {
 		return this.entry ? this.entry.getHighlights() : super.getHighlights();
 	}
 
-	public isHidden(): boolean {
+	isHidden(): boolean {
 		return this.entry ? this.entry.isHidden() : super.isHidden();
 	}
 
-	public setHighlights(labelHighlights: IHighlight[], descriptionHighlights?: IHighlight[], detailHighlights?: IHighlight[]): void {
+	setHighlights(labelHighlights: IHighlight[], descriptionHighlights?: IHighlight[], detailHighlights?: IHighlight[]): void {
 		this.entry ? this.entry.setHighlights(labelHighlights, descriptionHighlights, detailHighlights) : super.setHighlights(labelHighlights, descriptionHighlights, detailHighlights);
 	}
 
-	public setHidden(hidden: boolean): void {
+	setHidden(hidden: boolean): void {
 		this.entry ? this.entry.setHidden(hidden) : super.setHidden(hidden);
 	}
 
-	public run(mode: Mode, context: IContext): boolean {
+	run(mode: Mode, context: IContext): boolean {
 		return this.entry ? this.entry.run(mode, context) : super.run(mode, context);
 	}
 }
 
 class NoActionProvider implements IActionProvider {
 
-	public hasActions(tree: ITree, element: any): boolean {
+	hasActions(tree: ITree, element: any): boolean {
 		return false;
 	}
 
-	public getActions(tree: ITree, element: any): TPromise<IAction[]> {
+	getActions(tree: ITree, element: any): TPromise<IAction[]> {
 		return TPromise.as(null);
 	}
 
-	public hasSecondaryActions(tree: ITree, element: any): boolean {
+	hasSecondaryActions(tree: ITree, element: any): boolean {
 		return false;
 	}
 
-	public getSecondaryActions(tree: ITree, element: any): TPromise<IAction[]> {
+	getSecondaryActions(tree: ITree, element: any): TPromise<IAction[]> {
 		return TPromise.as(null);
 	}
 
-	public getActionItem(tree: ITree, element: any, action: Action): IActionItem {
+	getActionItem(tree: ITree, element: any, action: Action): IActionItem {
 		return null;
 	}
 }
@@ -333,7 +335,7 @@ class Renderer implements IRenderer<QuickOpenEntry> {
 		this.actionRunner = actionRunner;
 	}
 
-	public getHeight(entry: QuickOpenEntry): number {
+	getHeight(entry: QuickOpenEntry): number {
 		if (entry.getDetail()) {
 			return 44;
 		}
@@ -341,7 +343,7 @@ class Renderer implements IRenderer<QuickOpenEntry> {
 		return 22;
 	}
 
-	public getTemplateId(entry: QuickOpenEntry): string {
+	getTemplateId(entry: QuickOpenEntry): string {
 		if (entry instanceof QuickOpenEntryGroup) {
 			return templateEntryGroup;
 		}
@@ -349,7 +351,7 @@ class Renderer implements IRenderer<QuickOpenEntry> {
 		return templateEntry;
 	}
 
-	public renderTemplate(templateId: string, container: HTMLElement, styles: IQuickOpenStyles): IQuickOpenEntryGroupTemplateData {
+	renderTemplate(templateId: string, container: HTMLElement, styles: IQuickOpenStyles): IQuickOpenEntryGroupTemplateData {
 		const entryContainer = document.createElement('div');
 		DOM.addClass(entryContainer, 'sub-content');
 		container.appendChild(entryContainer);
@@ -410,7 +412,7 @@ class Renderer implements IRenderer<QuickOpenEntry> {
 		};
 	}
 
-	public renderElement(entry: QuickOpenEntry, templateId: string, data: IQuickOpenEntryGroupTemplateData, styles: IQuickOpenStyles): void {
+	renderElement(entry: QuickOpenEntry, templateId: string, data: IQuickOpenEntryGroupTemplateData, styles: IQuickOpenStyles): void {
 
 		// Action Bar
 		if (this.actionProvider.hasActions(null, entry)) {
@@ -480,7 +482,7 @@ class Renderer implements IRenderer<QuickOpenEntry> {
 		}
 	}
 
-	public disposeTemplate(templateId: string, templateData: IQuickOpenEntryGroupTemplateData): void {
+	disposeTemplate(templateId: string, templateData: IQuickOpenEntryGroupTemplateData): void {
 		const data = templateData as IQuickOpenEntryGroupTemplateData;
 		data.actionBar.dispose();
 		data.actionBar = null;
@@ -501,7 +503,8 @@ export class QuickOpenModel implements
 	IModel<QuickOpenEntry>,
 	IDataSource<QuickOpenEntry>,
 	IFilter<QuickOpenEntry>,
-	IRunner<QuickOpenEntry>
+	IRunner<QuickOpenEntry>,
+	IAccessiblityProvider<QuickOpenEntry>
 {
 	private _entries: QuickOpenEntry[];
 	private _dataSource: IDataSource<QuickOpenEntry>;
@@ -519,21 +522,21 @@ export class QuickOpenModel implements
 		this._accessibilityProvider = this;
 	}
 
-	public get entries() { return this._entries; }
-	public get dataSource() { return this._dataSource; }
-	public get renderer() { return this._renderer; }
-	public get filter() { return this._filter; }
-	public get runner() { return this._runner; }
-	public get accessibilityProvider() { return this._accessibilityProvider; }
+	get entries() { return this._entries; }
+	get dataSource() { return this._dataSource; }
+	get renderer() { return this._renderer; }
+	get filter() { return this._filter; }
+	get runner() { return this._runner; }
+	get accessibilityProvider() { return this._accessibilityProvider; }
 
-	public set entries(entries: QuickOpenEntry[]) {
+	set entries(entries: QuickOpenEntry[]) {
 		this._entries = entries;
 	}
 
 	/**
 	 * Adds entries that should show up in the quick open viewer.
 	 */
-	public addEntries(entries: QuickOpenEntry[]): void {
+	addEntries(entries: QuickOpenEntry[]): void {
 		if (types.isArray(entries)) {
 			this._entries = this._entries.concat(entries);
 		}
@@ -542,7 +545,7 @@ export class QuickOpenModel implements
 	/**
 	 * Set the entries that should show up in the quick open viewer.
 	 */
-	public setEntries(entries: QuickOpenEntry[]): void {
+	setEntries(entries: QuickOpenEntry[]): void {
 		if (types.isArray(entries)) {
 			this._entries = entries;
 		}
@@ -553,7 +556,7 @@ export class QuickOpenModel implements
 	 *
 	 * @visibleOnly optional parameter to only return visible entries
 	 */
-	public getEntries(visibleOnly?: boolean): QuickOpenEntry[] {
+	getEntries(visibleOnly?: boolean): QuickOpenEntry[] {
 		if (visibleOnly) {
 			return this._entries.filter((e) => !e.isHidden());
 		}
@@ -561,15 +564,15 @@ export class QuickOpenModel implements
 		return this._entries;
 	}
 
-	public getId(entry: QuickOpenEntry): string {
+	getId(entry: QuickOpenEntry): string {
 		return entry.getId();
 	}
 
-	public getLabel(entry: QuickOpenEntry): string {
+	getLabel(entry: QuickOpenEntry): string {
 		return entry.getLabel();
 	}
 
-	public getAriaLabel(entry: QuickOpenEntry): string {
+	getAriaLabel(entry: QuickOpenEntry): string {
 		const ariaLabel = entry.getAriaLabel();
 		if (ariaLabel) {
 			return nls.localize('quickOpenAriaLabelEntry', "{0}, picker", entry.getAriaLabel());
@@ -578,11 +581,11 @@ export class QuickOpenModel implements
 		return nls.localize('quickOpenAriaLabel', "picker");
 	}
 
-	public isVisible(entry: QuickOpenEntry): boolean {
+	isVisible(entry: QuickOpenEntry): boolean {
 		return !entry.isHidden();
 	}
 
-	public run(entry: QuickOpenEntry, mode: Mode, context: IContext): boolean {
+	run(entry: QuickOpenEntry, mode: Mode, context: IContext): boolean {
 		return entry.run(mode, context);
 	}
 }
diff --git a/src/vs/base/parts/quickopen/browser/quickOpenViewer.ts b/src/vs/base/parts/quickopen/browser/quickOpenViewer.ts
index 07817947cbb..58f0f68b304 100644
--- a/src/vs/base/parts/quickopen/browser/quickOpenViewer.ts
+++ b/src/vs/base/parts/quickopen/browser/quickOpenViewer.ts
@@ -23,7 +23,7 @@ export class DataSource implements IDataSource {
 		this.modelProvider = isFunction(arg.getModel) ? arg : { getModel: () => arg };
 	}
 
-	public getId(tree: ITree, element: any): string {
+	getId(tree: ITree, element: any): string {
 		if (!element) {
 			return null;
 		}
@@ -32,17 +32,17 @@ export class DataSource implements IDataSource {
 		return model === element ? '__root__' : model.dataSource.getId(element);
 	}
 
-	public hasChildren(tree: ITree, element: any): boolean {
+	hasChildren(tree: ITree, element: any): boolean {
 		const model = this.modelProvider.getModel();
 		return model && model === element && model.entries.length > 0;
 	}
 
-	public getChildren(tree: ITree, element: any): TPromise<any[]> {
+	getChildren(tree: ITree, element: any): TPromise<any[]> {
 		const model = this.modelProvider.getModel();
 		return TPromise.as(model === element ? model.entries : []);
 	}
 
-	public getParent(tree: ITree, element: any): TPromise<any> {
+	getParent(tree: ITree, element: any): TPromise<any> {
 		return TPromise.as(null);
 	}
 }
@@ -50,20 +50,43 @@ export class DataSource implements IDataSource {
 export class AccessibilityProvider implements IAccessibilityProvider {
 	constructor(private modelProvider: IModelProvider) { }
 
-	public getAriaLabel(tree: ITree, element: any): string {
+	getAriaLabel(tree: ITree, element: any): string {
 		const model = this.modelProvider.getModel();
 
 		return model.accessibilityProvider && model.accessibilityProvider.getAriaLabel(element);
 	}
 
-	public getPosInSet(tree: ITree, element: any): string {
+	getPosInSet(tree: ITree, element: any): string {
 		const model = this.modelProvider.getModel();
-		return String(model.entries.indexOf(element) + 1);
+		let i = 0;
+		if (model.filter) {
+			for (const entry of model.entries) {
+				if (model.filter.isVisible(entry)) {
+					i++;
+				}
+				if (entry === element) {
+					break;
+				}
+			}
+		} else {
+			i = model.entries.indexOf(element) + 1;
+		}
+		return String(i);
 	}
 
-	public getSetSize(): string {
+	getSetSize(): string {
 		const model = this.modelProvider.getModel();
-		return String(model.entries.length);
+		let n = 0;
+		if (model.filter) {
+			for (const entry of model.entries) {
+				if (model.filter.isVisible(entry)) {
+					n++;
+				}
+			}
+		} else {
+			n = model.entries.length;
+		}
+		return String(n);
 	}
 }
 
@@ -71,7 +94,7 @@ export class Filter implements IFilter {
 
 	constructor(private modelProvider: IModelProvider) { }
 
-	public isVisible(tree: ITree, element: any): boolean {
+	isVisible(tree: ITree, element: any): boolean {
 		const model = this.modelProvider.getModel();
 
 		if (!model.filter) {
@@ -89,31 +112,31 @@ export class Renderer implements IRenderer {
 		this.styles = styles;
 	}
 
-	public updateStyles(styles: IQuickOpenStyles): void {
+	updateStyles(styles: IQuickOpenStyles): void {
 		this.styles = styles;
 	}
 
-	public getHeight(tree: ITree, element: any): number {
+	getHeight(tree: ITree, element: any): number {
 		const model = this.modelProvider.getModel();
 		return model.renderer.getHeight(element);
 	}
 
-	public getTemplateId(tree: ITree, element: any): string {
+	getTemplateId(tree: ITree, element: any): string {
 		const model = this.modelProvider.getModel();
 		return model.renderer.getTemplateId(element);
 	}
 
-	public renderTemplate(tree: ITree, templateId: string, container: HTMLElement): any {
+	renderTemplate(tree: ITree, templateId: string, container: HTMLElement): any {
 		const model = this.modelProvider.getModel();
 		return model.renderer.renderTemplate(templateId, container, this.styles);
 	}
 
-	public renderElement(tree: ITree, element: any, templateId: string, templateData: any): void {
+	renderElement(tree: ITree, element: any, templateId: string, templateData: any): void {
 		const model = this.modelProvider.getModel();
 		model.renderer.renderElement(element, templateId, templateData, this.styles);
 	}
 
-	public disposeTemplate(tree: ITree, templateId: string, templateData: any): void {
+	disposeTemplate(tree: ITree, templateId: string, templateData: any): void {
 		const model = this.modelProvider.getModel();
 		model.renderer.disposeTemplate(templateId, templateData);
 	}
diff --git a/src/vs/base/parts/quickopen/browser/quickOpenWidget.ts b/src/vs/base/parts/quickopen/browser/quickOpenWidget.ts
index 53a84d50876..aca936974b6 100644
--- a/src/vs/base/parts/quickopen/browser/quickOpenWidget.ts
+++ b/src/vs/base/parts/quickopen/browser/quickOpenWidget.ts
@@ -6,13 +6,10 @@
 
 import 'vs/css!./quickopen';
 import * as nls from 'vs/nls';
-import { TPromise } from 'vs/base/common/winjs.base';
 import * as platform from 'vs/base/common/platform';
 import * as types from 'vs/base/common/types';
-import * as errors from 'vs/base/common/errors';
 import { IQuickNavigateConfiguration, IAutoFocus, IEntryRunContext, IModel, Mode, IKeyMods } from 'vs/base/parts/quickopen/common/quickOpen';
 import { Filter, Renderer, DataSource, IModelProvider, AccessibilityProvider } from 'vs/base/parts/quickopen/browser/quickOpenViewer';
-import { Builder, $ } from 'vs/base/browser/builder';
 import { ITree, ContextMenuEvent, IActionProvider, ITreeStyles, ITreeOptions, ITreeConfiguration } from 'vs/base/parts/tree/browser/tree';
 import { InputBox, MessageType, IInputBoxStyles, IRange } from 'vs/base/browser/ui/inputbox/inputBox';
 import Severity from 'vs/base/common/severity';
@@ -22,7 +19,7 @@ import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
 import { DefaultController, ClickBehavior } from 'vs/base/parts/tree/browser/treeDefaults';
 import * as DOM from 'vs/base/browser/dom';
 import { KeyCode } from 'vs/base/common/keyCodes';
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
+import { Disposable } from 'vs/base/common/lifecycle';
 import { ScrollbarVisibility } from 'vs/base/common/scrollable';
 import { Color } from 'vs/base/common/color';
 import { mixin } from 'vs/base/common/objects';
@@ -65,7 +62,7 @@ export interface IShowOptions {
 
 export class QuickOpenController extends DefaultController {
 
-	public onContextMenu(tree: ITree, element: any, event: ContextMenuEvent): boolean {
+	onContextMenu(tree: ITree, element: any, event: ContextMenuEvent): boolean {
 		if (platform.isMacintosh) {
 			return this.onLeftClick(tree, element, event); // https://github.com/Microsoft/vscode/issues/1011
 		}
@@ -74,7 +71,7 @@ export class QuickOpenController extends DefaultController {
 	}
 }
 
-export enum HideReason {
+export const enum HideReason {
 	ELEMENT_SELECTED,
 	FOCUS_LOST,
 	CANCELED
@@ -91,24 +88,24 @@ const defaultStyles = {
 
 const DEFAULT_INPUT_ARIA_LABEL = nls.localize('quickOpenAriaLabel', "Quick picker. Type to narrow down results.");
 
-export class QuickOpenWidget implements IModelProvider {
+export class QuickOpenWidget extends Disposable implements IModelProvider {
 
-	private static readonly MAX_WIDTH = 600;				// Max total width of quick open widget
+	private static readonly MAX_WIDTH = 600;			// Max total width of quick open widget
 	private static readonly MAX_ITEMS_HEIGHT = 20 * 22;	// Max height of item list below input field
 
 	private isDisposed: boolean;
 	private options: IQuickOpenOptions;
-	private builder: Builder;
+	private element: HTMLElement;
 	private tree: ITree;
 	private inputBox: InputBox;
-	private inputContainer: Builder;
-	private helpText: Builder;
-	private treeContainer: Builder;
+	private inputContainer: HTMLElement;
+	private helpText: HTMLElement;
+	private resultCount: HTMLElement;
+	private treeContainer: HTMLElement;
 	private progressBar: ProgressBar;
 	private visible: boolean;
 	private isLoosingFocus: boolean;
 	private callbacks: IQuickOpenCallbacks;
-	private toUnbind: IDisposable[];
 	private quickNavigateConfiguration: IQuickNavigateConfiguration;
 	private container: HTMLElement;
 	private treeElement: HTMLElement;
@@ -120,8 +117,9 @@ export class QuickOpenWidget implements IModelProvider {
 	private renderer: Renderer;
 
 	constructor(container: HTMLElement, callbacks: IQuickOpenCallbacks, options: IQuickOpenOptions) {
+		super();
+
 		this.isDisposed = false;
-		this.toUnbind = [];
 		this.container = container;
 		this.callbacks = callbacks;
 		this.options = options;
@@ -130,206 +128,221 @@ export class QuickOpenWidget implements IModelProvider {
 		this.model = null;
 	}
 
-	public getElement(): HTMLElement {
-		return $(this.builder).getHTMLElement();
+	getElement(): HTMLElement {
+		return this.element;
 	}
 
-	public getModel(): IModel<any> {
+	getModel(): IModel<any> {
 		return this.model;
 	}
 
-	public setCallbacks(callbacks: IQuickOpenCallbacks): void {
+	setCallbacks(callbacks: IQuickOpenCallbacks): void {
 		this.callbacks = callbacks;
 	}
 
-	public create(): HTMLElement {
-		this.builder = $().div(div => {
+	create(): HTMLElement {
 
-			// Eventing
-			div.on(DOM.EventType.KEY_DOWN, e => {
-				const keyboardEvent: StandardKeyboardEvent = new StandardKeyboardEvent(e as KeyboardEvent);
-				if (keyboardEvent.keyCode === KeyCode.Escape) {
+		// Container
+		this.element = document.createElement('div');
+		DOM.addClass(this.element, 'monaco-quick-open-widget');
+		this.container.appendChild(this.element);
+
+		this._register(DOM.addDisposableListener(this.element, DOM.EventType.CONTEXT_MENU, e => DOM.EventHelper.stop(e, true))); // Do this to fix an issue on Mac where the menu goes into the way
+		this._register(DOM.addDisposableListener(this.element, DOM.EventType.FOCUS, e => this.gainingFocus(), true));
+		this._register(DOM.addDisposableListener(this.element, DOM.EventType.BLUR, e => this.loosingFocus(e), true));
+		this._register(DOM.addDisposableListener(this.element, DOM.EventType.KEY_DOWN, e => {
+			const keyboardEvent: StandardKeyboardEvent = new StandardKeyboardEvent(e as KeyboardEvent);
+			if (keyboardEvent.keyCode === KeyCode.Escape) {
+				DOM.EventHelper.stop(e, true);
+
+				this.hide(HideReason.CANCELED);
+			} else if (keyboardEvent.keyCode === KeyCode.Tab && !keyboardEvent.altKey && !keyboardEvent.ctrlKey && !keyboardEvent.metaKey) {
+				const stops = e.currentTarget.querySelectorAll('input, .monaco-tree, .monaco-tree-row.focused .action-label.icon');
+				if (keyboardEvent.shiftKey && keyboardEvent.target === stops[0]) {
 					DOM.EventHelper.stop(e, true);
-
-					this.hide(HideReason.CANCELED);
+					stops[stops.length - 1].focus();
+				} else if (!keyboardEvent.shiftKey && keyboardEvent.target === stops[stops.length - 1]) {
+					DOM.EventHelper.stop(e, true);
+					stops[0].focus();
 				}
-			})
-				.on(DOM.EventType.CONTEXT_MENU, (e: Event) => DOM.EventHelper.stop(e, true)) // Do this to fix an issue on Mac where the menu goes into the way
-				.on(DOM.EventType.FOCUS, (e: FocusEvent) => this.gainingFocus(), null, true)
-				.on(DOM.EventType.BLUR, (e: FocusEvent) => this.loosingFocus(e), null, true);
+			}
+		}));
 
-			// Progress Bar
-			this.progressBar = new ProgressBar(div.clone(), { progressBarBackground: this.styles.progressBarBackground });
-			this.progressBar.hide();
+		// Progress Bar
+		this.progressBar = this._register(new ProgressBar(this.element, { progressBarBackground: this.styles.progressBarBackground }));
+		this.progressBar.hide();
 
-			// Input Field
-			div.div({ 'class': 'quick-open-input' }, inputContainer => {
-				this.inputContainer = inputContainer;
-				this.inputBox = new InputBox(inputContainer.getHTMLElement(), null, {
-					placeholder: this.options.inputPlaceHolder || '',
-					ariaLabel: DEFAULT_INPUT_ARIA_LABEL,
-					inputBackground: this.styles.inputBackground,
-					inputForeground: this.styles.inputForeground,
-					inputBorder: this.styles.inputBorder,
-					inputValidationInfoBackground: this.styles.inputValidationInfoBackground,
-					inputValidationInfoBorder: this.styles.inputValidationInfoBorder,
-					inputValidationWarningBackground: this.styles.inputValidationWarningBackground,
-					inputValidationWarningBorder: this.styles.inputValidationWarningBorder,
-					inputValidationErrorBackground: this.styles.inputValidationErrorBackground,
-					inputValidationErrorBorder: this.styles.inputValidationErrorBorder
-				});
+		// Input Field
+		this.inputContainer = document.createElement('div');
+		DOM.addClass(this.inputContainer, 'quick-open-input');
+		this.element.appendChild(this.inputContainer);
 
-				// ARIA
-				this.inputElement = this.inputBox.inputElement;
-				this.inputElement.setAttribute('role', 'combobox');
-				this.inputElement.setAttribute('aria-haspopup', 'false');
-				this.inputElement.setAttribute('aria-autocomplete', 'list');
+		this.inputBox = this._register(new InputBox(this.inputContainer, null, {
+			placeholder: this.options.inputPlaceHolder || '',
+			ariaLabel: DEFAULT_INPUT_ARIA_LABEL,
+			inputBackground: this.styles.inputBackground,
+			inputForeground: this.styles.inputForeground,
+			inputBorder: this.styles.inputBorder,
+			inputValidationInfoBackground: this.styles.inputValidationInfoBackground,
+			inputValidationInfoForeground: this.styles.inputValidationInfoForeground,
+			inputValidationInfoBorder: this.styles.inputValidationInfoBorder,
+			inputValidationWarningBackground: this.styles.inputValidationWarningBackground,
+			inputValidationWarningForeground: this.styles.inputValidationWarningForeground,
+			inputValidationWarningBorder: this.styles.inputValidationWarningBorder,
+			inputValidationErrorBackground: this.styles.inputValidationErrorBackground,
+			inputValidationErrorForeground: this.styles.inputValidationErrorForeground,
+			inputValidationErrorBorder: this.styles.inputValidationErrorBorder
+		}));
 
-				DOM.addDisposableListener(this.inputBox.inputElement, DOM.EventType.KEY_DOWN, (e: KeyboardEvent) => {
-					const keyboardEvent: StandardKeyboardEvent = new StandardKeyboardEvent(e);
-					const shouldOpenInBackground = this.shouldOpenInBackground(keyboardEvent);
+		this.inputElement = this.inputBox.inputElement;
+		this.inputElement.setAttribute('role', 'combobox');
+		this.inputElement.setAttribute('aria-haspopup', 'false');
+		this.inputElement.setAttribute('aria-autocomplete', 'list');
 
-					// Do not handle Tab: It is used to navigate between elements without mouse
-					if (keyboardEvent.keyCode === KeyCode.Tab) {
-						return;
+		this._register(DOM.addDisposableListener(this.inputBox.inputElement, DOM.EventType.INPUT, (e: Event) => this.onType()));
+		this._register(DOM.addDisposableListener(this.inputBox.inputElement, DOM.EventType.KEY_DOWN, (e: KeyboardEvent) => {
+			const keyboardEvent: StandardKeyboardEvent = new StandardKeyboardEvent(e);
+			const shouldOpenInBackground = this.shouldOpenInBackground(keyboardEvent);
+
+			// Do not handle Tab: It is used to navigate between elements without mouse
+			if (keyboardEvent.keyCode === KeyCode.Tab) {
+				return;
+			}
+
+			// Pass tree navigation keys to the tree but leave focus in input field
+			else if (keyboardEvent.keyCode === KeyCode.DownArrow || keyboardEvent.keyCode === KeyCode.UpArrow || keyboardEvent.keyCode === KeyCode.PageDown || keyboardEvent.keyCode === KeyCode.PageUp) {
+				DOM.EventHelper.stop(e, true);
+
+				this.navigateInTree(keyboardEvent.keyCode, keyboardEvent.shiftKey);
+
+				// Position cursor at the end of input to allow right arrow (open in background)
+				// to function immediately unless the user has made a selection
+				if (this.inputBox.inputElement.selectionStart === this.inputBox.inputElement.selectionEnd) {
+					this.inputBox.inputElement.selectionStart = this.inputBox.value.length;
+				}
+			}
+
+			// Select element on Enter or on Arrow-Right if we are at the end of the input
+			else if (keyboardEvent.keyCode === KeyCode.Enter || shouldOpenInBackground) {
+				DOM.EventHelper.stop(e, true);
+
+				const focus = this.tree.getFocus();
+				if (focus) {
+					this.elementSelected(focus, e, shouldOpenInBackground ? Mode.OPEN_IN_BACKGROUND : Mode.OPEN);
+				}
+			}
+		}));
+
+		// Result count for screen readers
+		this.resultCount = document.createElement('div');
+		DOM.addClass(this.resultCount, 'quick-open-result-count');
+		this.resultCount.setAttribute('aria-live', 'polite');
+		this.resultCount.setAttribute('aria-atomic', 'true');
+		this.element.appendChild(this.resultCount);
+
+		// Tree
+		this.treeContainer = document.createElement('div');
+		DOM.addClass(this.treeContainer, 'quick-open-tree');
+		this.element.appendChild(this.treeContainer);
+
+		const createTree = this.options.treeCreator || ((container, config, opts) => new Tree(container, config, opts));
+
+		this.tree = this._register(createTree(this.treeContainer, {
+			dataSource: new DataSource(this),
+			controller: new QuickOpenController({ clickBehavior: ClickBehavior.ON_MOUSE_UP, keyboardSupport: this.options.keyboardSupport }),
+			renderer: (this.renderer = new Renderer(this, this.styles)),
+			filter: new Filter(this),
+			accessibilityProvider: new AccessibilityProvider(this)
+		}, {
+				twistiePixels: 11,
+				indentPixels: 0,
+				alwaysFocused: true,
+				verticalScrollMode: ScrollbarVisibility.Visible,
+				horizontalScrollMode: ScrollbarVisibility.Hidden,
+				ariaLabel: nls.localize('treeAriaLabel', "Quick Picker"),
+				keyboardSupport: this.options.keyboardSupport,
+				preventRootFocus: false
+			}));
+
+		this.treeElement = this.tree.getHTMLElement();
+
+		// Handle Focus and Selection event
+		this._register(this.tree.onDidChangeFocus(event => {
+			this.elementFocused(event.focus, event);
+		}));
+
+		this._register(this.tree.onDidChangeSelection(event => {
+			if (event.selection && event.selection.length > 0) {
+				const mouseEvent: StandardMouseEvent = event.payload && event.payload.originalEvent instanceof StandardMouseEvent ? event.payload.originalEvent : void 0;
+				const shouldOpenInBackground = mouseEvent ? this.shouldOpenInBackground(mouseEvent) : false;
+
+				this.elementSelected(event.selection[0], event, shouldOpenInBackground ? Mode.OPEN_IN_BACKGROUND : Mode.OPEN);
+			}
+		}));
+
+		this._register(DOM.addDisposableListener(this.treeContainer, DOM.EventType.KEY_DOWN, e => {
+			const keyboardEvent: StandardKeyboardEvent = new StandardKeyboardEvent(e as KeyboardEvent);
+
+			// Only handle when in quick navigation mode
+			if (!this.quickNavigateConfiguration) {
+				return;
+			}
+
+			// Support keyboard navigation in quick navigation mode
+			if (keyboardEvent.keyCode === KeyCode.DownArrow || keyboardEvent.keyCode === KeyCode.UpArrow || keyboardEvent.keyCode === KeyCode.PageDown || keyboardEvent.keyCode === KeyCode.PageUp) {
+				DOM.EventHelper.stop(e, true);
+
+				this.navigateInTree(keyboardEvent.keyCode);
+			}
+		}));
+
+		this._register(DOM.addDisposableListener(this.treeContainer, DOM.EventType.KEY_UP, e => {
+			const keyboardEvent: StandardKeyboardEvent = new StandardKeyboardEvent(e as KeyboardEvent);
+			const keyCode = keyboardEvent.keyCode;
+
+			// Only handle when in quick navigation mode
+			if (!this.quickNavigateConfiguration) {
+				return;
+			}
+
+			// Select element when keys are pressed that signal it
+			const quickNavKeys = this.quickNavigateConfiguration.keybindings;
+			const wasTriggerKeyPressed = keyCode === KeyCode.Enter || quickNavKeys.some(k => {
+				const [firstPart, chordPart] = k.getParts();
+				if (chordPart) {
+					return false;
+				}
+
+				if (firstPart.shiftKey && keyCode === KeyCode.Shift) {
+					if (keyboardEvent.ctrlKey || keyboardEvent.altKey || keyboardEvent.metaKey) {
+						return false; // this is an optimistic check for the shift key being used to navigate back in quick open
 					}
 
-					// Pass tree navigation keys to the tree but leave focus in input field
-					else if (keyboardEvent.keyCode === KeyCode.DownArrow || keyboardEvent.keyCode === KeyCode.UpArrow || keyboardEvent.keyCode === KeyCode.PageDown || keyboardEvent.keyCode === KeyCode.PageUp) {
-						DOM.EventHelper.stop(e, true);
+					return true;
+				}
 
-						this.navigateInTree(keyboardEvent.keyCode, keyboardEvent.shiftKey);
+				if (firstPart.altKey && keyCode === KeyCode.Alt) {
+					return true;
+				}
 
-						// Position cursor at the end of input to allow right arrow (open in background)
-						// to function immediately unless the user has made a selection
-						if (this.inputBox.inputElement.selectionStart === this.inputBox.inputElement.selectionEnd) {
-							this.inputBox.inputElement.selectionStart = this.inputBox.value.length;
-						}
-					}
+				if (firstPart.ctrlKey && keyCode === KeyCode.Ctrl) {
+					return true;
+				}
 
-					// Select element on Enter or on Arrow-Right if we are at the end of the input
-					else if (keyboardEvent.keyCode === KeyCode.Enter || shouldOpenInBackground) {
-						DOM.EventHelper.stop(e, true);
+				if (firstPart.metaKey && keyCode === KeyCode.Meta) {
+					return true;
+				}
 
-						const focus = this.tree.getFocus();
-						if (focus) {
-							this.elementSelected(focus, e, shouldOpenInBackground ? Mode.OPEN_IN_BACKGROUND : Mode.OPEN);
-						}
-					}
-				});
-
-				DOM.addDisposableListener(this.inputBox.inputElement, DOM.EventType.INPUT, (e: Event) => {
-					this.onType();
-				});
+				return false;
 			});
 
-			// Tree
-			this.treeContainer = div.div({
-				'class': 'quick-open-tree'
-			}, div => {
-				const createTree = this.options.treeCreator || ((container, config, opts) => new Tree(container, config, opts));
-
-				this.tree = createTree(div.getHTMLElement(), {
-					dataSource: new DataSource(this),
-					controller: new QuickOpenController({ clickBehavior: ClickBehavior.ON_MOUSE_UP, keyboardSupport: this.options.keyboardSupport }),
-					renderer: (this.renderer = new Renderer(this, this.styles)),
-					filter: new Filter(this),
-					accessibilityProvider: new AccessibilityProvider(this)
-				}, {
-						twistiePixels: 11,
-						indentPixels: 0,
-						alwaysFocused: true,
-						verticalScrollMode: ScrollbarVisibility.Visible,
-						horizontalScrollMode: ScrollbarVisibility.Hidden,
-						ariaLabel: nls.localize('treeAriaLabel', "Quick Picker"),
-						keyboardSupport: this.options.keyboardSupport,
-						preventRootFocus: true
-					});
-
-				this.treeElement = this.tree.getHTMLElement();
-
-				// Handle Focus and Selection event
-				this.toUnbind.push(this.tree.onDidChangeFocus(event => {
-					this.elementFocused(event.focus, event);
-				}));
-
-				this.toUnbind.push(this.tree.onDidChangeSelection(event => {
-					if (event.selection && event.selection.length > 0) {
-						const mouseEvent: StandardMouseEvent = event.payload && event.payload.originalEvent instanceof StandardMouseEvent ? event.payload.originalEvent : void 0;
-						const shouldOpenInBackground = mouseEvent ? this.shouldOpenInBackground(mouseEvent) : false;
-
-						this.elementSelected(event.selection[0], event, shouldOpenInBackground ? Mode.OPEN_IN_BACKGROUND : Mode.OPEN);
-					}
-				}));
-			}).
-				on(DOM.EventType.KEY_DOWN, e => {
-					const keyboardEvent: StandardKeyboardEvent = new StandardKeyboardEvent(e as KeyboardEvent);
-
-					// Only handle when in quick navigation mode
-					if (!this.quickNavigateConfiguration) {
-						return;
-					}
-
-					// Support keyboard navigation in quick navigation mode
-					if (keyboardEvent.keyCode === KeyCode.DownArrow || keyboardEvent.keyCode === KeyCode.UpArrow || keyboardEvent.keyCode === KeyCode.PageDown || keyboardEvent.keyCode === KeyCode.PageUp) {
-						DOM.EventHelper.stop(e, true);
-
-						this.navigateInTree(keyboardEvent.keyCode);
-					}
-				}).
-				on(DOM.EventType.KEY_UP, e => {
-					const keyboardEvent: StandardKeyboardEvent = new StandardKeyboardEvent(e as KeyboardEvent);
-					const keyCode = keyboardEvent.keyCode;
-
-					// Only handle when in quick navigation mode
-					if (!this.quickNavigateConfiguration) {
-						return;
-					}
-
-					// Select element when keys are pressed that signal it
-					const quickNavKeys = this.quickNavigateConfiguration.keybindings;
-					const wasTriggerKeyPressed = keyCode === KeyCode.Enter || quickNavKeys.some(k => {
-						const [firstPart, chordPart] = k.getParts();
-						if (chordPart) {
-							return false;
-						}
-
-						if (firstPart.shiftKey && keyCode === KeyCode.Shift) {
-							if (keyboardEvent.ctrlKey || keyboardEvent.altKey || keyboardEvent.metaKey) {
-								return false; // this is an optimistic check for the shift key being used to navigate back in quick open
-							}
-
-							return true;
-						}
-
-						if (firstPart.altKey && keyCode === KeyCode.Alt) {
-							return true;
-						}
-
-						if (firstPart.ctrlKey && keyCode === KeyCode.Ctrl) {
-							return true;
-						}
-
-						if (firstPart.metaKey && keyCode === KeyCode.Meta) {
-							return true;
-						}
-
-						return false;
-					});
-
-					if (wasTriggerKeyPressed) {
-						const focus = this.tree.getFocus();
-						if (focus) {
-							this.elementSelected(focus, e);
-						}
-					}
-				}).
-				clone();
-		})
-
-			// Widget Attributes
-			.addClass('monaco-quick-open-widget')
-			.build(this.container);
+			if (wasTriggerKeyPressed) {
+				const focus = this.tree.getFocus();
+				if (focus) {
+					this.elementSelected(focus, e);
+				}
+			}
+		}));
 
 		// Support layout
 		if (this.layoutDimensions) {
@@ -339,7 +352,7 @@ export class QuickOpenWidget implements IModelProvider {
 		this.applyStyles();
 
 		// Allows focus to switch to next/previous entry after tab into an actionbar item
-		DOM.addDisposableListener(this.treeContainer.getHTMLElement(), DOM.EventType.KEY_DOWN, (e: KeyboardEvent) => {
+		this._register(DOM.addDisposableListener(this.treeContainer, DOM.EventType.KEY_DOWN, (e: KeyboardEvent) => {
 			const keyboardEvent: StandardKeyboardEvent = new StandardKeyboardEvent(e);
 			// Only handle when not in quick navigation mode
 			if (this.quickNavigateConfiguration) {
@@ -348,31 +361,32 @@ export class QuickOpenWidget implements IModelProvider {
 			if (keyboardEvent.keyCode === KeyCode.DownArrow || keyboardEvent.keyCode === KeyCode.UpArrow || keyboardEvent.keyCode === KeyCode.PageDown || keyboardEvent.keyCode === KeyCode.PageUp) {
 				DOM.EventHelper.stop(e, true);
 				this.navigateInTree(keyboardEvent.keyCode, keyboardEvent.shiftKey);
-				this.inputBox.inputElement.focus();
+				this.treeElement.focus();
 			}
-		});
-		return this.builder.getHTMLElement();
+		}));
+
+		return this.element;
 	}
 
-	public style(styles: IQuickOpenStyles): void {
+	style(styles: IQuickOpenStyles): void {
 		this.styles = styles;
 
 		this.applyStyles();
 	}
 
 	protected applyStyles(): void {
-		if (this.builder) {
+		if (this.element) {
 			const foreground = this.styles.foreground ? this.styles.foreground.toString() : null;
 			const background = this.styles.background ? this.styles.background.toString() : null;
 			const borderColor = this.styles.borderColor ? this.styles.borderColor.toString() : null;
 			const widgetShadow = this.styles.widgetShadow ? this.styles.widgetShadow.toString() : null;
 
-			this.builder.style('color', foreground);
-			this.builder.style('background-color', background);
-			this.builder.style('border-color', borderColor);
-			this.builder.style('border-width', borderColor ? '1px' : null);
-			this.builder.style('border-style', borderColor ? 'solid' : null);
-			this.builder.style('box-shadow', widgetShadow ? `0 5px 8px ${widgetShadow}` : null);
+			this.element.style.color = foreground;
+			this.element.style.backgroundColor = background;
+			this.element.style.borderColor = borderColor;
+			this.element.style.borderWidth = borderColor ? '1px' : null;
+			this.element.style.borderStyle = borderColor ? 'solid' : null;
+			this.element.style.boxShadow = widgetShadow ? `0 5px 8px ${widgetShadow}` : null;
 		}
 
 		if (this.progressBar) {
@@ -387,10 +401,13 @@ export class QuickOpenWidget implements IModelProvider {
 				inputForeground: this.styles.inputForeground,
 				inputBorder: this.styles.inputBorder,
 				inputValidationInfoBackground: this.styles.inputValidationInfoBackground,
+				inputValidationInfoForeground: this.styles.inputValidationInfoForeground,
 				inputValidationInfoBorder: this.styles.inputValidationInfoBorder,
 				inputValidationWarningBackground: this.styles.inputValidationWarningBackground,
+				inputValidationWarningForeground: this.styles.inputValidationWarningForeground,
 				inputValidationWarningBorder: this.styles.inputValidationWarningBorder,
 				inputValidationErrorBackground: this.styles.inputValidationErrorBackground,
+				inputValidationErrorForeground: this.styles.inputValidationErrorForeground,
 				inputValidationErrorBorder: this.styles.inputValidationErrorBorder
 			});
 		}
@@ -432,9 +449,9 @@ export class QuickOpenWidget implements IModelProvider {
 		// Adjust help text as needed if present
 		if (this.helpText) {
 			if (value) {
-				this.helpText.hide();
+				DOM.hide(this.helpText);
 			} else {
-				this.helpText.show();
+				DOM.show(this.helpText);
 			}
 		}
 
@@ -442,7 +459,7 @@ export class QuickOpenWidget implements IModelProvider {
 		this.callbacks.onType(value);
 	}
 
-	public navigate(next: boolean, quickNavigate?: IQuickNavigateConfiguration): void {
+	navigate(next: boolean, quickNavigate?: IQuickNavigateConfiguration): void {
 		if (this.isVisible()) {
 
 			// Transition into quick navigate mode if not yet done
@@ -507,7 +524,7 @@ export class QuickOpenWidget implements IModelProvider {
 		// Reveal
 		newFocus = this.tree.getFocus();
 		if (newFocus) {
-			this.tree.reveal(newFocus).done(null, errors.onUnexpectedError);
+			this.tree.reveal(newFocus);
 		}
 	}
 
@@ -548,33 +565,33 @@ export class QuickOpenWidget implements IModelProvider {
 		};
 	}
 
-	public show(prefix: string, options?: IShowOptions): void;
-	public show(input: IModel<any>, options?: IShowOptions): void;
-	public show(param: any, options?: IShowOptions): void {
+	show(prefix: string, options?: IShowOptions): void;
+	show(input: IModel<any>, options?: IShowOptions): void;
+	show(param: any, options?: IShowOptions): void {
 		this.visible = true;
 		this.isLoosingFocus = false;
 		this.quickNavigateConfiguration = options ? options.quickNavigateConfiguration : void 0;
 
 		// Adjust UI for quick navigate mode
 		if (this.quickNavigateConfiguration) {
-			this.inputContainer.hide();
-			this.builder.show();
+			DOM.hide(this.inputContainer);
+			DOM.show(this.element);
 			this.tree.domFocus();
 		}
 
 		// Otherwise use normal UI
 		else {
-			this.inputContainer.show();
-			this.builder.show();
+			DOM.show(this.inputContainer);
+			DOM.show(this.element);
 			this.inputBox.focus();
 		}
 
 		// Adjust Help text for IE
 		if (this.helpText) {
 			if (this.quickNavigateConfiguration || types.isString(param)) {
-				this.helpText.hide();
+				DOM.hide(this.helpText);
 			} else {
-				this.helpText.show();
+				DOM.show(this.helpText);
 			}
 		}
 
@@ -605,7 +622,7 @@ export class QuickOpenWidget implements IModelProvider {
 	}
 
 	private setInputAndLayout(input: IModel<any>, autoFocus: IAutoFocus): void {
-		this.treeContainer.style({ height: `${this.getHeight(input)}px` });
+		this.treeContainer.style.height = `${this.getHeight(input)}px`;
 
 		this.tree.setInput(null).then(() => {
 			this.model = input;
@@ -614,16 +631,19 @@ export class QuickOpenWidget implements IModelProvider {
 			this.inputElement.setAttribute('aria-haspopup', String(input && input.entries && input.entries.length > 0));
 
 			return this.tree.setInput(input);
-		}).done(() => {
+		}).then(() => {
 
 			// Indicate entries to tree
 			this.tree.layout();
 
+			const entries = input ? input.entries.filter(e => this.isElementVisible(input, e)) : [];
+			this.updateResultCount(entries.length);
+
 			// Handle auto focus
-			if (input && input.entries.some(e => this.isElementVisible(input, e))) {
-				this.autoFocus(input, autoFocus);
+			if (entries.length) {
+				this.autoFocus(input, entries, autoFocus);
 			}
-		}, errors.onUnexpectedError);
+		});
 	}
 
 	private isElementVisible<T>(input: IModel<T>, e: T): boolean {
@@ -634,8 +654,7 @@ export class QuickOpenWidget implements IModelProvider {
 		return input.filter.isVisible(e);
 	}
 
-	private autoFocus(input: IModel<any>, autoFocus: IAutoFocus = {}): void {
-		const entries = input.entries.filter(e => this.isElementVisible(input, e));
+	private autoFocus(input: IModel<any>, entries: any[], autoFocus: IAutoFocus = {}): void {
 
 		// First check for auto focus of prefix matches
 		if (autoFocus.autoFocusPrefixMatch) {
@@ -661,7 +680,7 @@ export class QuickOpenWidget implements IModelProvider {
 			const entryToFocus = caseSensitiveMatch || caseInsensitiveMatch;
 			if (entryToFocus) {
 				this.tree.setFocus(entryToFocus);
-				this.tree.reveal(entryToFocus, 0.5).done(null, errors.onUnexpectedError);
+				this.tree.reveal(entryToFocus, 0.5);
 
 				return;
 			}
@@ -670,14 +689,14 @@ export class QuickOpenWidget implements IModelProvider {
 		// Second check for auto focus of first entry
 		if (autoFocus.autoFocusFirstEntry) {
 			this.tree.focusFirst();
-			this.tree.reveal(this.tree.getFocus()).done(null, errors.onUnexpectedError);
+			this.tree.reveal(this.tree.getFocus());
 		}
 
 		// Third check for specific index option
 		else if (typeof autoFocus.autoFocusIndex === 'number') {
 			if (entries.length > autoFocus.autoFocusIndex) {
 				this.tree.focusNth(autoFocus.autoFocusIndex);
-				this.tree.reveal(this.tree.getFocus()).done(null, errors.onUnexpectedError);
+				this.tree.reveal(this.tree.getFocus());
 			}
 		}
 
@@ -696,7 +715,7 @@ export class QuickOpenWidget implements IModelProvider {
 		}
 	}
 
-	public refresh(input?: IModel<any>, autoFocus?: IAutoFocus): void {
+	refresh(input?: IModel<any>, autoFocus?: IAutoFocus): void {
 		if (!this.isVisible()) {
 			return;
 		}
@@ -710,20 +729,22 @@ export class QuickOpenWidget implements IModelProvider {
 		}
 
 		// Apply height & Refresh
-		this.treeContainer.style({ height: `${this.getHeight(input)}px` });
-		this.tree.refresh().done(() => {
+		this.treeContainer.style.height = `${this.getHeight(input)}px`;
+		this.tree.refresh().then(() => {
 
 			// Indicate entries to tree
 			this.tree.layout();
 
+			const entries = input ? input.entries.filter(e => this.isElementVisible(input, e)) : [];
+			this.updateResultCount(entries.length);
+
 			// Handle auto focus
 			if (autoFocus) {
-				let doAutoFocus = autoFocus && input && input.entries.some(e => this.isElementVisible(input, e));
-				if (doAutoFocus) {
-					this.autoFocus(input, autoFocus);
+				if (entries.length) {
+					this.autoFocus(input, entries, autoFocus);
 				}
 			}
-		}, errors.onUnexpectedError);
+		});
 	}
 
 	private getHeight(input: IModel<any>): number {
@@ -760,14 +781,18 @@ export class QuickOpenWidget implements IModelProvider {
 		return height;
 	}
 
-	public hide(reason?: HideReason): void {
+	updateResultCount(count: number) {
+		this.resultCount.textContent = nls.localize({ key: 'quickInput.visibleCount', comment: ['This tells the user how many items are shown in a list of items to select from. The items can be anything. Currently not visible, but read by screen readers.'] }, "{0} Results", count);
+	}
+
+	hide(reason?: HideReason): void {
 		if (!this.isVisible()) {
 			return;
 		}
 
 		this.visible = false;
-		this.builder.hide();
-		this.builder.domBlur();
+		DOM.hide(this.element);
+		this.element.blur();
 
 		// Clear input field and clear tree
 		this.inputBox.value = '';
@@ -777,7 +802,7 @@ export class QuickOpenWidget implements IModelProvider {
 		this.inputElement.setAttribute('aria-haspopup', 'false');
 
 		// Reset Tree Height
-		this.treeContainer.style({ height: (this.options.minItemsToShow ? this.options.minItemsToShow * 22 : 0) + 'px' });
+		this.treeContainer.style.height = `${this.options.minItemsToShow ? this.options.minItemsToShow * 22 : 0}px`;
 
 		// Clear any running Progress
 		this.progressBar.stop().hide();
@@ -801,17 +826,17 @@ export class QuickOpenWidget implements IModelProvider {
 		}
 	}
 
-	public getQuickNavigateConfiguration(): IQuickNavigateConfiguration {
+	getQuickNavigateConfiguration(): IQuickNavigateConfiguration {
 		return this.quickNavigateConfiguration;
 	}
 
-	public setPlaceHolder(placeHolder: string): void {
+	setPlaceHolder(placeHolder: string): void {
 		if (this.inputBox) {
 			this.inputBox.setPlaceHolder(placeHolder);
 		}
 	}
 
-	public setValue(value: string, selectionOrStableHint?: [number, number] | null): void {
+	setValue(value: string, selectionOrStableHint?: [number, number] | null): void {
 		if (this.inputBox) {
 			this.inputBox.value = value;
 			if (selectionOrStableHint === null) {
@@ -825,13 +850,13 @@ export class QuickOpenWidget implements IModelProvider {
 		}
 	}
 
-	public setPassword(isPassword: boolean): void {
+	setPassword(isPassword: boolean): void {
 		if (this.inputBox) {
 			this.inputBox.inputElement.type = isPassword ? 'password' : 'text';
 		}
 	}
 
-	public setInput(input: IModel<any>, autoFocus: IAutoFocus, ariaLabel?: string): void {
+	setInput(input: IModel<any>, autoFocus: IAutoFocus, ariaLabel?: string): void {
 		if (!this.isVisible()) {
 			return;
 		}
@@ -858,35 +883,35 @@ export class QuickOpenWidget implements IModelProvider {
 
 		// when the input is changing in quick open, we indicate this as CSS class to the widget
 		// for a certain timeout. this helps reducing some hectic UI updates when input changes quickly
-		this.builder.addClass('content-changing');
+		DOM.addClass(this.element, 'content-changing');
 		this.inputChangingTimeoutHandle = setTimeout(() => {
-			this.builder.removeClass('content-changing');
+			DOM.removeClass(this.element, 'content-changing');
 		}, 500);
 	}
 
-	public getInput(): IModel<any> {
+	getInput(): IModel<any> {
 		return this.tree.getInput();
 	}
 
-	public showInputDecoration(decoration: Severity): void {
+	showInputDecoration(decoration: Severity): void {
 		if (this.inputBox) {
 			this.inputBox.showMessage({ type: decoration === Severity.Info ? MessageType.INFO : decoration === Severity.Warning ? MessageType.WARNING : MessageType.ERROR, content: '' });
 		}
 	}
 
-	public clearInputDecoration(): void {
+	clearInputDecoration(): void {
 		if (this.inputBox) {
 			this.inputBox.hideMessage();
 		}
 	}
 
-	public focus(): void {
+	focus(): void {
 		if (this.isVisible() && this.inputBox) {
 			this.inputBox.focus();
 		}
 	}
 
-	public accept(): void {
+	accept(): void {
 		if (this.isVisible()) {
 			const focus = this.tree.getFocus();
 			if (focus) {
@@ -895,49 +920,45 @@ export class QuickOpenWidget implements IModelProvider {
 		}
 	}
 
-	public getProgressBar(): ProgressBar {
+	getProgressBar(): ProgressBar {
 		return this.progressBar;
 	}
 
-	public getInputBox(): InputBox {
+	getInputBox(): InputBox {
 		return this.inputBox;
 	}
 
-	public setExtraClass(clazz: string): void {
-		const previousClass = this.builder.getProperty('extra-class');
+	setExtraClass(clazz: string): void {
+		const previousClass = this.element.getAttribute('quick-open-extra-class');
 		if (previousClass) {
-			this.builder.removeClass(previousClass);
+			DOM.removeClasses(this.element, previousClass);
 		}
 
 		if (clazz) {
-			this.builder.addClass(clazz);
-			this.builder.setProperty('extra-class', clazz);
+			DOM.addClasses(this.element, clazz);
+			this.element.setAttribute('quick-open-extra-class', clazz);
 		} else if (previousClass) {
-			this.builder.removeProperty('extra-class');
+			this.element.removeAttribute('quick-open-extra-class');
 		}
 	}
 
-	public isVisible(): boolean {
+	isVisible(): boolean {
 		return this.visible;
 	}
 
-	public layout(dimension: DOM.Dimension): void {
+	layout(dimension: DOM.Dimension): void {
 		this.layoutDimensions = dimension;
 
 		// Apply to quick open width (height is dynamic by number of items to show)
 		const quickOpenWidth = Math.min(this.layoutDimensions.width * 0.62 /* golden cut */, QuickOpenWidget.MAX_WIDTH);
-		if (this.builder) {
+		if (this.element) {
 
 			// quick open
-			this.builder.style({
-				width: quickOpenWidth + 'px',
-				marginLeft: '-' + (quickOpenWidth / 2) + 'px'
-			});
+			this.element.style.width = `${quickOpenWidth}px`;
+			this.element.style.marginLeft = `-${quickOpenWidth / 2}px`;
 
 			// input field
-			this.inputContainer.style({
-				width: (quickOpenWidth - 12) + 'px'
-			});
+			this.inputContainer.style.width = `${quickOpenWidth - 12}px`;
 		}
 	}
 
@@ -951,16 +972,13 @@ export class QuickOpenWidget implements IModelProvider {
 		}
 
 		const relatedTarget = e.relatedTarget as HTMLElement;
-		if (!this.quickNavigateConfiguration && DOM.isAncestor(relatedTarget, this.builder.getHTMLElement())) {
+		if (!this.quickNavigateConfiguration && DOM.isAncestor(relatedTarget, this.element)) {
 			return; // user clicked somewhere into quick open widget, do not close thereby
 		}
 
 		this.isLoosingFocus = true;
-		TPromise.timeout(0).then(() => {
-			if (!this.isLoosingFocus) {
-				return;
-			}
-			if (this.isDisposed) {
+		setTimeout(() => {
+			if (!this.isLoosingFocus || this.isDisposed) {
 				return;
 			}
 
@@ -968,15 +986,12 @@ export class QuickOpenWidget implements IModelProvider {
 			if (!veto) {
 				this.hide(HideReason.FOCUS_LOST);
 			}
-		});
+		}, 0);
 	}
 
-	public dispose(): void {
-		this.isDisposed = true;
-		this.toUnbind = dispose(this.toUnbind);
+	dispose(): void {
+		super.dispose();
 
-		this.progressBar.dispose();
-		this.inputBox.dispose();
-		this.tree.dispose();
+		this.isDisposed = true;
 	}
 }
diff --git a/src/vs/base/parts/quickopen/browser/quickopen.css b/src/vs/base/parts/quickopen/browser/quickopen.css
index 97ef9224d98..97ddd6aab12 100644
--- a/src/vs/base/parts/quickopen/browser/quickopen.css
+++ b/src/vs/base/parts/quickopen/browser/quickopen.css
@@ -35,6 +35,11 @@
 	height: 25px;
 }
 
+.monaco-quick-open-widget .quick-open-result-count {
+	position: absolute;
+	left: -10000px;
+}
+
 .monaco-quick-open-widget .quick-open-tree {
 	line-height: 22px;
 }
diff --git a/src/vs/base/parts/quickopen/common/quickOpen.ts b/src/vs/base/parts/quickopen/common/quickOpen.ts
index 70be0054a75..dab2e522abb 100644
--- a/src/vs/base/parts/quickopen/common/quickOpen.ts
+++ b/src/vs/base/parts/quickopen/common/quickOpen.ts
@@ -41,7 +41,7 @@ export interface IAutoFocus {
 	autoFocusPrefixMatch?: string;
 }
 
-export enum Mode {
+export const enum Mode {
 	PREVIEW,
 	OPEN,
 	OPEN_IN_BACKGROUND
diff --git a/src/vs/base/parts/quickopen/test/common/quickOpenScorer.test.ts b/src/vs/base/parts/quickopen/test/common/quickOpenScorer.test.ts
index 29e70e70ca1..6f071535738 100644
--- a/src/vs/base/parts/quickopen/test/common/quickOpenScorer.test.ts
+++ b/src/vs/base/parts/quickopen/test/common/quickOpenScorer.test.ts
@@ -7,7 +7,7 @@
 
 import * as assert from 'assert';
 import * as scorer from 'vs/base/parts/quickopen/common/quickOpenScorer';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { basename, dirname, nativeSep } from 'vs/base/common/paths';
 import { isWindows } from 'vs/base/common/platform';
 
diff --git a/src/vs/base/parts/tree/browser/tree.ts b/src/vs/base/parts/tree/browser/tree.ts
index 4c7519d7790..47ffadcf0f0 100644
--- a/src/vs/base/parts/tree/browser/tree.ts
+++ b/src/vs/base/parts/tree/browser/tree.ts
@@ -25,6 +25,7 @@ export interface ITree {
 	onDidExpandItem: Event<IItemExpandEvent>;
 	onDidCollapseItem: Event<IItemCollapseEvent>;
 	onDidDispose: Event<void>;
+	onDidScroll: Event<void>;
 
 	/**
 	 * Returns the tree's DOM element.
@@ -108,13 +109,6 @@ export interface ITree {
 	 */
 	collapseAll(elements?: any[], recursive?: boolean): WinJS.Promise;
 
-	/**
-	 * Collapses several elements.
-	 * Collapses all elements at the greatest tree depth that has expanded elements.
-	 * The returned promise returns a boolean for whether the elements were collapsed or not.
-	 */
-	collapseDeepestExpandedLevel(): WinJS.Promise;
-
 	/**
 	 * Toggles an element's expansion state.
 	 */
@@ -148,6 +142,11 @@ export interface ITree {
 	 */
 	getRelativeTop(element: any): number;
 
+	/**
+	 * Returns the top-most visible element.
+	 */
+	getFirstVisibleElement(): any;
+
 	/**
 	 * Returns a number between 0 and 1 representing how much the tree is scroll down. 0 means all the way
 	 * to the top; 1 means all the way down.
@@ -365,6 +364,10 @@ export interface IDataSource {
 	/**
 	 * Returns the unique identifier of the given element.
 	 * No more than one element may use a given identifier.
+	 *
+	 * You should not attempt to "move" an element to a different
+	 * parent by keeping its ID. The idea here is to have tree location
+	 * related IDs (eg. full file path, in the Explorer example).
 	 */
 	getId(tree: ITree, element: any): string;
 
@@ -563,12 +566,12 @@ export interface IController {
 	onMouseUp?(tree: ITree, element: any, event: Mouse.IMouseEvent): boolean;
 }
 
-export enum DragOverEffect {
+export const enum DragOverEffect {
 	COPY,
 	MOVE
 }
 
-export enum DragOverBubble {
+export const enum DragOverBubble {
 	BUBBLE_DOWN,
 	BUBBLE_UP
 }
diff --git a/src/vs/base/parts/tree/browser/treeDefaults.ts b/src/vs/base/parts/tree/browser/treeDefaults.ts
index 7e9a7a682a4..b990157fe81 100644
--- a/src/vs/base/parts/tree/browser/treeDefaults.ts
+++ b/src/vs/base/parts/tree/browser/treeDefaults.ts
@@ -25,7 +25,7 @@ export interface ICancelableEvent {
 	stopPropagation(): void;
 }
 
-export enum ClickBehavior {
+export const enum ClickBehavior {
 
 	/**
 	 * Handle the click when the mouse button is pressed but not released yet.
@@ -38,7 +38,7 @@ export enum ClickBehavior {
 	ON_MOUSE_UP
 }
 
-export enum OpenMode {
+export const enum OpenMode {
 	SINGLE_CLICK,
 	DOUBLE_CLICK
 }
@@ -134,6 +134,10 @@ export class DefaultController implements _.IController {
 					return false; // Ignore event if target is a form input field (avoids browser specific issues)
 				}
 
+				if (dom.findParentWithClass(event.target, 'scrollbar', 'monaco-tree')) {
+					return false;
+				}
+
 				if (dom.findParentWithClass(event.target, 'monaco-action-bar', 'row')) { // TODO@Joao not very nice way of checking for the action bar (implicit knowledge)
 					return false; // Ignore event if target is over an action bar of the row
 				}
@@ -168,17 +172,16 @@ export class DefaultController implements _.IController {
 	}
 
 	protected onLeftClick(tree: _.ITree, element: any, eventish: ICancelableEvent, origin: string = 'mouse'): boolean {
-		const payload = { origin: origin, originalEvent: eventish };
 		const event = <mouse.IMouseEvent>eventish;
-		const isDoubleClick = (origin === 'mouse' && event.detail === 2);
+		const payload = { origin: origin, originalEvent: eventish, didClickOnTwistie: this.isClickOnTwistie(event) };
 
 		if (tree.getInput() === element) {
 			tree.clearFocus(payload);
 			tree.clearSelection(payload);
 		} else {
-			const isMouseDown = eventish && event.browserEvent && event.browserEvent.type === 'mousedown';
-			if (!isMouseDown) {
-				eventish.preventDefault(); // we cannot preventDefault onMouseDown because this would break DND otherwise
+			const isSingleMouseDown = eventish && event.browserEvent && event.browserEvent.type === 'mousedown' && event.browserEvent.detail === 1;
+			if (!isSingleMouseDown) {
+				eventish.preventDefault(); // we cannot preventDefault onMouseDown with single click because this would break DND otherwise
 			}
 			eventish.stopPropagation();
 
@@ -186,11 +189,11 @@ export class DefaultController implements _.IController {
 			tree.setSelection([element], payload);
 			tree.setFocus(element, payload);
 
-			if (this.openOnSingleClick || isDoubleClick || this.isClickOnTwistie(event)) {
+			if (this.shouldToggleExpansion(element, event, origin)) {
 				if (tree.isExpanded(element)) {
-					tree.collapse(element).done(null, errors.onUnexpectedError);
+					tree.collapse(element).then(null, errors.onUnexpectedError);
 				} else {
-					tree.expand(element).done(null, errors.onUnexpectedError);
+					tree.expand(element).then(null, errors.onUnexpectedError);
 				}
 			}
 		}
@@ -198,6 +201,11 @@ export class DefaultController implements _.IController {
 		return true;
 	}
 
+	protected shouldToggleExpansion(element: any, event: mouse.IMouseEvent, origin: string): boolean {
+		const isDoubleClick = (origin === 'mouse' && event.detail === 2);
+		return this.openOnSingleClick || isDoubleClick || this.isClickOnTwistie(event);
+	}
+
 	protected setOpenMode(openMode: OpenMode) {
 		this.options.openMode = openMode;
 	}
@@ -207,13 +215,20 @@ export class DefaultController implements _.IController {
 	}
 
 	protected isClickOnTwistie(event: mouse.IMouseEvent): boolean {
-		const target = event.target as HTMLElement;
+		let element = event.target as HTMLElement;
 
-		// There is no way to find out if the ::before element is clicked where
-		// the twistie is drawn, but the <div class="content"> element in the
-		// tree item is the only thing we get back as target when the user clicks
-		// on the twistie.
-		return target && dom.hasClass(target, 'content') && dom.hasClass(target.parentElement, 'monaco-tree-row');
+		if (!dom.hasClass(element, 'content')) {
+			return false;
+		}
+
+		const twistieStyle = window.getComputedStyle(element, ':before');
+
+		if (twistieStyle.backgroundImage === 'none' || twistieStyle.display === 'none') {
+			return false;
+		}
+
+		const twistieWidth = parseInt(twistieStyle.width) + parseInt(twistieStyle.paddingRight);
+		return event.browserEvent.offsetX <= twistieWidth;
 	}
 
 	public onContextMenu(tree: _.ITree, element: any, event: _.ContextMenuEvent): boolean {
@@ -267,7 +282,7 @@ export class DefaultController implements _.IController {
 			tree.clearHighlight(payload);
 		} else {
 			tree.focusPrevious(1, payload);
-			tree.reveal(tree.getFocus()).done(null, errors.onUnexpectedError);
+			tree.reveal(tree.getFocus()).then(null, errors.onUnexpectedError);
 		}
 		return true;
 	}
@@ -279,7 +294,7 @@ export class DefaultController implements _.IController {
 			tree.clearHighlight(payload);
 		} else {
 			tree.focusPreviousPage(payload);
-			tree.reveal(tree.getFocus()).done(null, errors.onUnexpectedError);
+			tree.reveal(tree.getFocus()).then(null, errors.onUnexpectedError);
 		}
 		return true;
 	}
@@ -291,7 +306,7 @@ export class DefaultController implements _.IController {
 			tree.clearHighlight(payload);
 		} else {
 			tree.focusNext(1, payload);
-			tree.reveal(tree.getFocus()).done(null, errors.onUnexpectedError);
+			tree.reveal(tree.getFocus()).then(null, errors.onUnexpectedError);
 		}
 		return true;
 	}
@@ -303,7 +318,7 @@ export class DefaultController implements _.IController {
 			tree.clearHighlight(payload);
 		} else {
 			tree.focusNextPage(payload);
-			tree.reveal(tree.getFocus()).done(null, errors.onUnexpectedError);
+			tree.reveal(tree.getFocus()).then(null, errors.onUnexpectedError);
 		}
 		return true;
 	}
@@ -315,7 +330,7 @@ export class DefaultController implements _.IController {
 			tree.clearHighlight(payload);
 		} else {
 			tree.focusFirst(payload);
-			tree.reveal(tree.getFocus()).done(null, errors.onUnexpectedError);
+			tree.reveal(tree.getFocus()).then(null, errors.onUnexpectedError);
 		}
 		return true;
 	}
@@ -327,7 +342,7 @@ export class DefaultController implements _.IController {
 			tree.clearHighlight(payload);
 		} else {
 			tree.focusLast(payload);
-			tree.reveal(tree.getFocus()).done(null, errors.onUnexpectedError);
+			tree.reveal(tree.getFocus()).then(null, errors.onUnexpectedError);
 		}
 		return true;
 	}
@@ -345,7 +360,7 @@ export class DefaultController implements _.IController {
 					return tree.reveal(tree.getFocus());
 				}
 				return undefined;
-			}).done(null, errors.onUnexpectedError);
+			}).then(null, errors.onUnexpectedError);
 		}
 		return true;
 	}
@@ -363,7 +378,7 @@ export class DefaultController implements _.IController {
 					return tree.reveal(tree.getFocus());
 				}
 				return undefined;
-			}).done(null, errors.onUnexpectedError);
+			}).then(null, errors.onUnexpectedError);
 		}
 		return true;
 	}
diff --git a/src/vs/base/parts/tree/browser/treeImpl.ts b/src/vs/base/parts/tree/browser/treeImpl.ts
index 9bf15a04c97..dc008d1eede 100644
--- a/src/vs/base/parts/tree/browser/treeImpl.ts
+++ b/src/vs/base/parts/tree/browser/treeImpl.ts
@@ -119,6 +119,10 @@ export class Tree implements _.ITree {
 		return this.view && this.view.onDOMBlur;
 	}
 
+	get onDidScroll(): Event<void> {
+		return this.view && this.view.onDidScroll;
+	}
+
 	public getHTMLElement(): HTMLElement {
 		return this.view.getHTMLElement();
 	}
@@ -180,10 +184,6 @@ export class Tree implements _.ITree {
 		return this.model.collapseAll(elements, recursive);
 	}
 
-	public collapseDeepestExpandedLevel(): WinJS.Promise {
-		return this.model.collapseDeepestExpandedLevel();
-	}
-
 	public toggleExpansion(element: any, recursive: boolean = false): WinJS.Promise {
 		return this.model.toggleExpansion(element, recursive);
 	}
@@ -209,6 +209,14 @@ export class Tree implements _.ITree {
 		return this.view.getRelativeTop(item);
 	}
 
+	public getFirstVisibleElement(): any {
+		return this.view.getFirstVisibleElement();
+	}
+
+	public getLastVisibleElement(): any {
+		return this.view.getLastVisibleElement();
+	}
+
 	public getScrollPosition(): number {
 		return this.view.getScrollPosition();
 	}
diff --git a/src/vs/base/parts/tree/browser/treeModel.ts b/src/vs/base/parts/tree/browser/treeModel.ts
index a9caa37d358..e40cf2a62bb 100644
--- a/src/vs/base/parts/tree/browser/treeModel.ts
+++ b/src/vs/base/parts/tree/browser/treeModel.ts
@@ -84,13 +84,11 @@ export class Lock {
 		var lock = this.getLock(item);
 
 		if (lock) {
-			var unbindListener: IDisposable;
-
 			return new WinJS.TPromise((c, e) => {
-				unbindListener = once(lock.onDispose)(() => {
+				once(lock.onDispose)(() => {
 					return this.run(item, fn).then(c, e);
 				});
-			}, () => { unbindListener.dispose(); });
+			});
 		}
 
 		var result: WinJS.Promise;
@@ -111,7 +109,7 @@ export class Lock {
 			}).then(c, e);
 
 			return result;
-		}, () => result.cancel());
+		});
 	}
 
 	private getLock(item: Item): LockData {
@@ -360,6 +358,10 @@ export class Item {
 		}
 
 		var result = this.lock.run(this, () => {
+			if (this.isExpanded() || !this.doesHaveChildren) {
+				return WinJS.TPromise.as(false);
+			}
+
 			var eventData: IItemExpandEvent = { item: this };
 			var result: WinJS.Promise;
 			this._onExpand.fire(eventData);
@@ -559,17 +561,6 @@ export class Item {
 		return result;
 	}
 
-	public getChildren(): Item[] {
-		var child = this.firstChild;
-		var results = [];
-		while (child) {
-			results.push(child);
-			child = child.next;
-		}
-
-		return results;
-	}
-
 	private isAncestorOf(item: Item): boolean {
 		while (item) {
 			if (item.id === this.id) {
@@ -1040,27 +1031,6 @@ export class TreeModel {
 		return WinJS.Promise.join(promises);
 	}
 
-	public collapseDeepestExpandedLevel(): WinJS.Promise {
-		var levelToCollapse = this.findDeepestExpandedLevel(this.input, 0);
-
-		var items = [this.input];
-		for (var i = 0; i < levelToCollapse; i++) {
-			items = arrays.flatten(items.map(node => node.getChildren()));
-		}
-
-		var promises = items.map(child => this.collapse(child, false));
-		return WinJS.Promise.join(promises);
-	}
-
-	private findDeepestExpandedLevel(item: Item, currentLevel: number): number {
-		var expandedChildren = item.getChildren().filter(child => child.isExpanded());
-		if (!expandedChildren.length) {
-			return currentLevel;
-		}
-
-		return Math.max(...expandedChildren.map(child => this.findDeepestExpandedLevel(child, currentLevel + 1)));
-	}
-
 	public toggleExpansion(element: any, recursive: boolean = false): WinJS.Promise {
 		return this.isExpanded(element) ? this.collapse(element, recursive) : this.expand(element);
 	}
diff --git a/src/vs/base/parts/tree/browser/treeUtils.ts b/src/vs/base/parts/tree/browser/treeUtils.ts
new file mode 100644
index 00000000000..7187ca1bd2a
--- /dev/null
+++ b/src/vs/base/parts/tree/browser/treeUtils.ts
@@ -0,0 +1,37 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+'use strict';
+
+import * as _ from 'vs/base/parts/tree/browser/tree';
+
+export function collapseAll(tree: _.ITree, except?: any): void {
+	const nav = tree.getNavigator();
+	let cur;
+	while (cur = nav.next()) {
+		if (!except || !isEqualOrParent(tree, except, cur)) {
+			tree.collapse(cur);
+		}
+	}
+}
+
+export function isEqualOrParent(tree: _.ITree, element: any, candidateParent: any): boolean {
+	const nav = tree.getNavigator(element);
+
+	do {
+		if (element === candidateParent) {
+			return true;
+		}
+	} while (element = nav.parent());
+
+	return false;
+}
+
+export function expandAll(tree: _.ITree): void {
+	const nav = tree.getNavigator();
+	let cur;
+	while (cur = nav.next()) {
+		tree.expand(cur);
+	}
+}
diff --git a/src/vs/base/parts/tree/browser/treeView.ts b/src/vs/base/parts/tree/browser/treeView.ts
index 177553e2089..05ee9f648b9 100644
--- a/src/vs/base/parts/tree/browser/treeView.ts
+++ b/src/vs/base/parts/tree/browser/treeView.ts
@@ -6,7 +6,6 @@
 
 import * as Platform from 'vs/base/common/platform';
 import * as Browser from 'vs/base/browser/browser';
-import * as WinJS from 'vs/base/common/winjs.base';
 import * as Lifecycle from 'vs/base/common/lifecycle';
 import * as DOM from 'vs/base/browser/dom';
 import * as Diff from 'vs/base/common/diff/diff';
@@ -25,7 +24,7 @@ import { KeyCode } from 'vs/base/common/keyCodes';
 import { Event, Emitter } from 'vs/base/common/event';
 import { DataTransfers } from 'vs/base/browser/dnd';
 import { DefaultTreestyler } from './treeDefaults';
-import { Delayer } from 'vs/base/common/async';
+import { Delayer, timeout } from 'vs/base/common/async';
 
 export interface IRow {
 	element: HTMLElement;
@@ -59,10 +58,19 @@ export class RowCache implements Lifecycle.IDisposable {
 			var row = document.createElement('div');
 			row.appendChild(content);
 
+			let templateData: any = null;
+
+			try {
+				templateData = this.context.renderer.renderTemplate(this.context.tree, templateId, content);
+			} catch (err) {
+				console.error('Tree usage error: exception while rendering template');
+				console.error(err);
+			}
+
 			result = {
 				element: row,
 				templateId: templateId,
-				templateData: this.context.renderer.renderTemplate(this.context.tree, templateId, content)
+				templateData
 			};
 		}
 
@@ -220,7 +228,7 @@ export class ViewItem implements IViewItem {
 			this.element.removeAttribute('id');
 		}
 		if (this.model.hasChildren()) {
-			this.element.setAttribute('aria-expanded', String(!!this.model.isExpanded()));
+			this.element.setAttribute('aria-expanded', String(!!this._styles['expanded']));
 		} else {
 			this.element.removeAttribute('aria-expanded');
 		}
@@ -260,7 +268,12 @@ export class ViewItem implements IViewItem {
 				this.element.style.width = 'fit-content';
 			}
 
-			this.context.renderer.renderElement(this.context.tree, this.model.getElement(), this.templateId, this.row.templateData);
+			try {
+				this.context.renderer.renderElement(this.context.tree, this.model.getElement(), this.templateId, this.row.templateData);
+			} catch (err) {
+				console.error('Tree usage error: exception while rendering element');
+				console.error(err);
+			}
 
 			if (this.context.horizontalScrolling) {
 				this.width = DOM.getContentWidth(this.element) + paddingLeft;
@@ -429,7 +442,7 @@ export class TreeView extends HeightMap {
 	private currentDropTarget: ViewItem;
 	private shouldInvalidateDropReaction: boolean;
 	private currentDropTargets: ViewItem[];
-	private currentDropPromise: WinJS.Promise;
+	private currentDropDisposable: Lifecycle.IDisposable = Lifecycle.Disposable.None;
 	private dragAndDropScrollInterval: number;
 	private dragAndDropScrollTimeout: number;
 	private dragAndDropMouseY: number;
@@ -445,6 +458,9 @@ export class TreeView extends HeightMap {
 	private readonly _onDOMBlur: Emitter<void> = new Emitter<void>();
 	get onDOMBlur(): Event<void> { return this._onDOMBlur.event; }
 
+	private readonly _onDidScroll: Emitter<void> = new Emitter<void>();
+	get onDidScroll(): Event<void> { return this._onDidScroll.event; }
+
 	constructor(context: _.ITreeContext, container: HTMLElement) {
 		super();
 
@@ -510,6 +526,7 @@ export class TreeView extends HeightMap {
 		});
 		this.scrollableElement.onScroll((e) => {
 			this.render(e.scrollTop, e.height, e.scrollLeft, e.width, e.scrollWidth);
+			this._onDidScroll.fire();
 		});
 
 		if (Browser.isIE) {
@@ -535,7 +552,6 @@ export class TreeView extends HeightMap {
 		this.viewListeners.push(DOM.addDisposableListener(this.domNode, 'mousedown', (e) => this.onMouseDown(e)));
 		this.viewListeners.push(DOM.addDisposableListener(this.domNode, 'mouseup', (e) => this.onMouseUp(e)));
 		this.viewListeners.push(DOM.addDisposableListener(this.wrapper, 'click', (e) => this.onClick(e)));
-		this.viewListeners.push(DOM.addDisposableListener(this.wrapper, 'auxclick', (e) => this.onClick(e))); // >= Chrome 56
 		this.viewListeners.push(DOM.addDisposableListener(this.domNode, 'contextmenu', (e) => this.onContextMenu(e)));
 		this.viewListeners.push(DOM.addDisposableListener(this.wrapper, Touch.EventType.Tap, (e) => this.onTap(e)));
 		this.viewListeners.push(DOM.addDisposableListener(this.wrapper, Touch.EventType.Change, (e) => this.onTouchChange(e)));
@@ -649,6 +665,27 @@ export class TreeView extends HeightMap {
 		}
 	}
 
+	public getFirstVisibleElement(): any {
+		const firstIndex = this.indexAt(this.lastRenderTop);
+		let item = this.itemAtIndex(firstIndex);
+		if (!item) {
+			return item;
+		}
+
+		const itemMidpoint = item.top + item.height / 2;
+		if (itemMidpoint < this.scrollTop) {
+			const nextItem = this.itemAtIndex(firstIndex + 1);
+			item = nextItem || item;
+		}
+
+		return item.model.getElement();
+	}
+
+	public getLastVisibleElement(): any {
+		const item = this.itemAtIndex(this.indexAt(this.lastRenderTop + this.lastRenderHeight - 1));
+		return item && item.model.getElement();
+	}
+
 	private render(scrollTop: number, viewHeight: number, scrollLeft: number, viewWidth: number, scrollWidth: number): void {
 		var i: number;
 		var stop: number;
@@ -1287,15 +1324,15 @@ export class TreeView extends HeightMap {
 
 		this.didJustPressContextMenuKey = event.keyCode === KeyCode.ContextMenu || (event.shiftKey && event.keyCode === KeyCode.F10);
 
+		if (event.target && event.target.tagName && event.target.tagName.toLowerCase() === 'input') {
+			return; // Ignore event if target is a form input field (avoids browser specific issues)
+		}
+
 		if (this.didJustPressContextMenuKey) {
 			event.preventDefault();
 			event.stopPropagation();
 		}
 
-		if (event.target && event.target.tagName && event.target.tagName.toLowerCase() === 'input') {
-			return; // Ignore event if target is a form input field (avoids browser specific issues)
-		}
-
 		this.context.controller.onKeyDown(this.context.tree, event);
 	}
 
@@ -1408,11 +1445,7 @@ export class TreeView extends HeightMap {
 
 				this.currentDropTargets.forEach(i => i.dropTarget = false);
 				this.currentDropTargets = [];
-
-				if (this.currentDropPromise) {
-					this.currentDropPromise.cancel();
-					this.currentDropPromise = null;
-				}
+				this.currentDropDisposable.dispose();
 			}
 
 			this.cancelDragAndDropScrollInterval();
@@ -1485,11 +1518,7 @@ export class TreeView extends HeightMap {
 			if (this.currentDropTarget) {
 				this.currentDropTargets.forEach(i => i.dropTarget = false);
 				this.currentDropTargets = [];
-
-				if (this.currentDropPromise) {
-					this.currentDropPromise.cancel();
-					this.currentDropPromise = null;
-				}
+				this.currentDropDisposable.dispose();
 			}
 
 			this.currentDropTarget = currentDropTarget;
@@ -1516,7 +1545,10 @@ export class TreeView extends HeightMap {
 				}
 
 				if (reaction.autoExpand) {
-					this.currentDropPromise = WinJS.TPromise.timeout(500)
+					const timeoutPromise = timeout(500);
+					this.currentDropDisposable = Lifecycle.toDisposable(() => timeoutPromise.cancel());
+
+					timeoutPromise
 						.then(() => this.context.tree.expand(this.currentDropElement))
 						.then(() => this.shouldInvalidateDropReaction = true);
 				}
@@ -1543,10 +1575,7 @@ export class TreeView extends HeightMap {
 			this.currentDropTargets = [];
 		}
 
-		if (this.currentDropPromise) {
-			this.currentDropPromise.cancel();
-			this.currentDropPromise = null;
-		}
+		this.currentDropDisposable.dispose();
 
 		this.cancelDragAndDropScrollInterval();
 		this.currentDragAndDropData = null;
diff --git a/src/vs/base/parts/tree/test/browser/treeModel.test.ts b/src/vs/base/parts/tree/test/browser/treeModel.test.ts
index b65060dec56..449100a6fed 100644
--- a/src/vs/base/parts/tree/test/browser/treeModel.test.ts
+++ b/src/vs/base/parts/tree/test/browser/treeModel.test.ts
@@ -12,6 +12,7 @@ import * as WinJS from 'vs/base/common/winjs.base';
 import * as model from 'vs/base/parts/tree/browser/treeModel';
 import * as TreeDefaults from 'vs/base/parts/tree/browser/treeDefaults';
 import { Event, Emitter } from 'vs/base/common/event';
+import { timeout } from 'vs/base/common/async';
 
 export class FakeRenderer {
 
@@ -613,23 +614,6 @@ suite('TreeModel - Expansion', () => {
 		});
 	});
 
-	test('collapseDeepestExpandedLevel', () => {
-		return model.setInput(SAMPLE.DEEP2).then(() => {
-			return model.expand(SAMPLE.DEEP2.children[0]).then(() => {
-				return model.expand(SAMPLE.DEEP2.children[0].children[0]).then(() => {
-
-					assert(model.isExpanded(SAMPLE.DEEP2.children[0]));
-					assert(model.isExpanded(SAMPLE.DEEP2.children[0].children[0]));
-
-					return model.collapseDeepestExpandedLevel().then(() => {
-						assert(model.isExpanded(SAMPLE.DEEP2.children[0]));
-						assert(!model.isExpanded(SAMPLE.DEEP2.children[0].children[0]));
-					});
-				});
-			});
-		});
-	});
-
 	test('auto expand single child folders', () => {
 		return model.setInput(SAMPLE.DEEP).then(() => {
 			return model.expand(SAMPLE.DEEP.children[0]).then(() => {
@@ -1339,7 +1323,7 @@ suite('TreeModel - Dynamic data model', () => {
 			dataModel.addChild('father', 'brother');
 			dataModel.addChild('mother', 'sister');
 
-			dataModel.promiseFactory = () => { return WinJS.TPromise.timeout(0); };
+			dataModel.promiseFactory = () => { return WinJS.TPromise.wrap(timeout(0)); };
 
 			var getTimes = 0;
 			var gotTimes = 0;
@@ -1600,7 +1584,7 @@ suite('TreeModel - Dynamic data model', () => {
 		return model.setInput('root').then(() => {
 
 			// delay expansions and refreshes
-			dataModel.promiseFactory = () => { return WinJS.TPromise.timeout(0); };
+			dataModel.promiseFactory = () => { return WinJS.TPromise.wrap(timeout(0)); };
 
 			var promises: WinJS.Promise[] = [];
 
@@ -1653,9 +1637,9 @@ suite('TreeModel - bugs', () => {
 		let listeners = <any>[];
 
 		// helpers
-		var getGetRootChildren = (children: string[], timeout = 0) => () => WinJS.TPromise.timeout(timeout).then(() => children);
+		var getGetRootChildren = (children: string[], millis = 0) => () => WinJS.TPromise.wrap(timeout(millis)).then(() => children);
 		var getRootChildren = getGetRootChildren(['homer', 'bart', 'lisa', 'marge', 'maggie'], 0);
-		var getGetBartChildren = (timeout = 0) => () => WinJS.TPromise.timeout(timeout).then(() => ['milhouse', 'nelson']);
+		var getGetBartChildren = (millis = 0) => () => WinJS.TPromise.wrap(timeout(millis)).then(() => ['milhouse', 'nelson']);
 		var getBartChildren = getGetBartChildren(0);
 
 		// item expanding should not exist!
diff --git a/src/vs/base/test/browser/builder.test.ts b/src/vs/base/test/browser/builder.test.ts
deleted file mode 100644
index d46dff04c97..00000000000
--- a/src/vs/base/test/browser/builder.test.ts
+++ /dev/null
@@ -1,1323 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-'use strict';
-
-import * as assert from 'assert';
-import { Builder, MultiBuilder, $, bindElement, withElement, setPropertyOnElement, getPropertyFromElement } from 'vs/base/browser/builder';
-import * as Types from 'vs/base/common/types';
-import * as DomUtils from 'vs/base/browser/dom';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { timeout } from 'vs/base/common/async';
-
-function withElementById(id: string, offdom?: boolean): Builder {
-	let element = document.getElementById(id);
-	if (element) {
-		return new Builder(element, offdom);
-	}
-
-	return null;
-}
-
-const Build = {
-	withElementById: withElementById
-};
-
-let withElementsBySelector = function (selector: string, offdom: boolean = false) {
-	let elements = window.document.querySelectorAll(selector);
-
-	let builders = [];
-	for (let i = 0; i < elements.length; i++) {
-		builders.push(new Builder(<HTMLElement>elements.item(i), offdom));
-	}
-
-	return new MultiBuilder(builders);
-};
-
-let withBuilder = function (builder: Builder, offdom: boolean) {
-	if (builder instanceof MultiBuilder) {
-		return new MultiBuilder(builder);
-	}
-
-	return new Builder(builder.getHTMLElement(), offdom);
-};
-
-function select(builder: Builder, selector: string, offdom?: boolean): MultiBuilder {
-	let elements = builder.getHTMLElement().querySelectorAll(selector);
-
-	let builders: Builder[] = [];
-	for (let i = 0; i < elements.length; i++) {
-		builders.push(withElement(<HTMLElement>elements.item(i), offdom));
-	}
-
-	return new MultiBuilder(builders);
-}
-
-suite('Builder', () => {
-	let fixture: HTMLElement;
-	let fixtureId = 'builder-fixture';
-
-	setup(() => {
-		fixture = document.createElement('div');
-		fixture.id = fixtureId;
-		document.body.appendChild(fixture);
-	});
-
-	teardown(() => {
-		document.body.removeChild(fixture);
-	});
-
-	test('Binding', function () {
-		let b = Build.withElementById(fixtureId, false);
-		let element = b.getHTMLElement();
-
-		assert(element);
-
-		// Properties
-		setPropertyOnElement(element, 'foo', 'bar');
-		assert.strictEqual(getPropertyFromElement(element, 'foo'), 'bar');
-
-		setPropertyOnElement(element, 'foo', { foo: 'bar' });
-		assert.deepEqual(getPropertyFromElement(element, 'foo'), { foo: 'bar' });
-
-		setPropertyOnElement(element, 'bar', 'bar');
-		assert.strictEqual(getPropertyFromElement(element, 'bar'), 'bar');
-
-		setPropertyOnElement(element, 'bar', { foo: 'bar' });
-		assert.deepEqual(getPropertyFromElement(element, 'bar'), { foo: 'bar' });
-	});
-
-	test('Select', function () {
-		let b = Build.withElementById(fixtureId, false);
-		assert(b);
-
-		let allDivs = withElementsBySelector('div');
-
-		assert(allDivs);
-		assert(allDivs.length >= 1);
-		assert(Types.isFunction(allDivs.push));
-		assert(allDivs instanceof MultiBuilder);
-
-		for (let key in b) {
-			if (b.hasOwnProperty(key) && Types.isFunction((b as any)[key])) {
-				assert(allDivs.hasOwnProperty(key));
-			}
-		}
-
-		let noElement = withElementsBySelector('#thiselementdoesnotexist');
-
-		assert(noElement);
-		assert(noElement.length === 0);
-		assert(Types.isFunction(noElement.push));
-		assert(noElement instanceof MultiBuilder);
-
-		for (let key in b) {
-			if (b.hasOwnProperty(key) && Types.isFunction((b as any)[key])) {
-				assert(noElement.hasOwnProperty(key));
-			}
-		}
-	});
-
-	test('Build.withElement()', function () {
-		let f = Build.withElementById(fixtureId, false);
-		let b = $(f.getHTMLElement());
-
-		b.addClass('foo');
-		assert(b.hasClass('foo'));
-
-		b.removeClass('foo');
-		assert(!b.hasClass('foo'));
-
-		assert.strictEqual(f.getHTMLElement(), document.getElementById(fixtureId));
-		assert.strictEqual(b.getHTMLElement(), document.getElementById(fixtureId));
-	});
-
-	test('Build.withBuilder()', function () {
-		let f = Build.withElementById(fixtureId, false);
-		let b = withBuilder(f, false);
-
-		b.addClass('foo');
-		assert(b.hasClass('foo'));
-
-		b.removeClass('foo');
-		assert(!b.hasClass('foo'));
-
-		assert.strictEqual(f.getHTMLElement(), document.getElementById(fixtureId));
-		assert.strictEqual(b.getHTMLElement(), document.getElementById(fixtureId));
-	});
-
-	test('Build.withBuilder() - Multibuilder', function () {
-		let f = withElementsBySelector('#' + fixtureId);
-		let b = withBuilder(f, false);
-
-		b.addClass('foo');
-		assert(b.hasClass('foo')[0]);
-
-		b.removeClass('foo');
-		assert(!b.hasClass('foo')[0]);
-	});
-
-	test('Build.offDOM()', function () {
-		let b = $();
-		assert(b);
-
-		b.div({
-			id: 'foobar'
-		}, function (div) {
-			div.span({
-				id: 'foobarspan',
-				innerHtml: 'foo bar'
-			});
-		});
-
-		assert(Build.withElementById('foobar') === null);
-
-		b.build(Build.withElementById(fixtureId, false));
-
-		assert(Build.withElementById('foobar'));
-		assert(Build.withElementById('foobarspan'));
-		assert.strictEqual(Build.withElementById('foobarspan').getHTMLElement().innerHTML, 'foo bar');
-	});
-
-	test('Build.withElementById()', function () {
-		let b = Build.withElementById(fixtureId, false);
-
-		b.addClass('foo');
-		assert(b.hasClass('foo'));
-
-		b.removeClass('foo');
-		assert(!b.hasClass('foo'));
-
-		assert.strictEqual(b.getHTMLElement(), document.getElementById(fixtureId));
-	});
-
-	test('withElementsBySelector()', function () {
-		let b = withElementsBySelector('#' + fixtureId, false);
-
-		b.addClass('foo');
-		assert(b.hasClass('foo')[0]);
-
-		b.removeClass('foo');
-		assert(!b.hasClass('foo')[0]);
-	});
-
-	test('Off DOM withElementById and container passed in', function () {
-		let b = Build.withElementById(fixtureId, true);
-		assert(b);
-		assert.strictEqual(b.getHTMLElement(), document.getElementById(fixtureId));
-
-		b.div({
-			id: 'foobar'
-		}, function (div) {
-			div.span({
-				id: 'foobarspan',
-				innerHtml: 'foo bar'
-			});
-		});
-
-		assert(Build.withElementById('foobar') === null);
-
-		b.build();
-
-		assert(Build.withElementById('foobar'));
-		assert(Build.withElementById('foobarspan'));
-		assert.strictEqual(Build.withElementById('foobarspan').getHTMLElement().innerHTML, 'foo bar');
-	});
-
-	test('Off DOM withSelector and container passed in', function () {
-		let b = withElementsBySelector('#' + fixtureId, true);
-		assert(b);
-
-		b.div({
-			id: 'foobar'
-		}, function (div) {
-			div.span({
-				id: 'foobarspan',
-				innerHtml: 'foo bar'
-			});
-		});
-
-		assert(Build.withElementById('foobar') === null);
-
-		b.build();
-
-		assert(Build.withElementById('foobar'));
-		assert(Build.withElementById('foobarspan'));
-		assert.strictEqual(Build.withElementById('foobarspan').getHTMLElement().innerHTML, 'foo bar');
-	});
-
-	test('Builder.build() with index specified', function () {
-		let b = Build.withElementById(fixtureId);
-		b.empty();
-		b.div({ id: '1' });
-		b.div({ id: '2' });
-		b.div({ id: '3' });
-
-		b = $();
-		b.div({ id: '4' });
-		b.build(Build.withElementById(fixtureId), 0);
-
-		b = Build.withElementById(fixtureId);
-		let divs = select(b, 'div');
-		assert.strictEqual(divs.length, 4);
-
-		let ids = divs.attr('id');
-		assert.strictEqual(ids.length, 4);
-		assert.strictEqual(ids[0], '4');
-		assert.strictEqual(ids[1], '1');
-		assert.strictEqual(ids[2], '2');
-		assert.strictEqual(ids[3], '3');
-
-		b = $();
-		b.div({ id: '5' });
-		b.build(Build.withElementById(fixtureId), 2);
-
-		b = Build.withElementById(fixtureId);
-		divs = select(b, 'div');
-		assert.strictEqual(divs.length, 5);
-
-		ids = divs.attr('id');
-		assert.strictEqual(ids.length, 5);
-		assert.strictEqual(ids[0], '4');
-		assert.strictEqual(ids[1], '1');
-		assert.strictEqual(ids[2], '5');
-		assert.strictEqual(ids[3], '2');
-		assert.strictEqual(ids[4], '3');
-	});
-
-	test('Builder.asContainer()', function () {
-		let f = Build.withElementById(fixtureId, false);
-		f.div({
-			id: 'foobar'
-		});
-
-		let divBuilder = f.asContainer();
-		divBuilder.span({
-			innerHtml: 'see man'
-		});
-	});
-
-	test('Builder.clone()', function () {
-		let b = Build.withElementById(fixtureId);
-
-		let clone = b.clone();
-		assert(clone);
-		assert(clone instanceof Builder);
-		assert.strictEqual(b.getHTMLElement(), clone.getHTMLElement());
-		assert.deepEqual(b, clone);
-
-		let multiB = withElementsBySelector('div');
-
-		let multiClone = multiB.clone();
-		assert(multiClone);
-	});
-
-	test('Builder Multibuilder fn call that returns Multibuilder', function () {
-		let b = Build.withElementById(fixtureId);
-		b.div(function (div: Builder) {
-			div.span();
-		});
-
-		b.div(function (div: Builder) {
-			div.span();
-		});
-
-		b.div(function (div: Builder) {
-			div.span();
-		});
-
-		let multiBuilder = select(Build.withElementById(fixtureId), 'div');
-		assert(multiBuilder.length === 3);
-	});
-
-	test('Builder.p() and other elements', function () {
-		let b = Build.withElementById(fixtureId);
-		b.empty();
-		b.div(function (div: Builder) {
-			assert(div !== b);
-			assert.strictEqual('div', div.getHTMLElement().nodeName.toLowerCase());
-
-			div.p(function (p: Builder) {
-				p.ul(function (ul: Builder) {
-					ul.li(function (li: Builder) {
-						li.span({
-							id: 'builderspan',
-							innerHtml: 'Foo Bar'
-						});
-
-						assert.strictEqual('span', li.getHTMLElement().nodeName.toLowerCase());
-
-						li.img({
-							id: 'builderimg',
-							src: '#'
-						});
-
-						assert.strictEqual('img', li.getHTMLElement().nodeName.toLowerCase());
-
-						li.a({
-							id: 'builderlink',
-							href: '#',
-							innerHtml: 'Link'
-						});
-
-						assert.strictEqual('a', li.getHTMLElement().nodeName.toLowerCase());
-					});
-				});
-			});
-
-			assert.strictEqual('p', div.getHTMLElement().nodeName.toLowerCase());
-		});
-
-		assert.strictEqual(select(Build.withElementById(fixtureId), 'div').length, 1);
-		assert.strictEqual(select(Build.withElementById(fixtureId), '*').length, 7);
-
-		assert.strictEqual(Build.withElementById('builderspan').getHTMLElement().innerHTML, 'Foo Bar');
-		assert.strictEqual(Build.withElementById('builderimg').attr('src'), '#');
-		assert.strictEqual(Build.withElementById('builderlink').attr('href'), '#');
-
-		// Assert HTML through DOM
-		let root = document.getElementById(fixtureId);
-		assert.strictEqual(root.childNodes.length, 1);
-
-		let div = root.childNodes[0];
-		assert.strictEqual('div', div.nodeName.toLowerCase());
-		assert.strictEqual(b.getHTMLElement(), div);
-		assert.strictEqual(div.childNodes.length, 1);
-
-		let p = div.childNodes[0];
-		assert.strictEqual('p', p.nodeName.toLowerCase());
-		assert.strictEqual(p.childNodes.length, 1);
-
-		let ul = p.childNodes[0];
-		assert.strictEqual('ul', ul.nodeName.toLowerCase());
-		assert.strictEqual(ul.childNodes.length, 1);
-
-		let li = ul.childNodes[0];
-		assert.strictEqual('li', li.nodeName.toLowerCase());
-		assert.strictEqual(li.childNodes.length, 3);
-
-		let span = <HTMLElement>li.childNodes[0];
-		assert.strictEqual('span', span.nodeName.toLowerCase());
-		assert.strictEqual(span.childNodes.length, 1);
-		assert.strictEqual(span.innerHTML, 'Foo Bar');
-
-		let img = <HTMLElement>li.childNodes[1];
-		assert.strictEqual('img', img.nodeName.toLowerCase());
-		assert.strictEqual(img.childNodes.length, 0);
-		assert.strictEqual(img.getAttribute('src'), '#');
-
-		let a = <HTMLElement>li.childNodes[2];
-		assert.strictEqual('a', a.nodeName.toLowerCase());
-		assert.strictEqual(a.childNodes.length, 1);
-		assert.strictEqual(a.getAttribute('href'), '#');
-		assert.strictEqual(a.innerHTML, 'Link');
-	});
-
-	test('Builder.p() and other elements', function () {
-		let b = Build.withElementById(fixtureId);
-		b.element('div', function (div: Builder) {
-			div.element('p', function (p: Builder) {
-				p.element('ul', function (ul: Builder) {
-					ul.element('li', function (li: Builder) {
-						li.element('span', {
-							id: 'builderspan',
-							innerHtml: 'Foo Bar'
-						});
-
-						li.element('img', {
-							id: 'builderimg',
-							src: '#'
-						});
-
-						li.element('a', {
-							id: 'builderlink',
-							href: '#',
-							innerHtml: 'Link'
-						});
-					});
-				});
-			});
-		});
-
-		assert.strictEqual(select(Build.withElementById(fixtureId), 'div').length, 1);
-		assert.strictEqual(select(Build.withElementById(fixtureId), '*').length, 7);
-
-		assert.strictEqual(Build.withElementById('builderspan').getHTMLElement().innerHTML, 'Foo Bar');
-		assert.strictEqual(Build.withElementById('builderimg').attr('src'), '#');
-		assert.strictEqual(Build.withElementById('builderlink').attr('href'), '#');
-	});
-
-	test('Builder.attr()', function () {
-		let b = Build.withElementById(fixtureId);
-		b.div();
-
-		assert(!b.attr('id'));
-		b.attr('id', 'foobar');
-		assert.strictEqual(b.attr('id'), 'foobar');
-
-		b.attr({
-			id: 'barfoo',
-			padding: [4, 3, 2, 1],
-			margin: '4px 3px 2px 1px'
-		});
-
-		assert.strictEqual(b.attr('id'), 'barfoo');
-		assert.strictEqual(b.getHTMLElement().getAttribute('id'), 'barfoo');
-		assert.strictEqual(b.style('margin-top'), '4px');
-		assert.strictEqual(b.getHTMLElement().style.marginTop, '4px');
-		assert.strictEqual(b.style('margin-right'), '3px');
-		assert.strictEqual(b.style('margin-bottom'), '2px');
-		assert.strictEqual(b.style('margin-left'), '1px');
-
-		assert.strictEqual(b.style('padding-top'), '4px');
-		assert.strictEqual(b.style('padding-right'), '3px');
-		assert.strictEqual(b.style('padding-bottom'), '2px');
-		assert.strictEqual(b.style('padding-left'), '1px');
-
-		b.attr({
-			padding: '1 2 3 4',
-			position: '100 200 300 400',
-			size: '200 300'
-		});
-
-		assert.strictEqual(b.style('padding-top'), '1px');
-		assert.strictEqual(b.style('padding-right'), '2px');
-		assert.strictEqual(b.style('padding-bottom'), '3px');
-		assert.strictEqual(b.style('padding-left'), '4px');
-
-		assert.strictEqual(b.style('top'), '100px');
-		assert.strictEqual(b.style('right'), '200px');
-		assert.strictEqual(b.style('bottom'), '300px');
-		assert.strictEqual(b.style('left'), '400px');
-
-		assert.strictEqual(b.style('width'), '200px');
-		assert.strictEqual(b.style('height'), '300px');
-	});
-
-	test('Builder.style()', function () {
-		let b = Build.withElementById(fixtureId);
-		b.div();
-
-		b.style('padding-bottom', '5px');
-		b.style('paddingTop', '4px');
-
-		assert.strictEqual(b.style('paddingBottom'), '5px');
-		assert.strictEqual(b.style('padding-bottom'), '5px');
-
-		assert.strictEqual(b.style('paddingTop'), '4px');
-		assert.strictEqual(b.style('padding-top'), '4px');
-	});
-
-	test('Builder.style() as object literal', function () {
-		let b = Build.withElementById(fixtureId);
-		b.div();
-
-		b.style({
-			'padding-bottom': '5px',
-			paddingTop: '4px',
-			border: '1px solid red'
-		});
-
-		assert.strictEqual(b.getHTMLElement().style.paddingBottom, '5px');
-
-		assert.strictEqual(b.style('paddingBottom'), '5px');
-		assert.strictEqual(b.style('padding-bottom'), '5px');
-
-		assert.strictEqual(b.style('paddingTop'), '4px');
-		assert.strictEqual(b.style('padding-top'), '4px');
-
-		assert.strictEqual(b.style('border-width'), '1px');
-		assert.strictEqual(b.style('border-style'), 'solid');
-		assert.strictEqual(b.style('border-color'), 'red');
-	});
-
-	test('Builder.attributes', function () {
-		let b = Build.withElementById(fixtureId);
-		b.div();
-
-		b.id('foobar');
-		b.title('foobar');
-		b.type('foobar');
-		b.value('foobar');
-		b.tabindex(0);
-
-		assert.strictEqual(b.attr('id'), 'foobar');
-		assert.strictEqual(b.attr('title'), 'foobar');
-		assert.strictEqual(b.attr('type'), 'foobar');
-		assert.strictEqual(b.attr('value'), 'foobar');
-		assert.strictEqual(b.attr('tabindex'), '0');
-
-		assert.strictEqual(b.getHTMLElement().getAttribute('id'), 'foobar');
-		assert.strictEqual(b.getHTMLElement().getAttribute('title'), 'foobar');
-		assert.strictEqual(b.getHTMLElement().getAttribute('type'), 'foobar');
-		assert.strictEqual(b.getHTMLElement().getAttribute('value'), 'foobar');
-		assert.strictEqual(b.getHTMLElement().getAttribute('tabindex'), '0');
-	});
-
-	test('Builder.addClass() and Co', function () {
-		let b = Build.withElementById(fixtureId);
-		b.div();
-
-		assert(!b.hasClass('foobar'));
-		assert(!b.getHTMLElement().className);
-		b.addClass('foobar');
-		assert(b.getComputedStyle());
-		assert(b.hasClass('foobar'));
-		assert.strictEqual(b.getHTMLElement().className, 'foobar');
-		b.removeClass('foobar');
-		assert(!b.hasClass('foobar'));
-		assert(!b.getHTMLElement().className);
-
-		assert(!b.hasClass('foobar'));
-		b.attr({ 'class': 'foobar' });
-		assert(b.hasClass('foobar'));
-		assert.strictEqual(b.getHTMLElement().className, 'foobar');
-		b.removeClass('foobar');
-		assert(!b.hasClass('foobar'));
-		assert(!b.getHTMLElement().className);
-
-		b.addClass('foobar').addClass('barfoo').addClass('foobar');
-		assert(b.hasClass('barfoo'));
-		assert(b.hasClass('foobar'));
-		b.removeClass('foobar').removeClass('barfoo');
-		assert(!b.hasClass('barfoo'));
-		assert(!b.hasClass('foobar'));
-		assert(!b.getHTMLElement().className);
-	});
-
-	test('Builder.padding() and .margin()', function () {
-		let b = Build.withElementById(fixtureId);
-		b.div();
-
-		b.padding(4, 3, 2, 1).margin(1, 2, 3, 4);
-
-		assert.strictEqual(b.style('padding-top'), '4px');
-		assert.strictEqual(b.style('padding-right'), '3px');
-		assert.strictEqual(b.style('padding-bottom'), '2px');
-		assert.strictEqual(b.style('padding-left'), '1px');
-
-		assert.strictEqual(b.style('margin-top'), '1px');
-		assert.strictEqual(b.style('margin-right'), '2px');
-		assert.strictEqual(b.style('margin-bottom'), '3px');
-		assert.strictEqual(b.style('margin-left'), '4px');
-		assert(b.getComputedStyle());
-	});
-
-	test('Builder.position()', function () {
-		let b = Build.withElementById(fixtureId);
-		b.div();
-
-		b.position(100, 200, 300, 400, 'relative');
-
-		assert.strictEqual(b.style('top'), '100px');
-		assert.strictEqual(b.style('right'), '200px');
-		assert.strictEqual(b.style('bottom'), '300px');
-		assert.strictEqual(b.style('left'), '400px');
-		assert.strictEqual(b.style('position'), 'relative');
-	});
-
-	test('Builder.size(), .minSize() and .maxSize()', function () {
-		let b = Build.withElementById(fixtureId);
-		b.div();
-
-		b.size(100, 200);
-
-		assert.strictEqual(b.style('width'), '100px');
-		assert.strictEqual(b.style('height'), '200px');
-	});
-
-	test('Builder.show() and .hide()', function () {
-		let b = Build.withElementById(fixtureId);
-		b.div();
-
-		b.show();
-		assert(!b.hasClass('monaco-builder-hidden'));
-		assert(!b.isHidden());
-		b.hide();
-		assert(b.isHidden());
-		b.show();
-		b.hide();
-		assert(b.hasClass('monaco-builder-hidden'));
-		assert(b.isHidden());
-	});
-
-	test('Builder.showDelayed()', function () {
-		let b = Build.withElementById(fixtureId);
-		b.div().hide();
-
-		b.showDelayed(20);
-		assert(b.hasClass('monaco-builder-hidden'));
-
-		return timeout(30).then(() => {
-			assert(!b.hasClass('monaco-builder-hidden'));
-		});
-	});
-
-	test('Builder.showDelayed() but interrupted', function () {
-		let b = Build.withElementById(fixtureId);
-		b.div().hide();
-
-		b.showDelayed(20);
-		assert(b.hasClass('monaco-builder-hidden'));
-
-		b.hide(); // Should cancel the visibility promise
-
-		return timeout(30).then(() => {
-			assert(b.hasClass('monaco-builder-hidden'));
-		});
-	});
-
-	test('Builder.innerHtml()', function () {
-		let b = Build.withElementById(fixtureId);
-		b.div();
-
-		b.innerHtml('<b>Foo Bar</b>');
-
-		assert.strictEqual(b.getHTMLElement().innerHTML, '<b>Foo Bar</b>');
-	});
-
-	test('Builder.safeInnerHtml()', function () {
-		let b = Build.withElementById(fixtureId);
-		b.div();
-
-		b.safeInnerHtml('<b>Foo Bar</b>');
-
-		assert.strictEqual(b.getHTMLElement().innerHTML, '&lt;b&gt;Foo Bar&lt;/b&gt;');
-
-		b.safeInnerHtml('Foo Bar');
-
-		assert.strictEqual(b.getHTMLElement().innerHTML, 'Foo Bar');
-	});
-
-	test('Build Client Area', function () {
-
-		// Global
-		let dimensions = $(document.body).getClientArea();
-		assert(dimensions.width > 0);
-		assert(dimensions.height > 0);
-
-		// Local
-		let b = Build.withElementById(fixtureId);
-		dimensions = b.getClientArea();
-		// assert(dimensions.width >= 0);
-		// assert(dimensions.height >= 0);
-	});
-
-	test('Builder.once()', function () {
-		let b = Build.withElementById(fixtureId);
-		b.element('input', {
-			type: 'button'
-		});
-
-		let counter = 0;
-		b.once(DomUtils.EventType.CLICK, function (e) {
-			counter++;
-			assert(counter <= 1);
-		});
-
-		b.getHTMLElement().click();
-		b.getHTMLElement().click();
-	});
-
-	test('Builder.once() with capture', function () {
-		let b = Build.withElementById(fixtureId);
-		b.element('input', {
-			type: 'button'
-		});
-
-		let counter = 0;
-		b.once(DomUtils.EventType.CLICK, function (e) {
-			counter++;
-			assert(counter <= 1);
-		}, null, true);
-
-		b.getHTMLElement().click();
-		b.getHTMLElement().click();
-	});
-
-	test('Builder.on() and .off()', function () {
-		let b = Build.withElementById(fixtureId);
-		b.element('input', {
-			type: 'button'
-		});
-
-		let listeners: Builder[] = [];
-		let counter = 0;
-		b.on(DomUtils.EventType.CLICK, function (e) {
-			counter++;
-		}, listeners);
-
-		assert(listeners.length === 1);
-
-		b.getHTMLElement().click();
-		b.off(DomUtils.EventType.BLUR);
-		b.getHTMLElement().click();
-		b.off(DomUtils.EventType.CLICK);
-		b.getHTMLElement().click();
-		b.getHTMLElement().click();
-
-		assert.equal(counter, 2);
-	});
-
-	test('Builder.on() and .off() with capture', function () {
-		let b = Build.withElementById(fixtureId);
-		b.element('input', {
-			type: 'button'
-		});
-
-		let listeners: Builder[] = [];
-		let counter = 0;
-		b.on(DomUtils.EventType.CLICK, function (e) {
-			counter++;
-		}, listeners, true);
-
-		assert(listeners.length === 1);
-
-		b.getHTMLElement().click();
-		b.off(DomUtils.EventType.BLUR);
-		b.getHTMLElement().click();
-		b.off(DomUtils.EventType.BLUR, true);
-		b.getHTMLElement().click();
-		b.off(DomUtils.EventType.CLICK);
-		b.getHTMLElement().click();
-		b.off(DomUtils.EventType.CLICK, true);
-		b.getHTMLElement().click();
-		b.getHTMLElement().click();
-		assert(counter === 4);
-	});
-
-	test('Builder.empty()', function () {
-		let inputs: Builder[] = [];
-		let bindings: Builder[] = [];
-
-		let b = Build.withElementById(fixtureId);
-		let counter1 = 0;
-		let counter2 = 0;
-		let counter3 = 0;
-		let counter4 = 0;
-		let counter5 = 0;
-		let counter6 = 0;
-		let counter7 = 0;
-
-		b.div(function (div: Builder) {
-			bindElement(div.getHTMLElement(), 'Foo Bar');
-			div.setProperty('Foo', 'Bar');
-			bindings.push(div.clone());
-
-			div.element('input', {
-				type: 'button'
-			}).on(DomUtils.EventType.CLICK, function () {
-				counter1++;
-				assert(counter1 <= 1);
-			});
-			inputs.push(div.clone());
-
-			div.p(function (p: Builder) {
-				bindElement(p.getHTMLElement(), 'Foo Bar');
-				p.setProperty('Foo', 'Bar');
-				bindings.push(p.clone());
-
-				p.element('input', {
-					type: 'button'
-				}).on(DomUtils.EventType.CLICK, function () {
-					counter2++;
-					assert(counter2 <= 1);
-				});
-				inputs.push(p.clone());
-
-				p.ul(function (ul: Builder) {
-					bindElement(ul.getHTMLElement(), 'Foo Bar');
-					ul.setProperty('Foo', 'Bar');
-					bindings.push(ul.clone());
-
-					ul.element('input', {
-						type: 'button'
-					}).on(DomUtils.EventType.CLICK, function (e) {
-						counter3++;
-						assert(counter3 <= 1);
-					});
-					inputs.push(ul.clone());
-
-					ul.li(function (li: Builder) {
-						bindElement(li.getHTMLElement(), 'Foo Bar');
-						li.setProperty('Foo', 'Bar');
-						bindings.push(li.clone());
-
-						li.element('input', {
-							type: 'button'
-						}).on(DomUtils.EventType.CLICK, function (e) {
-							counter4++;
-							assert(counter4 <= 1);
-						});
-						inputs.push(li.clone());
-
-						li.span({
-							id: 'builderspan',
-							innerHtml: 'Foo Bar'
-						}, function (span) {
-							bindElement(span.getHTMLElement(), 'Foo Bar');
-							span.setProperty('Foo', 'Bar');
-							bindings.push(span.clone());
-
-							span.element('input', {
-								type: 'button'
-							}).on(DomUtils.EventType.CLICK, function (e) {
-								counter5++;
-								assert(counter5 <= 1);
-							});
-							inputs.push(span.clone());
-						});
-
-						li.img({
-							id: 'builderimg',
-							src: '#'
-						}, function (img) {
-							bindElement(img.getHTMLElement(), 'Foo Bar');
-							img.setProperty('Foo', 'Bar');
-							bindings.push(img.clone());
-
-							img.element('input', {
-								type: 'button'
-							}).on(DomUtils.EventType.CLICK, function (e) {
-								counter6++;
-								assert(counter6 <= 1);
-							});
-							inputs.push(img.clone());
-						});
-
-						li.a({
-							id: 'builderlink',
-							href: '#',
-							innerHtml: 'Link'
-						}, function (a) {
-							bindElement(a.getHTMLElement(), 'Foo Bar');
-							a.setProperty('Foo', 'Bar');
-							bindings.push(a.clone());
-
-							a.element('input', {
-								type: 'button'
-							}).on(DomUtils.EventType.CLICK, function (e) {
-								counter7++;
-								assert(counter7 <= 1);
-							});
-							inputs.push(a.clone());
-						});
-					});
-				});
-			});
-		});
-
-		inputs.forEach(function (input) {
-			input.getHTMLElement().click();
-		});
-
-		for (let i = 0; i < bindings.length; i++) {
-			assert(bindings[i].getProperty('Foo'));
-		}
-
-		Build.withElementById(fixtureId).empty();
-		assert(select(Build.withElementById(fixtureId), '*').length === 0);
-
-		inputs.forEach(function (input) {
-			input.getHTMLElement().click();
-		});
-
-		for (let i = 0; i < bindings.length; i++) {
-			assert(!bindings[i].getProperty('Foo'));
-		}
-
-		assert.equal(counter1, 1);
-		assert.equal(counter2, 1);
-		assert.equal(counter3, 1);
-		assert.equal(counter4, 1);
-		assert.equal(counter5, 1);
-		assert.equal(counter6, 1);
-		assert.equal(counter7, 1);
-	});
-
-	test('Builder.empty() cleans all listeners', function () {
-		let b = Build.withElementById(fixtureId);
-		let unbindCounter = 0;
-
-		let old = DomUtils.addDisposableListener;
-		try {
-			(DomUtils as any).addDisposableListener = function (node: any, type: any, handler: any) {
-				let unbind: IDisposable = old.call(null, node, type, handler);
-
-				return {
-					dispose: function () {
-						unbindCounter++;
-						unbind.dispose();
-					}
-				};
-			};
-
-			b.div(function (div: Builder) {
-				div.p(function (p: Builder) {
-					p.span().on([DomUtils.EventType.CLICK, DomUtils.EventType.KEY_DOWN], function (e) { });
-
-					p.img().on([DomUtils.EventType.KEY_PRESS, DomUtils.EventType.MOUSE_OUT], function (e) { }, null, true); // useCapture
-
-					p.a(function (a: Builder) {
-						a.span().on([DomUtils.EventType.CLICK, DomUtils.EventType.KEY_DOWN], function (e) { });
-					}).on([DomUtils.EventType.SELECT, DomUtils.EventType.BLUR], function (e) { });
-				});
-			});
-
-			b.empty();
-			assert.strictEqual(unbindCounter, 8);
-		} finally {
-			(DomUtils as any).addDisposableListener = old;
-		}
-	});
-
-	test('Builder.destroy()', function () {
-		let inputs: Builder[] = [];
-		let bindings: Builder[] = [];
-
-		let b = Build.withElementById(fixtureId);
-		let counter1 = 0;
-		let counter2 = 0;
-		let counter3 = 0;
-		let counter4 = 0;
-		let counter5 = 0;
-		let counter6 = 0;
-		let counter7 = 0;
-
-		b.div(function (div: Builder) {
-			bindElement(div.getHTMLElement(), 'Foo Bar');
-			div.setProperty('Foo', 'Bar');
-			bindings.push(div.clone());
-
-			div.element('input', {
-				type: 'button'
-			}).on(DomUtils.EventType.CLICK, function (e) {
-				counter1++;
-				assert(counter1 <= 1);
-			}, null, true); // useCapture
-			inputs.push(div.clone());
-
-			div.p(function (p: Builder) {
-				bindElement(p.getHTMLElement(), 'Foo Bar');
-				p.setProperty('Foo', 'Bar');
-				bindings.push(p.clone());
-
-				p.element('input', {
-					type: 'button'
-				}).on(DomUtils.EventType.CLICK, function (e) {
-					counter2++;
-					assert(counter2 <= 1);
-				});
-				inputs.push(p.clone());
-
-				p.ul(function (ul: Builder) {
-					bindElement(ul.getHTMLElement(), 'Foo Bar');
-					ul.setProperty('Foo', 'Bar');
-					bindings.push(ul.clone());
-
-					ul.element('input', {
-						type: 'button'
-					}).on(DomUtils.EventType.CLICK, function (e) {
-						counter3++;
-						assert(counter3 <= 1);
-					});
-					inputs.push(ul.clone());
-
-					ul.li(function (li: Builder) {
-						bindElement(li.getHTMLElement(), 'Foo Bar');
-						li.setProperty('Foo', 'Bar');
-						bindings.push(li.clone());
-
-						li.element('input', {
-							type: 'button'
-						}).on(DomUtils.EventType.CLICK, function () {
-							counter4++;
-							assert(counter4 <= 1);
-						});
-						inputs.push(li.clone());
-
-						li.span({
-							id: 'builderspan',
-							innerHtml: 'Foo Bar'
-						}, function (span) {
-							bindElement(span.getHTMLElement(), 'Foo Bar');
-							span.setProperty('Foo', 'Bar');
-							bindings.push(span.clone());
-
-							span.element('input', {
-								type: 'button'
-							}).on(DomUtils.EventType.CLICK, function (e) {
-								counter5++;
-								assert(counter5 <= 1);
-							});
-							inputs.push(span.clone());
-						});
-
-						li.img({
-							id: 'builderimg',
-							src: '#'
-						}, function (img) {
-							bindElement(img.getHTMLElement(), 'Foo Bar');
-							img.setProperty('Foo', 'Bar');
-							bindings.push(img.clone());
-
-							img.element('input', {
-								type: 'button'
-							}).on(DomUtils.EventType.CLICK, function (e) {
-								counter6++;
-								assert(counter6 <= 1);
-							});
-							inputs.push(img.clone());
-						});
-
-						li.a({
-							id: 'builderlink',
-							href: '#',
-							innerHtml: 'Link'
-						}, function (a) {
-							bindElement(a.getHTMLElement(), 'Foo Bar');
-							a.setProperty('Foo', 'Bar');
-							bindings.push(a.clone());
-
-							a.element('input', {
-								type: 'button'
-							}).on(DomUtils.EventType.CLICK, function (e) {
-								counter7++;
-								assert(counter7 <= 1);
-							});
-							inputs.push(a.clone());
-						});
-					});
-				});
-			});
-		});
-
-		inputs.forEach(function (input) {
-			input.getHTMLElement().click();
-		});
-
-		for (let i = 0; i < bindings.length; i++) {
-			assert(bindings[i].getProperty('Foo'));
-		}
-
-		select(Build.withElementById(fixtureId), 'div').destroy();
-		assert(select(Build.withElementById(fixtureId), '*').length === 0);
-
-		inputs.forEach(function (input) {
-			input.getHTMLElement().click();
-		});
-
-		for (let i = 0; i < bindings.length; i++) {
-			assert(!bindings[i].getProperty('Foo'));
-		}
-
-		assert.equal(counter1, 1);
-		assert.equal(counter2, 1);
-		assert.equal(counter3, 1);
-		assert.equal(counter4, 1);
-		assert.equal(counter5, 1);
-		assert.equal(counter6, 1);
-		assert.equal(counter7, 1);
-	});
-
-	test('Builder.destroy() cleans all listeners', function () {
-		let b = Build.withElementById(fixtureId);
-		let unbindCounter = 0;
-
-		let old = DomUtils.addDisposableListener;
-		try {
-			(DomUtils as any).addDisposableListener = function (node: any, type: any, handler: any) {
-				let unbind: IDisposable = old.call(null, node, type, handler);
-
-				return {
-					dispose: function () {
-						unbindCounter++;
-						unbind.dispose();
-					}
-				};
-			};
-
-			b.div(function (div: Builder) {
-				div.p(function (p: Builder) {
-					p.span().on([DomUtils.EventType.CLICK, DomUtils.EventType.KEY_DOWN], function (e) { });
-
-					p.img().on([DomUtils.EventType.KEY_PRESS, DomUtils.EventType.MOUSE_OUT], function (e) { });
-
-					p.a(function (a: Builder) {
-						a.span().on([DomUtils.EventType.CLICK, DomUtils.EventType.KEY_DOWN], function (e) { });
-					}).on([DomUtils.EventType.SELECT, DomUtils.EventType.BLUR], function (e) { });
-				});
-			})
-				.on([DomUtils.EventType.CLICK, DomUtils.EventType.KEY_DOWN], function (e) { })
-				.on([DomUtils.EventType.BLUR, DomUtils.EventType.FOCUS], function (e) { }, null, true); //useCapture
-
-			b.destroy();
-			assert.strictEqual(unbindCounter, 16);
-		} finally {
-			(DomUtils as any).addDisposableListener = old;
-		}
-	});
-
-	test('Builder.offDOM()', function () {
-		let b = Build.withElementById(fixtureId);
-		b.div({ id: '1' });
-
-		assert(Build.withElementById('1'));
-
-		b.offDOM();
-
-		assert(!Build.withElementById('1'));
-	});
-
-	test('$ - selector construction', function () {
-		let obj = $('div');
-		assert(obj instanceof Builder);
-		assert(DomUtils.isHTMLElement(obj.getHTMLElement()));
-		assert.equal(obj.getHTMLElement().tagName.toLowerCase(), 'div');
-		assert.equal(obj.getHTMLElement().id, '');
-		assert.equal(obj.getHTMLElement().className, '');
-
-		obj = $('#myid');
-		assert(obj instanceof Builder);
-		assert(DomUtils.isHTMLElement(obj.getHTMLElement()));
-		assert.equal(obj.getHTMLElement().tagName.toLowerCase(), 'div');
-		assert.equal(obj.getHTMLElement().id, 'myid');
-		assert.equal(obj.getHTMLElement().className, '');
-
-		obj = $('.myclass');
-		assert(obj instanceof Builder);
-		assert(DomUtils.isHTMLElement(obj.getHTMLElement()));
-		assert.equal(obj.getHTMLElement().tagName.toLowerCase(), 'div');
-		assert.equal(obj.getHTMLElement().id, '');
-		assert.equal(obj.getHTMLElement().className, 'myclass');
-
-		obj = $('.myclass.element');
-		assert(obj instanceof Builder);
-		assert(DomUtils.isHTMLElement(obj.getHTMLElement()));
-		assert.equal(obj.getHTMLElement().tagName.toLowerCase(), 'div');
-		assert.equal(obj.getHTMLElement().id, '');
-		assert.equal(obj.getHTMLElement().className, 'myclass element');
-
-		obj = $('#myid.element');
-		assert(obj instanceof Builder);
-		assert(DomUtils.isHTMLElement(obj.getHTMLElement()));
-		assert.equal(obj.getHTMLElement().tagName.toLowerCase(), 'div');
-		assert.equal(obj.getHTMLElement().id, 'myid');
-		assert.equal(obj.getHTMLElement().className, 'element');
-
-		obj = $('ul#myid');
-		assert(obj instanceof Builder);
-		assert(DomUtils.isHTMLElement(obj.getHTMLElement()));
-		assert.equal(obj.getHTMLElement().tagName.toLowerCase(), 'ul');
-		assert.equal(obj.getHTMLElement().id, 'myid');
-		assert.equal(obj.getHTMLElement().className, '');
-
-		obj = $('header#monaco.container');
-		assert(obj instanceof Builder);
-		assert(DomUtils.isHTMLElement(obj.getHTMLElement()));
-		assert.equal(obj.getHTMLElement().tagName.toLowerCase(), 'header');
-		assert.equal(obj.getHTMLElement().id, 'monaco');
-		assert.equal(obj.getHTMLElement().className, 'container');
-
-		obj = $('header#monaco.container.box');
-		assert(obj instanceof Builder);
-		assert(DomUtils.isHTMLElement(obj.getHTMLElement()));
-		assert.equal(obj.getHTMLElement().tagName.toLowerCase(), 'header');
-		assert.equal(obj.getHTMLElement().id, 'monaco');
-		assert.equal(obj.getHTMLElement().className, 'container box');
-	});
-
-	test('$ - wrap elements and builders', function () {
-		let obj = $('#' + fixtureId);
-		assert(obj instanceof Builder);
-		obj = $(obj.getHTMLElement());
-		assert(obj instanceof Builder);
-		obj = $(obj);
-		assert(obj instanceof Builder);
-	});
-
-	test('$ - delegate to #element', function () {
-		let obj = $('a', { 'class': 'a1', innerHtml: 'Hello' });
-		assert(obj instanceof Builder);
-		let el = obj.getHTMLElement();
-		assert.equal(el.tagName.toLowerCase(), 'a');
-		assert.equal(el.className, 'a1');
-		assert.equal(el.innerHTML, 'Hello');
-	});
-
-	test('$ - html', function () {
-		let obj = $('<a class="a1">Hello</a>');
-		assert(obj instanceof Builder);
-		let el = obj.getHTMLElement();
-		assert.equal(el.tagName.toLowerCase(), 'a');
-		assert.equal(el.className, 'a1');
-		assert.equal(el.innerHTML, 'Hello');
-	});
-
-	test('$ - multiple html tags', function () {
-		let objs = <MultiBuilder>$('<a class="a1">Hello</a><a class="a2">There</a>');
-		assert(objs instanceof MultiBuilder);
-		assert.equal(objs.length, 2);
-
-		let obj = objs.item(0).getHTMLElement();
-		assert.equal(obj.tagName.toLowerCase(), 'a');
-		assert.equal(obj.className, 'a1');
-		assert.equal(obj.innerHTML, 'Hello');
-
-		obj = objs.item(1).getHTMLElement();
-		assert.equal(obj.tagName.toLowerCase(), 'a');
-		assert.equal(obj.className, 'a2');
-		assert.equal(obj.innerHTML, 'There');
-	});
-
-	test('$ - html format', function () {
-		let objs = <MultiBuilder>(<any>$)('<a class="{0}">{1}</a><a class="{2}">{3}</a>', 'a1', 'Hello', 'a2', 'There');
-		assert(objs instanceof MultiBuilder);
-		assert.equal(objs.length, 2);
-
-		let obj = objs.item(0).getHTMLElement();
-		assert.equal(obj.tagName.toLowerCase(), 'a');
-		assert.equal(obj.className, 'a1');
-		assert.equal(obj.innerHTML, 'Hello');
-
-		obj = objs.item(1).getHTMLElement();
-		assert.equal(obj.tagName.toLowerCase(), 'a');
-		assert.equal(obj.className, 'a2');
-		assert.equal(obj.innerHTML, 'There');
-	});
-
-	test('$ - exceptions', function () {
-		assert.throws(function () { $(''); });
-		assert.throws(function () { $(<any>123); });
-	});
-
-	test('$ - appendTo, append', function () {
-		let peel = $('<div class="peel"></div>');
-		let core = $('<span class="core"></span>').appendTo(peel);
-		let obj = peel.getHTMLElement();
-		assert(obj);
-		assert.equal(obj.tagName.toLowerCase(), 'div');
-		assert.equal(obj.className, 'peel');
-		assert.equal(obj.children.length, 1);
-		assert(obj.firstChild);
-		assert.equal((<HTMLElement>obj.firstChild).children.length, 0);
-		assert.equal((<HTMLElement>obj.firstChild).tagName.toLowerCase(), 'span');
-		assert.equal((<HTMLElement>obj.firstChild).className, 'core');
-		obj = core.getHTMLElement();
-		assert.equal(obj.children.length, 0);
-		assert.equal(obj.tagName.toLowerCase(), 'span');
-		assert.equal(obj.className, 'core');
-
-		peel = $('<div class="peel"></div>').append($('<span class="core"></span>'));
-		obj = peel.getHTMLElement();
-		assert(obj);
-		assert.equal(obj.tagName.toLowerCase(), 'div');
-		assert.equal(obj.className, 'peel');
-		assert.equal(obj.children.length, 1);
-		assert(obj.firstChild);
-		assert.equal((<HTMLElement>obj.firstChild).children.length, 0);
-		assert.equal((<HTMLElement>obj.firstChild).tagName.toLowerCase(), 'span');
-		assert.equal((<HTMLElement>obj.firstChild).className, 'core');
-	});
-});
diff --git a/src/vs/base/test/browser/ui/contextview/contextview.test.ts b/src/vs/base/test/browser/ui/contextview/contextview.test.ts
new file mode 100644
index 00000000000..09214cfc06d
--- /dev/null
+++ b/src/vs/base/test/browser/ui/contextview/contextview.test.ts
@@ -0,0 +1,28 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as assert from 'assert';
+import { layout, LayoutAnchorPosition } from 'vs/base/browser/ui/contextview/contextview';
+
+suite('Contextview', function () {
+
+	test('layout', function () {
+		assert.equal(layout(200, 20, { offset: 0, size: 0, position: LayoutAnchorPosition.Before }), 0);
+		assert.equal(layout(200, 20, { offset: 50, size: 0, position: LayoutAnchorPosition.Before }), 50);
+		assert.equal(layout(200, 20, { offset: 200, size: 0, position: LayoutAnchorPosition.Before }), 180);
+
+		assert.equal(layout(200, 20, { offset: 0, size: 0, position: LayoutAnchorPosition.After }), 0);
+		assert.equal(layout(200, 20, { offset: 50, size: 0, position: LayoutAnchorPosition.After }), 30);
+		assert.equal(layout(200, 20, { offset: 200, size: 0, position: LayoutAnchorPosition.After }), 180);
+
+		assert.equal(layout(200, 20, { offset: 0, size: 50, position: LayoutAnchorPosition.Before }), 50);
+		assert.equal(layout(200, 20, { offset: 50, size: 50, position: LayoutAnchorPosition.Before }), 100);
+		assert.equal(layout(200, 20, { offset: 150, size: 50, position: LayoutAnchorPosition.Before }), 130);
+
+		assert.equal(layout(200, 20, { offset: 0, size: 50, position: LayoutAnchorPosition.After }), 50);
+		assert.equal(layout(200, 20, { offset: 50, size: 50, position: LayoutAnchorPosition.After }), 30);
+		assert.equal(layout(200, 20, { offset: 150, size: 50, position: LayoutAnchorPosition.After }), 130);
+	});
+});
diff --git a/src/vs/base/test/browser/ui/grid/grid.test.ts b/src/vs/base/test/browser/ui/grid/grid.test.ts
index 75a3ed4c865..341d085e77a 100644
--- a/src/vs/base/test/browser/ui/grid/grid.test.ts
+++ b/src/vs/base/test/browser/ui/grid/grid.test.ts
@@ -4,8 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as assert from 'assert';
-import { Direction, Grid, getRelativeLocation, Orientation, SerializableGrid, ISerializableView, IViewDeserializer, GridNode, Sizing, isGridBranchNode } from 'vs/base/browser/ui/grid/grid';
+import { Direction, getRelativeLocation, Orientation, SerializableGrid, ISerializableView, IViewDeserializer, GridNode, Sizing, isGridBranchNode, sanitizeGridNodeDescriptor, GridNodeDescriptor, createSerializedGrid, Grid } from 'vs/base/browser/ui/grid/grid';
 import { TestView, nodesToArrays } from './util';
+import { deepClone } from 'vs/base/common/objects';
 
 suite('Grid', function () {
 	let container: HTMLElement;
@@ -55,7 +56,8 @@ suite('Grid', function () {
 
 	test('empty', function () {
 		const view1 = new TestView(100, Number.MAX_VALUE, 100, Number.MAX_VALUE);
-		const gridview = new Grid(container, view1);
+		const gridview = new Grid(view1);
+		container.appendChild(gridview.element);
 		gridview.layout(800, 600);
 
 		assert.deepEqual(view1.size, [800, 600]);
@@ -63,7 +65,8 @@ suite('Grid', function () {
 
 	test('two views vertically', function () {
 		const view1 = new TestView(50, Number.MAX_VALUE, 50, Number.MAX_VALUE);
-		const grid = new Grid(container, view1);
+		const grid = new Grid(view1);
+		container.appendChild(grid.element);
 		grid.layout(800, 600);
 		assert.deepEqual(view1.size, [800, 600]);
 
@@ -71,14 +74,13 @@ suite('Grid', function () {
 		grid.addView(view2, 200, view1, Direction.Up);
 		assert.deepEqual(view1.size, [800, 400]);
 		assert.deepEqual(view2.size, [800, 200]);
-
-		assert.equal(grid.getOrientation(view1), Orientation.VERTICAL);
-		assert.equal(grid.getOrientation(view2), Orientation.VERTICAL);
 	});
 
 	test('two views horizontally', function () {
 		const view1 = new TestView(50, Number.MAX_VALUE, 50, Number.MAX_VALUE);
-		const grid = new Grid(container, view1);
+		const grid = new Grid(view1);
+		container.appendChild(grid.element);
+
 		grid.layout(800, 600);
 		assert.deepEqual(view1.size, [800, 600]);
 
@@ -86,14 +88,13 @@ suite('Grid', function () {
 		grid.addView(view2, 300, view1, Direction.Right);
 		assert.deepEqual(view1.size, [500, 600]);
 		assert.deepEqual(view2.size, [300, 600]);
-
-		assert.equal(grid.getOrientation(view1), Orientation.HORIZONTAL);
-		assert.equal(grid.getOrientation(view2), Orientation.HORIZONTAL);
 	});
 
 	test('simple layout', function () {
 		const view1 = new TestView(50, Number.MAX_VALUE, 50, Number.MAX_VALUE);
-		const grid = new Grid(container, view1);
+		const grid = new Grid(view1);
+		container.appendChild(grid.element);
+
 		grid.layout(800, 600);
 		assert.deepEqual(view1.size, [800, 600]);
 
@@ -126,7 +127,9 @@ suite('Grid', function () {
 
 	test('another simple layout with automatic size distribution', function () {
 		const view1 = new TestView(50, Number.MAX_VALUE, 50, Number.MAX_VALUE);
-		const grid = new Grid(container, view1);
+		const grid = new Grid(view1);
+		container.appendChild(grid.element);
+
 		grid.layout(800, 600);
 		assert.deepEqual(view1.size, [800, 600]);
 
@@ -168,7 +171,9 @@ suite('Grid', function () {
 
 	test('another simple layout with split size distribution', function () {
 		const view1 = new TestView(50, Number.MAX_VALUE, 50, Number.MAX_VALUE);
-		const grid = new Grid(container, view1);
+		const grid = new Grid(view1);
+		container.appendChild(grid.element);
+
 		grid.layout(800, 600);
 		assert.deepEqual(view1.size, [800, 600]);
 
@@ -210,7 +215,9 @@ suite('Grid', function () {
 
 	test('3/2 layout with split', function () {
 		const view1 = new TestView(50, Number.MAX_VALUE, 50, Number.MAX_VALUE);
-		const grid = new Grid(container, view1);
+		const grid = new Grid(view1);
+		container.appendChild(grid.element);
+
 		grid.layout(800, 600);
 		assert.deepEqual(view1.size, [800, 600]);
 
@@ -243,7 +250,9 @@ suite('Grid', function () {
 
 	test('sizing should be correct after branch demotion #50564', function () {
 		const view1 = new TestView(50, Number.MAX_VALUE, 50, Number.MAX_VALUE);
-		const grid = new Grid(container, view1);
+		const grid = new Grid(view1);
+		container.appendChild(grid.element);
+
 		grid.layout(800, 600);
 
 		const view2 = new TestView(50, Number.MAX_VALUE, 50, Number.MAX_VALUE);
@@ -267,7 +276,9 @@ suite('Grid', function () {
 
 	test('sizing should be correct after branch demotion #50675', function () {
 		const view1 = new TestView(50, Number.MAX_VALUE, 50, Number.MAX_VALUE);
-		const grid = new Grid(container, view1);
+		const grid = new Grid(view1);
+		container.appendChild(grid.element);
+
 		grid.layout(800, 600);
 
 		const view2 = new TestView(50, Number.MAX_VALUE, 50, Number.MAX_VALUE);
@@ -291,7 +302,9 @@ suite('Grid', function () {
 
 	test('getNeighborViews should work on single view layout', function () {
 		const view1 = new TestView(50, Number.MAX_VALUE, 50, Number.MAX_VALUE);
-		const grid = new Grid(container, view1);
+		const grid = new Grid(view1);
+		container.appendChild(grid.element);
+
 		grid.layout(800, 600);
 
 		assert.deepEqual(grid.getNeighborViews(view1, Direction.Up), []);
@@ -307,7 +320,9 @@ suite('Grid', function () {
 
 	test('getNeighborViews should work on simple layout', function () {
 		const view1 = new TestView(50, Number.MAX_VALUE, 50, Number.MAX_VALUE);
-		const grid = new Grid(container, view1);
+		const grid = new Grid(view1);
+		container.appendChild(grid.element);
+
 		grid.layout(800, 600);
 
 		const view2 = new TestView(50, Number.MAX_VALUE, 50, Number.MAX_VALUE);
@@ -349,7 +364,9 @@ suite('Grid', function () {
 
 	test('getNeighborViews should work on a complex layout', function () {
 		const view1 = new TestView(50, Number.MAX_VALUE, 50, Number.MAX_VALUE);
-		const grid = new Grid(container, view1);
+		const grid = new Grid(view1);
+		container.appendChild(grid.element);
+
 		grid.layout(800, 600);
 
 		const view2 = new TestView(50, Number.MAX_VALUE, 50, Number.MAX_VALUE);
@@ -388,7 +405,9 @@ suite('Grid', function () {
 
 	test('getNeighborViews should work on another simple layout', function () {
 		const view1 = new TestView(50, Number.MAX_VALUE, 50, Number.MAX_VALUE);
-		const grid = new Grid(container, view1);
+		const grid = new Grid(view1);
+		container.appendChild(grid.element);
+
 		grid.layout(800, 600);
 
 		const view2 = new TestView(50, Number.MAX_VALUE, 50, Number.MAX_VALUE);
@@ -408,7 +427,9 @@ suite('Grid', function () {
 
 	test('getNeighborViews should only return immediate neighbors', function () {
 		const view1 = new TestView(50, Number.MAX_VALUE, 50, Number.MAX_VALUE);
-		const grid = new Grid(container, view1);
+		const grid = new Grid(view1);
+		container.appendChild(grid.element);
+
 		grid.layout(800, 600);
 
 		const view2 = new TestView(50, Number.MAX_VALUE, 50, Number.MAX_VALUE);
@@ -465,6 +486,7 @@ function nodesToNames(node: GridNode<TestSerializableView>): any {
 }
 
 suite('SerializableGrid', function () {
+
 	let container: HTMLElement;
 
 	setup(function () {
@@ -480,7 +502,8 @@ suite('SerializableGrid', function () {
 
 	test('serialize empty', function () {
 		const view1 = new TestSerializableView('view1', 50, Number.MAX_VALUE, 50, Number.MAX_VALUE);
-		const grid = new SerializableGrid(container, view1);
+		const grid = new SerializableGrid(view1);
+		container.appendChild(grid.element);
 		grid.layout(800, 600);
 
 		assert.deepEqual(grid.serialize(), {
@@ -505,7 +528,8 @@ suite('SerializableGrid', function () {
 
 	test('serialize simple layout', function () {
 		const view1 = new TestSerializableView('view1', 50, Number.MAX_VALUE, 50, Number.MAX_VALUE);
-		const grid = new SerializableGrid(container, view1);
+		const grid = new SerializableGrid(view1);
+		container.appendChild(grid.element);
 		grid.layout(800, 600);
 
 		const view2 = new TestSerializableView('view2', 50, Number.MAX_VALUE, 50, Number.MAX_VALUE);
@@ -558,14 +582,15 @@ suite('SerializableGrid', function () {
 
 	test('deserialize empty', function () {
 		const view1 = new TestSerializableView('view1', 50, Number.MAX_VALUE, 50, Number.MAX_VALUE);
-		const grid = new SerializableGrid(container, view1);
+		const grid = new SerializableGrid(view1);
+		container.appendChild(grid.element);
 		grid.layout(800, 600);
 
 		const json = grid.serialize();
 		grid.dispose();
 
 		const deserializer = new TestViewDeserializer();
-		const grid2 = SerializableGrid.deserialize(container, json, deserializer);
+		const grid2 = SerializableGrid.deserialize(json, deserializer);
 		grid2.layout(800, 600);
 
 		assert.deepEqual(nodesToNames(grid2.getViews()), ['view1']);
@@ -573,7 +598,9 @@ suite('SerializableGrid', function () {
 
 	test('deserialize simple layout', function () {
 		const view1 = new TestSerializableView('view1', 50, Number.MAX_VALUE, 50, Number.MAX_VALUE);
-		const grid = new SerializableGrid(container, view1);
+		const grid = new SerializableGrid(view1);
+		container.appendChild(grid.element);
+
 		grid.layout(800, 600);
 
 		const view2 = new TestSerializableView('view2', 50, Number.MAX_VALUE, 50, Number.MAX_VALUE);
@@ -592,7 +619,7 @@ suite('SerializableGrid', function () {
 		grid.dispose();
 
 		const deserializer = new TestViewDeserializer();
-		const grid2 = SerializableGrid.deserialize(container, json, deserializer);
+		const grid2 = SerializableGrid.deserialize(json, deserializer);
 
 		const view1Copy = deserializer.getView('view1');
 		const view2Copy = deserializer.getView('view2');
@@ -619,7 +646,9 @@ suite('SerializableGrid', function () {
 
 	test('deserialize simple layout with scaling', function () {
 		const view1 = new TestSerializableView('view1', 50, Number.MAX_VALUE, 50, Number.MAX_VALUE);
-		const grid = new SerializableGrid(container, view1);
+		const grid = new SerializableGrid(view1);
+		container.appendChild(grid.element);
+
 		grid.layout(800, 600);
 
 		const view2 = new TestSerializableView('view2', 50, Number.MAX_VALUE, 50, Number.MAX_VALUE);
@@ -638,7 +667,7 @@ suite('SerializableGrid', function () {
 		grid.dispose();
 
 		const deserializer = new TestViewDeserializer();
-		const grid2 = SerializableGrid.deserialize(container, json, deserializer);
+		const grid2 = SerializableGrid.deserialize(json, deserializer);
 
 		const view1Copy = deserializer.getView('view1');
 		const view2Copy = deserializer.getView('view2');
@@ -656,7 +685,8 @@ suite('SerializableGrid', function () {
 
 	test('deserialize 4 view layout (ben issue #2)', function () {
 		const view1 = new TestSerializableView('view1', 50, Number.MAX_VALUE, 50, Number.MAX_VALUE);
-		const grid = new SerializableGrid(container, view1);
+		const grid = new SerializableGrid(view1);
+		container.appendChild(grid.element);
 		grid.layout(800, 600);
 
 		const view2 = new TestSerializableView('view2', 50, Number.MAX_VALUE, 50, Number.MAX_VALUE);
@@ -672,7 +702,7 @@ suite('SerializableGrid', function () {
 		grid.dispose();
 
 		const deserializer = new TestViewDeserializer();
-		const grid2 = SerializableGrid.deserialize(container, json, deserializer);
+		const grid2 = SerializableGrid.deserialize(json, deserializer);
 
 		const view1Copy = deserializer.getView('view1');
 		const view2Copy = deserializer.getView('view2');
@@ -689,7 +719,9 @@ suite('SerializableGrid', function () {
 
 	test('deserialize 2 view layout (ben issue #3)', function () {
 		const view1 = new TestSerializableView('view1', 50, Number.MAX_VALUE, 50, Number.MAX_VALUE);
-		const grid = new SerializableGrid(container, view1);
+		const grid = new SerializableGrid(view1);
+		container.appendChild(grid.element);
+
 		grid.layout(800, 600);
 
 		const view2 = new TestSerializableView('view2', 50, Number.MAX_VALUE, 50, Number.MAX_VALUE);
@@ -699,7 +731,7 @@ suite('SerializableGrid', function () {
 		grid.dispose();
 
 		const deserializer = new TestViewDeserializer();
-		const grid2 = SerializableGrid.deserialize(container, json, deserializer);
+		const grid2 = SerializableGrid.deserialize(json, deserializer);
 
 		const view1Copy = deserializer.getView('view1');
 		const view2Copy = deserializer.getView('view2');
@@ -712,7 +744,9 @@ suite('SerializableGrid', function () {
 
 	test('deserialize simple view layout #50609', function () {
 		const view1 = new TestSerializableView('view1', 50, Number.MAX_VALUE, 50, Number.MAX_VALUE);
-		const grid = new SerializableGrid(container, view1);
+		const grid = new SerializableGrid(view1);
+		container.appendChild(grid.element);
+
 		grid.layout(800, 600);
 
 		const view2 = new TestSerializableView('view2', 50, Number.MAX_VALUE, 50, Number.MAX_VALUE);
@@ -727,7 +761,7 @@ suite('SerializableGrid', function () {
 		grid.dispose();
 
 		const deserializer = new TestViewDeserializer();
-		const grid2 = SerializableGrid.deserialize(container, json, deserializer);
+		const grid2 = SerializableGrid.deserialize(json, deserializer);
 
 		const view2Copy = deserializer.getView('view2');
 		const view3Copy = deserializer.getView('view3');
@@ -737,4 +771,35 @@ suite('SerializableGrid', function () {
 		assert.deepEqual(view2Copy.size, [800, 300]);
 		assert.deepEqual(view3Copy.size, [800, 300]);
 	});
-});
\ No newline at end of file
+
+	test('sanitizeGridNodeDescriptor', function () {
+		const nodeDescriptor = { groups: [{ size: 0.2 }, { size: 0.2 }, { size: 0.6, groups: [{}, {}] }] };
+		const nodeDescriptorCopy = deepClone<GridNodeDescriptor>(nodeDescriptor);
+		sanitizeGridNodeDescriptor(nodeDescriptorCopy);
+		assert.deepEqual(nodeDescriptorCopy, { groups: [{ size: 0.2 }, { size: 0.2 }, { size: 0.6, groups: [{ size: 0.5 }, { size: 0.5 }] }] });
+	});
+
+	test('createSerializedGrid', function () {
+		const gridDescriptor = { orientation: Orientation.VERTICAL, groups: [{ size: 0.2 }, { size: 0.2 }, { size: 0.6, groups: [{}, {}] }] };
+		const serializedGrid = createSerializedGrid(gridDescriptor);
+		assert.deepEqual(serializedGrid, {
+			root: {
+				type: 'branch',
+				size: undefined,
+				data: [
+					{ type: 'leaf', size: 0.2, data: null },
+					{ type: 'leaf', size: 0.2, data: null },
+					{
+						type: 'branch', size: 0.6, data: [
+							{ type: 'leaf', size: 0.5, data: null },
+							{ type: 'leaf', size: 0.5, data: null }
+						]
+					}
+				]
+			},
+			orientation: Orientation.VERTICAL,
+			width: 1,
+			height: 1
+		});
+	});
+});
diff --git a/src/vs/base/test/browser/ui/grid/gridview.test.ts b/src/vs/base/test/browser/ui/grid/gridview.test.ts
index c1cbe3c37d4..3485fa63b31 100644
--- a/src/vs/base/test/browser/ui/grid/gridview.test.ts
+++ b/src/vs/base/test/browser/ui/grid/gridview.test.ts
@@ -4,31 +4,33 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as assert from 'assert';
+import { $ } from 'vs/base/browser/dom';
 import { GridView, IView, Sizing } from 'vs/base/browser/ui/grid/gridview';
 import { nodesToArrays, TestView } from './util';
 
 suite('Gridview', function () {
-	let container: HTMLElement;
+	let gridview: GridView;
 
 	setup(function () {
-		container = document.createElement('div');
+		gridview = new GridView();
+		const container = $('.container');
+
 		container.style.position = 'absolute';
 		container.style.width = `${200}px`;
 		container.style.height = `${200}px`;
+		container.appendChild(gridview.element);
 	});
 
 	teardown(function () {
-		container = null;
+		gridview = null;
 	});
 
 	test('empty gridview is empty', function () {
-		const gridview = new GridView(container);
 		assert.deepEqual(nodesToArrays(gridview.getViews()), []);
 		gridview.dispose();
 	});
 
 	test('gridview addView', function () {
-		const gridview = new GridView(container);
 
 		const view = new TestView(20, 20, 20, 20);
 		assert.throws(() => gridview.addView(view, 200, []), 'empty location');
@@ -51,7 +53,6 @@ suite('Gridview', function () {
 	});
 
 	test('gridview addView nested', function () {
-		const gridview = new GridView(container);
 
 		const views = [
 			new TestView(20, 20, 20, 20),
@@ -71,7 +72,6 @@ suite('Gridview', function () {
 	});
 
 	test('gridview addView deep nested', function () {
-		const gridview = new GridView(container);
 
 		const view1 = new TestView(20, 20, 20, 20);
 		gridview.addView(view1 as IView, 200, [0]);
@@ -109,84 +109,82 @@ suite('Gridview', function () {
 	});
 
 	test('simple layout', function () {
-		const grid = new GridView(container);
-		grid.layout(800, 600);
+		gridview.layout(800, 600);
 
 		const view1 = new TestView(50, Number.MAX_VALUE, 50, Number.MAX_VALUE);
-		grid.addView(view1, 200, [0]);
+		gridview.addView(view1, 200, [0]);
 		assert.deepEqual(view1.size, [800, 600]);
-		assert.deepEqual(grid.getViewSize([0]), { width: 800, height: 600 });
+		assert.deepEqual(gridview.getViewSize([0]), { width: 800, height: 600 });
 
 		const view2 = new TestView(50, Number.MAX_VALUE, 50, Number.MAX_VALUE);
-		grid.addView(view2, 200, [0]);
+		gridview.addView(view2, 200, [0]);
 		assert.deepEqual(view1.size, [800, 400]);
-		assert.deepEqual(grid.getViewSize([1]), { width: 800, height: 400 });
+		assert.deepEqual(gridview.getViewSize([1]), { width: 800, height: 400 });
 		assert.deepEqual(view2.size, [800, 200]);
-		assert.deepEqual(grid.getViewSize([0]), { width: 800, height: 200 });
+		assert.deepEqual(gridview.getViewSize([0]), { width: 800, height: 200 });
 
 		const view3 = new TestView(50, Number.MAX_VALUE, 50, Number.MAX_VALUE);
-		grid.addView(view3, 200, [1, 1]);
+		gridview.addView(view3, 200, [1, 1]);
 		assert.deepEqual(view1.size, [600, 400]);
-		assert.deepEqual(grid.getViewSize([1, 0]), { width: 600, height: 400 });
+		assert.deepEqual(gridview.getViewSize([1, 0]), { width: 600, height: 400 });
 		assert.deepEqual(view2.size, [800, 200]);
-		assert.deepEqual(grid.getViewSize([0]), { width: 800, height: 200 });
+		assert.deepEqual(gridview.getViewSize([0]), { width: 800, height: 200 });
 		assert.deepEqual(view3.size, [200, 400]);
-		assert.deepEqual(grid.getViewSize([1, 1]), { width: 200, height: 400 });
+		assert.deepEqual(gridview.getViewSize([1, 1]), { width: 200, height: 400 });
 
 		const view4 = new TestView(50, Number.MAX_VALUE, 50, Number.MAX_VALUE);
-		grid.addView(view4, 200, [0, 0]);
+		gridview.addView(view4, 200, [0, 0]);
 		assert.deepEqual(view1.size, [600, 400]);
-		assert.deepEqual(grid.getViewSize([1, 0]), { width: 600, height: 400 });
+		assert.deepEqual(gridview.getViewSize([1, 0]), { width: 600, height: 400 });
 		assert.deepEqual(view2.size, [600, 200]);
-		assert.deepEqual(grid.getViewSize([0, 1]), { width: 600, height: 200 });
+		assert.deepEqual(gridview.getViewSize([0, 1]), { width: 600, height: 200 });
 		assert.deepEqual(view3.size, [200, 400]);
-		assert.deepEqual(grid.getViewSize([1, 1]), { width: 200, height: 400 });
+		assert.deepEqual(gridview.getViewSize([1, 1]), { width: 200, height: 400 });
 		assert.deepEqual(view4.size, [200, 200]);
-		assert.deepEqual(grid.getViewSize([0, 0]), { width: 200, height: 200 });
+		assert.deepEqual(gridview.getViewSize([0, 0]), { width: 200, height: 200 });
 
 		const view5 = new TestView(50, Number.MAX_VALUE, 50, Number.MAX_VALUE);
-		grid.addView(view5, 100, [1, 0, 1]);
+		gridview.addView(view5, 100, [1, 0, 1]);
 		assert.deepEqual(view1.size, [600, 300]);
-		assert.deepEqual(grid.getViewSize([1, 0, 0]), { width: 600, height: 300 });
+		assert.deepEqual(gridview.getViewSize([1, 0, 0]), { width: 600, height: 300 });
 		assert.deepEqual(view2.size, [600, 200]);
-		assert.deepEqual(grid.getViewSize([0, 1]), { width: 600, height: 200 });
+		assert.deepEqual(gridview.getViewSize([0, 1]), { width: 600, height: 200 });
 		assert.deepEqual(view3.size, [200, 400]);
-		assert.deepEqual(grid.getViewSize([1, 1]), { width: 200, height: 400 });
+		assert.deepEqual(gridview.getViewSize([1, 1]), { width: 200, height: 400 });
 		assert.deepEqual(view4.size, [200, 200]);
-		assert.deepEqual(grid.getViewSize([0, 0]), { width: 200, height: 200 });
+		assert.deepEqual(gridview.getViewSize([0, 0]), { width: 200, height: 200 });
 		assert.deepEqual(view5.size, [600, 100]);
-		assert.deepEqual(grid.getViewSize([1, 0, 1]), { width: 600, height: 100 });
+		assert.deepEqual(gridview.getViewSize([1, 0, 1]), { width: 600, height: 100 });
 	});
 
 	test('simple layout with automatic size distribution', function () {
-		const grid = new GridView(container);
-		grid.layout(800, 600);
+		gridview.layout(800, 600);
 
 		const view1 = new TestView(50, Number.MAX_VALUE, 50, Number.MAX_VALUE);
-		grid.addView(view1, Sizing.Distribute, [0]);
+		gridview.addView(view1, Sizing.Distribute, [0]);
 		assert.deepEqual(view1.size, [800, 600]);
-		assert.deepEqual(grid.getViewSize([0]), { width: 800, height: 600 });
+		assert.deepEqual(gridview.getViewSize([0]), { width: 800, height: 600 });
 
 		const view2 = new TestView(50, Number.MAX_VALUE, 50, Number.MAX_VALUE);
-		grid.addView(view2, Sizing.Distribute, [0]);
+		gridview.addView(view2, Sizing.Distribute, [0]);
 		assert.deepEqual(view1.size, [800, 300]);
 		assert.deepEqual(view2.size, [800, 300]);
 
 		const view3 = new TestView(50, Number.MAX_VALUE, 50, Number.MAX_VALUE);
-		grid.addView(view3, Sizing.Distribute, [1, 1]);
+		gridview.addView(view3, Sizing.Distribute, [1, 1]);
 		assert.deepEqual(view1.size, [400, 300]);
 		assert.deepEqual(view2.size, [800, 300]);
 		assert.deepEqual(view3.size, [400, 300]);
 
 		const view4 = new TestView(50, Number.MAX_VALUE, 50, Number.MAX_VALUE);
-		grid.addView(view4, Sizing.Distribute, [0, 0]);
+		gridview.addView(view4, Sizing.Distribute, [0, 0]);
 		assert.deepEqual(view1.size, [400, 300]);
 		assert.deepEqual(view2.size, [400, 300]);
 		assert.deepEqual(view3.size, [400, 300]);
 		assert.deepEqual(view4.size, [400, 300]);
 
 		const view5 = new TestView(50, Number.MAX_VALUE, 50, Number.MAX_VALUE);
-		grid.addView(view5, Sizing.Distribute, [1, 0, 1]);
+		gridview.addView(view5, Sizing.Distribute, [1, 0, 1]);
 		assert.deepEqual(view1.size, [400, 150]);
 		assert.deepEqual(view2.size, [400, 300]);
 		assert.deepEqual(view3.size, [400, 300]);
@@ -195,40 +193,38 @@ suite('Gridview', function () {
 	});
 
 	test('addviews before layout call 1', function () {
-		const grid = new GridView(container);
 
 		const view1 = new TestView(50, Number.MAX_VALUE, 50, Number.MAX_VALUE);
-		grid.addView(view1, 200, [0]);
+		gridview.addView(view1, 200, [0]);
 
 		const view2 = new TestView(50, Number.MAX_VALUE, 50, Number.MAX_VALUE);
-		grid.addView(view2, 200, [0]);
+		gridview.addView(view2, 200, [0]);
 
 		const view3 = new TestView(50, Number.MAX_VALUE, 50, Number.MAX_VALUE);
-		grid.addView(view3, 200, [1, 1]);
+		gridview.addView(view3, 200, [1, 1]);
 
-		grid.layout(800, 600);
+		gridview.layout(800, 600);
 
-		assert.deepEqual(view1.size, [50, 550]);
-		assert.deepEqual(view2.size, [800, 50]);
-		assert.deepEqual(view3.size, [750, 550]);
+		assert.deepEqual(view1.size, [400, 300]);
+		assert.deepEqual(view2.size, [800, 300]);
+		assert.deepEqual(view3.size, [400, 300]);
 	});
 
 	test('addviews before layout call 2', function () {
-		const grid = new GridView(container);
 
 		const view1 = new TestView(50, Number.MAX_VALUE, 50, Number.MAX_VALUE);
-		grid.addView(view1, 200, [0]);
+		gridview.addView(view1, 200, [0]);
 
 		const view2 = new TestView(50, Number.MAX_VALUE, 50, Number.MAX_VALUE);
-		grid.addView(view2, 200, [0]);
+		gridview.addView(view2, 200, [0]);
 
 		const view3 = new TestView(50, Number.MAX_VALUE, 50, Number.MAX_VALUE);
-		grid.addView(view3, 200, [0, 0]);
+		gridview.addView(view3, 200, [0, 0]);
 
-		grid.layout(800, 600);
+		gridview.layout(800, 600);
 
-		assert.deepEqual(view1.size, [800, 550]);
-		assert.deepEqual(view2.size, [750, 50]);
-		assert.deepEqual(view3.size, [50, 50]);
+		assert.deepEqual(view1.size, [800, 300]);
+		assert.deepEqual(view2.size, [400, 300]);
+		assert.deepEqual(view3.size, [400, 300]);
 	});
-});
\ No newline at end of file
+});
diff --git a/src/vs/base/test/browser/ui/list/listView.test.ts b/src/vs/base/test/browser/ui/list/listView.test.ts
new file mode 100644
index 00000000000..2dc54b4253f
--- /dev/null
+++ b/src/vs/base/test/browser/ui/list/listView.test.ts
@@ -0,0 +1,41 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as assert from 'assert';
+import { ListView } from 'vs/base/browser/ui/list/listView';
+import { IVirtualDelegate, IRenderer } from 'vs/base/browser/ui/list/list';
+import { range } from 'vs/base/common/arrays';
+
+suite('ListView', function () {
+	test('all rows get disposed', function () {
+		const element = document.createElement('div');
+		element.style.height = '200px';
+		element.style.width = '200px';
+
+		const delegate: IVirtualDelegate<number> = {
+			getHeight() { return 20; },
+			getTemplateId() { return 'template'; }
+		};
+
+		let templatesCount = 0;
+
+		const renderer: IRenderer<number, void> = {
+			templateId: 'template',
+			renderTemplate() { templatesCount++; },
+			renderElement() { },
+			disposeElement() { },
+			disposeTemplate() { templatesCount--; }
+		};
+
+		const listView = new ListView<number>(element, delegate, [renderer]);
+		listView.layout(200);
+
+		assert.equal(templatesCount, 0, 'no templates have been allocated');
+		listView.splice(0, 0, range(100));
+		assert.equal(templatesCount, 10, 'some templates have been allocated');
+		listView.dispose();
+		assert.equal(templatesCount, 0, 'all templates have been disposed');
+	});
+});
\ No newline at end of file
diff --git a/src/vs/base/test/browser/ui/splitview/splitview.test.ts b/src/vs/base/test/browser/ui/splitview/splitview.test.ts
index e4039acacdf..619fa4dfa14 100644
--- a/src/vs/base/test/browser/ui/splitview/splitview.test.ts
+++ b/src/vs/base/test/browser/ui/splitview/splitview.test.ts
@@ -261,16 +261,16 @@ suite('Splitview', () => {
 		view1.dispose();
 	});
 
-	test.skip('sashes are properly enabled/disabled', () => {
+	test('sashes are properly enabled/disabled', () => {
 		const view1 = new TestView(20, Number.POSITIVE_INFINITY);
 		const view2 = new TestView(20, Number.POSITIVE_INFINITY);
 		const view3 = new TestView(20, Number.POSITIVE_INFINITY);
 		const splitview = new SplitView(container);
 		splitview.layout(200);
 
-		splitview.addView(view1, 20);
-		splitview.addView(view2, 20);
-		splitview.addView(view3, 20);
+		splitview.addView(view1, Sizing.Distribute);
+		splitview.addView(view2, Sizing.Distribute);
+		splitview.addView(view3, Sizing.Distribute);
 
 		let sashes = getSashes(splitview);
 		assert.equal(sashes.length, 2, 'there are two sashes');
@@ -298,10 +298,14 @@ suite('Splitview', () => {
 		assert.equal(sashes[1].state, SashState.Disabled, 'second sash is disabled');
 
 		view1.maximumSize = 300;
-		assert.equal(sashes[0].state, SashState.Enabled, 'first sash is enabled');
-		assert.equal(sashes[1].state, SashState.Enabled, 'second sash is enabled');
+		assert.equal(sashes[0].state, SashState.Minimum, 'first sash is enabled');
+		assert.equal(sashes[1].state, SashState.Minimum, 'second sash is enabled');
 
 		view2.maximumSize = 200;
+		assert.equal(sashes[0].state, SashState.Minimum, 'first sash is enabled');
+		assert.equal(sashes[1].state, SashState.Minimum, 'second sash is enabled');
+
+		splitview.resizeView(0, 40);
 		assert.equal(sashes[0].state, SashState.Enabled, 'first sash is enabled');
 		assert.equal(sashes[1].state, SashState.Enabled, 'second sash is enabled');
 
@@ -376,7 +380,51 @@ suite('Splitview', () => {
 		splitview.addView(view3, 25);
 
 		splitview.layout(200);
-		assert.deepEqual([view1.size, view2.size, view3.size], [20, 20, 160]);
+		assert.deepEqual([view1.size, view2.size, view3.size], [67, 67, 66]);
+
+		splitview.dispose();
+		view3.dispose();
+		view2.dispose();
+		view1.dispose();
+	});
+
+	test('split sizing', () => {
+		const view1 = new TestView(20, Number.POSITIVE_INFINITY);
+		const view2 = new TestView(20, Number.POSITIVE_INFINITY);
+		const view3 = new TestView(20, Number.POSITIVE_INFINITY);
+		const splitview = new SplitView(container);
+		splitview.layout(200);
+
+		splitview.addView(view1, Sizing.Distribute);
+		assert.equal(view1.size, 200);
+
+		splitview.addView(view2, Sizing.Split(0));
+		assert.deepEqual([view1.size, view2.size], [100, 100]);
+
+		splitview.addView(view3, Sizing.Split(1));
+		assert.deepEqual([view1.size, view2.size, view3.size], [100, 50, 50]);
+
+		splitview.dispose();
+		view3.dispose();
+		view2.dispose();
+		view1.dispose();
+	});
+
+	test('split sizing 2', () => {
+		const view1 = new TestView(20, Number.POSITIVE_INFINITY);
+		const view2 = new TestView(20, Number.POSITIVE_INFINITY);
+		const view3 = new TestView(20, Number.POSITIVE_INFINITY);
+		const splitview = new SplitView(container);
+		splitview.layout(200);
+
+		splitview.addView(view1, Sizing.Distribute);
+		assert.equal(view1.size, 200);
+
+		splitview.addView(view2, Sizing.Split(0));
+		assert.deepEqual([view1.size, view2.size], [100, 100]);
+
+		splitview.addView(view3, Sizing.Split(0));
+		assert.deepEqual([view1.size, view2.size, view3.size], [50, 100, 50]);
 
 		splitview.dispose();
 		view3.dispose();
diff --git a/src/vs/base/test/browser/ui/tree/treeModel.test.ts b/src/vs/base/test/browser/ui/tree/treeModel.test.ts
new file mode 100644
index 00000000000..71d44e275e2
--- /dev/null
+++ b/src/vs/base/test/browser/ui/tree/treeModel.test.ts
@@ -0,0 +1,334 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as assert from 'assert';
+import { TreeModel, ITreeNode } from 'vs/base/browser/ui/tree/treeModel';
+import { ISpliceable } from 'vs/base/common/sequence';
+import { Iterator } from 'vs/base/common/iterator';
+
+function toSpliceable<T>(arr: T[]): ISpliceable<T> {
+	return {
+		splice(start: number, deleteCount: number, elements: T[]): void {
+			arr.splice(start, deleteCount, ...elements);
+		}
+	};
+}
+
+function toArray<T>(list: ITreeNode<T>[]): T[] {
+	return list.map(i => i.element);
+}
+
+suite('TreeModel2', function () {
+
+	test('ctor', function () {
+		const list = [] as ITreeNode<number>[];
+		const model = new TreeModel<number>(toSpliceable(list));
+		assert(model);
+		assert.equal(list.length, 0);
+	});
+
+	test('insert', function () {
+		const list = [] as ITreeNode<number>[];
+		const model = new TreeModel<number>(toSpliceable(list));
+
+		model.splice([0], 0, Iterator.iterate([
+			{ element: 0 },
+			{ element: 1 },
+			{ element: 2 }
+		]));
+
+		assert.deepEqual(list.length, 3);
+		assert.deepEqual(list[0].element, 0);
+		assert.deepEqual(list[0].collapsed, false);
+		assert.deepEqual(list[0].depth, 1);
+		assert.deepEqual(list[1].element, 1);
+		assert.deepEqual(list[1].collapsed, false);
+		assert.deepEqual(list[1].depth, 1);
+		assert.deepEqual(list[2].element, 2);
+		assert.deepEqual(list[2].collapsed, false);
+		assert.deepEqual(list[2].depth, 1);
+	});
+
+	test('deep insert', function () {
+		const list = [] as ITreeNode<number>[];
+		const model = new TreeModel<number>(toSpliceable(list));
+
+		model.splice([0], 0, Iterator.iterate([
+			{
+				element: 0, children: Iterator.iterate([
+					{ element: 10 },
+					{ element: 11 },
+					{ element: 12 },
+				])
+			},
+			{ element: 1 },
+			{ element: 2 }
+		]));
+
+		assert.deepEqual(list.length, 6);
+		assert.deepEqual(list[0].element, 0);
+		assert.deepEqual(list[0].collapsed, false);
+		assert.deepEqual(list[0].depth, 1);
+		assert.deepEqual(list[1].element, 10);
+		assert.deepEqual(list[1].collapsed, false);
+		assert.deepEqual(list[1].depth, 2);
+		assert.deepEqual(list[2].element, 11);
+		assert.deepEqual(list[2].collapsed, false);
+		assert.deepEqual(list[2].depth, 2);
+		assert.deepEqual(list[3].element, 12);
+		assert.deepEqual(list[3].collapsed, false);
+		assert.deepEqual(list[3].depth, 2);
+		assert.deepEqual(list[4].element, 1);
+		assert.deepEqual(list[4].collapsed, false);
+		assert.deepEqual(list[4].depth, 1);
+		assert.deepEqual(list[5].element, 2);
+		assert.deepEqual(list[5].collapsed, false);
+		assert.deepEqual(list[5].depth, 1);
+	});
+
+	test('deep insert collapsed', function () {
+		const list = [] as ITreeNode<number>[];
+		const model = new TreeModel<number>(toSpliceable(list));
+
+		model.splice([0], 0, Iterator.iterate([
+			{
+				element: 0, collapsed: true, children: Iterator.iterate([
+					{ element: 10 },
+					{ element: 11 },
+					{ element: 12 },
+				])
+			},
+			{ element: 1 },
+			{ element: 2 }
+		]));
+
+		assert.deepEqual(list.length, 3);
+		assert.deepEqual(list[0].element, 0);
+		assert.deepEqual(list[0].collapsed, true);
+		assert.deepEqual(list[0].depth, 1);
+		assert.deepEqual(list[1].element, 1);
+		assert.deepEqual(list[1].collapsed, false);
+		assert.deepEqual(list[1].depth, 1);
+		assert.deepEqual(list[2].element, 2);
+		assert.deepEqual(list[2].collapsed, false);
+		assert.deepEqual(list[2].depth, 1);
+	});
+
+	test('delete', function () {
+		const list = [] as ITreeNode<number>[];
+		const model = new TreeModel<number>(toSpliceable(list));
+
+		model.splice([0], 0, Iterator.iterate([
+			{ element: 0 },
+			{ element: 1 },
+			{ element: 2 }
+		]));
+
+		assert.deepEqual(list.length, 3);
+
+		model.splice([1], 1);
+		assert.deepEqual(list.length, 2);
+		assert.deepEqual(list[0].element, 0);
+		assert.deepEqual(list[0].collapsed, false);
+		assert.deepEqual(list[0].depth, 1);
+		assert.deepEqual(list[1].element, 2);
+		assert.deepEqual(list[1].collapsed, false);
+		assert.deepEqual(list[1].depth, 1);
+
+		model.splice([0], 2);
+		assert.deepEqual(list.length, 0);
+	});
+
+	test('nested delete', function () {
+		const list = [] as ITreeNode<number>[];
+		const model = new TreeModel<number>(toSpliceable(list));
+
+		model.splice([0], 0, Iterator.iterate([
+			{
+				element: 0, children: Iterator.iterate([
+					{ element: 10 },
+					{ element: 11 },
+					{ element: 12 },
+				])
+			},
+			{ element: 1 },
+			{ element: 2 }
+		]));
+
+		assert.deepEqual(list.length, 6);
+
+		model.splice([1], 2);
+		assert.deepEqual(list.length, 4);
+		assert.deepEqual(list[0].element, 0);
+		assert.deepEqual(list[0].collapsed, false);
+		assert.deepEqual(list[0].depth, 1);
+		assert.deepEqual(list[1].element, 10);
+		assert.deepEqual(list[1].collapsed, false);
+		assert.deepEqual(list[1].depth, 2);
+		assert.deepEqual(list[2].element, 11);
+		assert.deepEqual(list[2].collapsed, false);
+		assert.deepEqual(list[2].depth, 2);
+		assert.deepEqual(list[3].element, 12);
+		assert.deepEqual(list[3].collapsed, false);
+		assert.deepEqual(list[3].depth, 2);
+	});
+
+	test('deep delete', function () {
+		const list = [] as ITreeNode<number>[];
+		const model = new TreeModel<number>(toSpliceable(list));
+
+		model.splice([0], 0, Iterator.iterate([
+			{
+				element: 0, children: Iterator.iterate([
+					{ element: 10 },
+					{ element: 11 },
+					{ element: 12 },
+				])
+			},
+			{ element: 1 },
+			{ element: 2 }
+		]));
+
+		assert.deepEqual(list.length, 6);
+
+		model.splice([0], 1);
+		assert.deepEqual(list.length, 2);
+		assert.deepEqual(list[0].element, 1);
+		assert.deepEqual(list[0].collapsed, false);
+		assert.deepEqual(list[0].depth, 1);
+		assert.deepEqual(list[1].element, 2);
+		assert.deepEqual(list[1].collapsed, false);
+		assert.deepEqual(list[1].depth, 1);
+	});
+
+	test('hidden delete', function () {
+		const list = [] as ITreeNode<number>[];
+		const model = new TreeModel<number>(toSpliceable(list));
+
+		model.splice([0], 0, Iterator.iterate([
+			{
+				element: 0, collapsed: true, children: Iterator.iterate([
+					{ element: 10 },
+					{ element: 11 },
+					{ element: 12 },
+				])
+			},
+			{ element: 1 },
+			{ element: 2 }
+		]));
+
+		assert.deepEqual(list.length, 3);
+
+		model.splice([0, 1], 1);
+		assert.deepEqual(list.length, 3);
+
+		model.splice([0, 0], 2);
+		assert.deepEqual(list.length, 3);
+	});
+
+	test('collapse', function () {
+		const list = [] as ITreeNode<number>[];
+		const model = new TreeModel<number>(toSpliceable(list));
+
+		model.splice([0], 0, Iterator.iterate([
+			{
+				element: 0, children: Iterator.iterate([
+					{ element: 10 },
+					{ element: 11 },
+					{ element: 12 },
+				])
+			},
+			{ element: 1 },
+			{ element: 2 }
+		]));
+
+		assert.deepEqual(list.length, 6);
+
+		model.setCollapsed([0], true);
+		assert.deepEqual(list.length, 3);
+		assert.deepEqual(list[0].element, 0);
+		assert.deepEqual(list[0].collapsed, true);
+		assert.deepEqual(list[0].depth, 1);
+		assert.deepEqual(list[1].element, 1);
+		assert.deepEqual(list[1].collapsed, false);
+		assert.deepEqual(list[1].depth, 1);
+		assert.deepEqual(list[2].element, 2);
+		assert.deepEqual(list[2].collapsed, false);
+		assert.deepEqual(list[2].depth, 1);
+	});
+
+	// test('expand', function () {
+	// 	const list = [] as ITreeNode<number>[];
+	// 	const model = new TreeModel<number>(toSpliceable(list));
+
+	// 	model.splice([0], 0, Iterator.iterate([
+	// 		{
+	// 			element: 0, collapsed: true, children: Iterator.iterate([
+	// 				{ element: 10 },
+	// 				{ element: 11 },
+	// 				{ element: 12 },
+	// 			])
+	// 		},
+	// 		{ element: 1 },
+	// 		{ element: 2 }
+	// 	]));
+
+	// 	assert.deepEqual(list.length, 3);
+
+	// 	model.setCollapsed([0], false);
+	// 	assert.deepEqual(list.length, 6);
+	// 	assert.deepEqual(list[0].element, 0);
+	// 	assert.deepEqual(list[0].collapsed, false);
+	// 	assert.deepEqual(list[0].depth, 1);
+	// 	assert.deepEqual(list[1].element, 10);
+	// 	assert.deepEqual(list[1].collapsed, false);
+	// 	assert.deepEqual(list[1].depth, 2);
+	// 	assert.deepEqual(list[2].element, 11);
+	// 	assert.deepEqual(list[2].collapsed, false);
+	// 	assert.deepEqual(list[2].depth, 2);
+	// 	assert.deepEqual(list[3].element, 12);
+	// 	assert.deepEqual(list[3].collapsed, false);
+	// 	assert.deepEqual(list[3].depth, 2);
+	// 	assert.deepEqual(list[4].element, 1);
+	// 	assert.deepEqual(list[4].collapsed, false);
+	// 	assert.deepEqual(list[4].depth, 1);
+	// 	assert.deepEqual(list[5].element, 2);
+	// 	assert.deepEqual(list[5].collapsed, false);
+	// 	assert.deepEqual(list[5].depth, 1);
+	// });
+
+	test('collapse should recursively adjust visible count', function () {
+		const list = [] as ITreeNode<number>[];
+		const model = new TreeModel<number>(toSpliceable(list));
+
+		model.splice([0], 0, Iterator.iterate([
+			{
+				element: 1, children: [
+					{
+						element: 11, children: [
+							{ element: 111 }
+						]
+					}
+				]
+			},
+			{
+				element: 2, children: [
+					{ element: 21 }
+				]
+			}
+		]));
+
+		assert.deepEqual(list.length, 5);
+		assert.deepEqual(toArray(list), [1, 11, 111, 2, 21]);
+
+		model.setCollapsed([0, 0], true);
+		assert.deepEqual(list.length, 4);
+		assert.deepEqual(toArray(list), [1, 11, 2, 21]);
+
+		model.setCollapsed([1], true);
+		assert.deepEqual(list.length, 3);
+		assert.deepEqual(toArray(list), [1, 11, 2]);
+	});
+});
\ No newline at end of file
diff --git a/src/vs/base/test/common/arrays.test.ts b/src/vs/base/test/common/arrays.test.ts
index 3a8126f0bf2..cff3a614965 100644
--- a/src/vs/base/test/common/arrays.test.ts
+++ b/src/vs/base/test/common/arrays.test.ts
@@ -52,6 +52,11 @@ suite('Arrays', () => {
 		assert.deepEqual(data, [1, 2, 3, 4, 5, 6, 7, 8]);
 	});
 
+	test('mergeSort, sorted array', function () {
+		let data = arrays.mergeSort([1, 2, 3, 4, 5, 6], (a, b) => a - b);
+		assert.deepEqual(data, [1, 2, 3, 4, 5, 6]);
+	});
+
 	test('mergeSort, is stable', function () {
 
 		let numbers = arrays.mergeSort([33, 22, 11, 4, 99, 1], (a, b) => 0);
@@ -304,5 +309,43 @@ suite('Arrays', () => {
 		sparse = arrays.coalesce(sparse);
 		assert.equal(sparse.length, 5);
 	});
+
+	test('coalesce - inplace', function () {
+		let a = [null, 1, null, 2, 3];
+		arrays.coalesce(a, true);
+		assert.equal(a.length, 3);
+		assert.equal(a[0], 1);
+		assert.equal(a[1], 2);
+		assert.equal(a[2], 3);
+
+		a = [null, 1, null, void 0, undefined, 2, 3];
+		arrays.coalesce(a, true);
+		assert.equal(a.length, 3);
+		assert.equal(a[0], 1);
+		assert.equal(a[1], 2);
+		assert.equal(a[2], 3);
+
+		let b = [];
+		b[10] = 1;
+		b[20] = 2;
+		b[30] = 3;
+		arrays.coalesce(b, true);
+		assert.equal(b.length, 3);
+		assert.equal(b[0], 1);
+		assert.equal(b[1], 2);
+		assert.equal(b[2], 3);
+
+		let sparse = [];
+		sparse[0] = 1;
+		sparse[1] = 1;
+		sparse[17] = 1;
+		sparse[1000] = 1;
+		sparse[1001] = 1;
+
+		assert.equal(sparse.length, 1002);
+
+		arrays.coalesce(sparse, true);
+		assert.equal(sparse.length, 5);
+	});
 });
 
diff --git a/src/vs/base/test/common/async.test.ts b/src/vs/base/test/common/async.test.ts
index d1ef408cb3f..af519745523 100644
--- a/src/vs/base/test/common/async.test.ts
+++ b/src/vs/base/test/common/async.test.ts
@@ -5,20 +5,149 @@
 'use strict';
 
 import * as assert from 'assert';
+import * as async from 'vs/base/common/async';
+import { isPromiseCanceledError } from 'vs/base/common/errors';
+import { URI } from 'vs/base/common/uri';
 import { TPromise } from 'vs/base/common/winjs.base';
-import * as Async from 'vs/base/common/async';
-import URI from 'vs/base/common/uri';
 
 suite('Async', () => {
 
-	test('asDisposablePromise', async function () {
-		let value = await Async.asDisposablePromise(TPromise.as(1)).promise;
-		assert.equal(value, 1);
+	test('cancelablePromise - set token, don\'t wait for inner promise', function () {
+		let canceled = 0;
+		let promise = async.createCancelablePromise(token => {
+			token.onCancellationRequested(_ => { canceled += 1; });
+			return new Promise(resolve => { /*never*/ });
+		});
+		let result = promise.then(_ => assert.ok(false), err => {
+			assert.equal(canceled, 1);
+			assert.ok(isPromiseCanceledError(err));
+		});
+		promise.cancel();
+		promise.cancel(); // cancel only once
+		return result;
+	});
 
-		let disposablePromise = Async.asDisposablePromise(TPromise.timeout(1000).then(_ => 1), 2);
-		disposablePromise.dispose();
-		value = await disposablePromise.promise;
-		assert.equal(value, 2);
+	test('cancelablePromise - cancel despite inner promise being resolved', function () {
+		let canceled = 0;
+		let promise = async.createCancelablePromise(token => {
+			token.onCancellationRequested(_ => { canceled += 1; });
+			return Promise.resolve(1234);
+		});
+		let result = promise.then(_ => assert.ok(false), err => {
+			assert.equal(canceled, 1);
+			assert.ok(isPromiseCanceledError(err));
+		});
+		promise.cancel();
+		return result;
+	});
+
+	// test('Cancel callback behaviour', async function () {
+	// 	let withCancelCallback = new WinJsPromise(() => { }, () => { });
+	// 	let withoutCancelCallback = new TPromise(() => { });
+
+	// 	withCancelCallback.cancel();
+	// 	(withoutCancelCallback as WinJsPromise).cancel();
+
+	// 	await withCancelCallback.then(undefined, err => { assert.ok(isPromiseCanceledError(err)); });
+	// 	await withoutCancelCallback.then(undefined, err => { assert.ok(isPromiseCanceledError(err)); });
+	// });
+
+	// Cancelling a sync cancelable promise will fire the cancelled token.
+	// Also, every `then` callback runs in another execution frame.
+	test('CancelablePromise execution order (sync)', function () {
+		const order = [];
+
+		const cancellablePromise = async.createCancelablePromise(token => {
+			order.push('in callback');
+			token.onCancellationRequested(_ => order.push('cancelled'));
+			return Promise.resolve(1234);
+		});
+
+		order.push('afterCreate');
+
+		const promise = cancellablePromise
+			.then(null, err => null)
+			.then(() => order.push('finally'));
+
+		cancellablePromise.cancel();
+		order.push('afterCancel');
+
+		return promise.then(() => assert.deepEqual(order, ['in callback', 'afterCreate', 'cancelled', 'afterCancel', 'finally']));
+	});
+
+	// Cancelling an async cancelable promise is just the same as a sync cancellable promise.
+	test('CancelablePromise execution order (async)', function () {
+		const order = [];
+
+		const cancellablePromise = async.createCancelablePromise(token => {
+			order.push('in callback');
+			token.onCancellationRequested(_ => order.push('cancelled'));
+			return new Promise(c => setTimeout(c(1234), 0));
+		});
+
+		order.push('afterCreate');
+
+		const promise = cancellablePromise
+			.then(null, err => null)
+			.then(() => order.push('finally'));
+
+		cancellablePromise.cancel();
+		order.push('afterCancel');
+
+		return promise.then(() => assert.deepEqual(order, ['in callback', 'afterCreate', 'cancelled', 'afterCancel', 'finally']));
+	});
+
+	// // Cancelling a sync tpromise will NOT cancel the promise, since it has resolved already.
+	// // Every `then` callback runs sync in the same execution frame, thus `finally` executes
+	// // before `afterCancel`.
+	// test('TPromise execution order (sync)', function () {
+	// 	const order = [];
+	// 	let promise = new WinJsPromise(resolve => {
+	// 		order.push('in executor');
+	// 		resolve(1234);
+	// 	}, () => order.push('cancelled'));
+
+	// 	order.push('afterCreate');
+
+	// 	promise = promise
+	// 		.then(null, err => null)
+	// 		.then(() => order.push('finally'));
+
+	// 	promise.cancel();
+	// 	order.push('afterCancel');
+
+	// 	return promise.then(() => assert.deepEqual(order, ['in executor', 'afterCreate', 'finally', 'afterCancel']));
+	// });
+
+	// // Cancelling an async tpromise will cancel the promise.
+	// // Every `then` callback runs sync on the same execution frame as the `cancel` call,
+	// // so finally still executes before `afterCancel`.
+	// test('TPromise execution order (async)', function () {
+	// 	const order = [];
+	// 	let promise = new WinJsPromise(resolve => {
+	// 		order.push('in executor');
+	// 		setTimeout(() => resolve(1234));
+	// 	}, () => order.push('cancelled'));
+
+	// 	order.push('afterCreate');
+
+	// 	promise = promise
+	// 		.then(null, err => null)
+	// 		.then(() => order.push('finally'));
+
+	// 	promise.cancel();
+	// 	order.push('afterCancel');
+
+	// 	return promise.then(() => assert.deepEqual(order, ['in executor', 'afterCreate', 'cancelled', 'finally', 'afterCancel']));
+	// });
+
+	test('cancelablePromise - get inner result', async function () {
+		let promise = async.createCancelablePromise(token => {
+			return async.timeout(12).then(_ => 1234);
+		});
+
+		let result = await promise;
+		assert.equal(result, 1234);
 	});
 
 	test('Throttler - non async', function () {
@@ -27,7 +156,7 @@ suite('Async', () => {
 			return TPromise.as(++count);
 		};
 
-		let throttler = new Async.Throttler();
+		let throttler = new async.Throttler();
 
 		return TPromise.join([
 			throttler.queue(factory).then((result) => { assert.equal(result, 1); }),
@@ -40,13 +169,9 @@ suite('Async', () => {
 
 	test('Throttler', function () {
 		let count = 0;
-		let factory = () => {
-			return TPromise.timeout(0).then(() => {
-				return ++count;
-			});
-		};
+		let factory = () => TPromise.wrap(async.timeout(0)).then(() => ++count);
 
-		let throttler = new Async.Throttler();
+		let throttler = new async.Throttler();
 
 		return TPromise.join([
 			throttler.queue(factory).then((result) => { assert.equal(result, 1); }),
@@ -65,81 +190,12 @@ suite('Async', () => {
 		});
 	});
 
-	test('Throttler - cancel should not cancel other promises', function () {
-		let count = 0;
-		let factory = () => {
-			return TPromise.timeout(0).then(() => {
-				return ++count;
-			});
-		};
-
-		let throttler = new Async.Throttler();
-		let p1: TPromise;
-
-		const p = TPromise.join([
-			p1 = throttler.queue(factory).then((result) => { assert(false, 'should not be here, 1'); }, () => { assert(true, 'yes, it was cancelled'); }),
-			throttler.queue(factory).then((result) => { assert.equal(result, 1); }, () => { assert(false, 'should not be here, 2'); }),
-			throttler.queue(factory).then((result) => { assert.equal(result, 1); }, () => { assert(false, 'should not be here, 3'); }),
-			throttler.queue(factory).then((result) => { assert.equal(result, 1); }, () => { assert(false, 'should not be here, 4'); })
-		]);
-
-		p1.cancel();
-
-		return p;
-	});
-
-	test('Throttler - cancel the first queued promise should not cancel other promises', function () {
-		let count = 0;
-		let factory = () => {
-			return TPromise.timeout(0).then(() => {
-				return ++count;
-			});
-		};
-
-		let throttler = new Async.Throttler();
-		let p2: TPromise;
-
-		const p = TPromise.join([
-			throttler.queue(factory).then((result) => { assert.equal(result, 1); }, () => { assert(false, 'should not be here, 1'); }),
-			p2 = throttler.queue(factory).then((result) => { assert(false, 'should not be here, 2'); }, () => { assert(true, 'yes, it was cancelled'); }),
-			throttler.queue(factory).then((result) => { assert.equal(result, 2); }, () => { assert(false, 'should not be here, 3'); }),
-			throttler.queue(factory).then((result) => { assert.equal(result, 2); }, () => { assert(false, 'should not be here, 4'); })
-		]);
-
-		p2.cancel();
-
-		return p;
-	});
-
-	test('Throttler - cancel in the middle should not cancel other promises', function () {
-		let count = 0;
-		let factory = () => {
-			return TPromise.timeout(0).then(() => {
-				return ++count;
-			});
-		};
-
-		let throttler = new Async.Throttler();
-		let p3: TPromise;
-
-		const p = TPromise.join([
-			throttler.queue(factory).then((result) => { assert.equal(result, 1); }, () => { assert(false, 'should not be here, 1'); }),
-			throttler.queue(factory).then((result) => { assert.equal(result, 2); }, () => { assert(false, 'should not be here, 2'); }),
-			p3 = throttler.queue(factory).then((result) => { assert(false, 'should not be here, 3'); }, () => { assert(true, 'yes, it was cancelled'); }),
-			throttler.queue(factory).then((result) => { assert.equal(result, 2); }, () => { assert(false, 'should not be here, 4'); })
-		]);
-
-		p3.cancel();
-
-		return p;
-	});
-
 	test('Throttler - last factory should be the one getting called', function () {
 		let factoryFactory = (n: number) => () => {
-			return TPromise.timeout(0).then(() => n);
+			return TPromise.wrap(async.timeout(0)).then(() => n);
 		};
 
-		let throttler = new Async.Throttler();
+		let throttler = new async.Throttler();
 
 		let promises: TPromise[] = [];
 
@@ -150,37 +206,13 @@ suite('Async', () => {
 		return TPromise.join(promises);
 	});
 
-	test('Throttler - progress should work', function () {
-		let order = 0;
-		let factory = () => new TPromise((c, e, p) => {
-			TPromise.timeout(0).done(() => {
-				p(order++);
-				c(true);
-			});
-		});
-
-		let throttler = new Async.Throttler();
-		let promises: TPromise[] = [];
-		let progresses: any[][] = [[], [], []];
-
-		promises.push(throttler.queue(factory).then(null, null, (p) => progresses[0].push(p)));
-		promises.push(throttler.queue(factory).then(null, null, (p) => progresses[1].push(p)));
-		promises.push(throttler.queue(factory).then(null, null, (p) => progresses[2].push(p)));
-
-		return TPromise.join(promises).then(() => {
-			assert.deepEqual(progresses[0], [0]);
-			assert.deepEqual(progresses[1], [0]);
-			assert.deepEqual(progresses[2], [0]);
-		});
-	});
-
 	test('Delayer', function () {
 		let count = 0;
 		let factory = () => {
 			return TPromise.as(++count);
 		};
 
-		let delayer = new Async.Delayer(0);
+		let delayer = new async.Delayer(0);
 		let promises: TPromise[] = [];
 
 		assert(!delayer.isTriggered());
@@ -205,7 +237,7 @@ suite('Async', () => {
 			return TPromise.as(++count);
 		};
 
-		let delayer = new Async.Delayer(0);
+		let delayer = new async.Delayer(0);
 
 		assert(!delayer.isTriggered());
 
@@ -228,7 +260,7 @@ suite('Async', () => {
 			return TPromise.as(++count);
 		};
 
-		let delayer = new Async.Delayer(0);
+		let delayer = new async.Delayer(0);
 		let promises: TPromise[] = [];
 
 		assert(!delayer.isTriggered());
@@ -255,7 +287,7 @@ suite('Async', () => {
 			return TPromise.as(++count);
 		};
 
-		let delayer = new Async.Delayer(0);
+		let delayer = new async.Delayer(0);
 		let promises: TPromise[] = [];
 
 		assert(!delayer.isTriggered());
@@ -307,7 +339,7 @@ suite('Async', () => {
 			return TPromise.as(n);
 		};
 
-		let delayer = new Async.Delayer(0);
+		let delayer = new async.Delayer(0);
 		let promises: TPromise[] = [];
 
 		assert(!delayer.isTriggered());
@@ -325,60 +357,12 @@ suite('Async', () => {
 		return p;
 	});
 
-	test('Delayer - progress should work', function () {
-		let order = 0;
-		let factory = () => new TPromise((c, e, p) => {
-			TPromise.timeout(0).done(() => {
-				p(order++);
-				c(true);
-			});
-		});
-
-		let delayer = new Async.Delayer(0);
-		let promises: TPromise[] = [];
-		let progresses: any[][] = [[], [], []];
-
-		promises.push(delayer.trigger(factory).then(null, null, (p) => progresses[0].push(p)));
-		promises.push(delayer.trigger(factory).then(null, null, (p) => progresses[1].push(p)));
-		promises.push(delayer.trigger(factory).then(null, null, (p) => progresses[2].push(p)));
-
-		return TPromise.join(promises).then(() => {
-			assert.deepEqual(progresses[0], [0]);
-			assert.deepEqual(progresses[1], [0]);
-			assert.deepEqual(progresses[2], [0]);
-		});
-	});
-
-	test('ThrottledDelayer - progress should work', function () {
-		let order = 0;
-		let factory = () => new TPromise((c, e, p) => {
-			TPromise.timeout(0).done(() => {
-				p(order++);
-				c(true);
-			});
-		});
-
-		let delayer = new Async.ThrottledDelayer(0);
-		let promises: TPromise[] = [];
-		let progresses: any[][] = [[], [], []];
-
-		promises.push(delayer.trigger(factory).then(null, null, (p) => progresses[0].push(p)));
-		promises.push(delayer.trigger(factory).then(null, null, (p) => progresses[1].push(p)));
-		promises.push(delayer.trigger(factory).then(null, null, (p) => progresses[2].push(p)));
-
-		return TPromise.join(promises).then(() => {
-			assert.deepEqual(progresses[0], [0]);
-			assert.deepEqual(progresses[1], [0]);
-			assert.deepEqual(progresses[2], [0]);
-		});
-	});
-
 	test('Sequence', function () {
 		let factoryFactory = (n: number) => () => {
 			return TPromise.as(n);
 		};
 
-		return Async.sequence([
+		return async.sequence([
 			factoryFactory(1),
 			factoryFactory(2),
 			factoryFactory(3),
@@ -399,7 +383,7 @@ suite('Async', () => {
 			return TPromise.as(n);
 		};
 
-		let limiter = new Async.Limiter(1);
+		let limiter = new async.Limiter(1);
 
 		let promises: TPromise[] = [];
 		[0, 1, 2, 3, 4, 5, 6, 7, 8, 9].forEach(n => promises.push(limiter.queue(factoryFactory(n))));
@@ -407,7 +391,7 @@ suite('Async', () => {
 		return TPromise.join(promises).then((res) => {
 			assert.equal(10, res.length);
 
-			limiter = new Async.Limiter(100);
+			limiter = new async.Limiter(100);
 
 			promises = [];
 			[0, 1, 2, 3, 4, 5, 6, 7, 8, 9].forEach(n => promises.push(limiter.queue(factoryFactory(n))));
@@ -419,18 +403,16 @@ suite('Async', () => {
 	});
 
 	test('Limiter - async', function () {
-		let factoryFactory = (n: number) => () => {
-			return TPromise.timeout(0).then(() => n);
-		};
+		let factoryFactory = (n: number) => () => TPromise.wrap(async.timeout(0)).then(() => n);
 
-		let limiter = new Async.Limiter(1);
+		let limiter = new async.Limiter(1);
 		let promises: TPromise[] = [];
 		[0, 1, 2, 3, 4, 5, 6, 7, 8, 9].forEach(n => promises.push(limiter.queue(factoryFactory(n))));
 
 		return TPromise.join(promises).then((res) => {
 			assert.equal(10, res.length);
 
-			limiter = new Async.Limiter(100);
+			limiter = new async.Limiter(100);
 
 			promises = [];
 			[0, 1, 2, 3, 4, 5, 6, 7, 8, 9].forEach(n => promises.push(limiter.queue(factoryFactory(n))));
@@ -446,10 +428,10 @@ suite('Async', () => {
 		let factoryFactory = (n: number) => () => {
 			activePromises++;
 			assert(activePromises < 6);
-			return TPromise.timeout(0).then(() => { activePromises--; return n; });
+			return TPromise.wrap(async.timeout(0)).then(() => { activePromises--; return n; });
 		};
 
-		let limiter = new Async.Limiter(5);
+		let limiter = new async.Limiter(5);
 
 		let promises: TPromise[] = [];
 		[0, 1, 2, 3, 4, 5, 6, 7, 8, 9].forEach(n => promises.push(limiter.queue(factoryFactory(n))));
@@ -461,13 +443,13 @@ suite('Async', () => {
 	});
 
 	test('Queue - simple', function () {
-		let queue = new Async.Queue();
+		let queue = new async.Queue();
 
 		let syncPromise = false;
 		let f1 = () => TPromise.as(true).then(() => syncPromise = true);
 
 		let asyncPromise = false;
-		let f2 = () => TPromise.timeout(10).then(() => asyncPromise = true);
+		let f2 = () => TPromise.wrap(async.timeout(10)).then(() => asyncPromise = true);
 
 		assert.equal(queue.size, 0);
 
@@ -484,15 +466,15 @@ suite('Async', () => {
 	});
 
 	test('Queue - order is kept', function () {
-		let queue = new Async.Queue();
+		let queue = new async.Queue();
 
 		let res: number[] = [];
 
 		let f1 = () => TPromise.as(true).then(() => res.push(1));
-		let f2 = () => TPromise.timeout(10).then(() => res.push(2));
+		let f2 = () => TPromise.wrap(async.timeout(10)).then(() => res.push(2));
 		let f3 = () => TPromise.as(true).then(() => res.push(3));
-		let f4 = () => TPromise.timeout(20).then(() => res.push(4));
-		let f5 = () => TPromise.timeout(0).then(() => res.push(5));
+		let f4 = () => TPromise.wrap(async.timeout(20)).then(() => res.push(4));
+		let f5 = () => TPromise.wrap(async.timeout(0)).then(() => res.push(5));
 
 		queue.queue(f1);
 		queue.queue(f2);
@@ -508,16 +490,16 @@ suite('Async', () => {
 	});
 
 	test('Queue - errors bubble individually but not cause stop', function () {
-		let queue = new Async.Queue();
+		let queue = new async.Queue();
 
 		let res: number[] = [];
 		let error = false;
 
 		let f1 = () => TPromise.as(true).then(() => res.push(1));
-		let f2 = () => TPromise.timeout(10).then(() => res.push(2));
+		let f2 = () => TPromise.wrap(async.timeout(10)).then(() => res.push(2));
 		let f3 = () => TPromise.as(true).then(() => TPromise.wrapError(new Error('error')));
-		let f4 = () => TPromise.timeout(20).then(() => res.push(4));
-		let f5 = () => TPromise.timeout(0).then(() => res.push(5));
+		let f4 = () => TPromise.wrap(async.timeout(20)).then(() => res.push(4));
+		let f5 = () => TPromise.wrap(async.timeout(0)).then(() => res.push(5));
 
 		queue.queue(f1);
 		queue.queue(f2);
@@ -533,15 +515,15 @@ suite('Async', () => {
 	});
 
 	test('Queue - order is kept (chained)', function () {
-		let queue = new Async.Queue();
+		let queue = new async.Queue();
 
 		let res: number[] = [];
 
 		let f1 = () => TPromise.as(true).then(() => res.push(1));
-		let f2 = () => TPromise.timeout(10).then(() => res.push(2));
+		let f2 = () => TPromise.wrap(async.timeout(10)).then(() => res.push(2));
 		let f3 = () => TPromise.as(true).then(() => res.push(3));
-		let f4 = () => TPromise.timeout(20).then(() => res.push(4));
-		let f5 = () => TPromise.timeout(0).then(() => res.push(5));
+		let f4 = () => TPromise.wrap(async.timeout(20)).then(() => res.push(4));
+		let f5 = () => TPromise.wrap(async.timeout(0)).then(() => res.push(5));
 
 		return queue.queue(f1).then(() => {
 			return queue.queue(f2).then(() => {
@@ -561,7 +543,7 @@ suite('Async', () => {
 	});
 
 	test('Queue - events', function (done) {
-		let queue = new Async.Queue();
+		let queue = new async.Queue();
 
 		let finished = false;
 		queue.onFinished(() => {
@@ -570,9 +552,9 @@ suite('Async', () => {
 
 		let res: number[] = [];
 
-		let f1 = () => TPromise.timeout(10).then(() => res.push(2));
-		let f2 = () => TPromise.timeout(20).then(() => res.push(4));
-		let f3 = () => TPromise.timeout(0).then(() => res.push(5));
+		let f1 = () => TPromise.wrap(async.timeout(10)).then(() => res.push(2));
+		let f2 = () => TPromise.wrap(async.timeout(20)).then(() => res.push(4));
+		let f3 = () => TPromise.wrap(async.timeout(0)).then(() => res.push(5));
 
 		const q1 = queue.queue(f1);
 		const q2 = queue.queue(f2);
@@ -587,7 +569,7 @@ suite('Async', () => {
 	});
 
 	test('ResourceQueue - simple', function () {
-		let queue = new Async.ResourceQueue();
+		let queue = new async.ResourceQueue();
 
 		const r1Queue = queue.queueFor(URI.file('/some/path'));
 		const r2Queue = queue.queueFor(URI.file('/some/other/path'));
diff --git a/src/vs/base/test/common/cache.test.ts b/src/vs/base/test/common/cache.test.ts
index c7bab09abd0..00304bdc0fb 100644
--- a/src/vs/base/test/common/cache.test.ts
+++ b/src/vs/base/test/common/cache.test.ts
@@ -6,58 +6,60 @@
 'use strict';
 
 import * as assert from 'assert';
-import Cache from 'vs/base/common/cache';
+import { Cache } from 'vs/base/common/cache';
 import { TPromise } from 'vs/base/common/winjs.base';
+import { timeout } from 'vs/base/common/async';
 
 suite('Cache', () => {
 
 	test('simple value', () => {
 		let counter = 0;
-		const cache = new Cache(() => TPromise.as(counter++));
+		const cache = new Cache(_ => TPromise.as(counter++));
 
-		return cache.get()
+		return cache.get().promise
 			.then(c => assert.equal(c, 0), () => assert.fail('Unexpected assertion error'))
-			.then(() => cache.get())
+			.then(() => cache.get().promise)
 			.then(c => assert.equal(c, 0), () => assert.fail('Unexpected assertion error'));
 	});
 
 	test('simple error', () => {
 		let counter = 0;
-		const cache = new Cache(() => TPromise.wrapError(new Error(String(counter++))));
+		const cache = new Cache(_ => TPromise.wrapError(new Error(String(counter++))));
 
-		return cache.get()
+		return cache.get().promise
 			.then(() => assert.fail('Unexpected assertion error'), err => assert.equal(err.message, 0))
-			.then(() => cache.get())
+			.then(() => cache.get().promise)
 			.then(() => assert.fail('Unexpected assertion error'), err => assert.equal(err.message, 0));
 	});
 
 	test('should retry cancellations', () => {
 		let counter1 = 0, counter2 = 0;
 
-		const cache = new Cache(() => {
+		const cache = new Cache(token => {
 			counter1++;
-			return TPromise.timeout(1).then(() => counter2++);
+			return timeout(2, token).then(() => counter2++);
 		});
 
 		assert.equal(counter1, 0);
 		assert.equal(counter2, 0);
-		let promise = cache.get();
+		let result = cache.get();
 		assert.equal(counter1, 1);
 		assert.equal(counter2, 0);
-		promise.cancel();
+		result.promise.then(null, () => assert(true));
+		result.dispose();
 		assert.equal(counter1, 1);
 		assert.equal(counter2, 0);
 
-		promise = cache.get();
+		result = cache.get();
 		assert.equal(counter1, 2);
 		assert.equal(counter2, 0);
 
-		return promise
+		return result.promise
 			.then(c => {
 				assert.equal(counter1, 2);
 				assert.equal(counter2, 1);
 			})
-			.then(() => cache.get())
+			.then(() => cache.get().promise)
 			.then(c => {
 				assert.equal(counter1, 2);
 				assert.equal(counter2, 1);
diff --git a/src/vs/base/test/common/event.test.ts b/src/vs/base/test/common/event.test.ts
index 2ef6786f9ae..b4194a20a21 100644
--- a/src/vs/base/test/common/event.test.ts
+++ b/src/vs/base/test/common/event.test.ts
@@ -5,10 +5,11 @@
 'use strict';
 
 import * as assert from 'assert';
-import { Event, Emitter, debounceEvent, EventBufferer, once, fromPromise, stopwatch, buffer, echo, EventMultiplexer, latch } from 'vs/base/common/event';
+import { Event, Emitter, debounceEvent, EventBufferer, once, fromPromise, stopwatch, buffer, echo, EventMultiplexer, latch, AsyncEmitter, IWaitUntil } from 'vs/base/common/event';
 import { IDisposable } from 'vs/base/common/lifecycle';
 import * as Errors from 'vs/base/common/errors';
 import { TPromise } from 'vs/base/common/winjs.base';
+import { timeout } from 'vs/base/common/async';
 
 namespace Samples {
 
@@ -195,7 +196,7 @@ suite('Event', function () {
 		// If the source event is fired once, the debounced (on the leading edge) event should be fired only once
 		emitter.fire();
 
-		return TPromise.timeout(1).then(() => {
+		return timeout(1).then(() => {
 			assert.equal(calls, 1);
 		});
 	});
@@ -213,7 +214,7 @@ suite('Event', function () {
 		emitter.fire();
 		emitter.fire();
 		emitter.fire();
-		return TPromise.timeout(1).then(() => {
+		return timeout(1).then(() => {
 			assert.equal(calls, 2);
 		});
 	});
@@ -238,6 +239,103 @@ suite('Event', function () {
 	});
 });
 
+suite('AsyncEmitter', function () {
+
+	test('event has waitUntil-function', async function () {
+
+		interface E extends IWaitUntil {
+			foo: boolean;
+			bar: number;
+		}
+
+		let emitter = new AsyncEmitter<E>();
+
+		emitter.event(e => {
+			assert.equal(e.foo, true);
+			assert.equal(e.bar, 1);
+			assert.equal(typeof e.waitUntil, 'function');
+		});
+
+		emitter.fireAsync(thenables => ({
+			foo: true,
+			bar: 1,
+			waitUntil(t: Thenable<void>) { thenables.push(t); }
+		}));
+		emitter.dispose();
+	});
+
+	test('sequential delivery', async function () {
+
+		interface E extends IWaitUntil {
+			foo: boolean;
+		}
+
+		let globalState = 0;
+		let emitter = new AsyncEmitter<E>();
+
+		emitter.event(e => {
+			e.waitUntil(timeout(10).then(_ => {
+				assert.equal(globalState, 0);
+				globalState += 1;
+			}));
+		});
+
+		emitter.event(e => {
+			e.waitUntil(timeout(1).then(_ => {
+				assert.equal(globalState, 1);
+				globalState += 1;
+			}));
+		});
+
+		await emitter.fireAsync(thenables => ({
+			foo: true,
+			waitUntil(t) {
+				thenables.push(t);
+			}
+		}));
+		assert.equal(globalState, 2);
+	});
+
+	test('sequential, in-order delivery', async function () {
+		interface E extends IWaitUntil {
+			foo: number;
+		}
+		let events: number[] = [];
+		let done = false;
+		let emitter = new AsyncEmitter<E>();
+
+		// e1
+		emitter.event(e => {
+			e.waitUntil(timeout(10).then(async _ => {
+				if (e.foo === 1) {
+					await emitter.fireAsync(thenables => ({
+						foo: 2,
+						waitUntil(t) {
+							thenables.push(t);
+						}
+					}));
+					assert.deepEqual(events, [1, 2]);
+					done = true;
+				}
+			}));
+		});
+
+		// e2
+		emitter.event(e => {
+			events.push(e.foo);
+			e.waitUntil(timeout(7));
+		});
+
+		await emitter.fireAsync(thenables => ({
+			foo: 1,
+			waitUntil(t) {
+				thenables.push(t);
+			}
+		}));
+		assert.ok(done);
+	});
+});
+
 suite('Event utils', () => {
 
 	suite('EventBufferer', () => {
@@ -324,7 +422,7 @@ suite('Event utils', () => {
 
 			assert.equal(count, 0);
 
-			return TPromise.timeout(10).then(() => {
+			return timeout(10).then(() => {
 				assert.equal(count, 1);
 			});
 		});
@@ -332,7 +430,7 @@ suite('Event utils', () => {
 		test('should emit when done - setTimeout', async () => {
 			let count = 0;
 
-			const promise = TPromise.timeout(5);
+			const promise = timeout(5);
 			const event = fromPromise(promise);
 			event(() => count++);
 
@@ -402,7 +500,7 @@ suite('Event utils', () => {
 			const listener = bufferedEvent(num => result.push(num));
 			assert.deepEqual(result, []);
 
-			return TPromise.timeout(10).then(() => {
+			return timeout(10).then(() => {
 				emitter.fire(4);
 				assert.deepEqual(result, [1, 2, 3, 4]);
 
diff --git a/src/vs/base/test/common/history.test.ts b/src/vs/base/test/common/history.test.ts
index 4cf1324146f..81b57edab81 100644
--- a/src/vs/base/test/common/history.test.ts
+++ b/src/vs/base/test/common/history.test.ts
@@ -16,19 +16,18 @@ suite('History Navigator', () => {
 	});
 
 	test('create sets the position to last', () => {
-		const testObject = new HistoryNavigator(['1', '2', '3', '4'], 3);
+		const testObject = new HistoryNavigator(['1', '2', '3', '4'], 100);
 
-		assert.equal('4', testObject.current());
-		assert.equal(null, testObject.next());
-		assert.equal('3', testObject.previous());
+		assert.equal(testObject.current(), null);
+		assert.equal(testObject.next(), null);
+		assert.equal(testObject.previous(), '4');
 	});
 
 	test('last returns last element', () => {
-		const testObject = new HistoryNavigator(['1', '2', '3', '4'], 3);
+		const testObject = new HistoryNavigator(['1', '2', '3', '4'], 100);
 
-		testObject.first();
-
-		assert.equal('4', testObject.last());
+		assert.equal(testObject.first(), '1');
+		assert.equal(testObject.last(), '4');
 	});
 
 	test('first returns first element', () => {
@@ -42,17 +41,18 @@ suite('History Navigator', () => {
 
 		testObject.first();
 
-		assert.equal('3', testObject.next());
-		assert.equal('4', testObject.next());
-		assert.equal(null, testObject.next());
+		assert.equal(testObject.next(), '3');
+		assert.equal(testObject.next(), '4');
+		assert.equal(testObject.next(), null);
 	});
 
 	test('previous returns previous element', () => {
 		const testObject = new HistoryNavigator(['1', '2', '3', '4'], 3);
 
-		assert.equal('3', testObject.previous());
-		assert.equal('2', testObject.previous());
-		assert.equal(null, testObject.previous());
+		assert.equal(testObject.previous(), '4');
+		assert.equal(testObject.previous(), '3');
+		assert.equal(testObject.previous(), '2');
+		assert.equal(testObject.previous(), null);
 	});
 
 	test('next on last element returs null and remains on last', () => {
@@ -61,8 +61,8 @@ suite('History Navigator', () => {
 		testObject.first();
 		testObject.last();
 
-		assert.equal('4', testObject.current());
-		assert.equal(null, testObject.next());
+		assert.equal(testObject.current(), '4');
+		assert.equal(testObject.next(), null);
 	});
 
 	test('previous on first element returs null and remains on first', () => {
@@ -70,8 +70,8 @@ suite('History Navigator', () => {
 
 		testObject.first();
 
-		assert.equal('2', testObject.current());
-		assert.equal(null, testObject.previous());
+		assert.equal(testObject.current(), '2');
+		assert.equal(testObject.previous(), null);
 	});
 
 	test('add reduces the input to limit', () => {
@@ -79,7 +79,7 @@ suite('History Navigator', () => {
 
 		testObject.add('5');
 
-		assert.deepEqual(['4', '5'], toArray(testObject));
+		assert.deepEqual(toArray(testObject), ['4', '5']);
 	});
 
 	test('adding existing element changes the position', () => {
@@ -87,7 +87,7 @@ suite('History Navigator', () => {
 
 		testObject.add('2');
 
-		assert.deepEqual(['1', '3', '4', '2'], toArray(testObject));
+		assert.deepEqual(toArray(testObject), ['1', '3', '4', '2']);
 	});
 
 	test('add resets the navigator to last', () => {
@@ -96,8 +96,8 @@ suite('History Navigator', () => {
 		testObject.first();
 		testObject.add('5');
 
-		assert.equal('5', testObject.current());
-		assert.equal(null, testObject.next());
+		assert.equal(testObject.previous(), '5');
+		assert.equal(testObject.next(), null);
 	});
 
 	test('adding an existing item changes the order', () => {
@@ -110,9 +110,9 @@ suite('History Navigator', () => {
 
 	test('clear', () => {
 		const testObject = new HistoryNavigator(['a', 'b', 'c']);
-		assert.equal('c', testObject.current());
+		assert.equal(testObject.previous(), 'c');
 		testObject.clear();
-		assert.equal(undefined, testObject.current());
+		assert.equal(testObject.current(), undefined);
 	});
 
 	function toArray(historyNavigator: HistoryNavigator<string>): string[] {
@@ -126,4 +126,3 @@ suite('History Navigator', () => {
 		return result;
 	}
 });
-
diff --git a/src/vs/base/test/common/json.test.ts b/src/vs/base/test/common/json.test.ts
index 2551f00fde3..da9feea768c 100644
--- a/src/vs/base/test/common/json.test.ts
+++ b/src/vs/base/test/common/json.test.ts
@@ -43,9 +43,9 @@ function assertInvalidParse(input: string, expected: any, options?: ParseOptions
 	assert.deepEqual(actual, expected);
 }
 
-function assertTree(input: string, expected: any, expectedErrors: number[] = []): void {
+function assertTree(input: string, expected: any, expectedErrors: number[] = [], options?: ParseOptions): void {
 	var errors: ParseError[] = [];
-	var actual = parseTree(input, errors);
+	var actual = parseTree(input, errors, options);
 
 	assert.deepEqual(errors.map(e => e.error, expected), expectedErrors);
 	let checkParent = (node: Node) => {
@@ -203,7 +203,7 @@ suite('JSON', () => {
 
 	test('parse: objects with errors', () => {
 		assertInvalidParse('{,}', {});
-		assertInvalidParse('{ "foo": true, }', { foo: true });
+		assertInvalidParse('{ "foo": true, }', { foo: true }, { disallowTrailingComma: true });
 		assertInvalidParse('{ "bar": 8 "xoo": "foo" }', { bar: 8, xoo: 'foo' });
 		assertInvalidParse('{ ,"bar": 8 }', { bar: 8 });
 		assertInvalidParse('{ ,"bar": 8, "foo" }', { bar: 8 });
@@ -213,10 +213,10 @@ suite('JSON', () => {
 
 	test('parse: array with errors', () => {
 		assertInvalidParse('[,]', []);
-		assertInvalidParse('[ 1, 2, ]', [1, 2]);
+		assertInvalidParse('[ 1, 2, ]', [1, 2], { disallowTrailingComma: true });
 		assertInvalidParse('[ 1 2, 3 ]', [1, 2, 3]);
 		assertInvalidParse('[ ,1, 2, 3 ]', [1, 2, 3]);
-		assertInvalidParse('[ ,1, 2, 3, ]', [1, 2, 3]);
+		assertInvalidParse('[ ,1, 2, 3, ]', [1, 2, 3], { disallowTrailingComma: true });
 	});
 
 	test('parse: disallow commments', () => {
@@ -229,15 +229,19 @@ suite('JSON', () => {
 	});
 
 	test('parse: trailing comma', () => {
-		let options = { allowTrailingComma: true };
+		// default is allow
+		assertValidParse('{ "hello": [], }', { hello: [] });
+
+		let options = { disallowTrailingComma: false };
 		assertValidParse('{ "hello": [], }', { hello: [] }, options);
 		assertValidParse('{ "hello": [] }', { hello: [] }, options);
 		assertValidParse('{ "hello": [], "world": {}, }', { hello: [], world: {} }, options);
 		assertValidParse('{ "hello": [], "world": {} }', { hello: [], world: {} }, options);
 		assertValidParse('{ "hello": [1,] }', { hello: [1] }, options);
 
-		assertInvalidParse('{ "hello": [], }', { hello: [] });
-		assertInvalidParse('{ "hello": [], "world": {}, }', { hello: [], world: {} });
+		options = { disallowTrailingComma: true };
+		assertInvalidParse('{ "hello": [], }', { hello: [] }, options);
+		assertInvalidParse('{ "hello": [], "world": {}, }', { hello: [], world: {} }, options);
 	});
 
 	test('tree: literals', () => {
@@ -320,6 +324,6 @@ suite('JSON', () => {
 					}
 				]
 			}
-			, [ParseErrorCode.PropertyNameExpected, ParseErrorCode.ValueExpected]);
+			, [ParseErrorCode.PropertyNameExpected, ParseErrorCode.ValueExpected], { disallowTrailingComma: true });
 	});
 });
diff --git a/src/vs/base/test/common/map.test.ts b/src/vs/base/test/common/map.test.ts
index 23bbe9352ce..95b3d9d7d0e 100644
--- a/src/vs/base/test/common/map.test.ts
+++ b/src/vs/base/test/common/map.test.ts
@@ -7,8 +7,8 @@
 
 import { ResourceMap, TernarySearchTree, PathIterator, StringIterator, LinkedMap, Touch, LRUCache } from 'vs/base/common/map';
 import * as assert from 'assert';
-import URI from 'vs/base/common/uri';
-import { IIteratorResult } from 'vs/base/common/iterator';
+import { URI } from 'vs/base/common/uri';
+import { IteratorResult } from 'vs/base/common/iterator';
 
 suite('Map', () => {
 
@@ -419,7 +419,7 @@ suite('Map', () => {
 		map.set('/user/foo/flip/flop', 3);
 		map.set('/usr/foo', 4);
 
-		let item: IIteratorResult<number>;
+		let item: IteratorResult<number>;
 		let iter = map.findSuperstr('/user');
 
 		item = iter.next();
diff --git a/src/vs/base/test/common/marshalling.test.ts b/src/vs/base/test/common/marshalling.test.ts
index 675e9a6759e..1b74fda2077 100644
--- a/src/vs/base/test/common/marshalling.test.ts
+++ b/src/vs/base/test/common/marshalling.test.ts
@@ -5,7 +5,7 @@
 'use strict';
 
 import * as assert from 'assert';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { parse, stringify } from 'vs/base/common/marshalling';
 
 suite('Marshalling', () => {
diff --git a/src/vs/base/test/common/mime.test.ts b/src/vs/base/test/common/mime.test.ts
index 701e72bb27e..7cf3f9ac608 100644
--- a/src/vs/base/test/common/mime.test.ts
+++ b/src/vs/base/test/common/mime.test.ts
@@ -5,7 +5,7 @@
 'use strict';
 
 import * as assert from 'assert';
-import { guessMimeTypes, registerTextMime } from 'vs/base/common/mime';
+import { guessMimeTypes, registerTextMime, suggestFilename } from 'vs/base/common/mime';
 
 suite('Mime', () => {
 	test('Dynamically Register Text Mime', () => {
@@ -114,4 +114,53 @@ suite('Mime', () => {
 		let guess = guessMimeTypes('/some/path/dot.monaco.xml');
 		assert.deepEqual(guess, ['text/other', 'text/plain']);
 	});
+
+	test('Filename Suggestion - Suggest prefix only when there are no relevant extensions', () => {
+		const id = 'plumbus0';
+		const mime = `text/${id}`;
+		for (let extension of ['one', 'two']) {
+			registerTextMime({ id, mime, extension });
+		}
+
+		let suggested = suggestFilename('shleem', 'Untitled-1');
+		assert.equal(suggested, 'Untitled-1');
+	});
+
+	test('Filename Suggestion - Suggest prefix with first extension that begins with a dot', () => {
+		const id = 'plumbus1';
+		const mime = `text/${id}`;
+		for (let extension of ['plumbus', '.shleem', '.gazorpazorp']) {
+			registerTextMime({ id, mime, extension });
+		}
+
+		let suggested = suggestFilename('plumbus1', 'Untitled-1');
+		assert.equal(suggested, 'Untitled-1.shleem');
+	});
+
+	test('Filename Suggestion - Suggest first relevant extension when there are none that begin with a dot', () => {
+		const id = 'plumbus2';
+		const mime = `text/${id}`;
+		for (let extension of ['plumbus', 'shleem', 'gazorpazorp']) {
+			registerTextMime({ id, mime, extension });
+		}
+
+		let suggested = suggestFilename('plumbus2', 'Untitled-1');
+		assert.equal(suggested, 'plumbus');
+	});
+
+	test('Filename Suggestion - Should ignore user-configured associations', () => {
+		registerTextMime({ id: 'plumbus3', mime: 'text/plumbus3', extension: 'plumbus', userConfigured: true });
+		registerTextMime({ id: 'plumbus3', mime: 'text/plumbus3', extension: '.shleem', userConfigured: true });
+		registerTextMime({ id: 'plumbus3', mime: 'text/plumbus3', extension: '.gazorpazorp', userConfigured: false });
+
+		let suggested = suggestFilename('plumbus3', 'Untitled-1');
+		assert.equal(suggested, 'Untitled-1.gazorpazorp');
+
+		registerTextMime({ id: 'plumbus4', mime: 'text/plumbus4', extension: 'plumbus', userConfigured: true });
+		registerTextMime({ id: 'plumbus4', mime: 'text/plumbus4', extension: '.shleem', userConfigured: true });
+		registerTextMime({ id: 'plumbus4', mime: 'text/plumbus4', extension: '.gazorpazorp', userConfigured: true });
+
+		suggested = suggestFilename('plumbus4', 'Untitled-1');
+		assert.equal(suggested, 'Untitled-1');
+	});
 });
diff --git a/src/vs/base/test/common/network.test.ts b/src/vs/base/test/common/network.test.ts
deleted file mode 100644
index 7aba51f153b..00000000000
--- a/src/vs/base/test/common/network.test.ts
+++ /dev/null
@@ -1,92 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-'use strict';
-
-import * as assert from 'assert';
-import URI from 'vs/base/common/uri';
-
-function assertUrl(raw: string, scheme: string, domain: string, port: string, path: string, queryString: string, fragmentId: string): void {
-	// check for equivalent behaviour
-	const uri = URI.parse(raw);
-	assert.equal(uri.scheme, scheme);
-	assert.equal(uri.authority, port ? domain + ':' + port : domain);
-	assert.equal(uri.path, path);
-	assert.equal(uri.query, queryString);
-	assert.equal(uri.fragment, fragmentId);
-}
-
-suite('Network', () => {
-	test('urls', () => {
-		assertUrl('http://www.test.com:8000/this/that/theother.html?query=foo#hash',
-			'http', 'www.test.com', '8000', '/this/that/theother.html', 'query=foo', 'hash'
-		);
-
-		assertUrl('http://www.test.com:8000/this/that/theother.html?query=foo',
-			'http', 'www.test.com', '8000', '/this/that/theother.html', 'query=foo', ''
-		);
-
-		assertUrl('http://www.test.com:8000/this/that/theother.html#hash',
-			'http', 'www.test.com', '8000', '/this/that/theother.html', '', 'hash'
-		);
-
-		assertUrl('http://www.test.com:8000/#hash',
-			'http', 'www.test.com', '8000', '/', '', 'hash'
-		);
-
-		assertUrl('http://www.test.com:8000#hash',
-			'http', 'www.test.com', '8000', '/', '', 'hash'
-		);
-
-		assertUrl('http://www.test.com/#hash',
-			'http', 'www.test.com', '', '/', '', 'hash'
-		);
-
-		assertUrl('http://www.test.com#hash',
-			'http', 'www.test.com', '', '/', '', 'hash'
-		);
-
-		assertUrl('http://www.test.com:8000/this/that/theother.html',
-			'http', 'www.test.com', '8000', '/this/that/theother.html', '', ''
-		);
-
-		assertUrl('http://www.test.com:8000/',
-			'http', 'www.test.com', '8000', '/', '', ''
-		);
-
-		assertUrl('http://www.test.com:8000',
-			'http', 'www.test.com', '8000', '/', '', ''
-		);
-
-		assertUrl('http://www.test.com/',
-			'http', 'www.test.com', '', '/', '', ''
-		);
-
-		assertUrl('//www.test.com/',
-			'', 'www.test.com', '', '/', '', ''
-		);
-
-		assertUrl('//www.test.com:8000/this/that/theother.html?query=foo#hash',
-			'', 'www.test.com', '8000', '/this/that/theother.html', 'query=foo', 'hash'
-		);
-
-		assertUrl('//www.test.com/this/that/theother.html?query=foo#hash',
-			'', 'www.test.com', '', '/this/that/theother.html', 'query=foo', 'hash'
-		);
-
-		assertUrl('https://www.test.com:8000/this/that/theother.html?query=foo#hash',
-			'https', 'www.test.com', '8000', '/this/that/theother.html', 'query=foo', 'hash'
-		);
-
-		assertUrl('f12://www.test.com:8000/this/that/theother.html?query=foo#hash',
-			'f12', 'www.test.com', '8000', '/this/that/theother.html', 'query=foo', 'hash'
-		);
-
-		assertUrl('inmemory://model/0',
-			'inmemory', 'model', '', '/0', '', ''
-		);
-
-		assertUrl('file:///c/far/boo/file.cs', 'file', '', '', '/c/far/boo/file.cs', '', '');
-	});
-});
diff --git a/src/vs/base/test/common/paging.test.ts b/src/vs/base/test/common/paging.test.ts
index 04aed69dda4..b7a4cd076a6 100644
--- a/src/vs/base/test/common/paging.test.ts
+++ b/src/vs/base/test/common/paging.test.ts
@@ -8,23 +8,35 @@
 import * as assert from 'assert';
 import { IPager, PagedModel } from 'vs/base/common/paging';
 import { TPromise } from 'vs/base/common/winjs.base';
+import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
+import { isPromiseCanceledError, canceled } from 'vs/base/common/errors';
+
+function getPage(pageIndex: number, cancellationToken: CancellationToken): Thenable<number[]> {
+	if (cancellationToken.isCancellationRequested) {
+		return TPromise.wrapError(canceled());
+	}
+
+	return TPromise.as([0, 1, 2, 3, 4].map(i => i + (pageIndex * 5)));
+}
+
+class TestPager implements IPager<number> {
+
+	readonly firstPage = [0, 1, 2, 3, 4];
+	readonly pageSize = 5;
+	readonly total = 100;
+	readonly getPage: (pageIndex: number, cancellationToken: CancellationToken) => Thenable<number[]>;
+
+	constructor(getPageFn?: (pageIndex: number, cancellationToken: CancellationToken) => Thenable<number[]>) {
+		this.getPage = getPageFn || getPage;
+	}
+}
 
 suite('PagedModel', () => {
 
-	let model: PagedModel<number>;
-
-	setup(() => {
-		const pager: IPager<number> = {
-			firstPage: [0, 1, 2, 3, 4],
-			pageSize: 5,
-			total: 100,
-			getPage: pageIndex => TPromise.as([0, 1, 2, 3, 4].map(i => i + (pageIndex * 5)))
-		};
-
-		model = new PagedModel(pager, 0);
-	});
-
 	test('isResolved', () => {
+		const pager = new TestPager();
+		const model = new PagedModel(pager);
+
 		assert(model.isResolved(0));
 		assert(model.isResolved(1));
 		assert(model.isResolved(2));
@@ -40,14 +52,20 @@ suite('PagedModel', () => {
 	});
 
 	test('resolve single', () => {
+		const pager = new TestPager();
+		const model = new PagedModel(pager);
+
 		assert(!model.isResolved(5));
 
-		return model.resolve(5).then(() => {
+		return model.resolve(5, CancellationToken.None).then(() => {
 			assert(model.isResolved(5));
 		});
 	});
 
 	test('resolve page', () => {
+		const pager = new TestPager();
+		const model = new PagedModel(pager);
+
 		assert(!model.isResolved(5));
 		assert(!model.isResolved(6));
 		assert(!model.isResolved(7));
@@ -55,7 +73,7 @@ suite('PagedModel', () => {
 		assert(!model.isResolved(9));
 		assert(!model.isResolved(10));
 
-		return model.resolve(5).then(() => {
+		return model.resolve(5, CancellationToken.None).then(() => {
 			assert(model.isResolved(5));
 			assert(model.isResolved(6));
 			assert(model.isResolved(7));
@@ -66,6 +84,9 @@ suite('PagedModel', () => {
 	});
 
 	test('resolve page 2', () => {
+		const pager = new TestPager();
+		const model = new PagedModel(pager);
+
 		assert(!model.isResolved(5));
 		assert(!model.isResolved(6));
 		assert(!model.isResolved(7));
@@ -73,7 +94,7 @@ suite('PagedModel', () => {
 		assert(!model.isResolved(9));
 		assert(!model.isResolved(10));
 
-		return model.resolve(10).then(() => {
+		return model.resolve(10, CancellationToken.None).then(() => {
 			assert(!model.isResolved(5));
 			assert(!model.isResolved(6));
 			assert(!model.isResolved(7));
@@ -82,4 +103,85 @@ suite('PagedModel', () => {
 			assert(model.isResolved(10));
 		});
 	});
+
+	test('preemptive cancellation works', function () {
+		const pager = new TestPager(() => {
+			assert(false);
+			return TPromise.wrap([]);
+		});
+
+		const model = new PagedModel(pager);
+
+		return model.resolve(5, CancellationToken.Cancelled).then(
+			() => assert(false),
+			err => assert(isPromiseCanceledError(err))
+		);
+	});
+
+	test('cancellation works', function () {
+		const pager = new TestPager((_, token) => new TPromise((_, e) => {
+			token.onCancellationRequested(() => e(canceled()));
+		}));
+
+		const model = new PagedModel(pager);
+		const tokenSource = new CancellationTokenSource();
+
+		const promise = model.resolve(5, tokenSource.token).then(
+			() => assert(false),
+			err => assert(isPromiseCanceledError(err))
+		);
+
+		setTimeout(() => tokenSource.cancel(), 10);
+
+		return promise;
+	});
+
+	test('same page cancellation works', function () {
+		let state = 'idle';
+
+		const pager = new TestPager((pageIndex, token) => {
+			state = 'resolving';
+
+			return new TPromise((_, e) => {
+				token.onCancellationRequested(() => {
+					state = 'idle';
+					e(canceled());
+				});
+			});
+		});
+
+		const model = new PagedModel(pager);
+
+		assert.equal(state, 'idle');
+
+		const tokenSource1 = new CancellationTokenSource();
+		const promise1 = model.resolve(5, tokenSource1.token).then(
+			() => assert(false),
+			err => assert(isPromiseCanceledError(err))
+		);
+
+		assert.equal(state, 'resolving');
+
+		const tokenSource2 = new CancellationTokenSource();
+		const promise2 = model.resolve(6, tokenSource2.token).then(
+			() => assert(false),
+			err => assert(isPromiseCanceledError(err))
+		);
+
+		assert.equal(state, 'resolving');
+
+		setTimeout(() => {
+			assert.equal(state, 'resolving');
+			tokenSource1.cancel();
+			assert.equal(state, 'resolving');
+
+			setTimeout(() => {
+				assert.equal(state, 'resolving');
+				tokenSource2.cancel();
+				assert.equal(state, 'idle');
+			}, 10);
+		}, 10);
+
+		return TPromise.join([promise1, promise2]);
+	});
 });
\ No newline at end of file
diff --git a/src/vs/base/test/common/resources.test.ts b/src/vs/base/test/common/resources.test.ts
index 2c1e18bf6ef..c9838e3f93b 100644
--- a/src/vs/base/test/common/resources.test.ts
+++ b/src/vs/base/test/common/resources.test.ts
@@ -5,9 +5,9 @@
 'use strict';
 
 import * as assert from 'assert';
-import URI from 'vs/base/common/uri';
-import { distinctParents, dirname } from 'vs/base/common/resources';
-import { normalize } from 'vs/base/common/paths';
+import { dirname, basename, distinctParents, joinPath, isEqual, isEqualOrParent, hasToIgnoreCase, normalizePath, isAbsolutePath, isMalformedFileUri } from 'vs/base/common/resources';
+import { URI } from 'vs/base/common/uri';
+import { isWindows } from 'vs/base/common/platform';
 
 suite('Resources', () => {
 
@@ -43,11 +43,188 @@ suite('Resources', () => {
 	});
 
 	test('dirname', () => {
-		const f = URI.file('/some/file/test.txt');
-		const d = dirname(f);
-		assert.equal(d.fsPath, normalize('/some/file', true));
+		if (isWindows) {
+			assert.equal(dirname(URI.file('c:\\some\\file\\test.txt')).toString(), 'file:///c%3A/some/file');
+			assert.equal(dirname(URI.file('c:\\some\\file')).toString(), 'file:///c%3A/some');
+			assert.equal(dirname(URI.file('c:\\some\\file\\')).toString(), 'file:///c%3A/some');
+			assert.equal(dirname(URI.file('c:\\some')).toString(), 'file:///c%3A/');
+			assert.equal(dirname(URI.file('C:\\some')).toString(), 'file:///c%3A/');
+		} else {
+			assert.equal(dirname(URI.file('/some/file/test.txt')).toString(), 'file:///some/file');
+			assert.equal(dirname(URI.file('/some/file/')).toString(), 'file:///some');
+			assert.equal(dirname(URI.file('/some/file')).toString(), 'file:///some');
+		}
+		assert.equal(dirname(URI.parse('foo://a/some/file/test.txt')).toString(), 'foo://a/some/file');
+		assert.equal(dirname(URI.parse('foo://a/some/file/')).toString(), 'foo://a/some');
+		assert.equal(dirname(URI.parse('foo://a/some/file')).toString(), 'foo://a/some');
+		assert.equal(dirname(URI.parse('foo://a/some')).toString(), 'foo://a/');
 
 		// does not explode (https://github.com/Microsoft/vscode/issues/41987)
 		dirname(URI.from({ scheme: 'file', authority: '/users/someone/portal.h' }));
 	});
+
+	test('basename', () => {
+		if (isWindows) {
+			assert.equal(basename(URI.file('c:\\some\\file\\test.txt')), 'test.txt');
+			assert.equal(basename(URI.file('c:\\some\\file')), 'file');
+			assert.equal(basename(URI.file('c:\\some\\file\\')), 'file');
+			assert.equal(basename(URI.file('C:\\some\\file\\')), 'file');
+		} else {
+			assert.equal(basename(URI.file('/some/file/test.txt')), 'test.txt');
+			assert.equal(basename(URI.file('/some/file/')), 'file');
+			assert.equal(basename(URI.file('/some/file')), 'file');
+			assert.equal(basename(URI.file('/some')), 'some');
+		}
+		assert.equal(basename(URI.parse('foo://a/some/file/test.txt')), 'test.txt');
+		assert.equal(basename(URI.parse('foo://a/some/file/')), 'file');
+		assert.equal(basename(URI.parse('foo://a/some/file')), 'file');
+		assert.equal(basename(URI.parse('foo://a/some')), 'some');
+		assert.equal(basename(URI.parse('foo://a/')), '');
+		assert.equal(basename(URI.parse('foo://a')), '');
+	});
+
+	test('joinPath', () => {
+		if (isWindows) {
+			assert.equal(joinPath(URI.file('c:\\foo\\bar'), '/file.js').toString(), 'file:///c%3A/foo/bar/file.js');
+			assert.equal(joinPath(URI.file('c:\\foo\\bar\\'), 'file.js').toString(), 'file:///c%3A/foo/bar/file.js');
+			assert.equal(joinPath(URI.file('c:\\foo\\bar\\'), '/file.js').toString(), 'file:///c%3A/foo/bar/file.js');
+			assert.equal(joinPath(URI.file('c:\\'), '/file.js').toString(), 'file:///c%3A/file.js');
+			assert.equal(joinPath(URI.file('c:\\'), 'bar/file.js').toString(), 'file:///c%3A/bar/file.js');
+			assert.equal(joinPath(URI.file('c:\\foo'), './file.js').toString(), 'file:///c%3A/foo/file.js');
+			assert.equal(joinPath(URI.file('c:\\foo'), '/./file.js').toString(), 'file:///c%3A/foo/file.js');
+			assert.equal(joinPath(URI.file('C:\\foo'), '../file.js').toString(), 'file:///c%3A/file.js');
+			assert.equal(joinPath(URI.file('C:\\foo\\.'), '../file.js').toString(), 'file:///c%3A/file.js');
+		} else {
+			assert.equal(joinPath(URI.file('/foo/bar'), '/file.js').toString(), 'file:///foo/bar/file.js');
+			assert.equal(joinPath(URI.file('/foo/bar'), 'file.js').toString(), 'file:///foo/bar/file.js');
+			assert.equal(joinPath(URI.file('/foo/bar/'), '/file.js').toString(), 'file:///foo/bar/file.js');
+			assert.equal(joinPath(URI.file('/'), '/file.js').toString(), 'file:///file.js');
+			assert.equal(joinPath(URI.file('/foo/bar'), './file.js').toString(), 'file:///foo/bar/file.js');
+			assert.equal(joinPath(URI.file('/foo/bar'), '/./file.js').toString(), 'file:///foo/bar/file.js');
+			assert.equal(joinPath(URI.file('/foo/bar'), '../file.js').toString(), 'file:///foo/file.js');
+		}
+		assert.equal(joinPath(URI.parse('foo://a/foo/bar'), '/file.js').toString(), 'foo://a/foo/bar/file.js');
+		assert.equal(joinPath(URI.parse('foo://a/foo/bar'), 'file.js').toString(), 'foo://a/foo/bar/file.js');
+		assert.equal(joinPath(URI.parse('foo://a/foo/bar/'), '/file.js').toString(), 'foo://a/foo/bar/file.js');
+		assert.equal(joinPath(URI.parse('foo://a/'), '/file.js').toString(), 'foo://a/file.js');
+		assert.equal(joinPath(URI.parse('foo://a/foo/bar/'), './file.js').toString(), 'foo://a/foo/bar/file.js');
+		assert.equal(joinPath(URI.parse('foo://a/foo/bar/'), '/./file.js').toString(), 'foo://a/foo/bar/file.js');
+		assert.equal(joinPath(URI.parse('foo://a/foo/bar/'), '../file.js').toString(), 'foo://a/foo/file.js');
+
+		assert.equal(
+			joinPath(URI.from({ scheme: 'myScheme', authority: 'authority', path: '/path', query: 'query', fragment: 'fragment' }), '/file.js').toString(),
+			'myScheme://authority/path/file.js?query#fragment');
+	});
+
+	test('normalizePath', () => {
+		if (isWindows) {
+			assert.equal(normalizePath(URI.file('c:\\foo\\.\\bar')).toString(), 'file:///c%3A/foo/bar');
+			assert.equal(normalizePath(URI.file('c:\\foo\\.')).toString(), 'file:///c%3A/foo');
+			assert.equal(normalizePath(URI.file('c:\\foo\\.\\')).toString(), 'file:///c%3A/foo/');
+			assert.equal(normalizePath(URI.file('c:\\foo\\..')).toString(), 'file:///c%3A/');
+			assert.equal(normalizePath(URI.file('c:\\foo\\..\\bar')).toString(), 'file:///c%3A/bar');
+			assert.equal(normalizePath(URI.file('c:\\foo\\..\\..\\bar')).toString(), 'file:///c%3A/bar');
+			assert.equal(normalizePath(URI.file('c:\\foo\\foo\\..\\..\\bar')).toString(), 'file:///c%3A/bar');
+			assert.equal(normalizePath(URI.file('C:\\foo\\foo\\.\\..\\..\\bar')).toString(), 'file:///c%3A/bar');
+			assert.equal(normalizePath(URI.file('C:\\foo\\foo\\.\\..\\some\\..\\bar')).toString(), 'file:///c%3A/foo/bar');
+		} else {
+			assert.equal(normalizePath(URI.file('/foo/./bar')).toString(), 'file:///foo/bar');
+			assert.equal(normalizePath(URI.file('/foo/.')).toString(), 'file:///foo');
+			assert.equal(normalizePath(URI.file('/foo/./')).toString(), 'file:///foo/');
+			assert.equal(normalizePath(URI.file('/foo/..')).toString(), 'file:///');
+			assert.equal(normalizePath(URI.file('/foo/../bar')).toString(), 'file:///bar');
+			assert.equal(normalizePath(URI.file('/foo/../../bar')).toString(), 'file:///bar');
+			assert.equal(normalizePath(URI.file('/foo/foo/../../bar')).toString(), 'file:///bar');
+			assert.equal(normalizePath(URI.file('/foo/foo/./../../bar')).toString(), 'file:///bar');
+			assert.equal(normalizePath(URI.file('/foo/foo/./../some/../bar')).toString(), 'file:///foo/bar');
+		}
+		assert.equal(normalizePath(URI.parse('foo://a/foo/./bar')).toString(), 'foo://a/foo/bar');
+		assert.equal(normalizePath(URI.parse('foo://a/foo/.')).toString(), 'foo://a/foo');
+		assert.equal(normalizePath(URI.parse('foo://a/foo/./')).toString(), 'foo://a/foo/');
+		assert.equal(normalizePath(URI.parse('foo://a/foo/..')).toString(), 'foo://a/');
+		assert.equal(normalizePath(URI.parse('foo://a/foo/../bar')).toString(), 'foo://a/bar');
+		assert.equal(normalizePath(URI.parse('foo://a/foo/../../bar')).toString(), 'foo://a/bar');
+		assert.equal(normalizePath(URI.parse('foo://a/foo/foo/../../bar')).toString(), 'foo://a/bar');
+		assert.equal(normalizePath(URI.parse('foo://a/foo/foo/./../../bar')).toString(), 'foo://a/bar');
+		assert.equal(normalizePath(URI.parse('foo://a/foo/foo/./../some/../bar')).toString(), 'foo://a/foo/bar');
+	});
+
+	test('isAbsolute', () => {
+		if (isWindows) {
+			assert.equal(isAbsolutePath(URI.file('c:\\foo\\')), true);
+			assert.equal(isAbsolutePath(URI.file('C:\\foo\\')), true);
+			assert.equal(isAbsolutePath(URI.file('bar')), true); // URI normalizes all file URIs to be absolute
+		} else {
+			assert.equal(isAbsolutePath(URI.file('/foo/bar')), true);
+			assert.equal(isAbsolutePath(URI.file('bar')), true); // URI normalizes all file URIs to be absolute
+		}
+		assert.equal(isAbsolutePath(URI.parse('foo:foo')), false);
+		assert.equal(isAbsolutePath(URI.parse('foo://a/foo/.')), true);
+	});
+
+	test('isEqual', () => {
+		let fileURI = isWindows ? URI.file('c:\\foo\\bar') : URI.file('/foo/bar');
+		let fileURI2 = isWindows ? URI.file('C:\\foo\\Bar') : URI.file('/foo/Bar');
+		assert.equal(isEqual(fileURI, fileURI, true), true);
+		assert.equal(isEqual(fileURI, fileURI, false), true);
+		assert.equal(isEqual(fileURI, fileURI, hasToIgnoreCase(fileURI)), true);
+		assert.equal(isEqual(fileURI, fileURI2, true), true);
+		assert.equal(isEqual(fileURI, fileURI2, false), false);
+
+		let fileURI3 = URI.parse('foo://server:453/foo/bar');
+		let fileURI4 = URI.parse('foo://server:453/foo/Bar');
+		assert.equal(isEqual(fileURI3, fileURI3, true), true);
+		assert.equal(isEqual(fileURI3, fileURI3, false), true);
+		assert.equal(isEqual(fileURI3, fileURI3, hasToIgnoreCase(fileURI3)), true);
+		assert.equal(isEqual(fileURI3, fileURI4, true), true);
+		assert.equal(isEqual(fileURI3, fileURI4, false), false);
+
+		assert.equal(isEqual(fileURI, fileURI3, true), false);
+	});
+
+	test('isEqualOrParent', () => {
+		let fileURI = isWindows ? URI.file('c:\\foo\\bar') : URI.file('/foo/bar');
+		let fileURI2 = isWindows ? URI.file('c:\\foo') : URI.file('/foo');
+		let fileURI2b = isWindows ? URI.file('C:\\Foo\\') : URI.file('/Foo/');
+		assert.equal(isEqualOrParent(fileURI, fileURI, true), true, '1');
+		assert.equal(isEqualOrParent(fileURI, fileURI, false), true, '2');
+		assert.equal(isEqualOrParent(fileURI, fileURI2, true), true, '3');
+		assert.equal(isEqualOrParent(fileURI, fileURI2, false), true, '4');
+		assert.equal(isEqualOrParent(fileURI, fileURI2b, true), true, '5');
+		assert.equal(isEqualOrParent(fileURI, fileURI2b, false), false, '6');
+
+		assert.equal(isEqualOrParent(fileURI2, fileURI, false), false, '7');
+		assert.equal(isEqualOrParent(fileURI2b, fileURI2, true), true, '8');
+
+		let fileURI3 = URI.parse('foo://server:453/foo/bar/goo');
+		let fileURI4 = URI.parse('foo://server:453/foo/');
+		let fileURI5 = URI.parse('foo://server:453/foo');
+		assert.equal(isEqualOrParent(fileURI3, fileURI3, true), true, '11');
+		assert.equal(isEqualOrParent(fileURI3, fileURI3, false), true, '12');
+		assert.equal(isEqualOrParent(fileURI3, fileURI4, true), true, '13');
+		assert.equal(isEqualOrParent(fileURI3, fileURI4, false), true, '14');
+		assert.equal(isEqualOrParent(fileURI3, fileURI, true), false, '15');
+		assert.equal(isEqualOrParent(fileURI5, fileURI5, true), true, '16');
+	});
+
+	function assertMalformedFileUri(path: string, expected: string) {
+		const newURI = isMalformedFileUri(URI.parse(path));
+		assert.equal(newURI && newURI.toString(), expected);
+	}
+
+	test('isMalformedFileUri', () => {
+		if (isWindows) {
+			assertMalformedFileUri('c:/foo/bar', 'file:///c%3A/foo/bar');
+			assertMalformedFileUri('c:\\foo\\bar', 'file:///c%3A/foo/bar');
+			assertMalformedFileUri('C:\\foo\\bar', 'file:///c%3A/foo/bar');
+			assertMalformedFileUri('\\\\localhost\\c$\\devel\\test', 'file://localhost/c%24/devel/test');
+		}
+		assertMalformedFileUri('/foo/bar', 'file:///foo/bar');
+
+		assertMalformedFileUri('file:///foo/bar', void 0);
+		assertMalformedFileUri('file:///c%3A/foo/bar', void 0);
+		assertMalformedFileUri('file://localhost/c$/devel/test', void 0);
+		assertMalformedFileUri('foo://dadie/foo/bar', void 0);
+		assertMalformedFileUri('foo:///dadie/foo/bar', void 0);
+	});
 });
\ No newline at end of file
diff --git a/src/vs/base/test/common/strings.test.ts b/src/vs/base/test/common/strings.test.ts
index 295c3adb50a..8d7c6c705da 100644
--- a/src/vs/base/test/common/strings.test.ts
+++ b/src/vs/base/test/common/strings.test.ts
@@ -381,4 +381,16 @@ suite('Strings', () => {
 			assert.equal(strings.containsUppercaseCharacter(<string>str, true), result, `Wrong result for ${str}`);
 		});
 	});
+
+	test('uppercaseFirstLetter', () => {
+		[
+			['', ''],
+			['foo', 'Foo'],
+			['f', 'F'],
+			['123', '123'],
+			['.a', '.a'],
+		].forEach(([inStr, result]) => {
+			assert.equal(strings.uppercaseFirstLetter(inStr), result, `Wrong result for ${inStr}`);
+		});
+	});
 });
diff --git a/src/vs/base/test/common/tree.test.ts b/src/vs/base/test/common/tree.test.ts
deleted file mode 100644
index f750300dc52..00000000000
--- a/src/vs/base/test/common/tree.test.ts
+++ /dev/null
@@ -1,125 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import * as assert from 'assert';
-import { Tree } from 'vs/base/common/tree';
-
-suite('Base Tree', () => {
-
-	test('ctor', () => {
-		const tree = new Tree<number>();
-		assert(tree);
-
-		const nodes = tree.getNodes();
-		assert.equal(nodes.length, 0);
-	});
-
-	test('insert', () => {
-		const tree = new Tree<number>();
-
-		tree.splice([0], 0, [
-			{ element: 0, children: [] },
-			{ element: 1, children: [] },
-			{ element: 2, children: [] }
-		]);
-
-		const nodes = tree.getNodes();
-		assert.deepEqual(nodes.length, 3);
-		assert.deepEqual(nodes[0].element, 0);
-		assert.deepEqual(nodes[1].element, 1);
-		assert.deepEqual(nodes[2].element, 2);
-	});
-
-	test('deep insert', () => {
-		const tree = new Tree<number>();
-
-		tree.splice([0], 0, [
-			{
-				element: 0, children: [
-					{ element: 10, children: [] },
-					{ element: 11, children: [] },
-					{ element: 12, children: [] },
-				]
-			},
-			{ element: 1, children: [] },
-			{ element: 2, children: [] }
-		]);
-
-		const nodes = tree.getNodes();
-		assert.deepEqual(nodes.length, 3);
-		assert.deepEqual(nodes[0].element, 0);
-		assert.deepEqual(nodes[0].children.length, 3);
-		assert.deepEqual(nodes[0].children[0].element, 10);
-		assert.deepEqual(nodes[0].children[1].element, 11);
-		assert.deepEqual(nodes[0].children[2].element, 12);
-		assert.deepEqual(nodes[1].element, 1);
-		assert.deepEqual(nodes[2].element, 2);
-	});
-
-	test('delete', () => {
-		const tree = new Tree<number>();
-
-		tree.splice([0], 0, [
-			{ element: 0, children: [] },
-			{ element: 1, children: [] },
-			{ element: 2, children: [] }
-		]);
-
-		tree.splice([0], 3, []);
-
-		const nodes = tree.getNodes();
-		assert.equal(nodes.length, 0);
-	});
-
-	test('nested delete', () => {
-		const tree = new Tree<number>();
-
-		tree.splice([0], 0, [
-			{
-				element: 0, children: [
-					{ element: 10, children: [] },
-					{ element: 11, children: [] },
-					{ element: 12, children: [] },
-				]
-			},
-			{ element: 1, children: [] },
-			{ element: 2, children: [] }
-		]);
-
-		tree.splice([0, 1], 1, []);
-
-		const nodes = tree.getNodes();
-		assert.deepEqual(nodes.length, 3);
-		assert.deepEqual(nodes[0].element, 0);
-		assert.deepEqual(nodes[0].children.length, 2);
-		assert.deepEqual(nodes[0].children[0].element, 10);
-		assert.deepEqual(nodes[0].children[1].element, 12);
-		assert.deepEqual(nodes[1].element, 1);
-		assert.deepEqual(nodes[2].element, 2);
-	});
-
-	test('deep delete', () => {
-		const tree = new Tree<number>();
-
-		tree.splice([0], 0, [
-			{
-				element: 0, children: [
-					{ element: 10, children: [] },
-					{ element: 11, children: [] },
-					{ element: 12, children: [] },
-				]
-			},
-			{ element: 1, children: [] },
-			{ element: 2, children: [] }
-		]);
-
-		tree.splice([0], 1, []);
-
-		const nodes = tree.getNodes();
-		assert.deepEqual(nodes.length, 2);
-		assert.deepEqual(nodes[0].element, 1);
-		assert.deepEqual(nodes[1].element, 2);
-	});
-});
diff --git a/src/vs/base/test/common/uri.test.ts b/src/vs/base/test/common/uri.test.ts
index 618a56a1493..2f10412cd95 100644
--- a/src/vs/base/test/common/uri.test.ts
+++ b/src/vs/base/test/common/uri.test.ts
@@ -5,7 +5,7 @@
 'use strict';
 
 import * as assert from 'assert';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { normalize } from 'vs/base/common/paths';
 import { isWindows } from 'vs/base/common/platform';
 
@@ -65,8 +65,6 @@ suite('URI', () => {
 		assert.equal(URI.from({ scheme: 'http', authority: 'www.MSFT.com', path: '/my/path' }).toString(), 'http://www.msft.com/my/path');
 		assert.equal(URI.from({ scheme: 'http', authority: '', path: 'my/path' }).toString(), 'http:/my/path');
 		assert.equal(URI.from({ scheme: 'http', authority: '', path: '/my/path' }).toString(), 'http:/my/path');
-		assert.equal(URI.from({ scheme: '', authority: '', path: 'my/path' }).toString(), 'my/path');
-		assert.equal(URI.from({ scheme: '', authority: '', path: '/my/path' }).toString(), '/my/path');
 		//http://a-test-site.com/#test=true
 		assert.equal(URI.from({ scheme: 'http', authority: 'a-test-site.com', path: '/', query: 'test=true' }).toString(), 'http://a-test-site.com/?test%3Dtrue');
 		assert.equal(URI.from({ scheme: 'http', authority: 'a-test-site.com', path: '/', query: '', fragment: 'test=true' }).toString(), 'http://a-test-site.com/#test%3Dtrue');
@@ -75,7 +73,7 @@ suite('URI', () => {
 	test('http#toString, encode=FALSE', () => {
 		assert.equal(URI.from({ scheme: 'http', authority: 'a-test-site.com', path: '/', query: 'test=true' }).toString(true), 'http://a-test-site.com/?test=true');
 		assert.equal(URI.from({ scheme: 'http', authority: 'a-test-site.com', path: '/', query: '', fragment: 'test=true' }).toString(true), 'http://a-test-site.com/#test=true');
-		assert.equal(URI.from({}).with({ scheme: 'http', path: '/api/files/test.me', query: 't=1234' }).toString(true), 'http:/api/files/test.me?t=1234');
+		assert.equal(URI.from({ scheme: 'http', path: '/api/files/test.me', query: 't=1234' }).toString(true), 'http:/api/files/test.me?t=1234');
 
 		var value = URI.parse('file://shares/pröjects/c%23/#l12');
 		assert.equal(value.authority, 'shares');
@@ -107,12 +105,12 @@ suite('URI', () => {
 
 	test('with, changes', () => {
 		assert.equal(URI.parse('before:some/file/path').with({ scheme: 'after' }).toString(), 'after:some/file/path');
-		assert.equal(URI.from({}).with({ scheme: 'http', path: '/api/files/test.me', query: 't=1234' }).toString(), 'http:/api/files/test.me?t%3D1234');
-		assert.equal(URI.from({}).with({ scheme: 'http', authority: '', path: '/api/files/test.me', query: 't=1234', fragment: '' }).toString(), 'http:/api/files/test.me?t%3D1234');
-		assert.equal(URI.from({}).with({ scheme: 'https', authority: '', path: '/api/files/test.me', query: 't=1234', fragment: '' }).toString(), 'https:/api/files/test.me?t%3D1234');
-		assert.equal(URI.from({}).with({ scheme: 'HTTP', authority: '', path: '/api/files/test.me', query: 't=1234', fragment: '' }).toString(), 'HTTP:/api/files/test.me?t%3D1234');
-		assert.equal(URI.from({}).with({ scheme: 'HTTPS', authority: '', path: '/api/files/test.me', query: 't=1234', fragment: '' }).toString(), 'HTTPS:/api/files/test.me?t%3D1234');
-		assert.equal(URI.from({}).with({ scheme: 'boo', authority: '', path: '/api/files/test.me', query: 't=1234', fragment: '' }).toString(), 'boo:/api/files/test.me?t%3D1234');
+		assert.equal(URI.from({ scheme: 's' }).with({ scheme: 'http', path: '/api/files/test.me', query: 't=1234' }).toString(), 'http:/api/files/test.me?t%3D1234');
+		assert.equal(URI.from({ scheme: 's' }).with({ scheme: 'http', authority: '', path: '/api/files/test.me', query: 't=1234', fragment: '' }).toString(), 'http:/api/files/test.me?t%3D1234');
+		assert.equal(URI.from({ scheme: 's' }).with({ scheme: 'https', authority: '', path: '/api/files/test.me', query: 't=1234', fragment: '' }).toString(), 'https:/api/files/test.me?t%3D1234');
+		assert.equal(URI.from({ scheme: 's' }).with({ scheme: 'HTTP', authority: '', path: '/api/files/test.me', query: 't=1234', fragment: '' }).toString(), 'HTTP:/api/files/test.me?t%3D1234');
+		assert.equal(URI.from({ scheme: 's' }).with({ scheme: 'HTTPS', authority: '', path: '/api/files/test.me', query: 't=1234', fragment: '' }).toString(), 'HTTPS:/api/files/test.me?t%3D1234');
+		assert.equal(URI.from({ scheme: 's' }).with({ scheme: 'boo', authority: '', path: '/api/files/test.me', query: 't=1234', fragment: '' }).toString(), 'boo:/api/files/test.me?t%3D1234');
 	});
 
 	test('with, remove components #8465', () => {
@@ -186,34 +184,13 @@ suite('URI', () => {
 		assert.equal(value.query, '');
 		assert.equal(value.fragment, '');
 
-		value = URI.parse('api/files/test');
-		assert.equal(value.scheme, '');
+		value = URI.parse('foo:api/files/test');
+		assert.equal(value.scheme, 'foo');
 		assert.equal(value.authority, '');
 		assert.equal(value.path, 'api/files/test');
 		assert.equal(value.query, '');
 		assert.equal(value.fragment, '');
 
-		value = URI.parse('api');
-		assert.equal(value.scheme, '');
-		assert.equal(value.authority, '');
-		assert.equal(value.path, 'api');
-		assert.equal(value.query, '');
-		assert.equal(value.fragment, '');
-
-		value = URI.parse('/api/files/test');
-		assert.equal(value.scheme, '');
-		assert.equal(value.authority, '');
-		assert.equal(value.path, '/api/files/test');
-		assert.equal(value.query, '');
-		assert.equal(value.fragment, '');
-
-		value = URI.parse('?test');
-		assert.equal(value.scheme, '');
-		assert.equal(value.authority, '');
-		assert.equal(value.path, '');
-		assert.equal(value.query, 'test');
-		assert.equal(value.fragment, '');
-
 		value = URI.parse('file:?q');
 		assert.equal(value.scheme, 'file');
 		assert.equal(value.authority, '');
@@ -221,13 +198,6 @@ suite('URI', () => {
 		assert.equal(value.query, 'q');
 		assert.equal(value.fragment, '');
 
-		value = URI.parse('#test');
-		assert.equal(value.scheme, '');
-		assert.equal(value.authority, '');
-		assert.equal(value.path, '');
-		assert.equal(value.query, '');
-		assert.equal(value.fragment, 'test');
-
 		value = URI.parse('file:#d');
 		assert.equal(value.scheme, 'file');
 		assert.equal(value.authority, '');
diff --git a/src/vs/base/test/common/utils.ts b/src/vs/base/test/common/utils.ts
index 1875a6f6450..a21bb9f521e 100644
--- a/src/vs/base/test/common/utils.ts
+++ b/src/vs/base/test/common/utils.ts
@@ -5,28 +5,23 @@
 
 'use strict';
 
-import * as errors from 'vs/base/common/errors';
 import * as paths from 'vs/base/common/paths';
-import URI from 'vs/base/common/uri';
-import { PPromise, ProgressCallback, TProgressCallback, TPromise, TValueCallback } from 'vs/base/common/winjs.base';
+import { URI } from 'vs/base/common/uri';
+import { TPromise, TValueCallback } from 'vs/base/common/winjs.base';
+import { canceled } from 'vs/base/common/errors';
 
 export class DeferredTPromise<T> extends TPromise<T> {
 
-	public canceled: boolean;
-
 	private completeCallback: TValueCallback<T>;
 	private errorCallback: (err: any) => void;
-	private progressCallback: ProgressCallback;
 
 	constructor() {
 		let captured: any;
-		super((c, e, p) => {
-			captured = { c, e, p };
-		}, () => this.oncancel());
-		this.canceled = false;
+		super((c, e) => {
+			captured = { c, e };
+		});
 		this.completeCallback = captured.c;
 		this.errorCallback = captured.e;
-		this.progressCallback = captured.p;
 	}
 
 	public complete(value: T) {
@@ -37,45 +32,8 @@ export class DeferredTPromise<T> extends TPromise<T> {
 		this.errorCallback(err);
 	}
 
-	public progress(p: any) {
-		this.progressCallback(p);
-	}
-
-	private oncancel(): void {
-		this.canceled = true;
-	}
-}
-
-export class DeferredPPromise<C, P> extends PPromise<C, P> {
-
-	private completeCallback: TValueCallback<C>;
-	private errorCallback: (err: any) => void;
-	private progressCallback: TProgressCallback<P>;
-
-	constructor(init: (complete: TValueCallback<C>, error: (err: any) => void, progress: TProgressCallback<P>) => void = (c, e, p) => { }, oncancel?: any) {
-		let captured: any;
-		super((c, e, p) => {
-			captured = { c, e, p };
-		}, oncancel ? oncancel : () => this.oncancel);
-		this.completeCallback = captured.c;
-		this.errorCallback = captured.e;
-		this.progressCallback = captured.p;
-	}
-
-	private oncancel(): void {
-		this.errorCallback(errors.canceled());
-	}
-
-	public complete(c: C) {
-		this.completeCallback(c);
-	}
-
-	public progress(p: P) {
-		this.progressCallback(p);
-	}
-
-	public error(e: any) {
-		this.errorCallback(e);
+	public cancel() {
+		this.errorCallback(canceled());
 	}
 }
 
@@ -94,3 +52,7 @@ export function testRepeat(n: number, description: string, callback: (this: any,
 		test(`${description} (iteration ${i})`, callback);
 	}
 }
+
+export function testRepeatOnly(n: number, description: string, callback: (this: any, done: MochaDone) => any): void {
+	suite.only('repeat', () => testRepeat(n, description, callback));
+}
diff --git a/src/vs/base/test/common/winjs.polyfill.promise.test.ts b/src/vs/base/test/common/winjs.polyfill.promise.test.ts
index 0b60154b345..e3ee1b4f58c 100644
--- a/src/vs/base/test/common/winjs.polyfill.promise.test.ts
+++ b/src/vs/base/test/common/winjs.polyfill.promise.test.ts
@@ -5,8 +5,8 @@
 'use strict';
 
 import * as assert from 'assert';
-import { PolyfillPromise } from 'vs/base/common/winjs.polyfill.promise';
 import { Promise as WinJSPromise } from 'vs/base/common/winjs.base';
+import { PolyfillPromise } from 'vs/base/common/winjs.polyfill.promise';
 
 suite('Polyfill Promise', function () {
 
@@ -88,6 +88,12 @@ suite('Polyfill Promise', function () {
 		});
 	});
 
+	test('Promises polyfill does not support chaining then and catch #57722', function () {
+		return PolyfillPromise.resolve(1).then(function (x) { return x + 1; }).then(function (x) {
+			assert.equal(x, 2);
+		});
+	});
+
 	// run the same tests for the native and polyfill promise
 	(<any[]>[Promise, PolyfillPromise]).forEach(PromiseCtor => {
 
diff --git a/src/vs/base/test/common/winjs.promise.test.ts b/src/vs/base/test/common/winjs.promise.test.ts
new file mode 100644
index 00000000000..c8f0070d124
--- /dev/null
+++ b/src/vs/base/test/common/winjs.promise.test.ts
@@ -0,0 +1,70 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+'use strict';
+
+import * as assert from 'assert';
+import * as winjs from 'vs/base/common/winjs.base';
+
+suite('WinJS and ES6 Promises', function () {
+
+	test('Promise.resolve', function () {
+		let resolveTPromise;
+		const tPromise = new winjs.Promise((c, e) => {
+			resolveTPromise = c;
+		});
+
+		const es6Promise = Promise.resolve(tPromise);
+
+		const done = es6Promise.then(function (result) {
+			assert.equal(result, 'passed');
+		});
+
+		resolveTPromise('passed');
+
+		return done;
+	});
+
+	test('new Promise', function () {
+		let resolveTPromise;
+		const tPromise = new winjs.Promise((c, e) => {
+			resolveTPromise = c;
+		});
+
+		const es6Promise = new Promise(function (c, e) {
+			c(tPromise);
+		});
+
+		const done = es6Promise.then(function (result) {
+			assert.equal(result, 'passed');
+		});
+
+		resolveTPromise('passed');
+
+		return done;
+	});
+
+	test('1. Uncaught TypeError: this._state.then is not a function', () => {
+		let p1 = winjs.Promise.wrap<number>(new Promise<number>(function (c, e) { c(1); }));
+		Promise.all([p1]);
+	});
+
+	test('2. Uncaught TypeError: this._state.then is not a function', () => {
+		let p1 = winjs.Promise.wrap<number>(new Promise<number>(function (c, e) { c(1); }));
+		let thenFunc = p1.then.bind(p1);
+		setTimeout(() => {
+			thenFunc(() => { });
+		}, 0);
+	});
+
+	test('3. Uncaught TypeError: this._state.then is not a function', () => {
+		let c;
+		let p1 = new winjs.Promise(function (_c, e) { c = _c; });
+		let thenFunc = p1.then.bind(p1);
+		setTimeout(() => {
+			c(1);
+			thenFunc(() => { });
+		}, 0);
+	});
+});
diff --git a/src/vs/base/test/node/config.test.ts b/src/vs/base/test/node/config.test.ts
index 8a0002bc406..8be86fd083c 100644
--- a/src/vs/base/test/node/config.test.ts
+++ b/src/vs/base/test/node/config.test.ts
@@ -77,70 +77,70 @@ suite('Config', () => {
 		});
 	});
 
-	test('watching', function (done) {
-		this.timeout(10000); // watching is timing intense
+	// test('watching', function (done) {
+	// 	this.timeout(10000); // watching is timing intense
 
-		testFile('config', 'config.json').then(res => {
-			fs.writeFileSync(res.testFile, '// my comment\n{ "foo": "bar" }');
+	// 	testFile('config', 'config.json').then(res => {
+	// 		fs.writeFileSync(res.testFile, '// my comment\n{ "foo": "bar" }');
 
-			let watcher = new ConfigWatcher<{ foo: string; }>(res.testFile);
-			watcher.getConfig(); // ensure we are in sync
+	// 		let watcher = new ConfigWatcher<{ foo: string; }>(res.testFile);
+	// 		watcher.getConfig(); // ensure we are in sync
 
-			fs.writeFileSync(res.testFile, '// my comment\n{ "foo": "changed" }');
+	// 		fs.writeFileSync(res.testFile, '// my comment\n{ "foo": "changed" }');
 
-			watcher.onDidUpdateConfiguration(event => {
-				assert.ok(event);
-				assert.equal(event.config.foo, 'changed');
-				assert.equal(watcher.getValue('foo'), 'changed');
+	// 		watcher.onDidUpdateConfiguration(event => {
+	// 			assert.ok(event);
+	// 			assert.equal(event.config.foo, 'changed');
+	// 			assert.equal(watcher.getValue('foo'), 'changed');
 
-				watcher.dispose();
+	// 			watcher.dispose();
 
-				res.cleanUp().then(done, done);
-			});
-		}, done);
-	});
+	// 			res.cleanUp().then(done, done);
+	// 		});
+	// 	}, done);
+	// });
 
-	test('watching also works when file created later', function (done) {
-		this.timeout(10000); // watching is timing intense
+	// test('watching also works when file created later', function (done) {
+	// 	this.timeout(10000); // watching is timing intense
 
-		testFile('config', 'config.json').then(res => {
-			let watcher = new ConfigWatcher<{ foo: string; }>(res.testFile);
-			watcher.getConfig(); // ensure we are in sync
+	// 	testFile('config', 'config.json').then(res => {
+	// 		let watcher = new ConfigWatcher<{ foo: string; }>(res.testFile);
+	// 		watcher.getConfig(); // ensure we are in sync
 
-			fs.writeFileSync(res.testFile, '// my comment\n{ "foo": "changed" }');
+	// 		fs.writeFileSync(res.testFile, '// my comment\n{ "foo": "changed" }');
 
-			watcher.onDidUpdateConfiguration(event => {
-				assert.ok(event);
-				assert.equal(event.config.foo, 'changed');
-				assert.equal(watcher.getValue('foo'), 'changed');
+	// 		watcher.onDidUpdateConfiguration(event => {
+	// 			assert.ok(event);
+	// 			assert.equal(event.config.foo, 'changed');
+	// 			assert.equal(watcher.getValue('foo'), 'changed');
 
-				watcher.dispose();
+	// 			watcher.dispose();
 
-				res.cleanUp().then(done, done);
-			});
-		}, done);
-	});
+	// 			res.cleanUp().then(done, done);
+	// 		});
+	// 	}, done);
+	// });
 
-	test('watching detects the config file getting deleted', function (done) {
-		this.timeout(10000); // watching is timing intense
+	// test('watching detects the config file getting deleted', function (done) {
+	// 	this.timeout(10000); // watching is timing intense
 
-		testFile('config', 'config.json').then(res => {
-			fs.writeFileSync(res.testFile, '// my comment\n{ "foo": "bar" }');
+	// 	testFile('config', 'config.json').then(res => {
+	// 		fs.writeFileSync(res.testFile, '// my comment\n{ "foo": "bar" }');
 
-			let watcher = new ConfigWatcher<{ foo: string; }>(res.testFile);
-			watcher.getConfig(); // ensure we are in sync
+	// 		let watcher = new ConfigWatcher<{ foo: string; }>(res.testFile);
+	// 		watcher.getConfig(); // ensure we are in sync
 
-			watcher.onDidUpdateConfiguration(event => {
-				assert.ok(event);
+	// 		watcher.onDidUpdateConfiguration(event => {
+	// 			assert.ok(event);
 
-				watcher.dispose();
+	// 			watcher.dispose();
 
-				res.cleanUp().then(done, done);
-			});
+	// 			res.cleanUp().then(done, done);
+	// 		});
 
-			fs.unlinkSync(res.testFile);
-		}, done);
-	});
+	// 		fs.unlinkSync(res.testFile);
+	// 	}, done);
+	// });
 
 	test('reload', function (done) {
 		testFile('config', 'config.json').then(res => {
diff --git a/src/vs/base/test/node/encoding/encoding.test.ts b/src/vs/base/test/node/encoding/encoding.test.ts
index 252ee281e37..99d05d437a0 100644
--- a/src/vs/base/test/node/encoding/encoding.test.ts
+++ b/src/vs/base/test/node/encoding/encoding.test.ts
@@ -10,10 +10,11 @@ import * as fs from 'fs';
 import * as encoding from 'vs/base/node/encoding';
 import { readExactlyByFile } from 'vs/base/node/stream';
 import { Readable } from 'stream';
+import { getPathFromAmdModule } from 'vs/base/common/amd';
 
 suite('Encoding', () => {
 	test('detectBOM UTF-8', () => {
-		const file = require.toUrl('./fixtures/some_utf8.css');
+		const file = getPathFromAmdModule(require, './fixtures/some_utf8.css');
 
 		return encoding.detectEncodingByBOM(file).then((encoding: string) => {
 			assert.equal(encoding, 'utf8');
@@ -21,7 +22,7 @@ suite('Encoding', () => {
 	});
 
 	test('detectBOM UTF-16 LE', () => {
-		const file = require.toUrl('./fixtures/some_utf16le.css');
+		const file = getPathFromAmdModule(require, './fixtures/some_utf16le.css');
 
 		return encoding.detectEncodingByBOM(file).then((encoding: string) => {
 			assert.equal(encoding, 'utf16le');
@@ -29,7 +30,7 @@ suite('Encoding', () => {
 	});
 
 	test('detectBOM UTF-16 BE', () => {
-		const file = require.toUrl('./fixtures/some_utf16be.css');
+		const file = getPathFromAmdModule(require, './fixtures/some_utf16be.css');
 
 		return encoding.detectEncodingByBOM(file).then((encoding: string) => {
 			assert.equal(encoding, 'utf16be');
@@ -37,7 +38,7 @@ suite('Encoding', () => {
 	});
 
 	test('detectBOM ANSI', function () {
-		const file = require.toUrl('./fixtures/some_ansi.css');
+		const file = getPathFromAmdModule(require, './fixtures/some_ansi.css');
 
 		return encoding.detectEncodingByBOM(file).then((encoding: string) => {
 			assert.equal(encoding, null);
@@ -45,7 +46,7 @@ suite('Encoding', () => {
 	});
 
 	test('detectBOM ANSI', function () {
-		const file = require.toUrl('./fixtures/empty.txt');
+		const file = getPathFromAmdModule(require, './fixtures/empty.txt');
 
 		return encoding.detectEncodingByBOM(file).then((encoding: string) => {
 			assert.equal(encoding, null);
@@ -68,7 +69,7 @@ suite('Encoding', () => {
 	});
 
 	test('detectEncodingFromBuffer (JSON saved as PNG)', function () {
-		const file = require.toUrl('./fixtures/some.json.png');
+		const file = getPathFromAmdModule(require, './fixtures/some.json.png');
 
 		return readExactlyByFile(file, 512).then(buffer => {
 			const mimes = encoding.detectEncodingFromBuffer(buffer);
@@ -77,7 +78,7 @@ suite('Encoding', () => {
 	});
 
 	test('detectEncodingFromBuffer (PNG saved as TXT)', function () {
-		const file = require.toUrl('./fixtures/some.png.txt');
+		const file = getPathFromAmdModule(require, './fixtures/some.png.txt');
 		return readExactlyByFile(file, 512).then(buffer => {
 			const mimes = encoding.detectEncodingFromBuffer(buffer);
 			assert.equal(mimes.seemsBinary, true);
@@ -85,7 +86,7 @@ suite('Encoding', () => {
 	});
 
 	test('detectEncodingFromBuffer (XML saved as PNG)', function () {
-		const file = require.toUrl('./fixtures/some.xml.png');
+		const file = getPathFromAmdModule(require, './fixtures/some.xml.png');
 		return readExactlyByFile(file, 512).then(buffer => {
 			const mimes = encoding.detectEncodingFromBuffer(buffer);
 			assert.equal(mimes.seemsBinary, false);
@@ -93,7 +94,7 @@ suite('Encoding', () => {
 	});
 
 	test('detectEncodingFromBuffer (QWOFF saved as TXT)', function () {
-		const file = require.toUrl('./fixtures/some.qwoff.txt');
+		const file = getPathFromAmdModule(require, './fixtures/some.qwoff.txt');
 		return readExactlyByFile(file, 512).then(buffer => {
 			const mimes = encoding.detectEncodingFromBuffer(buffer);
 			assert.equal(mimes.seemsBinary, true);
@@ -101,7 +102,7 @@ suite('Encoding', () => {
 	});
 
 	test('detectEncodingFromBuffer (CSS saved as QWOFF)', function () {
-		const file = require.toUrl('./fixtures/some.css.qwoff');
+		const file = getPathFromAmdModule(require, './fixtures/some.css.qwoff');
 		return readExactlyByFile(file, 512).then(buffer => {
 			const mimes = encoding.detectEncodingFromBuffer(buffer);
 			assert.equal(mimes.seemsBinary, false);
@@ -109,7 +110,7 @@ suite('Encoding', () => {
 	});
 
 	test('detectEncodingFromBuffer (PDF)', function () {
-		const file = require.toUrl('./fixtures/some.pdf');
+		const file = getPathFromAmdModule(require, './fixtures/some.pdf');
 		return readExactlyByFile(file, 512).then(buffer => {
 			const mimes = encoding.detectEncodingFromBuffer(buffer);
 			assert.equal(mimes.seemsBinary, true);
@@ -117,7 +118,7 @@ suite('Encoding', () => {
 	});
 
 	test('detectEncodingFromBuffer (guess UTF-16 LE from content without BOM)', function () {
-		const file = require.toUrl('./fixtures/utf16_le_nobom.txt');
+		const file = getPathFromAmdModule(require, './fixtures/utf16_le_nobom.txt');
 		return readExactlyByFile(file, 512).then(buffer => {
 			const mimes = encoding.detectEncodingFromBuffer(buffer);
 			assert.equal(mimes.encoding, encoding.UTF16le);
@@ -126,7 +127,7 @@ suite('Encoding', () => {
 	});
 
 	test('detectEncodingFromBuffer (guess UTF-16 BE from content without BOM)', function () {
-		const file = require.toUrl('./fixtures/utf16_be_nobom.txt');
+		const file = getPathFromAmdModule(require, './fixtures/utf16_be_nobom.txt');
 		return readExactlyByFile(file, 512).then(buffer => {
 			const mimes = encoding.detectEncodingFromBuffer(buffer);
 			assert.equal(mimes.encoding, encoding.UTF16be);
@@ -135,7 +136,7 @@ suite('Encoding', () => {
 	});
 
 	test('autoGuessEncoding (ShiftJIS)', function () {
-		const file = require.toUrl('./fixtures/some.shiftjis.txt');
+		const file = getPathFromAmdModule(require, './fixtures/some.shiftjis.txt');
 		return readExactlyByFile(file, 512 * 8).then(buffer => {
 			return encoding.detectEncodingFromBuffer(buffer, true).then(mimes => {
 				assert.equal(mimes.encoding, 'shiftjis');
@@ -144,7 +145,7 @@ suite('Encoding', () => {
 	});
 
 	test('autoGuessEncoding (CP1252)', function () {
-		const file = require.toUrl('./fixtures/some.cp1252.txt');
+		const file = getPathFromAmdModule(require, './fixtures/some.cp1252.txt');
 		return readExactlyByFile(file, 512 * 8).then(buffer => {
 			return encoding.detectEncodingFromBuffer(buffer, true).then(mimes => {
 				assert.equal(mimes.encoding, 'windows1252');
@@ -238,7 +239,7 @@ suite('Encoding', () => {
 
 	test('toDecodeStream - encoding, utf16be', async function () {
 
-		let path = require.toUrl('./fixtures/some_utf16be.css');
+		let path = getPathFromAmdModule(require, './fixtures/some_utf16be.css');
 		let source = fs.createReadStream(path);
 
 		let { detected, stream } = await encoding.toDecodeStream(source, { minBytesRequiredForDetection: 64 });
@@ -254,7 +255,7 @@ suite('Encoding', () => {
 
 	test('toDecodeStream - empty file', async function () {
 
-		let path = require.toUrl('./fixtures/empty.txt');
+		let path = getPathFromAmdModule(require, './fixtures/empty.txt');
 		let source = fs.createReadStream(path);
 		let { detected, stream } = await encoding.toDecodeStream(source, {});
 
diff --git a/src/vs/base/test/node/extfs/extfs.test.ts b/src/vs/base/test/node/extfs/extfs.test.ts
index d5a363f2b5c..36add33a71c 100644
--- a/src/vs/base/test/node/extfs/extfs.test.ts
+++ b/src/vs/base/test/node/extfs/extfs.test.ts
@@ -14,13 +14,13 @@ import { canNormalize } from 'vs/base/common/normalization';
 import { isLinux, isWindows } from 'vs/base/common/platform';
 import * as uuid from 'vs/base/common/uuid';
 import * as extfs from 'vs/base/node/extfs';
-
-
+import { getPathFromAmdModule } from 'vs/base/common/amd';
+import { CancellationTokenSource } from 'vs/base/common/cancellation';
 
 const ignore = () => { };
 
 const mkdirp = (path: string, mode: number, callback: (error) => void) => {
-	extfs.mkdirp(path, mode).done(() => callback(null), error => callback(error));
+	extfs.mkdirp(path, mode).then(() => callback(null), error => callback(error));
 };
 
 const chunkSize = 64 * 1024;
@@ -169,7 +169,7 @@ suite('Extfs', () => {
 	test('copy, move and delete', function (done) {
 		const id = uuid.generateUuid();
 		const id2 = uuid.generateUuid();
-		const sourceDir = require.toUrl('./fixtures');
+		const sourceDir = getPathFromAmdModule(require, './fixtures');
 		const parentDir = path.join(os.tmpdir(), 'vsctests', 'extfs');
 		const targetDir = path.join(parentDir, id);
 		const targetDir2 = path.join(parentDir, id2);
@@ -320,7 +320,7 @@ suite('Extfs', () => {
 	test('writeFileAndFlush (file stream)', function (done) {
 		const id = uuid.generateUuid();
 		const parentDir = path.join(os.tmpdir(), 'vsctests', id);
-		const sourceFile = require.toUrl('./fixtures/index.html');
+		const sourceFile = getPathFromAmdModule(require, './fixtures/index.html');
 		const newDir = path.join(parentDir, 'extfs', id);
 		const testFile = path.join(newDir, 'flushed.txt');
 
@@ -453,7 +453,7 @@ suite('Extfs', () => {
 	test('writeFileAndFlush (file stream, error handling)', function (done) {
 		const id = uuid.generateUuid();
 		const parentDir = path.join(os.tmpdir(), 'vsctests', id);
-		const sourceFile = require.toUrl('./fixtures/index.html');
+		const sourceFile = getPathFromAmdModule(require, './fixtures/index.html');
 		const newDir = path.join(parentDir, 'extfs', id);
 		const testFile = path.join(newDir, 'flushed.txt');
 
@@ -563,4 +563,57 @@ suite('Extfs', () => {
 			extfs.del(parentDir, os.tmpdir(), done, ignore);
 		});
 	});
+
+	test('mkdirp cancellation', (done) => {
+		const id = uuid.generateUuid();
+		const parentDir = path.join(os.tmpdir(), 'vsctests', id);
+		const newDir = path.join(parentDir, 'extfs', id);
+
+		const source = new CancellationTokenSource();
+
+		const mkdirpPromise = extfs.mkdirp(newDir, 493, source.token);
+		source.cancel();
+
+		return mkdirpPromise.then(res => {
+			assert.equal(res, false);
+
+			extfs.del(parentDir, os.tmpdir(), done, ignore);
+		});
+	});
+
+	test('sanitizeFilePath', () => {
+		if (isWindows) {
+			assert.equal(extfs.sanitizeFilePath('.', 'C:\\the\\cwd'), 'C:\\the\\cwd');
+			assert.equal(extfs.sanitizeFilePath('', 'C:\\the\\cwd'), 'C:\\the\\cwd');
+
+			assert.equal(extfs.sanitizeFilePath('C:', 'C:\\the\\cwd'), 'C:\\');
+			assert.equal(extfs.sanitizeFilePath('C:\\', 'C:\\the\\cwd'), 'C:\\');
+			assert.equal(extfs.sanitizeFilePath('C:\\\\', 'C:\\the\\cwd'), 'C:\\');
+
+			assert.equal(extfs.sanitizeFilePath('C:\\folder\\my.txt', 'C:\\the\\cwd'), 'C:\\folder\\my.txt');
+			assert.equal(extfs.sanitizeFilePath('C:\\folder\\my', 'C:\\the\\cwd'), 'C:\\folder\\my');
+			assert.equal(extfs.sanitizeFilePath('C:\\folder\\..\\my', 'C:\\the\\cwd'), 'C:\\my');
+			assert.equal(extfs.sanitizeFilePath('C:\\folder\\my\\', 'C:\\the\\cwd'), 'C:\\folder\\my');
+			assert.equal(extfs.sanitizeFilePath('C:\\folder\\my\\\\\\', 'C:\\the\\cwd'), 'C:\\folder\\my');
+
+			assert.equal(extfs.sanitizeFilePath('my.txt', 'C:\\the\\cwd'), 'C:\\the\\cwd\\my.txt');
+			assert.equal(extfs.sanitizeFilePath('my.txt\\', 'C:\\the\\cwd'), 'C:\\the\\cwd\\my.txt');
+
+			assert.equal(extfs.sanitizeFilePath('\\\\localhost\\folder\\my', 'C:\\the\\cwd'), '\\\\localhost\\folder\\my');
+			assert.equal(extfs.sanitizeFilePath('\\\\localhost\\folder\\my\\', 'C:\\the\\cwd'), '\\\\localhost\\folder\\my');
+		} else {
+			assert.equal(extfs.sanitizeFilePath('.', '/the/cwd'), '/the/cwd');
+			assert.equal(extfs.sanitizeFilePath('', '/the/cwd'), '/the/cwd');
+			assert.equal(extfs.sanitizeFilePath('/', '/the/cwd'), '/');
+
+			assert.equal(extfs.sanitizeFilePath('/folder/my.txt', '/the/cwd'), '/folder/my.txt');
+			assert.equal(extfs.sanitizeFilePath('/folder/my', '/the/cwd'), '/folder/my');
+			assert.equal(extfs.sanitizeFilePath('/folder/../my', '/the/cwd'), '/my');
+			assert.equal(extfs.sanitizeFilePath('/folder/my/', '/the/cwd'), '/folder/my');
+			assert.equal(extfs.sanitizeFilePath('/folder/my///', '/the/cwd'), '/folder/my');
+
+			assert.equal(extfs.sanitizeFilePath('my.txt', '/the/cwd'), '/the/cwd/my.txt');
+			assert.equal(extfs.sanitizeFilePath('my.txt/', '/the/cwd'), '/the/cwd/my.txt');
+		}
+	});
 });
diff --git a/src/vs/base/test/node/glob.test.ts b/src/vs/base/test/node/glob.test.ts
index 5d2d82599e2..1b46a798de8 100644
--- a/src/vs/base/test/node/glob.test.ts
+++ b/src/vs/base/test/node/glob.test.ts
@@ -430,6 +430,7 @@ suite('Glob', () => {
 
 	test('expression support (single)', function () {
 		let siblings = ['test.html', 'test.txt', 'test.ts', 'test.js'];
+		let hasSibling = name => siblings.indexOf(name) !== -1;
 
 		// { "**/*.js": { "when": "$(basename).ts" } }
 		let expression: glob.IExpression = {
@@ -438,9 +439,9 @@ suite('Glob', () => {
 			}
 		};
 
-		assert.strictEqual('**/*.js', glob.match(expression, 'test.js', () => siblings));
-		assert.strictEqual(glob.match(expression, 'test.js', () => []), null);
-		assert.strictEqual(glob.match(expression, 'test.js', () => ['te.ts']), null);
+		assert.strictEqual('**/*.js', glob.match(expression, 'test.js', hasSibling));
+		assert.strictEqual(glob.match(expression, 'test.js', () => false), null);
+		assert.strictEqual(glob.match(expression, 'test.js', name => name === 'te.ts'), null);
 		assert.strictEqual(glob.match(expression, 'test.js'), null);
 
 		expression = {
@@ -449,22 +450,23 @@ suite('Glob', () => {
 			}
 		};
 
-		assert.strictEqual(glob.match(expression, 'test.js', () => siblings), null);
+		assert.strictEqual(glob.match(expression, 'test.js', hasSibling), null);
 
 		expression = {
 			'**/*.js': {
 			}
 		};
 
-		assert.strictEqual('**/*.js', glob.match(expression, 'test.js', () => siblings));
+		assert.strictEqual('**/*.js', glob.match(expression, 'test.js', hasSibling));
 
 		expression = {};
 
-		assert.strictEqual(glob.match(expression, 'test.js', () => siblings), null);
+		assert.strictEqual(glob.match(expression, 'test.js', hasSibling), null);
 	});
 
 	test('expression support (multiple)', function () {
 		let siblings = ['test.html', 'test.txt', 'test.ts', 'test.js'];
+		let hasSibling = name => siblings.indexOf(name) !== -1;
 
 		// { "**/*.js": { "when": "$(basename).ts" } }
 		let expression: glob.IExpression = {
@@ -474,11 +476,11 @@ suite('Glob', () => {
 			'**/*.bananas': { bananas: true }
 		};
 
-		assert.strictEqual('**/*.js', glob.match(expression, 'test.js', () => siblings));
-		assert.strictEqual('**/*.as', glob.match(expression, 'test.as', () => siblings));
-		assert.strictEqual('**/*.bananas', glob.match(expression, 'test.bananas', () => siblings));
+		assert.strictEqual('**/*.js', glob.match(expression, 'test.js', hasSibling));
+		assert.strictEqual('**/*.as', glob.match(expression, 'test.as', hasSibling));
+		assert.strictEqual('**/*.bananas', glob.match(expression, 'test.bananas', hasSibling));
 		assert.strictEqual('**/*.bananas', glob.match(expression, 'test.bananas'));
-		assert.strictEqual(glob.match(expression, 'test.foo', () => siblings), null);
+		assert.strictEqual(glob.match(expression, 'test.foo', hasSibling), null);
 	});
 
 	test('brackets', function () {
@@ -713,15 +715,16 @@ suite('Glob', () => {
 			'**/*.js': { when: '$(basename).ts' }
 		};
 
-		let sibilings = () => ['foo.ts', 'foo.js', 'foo', 'bar'];
+		let siblings = ['foo.ts', 'foo.js', 'foo', 'bar'];
+		let hasSibling = name => siblings.indexOf(name) !== -1;
 
-		assert.strictEqual(glob.match(expr, 'bar', sibilings), '**/bar');
-		assert.strictEqual(glob.match(expr, 'foo', sibilings), null);
-		assert.strictEqual(glob.match(expr, 'foo/bar', sibilings), '**/bar');
-		assert.strictEqual(glob.match(expr, 'foo\\bar', sibilings), '**/bar');
-		assert.strictEqual(glob.match(expr, 'foo/foo', sibilings), null);
-		assert.strictEqual(glob.match(expr, 'foo.js', sibilings), '**/*.js');
-		assert.strictEqual(glob.match(expr, 'bar.js', sibilings), null);
+		assert.strictEqual(glob.match(expr, 'bar', hasSibling), '**/bar');
+		assert.strictEqual(glob.match(expr, 'foo', hasSibling), null);
+		assert.strictEqual(glob.match(expr, 'foo/bar', hasSibling), '**/bar');
+		assert.strictEqual(glob.match(expr, 'foo\\bar', hasSibling), '**/bar');
+		assert.strictEqual(glob.match(expr, 'foo/foo', hasSibling), null);
+		assert.strictEqual(glob.match(expr, 'foo.js', hasSibling), '**/*.js');
+		assert.strictEqual(glob.match(expr, 'bar.js', hasSibling), null);
 	});
 
 	test('expression with multipe basename globs', function () {
@@ -766,10 +769,11 @@ suite('Glob', () => {
 		assert.strictEqual(glob.parse('{**/baz,**/foo}')('baz/foo', 'foo'), true);
 
 		let expr = { '**/*.js': { when: '$(basename).ts' } };
-		let sibilings = () => ['foo.ts', 'foo.js'];
+		let siblings = ['foo.ts', 'foo.js'];
+		let hasSibling = name => siblings.indexOf(name) !== -1;
 
-		assert.strictEqual(glob.parse(expr)('bar/baz.js', 'baz.js', sibilings), null);
-		assert.strictEqual(glob.parse(expr)('bar/foo.js', 'foo.js', sibilings), '**/*.js');
+		assert.strictEqual(glob.parse(expr)('bar/baz.js', 'baz.js', hasSibling), null);
+		assert.strictEqual(glob.parse(expr)('bar/foo.js', 'foo.js', hasSibling), '**/*.js');
 	});
 
 	test('expression/pattern basename terms', function () {
@@ -809,7 +813,8 @@ suite('Glob', () => {
 				['bar/nope', null]
 			]);
 
-		const siblingsFn = () => ['baz', 'baz.zip', 'nope'];
+		const siblings = ['baz', 'baz.zip', 'nope'];
+		const hasSibling = name => siblings.indexOf(name) !== -1;
 		testOptimizationForBasenames({
 			'**/foo/**': { when: '$(basename).zip' },
 			'**/bar/**': true
@@ -820,12 +825,12 @@ suite('Glob', () => {
 				['foo/bar', '**/bar/**'],
 			], [
 				null,
-				siblingsFn,
-				siblingsFn
+				hasSibling,
+				hasSibling
 			]);
 	});
 
-	function testOptimizationForBasenames(pattern: string | glob.IExpression, basenameTerms: string[], matches: [string, string | boolean][], siblingsFns: (() => string[])[] = []) {
+	function testOptimizationForBasenames(pattern: string | glob.IExpression, basenameTerms: string[], matches: [string, string | boolean][], siblingsFns: ((name: string) => boolean)[] = []) {
 		const parsed = glob.parse(<glob.IExpression>pattern, { trimForExclusions: true });
 		assert.deepStrictEqual(glob.getBasenameTerms(parsed), basenameTerms);
 		matches.forEach(([text, result], i) => {
@@ -914,7 +919,8 @@ suite('Glob', () => {
 				[nativeSep('/foo/bar/nope'), null]
 			]);
 
-		const siblingsFn = () => ['baz', 'baz.zip', 'nope'];
+		const siblings = ['baz', 'baz.zip', 'nope'];
+		let hasSibling = name => siblings.indexOf(name) !== -1;
 		testOptimizationForPaths({
 			'**/foo/123/**': { when: '$(basename).zip' },
 			'**/bar/123/**': true
@@ -925,12 +931,12 @@ suite('Glob', () => {
 				[nativeSep('foo/bar/123'), '**/bar/123/**'],
 			], [
 				null,
-				siblingsFn,
-				siblingsFn
+				hasSibling,
+				hasSibling
 			]);
 	});
 
-	function testOptimizationForPaths(pattern: string | glob.IExpression, pathTerms: string[], matches: [string, string | boolean][], siblingsFns: (() => string[])[] = []) {
+	function testOptimizationForPaths(pattern: string | glob.IExpression, pathTerms: string[], matches: [string, string | boolean][], siblingsFns: ((name: string) => boolean)[] = []) {
 		const parsed = glob.parse(<glob.IExpression>pattern, { trimForExclusions: true });
 		assert.deepStrictEqual(glob.getPathTerms(parsed), pathTerms);
 		matches.forEach(([text, result], i) => {
@@ -993,4 +999,16 @@ suite('Glob', () => {
 	test('pattern with "base" does not explode - #36081', function () {
 		assert.ok(glob.match({ 'base': true }, 'base'));
 	});
+
+	test('relative pattern - #57475', function () {
+		if (isWindows) {
+			let p: glob.IRelativePattern = { base: 'C:\\DNXConsoleApp\\foo', pattern: 'styles/style.css', pathToRelative: (from, to) => path.relative(from, to) };
+			assertGlobMatch(p, 'C:\\DNXConsoleApp\\foo\\styles\\style.css');
+			assertNoGlobMatch(p, 'C:\\DNXConsoleApp\\foo\\Program.cs');
+		} else {
+			let p: glob.IRelativePattern = { base: '/DNXConsoleApp/foo', pattern: 'styles/style.css', pathToRelative: (from, to) => path.relative(from, to) };
+			assertGlobMatch(p, '/DNXConsoleApp/foo/styles/style.css');
+			assertNoGlobMatch(p, '/DNXConsoleApp/foo/Program.cs');
+		}
+	});
 });
\ No newline at end of file
diff --git a/src/vs/base/test/node/processes/processes.test.ts b/src/vs/base/test/node/processes/processes.test.ts
index 332bdcdbff7..7755d984f4b 100644
--- a/src/vs/base/test/node/processes/processes.test.ts
+++ b/src/vs/base/test/node/processes/processes.test.ts
@@ -9,8 +9,8 @@ import * as assert from 'assert';
 import * as cp from 'child_process';
 import * as objects from 'vs/base/common/objects';
 import * as platform from 'vs/base/common/platform';
-import URI from 'vs/base/common/uri';
 import * as processes from 'vs/base/node/processes';
+import { getPathFromAmdModule } from 'vs/base/common/amd';
 
 function fork(id: string): cp.ChildProcess {
 	const opts: any = {
@@ -21,7 +21,7 @@ function fork(id: string): cp.ChildProcess {
 		})
 	};
 
-	return cp.fork(URI.parse(require.toUrl('bootstrap')).fsPath, ['--type=processTests'], opts);
+	return cp.fork(getPathFromAmdModule(require, 'bootstrap-fork'), ['--type=processTests'], opts);
 }
 
 suite('Processes', () => {
diff --git a/src/vs/base/test/node/stream/stream.test.ts b/src/vs/base/test/node/stream/stream.test.ts
index c2c5f1b2f9a..d52ed4c43b1 100644
--- a/src/vs/base/test/node/stream/stream.test.ts
+++ b/src/vs/base/test/node/stream/stream.test.ts
@@ -8,10 +8,11 @@
 import * as assert from 'assert';
 
 import * as stream from 'vs/base/node/stream';
+import { getPathFromAmdModule } from 'vs/base/common/amd';
 
 suite('Stream', () => {
 	test('readExactlyByFile - ANSI', function () {
-		const file = require.toUrl('./fixtures/file.css');
+		const file = getPathFromAmdModule(require, './fixtures/file.css');
 
 		return stream.readExactlyByFile(file, 10).then(({ buffer, bytesRead }) => {
 			assert.equal(bytesRead, 10);
@@ -20,7 +21,7 @@ suite('Stream', () => {
 	});
 
 	test('readExactlyByFile - empty', function () {
-		const file = require.toUrl('./fixtures/empty.txt');
+		const file = getPathFromAmdModule(require, './fixtures/empty.txt');
 
 		return stream.readExactlyByFile(file, 10).then(({ bytesRead }) => {
 			assert.equal(bytesRead, 0);
@@ -28,7 +29,7 @@ suite('Stream', () => {
 	});
 
 	test('readToMatchingString - ANSI', function () {
-		const file = require.toUrl('./fixtures/file.css');
+		const file = getPathFromAmdModule(require, './fixtures/file.css');
 
 		return stream.readToMatchingString(file, '\n', 10, 100).then((result: string) => {
 			// \r may be present on Windows
@@ -37,10 +38,10 @@ suite('Stream', () => {
 	});
 
 	test('readToMatchingString - empty', function () {
-		const file = require.toUrl('./fixtures/empty.txt');
+		const file = getPathFromAmdModule(require, './fixtures/empty.txt');
 
 		return stream.readToMatchingString(file, '\n', 10, 100).then((result: string) => {
 			assert.equal(result, null);
 		});
 	});
-});
\ No newline at end of file
+});
diff --git a/src/vs/base/test/node/uri.test.data.txt b/src/vs/base/test/node/uri.test.data.txt
index 7c5ca7f53c3..22e9869aaea 100644
--- a/src/vs/base/test/node/uri.test.data.txt
+++ b/src/vs/base/test/node/uri.test.data.txt
@@ -1052,7 +1052,7 @@
 /users/foo/src/vs/workbench/parts/extensions/browser/extensionsList.ts
 /users/foo/src/vs/workbench/parts/extensions/browser/extensionsActions.ts
 /users/foo/src/vs/workbench/parts/extensions/browser/media
-/users/foo/src/vs/workbench/parts/extensions/browser/media/language-icon.png
+/users/foo/src/vs/workbench/parts/extensions/browser/media/language-icon.svg
 /users/foo/src/vs/workbench/parts/extensions/browser/media/theme-icon.png
 /users/foo/src/vs/workbench/parts/extensions/browser/media/clear.svg
 /users/foo/src/vs/workbench/parts/extensions/browser/media/HalfStarLight.svg
@@ -2299,8 +2299,8 @@
 /users/foo/src/vs/base/parts/ipc/test/node/ipc.test.ts
 /users/foo/src/vs/base/parts/ipc/test/node/testService.ts
 /users/foo/src/vs/base/parts/ipc/common
-/users/foo/src/vs/base/parts/ipc/common/ipc.electron.ts
-/users/foo/src/vs/base/parts/ipc/common/ipc.ts
+/users/foo/src/vs/base/parts/ipc/node/ipc.electron.ts
+/users/foo/src/vs/base/parts/ipc/node/ipc.ts
 /users/foo/src/vs/base/parts/ipc/electron-browser
 /users/foo/src/vs/base/parts/ipc/electron-browser/ipc.electron-browser.ts
 /users/foo/src/vs/base/parts/ipc/node
diff --git a/src/vs/base/test/node/uri.test.perf.ts b/src/vs/base/test/node/uri.test.perf.ts
index 3689d197b4d..a3caa3df820 100644
--- a/src/vs/base/test/node/uri.test.perf.ts
+++ b/src/vs/base/test/node/uri.test.perf.ts
@@ -5,15 +5,16 @@
 'use strict';
 
 import * as assert from 'assert';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { readFileSync } from 'fs';
+import { getPathFromAmdModule } from 'vs/base/common/amd';
 
 suite('URI - perf', function () {
 
 	let manyFileUris: URI[];
 	setup(function () {
 		manyFileUris = [];
-		let data = readFileSync(URI.parse(require.toUrl('./uri.test.data.txt')).fsPath).toString();
+		let data = readFileSync(getPathFromAmdModule(require, './uri.test.data.txt')).toString();
 		let lines = data.split('\n');
 		for (let line of lines) {
 			manyFileUris.push(URI.file(line));
diff --git a/src/vs/base/test/node/zip/zip.test.ts b/src/vs/base/test/node/zip/zip.test.ts
deleted file mode 100644
index f53894f5ebb..00000000000
--- a/src/vs/base/test/node/zip/zip.test.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-'use strict';
-
-import * as assert from 'assert';
-import * as path from 'path';
-import * as os from 'os';
-import URI from 'vs/base/common/uri';
-import { extract } from 'vs/base/node/zip';
-import { generateUuid } from 'vs/base/common/uuid';
-import { rimraf, exists } from 'vs/base/node/pfs';
-import { NullLogService } from 'vs/platform/log/common/log';
-
-const fixtures = URI.parse(require.toUrl('./fixtures')).fsPath;
-
-suite('Zip', () => {
-
-	test('extract should handle directories', () => {
-		const fixture = path.join(fixtures, 'extract.zip');
-		const target = path.join(os.tmpdir(), generateUuid());
-
-		return extract(fixture, target, {}, new NullLogService())
-			.then(() => exists(path.join(target, 'extension')))
-			.then(exists => assert(exists))
-			.then(() => rimraf(target));
-	});
-});
\ No newline at end of file
diff --git a/src/vs/code/electron-main/contributions.ts b/src/vs/code/code.main.ts
similarity index 100%
rename from src/vs/code/electron-main/contributions.ts
rename to src/vs/code/code.main.ts
diff --git a/src/vs/code/electron-browser/issue/issueReporter.js b/src/vs/code/electron-browser/issue/issueReporter.js
index 5b246f9491b..71c2b34a4e5 100644
--- a/src/vs/code/electron-browser/issue/issueReporter.js
+++ b/src/vs/code/electron-browser/issue/issueReporter.js
@@ -3,173 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+//@ts-check
 'use strict';
 
-const path = require('path');
-const fs = require('fs');
-const remote = require('electron').remote;
+const bootstrapWindow = require('../../../../bootstrap-window');
 
-function assign(destination, source) {
-	return Object.keys(source)
-		.reduce(function (r, key) { r[key] = source[key]; return r; }, destination);
-}
-
-function parseURLQueryArgs() {
-	const search = window.location.search || '';
-
-	return search.split(/[?&]/)
-		.filter(function (param) { return !!param; })
-		.map(function (param) { return param.split('='); })
-		.filter(function (param) { return param.length === 2; })
-		.reduce(function (r, param) { r[param[0]] = decodeURIComponent(param[1]); return r; }, {});
-}
-
-function uriFromPath(_path) {
-	var pathName = path.resolve(_path).replace(/\\/g, '/');
-	if (pathName.length > 0 && pathName.charAt(0) !== '/') {
-		pathName = '/' + pathName;
-	}
-
-	return encodeURI('file://' + pathName);
-}
-
-function readFile(file) {
-	return new Promise(function(resolve, reject) {
-		fs.readFile(file, 'utf8', function(err, data) {
-			if (err) {
-				reject(err);
-				return;
-			}
-			resolve(data);
-		});
-	});
-}
-
-function main() {
-	const args = parseURLQueryArgs();
-	const configuration = JSON.parse(args['config'] || '{}') || {};
-
-	assign(process.env, configuration.userEnv);
-
-	//#region Add support for using node_modules.asar
-	(function () {
-		const path = require('path');
-		const Module = require('module');
-		let NODE_MODULES_PATH = path.join(configuration.appRoot, 'node_modules');
-		if (/[a-z]\:/.test(NODE_MODULES_PATH)) {
-			// Make drive letter uppercase
-			NODE_MODULES_PATH = NODE_MODULES_PATH.charAt(0).toUpperCase() + NODE_MODULES_PATH.substr(1);
-		}
-		const NODE_MODULES_ASAR_PATH = NODE_MODULES_PATH + '.asar';
-
-		const originalResolveLookupPaths = Module._resolveLookupPaths;
-		Module._resolveLookupPaths = function (request, parent, newReturn) {
-			const result = originalResolveLookupPaths(request, parent, newReturn);
-
-			const paths = newReturn ? result : result[1];
-			for (let i = 0, len = paths.length; i < len; i++) {
-				if (paths[i] === NODE_MODULES_PATH) {
-					paths.splice(i, 0, NODE_MODULES_ASAR_PATH);
-					break;
-				}
-			}
-
-			return result;
-		};
-	})();
-	//#endregion
-
-	const extractKey = function (e) {
-		return [
-			e.ctrlKey ? 'ctrl-' : '',
-			e.metaKey ? 'meta-' : '',
-			e.altKey ? 'alt-' : '',
-			e.shiftKey ? 'shift-' : '',
-			e.keyCode
-		].join('');
-	};
-
-	const TOGGLE_DEV_TOOLS_KB = (process.platform === 'darwin' ? 'meta-alt-73' : 'ctrl-shift-73'); // mac: Cmd-Alt-I, rest: Ctrl-Shift-I
-	const RELOAD_KB = (process.platform === 'darwin' ? 'meta-82' : 'ctrl-82'); // mac: Cmd-R, rest: Ctrl-R
-
-	window.addEventListener('keydown', function (e) {
-		const key = extractKey(e);
-		if (key === TOGGLE_DEV_TOOLS_KB) {
-			remote.getCurrentWebContents().toggleDevTools();
-		} else if (key === RELOAD_KB) {
-			remote.getCurrentWindow().reload();
-		}
-	});
-
-	// Load the loader and start loading the workbench
-	const rootUrl = uriFromPath(configuration.appRoot) + '/out';
-
-	// Get the nls configuration into the process.env as early as possible.
-	var nlsConfig = { availableLanguages: {} };
-	const config = process.env['VSCODE_NLS_CONFIG'];
-	if (config) {
-		process.env['VSCODE_NLS_CONFIG'] = config;
-		try {
-			nlsConfig = JSON.parse(config);
-		} catch (e) { /*noop*/ }
-	}
-
-	if (nlsConfig._resolvedLanguagePackCoreLocation) {
-		let bundles = Object.create(null);
-		nlsConfig.loadBundle = function(bundle, language, cb) {
-			let result = bundles[bundle];
-			if (result) {
-				cb(undefined, result);
-				return;
-			}
-			let bundleFile = path.join(nlsConfig._resolvedLanguagePackCoreLocation, bundle.replace(/\//g, '!') + '.nls.json');
-			readFile(bundleFile).then(function (content) {
-				let json = JSON.parse(content);
-				bundles[bundle] = json;
-				cb(undefined, json);
-			})
-			.catch(cb);
-		};
-	}
-
-	var locale = nlsConfig.availableLanguages['*'] || 'en';
-	if (locale === 'zh-tw') {
-		locale = 'zh-Hant';
-	} else if (locale === 'zh-cn') {
-		locale = 'zh-Hans';
-	}
-
-	window.document.documentElement.setAttribute('lang', locale);
-
-	// Load the loader
-	const loaderFilename = configuration.appRoot + '/out/vs/loader.js';
-	const loaderSource = fs.readFileSync(loaderFilename);
-	require('vm').runInThisContext(loaderSource, { filename: loaderFilename });
-	var define = global.define;
-	global.define = undefined;
-
-	window.nodeRequire = require.__$__nodeRequire;
-
-	define('fs', ['original-fs'], function (originalFS) { return originalFS; }); // replace the patched electron fs with the original node fs for all AMD code
-
-	window.MonacoEnvironment = {};
-
-	require.config({
-		baseUrl: rootUrl,
-		'vs/nls': nlsConfig,
-		nodeCachedDataDir: configuration.nodeCachedDataDir,
-		nodeModules: [/*BUILD->INSERT_NODE_MODULES*/]
-	});
-
-	if (nlsConfig.pseudo) {
-		require(['vs/nls'], function (nlsPlugin) {
-			nlsPlugin.setPseudoTranslation(nlsConfig.pseudo);
-		});
-	}
-
-	require(['vs/code/electron-browser/issue/issueReporterMain'], (issueReporter) => {
-		issueReporter.startup(configuration);
-	});
-}
-
-main();
+bootstrapWindow.load(['vs/code/electron-browser/issue/issueReporterMain'], function (issueReporter, configuration) {
+	issueReporter.startup(configuration);
+}, { forceEnableDeveloperKeybindings: true });
\ No newline at end of file
diff --git a/src/vs/code/electron-browser/issue/issueReporterMain.ts b/src/vs/code/electron-browser/issue/issueReporterMain.ts
index 65980535322..cd5c7bb1251 100644
--- a/src/vs/code/electron-browser/issue/issueReporterMain.ts
+++ b/src/vs/code/electron-browser/issue/issueReporterMain.ts
@@ -6,7 +6,7 @@
 'use strict';
 
 import 'vs/css!./media/issueReporter';
-import { shell, ipcRenderer, webFrame, remote, clipboard } from 'electron';
+import { shell, ipcRenderer, webFrame, clipboard } from 'electron';
 import { localize } from 'vs/nls';
 import { $ } from 'vs/base/browser/dom';
 import * as collections from 'vs/base/common/collections';
@@ -19,25 +19,25 @@ import { debounce } from 'vs/base/common/decorators';
 import * as platform from 'vs/base/common/platform';
 import { Disposable } from 'vs/base/common/lifecycle';
 import { Client as ElectronIPCClient } from 'vs/base/parts/ipc/electron-browser/ipc.electron-browser';
-import { getDelayedChannel } from 'vs/base/parts/ipc/common/ipc';
+import { getDelayedChannel } from 'vs/base/parts/ipc/node/ipc';
 import { connect as connectNet } from 'vs/base/parts/ipc/node/ipc.net';
 import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
 import { IWindowConfiguration, IWindowsService } from 'vs/platform/windows/common/windows';
-import { NullTelemetryService } from 'vs/platform/telemetry/common/telemetryUtils';
+import { NullTelemetryService, combinedAppender, LogAppender } from 'vs/platform/telemetry/common/telemetryUtils';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { ITelemetryServiceConfig, TelemetryService } from 'vs/platform/telemetry/common/telemetryService';
-import { ITelemetryAppenderChannel, TelemetryAppenderClient } from 'vs/platform/telemetry/common/telemetryIpc';
+import { ITelemetryAppenderChannel, TelemetryAppenderClient } from 'vs/platform/telemetry/node/telemetryIpc';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { InstantiationService } from 'vs/platform/instantiation/common/instantiationService';
 import { resolveCommonProperties } from 'vs/platform/telemetry/node/commonProperties';
-import { WindowsChannelClient } from 'vs/platform/windows/common/windowsIpc';
+import { WindowsChannelClient } from 'vs/platform/windows/node/windowsIpc';
 import { EnvironmentService } from 'vs/platform/environment/node/environmentService';
 import { IssueReporterModel } from 'vs/code/electron-browser/issue/issueReporterModel';
 import { IssueReporterData, IssueReporterStyles, IssueType, ISettingsSearchIssueReporterData, IssueReporterFeatures } from 'vs/platform/issue/common/issue';
 import BaseHtml from 'vs/code/electron-browser/issue/issueReporterPage';
 import { ILocalExtension } from 'vs/platform/extensionManagement/common/extensionManagement';
 import { createSpdLogService } from 'vs/platform/log/node/spdlogService';
-import { LogLevelSetterChannelClient, FollowerLogService } from 'vs/platform/log/common/logIpc';
+import { LogLevelSetterChannelClient, FollowerLogService } from 'vs/platform/log/node/logIpc';
 import { ILogService, getLogLevel } from 'vs/platform/log/common/log';
 import { OcticonLabel } from 'vs/base/browser/ui/octiconLabel/octiconLabel';
 import { normalizeGitHubUrl } from 'vs/code/electron-browser/issue/issueReporterUtil';
@@ -86,12 +86,12 @@ export class IssueReporter extends Disposable {
 				vscodeVersion: `${pkg.name} ${pkg.version} (${product.commit || 'Commit unknown'}, ${product.date || 'Date unknown'})`,
 				os: `${os.type()} ${os.arch()} ${os.release()}`
 			},
-			extensionsDisabled: this.environmentService.disableExtensions,
+			extensionsDisabled: !!this.environmentService.disableExtensions,
 		});
 
 		this.previewButton = new Button(document.getElementById('issue-reporter'));
 
-		ipcRenderer.on('issuePerformanceInfoResponse', (event, info) => {
+		ipcRenderer.on('vscode:issuePerformanceInfoResponse', (event, info) => {
 			this.logService.trace('issueReporter: Received performance data');
 			this.issueReporterModel.update(info);
 			this.receivedPerformanceInfo = true;
@@ -102,7 +102,7 @@ export class IssueReporter extends Disposable {
 			this.updatePreviewButtonState();
 		});
 
-		ipcRenderer.on('issueSystemInfoResponse', (event, info) => {
+		ipcRenderer.on('vscode:issueSystemInfoResponse', (event, info) => {
 			this.logService.trace('issueReporter: Received system data');
 			this.issueReporterModel.update({ systemInfo: info });
 			this.receivedSystemInfo = true;
@@ -111,9 +111,9 @@ export class IssueReporter extends Disposable {
 			this.updatePreviewButtonState();
 		});
 
-		ipcRenderer.send('issueSystemInfoRequest');
+		ipcRenderer.send('vscode:issueSystemInfoRequest');
 		if (configuration.data.issueType === IssueType.PerformanceIssue) {
-			ipcRenderer.send('issuePerformanceInfoRequest');
+			ipcRenderer.send('vscode:issuePerformanceInfoRequest');
 		}
 		this.logService.trace('issueReporter: Sent data requests');
 
@@ -287,9 +287,9 @@ export class IssueReporter extends Disposable {
 			.then(() => connectNet(this.environmentService.sharedIPCHandle, `window:${configuration.windowId}`));
 
 		const instantiationService = new InstantiationService(serviceCollection, true);
-		if (this.environmentService.isBuilt && !this.environmentService.isExtensionDevelopment && !this.environmentService.args['disable-telemetry'] && !!product.enableTelemetry) {
+		if (!this.environmentService.isExtensionDevelopment && !this.environmentService.args['disable-telemetry'] && !!product.enableTelemetry) {
 			const channel = getDelayedChannel<ITelemetryAppenderChannel>(sharedProcess.then(c => c.getChannel('telemetryAppender')));
-			const appender = new TelemetryAppenderClient(channel);
+			const appender = combinedAppender(new TelemetryAppenderClient(channel), new LogAppender(logService));
 			const commonProperties = resolveCommonProperties(product.commit, pkg.version, configuration.machineId, this.environmentService.installSourcePath);
 			const piiPaths = [this.environmentService.appRoot, this.environmentService.extensionsPath];
 			const config: ITelemetryServiceConfig = { appender, commonProperties, piiPaths };
@@ -308,7 +308,7 @@ export class IssueReporter extends Disposable {
 			const issueType = parseInt((<HTMLInputElement>event.target).value);
 			this.issueReporterModel.update({ issueType: issueType });
 			if (issueType === IssueType.PerformanceIssue && !this.receivedPerformanceInfo) {
-				ipcRenderer.send('issuePerformanceInfoRequest');
+				ipcRenderer.send('vscode:issuePerformanceInfoRequest');
 			}
 			this.updatePreviewButtonState();
 			this.render();
@@ -384,14 +384,14 @@ export class IssueReporter extends Disposable {
 		this.previewButton.onDidClick(() => this.createIssue());
 
 		this.addEventListener('disableExtensions', 'click', () => {
-			ipcRenderer.send('workbenchCommand', 'workbench.action.reloadWindowWithExtensionsDisabled');
+			ipcRenderer.send('vscode:workbenchCommand', 'workbench.action.reloadWindowWithExtensionsDisabled');
 		});
 
 		this.addEventListener('disableExtensions', 'keydown', (e: KeyboardEvent) => {
 			e.stopPropagation();
 			if (e.keyCode === 13 || e.keyCode === 32) {
-				ipcRenderer.send('workbenchCommand', 'workbench.extensions.action.disableAll');
-				ipcRenderer.send('workbenchCommand', 'workbench.action.reloadWindow');
+				ipcRenderer.send('vscode:workbenchCommand', 'workbench.extensions.action.disableAll');
+				ipcRenderer.send('vscode:workbenchCommand', 'workbench.action.reloadWindow');
 			}
 		});
 
@@ -400,7 +400,7 @@ export class IssueReporter extends Disposable {
 			// Cmd/Ctrl+Enter previews issue and closes window
 			if (cmdOrCtrlKey && e.keyCode === 13) {
 				if (this.createIssue()) {
-					remote.getCurrentWindow().close();
+					ipcRenderer.send('vscode:closeIssueReporter');
 				}
 			}
 
@@ -413,6 +413,16 @@ export class IssueReporter extends Disposable {
 			if (cmdOrCtrlKey && e.keyCode === 189) {
 				this.applyZoom(webFrame.getZoomLevel() - 1);
 			}
+
+			// With latest electron upgrade, cmd+a is no longer propagating correctly for inputs in this window on mac
+			// Manually perform the selection
+			if (platform.isMacintosh) {
+				if (cmdOrCtrlKey && e.keyCode === 65 && e.target) {
+					if (e.target instanceof HTMLInputElement || e.target instanceof HTMLTextAreaElement) {
+						(<HTMLInputElement>e.target).select();
+					}
+				}
+			}
 		};
 	}
 
diff --git a/src/vs/code/electron-browser/processExplorer/processExplorer.js b/src/vs/code/electron-browser/processExplorer/processExplorer.js
index 1fdb4bb8296..d05816f9915 100644
--- a/src/vs/code/electron-browser/processExplorer/processExplorer.js
+++ b/src/vs/code/electron-browser/processExplorer/processExplorer.js
@@ -3,173 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+//@ts-check
 'use strict';
 
-const path = require('path');
-const fs = require('fs');
-const remote = require('electron').remote;
+const bootstrapWindow = require('../../../../bootstrap-window');
 
-function assign(destination, source) {
-	return Object.keys(source)
-		.reduce(function (r, key) { r[key] = source[key]; return r; }, destination);
-}
-
-function parseURLQueryArgs() {
-	const search = window.location.search || '';
-
-	return search.split(/[?&]/)
-		.filter(function (param) { return !!param; })
-		.map(function (param) { return param.split('='); })
-		.filter(function (param) { return param.length === 2; })
-		.reduce(function (r, param) { r[param[0]] = decodeURIComponent(param[1]); return r; }, {});
-}
-
-function uriFromPath(_path) {
-	var pathName = path.resolve(_path).replace(/\\/g, '/');
-	if (pathName.length > 0 && pathName.charAt(0) !== '/') {
-		pathName = '/' + pathName;
-	}
-
-	return encodeURI('file://' + pathName);
-}
-
-function readFile(file) {
-	return new Promise(function(resolve, reject) {
-		fs.readFile(file, 'utf8', function(err, data) {
-			if (err) {
-				reject(err);
-				return;
-			}
-			resolve(data);
-		});
-	});
-}
-
-function main() {
-	const args = parseURLQueryArgs();
-	const configuration = JSON.parse(args['config'] || '{}') || {};
-
-	assign(process.env, configuration.userEnv);
-
-	//#region Add support for using node_modules.asar
-	(function () {
-		const path = require('path');
-		const Module = require('module');
-		let NODE_MODULES_PATH = path.join(configuration.appRoot, 'node_modules');
-		if (/[a-z]\:/.test(NODE_MODULES_PATH)) {
-			// Make drive letter uppercase
-			NODE_MODULES_PATH = NODE_MODULES_PATH.charAt(0).toUpperCase() + NODE_MODULES_PATH.substr(1);
-		}
-		const NODE_MODULES_ASAR_PATH = NODE_MODULES_PATH + '.asar';
-
-		const originalResolveLookupPaths = Module._resolveLookupPaths;
-		Module._resolveLookupPaths = function (request, parent, newReturn) {
-			const result = originalResolveLookupPaths(request, parent, newReturn);
-
-			const paths = newReturn ? result : result[1];
-			for (let i = 0, len = paths.length; i < len; i++) {
-				if (paths[i] === NODE_MODULES_PATH) {
-					paths.splice(i, 0, NODE_MODULES_ASAR_PATH);
-					break;
-				}
-			}
-
-			return result;
-		};
-	})();
-	//#endregion
-
-	// Get the nls configuration into the process.env as early as possible.
-	var nlsConfig = { availableLanguages: {} };
-	const config = process.env['VSCODE_NLS_CONFIG'];
-	if (config) {
-		process.env['VSCODE_NLS_CONFIG'] = config;
-		try {
-			nlsConfig = JSON.parse(config);
-		} catch (e) { /*noop*/ }
-	}
-
-	if (nlsConfig._resolvedLanguagePackCoreLocation) {
-		let bundles = Object.create(null);
-		nlsConfig.loadBundle = function(bundle, language, cb) {
-			let result = bundles[bundle];
-			if (result) {
-				cb(undefined, result);
-				return;
-			}
-			let bundleFile = path.join(nlsConfig._resolvedLanguagePackCoreLocation, bundle.replace(/\//g, '!') + '.nls.json');
-			readFile(bundleFile).then(function (content) {
-				let json = JSON.parse(content);
-				bundles[bundle] = json;
-				cb(undefined, json);
-			})
-			.catch(cb);
-		};
-	}
-
-	var locale = nlsConfig.availableLanguages['*'] || 'en';
-	if (locale === 'zh-tw') {
-		locale = 'zh-Hant';
-	} else if (locale === 'zh-cn') {
-		locale = 'zh-Hans';
-	}
-
-	window.document.documentElement.setAttribute('lang', locale);
-
-	const extractKey = function (e) {
-		return [
-			e.ctrlKey ? 'ctrl-' : '',
-			e.metaKey ? 'meta-' : '',
-			e.altKey ? 'alt-' : '',
-			e.shiftKey ? 'shift-' : '',
-			e.keyCode
-		].join('');
-	};
-
-	const TOGGLE_DEV_TOOLS_KB = (process.platform === 'darwin' ? 'meta-alt-73' : 'ctrl-shift-73'); // mac: Cmd-Alt-I, rest: Ctrl-Shift-I
-	const RELOAD_KB = (process.platform === 'darwin' ? 'meta-82' : 'ctrl-82'); // mac: Cmd-R, rest: Ctrl-R
-
-	window.addEventListener('keydown', function (e) {
-		const key = extractKey(e);
-		if (key === TOGGLE_DEV_TOOLS_KB) {
-			remote.getCurrentWebContents().toggleDevTools();
-		} else if (key === RELOAD_KB) {
-			remote.getCurrentWindow().reload();
-		}
-	});
-
-	// Load the loader
-	const loaderFilename = configuration.appRoot + '/out/vs/loader.js';
-	const loaderSource = fs.readFileSync(loaderFilename);
-	require('vm').runInThisContext(loaderSource, { filename: loaderFilename });
-	var define = global.define;
-	global.define = undefined;
-
-	window.nodeRequire = require.__$__nodeRequire;
-
-	define('fs', ['original-fs'], function (originalFS) { return originalFS; }); // replace the patched electron fs with the original node fs for all AMD code
-
-	window.MonacoEnvironment = {};
-	const rootUrl = uriFromPath(configuration.appRoot) + '/out';
-
-	require.config({
-		baseUrl: rootUrl,
-		'vs/nls': nlsConfig,
-		nodeCachedDataDir: configuration.nodeCachedDataDir,
-		nodeModules: [/*BUILD->INSERT_NODE_MODULES*/]
-	});
-
-	if (nlsConfig.pseudo) {
-		require(['vs/nls'], function (nlsPlugin) {
-			nlsPlugin.setPseudoTranslation(nlsConfig.pseudo);
-		});
-	}
-
-	require([
-		'vs/code/electron-browser/processExplorer/processExplorerMain'
-	], function (processExplorer) {
-		processExplorer.startup(configuration.data);
-	});
-}
-
-main();
+bootstrapWindow.load(['vs/code/electron-browser/processExplorer/processExplorerMain'], function (processExplorer, configuration) {
+	processExplorer.startup(configuration.data);
+}, { forceEnableDeveloperKeybindings: true });
\ No newline at end of file
diff --git a/src/vs/code/electron-browser/processExplorer/processExplorerMain.ts b/src/vs/code/electron-browser/processExplorer/processExplorerMain.ts
index 9c491c0dd95..645bf682472 100644
--- a/src/vs/code/electron-browser/processExplorer/processExplorerMain.ts
+++ b/src/vs/code/electron-browser/processExplorer/processExplorerMain.ts
@@ -7,7 +7,7 @@
 
 import 'vs/css!./media/processExplorer';
 import { listProcesses, ProcessItem } from 'vs/base/node/ps';
-import { remote, webFrame, ipcRenderer, clipboard } from 'electron';
+import { webFrame, ipcRenderer, clipboard } from 'electron';
 import { repeat } from 'vs/base/common/strings';
 import { totalmem } from 'os';
 import product from 'vs/platform/node/product';
@@ -15,6 +15,8 @@ import { localize } from 'vs/nls';
 import { ProcessExplorerStyles, ProcessExplorerData } from 'vs/platform/issue/common/issue';
 import * as browser from 'vs/base/browser/browser';
 import * as platform from 'vs/base/common/platform';
+import { IContextMenuItem } from 'vs/base/parts/contextmenu/common/contextmenu';
+import { popup } from 'vs/base/parts/contextmenu/electron-browser/contextmenu';
 
 let processList: any[];
 let mapPidToWindowTitle = new Map<number, string>();
@@ -137,29 +139,29 @@ function applyZoom(zoomLevel: number): void {
 function showContextMenu(e) {
 	e.preventDefault();
 
-	const menu = new remote.Menu();
+	const items: IContextMenuItem[] = [];
 
 	const pid = parseInt(e.currentTarget.id);
 	if (pid && typeof pid === 'number') {
-		menu.append(new remote.MenuItem({
+		items.push({
 			label: localize('killProcess', "Kill Process"),
 			click() {
 				process.kill(pid, 'SIGTERM');
 			}
-		}));
+		});
 
-		menu.append(new remote.MenuItem({
+		items.push({
 			label: localize('forceKillProcess', "Force Kill Process"),
 			click() {
 				process.kill(pid, 'SIGKILL');
 			}
-		}));
+		});
 
-		menu.append(new remote.MenuItem({
+		items.push({
 			type: 'separator'
-		}));
+		});
 
-		menu.append(new remote.MenuItem({
+		items.push({
 			label: localize('copy', "Copy"),
 			click() {
 				const row = document.getElementById(pid.toString());
@@ -167,9 +169,9 @@ function showContextMenu(e) {
 					clipboard.writeText(row.innerText);
 				}
 			}
-		}));
+		});
 
-		menu.append(new remote.MenuItem({
+		items.push({
 			label: localize('copyAll', "Copy All"),
 			click() {
 				const processList = document.getElementById('process-list');
@@ -177,9 +179,9 @@ function showContextMenu(e) {
 					clipboard.writeText(processList.innerText);
 				}
 			}
-		}));
+		});
 	} else {
-		menu.append(new remote.MenuItem({
+		items.push({
 			label: localize('copyAll', "Copy All"),
 			click() {
 				const processList = document.getElementById('process-list');
@@ -187,10 +189,10 @@ function showContextMenu(e) {
 					clipboard.writeText(processList.innerText);
 				}
 			}
-		}));
+		});
 	}
 
-	menu.popup(remote.getCurrentWindow());
+	popup(items);
 }
 
 export function startup(data: ProcessExplorerData): void {
@@ -198,7 +200,7 @@ export function startup(data: ProcessExplorerData): void {
 	applyZoom(data.zoomLevel);
 
 	// Map window process pids to titles, annotate process names with this when rendering to distinguish between them
-	ipcRenderer.on('windowsInfoResponse', (event, windows) => {
+	ipcRenderer.on('vscode:windowsInfoResponse', (event, windows) => {
 		mapPidToWindowTitle = new Map<number, string>();
 		windows.forEach(window => mapPidToWindowTitle.set(window.pid, window.title));
 	});
@@ -206,7 +208,7 @@ export function startup(data: ProcessExplorerData): void {
 	setInterval(() => {
 		ipcRenderer.send('windowsInfoRequest');
 
-		listProcesses(remote.process.pid).then(processes => {
+		listProcesses(data.pid).then(processes => {
 			processList = getProcessList(processes);
 			updateProcessInfo(processList);
 
diff --git a/src/vs/code/electron-browser/proxy/auth.html b/src/vs/code/electron-browser/proxy/auth.html
index e27ec2fc02e..f01e2b70601 100644
--- a/src/vs/code/electron-browser/proxy/auth.html
+++ b/src/vs/code/electron-browser/proxy/auth.html
@@ -79,11 +79,6 @@
 </body>
 
 <script>
-	const electron = require('electron');
-	const shell = electron.shell;
-	const ipc = electron.ipcRenderer;
-	const remote = electron.remote;
-	const currentWindow = remote.getCurrentWindow();
 
 	function promptForCredentials(data) {
 		return new Promise((c, e) => {
diff --git a/src/vs/code/electron-browser/sharedProcess/contrib/nodeCachedDataCleaner.ts b/src/vs/code/electron-browser/sharedProcess/contrib/nodeCachedDataCleaner.ts
index 1b9fb52e8ab..9862698a9c9 100644
--- a/src/vs/code/electron-browser/sharedProcess/contrib/nodeCachedDataCleaner.ts
+++ b/src/vs/code/electron-browser/sharedProcess/contrib/nodeCachedDataCleaner.ts
@@ -4,10 +4,10 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
+import { basename, dirname, join } from 'path';
 import { onUnexpectedError } from 'vs/base/common/errors';
+import { dispose, IDisposable } from 'vs/base/common/lifecycle';
 import { TPromise } from 'vs/base/common/winjs.base';
-import { join, basename, dirname } from 'path';
 import { readdir, rimraf, stat } from 'vs/base/node/pfs';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import product from 'vs/platform/node/product';
@@ -74,7 +74,7 @@ export class NodeCachedDataCleaner {
 
 				return TPromise.join(deletes);
 
-			}).done(undefined, onUnexpectedError);
+			}).then(undefined, onUnexpectedError);
 
 		}, 30 * 1000);
 
diff --git a/src/vs/code/electron-browser/sharedProcess/sharedProcess.js b/src/vs/code/electron-browser/sharedProcess/sharedProcess.js
index 98d6e852940..886bca97a2c 100644
--- a/src/vs/code/electron-browser/sharedProcess/sharedProcess.js
+++ b/src/vs/code/electron-browser/sharedProcess/sharedProcess.js
@@ -3,159 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+//@ts-check
 'use strict';
 
-const path = require('path');
-const fs = require('fs');
+const bootstrapWindow = require('../../../../bootstrap-window');
 
-function assign(destination, source) {
-	return Object.keys(source)
-		.reduce(function (r, key) { r[key] = source[key]; return r; }, destination);
-}
-
-function parseURLQueryArgs() {
-	const search = window.location.search || '';
-
-	return search.split(/[?&]/)
-		.filter(function (param) { return !!param; })
-		.map(function (param) { return param.split('='); })
-		.filter(function (param) { return param.length === 2; })
-		.reduce(function (r, param) { r[param[0]] = decodeURIComponent(param[1]); return r; }, {});
-}
-
-function createScript(src, onload) {
-	const script = document.createElement('script');
-	script.src = src;
-	script.addEventListener('load', onload);
-
-	const head = document.getElementsByTagName('head')[0];
-	head.insertBefore(script, head.lastChild);
-}
-
-function uriFromPath(_path) {
-	var pathName = path.resolve(_path).replace(/\\/g, '/');
-	if (pathName.length > 0 && pathName.charAt(0) !== '/') {
-		pathName = '/' + pathName;
-	}
-
-	return encodeURI('file://' + pathName);
-}
-
-function readFile(file) {
-	return new Promise(function(resolve, reject) {
-		fs.readFile(file, 'utf8', function(err, data) {
-			if (err) {
-				reject(err);
-				return;
-			}
-			resolve(data);
-		});
+bootstrapWindow.load(['vs/code/electron-browser/sharedProcess/sharedProcessMain'], function (sharedProcess, configuration) {
+	sharedProcess.startup({
+		machineId: configuration.machineId
 	});
-}
-
-function main() {
-	const args = parseURLQueryArgs();
-	const configuration = JSON.parse(args['config'] || '{}') || {};
-
-	//#region Add support for using node_modules.asar
-	(function () {
-		const path = require('path');
-		const Module = require('module');
-		let NODE_MODULES_PATH = path.join(configuration.appRoot, 'node_modules');
-		if (/[a-z]\:/.test(NODE_MODULES_PATH)) {
-			// Make drive letter uppercase
-			NODE_MODULES_PATH = NODE_MODULES_PATH.charAt(0).toUpperCase() + NODE_MODULES_PATH.substr(1);
-		}
-		const NODE_MODULES_ASAR_PATH = NODE_MODULES_PATH + '.asar';
-
-		const originalResolveLookupPaths = Module._resolveLookupPaths;
-		Module._resolveLookupPaths = function (request, parent, newReturn) {
-			const result = originalResolveLookupPaths(request, parent, newReturn);
-
-			const paths = newReturn ? result : result[1];
-			for (let i = 0, len = paths.length; i < len; i++) {
-				if (paths[i] === NODE_MODULES_PATH) {
-					paths.splice(i, 0, NODE_MODULES_ASAR_PATH);
-					break;
-				}
-			}
-
-			return result;
-		};
-	})();
-	//#endregion
-
-	// Correctly inherit the parent's environment
-	assign(process.env, configuration.userEnv);
-
-	// Get the nls configuration into the process.env as early as possible.
-	var nlsConfig = { availableLanguages: {} };
-	const config = process.env['VSCODE_NLS_CONFIG'];
-	if (config) {
-		process.env['VSCODE_NLS_CONFIG'] = config;
-		try {
-			nlsConfig = JSON.parse(config);
-		} catch (e) { /*noop*/ }
-	}
-
-	if (nlsConfig._resolvedLanguagePackCoreLocation) {
-		let bundles = Object.create(null);
-		nlsConfig.loadBundle = function(bundle, language, cb) {
-			let result = bundles[bundle];
-			if (result) {
-				cb(undefined, result);
-				return;
-			}
-			let bundleFile = path.join(nlsConfig._resolvedLanguagePackCoreLocation, bundle.replace(/\//g, '!') + '.nls.json');
-			readFile(bundleFile).then(function (content) {
-				let json = JSON.parse(content);
-				bundles[bundle] = json;
-				cb(undefined, json);
-			})
-				.catch(cb);
-		};
-	}
-
-	var locale = nlsConfig.availableLanguages['*'] || 'en';
-	if (locale === 'zh-tw') {
-		locale = 'zh-Hant';
-	} else if (locale === 'zh-cn') {
-		locale = 'zh-Hans';
-	}
-
-	window.document.documentElement.setAttribute('lang', locale);
-
-	// Load the loader and start loading the workbench
-	const rootUrl = uriFromPath(configuration.appRoot) + '/out';
-
-	// In the bundled version the nls plugin is packaged with the loader so the NLS Plugins
-	// loads as soon as the loader loads. To be able to have pseudo translation
-	createScript(rootUrl + '/vs/loader.js', function () {
-		var define = global.define;
-		global.define = undefined;
-		define('fs', ['original-fs'], function (originalFS) { return originalFS; }); // replace the patched electron fs with the original node fs for all AMD code
-
-		window.MonacoEnvironment = {};
-
-		require.config({
-			baseUrl: rootUrl,
-			'vs/nls': nlsConfig,
-			nodeCachedDataDir: configuration.nodeCachedDataDir,
-			nodeModules: [/*BUILD->INSERT_NODE_MODULES*/]
-		});
-
-		if (nlsConfig.pseudo) {
-			require(['vs/nls'], function (nlsPlugin) {
-				nlsPlugin.setPseudoTranslation(nlsConfig.pseudo);
-			});
-		}
-
-		require(['vs/code/electron-browser/sharedProcess/sharedProcessMain'], function (sharedProcess) {
-			sharedProcess.startup({
-				machineId: configuration.machineId
-			});
-		});
-	});
-}
-
-main();
+});
\ No newline at end of file
diff --git a/src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts b/src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts
index 58473214eeb..ff48ec7cb67 100644
--- a/src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts
+++ b/src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts
@@ -16,7 +16,7 @@ import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
 import { InstantiationService } from 'vs/platform/instantiation/common/instantiationService';
 import { IEnvironmentService, ParsedArgs } from 'vs/platform/environment/common/environment';
 import { EnvironmentService } from 'vs/platform/environment/node/environmentService';
-import { ExtensionManagementChannel } from 'vs/platform/extensionManagement/common/extensionManagementIpc';
+import { ExtensionManagementChannel } from 'vs/platform/extensionManagement/node/extensionManagementIpc';
 import { IExtensionManagementService, IExtensionGalleryService } from 'vs/platform/extensionManagement/common/extensionManagement';
 import { ExtensionManagementService } from 'vs/platform/extensionManagement/node/extensionManagementService';
 import { ExtensionGalleryService } from 'vs/platform/extensionManagement/node/extensionGalleryService';
@@ -25,23 +25,27 @@ import { ConfigurationService } from 'vs/platform/configuration/node/configurati
 import { IRequestService } from 'vs/platform/request/node/request';
 import { RequestService } from 'vs/platform/request/electron-browser/requestService';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { combinedAppender, NullTelemetryService } from 'vs/platform/telemetry/common/telemetryUtils';
+import { combinedAppender, NullTelemetryService, ITelemetryAppender, NullAppender, LogAppender } from 'vs/platform/telemetry/common/telemetryUtils';
 import { resolveCommonProperties } from 'vs/platform/telemetry/node/commonProperties';
-import { TelemetryAppenderChannel } from 'vs/platform/telemetry/common/telemetryIpc';
+import { TelemetryAppenderChannel } from 'vs/platform/telemetry/node/telemetryIpc';
 import { TelemetryService, ITelemetryServiceConfig } from 'vs/platform/telemetry/common/telemetryService';
 import { AppInsightsAppender } from 'vs/platform/telemetry/node/appInsightsAppender';
 import { IWindowsService, ActiveWindowManager } from 'vs/platform/windows/common/windows';
-import { WindowsChannelClient } from 'vs/platform/windows/common/windowsIpc';
+import { WindowsChannelClient } from 'vs/platform/windows/node/windowsIpc';
 import { ipcRenderer } from 'electron';
 import { createSharedProcessContributions } from 'vs/code/electron-browser/sharedProcess/contrib/contributions';
 import { createSpdLogService } from 'vs/platform/log/node/spdlogService';
 import { ILogService, LogLevel } from 'vs/platform/log/common/log';
-import { LogLevelSetterChannelClient, FollowerLogService } from 'vs/platform/log/common/logIpc';
+import { LogLevelSetterChannelClient, FollowerLogService } from 'vs/platform/log/node/logIpc';
 import { LocalizationsService } from 'vs/platform/localizations/node/localizations';
 import { ILocalizationsService } from 'vs/platform/localizations/common/localizations';
-import { LocalizationsChannel } from 'vs/platform/localizations/common/localizationsIpc';
-import { DialogChannelClient } from 'vs/platform/dialogs/common/dialogIpc';
+import { LocalizationsChannel } from 'vs/platform/localizations/node/localizationsIpc';
+import { DialogChannelClient } from 'vs/platform/dialogs/node/dialogIpc';
 import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
+import { IDisposable, dispose } from 'vs/base/common/lifecycle';
+import { IDownloadService } from 'vs/platform/download/common/download';
+import { DownloadServiceChannelClient } from 'vs/platform/download/node/downloadIpc';
+import { DefaultURITransformer } from 'vs/base/common/uriIpc';
 
 export interface ISharedProcessConfiguration {
 	readonly machineId: string;
@@ -61,11 +65,14 @@ const eventPrefix = 'monacoworkbench';
 
 function main(server: Server, initData: ISharedProcessInitData, configuration: ISharedProcessConfiguration): void {
 	const services = new ServiceCollection();
+	const disposables: IDisposable[] = [];
+	process.once('exit', () => dispose(disposables));
 
 	const environmentService = new EnvironmentService(initData.args, process.execPath);
-	const logLevelClient = new LogLevelSetterChannelClient(server.getChannel('loglevel', { route: () => 'main' }));
+	const mainRoute = () => TPromise.as('main');
+	const logLevelClient = new LogLevelSetterChannelClient(server.getChannel('loglevel', { routeCall: mainRoute, routeEvent: mainRoute }));
 	const logService = new FollowerLogService(logLevelClient, createSpdLogService('sharedprocess', initData.logLevel, environmentService.logsPath));
-	process.once('exit', () => logService.dispose());
+	disposables.push(logService);
 
 	logService.info('main', JSON.stringify(configuration));
 
@@ -74,42 +81,37 @@ function main(server: Server, initData: ISharedProcessInitData, configuration: I
 	services.set(IConfigurationService, new SyncDescriptor(ConfigurationService));
 	services.set(IRequestService, new SyncDescriptor(RequestService));
 
-	const windowsChannel = server.getChannel('windows', { route: () => 'main' });
+	const windowsChannel = server.getChannel('windows', { routeCall: mainRoute, routeEvent: mainRoute });
 	const windowsService = new WindowsChannelClient(windowsChannel);
 	services.set(IWindowsService, windowsService);
 
 	const activeWindowManager = new ActiveWindowManager(windowsService);
-	const dialogChannel = server.getChannel('dialog', {
-		route: () => {
-			logService.info('Routing dialog request to the client', activeWindowManager.activeClientId);
-			return activeWindowManager.activeClientId;
-		}
-	});
+	const route = () => activeWindowManager.getActiveClientId();
+
+	const dialogChannel = server.getChannel('dialog', { routeCall: route, routeEvent: route });
 	services.set(IDialogService, new DialogChannelClient(dialogChannel));
 
+	const downloadChannel = server.getChannel('download', { routeCall: route, routeEvent: route });
+	services.set(IDownloadService, new DownloadServiceChannelClient(downloadChannel, DefaultURITransformer));
+
 	const instantiationService = new InstantiationService(services);
 
 	instantiationService.invokeFunction(accessor => {
-		const appenders: AppInsightsAppender[] = [];
-
-		if (product.aiConfig && product.aiConfig.asimovKey) {
-			appenders.push(new AppInsightsAppender(eventPrefix, null, product.aiConfig.asimovKey));
-		}
-
-		// It is important to dispose the AI adapter properly because
-		// only then they flush remaining data.
-		process.once('exit', () => appenders.forEach(a => a.dispose()));
-
-		const appender = combinedAppender(...appenders);
-		server.registerChannel('telemetryAppender', new TelemetryAppenderChannel(appender));
-
 		const services = new ServiceCollection();
 		const environmentService = accessor.get(IEnvironmentService);
-		const { appRoot, extensionsPath, extensionDevelopmentPath, isBuilt, installSourcePath } = environmentService;
+		const { appRoot, extensionsPath, extensionDevelopmentLocationURI, isBuilt, installSourcePath } = environmentService;
+		const telemetryLogService = new FollowerLogService(logLevelClient, createSpdLogService('telemetry', initData.logLevel, environmentService.logsPath));
 
-		if (isBuilt && !extensionDevelopmentPath && !environmentService.args['disable-telemetry'] && product.enableTelemetry) {
+		let appInsightsAppender: ITelemetryAppender = NullAppender;
+		if (product.aiConfig && product.aiConfig.asimovKey && isBuilt) {
+			appInsightsAppender = new AppInsightsAppender(eventPrefix, null, product.aiConfig.asimovKey, telemetryLogService);
+			disposables.push(appInsightsAppender); // Ensure the AI appender is disposed so that it flushes remaining data
+		}
+		server.registerChannel('telemetryAppender', new TelemetryAppenderChannel(appInsightsAppender));
+
+		if (!extensionDevelopmentLocationURI && !environmentService.args['disable-telemetry'] && product.enableTelemetry) {
 			const config: ITelemetryServiceConfig = {
-				appender,
+				appender: combinedAppender(appInsightsAppender, new LogAppender(logService)),
 				commonProperties: resolveCommonProperties(product.commit, pkg.version, configuration.machineId, installSourcePath),
 				piiPaths: [appRoot, extensionsPath]
 			};
@@ -138,15 +140,16 @@ function main(server: Server, initData: ISharedProcessInitData, configuration: I
 			server.registerChannel('localizations', localizationsChannel);
 
 			createSharedProcessContributions(instantiationService2);
+			disposables.push(extensionManagementService as ExtensionManagementService);
 		});
 	});
 }
 
-function setupIPC(hook: string): TPromise<Server> {
-	function setup(retry: boolean): TPromise<Server> {
+function setupIPC(hook: string): Thenable<Server> {
+	function setup(retry: boolean): Thenable<Server> {
 		return serve(hook).then(null, err => {
 			if (!retry || platform.isWindows || err.code !== 'EADDRINUSE') {
-				return TPromise.wrapError(err);
+				return Promise.reject(err);
 			}
 
 			// should retry, not windows and eaddrinuse
@@ -155,7 +158,7 @@ function setupIPC(hook: string): TPromise<Server> {
 				client => {
 					// we could connect to a running instance. this is not good, abort
 					client.dispose();
-					return TPromise.wrapError(new Error('There is an instance already running.'));
+					return Promise.reject(new Error('There is an instance already running.'));
 				},
 				err => {
 					// it happens on Linux and OS X that the pipe is left behind
@@ -164,7 +167,7 @@ function setupIPC(hook: string): TPromise<Server> {
 					try {
 						fs.unlinkSync(hook);
 					} catch (e) {
-						return TPromise.wrapError(new Error('Error deleting the shared ipc hook.'));
+						return Promise.reject(new Error('Error deleting the shared ipc hook.'));
 					}
 
 					return setup(false);
diff --git a/src/vs/code/electron-browser/workbench/workbench.html b/src/vs/code/electron-browser/workbench/workbench.html
new file mode 100644
index 00000000000..f2c83331da7
--- /dev/null
+++ b/src/vs/code/electron-browser/workbench/workbench.html
@@ -0,0 +1,13 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta charset="utf-8" />
+		<meta http-equiv="Content-Security-Policy" content="default-src 'none'; img-src 'self' https: data:; media-src 'none'; child-src 'self'; object-src 'self'; script-src 'self'; style-src 'self' 'unsafe-inline'; connect-src 'self' https:; font-src 'self' https:;">
+	</head>
+	<body class="monaco-shell vs-dark" aria-label="">
+	</body>
+
+	<!-- Startup via workbench.js -->
+	<script src="workbench.js"></script>
+</html>
\ No newline at end of file
diff --git a/src/vs/code/electron-browser/workbench/workbench.js b/src/vs/code/electron-browser/workbench/workbench.js
new file mode 100644
index 00000000000..daf601e7425
--- /dev/null
+++ b/src/vs/code/electron-browser/workbench/workbench.js
@@ -0,0 +1,137 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+//@ts-check
+'use strict';
+
+const perf = require('../../../base/common/performance');
+perf.mark('renderer/started');
+
+const bootstrapWindow = require('../../../../bootstrap-window');
+
+// Setup shell environment
+process['lazyEnv'] = getLazyEnv();
+
+// Load workbench main
+bootstrapWindow.load([
+	'vs/workbench/workbench.main',
+	'vs/nls!vs/workbench/workbench.main',
+	'vs/css!vs/workbench/workbench.main'
+],
+	function (workbench, configuration) {
+		perf.mark('didLoadWorkbenchMain');
+
+		return process['lazyEnv'].then(function () {
+			perf.mark('main/startup');
+
+			// @ts-ignore
+			return require('vs/workbench/electron-browser/main').startup(configuration);
+		});
+	}, {
+		removeDeveloperKeybindingsAfterLoad: true,
+		canModifyDOM: function (windowConfig) {
+			showPartsSplash(windowConfig);
+		},
+		beforeLoaderConfig: function (windowConfig, loaderConfig) {
+			const onNodeCachedData = window['MonacoEnvironment'].onNodeCachedData = [];
+			loaderConfig.onNodeCachedData = function () {
+				onNodeCachedData.push(arguments);
+			};
+
+			loaderConfig.recordStats = !!windowConfig.performance;
+		},
+		beforeRequire: function () {
+			perf.mark('willLoadWorkbenchMain');
+		}
+	});
+
+/**
+ * @param {object} configuration
+ */
+function showPartsSplash(configuration) {
+	perf.mark('willShowPartsSplash');
+
+	// TODO@Ben remove me after a while
+	perf.mark('willAccessLocalStorage');
+	let storage = window.localStorage;
+	perf.mark('didAccessLocalStorage');
+
+	let data;
+	try {
+		let raw = storage.getItem('storage://global/parts-splash-data');
+		data = JSON.parse(raw);
+	} catch (e) {
+		// ignore
+	}
+
+	// high contrast mode has been turned on, ignore stored colors and layouts
+	if (data && configuration.highContrast && data.baseTheme !== 'hc-black') {
+		data = void 0;
+	}
+
+	const style = document.createElement('style');
+	document.head.appendChild(style);
+
+	if (data) {
+		const { layoutInfo, colorInfo, baseTheme } = data;
+
+		// set the theme base id used by images and some styles
+		document.body.className = `monaco-shell ${baseTheme}`;
+		// stylesheet that defines foreground and background color
+		style.innerHTML = `.monaco-shell { background-color: ${colorInfo.editorBackground}; color: ${colorInfo.foreground}; }`;
+
+		const splash = document.createElement('div');
+		splash.id = data.id;
+
+		// ensure there is enough space
+		layoutInfo.sideBarWidth = Math.min(layoutInfo.sideBarWidth, window.innerWidth - (layoutInfo.activityBarWidth + layoutInfo.editorPartMinWidth));
+
+		if (configuration.folderUri || configuration.workspace) {
+			// folder or workspace -> status bar color, sidebar
+			splash.innerHTML = `
+			<div style="position: absolute; width: 100%; left: 0; top: 0; height: ${layoutInfo.titleBarHeight}px; background-color: ${colorInfo.titleBarBackground}; -webkit-app-region: drag;"></div>
+			<div style="position: absolute; height: calc(100% - ${layoutInfo.titleBarHeight}px); top: ${layoutInfo.titleBarHeight}px; ${layoutInfo.sideBarSide}: 0; width: ${layoutInfo.activityBarWidth}px; background-color: ${colorInfo.activityBarBackground};"></div>
+			<div style="position: absolute; height: calc(100% - ${layoutInfo.titleBarHeight}px); top: ${layoutInfo.titleBarHeight}px; ${layoutInfo.sideBarSide}: ${layoutInfo.activityBarWidth}px; width: ${layoutInfo.sideBarWidth}px; background-color: ${colorInfo.sideBarBackground};"></div>
+			<div style="position: absolute; width: 100%; bottom: 0; left: 0; height: ${layoutInfo.statusBarHeight}px; background-color: ${colorInfo.statusBarBackground};"></div>
+			`;
+		} else {
+			// empty -> speical status bar color, no sidebar
+			splash.innerHTML = `
+			<div style="position: absolute; width: 100%; left: 0; top: 0; height: ${layoutInfo.titleBarHeight}px; background-color: ${colorInfo.titleBarBackground}; -webkit-app-region: drag;"></div>
+			<div style="position: absolute; height: calc(100% - ${layoutInfo.titleBarHeight}px); top: ${layoutInfo.titleBarHeight}px; ${layoutInfo.sideBarSide}: 0; width: ${layoutInfo.activityBarWidth}px; background-color: ${colorInfo.activityBarBackground};"></div>
+			<div style="position: absolute; width: 100%; bottom: 0; left: 0; height: ${layoutInfo.statusBarHeight}px; background-color: ${colorInfo.statusBarNoFolderBackground};"></div>
+			`;
+		}
+		document.body.appendChild(splash);
+	} else {
+		document.body.className = `monaco-shell ${configuration.highContrast ? 'hc-black' : 'vs-dark'}`;
+		style.innerHTML = `.monaco-shell { background-color: ${configuration.highContrast ? '#000000' : '#1E1E1E'}; color: ${configuration.highContrast ? '#FFFFFF' : '#CCCCCC'}; }`;
+	}
+
+	perf.mark('didShowPartsSplash');
+}
+
+/**
+ * @returns {Promise<void>}
+ */
+function getLazyEnv() {
+	// @ts-ignore
+	const ipc = require('electron').ipcRenderer;
+
+	return new Promise(function (resolve) {
+		const handle = setTimeout(function () {
+			resolve();
+			console.warn('renderer did not receive lazyEnv in time');
+		}, 10000);
+
+		ipc.once('vscode:acceptShellEnv', function (event, shellEnv) {
+			clearTimeout(handle);
+			bootstrapWindow.assign(process.env, shellEnv);
+			resolve(process.env);
+		});
+
+		ipc.send('vscode:fetchShellEnv');
+	});
+}
\ No newline at end of file
diff --git a/src/vs/code/electron-main/app.ts b/src/vs/code/electron-main/app.ts
index ea93934523a..7c8dc75333e 100644
--- a/src/vs/code/electron-main/app.ts
+++ b/src/vs/code/electron-main/app.ts
@@ -5,22 +5,21 @@
 
 'use strict';
 
-import { app, ipcMain as ipc } from 'electron';
+import { app, ipcMain as ipc, systemPreferences, shell, Event } from 'electron';
 import * as platform from 'vs/base/common/platform';
 import { WindowsManager } from 'vs/code/electron-main/windows';
 import { IWindowsService, OpenContext, ActiveWindowManager } from 'vs/platform/windows/common/windows';
-import { WindowsChannel } from 'vs/platform/windows/common/windowsIpc';
+import { WindowsChannel } from 'vs/platform/windows/node/windowsIpc';
 import { WindowsService } from 'vs/platform/windows/electron-main/windowsService';
 import { ILifecycleService } from 'vs/platform/lifecycle/electron-main/lifecycleMain';
-import { CodeMenu } from 'vs/code/electron-main/menus';
 import { getShellEnvironment } from 'vs/code/node/shellEnv';
 import { IUpdateService } from 'vs/platform/update/common/update';
-import { UpdateChannel } from 'vs/platform/update/common/updateIpc';
+import { UpdateChannel } from 'vs/platform/update/node/updateIpc';
 import { Server as ElectronIPCServer } from 'vs/base/parts/ipc/electron-main/ipc.electron-main';
 import { Server, connect, Client } from 'vs/base/parts/ipc/node/ipc.net';
 import { SharedProcess } from 'vs/code/electron-main/sharedProcess';
 import { Mutex } from 'windows-mutex';
-import { LaunchService, LaunchChannel, ILaunchService } from './launch';
+import { LaunchService, LaunchChannel, ILaunchService } from 'vs/platform/launch/electron-main/launchService';
 import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
 import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
 import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
@@ -29,38 +28,47 @@ import { IStateService } from 'vs/platform/state/common/state';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IURLService } from 'vs/platform/url/common/url';
-import { URLHandlerChannelClient, URLServiceChannel } from 'vs/platform/url/common/urlIpc';
+import { URLHandlerChannelClient, URLServiceChannel } from 'vs/platform/url/node/urlIpc';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { NullTelemetryService } from 'vs/platform/telemetry/common/telemetryUtils';
-import { ITelemetryAppenderChannel, TelemetryAppenderClient } from 'vs/platform/telemetry/common/telemetryIpc';
+import { NullTelemetryService, combinedAppender, LogAppender } from 'vs/platform/telemetry/common/telemetryUtils';
+import { ITelemetryAppenderChannel, TelemetryAppenderClient } from 'vs/platform/telemetry/node/telemetryIpc';
 import { TelemetryService, ITelemetryServiceConfig } from 'vs/platform/telemetry/common/telemetryService';
 import { resolveCommonProperties } from 'vs/platform/telemetry/node/commonProperties';
-import { getDelayedChannel } from 'vs/base/parts/ipc/common/ipc';
+import { getDelayedChannel } from 'vs/base/parts/ipc/node/ipc';
 import product from 'vs/platform/node/product';
 import pkg from 'vs/platform/node/package';
-import { ProxyAuthHandler } from './auth';
+import { ProxyAuthHandler } from 'vs/code/electron-main/auth';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { ConfigurationService } from 'vs/platform/configuration/node/configurationService';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { IWindowsMainService } from 'vs/platform/windows/electron-main/windows';
 import { IHistoryMainService } from 'vs/platform/history/common/history';
 import { isUndefinedOrNull } from 'vs/base/common/types';
-import { CodeWindow } from 'vs/code/electron-main/window';
 import { KeyboardLayoutMonitor } from 'vs/code/electron-main/keyboard';
-import URI from 'vs/base/common/uri';
-import { WorkspacesChannel } from 'vs/platform/workspaces/common/workspacesIpc';
+import { URI } from 'vs/base/common/uri';
+import { WorkspacesChannel } from 'vs/platform/workspaces/node/workspacesIpc';
 import { IWorkspacesMainService } from 'vs/platform/workspaces/common/workspaces';
 import { getMachineId } from 'vs/base/node/id';
 import { Win32UpdateService } from 'vs/platform/update/electron-main/updateService.win32';
 import { LinuxUpdateService } from 'vs/platform/update/electron-main/updateService.linux';
 import { DarwinUpdateService } from 'vs/platform/update/electron-main/updateService.darwin';
 import { IIssueService } from 'vs/platform/issue/common/issue';
-import { IssueChannel } from 'vs/platform/issue/common/issueIpc';
+import { IssueChannel } from 'vs/platform/issue/node/issueIpc';
 import { IssueService } from 'vs/platform/issue/electron-main/issueService';
-import { LogLevelSetterChannel } from 'vs/platform/log/common/logIpc';
-import { setUnexpectedErrorHandler } from 'vs/base/common/errors';
+import { LogLevelSetterChannel } from 'vs/platform/log/node/logIpc';
+import * as errors from 'vs/base/common/errors';
 import { ElectronURLListener } from 'vs/platform/url/electron-main/electronUrlListener';
 import { serve as serveDriver } from 'vs/platform/driver/electron-main/driver';
+import { IMenubarService } from 'vs/platform/menubar/common/menubar';
+import { MenubarService } from 'vs/platform/menubar/electron-main/menubarService';
+import { MenubarChannel } from 'vs/platform/menubar/node/menubarIpc';
+import { ILabelService, RegisterFormatterEvent } from 'vs/platform/label/common/label';
+import { CodeMenu } from 'vs/code/electron-main/menus';
+import { hasArgs } from 'vs/platform/environment/node/argv';
+import { RunOnceScheduler } from 'vs/base/common/async';
+import { registerContextMenuListener } from 'vs/base/parts/contextmenu/electron-main/contextmenu';
+import { THEME_STORAGE_KEY, THEME_BG_STORAGE_KEY } from 'vs/code/electron-main/theme';
+import { nativeSep } from 'vs/base/common/paths';
 
 export class CodeApplication {
 
@@ -81,9 +89,10 @@ export class CodeApplication {
 		@ILogService private logService: ILogService,
 		@IEnvironmentService private environmentService: IEnvironmentService,
 		@ILifecycleService private lifecycleService: ILifecycleService,
-		@IConfigurationService configurationService: ConfigurationService,
+		@IConfigurationService private configurationService: ConfigurationService,
 		@IStateService private stateService: IStateService,
-		@IHistoryMainService private historyMainService: IHistoryMainService
+		@IHistoryMainService private historyMainService: IHistoryMainService,
+		@ILabelService private labelService: ILabelService
 	) {
 		this.toDispose = [mainIpcServer, configurationService];
 
@@ -93,8 +102,12 @@ export class CodeApplication {
 	private registerListeners(): void {
 
 		// We handle uncaught exceptions here to prevent electron from opening a dialog to the user
-		setUnexpectedErrorHandler(err => this.onUnexpectedError(err));
+		errors.setUnexpectedErrorHandler(err => this.onUnexpectedError(err));
 		process.on('uncaughtException', err => this.onUnexpectedError(err));
+		process.on('unhandledRejection', (reason: any, promise: Promise<any>) => errors.onUnexpectedError(reason));
+
+		// Contextmenu via IPC support
+		registerContextMenuListener();
 
 		app.on('will-quit', () => {
 			this.logService.trace('App#will-quit: disposing resources');
@@ -117,46 +130,49 @@ export class CodeApplication {
 			}
 		});
 
-		const isValidWebviewSource = (source: string): boolean => {
-			if (!source) {
-				return false;
-			}
-			if (source === 'data:text/html;charset=utf-8,%3C%21DOCTYPE%20html%3E%0D%0A%3Chtml%20lang%3D%22en%22%20style%3D%22width%3A%20100%25%3B%20height%3A%20100%25%22%3E%0D%0A%3Chead%3E%0D%0A%09%3Ctitle%3EVirtual%20Document%3C%2Ftitle%3E%0D%0A%3C%2Fhead%3E%0D%0A%3Cbody%20style%3D%22margin%3A%200%3B%20overflow%3A%20hidden%3B%20width%3A%20100%25%3B%20height%3A%20100%25%22%3E%0D%0A%3C%2Fbody%3E%0D%0A%3C%2Fhtml%3E') {
-				return true;
-			}
-			const srcUri: any = URI.parse(source.toLowerCase()).toString();
-			return srcUri.startsWith(URI.file(this.environmentService.appRoot.toLowerCase()).toString());
-		};
-
+		// Security related measures (https://electronjs.org/docs/tutorial/security)
+		// DO NOT CHANGE without consulting the documentation
 		app.on('web-contents-created', (event: any, contents) => {
 			contents.on('will-attach-webview', (event: Electron.Event, webPreferences, params) => {
+
+				// Ensure defaults
 				delete webPreferences.preload;
 				webPreferences.nodeIntegration = false;
 
 				// Verify URLs being loaded
-				if (isValidWebviewSource(params.src) && isValidWebviewSource(webPreferences.preloadURL)) {
+				if (this.isValidWebviewSource(params.src) && this.isValidWebviewSource(webPreferences.preloadURL)) {
 					return;
 				}
 
+				delete webPreferences.preloadUrl;
+
 				// Otherwise prevent loading
 				this.logService.error('webContents#web-contents-created: Prevented webview attach');
+
 				event.preventDefault();
 			});
 
 			contents.on('will-navigate', event => {
 				this.logService.error('webContents#will-navigate: Prevented webcontent navigation');
+
 				event.preventDefault();
 			});
+
+			contents.on('new-window', (event: Event, url: string) => {
+				event.preventDefault(); // prevent code that wants to open links
+
+				shell.openExternal(url);
+			});
 		});
 
-		let macOpenFiles: string[] = [];
+		let macOpenFileURIs: URI[] = [];
 		let runningTimeout: number = null;
 		app.on('open-file', (event: Event, path: string) => {
 			this.logService.trace('App#open-file: ', path);
 			event.preventDefault();
 
 			// Keep in array because more might come!
-			macOpenFiles.push(path);
+			macOpenFileURIs.push(URI.file(path));
 
 			// Clear previous handler if any
 			if (runningTimeout !== null) {
@@ -170,10 +186,10 @@ export class CodeApplication {
 					this.windowsMainService.open({
 						context: OpenContext.DOCK /* can also be opening from finder while app is running */,
 						cli: this.environmentService.args,
-						pathsToOpen: macOpenFiles,
+						urisToOpen: macOpenFileURIs,
 						preferNewWindow: true /* dropping on the dock or opening from finder prefers to open in a new window */
 					});
-					macOpenFiles = [];
+					macOpenFileURIs = [];
 					runningTimeout = null;
 				}
 			}, 100);
@@ -183,15 +199,15 @@ export class CodeApplication {
 			this.windowsMainService.openNewWindow(OpenContext.DESKTOP); //macOS native tab "+" button
 		});
 
-		ipc.on('vscode:exit', (event: any, code: number) => {
+		ipc.on('vscode:exit', (event: Event, code: number) => {
 			this.logService.trace('IPC#vscode:exit', code);
 
 			this.dispose();
 			this.lifecycleService.kill(code);
 		});
 
-		ipc.on('vscode:fetchShellEnv', event => {
-			const webContents = event.sender.webContents;
+		ipc.on('vscode:fetchShellEnv', (event: Event) => {
+			const webContents = event.sender;
 			getShellEnvironment().then(shellEnv => {
 				if (!webContents.isDestroyed()) {
 					webContents.send('vscode:acceptShellEnv', shellEnv);
@@ -205,7 +221,7 @@ export class CodeApplication {
 			});
 		});
 
-		ipc.on('vscode:broadcast', (event: any, windowId: number, broadcast: { channel: string; payload: any; }) => {
+		ipc.on('vscode:broadcast', (event: Event, windowId: number, broadcast: { channel: string; payload: any; }) => {
 			if (this.windowsMainService && broadcast.channel && !isUndefinedOrNull(broadcast.payload)) {
 				this.logService.trace('IPC#vscode:broadcast', broadcast.channel, broadcast.payload);
 
@@ -217,6 +233,22 @@ export class CodeApplication {
 			}
 		});
 
+		ipc.on('vscode:labelRegisterFormatter', (event: any, data: RegisterFormatterEvent) => {
+			this.labelService.registerFormatter(data.scheme, data.formatter);
+		});
+
+		ipc.on('vscode:toggleDevTools', (event: Event) => {
+			event.sender.toggleDevTools();
+		});
+
+		ipc.on('vscode:openDevTools', (event: Event) => {
+			event.sender.openDevTools();
+		});
+
+		ipc.on('vscode:reloadWindow', (event: Event) => {
+			event.sender.reload();
+		});
+
 		// Keyboard layout changes
 		KeyboardLayoutMonitor.INSTANCE.onDidChangeKeyboardLayout(() => {
 			if (this.windowsMainService) {
@@ -225,6 +257,20 @@ export class CodeApplication {
 		});
 	}
 
+	private isValidWebviewSource(source: string): boolean {
+		if (!source) {
+			return false;
+		}
+
+		if (source === 'data:text/html;charset=utf-8,%3C%21DOCTYPE%20html%3E%0D%0A%3Chtml%20lang%3D%22en%22%20style%3D%22width%3A%20100%25%3B%20height%3A%20100%25%22%3E%0D%0A%3Chead%3E%0D%0A%09%3Ctitle%3EVirtual%20Document%3C%2Ftitle%3E%0D%0A%3C%2Fhead%3E%0D%0A%3Cbody%20style%3D%22margin%3A%200%3B%20overflow%3A%20hidden%3B%20width%3A%20100%25%3B%20height%3A%20100%25%22%3E%0D%0A%3C%2Fbody%3E%0D%0A%3C%2Fhtml%3E') {
+			return true;
+		}
+
+		const srcUri: any = URI.parse(source.toLowerCase()).fsPath;
+		const rootUri = URI.file(this.environmentService.appRoot.toLowerCase()).fsPath;
+		return srcUri.startsWith(rootUri + nativeSep);
+	}
+
 	private onUnexpectedError(err: Error): void {
 		if (err) {
 
@@ -252,12 +298,12 @@ export class CodeApplication {
 		if (event === 'vscode:changeColorTheme' && typeof payload === 'string') {
 			let data = JSON.parse(payload);
 
-			this.stateService.setItem(CodeWindow.themeStorageKey, data.id);
-			this.stateService.setItem(CodeWindow.themeBackgroundStorageKey, data.background);
+			this.stateService.setItem(THEME_STORAGE_KEY, data.baseTheme);
+			this.stateService.setItem(THEME_BG_STORAGE_KEY, data.background);
 		}
 	}
 
-	public startup(): TPromise<void> {
+	startup(): TPromise<void> {
 		this.logService.debug('Starting VS Code');
 		this.logService.debug(`from: ${this.environmentService.appRoot}`);
 		this.logService.debug('args:', this.environmentService.args);
@@ -270,6 +316,20 @@ export class CodeApplication {
 			app.setAppUserModelId(product.win32AppUserModelId);
 		}
 
+		// Fix native tabs on macOS 10.13
+		// macOS enables a compatibility patch for any bundle ID beginning with
+		// "com.microsoft.", which breaks native tabs for VS Code when using this
+		// identifier (from the official build).
+		// Explicitly opt out of the patch here before creating any windows.
+		// See: https://github.com/Microsoft/vscode/issues/35361#issuecomment-399794085
+		try {
+			if (platform.isMacintosh && this.configurationService.getValue<boolean>('window.nativeTabs') === true && !systemPreferences.getUserDefault('NSUseImprovedLayoutPass', 'boolean')) {
+				systemPreferences.setUserDefault('NSUseImprovedLayoutPass', 'boolean', true as any);
+			}
+		} catch (error) {
+			this.logService.error(error);
+		}
+
 		// Create Electron IPC Server
 		this.electronIpcServer = new ElectronIPCServer();
 
@@ -279,7 +339,7 @@ export class CodeApplication {
 			this.logService.trace(`Resolved machine identifier: ${machineId}`);
 
 			// Spawn shared process
-			this.sharedProcess = new SharedProcess(this.environmentService, this.lifecycleService, this.logService, machineId, this.userEnv);
+			this.sharedProcess = this.instantiationService.createInstance(SharedProcess, machineId, this.userEnv);
 			this.sharedProcessClient = this.sharedProcess.whenReady().then(() => connect(this.environmentService.sharedIPCHandle, 'main'));
 
 			// Services
@@ -340,11 +400,12 @@ export class CodeApplication {
 		services.set(IWindowsService, new SyncDescriptor(WindowsService, this.sharedProcess));
 		services.set(ILaunchService, new SyncDescriptor(LaunchService));
 		services.set(IIssueService, new SyncDescriptor(IssueService, machineId, this.userEnv));
+		services.set(IMenubarService, new SyncDescriptor(MenubarService));
 
 		// Telemtry
-		if (this.environmentService.isBuilt && !this.environmentService.isExtensionDevelopment && !this.environmentService.args['disable-telemetry'] && !!product.enableTelemetry) {
+		if (!this.environmentService.isExtensionDevelopment && !this.environmentService.args['disable-telemetry'] && !!product.enableTelemetry) {
 			const channel = getDelayedChannel<ITelemetryAppenderChannel>(this.sharedProcessClient.then(c => c.getChannel('telemetryAppender')));
-			const appender = new TelemetryAppenderClient(channel);
+			const appender = combinedAppender(new TelemetryAppenderClient(channel), new LogAppender(this.logService));
 			const commonProperties = resolveCommonProperties(product.commit, pkg.version, machineId, this.environmentService.installSourcePath);
 			const piiPaths = [this.environmentService.appRoot, this.environmentService.extensionsPath];
 			const config: ITelemetryServiceConfig = { appender, commonProperties, piiPaths };
@@ -381,7 +442,11 @@ export class CodeApplication {
 		const windowsService = accessor.get(IWindowsService);
 		const windowsChannel = new WindowsChannel(windowsService);
 		this.electronIpcServer.registerChannel('windows', windowsChannel);
-		this.sharedProcessClient.done(client => client.registerChannel('windows', windowsChannel));
+		this.sharedProcessClient.then(client => client.registerChannel('windows', windowsChannel));
+
+		const menubarService = accessor.get(IMenubarService);
+		const menubarChannel = new MenubarChannel(menubarService);
+		this.electronIpcServer.registerChannel('menubar', menubarChannel);
 
 		const urlService = accessor.get(IURLService);
 		const urlChannel = new URLServiceChannel(urlService);
@@ -390,7 +455,7 @@ export class CodeApplication {
 		// Log level management
 		const logLevelChannel = new LogLevelSetterChannel(accessor.get(ILogService));
 		this.electronIpcServer.registerChannel('loglevel', logLevelChannel);
-		this.sharedProcessClient.done(client => client.registerChannel('loglevel', logLevelChannel));
+		this.sharedProcessClient.then(client => client.registerChannel('loglevel', logLevelChannel));
 
 		// Lifecycle
 		this.lifecycleService.ready();
@@ -402,7 +467,8 @@ export class CodeApplication {
 
 		// Create a URL handler which forwards to the last active window
 		const activeWindowManager = new ActiveWindowManager(windowsService);
-		const urlHandlerChannel = this.electronIpcServer.getChannel('urlHandler', { route: () => activeWindowManager.activeClientId });
+		const route = () => activeWindowManager.getActiveClientId();
+		const urlHandlerChannel = this.electronIpcServer.getChannel('urlHandler', { routeCall: route, routeEvent: route });
 		const multiplexURLHandler = new URLHandlerChannelClient(urlHandlerChannel);
 
 		// On Mac, Code can be running without any open windows, so we must create a window to handle urls,
@@ -411,7 +477,7 @@ export class CodeApplication {
 			const environmentService = accessor.get(IEnvironmentService);
 
 			urlService.registerHandler({
-				async handleURL(uri: URI): TPromise<boolean> {
+				handleURL(uri: URI): TPromise<boolean> {
 					if (windowsMainService.getWindowCount() === 0) {
 						const cli = { ...environmentService.args, goto: true };
 						const [window] = windowsMainService.open({ context: OpenContext.API, cli, forceEmpty: true });
@@ -419,7 +485,7 @@ export class CodeApplication {
 						return window.ready().then(() => urlService.open(uri));
 					}
 
-					return false;
+					return TPromise.as(false);
 				}
 			});
 		}
@@ -437,17 +503,20 @@ export class CodeApplication {
 		// Open our first window
 		const macOpenFiles = (<any>global).macOpenFiles as string[];
 		const context = !!process.env['VSCODE_CLI'] ? OpenContext.CLI : OpenContext.DESKTOP;
-		if (args['new-window'] && args._.length === 0) {
+		const hasCliArgs = hasArgs(args._);
+		const hasFolderURIs = hasArgs(args['folder-uri']);
+		const hasFileURIs = hasArgs(args['file-uri']);
+
+		if (args['new-window'] && !hasCliArgs && !hasFolderURIs && !hasFileURIs) {
 			this.windowsMainService.open({ context, cli: args, forceNewWindow: true, forceEmpty: true, initialStartup: true }); // new window if "-n" was used without paths
-		} else if (macOpenFiles && macOpenFiles.length && (!args._ || !args._.length)) {
-			this.windowsMainService.open({ context: OpenContext.DOCK, cli: args, pathsToOpen: macOpenFiles, initialStartup: true }); // mac: open-file event received on startup
+		} else if (macOpenFiles && macOpenFiles.length && !hasCliArgs && !hasFolderURIs && !hasFileURIs) {
+			this.windowsMainService.open({ context: OpenContext.DOCK, cli: args, urisToOpen: macOpenFiles.map(file => URI.file(file)), initialStartup: true }); // mac: open-file event received on startup
 		} else {
-			this.windowsMainService.open({ context, cli: args, forceNewWindow: args['new-window'] || (!args._.length && args['unity-launch']), diffMode: args.diff, initialStartup: true }); // default: read paths from cli
+			this.windowsMainService.open({ context, cli: args, forceNewWindow: args['new-window'] || (!hasCliArgs && args['unity-launch']), diffMode: args.diff, initialStartup: true }); // default: read paths from cli
 		}
 	}
 
 	private afterWindowOpen(accessor: ServicesAccessor): void {
-		const appInstantiationService = accessor.get(IInstantiationService);
 		const windowsMainService = accessor.get(IWindowsMainService);
 
 		let windowsMutex: Mutex = null;
@@ -487,15 +556,30 @@ export class CodeApplication {
 			}
 		}
 
+		// TODO@sbatten: Remove when switching back to dynamic menu
 		// Install Menu
-		appInstantiationService.createInstance(CodeMenu);
+		const instantiationService = accessor.get(IInstantiationService);
+		const configurationService = accessor.get(IConfigurationService);
+
+		let createNativeMenu = true;
+		if (platform.isLinux) {
+			createNativeMenu = configurationService.getValue<string>('window.titleBarStyle') !== 'custom';
+		} else if (platform.isWindows) {
+			createNativeMenu = configurationService.getValue<string>('window.titleBarStyle') === 'native';
+		}
+
+		if (createNativeMenu) {
+			instantiationService.createInstance(CodeMenu);
+		}
 
 		// Jump List
 		this.historyMainService.updateWindowsJumpList();
 		this.historyMainService.onRecentlyOpenedChange(() => this.historyMainService.updateWindowsJumpList());
 
-		// Start shared process here
-		this.sharedProcess.spawn();
+		// Start shared process after a while
+		const sharedProcess = new RunOnceScheduler(() => this.sharedProcess.spawn(), 3000);
+		sharedProcess.schedule();
+		this.toDispose.push(sharedProcess);
 	}
 
 	private dispose(): void {
diff --git a/src/vs/code/electron-main/auth.ts b/src/vs/code/electron-main/auth.ts
index 5b2e51b8bba..229c4e77e0d 100644
--- a/src/vs/code/electron-main/auth.ts
+++ b/src/vs/code/electron-main/auth.ts
@@ -14,8 +14,8 @@ import { BrowserWindow, app } from 'electron';
 type LoginEvent = {
 	event: Electron.Event;
 	webContents: Electron.WebContents;
-	req: Electron.LoginRequest;
-	authInfo: Electron.LoginAuthInfo;
+	req: Electron.Request;
+	authInfo: Electron.AuthInfo;
 	cb: (username: string, password: string) => void;
 };
 
diff --git a/src/vs/code/electron-main/diagnostics.ts b/src/vs/code/electron-main/diagnostics.ts
deleted file mode 100644
index 3db04d06bdc..00000000000
--- a/src/vs/code/electron-main/diagnostics.ts
+++ /dev/null
@@ -1,291 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-'use strict';
-
-import { WorkspaceStats, collectWorkspaceStats, collectLaunchConfigs, WorkspaceStatItem } from 'vs/base/node/stats';
-import { IMainProcessInfo } from 'vs/code/electron-main/launch';
-import { ProcessItem, listProcesses } from 'vs/base/node/ps';
-import product from 'vs/platform/node/product';
-import pkg from 'vs/platform/node/package';
-import * as os from 'os';
-import { virtualMachineHint } from 'vs/base/node/id';
-import { repeat, pad } from 'vs/base/common/strings';
-import { isWindows } from 'vs/base/common/platform';
-import { app } from 'electron';
-import { basename } from 'path';
-
-export interface VersionInfo {
-	vscodeVersion: string;
-	os: string;
-}
-
-export interface SystemInfo {
-	CPUs?: string;
-	'Memory (System)': string;
-	'Load (avg)'?: string;
-	VM: string;
-	'Screen Reader': string;
-	'Process Argv': string;
-	'GPU Status': Electron.GPUFeatureStatus;
-}
-
-export interface ProcessInfo {
-	cpu: number;
-	memory: number;
-	pid: number;
-	name: string;
-}
-
-export interface PerformanceInfo {
-	processInfo?: string;
-	workspaceInfo?: string;
-}
-
-export function getPerformanceInfo(info: IMainProcessInfo): Promise<PerformanceInfo> {
-	return listProcesses(info.mainPID).then(rootProcess => {
-		const workspaceInfoMessages = [];
-
-		// Workspace Stats
-		const workspaceStatPromises = [];
-		if (info.windows.some(window => window.folders && window.folders.length > 0)) {
-			info.windows.forEach(window => {
-				if (window.folders.length === 0) {
-					return;
-				}
-
-				workspaceInfoMessages.push(`|  Window (${window.title})`);
-
-				window.folders.forEach(folder => {
-					workspaceStatPromises.push(collectWorkspaceStats(folder, ['node_modules', '.git']).then(async stats => {
-
-						let countMessage = `${stats.fileCount} files`;
-						if (stats.maxFilesReached) {
-							countMessage = `more than ${countMessage}`;
-						}
-						workspaceInfoMessages.push(`|    Folder (${basename(folder)}): ${countMessage}`);
-						workspaceInfoMessages.push(formatWorkspaceStats(stats));
-
-						const launchConfigs = await collectLaunchConfigs(folder);
-						if (launchConfigs.length > 0) {
-							workspaceInfoMessages.push(formatLaunchConfigs(launchConfigs));
-						}
-					}));
-				});
-			});
-		}
-
-		return Promise.all(workspaceStatPromises).then(() => {
-			return {
-				processInfo: formatProcessList(info, rootProcess),
-				workspaceInfo: workspaceInfoMessages.join('\n')
-			};
-		}).catch(error => {
-			return {
-				processInfo: formatProcessList(info, rootProcess),
-				workspaceInfo: `Unable to calculate workspace stats: ${error}`
-			};
-		});
-	});
-}
-
-export function getSystemInfo(info: IMainProcessInfo): SystemInfo {
-	const MB = 1024 * 1024;
-	const GB = 1024 * MB;
-
-	const systemInfo: SystemInfo = {
-		'Memory (System)': `${(os.totalmem() / GB).toFixed(2)}GB (${(os.freemem() / GB).toFixed(2)}GB free)`,
-		VM: `${Math.round((virtualMachineHint.value() * 100))}%`,
-		'Screen Reader': `${app.isAccessibilitySupportEnabled() ? 'yes' : 'no'}`,
-		'Process Argv': `${info.mainArguments.join(' ')}`,
-		'GPU Status': app.getGPUFeatureStatus()
-	};
-
-	const cpus = os.cpus();
-	if (cpus && cpus.length > 0) {
-		systemInfo.CPUs = `${cpus[0].model} (${cpus.length} x ${cpus[0].speed})`;
-	}
-
-	if (!isWindows) {
-		systemInfo['Load (avg)'] = `${os.loadavg().map(l => Math.round(l)).join(', ')}`;
-	}
-
-
-	return systemInfo;
-}
-
-export function printDiagnostics(info: IMainProcessInfo): Promise<any> {
-	return listProcesses(info.mainPID).then(rootProcess => {
-
-		// Environment Info
-		console.log('');
-		console.log(formatEnvironment(info));
-
-		// Process List
-		console.log('');
-		console.log(formatProcessList(info, rootProcess));
-
-		// Workspace Stats
-		const workspaceStatPromises = [];
-		if (info.windows.some(window => window.folders && window.folders.length > 0)) {
-			console.log('');
-			console.log('Workspace Stats: ');
-			info.windows.forEach(window => {
-				if (window.folders.length === 0) {
-					return;
-				}
-
-				console.log(`|  Window (${window.title})`);
-
-				window.folders.forEach(folder => {
-					workspaceStatPromises.push(collectWorkspaceStats(folder, ['node_modules', '.git']).then(async stats => {
-						let countMessage = `${stats.fileCount} files`;
-						if (stats.maxFilesReached) {
-							countMessage = `more than ${countMessage}`;
-						}
-						console.log(`|    Folder (${basename(folder)}): ${countMessage}`);
-						console.log(formatWorkspaceStats(stats));
-
-						await collectLaunchConfigs(folder).then(launchConfigs => {
-							if (launchConfigs.length > 0) {
-								console.log(formatLaunchConfigs(launchConfigs));
-							}
-						});
-					}).catch(error => {
-						console.log(`|      Error: Unable to collect workpsace stats for folder ${folder} (${error.toString()})`);
-					}));
-				});
-			});
-		}
-
-		return Promise.all(workspaceStatPromises).then(() => {
-			console.log('');
-			console.log('');
-		});
-	});
-}
-
-function formatWorkspaceStats(workspaceStats: WorkspaceStats): string {
-	const output: string[] = [];
-	const lineLength = 60;
-	let col = 0;
-
-	const appendAndWrap = (name: string, count: number) => {
-		const item = ` ${name}(${count})`;
-
-		if (col + item.length > lineLength) {
-			output.push(line);
-			line = '|                 ';
-			col = line.length;
-		}
-		else {
-			col += item.length;
-		}
-		line += item;
-	};
-
-	// File Types
-	let line = '|      File types:';
-	const maxShown = 10;
-	let max = workspaceStats.fileTypes.length > maxShown ? maxShown : workspaceStats.fileTypes.length;
-	for (let i = 0; i < max; i++) {
-		const item = workspaceStats.fileTypes[i];
-		appendAndWrap(item.name, item.count);
-	}
-	output.push(line);
-
-	// Conf Files
-	if (workspaceStats.configFiles.length >= 0) {
-		line = '|      Conf files:';
-		col = 0;
-		workspaceStats.configFiles.forEach((item) => {
-			appendAndWrap(item.name, item.count);
-		});
-		output.push(line);
-	}
-
-	return output.join('\n');
-}
-
-function formatLaunchConfigs(configs: WorkspaceStatItem[]): string {
-	const output: string[] = [];
-	let line = '|      Launch Configs:';
-	configs.forEach(each => {
-		const item = each.count > 1 ? ` ${each.name}(${each.count})` : ` ${each.name}`;
-		line += item;
-	});
-	output.push(line);
-	return output.join('\n');
-}
-
-function expandGPUFeatures(): string {
-	const gpuFeatures = app.getGPUFeatureStatus();
-	const longestFeatureName = Math.max(...Object.keys(gpuFeatures).map(feature => feature.length));
-	// Make columns aligned by adding spaces after feature name
-	return Object.keys(gpuFeatures).map(feature => `${feature}:  ${repeat(' ', longestFeatureName - feature.length)}  ${gpuFeatures[feature]}`).join('\n                  ');
-}
-
-export function formatEnvironment(info: IMainProcessInfo): string {
-	const MB = 1024 * 1024;
-	const GB = 1024 * MB;
-
-	const output: string[] = [];
-	output.push(`Version:          ${pkg.name} ${pkg.version} (${product.commit || 'Commit unknown'}, ${product.date || 'Date unknown'})`);
-	output.push(`OS Version:       ${os.type()} ${os.arch()} ${os.release()}`);
-	const cpus = os.cpus();
-	if (cpus && cpus.length > 0) {
-		output.push(`CPUs:             ${cpus[0].model} (${cpus.length} x ${cpus[0].speed})`);
-	}
-	output.push(`Memory (System):  ${(os.totalmem() / GB).toFixed(2)}GB (${(os.freemem() / GB).toFixed(2)}GB free)`);
-	if (!isWindows) {
-		output.push(`Load (avg):       ${os.loadavg().map(l => Math.round(l)).join(', ')}`); // only provided on Linux/macOS
-	}
-	output.push(`VM:               ${Math.round((virtualMachineHint.value() * 100))}%`);
-	output.push(`Screen Reader:    ${app.isAccessibilitySupportEnabled() ? 'yes' : 'no'}`);
-	output.push(`Process Argv:     ${info.mainArguments.join(' ')}`);
-	output.push(`GPU Status:       ${expandGPUFeatures()}`);
-
-	return output.join('\n');
-}
-
-function formatProcessList(info: IMainProcessInfo, rootProcess: ProcessItem): string {
-	const mapPidToWindowTitle = new Map<number, string>();
-	info.windows.forEach(window => mapPidToWindowTitle.set(window.pid, window.title));
-
-	const output: string[] = [];
-
-	output.push('CPU %\tMem MB\t   PID\tProcess');
-
-	if (rootProcess) {
-		formatProcessItem(mapPidToWindowTitle, output, rootProcess, 0);
-	}
-
-	return output.join('\n');
-}
-
-function formatProcessItem(mapPidToWindowTitle: Map<number, string>, output: string[], item: ProcessItem, indent: number): void {
-	const isRoot = (indent === 0);
-
-	const MB = 1024 * 1024;
-
-	// Format name with indent
-	let name: string;
-	if (isRoot) {
-		name = `${product.applicationName} main`;
-	} else {
-		name = `${repeat('  ', indent)} ${item.name}`;
-
-		if (item.name === 'window') {
-			name = `${name} (${mapPidToWindowTitle.get(item.pid)})`;
-		}
-	}
-	const memory = process.platform === 'win32' ? item.mem : (os.totalmem() * (item.mem / 100));
-	output.push(`${pad(Number(item.load.toFixed(0)), 5, ' ')}\t${pad(Number((memory / MB).toFixed(0)), 6, ' ')}\t${pad(Number((item.pid).toFixed(0)), 6, ' ')}\t${name}`);
-
-	// Recurse into children if any
-	if (Array.isArray(item.children)) {
-		item.children.forEach(child => formatProcessItem(mapPidToWindowTitle, output, child, indent + 1));
-	}
-}
diff --git a/src/vs/code/electron-main/launch.ts b/src/vs/code/electron-main/launch.ts
deleted file mode 100644
index 57f56884a01..00000000000
--- a/src/vs/code/electron-main/launch.ts
+++ /dev/null
@@ -1,283 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-'use strict';
-
-import { TPromise } from 'vs/base/common/winjs.base';
-import { IChannel } from 'vs/base/parts/ipc/common/ipc';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IURLService } from 'vs/platform/url/common/url';
-import { IProcessEnvironment, isMacintosh } from 'vs/base/common/platform';
-import { ParsedArgs, IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { OpenContext, IWindowSettings } from 'vs/platform/windows/common/windows';
-import { IWindowsMainService, ICodeWindow } from 'vs/platform/windows/electron-main/windows';
-import { whenDeleted } from 'vs/base/node/pfs';
-import { IWorkspacesMainService } from 'vs/platform/workspaces/common/workspaces';
-import { Schemas } from 'vs/base/common/network';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import URI from 'vs/base/common/uri';
-
-export const ID = 'launchService';
-export const ILaunchService = createDecorator<ILaunchService>(ID);
-
-export interface IStartArguments {
-	args: ParsedArgs;
-	userEnv: IProcessEnvironment;
-}
-
-export interface IWindowInfo {
-	pid: number;
-	title: string;
-	folders: string[];
-}
-
-export interface IMainProcessInfo {
-	mainPID: number;
-	mainArguments: string[];
-	windows: IWindowInfo[];
-}
-
-function parseOpenUrl(args: ParsedArgs): URI[] {
-	if (args['open-url'] && args._urls && args._urls.length > 0) {
-		// --open-url must contain -- followed by the url(s)
-		// process.argv is used over args._ as args._ are resolved to file paths at this point
-		return args._urls
-			.map(url => {
-				try {
-					return URI.parse(url);
-				} catch (err) {
-					return null;
-				}
-			})
-			.filter(uri => !!uri);
-	}
-
-	return [];
-}
-
-export interface ILaunchService {
-	_serviceBrand: any;
-	start(args: ParsedArgs, userEnv: IProcessEnvironment): TPromise<void>;
-	getMainProcessId(): TPromise<number>;
-	getMainProcessInfo(): TPromise<IMainProcessInfo>;
-	getLogsPath(): TPromise<string>;
-}
-
-export interface ILaunchChannel extends IChannel {
-	call(command: 'start', arg: IStartArguments): TPromise<void>;
-	call(command: 'get-main-process-id', arg: null): TPromise<any>;
-	call(command: 'get-main-process-info', arg: null): TPromise<any>;
-	call(command: 'get-logs-path', arg: null): TPromise<string>;
-	call(command: string, arg: any): TPromise<any>;
-}
-
-export class LaunchChannel implements ILaunchChannel {
-
-	constructor(private service: ILaunchService) { }
-
-	public call(command: string, arg: any): TPromise<any> {
-		switch (command) {
-			case 'start':
-				const { args, userEnv } = arg as IStartArguments;
-				return this.service.start(args, userEnv);
-
-			case 'get-main-process-id':
-				return this.service.getMainProcessId();
-
-			case 'get-main-process-info':
-				return this.service.getMainProcessInfo();
-
-			case 'get-logs-path':
-				return this.service.getLogsPath();
-		}
-
-		return undefined;
-	}
-}
-
-export class LaunchChannelClient implements ILaunchService {
-
-	_serviceBrand: any;
-
-	constructor(private channel: ILaunchChannel) { }
-
-	public start(args: ParsedArgs, userEnv: IProcessEnvironment): TPromise<void> {
-		return this.channel.call('start', { args, userEnv });
-	}
-
-	public getMainProcessId(): TPromise<number> {
-		return this.channel.call('get-main-process-id', null);
-	}
-
-	public getMainProcessInfo(): TPromise<IMainProcessInfo> {
-		return this.channel.call('get-main-process-info', null);
-	}
-
-	public getLogsPath(): TPromise<string> {
-		return this.channel.call('get-logs-path', null);
-	}
-}
-
-export class LaunchService implements ILaunchService {
-
-	_serviceBrand: any;
-
-	constructor(
-		@ILogService private logService: ILogService,
-		@IWindowsMainService private windowsMainService: IWindowsMainService,
-		@IURLService private urlService: IURLService,
-		@IWorkspacesMainService private workspacesMainService: IWorkspacesMainService,
-		@IEnvironmentService private readonly environmentService: IEnvironmentService,
-		@IConfigurationService private readonly configurationService: IConfigurationService
-	) { }
-
-	public start(args: ParsedArgs, userEnv: IProcessEnvironment): TPromise<void> {
-		this.logService.trace('Received data from other instance: ', args, userEnv);
-
-		const urlsToOpen = parseOpenUrl(args);
-
-		// Check early for open-url which is handled in URL service
-		if (urlsToOpen.length) {
-			let whenWindowReady = TPromise.as<any>(null);
-
-			// Create a window if there is none
-			if (this.windowsMainService.getWindowCount() === 0) {
-				const window = this.windowsMainService.openNewWindow(OpenContext.DESKTOP)[0];
-				whenWindowReady = window.ready();
-			}
-
-			// Make sure a window is open, ready to receive the url event
-			whenWindowReady.then(() => {
-				for (const url of urlsToOpen) {
-					this.urlService.open(url);
-				}
-			});
-
-			return TPromise.as(null);
-		}
-
-		// Otherwise handle in windows service
-		return this.startOpenWindow(args, userEnv);
-	}
-
-	private startOpenWindow(args: ParsedArgs, userEnv: IProcessEnvironment): TPromise<void> {
-		const context = !!userEnv['VSCODE_CLI'] ? OpenContext.CLI : OpenContext.DESKTOP;
-		let usedWindows: ICodeWindow[];
-
-		// Special case extension development
-		if (!!args.extensionDevelopmentPath) {
-			this.windowsMainService.openExtensionDevelopmentHostWindow({ context, cli: args, userEnv });
-		}
-
-		// Start without file/folder arguments
-		else if (args._.length === 0) {
-			let openNewWindow = false;
-
-			// Force new window
-			if (args['new-window'] || args['unity-launch']) {
-				openNewWindow = true;
-			}
-
-			// Force reuse window
-			else if (args['reuse-window']) {
-				openNewWindow = false;
-			}
-
-			// Otherwise check for settings
-			else {
-				const windowConfig = this.configurationService.getValue<IWindowSettings>('window');
-				const openWithoutArgumentsInNewWindowConfig = (windowConfig && windowConfig.openWithoutArgumentsInNewWindow) || 'default' /* default */;
-				switch (openWithoutArgumentsInNewWindowConfig) {
-					case 'on':
-						openNewWindow = true;
-						break;
-					case 'off':
-						openNewWindow = false;
-						break;
-					default:
-						openNewWindow = !isMacintosh; // prefer to restore running instance on macOS
-				}
-			}
-
-			if (openNewWindow) {
-				usedWindows = this.windowsMainService.open({ context, cli: args, userEnv, forceNewWindow: true, forceEmpty: true });
-			} else {
-				usedWindows = [this.windowsMainService.focusLastActive(args, context)];
-			}
-		}
-
-		// Start with file/folder arguments
-		else {
-			usedWindows = this.windowsMainService.open({
-				context,
-				cli: args,
-				userEnv,
-				forceNewWindow: args['new-window'],
-				preferNewWindow: !args['reuse-window'] && !args.wait,
-				forceReuseWindow: args['reuse-window'],
-				diffMode: args.diff,
-				addMode: args.add
-			});
-		}
-
-		// If the other instance is waiting to be killed, we hook up a window listener if one window
-		// is being used and only then resolve the startup promise which will kill this second instance.
-		// In addition, we poll for the wait marker file to be deleted to return.
-		if (args.wait && usedWindows.length === 1 && usedWindows[0]) {
-			return TPromise.any([
-				this.windowsMainService.waitForWindowCloseOrLoad(usedWindows[0].id),
-				whenDeleted(args.waitMarkerFilePath)
-			]).then(() => void 0, () => void 0);
-		}
-
-		return TPromise.as(null);
-	}
-
-	public getMainProcessId(): TPromise<number> {
-		this.logService.trace('Received request for process ID from other instance.');
-
-		return TPromise.as(process.pid);
-	}
-
-	public getMainProcessInfo(): TPromise<IMainProcessInfo> {
-		this.logService.trace('Received request for main process info from other instance.');
-
-		return TPromise.wrap({
-			mainPID: process.pid,
-			mainArguments: process.argv,
-			windows: this.windowsMainService.getWindows().map(window => {
-				return this.getWindowInfo(window);
-			})
-		} as IMainProcessInfo);
-	}
-
-	public getLogsPath(): TPromise<string> {
-		this.logService.trace('Received request for logs path from other instance.');
-
-		return TPromise.as(this.environmentService.logsPath);
-	}
-
-	private getWindowInfo(window: ICodeWindow): IWindowInfo {
-		const folders: string[] = [];
-
-		if (window.openedFolderPath) {
-			folders.push(window.openedFolderPath);
-		} else if (window.openedWorkspace) {
-			const rootFolders = this.workspacesMainService.resolveWorkspaceSync(window.openedWorkspace.configPath).folders;
-			rootFolders.forEach(root => {
-				if (root.uri.scheme === Schemas.file) { // todo@remote signal remote folders?
-					folders.push(root.uri.fsPath);
-				}
-			});
-		}
-
-		return {
-			pid: window.win.webContents.getOSProcessId(),
-			title: window.win.getTitle(),
-			folders
-		} as IWindowInfo;
-	}
-}
diff --git a/src/vs/code/electron-main/logUploader.ts b/src/vs/code/electron-main/logUploader.ts
index cf76bbbcd1b..38caf8716a4 100644
--- a/src/vs/code/electron-main/logUploader.ts
+++ b/src/vs/code/electron-main/logUploader.ts
@@ -11,12 +11,13 @@ import * as fs from 'fs';
 import * as path from 'path';
 
 import { localize } from 'vs/nls';
-import { ILaunchChannel } from 'vs/code/electron-main/launch';
+import { ILaunchChannel } from 'vs/platform/launch/electron-main/launchService';
 import { TPromise } from 'vs/base/common/winjs.base';
 import product from 'vs/platform/node/product';
 import { IRequestService } from 'vs/platform/request/node/request';
 import { IRequestContext } from 'vs/base/node/request';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
+import { CancellationToken } from 'vs/base/common/cancellation';
 
 interface PostResult {
 	readonly blob_id: string;
@@ -37,7 +38,7 @@ export async function uploadLogs(
 	channel: ILaunchChannel,
 	requestService: IRequestService,
 	environmentService: IEnvironmentService
-): TPromise<any> {
+): Promise<any> {
 	const endpoint = Endpoint.getFromProduct();
 	if (!endpoint) {
 		console.error(localize('invalidEndpoint', 'Invalid log uploader endpoint'));
@@ -75,7 +76,7 @@ async function postLogs(
 	endpoint: Endpoint,
 	outZip: string,
 	requestService: IRequestService
-): TPromise<PostResult> {
+): Promise<PostResult> {
 	const dotter = setInterval(() => console.log('.'), 5000);
 	let result: IRequestContext;
 	try {
@@ -86,7 +87,7 @@ async function postLogs(
 			headers: {
 				'Content-Type': 'application/zip'
 			}
-		});
+		}, CancellationToken.None);
 	} catch (e) {
 		clearInterval(dotter);
 		console.log(localize('postError', 'Error posting logs: {0}', e));
@@ -126,7 +127,7 @@ function zipLogs(
 	return new TPromise<string>((resolve, reject) => {
 		doZip(logsPath, outZip, tempDir, (err, stdout, stderr) => {
 			if (err) {
-				console.error(localize('zipError', 'Error zipping logs: {0}', err));
+				console.error(localize('zipError', 'Error zipping logs: {0}', err.message));
 				reject(err);
 			} else {
 				resolve(outZip);
@@ -152,4 +153,4 @@ function doZip(
 		default:
 			return cp.execFile('zip', ['-r', outZip, '.'], { cwd: logsPath }, callback);
 	}
-}
\ No newline at end of file
+}
diff --git a/src/vs/code/electron-main/main.ts b/src/vs/code/electron-main/main.ts
index 9eb5162971c..46007f71cf3 100644
--- a/src/vs/code/electron-main/main.ts
+++ b/src/vs/code/electron-main/main.ts
@@ -5,7 +5,7 @@
 
 'use strict';
 
-import 'vs/code/electron-main/contributions';
+import 'vs/code/code.main';
 import { app, dialog } from 'electron';
 import { assign } from 'vs/base/common/objects';
 import * as platform from 'vs/base/common/platform';
@@ -17,7 +17,7 @@ import { validatePaths } from 'vs/code/node/paths';
 import { LifecycleService, ILifecycleService } from 'vs/platform/lifecycle/electron-main/lifecycleMain';
 import { Server, serve, connect } from 'vs/base/parts/ipc/node/ipc.net';
 import { TPromise } from 'vs/base/common/winjs.base';
-import { ILaunchChannel, LaunchChannelClient } from 'vs/code/electron-main/launch';
+import { ILaunchChannel, LaunchChannelClient } from 'vs/platform/launch/electron-main/launchService';
 import { ServicesAccessor, IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { InstantiationService } from 'vs/platform/instantiation/common/instantiationService';
 import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
@@ -35,7 +35,7 @@ import { IRequestService } from 'vs/platform/request/node/request';
 import { RequestService } from 'vs/platform/request/electron-main/requestService';
 import { IURLService } from 'vs/platform/url/common/url';
 import { URLService } from 'vs/platform/url/common/urlService';
-import * as fs from 'original-fs';
+import * as fs from 'fs';
 import { CodeApplication } from 'vs/code/electron-main/app';
 import { HistoryMainService } from 'vs/platform/history/electron-main/historyMainService';
 import { IHistoryMainService } from 'vs/platform/history/common/history';
@@ -44,12 +44,13 @@ import { IWorkspacesMainService } from 'vs/platform/workspaces/common/workspaces
 import { localize } from 'vs/nls';
 import { mnemonicButtonLabel } from 'vs/base/common/labels';
 import { createSpdLogService } from 'vs/platform/log/node/spdlogService';
-import { printDiagnostics } from 'vs/code/electron-main/diagnostics';
+import { IDiagnosticsService, DiagnosticsService } from 'vs/platform/diagnostics/electron-main/diagnosticsService';
 import { BufferLogService } from 'vs/platform/log/common/bufferLog';
 import { uploadLogs } from 'vs/code/electron-main/logUploader';
 import { setUnexpectedErrorHandler } from 'vs/base/common/errors';
 import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
 import { CommandLineDialogService } from 'vs/platform/dialogs/node/dialogService';
+import { ILabelService, LabelService } from 'vs/platform/label/common/label';
 
 function createServices(args: ParsedArgs, bufferLogService: BufferLogService): IInstantiationService {
 	const services = new ServiceCollection();
@@ -57,6 +58,7 @@ function createServices(args: ParsedArgs, bufferLogService: BufferLogService): I
 	const environmentService = new EnvironmentService(args, process.execPath);
 	const consoleLogService = new ConsoleLogMainService(getLogLevel(environmentService));
 	const logService = new MultiplexLogService([consoleLogService, bufferLogService]);
+	const labelService = new LabelService(environmentService, undefined);
 
 	process.once('exit', () => logService.dispose());
 
@@ -64,6 +66,7 @@ function createServices(args: ParsedArgs, bufferLogService: BufferLogService): I
 	setTimeout(() => cleanupOlderLogs(environmentService).then(null, err => console.error(err)), 10000);
 
 	services.set(IEnvironmentService, environmentService);
+	services.set(ILabelService, labelService);
 	services.set(ILogService, logService);
 	services.set(IWorkspacesMainService, new SyncDescriptor(WorkspacesMainService));
 	services.set(IHistoryMainService, new SyncDescriptor(HistoryMainService));
@@ -74,6 +77,7 @@ function createServices(args: ParsedArgs, bufferLogService: BufferLogService): I
 	services.set(IURLService, new SyncDescriptor(URLService));
 	services.set(IBackupMainService, new SyncDescriptor(BackupMainService));
 	services.set(IDialogService, new SyncDescriptor(CommandLineDialogService));
+	services.set(IDiagnosticsService, new SyncDescriptor(DiagnosticsService));
 
 	return new InstantiationService(services, true);
 }
@@ -81,7 +85,7 @@ function createServices(args: ParsedArgs, bufferLogService: BufferLogService): I
 /**
  * Cleans up older logs, while keeping the 10 most recent ones.
 */
-async function cleanupOlderLogs(environmentService: EnvironmentService): TPromise<void> {
+async function cleanupOlderLogs(environmentService: EnvironmentService): Promise<void> {
 	const currentLog = path.basename(environmentService.logsPath);
 	const logsRoot = path.dirname(environmentService.logsPath);
 	const children = await readdir(logsRoot);
@@ -107,10 +111,11 @@ class ExpectedError extends Error {
 	public readonly isExpected = true;
 }
 
-function setupIPC(accessor: ServicesAccessor): TPromise<Server> {
+function setupIPC(accessor: ServicesAccessor): Thenable<Server> {
 	const logService = accessor.get(ILogService);
 	const environmentService = accessor.get(IEnvironmentService);
 	const requestService = accessor.get(IRequestService);
+	const diagnosticsService = accessor.get(IDiagnosticsService);
 
 	function allowSetForegroundWindow(service: LaunchChannelClient): TPromise<void> {
 		let promise = TPromise.wrap<void>(void 0);
@@ -131,7 +136,7 @@ function setupIPC(accessor: ServicesAccessor): TPromise<Server> {
 		return promise;
 	}
 
-	function setup(retry: boolean): TPromise<Server> {
+	function setup(retry: boolean): Thenable<Server> {
 		return serve(environmentService.mainIPCHandle).then(server => {
 
 			// Print --status usage info
@@ -158,7 +163,7 @@ function setupIPC(accessor: ServicesAccessor): TPromise<Server> {
 			return server;
 		}, err => {
 			if (err.code !== 'EADDRINUSE') {
-				return TPromise.wrapError<Server>(err);
+				return Promise.reject<Server>(err);
 			}
 
 			// Since we are the second instance, we do not want to show the dock
@@ -176,7 +181,7 @@ function setupIPC(accessor: ServicesAccessor): TPromise<Server> {
 						logService.error(msg);
 						client.dispose();
 
-						return TPromise.wrapError<Server>(new Error(msg));
+						return Promise.reject(new Error(msg));
 					}
 
 					// Show a warning dialog after some timeout if it takes long to talk to the other instance
@@ -198,14 +203,14 @@ function setupIPC(accessor: ServicesAccessor): TPromise<Server> {
 					// Process Info
 					if (environmentService.args.status) {
 						return service.getMainProcessInfo().then(info => {
-							return printDiagnostics(info).then(() => TPromise.wrapError(new ExpectedError()));
+							return diagnosticsService.printDiagnostics(info).then(() => Promise.reject(new ExpectedError()));
 						});
 					}
 
 					// Log uploader
 					if (typeof environmentService.args['upload-logs'] !== 'undefined') {
 						return uploadLogs(channel, requestService, environmentService)
-							.then(() => TPromise.wrapError(new ExpectedError()));
+							.then(() => Promise.reject(new ExpectedError()));
 					}
 
 					logService.trace('Sending env to running instance...');
@@ -220,7 +225,7 @@ function setupIPC(accessor: ServicesAccessor): TPromise<Server> {
 								clearTimeout(startupWarningDialogHandle);
 							}
 
-							return TPromise.wrapError(new ExpectedError('Sent env to running instance. Terminating...'));
+							return Promise.reject(new ExpectedError('Sent env to running instance. Terminating...'));
 						});
 				},
 				err => {
@@ -232,7 +237,7 @@ function setupIPC(accessor: ServicesAccessor): TPromise<Server> {
 							);
 						}
 
-						return TPromise.wrapError<Server>(err);
+						return Promise.reject<Server>(err);
 					}
 
 					// it happens on Linux and OS X that the pipe is left behind
@@ -242,7 +247,7 @@ function setupIPC(accessor: ServicesAccessor): TPromise<Server> {
 						fs.unlinkSync(environmentService.mainIPCHandle);
 					} catch (e) {
 						logService.warn('Could not delete obsolete instance handle', e);
-						return TPromise.wrapError<Server>(e);
+						return Promise.reject<Server>(e);
 					}
 
 					return setup(false);
@@ -304,7 +309,7 @@ function main() {
 		console.error(err.message);
 		app.exit(1);
 
-		return;
+		return void 0;
 	}
 
 	// We need to buffer the spdlog logs until we are sure
@@ -323,6 +328,11 @@ function main() {
 			VSCODE_NLS_CONFIG: process.env['VSCODE_NLS_CONFIG'],
 			VSCODE_LOGS: process.env['VSCODE_LOGS']
 		};
+
+		if (process.env['VSCODE_PORTABLE']) {
+			instanceEnv['VSCODE_PORTABLE'] = process.env['VSCODE_PORTABLE'];
+		}
+
 		assign(process.env, instanceEnv);
 
 		// Startup
@@ -332,7 +342,7 @@ function main() {
 				bufferLogService.logger = createSpdLogService('main', bufferLogService.getLevel(), environmentService.logsPath);
 				return instantiationService.createInstance(CodeApplication, mainIpcServer, instanceEnv).startup();
 			});
-	}).done(null, err => instantiationService.invokeFunction(quit, err));
+	}).then(null, err => instantiationService.invokeFunction(quit, err));
 }
 
 main();
diff --git a/src/vs/code/electron-main/menus.ts b/src/vs/code/electron-main/menus.ts
index a23b42e9f61..4f1efab386d 100644
--- a/src/vs/code/electron-main/menus.ts
+++ b/src/vs/code/electron-main/menus.ts
@@ -18,11 +18,13 @@ import { IUpdateService, StateType } from 'vs/platform/update/common/update';
 import product from 'vs/platform/node/product';
 import { RunOnceScheduler } from 'vs/base/common/async';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { mnemonicMenuLabel as baseMnemonicLabel, unmnemonicLabel, getPathLabel } from 'vs/base/common/labels';
+import { mnemonicMenuLabel as baseMnemonicLabel, unmnemonicLabel } from 'vs/base/common/labels';
 import { KeybindingsResolver } from 'vs/code/electron-main/keyboard';
 import { IWindowsMainService, IWindowsCountChangedEvent } from 'vs/platform/windows/electron-main/windows';
 import { IHistoryMainService } from 'vs/platform/history/common/history';
-import { IWorkspaceIdentifier, getWorkspaceLabel, ISingleFolderWorkspaceIdentifier, isSingleFolderWorkspaceIdentifier } from 'vs/platform/workspaces/common/workspaces';
+import { IWorkspaceIdentifier, ISingleFolderWorkspaceIdentifier, isSingleFolderWorkspaceIdentifier, isWorkspaceIdentifier } from 'vs/platform/workspaces/common/workspaces';
+import { URI } from 'vs/base/common/uri';
+import { ILabelService } from 'vs/platform/label/common/label';
 
 interface IMenuItemClickHandler {
 	inDevTools: (contents: Electron.WebContents) => void;
@@ -55,8 +57,6 @@ export class CodeMenu {
 	private closeFolder: Electron.MenuItem;
 	private closeWorkspace: Electron.MenuItem;
 
-	private nativeTabMenuItems: Electron.MenuItem[];
-
 	constructor(
 		@IUpdateService private updateService: IUpdateService,
 		@IInstantiationService instantiationService: IInstantiationService,
@@ -65,10 +65,9 @@ export class CodeMenu {
 		@IWindowsService private windowsService: IWindowsService,
 		@IEnvironmentService private environmentService: IEnvironmentService,
 		@ITelemetryService private telemetryService: ITelemetryService,
-		@IHistoryMainService private historyMainService: IHistoryMainService
+		@IHistoryMainService private historyMainService: IHistoryMainService,
+		@ILabelService private labelService: ILabelService
 	) {
-		this.nativeTabMenuItems = [];
-
 		this.menuUpdater = new RunOnceScheduler(() => this.doUpdateMenu(), 0);
 		this.keybindingsResolver = instantiationService.createInstance(KeybindingsResolver);
 
@@ -180,21 +179,12 @@ export class CodeMenu {
 		if ((e.oldCount === 0 && e.newCount > 0) || (e.oldCount > 0 && e.newCount === 0)) {
 			this.updateMenu();
 		}
-
-		// Update specific items that are dependent on window count
-		else if (this.currentEnableNativeTabs) {
-			this.nativeTabMenuItems.forEach(item => {
-				if (item) {
-					item.enabled = e.newCount > 1;
-				}
-			});
-		}
 	}
 
 	private updateWorkspaceMenuItems(): void {
 		const window = this.windowsMainService.getLastActiveWindow();
 		const isInWorkspaceContext = window && !!window.openedWorkspace;
-		const isInFolderContext = window && !!window.openedFolderPath;
+		const isInFolderContext = window && !!window.openedFolderUri;
 
 		this.closeWorkspace.visible = isInWorkspaceContext;
 		this.closeFolder.visible = !isInWorkspaceContext;
@@ -244,6 +234,11 @@ export class CodeMenu {
 		const debugMenuItem = new MenuItem({ label: this.mnemonicLabel(nls.localize({ key: 'mDebug', comment: ['&& denotes a mnemonic'] }, "&&Debug")), submenu: debugMenu });
 		this.setDebugMenu(debugMenu);
 
+		// Terminal
+		const terminalMenu = new Menu();
+		const terminalMenuItem = new MenuItem({ label: this.mnemonicLabel(nls.localize({ key: 'mTerminal', comment: ['&& denotes a mnemonic'] }, "&&Terminal")), submenu: terminalMenu });
+		this.setTerminalMenu(terminalMenu);
+
 		// Mac: Window
 		let macWindowMenuItem: Electron.MenuItem;
 		if (isMacintosh) {
@@ -257,10 +252,6 @@ export class CodeMenu {
 		const helpMenuItem = new MenuItem({ label: this.mnemonicLabel(nls.localize({ key: 'mHelp', comment: ['&& denotes a mnemonic'] }, "&&Help")), submenu: helpMenu, role: 'help' });
 		this.setHelpMenu(helpMenu);
 
-		// Tasks
-		const taskMenu = new Menu();
-		const taskMenuItem = new MenuItem({ label: this.mnemonicLabel(nls.localize({ key: 'mTask', comment: ['&& denotes a mnemonic'] }, "&&Tasks")), submenu: taskMenu });
-		this.setTaskMenu(taskMenu);
 
 		// Menu Structure
 		if (macApplicationMenuItem) {
@@ -273,7 +264,7 @@ export class CodeMenu {
 		menubar.append(viewMenuItem);
 		menubar.append(gotoMenuItem);
 		menubar.append(debugMenuItem);
-		menubar.append(taskMenuItem);
+		menubar.append(terminalMenuItem);
 
 		if (macWindowMenuItem) {
 			menubar.append(macWindowMenuItem);
@@ -379,7 +370,8 @@ export class CodeMenu {
 		const saveAllFiles = this.createMenuItem(nls.localize({ key: 'miSaveAll', comment: ['&& denotes a mnemonic'] }, "Save A&&ll"), 'workbench.action.files.saveAll');
 
 		const autoSaveEnabled = [AutoSaveConfiguration.AFTER_DELAY, AutoSaveConfiguration.ON_FOCUS_CHANGE, AutoSaveConfiguration.ON_WINDOW_CHANGE].some(s => this.currentAutoSaveSetting === s);
-		const autoSave = new MenuItem(this.likeAction('vscode.toggleAutoSave', { label: this.mnemonicLabel(nls.localize('miAutoSave', "Auto Save")), type: 'checkbox', checked: autoSaveEnabled, enabled: this.windowsMainService.getWindowCount() > 0, click: () => this.windowsMainService.sendToFocused('vscode.toggleAutoSave') }, false));
+
+		const autoSave = this.createMenuItem(this.mnemonicLabel(nls.localize('miAutoSave', "Auto Save")), 'workbench.action.toggleAutoSave', this.windowsMainService.getWindowCount() > 0, autoSaveEnabled);
 
 		const preferences = this.getPreferencesMenu();
 
@@ -429,14 +421,16 @@ export class CodeMenu {
 
 	private getPreferencesMenu(): Electron.MenuItem {
 		const settings = this.createMenuItem(nls.localize({ key: 'miOpenSettings', comment: ['&& denotes a mnemonic'] }, "&&Settings"), 'workbench.action.openSettings');
+		const extensions = this.createMenuItem(nls.localize({ key: 'miOpenExtensions', comment: ['&& denotes a mnemonic'] }, '&&Extensions'), 'workbench.view.extensions');
 		const kebindingSettings = this.createMenuItem(nls.localize({ key: 'miOpenKeymap', comment: ['&& denotes a mnemonic'] }, "&&Keyboard Shortcuts"), 'workbench.action.openGlobalKeybindings');
-		const keymapExtensions = this.createMenuItem(nls.localize({ key: 'miOpenKeymapExtensions', comment: ['&& denotes a mnemonic'] }, "&&Keymap Extensions"), 'workbench.extensions.action.showRecommendedKeymapExtensions');
+		const keymapExtensions = this.createMenuItem(nls.localize({ key: 'miOpenKeymapExtensions', comment: ['&& denotes a mnemonic'] }, "&&Keymaps"), 'workbench.extensions.action.showRecommendedKeymapExtensions');
 		const snippetsSettings = this.createMenuItem(nls.localize({ key: 'miOpenSnippets', comment: ['&& denotes a mnemonic'] }, "User &&Snippets"), 'workbench.action.openSnippets');
 		const colorThemeSelection = this.createMenuItem(nls.localize({ key: 'miSelectColorTheme', comment: ['&& denotes a mnemonic'] }, "&&Color Theme"), 'workbench.action.selectTheme');
 		const iconThemeSelection = this.createMenuItem(nls.localize({ key: 'miSelectIconTheme', comment: ['&& denotes a mnemonic'] }, "File &&Icon Theme"), 'workbench.action.selectIconTheme');
 
 		const preferencesMenu = new Menu();
 		preferencesMenu.append(settings);
+		preferencesMenu.append(extensions);
 		preferencesMenu.append(__separator__());
 		preferencesMenu.append(kebindingSettings);
 		preferencesMenu.append(keymapExtensions);
@@ -482,13 +476,16 @@ export class CodeMenu {
 
 	private createOpenRecentMenuItem(workspace: IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier | string, commandId: string, isFile: boolean): Electron.MenuItem {
 		let label: string;
-		let path: string;
-		if (isSingleFolderWorkspaceIdentifier(workspace) || typeof workspace === 'string') {
-			label = unmnemonicLabel(getPathLabel(workspace, null, this.environmentService));
-			path = workspace;
+		let uri: URI;
+		if (isSingleFolderWorkspaceIdentifier(workspace)) {
+			label = unmnemonicLabel(this.labelService.getWorkspaceLabel(workspace, { verbose: true }));
+			uri = workspace;
+		} else if (isWorkspaceIdentifier(workspace)) {
+			label = this.labelService.getWorkspaceLabel(workspace, { verbose: true });
+			uri = URI.file(workspace.configPath);
 		} else {
-			label = getWorkspaceLabel(workspace, this.environmentService, { verbose: true });
-			path = workspace.configPath;
+			uri = URI.file(workspace);
+			label = unmnemonicLabel(this.labelService.getUriLabel(uri));
 		}
 
 		return new MenuItem(this.likeAction(commandId, {
@@ -498,12 +495,13 @@ export class CodeMenu {
 				const success = this.windowsMainService.open({
 					context: OpenContext.MENU,
 					cli: this.environmentService.args,
-					pathsToOpen: [path], forceNewWindow: openInNewWindow,
+					urisToOpen: [uri],
+					forceNewWindow: openInNewWindow,
 					forceOpenWorkspaceAsFile: isFile
 				}).length > 0;
 
 				if (!success) {
-					this.historyMainService.removeFromRecentlyOpened([isSingleFolderWorkspaceIdentifier(workspace) ? workspace : workspace.configPath]);
+					this.historyMainService.removeFromRecentlyOpened([workspace]);
 				}
 			}
 		}, false));
@@ -513,7 +511,7 @@ export class CodeMenu {
 		return event && ((!isMacintosh && (event.ctrlKey || event.shiftKey)) || (isMacintosh && (event.metaKey || event.altKey)));
 	}
 
-	private createRoleMenuItem(label: string, commandId: string, role: Electron.MenuItemRole): Electron.MenuItem {
+	private createRoleMenuItem(label: string, commandId: string, role: any): Electron.MenuItem {
 		const options: Electron.MenuItemConstructorOptions = {
 			label: this.mnemonicLabel(label),
 			role,
@@ -652,57 +650,18 @@ export class CodeMenu {
 		// Panels
 		const output = this.createMenuItem(nls.localize({ key: 'miToggleOutput', comment: ['&& denotes a mnemonic'] }, "&&Output"), 'workbench.action.output.toggleOutput');
 		const debugConsole = this.createMenuItem(nls.localize({ key: 'miToggleDebugConsole', comment: ['&& denotes a mnemonic'] }, "De&&bug Console"), 'workbench.debug.action.toggleRepl');
-		const integratedTerminal = this.createMenuItem(nls.localize({ key: 'miToggleIntegratedTerminal', comment: ['&& denotes a mnemonic'] }, "&&Integrated Terminal"), 'workbench.action.terminal.toggleTerminal');
+		const terminal = this.createMenuItem(nls.localize({ key: 'miToggleTerminal', comment: ['&& denotes a mnemonic'] }, "&&Terminal"), 'workbench.action.terminal.toggleTerminal');
 		const problems = this.createMenuItem(nls.localize({ key: 'miMarker', comment: ['&& denotes a mnemonic'] }, "&&Problems"), 'workbench.actions.view.problems');
 
+		// Appearance
+
+		const appearanceMenu = new Menu();
+
 		const fullscreen = new MenuItem(this.withKeybinding('workbench.action.toggleFullScreen', { label: this.mnemonicLabel(nls.localize({ key: 'miToggleFullScreen', comment: ['&& denotes a mnemonic'] }, "Toggle &&Full Screen")), click: () => this.windowsMainService.getLastActiveWindow().toggleFullScreen(), enabled: this.windowsMainService.getWindowCount() > 0 }));
 		const toggleZenMode = this.createMenuItem(nls.localize('miToggleZenMode', "Toggle Zen Mode"), 'workbench.action.toggleZenMode');
 		const toggleCenteredLayout = this.createMenuItem(nls.localize('miToggleCenteredLayout', "Toggle Centered Layout"), 'workbench.action.toggleCenteredLayout');
 		const toggleMenuBar = this.createMenuItem(nls.localize({ key: 'miToggleMenuBar', comment: ['&& denotes a mnemonic'] }, "Toggle Menu &&Bar"), 'workbench.action.toggleMenuBar');
 
-		// Editor Layout
-
-		const editorLayoutMenu = new Menu();
-
-		const splitEditorUp = this.createMenuItem(nls.localize({ key: 'miSplitEditorUp', comment: ['&& denotes a mnemonic'] }, "Split &&Up"), 'workbench.action.splitEditorUp');
-		const splitEditorDown = this.createMenuItem(nls.localize({ key: 'miSplitEditorDown', comment: ['&& denotes a mnemonic'] }, "Split &&Down"), 'workbench.action.splitEditorDown');
-		const splitEditorLeft = this.createMenuItem(nls.localize({ key: 'miSplitEditorLeft', comment: ['&& denotes a mnemonic'] }, "Split &&Left"), 'workbench.action.splitEditorLeft');
-		const splitEditorRight = this.createMenuItem(nls.localize({ key: 'miSplitEditorRight', comment: ['&& denotes a mnemonic'] }, "Split &&Right"), 'workbench.action.splitEditorRight');
-
-		const singleColumnEditorLayout = this.createMenuItem(nls.localize({ key: 'miSingleColumnEditorLayout', comment: ['&& denotes a mnemonic'] }, "&&Single"), 'workbench.action.editorLayoutSingle');
-		const centeredEditorLayout = this.createMenuItem(nls.localize({ key: 'miCenteredEditorLayout', comment: ['&& denotes a mnemonic'] }, "&&Centered"), 'workbench.action.editorLayoutCentered');
-		const twoColumnsEditorLayout = this.createMenuItem(nls.localize({ key: 'miTwoColumnsEditorLayout', comment: ['&& denotes a mnemonic'] }, "&&Two Columns"), 'workbench.action.editorLayoutTwoColumns');
-		const threeColumnsEditorLayout = this.createMenuItem(nls.localize({ key: 'miThreeColumnsEditorLayout', comment: ['&& denotes a mnemonic'] }, "T&&hree Columns"), 'workbench.action.editorLayoutThreeColumns');
-		const twoRowsEditorLayout = this.createMenuItem(nls.localize({ key: 'miTwoRowsEditorLayout', comment: ['&& denotes a mnemonic'] }, "T&&wo Rows"), 'workbench.action.editorLayoutTwoRows');
-		const threeRowsEditorLayout = this.createMenuItem(nls.localize({ key: 'miThreeRowsEditorLayout', comment: ['&& denotes a mnemonic'] }, "Three &&Rows"), 'workbench.action.editorLayoutThreeRows');
-		const twoByTwoGridEditorLayout = this.createMenuItem(nls.localize({ key: 'miTwoByTwoGridEditorLayout', comment: ['&& denotes a mnemonic'] }, "&&Grid (2x2)"), 'workbench.action.editorLayoutTwoByTwoGrid');
-		const twoColumnsRightEditorLayout = this.createMenuItem(nls.localize({ key: 'miTwoColumnsRightEditorLayout', comment: ['&& denotes a mnemonic'] }, "Two C&&olumns Right"), 'workbench.action.editorLayoutTwoColumnsRight');
-		const twoColumnsBottomEditorLayout = this.createMenuItem(nls.localize({ key: 'miTwoColumnsBottomEditorLayout', comment: ['&& denotes a mnemonic'] }, "Two &&Columns Bottom"), 'workbench.action.editorLayoutTwoColumnsBottom');
-
-		const toggleEditorLayout = this.createMenuItem(nls.localize({ key: 'miToggleEditorLayout', comment: ['&& denotes a mnemonic'] }, "Flip &&Layout"), 'workbench.action.toggleEditorGroupLayout');
-
-		[
-			splitEditorUp,
-			splitEditorDown,
-			splitEditorLeft,
-			splitEditorRight,
-			__separator__(),
-			singleColumnEditorLayout,
-			centeredEditorLayout,
-			twoColumnsEditorLayout,
-			threeColumnsEditorLayout,
-			twoRowsEditorLayout,
-			threeRowsEditorLayout,
-			twoByTwoGridEditorLayout,
-			twoColumnsRightEditorLayout,
-			twoColumnsBottomEditorLayout,
-			__separator__(),
-			toggleEditorLayout
-		].forEach(item => editorLayoutMenu.append(item));
-
-		const editorLayout = new MenuItem({ label: this.mnemonicLabel(nls.localize({ key: 'miEditorLayout', comment: ['&& denotes a mnemonic'] }, "Editor &&Layout")), submenu: editorLayoutMenu });
-
-		// Workbench Layout
 		const toggleSidebar = this.createMenuItem(nls.localize({ key: 'miToggleSidebar', comment: ['&& denotes a mnemonic'] }, "&&Toggle Side Bar"), 'workbench.action.toggleSidebarVisibility');
 
 		let moveSideBarLabel: string;
@@ -731,21 +690,82 @@ export class CodeMenu {
 		}
 		const toggleActivtyBar = this.createMenuItem(activityBarLabel, 'workbench.action.toggleActivityBarVisibility');
 
-		// Editor
-		const toggleWordWrap = this.createMenuItem(nls.localize({ key: 'miToggleWordWrap', comment: ['&& denotes a mnemonic'] }, "Toggle &&Word Wrap"), 'editor.action.toggleWordWrap');
-		const toggleMinimap = this.createMenuItem(nls.localize({ key: 'miToggleMinimap', comment: ['&& denotes a mnemonic'] }, "Toggle &&Minimap"), 'editor.action.toggleMinimap');
-		const toggleRenderWhitespace = this.createMenuItem(nls.localize({ key: 'miToggleRenderWhitespace', comment: ['&& denotes a mnemonic'] }, "Toggle &&Render Whitespace"), 'editor.action.toggleRenderWhitespace');
-		const toggleRenderControlCharacters = this.createMenuItem(nls.localize({ key: 'miToggleRenderControlCharacters', comment: ['&& denotes a mnemonic'] }, "Toggle &&Control Characters"), 'editor.action.toggleRenderControlCharacter');
-
-		// Zoom
 		const zoomIn = this.createMenuItem(nls.localize({ key: 'miZoomIn', comment: ['&& denotes a mnemonic'] }, "&&Zoom In"), 'workbench.action.zoomIn');
 		const zoomOut = this.createMenuItem(nls.localize({ key: 'miZoomOut', comment: ['&& denotes a mnemonic'] }, "Zoom O&&ut"), 'workbench.action.zoomOut');
 		const resetZoom = this.createMenuItem(nls.localize({ key: 'miZoomReset', comment: ['&& denotes a mnemonic'] }, "&&Reset Zoom"), 'workbench.action.zoomReset');
 
+		arrays.coalesce([
+			fullscreen,
+			toggleZenMode,
+			toggleCenteredLayout,
+			isWindows || isLinux ? toggleMenuBar : void 0,
+			__separator__(),
+			moveSidebar,
+			toggleSidebar,
+			togglePanel,
+			toggleStatusbar,
+			toggleActivtyBar,
+			__separator__(),
+			zoomIn,
+			zoomOut,
+			resetZoom
+		]).forEach(item => appearanceMenu.append(item));
+
+		const appearance = new MenuItem({ label: this.mnemonicLabel(nls.localize({ key: 'miAppearance', comment: ['&& denotes a mnemonic'] }, "&&Appearance")), submenu: appearanceMenu });
+
+		// Editor Layout
+
+		const editorLayoutMenu = new Menu();
+
+		const splitEditorUp = this.createMenuItem(nls.localize({ key: 'miSplitEditorUp', comment: ['&& denotes a mnemonic'] }, "Split &&Up"), 'workbench.action.splitEditorUp');
+		const splitEditorDown = this.createMenuItem(nls.localize({ key: 'miSplitEditorDown', comment: ['&& denotes a mnemonic'] }, "Split &&Down"), 'workbench.action.splitEditorDown');
+		const splitEditorLeft = this.createMenuItem(nls.localize({ key: 'miSplitEditorLeft', comment: ['&& denotes a mnemonic'] }, "Split &&Left"), 'workbench.action.splitEditorLeft');
+		const splitEditorRight = this.createMenuItem(nls.localize({ key: 'miSplitEditorRight', comment: ['&& denotes a mnemonic'] }, "Split &&Right"), 'workbench.action.splitEditorRight');
+
+		const singleColumnEditorLayout = this.createMenuItem(nls.localize({ key: 'miSingleColumnEditorLayout', comment: ['&& denotes a mnemonic'] }, "&&Single"), 'workbench.action.editorLayoutSingle');
+		const twoColumnsEditorLayout = this.createMenuItem(nls.localize({ key: 'miTwoColumnsEditorLayout', comment: ['&& denotes a mnemonic'] }, "&&Two Columns"), 'workbench.action.editorLayoutTwoColumns');
+		const threeColumnsEditorLayout = this.createMenuItem(nls.localize({ key: 'miThreeColumnsEditorLayout', comment: ['&& denotes a mnemonic'] }, "T&&hree Columns"), 'workbench.action.editorLayoutThreeColumns');
+		const twoRowsEditorLayout = this.createMenuItem(nls.localize({ key: 'miTwoRowsEditorLayout', comment: ['&& denotes a mnemonic'] }, "T&&wo Rows"), 'workbench.action.editorLayoutTwoRows');
+		const threeRowsEditorLayout = this.createMenuItem(nls.localize({ key: 'miThreeRowsEditorLayout', comment: ['&& denotes a mnemonic'] }, "Three &&Rows"), 'workbench.action.editorLayoutThreeRows');
+		const twoByTwoGridEditorLayout = this.createMenuItem(nls.localize({ key: 'miTwoByTwoGridEditorLayout', comment: ['&& denotes a mnemonic'] }, "&&Grid (2x2)"), 'workbench.action.editorLayoutTwoByTwoGrid');
+		const twoRowsRightEditorLayout = this.createMenuItem(nls.localize({ key: 'miTwoRowsRightEditorLayout', comment: ['&& denotes a mnemonic'] }, "Two R&&ows Right"), 'workbench.action.editorLayoutTwoRowsRight');
+		const twoColumnsBottomEditorLayout = this.createMenuItem(nls.localize({ key: 'miTwoColumnsBottomEditorLayout', comment: ['&& denotes a mnemonic'] }, "Two &&Columns Bottom"), 'workbench.action.editorLayoutTwoColumnsBottom');
+
+		const toggleEditorLayout = this.createMenuItem(nls.localize({ key: 'miToggleEditorLayout', comment: ['&& denotes a mnemonic'] }, "Flip &&Layout"), 'workbench.action.toggleEditorGroupLayout');
+
+		[
+			splitEditorUp,
+			splitEditorDown,
+			splitEditorLeft,
+			splitEditorRight,
+			__separator__(),
+			singleColumnEditorLayout,
+			twoColumnsEditorLayout,
+			threeColumnsEditorLayout,
+			twoRowsEditorLayout,
+			threeRowsEditorLayout,
+			twoByTwoGridEditorLayout,
+			twoRowsRightEditorLayout,
+			twoColumnsBottomEditorLayout,
+			__separator__(),
+			toggleEditorLayout
+		].forEach(item => editorLayoutMenu.append(item));
+
+		const editorLayout = new MenuItem({ label: this.mnemonicLabel(nls.localize({ key: 'miEditorLayout', comment: ['&& denotes a mnemonic'] }, "Editor &&Layout")), submenu: editorLayoutMenu });
+
+		const toggleWordWrap = this.createMenuItem(nls.localize({ key: 'miToggleWordWrap', comment: ['&& denotes a mnemonic'] }, "Toggle &&Word Wrap"), 'editor.action.toggleWordWrap');
+		const toggleMinimap = this.createMenuItem(nls.localize({ key: 'miToggleMinimap', comment: ['&& denotes a mnemonic'] }, "Toggle &&Minimap"), 'editor.action.toggleMinimap');
+		const toggleRenderWhitespace = this.createMenuItem(nls.localize({ key: 'miToggleRenderWhitespace', comment: ['&& denotes a mnemonic'] }, "Toggle &&Render Whitespace"), 'editor.action.toggleRenderWhitespace');
+		const toggleRenderControlCharacters = this.createMenuItem(nls.localize({ key: 'miToggleRenderControlCharacters', comment: ['&& denotes a mnemonic'] }, "Toggle &&Control Characters"), 'editor.action.toggleRenderControlCharacter');
+		const toggleBreadcrumbs = this.createMenuItem(nls.localize({ key: 'miToggleBreadcrumbs', comment: ['&& denotes a mnemonic'] }, "Toggle &&Breadcrumbs"), 'breadcrumbs.toggle');
+
 		arrays.coalesce([
 			commands,
 			openView,
 			__separator__(),
+			appearance,
+			editorLayout,
+			__separator__(),
 			explorer,
 			search,
 			scm,
@@ -755,29 +775,13 @@ export class CodeMenu {
 			output,
 			problems,
 			debugConsole,
-			integratedTerminal,
-			__separator__(),
-			fullscreen,
-			toggleZenMode,
-			toggleCenteredLayout,
-			isWindows || isLinux ? toggleMenuBar : void 0,
-			__separator__(),
-			editorLayout,
-			__separator__(),
-			moveSidebar,
-			toggleSidebar,
-			togglePanel,
-			toggleStatusbar,
-			toggleActivtyBar,
+			terminal,
 			__separator__(),
 			toggleWordWrap,
 			toggleMinimap,
 			toggleRenderWhitespace,
 			toggleRenderControlCharacters,
-			__separator__(),
-			zoomIn,
-			zoomOut,
-			resetZoom
+			toggleBreadcrumbs
 		]).forEach(item => viewMenu.append(item));
 	}
 
@@ -860,6 +864,41 @@ export class CodeMenu {
 		].forEach(item => gotoMenu.append(item));
 	}
 
+	private setTerminalMenu(terminalMenu: Electron.Menu): void {
+		const newTerminal = this.createMenuItem(nls.localize({ key: 'miNewTerminal', comment: ['&& denotes a mnemonic'] }, "&&New Terminal"), 'workbench.action.terminal.new');
+		const splitTerminal = this.createMenuItem(nls.localize({ key: 'miSplitTerminal', comment: ['&& denotes a mnemonic'] }, "&&Split Terminal"), 'workbench.action.terminal.split');
+
+		const runActiveFile = this.createMenuItem(nls.localize({ key: 'miRunActiveFile', comment: ['&& denotes a mnemonic'] }, "Run &&Active File"), 'workbench.action.terminal.runActiveFile');
+		const runSelectedText = this.createMenuItem(nls.localize({ key: 'miRunSelectedText', comment: ['&& denotes a mnemonic'] }, "Run &&Selected Text"), 'workbench.action.terminal.runSelectedText');
+
+		const runTask = this.createMenuItem(nls.localize({ key: 'miRunTask', comment: ['&& denotes a mnemonic'] }, "&&Run Task..."), 'workbench.action.tasks.runTask');
+		const buildTask = this.createMenuItem(nls.localize({ key: 'miBuildTask', comment: ['&& denotes a mnemonic'] }, "Run &&Build Task..."), 'workbench.action.tasks.build');
+		const showTasks = this.createMenuItem(nls.localize({ key: 'miRunningTask', comment: ['&& denotes a mnemonic'] }, "Show Runnin&&g Tasks..."), 'workbench.action.tasks.showTasks');
+		const restartTask = this.createMenuItem(nls.localize({ key: 'miRestartTask', comment: ['&& denotes a mnemonic'] }, "R&&estart Running Task..."), 'workbench.action.tasks.restartTask');
+		const terminateTask = this.createMenuItem(nls.localize({ key: 'miTerminateTask', comment: ['&& denotes a mnemonic'] }, "&&Terminate Task..."), 'workbench.action.tasks.terminate');
+		const configureTask = this.createMenuItem(nls.localize({ key: 'miConfigureTask', comment: ['&& denotes a mnemonic'] }, "&&Configure Tasks..."), 'workbench.action.tasks.configureTaskRunner');
+		const configureBuildTask = this.createMenuItem(nls.localize({ key: 'miConfigureBuildTask', comment: ['&& denotes a mnemonic'] }, "Configure De&&fault Build Task..."), 'workbench.action.tasks.configureDefaultBuildTask');
+
+		const menuItems: MenuItem[] = [
+			newTerminal,
+			splitTerminal,
+			__separator__(),
+			runTask,
+			buildTask,
+			runActiveFile,
+			runSelectedText,
+			__separator__(),
+			terminateTask,
+			restartTask,
+			showTasks,
+			__separator__(),
+			configureTask,
+			configureBuildTask
+		];
+
+		menuItems.forEach(item => terminalMenu.append(item));
+	}
+
 	private setDebugMenu(debugMenu: Electron.Menu): void {
 		const start = this.createMenuItem(nls.localize({ key: 'miStartDebugging', comment: ['&& denotes a mnemonic'] }, "&&Start Debugging"), 'workbench.action.debug.start');
 		const startWithoutDebugging = this.createMenuItem(nls.localize({ key: 'miStartWithoutDebugging', comment: ['&& denotes a mnemonic'] }, "Start &&Without Debugging"), 'workbench.action.debug.run');
@@ -916,19 +955,16 @@ export class CodeMenu {
 		const bringAllToFront = new MenuItem({ label: nls.localize('mBringToFront', "Bring All to Front"), role: 'front', enabled: this.windowsMainService.getWindowCount() > 0 });
 		const switchWindow = this.createMenuItem(nls.localize({ key: 'miSwitchWindow', comment: ['&& denotes a mnemonic'] }, "Switch &&Window..."), 'workbench.action.switchWindow');
 
-		this.nativeTabMenuItems = [];
 		const nativeTabMenuItems: Electron.MenuItem[] = [];
 		if (this.currentEnableNativeTabs) {
-			const hasMultipleWindows = this.windowsMainService.getWindowCount() > 1;
+			nativeTabMenuItems.push(this.createMenuItem(nls.localize('mNewTab', "New Tab"), 'workbench.action.newWindowTab'));
 
-			this.nativeTabMenuItems.push(this.createMenuItem(nls.localize('mShowPreviousTab', "Show Previous Tab"), 'workbench.action.showPreviousWindowTab', hasMultipleWindows));
-			this.nativeTabMenuItems.push(this.createMenuItem(nls.localize('mShowNextTab', "Show Next Tab"), 'workbench.action.showNextWindowTab', hasMultipleWindows));
-			this.nativeTabMenuItems.push(this.createMenuItem(nls.localize('mMoveTabToNewWindow', "Move Tab to New Window"), 'workbench.action.moveWindowTabToNewWindow', hasMultipleWindows));
-			this.nativeTabMenuItems.push(this.createMenuItem(nls.localize('mMergeAllWindows', "Merge All Windows"), 'workbench.action.mergeAllWindowTabs', hasMultipleWindows));
+			nativeTabMenuItems.push(this.createRoleMenuItem(nls.localize('mShowPreviousTab', "Show Previous Tab"), 'workbench.action.showPreviousWindowTab', 'selectPreviousTab'));
+			nativeTabMenuItems.push(this.createRoleMenuItem(nls.localize('mShowNextTab', "Show Next Tab"), 'workbench.action.showNextWindowTab', 'selectNextTab'));
+			nativeTabMenuItems.push(this.createRoleMenuItem(nls.localize('mMoveTabToNewWindow', "Move Tab to New Window"), 'workbench.action.moveWindowTabToNewWindow', 'moveTabToNewWindow'));
+			nativeTabMenuItems.push(this.createRoleMenuItem(nls.localize('mMergeAllWindows', "Merge All Windows"), 'workbench.action.mergeAllWindowTabs', 'mergeAllWindows'));
 
-			nativeTabMenuItems.push(__separator__(), ...this.nativeTabMenuItems);
-		} else {
-			this.nativeTabMenuItems = [];
+			nativeTabMenuItems.push(__separator__(), ...nativeTabMenuItems);
 		}
 
 		[
@@ -945,7 +981,7 @@ export class CodeMenu {
 		const w = this.windowsMainService.getFocusedWindow();
 		if (w && w.win) {
 			const contents = w.win.webContents;
-			if (w.hasHiddenTitleBarStyle() && !w.win.isFullScreen() && !contents.isDevToolsOpened()) {
+			if (isMacintosh && w.hasHiddenTitleBarStyle() && !w.win.isFullScreen() && !contents.isDevToolsOpened()) {
 				contents.openDevTools({ mode: 'undocked' }); // due to https://github.com/electron/electron/issues/3647
 			} else {
 				contents.toggleDevTools();
@@ -1034,29 +1070,6 @@ export class CodeMenu {
 		}
 	}
 
-	private setTaskMenu(taskMenu: Electron.Menu): void {
-		const runTask = this.createMenuItem(nls.localize({ key: 'miRunTask', comment: ['&& denotes a mnemonic'] }, "&&Run Task..."), 'workbench.action.tasks.runTask');
-		const buildTask = this.createMenuItem(nls.localize({ key: 'miBuildTask', comment: ['&& denotes a mnemonic'] }, "Run &&Build Task..."), 'workbench.action.tasks.build');
-		const showTasks = this.createMenuItem(nls.localize({ key: 'miRunningTask', comment: ['&& denotes a mnemonic'] }, "Show Runnin&&g Tasks..."), 'workbench.action.tasks.showTasks');
-		const restartTask = this.createMenuItem(nls.localize({ key: 'miRestartTask', comment: ['&& denotes a mnemonic'] }, "R&&estart Running Task..."), 'workbench.action.tasks.restartTask');
-		const terminateTask = this.createMenuItem(nls.localize({ key: 'miTerminateTask', comment: ['&& denotes a mnemonic'] }, "&&Terminate Task..."), 'workbench.action.tasks.terminate');
-		const configureTask = this.createMenuItem(nls.localize({ key: 'miConfigureTask', comment: ['&& denotes a mnemonic'] }, "&&Configure Tasks..."), 'workbench.action.tasks.configureTaskRunner');
-		const configureBuildTask = this.createMenuItem(nls.localize({ key: 'miConfigureBuildTask', comment: ['&& denotes a mnemonic'] }, "Configure De&&fault Build Task..."), 'workbench.action.tasks.configureDefaultBuildTask');
-
-		[
-			//__separator__(),
-			runTask,
-			buildTask,
-			__separator__(),
-			terminateTask,
-			restartTask,
-			showTasks,
-			__separator__(),
-			configureTask,
-			configureBuildTask
-		].forEach(item => taskMenu.append(item));
-	}
-
 	private openAccessibilityOptions(): void {
 		const win = new BrowserWindow({
 			alwaysOnTop: true,
@@ -1065,7 +1078,10 @@ export class CodeMenu {
 			width: 450,
 			height: 300,
 			show: true,
-			title: nls.localize('accessibilityOptionsWindowTitle', "Accessibility Options")
+			title: nls.localize('accessibilityOptionsWindowTitle', "Accessibility Options"),
+			webPreferences: {
+				disableBlinkFeatures: 'Auxclick'
+			}
 		});
 
 		win.setMenuBarVisibility(false);
@@ -1129,6 +1145,7 @@ export class CodeMenu {
 	private createMenuItem(label: string, click: () => void, enabled?: boolean, checked?: boolean): Electron.MenuItem;
 	private createMenuItem(arg1: string, arg2: any, arg3?: boolean, arg4?: boolean): Electron.MenuItem {
 		const label = this.mnemonicLabel(arg1);
+
 		const click: () => void = (typeof arg2 === 'function') ? arg2 : (menuItem: Electron.MenuItem, win: Electron.BrowserWindow, event: Electron.Event) => {
 			let commandId = arg2;
 			if (Array.isArray(arg2)) {
@@ -1137,6 +1154,7 @@ export class CodeMenu {
 
 			this.runActionInRenderer(commandId);
 		};
+
 		const enabled = typeof arg3 === 'boolean' ? arg3 : this.windowsMainService.getWindowCount() > 0;
 		const checked = typeof arg4 === 'boolean' ? arg4 : false;
 
diff --git a/src/vs/code/electron-main/sharedProcess.ts b/src/vs/code/electron-main/sharedProcess.ts
index 7f0a1fca2b5..49519e62453 100644
--- a/src/vs/code/electron-main/sharedProcess.ts
+++ b/src/vs/code/electron-main/sharedProcess.ts
@@ -13,6 +13,8 @@ import { ISharedProcess } from 'vs/platform/windows/electron-main/windows';
 import { Barrier } from 'vs/base/common/async';
 import { ILogService } from 'vs/platform/log/common/log';
 import { ILifecycleService } from 'vs/platform/lifecycle/electron-main/lifecycleMain';
+import { IStateService } from 'vs/platform/state/common/state';
+import { getBackgroundColor } from 'vs/code/electron-main/theme';
 
 export class SharedProcess implements ISharedProcess {
 
@@ -21,11 +23,12 @@ export class SharedProcess implements ISharedProcess {
 	private window: Electron.BrowserWindow;
 
 	constructor(
-		private readonly environmentService: IEnvironmentService,
-		private readonly lifecycleService: ILifecycleService,
-		private readonly logService: ILogService,
 		private readonly machineId: string,
 		private readonly userEnv: IProcessEnvironment,
+		@IEnvironmentService private readonly environmentService: IEnvironmentService,
+		@ILifecycleService private readonly lifecycleService: ILifecycleService,
+		@IStateService private readonly stateService: IStateService,
+		@ILogService private readonly logService: ILogService
 	) {
 	}
 
@@ -33,10 +36,12 @@ export class SharedProcess implements ISharedProcess {
 	private get _whenReady(): TPromise<void> {
 		this.window = new BrowserWindow({
 			show: false,
+			backgroundColor: getBackgroundColor(this.stateService),
 			webPreferences: {
 				images: false,
 				webaudio: false,
-				webgl: false
+				webgl: false,
+				disableBlinkFeatures: 'Auxclick' // do NOT change, allows us to identify this window as shared-process in the process explorer
 			}
 		});
 		const config = assign({
diff --git a/src/vs/code/electron-main/theme.ts b/src/vs/code/electron-main/theme.ts
new file mode 100644
index 00000000000..fcee1e72733
--- /dev/null
+++ b/src/vs/code/electron-main/theme.ts
@@ -0,0 +1,41 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+import { isWindows, isMacintosh } from 'vs/base/common/platform';
+import { systemPreferences } from 'electron';
+import { IStateService } from 'vs/platform/state/common/state';
+
+export const DEFAULT_BG_LIGHT = '#FFFFFF';
+export const DEFAULT_BG_DARK = '#1E1E1E';
+export const DEFAULT_BG_HC_BLACK = '#000000';
+
+export const THEME_STORAGE_KEY = 'theme';
+export const THEME_BG_STORAGE_KEY = 'themeBackground';
+
+export function getBackgroundColor(stateService: IStateService): string {
+	if (isWindows && systemPreferences.isInvertedColorScheme()) {
+		return DEFAULT_BG_HC_BLACK;
+	}
+
+	let background = stateService.getItem<string>(THEME_BG_STORAGE_KEY, null);
+	if (!background) {
+		let baseTheme: string;
+		if (isWindows && systemPreferences.isInvertedColorScheme()) {
+			baseTheme = 'hc-black';
+		} else {
+			baseTheme = stateService.getItem<string>(THEME_STORAGE_KEY, 'vs-dark').split(' ')[0];
+		}
+
+		background = (baseTheme === 'hc-black') ? DEFAULT_BG_HC_BLACK : (baseTheme === 'vs' ? DEFAULT_BG_LIGHT : DEFAULT_BG_DARK);
+	}
+
+	if (isMacintosh && background.toUpperCase() === DEFAULT_BG_DARK) {
+		background = '#171717'; // https://github.com/electron/electron/issues/5150
+	}
+
+	return background;
+}
\ No newline at end of file
diff --git a/src/vs/code/electron-main/window.ts b/src/vs/code/electron-main/window.ts
index 5f99b37e2e2..78ced48cf48 100644
--- a/src/vs/code/electron-main/window.ts
+++ b/src/vs/code/electron-main/window.ts
@@ -8,9 +8,9 @@
 import * as path from 'path';
 import * as objects from 'vs/base/common/objects';
 import * as nls from 'vs/nls';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { IStateService } from 'vs/platform/state/common/state';
-import { shell, screen, BrowserWindow, systemPreferences, app, TouchBar, nativeImage } from 'electron';
+import { screen, BrowserWindow, systemPreferences, app, TouchBar, nativeImage } from 'electron';
 import { TPromise, TValueCallback } from 'vs/base/common/winjs.base';
 import { IEnvironmentService, ParsedArgs } from 'vs/platform/environment/common/environment';
 import { ILogService } from 'vs/platform/log/common/log';
@@ -23,9 +23,10 @@ import { isLinux, isMacintosh, isWindows } from 'vs/base/common/platform';
 import { ICodeWindow, IWindowState, WindowMode } from 'vs/platform/windows/electron-main/windows';
 import { IWorkspaceIdentifier, IWorkspacesMainService } from 'vs/platform/workspaces/common/workspaces';
 import { IBackupMainService } from 'vs/platform/backup/common/backup';
-import { ICommandAction } from 'vs/platform/actions/common/actions';
-import { mark, exportEntries } from 'vs/base/common/performance';
+import { ISerializableCommandAction } from 'vs/platform/actions/common/actions';
+import * as perf from 'vs/base/common/performance';
 import { resolveMarketplaceHeaders } from 'vs/platform/extensionManagement/node/extensionGalleryService';
+import { getBackgroundColor } from 'vs/code/electron-main/theme';
 
 export interface IWindowCreationOptions {
 	state: IWindowState;
@@ -55,13 +56,6 @@ interface ITouchBarSegment extends Electron.SegmentedControlSegment {
 
 export class CodeWindow implements ICodeWindow {
 
-	public static readonly themeStorageKey = 'theme';
-	public static readonly themeBackgroundStorageKey = 'themeBackground';
-
-	private static readonly DEFAULT_BG_LIGHT = '#FFFFFF';
-	private static readonly DEFAULT_BG_DARK = '#1E1E1E';
-	private static readonly DEFAULT_BG_HC_BLACK = '#000000';
-
 	private static readonly MIN_WIDTH = 200;
 	private static readonly MIN_HEIGHT = 120;
 
@@ -124,25 +118,22 @@ export class CodeWindow implements ICodeWindow {
 		// in case we are maximized or fullscreen, only show later after the call to maximize/fullscreen (see below)
 		const isFullscreenOrMaximized = (this.windowState.mode === WindowMode.Maximized || this.windowState.mode === WindowMode.Fullscreen);
 
-		let backgroundColor = this.getBackgroundColor();
-		if (isMacintosh && backgroundColor.toUpperCase() === CodeWindow.DEFAULT_BG_DARK) {
-			backgroundColor = '#171717'; // https://github.com/electron/electron/issues/5150
-		}
-
 		const options: Electron.BrowserWindowConstructorOptions = {
 			width: this.windowState.width,
 			height: this.windowState.height,
 			x: this.windowState.x,
 			y: this.windowState.y,
-			backgroundColor,
+			backgroundColor: getBackgroundColor(this.stateService),
 			minWidth: CodeWindow.MIN_WIDTH,
 			minHeight: CodeWindow.MIN_HEIGHT,
 			show: !isFullscreenOrMaximized,
 			title: product.nameLong,
 			webPreferences: {
-				'backgroundThrottling': false, // by default if Code is in the background, intervals and timeouts get throttled,
-				disableBlinkFeatures: 'Auxclick', // disable auxclick events (see https://developers.google.com/web/updates/2016/10/auxclick)
-				experimentalFeatures: true
+				// By default if Code is in the background, intervals and timeouts get throttled, so we
+				// want to enforce that Code stays in the foreground. This triggers a disable_hidden_
+				// flag that Electron provides via patch:
+				// https://github.com/electron/libchromiumcontent/blob/master/patches/common/chromium/disable_hidden.patch
+				'backgroundThrottling': false
 			}
 		};
 
@@ -167,10 +158,18 @@ export class CodeWindow implements ICodeWindow {
 		}
 
 		let useCustomTitleStyle = false;
-		if (isMacintosh && (!windowConfig || !windowConfig.titleBarStyle || windowConfig.titleBarStyle === 'custom')) {
+		if (isMacintosh) {
+			useCustomTitleStyle = !windowConfig || !windowConfig.titleBarStyle || windowConfig.titleBarStyle === 'custom'; // Default to custom on macOS
+
 			const isDev = !this.environmentService.isBuilt || !!config.extensionDevelopmentPath;
-			if (!isDev) {
-				useCustomTitleStyle = true; // not enabled when developing due to https://github.com/electron/electron/issues/3647
+			if (isDev) {
+				useCustomTitleStyle = false; // not enabled when developing due to https://github.com/electron/electron/issues/3647
+			}
+		} else {
+			if (isLinux) {
+				useCustomTitleStyle = windowConfig && windowConfig.titleBarStyle === 'custom';
+			} else {
+				useCustomTitleStyle = !windowConfig || !windowConfig.titleBarStyle || windowConfig.titleBarStyle === 'custom'; // Default to custom on Windows
 			}
 		}
 
@@ -181,29 +180,15 @@ export class CodeWindow implements ICodeWindow {
 		if (useCustomTitleStyle) {
 			options.titleBarStyle = 'hidden';
 			this.hiddenTitleBarStyle = true;
+			if (!isMacintosh) {
+				options.frame = false;
+			}
 		}
 
 		// Create the browser window.
 		this._win = new BrowserWindow(options);
 		this._id = this._win.id;
 
-		// Bug in Electron (https://github.com/electron/electron/issues/10862). On multi-monitor setups,
-		// it can happen that the position we set to the window is not the correct one on the display.
-		// To workaround, we ask the window for its position and set it again if not matching.
-		// This only applies if the window is not fullscreen or maximized and multiple monitors are used.
-		if (isWindows && !isFullscreenOrMaximized) {
-			try {
-				if (screen.getAllDisplays().length > 1) {
-					const [x, y] = this._win.getPosition();
-					if (x !== this.windowState.x || y !== this.windowState.y) {
-						this._win.setPosition(this.windowState.x, this.windowState.y, false);
-					}
-				}
-			} catch (err) {
-				this.logService.warn(`Unexpected error fixing window position on windows with multiple windows: ${err}\n${err.stack}`);
-			}
-		}
-
 		if (useCustomTitleStyle) {
 			this._win.setSheetOffset(22); // offset dialogs by the height of the custom title bar if we have any
 		}
@@ -223,35 +208,35 @@ export class CodeWindow implements ICodeWindow {
 		this._lastFocusTime = Date.now(); // since we show directly, we need to set the last focus time too
 	}
 
-	public hasHiddenTitleBarStyle(): boolean {
+	hasHiddenTitleBarStyle(): boolean {
 		return this.hiddenTitleBarStyle;
 	}
 
-	public get isExtensionDevelopmentHost(): boolean {
+	get isExtensionDevelopmentHost(): boolean {
 		return !!this.config.extensionDevelopmentPath;
 	}
 
-	public get isExtensionTestHost(): boolean {
+	get isExtensionTestHost(): boolean {
 		return !!this.config.extensionTestsPath;
 	}
 
-	public get extensionDevelopmentPath(): string {
+	get extensionDevelopmentPath(): string {
 		return this.config.extensionDevelopmentPath;
 	}
 
-	public get config(): IWindowConfiguration {
+	get config(): IWindowConfiguration {
 		return this.currentConfig;
 	}
 
-	public get id(): number {
+	get id(): number {
 		return this._id;
 	}
 
-	public get win(): Electron.BrowserWindow {
+	get win(): Electron.BrowserWindow {
 		return this._win;
 	}
 
-	public setRepresentedFilename(filename: string): void {
+	setRepresentedFilename(filename: string): void {
 		if (isMacintosh) {
 			this.win.setRepresentedFilename(filename);
 		} else {
@@ -259,7 +244,7 @@ export class CodeWindow implements ICodeWindow {
 		}
 	}
 
-	public getRepresentedFilename(): string {
+	getRepresentedFilename(): string {
 		if (isMacintosh) {
 			return this.win.getRepresentedFilename();
 		}
@@ -267,7 +252,7 @@ export class CodeWindow implements ICodeWindow {
 		return this.representedFilename;
 	}
 
-	public focus(): void {
+	focus(): void {
 		if (!this._win) {
 			return;
 		}
@@ -279,23 +264,23 @@ export class CodeWindow implements ICodeWindow {
 		this._win.focus();
 	}
 
-	public get lastFocusTime(): number {
+	get lastFocusTime(): number {
 		return this._lastFocusTime;
 	}
 
-	public get backupPath(): string {
+	get backupPath(): string {
 		return this.currentConfig ? this.currentConfig.backupPath : void 0;
 	}
 
-	public get openedWorkspace(): IWorkspaceIdentifier {
+	get openedWorkspace(): IWorkspaceIdentifier {
 		return this.currentConfig ? this.currentConfig.workspace : void 0;
 	}
 
-	public get openedFolderPath(): string {
-		return this.currentConfig ? this.currentConfig.folderPath : void 0;
+	get openedFolderUri(): URI {
+		return this.currentConfig ? this.currentConfig.folderUri : void 0;
 	}
 
-	public setReady(): void {
+	setReady(): void {
 		this._readyState = ReadyState.READY;
 
 		// inform all waiting promises that we are ready now
@@ -304,7 +289,7 @@ export class CodeWindow implements ICodeWindow {
 		}
 	}
 
-	public ready(): TPromise<ICodeWindow> {
+	ready(): TPromise<ICodeWindow> {
 		return new TPromise<ICodeWindow>((c) => {
 			if (this._readyState === ReadyState.READY) {
 				return c(this);
@@ -315,7 +300,7 @@ export class CodeWindow implements ICodeWindow {
 		});
 	}
 
-	public get readyState(): ReadyState {
+	get readyState(): ReadyState {
 		return this._readyState;
 	}
 
@@ -327,7 +312,7 @@ export class CodeWindow implements ICodeWindow {
 		// Inject headers when requests are incoming
 		const urls = ['https://marketplace.visualstudio.com/*', 'https://*.vsassets.io/*'];
 		this._win.webContents.session.webRequest.onBeforeSendHeaders({ urls }, (details: any, cb: any) => {
-			this.marketplaceHeadersPromise.done(headers => {
+			this.marketplaceHeadersPromise.then(headers => {
 				cb({ cancel: false, requestHeaders: objects.assign(details.requestHeaders, headers) });
 			});
 		});
@@ -382,18 +367,28 @@ export class CodeWindow implements ICodeWindow {
 		// App commands support
 		this.registerNavigationListenerOn('app-command', 'browser-backward', 'browser-forward', false);
 
-		// Handle code that wants to open links
-		this._win.webContents.on('new-window', (event: Event, url: string) => {
-			event.preventDefault();
-
-			shell.openExternal(url);
-		});
-
 		// Window Focus
 		this._win.on('focus', () => {
 			this._lastFocusTime = Date.now();
 		});
 
+		// Window (Un)Maximize
+		this._win.on('maximize', (e) => {
+			if (this.currentConfig) {
+				this.currentConfig.maximized = true;
+			}
+
+			app.emit('browser-window-maximize', e, this._win);
+		});
+
+		this._win.on('unmaximize', (e) => {
+			if (this.currentConfig) {
+				this.currentConfig.maximized = false;
+			}
+
+			app.emit('browser-window-unmaximize', e, this._win);
+		});
+
 		// Window Fullscreen
 		this._win.on('enter-full-screen', () => {
 			this.sendWhenReady('vscode:enterFullScreen');
@@ -408,16 +403,6 @@ export class CodeWindow implements ICodeWindow {
 			this.logService.warn('[electron event]: fail to load, ', errorDescription);
 		});
 
-		// Prevent any kind of navigation triggered by the user!
-		// But do not touch this in dev version because it will prevent "Reload" from dev tools
-		if (this.environmentService.isBuilt) {
-			this._win.webContents.on('will-navigate', (event: Event) => {
-				if (event) {
-					event.preventDefault();
-				}
-			});
-		}
-
 		// Handle configuration changes
 		this.toDispose.push(this.configurationService.onDidChangeConfiguration(e => this.onConfigurationUpdated()));
 
@@ -494,7 +479,13 @@ export class CodeWindow implements ICodeWindow {
 		});
 	}
 
-	public load(config: IWindowConfiguration, isReload?: boolean, disableExtensions?: boolean): void {
+	addTabbedWindow(window: ICodeWindow): void {
+		if (isMacintosh) {
+			this._win.addTabbedWindow(window.win);
+		}
+	}
+
+	load(config: IWindowConfiguration, isReload?: boolean, disableExtensions?: boolean): void {
 
 		// If this is the first time the window is loaded, we associate the paths
 		// directly with the window because we assume the loading will just work
@@ -535,7 +526,7 @@ export class CodeWindow implements ICodeWindow {
 		}
 
 		// Load URL
-		mark('main:loadWindow');
+		perf.mark('main:loadWindow');
 		this._win.loadURL(this.getUrl(configuration));
 
 		// Make window visible if it did not open in N seconds because this indicates an error
@@ -551,7 +542,7 @@ export class CodeWindow implements ICodeWindow {
 		}
 	}
 
-	public reload(configuration?: IWindowConfiguration, cli?: ParsedArgs): void {
+	reload(configuration?: IWindowConfiguration, cli?: ParsedArgs): void {
 
 		// If config is not provided, copy our current one
 		if (!configuration) {
@@ -605,14 +596,12 @@ export class CodeWindow implements ICodeWindow {
 		windowConfiguration.highContrast = isWindows && autoDetectHighContrast && systemPreferences.isInvertedColorScheme();
 		windowConfiguration.accessibilitySupport = app.isAccessibilitySupportEnabled();
 
-		// Theme
-		windowConfiguration.baseTheme = this.getBaseTheme();
-		windowConfiguration.backgroundColor = this.getBackgroundColor();
+		// Title style related
+		windowConfiguration.maximized = this._win.isMaximized();
+		windowConfiguration.frameless = this.hasHiddenTitleBarStyle() && !isMacintosh;
 
-		// Perf Counters
-		windowConfiguration.perfEntries = exportEntries();
-		windowConfiguration.perfStartTime = (<any>global).perfStartTime;
-		windowConfiguration.perfWindowLoadTime = Date.now();
+		// Dump Perf Counters
+		windowConfiguration.perfEntries = perf.exportEntries();
 
 		// Config (combination of process.argv and window configuration)
 		const environment = parseArgs(process.argv);
@@ -623,35 +612,10 @@ export class CodeWindow implements ICodeWindow {
 			}
 		}
 
-		return `${require.toUrl('vs/workbench/electron-browser/bootstrap/index.html')}?config=${encodeURIComponent(JSON.stringify(config))}`;
+		return `${require.toUrl('vs/code/electron-browser/workbench/workbench.html')}?config=${encodeURIComponent(JSON.stringify(config))}`;
 	}
 
-	private getBaseTheme(): string {
-		if (isWindows && systemPreferences.isInvertedColorScheme()) {
-			return 'hc-black';
-		}
-
-		const theme = this.stateService.getItem<string>(CodeWindow.themeStorageKey, 'vs-dark');
-
-		return theme.split(' ')[0];
-	}
-
-	private getBackgroundColor(): string {
-		if (isWindows && systemPreferences.isInvertedColorScheme()) {
-			return CodeWindow.DEFAULT_BG_HC_BLACK;
-		}
-
-		const background = this.stateService.getItem<string>(CodeWindow.themeBackgroundStorageKey, null);
-		if (!background) {
-			const baseTheme = this.getBaseTheme();
-
-			return baseTheme === 'hc-black' ? CodeWindow.DEFAULT_BG_HC_BLACK : (baseTheme === 'vs' ? CodeWindow.DEFAULT_BG_LIGHT : CodeWindow.DEFAULT_BG_DARK);
-		}
-
-		return background;
-	}
-
-	public serializeWindowState(): IWindowState {
+	serializeWindowState(): IWindowState {
 		if (!this._win) {
 			return defaultWindowState();
 		}
@@ -660,16 +624,24 @@ export class CodeWindow implements ICodeWindow {
 		if (this._win.isFullScreen()) {
 			const display = screen.getDisplayMatching(this.getBounds());
 
-			return {
+			const defaultState = defaultWindowState();
+
+			const res = {
 				mode: WindowMode.Fullscreen,
 				display: display ? display.id : void 0,
 
-				// still carry over window dimensions from previous sessions!
-				width: this.windowState.width,
-				height: this.windowState.height,
-				x: this.windowState.x,
-				y: this.windowState.y
+				// Still carry over window dimensions from previous sessions
+				// if we can compute it in fullscreen state.
+				// does not seem possible in all cases on Linux for example
+				// (https://github.com/Microsoft/vscode/issues/58218) so we
+				// fallback to the defaults in that case.
+				width: this.windowState.width || defaultState.width,
+				height: this.windowState.height || defaultState.height,
+				x: this.windowState.x || 0,
+				y: this.windowState.y || 0
 			};
+
+			return res;
 		}
 
 		const state: IWindowState = Object.create(null);
@@ -807,14 +779,14 @@ export class CodeWindow implements ICodeWindow {
 		return null;
 	}
 
-	public getBounds(): Electron.Rectangle {
+	getBounds(): Electron.Rectangle {
 		const pos = this._win.getPosition();
 		const dimension = this._win.getSize();
 
 		return { x: pos[0], y: pos[1], width: dimension[0], height: dimension[1] };
 	}
 
-	public toggleFullScreen(): void {
+	toggleFullScreen(): void {
 		const willBeFullScreen = !this._win.isFullScreen();
 
 		// set fullscreen flag on window
@@ -889,7 +861,7 @@ export class CodeWindow implements ICodeWindow {
 		}
 	}
 
-	public onWindowTitleDoubleClick(): void {
+	onWindowTitleDoubleClick(): void {
 
 		// Respect system settings on mac with regards to title click on windows title
 		if (isMacintosh) {
@@ -916,25 +888,25 @@ export class CodeWindow implements ICodeWindow {
 		}
 	}
 
-	public close(): void {
+	close(): void {
 		if (this._win) {
 			this._win.close();
 		}
 	}
 
-	public sendWhenReady(channel: string, ...args: any[]): void {
+	sendWhenReady(channel: string, ...args: any[]): void {
 		this.ready().then(() => {
 			this.send(channel, ...args);
 		});
 	}
 
-	public send(channel: string, ...args: any[]): void {
+	send(channel: string, ...args: any[]): void {
 		if (this._win) {
 			this._win.webContents.send(channel, ...args);
 		}
 	}
 
-	public updateTouchBar(groups: ICommandAction[][]): void {
+	updateTouchBar(groups: ISerializableCommandAction[][]): void {
 		if (!isMacintosh) {
 			return; // only supported on macOS
 		}
@@ -960,15 +932,10 @@ export class CodeWindow implements ICodeWindow {
 			this.touchBarGroups.push(groupTouchBar);
 		}
 
-		// Ugly workaround for native crash on macOS 10.12.1. We are not
-		// leveraging the API for changing the ESC touch bar item.
-		// See https://github.com/electron/electron/issues/10442
-		(<any>this._win)._setEscapeTouchBarItem = () => { };
-
 		this._win.setTouchBar(new TouchBar({ items: this.touchBarGroups }));
 	}
 
-	private createTouchBarGroup(items: ICommandAction[] = []): Electron.TouchBarSegmentedControl {
+	private createTouchBarGroup(items: ISerializableCommandAction[] = []): Electron.TouchBarSegmentedControl {
 
 		// Group Segments
 		const segments = this.createTouchBarGroupSegments(items);
@@ -986,11 +953,11 @@ export class CodeWindow implements ICodeWindow {
 		return control;
 	}
 
-	private createTouchBarGroupSegments(items: ICommandAction[] = []): ITouchBarSegment[] {
+	private createTouchBarGroupSegments(items: ISerializableCommandAction[] = []): ITouchBarSegment[] {
 		const segments: ITouchBarSegment[] = items.map(item => {
 			let icon: Electron.NativeImage;
-			if (item.iconPath) {
-				icon = nativeImage.createFromPath(item.iconPath.dark);
+			if (item.iconLocation && item.iconLocation.dark.scheme === 'file') {
+				icon = nativeImage.createFromPath(URI.revive(item.iconLocation.dark).fsPath);
 				if (icon.isEmpty()) {
 					icon = void 0;
 				}
@@ -1006,7 +973,7 @@ export class CodeWindow implements ICodeWindow {
 		return segments;
 	}
 
-	public dispose(): void {
+	dispose(): void {
 		if (this.showTimeoutHandle) {
 			clearTimeout(this.showTimeoutHandle);
 		}
diff --git a/src/vs/code/electron-main/windows.ts b/src/vs/code/electron-main/windows.ts
index f1b2021abc3..a67b887acd4 100644
--- a/src/vs/code/electron-main/windows.ts
+++ b/src/vs/code/electron-main/windows.ts
@@ -6,7 +6,7 @@
 'use strict';
 
 import { basename, normalize, join, dirname } from 'path';
-import * as fs from 'original-fs';
+import * as fs from 'fs';
 import { localize } from 'vs/nls';
 import * as arrays from 'vs/base/common/arrays';
 import { assign, mixin, equals } from 'vs/base/common/objects';
@@ -14,29 +14,31 @@ import { IBackupMainService } from 'vs/platform/backup/common/backup';
 import { IEnvironmentService, ParsedArgs } from 'vs/platform/environment/common/environment';
 import { IStateService } from 'vs/platform/state/common/state';
 import { CodeWindow, defaultWindowState } from 'vs/code/electron-main/window';
+import { hasArgs, asArray } from 'vs/platform/environment/node/argv';
 import { ipcMain as ipc, screen, BrowserWindow, dialog, systemPreferences, app } from 'electron';
 import { IPathWithLineAndColumn, parseLineAndColumnAware } from 'vs/code/node/paths';
 import { ILifecycleService, UnloadReason, IWindowUnloadEvent } from 'vs/platform/lifecycle/electron-main/lifecycleMain';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { ILogService } from 'vs/platform/log/common/log';
 import { IWindowSettings, OpenContext, IPath, IWindowConfiguration, INativeOpenDialogOptions, ReadyState, IPathsToWaitFor, IEnterWorkspaceResult, IMessageBoxResult } from 'vs/platform/windows/common/windows';
-import { getLastActiveWindow, findBestWindowOrFolderForFile, findWindowOnWorkspace, findWindowOnExtensionDevelopmentPath, findWindowOnWorkspaceOrFolderPath } from 'vs/code/node/windowsFinder';
+import { getLastActiveWindow, findBestWindowOrFolderForFile, findWindowOnWorkspace, findWindowOnExtensionDevelopmentPath, findWindowOnWorkspaceOrFolderUri } from 'vs/code/node/windowsFinder';
 import { Event as CommonEvent, Emitter } from 'vs/base/common/event';
 import product from 'vs/platform/node/product';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { isEqual } from 'vs/base/common/paths';
 import { IWindowsMainService, IOpenConfiguration, IWindowsCountChangedEvent, ICodeWindow, IWindowState as ISingleWindowState, WindowMode } from 'vs/platform/windows/electron-main/windows';
 import { IHistoryMainService } from 'vs/platform/history/common/history';
 import { IProcessEnvironment, isLinux, isMacintosh, isWindows } from 'vs/base/common/platform';
 import { TPromise } from 'vs/base/common/winjs.base';
-import { IWorkspacesMainService, IWorkspaceIdentifier, ISingleFolderWorkspaceIdentifier, WORKSPACE_FILTER, isSingleFolderWorkspaceIdentifier, IWorkspaceFolderCreationData } from 'vs/platform/workspaces/common/workspaces';
+import { IWorkspacesMainService, IWorkspaceIdentifier, WORKSPACE_FILTER, IWorkspaceFolderCreationData, ISingleFolderWorkspaceIdentifier, isSingleFolderWorkspaceIdentifier } from 'vs/platform/workspaces/common/workspaces';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { mnemonicButtonLabel } from 'vs/base/common/labels';
 import { Schemas } from 'vs/base/common/network';
 import { normalizeNFC } from 'vs/base/common/normalization';
-import URI from 'vs/base/common/uri';
-import { Queue } from 'vs/base/common/async';
+import { URI } from 'vs/base/common/uri';
+import { Queue, timeout } from 'vs/base/common/async';
 import { exists } from 'vs/base/node/pfs';
+import { getComparisonKey, isEqual, normalizePath } from 'vs/base/common/resources';
+import { endsWith } from 'vs/base/common/strings';
 
 enum WindowError {
 	UNRESPONSIVE,
@@ -49,11 +51,15 @@ interface INewWindowState extends ISingleWindowState {
 
 interface IWindowState {
 	workspace?: IWorkspaceIdentifier;
-	folderPath?: string;
+	folderUri?: URI;
 	backupPath: string;
 	uiState: ISingleWindowState;
 }
 
+interface IBackwardCompatibleWindowState extends IWindowState {
+	folderPath?: string;
+}
+
 interface IWindowsState {
 	lastActiveWindow?: IWindowState;
 	lastPluginDevelopmentHostWindow?: IWindowState;
@@ -67,7 +73,7 @@ interface IOpenBrowserWindowOptions {
 	cli?: ParsedArgs;
 
 	workspace?: IWorkspaceIdentifier;
-	folderPath?: string;
+	folderUri?: URI;
 
 	initialStartup?: boolean;
 
@@ -77,6 +83,7 @@ interface IOpenBrowserWindowOptions {
 	filesToWait?: IPathsToWaitFor;
 
 	forceNewWindow?: boolean;
+	forceNewTabbedWindow?: boolean;
 	windowToUse?: ICodeWindow;
 
 	emptyWindowBackupFolder?: string;
@@ -88,7 +95,7 @@ interface IPathToOpen extends IPath {
 	workspace?: IWorkspaceIdentifier;
 
 	// the folder path for a Code instance to open
-	folderPath?: string;
+	folderUri?: URI;
 
 	// the backup spath for a Code instance to use
 	backupPath?: string;
@@ -144,7 +151,7 @@ export class WindowsManager implements IWindowsMainService {
 		@IWorkspacesMainService private workspacesMainService: IWorkspacesMainService,
 		@IInstantiationService private instantiationService: IInstantiationService
 	) {
-		this.windowsState = this.stateService.getItem<IWindowsState>(WindowsManager.windowsStateStorageKey) || { openedWindows: [] };
+		this.windowsState = this.getWindowsState();
 		if (!Array.isArray(this.windowsState.openedWindows)) {
 			this.windowsState.openedWindows = [];
 		}
@@ -153,7 +160,31 @@ export class WindowsManager implements IWindowsMainService {
 		this.workspacesManager = new WorkspacesManager(workspacesMainService, backupMainService, environmentService, this);
 	}
 
-	public ready(initialUserEnv: IProcessEnvironment): void {
+	private getWindowsState(): IWindowsState {
+		const windowsState = this.stateService.getItem<IWindowsState>(WindowsManager.windowsStateStorageKey) || { openedWindows: [] };
+		if (windowsState.lastActiveWindow) {
+			windowsState.lastActiveWindow = this.revive(windowsState.lastActiveWindow);
+		}
+		if (windowsState.lastPluginDevelopmentHostWindow) {
+			windowsState.lastPluginDevelopmentHostWindow = this.revive(windowsState.lastPluginDevelopmentHostWindow);
+		}
+		if (windowsState.openedWindows) {
+			windowsState.openedWindows = windowsState.openedWindows.map(windowState => this.revive(windowState));
+		}
+		return windowsState;
+	}
+
+	private revive(windowState: IWindowState): IWindowState {
+		if (windowState.folderUri) {
+			windowState.folderUri = URI.revive(windowState.folderUri);
+		}
+		if ((<IBackwardCompatibleWindowState>windowState).folderPath) {
+			windowState.folderUri = URI.file((<IBackwardCompatibleWindowState>windowState).folderPath);
+		}
+		return windowState;
+	}
+
+	ready(initialUserEnv: IProcessEnvironment): void {
 		this.initialUserEnv = initialUserEnv;
 
 		this.registerListeners();
@@ -294,10 +325,10 @@ export class WindowsManager implements IWindowsMainService {
 		}
 
 		// Any non extension host window with same workspace or folder
-		else if (!win.isExtensionDevelopmentHost && (!!win.openedWorkspace || !!win.openedFolderPath)) {
+		else if (!win.isExtensionDevelopmentHost && (!!win.openedWorkspace || !!win.openedFolderUri)) {
 			this.windowsState.openedWindows.forEach(o => {
 				const sameWorkspace = win.openedWorkspace && o.workspace && o.workspace.id === win.openedWorkspace.id;
-				const sameFolder = win.openedFolderPath && isEqual(o.folderPath, win.openedFolderPath, !isLinux /* ignorecase */);
+				const sameFolder = win.openedFolderUri && o.folderUri && isEqual(o.folderUri, win.openedFolderUri);
 
 				if (sameWorkspace || sameFolder) {
 					o.uiState = state.uiState;
@@ -317,27 +348,28 @@ export class WindowsManager implements IWindowsMainService {
 	private toWindowState(win: ICodeWindow): IWindowState {
 		return {
 			workspace: win.openedWorkspace,
-			folderPath: win.openedFolderPath,
+			folderUri: win.openedFolderUri,
 			backupPath: win.backupPath,
 			uiState: win.serializeWindowState()
 		};
 	}
 
-	public open(openConfig: IOpenConfiguration): ICodeWindow[] {
+	open(openConfig: IOpenConfiguration): ICodeWindow[] {
+		this.logService.trace('windowsManager#open');
 		openConfig = this.validateOpenConfig(openConfig);
 
 		let pathsToOpen = this.getPathsToOpen(openConfig);
 
 		// When run with --add, take the folders that are to be opened as
 		// folders that should be added to the currently active window.
-		let foldersToAdd: IPath[] = [];
+		let foldersToAdd: URI[] = [];
 		if (openConfig.addMode) {
-			foldersToAdd = pathsToOpen.filter(path => !!path.folderPath).map(path => ({ filePath: path.folderPath }));
-			pathsToOpen = pathsToOpen.filter(path => !path.folderPath);
+			foldersToAdd = pathsToOpen.filter(path => !!path.folderUri).map(path => path.folderUri);
+			pathsToOpen = pathsToOpen.filter(path => !path.folderUri);
 		}
 
-		let filesToOpen = pathsToOpen.filter(path => !!path.filePath && !path.createFilePath);
-		let filesToCreate = pathsToOpen.filter(path => !!path.filePath && path.createFilePath);
+		let filesToOpen = pathsToOpen.filter(path => !!path.fileUri && !path.createFilePath);
+		let filesToCreate = pathsToOpen.filter(path => !!path.fileUri && path.createFilePath);
 
 		// When run with --diff, take the files to open as files to diff
 		// if there are exactly two files provided.
@@ -362,12 +394,12 @@ export class WindowsManager implements IWindowsMainService {
 		//
 		// These are windows to open to show either folders or files (including diffing files or creating them)
 		//
-		const foldersToOpen = arrays.distinct(pathsToOpen.filter(win => win.folderPath && !win.filePath).map(win => win.folderPath), folder => isLinux ? folder : folder.toLowerCase()); // prevent duplicates
+		const foldersToOpen = arrays.distinct(pathsToOpen.filter(win => win.folderUri && !win.fileUri).map(win => win.folderUri), folder => getComparisonKey(folder)); // prevent duplicates
 
 		//
 		// These are windows to restore because of hot-exit or from previous session (only performed once on startup!)
 		//
-		let foldersToRestore: string[] = [];
+		let foldersToRestore: URI[] = [];
 		let workspacesToRestore: IWorkspaceIdentifier[] = [];
 		let emptyToRestore: string[] = [];
 		if (openConfig.initialStartup && !openConfig.cli.extensionDevelopmentPath && !openConfig.cli['disable-restore-windows']) {
@@ -377,21 +409,22 @@ export class WindowsManager implements IWindowsMainService {
 			workspacesToRestore.push(...this.workspacesMainService.getUntitledWorkspacesSync());	// collect from previous window session
 
 			emptyToRestore = this.backupMainService.getEmptyWindowBackupPaths();
-			emptyToRestore.push(...pathsToOpen.filter(w => !w.workspace && !w.folderPath && w.backupPath).map(w => basename(w.backupPath))); // add empty windows with backupPath
+			emptyToRestore.push(...pathsToOpen.filter(w => !w.workspace && !w.folderUri && w.backupPath).map(w => basename(w.backupPath))); // add empty windows with backupPath
 			emptyToRestore = arrays.distinct(emptyToRestore); // prevent duplicates
 		}
 
 		//
 		// These are empty windows to open
 		//
-		const emptyToOpen = pathsToOpen.filter(win => !win.workspace && !win.folderPath && !win.filePath && !win.backupPath).length;
+		const emptyToOpen = pathsToOpen.filter(win => !win.workspace && !win.folderUri && !win.fileUri && !win.backupPath).length;
 
 		// Open based on config
 		const usedWindows = this.doOpen(openConfig, workspacesToOpen, workspacesToRestore, foldersToOpen, foldersToRestore, emptyToRestore, emptyToOpen, filesToOpen, filesToCreate, filesToDiff, filesToWait, foldersToAdd);
 
 		// Make sure to pass focus to the most relevant of the windows if we open multiple
 		if (usedWindows.length > 1) {
-			let focusLastActive = this.windowsState.lastActiveWindow && !openConfig.forceEmpty && !openConfig.cli._.length && (!openConfig.pathsToOpen || !openConfig.pathsToOpen.length);
+
+			let focusLastActive = this.windowsState.lastActiveWindow && !openConfig.forceEmpty && !hasArgs(openConfig.cli._) && !hasArgs(openConfig.cli['file-uri']) && !hasArgs(openConfig.cli['folder-uri']) && !(openConfig.urisToOpen && openConfig.urisToOpen.length);
 			let focusLastOpened = true;
 			let focusLastWindow = true;
 
@@ -410,9 +443,9 @@ export class WindowsManager implements IWindowsMainService {
 				for (let i = usedWindows.length - 1; i >= 0; i--) {
 					const usedWindow = usedWindows[i];
 					if (
-						(usedWindow.openedWorkspace && workspacesToRestore.some(workspace => workspace.id === usedWindow.openedWorkspace.id)) || 	// skip over restored workspace
-						(usedWindow.openedFolderPath && foldersToRestore.some(folder => folder === usedWindow.openedFolderPath)) ||					// skip over restored folder
-						(usedWindow.backupPath && emptyToRestore.some(empty => empty === basename(usedWindow.backupPath)))							// skip over restored empty window
+						(usedWindow.openedWorkspace && workspacesToRestore.some(workspace => workspace.id === usedWindow.openedWorkspace.id)) || 							// skip over restored workspace
+						(usedWindow.openedFolderUri && foldersToRestore.some(folder => isEqual(folder, usedWindow.openedFolderUri))) ||	// skip over restored folder
+						(usedWindow.backupPath && emptyToRestore.some(empty => empty === basename(usedWindow.backupPath)))													// skip over restored empty window
 					) {
 						continue;
 					}
@@ -433,13 +466,13 @@ export class WindowsManager implements IWindowsMainService {
 		// Also do not add paths when files are opened for diffing, only if opened individually
 		if (!usedWindows.some(w => w.isExtensionDevelopmentHost) && !openConfig.cli.diff) {
 			const recentlyOpenedWorkspaces: (IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier)[] = [];
-			const recentlyOpenedFiles: string[] = [];
+			const recentlyOpenedFiles: URI[] = [];
 
 			pathsToOpen.forEach(win => {
-				if (win.workspace || win.folderPath) {
-					recentlyOpenedWorkspaces.push(win.workspace || win.folderPath);
-				} else if (win.filePath) {
-					recentlyOpenedFiles.push(win.filePath);
+				if (win.workspace || win.folderUri) {
+					recentlyOpenedWorkspaces.push(win.workspace || win.folderUri);
+				} else if (win.fileUri) {
+					recentlyOpenedFiles.push(win.fileUri);
 				}
 			});
 
@@ -452,7 +485,7 @@ export class WindowsManager implements IWindowsMainService {
 		// used for the edit operation is closed or loaded to a different folder so that the waiting
 		// process can continue. We do this by deleting the waitMarkerFilePath.
 		if (openConfig.context === OpenContext.CLI && openConfig.cli.wait && openConfig.cli.waitMarkerFilePath && usedWindows.length === 1 && usedWindows[0]) {
-			this.waitForWindowCloseOrLoad(usedWindows[0].id).done(() => fs.unlink(openConfig.cli.waitMarkerFilePath, error => void 0));
+			this.waitForWindowCloseOrLoad(usedWindows[0].id).then(() => fs.unlink(openConfig.cli.waitMarkerFilePath, error => void 0));
 		}
 
 		return usedWindows;
@@ -472,15 +505,15 @@ export class WindowsManager implements IWindowsMainService {
 		openConfig: IOpenConfiguration,
 		workspacesToOpen: IWorkspaceIdentifier[],
 		workspacesToRestore: IWorkspaceIdentifier[],
-		foldersToOpen: string[],
-		foldersToRestore: string[],
+		foldersToOpen: URI[],
+		foldersToRestore: URI[],
 		emptyToRestore: string[],
 		emptyToOpen: number,
 		filesToOpen: IPath[],
 		filesToCreate: IPath[],
 		filesToDiff: IPath[],
 		filesToWait: IPathsToWaitFor,
-		foldersToAdd: IPath[]
+		foldersToAdd: URI[]
 	) {
 		const usedWindows: ICodeWindow[] = [];
 
@@ -509,17 +542,10 @@ export class WindowsManager implements IWindowsMainService {
 				newWindow: openFilesInNewWindow,
 				reuseWindow: openConfig.forceReuseWindow,
 				context: openConfig.context,
-				filePath: fileToCheck && fileToCheck.filePath,
-				userHome: this.environmentService.userHome,
+				fileUri: fileToCheck && fileToCheck.fileUri,
 				workspaceResolver: workspace => this.workspacesMainService.resolveWorkspaceSync(workspace.configPath)
 			});
 
-			// Special case: we started with --wait and we got back a folder to open. In this case
-			// we actually prefer to not open the folder but operate purely on the file.
-			if (typeof bestWindowOrFolder === 'string' && filesToWait) {
-				bestWindowOrFolder = !openFilesInNewWindow ? this.getLastActiveWindow() : null;
-			}
-
 			// We found a window to open the files in
 			if (bestWindowOrFolder instanceof CodeWindow) {
 
@@ -529,8 +555,8 @@ export class WindowsManager implements IWindowsMainService {
 				}
 
 				// Window is single folder
-				else if (bestWindowOrFolder.openedFolderPath) {
-					foldersToOpen.push(bestWindowOrFolder.openedFolderPath);
+				else if (bestWindowOrFolder.openedFolderUri) {
+					foldersToOpen.push(bestWindowOrFolder.openedFolderUri);
 				}
 
 				// Window is empty
@@ -547,11 +573,6 @@ export class WindowsManager implements IWindowsMainService {
 				}
 			}
 
-			// We found a suitable folder to open: add it to foldersToOpen
-			else if (typeof bestWindowOrFolder === 'string') {
-				foldersToOpen.push(bestWindowOrFolder);
-			}
-
 			// Finally, if no window or folder is found, just open the files in an empty window
 			else {
 				usedWindows.push(this.openInBrowserWindow({
@@ -562,7 +583,8 @@ export class WindowsManager implements IWindowsMainService {
 					filesToCreate,
 					filesToDiff,
 					filesToWait,
-					forceNewWindow: true
+					forceNewWindow: true,
+					forceNewTabbedWindow: openConfig.forceNewTabbedWindow
 				}));
 
 				// Reset these because we handled them
@@ -614,7 +636,8 @@ export class WindowsManager implements IWindowsMainService {
 		}
 
 		// Handle folders to open (instructed and to restore)
-		const allFoldersToOpen = arrays.distinct([...foldersToRestore, ...foldersToOpen], folder => isLinux ? folder : folder.toLowerCase()); // prevent duplicates
+		const allFoldersToOpen = arrays.distinct([...foldersToRestore, ...foldersToOpen], folder => getComparisonKey(folder)); // prevent duplicates
+
 		if (allFoldersToOpen.length > 0) {
 
 			// Check for existing instances
@@ -636,12 +659,13 @@ export class WindowsManager implements IWindowsMainService {
 
 			// Open remaining ones
 			allFoldersToOpen.forEach(folderToOpen => {
-				if (windowsOnFolderPath.some(win => isEqual(win.openedFolderPath, folderToOpen, !isLinux /* ignorecase */))) {
+
+				if (windowsOnFolderPath.some(win => isEqual(win.openedFolderUri, folderToOpen))) {
 					return; // ignore folders that are already open
 				}
 
 				// Do open folder
-				usedWindows.push(this.doOpenFolderOrWorkspace(openConfig, { folderPath: folderToOpen }, openFolderInNewWindow, filesToOpen, filesToCreate, filesToDiff, filesToWait));
+				usedWindows.push(this.doOpenFolderOrWorkspace(openConfig, { folderUri: folderToOpen }, openFolderInNewWindow, filesToOpen, filesToCreate, filesToDiff, filesToWait));
 
 				// Reset these because we handled them
 				filesToOpen = [];
@@ -665,6 +689,7 @@ export class WindowsManager implements IWindowsMainService {
 					filesToDiff,
 					filesToWait,
 					forceNewWindow: true,
+					forceNewTabbedWindow: openConfig.forceNewTabbedWindow,
 					emptyWindowBackupFolder
 				}));
 
@@ -685,7 +710,8 @@ export class WindowsManager implements IWindowsMainService {
 					userEnv: openConfig.userEnv,
 					cli: openConfig.cli,
 					initialStartup: openConfig.initialStartup,
-					forceNewWindow: openFolderInNewWindow
+					forceNewWindow: openFolderInNewWindow,
+					forceNewTabbedWindow: openConfig.forceNewTabbedWindow
 				}));
 
 				openFolderInNewWindow = true; // any other window to open must open in new window then
@@ -706,7 +732,7 @@ export class WindowsManager implements IWindowsMainService {
 		return window;
 	}
 
-	private doAddFoldersToExistingWidow(window: ICodeWindow, foldersToAdd: IPath[]): ICodeWindow {
+	private doAddFoldersToExistingWidow(window: ICodeWindow, foldersToAdd: URI[]): ICodeWindow {
 		window.focus(); // make sure window has focus
 
 		window.ready().then(readyWindow => {
@@ -726,12 +752,13 @@ export class WindowsManager implements IWindowsMainService {
 			cli: openConfig.cli,
 			initialStartup: openConfig.initialStartup,
 			workspace: folderOrWorkspace.workspace,
-			folderPath: folderOrWorkspace.folderPath,
+			folderUri: folderOrWorkspace.folderUri,
 			filesToOpen,
 			filesToCreate,
 			filesToDiff,
 			filesToWait,
 			forceNewWindow,
+			forceNewTabbedWindow: openConfig.forceNewTabbedWindow,
 			windowToUse
 		});
 
@@ -743,7 +770,7 @@ export class WindowsManager implements IWindowsMainService {
 		let isCommandLineOrAPICall = false;
 
 		// Extract paths: from API
-		if (openConfig.pathsToOpen && openConfig.pathsToOpen.length > 0) {
+		if (openConfig.urisToOpen && openConfig.urisToOpen.length > 0) {
 			windowsToOpen = this.doExtractPathsFromAPI(openConfig);
 			isCommandLineOrAPICall = true;
 		}
@@ -754,7 +781,7 @@ export class WindowsManager implements IWindowsMainService {
 		}
 
 		// Extract paths: from CLI
-		else if (openConfig.cli._.length > 0) {
+		else if (hasArgs(openConfig.cli._) || hasArgs(openConfig.cli['folder-uri']) || hasArgs(openConfig.cli['file-uri'])) {
 			windowsToOpen = this.doExtractPathsFromCLI(openConfig.cli);
 			isCommandLineOrAPICall = true;
 		}
@@ -769,13 +796,13 @@ export class WindowsManager implements IWindowsMainService {
 		// If we are in addMode, we should not do this because in that case all
 		// folders should be added to the existing window.
 		if (!openConfig.addMode && isCommandLineOrAPICall) {
-			const foldersToOpen = windowsToOpen.filter(path => !!path.folderPath);
+			const foldersToOpen = windowsToOpen.filter(path => !!path.folderUri);
 			if (foldersToOpen.length > 1) {
-				const workspace = this.workspacesMainService.createWorkspaceSync(foldersToOpen.map(folder => ({ uri: URI.file(folder.folderPath) })));
+				const workspace = this.workspacesMainService.createWorkspaceSync(foldersToOpen.map(folder => ({ uri: folder.folderUri })));
 
 				// Add workspace and remove folders thereby
 				windowsToOpen.push({ workspace });
-				windowsToOpen = windowsToOpen.filter(path => !path.folderPath);
+				windowsToOpen = windowsToOpen.filter(path => !path.folderUri);
 			}
 		}
 
@@ -783,35 +810,74 @@ export class WindowsManager implements IWindowsMainService {
 	}
 
 	private doExtractPathsFromAPI(openConfig: IOpenConfiguration): IPath[] {
-		let pathsToOpen = openConfig.pathsToOpen.map(pathToOpen => {
-			const path = this.parsePath(pathToOpen, { gotoLineMode: openConfig.cli && openConfig.cli.goto, forceOpenWorkspaceAsFile: openConfig.forceOpenWorkspaceAsFile });
+		let pathsToOpen = [];
+		let parseOptions = { gotoLineMode: openConfig.cli && openConfig.cli.goto, forceOpenWorkspaceAsFile: openConfig.forceOpenWorkspaceAsFile };
+		for (const pathToOpen of openConfig.urisToOpen) {
+			if (!pathToOpen) {
+				continue;
+			}
 
-			// Warn if the requested path to open does not exist
-			if (!path) {
+			const path = this.parseUri(pathToOpen, openConfig.forceOpenWorkspaceAsFile, parseOptions);
+			if (path) {
+				pathsToOpen.push(path);
+			} else {
+				// Warn about the invalid URI or path
+
+				let message, detail;
+				if (pathToOpen.scheme === Schemas.file) {
+					message = localize('pathNotExistTitle', "Path does not exist");
+					detail = localize('pathNotExistDetail', "The path '{0}' does not seem to exist anymore on disk.", pathToOpen.fsPath);
+				} else {
+					message = localize('uriInvalidTitle', "URI can not be opened");
+					detail = localize('uriInvalidDetail', "The URI '{0}' is not valid and can not be opened.", pathToOpen.toString());
+				}
 				const options: Electron.MessageBoxOptions = {
 					title: product.nameLong,
 					type: 'info',
 					buttons: [localize('ok', "OK")],
-					message: localize('pathNotExistTitle', "Path does not exist"),
-					detail: localize('pathNotExistDetail', "The path '{0}' does not seem to exist anymore on disk.", pathToOpen),
+					message,
+					detail,
 					noLink: true
 				};
 
 				this.dialogs.showMessageBox(options, this.getFocusedWindow());
 			}
-
-			return path;
-		});
-
-		// get rid of nulls
-		pathsToOpen = arrays.coalesce(pathsToOpen);
-
+		}
 		return pathsToOpen;
 	}
 
 	private doExtractPathsFromCLI(cli: ParsedArgs): IPath[] {
-		const pathsToOpen = arrays.coalesce(cli._.map(candidate => this.parsePath(candidate, { ignoreFileNotFound: true, gotoLineMode: cli.goto })));
-		if (pathsToOpen.length > 0) {
+		const pathsToOpen = [];
+		const parseOptions = { ignoreFileNotFound: true, gotoLineMode: cli.goto };
+
+		// folder uris
+		const folderUris = asArray(cli['folder-uri']);
+		for (let folderUri of folderUris) {
+			const path = this.parseUri(this.argToUri(folderUri), false, parseOptions);
+			if (path) {
+				pathsToOpen.push(path);
+			}
+		}
+
+		// file uris
+		const fileUris = asArray(cli['file-uri']);
+		for (let fileUri of fileUris) {
+			const path = this.parseUri(this.argToUri(fileUri), true, parseOptions);
+			if (path) {
+				pathsToOpen.push(path);
+			}
+		}
+
+		// folder or file paths
+		const cliArgs = asArray(cli._);
+		for (let cliArg of cliArgs) {
+			const path = this.parsePath(cliArg, parseOptions);
+			if (path) {
+				pathsToOpen.push(path);
+			}
+		}
+
+		if (pathsToOpen.length) {
 			return pathsToOpen;
 		}
 
@@ -843,9 +909,9 @@ export class WindowsManager implements IWindowsMainService {
 					}
 
 					// folder (if path is valid)
-					else if (lastActiveWindow.folderPath) {
-						const validatedFolder = this.parsePath(lastActiveWindow.folderPath);
-						if (validatedFolder && validatedFolder.folderPath) {
+					else if (lastActiveWindow.folderUri) {
+						const validatedFolder = this.parseUri(lastActiveWindow.folderUri, false);
+						if (validatedFolder && validatedFolder.folderUri) {
 							return [validatedFolder];
 						}
 					}
@@ -871,16 +937,16 @@ export class WindowsManager implements IWindowsMainService {
 				windowsToOpen.push(...workspaceCandidates.map(candidate => this.parsePath(candidate.configPath)).filter(window => window && window.workspace));
 
 				// Folders
-				const folderCandidates = this.windowsState.openedWindows.filter(w => !!w.folderPath).map(w => w.folderPath);
-				if (lastActiveWindow && lastActiveWindow.folderPath) {
-					folderCandidates.push(lastActiveWindow.folderPath);
+				const folderCandidates = this.windowsState.openedWindows.filter(w => !!w.folderUri).map(w => w.folderUri);
+				if (lastActiveWindow && lastActiveWindow.folderUri) {
+					folderCandidates.push(lastActiveWindow.folderUri);
 				}
-				windowsToOpen.push(...folderCandidates.map(candidate => this.parsePath(candidate)).filter(window => window && window.folderPath));
+				windowsToOpen.push(...folderCandidates.map(candidate => this.parseUri(candidate, false)).filter(window => window && window.folderUri));
 
 				// Windows that were Empty
 				if (restoreWindows === 'all') {
-					const lastOpenedEmpty = this.windowsState.openedWindows.filter(w => !w.workspace && !w.folderPath && w.backupPath).map(w => w.backupPath);
-					const lastActiveEmpty = lastActiveWindow && !lastActiveWindow.workspace && !lastActiveWindow.folderPath && lastActiveWindow.backupPath;
+					const lastOpenedEmpty = this.windowsState.openedWindows.filter(w => !w.workspace && !w.folderUri && w.backupPath).map(w => w.backupPath);
+					const lastActiveEmpty = lastActiveWindow && !lastActiveWindow.workspace && !lastActiveWindow.folderUri && lastActiveWindow.backupPath;
 					if (lastActiveEmpty) {
 						lastOpenedEmpty.push(lastActiveEmpty);
 					}
@@ -915,6 +981,50 @@ export class WindowsManager implements IWindowsMainService {
 		return restoreWindows;
 	}
 
+	private argToUri(arg: string): URI {
+		try {
+			let uri = URI.parse(arg);
+			if (!uri.scheme) {
+				this.logService.error(`Invalid URI input string, scheme missing: ${arg}`);
+				return null;
+			}
+			return uri;
+		} catch (e) {
+			this.logService.error(`Invalid URI input string: ${arg}, ${e.message}`);
+		}
+		return null;
+	}
+
+	private parseUri(uri: URI, isFile: boolean, options?: { ignoreFileNotFound?: boolean, gotoLineMode?: boolean, forceOpenWorkspaceAsFile?: boolean; }): IPathToOpen {
+		if (!uri || !uri.scheme) {
+			return null;
+		}
+		if (uri.scheme === Schemas.file) {
+			return this.parsePath(uri.fsPath, options);
+		}
+		// normalize URI
+		uri = normalizePath(uri);
+		if (endsWith(uri.path, '/')) {
+			uri = uri.with({ path: uri.path.substr(0, uri.path.length - 1) });
+		}
+		if (isFile) {
+			if (options && options.gotoLineMode) {
+				const parsedPath = parseLineAndColumnAware(uri.path);
+				return {
+					fileUri: uri.with({ path: parsedPath.path }),
+					lineNumber: parsedPath.line,
+					columnNumber: parsedPath.column
+				};
+			}
+			return {
+				fileUri: uri
+			};
+		}
+		return {
+			folderUri: uri
+		};
+	}
+
 	private parsePath(anyPath: string, options?: { ignoreFileNotFound?: boolean, gotoLineMode?: boolean, forceOpenWorkspaceAsFile?: boolean; }): IPathToOpen {
 		if (!anyPath) {
 			return null;
@@ -944,7 +1054,7 @@ export class WindowsManager implements IWindowsMainService {
 
 					// File
 					return {
-						filePath: candidate,
+						fileUri: URI.file(candidate),
 						lineNumber: gotoLineMode ? parsedPath.line : void 0,
 						columnNumber: gotoLineMode ? parsedPath.column : void 0
 					};
@@ -955,15 +1065,16 @@ export class WindowsManager implements IWindowsMainService {
 				// over to us)
 				else if (candidateStat.isDirectory()) {
 					return {
-						folderPath: candidate
+						folderUri: URI.file(candidate)
 					};
 				}
 			}
 		} catch (error) {
-			this.historyMainService.removeFromRecentlyOpened([candidate]); // since file does not seem to exist anymore, remove from recent
+			const fileUri = URI.file(candidate);
+			this.historyMainService.removeFromRecentlyOpened([fileUri]); // since file does not seem to exist anymore, remove from recent
 
 			if (options && options.ignoreFileNotFound) {
-				return { filePath: candidate, createFilePath: true }; // assume this is a file that does not yet exist
+				return { fileUri, createFilePath: true }; // assume this is a file that does not yet exist
 			}
 		}
 
@@ -1011,7 +1122,7 @@ export class WindowsManager implements IWindowsMainService {
 		return { openFolderInNewWindow, openFilesInNewWindow };
 	}
 
-	public openExtensionDevelopmentHostWindow(openConfig: IOpenConfiguration): void {
+	openExtensionDevelopmentHostWindow(openConfig: IOpenConfiguration): void {
 
 		// Reload an existing extension development host window on the same path
 		// We currently do not allow more than one extension development window
@@ -1023,23 +1134,46 @@ export class WindowsManager implements IWindowsMainService {
 
 			return;
 		}
+		let folderUris = asArray(openConfig.cli['folder-uri']);
+		let fileUris = asArray(openConfig.cli['file-uri']);
+		let cliArgs = openConfig.cli._;
 
 		// Fill in previously opened workspace unless an explicit path is provided and we are not unit testing
-		if (openConfig.cli._.length === 0 && !openConfig.cli.extensionTestsPath) {
+		if (!cliArgs.length && !folderUris.length && !fileUris.length && !openConfig.cli.extensionTestsPath) {
 			const extensionDevelopmentWindowState = this.windowsState.lastPluginDevelopmentHostWindow;
-			const workspaceToOpen = extensionDevelopmentWindowState && (extensionDevelopmentWindowState.workspace || extensionDevelopmentWindowState.folderPath);
+			const workspaceToOpen = extensionDevelopmentWindowState && (extensionDevelopmentWindowState.workspace || extensionDevelopmentWindowState.folderUri);
 			if (workspaceToOpen) {
-				openConfig.cli._ = [isSingleFolderWorkspaceIdentifier(workspaceToOpen) ? workspaceToOpen : workspaceToOpen.configPath];
+				if (isSingleFolderWorkspaceIdentifier(workspaceToOpen)) {
+					if (workspaceToOpen.scheme === Schemas.file) {
+						cliArgs = [workspaceToOpen.fsPath];
+					} else {
+						folderUris = [workspaceToOpen.toString()];
+					}
+				} else {
+					cliArgs = [workspaceToOpen.configPath];
+				}
 			}
 		}
 
 		// Make sure we are not asked to open a workspace or folder that is already opened
-		if (openConfig.cli._.some(path => !!findWindowOnWorkspaceOrFolderPath(WindowsManager.WINDOWS, path))) {
-			openConfig.cli._ = [];
+		if (cliArgs.length && cliArgs.some(path => !!findWindowOnWorkspaceOrFolderUri(WindowsManager.WINDOWS, URI.file(path)))) {
+			cliArgs = [];
 		}
 
+		if (folderUris.length && folderUris.some(uri => !!findWindowOnWorkspaceOrFolderUri(WindowsManager.WINDOWS, this.argToUri(uri)))) {
+			folderUris = [];
+		}
+
+		if (fileUris.length && fileUris.some(uri => !!findWindowOnWorkspaceOrFolderUri(WindowsManager.WINDOWS, this.argToUri(uri)))) {
+			fileUris = [];
+		}
+
+		openConfig.cli._ = cliArgs;
+		openConfig.cli['folder-uri'] = folderUris;
+		openConfig.cli['file-uri'] = fileUris;
+
 		// Open it
-		this.open({ context: openConfig.context, cli: openConfig.cli, forceNewWindow: true, forceEmpty: openConfig.cli._.length === 0, userEnv: openConfig.userEnv });
+		this.open({ context: openConfig.context, cli: openConfig.cli, forceNewWindow: true, forceEmpty: !cliArgs.length && !folderUris.length && !fileUris.length, userEnv: openConfig.userEnv });
 	}
 
 	private openInBrowserWindow(options: IOpenBrowserWindowOptions): ICodeWindow {
@@ -1048,11 +1182,12 @@ export class WindowsManager implements IWindowsMainService {
 		const configuration: IWindowConfiguration = mixin({}, options.cli); // inherit all properties from CLI
 		configuration.appRoot = this.environmentService.appRoot;
 		configuration.machineId = this.machineId;
+		configuration.mainPid = process.pid;
 		configuration.execPath = process.execPath;
 		configuration.userEnv = assign({}, this.initialUserEnv, options.userEnv || {});
 		configuration.isInitialStartup = options.initialStartup;
 		configuration.workspace = options.workspace;
-		configuration.folderPath = options.folderPath;
+		configuration.folderUri = options.folderUri;
 		configuration.filesToOpen = options.filesToOpen;
 		configuration.filesToCreate = options.filesToCreate;
 		configuration.filesToDiff = options.filesToDiff;
@@ -1068,7 +1203,7 @@ export class WindowsManager implements IWindowsMainService {
 		}
 
 		let window: ICodeWindow;
-		if (!options.forceNewWindow) {
+		if (!options.forceNewWindow && !options.forceNewTabbedWindow) {
 			window = options.windowToUse || this.getLastActiveWindow();
 			if (window) {
 				window.focus();
@@ -1095,12 +1230,21 @@ export class WindowsManager implements IWindowsMainService {
 				state.mode = WindowMode.Normal;
 			}
 
+			// Create the window
 			window = this.instantiationService.createInstance(CodeWindow, {
 				state,
 				extensionDevelopmentPath: configuration.extensionDevelopmentPath,
 				isExtensionTestHost: !!configuration.extensionTestsPath
 			});
 
+			// Add as window tab if configured (macOS only)
+			if (options.forceNewTabbedWindow) {
+				const activeWindow = this.getLastActiveWindow();
+				if (activeWindow) {
+					activeWindow.addTabbedWindow(window);
+				}
+			}
+
 			// Add to our list of windows
 			WindowsManager.WINDOWS.push(window);
 
@@ -1135,15 +1279,15 @@ export class WindowsManager implements IWindowsMainService {
 		}
 
 		// Only load when the window has not vetoed this
-		this.lifecycleService.unload(window, UnloadReason.LOAD).done(veto => {
+		this.lifecycleService.unload(window, UnloadReason.LOAD).then(veto => {
 			if (!veto) {
 
 				// Register window for backups
 				if (!configuration.extensionDevelopmentPath) {
 					if (configuration.workspace) {
 						configuration.backupPath = this.backupMainService.registerWorkspaceBackupSync(configuration.workspace);
-					} else if (configuration.folderPath) {
-						configuration.backupPath = this.backupMainService.registerFolderBackupSync(configuration.folderPath);
+					} else if (configuration.folderUri) {
+						configuration.backupPath = this.backupMainService.registerFolderBackupSync(configuration.folderUri);
 					} else {
 						configuration.backupPath = this.backupMainService.registerEmptyWindowBackupSync(options.emptyWindowBackupFolder);
 					}
@@ -1180,8 +1324,8 @@ export class WindowsManager implements IWindowsMainService {
 			}
 
 			// Known Folder - load from stored settings
-			if (configuration.folderPath) {
-				const stateForFolder = this.windowsState.openedWindows.filter(o => isEqual(o.folderPath, configuration.folderPath, !isLinux /* ignorecase */)).map(o => o.uiState);
+			if (configuration.folderUri) {
+				const stateForFolder = this.windowsState.openedWindows.filter(o => o.folderUri && isEqual(o.folderUri, configuration.folderUri)).map(o => o.uiState);
 				if (stateForFolder.length) {
 					return stateForFolder[0];
 				}
@@ -1287,10 +1431,10 @@ export class WindowsManager implements IWindowsMainService {
 		return state;
 	}
 
-	public reload(win: ICodeWindow, cli?: ParsedArgs): void {
+	reload(win: ICodeWindow, cli?: ParsedArgs): void {
 
 		// Only reload when the window has not vetoed this
-		this.lifecycleService.unload(win, UnloadReason.RELOAD).done(veto => {
+		this.lifecycleService.unload(win, UnloadReason.RELOAD).then(veto => {
 			if (!veto) {
 				win.reload(void 0, cli);
 
@@ -1300,18 +1444,22 @@ export class WindowsManager implements IWindowsMainService {
 		});
 	}
 
-	public closeWorkspace(win: ICodeWindow): void {
+	closeWorkspace(win: ICodeWindow): void {
 		this.openInBrowserWindow({
 			cli: this.environmentService.args,
 			windowToUse: win
 		});
 	}
 
-	public saveAndEnterWorkspace(win: ICodeWindow, path: string): TPromise<IEnterWorkspaceResult> {
+	saveAndEnterWorkspace(win: ICodeWindow, path: string): TPromise<IEnterWorkspaceResult> {
 		return this.workspacesManager.saveAndEnterWorkspace(win, path).then(result => this.doEnterWorkspace(win, result));
 	}
 
-	public createAndEnterWorkspace(win: ICodeWindow, folders?: IWorkspaceFolderCreationData[], path?: string): TPromise<IEnterWorkspaceResult> {
+	enterWorkspace(win: ICodeWindow, path: string): TPromise<IEnterWorkspaceResult> {
+		return this.workspacesManager.enterWorkspace(win, path).then(result => this.doEnterWorkspace(win, result));
+	}
+
+	createAndEnterWorkspace(win: ICodeWindow, folders?: IWorkspaceFolderCreationData[], path?: string): TPromise<IEnterWorkspaceResult> {
 		return this.workspacesManager.createAndEnterWorkspace(win, folders, path).then(result => this.doEnterWorkspace(win, result));
 	}
 
@@ -1326,7 +1474,7 @@ export class WindowsManager implements IWindowsMainService {
 		return result;
 	}
 
-	public pickWorkspaceAndOpen(options: INativeOpenDialogOptions): void {
+	pickWorkspaceAndOpen(options: INativeOpenDialogOptions): void {
 		this.workspacesManager.pickWorkspaceAndOpen(options);
 	}
 
@@ -1363,11 +1511,11 @@ export class WindowsManager implements IWindowsMainService {
 			// might be related to the fact that the untitled workspace prompt shows up async and this
 			// code can execute before the dialog is fully closed which then blocks the window from closing.
 			// Issue: https://github.com/Microsoft/vscode/issues/41989
-			return TPromise.timeout(0).then(() => veto);
+			return timeout(0).then(() => veto);
 		}));
 	}
 
-	public focusLastActive(cli: ParsedArgs, context: OpenContext): ICodeWindow {
+	focusLastActive(cli: ParsedArgs, context: OpenContext): ICodeWindow {
 		const lastActive = this.getLastActiveWindow();
 		if (lastActive) {
 			lastActive.focus();
@@ -1379,15 +1527,19 @@ export class WindowsManager implements IWindowsMainService {
 		return this.open({ context, cli, forceEmpty: true })[0];
 	}
 
-	public getLastActiveWindow(): ICodeWindow {
+	getLastActiveWindow(): ICodeWindow {
 		return getLastActiveWindow(WindowsManager.WINDOWS);
 	}
 
-	public openNewWindow(context: OpenContext): ICodeWindow[] {
+	openNewWindow(context: OpenContext): ICodeWindow[] {
 		return this.open({ context, cli: this.environmentService.args, forceNewWindow: true, forceEmpty: true });
 	}
 
-	public waitForWindowCloseOrLoad(windowId: number): TPromise<void> {
+	openNewTabbedWindow(context: OpenContext): ICodeWindow[] {
+		return this.open({ context, cli: this.environmentService.args, forceNewTabbedWindow: true, forceEmpty: true });
+	}
+
+	waitForWindowCloseOrLoad(windowId: number): TPromise<void> {
 		return new TPromise<void>(c => {
 			function handler(id: number) {
 				if (id === windowId) {
@@ -1403,7 +1555,7 @@ export class WindowsManager implements IWindowsMainService {
 		});
 	}
 
-	public sendToFocused(channel: string, ...args: any[]): void {
+	sendToFocused(channel: string, ...args: any[]): void {
 		const focusedWindow = this.getFocusedWindow() || this.getLastActiveWindow();
 
 		if (focusedWindow) {
@@ -1411,7 +1563,7 @@ export class WindowsManager implements IWindowsMainService {
 		}
 	}
 
-	public sendToAll(channel: string, payload?: any, windowIdsToIgnore?: number[]): void {
+	sendToAll(channel: string, payload?: any, windowIdsToIgnore?: number[]): void {
 		WindowsManager.WINDOWS.forEach(w => {
 			if (windowIdsToIgnore && windowIdsToIgnore.indexOf(w.id) >= 0) {
 				return; // do not send if we are instructed to ignore it
@@ -1421,7 +1573,7 @@ export class WindowsManager implements IWindowsMainService {
 		});
 	}
 
-	public getFocusedWindow(): ICodeWindow {
+	getFocusedWindow(): ICodeWindow {
 		const win = BrowserWindow.getFocusedWindow();
 		if (win) {
 			return this.getWindowById(win.id);
@@ -1430,7 +1582,7 @@ export class WindowsManager implements IWindowsMainService {
 		return null;
 	}
 
-	public getWindowById(windowId: number): ICodeWindow {
+	getWindowById(windowId: number): ICodeWindow {
 		const res = WindowsManager.WINDOWS.filter(w => w.id === windowId);
 		if (res && res.length === 1) {
 			return res[0];
@@ -1439,11 +1591,11 @@ export class WindowsManager implements IWindowsMainService {
 		return null;
 	}
 
-	public getWindows(): ICodeWindow[] {
+	getWindows(): ICodeWindow[] {
 		return WindowsManager.WINDOWS;
 	}
 
-	public getWindowCount(): number {
+	getWindowCount(): number {
 		return WindowsManager.WINDOWS.length;
 	}
 
@@ -1511,15 +1663,15 @@ export class WindowsManager implements IWindowsMainService {
 		this._onWindowClose.fire(win.id);
 	}
 
-	public pickFileFolderAndOpen(options: INativeOpenDialogOptions): void {
+	pickFileFolderAndOpen(options: INativeOpenDialogOptions): void {
 		this.doPickAndOpen(options, true /* pick folders */, true /* pick files */);
 	}
 
-	public pickFolderAndOpen(options: INativeOpenDialogOptions): void {
+	pickFolderAndOpen(options: INativeOpenDialogOptions): void {
 		this.doPickAndOpen(options, true /* pick folders */, false /* pick files */);
 	}
 
-	public pickFileAndOpen(options: INativeOpenDialogOptions): void {
+	pickFileAndOpen(options: INativeOpenDialogOptions): void {
 		this.doPickAndOpen(options, false /* pick folders */, true /* pick files */);
 	}
 
@@ -1557,19 +1709,19 @@ export class WindowsManager implements IWindowsMainService {
 		this.dialogs.pickAndOpen(internalOptions);
 	}
 
-	public showMessageBox(options: Electron.MessageBoxOptions, win?: ICodeWindow): TPromise<IMessageBoxResult> {
+	showMessageBox(options: Electron.MessageBoxOptions, win?: ICodeWindow): TPromise<IMessageBoxResult> {
 		return this.dialogs.showMessageBox(options, win);
 	}
 
-	public showSaveDialog(options: Electron.SaveDialogOptions, win?: ICodeWindow): TPromise<string> {
+	showSaveDialog(options: Electron.SaveDialogOptions, win?: ICodeWindow): TPromise<string> {
 		return this.dialogs.showSaveDialog(options, win);
 	}
 
-	public showOpenDialog(options: Electron.OpenDialogOptions, win?: ICodeWindow): TPromise<string[]> {
+	showOpenDialog(options: Electron.OpenDialogOptions, win?: ICodeWindow): TPromise<string[]> {
 		return this.dialogs.showOpenDialog(options, win);
 	}
 
-	public quit(): void {
+	quit(): void {
 
 		// If the user selected to exit from an extension development host window, do not quit, but just
 		// close the window unless this is the last window that is opened.
@@ -1609,8 +1761,8 @@ class Dialogs {
 		this.noWindowDialogQueue = new Queue<any>();
 	}
 
-	public pickAndOpen(options: INativeOpenDialogOptions): void {
-		this.getFileOrFolderPaths(options).then(paths => {
+	pickAndOpen(options: INativeOpenDialogOptions): void {
+		this.getFileOrFolderUris(options).then(paths => {
 			const numberOfPaths = paths ? paths.length : 0;
 
 			// Telemetry
@@ -1628,7 +1780,7 @@ class Dialogs {
 				this.windowsMainService.open({
 					context: OpenContext.DIALOG,
 					cli: this.environmentService.args,
-					pathsToOpen: paths,
+					urisToOpen: paths,
 					forceNewWindow: options.forceNewWindow,
 					forceOpenWorkspaceAsFile: options.dialogOptions && !equals(options.dialogOptions.filters, WORKSPACE_FILTER)
 				});
@@ -1636,7 +1788,7 @@ class Dialogs {
 		});
 	}
 
-	private getFileOrFolderPaths(options: IInternalNativeOpenDialogOptions): TPromise<string[]> {
+	private getFileOrFolderUris(options: IInternalNativeOpenDialogOptions): TPromise<URI[]> {
 
 		// Ensure dialog options
 		if (!options.dialogOptions) {
@@ -1674,7 +1826,7 @@ class Dialogs {
 				// Remember path in storage for next time
 				this.stateService.setItem(Dialogs.workingDirPickerStorageKey, dirname(paths[0]));
 
-				return paths;
+				return paths.map(path => URI.file(path));
 			}
 
 			return void 0;
@@ -1695,7 +1847,7 @@ class Dialogs {
 		return windowDialogQueue;
 	}
 
-	public showMessageBox(options: Electron.MessageBoxOptions, window?: ICodeWindow): TPromise<IMessageBoxResult> {
+	showMessageBox(options: Electron.MessageBoxOptions, window?: ICodeWindow): TPromise<IMessageBoxResult> {
 		return this.getDialogQueue(window).queue(() => {
 			return new TPromise((c, e) => {
 				dialog.showMessageBox(window ? window.win : void 0, options, (response: number, checkboxChecked: boolean) => {
@@ -1705,7 +1857,7 @@ class Dialogs {
 		});
 	}
 
-	public showSaveDialog(options: Electron.SaveDialogOptions, window?: ICodeWindow): TPromise<string> {
+	showSaveDialog(options: Electron.SaveDialogOptions, window?: ICodeWindow): TPromise<string> {
 
 		function normalizePath(path: string): string {
 			if (path && isMacintosh) {
@@ -1724,7 +1876,7 @@ class Dialogs {
 		});
 	}
 
-	public showOpenDialog(options: Electron.OpenDialogOptions, window?: ICodeWindow): TPromise<string[]> {
+	showOpenDialog(options: Electron.OpenDialogOptions, window?: ICodeWindow): TPromise<string[]> {
 
 		function normalizePaths(paths: string[]): string[] {
 			if (paths && paths.length > 0 && isMacintosh) {
@@ -1768,7 +1920,7 @@ class WorkspacesManager {
 	) {
 	}
 
-	public saveAndEnterWorkspace(window: ICodeWindow, path: string): TPromise<IEnterWorkspaceResult> {
+	saveAndEnterWorkspace(window: ICodeWindow, path: string): TPromise<IEnterWorkspaceResult> {
 		if (!window || !window.win || window.readyState !== ReadyState.READY || !window.openedWorkspace || !path || !this.isValidTargetWorkspacePath(window, path)) {
 			return TPromise.as(null); // return early if the window is not ready or disposed or does not have a workspace
 		}
@@ -1776,7 +1928,24 @@ class WorkspacesManager {
 		return this.doSaveAndOpenWorkspace(window, window.openedWorkspace, path);
 	}
 
-	public createAndEnterWorkspace(window: ICodeWindow, folders?: IWorkspaceFolderCreationData[], path?: string): TPromise<IEnterWorkspaceResult> {
+	enterWorkspace(window: ICodeWindow, path: string): TPromise<IEnterWorkspaceResult> {
+		if (!window || !window.win || window.readyState !== ReadyState.READY) {
+			return TPromise.as(null); // return early if the window is not ready or disposed
+		}
+
+		return this.isValidTargetWorkspacePath(window, path).then(isValid => {
+			if (!isValid) {
+				return TPromise.as<IEnterWorkspaceResult>(null); // return early if the workspace is not valid
+			}
+
+			return this.workspacesMainService.resolveWorkspace(path).then(workspace => {
+				return this.doOpenWorkspace(window, workspace);
+			});
+		});
+
+	}
+
+	createAndEnterWorkspace(window: ICodeWindow, folders?: IWorkspaceFolderCreationData[], path?: string): TPromise<IEnterWorkspaceResult> {
 		if (!window || !window.win || window.readyState !== ReadyState.READY) {
 			return TPromise.as(null); // return early if the window is not ready or disposed
 		}
@@ -1827,25 +1996,27 @@ class WorkspacesManager {
 			savePromise = TPromise.as(workspace);
 		}
 
-		return savePromise.then(workspace => {
-			window.focus();
-
-			// Register window for backups and migrate current backups over
-			let backupPath: string;
-			if (!window.config.extensionDevelopmentPath) {
-				backupPath = this.backupMainService.registerWorkspaceBackupSync(workspace, window.config.backupPath);
-			}
-
-			// Update window configuration properly based on transition to workspace
-			window.config.folderPath = void 0;
-			window.config.workspace = workspace;
-			window.config.backupPath = backupPath;
-
-			return { workspace, backupPath };
-		});
+		return savePromise.then(workspace => this.doOpenWorkspace(window, workspace));
 	}
 
-	public pickWorkspaceAndOpen(options: INativeOpenDialogOptions): void {
+	private doOpenWorkspace(window: ICodeWindow, workspace: IWorkspaceIdentifier): IEnterWorkspaceResult {
+		window.focus();
+
+		// Register window for backups and migrate current backups over
+		let backupPath: string;
+		if (!window.config.extensionDevelopmentPath) {
+			backupPath = this.backupMainService.registerWorkspaceBackupSync(workspace, window.config.backupPath);
+		}
+
+		// Update window configuration properly based on transition to workspace
+		window.config.folderUri = void 0;
+		window.config.workspace = workspace;
+		window.config.backupPath = backupPath;
+
+		return { workspace, backupPath };
+	}
+
+	pickWorkspaceAndOpen(options: INativeOpenDialogOptions): void {
 		const window = this.windowsMainService.getWindowById(options.windowId) || this.windowsMainService.getFocusedWindow() || this.windowsMainService.getLastActiveWindow();
 
 		this.windowsMainService.pickFileAndOpen({
@@ -1863,7 +2034,7 @@ class WorkspacesManager {
 		});
 	}
 
-	public promptToSaveUntitledWorkspace(window: ICodeWindow, workspace: IWorkspaceIdentifier): TPromise<boolean> {
+	promptToSaveUntitledWorkspace(window: ICodeWindow, workspace: IWorkspaceIdentifier): TPromise<boolean> {
 		enum ConfirmResult {
 			SAVE,
 			DONT_SAVE,
@@ -1931,7 +2102,7 @@ class WorkspacesManager {
 	private getUntitledWorkspaceSaveDialogDefaultPath(workspace?: IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier): string {
 		if (workspace) {
 			if (isSingleFolderWorkspaceIdentifier(workspace)) {
-				return dirname(workspace);
+				return workspace.scheme === Schemas.file ? dirname(workspace.fsPath) : void 0;
 			}
 
 			const resolvedWorkspace = this.workspacesMainService.resolveWorkspaceSync(workspace.configPath);
diff --git a/src/vs/code/node/cli.ts b/src/vs/code/node/cli.ts
index 0c5a6074797..94b66896ed0 100644
--- a/src/vs/code/node/cli.ts
+++ b/src/vs/code/node/cli.ts
@@ -14,7 +14,7 @@ import * as paths from 'path';
 import * as os from 'os';
 import * as fs from 'fs';
 import { whenDeleted } from 'vs/base/node/pfs';
-import { findFreePort } from 'vs/base/node/ports';
+import { findFreePort, randomPort } from 'vs/base/node/ports';
 import { resolveTerminalEncoding } from 'vs/base/node/encoding';
 import * as iconv from 'iconv-lite';
 import { writeFileAndFlushSync } from 'vs/base/node/extfs';
@@ -31,7 +31,7 @@ interface IMainCli {
 	main: (argv: ParsedArgs) => TPromise<void>;
 }
 
-export async function main(argv: string[]): TPromise<any> {
+export async function main(argv: string[]): Promise<any> {
 	let args: ParsedArgs;
 
 	try {
@@ -87,18 +87,17 @@ export async function main(argv: string[]): TPromise<any> {
 
 			// Write source to target
 			const data = fs.readFileSync(source);
-			try {
+			if (isWindows) {
+				// On Windows we use a different strategy of saving the file
+				// by first truncating the file and then writing with r+ mode.
+				// This helps to save hidden files on Windows
+				// (see https://github.com/Microsoft/vscode/issues/931) and
+				// prevent removing alternate data streams
+				// (see https://github.com/Microsoft/vscode/issues/6363)
+				fs.truncateSync(target, 0);
+				writeFileAndFlushSync(target, data, { flag: 'r+' });
+			} else {
 				writeFileAndFlushSync(target, data);
-			} catch (error) {
-				// On Windows and if the file exists with an EPERM error, we try a different strategy of saving the file
-				// by first truncating the file and then writing with r+ mode. This helps to save hidden files on Windows
-				// (see https://github.com/Microsoft/vscode/issues/931)
-				if (isWindows && error.code === 'EPERM') {
-					fs.truncateSync(target, 0);
-					writeFileAndFlushSync(target, data, { flag: 'r+' });
-				} else {
-					throw error;
-				}
 			}
 
 			// Restore previous mode as needed
@@ -172,7 +171,7 @@ export async function main(argv: string[]): TPromise<any> {
 				if (!stdinFileError) {
 
 					// Pipe into tmp file using terminals encoding
-					resolveTerminalEncoding(verbose).done(encoding => {
+					resolveTerminalEncoding(verbose).then(encoding => {
 						const converterStream = iconv.decodeStream(encoding);
 						process.stdin.pipe(converterStream).pipe(stdinFileStream);
 					});
@@ -252,13 +251,13 @@ export async function main(argv: string[]): TPromise<any> {
 		// to get better profile traces. Last, we listen on stdout for a signal that tells us to
 		// stop profiling.
 		if (args['prof-startup']) {
-			const portMain = await findFreePort(9222, 10, 6000);
-			const portRenderer = await findFreePort(portMain + 1, 10, 6000);
-			const portExthost = await findFreePort(portRenderer + 1, 10, 6000);
+			const portMain = await findFreePort(randomPort(), 10, 3000);
+			const portRenderer = await findFreePort(portMain + 1, 10, 3000);
+			const portExthost = await findFreePort(portRenderer + 1, 10, 3000);
 
-			if (!portMain || !portRenderer || !portExthost) {
-				console.error('Failed to find free ports for profiler to connect to do.');
-				return;
+			// fail the operation when one of the ports couldn't be accquired.
+			if (portMain * portRenderer * portExthost === 0) {
+				throw new Error('Failed to find free ports for profiler. Make sure to shutdown all instances of the editor first.');
 			}
 
 			const filenamePrefix = paths.join(os.homedir(), Math.random().toString(16).slice(-4));
@@ -271,38 +270,45 @@ export async function main(argv: string[]): TPromise<any> {
 
 			fs.writeFileSync(filenamePrefix, argv.slice(-6).join('|'));
 
-			processCallbacks.push(async child => {
+			processCallbacks.push(async _child => {
+				try {
+					// load and start profiler
+					const profiler = await import('v8-inspect-profiler');
+					const main = await profiler.startProfiling({ port: portMain });
+					const renderer = await profiler.startProfiling({ port: portRenderer, tries: 200 });
+					const extHost = await profiler.startProfiling({ port: portExthost, tries: 300 });
 
-				// load and start profiler
-				const profiler = await import('v8-inspect-profiler');
-				const main = await profiler.startProfiling({ port: portMain });
-				const renderer = await profiler.startProfiling({ port: portRenderer, tries: 200 });
-				const extHost = await profiler.startProfiling({ port: portExthost, tries: 300 });
+					// wait for the renderer to delete the
+					// marker file
+					await whenDeleted(filenamePrefix);
 
-				// wait for the renderer to delete the
-				// marker file
-				whenDeleted(filenamePrefix);
+					let profileMain = await main.stop();
+					let profileRenderer = await renderer.stop();
+					let profileExtHost = await extHost.stop();
+					let suffix = '';
 
-				let profileMain = await main.stop();
-				let profileRenderer = await renderer.stop();
-				let profileExtHost = await extHost.stop();
-				let suffix = '';
+					if (!process.env['VSCODE_DEV']) {
+						// when running from a not-development-build we remove
+						// absolute filenames because we don't want to reveal anything
+						// about users. We also append the `.txt` suffix to make it
+						// easier to attach these files to GH issues
+						profileMain = profiler.rewriteAbsolutePaths(profileMain, 'piiRemoved');
+						profileRenderer = profiler.rewriteAbsolutePaths(profileRenderer, 'piiRemoved');
+						profileExtHost = profiler.rewriteAbsolutePaths(profileExtHost, 'piiRemoved');
+						suffix = '.txt';
+					}
 
-				if (!process.env['VSCODE_DEV']) {
-					// when running from a not-development-build we remove
-					// absolute filenames because we don't want to reveal anything
-					// about users. We also append the `.txt` suffix to make it
-					// easier to attach these files to GH issues
-					profileMain = profiler.rewriteAbsolutePaths(profileMain, 'piiRemoved');
-					profileRenderer = profiler.rewriteAbsolutePaths(profileRenderer, 'piiRemoved');
-					profileExtHost = profiler.rewriteAbsolutePaths(profileExtHost, 'piiRemoved');
-					suffix = '.txt';
+					// finally stop profiling and save profiles to disk
+					await profiler.writeProfile(profileMain, `${filenamePrefix}-main.cpuprofile${suffix}`);
+					await profiler.writeProfile(profileRenderer, `${filenamePrefix}-renderer.cpuprofile${suffix}`);
+					await profiler.writeProfile(profileExtHost, `${filenamePrefix}-exthost.cpuprofile${suffix}`);
+
+					// re-create the marker file to signal that profiling is done
+					fs.writeFileSync(filenamePrefix, '');
+
+				} catch (e) {
+					console.error('Failed to profile startup. Make sure to quit Code first.');
 				}
-
-				// finally stop profiling and save profiles to disk
-				await profiler.writeProfile(profileMain, `${filenamePrefix}-main.cpuprofile${suffix}`);
-				await profiler.writeProfile(profileRenderer, `${filenamePrefix}-renderer.cpuprofile${suffix}`);
-				await profiler.writeProfile(profileExtHost, `${filenamePrefix}-exthost.cpuprofile${suffix}`);
 			});
 		}
 
@@ -318,7 +324,7 @@ export async function main(argv: string[]): TPromise<any> {
 			env
 		};
 
-		if (typeof args['upload-logs'] !== undefined) {
+		if (typeof args['upload-logs'] !== 'undefined') {
 			options['stdio'] = ['pipe', 'pipe', 'pipe'];
 		} else if (!verbose) {
 			options['stdio'] = 'ignore';
@@ -333,7 +339,7 @@ export async function main(argv: string[]): TPromise<any> {
 				child.once('exit', () => c(null));
 
 				// Complete when wait marker file is deleted
-				whenDeleted(waitMarkerFilePath).done(c, c);
+				whenDeleted(waitMarkerFilePath).then(c, c);
 			}).then(() => {
 
 				// Make sure to delete the tmp stdin file if we have any
diff --git a/src/vs/code/node/cliProcessMain.ts b/src/vs/code/node/cliProcessMain.ts
index 92f05cb628f..8cce3816254 100644
--- a/src/vs/code/node/cliProcessMain.ts
+++ b/src/vs/code/node/cliProcessMain.ts
@@ -7,6 +7,7 @@ import { localize } from 'vs/nls';
 import product from 'vs/platform/node/product';
 import pkg from 'vs/platform/node/package';
 import * as path from 'path';
+import * as semver from 'semver';
 
 import { TPromise } from 'vs/base/common/winjs.base';
 import { sequence } from 'vs/base/common/async';
@@ -38,6 +39,9 @@ import { ILogService, getLogLevel } from 'vs/platform/log/common/log';
 import { isPromiseCanceledError } from 'vs/base/common/errors';
 import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
 import { CommandLineDialogService } from 'vs/platform/dialogs/node/dialogService';
+import { areSameExtensions, getGalleryExtensionIdFromLocal } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
+import Severity from 'vs/base/common/severity';
+import { URI } from 'vs/base/common/uri';
 
 const notFound = (id: string) => localize('notFound', "Extension '{0}' not found.", id);
 const notInstalled = (id: string) => localize('notInstalled', "Extension '{0}' is not installed.", id);
@@ -58,26 +62,28 @@ class Main {
 	constructor(
 		@IEnvironmentService private environmentService: IEnvironmentService,
 		@IExtensionManagementService private extensionManagementService: IExtensionManagementService,
-		@IExtensionGalleryService private extensionGalleryService: IExtensionGalleryService
+		@IExtensionGalleryService private extensionGalleryService: IExtensionGalleryService,
+		@IDialogService private dialogService: IDialogService
 	) { }
 
 	run(argv: ParsedArgs): TPromise<any> {
 		// TODO@joao - make this contributable
 
+		let returnPromise: TPromise<any>;
 		if (argv['install-source']) {
-			return this.setInstallSource(argv['install-source']);
+			returnPromise = this.setInstallSource(argv['install-source']);
 		} else if (argv['list-extensions']) {
-			return this.listExtensions(argv['show-versions']);
+			returnPromise = this.listExtensions(argv['show-versions']);
 		} else if (argv['install-extension']) {
 			const arg = argv['install-extension'];
 			const args: string[] = typeof arg === 'string' ? [arg] : arg;
-			return this.installExtension(args);
+			returnPromise = this.installExtension(args);
 		} else if (argv['uninstall-extension']) {
 			const arg = argv['uninstall-extension'];
 			const ids: string[] = typeof arg === 'string' ? [arg] : arg;
-			return this.uninstallExtension(ids);
+			returnPromise = this.uninstallExtension(ids);
 		}
-		return undefined;
+		return returnPromise || TPromise.as(null);
 	}
 
 	private setInstallSource(installSource: string): TPromise<any> {
@@ -96,7 +102,7 @@ class Main {
 			.map(id => () => {
 				const extension = path.isAbsolute(id) ? id : path.join(process.cwd(), id);
 
-				return this.extensionManagementService.install(extension).then(() => {
+				return this.extensionManagementService.install(URI.file(extension)).then(() => {
 					console.log(localize('successVsixInstall', "Extension '{0}' was successfully installed!", getBaseLabel(extension)));
 				}, error => {
 					if (isPromiseCanceledError(error)) {
@@ -111,15 +117,8 @@ class Main {
 		const galleryTasks: Task[] = extensions
 			.filter(e => !/\.vsix$/i.test(e))
 			.map(id => () => {
-				return this.extensionManagementService.getInstalled(LocalExtensionType.User).then(installed => {
-					const isInstalled = installed.some(e => getId(e.manifest) === id);
-
-					if (isInstalled) {
-						console.log(localize('alreadyInstalled', "Extension '{0}' is already installed.", id));
-						return TPromise.as(null);
-					}
-
-					return this.extensionGalleryService.query({ names: [id], source: 'cli' })
+				return this.extensionManagementService.getInstalled(LocalExtensionType.User)
+					.then(installed => this.extensionGalleryService.query({ names: [id], source: 'cli' })
 						.then<IPager<IGalleryExtension>>(null, err => {
 							if (err.responseText) {
 								try {
@@ -129,7 +128,6 @@ class Main {
 									// noop
 								}
 							}
-
 							return TPromise.wrapError(err);
 						})
 						.then(result => {
@@ -139,29 +137,52 @@ class Main {
 								return TPromise.wrapError(new Error(`${notFound(id)}\n${useId}`));
 							}
 
-							console.log(localize('foundExtension', "Found '{0}' in the marketplace.", id));
-							console.log(localize('installing', "Installing..."));
+							const [installedExtension] = installed.filter(e => areSameExtensions({ id: getGalleryExtensionIdFromLocal(e) }, { id }));
+							if (installedExtension) {
+								const outdated = semver.gt(extension.version, installedExtension.manifest.version);
+								if (outdated) {
+									const updateMessage = localize('updateMessage', "Extension '{0}' v{1} is already installed, but a newer version {2} is available in the marketplace. Would you like to update?", id, installedExtension.manifest.version, extension.version);
+									return this.dialogService.show(Severity.Info, updateMessage, [localize('yes', "Yes"), localize('no', "No")])
+										.then(option => {
+											if (option === 0) {
+												return this.installFromGallery(id, extension);
+											}
+											console.log(localize('cancelInstall', "Cancelled installing Extension '{0}'.", id));
+											return TPromise.as(null);
+										});
 
-							return this.extensionManagementService.installFromGallery(extension)
-								.then(
-									() => console.log(localize('successInstall', "Extension '{0}' v{1} was successfully installed!", id, extension.version)),
-									error => {
-										if (isPromiseCanceledError(error)) {
-											console.log(localize('cancelVsixInstall', "Cancelled installing Extension '{0}'.", id));
-											return null;
-										} else {
-											return TPromise.wrapError(error);
-										}
-									});
-						});
-				});
+								} else {
+									console.log(localize('alreadyInstalled', "Extension '{0}' is already installed.", id));
+									return TPromise.as(null);
+								}
+							} else {
+								console.log(localize('foundExtension', "Found '{0}' in the marketplace.", id));
+								return this.installFromGallery(id, extension);
+							}
+
+						}));
 			});
 
 		return sequence([...vsixTasks, ...galleryTasks]);
 	}
 
+	private installFromGallery(id: string, extension: IGalleryExtension): TPromise<void> {
+		console.log(localize('installing', "Installing..."));
+		return this.extensionManagementService.installFromGallery(extension)
+			.then(
+				() => console.log(localize('successInstall', "Extension '{0}' v{1} was successfully installed!", id, extension.version)),
+				error => {
+					if (isPromiseCanceledError(error)) {
+						console.log(localize('cancelVsixInstall', "Cancelled installing Extension '{0}'.", id));
+						return null;
+					} else {
+						return TPromise.wrapError(error);
+					}
+				});
+	}
+
 	private uninstallExtension(extensions: string[]): TPromise<any> {
-		async function getExtensionId(extensionDescription: string): TPromise<string> {
+		async function getExtensionId(extensionDescription: string): Promise<string> {
 			if (!/\.vsix$/i.test(extensionDescription)) {
 				return extensionDescription;
 			}
@@ -174,7 +195,7 @@ class Main {
 		return sequence(extensions.map(extension => () => {
 			return getExtensionId(extension).then(id => {
 				return this.extensionManagementService.getInstalled(LocalExtensionType.User).then(installed => {
-					const [extension] = installed.filter(e => getId(e.manifest) === id);
+					const [extension] = installed.filter(e => areSameExtensions({ id: getGalleryExtensionIdFromLocal(e) }, { id }));
 
 					if (!extension) {
 						return TPromise.wrapError(new Error(`${notInstalled(id)}\n${useId}`));
@@ -212,7 +233,7 @@ export function main(argv: ParsedArgs): TPromise<void> {
 		const stateService = accessor.get(IStateService);
 
 		return TPromise.join([envService.appSettingsHome, envService.extensionsPath].map(p => mkdirp(p))).then(() => {
-			const { appRoot, extensionsPath, extensionDevelopmentPath, isBuilt, installSourcePath } = envService;
+			const { appRoot, extensionsPath, extensionDevelopmentLocationURI, isBuilt, installSourcePath } = envService;
 
 			const services = new ServiceCollection();
 			services.set(IConfigurationService, new SyncDescriptor(ConfigurationService));
@@ -221,17 +242,13 @@ export function main(argv: ParsedArgs): TPromise<void> {
 			services.set(IExtensionGalleryService, new SyncDescriptor(ExtensionGalleryService));
 			services.set(IDialogService, new SyncDescriptor(CommandLineDialogService));
 
-			if (isBuilt && !extensionDevelopmentPath && !envService.args['disable-telemetry'] && product.enableTelemetry) {
-				const appenders: AppInsightsAppender[] = [];
+			const appenders: AppInsightsAppender[] = [];
+			if (isBuilt && !extensionDevelopmentLocationURI && !envService.args['disable-telemetry'] && product.enableTelemetry) {
 
 				if (product.aiConfig && product.aiConfig.asimovKey) {
-					appenders.push(new AppInsightsAppender(eventPrefix, null, product.aiConfig.asimovKey));
+					appenders.push(new AppInsightsAppender(eventPrefix, null, product.aiConfig.asimovKey, logService));
 				}
 
-				// It is important to dispose the AI adapter properly because
-				// only then they flush remaining data.
-				process.once('exit', () => appenders.forEach(a => a.dispose()));
-
 				const config: ITelemetryServiceConfig = {
 					appender: combinedAppender(...appenders),
 					commonProperties: resolveCommonProperties(product.commit, pkg.version, stateService.getItem('telemetry.machineId'), installSourcePath),
@@ -246,7 +263,10 @@ export function main(argv: ParsedArgs): TPromise<void> {
 			const instantiationService2 = instantiationService.createChild(services);
 			const main = instantiationService2.createInstance(Main);
 
-			return main.run(argv);
+			return main.run(argv).then(() => {
+				// Dispose the AI adapter so that remaining data gets flushed.
+				return combinedAppender(...appenders).dispose();
+			});
 		});
 	});
 }
diff --git a/src/vs/code/node/paths.ts b/src/vs/code/node/paths.ts
index d54353ff72e..520bd6a7b45 100644
--- a/src/vs/code/node/paths.ts
+++ b/src/vs/code/node/paths.ts
@@ -12,16 +12,17 @@ import * as paths from 'vs/base/common/paths';
 import * as platform from 'vs/base/common/platform';
 import * as types from 'vs/base/common/types';
 import { ParsedArgs } from 'vs/platform/environment/common/environment';
-import { realpathSync } from 'vs/base/node/extfs';
+import { sanitizeFilePath } from 'vs/base/node/extfs';
 
 export function validatePaths(args: ParsedArgs): ParsedArgs {
+
 	// Track URLs if they're going to be used
 	if (args['open-url']) {
 		args._urls = args._;
 		args._ = [];
 	}
 
-	// Realpath/normalize paths and watch out for goto line mode
+	// Normalize paths and watch out for goto line mode
 	const paths = doValidatePaths(args._, args.goto);
 
 	// Update environment
@@ -46,26 +47,20 @@ function doValidatePaths(args: string[], gotoLineMode?: boolean): string[] {
 			pathCandidate = preparePath(cwd, pathCandidate);
 		}
 
-		let realPath: string;
-		try {
-			realPath = realpathSync(pathCandidate);
-		} catch (error) {
-			// in case of an error, assume the user wants to create this file
-			// if the path is relative, we join it to the cwd
-			realPath = path.normalize(path.isAbsolute(pathCandidate) ? pathCandidate : path.join(cwd, pathCandidate));
-		}
+		const sanitizedFilePath = sanitizeFilePath(pathCandidate, cwd);
 
-		const basename = path.basename(realPath);
+		const basename = path.basename(sanitizedFilePath);
 		if (basename /* can be empty if code is opened on root */ && !paths.isValidBasename(basename)) {
 			return null; // do not allow invalid file names
 		}
 
 		if (gotoLineMode) {
-			parsedPath.path = realPath;
+			parsedPath.path = sanitizedFilePath;
+
 			return toPath(parsedPath);
 		}
 
-		return realPath;
+		return sanitizedFilePath;
 	});
 
 	const caseInsensitive = platform.isWindows || platform.isMacintosh;
diff --git a/src/vs/code/node/windowsFinder.ts b/src/vs/code/node/windowsFinder.ts
index 61d9427fa69..2834f81e51a 100644
--- a/src/vs/code/node/windowsFinder.ts
+++ b/src/vs/code/node/windowsFinder.ts
@@ -8,13 +8,14 @@
 import * as platform from 'vs/base/common/platform';
 import * as paths from 'vs/base/common/paths';
 import { OpenContext } from 'vs/platform/windows/common/windows';
-import { IWorkspaceIdentifier, ISingleFolderWorkspaceIdentifier, isSingleFolderWorkspaceIdentifier, IResolvedWorkspace } from 'vs/platform/workspaces/common/workspaces';
-import { Schemas } from 'vs/base/common/network';
+import { IWorkspaceIdentifier, IResolvedWorkspace, ISingleFolderWorkspaceIdentifier, isSingleFolderWorkspaceIdentifier, isWorkspaceIdentifier } from 'vs/platform/workspaces/common/workspaces';
+import { URI } from 'vs/base/common/uri';
+import { isEqual, isEqualOrParent } from 'vs/base/common/resources';
 
 export interface ISimpleWindow {
 	openedWorkspace?: IWorkspaceIdentifier;
-	openedFolderPath?: string;
-	openedFilePath?: string;
+	openedFolderUri?: URI;
+	openedFileUri?: URI;
 	extensionDevelopmentPath?: string;
 	lastFocusTime: number;
 }
@@ -24,15 +25,15 @@ export interface IBestWindowOrFolderOptions<W extends ISimpleWindow> {
 	newWindow: boolean;
 	reuseWindow: boolean;
 	context: OpenContext;
-	filePath?: string;
+	fileUri?: URI;
 	userHome?: string;
 	codeSettingsFolder?: string;
 	workspaceResolver: (workspace: IWorkspaceIdentifier) => IResolvedWorkspace;
 }
 
-export function findBestWindowOrFolderForFile<W extends ISimpleWindow>({ windows, newWindow, reuseWindow, context, filePath, userHome, codeSettingsFolder, workspaceResolver }: IBestWindowOrFolderOptions<W>): W | string {
-	if (!newWindow && filePath && (context === OpenContext.DESKTOP || context === OpenContext.CLI || context === OpenContext.DOCK)) {
-		const windowOnFilePath = findWindowOnFilePath(windows, filePath, workspaceResolver);
+export function findBestWindowOrFolderForFile<W extends ISimpleWindow>({ windows, newWindow, reuseWindow, context, fileUri, workspaceResolver }: IBestWindowOrFolderOptions<W>): W {
+	if (!newWindow && fileUri && (context === OpenContext.DESKTOP || context === OpenContext.CLI || context === OpenContext.DOCK)) {
+		const windowOnFilePath = findWindowOnFilePath(windows, fileUri, workspaceResolver);
 		if (windowOnFilePath) {
 			return windowOnFilePath;
 		}
@@ -41,22 +42,22 @@ export function findBestWindowOrFolderForFile<W extends ISimpleWindow>({ windows
 	return !newWindow ? getLastActiveWindow(windows) : null;
 }
 
-function findWindowOnFilePath<W extends ISimpleWindow>(windows: W[], filePath: string, workspaceResolver: (workspace: IWorkspaceIdentifier) => IResolvedWorkspace): W {
+function findWindowOnFilePath<W extends ISimpleWindow>(windows: W[], fileUri: URI, workspaceResolver: (workspace: IWorkspaceIdentifier) => IResolvedWorkspace): W {
 
 	// First check for windows with workspaces that have a parent folder of the provided path opened
 	const workspaceWindows = windows.filter(window => !!window.openedWorkspace);
 	for (let i = 0; i < workspaceWindows.length; i++) {
 		const window = workspaceWindows[i];
 		const resolvedWorkspace = workspaceResolver(window.openedWorkspace);
-		if (resolvedWorkspace && resolvedWorkspace.folders.some(folder => folder.uri.scheme === Schemas.file && paths.isEqualOrParent(filePath, folder.uri.fsPath, !platform.isLinux /* ignorecase */))) {
+		if (resolvedWorkspace && resolvedWorkspace.folders.some(folder => isEqualOrParent(fileUri, folder.uri))) {
 			return window;
 		}
 	}
 
 	// Then go with single folder windows that are parent of the provided file path
-	const singleFolderWindowsOnFilePath = windows.filter(window => typeof window.openedFolderPath === 'string' && paths.isEqualOrParent(filePath, window.openedFolderPath, !platform.isLinux /* ignorecase */));
+	const singleFolderWindowsOnFilePath = windows.filter(window => window.openedFolderUri && isEqualOrParent(fileUri, window.openedFolderUri));
 	if (singleFolderWindowsOnFilePath.length) {
-		return singleFolderWindowsOnFilePath.sort((a, b) => -(a.openedFolderPath.length - b.openedFolderPath.length))[0];
+		return singleFolderWindowsOnFilePath.sort((a, b) => -(a.openedFolderUri.path.length - b.openedFolderUri.path.length))[0];
 	}
 
 	return null;
@@ -69,51 +70,50 @@ export function getLastActiveWindow<W extends ISimpleWindow>(windows: W[]): W {
 }
 
 export function findWindowOnWorkspace<W extends ISimpleWindow>(windows: W[], workspace: (IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier)): W {
-	return windows.filter(window => {
-
-		// match on folder
-		if (isSingleFolderWorkspaceIdentifier(workspace)) {
-			if (typeof window.openedFolderPath === 'string' && (paths.isEqual(window.openedFolderPath, workspace, !platform.isLinux /* ignorecase */))) {
-				return true;
+	if (isSingleFolderWorkspaceIdentifier(workspace)) {
+		for (const window of windows) {
+			// match on folder
+			if (isSingleFolderWorkspaceIdentifier(workspace)) {
+				if (window.openedFolderUri && isEqual(window.openedFolderUri, workspace)) {
+					return window;
+				}
 			}
 		}
-
-		// match on workspace
-		else {
+	} else if (isWorkspaceIdentifier(workspace)) {
+		for (const window of windows) {
+			// match on workspace
 			if (window.openedWorkspace && window.openedWorkspace.id === workspace.id) {
-				return true;
+				return window;
 			}
 		}
-
-		return false;
-	})[0];
+	}
+	return null;
 }
 
 export function findWindowOnExtensionDevelopmentPath<W extends ISimpleWindow>(windows: W[], extensionDevelopmentPath: string): W {
-	return windows.filter(window => {
-
-		// match on extension development path
+	for (const window of windows) {
+		// match on extension development path. The path can be a path or uri string, using paths.isEqual is not 100% correct but good enough
 		if (paths.isEqual(window.extensionDevelopmentPath, extensionDevelopmentPath, !platform.isLinux /* ignorecase */)) {
-			return true;
+			return window;
 		}
-
-		return false;
-	})[0];
+	}
+	return null;
 }
 
-export function findWindowOnWorkspaceOrFolderPath<W extends ISimpleWindow>(windows: W[], path: string): W {
-	return windows.filter(window => {
-
+export function findWindowOnWorkspaceOrFolderUri<W extends ISimpleWindow>(windows: W[], uri: URI): W {
+	if (!uri) {
+		return null;
+	}
+	for (const window of windows) {
 		// check for workspace config path
-		if (window.openedWorkspace && paths.isEqual(window.openedWorkspace.configPath, path, !platform.isLinux /* ignorecase */)) {
-			return true;
+		if (window.openedWorkspace && isEqual(URI.file(window.openedWorkspace.configPath), uri, !platform.isLinux /* ignorecase */)) {
+			return window;
 		}
 
 		// check for folder path
-		if (window.openedFolderPath && paths.isEqual(window.openedFolderPath, path, !platform.isLinux /* ignorecase */)) {
-			return true;
+		if (window.openedFolderUri && isEqual(window.openedFolderUri, uri)) {
+			return window;
 		}
-
-		return false;
-	})[0];
+	}
+	return null;
 }
diff --git a/src/vs/code/test/node/windowsFinder.test.ts b/src/vs/code/test/node/windowsFinder.test.ts
index 084d8546224..05f0a8ecb24 100644
--- a/src/vs/code/test/node/windowsFinder.test.ts
+++ b/src/vs/code/test/node/windowsFinder.test.ts
@@ -10,8 +10,10 @@ import { findBestWindowOrFolderForFile, ISimpleWindow, IBestWindowOrFolderOption
 import { OpenContext } from 'vs/platform/windows/common/windows';
 import { IWorkspaceIdentifier } from 'vs/platform/workspaces/common/workspaces';
 import { toWorkspaceFolders } from 'vs/platform/workspace/common/workspace';
+import { URI } from 'vs/base/common/uri';
+import { getPathFromAmdModule } from 'vs/base/common/amd';
 
-const fixturesFolder = require.toUrl('./fixtures');
+const fixturesFolder = getPathFromAmdModule(require, './fixtures');
 
 const testWorkspace: IWorkspaceIdentifier = {
 	id: Date.now().toString(),
@@ -30,10 +32,10 @@ function options(custom?: Partial<IBestWindowOrFolderOptions<ISimpleWindow>>): I
 	};
 }
 
-const vscodeFolderWindow = { lastFocusTime: 1, openedFolderPath: path.join(fixturesFolder, 'vscode_folder') };
-const lastActiveWindow = { lastFocusTime: 3, openedFolderPath: null };
-const noVscodeFolderWindow = { lastFocusTime: 2, openedFolderPath: path.join(fixturesFolder, 'no_vscode_folder') };
-const windows = [
+const vscodeFolderWindow: ISimpleWindow = { lastFocusTime: 1, openedFolderUri: URI.file(path.join(fixturesFolder, 'vscode_folder')) };
+const lastActiveWindow: ISimpleWindow = { lastFocusTime: 3, openedFolderUri: null };
+const noVscodeFolderWindow: ISimpleWindow = { lastFocusTime: 2, openedFolderUri: URI.file(path.join(fixturesFolder, 'no_vscode_folder')) };
+const windows: ISimpleWindow[] = [
 	vscodeFolderWindow,
 	lastActiveWindow,
 	noVscodeFolderWindow,
@@ -44,32 +46,32 @@ suite('WindowsFinder', () => {
 	test('New window without folder when no windows exist', () => {
 		assert.equal(findBestWindowOrFolderForFile(options()), null);
 		assert.equal(findBestWindowOrFolderForFile(options({
-			filePath: path.join(fixturesFolder, 'no_vscode_folder', 'file.txt')
+			fileUri: URI.file(path.join(fixturesFolder, 'no_vscode_folder', 'file.txt'))
 		})), null);
 		assert.equal(findBestWindowOrFolderForFile(options({
-			filePath: path.join(fixturesFolder, 'vscode_folder', 'file.txt'),
+			fileUri: URI.file(path.join(fixturesFolder, 'vscode_folder', 'file.txt')),
 			newWindow: true
 		})), null);
 		assert.equal(findBestWindowOrFolderForFile(options({
-			filePath: path.join(fixturesFolder, 'vscode_folder', 'file.txt'),
+			fileUri: URI.file(path.join(fixturesFolder, 'vscode_folder', 'file.txt')),
 			reuseWindow: true
 		})), null);
 		assert.equal(findBestWindowOrFolderForFile(options({
-			filePath: path.join(fixturesFolder, 'vscode_folder', 'file.txt'),
+			fileUri: URI.file(path.join(fixturesFolder, 'vscode_folder', 'file.txt')),
 			context: OpenContext.API
 		})), null);
 		assert.equal(findBestWindowOrFolderForFile(options({
-			filePath: path.join(fixturesFolder, 'vscode_folder', 'file.txt')
+			fileUri: URI.file(path.join(fixturesFolder, 'vscode_folder', 'file.txt'))
 		})), null);
 		assert.equal(findBestWindowOrFolderForFile(options({
-			filePath: path.join(fixturesFolder, 'vscode_folder', 'new_folder', 'new_file.txt')
+			fileUri: URI.file(path.join(fixturesFolder, 'vscode_folder', 'new_folder', 'new_file.txt'))
 		})), null);
 	});
 
 	test('New window without folder when windows exist', () => {
 		assert.equal(findBestWindowOrFolderForFile(options({
 			windows,
-			filePath: path.join(fixturesFolder, 'no_vscode_folder', 'file.txt'),
+			fileUri: URI.file(path.join(fixturesFolder, 'no_vscode_folder', 'file.txt')),
 			newWindow: true
 		})), null);
 	});
@@ -80,16 +82,16 @@ suite('WindowsFinder', () => {
 		})), lastActiveWindow);
 		assert.equal(findBestWindowOrFolderForFile(options({
 			windows,
-			filePath: path.join(fixturesFolder, 'no_vscode_folder2', 'file.txt')
+			fileUri: URI.file(path.join(fixturesFolder, 'no_vscode_folder2', 'file.txt'))
 		})), lastActiveWindow);
 		assert.equal(findBestWindowOrFolderForFile(options({
 			windows: [lastActiveWindow, noVscodeFolderWindow],
-			filePath: path.join(fixturesFolder, 'vscode_folder', 'file.txt'),
+			fileUri: URI.file(path.join(fixturesFolder, 'vscode_folder', 'file.txt')),
 			reuseWindow: true
 		})), lastActiveWindow);
 		assert.equal(findBestWindowOrFolderForFile(options({
 			windows,
-			filePath: path.join(fixturesFolder, 'no_vscode_folder', 'file.txt'),
+			fileUri: URI.file(path.join(fixturesFolder, 'no_vscode_folder', 'file.txt')),
 			context: OpenContext.API
 		})), lastActiveWindow);
 	});
@@ -97,33 +99,33 @@ suite('WindowsFinder', () => {
 	test('Existing window with folder', () => {
 		assert.equal(findBestWindowOrFolderForFile(options({
 			windows,
-			filePath: path.join(fixturesFolder, 'no_vscode_folder', 'file.txt')
+			fileUri: URI.file(path.join(fixturesFolder, 'no_vscode_folder', 'file.txt'))
 		})), noVscodeFolderWindow);
 		assert.equal(findBestWindowOrFolderForFile(options({
 			windows,
-			filePath: path.join(fixturesFolder, 'vscode_folder', 'file.txt')
+			fileUri: URI.file(path.join(fixturesFolder, 'vscode_folder', 'file.txt'))
 		})), vscodeFolderWindow);
-		const window = { lastFocusTime: 1, openedFolderPath: path.join(fixturesFolder, 'vscode_folder', 'nested_folder') };
+		const window: ISimpleWindow = { lastFocusTime: 1, openedFolderUri: URI.file(path.join(fixturesFolder, 'vscode_folder', 'nested_folder')) };
 		assert.equal(findBestWindowOrFolderForFile(options({
 			windows: [window],
-			filePath: path.join(fixturesFolder, 'vscode_folder', 'nested_folder', 'subfolder', 'file.txt')
+			fileUri: URI.file(path.join(fixturesFolder, 'vscode_folder', 'nested_folder', 'subfolder', 'file.txt'))
 		})), window);
 	});
 
 	test('More specific existing window wins', () => {
-		const window = { lastFocusTime: 2, openedFolderPath: path.join(fixturesFolder, 'no_vscode_folder') };
-		const nestedFolderWindow = { lastFocusTime: 1, openedFolderPath: path.join(fixturesFolder, 'no_vscode_folder', 'nested_folder') };
+		const window: ISimpleWindow = { lastFocusTime: 2, openedFolderUri: URI.file(path.join(fixturesFolder, 'no_vscode_folder')) };
+		const nestedFolderWindow: ISimpleWindow = { lastFocusTime: 1, openedFolderUri: URI.file(path.join(fixturesFolder, 'no_vscode_folder', 'nested_folder')) };
 		assert.equal(findBestWindowOrFolderForFile(options({
 			windows: [window, nestedFolderWindow],
-			filePath: path.join(fixturesFolder, 'no_vscode_folder', 'nested_folder', 'subfolder', 'file.txt')
+			fileUri: URI.file(path.join(fixturesFolder, 'no_vscode_folder', 'nested_folder', 'subfolder', 'file.txt'))
 		})), nestedFolderWindow);
 	});
 
 	test('Workspace folder wins', () => {
-		const window = { lastFocusTime: 1, openedWorkspace: testWorkspace };
+		const window: ISimpleWindow = { lastFocusTime: 1, openedWorkspace: testWorkspace };
 		assert.equal(findBestWindowOrFolderForFile(options({
 			windows: [window],
-			filePath: path.join(fixturesFolder, 'vscode_workspace_2_folder', 'nested_vscode_folder', 'subfolder', 'file.txt')
+			fileUri: URI.file(path.join(fixturesFolder, 'vscode_workspace_2_folder', 'nested_vscode_folder', 'subfolder', 'file.txt'))
 		})), window);
 	});
 });
diff --git a/src/vs/css.build.js b/src/vs/css.build.js
index 7f34c9b158a..4a617c57ed8 100644
--- a/src/vs/css.build.js
+++ b/src/vs/css.build.js
@@ -17,346 +17,346 @@
 var _cssPluginGlobal = this;
 var CSSBuildLoaderPlugin;
 (function (CSSBuildLoaderPlugin) {
-	var global = _cssPluginGlobal || {};
-	/**
-	 * Known issue:
-	 * - In IE there is no way to know if the CSS file loaded successfully or not.
-	 */
-	var BrowserCSSLoader = (function () {
-		function BrowserCSSLoader() {
-			this._pendingLoads = 0;
-		}
-		BrowserCSSLoader.prototype.attachListeners = function (name, linkNode, callback, errorback) {
-			var unbind = function () {
-				linkNode.removeEventListener('load', loadEventListener);
-				linkNode.removeEventListener('error', errorEventListener);
-			};
-			var loadEventListener = function (e) {
-				unbind();
-				callback();
-			};
-			var errorEventListener = function (e) {
-				unbind();
-				errorback(e);
-			};
-			linkNode.addEventListener('load', loadEventListener);
-			linkNode.addEventListener('error', errorEventListener);
-		};
-		BrowserCSSLoader.prototype._onLoad = function (name, callback) {
-			this._pendingLoads--;
-			callback();
-		};
-		BrowserCSSLoader.prototype._onLoadError = function (name, errorback, err) {
-			this._pendingLoads--;
-			errorback(err);
-		};
-		BrowserCSSLoader.prototype._insertLinkNode = function (linkNode) {
-			this._pendingLoads++;
-			var head = document.head || document.getElementsByTagName('head')[0];
-			var other = head.getElementsByTagName('link') || document.head.getElementsByTagName('script');
-			if (other.length > 0) {
-				head.insertBefore(linkNode, other[other.length - 1]);
-			}
-			else {
-				head.appendChild(linkNode);
-			}
-		};
-		BrowserCSSLoader.prototype.createLinkTag = function (name, cssUrl, externalCallback, externalErrorback) {
-			var _this = this;
-			var linkNode = document.createElement('link');
-			linkNode.setAttribute('rel', 'stylesheet');
-			linkNode.setAttribute('type', 'text/css');
-			linkNode.setAttribute('data-name', name);
-			var callback = function () { return _this._onLoad(name, externalCallback); };
-			var errorback = function (err) { return _this._onLoadError(name, externalErrorback, err); };
-			this.attachListeners(name, linkNode, callback, errorback);
-			linkNode.setAttribute('href', cssUrl);
-			return linkNode;
-		};
-		BrowserCSSLoader.prototype._linkTagExists = function (name, cssUrl) {
-			var i, len, nameAttr, hrefAttr, links = document.getElementsByTagName('link');
-			for (i = 0, len = links.length; i < len; i++) {
-				nameAttr = links[i].getAttribute('data-name');
-				hrefAttr = links[i].getAttribute('href');
-				if (nameAttr === name || hrefAttr === cssUrl) {
-					return true;
-				}
-			}
-			return false;
-		};
-		BrowserCSSLoader.prototype.load = function (name, cssUrl, externalCallback, externalErrorback) {
-			if (this._linkTagExists(name, cssUrl)) {
-				externalCallback();
-				return;
-			}
-			var linkNode = this.createLinkTag(name, cssUrl, externalCallback, externalErrorback);
-			this._insertLinkNode(linkNode);
-		};
-		return BrowserCSSLoader;
-	}());
-	var NodeCSSLoader = (function () {
-		function NodeCSSLoader() {
-			this.fs = require.nodeRequire('fs');
-		}
-		NodeCSSLoader.prototype.load = function (name, cssUrl, externalCallback, externalErrorback) {
-			var contents = this.fs.readFileSync(cssUrl, 'utf8');
-			// Remove BOM
-			if (contents.charCodeAt(0) === NodeCSSLoader.BOM_CHAR_CODE) {
-				contents = contents.substring(1);
-			}
-			externalCallback(contents);
-		};
-		return NodeCSSLoader;
-	}());
-	NodeCSSLoader.BOM_CHAR_CODE = 65279;
-	// ------------------------------ Finally, the plugin
-	var CSSPlugin = (function () {
-		function CSSPlugin(cssLoader) {
-			this.cssLoader = cssLoader;
-		}
-		CSSPlugin.prototype.load = function (name, req, load, config) {
-			config = config || {};
-			var myConfig = config['vs/css'] || {};
-			global.inlineResources = myConfig.inlineResources;
-			global.inlineResourcesLimit = myConfig.inlineResourcesLimit || 5000;
-			var cssUrl = req.toUrl(name + '.css');
-			this.cssLoader.load(name, cssUrl, function (contents) {
-				// Contents has the CSS file contents if we are in a build
-				if (config.isBuild) {
-					CSSPlugin.BUILD_MAP[name] = contents;
-					CSSPlugin.BUILD_PATH_MAP[name] = cssUrl;
-				}
-				load({});
-			}, function (err) {
-				if (typeof load.error === 'function') {
-					load.error('Could not find ' + cssUrl + ' or it was empty');
-				}
-			});
-		};
-		CSSPlugin.prototype.write = function (pluginName, moduleName, write) {
-			// getEntryPoint is a Monaco extension to r.js
-			var entryPoint = write.getEntryPoint();
-			// r.js destroys the context of this plugin between calling 'write' and 'writeFile'
-			// so the only option at this point is to leak the data to a global
-			global.cssPluginEntryPoints = global.cssPluginEntryPoints || {};
-			global.cssPluginEntryPoints[entryPoint] = global.cssPluginEntryPoints[entryPoint] || [];
-			global.cssPluginEntryPoints[entryPoint].push({
-				moduleName: moduleName,
-				contents: CSSPlugin.BUILD_MAP[moduleName],
-				fsPath: CSSPlugin.BUILD_PATH_MAP[moduleName],
-			});
-			write.asModule(pluginName + '!' + moduleName, 'define([\'vs/css!' + entryPoint + '\'], {});');
-		};
-		CSSPlugin.prototype.writeFile = function (pluginName, moduleName, req, write, config) {
-			if (global.cssPluginEntryPoints && global.cssPluginEntryPoints.hasOwnProperty(moduleName)) {
-				var fileName = req.toUrl(moduleName + '.css');
-				var contents = [
-					'/*---------------------------------------------------------',
-					' * Copyright (c) Microsoft Corporation. All rights reserved.',
-					' *--------------------------------------------------------*/'
-				], entries = global.cssPluginEntryPoints[moduleName];
-				for (var i = 0; i < entries.length; i++) {
-					if (global.inlineResources) {
-						contents.push(Utilities.rewriteOrInlineUrls(entries[i].fsPath, entries[i].moduleName, moduleName, entries[i].contents, global.inlineResources === 'base64', global.inlineResourcesLimit));
-					}
-					else {
-						contents.push(Utilities.rewriteUrls(entries[i].moduleName, moduleName, entries[i].contents));
-					}
-				}
-				write(fileName, contents.join('\r\n'));
-			}
-		};
-		CSSPlugin.prototype.getInlinedResources = function () {
-			return global.cssInlinedResources || [];
-		};
-		return CSSPlugin;
-	}());
-	CSSPlugin.BUILD_MAP = {};
-	CSSPlugin.BUILD_PATH_MAP = {};
-	CSSBuildLoaderPlugin.CSSPlugin = CSSPlugin;
-	var Utilities = (function () {
-		function Utilities() {
-		}
-		Utilities.startsWith = function (haystack, needle) {
-			return haystack.length >= needle.length && haystack.substr(0, needle.length) === needle;
-		};
-		/**
-		 * Find the path of a file.
-		 */
-		Utilities.pathOf = function (filename) {
-			var lastSlash = filename.lastIndexOf('/');
-			if (lastSlash !== -1) {
-				return filename.substr(0, lastSlash + 1);
-			}
-			else {
-				return '';
-			}
-		};
-		/**
-		 * A conceptual a + b for paths.
-		 * Takes into account if `a` contains a protocol.
-		 * Also normalizes the result: e.g.: a/b/ + ../c => a/c
-		 */
-		Utilities.joinPaths = function (a, b) {
-			function findSlashIndexAfterPrefix(haystack, prefix) {
-				if (Utilities.startsWith(haystack, prefix)) {
-					return Math.max(prefix.length, haystack.indexOf('/', prefix.length));
-				}
-				return 0;
-			}
-			var aPathStartIndex = 0;
-			aPathStartIndex = aPathStartIndex || findSlashIndexAfterPrefix(a, '//');
-			aPathStartIndex = aPathStartIndex || findSlashIndexAfterPrefix(a, 'http://');
-			aPathStartIndex = aPathStartIndex || findSlashIndexAfterPrefix(a, 'https://');
-			function pushPiece(pieces, piece) {
-				if (piece === './') {
-					// Ignore
-					return;
-				}
-				if (piece === '../') {
-					var prevPiece = (pieces.length > 0 ? pieces[pieces.length - 1] : null);
-					if (prevPiece && prevPiece === '/') {
-						// Ignore
-						return;
-					}
-					if (prevPiece && prevPiece !== '../') {
-						// Pop
-						pieces.pop();
-						return;
-					}
-				}
-				// Push
-				pieces.push(piece);
-			}
-			function push(pieces, path) {
-				while (path.length > 0) {
-					var slashIndex = path.indexOf('/');
-					var piece = (slashIndex >= 0 ? path.substring(0, slashIndex + 1) : path);
-					path = (slashIndex >= 0 ? path.substring(slashIndex + 1) : '');
-					pushPiece(pieces, piece);
-				}
-			}
-			var pieces = [];
-			push(pieces, a.substr(aPathStartIndex));
-			if (b.length > 0 && b.charAt(0) === '/') {
-				pieces = [];
-			}
-			push(pieces, b);
-			return a.substring(0, aPathStartIndex) + pieces.join('');
-		};
-		Utilities.commonPrefix = function (str1, str2) {
-			var len = Math.min(str1.length, str2.length);
-			for (var i = 0; i < len; i++) {
-				if (str1.charCodeAt(i) !== str2.charCodeAt(i)) {
-					break;
-				}
-			}
-			return str1.substring(0, i);
-		};
-		Utilities.commonFolderPrefix = function (fromPath, toPath) {
-			var prefix = Utilities.commonPrefix(fromPath, toPath);
-			var slashIndex = prefix.lastIndexOf('/');
-			if (slashIndex === -1) {
-				return '';
-			}
-			return prefix.substring(0, slashIndex + 1);
-		};
-		Utilities.relativePath = function (fromPath, toPath) {
-			if (Utilities.startsWith(toPath, '/') || Utilities.startsWith(toPath, 'http://') || Utilities.startsWith(toPath, 'https://')) {
-				return toPath;
-			}
-			// Ignore common folder prefix
-			var prefix = Utilities.commonFolderPrefix(fromPath, toPath);
-			fromPath = fromPath.substr(prefix.length);
-			toPath = toPath.substr(prefix.length);
-			var upCount = fromPath.split('/').length;
-			var result = '';
-			for (var i = 1; i < upCount; i++) {
-				result += '../';
-			}
-			return result + toPath;
-		};
-		Utilities._replaceURL = function (contents, replacer) {
-			// Use ")" as the terminator as quotes are oftentimes not used at all
-			return contents.replace(/url\(\s*([^\)]+)\s*\)?/g, function (_) {
-				var matches = [];
-				for (var _i = 1; _i < arguments.length; _i++) {
-					matches[_i - 1] = arguments[_i];
-				}
-				var url = matches[0];
-				// Eliminate starting quotes (the initial whitespace is not captured)
-				if (url.charAt(0) === '"' || url.charAt(0) === '\'') {
-					url = url.substring(1);
-				}
-				// The ending whitespace is captured
-				while (url.length > 0 && (url.charAt(url.length - 1) === ' ' || url.charAt(url.length - 1) === '\t')) {
-					url = url.substring(0, url.length - 1);
-				}
-				// Eliminate ending quotes
-				if (url.charAt(url.length - 1) === '"' || url.charAt(url.length - 1) === '\'') {
-					url = url.substring(0, url.length - 1);
-				}
-				if (!Utilities.startsWith(url, 'data:') && !Utilities.startsWith(url, 'http://') && !Utilities.startsWith(url, 'https://')) {
-					url = replacer(url);
-				}
-				return 'url(' + url + ')';
-			});
-		};
-		Utilities.rewriteUrls = function (originalFile, newFile, contents) {
-			return this._replaceURL(contents, function (url) {
-				var absoluteUrl = Utilities.joinPaths(Utilities.pathOf(originalFile), url);
-				return Utilities.relativePath(newFile, absoluteUrl);
-			});
-		};
-		Utilities.rewriteOrInlineUrls = function (originalFileFSPath, originalFile, newFile, contents, forceBase64, inlineByteLimit) {
-			var fs = require.nodeRequire('fs');
-			var path = require.nodeRequire('path');
-			return this._replaceURL(contents, function (url) {
-				if (/\.(svg|png)$/.test(url)) {
-					var fsPath = path.join(path.dirname(originalFileFSPath), url);
-					var fileContents = fs.readFileSync(fsPath);
-					if (fileContents.length < inlineByteLimit) {
-						global.cssInlinedResources = global.cssInlinedResources || [];
-						var normalizedFSPath = fsPath.replace(/\\/g, '/');
-						if (global.cssInlinedResources.indexOf(normalizedFSPath) >= 0) {
-							console.warn('CSS INLINING IMAGE AT ' + fsPath + ' MORE THAN ONCE. CONSIDER CONSOLIDATING CSS RULES');
-						}
-						global.cssInlinedResources.push(normalizedFSPath);
-						var MIME = /\.svg$/.test(url) ? 'image/svg+xml' : 'image/png';
-						var DATA = ';base64,' + fileContents.toString('base64');
-						if (!forceBase64 && /\.svg$/.test(url)) {
-							// .svg => url encode as explained at https://codepen.io/tigt/post/optimizing-svgs-in-data-uris
-							var newText = fileContents.toString()
-								.replace(/"/g, '\'')
-								.replace(/</g, '%3C')
-								.replace(/>/g, '%3E')
-								.replace(/&/g, '%26')
-								.replace(/#/g, '%23')
-								.replace(/\s+/g, ' ');
-							var encodedData = ',' + newText;
-							if (encodedData.length < DATA.length) {
-								DATA = encodedData;
-							}
-						}
-						return '"data:' + MIME + DATA + '"';
-					}
-				}
-				var absoluteUrl = Utilities.joinPaths(Utilities.pathOf(originalFile), url);
-				return Utilities.relativePath(newFile, absoluteUrl);
-			});
-		};
-		return Utilities;
-	}());
-	CSSBuildLoaderPlugin.Utilities = Utilities;
-	(function () {
-		var cssLoader = null;
-		var isElectron = (typeof process !== 'undefined' && typeof process.versions !== 'undefined' && typeof process.versions['electron'] !== 'undefined');
-		if (typeof process !== 'undefined' && process.versions && !!process.versions.node && !isElectron) {
-			cssLoader = new NodeCSSLoader();
-		}
-		else {
-			cssLoader = new BrowserCSSLoader();
-		}
-		define('vs/css', new CSSPlugin(cssLoader));
-	})();
+    var global = _cssPluginGlobal || {};
+    /**
+     * Known issue:
+     * - In IE there is no way to know if the CSS file loaded successfully or not.
+     */
+    var BrowserCSSLoader = /** @class */ (function () {
+        function BrowserCSSLoader() {
+            this._pendingLoads = 0;
+        }
+        BrowserCSSLoader.prototype.attachListeners = function (name, linkNode, callback, errorback) {
+            var unbind = function () {
+                linkNode.removeEventListener('load', loadEventListener);
+                linkNode.removeEventListener('error', errorEventListener);
+            };
+            var loadEventListener = function (e) {
+                unbind();
+                callback();
+            };
+            var errorEventListener = function (e) {
+                unbind();
+                errorback(e);
+            };
+            linkNode.addEventListener('load', loadEventListener);
+            linkNode.addEventListener('error', errorEventListener);
+        };
+        BrowserCSSLoader.prototype._onLoad = function (name, callback) {
+            this._pendingLoads--;
+            callback();
+        };
+        BrowserCSSLoader.prototype._onLoadError = function (name, errorback, err) {
+            this._pendingLoads--;
+            errorback(err);
+        };
+        BrowserCSSLoader.prototype._insertLinkNode = function (linkNode) {
+            this._pendingLoads++;
+            var head = document.head || document.getElementsByTagName('head')[0];
+            var other = head.getElementsByTagName('link') || document.head.getElementsByTagName('script');
+            if (other.length > 0) {
+                head.insertBefore(linkNode, other[other.length - 1]);
+            }
+            else {
+                head.appendChild(linkNode);
+            }
+        };
+        BrowserCSSLoader.prototype.createLinkTag = function (name, cssUrl, externalCallback, externalErrorback) {
+            var _this = this;
+            var linkNode = document.createElement('link');
+            linkNode.setAttribute('rel', 'stylesheet');
+            linkNode.setAttribute('type', 'text/css');
+            linkNode.setAttribute('data-name', name);
+            var callback = function () { return _this._onLoad(name, externalCallback); };
+            var errorback = function (err) { return _this._onLoadError(name, externalErrorback, err); };
+            this.attachListeners(name, linkNode, callback, errorback);
+            linkNode.setAttribute('href', cssUrl);
+            return linkNode;
+        };
+        BrowserCSSLoader.prototype._linkTagExists = function (name, cssUrl) {
+            var i, len, nameAttr, hrefAttr, links = document.getElementsByTagName('link');
+            for (i = 0, len = links.length; i < len; i++) {
+                nameAttr = links[i].getAttribute('data-name');
+                hrefAttr = links[i].getAttribute('href');
+                if (nameAttr === name || hrefAttr === cssUrl) {
+                    return true;
+                }
+            }
+            return false;
+        };
+        BrowserCSSLoader.prototype.load = function (name, cssUrl, externalCallback, externalErrorback) {
+            if (this._linkTagExists(name, cssUrl)) {
+                externalCallback();
+                return;
+            }
+            var linkNode = this.createLinkTag(name, cssUrl, externalCallback, externalErrorback);
+            this._insertLinkNode(linkNode);
+        };
+        return BrowserCSSLoader;
+    }());
+    var NodeCSSLoader = /** @class */ (function () {
+        function NodeCSSLoader() {
+            this.fs = require.nodeRequire('fs');
+        }
+        NodeCSSLoader.prototype.load = function (name, cssUrl, externalCallback, externalErrorback) {
+            var contents = this.fs.readFileSync(cssUrl, 'utf8');
+            // Remove BOM
+            if (contents.charCodeAt(0) === NodeCSSLoader.BOM_CHAR_CODE) {
+                contents = contents.substring(1);
+            }
+            externalCallback(contents);
+        };
+        NodeCSSLoader.BOM_CHAR_CODE = 65279;
+        return NodeCSSLoader;
+    }());
+    // ------------------------------ Finally, the plugin
+    var CSSPlugin = /** @class */ (function () {
+        function CSSPlugin(cssLoader) {
+            this.cssLoader = cssLoader;
+        }
+        CSSPlugin.prototype.load = function (name, req, load, config) {
+            config = config || {};
+            var myConfig = config['vs/css'] || {};
+            global.inlineResources = myConfig.inlineResources;
+            global.inlineResourcesLimit = myConfig.inlineResourcesLimit || 5000;
+            var cssUrl = req.toUrl(name + '.css');
+            this.cssLoader.load(name, cssUrl, function (contents) {
+                // Contents has the CSS file contents if we are in a build
+                if (config.isBuild) {
+                    CSSPlugin.BUILD_MAP[name] = contents;
+                    CSSPlugin.BUILD_PATH_MAP[name] = cssUrl;
+                }
+                load({});
+            }, function (err) {
+                if (typeof load.error === 'function') {
+                    load.error('Could not find ' + cssUrl + ' or it was empty');
+                }
+            });
+        };
+        CSSPlugin.prototype.write = function (pluginName, moduleName, write) {
+            // getEntryPoint is a Monaco extension to r.js
+            var entryPoint = write.getEntryPoint();
+            // r.js destroys the context of this plugin between calling 'write' and 'writeFile'
+            // so the only option at this point is to leak the data to a global
+            global.cssPluginEntryPoints = global.cssPluginEntryPoints || {};
+            global.cssPluginEntryPoints[entryPoint] = global.cssPluginEntryPoints[entryPoint] || [];
+            global.cssPluginEntryPoints[entryPoint].push({
+                moduleName: moduleName,
+                contents: CSSPlugin.BUILD_MAP[moduleName],
+                fsPath: CSSPlugin.BUILD_PATH_MAP[moduleName],
+            });
+            write.asModule(pluginName + '!' + moduleName, 'define([\'vs/css!' + entryPoint + '\'], {});');
+        };
+        CSSPlugin.prototype.writeFile = function (pluginName, moduleName, req, write, config) {
+            if (global.cssPluginEntryPoints && global.cssPluginEntryPoints.hasOwnProperty(moduleName)) {
+                var fileName = req.toUrl(moduleName + '.css');
+                var contents = [
+                    '/*---------------------------------------------------------',
+                    ' * Copyright (c) Microsoft Corporation. All rights reserved.',
+                    ' *--------------------------------------------------------*/'
+                ], entries = global.cssPluginEntryPoints[moduleName];
+                for (var i = 0; i < entries.length; i++) {
+                    if (global.inlineResources) {
+                        contents.push(Utilities.rewriteOrInlineUrls(entries[i].fsPath, entries[i].moduleName, moduleName, entries[i].contents, global.inlineResources === 'base64', global.inlineResourcesLimit));
+                    }
+                    else {
+                        contents.push(Utilities.rewriteUrls(entries[i].moduleName, moduleName, entries[i].contents));
+                    }
+                }
+                write(fileName, contents.join('\r\n'));
+            }
+        };
+        CSSPlugin.prototype.getInlinedResources = function () {
+            return global.cssInlinedResources || [];
+        };
+        CSSPlugin.BUILD_MAP = {};
+        CSSPlugin.BUILD_PATH_MAP = {};
+        return CSSPlugin;
+    }());
+    CSSBuildLoaderPlugin.CSSPlugin = CSSPlugin;
+    var Utilities = /** @class */ (function () {
+        function Utilities() {
+        }
+        Utilities.startsWith = function (haystack, needle) {
+            return haystack.length >= needle.length && haystack.substr(0, needle.length) === needle;
+        };
+        /**
+         * Find the path of a file.
+         */
+        Utilities.pathOf = function (filename) {
+            var lastSlash = filename.lastIndexOf('/');
+            if (lastSlash !== -1) {
+                return filename.substr(0, lastSlash + 1);
+            }
+            else {
+                return '';
+            }
+        };
+        /**
+         * A conceptual a + b for paths.
+         * Takes into account if `a` contains a protocol.
+         * Also normalizes the result: e.g.: a/b/ + ../c => a/c
+         */
+        Utilities.joinPaths = function (a, b) {
+            function findSlashIndexAfterPrefix(haystack, prefix) {
+                if (Utilities.startsWith(haystack, prefix)) {
+                    return Math.max(prefix.length, haystack.indexOf('/', prefix.length));
+                }
+                return 0;
+            }
+            var aPathStartIndex = 0;
+            aPathStartIndex = aPathStartIndex || findSlashIndexAfterPrefix(a, '//');
+            aPathStartIndex = aPathStartIndex || findSlashIndexAfterPrefix(a, 'http://');
+            aPathStartIndex = aPathStartIndex || findSlashIndexAfterPrefix(a, 'https://');
+            function pushPiece(pieces, piece) {
+                if (piece === './') {
+                    // Ignore
+                    return;
+                }
+                if (piece === '../') {
+                    var prevPiece = (pieces.length > 0 ? pieces[pieces.length - 1] : null);
+                    if (prevPiece && prevPiece === '/') {
+                        // Ignore
+                        return;
+                    }
+                    if (prevPiece && prevPiece !== '../') {
+                        // Pop
+                        pieces.pop();
+                        return;
+                    }
+                }
+                // Push
+                pieces.push(piece);
+            }
+            function push(pieces, path) {
+                while (path.length > 0) {
+                    var slashIndex = path.indexOf('/');
+                    var piece = (slashIndex >= 0 ? path.substring(0, slashIndex + 1) : path);
+                    path = (slashIndex >= 0 ? path.substring(slashIndex + 1) : '');
+                    pushPiece(pieces, piece);
+                }
+            }
+            var pieces = [];
+            push(pieces, a.substr(aPathStartIndex));
+            if (b.length > 0 && b.charAt(0) === '/') {
+                pieces = [];
+            }
+            push(pieces, b);
+            return a.substring(0, aPathStartIndex) + pieces.join('');
+        };
+        Utilities.commonPrefix = function (str1, str2) {
+            var len = Math.min(str1.length, str2.length);
+            for (var i = 0; i < len; i++) {
+                if (str1.charCodeAt(i) !== str2.charCodeAt(i)) {
+                    break;
+                }
+            }
+            return str1.substring(0, i);
+        };
+        Utilities.commonFolderPrefix = function (fromPath, toPath) {
+            var prefix = Utilities.commonPrefix(fromPath, toPath);
+            var slashIndex = prefix.lastIndexOf('/');
+            if (slashIndex === -1) {
+                return '';
+            }
+            return prefix.substring(0, slashIndex + 1);
+        };
+        Utilities.relativePath = function (fromPath, toPath) {
+            if (Utilities.startsWith(toPath, '/') || Utilities.startsWith(toPath, 'http://') || Utilities.startsWith(toPath, 'https://')) {
+                return toPath;
+            }
+            // Ignore common folder prefix
+            var prefix = Utilities.commonFolderPrefix(fromPath, toPath);
+            fromPath = fromPath.substr(prefix.length);
+            toPath = toPath.substr(prefix.length);
+            var upCount = fromPath.split('/').length;
+            var result = '';
+            for (var i = 1; i < upCount; i++) {
+                result += '../';
+            }
+            return result + toPath;
+        };
+        Utilities._replaceURL = function (contents, replacer) {
+            // Use ")" as the terminator as quotes are oftentimes not used at all
+            return contents.replace(/url\(\s*([^\)]+)\s*\)?/g, function (_) {
+                var matches = [];
+                for (var _i = 1; _i < arguments.length; _i++) {
+                    matches[_i - 1] = arguments[_i];
+                }
+                var url = matches[0];
+                // Eliminate starting quotes (the initial whitespace is not captured)
+                if (url.charAt(0) === '"' || url.charAt(0) === '\'') {
+                    url = url.substring(1);
+                }
+                // The ending whitespace is captured
+                while (url.length > 0 && (url.charAt(url.length - 1) === ' ' || url.charAt(url.length - 1) === '\t')) {
+                    url = url.substring(0, url.length - 1);
+                }
+                // Eliminate ending quotes
+                if (url.charAt(url.length - 1) === '"' || url.charAt(url.length - 1) === '\'') {
+                    url = url.substring(0, url.length - 1);
+                }
+                if (!Utilities.startsWith(url, 'data:') && !Utilities.startsWith(url, 'http://') && !Utilities.startsWith(url, 'https://')) {
+                    url = replacer(url);
+                }
+                return 'url(' + url + ')';
+            });
+        };
+        Utilities.rewriteUrls = function (originalFile, newFile, contents) {
+            return this._replaceURL(contents, function (url) {
+                var absoluteUrl = Utilities.joinPaths(Utilities.pathOf(originalFile), url);
+                return Utilities.relativePath(newFile, absoluteUrl);
+            });
+        };
+        Utilities.rewriteOrInlineUrls = function (originalFileFSPath, originalFile, newFile, contents, forceBase64, inlineByteLimit) {
+            var fs = require.nodeRequire('fs');
+            var path = require.nodeRequire('path');
+            return this._replaceURL(contents, function (url) {
+                if (/\.(svg|png)$/.test(url)) {
+                    var fsPath = path.join(path.dirname(originalFileFSPath), url);
+                    var fileContents = fs.readFileSync(fsPath);
+                    if (fileContents.length < inlineByteLimit) {
+                        global.cssInlinedResources = global.cssInlinedResources || [];
+                        var normalizedFSPath = fsPath.replace(/\\/g, '/');
+                        if (global.cssInlinedResources.indexOf(normalizedFSPath) >= 0) {
+                            console.warn('CSS INLINING IMAGE AT ' + fsPath + ' MORE THAN ONCE. CONSIDER CONSOLIDATING CSS RULES');
+                        }
+                        global.cssInlinedResources.push(normalizedFSPath);
+                        var MIME = /\.svg$/.test(url) ? 'image/svg+xml' : 'image/png';
+                        var DATA = ';base64,' + fileContents.toString('base64');
+                        if (!forceBase64 && /\.svg$/.test(url)) {
+                            // .svg => url encode as explained at https://codepen.io/tigt/post/optimizing-svgs-in-data-uris
+                            var newText = fileContents.toString()
+                                .replace(/"/g, '\'')
+                                .replace(/</g, '%3C')
+                                .replace(/>/g, '%3E')
+                                .replace(/&/g, '%26')
+                                .replace(/#/g, '%23')
+                                .replace(/\s+/g, ' ');
+                            var encodedData = ',' + newText;
+                            if (encodedData.length < DATA.length) {
+                                DATA = encodedData;
+                            }
+                        }
+                        return '"data:' + MIME + DATA + '"';
+                    }
+                }
+                var absoluteUrl = Utilities.joinPaths(Utilities.pathOf(originalFile), url);
+                return Utilities.relativePath(newFile, absoluteUrl);
+            });
+        };
+        return Utilities;
+    }());
+    CSSBuildLoaderPlugin.Utilities = Utilities;
+    (function () {
+        var cssLoader = null;
+        var isElectron = (typeof process !== 'undefined' && typeof process.versions !== 'undefined' && typeof process.versions['electron'] !== 'undefined');
+        if (typeof process !== 'undefined' && process.versions && !!process.versions.node && !isElectron) {
+            cssLoader = new NodeCSSLoader();
+        }
+        else {
+            cssLoader = new BrowserCSSLoader();
+        }
+        define('vs/css', new CSSPlugin(cssLoader));
+    })();
 })(CSSBuildLoaderPlugin || (CSSBuildLoaderPlugin = {}));
diff --git a/src/vs/editor/browser/config/charWidthReader.ts b/src/vs/editor/browser/config/charWidthReader.ts
index 6e5d782a037..63ba2d59a99 100644
--- a/src/vs/editor/browser/config/charWidthReader.ts
+++ b/src/vs/editor/browser/config/charWidthReader.ts
@@ -29,11 +29,7 @@ export class CharWidthRequest {
 	}
 }
 
-interface ICharWidthReader {
-	read(): void;
-}
-
-class DomCharWidthReader implements ICharWidthReader {
+class DomCharWidthReader {
 
 	private readonly _bareFontInfo: BareFontInfo;
 	private readonly _requests: CharWidthRequest[];
diff --git a/src/vs/editor/browser/config/configuration.ts b/src/vs/editor/browser/config/configuration.ts
index 74cb598bddf..f83aefc5125 100644
--- a/src/vs/editor/browser/config/configuration.ts
+++ b/src/vs/editor/browser/config/configuration.ts
@@ -90,6 +90,7 @@ export interface ISerializedFontInfo {
 	readonly isMonospace: boolean;
 	readonly typicalHalfwidthCharacterWidth: number;
 	readonly typicalFullwidthCharacterWidth: number;
+	readonly canUseHalfwidthRightwardsArrow: boolean;
 	readonly spaceWidth: number;
 	readonly maxDigitWidth: number;
 }
@@ -176,6 +177,7 @@ class CSSBasedConfiguration extends Disposable {
 					isMonospace: readConfig.isMonospace,
 					typicalHalfwidthCharacterWidth: Math.max(readConfig.typicalHalfwidthCharacterWidth, 5),
 					typicalFullwidthCharacterWidth: Math.max(readConfig.typicalFullwidthCharacterWidth, 5),
+					canUseHalfwidthRightwardsArrow: readConfig.canUseHalfwidthRightwardsArrow,
 					spaceWidth: Math.max(readConfig.spaceWidth, 5),
 					maxDigitWidth: Math.max(readConfig.maxDigitWidth, 5),
 				}, false);
@@ -214,7 +216,9 @@ class CSSBasedConfiguration extends Disposable {
 		const digit9 = this.createRequest('9', CharWidthRequestType.Regular, all, monospace);
 
 		// monospace test: used for whitespace rendering
-		this.createRequest('→', CharWidthRequestType.Regular, all, monospace);
+		const rightwardsArrow = this.createRequest('→', CharWidthRequestType.Regular, all, monospace);
+		const halfwidthRightwardsArrow = this.createRequest('￫', CharWidthRequestType.Regular, all, null);
+
 		this.createRequest('·', CharWidthRequestType.Regular, all, monospace);
 
 		// monospace test: some characters
@@ -256,6 +260,16 @@ class CSSBasedConfiguration extends Disposable {
 			}
 		}
 
+		let canUseHalfwidthRightwardsArrow = true;
+		if (isMonospace && halfwidthRightwardsArrow.width !== referenceWidth) {
+			// using a halfwidth rightwards arrow would break monospace...
+			canUseHalfwidthRightwardsArrow = false;
+		}
+		if (halfwidthRightwardsArrow.width > rightwardsArrow.width) {
+			// using a halfwidth rightwards arrow would paint a larger arrow than a regular rightwards arrow
+			canUseHalfwidthRightwardsArrow = false;
+		}
+
 		// let's trust the zoom level only 2s after it was changed.
 		const canTrustBrowserZoomLevel = (browser.getTimeSinceLastZoomLevelChanged() > 2000);
 		return new FontInfo({
@@ -268,6 +282,7 @@ class CSSBasedConfiguration extends Disposable {
 			isMonospace: isMonospace,
 			typicalHalfwidthCharacterWidth: typicalHalfwidthCharacter.width,
 			typicalFullwidthCharacterWidth: typicalFullwidthCharacter.width,
+			canUseHalfwidthRightwardsArrow: canUseHalfwidthRightwardsArrow,
 			spaceWidth: space.width,
 			maxDigitWidth: maxDigitWidth
 		}, canTrustBrowserZoomLevel);
diff --git a/src/vs/editor/browser/controller/coreCommands.ts b/src/vs/editor/browser/controller/coreCommands.ts
index 05c024d8d8c..46a8671d6f4 100644
--- a/src/vs/editor/browser/controller/coreCommands.ts
+++ b/src/vs/editor/browser/controller/coreCommands.ts
@@ -5,6 +5,7 @@
 
 'use strict';
 
+import * as nls from 'vs/nls';
 import { Position } from 'vs/editor/common/core/position';
 import { Range } from 'vs/editor/common/core/range';
 import * as editorCommon from 'vs/editor/common/editorCommon';
@@ -16,7 +17,7 @@ import { registerEditorCommand, ICommandOptions, EditorCommand, Command } from '
 import { IColumnSelectResult, ColumnSelection } from 'vs/editor/common/controller/cursorColumnSelection';
 import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
 import { KeyMod, KeyCode } from 'vs/base/common/keyCodes';
-import { KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRegistry';
+import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
 import H = editorCommon.Handler;
 import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
 import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
@@ -26,8 +27,9 @@ import { TypeOperations } from 'vs/editor/common/controller/cursorTypeOperations
 import { DeleteOperations } from 'vs/editor/common/controller/cursorDeleteOperations';
 import { VerticalRevealType } from 'vs/editor/common/view/viewEvents';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
+import { MenuId } from 'vs/platform/actions/common/actions';
 
-const CORE_WEIGHT = KeybindingsRegistry.WEIGHT.editorCore();
+const CORE_WEIGHT = KeybindingWeight.EditorCore;
 
 export abstract class CoreEditorCommand extends EditorCommand {
 	public runEditorCommand(accessor: ServicesAccessor, editor: ICodeEditor, args: any): void {
@@ -1620,7 +1622,7 @@ function findFocusedEditor(accessor: ServicesAccessor): ICodeEditor {
 }
 
 function registerCommand(command: Command) {
-	KeybindingsRegistry.registerCommandAndKeybindingRule(command.toCommandAndKeybindingRule(CORE_WEIGHT));
+	command.register();
 }
 
 /**
@@ -1704,11 +1706,17 @@ registerCommand(new EditorOrNativeTextInputCommand({
 	editorHandler: CoreNavigationCommands.SelectAll,
 	inputHandler: 'selectAll',
 	id: 'editor.action.selectAll',
-	precondition: EditorContextKeys.focus,
+	precondition: EditorContextKeys.textInputFocus,
 	kbOpts: {
 		weight: CORE_WEIGHT,
 		kbExpr: null,
 		primary: KeyMod.CtrlCmd | KeyCode.KEY_A
+	},
+	menubarOpts: {
+		menuId: MenuId.MenubarSelectionMenu,
+		group: '1_basic',
+		title: nls.localize({ key: 'miSelectAll', comment: ['&& denotes a mnemonic'] }, "&&Select All"),
+		order: 1
 	}
 }));
 
@@ -1721,6 +1729,12 @@ registerCommand(new EditorOrNativeTextInputCommand({
 		weight: CORE_WEIGHT,
 		kbExpr: EditorContextKeys.textInputFocus,
 		primary: KeyMod.CtrlCmd | KeyCode.KEY_Z
+	},
+	menubarOpts: {
+		menuId: MenuId.MenubarEditMenu,
+		group: '1_do',
+		title: nls.localize({ key: 'miUndo', comment: ['&& denotes a mnemonic'] }, "&&Undo"),
+		order: 1
 	}
 }));
 registerCommand(new EditorHandlerCommand('default:' + H.Undo, H.Undo));
@@ -1736,6 +1750,12 @@ registerCommand(new EditorOrNativeTextInputCommand({
 		primary: KeyMod.CtrlCmd | KeyCode.KEY_Y,
 		secondary: [KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KEY_Z],
 		mac: { primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KEY_Z }
+	},
+	menubarOpts: {
+		menuId: MenuId.MenubarEditMenu,
+		group: '1_do',
+		title: nls.localize({ key: 'miRedo', comment: ['&& denotes a mnemonic'] }, "&&Redo"),
+		order: 2
 	}
 }));
 registerCommand(new EditorHandlerCommand('default:' + H.Redo, H.Redo));
diff --git a/src/vs/editor/browser/controller/textAreaHandler.ts b/src/vs/editor/browser/controller/textAreaHandler.ts
index fb902c2a458..d649911a352 100644
--- a/src/vs/editor/browser/controller/textAreaHandler.ts
+++ b/src/vs/editor/browser/controller/textAreaHandler.ts
@@ -8,7 +8,7 @@ import 'vs/css!./textAreaHandler';
 import * as platform from 'vs/base/common/platform';
 import * as browser from 'vs/base/browser/browser';
 import * as strings from 'vs/base/common/strings';
-import { TextAreaInput, ITextAreaInputHost, IPasteData, ICompositionData } from 'vs/editor/browser/controller/textAreaInput';
+import { TextAreaInput, ITextAreaInputHost, IPasteData, ICompositionData, CopyOptions } from 'vs/editor/browser/controller/textAreaInput';
 import { ISimpleModel, ITypeData, TextAreaState, PagedScreenReaderStrategy } from 'vs/editor/browser/controller/textAreaState';
 import { Range } from 'vs/editor/common/core/range';
 import { Selection } from 'vs/editor/common/core/selection';
@@ -100,6 +100,7 @@ export class TextAreaHandler extends ViewPart {
 	private _fontInfo: BareFontInfo;
 	private _lineHeight: number;
 	private _emptySelectionClipboard: boolean;
+	private _copyWithSyntaxHighlighting: boolean;
 
 	/**
 	 * Defined only when the text area is visible (composition case).
@@ -128,6 +129,7 @@ export class TextAreaHandler extends ViewPart {
 		this._fontInfo = conf.fontInfo;
 		this._lineHeight = conf.lineHeight;
 		this._emptySelectionClipboard = conf.emptySelectionClipboard;
+		this._copyWithSyntaxHighlighting = conf.copyWithSyntaxHighlighting;
 
 		this._visibleTextArea = null;
 		this._selections = [new Selection(1, 1, 1, 1)];
@@ -191,6 +193,10 @@ export class TextAreaHandler extends ViewPart {
 			},
 
 			getHTMLToCopy: (): string => {
+				if (!this._copyWithSyntaxHighlighting && !CopyOptions.forceCopyWithSyntaxHighlighting) {
+					return null;
+				}
+
 				return this._context.model.getHTMLToCopy(this._selections, this._emptySelectionClipboard);
 			},
 
@@ -387,6 +393,9 @@ export class TextAreaHandler extends ViewPart {
 		if (e.emptySelectionClipboard) {
 			this._emptySelectionClipboard = conf.emptySelectionClipboard;
 		}
+		if (e.copyWithSyntaxHighlighting) {
+			this._copyWithSyntaxHighlighting = conf.copyWithSyntaxHighlighting;
+		}
 
 		return true;
 	}
diff --git a/src/vs/editor/browser/controller/textAreaInput.ts b/src/vs/editor/browser/controller/textAreaInput.ts
index 561d2a47ce6..53169924b40 100644
--- a/src/vs/editor/browser/controller/textAreaInput.ts
+++ b/src/vs/editor/browser/controller/textAreaInput.ts
@@ -267,7 +267,6 @@ export class TextAreaInput extends Disposable {
 			}
 
 			this._textAreaState = newState;
-			// console.log('==> DEDUCED INPUT: ' + JSON.stringify(typeInput));
 			if (this._nextCommand === ReadFromTextArea.Type) {
 				if (typeInput.text !== '') {
 					this._onType.fire(typeInput);
diff --git a/src/vs/editor/browser/controller/textAreaState.ts b/src/vs/editor/browser/controller/textAreaState.ts
index 09f54a8a013..fb3249c7903 100644
--- a/src/vs/editor/browser/controller/textAreaState.ts
+++ b/src/vs/editor/browser/controller/textAreaState.ts
@@ -121,7 +121,7 @@ export class TextAreaState {
 			// See https://github.com/Microsoft/vscode/issues/42251
 			// where typing always happens at offset 0 in the textarea
 			// when using a custom title area in OSX and moving the window
-			if (strings.endsWith(currentValue, previousValue)) {
+			if (!strings.startsWith(currentValue, previousValue) && strings.endsWith(currentValue, previousValue)) {
 				// Looks like something was typed at offset 0
 				// ==> pretend we placed the cursor at offset 0 to begin with...
 				previousSelectionStart = 0;
diff --git a/src/vs/editor/browser/editorBrowser.ts b/src/vs/editor/browser/editorBrowser.ts
index 559d6cdfc1e..d2b256b0ac9 100644
--- a/src/vs/editor/browser/editorBrowser.ts
+++ b/src/vs/editor/browser/editorBrowser.ts
@@ -396,6 +396,14 @@ export interface ICodeEditor extends editorCommon.IEditor {
 	 * @internal
 	 */
 	onDidType(listener: (text: string) => void): IDisposable;
+	/**
+	 * An event emitted after composition has started.
+	 */
+	onCompositionStart(listener: () => void): IDisposable;
+	/**
+	 * An event emitted after composition has ended.
+	 */
+	onCompositionEnd(listener: () => void): IDisposable;
 	/**
 	 * An event emitted when editing failed because the editor is read-only.
 	 * @event
@@ -578,9 +586,9 @@ export interface ICodeEditor extends editorCommon.IEditor {
 	 * The edits will land on the undo-redo stack, but no "undo stop" will be pushed.
 	 * @param source The source of the call.
 	 * @param edits The edits to execute.
-	 * @param endCursoState Cursor state after the edits were applied.
+	 * @param endCursorState Cursor state after the edits were applied.
 	 */
-	executeEdits(source: string, edits: IIdentifiedSingleEditOperation[], endCursoState?: Selection[]): boolean;
+	executeEdits(source: string, edits: IIdentifiedSingleEditOperation[], endCursorState?: Selection[]): boolean;
 
 	/**
 	 * Execute multiple (concommitent) commands on the editor.
@@ -853,4 +861,4 @@ export function getCodeEditor(thing: any): ICodeEditor {
 	}
 
 	return null;
-}
\ No newline at end of file
+}
diff --git a/src/vs/editor/browser/editorDom.ts b/src/vs/editor/browser/editorDom.ts
index b483b681901..48f8128addd 100644
--- a/src/vs/editor/browser/editorDom.ts
+++ b/src/vs/editor/browser/editorDom.ts
@@ -14,13 +14,11 @@ import { GlobalMouseMoveMonitor } from 'vs/base/browser/globalMouseMoveMonitor';
  */
 export class PageCoordinates {
 	_pageCoordinatesBrand: void;
-	public readonly x: number;
-	public readonly y: number;
 
-	constructor(x: number, y: number) {
-		this.x = x;
-		this.y = y;
-	}
+	constructor(
+		public readonly x: number,
+		public readonly y: number
+	) { }
 
 	public toClientCoordinates(): ClientCoordinates {
 		return new ClientCoordinates(this.x - dom.StandardWindow.scrollX, this.y - dom.StandardWindow.scrollY);
@@ -37,13 +35,10 @@ export class PageCoordinates {
 export class ClientCoordinates {
 	_clientCoordinatesBrand: void;
 
-	public readonly clientX: number;
-	public readonly clientY: number;
-
-	constructor(clientX: number, clientY: number) {
-		this.clientX = clientX;
-		this.clientY = clientY;
-	}
+	constructor(
+		public readonly clientX: number,
+		public readonly clientY: number
+	) { }
 
 	public toPageCoordinates(): PageCoordinates {
 		return new PageCoordinates(this.clientX + dom.StandardWindow.scrollX, this.clientY + dom.StandardWindow.scrollY);
@@ -56,17 +51,12 @@ export class ClientCoordinates {
 export class EditorPagePosition {
 	_editorPagePositionBrand: void;
 
-	public readonly x: number;
-	public readonly y: number;
-	public readonly width: number;
-	public readonly height: number;
-
-	constructor(x: number, y: number, width: number, height: number) {
-		this.x = x;
-		this.y = y;
-		this.width = width;
-		this.height = height;
-	}
+	constructor(
+		public readonly x: number,
+		public readonly y: number,
+		public readonly width: number,
+		public readonly height: number
+	) { }
 }
 
 export function createEditorPagePosition(editorViewDomNode: HTMLElement): EditorPagePosition {
diff --git a/src/vs/editor/browser/editorExtensions.ts b/src/vs/editor/browser/editorExtensions.ts
index c3de31ad7fb..fb90065a76e 100644
--- a/src/vs/editor/browser/editorExtensions.ts
+++ b/src/vs/editor/browser/editorExtensions.ts
@@ -5,21 +5,22 @@
 'use strict';
 
 import { illegalArgument } from 'vs/base/common/errors';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { ServicesAccessor, IConstructorSignature1 } from 'vs/platform/instantiation/common/instantiation';
 import { CommandsRegistry, ICommandHandlerDescription } from 'vs/platform/commands/common/commands';
-import { KeybindingsRegistry, ICommandAndKeybindingRule, IKeybindings } from 'vs/platform/keybinding/common/keybindingsRegistry';
+import { KeybindingsRegistry, IKeybindings } from 'vs/platform/keybinding/common/keybindingsRegistry';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { Position } from 'vs/editor/common/core/position';
 import * as editorCommon from 'vs/editor/common/editorCommon';
 import { IModelService } from 'vs/editor/common/services/modelService';
-import { MenuId, MenuRegistry, IMenuItem } from 'vs/platform/actions/common/actions';
+import { MenuId, MenuRegistry } from 'vs/platform/actions/common/actions';
 import { IContextKeyService, ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
 import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
 import { ITextModel } from 'vs/editor/common/model';
+import { IPosition } from 'vs/base/browser/ui/contextview/contextview';
 
 export type ServicesAccessor = ServicesAccessor;
 export type IEditorContributionCtor = IConstructorSignature1<ICodeEditor, editorCommon.IEditorContribution>;
@@ -28,53 +29,83 @@ export type IEditorContributionCtor = IConstructorSignature1<ICodeEditor, editor
 
 export interface ICommandKeybindingsOptions extends IKeybindings {
 	kbExpr?: ContextKeyExpr;
-	weight?: number;
+	weight: number;
+}
+export interface ICommandMenubarOptions {
+	menuId: MenuId;
+	group: string;
+	order: number;
+	when?: ContextKeyExpr;
+	title: string;
 }
 export interface ICommandOptions {
 	id: string;
 	precondition: ContextKeyExpr;
 	kbOpts?: ICommandKeybindingsOptions;
 	description?: ICommandHandlerDescription;
+	menubarOpts?: ICommandMenubarOptions;
 }
 export abstract class Command {
 	public readonly id: string;
 	public readonly precondition: ContextKeyExpr;
 	private readonly _kbOpts: ICommandKeybindingsOptions;
+	private readonly _menubarOpts: ICommandMenubarOptions;
 	private readonly _description: ICommandHandlerDescription;
 
 	constructor(opts: ICommandOptions) {
 		this.id = opts.id;
 		this.precondition = opts.precondition;
 		this._kbOpts = opts.kbOpts;
+		this._menubarOpts = opts.menubarOpts;
 		this._description = opts.description;
 	}
 
-	public toCommandAndKeybindingRule(defaultWeight: number): ICommandAndKeybindingRule {
-		const kbOpts = this._kbOpts || { primary: 0 };
+	public register(): void {
 
-		let kbWhen = kbOpts.kbExpr;
-		if (this.precondition) {
-			if (kbWhen) {
-				kbWhen = ContextKeyExpr.and(kbWhen, this.precondition);
-			} else {
-				kbWhen = this.precondition;
-			}
+		if (this._menubarOpts) {
+			MenuRegistry.appendMenuItem(this._menubarOpts.menuId, {
+				group: this._menubarOpts.group,
+				command: {
+					id: this.id,
+					title: this._menubarOpts.title,
+					// precondition: this.precondition
+				},
+				when: this._menubarOpts.when,
+				order: this._menubarOpts.order
+			});
 		}
 
-		const weight = (typeof kbOpts.weight === 'number' ? kbOpts.weight : defaultWeight);
+		if (this._kbOpts) {
+			let kbWhen = this._kbOpts.kbExpr;
+			if (this.precondition) {
+				if (kbWhen) {
+					kbWhen = ContextKeyExpr.and(kbWhen, this.precondition);
+				} else {
+					kbWhen = this.precondition;
+				}
+			}
 
-		return {
-			id: this.id,
-			handler: (accessor, args) => this.runCommand(accessor, args),
-			weight: weight,
-			when: kbWhen,
-			primary: kbOpts.primary,
-			secondary: kbOpts.secondary,
-			win: kbOpts.win,
-			linux: kbOpts.linux,
-			mac: kbOpts.mac,
-			description: this._description
-		};
+			KeybindingsRegistry.registerCommandAndKeybindingRule({
+				id: this.id,
+				handler: (accessor, args) => this.runCommand(accessor, args),
+				weight: this._kbOpts.weight,
+				when: kbWhen,
+				primary: this._kbOpts.primary,
+				secondary: this._kbOpts.secondary,
+				win: this._kbOpts.win,
+				linux: this._kbOpts.linux,
+				mac: this._kbOpts.mac,
+				description: this._description
+			});
+
+		} else {
+
+			CommandsRegistry.registerCommand({
+				id: this.id,
+				handler: (accessor, args) => this.runCommand(accessor, args),
+				description: this._description
+			});
+		}
 	}
 
 	public abstract runCommand(accessor: ServicesAccessor, args: any): void | TPromise<void>;
@@ -143,8 +174,8 @@ export abstract class EditorCommand extends Command {
 //#region EditorAction
 
 export interface IEditorCommandMenuOptions {
-	group?: string;
-	order?: number;
+	group: string;
+	order: number;
 	when?: ContextKeyExpr;
 }
 export interface IActionOptions extends ICommandOptions {
@@ -165,20 +196,21 @@ export abstract class EditorAction extends EditorCommand {
 		this.menuOpts = opts.menuOpts;
 	}
 
-	public toMenuItem(): IMenuItem {
-		if (!this.menuOpts) {
-			return null;
+	public register(): void {
+
+		if (this.menuOpts) {
+			MenuRegistry.appendMenuItem(MenuId.EditorContext, {
+				command: {
+					id: this.id,
+					title: this.label
+				},
+				when: ContextKeyExpr.and(this.precondition, this.menuOpts.when),
+				group: this.menuOpts.group,
+				order: this.menuOpts.order
+			});
 		}
 
-		return {
-			command: {
-				id: this.id,
-				title: this.label
-			},
-			when: ContextKeyExpr.and(this.precondition, this.menuOpts.when),
-			group: this.menuOpts.group,
-			order: this.menuOpts.order
-		};
+		super.register();
 	}
 
 	public runEditorCommand(accessor: ServicesAccessor, editor: ICodeEditor, args: any): void | TPromise<void> {
@@ -210,8 +242,14 @@ export function registerLanguageCommand(id: string, handler: (accessor: Services
 	CommandsRegistry.registerCommand(id, (accessor, args) => handler(accessor, args || {}));
 }
 
-export function registerDefaultLanguageCommand(id: string, handler: (model: ITextModel, position: Position, args: { [n: string]: any }) => any) {
-	registerLanguageCommand(id, function (accessor, args) {
+interface IDefaultArgs {
+	resource: URI;
+	position: IPosition;
+	[name: string]: any;
+}
+
+export function registerDefaultLanguageCommand(id: string, handler: (model: ITextModel, position: Position, args: IDefaultArgs) => any) {
+	registerLanguageCommand(id, function (accessor, args: IDefaultArgs) {
 
 		const { resource, position } = args;
 		if (!(resource instanceof URI)) {
@@ -288,14 +326,7 @@ class EditorContributionRegistry {
 	}
 
 	public registerEditorAction(action: EditorAction) {
-
-		let menuItem = action.toMenuItem();
-		if (menuItem) {
-			MenuRegistry.appendMenuItem(MenuId.EditorContext, menuItem);
-		}
-
-		KeybindingsRegistry.registerCommandAndKeybindingRule(action.toCommandAndKeybindingRule(KeybindingsRegistry.WEIGHT.editorContrib()));
-
+		action.register();
 		this.editorActions.push(action);
 	}
 
@@ -308,7 +339,7 @@ class EditorContributionRegistry {
 	}
 
 	public registerEditorCommand(editorCommand: EditorCommand) {
-		KeybindingsRegistry.registerCommandAndKeybindingRule(editorCommand.toCommandAndKeybindingRule(KeybindingsRegistry.WEIGHT.editorContrib()));
+		editorCommand.register();
 		this.editorCommands[editorCommand.id] = editorCommand;
 	}
 
diff --git a/src/vs/editor/browser/services/bulkEditService.ts b/src/vs/editor/browser/services/bulkEditService.ts
index 8bbde13a40f..c31b000de98 100644
--- a/src/vs/editor/browser/services/bulkEditService.ts
+++ b/src/vs/editor/browser/services/bulkEditService.ts
@@ -8,7 +8,6 @@ import { createDecorator } from 'vs/platform/instantiation/common/instantiation'
 import { WorkspaceEdit } from 'vs/editor/common/modes';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { ICodeEditor } from '../editorBrowser';
-import { Selection } from 'vs/editor/common/core/selection';
 import { IProgressRunner } from 'vs/platform/progress/common/progress';
 
 export const IBulkEditService = createDecorator<IBulkEditService>('IWorkspaceEditService');
@@ -20,7 +19,6 @@ export interface IBulkEditOptions {
 }
 
 export interface IBulkEditResult {
-	selection: Selection;
 	ariaSummary: string;
 }
 
diff --git a/src/vs/editor/browser/services/codeEditorServiceImpl.ts b/src/vs/editor/browser/services/codeEditorServiceImpl.ts
index 9fad9a52fe4..7b006da43e7 100644
--- a/src/vs/editor/browser/services/codeEditorServiceImpl.ts
+++ b/src/vs/editor/browser/services/codeEditorServiceImpl.ts
@@ -5,7 +5,7 @@
 'use strict';
 
 import * as strings from 'vs/base/common/strings';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import * as dom from 'vs/base/browser/dom';
 import { IDecorationRenderOptions, IThemeDecorationRenderOptions, IContentDecorationRenderOptions, isThemeColor } from 'vs/editor/common/editorCommon';
 import { IModelDecorationOptions, IModelDecorationOverviewRulerOptions, OverviewRulerLane, TrackedRangeStickiness } from 'vs/editor/common/model';
@@ -212,7 +212,7 @@ class DecorationTypeOptionsProvider implements IModelDecorationOptionsProvider {
 
 const _CSS_MAP: { [prop: string]: string; } = {
 	color: 'color:{0} !important;',
-	opacity: 'opacity:{0};',
+	opacity: 'opacity:{0}; will-change: opacity;', // TODO@Ben: 'will-change: opacity' is a workaround for https://github.com/Microsoft/vscode/issues/52196
 	backgroundColor: 'background-color:{0};',
 
 	outline: 'outline:{0};',
diff --git a/src/vs/editor/browser/services/openerService.ts b/src/vs/editor/browser/services/openerService.ts
index 931531d2719..eefc44bb8e1 100644
--- a/src/vs/editor/browser/services/openerService.ts
+++ b/src/vs/editor/browser/services/openerService.ts
@@ -4,13 +4,13 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import * as dom from 'vs/base/browser/dom';
+import * as resources from 'vs/base/common/resources';
 import { parse } from 'vs/base/common/marshalling';
 import { Schemas } from 'vs/base/common/network';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { normalize } from 'vs/base/common/paths';
 import { ICommandService, CommandsRegistry } from 'vs/platform/commands/common/commands';
 import { IOpenerService } from 'vs/platform/opener/common/opener';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
@@ -79,7 +79,7 @@ export class OpenerService implements IOpenerService {
 				return TPromise.as(undefined);
 
 			} else if (resource.scheme === Schemas.file) {
-				resource = resource.with({ path: normalize(resource.path) }); // workaround for non-normalized paths (https://github.com/Microsoft/vscode/issues/12954)
+				resource = resources.normalizePath(resource); // workaround for non-normalized paths (https://github.com/Microsoft/vscode/issues/12954)
 			}
 			promise = this._editorService.openCodeEditor({ resource, options: { selection, } }, this._editorService.getFocusedCodeEditor(), options && options.openToSide);
 		}
diff --git a/src/vs/editor/browser/viewParts/indentGuides/indentGuides.ts b/src/vs/editor/browser/viewParts/indentGuides/indentGuides.ts
index 7509cb3f777..aef3582c374 100644
--- a/src/vs/editor/browser/viewParts/indentGuides/indentGuides.ts
+++ b/src/vs/editor/browser/viewParts/indentGuides/indentGuides.ts
@@ -22,6 +22,7 @@ export class IndentGuidesOverlay extends DynamicViewOverlay {
 	private _spaceWidth: number;
 	private _renderResult: string[];
 	private _enabled: boolean;
+	private _activeIndentEnabled: boolean;
 
 	constructor(context: ViewContext) {
 		super();
@@ -30,6 +31,7 @@ export class IndentGuidesOverlay extends DynamicViewOverlay {
 		this._lineHeight = this._context.configuration.editor.lineHeight;
 		this._spaceWidth = this._context.configuration.editor.fontInfo.spaceWidth;
 		this._enabled = this._context.configuration.editor.viewInfo.renderIndentGuides;
+		this._activeIndentEnabled = this._context.configuration.editor.viewInfo.highlightActiveIndentGuide;
 		this._renderResult = null;
 
 		this._context.addEventHandler(this);
@@ -53,6 +55,7 @@ export class IndentGuidesOverlay extends DynamicViewOverlay {
 		}
 		if (e.viewInfo) {
 			this._enabled = this._context.configuration.editor.viewInfo.renderIndentGuides;
+			this._activeIndentEnabled = this._context.configuration.editor.viewInfo.highlightActiveIndentGuide;
 		}
 		return true;
 	}
@@ -114,7 +117,7 @@ export class IndentGuidesOverlay extends DynamicViewOverlay {
 		let activeIndentStartLineNumber = 0;
 		let activeIndentEndLineNumber = 0;
 		let activeIndentLevel = 0;
-		if (this._primaryLineNumber) {
+		if (this._activeIndentEnabled && this._primaryLineNumber) {
 			const activeIndentInfo = this._context.model.getActiveIndentGuide(this._primaryLineNumber, visibleStartLineNumber, visibleEndLineNumber);
 			activeIndentStartLineNumber = activeIndentInfo.startLineNumber;
 			activeIndentEndLineNumber = activeIndentInfo.endLineNumber;
diff --git a/src/vs/editor/browser/viewParts/lines/viewLine.ts b/src/vs/editor/browser/viewParts/lines/viewLine.ts
index 6e1338d6adb..01acc025bfe 100644
--- a/src/vs/editor/browser/viewParts/lines/viewLine.ts
+++ b/src/vs/editor/browser/viewParts/lines/viewLine.ts
@@ -74,6 +74,7 @@ export class ViewLineOptions {
 	public readonly renderControlCharacters: boolean;
 	public readonly spaceWidth: number;
 	public readonly useMonospaceOptimizations: boolean;
+	public readonly canUseHalfwidthRightwardsArrow: boolean;
 	public readonly lineHeight: number;
 	public readonly stopRenderingLineAfter: number;
 	public readonly fontLigatures: boolean;
@@ -87,6 +88,7 @@ export class ViewLineOptions {
 			config.editor.fontInfo.isMonospace
 			&& !config.editor.viewInfo.disableMonospaceOptimizations
 		);
+		this.canUseHalfwidthRightwardsArrow = config.editor.fontInfo.canUseHalfwidthRightwardsArrow;
 		this.lineHeight = config.editor.lineHeight;
 		this.stopRenderingLineAfter = config.editor.viewInfo.stopRenderingLineAfter;
 		this.fontLigatures = config.editor.viewInfo.fontLigatures;
@@ -99,6 +101,7 @@ export class ViewLineOptions {
 			&& this.renderControlCharacters === other.renderControlCharacters
 			&& this.spaceWidth === other.spaceWidth
 			&& this.useMonospaceOptimizations === other.useMonospaceOptimizations
+			&& this.canUseHalfwidthRightwardsArrow === other.canUseHalfwidthRightwardsArrow
 			&& this.lineHeight === other.lineHeight
 			&& this.stopRenderingLineAfter === other.stopRenderingLineAfter
 			&& this.fontLigatures === other.fontLigatures
@@ -190,6 +193,7 @@ export class ViewLine implements IVisibleLine {
 
 		let renderLineInput = new RenderLineInput(
 			options.useMonospaceOptimizations,
+			options.canUseHalfwidthRightwardsArrow,
 			lineData.content,
 			lineData.continuesWithWrappedLine,
 			lineData.isBasicASCII,
diff --git a/src/vs/editor/browser/widget/codeEditorWidget.ts b/src/vs/editor/browser/widget/codeEditorWidget.ts
index e35b26ddd3a..410e034e8b4 100644
--- a/src/vs/editor/browser/widget/codeEditorWidget.ts
+++ b/src/vs/editor/browser/widget/codeEditorWidget.ts
@@ -46,12 +46,14 @@ import { IMouseEvent } from 'vs/base/browser/mouseEvent';
 import { InternalEditorAction } from 'vs/editor/common/editorAction';
 import { ICommandDelegate } from 'vs/editor/browser/view/viewController';
 import { CoreEditorCommand } from 'vs/editor/browser/controller/coreCommands';
-import { editorErrorForeground, editorErrorBorder, editorWarningForeground, editorWarningBorder, editorInfoBorder, editorInfoForeground, editorHintForeground, editorHintBorder, editorUnnecessaryForeground } from 'vs/editor/common/view/editorColorRegistry';
+import { editorErrorForeground, editorErrorBorder, editorWarningForeground, editorWarningBorder, editorInfoBorder, editorInfoForeground, editorHintForeground, editorHintBorder, editorUnnecessaryCodeOpacity, editorUnnecessaryCodeBorder } from 'vs/editor/common/view/editorColorRegistry';
 import { Color } from 'vs/base/common/color';
 import { ClassName } from 'vs/editor/common/model/intervalTree';
 
 let EDITOR_ID = 0;
 
+const SHOW_UNUSED_ENABLED_CLASS = 'showUnused';
+
 export interface ICodeEditorWidgetOptions {
 	/**
 	 * Is this a simple widget (not a real code editor) ?
@@ -125,6 +127,12 @@ export class CodeEditorWidget extends Disposable implements editorBrowser.ICodeE
 	private readonly _onDidType: Emitter<string> = this._register(new Emitter<string>());
 	public readonly onDidType = this._onDidType.event;
 
+	private readonly _onCompositionStart: Emitter<void> = this._register(new Emitter<void>());
+	public readonly onCompositionStart = this._onCompositionStart.event;
+
+	private readonly _onCompositionEnd: Emitter<void> = this._register(new Emitter<void>());
+	public readonly onCompositionEnd = this._onCompositionEnd.event;
+
 	private readonly _onDidPaste: Emitter<Range> = this._register(new Emitter<Range>());
 	public readonly onDidPaste = this._onDidPaste.event;
 
@@ -227,6 +235,11 @@ export class CodeEditorWidget extends Disposable implements editorBrowser.ICodeE
 			if (e.layoutInfo) {
 				this._onDidLayoutChange.fire(this._configuration.editor.layoutInfo);
 			}
+			if (this._configuration.editor.showUnused) {
+				this.domElement.classList.add(SHOW_UNUSED_ENABLED_CLASS);
+			} else {
+				this.domElement.classList.remove(SHOW_UNUSED_ENABLED_CLASS);
+			}
 		}));
 
 		this._contextKeyService = this._register(contextKeyService.createScoped(this.domElement));
@@ -887,6 +900,13 @@ export class CodeEditorWidget extends Disposable implements editorBrowser.ICodeE
 			return;
 		}
 
+		if (handlerId === editorCommon.Handler.CompositionStart) {
+			this._onCompositionStart.fire();
+		}
+		if (handlerId === editorCommon.Handler.CompositionEnd) {
+			this._onCompositionEnd.fire();
+		}
+
 		const action = this.getAction(handlerId);
 		if (action) {
 			TPromise.as(action.run()).then(null, onUnexpectedError);
@@ -909,7 +929,7 @@ export class CodeEditorWidget extends Disposable implements editorBrowser.ICodeE
 		if (command) {
 			payload = payload || {};
 			payload.source = source;
-			TPromise.as(command.runEditorCommand(null, this, payload)).done(null, onUnexpectedError);
+			TPromise.as(command.runEditorCommand(null, this, payload)).then(null, onUnexpectedError);
 			return true;
 		}
 
@@ -1349,22 +1369,22 @@ export class CodeEditorWidget extends Disposable implements editorBrowser.ICodeE
 		if (this.isSimpleWidget) {
 			commandDelegate = {
 				paste: (source: string, text: string, pasteOnNewLine: boolean, multicursorText: string[]) => {
-					this.cursor.trigger(source, editorCommon.Handler.Paste, { text, pasteOnNewLine, multicursorText });
+					this.trigger(source, editorCommon.Handler.Paste, { text, pasteOnNewLine, multicursorText });
 				},
 				type: (source: string, text: string) => {
-					this.cursor.trigger(source, editorCommon.Handler.Type, { text });
+					this.trigger(source, editorCommon.Handler.Type, { text });
 				},
 				replacePreviousChar: (source: string, text: string, replaceCharCnt: number) => {
-					this.cursor.trigger(source, editorCommon.Handler.ReplacePreviousChar, { text, replaceCharCnt });
+					this.trigger(source, editorCommon.Handler.ReplacePreviousChar, { text, replaceCharCnt });
 				},
 				compositionStart: (source: string) => {
-					this.cursor.trigger(source, editorCommon.Handler.CompositionStart, undefined);
+					this.trigger(source, editorCommon.Handler.CompositionStart, undefined);
 				},
 				compositionEnd: (source: string) => {
-					this.cursor.trigger(source, editorCommon.Handler.CompositionEnd, undefined);
+					this.trigger(source, editorCommon.Handler.CompositionEnd, undefined);
 				},
 				cut: (source: string) => {
-					this.cursor.trigger(source, editorCommon.Handler.Cut, undefined);
+					this.trigger(source, editorCommon.Handler.Cut, undefined);
 				}
 			};
 		} else {
@@ -1543,6 +1563,8 @@ class EditorContextKeysManager extends Disposable {
 	private _editorReadonly: IContextKey<boolean>;
 	private _hasMultipleSelections: IContextKey<boolean>;
 	private _hasNonEmptySelection: IContextKey<boolean>;
+	private _canUndo: IContextKey<boolean>;
+	private _canRedo: IContextKey<boolean>;
 
 	constructor(
 		editor: CodeEditorWidget,
@@ -1560,6 +1582,8 @@ class EditorContextKeysManager extends Disposable {
 		this._editorReadonly = EditorContextKeys.readOnly.bindTo(contextKeyService);
 		this._hasMultipleSelections = EditorContextKeys.hasMultipleSelections.bindTo(contextKeyService);
 		this._hasNonEmptySelection = EditorContextKeys.hasNonEmptySelection.bindTo(contextKeyService);
+		this._canUndo = EditorContextKeys.canUndo.bindTo(contextKeyService);
+		this._canRedo = EditorContextKeys.canRedo.bindTo(contextKeyService);
 
 		this._register(this._editor.onDidChangeConfiguration(() => this._updateFromConfig()));
 		this._register(this._editor.onDidChangeCursorSelection(() => this._updateFromSelection()));
@@ -1567,10 +1591,13 @@ class EditorContextKeysManager extends Disposable {
 		this._register(this._editor.onDidBlurEditorWidget(() => this._updateFromFocus()));
 		this._register(this._editor.onDidFocusEditorText(() => this._updateFromFocus()));
 		this._register(this._editor.onDidBlurEditorText(() => this._updateFromFocus()));
+		this._register(this._editor.onDidChangeModel(() => this._updateFromModel()));
+		this._register(this._editor.onDidChangeConfiguration(() => this._updateFromModel()));
 
 		this._updateFromConfig();
 		this._updateFromSelection();
 		this._updateFromFocus();
+		this._updateFromModel();
 	}
 
 	private _updateFromConfig(): void {
@@ -1596,6 +1623,12 @@ class EditorContextKeysManager extends Disposable {
 		this._editorTextFocus.set(this._editor.hasTextFocus() && !this._editor.isSimpleWidget);
 		this._textInputFocus.set(this._editor.hasTextFocus());
 	}
+
+	private _updateFromModel(): void {
+		const model = this._editor.getModel();
+		this._canUndo.set(model && model.canUndo());
+		this._canRedo.set(model && model.canRedo());
+	}
 }
 
 export class EditorModeContext extends Disposable {
@@ -1796,8 +1829,13 @@ registerThemingParticipant((theme, collector) => {
 		collector.addRule(`.monaco-editor .${ClassName.EditorHintDecoration} { background: url("data:image/svg+xml,${getDotDotDotSVGData(hintForeground)}") no-repeat bottom left; }`);
 	}
 
-	const unnecessaryForeground = theme.getColor(editorUnnecessaryForeground);
+	const unnecessaryForeground = theme.getColor(editorUnnecessaryCodeOpacity);
 	if (unnecessaryForeground) {
-		collector.addRule(`.monaco-editor .${ClassName.EditorUnnecessaryDecoration} { color: ${unnecessaryForeground}; }`);
+		collector.addRule(`.${SHOW_UNUSED_ENABLED_CLASS} .monaco-editor .${ClassName.EditorUnnecessaryInlineDecoration} { opacity: ${unnecessaryForeground.rgba.a}; will-change: opacity; }`); // TODO@Ben: 'will-change: opacity' is a workaround for https://github.com/Microsoft/vscode/issues/52196
+	}
+
+	const unnecessaryBorder = theme.getColor(editorUnnecessaryCodeBorder);
+	if (unnecessaryBorder) {
+		collector.addRule(`.${SHOW_UNUSED_ENABLED_CLASS} .monaco-editor .${ClassName.EditorUnnecessaryDecoration} { border-bottom: 2px dashed ${unnecessaryBorder}; }`);
 	}
 });
diff --git a/src/vs/editor/browser/widget/diffEditorWidget.ts b/src/vs/editor/browser/widget/diffEditorWidget.ts
index 9c3fba06d47..f2eebc3f3df 100644
--- a/src/vs/editor/browser/widget/diffEditorWidget.ts
+++ b/src/vs/editor/browser/widget/diffEditorWidget.ts
@@ -31,13 +31,13 @@ import { ServiceCollection } from 'vs/platform/instantiation/common/serviceColle
 import { Event, Emitter } from 'vs/base/common/event';
 import * as editorOptions from 'vs/editor/common/config/editorOptions';
 import { registerThemingParticipant, IThemeService, ITheme, getThemeTypeSelector } from 'vs/platform/theme/common/themeService';
-import { scrollbarShadow, diffInserted, diffRemoved, defaultInsertColor, defaultRemoveColor, diffInsertedOutline, diffRemovedOutline } from 'vs/platform/theme/common/colorRegistry';
+import { scrollbarShadow, diffInserted, diffRemoved, defaultInsertColor, defaultRemoveColor, diffInsertedOutline, diffRemovedOutline, diffBorder } from 'vs/platform/theme/common/colorRegistry';
 import { Color } from 'vs/base/common/color';
 import { OverviewRulerZone } from 'vs/editor/common/view/overviewZoneManager';
 import { IEditorWhitespace } from 'vs/editor/common/viewLayout/whitespaceComputer';
 import { ModelDecorationOptions } from 'vs/editor/common/model/textModel';
 import { DiffReview } from 'vs/editor/browser/widget/diffReview';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { IStringBuilder, createStringBuilder } from 'vs/editor/common/core/stringBuilder';
 import { IModelDeltaDecoration, IModelDecorationsChangeAccessor, ITextModel } from 'vs/editor/common/model';
 import { INotificationService } from 'vs/platform/notification/common/notification';
@@ -585,7 +585,7 @@ export class DiffEditorWidget extends Disposable implements editorBrowser.IDiffE
 		// renderSideBySide
 		if (renderSideBySideChanged) {
 			if (this._renderSideBySide) {
-				this._setStrategy(new DiffEdtorWidgetSideBySide(this._createDataSource(), this._enableSplitViewResizing, ));
+				this._setStrategy(new DiffEdtorWidgetSideBySide(this._createDataSource(), this._enableSplitViewResizing));
 			} else {
 				this._setStrategy(new DiffEdtorWidgetInline(this._createDataSource(), this._enableSplitViewResizing));
 			}
@@ -944,7 +944,7 @@ export class DiffEditorWidget extends Disposable implements editorBrowser.IDiffE
 		clonedOptions.folding = false;
 		clonedOptions.codeLens = false;
 		clonedOptions.fixedOverflowWidgets = true;
-		clonedOptions.lineDecorationsWidth = '2ch';
+		// clonedOptions.lineDecorationsWidth = '2ch';
 		if (!clonedOptions.minimap) {
 			clonedOptions.minimap = {};
 		}
@@ -1177,7 +1177,7 @@ interface IDataSource {
 	getModifiedEditor(): editorBrowser.ICodeEditor;
 }
 
-abstract class DiffEditorWidgetStyle extends Disposable {
+abstract class DiffEditorWidgetStyle extends Disposable implements IDiffEditorWidgetStyle {
 
 	_dataSource: IDataSource;
 	_insertColor: Color;
@@ -1228,6 +1228,9 @@ abstract class DiffEditorWidgetStyle extends Disposable {
 	protected abstract _getViewZones(lineChanges: editorCommon.ILineChange[], originalForeignVZ: IEditorWhitespace[], modifiedForeignVZ: IEditorWhitespace[], originalEditor: editorBrowser.ICodeEditor, modifiedEditor: editorBrowser.ICodeEditor, renderIndicators: boolean): IEditorsZones;
 	protected abstract _getOriginalEditorDecorations(lineChanges: editorCommon.ILineChange[], ignoreTrimWhitespace: boolean, renderIndicators: boolean, originalEditor: editorBrowser.ICodeEditor, modifiedEditor: editorBrowser.ICodeEditor): IEditorDiffDecorations;
 	protected abstract _getModifiedEditorDecorations(lineChanges: editorCommon.ILineChange[], ignoreTrimWhitespace: boolean, renderIndicators: boolean, originalEditor: editorBrowser.ICodeEditor, modifiedEditor: editorBrowser.ICodeEditor): IEditorDiffDecorations;
+
+	public abstract setEnableSplitViewResizing(enableSplitViewResizing: boolean): void;
+	public abstract layout(): number;
 }
 
 interface IMyViewZone extends editorBrowser.IViewZone {
@@ -1529,10 +1532,6 @@ class DiffEdtorWidgetSideBySide extends DiffEditorWidgetStyle implements IDiffEd
 		this._sash.onDidReset(() => this.onSashReset());
 	}
 
-	public dispose(): void {
-		super.dispose();
-	}
-
 	public setEnableSplitViewResizing(enableSplitViewResizing: boolean): void {
 		let newDisableSash = (enableSplitViewResizing === false);
 		if (this._disableSash !== newDisableSash) {
@@ -1778,10 +1777,6 @@ class DiffEdtorWidgetInline extends DiffEditorWidgetStyle implements IDiffEditor
 		}));
 	}
 
-	public dispose(): void {
-		super.dispose();
-	}
-
 	public setEnableSplitViewResizing(enableSplitViewResizing: boolean): void {
 		// Nothing to do..
 	}
@@ -1987,6 +1982,7 @@ class InlineViewZonesComputer extends ViewZonesComputer {
 		const containsRTL = ViewLineRenderingData.containsRTL(lineContent, isBasicASCII, originalModel.mightContainRTL());
 		const output = renderViewLine(new RenderLineInput(
 			(config.fontInfo.isMonospace && !config.viewInfo.disableMonospaceOptimizations),
+			config.fontInfo.canUseHalfwidthRightwardsArrow,
 			lineContent,
 			false,
 			isBasicASCII,
@@ -2052,4 +2048,9 @@ registerThemingParticipant((theme, collector) => {
 	if (shadow) {
 		collector.addRule(`.monaco-diff-editor.side-by-side .editor.modified { box-shadow: -6px 0 5px -5px ${shadow}; }`);
 	}
+
+	let border = theme.getColor(diffBorder);
+	if (border) {
+		collector.addRule(`.monaco-diff-editor.side-by-side .editor.modified { border-left: 1px solid ${border}; }`);
+	}
 });
diff --git a/src/vs/editor/browser/widget/diffReview.ts b/src/vs/editor/browser/widget/diffReview.ts
index c06799df4c5..58b825408e6 100644
--- a/src/vs/editor/browser/widget/diffReview.ts
+++ b/src/vs/editor/browser/widget/diffReview.ts
@@ -30,6 +30,7 @@ import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
 import { ITextModel, TextModelResolvedOptions } from 'vs/editor/common/model';
 import { ViewLineRenderingData } from 'vs/editor/common/viewModel/viewModel';
+import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
 
 const DIFF_LINES_PADDING = 3;
 
@@ -768,6 +769,7 @@ export class DiffReview extends Disposable {
 		const containsRTL = ViewLineRenderingData.containsRTL(lineContent, isBasicASCII, model.mightContainRTL());
 		const r = renderViewLine(new RenderLineInput(
 			(config.fontInfo.isMonospace && !config.viewInfo.disableMonospaceOptimizations),
+			config.fontInfo.canUseHalfwidthRightwardsArrow,
 			lineContent,
 			false,
 			isBasicASCII,
@@ -810,7 +812,8 @@ class DiffReviewNext extends EditorAction {
 			precondition: ContextKeyExpr.has('isInDiffEditor'),
 			kbOpts: {
 				kbExpr: null,
-				primary: KeyCode.F7
+				primary: KeyCode.F7,
+				weight: KeybindingWeight.EditorContrib
 			}
 		});
 	}
@@ -832,7 +835,8 @@ class DiffReviewPrev extends EditorAction {
 			precondition: ContextKeyExpr.has('isInDiffEditor'),
 			kbOpts: {
 				kbExpr: null,
-				primary: KeyMod.Shift | KeyCode.F7
+				primary: KeyMod.Shift | KeyCode.F7,
+				weight: KeybindingWeight.EditorContrib
 			}
 		});
 	}
diff --git a/src/vs/editor/browser/widget/media/diffEditor.css b/src/vs/editor/browser/widget/media/diffEditor.css
index 08829aa00e7..5e71f38a9bd 100644
--- a/src/vs/editor/browser/widget/media/diffEditor.css
+++ b/src/vs/editor/browser/widget/media/diffEditor.css
@@ -41,6 +41,8 @@
 	opacity: 0.7;
 	background-repeat: no-repeat;
 	background-position: 50% 50%;
+	background-position: center;
+	background-size: 11px 11px;
 }
 .monaco-editor.hc-black .insert-sign,
 .monaco-diff-editor.hc-black .insert-sign,
diff --git a/src/vs/editor/common/config/commonEditorConfig.ts b/src/vs/editor/common/config/commonEditorConfig.ts
index 05859b26f37..ef9f9fc914b 100644
--- a/src/vs/editor/common/config/commonEditorConfig.ts
+++ b/src/vs/editor/common/config/commonEditorConfig.ts
@@ -61,6 +61,8 @@ export interface IEnvConfiguration {
 	accessibilitySupport: platform.AccessibilitySupport;
 }
 
+const hasOwnProperty = Object.hasOwnProperty;
+
 export abstract class CommonEditorConfiguration extends Disposable implements editorCommon.IConfiguration {
 
 	protected _rawOptions: editorOptions.IEditorOptions;
@@ -80,6 +82,8 @@ export abstract class CommonEditorConfiguration extends Disposable implements ed
 		this._rawOptions.scrollbar = objects.mixin({}, this._rawOptions.scrollbar || {});
 		this._rawOptions.minimap = objects.mixin({}, this._rawOptions.minimap || {});
 		this._rawOptions.find = objects.mixin({}, this._rawOptions.find || {});
+		this._rawOptions.hover = objects.mixin({}, this._rawOptions.hover || {});
+		this._rawOptions.parameterHints = objects.mixin({}, this._rawOptions.parameterHints || {});
 
 		this._validatedOptions = editorOptions.EditorOptionsValidator.validate(this._rawOptions, EDITOR_DEFAULTS);
 		this.editor = null;
@@ -135,7 +139,53 @@ export abstract class CommonEditorConfiguration extends Disposable implements ed
 		return editorOptions.InternalEditorOptionsFactory.createInternalEditorOptions(env, opts);
 	}
 
+	private static _primitiveArrayEquals(a: any[], b: any[]): boolean {
+		if (a.length !== b.length) {
+			return false;
+		}
+		for (let i = 0; i < a.length; i++) {
+			if (a[i] !== b[i]) {
+				return false;
+			}
+		}
+		return true;
+	}
+
+	private static _subsetEquals(base: object, subset: object): boolean {
+		for (let key in subset) {
+			if (hasOwnProperty.call(subset, key)) {
+				const subsetValue = subset[key];
+				const baseValue = base[key];
+
+				if (baseValue === subsetValue) {
+					continue;
+				}
+				if (Array.isArray(baseValue) && Array.isArray(subsetValue)) {
+					if (!this._primitiveArrayEquals(baseValue, subsetValue)) {
+						return false;
+					}
+					continue;
+				}
+				if (typeof baseValue === 'object' && typeof subsetValue === 'object') {
+					if (!this._subsetEquals(baseValue, subsetValue)) {
+						return false;
+					}
+					continue;
+				}
+
+				return false;
+			}
+		}
+		return true;
+	}
+
 	public updateOptions(newOptions: editorOptions.IEditorOptions): void {
+		if (typeof newOptions === 'undefined') {
+			return;
+		}
+		if (CommonEditorConfiguration._subsetEquals(this._rawOptions, newOptions)) {
+			return;
+		}
 		this._rawOptions = objects.mixin(this._rawOptions, newOptions || {});
 		this._validatedOptions = editorOptions.EditorOptionsValidator.validate(this._rawOptions, EDITOR_DEFAULTS);
 		this._recomputeOptions();
@@ -197,7 +247,7 @@ const editorConfiguration: IConfigurationNode = {
 		'editor.lineHeight': {
 			'type': 'number',
 			'default': EDITOR_FONT_DEFAULTS.lineHeight,
-			'description': nls.localize('lineHeight', "Controls the line height. Use 0 to compute the lineHeight from the fontSize.")
+			'description': nls.localize('lineHeight', "Controls the line height. Use 0 to compute the line height from the font size.")
 		},
 		'editor.letterSpacing': {
 			'type': 'number',
@@ -222,55 +272,53 @@ const editorConfiguration: IConfigurationNode = {
 				'type': 'number'
 			},
 			'default': EDITOR_DEFAULTS.viewInfo.rulers,
-			'description': nls.localize('rulers', "Render vertical rulers after a certain number of monospace characters. Use multiple values for multiple rulers. No rulers are drawn if array is empty")
+			'description': nls.localize('rulers', "Render vertical rulers after a certain number of monospace characters. Use multiple values for multiple rulers. No rulers are drawn if array is empty.")
 		},
 		'editor.wordSeparators': {
 			'type': 'string',
 			'default': EDITOR_DEFAULTS.wordSeparators,
-			'description': nls.localize('wordSeparators', "Characters that will be used as word separators when doing word related navigations or operations")
+			'description': nls.localize('wordSeparators', "Characters that will be used as word separators when doing word related navigations or operations.")
 		},
 		'editor.tabSize': {
 			'type': 'number',
 			'default': EDITOR_MODEL_DEFAULTS.tabSize,
 			'minimum': 1,
-			'description': nls.localize('tabSize', "The number of spaces a tab is equal to. This setting is overridden based on the file contents when `editor.detectIndentation` is on."),
-			'errorMessage': nls.localize('tabSize.errorMessage', "Expected 'number'. Note that the value \"auto\" has been replaced by the `editor.detectIndentation` setting.")
+			'markdownDescription': nls.localize('tabSize', "The number of spaces a tab is equal to. This setting is overridden based on the file contents when `#editor.detectIndentation#` is on.")
 		},
 		'editor.insertSpaces': {
 			'type': 'boolean',
 			'default': EDITOR_MODEL_DEFAULTS.insertSpaces,
-			'description': nls.localize('insertSpaces', "Insert spaces when pressing Tab. This setting is overridden based on the file contents when `editor.detectIndentation` is on."),
-			'errorMessage': nls.localize('insertSpaces.errorMessage', "Expected 'boolean'. Note that the value \"auto\" has been replaced by the `editor.detectIndentation` setting.")
+			'markdownDescription': nls.localize('insertSpaces', "Insert spaces when pressing `Tab`. This setting is overridden based on the file contents when `#editor.detectIndentation#` is on.")
 		},
 		'editor.detectIndentation': {
 			'type': 'boolean',
 			'default': EDITOR_MODEL_DEFAULTS.detectIndentation,
-			'description': nls.localize('detectIndentation', "When opening a file, `editor.tabSize` and `editor.insertSpaces` will be detected based on the file contents.")
+			'markdownDescription': nls.localize('detectIndentation', "Controls whether `#editor.tabSize#` and `#editor.insertSpaces#` will be automatically detected when a file is opened based on the file contents.")
 		},
 		'editor.roundedSelection': {
 			'type': 'boolean',
 			'default': EDITOR_DEFAULTS.viewInfo.roundedSelection,
-			'description': nls.localize('roundedSelection', "Controls if selections have rounded corners")
+			'description': nls.localize('roundedSelection', "Controls whether selections should have rounded corners.")
 		},
 		'editor.scrollBeyondLastLine': {
 			'type': 'boolean',
 			'default': EDITOR_DEFAULTS.viewInfo.scrollBeyondLastLine,
-			'description': nls.localize('scrollBeyondLastLine', "Controls if the editor will scroll beyond the last line")
+			'description': nls.localize('scrollBeyondLastLine', "Controls whether the editor will scroll beyond the last line.")
 		},
 		'editor.scrollBeyondLastColumn': {
 			'type': 'number',
 			'default': EDITOR_DEFAULTS.viewInfo.scrollBeyondLastColumn,
-			'description': nls.localize('scrollBeyondLastColumn', "Controls the number of extra characters beyond which the editor will scroll horizontally")
+			'description': nls.localize('scrollBeyondLastColumn', "Controls the number of extra characters beyond which the editor will scroll horizontally.")
 		},
 		'editor.smoothScrolling': {
 			'type': 'boolean',
 			'default': EDITOR_DEFAULTS.viewInfo.smoothScrolling,
-			'description': nls.localize('smoothScrolling', "Controls if the editor will scroll using an animation")
+			'description': nls.localize('smoothScrolling', "Controls whether the editor will scroll using an animation.")
 		},
 		'editor.minimap.enabled': {
 			'type': 'boolean',
 			'default': EDITOR_DEFAULTS.viewInfo.minimap.enabled,
-			'description': nls.localize('minimap.enabled', "Controls if the minimap is shown")
+			'description': nls.localize('minimap.enabled', "Controls whether the minimap is shown.")
 		},
 		'editor.minimap.side': {
 			'type': 'string',
@@ -287,33 +335,48 @@ const editorConfiguration: IConfigurationNode = {
 		'editor.minimap.renderCharacters': {
 			'type': 'boolean',
 			'default': EDITOR_DEFAULTS.viewInfo.minimap.renderCharacters,
-			'description': nls.localize('minimap.renderCharacters', "Render the actual characters on a line (as opposed to color blocks)")
+			'description': nls.localize('minimap.renderCharacters', "Render the actual characters on a line as opposed to color blocks.")
 		},
 		'editor.minimap.maxColumn': {
 			'type': 'number',
 			'default': EDITOR_DEFAULTS.viewInfo.minimap.maxColumn,
-			'description': nls.localize('minimap.maxColumn', "Limit the width of the minimap to render at most a certain number of columns")
+			'description': nls.localize('minimap.maxColumn', "Limit the width of the minimap to render at most a certain number of columns.")
+		},
+		'editor.hover.enabled': {
+			'type': 'boolean',
+			'default': EDITOR_DEFAULTS.contribInfo.hover.enabled,
+			'description': nls.localize('hover.enabled', "Controls whether the hover is shown.")
+		},
+		'editor.hover.delay': {
+			'type': 'number',
+			'default': EDITOR_DEFAULTS.contribInfo.hover.delay,
+			'description': nls.localize('hover.delay', "Time delay in milliseconds after which to the hover is shown.")
+		},
+		'editor.hover.sticky': {
+			'type': 'boolean',
+			'default': EDITOR_DEFAULTS.contribInfo.hover.sticky,
+			'description': nls.localize('hover.sticky', "Controls whether the hover should remain visible when mouse is moved over it.")
 		},
 		'editor.find.seedSearchStringFromSelection': {
 			'type': 'boolean',
 			'default': EDITOR_DEFAULTS.contribInfo.find.seedSearchStringFromSelection,
-			'description': nls.localize('find.seedSearchStringFromSelection', "Controls if we seed the search string in Find Widget from editor selection")
+			'description': nls.localize('find.seedSearchStringFromSelection', "Controls whether the search string in the Find Widget is seeded from the editor selection.")
 		},
 		'editor.find.autoFindInSelection': {
 			'type': 'boolean',
 			'default': EDITOR_DEFAULTS.contribInfo.find.autoFindInSelection,
-			'description': nls.localize('find.autoFindInSelection', "Controls if Find in Selection flag is turned on when multiple characters or lines of text are selected in the editor")
+			'description': nls.localize('find.autoFindInSelection', "Controls whether the find operation is carried on selected text or the entire file in the editor.")
 		},
 		'editor.find.globalFindClipboard': {
 			'type': 'boolean',
 			'default': EDITOR_DEFAULTS.contribInfo.find.globalFindClipboard,
-			'description': nls.localize('find.globalFindClipboard', "Controls if the Find Widget should read or modify the shared find clipboard on macOS"),
+			'description': nls.localize('find.globalFindClipboard', "Controls whether the Find Widget should read or modify the shared find clipboard on macOS."),
 			'included': platform.isMacintosh
 		},
 		'editor.wordWrap': {
 			'type': 'string',
 			'enum': ['off', 'on', 'wordWrapColumn', 'bounded'],
-			'enumDescriptions': [
+			'markdownEnumDescriptions': [
 				nls.localize('wordWrap.off', "Lines will never wrap."),
 				nls.localize('wordWrap.on', "Lines will wrap at the viewport width."),
 				nls.localize({
@@ -321,14 +384,14 @@ const editorConfiguration: IConfigurationNode = {
 					comment: [
 						'- `editor.wordWrapColumn` refers to a different setting and should not be localized.'
 					]
-				}, "Lines will wrap at `editor.wordWrapColumn`."),
+				}, "Lines will wrap at `#editor.wordWrapColumn#`."),
 				nls.localize({
 					key: 'wordWrap.bounded',
 					comment: [
 						'- viewport means the edge of the visible window size.',
 						'- `editor.wordWrapColumn` refers to a different setting and should not be localized.'
 					]
-				}, "Lines will wrap at the minimum of viewport and `editor.wordWrapColumn`."),
+				}, "Lines will wrap at the minimum of viewport and `#editor.wordWrapColumn#`."),
 			],
 			'default': EDITOR_DEFAULTS.wordWrap,
 			'description': nls.localize({
@@ -337,46 +400,52 @@ const editorConfiguration: IConfigurationNode = {
 					'- \'off\', \'on\', \'wordWrapColumn\' and \'bounded\' refer to values the setting can take and should not be localized.',
 					'- `editor.wordWrapColumn` refers to a different setting and should not be localized.'
 				]
-			}, "Controls how lines should wrap. Can be:\n - 'off' (disable wrapping),\n - 'on' (viewport wrapping),\n - 'wordWrapColumn' (wrap at `editor.wordWrapColumn`) or\n - 'bounded' (wrap at minimum of viewport and `editor.wordWrapColumn`).")
+			}, "Controls how lines should wrap.")
 		},
 		'editor.wordWrapColumn': {
 			'type': 'integer',
 			'default': EDITOR_DEFAULTS.wordWrapColumn,
 			'minimum': 1,
-			'description': nls.localize({
+			'markdownDescription': nls.localize({
 				key: 'wordWrapColumn',
 				comment: [
 					'- `editor.wordWrap` refers to a different setting and should not be localized.',
 					'- \'wordWrapColumn\' and \'bounded\' refer to values the different setting can take and should not be localized.'
 				]
-			}, "Controls the wrapping column of the editor when `editor.wordWrap` is 'wordWrapColumn' or 'bounded'.")
+			}, "Controls the wrapping column of the editor when `#editor.wordWrap#` is `wordWrapColumn` or `bounded`.")
 		},
 		'editor.wrappingIndent': {
 			'type': 'string',
 			'enum': ['none', 'same', 'indent', 'deepIndent'],
+			enumDescriptions: [
+				nls.localize('wrappingIndent.none', "No indentation. Wrapped lines begin at column 1."),
+				nls.localize('wrappingIndent.same', "Wrapped lines get the same indentation as the parent."),
+				nls.localize('wrappingIndent.indent', "Wrapped lines get +1 indentation toward the parent."),
+				nls.localize('wrappingIndent.deepIndent', "Wrapped lines get +2 indentation toward the parent."),
+			],
 			'default': 'same',
-			'description': nls.localize('wrappingIndent', "Controls the indentation of wrapped lines. Can be one of 'none', 'same', 'indent' or 'deepIndent'.")
+			'description': nls.localize('wrappingIndent', "Controls the indentation of wrapped lines."),
 		},
 		'editor.mouseWheelScrollSensitivity': {
 			'type': 'number',
 			'default': EDITOR_DEFAULTS.viewInfo.scrollbar.mouseWheelScrollSensitivity,
-			'description': nls.localize('mouseWheelScrollSensitivity', "A multiplier to be used on the `deltaX` and `deltaY` of mouse wheel scroll events")
+			'markdownDescription': nls.localize('mouseWheelScrollSensitivity', "A multiplier to be used on the `deltaX` and `deltaY` of mouse wheel scroll events.")
 		},
 		'editor.multiCursorModifier': {
 			'type': 'string',
 			'enum': ['ctrlCmd', 'alt'],
-			'enumDescriptions': [
+			'markdownEnumDescriptions': [
 				nls.localize('multiCursorModifier.ctrlCmd', "Maps to `Control` on Windows and Linux and to `Command` on macOS."),
 				nls.localize('multiCursorModifier.alt', "Maps to `Alt` on Windows and Linux and to `Option` on macOS.")
 			],
 			'default': 'alt',
-			'description': nls.localize({
+			'markdownDescription': nls.localize({
 				key: 'multiCursorModifier',
 				comment: [
 					'- `ctrlCmd` refers to a value the setting can take and should not be localized.',
 					'- `Control` and `Command` refer to the modifier keys Ctrl or Cmd on the keyboard and can be localized.'
 				]
-			}, "The modifier to be used to add multiple cursors with the mouse. `ctrlCmd` maps to `Control` on Windows and Linux and to `Command` on macOS. The Go To Definition and Open Link mouse gestures will adapt such that they do not conflict with the multicursor modifier.")
+			}, "The modifier to be used to add multiple cursors with the mouse. The Go To Definition and Open Link mouse gestures will adapt such that they do not conflict with the multicursor modifier. [Read more](https://code.visualstudio.com/docs/editor/codebasics#_multicursor-modifier).")
 		},
 		'editor.multiCursorMergeOverlapping': {
 			'type': 'boolean',
@@ -410,54 +479,96 @@ const editorConfiguration: IConfigurationNode = {
 				}
 			],
 			'default': EDITOR_DEFAULTS.contribInfo.quickSuggestions,
-			'description': nls.localize('quickSuggestions', "Controls if suggestions should automatically show up while typing")
+			'description': nls.localize('quickSuggestions', "Controls whether suggestions should automatically show up while typing.")
 		},
 		'editor.quickSuggestionsDelay': {
 			'type': 'integer',
 			'default': EDITOR_DEFAULTS.contribInfo.quickSuggestionsDelay,
 			'minimum': 0,
-			'description': nls.localize('quickSuggestionsDelay', "Controls the delay in ms after which quick suggestions will show up")
+			'description': nls.localize('quickSuggestionsDelay', "Controls the delay in milliseconds after which quick suggestions will show up.")
 		},
-		'editor.parameterHints': {
+		'editor.parameterHints.enabled': {
 			'type': 'boolean',
-			'default': EDITOR_DEFAULTS.contribInfo.parameterHints,
-			'description': nls.localize('parameterHints', "Enables pop-up that shows parameter documentation and type information as you type")
+			'default': EDITOR_DEFAULTS.contribInfo.parameterHints.enabled,
+			'description': nls.localize('parameterHints.enabled', "Enables a pop-up that shows parameter documentation and type information as you type.")
+		},
+		'editor.parameterHints.cycle': {
+			'type': 'boolean',
+			'default': EDITOR_DEFAULTS.contribInfo.parameterHints.cycle,
+			'description': nls.localize('parameterHints.cycle', "Controls whether the parameter hints menu cycles or closes when reaching the end of the list.")
 		},
 		'editor.autoClosingBrackets': {
-			'type': 'boolean',
+			type: 'string',
+			enum: ['always', 'languageDefined', 'beforeWhitespace', 'never'],
+			enumDescriptions: [
+				'',
+				nls.localize('editor.autoClosingBrackets.languageDefined', "Use language configurations to determine when to autoclose brackets."),
+				nls.localize('editor.autoClosingBrackets.beforeWhitespace', "Autoclose brackets only when the cursor is to the left of whitespace."),
+				'',
+
+			],
 			'default': EDITOR_DEFAULTS.autoClosingBrackets,
-			'description': nls.localize('autoClosingBrackets', "Controls if the editor should automatically close brackets after opening them")
+			'description': nls.localize('autoClosingBrackets', "Controls whether the editor should automatically close brackets after the user adds an opening bracket.")
+		},
+		'editor.autoClosingQuotes': {
+			type: 'string',
+			enum: ['always', 'languageDefined', 'beforeWhitespace', 'never'],
+			enumDescriptions: [
+				'',
+				nls.localize('editor.autoClosingQuotes.languageDefined', "Use language configurations to determine when to autoclose quotes."),
+				nls.localize('editor.autoClosingQuotes.beforeWhitespace', "Autoclose quotes only when the cursor is to the left of whitespace."),
+				'',
+			],
+			'default': EDITOR_DEFAULTS.autoClosingQuotes,
+			'description': nls.localize('autoClosingQuotes', "Controls whether the editor should automatically close quotes after the user adds an opening quote.")
+		},
+		'editor.autoSurround': {
+			type: 'string',
+			enum: ['languageDefined', 'brackets', 'quotes', 'never'],
+			enumDescriptions: [
+				nls.localize('editor.autoSurround.languageDefined', "Use language configurations to determine when to automatically surround selections."),
+				nls.localize('editor.autoSurround.brackets', "Surround with brackets but not quotes."),
+				nls.localize('editor.autoSurround.quotes', "Surround with quotes but not brackets."),
+				''
+			],
+			'default': EDITOR_DEFAULTS.autoSurround,
+			'description': nls.localize('autoSurround', "Controls whether the editor should automatically surround selections.")
 		},
 		'editor.formatOnType': {
 			'type': 'boolean',
 			'default': EDITOR_DEFAULTS.contribInfo.formatOnType,
-			'description': nls.localize('formatOnType', "Controls if the editor should automatically format the line after typing")
+			'description': nls.localize('formatOnType', "Controls whether the editor should automatically format the line after typing.")
 		},
 		'editor.formatOnPaste': {
 			'type': 'boolean',
 			'default': EDITOR_DEFAULTS.contribInfo.formatOnPaste,
-			'description': nls.localize('formatOnPaste', "Controls if the editor should automatically format the pasted content. A formatter must be available and the formatter should be able to format a range in a document.")
+			'description': nls.localize('formatOnPaste', "Controls whether the editor should automatically format the pasted content. A formatter must be available and the formatter should be able to format a range in a document.")
 		},
 		'editor.autoIndent': {
 			'type': 'boolean',
 			'default': EDITOR_DEFAULTS.autoIndent,
-			'description': nls.localize('autoIndent', "Controls if the editor should automatically adjust the indentation when users type, paste or move lines. Indentation rules of the language must be available.")
+			'description': nls.localize('autoIndent', "Controls whether the editor should automatically adjust the indentation when users type, paste or move lines. Extensions with indentation rules of the language must be available.")
 		},
 		'editor.suggestOnTriggerCharacters': {
 			'type': 'boolean',
 			'default': EDITOR_DEFAULTS.contribInfo.suggestOnTriggerCharacters,
-			'description': nls.localize('suggestOnTriggerCharacters', "Controls if suggestions should automatically show up when typing trigger characters")
+			'description': nls.localize('suggestOnTriggerCharacters', "Controls whether suggestions should automatically show up when typing trigger characters.")
 		},
 		'editor.acceptSuggestionOnEnter': {
 			'type': 'string',
 			'enum': ['on', 'smart', 'off'],
 			'default': EDITOR_DEFAULTS.contribInfo.acceptSuggestionOnEnter,
-			'description': nls.localize('acceptSuggestionOnEnter', "Controls if suggestions should be accepted on 'Enter' - in addition to 'Tab'. Helps to avoid ambiguity between inserting new lines or accepting suggestions. The value 'smart' means only accept a suggestion with Enter when it makes a textual change")
+			'markdownEnumDescriptions': [
+				'',
+				nls.localize('acceptSuggestionOnEnterSmart', "Only accept a suggestion with `Enter` when it makes a textual change."),
+				''
+			],
+			'markdownDescription': nls.localize('acceptSuggestionOnEnter', "Controls whether suggestions should be accepted on `Enter`, in addition to `Tab`. Helps to avoid ambiguity between inserting new lines or accepting suggestions.")
 		},
 		'editor.acceptSuggestionOnCommitCharacter': {
 			'type': 'boolean',
 			'default': EDITOR_DEFAULTS.contribInfo.acceptSuggestionOnCommitCharacter,
-			'description': nls.localize('acceptSuggestionOnCommitCharacter', "Controls if suggestions should be accepted on commit characters. For instance in JavaScript the semi-colon (';') can be a commit character that accepts a suggestion and types that character.")
+			'markdownDescription': nls.localize('acceptSuggestionOnCommitCharacter', "Controls whether suggestions should be accepted on commit characters. For example, in JavaScript, the semi-colon (`;`) can be a commit character that accepts a suggestion and types that character.")
 		},
 		'editor.snippetSuggestions': {
 			'type': 'string',
@@ -468,7 +579,7 @@ const editorConfiguration: IConfigurationNode = {
 				nls.localize('snippetSuggestions.inline', "Show snippets suggestions with other suggestions."),
 				nls.localize('snippetSuggestions.none', "Do not show snippet suggestions."),
 			],
-			'default': EDITOR_DEFAULTS.contribInfo.snippetSuggestions,
+			'default': EDITOR_DEFAULTS.contribInfo.suggest.snippets,
 			'description': nls.localize('snippetSuggestions', "Controls whether snippets are shown with other suggestions and how they are sorted.")
 		},
 		'editor.emptySelectionClipboard': {
@@ -476,6 +587,11 @@ const editorConfiguration: IConfigurationNode = {
 			'default': EDITOR_DEFAULTS.emptySelectionClipboard,
 			'description': nls.localize('emptySelectionClipboard', "Controls whether copying without a selection copies the current line.")
 		},
+		'editor.copyWithSyntaxHighlighting': {
+			'type': 'boolean',
+			'default': EDITOR_DEFAULTS.copyWithSyntaxHighlighting,
+			'description': nls.localize('copyWithSyntaxHighlighting', "Controls whether syntax highlighting should be copied into the clipboard.")
+		},
 		'editor.wordBasedSuggestions': {
 			'type': 'boolean',
 			'default': EDITOR_DEFAULTS.contribInfo.wordBasedSuggestions,
@@ -484,7 +600,7 @@ const editorConfiguration: IConfigurationNode = {
 		'editor.suggestSelection': {
 			'type': 'string',
 			'enum': ['first', 'recentlyUsed', 'recentlyUsedByPrefix'],
-			'enumDescriptions': [
+			'markdownEnumDescriptions': [
 				nls.localize('suggestSelection.first', "Always select the first suggestion."),
 				nls.localize('suggestSelection.recentlyUsed', "Select recent suggestions unless further typing selects one, e.g. `console.| -> console.log` because `log` has been completed recently."),
 				nls.localize('suggestSelection.recentlyUsedByPrefix', "Select suggestions based on previous prefixes that have completed those suggestions, e.g. `co -> console` and `con -> const`."),
@@ -496,33 +612,43 @@ const editorConfiguration: IConfigurationNode = {
 			'type': 'integer',
 			'default': 0,
 			'minimum': 0,
-			'description': nls.localize('suggestFontSize', "Font size for the suggest widget")
+			'markdownDescription': nls.localize('suggestFontSize', "Font size for the suggest widget. When set to `0`, the value of `#editor.fontSize#` is used.")
 		},
 		'editor.suggestLineHeight': {
 			'type': 'integer',
 			'default': 0,
 			'minimum': 0,
-			'description': nls.localize('suggestLineHeight', "Line height for the suggest widget")
+			'markdownDescription': nls.localize('suggestLineHeight', "Line height for the suggest widget. When set to `0`, the value of `#editor.lineHeight#` is used.")
+		},
+		'editor.suggest.filterGraceful': {
+			type: 'boolean',
+			default: true,
+			description: nls.localize('suggest.filterGraceful', "Controls whether filtering and sorting suggestions accounts for small typos.")
+		},
+		'editor.suggest.snippetsPreventQuickSuggestions': {
+			type: 'boolean',
+			default: true,
+			description: nls.localize('suggest.snippetsPreventQuickSuggestions', "Control whether an active snippet prevents quick suggestions.")
 		},
 		'editor.selectionHighlight': {
 			'type': 'boolean',
 			'default': EDITOR_DEFAULTS.contribInfo.selectionHighlight,
-			'description': nls.localize('selectionHighlight', "Controls whether the editor should highlight similar matches to the selection")
+			'description': nls.localize('selectionHighlight', "Controls whether the editor should highlight matches similar to the selection")
 		},
 		'editor.occurrencesHighlight': {
 			'type': 'boolean',
 			'default': EDITOR_DEFAULTS.contribInfo.occurrencesHighlight,
-			'description': nls.localize('occurrencesHighlight', "Controls whether the editor should highlight semantic symbol occurrences")
+			'description': nls.localize('occurrencesHighlight', "Controls whether the editor should highlight semantic symbol occurrences.")
 		},
 		'editor.overviewRulerLanes': {
 			'type': 'integer',
 			'default': 3,
-			'description': nls.localize('overviewRulerLanes', "Controls the number of decorations that can show up at the same position in the overview ruler")
+			'description': nls.localize('overviewRulerLanes', "Controls the number of decorations that can show up at the same position in the overview ruler.")
 		},
 		'editor.overviewRulerBorder': {
 			'type': 'boolean',
 			'default': EDITOR_DEFAULTS.viewInfo.overviewRulerBorder,
-			'description': nls.localize('overviewRulerBorder', "Controls if a border should be drawn around the overview ruler.")
+			'description': nls.localize('overviewRulerBorder', "Controls whether a border should be drawn around the overview ruler.")
 		},
 		'editor.cursorBlinking': {
 			'type': 'string',
@@ -533,55 +659,71 @@ const editorConfiguration: IConfigurationNode = {
 		'editor.mouseWheelZoom': {
 			'type': 'boolean',
 			'default': EDITOR_DEFAULTS.viewInfo.mouseWheelZoom,
-			'description': nls.localize('mouseWheelZoom', "Zoom the font of the editor when using mouse wheel and holding Ctrl")
+			'markdownDescription': nls.localize('mouseWheelZoom', "Zoom the font of the editor when using mouse wheel and holding `Ctrl`.")
 		},
 		'editor.cursorStyle': {
 			'type': 'string',
 			'enum': ['block', 'block-outline', 'line', 'line-thin', 'underline', 'underline-thin'],
 			'default': editorOptions.cursorStyleToString(EDITOR_DEFAULTS.viewInfo.cursorStyle),
-			'description': nls.localize('cursorStyle', "Controls the cursor style, accepted values are 'block', 'block-outline', 'line', 'line-thin', 'underline' and 'underline-thin'")
+			'description': nls.localize('cursorStyle', "Controls the cursor style.")
 		},
 		'editor.cursorWidth': {
 			'type': 'integer',
 			'default': EDITOR_DEFAULTS.viewInfo.cursorWidth,
-			'description': nls.localize('cursorWidth', "Controls the width of the cursor when editor.cursorStyle is set to 'line'")
+			'markdownDescription': nls.localize('cursorWidth', "Controls the width of the cursor when `#editor.cursorStyle#` is set to `line`.")
 		},
 		'editor.fontLigatures': {
 			'type': 'boolean',
 			'default': EDITOR_DEFAULTS.viewInfo.fontLigatures,
-			'description': nls.localize('fontLigatures', "Enables font ligatures")
+			'description': nls.localize('fontLigatures', "Enables/Disables font ligatures.")
 		},
 		'editor.hideCursorInOverviewRuler': {
 			'type': 'boolean',
 			'default': EDITOR_DEFAULTS.viewInfo.hideCursorInOverviewRuler,
-			'description': nls.localize('hideCursorInOverviewRuler', "Controls if the cursor should be hidden in the overview ruler.")
+			'description': nls.localize('hideCursorInOverviewRuler', "Controls whether the cursor should be hidden in the overview ruler.")
 		},
 		'editor.renderWhitespace': {
 			'type': 'string',
 			'enum': ['none', 'boundary', 'all'],
+			'enumDescriptions': [
+				'',
+				nls.localize('renderWhiteSpace.boundary', "Render whitespace characters except for single spaces between words."),
+				''
+			],
 			default: EDITOR_DEFAULTS.viewInfo.renderWhitespace,
-			description: nls.localize('renderWhitespace', "Controls how the editor should render whitespace characters, possibilities are 'none', 'boundary', and 'all'. The 'boundary' option does not render single spaces between words.")
+			description: nls.localize('renderWhitespace', "Controls how the editor should render whitespace characters.")
 		},
 		'editor.renderControlCharacters': {
 			'type': 'boolean',
 			default: EDITOR_DEFAULTS.viewInfo.renderControlCharacters,
-			description: nls.localize('renderControlCharacters', "Controls whether the editor should render control characters")
+			description: nls.localize('renderControlCharacters', "Controls whether the editor should render control characters.")
 		},
 		'editor.renderIndentGuides': {
 			'type': 'boolean',
 			default: EDITOR_DEFAULTS.viewInfo.renderIndentGuides,
-			description: nls.localize('renderIndentGuides', "Controls whether the editor should render indent guides")
+			description: nls.localize('renderIndentGuides', "Controls whether the editor should render indent guides.")
+		},
+		'editor.highlightActiveIndentGuide': {
+			'type': 'boolean',
+			default: EDITOR_DEFAULTS.viewInfo.highlightActiveIndentGuide,
+			description: nls.localize('highlightActiveIndentGuide', "Controls whether the editor should highlight the active indent guide.")
 		},
 		'editor.renderLineHighlight': {
 			'type': 'string',
 			'enum': ['none', 'gutter', 'line', 'all'],
+			'enumDescriptions': [
+				'',
+				'',
+				'',
+				nls.localize('renderLineHighlight.all', "Highlights both the gutter and the current line."),
+			],
 			default: EDITOR_DEFAULTS.viewInfo.renderLineHighlight,
-			description: nls.localize('renderLineHighlight', "Controls how the editor should render the current line highlight, possibilities are 'none', 'gutter', 'line', and 'all'.")
+			description: nls.localize('renderLineHighlight', "Controls how the editor should render the current line highlight.")
 		},
 		'editor.codeLens': {
 			'type': 'boolean',
 			'default': EDITOR_DEFAULTS.contribInfo.codeLens,
-			'description': nls.localize('codeLens', "Controls if the editor shows CodeLens")
+			'description': nls.localize('codeLens', "Controls whether the editor shows CodeLens")
 		},
 		'editor.folding': {
 			'type': 'boolean',
@@ -591,12 +733,8 @@ const editorConfiguration: IConfigurationNode = {
 		'editor.foldingStrategy': {
 			'type': 'string',
 			'enum': ['auto', 'indentation'],
-			'enumDescriptions': [
-				nls.localize('foldingStrategyAuto', 'If available, use a language specific folding strategy, otherwise falls back to the indentation based strategy.'),
-				nls.localize('foldingStrategyIndentation', 'Always use the indentation based folding strategy')
-			],
 			'default': EDITOR_DEFAULTS.contribInfo.foldingStrategy,
-			'description': nls.localize('foldingStrategy', "Controls the way folding ranges are computed. 'auto' picks uses a language specific folding strategy, if available. 'indentation' forces that the indentation based folding strategy is used.")
+			'markdownDescription': nls.localize('foldingStrategy', "Controls the strategy for computing folding ranges. `auto` uses a language specific folding strategy, if available. `indentation` uses the indentation based folding strategy.")
 		},
 		'editor.showFoldingControls': {
 			'type': 'string',
@@ -617,22 +755,22 @@ const editorConfiguration: IConfigurationNode = {
 		'editor.useTabStops': {
 			'type': 'boolean',
 			'default': EDITOR_DEFAULTS.useTabStops,
-			'description': nls.localize('useTabStops', "Inserting and deleting whitespace follows tab stops")
+			'description': nls.localize('useTabStops', "Inserting and deleting whitespace follows tab stops.")
 		},
 		'editor.trimAutoWhitespace': {
 			'type': 'boolean',
 			'default': EDITOR_MODEL_DEFAULTS.trimAutoWhitespace,
-			'description': nls.localize('trimAutoWhitespace', "Remove trailing auto inserted whitespace")
+			'description': nls.localize('trimAutoWhitespace', "Remove trailing auto inserted whitespace.")
 		},
 		'editor.stablePeek': {
 			'type': 'boolean',
 			'default': false,
-			'description': nls.localize('stablePeek', "Keep peek editors open even when double clicking their content or when hitting Escape.")
+			'markdownDescription': nls.localize('stablePeek', "Keep peek editors open even when double clicking their content or when hitting `Escape`.")
 		},
 		'editor.dragAndDrop': {
 			'type': 'boolean',
 			'default': EDITOR_DEFAULTS.dragAndDrop,
-			'description': nls.localize('dragAndDrop', "Controls if the editor should allow to move selections via drag and drop.")
+			'description': nls.localize('dragAndDrop', "Controls whether the editor should allow moving selections via drag and drop.")
 		},
 		'editor.accessibilitySupport': {
 			'type': 'string',
@@ -645,10 +783,15 @@ const editorConfiguration: IConfigurationNode = {
 			'default': EDITOR_DEFAULTS.accessibilitySupport,
 			'description': nls.localize('accessibilitySupport', "Controls whether the editor should run in a mode where it is optimized for screen readers.")
 		},
+		'editor.showUnused': {
+			'type': 'boolean',
+			'default': EDITOR_DEFAULTS.showUnused,
+			'description': nls.localize('showUnused', "Controls fading out of unused code.")
+		},
 		'editor.links': {
 			'type': 'boolean',
 			'default': EDITOR_DEFAULTS.contribInfo.links,
-			'description': nls.localize('links', "Controls whether the editor should detect links and make them clickable")
+			'description': nls.localize('links', "Controls whether the editor should detect links and make them clickable.")
 		},
 		'editor.colorDecorators': {
 			'type': 'boolean',
@@ -658,14 +801,14 @@ const editorConfiguration: IConfigurationNode = {
 		'editor.lightbulb.enabled': {
 			'type': 'boolean',
 			'default': EDITOR_DEFAULTS.contribInfo.lightbulbEnabled,
-			'description': nls.localize('codeActions', "Enables the code action lightbulb")
+			'description': nls.localize('codeActions', "Enables the code action lightbulb in the editor.")
 		},
 		'editor.codeActionsOnSave': {
 			'type': 'object',
 			'properties': {
 				'source.organizeImports': {
 					'type': 'boolean',
-					'description': nls.localize('codeActionsOnSave.organizeImports', "Run organize imports on save?")
+					'description': nls.localize('codeActionsOnSave.organizeImports', "Controls whether organize imports action should be run on file save.")
 				}
 			},
 			'additionalProperties': {
@@ -677,23 +820,23 @@ const editorConfiguration: IConfigurationNode = {
 		'editor.codeActionsOnSaveTimeout': {
 			'type': 'number',
 			'default': EDITOR_DEFAULTS.contribInfo.codeActionsOnSaveTimeout,
-			'description': nls.localize('codeActionsOnSaveTimeout', "Timeout for code actions run on save.")
+			'description': nls.localize('codeActionsOnSaveTimeout', "Timeout in milliseconds after which the code actions that are run on save are cancelled.")
 		},
 		'editor.selectionClipboard': {
 			'type': 'boolean',
 			'default': EDITOR_DEFAULTS.contribInfo.selectionClipboard,
-			'description': nls.localize('selectionClipboard', "Controls if the Linux primary clipboard should be supported."),
+			'description': nls.localize('selectionClipboard', "Controls whether the Linux primary clipboard should be supported."),
 			'included': platform.isLinux
 		},
 		'diffEditor.renderSideBySide': {
 			'type': 'boolean',
 			'default': true,
-			'description': nls.localize('sideBySide', "Controls if the diff editor shows the diff side by side or inline")
+			'description': nls.localize('sideBySide', "Controls whether the diff editor shows the diff side by side or inline.")
 		},
 		'diffEditor.ignoreTrimWhitespace': {
 			'type': 'boolean',
 			'default': true,
-			'description': nls.localize('ignoreTrimWhitespace', "Controls if the diff editor shows changes in leading or trailing whitespace as diffs")
+			'description': nls.localize('ignoreTrimWhitespace', "Controls whether the diff editor shows changes in leading or trailing whitespace as diffs.")
 		},
 		'editor.largeFileOptimizations': {
 			'type': 'boolean',
@@ -703,7 +846,7 @@ const editorConfiguration: IConfigurationNode = {
 		'diffEditor.renderIndicators': {
 			'type': 'boolean',
 			'default': true,
-			'description': nls.localize('renderIndicators', "Controls if the diff editor shows +/- indicators for added/removed changes")
+			'description': nls.localize('renderIndicators', "Controls whether the diff editor shows +/- indicators for added/removed changes.")
 		}
 	}
 };
diff --git a/src/vs/editor/common/config/editorOptions.ts b/src/vs/editor/common/config/editorOptions.ts
index 2e0412c8732..602afeebbc4 100644
--- a/src/vs/editor/common/config/editorOptions.ts
+++ b/src/vs/editor/common/config/editorOptions.ts
@@ -95,13 +95,23 @@ export interface IEditorFindOptions {
 	globalFindClipboard: boolean;
 }
 
+/**
+ * Configuration options for auto closing quotes and brackets
+ */
+export type EditorAutoClosingStrategy = 'always' | 'languageDefined' | 'beforeWhitespace' | 'never';
+
+/**
+ * Configuration options for auto wrapping quotes and brackets
+ */
+export type EditorAutoSurroundStrategy = 'languageDefined' | 'quotes' | 'brackets' | 'never';
+
 /**
  * Configuration options for editor minimap
  */
 export interface IEditorMinimapOptions {
 	/**
 	 * Enable the rendering of the minimap.
-	 * Defaults to false.
+	 * Defaults to true.
 	 */
 	enabled?: boolean;
 	/**
@@ -137,6 +147,54 @@ export interface IEditorLightbulbOptions {
 	enabled?: boolean;
 }
 
+/**
+ * Configuration options for editor hover
+ */
+export interface IEditorHoverOptions {
+	/**
+	 * Enable the hover.
+	 * Defaults to true.
+	 */
+	enabled?: boolean;
+	/**
+	 * Delay for showing the hover.
+	 * Defaults to 300.
+	 */
+	delay?: number;
+	/**
+	 * Is the hover sticky such that it can be clicked and its contents selected?
+	 * Defaults to true.
+	 */
+	sticky?: boolean;
+}
+
+/**
+ * Configuration options for parameter hints
+ */
+export interface IEditorParameterHintOptions {
+	/**
+	 * Enable parameter hints.
+	 * Defaults to true.
+	 */
+	enabled?: boolean;
+	/**
+	 * Enable cycling of parameter hints.
+	 * Defaults to false.
+	 */
+	cycle?: boolean;
+}
+
+export interface ISuggestOptions {
+	/**
+	 * Enable graceful matching. Defaults to true.
+	 */
+	filterGraceful?: boolean;
+	/**
+	 * Prevent quick suggestions when a snippet is active. Defaults to true.
+	 */
+	snippetsPreventQuickSuggestions?: boolean;
+}
+
 /**
  * Configuration map for codeActionsOnSave
  */
@@ -367,10 +425,9 @@ export interface IEditorOptions {
 	 */
 	stopRenderingLineAfter?: number;
 	/**
-	 * Enable hover.
-	 * Defaults to true.
+	 * Configure the editor's hover.
 	 */
-	hover?: boolean;
+	hover?: IEditorHoverOptions;
 	/**
 	 * Enable detecting links and making them clickable.
 	 * Defaults to true.
@@ -405,6 +462,10 @@ export interface IEditorOptions {
 	 * Defaults to 'auto'. It is best to leave this to 'auto'.
 	 */
 	accessibilitySupport?: 'auto' | 'off' | 'on';
+	/**
+	 * Suggest options.
+	 */
+	suggest?: ISuggestOptions;
 	/**
 	 * Enable quick suggestions (shadow suggestions)
 	 * Defaults to true.
@@ -416,19 +477,29 @@ export interface IEditorOptions {
 	 */
 	quickSuggestionsDelay?: number;
 	/**
-	 * Enables parameter hints
+	 * Parameter hint options.
 	 */
-	parameterHints?: boolean;
+	parameterHints?: IEditorParameterHintOptions;
 	/**
 	 * Render icons in suggestions box.
 	 * Defaults to true.
 	 */
 	iconsInSuggestions?: boolean;
 	/**
-	 * Enable auto closing brackets.
-	 * Defaults to true.
+	 * Options for auto closing brackets.
+	 * Defaults to language defined behavior.
 	 */
-	autoClosingBrackets?: boolean;
+	autoClosingBrackets?: EditorAutoClosingStrategy;
+	/**
+	 * Options for auto closing quotes.
+	 * Defaults to language defined behavior.
+	 */
+	autoClosingQuotes?: EditorAutoClosingStrategy;
+	/**
+	 * Options for auto surrounding.
+	 * Defaults to always allowing auto surrounding.
+	 */
+	autoSurround?: EditorAutoSurroundStrategy;
 	/**
 	 * Enable auto indentation adjustment.
 	 * Defaults to false.
@@ -472,6 +543,10 @@ export interface IEditorOptions {
 	 * Copying without a selection copies the current line.
 	 */
 	emptySelectionClipboard?: boolean;
+	/**
+	 * Syntax highlighting is copied.
+	 */
+	copyWithSyntaxHighlighting?: boolean;
 	/**
 	 * Enable word based suggestions. Defaults to 'true'
 	 */
@@ -549,9 +624,14 @@ export interface IEditorOptions {
 	renderControlCharacters?: boolean;
 	/**
 	 * Enable rendering of indent guides.
-	 * Defaults to false.
+	 * Defaults to true.
 	 */
 	renderIndentGuides?: boolean;
+	/**
+	 * Enable highlighting of the active indent guide.
+	 * Defaults to true.
+	 */
+	highlightActiveIndentGuide?: boolean;
 	/**
 	 * Enable rendering of current line highlight.
 	 * Defaults to all.
@@ -581,6 +661,10 @@ export interface IEditorOptions {
 	 * The letter spacing
 	 */
 	letterSpacing?: number;
+	/**
+	 * Controls fading out of unused variables.
+	 */
+	showUnused?: boolean;
 }
 
 /**
@@ -795,6 +879,23 @@ export interface InternalEditorFindOptions {
 	readonly globalFindClipboard: boolean;
 }
 
+export interface InternalEditorHoverOptions {
+	readonly enabled: boolean;
+	readonly delay: number;
+	readonly sticky: boolean;
+}
+
+export interface InternalSuggestOptions {
+	readonly filterGraceful: boolean;
+	readonly snippets: 'top' | 'bottom' | 'inline' | 'none';
+	readonly snippetsPreventQuickSuggestions: boolean;
+}
+
+export interface InternalParameterHintOptions {
+	readonly enabled: boolean;
+	readonly cycle: boolean;
+}
+
 export interface EditorWrappingInfo {
 	readonly inDiffEditor: boolean;
 	readonly isDominatedByLongLines: boolean;
@@ -841,6 +942,7 @@ export interface InternalEditorViewOptions {
 	readonly renderControlCharacters: boolean;
 	readonly fontLigatures: boolean;
 	readonly renderIndentGuides: boolean;
+	readonly highlightActiveIndentGuide: boolean;
 	readonly renderLineHighlight: 'none' | 'gutter' | 'line' | 'all';
 	readonly scrollbar: InternalEditorScrollbarOptions;
 	readonly minimap: InternalEditorMinimapOptions;
@@ -849,23 +951,24 @@ export interface InternalEditorViewOptions {
 
 export interface EditorContribOptions {
 	readonly selectionClipboard: boolean;
-	readonly hover: boolean;
+	readonly hover: InternalEditorHoverOptions;
 	readonly links: boolean;
 	readonly contextmenu: boolean;
 	readonly quickSuggestions: boolean | { other: boolean, comments: boolean, strings: boolean };
 	readonly quickSuggestionsDelay: number;
-	readonly parameterHints: boolean;
+	readonly parameterHints: InternalParameterHintOptions;
 	readonly iconsInSuggestions: boolean;
 	readonly formatOnType: boolean;
 	readonly formatOnPaste: boolean;
 	readonly suggestOnTriggerCharacters: boolean;
 	readonly acceptSuggestionOnEnter: 'on' | 'smart' | 'off';
 	readonly acceptSuggestionOnCommitCharacter: boolean;
-	readonly snippetSuggestions: 'top' | 'bottom' | 'inline' | 'none';
+	// readonly snippetSuggestions: 'top' | 'bottom' | 'inline' | 'none';
 	readonly wordBasedSuggestions: boolean;
 	readonly suggestSelection: 'first' | 'recentlyUsed' | 'recentlyUsedByPrefix';
 	readonly suggestFontSize: number;
 	readonly suggestLineHeight: number;
+	readonly suggest: InternalSuggestOptions;
 	readonly selectionHighlight: boolean;
 	readonly occurrencesHighlight: boolean;
 	readonly codeLens: boolean;
@@ -901,14 +1004,18 @@ export interface IValidatedEditorOptions {
 	readonly wordWrapBreakBeforeCharacters: string;
 	readonly wordWrapBreakAfterCharacters: string;
 	readonly wordWrapBreakObtrusiveCharacters: string;
-	readonly autoClosingBrackets: boolean;
+	readonly autoClosingBrackets: EditorAutoClosingStrategy;
+	readonly autoClosingQuotes: EditorAutoClosingStrategy;
+	readonly autoSurround: EditorAutoSurroundStrategy;
 	readonly autoIndent: boolean;
 	readonly dragAndDrop: boolean;
 	readonly emptySelectionClipboard: boolean;
+	readonly copyWithSyntaxHighlighting: boolean;
 	readonly useTabStops: boolean;
 	readonly multiCursorModifier: 'altKey' | 'ctrlKey' | 'metaKey';
 	readonly multiCursorMergeOverlapping: boolean;
 	readonly accessibilitySupport: 'auto' | 'off' | 'on';
+	readonly showUnused: boolean;
 
 	readonly viewInfo: InternalEditorViewOptions;
 	readonly contribInfo: EditorContribOptions;
@@ -931,15 +1038,19 @@ export class InternalEditorOptions {
 	readonly accessibilitySupport: platform.AccessibilitySupport;
 	readonly multiCursorModifier: 'altKey' | 'ctrlKey' | 'metaKey';
 	readonly multiCursorMergeOverlapping: boolean;
+	readonly showUnused: boolean;
 
 	// ---- cursor options
 	readonly wordSeparators: string;
-	readonly autoClosingBrackets: boolean;
+	readonly autoClosingBrackets: EditorAutoClosingStrategy;
+	readonly autoClosingQuotes: EditorAutoClosingStrategy;
+	readonly autoSurround: EditorAutoSurroundStrategy;
 	readonly autoIndent: boolean;
 	readonly useTabStops: boolean;
 	readonly tabFocusMode: boolean;
 	readonly dragAndDrop: boolean;
 	readonly emptySelectionClipboard: boolean;
+	readonly copyWithSyntaxHighlighting: boolean;
 
 	// ---- grouped options
 	readonly layoutInfo: EditorLayoutInfo;
@@ -961,17 +1072,21 @@ export class InternalEditorOptions {
 		multiCursorModifier: 'altKey' | 'ctrlKey' | 'metaKey';
 		multiCursorMergeOverlapping: boolean;
 		wordSeparators: string;
-		autoClosingBrackets: boolean;
+		autoClosingBrackets: EditorAutoClosingStrategy;
+		autoClosingQuotes: EditorAutoClosingStrategy;
+		autoSurround: EditorAutoSurroundStrategy;
 		autoIndent: boolean;
 		useTabStops: boolean;
 		tabFocusMode: boolean;
 		dragAndDrop: boolean;
 		emptySelectionClipboard: boolean;
+		copyWithSyntaxHighlighting: boolean;
 		layoutInfo: EditorLayoutInfo;
 		fontInfo: FontInfo;
 		viewInfo: InternalEditorViewOptions;
 		wrappingInfo: EditorWrappingInfo;
 		contribInfo: EditorContribOptions;
+		showUnused: boolean;
 	}) {
 		this.canUseLayerHinting = source.canUseLayerHinting;
 		this.pixelRatio = source.pixelRatio;
@@ -983,16 +1098,20 @@ export class InternalEditorOptions {
 		this.multiCursorMergeOverlapping = source.multiCursorMergeOverlapping;
 		this.wordSeparators = source.wordSeparators;
 		this.autoClosingBrackets = source.autoClosingBrackets;
+		this.autoClosingQuotes = source.autoClosingQuotes;
+		this.autoSurround = source.autoSurround;
 		this.autoIndent = source.autoIndent;
 		this.useTabStops = source.useTabStops;
 		this.tabFocusMode = source.tabFocusMode;
 		this.dragAndDrop = source.dragAndDrop;
 		this.emptySelectionClipboard = source.emptySelectionClipboard;
+		this.copyWithSyntaxHighlighting = source.copyWithSyntaxHighlighting;
 		this.layoutInfo = source.layoutInfo;
 		this.fontInfo = source.fontInfo;
 		this.viewInfo = source.viewInfo;
 		this.wrappingInfo = source.wrappingInfo;
 		this.contribInfo = source.contribInfo;
+		this.showUnused = source.showUnused;
 	}
 
 	/**
@@ -1010,11 +1129,15 @@ export class InternalEditorOptions {
 			&& this.multiCursorMergeOverlapping === other.multiCursorMergeOverlapping
 			&& this.wordSeparators === other.wordSeparators
 			&& this.autoClosingBrackets === other.autoClosingBrackets
+			&& this.autoClosingQuotes === other.autoClosingQuotes
+			&& this.autoSurround === other.autoSurround
 			&& this.autoIndent === other.autoIndent
 			&& this.useTabStops === other.useTabStops
 			&& this.tabFocusMode === other.tabFocusMode
 			&& this.dragAndDrop === other.dragAndDrop
+			&& this.showUnused === other.showUnused
 			&& this.emptySelectionClipboard === other.emptySelectionClipboard
+			&& this.copyWithSyntaxHighlighting === other.copyWithSyntaxHighlighting
 			&& InternalEditorOptions._equalsLayoutInfo(this.layoutInfo, other.layoutInfo)
 			&& this.fontInfo.equals(other.fontInfo)
 			&& InternalEditorOptions._equalsViewOptions(this.viewInfo, other.viewInfo)
@@ -1038,11 +1161,14 @@ export class InternalEditorOptions {
 			multiCursorMergeOverlapping: (this.multiCursorMergeOverlapping !== newOpts.multiCursorMergeOverlapping),
 			wordSeparators: (this.wordSeparators !== newOpts.wordSeparators),
 			autoClosingBrackets: (this.autoClosingBrackets !== newOpts.autoClosingBrackets),
+			autoClosingQuotes: (this.autoClosingQuotes !== newOpts.autoClosingQuotes),
+			autoSurround: (this.autoSurround !== newOpts.autoSurround),
 			autoIndent: (this.autoIndent !== newOpts.autoIndent),
 			useTabStops: (this.useTabStops !== newOpts.useTabStops),
 			tabFocusMode: (this.tabFocusMode !== newOpts.tabFocusMode),
 			dragAndDrop: (this.dragAndDrop !== newOpts.dragAndDrop),
 			emptySelectionClipboard: (this.emptySelectionClipboard !== newOpts.emptySelectionClipboard),
+			copyWithSyntaxHighlighting: (this.copyWithSyntaxHighlighting !== newOpts.copyWithSyntaxHighlighting),
 			layoutInfo: (!InternalEditorOptions._equalsLayoutInfo(this.layoutInfo, newOpts.layoutInfo)),
 			fontInfo: (!this.fontInfo.equals(newOpts.fontInfo)),
 			viewInfo: (!InternalEditorOptions._equalsViewOptions(this.viewInfo, newOpts.viewInfo)),
@@ -1122,6 +1248,7 @@ export class InternalEditorOptions {
 			&& a.renderControlCharacters === b.renderControlCharacters
 			&& a.fontLigatures === b.fontLigatures
 			&& a.renderIndentGuides === b.renderIndentGuides
+			&& a.highlightActiveIndentGuide === b.highlightActiveIndentGuide
 			&& a.renderLineHighlight === b.renderLineHighlight
 			&& this._equalsScrollbarOptions(a.scrollbar, b.scrollbar)
 			&& this._equalsMinimapOptions(a.minimap, b.minimap)
@@ -1165,7 +1292,6 @@ export class InternalEditorOptions {
 	/**
 	 * @internal
 	 */
-
 	private static _equalFindOptions(a: InternalEditorFindOptions, b: InternalEditorFindOptions): boolean {
 		return (
 			a.seedSearchStringFromSelection === b.seedSearchStringFromSelection
@@ -1174,6 +1300,42 @@ export class InternalEditorOptions {
 		);
 	}
 
+	/**
+	 * @internal
+	 */
+	private static _equalsParameterHintOptions(a: InternalParameterHintOptions, b: InternalParameterHintOptions): boolean {
+		return (
+			a.enabled === b.enabled
+			&& a.cycle === b.cycle
+		);
+	}
+
+	/**
+	 * @internal
+	 */
+	private static _equalsHoverOptions(a: InternalEditorHoverOptions, b: InternalEditorHoverOptions): boolean {
+		return (
+			a.enabled === b.enabled
+			&& a.delay === b.delay
+			&& a.sticky === b.sticky
+		);
+	}
+
+	/**
+	 * @internal
+	 */
+	private static _equalsSuggestOptions(a: InternalSuggestOptions, b: InternalSuggestOptions): any {
+		if (a === b) {
+			return true;
+		} else if (!a || !b) {
+			return false;
+		} else {
+			return a.filterGraceful === b.filterGraceful
+				&& a.snippets === b.snippets
+				&& a.snippetsPreventQuickSuggestions === b.snippetsPreventQuickSuggestions;
+		}
+	}
+
 	/**
 	 * @internal
 	 */
@@ -1197,23 +1359,23 @@ export class InternalEditorOptions {
 	private static _equalsContribOptions(a: EditorContribOptions, b: EditorContribOptions): boolean {
 		return (
 			a.selectionClipboard === b.selectionClipboard
-			&& a.hover === b.hover
+			&& this._equalsHoverOptions(a.hover, b.hover)
 			&& a.links === b.links
 			&& a.contextmenu === b.contextmenu
 			&& InternalEditorOptions._equalsQuickSuggestions(a.quickSuggestions, b.quickSuggestions)
 			&& a.quickSuggestionsDelay === b.quickSuggestionsDelay
-			&& a.parameterHints === b.parameterHints
+			&& this._equalsParameterHintOptions(a.parameterHints, b.parameterHints)
 			&& a.iconsInSuggestions === b.iconsInSuggestions
 			&& a.formatOnType === b.formatOnType
 			&& a.formatOnPaste === b.formatOnPaste
 			&& a.suggestOnTriggerCharacters === b.suggestOnTriggerCharacters
 			&& a.acceptSuggestionOnEnter === b.acceptSuggestionOnEnter
 			&& a.acceptSuggestionOnCommitCharacter === b.acceptSuggestionOnCommitCharacter
-			&& a.snippetSuggestions === b.snippetSuggestions
 			&& a.wordBasedSuggestions === b.wordBasedSuggestions
 			&& a.suggestSelection === b.suggestSelection
 			&& a.suggestFontSize === b.suggestFontSize
 			&& a.suggestLineHeight === b.suggestLineHeight
+			&& this._equalsSuggestOptions(a.suggest, b.suggest)
 			&& a.selectionHighlight === b.selectionHighlight
 			&& a.occurrencesHighlight === b.occurrencesHighlight
 			&& a.codeLens === b.codeLens
@@ -1383,11 +1545,14 @@ export interface IConfigurationChangedEvent {
 	readonly multiCursorMergeOverlapping: boolean;
 	readonly wordSeparators: boolean;
 	readonly autoClosingBrackets: boolean;
+	readonly autoClosingQuotes: boolean;
+	readonly autoSurround: boolean;
 	readonly autoIndent: boolean;
 	readonly useTabStops: boolean;
 	readonly tabFocusMode: boolean;
 	readonly dragAndDrop: boolean;
 	readonly emptySelectionClipboard: boolean;
+	readonly copyWithSyntaxHighlighting: boolean;
 	readonly layoutInfo: boolean;
 	readonly fontInfo: boolean;
 	readonly viewInfo: boolean;
@@ -1561,6 +1726,20 @@ export class EditorOptionsValidator {
 		}
 		const multiCursorModifier = _stringSet<'altKey' | 'metaKey' | 'ctrlKey'>(configuredMulticursorModifier, defaults.multiCursorModifier, ['altKey', 'metaKey', 'ctrlKey']);
 
+		let autoClosingBrackets: EditorAutoClosingStrategy;
+		let autoClosingQuotes: EditorAutoClosingStrategy;
+		let autoSurround: EditorAutoSurroundStrategy;
+		if (typeof opts.autoClosingBrackets === 'boolean' && opts.autoClosingBrackets === false) {
+			// backwards compatibility: disable all on boolean false
+			autoClosingBrackets = 'never';
+			autoClosingQuotes = 'never';
+			autoSurround = 'never';
+		} else {
+			autoClosingBrackets = _stringSet<EditorAutoClosingStrategy>(opts.autoClosingBrackets, defaults.autoClosingBrackets, ['always', 'languageDefined', 'beforeWhitespace', 'never']);
+			autoClosingQuotes = _stringSet<EditorAutoClosingStrategy>(opts.autoClosingQuotes, defaults.autoClosingQuotes, ['always', 'languageDefined', 'beforeWhitespace', 'never']);
+			autoSurround = _stringSet<EditorAutoSurroundStrategy>(opts.autoSurround, defaults.autoSurround, ['languageDefined', 'brackets', 'quotes', 'never']);
+		}
+
 		return {
 			inDiffEditor: _boolean(opts.inDiffEditor, defaults.inDiffEditor),
 			wordSeparators: _string(opts.wordSeparators, defaults.wordSeparators),
@@ -1577,14 +1756,18 @@ export class EditorOptionsValidator {
 			wordWrapBreakBeforeCharacters: _string(opts.wordWrapBreakBeforeCharacters, defaults.wordWrapBreakBeforeCharacters),
 			wordWrapBreakAfterCharacters: _string(opts.wordWrapBreakAfterCharacters, defaults.wordWrapBreakAfterCharacters),
 			wordWrapBreakObtrusiveCharacters: _string(opts.wordWrapBreakObtrusiveCharacters, defaults.wordWrapBreakObtrusiveCharacters),
-			autoClosingBrackets: _boolean(opts.autoClosingBrackets, defaults.autoClosingBrackets),
+			autoClosingBrackets,
+			autoClosingQuotes,
+			autoSurround,
 			autoIndent: _boolean(opts.autoIndent, defaults.autoIndent),
 			dragAndDrop: _boolean(opts.dragAndDrop, defaults.dragAndDrop),
 			emptySelectionClipboard: _boolean(opts.emptySelectionClipboard, defaults.emptySelectionClipboard),
+			copyWithSyntaxHighlighting: _boolean(opts.copyWithSyntaxHighlighting, defaults.copyWithSyntaxHighlighting),
 			useTabStops: _boolean(opts.useTabStops, defaults.useTabStops),
 			multiCursorModifier: multiCursorModifier,
 			multiCursorMergeOverlapping: _boolean(opts.multiCursorMergeOverlapping, defaults.multiCursorMergeOverlapping),
 			accessibilitySupport: _stringSet<'auto' | 'on' | 'off'>(opts.accessibilitySupport, defaults.accessibilitySupport, ['auto', 'on', 'off']),
+			showUnused: _boolean(opts.showUnused, defaults.showUnused),
 			viewInfo: viewInfo,
 			contribInfo: contribInfo,
 		};
@@ -1642,6 +1825,46 @@ export class EditorOptionsValidator {
 		};
 	}
 
+	private static _sanitizeParameterHintOpts(opts: IEditorParameterHintOptions, defaults: InternalParameterHintOptions): InternalParameterHintOptions {
+		if (typeof opts !== 'object') {
+			return defaults;
+		}
+
+		return {
+			enabled: _boolean(opts.enabled, defaults.enabled),
+			cycle: _boolean(opts.cycle, defaults.cycle)
+		};
+	}
+
+	private static _santizeHoverOpts(_opts: boolean | IEditorHoverOptions, defaults: InternalEditorHoverOptions): InternalEditorHoverOptions {
+		let opts: IEditorHoverOptions;
+		if (typeof _opts === 'boolean') {
+			opts = {
+				enabled: _opts
+			};
+		} else if (typeof _opts === 'object') {
+			opts = _opts;
+		} else {
+			return defaults;
+		}
+
+		return {
+			enabled: _boolean(opts.enabled, defaults.enabled),
+			delay: _clampedInt(opts.delay, defaults.delay, 0, 10000),
+			sticky: _boolean(opts.sticky, defaults.sticky)
+		};
+	}
+
+	private static _sanitizeSuggestOpts(opts: IEditorOptions, defaults: InternalSuggestOptions): InternalSuggestOptions {
+		const suggestOpts = opts.suggest || {};
+		return {
+			filterGraceful: _boolean(suggestOpts.filterGraceful, defaults.filterGraceful),
+			snippets: _stringSet<'top' | 'bottom' | 'inline' | 'none'>(opts.snippetSuggestions, defaults.snippets, ['top', 'bottom', 'inline', 'none']),
+			snippetsPreventQuickSuggestions: _boolean(suggestOpts.snippetsPreventQuickSuggestions, defaults.filterGraceful),
+		};
+	}
+
+
 	private static _sanitizeViewInfo(opts: IEditorOptions, defaults: InternalEditorViewOptions): InternalEditorViewOptions {
 
 		let rulers: number[] = [];
@@ -1738,6 +1961,7 @@ export class EditorOptionsValidator {
 			renderControlCharacters: _boolean(opts.renderControlCharacters, defaults.renderControlCharacters),
 			fontLigatures: fontLigatures,
 			renderIndentGuides: _boolean(opts.renderIndentGuides, defaults.renderIndentGuides),
+			highlightActiveIndentGuide: _boolean(opts.highlightActiveIndentGuide, defaults.highlightActiveIndentGuide),
 			renderLineHighlight: renderLineHighlight,
 			scrollbar: scrollbar,
 			minimap: minimap,
@@ -1759,23 +1983,23 @@ export class EditorOptionsValidator {
 		const find = this._santizeFindOpts(opts.find, defaults.find);
 		return {
 			selectionClipboard: _boolean(opts.selectionClipboard, defaults.selectionClipboard),
-			hover: _boolean(opts.hover, defaults.hover),
+			hover: this._santizeHoverOpts(opts.hover, defaults.hover),
 			links: _boolean(opts.links, defaults.links),
 			contextmenu: _boolean(opts.contextmenu, defaults.contextmenu),
 			quickSuggestions: quickSuggestions,
 			quickSuggestionsDelay: _clampedInt(opts.quickSuggestionsDelay, defaults.quickSuggestionsDelay, Constants.MIN_SAFE_SMALL_INTEGER, Constants.MAX_SAFE_SMALL_INTEGER),
-			parameterHints: _boolean(opts.parameterHints, defaults.parameterHints),
+			parameterHints: this._sanitizeParameterHintOpts(opts.parameterHints, defaults.parameterHints),
 			iconsInSuggestions: _boolean(opts.iconsInSuggestions, defaults.iconsInSuggestions),
 			formatOnType: _boolean(opts.formatOnType, defaults.formatOnType),
 			formatOnPaste: _boolean(opts.formatOnPaste, defaults.formatOnPaste),
 			suggestOnTriggerCharacters: _boolean(opts.suggestOnTriggerCharacters, defaults.suggestOnTriggerCharacters),
 			acceptSuggestionOnEnter: _stringSet<'on' | 'smart' | 'off'>(opts.acceptSuggestionOnEnter, defaults.acceptSuggestionOnEnter, ['on', 'smart', 'off']),
 			acceptSuggestionOnCommitCharacter: _boolean(opts.acceptSuggestionOnCommitCharacter, defaults.acceptSuggestionOnCommitCharacter),
-			snippetSuggestions: _stringSet<'top' | 'bottom' | 'inline' | 'none'>(opts.snippetSuggestions, defaults.snippetSuggestions, ['top', 'bottom', 'inline', 'none']),
 			wordBasedSuggestions: _boolean(opts.wordBasedSuggestions, defaults.wordBasedSuggestions),
 			suggestSelection: _stringSet<'first' | 'recentlyUsed' | 'recentlyUsedByPrefix'>(opts.suggestSelection, defaults.suggestSelection, ['first', 'recentlyUsed', 'recentlyUsedByPrefix']),
 			suggestFontSize: _clampedInt(opts.suggestFontSize, defaults.suggestFontSize, 0, 1000),
 			suggestLineHeight: _clampedInt(opts.suggestLineHeight, defaults.suggestLineHeight, 0, 1000),
+			suggest: this._sanitizeSuggestOpts(opts, defaults.suggest),
 			selectionHighlight: _boolean(opts.selectionHighlight, defaults.selectionHighlight),
 			occurrencesHighlight: _boolean(opts.occurrencesHighlight, defaults.occurrencesHighlight),
 			codeLens: _boolean(opts.codeLens, defaults.codeLens),
@@ -1817,13 +2041,17 @@ export class InternalEditorOptionsFactory {
 			wordWrapBreakAfterCharacters: opts.wordWrapBreakAfterCharacters,
 			wordWrapBreakObtrusiveCharacters: opts.wordWrapBreakObtrusiveCharacters,
 			autoClosingBrackets: opts.autoClosingBrackets,
+			autoClosingQuotes: opts.autoClosingQuotes,
+			autoSurround: opts.autoSurround,
 			autoIndent: opts.autoIndent,
 			dragAndDrop: opts.dragAndDrop,
 			emptySelectionClipboard: opts.emptySelectionClipboard,
+			copyWithSyntaxHighlighting: opts.copyWithSyntaxHighlighting,
 			useTabStops: opts.useTabStops,
 			multiCursorModifier: opts.multiCursorModifier,
 			multiCursorMergeOverlapping: opts.multiCursorMergeOverlapping,
 			accessibilitySupport: opts.accessibilitySupport,
+			showUnused: opts.showUnused,
 
 			viewInfo: {
 				extraEditorClassName: opts.viewInfo.extraEditorClassName,
@@ -1851,6 +2079,7 @@ export class InternalEditorOptionsFactory {
 				renderControlCharacters: (accessibilityIsOn ? false : opts.viewInfo.renderControlCharacters), // DISABLED WHEN SCREEN READER IS ATTACHED
 				fontLigatures: (accessibilityIsOn ? false : opts.viewInfo.fontLigatures), // DISABLED WHEN SCREEN READER IS ATTACHED
 				renderIndentGuides: (accessibilityIsOn ? false : opts.viewInfo.renderIndentGuides), // DISABLED WHEN SCREEN READER IS ATTACHED
+				highlightActiveIndentGuide: opts.viewInfo.highlightActiveIndentGuide,
 				renderLineHighlight: opts.viewInfo.renderLineHighlight,
 				scrollbar: opts.viewInfo.scrollbar,
 				minimap: {
@@ -1877,11 +2106,11 @@ export class InternalEditorOptionsFactory {
 				suggestOnTriggerCharacters: opts.contribInfo.suggestOnTriggerCharacters,
 				acceptSuggestionOnEnter: opts.contribInfo.acceptSuggestionOnEnter,
 				acceptSuggestionOnCommitCharacter: opts.contribInfo.acceptSuggestionOnCommitCharacter,
-				snippetSuggestions: opts.contribInfo.snippetSuggestions,
 				wordBasedSuggestions: opts.contribInfo.wordBasedSuggestions,
 				suggestSelection: opts.contribInfo.suggestSelection,
 				suggestFontSize: opts.contribInfo.suggestFontSize,
 				suggestLineHeight: opts.contribInfo.suggestLineHeight,
+				suggest: opts.contribInfo.suggest,
 				selectionHighlight: (accessibilityIsOn ? false : opts.contribInfo.selectionHighlight), // DISABLED WHEN SCREEN READER IS ATTACHED
 				occurrencesHighlight: (accessibilityIsOn ? false : opts.contribInfo.occurrencesHighlight), // DISABLED WHEN SCREEN READER IS ATTACHED
 				codeLens: (accessibilityIsOn ? false : opts.contribInfo.codeLens), // DISABLED WHEN SCREEN READER IS ATTACHED
@@ -2036,16 +2265,20 @@ export class InternalEditorOptionsFactory {
 			multiCursorMergeOverlapping: opts.multiCursorMergeOverlapping,
 			wordSeparators: opts.wordSeparators,
 			autoClosingBrackets: opts.autoClosingBrackets,
+			autoClosingQuotes: opts.autoClosingQuotes,
+			autoSurround: opts.autoSurround,
 			autoIndent: opts.autoIndent,
 			useTabStops: opts.useTabStops,
 			tabFocusMode: opts.readOnly ? true : env.tabFocusMode,
 			dragAndDrop: opts.dragAndDrop,
 			emptySelectionClipboard: opts.emptySelectionClipboard && env.emptySelectionClipboard,
+			copyWithSyntaxHighlighting: opts.copyWithSyntaxHighlighting,
 			layoutInfo: layoutInfo,
 			fontInfo: env.fontInfo,
 			viewInfo: opts.viewInfo,
 			wrappingInfo: wrappingInfo,
-			contribInfo: opts.contribInfo
+			contribInfo: opts.contribInfo,
+			showUnused: opts.showUnused,
 		});
 	}
 }
@@ -2218,9 +2451,9 @@ export class EditorLayoutProvider {
 	}
 }
 
-const DEFAULT_WINDOWS_FONT_FAMILY = 'Consolas, \'Courier New\', monospace, \'Segoe UI Emoji\'';
-const DEFAULT_MAC_FONT_FAMILY = 'Menlo, Monaco, \'Courier New\', monospace, \'Apple Color Emoji\'';
-const DEFAULT_LINUX_FONT_FAMILY = '\'Droid Sans Mono\', \'monospace\', monospace, \'Droid Sans Fallback\', \'Noto Color Emoji\'';
+const DEFAULT_WINDOWS_FONT_FAMILY = 'Consolas, \'Courier New\', monospace';
+const DEFAULT_MAC_FONT_FAMILY = 'Menlo, Monaco, \'Courier New\', monospace';
+const DEFAULT_LINUX_FONT_FAMILY = '\'Droid Sans Mono\', \'monospace\', monospace, \'Droid Sans Fallback\'';
 
 /**
  * @internal
@@ -2267,14 +2500,18 @@ export const EDITOR_DEFAULTS: IValidatedEditorOptions = {
 	wordWrapBreakBeforeCharacters: '([{‘“〈《「『【〔（［｛｢£¥＄￡￥+＋',
 	wordWrapBreakAfterCharacters: ' \t})]?|&,;¢°′″‰℃、。｡､￠，．：；？！％・･ゝゞヽヾーァィゥェォッャュョヮヵヶぁぃぅぇぉっゃゅょゎゕゖㇰㇱㇲㇳㇴㇵㇶㇷㇸㇹㇺㇻㇼㇽㇾㇿ々〻ｧｨｩｪｫｬｭｮｯｰ”〉》」』】〕）］｝｣',
 	wordWrapBreakObtrusiveCharacters: '.',
-	autoClosingBrackets: true,
+	autoClosingBrackets: 'languageDefined',
+	autoClosingQuotes: 'languageDefined',
+	autoSurround: 'languageDefined',
 	autoIndent: true,
 	dragAndDrop: true,
 	emptySelectionClipboard: true,
+	copyWithSyntaxHighlighting: true,
 	useTabStops: true,
 	multiCursorModifier: 'altKey',
 	multiCursorMergeOverlapping: true,
 	accessibilitySupport: 'auto',
+	showUnused: true,
 
 	viewInfo: {
 		extraEditorClassName: '',
@@ -2302,6 +2539,7 @@ export const EDITOR_DEFAULTS: IValidatedEditorOptions = {
 		renderControlCharacters: false,
 		fontLigatures: false,
 		renderIndentGuides: true,
+		highlightActiveIndentGuide: true,
 		renderLineHighlight: 'line',
 		scrollbar: {
 			vertical: ScrollbarVisibility.Auto,
@@ -2329,23 +2567,34 @@ export const EDITOR_DEFAULTS: IValidatedEditorOptions = {
 
 	contribInfo: {
 		selectionClipboard: true,
-		hover: true,
+		hover: {
+			enabled: true,
+			delay: 300,
+			sticky: true
+		},
 		links: true,
 		contextmenu: true,
 		quickSuggestions: { other: true, comments: false, strings: false },
 		quickSuggestionsDelay: 10,
-		parameterHints: true,
+		parameterHints: {
+			enabled: true,
+			cycle: false
+		},
 		iconsInSuggestions: true,
 		formatOnType: false,
 		formatOnPaste: false,
 		suggestOnTriggerCharacters: true,
 		acceptSuggestionOnEnter: 'on',
 		acceptSuggestionOnCommitCharacter: true,
-		snippetSuggestions: 'inline',
 		wordBasedSuggestions: true,
 		suggestSelection: 'recentlyUsed',
 		suggestFontSize: 0,
 		suggestLineHeight: 0,
+		suggest: {
+			filterGraceful: true,
+			snippets: 'inline',
+			snippetsPreventQuickSuggestions: true
+		},
 		selectionHighlight: true,
 		occurrencesHighlight: true,
 		codeLens: true,
diff --git a/src/vs/editor/common/config/fontInfo.ts b/src/vs/editor/common/config/fontInfo.ts
index 24b105bbd4e..1c5b063979b 100644
--- a/src/vs/editor/common/config/fontInfo.ts
+++ b/src/vs/editor/common/config/fontInfo.ts
@@ -155,6 +155,7 @@ export class FontInfo extends BareFontInfo {
 	readonly isMonospace: boolean;
 	readonly typicalHalfwidthCharacterWidth: number;
 	readonly typicalFullwidthCharacterWidth: number;
+	readonly canUseHalfwidthRightwardsArrow: boolean;
 	readonly spaceWidth: number;
 	readonly maxDigitWidth: number;
 
@@ -171,6 +172,7 @@ export class FontInfo extends BareFontInfo {
 		isMonospace: boolean;
 		typicalHalfwidthCharacterWidth: number;
 		typicalFullwidthCharacterWidth: number;
+		canUseHalfwidthRightwardsArrow: boolean;
 		spaceWidth: number;
 		maxDigitWidth: number;
 	}, isTrusted: boolean) {
@@ -179,6 +181,7 @@ export class FontInfo extends BareFontInfo {
 		this.isMonospace = opts.isMonospace;
 		this.typicalHalfwidthCharacterWidth = opts.typicalHalfwidthCharacterWidth;
 		this.typicalFullwidthCharacterWidth = opts.typicalFullwidthCharacterWidth;
+		this.canUseHalfwidthRightwardsArrow = opts.canUseHalfwidthRightwardsArrow;
 		this.spaceWidth = opts.spaceWidth;
 		this.maxDigitWidth = opts.maxDigitWidth;
 	}
@@ -195,6 +198,7 @@ export class FontInfo extends BareFontInfo {
 			&& this.letterSpacing === other.letterSpacing
 			&& this.typicalHalfwidthCharacterWidth === other.typicalHalfwidthCharacterWidth
 			&& this.typicalFullwidthCharacterWidth === other.typicalFullwidthCharacterWidth
+			&& this.canUseHalfwidthRightwardsArrow === other.canUseHalfwidthRightwardsArrow
 			&& this.spaceWidth === other.spaceWidth
 			&& this.maxDigitWidth === other.maxDigitWidth
 		);
diff --git a/src/vs/editor/common/controller/cursor.ts b/src/vs/editor/common/controller/cursor.ts
index 6e30401ddf9..caafa214f69 100644
--- a/src/vs/editor/common/controller/cursor.ts
+++ b/src/vs/editor/common/controller/cursor.ts
@@ -551,7 +551,6 @@ export class Cursor extends viewEvents.ViewEventEmitter implements ICursors {
 
 	private _type(source: string, text: string): void {
 		if (!this._isDoingComposition && source === 'keyboard') {
-			console.log('keyboard', source, text);
 			// If this event is coming straight from the keyboard, look for electric characters and enter
 
 			for (let i = 0, len = text.length; i < len; i++) {
diff --git a/src/vs/editor/common/controller/cursorCommon.ts b/src/vs/editor/common/controller/cursorCommon.ts
index 0563b6a0771..ebf8dc4a689 100644
--- a/src/vs/editor/common/controller/cursorCommon.ts
+++ b/src/vs/editor/common/controller/cursorCommon.ts
@@ -15,7 +15,7 @@ import { LanguageConfigurationRegistry } from 'vs/editor/common/modes/languageCo
 import { onUnexpectedError } from 'vs/base/common/errors';
 import { LanguageIdentifier } from 'vs/editor/common/modes';
 import { IAutoClosingPair } from 'vs/editor/common/modes/languageConfiguration';
-import { IConfigurationChangedEvent } from 'vs/editor/common/config/editorOptions';
+import { IConfigurationChangedEvent, EditorAutoClosingStrategy, EditorAutoSurroundStrategy } from 'vs/editor/common/config/editorOptions';
 import { IViewModel } from 'vs/editor/common/viewModel/viewModel';
 import { CursorChangeReason } from 'vs/editor/common/controller/cursorEvents';
 import { VerticalRevealType } from 'vs/editor/common/view/viewEvents';
@@ -66,6 +66,10 @@ export interface CharacterMap {
 	[char: string]: string;
 }
 
+const autoCloseAlways = _ => true;
+const autoCloseNever = _ => false;
+const autoCloseBeforeWhitespace = (chr: string) => (chr === ' ' || chr === '\t');
+
 export class CursorConfiguration {
 	_cursorMoveConfigurationBrand: void;
 
@@ -78,12 +82,16 @@ export class CursorConfiguration {
 	public readonly useTabStops: boolean;
 	public readonly wordSeparators: string;
 	public readonly emptySelectionClipboard: boolean;
+	public readonly copyWithSyntaxHighlighting: boolean;
 	public readonly multiCursorMergeOverlapping: boolean;
-	public readonly autoClosingBrackets: boolean;
+	public readonly autoClosingBrackets: EditorAutoClosingStrategy;
+	public readonly autoClosingQuotes: EditorAutoClosingStrategy;
+	public readonly autoSurround: EditorAutoSurroundStrategy;
 	public readonly autoIndent: boolean;
 	public readonly autoClosingPairsOpen: CharacterMap;
 	public readonly autoClosingPairsClose: CharacterMap;
 	public readonly surroundingPairs: CharacterMap;
+	public readonly shouldAutoCloseBefore: { quote: (ch: string) => boolean, bracket: (ch: string) => boolean };
 
 	private readonly _languageIdentifier: LanguageIdentifier;
 	private _electricChars: { [key: string]: boolean; };
@@ -95,6 +103,8 @@ export class CursorConfiguration {
 			|| e.emptySelectionClipboard
 			|| e.multiCursorMergeOverlapping
 			|| e.autoClosingBrackets
+			|| e.autoClosingQuotes
+			|| e.autoSurround
 			|| e.useTabStops
 			|| e.lineHeight
 			|| e.readOnly
@@ -120,8 +130,11 @@ export class CursorConfiguration {
 		this.useTabStops = c.useTabStops;
 		this.wordSeparators = c.wordSeparators;
 		this.emptySelectionClipboard = c.emptySelectionClipboard;
+		this.copyWithSyntaxHighlighting = c.copyWithSyntaxHighlighting;
 		this.multiCursorMergeOverlapping = c.multiCursorMergeOverlapping;
 		this.autoClosingBrackets = c.autoClosingBrackets;
+		this.autoClosingQuotes = c.autoClosingQuotes;
+		this.autoSurround = c.autoSurround;
 		this.autoIndent = c.autoIndent;
 
 		this.autoClosingPairsOpen = {};
@@ -129,6 +142,11 @@ export class CursorConfiguration {
 		this.surroundingPairs = {};
 		this._electricChars = null;
 
+		this.shouldAutoCloseBefore = {
+			quote: CursorConfiguration._getShouldAutoClose(languageIdentifier, this.autoClosingQuotes),
+			bracket: CursorConfiguration._getShouldAutoClose(languageIdentifier, this.autoClosingBrackets)
+		};
+
 		let autoClosingPairs = CursorConfiguration._getAutoClosingPairs(languageIdentifier);
 		if (autoClosingPairs) {
 			for (let i = 0; i < autoClosingPairs.length; i++) {
@@ -180,6 +198,29 @@ export class CursorConfiguration {
 		}
 	}
 
+	private static _getShouldAutoClose(languageIdentifier: LanguageIdentifier, autoCloseConfig: EditorAutoClosingStrategy): (ch: string) => boolean {
+		switch (autoCloseConfig) {
+			case 'beforeWhitespace':
+				return autoCloseBeforeWhitespace;
+			case 'languageDefined':
+				return CursorConfiguration._getLanguageDefinedShouldAutoClose(languageIdentifier);
+			case 'always':
+				return autoCloseAlways;
+			case 'never':
+				return autoCloseNever;
+		}
+	}
+
+	private static _getLanguageDefinedShouldAutoClose(languageIdentifier: LanguageIdentifier): (ch: string) => boolean {
+		try {
+			const autoCloseBeforeSet = LanguageConfigurationRegistry.getAutoCloseBeforeSet(languageIdentifier.id);
+			return c => autoCloseBeforeSet.indexOf(c) !== -1;
+		} catch (e) {
+			onUnexpectedError(e);
+			return autoCloseNever;
+		}
+	}
+
 	private static _getSurroundingPairs(languageIdentifier: LanguageIdentifier): IAutoClosingPair[] {
 		try {
 			return LanguageConfigurationRegistry.getSurroundingPairs(languageIdentifier.id);
@@ -537,3 +578,7 @@ export class CursorColumns {
 		return column - 1 - (column - 1) % tabSize;
 	}
 }
+
+export function isQuote(ch: string): boolean {
+	return (ch === '\'' || ch === '"' || ch === '`');
+}
diff --git a/src/vs/editor/common/controller/cursorDeleteOperations.ts b/src/vs/editor/common/controller/cursorDeleteOperations.ts
index e5b498b40e9..e16c0944cb9 100644
--- a/src/vs/editor/common/controller/cursorDeleteOperations.ts
+++ b/src/vs/editor/common/controller/cursorDeleteOperations.ts
@@ -5,7 +5,7 @@
 'use strict';
 
 import { ReplaceCommand } from 'vs/editor/common/commands/replaceCommand';
-import { CursorColumns, CursorConfiguration, ICursorSimpleModel, EditOperationResult, EditOperationType } from 'vs/editor/common/controller/cursorCommon';
+import { CursorColumns, CursorConfiguration, ICursorSimpleModel, EditOperationResult, EditOperationType, isQuote } from 'vs/editor/common/controller/cursorCommon';
 import { Range } from 'vs/editor/common/core/range';
 import { Selection } from 'vs/editor/common/core/selection';
 import { MoveOperations } from 'vs/editor/common/controller/cursorMoveOperations';
@@ -49,7 +49,7 @@ export class DeleteOperations {
 	}
 
 	private static _isAutoClosingPairDelete(config: CursorConfiguration, model: ICursorSimpleModel, selections: Selection[]): boolean {
-		if (!config.autoClosingBrackets) {
+		if (config.autoClosingBrackets === 'never' && config.autoClosingQuotes === 'never') {
 			return false;
 		}
 
@@ -68,6 +68,16 @@ export class DeleteOperations {
 				return false;
 			}
 
+			if (isQuote(character)) {
+				if (config.autoClosingQuotes === 'never') {
+					return false;
+				}
+			} else {
+				if (config.autoClosingBrackets === 'never') {
+					return false;
+				}
+			}
+
 			const afterCharacter = lineText[position.column - 1];
 			const closeCharacter = config.autoClosingPairsOpen[character];
 
diff --git a/src/vs/editor/common/controller/cursorMoveCommands.ts b/src/vs/editor/common/controller/cursorMoveCommands.ts
index bb9c031c095..039f6706bd2 100644
--- a/src/vs/editor/common/controller/cursorMoveCommands.ts
+++ b/src/vs/editor/common/controller/cursorMoveCommands.ts
@@ -607,7 +607,7 @@ export namespace CursorMove {
 						\`\`\`
 						'left', 'right', 'up', 'down'
 						'wrappedLineStart', 'wrappedLineEnd', 'wrappedLineColumnCenter'
-						'wrappedLineFirstNonWhitespaceCharacter', 'wrappedLineLastNonWhitespaceCharacter',
+						'wrappedLineFirstNonWhitespaceCharacter', 'wrappedLineLastNonWhitespaceCharacter'
 						'viewPortTop', 'viewPortCenter', 'viewPortBottom', 'viewPortIfOutside'
 						\`\`\`
 					* 'by': Unit to move. Default is computed based on 'to' value.
diff --git a/src/vs/editor/common/controller/cursorTypeOperations.ts b/src/vs/editor/common/controller/cursorTypeOperations.ts
index 7085aa16c93..f18e3e9d8fc 100644
--- a/src/vs/editor/common/controller/cursorTypeOperations.ts
+++ b/src/vs/editor/common/controller/cursorTypeOperations.ts
@@ -6,7 +6,7 @@
 
 import { onUnexpectedError } from 'vs/base/common/errors';
 import { ReplaceCommand, ReplaceCommandWithoutChangingPosition, ReplaceCommandWithOffsetCursorState } from 'vs/editor/common/commands/replaceCommand';
-import { CursorColumns, CursorConfiguration, ICursorSimpleModel, EditOperationResult, EditOperationType } from 'vs/editor/common/controller/cursorCommon';
+import { CursorColumns, CursorConfiguration, ICursorSimpleModel, EditOperationResult, EditOperationType, isQuote } from 'vs/editor/common/controller/cursorCommon';
 import { Range } from 'vs/editor/common/core/range';
 import { ICommand } from 'vs/editor/common/editorCommon';
 import { ITextModel } from 'vs/editor/common/model';
@@ -437,7 +437,9 @@ export class TypeOperations {
 	}
 
 	private static _isAutoClosingCloseCharType(config: CursorConfiguration, model: ITextModel, selections: Selection[], ch: string): boolean {
-		if (!config.autoClosingBrackets || !config.autoClosingPairsClose.hasOwnProperty(ch)) {
+		const autoCloseConfig = isQuote(ch) ? config.autoClosingQuotes : config.autoClosingBrackets;
+
+		if (autoCloseConfig === 'never' || !config.autoClosingPairsClose.hasOwnProperty(ch)) {
 			return false;
 		}
 
@@ -511,10 +513,15 @@ export class TypeOperations {
 	}
 
 	private static _isAutoClosingOpenCharType(config: CursorConfiguration, model: ITextModel, selections: Selection[], ch: string): boolean {
-		if (!config.autoClosingBrackets || !config.autoClosingPairsOpen.hasOwnProperty(ch)) {
+		const chIsQuote = isQuote(ch);
+		const autoCloseConfig = chIsQuote ? config.autoClosingQuotes : config.autoClosingBrackets;
+
+		if (autoCloseConfig === 'never' || !config.autoClosingPairsOpen.hasOwnProperty(ch)) {
 			return false;
 		}
 
+		let shouldAutoCloseBefore = chIsQuote ? config.shouldAutoCloseBefore.quote : config.shouldAutoCloseBefore.bracket;
+
 		for (let i = 0, len = selections.length; i < len; i++) {
 			const selection = selections[i];
 			if (!selection.isEmpty()) {
@@ -525,7 +532,7 @@ export class TypeOperations {
 			const lineText = model.getLineContent(position.lineNumber);
 
 			// Do not auto-close ' or " after a word character
-			if ((ch === '\'' || ch === '"') && position.column > 1) {
+			if (chIsQuote && position.column > 1) {
 				const wordSeparators = getMapForWordSeparators(config.wordSeparators);
 				const characterBeforeCode = lineText.charCodeAt(position.column - 2);
 				const characterBeforeType = wordSeparators.get(characterBeforeCode);
@@ -538,7 +545,8 @@ export class TypeOperations {
 			const characterAfter = lineText.charAt(position.column - 1);
 			if (characterAfter) {
 				let isBeforeCloseBrace = TypeOperations._isBeforeClosingBrace(config, ch, characterAfter);
-				if (!isBeforeCloseBrace && !/\s/.test(characterAfter)) {
+
+				if (!isBeforeCloseBrace && !shouldAutoCloseBefore(characterAfter)) {
 					return false;
 				}
 			}
@@ -579,12 +587,21 @@ export class TypeOperations {
 		});
 	}
 
+	private static _shouldSurroundChar(config: CursorConfiguration, ch: string): boolean {
+		if (isQuote(ch)) {
+			return (config.autoSurround === 'quotes' || config.autoSurround === 'languageDefined');
+		} else {
+			// Character is a bracket
+			return (config.autoSurround === 'brackets' || config.autoSurround === 'languageDefined');
+		}
+	}
+
 	private static _isSurroundSelectionType(config: CursorConfiguration, model: ITextModel, selections: Selection[], ch: string): boolean {
-		if (!config.autoClosingBrackets || !config.surroundingPairs.hasOwnProperty(ch)) {
+		if (!TypeOperations._shouldSurroundChar(config, ch) || !config.surroundingPairs.hasOwnProperty(ch)) {
 			return false;
 		}
 
-		const isTypingAQuoteCharacter = (ch === '\'' || ch === '"');
+		const isTypingAQuoteCharacter = isQuote(ch);
 
 		for (let i = 0, len = selections.length; i < len; i++) {
 			const selection = selections[i];
@@ -613,7 +630,7 @@ export class TypeOperations {
 
 			if (isTypingAQuoteCharacter && selection.startLineNumber === selection.endLineNumber && selection.startColumn + 1 === selection.endColumn) {
 				const selectionText = model.getValueInRange(selection);
-				if ((selectionText === '\'' || selectionText === '"')) {
+				if (isQuote(selectionText)) {
 					// Typing a quote character on top of another quote character
 					// => disable surround selection type
 					return false;
@@ -708,7 +725,7 @@ export class TypeOperations {
 	}
 
 	public static compositionEndWithInterceptors(prevEditOperationType: EditOperationType, config: CursorConfiguration, model: ITextModel, selections: Selection[]): EditOperationResult {
-		if (!config.autoClosingBrackets) {
+		if (config.autoClosingQuotes === 'never') {
 			return null;
 		}
 
@@ -736,7 +753,7 @@ export class TypeOperations {
 			// As we are not typing in a new character, so we don't need to run `_runAutoClosingCloseCharType`
 			// Next step, let's try to check if it's an open char.
 			if (config.autoClosingPairsOpen.hasOwnProperty(ch)) {
-				if ((ch === '\'' || ch === '"') && position.column > 2) {
+				if (isQuote(ch) && position.column > 2) {
 					const wordSeparators = getMapForWordSeparators(config.wordSeparators);
 					const characterBeforeCode = lineText.charCodeAt(position.column - 3);
 					const characterBeforeType = wordSeparators.get(characterBeforeCode);
@@ -749,7 +766,14 @@ export class TypeOperations {
 
 				if (characterAfter) {
 					let isBeforeCloseBrace = TypeOperations._isBeforeClosingBrace(config, ch, characterAfter);
-					if (!isBeforeCloseBrace && !/\s/.test(characterAfter)) {
+					let shouldAutoCloseBefore = isQuote(ch) ? config.shouldAutoCloseBefore.quote : config.shouldAutoCloseBefore.bracket;
+					if (isBeforeCloseBrace) {
+						// In normal auto closing logic, we will auto close if the cursor is even before a closing brace intentionally.
+						// However for composition mode, we do nothing here as users might clear all the characters for composition and we don't want to do a unnecessary auto close.
+						// Related: microsoft/vscode#57250.
+						continue;
+					}
+					if (!shouldAutoCloseBefore(characterAfter)) {
 						continue;
 					}
 				}
diff --git a/src/vs/editor/common/controller/cursorWordOperations.ts b/src/vs/editor/common/controller/cursorWordOperations.ts
index 8bd73b791f0..1fc71edf103 100644
--- a/src/vs/editor/common/controller/cursorWordOperations.ts
+++ b/src/vs/editor/common/controller/cursorWordOperations.ts
@@ -10,6 +10,7 @@ import { WordCharacterClassifier, WordCharacterClass, getMapForWordSeparators }
 import * as strings from 'vs/base/common/strings';
 import { Range } from 'vs/editor/common/core/range';
 import { Selection } from 'vs/editor/common/core/selection';
+import { CharCode } from 'vs/base/common/charCode';
 
 interface IFindWordResult {
 	/**
@@ -38,7 +39,8 @@ const enum WordType {
 
 export const enum WordNavigationType {
 	WordStart = 0,
-	WordEnd = 1
+	WordStartFast = 1,
+	WordEnd = 2
 }
 
 export class WordOperations {
@@ -160,9 +162,11 @@ export class WordOperations {
 	public static moveWordLeft(wordSeparators: WordCharacterClassifier, model: ICursorSimpleModel, position: Position, wordNavigationType: WordNavigationType): Position {
 		let lineNumber = position.lineNumber;
 		let column = position.column;
+		let movedToPreviousLine = false;
 
 		if (column === 1) {
 			if (lineNumber > 1) {
+				movedToPreviousLine = true;
 				lineNumber = lineNumber - 1;
 				column = model.getLineMaxColumn(lineNumber);
 			}
@@ -171,29 +175,41 @@ export class WordOperations {
 		let prevWordOnLine = WordOperations._findPreviousWordOnLine(wordSeparators, model, new Position(lineNumber, column));
 
 		if (wordNavigationType === WordNavigationType.WordStart) {
-			if (prevWordOnLine && prevWordOnLine.wordType === WordType.Separator) {
-				if (prevWordOnLine.end - prevWordOnLine.start === 1 && prevWordOnLine.nextCharClass === WordCharacterClass.Regular) {
-					// Skip over a word made up of one single separator and followed by a regular character
-					prevWordOnLine = WordOperations._findPreviousWordOnLine(wordSeparators, model, new Position(lineNumber, prevWordOnLine.start + 1));
+
+			if (prevWordOnLine && !movedToPreviousLine) {
+				// Special case for Visual Studio compatibility:
+				// when starting in the trim whitespace at the end of a line,
+				// go to the end of the last word
+				const lastWhitespaceColumn = model.getLineLastNonWhitespaceColumn(lineNumber);
+				if (lastWhitespaceColumn < column) {
+					return new Position(lineNumber, prevWordOnLine.end + 1);
 				}
 			}
-			if (prevWordOnLine) {
-				column = prevWordOnLine.start + 1;
-			} else {
-				column = 1;
-			}
-		} else {
-			if (prevWordOnLine && column <= prevWordOnLine.end + 1) {
-				prevWordOnLine = WordOperations._findPreviousWordOnLine(wordSeparators, model, new Position(lineNumber, prevWordOnLine.start + 1));
-			}
-			if (prevWordOnLine) {
-				column = prevWordOnLine.end + 1;
-			} else {
-				column = 1;
-			}
+
+			return new Position(lineNumber, prevWordOnLine ? prevWordOnLine.start + 1 : 1);
 		}
 
-		return new Position(lineNumber, column);
+		if (wordNavigationType === WordNavigationType.WordStartFast) {
+			if (
+				prevWordOnLine
+				&& prevWordOnLine.wordType === WordType.Separator
+				&& prevWordOnLine.end - prevWordOnLine.start === 1
+				&& prevWordOnLine.nextCharClass === WordCharacterClass.Regular
+			) {
+				// Skip over a word made up of one single separator and followed by a regular character
+				prevWordOnLine = WordOperations._findPreviousWordOnLine(wordSeparators, model, new Position(lineNumber, prevWordOnLine.start + 1));
+			}
+
+			return new Position(lineNumber, prevWordOnLine ? prevWordOnLine.start + 1 : 1);
+		}
+
+		// We are stopping at the ending of words
+
+		if (prevWordOnLine && column <= prevWordOnLine.end + 1) {
+			prevWordOnLine = WordOperations._findPreviousWordOnLine(wordSeparators, model, new Position(lineNumber, prevWordOnLine.start + 1));
+		}
+
+		return new Position(lineNumber, prevWordOnLine ? prevWordOnLine.end + 1 : 1);
 	}
 
 	public static moveWordRight(wordSeparators: WordCharacterClassifier, model: ICursorSimpleModel, position: Position, wordNavigationType: WordNavigationType): Position {
@@ -235,7 +251,7 @@ export class WordOperations {
 		return new Position(lineNumber, column);
 	}
 
-	private static _deleteWordLeftWhitespace(model: ICursorSimpleModel, position: Position): Range {
+	protected static _deleteWordLeftWhitespace(model: ICursorSimpleModel, position: Position): Range {
 		const lineContent = model.getLineContent(position.lineNumber);
 		const startIndex = position.column - 2;
 		const lastNonWhitespace = strings.lastNonWhitespaceIndex(lineContent, startIndex);
@@ -310,7 +326,7 @@ export class WordOperations {
 		return len;
 	}
 
-	private static _deleteWordRightWhitespace(model: ICursorSimpleModel, position: Position): Range {
+	protected static _deleteWordRightWhitespace(model: ICursorSimpleModel, position: Position): Range {
 		const lineContent = model.getLineContent(position.lineNumber);
 		const startIndex = position.column - 1;
 		const firstNonWhitespace = this._findFirstNonWhitespaceChar(lineContent, startIndex);
@@ -463,3 +479,176 @@ export class WordOperations {
 		return cursor.move(true, lineNumber, column, 0);
 	}
 }
+
+export function _lastWordPartEnd(str: string, startIndex: number = str.length - 1): number {
+	let ignoreUpperCase = !strings.isLowerAsciiLetter(str.charCodeAt(startIndex + 1));
+	for (let i = startIndex; i >= 0; i--) {
+		const chCode = str.charCodeAt(i);
+		if (chCode === CharCode.Space || chCode === CharCode.Tab) {
+			if (i === 0) {
+				return 0;
+			}
+			const prevChCode = str.charCodeAt(i - 1);
+			if (prevChCode !== CharCode.Space && prevChCode !== CharCode.Tab) {
+				return i - 1;
+			}
+		}
+		if (!ignoreUpperCase && strings.isUpperAsciiLetter(chCode)) {
+			return i - 1;
+		}
+		if (ignoreUpperCase && i < startIndex && strings.isLowerAsciiLetter(chCode)) {
+			return i;
+		}
+		if (chCode === CharCode.Underline) {
+			if (i === 0) {
+				return 0;
+			}
+			const prevChCode = str.charCodeAt(i - 1);
+			if (prevChCode !== CharCode.Underline) {
+				return i - 1;
+			}
+		}
+		ignoreUpperCase = ignoreUpperCase && strings.isUpperAsciiLetter(chCode);
+	}
+	return -1;
+}
+
+export function _nextWordPartBegin(str: string, startIndex: number = 0): number {
+	let prevChCode = str.charCodeAt(startIndex - 1);
+	let chCode = str.charCodeAt(startIndex);
+	// handle the special case ' X' and ' x' which is different from the standard methods
+	if ((prevChCode === CharCode.Space || prevChCode === CharCode.Tab) && (strings.isLowerAsciiLetter(chCode) || strings.isUpperAsciiLetter(chCode))) {
+		return startIndex + 1;
+	}
+	let ignoreUpperCase = strings.isUpperAsciiLetter(chCode);
+	for (let i = startIndex; i < str.length; ++i) {
+		chCode = str.charCodeAt(i);
+		if (chCode === CharCode.Space || chCode === CharCode.Tab) {
+			if (i + 1 >= str.length) {
+				return i + 1;
+			}
+			const nextChCode = str.charCodeAt(i + 1);
+			if (nextChCode !== CharCode.Space && nextChCode !== CharCode.Tab) {
+				return i + 2;
+			}
+		}
+		if (!ignoreUpperCase && strings.isUpperAsciiLetter(chCode)) {
+			return i + 1;
+		}
+		if (ignoreUpperCase && strings.isLowerAsciiLetter(chCode)) {
+			return i; // multiple UPPERCase : assume an upper case word and a CamelCase word - like DSLModel
+		}
+		ignoreUpperCase = ignoreUpperCase && strings.isUpperAsciiLetter(chCode);
+		if (chCode === CharCode.Underline) {
+			if (i + 1 >= str.length) {
+				return i + 1;
+			}
+			const nextChCode = str.charCodeAt(i + 1);
+			if (nextChCode !== CharCode.Underline) {
+				return i + 2;
+			}
+		}
+	}
+	return str.length + 1;
+}
+
+export class WordPartOperations extends WordOperations {
+	public static deleteWordPartLeft(wordSeparators: WordCharacterClassifier, model: ICursorSimpleModel, selection: Selection, whitespaceHeuristics: boolean, wordNavigationType: WordNavigationType): Range {
+		if (!selection.isEmpty()) {
+			return selection;
+		}
+
+		const position = new Position(selection.positionLineNumber, selection.positionColumn);
+		const lineNumber = position.lineNumber;
+		const column = position.column;
+
+		if (lineNumber === 1 && column === 1) {
+			// Ignore deleting at beginning of file
+			return null;
+		}
+
+		if (whitespaceHeuristics) {
+			let r = WordOperations._deleteWordLeftWhitespace(model, position);
+			if (r) {
+				return r;
+			}
+		}
+
+		const wordRange = WordOperations.deleteWordLeft(wordSeparators, model, selection, whitespaceHeuristics, wordNavigationType);
+		const lastWordPartEnd = _lastWordPartEnd(model.getLineContent(position.lineNumber), position.column - 2);
+		const wordPartRange = new Range(lineNumber, column, lineNumber, lastWordPartEnd + 2);
+
+		if (wordPartRange.getStartPosition().isBeforeOrEqual(wordRange.getStartPosition())) {
+			return wordRange;
+		}
+		return wordPartRange;
+	}
+
+	public static deleteWordPartRight(wordSeparators: WordCharacterClassifier, model: ICursorSimpleModel, selection: Selection, whitespaceHeuristics: boolean, wordNavigationType: WordNavigationType): Range {
+		if (!selection.isEmpty()) {
+			return selection;
+		}
+
+		const position = new Position(selection.positionLineNumber, selection.positionColumn);
+		const lineNumber = position.lineNumber;
+		const column = position.column;
+
+		const lineCount = model.getLineCount();
+		const maxColumn = model.getLineMaxColumn(lineNumber);
+		if (lineNumber === lineCount && column === maxColumn) {
+			// Ignore deleting at end of file
+			return null;
+		}
+
+		if (whitespaceHeuristics) {
+			let r = WordOperations._deleteWordRightWhitespace(model, position);
+			if (r) {
+				return r;
+			}
+		}
+
+		const wordRange = WordOperations.deleteWordRight(wordSeparators, model, selection, whitespaceHeuristics, wordNavigationType);
+		const nextWordPartBegin = _nextWordPartBegin(model.getLineContent(position.lineNumber), position.column);
+		const wordPartRange = new Range(lineNumber, column, lineNumber, nextWordPartBegin);
+
+		if (wordRange.getEndPosition().isBeforeOrEqual(wordPartRange.getEndPosition())) {
+			return wordRange;
+		}
+		return wordPartRange;
+	}
+
+	public static moveWordPartLeft(wordSeparators: WordCharacterClassifier, model: ICursorSimpleModel, position: Position, wordNavigationType: WordNavigationType): Position {
+		const lineNumber = position.lineNumber;
+		const column = position.column;
+		if (column === 1) {
+			return (lineNumber > 1 ? new Position(lineNumber - 1, model.getLineMaxColumn(lineNumber - 1)) : position);
+		}
+
+		const wordPos = WordOperations.moveWordLeft(wordSeparators, model, position, wordNavigationType);
+		const lastWordPartEnd = _lastWordPartEnd(model.getLineContent(lineNumber), column - 2);
+		const wordPartPos = new Position(lineNumber, lastWordPartEnd + 2);
+
+		if (wordPartPos.isBeforeOrEqual(wordPos)) {
+			return wordPos;
+		}
+		return wordPartPos;
+	}
+
+	public static moveWordPartRight(wordSeparators: WordCharacterClassifier, model: ICursorSimpleModel, position: Position, wordNavigationType: WordNavigationType): Position {
+		const lineNumber = position.lineNumber;
+		const column = position.column;
+		const maxColumn = model.getLineMaxColumn(lineNumber);
+		if (column === maxColumn) {
+			return (lineNumber < model.getLineCount() ? new Position(lineNumber + 1, 1) : position);
+		}
+
+		const wordPos = WordOperations.moveWordRight(wordSeparators, model, position, wordNavigationType);
+		const nextWordPartBegin = _nextWordPartBegin(model.getLineContent(lineNumber), column);
+		const wordPartPos = new Position(lineNumber, nextWordPartBegin);
+
+		if (wordPos.isBeforeOrEqual(wordPartPos)) {
+			return wordPos;
+		}
+		return wordPartPos;
+	}
+}
diff --git a/src/vs/editor/common/diff/diffComputer.ts b/src/vs/editor/common/diff/diffComputer.ts
index 9a8274f2326..2cd3132a952 100644
--- a/src/vs/editor/common/diff/diffComputer.ts
+++ b/src/vs/editor/common/diff/diffComputer.ts
@@ -255,7 +255,7 @@ class LineChange implements ILineChange {
 		this.charChanges = charChanges;
 	}
 
-	public static createFromDiffResult(shouldIgnoreTrimWhitespace: boolean, diffChange: IDiffChange, originalLineSequence: LineMarkerSequence, modifiedLineSequence: LineMarkerSequence, continueProcessingPredicate: () => boolean, shouldPostProcessCharChanges: boolean): LineChange {
+	public static createFromDiffResult(shouldIgnoreTrimWhitespace: boolean, diffChange: IDiffChange, originalLineSequence: LineMarkerSequence, modifiedLineSequence: LineMarkerSequence, continueProcessingPredicate: () => boolean, shouldComputeCharChanges: boolean, shouldPostProcessCharChanges: boolean): LineChange {
 		let originalStartLineNumber: number;
 		let originalEndLineNumber: number;
 		let modifiedStartLineNumber: number;
@@ -278,7 +278,7 @@ class LineChange implements ILineChange {
 			modifiedEndLineNumber = modifiedLineSequence.getEndLineNumber(diffChange.modifiedStart + diffChange.modifiedLength - 1);
 		}
 
-		if (diffChange.originalLength !== 0 && diffChange.modifiedLength !== 0 && continueProcessingPredicate()) {
+		if (shouldComputeCharChanges && diffChange.originalLength !== 0 && diffChange.modifiedLength !== 0 && continueProcessingPredicate()) {
 			const originalCharSequence = originalLineSequence.getCharSequence(shouldIgnoreTrimWhitespace, diffChange.originalStart, diffChange.originalStart + diffChange.originalLength - 1);
 			const modifiedCharSequence = modifiedLineSequence.getCharSequence(shouldIgnoreTrimWhitespace, diffChange.modifiedStart, diffChange.modifiedStart + diffChange.modifiedLength - 1);
 
@@ -299,6 +299,7 @@ class LineChange implements ILineChange {
 }
 
 export interface IDiffComputerOpts {
+	shouldComputeCharChanges: boolean;
 	shouldPostProcessCharChanges: boolean;
 	shouldIgnoreTrimWhitespace: boolean;
 	shouldMakePrettyDiff: boolean;
@@ -306,6 +307,7 @@ export interface IDiffComputerOpts {
 
 export class DiffComputer {
 
+	private readonly shouldComputeCharChanges: boolean;
 	private readonly shouldPostProcessCharChanges: boolean;
 	private readonly shouldIgnoreTrimWhitespace: boolean;
 	private readonly shouldMakePrettyDiff: boolean;
@@ -318,6 +320,7 @@ export class DiffComputer {
 	private computationStartTime: number;
 
 	constructor(originalLines: string[], modifiedLines: string[], opts: IDiffComputerOpts) {
+		this.shouldComputeCharChanges = opts.shouldComputeCharChanges;
 		this.shouldPostProcessCharChanges = opts.shouldPostProcessCharChanges;
 		this.shouldIgnoreTrimWhitespace = opts.shouldIgnoreTrimWhitespace;
 		this.shouldMakePrettyDiff = opts.shouldMakePrettyDiff;
@@ -380,7 +383,7 @@ export class DiffComputer {
 		if (this.shouldIgnoreTrimWhitespace) {
 			let lineChanges: LineChange[] = [];
 			for (let i = 0, length = rawChanges.length; i < length; i++) {
-				lineChanges.push(LineChange.createFromDiffResult(this.shouldIgnoreTrimWhitespace, rawChanges[i], this.original, this.modified, this._continueProcessingPredicate.bind(this), this.shouldPostProcessCharChanges));
+				lineChanges.push(LineChange.createFromDiffResult(this.shouldIgnoreTrimWhitespace, rawChanges[i], this.original, this.modified, this._continueProcessingPredicate.bind(this), this.shouldComputeCharChanges, this.shouldPostProcessCharChanges));
 			}
 			return lineChanges;
 		}
@@ -455,7 +458,7 @@ export class DiffComputer {
 
 			if (nextChange) {
 				// Emit the actual change
-				result.push(LineChange.createFromDiffResult(this.shouldIgnoreTrimWhitespace, nextChange, this.original, this.modified, this._continueProcessingPredicate.bind(this), this.shouldPostProcessCharChanges));
+				result.push(LineChange.createFromDiffResult(this.shouldIgnoreTrimWhitespace, nextChange, this.original, this.modified, this._continueProcessingPredicate.bind(this), this.shouldComputeCharChanges, this.shouldPostProcessCharChanges));
 
 				originalLineIndex += nextChange.originalLength;
 				modifiedLineIndex += nextChange.modifiedLength;
@@ -475,15 +478,17 @@ export class DiffComputer {
 			return;
 		}
 
+		let charChanges: CharChange[];
+		if (this.shouldComputeCharChanges) {
+			charChanges = [new CharChange(
+				originalLineNumber, originalStartColumn, originalLineNumber, originalEndColumn,
+				modifiedLineNumber, modifiedStartColumn, modifiedLineNumber, modifiedEndColumn
+			)];
+		}
 		result.push(new LineChange(
 			originalLineNumber, originalLineNumber,
 			modifiedLineNumber, modifiedLineNumber,
-			[
-				new CharChange(
-					originalLineNumber, originalStartColumn, originalLineNumber, originalEndColumn,
-					modifiedLineNumber, modifiedStartColumn, modifiedLineNumber, modifiedEndColumn
-				)
-			]
+			charChanges
 		));
 	}
 
@@ -507,10 +512,12 @@ export class DiffComputer {
 		if (prevChange.originalEndLineNumber + 1 === originalLineNumber && prevChange.modifiedEndLineNumber + 1 === modifiedLineNumber) {
 			prevChange.originalEndLineNumber = originalLineNumber;
 			prevChange.modifiedEndLineNumber = modifiedLineNumber;
-			prevChange.charChanges.push(new CharChange(
-				originalLineNumber, originalStartColumn, originalLineNumber, originalEndColumn,
-				modifiedLineNumber, modifiedStartColumn, modifiedLineNumber, modifiedEndColumn
-			));
+			if (this.shouldComputeCharChanges) {
+				prevChange.charChanges.push(new CharChange(
+					originalLineNumber, originalStartColumn, originalLineNumber, originalEndColumn,
+					modifiedLineNumber, modifiedStartColumn, modifiedLineNumber, modifiedEndColumn
+				));
+			}
 			return true;
 		}
 
diff --git a/src/vs/editor/common/editorCommon.ts b/src/vs/editor/common/editorCommon.ts
index 714b67fa3aa..99b03c2bf1c 100644
--- a/src/vs/editor/common/editorCommon.ts
+++ b/src/vs/editor/common/editorCommon.ts
@@ -5,7 +5,7 @@
 'use strict';
 
 import { IMarkdownString } from 'vs/base/common/htmlContent';
-import URI, { UriComponents } from 'vs/base/common/uri';
+import { URI, UriComponents } from 'vs/base/common/uri';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { IDisposable } from 'vs/base/common/lifecycle';
 import { Position, IPosition } from 'vs/editor/common/core/position';
@@ -439,7 +439,7 @@ export interface IEditor {
 	/**
 	 * Gets the current model attached to this editor.
 	 */
-	getModel(): IEditorModel;
+	getModel(): IEditorModel | null;
 
 	/**
 	 * Sets the current model attached to this editor.
@@ -449,7 +449,7 @@ export interface IEditor {
 	 * will not be destroyed.
 	 * It is safe to call setModel(null) to simply detach the current model from the editor.
 	 */
-	setModel(model: IEditorModel): void;
+	setModel(model: IEditorModel | null): void;
 
 	/**
 	 * Change the decorations. All decorations added through this changeAccessor
diff --git a/src/vs/editor/common/editorContextKeys.ts b/src/vs/editor/common/editorContextKeys.ts
index e6cd1d9caf5..c306f76352c 100644
--- a/src/vs/editor/common/editorContextKeys.ts
+++ b/src/vs/editor/common/editorContextKeys.ts
@@ -30,6 +30,8 @@ export namespace EditorContextKeys {
 	export const tabMovesFocus = new RawContextKey<boolean>('editorTabMovesFocus', false);
 	export const tabDoesNotMoveFocus: ContextKeyExpr = tabMovesFocus.toNegated();
 	export const isInEmbeddedEditor = new RawContextKey<boolean>('isInEmbeddedEditor', undefined);
+	export const canUndo = new RawContextKey<boolean>('canUndo', false);
+	export const canRedo = new RawContextKey<boolean>('canRedo', false);
 
 	// -- mode context keys
 	export const languageId = new RawContextKey<string>('editorLangId', undefined);
diff --git a/src/vs/editor/common/model.ts b/src/vs/editor/common/model.ts
index e4a6ba3feed..d24426a1f0b 100644
--- a/src/vs/editor/common/model.ts
+++ b/src/vs/editor/common/model.ts
@@ -5,7 +5,7 @@
 'use strict';
 
 import { IMarkdownString } from 'vs/base/common/htmlContent';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { LanguageId, LanguageIdentifier } from 'vs/editor/common/modes';
 import { LineTokens } from 'vs/editor/common/core/lineTokens';
 import { IDisposable } from 'vs/base/common/lifecycle';
@@ -733,33 +733,6 @@ export interface ITextModel {
 	 */
 	findPreviousMatch(searchString: string, searchStart: IPosition, isRegex: boolean, matchCase: boolean, wordSeparators: string | null, captureMatches: boolean): FindMatch;
 
-	/**
-	 * Get the language associated with this model.
-	 * @internal
-	 */
-	getLanguageIdentifier(): LanguageIdentifier;
-
-	/**
-	 * Get the language associated with this model.
-	 */
-	getModeId(): string;
-
-	/**
-	 * Get the word under or besides `position`.
-	 * @param position The position to look for a word.
-	 * @param skipSyntaxTokens Ignore syntax tokens, as identified by the mode.
-	 * @return The word under or besides `position`. Might be null.
-	 */
-	getWordAtPosition(position: IPosition): IWordAtPosition;
-
-	/**
-	 * Get the word under or besides `position` trimmed to `position`.column
-	 * @param position The position to look for a word.
-	 * @param skipSyntaxTokens Ignore syntax tokens, as identified by the mode.
-	 * @return The word under or besides `position`. Will never be null.
-	 */
-	getWordUntilPosition(position: IPosition): IWordAtPosition;
-
 	/**
 	 * Force tokenization information for `lineNumber` to be accurate.
 	 * @internal
@@ -814,7 +787,6 @@ export interface ITextModel {
 	/**
 	 * Get the word under or besides `position`.
 	 * @param position The position to look for a word.
-	 * @param skipSyntaxTokens Ignore syntax tokens, as identified by the mode.
 	 * @return The word under or besides `position`. Might be null.
 	 */
 	getWordAtPosition(position: IPosition): IWordAtPosition;
@@ -822,7 +794,6 @@ export interface ITextModel {
 	/**
 	 * Get the word under or besides `position` trimmed to `position`.column
 	 * @param position The position to look for a word.
-	 * @param skipSyntaxTokens Ignore syntax tokens, as identified by the mode.
 	 * @return The word under or besides `position`. Will never be null.
 	 */
 	getWordUntilPosition(position: IPosition): IWordAtPosition;
@@ -1030,6 +1001,12 @@ export interface ITextModel {
 	 */
 	undo(): Selection[];
 
+	/**
+	 * Is there anything in the undo stack?
+	 * @internal
+	 */
+	canUndo(): boolean;
+
 	/**
 	 * Redo edit operations until the next stop point created by `pushStackElement`.
 	 * The inverse edit operations will be pushed on the undo stack.
@@ -1037,6 +1014,12 @@ export interface ITextModel {
 	 */
 	redo(): Selection[];
 
+	/**
+	 * Is there anything in the redo stack?
+	 * @internal
+	 */
+	canRedo(): boolean;
+
 	/**
 	 * @deprecated Please use `onDidChangeContent` instead.
 	 * An event emitted when the contents of the model have changed.
diff --git a/src/vs/editor/common/model/editStack.ts b/src/vs/editor/common/model/editStack.ts
index 13a955cf522..5f5e3066845 100644
--- a/src/vs/editor/common/model/editStack.ts
+++ b/src/vs/editor/common/model/editStack.ts
@@ -210,6 +210,10 @@ export class EditStack {
 		return null;
 	}
 
+	public canUndo(): boolean {
+		return (this.past.length > 0);
+	}
+
 	public redo(): IUndoRedoResult {
 
 		if (this.future.length > 0) {
@@ -233,4 +237,8 @@ export class EditStack {
 
 		return null;
 	}
+
+	public canRedo(): boolean {
+		return (this.future.length > 0);
+	}
 }
diff --git a/src/vs/editor/common/model/intervalTree.ts b/src/vs/editor/common/model/intervalTree.ts
index ca11c6f9cb4..28839e413af 100644
--- a/src/vs/editor/common/model/intervalTree.ts
+++ b/src/vs/editor/common/model/intervalTree.ts
@@ -12,13 +12,14 @@ import { IModelDecoration, TrackedRangeStickiness as ActualTrackedRangeStickines
 // The red-black tree is based on the "Introduction to Algorithms" by Cormen, Leiserson and Rivest.
 //
 
-export const ClassName = {
-	EditorHintDecoration: 'squiggly-hint',
-	EditorInfoDecoration: 'squiggly-info',
-	EditorWarningDecoration: 'squiggly-warning',
-	EditorErrorDecoration: 'squiggly-error',
-	EditorUnnecessaryDecoration: 'squiggly-overlay-unnecessary'
-};
+export const enum ClassName {
+	EditorHintDecoration = 'squiggly-hint',
+	EditorInfoDecoration = 'squiggly-info',
+	EditorWarningDecoration = 'squiggly-warning',
+	EditorErrorDecoration = 'squiggly-error',
+	EditorUnnecessaryDecoration = 'squiggly-unnecessary',
+	EditorUnnecessaryInlineDecoration = 'squiggly-inline-unnecessary'
+}
 
 /**
  * Describes the behavior of decorations when typing/editing near their edges.
diff --git a/src/vs/editor/common/model/mirrorTextModel.ts b/src/vs/editor/common/model/mirrorTextModel.ts
index 7aa8eac9918..744ab95fabf 100644
--- a/src/vs/editor/common/model/mirrorTextModel.ts
+++ b/src/vs/editor/common/model/mirrorTextModel.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { IRange } from 'vs/editor/common/core/range';
 import { PrefixSumComputer } from 'vs/editor/common/viewModel/prefixSumComputer';
 import { IModelContentChange } from 'vs/editor/common/model/textModelEvents';
diff --git a/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeBase.ts b/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeBase.ts
index 491f5a38134..4d4b03519d1 100644
--- a/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeBase.ts
+++ b/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeBase.ts
@@ -1100,7 +1100,7 @@ export class PieceTreeBase {
 		let endColumn = endOffset - this._buffers[0].lineStarts[endIndex];
 		let endPos = { line: endIndex, column: endColumn };
 		let newPiece = new Piece(
-			0, /** todo */
+			0, /** todo@peng */
 			start,
 			endPos,
 			this.getLineFeedCnt(0, start, endPos),
diff --git a/src/vs/editor/common/model/textModel.ts b/src/vs/editor/common/model/textModel.ts
index 53dc47f82e1..dcc3bdc2e4b 100644
--- a/src/vs/editor/common/model/textModel.ts
+++ b/src/vs/editor/common/model/textModel.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { Event, Emitter } from 'vs/base/common/event';
 import * as model from 'vs/editor/common/model';
 import { LanguageIdentifier, TokenizationRegistry, LanguageId } from 'vs/editor/common/modes';
@@ -46,7 +46,7 @@ export function createTextBufferFactory(text: string): model.ITextBufferFactory
 }
 
 export function createTextBufferFactoryFromStream(stream: IStringStream, filter?: (chunk: string) => string): TPromise<model.ITextBufferFactory> {
-	return new TPromise<model.ITextBufferFactory>((c, e, p) => {
+	return new TPromise<model.ITextBufferFactory>((c, e) => {
 		let done = false;
 		let builder = createTextBufferBuilder();
 
@@ -1323,7 +1323,12 @@ export class TextModel extends Disposable implements model.ITextModel {
 			for (let i = 0, len = contentChanges.length; i < len; i++) {
 				const change = contentChanges[i];
 				const [eolCount, firstLineLength] = TextModel._eolCount(change.text);
-				this._tokens.applyEdits(change.range, eolCount, firstLineLength);
+				try {
+					this._tokens.applyEdits(change.range, eolCount, firstLineLength);
+				} catch (err) {
+					// emergency recovery => reset tokens
+					this._tokens = new ModelLinesTokens(this._tokens.languageIdentifier, this._tokens.tokenizationSupport);
+				}
 				this._onDidChangeDecorations.fire();
 				this._decorationsTree.acceptReplace(change.rangeOffset, change.rangeLength, change.text.length, change.forceMoveMarkers);
 
@@ -1416,6 +1421,10 @@ export class TextModel extends Disposable implements model.ITextModel {
 		}
 	}
 
+	public canUndo(): boolean {
+		return this._commandManager.canUndo();
+	}
+
 	private _redo(): Selection[] {
 		this._isRedoing = true;
 		let r = this._commandManager.redo();
@@ -1441,6 +1450,10 @@ export class TextModel extends Disposable implements model.ITextModel {
 		}
 	}
 
+	public canRedo(): boolean {
+		return this._commandManager.canRedo();
+	}
+
 	//#endregion
 
 	//#region Decorations
diff --git a/src/vs/editor/common/modes.ts b/src/vs/editor/common/modes.ts
index 2aa69522f6b..23a2b611dc9 100644
--- a/src/vs/editor/common/modes.ts
+++ b/src/vs/editor/common/modes.ts
@@ -4,21 +4,21 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
+import { CancellationToken } from 'vs/base/common/cancellation';
+import { Color } from 'vs/base/common/color';
+import { Event } from 'vs/base/common/event';
 import { IMarkdownString } from 'vs/base/common/htmlContent';
 import { IDisposable } from 'vs/base/common/lifecycle';
-import URI from 'vs/base/common/uri';
-import { TokenizationResult, TokenizationResult2 } from 'vs/editor/common/core/token';
-import LanguageFeatureRegistry from 'vs/editor/common/modes/languageFeatureRegistry';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { Position } from 'vs/editor/common/core/position';
-import { Range, IRange } from 'vs/editor/common/core/range';
-import { Event } from 'vs/base/common/event';
-import { TokenizationRegistryImpl } from 'vs/editor/common/modes/tokenizationRegistry';
-import { Color } from 'vs/base/common/color';
-import { IMarkerData } from 'vs/platform/markers/common/markers';
-import * as model from 'vs/editor/common/model';
 import { isObject } from 'vs/base/common/types';
+import { URI } from 'vs/base/common/uri';
+import { Position } from 'vs/editor/common/core/position';
+import { IRange, Range } from 'vs/editor/common/core/range';
 import { Selection } from 'vs/editor/common/core/selection';
+import { TokenizationResult, TokenizationResult2 } from 'vs/editor/common/core/token';
+import * as model from 'vs/editor/common/model';
+import LanguageFeatureRegistry from 'vs/editor/common/modes/languageFeatureRegistry';
+import { TokenizationRegistryImpl } from 'vs/editor/common/modes/tokenizationRegistry';
+import { IMarkerData } from 'vs/platform/markers/common/markers';
 
 /**
  * Open ended enum at runtime
@@ -216,6 +216,14 @@ export interface IState {
 	equals(other: IState): boolean;
 }
 
+/**
+ * A provider result represents the values a provider, like the [`HoverProvider`](#HoverProvider),
+ * may return. For once this is the actual result type `T`, like `Hover`, or a thenable that resolves
+ * to that type `T`. In addition, `null` and `undefined` can be returned - either directly or from a
+ * thenable.
+ */
+export type ProviderResult<T> = T | undefined | null | Thenable<T | undefined | null>;
+
 /**
  * A hover represents additional information for a symbol or word. Hovers are
  * rendered in a tooltip-like widget.
@@ -244,7 +252,7 @@ export interface HoverProvider {
 	 * position will be merged by the editor. A hover can have a range which defaults
 	 * to the word range at the position when omitted.
 	 */
-	provideHover(model: model.ITextModel, position: Position, token: CancellationToken): Hover | Thenable<Hover>;
+	provideHover(model: model.ITextModel, position: Position, token: CancellationToken): ProviderResult<Hover>;
 }
 
 /**
@@ -293,6 +301,7 @@ export interface ISuggestion {
 	documentation?: string | IMarkdownString;
 	filterText?: string;
 	sortText?: string;
+	preselect?: boolean;
 	noAutoAccept?: boolean;
 	commitCharacters?: string[];
 	overwriteBefore?: number;
@@ -300,6 +309,7 @@ export interface ISuggestion {
 	additionalTextEdits?: model.ISingleEditOperation[];
 	command?: Command;
 	snippetType?: SnippetType;
+	noWhitespaceAdjust?: boolean;
 }
 
 /**
@@ -335,9 +345,9 @@ export interface ISuggestSupport {
 
 	triggerCharacters?: string[];
 
-	provideCompletionItems(model: model.ITextModel, position: Position, context: SuggestContext, token: CancellationToken): ISuggestResult | Thenable<ISuggestResult>;
+	provideCompletionItems(model: model.ITextModel, position: Position, context: SuggestContext, token: CancellationToken): ProviderResult<ISuggestResult>;
 
-	resolveCompletionItem?(model: model.ITextModel, position: Position, item: ISuggestion, token: CancellationToken): ISuggestion | Thenable<ISuggestion>;
+	resolveCompletionItem?(model: model.ITextModel, position: Position, item: ISuggestion, token: CancellationToken): ProviderResult<ISuggestion>;
 }
 
 export interface CodeAction {
@@ -351,7 +361,7 @@ export interface CodeAction {
 /**
  * @internal
  */
-export enum CodeActionTrigger {
+export const enum CodeActionTrigger {
 	Automatic = 1,
 	Manual = 2,
 }
@@ -373,12 +383,12 @@ export interface CodeActionProvider {
 	/**
 	 * Provide commands for the given document and range.
 	 */
-	provideCodeActions(model: model.ITextModel, range: Range | Selection, context: CodeActionContext, token: CancellationToken): CodeAction[] | Thenable<CodeAction[]>;
+	provideCodeActions(model: model.ITextModel, range: Range | Selection, context: CodeActionContext, token: CancellationToken): ProviderResult<CodeAction[]>;
 
 	/**
 	 * Optional list of of CodeActionKinds that this provider returns.
 	 */
-	providedCodeActionKinds?: string[];
+	providedCodeActionKinds?: ReadonlyArray<string>;
 }
 
 /**
@@ -437,6 +447,18 @@ export interface SignatureHelp {
 	 */
 	activeParameter: number;
 }
+
+export enum SignatureHelpTriggerReason {
+	Invoke = 1,
+	TriggerCharacter = 2,
+	Retrigger = 3,
+}
+
+export interface SignatureHelpContext {
+	triggerReason: SignatureHelpTriggerReason;
+	triggerCharacter?: string;
+}
+
 /**
  * The signature help provider interface defines the contract between extensions and
  * the [parameter hints](https://code.visualstudio.com/docs/editor/intellisense)-feature.
@@ -448,7 +470,7 @@ export interface SignatureHelpProvider {
 	/**
 	 * Provide help for the signature at the given position and document.
 	 */
-	provideSignatureHelp(model: model.ITextModel, position: Position, token: CancellationToken): SignatureHelp | Thenable<SignatureHelp>;
+	provideSignatureHelp(model: model.ITextModel, position: Position, token: CancellationToken, context: SignatureHelpContext): ProviderResult<SignatureHelp>;
 }
 
 /**
@@ -492,7 +514,7 @@ export interface DocumentHighlightProvider {
 	 * Provide a set of document highlights, like all occurrences of a variable or
 	 * all exit-points of a function.
 	 */
-	provideDocumentHighlights(model: model.ITextModel, position: Position, token: CancellationToken): DocumentHighlight[] | Thenable<DocumentHighlight[]>;
+	provideDocumentHighlights(model: model.ITextModel, position: Position, token: CancellationToken): ProviderResult<DocumentHighlight[]>;
 }
 
 /**
@@ -513,7 +535,7 @@ export interface ReferenceProvider {
 	/**
 	 * Provide a set of project-wide references for the given position and document.
 	 */
-	provideReferences(model: model.ITextModel, position: Position, context: ReferenceContext, token: CancellationToken): Location[] | Thenable<Location[]>;
+	provideReferences(model: model.ITextModel, position: Position, context: ReferenceContext, token: CancellationToken): ProviderResult<Location[]>;
 }
 
 /**
@@ -537,6 +559,13 @@ export interface Location {
  */
 export type Definition = Location | Location[];
 
+export interface DefinitionLink {
+	origin?: IRange;
+	uri: URI;
+	range: IRange;
+	selectionRange?: IRange;
+}
+
 /**
  * The definition provider interface defines the contract between extensions and
  * the [go to definition](https://code.visualstudio.com/docs/editor/editingevolved#_go-to-definition)
@@ -546,7 +575,7 @@ export interface DefinitionProvider {
 	/**
 	 * Provide the definition of the symbol at the given position and document.
 	 */
-	provideDefinition(model: model.ITextModel, position: Position, token: CancellationToken): Definition | Thenable<Definition>;
+	provideDefinition(model: model.ITextModel, position: Position, token: CancellationToken): ProviderResult<Definition | DefinitionLink[]>;
 }
 
 /**
@@ -557,7 +586,7 @@ export interface ImplementationProvider {
 	/**
 	 * Provide the implementation of the symbol at the given position and document.
 	 */
-	provideImplementation(model: model.ITextModel, position: Position, token: CancellationToken): Definition | Thenable<Definition>;
+	provideImplementation(model: model.ITextModel, position: Position, token: CancellationToken): ProviderResult<Definition | DefinitionLink[]>;
 }
 
 /**
@@ -568,7 +597,7 @@ export interface TypeDefinitionProvider {
 	/**
 	 * Provide the type definition of the symbol at the given position and document.
 	 */
-	provideTypeDefinition(model: model.ITextModel, position: Position, token: CancellationToken): Definition | Thenable<Definition>;
+	provideTypeDefinition(model: model.ITextModel, position: Position, token: CancellationToken): ProviderResult<Definition | DefinitionLink[]>;
 }
 
 /**
@@ -638,60 +667,32 @@ export const symbolKindToCssClass = (function () {
 	_fromMapping[SymbolKind.TypeParameter] = 'type-parameter';
 
 	return function toCssClassName(kind: SymbolKind): string {
-		return _fromMapping[kind] || 'property';
+		return `symbol-icon ${_fromMapping[kind] || 'property'}`;
 	};
 })();
 
-/**
- * @internal
- */
-export interface IOutline {
-	entries: SymbolInformation[];
-}
-/**
- * Represents information about programming constructs like variables, classes,
- * interfaces etc.
- */
-export interface SymbolInformation {
-	/**
-	 * The name of this symbol.
-	 */
+export interface DocumentSymbol {
 	name: string;
-	/**
-	 * The detail of this symbol.
-	 */
-	detail?: string;
-	/**
-	 * The name of the symbol containing this symbol.
-	 */
-	containerName?: string;
-	/**
-	 * The kind of this symbol.
-	 */
+	detail: string;
 	kind: SymbolKind;
-	/**
-	 * The location of this symbol.
-	 */
-	location: Location;
-	/**
-	 * The defining range of this symbol.
-	 */
-	definingRange: IRange;
-
-	children?: SymbolInformation[];
+	containerName?: string;
+	range: IRange;
+	selectionRange: IRange;
+	children?: DocumentSymbol[];
 }
+
 /**
  * The document symbol provider interface defines the contract between extensions and
  * the [go to symbol](https://code.visualstudio.com/docs/editor/editingevolved#_goto-symbol)-feature.
  */
 export interface DocumentSymbolProvider {
 
-	extensionId?: string;
+	displayName?: string;
 
 	/**
 	 * Provide symbol information for the given document.
 	 */
-	provideDocumentSymbols(model: model.ITextModel, token: CancellationToken): SymbolInformation[] | Thenable<SymbolInformation[]>;
+	provideDocumentSymbols(model: model.ITextModel, token: CancellationToken): ProviderResult<DocumentSymbol[]>;
 }
 
 export interface TextEdit {
@@ -721,7 +722,7 @@ export interface DocumentFormattingEditProvider {
 	/**
 	 * Provide formatting edits for a whole document.
 	 */
-	provideDocumentFormattingEdits(model: model.ITextModel, options: FormattingOptions, token: CancellationToken): TextEdit[] | Thenable<TextEdit[]>;
+	provideDocumentFormattingEdits(model: model.ITextModel, options: FormattingOptions, token: CancellationToken): ProviderResult<TextEdit[]>;
 }
 /**
  * The document formatting provider interface defines the contract between extensions and
@@ -735,7 +736,7 @@ export interface DocumentRangeFormattingEditProvider {
 	 * or larger range. Often this is done by adjusting the start and end
 	 * of the range to full syntax nodes.
 	 */
-	provideDocumentRangeFormattingEdits(model: model.ITextModel, range: Range, options: FormattingOptions, token: CancellationToken): TextEdit[] | Thenable<TextEdit[]>;
+	provideDocumentRangeFormattingEdits(model: model.ITextModel, range: Range, options: FormattingOptions, token: CancellationToken): ProviderResult<TextEdit[]>;
 }
 /**
  * The document formatting provider interface defines the contract between extensions and
@@ -750,7 +751,7 @@ export interface OnTypeFormattingEditProvider {
 	 * what range the position to expand to, like find the matching `{`
 	 * when `}` has been entered.
 	 */
-	provideOnTypeFormattingEdits(model: model.ITextModel, position: Position, ch: string, options: FormattingOptions, token: CancellationToken): TextEdit[] | Thenable<TextEdit[]>;
+	provideOnTypeFormattingEdits(model: model.ITextModel, position: Position, ch: string, options: FormattingOptions, token: CancellationToken): ProviderResult<TextEdit[]>;
 }
 
 /**
@@ -772,8 +773,8 @@ export interface ILink {
  * A provider of links.
  */
 export interface LinkProvider {
-	provideLinks(model: model.ITextModel, token: CancellationToken): ILink[] | Thenable<ILink[]>;
-	resolveLink?: (link: ILink, token: CancellationToken) => ILink | Thenable<ILink>;
+	provideLinks(model: model.ITextModel, token: CancellationToken): ProviderResult<ILink[]>;
+	resolveLink?: (link: ILink, token: CancellationToken) => ProviderResult<ILink>;
 }
 
 /**
@@ -847,11 +848,11 @@ export interface DocumentColorProvider {
 	/**
 	 * Provides the color ranges for a specific model.
 	 */
-	provideDocumentColors(model: model.ITextModel, token: CancellationToken): IColorInformation[] | Thenable<IColorInformation[]>;
+	provideDocumentColors(model: model.ITextModel, token: CancellationToken): ProviderResult<IColorInformation[]>;
 	/**
 	 * Provide the string representations for a color.
 	 */
-	provideColorPresentations(model: model.ITextModel, colorInfo: IColorInformation, token: CancellationToken): IColorPresentation[] | Thenable<IColorPresentation[]>;
+	provideColorPresentations(model: model.ITextModel, colorInfo: IColorInformation, token: CancellationToken): ProviderResult<IColorPresentation[]>;
 }
 export interface FoldingContext {
 }
@@ -862,18 +863,18 @@ export interface FoldingRangeProvider {
 	/**
 	 * Provides the color ranges for a specific model.
 	 */
-	provideFoldingRanges(model: model.ITextModel, context: FoldingContext, token: CancellationToken): FoldingRange[] | Thenable<FoldingRange[]>;
+	provideFoldingRanges(model: model.ITextModel, context: FoldingContext, token: CancellationToken): ProviderResult<FoldingRange[]>;
 }
 
 export interface FoldingRange {
 
 	/**
-	 * The zero-based start line of the range to fold. The folded area starts after the line's last character.
+	 * The one-based start line of the range to fold. The folded area starts after the line's last character.
 	 */
 	start: number;
 
 	/**
-	 * The zero-based end line of the range to fold. The folded area ends with the line's last character.
+	 * The one-based end line of the range to fold. The folded area ends with the line's last character.
 	 */
 	end: number;
 
@@ -926,6 +927,7 @@ export function isResourceTextEdit(thing: any): thing is ResourceTextEdit {
 export interface ResourceFileEdit {
 	oldUri: URI;
 	newUri: URI;
+	options: { overwrite?: boolean, ignoreIfNotExists?: boolean, ignoreIfExists?: boolean, recursive?: boolean };
 }
 
 export interface ResourceTextEdit {
@@ -936,17 +938,19 @@ export interface ResourceTextEdit {
 
 export interface WorkspaceEdit {
 	edits: Array<ResourceTextEdit | ResourceFileEdit>;
-	rejectReason?: string; // TODO@joh, move to rename
 }
 
+export interface Rejection {
+	rejectReason?: string;
+}
 export interface RenameLocation {
 	range: IRange;
 	text: string;
 }
 
 export interface RenameProvider {
-	provideRenameEdits(model: model.ITextModel, position: Position, newName: string, token: CancellationToken): WorkspaceEdit | Thenable<WorkspaceEdit>;
-	resolveRenameLocation?(model: model.ITextModel, position: Position, token: CancellationToken): RenameLocation | Thenable<RenameLocation>;
+	provideRenameEdits(model: model.ITextModel, position: Position, newName: string, token: CancellationToken): ProviderResult<WorkspaceEdit & Rejection>;
+	resolveRenameLocation?(model: model.ITextModel, position: Position, token: CancellationToken): ProviderResult<RenameLocation & Rejection>;
 }
 
 
@@ -957,6 +961,9 @@ export interface Command {
 	arguments?: any[];
 }
 
+/**
+ * @internal
+ */
 export interface CommentInfo {
 	owner: number;
 	threads: CommentThread[];
@@ -964,6 +971,9 @@ export interface CommentInfo {
 	reply?: Command;
 }
 
+/**
+ * @internal
+ */
 export enum CommentThreadCollapsibleState {
 	/**
 	 * Determines an item is collapsed
@@ -975,6 +985,9 @@ export enum CommentThreadCollapsibleState {
 	Expanded = 1
 }
 
+/**
+ * @internal
+ */
 export interface CommentThread {
 	threadId: string;
 	resource: string;
@@ -984,11 +997,17 @@ export interface CommentThread {
 	reply?: Command;
 }
 
+/**
+ * @internal
+ */
 export interface NewCommentAction {
 	ranges: IRange[];
 	actions: Command[];
 }
 
+/**
+ * @internal
+ */
 export interface Comment {
 	readonly commentId: string;
 	readonly body: IMarkdownString;
@@ -997,6 +1016,9 @@ export interface Comment {
 	readonly command?: Command;
 }
 
+/**
+ * @internal
+ */
 export interface CommentThreadChangedEvent {
 	readonly owner: number;
 	/**
@@ -1015,7 +1037,9 @@ export interface CommentThreadChangedEvent {
 	readonly changed: CommentThread[];
 }
 
-
+/**
+ * @internal
+ */
 export interface DocumentCommentProvider {
 	provideDocumentComments(resource: URI, token: CancellationToken): Promise<CommentInfo>;
 	createNewCommentThread(resource: URI, range: Range, text: string, token: CancellationToken): Promise<CommentThread>;
@@ -1023,7 +1047,9 @@ export interface DocumentCommentProvider {
 	onDidChangeCommentThreads(): Event<CommentThreadChangedEvent>;
 }
 
-
+/**
+ * @internal
+ */
 export interface WorkspaceCommentProvider {
 	provideWorkspaceComments(token: CancellationToken): Promise<CommentThread[]>;
 	createNewCommentThread(resource: URI, range: Range, text: string, token: CancellationToken): Promise<CommentThread>;
@@ -1038,8 +1064,8 @@ export interface ICodeLensSymbol {
 }
 export interface CodeLensProvider {
 	onDidChange?: Event<this>;
-	provideCodeLenses(model: model.ITextModel, token: CancellationToken): ICodeLensSymbol[] | Thenable<ICodeLensSymbol[]>;
-	resolveCodeLens?(model: model.ITextModel, codeLens: ICodeLensSymbol, token: CancellationToken): ICodeLensSymbol | Thenable<ICodeLensSymbol>;
+	provideCodeLenses(model: model.ITextModel, token: CancellationToken): ProviderResult<ICodeLensSymbol[]>;
+	resolveCodeLens?(model: model.ITextModel, codeLens: ICodeLensSymbol, token: CancellationToken): ProviderResult<ICodeLensSymbol>;
 }
 
 // --- feature registries ------
diff --git a/src/vs/editor/common/modes/languageConfiguration.ts b/src/vs/editor/common/modes/languageConfiguration.ts
index 410d5694d01..d0f6b77d2b8 100644
--- a/src/vs/editor/common/modes/languageConfiguration.ts
+++ b/src/vs/editor/common/modes/languageConfiguration.ts
@@ -62,6 +62,13 @@ export interface LanguageConfiguration {
 	 */
 	surroundingPairs?: IAutoClosingPair[];
 
+	/**
+	 * Defines what characters must be after the cursor for bracket or quote autoclosing to occur when using the \'languageDefined\' autoclosing setting.
+	 *
+	 * This is typically the set of characters which can not start an expression, such as whitespace, closing brackets, non-unary operators, etc.
+	 */
+	autoCloseBefore?: string;
+
 	/**
 	 * The language's folding rules.
 	 */
diff --git a/src/vs/editor/common/modes/languageConfigurationRegistry.ts b/src/vs/editor/common/modes/languageConfigurationRegistry.ts
index a184362fd69..6dccea67963 100644
--- a/src/vs/editor/common/modes/languageConfigurationRegistry.ts
+++ b/src/vs/editor/common/modes/languageConfigurationRegistry.ts
@@ -13,7 +13,7 @@ import { Event, Emitter } from 'vs/base/common/event';
 import { ITextModel } from 'vs/editor/common/model';
 import { onUnexpectedError } from 'vs/base/common/errors';
 import * as strings from 'vs/base/common/strings';
-import { IDisposable } from 'vs/base/common/lifecycle';
+import { IDisposable, toDisposable } from 'vs/base/common/lifecycle';
 import { DEFAULT_WORD_REGEXP, ensureValidWordDefinition } from 'vs/editor/common/model/wordHelper';
 import { createScopedLineTokens } from 'vs/editor/common/modes/supports';
 import { LineTokens } from 'vs/editor/common/core/lineTokens';
@@ -119,6 +119,7 @@ export class RichEditSupport {
 			onEnterRules: (prev ? current.onEnterRules || prev.onEnterRules : current.onEnterRules),
 			autoClosingPairs: (prev ? current.autoClosingPairs || prev.autoClosingPairs : current.autoClosingPairs),
 			surroundingPairs: (prev ? current.surroundingPairs || prev.surroundingPairs : current.surroundingPairs),
+			autoCloseBefore: (prev ? current.autoCloseBefore || prev.autoCloseBefore : current.autoCloseBefore),
 			folding: (prev ? current.folding || prev.folding : current.folding),
 			__electricCharacterSupport: (prev ? current.__electricCharacterSupport || prev.__electricCharacterSupport : current.__electricCharacterSupport),
 		};
@@ -189,14 +190,12 @@ export class LanguageConfigurationRegistryImpl {
 		let current = new RichEditSupport(languageIdentifier, previous, configuration);
 		this._entries[languageIdentifier.id] = current;
 		this._onDidChange.fire({ languageIdentifier });
-		return {
-			dispose: () => {
-				if (this._entries[languageIdentifier.id] === current) {
-					this._entries[languageIdentifier.id] = previous;
-					this._onDidChange.fire({ languageIdentifier });
-				}
+		return toDisposable(() => {
+			if (this._entries[languageIdentifier.id] === current) {
+				this._entries[languageIdentifier.id] = previous;
+				this._onDidChange.fire({ languageIdentifier });
 			}
-		};
+		});
 	}
 
 	private _getRichEditSupport(languageId: LanguageId): RichEditSupport {
@@ -271,6 +270,14 @@ export class LanguageConfigurationRegistryImpl {
 		return characterPairSupport.getAutoClosingPairs();
 	}
 
+	public getAutoCloseBeforeSet(languageId: LanguageId): string {
+		let characterPairSupport = this._getCharacterPairSupport(languageId);
+		if (!characterPairSupport) {
+			return CharacterPairSupport.DEFAULT_AUTOCLOSE_BEFORE_LANGUAGE_DEFINED;
+		}
+		return characterPairSupport.getAutoCloseBeforeSet();
+	}
+
 	public getSurroundingPairs(languageId: LanguageId): IAutoClosingPair[] {
 		let characterPairSupport = this._getCharacterPairSupport(languageId);
 		if (!characterPairSupport) {
diff --git a/src/vs/editor/common/modes/languageFeatureRegistry.ts b/src/vs/editor/common/modes/languageFeatureRegistry.ts
index c5e4e7010d8..9dfd73755f2 100644
--- a/src/vs/editor/common/modes/languageFeatureRegistry.ts
+++ b/src/vs/editor/common/modes/languageFeatureRegistry.ts
@@ -6,7 +6,7 @@
 'use strict';
 
 import { Event, Emitter } from 'vs/base/common/event';
-import { IDisposable } from 'vs/base/common/lifecycle';
+import { IDisposable, toDisposable } from 'vs/base/common/lifecycle';
 import { ITextModel } from 'vs/editor/common/model';
 import { LanguageSelector, score } from 'vs/editor/common/modes/languageSelector';
 import { shouldSynchronizeModel } from 'vs/editor/common/services/modelService';
@@ -54,19 +54,17 @@ export default class LanguageFeatureRegistry<T> {
 		this._lastCandidate = undefined;
 		this._onDidChange.fire(this._entries.length);
 
-		return {
-			dispose: () => {
-				if (entry) {
-					let idx = this._entries.indexOf(entry);
-					if (idx >= 0) {
-						this._entries.splice(idx, 1);
-						this._lastCandidate = undefined;
-						this._onDidChange.fire(this._entries.length);
-						entry = undefined;
-					}
+		return toDisposable(() => {
+			if (entry) {
+				let idx = this._entries.indexOf(entry);
+				if (idx >= 0) {
+					this._entries.splice(idx, 1);
+					this._lastCandidate = undefined;
+					this._onDidChange.fire(this._entries.length);
+					entry = undefined;
 				}
 			}
-		};
+		});
 	}
 
 	has(model: ITextModel): boolean {
diff --git a/src/vs/editor/common/modes/languageSelector.ts b/src/vs/editor/common/modes/languageSelector.ts
index 513ca2cc2d6..c572fe8d78f 100644
--- a/src/vs/editor/common/modes/languageSelector.ts
+++ b/src/vs/editor/common/modes/languageSelector.ts
@@ -5,7 +5,7 @@
 
 'use strict';
 
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { match as matchGlobPattern, IRelativePattern } from 'vs/base/common/glob'; // TODO@Alex
 
 export interface LanguageFilter {
diff --git a/src/vs/editor/common/modes/supports/characterPair.ts b/src/vs/editor/common/modes/supports/characterPair.ts
index b6ce3dc3f35..70eb9ed7b65 100644
--- a/src/vs/editor/common/modes/supports/characterPair.ts
+++ b/src/vs/editor/common/modes/supports/characterPair.ts
@@ -9,10 +9,14 @@ import { CharacterPair, IAutoClosingPair, IAutoClosingPairConditional, StandardA
 
 export class CharacterPairSupport {
 
+	static readonly DEFAULT_AUTOCLOSE_BEFORE_LANGUAGE_DEFINED = ';:.,=}])> \n\t';
+	static readonly DEFAULT_AUTOCLOSE_BEFORE_WHITESPACE = ' \n\t';
+
 	private readonly _autoClosingPairs: StandardAutoClosingPairConditional[];
 	private readonly _surroundingPairs: IAutoClosingPair[];
+	private readonly _autoCloseBefore: string;
 
-	constructor(config: { brackets?: CharacterPair[]; autoClosingPairs?: IAutoClosingPairConditional[], surroundingPairs?: IAutoClosingPair[] }) {
+	constructor(config: { brackets?: CharacterPair[]; autoClosingPairs?: IAutoClosingPairConditional[], surroundingPairs?: IAutoClosingPair[], autoCloseBefore?: string }) {
 		if (config.autoClosingPairs) {
 			this._autoClosingPairs = config.autoClosingPairs.map(el => new StandardAutoClosingPairConditional(el));
 		} else if (config.brackets) {
@@ -21,6 +25,8 @@ export class CharacterPairSupport {
 			this._autoClosingPairs = [];
 		}
 
+		this._autoCloseBefore = typeof config.autoCloseBefore === 'string' ? config.autoCloseBefore : CharacterPairSupport.DEFAULT_AUTOCLOSE_BEFORE_LANGUAGE_DEFINED;
+
 		this._surroundingPairs = config.surroundingPairs || this._autoClosingPairs;
 	}
 
@@ -28,6 +34,10 @@ export class CharacterPairSupport {
 		return this._autoClosingPairs;
 	}
 
+	public getAutoCloseBeforeSet(): string {
+		return this._autoCloseBefore;
+	}
+
 	public shouldAutoClosePair(character: string, context: ScopedLineTokens, column: number): boolean {
 		// Always complete on empty line
 		if (context.getTokenCount() === 0) {
diff --git a/src/vs/editor/common/modes/supports/electricCharacter.ts b/src/vs/editor/common/modes/supports/electricCharacter.ts
index 085a2aa6959..715a3b06840 100644
--- a/src/vs/editor/common/modes/supports/electricCharacter.ts
+++ b/src/vs/editor/common/modes/supports/electricCharacter.ts
@@ -121,7 +121,8 @@ export class BracketElectricCharacterSupport {
 			}
 
 			// check if the full open bracket matches
-			let actual = line.substring(line.length - pair.open.length + 1) + character;
+			let start = column - pair.open.length + 1;
+			let actual = line.substring(start - 1, column - 1) + character;
 			if (actual !== pair.open) {
 				continue;
 			}
diff --git a/src/vs/editor/common/modes/supports/tokenization.ts b/src/vs/editor/common/modes/supports/tokenization.ts
index 85685d0ff41..db3d8400dcf 100644
--- a/src/vs/editor/common/modes/supports/tokenization.ts
+++ b/src/vs/editor/common/modes/supports/tokenization.ts
@@ -99,7 +99,7 @@ export function parseTokenTheme(source: ITokenThemeRule[]): ParsedTokenThemeRule
 /**
  * Resolve rules (i.e. inheritance).
  */
-function resolveParsedTokenThemeRules(parsedThemeRules: ParsedTokenThemeRule[]): TokenTheme {
+function resolveParsedTokenThemeRules(parsedThemeRules: ParsedTokenThemeRule[], customTokenColors: string[]): TokenTheme {
 
 	// Sort rules lexicographically, and then by index if necessary
 	parsedThemeRules.sort((a, b) => {
@@ -127,9 +127,17 @@ function resolveParsedTokenThemeRules(parsedThemeRules: ParsedTokenThemeRule[]):
 		}
 	}
 	let colorMap = new ColorMap();
-	// ensure default foreground gets id 1 and default background gets id 2
-	let defaults = new ThemeTrieElementRule(defaultFontStyle, colorMap.getId(defaultForeground), colorMap.getId(defaultBackground));
 
+	// start with token colors from custom token themes
+	for (let color of customTokenColors) {
+		colorMap.getId(color);
+	}
+
+
+	let foregroundColorId = colorMap.getId(defaultForeground);
+	let backgroundColorId = colorMap.getId(defaultBackground);
+
+	let defaults = new ThemeTrieElementRule(defaultFontStyle, foregroundColorId, backgroundColorId);
 	let root = new ThemeTrieElement(defaults);
 	for (let i = 0, len = parsedThemeRules.length; i < len; i++) {
 		let rule = parsedThemeRules[i];
@@ -139,6 +147,8 @@ function resolveParsedTokenThemeRules(parsedThemeRules: ParsedTokenThemeRule[]):
 	return new TokenTheme(colorMap, root);
 }
 
+const colorRegExp = /^#?([0-9A-Fa-f]{6})([0-9A-Fa-f]{2})?$/;
+
 export class ColorMap {
 
 	private _lastColorId: number;
@@ -155,10 +165,11 @@ export class ColorMap {
 		if (color === null) {
 			return 0;
 		}
-		color = color.toUpperCase();
-		if (!/^[0-9A-F]{6}$/.test(color)) {
-			throw new Error('Illegal color name: ' + color);
+		const match = color.match(colorRegExp);
+		if (!match) {
+			throw new Error('Illegal value for token color: ' + color);
 		}
+		color = match[1].toUpperCase();
 		let value = this._color2id.get(color);
 		if (value) {
 			return value;
@@ -177,12 +188,12 @@ export class ColorMap {
 
 export class TokenTheme {
 
-	public static createFromRawTokenTheme(source: ITokenThemeRule[]): TokenTheme {
-		return this.createFromParsedTokenTheme(parseTokenTheme(source));
+	public static createFromRawTokenTheme(source: ITokenThemeRule[], customTokenColors: string[]): TokenTheme {
+		return this.createFromParsedTokenTheme(parseTokenTheme(source), customTokenColors);
 	}
 
-	public static createFromParsedTokenTheme(source: ParsedTokenThemeRule[]): TokenTheme {
-		return resolveParsedTokenThemeRules(source);
+	public static createFromParsedTokenTheme(source: ParsedTokenThemeRule[], customTokenColors: string[]): TokenTheme {
+		return resolveParsedTokenThemeRules(source, customTokenColors);
 	}
 
 	private readonly _colorMap: ColorMap;
diff --git a/src/vs/editor/common/modes/tokenizationRegistry.ts b/src/vs/editor/common/modes/tokenizationRegistry.ts
index 660ef056881..dd13f213e76 100644
--- a/src/vs/editor/common/modes/tokenizationRegistry.ts
+++ b/src/vs/editor/common/modes/tokenizationRegistry.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import { IDisposable } from 'vs/base/common/lifecycle';
+import { IDisposable, toDisposable } from 'vs/base/common/lifecycle';
 import { Event, Emitter } from 'vs/base/common/event';
 import { ColorId, ITokenizationRegistry, ITokenizationSupport, ITokenizationSupportChangedEvent } from 'vs/editor/common/modes';
 import { Color } from 'vs/base/common/color';
@@ -33,15 +33,13 @@ export class TokenizationRegistryImpl implements ITokenizationRegistry {
 	public register(language: string, support: ITokenizationSupport): IDisposable {
 		this._map[language] = support;
 		this.fire([language]);
-		return {
-			dispose: () => {
-				if (this._map[language] !== support) {
-					return;
-				}
-				delete this._map[language];
-				this.fire([language]);
+		return toDisposable(() => {
+			if (this._map[language] !== support) {
+				return;
 			}
-		};
+			delete this._map[language];
+			this.fire([language]);
+		});
 	}
 
 	public get(language: string): ITokenizationSupport {
diff --git a/src/vs/editor/common/services/editorSimpleWorker.ts b/src/vs/editor/common/services/editorSimpleWorker.ts
index bf4848670db..552ab3c135f 100644
--- a/src/vs/editor/common/services/editorSimpleWorker.ts
+++ b/src/vs/editor/common/services/editorSimpleWorker.ts
@@ -5,7 +5,7 @@
 
 'use strict';
 
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { IDisposable } from 'vs/base/common/lifecycle';
 import { IRequestHandler } from 'vs/base/common/worker/simpleWorker';
@@ -16,13 +16,14 @@ import * as editorCommon from 'vs/editor/common/editorCommon';
 import { Position, IPosition } from 'vs/editor/common/core/position';
 import { MirrorTextModel as BaseMirrorModel, IModelChangedEvent } from 'vs/editor/common/model/mirrorTextModel';
 import { IInplaceReplaceSupportResult, ILink, ISuggestResult, ISuggestion, TextEdit } from 'vs/editor/common/modes';
-import { computeLinks } from 'vs/editor/common/modes/linkComputer';
+import { computeLinks, ILinkComputerTarget } from 'vs/editor/common/modes/linkComputer';
 import { BasicInplaceReplace } from 'vs/editor/common/modes/supports/inplaceReplaceSupport';
 import { getWordAtText, ensureValidWordDefinition } from 'vs/editor/common/model/wordHelper';
 import { createMonacoBaseAPI } from 'vs/editor/common/standalone/standaloneBase';
 import { IWordAtPosition, EndOfLineSequence } from 'vs/editor/common/model';
 import { globals } from 'vs/base/common/platform';
-import { IIterator } from 'vs/base/common/iterator';
+import { Iterator } from 'vs/base/common/iterator';
+import { mergeSort } from 'vs/base/common/arrays';
 
 export interface IMirrorModel {
 	readonly uri: URI;
@@ -50,7 +51,7 @@ export interface IRawModelData {
 /**
  * @internal
  */
-export interface ICommonModel {
+export interface ICommonModel extends ILinkComputerTarget, IMirrorModel {
 	uri: URI;
 	version: number;
 	eol: string;
@@ -59,7 +60,7 @@ export interface ICommonModel {
 	getLinesContent(): string[];
 	getLineCount(): number;
 	getLineContent(lineNumber: number): string;
-	createWordIterator(wordDefinition: RegExp): IIterator<string>;
+	createWordIterator(wordDefinition: RegExp): Iterator<string>;
 	getWordUntilPosition(position: IPosition, wordDefinition: RegExp): IWordAtPosition;
 	getValueInRange(range: IRange): string;
 	getWordAtPosition(position: IPosition, wordDefinition: RegExp): Range;
@@ -147,7 +148,7 @@ class MirrorModel extends BaseMirrorModel implements ICommonModel {
 		};
 	}
 
-	public createWordIterator(wordDefinition: RegExp): IIterator<string> {
+	public createWordIterator(wordDefinition: RegExp): Iterator<string> {
 		let obj = {
 			done: false,
 			value: ''
@@ -332,6 +333,7 @@ export abstract class BaseEditorSimpleWorker {
 		let originalLines = original.getLinesContent();
 		let modifiedLines = modified.getLinesContent();
 		let diffComputer = new DiffComputer(originalLines, modifiedLines, {
+			shouldComputeCharChanges: true,
 			shouldPostProcessCharChanges: true,
 			shouldIgnoreTrimWhitespace: ignoreTrimWhitespace,
 			shouldMakePrettyDiff: true
@@ -349,6 +351,7 @@ export abstract class BaseEditorSimpleWorker {
 		let originalLines = original.getLinesContent();
 		let modifiedLines = modified.getLinesContent();
 		let diffComputer = new DiffComputer(originalLines, modifiedLines, {
+			shouldComputeCharChanges: false,
 			shouldPostProcessCharChanges: false,
 			shouldIgnoreTrimWhitespace: ignoreTrimWhitespace,
 			shouldMakePrettyDiff: true
@@ -372,6 +375,8 @@ export abstract class BaseEditorSimpleWorker {
 		const result: TextEdit[] = [];
 		let lastEol: EndOfLineSequence;
 
+		edits = mergeSort(edits, (a, b) => Range.compareRangesUsingStarts(a.range, b.range));
+
 		for (let { range, text, eol } of edits) {
 
 			if (typeof eol === 'number') {
@@ -527,6 +532,7 @@ export abstract class BaseEditorSimpleWorker {
 			}
 			return TPromise.as(methods);
 		}
+		// ESM-comment-begin
 		return new TPromise<any>((c, e) => {
 			require([moduleId], (foreignModule: { create: IForeignModuleFactory }) => {
 				this._foreignModule = foreignModule.create(ctx, createData);
@@ -542,6 +548,11 @@ export abstract class BaseEditorSimpleWorker {
 
 			}, e);
 		});
+		// ESM-comment-end
+
+		// ESM-uncomment-begin
+		// return TPromise.wrapError(new Error(`Unexpected usage`));
+		// ESM-uncomment-end
 	}
 
 	// foreign method request
diff --git a/src/vs/editor/common/services/editorWorkerService.ts b/src/vs/editor/common/services/editorWorkerService.ts
index dd44f4562e8..4c2a7a6464b 100644
--- a/src/vs/editor/common/services/editorWorkerService.ts
+++ b/src/vs/editor/common/services/editorWorkerService.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
 import { IChange, ILineChange } from 'vs/editor/common/editorCommon';
diff --git a/src/vs/editor/common/services/editorWorkerServiceImpl.ts b/src/vs/editor/common/services/editorWorkerServiceImpl.ts
index efbf104f703..8078efd8abe 100644
--- a/src/vs/editor/common/services/editorWorkerServiceImpl.ts
+++ b/src/vs/editor/common/services/editorWorkerServiceImpl.ts
@@ -4,9 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import { IntervalTimer, ShallowCancelThenPromise, wireCancellationToken } from 'vs/base/common/async';
-import { Disposable, IDisposable, dispose } from 'vs/base/common/lifecycle';
-import URI from 'vs/base/common/uri';
+import { IntervalTimer } from 'vs/base/common/async';
+import { Disposable, IDisposable, dispose, toDisposable } from 'vs/base/common/lifecycle';
+import { URI } from 'vs/base/common/uri';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { SimpleWorkerClient, logOnceWebWorkerWarning } from 'vs/base/common/worker/simpleWorker';
 import { DefaultWorkerFactory } from 'vs/base/worker/defaultWorkerFactory';
@@ -63,7 +63,7 @@ export class EditorWorkerServiceImpl extends Disposable implements IEditorWorker
 				if (!canSyncModel(this._modelService, model.uri)) {
 					return TPromise.as([]); // File too large
 				}
-				return wireCancellationToken(token, this._workerManager.withWorker().then(client => client.computeLinks(model.uri)));
+				return this._workerManager.withWorker().then(client => client.computeLinks(model.uri));
 			}
 		}));
 		this._register(modes.SuggestRegistry.register('*', new WordBasedCompletionItemProvider(this._workerManager, configurationService, this._modelService)));
@@ -285,11 +285,9 @@ class EditorModelManager extends Disposable {
 		toDispose.push(model.onWillDispose(() => {
 			this._stopModelSync(modelUrl);
 		}));
-		toDispose.push({
-			dispose: () => {
-				this._proxy.acceptRemovedModel(modelUrl);
-			}
-		});
+		toDispose.push(toDisposable(() => {
+			this._proxy.acceptRemovedModel(modelUrl);
+		}));
 
 		this._syncedModels[modelUrl] = toDispose;
 	}
@@ -323,7 +321,7 @@ class SynchronousWorkerClient<T extends IDisposable> implements IWorkerClient<T>
 	}
 
 	public getProxyObject(): TPromise<T> {
-		return new ShallowCancelThenPromise(this._proxyObj);
+		return this._proxyObj;
 	}
 }
 
@@ -358,11 +356,11 @@ export class EditorWorkerClient extends Disposable {
 	}
 
 	protected _getProxy(): TPromise<EditorSimpleWorkerImpl> {
-		return new ShallowCancelThenPromise(this._getOrCreateWorker().getProxyObject().then(null, (err) => {
+		return this._getOrCreateWorker().getProxyObject().then(null, (err) => {
 			logOnceWebWorkerWarning(err);
 			this._worker = new SynchronousWorkerClient(new EditorSimpleWorkerImpl(null));
 			return this._getOrCreateWorker().getProxyObject();
-		}));
+		});
 	}
 
 	private _getOrCreateModelManager(proxy: EditorSimpleWorkerImpl): EditorModelManager {
diff --git a/src/vs/editor/common/services/languagesRegistry.ts b/src/vs/editor/common/services/languagesRegistry.ts
index 13225e51b8c..8618d2a2458 100644
--- a/src/vs/editor/common/services/languagesRegistry.ts
+++ b/src/vs/editor/common/services/languagesRegistry.ts
@@ -13,6 +13,7 @@ import { ILanguageExtensionPoint } from 'vs/editor/common/services/modeService';
 import { LanguageId, LanguageIdentifier } from 'vs/editor/common/modes';
 import { NULL_MODE_ID, NULL_LANGUAGE_IDENTIFIER } from 'vs/editor/common/modes/nullMode';
 import { IConfigurationRegistry, Extensions } from 'vs/platform/configuration/common/configurationRegistry';
+import { URI } from 'vs/base/common/uri';
 
 const hasOwnProperty = Object.prototype.hasOwnProperty;
 
@@ -23,7 +24,7 @@ export interface IResolvedLanguage {
 	aliases: string[];
 	extensions: string[];
 	filenames: string[];
-	configurationFiles: string[];
+	configurationFiles: URI[];
 }
 
 export class LanguagesRegistry {
@@ -188,7 +189,7 @@ export class LanguagesRegistry {
 			}
 		}
 
-		if (typeof lang.configuration === 'string') {
+		if (lang.configuration) {
 			resolvedLanguage.configurationFiles.push(lang.configuration);
 		}
 	}
@@ -224,7 +225,7 @@ export class LanguagesRegistry {
 		return this._lowercaseNameMap[languageNameLower].language;
 	}
 
-	public getConfigurationFiles(modeId: string): string[] {
+	public getConfigurationFiles(modeId: string): URI[] {
 		if (!hasOwnProperty.call(this._languages, modeId)) {
 			return [];
 		}
diff --git a/src/vs/editor/common/services/modeService.ts b/src/vs/editor/common/services/modeService.ts
index e420aa63096..b042208a197 100644
--- a/src/vs/editor/common/services/modeService.ts
+++ b/src/vs/editor/common/services/modeService.ts
@@ -8,6 +8,7 @@ import { Event } from 'vs/base/common/event';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
 import { IMode, LanguageId, LanguageIdentifier } from 'vs/editor/common/modes';
+import { URI } from 'vs/base/common/uri';
 
 export const IModeService = createDecorator<IModeService>('modeService');
 
@@ -19,18 +20,7 @@ export interface ILanguageExtensionPoint {
 	firstLine?: string;
 	aliases?: string[];
 	mimetypes?: string[];
-	configuration?: string;
-}
-
-export interface IValidLanguageExtensionPoint {
-	id: string;
-	extensions: string[];
-	filenames: string[];
-	filenamePatterns: string[];
-	firstLine: string;
-	aliases: string[];
-	mimetypes: string[];
-	configuration: string;
+	configuration?: URI;
 }
 
 export interface IModeService {
@@ -50,7 +40,7 @@ export interface IModeService {
 	getModeIdByFilenameOrFirstLine(filename: string, firstLine?: string): string;
 	getModeId(commaSeparatedMimetypesOrCommaSeparatedIds: string): string;
 	getLanguageIdentifier(modeId: string | LanguageId): LanguageIdentifier;
-	getConfigurationFiles(modeId: string): string[];
+	getConfigurationFiles(modeId: string): URI[];
 
 	// --- instantiation
 	getMode(commaSeparatedMimetypesOrCommaSeparatedIds: string): IMode;
diff --git a/src/vs/editor/common/services/modeServiceImpl.ts b/src/vs/editor/common/services/modeServiceImpl.ts
index 9c7b5b67680..edce40eaacb 100644
--- a/src/vs/editor/common/services/modeServiceImpl.ts
+++ b/src/vs/editor/common/services/modeServiceImpl.ts
@@ -11,6 +11,7 @@ import { IMode, LanguageId, LanguageIdentifier } from 'vs/editor/common/modes';
 import { FrankensteinMode } from 'vs/editor/common/modes/abstractMode';
 import { LanguagesRegistry } from 'vs/editor/common/services/languagesRegistry';
 import { IModeService } from 'vs/editor/common/services/modeService';
+import { URI } from 'vs/base/common/uri';
 
 export class ModeServiceImpl implements IModeService {
 	public _serviceBrand: any;
@@ -87,7 +88,7 @@ export class ModeServiceImpl implements IModeService {
 		return this._registry.getLanguageIdentifier(modeId);
 	}
 
-	public getConfigurationFiles(modeId: string): string[] {
+	public getConfigurationFiles(modeId: string): URI[] {
 		return this._registry.getConfigurationFiles(modeId);
 	}
 
@@ -109,7 +110,7 @@ export class ModeServiceImpl implements IModeService {
 			let r: IMode = null;
 			this.getOrCreateMode(commaSeparatedMimetypesOrCommaSeparatedIds).then((mode) => {
 				r = mode;
-			}).done(null, onUnexpectedError);
+			}, onUnexpectedError);
 			return r;
 		}
 		return null;
diff --git a/src/vs/editor/common/services/modelService.ts b/src/vs/editor/common/services/modelService.ts
index 6db067c4b04..b487d9ae45b 100644
--- a/src/vs/editor/common/services/modelService.ts
+++ b/src/vs/editor/common/services/modelService.ts
@@ -5,7 +5,7 @@
 'use strict';
 
 import { Event } from 'vs/base/common/event';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
 import { ITextModel, ITextModelCreationOptions, ITextBufferFactory } from 'vs/editor/common/model';
diff --git a/src/vs/editor/common/services/modelServiceImpl.ts b/src/vs/editor/common/services/modelServiceImpl.ts
index 69619294284..221165f6944 100644
--- a/src/vs/editor/common/services/modelServiceImpl.ts
+++ b/src/vs/editor/common/services/modelServiceImpl.ts
@@ -9,7 +9,7 @@ import * as network from 'vs/base/common/network';
 import { Event, Emitter } from 'vs/base/common/event';
 import { MarkdownString } from 'vs/base/common/htmlContent';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { IMarker, IMarkerService, MarkerSeverity, MarkerTag } from 'vs/platform/markers/common/markers';
 import { Range } from 'vs/editor/common/core/range';
@@ -28,6 +28,7 @@ import { overviewRulerWarning, overviewRulerError, overviewRulerInfo } from 'vs/
 import { ITextModel, IModelDeltaDecoration, IModelDecorationOptions, TrackedRangeStickiness, OverviewRulerLane, DefaultEndOfLine, ITextModelCreationOptions, EndOfLineSequence, IIdentifiedSingleEditOperation, ITextBufferFactory, ITextBuffer, EndOfLinePreference } from 'vs/editor/common/model';
 import { isFalsyOrEmpty } from 'vs/base/common/arrays';
 import { basename } from 'vs/base/common/paths';
+import { isThenable } from 'vs/base/common/async';
 
 function MODEL_ID(resource: URI): string {
 	return resource.toString();
@@ -73,8 +74,8 @@ class ModelMarkerHandler {
 
 		let newModelDecorations: IModelDeltaDecoration[] = markers.map((marker) => {
 			return {
-				range: this._createDecorationRange(modelData.model, marker),
-				options: this._createDecorationOption(marker)
+				range: ModelMarkerHandler._createDecorationRange(modelData.model, marker),
+				options: ModelMarkerHandler._createDecorationOption(marker)
 			};
 		});
 
@@ -85,9 +86,12 @@ class ModelMarkerHandler {
 
 		let ret = Range.lift(rawMarker);
 
-		if (rawMarker.severity === MarkerSeverity.Hint && Range.spansMultipleLines(ret)) {
-			// never render hints on multiple lines
-			ret = ret.setEndPosition(ret.startLineNumber, ret.startColumn);
+		if (rawMarker.severity === MarkerSeverity.Hint) {
+			if (!rawMarker.tags || rawMarker.tags.indexOf(MarkerTag.Unnecessary) === -1) {
+				// * never render hints on multiple lines
+				// * make enough space for three dots
+				ret = ret.setEndPosition(ret.startLineNumber, ret.startColumn + 2);
+			}
 		}
 
 		ret = model.validateRange(ret);
@@ -131,7 +135,9 @@ class ModelMarkerHandler {
 
 		switch (marker.severity) {
 			case MarkerSeverity.Hint:
-				if (!marker.customTags || marker.customTags.indexOf(MarkerTag.Unnecessary) === -1) {
+				if (marker.tags && marker.tags.indexOf(MarkerTag.Unnecessary) >= 0) {
+					className = ClassName.EditorUnnecessaryDecoration;
+				} else {
 					className = ClassName.EditorHintDecoration;
 				}
 				zIndex = 0;
@@ -157,9 +163,9 @@ class ModelMarkerHandler {
 				break;
 		}
 
-		if (marker.customTags) {
-			if (marker.customTags.indexOf(MarkerTag.Unnecessary) !== -1) {
-				inlineClassName = ClassName.EditorUnnecessaryDecoration;
+		if (marker.tags) {
+			if (marker.tags.indexOf(MarkerTag.Unnecessary) !== -1) {
+				inlineClassName = ClassName.EditorUnnecessaryInlineDecoration;
 			}
 		}
 
@@ -272,6 +278,9 @@ export class ModelServiceImpl implements IModelService {
 			if (!isNaN(parsedTabSize)) {
 				tabSize = parsedTabSize;
 			}
+			if (tabSize < 1) {
+				tabSize = 1;
+			}
 		}
 
 		let insertSpaces = EDITOR_MODEL_DEFAULTS.insertSpaces;
@@ -492,7 +501,7 @@ export class ModelServiceImpl implements IModelService {
 	public createModel(value: string | ITextBufferFactory, modeOrPromise: TPromise<IMode> | IMode, resource: URI, isForSimpleWidget: boolean = false): ITextModel {
 		let modelData: ModelData;
 
-		if (!modeOrPromise || TPromise.is(modeOrPromise)) {
+		if (!modeOrPromise || isThenable(modeOrPromise)) {
 			modelData = this._createModelData(value, PLAINTEXT_LANGUAGE_IDENTIFIER, resource, isForSimpleWidget);
 			this.setMode(modelData.model, modeOrPromise);
 		} else {
@@ -513,7 +522,7 @@ export class ModelServiceImpl implements IModelService {
 		if (!modeOrPromise) {
 			return;
 		}
-		if (TPromise.is(modeOrPromise)) {
+		if (isThenable(modeOrPromise)) {
 			modeOrPromise.then((mode) => {
 				if (!model.isDisposed()) {
 					model.setMode(mode.getLanguageIdentifier());
diff --git a/src/vs/editor/common/services/resolverService.ts b/src/vs/editor/common/services/resolverService.ts
index 173713e7018..d838f202e5e 100644
--- a/src/vs/editor/common/services/resolverService.ts
+++ b/src/vs/editor/common/services/resolverService.ts
@@ -5,7 +5,7 @@
 'use strict';
 
 import { TPromise } from 'vs/base/common/winjs.base';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
 import { ITextModel } from 'vs/editor/common/model';
 import { IEditorModel } from 'vs/platform/editor/common/editor';
@@ -33,7 +33,7 @@ export interface ITextModelContentProvider {
 	/**
 	 * Given a resource, return the content of the resource as `ITextModel`.
 	 */
-	provideTextContent(resource: URI): TPromise<ITextModel>;
+	provideTextContent(resource: URI): Thenable<ITextModel>;
 }
 
 export interface ITextEditorModel extends IEditorModel {
@@ -42,4 +42,6 @@ export interface ITextEditorModel extends IEditorModel {
 	 * Provides access to the underlying `ITextModel`.
 	 */
 	textEditorModel: ITextModel;
+
+	isReadonly(): boolean;
 }
diff --git a/src/vs/editor/common/services/resourceConfiguration.ts b/src/vs/editor/common/services/resourceConfiguration.ts
index 82ed5d415e5..8d4a738eb9b 100644
--- a/src/vs/editor/common/services/resourceConfiguration.ts
+++ b/src/vs/editor/common/services/resourceConfiguration.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { Event } from 'vs/base/common/event';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
 import { IPosition } from 'vs/editor/common/core/position';
 import { IConfigurationChangeEvent } from 'vs/platform/configuration/common/configuration';
diff --git a/src/vs/editor/common/services/resourceConfigurationImpl.ts b/src/vs/editor/common/services/resourceConfigurationImpl.ts
index 6b75152e474..1cdb3372d6d 100644
--- a/src/vs/editor/common/services/resourceConfigurationImpl.ts
+++ b/src/vs/editor/common/services/resourceConfigurationImpl.ts
@@ -5,7 +5,7 @@
 
 import { Event, Emitter } from 'vs/base/common/event';
 import { Disposable } from 'vs/base/common/lifecycle';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { IConfigurationService, IConfigurationChangeEvent } from 'vs/platform/configuration/common/configuration';
 import { ITextResourceConfigurationService } from 'vs/editor/common/services/resourceConfiguration';
 import { IPosition, Position } from 'vs/editor/common/core/position';
diff --git a/src/vs/editor/common/services/webWorker.ts b/src/vs/editor/common/services/webWorker.ts
index 2a8d04558d7..a07a751b041 100644
--- a/src/vs/editor/common/services/webWorker.ts
+++ b/src/vs/editor/common/services/webWorker.ts
@@ -4,8 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import { ShallowCancelThenPromise } from 'vs/base/common/async';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { IModelService } from 'vs/editor/common/services/modelService';
 import { EditorWorkerClient } from 'vs/editor/common/services/editorWorkerServiceImpl';
@@ -68,7 +67,7 @@ class MonacoWebWorkerImpl<T> extends EditorWorkerClient implements MonacoWebWork
 
 	private _getForeignProxy(): TPromise<T> {
 		if (!this._foreignProxy) {
-			this._foreignProxy = new ShallowCancelThenPromise(this._getProxy().then((proxy) => {
+			this._foreignProxy = this._getProxy().then((proxy) => {
 				return proxy.loadForeignModule(this._foreignModuleId, this._foreignModuleCreateData).then((foreignMethods) => {
 					this._foreignModuleId = null;
 					this._foreignModuleCreateData = null;
@@ -91,7 +90,7 @@ class MonacoWebWorkerImpl<T> extends EditorWorkerClient implements MonacoWebWork
 
 					return foreignProxy;
 				});
-			}));
+			});
 		}
 		return this._foreignProxy;
 	}
diff --git a/src/vs/editor/common/standalone/standaloneBase.ts b/src/vs/editor/common/standalone/standaloneBase.ts
index c4683e6d6ed..9bdd7c5f577 100644
--- a/src/vs/editor/common/standalone/standaloneBase.ts
+++ b/src/vs/editor/common/standalone/standaloneBase.ts
@@ -12,18 +12,12 @@ import { Selection, SelectionDirection } from 'vs/editor/common/core/selection';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { CancellationTokenSource } from 'vs/base/common/cancellation';
 import { Token } from 'vs/editor/common/core/token';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 
 // --------------------------------------------
 // This is repeated here so it can be exported
 // because TS inlines const enums
 // --------------------------------------------
-export enum Severity {
-	Ignore = 0,
-	Info = 1,
-	Warning = 2,
-	Error = 3,
-}
 
 export enum MarkerTag {
 	Unnecessary = 1,
@@ -248,7 +242,6 @@ export function createMonacoBaseAPI(): typeof monaco {
 		Range: Range,
 		Selection: Selection,
 		SelectionDirection: SelectionDirection,
-		Severity: Severity,
 		MarkerSeverity: MarkerSeverity,
 		MarkerTag: MarkerTag,
 		Promise: TPromise,
diff --git a/src/vs/editor/common/view/editorColorRegistry.ts b/src/vs/editor/common/view/editorColorRegistry.ts
index c8b310fb7de..c4c369cb0d2 100644
--- a/src/vs/editor/common/view/editorColorRegistry.ts
+++ b/src/vs/editor/common/view/editorColorRegistry.ts
@@ -21,9 +21,9 @@ export const editorCursorBackground = registerColor('editorCursor.background', n
 export const editorWhitespaces = registerColor('editorWhitespace.foreground', { dark: '#e3e4e229', light: '#33333333', hc: '#e3e4e229' }, nls.localize('editorWhitespaces', 'Color of whitespace characters in the editor.'));
 export const editorIndentGuides = registerColor('editorIndentGuide.background', { dark: editorWhitespaces, light: editorWhitespaces, hc: editorWhitespaces }, nls.localize('editorIndentGuides', 'Color of the editor indentation guides.'));
 export const editorActiveIndentGuides = registerColor('editorIndentGuide.activeBackground', { dark: editorWhitespaces, light: editorWhitespaces, hc: editorWhitespaces }, nls.localize('editorActiveIndentGuide', 'Color of the active editor indentation guides.'));
-export const editorLineNumbers = registerColor('editorLineNumber.foreground', { dark: '#5A5A5A', light: '#2B91AF', hc: Color.white }, nls.localize('editorLineNumbers', 'Color of editor line numbers.'));
+export const editorLineNumbers = registerColor('editorLineNumber.foreground', { dark: '#858585', light: '#237893', hc: Color.white }, nls.localize('editorLineNumbers', 'Color of editor line numbers.'));
 
-const deprecatedEditorActiveLineNumber = registerColor('editorActiveLineNumber.foreground', { dark: '#AAAAAA', light: '#0B216F', hc: activeContrastBorder }, nls.localize('editorActiveLineNumber', 'Color of editor active line number'), false, nls.localize('deprecatedEditorActiveLineNumber', 'Id is deprecated. Use \'editorLineNumber.activeForeground\' instead.'));
+const deprecatedEditorActiveLineNumber = registerColor('editorActiveLineNumber.foreground', { dark: '#c6c6c6', light: '#0B216F', hc: activeContrastBorder }, nls.localize('editorActiveLineNumber', 'Color of editor active line number'), false, nls.localize('deprecatedEditorActiveLineNumber', 'Id is deprecated. Use \'editorLineNumber.activeForeground\' instead.'));
 export const editorActiveLineNumber = registerColor('editorLineNumber.activeForeground', { dark: deprecatedEditorActiveLineNumber, light: deprecatedEditorActiveLineNumber, hc: deprecatedEditorActiveLineNumber }, nls.localize('editorActiveLineNumber', 'Color of editor active line number'));
 
 export const editorRuler = registerColor('editorRuler.foreground', { dark: '#5A5A5A', light: Color.lightgrey, hc: Color.white }, nls.localize('editorRuler', 'Color of the editor rulers.'));
@@ -49,7 +49,8 @@ export const editorInfoBorder = registerColor('editorInfo.border', { dark: null,
 export const editorHintForeground = registerColor('editorHint.foreground', { dark: Color.fromHex('#eeeeee').transparent(0.7), light: '#6c6c6c', hc: null }, nls.localize('hintForeground', 'Foreground color of hint squigglies in the editor.'));
 export const editorHintBorder = registerColor('editorHint.border', { dark: null, light: null, hc: Color.fromHex('#eeeeee').transparent(0.8) }, nls.localize('hintBorder', 'Border color of hint squigglies in the editor.'));
 
-export const editorUnnecessaryForeground = registerColor('editorUnnecessary.foreground', { dark: Color.fromHex('#eeeeee').transparent(0.7), light: '#6c6c6c', hc: null }, nls.localize('unnecessaryForeground', 'Foreground color of unnecessary code in the editor.'));
+export const editorUnnecessaryCodeBorder = registerColor('editorUnnecessaryCode.border', { dark: null, light: null, hc: Color.fromHex('#fff').transparent(0.8) }, nls.localize('unnecessaryCodeBorder', 'Border of unnecessary code in the editor.'));
+export const editorUnnecessaryCodeOpacity = registerColor('editorUnnecessaryCode.opacity', { dark: Color.fromHex('#000a'), light: Color.fromHex('#0007'), hc: null }, nls.localize('unnecessaryCodeOpacity', 'Opacity of unnecessary code in the editor.'));
 
 const rulerRangeDefault = new Color(new RGBA(0, 122, 204, 0.6));
 export const overviewRulerRangeHighlight = registerColor('editorOverviewRuler.rangeHighlightForeground', { dark: rulerRangeDefault, light: rulerRangeDefault, hc: rulerRangeDefault }, nls.localize('overviewRulerRangeHighlight', 'Overview ruler marker color for range highlights. The color must not be opaque to not hide underlying decorations.'), true);
diff --git a/src/vs/editor/common/view/viewEvents.ts b/src/vs/editor/common/view/viewEvents.ts
index d28e49abcfe..5efdb7f822e 100644
--- a/src/vs/editor/common/view/viewEvents.ts
+++ b/src/vs/editor/common/view/viewEvents.ts
@@ -9,7 +9,7 @@ import { Selection } from 'vs/editor/common/core/selection';
 import { ScrollEvent } from 'vs/base/common/scrollable';
 import { IConfigurationChangedEvent } from 'vs/editor/common/config/editorOptions';
 import * as errors from 'vs/base/common/errors';
-import { IDisposable, Disposable } from 'vs/base/common/lifecycle';
+import { IDisposable, Disposable, toDisposable } from 'vs/base/common/lifecycle';
 import { ScrollType } from 'vs/editor/common/editorCommon';
 
 export const enum ViewEventType {
@@ -42,6 +42,7 @@ export class ViewConfigurationChangedEvent {
 	public readonly readOnly: boolean;
 	public readonly accessibilitySupport: boolean;
 	public readonly emptySelectionClipboard: boolean;
+	public readonly copyWithSyntaxHighlighting: boolean;
 	public readonly layoutInfo: boolean;
 	public readonly fontInfo: boolean;
 	public readonly viewInfo: boolean;
@@ -55,6 +56,7 @@ export class ViewConfigurationChangedEvent {
 		this.readOnly = source.readOnly;
 		this.accessibilitySupport = source.accessibilitySupport;
 		this.emptySelectionClipboard = source.emptySelectionClipboard;
+		this.copyWithSyntaxHighlighting = source.copyWithSyntaxHighlighting;
 		this.layoutInfo = source.layoutInfo;
 		this.fontInfo = source.fontInfo;
 		this.viewInfo = source.viewInfo;
@@ -354,17 +356,15 @@ export class ViewEventEmitter extends Disposable {
 
 	public addEventListener(listener: (events: ViewEvent[]) => void): IDisposable {
 		this._listeners.push(listener);
-		return {
-			dispose: () => {
-				let listeners = this._listeners;
-				for (let i = 0, len = listeners.length; i < len; i++) {
-					if (listeners[i] === listener) {
-						listeners.splice(i, 1);
-						break;
-					}
+		return toDisposable(() => {
+			let listeners = this._listeners;
+			for (let i = 0, len = listeners.length; i < len; i++) {
+				if (listeners[i] === listener) {
+					listeners.splice(i, 1);
+					break;
 				}
 			}
-		};
+		});
 	}
 }
 
diff --git a/src/vs/editor/common/viewLayout/viewLineRenderer.ts b/src/vs/editor/common/viewLayout/viewLineRenderer.ts
index 977f9a5235b..0d91e39e3e4 100644
--- a/src/vs/editor/common/viewLayout/viewLineRenderer.ts
+++ b/src/vs/editor/common/viewLayout/viewLineRenderer.ts
@@ -35,6 +35,7 @@ class LinePart {
 export class RenderLineInput {
 
 	public readonly useMonospaceOptimizations: boolean;
+	public readonly canUseHalfwidthRightwardsArrow: boolean;
 	public readonly lineContent: string;
 	public readonly continuesWithWrappedLine: boolean;
 	public readonly isBasicASCII: boolean;
@@ -51,6 +52,7 @@ export class RenderLineInput {
 
 	constructor(
 		useMonospaceOptimizations: boolean,
+		canUseHalfwidthRightwardsArrow: boolean,
 		lineContent: string,
 		continuesWithWrappedLine: boolean,
 		isBasicASCII: boolean,
@@ -66,6 +68,7 @@ export class RenderLineInput {
 		fontLigatures: boolean
 	) {
 		this.useMonospaceOptimizations = useMonospaceOptimizations;
+		this.canUseHalfwidthRightwardsArrow = canUseHalfwidthRightwardsArrow;
 		this.lineContent = lineContent;
 		this.continuesWithWrappedLine = continuesWithWrappedLine;
 		this.isBasicASCII = isBasicASCII;
@@ -90,6 +93,7 @@ export class RenderLineInput {
 	public equals(other: RenderLineInput): boolean {
 		return (
 			this.useMonospaceOptimizations === other.useMonospaceOptimizations
+			&& this.canUseHalfwidthRightwardsArrow === other.canUseHalfwidthRightwardsArrow
 			&& this.lineContent === other.lineContent
 			&& this.continuesWithWrappedLine === other.continuesWithWrappedLine
 			&& this.isBasicASCII === other.isBasicASCII
@@ -303,6 +307,7 @@ export function renderViewLine2(input: RenderLineInput): RenderLineOutput2 {
 class ResolvedRenderLineInput {
 	constructor(
 		public readonly fontIsMonospace: boolean,
+		public readonly canUseHalfwidthRightwardsArrow: boolean,
 		public readonly lineContent: string,
 		public readonly len: number,
 		public readonly isOverflowing: boolean,
@@ -358,6 +363,7 @@ function resolveRenderLineInput(input: RenderLineInput): ResolvedRenderLineInput
 
 	return new ResolvedRenderLineInput(
 		useMonospaceOptimizations,
+		input.canUseHalfwidthRightwardsArrow,
 		lineContent,
 		len,
 		isOverflowing,
@@ -447,6 +453,7 @@ function _applyRenderWhitespace(lineContent: string, len: number, continuesWithW
 	let tokenIndex = 0;
 	let tokenType = tokens[tokenIndex].type;
 	let tokenEndIndex = tokens[tokenIndex].endIndex;
+	const tokensLength = tokens.length;
 
 	let firstNonWhitespaceIndex = strings.firstNonWhitespaceIndex(lineContent);
 	let lastNonWhitespaceIndex: number;
@@ -526,8 +533,10 @@ function _applyRenderWhitespace(lineContent: string, len: number, continuesWithW
 
 		if (charIndex === tokenEndIndex) {
 			tokenIndex++;
-			tokenType = tokens[tokenIndex].type;
-			tokenEndIndex = tokens[tokenIndex].endIndex;
+			if (tokenIndex < tokensLength) {
+				tokenType = tokens[tokenIndex].type;
+				tokenEndIndex = tokens[tokenIndex].endIndex;
+			}
 		}
 	}
 
@@ -613,6 +622,7 @@ function _applyInlineDecorations(lineContent: string, len: number, tokens: LineP
  */
 function _renderLine(input: ResolvedRenderLineInput, sb: IStringBuilder): RenderLineOutput {
 	const fontIsMonospace = input.fontIsMonospace;
+	const canUseHalfwidthRightwardsArrow = input.canUseHalfwidthRightwardsArrow;
 	const containsForeignElements = input.containsForeignElements;
 	const lineContent = input.lineContent;
 	const len = input.len;
@@ -688,7 +698,7 @@ function _renderLine(input: ResolvedRenderLineInput, sb: IStringBuilder): Render
 					tabsCharDelta += insertSpacesCount - 1;
 					charOffsetInPart += insertSpacesCount - 1;
 					if (insertSpacesCount > 0) {
-						if (insertSpacesCount > 1) {
+						if (!canUseHalfwidthRightwardsArrow || insertSpacesCount > 1) {
 							sb.write1(0x2192); // RIGHTWARDS ARROW
 						} else {
 							sb.write1(0xffeb); // HALFWIDTH RIGHTWARDS ARROW
diff --git a/src/vs/editor/common/viewModel/splitLinesCollection.ts b/src/vs/editor/common/viewModel/splitLinesCollection.ts
index 17ef4199216..3f34f8b4fab 100644
--- a/src/vs/editor/common/viewModel/splitLinesCollection.ts
+++ b/src/vs/editor/common/viewModel/splitLinesCollection.ts
@@ -192,6 +192,10 @@ export class SplitLinesCollection implements IViewModelLinesCollection {
 			// This is pretty bad, it means we lost track of the model...
 			throw new Error(`ViewModel is out of sync with Model!`);
 		}
+		if (this.lines.length !== this.model.getLineCount()) {
+			// This is pretty bad, it means we lost track of the model...
+			this._constructLines(false);
+		}
 	}
 
 	private _constructLines(resetHiddenAreas: boolean): void {
@@ -523,7 +527,7 @@ export class SplitLinesCollection implements IViewModelLinesCollection {
 		const result = this.model.getActiveIndentGuide(modelPosition.lineNumber, modelMinPosition.lineNumber, modelMaxPosition.lineNumber);
 
 		const viewStartPosition = this.convertModelPositionToViewPosition(result.startLineNumber, 1);
-		const viewEndPosition = this.convertModelPositionToViewPosition(result.endLineNumber, 1);
+		const viewEndPosition = this.convertModelPositionToViewPosition(result.endLineNumber, this.model.getLineMaxColumn(result.endLineNumber));
 		return {
 			startLineNumber: viewStartPosition.lineNumber,
 			endLineNumber: viewEndPosition.lineNumber,
diff --git a/src/vs/editor/contrib/bracketMatching/bracketMatching.ts b/src/vs/editor/contrib/bracketMatching/bracketMatching.ts
index b2573d26fa0..ed17ffb44dc 100644
--- a/src/vs/editor/contrib/bracketMatching/bracketMatching.ts
+++ b/src/vs/editor/contrib/bracketMatching/bracketMatching.ts
@@ -22,6 +22,7 @@ import { ModelDecorationOptions } from 'vs/editor/common/model/textModel';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
 import { registerColor } from 'vs/platform/theme/common/colorRegistry';
 import { TrackedRangeStickiness, IModelDeltaDecoration, OverviewRulerLane } from 'vs/editor/common/model';
+import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
 
 const overviewRulerBracketMatchForeground = registerColor('editorOverviewRuler.bracketMatchForeground', { dark: '#A0A0A0', light: '#A0A0A0', hc: '#A0A0A0' }, nls.localize('overviewRulerBracketMatchForeground', 'Overview ruler marker color for matching brackets.'));
 
@@ -34,7 +35,8 @@ class JumpToBracketAction extends EditorAction {
 			precondition: null,
 			kbOpts: {
 				kbExpr: EditorContextKeys.editorTextFocus,
-				primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.US_BACKSLASH
+				primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.US_BACKSLASH,
+				weight: KeybindingWeight.EditorContrib
 			}
 		});
 	}
@@ -116,7 +118,13 @@ export class BracketMatchingController extends Disposable implements editorCommo
 
 			this._updateBracketsSoon.schedule();
 		}));
-		this._register(editor.onDidChangeModel((e) => { this._decorations = []; this._updateBracketsSoon.schedule(); }));
+		this._register(editor.onDidChangeModelContent((e) => {
+			this._updateBracketsSoon.schedule();
+		}));
+		this._register(editor.onDidChangeModel((e) => {
+			this._decorations = [];
+			this._updateBracketsSoon.schedule();
+		}));
 		this._register(editor.onDidChangeModelLanguageConfiguration((e) => {
 			this._lastBracketsData = [];
 			this._updateBracketsSoon.schedule();
diff --git a/src/vs/editor/contrib/caretOperations/transpose.ts b/src/vs/editor/contrib/caretOperations/transpose.ts
index 6523327b253..ee59ca9c28d 100644
--- a/src/vs/editor/contrib/caretOperations/transpose.ts
+++ b/src/vs/editor/contrib/caretOperations/transpose.ts
@@ -15,6 +15,7 @@ import { registerEditorAction, EditorAction, ServicesAccessor } from 'vs/editor/
 import { ReplaceCommand } from 'vs/editor/common/commands/replaceCommand';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
 import { ITextModel } from 'vs/editor/common/model';
+import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
 
 class TransposeLettersAction extends EditorAction {
 
@@ -67,7 +68,8 @@ class TransposeLettersAction extends EditorAction {
 				primary: 0,
 				mac: {
 					primary: KeyMod.WinCtrl | KeyCode.KEY_T
-				}
+				},
+				weight: KeybindingWeight.EditorContrib
 			}
 		});
 	}
diff --git a/src/vs/editor/contrib/clipboard/clipboard.ts b/src/vs/editor/contrib/clipboard/clipboard.ts
index 97f62935e1f..4d0ec22210d 100644
--- a/src/vs/editor/contrib/clipboard/clipboard.ts
+++ b/src/vs/editor/contrib/clipboard/clipboard.ts
@@ -16,6 +16,8 @@ import { registerEditorAction, IActionOptions, EditorAction, ICommandKeybindings
 import { CopyOptions } from 'vs/editor/browser/controller/textAreaInput';
 import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
+import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
+import { MenuId } from 'vs/platform/actions/common/actions';
 
 const CLIPBOARD_CONTEXT_MENU_GROUP = '9_cutcopypaste';
 
@@ -62,7 +64,8 @@ class ExecCommandCutAction extends ExecCommandAction {
 		let kbOpts: ICommandKeybindingsOptions = {
 			kbExpr: EditorContextKeys.textInputFocus,
 			primary: KeyMod.CtrlCmd | KeyCode.KEY_X,
-			win: { primary: KeyMod.CtrlCmd | KeyCode.KEY_X, secondary: [KeyMod.Shift | KeyCode.Delete] }
+			win: { primary: KeyMod.CtrlCmd | KeyCode.KEY_X, secondary: [KeyMod.Shift | KeyCode.Delete] },
+			weight: KeybindingWeight.EditorContrib
 		};
 		// Do not bind cut keybindings in the browser,
 		// since browsers do that for us and it avoids security prompts
@@ -78,6 +81,12 @@ class ExecCommandCutAction extends ExecCommandAction {
 			menuOpts: {
 				group: CLIPBOARD_CONTEXT_MENU_GROUP,
 				order: 1
+			},
+			menubarOpts: {
+				menuId: MenuId.MenubarEditMenu,
+				group: '2_ccp',
+				title: nls.localize({ key: 'miCut', comment: ['&& denotes a mnemonic'] }, "Cu&&t"),
+				order: 1
 			}
 		});
 	}
@@ -99,7 +108,8 @@ class ExecCommandCopyAction extends ExecCommandAction {
 		let kbOpts: ICommandKeybindingsOptions = {
 			kbExpr: EditorContextKeys.textInputFocus,
 			primary: KeyMod.CtrlCmd | KeyCode.KEY_C,
-			win: { primary: KeyMod.CtrlCmd | KeyCode.KEY_C, secondary: [KeyMod.CtrlCmd | KeyCode.Insert] }
+			win: { primary: KeyMod.CtrlCmd | KeyCode.KEY_C, secondary: [KeyMod.CtrlCmd | KeyCode.Insert] },
+			weight: KeybindingWeight.EditorContrib
 		};
 		// Do not bind copy keybindings in the browser,
 		// since browsers do that for us and it avoids security prompts
@@ -116,6 +126,12 @@ class ExecCommandCopyAction extends ExecCommandAction {
 			menuOpts: {
 				group: CLIPBOARD_CONTEXT_MENU_GROUP,
 				order: 2
+			},
+			menubarOpts: {
+				menuId: MenuId.MenubarEditMenu,
+				group: '2_ccp',
+				title: nls.localize({ key: 'miCopy', comment: ['&& denotes a mnemonic'] }, "&&Copy"),
+				order: 2
 			}
 		});
 	}
@@ -137,7 +153,8 @@ class ExecCommandPasteAction extends ExecCommandAction {
 		let kbOpts: ICommandKeybindingsOptions = {
 			kbExpr: EditorContextKeys.textInputFocus,
 			primary: KeyMod.CtrlCmd | KeyCode.KEY_V,
-			win: { primary: KeyMod.CtrlCmd | KeyCode.KEY_V, secondary: [KeyMod.Shift | KeyCode.Insert] }
+			win: { primary: KeyMod.CtrlCmd | KeyCode.KEY_V, secondary: [KeyMod.Shift | KeyCode.Insert] },
+			weight: KeybindingWeight.EditorContrib
 		};
 		// Do not bind paste keybindings in the browser,
 		// since browsers do that for us and it avoids security prompts
@@ -154,6 +171,12 @@ class ExecCommandPasteAction extends ExecCommandAction {
 			menuOpts: {
 				group: CLIPBOARD_CONTEXT_MENU_GROUP,
 				order: 3
+			},
+			menubarOpts: {
+				menuId: MenuId.MenubarEditMenu,
+				group: '2_ccp',
+				title: nls.localize({ key: 'miPaste', comment: ['&& denotes a mnemonic'] }, "&&Paste"),
+				order: 3
 			}
 		});
 	}
@@ -169,7 +192,8 @@ class ExecCommandCopyWithSyntaxHighlightingAction extends ExecCommandAction {
 			precondition: null,
 			kbOpts: {
 				kbExpr: EditorContextKeys.textInputFocus,
-				primary: null
+				primary: null,
+				weight: KeybindingWeight.EditorContrib
 			}
 		});
 	}
diff --git a/src/vs/editor/contrib/codeAction/codeAction.ts b/src/vs/editor/contrib/codeAction/codeAction.ts
index c13ef19a29d..e301f1ee621 100644
--- a/src/vs/editor/contrib/codeAction/codeAction.ts
+++ b/src/vs/editor/contrib/codeAction/codeAction.ts
@@ -3,58 +3,62 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { isFalsyOrEmpty, mergeSort, flatten } from 'vs/base/common/arrays';
-import { asWinJsPromise } from 'vs/base/common/async';
-import { illegalArgument, onUnexpectedExternalError, isPromiseCanceledError } from 'vs/base/common/errors';
-import URI from 'vs/base/common/uri';
-import { TPromise } from 'vs/base/common/winjs.base';
+import { flatten, isFalsyOrEmpty, mergeSort } from 'vs/base/common/arrays';
+import { CancellationToken } from 'vs/base/common/cancellation';
+import { illegalArgument, isPromiseCanceledError, onUnexpectedExternalError } from 'vs/base/common/errors';
+import { URI } from 'vs/base/common/uri';
 import { registerLanguageCommand } from 'vs/editor/browser/editorExtensions';
 import { Range } from 'vs/editor/common/core/range';
+import { Selection } from 'vs/editor/common/core/selection';
 import { ITextModel } from 'vs/editor/common/model';
-import { CodeAction, CodeActionProviderRegistry, CodeActionContext, CodeActionTrigger as CodeActionTriggerKind } from 'vs/editor/common/modes';
+import { CodeAction, CodeActionContext, CodeActionProviderRegistry, CodeActionTrigger as CodeActionTriggerKind } from 'vs/editor/common/modes';
 import { IModelService } from 'vs/editor/common/services/modelService';
 import { CodeActionFilter, CodeActionKind, CodeActionTrigger } from './codeActionTrigger';
-import { Selection } from 'vs/editor/common/core/selection';
 
-export function getCodeActions(model: ITextModel, rangeOrSelection: Range | Selection, trigger?: CodeActionTrigger): TPromise<CodeAction[]> {
+export function getCodeActions(model: ITextModel, rangeOrSelection: Range | Selection, trigger?: CodeActionTrigger, token: CancellationToken = CancellationToken.None): Promise<CodeAction[]> {
 	const codeActionContext: CodeActionContext = {
 		only: trigger && trigger.filter && trigger.filter.kind ? trigger.filter.kind.value : undefined,
 		trigger: trigger && trigger.type === 'manual' ? CodeActionTriggerKind.Manual : CodeActionTriggerKind.Automatic
 	};
 
-	const promises = CodeActionProviderRegistry.all(model).map(support => {
-		return asWinJsPromise(token => support.provideCodeActions(model, rangeOrSelection, codeActionContext, token)).then(providedCodeActions => {
-			if (!Array.isArray(providedCodeActions)) {
+	const promises = CodeActionProviderRegistry.all(model)
+		.filter(provider => {
+			// Avoid calling providers that we know will not return code actions of interest
+			return !provider.providedCodeActionKinds || provider.providedCodeActionKinds.some(providedKind => isValidActionKind(trigger && trigger.filter, providedKind));
+		})
+		.map(support => {
+			return Promise.resolve(support.provideCodeActions(model, rangeOrSelection, codeActionContext, token)).then(providedCodeActions => {
+				if (!Array.isArray(providedCodeActions)) {
+					return [];
+				}
+				return providedCodeActions.filter(action => isValidAction(trigger && trigger.filter, action));
+			}, (err): CodeAction[] => {
+				if (isPromiseCanceledError(err)) {
+					throw err;
+				}
+
+				onUnexpectedExternalError(err);
 				return [];
-			}
-			return providedCodeActions.filter(action => isValidAction(trigger && trigger.filter, action));
-		}, (err): CodeAction[] => {
-			if (isPromiseCanceledError(err)) {
-				throw err;
-			}
-
-			onUnexpectedExternalError(err);
-			return [];
+			});
 		});
-	});
 
-	return TPromise.join(promises)
+	return Promise.all(promises)
 		.then(flatten)
 		.then(allCodeActions => mergeSort(allCodeActions, codeActionsComparator));
 }
 
 function isValidAction(filter: CodeActionFilter | undefined, action: CodeAction): boolean {
-	if (!action) {
-		return false;
-	}
+	return action && isValidActionKind(filter, action.kind);
+}
 
+function isValidActionKind(filter: CodeActionFilter | undefined, kind: string | undefined): boolean {
 	// Filter out actions by kind
-	if (filter && filter.kind && (!action.kind || !filter.kind.contains(action.kind))) {
+	if (filter && filter.kind && (!kind || !filter.kind.contains(kind))) {
 		return false;
 	}
 
 	// Don't return source actions unless they are explicitly requested
-	if (action.kind && CodeActionKind.Source.contains(action.kind) && (!filter || !filter.includeSourceActions)) {
+	if (kind && CodeActionKind.Source.contains(kind) && (!filter || !filter.includeSourceActions)) {
 		return false;
 	}
 
@@ -88,5 +92,5 @@ registerLanguageCommand('_executeCodeActionProvider', function (accessor, args)
 		throw illegalArgument();
 	}
 
-	return getCodeActions(model, model.validateRange(range), undefined);
+	return getCodeActions(model, model.validateRange(range), { type: 'manual', filter: { includeSourceActions: true } });
 });
diff --git a/src/vs/editor/contrib/codeAction/codeActionCommands.ts b/src/vs/editor/contrib/codeAction/codeActionCommands.ts
index 9ea29d8e5e4..d8d998a1fb8 100644
--- a/src/vs/editor/contrib/codeAction/codeActionCommands.ts
+++ b/src/vs/editor/contrib/codeAction/codeActionCommands.ts
@@ -3,11 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { CancelablePromise } from 'vs/base/common/async';
 import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
+import { dispose, IDisposable } from 'vs/base/common/lifecycle';
+import { escapeRegExpCharacters } from 'vs/base/common/strings';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
 import { EditorAction, EditorCommand, ServicesAccessor } from 'vs/editor/browser/editorExtensions';
+import { IBulkEditService } from 'vs/editor/browser/services/bulkEditService';
 import { IEditorContribution } from 'vs/editor/common/editorCommon';
 import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
 import { CodeAction } from 'vs/editor/common/modes';
@@ -18,13 +21,13 @@ import { ContextKeyExpr, IContextKeyService } from 'vs/platform/contextkey/commo
 import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { IMarkerService } from 'vs/platform/markers/common/markers';
+import { IProgressService } from 'vs/platform/progress/common/progress';
 import { CodeActionModel, CodeActionsComputeEvent, SUPPORTED_CODE_ACTIONS } from './codeActionModel';
 import { CodeActionAutoApply, CodeActionFilter, CodeActionKind } from './codeActionTrigger';
 import { CodeActionContextMenu } from './codeActionWidget';
 import { LightBulbWidget } from './lightBulbWidget';
-import { escapeRegExpCharacters } from 'vs/base/common/strings';
-import { IBulkEditService } from 'vs/editor/browser/services/bulkEditService';
-import { IProgressService } from 'vs/platform/progress/common/progress';
+import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
+import { onUnexpectedError } from 'vs/base/common/errors';
 
 function contextKeyForSupportedActions(kind: CodeActionKind) {
 	return ContextKeyExpr.regex(
@@ -46,7 +49,7 @@ export class QuickFixController implements IEditorContribution {
 	private _lightBulbWidget: LightBulbWidget;
 	private _disposables: IDisposable[] = [];
 
-	private _activeRequest: TPromise<CodeAction[]> | undefined;
+	private _activeRequest: CancelablePromise<CodeAction[]> | undefined;
 
 	constructor(editor: ICodeEditor,
 		@IMarkerService markerService: IMarkerService,
@@ -87,7 +90,7 @@ export class QuickFixController implements IEditorContribution {
 			this._activeRequest = e.actions;
 		}
 
-		if (e && e.trigger.filter && e.trigger.filter.kind) {
+		if (e && e.actions && e.trigger.filter && e.trigger.filter.kind) {
 			// Triggered for specific scope
 			// Apply if we only have one action or requested autoApply, otherwise show menu
 			e.actions.then(fixes => {
@@ -96,7 +99,7 @@ export class QuickFixController implements IEditorContribution {
 				} else {
 					this._codeActionContextMenu.show(e.actions, e.position);
 				}
-			});
+			}).catch(onUnexpectedError);
 			return;
 		}
 
@@ -121,10 +124,12 @@ export class QuickFixController implements IEditorContribution {
 	}
 
 	private _handleLightBulbSelect(coords: { x: number, y: number }): void {
-		this._codeActionContextMenu.show(this._lightBulbWidget.model.actions, coords);
+		if (this._lightBulbWidget.model && this._lightBulbWidget.model.actions) {
+			this._codeActionContextMenu.show(this._lightBulbWidget.model.actions, coords);
+		}
 	}
 
-	public triggerFromEditorSelection(filter?: CodeActionFilter, autoApply?: CodeActionAutoApply): TPromise<CodeAction[] | undefined> {
+	public triggerFromEditorSelection(filter?: CodeActionFilter, autoApply?: CodeActionAutoApply): Thenable<CodeAction[] | undefined> {
 		return this._model.trigger({ type: 'manual', filter, autoApply });
 	}
 
@@ -139,8 +144,8 @@ export class QuickFixController implements IEditorContribution {
 		this._lightBulbWidget.title = title;
 	}
 
-	private async _onApplyCodeAction(action: CodeAction): TPromise<void> {
-		await applyCodeAction(action, this._bulkEditService, this._commandService, this._editor);
+	private _onApplyCodeAction(action: CodeAction): TPromise<void> {
+		return TPromise.wrap(applyCodeAction(action, this._bulkEditService, this._commandService, this._editor));
 	}
 }
 
@@ -149,7 +154,7 @@ export async function applyCodeAction(
 	bulkEditService: IBulkEditService,
 	commandService: ICommandService,
 	editor?: ICodeEditor,
-) {
+): Promise<void> {
 	if (action.edit) {
 		await bulkEditService.apply(action.edit, { editor });
 	}
@@ -189,12 +194,13 @@ export class QuickFixAction extends EditorAction {
 			precondition: ContextKeyExpr.and(EditorContextKeys.writable, EditorContextKeys.hasCodeActionsProvider),
 			kbOpts: {
 				kbExpr: EditorContextKeys.editorTextFocus,
-				primary: KeyMod.CtrlCmd | KeyCode.US_DOT
+				primary: KeyMod.CtrlCmd | KeyCode.US_DOT,
+				weight: KeybindingWeight.EditorContrib
 			}
 		});
 	}
 
-	public run(accessor: ServicesAccessor, editor: ICodeEditor): void {
+	public run(_accessor: ServicesAccessor, editor: ICodeEditor): void {
 		return showCodeActionsForEditorSelection(editor, nls.localize('editor.action.quickFix.noneMessage', "No code actions available"));
 	}
 }
@@ -247,7 +253,7 @@ export class CodeActionCommand extends EditorCommand {
 		});
 	}
 
-	public runEditorCommand(accessor: ServicesAccessor, editor: ICodeEditor, userArg: any) {
+	public runEditorCommand(_accessor: ServicesAccessor, editor: ICodeEditor, userArg: any) {
 		const args = CodeActionCommandArgs.fromUser(userArg);
 		return showCodeActionsForEditorSelection(editor, nls.localize('editor.action.quickFix.noneMessage', "No code actions available"), { kind: args.kind, includeSourceActions: true }, args.apply);
 	}
@@ -269,7 +275,8 @@ export class RefactorAction extends EditorAction {
 				primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KEY_R,
 				mac: {
 					primary: KeyMod.WinCtrl | KeyMod.Shift | KeyCode.KEY_R
-				}
+				},
+				weight: KeybindingWeight.EditorContrib
 			},
 			menuOpts: {
 				group: '1_modification',
@@ -281,7 +288,7 @@ export class RefactorAction extends EditorAction {
 		});
 	}
 
-	public run(accessor: ServicesAccessor, editor: ICodeEditor): void {
+	public run(_accessor: ServicesAccessor, editor: ICodeEditor): void {
 		return showCodeActionsForEditorSelection(editor,
 			nls.localize('editor.action.refactor.noneMessage', "No refactorings available"),
 			{ kind: CodeActionKind.Refactor },
@@ -310,7 +317,7 @@ export class SourceAction extends EditorAction {
 		});
 	}
 
-	public run(accessor: ServicesAccessor, editor: ICodeEditor): void {
+	public run(_accessor: ServicesAccessor, editor: ICodeEditor): void {
 		return showCodeActionsForEditorSelection(editor,
 			nls.localize('editor.action.source.noneMessage', "No source actions available"),
 			{ kind: CodeActionKind.Source, includeSourceActions: true },
@@ -332,12 +339,13 @@ export class OrganizeImportsAction extends EditorAction {
 				contextKeyForSupportedActions(CodeActionKind.SourceOrganizeImports)),
 			kbOpts: {
 				kbExpr: EditorContextKeys.editorTextFocus,
-				primary: KeyMod.Shift | KeyMod.Alt | KeyCode.KEY_O
+				primary: KeyMod.Shift | KeyMod.Alt | KeyCode.KEY_O,
+				weight: KeybindingWeight.EditorContrib
 			}
 		});
 	}
 
-	public run(accessor: ServicesAccessor, editor: ICodeEditor): void {
+	public run(_accessor: ServicesAccessor, editor: ICodeEditor): void {
 		return showCodeActionsForEditorSelection(editor,
 			nls.localize('editor.action.organize.noneMessage', "No organize imports action available"),
 			{ kind: CodeActionKind.SourceOrganizeImports, includeSourceActions: true },
diff --git a/src/vs/editor/contrib/codeAction/codeActionContributions.ts b/src/vs/editor/contrib/codeAction/codeActionContributions.ts
index 8653b935470..4f7315db0f8 100644
--- a/src/vs/editor/contrib/codeAction/codeActionContributions.ts
+++ b/src/vs/editor/contrib/codeAction/codeActionContributions.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { registerEditorAction, registerEditorCommand, registerEditorContribution } from 'vs/editor/browser/editorExtensions';
-import { SourceAction, QuickFixController, QuickFixAction, CodeActionCommand, RefactorAction, OrganizeImportsAction } from 'vs/editor/contrib/codeAction/codeActionCommands';
+import { CodeActionCommand, OrganizeImportsAction, QuickFixAction, QuickFixController, RefactorAction, SourceAction } from 'vs/editor/contrib/codeAction/codeActionCommands';
 
 
 registerEditorContribution(QuickFixController);
diff --git a/src/vs/editor/contrib/codeAction/codeActionModel.ts b/src/vs/editor/contrib/codeAction/codeActionModel.ts
index acbd68b1fa1..cba2d2ccddf 100644
--- a/src/vs/editor/contrib/codeAction/codeActionModel.ts
+++ b/src/vs/editor/contrib/codeAction/codeActionModel.ts
@@ -3,9 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter, Event, debounceEvent } from 'vs/base/common/event';
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
-import URI from 'vs/base/common/uri';
+import { CancelablePromise, createCancelablePromise, TimeoutTimer } from 'vs/base/common/async';
+import { Emitter, Event } from 'vs/base/common/event';
+import { dispose, IDisposable } from 'vs/base/common/lifecycle';
+import { URI } from 'vs/base/common/uri';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
 import { Position } from 'vs/editor/common/core/position';
@@ -14,31 +15,33 @@ import { Selection } from 'vs/editor/common/core/selection';
 import { CodeAction, CodeActionProviderRegistry } from 'vs/editor/common/modes';
 import { IContextKey, IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
 import { IMarkerService } from 'vs/platform/markers/common/markers';
+import { IProgressService } from 'vs/platform/progress/common/progress';
 import { getCodeActions } from './codeAction';
 import { CodeActionTrigger } from './codeActionTrigger';
-import { IProgressService } from 'vs/platform/progress/common/progress';
 
 export const SUPPORTED_CODE_ACTIONS = new RawContextKey<string>('supportedCodeAction', '');
 
 export class CodeActionOracle {
 
 	private _disposables: IDisposable[] = [];
+	private readonly _autoTriggerTimer = new TimeoutTimer();
 
 	constructor(
 		private _editor: ICodeEditor,
 		private readonly _markerService: IMarkerService,
 		private _signalChange: (e: CodeActionsComputeEvent) => any,
-		delay: number = 250,
+		private readonly _delay: number = 250,
 		private readonly _progressService?: IProgressService,
 	) {
 		this._disposables.push(
-			debounceEvent(this._markerService.onMarkerChanged, (last, cur) => last ? last.concat(cur) : cur, delay / 2)(e => this._onMarkerChanges(e)),
-			debounceEvent(this._editor.onDidChangeCursorPosition, (last, cur) => cur, delay)(e => this._onCursorChange())
+			this._markerService.onMarkerChanged(e => this._onMarkerChanges(e)),
+			this._editor.onDidChangeCursorPosition(() => this._onCursorChange()),
 		);
 	}
 
 	dispose(): void {
 		this._disposables = dispose(this._disposables);
+		this._autoTriggerTimer.cancel();
 	}
 
 	trigger(trigger: CodeActionTrigger) {
@@ -48,16 +51,17 @@ export class CodeActionOracle {
 
 	private _onMarkerChanges(resources: URI[]): void {
 		const { uri } = this._editor.getModel();
-		for (const resource of resources) {
-			if (resource.toString() === uri.toString()) {
+		if (resources.some(resource => resource.toString() === uri.toString())) {
+			this._autoTriggerTimer.cancelAndSet(() => {
 				this.trigger({ type: 'auto' });
-				return;
-			}
+			}, this._delay);
 		}
 	}
 
 	private _onCursorChange(): void {
-		this.trigger({ type: 'auto' });
+		this._autoTriggerTimer.cancelAndSet(() => {
+			this.trigger({ type: 'auto' });
+		}, this._delay);
 	}
 
 	private _getRangeOfMarker(selection: Selection): Range {
@@ -99,7 +103,7 @@ export class CodeActionOracle {
 		return selection;
 	}
 
-	private _createEventAndSignalChange(trigger: CodeActionTrigger, selection: Selection | undefined): TPromise<CodeAction[] | undefined> {
+	private _createEventAndSignalChange(trigger: CodeActionTrigger, selection: Selection | undefined): Thenable<CodeAction[] | undefined> {
 		if (!selection) {
 			// cancel
 			this._signalChange({
@@ -113,10 +117,10 @@ export class CodeActionOracle {
 			const model = this._editor.getModel();
 			const markerRange = this._getRangeOfMarker(selection);
 			const position = markerRange ? markerRange.getStartPosition() : selection.getStartPosition();
-			const actions = getCodeActions(model, selection, trigger);
+			const actions = createCancelablePromise(token => getCodeActions(model, selection, trigger, token));
 
 			if (this._progressService && trigger.type === 'manual') {
-				this._progressService.showWhile(actions, 250);
+				this._progressService.showWhile(TPromise.wrap(actions), 250);
 			}
 
 			this._signalChange({
@@ -134,7 +138,7 @@ export interface CodeActionsComputeEvent {
 	trigger: CodeActionTrigger;
 	rangeOrSelection: Range | Selection;
 	position: Position;
-	actions: TPromise<CodeAction[]>;
+	actions: CancelablePromise<CodeAction[]>;
 }
 
 export class CodeActionModel {
@@ -196,7 +200,7 @@ export class CodeActionModel {
 		}
 	}
 
-	trigger(trigger: CodeActionTrigger): TPromise<CodeAction[] | undefined> {
+	trigger(trigger: CodeActionTrigger): Thenable<CodeAction[] | undefined> {
 		if (this._codeActionOracle) {
 			return this._codeActionOracle.trigger(trigger);
 		}
diff --git a/src/vs/editor/contrib/codeAction/codeActionTrigger.ts b/src/vs/editor/contrib/codeAction/codeActionTrigger.ts
index 4f3c53b5dc9..b8ed8cde8fc 100644
--- a/src/vs/editor/contrib/codeAction/codeActionTrigger.ts
+++ b/src/vs/editor/contrib/codeAction/codeActionTrigger.ts
@@ -9,6 +9,7 @@ export class CodeActionKind {
 	private static readonly sep = '.';
 
 	public static readonly Empty = new CodeActionKind('');
+	public static readonly QuickFix = new CodeActionKind('quickfix');
 	public static readonly Refactor = new CodeActionKind('refactor');
 	public static readonly Source = new CodeActionKind('source');
 	public static readonly SourceOrganizeImports = new CodeActionKind('source.organizeImports');
@@ -22,7 +23,7 @@ export class CodeActionKind {
 	}
 }
 
-export enum CodeActionAutoApply {
+export const enum CodeActionAutoApply {
 	IfSingle = 1,
 	First = 2,
 	Never = 3
diff --git a/src/vs/editor/contrib/codeAction/codeActionWidget.ts b/src/vs/editor/contrib/codeAction/codeActionWidget.ts
index 0020eca69a4..ebf9f659b0f 100644
--- a/src/vs/editor/contrib/codeAction/codeActionWidget.ts
+++ b/src/vs/editor/contrib/codeAction/codeActionWidget.ts
@@ -28,9 +28,9 @@ export class CodeActionContextMenu {
 		private readonly _onApplyCodeAction: (action: CodeAction) => TPromise<any>
 	) { }
 
-	show(fixes: TPromise<CodeAction[]>, at: { x: number; y: number } | Position) {
+	show(fixes: Thenable<CodeAction[]>, at: { x: number; y: number } | Position) {
 
-		const actions = fixes.then(value => {
+		const actions = fixes ? fixes.then(value => {
 			return value.map(action => {
 				return new Action(action.command ? action.command.id : action.title, action.title, undefined, true, () => {
 					return always(
@@ -41,10 +41,10 @@ export class CodeActionContextMenu {
 		}).then(actions => {
 			if (!this._editor.getDomNode()) {
 				// cancel when editor went off-dom
-				return TPromise.wrapError<any>(canceled());
+				return TPromise.wrapError<Action[]>(canceled());
 			}
 			return actions;
-		});
+		}) : TPromise.as([] as Action[]);
 
 		this._contextMenuService.showContextMenu({
 			getAnchor: () => {
@@ -53,7 +53,7 @@ export class CodeActionContextMenu {
 				}
 				return at;
 			},
-			getActions: () => actions,
+			getActions: () => TPromise.wrap(actions),
 			onHide: () => {
 				this._visible = false;
 				this._editor.focus();
diff --git a/src/vs/editor/contrib/codeAction/lightBulbWidget.ts b/src/vs/editor/contrib/codeAction/lightBulbWidget.ts
index 61e18dd6bde..fe0c8eb7320 100644
--- a/src/vs/editor/contrib/codeAction/lightBulbWidget.ts
+++ b/src/vs/editor/contrib/codeAction/lightBulbWidget.ts
@@ -7,10 +7,11 @@ import * as dom from 'vs/base/browser/dom';
 import { GlobalMouseMoveMonitor, IStandardMouseMoveEventData, standardMouseMoveMerger } from 'vs/base/browser/globalMouseMoveMonitor';
 import { CancellationTokenSource } from 'vs/base/common/cancellation';
 import { Emitter, Event } from 'vs/base/common/event';
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
+import { dispose, IDisposable } from 'vs/base/common/lifecycle';
 import 'vs/css!./lightBulbWidget';
 import { ContentWidgetPositionPreference, ICodeEditor, IContentWidget, IContentWidgetPosition } from 'vs/editor/browser/editorBrowser';
 import { TextModel } from 'vs/editor/common/model/textModel';
+import { CodeActionKind } from 'vs/editor/contrib/codeAction/codeActionTrigger';
 import { CodeActionsComputeEvent } from './codeActionModel';
 
 export class LightBulbWidget implements IDisposable, IContentWidget {
@@ -52,7 +53,7 @@ export class LightBulbWidget implements IDisposable, IContentWidget {
 			const { lineHeight } = this._editor.getConfiguration();
 
 			let pad = Math.floor(lineHeight / 3);
-			if (this._position.position.lineNumber < this._model.position.lineNumber) {
+			if (this._position && this._position.position.lineNumber < this._model.position.lineNumber) {
 				pad += lineHeight;
 			}
 
@@ -114,13 +115,18 @@ export class LightBulbWidget implements IDisposable, IContentWidget {
 		const { token } = this._futureFixes;
 		this._model = value;
 
-		this._model.actions.done(fixes => {
+		const selection = this._model.rangeOrSelection;
+		this._model.actions.then(fixes => {
 			if (!token.isCancellationRequested && fixes && fixes.length > 0) {
-				this._show();
+				if (selection.isEmpty() && fixes.every(fix => fix.kind && CodeActionKind.Refactor.contains(fix.kind))) {
+					this.hide();
+				} else {
+					this._show();
+				}
 			} else {
 				this.hide();
 			}
-		}, err => {
+		}).catch(err => {
 			this.hide();
 		});
 	}
@@ -142,7 +148,7 @@ export class LightBulbWidget implements IDisposable, IContentWidget {
 		if (!config.contribInfo.lightbulbEnabled) {
 			return;
 		}
-		const { lineNumber } = this._model.position;
+		const { lineNumber, column } = this._model.position;
 		const model = this._editor.getModel();
 		if (!model) {
 			return;
@@ -152,13 +158,21 @@ export class LightBulbWidget implements IDisposable, IContentWidget {
 		const lineContent = model.getLineContent(lineNumber);
 		const indent = TextModel.computeIndentLevel(lineContent, tabSize);
 		const lineHasSpace = config.fontInfo.spaceWidth * indent > 22;
+		const isFolded = (lineNumber) => {
+			return lineNumber > 2 && this._editor.getTopForLineNumber(lineNumber) === this._editor.getTopForLineNumber(lineNumber - 1);
+		};
 
 		let effectiveLineNumber = lineNumber;
 		if (!lineHasSpace) {
-			if (lineNumber > 1) {
+			if (lineNumber > 1 && !isFolded(lineNumber - 1)) {
 				effectiveLineNumber -= 1;
-			} else {
+			} else if (!isFolded(lineNumber + 1)) {
 				effectiveLineNumber += 1;
+			} else if (column * config.fontInfo.spaceWidth < 22) {
+				// cannot show lightbulb above/below and showing
+				// it inline would overlay the cursor...
+				this.hide();
+				return;
 			}
 		}
 
diff --git a/src/vs/editor/contrib/codeAction/test/codeAction.test.ts b/src/vs/editor/contrib/codeAction/test/codeAction.test.ts
index c2cc03ff9da..024c360fcc0 100644
--- a/src/vs/editor/contrib/codeAction/test/codeAction.test.ts
+++ b/src/vs/editor/contrib/codeAction/test/codeAction.test.ts
@@ -5,14 +5,14 @@
 'use strict';
 
 import * as assert from 'assert';
-import URI from 'vs/base/common/uri';
-import { TextModel } from 'vs/editor/common/model/textModel';
-import { CodeActionProviderRegistry, LanguageIdentifier, CodeActionProvider, Command, WorkspaceEdit, ResourceTextEdit, CodeAction, CodeActionContext } from 'vs/editor/common/modes';
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
+import { dispose, IDisposable } from 'vs/base/common/lifecycle';
+import { URI } from 'vs/base/common/uri';
 import { Range } from 'vs/editor/common/core/range';
+import { TextModel } from 'vs/editor/common/model/textModel';
+import { CodeAction, CodeActionContext, CodeActionProvider, CodeActionProviderRegistry, Command, LanguageIdentifier, ResourceTextEdit, WorkspaceEdit } from 'vs/editor/common/modes';
 import { getCodeActions } from 'vs/editor/contrib/codeAction/codeAction';
 import { CodeActionKind } from 'vs/editor/contrib/codeAction/codeActionTrigger';
-import { MarkerSeverity, IMarkerData } from 'vs/platform/markers/common/markers';
+import { IMarkerData, MarkerSeverity } from 'vs/platform/markers/common/markers';
 
 suite('CodeAction', () => {
 
@@ -194,4 +194,27 @@ suite('CodeAction', () => {
 			assert.strictEqual(actions[0].title, 'a');
 		}
 	});
+
+	test('getCodeActions should not invoke code action providers filtered out by providedCodeActionKinds', async function () {
+		let wasInvoked = false;
+		const provider = new class implements CodeActionProvider {
+			provideCodeActions() {
+				wasInvoked = true;
+				return [];
+			}
+
+			providedCodeActionKinds = [CodeActionKind.Refactor.value];
+		};
+
+		disposables.push(CodeActionProviderRegistry.register('fooLang', provider));
+
+		const actions = await getCodeActions(model, new Range(1, 1, 2, 1), {
+			type: 'auto',
+			filter: {
+				kind: CodeActionKind.QuickFix
+			}
+		});
+		assert.strictEqual(actions.length, 0);
+		assert.strictEqual(wasInvoked, false);
+	});
 });
diff --git a/src/vs/editor/contrib/codeAction/test/codeActionModel.test.ts b/src/vs/editor/contrib/codeAction/test/codeActionModel.test.ts
index 97ec8e79436..9635415bafb 100644
--- a/src/vs/editor/contrib/codeAction/test/codeActionModel.test.ts
+++ b/src/vs/editor/contrib/codeAction/test/codeActionModel.test.ts
@@ -2,19 +2,23 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-'use strict';
 
 import * as assert from 'assert';
-import URI from 'vs/base/common/uri';
-import { TextModel } from 'vs/editor/common/model/textModel';
-import { createTestCodeEditor } from 'vs/editor/test/browser/testCodeEditor';
-import { MarkerService } from 'vs/platform/markers/common/markerService';
-import { CodeActionOracle } from 'vs/editor/contrib/codeAction/codeActionModel';
-import { CodeActionProviderRegistry, LanguageIdentifier } from 'vs/editor/common/modes';
-import { IDisposable } from 'vs/base/common/lifecycle';
+import { dispose, IDisposable } from 'vs/base/common/lifecycle';
+import { URI } from 'vs/base/common/uri';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
 import { Selection } from 'vs/editor/common/core/selection';
+import { TextModel } from 'vs/editor/common/model/textModel';
+import { CodeActionProviderRegistry, LanguageIdentifier } from 'vs/editor/common/modes';
+import { CodeActionOracle } from 'vs/editor/contrib/codeAction/codeActionModel';
+import { createTestCodeEditor } from 'vs/editor/test/browser/testCodeEditor';
+import { MarkerService } from 'vs/platform/markers/common/markerService';
 
+const testProvider = {
+	provideCodeActions() {
+		return [{ id: 'test-command', title: 'test', arguments: [] }];
+	}
+};
 suite('CodeAction', () => {
 
 	const languageIdentifier = new LanguageIdentifier('foo-lang', 3);
@@ -22,14 +26,10 @@ suite('CodeAction', () => {
 	let model: TextModel;
 	let markerService: MarkerService;
 	let editor: ICodeEditor;
-	let reg: IDisposable;
+	let disposables: IDisposable[];
 
 	setup(() => {
-		reg = CodeActionProviderRegistry.register(languageIdentifier.language, {
-			provideCodeActions() {
-				return [{ id: 'test-command', title: 'test', arguments: [] }];
-			}
-		});
+		disposables = [];
 		markerService = new MarkerService();
 		model = TextModel.createFromString('foobar  foo bar\nfarboo far boo', undefined, languageIdentifier, uri);
 		editor = createTestCodeEditor({ model: model });
@@ -37,13 +37,15 @@ suite('CodeAction', () => {
 	});
 
 	teardown(() => {
-		reg.dispose();
+		dispose(disposables);
 		editor.dispose();
 		model.dispose();
 		markerService.dispose();
 	});
 
 	test('Orcale -> marker added', done => {
+		const reg = CodeActionProviderRegistry.register(languageIdentifier.language, testProvider);
+		disposables.push(reg);
 
 		const oracle = new CodeActionOracle(editor, markerService, e => {
 			assert.equal(e.trigger.type, 'auto');
@@ -68,6 +70,8 @@ suite('CodeAction', () => {
 	});
 
 	test('Orcale -> position changed', () => {
+		const reg = CodeActionProviderRegistry.register(languageIdentifier.language, testProvider);
+		disposables.push(reg);
 
 		markerService.changeOne('fake', uri, [{
 			startLineNumber: 1, startColumn: 1, endLineNumber: 1, endColumn: 6,
@@ -96,11 +100,12 @@ suite('CodeAction', () => {
 	});
 
 	test('Lightbulb is in the wrong place, #29933', async function () {
-		let reg = CodeActionProviderRegistry.register(languageIdentifier.language, {
-			provideCodeActions(doc, _range) {
+		const reg = CodeActionProviderRegistry.register(languageIdentifier.language, {
+			provideCodeActions(_doc, _range) {
 				return [];
 			}
 		});
+		disposables.push(reg);
 
 		editor.getModel().setValue('// @ts-check\n2\ncon\n');
 
@@ -146,9 +151,33 @@ suite('CodeAction', () => {
 
 		// 	oracle.trigger('manual');
 		// });
-
-
-		reg.dispose();
 	});
 
+	test('Orcale -> should only auto trigger once for cursor and marker update right after each other', done => {
+		const reg = CodeActionProviderRegistry.register(languageIdentifier.language, testProvider);
+		disposables.push(reg);
+
+		let triggerCount = 0;
+		const oracle = new CodeActionOracle(editor, markerService, e => {
+			assert.equal(e.trigger.type, 'auto');
+			++triggerCount;
+
+			// give time for second trigger before completing test
+			setTimeout(() => {
+				oracle.dispose();
+				assert.strictEqual(triggerCount, 1);
+				done();
+			}, 50);
+		}, 5 /*delay*/);
+
+		markerService.changeOne('fake', uri, [{
+			startLineNumber: 1, startColumn: 1, endLineNumber: 1, endColumn: 6,
+			message: 'error',
+			severity: 1,
+			code: '',
+			source: ''
+		}]);
+
+		editor.setSelection({ startLineNumber: 1, startColumn: 1, endLineNumber: 4, endColumn: 1 });
+	});
 });
diff --git a/src/vs/editor/contrib/codelens/codelens.ts b/src/vs/editor/contrib/codelens/codelens.ts
index 92821ec5ee6..a80ad5d3680 100644
--- a/src/vs/editor/contrib/codelens/codelens.ts
+++ b/src/vs/editor/contrib/codelens/codelens.ts
@@ -7,13 +7,11 @@
 
 import { illegalArgument, onUnexpectedExternalError } from 'vs/base/common/errors';
 import { mergeSort } from 'vs/base/common/arrays';
-import URI from 'vs/base/common/uri';
-import { TPromise } from 'vs/base/common/winjs.base';
+import { URI } from 'vs/base/common/uri';
 import { ITextModel } from 'vs/editor/common/model';
 import { registerLanguageCommand } from 'vs/editor/browser/editorExtensions';
 import { CodeLensProviderRegistry, CodeLensProvider, ICodeLensSymbol } from 'vs/editor/common/modes';
 import { IModelService } from 'vs/editor/common/services/modelService';
-import { asWinJsPromise } from 'vs/base/common/async';
 import { CancellationToken } from 'vs/base/common/cancellation';
 
 export interface ICodeLensData {
@@ -21,20 +19,20 @@ export interface ICodeLensData {
 	provider: CodeLensProvider;
 }
 
-export function getCodeLensData(model: ITextModel): TPromise<ICodeLensData[]> {
+export function getCodeLensData(model: ITextModel, token: CancellationToken): Promise<ICodeLensData[]> {
 
 	const symbols: ICodeLensData[] = [];
 	const provider = CodeLensProviderRegistry.ordered(model);
 
-	const promises = provider.map(provider => asWinJsPromise(token => provider.provideCodeLenses(model, token)).then(result => {
+	const promises = provider.map(provider => Promise.resolve(provider.provideCodeLenses(model, token)).then(result => {
 		if (Array.isArray(result)) {
 			for (let symbol of result) {
 				symbols.push({ symbol, provider });
 			}
 		}
-	}, onUnexpectedExternalError));
+	}).catch(onUnexpectedExternalError));
 
-	return TPromise.join(promises).then(() => {
+	return Promise.all(promises).then(() => {
 
 		return mergeSort(symbols, (a, b) => {
 			// sort by lineNumber, provider-rank, and column
@@ -70,7 +68,7 @@ registerLanguageCommand('_executeCodeLensProvider', function (accessor, args) {
 	}
 
 	const result: ICodeLensSymbol[] = [];
-	return getCodeLensData(model).then(value => {
+	return getCodeLensData(model, CancellationToken.None).then(value => {
 
 		let resolve: Thenable<any>[] = [];
 
diff --git a/src/vs/editor/contrib/codelens/codelensController.ts b/src/vs/editor/contrib/codelens/codelensController.ts
index 0cd0fb98162..23fde7dc577 100644
--- a/src/vs/editor/contrib/codelens/codelensController.ts
+++ b/src/vs/editor/contrib/codelens/codelensController.ts
@@ -5,21 +5,20 @@
 
 'use strict';
 
-import { RunOnceScheduler, asWinJsPromise } from 'vs/base/common/async';
+import { CancelablePromise, createCancelablePromise, RunOnceScheduler } from 'vs/base/common/async';
 import { onUnexpectedError } from 'vs/base/common/errors';
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
-import { TPromise } from 'vs/base/common/winjs.base';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import * as editorCommon from 'vs/editor/common/editorCommon';
-import { CodeLensProviderRegistry, ICodeLensSymbol } from 'vs/editor/common/modes';
+import { dispose, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
+import { StableEditorScrollState } from 'vs/editor/browser/core/editorState';
 import * as editorBrowser from 'vs/editor/browser/editorBrowser';
 import { registerEditorContribution } from 'vs/editor/browser/editorExtensions';
-import { ICodeLensData, getCodeLensData } from './codelens';
 import { IConfigurationChangedEvent } from 'vs/editor/common/config/editorOptions';
-import { CodeLens, CodeLensHelper } from 'vs/editor/contrib/codelens/codelensWidget';
+import * as editorCommon from 'vs/editor/common/editorCommon';
 import { IModelDecorationsChangeAccessor } from 'vs/editor/common/model';
+import { CodeLensProviderRegistry, ICodeLensSymbol } from 'vs/editor/common/modes';
+import { CodeLens, CodeLensHelper } from 'vs/editor/contrib/codelens/codelensWidget';
+import { ICommandService } from 'vs/platform/commands/common/commands';
 import { INotificationService } from 'vs/platform/notification/common/notification';
-import { StableEditorScrollState } from 'vs/editor/browser/core/editorState';
+import { getCodeLensData, ICodeLensData } from './codelens';
 
 export class CodeLensContribution implements editorCommon.IEditorContribution {
 
@@ -30,9 +29,9 @@ export class CodeLensContribution implements editorCommon.IEditorContribution {
 	private _globalToDispose: IDisposable[];
 	private _localToDispose: IDisposable[];
 	private _lenses: CodeLens[];
-	private _currentFindCodeLensSymbolsPromise: TPromise<ICodeLensData[]>;
+	private _currentFindCodeLensSymbolsPromise: CancelablePromise<ICodeLensData[]>;
 	private _modelChangeCounter: number;
-	private _currentFindOccPromise: TPromise<any>;
+	private _currentResolveCodeLensSymbolsPromise: CancelablePromise<any>;
 	private _detectVisibleLenses: RunOnceScheduler;
 
 	constructor(
@@ -72,9 +71,9 @@ export class CodeLensContribution implements editorCommon.IEditorContribution {
 			this._currentFindCodeLensSymbolsPromise = null;
 			this._modelChangeCounter++;
 		}
-		if (this._currentFindOccPromise) {
-			this._currentFindOccPromise.cancel();
-			this._currentFindOccPromise = null;
+		if (this._currentResolveCodeLensSymbolsPromise) {
+			this._currentResolveCodeLensSymbolsPromise.cancel();
+			this._currentResolveCodeLensSymbolsPromise = null;
 		}
 		this._localToDispose = dispose(this._localToDispose);
 	}
@@ -117,7 +116,7 @@ export class CodeLensContribution implements editorCommon.IEditorContribution {
 				this._currentFindCodeLensSymbolsPromise.cancel();
 			}
 
-			this._currentFindCodeLensSymbolsPromise = getCodeLensData(model);
+			this._currentFindCodeLensSymbolsPromise = createCancelablePromise(token => getCodeLensData(model, token));
 
 			this._currentFindCodeLensSymbolsPromise.then((result) => {
 				if (counterValue === this._modelChangeCounter) { // only the last one wins
@@ -168,22 +167,20 @@ export class CodeLensContribution implements editorCommon.IEditorContribution {
 		this._localToDispose.push(this._editor.onDidLayoutChange(e => {
 			this._detectVisibleLenses.schedule();
 		}));
-		this._localToDispose.push({
-			dispose: () => {
-				if (this._editor.getModel()) {
-					const scrollState = StableEditorScrollState.capture(this._editor);
-					this._editor.changeDecorations((changeAccessor) => {
-						this._editor.changeViewZones((accessor) => {
-							this._disposeAllLenses(changeAccessor, accessor);
-						});
+		this._localToDispose.push(toDisposable(() => {
+			if (this._editor.getModel()) {
+				const scrollState = StableEditorScrollState.capture(this._editor);
+				this._editor.changeDecorations((changeAccessor) => {
+					this._editor.changeViewZones((accessor) => {
+						this._disposeAllLenses(changeAccessor, accessor);
 					});
-					scrollState.restore(this._editor);
-				} else {
-					// No accessors available
-					this._disposeAllLenses(null, null);
-				}
+				});
+				scrollState.restore(this._editor);
+			} else {
+				// No accessors available
+				this._disposeAllLenses(null, null);
 			}
-		});
+		}));
 
 		scheduler.schedule();
 	}
@@ -267,9 +264,9 @@ export class CodeLensContribution implements editorCommon.IEditorContribution {
 	}
 
 	private _onViewportChanged(): void {
-		if (this._currentFindOccPromise) {
-			this._currentFindOccPromise.cancel();
-			this._currentFindOccPromise = null;
+		if (this._currentResolveCodeLensSymbolsPromise) {
+			this._currentResolveCodeLensSymbolsPromise.cancel();
+			this._currentResolveCodeLensSymbolsPromise = null;
 		}
 
 		const model = this._editor.getModel();
@@ -291,28 +288,34 @@ export class CodeLensContribution implements editorCommon.IEditorContribution {
 			return;
 		}
 
-		const promises = toResolve.map((request, i) => {
+		this._currentResolveCodeLensSymbolsPromise = createCancelablePromise(token => {
 
-			const resolvedSymbols = new Array<ICodeLensSymbol>(request.length);
-			const promises = request.map((request, i) => {
-				if (typeof request.provider.resolveCodeLens === 'function') {
-					return asWinJsPromise((token) => {
-						return request.provider.resolveCodeLens(model, request.symbol, token);
-					}).then(symbol => {
-						resolvedSymbols[i] = symbol;
-					});
-				}
-				resolvedSymbols[i] = request.symbol;
-				return TPromise.as(void 0);
+			const promises = toResolve.map((request, i) => {
+
+				const resolvedSymbols = new Array<ICodeLensSymbol>(request.length);
+				const promises = request.map((request, i) => {
+					if (typeof request.provider.resolveCodeLens === 'function') {
+						return Promise.resolve(request.provider.resolveCodeLens(model, request.symbol, token)).then(symbol => {
+							resolvedSymbols[i] = symbol;
+						});
+					}
+					resolvedSymbols[i] = request.symbol;
+					return Promise.resolve(void 0);
+				});
+
+				return Promise.all(promises).then(() => {
+					lenses[i].updateCommands(resolvedSymbols);
+				});
 			});
 
-			return TPromise.join(promises).then(() => {
-				lenses[i].updateCommands(resolvedSymbols);
-			});
+			return Promise.all(promises);
 		});
 
-		this._currentFindOccPromise = TPromise.join(promises).then(() => {
-			this._currentFindOccPromise = null;
+		this._currentResolveCodeLensSymbolsPromise.then(() => {
+			this._currentResolveCodeLensSymbolsPromise = null;
+		}).catch(err => {
+			this._currentResolveCodeLensSymbolsPromise = null;
+			onUnexpectedError(err);
 		});
 	}
 }
diff --git a/src/vs/editor/contrib/codelens/codelensWidget.ts b/src/vs/editor/contrib/codelens/codelensWidget.ts
index 72475e905c0..1d5b1e08cc8 100644
--- a/src/vs/editor/contrib/codelens/codelensWidget.ts
+++ b/src/vs/editor/contrib/codelens/codelensWidget.ts
@@ -93,7 +93,7 @@ class CodeLensContentWidget implements editorBrowser.IContentWidget {
 				let command = this._commands[element.id];
 				if (command) {
 					editor.focus();
-					commandService.executeCommand(command.id, ...command.arguments).done(undefined, err => {
+					commandService.executeCommand(command.id, ...command.arguments).then(undefined, err => {
 						notificationService.error(err);
 					});
 				}
diff --git a/src/vs/editor/contrib/colorPicker/color.ts b/src/vs/editor/contrib/colorPicker/color.ts
index e3f8d687510..b9d0c40de8e 100644
--- a/src/vs/editor/contrib/colorPicker/color.ts
+++ b/src/vs/editor/contrib/colorPicker/color.ts
@@ -3,16 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 
 import { TPromise } from 'vs/base/common/winjs.base';
 import { ColorProviderRegistry, DocumentColorProvider, IColorInformation, IColorPresentation } from 'vs/editor/common/modes';
-import { asWinJsPromise } from 'vs/base/common/async';
 import { ITextModel } from 'vs/editor/common/model';
 import { registerLanguageCommand } from 'vs/editor/browser/editorExtensions';
 import { Range, IRange } from 'vs/editor/common/core/range';
 import { illegalArgument } from 'vs/base/common/errors';
 import { IModelService } from 'vs/editor/common/services/modelService';
+import { CancellationToken } from 'vs/base/common/cancellation';
 
 
 export interface IColorData {
@@ -20,10 +20,10 @@ export interface IColorData {
 	provider: DocumentColorProvider;
 }
 
-export function getColors(model: ITextModel): TPromise<IColorData[]> {
+export function getColors(model: ITextModel, token: CancellationToken): Promise<IColorData[]> {
 	const colors: IColorData[] = [];
 	const providers = ColorProviderRegistry.ordered(model).reverse();
-	const promises = providers.map(provider => asWinJsPromise(token => provider.provideDocumentColors(model, token)).then(result => {
+	const promises = providers.map(provider => Promise.resolve(provider.provideDocumentColors(model, token)).then(result => {
 		if (Array.isArray(result)) {
 			for (let colorInfo of result) {
 				colors.push({ colorInfo, provider });
@@ -31,11 +31,11 @@ export function getColors(model: ITextModel): TPromise<IColorData[]> {
 		}
 	}));
 
-	return TPromise.join(promises).then(() => colors);
+	return Promise.all(promises).then(() => colors);
 }
 
-export function getColorPresentations(model: ITextModel, colorInfo: IColorInformation, provider: DocumentColorProvider): TPromise<IColorPresentation[]> {
-	return asWinJsPromise(token => provider.provideColorPresentations(model, colorInfo, token));
+export function getColorPresentations(model: ITextModel, colorInfo: IColorInformation, provider: DocumentColorProvider, token: CancellationToken): Promise<IColorPresentation[]> {
+	return Promise.resolve(provider.provideColorPresentations(model, colorInfo, token));
 }
 
 registerLanguageCommand('_executeDocumentColorProvider', function (accessor, args) {
@@ -52,7 +52,7 @@ registerLanguageCommand('_executeDocumentColorProvider', function (accessor, arg
 
 	const rawCIs: { range: IRange, color: [number, number, number, number] }[] = [];
 	const providers = ColorProviderRegistry.ordered(model).reverse();
-	const promises = providers.map(provider => asWinJsPromise(token => provider.provideDocumentColors(model, token)).then(result => {
+	const promises = providers.map(provider => Promise.resolve(provider.provideDocumentColors(model, CancellationToken.None)).then(result => {
 		if (Array.isArray(result)) {
 			for (let ci of result) {
 				rawCIs.push({ range: ci.range, color: [ci.color.red, ci.color.green, ci.color.blue, ci.color.alpha] });
@@ -84,7 +84,7 @@ registerLanguageCommand('_executeColorPresentationProvider', function (accessor,
 
 	const presentations: IColorPresentation[] = [];
 	const providers = ColorProviderRegistry.ordered(model).reverse();
-	const promises = providers.map(provider => asWinJsPromise(token => provider.provideColorPresentations(model, colorInfo, token)).then(result => {
+	const promises = providers.map(provider => Promise.resolve(provider.provideColorPresentations(model, colorInfo, CancellationToken.None)).then(result => {
 		if (Array.isArray(result)) {
 			presentations.push(...result);
 		}
diff --git a/src/vs/editor/contrib/colorPicker/colorDetector.ts b/src/vs/editor/contrib/colorPicker/colorDetector.ts
index 97fbb7b8852..a676d0e8c36 100644
--- a/src/vs/editor/contrib/colorPicker/colorDetector.ts
+++ b/src/vs/editor/contrib/colorPicker/colorDetector.ts
@@ -6,7 +6,6 @@
 import { RGBA } from 'vs/base/common/color';
 import { hash } from 'vs/base/common/hash';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
-import { TPromise } from 'vs/base/common/winjs.base';
 import { IEditorContribution } from 'vs/editor/common/editorCommon';
 import { registerEditorContribution } from 'vs/editor/browser/editorExtensions';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
@@ -17,6 +16,8 @@ import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService
 import { getColors, IColorData } from 'vs/editor/contrib/colorPicker/color';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { ModelDecorationOptions } from 'vs/editor/common/model/textModel';
+import { TimeoutTimer, CancelablePromise, createCancelablePromise } from 'vs/base/common/async';
+import { onUnexpectedError } from 'vs/base/common/errors';
 
 const MAX_DECORATORS = 500;
 
@@ -28,8 +29,8 @@ export class ColorDetector implements IEditorContribution {
 
 	private _globalToDispose: IDisposable[] = [];
 	private _localToDispose: IDisposable[] = [];
-	private _computePromise: TPromise<void>;
-	private _timeoutPromise: TPromise<void>;
+	private _computePromise: CancelablePromise<IColorData[]>;
+	private _timeoutTimer: TimeoutTimer;
 
 	private _decorationsIds: string[] = [];
 	private _colorDatas = new Map<string, IColorData>();
@@ -61,7 +62,7 @@ export class ColorDetector implements IEditorContribution {
 			}
 		}));
 
-		this._timeoutPromise = null;
+		this._timeoutTimer = null;
 		this._computePromise = null;
 		this._isEnabled = this.isEnabled();
 		this.onModelChanged();
@@ -115,29 +116,30 @@ export class ColorDetector implements IEditorContribution {
 		}
 
 		this._localToDispose.push(this._editor.onDidChangeModelContent((e) => {
-			if (!this._timeoutPromise) {
-				this._timeoutPromise = TPromise.timeout(ColorDetector.RECOMPUTE_TIME);
-				this._timeoutPromise.then(() => {
-					this._timeoutPromise = null;
+			if (!this._timeoutTimer) {
+				this._timeoutTimer = new TimeoutTimer();
+				this._timeoutTimer.cancelAndSet(() => {
+					this._timeoutTimer = null;
 					this.beginCompute();
-				});
+				}, ColorDetector.RECOMPUTE_TIME);
 			}
 		}));
 		this.beginCompute();
 	}
 
 	private beginCompute(): void {
-		this._computePromise = getColors(this._editor.getModel()).then(colorInfos => {
+		this._computePromise = createCancelablePromise(token => getColors(this._editor.getModel(), token));
+		this._computePromise.then((colorInfos) => {
 			this.updateDecorations(colorInfos);
 			this.updateColorDecorators(colorInfos);
 			this._computePromise = null;
-		});
+		}, onUnexpectedError);
 	}
 
 	private stop(): void {
-		if (this._timeoutPromise) {
-			this._timeoutPromise.cancel();
-			this._timeoutPromise = null;
+		if (this._timeoutTimer) {
+			this._timeoutTimer.cancel();
+			this._timeoutTimer = null;
 		}
 		if (this._computePromise) {
 			this._computePromise.cancel();
diff --git a/src/vs/editor/contrib/comment/comment.ts b/src/vs/editor/contrib/comment/comment.ts
index b570ff1f041..264e8527e52 100644
--- a/src/vs/editor/contrib/comment/comment.ts
+++ b/src/vs/editor/contrib/comment/comment.ts
@@ -12,6 +12,8 @@ import { registerEditorAction, IActionOptions, EditorAction, ServicesAccessor }
 import { BlockCommentCommand } from './blockCommentCommand';
 import { LineCommentCommand, Type } from './lineCommentCommand';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
+import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
+import { MenuId } from 'vs/platform/actions/common/actions';
 
 abstract class CommentLineAction extends EditorAction {
 
@@ -52,7 +54,14 @@ class ToggleCommentLineAction extends CommentLineAction {
 			precondition: EditorContextKeys.writable,
 			kbOpts: {
 				kbExpr: EditorContextKeys.editorTextFocus,
-				primary: KeyMod.CtrlCmd | KeyCode.US_SLASH
+				primary: KeyMod.CtrlCmd | KeyCode.US_SLASH,
+				weight: KeybindingWeight.EditorContrib
+			},
+			menubarOpts: {
+				menuId: MenuId.MenubarEditMenu,
+				group: '5_insert',
+				title: nls.localize({ key: 'miToggleLineComment', comment: ['&& denotes a mnemonic'] }, "&&Toggle Line Comment"),
+				order: 1
 			}
 		});
 	}
@@ -67,7 +76,8 @@ class AddLineCommentAction extends CommentLineAction {
 			precondition: EditorContextKeys.writable,
 			kbOpts: {
 				kbExpr: EditorContextKeys.editorTextFocus,
-				primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_K, KeyMod.CtrlCmd | KeyCode.KEY_C)
+				primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_K, KeyMod.CtrlCmd | KeyCode.KEY_C),
+				weight: KeybindingWeight.EditorContrib
 			}
 		});
 	}
@@ -82,7 +92,8 @@ class RemoveLineCommentAction extends CommentLineAction {
 			precondition: EditorContextKeys.writable,
 			kbOpts: {
 				kbExpr: EditorContextKeys.editorTextFocus,
-				primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_K, KeyMod.CtrlCmd | KeyCode.KEY_U)
+				primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_K, KeyMod.CtrlCmd | KeyCode.KEY_U),
+				weight: KeybindingWeight.EditorContrib
 			}
 		});
 	}
@@ -99,7 +110,14 @@ class BlockCommentAction extends EditorAction {
 			kbOpts: {
 				kbExpr: EditorContextKeys.editorTextFocus,
 				primary: KeyMod.Shift | KeyMod.Alt | KeyCode.KEY_A,
-				linux: { primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KEY_A }
+				linux: { primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KEY_A },
+				weight: KeybindingWeight.EditorContrib
+			},
+			menubarOpts: {
+				menuId: MenuId.MenubarEditMenu,
+				group: '5_insert',
+				title: nls.localize({ key: 'miToggleBlockComment', comment: ['&& denotes a mnemonic'] }, "Toggle &&Block Comment"),
+				order: 2
 			}
 		});
 	}
diff --git a/src/vs/editor/contrib/contextmenu/contextmenu.ts b/src/vs/editor/contrib/contextmenu/contextmenu.ts
index abdc0f2abd0..75de2e1c6d1 100644
--- a/src/vs/editor/contrib/contextmenu/contextmenu.ts
+++ b/src/vs/editor/contrib/contextmenu/contextmenu.ts
@@ -20,6 +20,7 @@ import { IEditorContribution, IScrollEvent, ScrollType } from 'vs/editor/common/
 import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
 import { registerEditorAction, registerEditorContribution, ServicesAccessor, EditorAction } from 'vs/editor/browser/editorExtensions';
 import { ICodeEditor, IEditorMouseEvent, MouseTargetType } from 'vs/editor/browser/editorBrowser';
+import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
 
 export interface IPosition {
 	x: number;
@@ -142,7 +143,9 @@ export class ContextMenuController implements IEditorContribution {
 		// Disable hover
 		const oldHoverSetting = this._editor.getConfiguration().contribInfo.hover;
 		this._editor.updateOptions({
-			hover: false
+			hover: {
+				enabled: false
+			}
 		});
 
 		let menuPosition = forcedPosition;
@@ -225,7 +228,8 @@ class ShowContextMenu extends EditorAction {
 			precondition: null,
 			kbOpts: {
 				kbExpr: EditorContextKeys.textInputFocus,
-				primary: KeyMod.Shift | KeyCode.F10
+				primary: KeyMod.Shift | KeyCode.F10,
+				weight: KeybindingWeight.EditorContrib
 			}
 		});
 	}
diff --git a/src/vs/editor/contrib/cursorUndo/cursorUndo.ts b/src/vs/editor/contrib/cursorUndo/cursorUndo.ts
index d302c030d77..cd80e4025a1 100644
--- a/src/vs/editor/contrib/cursorUndo/cursorUndo.ts
+++ b/src/vs/editor/contrib/cursorUndo/cursorUndo.ts
@@ -12,6 +12,7 @@ import { Disposable } from 'vs/base/common/lifecycle';
 import { IEditorContribution, ScrollType } from 'vs/editor/common/editorCommon';
 import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
+import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
 
 class CursorState {
 	readonly selections: Selection[];
@@ -113,12 +114,13 @@ export class CursorUndo extends EditorAction {
 	constructor() {
 		super({
 			id: 'cursorUndo',
-			label: nls.localize('cursor.undo', "Remove Selection of Last Find Match"),
-			alias: 'Remove Selection of Last Find Match',
+			label: nls.localize('cursor.undo', "Soft Undo"),
+			alias: 'Soft Undo',
 			precondition: null,
 			kbOpts: {
 				kbExpr: EditorContextKeys.textInputFocus,
-				primary: KeyMod.CtrlCmd | KeyCode.KEY_U
+				primary: KeyMod.CtrlCmd | KeyCode.KEY_U,
+				weight: KeybindingWeight.EditorContrib
 			}
 		});
 	}
diff --git a/src/vs/editor/contrib/dnd/dnd.ts b/src/vs/editor/contrib/dnd/dnd.ts
index 3d028223cee..e639b6aea8f 100644
--- a/src/vs/editor/contrib/dnd/dnd.ts
+++ b/src/vs/editor/contrib/dnd/dnd.ts
@@ -54,12 +54,20 @@ export class DragAndDropController implements editorCommon.IEditorContribution {
 		this._toUnhook.push(this._editor.onMouseDrop((e: IEditorMouseEvent) => this._onEditorMouseDrop(e)));
 		this._toUnhook.push(this._editor.onKeyDown((e: IKeyboardEvent) => this.onEditorKeyDown(e)));
 		this._toUnhook.push(this._editor.onKeyUp((e: IKeyboardEvent) => this.onEditorKeyUp(e)));
+		this._toUnhook.push(this._editor.onDidBlurEditorWidget(() => this.onEditorBlur()));
 		this._dndDecorationIds = [];
 		this._mouseDown = false;
 		this._modiferPressed = false;
 		this._dragSelection = null;
 	}
 
+	private onEditorBlur() {
+		this._removeDecoration();
+		this._dragSelection = null;
+		this._mouseDown = false;
+		this._modiferPressed = false;
+	}
+
 	private onEditorKeyDown(e: IKeyboardEvent): void {
 		if (!this._editor.getConfiguration().dragAndDrop) {
 			return;
@@ -140,8 +148,8 @@ export class DragAndDropController implements editorCommon.IEditorContribution {
 			if (this._dragSelection === null) {
 				if (mouseEvent.event.shiftKey) {
 					let primarySelection = this._editor.getSelection();
-					let { startLineNumber, startColumn } = primarySelection;
-					this._editor.setSelections([new Selection(startLineNumber, startColumn, newCursorPosition.lineNumber, newCursorPosition.column)]);
+					let { selectionStartLineNumber, selectionStartColumn } = primarySelection;
+					this._editor.setSelections([new Selection(selectionStartLineNumber, selectionStartColumn, newCursorPosition.lineNumber, newCursorPosition.column)]);
 				} else {
 					let newSelections = this._editor.getSelections().map(selection => {
 						if (selection.containsPosition(newCursorPosition)) {
diff --git a/src/vs/editor/contrib/documentSymbols/media/BooleanData_16x.svg b/src/vs/editor/contrib/documentSymbols/media/BooleanData_16x.svg
new file mode 100644
index 00000000000..d9fd295d0b6
--- /dev/null
+++ b/src/vs/editor/contrib/documentSymbols/media/BooleanData_16x.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><style>.icon-canvas-transparent{opacity:0;fill:#f6f6f6}.icon-vs-out{fill:#f6f6f6}.icon-vs-bg{fill:#424242}.icon-vs-fg{fill:#f0eff1}</style><path class="icon-canvas-transparent" d="M16 16H0V0h16v16z" id="canvas"/><path class="icon-vs-out" d="M16 14H0V2h16v12z" id="outline"/><path class="icon-vs-bg" d="M1 3v10h14V3H1zm13 9H8V8.507l3.998.006-2.121 2.129.707.707 3.35-3.35-3.35-3.338-.707.706 2.138 2.146L8 7.507V4h6v8z" id="iconBg"/><path class="icon-vs-fg" d="M14 4v8H8V8.507l3.998.006-2.121 2.129.707.707 3.35-3.35-3.35-3.338-.707.706 2.138 2.146L8 7.507V4h6zM6.057 5.367L5.35 4.66 2 8.01l3.35 3.338.707-.707-2.139-2.146L8 8.501v-1l-4.064-.005 2.121-2.129z" id="iconFg"/></svg>
\ No newline at end of file
diff --git a/src/vs/editor/contrib/documentSymbols/media/BooleanData_16x_darkp.svg b/src/vs/editor/contrib/documentSymbols/media/BooleanData_16x_darkp.svg
new file mode 100644
index 00000000000..48e8c5a3838
--- /dev/null
+++ b/src/vs/editor/contrib/documentSymbols/media/BooleanData_16x_darkp.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><style>.icon-canvas-transparent{opacity:0;fill:#252526}.icon-vs-out{fill:#252526}.icon-vs-bg{fill:#c5c5c5}.icon-vs-fg{fill:#2a292c}</style><path class="icon-canvas-transparent" d="M16 16H0V0h16v16z" id="canvas"/><path class="icon-vs-out" d="M16 14H0V2h16v12z" id="outline"/><path class="icon-vs-bg" d="M1 3v10h14V3H1zm13 9H8V8.507l3.998.006-2.121 2.129.707.707 3.35-3.35-3.35-3.338-.707.706 2.138 2.146L8 7.507V4h6v8z" id="iconBg"/><path class="icon-vs-fg" d="M14 4v8H8V8.507l3.998.006-2.121 2.129.707.707 3.35-3.35-3.35-3.338-.707.706 2.138 2.146L8 7.507V4h6zM6.057 5.367L5.35 4.66 2 8.01l3.35 3.338.707-.707-2.139-2.146L8 8.501v-1l-4.064-.005 2.121-2.129z" id="iconFg"/></svg>
\ No newline at end of file
diff --git a/src/vs/editor/contrib/documentSymbols/media/Class_16x.svg b/src/vs/editor/contrib/documentSymbols/media/Class_16x.svg
new file mode 100644
index 00000000000..e553c3633e5
--- /dev/null
+++ b/src/vs/editor/contrib/documentSymbols/media/Class_16x.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><style>.icon-canvas-transparent{opacity:0;fill:#f6f6f6}.icon-vs-out{fill:#f6f6f6}.icon-vs-action-orange{fill:#c27d1a}</style><g id="canvas"><path id="XMLID_1_" class="icon-canvas-transparent" d="M16 16H0V0h16v16z"/></g><path class="icon-vs-out" d="M16 6.586l-3-3L11.586 5H9.414l1-1-4-4h-.828L0 5.586v.828l4 4L6.414 8H7v5h1.586l3 3h.828L16 12.414v-.828L13.914 9.5 16 7.414v-.828z" id="outline"/><g id="iconBg"><path class="icon-vs-action-orange" d="M13 10l2 2-3 3-2-2 1-1H8V7H6L4 9 1 6l5-5 3 3-2 2h5l1-1 2 2-3 3-2-2 1-1H9v4l2.999.002L13 10z"/></g></svg>
\ No newline at end of file
diff --git a/src/vs/editor/contrib/documentSymbols/media/Class_16x_darkp.svg b/src/vs/editor/contrib/documentSymbols/media/Class_16x_darkp.svg
new file mode 100644
index 00000000000..c43aad29efd
--- /dev/null
+++ b/src/vs/editor/contrib/documentSymbols/media/Class_16x_darkp.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><style>.icon-canvas-transparent{opacity:0;fill:#2d2d30}.icon-vs-out{fill:#2d2d30}.icon-vs-action-orange{fill:#e8ab53}</style><path class="icon-canvas-transparent" d="M16 16H0V0h16v16z" id="canvas"/><path class="icon-vs-out" d="M16 6.586l-3-3L11.586 5H9.414l1-1-4-4h-.828L0 5.586v.828l4 4L6.414 8H7v5h1.586l3 3h.828L16 12.414v-.828L13.914 9.5 16 7.414v-.828z" id="outline"/><path class="icon-vs-action-orange" d="M13 10l2 2-3 3-2-2 1-1H8V7H6L4 9 1 6l5-5 3 3-2 2h5l1-1 2 2-3 3-2-2 1-1H9v4l2.999.002L13 10z" id="iconBg"/></svg>
\ No newline at end of file
diff --git a/src/vs/editor/contrib/documentSymbols/media/ColorPalette_ColorPalette_16x.svg b/src/vs/editor/contrib/documentSymbols/media/ColorPalette_ColorPalette_16x.svg
new file mode 100644
index 00000000000..2af5cc6faef
--- /dev/null
+++ b/src/vs/editor/contrib/documentSymbols/media/ColorPalette_ColorPalette_16x.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><style>.icon-canvas-transparent{opacity:0;fill:#f6f6f6}.icon-vs-out{fill:#f6f6f6}.icon-vs-bg{fill:#424242}.icon-vs-red{fill:#e51400}.icon-vs-yellow{fill:#ffcc00}.icon-vs-green{fill:#339933}.icon-vs-blue{fill:#1ba1e2}.icon-vs-action-purple{fill:#652d90}.icon-white{fill:#ffffff}</style><path class="icon-canvas-transparent" d="M16 16H0V0h16v16z" id="canvas"/><path class="icon-vs-out" d="M16 8c0 4.411-3.589 8-8 8a2.803 2.803 0 0 1-2.8-2.8c0-.833.272-1.629.766-2.241a.596.596 0 0 0 .101-.359.667.667 0 0 0-.667-.666.58.58 0 0 0-.358.102A3.584 3.584 0 0 1 2.8 10.8 2.803 2.803 0 0 1 0 8c0-4.411 3.589-8 8-8s8 3.589 8 8z" id="outline"/><path class="icon-white" d="M5.4 7.933a2.67 2.67 0 0 1 2.667 2.666c0 .606-.193 1.179-.544 1.614a1.599 1.599 0 0 0-.323.987.8.8 0 0 0 .8.8c3.309 0 6-2.691 6-6s-2.691-6-6-6-6 2.691-6 6c0 .441.359.8.8.8.378 0 .729-.114.986-.322A2.568 2.568 0 0 1 5.4 7.933z" id="iconFg"/><g id="iconBg"><path class="icon-vs-bg" d="M8 15c-.992 0-1.8-.808-1.8-1.8 0-.606.193-1.179.544-1.613.208-.259.323-.609.323-.987 0-.919-.748-1.666-1.667-1.666-.377 0-.728.115-.986.323A2.58 2.58 0 0 1 2.8 9.8C1.808 9.8 1 8.992 1 8c0-3.86 3.14-7 7-7 3.859 0 7 3.14 7 7 0 3.859-3.141 7-7 7zM5.4 7.933a2.67 2.67 0 0 1 2.667 2.666c0 .606-.193 1.179-.544 1.614a1.599 1.599 0 0 0-.323.987.8.8 0 0 0 .8.8c3.309 0 6-2.691 6-6s-2.691-6-6-6-6 2.691-6 6c0 .441.359.8.8.8.378 0 .729-.114.986-.322A2.568 2.568 0 0 1 5.4 7.933z"/><path class="icon-vs-action-purple" d="M4.5 5.375a.875.875 0 1 0 0 1.75.875.875 0 0 0 0-1.75z"/><path class="icon-vs-blue" d="M7.125 3.625a.875.875 0 1 0 0 1.75.875.875 0 0 0 0-1.75z"/><path class="icon-vs-green" d="M10.625 4.5a.875.875 0 1 0 0 1.75.875.875 0 0 0 0-1.75z"/><path class="icon-vs-yellow" d="M11.5 8a.875.875 0 1 0 0 1.75.875.875 0 0 0 0-1.75z"/><path class="icon-vs-red" d="M9.75 10.625a.875.875 0 1 0 0 1.75.875.875 0 0 0 0-1.75z"/></g></svg>
\ No newline at end of file
diff --git a/src/vs/editor/contrib/documentSymbols/media/ColorPalette_ColorPalette_16x_darkp.svg b/src/vs/editor/contrib/documentSymbols/media/ColorPalette_ColorPalette_16x_darkp.svg
new file mode 100644
index 00000000000..a2df3032cb1
--- /dev/null
+++ b/src/vs/editor/contrib/documentSymbols/media/ColorPalette_ColorPalette_16x_darkp.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><style>.icon-canvas-transparent{opacity:0;fill:#252526}.icon-vs-out{fill:#252526}.icon-vs-bg{fill:#c5c5c5}.icon-vs-red{fill:#ff4635}.icon-vs-yellow{fill:#ffda48}.icon-vs-green{fill:#78d278}.icon-vs-blue{fill:#37aee7}.icon-vs-action-purple{fill:#b180d7}.icon-white{fill:#000000}</style><path class="icon-canvas-transparent" d="M16 16H0V0h16v16z" id="canvas"/><path class="icon-vs-out" d="M16 8c0 4.411-3.589 8-8 8a2.803 2.803 0 0 1-2.8-2.8c0-.833.272-1.629.766-2.241a.596.596 0 0 0 .101-.359.667.667 0 0 0-.667-.666.58.58 0 0 0-.358.102A3.584 3.584 0 0 1 2.8 10.8 2.803 2.803 0 0 1 0 8c0-4.411 3.589-8 8-8s8 3.589 8 8z" id="outline"/><path class="icon-white" d="M5.4 7.933a2.67 2.67 0 0 1 2.667 2.666c0 .606-.193 1.179-.544 1.614a1.599 1.599 0 0 0-.323.987.8.8 0 0 0 .8.8c3.309 0 6-2.691 6-6s-2.691-6-6-6-6 2.691-6 6c0 .441.359.8.8.8.378 0 .729-.114.986-.322A2.568 2.568 0 0 1 5.4 7.933z" id="iconFg"/><g id="iconBg"><path class="icon-vs-bg" d="M8 15c-.992 0-1.8-.808-1.8-1.8 0-.606.193-1.179.544-1.613.208-.259.323-.609.323-.987 0-.919-.748-1.666-1.667-1.666-.377 0-.728.115-.986.323A2.58 2.58 0 0 1 2.8 9.8C1.808 9.8 1 8.992 1 8c0-3.86 3.14-7 7-7 3.859 0 7 3.14 7 7 0 3.859-3.141 7-7 7zM5.4 7.933a2.67 2.67 0 0 1 2.667 2.666c0 .606-.193 1.179-.544 1.614a1.599 1.599 0 0 0-.323.987.8.8 0 0 0 .8.8c3.309 0 6-2.691 6-6s-2.691-6-6-6-6 2.691-6 6c0 .441.359.8.8.8.378 0 .729-.114.986-.322A2.568 2.568 0 0 1 5.4 7.933z"/><path class="icon-vs-action-purple" d="M4.5 5.375a.875.875 0 1 0 0 1.75.875.875 0 0 0 0-1.75z"/><path class="icon-vs-blue" d="M7.125 3.625a.875.875 0 1 0 0 1.75.875.875 0 0 0 0-1.75z"/><path class="icon-vs-green" d="M10.625 4.5a.875.875 0 1 0 0 1.75.875.875 0 0 0 0-1.75z"/><path class="icon-vs-yellow" d="M11.5 8a.875.875 0 1 0 0 1.75.875.875 0 0 0 0-1.75z"/><path class="icon-vs-red" d="M9.75 10.625a.875.875 0 1 0 0 1.75.875.875 0 0 0 0-1.75z"/></g></svg>
\ No newline at end of file
diff --git a/src/vs/workbench/parts/outline/electron-browser/media/Constant_16x.svg b/src/vs/editor/contrib/documentSymbols/media/Constant_16x.svg
similarity index 100%
rename from src/vs/workbench/parts/outline/electron-browser/media/Constant_16x.svg
rename to src/vs/editor/contrib/documentSymbols/media/Constant_16x.svg
diff --git a/src/vs/workbench/parts/outline/electron-browser/media/Constant_16x_inverse.svg b/src/vs/editor/contrib/documentSymbols/media/Constant_16x_inverse.svg
similarity index 100%
rename from src/vs/workbench/parts/outline/electron-browser/media/Constant_16x_inverse.svg
rename to src/vs/editor/contrib/documentSymbols/media/Constant_16x_inverse.svg
diff --git a/src/vs/editor/contrib/documentSymbols/media/Document_16x.svg b/src/vs/editor/contrib/documentSymbols/media/Document_16x.svg
new file mode 100644
index 00000000000..7b36178ab46
--- /dev/null
+++ b/src/vs/editor/contrib/documentSymbols/media/Document_16x.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" enable-background="new 0 0 16 16"><style type="text/css">.icon-canvas-transparent{opacity:0;fill:#F6F6F6;} .icon-vs-out{fill:#F6F6F6;} .icon-vs-bg{fill:#424242;} .icon-vs-fg_x0020_2{fill:#F0EFF1;}</style><path class="icon-canvas-transparent" d="M16 16h-16v-16h16v16z" id="canvas"/><path class="icon-vs-out" d="M15 16h-13v-16h8.621l4.379 4.379v11.621z" id="outline"/><path class="icon-vs-fg_x0020_2" d="M13 14h-9v-12h5v4h4v8zm-3-9v-2.793l2.793 2.793h-2.793z" id="iconFg"/><path class="icon-vs-bg" d="M3 1v14h11v-10.207l-3.793-3.793h-7.207zm10 13h-9v-12h5v4h4v8zm-3-9v-2.793l2.793 2.793h-2.793z" id="iconBg"/></svg>
\ No newline at end of file
diff --git a/src/vs/editor/contrib/documentSymbols/media/Document_16x_darkp.svg b/src/vs/editor/contrib/documentSymbols/media/Document_16x_darkp.svg
new file mode 100644
index 00000000000..bced3a467ee
--- /dev/null
+++ b/src/vs/editor/contrib/documentSymbols/media/Document_16x_darkp.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" enable-background="new 0 0 16 16"><style type="text/css">.icon-canvas-transparent{opacity:0;fill:#F6F6F6;} .icon-vs-out{fill:#F6F6F6;} .icon-vs-bg{fill:#c5c5c5;} .icon-vs-fg_x0020_2{fill:#F0EFF1;}</style><path class="icon-canvas-transparent" d="M16 16h-16v-16h16v16z" id="canvas"/><path class="icon-vs-out" d="M15 16h-13v-16h8.621l4.379 4.379v11.621z" id="outline"/><path class="icon-vs-fg_x0020_2" d="M13 14h-9v-12h5v4h4v8zm-3-9v-2.793l2.793 2.793h-2.793z" id="iconFg"/><path class="icon-vs-bg" d="M3 1v14h11v-10.207l-3.793-3.793h-7.207zm10 13h-9v-12h5v4h4v8zm-3-9v-2.793l2.793 2.793h-2.793z" id="iconBg"/></svg>
\ No newline at end of file
diff --git a/src/vs/workbench/parts/outline/electron-browser/media/EnumItem_16x.svg b/src/vs/editor/contrib/documentSymbols/media/EnumItem_16x.svg
similarity index 100%
rename from src/vs/workbench/parts/outline/electron-browser/media/EnumItem_16x.svg
rename to src/vs/editor/contrib/documentSymbols/media/EnumItem_16x.svg
diff --git a/src/vs/workbench/parts/outline/electron-browser/media/EnumItem_inverse_16x.svg b/src/vs/editor/contrib/documentSymbols/media/EnumItem_inverse_16x.svg
similarity index 100%
rename from src/vs/workbench/parts/outline/electron-browser/media/EnumItem_inverse_16x.svg
rename to src/vs/editor/contrib/documentSymbols/media/EnumItem_inverse_16x.svg
diff --git a/src/vs/editor/contrib/documentSymbols/media/Enumerator_16x.svg b/src/vs/editor/contrib/documentSymbols/media/Enumerator_16x.svg
new file mode 100755
index 00000000000..e4a9551fd5a
--- /dev/null
+++ b/src/vs/editor/contrib/documentSymbols/media/Enumerator_16x.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><style>.icon-canvas-transparent{opacity:0;fill:#f6f6f6}.icon-vs-out{fill:#f6f6f6}.icon-vs-fg{fill:#f0eff1}.icon-vs-action-orange{fill:#c27d1a}</style><path class="icon-canvas-transparent" d="M16 16H0V0h16v16z" id="canvas"/><path class="icon-vs-out" d="M14.414 1L16 2.586v5.828L14.414 10H10v3.416L8.414 15H1.586L0 13.416v-5.83L1.586 6H6V2.586L7.586 1h6.828z" id="outline"/><path class="icon-vs-fg" d="M2 13h6V8H2v5zm1-4h4v1H3V9zm0 2h4v1H3v-1zm11-5V3H8v3h.414L9 6.586V6h4v1H9.414l.586.586V8h4V6zm-1-1H9V4h4v1z" id="iconFg"/><path class="icon-vs-action-orange" d="M3 11h4.001v1H3v-1zm0-1h4.001V9H3v1zm6-2v5l-1 1H2l-1-1V8l1-1h6l1 1zM8 8H2v5h6V8zm1-2l1 1h3V6H9zm0-1h4V4H9v1zm5-3H8L7 3v3h1V3h6v5h-4v1h4l1-1V3l-1-1z" id="iconBg"/></svg>
\ No newline at end of file
diff --git a/src/vs/editor/contrib/documentSymbols/media/Enumerator_inverse_16x.svg b/src/vs/editor/contrib/documentSymbols/media/Enumerator_inverse_16x.svg
new file mode 100755
index 00000000000..d8e9f4f107a
--- /dev/null
+++ b/src/vs/editor/contrib/documentSymbols/media/Enumerator_inverse_16x.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><style>.icon-canvas-transparent{opacity:0;fill:#2d2d30}.icon-vs-out{fill:#2d2d30}.icon-vs-fg{fill:#2b282e}.icon-vs-action-orange{fill:#e8ab53}</style><path class="icon-canvas-transparent" d="M16 16H0V0h16v16z" id="canvas"/><path class="icon-vs-out" d="M14.414 1L16 2.586v5.828L14.414 10H10v3.416L8.414 15H1.586L0 13.416v-5.83L1.586 6H6V2.586L7.586 1h6.828z" id="outline"/><path class="icon-vs-fg" d="M2 13h6V8H2v5zm1-4h4v1H3V9zm0 2h4v1H3v-1zm11-5V3H8v3h.414L9 6.586V6h4v1H9.414l.586.586V8h4V6zm-1-1H9V4h4v1z" id="iconFg"/><path class="icon-vs-action-orange" d="M3 11h4.001v1H3v-1zm0-1h4.001V9H3v1zm6-2v5l-1 1H2l-1-1V8l1-1h6l1 1zM8 8H2v5h6V8zm1-2l1 1h3V6H9zm0-1h4V4H9v1zm5-3H8L7 3v3h1V3h6v5h-4v1h4l1-1V3l-1-1z" id="iconBg"/></svg>
\ No newline at end of file
diff --git a/src/vs/workbench/parts/outline/electron-browser/media/Event_16x_vscode.svg b/src/vs/editor/contrib/documentSymbols/media/Event_16x_vscode.svg
similarity index 100%
rename from src/vs/workbench/parts/outline/electron-browser/media/Event_16x_vscode.svg
rename to src/vs/editor/contrib/documentSymbols/media/Event_16x_vscode.svg
diff --git a/src/vs/workbench/parts/outline/electron-browser/media/Event_16x_vscode_inverse.svg b/src/vs/editor/contrib/documentSymbols/media/Event_16x_vscode_inverse.svg
similarity index 100%
rename from src/vs/workbench/parts/outline/electron-browser/media/Event_16x_vscode_inverse.svg
rename to src/vs/editor/contrib/documentSymbols/media/Event_16x_vscode_inverse.svg
diff --git a/src/vs/editor/contrib/documentSymbols/media/Field_16x.svg b/src/vs/editor/contrib/documentSymbols/media/Field_16x.svg
new file mode 100644
index 00000000000..e1b5aa5e31d
--- /dev/null
+++ b/src/vs/editor/contrib/documentSymbols/media/Field_16x.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" enable-background="new 0 0 16 16"><style type="text/css">.icon-canvas-transparent{opacity:0;fill:#F6F6F6;} .icon-vs-out{fill:#F6F6F6;} .icon-vs-fg{fill:#F0EFF1;} .icon-vs-action-blue{fill:#00539C;}</style><path class="icon-canvas-transparent" d="M16 16h-16v-16h16v16z" id="canvas"/><path class="icon-vs-out" d="M0 10.736v-6.236l9-4.5 7 3.5v6.236l-9 4.5-7-3.5z" id="outline"/><path class="icon-vs-action-blue" d="M9 1l-8 4v5l6 3 8-4v-5l-6-3zm-2 5.882l-3.764-1.882 5.764-2.882 3.764 1.882-5.764 2.882z" id="iconBg"/><path class="icon-vs-fg" d="M9 2.118l3.764 1.882-5.764 2.882-3.764-1.882 5.764-2.882z" id="iconFg"/></svg>
\ No newline at end of file
diff --git a/src/vs/editor/contrib/documentSymbols/media/Field_16x_darkp.svg b/src/vs/editor/contrib/documentSymbols/media/Field_16x_darkp.svg
new file mode 100644
index 00000000000..5fc48ceff0f
--- /dev/null
+++ b/src/vs/editor/contrib/documentSymbols/media/Field_16x_darkp.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><style>.icon-canvas-transparent{opacity:0;fill:#2d2d30}.icon-vs-out{fill:#2d2d30}.icon-vs-fg{fill:#2b282e}.icon-vs-action-blue{fill:#75beff}</style><path class="icon-canvas-transparent" d="M16 16H0V0h16v16z" id="canvas"/><path class="icon-vs-out" d="M0 10.736V4.5L9 0l7 3.5v6.236l-9 4.5-7-3.5z" id="outline"/><path class="icon-vs-action-blue" d="M9 1L1 5v5l6 3 8-4V4L9 1zM7 6.882L3.236 5 9 2.118 12.764 4 7 6.882z" id="iconBg"/><path class="icon-vs-fg" d="M9 2.118L12.764 4 7 6.882 3.236 5 9 2.118z" id="iconFg"/></svg>
\ No newline at end of file
diff --git a/src/vs/editor/contrib/documentSymbols/media/Indexer_16x.svg b/src/vs/editor/contrib/documentSymbols/media/Indexer_16x.svg
new file mode 100644
index 00000000000..ff55f31ffa3
--- /dev/null
+++ b/src/vs/editor/contrib/documentSymbols/media/Indexer_16x.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><style>.icon-canvas-transparent{opacity:0;fill:#f6f6f6}.icon-vs-out{fill:#f6f6f6}.icon-vs-bg{fill:#424242}</style><path class="icon-canvas-transparent" d="M16 16H0V0h16v16z" id="canvas"/><path class="icon-vs-out" d="M11 15v-3h2V4h-2V1h5v14h-5zM0 15V1h5v3H3v8h2v3H0z" id="outline"/><g id="iconBg"><path class="icon-vs-bg" d="M4 14H1V2h3v1H2v10h2v1zM15 2h-3v1h2v10h-2v1h3V2z"/></g></svg>
\ No newline at end of file
diff --git a/src/vs/editor/contrib/documentSymbols/media/Indexer_16x_darkp.svg b/src/vs/editor/contrib/documentSymbols/media/Indexer_16x_darkp.svg
new file mode 100644
index 00000000000..2f3788e7730
--- /dev/null
+++ b/src/vs/editor/contrib/documentSymbols/media/Indexer_16x_darkp.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><style>.icon-canvas-transparent{opacity:0;fill:#252526}.icon-vs-out{fill:#252526}.icon-vs-bg{fill:#c5c5c5}</style><path class="icon-canvas-transparent" d="M16 16H0V0h16v16z" id="canvas"/><path class="icon-vs-out" d="M11 15v-3h2V4h-2V1h5v14h-5zM0 15V1h5v3H3v8h2v3H0z" id="outline"/><g id="iconBg"><path class="icon-vs-bg" d="M4 14H1V2h3v1H2v10h2v1zM15 2h-3v1h2v10h-2v1h3V2z"/></g></svg>
\ No newline at end of file
diff --git a/src/vs/editor/contrib/documentSymbols/media/IntelliSenseKeyword_16x.svg b/src/vs/editor/contrib/documentSymbols/media/IntelliSenseKeyword_16x.svg
new file mode 100644
index 00000000000..7a80c7fe260
--- /dev/null
+++ b/src/vs/editor/contrib/documentSymbols/media/IntelliSenseKeyword_16x.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><style>.icon-canvas-transparent{opacity:0;fill:#f6f6f6}.icon-vs-out{fill:#f6f6f6}.icon-vs-bg{fill:#424242}.icon-vs-fg{fill:#f0eff1}</style><path class="icon-canvas-transparent" d="M16 16H0V0h16v16z" id="canvas"/><path class="icon-vs-out" d="M16 5V2H9V1H0v14h13v-3h3V9h-1V6H9V5h7zm-8 7V9h1v3H8z" id="outline"/><path class="icon-vs-fg" d="M2 3h5v1H2V3z" id="iconFg"/><g id="iconBg"><path class="icon-vs-bg" d="M15 4h-5V3h5v1zm-1 3h-2v1h2V7zm-4 0H1v1h9V7zm2 6H1v1h11v-1zm-5-3H1v1h6v-1zm8 0h-5v1h5v-1zM8 2v3H1V2h7zM7 3H2v1h5V3z"/></g></svg>
\ No newline at end of file
diff --git a/src/vs/editor/contrib/documentSymbols/media/IntelliSenseKeyword_16x_darkp.svg b/src/vs/editor/contrib/documentSymbols/media/IntelliSenseKeyword_16x_darkp.svg
new file mode 100644
index 00000000000..ef98b5133fd
--- /dev/null
+++ b/src/vs/editor/contrib/documentSymbols/media/IntelliSenseKeyword_16x_darkp.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><style>.icon-canvas-transparent{opacity:0;fill:#252526}.icon-vs-out{fill:#252526}.icon-vs-bg{fill:#c5c5c5}.icon-vs-fg{fill:#2a292c}</style><path class="icon-canvas-transparent" d="M16 16H0V0h16v16z" id="canvas"/><path class="icon-vs-out" d="M16 5V2H9V1H0v14h13v-3h3V9h-1V6H9V5h7zm-8 7V9h1v3H8z" id="outline"/><path class="icon-vs-fg" d="M2 3h5v1H2V3z" id="iconFg"/><g id="iconBg"><path class="icon-vs-bg" d="M15 4h-5V3h5v1zm-1 3h-2v1h2V7zm-4 0H1v1h9V7zm2 6H1v1h11v-1zm-5-3H1v1h6v-1zm8 0h-5v1h5v-1zM8 2v3H1V2h7zM7 3H2v1h5V3z"/></g></svg>
\ No newline at end of file
diff --git a/src/vs/editor/contrib/documentSymbols/media/Interface_16x.svg b/src/vs/editor/contrib/documentSymbols/media/Interface_16x.svg
new file mode 100644
index 00000000000..0c08c8d50af
--- /dev/null
+++ b/src/vs/editor/contrib/documentSymbols/media/Interface_16x.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" enable-background="new 0 0 16 16"><style type="text/css">.icon-canvas-transparent{opacity:0;fill:#F6F6F6;} .icon-vs-out{fill:#F6F6F6;} .icon-vs-fg{fill:#F0EFF1;} .icon-vs-action-blue{fill:#00539C;}</style><path class="icon-canvas-transparent" d="M16 16h-16v-16h16v16z" id="canvas"/><path class="icon-vs-out" d="M11.5 12c-1.915 0-3.602-1.241-4.228-3h-1.41c-.536.985-1.572 1.625-2.737 1.625-1.723 0-3.125-1.402-3.125-3.125s1.402-3.125 3.125-3.125c1.165 0 2.201.639 2.737 1.625h1.41c.626-1.759 2.313-3 4.228-3 2.481 0 4.5 2.019 4.5 4.5s-2.019 4.5-4.5 4.5z" id="outline"/><path class="icon-vs-fg" d="M11.5 9c-.827 0-1.5-.674-1.5-1.5 0-.828.673-1.5 1.5-1.5s1.5.672 1.5 1.5c0 .826-.673 1.5-1.5 1.5z" id="iconFg"/><path class="icon-vs-action-blue" d="M11.5 4c-1.762 0-3.205 1.306-3.45 3h-2.865c-.226-.931-1.059-1.625-2.06-1.625-1.174 0-2.125.951-2.125 2.125s.951 2.125 2.125 2.125c1 0 1.834-.694 2.06-1.625h2.865c.245 1.694 1.688 3 3.45 3 1.933 0 3.5-1.567 3.5-3.5s-1.567-3.5-3.5-3.5zm0 5c-.827 0-1.5-.673-1.5-1.5s.673-1.5 1.5-1.5 1.5.673 1.5 1.5-.673 1.5-1.5 1.5z" id="iconBg"/></svg>
\ No newline at end of file
diff --git a/src/vs/editor/contrib/documentSymbols/media/Interface_16x_darkp.svg b/src/vs/editor/contrib/documentSymbols/media/Interface_16x_darkp.svg
new file mode 100644
index 00000000000..f7c2934a55c
--- /dev/null
+++ b/src/vs/editor/contrib/documentSymbols/media/Interface_16x_darkp.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><style>.icon-canvas-transparent{opacity:0;fill:#2d2d30}.icon-vs-out{fill:#2d2d30}.icon-vs-fg{fill:#2b282e}.icon-vs-action-blue{fill:#75beff}</style><path class="icon-canvas-transparent" d="M16 16H0V0h16v16z" id="canvas"/><path class="icon-vs-out" d="M11.5 12c-1.915 0-3.602-1.241-4.228-3h-1.41a3.11 3.11 0 0 1-2.737 1.625C1.402 10.625 0 9.223 0 7.5s1.402-3.125 3.125-3.125c1.165 0 2.201.639 2.737 1.625h1.41c.626-1.759 2.313-3 4.228-3C13.981 3 16 5.019 16 7.5S13.981 12 11.5 12z" id="outline"/><path class="icon-vs-fg" d="M11.5 9A1.501 1.501 0 1 1 13 7.5c0 .826-.673 1.5-1.5 1.5z" id="iconFg"/><path class="icon-vs-action-blue" d="M11.5 4a3.49 3.49 0 0 0-3.45 3H5.185A2.122 2.122 0 0 0 1 7.5a2.123 2.123 0 1 0 4.185.5H8.05a3.49 3.49 0 0 0 3.45 3 3.5 3.5 0 1 0 0-7zm0 5c-.827 0-1.5-.673-1.5-1.5S10.673 6 11.5 6s1.5.673 1.5 1.5S12.327 9 11.5 9z" id="iconBg"/></svg>
\ No newline at end of file
diff --git a/src/vs/editor/contrib/documentSymbols/media/LocalVariable_16x_vscode.svg b/src/vs/editor/contrib/documentSymbols/media/LocalVariable_16x_vscode.svg
new file mode 100644
index 00000000000..e78894b6c63
--- /dev/null
+++ b/src/vs/editor/contrib/documentSymbols/media/LocalVariable_16x_vscode.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><style>.icon-canvas-transparent{opacity:0;fill:#f6f6f6}.icon-vs-out{fill:#f6f6f6}.icon-vs-bg{fill:#424242}.icon-vs-fg{fill:#f0eff1}.icon-vs-action-blue{fill:#00539c}</style><path class="icon-canvas-transparent" d="M16 16H0V0h16v16z" id="canvas"/><path class="icon-vs-out" d="M11 3v1.015L8.733 2.882 5 4.749V3H0v10h5v-1.859l2.156 1.077L11 10.295V13h5V3h-5z" id="outline" style="display: none;"/><path class="icon-vs-bg" d="M2 5v6h2v1H1V4h3v1H2zm10 6v1h3V4h-3v1h2v6h-2z" id="iconBg"/><path class="icon-vs-fg" d="M7.156 7.156l-1.578-.789 3.156-1.578 1.578.789-3.156 1.578z" id="iconFg" style="display: none;"/><path class="icon-vs-action-blue" d="M8.733 4L4 6.367v3.156L7.156 11.1l4.733-2.367V5.578L8.733 4zM7.156 7.156l-1.578-.789 3.156-1.578 1.578.789-3.156 1.578z" id="colorImportance"/></svg>
\ No newline at end of file
diff --git a/src/vs/editor/contrib/documentSymbols/media/LocalVariable_16x_vscode_inverse.svg b/src/vs/editor/contrib/documentSymbols/media/LocalVariable_16x_vscode_inverse.svg
new file mode 100644
index 00000000000..44a44b489d1
--- /dev/null
+++ b/src/vs/editor/contrib/documentSymbols/media/LocalVariable_16x_vscode_inverse.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><style>.icon-canvas-transparent{opacity:0;fill:#2d2d30}.icon-vs-out{fill:#2d2d30}.icon-vs-bg{fill:#c5c5c5}.icon-vs-fg{fill:#2b282e}.icon-vs-action-blue{fill:#75beff}</style><path class="icon-canvas-transparent" d="M16 16H0V0h16v16z" id="canvas"/><path class="icon-vs-out" d="M11 3v1.015L8.733 2.882 5 4.749V3H0v10h5v-1.859l2.156 1.077L11 10.295V13h5V3h-5z" id="outline" style="display: none;"/><path class="icon-vs-bg" d="M2 5v6h2v1H1V4h3v1H2zm10 6v1h3V4h-3v1h2v6h-2z" id="iconBg"/><path class="icon-vs-fg" d="M7.156 7.156l-1.578-.789 3.156-1.578 1.578.789-3.156 1.578z" id="iconFg" style="display: none;"/><path class="icon-vs-action-blue" d="M8.733 4L4 6.367v3.156L7.156 11.1l4.733-2.367V5.578L8.733 4zM7.156 7.156l-1.578-.789 3.156-1.578 1.578.789-3.156 1.578z" id="colorImportance"/></svg>
\ No newline at end of file
diff --git a/src/vs/editor/contrib/documentSymbols/media/Method_16x.svg b/src/vs/editor/contrib/documentSymbols/media/Method_16x.svg
new file mode 100644
index 00000000000..e1b587f9cc0
--- /dev/null
+++ b/src/vs/editor/contrib/documentSymbols/media/Method_16x.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.icon-canvas-transparent,.icon-vs-out{fill:#f6f6f6;}.icon-canvas-transparent{opacity:0;}.icon-vs-fg{fill:#f0eff1;}.icon-vs-action-purple{fill:#652d90;}</style></defs><title>Method_16x</title><g id="canvas"><path class="icon-canvas-transparent" d="M16,16H0V0H16Z"/></g><g id="outline"><path class="icon-vs-out" d="M15,3.349v8.4L8.975,16h-.9L1,11.582V3.327L7.6,0H8.713Z"/></g><g id="iconFg"><path class="icon-vs-fg" d="M12.715,4.4,8.487,7.02,3.565,4.272,8.144,1.963ZM3,5.1,8,7.894v5.7L3,10.473Zm6,8.434V7.878L13,5.4v5.318Z"/></g><g id="iconBg"><path class="icon-vs-action-purple" d="M8.156.837,2,3.942v7.085L8.517,15.1,14,11.233V3.95ZM12.715,4.4,8.487,7.02,3.565,4.272,8.144,1.963ZM3,5.1,8,7.894v5.7L3,10.473Zm6,8.434V7.878L13,5.4v5.318Z"/></g></svg>
\ No newline at end of file
diff --git a/src/vs/editor/contrib/documentSymbols/media/Method_16x_darkp.svg b/src/vs/editor/contrib/documentSymbols/media/Method_16x_darkp.svg
new file mode 100644
index 00000000000..0b7dd26efd3
--- /dev/null
+++ b/src/vs/editor/contrib/documentSymbols/media/Method_16x_darkp.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.icon-canvas-transparent,.icon-vs-out{fill:#252526;}.icon-canvas-transparent{opacity:0;}.icon-vs-fg{fill:#2a292c;}.icon-vs-action-purple{fill:#b180d7;}</style></defs><title>Method_16x</title><g id="canvas"><path class="icon-canvas-transparent" d="M16,16H0V0H16Z"/></g><g id="outline"><path class="icon-vs-out" d="M15,3.349v8.4L8.975,16h-.9L1,11.582V3.327L7.6,0H8.713Z"/></g><g id="iconFg"><path class="icon-vs-fg" d="M12.715,4.4,8.487,7.02,3.565,4.272,8.144,1.963ZM3,5.1,8,7.894v5.7L3,10.473Zm6,8.434V7.878L13,5.4v5.318Z"/></g><g id="iconBg"><path class="icon-vs-action-purple" d="M8.156.837,2,3.942v7.085L8.517,15.1,14,11.233V3.95ZM12.715,4.4,8.487,7.02,3.565,4.272,8.144,1.963ZM3,5.1,8,7.894v5.7L3,10.473Zm6,8.434V7.878L13,5.4v5.318Z"/></g></svg>
\ No newline at end of file
diff --git a/src/vs/editor/contrib/documentSymbols/media/Namespace_16x.svg b/src/vs/editor/contrib/documentSymbols/media/Namespace_16x.svg
new file mode 100644
index 00000000000..772b9152cb5
--- /dev/null
+++ b/src/vs/editor/contrib/documentSymbols/media/Namespace_16x.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><style>.icon-canvas-transparent{opacity:0;fill:#f6f6f6}.icon-vs-out{fill:#f6f6f6}.icon-vs-bg{fill:#424242}</style><path class="icon-canvas-transparent" d="M16 16H0V0h16v16z" id="canvas"/><path class="icon-vs-out" d="M9.26 11.984l.978-.021a.962.962 0 0 0 .09-.006c.011-.063.026-.179.026-.361V9.688c0-.679.185-1.257.53-1.707-.346-.452-.53-1.03-.53-1.705V4.35c0-.167-.021-.259-.034-.302L9.26 4.02V.973l1.011.011c2.167.024 3.409 1.156 3.409 3.105v1.962c0 .351.071.461.072.462l.936.06.053.927v1.936l-.936.061c-.076.016-.125.146-.125.424v2.017c0 .914-.332 3.043-3.408 3.078l-1.012.011v-3.043zm-3.521 3.032c-3.089-.035-3.422-2.164-3.422-3.078V9.921c0-.327-.066-.432-.067-.433l-.937-.06-.063-.929V6.563l.942-.06c.058 0 .125-.114.125-.452V4.09c0-1.949 1.248-3.081 3.422-3.105L6.75.973V4.02l-.975.023a.572.572 0 0 0-.093.01c.006.021-.019.115-.019.297v1.928c0 .675-.186 1.253-.534 1.705.348.45.534 1.028.534 1.707v1.907c0 .175.014.291.027.363.023.002 1.06.025 1.06.025v3.043l-1.011-.012z" id="outline"/><g id="iconBg"><path class="icon-vs-bg" d="M5.75 14.016c-1.623-.019-2.434-.711-2.434-2.078V9.921c0-.902-.355-1.376-1.066-1.422v-.998c.711-.045 1.066-.529 1.066-1.449V4.09c0-1.385.811-2.087 2.434-2.105v1.06c-.725.017-1.087.453-1.087 1.305v1.928c0 .92-.454 1.488-1.36 1.702V8c.907.201 1.36.763 1.36 1.688v1.907c0 .488.081.835.243 1.042.162.208.443.316.844.325v1.054zm7.99-5.517c-.706.045-1.06.52-1.06 1.422v2.017c0 1.367-.807 2.06-2.42 2.078v-1.053c.396-.009.678-.118.844-.328.167-.21.25-.556.25-1.039V9.688c0-.925.449-1.488 1.347-1.688v-.021c-.898-.214-1.347-.782-1.347-1.702V4.35c0-.852-.364-1.288-1.094-1.306v-1.06c1.613.018 2.42.72 2.42 2.105v1.962c0 .92.354 1.404 1.06 1.449v.999z"/></g></svg>
\ No newline at end of file
diff --git a/src/vs/editor/contrib/documentSymbols/media/Namespace_16x_darkp.svg b/src/vs/editor/contrib/documentSymbols/media/Namespace_16x_darkp.svg
new file mode 100644
index 00000000000..dc052a068ca
--- /dev/null
+++ b/src/vs/editor/contrib/documentSymbols/media/Namespace_16x_darkp.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><style>.icon-canvas-transparent{opacity:0;fill:#252526}.icon-vs-out{fill:#252526}.icon-vs-bg{fill:#c5c5c5}</style><path class="icon-canvas-transparent" d="M16 16H0V0h16v16z" id="canvas"/><path class="icon-vs-out" d="M9.26 11.984l.978-.021a.962.962 0 0 0 .09-.006c.011-.063.026-.179.026-.361V9.688c0-.679.185-1.257.53-1.707-.346-.452-.53-1.03-.53-1.705V4.35c0-.167-.021-.259-.034-.302L9.26 4.02V.973l1.011.011c2.167.024 3.409 1.156 3.409 3.105v1.962c0 .351.071.461.072.462l.936.06.053.927v1.936l-.936.061c-.076.016-.125.146-.125.424v2.017c0 .914-.332 3.043-3.408 3.078l-1.012.011v-3.043zm-3.521 3.032c-3.089-.035-3.422-2.164-3.422-3.078V9.921c0-.327-.066-.432-.067-.433l-.937-.06-.063-.929V6.563l.942-.06c.058 0 .125-.114.125-.452V4.09c0-1.949 1.248-3.081 3.422-3.105L6.75.973V4.02l-.975.023a.572.572 0 0 0-.093.01c.006.021-.019.115-.019.297v1.928c0 .675-.186 1.253-.534 1.705.348.45.534 1.028.534 1.707v1.907c0 .175.014.291.027.363.023.002 1.06.025 1.06.025v3.043l-1.011-.012z" id="outline"/><g id="iconBg"><path class="icon-vs-bg" d="M5.75 14.016c-1.623-.019-2.434-.711-2.434-2.078V9.921c0-.902-.355-1.376-1.066-1.422v-.998c.711-.045 1.066-.529 1.066-1.449V4.09c0-1.385.811-2.087 2.434-2.105v1.06c-.725.017-1.087.453-1.087 1.305v1.928c0 .92-.454 1.488-1.36 1.702V8c.907.201 1.36.763 1.36 1.688v1.907c0 .488.081.835.243 1.042.162.208.443.316.844.325v1.054zm7.99-5.517c-.706.045-1.06.52-1.06 1.422v2.017c0 1.367-.807 2.06-2.42 2.078v-1.053c.396-.009.678-.118.844-.328.167-.21.25-.556.25-1.039V9.688c0-.925.449-1.488 1.347-1.688v-.021c-.898-.214-1.347-.782-1.347-1.702V4.35c0-.852-.364-1.288-1.094-1.306v-1.06c1.613.018 2.42.72 2.42 2.105v1.962c0 .92.354 1.404 1.06 1.449v.999z"/></g></svg>
\ No newline at end of file
diff --git a/src/vs/editor/contrib/documentSymbols/media/Numeric_16x.svg b/src/vs/editor/contrib/documentSymbols/media/Numeric_16x.svg
new file mode 100644
index 00000000000..ac848f89b8c
--- /dev/null
+++ b/src/vs/editor/contrib/documentSymbols/media/Numeric_16x.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><style>.icon-canvas-transparent{opacity:0;fill:#f6f6f6}.icon-vs-out{fill:#f6f6f6}.icon-vs-bg{fill:#424242}</style><path class="icon-canvas-transparent" d="M16 16H0V0h16v16z" id="canvas"/><path class="icon-vs-out" d="M9 15v-3H7v3H4v-3H1V9h3V7H1V4h3V1h3v3h2V1h3v3h3v3h-3v2h3v3h-3v3H9z" id="outline"/><g id="iconBg"><path class="icon-vs-bg" d="M14 6V5h-3V2h-1v3H6V2H5v3H2v1h3v4H2v1h3v3h1v-3h4v3h1v-3h3v-1h-3V6h3zm-4 4H6V6h4v4z"/></g></svg>
\ No newline at end of file
diff --git a/src/vs/editor/contrib/documentSymbols/media/Numeric_16x_darkp.svg b/src/vs/editor/contrib/documentSymbols/media/Numeric_16x_darkp.svg
new file mode 100644
index 00000000000..4144eea0c06
--- /dev/null
+++ b/src/vs/editor/contrib/documentSymbols/media/Numeric_16x_darkp.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><style>.icon-canvas-transparent{opacity:0;fill:#252526}.icon-vs-out{fill:#252526}.icon-vs-bg{fill:#c5c5c5}</style><path class="icon-canvas-transparent" d="M16 16H0V0h16v16z" id="canvas"/><path class="icon-vs-out" d="M9 15v-3H7v3H4v-3H1V9h3V7H1V4h3V1h3v3h2V1h3v3h3v3h-3v2h3v3h-3v3H9z" id="outline"/><g id="iconBg"><path class="icon-vs-bg" d="M14 6V5h-3V2h-1v3H6V2H5v3H2v1h3v4H2v1h3v3h1v-3h4v3h1v-3h3v-1h-3V6h3zm-4 4H6V6h4v4z"/></g></svg>
\ No newline at end of file
diff --git a/src/vs/workbench/parts/outline/electron-browser/media/Operator_16x_vscode.svg b/src/vs/editor/contrib/documentSymbols/media/Operator_16x_vscode.svg
similarity index 100%
rename from src/vs/workbench/parts/outline/electron-browser/media/Operator_16x_vscode.svg
rename to src/vs/editor/contrib/documentSymbols/media/Operator_16x_vscode.svg
diff --git a/src/vs/workbench/parts/outline/electron-browser/media/Operator_16x_vscode_inverse.svg b/src/vs/editor/contrib/documentSymbols/media/Operator_16x_vscode_inverse.svg
similarity index 100%
rename from src/vs/workbench/parts/outline/electron-browser/media/Operator_16x_vscode_inverse.svg
rename to src/vs/editor/contrib/documentSymbols/media/Operator_16x_vscode_inverse.svg
diff --git a/src/vs/editor/contrib/documentSymbols/media/Property_16x.svg b/src/vs/editor/contrib/documentSymbols/media/Property_16x.svg
new file mode 100644
index 00000000000..cac629e1132
--- /dev/null
+++ b/src/vs/editor/contrib/documentSymbols/media/Property_16x.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.icon-canvas-transparent,.icon-vs-out{fill:#f6f6f6;}.icon-canvas-transparent{opacity:0;}.icon-vs-bg{fill:#424242;}</style></defs><title>Property_16x</title><g id="canvas"><path class="icon-canvas-transparent" d="M16,16H0V0H16Z"/></g><g id="outline"><path class="icon-vs-out" d="M16,5.5a5.46,5.46,0,0,1-6.307,5.434l-.078-.012a5.439,5.439,0,0,1-.811-.191L4.268,15.268A2.5,2.5,0,0,1,.732,11.732L5.269,7.2a5.452,5.452,0,0,1-.191-.812c0-.025-.008-.051-.012-.077A5.5,5.5,0,1,1,16,5.5Z"/></g><g id="iconBg"><path class="icon-vs-bg" d="M15,5.5A4.474,4.474,0,0,1,8.571,9.55l-5.01,5.01a1.5,1.5,0,0,1-2.122-2.12L6.45,7.429A4.474,4.474,0,0,1,12.429,1.45L9.636,4.243l2.121,2.121L14.55,3.571A4.462,4.462,0,0,1,15,5.5Z"/></g></svg>
\ No newline at end of file
diff --git a/src/vs/editor/contrib/documentSymbols/media/Property_16x_darkp.svg b/src/vs/editor/contrib/documentSymbols/media/Property_16x_darkp.svg
new file mode 100644
index 00000000000..bad83c9a321
--- /dev/null
+++ b/src/vs/editor/contrib/documentSymbols/media/Property_16x_darkp.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.icon-canvas-transparent,.icon-vs-out{fill:#252526;}.icon-canvas-transparent{opacity:0;}.icon-vs-bg{fill:#c5c5c5;}</style></defs><title>Property_16x</title><g id="canvas"><path class="icon-canvas-transparent" d="M16,16H0V0H16Z"/></g><g id="outline"><path class="icon-vs-out" d="M16,5.5a5.46,5.46,0,0,1-6.307,5.434l-.078-.012a5.439,5.439,0,0,1-.811-.191L4.268,15.268A2.5,2.5,0,0,1,.732,11.732L5.269,7.2a5.452,5.452,0,0,1-.191-.812c0-.025-.008-.051-.012-.077A5.5,5.5,0,1,1,16,5.5Z"/></g><g id="iconBg"><path class="icon-vs-bg" d="M15,5.5A4.474,4.474,0,0,1,8.571,9.55l-5.01,5.01a1.5,1.5,0,0,1-2.122-2.12L6.45,7.429A4.474,4.474,0,0,1,12.429,1.45L9.636,4.243l2.121,2.121L14.55,3.571A4.462,4.462,0,0,1,15,5.5Z"/></g></svg>
\ No newline at end of file
diff --git a/src/vs/editor/contrib/documentSymbols/media/Snippet_16x.svg b/src/vs/editor/contrib/documentSymbols/media/Snippet_16x.svg
new file mode 100644
index 00000000000..640c247786e
--- /dev/null
+++ b/src/vs/editor/contrib/documentSymbols/media/Snippet_16x.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><style>.st0{opacity:0}.st0,.st1{fill:#f6f6f6}.st2{fill:#424242}.st3{fill:none}.st4{fill:#f0eff1}</style><g id="outline"><path class="st0" d="M0 0h16v16H0z"/><path class="st1" d="M2 0h13v15H2z"/></g><g id="icon_x5F_bg"><path class="st2" d="M7 13h1v1H7zM5 13h1v1H5zM3 13h1v1H3zM9 13h1v1H9zM11 13h1v1h-1zM13 13h1v1h-1zM3 1v11h1V2h9v10h1V1z"/></g><g id="icon_x5F_fg"><path class="st3" d="M13 2H4h9z"/><path class="st4" d="M4 2h9v10H4z"/></g></svg>
\ No newline at end of file
diff --git a/src/vs/editor/contrib/documentSymbols/media/Snippet_16x_darkp.svg b/src/vs/editor/contrib/documentSymbols/media/Snippet_16x_darkp.svg
new file mode 100644
index 00000000000..0fb4b8bc9e3
--- /dev/null
+++ b/src/vs/editor/contrib/documentSymbols/media/Snippet_16x_darkp.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><style>.st0{opacity:0}.st0,.st1{fill:#252526}.st2{fill:#c5c5c5}.st3{fill:none}.st4{fill:#2a292c}</style><g id="outline"><path class="st0" d="M0 0h16v16H0z"/><path class="st1" d="M2 0h13v15H2z"/></g><g id="icon_x5F_bg"><path class="st2" d="M7 13h1v1H7zM5 13h1v1H5zM3 13h1v1H3zM9 13h1v1H9zM11 13h1v1h-1zM13 13h1v1h-1zM3 1v11h1V2h9v10h1V1z"/></g><g id="icon_x5F_fg"><path class="st3" d="M13 2H4h9z"/><path class="st4" d="M4 2h9v10H4z"/></g></svg>
\ No newline at end of file
diff --git a/src/vs/editor/contrib/documentSymbols/media/String_16x.svg b/src/vs/editor/contrib/documentSymbols/media/String_16x.svg
new file mode 100644
index 00000000000..880d50dd03f
--- /dev/null
+++ b/src/vs/editor/contrib/documentSymbols/media/String_16x.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><style>.icon-canvas-transparent{opacity:0;fill:#f6f6f6}.icon-vs-out{fill:#f6f6f6}.icon-vs-bg{fill:#424242}</style><path class="icon-canvas-transparent" d="M0 0h16v16H0z" id="canvas"/><path class="icon-vs-out" d="M15.256 5.539a3.579 3.579 0 0 0-1.501-.306c-1.014 0-1.85.328-2.482.974-.084.086-.149.185-.222.278-.057-.091-.109-.186-.175-.27-.512-.642-1.243-.982-2.117-.982-.189 0-.372.016-.547.048V3.176h-3.02v2.736c-.463-.438-1.123-.68-1.949-.68-.8 0-1.524.189-2.153.562l-.49.291v2.081c-.288.393-.44.887-.44 1.464 0 .667.236 1.246.684 1.676.442.423 1.024.638 1.731.638.265 0 .517-.036.753-.105H7.8c.237.07.49.105.755.105.928 0 1.709-.365 2.258-1.055.052-.066.091-.142.138-.212.087.117.171.236.275.342.604.614 1.388.925 2.33.925.668 0 1.267-.15 1.779-.446l.5-.289V9.39l.004.003V5.806l-.583-.267zm-6.88 3.59l-.123-.013c-.024-.026-.051-.055-.051-.159v-.558c0-.21.063-.284.09-.315.021-.024.033-.038.119-.038l.033-.003c.02.025.084.128.084.418-.001.418-.091.587-.152.668zm5.834-.165c-.191.154-.326.171-.411.171-.229 0-.293-.066-.322-.097-.073-.076-.11-.214-.11-.411 0-.31.103-.418.14-.458.057-.061.134-.125.332-.125.086 0 .221.016.403.152l.479.358-.511.41z" id="outline"/><g id="iconBg"><path class="icon-vs-bg" d="M3.243 6.233c-.621 0-1.169.141-1.644.422v.892c.431-.369.914-.554 1.45-.554.609 0 .914.321.914.962l-1.336.189c-.978.141-1.467.636-1.467 1.486 0 .396.125.713.375.954.251.24.597.36 1.04.36.601 0 1.056-.27 1.367-.809h.018v.703h.989V7.911c-.001-1.119-.57-1.678-1.706-1.678zm.72 2.786c0 .331-.102.606-.305.824a1.011 1.011 0 0 1-.771.327c-.229 0-.411-.061-.547-.183a.595.595 0 0 1-.205-.467c0-.261.074-.443.222-.547.147-.104.368-.175.661-.213l.945-.132v.391zM8.758 6.233c-.671 0-1.181.299-1.529.896h-.018V4.176h-1.02v6.662h1.02v-.65h.018c.299.504.741.756 1.327.756.624 0 1.116-.227 1.476-.679.361-.453.541-1.056.541-1.809 0-.677-.16-1.216-.48-1.619s-.767-.604-1.335-.604zm.445 3.46c-.214.294-.511.441-.889.441-.322 0-.588-.114-.798-.343s-.314-.506-.314-.834v-.558c0-.387.11-.709.332-.967s.514-.387.877-.387c.343 0 .615.125.816.375.199.251.301.597.301 1.04-.001.528-.108.939-.325 1.233zM13.838 7.046c.354 0 .688.117 1.002.352v-.95a2.572 2.572 0 0 0-1.085-.215c-.738 0-1.328.225-1.769.675-.441.45-.662 1.045-.662 1.786 0 .665.205 1.206.615 1.624.41.417.949.626 1.617.626.492 0 .919-.104 1.279-.312v-.888c-.325.261-.671.391-1.037.391-.437 0-.784-.135-1.044-.404-.259-.27-.389-.637-.389-1.103 0-.472.138-.853.413-1.145.277-.291.63-.437 1.06-.437z"/></g></svg>
\ No newline at end of file
diff --git a/src/vs/editor/contrib/documentSymbols/media/String_16x_darkp.svg b/src/vs/editor/contrib/documentSymbols/media/String_16x_darkp.svg
new file mode 100644
index 00000000000..de3ea3b37eb
--- /dev/null
+++ b/src/vs/editor/contrib/documentSymbols/media/String_16x_darkp.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><style>.icon-canvas-transparent{opacity:0;fill:#252526}.icon-vs-out{fill:#252526}.icon-vs-bg{fill:#c5c5c5}</style><path class="icon-canvas-transparent" d="M0 0h16v16H0z" id="canvas"/><path class="icon-vs-out" d="M15.256 5.539a3.579 3.579 0 0 0-1.501-.306c-1.014 0-1.85.328-2.482.974-.084.086-.149.185-.222.278-.057-.091-.109-.186-.175-.27-.512-.642-1.243-.982-2.117-.982-.189 0-.372.016-.547.048V3.176h-3.02v2.736c-.463-.438-1.123-.68-1.949-.68-.8 0-1.524.189-2.153.562l-.49.291v2.081c-.288.393-.44.887-.44 1.464 0 .667.236 1.246.684 1.676.442.423 1.024.638 1.731.638.265 0 .517-.036.753-.105H7.8c.237.07.49.105.755.105.928 0 1.709-.365 2.258-1.055.052-.066.091-.142.138-.212.087.117.171.236.275.342.604.614 1.388.925 2.33.925.668 0 1.267-.15 1.779-.446l.5-.289V9.39l.004.003V5.806l-.583-.267zm-6.88 3.59l-.123-.013c-.024-.026-.051-.055-.051-.159v-.558c0-.21.063-.284.09-.315.021-.024.033-.038.119-.038l.033-.003c.02.025.084.128.084.418-.001.418-.091.587-.152.668zm5.834-.165c-.191.154-.326.171-.411.171-.229 0-.293-.066-.322-.097-.073-.076-.11-.214-.11-.411 0-.31.103-.418.14-.458.057-.061.134-.125.332-.125.086 0 .221.016.403.152l.479.358-.511.41z" id="outline"/><g id="iconBg"><path class="icon-vs-bg" d="M3.243 6.233c-.621 0-1.169.141-1.644.422v.892c.431-.369.914-.554 1.45-.554.609 0 .914.321.914.962l-1.336.189c-.978.141-1.467.636-1.467 1.486 0 .396.125.713.375.954.251.24.597.36 1.04.36.601 0 1.056-.27 1.367-.809h.018v.703h.989V7.911c-.001-1.119-.57-1.678-1.706-1.678zm.72 2.786c0 .331-.102.606-.305.824a1.011 1.011 0 0 1-.771.327c-.229 0-.411-.061-.547-.183a.595.595 0 0 1-.205-.467c0-.261.074-.443.222-.547.147-.104.368-.175.661-.213l.945-.132v.391zM8.758 6.233c-.671 0-1.181.299-1.529.896h-.018V4.176h-1.02v6.662h1.02v-.65h.018c.299.504.741.756 1.327.756.624 0 1.116-.227 1.476-.679.361-.453.541-1.056.541-1.809 0-.677-.16-1.216-.48-1.619s-.767-.604-1.335-.604zm.445 3.46c-.214.294-.511.441-.889.441-.322 0-.588-.114-.798-.343s-.314-.506-.314-.834v-.558c0-.387.11-.709.332-.967s.514-.387.877-.387c.343 0 .615.125.816.375.199.251.301.597.301 1.04-.001.528-.108.939-.325 1.233zM13.838 7.046c.354 0 .688.117 1.002.352v-.95a2.572 2.572 0 0 0-1.085-.215c-.738 0-1.328.225-1.769.675-.441.45-.662 1.045-.662 1.786 0 .665.205 1.206.615 1.624.41.417.949.626 1.617.626.492 0 .919-.104 1.279-.312v-.888c-.325.261-.671.391-1.037.391-.437 0-.784-.135-1.044-.404-.259-.27-.389-.637-.389-1.103 0-.472.138-.853.413-1.145.277-.291.63-.437 1.06-.437z"/></g></svg>
\ No newline at end of file
diff --git a/src/vs/workbench/parts/outline/electron-browser/media/Structure_16x_vscode.svg b/src/vs/editor/contrib/documentSymbols/media/Structure_16x_vscode.svg
similarity index 100%
rename from src/vs/workbench/parts/outline/electron-browser/media/Structure_16x_vscode.svg
rename to src/vs/editor/contrib/documentSymbols/media/Structure_16x_vscode.svg
diff --git a/src/vs/workbench/parts/outline/electron-browser/media/Structure_16x_vscode_inverse.svg b/src/vs/editor/contrib/documentSymbols/media/Structure_16x_vscode_inverse.svg
similarity index 100%
rename from src/vs/workbench/parts/outline/electron-browser/media/Structure_16x_vscode_inverse.svg
rename to src/vs/editor/contrib/documentSymbols/media/Structure_16x_vscode_inverse.svg
diff --git a/src/vs/workbench/parts/outline/electron-browser/media/Template_16x_vscode.svg b/src/vs/editor/contrib/documentSymbols/media/Template_16x_vscode.svg
similarity index 100%
rename from src/vs/workbench/parts/outline/electron-browser/media/Template_16x_vscode.svg
rename to src/vs/editor/contrib/documentSymbols/media/Template_16x_vscode.svg
diff --git a/src/vs/workbench/parts/outline/electron-browser/media/Template_16x_vscode_inverse.svg b/src/vs/editor/contrib/documentSymbols/media/Template_16x_vscode_inverse.svg
similarity index 100%
rename from src/vs/workbench/parts/outline/electron-browser/media/Template_16x_vscode_inverse.svg
rename to src/vs/editor/contrib/documentSymbols/media/Template_16x_vscode_inverse.svg
diff --git a/src/vs/editor/contrib/documentSymbols/media/outlineTree.css b/src/vs/editor/contrib/documentSymbols/media/outlineTree.css
new file mode 100644
index 00000000000..f62841df77d
--- /dev/null
+++ b/src/vs/editor/contrib/documentSymbols/media/outlineTree.css
@@ -0,0 +1,66 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+.monaco-tree.focused .selected .outline-element-label, .monaco-tree.focused .selected .outline-element-decoration {
+	/* make sure selection color wins when a label is being selected */
+	color: inherit !important;
+}
+
+.monaco-tree .outline-element {
+	display: flex;
+	flex: 1;
+	flex-flow: row nowrap;
+	align-items: center;
+}
+
+.monaco-tree .outline-element .outline-element-icon {
+	padding-right: 3px;
+}
+
+/* .monaco-tree.no-icons .outline-element .outline-element-icon {
+	display: none;
+} */
+
+.monaco-tree .outline-element .outline-element-label {
+	text-overflow: ellipsis;
+	overflow: hidden;
+	color: var(--outline-element-color);
+}
+
+.monaco-tree .outline-element .outline-element-label .monaco-highlighted-label .highlight {
+	font-weight: bold;
+}
+
+.monaco-tree .outline-element .outline-element-detail {
+	visibility: hidden;
+	flex: 1;
+	flex-basis: 10%;
+	opacity: 0.8;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	font-size: 90%;
+	padding-left: 4px;
+	padding-top: 3px;
+}
+
+.monaco-tree .monaco-tree-row.focused .outline-element .outline-element-detail {
+	visibility: inherit;
+}
+
+.monaco-tree .outline-element .outline-element-decoration {
+	opacity: 0.75;
+	font-size: 90%;
+	font-weight: 600;
+	padding: 0 12px 0 5px;
+	margin-left: auto;
+	text-align: center;
+	color: var(--outline-element-color);
+}
+
+.monaco-tree .outline-element .outline-element-decoration.bubble {
+	font-family: octicons;
+	font-size: 14px;
+	opacity: 0.4;
+}
diff --git a/src/vs/editor/contrib/documentSymbols/media/symbol-icons.css b/src/vs/editor/contrib/documentSymbols/media/symbol-icons.css
new file mode 100644
index 00000000000..76d67d5efcc
--- /dev/null
+++ b/src/vs/editor/contrib/documentSymbols/media/symbol-icons.css
@@ -0,0 +1,276 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+.monaco-workbench .symbol-icon {
+	display: inline-block;
+	height: 14px;
+	width: 16px;
+	min-height: 14px;
+	min-width: 16px;
+}
+
+/* default icons */
+.monaco-workbench .symbol-icon {
+	background-image: url('Field_16x.svg');
+	background-repeat: no-repeat;
+}
+.vs-dark .monaco-workbench .symbol-icon,
+.hc-black .monaco-workbench .symbol-icon {
+	background-image: url('Field_16x_darkp.svg');
+}
+
+/* constant */
+.monaco-workbench .symbol-icon.constant {
+	background-image: url('Constant_16x.svg');
+}
+.vs-dark .monaco-workbench .symbol-icon.constant,
+.hc-black .monaco-workbench .symbol-icon.constant {
+	background-image: url('Constant_16x_inverse.svg');
+}
+
+/* enum */
+.monaco-workbench .symbol-icon.enum {
+	background-image: url('Enumerator_16x.svg');
+}
+.vs-dark .monaco-workbench .symbol-icon.enum,
+.hc-black .monaco-workbench .symbol-icon.enum {
+	background-image: url('Enumerator_inverse_16x.svg');
+}
+
+/* enum-member */
+.monaco-workbench .symbol-icon.enum-member {
+	background-image: url('EnumItem_16x.svg');
+}
+.vs-dark .monaco-workbench .symbol-icon.enum-member,
+.hc-black .monaco-workbench .symbol-icon.enum-member {
+	background-image: url('EnumItem_inverse_16x.svg');
+}
+
+/* struct */
+.monaco-workbench .symbol-icon.struct {
+	background-image: url('Structure_16x_vscode.svg');
+}
+.vs-dark .monaco-workbench .symbol-icon.struct,
+.hc-black .monaco-workbench .symbol-icon.struct {
+	background-image: url('Structure_16x_vscode_inverse.svg');
+}
+
+/* event */
+.monaco-workbench .symbol-icon.event {
+	background-image: url('Event_16x_vscode.svg');
+}
+.vs-dark .monaco-workbench .symbol-icon.event,
+.hc-black .monaco-workbench .symbol-icon.event {
+	background-image: url('Event_16x_vscode_inverse.svg');
+}
+
+/* operator */
+.monaco-workbench .symbol-icon.operator {
+	background-image: url('Operator_16x_vscode.svg');
+}
+.vs-dark .monaco-workbench .symbol-icon.operator,
+.hc-black .monaco-workbench .symbol-icon.operator {
+	background-image: url('Operator_16x_vscode_inverse.svg');
+}
+
+/* type paramter */
+.monaco-workbench .symbol-icon.type-parameter {
+	background-image: url('Template_16x_vscode.svg');
+}
+.vs-dark .monaco-workbench .symbol-icon.type-parameter,
+.hc-black .monaco-workbench .symbol-icon.type-parameter {
+	background-image: url('Template_16x_vscode_inverse.svg');
+}
+
+/* boolean, null */
+.monaco-workbench .symbol-icon.boolean {
+	background-image: url('BooleanData_16x.svg');
+}
+.vs-dark .monaco-workbench .symbol-icon.boolean,
+.hc-black .monaco-workbench .symbol-icon.boolean {
+	background-image: url('BooleanData_16x_darkp.svg');
+}
+
+/* null */
+.monaco-workbench .symbol-icon.null {
+	background-image: url('BooleanData_16x.svg');
+}
+.vs-dark .monaco-workbench .symbol-icon.null,
+.hc-black .monaco-workbench .symbol-icon.null {
+	background-image: url('BooleanData_16x_darkp.svg');
+}
+
+/* class */
+.monaco-workbench .symbol-icon.class {
+	background-image: url('Class_16x.svg');
+}
+.vs-dark .monaco-workbench .symbol-icon.class,
+.hc-black .monaco-workbench .symbol-icon.class {
+	background-image: url('Class_16x_darkp.svg');
+}
+
+/* constructor */
+.monaco-workbench .symbol-icon.constructor {
+	background-image: url('Method_16x.svg');
+}
+.vs-dark .monaco-workbench .symbol-icon.constructor,
+.hc-black .monaco-workbench .symbol-icon.constructor {
+	background-image: url('Method_16x_darkp.svg');
+}
+
+/* file */
+.monaco-workbench .symbol-icon.file {
+	background-image: url('Document_16x.svg');
+}
+.vs-dark .monaco-workbench .symbol-icon.file,
+.hc-black .monaco-workbench .symbol-icon.file {
+	background-image: url('Document_16x_darkp.svg');
+}
+
+/* field */
+.monaco-workbench .symbol-icon.field {
+	background-image: url('Field_16x.svg');
+}
+.vs-dark .monaco-workbench .symbol-icon.field,
+.hc-black .monaco-workbench .symbol-icon.field {
+	background-image: url('Field_16x_darkp.svg');
+}
+
+/* variable */
+.monaco-workbench .symbol-icon.variable {
+	background-image: url('LocalVariable_16x_vscode.svg');
+}
+.vs-dark .monaco-workbench .symbol-icon.variable,
+.hc-black .monaco-workbench .symbol-icon.variable {
+	background-image: url('LocalVariable_16x_vscode_inverse.svg');
+}
+
+/* array */
+.monaco-workbench .symbol-icon.array {
+	background-image: url('Indexer_16x.svg');
+}
+.vs-dark .monaco-workbench .symbol-icon.array,
+.hc-black .monaco-workbench .symbol-icon.array {
+	background-image: url('Indexer_16x_darkp.svg');
+}
+
+/* keyword */
+/* todo@joh not used? */
+.monaco-workbench .symbol-icon.keyword {
+	background-image: url('IntelliSenseKeyword_16x.svg');
+}
+.vs-dark .monaco-workbench .symbol-icon.keyword,
+.hc-black .monaco-workbench .symbol-icon.keyword {
+	background-image: url('IntelliSenseKeyword_16x_darkp.svg');
+}
+
+/* interface */
+.monaco-workbench .symbol-icon.interface {
+	background-image: url('Interface_16x.svg');
+}
+.vs-dark .monaco-workbench .symbol-icon.interface,
+.hc-black .monaco-workbench .symbol-icon.interface {
+	background-image: url('Interface_16x_darkp.svg');
+}
+
+/* method */
+.monaco-workbench .symbol-icon.method {
+	background-image: url('Method_16x.svg');
+}
+.vs-dark .monaco-workbench .symbol-icon.method,
+.hc-black .monaco-workbench .symbol-icon.method {
+	background-image: url('Method_16x_darkp.svg');
+}
+
+/* function */
+.monaco-workbench .symbol-icon.function {
+	background-image: url('Method_16x.svg');
+}
+.vs-dark .monaco-workbench .symbol-icon.function,
+.hc-black .monaco-workbench .symbol-icon.function {
+	background-image: url('Method_16x_darkp.svg');
+}
+
+/* object */
+.monaco-workbench .symbol-icon.object {
+	background-image: url('Namespace_16x.svg');
+}
+.vs-dark .monaco-workbench .symbol-icon.object,
+.hc-black .monaco-workbench .symbol-icon.object {
+	background-image: url('Namespace_16x_darkp.svg');
+}
+
+/* namespace */
+.monaco-workbench .symbol-icon.namespace {
+	background-image: url('Namespace_16x.svg');
+}
+.vs-dark .monaco-workbench .symbol-icon.namespace,
+.hc-black .monaco-workbench .symbol-icon.namespace {
+	background-image: url('Namespace_16x_darkp.svg');
+}
+
+/* package */
+.monaco-workbench .symbol-icon.package {
+	background-image: url('Namespace_16x.svg');
+}
+.vs-dark .monaco-workbench .symbol-icon.package,
+.hc-black .monaco-workbench .symbol-icon.package {
+	background-image: url('Namespace_16x_darkp.svg');
+}
+
+/* module */
+.monaco-workbench .symbol-icon.module {
+	background-image: url('Namespace_16x.svg');
+}
+.vs-dark .monaco-workbench .symbol-icon.module,
+.hc-black .monaco-workbench .symbol-icon.module {
+	background-image: url('Namespace_16x_darkp.svg');
+}
+
+/* number */
+.monaco-workbench .symbol-icon.number {
+	background-image: url('Numeric_16x.svg');
+}
+.vs-dark .monaco-workbench .symbol-icon.number,
+.hc-black .monaco-workbench .symbol-icon.number {
+	background-image: url('Numeric_16x_darkp.svg');
+}
+
+/* property */
+.monaco-workbench .symbol-icon.property {
+	background-image: url('Property_16x.svg');
+}
+.vs-dark .monaco-workbench .symbol-icon.property,
+.hc-black .monaco-workbench .symbol-icon.property {
+	background-image: url('Property_16x_darkp.svg');
+}
+
+/* snippet */
+/* todo@joh unused? */
+.monaco-workbench .symbol-icon.snippet {
+	background-image: url('Snippet_16x.svg');
+}
+.vs-dark .monaco-workbench .symbol-icon.snippet,
+.hc-black .monaco-workbench .symbol-icon.snippet {
+	background-image: url('Snippet_16x_darkp.svg');
+}
+
+/* string */
+.monaco-workbench .symbol-icon.string {
+	background-image: url('String_16x.svg');
+}
+.vs-dark .monaco-workbench .symbol-icon.string,
+.hc-black .monaco-workbench .symbol-icon.string {
+	background-image: url('String_16x_darkp.svg');
+}
+
+/* key */
+.monaco-workbench .symbol-icon.key {
+	background-image: url('String_16x.svg');
+}
+.vs-dark .monaco-workbench .symbol-icon.key,
+.hc-black .monaco-workbench .symbol-icon.key {
+	background-image: url('String_16x_darkp.svg');
+}
diff --git a/src/vs/editor/contrib/documentSymbols/outlineModel.ts b/src/vs/editor/contrib/documentSymbols/outlineModel.ts
new file mode 100644
index 00000000000..c980bd1f32c
--- /dev/null
+++ b/src/vs/editor/contrib/documentSymbols/outlineModel.ts
@@ -0,0 +1,447 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+'use strict';
+
+import { binarySearch, coalesce, isFalsyOrEmpty } from 'vs/base/common/arrays';
+import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
+import { first, forEach, size } from 'vs/base/common/collections';
+import { onUnexpectedExternalError } from 'vs/base/common/errors';
+import { fuzzyScore, FuzzyScore } from 'vs/base/common/filters';
+import { LRUCache } from 'vs/base/common/map';
+import { commonPrefixLength } from 'vs/base/common/strings';
+import { IPosition } from 'vs/editor/common/core/position';
+import { IRange, Range } from 'vs/editor/common/core/range';
+import { ITextModel } from 'vs/editor/common/model';
+import { DocumentSymbol, DocumentSymbolProvider, DocumentSymbolProviderRegistry } from 'vs/editor/common/modes';
+import { IMarker, MarkerSeverity } from 'vs/platform/markers/common/markers';
+
+export abstract class TreeElement {
+
+	abstract id: string;
+	abstract children: { [id: string]: TreeElement };
+	abstract parent: TreeElement;
+
+	abstract adopt(newParent: TreeElement): TreeElement;
+
+	remove(): void {
+		delete this.parent.children[this.id];
+	}
+
+	static findId(candidate: DocumentSymbol | string, container: TreeElement): string {
+		// complex id-computation which contains the origin/extension,
+		// the parent path, and some dedupe logic when names collide
+		let candidateId: string;
+		if (typeof candidate === 'string') {
+			candidateId = `${container.id}/${candidate}`;
+		} else {
+			candidateId = `${container.id}/${candidate.name}`;
+			if (container.children[candidateId] !== void 0) {
+				candidateId = `${container.id}/${candidate.name}_${candidate.range.startLineNumber}_${candidate.range.startColumn}`;
+			}
+		}
+
+		let id = candidateId;
+		for (let i = 0; container.children[id] !== void 0; i++) {
+			id = `${candidateId}_${i}`;
+		}
+
+		return id;
+	}
+
+	static getElementById(id: string, element: TreeElement): TreeElement {
+		if (!id) {
+			return undefined;
+		}
+		let len = commonPrefixLength(id, element.id);
+		if (len === id.length) {
+			return element;
+		}
+		if (len < element.id.length) {
+			return undefined;
+		}
+		for (const key in element.children) {
+			let candidate = TreeElement.getElementById(id, element.children[key]);
+			if (candidate) {
+				return candidate;
+			}
+		}
+		return undefined;
+	}
+
+	static size(element: TreeElement): number {
+		let res = 1;
+		for (const key in element.children) {
+			res += TreeElement.size(element.children[key]);
+		}
+		return res;
+	}
+
+	static empty(element: TreeElement): boolean {
+		for (const _key in element.children) {
+			return false;
+		}
+		return true;
+	}
+}
+
+export class OutlineElement extends TreeElement {
+
+	children: { [id: string]: OutlineElement; } = Object.create(null);
+	score: FuzzyScore = [0, []];
+	marker: { count: number, topSev: MarkerSeverity };
+
+	constructor(
+		readonly id: string,
+		public parent: OutlineModel | OutlineGroup | OutlineElement,
+		readonly symbol: DocumentSymbol
+	) {
+		super();
+	}
+
+	adopt(parent: OutlineModel | OutlineGroup | OutlineElement): OutlineElement {
+		let res = new OutlineElement(this.id, parent, this.symbol);
+		forEach(this.children, entry => res.children[entry.key] = entry.value.adopt(res));
+		return res;
+	}
+}
+
+export class OutlineGroup extends TreeElement {
+
+	children: { [id: string]: OutlineElement; } = Object.create(null);
+
+	constructor(
+		readonly id: string,
+		public parent: OutlineModel,
+		readonly provider: DocumentSymbolProvider,
+		readonly providerIndex: number,
+	) {
+		super();
+	}
+
+	adopt(parent: OutlineModel): OutlineGroup {
+		let res = new OutlineGroup(this.id, parent, this.provider, this.providerIndex);
+		forEach(this.children, entry => res.children[entry.key] = entry.value.adopt(res));
+		return res;
+	}
+
+	updateMatches(pattern: string, topMatch: OutlineElement): OutlineElement {
+		for (const key in this.children) {
+			topMatch = this._updateMatches(pattern, this.children[key], topMatch);
+		}
+		return topMatch;
+	}
+
+	private _updateMatches(pattern: string, item: OutlineElement, topMatch: OutlineElement): OutlineElement {
+		item.score = fuzzyScore(pattern, item.symbol.name, undefined, true);
+		if (item.score && (!topMatch || item.score[0] > topMatch.score[0])) {
+			topMatch = item;
+		}
+		for (const key in item.children) {
+			let child = item.children[key];
+			topMatch = this._updateMatches(pattern, child, topMatch);
+			if (!item.score && child.score) {
+				// don't filter parents with unfiltered children
+				item.score = [0, []];
+			}
+		}
+		return topMatch;
+	}
+
+	getItemEnclosingPosition(position: IPosition): OutlineElement {
+		return this._getItemEnclosingPosition(position, this.children);
+	}
+
+	private _getItemEnclosingPosition(position: IPosition, children: { [id: string]: OutlineElement }): OutlineElement {
+		for (let key in children) {
+			let item = children[key];
+			if (!Range.containsPosition(item.symbol.range, position)) {
+				continue;
+			}
+			return this._getItemEnclosingPosition(position, item.children) || item;
+		}
+		return undefined;
+	}
+
+	updateMarker(marker: IMarker[]): void {
+		for (const key in this.children) {
+			this._updateMarker(marker, this.children[key]);
+		}
+	}
+
+	private _updateMarker(markers: IMarker[], item: OutlineElement): void {
+
+		item.marker = undefined;
+
+		// find the proper start index to check for item/marker overlap.
+		let idx = binarySearch<IRange>(markers, item.symbol.range, Range.compareRangesUsingStarts);
+		let start: number;
+		if (idx < 0) {
+			start = ~idx;
+			if (start > 0 && Range.areIntersecting(markers[start - 1], item.symbol.range)) {
+				start -= 1;
+			}
+		} else {
+			start = idx;
+		}
+
+		let myMarkers: IMarker[] = [];
+		let myTopSev: MarkerSeverity;
+
+		for (; start < markers.length && Range.areIntersecting(item.symbol.range, markers[start]); start++) {
+			// remove markers intersecting with this outline element
+			// and store them in a 'private' array.
+			let marker = markers[start];
+			myMarkers.push(marker);
+			markers[start] = undefined;
+			if (!myTopSev || marker.severity > myTopSev) {
+				myTopSev = marker.severity;
+			}
+		}
+
+		// Recurse into children and let them match markers that have matched
+		// this outline element. This might remove markers from this element and
+		// therefore we remember that we have had markers. That allows us to render
+		// the dot, saying 'this element has children with markers'
+		for (const key in item.children) {
+			this._updateMarker(myMarkers, item.children[key]);
+		}
+
+		if (myTopSev) {
+			item.marker = {
+				count: myMarkers.length,
+				topSev: myTopSev
+			};
+		}
+
+		coalesce(markers, true);
+	}
+}
+
+export class OutlineModel extends TreeElement {
+
+	private static readonly _requests = new LRUCache<string, { promiseCnt: number, source: CancellationTokenSource, promise: Promise<any>, model: OutlineModel }>(9, .75);
+	private static readonly _keys = new class {
+
+		private _counter = 1;
+		private _data = new WeakMap<DocumentSymbolProvider, number>();
+
+		for(textModel: ITextModel): string {
+			return `${textModel.id}/${textModel.getVersionId()}/${this._hash(DocumentSymbolProviderRegistry.all(textModel))}`;
+		}
+
+		private _hash(providers: DocumentSymbolProvider[]): string {
+			let result = '';
+			for (const provider of providers) {
+				let n = this._data.get(provider);
+				if (typeof n === 'undefined') {
+					n = this._counter++;
+					this._data.set(provider, n);
+				}
+				result += n;
+			}
+			return result;
+		}
+	};
+
+
+	static create(textModel: ITextModel, token: CancellationToken): Promise<OutlineModel> {
+
+		let key = this._keys.for(textModel);
+		let data = OutlineModel._requests.get(key);
+
+		if (!data) {
+			let source = new CancellationTokenSource();
+			data = {
+				promiseCnt: 0,
+				source,
+				promise: OutlineModel._create(textModel, source.token),
+				model: undefined,
+			};
+			OutlineModel._requests.set(key, data);
+		}
+
+		if (data.model) {
+			// resolved -> return data
+			return Promise.resolve(data.model);
+		}
+
+		// increase usage counter
+		data.promiseCnt += 1;
+
+		token.onCancellationRequested(() => {
+			// last -> cancel provider request, remove cached promise
+			if (--data.promiseCnt === 0) {
+				data.source.cancel();
+				OutlineModel._requests.delete(key);
+			}
+		});
+
+		return new Promise((resolve, reject) => {
+			data.promise.then(model => {
+				data.model = model;
+				resolve(model);
+			}, err => {
+				OutlineModel._requests.delete(key);
+				reject(err);
+			});
+		});
+	}
+
+	static _create(textModel: ITextModel, token: CancellationToken): Promise<OutlineModel> {
+
+		let result = new OutlineModel(textModel);
+		let promises = DocumentSymbolProviderRegistry.ordered(textModel).map((provider, index) => {
+
+			let id = TreeElement.findId(`provider_${index}`, result);
+			let group = new OutlineGroup(id, result, provider, index);
+
+			return Promise.resolve(provider.provideDocumentSymbols(result.textModel, token)).then(result => {
+				if (!isFalsyOrEmpty(result)) {
+					for (const info of result) {
+						OutlineModel._makeOutlineElement(info, group);
+					}
+				}
+				return group;
+			}, err => {
+				onUnexpectedExternalError(err);
+				return group;
+			}).then(group => {
+				if (!TreeElement.empty(group)) {
+					result._groups[id] = group;
+				} else {
+					group.remove();
+				}
+			});
+		});
+
+		return Promise.all(promises).then(() => result._compact());
+	}
+
+	private static _makeOutlineElement(info: DocumentSymbol, container: OutlineGroup | OutlineElement): void {
+		let id = TreeElement.findId(info, container);
+		let res = new OutlineElement(id, container, info);
+		if (info.children) {
+			for (const childInfo of info.children) {
+				OutlineModel._makeOutlineElement(childInfo, res);
+			}
+		}
+		container.children[res.id] = res;
+	}
+
+	static get(element: TreeElement): OutlineModel {
+		while (element) {
+			if (element instanceof OutlineModel) {
+				return element;
+			}
+			element = element.parent;
+		}
+		return undefined;
+	}
+
+	readonly id = 'root';
+	readonly parent = undefined;
+
+	protected _groups: { [id: string]: OutlineGroup; } = Object.create(null);
+	children: { [id: string]: OutlineGroup | OutlineElement; } = Object.create(null);
+
+	protected constructor(readonly textModel: ITextModel) {
+		super();
+	}
+
+	adopt(): OutlineModel {
+		let res = new OutlineModel(this.textModel);
+		forEach(this._groups, entry => res._groups[entry.key] = entry.value.adopt(res));
+		return res._compact();
+	}
+
+	private _compact(): this {
+		let count = 0;
+		for (const key in this._groups) {
+			let group = this._groups[key];
+			if (first(group.children) === undefined) { // empty
+				delete this._groups[key];
+			} else {
+				count += 1;
+			}
+		}
+		if (count !== 1) {
+			//
+			this.children = this._groups;
+		} else {
+			// adopt all elements of the first group
+			let group = first(this._groups);
+			for (let key in group.children) {
+				let child = group.children[key];
+				child.parent = this;
+				this.children[child.id] = child;
+			}
+		}
+		return this;
+	}
+
+	merge(other: OutlineModel): boolean {
+		if (this.textModel.uri.toString() !== other.textModel.uri.toString()) {
+			return false;
+		}
+		if (size(this._groups) !== size(other._groups)) {
+			return false;
+		}
+		this._groups = other._groups;
+		this.children = other.children;
+		return true;
+	}
+
+	private _matches: [string, OutlineElement];
+
+	updateMatches(pattern: string): OutlineElement {
+		if (this._matches && this._matches[0] === pattern) {
+			return this._matches[1];
+		}
+		let topMatch: OutlineElement;
+		for (const key in this._groups) {
+			topMatch = this._groups[key].updateMatches(pattern, topMatch);
+		}
+		this._matches = [pattern, topMatch];
+		return topMatch;
+	}
+
+	getItemEnclosingPosition(position: IPosition, context?: OutlineElement): OutlineElement {
+
+		let preferredGroup: OutlineGroup;
+		if (context) {
+			let candidate = context.parent;
+			while (candidate && !preferredGroup) {
+				if (candidate instanceof OutlineGroup) {
+					preferredGroup = candidate;
+				}
+				candidate = candidate.parent;
+			}
+		}
+
+		let result: OutlineElement = undefined;
+		for (const key in this._groups) {
+			const group = this._groups[key];
+			result = group.getItemEnclosingPosition(position);
+			if (result && (!preferredGroup || preferredGroup === group)) {
+				break;
+			}
+		}
+		return result;
+	}
+
+	getItemById(id: string): TreeElement {
+		return TreeElement.getElementById(id, this);
+	}
+
+	updateMarker(marker: IMarker[]): void {
+		// sort markers by start range so that we can use
+		// outline element starts for quicker look up
+		marker.sort(Range.compareRangesUsingStarts);
+
+		for (const key in this._groups) {
+			this._groups[key].updateMarker(marker.slice(0));
+		}
+	}
+}
diff --git a/src/vs/editor/contrib/documentSymbols/outlineTree.ts b/src/vs/editor/contrib/documentSymbols/outlineTree.ts
new file mode 100644
index 00000000000..6737e50335b
--- /dev/null
+++ b/src/vs/editor/contrib/documentSymbols/outlineTree.ts
@@ -0,0 +1,318 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+'use strict';
+
+import * as dom from 'vs/base/browser/dom';
+import { IMouseEvent } from 'vs/base/browser/mouseEvent';
+import { HighlightedLabel } from 'vs/base/browser/ui/highlightedlabel/highlightedLabel';
+import { values } from 'vs/base/common/collections';
+import { createMatches } from 'vs/base/common/filters';
+import { TPromise } from 'vs/base/common/winjs.base';
+import { IDataSource, IFilter, IRenderer, ISorter, ITree } from 'vs/base/parts/tree/browser/tree';
+import 'vs/css!./media/outlineTree';
+import 'vs/css!./media/symbol-icons';
+import { Range } from 'vs/editor/common/core/range';
+import { SymbolKind, symbolKindToCssClass } from 'vs/editor/common/modes';
+import { OutlineElement, OutlineGroup, OutlineModel, TreeElement } from 'vs/editor/contrib/documentSymbols/outlineModel';
+import { localize } from 'vs/nls';
+import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { WorkbenchTreeController } from 'vs/platform/list/browser/listService';
+import { MarkerSeverity } from 'vs/platform/markers/common/markers';
+import { listErrorForeground, listWarningForeground } from 'vs/platform/theme/common/colorRegistry';
+import { IThemeService } from 'vs/platform/theme/common/themeService';
+
+export const enum OutlineItemCompareType {
+	ByPosition,
+	ByName,
+	ByKind
+}
+
+export class OutlineItemComparator implements ISorter {
+
+	constructor(
+		public type: OutlineItemCompareType = OutlineItemCompareType.ByPosition
+	) { }
+
+	compare(tree: ITree, a: OutlineGroup | OutlineElement, b: OutlineGroup | OutlineElement): number {
+
+		if (a instanceof OutlineGroup && b instanceof OutlineGroup) {
+			return a.providerIndex - b.providerIndex;
+		}
+
+		if (a instanceof OutlineElement && b instanceof OutlineElement) {
+			switch (this.type) {
+				case OutlineItemCompareType.ByKind:
+					return a.symbol.kind - b.symbol.kind;
+				case OutlineItemCompareType.ByName:
+					return a.symbol.name.localeCompare(b.symbol.name);
+				case OutlineItemCompareType.ByPosition:
+				default:
+					return Range.compareRangesUsingStarts(a.symbol.range, b.symbol.range);
+			}
+		}
+
+		return 0;
+	}
+}
+
+export class OutlineItemFilter implements IFilter {
+
+	enabled: boolean = true;
+
+	isVisible(tree: ITree, element: OutlineElement | any): boolean {
+		if (!this.enabled) {
+			return true;
+		}
+		return !(element instanceof OutlineElement) || Boolean(element.score);
+	}
+}
+
+export class OutlineDataSource implements IDataSource {
+
+	// this is a workaround for the tree showing twisties for items
+	// with only filtered children
+	filterOnScore: boolean = true;
+
+	getId(tree: ITree, element: TreeElement): string {
+		return element ? element.id : 'empty';
+	}
+
+	hasChildren(tree: ITree, element: OutlineModel | OutlineGroup | OutlineElement): boolean {
+		if (!element) {
+			return false;
+		}
+		if (element instanceof OutlineModel) {
+			return true;
+		}
+		if (element instanceof OutlineElement && (this.filterOnScore && !element.score)) {
+			return false;
+		}
+		for (const id in element.children) {
+			if (!this.filterOnScore || element.children[id].score) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	getChildren(tree: ITree, element: TreeElement): TPromise<TreeElement[]> {
+		let res = values(element.children);
+		// console.log(element.id + ' with children ' + res.length);
+		return TPromise.wrap(res);
+	}
+
+	getParent(tree: ITree, element: TreeElement | any): TPromise<TreeElement> {
+		return TPromise.wrap(element && element.parent);
+	}
+
+	shouldAutoexpand(tree: ITree, element: TreeElement): boolean {
+		return element && (element instanceof OutlineModel || element.parent instanceof OutlineModel || element instanceof OutlineGroup || element.parent instanceof OutlineGroup);
+	}
+}
+
+export interface OutlineTemplate {
+	labelContainer: HTMLElement;
+	label: HighlightedLabel;
+	icon?: HTMLElement;
+	detail?: HTMLElement;
+	decoration?: HTMLElement;
+}
+
+export class OutlineRenderer implements IRenderer {
+
+	renderProblemColors = true;
+	renderProblemBadges = true;
+
+	constructor(
+		@IThemeService readonly _themeService: IThemeService,
+		@IConfigurationService readonly _configurationService: IConfigurationService
+	) {
+		//
+	}
+
+	getHeight(tree: ITree, element: any): number {
+		return 22;
+	}
+
+	getTemplateId(tree: ITree, element: OutlineGroup | OutlineElement): string {
+		return element instanceof OutlineGroup ? 'outline-group' : 'outline-element';
+	}
+
+	renderTemplate(tree: ITree, templateId: string, container: HTMLElement): OutlineTemplate {
+		if (templateId === 'outline-element') {
+			const icon = dom.$('.outline-element-icon symbol-icon');
+			const labelContainer = dom.$('.outline-element-label');
+			const detail = dom.$('.outline-element-detail');
+			const decoration = dom.$('.outline-element-decoration');
+			dom.addClass(container, 'outline-element');
+			dom.append(container, icon, labelContainer, detail, decoration);
+			return { icon, labelContainer, label: new HighlightedLabel(labelContainer), detail, decoration };
+		}
+		if (templateId === 'outline-group') {
+			const labelContainer = dom.$('.outline-element-label');
+			dom.addClass(container, 'outline-element');
+			dom.append(container, labelContainer);
+			return { labelContainer, label: new HighlightedLabel(labelContainer) };
+		}
+
+		throw new Error(templateId);
+	}
+
+	renderElement(tree: ITree, element: OutlineGroup | OutlineElement, templateId: string, template: OutlineTemplate): void {
+		if (element instanceof OutlineElement) {
+			template.icon.className = `outline-element-icon ${symbolKindToCssClass(element.symbol.kind)}`;
+			template.label.set(element.symbol.name, element.score ? createMatches(element.score[1]) : undefined, localize('title.template', "{0} ({1})", element.symbol.name, OutlineRenderer._symbolKindNames[element.symbol.kind]));
+			template.detail.innerText = element.symbol.detail || '';
+			this._renderMarkerInfo(element, template);
+
+		}
+		if (element instanceof OutlineGroup) {
+			template.label.set(element.provider.displayName || localize('provider', "Outline Provider"));
+		}
+	}
+
+	private _renderMarkerInfo(element: OutlineElement, template: OutlineTemplate): void {
+
+		if (!element.marker) {
+			dom.hide(template.decoration);
+			template.labelContainer.style.removeProperty('--outline-element-color');
+			return;
+		}
+
+		const { count, topSev } = element.marker;
+		const color = this._themeService.getTheme().getColor(topSev === MarkerSeverity.Error ? listErrorForeground : listWarningForeground);
+		const cssColor = color ? color.toString() : 'inherit';
+
+		// color of the label
+		if (this.renderProblemColors) {
+			template.labelContainer.style.setProperty('--outline-element-color', cssColor);
+		} else {
+			template.labelContainer.style.removeProperty('--outline-element-color');
+		}
+
+		// badge with color/rollup
+		if (!this.renderProblemBadges) {
+			dom.hide(template.decoration);
+
+		} else if (count > 0) {
+			dom.show(template.decoration);
+			dom.removeClass(template.decoration, 'bubble');
+			template.decoration.innerText = count < 10 ? count.toString() : '+9';
+			template.decoration.title = count === 1 ? localize('1.problem', "1 problem in this element") : localize('N.problem', "{0} problems in this element", count);
+			template.decoration.style.setProperty('--outline-element-color', cssColor);
+
+		} else {
+			dom.show(template.decoration);
+			dom.addClass(template.decoration, 'bubble');
+			template.decoration.innerText = '\uf052';
+			template.decoration.title = localize('deep.problem', "Contains elements with problems");
+			template.decoration.style.setProperty('--outline-element-color', cssColor);
+		}
+	}
+
+	private static _symbolKindNames: { [symbol: number]: string } = {
+		[SymbolKind.Array]: localize('Array', "array"),
+		[SymbolKind.Boolean]: localize('Boolean', "boolean"),
+		[SymbolKind.Class]: localize('Class', "class"),
+		[SymbolKind.Constant]: localize('Constant', "constant"),
+		[SymbolKind.Constructor]: localize('Constructor', "constructor"),
+		[SymbolKind.Enum]: localize('Enum', "enumeration"),
+		[SymbolKind.EnumMember]: localize('EnumMember', "enumeration member"),
+		[SymbolKind.Event]: localize('Event', "event"),
+		[SymbolKind.Field]: localize('Field', "field"),
+		[SymbolKind.File]: localize('File', "file"),
+		[SymbolKind.Function]: localize('Function', "function"),
+		[SymbolKind.Interface]: localize('Interface', "interface"),
+		[SymbolKind.Key]: localize('Key', "key"),
+		[SymbolKind.Method]: localize('Method', "method"),
+		[SymbolKind.Module]: localize('Module', "module"),
+		[SymbolKind.Namespace]: localize('Namespace', "namespace"),
+		[SymbolKind.Null]: localize('Null', "null"),
+		[SymbolKind.Number]: localize('Number', "number"),
+		[SymbolKind.Object]: localize('Object', "object"),
+		[SymbolKind.Operator]: localize('Operator', "operator"),
+		[SymbolKind.Package]: localize('Package', "package"),
+		[SymbolKind.Property]: localize('Property', "property"),
+		[SymbolKind.String]: localize('String', "string"),
+		[SymbolKind.Struct]: localize('Struct', "struct"),
+		[SymbolKind.TypeParameter]: localize('TypeParameter', "type parameter"),
+		[SymbolKind.Variable]: localize('Variable', "variable"),
+	};
+
+	disposeTemplate(tree: ITree, templateId: string, template: OutlineTemplate): void {
+		template.label.dispose();
+	}
+
+}
+
+export class OutlineTreeState {
+
+	readonly selected: string;
+	readonly focused: string;
+	readonly expanded: string[];
+
+	static capture(tree: ITree): OutlineTreeState {
+		// selection
+		let selected: string;
+		let element = tree.getSelection()[0];
+		if (element instanceof TreeElement) {
+			selected = element.id;
+		}
+
+		// focus
+		let focused: string;
+		element = tree.getFocus(true);
+		if (element instanceof TreeElement) {
+			focused = element.id;
+		}
+
+		// expansion
+		let expanded = new Array<string>();
+		let nav = tree.getNavigator();
+		while (nav.next()) {
+			let element = nav.current();
+			if (element instanceof TreeElement) {
+				if (tree.isExpanded(element)) {
+					expanded.push(element.id);
+				}
+			}
+		}
+		return { selected, focused, expanded };
+	}
+
+	static async restore(tree: ITree, state: OutlineTreeState, eventPayload: any): Promise<void> {
+		let model = <OutlineModel>tree.getInput();
+		if (!state || !(model instanceof OutlineModel)) {
+			return TPromise.as(undefined);
+		}
+
+		// expansion
+		let items: TreeElement[] = [];
+		for (const id of state.expanded) {
+			let item = model.getItemById(id);
+			if (item) {
+				items.push(item);
+			}
+		}
+		await tree.collapseAll(undefined);
+		await tree.expandAll(items);
+
+		// selection & focus
+		let selected = model.getItemById(state.selected);
+		let focused = model.getItemById(state.focused);
+		tree.setSelection([selected], eventPayload);
+		tree.setFocus(focused, eventPayload);
+	}
+}
+
+export class OutlineController extends WorkbenchTreeController {
+	protected shouldToggleExpansion(element: any, event: IMouseEvent, origin: string): boolean {
+		if (element instanceof OutlineElement) {
+			return this.isClickOnTwistie(event);
+		} else {
+			return super.shouldToggleExpansion(element, event, origin);
+		}
+	}
+}
diff --git a/src/vs/editor/contrib/documentSymbols/test/outlineModel.test.ts b/src/vs/editor/contrib/documentSymbols/test/outlineModel.test.ts
new file mode 100644
index 00000000000..0f46a22ff7c
--- /dev/null
+++ b/src/vs/editor/contrib/documentSymbols/test/outlineModel.test.ts
@@ -0,0 +1,188 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+import * as assert from 'assert';
+import { OutlineElement, OutlineGroup, OutlineModel } from '../outlineModel';
+import { SymbolKind, DocumentSymbol, DocumentSymbolProviderRegistry } from 'vs/editor/common/modes';
+import { Range } from 'vs/editor/common/core/range';
+import { IMarker, MarkerSeverity } from 'vs/platform/markers/common/markers';
+import { TextModel } from 'vs/editor/common/model/textModel';
+import { URI } from 'vs/base/common/uri';
+import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
+
+suite('OutlineModel', function () {
+
+	test('OutlineModel#create, cached', async function () {
+
+		let model = TextModel.createFromString('foo', undefined, undefined, URI.file('/fome/path.foo'));
+		let count = 0;
+		let reg = DocumentSymbolProviderRegistry.register({ pattern: '**/path.foo' }, {
+			provideDocumentSymbols() {
+				count += 1;
+				return [];
+			}
+		});
+
+		await OutlineModel.create(model, CancellationToken.None);
+		assert.equal(count, 1);
+
+		// cached
+		await OutlineModel.create(model, CancellationToken.None);
+		assert.equal(count, 1);
+
+		// new version
+		model.applyEdits([{ text: 'XXX', range: new Range(1, 1, 1, 1) }]);
+		await OutlineModel.create(model, CancellationToken.None);
+		assert.equal(count, 2);
+
+		reg.dispose();
+	});
+
+	test('OutlineModel#create, cached/cancel', async function () {
+
+		let model = TextModel.createFromString('foo', undefined, undefined, URI.file('/fome/path.foo'));
+		let isCancelled = false;
+
+		let reg = DocumentSymbolProviderRegistry.register({ pattern: '**/path.foo' }, {
+			provideDocumentSymbols(d, token) {
+				return new Promise(resolve => {
+					token.onCancellationRequested(_ => {
+						isCancelled = true;
+						resolve(null);
+					});
+				});
+			}
+		});
+
+		assert.equal(isCancelled, false);
+		let s1 = new CancellationTokenSource();
+		OutlineModel.create(model, s1.token);
+		let s2 = new CancellationTokenSource();
+		OutlineModel.create(model, s2.token);
+
+		s1.cancel();
+		assert.equal(isCancelled, false);
+
+		s2.cancel();
+		assert.equal(isCancelled, true);
+
+		reg.dispose();
+	});
+
+	function fakeSymbolInformation(range: Range, name: string = 'foo'): DocumentSymbol {
+		return {
+			name,
+			detail: 'fake',
+			kind: SymbolKind.Boolean,
+			selectionRange: range,
+			range: range
+		};
+	}
+
+	function fakeMarker(range: Range): IMarker {
+		return { ...range, owner: 'ffff', message: 'test', severity: MarkerSeverity.Error, resource: null };
+	}
+
+	test('OutlineElement - updateMarker', function () {
+
+		let e0 = new OutlineElement('foo1', null, fakeSymbolInformation(new Range(1, 1, 1, 10)));
+		let e1 = new OutlineElement('foo2', null, fakeSymbolInformation(new Range(2, 1, 5, 1)));
+		let e2 = new OutlineElement('foo3', null, fakeSymbolInformation(new Range(6, 1, 10, 10)));
+
+		let group = new OutlineGroup('group', null, null, 1);
+		group.children[e0.id] = e0;
+		group.children[e1.id] = e1;
+		group.children[e2.id] = e2;
+
+		const data = [fakeMarker(new Range(6, 1, 6, 7)), fakeMarker(new Range(1, 1, 1, 4)), fakeMarker(new Range(10, 2, 14, 1))];
+		data.sort(Range.compareRangesUsingStarts); // model does this
+
+		group.updateMarker(data);
+		assert.equal(data.length, 0); // all 'stolen'
+		assert.equal(e0.marker.count, 1);
+		assert.equal(e1.marker, undefined);
+		assert.equal(e2.marker.count, 2);
+
+		group.updateMarker([]);
+		assert.equal(e0.marker, undefined);
+		assert.equal(e1.marker, undefined);
+		assert.equal(e2.marker, undefined);
+	});
+
+	test('OutlineElement - updateMarker, 2', function () {
+
+		let p = new OutlineElement('A', null, fakeSymbolInformation(new Range(1, 1, 11, 1)));
+		let c1 = new OutlineElement('A/B', null, fakeSymbolInformation(new Range(2, 4, 5, 4)));
+		let c2 = new OutlineElement('A/C', null, fakeSymbolInformation(new Range(6, 4, 9, 4)));
+
+		let group = new OutlineGroup('group', null, null, 1);
+		group.children[p.id] = p;
+		p.children[c1.id] = c1;
+		p.children[c2.id] = c2;
+
+		let data = [
+			fakeMarker(new Range(2, 4, 5, 4))
+		];
+
+		group.updateMarker(data);
+		assert.equal(p.marker.count, 0);
+		assert.equal(c1.marker.count, 1);
+		assert.equal(c2.marker, undefined);
+
+		data = [
+			fakeMarker(new Range(2, 4, 5, 4)),
+			fakeMarker(new Range(2, 6, 2, 8)),
+			fakeMarker(new Range(7, 6, 7, 8)),
+		];
+		group.updateMarker(data);
+		assert.equal(p.marker.count, 0);
+		assert.equal(c1.marker.count, 2);
+		assert.equal(c2.marker.count, 1);
+
+		data = [
+			fakeMarker(new Range(1, 4, 1, 11)),
+			fakeMarker(new Range(7, 6, 7, 8)),
+		];
+		group.updateMarker(data);
+		assert.equal(p.marker.count, 1);
+		assert.equal(c1.marker, undefined);
+		assert.equal(c2.marker.count, 1);
+	});
+
+	test('OutlineElement - updateMarker/multiple groups', function () {
+
+		let model = new class extends OutlineModel {
+			constructor() {
+				super(null);
+			}
+			readyForTesting() {
+				this._groups = this.children as any;
+			}
+		};
+		model.children['g1'] = new OutlineGroup('g1', model, null, 1);
+		model.children['g1'].children['c1'] = new OutlineElement('c1', model.children['g1'], fakeSymbolInformation(new Range(1, 1, 11, 1)));
+
+		model.children['g2'] = new OutlineGroup('g2', model, null, 1);
+		model.children['g2'].children['c2'] = new OutlineElement('c2', model.children['g2'], fakeSymbolInformation(new Range(1, 1, 7, 1)));
+		model.children['g2'].children['c2'].children['c2.1'] = new OutlineElement('c2.1', model.children['g2'].children['c2'], fakeSymbolInformation(new Range(1, 3, 2, 19)));
+		model.children['g2'].children['c2'].children['c2.2'] = new OutlineElement('c2.2', model.children['g2'].children['c2'], fakeSymbolInformation(new Range(4, 1, 6, 10)));
+
+		model.readyForTesting();
+
+		const data = [
+			fakeMarker(new Range(1, 1, 2, 8)),
+			fakeMarker(new Range(6, 1, 6, 98)),
+		];
+
+		model.updateMarker(data);
+
+		assert.equal(model.children['g1'].children['c1'].marker.count, 2);
+		assert.equal(model.children['g2'].children['c2'].children['c2.1'].marker.count, 1);
+		assert.equal(model.children['g2'].children['c2'].children['c2.2'].marker.count, 1);
+	});
+
+});
diff --git a/src/vs/editor/contrib/find/findController.ts b/src/vs/editor/contrib/find/findController.ts
index 103d4ca4370..f7f0d9f2286 100644
--- a/src/vs/editor/contrib/find/findController.ts
+++ b/src/vs/editor/contrib/find/findController.ts
@@ -7,11 +7,11 @@
 import * as nls from 'vs/nls';
 import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
 import { Disposable } from 'vs/base/common/lifecycle';
-import { ContextKeyExpr, IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
+import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import * as strings from 'vs/base/common/strings';
 import * as editorCommon from 'vs/editor/common/editorCommon';
 import { registerEditorContribution, registerEditorAction, ServicesAccessor, EditorAction, EditorCommand, registerEditorCommand } from 'vs/editor/browser/editorExtensions';
-import { FIND_IDS, FindModelBoundToEditorModel, ToggleCaseSensitiveKeybinding, ToggleRegexKeybinding, ToggleWholeWordKeybinding, ToggleSearchScopeKeybinding, ShowPreviousFindTermKeybinding, ShowNextFindTermKeybinding, CONTEXT_FIND_WIDGET_VISIBLE, CONTEXT_FIND_INPUT_FOCUSED } from 'vs/editor/contrib/find/findModel';
+import { FIND_IDS, FindModelBoundToEditorModel, ToggleCaseSensitiveKeybinding, ToggleRegexKeybinding, ToggleWholeWordKeybinding, ToggleSearchScopeKeybinding, CONTEXT_FIND_WIDGET_VISIBLE } from 'vs/editor/contrib/find/findModel';
 import { FindReplaceState, FindReplaceStateChangedEvent, INewFindReplaceState } from 'vs/editor/contrib/find/findState';
 import { Delayer } from 'vs/base/common/async';
 import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
@@ -23,10 +23,9 @@ import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
 import { FindWidget, IFindController } from 'vs/editor/contrib/find/findWidget';
 import { FindOptionsWidget } from 'vs/editor/contrib/find/findOptionsWidget';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRegistry';
+import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
 import { optional } from 'vs/platform/instantiation/common/instantiation';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { showDeprecatedWarning } from 'vs/platform/widget/browser/input';
+import { MenuId } from 'vs/platform/actions/common/actions';
 
 export function getSelectionSearchString(editor: ICodeEditor): string {
 	let selection = editor.getSelection();
@@ -185,14 +184,17 @@ export class CommonFindController extends Disposable implements editorCommon.IEd
 
 	public toggleCaseSensitive(): void {
 		this._state.change({ matchCase: !this._state.matchCase }, false);
+		this.highlightFindOptions();
 	}
 
 	public toggleWholeWords(): void {
 		this._state.change({ wholeWord: !this._state.wholeWord }, false);
+		this.highlightFindOptions();
 	}
 
 	public toggleRegex(): void {
 		this._state.change({ isRegex: !this._state.isRegex }, false);
+		this.highlightFindOptions();
 	}
 
 	public toggleSearchScope(): void {
@@ -310,16 +312,6 @@ export class CommonFindController extends Disposable implements editorCommon.IEd
 		return false;
 	}
 
-	public showPreviousFindTerm(): boolean {
-		// overwritten in subclass
-		return false;
-	}
-
-	public showNextFindTerm(): boolean {
-		// overwritten in subclass
-		return false;
-	}
-
 	public getGlobalBufferTerm(): string {
 		if (this._editor.getConfiguration().contribInfo.find.globalFindClipboard
 			&& this._clipboardService
@@ -352,7 +344,6 @@ export class FindController extends CommonFindController implements IFindControl
 		@IKeybindingService private readonly _keybindingService: IKeybindingService,
 		@IThemeService private readonly _themeService: IThemeService,
 		@IStorageService storageService: IStorageService,
-		@INotificationService private readonly _notificationService: INotificationService,
 		@optional(IClipboardService) clipboardService: IClipboardService
 	) {
 		super(editor, _contextKeyService, storageService, clipboardService);
@@ -387,18 +378,6 @@ export class FindController extends CommonFindController implements IFindControl
 		this._widget = this._register(new FindWidget(this._editor, this, this._state, this._contextViewService, this._keybindingService, this._contextKeyService, this._themeService));
 		this._findOptionsWidget = this._register(new FindOptionsWidget(this._editor, this._state, this._keybindingService, this._themeService));
 	}
-
-	public showPreviousFindTerm(): boolean {
-		showDeprecatedWarning(this._notificationService, this._keybindingService, this._storageService);
-		this._widget.showPreviousFindTerm();
-		return true;
-	}
-
-	public showNextFindTerm(): boolean {
-		showDeprecatedWarning(this._notificationService, this._keybindingService, this._storageService);
-		this._widget.showNextFindTerm();
-		return true;
-	}
 }
 
 export class StartFindAction extends EditorAction {
@@ -411,7 +390,14 @@ export class StartFindAction extends EditorAction {
 			precondition: null,
 			kbOpts: {
 				kbExpr: null,
-				primary: KeyMod.CtrlCmd | KeyCode.KEY_F
+				primary: KeyMod.CtrlCmd | KeyCode.KEY_F,
+				weight: KeybindingWeight.EditorContrib
+			},
+			menubarOpts: {
+				menuId: MenuId.MenubarEditMenu,
+				group: '3_find',
+				title: nls.localize({ key: 'miFind', comment: ['&& denotes a mnemonic'] }, "&&Find"),
+				order: 1
 			}
 		});
 	}
@@ -443,7 +429,8 @@ export class StartFindWithSelectionAction extends EditorAction {
 				primary: null,
 				mac: {
 					primary: KeyMod.CtrlCmd | KeyCode.KEY_E,
-				}
+				},
+				weight: KeybindingWeight.EditorContrib
 			}
 		});
 	}
@@ -492,7 +479,8 @@ export class NextMatchFindAction extends MatchFindAction {
 			kbOpts: {
 				kbExpr: EditorContextKeys.focus,
 				primary: KeyCode.F3,
-				mac: { primary: KeyMod.CtrlCmd | KeyCode.KEY_G, secondary: [KeyCode.F3] }
+				mac: { primary: KeyMod.CtrlCmd | KeyCode.KEY_G, secondary: [KeyCode.F3] },
+				weight: KeybindingWeight.EditorContrib
 			}
 		});
 	}
@@ -513,7 +501,8 @@ export class PreviousMatchFindAction extends MatchFindAction {
 			kbOpts: {
 				kbExpr: EditorContextKeys.focus,
 				primary: KeyMod.Shift | KeyCode.F3,
-				mac: { primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KEY_G, secondary: [KeyMod.Shift | KeyCode.F3] }
+				mac: { primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KEY_G, secondary: [KeyMod.Shift | KeyCode.F3] },
+				weight: KeybindingWeight.EditorContrib
 			}
 		});
 	}
@@ -558,7 +547,8 @@ export class NextSelectionMatchFindAction extends SelectionMatchFindAction {
 			precondition: null,
 			kbOpts: {
 				kbExpr: EditorContextKeys.focus,
-				primary: KeyMod.CtrlCmd | KeyCode.F3
+				primary: KeyMod.CtrlCmd | KeyCode.F3,
+				weight: KeybindingWeight.EditorContrib
 			}
 		});
 	}
@@ -578,7 +568,8 @@ export class PreviousSelectionMatchFindAction extends SelectionMatchFindAction {
 			precondition: null,
 			kbOpts: {
 				kbExpr: EditorContextKeys.focus,
-				primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.F3
+				primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.F3,
+				weight: KeybindingWeight.EditorContrib
 			}
 		});
 	}
@@ -599,7 +590,14 @@ export class StartFindReplaceAction extends EditorAction {
 			kbOpts: {
 				kbExpr: null,
 				primary: KeyMod.CtrlCmd | KeyCode.KEY_H,
-				mac: { primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.KEY_F }
+				mac: { primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.KEY_F },
+				weight: KeybindingWeight.EditorContrib
+			},
+			menubarOpts: {
+				menuId: MenuId.MenubarEditMenu,
+				group: '3_find',
+				title: nls.localize({ key: 'miReplace', comment: ['&& denotes a mnemonic'] }, "&&Replace"),
+				order: 2
 			}
 		});
 	}
@@ -614,10 +612,9 @@ export class StartFindReplaceAction extends EditorAction {
 		// we only seed search string from selection when the current selection is single line and not empty.
 		let seedSearchStringFromSelection = !currentSelection.isEmpty() &&
 			currentSelection.startLineNumber === currentSelection.endLineNumber && editor.getConfiguration().contribInfo.find.seedSearchStringFromSelection;
-		let oldSearchString = controller.getState().searchString;
 		// if the existing search string in find widget is empty and we don't seed search string from selection, it means the Find Input
 		// is still empty, so we should focus the Find Input instead of Replace Input.
-		let shouldFocus = (!!oldSearchString || seedSearchStringFromSelection) ?
+		let shouldFocus = seedSearchStringFromSelection ?
 			FindStartFocusAction.FocusReplaceInput : FindStartFocusAction.FocusFindInput;
 
 		if (controller) {
@@ -632,54 +629,6 @@ export class StartFindReplaceAction extends EditorAction {
 	}
 }
 
-export class ShowNextFindTermAction extends MatchFindAction {
-
-	constructor() {
-		super({
-			id: FIND_IDS.ShowNextFindTermAction,
-			label: nls.localize('showNextFindTermAction', "Show Next Find Term"),
-			alias: 'Show Next Find Term',
-			precondition: CONTEXT_FIND_WIDGET_VISIBLE,
-			kbOpts: {
-				weight: KeybindingsRegistry.WEIGHT.editorContrib(5),
-				kbExpr: ContextKeyExpr.and(CONTEXT_FIND_INPUT_FOCUSED, EditorContextKeys.focus),
-				primary: ShowNextFindTermKeybinding.primary,
-				mac: ShowNextFindTermKeybinding.mac,
-				win: ShowNextFindTermKeybinding.win,
-				linux: ShowNextFindTermKeybinding.linux
-			}
-		});
-	}
-
-	protected _run(controller: CommonFindController): boolean {
-		return controller.showNextFindTerm();
-	}
-}
-
-export class ShowPreviousFindTermAction extends MatchFindAction {
-
-	constructor() {
-		super({
-			id: FIND_IDS.ShowPreviousFindTermAction,
-			label: nls.localize('showPreviousFindTermAction', "Show Previous Find Term"),
-			alias: 'Find Show Previous Find Term',
-			precondition: CONTEXT_FIND_WIDGET_VISIBLE,
-			kbOpts: {
-				weight: KeybindingsRegistry.WEIGHT.editorContrib(5),
-				kbExpr: ContextKeyExpr.and(CONTEXT_FIND_INPUT_FOCUSED, EditorContextKeys.focus),
-				primary: ShowPreviousFindTermKeybinding.primary,
-				mac: ShowPreviousFindTermKeybinding.mac,
-				win: ShowPreviousFindTermKeybinding.win,
-				linux: ShowPreviousFindTermKeybinding.linux
-			}
-		});
-	}
-
-	protected _run(controller: CommonFindController): boolean {
-		return controller.showPreviousFindTerm();
-	}
-}
-
 registerEditorContribution(FindController);
 
 registerEditorAction(StartFindAction);
@@ -689,8 +638,6 @@ registerEditorAction(PreviousMatchFindAction);
 registerEditorAction(NextSelectionMatchFindAction);
 registerEditorAction(PreviousSelectionMatchFindAction);
 registerEditorAction(StartFindReplaceAction);
-registerEditorAction(ShowNextFindTermAction);
-registerEditorAction(ShowPreviousFindTermAction);
 
 const FindCommand = EditorCommand.bindToContribution<CommonFindController>(CommonFindController.get);
 
@@ -699,7 +646,7 @@ registerEditorCommand(new FindCommand({
 	precondition: CONTEXT_FIND_WIDGET_VISIBLE,
 	handler: x => x.closeFindWidget(),
 	kbOpts: {
-		weight: KeybindingsRegistry.WEIGHT.editorContrib(5),
+		weight: KeybindingWeight.EditorContrib + 5,
 		kbExpr: EditorContextKeys.focus,
 		primary: KeyCode.Escape,
 		secondary: [KeyMod.Shift | KeyCode.Escape]
@@ -711,7 +658,7 @@ registerEditorCommand(new FindCommand({
 	precondition: null,
 	handler: x => x.toggleCaseSensitive(),
 	kbOpts: {
-		weight: KeybindingsRegistry.WEIGHT.editorContrib(5),
+		weight: KeybindingWeight.EditorContrib + 5,
 		kbExpr: EditorContextKeys.focus,
 		primary: ToggleCaseSensitiveKeybinding.primary,
 		mac: ToggleCaseSensitiveKeybinding.mac,
@@ -725,7 +672,7 @@ registerEditorCommand(new FindCommand({
 	precondition: null,
 	handler: x => x.toggleWholeWords(),
 	kbOpts: {
-		weight: KeybindingsRegistry.WEIGHT.editorContrib(5),
+		weight: KeybindingWeight.EditorContrib + 5,
 		kbExpr: EditorContextKeys.focus,
 		primary: ToggleWholeWordKeybinding.primary,
 		mac: ToggleWholeWordKeybinding.mac,
@@ -739,7 +686,7 @@ registerEditorCommand(new FindCommand({
 	precondition: null,
 	handler: x => x.toggleRegex(),
 	kbOpts: {
-		weight: KeybindingsRegistry.WEIGHT.editorContrib(5),
+		weight: KeybindingWeight.EditorContrib + 5,
 		kbExpr: EditorContextKeys.focus,
 		primary: ToggleRegexKeybinding.primary,
 		mac: ToggleRegexKeybinding.mac,
@@ -753,7 +700,7 @@ registerEditorCommand(new FindCommand({
 	precondition: null,
 	handler: x => x.toggleSearchScope(),
 	kbOpts: {
-		weight: KeybindingsRegistry.WEIGHT.editorContrib(5),
+		weight: KeybindingWeight.EditorContrib + 5,
 		kbExpr: EditorContextKeys.focus,
 		primary: ToggleSearchScopeKeybinding.primary,
 		mac: ToggleSearchScopeKeybinding.mac,
@@ -767,7 +714,7 @@ registerEditorCommand(new FindCommand({
 	precondition: CONTEXT_FIND_WIDGET_VISIBLE,
 	handler: x => x.replace(),
 	kbOpts: {
-		weight: KeybindingsRegistry.WEIGHT.editorContrib(5),
+		weight: KeybindingWeight.EditorContrib + 5,
 		kbExpr: EditorContextKeys.focus,
 		primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KEY_1
 	}
@@ -778,7 +725,7 @@ registerEditorCommand(new FindCommand({
 	precondition: CONTEXT_FIND_WIDGET_VISIBLE,
 	handler: x => x.replaceAll(),
 	kbOpts: {
-		weight: KeybindingsRegistry.WEIGHT.editorContrib(5),
+		weight: KeybindingWeight.EditorContrib + 5,
 		kbExpr: EditorContextKeys.focus,
 		primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.Enter
 	}
@@ -789,7 +736,7 @@ registerEditorCommand(new FindCommand({
 	precondition: CONTEXT_FIND_WIDGET_VISIBLE,
 	handler: x => x.selectAllMatches(),
 	kbOpts: {
-		weight: KeybindingsRegistry.WEIGHT.editorContrib(5),
+		weight: KeybindingWeight.EditorContrib + 5,
 		kbExpr: EditorContextKeys.focus,
 		primary: KeyMod.Alt | KeyCode.Enter
 	}
diff --git a/src/vs/editor/contrib/find/findModel.ts b/src/vs/editor/contrib/find/findModel.ts
index 1196fbbd9bd..bf51ac38ce5 100644
--- a/src/vs/editor/contrib/find/findModel.ts
+++ b/src/vs/editor/contrib/find/findModel.ts
@@ -46,12 +46,6 @@ export const ToggleSearchScopeKeybinding: IKeybindings = {
 	primary: KeyMod.Alt | KeyCode.KEY_L,
 	mac: { primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.KEY_L }
 };
-export const ShowPreviousFindTermKeybinding: IKeybindings = {
-	primary: KeyMod.Alt | KeyCode.UpArrow
-};
-export const ShowNextFindTermKeybinding: IKeybindings = {
-	primary: KeyMod.Alt | KeyCode.DownArrow
-};
 
 export const FIND_IDS = {
 	StartFindAction: 'actions.find',
@@ -68,11 +62,7 @@ export const FIND_IDS = {
 	ToggleSearchScopeCommand: 'toggleFindInSelection',
 	ReplaceOneAction: 'editor.action.replaceOne',
 	ReplaceAllAction: 'editor.action.replaceAll',
-	SelectAllMatchesAction: 'editor.action.selectAllMatches',
-	ShowPreviousFindTermAction: 'find.history.showPrevious',
-	ShowNextFindTermAction: 'find.history.showNext',
-	ShowPreviousReplaceTermAction: 'replace.history.showPrevious',
-	ShowNextReplaceTermAction: 'replace.history.showNext'
+	SelectAllMatchesAction: 'editor.action.selectAllMatches'
 };
 
 export const MATCHES_LIMIT = 19999;
diff --git a/src/vs/editor/contrib/find/findOptionsWidget.ts b/src/vs/editor/contrib/find/findOptionsWidget.ts
index fcf2d486513..3a23a72c56b 100644
--- a/src/vs/editor/contrib/find/findOptionsWidget.ts
+++ b/src/vs/editor/contrib/find/findOptionsWidget.ts
@@ -53,38 +53,38 @@ export class FindOptionsWidget extends Widget implements IOverlayWidget {
 		this.caseSensitive = this._register(new CaseSensitiveCheckbox({
 			appendTitle: this._keybindingLabelFor(FIND_IDS.ToggleCaseSensitiveCommand),
 			isChecked: this._state.matchCase,
-			onChange: (viaKeyboard) => {
-				this._state.change({
-					matchCase: this.caseSensitive.checked
-				}, false);
-			},
 			inputActiveOptionBorder: inputActiveOptionBorderColor
 		}));
 		this._domNode.appendChild(this.caseSensitive.domNode);
+		this._register(this.caseSensitive.onChange(() => {
+			this._state.change({
+				matchCase: this.caseSensitive.checked
+			}, false);
+		}));
 
 		this.wholeWords = this._register(new WholeWordsCheckbox({
 			appendTitle: this._keybindingLabelFor(FIND_IDS.ToggleWholeWordCommand),
 			isChecked: this._state.wholeWord,
-			onChange: (viaKeyboard) => {
-				this._state.change({
-					wholeWord: this.wholeWords.checked
-				}, false);
-			},
 			inputActiveOptionBorder: inputActiveOptionBorderColor
 		}));
 		this._domNode.appendChild(this.wholeWords.domNode);
+		this._register(this.wholeWords.onChange(() => {
+			this._state.change({
+				wholeWord: this.wholeWords.checked
+			}, false);
+		}));
 
 		this.regex = this._register(new RegexCheckbox({
 			appendTitle: this._keybindingLabelFor(FIND_IDS.ToggleRegexCommand),
 			isChecked: this._state.isRegex,
-			onChange: (viaKeyboard) => {
-				this._state.change({
-					isRegex: this.regex.checked
-				}, false);
-			},
 			inputActiveOptionBorder: inputActiveOptionBorderColor
 		}));
 		this._domNode.appendChild(this.regex.domNode);
+		this._register(this.regex.onChange(() => {
+			this._state.change({
+				isRegex: this.regex.checked
+			}, false);
+		}));
 
 		this._editor.addOverlayWidget(this);
 
diff --git a/src/vs/editor/contrib/find/findWidget.ts b/src/vs/editor/contrib/find/findWidget.ts
index 82b25e526c5..51a7e330944 100644
--- a/src/vs/editor/contrib/find/findWidget.ts
+++ b/src/vs/editor/contrib/find/findWidget.ts
@@ -29,8 +29,9 @@ import { IContextKeyService, IContextKey } from 'vs/platform/contextkey/common/c
 import { ITheme, registerThemingParticipant, IThemeService } from 'vs/platform/theme/common/themeService';
 import { Color } from 'vs/base/common/color';
 import { IConfigurationChangedEvent } from 'vs/editor/common/config/editorOptions';
-import { editorFindRangeHighlight, editorFindMatch, editorFindMatchHighlight, contrastBorder, inputBackground, editorWidgetBackground, inputActiveOptionBorder, widgetShadow, inputForeground, inputBorder, inputValidationInfoBackground, inputValidationInfoBorder, inputValidationWarningBackground, inputValidationWarningBorder, inputValidationErrorBackground, inputValidationErrorBorder, errorForeground, editorWidgetBorder, editorFindMatchBorder, editorFindMatchHighlightBorder, editorFindRangeHighlightBorder, editorWidgetResizeBorder } from 'vs/platform/theme/common/colorRegistry';
-import { ContextScopedFindInput, ContextScopedHistoryInputBox } from 'vs/platform/widget/browser/input';
+import { editorFindRangeHighlight, editorFindMatch, editorFindMatchHighlight, contrastBorder, inputBackground, editorWidgetBackground, inputActiveOptionBorder, widgetShadow, inputForeground, inputBorder, inputValidationInfoBackground, inputValidationInfoForeground, inputValidationInfoBorder, inputValidationWarningBackground, inputValidationWarningForeground, inputValidationWarningBorder, inputValidationErrorBackground, inputValidationErrorForeground, inputValidationErrorBorder, errorForeground, editorWidgetBorder, editorFindMatchBorder, editorFindMatchHighlightBorder, editorFindRangeHighlightBorder, editorWidgetResizeBorder } from 'vs/platform/theme/common/colorRegistry';
+import { ContextScopedFindInput, ContextScopedHistoryInputBox } from 'vs/platform/widget/browser/contextScopedHistoryWidget';
+import { toDisposable } from 'vs/base/common/lifecycle';
 
 
 export interface IFindController {
@@ -106,6 +107,7 @@ export class FindWidget extends Widget implements IOverlayWidget, IHorizontalSas
 
 	private _isVisible: boolean;
 	private _isReplaceVisible: boolean;
+	private _ignoreChangeEvent: boolean;
 
 	private _findFocusTracker: dom.IFocusTracker;
 	private _findInputFocused: IContextKey<boolean>;
@@ -137,8 +139,10 @@ export class FindWidget extends Widget implements IOverlayWidget, IHorizontalSas
 
 		this._isVisible = false;
 		this._isReplaceVisible = false;
+		this._ignoreChangeEvent = false;
 
 		this._updateHistoryDelayer = new Delayer<void>(500);
+		this._register(toDisposable(() => this._updateHistoryDelayer.cancel()));
 		this._register(this._state.onFindReplaceStateChange((e) => this._onStateChanged(e)));
 		this._buildDomNode();
 		this._updateButtons();
@@ -244,19 +248,16 @@ export class FindWidget extends Widget implements IOverlayWidget, IHorizontalSas
 		return null;
 	}
 
-	public showNextFindTerm() {
-		this._findInput.inputBox.showNextValue();
-	}
-
-	public showPreviousFindTerm() {
-		this._findInput.inputBox.showPreviousValue();
-	}
-
 	// ----- React to state changes
 
 	private _onStateChanged(e: FindReplaceStateChangedEvent): void {
 		if (e.searchString) {
-			this._findInput.setValue(this._state.searchString);
+			try {
+				this._ignoreChangeEvent = true;
+				this._findInput.setValue(this._state.searchString);
+			} finally {
+				this._ignoreChangeEvent = false;
+			}
 			this._updateButtons();
 		}
 		if (e.replaceString) {
@@ -320,10 +321,10 @@ export class FindWidget extends Widget implements IOverlayWidget, IHorizontalSas
 
 	private _updateHistory() {
 		if (this._state.searchString) {
-			this._findInput.inputBox.addToHistory(this._state.searchString);
+			this._findInput.inputBox.addToHistory();
 		}
 		if (this._state.replaceString) {
-			this._replaceInputBox.addToHistory(this._state.replaceString);
+			this._replaceInputBox.addToHistory();
 		}
 	}
 
@@ -412,6 +413,12 @@ export class FindWidget extends Widget implements IOverlayWidget, IHorizontalSas
 				dom.addClass(this._domNode, 'visible');
 				this._domNode.setAttribute('aria-hidden', 'false');
 			}, 0);
+
+			// validate query again as it's being dismissed when we hide the find widget.
+			setTimeout(() => {
+				this._findInput.validate();
+			}, 200);
+
 			this._codeEditor.layoutOverlayWidget(this);
 
 			let adjustEditorScrollTop = true;
@@ -449,6 +456,7 @@ export class FindWidget extends Widget implements IOverlayWidget, IHorizontalSas
 
 			dom.removeClass(this._domNode, 'visible');
 			this._domNode.setAttribute('aria-hidden', 'true');
+			this._findInput.clearMessage();
 			if (focusTheEditor) {
 				this._codeEditor.focus();
 			}
@@ -520,10 +528,13 @@ export class FindWidget extends Widget implements IOverlayWidget, IHorizontalSas
 			inputForeground: theme.getColor(inputForeground),
 			inputBorder: theme.getColor(inputBorder),
 			inputValidationInfoBackground: theme.getColor(inputValidationInfoBackground),
+			inputValidationInfoForeground: theme.getColor(inputValidationInfoForeground),
 			inputValidationInfoBorder: theme.getColor(inputValidationInfoBorder),
 			inputValidationWarningBackground: theme.getColor(inputValidationWarningBackground),
+			inputValidationWarningForeground: theme.getColor(inputValidationWarningForeground),
 			inputValidationWarningBorder: theme.getColor(inputValidationWarningBorder),
 			inputValidationErrorBackground: theme.getColor(inputValidationErrorBackground),
+			inputValidationErrorForeground: theme.getColor(inputValidationErrorForeground),
 			inputValidationErrorBorder: theme.getColor(inputValidationErrorBorder)
 		};
 		this._findInput.style(inputStyles);
@@ -621,13 +632,13 @@ export class FindWidget extends Widget implements IOverlayWidget, IHorizontalSas
 	private _onFindInputKeyDown(e: IKeyboardEvent): void {
 
 		if (e.equals(KeyCode.Enter)) {
-			this._codeEditor.getAction(FIND_IDS.NextMatchFindAction).run().done(null, onUnexpectedError);
+			this._codeEditor.getAction(FIND_IDS.NextMatchFindAction).run().then(null, onUnexpectedError);
 			e.preventDefault();
 			return;
 		}
 
 		if (e.equals(KeyMod.Shift | KeyCode.Enter)) {
-			this._codeEditor.getAction(FIND_IDS.PreviousMatchFindAction).run().done(null, onUnexpectedError);
+			this._codeEditor.getAction(FIND_IDS.PreviousMatchFindAction).run().then(null, onUnexpectedError);
 			e.preventDefault();
 			return;
 		}
@@ -734,6 +745,9 @@ export class FindWidget extends Widget implements IOverlayWidget, IHorizontalSas
 		this._findInput.setWholeWords(!!this._state.wholeWord);
 		this._register(this._findInput.onKeyDown((e) => this._onFindInputKeyDown(e)));
 		this._register(this._findInput.inputBox.onDidChange(() => {
+			if (this._ignoreChangeEvent) {
+				return;
+			}
 			this._state.change({ searchString: this._findInput.getValue() }, true);
 		}));
 		this._register(this._findInput.onDidOptionChange(() => {
@@ -764,7 +778,7 @@ export class FindWidget extends Widget implements IOverlayWidget, IHorizontalSas
 			label: NLS_PREVIOUS_MATCH_BTN_LABEL + this._keybindingLabelFor(FIND_IDS.PreviousMatchFindAction),
 			className: 'previous',
 			onTrigger: () => {
-				this._codeEditor.getAction(FIND_IDS.PreviousMatchFindAction).run().done(null, onUnexpectedError);
+				this._codeEditor.getAction(FIND_IDS.PreviousMatchFindAction).run().then(null, onUnexpectedError);
 			}
 		}));
 
@@ -773,7 +787,7 @@ export class FindWidget extends Widget implements IOverlayWidget, IHorizontalSas
 			label: NLS_NEXT_MATCH_BTN_LABEL + this._keybindingLabelFor(FIND_IDS.NextMatchFindAction),
 			className: 'next',
 			onTrigger: () => {
-				this._codeEditor.getAction(FIND_IDS.NextMatchFindAction).run().done(null, onUnexpectedError);
+				this._codeEditor.getAction(FIND_IDS.NextMatchFindAction).run().then(null, onUnexpectedError);
 			}
 		}));
 
@@ -840,8 +854,9 @@ export class FindWidget extends Widget implements IOverlayWidget, IHorizontalSas
 			history: []
 		}, this._contextKeyService));
 
+
 		this._register(dom.addStandardDisposableListener(this._replaceInputBox.inputElement, 'keydown', (e) => this._onReplaceInputKeyDown(e)));
-		this._register(dom.addStandardDisposableListener(this._replaceInputBox.inputElement, 'input', (e) => {
+		this._register(this._replaceInputBox.onDidChange((e) => {
 			this._state.change({ replaceString: this._replaceInputBox.value }, false);
 		}));
 
diff --git a/src/vs/editor/contrib/find/simpleFindWidget.ts b/src/vs/editor/contrib/find/simpleFindWidget.ts
index 44f7066321e..f99159eeb65 100644
--- a/src/vs/editor/contrib/find/simpleFindWidget.ts
+++ b/src/vs/editor/contrib/find/simpleFindWidget.ts
@@ -12,13 +12,10 @@ import * as dom from 'vs/base/browser/dom';
 import { FindInput } from 'vs/base/browser/ui/findinput/findInput';
 import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
 import { registerThemingParticipant, ITheme } from 'vs/platform/theme/common/themeService';
-import { inputBackground, inputActiveOptionBorder, inputForeground, inputBorder, inputValidationInfoBackground, inputValidationInfoBorder, inputValidationWarningBackground, inputValidationWarningBorder, inputValidationErrorBackground, inputValidationErrorBorder, editorWidgetBackground, widgetShadow } from 'vs/platform/theme/common/colorRegistry';
+import { inputBackground, inputActiveOptionBorder, inputForeground, inputBorder, inputValidationInfoBackground, inputValidationInfoForeground, inputValidationInfoBorder, inputValidationWarningBackground, inputValidationWarningForeground, inputValidationWarningBorder, inputValidationErrorBackground, inputValidationErrorForeground, inputValidationErrorBorder, editorWidgetBackground, widgetShadow } from 'vs/platform/theme/common/colorRegistry';
 import { SimpleButton } from './findWidget';
-import { ContextScopedFindInput, showDeprecatedWarning } from 'vs/platform/widget/browser/input';
+import { ContextScopedFindInput } from 'vs/platform/widget/browser/contextScopedHistoryWidget';
 import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { IStorageService } from 'vs/platform/storage/common/storage';
 
 const NLS_FIND_INPUT_LABEL = nls.localize('label.find', "Find");
 const NLS_FIND_INPUT_PLACEHOLDER = nls.localize('placeholder.find', "Find");
@@ -37,10 +34,7 @@ export abstract class SimpleFindWidget extends Widget {
 
 	constructor(
 		@IContextViewService private readonly _contextViewService: IContextViewService,
-		@IContextKeyService contextKeyService: IContextKeyService,
-		@IKeybindingService private readonly _keybindingService: IKeybindingService,
-		@INotificationService private readonly _notificationService: INotificationService,
-		@IStorageService private readonly _storageService: IStorageService
+		@IContextKeyService contextKeyService: IContextKeyService
 	) {
 		super();
 
@@ -139,6 +133,10 @@ export abstract class SimpleFindWidget extends Widget {
 		return this._findInput.getValue();
 	}
 
+	public get focusTracker(): dom.IFocusTracker {
+		return this._findInputFocusTracker;
+	}
+
 	public updateTheme(theme: ITheme): void {
 		const inputStyles = {
 			inputActiveOptionBorder: theme.getColor(inputActiveOptionBorder),
@@ -146,10 +144,13 @@ export abstract class SimpleFindWidget extends Widget {
 			inputForeground: theme.getColor(inputForeground),
 			inputBorder: theme.getColor(inputBorder),
 			inputValidationInfoBackground: theme.getColor(inputValidationInfoBackground),
+			inputValidationInfoForeground: theme.getColor(inputValidationInfoForeground),
 			inputValidationInfoBorder: theme.getColor(inputValidationInfoBorder),
 			inputValidationWarningBackground: theme.getColor(inputValidationWarningBackground),
+			inputValidationWarningForeground: theme.getColor(inputValidationWarningForeground),
 			inputValidationWarningBorder: theme.getColor(inputValidationWarningBorder),
 			inputValidationErrorBackground: theme.getColor(inputValidationErrorBackground),
+			inputValidationErrorForeground: theme.getColor(inputValidationErrorForeground),
 			inputValidationErrorBorder: theme.getColor(inputValidationErrorBorder)
 		};
 		this._findInput.style(inputStyles);
@@ -160,6 +161,7 @@ export abstract class SimpleFindWidget extends Widget {
 
 		if (this._domNode && this._domNode.parentElement) {
 			this._domNode.parentElement.removeChild(this._domNode);
+			this._domNode = undefined;
 		}
 	}
 
@@ -202,19 +204,7 @@ export abstract class SimpleFindWidget extends Widget {
 	}
 
 	protected _updateHistory() {
-		if (this.inputValue) {
-			this._findInput.inputBox.addToHistory(this._findInput.getValue());
-		}
-	}
-
-	public showNextFindTerm() {
-		showDeprecatedWarning(this._notificationService, this._keybindingService, this._storageService);
-		this._findInput.inputBox.showNextValue();
-	}
-
-	public showPreviousFindTerm() {
-		showDeprecatedWarning(this._notificationService, this._keybindingService, this._storageService);
-		this._findInput.inputBox.showPreviousValue();
+		this._findInput.inputBox.addToHistory();
 	}
 }
 
diff --git a/src/vs/editor/contrib/folding/folding.ts b/src/vs/editor/contrib/folding/folding.ts
index d614610198b..0af5f01951f 100644
--- a/src/vs/editor/contrib/folding/folding.ts
+++ b/src/vs/editor/contrib/folding/folding.ts
@@ -9,7 +9,7 @@ import 'vs/css!./folding';
 import * as nls from 'vs/nls';
 import * as types from 'vs/base/common/types';
 import { escapeRegExpCharacters } from 'vs/base/common/strings';
-import { RunOnceScheduler, Delayer, asWinJsPromise } from 'vs/base/common/async';
+import { RunOnceScheduler, Delayer, CancelablePromise, createCancelablePromise } from 'vs/base/common/async';
 import { KeyCode, KeyMod, KeyChord } from 'vs/base/common/keyCodes';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { TPromise } from 'vs/base/common/winjs.base';
@@ -29,9 +29,11 @@ import { LanguageConfigurationRegistry } from 'vs/editor/common/modes/languageCo
 import { IndentRangeProvider } from 'vs/editor/contrib/folding/indentRangeProvider';
 import { IPosition } from 'vs/editor/common/core/position';
 import { FoldingRangeProviderRegistry, FoldingRangeKind } from 'vs/editor/common/modes';
-import { SyntaxRangeProvider } from './syntaxRangeProvider';
+import { SyntaxRangeProvider, ID_SYNTAX_PROVIDER } from './syntaxRangeProvider';
 import { CancellationToken } from 'vs/base/common/cancellation';
-import { InitializingRangeProvider } from 'vs/editor/contrib/folding/intializingRangeProvider';
+import { InitializingRangeProvider, ID_INIT_PROVIDER } from 'vs/editor/contrib/folding/intializingRangeProvider';
+import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
+import { onUnexpectedError } from 'vs/base/common/errors';
 
 export const ID = 'editor.contrib.folding';
 
@@ -67,7 +69,7 @@ export class FoldingController implements IEditorContribution {
 	private hiddenRangeModel: HiddenRangeModel;
 
 	private rangeProvider: RangeProvider;
-	private foldingRegionPromise: TPromise<FoldingRegions>;
+	private foldingRegionPromise: CancelablePromise<FoldingRegions>;
 
 	private foldingStateMemento: FoldingStateMemento;
 
@@ -155,7 +157,7 @@ export class FoldingController implements IEditorContribution {
 			return;
 		}
 
-		if (state.provider !== 'indent') {
+		if (state.provider === ID_SYNTAX_PROVIDER || state.provider === ID_INIT_PROVIDER) {
 			this.foldingStateMemento = state;
 		}
 
@@ -165,7 +167,7 @@ export class FoldingController implements IEditorContribution {
 				if (foldingModel) {
 					foldingModel.applyMemento(state.collapsedRegions);
 				}
-			});
+			}).then(undefined, onUnexpectedError);
 		}
 	}
 
@@ -261,8 +263,8 @@ export class FoldingController implements IEditorContribution {
 				if (!this.foldingModel) { // null if editor has been disposed, or folding turned off
 					return null;
 				}
-				let foldingRegionPromise = this.foldingRegionPromise = asWinJsPromise<FoldingRegions>(token => this.getRangeProvider(this.foldingModel.textModel).compute(token));
-				return foldingRegionPromise.then(foldingRanges => {
+				let foldingRegionPromise = this.foldingRegionPromise = createCancelablePromise(token => this.getRangeProvider(this.foldingModel.textModel).compute(token));
+				return TPromise.wrap(foldingRegionPromise.then(foldingRanges => {
 					if (foldingRanges && foldingRegionPromise === this.foldingRegionPromise) { // new request or cancelled in the meantime?
 						// some cursors might have moved into hidden regions, make sure they are in expanded regions
 						let selections = this.editor.getSelections();
@@ -270,7 +272,7 @@ export class FoldingController implements IEditorContribution {
 						this.foldingModel.update(foldingRanges, selectionLineNumbers);
 					}
 					return this.foldingModel;
-				});
+				}));
 			});
 		}
 	}
@@ -311,7 +313,7 @@ export class FoldingController implements IEditorContribution {
 					}
 				}
 			}
-		});
+		}).then(undefined, onUnexpectedError);
 
 	}
 
@@ -331,10 +333,13 @@ export class FoldingController implements IEditorContribution {
 		switch (e.target.type) {
 			case MouseTargetType.GUTTER_LINE_DECORATIONS:
 				const data = e.target.detail as IMarginData;
-				const gutterOffsetX = data.offsetX - data.glyphMarginWidth - data.lineNumbersWidth - data.glyphMarginLeft;
+				const offsetLeftInGutter = (e.target.element as HTMLElement).offsetLeft;
+				const gutterOffsetX = data.offsetX - offsetLeftInGutter;
+
+				// const gutterOffsetX = data.offsetX - data.glyphMarginWidth - data.lineNumbersWidth - data.glyphMarginLeft;
 
 				// TODO@joao TODO@alex TODO@martin this is such that we don't collide with dirty diff
-				if (gutterOffsetX <= 10) {
+				if (gutterOffsetX < 5) { // the whitespace between the border and the real folding icon border is 5px
 					return;
 				}
 
@@ -403,7 +408,7 @@ export class FoldingController implements IEditorContribution {
 					}
 				}
 			}
-		});
+		}).then(undefined, onUnexpectedError);
 	}
 
 	public reveal(position: IPosition): void {
@@ -486,7 +491,8 @@ class UnfoldAction extends FoldingAction<FoldingArguments> {
 				primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.US_CLOSE_SQUARE_BRACKET,
 				mac: {
 					primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.US_CLOSE_SQUARE_BRACKET
-				}
+				},
+				weight: KeybindingWeight.EditorContrib
 			},
 			description: {
 				description: 'Unfold the content in the editor',
@@ -495,7 +501,7 @@ class UnfoldAction extends FoldingAction<FoldingArguments> {
 						name: 'Unfold editor argument',
 						description: `Property-value pairs that can be passed through this argument:
 						* 'levels': Number of levels to unfold. If not set, defaults to 1.
-						* 'direction': If 'up', unfold given number of levels up otherwise unfolds down
+						* 'direction': If 'up', unfold given number of levels up otherwise unfolds down.
 						* 'selectionLines': The start lines (0-based) of the editor selections to apply the unfold action to. If not set, the active selection(s) will be used.
 						`,
 						constraint: foldingArgumentsConstraint
@@ -526,7 +532,8 @@ class UnFoldRecursivelyAction extends FoldingAction<void> {
 			precondition: null,
 			kbOpts: {
 				kbExpr: EditorContextKeys.editorTextFocus,
-				primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_K, KeyMod.CtrlCmd | KeyCode.US_CLOSE_SQUARE_BRACKET)
+				primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_K, KeyMod.CtrlCmd | KeyCode.US_CLOSE_SQUARE_BRACKET),
+				weight: KeybindingWeight.EditorContrib
 			}
 		});
 	}
@@ -549,7 +556,8 @@ class FoldAction extends FoldingAction<FoldingArguments> {
 				primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.US_OPEN_SQUARE_BRACKET,
 				mac: {
 					primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.US_OPEN_SQUARE_BRACKET
-				}
+				},
+				weight: KeybindingWeight.EditorContrib
 			},
 			description: {
 				description: 'Fold the content in the editor',
@@ -557,8 +565,8 @@ class FoldAction extends FoldingAction<FoldingArguments> {
 					{
 						name: 'Fold editor argument',
 						description: `Property-value pairs that can be passed through this argument:
-							* 'levels': Number of levels to fold. Defaults to 1
-							* 'direction': If 'up', folds given number of levels up otherwise folds down
+							* 'levels': Number of levels to fold. Defaults to 1.
+							* 'direction': If 'up', folds given number of levels up otherwise folds down.
 							* 'selectionLines': The start lines (0-based) of the editor selections to apply the fold action to. If not set, the active selection(s) will be used.
 						`,
 						constraint: foldingArgumentsConstraint
@@ -589,7 +597,8 @@ class FoldRecursivelyAction extends FoldingAction<void> {
 			precondition: null,
 			kbOpts: {
 				kbExpr: EditorContextKeys.editorTextFocus,
-				primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_K, KeyMod.CtrlCmd | KeyCode.US_OPEN_SQUARE_BRACKET)
+				primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_K, KeyMod.CtrlCmd | KeyCode.US_OPEN_SQUARE_BRACKET),
+				weight: KeybindingWeight.EditorContrib
 			}
 		});
 	}
@@ -610,7 +619,8 @@ class FoldAllBlockCommentsAction extends FoldingAction<void> {
 			precondition: null,
 			kbOpts: {
 				kbExpr: EditorContextKeys.editorTextFocus,
-				primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_K, KeyMod.CtrlCmd | KeyCode.US_SLASH)
+				primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_K, KeyMod.CtrlCmd | KeyCode.US_SLASH),
+				weight: KeybindingWeight.EditorContrib
 			}
 		});
 	}
@@ -638,7 +648,8 @@ class FoldAllRegionsAction extends FoldingAction<void> {
 			precondition: null,
 			kbOpts: {
 				kbExpr: EditorContextKeys.editorTextFocus,
-				primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_K, KeyMod.CtrlCmd | KeyCode.KEY_8)
+				primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_K, KeyMod.CtrlCmd | KeyCode.KEY_8),
+				weight: KeybindingWeight.EditorContrib
 			}
 		});
 	}
@@ -666,7 +677,8 @@ class UnfoldAllRegionsAction extends FoldingAction<void> {
 			precondition: null,
 			kbOpts: {
 				kbExpr: EditorContextKeys.editorTextFocus,
-				primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_K, KeyMod.CtrlCmd | KeyCode.KEY_9)
+				primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_K, KeyMod.CtrlCmd | KeyCode.KEY_9),
+				weight: KeybindingWeight.EditorContrib
 			}
 		});
 	}
@@ -694,7 +706,8 @@ class FoldAllAction extends FoldingAction<void> {
 			precondition: null,
 			kbOpts: {
 				kbExpr: EditorContextKeys.editorTextFocus,
-				primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_K, KeyMod.CtrlCmd | KeyCode.KEY_0)
+				primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_K, KeyMod.CtrlCmd | KeyCode.KEY_0),
+				weight: KeybindingWeight.EditorContrib
 			}
 		});
 	}
@@ -714,7 +727,8 @@ class UnfoldAllAction extends FoldingAction<void> {
 			precondition: null,
 			kbOpts: {
 				kbExpr: EditorContextKeys.editorTextFocus,
-				primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_K, KeyMod.CtrlCmd | KeyCode.KEY_J)
+				primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_K, KeyMod.CtrlCmd | KeyCode.KEY_J),
+				weight: KeybindingWeight.EditorContrib
 			}
 		});
 	}
@@ -757,7 +771,8 @@ for (let i = 1; i <= 7; i++) {
 			precondition: null,
 			kbOpts: {
 				kbExpr: EditorContextKeys.editorTextFocus,
-				primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_K, KeyMod.CtrlCmd | (KeyCode.KEY_0 + i))
+				primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_K, KeyMod.CtrlCmd | (KeyCode.KEY_0 + i)),
+				weight: KeybindingWeight.EditorContrib
 			}
 		})
 	);
diff --git a/src/vs/editor/contrib/folding/indentRangeProvider.ts b/src/vs/editor/contrib/folding/indentRangeProvider.ts
index d897e5193da..727bcd29de1 100644
--- a/src/vs/editor/contrib/folding/indentRangeProvider.ts
+++ b/src/vs/editor/contrib/folding/indentRangeProvider.ts
@@ -16,8 +16,10 @@ import { CancellationToken } from 'vs/base/common/cancellation';
 
 const MAX_FOLDING_REGIONS_FOR_INDENT_LIMIT = 5000;
 
+export const ID_INDENT_PROVIDER = 'indent';
+
 export class IndentRangeProvider implements RangeProvider {
-	readonly id = 'indent';
+	readonly id = ID_INDENT_PROVIDER;
 
 	readonly decorations;
 
diff --git a/src/vs/editor/contrib/folding/intializingRangeProvider.ts b/src/vs/editor/contrib/folding/intializingRangeProvider.ts
index 4e7e024e80d..bd5fa4ae50b 100644
--- a/src/vs/editor/contrib/folding/intializingRangeProvider.ts
+++ b/src/vs/editor/contrib/folding/intializingRangeProvider.ts
@@ -12,8 +12,10 @@ import { TPromise } from 'vs/base/common/winjs.base';
 import { CancellationToken } from 'vs/base/common/cancellation';
 import { IFoldingRangeData, sanitizeRanges } from 'vs/editor/contrib/folding/syntaxRangeProvider';
 
+export const ID_INIT_PROVIDER = 'init';
+
 export class InitializingRangeProvider implements RangeProvider {
-	readonly id = 'init';
+	readonly id = ID_INIT_PROVIDER;
 
 	private decorationIds: string[] | undefined;
 	private timeout: number;
diff --git a/src/vs/editor/contrib/folding/syntaxRangeProvider.ts b/src/vs/editor/contrib/folding/syntaxRangeProvider.ts
index 916fc5bfb65..e52d226638a 100644
--- a/src/vs/editor/contrib/folding/syntaxRangeProvider.ts
+++ b/src/vs/editor/contrib/folding/syntaxRangeProvider.ts
@@ -23,9 +23,11 @@ export interface IFoldingRangeData extends FoldingRange {
 const foldingContext: FoldingContext = {
 };
 
+export const ID_SYNTAX_PROVIDER = 'syntax';
+
 export class SyntaxRangeProvider implements RangeProvider {
 
-	readonly id = 'syntax';
+	readonly id = ID_SYNTAX_PROVIDER;
 
 	constructor(private editorModel: ITextModel, private providers: FoldingRangeProvider[], private limit = MAX_FOLDING_REGIONS) {
 	}
diff --git a/src/vs/editor/contrib/format/format.ts b/src/vs/editor/contrib/format/format.ts
index bc6ed0f89d9..ea25a1e2086 100644
--- a/src/vs/editor/contrib/format/format.ts
+++ b/src/vs/editor/contrib/format/format.ts
@@ -3,19 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-'use strict';
-
 import { illegalArgument, onUnexpectedExternalError } from 'vs/base/common/errors';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { isFalsyOrEmpty } from 'vs/base/common/arrays';
-import { TPromise } from 'vs/base/common/winjs.base';
 import { Range } from 'vs/editor/common/core/range';
 import { ITextModel } from 'vs/editor/common/model';
 import { registerDefaultLanguageCommand, registerLanguageCommand } from 'vs/editor/browser/editorExtensions';
 import { DocumentFormattingEditProviderRegistry, DocumentRangeFormattingEditProviderRegistry, OnTypeFormattingEditProviderRegistry, FormattingOptions, TextEdit } from 'vs/editor/common/modes';
 import { IModelService } from 'vs/editor/common/services/modelService';
-import { asWinJsPromise, sequence } from 'vs/base/common/async';
+import { first2 } from 'vs/base/common/async';
 import { Position } from 'vs/editor/common/core/position';
+import { CancellationToken } from 'vs/base/common/cancellation';
 
 export class NoProviderError extends Error {
 
@@ -28,60 +26,44 @@ export class NoProviderError extends Error {
 	}
 }
 
-export function getDocumentRangeFormattingEdits(model: ITextModel, range: Range, options: FormattingOptions): TPromise<TextEdit[], NoProviderError> {
+export function getDocumentRangeFormattingEdits(model: ITextModel, range: Range, options: FormattingOptions, token: CancellationToken): Promise<TextEdit[]> {
 
 	const providers = DocumentRangeFormattingEditProviderRegistry.ordered(model);
 
 	if (providers.length === 0) {
-		return TPromise.wrapError(new NoProviderError());
+		return Promise.reject(new NoProviderError());
 	}
 
-	let result: TextEdit[];
-	return sequence(providers.map(provider => {
-		return () => {
-			if (!isFalsyOrEmpty(result)) {
-				return undefined;
-			}
-			return asWinJsPromise(token => provider.provideDocumentRangeFormattingEdits(model, range, options, token)).then(value => {
-				result = value;
-			}, onUnexpectedExternalError);
-		};
-	})).then(() => result);
+	return first2(providers.map(provider => () => {
+		return Promise.resolve(provider.provideDocumentRangeFormattingEdits(model, range, options, token))
+			.then(undefined, onUnexpectedExternalError);
+	}), result => !isFalsyOrEmpty(result));
 }
 
-export function getDocumentFormattingEdits(model: ITextModel, options: FormattingOptions): TPromise<TextEdit[]> {
+export function getDocumentFormattingEdits(model: ITextModel, options: FormattingOptions, token: CancellationToken): Promise<TextEdit[]> {
 	const providers = DocumentFormattingEditProviderRegistry.ordered(model);
 
 	// try range formatters when no document formatter is registered
 	if (providers.length === 0) {
-		return getDocumentRangeFormattingEdits(model, model.getFullModelRange(), options);
+		return getDocumentRangeFormattingEdits(model, model.getFullModelRange(), options, token);
 	}
 
-	let result: TextEdit[];
-	return sequence(providers.map(provider => {
-		return () => {
-			if (!isFalsyOrEmpty(result)) {
-				return undefined;
-			}
-			return asWinJsPromise(token => provider.provideDocumentFormattingEdits(model, options, token)).then(value => {
-				result = value;
-			}, onUnexpectedExternalError);
-		};
-	})).then(() => result);
+	return first2(providers.map(provider => () => {
+		return Promise.resolve(provider.provideDocumentFormattingEdits(model, options, token))
+			.then(undefined, onUnexpectedExternalError);
+	}), result => !isFalsyOrEmpty(result));
 }
 
-export function getOnTypeFormattingEdits(model: ITextModel, position: Position, ch: string, options: FormattingOptions): TPromise<TextEdit[]> {
+export function getOnTypeFormattingEdits(model: ITextModel, position: Position, ch: string, options: FormattingOptions): Promise<TextEdit[]> {
 	const [support] = OnTypeFormattingEditProviderRegistry.ordered(model);
 	if (!support) {
-		return TPromise.as(undefined);
+		return Promise.resolve(undefined);
 	}
 	if (support.autoFormatTriggerCharacters.indexOf(ch) < 0) {
-		return TPromise.as(undefined);
+		return Promise.resolve(undefined);
 	}
 
-	return asWinJsPromise((token) => {
-		return support.provideOnTypeFormattingEdits(model, position, ch, options, token);
-	}).then(r => r, onUnexpectedExternalError);
+	return Promise.resolve(support.provideOnTypeFormattingEdits(model, position, ch, options, CancellationToken.None)).then(r => r, onUnexpectedExternalError);
 }
 
 registerLanguageCommand('_executeFormatRangeProvider', function (accessor, args) {
@@ -93,7 +75,7 @@ registerLanguageCommand('_executeFormatRangeProvider', function (accessor, args)
 	if (!model) {
 		throw illegalArgument('resource');
 	}
-	return getDocumentRangeFormattingEdits(model, Range.lift(range), options);
+	return getDocumentRangeFormattingEdits(model, Range.lift(range), options, CancellationToken.None);
 });
 
 registerLanguageCommand('_executeFormatDocumentProvider', function (accessor, args) {
@@ -106,7 +88,7 @@ registerLanguageCommand('_executeFormatDocumentProvider', function (accessor, ar
 		throw illegalArgument('resource');
 	}
 
-	return getDocumentFormattingEdits(model, options);
+	return getDocumentFormattingEdits(model, options, CancellationToken.None);
 });
 
 registerDefaultLanguageCommand('_executeFormatOnTypeProvider', function (model, position, args) {
diff --git a/src/vs/editor/contrib/format/formatActions.ts b/src/vs/editor/contrib/format/formatActions.ts
index 985dd3e900e..6d425548f9d 100644
--- a/src/vs/editor/contrib/format/formatActions.ts
+++ b/src/vs/editor/contrib/format/formatActions.ts
@@ -26,6 +26,8 @@ import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
 import { ISingleEditOperation } from 'vs/editor/common/model';
 import { INotificationService } from 'vs/platform/notification/common/notification';
+import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
+import { CancellationToken } from 'vs/base/common/cancellation';
 
 
 function alertFormattingEdits(edits: ISingleEditOperation[]): void {
@@ -238,7 +240,7 @@ class FormatOnPaste implements editorCommon.IEditorContribution {
 		const { tabSize, insertSpaces } = model.getOptions();
 		const state = new EditorState(this.editor, CodeEditorStateFlag.Value | CodeEditorStateFlag.Position);
 
-		getDocumentRangeFormattingEdits(model, range, { tabSize, insertSpaces }).then(edits => {
+		getDocumentRangeFormattingEdits(model, range, { tabSize, insertSpaces }, CancellationToken.None).then(edits => {
 			return this.workerService.computeMoreMinimalEdits(model.uri, edits);
 		}).then(edits => {
 			if (!state.validate(this.editor) || isFalsyOrEmpty(edits)) {
@@ -266,7 +268,7 @@ export abstract class AbstractFormatAction extends EditorAction {
 		const workerService = accessor.get(IEditorWorkerService);
 		const notificationService = accessor.get(INotificationService);
 
-		const formattingPromise = this._getFormattingEdits(editor);
+		const formattingPromise = this._getFormattingEdits(editor, CancellationToken.None);
 		if (!formattingPromise) {
 			return TPromise.as(void 0);
 		}
@@ -275,7 +277,7 @@ export abstract class AbstractFormatAction extends EditorAction {
 		const state = new EditorState(editor, CodeEditorStateFlag.Value | CodeEditorStateFlag.Position);
 
 		// Receive formatted value from worker
-		return formattingPromise.then(edits => workerService.computeMoreMinimalEdits(editor.getModel().uri, edits)).then(edits => {
+		return TPromise.wrap(formattingPromise).then(edits => workerService.computeMoreMinimalEdits(editor.getModel().uri, edits)).then(edits => {
 			if (!state.validate(editor) || isFalsyOrEmpty(edits)) {
 				return;
 			}
@@ -283,6 +285,7 @@ export abstract class AbstractFormatAction extends EditorAction {
 			FormattingEdit.execute(editor, edits);
 			alertFormattingEdits(edits);
 			editor.focus();
+			editor.revealPositionInCenterIfOutsideViewport(editor.getPosition(), editorCommon.ScrollType.Immediate);
 		}, err => {
 			if (err instanceof Error && err.name === NoProviderError.Name) {
 				this._notifyNoProviderError(notificationService, editor.getModel().getLanguageIdentifier().language);
@@ -292,7 +295,8 @@ export abstract class AbstractFormatAction extends EditorAction {
 		});
 	}
 
-	protected abstract _getFormattingEdits(editor: ICodeEditor): TPromise<ISingleEditOperation[]>;
+	protected abstract _getFormattingEdits(editor: ICodeEditor, token: CancellationToken): Promise<ISingleEditOperation[]>;
+
 	protected _notifyNoProviderError(notificationService: INotificationService, language: string): void {
 		notificationService.info(nls.localize('no.provider', "There is no formatter for '{0}'-files installed.", language));
 	}
@@ -310,7 +314,8 @@ export class FormatDocumentAction extends AbstractFormatAction {
 				kbExpr: EditorContextKeys.editorTextFocus,
 				primary: KeyMod.Shift | KeyMod.Alt | KeyCode.KEY_F,
 				// secondary: [KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_K, KeyMod.CtrlCmd | KeyCode.KEY_D)],
-				linux: { primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KEY_I }
+				linux: { primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KEY_I },
+				weight: KeybindingWeight.EditorContrib
 			},
 			menuOpts: {
 				when: EditorContextKeys.hasDocumentFormattingProvider,
@@ -320,10 +325,10 @@ export class FormatDocumentAction extends AbstractFormatAction {
 		});
 	}
 
-	protected _getFormattingEdits(editor: ICodeEditor): TPromise<ISingleEditOperation[]> {
+	protected _getFormattingEdits(editor: ICodeEditor, token: CancellationToken): Promise<ISingleEditOperation[]> {
 		const model = editor.getModel();
 		const { tabSize, insertSpaces } = model.getOptions();
-		return getDocumentFormattingEdits(model, { tabSize, insertSpaces });
+		return getDocumentFormattingEdits(model, { tabSize, insertSpaces }, token);
 	}
 
 	protected _notifyNoProviderError(notificationService: INotificationService, language: string): void {
@@ -341,7 +346,8 @@ export class FormatSelectionAction extends AbstractFormatAction {
 			precondition: ContextKeyExpr.and(EditorContextKeys.writable, EditorContextKeys.hasNonEmptySelection),
 			kbOpts: {
 				kbExpr: EditorContextKeys.editorTextFocus,
-				primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_K, KeyMod.CtrlCmd | KeyCode.KEY_F)
+				primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_K, KeyMod.CtrlCmd | KeyCode.KEY_F),
+				weight: KeybindingWeight.EditorContrib
 			},
 			menuOpts: {
 				when: ContextKeyExpr.and(EditorContextKeys.hasDocumentSelectionFormattingProvider, EditorContextKeys.hasNonEmptySelection),
@@ -351,10 +357,10 @@ export class FormatSelectionAction extends AbstractFormatAction {
 		});
 	}
 
-	protected _getFormattingEdits(editor: ICodeEditor): TPromise<ISingleEditOperation[]> {
+	protected _getFormattingEdits(editor: ICodeEditor, token: CancellationToken): Promise<ISingleEditOperation[]> {
 		const model = editor.getModel();
 		const { tabSize, insertSpaces } = model.getOptions();
-		return getDocumentRangeFormattingEdits(model, editor.getSelection(), { tabSize, insertSpaces });
+		return getDocumentRangeFormattingEdits(model, editor.getSelection(), { tabSize, insertSpaces }, token);
 	}
 
 	protected _notifyNoProviderError(notificationService: INotificationService, language: string): void {
@@ -376,14 +382,14 @@ CommandsRegistry.registerCommand('editor.action.format', accessor => {
 			constructor() {
 				super({} as IActionOptions);
 			}
-			_getFormattingEdits(editor: ICodeEditor): TPromise<ISingleEditOperation[]> {
+			_getFormattingEdits(editor: ICodeEditor, token: CancellationToken): Promise<ISingleEditOperation[]> {
 				const model = editor.getModel();
 				const editorSelection = editor.getSelection();
 				const { tabSize, insertSpaces } = model.getOptions();
 
 				return editorSelection.isEmpty()
-					? getDocumentFormattingEdits(model, { tabSize, insertSpaces })
-					: getDocumentRangeFormattingEdits(model, editorSelection, { tabSize, insertSpaces });
+					? getDocumentFormattingEdits(model, { tabSize, insertSpaces }, token)
+					: getDocumentRangeFormattingEdits(model, editorSelection, { tabSize, insertSpaces }, token);
 			}
 		}().run(accessor, editor);
 	}
diff --git a/src/vs/editor/contrib/goToDefinition/clickLinkGesture.ts b/src/vs/editor/contrib/goToDefinition/clickLinkGesture.ts
index f8157b3bf0c..8bc694f358a 100644
--- a/src/vs/editor/contrib/goToDefinition/clickLinkGesture.ts
+++ b/src/vs/editor/contrib/goToDefinition/clickLinkGesture.ts
@@ -52,19 +52,20 @@ export class ClickLinkKeyboardEvent {
 		this.hasTriggerModifier = hasModifier(source, opts.triggerModifier);
 	}
 }
+export type TriggerModifier = 'ctrlKey' | 'shiftKey' | 'altKey' | 'metaKey';
 
 export class ClickLinkOptions {
 
 	public readonly triggerKey: KeyCode;
-	public readonly triggerModifier: 'ctrlKey' | 'shiftKey' | 'altKey' | 'metaKey';
+	public readonly triggerModifier: TriggerModifier;
 	public readonly triggerSideBySideKey: KeyCode;
-	public readonly triggerSideBySideModifier: 'ctrlKey' | 'shiftKey' | 'altKey' | 'metaKey';
+	public readonly triggerSideBySideModifier: TriggerModifier;
 
 	constructor(
 		triggerKey: KeyCode,
-		triggerModifier: 'ctrlKey' | 'shiftKey' | 'altKey' | 'metaKey',
+		triggerModifier: TriggerModifier,
 		triggerSideBySideKey: KeyCode,
-		triggerSideBySideModifier: 'ctrlKey' | 'shiftKey' | 'altKey' | 'metaKey'
+		triggerSideBySideModifier: TriggerModifier
 	) {
 		this.triggerKey = triggerKey;
 		this.triggerModifier = triggerModifier;
diff --git a/src/vs/editor/contrib/goToDefinition/goToDefinition.ts b/src/vs/editor/contrib/goToDefinition/goToDefinition.ts
index f79912d8323..e5fc9e10930 100644
--- a/src/vs/editor/contrib/goToDefinition/goToDefinition.ts
+++ b/src/vs/editor/contrib/goToDefinition/goToDefinition.ts
@@ -3,60 +3,55 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-'use strict';
-
-import { onUnexpectedExternalError } from 'vs/base/common/errors';
-import { TPromise } from 'vs/base/common/winjs.base';
-import { ITextModel } from 'vs/editor/common/model';
-import { registerDefaultLanguageCommand } from 'vs/editor/browser/editorExtensions';
-import LanguageFeatureRegistry from 'vs/editor/common/modes/languageFeatureRegistry';
-import { DefinitionProviderRegistry, ImplementationProviderRegistry, TypeDefinitionProviderRegistry, Location } from 'vs/editor/common/modes';
+import { flatten, coalesce } from 'vs/base/common/arrays';
 import { CancellationToken } from 'vs/base/common/cancellation';
-import { asWinJsPromise } from 'vs/base/common/async';
+import { onUnexpectedExternalError } from 'vs/base/common/errors';
+import { registerDefaultLanguageCommand } from 'vs/editor/browser/editorExtensions';
 import { Position } from 'vs/editor/common/core/position';
-import { flatten } from 'vs/base/common/arrays';
+import { ITextModel } from 'vs/editor/common/model';
+import { DefinitionLink, DefinitionProviderRegistry, ImplementationProviderRegistry, TypeDefinitionProviderRegistry } from 'vs/editor/common/modes';
+import LanguageFeatureRegistry from 'vs/editor/common/modes/languageFeatureRegistry';
+
 
 function getDefinitions<T>(
 	model: ITextModel,
 	position: Position,
 	registry: LanguageFeatureRegistry<T>,
-	provide: (provider: T, model: ITextModel, position: Position, token: CancellationToken) => Location | Location[] | Thenable<Location | Location[]>
-): TPromise<Location[]> {
+	provide: (provider: T, model: ITextModel, position: Position) => DefinitionLink | DefinitionLink[] | Thenable<DefinitionLink | DefinitionLink[]>
+): Thenable<DefinitionLink[]> {
 	const provider = registry.ordered(model);
 
 	// get results
-	const promises = provider.map((provider, idx): TPromise<Location | Location[]> => {
-		return asWinJsPromise((token) => {
-			return provide(provider, model, position, token);
-		}).then(undefined, err => {
+	const promises = provider.map((provider): Thenable<DefinitionLink | DefinitionLink[]> => {
+		return Promise.resolve(provide(provider, model, position)).then(undefined, err => {
 			onUnexpectedExternalError(err);
 			return null;
 		});
 	});
-	return TPromise.join(promises)
+	return Promise.all(promises)
 		.then(flatten)
-		.then(references => references.filter(x => !!x));
+		.then(references => coalesce(references));
 }
 
 
-export function getDefinitionsAtPosition(model: ITextModel, position: Position): TPromise<Location[]> {
-	return getDefinitions(model, position, DefinitionProviderRegistry, (provider, model, position, token) => {
+export function getDefinitionsAtPosition(model: ITextModel, position: Position, token: CancellationToken): Thenable<DefinitionLink[]> {
+	return getDefinitions(model, position, DefinitionProviderRegistry, (provider, model, position) => {
 		return provider.provideDefinition(model, position, token);
 	});
 }
 
-export function getImplementationsAtPosition(model: ITextModel, position: Position): TPromise<Location[]> {
-	return getDefinitions(model, position, ImplementationProviderRegistry, (provider, model, position, token) => {
+export function getImplementationsAtPosition(model: ITextModel, position: Position, token: CancellationToken): Thenable<DefinitionLink[]> {
+	return getDefinitions(model, position, ImplementationProviderRegistry, (provider, model, position) => {
 		return provider.provideImplementation(model, position, token);
 	});
 }
 
-export function getTypeDefinitionsAtPosition(model: ITextModel, position: Position): TPromise<Location[]> {
-	return getDefinitions(model, position, TypeDefinitionProviderRegistry, (provider, model, position, token) => {
+export function getTypeDefinitionsAtPosition(model: ITextModel, position: Position, token: CancellationToken): Thenable<DefinitionLink[]> {
+	return getDefinitions(model, position, TypeDefinitionProviderRegistry, (provider, model, position) => {
 		return provider.provideTypeDefinition(model, position, token);
 	});
 }
 
-registerDefaultLanguageCommand('_executeDefinitionProvider', getDefinitionsAtPosition);
-registerDefaultLanguageCommand('_executeImplementationProvider', getImplementationsAtPosition);
-registerDefaultLanguageCommand('_executeTypeDefinitionProvider', getTypeDefinitionsAtPosition);
+registerDefaultLanguageCommand('_executeDefinitionProvider', (model, position) => getDefinitionsAtPosition(model, position, CancellationToken.None));
+registerDefaultLanguageCommand('_executeImplementationProvider', (model, position) => getImplementationsAtPosition(model, position, CancellationToken.None));
+registerDefaultLanguageCommand('_executeTypeDefinitionProvider', (model, position) => getTypeDefinitionsAtPosition(model, position, CancellationToken.None));
diff --git a/src/vs/editor/contrib/goToDefinition/goToDefinitionCommands.ts b/src/vs/editor/contrib/goToDefinition/goToDefinitionCommands.ts
index 348b9833544..bd859bd3cde 100644
--- a/src/vs/editor/contrib/goToDefinition/goToDefinitionCommands.ts
+++ b/src/vs/editor/contrib/goToDefinition/goToDefinitionCommands.ts
@@ -3,8 +3,6 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-'use strict';
-
 import * as nls from 'vs/nls';
 import { alert } from 'vs/base/browser/ui/aria/aria';
 import { KeyCode, KeyMod, KeyChord } from 'vs/base/common/keyCodes';
@@ -13,7 +11,7 @@ import { TPromise } from 'vs/base/common/winjs.base';
 import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
 import { Range } from 'vs/editor/common/core/range';
 import { registerEditorAction, IActionOptions, ServicesAccessor, EditorAction } from 'vs/editor/browser/editorExtensions';
-import { Location } from 'vs/editor/common/modes';
+import { DefinitionLink } from 'vs/editor/common/modes';
 import { getDefinitionsAtPosition, getImplementationsAtPosition, getTypeDefinitionsAtPosition } from './goToDefinition';
 import { ReferencesController } from 'vs/editor/contrib/referenceSearch/referencesController';
 import { ReferencesModel } from 'vs/editor/contrib/referenceSearch/referencesModel';
@@ -26,6 +24,10 @@ import { IProgressService } from 'vs/platform/progress/common/progress';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
 import { ITextModel, IWordAtPosition } from 'vs/editor/common/model';
 import { INotificationService } from 'vs/platform/notification/common/notification';
+import { createCancelablePromise } from 'vs/base/common/async';
+import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
+import { MenuRegistry, MenuId } from 'vs/platform/actions/common/actions';
+import { CancellationToken } from 'vs/base/common/cancellation';
 
 export class DefinitionActionConfig {
 
@@ -56,7 +58,7 @@ export class DefinitionAction extends EditorAction {
 		const model = editor.getModel();
 		const pos = editor.getPosition();
 
-		const definitionPromise = this._getDeclarationsAtPosition(model, pos).then(references => {
+		const definitionPromise = this._getDeclarationsAtPosition(model, pos, CancellationToken.None).then(references => {
 
 			if (model.isDisposed() || editor.getModel() !== model) {
 				// new model, no more model
@@ -66,7 +68,7 @@ export class DefinitionAction extends EditorAction {
 			// * remove falsy references
 			// * find reference at the current pos
 			let idxOfCurrent = -1;
-			let result: Location[] = [];
+			const result: DefinitionLink[] = [];
 			for (let i = 0; i < references.length; i++) {
 				let reference = references[i];
 				if (!reference || !reference.range) {
@@ -108,11 +110,11 @@ export class DefinitionAction extends EditorAction {
 		});
 
 		progressService.showWhile(definitionPromise, 250);
-		return definitionPromise;
+		return TPromise.wrap(definitionPromise);
 	}
 
-	protected _getDeclarationsAtPosition(model: ITextModel, position: corePosition.Position): TPromise<Location[]> {
-		return getDefinitionsAtPosition(model, position);
+	protected _getDeclarationsAtPosition(model: ITextModel, position: corePosition.Position, token: CancellationToken): Thenable<DefinitionLink[]> {
+		return getDefinitionsAtPosition(model, position, token);
 	}
 
 	protected _getNoResultFoundMessage(info?: IWordAtPosition): string {
@@ -144,13 +146,13 @@ export class DefinitionAction extends EditorAction {
 		}
 	}
 
-	private _openReference(editor: ICodeEditor, editorService: ICodeEditorService, reference: Location, sideBySide: boolean): TPromise<ICodeEditor> {
-		let { uri, range } = reference;
+	private _openReference(editor: ICodeEditor, editorService: ICodeEditorService, reference: DefinitionLink, sideBySide: boolean): TPromise<ICodeEditor> {
+		const { uri, range } = reference;
 		return editorService.openCodeEditor({
 			resource: uri,
 			options: {
 				selection: Range.collapseToStart(range),
-				revealIfVisible: true,
+				revealIfOpened: true,
 				revealInCenterIfOutsideViewport: true
 			}
 		}, editor, sideBySide);
@@ -159,7 +161,7 @@ export class DefinitionAction extends EditorAction {
 	private _openInPeek(editorService: ICodeEditorService, target: ICodeEditor, model: ReferencesModel) {
 		let controller = ReferencesController.get(target);
 		if (controller) {
-			controller.toggleWidget(target.getSelection(), TPromise.as(model), {
+			controller.toggleWidget(target.getSelection(), createCancelablePromise(_ => Promise.resolve(model)), {
 				getMetaTitle: (model) => {
 					return this._getMetaTitle(model);
 				},
@@ -192,7 +194,8 @@ export class GoToDefinitionAction extends DefinitionAction {
 				EditorContextKeys.isInEmbeddedEditor.toNegated()),
 			kbOpts: {
 				kbExpr: EditorContextKeys.editorTextFocus,
-				primary: goToDeclarationKb
+				primary: goToDeclarationKb,
+				weight: KeybindingWeight.EditorContrib
 			},
 			menuOpts: {
 				group: 'navigation',
@@ -216,7 +219,8 @@ export class OpenDefinitionToSideAction extends DefinitionAction {
 				EditorContextKeys.isInEmbeddedEditor.toNegated()),
 			kbOpts: {
 				kbExpr: EditorContextKeys.editorTextFocus,
-				primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_K, goToDeclarationKb)
+				primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_K, goToDeclarationKb),
+				weight: KeybindingWeight.EditorContrib
 			}
 		});
 	}
@@ -235,7 +239,8 @@ export class PeekDefinitionAction extends DefinitionAction {
 			kbOpts: {
 				kbExpr: EditorContextKeys.editorTextFocus,
 				primary: KeyMod.Alt | KeyCode.F12,
-				linux: { primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.F10 }
+				linux: { primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.F10 },
+				weight: KeybindingWeight.EditorContrib
 			},
 			menuOpts: {
 				group: 'navigation',
@@ -246,8 +251,8 @@ export class PeekDefinitionAction extends DefinitionAction {
 }
 
 export class ImplementationAction extends DefinitionAction {
-	protected _getDeclarationsAtPosition(model: ITextModel, position: corePosition.Position): TPromise<Location[]> {
-		return getImplementationsAtPosition(model, position);
+	protected _getDeclarationsAtPosition(model: ITextModel, position: corePosition.Position, token: CancellationToken): Thenable<DefinitionLink[]> {
+		return getImplementationsAtPosition(model, position, token);
 	}
 
 	protected _getNoResultFoundMessage(info?: IWordAtPosition): string {
@@ -275,7 +280,8 @@ export class GoToImplementationAction extends ImplementationAction {
 				EditorContextKeys.isInEmbeddedEditor.toNegated()),
 			kbOpts: {
 				kbExpr: EditorContextKeys.editorTextFocus,
-				primary: KeyMod.CtrlCmd | KeyCode.F12
+				primary: KeyMod.CtrlCmd | KeyCode.F12,
+				weight: KeybindingWeight.EditorContrib
 			}
 		});
 	}
@@ -295,15 +301,16 @@ export class PeekImplementationAction extends ImplementationAction {
 				EditorContextKeys.isInEmbeddedEditor.toNegated()),
 			kbOpts: {
 				kbExpr: EditorContextKeys.editorTextFocus,
-				primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.F12
+				primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.F12,
+				weight: KeybindingWeight.EditorContrib
 			}
 		});
 	}
 }
 
 export class TypeDefinitionAction extends DefinitionAction {
-	protected _getDeclarationsAtPosition(model: ITextModel, position: corePosition.Position): TPromise<Location[]> {
-		return getTypeDefinitionsAtPosition(model, position);
+	protected _getDeclarationsAtPosition(model: ITextModel, position: corePosition.Position, token: CancellationToken): Thenable<DefinitionLink[]> {
+		return getTypeDefinitionsAtPosition(model, position, token);
 	}
 
 	protected _getNoResultFoundMessage(info?: IWordAtPosition): string {
@@ -331,7 +338,8 @@ export class GoToTypeDefinitionAction extends TypeDefinitionAction {
 				EditorContextKeys.isInEmbeddedEditor.toNegated()),
 			kbOpts: {
 				kbExpr: EditorContextKeys.editorTextFocus,
-				primary: 0
+				primary: 0,
+				weight: KeybindingWeight.EditorContrib
 			},
 			menuOpts: {
 				group: 'navigation',
@@ -355,7 +363,8 @@ export class PeekTypeDefinitionAction extends TypeDefinitionAction {
 				EditorContextKeys.isInEmbeddedEditor.toNegated()),
 			kbOpts: {
 				kbExpr: EditorContextKeys.editorTextFocus,
-				primary: 0
+				primary: 0,
+				weight: KeybindingWeight.EditorContrib
 			}
 		});
 	}
@@ -368,3 +377,31 @@ registerEditorAction(GoToImplementationAction);
 registerEditorAction(PeekImplementationAction);
 registerEditorAction(GoToTypeDefinitionAction);
 registerEditorAction(PeekTypeDefinitionAction);
+
+// Go to menu
+MenuRegistry.appendMenuItem(MenuId.MenubarGoMenu, {
+	group: 'z_go_to',
+	command: {
+		id: 'editor.action.goToDeclaration',
+		title: nls.localize({ key: 'miGotoDefinition', comment: ['&& denotes a mnemonic'] }, "Go to &&Definition")
+	},
+	order: 4
+});
+
+MenuRegistry.appendMenuItem(MenuId.MenubarGoMenu, {
+	group: 'z_go_to',
+	command: {
+		id: 'editor.action.goToTypeDefinition',
+		title: nls.localize({ key: 'miGotoTypeDefinition', comment: ['&& denotes a mnemonic'] }, "Go to &&Type Definition")
+	},
+	order: 5
+});
+
+MenuRegistry.appendMenuItem(MenuId.MenubarGoMenu, {
+	group: 'z_go_to',
+	command: {
+		id: 'editor.action.goToImplementation',
+		title: nls.localize({ key: 'miGotoImplementation', comment: ['&& denotes a mnemonic'] }, "Go to &&Implementation")
+	},
+	order: 6
+});
diff --git a/src/vs/editor/contrib/goToDefinition/goToDefinitionMouse.ts b/src/vs/editor/contrib/goToDefinition/goToDefinitionMouse.ts
index b57914b16d3..48b589f2ee3 100644
--- a/src/vs/editor/contrib/goToDefinition/goToDefinitionMouse.ts
+++ b/src/vs/editor/contrib/goToDefinition/goToDefinitionMouse.ts
@@ -7,14 +7,15 @@
 
 import 'vs/css!./goToDefinitionMouse';
 import * as nls from 'vs/nls';
-import { Throttler } from 'vs/base/common/async';
+import { createCancelablePromise, CancelablePromise } from 'vs/base/common/async';
+import { CancellationToken } from 'vs/base/common/cancellation';
 import { onUnexpectedError } from 'vs/base/common/errors';
 import { MarkdownString } from 'vs/base/common/htmlContent';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { IModeService } from 'vs/editor/common/services/modeService';
 import { Range } from 'vs/editor/common/core/range';
 import * as editorCommon from 'vs/editor/common/editorCommon';
-import { Location, DefinitionProviderRegistry } from 'vs/editor/common/modes';
+import { DefinitionProviderRegistry, DefinitionLink } from 'vs/editor/common/modes';
 import { ICodeEditor, IMouseTarget, MouseTargetType } from 'vs/editor/browser/editorBrowser';
 import { registerEditorContribution } from 'vs/editor/browser/editorExtensions';
 import { getDefinitionsAtPosition } from './goToDefinition';
@@ -25,7 +26,8 @@ import { editorActiveLinkForeground } from 'vs/platform/theme/common/colorRegist
 import { EditorState, CodeEditorStateFlag } from 'vs/editor/browser/core/editorState';
 import { DefinitionAction, DefinitionActionConfig } from './goToDefinitionCommands';
 import { ClickLinkGesture, ClickLinkMouseEvent, ClickLinkKeyboardEvent } from 'vs/editor/contrib/goToDefinition/clickLinkGesture';
-import { IWordAtPosition, IModelDeltaDecoration } from 'vs/editor/common/model';
+import { IWordAtPosition, IModelDeltaDecoration, ITextModel } from 'vs/editor/common/model';
+import { Position } from 'vs/editor/common/core/position';
 
 class GotoDefinitionWithMouseEditorContribution implements editorCommon.IEditorContribution {
 
@@ -36,7 +38,7 @@ class GotoDefinitionWithMouseEditorContribution implements editorCommon.IEditorC
 	private toUnhook: IDisposable[];
 	private decorations: string[];
 	private currentWordUnderMouse: IWordAtPosition;
-	private throttler: Throttler;
+	private previousPromise: CancelablePromise<DefinitionLink[]>;
 
 	constructor(
 		editor: ICodeEditor,
@@ -46,7 +48,7 @@ class GotoDefinitionWithMouseEditorContribution implements editorCommon.IEditorC
 		this.toUnhook = [];
 		this.decorations = [];
 		this.editor = editor;
-		this.throttler = new Throttler();
+		this.previousPromise = null;
 
 		let linkGesture = new ClickLinkGesture(editor);
 		this.toUnhook.push(linkGesture);
@@ -57,7 +59,7 @@ class GotoDefinitionWithMouseEditorContribution implements editorCommon.IEditorC
 
 		this.toUnhook.push(linkGesture.onExecute((mouseEvent: ClickLinkMouseEvent) => {
 			if (this.isEnabled(mouseEvent)) {
-				this.gotoDefinition(mouseEvent.target, mouseEvent.hasSideBySideModifier).done(() => {
+				this.gotoDefinition(mouseEvent.target, mouseEvent.hasSideBySideModifier).then(() => {
 					this.removeDecorations();
 				}, (error: Error) => {
 					this.removeDecorations();
@@ -99,12 +101,14 @@ class GotoDefinitionWithMouseEditorContribution implements editorCommon.IEditorC
 		// Find definition and decorate word if found
 		let state = new EditorState(this.editor, CodeEditorStateFlag.Position | CodeEditorStateFlag.Value | CodeEditorStateFlag.Selection | CodeEditorStateFlag.Scroll);
 
-		this.throttler.queue(() => {
-			return state.validate(this.editor)
-				? this.findDefinition(mouseEvent.target)
-				: TPromise.wrap<Location[]>(null);
+		if (this.previousPromise) {
+			this.previousPromise.cancel();
+			this.previousPromise = null;
+		}
 
-		}).then(results => {
+		this.previousPromise = createCancelablePromise(token => this.findDefinition(mouseEvent.target, token));
+
+		this.previousPromise.then(results => {
 			if (!results || !results.length || !state.validate(this.editor)) {
 				this.removeDecorations();
 				return;
@@ -136,35 +140,115 @@ class GotoDefinitionWithMouseEditorContribution implements editorCommon.IEditorC
 					const { object: { textEditorModel } } = ref;
 					const { startLineNumber } = result.range;
 
-					if (textEditorModel.getLineMaxColumn(startLineNumber) === 0) {
+					if (startLineNumber < 1 || startLineNumber > textEditorModel.getLineCount()) {
+						// invalid range
 						ref.dispose();
 						return;
 					}
 
-					const startIndent = textEditorModel.getLineFirstNonWhitespaceColumn(startLineNumber);
-					const maxLineNumber = Math.min(textEditorModel.getLineCount(), startLineNumber + GotoDefinitionWithMouseEditorContribution.MAX_SOURCE_PREVIEW_LINES);
-					let endLineNumber = startLineNumber + 1;
-					let minIndent = startIndent;
+					const previewValue = this.getPreviewValue(textEditorModel, startLineNumber);
 
-					for (; endLineNumber < maxLineNumber; endLineNumber++) {
-						let endIndent = textEditorModel.getLineFirstNonWhitespaceColumn(endLineNumber);
-						minIndent = Math.min(minIndent, endIndent);
-						if (startIndent === endIndent) {
-							break;
-						}
+					let wordRange: Range;
+					if (result.origin) {
+						wordRange = Range.lift(result.origin);
+					} else {
+						wordRange = new Range(position.lineNumber, word.startColumn, position.lineNumber, word.endColumn);
 					}
 
-					const previewRange = new Range(startLineNumber, 1, endLineNumber + 1, 1);
-					const value = textEditorModel.getValueInRange(previewRange).replace(new RegExp(`^\\s{${minIndent - 1}}`, 'gm'), '').trim();
-
 					this.addDecoration(
-						new Range(position.lineNumber, word.startColumn, position.lineNumber, word.endColumn),
-						new MarkdownString().appendCodeblock(this.modeService.getModeIdByFilenameOrFirstLine(textEditorModel.uri.fsPath), value)
+						wordRange,
+						new MarkdownString().appendCodeblock(this.modeService.getModeIdByFilenameOrFirstLine(textEditorModel.uri.fsPath), previewValue)
 					);
 					ref.dispose();
 				});
 			}
-		}).done(undefined, onUnexpectedError);
+		}).then(undefined, onUnexpectedError);
+	}
+
+	private getPreviewValue(textEditorModel: ITextModel, startLineNumber: number) {
+		let rangeToUse = this.getPreviewRangeBasedOnBrackets(textEditorModel, startLineNumber);
+		const numberOfLinesInRange = rangeToUse.endLineNumber - rangeToUse.startLineNumber;
+		if (numberOfLinesInRange >= GotoDefinitionWithMouseEditorContribution.MAX_SOURCE_PREVIEW_LINES) {
+			rangeToUse = this.getPreviewRangeBasedOnIndentation(textEditorModel, startLineNumber);
+		}
+
+		const previewValue = this.stripIndentationFromPreviewRange(textEditorModel, startLineNumber, rangeToUse);
+		return previewValue;
+	}
+
+	private stripIndentationFromPreviewRange(textEditorModel: ITextModel, startLineNumber: number, previewRange: Range) {
+		const startIndent = textEditorModel.getLineFirstNonWhitespaceColumn(startLineNumber);
+		let minIndent = startIndent;
+
+		for (let endLineNumber = startLineNumber + 1; endLineNumber < previewRange.endLineNumber; endLineNumber++) {
+			const endIndent = textEditorModel.getLineFirstNonWhitespaceColumn(endLineNumber);
+			minIndent = Math.min(minIndent, endIndent);
+		}
+
+		const previewValue = textEditorModel.getValueInRange(previewRange).replace(new RegExp(`^\\s{${minIndent - 1}}`, 'gm'), '').trim();
+		return previewValue;
+	}
+
+	private getPreviewRangeBasedOnIndentation(textEditorModel: ITextModel, startLineNumber: number) {
+		const startIndent = textEditorModel.getLineFirstNonWhitespaceColumn(startLineNumber);
+		const maxLineNumber = Math.min(textEditorModel.getLineCount(), startLineNumber + GotoDefinitionWithMouseEditorContribution.MAX_SOURCE_PREVIEW_LINES);
+		let endLineNumber = startLineNumber + 1;
+
+		for (; endLineNumber < maxLineNumber; endLineNumber++) {
+			let endIndent = textEditorModel.getLineFirstNonWhitespaceColumn(endLineNumber);
+
+			if (startIndent === endIndent) {
+				break;
+			}
+		}
+
+		return new Range(startLineNumber, 1, endLineNumber + 1, 1);
+	}
+
+	private getPreviewRangeBasedOnBrackets(textEditorModel: ITextModel, startLineNumber: number) {
+		const maxLineNumber = Math.min(textEditorModel.getLineCount(), startLineNumber + GotoDefinitionWithMouseEditorContribution.MAX_SOURCE_PREVIEW_LINES);
+
+		const brackets = [];
+
+		let ignoreFirstEmpty = true;
+		let currentBracket = textEditorModel.findNextBracket(new Position(startLineNumber, 1));
+		while (currentBracket !== null) {
+
+			if (brackets.length === 0) {
+				brackets.push(currentBracket);
+			} else {
+				const lastBracket = brackets[brackets.length - 1];
+				if (lastBracket.open === currentBracket.open && lastBracket.isOpen && !currentBracket.isOpen) {
+					brackets.pop();
+				} else {
+					brackets.push(currentBracket);
+				}
+
+				if (brackets.length === 0) {
+					if (ignoreFirstEmpty) {
+						ignoreFirstEmpty = false;
+					} else {
+						return new Range(startLineNumber, 1, currentBracket.range.endLineNumber + 1, 1);
+					}
+				}
+			}
+
+			const maxColumn = textEditorModel.getLineMaxColumn(startLineNumber);
+			let nextLineNumber = currentBracket.range.endLineNumber;
+			let nextColumn = currentBracket.range.endColumn;
+			if (maxColumn === currentBracket.range.endColumn) {
+				nextLineNumber++;
+				nextColumn = 1;
+			}
+
+			if (nextLineNumber > maxLineNumber) {
+				return new Range(startLineNumber, 1, maxLineNumber + 1, 1);
+			}
+
+			currentBracket = textEditorModel.findNextBracket(new Position(nextLineNumber, nextColumn));
+		}
+
+		return new Range(startLineNumber, 1, maxLineNumber + 1, 1);
 	}
 
 	private addDecoration(range: Range, hoverMessage: MarkdownString): void {
@@ -194,13 +278,13 @@ class GotoDefinitionWithMouseEditorContribution implements editorCommon.IEditorC
 			DefinitionProviderRegistry.has(this.editor.getModel());
 	}
 
-	private findDefinition(target: IMouseTarget): TPromise<Location[]> {
-		let model = this.editor.getModel();
+	private findDefinition(target: IMouseTarget, token: CancellationToken): Thenable<DefinitionLink[]> {
+		const model = this.editor.getModel();
 		if (!model) {
 			return TPromise.as(null);
 		}
 
-		return getDefinitionsAtPosition(this.editor.getModel(), target.position);
+		return getDefinitionsAtPosition(model, target.position, token);
 	}
 
 	private gotoDefinition(target: IMouseTarget, sideBySide: boolean): TPromise<any> {
diff --git a/src/vs/editor/contrib/gotoError/gotoError.ts b/src/vs/editor/contrib/gotoError/gotoError.ts
index 1c56024bc20..55c8120e4f8 100644
--- a/src/vs/editor/contrib/gotoError/gotoError.ts
+++ b/src/vs/editor/contrib/gotoError/gotoError.ts
@@ -9,7 +9,7 @@ import * as nls from 'vs/nls';
 import { Emitter } from 'vs/base/common/event';
 import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { RawContextKey, IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { IMarker, IMarkerService, MarkerSeverity } from 'vs/platform/markers/common/markers';
 import { Position } from 'vs/editor/common/core/position';
@@ -19,7 +19,7 @@ import { registerEditorAction, registerEditorContribution, ServicesAccessor, IAc
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
-import { KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRegistry';
+import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
 import { MarkerNavigationWidget } from './gotoErrorWidget';
 import { compare } from 'vs/base/common/strings';
 import { binarySearch } from 'vs/base/common/arrays';
@@ -401,7 +401,8 @@ class NextMarkerInFilesAction extends MarkerNavigationAction {
 			precondition: EditorContextKeys.writable,
 			kbOpts: {
 				kbExpr: EditorContextKeys.focus,
-				primary: KeyCode.F8
+				primary: KeyCode.F8,
+				weight: KeybindingWeight.EditorContrib
 			}
 		});
 	}
@@ -416,7 +417,8 @@ class PrevMarkerInFilesAction extends MarkerNavigationAction {
 			precondition: EditorContextKeys.writable,
 			kbOpts: {
 				kbExpr: EditorContextKeys.focus,
-				primary: KeyMod.Shift | KeyCode.F8
+				primary: KeyMod.Shift | KeyCode.F8,
+				weight: KeybindingWeight.EditorContrib
 			}
 		});
 	}
@@ -437,7 +439,7 @@ registerEditorCommand(new MarkerCommand({
 	precondition: CONTEXT_MARKERS_NAVIGATION_VISIBLE,
 	handler: x => x.closeMarkersNavigation(),
 	kbOpts: {
-		weight: KeybindingsRegistry.WEIGHT.editorContrib(50),
+		weight: KeybindingWeight.EditorContrib + 50,
 		kbExpr: EditorContextKeys.focus,
 		primary: KeyCode.Escape,
 		secondary: [KeyMod.Shift | KeyCode.Escape]
diff --git a/src/vs/editor/contrib/gotoError/gotoErrorWidget.ts b/src/vs/editor/contrib/gotoError/gotoErrorWidget.ts
index cfc7c049c58..ce9478eaff2 100644
--- a/src/vs/editor/contrib/gotoError/gotoErrorWidget.ts
+++ b/src/vs/editor/contrib/gotoError/gotoErrorWidget.ts
@@ -114,7 +114,7 @@ class MessageWidget {
 				let relatedResource = document.createElement('span');
 				dom.addClass(relatedResource, 'filename');
 				relatedResource.innerHTML = `${getBaseLabel(related.resource)}(${related.startLineNumber}, ${related.startColumn}): `;
-				relatedResource.title = getPathLabel(related.resource);
+				relatedResource.title = getPathLabel(related.resource, undefined);
 				this._relatedDiagnostics.set(relatedResource, related);
 
 				let relatedMessage = document.createElement('span');
diff --git a/src/vs/editor/contrib/hover/getHover.ts b/src/vs/editor/contrib/hover/getHover.ts
index a6bf28af9c8..577c87d814a 100644
--- a/src/vs/editor/contrib/hover/getHover.ts
+++ b/src/vs/editor/contrib/hover/getHover.ts
@@ -3,39 +3,34 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-'use strict';
-
 import { coalesce } from 'vs/base/common/arrays';
 import { onUnexpectedExternalError } from 'vs/base/common/errors';
-import { TPromise } from 'vs/base/common/winjs.base';
 import { ITextModel } from 'vs/editor/common/model';
 import { registerDefaultLanguageCommand } from 'vs/editor/browser/editorExtensions';
 import { Hover, HoverProviderRegistry } from 'vs/editor/common/modes';
-import { asWinJsPromise } from 'vs/base/common/async';
 import { Position } from 'vs/editor/common/core/position';
+import { CancellationToken } from 'vs/base/common/cancellation';
 
-export function getHover(model: ITextModel, position: Position): TPromise<Hover[]> {
+export function getHover(model: ITextModel, position: Position, token: CancellationToken): Promise<Hover[]> {
 
 	const supports = HoverProviderRegistry.ordered(model);
-	const values: Hover[] = [];
 
-	const promises = supports.map((support, idx) => {
-		return asWinJsPromise((token) => {
-			return support.provideHover(model, position, token);
-		}).then((result) => {
-			if (result) {
-				let hasRange = (typeof result.range !== 'undefined');
-				let hasHtmlContent = typeof result.contents !== 'undefined' && result.contents && result.contents.length > 0;
-				if (hasRange && hasHtmlContent) {
-					values[idx] = result;
-				}
-			}
+	const promises = supports.map(support => {
+		return Promise.resolve(support.provideHover(model, position, token)).then(hover => {
+			return hover && isValid(hover) ? hover : undefined;
 		}, err => {
 			onUnexpectedExternalError(err);
+			return undefined;
 		});
 	});
 
-	return TPromise.join(promises).then(() => coalesce(values));
+	return Promise.all(promises).then(values => coalesce(values));
 }
 
-registerDefaultLanguageCommand('_executeHoverProvider', getHover);
+registerDefaultLanguageCommand('_executeHoverProvider', (model, position) => getHover(model, position, CancellationToken.None));
+
+function isValid(result: Hover) {
+	const hasRange = (typeof result.range !== 'undefined');
+	const hasHtmlContent = typeof result.contents !== 'undefined' && result.contents && result.contents.length > 0;
+	return hasRange && hasHtmlContent;
+}
diff --git a/src/vs/editor/contrib/hover/hover.ts b/src/vs/editor/contrib/hover/hover.ts
index 1fdad70ae85..655df41ddda 100644
--- a/src/vs/editor/contrib/hover/hover.ts
+++ b/src/vs/editor/contrib/hover/hover.ts
@@ -13,7 +13,8 @@ import { IKeyboardEvent } from 'vs/base/browser/keyboardEvent';
 import { IOpenerService } from 'vs/platform/opener/common/opener';
 import { IModeService } from 'vs/editor/common/services/modeService';
 import { Range } from 'vs/editor/common/core/range';
-import * as editorCommon from 'vs/editor/common/editorCommon';
+import { IEditorContribution, IScrollEvent } from 'vs/editor/common/editorCommon';
+import { IConfigurationChangedEvent } from 'vs/editor/common/config/editorOptions';
 import { registerEditorAction, registerEditorContribution, ServicesAccessor, EditorAction } from 'vs/editor/browser/editorExtensions';
 import { ICodeEditor, IEditorMouseEvent, MouseTargetType } from 'vs/editor/browser/editorBrowser';
 import { ModesContentHoverWidget } from './modesContentHover';
@@ -24,13 +25,15 @@ import { editorHoverHighlight, editorHoverBackground, editorHoverBorder, textLin
 import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
 import { MarkdownRenderer } from 'vs/editor/contrib/markdown/markdownRenderer';
 import { IEmptyContentData } from 'vs/editor/browser/controller/mouseTarget';
+import { HoverStartMode } from 'vs/editor/contrib/hover/hoverOperation';
+import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
 
-export class ModesHoverController implements editorCommon.IEditorContribution {
+export class ModesHoverController implements IEditorContribution {
 
 	private static readonly ID = 'editor.contrib.hover';
 
-	private _editor: ICodeEditor;
 	private _toUnhook: IDisposable[];
+	private _didChangeConfigurationHandler: IDisposable;
 
 	private _contentWidget: ModesContentHoverWidget;
 	private _glyphWidget: ModesGlyphHoverWidget;
@@ -51,35 +54,57 @@ export class ModesHoverController implements editorCommon.IEditorContribution {
 
 	private _isMouseDown: boolean;
 	private _hoverClicked: boolean;
+	private _isHoverEnabled: boolean;
+	private _isHoverSticky: boolean;
 
 	static get(editor: ICodeEditor): ModesHoverController {
 		return editor.getContribution<ModesHoverController>(ModesHoverController.ID);
 	}
 
-	constructor(editor: ICodeEditor,
+	constructor(private readonly _editor: ICodeEditor,
 		@IOpenerService private readonly _openerService: IOpenerService,
 		@IModeService private readonly _modeService: IModeService,
 		@IThemeService private readonly _themeService: IThemeService
 	) {
-		this._editor = editor;
-
 		this._toUnhook = [];
-		this._isMouseDown = false;
 
-		if (editor.getConfiguration().contribInfo.hover) {
+		this._isMouseDown = false;
+		this._hoverClicked = false;
+
+		this._hookEvents();
+
+		this._didChangeConfigurationHandler = this._editor.onDidChangeConfiguration((e: IConfigurationChangedEvent) => {
+			if (e.contribInfo) {
+				this._hideWidgets();
+				this._unhookEvents();
+				this._hookEvents();
+			}
+		});
+	}
+
+	private _hookEvents(): void {
+		const hideWidgetsEventHandler = () => this._hideWidgets();
+
+		const hoverOpts = this._editor.getConfiguration().contribInfo.hover;
+		this._isHoverEnabled = hoverOpts.enabled;
+		this._isHoverSticky = hoverOpts.sticky;
+		if (this._isHoverEnabled) {
 			this._toUnhook.push(this._editor.onMouseDown((e: IEditorMouseEvent) => this._onEditorMouseDown(e)));
 			this._toUnhook.push(this._editor.onMouseUp((e: IEditorMouseEvent) => this._onEditorMouseUp(e)));
 			this._toUnhook.push(this._editor.onMouseMove((e: IEditorMouseEvent) => this._onEditorMouseMove(e)));
-			this._toUnhook.push(this._editor.onMouseLeave((e: IEditorMouseEvent) => this._hideWidgets()));
 			this._toUnhook.push(this._editor.onKeyDown((e: IKeyboardEvent) => this._onKeyDown(e)));
-			this._toUnhook.push(this._editor.onDidChangeModel(() => this._hideWidgets()));
 			this._toUnhook.push(this._editor.onDidChangeModelDecorations(() => this._onModelDecorationsChanged()));
-			this._toUnhook.push(this._editor.onDidScrollChange((e) => {
-				if (e.scrollTopChanged || e.scrollLeftChanged) {
-					this._hideWidgets();
-				}
-			}));
+		} else {
+			this._toUnhook.push(this._editor.onMouseMove(hideWidgetsEventHandler));
 		}
+
+		this._toUnhook.push(this._editor.onMouseLeave(hideWidgetsEventHandler));
+		this._toUnhook.push(this._editor.onDidChangeModel(hideWidgetsEventHandler));
+		this._toUnhook.push(this._editor.onDidScrollChange((e: IScrollEvent) => this._onEditorScrollChanged(e)));
+	}
+
+	private _unhookEvents(): void {
+		this._toUnhook = dispose(this._toUnhook);
 	}
 
 	private _onModelDecorationsChanged(): void {
@@ -87,6 +112,12 @@ export class ModesHoverController implements editorCommon.IEditorContribution {
 		this.glyphWidget.onModelDecorationsChanged();
 	}
 
+	private _onEditorScrollChanged(e: IScrollEvent): void {
+		if (e.scrollTopChanged || e.scrollLeftChanged) {
+			this._hideWidgets();
+		}
+	}
+
 	private _onEditorMouseDown(mouseEvent: IEditorMouseEvent): void {
 		this._isMouseDown = true;
 
@@ -115,6 +146,7 @@ export class ModesHoverController implements editorCommon.IEditorContribution {
 	}
 
 	private _onEditorMouseMove(mouseEvent: IEditorMouseEvent): void {
+		// const this._editor.getConfiguration().contribInfo.hover.sticky;
 		let targetType = mouseEvent.target.type;
 		const hasStopKey = (platform.isMacintosh ? mouseEvent.event.metaKey : mouseEvent.event.ctrlKey);
 
@@ -122,12 +154,12 @@ export class ModesHoverController implements editorCommon.IEditorContribution {
 			return;
 		}
 
-		if (targetType === MouseTargetType.CONTENT_WIDGET && mouseEvent.target.detail === ModesContentHoverWidget.ID && !hasStopKey) {
+		if (this._isHoverSticky && targetType === MouseTargetType.CONTENT_WIDGET && mouseEvent.target.detail === ModesContentHoverWidget.ID && !hasStopKey) {
 			// mouse moved on top of content hover widget
 			return;
 		}
 
-		if (targetType === MouseTargetType.OVERLAY_WIDGET && mouseEvent.target.detail === ModesGlyphHoverWidget.ID && !hasStopKey) {
+		if (this._isHoverSticky && targetType === MouseTargetType.OVERLAY_WIDGET && mouseEvent.target.detail === ModesGlyphHoverWidget.ID && !hasStopKey) {
 			// mouse moved on top of overlay hover widget
 			return;
 		}
@@ -141,20 +173,26 @@ export class ModesHoverController implements editorCommon.IEditorContribution {
 			}
 		}
 
-		if (this._editor.getConfiguration().contribInfo.hover && targetType === MouseTargetType.CONTENT_TEXT) {
+		if (targetType === MouseTargetType.CONTENT_TEXT) {
 			this.glyphWidget.hide();
-			this.contentWidget.startShowingAt(mouseEvent.target.range, false);
+
+			if (this._isHoverEnabled) {
+				this.contentWidget.startShowingAt(mouseEvent.target.range, HoverStartMode.Delayed, false);
+			}
 		} else if (targetType === MouseTargetType.GUTTER_GLYPH_MARGIN) {
 			this.contentWidget.hide();
-			this.glyphWidget.startShowingAt(mouseEvent.target.position.lineNumber);
+
+			if (this._isHoverEnabled) {
+				this.glyphWidget.startShowingAt(mouseEvent.target.position.lineNumber);
+			}
 		} else {
 			this._hideWidgets();
 		}
 	}
 
 	private _onKeyDown(e: IKeyboardEvent): void {
-		if (e.keyCode !== KeyCode.Ctrl && e.keyCode !== KeyCode.Alt && e.keyCode !== KeyCode.Meta) {
-			// Do not hide hover when Ctrl/Meta is pressed
+		if (e.keyCode !== KeyCode.Ctrl && e.keyCode !== KeyCode.Alt && e.keyCode !== KeyCode.Meta && e.keyCode !== KeyCode.Shift) {
+			// Do not hide hover when a modifier key is pressed
 			this._hideWidgets();
 		}
 	}
@@ -174,8 +212,8 @@ export class ModesHoverController implements editorCommon.IEditorContribution {
 		this._glyphWidget = new ModesGlyphHoverWidget(this._editor, renderer);
 	}
 
-	public showContentHover(range: Range, focus: boolean): void {
-		this.contentWidget.startShowingAt(range, focus);
+	public showContentHover(range: Range, mode: HoverStartMode, focus: boolean): void {
+		this.contentWidget.startShowingAt(range, mode, focus);
 	}
 
 	public getId(): string {
@@ -183,7 +221,9 @@ export class ModesHoverController implements editorCommon.IEditorContribution {
 	}
 
 	public dispose(): void {
-		this._toUnhook = dispose(this._toUnhook);
+		this._unhookEvents();
+		this._didChangeConfigurationHandler.dispose();
+
 		if (this._glyphWidget) {
 			this._glyphWidget.dispose();
 			this._glyphWidget = null;
@@ -211,7 +251,8 @@ class ShowHoverAction extends EditorAction {
 			precondition: null,
 			kbOpts: {
 				kbExpr: EditorContextKeys.editorTextFocus,
-				primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_K, KeyMod.CtrlCmd | KeyCode.KEY_I)
+				primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_K, KeyMod.CtrlCmd | KeyCode.KEY_I),
+				weight: KeybindingWeight.EditorContrib
 			}
 		});
 	}
@@ -223,7 +264,7 @@ class ShowHoverAction extends EditorAction {
 		}
 		const position = editor.getPosition();
 		const range = new Range(position.lineNumber, position.column, position.lineNumber, position.column);
-		controller.showContentHover(range, true);
+		controller.showContentHover(range, HoverStartMode.Immediate, true);
 	}
 }
 
diff --git a/src/vs/editor/contrib/hover/hoverOperation.ts b/src/vs/editor/contrib/hover/hoverOperation.ts
index 432f7107116..2b55f24057d 100644
--- a/src/vs/editor/contrib/hover/hoverOperation.ts
+++ b/src/vs/editor/contrib/hover/hoverOperation.ts
@@ -4,21 +4,16 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import { RunOnceScheduler } from 'vs/base/common/async';
+import { RunOnceScheduler, CancelablePromise, createCancelablePromise } from 'vs/base/common/async';
 import { onUnexpectedError } from 'vs/base/common/errors';
-import { TPromise } from 'vs/base/common/winjs.base';
+import { CancellationToken } from 'vs/base/common/cancellation';
 
 export interface IHoverComputer<Result> {
 
-	/**
-	 * Overwrite the default hover time
-	 */
-	getHoverTimeMillis?: () => number;
-
 	/**
 	 * This is called after half the hover time
 	 */
-	computeAsync?: () => TPromise<Result>;
+	computeAsync?: (token: CancellationToken) => Promise<Result>;
 
 	/**
 	 * This is called after all the hover time
@@ -46,17 +41,23 @@ const enum ComputeHoverOperationState {
 	WAITING_FOR_ASYNC_COMPUTATION = 3
 }
 
+export const enum HoverStartMode {
+	Delayed = 0,
+	Immediate = 1
+}
+
 export class HoverOperation<Result> {
 
 	static HOVER_TIME = 300;
 
 	private _computer: IHoverComputer<Result>;
 	private _state: ComputeHoverOperationState;
+	private _hoverTime: number;
 
 	private _firstWaitScheduler: RunOnceScheduler;
 	private _secondWaitScheduler: RunOnceScheduler;
 	private _loadingMessageScheduler: RunOnceScheduler;
-	private _asyncComputationPromise: TPromise<void>;
+	private _asyncComputationPromise: CancelablePromise<Result>;
 	private _asyncComputationPromiseDone: boolean;
 
 	private _completeCallback: (r: Result) => void;
@@ -66,10 +67,11 @@ export class HoverOperation<Result> {
 	constructor(computer: IHoverComputer<Result>, success: (r: Result) => void, error: (err: any) => void, progress: (progress: any) => void) {
 		this._computer = computer;
 		this._state = ComputeHoverOperationState.IDLE;
+		this._hoverTime = HoverOperation.HOVER_TIME;
 
-		this._firstWaitScheduler = new RunOnceScheduler(() => this._triggerAsyncComputation(), this._getHoverTimeMillis() / 2);
-		this._secondWaitScheduler = new RunOnceScheduler(() => this._triggerSyncComputation(), this._getHoverTimeMillis() / 2);
-		this._loadingMessageScheduler = new RunOnceScheduler(() => this._showLoadingMessage(), 3 * this._getHoverTimeMillis());
+		this._firstWaitScheduler = new RunOnceScheduler(() => this._triggerAsyncComputation(), 0);
+		this._secondWaitScheduler = new RunOnceScheduler(() => this._triggerSyncComputation(), 0);
+		this._loadingMessageScheduler = new RunOnceScheduler(() => this._showLoadingMessage(), 0);
 
 		this._asyncComputationPromise = null;
 		this._asyncComputationPromiseDone = false;
@@ -79,23 +81,34 @@ export class HoverOperation<Result> {
 		this._progressCallback = progress;
 	}
 
-	private _getHoverTimeMillis(): number {
-		if (this._computer.getHoverTimeMillis) {
-			return this._computer.getHoverTimeMillis();
-		}
-		return HoverOperation.HOVER_TIME;
+	public setHoverTime(hoverTime: number): void {
+		this._hoverTime = hoverTime;
+	}
+
+	private _firstWaitTime(): number {
+		return this._hoverTime / 2;
+	}
+
+	private _secondWaitTime(): number {
+		return this._hoverTime / 2;
+	}
+
+	private _loadingMessageTime(): number {
+		return 3 * this._hoverTime;
 	}
 
 	private _triggerAsyncComputation(): void {
 		this._state = ComputeHoverOperationState.SECOND_WAIT;
-		this._secondWaitScheduler.schedule();
+		this._secondWaitScheduler.schedule(this._secondWaitTime());
 
 		if (this._computer.computeAsync) {
 			this._asyncComputationPromiseDone = false;
-			this._asyncComputationPromise = this._computer.computeAsync().then((asyncResult: Result) => {
+			this._asyncComputationPromise = createCancelablePromise(token => this._computer.computeAsync(token));
+			this._asyncComputationPromise.then((asyncResult: Result) => {
 				this._asyncComputationPromiseDone = true;
 				this._withAsyncResult(asyncResult);
 			}, (e) => this._onError(e));
+
 		} else {
 			this._asyncComputationPromiseDone = true;
 		}
@@ -152,11 +165,25 @@ export class HoverOperation<Result> {
 		}
 	}
 
-	public start(): void {
-		if (this._state === ComputeHoverOperationState.IDLE) {
-			this._state = ComputeHoverOperationState.FIRST_WAIT;
-			this._firstWaitScheduler.schedule();
-			this._loadingMessageScheduler.schedule();
+	public start(mode: HoverStartMode): void {
+		if (mode === HoverStartMode.Delayed) {
+			if (this._state === ComputeHoverOperationState.IDLE) {
+				this._state = ComputeHoverOperationState.FIRST_WAIT;
+				this._firstWaitScheduler.schedule(this._firstWaitTime());
+				this._loadingMessageScheduler.schedule(this._loadingMessageTime());
+			}
+		} else {
+			switch (this._state) {
+				case ComputeHoverOperationState.IDLE:
+					this._triggerAsyncComputation();
+					this._secondWaitScheduler.cancel();
+					this._triggerSyncComputation();
+					break;
+				case ComputeHoverOperationState.SECOND_WAIT:
+					this._secondWaitScheduler.cancel();
+					this._triggerSyncComputation();
+					break;
+			}
 		}
 	}
 
diff --git a/src/vs/editor/contrib/hover/modesContentHover.ts b/src/vs/editor/contrib/hover/modesContentHover.ts
index bb029b40ded..071469c7a18 100644
--- a/src/vs/editor/contrib/hover/modesContentHover.ts
+++ b/src/vs/editor/contrib/hover/modesContentHover.ts
@@ -6,13 +6,12 @@
 
 import * as nls from 'vs/nls';
 import * as dom from 'vs/base/browser/dom';
-import { TPromise } from 'vs/base/common/winjs.base';
 import { IRange, Range } from 'vs/editor/common/core/range';
 import { Position } from 'vs/editor/common/core/position';
 import { HoverProviderRegistry, Hover, IColor, DocumentColorProvider } from 'vs/editor/common/modes';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
 import { getHover } from 'vs/editor/contrib/hover/getHover';
-import { HoverOperation, IHoverComputer } from './hoverOperation';
+import { HoverOperation, IHoverComputer, HoverStartMode } from './hoverOperation';
 import { ContentHoverWidget } from './hoverWidgets';
 import { IMarkdownString, MarkdownString, isEmptyMarkdownString, markedStringsEquals } from 'vs/base/common/htmlContent';
 import { MarkdownRenderer } from 'vs/editor/contrib/markdown/markdownRenderer';
@@ -21,9 +20,10 @@ import { ColorPickerModel } from 'vs/editor/contrib/colorPicker/colorPickerModel
 import { ColorPickerWidget } from 'vs/editor/contrib/colorPicker/colorPickerWidget';
 import { ColorDetector } from 'vs/editor/contrib/colorPicker/colorDetector';
 import { Color, RGBA } from 'vs/base/common/color';
-import { IDisposable, empty as EmptyDisposable, dispose, combinedDisposable } from 'vs/base/common/lifecycle';
+import { IDisposable, Disposable, combinedDisposable } from 'vs/base/common/lifecycle';
 import { getColorPresentations } from 'vs/editor/contrib/colorPicker/color';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
+import { CancellationToken } from 'vs/base/common/cancellation';
 const $ = dom.$;
 
 class ColorHover {
@@ -57,17 +57,17 @@ class ModesContentComputer implements IHoverComputer<HoverPart[]> {
 		this._result = [];
 	}
 
-	computeAsync(): TPromise<HoverPart[]> {
+	computeAsync(token: CancellationToken): Promise<HoverPart[]> {
 		const model = this._editor.getModel();
 
 		if (!HoverProviderRegistry.has(model)) {
-			return TPromise.as(null);
+			return Promise.resolve(null);
 		}
 
 		return getHover(model, new Position(
 			this._range.startLineNumber,
 			this._range.startColumn
-		));
+		), token);
 	}
 
 	computeSync(): HoverPart[] {
@@ -167,8 +167,7 @@ export class ModesContentHoverWidget extends ContentHoverWidget {
 	private _shouldFocus: boolean;
 	private _colorPicker: ColorPickerWidget;
 
-	private renderDisposable: IDisposable = EmptyDisposable;
-	private toDispose: IDisposable[] = [];
+	private renderDisposable: IDisposable = Disposable.None;
 
 	constructor(
 		editor: ICodeEditor,
@@ -182,7 +181,7 @@ export class ModesContentHoverWidget extends ContentHoverWidget {
 		this._isChangingDecorations = false;
 
 		this._markdownRenderer = markdownRenderer;
-		markdownRenderer.onDidRenderCodeBlock(this.onContentsChange, this, this.toDispose);
+		this._register(markdownRenderer.onDidRenderCodeBlock(this.onContentsChange, this));
 
 		this._hoverOperation = new HoverOperation(
 			this._computer,
@@ -191,21 +190,23 @@ export class ModesContentHoverWidget extends ContentHoverWidget {
 			result => this._withResult(result, false)
 		);
 
-		this.toDispose.push(dom.addStandardDisposableListener(this.getDomNode(), dom.EventType.FOCUS, () => {
+		this._register(dom.addStandardDisposableListener(this.getDomNode(), dom.EventType.FOCUS, () => {
 			if (this._colorPicker) {
 				dom.addClass(this.getDomNode(), 'colorpicker-hover');
 			}
 		}));
-		this.toDispose.push(dom.addStandardDisposableListener(this.getDomNode(), dom.EventType.BLUR, () => {
+		this._register(dom.addStandardDisposableListener(this.getDomNode(), dom.EventType.BLUR, () => {
 			dom.removeClass(this.getDomNode(), 'colorpicker-hover');
 		}));
+		this._register(editor.onDidChangeConfiguration((e) => {
+			this._hoverOperation.setHoverTime(this._editor.getConfiguration().contribInfo.hover.delay);
+		}));
 	}
 
 	dispose(): void {
 		this.renderDisposable.dispose();
-		this.renderDisposable = EmptyDisposable;
+		this.renderDisposable = Disposable.None;
 		this._hoverOperation.cancel();
-		this.toDispose = dispose(this.toDispose);
 		super.dispose();
 	}
 
@@ -220,12 +221,12 @@ export class ModesContentHoverWidget extends ContentHoverWidget {
 			this._computer.clearResult();
 
 			if (!this._colorPicker) { // TODO@Michel ensure that displayed text for other decorations is computed even if color picker is in place
-				this._hoverOperation.start();
+				this._hoverOperation.start(HoverStartMode.Delayed);
 			}
 		}
 	}
 
-	startShowingAt(range: Range, focus: boolean): void {
+	startShowingAt(range: Range, mode: HoverStartMode, focus: boolean): void {
 		if (this._lastRange && this._lastRange.equalsRange(range)) {
 			// We have to show the widget at the exact same range as before, so no work is needed
 			return;
@@ -262,7 +263,7 @@ export class ModesContentHoverWidget extends ContentHoverWidget {
 		this._lastRange = range;
 		this._computer.setRange(range);
 		this._shouldFocus = focus;
-		this._hoverOperation.start();
+		this._hoverOperation.start(mode);
 	}
 
 	hide(): void {
@@ -273,7 +274,7 @@ export class ModesContentHoverWidget extends ContentHoverWidget {
 		this._highlightDecorations = this._editor.deltaDecorations(this._highlightDecorations, []);
 		this._isChangingDecorations = false;
 		this.renderDisposable.dispose();
-		this.renderDisposable = EmptyDisposable;
+		this.renderDisposable = Disposable.None;
 		this._colorPicker = null;
 	}
 
@@ -338,7 +339,7 @@ export class ModesContentHoverWidget extends ContentHoverWidget {
 				const model = new ColorPickerModel(color, [], 0);
 				const widget = new ColorPickerWidget(fragment, model, this._editor.getConfiguration().pixelRatio, this._themeService);
 
-				getColorPresentations(editorModel, colorInfo, msg.provider).then(colorPresentations => {
+				getColorPresentations(editorModel, colorInfo, msg.provider, CancellationToken.None).then(colorPresentations => {
 					model.colorPresentations = colorPresentations;
 					const originalText = this._editor.getModel().getValueInRange(msg.range);
 					model.guessColorPresentation(color, originalText);
@@ -360,11 +361,11 @@ export class ModesContentHoverWidget extends ContentHoverWidget {
 							newRange = range.setEndPosition(range.endLineNumber, range.startColumn + model.presentation.label.length);
 						}
 
-						editorModel.pushEditOperations([], textEdits, () => []);
+						this._editor.executeEdits('colorpicker', textEdits);
 
 						if (model.presentation.additionalTextEdits) {
 							textEdits = [...model.presentation.additionalTextEdits];
-							editorModel.pushEditOperations([], textEdits, () => []);
+							this._editor.executeEdits('colorpicker', textEdits);
 							this.hide();
 						}
 						this._editor.pushUndoStop();
@@ -380,7 +381,7 @@ export class ModesContentHoverWidget extends ContentHoverWidget {
 								blue: color.rgba.b / 255,
 								alpha: color.rgba.a
 							}
-						}, msg.provider).then((colorPresentations) => {
+						}, msg.provider, CancellationToken.None).then((colorPresentations) => {
 							model.colorPresentations = colorPresentations;
 						});
 					};
diff --git a/src/vs/editor/contrib/hover/modesGlyphHover.ts b/src/vs/editor/contrib/hover/modesGlyphHover.ts
index c1844e2e33e..535aab4a250 100644
--- a/src/vs/editor/contrib/hover/modesGlyphHover.ts
+++ b/src/vs/editor/contrib/hover/modesGlyphHover.ts
@@ -5,7 +5,7 @@
 'use strict';
 
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { HoverOperation, IHoverComputer } from './hoverOperation';
+import { HoverOperation, IHoverComputer, HoverStartMode } from './hoverOperation';
 import { GlyphHoverWidget } from './hoverWidgets';
 import { $ } from 'vs/base/browser/dom';
 import { MarkdownRenderer } from 'vs/editor/contrib/markdown/markdownRenderer';
@@ -123,7 +123,7 @@ export class ModesGlyphHoverWidget extends GlyphHoverWidget {
 			// we need to recompute the displayed text
 			this._hoverOperation.cancel();
 			this._computer.clearResult();
-			this._hoverOperation.start();
+			this._hoverOperation.start(HoverStartMode.Delayed);
 		}
 	}
 
@@ -139,7 +139,7 @@ export class ModesGlyphHoverWidget extends GlyphHoverWidget {
 
 		this._lastLineNumber = lineNumber;
 		this._computer.setLineNumber(lineNumber);
-		this._hoverOperation.start();
+		this._hoverOperation.start(HoverStartMode.Delayed);
 	}
 
 	public hide(): void {
diff --git a/src/vs/editor/contrib/inPlaceReplace/inPlaceReplace.ts b/src/vs/editor/contrib/inPlaceReplace/inPlaceReplace.ts
index 4d7b492685d..eba360f0676 100644
--- a/src/vs/editor/contrib/inPlaceReplace/inPlaceReplace.ts
+++ b/src/vs/editor/contrib/inPlaceReplace/inPlaceReplace.ts
@@ -20,6 +20,9 @@ import { registerThemingParticipant } from 'vs/platform/theme/common/themeServic
 import { editorBracketMatchBorder } from 'vs/editor/common/view/editorColorRegistry';
 import { ModelDecorationOptions } from 'vs/editor/common/model/textModel';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
+import { CancelablePromise, createCancelablePromise, timeout } from 'vs/base/common/async';
+import { onUnexpectedError } from 'vs/base/common/errors';
+import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
 
 class InPlaceReplaceController implements IEditorContribution {
 
@@ -33,11 +36,11 @@ class InPlaceReplaceController implements IEditorContribution {
 		className: 'valueSetReplacement'
 	});
 
-	private editor: ICodeEditor;
-	private currentRequest: TPromise<IInplaceReplaceSupportResult>;
-	private decorationRemover: TPromise<void>;
-	private decorationIds: string[];
-	private editorWorkerService: IEditorWorkerService;
+	private readonly editor: ICodeEditor;
+	private readonly editorWorkerService: IEditorWorkerService;
+	private decorationIds: string[] = [];
+	private currentRequest: CancelablePromise<IInplaceReplaceSupportResult>;
+	private decorationRemover: CancelablePromise<void>;
 
 	constructor(
 		editor: ICodeEditor,
@@ -45,9 +48,6 @@ class InPlaceReplaceController implements IEditorContribution {
 	) {
 		this.editor = editor;
 		this.editorWorkerService = editorWorkerService;
-		this.currentRequest = TPromise.as(<IInplaceReplaceSupportResult>null);
-		this.decorationRemover = TPromise.as(<void>null);
-		this.decorationIds = [];
 	}
 
 	public dispose(): void {
@@ -57,10 +57,12 @@ class InPlaceReplaceController implements IEditorContribution {
 		return InPlaceReplaceController.ID;
 	}
 
-	public run(source: string, up: boolean): TPromise<void> {
+	public run(source: string, up: boolean): Thenable<void> {
 
 		// cancel any pending request
-		this.currentRequest.cancel();
+		if (this.currentRequest) {
+			this.currentRequest.cancel();
+		}
 
 		let selection = this.editor.getSelection();
 		const model = this.editor.getModel();
@@ -74,18 +76,12 @@ class InPlaceReplaceController implements IEditorContribution {
 		const state = new EditorState(this.editor, CodeEditorStateFlag.Value | CodeEditorStateFlag.Position);
 
 		if (!this.editorWorkerService.canNavigateValueSet(modelURI)) {
-			this.currentRequest = TPromise.as(null);
-		} else {
-			this.currentRequest = this.editorWorkerService.navigateValueSet(modelURI, selection, up);
-			this.currentRequest = this.currentRequest.then((basicResult) => {
-				if (basicResult && basicResult.range && basicResult.value) {
-					return basicResult;
-				}
-				return null;
-			});
+			return undefined;
 		}
 
-		return this.currentRequest.then((result: IInplaceReplaceSupportResult) => {
+		this.currentRequest = createCancelablePromise(token => this.editorWorkerService.navigateValueSet(modelURI, selection, up));
+
+		return this.currentRequest.then(result => {
 
 			if (!result || !result.range || !result.value) {
 				// No proper result
@@ -127,12 +123,13 @@ class InPlaceReplaceController implements IEditorContribution {
 			}]);
 
 			// remove decoration after delay
-			this.decorationRemover.cancel();
-			this.decorationRemover = TPromise.timeout(350);
-			this.decorationRemover.then(() => {
-				this.decorationIds = this.editor.deltaDecorations(this.decorationIds, []);
-			});
-		});
+			if (this.decorationRemover) {
+				this.decorationRemover.cancel();
+			}
+			this.decorationRemover = timeout(350);
+			this.decorationRemover.then(() => this.decorationIds = this.editor.deltaDecorations(this.decorationIds, [])).catch(onUnexpectedError);
+
+		}).catch(onUnexpectedError);
 	}
 }
 
@@ -146,7 +143,8 @@ class InPlaceReplaceUp extends EditorAction {
 			precondition: EditorContextKeys.writable,
 			kbOpts: {
 				kbExpr: EditorContextKeys.editorTextFocus,
-				primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.US_COMMA
+				primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.US_COMMA,
+				weight: KeybindingWeight.EditorContrib
 			}
 		});
 	}
@@ -156,7 +154,7 @@ class InPlaceReplaceUp extends EditorAction {
 		if (!controller) {
 			return undefined;
 		}
-		return controller.run(this.id, true);
+		return TPromise.wrap(controller.run(this.id, true));
 	}
 }
 
@@ -170,7 +168,8 @@ class InPlaceReplaceDown extends EditorAction {
 			precondition: EditorContextKeys.writable,
 			kbOpts: {
 				kbExpr: EditorContextKeys.editorTextFocus,
-				primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.US_DOT
+				primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.US_DOT,
+				weight: KeybindingWeight.EditorContrib
 			}
 		});
 	}
@@ -180,7 +179,7 @@ class InPlaceReplaceDown extends EditorAction {
 		if (!controller) {
 			return undefined;
 		}
-		return controller.run(this.id, false);
+		return TPromise.wrap(controller.run(this.id, false));
 	}
 }
 
diff --git a/src/vs/editor/contrib/indentation/indentation.ts b/src/vs/editor/contrib/indentation/indentation.ts
index ab6c491ed74..9ba96fc6e06 100644
--- a/src/vs/editor/contrib/indentation/indentation.ts
+++ b/src/vs/editor/contrib/indentation/indentation.ts
@@ -5,13 +5,11 @@
 
 import * as nls from 'vs/nls';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
-import { TPromise } from 'vs/base/common/winjs.base';
 import * as strings from 'vs/base/common/strings';
 import { IEditorContribution, ICommand, ICursorStateComputerData, IEditOperationBuilder } from 'vs/editor/common/editorCommon';
 import { IIdentifiedSingleEditOperation, ITextModel } from 'vs/editor/common/model';
 import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
 import { registerEditorAction, ServicesAccessor, IActionOptions, EditorAction, registerEditorContribution } from 'vs/editor/browser/editorExtensions';
-import { IQuickOpenService } from 'vs/platform/quickOpen/common/quickOpen';
 import { IModelService } from 'vs/editor/common/services/modelService';
 import { Range } from 'vs/editor/common/core/range';
 import { Selection } from 'vs/editor/common/core/selection';
@@ -23,6 +21,7 @@ import { TextEdit, StandardTokenType } from 'vs/editor/common/modes';
 import * as IndentUtil from './indentUtils';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
 import { IndentConsts } from 'vs/editor/common/modes/supports/indentRules';
+import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
 
 export function shiftIndent(tabSize: number, indentation: string, count?: number): string {
 	count = count || 1;
@@ -216,13 +215,13 @@ export class ChangeIndentationSizeAction extends EditorAction {
 		super(opts);
 	}
 
-	public run(accessor: ServicesAccessor, editor: ICodeEditor): TPromise<void> {
-		const quickOpenService = accessor.get(IQuickOpenService);
+	public run(accessor: ServicesAccessor, editor: ICodeEditor): void {
+		const quickInputService = accessor.get(IQuickInputService);
 		const modelService = accessor.get(IModelService);
 
 		let model = editor.getModel();
 		if (!model) {
-			return undefined;
+			return;
 		}
 
 		let creationOpts = modelService.getCreationOptions(model.getLanguageIdentifier().language, model.uri, model.isForSimpleWidget);
@@ -236,16 +235,16 @@ export class ChangeIndentationSizeAction extends EditorAction {
 		// auto focus the tabSize set for the current editor
 		const autoFocusIndex = Math.min(model.getOptions().tabSize - 1, 7);
 
-		return TPromise.timeout(50 /* quick open is sensitive to being opened so soon after another */).then(() =>
-			quickOpenService.pick(picks, { placeHolder: nls.localize({ key: 'selectTabWidth', comment: ['Tab corresponds to the tab key'] }, "Select Tab Size for Current File"), autoFocus: { autoFocusIndex } }).then(pick => {
+		setTimeout(() => {
+			quickInputService.pick(picks, { placeHolder: nls.localize({ key: 'selectTabWidth', comment: ['Tab corresponds to the tab key'] }, "Select Tab Size for Current File"), activeItem: picks[autoFocusIndex] }).then(pick => {
 				if (pick) {
 					model.updateOptions({
 						tabSize: parseInt(pick.label, 10),
 						insertSpaces: this.insertSpaces
 					});
 				}
-			})
-		);
+			});
+		}, 50/* quick open is sensitive to being opened so soon after another */);
 	}
 }
 
diff --git a/src/vs/editor/contrib/linesOperations/linesOperations.ts b/src/vs/editor/contrib/linesOperations/linesOperations.ts
index 0e2e13b66b6..6ec061f49ac 100644
--- a/src/vs/editor/contrib/linesOperations/linesOperations.ts
+++ b/src/vs/editor/contrib/linesOperations/linesOperations.ts
@@ -23,6 +23,8 @@ import { MoveLinesCommand } from './moveLinesCommand';
 import { TypeOperations } from 'vs/editor/common/controller/cursorTypeOperations';
 import { CoreEditingCommands } from 'vs/editor/browser/controller/coreCommands';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
+import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
+import { MenuId } from 'vs/platform/actions/common/actions';
 
 // copy lines
 
@@ -35,7 +37,7 @@ abstract class AbstractCopyLinesAction extends EditorAction {
 		this.down = down;
 	}
 
-	public run(accessor: ServicesAccessor, editor: ICodeEditor): void {
+	public run(_accessor: ServicesAccessor, editor: ICodeEditor): void {
 
 		let commands: ICommand[] = [];
 		let selections = editor.getSelections();
@@ -60,7 +62,14 @@ class CopyLinesUpAction extends AbstractCopyLinesAction {
 			kbOpts: {
 				kbExpr: EditorContextKeys.editorTextFocus,
 				primary: KeyMod.Alt | KeyMod.Shift | KeyCode.UpArrow,
-				linux: { primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyMod.Shift | KeyCode.UpArrow }
+				linux: { primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyMod.Shift | KeyCode.UpArrow },
+				weight: KeybindingWeight.EditorContrib
+			},
+			menubarOpts: {
+				menuId: MenuId.MenubarSelectionMenu,
+				group: '2_line',
+				title: nls.localize({ key: 'miCopyLinesUp', comment: ['&& denotes a mnemonic'] }, "&&Copy Line Up"),
+				order: 1
 			}
 		});
 	}
@@ -76,7 +85,14 @@ class CopyLinesDownAction extends AbstractCopyLinesAction {
 			kbOpts: {
 				kbExpr: EditorContextKeys.editorTextFocus,
 				primary: KeyMod.Alt | KeyMod.Shift | KeyCode.DownArrow,
-				linux: { primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyMod.Shift | KeyCode.DownArrow }
+				linux: { primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyMod.Shift | KeyCode.DownArrow },
+				weight: KeybindingWeight.EditorContrib
+			},
+			menubarOpts: {
+				menuId: MenuId.MenubarSelectionMenu,
+				group: '2_line',
+				title: nls.localize({ key: 'miCopyLinesDown', comment: ['&& denotes a mnemonic'] }, "Co&&py Line Down"),
+				order: 2
 			}
 		});
 	}
@@ -93,7 +109,7 @@ abstract class AbstractMoveLinesAction extends EditorAction {
 		this.down = down;
 	}
 
-	public run(accessor: ServicesAccessor, editor: ICodeEditor): void {
+	public run(_accessor: ServicesAccessor, editor: ICodeEditor): void {
 
 		let commands: ICommand[] = [];
 		let selections = editor.getSelections();
@@ -119,7 +135,14 @@ class MoveLinesUpAction extends AbstractMoveLinesAction {
 			kbOpts: {
 				kbExpr: EditorContextKeys.editorTextFocus,
 				primary: KeyMod.Alt | KeyCode.UpArrow,
-				linux: { primary: KeyMod.Alt | KeyCode.UpArrow }
+				linux: { primary: KeyMod.Alt | KeyCode.UpArrow },
+				weight: KeybindingWeight.EditorContrib
+			},
+			menubarOpts: {
+				menuId: MenuId.MenubarSelectionMenu,
+				group: '2_line',
+				title: nls.localize({ key: 'miMoveLinesUp', comment: ['&& denotes a mnemonic'] }, "Mo&&ve Line Up"),
+				order: 3
 			}
 		});
 	}
@@ -135,7 +158,14 @@ class MoveLinesDownAction extends AbstractMoveLinesAction {
 			kbOpts: {
 				kbExpr: EditorContextKeys.editorTextFocus,
 				primary: KeyMod.Alt | KeyCode.DownArrow,
-				linux: { primary: KeyMod.Alt | KeyCode.DownArrow }
+				linux: { primary: KeyMod.Alt | KeyCode.DownArrow },
+				weight: KeybindingWeight.EditorContrib
+			},
+			menubarOpts: {
+				menuId: MenuId.MenubarSelectionMenu,
+				group: '2_line',
+				title: nls.localize({ key: 'miMoveLinesDown', comment: ['&& denotes a mnemonic'] }, "Move &&Line Down"),
+				order: 4
 			}
 		});
 	}
@@ -149,7 +179,7 @@ export abstract class AbstractSortLinesAction extends EditorAction {
 		this.descending = descending;
 	}
 
-	public run(accessor: ServicesAccessor, editor: ICodeEditor): void {
+	public run(_accessor: ServicesAccessor, editor: ICodeEditor): void {
 		const selections = editor.getSelections();
 
 		for (let i = 0, len = selections.length; i < len; i++) {
@@ -204,12 +234,13 @@ export class TrimTrailingWhitespaceAction extends EditorAction {
 			precondition: EditorContextKeys.writable,
 			kbOpts: {
 				kbExpr: EditorContextKeys.editorTextFocus,
-				primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_K, KeyMod.CtrlCmd | KeyCode.KEY_X)
+				primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_K, KeyMod.CtrlCmd | KeyCode.KEY_X),
+				weight: KeybindingWeight.EditorContrib
 			}
 		});
 	}
 
-	public run(accessor: ServicesAccessor, editor: ICodeEditor, args: any): void {
+	public run(_accessor: ServicesAccessor, editor: ICodeEditor, args: any): void {
 
 		let cursors: Position[] = [];
 		if (args.reason === 'auto-save') {
@@ -235,8 +266,37 @@ interface IDeleteLinesOperation {
 	positionColumn: number;
 }
 
-abstract class AbstractRemoveLinesAction extends EditorAction {
-	_getLinesToRemove(editor: ICodeEditor): IDeleteLinesOperation[] {
+class DeleteLinesAction extends EditorAction {
+
+	constructor() {
+		super({
+			id: 'editor.action.deleteLines',
+			label: nls.localize('lines.delete', "Delete Line"),
+			alias: 'Delete Line',
+			precondition: EditorContextKeys.writable,
+			kbOpts: {
+				kbExpr: EditorContextKeys.textInputFocus,
+				primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KEY_K,
+				weight: KeybindingWeight.EditorContrib
+			}
+		});
+	}
+
+	public run(_accessor: ServicesAccessor, editor: ICodeEditor): void {
+
+		let ops = this._getLinesToRemove(editor);
+
+		// Finally, construct the delete lines commands
+		let commands: ICommand[] = ops.map((op) => {
+			return new DeleteLinesCommand(op.startLineNumber, op.endLineNumber, op.positionColumn);
+		});
+
+		editor.pushUndoStop();
+		editor.executeCommands(this.id, commands);
+		editor.pushUndoStop();
+	}
+
+	private _getLinesToRemove(editor: ICodeEditor): IDeleteLinesOperation[] {
 		// Construct delete operations
 		let operations: IDeleteLinesOperation[] = editor.getSelections().map((s) => {
 
@@ -277,36 +337,6 @@ abstract class AbstractRemoveLinesAction extends EditorAction {
 	}
 }
 
-class DeleteLinesAction extends AbstractRemoveLinesAction {
-
-	constructor() {
-		super({
-			id: 'editor.action.deleteLines',
-			label: nls.localize('lines.delete', "Delete Line"),
-			alias: 'Delete Line',
-			precondition: EditorContextKeys.writable,
-			kbOpts: {
-				kbExpr: EditorContextKeys.textInputFocus,
-				primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KEY_K
-			}
-		});
-	}
-
-	public run(accessor: ServicesAccessor, editor: ICodeEditor): void {
-
-		let ops = this._getLinesToRemove(editor);
-
-		// Finally, construct the delete lines commands
-		let commands: ICommand[] = ops.map((op) => {
-			return new DeleteLinesCommand(op.startLineNumber, op.endLineNumber, op.positionColumn);
-		});
-
-		editor.pushUndoStop();
-		editor.executeCommands(this.id, commands);
-		editor.pushUndoStop();
-	}
-}
-
 export class IndentLinesAction extends EditorAction {
 	constructor() {
 		super({
@@ -316,12 +346,13 @@ export class IndentLinesAction extends EditorAction {
 			precondition: EditorContextKeys.writable,
 			kbOpts: {
 				kbExpr: EditorContextKeys.editorTextFocus,
-				primary: KeyMod.CtrlCmd | KeyCode.US_CLOSE_SQUARE_BRACKET
+				primary: KeyMod.CtrlCmd | KeyCode.US_CLOSE_SQUARE_BRACKET,
+				weight: KeybindingWeight.EditorContrib
 			}
 		});
 	}
 
-	public run(accessor: ServicesAccessor, editor: ICodeEditor): void {
+	public run(_accessor: ServicesAccessor, editor: ICodeEditor): void {
 		editor.pushUndoStop();
 		editor.executeCommands(this.id, TypeOperations.indent(editor._getCursorConfiguration(), editor.getModel(), editor.getSelections()));
 		editor.pushUndoStop();
@@ -337,12 +368,13 @@ class OutdentLinesAction extends EditorAction {
 			precondition: EditorContextKeys.writable,
 			kbOpts: {
 				kbExpr: EditorContextKeys.editorTextFocus,
-				primary: KeyMod.CtrlCmd | KeyCode.US_OPEN_SQUARE_BRACKET
+				primary: KeyMod.CtrlCmd | KeyCode.US_OPEN_SQUARE_BRACKET,
+				weight: KeybindingWeight.EditorContrib
 			}
 		});
 	}
 
-	public run(accessor: ServicesAccessor, editor: ICodeEditor): void {
+	public run(_accessor: ServicesAccessor, editor: ICodeEditor): void {
 		CoreEditingCommands.Outdent.runEditorCommand(null, editor, null);
 	}
 }
@@ -356,12 +388,13 @@ export class InsertLineBeforeAction extends EditorAction {
 			precondition: EditorContextKeys.writable,
 			kbOpts: {
 				kbExpr: EditorContextKeys.editorTextFocus,
-				primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.Enter
+				primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.Enter,
+				weight: KeybindingWeight.EditorContrib
 			}
 		});
 	}
 
-	public run(accessor: ServicesAccessor, editor: ICodeEditor): void {
+	public run(_accessor: ServicesAccessor, editor: ICodeEditor): void {
 		editor.pushUndoStop();
 		editor.executeCommands(this.id, TypeOperations.lineInsertBefore(editor._getCursorConfiguration(), editor.getModel(), editor.getSelections()));
 	}
@@ -376,19 +409,20 @@ export class InsertLineAfterAction extends EditorAction {
 			precondition: EditorContextKeys.writable,
 			kbOpts: {
 				kbExpr: EditorContextKeys.editorTextFocus,
-				primary: KeyMod.CtrlCmd | KeyCode.Enter
+				primary: KeyMod.CtrlCmd | KeyCode.Enter,
+				weight: KeybindingWeight.EditorContrib
 			}
 		});
 	}
 
-	public run(accessor: ServicesAccessor, editor: ICodeEditor): void {
+	public run(_accessor: ServicesAccessor, editor: ICodeEditor): void {
 		editor.pushUndoStop();
 		editor.executeCommands(this.id, TypeOperations.lineInsertAfter(editor._getCursorConfiguration(), editor.getModel(), editor.getSelections()));
 	}
 }
 
 export abstract class AbstractDeleteAllToBoundaryAction extends EditorAction {
-	public run(accessor: ServicesAccessor, editor: ICodeEditor): void {
+	public run(_accessor: ServicesAccessor, editor: ICodeEditor): void {
 		const primaryCursor = editor.getSelection();
 		let rangesToDelete = this._getRangesToDelete(editor);
 		// merge overlapping selections
@@ -408,8 +442,8 @@ export abstract class AbstractDeleteAllToBoundaryAction extends EditorAction {
 		effectiveRanges.push(rangesToDelete[rangesToDelete.length - 1]);
 
 		let endCursorState = this._getEndCursorState(primaryCursor, effectiveRanges);
+
 		let edits: IIdentifiedSingleEditOperation[] = effectiveRanges.map(range => {
-			endCursorState.push(new Selection(range.startLineNumber, range.startColumn, range.startLineNumber, range.startColumn));
 			return EditOperation.replace(range, '');
 		});
 
@@ -436,7 +470,8 @@ export class DeleteAllLeftAction extends AbstractDeleteAllToBoundaryAction {
 			kbOpts: {
 				kbExpr: EditorContextKeys.textInputFocus,
 				primary: null,
-				mac: { primary: KeyMod.CtrlCmd | KeyCode.Backspace }
+				mac: { primary: KeyMod.CtrlCmd | KeyCode.Backspace },
+				weight: KeybindingWeight.EditorContrib
 			}
 		});
 	}
@@ -444,17 +479,25 @@ export class DeleteAllLeftAction extends AbstractDeleteAllToBoundaryAction {
 	_getEndCursorState(primaryCursor: Range, rangesToDelete: Range[]): Selection[] {
 		let endPrimaryCursor: Selection;
 		let endCursorState: Selection[] = [];
+		let deletedLines = 0;
 
-		for (let i = 0, len = rangesToDelete.length; i < len; i++) {
-			let range = rangesToDelete[i];
-			let endCursor = new Selection(rangesToDelete[i].startLineNumber, rangesToDelete[i].startColumn, rangesToDelete[i].startLineNumber, rangesToDelete[i].startColumn);
+		rangesToDelete.forEach(range => {
+			let endCursor;
+			if (range.endColumn === 1 && deletedLines > 0) {
+				let newStartLine = range.startLineNumber - deletedLines;
+				endCursor = new Selection(newStartLine, range.startColumn, newStartLine, range.startColumn);
+			} else {
+				endCursor = new Selection(range.startLineNumber, range.startColumn, range.startLineNumber, range.startColumn);
+			}
+
+			deletedLines += range.endLineNumber - range.startLineNumber;
 
 			if (range.intersectRanges(primaryCursor)) {
 				endPrimaryCursor = endCursor;
 			} else {
 				endCursorState.push(endCursor);
 			}
-		}
+		});
 
 		if (endPrimaryCursor) {
 			endCursorState.unshift(endPrimaryCursor);
@@ -465,11 +508,18 @@ export class DeleteAllLeftAction extends AbstractDeleteAllToBoundaryAction {
 
 	_getRangesToDelete(editor: ICodeEditor): Range[] {
 		let rangesToDelete: Range[] = editor.getSelections();
+		let model = editor.getModel();
 
 		rangesToDelete.sort(Range.compareRangesUsingStarts);
 		rangesToDelete = rangesToDelete.map(selection => {
 			if (selection.isEmpty()) {
-				return new Range(selection.startLineNumber, 1, selection.startLineNumber, selection.startColumn);
+				if (selection.startColumn === 1) {
+					let deleteFromLine = Math.max(1, selection.startLineNumber - 1);
+					let deleteFromColumn = selection.startLineNumber === 1 ? 1 : model.getLineContent(deleteFromLine).length + 1;
+					return new Range(deleteFromLine, deleteFromColumn, selection.startLineNumber, 1);
+				} else {
+					return new Range(selection.startLineNumber, 1, selection.startLineNumber, selection.startColumn);
+				}
 			} else {
 				return selection;
 			}
@@ -489,7 +539,8 @@ export class DeleteAllRightAction extends AbstractDeleteAllToBoundaryAction {
 			kbOpts: {
 				kbExpr: EditorContextKeys.textInputFocus,
 				primary: null,
-				mac: { primary: KeyMod.WinCtrl | KeyCode.KEY_K, secondary: [KeyMod.CtrlCmd | KeyCode.Delete] }
+				mac: { primary: KeyMod.WinCtrl | KeyCode.KEY_K, secondary: [KeyMod.CtrlCmd | KeyCode.Delete] },
+				weight: KeybindingWeight.EditorContrib
 			}
 		});
 	}
@@ -546,12 +597,13 @@ export class JoinLinesAction extends EditorAction {
 			kbOpts: {
 				kbExpr: EditorContextKeys.editorTextFocus,
 				primary: 0,
-				mac: { primary: KeyMod.WinCtrl | KeyCode.KEY_J }
+				mac: { primary: KeyMod.WinCtrl | KeyCode.KEY_J },
+				weight: KeybindingWeight.EditorContrib
 			}
 		});
 	}
 
-	public run(accessor: ServicesAccessor, editor: ICodeEditor): void {
+	public run(_accessor: ServicesAccessor, editor: ICodeEditor): void {
 		let selections = editor.getSelections();
 		let primaryCursor = editor.getSelection();
 
@@ -694,7 +746,7 @@ export class TransposeAction extends EditorAction {
 		});
 	}
 
-	public run(accessor: ServicesAccessor, editor: ICodeEditor): void {
+	public run(_accessor: ServicesAccessor, editor: ICodeEditor): void {
 		let selections = editor.getSelections();
 		let model = editor.getModel();
 		let commands: ICommand[] = [];
@@ -735,7 +787,7 @@ export class TransposeAction extends EditorAction {
 }
 
 export abstract class AbstractCaseAction extends EditorAction {
-	public run(accessor: ServicesAccessor, editor: ICodeEditor): void {
+	public run(_accessor: ServicesAccessor, editor: ICodeEditor): void {
 		let selections = editor.getSelections();
 		let model = editor.getModel();
 		let commands: ICommand[] = [];
diff --git a/src/vs/editor/contrib/linesOperations/test/linesOperations.test.ts b/src/vs/editor/contrib/linesOperations/test/linesOperations.test.ts
index ae01a2682eb..31963d45986 100644
--- a/src/vs/editor/contrib/linesOperations/test/linesOperations.test.ts
+++ b/src/vs/editor/contrib/linesOperations/test/linesOperations.test.ts
@@ -155,6 +155,101 @@ suite('Editor Contrib - Line Operations', () => {
 				});
 		});
 
+		test('should jump to the previous line when on first column', function () {
+			withTestCodeEditor(
+				[
+					'one',
+					'two',
+					'three'
+				], {}, (editor, cursor) => {
+					let model = editor.getModel();
+					let deleteAllLeftAction = new DeleteAllLeftAction();
+
+					editor.setSelection(new Selection(2, 1, 2, 1));
+					deleteAllLeftAction.run(null, editor);
+					assert.equal(model.getLineContent(1), 'onetwo', '001');
+
+					editor.setSelections([new Selection(1, 1, 1, 1), new Selection(2, 1, 2, 1)]);
+					deleteAllLeftAction.run(null, editor);
+					assert.equal(model.getLinesContent()[0], 'onetwothree');
+					assert.equal(model.getLinesContent().length, 1);
+
+					editor.setSelection(new Selection(1, 1, 1, 1));
+					deleteAllLeftAction.run(null, editor);
+					assert.equal(model.getLinesContent()[0], 'onetwothree');
+				});
+		});
+
+		test('should keep deleting lines in multi cursor mode', function () {
+			withTestCodeEditor(
+				[
+					'hi my name is Carlos Matos',
+					'BCC',
+					'waso waso waso',
+					'my wife doesnt believe in me',
+					'nonononono',
+					'bitconneeeect'
+				], {}, (editor, cursor) => {
+					let model = editor.getModel();
+					let deleteAllLeftAction = new DeleteAllLeftAction();
+
+					const beforeSecondWasoSelection = new Selection(3, 5, 3, 5);
+					const endOfBCCSelection = new Selection(2, 4, 2, 4);
+					const endOfNonono = new Selection(5, 11, 5, 11);
+
+					editor.setSelections([beforeSecondWasoSelection, endOfBCCSelection, endOfNonono]);
+					let selections;
+
+					deleteAllLeftAction.run(null, editor);
+					selections = editor.getSelections();
+
+					assert.equal(model.getLineContent(2), '');
+					assert.equal(model.getLineContent(3), ' waso waso');
+					assert.equal(model.getLineContent(5), '');
+
+					assert.deepEqual([
+						selections[0].startLineNumber,
+						selections[0].startColumn,
+						selections[0].endLineNumber,
+						selections[0].endColumn
+					], [3, 1, 3, 1]);
+
+					assert.deepEqual([
+						selections[1].startLineNumber,
+						selections[1].startColumn,
+						selections[1].endLineNumber,
+						selections[1].endColumn
+					], [2, 1, 2, 1]);
+
+					assert.deepEqual([
+						selections[2].startLineNumber,
+						selections[2].startColumn,
+						selections[2].endLineNumber,
+						selections[2].endColumn
+					], [5, 1, 5, 1]);
+
+					deleteAllLeftAction.run(null, editor);
+					selections = editor.getSelections();
+
+					assert.equal(model.getLineContent(1), 'hi my name is Carlos Matos waso waso');
+					assert.equal(selections.length, 2);
+
+					assert.deepEqual([
+						selections[0].startLineNumber,
+						selections[0].startColumn,
+						selections[0].endLineNumber,
+						selections[0].endColumn
+					], [1, 27, 1, 27]);
+
+					assert.deepEqual([
+						selections[1].startLineNumber,
+						selections[1].startColumn,
+						selections[1].endLineNumber,
+						selections[1].endColumn
+					], [2, 29, 2, 29]);
+				});
+		});
+
 		test('should work in multi cursor mode', function () {
 			withTestCodeEditor(
 				[
diff --git a/src/vs/editor/contrib/links/getLinks.ts b/src/vs/editor/contrib/links/getLinks.ts
index bbeda1aedd4..028177b91c5 100644
--- a/src/vs/editor/contrib/links/getLinks.ts
+++ b/src/vs/editor/contrib/links/getLinks.ts
@@ -6,14 +6,14 @@
 'use strict';
 
 import { onUnexpectedExternalError } from 'vs/base/common/errors';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { Range, IRange } from 'vs/editor/common/core/range';
 import { ITextModel } from 'vs/editor/common/model';
 import { ILink, LinkProvider, LinkProviderRegistry } from 'vs/editor/common/modes';
-import { asWinJsPromise } from 'vs/base/common/async';
 import { CommandsRegistry } from 'vs/platform/commands/common/commands';
 import { IModelService } from 'vs/editor/common/services/modelService';
+import { CancellationToken } from 'vs/base/common/cancellation';
 
 export class Link implements ILink {
 
@@ -40,7 +40,7 @@ export class Link implements ILink {
 		return this._link.url;
 	}
 
-	resolve(): TPromise<URI> {
+	resolve(token: CancellationToken): Thenable<URI> {
 		if (this._link.url) {
 			try {
 				return TPromise.as(URI.parse(this._link.url));
@@ -50,11 +50,11 @@ export class Link implements ILink {
 		}
 
 		if (typeof this._provider.resolveLink === 'function') {
-			return asWinJsPromise(token => this._provider.resolveLink(this._link, token)).then(value => {
+			return Promise.resolve(this._provider.resolveLink(this._link, token)).then(value => {
 				this._link = value || this._link;
 				if (this._link.url) {
 					// recurse
-					return this.resolve();
+					return this.resolve(token);
 				}
 
 				return TPromise.wrapError<URI>(new Error('missing'));
@@ -65,13 +65,13 @@ export class Link implements ILink {
 	}
 }
 
-export function getLinks(model: ITextModel): TPromise<Link[]> {
+export function getLinks(model: ITextModel, token: CancellationToken): Promise<Link[]> {
 
 	let links: Link[] = [];
 
 	// ask all providers for links in parallel
 	const promises = LinkProviderRegistry.ordered(model).reverse().map(provider => {
-		return asWinJsPromise(token => provider.provideLinks(model, token)).then(result => {
+		return Promise.resolve(provider.provideLinks(model, token)).then(result => {
 			if (Array.isArray(result)) {
 				const newLinks = result.map(link => new Link(link, provider));
 				links = union(links, newLinks);
@@ -79,7 +79,7 @@ export function getLinks(model: ITextModel): TPromise<Link[]> {
 		}, onUnexpectedExternalError);
 	});
 
-	return TPromise.join(promises).then(() => {
+	return Promise.all(promises).then(() => {
 		return links;
 	});
 }
@@ -137,5 +137,5 @@ CommandsRegistry.registerCommand('_executeLinkProvider', (accessor, ...args) =>
 		return undefined;
 	}
 
-	return getLinks(model);
+	return getLinks(model, CancellationToken.None);
 });
diff --git a/src/vs/editor/contrib/links/links.ts b/src/vs/editor/contrib/links/links.ts
index cea850c2a20..eb65d4e2661 100644
--- a/src/vs/editor/contrib/links/links.ts
+++ b/src/vs/editor/contrib/links/links.ts
@@ -9,7 +9,6 @@ import 'vs/css!./links';
 import * as nls from 'vs/nls';
 import { onUnexpectedError } from 'vs/base/common/errors';
 import * as platform from 'vs/base/common/platform';
-import { TPromise } from 'vs/base/common/winjs.base';
 import { IOpenerService } from 'vs/platform/opener/common/opener';
 import * as editorCommon from 'vs/editor/common/editorCommon';
 import { registerEditorAction, registerEditorContribution, ServicesAccessor, EditorAction } from 'vs/editor/browser/editorExtensions';
@@ -25,6 +24,8 @@ import { ClickLinkGesture, ClickLinkMouseEvent, ClickLinkKeyboardEvent } from 'v
 import { MarkdownString } from 'vs/base/common/htmlContent';
 import { TrackedRangeStickiness, IModelDeltaDecoration, IModelDecorationsChangeAccessor } from 'vs/editor/common/model';
 import { INotificationService } from 'vs/platform/notification/common/notification';
+import * as async from 'vs/base/common/async';
+import { CancellationToken } from 'vs/base/common/cancellation';
 
 const HOVER_MESSAGE_GENERAL_META = new MarkdownString().appendText(
 	platform.isMacintosh
@@ -149,8 +150,8 @@ class LinkDetector implements editorCommon.IEditorContribution {
 	private editor: ICodeEditor;
 	private enabled: boolean;
 	private listenersToRemove: IDisposable[];
-	private timeoutPromise: TPromise<void>;
-	private computePromise: TPromise<void>;
+	private timeout: async.TimeoutTimer;
+	private computePromise: async.CancelablePromise<Link[]>;
 	private activeLinkDecorationId: string;
 	private openerService: IOpenerService;
 	private notificationService: INotificationService;
@@ -201,7 +202,7 @@ class LinkDetector implements editorCommon.IEditorContribution {
 		this.listenersToRemove.push(editor.onDidChangeModelLanguage((e) => this.onModelModeChanged()));
 		this.listenersToRemove.push(LinkProviderRegistry.onDidChange((e) => this.onModelModeChanged()));
 
-		this.timeoutPromise = null;
+		this.timeout = new async.TimeoutTimer();
 		this.computePromise = null;
 		this.currentOccurrences = {};
 		this.activeLinkDecorationId = null;
@@ -225,16 +226,10 @@ class LinkDetector implements editorCommon.IEditorContribution {
 	}
 
 	private onChange(): void {
-		if (!this.timeoutPromise) {
-			this.timeoutPromise = TPromise.timeout(LinkDetector.RECOMPUTE_TIME);
-			this.timeoutPromise.then(() => {
-				this.timeoutPromise = null;
-				this.beginCompute();
-			});
-		}
+		this.timeout.setIfNotSet(() => this.beginCompute(), LinkDetector.RECOMPUTE_TIME);
 	}
 
-	private beginCompute(): void {
+	private async beginCompute(): Promise<void> {
 		if (!this.editor.getModel() || !this.enabled) {
 			return;
 		}
@@ -243,10 +238,15 @@ class LinkDetector implements editorCommon.IEditorContribution {
 			return;
 		}
 
-		this.computePromise = getLinks(this.editor.getModel()).then(links => {
+		this.computePromise = async.createCancelablePromise(token => getLinks(this.editor.getModel(), token));
+		try {
+			const links = await this.computePromise;
 			this.updateDecorations(links);
+		} catch (err) {
+			onUnexpectedError(err);
+		} finally {
 			this.computePromise = null;
-		});
+		}
 	}
 
 	private updateDecorations(links: Link[]): void {
@@ -326,7 +326,7 @@ class LinkDetector implements editorCommon.IEditorContribution {
 
 		const { link } = occurrence;
 
-		link.resolve().then(uri => {
+		link.resolve(CancellationToken.None).then(uri => {
 			// open the uri
 			return this.openerService.open(uri, { openToSide });
 
@@ -339,7 +339,7 @@ class LinkDetector implements editorCommon.IEditorContribution {
 			} else {
 				onUnexpectedError(err);
 			}
-		}).done(null, onUnexpectedError);
+		});
 	}
 
 	public getLinkOccurrence(position: Position): LinkOccurrence {
@@ -369,10 +369,7 @@ class LinkDetector implements editorCommon.IEditorContribution {
 	}
 
 	private stop(): void {
-		if (this.timeoutPromise) {
-			this.timeoutPromise.cancel();
-			this.timeoutPromise = null;
-		}
+		this.timeout.cancel();
 		if (this.computePromise) {
 			this.computePromise.cancel();
 			this.computePromise = null;
@@ -382,6 +379,7 @@ class LinkDetector implements editorCommon.IEditorContribution {
 	public dispose(): void {
 		this.listenersToRemove = dispose(this.listenersToRemove);
 		this.stop();
+		this.timeout.dispose();
 	}
 }
 
diff --git a/src/vs/editor/contrib/markdown/markdownRenderer.ts b/src/vs/editor/contrib/markdown/markdownRenderer.ts
index 106f60d7451..6f7d78e7db4 100644
--- a/src/vs/editor/contrib/markdown/markdownRenderer.ts
+++ b/src/vs/editor/contrib/markdown/markdownRenderer.ts
@@ -10,7 +10,7 @@ import { IMarkdownString } from 'vs/base/common/htmlContent';
 import { renderMarkdown, RenderOptions } from 'vs/base/browser/htmlContentRenderer';
 import { IOpenerService, NullOpenerService } from 'vs/platform/opener/common/opener';
 import { IModeService } from 'vs/editor/common/services/modeService';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { onUnexpectedError } from 'vs/base/common/errors';
 import { tokenizeToString } from 'vs/editor/common/modes/textToHtmlTokenizer';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
diff --git a/src/vs/editor/contrib/message/messageController.ts b/src/vs/editor/contrib/message/messageController.ts
index e80d0f6b90c..ad00fce472f 100644
--- a/src/vs/editor/contrib/message/messageController.ts
+++ b/src/vs/editor/contrib/message/messageController.ts
@@ -7,7 +7,7 @@
 
 import 'vs/css!./messageController';
 import * as nls from 'vs/nls';
-import { setDisposableTimeout } from 'vs/base/common/async';
+import { TimeoutTimer } from 'vs/base/common/async';
 import { KeyCode } from 'vs/base/common/keyCodes';
 import { IDisposable, dispose, Disposable } from 'vs/base/common/lifecycle';
 import { alert } from 'vs/base/browser/ui/aria/aria';
@@ -18,8 +18,8 @@ import { ICodeEditor, IContentWidget, IContentWidgetPosition, ContentWidgetPosit
 import { IContextKeyService, RawContextKey, IContextKey } from 'vs/platform/contextkey/common/contextkey';
 import { IPosition } from 'vs/editor/common/core/position';
 import { registerThemingParticipant, HIGH_CONTRAST } from 'vs/platform/theme/common/themeService';
-import { inputValidationInfoBorder, inputValidationInfoBackground } from 'vs/platform/theme/common/colorRegistry';
-import { KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRegistry';
+import { inputValidationInfoBorder, inputValidationInfoBackground, inputValidationInfoForeground } from 'vs/platform/theme/common/colorRegistry';
+import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
 
 export class MessageController extends Disposable implements editorCommon.IEditorContribution {
 
@@ -75,7 +75,7 @@ export class MessageController extends Disposable implements editorCommon.IEdito
 		this._messageListeners.push(this._editor.onDidChangeModel(() => this.closeMessage()));
 
 		// close after 3s
-		this._messageListeners.push(setDisposableTimeout(() => this.closeMessage(), 3000));
+		this._messageListeners.push(new TimeoutTimer(() => this.closeMessage(), 3000));
 
 		// close on mouse move
 		let bounds: Range;
@@ -114,7 +114,7 @@ registerEditorCommand(new MessageCommand({
 	precondition: MessageController.MESSAGE_VISIBLE,
 	handler: c => c.closeMessage(),
 	kbOpts: {
-		weight: KeybindingsRegistry.WEIGHT.editorContrib(30),
+		weight: KeybindingWeight.EditorContrib + 30,
 		primary: KeyCode.Escape
 	}
 }));
@@ -194,4 +194,8 @@ registerThemingParticipant((theme, collector) => {
 	if (background) {
 		collector.addRule(`.monaco-editor .monaco-editor-overlaymessage .message { background-color: ${background}; }`);
 	}
+	let foreground = theme.getColor(inputValidationInfoForeground);
+	if (foreground) {
+		collector.addRule(`.monaco-editor .monaco-editor-overlaymessage .message { color: ${foreground}; }`);
+	}
 });
diff --git a/src/vs/editor/contrib/multicursor/multicursor.ts b/src/vs/editor/contrib/multicursor/multicursor.ts
index c47b0080fbf..f75b50f5313 100644
--- a/src/vs/editor/contrib/multicursor/multicursor.ts
+++ b/src/vs/editor/contrib/multicursor/multicursor.ts
@@ -25,6 +25,8 @@ import { overviewRulerSelectionHighlightForeground } from 'vs/platform/theme/com
 import { themeColorFromId } from 'vs/platform/theme/common/themeService';
 import { INewFindReplaceState, FindOptionOverride } from 'vs/editor/contrib/find/findState';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
+import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
+import { MenuId } from 'vs/platform/actions/common/actions';
 
 export class InsertCursorAbove extends EditorAction {
 
@@ -40,7 +42,14 @@ export class InsertCursorAbove extends EditorAction {
 				linux: {
 					primary: KeyMod.Shift | KeyMod.Alt | KeyCode.UpArrow,
 					secondary: [KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.UpArrow]
-				}
+				},
+				weight: KeybindingWeight.EditorContrib
+			},
+			menubarOpts: {
+				menuId: MenuId.MenubarSelectionMenu,
+				group: '3_multi',
+				title: nls.localize({ key: 'miInsertCursorAbove', comment: ['&& denotes a mnemonic'] }, "&&Add Cursor Above"),
+				order: 2
 			}
 		});
 	}
@@ -78,7 +87,14 @@ export class InsertCursorBelow extends EditorAction {
 				linux: {
 					primary: KeyMod.Shift | KeyMod.Alt | KeyCode.DownArrow,
 					secondary: [KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.DownArrow]
-				}
+				},
+				weight: KeybindingWeight.EditorContrib
+			},
+			menubarOpts: {
+				menuId: MenuId.MenubarSelectionMenu,
+				group: '3_multi',
+				title: nls.localize({ key: 'miInsertCursorBelow', comment: ['&& denotes a mnemonic'] }, "A&&dd Cursor Below"),
+				order: 3
 			}
 		});
 	}
@@ -112,7 +128,14 @@ class InsertCursorAtEndOfEachLineSelected extends EditorAction {
 			precondition: null,
 			kbOpts: {
 				kbExpr: EditorContextKeys.editorTextFocus,
-				primary: KeyMod.Shift | KeyMod.Alt | KeyCode.KEY_I
+				primary: KeyMod.Shift | KeyMod.Alt | KeyCode.KEY_I,
+				weight: KeybindingWeight.EditorContrib
+			},
+			menubarOpts: {
+				menuId: MenuId.MenubarSelectionMenu,
+				group: '3_multi',
+				title: nls.localize({ key: 'miInsertCursorAtEndOfEachLineSelected', comment: ['&& denotes a mnemonic'] }, "Add C&&ursors to Line Ends"),
+				order: 4
 			}
 		});
 	}
@@ -522,7 +545,14 @@ export class AddSelectionToNextFindMatchAction extends MultiCursorSelectionContr
 			precondition: null,
 			kbOpts: {
 				kbExpr: EditorContextKeys.focus,
-				primary: KeyMod.CtrlCmd | KeyCode.KEY_D
+				primary: KeyMod.CtrlCmd | KeyCode.KEY_D,
+				weight: KeybindingWeight.EditorContrib
+			},
+			menubarOpts: {
+				menuId: MenuId.MenubarSelectionMenu,
+				group: '3_multi',
+				title: nls.localize({ key: 'miAddSelectionToNextFindMatch', comment: ['&& denotes a mnemonic'] }, "Add &&Next Occurrence"),
+				order: 5
 			}
 		});
 	}
@@ -537,7 +567,13 @@ export class AddSelectionToPreviousFindMatchAction extends MultiCursorSelectionC
 			id: 'editor.action.addSelectionToPreviousFindMatch',
 			label: nls.localize('addSelectionToPreviousFindMatch', "Add Selection To Previous Find Match"),
 			alias: 'Add Selection To Previous Find Match',
-			precondition: null
+			precondition: null,
+			menubarOpts: {
+				menuId: MenuId.MenubarSelectionMenu,
+				group: '3_multi',
+				title: nls.localize({ key: 'miAddSelectionToPreviousFindMatch', comment: ['&& denotes a mnemonic'] }, "Add P&&revious Occurrence"),
+				order: 6
+			}
 		});
 	}
 	protected _run(multiCursorController: MultiCursorSelectionController, findController: CommonFindController): void {
@@ -554,7 +590,8 @@ export class MoveSelectionToNextFindMatchAction extends MultiCursorSelectionCont
 			precondition: null,
 			kbOpts: {
 				kbExpr: EditorContextKeys.focus,
-				primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_K, KeyMod.CtrlCmd | KeyCode.KEY_D)
+				primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_K, KeyMod.CtrlCmd | KeyCode.KEY_D),
+				weight: KeybindingWeight.EditorContrib
 			}
 		});
 	}
@@ -586,7 +623,14 @@ export class SelectHighlightsAction extends MultiCursorSelectionControllerAction
 			precondition: null,
 			kbOpts: {
 				kbExpr: EditorContextKeys.focus,
-				primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KEY_L
+				primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KEY_L,
+				weight: KeybindingWeight.EditorContrib
+			},
+			menubarOpts: {
+				menuId: MenuId.MenubarSelectionMenu,
+				group: '3_multi',
+				title: nls.localize({ key: 'miSelectHighlights', comment: ['&& denotes a mnemonic'] }, "Select All &&Occurrences"),
+				order: 7
 			}
 		});
 	}
@@ -604,7 +648,8 @@ export class CompatChangeAll extends MultiCursorSelectionControllerAction {
 			precondition: EditorContextKeys.writable,
 			kbOpts: {
 				kbExpr: EditorContextKeys.editorTextFocus,
-				primary: KeyMod.CtrlCmd | KeyCode.F2
+				primary: KeyMod.CtrlCmd | KeyCode.F2,
+				weight: KeybindingWeight.EditorContrib
 			},
 			menuOpts: {
 				group: '1_modification',
@@ -618,13 +663,11 @@ export class CompatChangeAll extends MultiCursorSelectionControllerAction {
 }
 
 class SelectionHighlighterState {
-	public readonly lastWordUnderCursor: Selection;
 	public readonly searchText: string;
 	public readonly matchCase: boolean;
 	public readonly wordSeparators: string;
 
-	constructor(lastWordUnderCursor: Selection, searchText: string, matchCase: boolean, wordSeparators: string) {
-		this.lastWordUnderCursor = lastWordUnderCursor;
+	constructor(searchText: string, matchCase: boolean, wordSeparators: string) {
 		this.searchText = searchText;
 		this.matchCase = matchCase;
 		this.wordSeparators = wordSeparators;
@@ -678,7 +721,7 @@ export class SelectionHighlighter extends Disposable implements IEditorContribut
 
 			if (e.selection.isEmpty()) {
 				if (e.reason === CursorChangeReason.Explicit) {
-					if (this.state && (!this.state.lastWordUnderCursor || !this.state.lastWordUnderCursor.containsPosition(e.selection.getStartPosition()))) {
+					if (this.state) {
 						// no longer valid
 						this._setState(null);
 					}
@@ -746,21 +789,10 @@ export class SelectionHighlighter extends Disposable implements IEditorContribut
 			return null;
 		}
 
-		let lastWordUnderCursor: Selection = null;
-		const hasFindOccurrences = DocumentHighlightProviderRegistry.has(model);
 		if (r.currentMatch) {
 			// This is an empty selection
-			if (hasFindOccurrences) {
-				// Do not interfere with semantic word highlighting in the no selection case
-				return null;
-			}
-
-			const config = editor.getConfiguration();
-			if (!config.contribInfo.occurrencesHighlight) {
-				return null;
-			}
-
-			lastWordUnderCursor = r.currentMatch;
+			// Do not interfere with semantic word highlighting in the no selection case
+			return null;
 		}
 		if (/^[ \t]+$/.test(r.searchText)) {
 			// whitespace only selection
@@ -792,7 +824,7 @@ export class SelectionHighlighter extends Disposable implements IEditorContribut
 			}
 		}
 
-		return new SelectionHighlighterState(lastWordUnderCursor, r.searchText, r.matchCase, r.wholeWord ? editor.getConfiguration().wordSeparators : null);
+		return new SelectionHighlighterState(r.searchText, r.matchCase, r.wholeWord ? editor.getConfiguration().wordSeparators : null);
 	}
 
 	private _setState(state: SelectionHighlighterState): void {
@@ -834,7 +866,7 @@ export class SelectionHighlighter extends Disposable implements IEditorContribut
 				const cmp = Range.compareRangesUsingStarts(match, selections[j]);
 				if (cmp < 0) {
 					// match is before sel
-					if (!Range.areIntersecting(match, selections[j])) {
+					if (selections[j].isEmpty() || !Range.areIntersecting(match, selections[j])) {
 						matches.push(match);
 					}
 					i++;
diff --git a/src/vs/editor/contrib/parameterHints/parameterHints.ts b/src/vs/editor/contrib/parameterHints/parameterHints.ts
index 92d7eb7a799..e02faeb4cc5 100644
--- a/src/vs/editor/contrib/parameterHints/parameterHints.ts
+++ b/src/vs/editor/contrib/parameterHints/parameterHints.ts
@@ -15,7 +15,8 @@ import { registerEditorAction, registerEditorContribution, ServicesAccessor, Edi
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
 import { ParameterHintsWidget } from './parameterHintsWidget';
 import { Context } from 'vs/editor/contrib/parameterHints/provideSignatureHelp';
-import { KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRegistry';
+import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
+import * as modes from 'vs/editor/common/modes';
 
 class ParameterHintsController implements IEditorContribution {
 
@@ -49,8 +50,8 @@ class ParameterHintsController implements IEditorContribution {
 		this.widget.next();
 	}
 
-	trigger(): void {
-		this.widget.trigger();
+	trigger(context: modes.SignatureHelpContext): void {
+		this.widget.trigger(context);
 	}
 
 	dispose(): void {
@@ -68,7 +69,8 @@ export class TriggerParameterHintsAction extends EditorAction {
 			precondition: EditorContextKeys.hasSignatureHelpProvider,
 			kbOpts: {
 				kbExpr: EditorContextKeys.editorTextFocus,
-				primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.Space
+				primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.Space,
+				weight: KeybindingWeight.EditorContrib
 			}
 		});
 	}
@@ -76,7 +78,7 @@ export class TriggerParameterHintsAction extends EditorAction {
 	public run(accessor: ServicesAccessor, editor: ICodeEditor): void {
 		let controller = ParameterHintsController.get(editor);
 		if (controller) {
-			controller.trigger();
+			controller.trigger({ triggerReason: modes.SignatureHelpTriggerReason.Invoke });
 		}
 	}
 }
@@ -84,7 +86,7 @@ export class TriggerParameterHintsAction extends EditorAction {
 registerEditorContribution(ParameterHintsController);
 registerEditorAction(TriggerParameterHintsAction);
 
-const weight = KeybindingsRegistry.WEIGHT.editorContrib(75);
+const weight = KeybindingWeight.EditorContrib + 75;
 
 const ParameterHintsCommand = EditorCommand.bindToContribution<ParameterHintsController>(ParameterHintsController.get);
 
diff --git a/src/vs/editor/contrib/parameterHints/parameterHintsWidget.ts b/src/vs/editor/contrib/parameterHints/parameterHintsWidget.ts
index d6dd252f9f9..892eb88a8e9 100644
--- a/src/vs/editor/contrib/parameterHints/parameterHintsWidget.ts
+++ b/src/vs/editor/contrib/parameterHints/parameterHintsWidget.ts
@@ -8,12 +8,11 @@
 import 'vs/css!./parameterHints';
 import * as nls from 'vs/nls';
 import { IDisposable, dispose, Disposable } from 'vs/base/common/lifecycle';
-import { TPromise } from 'vs/base/common/winjs.base';
 import * as dom from 'vs/base/browser/dom';
 import * as aria from 'vs/base/browser/ui/aria/aria';
-import { SignatureHelp, SignatureInformation, SignatureHelpProviderRegistry } from 'vs/editor/common/modes';
+import * as modes from 'vs/editor/common/modes';
 import { ContentWidgetPositionPreference, ICodeEditor, IContentWidget, IContentWidgetPosition } from 'vs/editor/browser/editorBrowser';
-import { RunOnceScheduler } from 'vs/base/common/async';
+import { RunOnceScheduler, createCancelablePromise, CancelablePromise } from 'vs/base/common/async';
 import { onUnexpectedError } from 'vs/base/common/errors';
 import { Event, Emitter, chain } from 'vs/base/common/event';
 import { domEvent, stop } from 'vs/base/browser/event';
@@ -32,43 +31,49 @@ import { MarkdownRenderer } from 'vs/editor/contrib/markdown/markdownRenderer';
 const $ = dom.$;
 
 export interface IHintEvent {
-	hints: SignatureHelp;
+	hints: modes.SignatureHelp;
 }
 
 export class ParameterHintsModel extends Disposable {
 
-	static DELAY = 120; // ms
+	private static readonly DEFAULT_DELAY = 120; // ms
 
-	private _onHint = this._register(new Emitter<IHintEvent>());
-	onHint: Event<IHintEvent> = this._onHint.event;
+	private readonly _onHint = this._register(new Emitter<IHintEvent>());
+	public readonly onHint: Event<IHintEvent> = this._onHint.event;
 
-	private _onCancel = this._register(new Emitter<void>());
-	onCancel: Event<void> = this._onCancel.event;
+	private readonly _onCancel = this._register(new Emitter<void>());
+	public readonly onCancel: Event<void> = this._onCancel.event;
 
 	private editor: ICodeEditor;
 	private enabled: boolean;
 	private triggerCharactersListeners: IDisposable[];
-	private active: boolean;
-	private throttledDelayer: RunOnceScheduler;
-	private provideSignatureHelpRequest?: TPromise<boolean, any>;
+	private active: boolean = false;
+	private pending: boolean = false;
+	private triggerChars = new CharacterSet();
 
-	constructor(editor: ICodeEditor) {
+	private triggerContext: modes.SignatureHelpContext | undefined;
+	private throttledDelayer: RunOnceScheduler;
+	private provideSignatureHelpRequest?: CancelablePromise<modes.SignatureHelp>;
+
+	constructor(
+		editor: ICodeEditor,
+		delay: number = ParameterHintsModel.DEFAULT_DELAY
+	) {
 		super();
 
 		this.editor = editor;
 		this.enabled = false;
 		this.triggerCharactersListeners = [];
 
-		this.throttledDelayer = new RunOnceScheduler(() => this.doTrigger(), ParameterHintsModel.DELAY);
-
-		this.active = false;
+		this.throttledDelayer = new RunOnceScheduler(() => this.doTrigger(), delay);
 
 		this._register(this.editor.onDidChangeConfiguration(() => this.onEditorConfigurationChange()));
 		this._register(this.editor.onDidChangeModel(e => this.onModelChanged()));
 		this._register(this.editor.onDidChangeModelLanguage(_ => this.onModelChanged()));
 		this._register(this.editor.onDidChangeCursorSelection(e => this.onCursorChange(e)));
 		this._register(this.editor.onDidChangeModelContent(e => this.onModelContentChange()));
-		this._register(SignatureHelpProviderRegistry.onDidChange(this.onModelChanged, this));
+		this._register(modes.SignatureHelpProviderRegistry.onDidChange(this.onModelChanged, this));
+		this._register(this.editor.onDidType(text => this.onDidType(text)));
 
 		this.onEditorConfigurationChange();
 		this.onModelChanged();
@@ -76,6 +81,8 @@ export class ParameterHintsModel extends Disposable {
 
 	cancel(silent: boolean = false): void {
 		this.active = false;
+		this.pending = false;
+		this.triggerContext = undefined;
 
 		this.throttledDelayer.cancel();
 
@@ -89,12 +96,13 @@ export class ParameterHintsModel extends Disposable {
 		}
 	}
 
-	trigger(delay = ParameterHintsModel.DELAY): void {
-		if (!SignatureHelpProviderRegistry.has(this.editor.getModel())) {
+	trigger(context: modes.SignatureHelpContext, delay?: number): void {
+		if (!modes.SignatureHelpProviderRegistry.has(this.editor.getModel())) {
 			return;
 		}
 
 		this.cancel(true);
+		this.triggerContext = context;
 		return this.throttledDelayer.schedule(delay);
 	}
 
@@ -103,73 +111,90 @@ export class ParameterHintsModel extends Disposable {
 			this.provideSignatureHelpRequest.cancel();
 		}
 
-		this.provideSignatureHelpRequest = provideSignatureHelp(this.editor.getModel(), this.editor.getPosition())
-			.then(null, onUnexpectedError)
-			.then(result => {
-				if (!result || !result.signatures || result.signatures.length === 0) {
-					this.cancel();
-					this._onCancel.fire(void 0);
-					return false;
-				}
+		this.pending = true;
 
-				this.active = true;
+		const triggerContext = this.triggerContext || { triggerReason: modes.SignatureHelpTriggerReason.Invoke };
+		this.triggerContext = undefined;
 
-				const event: IHintEvent = { hints: result };
-				this._onHint.fire(event);
-				return true;
-			});
+		this.provideSignatureHelpRequest = createCancelablePromise(token =>
+			provideSignatureHelp(this.editor.getModel(), this.editor.getPosition(), triggerContext, token));
+
+		this.provideSignatureHelpRequest.then(result => {
+			this.pending = false;
+
+			if (!result || !result.signatures || result.signatures.length === 0) {
+				this.cancel();
+				this._onCancel.fire(void 0);
+				return false;
+			}
+
+			this.active = true;
+			const event: IHintEvent = { hints: result };
+			this._onHint.fire(event);
+			return true;
+
+		}).catch(error => {
+			this.pending = false;
+			onUnexpectedError(error);
+		});
 	}
 
-	isTriggered(): boolean {
-		return this.active || this.throttledDelayer.isScheduled();
+	private get isTriggered(): boolean {
+		return this.active || this.pending || this.throttledDelayer.isScheduled();
 	}
 
 	private onModelChanged(): void {
 		this.cancel();
 
-		this.triggerCharactersListeners = dispose(this.triggerCharactersListeners);
+		// Update trigger characters
+		this.triggerChars = new CharacterSet();
 
 		const model = this.editor.getModel();
 		if (!model) {
 			return;
 		}
 
-		const triggerChars = new CharacterSet();
-		for (const support of SignatureHelpProviderRegistry.ordered(model)) {
+		for (const support of modes.SignatureHelpProviderRegistry.ordered(model)) {
 			if (Array.isArray(support.signatureHelpTriggerCharacters)) {
 				for (const ch of support.signatureHelpTriggerCharacters) {
-					triggerChars.add(ch.charCodeAt(0));
+					this.triggerChars.add(ch.charCodeAt(0));
 				}
 			}
 		}
+	}
 
-		this.triggerCharactersListeners.push(this.editor.onDidType((text: string) => {
-			if (!this.enabled) {
-				return;
-			}
+	private onDidType(text: string) {
+		if (!this.enabled) {
+			return;
+		}
 
-			if (triggerChars.has(text.charCodeAt(text.length - 1))) {
-				this.trigger();
-			}
-		}));
+		const lastCharIndex = text.length - 1;
+		if (this.triggerChars.has(text.charCodeAt(lastCharIndex))) {
+			this.trigger({
+				triggerReason: this.isTriggered
+					? modes.SignatureHelpTriggerReason.Retrigger
+					: modes.SignatureHelpTriggerReason.TriggerCharacter,
+				triggerCharacter: text.charAt(lastCharIndex)
+			});
+		}
 	}
 
 	private onCursorChange(e: ICursorSelectionChangedEvent): void {
 		if (e.source === 'mouse') {
 			this.cancel();
-		} else if (this.isTriggered()) {
-			this.trigger();
+		} else if (this.isTriggered) {
+			this.trigger({ triggerReason: modes.SignatureHelpTriggerReason.Retrigger });
 		}
 	}
 
 	private onModelContentChange(): void {
-		if (this.isTriggered()) {
-			this.trigger();
+		if (this.isTriggered) {
+			this.trigger({ triggerReason: modes.SignatureHelpTriggerReason.Retrigger });
 		}
 	}
 
 	private onEditorConfigurationChange(): void {
-		this.enabled = this.editor.getConfiguration().contribInfo.parameterHints;
+		this.enabled = this.editor.getConfiguration().contribInfo.parameterHints.enabled;
 
 		if (!this.enabled) {
 			this.cancel();
@@ -188,18 +213,18 @@ export class ParameterHintsWidget implements IContentWidget, IDisposable {
 
 	private static readonly ID = 'editor.widget.parameterHintsWidget';
 
-	private markdownRenderer: MarkdownRenderer;
+	private readonly markdownRenderer: MarkdownRenderer;
 	private renderDisposeables: IDisposable[];
 	private model: ParameterHintsModel;
-	private keyVisible: IContextKey<boolean>;
-	private keyMultipleSignatures: IContextKey<boolean>;
+	private readonly keyVisible: IContextKey<boolean>;
+	private readonly keyMultipleSignatures: IContextKey<boolean>;
 	private element: HTMLElement;
 	private signature: HTMLElement;
 	private docs: HTMLElement;
 	private overloads: HTMLElement;
 	private currentSignature: number;
 	private visible: boolean;
-	private hints: SignatureHelp;
+	private hints: modes.SignatureHelp;
 	private announcedLabel: string;
 	private scrollbar: DomScrollableElement;
 	private disposables: IDisposable[];
@@ -294,7 +319,7 @@ export class ParameterHintsWidget implements IContentWidget, IDisposable {
 
 		this.keyVisible.set(true);
 		this.visible = true;
-		TPromise.timeout(100).done(() => dom.addClass(this.element, 'visible'));
+		setTimeout(() => dom.addClass(this.element, 'visible'), 100);
 		this.editor.layoutContentWidget(this);
 	}
 
@@ -406,7 +431,7 @@ export class ParameterHintsWidget implements IContentWidget, IDisposable {
 		this.scrollbar.scanDomNode();
 	}
 
-	private renderParameters(parent: HTMLElement, signature: SignatureInformation, currentParameter: number): void {
+	private renderParameters(parent: HTMLElement, signature: modes.SignatureInformation, currentParameter: number): void {
 		let end = signature.label.length;
 		let idx = 0;
 		let element: HTMLSpanElement;
@@ -475,26 +500,42 @@ export class ParameterHintsWidget implements IContentWidget, IDisposable {
 
 	next(): boolean {
 		const length = this.hints.signatures.length;
+		const last = (this.currentSignature % length) === (length - 1);
+		const cycle = this.editor.getConfiguration().contribInfo.parameterHints.cycle;
 
-		if (length < 2) {
+		// If there is only one signature, or we're on last signature of list
+		if ((length < 2 || last) && !cycle) {
 			this.cancel();
 			return false;
 		}
 
-		this.currentSignature = (this.currentSignature + 1) % length;
+		if (last && cycle) {
+			this.currentSignature = 0;
+		} else {
+			this.currentSignature++;
+		}
+
 		this.render();
 		return true;
 	}
 
 	previous(): boolean {
 		const length = this.hints.signatures.length;
+		const first = this.currentSignature === 0;
+		const cycle = this.editor.getConfiguration().contribInfo.parameterHints.cycle;
 
-		if (length < 2) {
+		// If there is only one signature, or we're on first signature of list
+		if ((length < 2 || first) && !cycle) {
 			this.cancel();
 			return false;
 		}
 
-		this.currentSignature = (this.currentSignature - 1 + length) % length;
+		if (first && cycle) {
+			this.currentSignature = length - 1;
+		} else {
+			this.currentSignature--;
+		}
+
 		this.render();
 		return true;
 	}
@@ -511,8 +552,8 @@ export class ParameterHintsWidget implements IContentWidget, IDisposable {
 		return ParameterHintsWidget.ID;
 	}
 
-	trigger(): void {
-		this.model.trigger(0);
+	trigger(context: modes.SignatureHelpContext): void {
+		this.model.trigger(context, 0);
 	}
 
 	private updateMaxHeight(): void {
diff --git a/src/vs/editor/contrib/parameterHints/provideSignatureHelp.ts b/src/vs/editor/contrib/parameterHints/provideSignatureHelp.ts
index 29fe15c2ae2..c75a78f58f9 100644
--- a/src/vs/editor/contrib/parameterHints/provideSignatureHelp.ts
+++ b/src/vs/editor/contrib/parameterHints/provideSignatureHelp.ts
@@ -3,39 +3,28 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-'use strict';
-
-import { TPromise } from 'vs/base/common/winjs.base';
+import { first2 } from 'vs/base/common/async';
 import { onUnexpectedExternalError } from 'vs/base/common/errors';
-import { ITextModel } from 'vs/editor/common/model';
 import { registerDefaultLanguageCommand } from 'vs/editor/browser/editorExtensions';
-import { SignatureHelp, SignatureHelpProviderRegistry } from 'vs/editor/common/modes';
-import { asWinJsPromise, sequence } from 'vs/base/common/async';
 import { Position } from 'vs/editor/common/core/position';
+import { ITextModel } from 'vs/editor/common/model';
+import * as modes from 'vs/editor/common/modes';
 import { RawContextKey } from 'vs/platform/contextkey/common/contextkey';
+import { CancellationToken } from 'vs/base/common/cancellation';
 
 export const Context = {
 	Visible: new RawContextKey<boolean>('parameterHintsVisible', false),
 	MultipleSignatures: new RawContextKey<boolean>('parameterHintsMultipleSignatures', false),
 };
 
-export function provideSignatureHelp(model: ITextModel, position: Position): TPromise<SignatureHelp> {
+export function provideSignatureHelp(model: ITextModel, position: Position, context: modes.SignatureHelpContext, token: CancellationToken): Promise<modes.SignatureHelp> {
 
-	const supports = SignatureHelpProviderRegistry.ordered(model);
-	let result: SignatureHelp;
+	const supports = modes.SignatureHelpProviderRegistry.ordered(model);
 
-	return sequence(supports.map(support => () => {
-
-		if (result) {
-			// stop when there is a result
-			return undefined;
-		}
-
-		return asWinJsPromise(token => support.provideSignatureHelp(model, position, token)).then(thisResult => {
-			result = thisResult;
-		}, onUnexpectedExternalError);
-
-	})).then(() => result);
+	return first2(supports.map(support => () => {
+		return Promise.resolve(support.provideSignatureHelp(model, position, token, context)).catch(onUnexpectedExternalError);
+	}));
 }
 
-registerDefaultLanguageCommand('_executeSignatureHelpProvider', provideSignatureHelp);
+registerDefaultLanguageCommand('_executeSignatureHelpProvider', (model, position) =>
+	provideSignatureHelp(model, position, { triggerReason: modes.SignatureHelpTriggerReason.Invoke }, CancellationToken.None));
diff --git a/src/vs/editor/contrib/parameterHints/test/parameterHintsModel.test.ts b/src/vs/editor/contrib/parameterHints/test/parameterHintsModel.test.ts
index 566c400dad3..edd554911cf 100644
--- a/src/vs/editor/contrib/parameterHints/test/parameterHintsModel.test.ts
+++ b/src/vs/editor/contrib/parameterHints/test/parameterHintsModel.test.ts
@@ -5,60 +5,214 @@
 
 import * as assert from 'assert';
 import { CancellationToken } from 'vs/base/common/cancellation';
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
-import URI from 'vs/base/common/uri';
+import { dispose, IDisposable } from 'vs/base/common/lifecycle';
+import { URI } from 'vs/base/common/uri';
 import { Position } from 'vs/editor/common/core/position';
+import { Handler } from 'vs/editor/common/editorCommon';
 import { ITextModel } from 'vs/editor/common/model';
 import { TextModel } from 'vs/editor/common/model/textModel';
-import { SignatureHelp, SignatureHelpProvider, SignatureHelpProviderRegistry } from 'vs/editor/common/modes';
-import { TestCodeEditor, createTestCodeEditor } from 'vs/editor/test/browser/testCodeEditor';
+import * as modes from 'vs/editor/common/modes';
+import { createTestCodeEditor } from 'vs/editor/test/browser/testCodeEditor';
 import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
 import { IStorageService, NullStorageService } from 'vs/platform/storage/common/storage';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { NullTelemetryService } from 'vs/platform/telemetry/common/telemetryUtils';
 import { ParameterHintsModel } from '../parameterHintsWidget';
 
-function createMockEditor(model: TextModel): TestCodeEditor {
-	return createTestCodeEditor({
-		model: model,
-		serviceCollection: new ServiceCollection(
-			[ITelemetryService, NullTelemetryService],
-			[IStorageService, NullStorageService]
-		)
-	});
-}
+const mockFile = URI.parse('test:somefile.ttt');
+const mockFileSelector = { scheme: 'test' };
 
 
+const emptySigHelpResult = {
+	signatures: [{
+		label: 'none',
+		parameters: []
+	}],
+	activeParameter: 0,
+	activeSignature: 0
+};
 suite('ParameterHintsModel', () => {
 	let disposables: IDisposable[] = [];
 
-
 	setup(function () {
 		disposables = dispose(disposables);
 	});
 
-	test('Should cancel existing request when new request comes in', () => {
-		const textModel = TextModel.createFromString('abc def', undefined, undefined, URI.parse('test:somefile.ttt'));
+	function createMockEditor(fileContents: string) {
+		const textModel = TextModel.createFromString(fileContents, undefined, undefined, mockFile);
+		const editor = createTestCodeEditor({
+			model: textModel,
+			serviceCollection: new ServiceCollection(
+				[ITelemetryService, NullTelemetryService],
+				[IStorageService, NullStorageService]
+			)
+		});
 		disposables.push(textModel);
+		disposables.push(editor);
+		return editor;
+	}
 
-		const editor = createMockEditor(textModel);
+	test('Provider should get trigger character on type', (done) => {
+		const triggerChar = '(';
+
+		const editor = createMockEditor('');
+		disposables.push(new ParameterHintsModel(editor));
+
+		disposables.push(modes.SignatureHelpProviderRegistry.register(mockFileSelector, new class implements modes.SignatureHelpProvider {
+			signatureHelpTriggerCharacters = [triggerChar];
+
+			provideSignatureHelp(_model: ITextModel, _position: Position, _token: CancellationToken, context: modes.SignatureHelpContext): modes.SignatureHelp | Thenable<modes.SignatureHelp> {
+				assert.strictEqual(context.triggerReason, modes.SignatureHelpTriggerReason.TriggerCharacter);
+				assert.strictEqual(context.triggerCharacter, triggerChar);
+				done();
+				return undefined;
+			}
+		}));
+
+		editor.trigger('keyboard', Handler.Type, { text: triggerChar });
+	});
+
+	test('Provider should be retriggered if already active', (done) => {
+		const triggerChar = '(';
+
+		const editor = createMockEditor('');
+		disposables.push(new ParameterHintsModel(editor));
+
+		let invokeCount = 0;
+		disposables.push(modes.SignatureHelpProviderRegistry.register(mockFileSelector, new class implements modes.SignatureHelpProvider {
+			signatureHelpTriggerCharacters = [triggerChar];
+
+			provideSignatureHelp(_model: ITextModel, _position: Position, _token: CancellationToken, context: modes.SignatureHelpContext): modes.SignatureHelp | Thenable<modes.SignatureHelp> {
+				++invokeCount;
+				if (invokeCount === 1) {
+					assert.strictEqual(context.triggerReason, modes.SignatureHelpTriggerReason.TriggerCharacter);
+					assert.strictEqual(context.triggerCharacter, triggerChar);
+					// Retrigger
+					editor.trigger('keyboard', Handler.Type, { text: triggerChar });
+				} else {
+					assert.strictEqual(invokeCount, 2);
+					assert.strictEqual(context.triggerReason, modes.SignatureHelpTriggerReason.Retrigger);
+					assert.strictEqual(context.triggerCharacter, triggerChar);
+					done();
+				}
+				return emptySigHelpResult;
+			}
+		}));
+
+		editor.trigger('keyboard', Handler.Type, { text: triggerChar });
+	});
+
+	test('Provider should not be retriggered if previous help is canceled first', (done) => {
+		const triggerChar = '(';
+
+		const editor = createMockEditor('');
+		const hintModel = new ParameterHintsModel(editor);
+		disposables.push(hintModel);
+
+		let invokeCount = 0;
+		disposables.push(modes.SignatureHelpProviderRegistry.register(mockFileSelector, new class implements modes.SignatureHelpProvider {
+			signatureHelpTriggerCharacters = [triggerChar];
+
+			provideSignatureHelp(_model: ITextModel, _position: Position, _token: CancellationToken, context: modes.SignatureHelpContext): modes.SignatureHelp | Thenable<modes.SignatureHelp> {
+				++invokeCount;
+				if (invokeCount === 1) {
+					assert.strictEqual(context.triggerReason, modes.SignatureHelpTriggerReason.TriggerCharacter);
+					assert.strictEqual(context.triggerCharacter, triggerChar);
+
+					// Cancel and retrigger
+					hintModel.cancel();
+					editor.trigger('keyboard', Handler.Type, { text: triggerChar });
+				} else {
+					assert.strictEqual(invokeCount, 2);
+					assert.strictEqual(context.triggerReason, modes.SignatureHelpTriggerReason.TriggerCharacter);
+					assert.strictEqual(context.triggerCharacter, triggerChar);
+					done();
+				}
+				return emptySigHelpResult;
+			}
+		}));
+
+		editor.trigger('keyboard', Handler.Type, { text: triggerChar });
+	});
+
+	test('Provider should get last trigger character when triggered multiple times and only be invoked once', (done) => {
+		const editor = createMockEditor('');
+		disposables.push(new ParameterHintsModel(editor, 5));
+
+		let invokeCount = 0;
+		disposables.push(modes.SignatureHelpProviderRegistry.register(mockFileSelector, new class implements modes.SignatureHelpProvider {
+			signatureHelpTriggerCharacters = ['a', 'b', 'c'];
+
+			provideSignatureHelp(_model: ITextModel, _position: Position, _token: CancellationToken, context: modes.SignatureHelpContext): modes.SignatureHelp | Thenable<modes.SignatureHelp> {
+				++invokeCount;
+				assert.strictEqual(context.triggerReason, modes.SignatureHelpTriggerReason.Retrigger);
+				assert.strictEqual(context.triggerCharacter, 'c');
+
+				// Give some time to allow for later triggers
+				setTimeout(() => {
+					assert.strictEqual(invokeCount, 1);
+
+					done();
+				}, 50);
+				return undefined;
+			}
+		}));
+
+		editor.trigger('keyboard', Handler.Type, { text: 'a' });
+		editor.trigger('keyboard', Handler.Type, { text: 'b' });
+		editor.trigger('keyboard', Handler.Type, { text: 'c' });
+	});
+
+	test('Provider should be retriggered if already active', (done) => {
+		const editor = createMockEditor('');
+		disposables.push(new ParameterHintsModel(editor, 5));
+
+		let invokeCount = 0;
+		disposables.push(modes.SignatureHelpProviderRegistry.register(mockFileSelector, new class implements modes.SignatureHelpProvider {
+			signatureHelpTriggerCharacters = ['a', 'b'];
+
+			provideSignatureHelp(_model: ITextModel, _position: Position, _token: CancellationToken, context: modes.SignatureHelpContext): modes.SignatureHelp | Thenable<modes.SignatureHelp> {
+				++invokeCount;
+				if (invokeCount === 1) {
+					assert.strictEqual(context.triggerReason, modes.SignatureHelpTriggerReason.TriggerCharacter);
+					assert.strictEqual(context.triggerCharacter, 'a');
+
+					// retrigger after delay for widget to show up
+					setTimeout(() => editor.trigger('keyboard', Handler.Type, { text: 'b' }), 50);
+				} else if (invokeCount === 2) {
+					assert.strictEqual(context.triggerReason, modes.SignatureHelpTriggerReason.Retrigger);
+					assert.strictEqual(context.triggerCharacter, 'b');
+					done();
+				} else {
+					assert.fail('Unexpected invoke');
+				}
+
+				return emptySigHelpResult;
+			}
+		}));
+
+		editor.trigger('keyboard', Handler.Type, { text: 'a' });
+	});
+
+	test('Should cancel existing request when new request comes in', () => {
+		const editor = createMockEditor('abc def');
 		const hintsModel = new ParameterHintsModel(editor);
 
 		let didRequestCancellationOf = -1;
 		let invokeCount = 0;
-		const longRunningProvider = new class implements SignatureHelpProvider {
-			signatureHelpTriggerCharacters: string[] = [];
+		const longRunningProvider = new class implements modes.SignatureHelpProvider {
+			signatureHelpTriggerCharacters = [];
 
-			provideSignatureHelp(model: ITextModel, position: Position, token: CancellationToken): SignatureHelp | Thenable<SignatureHelp> {
+			provideSignatureHelp(_model: ITextModel, _position: Position, token: CancellationToken): modes.SignatureHelp | Thenable<modes.SignatureHelp> {
 				const count = invokeCount++;
 				token.onCancellationRequested(() => { didRequestCancellationOf = count; });
 
 				// retrigger on first request
 				if (count === 0) {
-					hintsModel.trigger(0);
+					hintsModel.trigger({ triggerReason: modes.SignatureHelpTriggerReason.Invoke }, 0);
 				}
 
-				return new Promise<SignatureHelp>(resolve => {
+				return new Promise<modes.SignatureHelp>(resolve => {
 					setTimeout(() => {
 						resolve({
 							signatures: [{
@@ -73,9 +227,9 @@ suite('ParameterHintsModel', () => {
 			}
 		};
 
-		disposables.push(SignatureHelpProviderRegistry.register({ scheme: 'test' }, longRunningProvider));
+		disposables.push(modes.SignatureHelpProviderRegistry.register(mockFileSelector, longRunningProvider));
 
-		hintsModel.trigger(0);
+		hintsModel.trigger({ triggerReason: modes.SignatureHelpTriggerReason.Invoke }, 0);
 		assert.strictEqual(-1, didRequestCancellationOf);
 
 		return new Promise((resolve, reject) =>
diff --git a/src/vs/editor/contrib/quickOpen/quickOpen.ts b/src/vs/editor/contrib/quickOpen/quickOpen.ts
index 05c2680d57c..0f863de7d88 100644
--- a/src/vs/editor/contrib/quickOpen/quickOpen.ts
+++ b/src/vs/editor/contrib/quickOpen/quickOpen.ts
@@ -6,22 +6,21 @@
 'use strict';
 
 import { illegalArgument, onUnexpectedExternalError } from 'vs/base/common/errors';
-import URI from 'vs/base/common/uri';
-import { TPromise } from 'vs/base/common/winjs.base';
+import { URI } from 'vs/base/common/uri';
 import { Range } from 'vs/editor/common/core/range';
 import { ITextModel } from 'vs/editor/common/model';
 import { registerLanguageCommand } from 'vs/editor/browser/editorExtensions';
-import { SymbolInformation, DocumentSymbolProviderRegistry, IOutline } from 'vs/editor/common/modes';
+import { DocumentSymbol, DocumentSymbolProviderRegistry } from 'vs/editor/common/modes';
 import { IModelService } from 'vs/editor/common/services/modelService';
-import { asWinJsPromise } from 'vs/base/common/async';
+import { CancellationToken } from 'vs/base/common/cancellation';
 
-export function getDocumentSymbols(model: ITextModel): TPromise<IOutline> {
+export function getDocumentSymbols(model: ITextModel, flat: boolean, token: CancellationToken): Thenable<DocumentSymbol[]> {
 
-	let roots: SymbolInformation[] = [];
+	let roots: DocumentSymbol[] = [];
 
 	let promises = DocumentSymbolProviderRegistry.all(model).map(support => {
 
-		return asWinJsPromise(token => support.provideDocumentSymbols(model, token)).then(result => {
+		return Promise.resolve(support.provideDocumentSymbols(model, token)).then(result => {
 			if (Array.isArray(result)) {
 				roots.push(...result);
 			}
@@ -30,30 +29,34 @@ export function getDocumentSymbols(model: ITextModel): TPromise<IOutline> {
 		});
 	});
 
-	return TPromise.join(promises).then(() => {
-		let flatEntries: SymbolInformation[] = [];
-		flatten(flatEntries, roots, '');
+	return Promise.all(promises).then(() => {
+		let flatEntries: DocumentSymbol[] = [];
+		if (token.isCancellationRequested) {
+			return flatEntries;
+		}
+		if (flat) {
+			flatten(flatEntries, roots, '');
+		} else {
+			flatEntries = roots;
+		}
 		flatEntries.sort(compareEntriesUsingStart);
-
-		return {
-			entries: flatEntries,
-		};
+		return flatEntries;
 	});
 }
 
-function compareEntriesUsingStart(a: SymbolInformation, b: SymbolInformation): number {
-	return Range.compareRangesUsingStarts(a.location.range, b.location.range);
+function compareEntriesUsingStart(a: DocumentSymbol, b: DocumentSymbol): number {
+	return Range.compareRangesUsingStarts(a.range, b.range);
 }
 
-function flatten(bucket: SymbolInformation[], entries: SymbolInformation[], overrideContainerLabel: string): void {
+function flatten(bucket: DocumentSymbol[], entries: DocumentSymbol[], overrideContainerLabel: string): void {
 	for (let entry of entries) {
 		bucket.push({
 			kind: entry.kind,
 			name: entry.name,
 			detail: entry.detail,
 			containerName: entry.containerName || overrideContainerLabel,
-			location: entry.location,
-			definingRange: entry.definingRange,
+			range: entry.range,
+			selectionRange: entry.selectionRange,
 			children: undefined, // we flatten it...
 		});
 		if (entry.children) {
@@ -72,5 +75,5 @@ registerLanguageCommand('_executeDocumentSymbolProvider', function (accessor, ar
 	if (!model) {
 		throw illegalArgument('resource');
 	}
-	return getDocumentSymbols(model);
+	return getDocumentSymbols(model, false, CancellationToken.None);
 });
diff --git a/src/vs/editor/contrib/referenceSearch/peekViewWidget.ts b/src/vs/editor/contrib/referenceSearch/peekViewWidget.ts
index 90e61d8c44c..12d77231487 100644
--- a/src/vs/editor/contrib/referenceSearch/peekViewWidget.ts
+++ b/src/vs/editor/contrib/referenceSearch/peekViewWidget.ts
@@ -5,22 +5,22 @@
 
 'use strict';
 
-import 'vs/css!./media/peekViewWidget';
-import * as nls from 'vs/nls';
-import { Action } from 'vs/base/common/actions';
-import * as strings from 'vs/base/common/strings';
-import * as objects from 'vs/base/common/objects';
-import { $ } from 'vs/base/browser/builder';
-import { Event, Emitter } from 'vs/base/common/event';
 import * as dom from 'vs/base/browser/dom';
+import { IMouseEvent } from 'vs/base/browser/mouseEvent';
 import { ActionBar, IActionBarOptions } from 'vs/base/browser/ui/actionbar/actionbar';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { IOptions, ZoneWidget, IStyles } from 'vs/editor/contrib/zoneWidget/zoneWidget';
-import { EmbeddedCodeEditorWidget } from 'vs/editor/browser/widget/embeddedCodeEditorWidget';
-import { ContextKeyExpr, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
+import { Action } from 'vs/base/common/actions';
 import { Color } from 'vs/base/common/color';
+import { Emitter, Event } from 'vs/base/common/event';
+import * as objects from 'vs/base/common/objects';
+import * as strings from 'vs/base/common/strings';
+import 'vs/css!./media/peekViewWidget';
+import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
+import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
+import { EmbeddedCodeEditorWidget } from 'vs/editor/browser/widget/embeddedCodeEditorWidget';
+import { IOptions, IStyles, ZoneWidget } from 'vs/editor/contrib/zoneWidget/zoneWidget';
+import * as nls from 'vs/nls';
+import { ContextKeyExpr, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
+import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
 
 export namespace PeekContext {
 	export const inPeekEditor = new RawContextKey<boolean>('inReferenceSearchEditor', true);
@@ -111,8 +111,8 @@ export abstract class PeekViewWidget extends ZoneWidget {
 	protected _fillContainer(container: HTMLElement): void {
 		this.setCssClass('peekview-widget');
 
-		this._headElement = <HTMLDivElement>$('.head').getHTMLElement();
-		this._bodyElement = <HTMLDivElement>$('.body').getHTMLElement();
+		this._headElement = dom.$('.head');
+		this._bodyElement = dom.$('.body');
 
 		this._fillHead(this._headElement);
 		this._fillBody(this._bodyElement);
@@ -122,18 +122,20 @@ export abstract class PeekViewWidget extends ZoneWidget {
 	}
 
 	protected _fillHead(container: HTMLElement): void {
-		const titleElement = $('.peekview-title').
-			on(dom.EventType.CLICK, e => this._onTitleClick(<MouseEvent>e)).
-			appendTo(this._headElement).
-			getHTMLElement();
+		const titleElement = dom.$('.peekview-title');
+		dom.append(this._headElement, titleElement);
+		dom.addStandardDisposableListener(titleElement, 'click', event => this._onTitleClick(event));
 
-		this._primaryHeading = $('span.filename').appendTo(titleElement).getHTMLElement();
-		this._secondaryHeading = $('span.dirname').appendTo(titleElement).getHTMLElement();
-		this._metaHeading = $('span.meta').appendTo(titleElement).getHTMLElement();
+		this._primaryHeading = dom.$('span.filename');
+		this._secondaryHeading = dom.$('span.dirname');
+		this._metaHeading = dom.$('span.meta');
+		dom.append(titleElement, this._primaryHeading, this._secondaryHeading, this._metaHeading);
+
+		const actionsContainer = dom.$('.peekview-actions');
+		dom.append(this._headElement, actionsContainer);
 
-		const actionsContainer = $('.peekview-actions').appendTo(this._headElement);
 		const actionBarOptions = this._getActionBarOptions();
-		this._actionbarWidget = new ActionBar(actionsContainer.getHTMLElement(), actionBarOptions);
+		this._actionbarWidget = new ActionBar(actionsContainer, actionBarOptions);
 		this._disposables.push(this._actionbarWidget);
 
 		this._actionbarWidget.push(new Action('peekview.close', nls.localize('label.close', "Close"), 'close-peekview-action', true, () => {
@@ -146,15 +148,15 @@ export abstract class PeekViewWidget extends ZoneWidget {
 		return {};
 	}
 
-	protected _onTitleClick(event: MouseEvent): void {
+	protected _onTitleClick(event: IMouseEvent): void {
 		// implement me
 	}
 
 	public setTitle(primaryHeading: string, secondaryHeading?: string): void {
-		$(this._primaryHeading).safeInnerHtml(primaryHeading);
+		this._primaryHeading.innerHTML = strings.escape(primaryHeading);
 		this._primaryHeading.setAttribute('aria-label', primaryHeading);
 		if (secondaryHeading) {
-			$(this._secondaryHeading).safeInnerHtml(secondaryHeading);
+			this._secondaryHeading.innerHTML = strings.escape(secondaryHeading);
 		} else {
 			dom.clearNode(this._secondaryHeading);
 		}
@@ -162,7 +164,7 @@ export abstract class PeekViewWidget extends ZoneWidget {
 
 	public setMetaTitle(value: string): void {
 		if (value) {
-			$(this._metaHeading).safeInnerHtml(value);
+			this._metaHeading.innerHTML = strings.escape(value);
 		} else {
 			dom.clearNode(this._metaHeading);
 		}
diff --git a/src/vs/editor/contrib/referenceSearch/referenceSearch.ts b/src/vs/editor/contrib/referenceSearch/referenceSearch.ts
index 47d501ae9ef..4afa93c925d 100644
--- a/src/vs/editor/contrib/referenceSearch/referenceSearch.ts
+++ b/src/vs/editor/contrib/referenceSearch/referenceSearch.ts
@@ -8,22 +8,27 @@ import * as nls from 'vs/nls';
 import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { IContextKeyService, ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { Position } from 'vs/editor/common/core/position';
+import { KeybindingsRegistry, KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
+import { Position, IPosition } from 'vs/editor/common/core/position';
 import * as editorCommon from 'vs/editor/common/editorCommon';
 import { registerEditorAction, ServicesAccessor, EditorAction, registerEditorContribution, registerDefaultLanguageCommand } from 'vs/editor/browser/editorExtensions';
 import { Location, ReferenceProviderRegistry } from 'vs/editor/common/modes';
+import { Range } from 'vs/editor/common/core/range';
 import { PeekContext, getOuterEditor } from './peekViewWidget';
 import { ReferencesController, RequestOptions, ctxReferenceSearchVisible } from './referencesController';
 import { ReferencesModel, OneReference } from './referencesModel';
-import { asWinJsPromise } from 'vs/base/common/async';
+import { createCancelablePromise } from 'vs/base/common/async';
 import { onUnexpectedExternalError } from 'vs/base/common/errors';
 import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
 import { EmbeddedCodeEditorWidget } from 'vs/editor/browser/widget/embeddedCodeEditorWidget';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
+import { ICodeEditor, isCodeEditor } from 'vs/editor/browser/editorBrowser';
 import { ITextModel } from 'vs/editor/common/model';
 import { IListService } from 'vs/platform/list/browser/listService';
 import { ctxReferenceWidgetSearchTreeFocused } from 'vs/editor/contrib/referenceSearch/referencesWidget';
+import { CommandsRegistry, ICommandHandler } from 'vs/platform/commands/common/commands';
+import { URI } from 'vs/base/common/uri';
+import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
+import { CancellationToken } from 'vs/base/common/cancellation';
 
 export const defaultReferenceSearchOptions: RequestOptions = {
 	getMetaTitle(model) {
@@ -65,7 +70,8 @@ export class ReferenceAction extends EditorAction {
 				EditorContextKeys.isInEmbeddedEditor.toNegated()),
 			kbOpts: {
 				kbExpr: EditorContextKeys.editorTextFocus,
-				primary: KeyMod.Shift | KeyCode.F12
+				primary: KeyMod.Shift | KeyCode.F12,
+				weight: KeybindingWeight.EditorContrib
 			},
 			menuOpts: {
 				group: 'navigation',
@@ -81,7 +87,7 @@ export class ReferenceAction extends EditorAction {
 		}
 		let range = editor.getSelection();
 		let model = editor.getModel();
-		let references = provideReferences(model, range.getStartPosition()).then(references => new ReferencesModel(references));
+		let references = createCancelablePromise(token => provideReferences(model, range.getStartPosition(), token).then(references => new ReferencesModel(references)));
 		controller.toggleWidget(range, references, defaultReferenceSearchOptions);
 	}
 }
@@ -90,6 +96,78 @@ registerEditorContribution(ReferenceController);
 
 registerEditorAction(ReferenceAction);
 
+let findReferencesCommand: ICommandHandler = (accessor: ServicesAccessor, resource: URI, position: IPosition) => {
+	if (!(resource instanceof URI)) {
+		throw new Error('illegal argument, uri');
+	}
+	if (!position) {
+		throw new Error('illegal argument, position');
+	}
+
+	const codeEditorService = accessor.get(ICodeEditorService);
+	return codeEditorService.openCodeEditor({ resource }, codeEditorService.getFocusedCodeEditor()).then(control => {
+		if (!isCodeEditor(control)) {
+			return undefined;
+		}
+
+		let controller = ReferencesController.get(control);
+		if (!controller) {
+			return undefined;
+		}
+
+		let references = createCancelablePromise(token => provideReferences(control.getModel(), Position.lift(position), token).then(references => new ReferencesModel(references)));
+		let range = new Range(position.lineNumber, position.column, position.lineNumber, position.column);
+		return TPromise.as(controller.toggleWidget(range, references, defaultReferenceSearchOptions));
+	});
+};
+
+let showReferencesCommand: ICommandHandler = (accessor: ServicesAccessor, resource: URI, position: IPosition, references: Location[]) => {
+	if (!(resource instanceof URI)) {
+		throw new Error('illegal argument, uri expected');
+	}
+
+	if (!references) {
+		throw new Error('missing references');
+	}
+
+	const codeEditorService = accessor.get(ICodeEditorService);
+	return codeEditorService.openCodeEditor({ resource }, codeEditorService.getFocusedCodeEditor()).then(control => {
+		if (!isCodeEditor(control)) {
+			return undefined;
+		}
+
+		let controller = ReferencesController.get(control);
+		if (!controller) {
+			return undefined;
+		}
+
+		return TPromise.as(controller.toggleWidget(
+			new Range(position.lineNumber, position.column, position.lineNumber, position.column),
+			createCancelablePromise(_ => Promise.resolve(new ReferencesModel(references))),
+			defaultReferenceSearchOptions)).then(() => true);
+	});
+};
+
+// register commands
+
+CommandsRegistry.registerCommand({
+	id: 'editor.action.findReferences',
+	handler: findReferencesCommand
+});
+
+CommandsRegistry.registerCommand({
+	id: 'editor.action.showReferences',
+	handler: showReferencesCommand,
+	description: {
+		description: 'Show references at a position in a file',
+		args: [
+			{ name: 'uri', description: 'The text document in which to show references', constraint: URI },
+			{ name: 'position', description: 'The position at which to show', constraint: Position.isIPosition },
+			{ name: 'locations', description: 'An array of locations.', constraint: Array },
+		]
+	}
+});
+
 function closeActiveReferenceSearch(accessor: ServicesAccessor, args: any) {
 	withController(accessor, controller => controller.closeWidget());
 }
@@ -119,7 +197,7 @@ function withController(accessor: ServicesAccessor, fn: (controller: ReferencesC
 
 KeybindingsRegistry.registerCommandAndKeybindingRule({
 	id: 'goToNextReference',
-	weight: KeybindingsRegistry.WEIGHT.workbenchContrib(50),
+	weight: KeybindingWeight.WorkbenchContrib + 50,
 	primary: KeyCode.F4,
 	when: ctxReferenceSearchVisible,
 	handler(accessor) {
@@ -131,7 +209,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 
 KeybindingsRegistry.registerCommandAndKeybindingRule({
 	id: 'goToNextReferenceFromEmbeddedEditor',
-	weight: KeybindingsRegistry.WEIGHT.editorContrib(50),
+	weight: KeybindingWeight.EditorContrib + 50,
 	primary: KeyCode.F4,
 	when: PeekContext.inPeekEditor,
 	handler(accessor) {
@@ -143,7 +221,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 
 KeybindingsRegistry.registerCommandAndKeybindingRule({
 	id: 'goToPreviousReference',
-	weight: KeybindingsRegistry.WEIGHT.workbenchContrib(50),
+	weight: KeybindingWeight.WorkbenchContrib + 50,
 	primary: KeyMod.Shift | KeyCode.F4,
 	when: ctxReferenceSearchVisible,
 	handler(accessor) {
@@ -155,7 +233,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 
 KeybindingsRegistry.registerCommandAndKeybindingRule({
 	id: 'goToPreviousReferenceFromEmbeddedEditor',
-	weight: KeybindingsRegistry.WEIGHT.editorContrib(50),
+	weight: KeybindingWeight.EditorContrib + 50,
 	primary: KeyMod.Shift | KeyCode.F4,
 	when: PeekContext.inPeekEditor,
 	handler(accessor) {
@@ -167,7 +245,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 
 KeybindingsRegistry.registerCommandAndKeybindingRule({
 	id: 'closeReferenceSearch',
-	weight: KeybindingsRegistry.WEIGHT.workbenchContrib(50),
+	weight: KeybindingWeight.WorkbenchContrib + 50,
 	primary: KeyCode.Escape,
 	secondary: [KeyMod.Shift | KeyCode.Escape],
 	when: ContextKeyExpr.and(ctxReferenceSearchVisible, ContextKeyExpr.not('config.editor.stablePeek')),
@@ -176,7 +254,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 
 KeybindingsRegistry.registerCommandAndKeybindingRule({
 	id: 'closeReferenceSearchEditor',
-	weight: KeybindingsRegistry.WEIGHT.editorContrib(-101),
+	weight: KeybindingWeight.EditorContrib - 101,
 	primary: KeyCode.Escape,
 	secondary: [KeyMod.Shift | KeyCode.Escape],
 	when: ContextKeyExpr.and(PeekContext.inPeekEditor, ContextKeyExpr.not('config.editor.stablePeek')),
@@ -185,7 +263,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 
 KeybindingsRegistry.registerCommandAndKeybindingRule({
 	id: 'openReferenceToSide',
-	weight: KeybindingsRegistry.WEIGHT.editorContrib(),
+	weight: KeybindingWeight.EditorContrib,
 	primary: KeyMod.CtrlCmd | KeyCode.Enter,
 	mac: {
 		primary: KeyMod.WinCtrl | KeyCode.Enter
@@ -194,13 +272,11 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 	handler: openReferenceToSide
 });
 
-export function provideReferences(model: ITextModel, position: Position): TPromise<Location[]> {
+export function provideReferences(model: ITextModel, position: Position, token: CancellationToken): Promise<Location[]> {
 
 	// collect references from all providers
 	const promises = ReferenceProviderRegistry.ordered(model).map(provider => {
-		return asWinJsPromise((token) => {
-			return provider.provideReferences(model, position, { includeDeclaration: true }, token);
-		}).then(result => {
+		return Promise.resolve(provider.provideReferences(model, position, { includeDeclaration: true }, token)).then(result => {
 			if (Array.isArray(result)) {
 				return <Location[]>result;
 			}
@@ -210,7 +286,7 @@ export function provideReferences(model: ITextModel, position: Position): TPromi
 		});
 	});
 
-	return TPromise.join(promises).then(references => {
+	return Promise.all(promises).then(references => {
 		let result: Location[] = [];
 		for (let ref of references) {
 			if (ref) {
@@ -221,4 +297,4 @@ export function provideReferences(model: ITextModel, position: Position): TPromi
 	});
 }
 
-registerDefaultLanguageCommand('_executeReferenceProvider', provideReferences);
+registerDefaultLanguageCommand('_executeReferenceProvider', (model, position) => provideReferences(model, position, CancellationToken.None));
diff --git a/src/vs/editor/contrib/referenceSearch/referencesController.ts b/src/vs/editor/contrib/referenceSearch/referencesController.ts
index 4f0182c8d6c..32b8746b768 100644
--- a/src/vs/editor/contrib/referenceSearch/referencesController.ts
+++ b/src/vs/editor/contrib/referenceSearch/referencesController.ts
@@ -9,22 +9,19 @@ import { onUnexpectedError } from 'vs/base/common/errors';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { IInstantiationService, optional } from 'vs/platform/instantiation/common/instantiation';
+import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IContextKey, IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
 import { IStorageService } from 'vs/platform/storage/common/storage';
 import * as editorCommon from 'vs/editor/common/editorCommon';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
 import { ReferencesModel } from './referencesModel';
 import { ReferenceWidget, LayoutData } from './referencesWidget';
 import { Range } from 'vs/editor/common/core/range';
-import { ITextModelService } from 'vs/editor/common/services/resolverService';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { Position } from 'vs/editor/common/core/position';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { Location } from 'vs/editor/common/modes';
 import { INotificationService } from 'vs/platform/notification/common/notification';
+import { CancelablePromise } from 'vs/base/common/async';
 
 export const ctxReferenceSearchVisible = new RawContextKey<boolean>('referenceSearchVisible', false);
 
@@ -55,14 +52,10 @@ export abstract class ReferencesController implements editorCommon.IEditorContri
 		editor: ICodeEditor,
 		@IContextKeyService contextKeyService: IContextKeyService,
 		@ICodeEditorService private readonly _editorService: ICodeEditorService,
-		@ITextModelService private readonly _textModelResolverService: ITextModelService,
 		@INotificationService private readonly _notificationService: INotificationService,
 		@IInstantiationService private readonly _instantiationService: IInstantiationService,
-		@IWorkspaceContextService private readonly _contextService: IWorkspaceContextService,
 		@IStorageService private readonly _storageService: IStorageService,
-		@IThemeService private readonly _themeService: IThemeService,
 		@IConfigurationService private readonly _configurationService: IConfigurationService,
-		@optional(IEnvironmentService) private _environmentService: IEnvironmentService
 	) {
 		this._editor = editor;
 		this._referenceSearchVisible = ctxReferenceSearchVisible.bindTo(contextKeyService);
@@ -73,14 +66,16 @@ export abstract class ReferencesController implements editorCommon.IEditorContri
 	}
 
 	public dispose(): void {
-		if (this._widget) {
-			this._widget.dispose();
-			this._widget = null;
-		}
+		this._referenceSearchVisible.reset();
+		dispose(this._disposables);
+		dispose(this._widget);
+		dispose(this._model);
+		this._widget = null;
+		this._model = null;
 		this._editor = null;
 	}
 
-	public toggleWidget(range: Range, modelPromise: TPromise<ReferencesModel>, options: RequestOptions): void {
+	public toggleWidget(range: Range, modelPromise: CancelablePromise<ReferencesModel>, options: RequestOptions): void {
 
 		// close current widget and return early is position didn't change
 		let widgetPosition: Position;
@@ -103,7 +98,7 @@ export abstract class ReferencesController implements editorCommon.IEditorContri
 		}));
 		const storageKey = 'peekViewLayout';
 		const data = <LayoutData>JSON.parse(this._storageService.get(storageKey, undefined, '{}'));
-		this._widget = new ReferenceWidget(this._editor, this._defaultTreeKeyboardSupport, data, this._textModelResolverService, this._contextService, this._themeService, this._instantiationService, this._environmentService);
+		this._widget = this._instantiationService.createInstance(ReferenceWidget, this._editor, this._defaultTreeKeyboardSupport, data);
 		this._widget.setTitle(nls.localize('labelLoading', "Loading..."));
 		this._widget.show(range);
 		this._disposables.push(this._widget.onDidClose(() => {
@@ -189,16 +184,12 @@ export abstract class ReferencesController implements editorCommon.IEditorContri
 	}
 
 	public closeWidget(): void {
-		if (this._widget) {
-			this._widget.dispose();
-			this._widget = null;
-		}
+		dispose(this._widget);
+		this._widget = null;
 		this._referenceSearchVisible.reset();
 		this._disposables = dispose(this._disposables);
-		if (this._model) {
-			this._model.dispose();
-			this._model = null;
-		}
+		dispose(this._model);
+		this._model = null;
 		this._editor.focus();
 		this._requestIdPool += 1; // Cancel pending requests
 	}
diff --git a/src/vs/editor/contrib/referenceSearch/referencesModel.ts b/src/vs/editor/contrib/referenceSearch/referencesModel.ts
index 81865714ad8..5f529ae0017 100644
--- a/src/vs/editor/contrib/referenceSearch/referencesModel.ts
+++ b/src/vs/editor/contrib/referenceSearch/referencesModel.ts
@@ -6,10 +6,10 @@
 
 import { localize } from 'vs/nls';
 import { Event, Emitter } from 'vs/base/common/event';
-import { basename, dirname } from 'vs/base/common/paths';
+import { basename } from 'vs/base/common/paths';
 import { IDisposable, dispose, IReference } from 'vs/base/common/lifecycle';
 import * as strings from 'vs/base/common/strings';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { defaultGenerator } from 'vs/base/common/idGenerator';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { Range, IRange } from 'vs/editor/common/core/range';
@@ -18,52 +18,32 @@ import { ITextModelService, ITextEditorModel } from 'vs/editor/common/services/r
 import { Position } from 'vs/editor/common/core/position';
 
 export class OneReference {
-	private _id: string;
-	private _onRefChanged = new Emitter<this>();
+	readonly id: string;
 
+	private readonly _onRefChanged = new Emitter<this>();
 	readonly onRefChanged: Event<this> = this._onRefChanged.event;
 
 	constructor(
-		private _parent: FileReferences,
+		readonly parent: FileReferences,
 		private _range: IRange
 	) {
-		this._id = defaultGenerator.nextId();
+		this.id = defaultGenerator.nextId();
 	}
 
-	public get id(): string {
-		return this._id;
+	get uri(): URI {
+		return this.parent.uri;
 	}
 
-	public get model(): FileReferences {
-		return this._parent;
-	}
-
-	public get parent(): FileReferences {
-		return this._parent;
-	}
-
-	public get uri(): URI {
-		return this._parent.uri;
-	}
-
-	public get name(): string {
-		return this._parent.name;
-	}
-
-	public get directory(): string {
-		return this._parent.directory;
-	}
-
-	public get range(): IRange {
+	get range(): IRange {
 		return this._range;
 	}
 
-	public set range(value: IRange) {
+	set range(value: IRange) {
 		this._range = value;
 		this._onRefChanged.fire(this);
 	}
 
-	public getAriaMessage(): string {
+	getAriaMessage(): string {
 		return localize(
 			'aria.oneReference', "symbol in {0} on line {1} at column {2}",
 			basename(this.uri.fsPath), this.range.startLineNumber, this.range.startColumn
@@ -73,14 +53,17 @@ export class OneReference {
 
 export class FilePreview implements IDisposable {
 
-	constructor(private _modelReference: IReference<ITextEditorModel>) {
-
+	constructor(
+		private readonly _modelReference: IReference<ITextEditorModel>
+	) {
 	}
 
-	private get _model() { return this._modelReference.object.textEditorModel; }
+	dispose(): void {
+		dispose(this._modelReference);
+	}
 
-	public preview(range: IRange, n: number = 8): { before: string; inside: string; after: string } {
-		const model = this._model;
+	preview(range: IRange, n: number = 8): { before: string; inside: string; after: string } {
+		const model = this._modelReference.object.textEditorModel;
 
 		if (!model) {
 			return undefined;
@@ -99,13 +82,6 @@ export class FilePreview implements IDisposable {
 
 		return ret;
 	}
-
-	dispose(): void {
-		if (this._modelReference) {
-			this._modelReference.dispose();
-			this._modelReference = null;
-		}
-	}
 }
 
 export class FileReferences implements IDisposable {
@@ -115,39 +91,31 @@ export class FileReferences implements IDisposable {
 	private _resolved: boolean;
 	private _loadFailure: any;
 
-	constructor(private _parent: ReferencesModel, private _uri: URI) {
+	constructor(private readonly _parent: ReferencesModel, private _uri: URI) {
 		this._children = [];
 	}
 
-	public get id(): string {
+	get id(): string {
 		return this._uri.toString();
 	}
 
-	public get parent(): ReferencesModel {
+	get parent(): ReferencesModel {
 		return this._parent;
 	}
 
-	public get children(): OneReference[] {
+	get children(): OneReference[] {
 		return this._children;
 	}
 
-	public get uri(): URI {
+	get uri(): URI {
 		return this._uri;
 	}
 
-	public get name(): string {
-		return basename(this.uri.fsPath);
-	}
-
-	public get directory(): string {
-		return dirname(this.uri.fsPath);
-	}
-
-	public get preview(): FilePreview {
+	get preview(): FilePreview {
 		return this._preview;
 	}
 
-	public get failure(): any {
+	get failure(): any {
 		return this._loadFailure;
 	}
 
@@ -160,7 +128,7 @@ export class FileReferences implements IDisposable {
 		}
 	}
 
-	public resolve(textModelResolverService: ITextModelService): TPromise<FileReferences> {
+	resolve(textModelResolverService: ITextModelService): TPromise<FileReferences> {
 
 		if (this._resolved) {
 			return TPromise.as(this);
@@ -198,11 +166,11 @@ export class FileReferences implements IDisposable {
 export class ReferencesModel implements IDisposable {
 
 	private readonly _disposables: IDisposable[];
-	private _groups: FileReferences[] = [];
-	private _references: OneReference[] = [];
-	private _onDidChangeReferenceRange = new Emitter<OneReference>();
+	readonly groups: FileReferences[] = [];
+	readonly references: OneReference[] = [];
 
-	onDidChangeReferenceRange: Event<OneReference> = this._onDidChangeReferenceRange.event;
+	readonly _onDidChangeReferenceRange = new Emitter<OneReference>();
+	readonly onDidChangeReferenceRange: Event<OneReference> = this._onDidChangeReferenceRange.event;
 
 	constructor(references: Location[]) {
 		this._disposables = [];
@@ -223,22 +191,14 @@ export class ReferencesModel implements IDisposable {
 
 				let oneRef = new OneReference(current, ref.range);
 				this._disposables.push(oneRef.onRefChanged((e) => this._onDidChangeReferenceRange.fire(e)));
-				this._references.push(oneRef);
+				this.references.push(oneRef);
 				current.children.push(oneRef);
 			}
 		}
 	}
 
-	public get empty(): boolean {
-		return this._groups.length === 0;
-	}
-
-	public get references(): OneReference[] {
-		return this._references;
-	}
-
-	public get groups(): FileReferences[] {
-		return this._groups;
+	get empty(): boolean {
+		return this.groups.length === 0;
 	}
 
 	getAriaMessage(): string {
@@ -253,7 +213,7 @@ export class ReferencesModel implements IDisposable {
 		}
 	}
 
-	public nextOrPreviousReference(reference: OneReference, next: boolean): OneReference {
+	nextOrPreviousReference(reference: OneReference, next: boolean): OneReference {
 
 		let { parent } = reference;
 
@@ -281,9 +241,9 @@ export class ReferencesModel implements IDisposable {
 		}
 	}
 
-	public nearestReference(resource: URI, position: Position): OneReference {
+	nearestReference(resource: URI, position: Position): OneReference {
 
-		const nearest = this._references.map((ref, idx) => {
+		const nearest = this.references.map((ref, idx) => {
 			return {
 				idx,
 				prefixLen: strings.commonPrefixLength(ref.uri.toString(), resource.toString()),
@@ -304,14 +264,15 @@ export class ReferencesModel implements IDisposable {
 		})[0];
 
 		if (nearest) {
-			return this._references[nearest.idx];
+			return this.references[nearest.idx];
 		}
 		return undefined;
 	}
 
 	dispose(): void {
-		this._groups = dispose(this._groups);
+		dispose(this.groups);
 		dispose(this._disposables);
+		this.groups.length = 0;
 		this._disposables.length = 0;
 	}
 
diff --git a/src/vs/editor/contrib/referenceSearch/referencesWidget.ts b/src/vs/editor/contrib/referenceSearch/referencesWidget.ts
index ea315ba3b73..c43976cf94a 100644
--- a/src/vs/editor/contrib/referenceSearch/referencesWidget.ts
+++ b/src/vs/editor/contrib/referenceSearch/referencesWidget.ts
@@ -4,46 +4,45 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import 'vs/css!./media/referencesWidget';
-import * as nls from 'vs/nls';
-import { onUnexpectedError } from 'vs/base/common/errors';
-import { getPathLabel } from 'vs/base/common/labels';
-import { Event, Emitter } from 'vs/base/common/event';
-import { IDisposable, dispose, IReference } from 'vs/base/common/lifecycle';
-import { Schemas } from 'vs/base/common/network';
-import * as strings from 'vs/base/common/strings';
-import { TPromise } from 'vs/base/common/winjs.base';
-import { Color } from 'vs/base/common/color';
-import { $, Builder } from 'vs/base/browser/builder';
 import * as dom from 'vs/base/browser/dom';
-import { Sash, ISashEvent, IVerticalSashLayoutProvider } from 'vs/base/browser/ui/sash/sash';
 import { IKeyboardEvent } from 'vs/base/browser/keyboardEvent';
 import { IMouseEvent } from 'vs/base/browser/mouseEvent';
 import { GestureEvent } from 'vs/base/browser/touch';
 import { CountBadge } from 'vs/base/browser/ui/countBadge/countBadge';
-import { FileLabel } from 'vs/base/browser/ui/iconLabel/iconLabel';
+import { IconLabel } from 'vs/base/browser/ui/iconLabel/iconLabel';
+import { ISashEvent, IVerticalSashLayoutProvider, Sash } from 'vs/base/browser/ui/sash/sash';
+import { Color } from 'vs/base/common/color';
+import { onUnexpectedError } from 'vs/base/common/errors';
+import { Emitter, Event } from 'vs/base/common/event';
+import { getBaseLabel } from 'vs/base/common/labels';
+import { dispose, IDisposable, IReference } from 'vs/base/common/lifecycle';
+import { Schemas } from 'vs/base/common/network';
+import { basenameOrAuthority, dirname } from 'vs/base/common/resources';
+import * as strings from 'vs/base/common/strings';
+import { TPromise } from 'vs/base/common/winjs.base';
 import * as tree from 'vs/base/parts/tree/browser/tree';
-import { IInstantiationService, optional } from 'vs/platform/instantiation/common/instantiation';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { Range, IRange } from 'vs/editor/common/core/range';
-import * as editorCommon from 'vs/editor/common/editorCommon';
-import { TextModel, ModelDecorationOptions } from 'vs/editor/common/model/textModel';
+import { ClickBehavior } from 'vs/base/parts/tree/browser/treeDefaults';
+import 'vs/css!./media/referencesWidget';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
 import { EmbeddedCodeEditorWidget } from 'vs/editor/browser/widget/embeddedCodeEditorWidget';
+import { IEditorOptions } from 'vs/editor/common/config/editorOptions';
+import { IRange, Range } from 'vs/editor/common/core/range';
+import * as editorCommon from 'vs/editor/common/editorCommon';
+import { IModelDeltaDecoration, TrackedRangeStickiness } from 'vs/editor/common/model';
+import { ModelDecorationOptions, TextModel } from 'vs/editor/common/model/textModel';
+import { Location } from 'vs/editor/common/modes';
+import { ITextEditorModel, ITextModelService } from 'vs/editor/common/services/resolverService';
+import * as nls from 'vs/nls';
+import { RawContextKey } from 'vs/platform/contextkey/common/contextkey';
+import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { ILabelService } from 'vs/platform/label/common/label';
+import { WorkbenchTree, WorkbenchTreeController } from 'vs/platform/list/browser/listService';
+import { activeContrastBorder, contrastBorder, registerColor } from 'vs/platform/theme/common/colorRegistry';
+import { attachBadgeStyler } from 'vs/platform/theme/common/styler';
+import { ITheme, IThemeService, registerThemingParticipant } from 'vs/platform/theme/common/themeService';
 import { PeekViewWidget } from './peekViewWidget';
 import { FileReferences, OneReference, ReferencesModel } from './referencesModel';
-import { ITextModelService, ITextEditorModel } from 'vs/editor/common/services/resolverService';
-import { registerColor, activeContrastBorder, contrastBorder } from 'vs/platform/theme/common/colorRegistry';
-import { registerThemingParticipant, ITheme, IThemeService } from 'vs/platform/theme/common/themeService';
-import { attachBadgeStyler } from 'vs/platform/theme/common/styler';
-import { IEditorOptions } from 'vs/editor/common/config/editorOptions';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import URI from 'vs/base/common/uri';
-import { TrackedRangeStickiness, IModelDeltaDecoration } from 'vs/editor/common/model';
-import { WorkbenchTree, WorkbenchTreeController } from 'vs/platform/list/browser/listService';
-import { RawContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { Location } from 'vs/editor/common/modes';
-import { ClickBehavior } from 'vs/base/parts/tree/browser/treeDefaults';
+
 
 class DecorationsManager implements IDisposable {
 
@@ -274,9 +273,9 @@ class Controller extends WorkbenchTreeController {
 	private _expandCollapse(tree: tree.ITree, element: any): boolean {
 
 		if (tree.isExpanded(element)) {
-			tree.collapse(element).done(null, onUnexpectedError);
+			tree.collapse(element).then(null, onUnexpectedError);
 		} else {
-			tree.expand(element).done(null, onUnexpectedError);
+			tree.expand(element).then(null, onUnexpectedError);
 		}
 		return true;
 	}
@@ -294,22 +293,21 @@ class Controller extends WorkbenchTreeController {
 
 class FileReferencesTemplate {
 
-	readonly file: FileLabel;
+	readonly file: IconLabel;
 	readonly badge: CountBadge;
 	readonly dispose: () => void;
 
 	constructor(
 		container: HTMLElement,
-		@IWorkspaceContextService private readonly _contextService: IWorkspaceContextService,
-		@optional(IEnvironmentService) private _environmentService: IEnvironmentService,
+		@ILabelService private readonly _uriLabel: ILabelService,
 		@IThemeService themeService: IThemeService,
 	) {
 		const parent = document.createElement('div');
 		dom.addClass(parent, 'reference-file');
 		container.appendChild(parent);
-		this.file = new FileLabel(parent, URI.parse('no:file'), this._contextService, this._environmentService);
+		this.file = new IconLabel(parent);
 
-		this.badge = new CountBadge($('.count').appendTo(parent).getHTMLElement());
+		this.badge = new CountBadge(dom.append(parent, dom.$('.count')));
 		const styler = attachBadgeStyler(this.badge, themeService);
 
 		this.dispose = () => {
@@ -319,7 +317,8 @@ class FileReferencesTemplate {
 	}
 
 	set(element: FileReferences) {
-		this.file.setFile(element.uri, this._contextService, this._environmentService);
+		let parent = dirname(element.uri);
+		this.file.setValue(getBaseLabel(element.uri), parent ? this._uriLabel.getUriLabel(parent, true) : undefined, { title: this._uriLabel.getUriLabel(element.uri) });
 		const len = element.children.length;
 		this.badge.setCount(len);
 		if (element.failure) {
@@ -367,9 +366,8 @@ class Renderer implements tree.IRenderer {
 	};
 
 	constructor(
-		@IWorkspaceContextService private readonly _contextService: IWorkspaceContextService,
 		@IThemeService private readonly _themeService: IThemeService,
-		@optional(IEnvironmentService) private _environmentService: IEnvironmentService,
+		@ILabelService private readonly _uriLabel: ILabelService,
 	) {
 		//
 	}
@@ -389,7 +387,7 @@ class Renderer implements tree.IRenderer {
 
 	renderTemplate(tree: tree.ITree, templateId: string, container: HTMLElement) {
 		if (templateId === Renderer._ids.FileReferences) {
-			return new FileReferencesTemplate(container, this._contextService, this._environmentService, this._themeService);
+			return new FileReferencesTemplate(container, this._uriLabel, this._themeService);
 		} else if (templateId === Renderer._ids.OneReference) {
 			return new OneReferenceTemplate(container);
 		}
@@ -518,23 +516,22 @@ export class ReferenceWidget extends PeekViewWidget {
 	private _onDidSelectReference = new Emitter<SelectionEvent>();
 
 	private _tree: WorkbenchTree;
-	private _treeContainer: Builder;
+	private _treeContainer: HTMLElement;
 	private _sash: VSash;
 	private _preview: ICodeEditor;
 	private _previewModelReference: IReference<ITextEditorModel>;
 	private _previewNotAvailableMessage: TextModel;
-	private _previewContainer: Builder;
-	private _messageContainer: Builder;
+	private _previewContainer: HTMLElement;
+	private _messageContainer: HTMLElement;
 
 	constructor(
 		editor: ICodeEditor,
 		private _defaultTreeKeyboardSupport: boolean,
 		public layoutData: LayoutData,
-		private _textModelResolverService: ITextModelService,
-		private _contextService: IWorkspaceContextService,
-		themeService: IThemeService,
-		private _instantiationService: IInstantiationService,
-		private _environmentService: IEnvironmentService
+		@IThemeService themeService: IThemeService,
+		@ITextModelService private _textModelResolverService: ITextModelService,
+		@IInstantiationService private _instantiationService: IInstantiationService,
+		@ILabelService private _uriLabel: ILabelService
 	) {
 		super(editor, { showFrame: false, showArrow: true, isResizeable: true, isAccessible: true });
 
@@ -574,7 +571,7 @@ export class ReferenceWidget extends PeekViewWidget {
 		this._tree.domFocus();
 	}
 
-	protected _onTitleClick(e: MouseEvent): void {
+	protected _onTitleClick(e: IMouseEvent): void {
 		if (this._preview && this._preview.getModel()) {
 			this._onDidSelectReference.fire({
 				element: this._getFocusedReference(),
@@ -585,96 +582,88 @@ export class ReferenceWidget extends PeekViewWidget {
 	}
 
 	protected _fillBody(containerElement: HTMLElement): void {
-		let container = $(containerElement);
-
 		this.setCssClass('reference-zone-widget');
 
 		// message pane
-		container.div({ 'class': 'messages' }, div => {
-			this._messageContainer = div.hide();
-		});
+		this._messageContainer = dom.append(containerElement, dom.$('div.messages'));
+		dom.hide(this._messageContainer);
 
 		// editor
-		container.div({ 'class': 'preview inline' }, (div: Builder) => {
-
-			let options: IEditorOptions = {
-				scrollBeyondLastLine: false,
-				scrollbar: {
-					verticalScrollbarSize: 14,
-					horizontal: 'auto',
-					useShadows: true,
-					verticalHasArrows: false,
-					horizontalHasArrows: false
-				},
-				overviewRulerLanes: 2,
-				fixedOverflowWidgets: true,
-				minimap: {
-					enabled: false
-				}
-			};
-
-			this._preview = this._instantiationService.createInstance(EmbeddedCodeEditorWidget, div.getHTMLElement(), options, this.editor);
-			this._previewContainer = div.hide();
-			this._previewNotAvailableMessage = TextModel.createFromString(nls.localize('missingPreviewMessage', "no preview available"));
-		});
+		this._previewContainer = dom.append(containerElement, dom.$('div.preview.inline'));
+		let options: IEditorOptions = {
+			scrollBeyondLastLine: false,
+			scrollbar: {
+				verticalScrollbarSize: 14,
+				horizontal: 'auto',
+				useShadows: true,
+				verticalHasArrows: false,
+				horizontalHasArrows: false
+			},
+			overviewRulerLanes: 2,
+			fixedOverflowWidgets: true,
+			minimap: {
+				enabled: false
+			}
+		};
+		this._preview = this._instantiationService.createInstance(EmbeddedCodeEditorWidget, this._previewContainer, options, this.editor);
+		dom.hide(this._previewContainer);
+		this._previewNotAvailableMessage = TextModel.createFromString(nls.localize('missingPreviewMessage', "no preview available"));
 
 		// sash
 		this._sash = new VSash(containerElement, this.layoutData.ratio || .8);
 		this._sash.onDidChangePercentages(() => {
 			let [left, right] = this._sash.percentages;
-			this._previewContainer.style({ width: left });
-			this._treeContainer.style({ width: right });
+			this._previewContainer.style.width = left;
+			this._treeContainer.style.width = right;
 			this._preview.layout();
 			this._tree.layout();
 			this.layoutData.ratio = this._sash.ratio;
 		});
 
 		// tree
-		container.div({ 'class': 'ref-tree inline' }, (div: Builder) => {
-			let controller = this._instantiationService.createInstance(Controller, { keyboardSupport: this._defaultTreeKeyboardSupport, clickBehavior: ClickBehavior.ON_MOUSE_UP /* our controller already deals with this */ });
-			this._callOnDispose.push(controller);
+		this._treeContainer = dom.append(containerElement, dom.$('div.ref-tree.inline'));
+		let controller = this._instantiationService.createInstance(Controller, { keyboardSupport: this._defaultTreeKeyboardSupport, clickBehavior: ClickBehavior.ON_MOUSE_UP /* our controller already deals with this */ });
+		this._callOnDispose.push(controller);
 
-			let config = <tree.ITreeConfiguration>{
-				dataSource: this._instantiationService.createInstance(DataSource),
-				renderer: this._instantiationService.createInstance(Renderer),
-				controller,
-				accessibilityProvider: new AriaProvider()
-			};
+		let config = <tree.ITreeConfiguration>{
+			dataSource: this._instantiationService.createInstance(DataSource),
+			renderer: this._instantiationService.createInstance(Renderer),
+			controller,
+			accessibilityProvider: new AriaProvider()
+		};
 
-			let options: tree.ITreeOptions = {
-				twistiePixels: 20,
-				ariaLabel: nls.localize('treeAriaLabel', "References")
-			};
+		let treeOptions: tree.ITreeOptions = {
+			twistiePixels: 20,
+			ariaLabel: nls.localize('treeAriaLabel', "References")
+		};
 
-			this._tree = this._instantiationService.createInstance(WorkbenchTree, div.getHTMLElement(), config, options);
+		this._tree = this._instantiationService.createInstance(WorkbenchTree, this._treeContainer, config, treeOptions);
 
-			ctxReferenceWidgetSearchTreeFocused.bindTo(this._tree.contextKeyService);
+		ctxReferenceWidgetSearchTreeFocused.bindTo(this._tree.contextKeyService);
 
-			// listen on selection and focus
-			let onEvent = (element: any, kind: 'show' | 'goto' | 'side') => {
-				if (element instanceof OneReference) {
-					if (kind === 'show') {
-						this._revealReference(element, false);
-					}
-					this._onDidSelectReference.fire({ element, kind, source: 'tree' });
+		// listen on selection and focus
+		let onEvent = (element: any, kind: 'show' | 'goto' | 'side') => {
+			if (element instanceof OneReference) {
+				if (kind === 'show') {
+					this._revealReference(element, false);
 				}
-			};
-			this._disposables.push(this._tree.onDidChangeFocus(event => {
-				if (event && event.payload && event.payload.origin === 'keyboard') {
-					onEvent(event.focus, 'show'); // only handle events from keyboard, mouse/touch is handled by other listeners below
-				}
-			}));
-			this._disposables.push(this._tree.onDidChangeSelection(event => {
-				if (event && event.payload && event.payload.origin === 'keyboard') {
-					onEvent(event.selection[0], 'goto'); // only handle events from keyboard, mouse/touch is handled by other listeners below
-				}
-			}));
-			this._disposables.push(controller.onDidFocus(element => onEvent(element, 'show')));
-			this._disposables.push(controller.onDidSelect(element => onEvent(element, 'goto')));
-			this._disposables.push(controller.onDidOpenToSide(element => onEvent(element, 'side')));
-
-			this._treeContainer = div.hide();
-		});
+				this._onDidSelectReference.fire({ element, kind, source: 'tree' });
+			}
+		};
+		this._disposables.push(this._tree.onDidChangeFocus(event => {
+			if (event && event.payload && event.payload.origin === 'keyboard') {
+				onEvent(event.focus, 'show'); // only handle events from keyboard, mouse/touch is handled by other listeners below
+			}
+		}));
+		this._disposables.push(this._tree.onDidChangeSelection(event => {
+			if (event && event.payload && event.payload.origin === 'keyboard') {
+				onEvent(event.selection[0], 'goto'); // only handle events from keyboard, mouse/touch is handled by other listeners below
+			}
+		}));
+		this._disposables.push(controller.onDidFocus(element => onEvent(element, 'show')));
+		this._disposables.push(controller.onDidSelect(element => onEvent(element, 'goto')));
+		this._disposables.push(controller.onDidOpenToSide(element => onEvent(element, 'side')));
+		dom.hide(this._treeContainer);
 	}
 
 	protected _doLayoutBody(heightInPixel: number, widthInPixel: number): void {
@@ -686,9 +675,10 @@ export class ReferenceWidget extends PeekViewWidget {
 
 		// set height/width
 		const [left, right] = this._sash.percentages;
-		this._previewContainer.style({ height, width: left });
-		this._treeContainer.style({ height, width: right });
-
+		this._previewContainer.style.height = height;
+		this._previewContainer.style.width = left;
+		this._treeContainer.style.height = height;
+		this._treeContainer.style.width = right;
 		// forward
 		this._tree.layout(heightInPixel);
 		this._preview.layout();
@@ -705,7 +695,7 @@ export class ReferenceWidget extends PeekViewWidget {
 		this._preview.layout();
 	}
 
-	public setSelection(selection: OneReference): TPromise<any> {
+	public setSelection(selection: OneReference): Promise<any> {
 		return this._revealReference(selection, true).then(() => {
 
 			// show in tree
@@ -728,11 +718,12 @@ export class ReferenceWidget extends PeekViewWidget {
 
 		if (this._model.empty) {
 			this.setTitle('');
-			this._messageContainer.innerHtml(nls.localize('noResults', "No results")).show();
+			this._messageContainer.innerHTML = nls.localize('noResults', "No results");
+			dom.show(this._messageContainer);
 			return TPromise.as(void 0);
 		}
 
-		this._messageContainer.hide();
+		dom.hide(this._messageContainer);
 		this._decorationsManager = new DecorationsManager(this._preview, this._model);
 		this._disposeOnNewModel.push(this._decorationsManager);
 
@@ -753,8 +744,8 @@ export class ReferenceWidget extends PeekViewWidget {
 
 		// make sure things are rendered
 		dom.addClass(this.container, 'results-loaded');
-		this._treeContainer.show();
-		this._previewContainer.show();
+		dom.show(this._treeContainer);
+		dom.show(this._previewContainer);
 		this._preview.layout();
 		this._tree.layout();
 		this.focus();
@@ -776,11 +767,11 @@ export class ReferenceWidget extends PeekViewWidget {
 		return undefined;
 	}
 
-	private async _revealReference(reference: OneReference, revealParent: boolean): TPromise<void> {
+	private async _revealReference(reference: OneReference, revealParent: boolean): Promise<void> {
 
 		// Update widget header
 		if (reference.uri.scheme !== Schemas.inMemory) {
-			this.setTitle(reference.name, getPathLabel(reference.directory, this._contextService, this._environmentService));
+			this.setTitle(basenameOrAuthority(reference.uri), this._uriLabel.getUriLabel(dirname(reference.uri), false));
 		} else {
 			this.setTitle(nls.localize('peekView.alternateTitle', "References"));
 		}
diff --git a/src/vs/editor/contrib/referenceSearch/test/referencesModel.test.ts b/src/vs/editor/contrib/referenceSearch/test/referencesModel.test.ts
index ec10a2dd1c4..d6114952d08 100644
--- a/src/vs/editor/contrib/referenceSearch/test/referencesModel.test.ts
+++ b/src/vs/editor/contrib/referenceSearch/test/referencesModel.test.ts
@@ -5,7 +5,7 @@
 'use strict';
 
 import * as assert from 'assert';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { Range } from 'vs/editor/common/core/range';
 import { Position } from 'vs/editor/common/core/position';
 import { ReferencesModel } from 'vs/editor/contrib/referenceSearch/referencesModel';
diff --git a/src/vs/editor/contrib/rename/rename.ts b/src/vs/editor/contrib/rename/rename.ts
index a3939df7767..349b72d0416 100644
--- a/src/vs/editor/contrib/rename/rename.ts
+++ b/src/vs/editor/contrib/rename/rename.ts
@@ -18,18 +18,18 @@ import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
 import RenameInputField from './renameInputField';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { asWinJsPromise } from 'vs/base/common/async';
-import { WorkspaceEdit, RenameProviderRegistry, RenameProvider, RenameLocation } from 'vs/editor/common/modes';
+import { WorkspaceEdit, RenameProviderRegistry, RenameProvider, RenameLocation, Rejection } from 'vs/editor/common/modes';
 import { Position, IPosition } from 'vs/editor/common/core/position';
 import { alert } from 'vs/base/browser/ui/aria/aria';
 import { Range } from 'vs/editor/common/core/range';
 import { MessageController } from 'vs/editor/contrib/message/messageController';
 import { EditorState, CodeEditorStateFlag } from 'vs/editor/browser/core/editorState';
-import { KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRegistry';
+import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
 import { INotificationService } from 'vs/platform/notification/common/notification';
 import { IBulkEditService } from 'vs/editor/browser/services/bulkEditService';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
+import { CancellationToken } from 'vs/base/common/cancellation';
 
 class RenameSkeleton {
 
@@ -46,13 +46,13 @@ class RenameSkeleton {
 		return this._provider.length > 0;
 	}
 
-	async resolveRenameLocation(): TPromise<RenameLocation> {
+	async resolveRenameLocation(token: CancellationToken): Promise<RenameLocation & Rejection> {
 
 		let [provider] = this._provider;
-		let res: RenameLocation;
+		let res: RenameLocation & Rejection;
 
 		if (provider.resolveRenameLocation) {
-			res = await asWinJsPromise(token => provider.resolveRenameLocation(this.model, this.position, token));
+			res = await provider.resolveRenameLocation(this.model, this.position, token);
 		}
 
 		if (!res) {
@@ -68,7 +68,7 @@ class RenameSkeleton {
 		return res;
 	}
 
-	async provideRenameEdits(newName: string, i: number = 0, rejects: string[] = [], position: Position = this.position): TPromise<WorkspaceEdit> {
+	async provideRenameEdits(newName: string, i: number = 0, rejects: string[] = [], token: CancellationToken): Promise<WorkspaceEdit & Rejection> {
 
 		if (i >= this._provider.length) {
 			return {
@@ -78,18 +78,18 @@ class RenameSkeleton {
 		}
 
 		let provider = this._provider[i];
-		let result = await asWinJsPromise((token) => provider.provideRenameEdits(this.model, this.position, newName, token));
+		let result = await provider.provideRenameEdits(this.model, this.position, newName, token);
 		if (!result) {
-			return this.provideRenameEdits(newName, i + 1, rejects.concat(nls.localize('no result', "No result.")));
+			return this.provideRenameEdits(newName, i + 1, rejects.concat(nls.localize('no result', "No result.")), token);
 		} else if (result.rejectReason) {
-			return this.provideRenameEdits(newName, i + 1, rejects.concat(result.rejectReason));
+			return this.provideRenameEdits(newName, i + 1, rejects.concat(result.rejectReason), token);
 		}
 		return result;
 	}
 }
 
-export async function rename(model: ITextModel, position: Position, newName: string): TPromise<WorkspaceEdit> {
-	return new RenameSkeleton(model, position).provideRenameEdits(newName);
+export async function rename(model: ITextModel, position: Position, newName: string): Promise<WorkspaceEdit & Rejection> {
+	return new RenameSkeleton(model, position).provideRenameEdits(newName, undefined, undefined, CancellationToken.None);
 }
 
 // ---  register actions and commands
@@ -127,7 +127,7 @@ class RenameController implements IEditorContribution {
 		return RenameController.ID;
 	}
 
-	public async run(): TPromise<void> {
+	public async run(token: CancellationToken): Promise<void> {
 
 		const position = this.editor.getPosition();
 		const skeleton = new RenameSkeleton(this.editor.getModel(), position);
@@ -136,9 +136,9 @@ class RenameController implements IEditorContribution {
 			return undefined;
 		}
 
-		let loc: RenameLocation;
+		let loc: RenameLocation & Rejection;
 		try {
-			loc = await skeleton.resolveRenameLocation();
+			loc = await skeleton.resolveRenameLocation(token);
 		} catch (e) {
 			MessageController.get(this.editor).showMessage(e, position);
 			return undefined;
@@ -148,6 +148,11 @@ class RenameController implements IEditorContribution {
 			return undefined;
 		}
 
+		if (loc.rejectReason) {
+			MessageController.get(this.editor).showMessage(loc.rejectReason, position);
+			return undefined;
+		}
+
 		let selection = this.editor.getSelection();
 		let selectionStart = 0;
 		let selectionEnd = loc.text.length;
@@ -172,7 +177,7 @@ class RenameController implements IEditorContribution {
 
 			const state = new EditorState(this.editor, CodeEditorStateFlag.Position | CodeEditorStateFlag.Value | CodeEditorStateFlag.Selection | CodeEditorStateFlag.Scroll);
 
-			const renameOperation = skeleton.provideRenameEdits(newNameOrFocusFlag, 0, [], Range.lift(loc.range).getStartPosition()).then(result => {
+			const renameOperation = Promise.resolve(skeleton.provideRenameEdits(newNameOrFocusFlag, 0, [], token).then(result => {
 				if (result.rejectReason) {
 					if (state.validate(this.editor)) {
 						MessageController.get(this.editor).showMessage(result.rejectReason, this.editor.getPosition());
@@ -183,9 +188,6 @@ class RenameController implements IEditorContribution {
 				}
 
 				return this._bulkEditService.apply(result, { editor: this.editor }).then(result => {
-					if (result.selection) {
-						this.editor.setSelection(result.selection);
-					}
 					// alert
 					if (result.ariaSummary) {
 						alert(nls.localize('aria', "Successfully renamed '{0}' to '{1}'. Summary: {2}", loc.text, newNameOrFocusFlag, result.ariaSummary));
@@ -194,15 +196,15 @@ class RenameController implements IEditorContribution {
 
 			}, err => {
 				this._notificationService.error(nls.localize('rename.failed', "Rename failed to execute."));
-				return TPromise.wrapError(err);
-			});
+				return Promise.reject(err);
+			}));
 
 			this._progressService.showWhile(renameOperation, 250);
 			return renameOperation;
 
 		}, err => {
 			this._renameInputVisible.reset();
-			return TPromise.wrapError(err);
+			return Promise.reject(err);
 		});
 	}
 
@@ -227,7 +229,8 @@ export class RenameAction extends EditorAction {
 			precondition: ContextKeyExpr.and(EditorContextKeys.writable, EditorContextKeys.hasRenameProvider),
 			kbOpts: {
 				kbExpr: EditorContextKeys.editorTextFocus,
-				primary: KeyCode.F2
+				primary: KeyCode.F2,
+				weight: KeybindingWeight.EditorContrib
 			},
 			menuOpts: {
 				group: '1_modification',
@@ -256,7 +259,7 @@ export class RenameAction extends EditorAction {
 	run(accessor: ServicesAccessor, editor: ICodeEditor): TPromise<void> {
 		let controller = RenameController.get(editor);
 		if (controller) {
-			return controller.run();
+			return TPromise.wrap(controller.run(CancellationToken.None));
 		}
 		return undefined;
 	}
@@ -272,7 +275,7 @@ registerEditorCommand(new RenameCommand({
 	precondition: CONTEXT_RENAME_INPUT_VISIBLE,
 	handler: x => x.acceptRenameInput(),
 	kbOpts: {
-		weight: KeybindingsRegistry.WEIGHT.editorContrib(99),
+		weight: KeybindingWeight.EditorContrib + 99,
 		kbExpr: EditorContextKeys.focus,
 		primary: KeyCode.Enter
 	}
@@ -283,7 +286,7 @@ registerEditorCommand(new RenameCommand({
 	precondition: CONTEXT_RENAME_INPUT_VISIBLE,
 	handler: x => x.cancelRenameInput(),
 	kbOpts: {
-		weight: KeybindingsRegistry.WEIGHT.editorContrib(99),
+		weight: KeybindingWeight.EditorContrib + 99,
 		kbExpr: EditorContextKeys.focus,
 		primary: KeyCode.Escape,
 		secondary: [KeyMod.Shift | KeyCode.Escape]
diff --git a/src/vs/editor/contrib/rename/renameInputField.ts b/src/vs/editor/contrib/rename/renameInputField.ts
index c297a5ea47b..9c87716107c 100644
--- a/src/vs/editor/contrib/rename/renameInputField.ts
+++ b/src/vs/editor/contrib/rename/renameInputField.ts
@@ -8,7 +8,6 @@
 import 'vs/css!./renameInputField';
 import { localize } from 'vs/nls';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
-import { TPromise } from 'vs/base/common/winjs.base';
 import { Range, IRange } from 'vs/editor/common/core/range';
 import { ContentWidgetPositionPreference, ICodeEditor, IContentWidget, IContentWidgetPosition } from 'vs/editor/browser/editorBrowser';
 import { IThemeService, ITheme } from 'vs/platform/theme/common/themeService';
@@ -123,7 +122,7 @@ export default class RenameInputField implements IContentWidget, IDisposable {
 		}
 	}
 
-	public getInput(where: IRange, value: string, selectionStart: number, selectionEnd: number): TPromise<string | boolean> {
+	public getInput(where: IRange, value: string, selectionStart: number, selectionEnd: number): Promise<string | boolean> {
 
 		this._position = new Position(where.startLineNumber, where.startColumn);
 		this._inputField.value = value;
@@ -139,7 +138,7 @@ export default class RenameInputField implements IContentWidget, IDisposable {
 			this._hide();
 		};
 
-		return new TPromise<string>(resolve => {
+		return new Promise<string>(resolve => {
 
 			this._currentCancelInput = (focusEditor) => {
 				this._currentAcceptInput = null;
@@ -171,14 +170,12 @@ export default class RenameInputField implements IContentWidget, IDisposable {
 
 			this._show();
 
-		}, () => {
-			this._currentCancelInput(true);
 		}).then(newValue => {
 			always();
 			return newValue;
 		}, err => {
 			always();
-			return TPromise.wrapError<string>(err);
+			return Promise.reject(err);
 		});
 	}
 
diff --git a/src/vs/editor/contrib/smartSelect/smartSelect.ts b/src/vs/editor/contrib/smartSelect/smartSelect.ts
index 7c25548d3c9..cfe14c52788 100644
--- a/src/vs/editor/contrib/smartSelect/smartSelect.ts
+++ b/src/vs/editor/contrib/smartSelect/smartSelect.ts
@@ -16,6 +16,8 @@ import { registerEditorAction, ServicesAccessor, IActionOptions, EditorAction, r
 import { TokenSelectionSupport, ILogicalSelectionEntry } from './tokenSelectionSupport';
 import { ICursorPositionChangedEvent } from 'vs/editor/common/controller/cursorEvents';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
+import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
+import { MenuId } from 'vs/platform/actions/common/actions';
 
 // --- selection state machine
 
@@ -173,7 +175,14 @@ class GrowSelectionAction extends AbstractSmartSelect {
 			kbOpts: {
 				kbExpr: EditorContextKeys.editorTextFocus,
 				primary: KeyMod.Shift | KeyMod.Alt | KeyCode.RightArrow,
-				mac: { primary: KeyMod.CtrlCmd | KeyMod.WinCtrl | KeyMod.Shift | KeyCode.RightArrow }
+				mac: { primary: KeyMod.CtrlCmd | KeyMod.WinCtrl | KeyMod.Shift | KeyCode.RightArrow },
+				weight: KeybindingWeight.EditorContrib
+			},
+			menubarOpts: {
+				menuId: MenuId.MenubarSelectionMenu,
+				group: '1_basic',
+				title: nls.localize({ key: 'miSmartSelectGrow', comment: ['&& denotes a mnemonic'] }, "&&Expand Selection"),
+				order: 2
 			}
 		});
 	}
@@ -189,7 +198,14 @@ class ShrinkSelectionAction extends AbstractSmartSelect {
 			kbOpts: {
 				kbExpr: EditorContextKeys.editorTextFocus,
 				primary: KeyMod.Shift | KeyMod.Alt | KeyCode.LeftArrow,
-				mac: { primary: KeyMod.CtrlCmd | KeyMod.WinCtrl | KeyMod.Shift | KeyCode.LeftArrow }
+				mac: { primary: KeyMod.CtrlCmd | KeyMod.WinCtrl | KeyMod.Shift | KeyCode.LeftArrow },
+				weight: KeybindingWeight.EditorContrib
+			},
+			menubarOpts: {
+				menuId: MenuId.MenubarSelectionMenu,
+				group: '1_basic',
+				title: nls.localize({ key: 'miSmartSelectShrink', comment: ['&& denotes a mnemonic'] }, "&&Shrink Selection"),
+				order: 3
 			}
 		});
 	}
diff --git a/src/vs/editor/contrib/smartSelect/test/tokenSelectionSupport.test.ts b/src/vs/editor/contrib/smartSelect/test/tokenSelectionSupport.test.ts
index a06b506123b..fb406b259ef 100644
--- a/src/vs/editor/contrib/smartSelect/test/tokenSelectionSupport.test.ts
+++ b/src/vs/editor/contrib/smartSelect/test/tokenSelectionSupport.test.ts
@@ -5,7 +5,7 @@
 'use strict';
 
 import * as assert from 'assert';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { Range } from 'vs/editor/common/core/range';
 import { Position } from 'vs/editor/common/core/position';
 import { LanguageIdentifier } from 'vs/editor/common/modes';
@@ -115,4 +115,38 @@ suite('TokenSelectionSupport', () => {
 				// new Range(3, 19, 3, 20)
 			]);
 	});
+
+	test('getRangesToPosition #56886. Skip empty lines correctly.', () => {
+
+		assertGetRangesToPosition([
+			'function a(bar, foo){',
+			'\tif (bar) {',
+			'',
+			'\t}',
+			'}'
+		], 3, 1, [
+				new Range(1, 1, 5, 2),
+				new Range(1, 21, 5, 2),
+				new Range(2, 1, 4, 3),
+				new Range(2, 11, 4, 3)
+			]);
+	});
+
+	test('getRangesToPosition #56886. Do not skip lines with only whitespaces.', () => {
+
+		assertGetRangesToPosition([
+			'function a(bar, foo){',
+			'\tif (bar) {',
+			' ',
+			'\t}',
+			'}'
+		], 3, 1, [
+				new Range(1, 1, 5, 2),
+				new Range(1, 21, 5, 2),
+				new Range(2, 1, 4, 3),
+				new Range(2, 11, 4, 3),
+				new Range(3, 1, 4, 2),
+				new Range(3, 1, 3, 2)
+			]);
+	});
 });
diff --git a/src/vs/editor/contrib/smartSelect/tokenSelectionSupport.ts b/src/vs/editor/contrib/smartSelect/tokenSelectionSupport.ts
index 0ab1ea198e3..e54debcbd23 100644
--- a/src/vs/editor/contrib/smartSelect/tokenSelectionSupport.ts
+++ b/src/vs/editor/contrib/smartSelect/tokenSelectionSupport.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { Range } from 'vs/editor/common/core/range';
 import { ITextModel } from 'vs/editor/common/model';
diff --git a/src/vs/editor/contrib/smartSelect/tokenTree.ts b/src/vs/editor/contrib/smartSelect/tokenTree.ts
index 537f2675c9f..755bfb013ae 100644
--- a/src/vs/editor/contrib/smartSelect/tokenTree.ts
+++ b/src/vs/editor/contrib/smartSelect/tokenTree.ts
@@ -174,7 +174,7 @@ class ModelRawTokenScanner {
 			this._model.forceTokenization(this._lineNumber);
 			this._lineTokens = this._model.getLineTokens(this._lineNumber);
 			this._tokenIndex = 0;
-			if (this._lineTokens.getCount() === 0) {
+			if (this._lineTokens.getLineContent().length === 0) {
 				// Skip empty lines
 				this._lineTokens = null;
 			}
diff --git a/src/vs/editor/contrib/snippet/snippet.md b/src/vs/editor/contrib/snippet/snippet.md
index 403cda77438..ce571c614af 100644
--- a/src/vs/editor/contrib/snippet/snippet.md
+++ b/src/vs/editor/contrib/snippet/snippet.md
@@ -53,6 +53,26 @@ ${TM_FILENAME/(.*)\..+$/$1/}
   |-> resolves to the filename
 ```
 
+Placeholder-Transform
+--
+
+Like a Variable-Transform, a transformation of a placeholder allows changing the inserted text for the placeholder when moving to the next tab stop.
+The inserted text is matched with the regular expression and the match or matches - depending on the options - are replaced with the specified replacement format text.
+Every occurrence of a placeholder can define its own transformation independently using the value of the first placeholder.
+The format for Placeholder-Transforms is the same as for Variable-Transforms.
+
+The following sample removes an underscore at the beginning of the text. `_transform` becomes `transform`.
+
+```
+${1/^_(.*)/$1/}
+  |   |    |  |-> No options
+  |   |    |
+  |   |    |-> Replace it with the first capture group
+  |   |
+  |   |-> Regular expression to capture everything after the underscore
+  |
+  |-> Placeholder Index
+```
 
 Grammar
 --
@@ -61,12 +81,15 @@ Below is the EBNF for snippets. With `\` (backslash) you can escape `$`, `}` and
 
 ```
 any         ::= tabstop | placeholder | choice | variable | text
-tabstop     ::= '$' int | '${' int '}'
+tabstop     ::= '$' int
+                | '${' int '}'
+                | '${' int  transform '}'
 placeholder ::= '${' int ':' any '}'
 choice      ::= '${' int '|' text (',' text)* '|}'
 variable    ::= '$' var | '${' var }'
                 | '${' var ':' any '}'
-                | '${' var '/' regex '/' (format | text)+ '/' options '}'
+                | '${' var transform '}'
+transform   ::= '/' regex '/' (format | text)+ '/' options
 format      ::= '$' int | '${' int '}'
                 | '${' int ':' '/upcase' | '/downcase' | '/capitalize' '}'
                 | '${' int ':+' if '}'
diff --git a/src/vs/editor/contrib/snippet/snippetController2.ts b/src/vs/editor/contrib/snippet/snippetController2.ts
index 83abd441a26..03e9a581b1a 100644
--- a/src/vs/editor/contrib/snippet/snippetController2.ts
+++ b/src/vs/editor/contrib/snippet/snippetController2.ts
@@ -5,22 +5,22 @@
 
 'use strict';
 
-import { RawContextKey, IContextKey, IContextKeyService, ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { registerEditorContribution, EditorCommand, registerEditorCommand } from 'vs/editor/browser/editorExtensions';
-import { dispose, IDisposable } from 'vs/base/common/lifecycle';
-import { SnippetSession } from './snippetSession';
-import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
 import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { showSimpleSuggestions } from 'vs/editor/contrib/suggest/suggest';
-import { ISuggestion } from 'vs/editor/common/modes';
-import { Selection } from 'vs/editor/common/core/selection';
-import { Range } from 'vs/editor/common/core/range';
-import { Choice } from 'vs/editor/contrib/snippet/snippetParser';
+import { dispose, IDisposable } from 'vs/base/common/lifecycle';
 import { repeat } from 'vs/base/common/strings';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRegistry';
+import { EditorCommand, registerEditorCommand, registerEditorContribution } from 'vs/editor/browser/editorExtensions';
+import { Range } from 'vs/editor/common/core/range';
+import { Selection } from 'vs/editor/common/core/selection';
 import { IEditorContribution } from 'vs/editor/common/editorCommon';
+import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
+import { ISuggestion } from 'vs/editor/common/modes';
+import { Choice } from 'vs/editor/contrib/snippet/snippetParser';
+import { showSimpleSuggestions } from 'vs/editor/contrib/suggest/suggest';
+import { ContextKeyExpr, IContextKey, IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
+import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
 import { ILogService } from 'vs/platform/log/common/log';
+import { SnippetSession } from './snippetSession';
 
 export class SnippetController2 implements IEditorContribution {
 
@@ -65,13 +65,14 @@ export class SnippetController2 implements IEditorContribution {
 	insert(
 		template: string,
 		overwriteBefore: number = 0, overwriteAfter: number = 0,
-		undoStopBefore: boolean = true, undoStopAfter: boolean = true
+		undoStopBefore: boolean = true, undoStopAfter: boolean = true,
+		adjustWhitespace: boolean = true,
 	): void {
 		// this is here to find out more about the yet-not-understood
 		// error that sometimes happens when we fail to inserted a nested
 		// snippet
 		try {
-			this._doInsert(template, overwriteBefore, overwriteAfter, undoStopBefore, undoStopAfter);
+			this._doInsert(template, overwriteBefore, overwriteAfter, undoStopBefore, undoStopAfter, adjustWhitespace);
 
 		} catch (e) {
 			this.cancel();
@@ -85,7 +86,8 @@ export class SnippetController2 implements IEditorContribution {
 	private _doInsert(
 		template: string,
 		overwriteBefore: number = 0, overwriteAfter: number = 0,
-		undoStopBefore: boolean = true, undoStopAfter: boolean = true
+		undoStopBefore: boolean = true, undoStopAfter: boolean = true,
+		adjustWhitespace: boolean = true,
 	): void {
 
 		// don't listen while inserting the snippet
@@ -98,10 +100,10 @@ export class SnippetController2 implements IEditorContribution {
 
 		if (!this._session) {
 			this._modelVersionId = this._editor.getModel().getAlternativeVersionId();
-			this._session = new SnippetSession(this._editor, template, overwriteBefore, overwriteAfter);
+			this._session = new SnippetSession(this._editor, template, overwriteBefore, overwriteAfter, adjustWhitespace);
 			this._session.insert();
 		} else {
-			this._session.merge(template, overwriteBefore, overwriteAfter);
+			this._session.merge(template, overwriteBefore, overwriteAfter, adjustWhitespace);
 		}
 
 		if (undoStopAfter) {
@@ -205,6 +207,10 @@ export class SnippetController2 implements IEditorContribution {
 		this._updateState();
 	}
 
+	isInSnippet(): boolean {
+		return this._inSnippet.get();
+	}
+
 	getSessionEnclosingRange(): Range {
 		if (this._session) {
 			return this._session.getEnclosingRange();
@@ -223,7 +229,7 @@ registerEditorCommand(new CommandCtor({
 	precondition: ContextKeyExpr.and(SnippetController2.InSnippetMode, SnippetController2.HasNextTabstop),
 	handler: ctrl => ctrl.next(),
 	kbOpts: {
-		weight: KeybindingsRegistry.WEIGHT.editorContrib(30),
+		weight: KeybindingWeight.EditorContrib + 30,
 		kbExpr: EditorContextKeys.editorTextFocus,
 		primary: KeyCode.Tab
 	}
@@ -233,7 +239,7 @@ registerEditorCommand(new CommandCtor({
 	precondition: ContextKeyExpr.and(SnippetController2.InSnippetMode, SnippetController2.HasPrevTabstop),
 	handler: ctrl => ctrl.prev(),
 	kbOpts: {
-		weight: KeybindingsRegistry.WEIGHT.editorContrib(30),
+		weight: KeybindingWeight.EditorContrib + 30,
 		kbExpr: EditorContextKeys.editorTextFocus,
 		primary: KeyMod.Shift | KeyCode.Tab
 	}
@@ -243,7 +249,7 @@ registerEditorCommand(new CommandCtor({
 	precondition: SnippetController2.InSnippetMode,
 	handler: ctrl => ctrl.cancel(),
 	kbOpts: {
-		weight: KeybindingsRegistry.WEIGHT.editorContrib(30),
+		weight: KeybindingWeight.EditorContrib + 30,
 		kbExpr: EditorContextKeys.editorTextFocus,
 		primary: KeyCode.Escape,
 		secondary: [KeyMod.Shift | KeyCode.Escape]
@@ -255,7 +261,7 @@ registerEditorCommand(new CommandCtor({
 	precondition: SnippetController2.InSnippetMode,
 	handler: ctrl => ctrl.finish(),
 	// kbOpts: {
-	// 	weight: KeybindingsRegistry.WEIGHT.editorContrib(30),
+	// 	weight: KeybindingWeight.EditorContrib + 30,
 	// 	kbExpr: EditorContextKeys.textFocus,
 	// 	primary: KeyCode.Enter,
 	// }
diff --git a/src/vs/editor/contrib/snippet/snippetParser.ts b/src/vs/editor/contrib/snippet/snippetParser.ts
index 2ee46939849..c839cffd343 100644
--- a/src/vs/editor/contrib/snippet/snippetParser.ts
+++ b/src/vs/editor/contrib/snippet/snippetParser.ts
@@ -7,7 +7,7 @@
 
 import { CharCode } from 'vs/base/common/charCode';
 
-export enum TokenType {
+export const enum TokenType {
 	Dollar,
 	Colon,
 	Comma,
@@ -214,8 +214,11 @@ export class Text extends Marker {
 	}
 }
 
-export class Placeholder extends Marker {
+export abstract class TransformableMarker extends Marker {
+	public transform: Transform;
+}
 
+export class Placeholder extends TransformableMarker {
 	static compareByIndex(a: Placeholder, b: Placeholder): number {
 		if (a.index === b.index) {
 			return 0;
@@ -247,17 +250,26 @@ export class Placeholder extends Marker {
 	}
 
 	toTextmateString(): string {
-		if (this.children.length === 0) {
+		let transformString = '';
+		if (this.transform) {
+			transformString = this.transform.toTextmateString();
+		}
+		if (this.children.length === 0 && !this.transform) {
 			return `\$${this.index}`;
+		} else if (this.children.length === 0) {
+			return `\${${this.index}${transformString}}`;
 		} else if (this.choice) {
-			return `\${${this.index}|${this.choice.toTextmateString()}|}`;
+			return `\${${this.index}|${this.choice.toTextmateString()}|${transformString}}`;
 		} else {
-			return `\${${this.index}:${this.children.map(child => child.toTextmateString()).join('')}}`;
+			return `\${${this.index}:${this.children.map(child => child.toTextmateString()).join('')}${transformString}}`;
 		}
 	}
 
 	clone(): Placeholder {
 		let ret = new Placeholder(this.index);
+		if (this.transform) {
+			ret.transform = this.transform.clone();
+		}
 		ret._children = this.children.map(child => child.clone());
 		return ret;
 	}
@@ -322,7 +334,7 @@ export class Transform extends Marker {
 	}
 
 	toTextmateString(): string {
-		return `/${Text.escape(this.regexp.source)}/${this.children.map(c => c.toTextmateString())}/${this.regexp.ignoreCase ? 'i' : ''}`;
+		return `/${Text.escape(this.regexp.source)}/${this.children.map(c => c.toTextmateString())}/${(this.regexp.ignoreCase ? 'i' : '') + (this.regexp.global ? 'g' : '')}`;
 	}
 
 	clone(): Transform {
@@ -384,7 +396,7 @@ export class FormatString extends Marker {
 	}
 }
 
-export class Variable extends Marker {
+export class Variable extends TransformableMarker {
 
 	constructor(public name: string) {
 		super();
@@ -392,9 +404,8 @@ export class Variable extends Marker {
 
 	resolve(resolver: VariableResolver): boolean {
 		let value = resolver.resolve(this);
-		let [firstChild] = this._children;
-		if (firstChild instanceof Transform && this._children.length === 1) {
-			value = firstChild.resolve(value || '');
+		if (this.transform) {
+			value = this.transform.resolve(value || '');
 		}
 		if (value !== undefined) {
 			this._children = [new Text(value)];
@@ -404,15 +415,22 @@ export class Variable extends Marker {
 	}
 
 	toTextmateString(): string {
+		let transformString = '';
+		if (this.transform) {
+			transformString = this.transform.toTextmateString();
+		}
 		if (this.children.length === 0) {
-			return `\${${this.name}}`;
+			return `\${${this.name}${transformString}}`;
 		} else {
-			return `\${${this.name}:${this.children.map(child => child.toTextmateString()).join('')}}`;
+			return `\${${this.name}:${this.children.map(child => child.toTextmateString()).join('')}${transformString}}`;
 		}
 	}
 
 	clone(): Variable {
 		const ret = new Variable(this.name);
+		if (this.transform) {
+			ret.transform = this.transform.clone();
+		}
 		ret._children = this.children.map(child => child.clone());
 		return ret;
 	}
@@ -580,6 +598,7 @@ export class SnippetParser {
 		for (const placeholder of incompletePlaceholders) {
 			if (placeholderDefaultValues.has(placeholder.index)) {
 				const clone = new Placeholder(placeholder.index);
+				clone.transform = placeholder.transform;
 				for (const child of placeholderDefaultValues.get(placeholder.index)) {
 					clone.appendChild(child.clone());
 				}
@@ -624,6 +643,9 @@ export class SnippetParser {
 		let start = this._token;
 		while (this._token.type !== type) {
 			this._token = this._scanner.next();
+			if (this._token.type === TokenType.EOF) {
+				return false;
+			}
 		}
 		let value = this._scanner.value.substring(start.pos, this._token.pos);
 		this._token = this._scanner.next();
@@ -717,11 +739,13 @@ export class SnippetParser {
 						continue;
 					}
 
-					if (this._accept(TokenType.Pipe) && this._accept(TokenType.CurlyClose)) {
-						// ..|} -> done
+					if (this._accept(TokenType.Pipe)) {
 						placeholder.appendChild(choice);
-						parent.appendChild(placeholder);
-						return true;
+						if (this._accept(TokenType.CurlyClose)) {
+							// ..|} -> done
+							parent.appendChild(placeholder);
+							return true;
+						}
 					}
 				}
 
@@ -729,6 +753,16 @@ export class SnippetParser {
 				return false;
 			}
 
+		} else if (this._accept(TokenType.Forwardslash)) {
+			// ${1/<regex>/<format>/<options>}
+			if (this._parseTransform(placeholder)) {
+				parent.appendChild(placeholder);
+				return true;
+			}
+
+			this._backTo(token);
+			return false;
+
 		} else if (this._accept(TokenType.CurlyClose)) {
 			// ${1}
 			parent.appendChild(placeholder);
@@ -829,7 +863,7 @@ export class SnippetParser {
 		}
 	}
 
-	private _parseTransform(parent: Variable): boolean {
+	private _parseTransform(parent: TransformableMarker): boolean {
 		// ...<regex>/<format>/<options>}
 
 		let transform = new Transform();
@@ -894,7 +928,7 @@ export class SnippetParser {
 			return false;
 		}
 
-		parent.appendChild(transform);
+		parent.transform = transform;
 		return true;
 	}
 
diff --git a/src/vs/editor/contrib/snippet/snippetSession.ts b/src/vs/editor/contrib/snippet/snippetSession.ts
index 31be6b2ba16..65d1fe67f3d 100644
--- a/src/vs/editor/contrib/snippet/snippetSession.ts
+++ b/src/vs/editor/contrib/snippet/snippetSession.ts
@@ -5,21 +5,21 @@
 
 'use strict';
 
-import 'vs/css!./snippetSession';
-import { getLeadingWhitespace } from 'vs/base/common/strings';
-import { ITextModel, TrackedRangeStickiness, IIdentifiedSingleEditOperation } from 'vs/editor/common/model';
-import { EditOperation } from 'vs/editor/common/core/editOperation';
-import { TextmateSnippet, Placeholder, Choice, SnippetParser } from './snippetParser';
-import { Selection } from 'vs/editor/common/core/selection';
-import { Range } from 'vs/editor/common/core/range';
-import { IPosition } from 'vs/editor/common/core/position';
 import { groupBy } from 'vs/base/common/arrays';
 import { dispose } from 'vs/base/common/lifecycle';
-import { SelectionBasedVariableResolver, CompositeSnippetVariableResolver, ModelBasedVariableResolver, ClipboardBasedVariableResolver, TimeBasedVariableResolver } from './snippetVariables';
-import { ModelDecorationOptions } from 'vs/editor/common/model/textModel';
+import { getLeadingWhitespace } from 'vs/base/common/strings';
+import 'vs/css!./snippetSession';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
+import { EditOperation } from 'vs/editor/common/core/editOperation';
+import { IPosition } from 'vs/editor/common/core/position';
+import { Range } from 'vs/editor/common/core/range';
+import { Selection } from 'vs/editor/common/core/selection';
+import { IIdentifiedSingleEditOperation, ITextModel, TrackedRangeStickiness } from 'vs/editor/common/model';
+import { ModelDecorationOptions } from 'vs/editor/common/model/textModel';
 import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
 import { optional } from 'vs/platform/instantiation/common/instantiation';
+import { Choice, Placeholder, SnippetParser, Text, TextmateSnippet } from './snippetParser';
+import { ClipboardBasedVariableResolver, CompositeSnippetVariableResolver, ModelBasedVariableResolver, SelectionBasedVariableResolver, TimeBasedVariableResolver } from './snippetVariables';
 
 export class OneSnippet {
 
@@ -87,6 +87,25 @@ export class OneSnippet {
 
 		this._initDecorations();
 
+		// Transform placeholder text if necessary
+		if (this._placeholderGroupsIdx >= 0) {
+			let operations: IIdentifiedSingleEditOperation[] = [];
+
+			for (const placeholder of this._placeholderGroups[this._placeholderGroupsIdx]) {
+				// Check if the placeholder has a transformation
+				if (placeholder.transform) {
+					const id = this._placeholderDecorations.get(placeholder);
+					const range = this._editor.getModel().getDecorationRange(id);
+					const currentValue = this._editor.getModel().getValueInRange(range);
+
+					operations.push(EditOperation.replaceMove(range, placeholder.transform.resolve(currentValue)));
+				}
+			}
+			if (operations.length > 0) {
+				this._editor.executeEdits('snippet.placeholderTransform', operations);
+			}
+		}
+
 		if (fwd === true && this._placeholderGroupsIdx < this._placeholderGroups.length - 1) {
 			this._placeholderGroupsIdx += 1;
 
@@ -165,6 +184,14 @@ export class OneSnippet {
 
 				const id = this._placeholderDecorations.get(placeholder);
 				const range = this._editor.getModel().getDecorationRange(id);
+				if (!range) {
+					// one of the placeholder lost its decoration and
+					// therefore we bail out and pretend the placeholder
+					// (with its mirrors) doesn't exist anymore.
+					result.delete(placeholder.index);
+					break;
+				}
+
 				ranges.push(range);
 			}
 		}
@@ -244,17 +271,26 @@ export class OneSnippet {
 
 export class SnippetSession {
 
-	static adjustWhitespace(model: ITextModel, position: IPosition, template: string): string {
-
+	static adjustWhitespace(model: ITextModel, position: IPosition, snippet: TextmateSnippet): void {
 		const line = model.getLineContent(position.lineNumber);
 		const lineLeadingWhitespace = getLeadingWhitespace(line, 0, position.column - 1);
-		const templateLines = template.split(/\r\n|\r|\n/);
 
-		for (let i = 1; i < templateLines.length; i++) {
-			let templateLeadingWhitespace = getLeadingWhitespace(templateLines[i]);
-			templateLines[i] = model.normalizeIndentation(lineLeadingWhitespace + templateLeadingWhitespace) + templateLines[i].substr(templateLeadingWhitespace.length);
-		}
-		return templateLines.join(model.getEOL());
+		snippet.walk(marker => {
+			if (marker instanceof Text && !(marker.parent instanceof Choice)) {
+				// adjust indentation of text markers, except for choise elements
+				// which get adjusted when being selected
+				const lines = marker.value.split(/\r\n|\r|\n/);
+				for (let i = 1; i < lines.length; i++) {
+					let templateLeadingWhitespace = getLeadingWhitespace(lines[i]);
+					lines[i] = model.normalizeIndentation(lineLeadingWhitespace + templateLeadingWhitespace) + lines[i].substr(templateLeadingWhitespace.length);
+				}
+				const newValue = lines.join(model.getEOL());
+				if (newValue !== marker.value) {
+					marker.parent.replace(marker, [new Text(newValue)]);
+				}
+			}
+			return true;
+		});
 	}
 
 	static adjustSelection(model: ITextModel, selection: Selection, overwriteBefore: number, overwriteAfter: number): Selection {
@@ -281,7 +317,7 @@ export class SnippetSession {
 		return selection;
 	}
 
-	static createEditsAndSnippets(editor: ICodeEditor, template: string, overwriteBefore: number, overwriteAfter: number, enforceFinalTabstop: boolean): { edits: IIdentifiedSingleEditOperation[], snippets: OneSnippet[] } {
+	static createEditsAndSnippets(editor: ICodeEditor, template: string, overwriteBefore: number, overwriteAfter: number, enforceFinalTabstop: boolean, adjustWhitespace: boolean): { edits: IIdentifiedSingleEditOperation[], snippets: OneSnippet[] } {
 
 		const model = editor.getModel();
 		const edits: IIdentifiedSingleEditOperation[] = [];
@@ -324,19 +360,21 @@ export class SnippetSession {
 				.setStartPosition(extensionBefore.startLineNumber, extensionBefore.startColumn)
 				.setEndPosition(extensionAfter.endLineNumber, extensionAfter.endColumn);
 
+			const snippet = new SnippetParser().parse(template, true, enforceFinalTabstop);
+
 			// adjust the template string to match the indentation and
 			// whitespace rules of this insert location (can be different for each cursor)
 			const start = snippetSelection.getStartPosition();
-			const adjustedTemplate = SnippetSession.adjustWhitespace(model, start, template);
+			if (adjustWhitespace) {
+				SnippetSession.adjustWhitespace(model, start, snippet);
+			}
 
-			const snippet = new SnippetParser()
-				.parse(adjustedTemplate, true, enforceFinalTabstop)
-				.resolveVariables(new CompositeSnippetVariableResolver([
-					modelBasedVariableResolver,
-					new ClipboardBasedVariableResolver(clipboardService, idx, indexedSelections.length),
-					new SelectionBasedVariableResolver(model, selection),
-					new TimeBasedVariableResolver
-				]));
+			snippet.resolveVariables(new CompositeSnippetVariableResolver([
+				modelBasedVariableResolver,
+				new ClipboardBasedVariableResolver(clipboardService, idx, indexedSelections.length),
+				new SelectionBasedVariableResolver(model, selection),
+				new TimeBasedVariableResolver
+			]));
 
 			const offset = model.getOffsetAt(start) + delta;
 			delta += snippet.toString().length - model.getValueLengthInRange(snippetSelection);
@@ -356,13 +394,15 @@ export class SnippetSession {
 	private readonly _templateMerges: [number, number, string][] = [];
 	private readonly _overwriteBefore: number;
 	private readonly _overwriteAfter: number;
+	private readonly _adjustWhitespace: boolean;
 	private _snippets: OneSnippet[] = [];
 
-	constructor(editor: ICodeEditor, template: string, overwriteBefore: number = 0, overwriteAfter: number = 0) {
+	constructor(editor: ICodeEditor, template: string, overwriteBefore: number = 0, overwriteAfter: number = 0, adjustWhitespace: boolean = true) {
 		this._editor = editor;
 		this._template = template;
 		this._overwriteBefore = overwriteBefore;
 		this._overwriteAfter = overwriteAfter;
+		this._adjustWhitespace = adjustWhitespace;
 	}
 
 	dispose(): void {
@@ -378,7 +418,7 @@ export class SnippetSession {
 		const model = this._editor.getModel();
 
 		// make insert edit and start with first selections
-		const { edits, snippets } = SnippetSession.createEditsAndSnippets(this._editor, this._template, this._overwriteBefore, this._overwriteAfter, false);
+		const { edits, snippets } = SnippetSession.createEditsAndSnippets(this._editor, this._template, this._overwriteBefore, this._overwriteAfter, false, this._adjustWhitespace);
 		this._snippets = snippets;
 
 		const selections = model.pushEditOperations(this._editor.getSelections(), edits, undoEdits => {
@@ -392,9 +432,9 @@ export class SnippetSession {
 		this._editor.revealRange(selections[0]);
 	}
 
-	merge(template: string, overwriteBefore: number = 0, overwriteAfter: number = 0): void {
+	merge(template: string, overwriteBefore: number = 0, overwriteAfter: number = 0, adjustWhitespace: boolean = true): void {
 		this._templateMerges.push([this._snippets[0]._nestingLevel, this._snippets[0]._placeholderGroupsIdx, template]);
-		const { edits, snippets } = SnippetSession.createEditsAndSnippets(this._editor, template, overwriteBefore, overwriteAfter, true);
+		const { edits, snippets } = SnippetSession.createEditsAndSnippets(this._editor, template, overwriteBefore, overwriteAfter, true, adjustWhitespace);
 
 		this._editor.setSelections(this._editor.getModel().pushEditOperations(this._editor.getSelections(), edits, undoEdits => {
 
diff --git a/src/vs/editor/contrib/snippet/test/snippetParser.test.ts b/src/vs/editor/contrib/snippet/test/snippetParser.test.ts
index 20d5d3c96af..301c9dd1b81 100644
--- a/src/vs/editor/contrib/snippet/test/snippetParser.test.ts
+++ b/src/vs/editor/contrib/snippet/test/snippetParser.test.ts
@@ -240,6 +240,20 @@ suite('SnippetParser', () => {
 
 	});
 
+	test('Parser, placeholder transforms', function () {
+		assertTextAndMarker('${1///}', '', Placeholder);
+		assertTextAndMarker('${1/regex/format/gmi}', '', Placeholder);
+		assertTextAndMarker('${1/([A-Z][a-z])/format/}', '', Placeholder);
+
+		// tricky regex
+		assertTextAndMarker('${1/m\\/atch/$1/i}', '', Placeholder);
+		assertMarker('${1/regex\/format/options}', Text);
+
+		// incomplete
+		assertTextAndMarker('${1///', '${1///', Text);
+		assertTextAndMarker('${1/regex/format/options', '${1/regex/format/options', Text);
+	});
+
 	test('No way to escape forward slash in snippet regex #36715', function () {
 		assertMarker('${TM_DIRECTORY/src\\//$1/}', Variable);
 	});
@@ -378,6 +392,41 @@ suite('SnippetParser', () => {
 		assert.ok(marker[0] instanceof Variable);
 	});
 
+	test('Parser, transform example', () => {
+		let { children } = new SnippetParser().parse('${1:name} : ${2:type}${3/\\s:=(.*)/${1:+ :=}${1}/};\n$0');
+
+		//${1:name}
+		assert.ok(children[0] instanceof Placeholder);
+		assert.equal(children[0].children.length, 1);
+		assert.equal(children[0].children[0].toString(), 'name');
+		assert.equal((<Placeholder>children[0]).transform, undefined);
+
+		// :
+		assert.ok(children[1] instanceof Text);
+		assert.equal(children[1].toString(), ' : ');
+
+		//${2:type}
+		assert.ok(children[2] instanceof Placeholder);
+		assert.equal(children[2].children.length, 1);
+		assert.equal(children[2].children[0].toString(), 'type');
+
+		//${3/\\s:=(.*)/${1:+ :=}${1}/}
+		assert.ok(children[3] instanceof Placeholder);
+		assert.equal(children[3].children.length, 0);
+		assert.notEqual((<Placeholder>children[3]).transform, undefined);
+		let transform = (<Placeholder>children[3]).transform;
+		assert.equal(transform.regexp, '/\\s:=(.*)/');
+		assert.equal(transform.children.length, 2);
+		assert.ok(transform.children[0] instanceof FormatString);
+		assert.equal((<FormatString>transform.children[0]).index, 1);
+		assert.equal((<FormatString>transform.children[0]).ifValue, ' :=');
+		assert.ok(transform.children[1] instanceof FormatString);
+		assert.equal((<FormatString>transform.children[1]).index, 1);
+		assert.ok(children[4] instanceof Text);
+		assert.equal(children[4].toString(), ';\n');
+
+	});
+
 	test('Parser, default placeholder values', () => {
 
 		assertMarker('errorContext: `${1:err}`, error: $1', Text, Placeholder, Text, Placeholder);
@@ -393,6 +442,23 @@ suite('SnippetParser', () => {
 		assert.equal((<Text>(<Placeholder>p2).children[0]), 'err');
 	});
 
+	test('Parser, default placeholder values and one transform', () => {
+
+		assertMarker('errorContext: `${1:err}`, error: ${1/err/ok/}', Text, Placeholder, Text, Placeholder);
+
+		const [, p3, , p4] = new SnippetParser().parse('errorContext: `${1:err}`, error:${1/err/ok/}').children;
+
+		assert.equal((<Placeholder>p3).index, '1');
+		assert.equal((<Placeholder>p3).children.length, '1');
+		assert.equal((<Text>(<Placeholder>p3).children[0]), 'err');
+		assert.equal((<Placeholder>p3).transform, undefined);
+
+		assert.equal((<Placeholder>p4).index, '1');
+		assert.equal((<Placeholder>p4).children.length, '1');
+		assert.equal((<Text>(<Placeholder>p4).children[0]), 'err');
+		assert.notEqual((<Placeholder>p4).transform, undefined);
+	});
+
 	test('Repeated snippet placeholder should always inherit, #31040', function () {
 		assertText('${1:foo}-abc-$1', 'foo-abc-foo');
 		assertText('${1:foo}-abc-${1}', 'foo-abc-foo');
@@ -630,4 +696,20 @@ suite('SnippetParser', () => {
 		const snippet = new SnippetParser().parse('${TM_DIRECTORY/.*src[\\/](.*)/$1/}');
 		assertMarker(snippet, Variable);
 	});
+
+	test('Variable transformation doesn\'t work if undefined variables are used in the same snippet #51769', function () {
+		let transform = new Transform();
+		transform.appendChild(new Text('bar'));
+		transform.regexp = new RegExp('foo', 'gi');
+		assert.equal(transform.toTextmateString(), '/foo/bar/ig');
+	});
+
+	test('Snippet parser freeze #53144', function () {
+		let snippet = new SnippetParser().parse('${1/(void$)|(.+)/${1:?-\treturn nil;}/}');
+		assertMarker(snippet, Placeholder);
+	});
+
+	test('snippets variable not resolved in JSON proposal #52931', function () {
+		assertTextAndMarker('FOO${1:/bin/bash}', 'FOO/bin/bash', Text, Placeholder);
+	});
 });
diff --git a/src/vs/editor/contrib/snippet/test/snippetSession.test.ts b/src/vs/editor/contrib/snippet/test/snippetSession.test.ts
index 6c9ea6728db..361e3d57009 100644
--- a/src/vs/editor/contrib/snippet/test/snippetSession.test.ts
+++ b/src/vs/editor/contrib/snippet/test/snippetSession.test.ts
@@ -5,13 +5,14 @@
 'use strict';
 
 import * as assert from 'assert';
-import { Selection } from 'vs/editor/common/core/selection';
-import { Range } from 'vs/editor/common/core/range';
+import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
 import { IPosition, Position } from 'vs/editor/common/core/position';
+import { Range } from 'vs/editor/common/core/range';
+import { Selection } from 'vs/editor/common/core/selection';
+import { TextModel } from 'vs/editor/common/model/textModel';
+import { SnippetParser } from 'vs/editor/contrib/snippet/snippetParser';
 import { SnippetSession } from 'vs/editor/contrib/snippet/snippetSession';
 import { createTestCodeEditor } from 'vs/editor/test/browser/testCodeEditor';
-import { TextModel } from 'vs/editor/common/model/textModel';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
 
 suite('SnippetSession', function () {
 
@@ -41,8 +42,9 @@ suite('SnippetSession', function () {
 	test('normalize whitespace', function () {
 
 		function assertNormalized(position: IPosition, input: string, expected: string): void {
-			const actual = SnippetSession.adjustWhitespace(model, position, input);
-			assert.equal(actual, expected);
+			const snippet = new SnippetParser().parse(input);
+			SnippetSession.adjustWhitespace(model, position, snippet);
+			assert.equal(snippet.toTextmateString(), expected);
 		}
 
 		assertNormalized(new Position(1, 1), 'foo', 'foo');
@@ -51,6 +53,9 @@ suite('SnippetSession', function () {
 		assertNormalized(new Position(2, 5), 'foo\r\tbar', 'foo\n        bar');
 		assertNormalized(new Position(2, 3), 'foo\r\tbar', 'foo\n      bar');
 		assertNormalized(new Position(2, 5), 'foo\r\tbar\nfoo', 'foo\n        bar\n    foo');
+
+		//Indentation issue with choice elements that span multiple lines #46266
+		assertNormalized(new Position(2, 5), 'a\nb${1|foo,\nbar|}', 'a\n    b${1|foo,\nbar|}');
 	});
 
 	test('adjust selection (overwrite[Before|After])', function () {
@@ -120,6 +125,14 @@ suite('SnippetSession', function () {
 		assertSelections(editor, new Selection(3, 1, 3, 1), new Selection(6, 5, 6, 5));
 	});
 
+	test('snippets, newline NO whitespace adjust', () => {
+
+		editor.setSelection(new Selection(2, 5, 2, 5));
+		const session = new SnippetSession(editor, 'abc\n    foo\n        bar\n$0', 0, 0, false);
+		session.insert();
+		assert.equal(editor.getModel().getValue(), 'function foo() {\n    abc\n    foo\n        bar\nconsole.log(a);\n}');
+	});
+
 	test('snippets, selections -> next/prev', () => {
 
 		const session = new SnippetSession(editor, 'f$1oo${2:bar}foo$0');
@@ -434,6 +447,121 @@ suite('SnippetSession', function () {
 		assertSelections(editor, new Selection(1, 6, 1, 25));
 	});
 
+	test('snippets, transform', function () {
+		editor.getModel().setValue('');
+		editor.setSelection(new Selection(1, 1, 1, 1));
+		const session = new SnippetSession(editor, '${1/foo/bar/}$0');
+		session.insert();
+		assertSelections(editor, new Selection(1, 1, 1, 1));
+
+		editor.trigger('test', 'type', { text: 'foo' });
+		session.next();
+
+		assert.equal(model.getValue(), 'bar');
+		assert.equal(session.isAtLastPlaceholder, true);
+		assertSelections(editor, new Selection(1, 4, 1, 4));
+	});
+
+	test('snippets, multi placeholder same index one transform', function () {
+		editor.getModel().setValue('');
+		editor.setSelection(new Selection(1, 1, 1, 1));
+		const session = new SnippetSession(editor, '$1 baz ${1/foo/bar/}$0');
+		session.insert();
+		assertSelections(editor, new Selection(1, 1, 1, 1), new Selection(1, 6, 1, 6));
+
+		editor.trigger('test', 'type', { text: 'foo' });
+		session.next();
+
+		assert.equal(model.getValue(), 'foo baz bar');
+		assert.equal(session.isAtLastPlaceholder, true);
+		assertSelections(editor, new Selection(1, 12, 1, 12));
+	});
+
+	test('snippets, transform example', function () {
+		editor.getModel().setValue('');
+		editor.setSelection(new Selection(1, 1, 1, 1));
+		const session = new SnippetSession(editor, '${1:name} : ${2:type}${3/\\s:=(.*)/${1:+ :=}${1}/};\n$0');
+		session.insert();
+
+		assertSelections(editor, new Selection(1, 1, 1, 5));
+		editor.trigger('test', 'type', { text: 'clk' });
+		session.next();
+
+		assertSelections(editor, new Selection(1, 7, 1, 11));
+		editor.trigger('test', 'type', { text: 'std_logic' });
+		session.next();
+
+		assertSelections(editor, new Selection(1, 16, 1, 16));
+		session.next();
+
+		assert.equal(model.getValue(), 'clk : std_logic;\n');
+		assert.equal(session.isAtLastPlaceholder, true);
+		assertSelections(editor, new Selection(2, 1, 2, 1));
+	});
+
+	test('snippets, transform with indent', function () {
+		const snippet = [
+			'private readonly ${1} = new Emitter<$2>();',
+			'readonly ${1/^_(.*)/$1/}: Event<$2> = this.$1.event;',
+			'$0'
+		].join('\n');
+		const expected = [
+			'{',
+			'\tprivate readonly _prop = new Emitter<string>();',
+			'\treadonly prop: Event<string> = this._prop.event;',
+			'\t',
+			'}'
+		].join('\n');
+		const base = [
+			'{',
+			'\t',
+			'}'
+		].join('\n');
+
+		editor.getModel().setValue(base);
+		editor.getModel().updateOptions({ insertSpaces: false });
+		editor.setSelection(new Selection(2, 2, 2, 2));
+
+		const session = new SnippetSession(editor, snippet);
+		session.insert();
+
+		assertSelections(editor, new Selection(2, 19, 2, 19), new Selection(3, 11, 3, 11), new Selection(3, 28, 3, 28));
+		editor.trigger('test', 'type', { text: '_prop' });
+		session.next();
+
+		assertSelections(editor, new Selection(2, 39, 2, 39), new Selection(3, 23, 3, 23));
+		editor.trigger('test', 'type', { text: 'string' });
+		session.next();
+
+		assert.equal(model.getValue(), expected);
+		assert.equal(session.isAtLastPlaceholder, true);
+		assertSelections(editor, new Selection(4, 2, 4, 2));
+
+	});
+
+	test('snippets, transform example hit if', function () {
+		editor.getModel().setValue('');
+		editor.setSelection(new Selection(1, 1, 1, 1));
+		const session = new SnippetSession(editor, '${1:name} : ${2:type}${3/\\s:=(.*)/${1:+ :=}${1}/};\n$0');
+		session.insert();
+
+		assertSelections(editor, new Selection(1, 1, 1, 5));
+		editor.trigger('test', 'type', { text: 'clk' });
+		session.next();
+
+		assertSelections(editor, new Selection(1, 7, 1, 11));
+		editor.trigger('test', 'type', { text: 'std_logic' });
+		session.next();
+
+		assertSelections(editor, new Selection(1, 16, 1, 16));
+		editor.trigger('test', 'type', { text: ' := \'1\'' });
+		session.next();
+
+		assert.equal(model.getValue(), 'clk : std_logic := \'1\';\n');
+		assert.equal(session.isAtLastPlaceholder, true);
+		assertSelections(editor, new Selection(2, 1, 2, 1));
+	});
+
 	test('Snippet placeholder index incorrect after using 2+ snippets in a row that each end with a placeholder, #30769', function () {
 		editor.getModel().setValue('');
 		editor.setSelection(new Selection(1, 1, 1, 1));
diff --git a/src/vs/editor/contrib/snippet/test/snippetVariables.test.ts b/src/vs/editor/contrib/snippet/test/snippetVariables.test.ts
index 80cb27ce5ad..77715fd2e6d 100644
--- a/src/vs/editor/contrib/snippet/test/snippetVariables.test.ts
+++ b/src/vs/editor/contrib/snippet/test/snippetVariables.test.ts
@@ -6,7 +6,7 @@
 
 import * as assert from 'assert';
 import { isWindows } from 'vs/base/common/platform';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { Selection } from 'vs/editor/common/core/selection';
 import { SelectionBasedVariableResolver, CompositeSnippetVariableResolver, ModelBasedVariableResolver, ClipboardBasedVariableResolver, TimeBasedVariableResolver } from 'vs/editor/contrib/snippet/snippetVariables';
 import { SnippetParser, Variable, VariableResolver } from 'vs/editor/contrib/snippet/snippetParser';
diff --git a/src/vs/editor/contrib/suggest/completionModel.ts b/src/vs/editor/contrib/suggest/completionModel.ts
index 255750fe219..06208d010d0 100644
--- a/src/vs/editor/contrib/suggest/completionModel.ts
+++ b/src/vs/editor/contrib/suggest/completionModel.ts
@@ -8,7 +8,8 @@
 import { fuzzyScore, fuzzyScoreGracefulAggressive, anyScore } from 'vs/base/common/filters';
 import { isDisposable } from 'vs/base/common/lifecycle';
 import { ISuggestResult, ISuggestSupport } from 'vs/editor/common/modes';
-import { ISuggestionItem, SnippetConfig } from './suggest';
+import { ISuggestionItem } from './suggest';
+import { InternalSuggestOptions, EDITOR_DEFAULTS } from 'vs/editor/common/config/editorOptions';
 
 export interface ICompletionItem extends ISuggestionItem {
 	matches?: number[];
@@ -46,8 +47,9 @@ const enum Refilter {
 
 export class CompletionModel {
 
-	private readonly _column: number;
 	private readonly _items: ICompletionItem[];
+	private readonly _column: number;
+	private readonly _options: InternalSuggestOptions;
 	private readonly _snippetCompareFn = CompletionModel._compareCompletionItems;
 
 	private _lineContext: LineContext;
@@ -56,15 +58,16 @@ export class CompletionModel {
 	private _isIncomplete: Set<ISuggestSupport>;
 	private _stats: ICompletionStats;
 
-	constructor(items: ISuggestionItem[], column: number, lineContext: LineContext, snippetConfig?: SnippetConfig) {
+	constructor(items: ISuggestionItem[], column: number, lineContext: LineContext, options: InternalSuggestOptions = EDITOR_DEFAULTS.contribInfo.suggest) {
 		this._items = items;
 		this._column = column;
+		this._options = options;
 		this._refilterKind = Refilter.All;
 		this._lineContext = lineContext;
 
-		if (snippetConfig === 'top') {
+		if (options.snippets === 'top') {
 			this._snippetCompareFn = CompletionModel._compareCompletionItemsSnippetsUp;
-		} else if (snippetConfig === 'bottom') {
+		} else if (options.snippets === 'bottom') {
 			this._snippetCompareFn = CompletionModel._compareCompletionItemsSnippetsDown;
 		}
 	}
@@ -146,8 +149,9 @@ export class CompletionModel {
 		const target: typeof source = [];
 
 		// picks a score function based on the number of
-		// items that we have to score/filter
-		const scoreFn = source.length > 2000 ? fuzzyScore : fuzzyScoreGracefulAggressive;
+		// items that we have to score/filter and based on the
+		// user-configuration
+		const scoreFn = (!this._options.filterGraceful || source.length > 2000) ? fuzzyScore : fuzzyScoreGracefulAggressive;
 
 		for (let i = 0; i < source.length; i++) {
 
diff --git a/src/vs/editor/contrib/suggest/suggest.ts b/src/vs/editor/contrib/suggest/suggest.ts
index 8136074bc0f..0df5abe1e5e 100644
--- a/src/vs/editor/contrib/suggest/suggest.ts
+++ b/src/vs/editor/contrib/suggest/suggest.ts
@@ -2,14 +2,12 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-'use strict';
 
-import { sequence, asWinJsPromise } from 'vs/base/common/async';
+import { first2 } from 'vs/base/common/async';
 import { isFalsyOrEmpty } from 'vs/base/common/arrays';
 import { compareIgnoreCase } from 'vs/base/common/strings';
 import { assign } from 'vs/base/common/objects';
 import { onUnexpectedExternalError } from 'vs/base/common/errors';
-import { TPromise } from 'vs/base/common/winjs.base';
 import { IEditorContribution } from 'vs/editor/common/editorCommon';
 import { ITextModel } from 'vs/editor/common/model';
 import { registerDefaultLanguageCommand } from 'vs/editor/browser/editorExtensions';
@@ -17,6 +15,7 @@ import { ISuggestResult, ISuggestSupport, ISuggestion, SuggestRegistry, SuggestC
 import { Position, IPosition } from 'vs/editor/common/core/position';
 import { RawContextKey } from 'vs/platform/contextkey/common/contextkey';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
+import { CancellationToken } from 'vs/base/common/cancellation';
 
 export const Context = {
 	Visible: new RawContextKey<boolean>('suggestWidgetVisible', false),
@@ -31,20 +30,31 @@ export interface ISuggestionItem {
 	suggestion: ISuggestion;
 	container: ISuggestResult;
 	support: ISuggestSupport;
-	resolve(): TPromise<void>;
+	resolve(token: CancellationToken): Thenable<void>;
 }
 
 export type SnippetConfig = 'top' | 'bottom' | 'inline' | 'none';
 
 let _snippetSuggestSupport: ISuggestSupport;
 
+export function getSnippetSuggestSupport(): ISuggestSupport {
+	return _snippetSuggestSupport;
+}
+
 export function setSnippetSuggestSupport(support: ISuggestSupport): ISuggestSupport {
 	const old = _snippetSuggestSupport;
 	_snippetSuggestSupport = support;
 	return old;
 }
 
-export function provideSuggestionItems(model: ITextModel, position: Position, snippetConfig: SnippetConfig = 'bottom', onlyFrom?: ISuggestSupport[], context?: SuggestContext): TPromise<ISuggestionItem[]> {
+export function provideSuggestionItems(
+	model: ITextModel,
+	position: Position,
+	snippetConfig: SnippetConfig = 'bottom',
+	onlyFrom?: ISuggestSupport[],
+	context?: SuggestContext,
+	token: CancellationToken = CancellationToken.None
+): Promise<ISuggestionItem[]> {
 
 	const allSuggestions: ISuggestionItem[] = [];
 	const acceptSuggestion = createSuggesionFilter(snippetConfig);
@@ -64,50 +74,44 @@ export function provideSuggestionItems(model: ITextModel, position: Position, sn
 	// add suggestions from contributed providers - providers are ordered in groups of
 	// equal score and once a group produces a result the process stops
 	let hasResult = false;
-	const factory = supports.map(supports => {
-		return () => {
-			// stop when we have a result
-			if (hasResult) {
+	const factory = supports.map(supports => () => {
+		// for each support in the group ask for suggestions
+		return Promise.all(supports.map(support => {
+
+			if (!isFalsyOrEmpty(onlyFrom) && onlyFrom.indexOf(support) < 0) {
 				return undefined;
 			}
-			// for each support in the group ask for suggestions
-			return TPromise.join(supports.map(support => {
 
-				if (!isFalsyOrEmpty(onlyFrom) && onlyFrom.indexOf(support) < 0) {
-					return undefined;
-				}
+			return Promise.resolve(support.provideCompletionItems(model, position, suggestConext, token)).then(container => {
 
-				return asWinJsPromise(token => support.provideCompletionItems(model, position, suggestConext, token)).then(container => {
+				const len = allSuggestions.length;
 
-					const len = allSuggestions.length;
+				if (container && !isFalsyOrEmpty(container.suggestions)) {
+					for (let suggestion of container.suggestions) {
+						if (acceptSuggestion(suggestion)) {
 
-					if (container && !isFalsyOrEmpty(container.suggestions)) {
-						for (let suggestion of container.suggestions) {
-							if (acceptSuggestion(suggestion)) {
+							fixOverwriteBeforeAfter(suggestion, container);
 
-								fixOverwriteBeforeAfter(suggestion, container);
-
-								allSuggestions.push({
-									position,
-									container,
-									suggestion,
-									support,
-									resolve: createSuggestionResolver(support, suggestion, model, position)
-								});
-							}
+							allSuggestions.push({
+								position,
+								container,
+								suggestion,
+								support,
+								resolve: createSuggestionResolver(support, suggestion, model, position)
+							});
 						}
 					}
+				}
 
-					if (len !== allSuggestions.length && support !== _snippetSuggestSupport) {
-						hasResult = true;
-					}
+				if (len !== allSuggestions.length && support !== _snippetSuggestSupport) {
+					hasResult = true;
+				}
 
-				}, onUnexpectedExternalError);
-			}));
-		};
+			}, onUnexpectedExternalError);
+		}));
 	});
 
-	const result = sequence(factory).then(() => allSuggestions.sort(getSuggestionComparator(snippetConfig)));
+	const result = first2(factory, () => hasResult).then(() => allSuggestions.sort(getSuggestionComparator(snippetConfig)));
 
 	// result.then(items => {
 	// 	console.log(model.getWordUntilPosition(position), items.map(item => `${item.suggestion.label}, type=${item.suggestion.type}, incomplete?${item.container.incomplete}, overwriteBefore=${item.suggestion.overwriteBefore}`));
@@ -128,13 +132,13 @@ function fixOverwriteBeforeAfter(suggestion: ISuggestion, container: ISuggestRes
 	}
 }
 
-function createSuggestionResolver(provider: ISuggestSupport, suggestion: ISuggestion, model: ITextModel, position: Position): () => TPromise<void> {
-	return () => {
+function createSuggestionResolver(provider: ISuggestSupport, suggestion: ISuggestion, model: ITextModel, position: Position): (token: CancellationToken) => Promise<void> {
+	return (token) => {
 		if (typeof provider.resolveCompletionItem === 'function') {
-			return asWinJsPromise(token => provider.resolveCompletionItem(model, position, suggestion, token))
-				.then(value => { assign(suggestion, value); });
+			return Promise.resolve(provider.resolveCompletionItem(model, position, suggestion, token)).then(value => { assign(suggestion, value); });
+		} else {
+			return Promise.resolve(void 0);
 		}
-		return TPromise.as(void 0);
 	};
 }
 
@@ -216,13 +220,13 @@ registerDefaultLanguageCommand('_executeCompletionItemProvider', (model, positio
 	return provideSuggestionItems(model, position).then(items => {
 		for (const item of items) {
 			if (resolving.length < maxItemsToResolve) {
-				resolving.push(item.resolve());
+				resolving.push(item.resolve(CancellationToken.None));
 			}
 			result.incomplete = result.incomplete || item.container.incomplete;
 			result.suggestions.push(item.suggestion);
 		}
 	}).then(() => {
-		return TPromise.join(resolving);
+		return Promise.all(resolving);
 	}).then(() => {
 		return result;
 	});
@@ -232,10 +236,16 @@ interface SuggestController extends IEditorContribution {
 	triggerSuggest(onlyFrom?: ISuggestSupport[]): void;
 }
 
-let _suggestions: ISuggestion[];
+
 let _provider = new class implements ISuggestSupport {
+
+	onlyOnceSuggestions: ISuggestion[] = [];
+
 	provideCompletionItems(): ISuggestResult {
-		return _suggestions && { suggestions: _suggestions };
+		let suggestions = this.onlyOnceSuggestions.slice(0);
+		let result = { suggestions };
+		this.onlyOnceSuggestions.length = 0;
+		return result;
 	}
 };
 
@@ -243,8 +253,7 @@ SuggestRegistry.register('*', _provider);
 
 export function showSimpleSuggestions(editor: ICodeEditor, suggestions: ISuggestion[]) {
 	setTimeout(() => {
-		_suggestions = suggestions;
+		_provider.onlyOnceSuggestions.push(...suggestions);
 		editor.getContribution<SuggestController>('editor.contrib.suggestController').triggerSuggest([_provider]);
-		_suggestions = undefined;
 	}, 0);
 }
diff --git a/src/vs/editor/contrib/suggest/suggestController.ts b/src/vs/editor/contrib/suggest/suggestController.ts
index 1d1cf7b049c..f73149757ec 100644
--- a/src/vs/editor/contrib/suggest/suggestController.ts
+++ b/src/vs/editor/contrib/suggest/suggestController.ts
@@ -4,30 +4,30 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import * as nls from 'vs/nls';
-import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { onUnexpectedError } from 'vs/base/common/errors';
-import { isFalsyOrEmpty } from 'vs/base/common/arrays';
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ContextKeyExpr, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { IEditorContribution, ScrollType } from 'vs/editor/common/editorCommon';
-import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
-import { registerEditorAction, registerEditorContribution, ServicesAccessor, EditorAction, EditorCommand, registerEditorCommand } from 'vs/editor/browser/editorExtensions';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
 import { alert } from 'vs/base/browser/ui/aria/aria';
+import { isFalsyOrEmpty } from 'vs/base/common/arrays';
+import { onUnexpectedError } from 'vs/base/common/errors';
+import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
+import { dispose, IDisposable } from 'vs/base/common/lifecycle';
+import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
+import { EditorAction, EditorCommand, registerEditorAction, registerEditorCommand, registerEditorContribution, ServicesAccessor } from 'vs/editor/browser/editorExtensions';
 import { EditOperation } from 'vs/editor/common/core/editOperation';
 import { Range } from 'vs/editor/common/core/range';
+import { IEditorContribution, ScrollType } from 'vs/editor/common/editorCommon';
+import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
 import { ISuggestSupport } from 'vs/editor/common/modes';
-import { SnippetParser } from 'vs/editor/contrib/snippet/snippetParser';
 import { SnippetController2 } from 'vs/editor/contrib/snippet/snippetController2';
-import { Context as SuggestContext } from './suggest';
-import { SuggestModel, State } from './suggestModel';
-import { ICompletionItem } from './completionModel';
-import { SuggestWidget, ISelectedSuggestion } from './suggestWidget';
-import { KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRegistry';
+import { SnippetParser } from 'vs/editor/contrib/snippet/snippetParser';
 import { SuggestMemories } from 'vs/editor/contrib/suggest/suggestMemory';
+import * as nls from 'vs/nls';
+import { ICommandService } from 'vs/platform/commands/common/commands';
+import { ContextKeyExpr, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
+import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
+import { ICompletionItem } from './completionModel';
+import { Context as SuggestContext } from './suggest';
+import { State, SuggestModel } from './suggestModel';
+import { ISelectedSuggestion, SuggestWidget } from './suggestWidget';
 
 class AcceptOnCharacterOracle {
 
@@ -88,6 +88,8 @@ export class SuggestController implements IEditorContribution {
 	private _memory: SuggestMemories;
 	private _toDispose: IDisposable[] = [];
 
+	private readonly _sticky = false; // for development purposes only
+
 	constructor(
 		private _editor: ICodeEditor,
 		@ICommandService private readonly _commandService: ICommandService,
@@ -112,6 +114,11 @@ export class SuggestController implements IEditorContribution {
 				this._widget.hideWidget();
 			}
 		}));
+		this._toDispose.push(this._editor.onDidBlurEditorText(() => {
+			if (!this._sticky) {
+				this._model.cancel();
+			}
+		}));
 
 		// Manage the acceptSuggestionsOnEnter context key
 		let acceptSuggestionsOnEnter = SuggestContext.AcceptSuggestionsOnEnter.bindTo(_contextKeyService);
@@ -196,10 +203,12 @@ export class SuggestController implements IEditorContribution {
 		const editorColumn = this._editor.getPosition().column;
 		const columnDelta = editorColumn - position.column;
 
+		// pushing undo stops *before* additional text edits and
+		// *after* the main edit
+		this._editor.pushUndoStop();
+
 		if (Array.isArray(suggestion.additionalTextEdits)) {
-			this._editor.pushUndoStop();
 			this._editor.executeEdits('suggestController.additionalTextEdits', suggestion.additionalTextEdits.map(edit => EditOperation.replace(Range.lift(edit.range), edit.text)));
-			this._editor.pushUndoStop();
 		}
 
 		// keep item in memory
@@ -213,9 +222,13 @@ export class SuggestController implements IEditorContribution {
 		SnippetController2.get(this._editor).insert(
 			insertText,
 			suggestion.overwriteBefore + columnDelta,
-			suggestion.overwriteAfter
+			suggestion.overwriteAfter,
+			false, false,
+			!suggestion.noWhitespaceAdjust
 		);
 
+		this._editor.pushUndoStop();
+
 		if (!suggestion.command) {
 			// done
 			this._model.cancel();
@@ -226,7 +239,7 @@ export class SuggestController implements IEditorContribution {
 
 		} else {
 			// exec command, done
-			this._commandService.executeCommand(suggestion.command.id, ...suggestion.command.arguments).done(undefined, onUnexpectedError);
+			this._commandService.executeCommand(suggestion.command.id, ...suggestion.command.arguments).then(undefined, onUnexpectedError);
 			this._model.cancel();
 		}
 
@@ -320,7 +333,8 @@ export class TriggerSuggestAction extends EditorAction {
 			kbOpts: {
 				kbExpr: EditorContextKeys.textInputFocus,
 				primary: KeyMod.CtrlCmd | KeyCode.Space,
-				mac: { primary: KeyMod.WinCtrl | KeyCode.Space }
+				mac: { primary: KeyMod.WinCtrl | KeyCode.Space },
+				weight: KeybindingWeight.EditorContrib
 			}
 		});
 	}
@@ -339,7 +353,7 @@ export class TriggerSuggestAction extends EditorAction {
 registerEditorContribution(SuggestController);
 registerEditorAction(TriggerSuggestAction);
 
-const weight = KeybindingsRegistry.WEIGHT.editorContrib(90);
+const weight = KeybindingWeight.EditorContrib + 90;
 
 const SuggestCommand = EditorCommand.bindToContribution<SuggestController>(SuggestController.get);
 
@@ -350,7 +364,7 @@ registerEditorCommand(new SuggestCommand({
 	handler: x => x.acceptSelectedSuggestion(),
 	kbOpts: {
 		weight: weight,
-		kbExpr: ContextKeyExpr.and(EditorContextKeys.textInputFocus, SnippetController2.InSnippetMode.toNegated()),
+		kbExpr: EditorContextKeys.textInputFocus,
 		primary: KeyCode.Tab
 	}
 }));
diff --git a/src/vs/editor/contrib/suggest/suggestMemory.ts b/src/vs/editor/contrib/suggest/suggestMemory.ts
index 29c6afc906d..e278a619c96 100644
--- a/src/vs/editor/contrib/suggest/suggestMemory.ts
+++ b/src/vs/editor/contrib/suggest/suggestMemory.ts
@@ -13,9 +13,26 @@ import { RunOnceScheduler } from 'vs/base/common/async';
 
 export abstract class Memory {
 
-	abstract memorize(model: ITextModel, pos: IPosition, item: ICompletionItem): void;
+	select(model: ITextModel, pos: IPosition, items: ICompletionItem[]): number {
+		if (items.length === 0) {
+			return 0;
+		}
+		let topScore = items[0].score;
+		for (let i = 1; i < items.length; i++) {
+			const { score, suggestion } = items[i];
+			if (score !== topScore) {
+				// stop when leaving the group of top matches
+				break;
+			}
+			if (suggestion.preselect) {
+				// stop when seeing an auto-select-item
+				return i;
+			}
+		}
+		return 0;
+	}
 
-	abstract select(model: ITextModel, pos: IPosition, items: ICompletionItem[]): number;
+	abstract memorize(model: ITextModel, pos: IPosition, item: ICompletionItem): void;
 
 	abstract toJSON(): object;
 
@@ -28,10 +45,6 @@ export class NoMemory extends Memory {
 		// no-op
 	}
 
-	select(model: ITextModel, pos: IPosition, items: ICompletionItem[]): number {
-		return 0;
-	}
-
 	toJSON() {
 		return undefined;
 	}
@@ -67,15 +80,15 @@ export class LRUMemory extends Memory {
 		// that has been used in the past
 		let { word } = model.getWordUntilPosition(pos);
 		if (word.length !== 0) {
-			return 0;
+			return super.select(model, pos, items);
 		}
 
 		let lineSuffix = model.getLineContent(pos.lineNumber).substr(pos.column - 10, pos.column - 1);
 		if (/\s$/.test(lineSuffix)) {
-			return 0;
+			return super.select(model, pos, items);
 		}
 
-		let res = 0;
+		let res = -1;
 		let seq = -1;
 		for (let i = 0; i < items.length; i++) {
 			const { suggestion } = items[i];
@@ -86,7 +99,11 @@ export class LRUMemory extends Memory {
 				res = i;
 			}
 		}
-		return res;
+		if (res === -1) {
+			return super.select(model, pos, items);
+		} else {
+			return res;
+		}
 	}
 
 	toJSON(): object {
@@ -127,7 +144,7 @@ export class PrefixMemory extends Memory {
 	select(model: ITextModel, pos: IPosition, items: ICompletionItem[]): number {
 		let { word } = model.getWordUntilPosition(pos);
 		if (!word) {
-			return 0;
+			return super.select(model, pos, items);
 		}
 		let key = `${model.getLanguageIdentifier().language}/${word}`;
 		let item = this._trie.get(key);
@@ -142,7 +159,7 @@ export class PrefixMemory extends Memory {
 				}
 			}
 		}
-		return 0;
+		return super.select(model, pos, items);
 	}
 
 	toJSON(): object {
diff --git a/src/vs/editor/contrib/suggest/suggestModel.ts b/src/vs/editor/contrib/suggest/suggestModel.ts
index 417451c9a35..cceda3b6cfd 100644
--- a/src/vs/editor/contrib/suggest/suggestModel.ts
+++ b/src/vs/editor/contrib/suggest/suggestModel.ts
@@ -5,12 +5,11 @@
 'use strict';
 
 import { isFalsyOrEmpty } from 'vs/base/common/arrays';
-import { TimeoutTimer } from 'vs/base/common/async';
+import { TimeoutTimer, CancelablePromise, createCancelablePromise } from 'vs/base/common/async';
 import { onUnexpectedError } from 'vs/base/common/errors';
 import { Emitter, Event } from 'vs/base/common/event';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { values } from 'vs/base/common/map';
-import { TPromise } from 'vs/base/common/winjs.base';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
 import { CursorChangeReason, ICursorSelectionChangedEvent } from 'vs/editor/common/controller/cursorEvents';
 import { Position } from 'vs/editor/common/core/position';
@@ -18,7 +17,8 @@ import { Selection } from 'vs/editor/common/core/selection';
 import { ITextModel, IWordAtPosition } from 'vs/editor/common/model';
 import { ISuggestSupport, StandardTokenType, SuggestContext, SuggestRegistry, SuggestTriggerKind } from 'vs/editor/common/modes';
 import { CompletionModel } from './completionModel';
-import { ISuggestionItem, getSuggestionComparator, provideSuggestionItems } from './suggest';
+import { ISuggestionItem, getSuggestionComparator, provideSuggestionItems, getSnippetSuggestSupport } from './suggest';
+import { SnippetController2 } from 'vs/editor/contrib/snippet/snippetController2';
 
 export interface ICancelEvent {
 	readonly retrigger: boolean;
@@ -89,11 +89,11 @@ export class SuggestModel implements IDisposable {
 	private _toDispose: IDisposable[] = [];
 	private _quickSuggestDelay: number;
 	private _triggerCharacterListener: IDisposable;
-	private _triggerAutoSuggestPromise: TPromise<void>;
-	private _triggerRefilter = new TimeoutTimer();
+	private readonly _triggerQuickSuggest = new TimeoutTimer();
+	private readonly _triggerRefilter = new TimeoutTimer();
 	private _state: State;
 
-	private _requestPromise: TPromise<void>;
+	private _requestPromise: CancelablePromise<ISuggestionItem[]>;
 	private _context: LineContext;
 	private _currentSelection: Selection;
 
@@ -109,7 +109,6 @@ export class SuggestModel implements IDisposable {
 	constructor(editor: ICodeEditor) {
 		this._editor = editor;
 		this._state = State.Idle;
-		this._triggerAutoSuggestPromise = null;
 		this._requestPromise = null;
 		this._completionModel = null;
 		this._context = null;
@@ -135,16 +134,31 @@ export class SuggestModel implements IDisposable {
 		this._toDispose.push(this._editor.onDidChangeCursorSelection(e => {
 			this._onCursorChange(e);
 		}));
-		this._toDispose.push(this._editor.onDidChangeModelContent(e => {
+
+		let editorIsComposing = false;
+		this._toDispose.push(this._editor.onCompositionStart(() => {
+			editorIsComposing = true;
+		}));
+		this._toDispose.push(this._editor.onCompositionEnd(() => {
+			// refilter when composition ends
+			editorIsComposing = false;
 			this._refilterCompletionItems();
 		}));
+		this._toDispose.push(this._editor.onDidChangeModelContent(() => {
+			// only filter completions when the editor isn't
+			// composing a character, e.g. ¨ + u makes ü but just
+			// ¨ cannot be used for filtering
+			if (!editorIsComposing) {
+				this._refilterCompletionItems();
+			}
+		}));
 
 		this._updateTriggerCharacters();
 		this._updateQuickSuggest();
 	}
 
 	dispose(): void {
-		dispose([this._onDidCancel, this._onDidSuggest, this._onDidTrigger, this._triggerCharacterListener, this._triggerRefilter]);
+		dispose([this._onDidCancel, this._onDidSuggest, this._onDidTrigger, this._triggerCharacterListener, this._triggerQuickSuggest, this._triggerRefilter]);
 		this._toDispose = dispose(this._toDispose);
 		dispose(this._completionModel);
 		this.cancel();
@@ -180,6 +194,7 @@ export class SuggestModel implements IDisposable {
 				let set = supportsByTriggerCharacter[ch];
 				if (!set) {
 					set = supportsByTriggerCharacter[ch] = new Set();
+					set.add(getSnippetSuggestSupport());
 				}
 				set.add(support);
 			}
@@ -208,9 +223,9 @@ export class SuggestModel implements IDisposable {
 
 		this._triggerRefilter.cancel();
 
-		if (this._triggerAutoSuggestPromise) {
-			this._triggerAutoSuggestPromise.cancel();
-			this._triggerAutoSuggestPromise = null;
+		if (this._triggerQuickSuggest) {
+			this._triggerQuickSuggest.cancel();
+
 		}
 
 		if (this._requestPromise) {
@@ -264,48 +279,58 @@ export class SuggestModel implements IDisposable {
 
 		if (this._state === State.Idle) {
 
-			// trigger 24x7 IntelliSense when idle, enabled, when cursor
-			// moved RIGHT, and when at a good position
-			if (this._editor.getConfiguration().contribInfo.quickSuggestions !== false
-				&& (prevSelection.containsRange(this._currentSelection)
-					|| prevSelection.getEndPosition().isBeforeOrEqual(this._currentSelection.getPosition()))
-			) {
-				this.cancel();
-
-				this._triggerAutoSuggestPromise = TPromise.timeout(this._quickSuggestDelay);
-				this._triggerAutoSuggestPromise.then(() => {
-					if (LineContext.shouldAutoTrigger(this._editor)) {
-						const model = this._editor.getModel();
-						const pos = this._editor.getPosition();
-
-						if (!model) {
-							return;
-						}
-						// validate enabled now
-						const { quickSuggestions } = this._editor.getConfiguration().contribInfo;
-						if (quickSuggestions === false) {
-							return;
-						} else if (quickSuggestions === true) {
-							// all good
-						} else {
-							// Check the type of the token that triggered this
-							model.tokenizeIfCheap(pos.lineNumber);
-							const lineTokens = model.getLineTokens(pos.lineNumber);
-							const tokenType = lineTokens.getStandardTokenType(lineTokens.findTokenIndexAtOffset(Math.max(pos.column - 1 - 1, 0)));
-							const inValidScope = quickSuggestions.other && tokenType === StandardTokenType.Other
-								|| quickSuggestions.comments && tokenType === StandardTokenType.Comment
-								|| quickSuggestions.strings && tokenType === StandardTokenType.String;
-
-							if (!inValidScope) {
-								return;
-							}
-						}
-
-						this.trigger({ auto: true });
-					}
-					this._triggerAutoSuggestPromise = null;
-				});
+			if (this._editor.getConfiguration().contribInfo.quickSuggestions === false) {
+				// not enabled
+				return;
 			}
+
+			if (!prevSelection.containsRange(this._currentSelection) && !prevSelection.getEndPosition().isBeforeOrEqual(this._currentSelection.getPosition())) {
+				// cursor didn't move RIGHT
+				return;
+			}
+
+			if (this._editor.getConfiguration().contribInfo.suggest.snippetsPreventQuickSuggestions && SnippetController2.get(this._editor).isInSnippet()) {
+				// no quick suggestion when in snippet mode
+				return;
+			}
+
+			this.cancel();
+
+			this._triggerQuickSuggest.cancelAndSet(() => {
+				if (!LineContext.shouldAutoTrigger(this._editor)) {
+					return;
+				}
+
+				const model = this._editor.getModel();
+				const pos = this._editor.getPosition();
+				if (!model) {
+					return;
+				}
+				// validate enabled now
+				const { quickSuggestions } = this._editor.getConfiguration().contribInfo;
+				if (quickSuggestions === false) {
+					return;
+				} else if (quickSuggestions === true) {
+					// all good
+				} else {
+					// Check the type of the token that triggered this
+					model.tokenizeIfCheap(pos.lineNumber);
+					const lineTokens = model.getLineTokens(pos.lineNumber);
+					const tokenType = lineTokens.getStandardTokenType(lineTokens.findTokenIndexAtOffset(Math.max(pos.column - 1 - 1, 0)));
+					const inValidScope = quickSuggestions.other && tokenType === StandardTokenType.Other
+						|| quickSuggestions.comments && tokenType === StandardTokenType.Comment
+						|| quickSuggestions.strings && tokenType === StandardTokenType.String;
+
+					if (!inValidScope) {
+						return;
+					}
+				}
+
+				// we made it till here -> trigger now
+				this.trigger({ auto: true });
+
+			}, this._quickSuggestDelay);
+
 		}
 	}
 
@@ -355,11 +380,16 @@ export class SuggestModel implements IDisposable {
 			suggestCtx = { triggerKind: SuggestTriggerKind.Invoke };
 		}
 
-		this._requestPromise = provideSuggestionItems(model, this._editor.getPosition(),
-			this._editor.getConfiguration().contribInfo.snippetSuggestions,
+		this._requestPromise = createCancelablePromise(token => provideSuggestionItems(
+			model,
+			this._editor.getPosition(),
+			this._editor.getConfiguration().contribInfo.suggest.snippets,
 			onlyFrom,
-			suggestCtx
-		).then(items => {
+			suggestCtx,
+			token
+		));
+
+		this._requestPromise.then(items => {
 
 			this._requestPromise = null;
 			if (this._state === State.Idle) {
@@ -371,7 +401,7 @@ export class SuggestModel implements IDisposable {
 			}
 
 			if (!isFalsyOrEmpty(existingItems)) {
-				const cmpFn = getSuggestionComparator(this._editor.getConfiguration().contribInfo.snippetSuggestions);
+				const cmpFn = getSuggestionComparator(this._editor.getConfiguration().contribInfo.suggest.snippets);
 				items = items.concat(existingItems).sort(cmpFn);
 			}
 
@@ -380,10 +410,12 @@ export class SuggestModel implements IDisposable {
 			this._completionModel = new CompletionModel(items, this._context.column, {
 				leadingLineContent: ctx.leadingLineContent,
 				characterCountDelta: this._context ? ctx.column - this._context.column : 0
-			}, this._editor.getConfiguration().contribInfo.snippetSuggestions);
+			},
+				this._editor.getConfiguration().contribInfo.suggest
+			);
 			this._onNewContext(ctx);
 
-		}).then(null, onUnexpectedError);
+		}).catch(onUnexpectedError);
 	}
 
 	private _onNewContext(ctx: LineContext): void {
diff --git a/src/vs/editor/contrib/suggest/suggestWidget.ts b/src/vs/editor/contrib/suggest/suggestWidget.ts
index 0f907cf62d9..4c86b7a6a67 100644
--- a/src/vs/editor/contrib/suggest/suggestWidget.ts
+++ b/src/vs/editor/contrib/suggest/suggestWidget.ts
@@ -10,12 +10,11 @@ import * as nls from 'vs/nls';
 import { createMatches } from 'vs/base/common/filters';
 import * as strings from 'vs/base/common/strings';
 import { Event, Emitter, chain } from 'vs/base/common/event';
-import { TPromise } from 'vs/base/common/winjs.base';
-import { isPromiseCanceledError, onUnexpectedError } from 'vs/base/common/errors';
+import { onUnexpectedError } from 'vs/base/common/errors';
 import { IDisposable, dispose, toDisposable } from 'vs/base/common/lifecycle';
 import { addClass, append, $, hide, removeClass, show, toggleClass, getDomNodePagePosition, hasClass } from 'vs/base/browser/dom';
 import { HighlightedLabel } from 'vs/base/browser/ui/highlightedlabel/highlightedLabel';
-import { IDelegate, IListEvent, IRenderer } from 'vs/base/browser/ui/list/list';
+import { IVirtualDelegate, IListEvent, IRenderer } from 'vs/base/browser/ui/list/list';
 import { List } from 'vs/base/browser/ui/list/listWidget';
 import { DomScrollableElement } from 'vs/base/browser/ui/scrollbar/scrollableElement';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
@@ -33,8 +32,9 @@ import { IStorageService, StorageScope } from 'vs/platform/storage/common/storag
 import { MarkdownRenderer } from 'vs/editor/contrib/markdown/markdownRenderer';
 import { IModeService } from 'vs/editor/common/services/modeService';
 import { IOpenerService } from 'vs/platform/opener/common/opener';
+import { TimeoutTimer, CancelablePromise, createCancelablePromise } from 'vs/base/common/async';
+import { CancellationToken } from 'vs/base/common/cancellation';
 
-const sticky = false; // for development purposes
 const expandSuggestionDocsByDefault = false;
 const maxSuggestionsToShow = 12;
 
@@ -110,10 +110,12 @@ class Renderer implements IRenderer<ICompletionItem, ISuggestionTemplateData> {
 			const fontFamily = configuration.fontInfo.fontFamily;
 			const fontSize = configuration.contribInfo.suggestFontSize || configuration.fontInfo.fontSize;
 			const lineHeight = configuration.contribInfo.suggestLineHeight || configuration.fontInfo.lineHeight;
+			const fontWeight = configuration.fontInfo.fontWeight;
 			const fontSizePx = `${fontSize}px`;
 			const lineHeightPx = `${lineHeight}px`;
 
 			data.root.style.fontSize = fontSizePx;
+			data.root.style.fontWeight = fontWeight;
 			main.style.fontFamily = fontFamily;
 			main.style.lineHeight = lineHeightPx;
 			data.icon.style.height = lineHeightPx;
@@ -172,7 +174,10 @@ class Renderer implements IRenderer<ICompletionItem, ISuggestionTemplateData> {
 			data.readMore.onmousedown = null;
 			data.readMore.onclick = null;
 		}
+	}
 
+	disposeElement(): void {
+		// noop
 	}
 
 	disposeTemplate(templateData: ISuggestionTemplateData): void {
@@ -327,10 +332,12 @@ class SuggestionDetails {
 		const fontFamily = configuration.fontInfo.fontFamily;
 		const fontSize = configuration.contribInfo.suggestFontSize || configuration.fontInfo.fontSize;
 		const lineHeight = configuration.contribInfo.suggestLineHeight || configuration.fontInfo.lineHeight;
+		const fontWeight = configuration.fontInfo.fontWeight;
 		const fontSizePx = `${fontSize}px`;
 		const lineHeightPx = `${lineHeight}px`;
 
 		this.el.style.fontSize = fontSizePx;
+		this.el.style.fontWeight = fontWeight;
 		this.type.style.fontFamily = fontFamily;
 		this.close.style.height = lineHeightPx;
 		this.close.style.width = lineHeightPx;
@@ -348,7 +355,7 @@ export interface ISelectedSuggestion {
 	model: CompletionModel;
 }
 
-export class SuggestWidget implements IContentWidget, IDelegate<ICompletionItem>, IDisposable {
+export class SuggestWidget implements IContentWidget, IVirtualDelegate<ICompletionItem>, IDisposable {
 
 	private static readonly ID: string = 'editor.widget.suggestWidget';
 
@@ -361,7 +368,7 @@ export class SuggestWidget implements IContentWidget, IDelegate<ICompletionItem>
 	private state: State;
 	private isAuto: boolean;
 	private loadingTimeout: number;
-	private currentSuggestionDetails: TPromise<void>;
+	private currentSuggestionDetails: CancelablePromise<void>;
 	private focusedItem: ICompletionItem;
 	private ignoreFocusEvents = false;
 	private completionModel: CompletionModel;
@@ -377,8 +384,8 @@ export class SuggestWidget implements IContentWidget, IDelegate<ICompletionItem>
 	private suggestWidgetMultipleSuggestions: IContextKey<boolean>;
 	private suggestionSupportsAutoAccept: IContextKey<boolean>;
 
-	private editorBlurTimeout: TPromise<void>;
-	private showTimeout: TPromise<void>;
+	private readonly editorBlurTimeout = new TimeoutTimer();
+	private readonly showTimeout = new TimeoutTimer();
 	private toDispose: IDisposable[];
 
 	private onDidSelectEmitter = new Emitter<ISelectedSuggestion>();
@@ -401,6 +408,8 @@ export class SuggestWidget implements IContentWidget, IDelegate<ICompletionItem>
 	private storageServiceAvailable: boolean = true;
 	private expandSuggestionDocs: boolean = false;
 
+	private firstFocusInCurrentList: boolean = false;
+
 	constructor(
 		private editor: ICodeEditor,
 		@ITelemetryService private telemetryService: ITelemetryService,
@@ -450,7 +459,6 @@ export class SuggestWidget implements IContentWidget, IDelegate<ICompletionItem>
 				listInactiveFocusOutline: activeContrastBorder
 			}),
 			themeService.onThemeChange(t => this.onThemeChange(t)),
-			editor.onDidBlurEditorText(() => this.onEditorBlur()),
 			editor.onDidLayoutChange(() => this.onEditorLayoutChange()),
 			this.list.onSelectionChange(e => this.onListSelection(e)),
 			this.list.onFocusChange(e => this.onListFocus(e)),
@@ -475,18 +483,6 @@ export class SuggestWidget implements IContentWidget, IDelegate<ICompletionItem>
 		this.editor.layoutContentWidget(this);
 	}
 
-	private onEditorBlur(): void {
-		if (sticky) {
-			return;
-		}
-
-		this.editorBlurTimeout = TPromise.timeout(150).then(() => {
-			if (!this.editor.hasTextFocus()) {
-				this.setState(State.Hidden);
-			}
-		});
-	}
-
 	private onEditorLayoutChange(): void {
 		if ((this.state === State.Open || this.state === State.Details) && this.expandDocsSettingFromStorage()) {
 			this.expandSideOrBelow();
@@ -500,7 +496,7 @@ export class SuggestWidget implements IContentWidget, IDelegate<ICompletionItem>
 
 		const item = e.elements[0];
 		const index = e.indexes[0];
-		item.resolve().then(() => {
+		item.resolve(CancellationToken.None).then(() => {
 			this.onDidSelectEmitter.fire({ item, index, model: this.completionModel });
 			alert(nls.localize('suggestionAriaAccepted', "{0}, accepted", item.suggestion.label));
 			this.editor.focus();
@@ -566,6 +562,7 @@ export class SuggestWidget implements IContentWidget, IDelegate<ICompletionItem>
 		const item = e.elements[0];
 		this._ariaAlert(this._getSuggestionAriaAlertLabel(item));
 
+		this.firstFocusInCurrentList = !this.focusedItem;
 		if (item === this.focusedItem) {
 			return;
 		}
@@ -583,22 +580,29 @@ export class SuggestWidget implements IContentWidget, IDelegate<ICompletionItem>
 
 		this.list.reveal(index);
 
-		this.currentSuggestionDetails = item.resolve()
-			.then(() => {
-				// item can have extra information, so re-render
-				this.ignoreFocusEvents = true;
-				this.list.splice(index, 1, [item]);
-				this.list.setFocus([index]);
-				this.ignoreFocusEvents = false;
+		this.currentSuggestionDetails = createCancelablePromise(token => item.resolve(token));
 
-				if (this.expandDocsSettingFromStorage()) {
-					this.showDetails();
-				} else {
-					removeClass(this.element, 'docs-side');
-				}
-			})
-			.then(null, err => !isPromiseCanceledError(err) && onUnexpectedError(err))
-			.then(() => this.currentSuggestionDetails = null);
+		this.currentSuggestionDetails.then(() => {
+			if (this.list.length < index) {
+				return;
+			}
+
+			// item can have extra information, so re-render
+			this.ignoreFocusEvents = true;
+			this.list.splice(index, 1, [item]);
+			this.list.setFocus([index]);
+			this.ignoreFocusEvents = false;
+
+			if (this.expandDocsSettingFromStorage()) {
+				this.showDetails();
+			} else {
+				removeClass(this.element, 'docs-side');
+			}
+		}).catch(onUnexpectedError).then(() => {
+			if (this.focusedItem === item) {
+				this.currentSuggestionDetails = null;
+			}
+		});
 
 		// emit an event
 		this.onDidFocusEmitter.fire({ item, index, model: this.completionModel });
@@ -622,6 +626,7 @@ export class SuggestWidget implements IContentWidget, IDelegate<ICompletionItem>
 				if (stateChanged) {
 					this.list.splice(0, this.list.length);
 				}
+				this.focusedItem = null;
 				break;
 			case State.Loading:
 				this.messageElement.textContent = SuggestWidget.LOADING_MESSAGE;
@@ -629,6 +634,7 @@ export class SuggestWidget implements IContentWidget, IDelegate<ICompletionItem>
 				show(this.messageElement);
 				removeClass(this.element, 'docs-side');
 				this.show();
+				this.focusedItem = null;
 				break;
 			case State.Empty:
 				this.messageElement.textContent = SuggestWidget.NO_SUGGESTIONS_MESSAGE;
@@ -636,6 +642,7 @@ export class SuggestWidget implements IContentWidget, IDelegate<ICompletionItem>
 				show(this.messageElement);
 				removeClass(this.element, 'docs-side');
 				this.show();
+				this.focusedItem = null;
 				break;
 			case State.Open:
 				hide(this.messageElement);
@@ -679,7 +686,6 @@ export class SuggestWidget implements IContentWidget, IDelegate<ICompletionItem>
 
 		if (this.completionModel !== completionModel) {
 			this.completionModel = completionModel;
-			this.focusedItem = null;
 		}
 
 		if (isFrozen && this.state !== State.Empty && this.state !== State.Hidden) {
@@ -702,18 +708,21 @@ export class SuggestWidget implements IContentWidget, IDelegate<ICompletionItem>
 			this.completionModel = null;
 
 		} else {
-			const { stats } = this.completionModel;
-			stats['wasAutomaticallyTriggered'] = !!isAuto;
-			/* __GDPR__
-				"suggestWidget" : {
-					"wasAutomaticallyTriggered" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
-					"${include}": [
-						"${ICompletionStats}",
-						"${EditorTelemetryData}"
-					]
-				}
-			*/
-			this.telemetryService.publicLog('suggestWidget', { ...stats, ...this.editor.getTelemetryData() });
+
+			if (this.state !== State.Open) {
+				const { stats } = this.completionModel;
+				stats['wasAutomaticallyTriggered'] = !!isAuto;
+				/* __GDPR__
+					"suggestWidget" : {
+						"wasAutomaticallyTriggered" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+						"${include}": [
+							"${ICompletionStats}",
+							"${EditorTelemetryData}"
+						]
+					}
+				*/
+				this.telemetryService.publicLog('suggestWidget', { ...stats, ...this.editor.getTelemetryData() });
+			}
 
 			this.list.splice(0, this.list.length, this.completionModel.items);
 
@@ -873,7 +882,7 @@ export class SuggestWidget implements IContentWidget, IDelegate<ICompletionItem>
 			*/
 			this.telemetryService.publicLog('suggestWidget:collapseDetails', this.editor.getTelemetryData());
 		} else {
-			if (this.state !== State.Open && this.state !== State.Details) {
+			if (this.state !== State.Open && this.state !== State.Details && this.state !== State.Frozen) {
 				return;
 			}
 
@@ -920,10 +929,10 @@ export class SuggestWidget implements IContentWidget, IDelegate<ICompletionItem>
 
 		this.suggestWidgetVisible.set(true);
 
-		this.showTimeout = TPromise.timeout(100).then(() => {
+		this.showTimeout.cancelAndSet(() => {
 			addClass(this.element, 'visible');
 			this.onDidShowEmitter.fire(this);
-		});
+		}, 100);
 	}
 
 	private hide(): void {
@@ -1004,11 +1013,17 @@ export class SuggestWidget implements IContentWidget, IDelegate<ICompletionItem>
 	}
 
 	private expandSideOrBelow() {
+		if (!canExpandCompletionItem(this.focusedItem) && this.firstFocusInCurrentList) {
+			removeClass(this.element, 'docs-side');
+			removeClass(this.element, 'docs-below');
+			return;
+		}
+
 		let matches = this.element.style.maxWidth.match(/(\d+)px/);
 		if (!matches || Number(matches[1]) < this.maxWidgetWidth) {
 			addClass(this.element, 'docs-below');
 			removeClass(this.element, 'docs-side');
-		} else {
+		} else if (canExpandCompletionItem(this.focusedItem)) {
 			addClass(this.element, 'docs-side');
 			removeClass(this.element, 'docs-below');
 		}
@@ -1071,15 +1086,8 @@ export class SuggestWidget implements IContentWidget, IDelegate<ICompletionItem>
 			this.loadingTimeout = null;
 		}
 
-		if (this.editorBlurTimeout) {
-			this.editorBlurTimeout.cancel();
-			this.editorBlurTimeout = null;
-		}
-
-		if (this.showTimeout) {
-			this.showTimeout.cancel();
-			this.showTimeout = null;
-		}
+		this.editorBlurTimeout.dispose();
+		this.showTimeout.dispose();
 	}
 }
 
diff --git a/src/vs/editor/contrib/suggest/test/completionModel.test.ts b/src/vs/editor/contrib/suggest/test/completionModel.test.ts
index 87631a1720a..bcb1a675914 100644
--- a/src/vs/editor/contrib/suggest/test/completionModel.test.ts
+++ b/src/vs/editor/contrib/suggest/test/completionModel.test.ts
@@ -167,7 +167,7 @@ suite('CompletionModel', function () {
 		], 1, {
 				leadingLineContent: 's',
 				characterCountDelta: 0
-			}, 'top');
+			}, { snippets: 'top', snippetsPreventQuickSuggestions: true, filterGraceful: true });
 
 		assert.equal(model.items.length, 2);
 		const [a, b] = model.items;
@@ -186,7 +186,7 @@ suite('CompletionModel', function () {
 		], 1, {
 				leadingLineContent: 's',
 				characterCountDelta: 0
-			}, 'bottom');
+			}, { snippets: 'bottom', snippetsPreventQuickSuggestions: true, filterGraceful: true });
 
 		assert.equal(model.items.length, 2);
 		const [a, b] = model.items;
@@ -204,7 +204,7 @@ suite('CompletionModel', function () {
 		], 1, {
 				leadingLineContent: 's',
 				characterCountDelta: 0
-			}, 'inline');
+			}, { snippets: 'inline', snippetsPreventQuickSuggestions: true, filterGraceful: true });
 
 		assert.equal(model.items.length, 2);
 		const [a, b] = model.items;
@@ -267,7 +267,7 @@ suite('CompletionModel', function () {
 		], 1, {
 				leadingLineContent: '',
 				characterCountDelta: 0
-			}, 'inline');
+			});
 
 		assert.equal(model.items.length, 5);
 
@@ -294,7 +294,7 @@ suite('CompletionModel', function () {
 		], 1, {
 				leadingLineContent: '',
 				characterCountDelta: 0
-			}, 'inline');
+			});
 
 		// query gets longer, narrow down the narrow-down'ed-set from before
 		model.lineContext = { leadingLineContent: 'rlut', characterCountDelta: 4 };
@@ -316,7 +316,7 @@ suite('CompletionModel', function () {
 		], 1, {
 				leadingLineContent: '',
 				characterCountDelta: 0
-			}, 'inline');
+			});
 
 		model.lineContext = { leadingLineContent: 'form', characterCountDelta: 4 };
 		assert.equal(model.items.length, 5);
diff --git a/src/vs/editor/contrib/suggest/test/suggest.test.ts b/src/vs/editor/contrib/suggest/test/suggest.test.ts
index 0ee9c8d5715..f8f5d2133ff 100644
--- a/src/vs/editor/contrib/suggest/test/suggest.test.ts
+++ b/src/vs/editor/contrib/suggest/test/suggest.test.ts
@@ -5,7 +5,7 @@
 'use strict';
 
 import * as assert from 'assert';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { IDisposable } from 'vs/base/common/lifecycle';
 import { SuggestRegistry } from 'vs/editor/common/modes';
 import { provideSuggestionItems } from 'vs/editor/contrib/suggest/suggest';
diff --git a/src/vs/editor/contrib/suggest/test/suggestMemory.test.ts b/src/vs/editor/contrib/suggest/test/suggestMemory.test.ts
index 4025fcd221e..02509927e62 100644
--- a/src/vs/editor/contrib/suggest/test/suggestMemory.test.ts
+++ b/src/vs/editor/contrib/suggest/test/suggestMemory.test.ts
@@ -6,7 +6,7 @@
 'use strict';
 
 import * as assert from 'assert';
-import { LRUMemory, NoMemory, PrefixMemory } from 'vs/editor/contrib/suggest/suggestMemory';
+import { LRUMemory, NoMemory, PrefixMemory, Memory } from 'vs/editor/contrib/suggest/suggestMemory';
 import { ITextModel } from 'vs/editor/common/model';
 import { TextModel } from 'vs/editor/common/model/textModel';
 import { ICompletionItem } from 'vs/editor/contrib/suggest/completionModel';
@@ -28,6 +28,46 @@ suite('SuggestMemories', function () {
 		];
 	});
 
+	test('AbstractMemory, select', function () {
+
+		const mem = new class extends Memory {
+			memorize(model: ITextModel, pos: IPosition, item: ICompletionItem): void {
+				throw new Error('Method not implemented.');
+			} toJSON(): object {
+				throw new Error('Method not implemented.');
+			}
+			fromJSON(data: object): void {
+				throw new Error('Method not implemented.');
+			}
+		};
+
+		let item1 = createSuggestItem('fazz', 0);
+		let item2 = createSuggestItem('bazz', 0);
+		let item3 = createSuggestItem('bazz', 0);
+		let item4 = createSuggestItem('bazz', 0);
+		item1.suggestion.preselect = false;
+		item2.suggestion.preselect = true;
+		item3.suggestion.preselect = true;
+
+		assert.equal(mem.select(buffer, pos, [item1, item2, item3, item4]), 1);
+	});
+
+	test('[No|Prefix|LRU]Memory honor selection boost', function () {
+		let item1 = createSuggestItem('fazz', 0);
+		let item2 = createSuggestItem('bazz', 0);
+		let item3 = createSuggestItem('bazz', 0);
+		let item4 = createSuggestItem('bazz', 0);
+		item1.suggestion.preselect = false;
+		item2.suggestion.preselect = true;
+		item3.suggestion.preselect = true;
+		let items = [item1, item2, item3, item4];
+
+
+		assert.equal(new NoMemory().select(buffer, pos, items), 1);
+		assert.equal(new LRUMemory().select(buffer, pos, items), 1);
+		assert.equal(new PrefixMemory().select(buffer, pos, items), 1);
+	});
+
 	test('NoMemory', function () {
 
 		const mem = new NoMemory();
diff --git a/src/vs/editor/contrib/suggest/test/suggestModel.test.ts b/src/vs/editor/contrib/suggest/test/suggestModel.test.ts
index 69a6c6870e0..56691b842dc 100644
--- a/src/vs/editor/contrib/suggest/test/suggestModel.test.ts
+++ b/src/vs/editor/contrib/suggest/test/suggestModel.test.ts
@@ -7,7 +7,7 @@
 import * as assert from 'assert';
 import { Event } from 'vs/base/common/event';
 import { Disposable, IDisposable, dispose } from 'vs/base/common/lifecycle';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { CoreEditingCommands } from 'vs/editor/browser/controller/coreCommands';
 import { EditOperation } from 'vs/editor/common/core/editOperation';
 import { Range } from 'vs/editor/common/core/range';
@@ -30,13 +30,15 @@ import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { NullTelemetryService } from 'vs/platform/telemetry/common/telemetryUtils';
 
 function createMockEditor(model: TextModel): TestCodeEditor {
-	return createTestCodeEditor({
+	let editor = createTestCodeEditor({
 		model: model,
 		serviceCollection: new ServiceCollection(
 			[ITelemetryService, NullTelemetryService],
 			[IStorageService, NullStorageService]
-		)
+		),
 	});
+	editor.registerAndInstantiateContribution(SnippetController2);
+	return editor;
 }
 
 suite('SuggestModel - Context', function () {
diff --git a/src/vs/editor/contrib/toggleTabFocusMode/toggleTabFocusMode.ts b/src/vs/editor/contrib/toggleTabFocusMode/toggleTabFocusMode.ts
index e3aa3349af1..87cb996bb1c 100644
--- a/src/vs/editor/contrib/toggleTabFocusMode/toggleTabFocusMode.ts
+++ b/src/vs/editor/contrib/toggleTabFocusMode/toggleTabFocusMode.ts
@@ -9,6 +9,7 @@ import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
 import { registerEditorAction, ServicesAccessor, EditorAction } from 'vs/editor/browser/editorExtensions';
 import { TabFocus } from 'vs/editor/common/config/commonEditorConfig';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
+import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
 
 export class ToggleTabFocusModeAction extends EditorAction {
 
@@ -23,7 +24,8 @@ export class ToggleTabFocusModeAction extends EditorAction {
 			kbOpts: {
 				kbExpr: null,
 				primary: KeyMod.CtrlCmd | KeyCode.KEY_M,
-				mac: { primary: KeyMod.WinCtrl | KeyMod.Shift | KeyCode.KEY_M }
+				mac: { primary: KeyMod.WinCtrl | KeyMod.Shift | KeyCode.KEY_M },
+				weight: KeybindingWeight.EditorContrib
 			}
 		});
 	}
diff --git a/src/vs/editor/contrib/wordHighlighter/wordHighlighter.ts b/src/vs/editor/contrib/wordHighlighter/wordHighlighter.ts
index c639a47bb00..dbf375aa46c 100644
--- a/src/vs/editor/contrib/wordHighlighter/wordHighlighter.ts
+++ b/src/vs/editor/contrib/wordHighlighter/wordHighlighter.ts
@@ -2,19 +2,18 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-'use strict';
 
 import * as nls from 'vs/nls';
 
-import { sequence, asWinJsPromise } from 'vs/base/common/async';
-import { onUnexpectedExternalError } from 'vs/base/common/errors';
-import { TPromise } from 'vs/base/common/winjs.base';
+import { first2, createCancelablePromise, CancelablePromise, timeout } from 'vs/base/common/async';
+import { onUnexpectedExternalError, onUnexpectedError } from 'vs/base/common/errors';
 import { Range } from 'vs/editor/common/core/range';
 import * as editorCommon from 'vs/editor/common/editorCommon';
 import { registerEditorContribution, EditorAction, IActionOptions, registerEditorAction, registerDefaultLanguageCommand } from 'vs/editor/browser/editorExtensions';
 import { DocumentHighlight, DocumentHighlightKind, DocumentHighlightProviderRegistry } from 'vs/editor/common/modes';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { Position } from 'vs/editor/common/core/position';
+import { Selection } from 'vs/editor/common/core/selection';
 import { registerColor, editorSelectionHighlight, overviewRulerSelectionHighlightForeground, activeContrastBorder, editorSelectionHighlightBorder } from 'vs/platform/theme/common/colorRegistry';
 import { registerThemingParticipant, themeColorFromId } from 'vs/platform/theme/common/themeService';
 import { CursorChangeReason, ICursorPositionChangedEvent } from 'vs/editor/common/controller/cursorEvents';
@@ -23,9 +22,11 @@ import { IContextKey, IContextKeyService, RawContextKey } from 'vs/platform/cont
 import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
 import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
 import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
-import { firstIndex } from 'vs/base/common/arrays';
+import { firstIndex, isFalsyOrEmpty } from 'vs/base/common/arrays';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
 import { ITextModel, TrackedRangeStickiness, OverviewRulerLane, IModelDeltaDecoration } from 'vs/editor/common/model';
+import { CancellationToken } from 'vs/base/common/cancellation';
+import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
 
 export const editorWordHighlight = registerColor('editor.wordHighlightBackground', { dark: '#575757B8', light: '#57575740', hc: null }, nls.localize('wordHighlight', 'Background color of a symbol during read-access, like reading a variable. The color must not be opaque to not hide underlying decorations.'), true);
 export const editorWordHighlightStrong = registerColor('editor.wordHighlightStrongBackground', { dark: '#004972B8', light: '#0e639c40', hc: null }, nls.localize('wordHighlightStrong', 'Background color of a symbol during write-access, like writing to a variable. The color must not be opaque to not hide underlying decorations.'), true);
@@ -37,50 +38,137 @@ export const overviewRulerWordHighlightStrongForeground = registerColor('editorO
 
 export const ctxHasWordHighlights = new RawContextKey<boolean>('hasWordHighlights', false);
 
-export function getOccurrencesAtPosition(model: ITextModel, position: Position): TPromise<DocumentHighlight[]> {
+export function getOccurrencesAtPosition(model: ITextModel, position: Position, token: CancellationToken): Promise<DocumentHighlight[]> {
 
 	const orderedByScore = DocumentHighlightProviderRegistry.ordered(model);
-	let foundResult = false;
 
 	// in order of score ask the occurrences provider
 	// until someone response with a good result
 	// (good = none empty array)
-	return sequence(orderedByScore.map(provider => {
-		return (): TPromise<DocumentHighlight[]> => {
-			if (!foundResult) {
-				return asWinJsPromise((token) => {
-					return provider.provideDocumentHighlights(model, position, token);
-				}).then(data => {
-					if (Array.isArray(data) && data.length > 0) {
-						foundResult = true;
-						return data;
-					}
-					return undefined;
-				}, err => {
-					onUnexpectedExternalError(err);
-					return undefined;
-				});
-			}
-			return undefined;
-		};
-	})).then(values => {
-		return values[0];
-	});
+	return first2(orderedByScore.map(provider => () => {
+		return Promise.resolve(provider.provideDocumentHighlights(model, position, token))
+			.then(undefined, onUnexpectedExternalError);
+	}), result => !isFalsyOrEmpty(result));
 }
 
-registerDefaultLanguageCommand('_executeDocumentHighlights', getOccurrencesAtPosition);
+interface IOccurenceAtPositionRequest {
+	readonly result: Promise<DocumentHighlight[]>;
+	isValid(model: ITextModel, selection: Selection, decorationIds: string[]): boolean;
+	cancel(): void;
+}
+
+abstract class OccurenceAtPositionRequest implements IOccurenceAtPositionRequest {
+
+	private readonly _wordRange: Range;
+	public readonly result: CancelablePromise<DocumentHighlight[]>;
+
+	constructor(model: ITextModel, selection: Selection, wordSeparators: string) {
+		this._wordRange = this._getCurrentWordRange(model, selection);
+		this.result = createCancelablePromise(token => this._compute(model, selection, wordSeparators, token));
+	}
+
+	protected abstract _compute(model: ITextModel, selection: Selection, wordSeparators: string, token: CancellationToken): Thenable<DocumentHighlight[]>;
+
+	private _getCurrentWordRange(model: ITextModel, selection: Selection): Range {
+		const word = model.getWordAtPosition(selection.getPosition());
+		if (word) {
+			return new Range(selection.startLineNumber, word.startColumn, selection.startLineNumber, word.endColumn);
+		}
+		return null;
+	}
+
+	public isValid(model: ITextModel, selection: Selection, decorationIds: string[]): boolean {
+
+		const lineNumber = selection.startLineNumber;
+		const startColumn = selection.startColumn;
+		const endColumn = selection.endColumn;
+		const currentWordRange = this._getCurrentWordRange(model, selection);
+
+		let requestIsValid = (this._wordRange && this._wordRange.equalsRange(currentWordRange));
+
+		// Even if we are on a different word, if that word is in the decorations ranges, the request is still valid
+		// (Same symbol)
+		for (let i = 0, len = decorationIds.length; !requestIsValid && i < len; i++) {
+			let range = model.getDecorationRange(decorationIds[i]);
+			if (range && range.startLineNumber === lineNumber) {
+				if (range.startColumn <= startColumn && range.endColumn >= endColumn) {
+					requestIsValid = true;
+				}
+			}
+		}
+
+		return requestIsValid;
+	}
+
+	public cancel(): void {
+		this.result.cancel();
+	}
+}
+
+class SemanticOccurenceAtPositionRequest extends OccurenceAtPositionRequest {
+	protected _compute(model: ITextModel, selection: Selection, wordSeparators: string, token: CancellationToken): Thenable<DocumentHighlight[]> {
+		return getOccurrencesAtPosition(model, selection.getPosition(), token);
+	}
+}
+
+class TextualOccurenceAtPositionRequest extends OccurenceAtPositionRequest {
+
+	private _selectionIsEmpty: boolean;
+
+	constructor(model: ITextModel, selection: Selection, wordSeparators: string) {
+		super(model, selection, wordSeparators);
+		this._selectionIsEmpty = selection.isEmpty();
+	}
+
+	protected _compute(model: ITextModel, selection: Selection, wordSeparators: string, token: CancellationToken): Thenable<DocumentHighlight[]> {
+		return timeout(250, token).then(() => {
+			if (!selection.isEmpty()) {
+				return [];
+			}
+
+			const word = model.getWordAtPosition(selection.getPosition());
+
+			if (!word) {
+				return [];
+			}
+			const matches = model.findMatches(word.word, true, false, true, wordSeparators, false);
+			return matches.map(m => {
+				return {
+					range: m.range,
+					kind: DocumentHighlightKind.Text
+				};
+			});
+		});
+	}
+
+	public isValid(model: ITextModel, selection: Selection, decorationIds: string[]): boolean {
+		const currentSelectionIsEmpty = selection.isEmpty();
+		if (this._selectionIsEmpty !== currentSelectionIsEmpty) {
+			return false;
+		}
+		return super.isValid(model, selection, decorationIds);
+	}
+}
+
+function computeOccurencesAtPosition(model: ITextModel, selection: Selection, wordSeparators: string): IOccurenceAtPositionRequest {
+	if (DocumentHighlightProviderRegistry.has(model)) {
+		return new SemanticOccurenceAtPositionRequest(model, selection, wordSeparators);
+	}
+	return new TextualOccurenceAtPositionRequest(model, selection, wordSeparators);
+}
+
+registerDefaultLanguageCommand('_executeDocumentHighlights', (model, position) => getOccurrencesAtPosition(model, position, CancellationToken.None));
 
 class WordHighlighter {
 
 	private editor: ICodeEditor;
 	private occurrencesHighlight: boolean;
 	private model: ITextModel;
-	private _lastWordRange: Range;
 	private _decorationIds: string[];
 	private toUnhook: IDisposable[];
 
 	private workerRequestTokenId: number = 0;
-	private workerRequest: TPromise<DocumentHighlight[]> = null;
+	private workerRequest: IOccurenceAtPositionRequest;
 	private workerRequestCompleted: boolean = false;
 	private workerRequestValue: DocumentHighlight[] = [];
 
@@ -127,7 +215,6 @@ class WordHighlighter {
 			}
 		}));
 
-		this._lastWordRange = null;
 		this._decorationIds = [];
 		this.workerRequestTokenId = 0;
 		this.workerRequest = null;
@@ -191,8 +278,6 @@ class WordHighlighter {
 	}
 
 	private _stopAll(): void {
-		this._lastWordRange = null;
-
 		// Remove any existing decorations
 		this._removeDecorations();
 
@@ -233,12 +318,6 @@ class WordHighlighter {
 	}
 
 	private _run(): void {
-		// no providers for this model
-		if (!DocumentHighlightProviderRegistry.has(this.model)) {
-			this._stopAll();
-			return;
-		}
-
 		let editorSelection = this.editor.getSelection();
 
 		// ignore multiline selection
@@ -267,21 +346,7 @@ class WordHighlighter {
 		// - 250ms later after the last cursor move event, render the occurrences
 		// - no flickering!
 
-		let currentWordRange = new Range(lineNumber, word.startColumn, lineNumber, word.endColumn);
-
-		let workerRequestIsValid = this._lastWordRange && this._lastWordRange.equalsRange(currentWordRange);
-
-		// Even if we are on a different word, if that word is in the decorations ranges, the request is still valid
-		// (Same symbol)
-		for (let i = 0, len = this._decorationIds.length; !workerRequestIsValid && i < len; i++) {
-			let range = this.model.getDecorationRange(this._decorationIds[i]);
-			if (range && range.startLineNumber === lineNumber) {
-				if (range.startColumn <= startColumn && range.endColumn >= endColumn) {
-					workerRequestIsValid = true;
-				}
-			}
-		}
-
+		const workerRequestIsValid = (this.workerRequest && this.workerRequest.isValid(this.model, editorSelection, this._decorationIds));
 
 		// There are 4 cases:
 		// a) old workerRequest is valid & completed, renderDecorationsTimer fired
@@ -310,18 +375,16 @@ class WordHighlighter {
 			let myRequestId = ++this.workerRequestTokenId;
 			this.workerRequestCompleted = false;
 
-			this.workerRequest = getOccurrencesAtPosition(this.model, this.editor.getPosition());
+			this.workerRequest = computeOccurencesAtPosition(this.model, this.editor.getSelection(), this.editor.getConfiguration().wordSeparators);
 
-			this.workerRequest.then(data => {
+			this.workerRequest.result.then(data => {
 				if (myRequestId === this.workerRequestTokenId) {
 					this.workerRequestCompleted = true;
 					this.workerRequestValue = data || [];
 					this._beginRenderDecorations();
 				}
-			}).done();
+			}, onUnexpectedError);
 		}
-
-		this._lastWordRange = currentWordRange;
 	}
 
 	private _beginRenderDecorations(): void {
@@ -478,7 +541,8 @@ class NextWordHighlightAction extends WordHighlightNavigationAction {
 			precondition: ctxHasWordHighlights,
 			kbOpts: {
 				kbExpr: EditorContextKeys.editorTextFocus,
-				primary: KeyCode.F7
+				primary: KeyCode.F7,
+				weight: KeybindingWeight.EditorContrib
 			}
 		});
 	}
@@ -493,7 +557,8 @@ class PrevWordHighlightAction extends WordHighlightNavigationAction {
 			precondition: ctxHasWordHighlights,
 			kbOpts: {
 				kbExpr: EditorContextKeys.editorTextFocus,
-				primary: KeyMod.Shift | KeyCode.F7
+				primary: KeyMod.Shift | KeyCode.F7,
+				weight: KeybindingWeight.EditorContrib
 			}
 		});
 	}
diff --git a/src/vs/editor/contrib/wordOperations/test/wordOperations.test.ts b/src/vs/editor/contrib/wordOperations/test/wordOperations.test.ts
index bd34ee01bda..eb3361d3ef3 100644
--- a/src/vs/editor/contrib/wordOperations/test/wordOperations.test.ts
+++ b/src/vs/editor/contrib/wordOperations/test/wordOperations.test.ts
@@ -18,6 +18,7 @@ import {
 } from 'vs/editor/contrib/wordOperations/wordOperations';
 import { EditorCommand } from 'vs/editor/browser/editorExtensions';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
+import { deserializePipePositions, testRepeatedActionAndExtractPositions, serializePipePositions } from 'vs/editor/contrib/wordOperations/test/wordTestUtils';
 
 suite('WordOperations', () => {
 
@@ -43,16 +44,16 @@ suite('WordOperations', () => {
 	function runEditorCommand(editor: ICodeEditor, command: EditorCommand): void {
 		command.runEditorCommand(null, editor, null);
 	}
-	function moveWordLeft(editor: ICodeEditor, inSelectionMode: boolean = false): void {
+	function cursorWordLeft(editor: ICodeEditor, inSelectionMode: boolean = false): void {
 		runEditorCommand(editor, inSelectionMode ? _cursorWordLeftSelect : _cursorWordLeft);
 	}
-	function moveWordStartLeft(editor: ICodeEditor, inSelectionMode: boolean = false): void {
+	function cursorWordStartLeft(editor: ICodeEditor, inSelectionMode: boolean = false): void {
 		runEditorCommand(editor, inSelectionMode ? _cursorWordStartLeftSelect : _cursorWordStartLeft);
 	}
-	function moveWordEndLeft(editor: ICodeEditor, inSelectionMode: boolean = false): void {
+	function cursorWordEndLeft(editor: ICodeEditor, inSelectionMode: boolean = false): void {
 		runEditorCommand(editor, inSelectionMode ? _cursorWordEndLeftSelect : _cursorWordEndLeft);
 	}
-	function moveWordRight(editor: ICodeEditor, inSelectionMode: boolean = false): void {
+	function cursorWordRight(editor: ICodeEditor, inSelectionMode: boolean = false): void {
 		runEditorCommand(editor, inSelectionMode ? _cursorWordRightSelect : _cursorWordRight);
 	}
 	function moveWordEndRight(editor: ICodeEditor, inSelectionMode: boolean = false): void {
@@ -80,44 +81,27 @@ suite('WordOperations', () => {
 		runEditorCommand(editor, _deleteWordEndRight);
 	}
 
-	test('move word left', () => {
-		withTestCodeEditor([
-			'    \tMy First Line\t ',
-			'\tMy Second Line',
-			'    Third Line🐶',
-			'',
-			'1',
-		], {}, (editor, _) => {
-			editor.setPosition(new Position(5, 2));
-			const expectedStops = [
-				[5, 1],
-				[4, 1],
-				[3, 11],
-				[3, 5],
-				[3, 1],
-				[2, 12],
-				[2, 5],
-				[2, 2],
-				[2, 1],
-				[1, 15],
-				[1, 9],
-				[1, 6],
-				[1, 1],
-				[1, 1],
-			];
-
-			let actualStops: number[][] = [];
-			for (let i = 0; i < expectedStops.length; i++) {
-				moveWordLeft(editor);
-				const pos = editor.getPosition();
-				actualStops.push([pos.lineNumber, pos.column]);
-			}
-
-			assert.deepEqual(actualStops, expectedStops);
-		});
+	test('cursorWordLeft - simple', () => {
+		const EXPECTED = [
+			'|    \t|My |First |Line\t ',
+			'|\t|My |Second |Line',
+			'|    |Third |Line🐶',
+			'|',
+			'|1',
+		].join('\n');
+		const [text,] = deserializePipePositions(EXPECTED);
+		const actualStops = testRepeatedActionAndExtractPositions(
+			text,
+			new Position(1000, 1000),
+			ed => cursorWordLeft(ed),
+			ed => ed.getPosition(),
+			ed => ed.getPosition().equals(new Position(1, 1))
+		);
+		const actual = serializePipePositions(text, actualStops);
+		assert.deepEqual(actual, EXPECTED);
 	});
 
-	test('move word left selection', () => {
+	test('cursorWordLeft - with selection', () => {
 		withTestCodeEditor([
 			'    \tMy First Line\t ',
 			'\tMy Second Line',
@@ -126,83 +110,106 @@ suite('WordOperations', () => {
 			'1',
 		], {}, (editor, _) => {
 			editor.setPosition(new Position(5, 2));
-			moveWordLeft(editor, true);
+			cursorWordLeft(editor, true);
 			assert.deepEqual(editor.getSelection(), new Selection(5, 2, 5, 1));
 		});
 	});
 
-	test('issue #832: moveWordLeft', () => {
-		withTestCodeEditor([
-			'   /* Just some   more   text a+= 3 +5-3 + 7 */  '
-		], {}, (editor, _) => {
-			editor.setPosition(new Position(1, 50));
-
-			moveWordLeft(editor); assert.equal(editor.getPosition().column, '   /* Just some   more   text a+= 3 +5-3 + 7 '.length + 1, '001');
-			moveWordLeft(editor); assert.equal(editor.getPosition().column, '   /* Just some   more   text a+= 3 +5-3 + '.length + 1, '002');
-			moveWordLeft(editor); assert.equal(editor.getPosition().column, '   /* Just some   more   text a+= 3 +5-3 '.length + 1, '003');
-			moveWordLeft(editor); assert.equal(editor.getPosition().column, '   /* Just some   more   text a+= 3 +5-'.length + 1, '004');
-			moveWordLeft(editor); assert.equal(editor.getPosition().column, '   /* Just some   more   text a+= 3 +'.length + 1, '006');
-			moveWordLeft(editor); assert.equal(editor.getPosition().column, '   /* Just some   more   text a+= 3 '.length + 1, '007');
-			moveWordLeft(editor); assert.equal(editor.getPosition().column, '   /* Just some   more   text a+= '.length + 1, '008');
-			moveWordLeft(editor); assert.equal(editor.getPosition().column, '   /* Just some   more   text a'.length + 1, '009');
-			moveWordLeft(editor); assert.equal(editor.getPosition().column, '   /* Just some   more   text '.length + 1, '010');
-			moveWordLeft(editor); assert.equal(editor.getPosition().column, '   /* Just some   more   '.length + 1, '011');
-			moveWordLeft(editor); assert.equal(editor.getPosition().column, '   /* Just some   '.length + 1, '012');
-			moveWordLeft(editor); assert.equal(editor.getPosition().column, '   /* Just '.length + 1, '013');
-			moveWordLeft(editor); assert.equal(editor.getPosition().column, '   /* '.length + 1, '014');
-			moveWordLeft(editor); assert.equal(editor.getPosition().column, '   '.length + 1, '015');
-		});
+	test('cursorWordLeft - issue #832', () => {
+		const EXPECTED = ['|   |/* |Just |some   |more   |text |a|+= |3 |+|5-|3 |+ |7 |*/  '].join('\n');
+		const [text,] = deserializePipePositions(EXPECTED);
+		const actualStops = testRepeatedActionAndExtractPositions(
+			text,
+			new Position(1000, 1000),
+			ed => cursorWordLeft(ed),
+			ed => ed.getPosition(),
+			ed => ed.getPosition().equals(new Position(1, 1))
+		);
+		const actual = serializePipePositions(text, actualStops);
+		assert.deepEqual(actual, EXPECTED);
 	});
 
-	test('moveWordStartLeft', () => {
-		withTestCodeEditor([
-			'   /* Just some   more   text a+= 3 +5-3 + 7 */  '
-		], {}, (editor, _) => {
-			editor.setPosition(new Position(1, 50));
-
-			moveWordStartLeft(editor); assert.equal(editor.getPosition().column, '   /* Just some   more   text a+= 3 +5-3 + 7 '.length + 1, '001');
-			moveWordStartLeft(editor); assert.equal(editor.getPosition().column, '   /* Just some   more   text a+= 3 +5-3 + '.length + 1, '002');
-			moveWordStartLeft(editor); assert.equal(editor.getPosition().column, '   /* Just some   more   text a+= 3 +5-3 '.length + 1, '003');
-			moveWordStartLeft(editor); assert.equal(editor.getPosition().column, '   /* Just some   more   text a+= 3 +5-'.length + 1, '004');
-			moveWordStartLeft(editor); assert.equal(editor.getPosition().column, '   /* Just some   more   text a+= 3 +'.length + 1, '006');
-			moveWordStartLeft(editor); assert.equal(editor.getPosition().column, '   /* Just some   more   text a+= 3 '.length + 1, '007');
-			moveWordStartLeft(editor); assert.equal(editor.getPosition().column, '   /* Just some   more   text a+= '.length + 1, '008');
-			moveWordStartLeft(editor); assert.equal(editor.getPosition().column, '   /* Just some   more   text a'.length + 1, '009');
-			moveWordStartLeft(editor); assert.equal(editor.getPosition().column, '   /* Just some   more   text '.length + 1, '010');
-			moveWordStartLeft(editor); assert.equal(editor.getPosition().column, '   /* Just some   more   '.length + 1, '011');
-			moveWordStartLeft(editor); assert.equal(editor.getPosition().column, '   /* Just some   '.length + 1, '012');
-			moveWordStartLeft(editor); assert.equal(editor.getPosition().column, '   /* Just '.length + 1, '013');
-			moveWordStartLeft(editor); assert.equal(editor.getPosition().column, '   /* '.length + 1, '014');
-			moveWordStartLeft(editor); assert.equal(editor.getPosition().column, '   '.length + 1, '015');
-		});
+	test('cursorWordLeft - issue #48046: Word selection doesn\'t work as usual', () => {
+		const EXPECTED = [
+			'|deep.|object.|property',
+		].join('\n');
+		const [text,] = deserializePipePositions(EXPECTED);
+		const actualStops = testRepeatedActionAndExtractPositions(
+			text,
+			new Position(1, 21),
+			ed => cursorWordLeft(ed),
+			ed => ed.getPosition(),
+			ed => ed.getPosition().equals(new Position(1, 1))
+		);
+		const actual = serializePipePositions(text, actualStops);
+		assert.deepEqual(actual, EXPECTED);
 	});
 
-	test('moveWordEndLeft', () => {
-		withTestCodeEditor([
-			'   /* Just some   more   text a+= 3 +5-3 + 7 */  '
-		], {}, (editor, _) => {
-			editor.setPosition(new Position(1, 50));
-
-			moveWordEndLeft(editor); assert.equal(editor.getPosition().column, '   /* Just some   more   text a+= 3 +5-3 + 7 */'.length + 1, '001');
-			moveWordEndLeft(editor); assert.equal(editor.getPosition().column, '   /* Just some   more   text a+= 3 +5-3 + 7'.length + 1, '002');
-			moveWordEndLeft(editor); assert.equal(editor.getPosition().column, '   /* Just some   more   text a+= 3 +5-3 +'.length + 1, '003');
-			moveWordEndLeft(editor); assert.equal(editor.getPosition().column, '   /* Just some   more   text a+= 3 +5-3'.length + 1, '004');
-			moveWordEndLeft(editor); assert.equal(editor.getPosition().column, '   /* Just some   more   text a+= 3 +5-'.length + 1, '005');
-			moveWordEndLeft(editor); assert.equal(editor.getPosition().column, '   /* Just some   more   text a+= 3 +5'.length + 1, '006');
-			moveWordEndLeft(editor); assert.equal(editor.getPosition().column, '   /* Just some   more   text a+= 3 +'.length + 1, '007');
-			moveWordEndLeft(editor); assert.equal(editor.getPosition().column, '   /* Just some   more   text a+= 3'.length + 1, '008');
-			moveWordEndLeft(editor); assert.equal(editor.getPosition().column, '   /* Just some   more   text a+='.length + 1, '009');
-			moveWordEndLeft(editor); assert.equal(editor.getPosition().column, '   /* Just some   more   text a'.length + 1, '010');
-			moveWordEndLeft(editor); assert.equal(editor.getPosition().column, '   /* Just some   more   text'.length + 1, '011');
-			moveWordEndLeft(editor); assert.equal(editor.getPosition().column, '   /* Just some   more'.length + 1, '012');
-			moveWordEndLeft(editor); assert.equal(editor.getPosition().column, '   /* Just some'.length + 1, '013');
-			moveWordEndLeft(editor); assert.equal(editor.getPosition().column, '   /* Just'.length + 1, '014');
-			moveWordEndLeft(editor); assert.equal(editor.getPosition().column, '   /*'.length + 1, '015');
-			moveWordEndLeft(editor); assert.equal(editor.getPosition().column, ''.length + 1, '016');
-		});
+	test('cursorWordStartLeft', () => {
+		// This is the behaviour observed in Visual Studio, please do not touch test
+		const EXPECTED = ['|   |/* |Just |some   |more   |text |a|+= |3 |+|5|-|3 |+ |7 |*/|  '].join('\n');
+		const [text,] = deserializePipePositions(EXPECTED);
+		const actualStops = testRepeatedActionAndExtractPositions(
+			text,
+			new Position(1000, 1000),
+			ed => cursorWordStartLeft(ed),
+			ed => ed.getPosition(),
+			ed => ed.getPosition().equals(new Position(1, 1))
+		);
+		const actual = serializePipePositions(text, actualStops);
+		assert.deepEqual(actual, EXPECTED);
 	});
 
-	test('move word right', () => {
+	test('cursorWordStartLeft - issue #51119: regression makes VS compatibility impossible', () => {
+		// This is the behaviour observed in Visual Studio, please do not touch test
+		const EXPECTED = ['|this|.|is|.|a|.|test'].join('\n');
+		const [text,] = deserializePipePositions(EXPECTED);
+		const actualStops = testRepeatedActionAndExtractPositions(
+			text,
+			new Position(1000, 1000),
+			ed => cursorWordStartLeft(ed),
+			ed => ed.getPosition(),
+			ed => ed.getPosition().equals(new Position(1, 1))
+		);
+		const actual = serializePipePositions(text, actualStops);
+		assert.deepEqual(actual, EXPECTED);
+	});
+
+	test('cursorWordEndLeft', () => {
+		const EXPECTED = ['|   /*| Just| some|   more|   text| a|+=| 3| +|5|-|3| +| 7| */|  '].join('\n');
+		const [text,] = deserializePipePositions(EXPECTED);
+		const actualStops = testRepeatedActionAndExtractPositions(
+			text,
+			new Position(1000, 1000),
+			ed => cursorWordEndLeft(ed),
+			ed => ed.getPosition(),
+			ed => ed.getPosition().equals(new Position(1, 1))
+		);
+		const actual = serializePipePositions(text, actualStops);
+		assert.deepEqual(actual, EXPECTED);
+	});
+
+	test('cursorWordRight - simple', () => {
+		const EXPECTED = [
+			'    \tMy| First| Line|\t |',
+			'\tMy| Second| Line|',
+			'    Third| Line🐶|',
+			'|',
+			'1|',
+		].join('\n');
+		const [text,] = deserializePipePositions(EXPECTED);
+		const actualStops = testRepeatedActionAndExtractPositions(
+			text,
+			new Position(1, 1),
+			ed => cursorWordRight(ed),
+			ed => ed.getPosition(),
+			ed => ed.getPosition().equals(new Position(5, 2))
+		);
+		const actual = serializePipePositions(text, actualStops);
+		assert.deepEqual(actual, EXPECTED);
+	});
+
+	test('cursorWordRight - selection', () => {
 		withTestCodeEditor([
 			'    \tMy First Line\t ',
 			'\tMy Second Line',
@@ -211,145 +218,92 @@ suite('WordOperations', () => {
 			'1',
 		], {}, (editor, _) => {
 			editor.setPosition(new Position(1, 1));
-			let expectedStops = [
-				[1, 8],
-				[1, 14],
-				[1, 19],
-				[1, 21],
-				[2, 4],
-				[2, 11],
-				[2, 16],
-				[3, 10],
-				[3, 17],
-				[4, 1],
-				[5, 2],
-				[5, 2],
-			];
-
-			let actualStops: number[][] = [];
-			for (let i = 0; i < expectedStops.length; i++) {
-				moveWordRight(editor);
-				let pos = editor.getPosition();
-				actualStops.push([pos.lineNumber, pos.column]);
-			}
-
-			assert.deepEqual(actualStops, expectedStops);
-		});
-	});
-
-	test('move word right selection', () => {
-		withTestCodeEditor([
-			'    \tMy First Line\t ',
-			'\tMy Second Line',
-			'    Third Line🐶',
-			'',
-			'1',
-		], {}, (editor, _) => {
-			editor.setPosition(new Position(1, 1));
-			moveWordRight(editor, true);
+			cursorWordRight(editor, true);
 			assert.deepEqual(editor.getSelection(), new Selection(1, 1, 1, 8));
 		});
 	});
 
-	test('issue #832: moveWordRight', () => {
-		withTestCodeEditor([
-			'   /* Just some   more   text a+= 3 +5-3 + 7 */  '
-		], {}, (editor, _) => {
-			editor.setPosition(new Position(1, 1));
-
-			moveWordRight(editor); assert.equal(editor.getPosition().column, '   /*'.length + 1, '001');
-			moveWordRight(editor); assert.equal(editor.getPosition().column, '   /* Just'.length + 1, '003');
-			moveWordRight(editor); assert.equal(editor.getPosition().column, '   /* Just some'.length + 1, '004');
-			moveWordRight(editor); assert.equal(editor.getPosition().column, '   /* Just some   more'.length + 1, '005');
-			moveWordRight(editor); assert.equal(editor.getPosition().column, '   /* Just some   more   text'.length + 1, '006');
-			moveWordRight(editor); assert.equal(editor.getPosition().column, '   /* Just some   more   text a'.length + 1, '007');
-			moveWordRight(editor); assert.equal(editor.getPosition().column, '   /* Just some   more   text a+='.length + 1, '008');
-			moveWordRight(editor); assert.equal(editor.getPosition().column, '   /* Just some   more   text a+= 3'.length + 1, '009');
-			moveWordRight(editor); assert.equal(editor.getPosition().column, '   /* Just some   more   text a+= 3 +5'.length + 1, '011');
-			moveWordRight(editor); assert.equal(editor.getPosition().column, '   /* Just some   more   text a+= 3 +5-3'.length + 1, '013');
-			moveWordRight(editor); assert.equal(editor.getPosition().column, '   /* Just some   more   text a+= 3 +5-3 +'.length + 1, '014');
-			moveWordRight(editor); assert.equal(editor.getPosition().column, '   /* Just some   more   text a+= 3 +5-3 + 7'.length + 1, '015');
-			moveWordRight(editor); assert.equal(editor.getPosition().column, '   /* Just some   more   text a+= 3 +5-3 + 7 */'.length + 1, '016');
-			moveWordRight(editor); assert.equal(editor.getPosition().column, '   /* Just some   more   text a+= 3 +5-3 + 7 */  '.length + 1, '016');
-
-		});
+	test('cursorWordRight - issue #832', () => {
+		const EXPECTED = [
+			'   /*| Just| some|   more|   text| a|+=| 3| +5|-3| +| 7| */|  |',
+		].join('\n');
+		const [text,] = deserializePipePositions(EXPECTED);
+		const actualStops = testRepeatedActionAndExtractPositions(
+			text,
+			new Position(1, 1),
+			ed => cursorWordRight(ed),
+			ed => ed.getPosition(),
+			ed => ed.getPosition().equals(new Position(1, 50))
+		);
+		const actual = serializePipePositions(text, actualStops);
+		assert.deepEqual(actual, EXPECTED);
 	});
 
-	test('issue #41199: moveWordRight', () => {
-		withTestCodeEditor([
-			'console.log(err)'
-		], {}, (editor, _) => {
-			editor.setPosition(new Position(1, 1));
-
-			moveWordRight(editor); assert.equal(editor.getPosition().column, 'console'.length + 1, '001');
-			moveWordRight(editor); assert.equal(editor.getPosition().column, 'console.log'.length + 1, '002');
-			moveWordRight(editor); assert.equal(editor.getPosition().column, 'console.log(err'.length + 1, '003');
-			moveWordRight(editor); assert.equal(editor.getPosition().column, 'console.log(err)'.length + 1, '004');
-		});
-	});
-
-	test('issue #48046: Word selection doesn\'t work as usual', () => {
-		withTestCodeEditor([
-			'deep.object.property'
-		], {}, (editor, _) => {
-			editor.setPosition(new Position(1, 21));
-
-			moveWordLeft(editor); assert.equal(editor.getPosition().column, 'deep.object.'.length + 1, '001');
-			moveWordLeft(editor); assert.equal(editor.getPosition().column, 'deep.'.length + 1, '002');
-			moveWordLeft(editor); assert.equal(editor.getPosition().column, ''.length + 1, '003');
-		});
+	test('cursorWordRight - issue #41199', () => {
+		const EXPECTED = [
+			'console|.log|(err|)|',
+		].join('\n');
+		const [text,] = deserializePipePositions(EXPECTED);
+		const actualStops = testRepeatedActionAndExtractPositions(
+			text,
+			new Position(1, 1),
+			ed => cursorWordRight(ed),
+			ed => ed.getPosition(),
+			ed => ed.getPosition().equals(new Position(1, 17))
+		);
+		const actual = serializePipePositions(text, actualStops);
+		assert.deepEqual(actual, EXPECTED);
 	});
 
 	test('moveWordEndRight', () => {
-		withTestCodeEditor([
-			'   /* Just some   more   text a+= 3 +5-3 + 7 */  '
-		], {}, (editor, _) => {
-			editor.setPosition(new Position(1, 1));
-
-			moveWordEndRight(editor); assert.equal(editor.getPosition().column, '   /*'.length + 1, '001');
-			moveWordEndRight(editor); assert.equal(editor.getPosition().column, '   /* Just'.length + 1, '003');
-			moveWordEndRight(editor); assert.equal(editor.getPosition().column, '   /* Just some'.length + 1, '004');
-			moveWordEndRight(editor); assert.equal(editor.getPosition().column, '   /* Just some   more'.length + 1, '005');
-			moveWordEndRight(editor); assert.equal(editor.getPosition().column, '   /* Just some   more   text'.length + 1, '006');
-			moveWordEndRight(editor); assert.equal(editor.getPosition().column, '   /* Just some   more   text a'.length + 1, '007');
-			moveWordEndRight(editor); assert.equal(editor.getPosition().column, '   /* Just some   more   text a+='.length + 1, '008');
-			moveWordEndRight(editor); assert.equal(editor.getPosition().column, '   /* Just some   more   text a+= 3'.length + 1, '009');
-			moveWordEndRight(editor); assert.equal(editor.getPosition().column, '   /* Just some   more   text a+= 3 +5'.length + 1, '011');
-			moveWordEndRight(editor); assert.equal(editor.getPosition().column, '   /* Just some   more   text a+= 3 +5-3'.length + 1, '013');
-			moveWordEndRight(editor); assert.equal(editor.getPosition().column, '   /* Just some   more   text a+= 3 +5-3 +'.length + 1, '014');
-			moveWordEndRight(editor); assert.equal(editor.getPosition().column, '   /* Just some   more   text a+= 3 +5-3 + 7'.length + 1, '015');
-			moveWordEndRight(editor); assert.equal(editor.getPosition().column, '   /* Just some   more   text a+= 3 +5-3 + 7 */'.length + 1, '016');
-			moveWordEndRight(editor); assert.equal(editor.getPosition().column, '   /* Just some   more   text a+= 3 +5-3 + 7 */  '.length + 1, '016');
-
-		});
+		const EXPECTED = [
+			'   /*| Just| some|   more|   text| a|+=| 3| +5|-3| +| 7| */|  |',
+		].join('\n');
+		const [text,] = deserializePipePositions(EXPECTED);
+		const actualStops = testRepeatedActionAndExtractPositions(
+			text,
+			new Position(1, 1),
+			ed => moveWordEndRight(ed),
+			ed => ed.getPosition(),
+			ed => ed.getPosition().equals(new Position(1, 50))
+		);
+		const actual = serializePipePositions(text, actualStops);
+		assert.deepEqual(actual, EXPECTED);
 	});
 
 	test('moveWordStartRight', () => {
-		withTestCodeEditor([
-			'   /* Just some   more   text a+= 3 +5-3 + 7 */  '
-		], {}, (editor, _) => {
-			editor.setPosition(new Position(1, 1));
-
-			moveWordStartRight(editor); assert.equal(editor.getPosition().column, '   '.length + 1, '001');
-			moveWordStartRight(editor); assert.equal(editor.getPosition().column, '   /* '.length + 1, '002');
-			moveWordStartRight(editor); assert.equal(editor.getPosition().column, '   /* Just '.length + 1, '003');
-			moveWordStartRight(editor); assert.equal(editor.getPosition().column, '   /* Just some   '.length + 1, '004');
-			moveWordStartRight(editor); assert.equal(editor.getPosition().column, '   /* Just some   more   '.length + 1, '005');
-			moveWordStartRight(editor); assert.equal(editor.getPosition().column, '   /* Just some   more   text '.length + 1, '006');
-			moveWordStartRight(editor); assert.equal(editor.getPosition().column, '   /* Just some   more   text a'.length + 1, '007');
-			moveWordStartRight(editor); assert.equal(editor.getPosition().column, '   /* Just some   more   text a+= '.length + 1, '008');
-			moveWordStartRight(editor); assert.equal(editor.getPosition().column, '   /* Just some   more   text a+= 3 '.length + 1, '009');
-			moveWordStartRight(editor); assert.equal(editor.getPosition().column, '   /* Just some   more   text a+= 3 +'.length + 1, '010');
-			moveWordStartRight(editor); assert.equal(editor.getPosition().column, '   /* Just some   more   text a+= 3 +5'.length + 1, '011');
-			moveWordStartRight(editor); assert.equal(editor.getPosition().column, '   /* Just some   more   text a+= 3 +5-'.length + 1, '012');
-			moveWordStartRight(editor); assert.equal(editor.getPosition().column, '   /* Just some   more   text a+= 3 +5-3 '.length + 1, '013');
-			moveWordStartRight(editor); assert.equal(editor.getPosition().column, '   /* Just some   more   text a+= 3 +5-3 + '.length + 1, '014');
-			moveWordStartRight(editor); assert.equal(editor.getPosition().column, '   /* Just some   more   text a+= 3 +5-3 + 7 '.length + 1, '015');
-			moveWordStartRight(editor); assert.equal(editor.getPosition().column, '   /* Just some   more   text a+= 3 +5-3 + 7 */  '.length + 1, '016');
-		});
+		// This is the behaviour observed in Visual Studio, please do not touch test
+		const EXPECTED = [
+			'   |/* |Just |some   |more   |text |a|+= |3 |+|5|-|3 |+ |7 |*/  |',
+		].join('\n');
+		const [text,] = deserializePipePositions(EXPECTED);
+		const actualStops = testRepeatedActionAndExtractPositions(
+			text,
+			new Position(1, 1),
+			ed => moveWordStartRight(ed),
+			ed => ed.getPosition(),
+			ed => ed.getPosition().equals(new Position(1, 50))
+		);
+		const actual = serializePipePositions(text, actualStops);
+		assert.deepEqual(actual, EXPECTED);
 	});
 
-	test('delete word left for non-empty selection', () => {
+	test('issue #51119: cursorWordStartRight regression makes VS compatibility impossible', () => {
+		// This is the behaviour observed in Visual Studio, please do not touch test
+		const EXPECTED = ['this|.|is|.|a|.|test|'].join('\n');
+		const [text,] = deserializePipePositions(EXPECTED);
+		const actualStops = testRepeatedActionAndExtractPositions(
+			text,
+			new Position(1, 1),
+			ed => moveWordStartRight(ed),
+			ed => ed.getPosition(),
+			ed => ed.getPosition().equals(new Position(1, 15))
+		);
+		const actual = serializePipePositions(text, actualStops);
+		assert.deepEqual(actual, EXPECTED);
+	});
+
+	test('deleteWordLeft for non-empty selection', () => {
 		withTestCodeEditor([
 			'    \tMy First Line\t ',
 			'\tMy Second Line',
@@ -365,7 +319,7 @@ suite('WordOperations', () => {
 		});
 	});
 
-	test('delete word left for caret at beginning of document', () => {
+	test('deleteWordLeft for cursor at beginning of document', () => {
 		withTestCodeEditor([
 			'    \tMy First Line\t ',
 			'\tMy Second Line',
@@ -381,7 +335,7 @@ suite('WordOperations', () => {
 		});
 	});
 
-	test('delete word left for caret at end of whitespace', () => {
+	test('deleteWordLeft for cursor at end of whitespace', () => {
 		withTestCodeEditor([
 			'    \tMy First Line\t ',
 			'\tMy Second Line',
@@ -397,7 +351,7 @@ suite('WordOperations', () => {
 		});
 	});
 
-	test('delete word left for caret just behind a word', () => {
+	test('deleteWordLeft for cursor just behind a word', () => {
 		withTestCodeEditor([
 			'    \tMy First Line\t ',
 			'\tMy Second Line',
@@ -413,7 +367,7 @@ suite('WordOperations', () => {
 		});
 	});
 
-	test('delete word left for caret inside of a word', () => {
+	test('deleteWordLeft for cursor inside of a word', () => {
 		withTestCodeEditor([
 			'    \tMy First Line\t ',
 			'\tMy Second Line',
@@ -429,7 +383,7 @@ suite('WordOperations', () => {
 		});
 	});
 
-	test('delete word right for non-empty selection', () => {
+	test('deleteWordRight for non-empty selection', () => {
 		withTestCodeEditor([
 			'    \tMy First Line\t ',
 			'\tMy Second Line',
@@ -445,7 +399,7 @@ suite('WordOperations', () => {
 		});
 	});
 
-	test('delete word right for caret at end of document', () => {
+	test('deleteWordRight for cursor at end of document', () => {
 		withTestCodeEditor([
 			'    \tMy First Line\t ',
 			'\tMy Second Line',
@@ -461,7 +415,7 @@ suite('WordOperations', () => {
 		});
 	});
 
-	test('delete word right for caret at beggining of whitespace', () => {
+	test('deleteWordRight for cursor at beggining of whitespace', () => {
 		withTestCodeEditor([
 			'    \tMy First Line\t ',
 			'\tMy Second Line',
@@ -477,7 +431,7 @@ suite('WordOperations', () => {
 		});
 	});
 
-	test('delete word right for caret just before a word', () => {
+	test('deleteWordRight for cursor just before a word', () => {
 		withTestCodeEditor([
 			'    \tMy First Line\t ',
 			'\tMy Second Line',
@@ -493,7 +447,7 @@ suite('WordOperations', () => {
 		});
 	});
 
-	test('delete word right for caret inside of a word', () => {
+	test('deleteWordRight for cursor inside of a word', () => {
 		withTestCodeEditor([
 			'    \tMy First Line\t ',
 			'\tMy Second Line',
@@ -509,69 +463,55 @@ suite('WordOperations', () => {
 		});
 	});
 
-	test('issue #832: deleteWordLeft', () => {
-		withTestCodeEditor([
-			'   /* Just some text a+= 3 +5 */  '
-		], {}, (editor, _) => {
-			const model = editor.getModel();
-			editor.setPosition(new Position(1, 37));
-			deleteWordLeft(editor); assert.equal(model.getLineContent(1), '   /* Just some text a+= 3 +5 */', '001');
-			deleteWordLeft(editor); assert.equal(model.getLineContent(1), '   /* Just some text a+= 3 +5 ', '002');
-			deleteWordLeft(editor); assert.equal(model.getLineContent(1), '   /* Just some text a+= 3 +', '003');
-			deleteWordLeft(editor); assert.equal(model.getLineContent(1), '   /* Just some text a+= 3 ', '004');
-			deleteWordLeft(editor); assert.equal(model.getLineContent(1), '   /* Just some text a+= ', '005');
-			deleteWordLeft(editor); assert.equal(model.getLineContent(1), '   /* Just some text a', '006');
-			deleteWordLeft(editor); assert.equal(model.getLineContent(1), '   /* Just some text ', '007');
-			deleteWordLeft(editor); assert.equal(model.getLineContent(1), '   /* Just some ', '008');
-			deleteWordLeft(editor); assert.equal(model.getLineContent(1), '   /* Just ', '009');
-			deleteWordLeft(editor); assert.equal(model.getLineContent(1), '   /* ', '010');
-			deleteWordLeft(editor); assert.equal(model.getLineContent(1), '   ', '011');
-			deleteWordLeft(editor); assert.equal(model.getLineContent(1), '', '012');
-		});
+	test('deleteWordLeft - issue #832', () => {
+		const EXPECTED = [
+			'|   |/* |Just |some |text |a|+= |3 |+|5 |*/|  ',
+		].join('\n');
+		const [text,] = deserializePipePositions(EXPECTED);
+		const actualStops = testRepeatedActionAndExtractPositions(
+			text,
+			new Position(1000, 10000),
+			ed => deleteWordLeft(ed),
+			ed => ed.getPosition(),
+			ed => ed.getValue().length === 0
+		);
+		const actual = serializePipePositions(text, actualStops);
+		assert.deepEqual(actual, EXPECTED);
 	});
 
 	test('deleteWordStartLeft', () => {
-		withTestCodeEditor([
-			'   /* Just some text a+= 3 +5 */  '
-		], {}, (editor, _) => {
-			const model = editor.getModel();
-			editor.setPosition(new Position(1, 37));
-
-			deleteWordStartLeft(editor); assert.equal(model.getLineContent(1), '   /* Just some text a+= 3 +5 ', '001');
-			deleteWordStartLeft(editor); assert.equal(model.getLineContent(1), '   /* Just some text a+= 3 +', '002');
-			deleteWordStartLeft(editor); assert.equal(model.getLineContent(1), '   /* Just some text a+= 3 ', '003');
-			deleteWordStartLeft(editor); assert.equal(model.getLineContent(1), '   /* Just some text a+= ', '004');
-			deleteWordStartLeft(editor); assert.equal(model.getLineContent(1), '   /* Just some text a', '005');
-			deleteWordStartLeft(editor); assert.equal(model.getLineContent(1), '   /* Just some text ', '006');
-			deleteWordStartLeft(editor); assert.equal(model.getLineContent(1), '   /* Just some ', '007');
-			deleteWordStartLeft(editor); assert.equal(model.getLineContent(1), '   /* Just ', '008');
-			deleteWordStartLeft(editor); assert.equal(model.getLineContent(1), '   /* ', '009');
-			deleteWordStartLeft(editor); assert.equal(model.getLineContent(1), '   ', '010');
-			deleteWordStartLeft(editor); assert.equal(model.getLineContent(1), '', '011');
-		});
+		const EXPECTED = [
+			'|   |/* |Just |some |text |a|+= |3 |+|5 |*/  ',
+		].join('\n');
+		const [text,] = deserializePipePositions(EXPECTED);
+		const actualStops = testRepeatedActionAndExtractPositions(
+			text,
+			new Position(1000, 10000),
+			ed => deleteWordStartLeft(ed),
+			ed => ed.getPosition(),
+			ed => ed.getValue().length === 0
+		);
+		const actual = serializePipePositions(text, actualStops);
+		assert.deepEqual(actual, EXPECTED);
 	});
 
 	test('deleteWordEndLeft', () => {
-		withTestCodeEditor([
-			'   /* Just some text a+= 3 +5 */  '
-		], {}, (editor, _) => {
-			const model = editor.getModel();
-			editor.setPosition(new Position(1, 37));
-			deleteWordEndLeft(editor); assert.equal(model.getLineContent(1), '   /* Just some text a+= 3 +5 */', '001');
-			deleteWordEndLeft(editor); assert.equal(model.getLineContent(1), '   /* Just some text a+= 3 +5', '002');
-			deleteWordEndLeft(editor); assert.equal(model.getLineContent(1), '   /* Just some text a+= 3 +', '003');
-			deleteWordEndLeft(editor); assert.equal(model.getLineContent(1), '   /* Just some text a+= 3', '004');
-			deleteWordEndLeft(editor); assert.equal(model.getLineContent(1), '   /* Just some text a+=', '005');
-			deleteWordEndLeft(editor); assert.equal(model.getLineContent(1), '   /* Just some text a', '006');
-			deleteWordEndLeft(editor); assert.equal(model.getLineContent(1), '   /* Just some text', '007');
-			deleteWordEndLeft(editor); assert.equal(model.getLineContent(1), '   /* Just some', '008');
-			deleteWordEndLeft(editor); assert.equal(model.getLineContent(1), '   /* Just', '009');
-			deleteWordEndLeft(editor); assert.equal(model.getLineContent(1), '   /*', '010');
-			deleteWordEndLeft(editor); assert.equal(model.getLineContent(1), '', '011');
-		});
+		const EXPECTED = [
+			'|   /*| Just| some| text| a|+=| 3| +|5| */|  ',
+		].join('\n');
+		const [text,] = deserializePipePositions(EXPECTED);
+		const actualStops = testRepeatedActionAndExtractPositions(
+			text,
+			new Position(1000, 10000),
+			ed => deleteWordEndLeft(ed),
+			ed => ed.getPosition(),
+			ed => ed.getValue().length === 0
+		);
+		const actual = serializePipePositions(text, actualStops);
+		assert.deepEqual(actual, EXPECTED);
 	});
 
-	test('issue #24947', () => {
+	test('deleteWordLeft - issue #24947', () => {
 		withTestCodeEditor([
 			'{',
 			'}'
@@ -600,29 +540,21 @@ suite('WordOperations', () => {
 		});
 	});
 
-	test('issue #832: deleteWordRight', () => {
-		withTestCodeEditor([
-			'   /* Just some text a+= 3 +5-3 */  '
-		], {}, (editor, _) => {
-			const model = editor.getModel();
-			editor.setPosition(new Position(1, 1));
-			deleteWordRight(editor); assert.equal(model.getLineContent(1), '/* Just some text a+= 3 +5-3 */  ', '001');
-			deleteWordRight(editor); assert.equal(model.getLineContent(1), ' Just some text a+= 3 +5-3 */  ', '002');
-			deleteWordRight(editor); assert.equal(model.getLineContent(1), ' some text a+= 3 +5-3 */  ', '003');
-			deleteWordRight(editor); assert.equal(model.getLineContent(1), ' text a+= 3 +5-3 */  ', '004');
-			deleteWordRight(editor); assert.equal(model.getLineContent(1), ' a+= 3 +5-3 */  ', '005');
-			deleteWordRight(editor); assert.equal(model.getLineContent(1), '+= 3 +5-3 */  ', '006');
-			deleteWordRight(editor); assert.equal(model.getLineContent(1), ' 3 +5-3 */  ', '007');
-			deleteWordRight(editor); assert.equal(model.getLineContent(1), ' +5-3 */  ', '008');
-			deleteWordRight(editor); assert.equal(model.getLineContent(1), '5-3 */  ', '009');
-			deleteWordRight(editor); assert.equal(model.getLineContent(1), '-3 */  ', '010');
-			deleteWordRight(editor); assert.equal(model.getLineContent(1), '3 */  ', '011');
-			deleteWordRight(editor); assert.equal(model.getLineContent(1), ' */  ', '012');
-			deleteWordRight(editor); assert.equal(model.getLineContent(1), '  ', '013');
-		});
+	test('deleteWordRight - issue #832', () => {
+		const EXPECTED = '   |/*| Just| some| text| a|+=| 3| +|5|-|3| */|  |';
+		const [text,] = deserializePipePositions(EXPECTED);
+		const actualStops = testRepeatedActionAndExtractPositions(
+			text,
+			new Position(1, 1),
+			ed => deleteWordRight(ed),
+			ed => new Position(1, text.length - ed.getValue().length + 1),
+			ed => ed.getValue().length === 0
+		);
+		const actual = serializePipePositions(text, actualStops);
+		assert.deepEqual(actual, EXPECTED);
 	});
 
-	test('issue #3882: deleteWordRight', () => {
+	test('deleteWordRight - issue #3882', () => {
 		withTestCodeEditor([
 			'public void Add( int x,',
 			'                 int y )'
@@ -633,7 +565,7 @@ suite('WordOperations', () => {
 		});
 	});
 
-	test('issue #3882: deleteWordStartRight', () => {
+	test('deleteWordStartRight - issue #3882', () => {
 		withTestCodeEditor([
 			'public void Add( int x,',
 			'                 int y )'
@@ -644,7 +576,7 @@ suite('WordOperations', () => {
 		});
 	});
 
-	test('issue #3882: deleteWordEndRight', () => {
+	test('deleteWordEndRight - issue #3882', () => {
 		withTestCodeEditor([
 			'public void Add( int x,',
 			'                 int y )'
@@ -656,50 +588,34 @@ suite('WordOperations', () => {
 	});
 
 	test('deleteWordStartRight', () => {
-		withTestCodeEditor([
-			'   /* Just some text a+= 3 +5-3 */  '
-		], {}, (editor, _) => {
-			const model = editor.getModel();
-			editor.setPosition(new Position(1, 1));
-
-			deleteWordStartRight(editor); assert.equal(model.getLineContent(1), '/* Just some text a+= 3 +5-3 */  ', '001');
-			deleteWordStartRight(editor); assert.equal(model.getLineContent(1), 'Just some text a+= 3 +5-3 */  ', '002');
-			deleteWordStartRight(editor); assert.equal(model.getLineContent(1), 'some text a+= 3 +5-3 */  ', '003');
-			deleteWordStartRight(editor); assert.equal(model.getLineContent(1), 'text a+= 3 +5-3 */  ', '004');
-			deleteWordStartRight(editor); assert.equal(model.getLineContent(1), 'a+= 3 +5-3 */  ', '005');
-			deleteWordStartRight(editor); assert.equal(model.getLineContent(1), '+= 3 +5-3 */  ', '006');
-			deleteWordStartRight(editor); assert.equal(model.getLineContent(1), '3 +5-3 */  ', '007');
-			deleteWordStartRight(editor); assert.equal(model.getLineContent(1), '+5-3 */  ', '008');
-			deleteWordStartRight(editor); assert.equal(model.getLineContent(1), '5-3 */  ', '009');
-			deleteWordStartRight(editor); assert.equal(model.getLineContent(1), '-3 */  ', '010');
-			deleteWordStartRight(editor); assert.equal(model.getLineContent(1), '3 */  ', '011');
-			deleteWordStartRight(editor); assert.equal(model.getLineContent(1), '*/  ', '012');
-			deleteWordStartRight(editor); assert.equal(model.getLineContent(1), '', '013');
-		});
+		const EXPECTED = '   |/* |Just |some |text |a|+= |3 |+|5|-|3 |*/  |';
+		const [text,] = deserializePipePositions(EXPECTED);
+		const actualStops = testRepeatedActionAndExtractPositions(
+			text,
+			new Position(1, 1),
+			ed => deleteWordStartRight(ed),
+			ed => new Position(1, text.length - ed.getValue().length + 1),
+			ed => ed.getValue().length === 0
+		);
+		const actual = serializePipePositions(text, actualStops);
+		assert.deepEqual(actual, EXPECTED);
 	});
 
 	test('deleteWordEndRight', () => {
-		withTestCodeEditor([
-			'   /* Just some text a+= 3 +5-3 */  '
-		], {}, (editor, _) => {
-			const model = editor.getModel();
-			editor.setPosition(new Position(1, 1));
-			deleteWordEndRight(editor); assert.equal(model.getLineContent(1), ' Just some text a+= 3 +5-3 */  ', '001');
-			deleteWordEndRight(editor); assert.equal(model.getLineContent(1), ' some text a+= 3 +5-3 */  ', '002');
-			deleteWordEndRight(editor); assert.equal(model.getLineContent(1), ' text a+= 3 +5-3 */  ', '003');
-			deleteWordEndRight(editor); assert.equal(model.getLineContent(1), ' a+= 3 +5-3 */  ', '004');
-			deleteWordEndRight(editor); assert.equal(model.getLineContent(1), '+= 3 +5-3 */  ', '005');
-			deleteWordEndRight(editor); assert.equal(model.getLineContent(1), ' 3 +5-3 */  ', '006');
-			deleteWordEndRight(editor); assert.equal(model.getLineContent(1), ' +5-3 */  ', '007');
-			deleteWordEndRight(editor); assert.equal(model.getLineContent(1), '5-3 */  ', '008');
-			deleteWordEndRight(editor); assert.equal(model.getLineContent(1), '-3 */  ', '009');
-			deleteWordEndRight(editor); assert.equal(model.getLineContent(1), '3 */  ', '010');
-			deleteWordEndRight(editor); assert.equal(model.getLineContent(1), ' */  ', '011');
-			deleteWordEndRight(editor); assert.equal(model.getLineContent(1), '  ', '012');
-		});
+		const EXPECTED = '   /*| Just| some| text| a|+=| 3| +|5|-|3| */|  |';
+		const [text,] = deserializePipePositions(EXPECTED);
+		const actualStops = testRepeatedActionAndExtractPositions(
+			text,
+			new Position(1, 1),
+			ed => deleteWordEndRight(ed),
+			ed => new Position(1, text.length - ed.getValue().length + 1),
+			ed => ed.getValue().length === 0
+		);
+		const actual = serializePipePositions(text, actualStops);
+		assert.deepEqual(actual, EXPECTED);
 	});
 
-	test('issue #3882 (1): Ctrl+Delete removing entire line when used at the end of line', () => {
+	test('deleteWordRight - issue #3882 (1): Ctrl+Delete removing entire line when used at the end of line', () => {
 		withTestCodeEditor([
 			'A line with text.',
 			'   And another one'
@@ -710,7 +626,7 @@ suite('WordOperations', () => {
 		});
 	});
 
-	test('issue #3882 (2): Ctrl+Delete removing entire line when used at the end of line', () => {
+	test('deleteWordLeft - issue #3882 (2): Ctrl+Delete removing entire line when used at the end of line', () => {
 		withTestCodeEditor([
 			'A line with text.',
 			'   And another one'
diff --git a/src/vs/editor/contrib/wordOperations/test/wordTestUtils.ts b/src/vs/editor/contrib/wordOperations/test/wordTestUtils.ts
new file mode 100644
index 00000000000..8ab24036b80
--- /dev/null
+++ b/src/vs/editor/contrib/wordOperations/test/wordTestUtils.ts
@@ -0,0 +1,79 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+'use strict';
+
+import { Position } from 'vs/editor/common/core/position';
+import { withTestCodeEditor, TestCodeEditor } from 'vs/editor/test/browser/testCodeEditor';
+
+export function deserializePipePositions(text: string): [string, Position[]] {
+	let resultText = '';
+	let lineNumber = 1;
+	let charIndex = 0;
+	let positions: Position[] = [];
+	for (let i = 0, len = text.length; i < len; i++) {
+		const chr = text.charAt(i);
+		if (chr === '\n') {
+			resultText += chr;
+			lineNumber++;
+			charIndex = 0;
+			continue;
+		}
+		if (chr === '|') {
+			positions.push(new Position(lineNumber, charIndex + 1));
+		} else {
+			resultText += chr;
+			charIndex++;
+		}
+	}
+	return [resultText, positions];
+}
+
+export function serializePipePositions(text: string, positions: Position[]): string {
+	positions.sort(Position.compare);
+	let resultText = '';
+	let lineNumber = 1;
+	let charIndex = 0;
+	for (let i = 0, len = text.length; i < len; i++) {
+		const chr = text.charAt(i);
+		if (positions.length > 0 && positions[0].lineNumber === lineNumber && positions[0].column === charIndex + 1) {
+			resultText += '|';
+			positions.shift();
+		}
+		resultText += chr;
+		if (chr === '\n') {
+			lineNumber++;
+			charIndex = 0;
+		} else {
+			charIndex++;
+		}
+	}
+	if (positions.length > 0 && positions[0].lineNumber === lineNumber && positions[0].column === charIndex + 1) {
+		resultText += '|';
+		positions.shift();
+	}
+	if (positions.length > 0) {
+		throw new Error(`Unexpected left over positions!!!`);
+	}
+	return resultText;
+}
+
+export function testRepeatedActionAndExtractPositions(text: string, initialPosition: Position, action: (editor: TestCodeEditor) => void, record: (editor: TestCodeEditor) => Position, stopCondition: (editor: TestCodeEditor) => boolean): Position[] {
+	let actualStops: Position[] = [];
+	withTestCodeEditor(text, {}, (editor, _) => {
+		editor.setPosition(initialPosition);
+		while (true) {
+			action(editor);
+			actualStops.push(record(editor));
+			if (stopCondition(editor)) {
+				break;
+			}
+
+			if (actualStops.length > 1000) {
+				throw new Error(`Endless loop detected!`);
+			}
+		}
+	});
+	return actualStops;
+}
diff --git a/src/vs/editor/contrib/wordOperations/wordOperations.ts b/src/vs/editor/contrib/wordOperations/wordOperations.ts
index 528303ab72c..a46cfb237ab 100644
--- a/src/vs/editor/contrib/wordOperations/wordOperations.ts
+++ b/src/vs/editor/contrib/wordOperations/wordOperations.ts
@@ -19,6 +19,7 @@ import { getMapForWordSeparators, WordCharacterClassifier } from 'vs/editor/comm
 import { CursorState } from 'vs/editor/common/controller/cursorCommon';
 import { CursorChangeReason } from 'vs/editor/common/controller/cursorEvents';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
+import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
 
 export interface MoveWordOptions extends ICommandOptions {
 	inSelectionMode: boolean;
@@ -100,7 +101,8 @@ export class CursorWordStartLeft extends WordLeftCommand {
 			kbOpts: {
 				kbExpr: EditorContextKeys.textInputFocus,
 				primary: KeyMod.CtrlCmd | KeyCode.LeftArrow,
-				mac: { primary: KeyMod.Alt | KeyCode.LeftArrow }
+				mac: { primary: KeyMod.Alt | KeyCode.LeftArrow },
+				weight: KeybindingWeight.EditorContrib
 			}
 		});
 	}
@@ -121,7 +123,7 @@ export class CursorWordLeft extends WordLeftCommand {
 	constructor() {
 		super({
 			inSelectionMode: false,
-			wordNavigationType: WordNavigationType.WordStart,
+			wordNavigationType: WordNavigationType.WordStartFast,
 			id: 'cursorWordLeft',
 			precondition: null
 		});
@@ -138,7 +140,8 @@ export class CursorWordStartLeftSelect extends WordLeftCommand {
 			kbOpts: {
 				kbExpr: EditorContextKeys.textInputFocus,
 				primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.LeftArrow,
-				mac: { primary: KeyMod.Alt | KeyMod.Shift | KeyCode.LeftArrow }
+				mac: { primary: KeyMod.Alt | KeyMod.Shift | KeyCode.LeftArrow },
+				weight: KeybindingWeight.EditorContrib
 			}
 		});
 	}
@@ -187,7 +190,8 @@ export class CursorWordEndRight extends WordRightCommand {
 			kbOpts: {
 				kbExpr: EditorContextKeys.textInputFocus,
 				primary: KeyMod.CtrlCmd | KeyCode.RightArrow,
-				mac: { primary: KeyMod.Alt | KeyCode.RightArrow }
+				mac: { primary: KeyMod.Alt | KeyCode.RightArrow },
+				weight: KeybindingWeight.EditorContrib
 			}
 		});
 	}
@@ -225,7 +229,8 @@ export class CursorWordEndRightSelect extends WordRightCommand {
 			kbOpts: {
 				kbExpr: EditorContextKeys.textInputFocus,
 				primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.RightArrow,
-				mac: { primary: KeyMod.Alt | KeyMod.Shift | KeyCode.RightArrow }
+				mac: { primary: KeyMod.Alt | KeyMod.Shift | KeyCode.RightArrow },
+				weight: KeybindingWeight.EditorContrib
 			}
 		});
 	}
@@ -330,7 +335,8 @@ export class DeleteWordLeft extends DeleteWordLeftCommand {
 			kbOpts: {
 				kbExpr: EditorContextKeys.textInputFocus,
 				primary: KeyMod.CtrlCmd | KeyCode.Backspace,
-				mac: { primary: KeyMod.Alt | KeyCode.Backspace }
+				mac: { primary: KeyMod.Alt | KeyCode.Backspace },
+				weight: KeybindingWeight.EditorContrib
 			}
 		});
 	}
@@ -368,7 +374,8 @@ export class DeleteWordRight extends DeleteWordRightCommand {
 			kbOpts: {
 				kbExpr: EditorContextKeys.textInputFocus,
 				primary: KeyMod.CtrlCmd | KeyCode.Delete,
-				mac: { primary: KeyMod.Alt | KeyCode.Delete }
+				mac: { primary: KeyMod.Alt | KeyCode.Delete },
+				weight: KeybindingWeight.EditorContrib
 			}
 		});
 	}
diff --git a/src/vs/editor/contrib/wordPartOperations/test/wordPartOperations.test.ts b/src/vs/editor/contrib/wordPartOperations/test/wordPartOperations.test.ts
new file mode 100644
index 00000000000..67864f7df46
--- /dev/null
+++ b/src/vs/editor/contrib/wordPartOperations/test/wordPartOperations.test.ts
@@ -0,0 +1,155 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+'use strict';
+
+import * as assert from 'assert';
+import { Position } from 'vs/editor/common/core/position';
+import { DeleteWordPartLeft, DeleteWordPartRight, CursorWordPartLeft, CursorWordPartRight } from 'vs/editor/contrib/wordPartOperations/wordPartOperations';
+import { EditorCommand } from 'vs/editor/browser/editorExtensions';
+import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
+import { deserializePipePositions, testRepeatedActionAndExtractPositions, serializePipePositions } from 'vs/editor/contrib/wordOperations/test/wordTestUtils';
+
+suite('WordPartOperations', () => {
+	const _deleteWordPartLeft = new DeleteWordPartLeft();
+	const _deleteWordPartRight = new DeleteWordPartRight();
+	const _cursorWordPartLeft = new CursorWordPartLeft();
+	const _cursorWordPartRight = new CursorWordPartRight();
+
+	function runEditorCommand(editor: ICodeEditor, command: EditorCommand): void {
+		command.runEditorCommand(null, editor, null);
+	}
+	function moveWordPartLeft(editor: ICodeEditor, inSelectionmode: boolean = false): void {
+		runEditorCommand(editor, inSelectionmode ? _cursorWordPartLeft : _cursorWordPartLeft);
+	}
+	function moveWordPartRight(editor: ICodeEditor, inSelectionmode: boolean = false): void {
+		runEditorCommand(editor, inSelectionmode ? _cursorWordPartLeft : _cursorWordPartRight);
+	}
+	function deleteWordPartLeft(editor: ICodeEditor): void {
+		runEditorCommand(editor, _deleteWordPartLeft);
+	}
+	function deleteWordPartRight(editor: ICodeEditor): void {
+		runEditorCommand(editor, _deleteWordPartRight);
+	}
+
+	test('move word part left basic', () => {
+		const EXPECTED = [
+			'|start| |line|',
+			'|this|Is|A|Camel|Case|Var|  |this|_is|_a|_snake|_case|_var| |THIS|_IS|_CAPS|_SNAKE| |this|_IS|Mixed|Use|',
+			'|end| |line'
+		].join('\n');
+		const [text,] = deserializePipePositions(EXPECTED);
+		const actualStops = testRepeatedActionAndExtractPositions(
+			text,
+			new Position(1000, 1000),
+			ed => moveWordPartLeft(ed),
+			ed => ed.getPosition(),
+			ed => ed.getPosition().equals(new Position(1, 1))
+		);
+		const actual = serializePipePositions(text, actualStops);
+		assert.deepEqual(actual, EXPECTED);
+	});
+
+	test('issue #53899: move word part left whitespace', () => {
+		const EXPECTED = '|myvar| |=| |\'|demonstration|     |of| |selection| |with| |space|\'';
+		const [text,] = deserializePipePositions(EXPECTED);
+		const actualStops = testRepeatedActionAndExtractPositions(
+			text,
+			new Position(1000, 1000),
+			ed => moveWordPartLeft(ed),
+			ed => ed.getPosition(),
+			ed => ed.getPosition().equals(new Position(1, 1))
+		);
+		const actual = serializePipePositions(text, actualStops);
+		assert.deepEqual(actual, EXPECTED);
+	});
+
+	test('issue #53899: move word part left underscores', () => {
+		const EXPECTED = '|myvar| |=| |\'|demonstration|_____of| |selection| |with| |space|\'';
+		const [text,] = deserializePipePositions(EXPECTED);
+		const actualStops = testRepeatedActionAndExtractPositions(
+			text,
+			new Position(1000, 1000),
+			ed => moveWordPartLeft(ed),
+			ed => ed.getPosition(),
+			ed => ed.getPosition().equals(new Position(1, 1))
+		);
+		const actual = serializePipePositions(text, actualStops);
+		assert.deepEqual(actual, EXPECTED);
+	});
+
+	test('move word part right basic', () => {
+		const EXPECTED = [
+			'start| |line|',
+			'|this|Is|A|Camel|Case|Var|  |this_|is_|a_|snake_|case_|var| |THIS_|IS_|CAPS_|SNAKE| |this_|IS|Mixed|Use|',
+			'|end| |line|'
+		].join('\n');
+		const [text,] = deserializePipePositions(EXPECTED);
+		const actualStops = testRepeatedActionAndExtractPositions(
+			text,
+			new Position(1, 1),
+			ed => moveWordPartRight(ed),
+			ed => ed.getPosition(),
+			ed => ed.getPosition().equals(new Position(3, 9))
+		);
+		const actual = serializePipePositions(text, actualStops);
+		assert.deepEqual(actual, EXPECTED);
+	});
+
+	test('issue #53899: move word part right whitespace', () => {
+		const EXPECTED = 'myvar| =| \'demonstration|     |of| |selection| |with| |space|\'|';
+		const [text,] = deserializePipePositions(EXPECTED);
+		const actualStops = testRepeatedActionAndExtractPositions(
+			text,
+			new Position(1, 1),
+			ed => moveWordPartRight(ed),
+			ed => ed.getPosition(),
+			ed => ed.getPosition().equals(new Position(1, 52))
+		);
+		const actual = serializePipePositions(text, actualStops);
+		assert.deepEqual(actual, EXPECTED);
+	});
+
+	test('issue #53899: move word part right underscores', () => {
+		const EXPECTED = 'myvar| =| \'demonstration_____|of| |selection| |with| |space|\'|';
+		const [text,] = deserializePipePositions(EXPECTED);
+		const actualStops = testRepeatedActionAndExtractPositions(
+			text,
+			new Position(1, 1),
+			ed => moveWordPartRight(ed),
+			ed => ed.getPosition(),
+			ed => ed.getPosition().equals(new Position(1, 52))
+		);
+		const actual = serializePipePositions(text, actualStops);
+		assert.deepEqual(actual, EXPECTED);
+	});
+
+	test('delete word part left basic', () => {
+		const EXPECTED = '|   |/*| |Just| |some| |text| |a|+=| |3| |+|5|-|3| |*/|  |this|Is|A|Camel|Case|Var|  |this|_is|_a|_snake|_case|_var| |THIS|_IS|_CAPS|_SNAKE| |this|_IS|Mixed|Use';
+		const [text,] = deserializePipePositions(EXPECTED);
+		const actualStops = testRepeatedActionAndExtractPositions(
+			text,
+			new Position(1, 1000),
+			ed => deleteWordPartLeft(ed),
+			ed => ed.getPosition(),
+			ed => ed.getValue().length === 0
+		);
+		const actual = serializePipePositions(text, actualStops);
+		assert.deepEqual(actual, EXPECTED);
+	});
+
+	test('delete word part right basic', () => {
+		const EXPECTED = '   |/*| |Just| |some| |text| |a|+=| 3| +|5|-|3| */|  |this|Is|A|Camel|Case|Var|  |this_|is_|a_|snake_|case_|var| |THIS_|IS_|CAPS_|SNAKE| |this_|IS|Mixed|Use|';
+		const [text,] = deserializePipePositions(EXPECTED);
+		const actualStops = testRepeatedActionAndExtractPositions(
+			text,
+			new Position(1, 1),
+			ed => deleteWordPartRight(ed),
+			ed => new Position(1, text.length - ed.getValue().length + 1),
+			ed => ed.getValue().length === 0
+		);
+		const actual = serializePipePositions(text, actualStops);
+		assert.deepEqual(actual, EXPECTED);
+	});
+});
diff --git a/src/vs/editor/contrib/wordPartOperations/wordPartOperations.ts b/src/vs/editor/contrib/wordPartOperations/wordPartOperations.ts
new file mode 100644
index 00000000000..fec93549d35
--- /dev/null
+++ b/src/vs/editor/contrib/wordPartOperations/wordPartOperations.ts
@@ -0,0 +1,160 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
+import { ITextModel } from 'vs/editor/common/model';
+import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
+import { Selection } from 'vs/editor/common/core/selection';
+import { registerEditorCommand } from 'vs/editor/browser/editorExtensions';
+import { Range } from 'vs/editor/common/core/range';
+import { WordNavigationType, WordPartOperations } from 'vs/editor/common/controller/cursorWordOperations';
+import { WordCharacterClassifier } from 'vs/editor/common/controller/wordCharacterClassifier';
+import { DeleteWordCommand, MoveWordCommand } from '../wordOperations/wordOperations';
+import { Position } from 'vs/editor/common/core/position';
+import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
+import { CommandsRegistry } from 'vs/platform/commands/common/commands';
+
+export class DeleteWordPartLeft extends DeleteWordCommand {
+	constructor() {
+		super({
+			whitespaceHeuristics: true,
+			wordNavigationType: WordNavigationType.WordStart,
+			id: 'deleteWordPartLeft',
+			precondition: EditorContextKeys.writable,
+			kbOpts: {
+				kbExpr: EditorContextKeys.textInputFocus,
+				primary: 0,
+				mac: { primary: KeyMod.WinCtrl | KeyMod.Alt | KeyCode.Backspace },
+				weight: KeybindingWeight.EditorContrib
+			}
+		});
+	}
+
+	protected _delete(wordSeparators: WordCharacterClassifier, model: ITextModel, selection: Selection, whitespaceHeuristics: boolean, wordNavigationType: WordNavigationType): Range {
+		let r = WordPartOperations.deleteWordPartLeft(wordSeparators, model, selection, whitespaceHeuristics, wordNavigationType);
+		if (r) {
+			return r;
+		}
+		return new Range(1, 1, 1, 1);
+	}
+}
+
+export class DeleteWordPartRight extends DeleteWordCommand {
+	constructor() {
+		super({
+			whitespaceHeuristics: true,
+			wordNavigationType: WordNavigationType.WordEnd,
+			id: 'deleteWordPartRight',
+			precondition: EditorContextKeys.writable,
+			kbOpts: {
+				kbExpr: EditorContextKeys.textInputFocus,
+				primary: 0,
+				mac: { primary: KeyMod.WinCtrl | KeyMod.Alt | KeyCode.Delete },
+				weight: KeybindingWeight.EditorContrib
+			}
+		});
+	}
+
+	protected _delete(wordSeparators: WordCharacterClassifier, model: ITextModel, selection: Selection, whitespaceHeuristics: boolean, wordNavigationType: WordNavigationType): Range {
+		let r = WordPartOperations.deleteWordPartRight(wordSeparators, model, selection, whitespaceHeuristics, wordNavigationType);
+		if (r) {
+			return r;
+		}
+		const lineCount = model.getLineCount();
+		const maxColumn = model.getLineMaxColumn(lineCount);
+		return new Range(lineCount, maxColumn, lineCount, maxColumn);
+	}
+}
+
+export class WordPartLeftCommand extends MoveWordCommand {
+	protected _move(wordSeparators: WordCharacterClassifier, model: ITextModel, position: Position, wordNavigationType: WordNavigationType): Position {
+		return WordPartOperations.moveWordPartLeft(wordSeparators, model, position, wordNavigationType);
+	}
+}
+export class CursorWordPartLeft extends WordPartLeftCommand {
+	constructor() {
+		super({
+			inSelectionMode: false,
+			wordNavigationType: WordNavigationType.WordStart,
+			id: 'cursorWordPartLeft',
+			precondition: null,
+			kbOpts: {
+				kbExpr: EditorContextKeys.textInputFocus,
+				primary: 0,
+				mac: { primary: KeyMod.WinCtrl | KeyMod.Alt | KeyCode.LeftArrow },
+				weight: KeybindingWeight.EditorContrib
+			}
+		});
+	}
+}
+// Register previous id for compatibility purposes
+CommandsRegistry.registerCommandAlias('cursorWordPartStartLeft', 'cursorWordPartLeft');
+
+export class CursorWordPartLeftSelect extends WordPartLeftCommand {
+	constructor() {
+		super({
+			inSelectionMode: true,
+			wordNavigationType: WordNavigationType.WordStart,
+			id: 'cursorWordPartLeftSelect',
+			precondition: null,
+			kbOpts: {
+				kbExpr: EditorContextKeys.textInputFocus,
+				primary: 0,
+				mac: { primary: KeyMod.WinCtrl | KeyMod.Alt | KeyMod.Shift | KeyCode.LeftArrow },
+				weight: KeybindingWeight.EditorContrib
+			}
+		});
+	}
+}
+// Register previous id for compatibility purposes
+CommandsRegistry.registerCommandAlias('cursorWordPartStartLeftSelect', 'cursorWordPartLeftSelect');
+
+export class WordPartRightCommand extends MoveWordCommand {
+	protected _move(wordSeparators: WordCharacterClassifier, model: ITextModel, position: Position, wordNavigationType: WordNavigationType): Position {
+		return WordPartOperations.moveWordPartRight(wordSeparators, model, position, wordNavigationType);
+	}
+}
+export class CursorWordPartRight extends WordPartRightCommand {
+	constructor() {
+		super({
+			inSelectionMode: false,
+			wordNavigationType: WordNavigationType.WordEnd,
+			id: 'cursorWordPartRight',
+			precondition: null,
+			kbOpts: {
+				kbExpr: EditorContextKeys.textInputFocus,
+				primary: 0,
+				mac: { primary: KeyMod.WinCtrl | KeyMod.Alt | KeyCode.RightArrow },
+				weight: KeybindingWeight.EditorContrib
+			}
+		});
+	}
+}
+export class CursorWordPartRightSelect extends WordPartRightCommand {
+	constructor() {
+		super({
+			inSelectionMode: true,
+			wordNavigationType: WordNavigationType.WordEnd,
+			id: 'cursorWordPartRightSelect',
+			precondition: null,
+			kbOpts: {
+				kbExpr: EditorContextKeys.textInputFocus,
+				primary: 0,
+				mac: { primary: KeyMod.WinCtrl | KeyMod.Alt | KeyMod.Shift | KeyCode.RightArrow },
+				weight: KeybindingWeight.EditorContrib
+			}
+		});
+	}
+}
+
+
+registerEditorCommand(new DeleteWordPartLeft());
+registerEditorCommand(new DeleteWordPartRight());
+registerEditorCommand(new CursorWordPartLeft());
+registerEditorCommand(new CursorWordPartLeftSelect());
+registerEditorCommand(new CursorWordPartRight());
+registerEditorCommand(new CursorWordPartRightSelect());
diff --git a/src/vs/editor/editor.all.ts b/src/vs/editor/editor.all.ts
index e23a365cca7..cc32769c6a6 100644
--- a/src/vs/editor/editor.all.ts
+++ b/src/vs/editor/editor.all.ts
@@ -42,3 +42,4 @@ import 'vs/editor/contrib/suggest/suggestController';
 import 'vs/editor/contrib/toggleTabFocusMode/toggleTabFocusMode';
 import 'vs/editor/contrib/wordHighlighter/wordHighlighter';
 import 'vs/editor/contrib/wordOperations/wordOperations';
+import 'vs/editor/contrib/wordPartOperations/wordPartOperations';
diff --git a/src/vs/editor/editor.api.ts b/src/vs/editor/editor.api.ts
index 5594a22627c..7bd274aab60 100644
--- a/src/vs/editor/editor.api.ts
+++ b/src/vs/editor/editor.api.ts
@@ -35,7 +35,6 @@ export const Position = api.Position;
 export const Range = api.Range;
 export const Selection = api.Selection;
 export const SelectionDirection = api.SelectionDirection;
-export const Severity = api.Severity;
 export const MarkerSeverity = api.MarkerSeverity;
 export const MarkerTag = api.MarkerTag;
 export const Promise = api.Promise;
diff --git a/src/vs/editor/standalone/browser/accessibilityHelp/accessibilityHelp.ts b/src/vs/editor/standalone/browser/accessibilityHelp/accessibilityHelp.ts
index 7f6504e4607..d650416ba53 100644
--- a/src/vs/editor/standalone/browser/accessibilityHelp/accessibilityHelp.ts
+++ b/src/vs/editor/standalone/browser/accessibilityHelp/accessibilityHelp.ts
@@ -26,11 +26,11 @@ import { editorWidgetBackground, widgetShadow, contrastBorder } from 'vs/platfor
 import * as platform from 'vs/base/common/platform';
 import { alert } from 'vs/base/browser/ui/aria/aria';
 import { IOpenerService } from 'vs/platform/opener/common/opener';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { Selection } from 'vs/editor/common/core/selection';
 import * as browser from 'vs/base/browser/browser';
 import { IEditorConstructionOptions } from 'vs/editor/standalone/browser/standaloneCodeEditor';
-import { KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRegistry';
+import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
 
 const CONTEXT_ACCESSIBILITY_WIDGET_VISIBLE = new RawContextKey<boolean>('accessibilityHelpWidgetVisible', false);
 
@@ -342,7 +342,8 @@ class ShowAccessibilityHelpAction extends EditorAction {
 			precondition: null,
 			kbOpts: {
 				kbExpr: EditorContextKeys.focus,
-				primary: (browser.isIE ? KeyMod.CtrlCmd | KeyCode.F1 : KeyMod.Alt | KeyCode.F1)
+				primary: (browser.isIE ? KeyMod.CtrlCmd | KeyCode.F1 : KeyMod.Alt | KeyCode.F1),
+				weight: KeybindingWeight.EditorContrib
 			}
 		});
 	}
@@ -366,7 +367,7 @@ registerEditorCommand(
 		precondition: CONTEXT_ACCESSIBILITY_WIDGET_VISIBLE,
 		handler: x => x.hide(),
 		kbOpts: {
-			weight: KeybindingsRegistry.WEIGHT.editorContrib(100),
+			weight: KeybindingWeight.EditorContrib + 100,
 			kbExpr: EditorContextKeys.focus,
 			primary: KeyCode.Escape,
 			secondary: [KeyMod.Shift | KeyCode.Escape]
diff --git a/src/vs/editor/standalone/browser/colorizer.ts b/src/vs/editor/standalone/browser/colorizer.ts
index 298a4d7a0d5..5309a0ebf41 100644
--- a/src/vs/editor/standalone/browser/colorizer.ts
+++ b/src/vs/editor/standalone/browser/colorizer.ts
@@ -14,6 +14,7 @@ import { LineTokens, IViewLineTokens } from 'vs/editor/common/core/lineTokens';
 import * as strings from 'vs/base/common/strings';
 import { IStandaloneThemeService } from 'vs/editor/standalone/common/standaloneThemeService';
 import { ViewLineRenderingData } from 'vs/editor/common/viewModel/viewModel';
+import { TimeoutTimer } from 'vs/base/common/async';
 
 export interface IColorizerOptions {
 	tabSize?: number;
@@ -42,26 +43,7 @@ export class Colorizer {
 		let render = (str: string) => {
 			domNode.innerHTML = str;
 		};
-		return this.colorize(modeService, text, mimeType, options).then(render, (err) => console.error(err), render);
-	}
-
-	private static _tokenizationSupportChangedPromise(language: string): TPromise<void> {
-		let listener: IDisposable = null;
-		let stopListening = () => {
-			if (listener) {
-				listener.dispose();
-				listener = null;
-			}
-		};
-
-		return new TPromise<void>((c, e, p) => {
-			listener = TokenizationRegistry.onDidChange((e) => {
-				if (e.changedLanguages.indexOf(language) >= 0) {
-					stopListening();
-					c(void 0);
-				}
-			});
-		}, stopListening);
+		return this.colorize(modeService, text, mimeType, options).then(render, (err) => console.error(err));
 	}
 
 	public static colorize(modeService: IModeService, text: string, mimeType: string, options: IColorizerOptions): TPromise<string> {
@@ -84,13 +66,34 @@ export class Colorizer {
 			return TPromise.as(_colorize(lines, options.tabSize, tokenizationSupport));
 		}
 
-		// wait 500ms for mode to load, then give up
-		return TPromise.any([this._tokenizationSupportChangedPromise(language), TPromise.timeout(500)]).then(_ => {
-			let tokenizationSupport = TokenizationRegistry.get(language);
-			if (tokenizationSupport) {
-				return _colorize(lines, options.tabSize, tokenizationSupport);
-			}
-			return _fakeColorize(lines, options.tabSize);
+		return new TPromise<string>((resolve, reject) => {
+			let listener: IDisposable = null;
+			let timeout: TimeoutTimer = null;
+
+			const execute = () => {
+				if (listener) {
+					listener.dispose();
+					listener = null;
+				}
+				if (timeout) {
+					timeout.dispose();
+					timeout = null;
+				}
+				const tokenizationSupport = TokenizationRegistry.get(language);
+				if (tokenizationSupport) {
+					return resolve(_colorize(lines, options.tabSize, tokenizationSupport));
+				}
+				return resolve(_fakeColorize(lines, options.tabSize));
+			};
+
+			// wait 500ms for mode to load, then give up
+			timeout = new TimeoutTimer();
+			timeout.cancelAndSet(execute, 500);
+			listener = TokenizationRegistry.onDidChange((e) => {
+				if (e.changedLanguages.indexOf(language) >= 0) {
+					execute();
+				}
+			});
 		});
 	}
 
@@ -99,6 +102,7 @@ export class Colorizer {
 		const containsRTL = ViewLineRenderingData.containsRTL(line, isBasicASCII, mightContainRTL);
 		let renderResult = renderViewLine(new RenderLineInput(
 			false,
+			true,
 			line,
 			false,
 			isBasicASCII,
@@ -152,6 +156,7 @@ function _fakeColorize(lines: string[], tabSize: number): string {
 		const containsRTL = ViewLineRenderingData.containsRTL(line, isBasicASCII, /* check for RTL */true);
 		let renderResult = renderViewLine(new RenderLineInput(
 			false,
+			true,
 			line,
 			false,
 			isBasicASCII,
@@ -187,6 +192,7 @@ function _actualColorize(lines: string[], tabSize: number, tokenizationSupport:
 		const containsRTL = ViewLineRenderingData.containsRTL(line, isBasicASCII, /* check for RTL */true);
 		let renderResult = renderViewLine(new RenderLineInput(
 			false,
+			true,
 			line,
 			false,
 			isBasicASCII,
diff --git a/src/vs/editor/standalone/browser/quickOpen/editorQuickOpen.ts b/src/vs/editor/standalone/browser/quickOpen/editorQuickOpen.ts
index 8bd223b6a2f..9076c61eb13 100644
--- a/src/vs/editor/standalone/browser/quickOpen/editorQuickOpen.ts
+++ b/src/vs/editor/standalone/browser/quickOpen/editorQuickOpen.ts
@@ -69,7 +69,13 @@ export class QuickOpenController implements editorCommon.IEditorContribution, ID
 			}
 
 			this.lastKnownEditorSelection = null;
-			this.editor.focus();
+
+			// Return focus to the editor if
+			// - focus is back on the <body> element because no other focusable element was clicked
+			// - a command was picked from the picker which indicates the editor should get focused
+			if (document.activeElement === document.body || !canceled) {
+				this.editor.focus();
+			}
 		};
 
 		this.widget = new QuickOpenEditorWidget(
diff --git a/src/vs/editor/standalone/browser/quickOpen/gotoLine.ts b/src/vs/editor/standalone/browser/quickOpen/gotoLine.ts
index 9f83d8111c9..28bf35f5a56 100644
--- a/src/vs/editor/standalone/browser/quickOpen/gotoLine.ts
+++ b/src/vs/editor/standalone/browser/quickOpen/gotoLine.ts
@@ -18,6 +18,7 @@ import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
 import { Position } from 'vs/editor/common/core/position';
 import { Range } from 'vs/editor/common/core/range';
 import { ITextModel } from 'vs/editor/common/model';
+import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
 
 interface ParseResult {
 	position: Position;
@@ -153,7 +154,8 @@ export class GotoLineAction extends BaseEditorQuickOpenAction {
 			kbOpts: {
 				kbExpr: EditorContextKeys.focus,
 				primary: KeyMod.CtrlCmd | KeyCode.KEY_G,
-				mac: { primary: KeyMod.WinCtrl | KeyCode.KEY_G }
+				mac: { primary: KeyMod.WinCtrl | KeyCode.KEY_G },
+				weight: KeybindingWeight.EditorContrib
 			}
 		});
 	}
diff --git a/src/vs/editor/standalone/browser/quickOpen/quickCommand.ts b/src/vs/editor/standalone/browser/quickOpen/quickCommand.ts
index e44e14c0da8..d5f913ea550 100644
--- a/src/vs/editor/standalone/browser/quickOpen/quickCommand.ts
+++ b/src/vs/editor/standalone/browser/quickOpen/quickCommand.ts
@@ -18,6 +18,7 @@ import { registerEditorAction, ServicesAccessor } from 'vs/editor/browser/editor
 import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
 import * as browser from 'vs/base/browser/browser';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
+import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
 
 export class EditorActionCommandEntry extends QuickOpenEntryGroup {
 	private key: string;
@@ -49,18 +50,18 @@ export class EditorActionCommandEntry extends QuickOpenEntryGroup {
 		if (mode === Mode.OPEN) {
 
 			// Use a timeout to give the quick open widget a chance to close itself first
-			TPromise.timeout(50).done(() => {
+			setTimeout(() => {
 
 				// Some actions are enabled only when editor has focus
 				this.editor.focus();
 
 				try {
 					let promise = this.action.run() || TPromise.as(null);
-					promise.done(null, onUnexpectedError);
+					promise.then(null, onUnexpectedError);
 				} catch (error) {
 					onUnexpectedError(error);
 				}
-			}, onUnexpectedError);
+			}, 50);
 
 			return true;
 		}
@@ -79,9 +80,12 @@ export class QuickCommandAction extends BaseEditorQuickOpenAction {
 			precondition: null,
 			kbOpts: {
 				kbExpr: EditorContextKeys.focus,
-				primary: (browser.isIE ? KeyMod.Alt | KeyCode.F1 : KeyCode.F1)
+				primary: (browser.isIE ? KeyMod.Alt | KeyCode.F1 : KeyCode.F1),
+				weight: KeybindingWeight.EditorContrib
 			},
 			menuOpts: {
+				group: 'z_commands',
+				order: 1
 			}
 		});
 	}
diff --git a/src/vs/editor/standalone/browser/quickOpen/quickOutline.ts b/src/vs/editor/standalone/browser/quickOpen/quickOutline.ts
index a09d76a25d5..83ec34ab012 100644
--- a/src/vs/editor/standalone/browser/quickOpen/quickOutline.ts
+++ b/src/vs/editor/standalone/browser/quickOpen/quickOutline.ts
@@ -15,13 +15,15 @@ import { IContext, IHighlight, QuickOpenEntryGroup, QuickOpenModel } from 'vs/ba
 import { IAutoFocus, Mode } from 'vs/base/parts/quickopen/common/quickOpen';
 import { ScrollType } from 'vs/editor/common/editorCommon';
 import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
-import { SymbolInformation, DocumentSymbolProviderRegistry, symbolKindToCssClass, IOutline, Location } from 'vs/editor/common/modes';
+import { DocumentSymbol, DocumentSymbolProviderRegistry, symbolKindToCssClass } from 'vs/editor/common/modes';
 import { BaseEditorQuickOpenAction, IDecorator } from './editorQuickOpen';
 import { getDocumentSymbols } from 'vs/editor/contrib/quickOpen/quickOpen';
 import { registerEditorAction, ServicesAccessor } from 'vs/editor/browser/editorExtensions';
 import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { Range } from 'vs/editor/common/core/range';
+import { Range, IRange } from 'vs/editor/common/core/range';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
+import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
+import { CancellationToken } from 'vs/base/common/cancellation';
 
 let SCOPE_PREFIX = ':';
 
@@ -120,7 +122,8 @@ export class QuickOutlineAction extends BaseEditorQuickOpenAction {
 			precondition: EditorContextKeys.hasDocumentSymbolProvider,
 			kbOpts: {
 				kbExpr: EditorContextKeys.focus,
-				primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KEY_O
+				primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KEY_O,
+				weight: KeybindingWeight.EditorContrib
 			},
 			menuOpts: {
 				group: 'navigation',
@@ -138,16 +141,16 @@ export class QuickOutlineAction extends BaseEditorQuickOpenAction {
 		}
 
 		// Resolve outline
-		return getDocumentSymbols(model).then((result: IOutline) => {
-			if (result.entries.length === 0) {
+		return TPromise.wrap(getDocumentSymbols(model, true, CancellationToken.None).then((result: DocumentSymbol[]) => {
+			if (result.length === 0) {
 				return;
 			}
 
-			this._run(editor, result.entries);
-		});
+			this._run(editor, result);
+		}));
 	}
 
-	private _run(editor: ICodeEditor, result: SymbolInformation[]): void {
+	private _run(editor: ICodeEditor, result: DocumentSymbol[]): void {
 		this._show(this.getController(editor), {
 			getModel: (value: string): QuickOpenModel => {
 				return new QuickOpenModel(this.toQuickOpenEntries(editor, result, value));
@@ -167,11 +170,11 @@ export class QuickOutlineAction extends BaseEditorQuickOpenAction {
 		});
 	}
 
-	private symbolEntry(name: string, type: string, description: string, location: Location, highlights: IHighlight[], editor: ICodeEditor, decorator: IDecorator): SymbolEntry {
-		return new SymbolEntry(name, type, description, Range.lift(location.range), highlights, editor, decorator);
+	private symbolEntry(name: string, type: string, description: string, range: IRange, highlights: IHighlight[], editor: ICodeEditor, decorator: IDecorator): SymbolEntry {
+		return new SymbolEntry(name, type, description, Range.lift(range), highlights, editor, decorator);
 	}
 
-	private toQuickOpenEntries(editor: ICodeEditor, flattened: SymbolInformation[], searchValue: string): SymbolEntry[] {
+	private toQuickOpenEntries(editor: ICodeEditor, flattened: DocumentSymbol[], searchValue: string): SymbolEntry[] {
 		const controller = this.getController(editor);
 
 		let results: SymbolEntry[] = [];
@@ -197,7 +200,7 @@ export class QuickOutlineAction extends BaseEditorQuickOpenAction {
 				}
 
 				// Add
-				results.push(this.symbolEntry(label, symbolKindToCssClass(element.kind), description, element.location, highlights, editor, controller));
+				results.push(this.symbolEntry(label, symbolKindToCssClass(element.kind), description, element.range, highlights, editor, controller));
 			}
 		}
 
diff --git a/src/vs/editor/standalone/browser/referenceSearch/standaloneReferenceSearch.ts b/src/vs/editor/standalone/browser/referenceSearch/standaloneReferenceSearch.ts
index e0b2289a0ef..3259edf4f88 100644
--- a/src/vs/editor/standalone/browser/referenceSearch/standaloneReferenceSearch.ts
+++ b/src/vs/editor/standalone/browser/referenceSearch/standaloneReferenceSearch.ts
@@ -5,16 +5,12 @@
 'use strict';
 
 import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { IInstantiationService, optional } from 'vs/platform/instantiation/common/instantiation';
+import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
 import { IStorageService } from 'vs/platform/storage/common/storage';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
 import { registerEditorContribution } from 'vs/editor/browser/editorExtensions';
-import { ITextModelService } from 'vs/editor/common/services/resolverService';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { INotificationService } from 'vs/platform/notification/common/notification';
 import { ReferencesController } from 'vs/editor/contrib/referenceSearch/referencesController';
 
@@ -24,28 +20,20 @@ export class StandaloneReferencesController extends ReferencesController {
 		editor: ICodeEditor,
 		@IContextKeyService contextKeyService: IContextKeyService,
 		@ICodeEditorService editorService: ICodeEditorService,
-		@ITextModelService textModelResolverService: ITextModelService,
 		@INotificationService notificationService: INotificationService,
 		@IInstantiationService instantiationService: IInstantiationService,
-		@IWorkspaceContextService contextService: IWorkspaceContextService,
 		@IStorageService storageService: IStorageService,
-		@IThemeService themeService: IThemeService,
 		@IConfigurationService configurationService: IConfigurationService,
-		@optional(IEnvironmentService) environmentService: IEnvironmentService
 	) {
 		super(
 			true,
 			editor,
 			contextKeyService,
 			editorService,
-			textModelResolverService,
 			notificationService,
 			instantiationService,
-			contextService,
 			storageService,
-			themeService,
 			configurationService,
-			environmentService
 		);
 	}
 }
diff --git a/src/vs/editor/standalone/browser/simpleServices.ts b/src/vs/editor/standalone/browser/simpleServices.ts
index 08f50a00e19..62931784d85 100644
--- a/src/vs/editor/standalone/browser/simpleServices.ts
+++ b/src/vs/editor/standalone/browser/simpleServices.ts
@@ -5,10 +5,10 @@
 'use strict';
 
 import Severity from 'vs/base/common/severity';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { IConfigurationService, IConfigurationChangeEvent, IConfigurationOverrides, IConfigurationData } from 'vs/platform/configuration/common/configuration';
-import { ISingleFolderWorkspaceIdentifier, IWorkspaceIdentifier } from 'vs/platform/workspaces/common/workspaces';
+import { IWorkspaceIdentifier, ISingleFolderWorkspaceIdentifier } from 'vs/platform/workspaces/common/workspaces';
 import { ICommandService, ICommand, ICommandEvent, ICommandHandler, CommandsRegistry } from 'vs/platform/commands/common/commands';
 import { AbstractKeybindingService } from 'vs/platform/keybinding/common/abstractKeybindingService';
 import { USLayoutResolvedKeybinding } from 'vs/platform/keybinding/common/usLayoutResolvedKeybinding';
@@ -24,7 +24,7 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti
 import { IProgressService, IProgressRunner } from 'vs/platform/progress/common/progress';
 import { ITextResourceConfigurationService } from 'vs/editor/common/services/resourceConfiguration';
 import { ITextModelService, ITextModelContentProvider, ITextEditorModel } from 'vs/editor/common/services/resolverService';
-import { IDisposable, IReference, ImmortalReference, combinedDisposable } from 'vs/base/common/lifecycle';
+import { IDisposable, IReference, ImmortalReference, combinedDisposable, toDisposable } from 'vs/base/common/lifecycle';
 import * as dom from 'vs/base/browser/dom';
 import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
 import { KeybindingsRegistry, IKeybindingItem } from 'vs/platform/keybinding/common/keybindingsRegistry';
@@ -45,6 +45,7 @@ import { WorkspaceEdit, isResourceTextEdit, TextEdit } from 'vs/editor/common/mo
 import { IModelService } from 'vs/editor/common/services/modelService';
 import { EditOperation } from 'vs/editor/common/core/editOperation';
 import { localize } from 'vs/nls';
+import { ILabelService, LabelRules, RegisterFormatterEvent } from 'vs/platform/label/common/label';
 
 export class SimpleModel implements ITextEditorModel {
 
@@ -68,6 +69,10 @@ export class SimpleModel implements ITextEditorModel {
 		return this.model;
 	}
 
+	public isReadonly(): boolean {
+		return false;
+	}
+
 	public dispose(): void {
 		this._onDispose.fire();
 	}
@@ -230,11 +235,9 @@ export class StandaloneCommandService implements ICommandService {
 	public addCommand(command: ICommand): IDisposable {
 		const { id } = command;
 		this._dynamicCommands[id] = command;
-		return {
-			dispose: () => {
-				delete this._dynamicCommands[id];
-			}
-		};
+		return toDisposable(() => {
+			delete this._dynamicCommands[id];
+		});
 	}
 
 	public executeCommand<T>(id: string, ...args: any[]): TPromise<T> {
@@ -289,18 +292,16 @@ export class StandaloneKeybindingService extends AbstractKeybindingService {
 			weight2: 0
 		});
 
-		toDispose.push({
-			dispose: () => {
-				for (let i = 0; i < this._dynamicKeybindings.length; i++) {
-					let kb = this._dynamicKeybindings[i];
-					if (kb.command === commandId) {
-						this._dynamicKeybindings.splice(i, 1);
-						this.updateResolver({ source: KeybindingSource.Default });
-						return;
-					}
+		toDispose.push(toDisposable(() => {
+			for (let i = 0; i < this._dynamicKeybindings.length; i++) {
+				let kb = this._dynamicKeybindings[i];
+				if (kb.command === commandId) {
+					this._dynamicKeybindings.splice(i, 1);
+					this.updateResolver({ source: KeybindingSource.Default });
+					return;
 				}
 			}
-		});
+		}));
 
 		let commandService = this._commandService;
 		if (commandService instanceof StandaloneCommandService) {
@@ -507,7 +508,7 @@ export class SimpleWorkspaceContextService implements IWorkspaceContextService {
 
 	constructor() {
 		const resource = URI.from({ scheme: SimpleWorkspaceContextService.SCHEME, authority: 'model', path: '/' });
-		this.workspace = { id: '4064f6ec-cb38-4ad0-af64-ee6467e63c82', folders: [new WorkspaceFolder({ uri: resource, name: '', index: 0 })], name: resource.fsPath };
+		this.workspace = { id: '4064f6ec-cb38-4ad0-af64-ee6467e63c82', folders: [new WorkspaceFolder({ uri: resource, name: '', index: 0 })] };
 	}
 
 	public getWorkspace(): IWorkspace {
@@ -594,3 +595,25 @@ export class SimpleBulkEditService implements IBulkEditService {
 		});
 	}
 }
+
+export class SimpleUriLabelService implements ILabelService {
+	_serviceBrand: any;
+
+	private readonly _onDidRegisterFormatter: Emitter<RegisterFormatterEvent> = new Emitter<RegisterFormatterEvent>();
+	public readonly onDidRegisterFormatter: Event<RegisterFormatterEvent> = this._onDidRegisterFormatter.event;
+
+	public getUriLabel(resource: URI, relative?: boolean): string {
+		if (resource.scheme === 'file') {
+			return resource.fsPath;
+		}
+		return resource.path;
+	}
+
+	public getWorkspaceLabel(workspace: IWorkspaceIdentifier | URI | IWorkspace, options?: { verbose: boolean; }): string {
+		return '';
+	}
+
+	public registerFormatter(schema: string, formatter: LabelRules): IDisposable {
+		throw new Error('Not implemented');
+	}
+}
diff --git a/src/vs/editor/standalone/browser/standalone-tokens.css b/src/vs/editor/standalone/browser/standalone-tokens.css
index c5860572a8e..1396ea01d0a 100644
--- a/src/vs/editor/standalone/browser/standalone-tokens.css
+++ b/src/vs/editor/standalone/browser/standalone-tokens.css
@@ -9,14 +9,14 @@
 	font-family: -apple-system, BlinkMacSystemFont, "Segoe WPC", "Segoe UI", "HelveticaNeue-Light", "Ubuntu", "Droid Sans", sans-serif;
 }
 
-.monaco-menu .monaco-action-bar.vertical .action-item .action-label:focus {
+.monaco-menu .monaco-action-bar.vertical .action-item .action-menu-item:focus .action-label {
 	color: #0059AC;
 	stroke-width: 1.2px;
 	text-shadow: 0px 0px 0.15px #0059AC;
 }
 
-.monaco-editor.vs-dark .monaco-menu .monaco-action-bar.vertical .action-item .action-label:focus,
-.monaco-editor.hc-black .monaco-menu .monaco-action-bar.vertical .action-item .action-label:focus {
+.monaco-editor.vs-dark .monaco-menu .monaco-action-bar.vertical .action-menu-item:focus .action-label,
+.monaco-editor.hc-black .monaco-menu .monaco-action-bar.vertical .action-menu-item:focus .action-label {
 	color: #ACDDFF;
 	stroke-width: 1.2px;
 	text-shadow: 0px 0px 0.15px #ACDDFF;
@@ -211,14 +211,14 @@
 	}
 
 	/* contextmenu */
-	.monaco-editor.vs .monaco-menu .monaco-action-bar.vertical .action-item .action-label:focus,
-	.monaco-editor.vs-dark .monaco-menu .monaco-action-bar.vertical .action-item .action-label:focus {
+	.monaco-editor.vs .monaco-menu .monaco-action-bar.vertical .action-menu-item:focus .action-label,
+	.monaco-editor.vs-dark .monaco-menu .monaco-action-bar.vertical .action-menu-item:focus .action-label {
 		-ms-high-contrast-adjust: none;
 		color: highlighttext !important;
 		background-color: highlight !important;
 	}
-	.monaco-editor.vs .monaco-menu .monaco-action-bar.vertical .action-item .action-label:hover,
-	.monaco-editor.vs-dark .monaco-menu .monaco-action-bar.vertical .action-item .action-label:hover {
+	.monaco-editor.vs .monaco-menu .monaco-action-bar.vertical .action-menu-item:hover .action-label,
+	.monaco-editor.vs-dark .monaco-menu .monaco-action-bar.vertical .action-menu-item:hover .action-label {
 		-ms-high-contrast-adjust: none;
 		background: transparent !important;
 		border: 1px solid highlight;
diff --git a/src/vs/editor/standalone/browser/standaloneCodeEditor.ts b/src/vs/editor/standalone/browser/standaloneCodeEditor.ts
index 22b23704de2..890b51f49bd 100644
--- a/src/vs/editor/standalone/browser/standaloneCodeEditor.ts
+++ b/src/vs/editor/standalone/browser/standaloneCodeEditor.ts
@@ -5,7 +5,7 @@
 
 'use strict';
 
-import { empty as emptyDisposable, IDisposable, combinedDisposable } from 'vs/base/common/lifecycle';
+import { Disposable, IDisposable, combinedDisposable, toDisposable } from 'vs/base/common/lifecycle';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
@@ -17,7 +17,7 @@ import { ITextModel } from 'vs/editor/common/model';
 import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
 import { IEditorWorkerService } from 'vs/editor/common/services/editorWorkerService';
 import { StandaloneKeybindingService, applyConfigurationValues } from 'vs/editor/standalone/browser/simpleServices';
-import { IEditorContextViewService } from 'vs/editor/standalone/browser/standaloneServices';
+import { ContextViewService } from 'vs/platform/contextview/browser/contextViewService';
 import { CodeEditorWidget } from 'vs/editor/browser/widget/codeEditorWidget';
 import { DiffEditorWidget } from 'vs/editor/browser/widget/diffEditorWidget';
 import { ICodeEditor, IDiffEditor } from 'vs/editor/browser/editorBrowser';
@@ -84,7 +84,7 @@ export interface IEditorConstructionOptions extends IEditorOptions {
 	/**
 	 * The initial model associated with this code editor.
 	 */
-	model?: ITextModel;
+	model?: ITextModel | null;
 	/**
 	 * The initial value of the auto created model in the editor.
 	 * To not create automatically a model, use `model: null`.
@@ -206,7 +206,7 @@ export class StandaloneCodeEditor extends CodeEditorWidget implements IStandalon
 		}
 		if (!this._standaloneKeybindingService) {
 			console.warn('Cannot add keybinding because the editor is configured with an unrecognized KeybindingService');
-			return emptyDisposable;
+			return Disposable.None;
 		}
 
 		// Read descriptor options
@@ -272,11 +272,9 @@ export class StandaloneCodeEditor extends CodeEditorWidget implements IStandalon
 
 		// Store it under the original id, such that trigger with the original id will work
 		this._actions[id] = internalAction;
-		toDispose.push({
-			dispose: () => {
-				delete this._actions[id];
-			}
-		});
+		toDispose.push(toDisposable(() => {
+			delete this._actions[id];
+		}));
 
 		return combinedDisposable(toDispose);
 	}
@@ -284,7 +282,7 @@ export class StandaloneCodeEditor extends CodeEditorWidget implements IStandalon
 
 export class StandaloneEditor extends StandaloneCodeEditor implements IStandaloneCodeEditor {
 
-	private _contextViewService: IEditorContextViewService;
+	private _contextViewService: ContextViewService;
 	private readonly _configurationService: IConfigurationService;
 	private _ownsModel: boolean;
 
@@ -311,7 +309,7 @@ export class StandaloneEditor extends StandaloneCodeEditor implements IStandalon
 		delete options.model;
 		super(domElement, options, instantiationService, codeEditorService, commandService, contextKeyService, keybindingService, themeService, notificationService);
 
-		this._contextViewService = <IEditorContextViewService>contextViewService;
+		this._contextViewService = <ContextViewService>contextViewService;
 		this._configurationService = configurationService;
 		this._register(toDispose);
 
@@ -359,7 +357,7 @@ export class StandaloneEditor extends StandaloneCodeEditor implements IStandalon
 
 export class StandaloneDiffEditor extends DiffEditorWidget implements IStandaloneDiffEditor {
 
-	private _contextViewService: IEditorContextViewService;
+	private _contextViewService: ContextViewService;
 	private readonly _configurationService: IConfigurationService;
 
 	constructor(
@@ -384,7 +382,7 @@ export class StandaloneDiffEditor extends DiffEditorWidget implements IStandalon
 
 		super(domElement, options, editorWorkerService, contextKeyService, instantiationService, codeEditorService, themeService, notificationService);
 
-		this._contextViewService = <IEditorContextViewService>contextViewService;
+		this._contextViewService = <ContextViewService>contextViewService;
 		this._configurationService = configurationService;
 
 		this._register(toDispose);
diff --git a/src/vs/editor/standalone/browser/standaloneCodeServiceImpl.ts b/src/vs/editor/standalone/browser/standaloneCodeServiceImpl.ts
index e9475a0e613..90717c99c68 100644
--- a/src/vs/editor/standalone/browser/standaloneCodeServiceImpl.ts
+++ b/src/vs/editor/standalone/browser/standaloneCodeServiceImpl.ts
@@ -13,7 +13,7 @@ import { windowOpenNoOpener } from 'vs/base/browser/dom';
 import { Schemas } from 'vs/base/common/network';
 import { IRange } from 'vs/editor/common/core/range';
 import { ITextModel } from 'vs/editor/common/model';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 
 export class StandaloneCodeEditorServiceImpl extends CodeEditorServiceImpl {
 
diff --git a/src/vs/editor/standalone/browser/standaloneEditor.ts b/src/vs/editor/standalone/browser/standaloneEditor.ts
index 67772c4ff1c..7851d5d20d4 100644
--- a/src/vs/editor/standalone/browser/standaloneEditor.ts
+++ b/src/vs/editor/standalone/browser/standaloneEditor.ts
@@ -11,7 +11,7 @@ import { StandaloneEditor, IStandaloneCodeEditor, StandaloneDiffEditor, IStandal
 import { ScrollbarVisibility } from 'vs/base/common/scrollable';
 import { IEditorOverrideServices, DynamicStandaloneServices, StaticServices } from 'vs/editor/standalone/browser/standaloneServices';
 import { IDisposable } from 'vs/base/common/lifecycle';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { OpenerService } from 'vs/editor/browser/services/openerService';
 import { IOpenerService } from 'vs/platform/opener/common/opener';
@@ -165,8 +165,8 @@ export function createModel(value: string, language?: string, uri?: URI): ITextM
 /**
  * Change the language for a model.
  */
-export function setModelLanguage(model: ITextModel, language: string): void {
-	StaticServices.modelService.get().setMode(model, StaticServices.modeService.get().getOrCreateMode(language));
+export function setModelLanguage(model: ITextModel, languageId: string): void {
+	StaticServices.modelService.get().setMode(model, StaticServices.modeService.get().getOrCreateMode(languageId));
 }
 
 /**
@@ -262,14 +262,14 @@ export function colorizeModelLine(model: ITextModel, lineNumber: number, tabSize
 /**
  * @internal
  */
-function getSafeTokenizationSupport(languageId: string): modes.ITokenizationSupport {
-	let tokenizationSupport = modes.TokenizationRegistry.get(languageId);
+function getSafeTokenizationSupport(language: string): modes.ITokenizationSupport {
+	let tokenizationSupport = modes.TokenizationRegistry.get(language);
 	if (tokenizationSupport) {
 		return tokenizationSupport;
 	}
 	return {
 		getInitialState: () => NULL_STATE,
-		tokenize: (line: string, state: modes.IState, deltaOffset: number) => nullTokenize(languageId, line, state, deltaOffset),
+		tokenize: (line: string, state: modes.IState, deltaOffset: number) => nullTokenize(language, line, state, deltaOffset),
 		tokenize2: undefined,
 	};
 }
@@ -297,7 +297,7 @@ export function tokenize(text: string, languageId: string): Token[][] {
 }
 
 /**
- * Define a new theme.
+ * Define a new theme or updte an existing theme.
  */
 export function defineTheme(themeName: string, themeData: IStandaloneThemeData): void {
 	StaticServices.standaloneThemeService.get().defineTheme(themeName, themeData);
@@ -394,5 +394,6 @@ export function createMonacoEditorAPI(): typeof monaco.editor {
 
 		// vars
 		EditorType: editorCommon.EditorType
+
 	};
 }
diff --git a/src/vs/editor/standalone/browser/standaloneLanguages.ts b/src/vs/editor/standalone/browser/standaloneLanguages.ts
index 533087ed7b0..f7d7ccd8f40 100644
--- a/src/vs/editor/standalone/browser/standaloneLanguages.ts
+++ b/src/vs/editor/standalone/browser/standaloneLanguages.ts
@@ -42,6 +42,11 @@ export function getLanguages(): ILanguageExtensionPoint[] {
 	return result;
 }
 
+export function getEncodedLanguageId(languageId: string): number {
+	let lid = StaticServices.modeService.get().getLanguageIdentifier(languageId);
+	return lid && lid.id;
+}
+
 /**
  * An event emitted when a language is first time needed (e.g. a model has it set).
  * @event
@@ -69,6 +74,31 @@ export function setLanguageConfiguration(languageId: string, configuration: Lang
 	return LanguageConfigurationRegistry.register(languageIdentifier, configuration);
 }
 
+/**
+ * @internal
+ */
+export class EncodedTokenizationSupport2Adapter implements modes.ITokenizationSupport {
+
+	private readonly _actual: EncodedTokensProvider;
+
+	constructor(actual: EncodedTokensProvider) {
+		this._actual = actual;
+	}
+
+	public getInitialState(): modes.IState {
+		return this._actual.getInitialState();
+	}
+
+	public tokenize(line: string, state: modes.IState, offsetDelta: number): TokenizationResult {
+		throw new Error('Not supported!');
+	}
+
+	public tokenize2(line: string, state: modes.IState): TokenizationResult2 {
+		let result = this._actual.tokenizeEncoded(line, state);
+		return new TokenizationResult2(result.tokens, result.endState);
+	}
+}
+
 /**
  * @internal
  */
@@ -203,6 +233,38 @@ export interface ILineTokens {
 	endState: modes.IState;
 }
 
+/**
+ * The result of a line tokenization.
+ */
+export interface IEncodedLineTokens {
+	/**
+	 * The tokens on the line in a binary, encoded format. Each token occupies two array indices. For token i:
+	 *  - at offset 2*i => startIndex
+	 *  - at offset 2*i + 1 => metadata
+	 * Meta data is in binary format:
+	 * - -------------------------------------------
+	 *     3322 2222 2222 1111 1111 1100 0000 0000
+	 *     1098 7654 3210 9876 5432 1098 7654 3210
+	 * - -------------------------------------------
+	 *     bbbb bbbb bfff ffff ffFF FTTT LLLL LLLL
+	 * - -------------------------------------------
+	 *  - L = EncodedLanguageId (8 bits): Use `getEncodedLanguageId` to get the encoded ID of a language.
+	 *  - T = StandardTokenType (3 bits): Other = 0, Comment = 1, String = 2, RegEx = 4.
+	 *  - F = FontStyle (3 bits): None = 0, Italic = 1, Bold = 2, Underline = 4.
+	 *  - f = foreground ColorId (9 bits)
+	 *  - b = background ColorId (9 bits)
+	 *  - The color value for each colorId is defined in IStandaloneThemeData.customTokenColors:
+	 * e.g colorId = 1 is stored in IStandaloneThemeData.customTokenColors[1]. Color id = 0 means no color,
+	 * id = 1 is for the default foreground color, id = 2 for the default background.
+	 */
+	tokens: Uint32Array;
+	/**
+	 * The tokenization end state.
+	 * A pointer will be held to this and the object should not be modified by the tokenizer after the pointer is returned.
+	 */
+	endState: modes.IState;
+}
+
 /**
  * A "manual" provider of tokens.
  */
@@ -217,18 +279,41 @@ export interface TokensProvider {
 	tokenize(line: string, state: modes.IState): ILineTokens;
 }
 
+/**
+ * A "manual" provider of tokens, returning tokens in a binary form.
+ */
+export interface EncodedTokensProvider {
+	/**
+	 * The initial state of a language. Will be the state passed in to tokenize the first line.
+	 */
+	getInitialState(): modes.IState;
+	/**
+	 * Tokenize a line given the state at the beginning of the line.
+	 */
+	tokenizeEncoded(line: string, state: modes.IState): IEncodedLineTokens;
+}
+
+function isEncodedTokensProvider(provider: TokensProvider | EncodedTokensProvider): provider is EncodedTokensProvider {
+	return provider['tokenizeEncoded'];
+}
 /**
  * Set the tokens provider for a language (manual implementation).
  */
-export function setTokensProvider(languageId: string, provider: TokensProvider): IDisposable {
+export function setTokensProvider(languageId: string, provider: TokensProvider | EncodedTokensProvider): IDisposable {
 	let languageIdentifier = StaticServices.modeService.get().getLanguageIdentifier(languageId);
 	if (!languageIdentifier) {
 		throw new Error(`Cannot set tokens provider for unknown language ${languageId}`);
 	}
-	let adapter = new TokenizationSupport2Adapter(StaticServices.standaloneThemeService.get(), languageIdentifier, provider);
+	let adapter: modes.ITokenizationSupport;
+	if (isEncodedTokensProvider(provider)) {
+		adapter = new EncodedTokenizationSupport2Adapter(provider);
+	} else {
+		adapter = new TokenizationSupport2Adapter(StaticServices.standaloneThemeService.get(), languageIdentifier, provider);
+	}
 	return modes.TokenizationRegistry.register(languageId, adapter);
 }
 
+
 /**
  * Set the tokens provider for a language (monarch implementation).
  */
@@ -764,6 +849,7 @@ export function createMonacoLanguagesAPI(): typeof monaco.languages {
 		register: register,
 		getLanguages: getLanguages,
 		onLanguage: onLanguage,
+		getEncodedLanguageId: getEncodedLanguageId,
 
 		// provider methods
 		setLanguageConfiguration: setLanguageConfiguration,
@@ -794,7 +880,7 @@ export function createMonacoLanguagesAPI(): typeof monaco.languages {
 		SymbolKind: modes.SymbolKind,
 		IndentAction: IndentAction,
 		SuggestTriggerKind: modes.SuggestTriggerKind,
-		CommentThreadCollapsibleState: modes.CommentThreadCollapsibleState,
-		FoldingRangeKind: modes.FoldingRangeKind
+		FoldingRangeKind: modes.FoldingRangeKind,
+		SignatureHelpTriggerReason: modes.SignatureHelpTriggerReason,
 	};
 }
diff --git a/src/vs/editor/standalone/browser/standaloneServices.ts b/src/vs/editor/standalone/browser/standaloneServices.ts
index e4f58e5df58..c6ca31a3c08 100644
--- a/src/vs/editor/standalone/browser/standaloneServices.ts
+++ b/src/vs/editor/standalone/browser/standaloneServices.ts
@@ -33,7 +33,7 @@ import { StandaloneCodeEditorServiceImpl } from 'vs/editor/standalone/browser/st
 import {
 	SimpleConfigurationService, SimpleResourceConfigurationService, SimpleMenuService,
 	SimpleProgressService, StandaloneCommandService, StandaloneKeybindingService, SimpleNotificationService,
-	StandaloneTelemetryService, SimpleWorkspaceContextService, SimpleDialogService, SimpleBulkEditService
+	StandaloneTelemetryService, SimpleWorkspaceContextService, SimpleDialogService, SimpleBulkEditService, SimpleUriLabelService
 } from 'vs/editor/standalone/browser/simpleServices';
 import { ContextKeyService } from 'vs/platform/contextkey/browser/contextKeyService';
 import { IMenuService } from 'vs/platform/actions/common/actions';
@@ -44,11 +44,7 @@ import { INotificationService } from 'vs/platform/notification/common/notificati
 import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
 import { IListService, ListService } from 'vs/platform/list/browser/listService';
 import { IBulkEditService } from 'vs/editor/browser/services/bulkEditService';
-
-export interface IEditorContextViewService extends IContextViewService {
-	dispose(): void;
-	setContainer(domNode: HTMLElement): void;
-}
+import { ILabelService } from 'vs/platform/label/common/label';
 
 export interface IEditorOverrideServices {
 	[index: string]: any;
@@ -126,6 +122,8 @@ export module StaticServices {
 
 	export const contextService = define(IWorkspaceContextService, () => new SimpleWorkspaceContextService());
 
+	export const labelService = define(ILabelService, () => new SimpleUriLabelService());
+
 	export const telemetryService = define(ITelemetryService, () => new StandaloneTelemetryService());
 
 	export const dialogService = define(IDialogService, () => new SimpleDialogService());
diff --git a/src/vs/editor/standalone/browser/standaloneThemeServiceImpl.ts b/src/vs/editor/standalone/browser/standaloneThemeServiceImpl.ts
index 7f4f3612fc6..f72758ff75e 100644
--- a/src/vs/editor/standalone/browser/standaloneThemeServiceImpl.ts
+++ b/src/vs/editor/standalone/browser/standaloneThemeServiceImpl.ts
@@ -5,7 +5,7 @@
 'use strict';
 
 import { TokenTheme, ITokenThemeRule, generateTokensCSSForColorMap } from 'vs/editor/common/modes/supports/tokenization';
-import { IStandaloneThemeService, BuiltinTheme, IStandaloneThemeData, IStandaloneTheme, IColors } from 'vs/editor/standalone/common/standaloneThemeService';
+import { IStandaloneThemeService, BuiltinTheme, IStandaloneThemeData, IStandaloneTheme } from 'vs/editor/standalone/common/standaloneThemeService';
 import { vs, vs_dark, hc_black } from 'vs/editor/standalone/common/themes';
 import * as dom from 'vs/base/browser/dom';
 import { TokenizationRegistry } from 'vs/editor/common/modes';
@@ -26,13 +26,15 @@ const themingRegistry = Registry.as<IThemingRegistry>(ThemingExtensions.ThemingC
 class StandaloneTheme implements IStandaloneTheme {
 	public readonly id: string;
 	public readonly themeName: string;
-	private rules: ITokenThemeRule[];
-	public readonly base: string;
+
+	private themeData: IStandaloneThemeData;
 	private colors: { [colorId: string]: Color };
 	private defaultColors: { [colorId: string]: Color };
 	private _tokenTheme: TokenTheme;
 
-	constructor(base: string, name: string, colors: IColors, rules: ITokenThemeRule[]) {
+	constructor(name: string, standaloneThemeData: IStandaloneThemeData) {
+		this.themeData = standaloneThemeData;
+		let base = standaloneThemeData.base;
 		if (name.length > 0) {
 			this.id = base + ' ' + name;
 			this.themeName = name;
@@ -40,18 +42,46 @@ class StandaloneTheme implements IStandaloneTheme {
 			this.id = base;
 			this.themeName = base;
 		}
-		this.base = base;
-		this.rules = rules;
-		this.colors = {};
-		for (let id in colors) {
-			this.colors[id] = Color.fromHex(colors[id]);
+		this.colors = null;
+		this.defaultColors = Object.create(null);
+		this._tokenTheme = null;
+	}
+
+	public get base(): string {
+		return this.themeData.base;
+	}
+
+	public notifyBaseUpdated() {
+		if (this.themeData.inherit) {
+			this.colors = null;
+			this._tokenTheme = null;
 		}
-		this.defaultColors = {};
+	}
+
+	private getColors(): { [colorId: string]: Color } {
+		if (!this.colors) {
+			let colors: { [colorId: string]: Color } = Object.create(null);
+			for (let id in this.themeData.colors) {
+				colors[id] = Color.fromHex(this.themeData.colors[id]);
+			}
+			if (this.themeData.inherit) {
+				let baseData = getBuiltinRules(this.themeData.base);
+				for (let id in baseData.colors) {
+					if (!colors[id]) {
+						colors[id] = Color.fromHex(baseData.colors[id]);
+					}
+
+				}
+			}
+			this.colors = colors;
+		}
+		return this.colors;
 	}
 
 	public getColor(colorId: ColorIdentifier, useDefault?: boolean): Color {
-		if (this.colors.hasOwnProperty(colorId)) {
-			return this.colors[colorId];
+		const color = this.getColors()[colorId];
+		if (color) {
+			return color;
 		}
 		if (useDefault !== false) {
 			return this.getDefault(colorId);
@@ -60,16 +90,17 @@ class StandaloneTheme implements IStandaloneTheme {
 	}
 
 	private getDefault(colorId: ColorIdentifier): Color {
-		if (this.defaultColors.hasOwnProperty(colorId)) {
-			return this.defaultColors[colorId];
+		let color = this.defaultColors[colorId];
+		if (color) {
+			return color;
 		}
-		let color = colorRegistry.resolveDefaultColor(colorId, this);
+		color = colorRegistry.resolveDefaultColor(colorId, this);
 		this.defaultColors[colorId] = color;
 		return color;
 	}
 
 	public defines(colorId: ColorIdentifier): boolean {
-		return this.colors.hasOwnProperty(colorId);
+		return Object.prototype.hasOwnProperty.call(this.getColors(), colorId);
 	}
 
 	public get type() {
@@ -82,7 +113,20 @@ class StandaloneTheme implements IStandaloneTheme {
 
 	public get tokenTheme(): TokenTheme {
 		if (!this._tokenTheme) {
-			this._tokenTheme = TokenTheme.createFromRawTokenTheme(this.rules);
+			let rules: ITokenThemeRule[] = [];
+			let encodedTokensColors = [];
+			if (this.themeData.inherit) {
+				let baseData = getBuiltinRules(this.themeData.base);
+				rules = baseData.rules;
+				if (baseData.encodedTokensColors) {
+					encodedTokensColors = baseData.encodedTokensColors;
+				}
+			}
+			rules = rules.concat(this.themeData.rules);
+			if (this.themeData.encodedTokensColors) {
+				encodedTokensColors = this.themeData.encodedTokensColors;
+			}
+			this._tokenTheme = TokenTheme.createFromRawTokenTheme(rules, encodedTokensColors);
 		}
 		return this._tokenTheme;
 	}
@@ -109,7 +153,7 @@ function getBuiltinRules(builtinTheme: BuiltinTheme): IStandaloneThemeData {
 
 function newBuiltInTheme(builtinTheme: BuiltinTheme): StandaloneTheme {
 	let themeData = getBuiltinRules(builtinTheme);
-	return new StandaloneTheme(builtinTheme, '', themeData.colors, themeData.rules);
+	return new StandaloneTheme(builtinTheme, themeData);
 }
 
 export class StandaloneThemeServiceImpl implements IStandaloneThemeService {
@@ -139,28 +183,25 @@ export class StandaloneThemeServiceImpl implements IStandaloneThemeService {
 	}
 
 	public defineTheme(themeName: string, themeData: IStandaloneThemeData): void {
-		if (!/^[a-z0-9\-]+$/i.test(themeName) || isBuiltinTheme(themeName)) {
+		if (!/^[a-z0-9\-]+$/i.test(themeName)) {
 			throw new Error('Illegal theme name!');
 		}
-		if (!isBuiltinTheme(themeData.base)) {
+		if (!isBuiltinTheme(themeData.base) && !isBuiltinTheme(themeName)) {
 			throw new Error('Illegal theme base!');
 		}
+		// set or replace theme
+		this._knownThemes.set(themeName, new StandaloneTheme(themeName, themeData));
 
-		let rules: ITokenThemeRule[] = [];
-		let colors: IColors = {};
-		if (themeData.inherit) {
-			let baseData = getBuiltinRules(themeData.base);
-			rules = rules.concat(baseData.rules);
-			for (let id in baseData.colors) {
-				colors[id] = baseData.colors[id];
-			}
+		if (isBuiltinTheme(themeName)) {
+			this._knownThemes.forEach(theme => {
+				if (theme.base === themeName) {
+					theme.notifyBaseUpdated();
+				}
+			});
 		}
-		rules = rules.concat(themeData.rules);
-		for (let id in themeData.colors) {
-			colors[id] = themeData.colors[id];
+		if (this._theme && this._theme.themeName === themeName) {
+			this.setTheme(themeName); // refresh theme
 		}
-
-		this._knownThemes.set(themeName, new StandaloneTheme(themeData.base, themeName, colors, rules));
 	}
 
 	public getTheme(): IStandaloneTheme {
diff --git a/src/vs/editor/standalone/common/monarch/monarchTypes.ts b/src/vs/editor/standalone/common/monarch/monarchTypes.ts
index 55a14165507..a2b88685fb2 100644
--- a/src/vs/editor/standalone/common/monarch/monarchTypes.ts
+++ b/src/vs/editor/standalone/common/monarch/monarchTypes.ts
@@ -37,7 +37,7 @@ export interface IMonarchLanguage {
 	/**
 	 * attach this to every token class (by default '.' + name)
 	 */
-	tokenPostfix: string;
+	tokenPostfix?: string;
 }
 
 /**
@@ -45,7 +45,11 @@ export interface IMonarchLanguage {
  * 		shorthands: [reg,act] == { regex: reg, action: act}
  *		and       : [reg,act,nxt] == { regex: reg, action: act{ next: nxt }}
  */
-export interface IMonarchLanguageRule {
+export type IShortMonarchLanguageRule1 = [RegExp, IMonarchLanguageAction];
+
+export type IShortMonarchLanguageRule2 = [RegExp, IMonarchLanguageAction, string];
+
+export interface IExpandedMonarchLanguageRule {
 	/**
 	 * match tokens
 	 */
@@ -61,22 +65,26 @@ export interface IMonarchLanguageRule {
 	include?: string;
 }
 
+export type IMonarchLanguageRule = IShortMonarchLanguageRule1
+	| IShortMonarchLanguageRule2
+	| IExpandedMonarchLanguageRule;
+
 /**
  * An action is either an array of actions...
  * ... or a case statement with guards...
  * ... or a basic action with a token value.
  */
-export interface IMonarchLanguageAction {
+export type IShortMonarchLanguageAction = string;
+
+export interface IExpandedMonarchLanguageAction {
 	/**
 	 * array of actions for each parenthesized match group
 	 */
 	group?: IMonarchLanguageAction[];
-
 	/**
 	 * map from string to ILanguageAction
 	 */
 	cases?: Object;
-
 	/**
 	 * token class (ie. css class) (or "@brackets" or "@rematch")
 	 */
@@ -107,6 +115,11 @@ export interface IMonarchLanguageAction {
 	log?: string;
 }
 
+export type IMonarchLanguageAction = IShortMonarchLanguageAction
+	| IExpandedMonarchLanguageAction
+	| IShortMonarchLanguageAction[]
+	| IExpandedMonarchLanguageAction[];
+
 /**
  * This interface can be shortened as an array, ie. ['{','}','delimiter.curly']
  */
@@ -123,4 +136,4 @@ export interface IMonarchLanguageBracket {
 	 * token class
 	 */
 	token: string;
-}
+}
\ No newline at end of file
diff --git a/src/vs/editor/standalone/common/standaloneThemeService.ts b/src/vs/editor/standalone/common/standaloneThemeService.ts
index 7dfc0bdbdfb..12e5b7782cd 100644
--- a/src/vs/editor/standalone/common/standaloneThemeService.ts
+++ b/src/vs/editor/standalone/common/standaloneThemeService.ts
@@ -17,6 +17,7 @@ export interface IStandaloneThemeData {
 	base: BuiltinTheme;
 	inherit: boolean;
 	rules: ITokenThemeRule[];
+	encodedTokensColors?: string[];
 	colors: IColors;
 }
 
diff --git a/src/vs/editor/test/browser/controller/cursor.test.ts b/src/vs/editor/test/browser/controller/cursor.test.ts
index 7c4d3136f27..d744095cd1e 100644
--- a/src/vs/editor/test/browser/controller/cursor.test.ts
+++ b/src/vs/editor/test/browser/controller/cursor.test.ts
@@ -3947,6 +3947,21 @@ suite('autoClosingPairs', () => {
 				],
 			}));
 		}
+
+		public setAutocloseEnabledSet(chars: string) {
+			this._register(LanguageConfigurationRegistry.register(this.getLanguageIdentifier(), {
+				autoCloseBefore: chars,
+				autoClosingPairs: [
+					{ open: '{', close: '}' },
+					{ open: '[', close: ']' },
+					{ open: '(', close: ')' },
+					{ open: '\'', close: '\'', notIn: ['string', 'comment'] },
+					{ open: '\"', close: '\"', notIn: ['string'] },
+					{ open: '`', close: '`', notIn: ['string', 'comment'] },
+					{ open: '/**', close: ' */', notIn: ['string'] }
+				],
+			}));
+		}
 	}
 
 	const enum ColumnType {
@@ -3982,7 +3997,7 @@ suite('autoClosingPairs', () => {
 		cursorCommand(cursor, H.Undo);
 	}
 
-	test('open parens', () => {
+	test('open parens: default', () => {
 		let mode = new AutoClosingMode();
 		usingCursor({
 			text: [
@@ -3998,6 +4013,52 @@ suite('autoClosingPairs', () => {
 			languageIdentifier: mode.getLanguageIdentifier()
 		}, (model, cursor) => {
 
+			let autoClosePositions = [
+				'var| a| |=| [|]|;|',
+				'var| b| |=| `asd`|;|',
+				'var| c| |=| \'asd\'|;|',
+				'var| d| |=| "asd"|;|',
+				'var| e| |=| /*3*/|	3|;|',
+				'var| f| |=| /**| 3| */3|;|',
+				'var| g| |=| (3+5|)|;|',
+				'var| h| |=| {| a|:| \'value\'| |}|;|',
+			];
+			for (let i = 0, len = autoClosePositions.length; i < len; i++) {
+				const lineNumber = i + 1;
+				const autoCloseColumns = extractSpecialColumns(model.getLineMaxColumn(lineNumber), autoClosePositions[i]);
+
+				for (let column = 1; column < autoCloseColumns.length; column++) {
+					model.forceTokenization(lineNumber);
+					if (autoCloseColumns[column] === ColumnType.Special1) {
+						assertType(model, cursor, lineNumber, column, '(', '()', `auto closes @ (${lineNumber}, ${column})`);
+					} else {
+						assertType(model, cursor, lineNumber, column, '(', '(', `does not auto close @ (${lineNumber}, ${column})`);
+					}
+				}
+			}
+		});
+		mode.dispose();
+	});
+
+	test('open parens: whitespace', () => {
+		let mode = new AutoClosingMode();
+		usingCursor({
+			text: [
+				'var a = [];',
+				'var b = `asd`;',
+				'var c = \'asd\';',
+				'var d = "asd";',
+				'var e = /*3*/	3;',
+				'var f = /** 3 */3;',
+				'var g = (3+5);',
+				'var h = { a: \'value\' };',
+			],
+			languageIdentifier: mode.getLanguageIdentifier(),
+			editorOpts: {
+				autoClosingBrackets: 'beforeWhitespace'
+			}
+		}, (model, cursor) => {
+
 			let autoClosePositions = [
 				'var| a| =| [|];|',
 				'var| b| =| `asd`;|',
@@ -4025,6 +4086,259 @@ suite('autoClosingPairs', () => {
 		mode.dispose();
 	});
 
+	test('open parens disabled/enabled open quotes enabled/disabled', () => {
+		let mode = new AutoClosingMode();
+		usingCursor({
+			text: [
+				'var a = [];',
+			],
+			languageIdentifier: mode.getLanguageIdentifier(),
+			editorOpts: {
+				autoClosingBrackets: 'beforeWhitespace',
+				autoClosingQuotes: 'never'
+			}
+		}, (model, cursor) => {
+
+			let autoClosePositions = [
+				'var| a| =| [|];|',
+			];
+			for (let i = 0, len = autoClosePositions.length; i < len; i++) {
+				const lineNumber = i + 1;
+				const autoCloseColumns = extractSpecialColumns(model.getLineMaxColumn(lineNumber), autoClosePositions[i]);
+
+				for (let column = 1; column < autoCloseColumns.length; column++) {
+					model.forceTokenization(lineNumber);
+					if (autoCloseColumns[column] === ColumnType.Special1) {
+						assertType(model, cursor, lineNumber, column, '(', '()', `auto closes @ (${lineNumber}, ${column})`);
+					} else {
+						assertType(model, cursor, lineNumber, column, '(', '(', `does not auto close @ (${lineNumber}, ${column})`);
+					}
+					assertType(model, cursor, lineNumber, column, '\'', '\'', `does not auto close @ (${lineNumber}, ${column})`);
+				}
+			}
+		});
+
+		usingCursor({
+			text: [
+				'var b = [];',
+			],
+			languageIdentifier: mode.getLanguageIdentifier(),
+			editorOpts: {
+				autoClosingBrackets: 'never',
+				autoClosingQuotes: 'beforeWhitespace'
+			}
+		}, (model, cursor) => {
+
+			let autoClosePositions = [
+				'var b =| [|];|',
+			];
+			for (let i = 0, len = autoClosePositions.length; i < len; i++) {
+				const lineNumber = i + 1;
+				const autoCloseColumns = extractSpecialColumns(model.getLineMaxColumn(lineNumber), autoClosePositions[i]);
+
+				for (let column = 1; column < autoCloseColumns.length; column++) {
+					model.forceTokenization(lineNumber);
+					if (autoCloseColumns[column] === ColumnType.Special1) {
+						assertType(model, cursor, lineNumber, column, '\'', '\'\'', `auto closes @ (${lineNumber}, ${column})`);
+					} else {
+						assertType(model, cursor, lineNumber, column, '\'', '\'', `does not auto close @ (${lineNumber}, ${column})`);
+					}
+					assertType(model, cursor, lineNumber, column, '(', '(', `does not auto close @ (${lineNumber}, ${column})`);
+				}
+			}
+		});
+		mode.dispose();
+	});
+
+	test('configurable open parens', () => {
+		let mode = new AutoClosingMode();
+		mode.setAutocloseEnabledSet('abc');
+		usingCursor({
+			text: [
+				'var a = [];',
+				'var b = `asd`;',
+				'var c = \'asd\';',
+				'var d = "asd";',
+				'var e = /*3*/	3;',
+				'var f = /** 3 */3;',
+				'var g = (3+5);',
+				'var h = { a: \'value\' };',
+			],
+			languageIdentifier: mode.getLanguageIdentifier(),
+			editorOpts: {
+				autoClosingBrackets: 'languageDefined'
+			}
+		}, (model, cursor) => {
+
+			let autoClosePositions = [
+				'v|ar |a = [|];|',
+				'v|ar |b = `|asd`;|',
+				'v|ar |c = \'|asd\';|',
+				'v|ar d = "|asd";|',
+				'v|ar e = /*3*/	3;|',
+				'v|ar f = /** 3 */3;|',
+				'v|ar g = (3+5|);|',
+				'v|ar h = { |a: \'v|alue\' |};|',
+			];
+			for (let i = 0, len = autoClosePositions.length; i < len; i++) {
+				const lineNumber = i + 1;
+				const autoCloseColumns = extractSpecialColumns(model.getLineMaxColumn(lineNumber), autoClosePositions[i]);
+
+				for (let column = 1; column < autoCloseColumns.length; column++) {
+					model.forceTokenization(lineNumber);
+					if (autoCloseColumns[column] === ColumnType.Special1) {
+						assertType(model, cursor, lineNumber, column, '(', '()', `auto closes @ (${lineNumber}, ${column})`);
+					} else {
+						assertType(model, cursor, lineNumber, column, '(', '(', `does not auto close @ (${lineNumber}, ${column})`);
+					}
+				}
+			}
+		});
+		mode.dispose();
+	});
+
+	test('auto-pairing can be disabled', () => {
+		let mode = new AutoClosingMode();
+		usingCursor({
+			text: [
+				'var a = [];',
+				'var b = `asd`;',
+				'var c = \'asd\';',
+				'var d = "asd";',
+				'var e = /*3*/	3;',
+				'var f = /** 3 */3;',
+				'var g = (3+5);',
+				'var h = { a: \'value\' };',
+			],
+			languageIdentifier: mode.getLanguageIdentifier(),
+			editorOpts: {
+				autoClosingBrackets: 'never',
+				autoClosingQuotes: 'never'
+			}
+		}, (model, cursor) => {
+
+			let autoClosePositions = [
+				'var a = [];',
+				'var b = `asd`;',
+				'var c = \'asd\';',
+				'var d = "asd";',
+				'var e = /*3*/	3;',
+				'var f = /** 3 */3;',
+				'var g = (3+5);',
+				'var h = { a: \'value\' };',
+			];
+			for (let i = 0, len = autoClosePositions.length; i < len; i++) {
+				const lineNumber = i + 1;
+				const autoCloseColumns = extractSpecialColumns(model.getLineMaxColumn(lineNumber), autoClosePositions[i]);
+
+				for (let column = 1; column < autoCloseColumns.length; column++) {
+					model.forceTokenization(lineNumber);
+					if (autoCloseColumns[column] === ColumnType.Special1) {
+						assertType(model, cursor, lineNumber, column, '(', '()', `auto closes @ (${lineNumber}, ${column})`);
+						assertType(model, cursor, lineNumber, column, '"', '""', `auto closes @ (${lineNumber}, ${column})`);
+					} else {
+						assertType(model, cursor, lineNumber, column, '(', '(', `does not auto close @ (${lineNumber}, ${column})`);
+						assertType(model, cursor, lineNumber, column, '"', '"', `does not auto close @ (${lineNumber}, ${column})`);
+					}
+				}
+			}
+		});
+		mode.dispose();
+	});
+
+	test('auto wrapping is configurable', () => {
+		let mode = new AutoClosingMode();
+		usingCursor({
+			text: [
+				'var a = asd'
+			],
+			languageIdentifier: mode.getLanguageIdentifier()
+		}, (model, cursor) => {
+
+			cursor.setSelections('test', [
+				new Selection(1, 1, 1, 4),
+				new Selection(1, 9, 1, 12),
+			]);
+
+			// type a `
+			cursorCommand(cursor, H.Type, { text: '`' }, 'keyboard');
+
+			assert.equal(model.getValue(), '`var` a = `asd`');
+
+			// type a (
+			cursorCommand(cursor, H.Type, { text: '(' }, 'keyboard');
+
+			assert.equal(model.getValue(), '`(var)` a = `(asd)`');
+		});
+
+		usingCursor({
+			text: [
+				'var a = asd'
+			],
+			languageIdentifier: mode.getLanguageIdentifier(),
+			editorOpts: {
+				autoSurround: 'never'
+			}
+		}, (model, cursor) => {
+
+			cursor.setSelections('test', [
+				new Selection(1, 1, 1, 4),
+			]);
+
+			// type a `
+			cursorCommand(cursor, H.Type, { text: '`' }, 'keyboard');
+
+			assert.equal(model.getValue(), '` a = asd');
+		});
+
+		usingCursor({
+			text: [
+				'var a = asd'
+			],
+			languageIdentifier: mode.getLanguageIdentifier(),
+			editorOpts: {
+				autoSurround: 'quotes'
+			}
+		}, (model, cursor) => {
+
+			cursor.setSelections('test', [
+				new Selection(1, 1, 1, 4),
+			]);
+
+			// type a `
+			cursorCommand(cursor, H.Type, { text: '`' }, 'keyboard');
+			assert.equal(model.getValue(), '`var` a = asd');
+
+			// type a (
+			cursorCommand(cursor, H.Type, { text: '(' }, 'keyboard');
+			assert.equal(model.getValue(), '`(` a = asd');
+		});
+
+		usingCursor({
+			text: [
+				'var a = asd'
+			],
+			languageIdentifier: mode.getLanguageIdentifier(),
+			editorOpts: {
+				autoSurround: 'brackets'
+			}
+		}, (model, cursor) => {
+
+			cursor.setSelections('test', [
+				new Selection(1, 1, 1, 4),
+			]);
+
+			// type a (
+			cursorCommand(cursor, H.Type, { text: '(' }, 'keyboard');
+			assert.equal(model.getValue(), '(var) a = asd');
+
+			// type a `
+			cursorCommand(cursor, H.Type, { text: '`' }, 'keyboard');
+			assert.equal(model.getValue(), '(`) a = asd');
+		});
+		mode.dispose();
+	});
+
 	test('quote', () => {
 		let mode = new AutoClosingMode();
 		usingCursor({
@@ -4042,14 +4356,14 @@ suite('autoClosingPairs', () => {
 		}, (model, cursor) => {
 
 			let autoClosePositions = [
-				'var a =| [|];|',
-				'var b =| |`asd`;|',
-				'var c =| |\'asd!\';|',
-				'var d =| |"asd";|',
-				'var e =| /*3*/|	3;|',
-				'var f =| /**| 3 */3;|',
-				'var g =| (3+5);|',
-				'var h =| {| a:| |\'value!\'| |};|',
+				'var a |=| [|]|;|',
+				'var b |=| |`asd`|;|',
+				'var c |=| |\'asd!\'|;|',
+				'var d |=| |"asd"|;|',
+				'var e |=| /*3*/|	3;|',
+				'var f |=| /**| 3 */3;|',
+				'var g |=| (3+5)|;|',
+				'var h |=| {| a:| |\'value!\'| |}|;|',
 			];
 			for (let i = 0, len = autoClosePositions.length; i < len; i++) {
 				const lineNumber = i + 1;
@@ -4070,6 +4384,51 @@ suite('autoClosingPairs', () => {
 		mode.dispose();
 	});
 
+	test('issue #55314: Do not auto-close when ending with open', () => {
+		const languageId = new LanguageIdentifier('myElectricMode', 5);
+		class ElectricMode extends MockMode {
+			constructor() {
+				super(languageId);
+				this._register(LanguageConfigurationRegistry.register(this.getLanguageIdentifier(), {
+					autoClosingPairs: [
+						{ open: '{', close: '}' },
+						{ open: '[', close: ']' },
+						{ open: '(', close: ')' },
+						{ open: '\'', close: '\'', notIn: ['string', 'comment'] },
+						{ open: '\"', close: '\"', notIn: ['string'] },
+						{ open: 'B\"', close: '\"', notIn: ['string', 'comment'] },
+						{ open: '`', close: '`', notIn: ['string', 'comment'] },
+						{ open: '/**', close: ' */', notIn: ['string'] }
+					],
+				}));
+			}
+		}
+
+		const mode = new ElectricMode();
+
+		usingCursor({
+			text: [
+				'little goat',
+				'little LAMB',
+				'little sheep',
+				'Big LAMB'
+			],
+			languageIdentifier: mode.getLanguageIdentifier()
+		}, (model, cursor) => {
+			model.forceTokenization(model.getLineCount());
+			assertType(model, cursor, 1, 4, '"', '"', `does not double quote when ending with open`);
+			model.forceTokenization(model.getLineCount());
+			assertType(model, cursor, 2, 4, '"', '"', `does not double quote when ending with open`);
+			model.forceTokenization(model.getLineCount());
+			assertType(model, cursor, 3, 4, '"', '"', `does not double quote when ending with open`);
+			model.forceTokenization(model.getLineCount());
+			assertType(model, cursor, 4, 2, '"', '""', `double quote when ending with open`);
+			model.forceTokenization(model.getLineCount());
+			assertType(model, cursor, 4, 3, '"', '"', `does not double quote when ending with open`);
+		});
+		mode.dispose();
+	});
+
 	test('issue #27937: Trying to add an item to the front of a list is cumbersome', () => {
 		let mode = new AutoClosingMode();
 		usingCursor({
@@ -4222,7 +4581,7 @@ suite('autoClosingPairs', () => {
 			cursorCommand(cursor, H.ReplacePreviousChar, { replaceCharCnt: 1, text: '"' }, 'keyboard');
 			cursorCommand(cursor, H.CompositionEnd, null, 'keyboard');
 
-			assert.equal(model.getValue(), '\'""\'');
+			assert.equal(model.getValue(), '\'"\'');
 
 			// Typing ' + space after '
 			model.setValue('\'');
diff --git a/src/vs/editor/test/browser/controller/textAreaState.test.ts b/src/vs/editor/test/browser/controller/textAreaState.test.ts
index 492ad210207..a954c51f42e 100644
--- a/src/vs/editor/test/browser/controller/textAreaState.test.ts
+++ b/src/vs/editor/test/browser/controller/textAreaState.test.ts
@@ -518,6 +518,20 @@ suite('TextAreaState', () => {
 		);
 	});
 
+	test('issue #49480: Double curly braces inserted', () => {
+		// Characters get doubled
+		testDeduceInput(
+			new TextAreaState(
+				'aa',
+				2, 2,
+				null, null
+			),
+			'aaa',
+			3, 3, true, true,
+			'a', 0
+		);
+	});
+
 	suite('PagedScreenReaderStrategy', () => {
 
 		function testPagedScreenReaderStrategy(lines: string[], selection: Selection, expected: TextAreaState): void {
diff --git a/src/vs/editor/test/browser/core/editorState.test.ts b/src/vs/editor/test/browser/core/editorState.test.ts
index 5441477e432..e3e64299bb4 100644
--- a/src/vs/editor/test/browser/core/editorState.test.ts
+++ b/src/vs/editor/test/browser/core/editorState.test.ts
@@ -6,7 +6,7 @@
 'use strict';
 
 import * as assert from 'assert';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { ITextModel } from 'vs/editor/common/model';
 import { EditorState, CodeEditorStateFlag } from 'vs/editor/browser/core/editorState';
 import { Selection } from 'vs/editor/common/core/selection';
diff --git a/src/vs/editor/test/browser/services/decorationRenderOptions.test.ts b/src/vs/editor/test/browser/services/decorationRenderOptions.test.ts
index 72291114149..0c31be1e257 100644
--- a/src/vs/editor/test/browser/services/decorationRenderOptions.test.ts
+++ b/src/vs/editor/test/browser/services/decorationRenderOptions.test.ts
@@ -5,7 +5,7 @@
 'use strict';
 
 import * as assert from 'assert';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import * as dom from 'vs/base/browser/dom';
 import { CodeEditorServiceImpl } from 'vs/editor/browser/services/codeEditorServiceImpl';
 import { IDecorationRenderOptions } from 'vs/editor/common/editorCommon';
diff --git a/src/vs/editor/test/browser/services/openerService.test.ts b/src/vs/editor/test/browser/services/openerService.test.ts
index 0401ca8b4ef..dfe92ebf965 100644
--- a/src/vs/editor/test/browser/services/openerService.test.ts
+++ b/src/vs/editor/test/browser/services/openerService.test.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import * as assert from 'assert';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { TestCodeEditorService } from 'vs/editor/test/browser/editorTestServices';
diff --git a/src/vs/editor/test/browser/testCodeEditor.ts b/src/vs/editor/test/browser/testCodeEditor.ts
index 79ae7e5d017..4a0d4669624 100644
--- a/src/vs/editor/test/browser/testCodeEditor.ts
+++ b/src/vs/editor/test/browser/testCodeEditor.ts
@@ -72,10 +72,14 @@ export interface TestCodeEditorCreationOptions extends editorOptions.IEditorOpti
 	serviceCollection?: ServiceCollection;
 }
 
-export function withTestCodeEditor(text: string[], options: TestCodeEditorCreationOptions, callback: (editor: TestCodeEditor, cursor: Cursor) => void): void {
+export function withTestCodeEditor(text: string | string[], options: TestCodeEditorCreationOptions, callback: (editor: TestCodeEditor, cursor: Cursor) => void): void {
 	// create a model if necessary and remember it in order to dispose it.
 	if (!options.model) {
-		options.model = TextModel.createFromString(text.join('\n'));
+		if (typeof text === 'string') {
+			options.model = TextModel.createFromString(text);
+		} else {
+			options.model = TextModel.createFromString(text.join('\n'));
+		}
 	}
 
 	let editor = <TestCodeEditor>createTestCodeEditor(options);
diff --git a/src/vs/editor/test/common/config/commonEditorConfig.test.ts b/src/vs/editor/test/common/config/commonEditorConfig.test.ts
index 92f7a852d58..c2d68367dcc 100644
--- a/src/vs/editor/test/common/config/commonEditorConfig.test.ts
+++ b/src/vs/editor/test/common/config/commonEditorConfig.test.ts
@@ -9,6 +9,7 @@ import { EditorZoom } from 'vs/editor/common/config/editorZoom';
 import { TestConfiguration } from 'vs/editor/test/common/mocks/testConfiguration';
 import { IEnvConfiguration } from 'vs/editor/common/config/commonEditorConfig';
 import { AccessibilitySupport } from 'vs/base/common/platform';
+import { IEditorHoverOptions } from 'vs/editor/common/config/editorOptions';
 
 suite('Common Editor Config', () => {
 	test('Zoom Level', () => {
@@ -176,4 +177,17 @@ suite('Common Editor Config', () => {
 		});
 		assertWrapping(config, true, 1);
 	});
+
+	test('issue #53152: Cannot assign to read only property \'enabled\' of object', () => {
+		let hoverOptions: IEditorHoverOptions = {};
+		Object.defineProperty(hoverOptions, 'enabled', {
+			writable: false,
+			value: true
+		});
+		let config = new TestConfiguration({ hover: hoverOptions });
+
+		assert.equal(config.editor.contribInfo.hover.enabled, true);
+		config.updateOptions({ hover: { enabled: false } });
+		assert.equal(config.editor.contribInfo.hover.enabled, false);
+	});
 });
diff --git a/src/vs/editor/test/common/diff/diffComputer.test.ts b/src/vs/editor/test/common/diff/diffComputer.test.ts
index 2a7cc783ee3..574a75000ee 100644
--- a/src/vs/editor/test/common/diff/diffComputer.test.ts
+++ b/src/vs/editor/test/common/diff/diffComputer.test.ts
@@ -25,8 +25,9 @@ function extractCharChangeRepresentation(change: ICharChange, expectedChange: IC
 }
 
 function extractLineChangeRepresentation(change: ILineChange, expectedChange: ILineChange): IChange | ILineChange {
+	let charChanges: ICharChange[];
 	if (change.charChanges) {
-		let charChanges: ICharChange[] = [];
+		charChanges = [];
 		for (let i = 0; i < change.charChanges.length; i++) {
 			charChanges.push(
 				extractCharChangeRepresentation(
@@ -35,26 +36,21 @@ function extractLineChangeRepresentation(change: ILineChange, expectedChange: IL
 				)
 			);
 		}
-		return {
-			originalStartLineNumber: change.originalStartLineNumber,
-			originalEndLineNumber: change.originalEndLineNumber,
-			modifiedStartLineNumber: change.modifiedStartLineNumber,
-			modifiedEndLineNumber: change.modifiedEndLineNumber,
-			charChanges: charChanges
-		};
 	}
 	return {
 		originalStartLineNumber: change.originalStartLineNumber,
 		originalEndLineNumber: change.originalEndLineNumber,
 		modifiedStartLineNumber: change.modifiedStartLineNumber,
-		modifiedEndLineNumber: change.modifiedEndLineNumber
+		modifiedEndLineNumber: change.modifiedEndLineNumber,
+		charChanges: charChanges
 	};
 }
 
-function assertDiff(originalLines: string[], modifiedLines: string[], expectedChanges: IChange[], shouldPostProcessCharChanges: boolean = false, shouldIgnoreTrimWhitespace: boolean = false) {
+function assertDiff(originalLines: string[], modifiedLines: string[], expectedChanges: IChange[], shouldComputeCharChanges: boolean = true, shouldPostProcessCharChanges: boolean = false, shouldIgnoreTrimWhitespace: boolean = false) {
 	let diffComputer = new DiffComputer(originalLines, modifiedLines, {
-		shouldPostProcessCharChanges: shouldPostProcessCharChanges || false,
-		shouldIgnoreTrimWhitespace: shouldIgnoreTrimWhitespace || false,
+		shouldComputeCharChanges,
+		shouldPostProcessCharChanges,
+		shouldIgnoreTrimWhitespace,
 		shouldMakePrettyDiff: true
 	});
 	let changes = diffComputer.computeDiff();
@@ -66,25 +62,27 @@ function assertDiff(originalLines: string[], modifiedLines: string[], expectedCh
 	assert.deepEqual(extracted, expectedChanges);
 }
 
-function createLineDeletion(startLineNumber: number, endLineNumber: number, modifiedLineNumber: number): IChange {
+function createLineDeletion(startLineNumber: number, endLineNumber: number, modifiedLineNumber: number): ILineChange {
 	return {
 		originalStartLineNumber: startLineNumber,
 		originalEndLineNumber: endLineNumber,
 		modifiedStartLineNumber: modifiedLineNumber,
-		modifiedEndLineNumber: 0
+		modifiedEndLineNumber: 0,
+		charChanges: undefined
 	};
 }
 
-function createLineInsertion(startLineNumber: number, endLineNumber: number, originalLineNumber: number): IChange {
+function createLineInsertion(startLineNumber: number, endLineNumber: number, originalLineNumber: number): ILineChange {
 	return {
 		originalStartLineNumber: originalLineNumber,
 		originalEndLineNumber: 0,
 		modifiedStartLineNumber: startLineNumber,
-		modifiedEndLineNumber: endLineNumber
+		modifiedEndLineNumber: endLineNumber,
+		charChanges: undefined
 	};
 }
 
-function createLineChange(originalStartLineNumber: number, originalEndLineNumber: number, modifiedStartLineNumber: number, modifiedEndLineNumber: number, charChanges: ICharChange[]): ILineChange {
+function createLineChange(originalStartLineNumber: number, originalEndLineNumber: number, modifiedStartLineNumber: number, modifiedEndLineNumber: number, charChanges?: ICharChange[]): ILineChange {
 	return {
 		originalStartLineNumber: originalStartLineNumber,
 		originalEndLineNumber: originalEndLineNumber,
@@ -390,7 +388,7 @@ suite('Editor Diff - DiffComputer', () => {
 				createCharChange(1, 2, 1, 4, 1, 2, 1, 13)
 			])
 		];
-		assertDiff(original, modified, expected, true);
+		assertDiff(original, modified, expected, true, true);
 	});
 
 	test('ignore trim whitespace', () => {
@@ -403,7 +401,7 @@ suite('Editor Diff - DiffComputer', () => {
 				createCharInsertion(4, 1, 4, 4)
 			])
 		];
-		assertDiff(original, modified, expected, false, true);
+		assertDiff(original, modified, expected, true, false, true);
 	});
 
 	test('issue #12122 r.hasOwnProperty is not a function', () => {
@@ -423,7 +421,7 @@ suite('Editor Diff - DiffComputer', () => {
 				createCharChange(0, 0, 0, 0, 0, 0, 0, 0)
 			])
 		];
-		assertDiff(original, modified, expected, false, true);
+		assertDiff(original, modified, expected, true, false, true);
 	});
 
 	test('empty diff 2', () => {
@@ -434,7 +432,7 @@ suite('Editor Diff - DiffComputer', () => {
 				createCharChange(0, 0, 0, 0, 0, 0, 0, 0)
 			])
 		];
-		assertDiff(original, modified, expected, false, true);
+		assertDiff(original, modified, expected, true, false, true);
 	});
 
 	test('empty diff 3', () => {
@@ -445,7 +443,7 @@ suite('Editor Diff - DiffComputer', () => {
 				createCharChange(0, 0, 0, 0, 0, 0, 0, 0)
 			])
 		];
-		assertDiff(original, modified, expected, false, true);
+		assertDiff(original, modified, expected, true, false, true);
 	});
 
 	test('empty diff 4', () => {
@@ -456,7 +454,7 @@ suite('Editor Diff - DiffComputer', () => {
 				createCharChange(0, 0, 0, 0, 0, 0, 0, 0)
 			])
 		];
-		assertDiff(original, modified, expected, false, true);
+		assertDiff(original, modified, expected, true, false, true);
 	});
 
 	test('pretty diff 1', () => {
@@ -493,7 +491,7 @@ suite('Editor Diff - DiffComputer', () => {
 			createLineInsertion(1, 1, 0),
 			createLineInsertion(10, 13, 8)
 		];
-		assertDiff(original, modified, expected, false, true);
+		assertDiff(original, modified, expected, true, false, true);
 	});
 
 	test('pretty diff 2', () => {
@@ -536,7 +534,7 @@ suite('Editor Diff - DiffComputer', () => {
 			createLineInsertion(1, 3, 0),
 			createLineDeletion(10, 13, 12),
 		];
-		assertDiff(original, modified, expected, false, true);
+		assertDiff(original, modified, expected, true, false, true);
 	});
 
 	test('pretty diff 3', () => {
@@ -574,7 +572,7 @@ suite('Editor Diff - DiffComputer', () => {
 		let expected = [
 			createLineInsertion(7, 11, 6)
 		];
-		assertDiff(original, modified, expected, false, true);
+		assertDiff(original, modified, expected, true, false, true);
 	});
 
 	test('issue #23636', () => {
@@ -671,7 +669,7 @@ suite('Editor Diff - DiffComputer', () => {
 			)
 			// createLineInsertion(7, 11, 6)
 		];
-		assertDiff(original, modified, expected, true, false);
+		assertDiff(original, modified, expected, true, true, false);
 	});
 
 	test('issue #43922', () => {
@@ -690,7 +688,7 @@ suite('Editor Diff - DiffComputer', () => {
 				]
 			)
 		];
-		assertDiff(original, modified, expected, true, false);
+		assertDiff(original, modified, expected, true, true, false);
 	});
 
 	test('issue #42751', () => {
@@ -710,6 +708,25 @@ suite('Editor Diff - DiffComputer', () => {
 				]
 			)
 		];
-		assertDiff(original, modified, expected, true, false);
+		assertDiff(original, modified, expected, true, true, false);
+	});
+
+	test('does not give character changes', () => {
+		let original = [
+			'    1',
+			'  2',
+			'A',
+		];
+		let modified = [
+			'    1',
+			'   3',
+			' A',
+		];
+		let expected = [
+			createLineChange(
+				2, 3, 2, 3
+			)
+		];
+		assertDiff(original, modified, expected, false, false, false);
 	});
 });
diff --git a/src/vs/editor/test/common/editorTestUtils.ts b/src/vs/editor/test/common/editorTestUtils.ts
index c97a9a55a74..f02eab651ac 100644
--- a/src/vs/editor/test/common/editorTestUtils.ts
+++ b/src/vs/editor/test/common/editorTestUtils.ts
@@ -7,7 +7,7 @@
 import { TextModel } from 'vs/editor/common/model/textModel';
 import { DefaultEndOfLine, ITextModelCreationOptions } from 'vs/editor/common/model';
 import { LanguageIdentifier } from 'vs/editor/common/modes';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 
 export function withEditorModel(text: string[], callback: (model: TextModel) => void): void {
 	let model = TextModel.createFromString(text.join('\n'));
diff --git a/src/vs/editor/test/common/mocks/testConfiguration.ts b/src/vs/editor/test/common/mocks/testConfiguration.ts
index b94830a8456..0492346bff7 100644
--- a/src/vs/editor/test/common/mocks/testConfiguration.ts
+++ b/src/vs/editor/test/common/mocks/testConfiguration.ts
@@ -39,6 +39,7 @@ export class TestConfiguration extends CommonEditorConfiguration {
 			isMonospace: true,
 			typicalHalfwidthCharacterWidth: 10,
 			typicalFullwidthCharacterWidth: 20,
+			canUseHalfwidthRightwardsArrow: true,
 			spaceWidth: 10,
 			maxDigitWidth: 10,
 		}, true);
diff --git a/src/vs/editor/test/common/model/benchmark/bootstrap.js b/src/vs/editor/test/common/model/benchmark/bootstrap.js
index a93aabeb980..4364204ce0a 100644
--- a/src/vs/editor/test/common/model/benchmark/bootstrap.js
+++ b/src/vs/editor/test/common/model/benchmark/bootstrap.js
@@ -3,4 +3,4 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-require('../../../../../../bootstrap-amd').bootstrap('vs/editor/test/common/model/benchmark/entry');
\ No newline at end of file
+require('../../../../../../bootstrap-amd').load('vs/editor/test/common/model/benchmark/entry');
\ No newline at end of file
diff --git a/src/vs/editor/test/common/modes/languageSelector.test.ts b/src/vs/editor/test/common/modes/languageSelector.test.ts
index fa061f82b6d..96a16b357b4 100644
--- a/src/vs/editor/test/common/modes/languageSelector.test.ts
+++ b/src/vs/editor/test/common/modes/languageSelector.test.ts
@@ -6,7 +6,7 @@
 'use strict';
 
 import * as assert from 'assert';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { score } from 'vs/editor/common/modes/languageSelector';
 
 suite('LanguageSelector', function () {
diff --git a/src/vs/editor/test/common/modes/supports/tokenization.test.ts b/src/vs/editor/test/common/modes/supports/tokenization.test.ts
index 199a670cdaf..755d5b9d2f4 100644
--- a/src/vs/editor/test/common/modes/supports/tokenization.test.ts
+++ b/src/vs/editor/test/common/modes/supports/tokenization.test.ts
@@ -15,7 +15,7 @@ suite('Token theme matching', () => {
 			{ token: '', foreground: '100000', background: '200000' },
 			{ token: 'punctuation.definition.string.begin.html', foreground: '300000' },
 			{ token: 'punctuation.definition.string', foreground: '400000' },
-		]);
+		], []);
 
 		let colorMap = new ColorMap();
 		colorMap.getId('100000');
@@ -42,7 +42,7 @@ suite('Token theme matching', () => {
 			{ token: 'constant.numeric.oct', fontStyle: 'bold italic underline' },
 			{ token: 'constant.numeric.dec', fontStyle: '', foreground: '500000' },
 			{ token: 'storage.object.bar', fontStyle: '', foreground: '600000' },
-		]);
+		], []);
 
 		let colorMap = new ColorMap();
 		const _A = colorMap.getId('F8F8F2');
@@ -167,7 +167,7 @@ suite('Token theme resolving', () => {
 	});
 
 	test('always has defaults', () => {
-		let actual = TokenTheme.createFromParsedTokenTheme([]);
+		let actual = TokenTheme.createFromParsedTokenTheme([], []);
 		let colorMap = new ColorMap();
 		const _A = colorMap.getId('000000');
 		const _B = colorMap.getId('ffffff');
@@ -178,7 +178,7 @@ suite('Token theme resolving', () => {
 	test('respects incoming defaults 1', () => {
 		let actual = TokenTheme.createFromParsedTokenTheme([
 			new ParsedTokenThemeRule('', -1, FontStyle.NotSet, null, null)
-		]);
+		], []);
 		let colorMap = new ColorMap();
 		const _A = colorMap.getId('000000');
 		const _B = colorMap.getId('ffffff');
@@ -189,7 +189,7 @@ suite('Token theme resolving', () => {
 	test('respects incoming defaults 2', () => {
 		let actual = TokenTheme.createFromParsedTokenTheme([
 			new ParsedTokenThemeRule('', -1, FontStyle.None, null, null)
-		]);
+		], []);
 		let colorMap = new ColorMap();
 		const _A = colorMap.getId('000000');
 		const _B = colorMap.getId('ffffff');
@@ -200,7 +200,7 @@ suite('Token theme resolving', () => {
 	test('respects incoming defaults 3', () => {
 		let actual = TokenTheme.createFromParsedTokenTheme([
 			new ParsedTokenThemeRule('', -1, FontStyle.Bold, null, null)
-		]);
+		], []);
 		let colorMap = new ColorMap();
 		const _A = colorMap.getId('000000');
 		const _B = colorMap.getId('ffffff');
@@ -211,7 +211,7 @@ suite('Token theme resolving', () => {
 	test('respects incoming defaults 4', () => {
 		let actual = TokenTheme.createFromParsedTokenTheme([
 			new ParsedTokenThemeRule('', -1, FontStyle.NotSet, 'ff0000', null)
-		]);
+		], []);
 		let colorMap = new ColorMap();
 		const _A = colorMap.getId('ff0000');
 		const _B = colorMap.getId('ffffff');
@@ -222,7 +222,7 @@ suite('Token theme resolving', () => {
 	test('respects incoming defaults 5', () => {
 		let actual = TokenTheme.createFromParsedTokenTheme([
 			new ParsedTokenThemeRule('', -1, FontStyle.NotSet, null, 'ff0000')
-		]);
+		], []);
 		let colorMap = new ColorMap();
 		const _A = colorMap.getId('000000');
 		const _B = colorMap.getId('ff0000');
@@ -235,7 +235,7 @@ suite('Token theme resolving', () => {
 			new ParsedTokenThemeRule('', -1, FontStyle.NotSet, null, 'ff0000'),
 			new ParsedTokenThemeRule('', -1, FontStyle.NotSet, '00ff00', null),
 			new ParsedTokenThemeRule('', -1, FontStyle.Bold, null, null),
-		]);
+		], []);
 		let colorMap = new ColorMap();
 		const _A = colorMap.getId('00ff00');
 		const _B = colorMap.getId('ff0000');
@@ -247,7 +247,7 @@ suite('Token theme resolving', () => {
 		let actual = TokenTheme.createFromParsedTokenTheme([
 			new ParsedTokenThemeRule('', -1, FontStyle.NotSet, 'F8F8F2', '272822'),
 			new ParsedTokenThemeRule('var', -1, FontStyle.NotSet, 'ff0000', null)
-		]);
+		], []);
 		let colorMap = new ColorMap();
 		const _A = colorMap.getId('F8F8F2');
 		const _B = colorMap.getId('272822');
@@ -264,7 +264,7 @@ suite('Token theme resolving', () => {
 			new ParsedTokenThemeRule('', -1, FontStyle.NotSet, 'F8F8F2', '272822'),
 			new ParsedTokenThemeRule('var', 1, FontStyle.Bold, null, null),
 			new ParsedTokenThemeRule('var', 0, FontStyle.NotSet, 'ff0000', null),
-		]);
+		], []);
 		let colorMap = new ColorMap();
 		const _A = colorMap.getId('F8F8F2');
 		const _B = colorMap.getId('272822');
@@ -281,7 +281,7 @@ suite('Token theme resolving', () => {
 			new ParsedTokenThemeRule('', -1, FontStyle.NotSet, 'F8F8F2', '272822'),
 			new ParsedTokenThemeRule('var', -1, FontStyle.Bold, 'ff0000', null),
 			new ParsedTokenThemeRule('var.identifier', -1, FontStyle.NotSet, '00ff00', null),
-		]);
+		], []);
 		let colorMap = new ColorMap();
 		const _A = colorMap.getId('F8F8F2');
 		const _B = colorMap.getId('272822');
@@ -306,7 +306,7 @@ suite('Token theme resolving', () => {
 			new ParsedTokenThemeRule('constant.numeric.hex', 6, FontStyle.Bold, null, null),
 			new ParsedTokenThemeRule('constant.numeric.oct', 7, FontStyle.Bold | FontStyle.Italic | FontStyle.Underline, null, null),
 			new ParsedTokenThemeRule('constant.numeric.dec', 8, FontStyle.None, '300000', null),
-		]);
+		], []);
 		let colorMap = new ColorMap();
 		const _A = colorMap.getId('F8F8F2');
 		const _B = colorMap.getId('272822');
@@ -330,4 +330,18 @@ suite('Token theme resolving', () => {
 		});
 		assert.deepEqual(actual.getThemeTrieElement(), root);
 	});
+
+	test('custom colors are first in color map', () => {
+		let actual = TokenTheme.createFromParsedTokenTheme([
+			new ParsedTokenThemeRule('var', -1, FontStyle.NotSet, 'F8F8F2', null)
+		], [
+				'000000', 'FFFFFF', '0F0F0F'
+			]);
+		let colorMap = new ColorMap();
+		colorMap.getId('000000');
+		colorMap.getId('FFFFFF');
+		colorMap.getId('0F0F0F');
+		colorMap.getId('F8F8F2');
+		assert.deepEqual(actual.getColorMap(), colorMap.getColorMap());
+	});
 });
diff --git a/src/vs/editor/test/common/services/languagesRegistry.test.ts b/src/vs/editor/test/common/services/languagesRegistry.test.ts
index 42ed949ff4f..cf2b1f618d9 100644
--- a/src/vs/editor/test/common/services/languagesRegistry.test.ts
+++ b/src/vs/editor/test/common/services/languagesRegistry.test.ts
@@ -6,6 +6,7 @@
 
 import * as assert from 'assert';
 import { LanguagesRegistry } from 'vs/editor/common/services/languagesRegistry';
+import { URI } from 'vs/base/common/uri';
 
 suite('LanguagesRegistry', () => {
 
@@ -250,19 +251,19 @@ suite('LanguagesRegistry', () => {
 		registry._registerLanguages([{
 			id: 'a',
 			aliases: ['aName'],
-			configuration: 'aFilename'
+			configuration: URI.file('/path/to/aFilename')
 		}]);
 
-		assert.deepEqual(registry.getConfigurationFiles('a'), ['aFilename']);
+		assert.deepEqual(registry.getConfigurationFiles('a'), [URI.file('/path/to/aFilename')]);
 		assert.deepEqual(registry.getConfigurationFiles('aname'), []);
 		assert.deepEqual(registry.getConfigurationFiles('aName'), []);
 
 		registry._registerLanguages([{
 			id: 'a',
-			configuration: 'aFilename2'
+			configuration: URI.file('/path/to/aFilename2')
 		}]);
 
-		assert.deepEqual(registry.getConfigurationFiles('a'), ['aFilename', 'aFilename2']);
+		assert.deepEqual(registry.getConfigurationFiles('a'), [URI.file('/path/to/aFilename'), URI.file('/path/to/aFilename2')]);
 		assert.deepEqual(registry.getConfigurationFiles('aname'), []);
 		assert.deepEqual(registry.getConfigurationFiles('aName'), []);
 	});
diff --git a/src/vs/editor/test/common/services/modelService.test.ts b/src/vs/editor/test/common/services/modelService.test.ts
index fa75cbb9c4f..b4db0be2cc7 100644
--- a/src/vs/editor/test/common/services/modelService.test.ts
+++ b/src/vs/editor/test/common/services/modelService.test.ts
@@ -7,7 +7,7 @@
 import * as assert from 'assert';
 import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
 import { ModelServiceImpl } from 'vs/editor/common/services/modelServiceImpl';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import * as platform from 'vs/base/common/platform';
 import { DefaultEndOfLine } from 'vs/editor/common/model';
 import { TextModel, createTextBuffer } from 'vs/editor/common/model/textModel';
diff --git a/src/vs/editor/test/common/standalone/standaloneBase.test.ts b/src/vs/editor/test/common/standalone/standaloneBase.test.ts
index 64849eb80cb..4cec807f3c1 100644
--- a/src/vs/editor/test/common/standalone/standaloneBase.test.ts
+++ b/src/vs/editor/test/common/standalone/standaloneBase.test.ts
@@ -5,18 +5,8 @@
 'use strict';
 
 import * as assert from 'assert';
-import { KeyCode as StandaloneKeyCode, Severity as StandaloneSeverity } from 'vs/editor/common/standalone/standaloneBase';
+import { KeyCode as StandaloneKeyCode } from 'vs/editor/common/standalone/standaloneBase';
 import { KeyCode as RuntimeKeyCode } from 'vs/base/common/keyCodes';
-import RuntimeSeverity from 'vs/base/common/severity';
-
-suite('StandaloneBase', () => {
-	test('exports enums correctly', () => {
-		assert.equal(StandaloneSeverity.Ignore, RuntimeSeverity.Ignore);
-		assert.equal(StandaloneSeverity.Info, RuntimeSeverity.Info);
-		assert.equal(StandaloneSeverity.Warning, RuntimeSeverity.Warning);
-		assert.equal(StandaloneSeverity.Error, RuntimeSeverity.Error);
-	});
-});
 
 suite('KeyCode', () => {
 	test('is exported correctly in standalone editor', () => {
diff --git a/src/vs/editor/test/common/viewLayout/viewLineRenderer.test.ts b/src/vs/editor/test/common/viewLayout/viewLineRenderer.test.ts
index 59705ec0d93..968b1a20126 100644
--- a/src/vs/editor/test/common/viewLayout/viewLineRenderer.test.ts
+++ b/src/vs/editor/test/common/viewLayout/viewLineRenderer.test.ts
@@ -29,6 +29,7 @@ suite('viewLineRenderer.renderLine', () => {
 	function assertCharacterReplacement(lineContent: string, tabSize: number, expected: string, expectedCharOffsetInPart: number[][], expectedPartLengts: number[]): void {
 		let _actual = renderViewLine(new RenderLineInput(
 			false,
+			true,
 			lineContent,
 			false,
 			strings.isBasicASCII(lineContent),
@@ -77,6 +78,7 @@ suite('viewLineRenderer.renderLine', () => {
 	function assertParts(lineContent: string, tabSize: number, parts: ViewLineToken[], expected: string, expectedCharOffsetInPart: number[][], expectedPartLengts: number[]): void {
 		let _actual = renderViewLine(new RenderLineInput(
 			false,
+			true,
 			lineContent,
 			false,
 			true,
@@ -115,6 +117,7 @@ suite('viewLineRenderer.renderLine', () => {
 	test('overflow', () => {
 		let _actual = renderViewLine(new RenderLineInput(
 			false,
+			true,
 			'Hello world!',
 			false,
 			true,
@@ -218,6 +221,7 @@ suite('viewLineRenderer.renderLine', () => {
 
 		let _actual = renderViewLine(new RenderLineInput(
 			false,
+			true,
 			lineText,
 			false,
 			true,
@@ -279,6 +283,7 @@ suite('viewLineRenderer.renderLine', () => {
 
 		let _actual = renderViewLine(new RenderLineInput(
 			false,
+			true,
 			lineText,
 			false,
 			true,
@@ -340,6 +345,7 @@ suite('viewLineRenderer.renderLine', () => {
 
 		let _actual = renderViewLine(new RenderLineInput(
 			false,
+			true,
 			lineText,
 			false,
 			true,
@@ -378,6 +384,7 @@ suite('viewLineRenderer.renderLine', () => {
 
 		let _actual = renderViewLine(new RenderLineInput(
 			false,
+			true,
 			lineText,
 			false,
 			false,
@@ -407,6 +414,7 @@ suite('viewLineRenderer.renderLine', () => {
 			let lineParts = createViewLineTokens([createPart(lineText.length, 1)]);
 			let actual = renderViewLine(new RenderLineInput(
 				false,
+				true,
 				lineText,
 				false,
 				true,
@@ -506,6 +514,7 @@ suite('viewLineRenderer.renderLine', () => {
 			let lineParts = createViewLineTokens([createPart(lineText.length, 1)]);
 			let actual = renderViewLine(new RenderLineInput(
 				false,
+				true,
 				lineText,
 				false,
 				true,
@@ -541,6 +550,7 @@ suite('viewLineRenderer.renderLine', () => {
 		let lineParts = createViewLineTokens([createPart(lineText.length, 1)]);
 		let actual = renderViewLine(new RenderLineInput(
 			false,
+			true,
 			lineText,
 			false,
 			false,
@@ -569,6 +579,7 @@ suite('viewLineRenderer.renderLine', () => {
 		];
 		let actual = renderViewLine(new RenderLineInput(
 			false,
+			true,
 			lineText,
 			false,
 			false,
@@ -613,6 +624,7 @@ suite('viewLineRenderer.renderLine', () => {
 		].join('');
 
 		let _actual = renderViewLine(new RenderLineInput(
+			true,
 			true,
 			lineText,
 			false,
@@ -696,6 +708,7 @@ suite('viewLineRenderer.renderLine 2', () => {
 	function testCreateLineParts(fontIsMonospace: boolean, lineContent: string, tokens: ViewLineToken[], fauxIndentLength: number, renderWhitespace: 'none' | 'boundary' | 'all', expected: string): void {
 		let actual = renderViewLine(new RenderLineInput(
 			fontIsMonospace,
+			true,
 			lineContent,
 			false,
 			true,
@@ -720,6 +733,7 @@ suite('viewLineRenderer.renderLine 2', () => {
 
 		let actual = renderViewLine(new RenderLineInput(
 			false,
+			true,
 			lineContent,
 			false,
 			true,
@@ -749,6 +763,7 @@ suite('viewLineRenderer.renderLine 2', () => {
 		let lineContent = '\'let url = `http://***/_api/web/lists/GetByTitle(\\\'Teambuildingaanvragen\\\')/items`;\'';
 
 		let actual = renderViewLine(new RenderLineInput(
+			true,
 			true,
 			lineContent,
 			false,
@@ -1016,6 +1031,7 @@ suite('viewLineRenderer.renderLine 2', () => {
 	test('createLineParts can handle unsorted inline decorations', () => {
 		let actual = renderViewLine(new RenderLineInput(
 			false,
+			true,
 			'Hello world',
 			false,
 			true,
@@ -1059,6 +1075,7 @@ suite('viewLineRenderer.renderLine 2', () => {
 
 		let actual = renderViewLine(new RenderLineInput(
 			false,
+			true,
 			lineContent,
 			false,
 			true,
@@ -1090,6 +1107,7 @@ suite('viewLineRenderer.renderLine 2', () => {
 
 		let actual = renderViewLine(new RenderLineInput(
 			false,
+			true,
 			lineContent,
 			false,
 			true,
@@ -1122,6 +1140,7 @@ suite('viewLineRenderer.renderLine 2', () => {
 
 		let actual = renderViewLine(new RenderLineInput(
 			false,
+			true,
 			lineContent,
 			false,
 			true,
@@ -1149,6 +1168,7 @@ suite('viewLineRenderer.renderLine 2', () => {
 	test('issue #37208: Collapsing bullet point containing emoji in Markdown document results in [??] character', () => {
 
 		let actual = renderViewLine(new RenderLineInput(
+			true,
 			true,
 			'  1. 🙏',
 			false,
@@ -1178,6 +1198,7 @@ suite('viewLineRenderer.renderLine 2', () => {
 	test('issue #37401: Allow both before and after decorations on empty line', () => {
 
 		let actual = renderViewLine(new RenderLineInput(
+			true,
 			true,
 			'',
 			false,
@@ -1209,6 +1230,7 @@ suite('viewLineRenderer.renderLine 2', () => {
 	test('issue #38935: GitLens end-of-line blame no longer rendering', () => {
 
 		let actual = renderViewLine(new RenderLineInput(
+			true,
 			true,
 			'\t}',
 			false,
@@ -1241,6 +1263,7 @@ suite('viewLineRenderer.renderLine 2', () => {
 	test('issue #22832: Consider fullwidth characters when rendering tabs', () => {
 
 		let actual = renderViewLine(new RenderLineInput(
+			true,
 			true,
 			'asd = "擦"\t\t#asd',
 			false,
@@ -1269,6 +1292,7 @@ suite('viewLineRenderer.renderLine 2', () => {
 	test('issue #22832: Consider fullwidth characters when rendering tabs (render whitespace)', () => {
 
 		let actual = renderViewLine(new RenderLineInput(
+			true,
 			true,
 			'asd = "擦"\t\t#asd',
 			false,
@@ -1303,6 +1327,7 @@ suite('viewLineRenderer.renderLine 2', () => {
 	test('issue #22352: COMBINING ACUTE ACCENT (U+0301)', () => {
 
 		let actual = renderViewLine(new RenderLineInput(
+			true,
 			true,
 			'12345689012345678901234568901234567890123456890abába',
 			false,
@@ -1331,6 +1356,7 @@ suite('viewLineRenderer.renderLine 2', () => {
 	test('issue #22352: Partially Broken Complex Script Rendering of Tamil', () => {
 
 		let actual = renderViewLine(new RenderLineInput(
+			true,
 			true,
 			' JoyShareல் பின்தொடர்ந்து, விடீயோ, ஜோக்குகள், அனிமேசன், நகைச்சுவை படங்கள் மற்றும் செய்திகளை பெறுவீர்',
 			false,
@@ -1363,6 +1389,7 @@ suite('viewLineRenderer.renderLine 2', () => {
 	test('issue #42700: Hindi characters are not being rendered properly', () => {
 
 		let actual = renderViewLine(new RenderLineInput(
+			true,
 			true,
 			' वो ऐसा क्या है जो हमारे अंदर भी है और बाहर भी है। जिसकी वजह से हम सब हैं। जिसने इस सृष्टि की रचना की है।',
 			false,
@@ -1390,6 +1417,7 @@ suite('viewLineRenderer.renderLine 2', () => {
 
 	test('issue #38123: editor.renderWhitespace: "boundary" renders whitespace at line wrap point when line is wrapped', () => {
 		let actual = renderViewLine(new RenderLineInput(
+			true,
 			true,
 			'This is a long line which never uses more than two spaces. ',
 			true,
@@ -1418,6 +1446,7 @@ suite('viewLineRenderer.renderLine 2', () => {
 	function createTestGetColumnOfLinePartOffset(lineContent: string, tabSize: number, parts: ViewLineToken[], expectedPartLengths: number[]): (partIndex: number, partLength: number, offset: number, expected: number) => void {
 		let renderLineOutput = renderViewLine(new RenderLineInput(
 			false,
+			true,
 			lineContent,
 			false,
 			true,
diff --git a/src/vs/loader.js b/src/vs/loader.js
index 291f0e8b6b3..d02070659ce 100644
--- a/src/vs/loader.js
+++ b/src/vs/loader.js
@@ -142,7 +142,7 @@ var AMDLoader;
          * This method does not take care of / vs \
          */
         Utilities.fileUriToFilePath = function (isWindows, uri) {
-            uri = decodeURI(uri);
+            uri = decodeURI(uri).replace(/%23/g, '#');
             if (isWindows) {
                 if (/^file:\/\/\//.test(uri)) {
                     // This is a URI without a hostname => return only the path segment
@@ -212,7 +212,7 @@ var AMDLoader;
             return '===anonymous' + (Utilities.NEXT_ANONYMOUS_ID++) + '===';
         };
         Utilities.isAnonymousModule = function (id) {
-            return /^===anonymous/.test(id);
+            return Utilities.startsWith(id, '===anonymous');
         };
         Utilities.getHighPerformanceTimestamp = function () {
             if (!this.PERFORMANCE_NOW_PROBED) {
@@ -768,8 +768,7 @@ var AMDLoader;
                     }
                     contents = nodeInstrumenter(contents, normalizedScriptSrc);
                     if (!opts.nodeCachedDataDir) {
-                        _this._loadAndEvalScript(moduleManager, scriptSrc, vmScriptSrc, contents, { filename: vmScriptSrc }, recorder);
-                        callback();
+                        _this._loadAndEvalScript(moduleManager, scriptSrc, vmScriptSrc, contents, { filename: vmScriptSrc }, recorder, callback, errorback);
                     }
                     else {
                         var cachedDataPath_1 = _this._getCachedDataPath(opts.nodeCachedDataDir, scriptSrc);
@@ -780,22 +779,34 @@ var AMDLoader;
                                 produceCachedData: typeof cachedData === 'undefined',
                                 cachedData: cachedData
                             };
-                            var script = _this._loadAndEvalScript(moduleManager, scriptSrc, vmScriptSrc, contents, options, recorder);
-                            callback();
+                            var script = _this._loadAndEvalScript(moduleManager, scriptSrc, vmScriptSrc, contents, options, recorder, callback, errorback);
                             _this._processCachedData(moduleManager, script, cachedDataPath_1);
                         });
                     }
                 });
             }
         };
-        NodeScriptLoader.prototype._loadAndEvalScript = function (moduleManager, scriptSrc, vmScriptSrc, contents, options, recorder) {
+        NodeScriptLoader.prototype._loadAndEvalScript = function (moduleManager, scriptSrc, vmScriptSrc, contents, options, recorder, callback, errorback) {
             // create script, run script
             recorder.record(31 /* NodeBeginEvaluatingScript */, scriptSrc);
             var script = new this._vm.Script(contents, options);
             var r = script.runInThisContext(options);
-            r.call(AMDLoader.global, moduleManager.getGlobalAMDRequireFunc(), moduleManager.getGlobalAMDDefineFunc(), vmScriptSrc, this._path.dirname(scriptSrc));
+            var globalDefineFunc = moduleManager.getGlobalAMDDefineFunc();
+            var receivedDefineCall = false;
+            var localDefineFunc = function () {
+                receivedDefineCall = true;
+                return globalDefineFunc.apply(null, arguments);
+            };
+            localDefineFunc.amd = globalDefineFunc.amd;
+            r.call(AMDLoader.global, moduleManager.getGlobalAMDRequireFunc(), localDefineFunc, vmScriptSrc, this._path.dirname(scriptSrc));
             // signal done
             recorder.record(32 /* NodeEndEvaluatingScript */, scriptSrc);
+            if (receivedDefineCall) {
+                callback();
+            }
+            else {
+                errorback(new Error("Didn't receive define call in " + scriptSrc + "!"));
+            }
             return script;
         };
         NodeScriptLoader.prototype._getCachedDataPath = function (basedir, filename) {
@@ -1403,7 +1414,8 @@ var AMDLoader;
             this._knownModules2[moduleId] = true;
             var strModuleId = this._moduleIdProvider.getStrModuleId(moduleId);
             var paths = this._config.moduleIdToPaths(strModuleId);
-            if (this._env.isNode && strModuleId.indexOf('/') === -1) {
+            var scopedPackageRegex = /^@[^\/]+\/[^\/]+$/; // matches @scope/package-name
+            if (this._env.isNode && (strModuleId.indexOf('/') === -1 || scopedPackageRegex.test(strModuleId))) {
                 paths.push('node|' + strModuleId);
             }
             var lastPathIndex = -1;
@@ -1649,6 +1661,9 @@ var AMDLoader;
     RequireFunc.getStats = function () {
         return moduleManager.getLoaderEvents();
     };
+    RequireFunc.define = function () {
+        return DefineFunc.apply(null, arguments);
+    };
     function init() {
         if (typeof AMDLoader.global.require !== 'undefined' || typeof require !== 'undefined') {
             var _nodeRequire_1 = (AMDLoader.global.require || require);
diff --git a/src/vs/monaco.d.ts b/src/vs/monaco.d.ts
index 8a49ab1c4d4..ad533ea43d5 100644
--- a/src/vs/monaco.d.ts
+++ b/src/vs/monaco.d.ts
@@ -25,13 +25,6 @@ declare namespace monaco {
 		dispose(): void;
 	}
 
-	export enum Severity {
-		Ignore = 0,
-		Info = 1,
-		Warning = 2,
-		Error = 3,
-	}
-
 	export enum MarkerTag {
 		Unnecessary = 1,
 	}
@@ -45,31 +38,13 @@ declare namespace monaco {
 
 
 
-
-	export type TValueCallback<T = any> = (value: T | PromiseLike<T>) => void;
-
-	export type ProgressCallback<TProgress = any> = (progress: TProgress) => void;
-
-
-	export class Promise<T = any, TProgress = any> {
-		constructor(
-			executor: (
-				resolve: (value: T | PromiseLike<T>) => void,
-				reject: (reason: any) => void,
-				progress: (progress: TProgress) => void) => void,
-			oncancel?: () => void);
+	export class Promise<T = any> {
+		constructor(executor: (resolve: (value: T | PromiseLike<T>) => void, reject: (reason: any) => void) => void);
 
 		public then<TResult1 = T, TResult2 = never>(
 			onfulfilled?: ((value: T) => TResult1 | PromiseLike<TResult1>) | null,
-			onrejected?: ((reason: any) => TResult2 | PromiseLike<TResult2>) | null,
-			onprogress?: (progress: TProgress) => void): Promise<TResult1 | TResult2, TProgress>;
+			onrejected?: ((reason: any) => TResult2 | PromiseLike<TResult2>) | null): Promise<TResult1 | TResult2>;
 
-		public done(
-			onfulfilled?: (value: T) => void,
-			onrejected?: (reason: any) => void,
-			onprogress?: (progress: TProgress) => void): void;
-
-		public cancel(): void;
 
 		public static as(value: null): Promise<null>;
 		public static as(value: undefined): Promise<undefined>;
@@ -77,13 +52,8 @@ declare namespace monaco {
 		public static as<T, SomePromise extends PromiseLike<T>>(value: SomePromise): SomePromise;
 		public static as<T>(value: T): Promise<T>;
 
-		public static is(value: any): value is PromiseLike<any>;
-
-		public static timeout(delay: number): Promise<void>;
-
 		public static join<T1, T2>(promises: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>]): Promise<[T1, T2]>;
 		public static join<T>(promises: (T | PromiseLike<T>)[]): Promise<T[]>;
-		public static join<T>(promises: { [n: string]: T | PromiseLike<T> }): Promise<{ [n: string]: T }>;
 
 		public static any<T>(promises: (T | PromiseLike<T>)[]): Promise<{ key: string; value: Promise<T>; }>;
 
@@ -108,7 +78,7 @@ declare namespace monaco {
 	}
 	/**
 	 * Uniform Resource Identifier (Uri) http://tools.ietf.org/html/rfc3986.
-	 * This class is a simple parser which creates the basic component paths
+	 * This class is a simple parser which creates the basic component parts
 	 * (http://tools.ietf.org/html/rfc3986#section-3) with minimal validation
 	 * and encoding.
 	 *
@@ -119,8 +89,6 @@ declare namespace monaco {
 	 *        |   _____________________|__
 	 *       / \ /                        \
 	 *       urn:example:animal:ferret:nose
-	 *
-	 *
 	 */
 	export class Uri implements UriComponents {
 		static isUri(thing: any): thing is Uri;
@@ -148,28 +116,80 @@ declare namespace monaco {
 		readonly fragment: string;
 		/**
 		 * Returns a string representing the corresponding file system path of this Uri.
-		 * Will handle UNC paths and normalize windows drive letters to lower-case. Also
-		 * uses the platform specific path separator. Will *not* validate the path for
-		 * invalid characters and semantics. Will *not* look at the scheme of this Uri.
+		 * Will handle UNC paths, normalizes windows drive letters to lower-case, and uses the
+		 * platform specific path separator.
+		 *
+		 * * Will *not* validate the path for invalid characters and semantics.
+		 * * Will *not* look at the scheme of this Uri.
+		 * * The result shall *not* be used for display purposes but for accessing a file on disk.
+		 *
+		 *
+		 * The *difference* to `Uri#path` is the use of the platform specific separator and the handling
+		 * of UNC paths. See the below sample of a file-uri with an authority (UNC path).
+		 *
+		 * ```ts
+			const u = Uri.parse('file://server/c$/folder/file.txt')
+			u.authority === 'server'
+			u.path === '/shares/c$/file.txt'
+			u.fsPath === '\\server\c$\folder\file.txt'
+		```
+		 *
+		 * Using `Uri#path` to read a file (using fs-apis) would not be enough because parts of the path,
+		 * namely the server name, would be missing. Therefore `Uri#fsPath` exists - it's sugar to ease working
+		 * with URIs that represent files on disk (`file` scheme).
 		 */
 		readonly fsPath: string;
 		with(change: {
 			scheme?: string;
-			authority?: string;
-			path?: string;
-			query?: string;
-			fragment?: string;
+			authority?: string | null;
+			path?: string | null;
+			query?: string | null;
+			fragment?: string | null;
 		}): Uri;
+		/**
+		 * Creates a new Uri from a string, e.g. `http://www.msft.com/some/path`,
+		 * `file:///usr/home`, or `scheme:with/path`.
+		 *
+		 * @param value A string which represents an Uri (see `Uri#toString`).
+		 */
 		static parse(value: string): Uri;
+		/**
+		 * Creates a new Uri from a file system path, e.g. `c:\my\files`,
+		 * `/usr/home`, or `\\server\share\some\path`.
+		 *
+		 * The *difference* between `Uri#parse` and `Uri#file` is that the latter treats the argument
+		 * as path, not as stringified-uri. E.g. `Uri.file(path)` is **not the same as**
+		 * `Uri.parse('file://' + path)` because the path might contain characters that are
+		 * interpreted (# and ?). See the following sample:
+		 * ```ts
+		const good = Uri.file('/coding/c#/project1');
+		good.scheme === 'file';
+		good.path === '/coding/c#/project1';
+		good.fragment === '';
+		const bad = Uri.parse('file://' + '/coding/c#/project1');
+		bad.scheme === 'file';
+		bad.path === '/coding/c'; // path is now broken
+		bad.fragment === '/project1';
+		```
+		 *
+		 * @param path A file system path (see `Uri#fsPath`)
+		 */
 		static file(path: string): Uri;
 		static from(components: {
-			scheme?: string;
+			scheme: string;
 			authority?: string;
 			path?: string;
 			query?: string;
 			fragment?: string;
 		}): Uri;
 		/**
+		 * Creates a string presentation for this Uri. It's guardeed that calling
+		 * `Uri.parse` with the result of this function creates an Uri which is equal
+		 * to this Uri.
+		 *
+		 * * The result shall *not* be used for display purposes but for externalization or transport.
+		 * * The result will be encoded using the percentage encoding and encoding happens mostly
+		 * ignore the scheme-specific encoding rules.
 		 *
 		 * @param skipEncoding Do not encode the result, default is `false`
 		 */
@@ -822,7 +842,7 @@ declare namespace monaco.editor {
 	/**
 	 * Change the language for a model.
 	 */
-	export function setModelLanguage(model: ITextModel, language: string): void;
+	export function setModelLanguage(model: ITextModel, languageId: string): void;
 
 	/**
 	 * Set the markers for a model.
@@ -898,7 +918,7 @@ declare namespace monaco.editor {
 	export function tokenize(text: string, languageId: string): Token[][];
 
 	/**
-	 * Define a new theme.
+	 * Define a new theme or updte an existing theme.
 	 */
 	export function defineTheme(themeName: string, themeData: IStandaloneThemeData): void;
 
@@ -913,6 +933,7 @@ declare namespace monaco.editor {
 		base: BuiltinTheme;
 		inherit: boolean;
 		rules: ITokenThemeRule[];
+		encodedTokensColors?: string[];
 		colors: IColors;
 	}
 
@@ -1014,7 +1035,7 @@ declare namespace monaco.editor {
 		/**
 		 * The initial model associated with this code editor.
 		 */
-		model?: ITextModel;
+		model?: ITextModel | null;
 		/**
 		 * The initial value of the auto created model in the editor.
 		 * To not create automatically a model, use `model: null`.
@@ -1093,7 +1114,7 @@ declare namespace monaco.editor {
 		endLineNumber: number;
 		endColumn: number;
 		relatedInformation?: IRelatedInformation[];
-		customTags?: MarkerTag[];
+		tags?: MarkerTag[];
 	}
 
 	/**
@@ -1109,7 +1130,7 @@ declare namespace monaco.editor {
 		endLineNumber: number;
 		endColumn: number;
 		relatedInformation?: IRelatedInformation[];
-		customTags?: MarkerTag[];
+		tags?: MarkerTag[];
 	}
 
 	/**
@@ -1629,32 +1650,12 @@ declare namespace monaco.editor {
 		/**
 		 * Get the word under or besides `position`.
 		 * @param position The position to look for a word.
-		 * @param skipSyntaxTokens Ignore syntax tokens, as identified by the mode.
 		 * @return The word under or besides `position`. Might be null.
 		 */
 		getWordAtPosition(position: IPosition): IWordAtPosition;
 		/**
 		 * Get the word under or besides `position` trimmed to `position`.column
 		 * @param position The position to look for a word.
-		 * @param skipSyntaxTokens Ignore syntax tokens, as identified by the mode.
-		 * @return The word under or besides `position`. Will never be null.
-		 */
-		getWordUntilPosition(position: IPosition): IWordAtPosition;
-		/**
-		 * Get the language associated with this model.
-		 */
-		getModeId(): string;
-		/**
-		 * Get the word under or besides `position`.
-		 * @param position The position to look for a word.
-		 * @param skipSyntaxTokens Ignore syntax tokens, as identified by the mode.
-		 * @return The word under or besides `position`. Might be null.
-		 */
-		getWordAtPosition(position: IPosition): IWordAtPosition;
-		/**
-		 * Get the word under or besides `position` trimmed to `position`.column
-		 * @param position The position to look for a word.
-		 * @param skipSyntaxTokens Ignore syntax tokens, as identified by the mode.
 		 * @return The word under or besides `position`. Will never be null.
 		 */
 		getWordUntilPosition(position: IPosition): IWordAtPosition;
@@ -2153,7 +2154,7 @@ declare namespace monaco.editor {
 		/**
 		 * Gets the current model attached to this editor.
 		 */
-		getModel(): IEditorModel;
+		getModel(): IEditorModel | null;
 		/**
 		 * Sets the current model attached to this editor.
 		 * If the previous model was created by the editor via the value key in the options
@@ -2162,7 +2163,7 @@ declare namespace monaco.editor {
 		 * will not be destroyed.
 		 * It is safe to call setModel(null) to simply detach the current model from the editor.
 		 */
-		setModel(model: IEditorModel): void;
+		setModel(model: IEditorModel | null): void;
 	}
 
 	/**
@@ -2445,13 +2446,23 @@ declare namespace monaco.editor {
 		autoFindInSelection: boolean;
 	}
 
+	/**
+	 * Configuration options for auto closing quotes and brackets
+	 */
+	export type EditorAutoClosingStrategy = 'always' | 'languageDefined' | 'beforeWhitespace' | 'never';
+
+	/**
+	 * Configuration options for auto wrapping quotes and brackets
+	 */
+	export type EditorAutoSurroundStrategy = 'languageDefined' | 'quotes' | 'brackets' | 'never';
+
 	/**
 	 * Configuration options for editor minimap
 	 */
 	export interface IEditorMinimapOptions {
 		/**
 		 * Enable the rendering of the minimap.
-		 * Defaults to false.
+		 * Defaults to true.
 		 */
 		enabled?: boolean;
 		/**
@@ -2487,6 +2498,54 @@ declare namespace monaco.editor {
 		enabled?: boolean;
 	}
 
+	/**
+	 * Configuration options for editor hover
+	 */
+	export interface IEditorHoverOptions {
+		/**
+		 * Enable the hover.
+		 * Defaults to true.
+		 */
+		enabled?: boolean;
+		/**
+		 * Delay for showing the hover.
+		 * Defaults to 300.
+		 */
+		delay?: number;
+		/**
+		 * Is the hover sticky such that it can be clicked and its contents selected?
+		 * Defaults to true.
+		 */
+		sticky?: boolean;
+	}
+
+	/**
+	 * Configuration options for parameter hints
+	 */
+	export interface IEditorParameterHintOptions {
+		/**
+		 * Enable parameter hints.
+		 * Defaults to true.
+		 */
+		enabled?: boolean;
+		/**
+		 * Enable cycling of parameter hints.
+		 * Defaults to false.
+		 */
+		cycle?: boolean;
+	}
+
+	export interface ISuggestOptions {
+		/**
+		 * Enable graceful matching. Defaults to true.
+		 */
+		filterGraceful?: boolean;
+		/**
+		 * Prevent quick suggestions when a snippet is active. Defaults to true.
+		 */
+		snippetsPreventQuickSuggestions?: boolean;
+	}
+
 	/**
 	 * Configuration map for codeActionsOnSave
 	 */
@@ -2705,10 +2764,9 @@ declare namespace monaco.editor {
 		 */
 		stopRenderingLineAfter?: number;
 		/**
-		 * Enable hover.
-		 * Defaults to true.
+		 * Configure the editor's hover.
 		 */
-		hover?: boolean;
+		hover?: IEditorHoverOptions;
 		/**
 		 * Enable detecting links and making them clickable.
 		 * Defaults to true.
@@ -2743,6 +2801,10 @@ declare namespace monaco.editor {
 		 * Defaults to 'auto'. It is best to leave this to 'auto'.
 		 */
 		accessibilitySupport?: 'auto' | 'off' | 'on';
+		/**
+		 * Suggest options.
+		 */
+		suggest?: ISuggestOptions;
 		/**
 		 * Enable quick suggestions (shadow suggestions)
 		 * Defaults to true.
@@ -2758,19 +2820,29 @@ declare namespace monaco.editor {
 		 */
 		quickSuggestionsDelay?: number;
 		/**
-		 * Enables parameter hints
+		 * Parameter hint options.
 		 */
-		parameterHints?: boolean;
+		parameterHints?: IEditorParameterHintOptions;
 		/**
 		 * Render icons in suggestions box.
 		 * Defaults to true.
 		 */
 		iconsInSuggestions?: boolean;
 		/**
-		 * Enable auto closing brackets.
-		 * Defaults to true.
+		 * Options for auto closing brackets.
+		 * Defaults to language defined behavior.
 		 */
-		autoClosingBrackets?: boolean;
+		autoClosingBrackets?: EditorAutoClosingStrategy;
+		/**
+		 * Options for auto closing quotes.
+		 * Defaults to language defined behavior.
+		 */
+		autoClosingQuotes?: EditorAutoClosingStrategy;
+		/**
+		 * Options for auto surrounding.
+		 * Defaults to always allowing auto surrounding.
+		 */
+		autoSurround?: EditorAutoSurroundStrategy;
 		/**
 		 * Enable auto indentation adjustment.
 		 * Defaults to false.
@@ -2814,6 +2886,10 @@ declare namespace monaco.editor {
 		 * Copying without a selection copies the current line.
 		 */
 		emptySelectionClipboard?: boolean;
+		/**
+		 * Syntax highlighting is copied.
+		 */
+		copyWithSyntaxHighlighting?: boolean;
 		/**
 		 * Enable word based suggestions. Defaults to 'true'
 		 */
@@ -2891,9 +2967,14 @@ declare namespace monaco.editor {
 		renderControlCharacters?: boolean;
 		/**
 		 * Enable rendering of indent guides.
-		 * Defaults to false.
+		 * Defaults to true.
 		 */
 		renderIndentGuides?: boolean;
+		/**
+		 * Enable highlighting of the active indent guide.
+		 * Defaults to true.
+		 */
+		highlightActiveIndentGuide?: boolean;
 		/**
 		 * Enable rendering of current line highlight.
 		 * Defaults to all.
@@ -2923,6 +3004,10 @@ declare namespace monaco.editor {
 		 * The letter spacing
 		 */
 		letterSpacing?: number;
+		/**
+		 * Controls fading out of unused variables.
+		 */
+		showUnused?: boolean;
 	}
 
 	/**
@@ -3074,6 +3159,23 @@ declare namespace monaco.editor {
 		readonly autoFindInSelection: boolean;
 	}
 
+	export interface InternalEditorHoverOptions {
+		readonly enabled: boolean;
+		readonly delay: number;
+		readonly sticky: boolean;
+	}
+
+	export interface InternalSuggestOptions {
+		readonly filterGraceful: boolean;
+		readonly snippets: 'top' | 'bottom' | 'inline' | 'none';
+		readonly snippetsPreventQuickSuggestions: boolean;
+	}
+
+	export interface InternalParameterHintOptions {
+		readonly enabled: boolean;
+		readonly cycle: boolean;
+	}
+
 	export interface EditorWrappingInfo {
 		readonly inDiffEditor: boolean;
 		readonly isDominatedByLongLines: boolean;
@@ -3120,6 +3222,7 @@ declare namespace monaco.editor {
 		readonly renderControlCharacters: boolean;
 		readonly fontLigatures: boolean;
 		readonly renderIndentGuides: boolean;
+		readonly highlightActiveIndentGuide: boolean;
 		readonly renderLineHighlight: 'none' | 'gutter' | 'line' | 'all';
 		readonly scrollbar: InternalEditorScrollbarOptions;
 		readonly minimap: InternalEditorMinimapOptions;
@@ -3128,7 +3231,7 @@ declare namespace monaco.editor {
 
 	export interface EditorContribOptions {
 		readonly selectionClipboard: boolean;
-		readonly hover: boolean;
+		readonly hover: InternalEditorHoverOptions;
 		readonly links: boolean;
 		readonly contextmenu: boolean;
 		readonly quickSuggestions: boolean | {
@@ -3137,18 +3240,18 @@ declare namespace monaco.editor {
 			strings: boolean;
 		};
 		readonly quickSuggestionsDelay: number;
-		readonly parameterHints: boolean;
+		readonly parameterHints: InternalParameterHintOptions;
 		readonly iconsInSuggestions: boolean;
 		readonly formatOnType: boolean;
 		readonly formatOnPaste: boolean;
 		readonly suggestOnTriggerCharacters: boolean;
 		readonly acceptSuggestionOnEnter: 'on' | 'smart' | 'off';
 		readonly acceptSuggestionOnCommitCharacter: boolean;
-		readonly snippetSuggestions: 'top' | 'bottom' | 'inline' | 'none';
 		readonly wordBasedSuggestions: boolean;
 		readonly suggestSelection: 'first' | 'recentlyUsed' | 'recentlyUsedByPrefix';
 		readonly suggestFontSize: number;
 		readonly suggestLineHeight: number;
+		readonly suggest: InternalSuggestOptions;
 		readonly selectionHighlight: boolean;
 		readonly occurrencesHighlight: boolean;
 		readonly codeLens: boolean;
@@ -3175,13 +3278,17 @@ declare namespace monaco.editor {
 		readonly readOnly: boolean;
 		readonly multiCursorModifier: 'altKey' | 'ctrlKey' | 'metaKey';
 		readonly multiCursorMergeOverlapping: boolean;
+		readonly showUnused: boolean;
 		readonly wordSeparators: string;
-		readonly autoClosingBrackets: boolean;
+		readonly autoClosingBrackets: EditorAutoClosingStrategy;
+		readonly autoClosingQuotes: EditorAutoClosingStrategy;
+		readonly autoSurround: EditorAutoSurroundStrategy;
 		readonly autoIndent: boolean;
 		readonly useTabStops: boolean;
 		readonly tabFocusMode: boolean;
 		readonly dragAndDrop: boolean;
 		readonly emptySelectionClipboard: boolean;
+		readonly copyWithSyntaxHighlighting: boolean;
 		readonly layoutInfo: EditorLayoutInfo;
 		readonly fontInfo: FontInfo;
 		readonly viewInfo: InternalEditorViewOptions;
@@ -3315,11 +3422,14 @@ declare namespace monaco.editor {
 		readonly multiCursorMergeOverlapping: boolean;
 		readonly wordSeparators: boolean;
 		readonly autoClosingBrackets: boolean;
+		readonly autoClosingQuotes: boolean;
+		readonly autoSurround: boolean;
 		readonly autoIndent: boolean;
 		readonly useTabStops: boolean;
 		readonly tabFocusMode: boolean;
 		readonly dragAndDrop: boolean;
 		readonly emptySelectionClipboard: boolean;
+		readonly copyWithSyntaxHighlighting: boolean;
 		readonly layoutInfo: boolean;
 		readonly fontInfo: boolean;
 		readonly viewInfo: boolean;
@@ -3678,6 +3788,14 @@ declare namespace monaco.editor {
 		 * @event
 		 */
 		onDidBlurEditorWidget(listener: () => void): IDisposable;
+		/**
+		 * An event emitted after composition has started.
+		 */
+		onCompositionStart(listener: () => void): IDisposable;
+		/**
+		 * An event emitted after composition has ended.
+		 */
+		onCompositionEnd(listener: () => void): IDisposable;
 		/**
 		 * An event emitted on a "mouseup".
 		 * @event
@@ -3812,9 +3930,9 @@ declare namespace monaco.editor {
 		 * The edits will land on the undo-redo stack, but no "undo stop" will be pushed.
 		 * @param source The source of the call.
 		 * @param edits The edits to execute.
-		 * @param endCursoState Cursor state after the edits were applied.
+		 * @param endCursorState Cursor state after the edits were applied.
 		 */
-		executeEdits(source: string, edits: IIdentifiedSingleEditOperation[], endCursoState?: Selection[]): boolean;
+		executeEdits(source: string, edits: IIdentifiedSingleEditOperation[], endCursorState?: Selection[]): boolean;
 		/**
 		 * Execute multiple (concommitent) commands on the editor.
 		 * @param source The source of the call.
@@ -3978,6 +4096,7 @@ declare namespace monaco.editor {
 		readonly isMonospace: boolean;
 		readonly typicalHalfwidthCharacterWidth: number;
 		readonly typicalFullwidthCharacterWidth: number;
+		readonly canUseHalfwidthRightwardsArrow: boolean;
 		readonly spaceWidth: number;
 		readonly maxDigitWidth: number;
 	}
@@ -4009,6 +4128,8 @@ declare namespace monaco.languages {
 	 */
 	export function getLanguages(): ILanguageExtensionPoint[];
 
+	export function getEncodedLanguageId(languageId: string): number;
+
 	/**
 	 * An event emitted when a language is first time needed (e.g. a model has it set).
 	 * @event
@@ -4043,6 +4164,38 @@ declare namespace monaco.languages {
 		endState: IState;
 	}
 
+	/**
+	 * The result of a line tokenization.
+	 */
+	export interface IEncodedLineTokens {
+		/**
+		 * The tokens on the line in a binary, encoded format. Each token occupies two array indices. For token i:
+		 *  - at offset 2*i => startIndex
+		 *  - at offset 2*i + 1 => metadata
+		 * Meta data is in binary format:
+		 * - -------------------------------------------
+		 *     3322 2222 2222 1111 1111 1100 0000 0000
+		 *     1098 7654 3210 9876 5432 1098 7654 3210
+		 * - -------------------------------------------
+		 *     bbbb bbbb bfff ffff ffFF FTTT LLLL LLLL
+		 * - -------------------------------------------
+		 *  - L = EncodedLanguageId (8 bits): Use `getEncodedLanguageId` to get the encoded ID of a language.
+		 *  - T = StandardTokenType (3 bits): Other = 0, Comment = 1, String = 2, RegEx = 4.
+		 *  - F = FontStyle (3 bits): None = 0, Italic = 1, Bold = 2, Underline = 4.
+		 *  - f = foreground ColorId (9 bits)
+		 *  - b = background ColorId (9 bits)
+		 *  - The color value for each colorId is defined in IStandaloneThemeData.customTokenColors:
+		 * e.g colorId = 1 is stored in IStandaloneThemeData.customTokenColors[1]. Color id = 0 means no color,
+		 * id = 1 is for the default foreground color, id = 2 for the default background.
+		 */
+		tokens: Uint32Array;
+		/**
+		 * The tokenization end state.
+		 * A pointer will be held to this and the object should not be modified by the tokenizer after the pointer is returned.
+		 */
+		endState: IState;
+	}
+
 	/**
 	 * A "manual" provider of tokens.
 	 */
@@ -4057,10 +4210,24 @@ declare namespace monaco.languages {
 		tokenize(line: string, state: IState): ILineTokens;
 	}
 
+	/**
+	 * A "manual" provider of tokens, returning tokens in a binary form.
+	 */
+	export interface EncodedTokensProvider {
+		/**
+		 * The initial state of a language. Will be the state passed in to tokenize the first line.
+		 */
+		getInitialState(): IState;
+		/**
+		 * Tokenize a line given the state at the beginning of the line.
+		 */
+		tokenizeEncoded(line: string, state: IState): IEncodedLineTokens;
+	}
+
 	/**
 	 * Set the tokens provider for a language (manual implementation).
 	 */
-	export function setTokensProvider(languageId: string, provider: TokensProvider): IDisposable;
+	export function setTokensProvider(languageId: string, provider: TokensProvider | EncodedTokensProvider): IDisposable;
 
 	/**
 	 * Set the tokens provider for a language (monarch implementation).
@@ -4423,6 +4590,12 @@ declare namespace monaco.languages {
 		 * settings will be used.
 		 */
 		surroundingPairs?: IAutoClosingPair[];
+		/**
+		 * Defines what characters must be after the cursor for bracket or quote autoclosing to occur when using the \'languageDefined\' autoclosing setting.
+		 *
+		 * This is typically the set of characters which can not start an expression, such as whitespace, closing brackets, non-unary operators, etc.
+		 */
+		autoCloseBefore?: string;
 		/**
 		 * The language's folding rules.
 		 */
@@ -4596,6 +4769,14 @@ declare namespace monaco.languages {
 		equals(other: IState): boolean;
 	}
 
+	/**
+	 * A provider result represents the values a provider, like the [`HoverProvider`](#HoverProvider),
+	 * may return. For once this is the actual result type `T`, like `Hover`, or a thenable that resolves
+	 * to that type `T`. In addition, `null` and `undefined` can be returned - either directly or from a
+	 * thenable.
+	 */
+	export type ProviderResult<T> = T | undefined | null | Thenable<T | undefined | null>;
+
 	/**
 	 * A hover represents additional information for a symbol or word. Hovers are
 	 * rendered in a tooltip-like widget.
@@ -4623,7 +4804,7 @@ declare namespace monaco.languages {
 		 * position will be merged by the editor. A hover can have a range which defaults
 		 * to the word range at the position when omitted.
 		 */
-		provideHover(model: editor.ITextModel, position: Position, token: CancellationToken): Hover | Thenable<Hover>;
+		provideHover(model: editor.ITextModel, position: Position, token: CancellationToken): ProviderResult<Hover>;
 	}
 
 	/**
@@ -4702,6 +4883,17 @@ declare namespace monaco.languages {
 		activeParameter: number;
 	}
 
+	export enum SignatureHelpTriggerReason {
+		Invoke = 1,
+		TriggerCharacter = 2,
+		Retrigger = 3
+	}
+
+	export interface SignatureHelpContext {
+		triggerReason: SignatureHelpTriggerReason;
+		triggerCharacter?: string;
+	}
+
 	/**
 	 * The signature help provider interface defines the contract between extensions and
 	 * the [parameter hints](https://code.visualstudio.com/docs/editor/intellisense)-feature.
@@ -4711,7 +4903,7 @@ declare namespace monaco.languages {
 		/**
 		 * Provide help for the signature at the given position and document.
 		 */
-		provideSignatureHelp(model: editor.ITextModel, position: Position, token: CancellationToken): SignatureHelp | Thenable<SignatureHelp>;
+		provideSignatureHelp(model: editor.ITextModel, position: Position, token: CancellationToken, context: SignatureHelpContext): ProviderResult<SignatureHelp>;
 	}
 
 	/**
@@ -4757,7 +4949,7 @@ declare namespace monaco.languages {
 		 * Provide a set of document highlights, like all occurrences of a variable or
 		 * all exit-points of a function.
 		 */
-		provideDocumentHighlights(model: editor.ITextModel, position: Position, token: CancellationToken): DocumentHighlight[] | Thenable<DocumentHighlight[]>;
+		provideDocumentHighlights(model: editor.ITextModel, position: Position, token: CancellationToken): ProviderResult<DocumentHighlight[]>;
 	}
 
 	/**
@@ -4779,7 +4971,7 @@ declare namespace monaco.languages {
 		/**
 		 * Provide a set of project-wide references for the given position and document.
 		 */
-		provideReferences(model: editor.ITextModel, position: Position, context: ReferenceContext, token: CancellationToken): Location[] | Thenable<Location[]>;
+		provideReferences(model: editor.ITextModel, position: Position, context: ReferenceContext, token: CancellationToken): ProviderResult<Location[]>;
 	}
 
 	/**
@@ -4804,6 +4996,13 @@ declare namespace monaco.languages {
 	 */
 	export type Definition = Location | Location[];
 
+	export interface DefinitionLink {
+		origin?: IRange;
+		uri: Uri;
+		range: IRange;
+		selectionRange?: IRange;
+	}
+
 	/**
 	 * The definition provider interface defines the contract between extensions and
 	 * the [go to definition](https://code.visualstudio.com/docs/editor/editingevolved#_go-to-definition)
@@ -4813,7 +5012,7 @@ declare namespace monaco.languages {
 		/**
 		 * Provide the definition of the symbol at the given position and document.
 		 */
-		provideDefinition(model: editor.ITextModel, position: Position, token: CancellationToken): Definition | Thenable<Definition>;
+		provideDefinition(model: editor.ITextModel, position: Position, token: CancellationToken): ProviderResult<Definition | DefinitionLink[]>;
 	}
 
 	/**
@@ -4824,7 +5023,7 @@ declare namespace monaco.languages {
 		/**
 		 * Provide the implementation of the symbol at the given position and document.
 		 */
-		provideImplementation(model: editor.ITextModel, position: Position, token: CancellationToken): Definition | Thenable<Definition>;
+		provideImplementation(model: editor.ITextModel, position: Position, token: CancellationToken): ProviderResult<Definition | DefinitionLink[]>;
 	}
 
 	/**
@@ -4835,7 +5034,7 @@ declare namespace monaco.languages {
 		/**
 		 * Provide the type definition of the symbol at the given position and document.
 		 */
-		provideTypeDefinition(model: editor.ITextModel, position: Position, token: CancellationToken): Definition | Thenable<Definition>;
+		provideTypeDefinition(model: editor.ITextModel, position: Position, token: CancellationToken): ProviderResult<Definition | DefinitionLink[]>;
 	}
 
 	/**
@@ -4870,36 +5069,14 @@ declare namespace monaco.languages {
 		TypeParameter = 25
 	}
 
-	/**
-	 * Represents information about programming constructs like variables, classes,
-	 * interfaces etc.
-	 */
-	export interface SymbolInformation {
-		/**
-		 * The name of this symbol.
-		 */
+	export interface DocumentSymbol {
 		name: string;
-		/**
-		 * The detail of this symbol.
-		 */
-		detail?: string;
-		/**
-		 * The name of the symbol containing this symbol.
-		 */
-		containerName?: string;
-		/**
-		 * The kind of this symbol.
-		 */
+		detail: string;
 		kind: SymbolKind;
-		/**
-		 * The location of this symbol.
-		 */
-		location: Location;
-		/**
-		 * The defining range of this symbol.
-		 */
-		definingRange: IRange;
-		children?: SymbolInformation[];
+		containerName?: string;
+		range: IRange;
+		selectionRange: IRange;
+		children?: DocumentSymbol[];
 	}
 
 	/**
@@ -4907,11 +5084,11 @@ declare namespace monaco.languages {
 	 * the [go to symbol](https://code.visualstudio.com/docs/editor/editingevolved#_goto-symbol)-feature.
 	 */
 	export interface DocumentSymbolProvider {
-		extensionId?: string;
+		displayName?: string;
 		/**
 		 * Provide symbol information for the given document.
 		 */
-		provideDocumentSymbols(model: editor.ITextModel, token: CancellationToken): SymbolInformation[] | Thenable<SymbolInformation[]>;
+		provideDocumentSymbols(model: editor.ITextModel, token: CancellationToken): ProviderResult<DocumentSymbol[]>;
 	}
 
 	export interface TextEdit {
@@ -4942,7 +5119,7 @@ declare namespace monaco.languages {
 		/**
 		 * Provide formatting edits for a whole document.
 		 */
-		provideDocumentFormattingEdits(model: editor.ITextModel, options: FormattingOptions, token: CancellationToken): TextEdit[] | Thenable<TextEdit[]>;
+		provideDocumentFormattingEdits(model: editor.ITextModel, options: FormattingOptions, token: CancellationToken): ProviderResult<TextEdit[]>;
 	}
 
 	/**
@@ -4957,7 +5134,7 @@ declare namespace monaco.languages {
 		 * or larger range. Often this is done by adjusting the start and end
 		 * of the range to full syntax nodes.
 		 */
-		provideDocumentRangeFormattingEdits(model: editor.ITextModel, range: Range, options: FormattingOptions, token: CancellationToken): TextEdit[] | Thenable<TextEdit[]>;
+		provideDocumentRangeFormattingEdits(model: editor.ITextModel, range: Range, options: FormattingOptions, token: CancellationToken): ProviderResult<TextEdit[]>;
 	}
 
 	/**
@@ -4973,7 +5150,7 @@ declare namespace monaco.languages {
 		 * what range the position to expand to, like find the matching `{`
 		 * when `}` has been entered.
 		 */
-		provideOnTypeFormattingEdits(model: editor.ITextModel, position: Position, ch: string, options: FormattingOptions, token: CancellationToken): TextEdit[] | Thenable<TextEdit[]>;
+		provideOnTypeFormattingEdits(model: editor.ITextModel, position: Position, ch: string, options: FormattingOptions, token: CancellationToken): ProviderResult<TextEdit[]>;
 	}
 
 	/**
@@ -4988,8 +5165,8 @@ declare namespace monaco.languages {
 	 * A provider of links.
 	 */
 	export interface LinkProvider {
-		provideLinks(model: editor.ITextModel, token: CancellationToken): ILink[] | Thenable<ILink[]>;
-		resolveLink?: (link: ILink, token: CancellationToken) => ILink | Thenable<ILink>;
+		provideLinks(model: editor.ITextModel, token: CancellationToken): ProviderResult<ILink[]>;
+		resolveLink?: (link: ILink, token: CancellationToken) => ProviderResult<ILink>;
 	}
 
 	/**
@@ -5057,11 +5234,11 @@ declare namespace monaco.languages {
 		/**
 		 * Provides the color ranges for a specific model.
 		 */
-		provideDocumentColors(model: editor.ITextModel, token: CancellationToken): IColorInformation[] | Thenable<IColorInformation[]>;
+		provideDocumentColors(model: editor.ITextModel, token: CancellationToken): ProviderResult<IColorInformation[]>;
 		/**
 		 * Provide the string representations for a color.
 		 */
-		provideColorPresentations(model: editor.ITextModel, colorInfo: IColorInformation, token: CancellationToken): IColorPresentation[] | Thenable<IColorPresentation[]>;
+		provideColorPresentations(model: editor.ITextModel, colorInfo: IColorInformation, token: CancellationToken): ProviderResult<IColorPresentation[]>;
 	}
 
 	export interface FoldingContext {
@@ -5074,16 +5251,16 @@ declare namespace monaco.languages {
 		/**
 		 * Provides the color ranges for a specific model.
 		 */
-		provideFoldingRanges(model: editor.ITextModel, context: FoldingContext, token: CancellationToken): FoldingRange[] | Thenable<FoldingRange[]>;
+		provideFoldingRanges(model: editor.ITextModel, context: FoldingContext, token: CancellationToken): ProviderResult<FoldingRange[]>;
 	}
 
 	export interface FoldingRange {
 		/**
-		 * The zero-based start line of the range to fold. The folded area starts after the line's last character.
+		 * The one-based start line of the range to fold. The folded area starts after the line's last character.
 		 */
 		start: number;
 		/**
-		 * The zero-based end line of the range to fold. The folded area ends with the line's last character.
+		 * The one-based end line of the range to fold. The folded area ends with the line's last character.
 		 */
 		end: number;
 		/**
@@ -5121,6 +5298,12 @@ declare namespace monaco.languages {
 	export interface ResourceFileEdit {
 		oldUri: Uri;
 		newUri: Uri;
+		options: {
+			overwrite?: boolean;
+			ignoreIfNotExists?: boolean;
+			ignoreIfExists?: boolean;
+			recursive?: boolean;
+		};
 	}
 
 	export interface ResourceTextEdit {
@@ -5131,6 +5314,9 @@ declare namespace monaco.languages {
 
 	export interface WorkspaceEdit {
 		edits: Array<ResourceTextEdit | ResourceFileEdit>;
+	}
+
+	export interface Rejection {
 		rejectReason?: string;
 	}
 
@@ -5140,8 +5326,8 @@ declare namespace monaco.languages {
 	}
 
 	export interface RenameProvider {
-		provideRenameEdits(model: editor.ITextModel, position: Position, newName: string, token: CancellationToken): WorkspaceEdit | Thenable<WorkspaceEdit>;
-		resolveRenameLocation?(model: editor.ITextModel, position: Position, token: CancellationToken): RenameLocation | Thenable<RenameLocation>;
+		provideRenameEdits(model: editor.ITextModel, position: Position, newName: string, token: CancellationToken): ProviderResult<WorkspaceEdit & Rejection>;
+		resolveRenameLocation?(model: editor.ITextModel, position: Position, token: CancellationToken): ProviderResult<RenameLocation & Rejection>;
 	}
 
 	export interface Command {
@@ -5151,76 +5337,6 @@ declare namespace monaco.languages {
 		arguments?: any[];
 	}
 
-	export interface CommentInfo {
-		owner: number;
-		threads: CommentThread[];
-		commentingRanges?: IRange[];
-		reply?: Command;
-	}
-
-	export enum CommentThreadCollapsibleState {
-		/**
-		 * Determines an item is collapsed
-		 */
-		Collapsed = 0,
-		/**
-		 * Determines an item is expanded
-		 */
-		Expanded = 1
-	}
-
-	export interface CommentThread {
-		threadId: string;
-		resource: string;
-		range: IRange;
-		comments: Comment[];
-		collapsibleState?: CommentThreadCollapsibleState;
-		reply?: Command;
-	}
-
-	export interface NewCommentAction {
-		ranges: IRange[];
-		actions: Command[];
-	}
-
-	export interface Comment {
-		readonly commentId: string;
-		readonly body: IMarkdownString;
-		readonly userName: string;
-		readonly gravatar: string;
-		readonly command?: Command;
-	}
-
-	export interface CommentThreadChangedEvent {
-		readonly owner: number;
-		/**
-		 * Added comment threads.
-		 */
-		readonly added: CommentThread[];
-		/**
-		 * Removed comment threads.
-		 */
-		readonly removed: CommentThread[];
-		/**
-		 * Changed comment threads.
-		 */
-		readonly changed: CommentThread[];
-	}
-
-	export interface DocumentCommentProvider {
-		provideDocumentComments(resource: Uri, token: CancellationToken): Promise<CommentInfo>;
-		createNewCommentThread(resource: Uri, range: Range, text: string, token: CancellationToken): Promise<CommentThread>;
-		replyToCommentThread(resource: Uri, range: Range, thread: CommentThread, text: string, token: CancellationToken): Promise<CommentThread>;
-		onDidChangeCommentThreads(): IEvent<CommentThreadChangedEvent>;
-	}
-
-	export interface WorkspaceCommentProvider {
-		provideWorkspaceComments(token: CancellationToken): Promise<CommentThread[]>;
-		createNewCommentThread(resource: Uri, range: Range, text: string, token: CancellationToken): Promise<CommentThread>;
-		replyToCommentThread(resource: Uri, range: Range, thread: CommentThread, text: string, token: CancellationToken): Promise<CommentThread>;
-		onDidChangeCommentThreads(): IEvent<CommentThreadChangedEvent>;
-	}
-
 	export interface ICodeLensSymbol {
 		range: IRange;
 		id?: string;
@@ -5229,8 +5345,8 @@ declare namespace monaco.languages {
 
 	export interface CodeLensProvider {
 		onDidChange?: IEvent<this>;
-		provideCodeLenses(model: editor.ITextModel, token: CancellationToken): ICodeLensSymbol[] | Thenable<ICodeLensSymbol[]>;
-		resolveCodeLens?(model: editor.ITextModel, codeLens: ICodeLensSymbol, token: CancellationToken): ICodeLensSymbol | Thenable<ICodeLensSymbol>;
+		provideCodeLenses(model: editor.ITextModel, token: CancellationToken): ProviderResult<ICodeLensSymbol[]>;
+		resolveCodeLens?(model: editor.ITextModel, codeLens: ICodeLensSymbol, token: CancellationToken): ProviderResult<ICodeLensSymbol>;
 	}
 
 	export interface ILanguageExtensionPoint {
@@ -5241,7 +5357,7 @@ declare namespace monaco.languages {
 		firstLine?: string;
 		aliases?: string[];
 		mimetypes?: string[];
-		configuration?: string;
+		configuration?: Uri;
 	}
 	/**
 	 * A Monarch language definition
@@ -5272,7 +5388,7 @@ declare namespace monaco.languages {
 		/**
 		 * attach this to every token class (by default '.' + name)
 		 */
-		tokenPostfix: string;
+		tokenPostfix?: string;
 	}
 
 	/**
@@ -5280,7 +5396,11 @@ declare namespace monaco.languages {
 	 * 		shorthands: [reg,act] == { regex: reg, action: act}
 	 *		and       : [reg,act,nxt] == { regex: reg, action: act{ next: nxt }}
 	 */
-	export interface IMonarchLanguageRule {
+	export type IShortMonarchLanguageRule1 = [RegExp, IMonarchLanguageAction];
+
+	export type IShortMonarchLanguageRule2 = [RegExp, IMonarchLanguageAction, string];
+
+	export interface IExpandedMonarchLanguageRule {
 		/**
 		 * match tokens
 		 */
@@ -5295,12 +5415,16 @@ declare namespace monaco.languages {
 		include?: string;
 	}
 
+	export type IMonarchLanguageRule = IShortMonarchLanguageRule1 | IShortMonarchLanguageRule2 | IExpandedMonarchLanguageRule;
+
 	/**
 	 * An action is either an array of actions...
 	 * ... or a case statement with guards...
 	 * ... or a basic action with a token value.
 	 */
-	export interface IMonarchLanguageAction {
+	export type IShortMonarchLanguageAction = string;
+
+	export interface IExpandedMonarchLanguageAction {
 		/**
 		 * array of actions for each parenthesized match group
 		 */
@@ -5339,6 +5463,8 @@ declare namespace monaco.languages {
 		log?: string;
 	}
 
+	export type IMonarchLanguageAction = IShortMonarchLanguageAction | IExpandedMonarchLanguageAction | IShortMonarchLanguageAction[] | IExpandedMonarchLanguageAction[];
+
 	/**
 	 * This interface can be shortened as an array, ie. ['{','}','delimiter.curly']
 	 */
diff --git a/src/vs/nls.build.js b/src/vs/nls.build.js
index ece108ed635..37077e8c32f 100644
--- a/src/vs/nls.build.js
+++ b/src/vs/nls.build.js
@@ -17,166 +17,166 @@
 var _nlsPluginGlobal = this;
 var NLSBuildLoaderPlugin;
 (function (NLSBuildLoaderPlugin) {
-	var global = _nlsPluginGlobal || {};
-	var Resources = global.Plugin && global.Plugin.Resources ? global.Plugin.Resources : undefined;
-	var IS_PSEUDO = (global && global.document && global.document.location && global.document.location.hash.indexOf('pseudo=true') >= 0);
-	function _format(message, args) {
-		var result;
-		if (args.length === 0) {
-			result = message;
-		}
-		else {
-			result = message.replace(/\{(\d+)\}/g, function (match, rest) {
-				var index = rest[0];
-				return typeof args[index] !== 'undefined' ? args[index] : match;
-			});
-		}
-		if (IS_PSEUDO) {
-			// FF3B and FF3D is the Unicode zenkaku representation for [ and ]
-			result = '\uFF3B' + result.replace(/[aouei]/g, '$&$&') + '\uFF3D';
-		}
-		return result;
-	}
-	function findLanguageForModule(config, name) {
-		var result = config[name];
-		if (result)
-			return result;
-		result = config['*'];
-		if (result)
-			return result;
-		return null;
-	}
-	function localize(data, message) {
-		var args = [];
-		for (var _i = 0; _i < (arguments.length - 2); _i++) {
-			args[_i] = arguments[_i + 2];
-		}
-		return _format(message, args);
-	}
-	function createScopedLocalize(scope) {
-		return function (idx, defaultValue) {
-			var restArgs = Array.prototype.slice.call(arguments, 2);
-			return _format(scope[idx], restArgs);
-		};
-	}
-	var NLSPlugin = (function () {
-		function NLSPlugin() {
-			this.localize = localize;
-		}
-		NLSPlugin.prototype.setPseudoTranslation = function (value) {
-			IS_PSEUDO = value;
-		};
-		NLSPlugin.prototype.create = function (key, data) {
-			return {
-				localize: createScopedLocalize(data[key])
-			};
-		};
-		NLSPlugin.prototype.load = function (name, req, load, config) {
-			config = config || {};
-			if (!name || name.length === 0) {
-				load({
-					localize: localize
-				});
-			}
-			else {
-				var suffix = void 0;
-				if (Resources && Resources.getString) {
-					suffix = '.nls.keys';
-					req([name + suffix], function (keyMap) {
-						load({
-							localize: function (moduleKey, index) {
-								if (!keyMap[moduleKey])
-									return 'NLS error: unknown key ' + moduleKey;
-								var mk = keyMap[moduleKey].keys;
-								if (index >= mk.length)
-									return 'NLS error unknow index ' + index;
-								var subKey = mk[index];
-								var args = [];
-								args[0] = moduleKey + '_' + subKey;
-								for (var _i = 0; _i < (arguments.length - 2); _i++) {
-									args[_i + 1] = arguments[_i + 2];
-								}
-								return Resources.getString.apply(Resources, args);
-							}
-						});
-					});
-				}
-				else {
-					if (config.isBuild) {
-						req([name + '.nls', name + '.nls.keys'], function (messages, keys) {
-							NLSPlugin.BUILD_MAP[name] = messages;
-							NLSPlugin.BUILD_MAP_KEYS[name] = keys;
-							load(messages);
-						});
-					}
-					else {
-						var pluginConfig = config['vs/nls'] || {};
-						var language = pluginConfig.availableLanguages ? findLanguageForModule(pluginConfig.availableLanguages, name) : null;
-						suffix = '.nls';
-						if (language !== null && language !== NLSPlugin.DEFAULT_TAG) {
-							suffix = suffix + '.' + language;
-						}
-						req([name + suffix], function (messages) {
-							if (Array.isArray(messages)) {
-								messages.localize = createScopedLocalize(messages);
-							}
-							else {
-								messages.localize = createScopedLocalize(messages[name]);
-							}
-							load(messages);
-						});
-					}
-				}
-			}
-		};
-		NLSPlugin.prototype._getEntryPointsMap = function () {
-			global.nlsPluginEntryPoints = global.nlsPluginEntryPoints || {};
-			return global.nlsPluginEntryPoints;
-		};
-		NLSPlugin.prototype.write = function (pluginName, moduleName, write) {
-			// getEntryPoint is a Monaco extension to r.js
-			var entryPoint = write.getEntryPoint();
-			// r.js destroys the context of this plugin between calling 'write' and 'writeFile'
-			// so the only option at this point is to leak the data to a global
-			var entryPointsMap = this._getEntryPointsMap();
-			entryPointsMap[entryPoint] = entryPointsMap[entryPoint] || [];
-			entryPointsMap[entryPoint].push(moduleName);
-			if (moduleName !== entryPoint) {
-				write.asModule(pluginName + '!' + moduleName, 'define([\'vs/nls\', \'vs/nls!' + entryPoint + '\'], function(nls, data) { return nls.create("' + moduleName + '", data); });');
-			}
-		};
-		NLSPlugin.prototype.writeFile = function (pluginName, moduleName, req, write, config) {
-			var entryPointsMap = this._getEntryPointsMap();
-			if (entryPointsMap.hasOwnProperty(moduleName)) {
-				var fileName = req.toUrl(moduleName + '.nls.js');
-				var contents = [
-					'/*---------------------------------------------------------',
-					' * Copyright (c) Microsoft Corporation. All rights reserved.',
-					' *--------------------------------------------------------*/'
-				], entries = entryPointsMap[moduleName];
-				var data = {};
-				for (var i = 0; i < entries.length; i++) {
-					data[entries[i]] = NLSPlugin.BUILD_MAP[entries[i]];
-				}
-				contents.push('define("' + moduleName + '.nls", ' + JSON.stringify(data, null, '\t') + ');');
-				write(fileName, contents.join('\r\n'));
-			}
-		};
-		NLSPlugin.prototype.finishBuild = function (write) {
-			write('nls.metadata.json', JSON.stringify({
-				keys: NLSPlugin.BUILD_MAP_KEYS,
-				messages: NLSPlugin.BUILD_MAP,
-				bundles: this._getEntryPointsMap()
-			}, null, '\t'));
-		};
-		;
-		return NLSPlugin;
-	}());
-	NLSPlugin.DEFAULT_TAG = 'i-default';
-	NLSPlugin.BUILD_MAP = {};
-	NLSPlugin.BUILD_MAP_KEYS = {};
-	NLSBuildLoaderPlugin.NLSPlugin = NLSPlugin;
-	(function () {
-		define('vs/nls', new NLSPlugin());
-	})();
+    var global = _nlsPluginGlobal || {};
+    var Resources = global.Plugin && global.Plugin.Resources ? global.Plugin.Resources : undefined;
+    var IS_PSEUDO = (global && global.document && global.document.location && global.document.location.hash.indexOf('pseudo=true') >= 0);
+    function _format(message, args) {
+        var result;
+        if (args.length === 0) {
+            result = message;
+        }
+        else {
+            result = message.replace(/\{(\d+)\}/g, function (match, rest) {
+                var index = rest[0];
+                return typeof args[index] !== 'undefined' ? args[index] : match;
+            });
+        }
+        if (IS_PSEUDO) {
+            // FF3B and FF3D is the Unicode zenkaku representation for [ and ]
+            result = '\uFF3B' + result.replace(/[aouei]/g, '$&$&') + '\uFF3D';
+        }
+        return result;
+    }
+    function findLanguageForModule(config, name) {
+        var result = config[name];
+        if (result)
+            return result;
+        result = config['*'];
+        if (result)
+            return result;
+        return null;
+    }
+    function localize(data, message) {
+        var args = [];
+        for (var _i = 0; _i < (arguments.length - 2); _i++) {
+            args[_i] = arguments[_i + 2];
+        }
+        return _format(message, args);
+    }
+    function createScopedLocalize(scope) {
+        return function (idx, defaultValue) {
+            var restArgs = Array.prototype.slice.call(arguments, 2);
+            return _format(scope[idx], restArgs);
+        };
+    }
+    var NLSPlugin = /** @class */ (function () {
+        function NLSPlugin() {
+            this.localize = localize;
+        }
+        NLSPlugin.prototype.setPseudoTranslation = function (value) {
+            IS_PSEUDO = value;
+        };
+        NLSPlugin.prototype.create = function (key, data) {
+            return {
+                localize: createScopedLocalize(data[key])
+            };
+        };
+        NLSPlugin.prototype.load = function (name, req, load, config) {
+            config = config || {};
+            if (!name || name.length === 0) {
+                load({
+                    localize: localize
+                });
+            }
+            else {
+                var suffix = void 0;
+                if (Resources && Resources.getString) {
+                    suffix = '.nls.keys';
+                    req([name + suffix], function (keyMap) {
+                        load({
+                            localize: function (moduleKey, index) {
+                                if (!keyMap[moduleKey])
+                                    return 'NLS error: unknown key ' + moduleKey;
+                                var mk = keyMap[moduleKey].keys;
+                                if (index >= mk.length)
+                                    return 'NLS error unknow index ' + index;
+                                var subKey = mk[index];
+                                var args = [];
+                                args[0] = moduleKey + '_' + subKey;
+                                for (var _i = 0; _i < (arguments.length - 2); _i++) {
+                                    args[_i + 1] = arguments[_i + 2];
+                                }
+                                return Resources.getString.apply(Resources, args);
+                            }
+                        });
+                    });
+                }
+                else {
+                    if (config.isBuild) {
+                        req([name + '.nls', name + '.nls.keys'], function (messages, keys) {
+                            NLSPlugin.BUILD_MAP[name] = messages;
+                            NLSPlugin.BUILD_MAP_KEYS[name] = keys;
+                            load(messages);
+                        });
+                    }
+                    else {
+                        var pluginConfig = config['vs/nls'] || {};
+                        var language = pluginConfig.availableLanguages ? findLanguageForModule(pluginConfig.availableLanguages, name) : null;
+                        suffix = '.nls';
+                        if (language !== null && language !== NLSPlugin.DEFAULT_TAG) {
+                            suffix = suffix + '.' + language;
+                        }
+                        req([name + suffix], function (messages) {
+                            if (Array.isArray(messages)) {
+                                messages.localize = createScopedLocalize(messages);
+                            }
+                            else {
+                                messages.localize = createScopedLocalize(messages[name]);
+                            }
+                            load(messages);
+                        });
+                    }
+                }
+            }
+        };
+        NLSPlugin.prototype._getEntryPointsMap = function () {
+            global.nlsPluginEntryPoints = global.nlsPluginEntryPoints || {};
+            return global.nlsPluginEntryPoints;
+        };
+        NLSPlugin.prototype.write = function (pluginName, moduleName, write) {
+            // getEntryPoint is a Monaco extension to r.js
+            var entryPoint = write.getEntryPoint();
+            // r.js destroys the context of this plugin between calling 'write' and 'writeFile'
+            // so the only option at this point is to leak the data to a global
+            var entryPointsMap = this._getEntryPointsMap();
+            entryPointsMap[entryPoint] = entryPointsMap[entryPoint] || [];
+            entryPointsMap[entryPoint].push(moduleName);
+            if (moduleName !== entryPoint) {
+                write.asModule(pluginName + '!' + moduleName, 'define([\'vs/nls\', \'vs/nls!' + entryPoint + '\'], function(nls, data) { return nls.create("' + moduleName + '", data); });');
+            }
+        };
+        NLSPlugin.prototype.writeFile = function (pluginName, moduleName, req, write, config) {
+            var entryPointsMap = this._getEntryPointsMap();
+            if (entryPointsMap.hasOwnProperty(moduleName)) {
+                var fileName = req.toUrl(moduleName + '.nls.js');
+                var contents = [
+                    '/*---------------------------------------------------------',
+                    ' * Copyright (c) Microsoft Corporation. All rights reserved.',
+                    ' *--------------------------------------------------------*/'
+                ], entries = entryPointsMap[moduleName];
+                var data = {};
+                for (var i = 0; i < entries.length; i++) {
+                    data[entries[i]] = NLSPlugin.BUILD_MAP[entries[i]];
+                }
+                contents.push('define("' + moduleName + '.nls", ' + JSON.stringify(data, null, '\t') + ');');
+                write(fileName, contents.join('\r\n'));
+            }
+        };
+        NLSPlugin.prototype.finishBuild = function (write) {
+            write('nls.metadata.json', JSON.stringify({
+                keys: NLSPlugin.BUILD_MAP_KEYS,
+                messages: NLSPlugin.BUILD_MAP,
+                bundles: this._getEntryPointsMap()
+            }, null, '\t'));
+        };
+        ;
+        NLSPlugin.DEFAULT_TAG = 'i-default';
+        NLSPlugin.BUILD_MAP = {};
+        NLSPlugin.BUILD_MAP_KEYS = {};
+        return NLSPlugin;
+    }());
+    NLSBuildLoaderPlugin.NLSPlugin = NLSPlugin;
+    (function () {
+        define('vs/nls', new NLSPlugin());
+    })();
 })(NLSBuildLoaderPlugin || (NLSBuildLoaderPlugin = {}));
diff --git a/src/vs/nls.d.ts b/src/vs/nls.d.ts
index eae07d0b215..38bbd076068 100644
--- a/src/vs/nls.d.ts
+++ b/src/vs/nls.d.ts
@@ -8,5 +8,5 @@ export interface ILocalizeInfo {
 	comment: string[];
 }
 
-export declare function localize(info: ILocalizeInfo, message: string, ...args: any[]): string;
-export declare function localize(key: string, message: string, ...args: any[]): string;
+export declare function localize(info: ILocalizeInfo, message: string, ...args: (string | number | boolean | undefined | null)[]): string;
+export declare function localize(key: string, message: string, ...args: (string | number | boolean | undefined | null)[]): string;
diff --git a/src/vs/nls.js b/src/vs/nls.js
index 79b64a22484..8e178e8d0ea 100644
--- a/src/vs/nls.js
+++ b/src/vs/nls.js
@@ -46,7 +46,15 @@ var NLSLoaderPlugin;
         else {
             result = message.replace(/\{(\d+)\}/g, function (match, rest) {
                 var index = rest[0];
-                return typeof args[index] !== 'undefined' ? args[index] : match;
+                var arg = args[index];
+                var result = match;
+                if (typeof arg === 'string') {
+                    result = arg;
+                }
+                else if (typeof arg === 'number' || typeof arg === 'boolean' || arg === void 0 || arg === null) {
+                    result = String(arg);
+                }
+                return result;
             });
         }
         if (env.isPseudo) {
diff --git a/src/vs/platform/actions/browser/menuItemActionItem.ts b/src/vs/platform/actions/browser/menuItemActionItem.ts
index c79984b7d63..a4ef78d6f05 100644
--- a/src/vs/platform/actions/browser/menuItemActionItem.ts
+++ b/src/vs/platform/actions/browser/menuItemActionItem.ts
@@ -5,20 +5,19 @@
 
 'use strict';
 
-import { localize } from 'vs/nls';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { IMenu, MenuItemAction, IMenuActionOptions, ICommandAction } from 'vs/platform/actions/common/actions';
-import { IAction } from 'vs/base/common/actions';
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
-import { ActionItem, Separator } from 'vs/base/browser/ui/actionbar/actionbar';
+import { addClasses, createCSSRule, removeClasses } from 'vs/base/browser/dom';
 import { domEvent } from 'vs/base/browser/event';
+import { ActionItem, Separator } from 'vs/base/browser/ui/actionbar/actionbar';
+import { IAction } from 'vs/base/common/actions';
 import { Emitter } from 'vs/base/common/event';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
 import { IdGenerator } from 'vs/base/common/idGenerator';
-import { createCSSRule } from 'vs/base/browser/dom';
-import URI from 'vs/base/common/uri';
+import { dispose, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
+import { isLinux, isWindows } from 'vs/base/common/platform';
+import { localize } from 'vs/nls';
+import { ICommandAction, IMenu, IMenuActionOptions, MenuItemAction, SubmenuItemAction } from 'vs/platform/actions/common/actions';
+import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
+import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { INotificationService } from 'vs/platform/notification/common/notification';
-import { isWindows, isLinux } from 'vs/base/common/platform';
 
 // The alternative key on all platforms is alt. On windows we also support shift as an alternative key #44136
 class AlternativeKeyEmitter extends Emitter<boolean> {
@@ -92,40 +91,17 @@ export function fillInActionBarActions(menu: IMenu, options: IMenuActionOptions,
 	fillInActions(groups, target, false, isPrimaryGroup);
 }
 
-function fillInActions(groups: [string, MenuItemAction[]][], target: IAction[] | { primary: IAction[]; secondary: IAction[]; }, getAlternativeActions, isPrimaryGroup: (group: string) => boolean = group => group === 'navigation'): void {
+function fillInActions(groups: [string, (MenuItemAction | SubmenuItemAction)[]][], target: IAction[] | { primary: IAction[]; secondary: IAction[]; }, getAlternativeActions, isPrimaryGroup: (group: string) => boolean = group => group === 'navigation'): void {
 	for (let tuple of groups) {
 		let [group, actions] = tuple;
 		if (getAlternativeActions) {
-			actions = actions.map(a => !!a.alt ? a.alt : a);
+			actions = actions.map(a => (a instanceof MenuItemAction) && !!a.alt ? a.alt : a);
 		}
 
 		if (isPrimaryGroup(group)) {
+			const to = Array.isArray<IAction>(target) ? target : target.primary;
 
-			const head = Array.isArray<IAction>(target) ? target : target.primary;
-
-			// split contributed actions at the point where order
-			// changes form lt zero to gte
-			let pivot = 0;
-			for (; pivot < actions.length; pivot++) {
-				if ((<MenuItemAction>actions[pivot]).order >= 0) {
-					break;
-				}
-			}
-			// prepend contributed actions with order lte zero
-			head.unshift(...actions.slice(0, pivot));
-
-			// find the first separator which marks the end of the
-			// navigation group - might be the whole array length
-			let sep = 0;
-			while (sep < head.length) {
-				if (head[sep] instanceof Separator) {
-					break;
-				}
-				sep++;
-			}
-			// append contributed actions with order gt zero
-			head.splice(sep, 0, ...actions.slice(pivot));
-
+			to.unshift(...actions);
 		} else {
 			const to = Array.isArray<IAction>(target) ? target : target.secondary;
 
@@ -161,7 +137,7 @@ export class MenuItemActionItem extends ActionItem {
 		@INotificationService protected _notificationService: INotificationService,
 		@IContextMenuService private readonly _contextMenuService: IContextMenuService
 	) {
-		super(undefined, _action, { icon: !!(_action.class || _action.item.iconPath), label: !_action.class && !_action.item.iconPath });
+		super(undefined, _action, { icon: !!(_action.class || _action.item.iconLocation), label: !_action.class && !_action.item.iconLocation });
 	}
 
 	protected get _commandAction(): IAction {
@@ -178,40 +154,52 @@ export class MenuItemActionItem extends ActionItem {
 		}
 
 		this.actionRunner.run(this._commandAction)
-			.done(undefined, err => this._notificationService.error(err));
+			.then(undefined, err => this._notificationService.error(err));
 	}
 
 	render(container: HTMLElement): void {
 		super.render(container);
 
 		this._updateItemClass(this._action.item);
+
+		let mouseOver = false;
 		const alternativeKeyEmitter = AlternativeKeyEmitter.getInstance(this._contextMenuService);
 		let alternativeKeyDown = alternativeKeyEmitter.isPressed;
 
 		const updateAltState = () => {
-			if (alternativeKeyDown !== this._wantsAltCommand) {
-				this._wantsAltCommand = alternativeKeyDown;
-				this._updateLabel();
-				this._updateTooltip();
-				this._updateClass();
+			const wantsAltCommand = mouseOver && alternativeKeyDown;
+			if (wantsAltCommand !== this._wantsAltCommand) {
+				this._wantsAltCommand = wantsAltCommand;
+				this.updateLabel();
+				this.updateTooltip();
+				this.updateClass();
 			}
 		};
-		updateAltState();
 
-		this._callOnDispose.push(alternativeKeyEmitter.event(value => {
+		this._register(alternativeKeyEmitter.event(value => {
 			alternativeKeyDown = value;
 			updateAltState();
 		}));
+
+		this._register(domEvent(container, 'mouseleave')(_ => {
+			mouseOver = false;
+			updateAltState();
+		}));
+
+		this._register(domEvent(container, 'mouseenter')(e => {
+			mouseOver = true;
+			updateAltState();
+		}));
 	}
 
-	_updateLabel(): void {
+	updateLabel(): void {
 		if (this.options.label) {
-			this.$e.text(this._commandAction.label);
+			this.label.textContent = this._commandAction.label;
 		}
 	}
 
-	_updateTooltip(): void {
-		const element = this.$e.getHTMLElement();
+	updateTooltip(): void {
+		const element = this.label;
 		const keybinding = this._keybindingService.lookupKeybinding(this._commandAction.id);
 		const keybindingLabel = keybinding && keybinding.getLabel();
 
@@ -220,7 +208,7 @@ export class MenuItemActionItem extends ActionItem {
 			: this._commandAction.label;
 	}
 
-	_updateClass(): void {
+	updateClass(): void {
 		if (this.options.icon) {
 			if (this._commandAction !== this._action) {
 				this._updateItemClass(this._action.alt.item);
@@ -234,20 +222,22 @@ export class MenuItemActionItem extends ActionItem {
 		dispose(this._itemClassDispose);
 		this._itemClassDispose = undefined;
 
-		if (item.iconPath) {
+		if (item.iconLocation) {
 			let iconClass: string;
 
-			if (MenuItemActionItem.ICON_PATH_TO_CSS_RULES.has(item.iconPath.dark)) {
-				iconClass = MenuItemActionItem.ICON_PATH_TO_CSS_RULES.get(item.iconPath.dark);
+			const iconPathMapKey = item.iconLocation.dark.toString();
+
+			if (MenuItemActionItem.ICON_PATH_TO_CSS_RULES.has(iconPathMapKey)) {
+				iconClass = MenuItemActionItem.ICON_PATH_TO_CSS_RULES.get(iconPathMapKey);
 			} else {
 				iconClass = ids.nextId();
-				createCSSRule(`.icon.${iconClass}`, `background-image: url("${URI.file(item.iconPath.light || item.iconPath.dark).toString()}")`);
-				createCSSRule(`.vs-dark .icon.${iconClass}, .hc-black .icon.${iconClass}`, `background-image: url("${URI.file(item.iconPath.dark).toString()}")`);
-				MenuItemActionItem.ICON_PATH_TO_CSS_RULES.set(item.iconPath.dark, iconClass);
+				createCSSRule(`.icon.${iconClass}`, `background-image: url("${(item.iconLocation.light || item.iconLocation.dark).toString()}")`);
+				createCSSRule(`.vs-dark .icon.${iconClass}, .hc-black .icon.${iconClass}`, `background-image: url("${item.iconLocation.dark.toString()}")`);
+				MenuItemActionItem.ICON_PATH_TO_CSS_RULES.set(iconPathMapKey, iconClass);
 			}
 
-			this.$e.getHTMLElement().classList.add('icon', iconClass);
-			this._itemClassDispose = { dispose: () => this.$e.getHTMLElement().classList.remove('icon', iconClass) };
+			addClasses(this.label, 'icon', iconClass);
+			this._itemClassDispose = toDisposable(() => removeClasses(this.label, 'icon', iconClass));
 		}
 	}
 
@@ -271,6 +261,6 @@ export class ContextAwareMenuItemActionItem extends MenuItemActionItem {
 		event.stopPropagation();
 
 		this.actionRunner.run(this._commandAction, this._context)
-			.done(undefined, err => this._notificationService.error(err));
+			.then(undefined, err => this._notificationService.error(err));
 	}
 }
diff --git a/src/vs/platform/actions/common/actions.ts b/src/vs/platform/actions/common/actions.ts
index 914b7ff2f31..720ad5d4de5 100644
--- a/src/vs/platform/actions/common/actions.ts
+++ b/src/vs/platform/actions/common/actions.ts
@@ -13,20 +13,28 @@ import { ContextKeyExpr, IContextKeyService } from 'vs/platform/contextkey/commo
 import { ICommandService } from 'vs/platform/commands/common/commands';
 import { IDisposable } from 'vs/base/common/lifecycle';
 import { Event } from 'vs/base/common/event';
+import { URI, UriComponents } from 'vs/base/common/uri';
 
 export interface ILocalizedString {
 	value: string;
 	original: string;
 }
 
-export interface ICommandAction {
+export interface IBaseCommandAction {
 	id: string;
 	title: string | ILocalizedString;
 	category?: string | ILocalizedString;
-	iconPath?: { dark: string; light?: string; };
+}
+
+export interface ICommandAction extends IBaseCommandAction {
+	iconLocation?: { dark: URI; light?: URI; };
 	precondition?: ContextKeyExpr;
 }
 
+export interface ISerializableCommandAction extends IBaseCommandAction {
+	iconLocation?: { dark: UriComponents; light?: UriComponents; };
+}
+
 export interface IMenuItem {
 	command: ICommandAction;
 	alt?: ICommandAction;
@@ -35,6 +43,22 @@ export interface IMenuItem {
 	order?: number;
 }
 
+export interface ISubmenuItem {
+	title: string | ILocalizedString;
+	submenu: MenuId;
+	when?: ContextKeyExpr;
+	group?: 'navigation' | string;
+	order?: number;
+}
+
+export function isIMenuItem(item: IMenuItem | ISubmenuItem): item is IMenuItem {
+	return (item as IMenuItem).command !== undefined;
+}
+
+export function isISubmenuItem(item: IMenuItem | ISubmenuItem): item is ISubmenuItem {
+	return (item as ISubmenuItem).submenu !== undefined;
+}
+
 export class MenuId {
 
 	private static ID = 1;
@@ -61,6 +85,21 @@ export class MenuId {
 	static readonly ViewItemContext = new MenuId();
 	static readonly TouchBarContext = new MenuId();
 	static readonly SearchContext = new MenuId();
+	static readonly MenubarFileMenu = new MenuId();
+	static readonly MenubarEditMenu = new MenuId();
+	static readonly MenubarRecentMenu = new MenuId();
+	static readonly MenubarSelectionMenu = new MenuId();
+	static readonly MenubarViewMenu = new MenuId();
+	static readonly MenubarAppearanceMenu = new MenuId();
+	static readonly MenubarLayoutMenu = new MenuId();
+	static readonly MenubarGoMenu = new MenuId();
+	static readonly MenubarSwitchEditorMenu = new MenuId();
+	static readonly MenubarSwitchGroupMenu = new MenuId();
+	static readonly MenubarDebugMenu = new MenuId();
+	static readonly MenubarNewBreakpointMenu = new MenuId();
+	static readonly MenubarPreferencesMenu = new MenuId();
+	static readonly MenubarHelpMenu = new MenuId();
+	static readonly MenubarTerminalMenu = new MenuId();
 
 	readonly id: string = String(MenuId.ID++);
 }
@@ -72,7 +111,7 @@ export interface IMenuActionOptions {
 
 export interface IMenu extends IDisposable {
 	onDidChange: Event<IMenu>;
-	getActions(options?: IMenuActionOptions): [string, MenuItemAction[]][];
+	getActions(options?: IMenuActionOptions): [string, (MenuItemAction | SubmenuItemAction)[]][];
 }
 
 export const IMenuService = createDecorator<IMenuService>('menuService');
@@ -87,15 +126,15 @@ export interface IMenuService {
 export interface IMenuRegistry {
 	addCommand(userCommand: ICommandAction): boolean;
 	getCommand(id: string): ICommandAction;
-	appendMenuItem(menu: MenuId, item: IMenuItem): IDisposable;
-	getMenuItems(loc: MenuId): IMenuItem[];
+	appendMenuItem(menu: MenuId, item: IMenuItem | ISubmenuItem): IDisposable;
+	getMenuItems(loc: MenuId): (IMenuItem | ISubmenuItem)[];
 }
 
 export const MenuRegistry: IMenuRegistry = new class implements IMenuRegistry {
 
 	private _commands: { [id: string]: ICommandAction } = Object.create(null);
 
-	private _menuItems: { [loc: string]: IMenuItem[] } = Object.create(null);
+	private _menuItems: { [loc: string]: (IMenuItem | ISubmenuItem)[] } = Object.create(null);
 
 	addCommand(command: ICommandAction): boolean {
 		const old = this._commands[command.id];
@@ -107,7 +146,7 @@ export const MenuRegistry: IMenuRegistry = new class implements IMenuRegistry {
 		return this._commands[id];
 	}
 
-	appendMenuItem({ id }: MenuId, item: IMenuItem): IDisposable {
+	appendMenuItem({ id }: MenuId, item: IMenuItem | ISubmenuItem): IDisposable {
 		let array = this._menuItems[id];
 		if (!array) {
 			this._menuItems[id] = array = [item];
@@ -124,7 +163,7 @@ export const MenuRegistry: IMenuRegistry = new class implements IMenuRegistry {
 		};
 	}
 
-	getMenuItems({ id }: MenuId): IMenuItem[] {
+	getMenuItems({ id }: MenuId): (IMenuItem | ISubmenuItem)[] {
 		const result = this._menuItems[id] || [];
 
 		if (id === MenuId.CommandPalette.id) {
@@ -135,9 +174,12 @@ export const MenuRegistry: IMenuRegistry = new class implements IMenuRegistry {
 		return result;
 	}
 
-	private _appendImplicitItems(result: IMenuItem[]) {
+	private _appendImplicitItems(result: (IMenuItem | ISubmenuItem)[]) {
 		const set = new Set<string>();
-		for (const { command, alt } of result) {
+
+		const temp = result.filter(item => { return isIMenuItem(item); }) as IMenuItem[];
+
+		for (const { command, alt } of temp) {
 			set.add(command.id);
 			if (alt) {
 				set.add(alt.id);
@@ -166,6 +208,16 @@ export class ExecuteCommandAction extends Action {
 	}
 }
 
+export class SubmenuItemAction extends Action {
+	// private _options: IMenuActionOptions;
+
+	readonly item: ISubmenuItem;
+	constructor(item: ISubmenuItem) {
+		typeof item.title === 'string' ? super('', item.title, 'submenu') : super('', item.title.value, 'submenu');
+		this.item = item;
+	}
+}
+
 export class MenuItemAction extends ExecuteCommandAction {
 
 	private _options: IMenuActionOptions;
diff --git a/src/vs/platform/actions/common/menu.ts b/src/vs/platform/actions/common/menu.ts
index e3ad0820736..37c14316640 100644
--- a/src/vs/platform/actions/common/menu.ts
+++ b/src/vs/platform/actions/common/menu.ts
@@ -9,10 +9,10 @@ import { Event, Emitter } from 'vs/base/common/event';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { ContextKeyExpr, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { MenuId, MenuRegistry, MenuItemAction, IMenu, IMenuItem, IMenuActionOptions } from 'vs/platform/actions/common/actions';
+import { MenuId, MenuRegistry, MenuItemAction, IMenu, IMenuItem, IMenuActionOptions, ISubmenuItem, SubmenuItemAction, isIMenuItem } from 'vs/platform/actions/common/actions';
 import { ICommandService } from 'vs/platform/commands/common/commands';
 
-type MenuItemGroup = [string, IMenuItem[]];
+type MenuItemGroup = [string, (IMenuItem | ISubmenuItem)[]];
 
 export class Menu implements IMenu {
 
@@ -66,15 +66,14 @@ export class Menu implements IMenu {
 		return this._onDidChange.event;
 	}
 
-	getActions(options: IMenuActionOptions): [string, MenuItemAction[]][] {
-		const result: [string, MenuItemAction[]][] = [];
+	getActions(options: IMenuActionOptions): [string, (MenuItemAction | SubmenuItemAction)[]][] {
+		const result: [string, (MenuItemAction | SubmenuItemAction)[]][] = [];
 		for (let group of this._menuGroups) {
 			const [id, items] = group;
-			const activeActions: MenuItemAction[] = [];
+			const activeActions: (MenuItemAction | SubmenuItemAction)[] = [];
 			for (const item of items) {
 				if (this._contextKeyService.contextMatchesRules(item.when)) {
-					const action = new MenuItemAction(item.command, item.alt, options, this._contextKeyService, this._commandService);
-					action.order = item.order; //TODO@Ben order is menu item property, not an action property
+					const action = isIMenuItem(item) ? new MenuItemAction(item.command, item.alt, options, this._contextKeyService, this._commandService) : new SubmenuItemAction(item);
 					activeActions.push(action);
 				}
 			}
diff --git a/src/vs/platform/backup/common/backup.ts b/src/vs/platform/backup/common/backup.ts
index 1d77135f933..a761c98e0ae 100644
--- a/src/vs/platform/backup/common/backup.ts
+++ b/src/vs/platform/backup/common/backup.ts
@@ -5,11 +5,15 @@
 
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
 import { IWorkspaceIdentifier } from 'vs/platform/workspaces/common/workspaces';
+import { URI } from 'vs/base/common/uri';
 
 export interface IBackupWorkspacesFormat {
 	rootWorkspaces: IWorkspaceIdentifier[];
-	folderWorkspaces: string[];
+	folderURIWorkspaces: string[];
 	emptyWorkspaces: string[];
+
+	// deprecated
+	folderWorkspaces?: string[]; // use folderURIWorkspaces instead
 }
 
 export const IBackupMainService = createDecorator<IBackupMainService>('backupMainService');
@@ -20,10 +24,14 @@ export interface IBackupMainService {
 	isHotExitEnabled(): boolean;
 
 	getWorkspaceBackups(): IWorkspaceIdentifier[];
-	getFolderBackupPaths(): string[];
+	getFolderBackupPaths(): URI[];
 	getEmptyWindowBackupPaths(): string[];
 
 	registerWorkspaceBackupSync(workspace: IWorkspaceIdentifier, migrateFrom?: string): string;
-	registerFolderBackupSync(folderPath: string): string;
+	registerFolderBackupSync(folderUri: URI): string;
 	registerEmptyWindowBackupSync(backupFolder?: string): string;
+
+	unregisterWorkspaceBackupSync(workspace: IWorkspaceIdentifier): void;
+	unregisterFolderBackupSync(folderUri: URI): void;
+	unregisterEmptyWindowBackupSync(backupFolder: string): void;
 }
\ No newline at end of file
diff --git a/src/vs/platform/backup/electron-main/backupMainService.ts b/src/vs/platform/backup/electron-main/backupMainService.ts
index 9201f86adb9..cca5c578754 100644
--- a/src/vs/platform/backup/electron-main/backupMainService.ts
+++ b/src/vs/platform/backup/electron-main/backupMainService.ts
@@ -3,18 +3,23 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as arrays from 'vs/base/common/arrays';
 import * as fs from 'fs';
 import * as path from 'path';
 import * as crypto from 'crypto';
 import * as platform from 'vs/base/common/platform';
 import * as extfs from 'vs/base/node/extfs';
-import { IBackupWorkspacesFormat, IBackupMainService } from 'vs/platform/backup/common/backup';
+import * as arrays from 'vs/base/common/arrays';
+import { IBackupMainService, IBackupWorkspacesFormat } from 'vs/platform/backup/common/backup';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IFilesConfiguration, HotExitConfiguration } from 'vs/platform/files/common/files';
 import { ILogService } from 'vs/platform/log/common/log';
-import { IWorkspaceIdentifier, ISingleFolderWorkspaceIdentifier, isSingleFolderWorkspaceIdentifier } from 'vs/platform/workspaces/common/workspaces';
+
+import { IWorkspaceIdentifier, isWorkspaceIdentifier } from 'vs/platform/workspaces/common/workspaces';
+import { URI } from 'vs/base/common/uri';
+import { isEqual as areResourcesEquals, getComparisonKey, hasToIgnoreCase } from 'vs/base/common/resources';
+import { isEqual } from 'vs/base/common/paths';
+import { Schemas } from 'vs/base/common/network';
 
 export class BackupMainService implements IBackupMainService {
 
@@ -23,7 +28,9 @@ export class BackupMainService implements IBackupMainService {
 	protected backupHome: string;
 	protected workspacesJsonPath: string;
 
-	protected backups: IBackupWorkspacesFormat;
+	protected rootWorkspaces: IWorkspaceIdentifier[];
+	protected folderWorkspaces: URI[];
+	protected emptyWorkspaces: string[];
 
 	constructor(
 		@IEnvironmentService environmentService: IEnvironmentService,
@@ -43,17 +50,16 @@ export class BackupMainService implements IBackupMainService {
 			return [];
 		}
 
-		return this.backups.rootWorkspaces.slice(0); // return a copy
+		return this.rootWorkspaces.slice(0); // return a copy
 	}
 
-	public getFolderBackupPaths(): string[] {
+	public getFolderBackupPaths(): URI[] {
 		if (this.isHotExitOnExitAndWindowClose()) {
 			// Only non-folder windows are restored on main process launch when
 			// hot exit is configured as onExitAndWindowClose.
 			return [];
 		}
-
-		return this.backups.folderWorkspaces.slice(0); // return a copy
+		return this.folderWorkspaces.slice(0); // return a copy
 	}
 
 	public isHotExitEnabled(): boolean {
@@ -71,13 +77,16 @@ export class BackupMainService implements IBackupMainService {
 	}
 
 	public getEmptyWindowBackupPaths(): string[] {
-		return this.backups.emptyWorkspaces.slice(0); // return a copy
+		return this.emptyWorkspaces.slice(0); // return a copy
 	}
 
 	public registerWorkspaceBackupSync(workspace: IWorkspaceIdentifier, migrateFrom?: string): string {
-		this.pushBackupPathsSync(workspace, this.backups.rootWorkspaces);
+		if (!this.rootWorkspaces.some(w => w.id === workspace.id)) {
+			this.rootWorkspaces.push(workspace);
+			this.saveSync();
+		}
 
-		const backupPath = path.join(this.backupHome, workspace.id);
+		const backupPath = this.getBackupPath(workspace.id);
 
 		if (migrateFrom) {
 			this.moveBackupFolderSync(backupPath, migrateFrom);
@@ -103,10 +112,28 @@ export class BackupMainService implements IBackupMainService {
 		}
 	}
 
-	public registerFolderBackupSync(folderPath: string): string {
-		this.pushBackupPathsSync(folderPath, this.backups.folderWorkspaces);
+	public unregisterWorkspaceBackupSync(workspace: IWorkspaceIdentifier): void {
+		let index = arrays.firstIndex(this.rootWorkspaces, w => w.id === workspace.id);
+		if (index !== -1) {
+			this.rootWorkspaces.splice(index, 1);
+			this.saveSync();
+		}
+	}
 
-		return path.join(this.backupHome, this.getFolderHash(folderPath));
+	public registerFolderBackupSync(folderUri: URI): string {
+		if (!this.folderWorkspaces.some(uri => areResourcesEquals(folderUri, uri))) {
+			this.folderWorkspaces.push(folderUri);
+			this.saveSync();
+		}
+		return this.getBackupPath(this.getFolderHash(folderUri));
+	}
+
+	public unregisterFolderBackupSync(folderUri: URI): void {
+		let index = arrays.firstIndex(this.folderWorkspaces, uri => areResourcesEquals(folderUri, uri));
+		if (index !== -1) {
+			this.folderWorkspaces.splice(index, 1);
+			this.saveSync();
+		}
 	}
 
 	public registerEmptyWindowBackupSync(backupFolder?: string): string {
@@ -115,52 +142,23 @@ export class BackupMainService implements IBackupMainService {
 		if (!backupFolder) {
 			backupFolder = this.getRandomEmptyWindowId();
 		}
-
-		this.pushBackupPathsSync(backupFolder, this.backups.emptyWorkspaces);
-
-		return path.join(this.backupHome, backupFolder);
+		if (!this.emptyWorkspaces.some(w => isEqual(w, backupFolder, !platform.isLinux))) {
+			this.emptyWorkspaces.push(backupFolder);
+			this.saveSync();
+		}
+		return this.getBackupPath(backupFolder);
 	}
 
-	private pushBackupPathsSync(workspaceIdentifier: IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier, target: (IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier)[]): void {
-		if (this.indexOf(workspaceIdentifier, target) === -1) {
-			target.push(workspaceIdentifier);
+	public unregisterEmptyWindowBackupSync(backupFolder: string): void {
+		let index = arrays.firstIndex(this.emptyWorkspaces, w => isEqual(w, backupFolder, !platform.isLinux));
+		if (index !== -1) {
+			this.emptyWorkspaces.splice(index, 1);
 			this.saveSync();
 		}
 	}
 
-	protected removeBackupPathSync(workspaceIdentifier: IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier, target: (IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier)[]): void {
-		if (!target) {
-			return;
-		}
-
-		const index = this.indexOf(workspaceIdentifier, target);
-		if (index === -1) {
-			return;
-		}
-
-		target.splice(index, 1);
-		this.saveSync();
-	}
-
-	private indexOf(workspaceIdentifier: IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier, target: (IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier)[]): number {
-		if (!target) {
-			return -1;
-		}
-
-		const sanitizedWorkspaceIdentifier = this.sanitizeId(workspaceIdentifier);
-
-		return arrays.firstIndex(target, id => this.sanitizeId(id) === sanitizedWorkspaceIdentifier);
-	}
-
-	private sanitizeId(workspaceIdentifier: IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier): string {
-		if (isSingleFolderWorkspaceIdentifier(workspaceIdentifier)) {
-			return this.sanitizePath(workspaceIdentifier);
-		}
-
-		return workspaceIdentifier.id;
-	}
-
 	protected loadSync(): void {
+
 		let backups: IBackupWorkspacesFormat;
 		try {
 			backups = JSON.parse(fs.readFileSync(this.workspacesJsonPath, 'utf8').toString()); // invalid JSON or permission issue can happen here
@@ -168,117 +166,168 @@ export class BackupMainService implements IBackupMainService {
 			backups = Object.create(null);
 		}
 
-		// Ensure rootWorkspaces is a object[]
-		if (backups.rootWorkspaces) {
-			const rws = backups.rootWorkspaces;
-			if (!Array.isArray(rws) || rws.some(r => typeof r !== 'object')) {
-				backups.rootWorkspaces = [];
-			}
-		} else {
-			backups.rootWorkspaces = [];
-		}
+		// read empty worrkspace backs first
+		this.emptyWorkspaces = this.validateEmptyWorkspaces(backups.emptyWorkspaces);
 
-		// Ensure folderWorkspaces is a string[]
-		if (backups.folderWorkspaces) {
-			const fws = backups.folderWorkspaces;
-			if (!Array.isArray(fws) || fws.some(f => typeof f !== 'string')) {
-				backups.folderWorkspaces = [];
-			}
-		} else {
-			backups.folderWorkspaces = [];
-		}
+		// read workspace backups
+		this.rootWorkspaces = this.validateWorkspaces(backups.rootWorkspaces);
 
-		// Ensure emptyWorkspaces is a string[]
-		if (backups.emptyWorkspaces) {
-			const fws = backups.emptyWorkspaces;
-			if (!Array.isArray(fws) || fws.some(f => typeof f !== 'string')) {
-				backups.emptyWorkspaces = [];
-			}
-		} else {
-			backups.emptyWorkspaces = [];
-		}
-
-		this.backups = this.dedupeBackups(backups);
-
-		// Validate backup workspaces
-		this.validateBackupWorkspaces(backups);
-	}
-
-	protected dedupeBackups(backups: IBackupWorkspacesFormat): IBackupWorkspacesFormat {
-
-		// De-duplicate folder/workspace backups. don't worry about cleaning them up any duplicates as
-		// they will be removed when there are no backups.
-		backups.folderWorkspaces = arrays.distinct(backups.folderWorkspaces, ws => this.sanitizePath(ws));
-		backups.rootWorkspaces = arrays.distinct(backups.rootWorkspaces, ws => this.sanitizePath(ws.id));
-
-		return backups;
-	}
-
-	private validateBackupWorkspaces(backups: IBackupWorkspacesFormat): void {
-		const staleBackupWorkspaces: { workspaceIdentifier: IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier; backupPath: string; target: (IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier)[] }[] = [];
-
-		const workspaceAndFolders: { workspaceIdentifier: IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier, target: (IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier)[] }[] = [];
-		workspaceAndFolders.push(...backups.rootWorkspaces.map(r => ({ workspaceIdentifier: r, target: backups.rootWorkspaces })));
-		workspaceAndFolders.push(...backups.folderWorkspaces.map(f => ({ workspaceIdentifier: f, target: backups.folderWorkspaces })));
-
-		// Validate Workspace and Folder Backups
-		workspaceAndFolders.forEach(workspaceOrFolder => {
-			const workspaceId = workspaceOrFolder.workspaceIdentifier;
-			const workspacePath = isSingleFolderWorkspaceIdentifier(workspaceId) ? workspaceId : workspaceId.configPath;
-			const backupPath = path.join(this.backupHome, isSingleFolderWorkspaceIdentifier(workspaceId) ? this.getFolderHash(workspaceId) : workspaceId.id);
-			const hasBackups = this.hasBackupsSync(backupPath);
-			const missingWorkspace = hasBackups && !fs.existsSync(workspacePath);
-
-			// If the workspace/folder has no backups, make sure to delete it
-			// If the workspace/folder has backups, but the target workspace is missing, convert backups to empty ones
-			if (!hasBackups || missingWorkspace) {
-				staleBackupWorkspaces.push({ workspaceIdentifier: workspaceId, backupPath, target: workspaceOrFolder.target });
-
-				if (missingWorkspace) {
-					this.convertToEmptyWindowBackup(backupPath);
+		// read folder backups
+		let workspaceFolders: URI[];
+		try {
+			if (Array.isArray(backups.folderURIWorkspaces)) {
+				workspaceFolders = backups.folderURIWorkspaces.map(f => URI.parse(f));
+			} else if (Array.isArray(backups.folderWorkspaces)) {
+				// migrate legacy folder paths
+				workspaceFolders = [];
+				for (const folderPath of backups.folderWorkspaces) {
+					const oldFolderHash = this.getLegacyFolderHash(folderPath);
+					const folderUri = URI.file(folderPath);
+					const newFolderHash = this.getFolderHash(folderUri);
+					if (newFolderHash !== oldFolderHash) {
+						this.moveBackupFolderSync(this.getBackupPath(newFolderHash), this.getBackupPath(oldFolderHash));
+					}
+					workspaceFolders.push(folderUri);
 				}
 			}
-		});
+		} catch (e) {
+			// ignore URI parsing exceptions
+		}
+		this.folderWorkspaces = this.validateFolders(workspaceFolders);
+
+		// save again in case some workspaces or folders have been removed
+		this.saveSync();
+
+	}
+
+	private getBackupPath(oldFolderHash: string): string {
+		return path.join(this.backupHome, oldFolderHash);
+	}
+
+	private validateWorkspaces(rootWorkspaces: IWorkspaceIdentifier[]): IWorkspaceIdentifier[] {
+		if (!Array.isArray(rootWorkspaces)) {
+			return [];
+		}
+
+		const seenIds: { [id: string]: boolean } = Object.create(null);
+		const result: IWorkspaceIdentifier[] = [];
+
+		// Validate Workspaces
+		for (let workspace of rootWorkspaces) {
+			if (!isWorkspaceIdentifier(workspace)) {
+				return []; // wrong format, skip all entries
+			}
+
+			if (!seenIds[workspace.id]) {
+				seenIds[workspace.id] = true;
+
+				const backupPath = this.getBackupPath(workspace.id);
+				const hasBackups = this.hasBackupsSync(backupPath);
+
+				// If the workspace has no backups, ignore it
+				if (hasBackups) {
+					if (fs.existsSync(workspace.configPath)) {
+						result.push(workspace);
+					} else {
+						// If the workspace has backups, but the target workspace is missing, convert backups to empty ones
+						this.convertToEmptyWindowBackup(backupPath);
+					}
+				} else {
+					this.deleteStaleBackup(backupPath);
+				}
+			}
+		}
+		return result;
+	}
+
+	private validateFolders(folderWorkspaces: URI[]): URI[] {
+		if (!Array.isArray(folderWorkspaces)) {
+			return [];
+		}
+
+		const result: URI[] = [];
+		const seen: { [id: string]: boolean } = Object.create(null);
+
+		for (let folderURI of folderWorkspaces) {
+			const key = getComparisonKey(folderURI);
+			if (!seen[key]) {
+				seen[key] = true;
+
+				const backupPath = this.getBackupPath(this.getFolderHash(folderURI));
+				const hasBackups = this.hasBackupsSync(backupPath);
+
+				// If the folder has no backups, ignore it
+				if (hasBackups) {
+					if (folderURI.scheme !== Schemas.file || fs.existsSync(folderURI.fsPath)) {
+						result.push(folderURI);
+					} else {
+						// If the folder has backups, but the target workspace is missing, convert backups to empty ones
+						this.convertToEmptyWindowBackup(backupPath);
+					}
+				} else {
+					this.deleteStaleBackup(backupPath);
+				}
+			}
+		}
+
+		return result;
+	}
+	private validateEmptyWorkspaces(emptyWorkspaces: string[]): string[] {
+		if (!Array.isArray(emptyWorkspaces)) {
+			return [];
+		}
+
+		const result: string[] = [];
+		const seen: { [id: string]: boolean } = Object.create(null);
 
 		// Validate Empty Windows
-		backups.emptyWorkspaces.forEach(backupFolder => {
-			const backupPath = path.join(this.backupHome, backupFolder);
-			if (!this.hasBackupsSync(backupPath)) {
-				staleBackupWorkspaces.push({ workspaceIdentifier: backupFolder, backupPath, target: backups.emptyWorkspaces });
+		for (let backupFolder of emptyWorkspaces) {
+			if (typeof backupFolder !== 'string') {
+				return [];
 			}
-		});
 
-		// Clean up stale backups
-		staleBackupWorkspaces.forEach(staleBackupWorkspace => {
-			const { backupPath, workspaceIdentifier, target } = staleBackupWorkspace;
+			if (!seen[backupFolder]) {
+				seen[backupFolder] = true;
 
-			try {
+				const backupPath = this.getBackupPath(backupFolder);
+				if (this.hasBackupsSync(backupPath)) {
+					result.push(backupFolder);
+				} else {
+					this.deleteStaleBackup(backupPath);
+				}
+			}
+		}
+
+		return result;
+	}
+
+	private deleteStaleBackup(backupPath: string) {
+		try {
+			if (fs.existsSync(backupPath)) {
 				extfs.delSync(backupPath);
-			} catch (ex) {
-				this.logService.error(`Backup: Could not delete stale backup: ${ex.toString()}`);
 			}
-
-			this.removeBackupPathSync(workspaceIdentifier, target);
-		});
+		} catch (ex) {
+			this.logService.error(`Backup: Could not delete stale backup: ${ex.toString()}`);
+		}
 	}
 
 	private convertToEmptyWindowBackup(backupPath: string): boolean {
 
 		// New empty window backup
-		const identifier = this.getRandomEmptyWindowId();
-		this.pushBackupPathsSync(identifier, this.backups.emptyWorkspaces);
+		let newBackupFolder = this.getRandomEmptyWindowId();
+		while (this.emptyWorkspaces.some(w => isEqual(w, newBackupFolder, platform.isLinux))) {
+			newBackupFolder = this.getRandomEmptyWindowId();
+		}
 
 		// Rename backupPath to new empty window backup path
-		const newEmptyWindowBackupPath = path.join(this.backupHome, identifier);
+		const newEmptyWindowBackupPath = this.getBackupPath(newBackupFolder);
 		try {
 			fs.renameSync(backupPath, newEmptyWindowBackupPath);
 		} catch (ex) {
 			this.logService.error(`Backup: Could not rename backup folder: ${ex.toString()}`);
-
-			this.removeBackupPathSync(identifier, this.backups.emptyWorkspaces);
-
 			return false;
 		}
+		this.emptyWorkspaces.push(newBackupFolder);
 
 		return true;
 	}
@@ -308,8 +357,12 @@ export class BackupMainService implements IBackupMainService {
 			if (!fs.existsSync(this.backupHome)) {
 				fs.mkdirSync(this.backupHome);
 			}
-
-			extfs.writeFileAndFlushSync(this.workspacesJsonPath, JSON.stringify(this.backups));
+			const backups: IBackupWorkspacesFormat = {
+				rootWorkspaces: this.rootWorkspaces,
+				folderURIWorkspaces: this.folderWorkspaces.map(f => f.toString()),
+				emptyWorkspaces: this.emptyWorkspaces
+			};
+			extfs.writeFileAndFlushSync(this.workspacesJsonPath, JSON.stringify(backups));
 		} catch (ex) {
 			this.logService.error(`Backup: Could not save workspaces.json: ${ex.toString()}`);
 		}
@@ -319,11 +372,19 @@ export class BackupMainService implements IBackupMainService {
 		return (Date.now() + Math.round(Math.random() * 1000)).toString();
 	}
 
-	private sanitizePath(p: string): string {
-		return platform.isLinux ? p : p.toLowerCase();
+	protected getFolderHash(folderUri: URI): string {
+		let key;
+		if (folderUri.scheme === Schemas.file) {
+			// for backward compatibility, use the fspath as key
+			key = platform.isLinux ? folderUri.fsPath : folderUri.fsPath.toLowerCase();
+
+		} else {
+			key = hasToIgnoreCase(folderUri) ? folderUri.toString().toLowerCase() : folderUri.toString();
+		}
+		return crypto.createHash('md5').update(key).digest('hex');
 	}
 
-	protected getFolderHash(folderPath: string): string {
-		return crypto.createHash('md5').update(this.sanitizePath(folderPath)).digest('hex');
+	protected getLegacyFolderHash(folderPath: string): string {
+		return crypto.createHash('md5').update(platform.isLinux ? folderPath : folderPath.toLowerCase()).digest('hex');
 	}
-}
+}
\ No newline at end of file
diff --git a/src/vs/platform/backup/test/electron-main/backupMainService.test.ts b/src/vs/platform/backup/test/electron-main/backupMainService.test.ts
index ff421ddbdf7..3ed740d5768 100644
--- a/src/vs/platform/backup/test/electron-main/backupMainService.test.ts
+++ b/src/vs/platform/backup/test/electron-main/backupMainService.test.ts
@@ -11,7 +11,7 @@ import * as fs from 'fs';
 import * as os from 'os';
 import * as path from 'path';
 import * as pfs from 'vs/base/node/pfs';
-import Uri from 'vs/base/common/uri';
+import { URI as Uri } from 'vs/base/common/uri';
 import { EnvironmentService } from 'vs/platform/environment/node/environmentService';
 import { parseArgs } from 'vs/platform/environment/node/argv';
 import { BackupMainService } from 'vs/platform/backup/electron-main/backupMainService';
@@ -25,6 +25,11 @@ import { getRandomTestPath } from 'vs/workbench/test/workbenchTestServices';
 import { Schemas } from 'vs/base/common/network';
 
 suite('BackupMainService', () => {
+
+	function assertEqualUris(actual: Uri[], expected: Uri[]) {
+		assert.deepEqual(actual.map(a => a.toString()), expected.map(a => a.toString()));
+	}
+
 	const parentDir = getRandomTestPath(os.tmpdir(), 'vsctests', 'backupservice');
 	const backupHome = path.join(parentDir, 'Backups');
 	const backupWorkspacesPath = path.join(backupHome, 'workspaces.json');
@@ -43,28 +48,21 @@ suite('BackupMainService', () => {
 			this.loadSync();
 		}
 
-		public get backupsData(): IBackupWorkspacesFormat {
-			return this.backups;
-		}
-
-		public removeBackupPathSync(workspaceIdentifier: string | IWorkspaceIdentifier, target: (string | IWorkspaceIdentifier)[]): void {
-			return super.removeBackupPathSync(workspaceIdentifier, target);
-		}
-
 		public loadSync(): void {
 			super.loadSync();
 		}
 
-		public dedupeBackups(backups: IBackupWorkspacesFormat): IBackupWorkspacesFormat {
-			return super.dedupeBackups(backups);
+		public toBackupPath(arg: Uri | string): string {
+			const id = arg instanceof Uri ? super.getFolderHash(arg) : arg;
+			return path.join(this.backupHome, id);
 		}
 
-		public toBackupPath(workspacePath: string): string {
-			return path.join(this.backupHome, super.getFolderHash(workspacePath));
+		public getFolderHash(folderUri: Uri): string {
+			return super.getFolderHash(folderUri);
 		}
 
-		public getFolderHash(folderPath: string): string {
-			return super.getFolderHash(folderPath);
+		public toLegacyBackupPath(folderPath: string): string {
+			return path.join(this.backupHome, super.getLegacyFolderHash(folderPath));
 		}
 	}
 
@@ -75,6 +73,31 @@ suite('BackupMainService', () => {
 		};
 	}
 
+	async function ensureFolderExists(uri: Uri): Promise<void> {
+		if (!fs.existsSync(uri.fsPath)) {
+			fs.mkdirSync(uri.fsPath);
+		}
+		const backupFolder = service.toBackupPath(uri);
+		await createBackupFolder(backupFolder);
+	}
+
+	async function ensureWorkspaceExists(workspace: IWorkspaceIdentifier): Promise<IWorkspaceIdentifier> {
+		if (!fs.existsSync(workspace.configPath)) {
+			await pfs.writeFile(workspace.configPath, 'Hello');
+		}
+		const backupFolder = service.toBackupPath(workspace.id);
+		await createBackupFolder(backupFolder);
+		return workspace;
+	}
+
+	async function createBackupFolder(backupFolder: string): Promise<void> {
+		if (!fs.existsSync(backupFolder)) {
+			fs.mkdirSync(backupFolder);
+			fs.mkdirSync(path.join(backupFolder, Schemas.file));
+			await pfs.writeFile(path.join(backupFolder, Schemas.file, 'foo.txt'), 'Hello');
+		}
+	}
+
 	function sanitizePath(p: string): string {
 		return platform.isLinux ? p : p.toLowerCase();
 	}
@@ -82,6 +105,8 @@ suite('BackupMainService', () => {
 	const fooFile = Uri.file(platform.isWindows ? 'C:\\foo' : '/foo');
 	const barFile = Uri.file(platform.isWindows ? 'C:\\bar' : '/bar');
 
+	const existingTestFolder1 = Uri.file(path.join(parentDir, 'folder1'));
+
 	let service: TestBackupMainService;
 	let configService: TestConfigurationService;
 
@@ -103,40 +128,40 @@ suite('BackupMainService', () => {
 		this.timeout(1000 * 10); // increase timeout for this test
 
 		// 1) backup workspace path does not exist
-		service.registerFolderBackupSync(fooFile.fsPath);
-		service.registerFolderBackupSync(barFile.fsPath);
+		service.registerFolderBackupSync(fooFile);
+		service.registerFolderBackupSync(barFile);
 		service.loadSync();
-		assert.deepEqual(service.getFolderBackupPaths(), []);
+		assertEqualUris(service.getFolderBackupPaths(), []);
 
 		// 2) backup workspace path exists with empty contents within
-		fs.mkdirSync(service.toBackupPath(fooFile.fsPath));
-		fs.mkdirSync(service.toBackupPath(barFile.fsPath));
-		service.registerFolderBackupSync(fooFile.fsPath);
-		service.registerFolderBackupSync(barFile.fsPath);
+		fs.mkdirSync(service.toBackupPath(fooFile));
+		fs.mkdirSync(service.toBackupPath(barFile));
+		service.registerFolderBackupSync(fooFile);
+		service.registerFolderBackupSync(barFile);
 		service.loadSync();
-		assert.deepEqual(service.getFolderBackupPaths(), []);
-		assert.ok(!fs.existsSync(service.toBackupPath(fooFile.fsPath)));
-		assert.ok(!fs.existsSync(service.toBackupPath(barFile.fsPath)));
+		assertEqualUris(service.getFolderBackupPaths(), []);
+		assert.ok(!fs.existsSync(service.toBackupPath(fooFile)));
+		assert.ok(!fs.existsSync(service.toBackupPath(barFile)));
 
 		// 3) backup workspace path exists with empty folders within
-		fs.mkdirSync(service.toBackupPath(fooFile.fsPath));
-		fs.mkdirSync(service.toBackupPath(barFile.fsPath));
-		fs.mkdirSync(path.join(service.toBackupPath(fooFile.fsPath), Schemas.file));
-		fs.mkdirSync(path.join(service.toBackupPath(barFile.fsPath), Schemas.untitled));
-		service.registerFolderBackupSync(fooFile.fsPath);
-		service.registerFolderBackupSync(barFile.fsPath);
+		fs.mkdirSync(service.toBackupPath(fooFile));
+		fs.mkdirSync(service.toBackupPath(barFile));
+		fs.mkdirSync(path.join(service.toBackupPath(fooFile), Schemas.file));
+		fs.mkdirSync(path.join(service.toBackupPath(barFile), Schemas.untitled));
+		service.registerFolderBackupSync(fooFile);
+		service.registerFolderBackupSync(barFile);
 		service.loadSync();
-		assert.deepEqual(service.getFolderBackupPaths(), []);
-		assert.ok(!fs.existsSync(service.toBackupPath(fooFile.fsPath)));
-		assert.ok(!fs.existsSync(service.toBackupPath(barFile.fsPath)));
+		assertEqualUris(service.getFolderBackupPaths(), []);
+		assert.ok(!fs.existsSync(service.toBackupPath(fooFile)));
+		assert.ok(!fs.existsSync(service.toBackupPath(barFile)));
 
 		// 4) backup workspace path points to a workspace that no longer exists
 		// so it should convert the backup worspace to an empty workspace backup
-		const fileBackups = path.join(service.toBackupPath(fooFile.fsPath), Schemas.file);
-		fs.mkdirSync(service.toBackupPath(fooFile.fsPath));
-		fs.mkdirSync(service.toBackupPath(barFile.fsPath));
+		const fileBackups = path.join(service.toBackupPath(fooFile), Schemas.file);
+		fs.mkdirSync(service.toBackupPath(fooFile));
+		fs.mkdirSync(service.toBackupPath(barFile));
 		fs.mkdirSync(fileBackups);
-		service.registerFolderBackupSync(fooFile.fsPath);
+		service.registerFolderBackupSync(fooFile);
 		assert.equal(service.getFolderBackupPaths().length, 1);
 		assert.equal(service.getEmptyWindowBackupPaths().length, 0);
 		fs.writeFileSync(path.join(fileBackups, 'backup.txt'), '');
@@ -155,32 +180,32 @@ suite('BackupMainService', () => {
 		assert.deepEqual(service.getWorkspaceBackups(), []);
 
 		// 2) backup workspace path exists with empty contents within
-		fs.mkdirSync(service.toBackupPath(fooFile.fsPath));
-		fs.mkdirSync(service.toBackupPath(barFile.fsPath));
+		fs.mkdirSync(service.toBackupPath(fooFile));
+		fs.mkdirSync(service.toBackupPath(barFile));
 		service.registerWorkspaceBackupSync(toWorkspace(fooFile.fsPath));
 		service.registerWorkspaceBackupSync(toWorkspace(barFile.fsPath));
 		service.loadSync();
 		assert.deepEqual(service.getWorkspaceBackups(), []);
-		assert.ok(!fs.existsSync(service.toBackupPath(fooFile.fsPath)));
-		assert.ok(!fs.existsSync(service.toBackupPath(barFile.fsPath)));
+		assert.ok(!fs.existsSync(service.toBackupPath(fooFile)));
+		assert.ok(!fs.existsSync(service.toBackupPath(barFile)));
 
 		// 3) backup workspace path exists with empty folders within
-		fs.mkdirSync(service.toBackupPath(fooFile.fsPath));
-		fs.mkdirSync(service.toBackupPath(barFile.fsPath));
-		fs.mkdirSync(path.join(service.toBackupPath(fooFile.fsPath), Schemas.file));
-		fs.mkdirSync(path.join(service.toBackupPath(barFile.fsPath), Schemas.untitled));
+		fs.mkdirSync(service.toBackupPath(fooFile));
+		fs.mkdirSync(service.toBackupPath(barFile));
+		fs.mkdirSync(path.join(service.toBackupPath(fooFile), Schemas.file));
+		fs.mkdirSync(path.join(service.toBackupPath(barFile), Schemas.untitled));
 		service.registerWorkspaceBackupSync(toWorkspace(fooFile.fsPath));
 		service.registerWorkspaceBackupSync(toWorkspace(barFile.fsPath));
 		service.loadSync();
 		assert.deepEqual(service.getWorkspaceBackups(), []);
-		assert.ok(!fs.existsSync(service.toBackupPath(fooFile.fsPath)));
-		assert.ok(!fs.existsSync(service.toBackupPath(barFile.fsPath)));
+		assert.ok(!fs.existsSync(service.toBackupPath(fooFile)));
+		assert.ok(!fs.existsSync(service.toBackupPath(barFile)));
 
 		// 4) backup workspace path points to a workspace that no longer exists
 		// so it should convert the backup worspace to an empty workspace backup
-		const fileBackups = path.join(service.toBackupPath(fooFile.fsPath), Schemas.file);
-		fs.mkdirSync(service.toBackupPath(fooFile.fsPath));
-		fs.mkdirSync(service.toBackupPath(barFile.fsPath));
+		const fileBackups = path.join(service.toBackupPath(fooFile), Schemas.file);
+		fs.mkdirSync(service.toBackupPath(fooFile));
+		fs.mkdirSync(service.toBackupPath(barFile));
 		fs.mkdirSync(fileBackups);
 		service.registerWorkspaceBackupSync(toWorkspace(fooFile.fsPath));
 		assert.equal(service.getWorkspaceBackups().length, 1);
@@ -192,10 +217,10 @@ suite('BackupMainService', () => {
 	});
 
 	test('service supports to migrate backup data from another location', () => {
-		const backupPathToMigrate = service.toBackupPath(fooFile.fsPath);
+		const backupPathToMigrate = service.toBackupPath(fooFile);
 		fs.mkdirSync(backupPathToMigrate);
 		fs.writeFileSync(path.join(backupPathToMigrate, 'backup.txt'), 'Some Data');
-		service.registerFolderBackupSync(backupPathToMigrate);
+		service.registerFolderBackupSync(Uri.file(backupPathToMigrate));
 
 		const workspaceBackupPath = service.registerWorkspaceBackupSync(toWorkspace(barFile.fsPath), backupPathToMigrate);
 
@@ -208,15 +233,15 @@ suite('BackupMainService', () => {
 	});
 
 	test('service backup migration makes sure to preserve existing backups', () => {
-		const backupPathToMigrate = service.toBackupPath(fooFile.fsPath);
+		const backupPathToMigrate = service.toBackupPath(fooFile);
 		fs.mkdirSync(backupPathToMigrate);
 		fs.writeFileSync(path.join(backupPathToMigrate, 'backup.txt'), 'Some Data');
-		service.registerFolderBackupSync(backupPathToMigrate);
+		service.registerFolderBackupSync(Uri.file(backupPathToMigrate));
 
-		const backupPathToPreserve = service.toBackupPath(barFile.fsPath);
+		const backupPathToPreserve = service.toBackupPath(barFile);
 		fs.mkdirSync(backupPathToPreserve);
 		fs.writeFileSync(path.join(backupPathToPreserve, 'backup.txt'), 'Some Data');
-		service.registerFolderBackupSync(backupPathToPreserve);
+		service.registerFolderBackupSync(Uri.file(backupPathToPreserve));
 
 		const workspaceBackupPath = service.registerWorkspaceBackupSync(toWorkspace(barFile.fsPath), backupPathToMigrate);
 
@@ -229,56 +254,102 @@ suite('BackupMainService', () => {
 		assert.equal(1, fs.readdirSync(path.join(backupHome, emptyBackups[0])).length);
 	});
 
+	suite('migrate folderPath to folderURI', () => {
+
+		test('migration makes sure to preserve existing backups', async () => {
+			if (platform.isLinux) {
+				return; // TODO:Martin #54483 fix tests
+			}
+
+			let path1 = path.join(parentDir, 'folder1').toLowerCase();
+			let path2 = path.join(parentDir, 'folder2').toUpperCase();
+			let uri1 = Uri.file(path1);
+			let uri2 = Uri.file(path2);
+
+			if (!fs.existsSync(path1)) {
+				fs.mkdirSync(path1);
+			}
+			if (!fs.existsSync(path2)) {
+				fs.mkdirSync(path2);
+			}
+			const backupFolder1 = service.toLegacyBackupPath(path1);
+			if (!fs.existsSync(backupFolder1)) {
+				fs.mkdirSync(backupFolder1);
+				fs.mkdirSync(path.join(backupFolder1, Schemas.file));
+				await pfs.writeFile(path.join(backupFolder1, Schemas.file, 'unsaved1.txt'), 'Legacy');
+			}
+			const backupFolder2 = service.toLegacyBackupPath(path2);
+			if (!fs.existsSync(backupFolder2)) {
+				fs.mkdirSync(backupFolder2);
+				fs.mkdirSync(path.join(backupFolder2, Schemas.file));
+				await pfs.writeFile(path.join(backupFolder2, Schemas.file, 'unsaved2.txt'), 'Legacy');
+			}
+
+			const workspacesJson = { rootWorkspaces: [], folderWorkspaces: [path1, path2], emptyWorkspaces: [] };
+			await pfs.writeFile(backupWorkspacesPath, JSON.stringify(workspacesJson)).then(() => {
+				service.loadSync();
+				return pfs.readFile(backupWorkspacesPath, 'utf-8').then(content => {
+					const json = <IBackupWorkspacesFormat>JSON.parse(content);
+					assert.deepEqual(json.folderURIWorkspaces, [uri1.toString(), uri2.toString()]);
+					const newBackupFolder1 = service.toBackupPath(uri1);
+					assert.ok(fs.existsSync(path.join(newBackupFolder1, Schemas.file, 'unsaved1.txt')));
+					const newBackupFolder2 = service.toBackupPath(uri2);
+					assert.ok(fs.existsSync(path.join(newBackupFolder2, Schemas.file, 'unsaved2.txt')));
+				});
+			});
+		});
+	});
+
 	suite('loadSync', () => {
 		test('getFolderBackupPaths() should return [] when workspaces.json doesn\'t exist', () => {
-			assert.deepEqual(service.getFolderBackupPaths(), []);
+			assertEqualUris(service.getFolderBackupPaths(), []);
 		});
 
 		test('getFolderBackupPaths() should return [] when workspaces.json is not properly formed JSON', () => {
 			fs.writeFileSync(backupWorkspacesPath, '');
 			service.loadSync();
-			assert.deepEqual(service.getFolderBackupPaths(), []);
+			assertEqualUris(service.getFolderBackupPaths(), []);
 			fs.writeFileSync(backupWorkspacesPath, '{]');
 			service.loadSync();
-			assert.deepEqual(service.getFolderBackupPaths(), []);
+			assertEqualUris(service.getFolderBackupPaths(), []);
 			fs.writeFileSync(backupWorkspacesPath, 'foo');
 			service.loadSync();
-			assert.deepEqual(service.getFolderBackupPaths(), []);
+			assertEqualUris(service.getFolderBackupPaths(), []);
 		});
 
 		test('getFolderBackupPaths() should return [] when folderWorkspaces in workspaces.json is absent', () => {
 			fs.writeFileSync(backupWorkspacesPath, '{}');
 			service.loadSync();
-			assert.deepEqual(service.getFolderBackupPaths(), []);
+			assertEqualUris(service.getFolderBackupPaths(), []);
 		});
 
 		test('getFolderBackupPaths() should return [] when folderWorkspaces in workspaces.json is not a string array', () => {
 			fs.writeFileSync(backupWorkspacesPath, '{"folderWorkspaces":{}}');
 			service.loadSync();
-			assert.deepEqual(service.getFolderBackupPaths(), []);
+			assertEqualUris(service.getFolderBackupPaths(), []);
 			fs.writeFileSync(backupWorkspacesPath, '{"folderWorkspaces":{"foo": ["bar"]}}');
 			service.loadSync();
-			assert.deepEqual(service.getFolderBackupPaths(), []);
+			assertEqualUris(service.getFolderBackupPaths(), []);
 			fs.writeFileSync(backupWorkspacesPath, '{"folderWorkspaces":{"foo": []}}');
 			service.loadSync();
-			assert.deepEqual(service.getFolderBackupPaths(), []);
+			assertEqualUris(service.getFolderBackupPaths(), []);
 			fs.writeFileSync(backupWorkspacesPath, '{"folderWorkspaces":{"foo": "bar"}}');
 			service.loadSync();
-			assert.deepEqual(service.getFolderBackupPaths(), []);
+			assertEqualUris(service.getFolderBackupPaths(), []);
 			fs.writeFileSync(backupWorkspacesPath, '{"folderWorkspaces":"foo"}');
 			service.loadSync();
-			assert.deepEqual(service.getFolderBackupPaths(), []);
+			assertEqualUris(service.getFolderBackupPaths(), []);
 			fs.writeFileSync(backupWorkspacesPath, '{"folderWorkspaces":1}');
 			service.loadSync();
-			assert.deepEqual(service.getFolderBackupPaths(), []);
+			assertEqualUris(service.getFolderBackupPaths(), []);
 		});
 
 		test('getFolderBackupPaths() should return [] when files.hotExit = "onExitAndWindowClose"', () => {
-			service.registerFolderBackupSync(fooFile.fsPath.toUpperCase());
-			assert.deepEqual(service.getFolderBackupPaths(), [fooFile.fsPath.toUpperCase()]);
+			service.registerFolderBackupSync(Uri.file(fooFile.fsPath.toUpperCase()));
+			assertEqualUris(service.getFolderBackupPaths(), [Uri.file(fooFile.fsPath.toUpperCase())]);
 			configService.setUserConfiguration('files.hotExit', HotExitConfiguration.ON_EXIT_AND_WINDOW_CLOSE);
 			service.loadSync();
-			assert.deepEqual(service.getFolderBackupPaths(), []);
+			assertEqualUris(service.getFolderBackupPaths(), []);
 		});
 
 		test('getWorkspaceBackups() should return [] when workspaces.json doesn\'t exist', () => {
@@ -379,59 +450,82 @@ suite('BackupMainService', () => {
 	});
 
 	suite('dedupeFolderWorkspaces', () => {
-		test('should ignore duplicates on Windows and Mac (folder workspace)', () => {
-			// Skip test on Linux
-			if (platform.isLinux) {
-				return;
-			}
+		test('should ignore duplicates (folder workspace)', async () => {
 
-			const backups: IBackupWorkspacesFormat = {
+			await ensureFolderExists(existingTestFolder1);
+
+			const workspacesJson: IBackupWorkspacesFormat = {
 				rootWorkspaces: [],
-				folderWorkspaces: platform.isWindows ? ['c:\\FOO', 'C:\\FOO', 'c:\\foo'] : ['/FOO', '/foo'],
+				folderURIWorkspaces: [existingTestFolder1.toString(), existingTestFolder1.toString()],
 				emptyWorkspaces: []
 			};
-
-			service.dedupeBackups(backups);
-
-			assert.equal(backups.folderWorkspaces.length, 1);
-			if (platform.isWindows) {
-				assert.deepEqual(backups.folderWorkspaces, ['c:\\FOO'], 'should return the first duplicated entry');
-			} else {
-				assert.deepEqual(backups.folderWorkspaces, ['/FOO'], 'should return the first duplicated entry');
-			}
+			return pfs.writeFile(backupWorkspacesPath, JSON.stringify(workspacesJson)).then(() => {
+				service.loadSync();
+				return pfs.readFile(backupWorkspacesPath, 'utf-8').then(buffer => {
+					const json = <IBackupWorkspacesFormat>JSON.parse(buffer);
+					assert.deepEqual(json.folderURIWorkspaces, [existingTestFolder1.toString()]);
+				});
+			});
 		});
 
-		test('should ignore duplicates on Windows and Mac (root workspace)', () => {
-			// Skip test on Linux
-			if (platform.isLinux) {
-				return;
-			}
+		test('should ignore duplicates on Windows and Mac (folder workspace)', async () => {
 
-			const backups: IBackupWorkspacesFormat = {
-				rootWorkspaces: platform.isWindows ? [toWorkspace('c:\\FOO'), toWorkspace('C:\\FOO'), toWorkspace('c:\\foo')] : [toWorkspace('/FOO'), toWorkspace('/foo')],
-				folderWorkspaces: [],
+			await ensureFolderExists(existingTestFolder1);
+
+			const workspacesJson: IBackupWorkspacesFormat = {
+				rootWorkspaces: [],
+				folderURIWorkspaces: [existingTestFolder1.toString(), existingTestFolder1.toString().toLowerCase()],
 				emptyWorkspaces: []
 			};
+			return pfs.writeFile(backupWorkspacesPath, JSON.stringify(workspacesJson)).then(() => {
+				service.loadSync();
+				return pfs.readFile(backupWorkspacesPath, 'utf-8').then(buffer => {
+					const json = <IBackupWorkspacesFormat>JSON.parse(buffer);
+					assert.deepEqual(json.folderURIWorkspaces, [existingTestFolder1.toString()]);
+				});
+			});
+		});
 
-			service.dedupeBackups(backups);
-
-			assert.equal(backups.rootWorkspaces.length, 1);
-			if (platform.isWindows) {
-				assert.deepEqual(backups.rootWorkspaces.map(r => r.configPath), ['c:\\FOO'], 'should return the first duplicated entry');
-			} else {
-				assert.deepEqual(backups.rootWorkspaces.map(r => r.configPath), ['/FOO'], 'should return the first duplicated entry');
+		test('should ignore duplicates on Windows and Mac (root workspace)', async () => {
+			if (platform.isLinux) {
+				return; // TODO:Martin #54483 fix tests
 			}
+
+			const workspacePath = path.join(parentDir, 'Foo.code-workspace');
+
+			const workspace1 = await ensureWorkspaceExists(toWorkspace(workspacePath));
+			const workspace2 = await ensureWorkspaceExists(toWorkspace(workspacePath.toUpperCase()));
+			const workspace3 = await ensureWorkspaceExists(toWorkspace(workspacePath.toLowerCase()));
+
+			const workspacesJson: IBackupWorkspacesFormat = {
+				rootWorkspaces: [workspace1, workspace2, workspace3],
+				folderURIWorkspaces: [],
+				emptyWorkspaces: []
+			};
+			return pfs.writeFile(backupWorkspacesPath, JSON.stringify(workspacesJson)).then(() => {
+				service.loadSync();
+				return pfs.readFile(backupWorkspacesPath, 'utf-8').then(buffer => {
+					const json = <IBackupWorkspacesFormat>JSON.parse(buffer);
+					assert.equal(json.rootWorkspaces.length, platform.isLinux ? 3 : 1);
+					if (platform.isLinux) {
+						assert.deepEqual(json.rootWorkspaces.map(r => r.configPath), [workspacePath, workspacePath.toUpperCase(), workspacePath.toLowerCase()]);
+					} else {
+						assert.deepEqual(json.rootWorkspaces.map(r => r.configPath), [workspacePath], 'should return the first duplicated entry');
+					}
+				});
+			});
+
 		});
 	});
 
 	suite('registerWindowForBackups', () => {
 		test('should persist paths to workspaces.json (folder workspace)', () => {
-			service.registerFolderBackupSync(fooFile.fsPath);
-			service.registerFolderBackupSync(barFile.fsPath);
-			assert.deepEqual(service.getFolderBackupPaths(), [fooFile.fsPath, barFile.fsPath]);
+			service.registerFolderBackupSync(fooFile);
+			service.registerFolderBackupSync(barFile);
+			assertEqualUris(service.getFolderBackupPaths(), [fooFile, barFile]);
 			return pfs.readFile(backupWorkspacesPath, 'utf-8').then(buffer => {
 				const json = <IBackupWorkspacesFormat>JSON.parse(buffer);
-				assert.deepEqual(json.folderWorkspaces, [fooFile.fsPath, barFile.fsPath]);
+				assert.deepEqual(json.folderURIWorkspaces, [fooFile.toString(), barFile.toString()]);
 			});
 		});
 
@@ -455,11 +549,11 @@ suite('BackupMainService', () => {
 		});
 
 		test('should always store the workspace path in workspaces.json using the case given, regardless of whether the file system is case-sensitive (folder workspace)', () => {
-			service.registerFolderBackupSync(fooFile.fsPath.toUpperCase());
-			assert.deepEqual(service.getFolderBackupPaths(), [fooFile.fsPath.toUpperCase()]);
+			service.registerFolderBackupSync(Uri.file(fooFile.fsPath.toUpperCase()));
+			assertEqualUris(service.getFolderBackupPaths(), [Uri.file(fooFile.fsPath.toUpperCase())]);
 			return pfs.readFile(backupWorkspacesPath, 'utf-8').then(buffer => {
 				const json = <IBackupWorkspacesFormat>JSON.parse(buffer);
-				assert.deepEqual(json.folderWorkspaces, [fooFile.fsPath.toUpperCase()]);
+				assert.deepEqual(json.folderURIWorkspaces, [Uri.file(fooFile.fsPath.toUpperCase()).toString()]);
 			});
 		});
 
@@ -475,16 +569,16 @@ suite('BackupMainService', () => {
 
 	suite('removeBackupPathSync', () => {
 		test('should remove folder workspaces from workspaces.json (folder workspace)', () => {
-			service.registerFolderBackupSync(fooFile.fsPath);
-			service.registerFolderBackupSync(barFile.fsPath);
-			service.removeBackupPathSync(fooFile.fsPath, service.backupsData.folderWorkspaces);
+			service.registerFolderBackupSync(fooFile);
+			service.registerFolderBackupSync(barFile);
+			service.unregisterFolderBackupSync(fooFile);
 			return pfs.readFile(backupWorkspacesPath, 'utf-8').then(buffer => {
 				const json = <IBackupWorkspacesFormat>JSON.parse(buffer);
-				assert.deepEqual(json.folderWorkspaces, [barFile.fsPath]);
-				service.removeBackupPathSync(barFile.fsPath, service.backupsData.folderWorkspaces);
+				assert.deepEqual(json.folderURIWorkspaces, [barFile.toString()]);
+				service.unregisterFolderBackupSync(barFile);
 				return pfs.readFile(backupWorkspacesPath, 'utf-8').then(content => {
 					const json2 = <IBackupWorkspacesFormat>JSON.parse(content);
-					assert.deepEqual(json2.folderWorkspaces, []);
+					assert.deepEqual(json2.folderURIWorkspaces, []);
 				});
 			});
 		});
@@ -494,11 +588,11 @@ suite('BackupMainService', () => {
 			service.registerWorkspaceBackupSync(ws1);
 			const ws2 = toWorkspace(barFile.fsPath);
 			service.registerWorkspaceBackupSync(ws2);
-			service.removeBackupPathSync(ws1, service.backupsData.rootWorkspaces);
+			service.unregisterWorkspaceBackupSync(ws1);
 			return pfs.readFile(backupWorkspacesPath, 'utf-8').then(buffer => {
 				const json = <IBackupWorkspacesFormat>JSON.parse(buffer);
 				assert.deepEqual(json.rootWorkspaces.map(r => r.configPath), [barFile.fsPath]);
-				service.removeBackupPathSync(ws2, service.backupsData.rootWorkspaces);
+				service.unregisterWorkspaceBackupSync(ws2);
 				return pfs.readFile(backupWorkspacesPath, 'utf-8').then(content => {
 					const json2 = <IBackupWorkspacesFormat>JSON.parse(content);
 					assert.deepEqual(json2.rootWorkspaces, []);
@@ -509,11 +603,11 @@ suite('BackupMainService', () => {
 		test('should remove empty workspaces from workspaces.json', () => {
 			service.registerEmptyWindowBackupSync('foo');
 			service.registerEmptyWindowBackupSync('bar');
-			service.removeBackupPathSync('foo', service.backupsData.emptyWorkspaces);
+			service.unregisterEmptyWindowBackupSync('foo');
 			return pfs.readFile(backupWorkspacesPath, 'utf-8').then(buffer => {
 				const json = <IBackupWorkspacesFormat>JSON.parse(buffer);
 				assert.deepEqual(json.emptyWorkspaces, ['bar']);
-				service.removeBackupPathSync('bar', service.backupsData.emptyWorkspaces);
+				service.unregisterEmptyWindowBackupSync('bar');
 				return pfs.readFile(backupWorkspacesPath, 'utf-8').then(content => {
 					const json2 = <IBackupWorkspacesFormat>JSON.parse(content);
 					assert.deepEqual(json2.emptyWorkspaces, []);
@@ -521,23 +615,24 @@ suite('BackupMainService', () => {
 			});
 		});
 
-		test('should fail gracefully when removing a path that doesn\'t exist', () => {
-			const workspacesJson: IBackupWorkspacesFormat = { rootWorkspaces: [], folderWorkspaces: [fooFile.fsPath], emptyWorkspaces: [] };
+		test('should fail gracefully when removing a path that doesn\'t exist', async () => {
+
+			await ensureFolderExists(existingTestFolder1); // make sure backup folder exists, so the folder is not removed on loadSync
+
+			const workspacesJson: IBackupWorkspacesFormat = { rootWorkspaces: [], folderURIWorkspaces: [existingTestFolder1.toString()], emptyWorkspaces: [] };
 			return pfs.writeFile(backupWorkspacesPath, JSON.stringify(workspacesJson)).then(() => {
-				service.removeBackupPathSync(barFile.fsPath, service.backupsData.folderWorkspaces);
-				service.removeBackupPathSync('test', service.backupsData.emptyWorkspaces);
+				service.loadSync();
+				service.unregisterFolderBackupSync(barFile);
+				service.unregisterEmptyWindowBackupSync('test');
 				return pfs.readFile(backupWorkspacesPath, 'utf-8').then(content => {
 					const json = <IBackupWorkspacesFormat>JSON.parse(content);
-					assert.deepEqual(json.folderWorkspaces, [fooFile.fsPath]);
+					assert.deepEqual(json.folderURIWorkspaces, [existingTestFolder1.toString()]);
 				});
 			});
 		});
 	});
 
 	suite('getWorkspaceHash', () => {
-		test('should perform an md5 hash on the path', () => {
-			assert.equal(service.getFolderHash('/foo'), '1effb2475fcfba4f9e8b8a1dbc8f3caf');
-		});
 
 		test('should ignore case on Windows and Mac', () => {
 			// Skip test on Linux
@@ -546,19 +641,19 @@ suite('BackupMainService', () => {
 			}
 
 			if (platform.isMacintosh) {
-				assert.equal(service.getFolderHash('/foo'), service.getFolderHash('/FOO'));
+				assert.equal(service.getFolderHash(Uri.file('/foo')), service.getFolderHash(Uri.file('/FOO')));
 			}
 
 			if (platform.isWindows) {
-				assert.equal(service.getFolderHash('c:\\foo'), service.getFolderHash('C:\\FOO'));
+				assert.equal(service.getFolderHash(Uri.file('c:\\foo')), service.getFolderHash(Uri.file('C:\\FOO')));
 			}
 		});
 	});
 
 	suite('mixed path casing', () => {
 		test('should handle case insensitive paths properly (registerWindowForBackupsSync) (folder workspace)', () => {
-			service.registerFolderBackupSync(fooFile.fsPath);
-			service.registerFolderBackupSync(fooFile.fsPath.toUpperCase());
+			service.registerFolderBackupSync(fooFile);
+			service.registerFolderBackupSync(Uri.file(fooFile.fsPath.toUpperCase()));
 
 			if (platform.isLinux) {
 				assert.equal(service.getFolderBackupPaths().length, 2);
@@ -581,13 +676,13 @@ suite('BackupMainService', () => {
 		test('should handle case insensitive paths properly (removeBackupPathSync) (folder workspace)', () => {
 
 			// same case
-			service.registerFolderBackupSync(fooFile.fsPath);
-			service.removeBackupPathSync(fooFile.fsPath, service.backupsData.folderWorkspaces);
+			service.registerFolderBackupSync(fooFile);
+			service.unregisterFolderBackupSync(fooFile);
 			assert.equal(service.getFolderBackupPaths().length, 0);
 
 			// mixed case
-			service.registerFolderBackupSync(fooFile.fsPath);
-			service.removeBackupPathSync(fooFile.fsPath.toUpperCase(), service.backupsData.folderWorkspaces);
+			service.registerFolderBackupSync(fooFile);
+			service.unregisterFolderBackupSync(Uri.file(fooFile.fsPath.toUpperCase()));
 
 			if (platform.isLinux) {
 				assert.equal(service.getFolderBackupPaths().length, 1);
diff --git a/src/vs/platform/clipboard/common/clipboardService.ts b/src/vs/platform/clipboard/common/clipboardService.ts
index d93af3a745f..13b9c84de3c 100644
--- a/src/vs/platform/clipboard/common/clipboardService.ts
+++ b/src/vs/platform/clipboard/common/clipboardService.ts
@@ -6,7 +6,7 @@
 'use strict';
 
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 
 export const IClipboardService = createDecorator<IClipboardService>('clipboardService');
 
diff --git a/src/vs/platform/clipboard/electron-browser/clipboardService.ts b/src/vs/platform/clipboard/electron-browser/clipboardService.ts
index d59c3edaf4d..b2861173923 100644
--- a/src/vs/platform/clipboard/electron-browser/clipboardService.ts
+++ b/src/vs/platform/clipboard/electron-browser/clipboardService.ts
@@ -7,7 +7,7 @@
 
 import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
 import { clipboard } from 'electron';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { isMacintosh } from 'vs/base/common/platform';
 
 export class ClipboardService implements IClipboardService {
diff --git a/src/vs/platform/commands/common/commands.ts b/src/vs/platform/commands/common/commands.ts
index 7d52c3ecaa0..b912a022dfc 100644
--- a/src/vs/platform/commands/common/commands.ts
+++ b/src/vs/platform/commands/common/commands.ts
@@ -5,7 +5,7 @@
 'use strict';
 
 import { TPromise } from 'vs/base/common/winjs.base';
-import { IDisposable } from 'vs/base/common/lifecycle';
+import { IDisposable, toDisposable } from 'vs/base/common/lifecycle';
 import { TypeConstraint, validateConstraints } from 'vs/base/common/types';
 import { ServicesAccessor, createDecorator } from 'vs/platform/instantiation/common/instantiation';
 import { Event } from 'vs/base/common/event';
@@ -46,6 +46,7 @@ export interface ICommandHandlerDescription {
 export interface ICommandRegistry {
 	registerCommand(id: string, command: ICommandHandler): IDisposable;
 	registerCommand(command: ICommand): IDisposable;
+	registerCommandAlias(oldId: string, newId: string): IDisposable;
 	getCommand(id: string): ICommand;
 	getCommands(): ICommandsMap;
 }
@@ -91,14 +92,18 @@ export const CommandsRegistry: ICommandRegistry = new class implements ICommandR
 
 		let removeFn = commands.unshift(idOrCommand);
 
-		return {
-			dispose: () => {
-				removeFn();
-				if (this._commands.get(id).isEmpty()) {
-					this._commands.delete(id);
-				}
+		return toDisposable(() => {
+			removeFn();
+			if (this._commands.get(id).isEmpty()) {
+				this._commands.delete(id);
 			}
-		};
+		});
+	}
+
+	registerCommandAlias(oldId: string, newId: string): IDisposable {
+		return CommandsRegistry.registerCommand(oldId, (accessor, ...args) => {
+			accessor.get(ICommandService).executeCommand(newId, ...args);
+		});
 	}
 
 	getCommand(id: string): ICommand {
diff --git a/src/vs/platform/configuration/common/configuration.ts b/src/vs/platform/configuration/common/configuration.ts
index 6aa47675ddb..13f6cdf5146 100644
--- a/src/vs/platform/configuration/common/configuration.ts
+++ b/src/vs/platform/configuration/common/configuration.ts
@@ -6,7 +6,7 @@
 import { TPromise } from 'vs/base/common/winjs.base';
 import * as objects from 'vs/base/common/objects';
 import * as types from 'vs/base/common/types';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { Event } from 'vs/base/common/event';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
@@ -28,13 +28,22 @@ export interface IConfigurationOverrides {
 	resource?: URI;
 }
 
-export enum ConfigurationTarget {
+export const enum ConfigurationTarget {
 	USER = 1,
 	WORKSPACE,
 	WORKSPACE_FOLDER,
 	DEFAULT,
 	MEMORY
 }
+export function ConfigurationTargetToString(configurationTarget: ConfigurationTarget) {
+	switch (configurationTarget) {
+		case ConfigurationTarget.USER: return 'USER';
+		case ConfigurationTarget.WORKSPACE: return 'WORKSPACE';
+		case ConfigurationTarget.WORKSPACE_FOLDER: return 'WORKSPACE_FOLDER';
+		case ConfigurationTarget.DEFAULT: return 'DEFAULT';
+		case ConfigurationTarget.MEMORY: return 'MEMORY';
+	}
+}
 
 export interface IConfigurationChangeEvent {
 
diff --git a/src/vs/platform/configuration/common/configurationModels.ts b/src/vs/platform/configuration/common/configurationModels.ts
index 9944e02325f..acf80b147b8 100644
--- a/src/vs/platform/configuration/common/configurationModels.ts
+++ b/src/vs/platform/configuration/common/configurationModels.ts
@@ -9,7 +9,7 @@ import { ResourceMap } from 'vs/base/common/map';
 import * as arrays from 'vs/base/common/arrays';
 import * as types from 'vs/base/common/types';
 import * as objects from 'vs/base/common/objects';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { OVERRIDE_PROPERTY_PATTERN } from 'vs/platform/configuration/common/configurationRegistry';
 import { IOverrides, overrideIdentifierFromKey, addToValueTree, toValuesTree, IConfigurationModel, getConfigurationValue, IConfigurationOverrides, IConfigurationData, getDefaultValues, getConfigurationKeys, IConfigurationChangeEvent, ConfigurationTarget, removeFromValueTree, toOverrides } from 'vs/platform/configuration/common/configuration';
 import { Workspace } from 'vs/platform/workspace/common/workspace';
diff --git a/src/vs/platform/configuration/common/configurationRegistry.ts b/src/vs/platform/configuration/common/configurationRegistry.ts
index 30d8205f48d..a9e2e987d88 100644
--- a/src/vs/platform/configuration/common/configurationRegistry.ts
+++ b/src/vs/platform/configuration/common/configurationRegistry.ts
@@ -34,6 +34,12 @@ export interface IConfigurationRegistry {
 	 */
 	notifyConfigurationSchemaUpdated(configuration: IConfigurationNode): void;
 
+	/**
+	 * Event that fires whenver a configuration has been
+	 * registered.
+	 */
+	onDidSchemaChange: Event<void>;
+
 	/**
 	 * Event that fires whenver a configuration has been
 	 * registered.
@@ -61,7 +67,7 @@ export interface IConfigurationRegistry {
 	registerOverrideIdentifiers(identifiers: string[]): void;
 }
 
-export enum ConfigurationScope {
+export const enum ConfigurationScope {
 	APPLICATION = 1,
 	WINDOW,
 	RESOURCE,
@@ -70,8 +76,8 @@ export enum ConfigurationScope {
 export interface IConfigurationPropertySchema extends IJSONSchema {
 	overridable?: boolean;
 	scope?: ConfigurationScope;
-	notMultiRootAdopted?: boolean;
 	included?: boolean;
+	tags?: string[];
 }
 
 export interface IConfigurationNode {
@@ -84,6 +90,7 @@ export interface IConfigurationNode {
 	allOf?: IConfigurationNode[];
 	overridable?: boolean;
 	scope?: ConfigurationScope;
+	contributedByExtension?: boolean;
 }
 
 export interface IDefaultConfigurationExtension {
@@ -109,6 +116,9 @@ class ConfigurationRegistry implements IConfigurationRegistry {
 	private overrideIdentifiers: string[] = [];
 	private overridePropertyPattern: string;
 
+	private readonly _onDidSchemaChange: Emitter<void> = new Emitter<void>();
+	readonly onDidSchemaChange: Event<void> = this._onDidSchemaChange.event;
+
 	private readonly _onDidRegisterConfiguration: Emitter<string[]> = new Emitter<string[]>();
 	readonly onDidRegisterConfiguration: Event<string[]> = this._onDidRegisterConfiguration.event;
 
@@ -175,7 +185,7 @@ class ConfigurationRegistry implements IConfigurationRegistry {
 	}
 
 	private validateAndRegisterProperties(configuration: IConfigurationNode, validate: boolean = true, scope: ConfigurationScope = ConfigurationScope.WINDOW, overridable: boolean = false): string[] {
-		scope = configuration.scope !== void 0 && configuration.scope !== null ? configuration.scope : scope;
+		scope = types.isUndefinedOrNull(configuration.scope) ? scope : configuration.scope;
 		overridable = configuration.overridable || overridable;
 		let propertyKeys = [];
 		let properties = configuration.properties;
@@ -197,8 +207,11 @@ class ConfigurationRegistry implements IConfigurationRegistry {
 				if (overridable) {
 					property.overridable = true;
 				}
-				if (property.scope === void 0) {
-					property.scope = scope;
+
+				if (OVERRIDE_PROPERTY_PATTERN.test(key)) {
+					property.scope = void 0; // No scope for overridable properties `[${identifier}]`
+				} else {
+					property.scope = types.isUndefinedOrNull(property.scope) ? scope : property.scope;
 				}
 
 				// Add to properties maps
@@ -239,7 +252,7 @@ class ConfigurationRegistry implements IConfigurationRegistry {
 		function register(configuration: IConfigurationNode) {
 			let properties = configuration.properties;
 			if (properties) {
-				for (let key in properties) {
+				for (const key in properties) {
 					allSettings.properties[key] = properties[key];
 					switch (properties[key].scope) {
 						case ConfigurationScope.APPLICATION:
@@ -260,6 +273,7 @@ class ConfigurationRegistry implements IConfigurationRegistry {
 			}
 		}
 		register(configuration);
+		this._onDidSchemaChange.fire();
 	}
 
 	private updateSchemaForOverrideSettingsConfiguration(configuration: IConfigurationNode): void {
@@ -291,6 +305,8 @@ class ConfigurationRegistry implements IConfigurationRegistry {
 		applicationSettings.patternProperties[this.overridePropertyPattern] = patternProperties;
 		windowSettings.patternProperties[this.overridePropertyPattern] = patternProperties;
 		resourceSettings.patternProperties[this.overridePropertyPattern] = patternProperties;
+
+		this._onDidSchemaChange.fire();
 	}
 
 	private update(configuration: IConfigurationNode): void {
diff --git a/src/vs/platform/configuration/test/common/configurationModels.test.ts b/src/vs/platform/configuration/test/common/configurationModels.test.ts
index 20c2f5c5135..b7fa775beaf 100644
--- a/src/vs/platform/configuration/test/common/configurationModels.test.ts
+++ b/src/vs/platform/configuration/test/common/configurationModels.test.ts
@@ -8,7 +8,7 @@ import * as assert from 'assert';
 import { ConfigurationModel, DefaultConfigurationModel, ConfigurationChangeEvent, ConfigurationModelParser } from 'vs/platform/configuration/common/configurationModels';
 import { Extensions, IConfigurationRegistry } from 'vs/platform/configuration/common/configurationRegistry';
 import { Registry } from 'vs/platform/registry/common/platform';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 
 suite('ConfigurationModel', () => {
 
diff --git a/src/vs/platform/configuration/test/common/testConfigurationService.ts b/src/vs/platform/configuration/test/common/testConfigurationService.ts
index 90c2324afe9..8c2a0fed9da 100644
--- a/src/vs/platform/configuration/test/common/testConfigurationService.ts
+++ b/src/vs/platform/configuration/test/common/testConfigurationService.ts
@@ -6,7 +6,7 @@
 'use strict';
 
 import { TernarySearchTree } from 'vs/base/common/map';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { getConfigurationKeys, IConfigurationOverrides, IConfigurationService, getConfigurationValue, isConfigurationOverrides } from 'vs/platform/configuration/common/configuration';
 
diff --git a/src/vs/platform/contextkey/browser/contextKeyService.ts b/src/vs/platform/contextkey/browser/contextKeyService.ts
index b661d0e0c0e..2ac546ff0c0 100644
--- a/src/vs/platform/contextkey/browser/contextKeyService.ts
+++ b/src/vs/platform/contextkey/browser/contextKeyService.ts
@@ -331,6 +331,7 @@ class ScopedContextKeyService extends AbstractContextKeyService {
 		this._parent.disposeContext(this._myContextId);
 		if (this._domNode) {
 			this._domNode.removeAttribute(KEYBINDING_CONTEXT_ATTR);
+			this._domNode = undefined;
 		}
 	}
 
diff --git a/src/vs/platform/contextkey/common/contextkey.ts b/src/vs/platform/contextkey/common/contextkey.ts
index 33888854f2c..5bc252f5502 100644
--- a/src/vs/platform/contextkey/common/contextkey.ts
+++ b/src/vs/platform/contextkey/common/contextkey.ts
@@ -8,7 +8,7 @@ import { createDecorator } from 'vs/platform/instantiation/common/instantiation'
 import { Event } from 'vs/base/common/event';
 import { isFalsyOrWhitespace } from 'vs/base/common/strings';
 
-export enum ContextKeyExprType {
+export const enum ContextKeyExprType {
 	Defined = 1,
 	Not = 2,
 	Equals = 3,
diff --git a/src/vs/platform/contextview/browser/contextMenuHandler.ts b/src/vs/platform/contextview/browser/contextMenuHandler.ts
index c0dd673a14d..0ae68867b5c 100644
--- a/src/vs/platform/contextview/browser/contextMenuHandler.ts
+++ b/src/vs/platform/contextview/browser/contextMenuHandler.ts
@@ -6,16 +6,16 @@
 'use strict';
 
 import 'vs/css!./contextMenuHandler';
-import { $, Builder } from 'vs/base/browser/builder';
-import { combinedDisposable, IDisposable } from 'vs/base/common/lifecycle';
+import { combinedDisposable, IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { StandardMouseEvent } from 'vs/base/browser/mouseEvent';
-import { IActionRunner, ActionRunner, IAction, IRunEvent } from 'vs/base/common/actions';
+import { ActionRunner, IAction, IRunEvent } from 'vs/base/common/actions';
 import { Menu } from 'vs/base/browser/ui/menu/menu';
 
 import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { INotificationService } from 'vs/platform/notification/common/notification';
 import { IContextMenuDelegate } from 'vs/base/browser/contextmenu';
+import { addDisposableListener } from 'vs/base/browser/dom';
 
 export class ContextMenuHandler {
 
@@ -23,10 +23,10 @@ export class ContextMenuHandler {
 	private notificationService: INotificationService;
 	private telemetryService: ITelemetryService;
 
-	private actionRunner: IActionRunner;
-	private $el: Builder;
+	private element: HTMLElement;
+	private elementDisposable: IDisposable;
 	private menuContainerElement: HTMLElement;
-	private toDispose: IDisposable[];
+	private focusToReturn: HTMLElement;
 
 	constructor(element: HTMLElement, contextViewService: IContextViewService, telemetryService: ITelemetryService, notificationService: INotificationService) {
 		this.setContainer(element);
@@ -35,56 +35,28 @@ export class ContextMenuHandler {
 		this.telemetryService = telemetryService;
 		this.notificationService = notificationService;
 
-		this.actionRunner = new ActionRunner();
 		this.menuContainerElement = null;
-		this.toDispose = [];
-
-		let hideViewOnRun = false;
-
-		this.toDispose.push(this.actionRunner.onDidBeforeRun((e: IRunEvent) => {
-			if (this.telemetryService) {
-				/* __GDPR__
-					"workbenchActionExecuted" : {
-						"id" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-						"from": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-					}
-				*/
-				this.telemetryService.publicLog('workbenchActionExecuted', { id: e.action.id, from: 'contextMenu' });
-			}
-
-			hideViewOnRun = !!(<any>e).retainActionItem;
-
-			if (!hideViewOnRun) {
-				this.contextViewService.hideContextView(false);
-			}
-		}));
-
-		this.toDispose.push(this.actionRunner.onDidRun((e: IRunEvent) => {
-			if (hideViewOnRun) {
-				this.contextViewService.hideContextView(false);
-			}
-
-			hideViewOnRun = false;
-
-			if (e.error && this.notificationService) {
-				this.notificationService.error(e.error);
-			}
-		}));
 	}
 
 	public setContainer(container: HTMLElement): void {
-		if (this.$el) {
-			this.$el.off(['click', 'mousedown']);
-			this.$el = null;
+		if (this.element) {
+			this.elementDisposable = dispose(this.elementDisposable);
+			this.element = null;
 		}
 		if (container) {
-			this.$el = $(container);
-			this.$el.on('mousedown', (e: Event) => this.onMouseDown(e as MouseEvent));
+			this.element = container;
+			this.elementDisposable = addDisposableListener(this.element, 'mousedown', (e) => this.onMouseDown(e as MouseEvent));
 		}
 	}
 
 	public showContextMenu(delegate: IContextMenuDelegate): void {
-		delegate.getActions().done((actions: IAction[]) => {
+		delegate.getActions().then((actions: IAction[]) => {
+			if (!actions.length) {
+				return; // Don't render an empty context menu
+			}
+
+			this.focusToReturn = document.activeElement as HTMLElement;
+
 			this.contextViewService.showContextView({
 				getAnchor: () => delegate.getAnchor(),
 				canRelayout: false,
@@ -98,23 +70,25 @@ export class ContextMenuHandler {
 						container.className += ' ' + className;
 					}
 
-					let menu = new Menu(container, actions, {
+					const menuDisposables: IDisposable[] = [];
+
+					const actionRunner = delegate.actionRunner || new ActionRunner();
+					actionRunner.onDidBeforeRun(this.onActionRun, this, menuDisposables);
+					actionRunner.onDidRun(this.onDidActionRun, this, menuDisposables);
+
+					const menu = new Menu(container, actions, {
 						actionItemProvider: delegate.getActionItem,
 						context: delegate.getActionsContext ? delegate.getActionsContext() : null,
-						actionRunner: this.actionRunner
+						actionRunner,
+						getKeyBinding: delegate.getKeyBinding
 					});
 
-					let listener1 = menu.onDidCancel(() => {
-						this.contextViewService.hideContextView(true);
-					});
+					menu.onDidCancel(() => this.contextViewService.hideContextView(true), null, menuDisposables);
+					menu.onDidBlur(() => this.contextViewService.hideContextView(true), null, menuDisposables);
 
-					let listener2 = menu.onDidBlur(() => {
-						this.contextViewService.hideContextView(true);
-					});
+					menu.focus(!!delegate.autoSelectFirstItem);
 
-					menu.focus();
-
-					return combinedDisposable([listener1, listener2, menu]);
+					return combinedDisposable([...menuDisposables, menu]);
 				},
 
 				onHide: (didCancel?: boolean) => {
@@ -128,6 +102,31 @@ export class ContextMenuHandler {
 		});
 	}
 
+	private onActionRun(e: IRunEvent): void {
+		if (this.telemetryService) {
+			/* __GDPR__
+				"workbenchActionExecuted" : {
+					"id" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+					"from": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+				}
+			*/
+			this.telemetryService.publicLog('workbenchActionExecuted', { id: e.action.id, from: 'contextMenu' });
+		}
+
+		this.contextViewService.hideContextView(false);
+
+		// Restore focus here
+		if (this.focusToReturn) {
+			this.focusToReturn.focus();
+		}
+	}
+
+	private onDidActionRun(e: IRunEvent): void {
+		if (e.error && this.notificationService) {
+			this.notificationService.error(e.error);
+		}
+	}
+
 	private onMouseDown(e: MouseEvent): void {
 		if (!this.menuContainerElement) {
 			return;
diff --git a/src/vs/platform/diagnostics/electron-main/diagnosticsService.ts b/src/vs/platform/diagnostics/electron-main/diagnosticsService.ts
new file mode 100644
index 00000000000..c02bebc7e24
--- /dev/null
+++ b/src/vs/platform/diagnostics/electron-main/diagnosticsService.ts
@@ -0,0 +1,322 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+import { WorkspaceStats, collectWorkspaceStats, collectLaunchConfigs, WorkspaceStatItem } from 'vs/base/node/stats';
+import { IMainProcessInfo } from 'vs/platform/launch/electron-main/launchService';
+import { ProcessItem, listProcesses } from 'vs/base/node/ps';
+import product from 'vs/platform/node/product';
+import pkg from 'vs/platform/node/package';
+import * as os from 'os';
+import { virtualMachineHint } from 'vs/base/node/id';
+import { repeat, pad } from 'vs/base/common/strings';
+import { isWindows } from 'vs/base/common/platform';
+import { app } from 'electron';
+import { basename } from 'path';
+import { URI } from 'vs/base/common/uri';
+import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
+
+export const ID = 'diagnosticsService';
+export const IDiagnosticsService = createDecorator<IDiagnosticsService>(ID);
+
+export interface IDiagnosticsService {
+	_serviceBrand: any;
+
+	formatEnvironment(info: IMainProcessInfo): string;
+	getPerformanceInfo(info: IMainProcessInfo): Promise<PerformanceInfo>;
+	getSystemInfo(info: IMainProcessInfo): SystemInfo;
+	printDiagnostics(info: IMainProcessInfo): Promise<any>;
+}
+
+export interface VersionInfo {
+	vscodeVersion: string;
+	os: string;
+}
+
+export interface SystemInfo {
+	CPUs?: string;
+	'Memory (System)': string;
+	'Load (avg)'?: string;
+	VM: string;
+	'Screen Reader': string;
+	'Process Argv': string;
+	'GPU Status': Electron.GPUFeatureStatus;
+}
+
+export interface ProcessInfo {
+	cpu: number;
+	memory: number;
+	pid: number;
+	name: string;
+}
+
+export interface PerformanceInfo {
+	processInfo?: string;
+	workspaceInfo?: string;
+}
+
+export class DiagnosticsService implements IDiagnosticsService {
+
+	_serviceBrand: any;
+
+	formatEnvironment(info: IMainProcessInfo): string {
+		const MB = 1024 * 1024;
+		const GB = 1024 * MB;
+
+		const output: string[] = [];
+		output.push(`Version:          ${pkg.name} ${pkg.version} (${product.commit || 'Commit unknown'}, ${product.date || 'Date unknown'})`);
+		output.push(`OS Version:       ${os.type()} ${os.arch()} ${os.release()}`);
+		const cpus = os.cpus();
+		if (cpus && cpus.length > 0) {
+			output.push(`CPUs:             ${cpus[0].model} (${cpus.length} x ${cpus[0].speed})`);
+		}
+		output.push(`Memory (System):  ${(os.totalmem() / GB).toFixed(2)}GB (${(os.freemem() / GB).toFixed(2)}GB free)`);
+		if (!isWindows) {
+			output.push(`Load (avg):       ${os.loadavg().map(l => Math.round(l)).join(', ')}`); // only provided on Linux/macOS
+		}
+		output.push(`VM:               ${Math.round((virtualMachineHint.value() * 100))}%`);
+		output.push(`Screen Reader:    ${app.isAccessibilitySupportEnabled() ? 'yes' : 'no'}`);
+		output.push(`Process Argv:     ${info.mainArguments.join(' ')}`);
+		output.push(`GPU Status:       ${this.expandGPUFeatures()}`);
+
+		return output.join('\n');
+	}
+
+	getPerformanceInfo(info: IMainProcessInfo): Promise<PerformanceInfo> {
+		return listProcesses(info.mainPID).then(rootProcess => {
+			const workspaceInfoMessages = [];
+
+			// Workspace Stats
+			const workspaceStatPromises = [];
+			if (info.windows.some(window => window.folderURIs && window.folderURIs.length > 0)) {
+				info.windows.forEach(window => {
+					if (window.folderURIs.length === 0) {
+						return;
+					}
+
+					workspaceInfoMessages.push(`|  Window (${window.title})`);
+
+					window.folderURIs.forEach(uriComponents => {
+						const folderUri = URI.revive(uriComponents);
+						if (folderUri.scheme === 'file') {
+							const folder = folderUri.fsPath;
+							workspaceStatPromises.push(collectWorkspaceStats(folder, ['node_modules', '.git']).then(async stats => {
+
+								let countMessage = `${stats.fileCount} files`;
+								if (stats.maxFilesReached) {
+									countMessage = `more than ${countMessage}`;
+								}
+								workspaceInfoMessages.push(`|    Folder (${basename(folder)}): ${countMessage}`);
+								workspaceInfoMessages.push(this.formatWorkspaceStats(stats));
+
+								const launchConfigs = await collectLaunchConfigs(folder);
+								if (launchConfigs.length > 0) {
+									workspaceInfoMessages.push(this.formatLaunchConfigs(launchConfigs));
+								}
+							}));
+						} else {
+							workspaceInfoMessages.push(`|    Folder (${folderUri.toString()}): RPerformance stats not available.`);
+						}
+					});
+				});
+			}
+
+			return Promise.all(workspaceStatPromises).then(() => {
+				return {
+					processInfo: this.formatProcessList(info, rootProcess),
+					workspaceInfo: workspaceInfoMessages.join('\n')
+				};
+			}).catch(error => {
+				return {
+					processInfo: this.formatProcessList(info, rootProcess),
+					workspaceInfo: `Unable to calculate workspace stats: ${error}`
+				};
+			});
+		});
+	}
+
+	getSystemInfo(info: IMainProcessInfo): SystemInfo {
+		const MB = 1024 * 1024;
+		const GB = 1024 * MB;
+
+		const systemInfo: SystemInfo = {
+			'Memory (System)': `${(os.totalmem() / GB).toFixed(2)}GB (${(os.freemem() / GB).toFixed(2)}GB free)`,
+			VM: `${Math.round((virtualMachineHint.value() * 100))}%`,
+			'Screen Reader': `${app.isAccessibilitySupportEnabled() ? 'yes' : 'no'}`,
+			'Process Argv': `${info.mainArguments.join(' ')}`,
+			'GPU Status': app.getGPUFeatureStatus()
+		};
+
+		const cpus = os.cpus();
+		if (cpus && cpus.length > 0) {
+			systemInfo.CPUs = `${cpus[0].model} (${cpus.length} x ${cpus[0].speed})`;
+		}
+
+		if (!isWindows) {
+			systemInfo['Load (avg)'] = `${os.loadavg().map(l => Math.round(l)).join(', ')}`;
+		}
+
+
+		return systemInfo;
+	}
+
+	printDiagnostics(info: IMainProcessInfo): Promise<any> {
+		return listProcesses(info.mainPID).then(rootProcess => {
+
+			// Environment Info
+			console.log('');
+			console.log(this.formatEnvironment(info));
+
+			// Process List
+			console.log('');
+			console.log(this.formatProcessList(info, rootProcess));
+
+			// Workspace Stats
+			const workspaceStatPromises = [];
+			if (info.windows.some(window => window.folderURIs && window.folderURIs.length > 0)) {
+				console.log('');
+				console.log('Workspace Stats: ');
+				info.windows.forEach(window => {
+					if (window.folderURIs.length === 0) {
+						return;
+					}
+
+					console.log(`|  Window (${window.title})`);
+
+					window.folderURIs.forEach(uriComponents => {
+						const folderUri = URI.revive(uriComponents);
+						if (folderUri.scheme === 'file') {
+							const folder = folderUri.fsPath;
+							workspaceStatPromises.push(collectWorkspaceStats(folder, ['node_modules', '.git']).then(async stats => {
+								let countMessage = `${stats.fileCount} files`;
+								if (stats.maxFilesReached) {
+									countMessage = `more than ${countMessage}`;
+								}
+								console.log(`|    Folder (${basename(folder)}): ${countMessage}`);
+								console.log(this.formatWorkspaceStats(stats));
+
+								await collectLaunchConfigs(folder).then(launchConfigs => {
+									if (launchConfigs.length > 0) {
+										console.log(this.formatLaunchConfigs(launchConfigs));
+									}
+								});
+							}).catch(error => {
+								console.log(`|      Error: Unable to collect workspace stats for folder ${folder} (${error.toString()})`);
+							}));
+						} else {
+							console.log(`|    Folder (${folderUri.toString()}): Workspace stats not available.`);
+						}
+					});
+				});
+			}
+
+			return Promise.all(workspaceStatPromises).then(() => {
+				console.log('');
+				console.log('');
+			});
+		});
+	}
+
+	private formatWorkspaceStats(workspaceStats: WorkspaceStats): string {
+		const output: string[] = [];
+		const lineLength = 60;
+		let col = 0;
+
+		const appendAndWrap = (name: string, count: number) => {
+			const item = ` ${name}(${count})`;
+
+			if (col + item.length > lineLength) {
+				output.push(line);
+				line = '|                 ';
+				col = line.length;
+			}
+			else {
+				col += item.length;
+			}
+			line += item;
+		};
+
+		// File Types
+		let line = '|      File types:';
+		const maxShown = 10;
+		let max = workspaceStats.fileTypes.length > maxShown ? maxShown : workspaceStats.fileTypes.length;
+		for (let i = 0; i < max; i++) {
+			const item = workspaceStats.fileTypes[i];
+			appendAndWrap(item.name, item.count);
+		}
+		output.push(line);
+
+		// Conf Files
+		if (workspaceStats.configFiles.length >= 0) {
+			line = '|      Conf files:';
+			col = 0;
+			workspaceStats.configFiles.forEach((item) => {
+				appendAndWrap(item.name, item.count);
+			});
+			output.push(line);
+		}
+
+		return output.join('\n');
+	}
+
+	private formatLaunchConfigs(configs: WorkspaceStatItem[]): string {
+		const output: string[] = [];
+		let line = '|      Launch Configs:';
+		configs.forEach(each => {
+			const item = each.count > 1 ? ` ${each.name}(${each.count})` : ` ${each.name}`;
+			line += item;
+		});
+		output.push(line);
+		return output.join('\n');
+	}
+
+	private expandGPUFeatures(): string {
+		const gpuFeatures = app.getGPUFeatureStatus();
+		const longestFeatureName = Math.max(...Object.keys(gpuFeatures).map(feature => feature.length));
+		// Make columns aligned by adding spaces after feature name
+		return Object.keys(gpuFeatures).map(feature => `${feature}:  ${repeat(' ', longestFeatureName - feature.length)}  ${gpuFeatures[feature]}`).join('\n                  ');
+	}
+
+	private formatProcessList(info: IMainProcessInfo, rootProcess: ProcessItem): string {
+		const mapPidToWindowTitle = new Map<number, string>();
+		info.windows.forEach(window => mapPidToWindowTitle.set(window.pid, window.title));
+
+		const output: string[] = [];
+
+		output.push('CPU %\tMem MB\t   PID\tProcess');
+
+		if (rootProcess) {
+			this.formatProcessItem(mapPidToWindowTitle, output, rootProcess, 0);
+		}
+
+		return output.join('\n');
+	}
+
+	private formatProcessItem(mapPidToWindowTitle: Map<number, string>, output: string[], item: ProcessItem, indent: number): void {
+		const isRoot = (indent === 0);
+
+		const MB = 1024 * 1024;
+
+		// Format name with indent
+		let name: string;
+		if (isRoot) {
+			name = `${product.applicationName} main`;
+		} else {
+			name = `${repeat('  ', indent)} ${item.name}`;
+
+			if (item.name === 'window') {
+				name = `${name} (${mapPidToWindowTitle.get(item.pid)})`;
+			}
+		}
+		const memory = process.platform === 'win32' ? item.mem : (os.totalmem() * (item.mem / 100));
+		output.push(`${pad(Number(item.load.toFixed(0)), 5, ' ')}\t${pad(Number((memory / MB).toFixed(0)), 6, ' ')}\t${pad(Number((item.pid).toFixed(0)), 6, ' ')}\t${name}`);
+
+		// Recurse into children if any
+		if (Array.isArray(item.children)) {
+			item.children.forEach(child => this.formatProcessItem(mapPidToWindowTitle, output, child, indent + 1));
+		}
+	}
+}
diff --git a/src/vs/platform/dialogs/common/dialogIpc.ts b/src/vs/platform/dialogs/common/dialogIpc.ts
deleted file mode 100644
index 7d260b4e8f8..00000000000
--- a/src/vs/platform/dialogs/common/dialogIpc.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-'use strict';
-
-import { TPromise } from 'vs/base/common/winjs.base';
-import { IChannel } from 'vs/base/parts/ipc/common/ipc';
-import { IDialogService, IConfirmation, IConfirmationResult } from 'vs/platform/dialogs/common/dialogs';
-import Severity from 'vs/base/common/severity';
-
-export interface IDialogChannel extends IChannel {
-	call(command: 'show'): TPromise<number>;
-	call(command: 'confirm'): TPromise<IConfirmationResult>;
-	call(command: string, arg?: any): TPromise<any>;
-}
-
-export class DialogChannel implements IDialogChannel {
-
-	constructor(@IDialogService private dialogService: IDialogService) {
-	}
-
-	call(command: string, args?: any[]): TPromise<any> {
-		switch (command) {
-			case 'show': return this.dialogService.show(args[0], args[1], args[2]);
-			case 'confirm': return this.dialogService.confirm(args[0]);
-		}
-		return TPromise.wrapError(new Error('invalid command'));
-	}
-}
-
-export class DialogChannelClient implements IDialogService {
-
-	_serviceBrand: any;
-
-	constructor(private channel: IDialogChannel) { }
-
-	show(severity: Severity, message: string, options: string[]): TPromise<number> {
-		return this.channel.call('show', [severity, message, options]);
-	}
-
-	confirm(confirmation: IConfirmation): TPromise<IConfirmationResult> {
-		return this.channel.call('confirm', [confirmation]);
-	}
-}
\ No newline at end of file
diff --git a/src/vs/platform/dialogs/common/dialogs.ts b/src/vs/platform/dialogs/common/dialogs.ts
index f5b0f0f5462..a1b43d7785f 100644
--- a/src/vs/platform/dialogs/common/dialogs.ts
+++ b/src/vs/platform/dialogs/common/dialogs.ts
@@ -7,7 +7,7 @@
 import { TPromise } from 'vs/base/common/winjs.base';
 import Severity from 'vs/base/common/severity';
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { basename } from 'vs/base/common/paths';
 import { localize } from 'vs/nls';
 
diff --git a/src/vs/platform/dialogs/node/dialogIpc.ts b/src/vs/platform/dialogs/node/dialogIpc.ts
new file mode 100644
index 00000000000..c392844d3f4
--- /dev/null
+++ b/src/vs/platform/dialogs/node/dialogIpc.ts
@@ -0,0 +1,50 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+import { TPromise } from 'vs/base/common/winjs.base';
+import { IChannel } from 'vs/base/parts/ipc/node/ipc';
+import { IDialogService, IConfirmation, IConfirmationResult } from 'vs/platform/dialogs/common/dialogs';
+import Severity from 'vs/base/common/severity';
+import { Event } from 'vs/base/common/event';
+
+export interface IDialogChannel extends IChannel {
+	call(command: 'show'): Thenable<number>;
+	call(command: 'confirm'): Thenable<IConfirmationResult>;
+	call(command: string, arg?: any): Thenable<any>;
+}
+
+export class DialogChannel implements IDialogChannel {
+
+	constructor(@IDialogService private dialogService: IDialogService) { }
+
+	listen<T>(event: string): Event<T> {
+		throw new Error('No event found');
+	}
+
+	call(command: string, args?: any[]): Thenable<any> {
+		switch (command) {
+			case 'show': return this.dialogService.show(args[0], args[1], args[2]);
+			case 'confirm': return this.dialogService.confirm(args[0]);
+		}
+		return TPromise.wrapError(new Error('invalid command'));
+	}
+}
+
+export class DialogChannelClient implements IDialogService {
+
+	_serviceBrand: any;
+
+	constructor(private channel: IDialogChannel) { }
+
+	show(severity: Severity, message: string, options: string[]): TPromise<number> {
+		return TPromise.wrap(this.channel.call('show', [severity, message, options]));
+	}
+
+	confirm(confirmation: IConfirmation): TPromise<IConfirmationResult> {
+		return TPromise.wrap(this.channel.call('confirm', [confirmation]));
+	}
+}
\ No newline at end of file
diff --git a/src/vs/platform/dialogs/node/dialogService.ts b/src/vs/platform/dialogs/node/dialogService.ts
index b1896b82a8f..4304af55184 100644
--- a/src/vs/platform/dialogs/node/dialogService.ts
+++ b/src/vs/platform/dialogs/node/dialogService.ts
@@ -8,6 +8,7 @@ import { TPromise } from 'vs/base/common/winjs.base';
 import { IDialogService, IConfirmation, IConfirmationResult } from 'vs/platform/dialogs/common/dialogs';
 import Severity from 'vs/base/common/severity';
 import { localize } from 'vs/nls';
+import { canceled } from 'vs/base/common/errors';
 
 export class CommandLineDialogService implements IDialogService {
 
@@ -31,7 +32,7 @@ export class CommandLineDialogService implements IDialogService {
 			});
 			rl.once('SIGINT', () => {
 				rl.close();
-				promise.cancel();
+				e(canceled());
 			});
 		});
 		return promise;
@@ -64,4 +65,4 @@ export class CommandLineDialogService implements IDialogService {
 			} as IConfirmationResult;
 		});
 	}
-}
\ No newline at end of file
+}
diff --git a/src/vs/platform/download/common/download.ts b/src/vs/platform/download/common/download.ts
new file mode 100644
index 00000000000..1ff68352bb5
--- /dev/null
+++ b/src/vs/platform/download/common/download.ts
@@ -0,0 +1,20 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+import { URI } from 'vs/base/common/uri';
+import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
+import { TPromise } from 'vs/base/common/winjs.base';
+
+export const IDownloadService = createDecorator<IDownloadService>('downloadService');
+
+export interface IDownloadService {
+
+	_serviceBrand: any;
+
+	download(location: URI, file: string): TPromise<void>;
+
+}
\ No newline at end of file
diff --git a/src/vs/platform/download/node/downloadIpc.ts b/src/vs/platform/download/node/downloadIpc.ts
new file mode 100644
index 00000000000..675a725b3b1
--- /dev/null
+++ b/src/vs/platform/download/node/downloadIpc.ts
@@ -0,0 +1,83 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+import { URI } from 'vs/base/common/uri';
+import * as path from 'path';
+import * as fs from 'fs';
+import { TPromise } from 'vs/base/common/winjs.base';
+import { IChannel } from 'vs/base/parts/ipc/node/ipc';
+import { Event, Emitter, buffer } from 'vs/base/common/event';
+import { IDownloadService } from 'vs/platform/download/common/download';
+import { mkdirp } from 'vs/base/node/pfs';
+import { IURITransformer } from 'vs/base/common/uriIpc';
+
+export type UploadResponse = Buffer | string | undefined;
+
+export function upload(uri: URI): Event<UploadResponse> {
+	const stream = new Emitter<UploadResponse>();
+	const readstream = fs.createReadStream(uri.fsPath);
+	readstream.on('data', data => stream.fire(data));
+	readstream.on('error', error => stream.fire(error.toString()));
+	readstream.on('close', () => stream.fire());
+	return stream.event;
+}
+
+export interface IDownloadServiceChannel extends IChannel {
+	listen(event: 'upload', uri: URI): Event<UploadResponse>;
+	listen(event: string, arg?: any): Event<any>;
+}
+
+export class DownloadServiceChannel implements IDownloadServiceChannel {
+
+	constructor() { }
+
+	listen(event: string, arg?: any): Event<any> {
+		switch (event) {
+			case 'upload': return buffer(upload(URI.revive(arg)));
+		}
+		return undefined;
+	}
+
+	call(command: string, arg?: any): TPromise<any> {
+		throw new Error('No calls');
+	}
+}
+
+export class DownloadServiceChannelClient implements IDownloadService {
+
+	_serviceBrand: any;
+
+	constructor(private channel: IDownloadServiceChannel, private uriTransformer: IURITransformer) { }
+
+	download(from: URI, to: string): TPromise<void> {
+		from = this.uriTransformer.transformOutgoing(from);
+		const dirName = path.dirname(to);
+		let out: fs.WriteStream;
+		return new TPromise((c, e) => {
+			return mkdirp(dirName)
+				.then(() => {
+					out = fs.createWriteStream(to);
+					out.once('close', () => c(null));
+					out.once('error', e);
+					const uploadStream = this.channel.listen('upload', from);
+					const disposable = uploadStream((result: UploadResponse) => {
+						if (result === void 0) {
+							out.end();
+							disposable.dispose();
+							c(null);
+						} else if (Buffer.isBuffer(result)) {
+							out.write(result);
+						} else if (typeof result === 'string') {
+							out.close();
+							disposable.dispose();
+							e(result);
+						}
+					});
+				});
+		});
+	}
+}
\ No newline at end of file
diff --git a/src/vs/platform/driver/common/driver.ts b/src/vs/platform/driver/common/driver.ts
deleted file mode 100644
index a069d1c087d..00000000000
--- a/src/vs/platform/driver/common/driver.ts
+++ /dev/null
@@ -1,279 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-'use strict';
-
-import { TPromise } from 'vs/base/common/winjs.base';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { IChannel } from 'vs/base/parts/ipc/common/ipc';
-
-export const ID = 'driverService';
-export const IDriver = createDecorator<IDriver>(ID);
-
-// !! Do not remove the following START and END markers, they are parsed by the smoketest build
-
-//*START
-export interface IElement {
-	tagName: string;
-	className: string;
-	textContent: string;
-	attributes: { [name: string]: string; };
-	children: IElement[];
-	top: number;
-	left: number;
-}
-
-export interface IDriver {
-	_serviceBrand: any;
-
-	getWindowIds(): TPromise<number[]>;
-	capturePage(windowId: number): TPromise<string>;
-	reloadWindow(windowId: number): TPromise<void>;
-	dispatchKeybinding(windowId: number, keybinding: string): TPromise<void>;
-	click(windowId: number, selector: string, xoffset?: number | undefined, yoffset?: number | undefined): TPromise<void>;
-	doubleClick(windowId: number, selector: string): TPromise<void>;
-	setValue(windowId: number, selector: string, text: string): TPromise<void>;
-	getTitle(windowId: number): TPromise<string>;
-	isActiveElement(windowId: number, selector: string): TPromise<boolean>;
-	getElements(windowId: number, selector: string, recursive?: boolean): TPromise<IElement[]>;
-	typeInEditor(windowId: number, selector: string, text: string): TPromise<void>;
-	getTerminalBuffer(windowId: number, selector: string): TPromise<string[]>;
-	writeInTerminal(windowId: number, selector: string, text: string): TPromise<void>;
-}
-//*END
-
-export interface IDriverChannel extends IChannel {
-	call(command: 'getWindowIds'): TPromise<number[]>;
-	call(command: 'capturePage'): TPromise<string>;
-	call(command: 'reloadWindow', arg: number): TPromise<void>;
-	call(command: 'dispatchKeybinding', arg: [number, string]): TPromise<void>;
-	call(command: 'click', arg: [number, string, number | undefined, number | undefined]): TPromise<void>;
-	call(command: 'doubleClick', arg: [number, string]): TPromise<void>;
-	call(command: 'setValue', arg: [number, string, string]): TPromise<void>;
-	call(command: 'getTitle', arg: [number]): TPromise<string>;
-	call(command: 'isActiveElement', arg: [number, string]): TPromise<boolean>;
-	call(command: 'getElements', arg: [number, string, boolean]): TPromise<IElement[]>;
-	call(command: 'typeInEditor', arg: [number, string, string]): TPromise<void>;
-	call(command: 'getTerminalBuffer', arg: [number, string]): TPromise<string[]>;
-	call(command: 'writeInTerminal', arg: [number, string, string]): TPromise<void>;
-	call(command: string, arg: any): TPromise<any>;
-}
-
-export class DriverChannel implements IDriverChannel {
-
-	constructor(private driver: IDriver) { }
-
-	call(command: string, arg?: any): TPromise<any> {
-		switch (command) {
-			case 'getWindowIds': return this.driver.getWindowIds();
-			case 'capturePage': return this.driver.capturePage(arg);
-			case 'reloadWindow': return this.driver.reloadWindow(arg);
-			case 'dispatchKeybinding': return this.driver.dispatchKeybinding(arg[0], arg[1]);
-			case 'click': return this.driver.click(arg[0], arg[1], arg[2], arg[3]);
-			case 'doubleClick': return this.driver.doubleClick(arg[0], arg[1]);
-			case 'setValue': return this.driver.setValue(arg[0], arg[1], arg[2]);
-			case 'getTitle': return this.driver.getTitle(arg[0]);
-			case 'isActiveElement': return this.driver.isActiveElement(arg[0], arg[1]);
-			case 'getElements': return this.driver.getElements(arg[0], arg[1], arg[2]);
-			case 'typeInEditor': return this.driver.typeInEditor(arg[0], arg[1], arg[2]);
-			case 'getTerminalBuffer': return this.driver.getTerminalBuffer(arg[0], arg[1]);
-			case 'writeInTerminal': return this.driver.writeInTerminal(arg[0], arg[1], arg[2]);
-		}
-
-		return undefined;
-	}
-}
-
-export class DriverChannelClient implements IDriver {
-
-	_serviceBrand: any;
-
-	constructor(private channel: IDriverChannel) { }
-
-	getWindowIds(): TPromise<number[]> {
-		return this.channel.call('getWindowIds');
-	}
-
-	capturePage(windowId: number): TPromise<string> {
-		return this.channel.call('capturePage', windowId);
-	}
-
-	reloadWindow(windowId: number): TPromise<void> {
-		return this.channel.call('reloadWindow', windowId);
-	}
-
-	dispatchKeybinding(windowId: number, keybinding: string): TPromise<void> {
-		return this.channel.call('dispatchKeybinding', [windowId, keybinding]);
-	}
-
-	click(windowId: number, selector: string, xoffset: number | undefined, yoffset: number | undefined): TPromise<void> {
-		return this.channel.call('click', [windowId, selector, xoffset, yoffset]);
-	}
-
-	doubleClick(windowId: number, selector: string): TPromise<void> {
-		return this.channel.call('doubleClick', [windowId, selector]);
-	}
-
-	setValue(windowId: number, selector: string, text: string): TPromise<void> {
-		return this.channel.call('setValue', [windowId, selector, text]);
-	}
-
-	getTitle(windowId: number): TPromise<string> {
-		return this.channel.call('getTitle', [windowId]);
-	}
-
-	isActiveElement(windowId: number, selector: string): TPromise<boolean> {
-		return this.channel.call('isActiveElement', [windowId, selector]);
-	}
-
-	getElements(windowId: number, selector: string, recursive: boolean): TPromise<IElement[]> {
-		return this.channel.call('getElements', [windowId, selector, recursive]);
-	}
-
-	typeInEditor(windowId: number, selector: string, text: string): TPromise<void> {
-		return this.channel.call('typeInEditor', [windowId, selector, text]);
-	}
-
-	getTerminalBuffer(windowId: number, selector: string): TPromise<string[]> {
-		return this.channel.call('getTerminalBuffer', [windowId, selector]);
-	}
-
-	writeInTerminal(windowId: number, selector: string, text: string): TPromise<void> {
-		return this.channel.call('writeInTerminal', [windowId, selector, text]);
-	}
-}
-
-export interface IDriverOptions {
-	verbose: boolean;
-}
-
-export interface IWindowDriverRegistry {
-	registerWindowDriver(windowId: number): TPromise<IDriverOptions>;
-	reloadWindowDriver(windowId: number): TPromise<void>;
-}
-
-export interface IWindowDriverRegistryChannel extends IChannel {
-	call(command: 'registerWindowDriver', arg: number): TPromise<IDriverOptions>;
-	call(command: 'reloadWindowDriver', arg: number): TPromise<void>;
-	call(command: string, arg: any): TPromise<any>;
-}
-
-export class WindowDriverRegistryChannel implements IWindowDriverRegistryChannel {
-
-	constructor(private registry: IWindowDriverRegistry) { }
-
-	call(command: string, arg?: any): TPromise<any> {
-		switch (command) {
-			case 'registerWindowDriver': return this.registry.registerWindowDriver(arg);
-			case 'reloadWindowDriver': return this.registry.reloadWindowDriver(arg);
-		}
-
-		return undefined;
-	}
-}
-
-export class WindowDriverRegistryChannelClient implements IWindowDriverRegistry {
-
-	_serviceBrand: any;
-
-	constructor(private channel: IWindowDriverRegistryChannel) { }
-
-	registerWindowDriver(windowId: number): TPromise<IDriverOptions> {
-		return this.channel.call('registerWindowDriver', windowId);
-	}
-
-	reloadWindowDriver(windowId: number): TPromise<void> {
-		return this.channel.call('reloadWindowDriver', windowId);
-	}
-}
-
-export interface IWindowDriver {
-	click(selector: string, xoffset?: number | undefined, yoffset?: number | undefined): TPromise<void>;
-	doubleClick(selector: string): TPromise<void>;
-	setValue(selector: string, text: string): TPromise<void>;
-	getTitle(): TPromise<string>;
-	isActiveElement(selector: string): TPromise<boolean>;
-	getElements(selector: string, recursive: boolean): TPromise<IElement[]>;
-	typeInEditor(selector: string, text: string): TPromise<void>;
-	getTerminalBuffer(selector: string): TPromise<string[]>;
-	writeInTerminal(selector: string, text: string): TPromise<void>;
-}
-
-export interface IWindowDriverChannel extends IChannel {
-	call(command: 'click', arg: [string, number | undefined, number | undefined]): TPromise<void>;
-	call(command: 'doubleClick', arg: string): TPromise<void>;
-	call(command: 'setValue', arg: [string, string]): TPromise<void>;
-	call(command: 'getTitle'): TPromise<string>;
-	call(command: 'isActiveElement', arg: string): TPromise<boolean>;
-	call(command: 'getElements', arg: [string, boolean]): TPromise<IElement[]>;
-	call(command: 'typeInEditor', arg: [string, string]): TPromise<void>;
-	call(command: 'getTerminalBuffer', arg: string): TPromise<string[]>;
-	call(command: 'writeInTerminal', arg: [string, string]): TPromise<void>;
-	call(command: string, arg: any): TPromise<any>;
-}
-
-export class WindowDriverChannel implements IWindowDriverChannel {
-
-	constructor(private driver: IWindowDriver) { }
-
-	call(command: string, arg?: any): TPromise<any> {
-		switch (command) {
-			case 'click': return this.driver.click(arg[0], arg[1], arg[2]);
-			case 'doubleClick': return this.driver.doubleClick(arg);
-			case 'setValue': return this.driver.setValue(arg[0], arg[1]);
-			case 'getTitle': return this.driver.getTitle();
-			case 'isActiveElement': return this.driver.isActiveElement(arg);
-			case 'getElements': return this.driver.getElements(arg[0], arg[1]);
-			case 'typeInEditor': return this.driver.typeInEditor(arg[0], arg[1]);
-			case 'getTerminalBuffer': return this.driver.getTerminalBuffer(arg);
-			case 'writeInTerminal': return this.driver.writeInTerminal(arg[0], arg[1]);
-		}
-
-		return undefined;
-	}
-}
-
-export class WindowDriverChannelClient implements IWindowDriver {
-
-	_serviceBrand: any;
-
-	constructor(private channel: IWindowDriverChannel) { }
-
-	click(selector: string, xoffset?: number, yoffset?: number): TPromise<void> {
-		return this.channel.call('click', [selector, xoffset, yoffset]);
-	}
-
-	doubleClick(selector: string): TPromise<void> {
-		return this.channel.call('doubleClick', selector);
-	}
-
-	setValue(selector: string, text: string): TPromise<void> {
-		return this.channel.call('setValue', [selector, text]);
-	}
-
-	getTitle(): TPromise<string> {
-		return this.channel.call('getTitle');
-	}
-
-	isActiveElement(selector: string): TPromise<boolean> {
-		return this.channel.call('isActiveElement', selector);
-	}
-
-	getElements(selector: string, recursive: boolean): TPromise<IElement[]> {
-		return this.channel.call('getElements', [selector, recursive]);
-	}
-
-	typeInEditor(selector: string, text: string): TPromise<void> {
-		return this.channel.call('typeInEditor', [selector, text]);
-	}
-
-	getTerminalBuffer(selector: string): TPromise<string[]> {
-		return this.channel.call('getTerminalBuffer', selector);
-	}
-
-	writeInTerminal(selector: string, text: string): TPromise<void> {
-		return this.channel.call('writeInTerminal', [selector, text]);
-	}
-}
\ No newline at end of file
diff --git a/src/vs/platform/driver/electron-browser/driver.ts b/src/vs/platform/driver/electron-browser/driver.ts
index 93e4cf36c80..90a76721c11 100644
--- a/src/vs/platform/driver/electron-browser/driver.ts
+++ b/src/vs/platform/driver/electron-browser/driver.ts
@@ -7,12 +7,14 @@
 
 import { TPromise } from 'vs/base/common/winjs.base';
 import { IDisposable, toDisposable, combinedDisposable } from 'vs/base/common/lifecycle';
-import { IWindowDriver, IElement, WindowDriverChannel, WindowDriverRegistryChannelClient } from 'vs/platform/driver/common/driver';
-import { IPCClient } from 'vs/base/parts/ipc/common/ipc';
+import { IWindowDriver, IElement, WindowDriverChannel, WindowDriverRegistryChannelClient } from 'vs/platform/driver/node/driver';
+import { IPCClient } from 'vs/base/parts/ipc/node/ipc';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { getTopLeftOffset, getClientArea } from 'vs/base/browser/dom';
 import * as electron from 'electron';
 import { IWindowService } from 'vs/platform/windows/common/windows';
+import { Terminal } from 'vscode-xterm';
+import { timeout } from 'vs/base/common/async';
 
 function serializeElement(element: Element, recursive: boolean): IElement {
 	const attributes = Object.create(null);
@@ -49,7 +51,7 @@ class WindowDriver implements IWindowDriver {
 		@IWindowService private windowService: IWindowService
 	) { }
 
-	async click(selector: string, xoffset?: number, yoffset?: number): TPromise<void> {
+	click(selector: string, xoffset?: number, yoffset?: number): TPromise<void> {
 		return this._click(selector, 1, xoffset, yoffset);
 	}
 
@@ -57,11 +59,11 @@ class WindowDriver implements IWindowDriver {
 		return this._click(selector, 2);
 	}
 
-	private async _getElementXY(selector: string, xoffset?: number, yoffset?: number): TPromise<{ x: number; y: number; }> {
+	private _getElementXY(selector: string, xoffset?: number, yoffset?: number): TPromise<{ x: number; y: number; }> {
 		const element = document.querySelector(selector);
 
 		if (!element) {
-			throw new Error('Element not found');
+			return TPromise.wrapError(new Error(`Element not found: ${selector}`));
 		}
 
 		const { left, top } = getTopLeftOffset(element as HTMLElement);
@@ -79,23 +81,27 @@ class WindowDriver implements IWindowDriver {
 		x = Math.round(x);
 		y = Math.round(y);
 
-		return { x, y };
+		return TPromise.as({ x, y });
 	}
 
-	private async _click(selector: string, clickCount: number, xoffset?: number, yoffset?: number): TPromise<void> {
-		const { x, y } = await this._getElementXY(selector, xoffset, yoffset);
-		const webContents = electron.remote.getCurrentWebContents();
-		webContents.sendInputEvent({ type: 'mouseDown', x, y, button: 'left', clickCount } as any);
-		webContents.sendInputEvent({ type: 'mouseUp', x, y, button: 'left', clickCount } as any);
+	private _click(selector: string, clickCount: number, xoffset?: number, yoffset?: number): TPromise<void> {
+		return this._getElementXY(selector, xoffset, yoffset).then(({ x, y }) => {
 
-		await TPromise.timeout(100);
+			const webContents: electron.WebContents = (electron as any).remote.getCurrentWebContents();
+			webContents.sendInputEvent({ type: 'mouseDown', x, y, button: 'left', clickCount } as any);
+
+			return TPromise.wrap(timeout(10)).then(() => {
+				webContents.sendInputEvent({ type: 'mouseUp', x, y, button: 'left', clickCount } as any);
+				return TPromise.wrap(timeout(100));
+			});
+		});
 	}
 
-	async setValue(selector: string, text: string): TPromise<void> {
+	setValue(selector: string, text: string): TPromise<void> {
 		const element = document.querySelector(selector);
 
 		if (!element) {
-			throw new Error('Element not found');
+			return TPromise.wrapError(new Error(`Element not found: ${selector}`));
 		}
 
 		const inputElement = element as HTMLInputElement;
@@ -103,13 +109,15 @@ class WindowDriver implements IWindowDriver {
 
 		const event = new Event('input', { bubbles: true, cancelable: true });
 		inputElement.dispatchEvent(event);
+
+		return TPromise.as(null);
 	}
 
-	async getTitle(): TPromise<string> {
-		return document.title;
+	getTitle(): TPromise<string> {
+		return TPromise.as(document.title);
 	}
 
-	async isActiveElement(selector: string): TPromise<boolean> {
+	isActiveElement(selector: string): TPromise<boolean> {
 		const element = document.querySelector(selector);
 
 		if (element !== document.activeElement) {
@@ -125,13 +133,13 @@ class WindowDriver implements IWindowDriver {
 				el = el.parentElement;
 			}
 
-			throw new Error(`Active element not found. Current active element is '${chain.join(' > ')}'`);
+			return TPromise.wrapError(new Error(`Active element not found. Current active element is '${chain.join(' > ')}'. Looking for ${selector}`));
 		}
 
-		return true;
+		return TPromise.as(true);
 	}
 
-	async getElements(selector: string, recursive: boolean): TPromise<IElement[]> {
+	getElements(selector: string, recursive: boolean): TPromise<IElement[]> {
 		const query = document.querySelectorAll(selector);
 		const result: IElement[] = [];
 
@@ -140,14 +148,14 @@ class WindowDriver implements IWindowDriver {
 			result.push(serializeElement(element, recursive));
 		}
 
-		return result;
+		return TPromise.as(result);
 	}
 
-	async typeInEditor(selector: string, text: string): TPromise<void> {
+	typeInEditor(selector: string, text: string): TPromise<void> {
 		const element = document.querySelector(selector);
 
 		if (!element) {
-			throw new Error('Editor not found: ' + selector);
+			return TPromise.wrapError(new Error(`Editor not found: ${selector}`));
 		}
 
 		const textarea = element as HTMLTextAreaElement;
@@ -161,48 +169,52 @@ class WindowDriver implements IWindowDriver {
 
 		const event = new Event('input', { 'bubbles': true, 'cancelable': true });
 		textarea.dispatchEvent(event);
+
+		return TPromise.as(null);
 	}
 
-	async getTerminalBuffer(selector: string): TPromise<string[]> {
+	getTerminalBuffer(selector: string): TPromise<string[]> {
 		const element = document.querySelector(selector);
 
 		if (!element) {
-			throw new Error('Terminal not found: ' + selector);
+			return TPromise.wrapError(new Error(`Terminal not found: ${selector}`));
 		}
 
-		const xterm = (element as any).xterm;
+		const xterm: Terminal = (element as any).xterm;
 
 		if (!xterm) {
-			throw new Error('Xterm not found: ' + selector);
+			return TPromise.wrapError(new Error(`Xterm not found: ${selector}`));
 		}
 
 		const lines: string[] = [];
 
-		for (let i = 0; i < xterm.buffer.lines.length; i++) {
-			lines.push(xterm.buffer.translateBufferLineToString(i, true));
+		for (let i = 0; i < xterm._core.buffer.lines.length; i++) {
+			lines.push(xterm._core.buffer.translateBufferLineToString(i, true));
 		}
 
-		return lines;
+		return TPromise.as(lines);
 	}
 
-	async writeInTerminal(selector: string, text: string): TPromise<void> {
+	writeInTerminal(selector: string, text: string): TPromise<void> {
 		const element = document.querySelector(selector);
 
 		if (!element) {
-			throw new Error('Element not found');
+			return TPromise.wrapError(new Error(`Element not found: ${selector}`));
 		}
 
-		const xterm = (element as any).xterm;
+		const xterm: Terminal = (element as any).xterm;
 
 		if (!xterm) {
-			throw new Error('Xterm not found');
+			return TPromise.wrapError(new Error(`Xterm not found: ${selector}`));
 		}
 
-		xterm.send(text);
+		xterm._core.handler(text);
+
+		return TPromise.as(null);
 	}
 
-	async openDevTools(): TPromise<void> {
-		await this.windowService.openDevTools({ mode: 'detach' });
+	openDevTools(): TPromise<void> {
+		return this.windowService.openDevTools({ mode: 'detach' });
 	}
 }
 
@@ -210,7 +222,7 @@ export async function registerWindowDriver(
 	client: IPCClient,
 	windowId: number,
 	instantiationService: IInstantiationService
-): TPromise<IDisposable> {
+): Promise<IDisposable> {
 	const windowDriver = instantiationService.createInstance(WindowDriver);
 	const windowDriverChannel = new WindowDriverChannel(windowDriver);
 	client.registerChannel('windowDriver', windowDriverChannel);
@@ -221,9 +233,9 @@ export async function registerWindowDriver(
 	const options = await windowDriverRegistry.registerWindowDriver(windowId);
 
 	if (options.verbose) {
-		// windowDriver.openDevTools();
+		windowDriver.openDevTools();
 	}
 
 	const disposable = toDisposable(() => windowDriverRegistry.reloadWindowDriver(windowId));
 	return combinedDisposable([disposable, client]);
-}
\ No newline at end of file
+}
diff --git a/src/vs/platform/driver/electron-main/driver.ts b/src/vs/platform/driver/electron-main/driver.ts
index 46efb22aed5..f448ede7a08 100644
--- a/src/vs/platform/driver/electron-main/driver.ts
+++ b/src/vs/platform/driver/electron-main/driver.ts
@@ -6,29 +6,31 @@
 'use strict';
 
 import { TPromise } from 'vs/base/common/winjs.base';
-import { IDriver, DriverChannel, IElement, IWindowDriverChannel, WindowDriverChannelClient, IWindowDriverRegistry, WindowDriverRegistryChannel, IWindowDriver, IDriverOptions } from 'vs/platform/driver/common/driver';
+import { IDriver, DriverChannel, IElement, IWindowDriverChannel, WindowDriverChannelClient, IWindowDriverRegistry, WindowDriverRegistryChannel, IWindowDriver, IDriverOptions } from 'vs/platform/driver/node/driver';
 import { IWindowsMainService } from 'vs/platform/windows/electron-main/windows';
 import { serve as serveNet } from 'vs/base/parts/ipc/node/ipc.net';
 import { combinedDisposable, IDisposable } from 'vs/base/common/lifecycle';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IPCServer, IClientRouter } from 'vs/base/parts/ipc/common/ipc';
+import { IPCServer, IClientRouter } from 'vs/base/parts/ipc/node/ipc';
 import { SimpleKeybinding, KeyCode } from 'vs/base/common/keyCodes';
 import { USLayoutResolvedKeybinding } from 'vs/platform/keybinding/common/usLayoutResolvedKeybinding';
 import { OS } from 'vs/base/common/platform';
 import { Emitter, toPromise } from 'vs/base/common/event';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-
-// TODO@joao: bad layering!
-import { KeybindingIO } from 'vs/workbench/services/keybinding/common/keybindingIO';
-import { ScanCodeBinding } from 'vs/workbench/services/keybinding/common/scanCode';
-import { NativeImage } from 'electron';
+import { ScanCodeBinding } from 'vs/base/common/scanCode';
+import { KeybindingParser } from 'vs/base/common/keybindingParser';
+import { timeout } from 'vs/base/common/async';
 
 class WindowRouter implements IClientRouter {
 
 	constructor(private windowId: number) { }
 
-	route(command: string, arg: any): string {
-		return `window:${this.windowId}`;
+	routeCall(): TPromise<string> {
+		return TPromise.as(`window:${this.windowId}`);
+	}
+
+	routeEvent(): TPromise<string> {
+		return TPromise.as(`window:${this.windowId}`);
 	}
 }
 
@@ -50,57 +52,57 @@ export class Driver implements IDriver, IWindowDriverRegistry {
 		@IWindowsMainService private windowsService: IWindowsMainService
 	) { }
 
-	async registerWindowDriver(windowId: number): TPromise<IDriverOptions> {
+	registerWindowDriver(windowId: number): TPromise<IDriverOptions> {
 		this.registeredWindowIds.add(windowId);
 		this.reloadingWindowIds.delete(windowId);
 		this.onDidReloadingChange.fire();
-		return this.options;
+		return TPromise.as(this.options);
 	}
 
-	async reloadWindowDriver(windowId: number): TPromise<void> {
+	reloadWindowDriver(windowId: number): TPromise<void> {
 		this.reloadingWindowIds.add(windowId);
+		return TPromise.as(null);
 	}
 
-	async getWindowIds(): TPromise<number[]> {
-		return this.windowsService.getWindows()
+	getWindowIds(): TPromise<number[]> {
+		return TPromise.as(this.windowsService.getWindows()
 			.map(w => w.id)
-			.filter(id => this.registeredWindowIds.has(id) && !this.reloadingWindowIds.has(id));
+			.filter(id => this.registeredWindowIds.has(id) && !this.reloadingWindowIds.has(id)));
 	}
 
-	async capturePage(windowId: number): TPromise<string> {
-		await this.whenUnfrozen(windowId);
-
-		const window = this.windowsService.getWindowById(windowId);
-		const webContents = window.win.webContents;
-		const image = await new Promise<NativeImage>(c => webContents.capturePage(c));
-		const buffer = image.toPNG();
-
-		return buffer.toString('base64');
+	capturePage(windowId: number): TPromise<string> {
+		return this.whenUnfrozen(windowId).then(() => {
+			const window = this.windowsService.getWindowById(windowId);
+			const webContents = window.win.webContents;
+			return new TPromise(c => webContents.capturePage(image => c(image.toPNG().toString('base64'))));
+		});
 	}
 
-	async reloadWindow(windowId: number): TPromise<void> {
-		await this.whenUnfrozen(windowId);
-
-		const window = this.windowsService.getWindowById(windowId);
-		this.reloadingWindowIds.add(windowId);
-		this.windowsService.reload(window);
+	reloadWindow(windowId: number): TPromise<void> {
+		return this.whenUnfrozen(windowId).then(() => {
+			const window = this.windowsService.getWindowById(windowId);
+			this.reloadingWindowIds.add(windowId);
+			this.windowsService.reload(window);
+		});
 	}
 
-	async dispatchKeybinding(windowId: number, keybinding: string): TPromise<void> {
-		await this.whenUnfrozen(windowId);
+	dispatchKeybinding(windowId: number, keybinding: string): TPromise<void> {
+		return this.whenUnfrozen(windowId).then(() => {
+			const [first, second] = KeybindingParser.parseUserBinding(keybinding);
 
-		const [first, second] = KeybindingIO._readUserBinding(keybinding);
-
-		await this._dispatchKeybinding(windowId, first);
-
-		if (second) {
-			await this._dispatchKeybinding(windowId, second);
-		}
+			return this._dispatchKeybinding(windowId, first).then(() => {
+				if (second) {
+					return this._dispatchKeybinding(windowId, second);
+				} else {
+					return TPromise.as(null);
+				}
+			});
+		});
 	}
 
-	private async _dispatchKeybinding(windowId: number, keybinding: SimpleKeybinding | ScanCodeBinding): TPromise<void> {
+	private _dispatchKeybinding(windowId: number, keybinding: SimpleKeybinding | ScanCodeBinding): TPromise<void> {
 		if (keybinding instanceof ScanCodeBinding) {
-			throw new Error('ScanCodeBindings not supported');
+			return TPromise.wrapError(new Error('ScanCodeBindings not supported'));
 		}
 
 		const window = this.windowsService.getWindowById(windowId);
@@ -135,63 +137,76 @@ export class Driver implements IDriver, IWindowDriverRegistry {
 
 		webContents.sendInputEvent({ type: 'keyUp', keyCode, modifiers } as any);
 
-		await TPromise.timeout(100);
+		return TPromise.wrap(timeout(100));
 	}
 
-	async click(windowId: number, selector: string, xoffset?: number, yoffset?: number): TPromise<void> {
-		const windowDriver = await this.getWindowDriver(windowId);
-		return windowDriver.click(selector, xoffset, yoffset);
+	click(windowId: number, selector: string, xoffset?: number, yoffset?: number): TPromise<void> {
+		return this.getWindowDriver(windowId).then(windowDriver => {
+			return windowDriver.click(selector, xoffset, yoffset);
+		});
 	}
 
-	async doubleClick(windowId: number, selector: string): TPromise<void> {
-		const windowDriver = await this.getWindowDriver(windowId);
-		return windowDriver.doubleClick(selector);
+	doubleClick(windowId: number, selector: string): TPromise<void> {
+		return this.getWindowDriver(windowId).then(windowDriver => {
+			return windowDriver.doubleClick(selector);
+		});
 	}
 
-	async setValue(windowId: number, selector: string, text: string): TPromise<void> {
-		const windowDriver = await this.getWindowDriver(windowId);
-		return windowDriver.setValue(selector, text);
+	setValue(windowId: number, selector: string, text: string): TPromise<void> {
+		return this.getWindowDriver(windowId).then(windowDriver => {
+			return windowDriver.setValue(selector, text);
+		});
 	}
 
-	async getTitle(windowId: number): TPromise<string> {
-		const windowDriver = await this.getWindowDriver(windowId);
-		return windowDriver.getTitle();
+	getTitle(windowId: number): TPromise<string> {
+		return this.getWindowDriver(windowId).then(windowDriver => {
+			return windowDriver.getTitle();
+		});
 	}
 
-	async isActiveElement(windowId: number, selector: string): TPromise<boolean> {
-		const windowDriver = await this.getWindowDriver(windowId);
-		return windowDriver.isActiveElement(selector);
+	isActiveElement(windowId: number, selector: string): TPromise<boolean> {
+		return this.getWindowDriver(windowId).then(windowDriver => {
+			return windowDriver.isActiveElement(selector);
+		});
 	}
 
-	async getElements(windowId: number, selector: string, recursive: boolean): TPromise<IElement[]> {
-		const windowDriver = await this.getWindowDriver(windowId);
-		return windowDriver.getElements(selector, recursive);
+	getElements(windowId: number, selector: string, recursive: boolean): TPromise<IElement[]> {
+		return this.getWindowDriver(windowId).then(windowDriver => {
+			return windowDriver.getElements(selector, recursive);
+		});
 	}
 
-	async typeInEditor(windowId: number, selector: string, text: string): TPromise<void> {
-		const windowDriver = await this.getWindowDriver(windowId);
-		return windowDriver.typeInEditor(selector, text);
+	typeInEditor(windowId: number, selector: string, text: string): TPromise<void> {
+		return this.getWindowDriver(windowId).then(windowDriver => {
+			return windowDriver.typeInEditor(selector, text);
+		});
 	}
 
-	async getTerminalBuffer(windowId: number, selector: string): TPromise<string[]> {
-		const windowDriver = await this.getWindowDriver(windowId);
-		return windowDriver.getTerminalBuffer(selector);
+	getTerminalBuffer(windowId: number, selector: string): TPromise<string[]> {
+		return this.getWindowDriver(windowId).then(windowDriver => {
+			return windowDriver.getTerminalBuffer(selector);
+		});
 	}
 
-	async writeInTerminal(windowId: number, selector: string, text: string): TPromise<void> {
-		const windowDriver = await this.getWindowDriver(windowId);
-		return windowDriver.writeInTerminal(selector, text);
+	writeInTerminal(windowId: number, selector: string, text: string): TPromise<void> {
+		return this.getWindowDriver(windowId).then(windowDriver => {
+			return windowDriver.writeInTerminal(selector, text);
+		});
 	}
 
-	private async getWindowDriver(windowId: number): TPromise<IWindowDriver> {
-		await this.whenUnfrozen(windowId);
-
-		const router = new WindowRouter(windowId);
-		const windowDriverChannel = this.windowServer.getChannel<IWindowDriverChannel>('windowDriver', router);
-		return new WindowDriverChannelClient(windowDriverChannel);
+	private getWindowDriver(windowId: number): TPromise<IWindowDriver> {
+		return this.whenUnfrozen(windowId).then(() => {
+			const router = new WindowRouter(windowId);
+			const windowDriverChannel = this.windowServer.getChannel<IWindowDriverChannel>('windowDriver', router);
+			return new WindowDriverChannelClient(windowDriverChannel);
+		});
 	}
 
-	private async whenUnfrozen(windowId: number): TPromise<void> {
+	private whenUnfrozen(windowId: number): TPromise<void> {
+		return TPromise.wrap(this._whenUnfrozen(windowId));
+	}
+
+	private async _whenUnfrozen(windowId: number): Promise<void> {
 		while (this.reloadingWindowIds.has(windowId)) {
 			await toPromise(this.onDidReloadingChange.event);
 		}
@@ -203,7 +218,7 @@ export async function serve(
 	handle: string,
 	environmentService: IEnvironmentService,
 	instantiationService: IInstantiationService
-): TPromise<IDisposable> {
+): Promise<IDisposable> {
 	const verbose = environmentService.driverVerbose;
 	const driver = instantiationService.createInstance(Driver, windowServer, { verbose });
 
@@ -215,4 +230,4 @@ export async function serve(
 	server.registerChannel('driver', channel);
 
 	return combinedDisposable([server, windowServer]);
-}
\ No newline at end of file
+}
diff --git a/src/vs/platform/driver/node/driver.ts b/src/vs/platform/driver/node/driver.ts
index fb61d1d1fa6..2195bcb9a67 100644
--- a/src/vs/platform/driver/node/driver.ts
+++ b/src/vs/platform/driver/node/driver.ts
@@ -5,11 +5,294 @@
 
 'use strict';
 
-import { TPromise } from 'vs/base/common/winjs.base';
-import { IDriver, DriverChannelClient } from 'vs/platform/driver/common/driver';
 import { connect as connectNet, Client } from 'vs/base/parts/ipc/node/ipc.net';
+import { TPromise } from 'vs/base/common/winjs.base';
+import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
+import { IChannel } from 'vs/base/parts/ipc/node/ipc';
+import { Event } from 'vs/base/common/event';
 
-export async function connect(handle: string): TPromise<{ client: Client, driver: IDriver }> {
+export const ID = 'driverService';
+export const IDriver = createDecorator<IDriver>(ID);
+
+// !! Do not remove the following START and END markers, they are parsed by the smoketest build
+
+//*START
+export interface IElement {
+	tagName: string;
+	className: string;
+	textContent: string;
+	attributes: { [name: string]: string; };
+	children: IElement[];
+	top: number;
+	left: number;
+}
+
+export interface IDriver {
+	_serviceBrand: any;
+
+	getWindowIds(): TPromise<number[]>;
+	capturePage(windowId: number): TPromise<string>;
+	reloadWindow(windowId: number): TPromise<void>;
+	dispatchKeybinding(windowId: number, keybinding: string): TPromise<void>;
+	click(windowId: number, selector: string, xoffset?: number | undefined, yoffset?: number | undefined): TPromise<void>;
+	doubleClick(windowId: number, selector: string): TPromise<void>;
+	setValue(windowId: number, selector: string, text: string): TPromise<void>;
+	getTitle(windowId: number): TPromise<string>;
+	isActiveElement(windowId: number, selector: string): TPromise<boolean>;
+	getElements(windowId: number, selector: string, recursive?: boolean): TPromise<IElement[]>;
+	typeInEditor(windowId: number, selector: string, text: string): TPromise<void>;
+	getTerminalBuffer(windowId: number, selector: string): TPromise<string[]>;
+	writeInTerminal(windowId: number, selector: string, text: string): TPromise<void>;
+}
+//*END
+
+export interface IDriverChannel extends IChannel {
+	call(command: 'getWindowIds'): Thenable<number[]>;
+	call(command: 'capturePage'): Thenable<string>;
+	call(command: 'reloadWindow', arg: number): Thenable<void>;
+	call(command: 'dispatchKeybinding', arg: [number, string]): Thenable<void>;
+	call(command: 'click', arg: [number, string, number | undefined, number | undefined]): Thenable<void>;
+	call(command: 'doubleClick', arg: [number, string]): Thenable<void>;
+	call(command: 'setValue', arg: [number, string, string]): Thenable<void>;
+	call(command: 'getTitle', arg: [number]): Thenable<string>;
+	call(command: 'isActiveElement', arg: [number, string]): Thenable<boolean>;
+	call(command: 'getElements', arg: [number, string, boolean]): Thenable<IElement[]>;
+	call(command: 'typeInEditor', arg: [number, string, string]): Thenable<void>;
+	call(command: 'getTerminalBuffer', arg: [number, string]): Thenable<string[]>;
+	call(command: 'writeInTerminal', arg: [number, string, string]): Thenable<void>;
+	call(command: string, arg: any): Thenable<any>;
+}
+
+export class DriverChannel implements IDriverChannel {
+
+	constructor(private driver: IDriver) { }
+
+	listen<T>(event: string): Event<T> {
+		throw new Error('No event found');
+	}
+
+	call(command: string, arg?: any): TPromise<any> {
+		switch (command) {
+			case 'getWindowIds': return this.driver.getWindowIds();
+			case 'capturePage': return this.driver.capturePage(arg);
+			case 'reloadWindow': return this.driver.reloadWindow(arg);
+			case 'dispatchKeybinding': return this.driver.dispatchKeybinding(arg[0], arg[1]);
+			case 'click': return this.driver.click(arg[0], arg[1], arg[2], arg[3]);
+			case 'doubleClick': return this.driver.doubleClick(arg[0], arg[1]);
+			case 'setValue': return this.driver.setValue(arg[0], arg[1], arg[2]);
+			case 'getTitle': return this.driver.getTitle(arg[0]);
+			case 'isActiveElement': return this.driver.isActiveElement(arg[0], arg[1]);
+			case 'getElements': return this.driver.getElements(arg[0], arg[1], arg[2]);
+			case 'typeInEditor': return this.driver.typeInEditor(arg[0], arg[1], arg[2]);
+			case 'getTerminalBuffer': return this.driver.getTerminalBuffer(arg[0], arg[1]);
+			case 'writeInTerminal': return this.driver.writeInTerminal(arg[0], arg[1], arg[2]);
+		}
+
+		return undefined;
+	}
+}
+
+export class DriverChannelClient implements IDriver {
+
+	_serviceBrand: any;
+
+	constructor(private channel: IDriverChannel) { }
+
+	getWindowIds(): TPromise<number[]> {
+		return TPromise.wrap(this.channel.call('getWindowIds'));
+	}
+
+	capturePage(windowId: number): TPromise<string> {
+		return TPromise.wrap(this.channel.call('capturePage', windowId));
+	}
+
+	reloadWindow(windowId: number): TPromise<void> {
+		return TPromise.wrap(this.channel.call('reloadWindow', windowId));
+	}
+
+	dispatchKeybinding(windowId: number, keybinding: string): TPromise<void> {
+		return TPromise.wrap(this.channel.call('dispatchKeybinding', [windowId, keybinding]));
+	}
+
+	click(windowId: number, selector: string, xoffset: number | undefined, yoffset: number | undefined): TPromise<void> {
+		return TPromise.wrap(this.channel.call('click', [windowId, selector, xoffset, yoffset]));
+	}
+
+	doubleClick(windowId: number, selector: string): TPromise<void> {
+		return TPromise.wrap(this.channel.call('doubleClick', [windowId, selector]));
+	}
+
+	setValue(windowId: number, selector: string, text: string): TPromise<void> {
+		return TPromise.wrap(this.channel.call('setValue', [windowId, selector, text]));
+	}
+
+	getTitle(windowId: number): TPromise<string> {
+		return TPromise.wrap(this.channel.call('getTitle', [windowId]));
+	}
+
+	isActiveElement(windowId: number, selector: string): TPromise<boolean> {
+		return TPromise.wrap(this.channel.call('isActiveElement', [windowId, selector]));
+	}
+
+	getElements(windowId: number, selector: string, recursive: boolean): TPromise<IElement[]> {
+		return TPromise.wrap(this.channel.call('getElements', [windowId, selector, recursive]));
+	}
+
+	typeInEditor(windowId: number, selector: string, text: string): TPromise<void> {
+		return TPromise.wrap(this.channel.call('typeInEditor', [windowId, selector, text]));
+	}
+
+	getTerminalBuffer(windowId: number, selector: string): TPromise<string[]> {
+		return TPromise.wrap(this.channel.call('getTerminalBuffer', [windowId, selector]));
+	}
+
+	writeInTerminal(windowId: number, selector: string, text: string): TPromise<void> {
+		return TPromise.wrap(this.channel.call('writeInTerminal', [windowId, selector, text]));
+	}
+}
+
+export interface IDriverOptions {
+	verbose: boolean;
+}
+
+export interface IWindowDriverRegistry {
+	registerWindowDriver(windowId: number): TPromise<IDriverOptions>;
+	reloadWindowDriver(windowId: number): TPromise<void>;
+}
+
+export interface IWindowDriverRegistryChannel extends IChannel {
+	call(command: 'registerWindowDriver', arg: number): Thenable<IDriverOptions>;
+	call(command: 'reloadWindowDriver', arg: number): Thenable<void>;
+	call(command: string, arg: any): Thenable<any>;
+}
+
+export class WindowDriverRegistryChannel implements IWindowDriverRegistryChannel {
+
+	constructor(private registry: IWindowDriverRegistry) { }
+
+	listen<T>(event: string): Event<T> {
+		throw new Error('No event found');
+	}
+
+	call(command: string, arg?: any): Thenable<any> {
+		switch (command) {
+			case 'registerWindowDriver': return this.registry.registerWindowDriver(arg);
+			case 'reloadWindowDriver': return this.registry.reloadWindowDriver(arg);
+		}
+
+		return undefined;
+	}
+}
+
+export class WindowDriverRegistryChannelClient implements IWindowDriverRegistry {
+
+	_serviceBrand: any;
+
+	constructor(private channel: IWindowDriverRegistryChannel) { }
+
+	registerWindowDriver(windowId: number): TPromise<IDriverOptions> {
+		return TPromise.wrap(this.channel.call('registerWindowDriver', windowId));
+	}
+
+	reloadWindowDriver(windowId: number): TPromise<void> {
+		return TPromise.wrap(this.channel.call('reloadWindowDriver', windowId));
+	}
+}
+
+export interface IWindowDriver {
+	click(selector: string, xoffset?: number | undefined, yoffset?: number | undefined): TPromise<void>;
+	doubleClick(selector: string): TPromise<void>;
+	setValue(selector: string, text: string): TPromise<void>;
+	getTitle(): TPromise<string>;
+	isActiveElement(selector: string): TPromise<boolean>;
+	getElements(selector: string, recursive: boolean): TPromise<IElement[]>;
+	typeInEditor(selector: string, text: string): TPromise<void>;
+	getTerminalBuffer(selector: string): TPromise<string[]>;
+	writeInTerminal(selector: string, text: string): TPromise<void>;
+}
+
+export interface IWindowDriverChannel extends IChannel {
+	call(command: 'click', arg: [string, number | undefined, number | undefined]): Thenable<void>;
+	call(command: 'doubleClick', arg: string): Thenable<void>;
+	call(command: 'setValue', arg: [string, string]): Thenable<void>;
+	call(command: 'getTitle'): Thenable<string>;
+	call(command: 'isActiveElement', arg: string): Thenable<boolean>;
+	call(command: 'getElements', arg: [string, boolean]): Thenable<IElement[]>;
+	call(command: 'typeInEditor', arg: [string, string]): Thenable<void>;
+	call(command: 'getTerminalBuffer', arg: string): Thenable<string[]>;
+	call(command: 'writeInTerminal', arg: [string, string]): Thenable<void>;
+	call(command: string, arg: any): Thenable<any>;
+}
+
+export class WindowDriverChannel implements IWindowDriverChannel {
+
+	constructor(private driver: IWindowDriver) { }
+
+	listen<T>(event: string): Event<T> {
+		throw new Error('No event found');
+	}
+
+	call(command: string, arg?: any): Thenable<any> {
+		switch (command) {
+			case 'click': return this.driver.click(arg[0], arg[1], arg[2]);
+			case 'doubleClick': return this.driver.doubleClick(arg);
+			case 'setValue': return this.driver.setValue(arg[0], arg[1]);
+			case 'getTitle': return this.driver.getTitle();
+			case 'isActiveElement': return this.driver.isActiveElement(arg);
+			case 'getElements': return this.driver.getElements(arg[0], arg[1]);
+			case 'typeInEditor': return this.driver.typeInEditor(arg[0], arg[1]);
+			case 'getTerminalBuffer': return this.driver.getTerminalBuffer(arg);
+			case 'writeInTerminal': return this.driver.writeInTerminal(arg[0], arg[1]);
+		}
+
+		return undefined;
+	}
+}
+
+export class WindowDriverChannelClient implements IWindowDriver {
+
+	_serviceBrand: any;
+
+	constructor(private channel: IWindowDriverChannel) { }
+
+	click(selector: string, xoffset?: number, yoffset?: number): TPromise<void> {
+		return TPromise.wrap(this.channel.call('click', [selector, xoffset, yoffset]));
+	}
+
+	doubleClick(selector: string): TPromise<void> {
+		return TPromise.wrap(this.channel.call('doubleClick', selector));
+	}
+
+	setValue(selector: string, text: string): TPromise<void> {
+		return TPromise.wrap(this.channel.call('setValue', [selector, text]));
+	}
+
+	getTitle(): TPromise<string> {
+		return TPromise.wrap(this.channel.call('getTitle'));
+	}
+
+	isActiveElement(selector: string): TPromise<boolean> {
+		return TPromise.wrap(this.channel.call('isActiveElement', selector));
+	}
+
+	getElements(selector: string, recursive: boolean): TPromise<IElement[]> {
+		return TPromise.wrap(this.channel.call('getElements', [selector, recursive]));
+	}
+
+	typeInEditor(selector: string, text: string): TPromise<void> {
+		return TPromise.wrap(this.channel.call('typeInEditor', [selector, text]));
+	}
+
+	getTerminalBuffer(selector: string): TPromise<string[]> {
+		return TPromise.wrap(this.channel.call('getTerminalBuffer', selector));
+	}
+
+	writeInTerminal(selector: string, text: string): TPromise<void> {
+		return TPromise.wrap(this.channel.call('writeInTerminal', [selector, text]));
+	}
+}
+
+export async function connect(handle: string): Promise<{ client: Client, driver: IDriver }> {
 	const client = await connectNet(handle, 'driverClient');
 	const channel = client.getChannel('driver');
 	const driver = new DriverChannelClient(channel);
diff --git a/src/vs/platform/editor/common/editor.ts b/src/vs/platform/editor/common/editor.ts
index d35396a181a..40d7169e10b 100644
--- a/src/vs/platform/editor/common/editor.ts
+++ b/src/vs/platform/editor/common/editor.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { Event } from 'vs/base/common/event';
 
@@ -42,6 +42,15 @@ export interface IBaseResourceInput {
 	 * Description to show for the diff editor
 	 */
 	description?: string;
+
+	/**
+	 * Hint to indicate that this input should be treated as a file
+	 * that opens in an editor capable of showing file content.
+	 *
+	 * Without this hint, the editor service will make a guess by
+	 * looking at the scheme of the resource(s).
+	 */
+	forceFile?: boolean;
 }
 
 export interface IResourceInput extends IBaseResourceInput {
@@ -66,11 +75,11 @@ export interface IEditorOptions {
 	readonly preserveFocus?: boolean;
 
 	/**
-	 * Tells the editor to replace the editor input in the editor even if it is identical to the one
-	 * already showing. By default, the editor will not replace the input if it is identical to the
+	 * Tells the editor to reload the editor input in the editor even if it is identical to the one
+	 * already showing. By default, the editor will not reload the input if it is identical to the
 	 * one showing.
 	 */
-	readonly forceOpen?: boolean;
+	readonly forceReload?: boolean;
 
 	/**
 	 * Will reveal the editor if it is already opened and visible in any of the opened editor groups. Note
diff --git a/src/vs/platform/environment/common/environment.ts b/src/vs/platform/environment/common/environment.ts
index 06f80764726..d81317dc247 100644
--- a/src/vs/platform/environment/common/environment.ts
+++ b/src/vs/platform/environment/common/environment.ts
@@ -4,10 +4,13 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
+import { URI } from 'vs/base/common/uri';
 
 export interface ParsedArgs {
 	[arg: string]: any;
 	_: string[];
+	'folder-uri'?: string | string[];
+	'file-uri'?: string | string[];
 	_urls?: string[];
 	help?: boolean;
 	version?: boolean;
@@ -25,11 +28,12 @@ export interface ParsedArgs {
 	performance?: boolean;
 	'prof-startup'?: string;
 	'prof-startup-prefix'?: string;
+	'prof-append-timers'?: string;
 	verbose?: boolean;
 	log?: string;
 	logExtensionHostCommunication?: boolean;
-	'disable-extensions'?: boolean;
 	'extensions-dir'?: string;
+	'builtin-extensions-dir'?: string;
 	extensionDevelopmentPath?: string;
 	extensionTestsPath?: string;
 	debugPluginHost?: string;
@@ -37,6 +41,8 @@ export interface ParsedArgs {
 	debugId?: string;
 	debugSearch?: string;
 	debugBrkSearch?: string;
+	'disable-extensions'?: boolean;
+	'disable-extension'?: string | string[];
 	'list-extensions'?: boolean;
 	'show-versions'?: boolean;
 	'install-extension'?: string | string[];
@@ -99,9 +105,10 @@ export interface IEnvironmentService {
 	workspacesHome: string;
 
 	isExtensionDevelopment: boolean;
-	disableExtensions: boolean;
+	disableExtensions: boolean | string[];
+	builtinExtensionsPath: string;
 	extensionsPath: string;
-	extensionDevelopmentPath: string;
+	extensionDevelopmentLocationURI: URI;
 	extensionTestsPath: string;
 
 	debugExtensionHost: IExtensionHostDebugParams;
@@ -116,6 +123,7 @@ export interface IEnvironmentService {
 	performance: boolean;
 
 	// logging
+	log: string;
 	logsPath: string;
 	verbose: boolean;
 
diff --git a/src/vs/platform/environment/node/argv.ts b/src/vs/platform/environment/node/argv.ts
index 529890d3034..7183c2471eb 100644
--- a/src/vs/platform/environment/node/argv.ts
+++ b/src/vs/platform/environment/node/argv.ts
@@ -18,9 +18,12 @@ const options: minimist.Opts = {
 		'locale',
 		'user-data-dir',
 		'extensions-dir',
+		'folder-uri',
+		'file-uri',
 		'extensionDevelopmentPath',
 		'extensionTestsPath',
 		'install-extension',
+		'disable-extension',
 		'uninstall-extension',
 		'debugId',
 		'debugPluginHost',
@@ -146,7 +149,7 @@ const optionsHelp: { [name: string]: string; } = {
 	'-a, --add <dir>': localize('add', "Add folder(s) to the last active window."),
 	'-g, --goto <file:line[:character]>': localize('goto', "Open a file at the path on the specified line and character position."),
 	'-n, --new-window': localize('newWindow', "Force to open a new window."),
-	'-r, --reuse-window': localize('reuseWindow', "Force to open a file or folder in the last active window."),
+	'-r, --reuse-window': localize('reuseWindow', "Force to open a file or folder in an already opened window."),
 	'-w, --wait': localize('wait', "Wait for the files to be closed before returning."),
 	'--locale <locale>': localize('locale', "The locale to use (e.g. en-US or zh-TW)."),
 	'--user-data-dir <dir>': localize('userDataDir', "Specifies the directory that user data is kept in. Can be used to open multiple distinct instances of Code."),
@@ -160,7 +163,7 @@ const extensionsHelp: { [name: string]: string; } = {
 	'--show-versions': localize('showVersions', "Show versions of installed extensions, when using --list-extension."),
 	'--install-extension (<extension-id> | <extension-vsix-path>)': localize('installExtension', "Installs an extension."),
 	'--uninstall-extension (<extension-id> | <extension-vsix-path>)': localize('uninstallExtension', "Uninstalls an extension."),
-	'--enable-proposed-api <extension-id>': localize('experimentalApis', "Enables proposed API features for an extension.")
+	'--enable-proposed-api (<extension-id>)': localize('experimentalApis', "Enables proposed API features for extensions. Can receive one or more extension IDs to enable individually.")
 };
 
 const troubleshootingHelp: { [name: string]: string; } = {
@@ -170,6 +173,7 @@ const troubleshootingHelp: { [name: string]: string; } = {
 	'-p, --performance': localize('performance', "Start with the 'Developer: Startup Performance' command enabled."),
 	'--prof-startup': localize('prof-startup', "Run CPU profiler during startup"),
 	'--disable-extensions': localize('disableExtensions', "Disable all installed extensions."),
+	'--disable-extension <extension-id>': localize('disableExtension', "Disable an extension."),
 	'--inspect-extensions': localize('inspect-extensions', "Allow debugging and profiling of extensions. Check the developer tools for the connection URI."),
 	'--inspect-brk-extensions': localize('inspect-brk-extensions', "Allow debugging and profiling of extensions with the extension host being paused after start. Check the developer tools for the connection URI."),
 	'--disable-gpu': localize('disableGPU', "Disable GPU hardware acceleration."),
@@ -230,3 +234,30 @@ ${formatOptions(extensionsHelp, columns)}
 ${ localize('troubleshooting', "Troubleshooting")}:
 ${formatOptions(troubleshootingHelp, columns)}`;
 }
+
+/**
+ * Converts an argument into an array
+ * @param arg a argument value. Can be undefined, an entry or an array
+ */
+export function asArray(arg: string | string[] | undefined): string[] {
+	if (arg) {
+		if (Array.isArray(arg)) {
+			return arg;
+		}
+		return [arg];
+	}
+	return [];
+}
+
+/**
+ * Returns whether an argument is present.
+ */
+export function hasArgs(arg: string | string[] | undefined): boolean {
+	if (arg) {
+		if (Array.isArray(arg)) {
+			return !!arg.length;
+		}
+		return true;
+	}
+	return false;
+}
\ No newline at end of file
diff --git a/src/vs/platform/environment/node/environmentService.ts b/src/vs/platform/environment/node/environmentService.ts
index 381202a6d1b..7d7aacfc48f 100644
--- a/src/vs/platform/environment/node/environmentService.ts
+++ b/src/vs/platform/environment/node/environmentService.ts
@@ -8,12 +8,13 @@ import * as crypto from 'crypto';
 import * as paths from 'vs/base/node/paths';
 import * as os from 'os';
 import * as path from 'path';
-import URI from 'vs/base/common/uri';
 import { memoize } from 'vs/base/common/decorators';
 import pkg from 'vs/platform/node/package';
 import product from 'vs/platform/node/product';
 import { toLocalISOString } from 'vs/base/common/date';
 import { isWindows, isLinux } from 'vs/base/common/platform';
+import { getPathFromAmdModule } from 'vs/base/common/amd';
+import { URI } from 'vs/base/common/uri';
 
 // Read this before there's any chance it is overwritten
 // Related to https://github.com/Microsoft/vscode/issues/30624
@@ -77,7 +78,7 @@ export class EnvironmentService implements IEnvironmentService {
 	get args(): ParsedArgs { return this._args; }
 
 	@memoize
-	get appRoot(): string { return path.dirname(URI.parse(require.toUrl('')).fsPath); }
+	get appRoot(): string { return path.dirname(getPathFromAmdModule(require, '')); }
 
 	get execPath(): string { return this._execPath; }
 
@@ -90,7 +91,13 @@ export class EnvironmentService implements IEnvironmentService {
 	get userHome(): string { return os.homedir(); }
 
 	@memoize
-	get userDataPath(): string { return parseUserDataDir(this._args, process); }
+	get userDataPath(): string {
+		if (process.env['VSCODE_PORTABLE']) {
+			return path.join(process.env['VSCODE_PORTABLE'], 'user-data');
+		}
+
+		return parseUserDataDir(this._args, process);
+	}
 
 	get appNameLong(): string { return product.nameLong; }
 
@@ -127,15 +134,60 @@ export class EnvironmentService implements IEnvironmentService {
 	get installSourcePath(): string { return path.join(this.userDataPath, 'installSource'); }
 
 	@memoize
-	get extensionsPath(): string { return parsePathArg(this._args['extensions-dir'], process) || process.env['VSCODE_EXTENSIONS'] || path.join(this.userHome, product.dataFolderName, 'extensions'); }
+	get builtinExtensionsPath(): string {
+		const fromArgs = parsePathArg(this._args['builtin-extensions-dir'], process);
+		if (fromArgs) {
+			return fromArgs;
+		} else {
+			return path.normalize(path.join(getPathFromAmdModule(require, ''), '..', 'extensions'));
+		}
+	}
 
 	@memoize
-	get extensionDevelopmentPath(): string { return this._args.extensionDevelopmentPath ? path.normalize(this._args.extensionDevelopmentPath) : this._args.extensionDevelopmentPath; }
+	get extensionsPath(): string {
+		const fromArgs = parsePathArg(this._args['extensions-dir'], process);
+
+		if (fromArgs) {
+			return fromArgs;
+		} else if (process.env['VSCODE_EXTENSIONS']) {
+			return process.env['VSCODE_EXTENSIONS'];
+		} else if (process.env['VSCODE_PORTABLE']) {
+			return path.join(process.env['VSCODE_PORTABLE'], 'extensions');
+		} else {
+			return path.join(this.userHome, product.dataFolderName, 'extensions');
+		}
+	}
+
+	@memoize
+	get extensionDevelopmentLocationURI(): URI {
+		const s = this._args.extensionDevelopmentPath;
+		if (s) {
+			if (/^[^:/?#]+?:\/\//.test(s)) {
+				return URI.parse(s);
+			}
+			return URI.file(path.normalize(s));
+		}
+		return void 0;
+	}
 
 	@memoize
 	get extensionTestsPath(): string { return this._args.extensionTestsPath ? path.normalize(this._args.extensionTestsPath) : this._args.extensionTestsPath; }
 
-	get disableExtensions(): boolean { return this._args['disable-extensions']; }
+	get disableExtensions(): boolean | string[] {
+		if (this._args['disable-extensions']) {
+			return true;
+		}
+		const disableExtensions: string | string[] = this._args['disable-extension'];
+		if (disableExtensions) {
+			if (typeof disableExtensions === 'string') {
+				return [disableExtensions];
+			}
+			if (Array.isArray(disableExtensions) && disableExtensions.length > 0) {
+				return disableExtensions;
+			}
+		}
+		return false;
+	}
 
 	get skipGettingStarted(): boolean { return this._args['skip-getting-started']; }
 
@@ -151,6 +203,7 @@ export class EnvironmentService implements IEnvironmentService {
 
 	get isBuilt(): boolean { return !process.env['VSCODE_DEV']; }
 	get verbose(): boolean { return this._args.verbose; }
+	get log(): string { return this._args.log; }
 
 	get wait(): boolean { return this._args.wait; }
 	get logExtensionHostCommunication(): boolean { return this._args.logExtensionHostCommunication; }
diff --git a/src/vs/platform/extensionManagement/common/extensionEnablementService.ts b/src/vs/platform/extensionManagement/common/extensionEnablementService.ts
index 28c6ce6805f..f56f3aabbbf 100644
--- a/src/vs/platform/extensionManagement/common/extensionEnablementService.ts
+++ b/src/vs/platform/extensionManagement/common/extensionEnablementService.ts
@@ -8,7 +8,7 @@ import { TPromise } from 'vs/base/common/winjs.base';
 import { Event, Emitter } from 'vs/base/common/event';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { IExtensionManagementService, DidUninstallExtensionEvent, IExtensionEnablementService, IExtensionIdentifier, EnablementState, ILocalExtension, isIExtensionIdentifier, LocalExtensionType } from 'vs/platform/extensionManagement/common/extensionManagement';
-import { getIdFromLocalExtensionId, areSameExtensions, getGalleryExtensionIdFromLocal } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
+import { getIdFromLocalExtensionId, areSameExtensions } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
 import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
 import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
@@ -29,7 +29,7 @@ export class ExtensionEnablementService implements IExtensionEnablementService {
 		@IStorageService private storageService: IStorageService,
 		@IWorkspaceContextService private contextService: IWorkspaceContextService,
 		@IEnvironmentService private environmentService: IEnvironmentService,
-		@IExtensionManagementService extensionManagementService: IExtensionManagementService
+		@IExtensionManagementService private extensionManagementService: IExtensionManagementService
 	) {
 		extensionManagementService.onDidUninstallExtension(this._onDidUninstallExtension, this, this.disposables);
 	}
@@ -38,7 +38,11 @@ export class ExtensionEnablementService implements IExtensionEnablementService {
 		return this.contextService.getWorkbenchState() !== WorkbenchState.EMPTY;
 	}
 
-	getDisabledExtensions(): TPromise<IExtensionIdentifier[]> {
+	get allUserExtensionsDisabled(): boolean {
+		return this.environmentService.disableExtensions === true;
+	}
+
+	async getDisabledExtensions(): Promise<IExtensionIdentifier[]> {
 
 		let result = this._getDisabledExtensions(StorageScope.GLOBAL);
 
@@ -54,14 +58,25 @@ export class ExtensionEnablementService implements IExtensionEnablementService {
 			}
 		}
 
-		return TPromise.as(result);
+		if (this.environmentService.disableExtensions) {
+			const allInstalledExtensions = await this.extensionManagementService.getInstalled();
+			for (const installedExtension of allInstalledExtensions) {
+				if (this._isExtensionDisabledInEnvironment(installedExtension)) {
+					if (!result.some(r => areSameExtensions(r, installedExtension.galleryIdentifier))) {
+						result.push(installedExtension.galleryIdentifier);
+					}
+				}
+			}
+		}
+
+		return result;
 	}
 
 	getEnablementState(extension: ILocalExtension): EnablementState {
-		if (this.environmentService.disableExtensions && extension.type === LocalExtensionType.User) {
+		if (this._isExtensionDisabledInEnvironment(extension)) {
 			return EnablementState.Disabled;
 		}
-		const identifier = this._getIdentifier(extension);
+		const identifier = extension.galleryIdentifier;
 		if (this.hasWorkspace) {
 			if (this._getEnabledExtensions(StorageScope.WORKSPACE).filter(e => areSameExtensions(e, identifier))[0]) {
 				return EnablementState.WorkspaceEnabled;
@@ -95,7 +110,7 @@ export class ExtensionEnablementService implements IExtensionEnablementService {
 			if (!this.canChangeEnablement(arg)) {
 				return TPromise.wrap(false);
 			}
-			identifier = this._getIdentifier(arg);
+			identifier = arg.galleryIdentifier;
 		}
 
 		const workspace = newState === EnablementState.WorkspaceDisabled || newState === EnablementState.WorkspaceEnabled;
@@ -134,6 +149,17 @@ export class ExtensionEnablementService implements IExtensionEnablementService {
 		return enablementState === EnablementState.WorkspaceEnabled || enablementState === EnablementState.Enabled;
 	}
 
+	private _isExtensionDisabledInEnvironment(extension: ILocalExtension): boolean {
+		if (this.allUserExtensionsDisabled) {
+			return extension.type === LocalExtensionType.User;
+		}
+		const disabledExtensions = this.environmentService.disableExtensions;
+		if (Array.isArray(disabledExtensions)) {
+			return disabledExtensions.some(id => areSameExtensions({ id }, extension.galleryIdentifier));
+		}
+		return false;
+	}
+
 	private _getEnablementState(identifier: IExtensionIdentifier): EnablementState {
 		if (this.hasWorkspace) {
 			if (this._getEnabledExtensions(StorageScope.WORKSPACE).filter(e => areSameExtensions(e, identifier))[0]) {
@@ -150,10 +176,6 @@ export class ExtensionEnablementService implements IExtensionEnablementService {
 		return EnablementState.Enabled;
 	}
 
-	private _getIdentifier(extension: ILocalExtension): IExtensionIdentifier {
-		return { id: getGalleryExtensionIdFromLocal(extension), uuid: extension.identifier.uuid };
-	}
-
 	private _enableExtension(identifier: IExtensionIdentifier): void {
 		this._removeFromDisabledExtensions(identifier, StorageScope.WORKSPACE);
 		this._removeFromEnabledExtensions(identifier, StorageScope.WORKSPACE);
diff --git a/src/vs/platform/extensionManagement/common/extensionManagement.ts b/src/vs/platform/extensionManagement/common/extensionManagement.ts
index fc191890180..9a79972905f 100644
--- a/src/vs/platform/extensionManagement/common/extensionManagement.ts
+++ b/src/vs/platform/extensionManagement/common/extensionManagement.ts
@@ -11,6 +11,9 @@ import { Event } from 'vs/base/common/event';
 import { IPager } from 'vs/base/common/paging';
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
 import { ILocalization } from 'vs/platform/localizations/common/localizations';
+import { URI } from 'vs/base/common/uri';
+import { IWorkspaceFolder, IWorkspace } from 'vs/platform/workspace/common/workspace';
+import { CancellationToken } from 'vs/base/common/cancellation';
 
 export const EXTENSION_IDENTIFIER_PATTERN = '^([a-z0-9A-Z][a-z0-9\-A-Z]*)\\.([a-z0-9A-Z][a-z0-9\-A-Z]*)$';
 export const EXTENSION_IDENTIFIER_REGEX = new RegExp(EXTENSION_IDENTIFIER_PATTERN);
@@ -94,7 +97,7 @@ export interface IColor {
 
 export interface IExtensionContributions {
 	commands?: ICommand[];
-	configuration?: IConfiguration;
+	configuration?: IConfiguration | IConfiguration[];
 	debuggers?: IDebugger[];
 	grammars?: IGrammar[];
 	jsonValidation?: IJSONValidation[];
@@ -120,8 +123,10 @@ export interface IExtensionManifest {
 	main?: string;
 	icon?: string;
 	categories?: string[];
+	keywords?: string[];
 	activationEvents?: string[];
 	extensionDependencies?: string[];
+	extensionPack?: string[];
 	contributes?: IExtensionContributions;
 	repository?: {
 		url: string;
@@ -133,6 +138,7 @@ export interface IExtensionManifest {
 
 export interface IGalleryExtensionProperties {
 	dependencies?: string[];
+	extensionPack?: string[];
 	engine?: string;
 }
 
@@ -195,7 +201,7 @@ export interface IGalleryMetadata {
 	publisherDisplayName: string;
 }
 
-export enum LocalExtensionType {
+export const enum LocalExtensionType {
 	System,
 	User
 }
@@ -203,9 +209,10 @@ export enum LocalExtensionType {
 export interface ILocalExtension {
 	type: LocalExtensionType;
 	identifier: IExtensionIdentifier;
+	galleryIdentifier: IExtensionIdentifier;
 	manifest: IExtensionManifest;
 	metadata: IGalleryMetadata;
-	path: string;
+	location: URI;
 	readmeUrl: string;
 	changelogUrl: string;
 }
@@ -213,7 +220,7 @@ export interface ILocalExtension {
 export const IExtensionManagementService = createDecorator<IExtensionManagementService>('extensionManagementService');
 export const IExtensionGalleryService = createDecorator<IExtensionGalleryService>('extensionGalleryService');
 
-export enum SortBy {
+export const enum SortBy {
 	NoneOrRelevance = 0,
 	LastUpdatedDate = 1,
 	Title = 2,
@@ -224,7 +231,7 @@ export enum SortBy {
 	WeightedRating = 12
 }
 
-export enum SortOrder {
+export const enum SortOrder {
 	Default = 0,
 	Ascending = 1,
 	Descending = 2
@@ -240,7 +247,7 @@ export interface IQueryOptions {
 	source?: string;
 }
 
-export enum StatisticType {
+export const enum StatisticType {
 	Uninstall = 'uninstall'
 }
 
@@ -249,8 +256,9 @@ export interface IReportedExtension {
 	malicious: boolean;
 }
 
-export enum InstallOperation {
-	Install = 1,
+export const enum InstallOperation {
+	None = 0,
+	Install,
 	Update
 }
 
@@ -264,13 +272,14 @@ export interface IExtensionGalleryService {
 	query(options?: IQueryOptions): TPromise<IPager<IGalleryExtension>>;
 	download(extension: IGalleryExtension, operation: InstallOperation): TPromise<string>;
 	reportStatistic(publisher: string, name: string, version: string, type: StatisticType): TPromise<void>;
-	getReadme(extension: IGalleryExtension): TPromise<string>;
-	getManifest(extension: IGalleryExtension): TPromise<IExtensionManifest>;
-	getChangelog(extension: IGalleryExtension): TPromise<string>;
+	getReadme(extension: IGalleryExtension, token: CancellationToken): TPromise<string>;
+	getManifest(extension: IGalleryExtension, token: CancellationToken): TPromise<IExtensionManifest>;
+	getChangelog(extension: IGalleryExtension, token: CancellationToken): TPromise<string>;
 	getCoreTranslation(extension: IGalleryExtension, languageId: string): TPromise<ITranslation>;
 	loadCompatibleVersion(extension: IGalleryExtension): TPromise<IGalleryExtension>;
-	loadAllDependencies(dependencies: IExtensionIdentifier[]): TPromise<IGalleryExtension[]>;
+	loadAllDependencies(dependencies: IExtensionIdentifier[], token: CancellationToken): TPromise<IGalleryExtension[]>;
 	getExtensionsReport(): TPromise<IReportedExtension[]>;
+	getExtension(id: IExtensionIdentifier, version?: string): TPromise<IGalleryExtension>;
 }
 
 export interface InstallExtensionEvent {
@@ -301,17 +310,34 @@ export interface IExtensionManagementService {
 	onUninstallExtension: Event<IExtensionIdentifier>;
 	onDidUninstallExtension: Event<DidUninstallExtensionEvent>;
 
-	install(zipPath: string): TPromise<ILocalExtension>;
-	installFromGallery(extension: IGalleryExtension): TPromise<ILocalExtension>;
+	zip(extension: ILocalExtension): TPromise<URI>;
+	unzip(zipLocation: URI, type: LocalExtensionType): TPromise<IExtensionIdentifier>;
+	install(vsix: URI): TPromise<IExtensionIdentifier>;
+	installFromGallery(extension: IGalleryExtension): TPromise<void>;
 	uninstall(extension: ILocalExtension, force?: boolean): TPromise<void>;
-	reinstallFromGallery(extension: ILocalExtension): TPromise<ILocalExtension>;
+	reinstallFromGallery(extension: ILocalExtension): TPromise<void>;
 	getInstalled(type?: LocalExtensionType): TPromise<ILocalExtension[]>;
 	getExtensionsReport(): TPromise<IReportedExtension[]>;
 
 	updateMetadata(local: ILocalExtension, metadata: IGalleryMetadata): TPromise<ILocalExtension>;
 }
 
-export enum EnablementState {
+export const IExtensionManagementServerService = createDecorator<IExtensionManagementServerService>('extensionManagementServerService');
+
+export interface IExtensionManagementServer {
+	extensionManagementService: IExtensionManagementService;
+	authority: string;
+	label: string;
+}
+
+export interface IExtensionManagementServerService {
+	_serviceBrand: any;
+	readonly extensionManagementServers: IExtensionManagementServer[];
+	getLocalExtensionManagementServer(): IExtensionManagementServer;
+	getExtensionManagementServer(location: URI): IExtensionManagementServer;
+}
+
+export const enum EnablementState {
 	Disabled,
 	WorkspaceDisabled,
 	Enabled,
@@ -324,6 +350,8 @@ export const IExtensionEnablementService = createDecorator<IExtensionEnablementS
 export interface IExtensionEnablementService {
 	_serviceBrand: any;
 
+	readonly allUserExtensionsDisabled: boolean;
+
 	/**
 	 * Event to listen on for extension enablement changes
 	 */
@@ -333,7 +361,7 @@ export interface IExtensionEnablementService {
 	 * Returns all disabled extension identifiers for current workspace
 	 * Returns an empty array if none exist
 	 */
-	getDisabledExtensions(): TPromise<IExtensionIdentifier[]>;
+	getDisabledExtensions(): Promise<IExtensionIdentifier[]>;
 
 	/**
 	 * Returns the enablement state for the given extension
@@ -362,24 +390,49 @@ export interface IExtensionEnablementService {
 	setEnablement(extension: ILocalExtension, state: EnablementState): TPromise<boolean>;
 }
 
+export interface IExtensionsConfigContent {
+	recommendations: string[];
+	unwantedRecommendations: string[];
+}
+
+export type RecommendationChangeNotification = {
+	extensionId: string,
+	isRecommended: boolean
+};
+
+export type DynamicRecommendation = 'dynamic';
+export type ExecutableRecommendation = 'executable';
+export type CachedRecommendation = 'cached';
+export type ApplicationRecommendation = 'application';
+export type ExtensionRecommendationSource = IWorkspace | IWorkspaceFolder | URI | DynamicRecommendation | ExecutableRecommendation | CachedRecommendation | ApplicationRecommendation;
+
+export interface IExtensionRecommendation {
+	extensionId: string;
+	sources: ExtensionRecommendationSource[];
+}
+
 export const IExtensionTipsService = createDecorator<IExtensionTipsService>('extensionTipsService');
 
 export interface IExtensionTipsService {
 	_serviceBrand: any;
 	getAllRecommendationsWithReason(): { [id: string]: { reasonId: ExtensionRecommendationReason, reasonText: string }; };
-	getFileBasedRecommendations(): string[];
-	getOtherRecommendations(): TPromise<string[]>;
-	getWorkspaceRecommendations(): TPromise<string[]>;
-	getKeymapRecommendations(): string[];
+	getFileBasedRecommendations(): IExtensionRecommendation[];
+	getOtherRecommendations(): TPromise<IExtensionRecommendation[]>;
+	getWorkspaceRecommendations(): TPromise<IExtensionRecommendation[]>;
+	getKeymapRecommendations(): IExtensionRecommendation[];
+	getAllRecommendations(): TPromise<IExtensionRecommendation[]>;
 	getKeywordsForExtension(extension: string): string[];
-	getRecommendationsForExtension(extension: string): string[];
+	toggleIgnoredRecommendation(extensionId: string, shouldIgnore: boolean): void;
+	getAllIgnoredRecommendations(): { global: string[], workspace: string[] };
+	onRecommendationChange: Event<RecommendationChangeNotification>;
 }
 
-export enum ExtensionRecommendationReason {
+export const enum ExtensionRecommendationReason {
 	Workspace,
 	File,
 	Executable,
-	DynamicWorkspace
+	DynamicWorkspace,
+	Experimental
 }
 
 export const ExtensionsLabel = localize('extensions', "Extensions");
diff --git a/src/vs/platform/extensionManagement/common/extensionManagementIpc.ts b/src/vs/platform/extensionManagement/common/extensionManagementIpc.ts
deleted file mode 100644
index b54d3db67f2..00000000000
--- a/src/vs/platform/extensionManagement/common/extensionManagementIpc.ts
+++ /dev/null
@@ -1,104 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-'use strict';
-
-import { TPromise } from 'vs/base/common/winjs.base';
-import { IChannel, eventToCall, eventFromCall } from 'vs/base/parts/ipc/common/ipc';
-import { IExtensionManagementService, ILocalExtension, InstallExtensionEvent, DidInstallExtensionEvent, IGalleryExtension, LocalExtensionType, DidUninstallExtensionEvent, IExtensionIdentifier, IGalleryMetadata, IReportedExtension } from './extensionManagement';
-import { Event, buffer } from 'vs/base/common/event';
-
-export interface IExtensionManagementChannel extends IChannel {
-	call(command: 'event:onInstallExtension'): TPromise<void>;
-	call(command: 'event:onDidInstallExtension'): TPromise<void>;
-	call(command: 'event:onUninstallExtension'): TPromise<void>;
-	call(command: 'event:onDidUninstallExtension'): TPromise<void>;
-	call(command: 'install', path: string): TPromise<ILocalExtension>;
-	call(command: 'installFromGallery', extension: IGalleryExtension): TPromise<ILocalExtension>;
-	call(command: 'uninstall', args: [ILocalExtension, boolean]): TPromise<void>;
-	call(command: 'reinstallFromGallery', args: [ILocalExtension]): TPromise<ILocalExtension>;
-	call(command: 'getInstalled'): TPromise<ILocalExtension[]>;
-	call(command: 'getExtensionsReport'): TPromise<IReportedExtension[]>;
-	call(command: string, arg?: any): TPromise<any>;
-}
-
-export class ExtensionManagementChannel implements IExtensionManagementChannel {
-
-	onInstallExtension: Event<InstallExtensionEvent>;
-	onDidInstallExtension: Event<DidInstallExtensionEvent>;
-	onUninstallExtension: Event<IExtensionIdentifier>;
-	onDidUninstallExtension: Event<DidUninstallExtensionEvent>;
-
-	constructor(private service: IExtensionManagementService) {
-		this.onInstallExtension = buffer(service.onInstallExtension, true);
-		this.onDidInstallExtension = buffer(service.onDidInstallExtension, true);
-		this.onUninstallExtension = buffer(service.onUninstallExtension, true);
-		this.onDidUninstallExtension = buffer(service.onDidUninstallExtension, true);
-	}
-
-	call(command: string, arg?: any): TPromise<any> {
-		switch (command) {
-			case 'event:onInstallExtension': return eventToCall(this.onInstallExtension);
-			case 'event:onDidInstallExtension': return eventToCall(this.onDidInstallExtension);
-			case 'event:onUninstallExtension': return eventToCall(this.onUninstallExtension);
-			case 'event:onDidUninstallExtension': return eventToCall(this.onDidUninstallExtension);
-			case 'install': return this.service.install(arg);
-			case 'installFromGallery': return this.service.installFromGallery(arg[0]);
-			case 'uninstall': return this.service.uninstall(arg[0], arg[1]);
-			case 'reinstallFromGallery': return this.service.reinstallFromGallery(arg[0]);
-			case 'getInstalled': return this.service.getInstalled(arg);
-			case 'updateMetadata': return this.service.updateMetadata(arg[0], arg[1]);
-			case 'getExtensionsReport': return this.service.getExtensionsReport();
-		}
-		return undefined;
-	}
-}
-
-export class ExtensionManagementChannelClient implements IExtensionManagementService {
-
-	_serviceBrand: any;
-
-	constructor(private channel: IExtensionManagementChannel) { }
-
-	private _onInstallExtension = eventFromCall<InstallExtensionEvent>(this.channel, 'event:onInstallExtension');
-	get onInstallExtension(): Event<InstallExtensionEvent> { return this._onInstallExtension; }
-
-	private _onDidInstallExtension = eventFromCall<DidInstallExtensionEvent>(this.channel, 'event:onDidInstallExtension');
-	get onDidInstallExtension(): Event<DidInstallExtensionEvent> { return this._onDidInstallExtension; }
-
-	private _onUninstallExtension = eventFromCall<IExtensionIdentifier>(this.channel, 'event:onUninstallExtension');
-	get onUninstallExtension(): Event<IExtensionIdentifier> { return this._onUninstallExtension; }
-
-	private _onDidUninstallExtension = eventFromCall<DidUninstallExtensionEvent>(this.channel, 'event:onDidUninstallExtension');
-	get onDidUninstallExtension(): Event<DidUninstallExtensionEvent> { return this._onDidUninstallExtension; }
-
-	install(zipPath: string): TPromise<ILocalExtension> {
-		return this.channel.call('install', zipPath);
-	}
-
-	installFromGallery(extension: IGalleryExtension): TPromise<ILocalExtension> {
-		return this.channel.call('installFromGallery', [extension]);
-	}
-
-	uninstall(extension: ILocalExtension, force = false): TPromise<void> {
-		return this.channel.call('uninstall', [extension, force]);
-	}
-
-	reinstallFromGallery(extension: ILocalExtension): TPromise<ILocalExtension> {
-		return this.channel.call('reinstallFromGallery', [extension]);
-	}
-
-	getInstalled(type: LocalExtensionType = null): TPromise<ILocalExtension[]> {
-		return this.channel.call('getInstalled', type);
-	}
-
-	updateMetadata(local: ILocalExtension, metadata: IGalleryMetadata): TPromise<ILocalExtension> {
-		return this.channel.call('updateMetadata', [local, metadata]);
-	}
-
-	getExtensionsReport(): TPromise<IReportedExtension[]> {
-		return this.channel.call('getExtensionsReport');
-	}
-}
\ No newline at end of file
diff --git a/src/vs/platform/extensionManagement/common/extensionManagementUtil.ts b/src/vs/platform/extensionManagement/common/extensionManagementUtil.ts
index 505673fa7fc..2e989c69d67 100644
--- a/src/vs/platform/extensionManagement/common/extensionManagementUtil.ts
+++ b/src/vs/platform/extensionManagement/common/extensionManagementUtil.ts
@@ -5,7 +5,9 @@
 
 'use strict';
 
-import { ILocalExtension, IGalleryExtension, EXTENSION_IDENTIFIER_REGEX, IExtensionIdentifier, IReportedExtension } from 'vs/platform/extensionManagement/common/extensionManagement';
+import { ILocalExtension, IGalleryExtension, IExtensionIdentifier, IReportedExtension, IExtensionManifest } from 'vs/platform/extensionManagement/common/extensionManagement';
+import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { compareIgnoreCase } from 'vs/base/common/strings';
 
 export function areSameExtensions(a: IExtensionIdentifier, b: IExtensionIdentifier): boolean {
 	if (a.uuid && b.uuid) {
@@ -14,7 +16,11 @@ export function areSameExtensions(a: IExtensionIdentifier, b: IExtensionIdentifi
 	if (a.id === b.id) {
 		return true;
 	}
-	return adoptToGalleryExtensionId(a.id) === adoptToGalleryExtensionId(b.id);
+	return compareIgnoreCase(a.id, b.id) === 0;
+}
+
+export function adoptToGalleryExtensionId(id: string): string {
+	return id.toLocaleLowerCase();
 }
 
 export function getGalleryExtensionId(publisher: string, name: string): string {
@@ -35,10 +41,6 @@ export function getIdFromLocalExtensionId(localExtensionId: string): string {
 	return adoptToGalleryExtensionId(localExtensionId);
 }
 
-export function adoptToGalleryExtensionId(id: string): string {
-	return id.replace(EXTENSION_IDENTIFIER_REGEX, (match, publisher: string, name: string) => getGalleryExtensionId(publisher, name));
-}
-
 export function getLocalExtensionId(id: string, version: string): string {
 	return `${id}-${version}`;
 }
@@ -117,4 +119,27 @@ export function getMaliciousExtensionsSet(report: IReportedExtension[]): Set<str
 	}
 
 	return result;
+}
+
+const nonWorkspaceExtensions = new Set<string>();
+
+export function isWorkspaceExtension(manifest: IExtensionManifest, configurationService: IConfigurationService): boolean {
+	const extensionId = getGalleryExtensionId(manifest.publisher, manifest.name);
+	const configuredWorkspaceExtensions = configurationService.getValue<string[]>('_workbench.workspaceExtensions') || [];
+	if (configuredWorkspaceExtensions.length) {
+		if (configuredWorkspaceExtensions.indexOf(extensionId) !== -1) {
+			return true;
+		}
+		if (configuredWorkspaceExtensions.indexOf(`-${extensionId}`) !== -1) {
+			return false;
+		}
+	}
+
+	if (manifest.main) {
+		if ((manifest.categories || []).indexOf('Workspace Extension') !== -1) {
+			return true;
+		}
+		return !nonWorkspaceExtensions.has(extensionId);
+	}
+	return false;
 }
\ No newline at end of file
diff --git a/src/vs/platform/extensionManagement/node/extensionGalleryService.ts b/src/vs/platform/extensionManagement/node/extensionGalleryService.ts
index cec901d0b77..3d642baf387 100644
--- a/src/vs/platform/extensionManagement/node/extensionGalleryService.ts
+++ b/src/vs/platform/extensionManagement/node/extensionGalleryService.ts
@@ -3,12 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
 import { tmpdir } from 'os';
 import * as path from 'path';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { distinct } from 'vs/base/common/arrays';
-import { getErrorMessage, isPromiseCanceledError } from 'vs/base/common/errors';
+import { getErrorMessage, isPromiseCanceledError, canceled } from 'vs/base/common/errors';
 import { StatisticType, IGalleryExtension, IExtensionGalleryService, IGalleryExtensionAsset, IQueryOptions, SortBy, SortOrder, IExtensionManifest, IExtensionIdentifier, IReportedExtension, InstallOperation, ITranslation } from 'vs/platform/extensionManagement/common/extensionManagement';
 import { getGalleryExtensionId, getGalleryExtensionTelemetryData, adoptToGalleryExtensionId } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
 import { assign, getOrDefault } from 'vs/base/common/objects';
@@ -24,6 +23,7 @@ import { readFile } from 'vs/base/node/pfs';
 import { writeFileAndFlushSync } from 'vs/base/node/extfs';
 import { generateUuid, isUUID } from 'vs/base/common/uuid';
 import { values } from 'vs/base/common/map';
+import { CancellationToken } from 'vs/base/common/cancellation';
 
 interface IRawGalleryExtensionFile {
 	assetType: string;
@@ -115,6 +115,7 @@ const AssetType = {
 
 const PropertyType = {
 	Dependency: 'Microsoft.VisualStudio.Code.ExtensionDependencies',
+	ExtensionPack: 'Microsoft.VisualStudio.Code.ExtensionPack',
 	Engine: 'Microsoft.VisualStudio.Code.Engine'
 };
 
@@ -262,8 +263,8 @@ function getVersionAsset(version: IRawGalleryExtensionVersion, type: string): IG
 	};
 }
 
-function getDependencies(version: IRawGalleryExtensionVersion): string[] {
-	const values = version.properties ? version.properties.filter(p => p.key === PropertyType.Dependency) : [];
+function getExtensions(version: IRawGalleryExtensionVersion, property: string): string[] {
+	const values = version.properties ? version.properties.filter(p => p.key === property) : [];
 	const value = values.length > 0 && values[0].value;
 	return value ? value.split(',').map(v => adoptToGalleryExtensionId(v)) : [];
 }
@@ -277,8 +278,7 @@ function getIsPreview(flags: string): boolean {
 	return flags.indexOf('preview') !== -1;
 }
 
-function toExtension(galleryExtension: IRawGalleryExtension, extensionsGalleryUrl: string, index: number, query: Query, querySource?: string): IGalleryExtension {
-	const [version] = galleryExtension.versions;
+function toExtension(galleryExtension: IRawGalleryExtension, version: IRawGalleryExtensionVersion, index: number, query: Query, querySource?: string): IGalleryExtension {
 	const assets = {
 		manifest: getVersionAsset(version, AssetType.Manifest),
 		readme: getVersionAsset(version, AssetType.Details),
@@ -303,12 +303,13 @@ function toExtension(galleryExtension: IRawGalleryExtension, extensionsGalleryUr
 		publisher: galleryExtension.publisher.publisherName,
 		publisherDisplayName: galleryExtension.publisher.displayName,
 		description: galleryExtension.shortDescription || '',
-		installCount: getStatistic(galleryExtension.statistics, 'install'),
+		installCount: getStatistic(galleryExtension.statistics, 'install') + getStatistic(galleryExtension.statistics, 'updateCount'),
 		rating: getStatistic(galleryExtension.statistics, 'averagerating'),
 		ratingCount: getStatistic(galleryExtension.statistics, 'ratingcount'),
 		assets,
 		properties: {
-			dependencies: getDependencies(version),
+			dependencies: getExtensions(version, PropertyType.Dependency),
+			extensionPack: getExtensions(version, PropertyType.ExtensionPack),
 			engine: getEngine(version)
 		},
 		/* __GDPR__FRAGMENT__
@@ -360,6 +361,31 @@ export class ExtensionGalleryService implements IExtensionGalleryService {
 		return !!this.extensionsGalleryUrl;
 	}
 
+	getExtension({ id, uuid }: IExtensionIdentifier, version?: string): TPromise<IGalleryExtension> {
+		let query = new Query()
+			.withFlags(Flags.IncludeAssetUri, Flags.IncludeStatistics, Flags.IncludeFiles, Flags.IncludeVersionProperties)
+			.withPage(1, 1)
+			.withFilter(FilterType.Target, 'Microsoft.VisualStudio.Code')
+			.withFilter(FilterType.ExcludeWithFlags, flagsToString(Flags.Unpublished));
+
+		if (uuid) {
+			query = query.withFilter(FilterType.ExtensionId, uuid);
+		} else {
+			query = query.withFilter(FilterType.ExtensionName, id);
+		}
+
+		return this.queryGallery(query, CancellationToken.None).then(({ galleryExtensions }) => {
+			if (galleryExtensions.length) {
+				const galleryExtension = galleryExtensions[0];
+				const versionAsset = version ? galleryExtension.versions.filter(v => v.version === version)[0] : galleryExtension.versions[0];
+				if (versionAsset) {
+					return toExtension(galleryExtension, versionAsset, 0, query);
+				}
+			}
+			return null;
+		});
+	}
+
 	query(options: IQueryOptions = {}): TPromise<IPager<IGalleryExtension>> {
 		if (!this.isEnabled()) {
 			return TPromise.wrapError<IPager<IGalleryExtension>>(new Error('No extension gallery service configured.'));
@@ -420,20 +446,24 @@ export class ExtensionGalleryService implements IExtensionGalleryService {
 			query = query.withSortOrder(options.sortOrder);
 		}
 
-		return this.queryGallery(query).then(({ galleryExtensions, total }) => {
-			const extensions = galleryExtensions.map((e, index) => toExtension(e, this.extensionsGalleryUrl, index, query, options.source));
+		return this.queryGallery(query, CancellationToken.None).then(({ galleryExtensions, total }) => {
+			const extensions = galleryExtensions.map((e, index) => toExtension(e, e.versions[0], index, query, options.source));
 			const pageSize = query.pageSize;
-			const getPage = (pageIndex: number) => {
+			const getPage = (pageIndex: number, ct: CancellationToken) => {
+				if (ct.isCancellationRequested) {
+					return TPromise.wrapError(canceled());
+				}
+
 				const nextPageQuery = query.withPage(pageIndex + 1);
-				return this.queryGallery(nextPageQuery)
-					.then(({ galleryExtensions }) => galleryExtensions.map((e, index) => toExtension(e, this.extensionsGalleryUrl, index, nextPageQuery, options.source)));
+				return this.queryGallery(nextPageQuery, ct)
+					.then(({ galleryExtensions }) => galleryExtensions.map((e, index) => toExtension(e, e.versions[0], index, nextPageQuery, options.source)));
 			};
 
-			return { firstPage: extensions, total, pageSize, getPage };
+			return { firstPage: extensions, total, pageSize, getPage } as IPager<IGalleryExtension>;
 		});
 	}
 
-	private queryGallery(query: Query): TPromise<{ galleryExtensions: IRawGalleryExtension[], total: number; }> {
+	private queryGallery(query: Query, token: CancellationToken): TPromise<{ galleryExtensions: IRawGalleryExtension[], total: number; }> {
 		return this.commonHeadersPromise.then(commonHeaders => {
 			const data = JSON.stringify(query.raw);
 			const headers = assign({}, commonHeaders, {
@@ -448,7 +478,7 @@ export class ExtensionGalleryService implements IExtensionGalleryService {
 				url: this.api('/extensionquery'),
 				data,
 				headers
-			}).then(context => {
+			}, token).then(context => {
 
 				if (context.res.statusCode >= 400 && context.res.statusCode < 500) {
 					return { galleryExtensions: [], total: 0 };
@@ -478,49 +508,43 @@ export class ExtensionGalleryService implements IExtensionGalleryService {
 				type: 'POST',
 				url: this.api(`/publishers/${publisher}/extensions/${name}/${version}/stats?statType=${type}`),
 				headers
-			}).then(null, () => null);
+			}, CancellationToken.None).then(null, () => null);
 		});
 	}
 
 	download(extension: IGalleryExtension, operation: InstallOperation): TPromise<string> {
-		return this.loadCompatibleVersion(extension)
-			.then(extension => {
-				if (!extension) {
-					return TPromise.wrapError(new Error(localize('notCompatibleDownload', "Unable to download because the extension compatible with current version '{0}' of VS Code is not found.", pkg.version)));
-				}
-				const zipPath = path.join(tmpdir(), generateUuid());
-				const data = getGalleryExtensionTelemetryData(extension);
-				const startTime = new Date().getTime();
-				/* __GDPR__
-					"galleryService:downloadVSIX" : {
-						"duration": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true },
-						"${include}": [
-							"${GalleryExtensionTelemetryData}"
-						]
-					}
-				*/
-				const log = (duration: number) => this.telemetryService.publicLog('galleryService:downloadVSIX', assign(data, { duration }));
+		const zipPath = path.join(tmpdir(), generateUuid());
+		const data = getGalleryExtensionTelemetryData(extension);
+		const startTime = new Date().getTime();
+		/* __GDPR__
+			"galleryService:downloadVSIX" : {
+				"duration": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true },
+				"${include}": [
+					"${GalleryExtensionTelemetryData}"
+				]
+			}
+		*/
+		const log = (duration: number) => this.telemetryService.publicLog('galleryService:downloadVSIX', assign(data, { duration }));
 
-				const operationParam = operation === InstallOperation.Install ? 'install' : operation === InstallOperation.Update ? 'update' : '';
-				const downloadAsset = operationParam ? {
-					uri: `${extension.assets.download.uri}&${operationParam}=true`,
-					fallbackUri: `${extension.assets.download.fallbackUri}?${operationParam}=true`
-				} : extension.assets.download;
+		const operationParam = operation === InstallOperation.Install ? 'install' : operation === InstallOperation.Update ? 'update' : '';
+		const downloadAsset = operationParam ? {
+			uri: `${extension.assets.download.uri}&${operationParam}=true`,
+			fallbackUri: `${extension.assets.download.fallbackUri}?${operationParam}=true`
+		} : extension.assets.download;
 
-				return this.getAsset(downloadAsset)
-					.then(context => download(zipPath, context))
-					.then(() => log(new Date().getTime() - startTime))
-					.then(() => zipPath);
-			});
+		return this.getAsset(downloadAsset)
+			.then(context => download(zipPath, context))
+			.then(() => log(new Date().getTime() - startTime))
+			.then(() => zipPath);
 	}
 
-	getReadme(extension: IGalleryExtension): TPromise<string> {
-		return this.getAsset(extension.assets.readme)
+	getReadme(extension: IGalleryExtension, token: CancellationToken): TPromise<string> {
+		return this.getAsset(extension.assets.readme, {}, token)
 			.then(asText);
 	}
 
-	getManifest(extension: IGalleryExtension): TPromise<IExtensionManifest> {
-		return this.getAsset(extension.assets.manifest)
+	getManifest(extension: IGalleryExtension, token: CancellationToken): TPromise<IExtensionManifest> {
+		return this.getAsset(extension.assets.manifest, {}, token)
 			.then(asText)
 			.then(JSON.parse);
 	}
@@ -535,13 +559,13 @@ export class ExtensionGalleryService implements IExtensionGalleryService {
 		return TPromise.as(null);
 	}
 
-	getChangelog(extension: IGalleryExtension): TPromise<string> {
-		return this.getAsset(extension.assets.changelog)
+	getChangelog(extension: IGalleryExtension, token: CancellationToken): TPromise<string> {
+		return this.getAsset(extension.assets.changelog, {}, token)
 			.then(asText);
 	}
 
-	loadAllDependencies(extensions: IExtensionIdentifier[]): TPromise<IGalleryExtension[]> {
-		return this.getDependenciesReccursively(extensions.map(e => e.id), []);
+	loadAllDependencies(extensions: IExtensionIdentifier[], token: CancellationToken): TPromise<IGalleryExtension[]> {
+		return this.getDependenciesReccursively(extensions.map(e => e.id), [], token);
 	}
 
 	loadCompatibleVersion(extension: IGalleryExtension): TPromise<IGalleryExtension> {
@@ -557,7 +581,7 @@ export class ExtensionGalleryService implements IExtensionGalleryService {
 			.withAssetTypes(AssetType.Manifest, AssetType.VSIX)
 			.withFilter(FilterType.ExtensionId, extension.identifier.uuid);
 
-		return this.queryGallery(query)
+		return this.queryGallery(query, CancellationToken.None)
 			.then(({ galleryExtensions }) => {
 				const [rawExtension] = galleryExtensions;
 
@@ -568,7 +592,7 @@ export class ExtensionGalleryService implements IExtensionGalleryService {
 				return this.getLastValidExtensionVersion(rawExtension, rawExtension.versions)
 					.then(rawVersion => {
 						if (rawVersion) {
-							extension.properties.dependencies = getDependencies(rawVersion);
+							extension.properties.dependencies = getExtensions(rawVersion, PropertyType.Dependency);
 							extension.properties.engine = getEngine(rawVersion);
 							extension.assets.download = getVersionAsset(rawVersion, AssetType.VSIX);
 							extension.version = rawVersion.version;
@@ -579,7 +603,7 @@ export class ExtensionGalleryService implements IExtensionGalleryService {
 			});
 	}
 
-	private loadDependencies(extensionNames: string[]): TPromise<IGalleryExtension[]> {
+	private loadDependencies(extensionNames: string[], token: CancellationToken): TPromise<IGalleryExtension[]> {
 		if (!extensionNames || extensionNames.length === 0) {
 			return TPromise.as([]);
 		}
@@ -592,14 +616,14 @@ export class ExtensionGalleryService implements IExtensionGalleryService {
 			.withAssetTypes(AssetType.Icon, AssetType.License, AssetType.Details, AssetType.Manifest, AssetType.VSIX)
 			.withFilter(FilterType.ExtensionName, ...extensionNames);
 
-		return this.queryGallery(query).then(result => {
+		return this.queryGallery(query, token).then(result => {
 			const dependencies = [];
 			const ids = [];
 
 			for (let index = 0; index < result.galleryExtensions.length; index++) {
 				const rawExtension = result.galleryExtensions[index];
 				if (ids.indexOf(rawExtension.extensionId) === -1) {
-					dependencies.push(toExtension(rawExtension, this.extensionsGalleryUrl, index, query, 'dependencies'));
+					dependencies.push(toExtension(rawExtension, rawExtension.versions[0], index, query, 'dependencies'));
 					ids.push(rawExtension.extensionId);
 				}
 			}
@@ -607,7 +631,7 @@ export class ExtensionGalleryService implements IExtensionGalleryService {
 		});
 	}
 
-	private getDependenciesReccursively(toGet: string[], result: IGalleryExtension[]): TPromise<IGalleryExtension[]> {
+	private getDependenciesReccursively(toGet: string[], result: IGalleryExtension[], token: CancellationToken): TPromise<IGalleryExtension[]> {
 		if (!toGet || !toGet.length) {
 			return TPromise.wrap(result);
 		}
@@ -616,7 +640,7 @@ export class ExtensionGalleryService implements IExtensionGalleryService {
 			return TPromise.wrap(result);
 		}
 
-		return this.loadDependencies(toGet)
+		return this.loadDependencies(toGet, token)
 			.then(loadedDependencies => {
 				const dependenciesSet = new Set<string>();
 				for (const dep of loadedDependencies) {
@@ -627,11 +651,11 @@ export class ExtensionGalleryService implements IExtensionGalleryService {
 				result = distinct(result.concat(loadedDependencies), d => d.identifier.uuid);
 				const dependencies: string[] = [];
 				dependenciesSet.forEach(d => !ExtensionGalleryService.hasExtensionByName(result, d) && dependencies.push(d));
-				return this.getDependenciesReccursively(dependencies, result);
+				return this.getDependenciesReccursively(dependencies, result, token);
 			});
 	}
 
-	private getAsset(asset: IGalleryExtensionAsset, options: IRequestOptions = {}): TPromise<IRequestContext> {
+	private getAsset(asset: IGalleryExtensionAsset, options: IRequestOptions = {}, token: CancellationToken = CancellationToken.None): TPromise<IRequestContext> {
 		return this.commonHeadersPromise.then(commonHeaders => {
 			const baseOptions = { type: 'GET' };
 			const headers = assign({}, commonHeaders, options.headers || {});
@@ -641,7 +665,7 @@ export class ExtensionGalleryService implements IExtensionGalleryService {
 			const fallbackUrl = asset.fallbackUri;
 			const firstOptions = assign({}, options, { url });
 
-			return this.requestService.request(firstOptions)
+			return this.requestService.request(firstOptions, token)
 				.then(context => {
 					if (context.res.statusCode === 200) {
 						return TPromise.as(context);
@@ -673,7 +697,7 @@ export class ExtensionGalleryService implements IExtensionGalleryService {
 					this.telemetryService.publicLog('galleryService:cdnFallback', { url, message });
 
 					const fallbackOptions = assign({}, options, { url: fallbackUrl });
-					return this.requestService.request(fallbackOptions).then(null, err => {
+					return this.requestService.request(fallbackOptions, token).then(null, err => {
 						if (isPromiseCanceledError(err)) {
 							return TPromise.wrapError<IRequestContext>(err);
 						}
@@ -756,7 +780,7 @@ export class ExtensionGalleryService implements IExtensionGalleryService {
 			return TPromise.as([]);
 		}
 
-		return this.requestService.request({ type: 'GET', url: this.extensionsControlUrl }).then(context => {
+		return this.requestService.request({ type: 'GET', url: this.extensionsControlUrl }, CancellationToken.None).then(context => {
 			if (context.res.statusCode !== 200) {
 				return TPromise.wrapError(new Error('Could not get extensions report.'));
 			}
@@ -804,4 +828,4 @@ export function resolveMarketplaceHeaders(environmentService: IEnvironmentServic
 			'X-Market-User-Id': uuid
 		};
 	});
-}
\ No newline at end of file
+}
diff --git a/src/vs/platform/extensionManagement/node/extensionLifecycle.ts b/src/vs/platform/extensionManagement/node/extensionLifecycle.ts
index cbeef87b2bc..7589d439876 100644
--- a/src/vs/platform/extensionManagement/node/extensionLifecycle.ts
+++ b/src/vs/platform/extensionManagement/node/extensionLifecycle.ts
@@ -10,9 +10,10 @@ import { TPromise } from 'vs/base/common/winjs.base';
 import { ILogService } from 'vs/platform/log/common/log';
 import { fork, ChildProcess } from 'child_process';
 import { toErrorMessage } from 'vs/base/common/errorMessage';
-import { join } from 'vs/base/common/paths';
+import { posix } from 'path';
 import { Limiter } from 'vs/base/common/async';
 import { fromNodeEventEmitter, anyEvent, mapEvent, debounceEvent } from 'vs/base/common/event';
+import { Schemas } from 'vs/base/common/network';
 
 export class ExtensionsLifecycle extends Disposable {
 
@@ -36,13 +37,13 @@ export class ExtensionsLifecycle extends Disposable {
 	}
 
 	private parseUninstallScript(extension: ILocalExtension): { uninstallHook: string, args: string[] } {
-		if (extension.manifest && extension.manifest['scripts'] && typeof extension.manifest['scripts']['vscode:uninstall'] === 'string') {
+		if (extension.location.scheme === Schemas.file && extension.manifest && extension.manifest['scripts'] && typeof extension.manifest['scripts']['vscode:uninstall'] === 'string') {
 			const uninstallScript = (<string>extension.manifest['scripts']['vscode:uninstall']).split(' ');
 			if (uninstallScript.length < 2 || uninstallScript[0] !== 'node' || !uninstallScript[1]) {
 				this.logService.warn(extension.identifier.id, 'Uninstall script should be a node script');
 				return null;
 			}
-			return { uninstallHook: join(extension.path, uninstallScript[1]), args: uninstallScript.slice(2) || [] };
+			return { uninstallHook: posix.join(extension.location.fsPath, uninstallScript[1]), args: uninstallScript.slice(2) || [] };
 		}
 		return null;
 	}
diff --git a/src/vs/platform/extensionManagement/node/extensionManagementIpc.ts b/src/vs/platform/extensionManagement/node/extensionManagementIpc.ts
new file mode 100644
index 00000000000..5c20a9e30b0
--- /dev/null
+++ b/src/vs/platform/extensionManagement/node/extensionManagementIpc.ts
@@ -0,0 +1,135 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+import { TPromise } from 'vs/base/common/winjs.base';
+import { IChannel } from 'vs/base/parts/ipc/node/ipc';
+import { IExtensionManagementService, ILocalExtension, InstallExtensionEvent, DidInstallExtensionEvent, IGalleryExtension, LocalExtensionType, DidUninstallExtensionEvent, IExtensionIdentifier, IGalleryMetadata, IReportedExtension } from '../common/extensionManagement';
+import { Event, buffer, mapEvent } from 'vs/base/common/event';
+import { URI } from 'vs/base/common/uri';
+import { IURITransformer } from 'vs/base/common/uriIpc';
+
+export interface IExtensionManagementChannel extends IChannel {
+	listen(event: 'onInstallExtension'): Event<InstallExtensionEvent>;
+	listen(event: 'onDidInstallExtension'): Event<DidInstallExtensionEvent>;
+	listen(event: 'onUninstallExtension'): Event<IExtensionIdentifier>;
+	listen(event: 'onDidUninstallExtension'): Event<DidUninstallExtensionEvent>;
+
+	call(command: 'zip', args: [ILocalExtension]): Thenable<URI>;
+	call(command: 'unzip', args: [URI, LocalExtensionType]): Thenable<IExtensionIdentifier>;
+	call(command: 'install', args: [URI]): Thenable<IExtensionIdentifier>;
+	call(command: 'installFromGallery', args: [IGalleryExtension]): Thenable<void>;
+	call(command: 'uninstall', args: [ILocalExtension, boolean]): Thenable<void>;
+	call(command: 'reinstallFromGallery', args: [ILocalExtension]): Thenable<void>;
+	call(command: 'getInstalled', args: [LocalExtensionType]): Thenable<ILocalExtension[]>;
+	call(command: 'getExtensionsReport'): Thenable<IReportedExtension[]>;
+	call(command: 'updateMetadata', args: [ILocalExtension, IGalleryMetadata]): Thenable<ILocalExtension>;
+}
+
+export class ExtensionManagementChannel implements IExtensionManagementChannel {
+
+	onInstallExtension: Event<InstallExtensionEvent>;
+	onDidInstallExtension: Event<DidInstallExtensionEvent>;
+	onUninstallExtension: Event<IExtensionIdentifier>;
+	onDidUninstallExtension: Event<DidUninstallExtensionEvent>;
+
+	constructor(private service: IExtensionManagementService) {
+		this.onInstallExtension = buffer(service.onInstallExtension, true);
+		this.onDidInstallExtension = buffer(service.onDidInstallExtension, true);
+		this.onUninstallExtension = buffer(service.onUninstallExtension, true);
+		this.onDidUninstallExtension = buffer(service.onDidUninstallExtension, true);
+	}
+
+	listen(event: string): Event<any> {
+		switch (event) {
+			case 'onInstallExtension': return this.onInstallExtension;
+			case 'onDidInstallExtension': return this.onDidInstallExtension;
+			case 'onUninstallExtension': return this.onUninstallExtension;
+			case 'onDidUninstallExtension': return this.onDidUninstallExtension;
+		}
+
+		throw new Error('Invalid listen');
+	}
+
+	call(command: string, args?: any): Thenable<any> {
+		switch (command) {
+			case 'zip': return this.service.zip(this._transform(args[0]));
+			case 'unzip': return this.service.unzip(URI.revive(args[0]), args[1]);
+			case 'install': return this.service.install(URI.revive(args[0]));
+			case 'installFromGallery': return this.service.installFromGallery(args[0]);
+			case 'uninstall': return this.service.uninstall(this._transform(args[0]), args[1]);
+			case 'reinstallFromGallery': return this.service.reinstallFromGallery(this._transform(args[0]));
+			case 'getInstalled': return this.service.getInstalled(args[0]);
+			case 'updateMetadata': return this.service.updateMetadata(this._transform(args[0]), args[1]);
+			case 'getExtensionsReport': return this.service.getExtensionsReport();
+		}
+
+		throw new Error('Invalid call');
+	}
+
+	private _transform(extension: ILocalExtension): ILocalExtension {
+		return extension ? { ...extension, ...{ location: URI.revive(extension.location) } } : extension;
+	}
+}
+
+export class ExtensionManagementChannelClient implements IExtensionManagementService {
+
+	_serviceBrand: any;
+
+	constructor(private channel: IExtensionManagementChannel, private uriTransformer: IURITransformer) { }
+
+	get onInstallExtension(): Event<InstallExtensionEvent> { return this.channel.listen('onInstallExtension'); }
+	get onDidInstallExtension(): Event<DidInstallExtensionEvent> { return mapEvent(this.channel.listen('onDidInstallExtension'), i => ({ ...i, local: this._transformIncoming(i.local) })); }
+	get onUninstallExtension(): Event<IExtensionIdentifier> { return this.channel.listen('onUninstallExtension'); }
+	get onDidUninstallExtension(): Event<DidUninstallExtensionEvent> { return this.channel.listen('onDidUninstallExtension'); }
+
+	zip(extension: ILocalExtension): TPromise<URI> {
+		return TPromise.wrap(this.channel.call('zip', [this._transformOutgoing(extension)]).then(result => URI.revive(this.uriTransformer.transformIncoming(result))));
+	}
+
+	unzip(zipLocation: URI, type: LocalExtensionType): TPromise<IExtensionIdentifier> {
+		return TPromise.wrap(this.channel.call('unzip', [this.uriTransformer.transformOutgoing(zipLocation), type]));
+	}
+
+	install(vsix: URI): TPromise<IExtensionIdentifier> {
+		return TPromise.wrap(this.channel.call('install', [this.uriTransformer.transformOutgoing(vsix)]));
+	}
+
+	installFromGallery(extension: IGalleryExtension): TPromise<void> {
+		return TPromise.wrap(this.channel.call('installFromGallery', [extension]));
+	}
+
+	uninstall(extension: ILocalExtension, force = false): TPromise<void> {
+		return TPromise.wrap(this.channel.call('uninstall', [this._transformOutgoing(extension), force]));
+	}
+
+	reinstallFromGallery(extension: ILocalExtension): TPromise<void> {
+		return TPromise.wrap(this.channel.call('reinstallFromGallery', [this._transformOutgoing(extension)]));
+	}
+
+	getInstalled(type: LocalExtensionType = null): TPromise<ILocalExtension[]> {
+		return TPromise.wrap(this.channel.call('getInstalled', [type]))
+			.then(extensions => extensions.map(extension => this._transformIncoming(extension)));
+	}
+
+	updateMetadata(local: ILocalExtension, metadata: IGalleryMetadata): TPromise<ILocalExtension> {
+		return TPromise.wrap(this.channel.call('updateMetadata', [this._transformOutgoing(local), metadata]))
+			.then(extension => this._transformIncoming(extension));
+	}
+
+	getExtensionsReport(): TPromise<IReportedExtension[]> {
+		return TPromise.wrap(this.channel.call('getExtensionsReport'));
+	}
+
+	private _transformIncoming(extension: ILocalExtension): ILocalExtension {
+		return extension ? { ...extension, ...{ location: URI.revive(this.uriTransformer.transformIncoming(extension.location)) } } : extension;
+	}
+
+	private _transformOutgoing(extension: ILocalExtension): ILocalExtension {
+		return extension ? { ...extension, ...{ location: this.uriTransformer.transformOutgoing(extension.location) } } : extension;
+	}
+
+}
\ No newline at end of file
diff --git a/src/vs/platform/extensionManagement/node/extensionManagementService.ts b/src/vs/platform/extensionManagement/node/extensionManagementService.ts
index 5d7e31e087c..d11c7424985 100644
--- a/src/vs/platform/extensionManagement/node/extensionManagementService.ts
+++ b/src/vs/platform/extensionManagement/node/extensionManagementService.ts
@@ -11,9 +11,9 @@ import * as pfs from 'vs/base/node/pfs';
 import * as errors from 'vs/base/common/errors';
 import { assign } from 'vs/base/common/objects';
 import { toDisposable, Disposable } from 'vs/base/common/lifecycle';
-import { flatten, distinct } from 'vs/base/common/arrays';
-import { extract, buffer, ExtractError } from 'vs/base/node/zip';
-import { TPromise } from 'vs/base/common/winjs.base';
+import { flatten } from 'vs/base/common/arrays';
+import { extract, buffer, ExtractError, zip, IFile } from 'vs/platform/node/zip';
+import { TPromise, ValueCallback, ErrorCallback } from 'vs/base/common/winjs.base';
 import {
 	IExtensionManagementService, IExtensionGalleryService, ILocalExtension,
 	IGalleryExtension, IExtensionManifest, IGalleryMetadata,
@@ -26,10 +26,10 @@ import {
 import { getGalleryExtensionIdFromLocal, adoptToGalleryExtensionId, areSameExtensions, getGalleryExtensionId, groupByExtension, getMaliciousExtensionsSet, getLocalExtensionId, getGalleryExtensionTelemetryData, getLocalExtensionTelemetryData, getIdFromLocalExtensionId } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
 import { localizeManifest } from '../common/extensionNls';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { Limiter, always } from 'vs/base/common/async';
+import { Limiter, always, createCancelablePromise, CancelablePromise } from 'vs/base/common/async';
 import { Event, Emitter } from 'vs/base/common/event';
 import * as semver from 'semver';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import pkg from 'vs/platform/node/package';
 import { isMacintosh, isWindows } from 'vs/base/common/platform';
 import { ILogService } from 'vs/platform/log/common/log';
@@ -40,8 +40,13 @@ import { ExtensionsLifecycle } from 'vs/platform/extensionManagement/node/extens
 import { toErrorMessage } from 'vs/base/common/errorMessage';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { isEngineValid } from 'vs/platform/extensions/node/extensionValidator';
+import { tmpdir } from 'os';
+import { generateUuid } from 'vs/base/common/uuid';
+import { IDownloadService } from 'vs/platform/download/common/download';
+import { optional } from 'vs/platform/instantiation/common/instantiation';
+import { Schemas } from 'vs/base/common/network';
+import { CancellationToken } from 'vs/base/common/cancellation';
 
-const SystemExtensionsRoot = path.normalize(path.join(URI.parse(require.toUrl('')).fsPath, '..', 'extensions'));
 const ERROR_SCANNING_SYS_EXTENSIONS = 'scanningSystem';
 const ERROR_SCANNING_USER_EXTENSIONS = 'scanningUser';
 const INSTALL_ERROR_UNSET_UNINSTALLED = 'unsetUninstalled';
@@ -53,6 +58,7 @@ const INSTALL_ERROR_LOCAL = 'local';
 const INSTALL_ERROR_EXTRACTING = 'extracting';
 const INSTALL_ERROR_RENAMING = 'renaming';
 const INSTALL_ERROR_DELETING = 'deleting';
+const INSTALL_ERROR_MALICIOUS = 'malicious';
 const ERROR_UNKNOWN = 'unknown';
 
 export class ExtensionManagementError extends Error {
@@ -107,13 +113,14 @@ export class ExtensionManagementService extends Disposable implements IExtension
 
 	_serviceBrand: any;
 
+	private systemExtensionsPath: string;
 	private extensionsPath: string;
 	private uninstalledPath: string;
 	private uninstalledFileLimiter: Limiter<void>;
 	private reportedExtensions: TPromise<IReportedExtension[]> | undefined;
 	private lastReportTimestamp = 0;
-	private readonly installationStartTime: Map<string, number> = new Map<string, number>();
-	private readonly installingExtensions: Map<string, TPromise<ILocalExtension>> = new Map<string, TPromise<ILocalExtension>>();
+	private readonly installingExtensions: Map<string, CancelablePromise<void>> = new Map<string, CancelablePromise<void>>();
+	private readonly uninstallingExtensions: Map<string, CancelablePromise<void>> = new Map<string, CancelablePromise<void>>();
 	private readonly manifestCache: ExtensionsManifestCache;
 	private readonly extensionLifecycle: ExtensionsLifecycle;
 
@@ -134,48 +141,108 @@ export class ExtensionManagementService extends Disposable implements IExtension
 		@IDialogService private dialogService: IDialogService,
 		@IExtensionGalleryService private galleryService: IExtensionGalleryService,
 		@ILogService private logService: ILogService,
+		@optional(IDownloadService) private downloadService: IDownloadService,
 		@ITelemetryService private telemetryService: ITelemetryService,
 	) {
 		super();
+		this.systemExtensionsPath = environmentService.builtinExtensionsPath;
 		this.extensionsPath = environmentService.extensionsPath;
 		this.uninstalledPath = path.join(this.extensionsPath, '.obsolete');
 		this.uninstalledFileLimiter = new Limiter(1);
-		this._register(toDisposable(() => this.installingExtensions.clear()));
 		this.manifestCache = this._register(new ExtensionsManifestCache(environmentService, this));
 		this.extensionLifecycle = this._register(new ExtensionsLifecycle(this.logService));
+
+		this._register(toDisposable(() => {
+			this.installingExtensions.forEach(promise => promise.cancel());
+			this.uninstallingExtensions.forEach(promise => promise.cancel());
+			this.installingExtensions.clear();
+			this.uninstallingExtensions.clear();
+		}));
 	}
 
-	install(zipPath: string): TPromise<ILocalExtension> {
-		zipPath = path.resolve(zipPath);
+	zip(extension: ILocalExtension): TPromise<URI> {
+		return TPromise.wrap(this.collectFiles(extension))
+			.then(files => zip(path.join(tmpdir(), generateUuid()), files))
+			.then(path => URI.file(path));
+	}
 
-		return validateLocalExtension(zipPath)
-			.then(manifest => {
-				const identifier = { id: getLocalExtensionIdFromManifest(manifest) };
-				if (manifest.engines && manifest.engines.vscode && !isEngineValid(manifest.engines.vscode)) {
-					return TPromise.wrapError<ILocalExtension>(new Error(nls.localize('incompatible', "Unable to install Extension '{0}' as it is not compatible with Code '{1}'.", identifier.id, pkg.version)));
+	unzip(zipLocation: URI, type: LocalExtensionType): TPromise<IExtensionIdentifier> {
+		return this.install(zipLocation, type);
+	}
+
+	private collectFiles(extension: ILocalExtension): Promise<IFile[]> {
+
+		const collectFilesFromDirectory = async (dir): Promise<string[]> => {
+			let entries = await pfs.readdir(dir);
+			entries = entries.map(e => path.join(dir, e));
+			const stats = await Promise.all(entries.map(e => pfs.stat(e)));
+			let promise: Promise<string[]> = Promise.resolve([]);
+			stats.forEach((stat, index) => {
+				const entry = entries[index];
+				if (stat.isFile()) {
+					promise = promise.then(result => ([...result, entry]));
+				}
+				if (stat.isDirectory()) {
+					promise = promise
+						.then(result => collectFilesFromDirectory(entry)
+							.then(files => ([...result, ...files])));
 				}
-				return this.removeIfExists(identifier.id)
-					.then(
-						() => this.checkOutdated(manifest)
-							.then(validated => {
-								if (validated) {
-									this.logService.info('Installing the extension:', identifier.id);
-									this._onInstallExtension.fire({ identifier, zipPath });
-									return this.getMetadata(getGalleryExtensionId(manifest.publisher, manifest.name))
-										.then(
-											metadata => this.installFromZipPath(identifier, zipPath, metadata, manifest),
-											error => this.installFromZipPath(identifier, zipPath, null, manifest))
-										.then(
-											local => { this.logService.info('Successfully installed the extension:', identifier.id); return local; },
-											e => {
-												this.logService.error('Failed to install the extension:', identifier.id, e.message);
-												return TPromise.wrapError(e);
-											});
-								}
-								return null;
-							}),
-						e => TPromise.wrapError(new Error(nls.localize('restartCode', "Please restart Code before reinstalling {0}.", manifest.displayName || manifest.name))));
 			});
+			return promise;
+		};
+
+		return collectFilesFromDirectory(extension.location.fsPath)
+			.then(files => files.map(f => (<IFile>{ path: `extension/${path.relative(extension.location.fsPath, f)}`, localPath: f })));
+
+	}
+
+	install(vsix: URI, type: LocalExtensionType = LocalExtensionType.User): TPromise<IExtensionIdentifier> {
+		return TPromise.wrap(createCancelablePromise(token => {
+			return this.downloadVsix(vsix)
+				.then(downloadLocation => {
+					const zipPath = path.resolve(downloadLocation.fsPath);
+
+					return validateLocalExtension(zipPath)
+						.then(manifest => {
+							const identifier = { id: getLocalExtensionIdFromManifest(manifest) };
+							if (manifest.engines && manifest.engines.vscode && !isEngineValid(manifest.engines.vscode)) {
+								return TPromise.wrapError<IExtensionIdentifier>(new Error(nls.localize('incompatible', "Unable to install Extension '{0}' as it is not compatible with Code '{1}'.", identifier.id, pkg.version)));
+							}
+							return this.removeIfExists(identifier.id)
+								.then(
+									() => this.checkOutdated(manifest)
+										.then(validated => {
+											if (validated) {
+												this.logService.info('Installing the extension:', identifier.id);
+												this._onInstallExtension.fire({ identifier, zipPath });
+												return this.getMetadata(getGalleryExtensionId(manifest.publisher, manifest.name))
+													.then(
+														metadata => this.installFromZipPath(identifier, zipPath, metadata, type, token),
+														error => this.installFromZipPath(identifier, zipPath, null, type, token))
+													.then(
+														() => { this.logService.info('Successfully installed the extension:', identifier.id); return identifier; },
+														e => {
+															this.logService.error('Failed to install the extension:', identifier.id, e.message);
+															return TPromise.wrapError(e);
+														});
+											}
+											return null;
+										}),
+									e => TPromise.wrapError(new Error(nls.localize('restartCode', "Please restart Code before reinstalling {0}.", manifest.displayName || manifest.name))));
+						});
+				});
+		}));
+	}
+
+	private downloadVsix(vsix: URI): TPromise<URI> {
+		if (vsix.scheme === Schemas.file) {
+			return TPromise.as(vsix);
+		}
+		if (!this.downloadService) {
+			throw new Error('Download service is not available');
+		}
+		const downloadedLocation = path.join(tmpdir(), generateUuid());
+		return this.downloadService.download(vsix, downloadedLocation).then(() => URI.file(downloadedLocation));
 	}
 
 	private removeIfExists(id: string): TPromise<void> {
@@ -207,52 +274,74 @@ export class ExtensionManagementService extends Disposable implements IExtension
 			});
 	}
 
-	private installFromZipPath(identifier: IExtensionIdentifier, zipPath: string, metadata: IGalleryMetadata, manifest: IExtensionManifest): TPromise<ILocalExtension> {
-		return this.getInstalled()
+	private installFromZipPath(identifier: IExtensionIdentifier, zipPath: string, metadata: IGalleryMetadata, type: LocalExtensionType, token: CancellationToken): TPromise<ILocalExtension> {
+		return this.toNonCancellablePromise(this.getInstalled()
 			.then(installed => {
 				const operation = this.getOperation({ id: getIdFromLocalExtensionId(identifier.id), uuid: identifier.uuid }, installed);
-				return this.installExtension({ zipPath, id: identifier.id, metadata })
-					.then(local => {
-						if (this.galleryService.isEnabled() && local.manifest.extensionDependencies && local.manifest.extensionDependencies.length) {
-							return this.getDependenciesToInstall(local.manifest.extensionDependencies)
-								.then(dependenciesToInstall => {
-									dependenciesToInstall = metadata ? dependenciesToInstall.filter(d => d.identifier.uuid !== metadata.id) : dependenciesToInstall;
-									return this.downloadAndInstallExtensions(dependenciesToInstall, dependenciesToInstall.map(d => this.getOperation(d.identifier, installed)));
-								})
-								.then(() => local, error => {
-									this.setUninstalled(local);
-									return TPromise.wrapError(new Error(nls.localize('errorInstallingDependencies', "Error while installing dependencies. {0}", error instanceof Error ? error.message : error)));
-								});
-						}
-						return local;
-					})
+				return this.installExtension({ zipPath, id: identifier.id, metadata }, type, token)
+					.then(local => this.installDependenciesAndPackExtensions(local, null).then(() => local, error => this.uninstall(local, true).then(() => TPromise.wrapError(error), () => TPromise.wrapError(error))))
 					.then(
 						local => { this._onDidInstallExtension.fire({ identifier, zipPath, local, operation }); return local; },
 						error => { this._onDidInstallExtension.fire({ identifier, zipPath, operation, error }); return TPromise.wrapError(error); }
 					);
-			});
+			}));
 	}
 
-	installFromGallery(extension: IGalleryExtension): TPromise<ILocalExtension> {
-		this.onInstallExtensions([extension]);
-		return this.getInstalled(LocalExtensionType.User)
-			.then(installed => this.collectExtensionsToInstall(extension)
-				.then(
-					extensionsToInstall => {
-						if (extensionsToInstall.length > 1) {
-							this.onInstallExtensions(extensionsToInstall.slice(1));
-						}
-						const operataions: InstallOperation[] = extensionsToInstall.map(e => this.getOperation(e.identifier, installed));
-						return this.downloadAndInstallExtensions(extensionsToInstall, operataions)
-							.then(
-								locals => this.onDidInstallExtensions(extensionsToInstall, locals, operataions, [])
-									.then(() => locals.filter(l => areSameExtensions({ id: getGalleryExtensionIdFromLocal(l), uuid: l.identifier.uuid }, extension.identifier))[0]),
-								errors => this.onDidInstallExtensions(extensionsToInstall, [], operataions, errors));
-					},
-					error => this.onDidInstallExtensions([extension], [], [this.getOperation(extension.identifier, installed)], [error])));
+	installFromGallery(extension: IGalleryExtension): TPromise<void> {
+		let cancellablePromise = this.installingExtensions.get(extension.identifier.id);
+		if (!cancellablePromise) {
+
+			let cancellationToken: CancellationToken, successCallback: ValueCallback<void>, errorCallback: ErrorCallback;
+			cancellablePromise = createCancelablePromise(token => { cancellationToken = token; return new TPromise((c, e) => { successCallback = c; errorCallback = e; }); });
+			this.installingExtensions.set(extension.identifier.id, cancellablePromise);
+
+			try {
+				const startTime = new Date().getTime();
+				const identifier = { id: getLocalExtensionIdFromGallery(extension, extension.version), uuid: extension.identifier.uuid };
+				const telemetryData = getGalleryExtensionTelemetryData(extension);
+				let operation: InstallOperation = InstallOperation.Install;
+
+				this.logService.info('Installing extension:', extension.name);
+				this._onInstallExtension.fire({ identifier, gallery: extension });
+
+				this.checkMalicious(extension)
+					.then(() => this.getInstalled(LocalExtensionType.User))
+					.then(installed => {
+						const existingExtension = installed.filter(i => areSameExtensions(i.galleryIdentifier, extension.identifier))[0];
+						operation = existingExtension ? InstallOperation.Update : InstallOperation.Install;
+						return this.downloadInstallableExtension(extension, operation)
+							.then(installableExtension => this.installExtension(installableExtension, LocalExtensionType.User, cancellationToken).then(local => always(pfs.rimraf(installableExtension.zipPath), () => null).then(() => local)))
+							.then(local => this.installDependenciesAndPackExtensions(local, existingExtension)
+								.then(() => local, error => this.uninstall(local, true).then(() => TPromise.wrapError(error), () => TPromise.wrapError(error))));
+					})
+					.then(
+						local => {
+							this.installingExtensions.delete(extension.identifier.id);
+							this.logService.info(`Extensions installed successfully:`, extension.identifier.id);
+							this._onDidInstallExtension.fire({ identifier, gallery: extension, local, operation });
+							this.reportTelemetry(this.getTelemetryEvent(operation), telemetryData, new Date().getTime() - startTime, void 0);
+							successCallback(null);
+						},
+						error => {
+							this.installingExtensions.delete(extension.identifier.id);
+							const errorCode = error && (<ExtensionManagementError>error).code ? (<ExtensionManagementError>error).code : ERROR_UNKNOWN;
+							this.logService.error(`Failed to install extension:`, extension.identifier.id, error ? error.message : errorCode);
+							this._onDidInstallExtension.fire({ identifier, gallery: extension, operation, error: errorCode });
+							this.reportTelemetry(this.getTelemetryEvent(operation), telemetryData, new Date().getTime() - startTime, error);
+							errorCallback(error);
+						});
+
+			} catch (error) {
+				this.installingExtensions.delete(extension.identifier.id);
+				errorCallback(error);
+			}
+
+		}
+
+		return TPromise.wrap(cancellablePromise);
 	}
 
-	reinstallFromGallery(extension: ILocalExtension): TPromise<ILocalExtension> {
+	reinstallFromGallery(extension: ILocalExtension): TPromise<void> {
 		if (!this.galleryService.isEnabled()) {
 			return TPromise.wrapError(new Error(nls.localize('MarketPlaceDisabled', "Marketplace is not enabled")));
 		}
@@ -273,46 +362,19 @@ export class ExtensionManagementService extends Disposable implements IExtension
 		return installed.some(i => areSameExtensions({ id: getGalleryExtensionIdFromLocal(i), uuid: i.identifier.uuid }, extensionToInstall)) ? InstallOperation.Update : InstallOperation.Install;
 	}
 
-	private collectExtensionsToInstall(extension: IGalleryExtension): TPromise<IGalleryExtension[]> {
-		return this.galleryService.loadCompatibleVersion(extension)
-			.then(compatible => {
-				if (!compatible) {
-					return TPromise.wrapError<IGalleryExtension[]>(new ExtensionManagementError(nls.localize('notFoundCompatible', "Unable to install '{0}'; there is no available version compatible with VS Code '{1}'.", extension.identifier.id, pkg.version), INSTALL_ERROR_INCOMPATIBLE));
+	private getTelemetryEvent(operation: InstallOperation): string {
+		return operation === InstallOperation.Update ? 'extensionGallery:update' : 'extensionGallery:install';
+	}
+
+	private checkMalicious(extension: IGalleryExtension): TPromise<void> {
+		return this.getExtensionsReport()
+			.then(report => {
+				if (getMaliciousExtensionsSet(report).has(extension.identifier.id)) {
+					throw new ExtensionManagementError(INSTALL_ERROR_MALICIOUS, nls.localize('malicious extension', "Can't install extension since it was reported to be problematic."));
+				} else {
+					return null;
 				}
-				return this.getDependenciesToInstall(compatible.properties.dependencies)
-					.then(
-						dependenciesToInstall => ([compatible, ...dependenciesToInstall.filter(d => d.identifier.uuid !== compatible.identifier.uuid)]),
-						error => TPromise.wrapError<IGalleryExtension[]>(new ExtensionManagementError(this.joinErrors(error).message, INSTALL_ERROR_GALLERY)));
-			},
-				error => TPromise.wrapError<IGalleryExtension[]>(new ExtensionManagementError(this.joinErrors(error).message, INSTALL_ERROR_GALLERY)));
-	}
-
-	private downloadAndInstallExtensions(extensions: IGalleryExtension[], operations: InstallOperation[]): TPromise<ILocalExtension[]> {
-		return TPromise.join(extensions.map((extensionToInstall, index) => this.downloadAndInstallExtension(extensionToInstall, operations[index])))
-			.then(null, errors => this.rollback(extensions).then(() => TPromise.wrapError(errors), () => TPromise.wrapError(errors)));
-	}
-
-	private downloadAndInstallExtension(extension: IGalleryExtension, operation: InstallOperation): TPromise<ILocalExtension> {
-		let installingExtension = this.installingExtensions.get(extension.identifier.id);
-		if (!installingExtension) {
-			installingExtension = this.getExtensionsReport()
-				.then(report => {
-					if (getMaliciousExtensionsSet(report).has(extension.identifier.id)) {
-						throw new Error(nls.localize('malicious extension', "Can't install extension since it was reported to be problematic."));
-					} else {
-						return extension;
-					}
-				})
-				.then(extension => this.downloadInstallableExtension(extension, operation))
-				.then(installableExtension => this.installExtension(installableExtension))
-				.then(
-					local => { this.installingExtensions.delete(extension.identifier.id); return local; },
-					e => { this.installingExtensions.delete(extension.identifier.id); return TPromise.wrapError(e); }
-				);
-
-			this.installingExtensions.set(extension.identifier.id, installingExtension);
-		}
-		return installingExtension;
+			});
 	}
 
 	private downloadInstallableExtension(extension: IGalleryExtension, operation: InstallOperation): TPromise<InstallableExtension> {
@@ -327,10 +389,10 @@ export class ExtensionManagementService extends Disposable implements IExtension
 				compatible => {
 					if (compatible) {
 						this.logService.trace('Started downloading extension:', extension.name);
-						return this.galleryService.download(extension, operation)
+						return this.galleryService.download(compatible, operation)
 							.then(
 								zipPath => {
-									this.logService.info('Downloaded extension:', extension.name);
+									this.logService.info('Downloaded extension:', extension.name, zipPath);
 									return validateLocalExtension(zipPath)
 										.then(
 											manifest => (<InstallableExtension>{ zipPath, id: getLocalExtensionIdFromManifest(manifest), metadata }),
@@ -345,62 +407,14 @@ export class ExtensionManagementService extends Disposable implements IExtension
 				error => TPromise.wrapError<InstallableExtension>(new ExtensionManagementError(this.joinErrors(error).message, INSTALL_ERROR_GALLERY)));
 	}
 
-	private onInstallExtensions(extensions: IGalleryExtension[]): void {
-		for (const extension of extensions) {
-			this.logService.info('Installing extension:', extension.name);
-			this.installationStartTime.set(extension.identifier.id, new Date().getTime());
-			const id = getLocalExtensionIdFromGallery(extension, extension.version);
-			this._onInstallExtension.fire({ identifier: { id, uuid: extension.identifier.uuid }, gallery: extension });
-		}
-	}
-
-	private onDidInstallExtensions(extensions: IGalleryExtension[], locals: ILocalExtension[], operations: InstallOperation[], errors: Error[]): TPromise<any> {
-		extensions.forEach((gallery, index) => {
-			const identifier = { id: getLocalExtensionIdFromGallery(gallery, gallery.version), uuid: gallery.identifier.uuid };
-			const local = locals[index];
-			const error = errors[index];
-			const operation = operations[index];
-			if (local) {
-				this.logService.info(`Extensions installed successfully:`, gallery.identifier.id);
-				this._onDidInstallExtension.fire({ identifier, gallery, local, operation });
-			} else {
-				const errorCode = error && (<ExtensionManagementError>error).code ? (<ExtensionManagementError>error).code : ERROR_UNKNOWN;
-				this.logService.error(`Failed to install extension:`, gallery.identifier.id, error ? error.message : errorCode);
-				this._onDidInstallExtension.fire({ identifier, gallery, operation, error: errorCode });
-			}
-			const startTime = this.installationStartTime.get(gallery.identifier.id);
-			this.reportTelemetry(operations[index] === InstallOperation.Update ? 'extensionGallery:update' : 'extensionGallery:install', getGalleryExtensionTelemetryData(gallery), startTime ? new Date().getTime() - startTime : void 0, error);
-			this.installationStartTime.delete(gallery.identifier.id);
-		});
-		return errors.length ? TPromise.wrapError(this.joinErrors(errors)) : TPromise.as(null);
-	}
-
-	private getDependenciesToInstall(dependencies: string[]): TPromise<IGalleryExtension[]> {
-		if (dependencies.length) {
-			return this.getInstalled()
-				.then(installed => {
-					const uninstalledDeps = dependencies.filter(d => installed.every(i => getGalleryExtensionId(i.manifest.publisher, i.manifest.name) !== d));
-					if (uninstalledDeps.length) {
-						return this.galleryService.loadAllDependencies(uninstalledDeps.map(id => (<IExtensionIdentifier>{ id })))
-							.then(allDependencies => allDependencies.filter(d => {
-								const extensionId = getLocalExtensionIdFromGallery(d, d.version);
-								return installed.every(({ identifier }) => identifier.id !== extensionId);
-							}));
-					}
-					return [];
-				});
-		}
-		return TPromise.as([]);
-	}
-
-	private installExtension(installableExtension: InstallableExtension): TPromise<ILocalExtension> {
+	private installExtension(installableExtension: InstallableExtension, type: LocalExtensionType, token: CancellationToken): TPromise<ILocalExtension> {
 		return this.unsetUninstalledAndGetLocal(installableExtension.id)
 			.then(
 				local => {
 					if (local) {
 						return local;
 					}
-					return this.extractAndInstall(installableExtension);
+					return this.extractAndInstall(installableExtension, type, token);
 				},
 				e => {
 					if (isMacintosh) {
@@ -427,13 +441,15 @@ export class ExtensionManagementService extends Disposable implements IExtension
 			});
 	}
 
-	private extractAndInstall({ zipPath, id, metadata }: InstallableExtension): TPromise<ILocalExtension> {
-		const tempPath = path.join(this.extensionsPath, `.${id}`);
-		const extensionPath = path.join(this.extensionsPath, id);
-		return this.extractAndRename(id, zipPath, tempPath, extensionPath)
+	private extractAndInstall({ zipPath, id, metadata }: InstallableExtension, type: LocalExtensionType, token: CancellationToken): TPromise<ILocalExtension> {
+		const location = type === LocalExtensionType.User ? this.extensionsPath : this.systemExtensionsPath;
+		const tempPath = path.join(location, `.${id}`);
+		const extensionPath = path.join(location, id);
+		return pfs.rimraf(extensionPath)
+			.then(() => this.extractAndRename(id, zipPath, tempPath, extensionPath, token), e => TPromise.wrapError(new ExtensionManagementError(nls.localize('errorDeleting', "Unable to delete the existing folder '{0}' while installing the extension '{1}'. Please delete the folder manually and try again", extensionPath, id), INSTALL_ERROR_DELETING)))
 			.then(() => {
 				this.logService.info('Installation completed.', id);
-				return this.scanExtension(id, this.extensionsPath, LocalExtensionType.User);
+				return this.scanExtension(id, location, type);
 			})
 			.then(local => {
 				if (metadata) {
@@ -444,9 +460,9 @@ export class ExtensionManagementService extends Disposable implements IExtension
 			});
 	}
 
-	private extractAndRename(id: string, zipPath: string, extractPath: string, renamePath: string): TPromise<void> {
-		return this.extract(id, zipPath, extractPath)
-			.then(() => this.rename(id, extractPath, renamePath, Date.now() + (30 * 1000) /* Retry for 30 seconds */)
+	private extractAndRename(id: string, zipPath: string, extractPath: string, renamePath: string, token: CancellationToken): TPromise<void> {
+		return this.extract(id, zipPath, extractPath, token)
+			.then(() => this.rename(id, extractPath, renamePath, Date.now() + (2 * 60 * 1000) /* Retry for 2 minutes */)
 				.then(
 					() => this.logService.info('Renamed to', renamePath),
 					e => {
@@ -455,11 +471,11 @@ export class ExtensionManagementService extends Disposable implements IExtension
 					}));
 	}
 
-	private extract(id: string, zipPath: string, extractPath: string): TPromise<void> {
+	private extract(id: string, zipPath: string, extractPath: string, token: CancellationToken): TPromise<void> {
 		this.logService.trace(`Started extracting the extension from ${zipPath} to ${extractPath}`);
 		return pfs.rimraf(extractPath)
 			.then(
-				() => extract(zipPath, extractPath, { sourcePath: 'extension', overwrite: true }, this.logService)
+				() => extract(zipPath, extractPath, { sourcePath: 'extension', overwrite: true }, this.logService, token)
 					.then(
 						() => this.logService.info(`Extracted extension to ${extractPath}:`, id),
 						e => always(pfs.rimraf(extractPath), () => null)
@@ -478,22 +494,55 @@ export class ExtensionManagementService extends Disposable implements IExtension
 			});
 	}
 
+	private installDependenciesAndPackExtensions(installed: ILocalExtension, existing: ILocalExtension): TPromise<void> {
+		if (this.galleryService.isEnabled()) {
+			const dependenciesAndPackExtensions: string[] = installed.manifest.extensionDependencies || [];
+			if (installed.manifest.extensionPack) {
+				for (const extension of installed.manifest.extensionPack) {
+					// add only those extensions which are new in currently installed extension
+					if (!(existing && existing.manifest.extensionPack && existing.manifest.extensionPack.some(old => areSameExtensions({ id: old }, { id: extension })))) {
+						if (dependenciesAndPackExtensions.every(e => !areSameExtensions({ id: e }, { id: extension }))) {
+							dependenciesAndPackExtensions.push(extension);
+						}
+					}
+				}
+			}
+			if (dependenciesAndPackExtensions.length) {
+				return this.getInstalled()
+					.then(installed => {
+						// filter out installing and installed extensions
+						const names = dependenciesAndPackExtensions.filter(id => !this.installingExtensions.has(adoptToGalleryExtensionId(id)) && installed.every(({ galleryIdentifier }) => !areSameExtensions(galleryIdentifier, { id })));
+						if (names.length) {
+							return this.galleryService.query({ names, pageSize: dependenciesAndPackExtensions.length })
+								.then(galleryResult => {
+									const extensionsToInstall = galleryResult.firstPage;
+									return TPromise.join(extensionsToInstall.map(e => this.installFromGallery(e)))
+										.then(() => null, errors => this.rollback(extensionsToInstall).then(() => TPromise.wrapError(errors), () => TPromise.wrapError(errors)));
+								});
+						}
+						return null;
+					});
+			}
+		}
+		return TPromise.as(null);
+	}
+
 	private rollback(extensions: IGalleryExtension[]): TPromise<void> {
 		return this.getInstalled(LocalExtensionType.User)
 			.then(installed =>
 				TPromise.join(installed.filter(local => extensions.some(galleryExtension => local.identifier.id === getLocalExtensionIdFromGallery(galleryExtension, galleryExtension.version))) // Only check id (pub.name-version) because we want to rollback the exact version
-					.map(local => this.setUninstalled(local))))
+					.map(local => this.uninstall(local, true))))
 			.then(() => null, () => null);
 	}
 
 	uninstall(extension: ILocalExtension, force = false): TPromise<void> {
-		return this.getInstalled(LocalExtensionType.User)
+		return this.toNonCancellablePromise(this.getInstalled(LocalExtensionType.User)
 			.then(installed => {
 				const promises = installed
 					.filter(e => e.manifest.publisher === extension.manifest.publisher && e.manifest.name === extension.manifest.name)
-					.map(e => this.checkForDependenciesAndUninstall(e, installed, force));
+					.map(e => this.checkForDependenciesAndUninstall(e, installed));
 				return TPromise.join(promises).then(() => null, error => TPromise.wrapError(this.joinErrors(error)));
-			});
+			}));
 	}
 
 	updateMetadata(local: ILocalExtension, metadata: IGalleryMetadata): TPromise<ILocalExtension> {
@@ -548,9 +597,15 @@ export class ExtensionManagementService extends Disposable implements IExtension
 		}, new Error(''));
 	}
 
-	private checkForDependenciesAndUninstall(extension: ILocalExtension, installed: ILocalExtension[], force: boolean): TPromise<void> {
+	private checkForDependenciesAndUninstall(extension: ILocalExtension, installed: ILocalExtension[]): TPromise<void> {
 		return this.preUninstallExtension(extension)
-			.then(() => this.hasDependencies(extension, installed) ? this.promptForDependenciesAndUninstall(extension, installed, force) : this.uninstallWithDependencies(extension, [], installed))
+			.then(() => {
+				const packedExtensions = this.getAllPackExtensionsToUninstall(extension, installed);
+				if (packedExtensions.length) {
+					return this.uninstallExtensions(extension, packedExtensions, installed);
+				}
+				return this.uninstallExtensions(extension, [], installed);
+			})
 			.then(() => this.postUninstallExtension(extension),
 				error => {
 					this.postUninstallExtension(extension, new ExtensionManagementError(error instanceof Error ? error.message : error, INSTALL_ERROR_LOCAL));
@@ -558,47 +613,15 @@ export class ExtensionManagementService extends Disposable implements IExtension
 				});
 	}
 
-	private hasDependencies(extension: ILocalExtension, installed: ILocalExtension[]): boolean {
-		if (extension.manifest.extensionDependencies && extension.manifest.extensionDependencies.length) {
-			return installed.some(i => extension.manifest.extensionDependencies.indexOf(getGalleryExtensionIdFromLocal(i)) !== -1);
-		}
-		return false;
-	}
-
-	private promptForDependenciesAndUninstall(extension: ILocalExtension, installed: ILocalExtension[], force: boolean): TPromise<void> {
-		if (force) {
-			const dependencies = distinct(this.getDependenciesToUninstallRecursively(extension, installed, [])).filter(e => e !== extension);
-			return this.uninstallWithDependencies(extension, dependencies, installed);
-		}
-
-		const message = nls.localize('uninstallDependeciesConfirmation', "Would you like to uninstall '{0}' only or its dependencies also?", extension.manifest.displayName || extension.manifest.name);
-		const buttons = [
-			nls.localize('uninstallOnly', "Extension Only"),
-			nls.localize('uninstallAll', "Uninstall All"),
-			nls.localize('cancel', "Cancel")
-		];
-		this.logService.info('Requesting for confirmation to uninstall extension with dependencies', extension.identifier.id);
-		return this.dialogService.show(Severity.Info, message, buttons, { cancelId: 2 })
-			.then<void>(value => {
-				if (value === 0) {
-					return this.uninstallWithDependencies(extension, [], installed);
-				}
-				if (value === 1) {
-					const dependencies = distinct(this.getDependenciesToUninstallRecursively(extension, installed, [])).filter(e => e !== extension);
-					return this.uninstallWithDependencies(extension, dependencies, installed);
-				}
-				this.logService.info('Cancelled uninstalling extension:', extension.identifier.id);
-				return TPromise.wrapError(errors.canceled());
-			}, error => TPromise.wrapError(errors.canceled()));
-	}
-
-	private uninstallWithDependencies(extension: ILocalExtension, dependencies: ILocalExtension[], installed: ILocalExtension[]): TPromise<void> {
-		const dependenciesToUninstall = this.filterDependents(extension, dependencies, installed);
-		let dependents = this.getDependents(extension, installed).filter(dependent => extension !== dependent && dependenciesToUninstall.indexOf(dependent) === -1);
+	private uninstallExtensions(extension: ILocalExtension, otherExtensionsToUninstall: ILocalExtension[], installed: ILocalExtension[]): TPromise<void> {
+		const dependents = this.getDependents(extension, installed);
 		if (dependents.length) {
-			return TPromise.wrapError<void>(new Error(this.getDependentsErrorMessage(extension, dependents)));
+			const remainingDependents = dependents.filter(dependent => extension !== dependent && otherExtensionsToUninstall.indexOf(dependent) === -1);
+			if (remainingDependents.length) {
+				return TPromise.wrapError<void>(new Error(this.getDependentsErrorMessage(extension, remainingDependents)));
+			}
 		}
-		return TPromise.join([this.uninstallExtension(extension), ...dependenciesToUninstall.map(d => this.doUninstall(d))]).then(() => null);
+		return TPromise.join([this.uninstallExtension(extension), ...otherExtensionsToUninstall.map(d => this.doUninstall(d))]).then(() => null);
 	}
 
 	private getDependentsErrorMessage(extension: ILocalExtension, dependents: ILocalExtension[]): string {
@@ -614,37 +637,24 @@ export class ExtensionManagementService extends Disposable implements IExtension
 			extension.manifest.displayName || extension.manifest.name, dependents[0].manifest.displayName || dependents[0].manifest.name, dependents[1].manifest.displayName || dependents[1].manifest.name);
 	}
 
-	private getDependenciesToUninstallRecursively(extension: ILocalExtension, installed: ILocalExtension[], checked: ILocalExtension[]): ILocalExtension[] {
+	private getAllPackExtensionsToUninstall(extension: ILocalExtension, installed: ILocalExtension[], checked: ILocalExtension[] = []): ILocalExtension[] {
 		if (checked.indexOf(extension) !== -1) {
 			return [];
 		}
 		checked.push(extension);
-		if (!extension.manifest.extensionDependencies || extension.manifest.extensionDependencies.length === 0) {
+		if (!extension.manifest.extensionPack || extension.manifest.extensionPack.length === 0) {
 			return [];
 		}
-		const dependenciesToUninstall = installed.filter(i => extension.manifest.extensionDependencies.indexOf(getGalleryExtensionIdFromLocal(i)) !== -1);
-		const depsOfDeps = [];
-		for (const dep of dependenciesToUninstall) {
-			depsOfDeps.push(...this.getDependenciesToUninstallRecursively(dep, installed, checked));
+		const packedExtensions = installed.filter(i => extension.manifest.extensionPack.some(id => areSameExtensions({ id }, i.galleryIdentifier)));
+		const packOfPackedExtensions = [];
+		for (const packedExtension of packedExtensions) {
+			packOfPackedExtensions.push(...this.getAllPackExtensionsToUninstall(packedExtension, installed, checked));
 		}
-		return [...dependenciesToUninstall, ...depsOfDeps];
-	}
-
-	private filterDependents(extension: ILocalExtension, dependencies: ILocalExtension[], installed: ILocalExtension[]): ILocalExtension[] {
-		installed = installed.filter(i => i !== extension && i.manifest.extensionDependencies && i.manifest.extensionDependencies.length > 0);
-		let result = dependencies.slice(0);
-		for (let i = 0; i < dependencies.length; i++) {
-			const dep = dependencies[i];
-			const dependents = this.getDependents(dep, installed).filter(e => dependencies.indexOf(e) === -1);
-			if (dependents.length) {
-				result.splice(i - (dependencies.length - result.length), 1);
-			}
-		}
-		return result;
+		return [...packedExtensions, ...packOfPackedExtensions];
 	}
 
 	private getDependents(extension: ILocalExtension, installed: ILocalExtension[]): ILocalExtension[] {
-		return installed.filter(e => e.manifest.extensionDependencies && e.manifest.extensionDependencies.indexOf(getGalleryExtensionIdFromLocal(extension)) !== -1);
+		return installed.filter(e => e.manifest.extensionDependencies && e.manifest.extensionDependencies.some(id => areSameExtensions({ id }, extension.galleryIdentifier)));
 	}
 
 	private doUninstall(extension: ILocalExtension): TPromise<void> {
@@ -658,7 +668,7 @@ export class ExtensionManagementService extends Disposable implements IExtension
 	}
 
 	private preUninstallExtension(extension: ILocalExtension): TPromise<void> {
-		return pfs.exists(extension.path)
+		return pfs.exists(extension.location.fsPath)
 			.then(exists => exists ? null : TPromise.wrapError(new Error(nls.localize('notExists', "Could not find extension"))))
 			.then(() => {
 				this.logService.info('Uninstalling extension:', extension.identifier.id);
@@ -667,12 +677,19 @@ export class ExtensionManagementService extends Disposable implements IExtension
 	}
 
 	private uninstallExtension(local: ILocalExtension): TPromise<void> {
-		// Set all versions of the extension as uninstalled
-		return this.scanUserExtensions(false)
-			.then(userExtensions => this.setUninstalled(...userExtensions.filter(u => areSameExtensions({ id: getGalleryExtensionIdFromLocal(u), uuid: u.identifier.uuid }, { id: getGalleryExtensionIdFromLocal(local), uuid: local.identifier.uuid }))));
+		const id = getGalleryExtensionIdFromLocal(local);
+		let promise = this.uninstallingExtensions.get(id);
+		if (!promise) {
+			// Set all versions of the extension as uninstalled
+			promise = createCancelablePromise(token => this.scanUserExtensions(false)
+				.then(userExtensions => this.setUninstalled(...userExtensions.filter(u => areSameExtensions({ id: getGalleryExtensionIdFromLocal(u), uuid: u.identifier.uuid }, { id, uuid: local.identifier.uuid }))))
+				.then(() => { this.uninstallingExtensions.delete(id); }));
+			this.uninstallingExtensions.set(id, promise);
+		}
+		return TPromise.wrap(promise);
 	}
 
-	private async postUninstallExtension(extension: ILocalExtension, error?: Error): TPromise<void> {
+	private async postUninstallExtension(extension: ILocalExtension, error?: Error): Promise<void> {
 		if (error) {
 			this.logService.error('Failed to uninstall extension:', extension.identifier.id, error.message);
 		} else {
@@ -703,7 +720,7 @@ export class ExtensionManagementService extends Disposable implements IExtension
 
 	private scanSystemExtensions(): TPromise<ILocalExtension[]> {
 		this.logService.trace('Started scanning system extensions');
-		return this.scanExtensions(SystemExtensionsRoot, LocalExtensionType.System)
+		return this.scanExtensions(this.systemExtensionsPath, LocalExtensionType.System)
 			.then(result => {
 				this.logService.info('Scanned system extensions:', result.length);
 				return result;
@@ -746,8 +763,12 @@ export class ExtensionManagementService extends Disposable implements IExtension
 					if (manifest.extensionDependencies) {
 						manifest.extensionDependencies = manifest.extensionDependencies.map(id => adoptToGalleryExtensionId(id));
 					}
+					if (manifest.extensionPack) {
+						manifest.extensionPack = manifest.extensionPack.map(id => adoptToGalleryExtensionId(id));
+					}
 					const identifier = { id: type === LocalExtensionType.System ? folderName : getLocalExtensionIdFromManifest(manifest), uuid: metadata ? metadata.id : null };
-					return { type, identifier, manifest, metadata, path: extensionPath, readmeUrl, changelogUrl };
+					const galleryIdentifier = { id: getGalleryExtensionId(manifest.publisher, manifest.name), uuid: identifier.uuid };
+					return { type, identifier, galleryIdentifier, manifest, metadata, location: URI.file(extensionPath), readmeUrl, changelogUrl };
 				}))
 			.then(null, () => null);
 	}
@@ -788,7 +809,7 @@ export class ExtensionManagementService extends Disposable implements IExtension
 
 	private removeExtension(extension: ILocalExtension, type: string): TPromise<void> {
 		this.logService.trace(`Deleting ${type} extension from disk`, extension.identifier.id);
-		return pfs.rimraf(extension.path).then(() => this.logService.info('Deleted from disk', extension.identifier.id));
+		return pfs.rimraf(extension.location.fsPath).then(() => this.logService.info('Deleted from disk', extension.identifier.id));
 	}
 
 	private isUninstalled(id: string): TPromise<boolean> {
@@ -863,6 +884,10 @@ export class ExtensionManagementService extends Disposable implements IExtension
 			});
 	}
 
+	private toNonCancellablePromise<T>(promise: TPromise<T>): TPromise<T> {
+		return new TPromise((c, e) => promise.then(result => c(result), error => e(error)));
+	}
+
 	private reportTelemetry(eventName: string, extensionData: any, duration: number, error?: Error): void {
 		const errorcode = error ? error instanceof ExtensionManagementError ? error.code : ERROR_UNKNOWN : void 0;
 		/* __GDPR__
diff --git a/src/vs/platform/extensionManagement/node/extensionsManifestCache.ts b/src/vs/platform/extensionManagement/node/extensionsManifestCache.ts
index a4e1887321f..fccfd884505 100644
--- a/src/vs/platform/extensionManagement/node/extensionsManifestCache.ts
+++ b/src/vs/platform/extensionManagement/node/extensionsManifestCache.ts
@@ -37,6 +37,6 @@ export class ExtensionsManifestCache extends Disposable {
 	}
 
 	invalidate(): void {
-		pfs.del(this.extensionsManifestCache).done(() => { }, () => { });
+		pfs.del(this.extensionsManifestCache).then(() => { }, () => { });
 	}
 }
diff --git a/src/vs/platform/extensionManagement/node/multiExtensionManagement.ts b/src/vs/platform/extensionManagement/node/multiExtensionManagement.ts
new file mode 100644
index 00000000000..065bac07359
--- /dev/null
+++ b/src/vs/platform/extensionManagement/node/multiExtensionManagement.ts
@@ -0,0 +1,199 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { TPromise } from 'vs/base/common/winjs.base';
+import { Event, EventMultiplexer } from 'vs/base/common/event';
+import * as pfs from 'vs/base/node/pfs';
+import {
+	IExtensionManagementService, ILocalExtension, IGalleryExtension, LocalExtensionType, InstallExtensionEvent, DidInstallExtensionEvent, IExtensionIdentifier, DidUninstallExtensionEvent, IReportedExtension, IGalleryMetadata,
+	IExtensionManagementServerService, IExtensionManagementServer, IExtensionGalleryService, InstallOperation
+} from 'vs/platform/extensionManagement/common/extensionManagement';
+import { flatten } from 'vs/base/common/arrays';
+import { isWorkspaceExtension, areSameExtensions } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
+import { URI } from 'vs/base/common/uri';
+import { INotificationService, Severity, INotificationHandle } from 'vs/platform/notification/common/notification';
+import { localize } from 'vs/nls';
+import { IWindowService } from 'vs/platform/windows/common/windows';
+import { Action } from 'vs/base/common/actions';
+import { ILogService } from 'vs/platform/log/common/log';
+import { Disposable } from 'vs/base/common/lifecycle';
+import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { CancellationToken } from 'vs/base/common/cancellation';
+
+export class MulitExtensionManagementService extends Disposable implements IExtensionManagementService {
+
+	_serviceBrand: any;
+
+	readonly onInstallExtension: Event<InstallExtensionEvent>;
+	readonly onDidInstallExtension: Event<DidInstallExtensionEvent>;
+	readonly onUninstallExtension: Event<IExtensionIdentifier>;
+	readonly onDidUninstallExtension: Event<DidUninstallExtensionEvent>;
+
+	private readonly servers: IExtensionManagementServer[];
+	private readonly localServer: IExtensionManagementServer;
+	private readonly otherServers: IExtensionManagementServer[];
+
+	constructor(
+		@IExtensionManagementServerService private extensionManagementServerService: IExtensionManagementServerService,
+		@INotificationService private notificationService: INotificationService,
+		@IWindowService private windowService: IWindowService,
+		@ILogService private logService: ILogService,
+		@IExtensionGalleryService private extensionGalleryService: IExtensionGalleryService,
+		@IConfigurationService private configurationService: IConfigurationService
+	) {
+		super();
+		this.servers = this.extensionManagementServerService.extensionManagementServers;
+		this.localServer = this.extensionManagementServerService.getLocalExtensionManagementServer();
+		this.otherServers = this.servers.filter(s => s !== this.localServer);
+
+		this.onInstallExtension = this._register(this.servers.reduce((emitter: EventMultiplexer<InstallExtensionEvent>, server) => { emitter.add(server.extensionManagementService.onInstallExtension); return emitter; }, new EventMultiplexer<InstallExtensionEvent>())).event;
+		this.onDidInstallExtension = this._register(this.servers.reduce((emitter: EventMultiplexer<DidInstallExtensionEvent>, server) => { emitter.add(server.extensionManagementService.onDidInstallExtension); return emitter; }, new EventMultiplexer<DidInstallExtensionEvent>())).event;
+		this.onUninstallExtension = this._register(this.servers.reduce((emitter: EventMultiplexer<IExtensionIdentifier>, server) => { emitter.add(server.extensionManagementService.onUninstallExtension); return emitter; }, new EventMultiplexer<IExtensionIdentifier>())).event;
+		this.onDidUninstallExtension = this._register(this.servers.reduce((emitter: EventMultiplexer<DidUninstallExtensionEvent>, server) => { emitter.add(server.extensionManagementService.onDidUninstallExtension); return emitter; }, new EventMultiplexer<DidUninstallExtensionEvent>())).event;
+
+		if (this.otherServers.length) {
+			this.syncExtensions();
+		}
+	}
+
+	getInstalled(type?: LocalExtensionType): TPromise<ILocalExtension[]> {
+		return TPromise.join(this.servers.map(({ extensionManagementService }) => extensionManagementService.getInstalled(type)))
+			.then(result => flatten(result));
+	}
+
+	uninstall(extension: ILocalExtension, force?: boolean): TPromise<void> {
+		return this.getServer(extension).extensionManagementService.uninstall(extension, force);
+	}
+
+	reinstallFromGallery(extension: ILocalExtension): TPromise<void> {
+		return this.getServer(extension).extensionManagementService.reinstallFromGallery(extension);
+	}
+
+	updateMetadata(extension: ILocalExtension, metadata: IGalleryMetadata): TPromise<ILocalExtension> {
+		return this.getServer(extension).extensionManagementService.updateMetadata(extension, metadata);
+	}
+
+	zip(extension: ILocalExtension): TPromise<URI> {
+		throw new Error('Not Supported');
+	}
+
+	unzip(zipLocation: URI, type: LocalExtensionType): TPromise<IExtensionIdentifier> {
+		return TPromise.join(this.servers.map(({ extensionManagementService }) => extensionManagementService.unzip(zipLocation, type))).then(() => null);
+	}
+
+	install(vsix: URI): TPromise<IExtensionIdentifier> {
+		return this.localServer.extensionManagementService.install(vsix)
+			.then(extensionIdentifer => this.localServer.extensionManagementService.getInstalled(LocalExtensionType.User)
+				.then(installed => {
+					const extension = installed.filter(i => areSameExtensions(i.identifier, extensionIdentifer))[0];
+					if (this.otherServers.length && extension && isWorkspaceExtension(extension.manifest, this.configurationService)) {
+						return TPromise.join(this.otherServers.map(server => server.extensionManagementService.install(vsix)))
+							.then(() => extensionIdentifer);
+					}
+					return extensionIdentifer;
+				}));
+	}
+
+	installFromGallery(gallery: IGalleryExtension): TPromise<void> {
+		if (this.otherServers.length === 0) {
+			return this.localServer.extensionManagementService.installFromGallery(gallery);
+		}
+		return this.extensionGalleryService.getManifest(gallery, CancellationToken.None)
+			.then(manifest => {
+				const servers = isWorkspaceExtension(manifest, this.configurationService) ? this.servers : [this.localServer];
+				return TPromise.join(servers.map(server => server.extensionManagementService.installFromGallery(gallery)))
+					.then(() => null);
+			});
+	}
+
+	getExtensionsReport(): TPromise<IReportedExtension[]> {
+		return this.extensionManagementServerService.getLocalExtensionManagementServer().extensionManagementService.getExtensionsReport();
+	}
+
+	private getServer(extension: ILocalExtension): IExtensionManagementServer {
+		return this.extensionManagementServerService.getExtensionManagementServer(extension.location);
+	}
+
+	private async syncExtensions(): Promise<void> {
+		this.localServer.extensionManagementService.getInstalled(LocalExtensionType.User)
+			.then(async localExtensions => {
+				const workspaceExtensions = localExtensions.filter(e => isWorkspaceExtension(e.manifest, this.configurationService));
+				const extensionsToSync: Map<IExtensionManagementServer, ILocalExtension[]> = await this.getExtensionsToSync(workspaceExtensions);
+				if (extensionsToSync.size > 0) {
+					const handler = this.notificationService.notify({ severity: Severity.Info, message: localize('synchronising', "Synchronising workspace extensions...") });
+					handler.progress.infinite();
+					this.doSyncExtensions(extensionsToSync, handler).then(() => {
+						handler.progress.done();
+						handler.updateMessage(localize('Synchronize.finished', "Finished synchronising. Please reload now."));
+						handler.updateActions({
+							primary: [
+								new Action('Synchronize.reloadNow', localize('Synchronize.reloadNow', "Reload Now"), null, true, () => this.windowService.reloadWindow())
+							]
+						});
+					}, error => {
+						handler.progress.done();
+						handler.updateSeverity(Severity.Error);
+						handler.updateMessage(error);
+					});
+				}
+			}, err => this.logService.error('Error while Synchronisation', err));
+	}
+
+	private async getExtensionsToSync(workspaceExtensions: ILocalExtension[]): Promise<Map<IExtensionManagementServer, ILocalExtension[]>> {
+		const extensionsToSync: Map<IExtensionManagementServer, ILocalExtension[]> = new Map<IExtensionManagementServer, ILocalExtension[]>();
+		for (const server of this.otherServers) {
+			const extensions = await server.extensionManagementService.getInstalled(LocalExtensionType.User);
+			const groupedByVersionId: Map<string, ILocalExtension> = extensions.reduce((groupedById, extension) => groupedById.set(`${extension.galleryIdentifier.id}-${extension.manifest.version}`, extension), new Map<string, ILocalExtension>());
+			const toSync = workspaceExtensions.filter(e => !groupedByVersionId.has(`${e.galleryIdentifier.id}-${e.manifest.version}`));
+			if (toSync.length) {
+				extensionsToSync.set(server, toSync);
+			}
+		}
+		return extensionsToSync;
+	}
+
+	private async doSyncExtensions(extensionsToSync: Map<IExtensionManagementServer, ILocalExtension[]>, notificationHandler: INotificationHandle): Promise<void> {
+		const ids: string[] = [];
+		const zipLocationResolvers: TPromise<{ location: URI, vsix: boolean }>[] = [];
+
+		extensionsToSync.forEach(extensions => {
+			for (const extension of extensions) {
+				if (ids.indexOf(extension.galleryIdentifier.id) === -1) {
+					ids.push(extension.galleryIdentifier.id);
+					zipLocationResolvers.push(this.downloadFromGallery(extension)
+						.then(location => location ? { location, vsix: true } : this.localServer.extensionManagementService.zip(extension).then(location => ({ location, vsix: false }))));
+				}
+			}
+		});
+
+		const zipLocations = await TPromise.join(zipLocationResolvers);
+		const promises: Promise<any>[] = [];
+		extensionsToSync.forEach((extensions, server) => {
+			let promise: Promise<any> = Promise.resolve();
+			extensions.forEach(extension => {
+				const index = ids.indexOf(extension.galleryIdentifier.id);
+				const { location, vsix } = zipLocations[index];
+				promise = promise
+					.then(() => {
+						notificationHandler.updateMessage(localize('synchronising extension', "Synchronising workspace extension: {0}", extension.manifest.displayName || extension.manifest.name));
+						return vsix ? server.extensionManagementService.install(location) : server.extensionManagementService.unzip(location, extension.type);
+					}).then(
+						() => pfs.rimraf(location.fsPath),
+						error => pfs.rimraf(location.fsPath).then(() => TPromise.wrapError(error), () => TPromise.wrapError(error)));
+			});
+			promises.push(promise);
+		});
+
+		await Promise.all(promises);
+	}
+
+	private downloadFromGallery(extension: ILocalExtension): TPromise<URI> {
+		if (this.extensionGalleryService.isEnabled()) {
+			return this.extensionGalleryService.getExtension(extension.galleryIdentifier, extension.manifest.version)
+				.then(galleryExtension => galleryExtension ? this.extensionGalleryService.download(galleryExtension, InstallOperation.None).then(location => URI.file(location)) : null);
+		}
+		return TPromise.as(null);
+	}
+}
\ No newline at end of file
diff --git a/src/vs/platform/extensionManagement/test/common/extensionEnablementService.test.ts b/src/vs/platform/extensionManagement/test/common/extensionEnablementService.test.ts
index 717a17dd3b0..655d4b05b50 100644
--- a/src/vs/platform/extensionManagement/test/common/extensionEnablementService.test.ts
+++ b/src/vs/platform/extensionManagement/test/common/extensionEnablementService.test.ts
@@ -35,10 +35,11 @@ export class TestExtensionEnablementService extends ExtensionEnablementService {
 	constructor(instantiationService: TestInstantiationService) {
 		super(storageService(instantiationService), instantiationService.get(IWorkspaceContextService),
 			instantiationService.get(IEnvironmentService) || instantiationService.stub(IEnvironmentService, {} as IEnvironmentService),
-			instantiationService.get(IExtensionManagementService) || instantiationService.stub(IExtensionManagementService, { onDidUninstallExtension: new Emitter() }));
+			instantiationService.get(IExtensionManagementService) || instantiationService.stub(IExtensionManagementService,
+				{ onDidUninstallExtension: new Emitter<DidUninstallExtensionEvent>().event } as IExtensionManagementService));
 	}
 
-	public reset(): TPromise<void> {
+	public async reset(): Promise<void> {
 		return this.getDisabledExtensions().then(extensions => extensions.forEach(d => this.setEnablement(aLocalExtension(d.id), EnablementState.Enabled)));
 	}
 }
@@ -52,7 +53,7 @@ suite('ExtensionEnablementService Test', () => {
 
 	setup(() => {
 		instantiationService = new TestInstantiationService();
-		instantiationService.stub(IExtensionManagementService, { onDidUninstallExtension: didUninstallEvent.event });
+		instantiationService.stub(IExtensionManagementService, { onDidUninstallExtension: didUninstallEvent.event, getInstalled: () => TPromise.as([]) } as IExtensionManagementService);
 		testObject = new TestExtensionEnablementService(instantiationService);
 	});
 
@@ -331,6 +332,12 @@ suite('ExtensionEnablementService Test', () => {
 		assert.equal(testObject.canChangeEnablement(aLocalExtension('pub.a')), false);
 	});
 
+	test('test canChangeEnablement return false when the extension is disabled in environment', () => {
+		instantiationService.stub(IEnvironmentService, { disableExtensions: ['pub.a'] } as IEnvironmentService);
+		testObject = new TestExtensionEnablementService(instantiationService);
+		assert.equal(testObject.canChangeEnablement(aLocalExtension('pub.a')), false);
+	});
+
 	test('test canChangeEnablement return true for system extensions when extensions are disabled in environment', () => {
 		instantiationService.stub(IEnvironmentService, { disableExtensions: true } as IEnvironmentService);
 		testObject = new TestExtensionEnablementService(instantiationService);
@@ -338,12 +345,32 @@ suite('ExtensionEnablementService Test', () => {
 		extension.type = LocalExtensionType.System;
 		assert.equal(testObject.canChangeEnablement(extension), true);
 	});
+
+	test('test canChangeEnablement return false for system extensions when extension is disabled in environment', () => {
+		instantiationService.stub(IEnvironmentService, { disableExtensions: ['pub.a'] } as IEnvironmentService);
+		testObject = new TestExtensionEnablementService(instantiationService);
+		const extension = aLocalExtension('pub.a');
+		extension.type = LocalExtensionType.System;
+		assert.equal(testObject.canChangeEnablement(extension), true);
+	});
+
+	test('test getDisabledExtensions include extensions disabled in enviroment', () => {
+		instantiationService.stub(IEnvironmentService, { disableExtensions: ['pub.a'] } as IEnvironmentService);
+		instantiationService.stub(IExtensionManagementService, { onDidUninstallExtension: didUninstallEvent.event, getInstalled: () => TPromise.as([aLocalExtension('pub.a'), aLocalExtension('pub.b')]) } as IExtensionManagementService);
+		testObject = new TestExtensionEnablementService(instantiationService);
+		return testObject.getDisabledExtensions()
+			.then(actual => {
+				assert.equal(actual.length, 1);
+				assert.equal(actual[0].id, 'pub.a');
+			});
+	});
 });
 
 function aLocalExtension(id: string, contributes?: IExtensionContributions): ILocalExtension {
 	const [publisher, name] = id.split('.');
 	return <ILocalExtension>Object.create({
 		identifier: { id },
+		galleryIdentifier: { id, uuid: void 0 },
 		manifest: {
 			name,
 			publisher,
diff --git a/src/vs/platform/files/common/files.ts b/src/vs/platform/files/common/files.ts
index b59c623ee3c..abe84da07b4 100644
--- a/src/vs/platform/files/common/files.ts
+++ b/src/vs/platform/files/common/files.ts
@@ -6,7 +6,7 @@
 
 import { TPromise } from 'vs/base/common/winjs.base';
 import * as paths from 'vs/base/common/paths';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import * as glob from 'vs/base/common/glob';
 import { isLinux } from 'vs/base/common/platform';
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
@@ -128,16 +128,11 @@ export interface IFileService {
 	createFolder(resource: URI): TPromise<IFileStat>;
 
 	/**
-	 * Renames the provided file to use the new name. The returned promise
-	 * will have the stat model object as a result.
+	 * Deletes the provided file. The optional useTrash parameter allows to
+	 * move the file to trash. The optional recursive parameter allows to delete
+	 * non-empty folders recursively.
 	 */
-	rename(resource: URI, newName: string): TPromise<IFileStat>;
-
-	/**
-	 * Deletes the provided file.  The optional useTrash parameter allows to
-	 * move the file to trash.
-	 */
-	del(resource: URI, useTrash?: boolean): TPromise<void>;
+	del(resource: URI, options?: { useTrash?: boolean, recursive?: boolean }): TPromise<void>;
 
 	/**
 	 * Allows to start a watcher that reports file change events on the provided resource.
@@ -164,6 +159,10 @@ export interface FileWriteOptions {
 	create: boolean;
 }
 
+export interface FileDeleteOptions {
+	recursive: boolean;
+}
+
 export enum FileType {
 	Unknown = 0,
 	File = 1,
@@ -183,12 +182,13 @@ export interface IWatchOptions {
 	excludes: string[];
 }
 
-export enum FileSystemProviderCapabilities {
+export const enum FileSystemProviderCapabilities {
 	FileReadWrite = 1 << 1,
 	FileOpenReadWriteClose = 1 << 2,
 	FileFolderCopy = 1 << 3,
 
-	PathCaseSensitive = 1 << 10
+	PathCaseSensitive = 1 << 10,
+	Readonly = 1 << 11
 }
 
 export interface IFileSystemProvider {
@@ -198,21 +198,21 @@ export interface IFileSystemProvider {
 	onDidChangeFile: Event<IFileChange[]>;
 	watch(resource: URI, opts: IWatchOptions): IDisposable;
 
-	stat(resource: URI): TPromise<IStat>;
-	mkdir(resource: URI): TPromise<void>;
-	readdir(resource: URI): TPromise<[string, FileType][]>;
-	delete(resource: URI): TPromise<void>;
+	stat(resource: URI): Thenable<IStat>;
+	mkdir(resource: URI): Thenable<void>;
+	readdir(resource: URI): Thenable<[string, FileType][]>;
+	delete(resource: URI, opts: FileDeleteOptions): Thenable<void>;
 
-	rename(from: URI, to: URI, opts: FileOverwriteOptions): TPromise<void>;
-	copy?(from: URI, to: URI, opts: FileOverwriteOptions): TPromise<void>;
+	rename(from: URI, to: URI, opts: FileOverwriteOptions): Thenable<void>;
+	copy?(from: URI, to: URI, opts: FileOverwriteOptions): Thenable<void>;
 
-	readFile?(resource: URI): TPromise<Uint8Array>;
-	writeFile?(resource: URI, content: Uint8Array, opts: FileWriteOptions): TPromise<void>;
+	readFile?(resource: URI): Thenable<Uint8Array>;
+	writeFile?(resource: URI, content: Uint8Array, opts: FileWriteOptions): Thenable<void>;
 
-	open?(resource: URI): TPromise<number>;
-	close?(fd: number): TPromise<void>;
-	read?(fd: number, pos: number, data: Uint8Array, offset: number, length: number): TPromise<number>;
-	write?(fd: number, pos: number, data: Uint8Array, offset: number, length: number): TPromise<number>;
+	open?(resource: URI): Thenable<number>;
+	close?(fd: number): Thenable<void>;
+	read?(fd: number, pos: number, data: Uint8Array, offset: number, length: number): Thenable<number>;
+	write?(fd: number, pos: number, data: Uint8Array, offset: number, length: number): Thenable<number>;
 }
 
 export interface IFileSystemProviderRegistrationEvent {
@@ -221,7 +221,7 @@ export interface IFileSystemProviderRegistrationEvent {
 	provider?: IFileSystemProvider;
 }
 
-export enum FileOperation {
+export const enum FileOperation {
 	CREATE,
 	DELETE,
 	MOVE,
@@ -233,15 +233,15 @@ export class FileOperationEvent {
 	constructor(private _resource: URI, private _operation: FileOperation, private _target?: IFileStat) {
 	}
 
-	public get resource(): URI {
+	get resource(): URI {
 		return this._resource;
 	}
 
-	public get target(): IFileStat {
+	get target(): IFileStat {
 		return this._target;
 	}
 
-	public get operation(): FileOperation {
+	get operation(): FileOperation {
 		return this._operation;
 	}
 }
@@ -249,7 +249,7 @@ export class FileOperationEvent {
 /**
  * Possible changes that can occur to a file.
  */
-export enum FileChangeType {
+export const enum FileChangeType {
 	UPDATED = 0,
 	ADDED = 1,
 	DELETED = 2
@@ -279,27 +279,29 @@ export class FileChangesEvent {
 		this._changes = changes;
 	}
 
-	public get changes() {
+	get changes() {
 		return this._changes;
 	}
 
 	/**
-	 * Returns true if this change event contains the provided file with the given change type. In case of
+	 * Returns true if this change event contains the provided file with the given change type (if provided). In case of
 	 * type DELETED, this method will also return true if a folder got deleted that is the parent of the
 	 * provided file path.
 	 */
-	public contains(resource: URI, type: FileChangeType): boolean {
+	contains(resource: URI, type?: FileChangeType): boolean {
 		if (!resource) {
 			return false;
 		}
 
+		const checkForChangeType = !isUndefinedOrNull(type);
+
 		return this._changes.some(change => {
-			if (change.type !== type) {
+			if (checkForChangeType && change.type !== type) {
 				return false;
 			}
 
 			// For deleted also return true when deleted folder is parent of target path
-			if (type === FileChangeType.DELETED) {
+			if (change.type === FileChangeType.DELETED) {
 				return isEqualOrParent(resource, change.resource, !isLinux /* ignorecase */);
 			}
 
@@ -310,42 +312,42 @@ export class FileChangesEvent {
 	/**
 	 * Returns the changes that describe added files.
 	 */
-	public getAdded(): IFileChange[] {
+	getAdded(): IFileChange[] {
 		return this.getOfType(FileChangeType.ADDED);
 	}
 
 	/**
 	 * Returns if this event contains added files.
 	 */
-	public gotAdded(): boolean {
+	gotAdded(): boolean {
 		return this.hasType(FileChangeType.ADDED);
 	}
 
 	/**
 	 * Returns the changes that describe deleted files.
 	 */
-	public getDeleted(): IFileChange[] {
+	getDeleted(): IFileChange[] {
 		return this.getOfType(FileChangeType.DELETED);
 	}
 
 	/**
 	 * Returns if this event contains deleted files.
 	 */
-	public gotDeleted(): boolean {
+	gotDeleted(): boolean {
 		return this.hasType(FileChangeType.DELETED);
 	}
 
 	/**
 	 * Returns the changes that describe updated files.
 	 */
-	public getUpdated(): IFileChange[] {
+	getUpdated(): IFileChange[] {
 		return this.getOfType(FileChangeType.UPDATED);
 	}
 
 	/**
 	 * Returns if this event contains updated files.
 	 */
-	public gotUpdated(): boolean {
+	gotUpdated(): boolean {
 		return this.hasType(FileChangeType.UPDATED);
 	}
 
@@ -404,6 +406,11 @@ export interface IBaseStat {
 	 * current state of the file or directory.
 	 */
 	etag: string;
+
+	/**
+	 * The resource is readonly.
+	 */
+	isReadonly?: boolean;
 }
 
 /**
@@ -615,7 +622,7 @@ export class FileOperationError extends Error {
 	}
 }
 
-export enum FileOperationResult {
+export const enum FileOperationResult {
 	FILE_IS_BINARY,
 	FILE_IS_DIRECTORY,
 	FILE_NOT_FOUND,
diff --git a/src/vs/platform/files/test/files.test.ts b/src/vs/platform/files/test/files.test.ts
index aba5148b53d..2b5d6e238c4 100644
--- a/src/vs/platform/files/test/files.test.ts
+++ b/src/vs/platform/files/test/files.test.ts
@@ -6,7 +6,7 @@
 'use strict';
 
 import * as assert from 'assert';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { join, isEqual, isEqualOrParent } from 'vs/base/common/paths';
 import { FileChangeType, FileChangesEvent, isParent } from 'vs/platform/files/common/files';
 import { isLinux, isMacintosh, isWindows } from 'vs/base/common/platform';
diff --git a/src/vs/platform/history/common/history.ts b/src/vs/platform/history/common/history.ts
index 1ce03f870fc..3e75536f968 100644
--- a/src/vs/platform/history/common/history.ts
+++ b/src/vs/platform/history/common/history.ts
@@ -9,12 +9,13 @@ import { IPath } from 'vs/platform/windows/common/windows';
 import { Event as CommonEvent } from 'vs/base/common/event';
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
 import { IWorkspaceIdentifier, ISingleFolderWorkspaceIdentifier } from 'vs/platform/workspaces/common/workspaces';
+import { URI } from 'vs/base/common/uri';
 
 export const IHistoryMainService = createDecorator<IHistoryMainService>('historyMainService');
 
 export interface IRecentlyOpened {
 	workspaces: (IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier)[];
-	files: string[];
+	files: URI[];
 }
 
 export interface IHistoryMainService {
@@ -22,9 +23,9 @@ export interface IHistoryMainService {
 
 	onRecentlyOpenedChange: CommonEvent<void>;
 
-	addRecentlyOpened(workspaces: (IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier)[], files: string[]): void;
+	addRecentlyOpened(workspaces: (IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier)[], files: URI[]): void;
 	getRecentlyOpened(currentWorkspace?: IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier, currentFiles?: IPath[]): IRecentlyOpened;
-	removeFromRecentlyOpened(paths: string[]): void;
+	removeFromRecentlyOpened(paths: (IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier | URI | string)[]): void;
 	clearRecentlyOpened(): void;
 
 	updateWindowsJumpList(): void;
diff --git a/src/vs/platform/history/electron-main/historyMainService.ts b/src/vs/platform/history/electron-main/historyMainService.ts
index 5c8c223322b..555e4af8546 100644
--- a/src/vs/platform/history/electron-main/historyMainService.ts
+++ b/src/vs/platform/history/electron-main/historyMainService.ts
@@ -5,22 +5,33 @@
 
 'use strict';
 
-import * as path from 'path';
 import * as nls from 'vs/nls';
 import * as arrays from 'vs/base/common/arrays';
-import { trim } from 'vs/base/common/strings';
 import { IStateService } from 'vs/platform/state/common/state';
 import { app } from 'electron';
 import { ILogService } from 'vs/platform/log/common/log';
-import { getPathLabel, getBaseLabel } from 'vs/base/common/labels';
+import { getBaseLabel } from 'vs/base/common/labels';
 import { IPath } from 'vs/platform/windows/common/windows';
 import { Event as CommonEvent, Emitter } from 'vs/base/common/event';
 import { isWindows, isMacintosh, isLinux } from 'vs/base/common/platform';
-import { IWorkspaceIdentifier, IWorkspacesMainService, getWorkspaceLabel, ISingleFolderWorkspaceIdentifier, isSingleFolderWorkspaceIdentifier, IWorkspaceSavedEvent } from 'vs/platform/workspaces/common/workspaces';
+import { IWorkspaceIdentifier, IWorkspacesMainService, IWorkspaceSavedEvent, ISingleFolderWorkspaceIdentifier, isSingleFolderWorkspaceIdentifier, isWorkspaceIdentifier } from 'vs/platform/workspaces/common/workspaces';
 import { IHistoryMainService, IRecentlyOpened } from 'vs/platform/history/common/history';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { isEqual } from 'vs/base/common/paths';
 import { RunOnceScheduler } from 'vs/base/common/async';
+import { getComparisonKey, isEqual as areResourcesEqual, dirname } from 'vs/base/common/resources';
+import { URI, UriComponents } from 'vs/base/common/uri';
+import { Schemas } from 'vs/base/common/network';
+import { ILabelService } from 'vs/platform/label/common/label';
+
+interface ISerializedRecentlyOpened {
+	workspaces2: (IWorkspaceIdentifier | string)[]; // IWorkspaceIdentifier or URI.toString()
+	files2: string[]; // files as URI.toString()
+}
+
+interface ILegacySerializedRecentlyOpened {
+	workspaces: (IWorkspaceIdentifier | string | UriComponents)[]; // legacy (UriComponents was also supported for a few insider builds)
+	files: string[]; // files as paths
+}
 
 export class HistoryMainService implements IHistoryMainService {
 
@@ -40,7 +51,7 @@ export class HistoryMainService implements IHistoryMainService {
 		@IStateService private stateService: IStateService,
 		@ILogService private logService: ILogService,
 		@IWorkspacesMainService private workspacesMainService: IWorkspacesMainService,
-		@IEnvironmentService private environmentService: IEnvironmentService,
+		@ILabelService private labelService: ILabelService
 	) {
 		this.macOSRecentDocumentsUpdater = new RunOnceScheduler(() => this.updateMacOSRecentDocuments(), 800);
 
@@ -49,6 +60,7 @@ export class HistoryMainService implements IHistoryMainService {
 
 	private registerListeners(): void {
 		this.workspacesMainService.onWorkspaceSaved(e => this.onWorkspaceSaved(e));
+		this.labelService.onDidRegisterFormatter(() => this._onRecentlyOpenedChange.fire());
 	}
 
 	private onWorkspaceSaved(e: IWorkspaceSavedEvent): void {
@@ -57,34 +69,38 @@ export class HistoryMainService implements IHistoryMainService {
 		this.addRecentlyOpened([e.workspace], []);
 	}
 
-	public addRecentlyOpened(workspaces: (IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier)[], files: string[]): void {
+	addRecentlyOpened(workspaces: (IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier)[], files: URI[]): void {
 		if ((workspaces && workspaces.length > 0) || (files && files.length > 0)) {
 			const mru = this.getRecentlyOpened();
 
 			// Workspaces
-			workspaces.forEach(workspace => {
-				const isUntitledWorkspace = !isSingleFolderWorkspaceIdentifier(workspace) && this.workspacesMainService.isUntitledWorkspace(workspace);
-				if (isUntitledWorkspace) {
-					return; // only store saved workspaces
-				}
+			if (Array.isArray(workspaces)) {
+				workspaces.forEach(workspace => {
+					const isUntitledWorkspace = !isSingleFolderWorkspaceIdentifier(workspace) && this.workspacesMainService.isUntitledWorkspace(workspace);
+					if (isUntitledWorkspace) {
+						return; // only store saved workspaces
+					}
 
-				mru.workspaces.unshift(workspace);
-				mru.workspaces = arrays.distinct(mru.workspaces, workspace => this.distinctFn(workspace));
+					mru.workspaces.unshift(workspace);
+					mru.workspaces = arrays.distinct(mru.workspaces, workspace => this.distinctFn(workspace));
 
-				// We do not add to recent documents here because on Windows we do this from a custom
-				// JumpList and on macOS we fill the recent documents in one go from all our data later.
-			});
+					// We do not add to recent documents here because on Windows we do this from a custom
+					// JumpList and on macOS we fill the recent documents in one go from all our data later.
+				});
+			}
 
 			// Files
-			files.forEach((path) => {
-				mru.files.unshift(path);
-				mru.files = arrays.distinct(mru.files, file => this.distinctFn(file));
+			if (Array.isArray(files)) {
+				files.forEach((fileUri) => {
+					mru.files.unshift(fileUri);
+					mru.files = arrays.distinct(mru.files, file => this.distinctFn(file));
 
-				// Add to recent documents (Windows only, macOS later)
-				if (isWindows) {
-					app.addRecentDocument(path);
-				}
-			});
+					// Add to recent documents (Windows only, macOS later)
+					if (isWindows && fileUri.scheme === Schemas.file) {
+						app.addRecentDocument(fileUri.fsPath);
+					}
+				});
+			}
 
 			// Make sure its bounded
 			mru.workspaces = mru.workspaces.slice(0, HistoryMainService.MAX_TOTAL_RECENT_ENTRIES);
@@ -100,21 +116,40 @@ export class HistoryMainService implements IHistoryMainService {
 		}
 	}
 
-	public removeFromRecentlyOpened(pathsToRemove: string[]): void {
+	removeFromRecentlyOpened(pathsToRemove: (IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier | URI | string)[]): void {
 		const mru = this.getRecentlyOpened();
 		let update = false;
 
 		pathsToRemove.forEach((pathToRemove => {
 
 			// Remove workspace
-			let index = arrays.firstIndex(mru.workspaces, workspace => isEqual(isSingleFolderWorkspaceIdentifier(workspace) ? workspace : workspace.configPath, pathToRemove, !isLinux /* ignorecase */));
+			let index = arrays.firstIndex(mru.workspaces, workspace => {
+				if (isWorkspaceIdentifier(pathToRemove)) {
+					return isWorkspaceIdentifier(workspace) && isEqual(pathToRemove.configPath, workspace.configPath, !isLinux /* ignorecase */);
+				}
+				if (isSingleFolderWorkspaceIdentifier(pathToRemove)) {
+					return isSingleFolderWorkspaceIdentifier(workspace) && areResourcesEqual(pathToRemove, workspace);
+				}
+				if (typeof pathToRemove === 'string') {
+					if (isSingleFolderWorkspaceIdentifier(workspace)) {
+						return workspace.scheme === Schemas.file && areResourcesEqual(URI.file(pathToRemove), workspace);
+					}
+					if (isWorkspaceIdentifier(workspace)) {
+						return isEqual(pathToRemove, workspace.configPath, !isLinux /* ignorecase */);
+					}
+				}
+				return false;
+			});
 			if (index >= 0) {
 				mru.workspaces.splice(index, 1);
 				update = true;
 			}
 
 			// Remove file
-			index = arrays.firstIndex(mru.files, file => isEqual(file, pathToRemove, !isLinux /* ignorecase */));
+			const pathToRemoveURI = pathToRemove instanceof URI ? pathToRemove : typeof pathToRemove === 'string' ? URI.file(pathToRemove) : null;
+			if (pathToRemoveURI) {
+				index = arrays.firstIndex(mru.files, file => areResourcesEqual(file, pathToRemoveURI));
+			}
 			if (index >= 0) {
 				mru.files.splice(index, 1);
 				update = true;
@@ -149,20 +184,31 @@ export class HistoryMainService implements IHistoryMainService {
 		let maxEntries = HistoryMainService.MAX_MACOS_DOCK_RECENT_ENTRIES;
 
 		// Take up to maxEntries/2 workspaces
-		for (let i = 0; i < mru.workspaces.length && i < HistoryMainService.MAX_MACOS_DOCK_RECENT_ENTRIES / 2; i++) {
+		let nEntries = 0;
+		for (let i = 0; i < mru.workspaces.length && nEntries < HistoryMainService.MAX_MACOS_DOCK_RECENT_ENTRIES / 2; i++) {
 			const workspace = mru.workspaces[i];
-			app.addRecentDocument(isSingleFolderWorkspaceIdentifier(workspace) ? workspace : workspace.configPath);
-			maxEntries--;
+			if (isSingleFolderWorkspaceIdentifier(workspace)) {
+				if (workspace.scheme === Schemas.file) {
+					app.addRecentDocument(workspace.fsPath);
+					nEntries++;
+				}
+			} else {
+				app.addRecentDocument(workspace.configPath);
+				nEntries++;
+			}
 		}
 
 		// Take up to maxEntries files
-		for (let i = 0; i < mru.files.length && i < maxEntries; i++) {
+		for (let i = 0; i < mru.files.length && nEntries < maxEntries; i++) {
 			const file = mru.files[i];
-			app.addRecentDocument(file);
+			if (file.scheme === Schemas.file) {
+				app.addRecentDocument(file.fsPath);
+				nEntries++;
+			}
 		}
 	}
 
-	public clearRecentlyOpened(): void {
+	clearRecentlyOpened(): void {
 		this.saveRecentlyOpened({ workspaces: [], files: [] });
 		app.clearRecentDocuments();
 
@@ -170,12 +216,12 @@ export class HistoryMainService implements IHistoryMainService {
 		this._onRecentlyOpenedChange.fire();
 	}
 
-	public getRecentlyOpened(currentWorkspace?: IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier, currentFiles?: IPath[]): IRecentlyOpened {
+	getRecentlyOpened(currentWorkspace?: IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier, currentFiles?: IPath[]): IRecentlyOpened {
 		let workspaces: (IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier)[];
-		let files: string[];
+		let files: URI[];
 
 		// Get from storage
-		const storedRecents = this.stateService.getItem<IRecentlyOpened>(HistoryMainService.recentlyOpenedStorageKey);
+		const storedRecents = this.getRecentlyOpenedFromStorage();
 		if (storedRecents) {
 			workspaces = storedRecents.workspaces || [];
 			files = storedRecents.files || [];
@@ -191,7 +237,7 @@ export class HistoryMainService implements IHistoryMainService {
 
 		// Add currently files to open to the beginning if any
 		if (currentFiles) {
-			files.unshift(...currentFiles.map(f => f.filePath));
+			files.unshift(...currentFiles.map(f => f.fileUri));
 		}
 
 		// Clear those dupes
@@ -204,19 +250,72 @@ export class HistoryMainService implements IHistoryMainService {
 		return { workspaces, files };
 	}
 
-	private distinctFn(workspaceOrFile: IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier | string): string {
-		if (isSingleFolderWorkspaceIdentifier(workspaceOrFile)) {
-			return isLinux ? workspaceOrFile : workspaceOrFile.toLowerCase();
+	private distinctFn(workspaceOrFile: IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier | URI): string {
+		if (workspaceOrFile instanceof URI) {
+			return getComparisonKey(workspaceOrFile);
 		}
-
 		return workspaceOrFile.id;
 	}
 
-	private saveRecentlyOpened(recent: IRecentlyOpened): void {
-		this.stateService.setItem(HistoryMainService.recentlyOpenedStorageKey, recent);
+	private getRecentlyOpenedFromStorage(): IRecentlyOpened {
+		const storedRecents = this.stateService.getItem<ISerializedRecentlyOpened & ILegacySerializedRecentlyOpened>(HistoryMainService.recentlyOpenedStorageKey);
+		const result: IRecentlyOpened = { workspaces: [], files: [] };
+		if (storedRecents) {
+			if (Array.isArray(storedRecents.workspaces2)) {
+				for (const workspace of storedRecents.workspaces2) {
+					if (isWorkspaceIdentifier(workspace)) {
+						result.workspaces.push(workspace);
+					} else if (typeof workspace === 'string') {
+						result.workspaces.push(URI.parse(workspace));
+					}
+				}
+			} else if (Array.isArray(storedRecents.workspaces)) {
+				// TODO@martin legacy support can be removed at some point (6 month?)
+				// format of 1.25 and before
+				for (const workspace of storedRecents.workspaces) {
+					if (typeof workspace === 'string') {
+						result.workspaces.push(URI.file(workspace));
+					} else if (isWorkspaceIdentifier(workspace)) {
+						result.workspaces.push(workspace);
+					} else if (workspace && typeof workspace.path === 'string' && typeof workspace.scheme === 'string') {
+						// added by 1.26-insiders
+						result.workspaces.push(URI.revive(workspace));
+					}
+				}
+			}
+			if (Array.isArray(storedRecents.files2)) {
+				for (const file of storedRecents.files2) {
+					if (typeof file === 'string') {
+						result.files.push(URI.parse(file));
+					}
+				}
+			} else if (Array.isArray(storedRecents.files)) {
+				for (const file of storedRecents.files) {
+					if (typeof file === 'string') {
+						result.files.push(URI.file(file));
+					}
+				}
+			}
+		}
+		return result;
 	}
 
-	public updateWindowsJumpList(): void {
+	private saveRecentlyOpened(recent: IRecentlyOpened): void {
+		const serialized: ISerializedRecentlyOpened = { workspaces2: [], files2: [] };
+		for (const workspace of recent.workspaces) {
+			if (isSingleFolderWorkspaceIdentifier(workspace)) {
+				serialized.workspaces2.push(workspace.toString());
+			} else {
+				serialized.workspaces2.push(workspace);
+			}
+		}
+		for (const file of recent.files) {
+			serialized.files2.push(file.toString());
+		}
+		this.stateService.setItem(HistoryMainService.recentlyOpenedStorageKey, serialized);
+	}
+
+	updateWindowsJumpList(): void {
 		if (!isWindows) {
 			return; // only on windows
 		}
@@ -246,22 +345,44 @@ export class HistoryMainService implements IHistoryMainService {
 			// so we need to update our list of recent paths with the choice of the user to not add them again
 			// Also: Windows will not show our custom category at all if there is any entry which was removed
 			// by the user! See https://github.com/Microsoft/vscode/issues/15052
-			this.removeFromRecentlyOpened(app.getJumpListSettings().removedItems.filter(r => !!r.args).map(r => trim(r.args, '"')));
+			let toRemove: (ISingleFolderWorkspaceIdentifier | IWorkspaceIdentifier)[] = [];
+			for (let item of app.getJumpListSettings().removedItems) {
+				const args = item.args;
+				if (args) {
+					const match = /^--folder-uri\s+"([^"]+)"$/.exec(args);
+					if (match) {
+						if (args[0] === '-') {
+							toRemove.push(URI.parse(match[1]));
+						} else {
+							let configPath = match[1];
+							toRemove.push({ id: this.workspacesMainService.getWorkspaceId(configPath), configPath });
+						}
+					}
+				}
+			}
+			this.removeFromRecentlyOpened(toRemove);
 
 			// Add entries
 			jumpList.push({
 				type: 'custom',
 				name: nls.localize('recentFolders', "Recent Workspaces"),
 				items: this.getRecentlyOpened().workspaces.slice(0, 7 /* limit number of entries here */).map(workspace => {
-					const title = isSingleFolderWorkspaceIdentifier(workspace) ? getBaseLabel(workspace) : getWorkspaceLabel(workspace, this.environmentService);
-					const description = isSingleFolderWorkspaceIdentifier(workspace) ? nls.localize('folderDesc', "{0} {1}", getBaseLabel(workspace), getPathLabel(path.dirname(workspace))) : nls.localize('codeWorkspace', "Code Workspace");
-
+					const title = this.labelService.getWorkspaceLabel(workspace);
+					let description;
+					let args;
+					if (isSingleFolderWorkspaceIdentifier(workspace)) {
+						description = nls.localize('folderDesc', "{0} {1}", getBaseLabel(workspace), this.labelService.getUriLabel(dirname(workspace)));
+						args = `--folder-uri "${workspace.toString()}"`;
+					} else {
+						description = nls.localize('codeWorkspace', "Code Workspace");
+						args = `"${workspace.configPath}"`;
+					}
 					return <Electron.JumpListItem>{
 						type: 'task',
 						title,
 						description,
 						program: process.execPath,
-						args: `"${isSingleFolderWorkspaceIdentifier(workspace) ? workspace : workspace.configPath}"`, // open folder (use quotes to support paths with whitespaces)
+						args,
 						iconPath: 'explorer.exe', // simulate folder icon
 						iconIndex: 0
 					};
@@ -280,4 +401,4 @@ export class HistoryMainService implements IHistoryMainService {
 			this.logService.warn('#setJumpList', error); // since setJumpList is relatively new API, make sure to guard for errors
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/vs/platform/integrity/common/integrity.ts b/src/vs/platform/integrity/common/integrity.ts
index 6984b0fa8e7..c2ffaae674b 100644
--- a/src/vs/platform/integrity/common/integrity.ts
+++ b/src/vs/platform/integrity/common/integrity.ts
@@ -5,7 +5,7 @@
 'use strict';
 
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 
 export const IIntegrityService = createDecorator<IIntegrityService>('integrityService');
 
diff --git a/src/vs/platform/integrity/node/integrityServiceImpl.ts b/src/vs/platform/integrity/node/integrityServiceImpl.ts
index 5a45065e013..5174f67fdeb 100644
--- a/src/vs/platform/integrity/node/integrityServiceImpl.ts
+++ b/src/vs/platform/integrity/node/integrityServiceImpl.ts
@@ -10,7 +10,7 @@ import * as crypto from 'crypto';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { IIntegrityService, IntegrityTestResult, ChecksumPair } from 'vs/platform/integrity/common/integrity';
 import product from 'vs/platform/node/product';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import Severity from 'vs/base/common/severity';
 import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
 import { ILifecycleService, LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
@@ -133,7 +133,7 @@ export class IntegrityServiceImpl implements IIntegrityService {
 
 	private _resolve(filename: string, expected: string): TPromise<ChecksumPair> {
 		let fileUri = URI.parse(require.toUrl(filename));
-		return new TPromise<ChecksumPair>((c, e, p) => {
+		return new TPromise<ChecksumPair>((c, e) => {
 			fs.readFile(fileUri.fsPath, (err, buff) => {
 				if (err) {
 					return e(err);
diff --git a/src/vs/platform/issue/common/issue.ts b/src/vs/platform/issue/common/issue.ts
index 46d378dc8d4..49de26922cc 100644
--- a/src/vs/platform/issue/common/issue.ts
+++ b/src/vs/platform/issue/common/issue.ts
@@ -22,7 +22,7 @@ export interface WindowData {
 	zoomLevel: number;
 }
 
-export enum IssueType {
+export const enum IssueType {
 	Bug,
 	PerformanceIssue,
 	FeatureRequest,
@@ -74,6 +74,7 @@ export interface ProcessExplorerStyles extends WindowStyles {
 }
 
 export interface ProcessExplorerData extends WindowData {
+	pid: number;
 	styles: ProcessExplorerStyles;
 }
 
diff --git a/src/vs/platform/issue/electron-main/issueService.ts b/src/vs/platform/issue/electron-main/issueService.ts
index 0129b71e68d..bef6d5a627b 100644
--- a/src/vs/platform/issue/electron-main/issueService.ts
+++ b/src/vs/platform/issue/electron-main/issueService.ts
@@ -10,9 +10,9 @@ import { localize } from 'vs/nls';
 import * as objects from 'vs/base/common/objects';
 import { parseArgs } from 'vs/platform/environment/node/argv';
 import { IIssueService, IssueReporterData, IssueReporterFeatures, ProcessExplorerData } from 'vs/platform/issue/common/issue';
-import { BrowserWindow, ipcMain, screen } from 'electron';
-import { ILaunchService } from 'vs/code/electron-main/launch';
-import { getPerformanceInfo, PerformanceInfo, getSystemInfo, SystemInfo } from 'vs/code/electron-main/diagnostics';
+import { BrowserWindow, ipcMain, screen, Event } from 'electron';
+import { ILaunchService } from 'vs/platform/launch/electron-main/launchService';
+import { PerformanceInfo, SystemInfo, IDiagnosticsService } from 'vs/platform/diagnostics/electron-main/diagnosticsService';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { isMacintosh, IProcessEnvironment } from 'vs/base/common/platform';
 import { ILogService } from 'vs/platform/log/common/log';
@@ -31,25 +31,32 @@ export class IssueService implements IIssueService {
 		@IEnvironmentService private environmentService: IEnvironmentService,
 		@ILaunchService private launchService: ILaunchService,
 		@ILogService private logService: ILogService,
+		@IDiagnosticsService private diagnosticsService: IDiagnosticsService
 	) { }
 
 	openReporter(data: IssueReporterData): TPromise<void> {
-		ipcMain.on('issueSystemInfoRequest', event => {
+		ipcMain.on('vscode:issueSystemInfoRequest', (event: Event) => {
 			this.getSystemInformation().then(msg => {
-				event.sender.send('issueSystemInfoResponse', msg);
+				event.sender.send('vscode:issueSystemInfoResponse', msg);
 			});
 		});
 
-		ipcMain.on('issuePerformanceInfoRequest', event => {
+		ipcMain.on('vscode:issuePerformanceInfoRequest', (event: Event) => {
 			this.getPerformanceInfo().then(msg => {
-				event.sender.send('issuePerformanceInfoResponse', msg);
+				event.sender.send('vscode:issuePerformanceInfoResponse', msg);
 			});
 		});
 
-		ipcMain.on('workbenchCommand', (event, arg) => {
+		ipcMain.on('vscode:workbenchCommand', (event, arg) => {
 			this._issueParentWindow.webContents.send('vscode:runAction', { id: arg, from: 'issueReporter' });
 		});
 
+		ipcMain.on('vscode:closeIssueReporter', (event: Event) => {
+			if (this._issueWindow) {
+				this._issueWindow.close();
+			}
+		});
+
 		this._issueParentWindow = BrowserWindow.getFocusedWindow();
 		const position = this.getWindowPosition(this._issueParentWindow, 700, 800);
 		if (!this._issueWindow) {
@@ -75,8 +82,10 @@ export class IssueService implements IIssueService {
 			this._issueWindow.on('close', () => this._issueWindow = null);
 
 			this._issueParentWindow.on('closed', () => {
-				this._issueWindow.close();
-				this._issueWindow = null;
+				if (this._issueWindow) {
+					this._issueWindow.close();
+					this._issueWindow = null;
+				}
 			});
 		}
 
@@ -86,9 +95,9 @@ export class IssueService implements IIssueService {
 	}
 
 	openProcessExplorer(data: ProcessExplorerData): TPromise<void> {
-		ipcMain.on('windowsInfoRequest', event => {
+		ipcMain.on('windowsInfoRequest', (event: Event) => {
 			this.launchService.getMainProcessInfo().then(info => {
-				event.sender.send('windowsInfoResponse', info.windows);
+				event.sender.send('vscode:windowsInfoResponse', info.windows);
 			});
 		});
 
@@ -133,8 +142,10 @@ export class IssueService implements IIssueService {
 			this._processExplorerWindow.on('close', () => this._processExplorerWindow = void 0);
 
 			parentWindow.on('close', () => {
-				this._processExplorerWindow.close();
-				this._processExplorerWindow = null;
+				if (this._processExplorerWindow) {
+					this._processExplorerWindow.close();
+					this._processExplorerWindow = null;
+				}
 			});
 		}
 
@@ -217,7 +228,7 @@ export class IssueService implements IIssueService {
 	private getSystemInformation(): TPromise<SystemInfo> {
 		return new Promise((resolve, reject) => {
 			this.launchService.getMainProcessInfo().then(info => {
-				resolve(getSystemInfo(info));
+				resolve(this.diagnosticsService.getSystemInfo(info));
 			});
 		});
 	}
@@ -225,7 +236,7 @@ export class IssueService implements IIssueService {
 	private getPerformanceInfo(): TPromise<PerformanceInfo> {
 		return new Promise((resolve, reject) => {
 			this.launchService.getMainProcessInfo().then(info => {
-				getPerformanceInfo(info)
+				this.diagnosticsService.getPerformanceInfo(info)
 					.then(diagnosticInfo => {
 						resolve(diagnosticInfo);
 					})
diff --git a/src/vs/platform/issue/common/issueIpc.ts b/src/vs/platform/issue/node/issueIpc.ts
similarity index 87%
rename from src/vs/platform/issue/common/issueIpc.ts
rename to src/vs/platform/issue/node/issueIpc.ts
index d804c6579fe..e58dff508b8 100644
--- a/src/vs/platform/issue/common/issueIpc.ts
+++ b/src/vs/platform/issue/node/issueIpc.ts
@@ -6,8 +6,9 @@
 'use strict';
 
 import { TPromise } from 'vs/base/common/winjs.base';
-import { IChannel } from 'vs/base/parts/ipc/common/ipc';
-import { IIssueService, IssueReporterData, ProcessExplorerData } from './issue';
+import { IChannel } from 'vs/base/parts/ipc/node/ipc';
+import { IIssueService, IssueReporterData, ProcessExplorerData } from '../common/issue';
+import { Event } from 'vs/base/common/event';
 
 export interface IIssueChannel extends IChannel {
 	call(command: 'openIssueReporter', arg: IssueReporterData): TPromise<void>;
@@ -19,6 +20,10 @@ export class IssueChannel implements IIssueChannel {
 
 	constructor(private service: IIssueService) { }
 
+	listen<T>(event: string): Event<T> {
+		throw new Error('No event found');
+	}
+
 	call(command: string, arg?: any): TPromise<any> {
 		switch (command) {
 			case 'openIssueReporter':
diff --git a/src/vs/platform/keybinding/common/abstractKeybindingService.ts b/src/vs/platform/keybinding/common/abstractKeybindingService.ts
index f001258b68e..6286f886142 100644
--- a/src/vs/platform/keybinding/common/abstractKeybindingService.ts
+++ b/src/vs/platform/keybinding/common/abstractKeybindingService.ts
@@ -5,7 +5,7 @@
 'use strict';
 
 import * as nls from 'vs/nls';
-import { ResolvedKeybinding, Keybinding } from 'vs/base/common/keyCodes';
+import { ResolvedKeybinding, Keybinding, KeyCode } from 'vs/base/common/keyCodes';
 import { IDisposable, Disposable } from 'vs/base/common/lifecycle';
 import { ICommandService } from 'vs/platform/commands/common/commands';
 import { KeybindingResolver, IResolveResult } from 'vs/platform/keybinding/common/keybindingResolver';
@@ -188,9 +188,11 @@ export abstract class AbstractKeybindingService extends Disposable implements IK
 			if (!resolveResult.bubble) {
 				shouldPreventDefault = true;
 			}
-			this._commandService.executeCommand(resolveResult.commandId, resolveResult.commandArgs).done(undefined, err => {
-				this._notificationService.warn(err);
-			});
+			if (typeof resolveResult.commandArgs === 'undefined') {
+				this._commandService.executeCommand(resolveResult.commandId).then(undefined, err => this._notificationService.warn(err));
+			} else {
+				this._commandService.executeCommand(resolveResult.commandId, resolveResult.commandArgs).then(undefined, err => this._notificationService.warn(err));
+			}
 			/* __GDPR__
 				"workbenchActionExecuted" : {
 					"id" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
@@ -202,4 +204,18 @@ export abstract class AbstractKeybindingService extends Disposable implements IK
 
 		return shouldPreventDefault;
 	}
+
+	mightProducePrintableCharacter(event: IKeyboardEvent): boolean {
+		if (event.ctrlKey || event.metaKey) {
+			// ignore ctrl/cmd-combination but not shift/alt-combinatios
+			return false;
+		}
+		// weak check for certain ranges. this is properly implemented in a subclass
+		// with access to the KeyboardMapperFactory.
+		if ((event.keyCode >= KeyCode.KEY_A && event.keyCode <= KeyCode.KEY_Z)
+			|| (event.keyCode >= KeyCode.KEY_0 && event.keyCode <= KeyCode.KEY_9)) {
+			return true;
+		}
+		return false;
+	}
 }
diff --git a/src/vs/platform/keybinding/common/keybinding.ts b/src/vs/platform/keybinding/common/keybinding.ts
index c491ec7a8d0..ea2de529888 100644
--- a/src/vs/platform/keybinding/common/keybinding.ts
+++ b/src/vs/platform/keybinding/common/keybinding.ts
@@ -18,7 +18,7 @@ export interface IUserFriendlyKeybinding {
 	when?: string;
 }
 
-export enum KeybindingSource {
+export const enum KeybindingSource {
 	Default = 1,
 	User
 }
@@ -77,5 +77,11 @@ export interface IKeybindingService {
 	getKeybindings(): ResolvedKeybindingItem[];
 
 	customKeybindingsCount(): number;
+
+	/**
+	 * Will the given key event produce a character that's rendered on screen, e.g. in a
+	 * text box. *Note* that the results of this function can be incorrect.
+	 */
+	mightProducePrintableCharacter(event: IKeyboardEvent): boolean;
 }
 
diff --git a/src/vs/platform/keybinding/common/keybindingsRegistry.ts b/src/vs/platform/keybinding/common/keybindingsRegistry.ts
index 39113558334..3d581b4e64f 100644
--- a/src/vs/platform/keybinding/common/keybindingsRegistry.ts
+++ b/src/vs/platform/keybinding/common/keybindingsRegistry.ts
@@ -57,6 +57,14 @@ export const enum KeybindingRuleSource {
 	Extension = 1
 }
 
+export const enum KeybindingWeight {
+	EditorCore = 0,
+	EditorContrib = 100,
+	WorkbenchContrib = 200,
+	BuiltinExtension = 300,
+	ExternalExtension = 400
+}
+
 export interface ICommandAndKeybindingRule extends IKeybindingRule {
 	handler: ICommandHandler;
 	description?: ICommandHandlerDescription;
@@ -67,14 +75,6 @@ export interface IKeybindingsRegistry {
 	registerKeybindingRule2(rule: IKeybindingRule2, source?: KeybindingRuleSource): void;
 	registerCommandAndKeybindingRule(desc: ICommandAndKeybindingRule, source?: KeybindingRuleSource): void;
 	getDefaultKeybindings(): IKeybindingItem[];
-
-	WEIGHT: {
-		editorCore(importance?: number): number;
-		editorContrib(importance?: number): number;
-		workbenchContrib(importance?: number): number;
-		builtinExtension(importance?: number): number;
-		externalExtension(importance?: number): number;
-	};
 }
 
 class KeybindingsRegistryImpl implements IKeybindingsRegistry {
@@ -82,24 +82,6 @@ class KeybindingsRegistryImpl implements IKeybindingsRegistry {
 	private _keybindings: IKeybindingItem[];
 	private _keybindingsSorted: boolean;
 
-	public WEIGHT = {
-		editorCore: (importance: number = 0): number => {
-			return 0 + importance;
-		},
-		editorContrib: (importance: number = 0): number => {
-			return 100 + importance;
-		},
-		workbenchContrib: (importance: number = 0): number => {
-			return 200 + importance;
-		},
-		builtinExtension: (importance: number = 0): number => {
-			return 300 + importance;
-		},
-		externalExtension: (importance: number = 0): number => {
-			return 400 + importance;
-		}
-	};
-
 	constructor() {
 		this._keybindings = [];
 		this._keybindingsSorted = true;
diff --git a/src/vs/platform/keybinding/test/common/keybindingLabels.test.ts b/src/vs/platform/keybinding/test/common/keybindingLabels.test.ts
index 19f285354cc..25dc83e6d4d 100644
--- a/src/vs/platform/keybinding/test/common/keybindingLabels.test.ts
+++ b/src/vs/platform/keybinding/test/common/keybindingLabels.test.ts
@@ -55,24 +55,24 @@ suite('KeybindingLabels', () => {
 		assertUSLabel(OperatingSystem.Linux, KeyMod.CtrlCmd | KeyCode.KEY_A, 'Ctrl+A');
 		assertUSLabel(OperatingSystem.Linux, KeyMod.Shift | KeyCode.KEY_A, 'Shift+A');
 		assertUSLabel(OperatingSystem.Linux, KeyMod.Alt | KeyCode.KEY_A, 'Alt+A');
-		assertUSLabel(OperatingSystem.Linux, KeyMod.WinCtrl | KeyCode.KEY_A, 'Windows+A');
+		assertUSLabel(OperatingSystem.Linux, KeyMod.WinCtrl | KeyCode.KEY_A, 'Super+A');
 
 		// two modifiers
 		assertUSLabel(OperatingSystem.Linux, KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KEY_A, 'Ctrl+Shift+A');
 		assertUSLabel(OperatingSystem.Linux, KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.KEY_A, 'Ctrl+Alt+A');
-		assertUSLabel(OperatingSystem.Linux, KeyMod.CtrlCmd | KeyMod.WinCtrl | KeyCode.KEY_A, 'Ctrl+Windows+A');
+		assertUSLabel(OperatingSystem.Linux, KeyMod.CtrlCmd | KeyMod.WinCtrl | KeyCode.KEY_A, 'Ctrl+Super+A');
 		assertUSLabel(OperatingSystem.Linux, KeyMod.Shift | KeyMod.Alt | KeyCode.KEY_A, 'Shift+Alt+A');
-		assertUSLabel(OperatingSystem.Linux, KeyMod.Shift | KeyMod.WinCtrl | KeyCode.KEY_A, 'Shift+Windows+A');
-		assertUSLabel(OperatingSystem.Linux, KeyMod.Alt | KeyMod.WinCtrl | KeyCode.KEY_A, 'Alt+Windows+A');
+		assertUSLabel(OperatingSystem.Linux, KeyMod.Shift | KeyMod.WinCtrl | KeyCode.KEY_A, 'Shift+Super+A');
+		assertUSLabel(OperatingSystem.Linux, KeyMod.Alt | KeyMod.WinCtrl | KeyCode.KEY_A, 'Alt+Super+A');
 
 		// three modifiers
 		assertUSLabel(OperatingSystem.Linux, KeyMod.CtrlCmd | KeyMod.Shift | KeyMod.Alt | KeyCode.KEY_A, 'Ctrl+Shift+Alt+A');
-		assertUSLabel(OperatingSystem.Linux, KeyMod.CtrlCmd | KeyMod.Shift | KeyMod.WinCtrl | KeyCode.KEY_A, 'Ctrl+Shift+Windows+A');
-		assertUSLabel(OperatingSystem.Linux, KeyMod.CtrlCmd | KeyMod.Alt | KeyMod.WinCtrl | KeyCode.KEY_A, 'Ctrl+Alt+Windows+A');
-		assertUSLabel(OperatingSystem.Linux, KeyMod.Shift | KeyMod.Alt | KeyMod.WinCtrl | KeyCode.KEY_A, 'Shift+Alt+Windows+A');
+		assertUSLabel(OperatingSystem.Linux, KeyMod.CtrlCmd | KeyMod.Shift | KeyMod.WinCtrl | KeyCode.KEY_A, 'Ctrl+Shift+Super+A');
+		assertUSLabel(OperatingSystem.Linux, KeyMod.CtrlCmd | KeyMod.Alt | KeyMod.WinCtrl | KeyCode.KEY_A, 'Ctrl+Alt+Super+A');
+		assertUSLabel(OperatingSystem.Linux, KeyMod.Shift | KeyMod.Alt | KeyMod.WinCtrl | KeyCode.KEY_A, 'Shift+Alt+Super+A');
 
 		// four modifiers
-		assertUSLabel(OperatingSystem.Linux, KeyMod.CtrlCmd | KeyMod.Shift | KeyMod.Alt | KeyMod.WinCtrl | KeyCode.KEY_A, 'Ctrl+Shift+Alt+Windows+A');
+		assertUSLabel(OperatingSystem.Linux, KeyMod.CtrlCmd | KeyMod.Shift | KeyMod.Alt | KeyMod.WinCtrl | KeyCode.KEY_A, 'Ctrl+Shift+Alt+Super+A');
 
 		// chord
 		assertUSLabel(OperatingSystem.Linux, KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_A, KeyMod.CtrlCmd | KeyCode.KEY_B), 'Ctrl+A Ctrl+B');
@@ -122,7 +122,7 @@ suite('KeybindingLabels', () => {
 		}
 
 		assertAriaLabel(OperatingSystem.Windows, KeyMod.CtrlCmd | KeyMod.Shift | KeyMod.Alt | KeyMod.WinCtrl | KeyCode.KEY_A, 'Control+Shift+Alt+Windows+A');
-		assertAriaLabel(OperatingSystem.Linux, KeyMod.CtrlCmd | KeyMod.Shift | KeyMod.Alt | KeyMod.WinCtrl | KeyCode.KEY_A, 'Control+Shift+Alt+Windows+A');
+		assertAriaLabel(OperatingSystem.Linux, KeyMod.CtrlCmd | KeyMod.Shift | KeyMod.Alt | KeyMod.WinCtrl | KeyCode.KEY_A, 'Control+Shift+Alt+Super+A');
 		assertAriaLabel(OperatingSystem.Macintosh, KeyMod.CtrlCmd | KeyMod.Shift | KeyMod.Alt | KeyMod.WinCtrl | KeyCode.KEY_A, 'Control+Shift+Alt+Command+A');
 	});
 
diff --git a/src/vs/platform/keybinding/test/common/mockKeybindingService.ts b/src/vs/platform/keybinding/test/common/mockKeybindingService.ts
index 8a44c7bd8db..a8b00dfb030 100644
--- a/src/vs/platform/keybinding/test/common/mockKeybindingService.ts
+++ b/src/vs/platform/keybinding/test/common/mockKeybindingService.ts
@@ -124,4 +124,8 @@ export class MockKeybindingService implements IKeybindingService {
 	dispatchEvent(e: IKeyboardEvent, target: IContextKeyServiceTarget): boolean {
 		return false;
 	}
+
+	mightProducePrintableCharacter(e: IKeyboardEvent): boolean {
+		return false;
+	}
 }
diff --git a/src/vs/platform/label/common/label.ts b/src/vs/platform/label/common/label.ts
new file mode 100644
index 00000000000..084c063627a
--- /dev/null
+++ b/src/vs/platform/label/common/label.ts
@@ -0,0 +1,171 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { URI } from 'vs/base/common/uri';
+import { IDisposable } from 'vs/base/common/lifecycle';
+import { Event, Emitter } from 'vs/base/common/event';
+import { IEnvironmentService } from 'vs/platform/environment/common/environment';
+import { IWorkspaceContextService, IWorkspace } from 'vs/platform/workspace/common/workspace';
+import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
+import { isEqual, basenameOrAuthority } from 'vs/base/common/resources';
+import { isLinux, isWindows } from 'vs/base/common/platform';
+import { tildify, getPathLabel } from 'vs/base/common/labels';
+import { ltrim } from 'vs/base/common/strings';
+import { IWorkspaceIdentifier, ISingleFolderWorkspaceIdentifier, isSingleFolderWorkspaceIdentifier, WORKSPACE_EXTENSION, toWorkspaceIdentifier, isWorkspaceIdentifier } from 'vs/platform/workspaces/common/workspaces';
+import { localize } from 'vs/nls';
+import { isParent } from 'vs/platform/files/common/files';
+import { basename, dirname, join } from 'vs/base/common/paths';
+import { Schemas } from 'vs/base/common/network';
+
+export interface RegisterFormatterEvent {
+	scheme: string;
+	formatter: LabelRules;
+}
+
+export interface ILabelService {
+	_serviceBrand: any;
+	getUriLabel(resource: URI, relative?: boolean, forceNoTildify?: boolean): string;
+	getWorkspaceLabel(workspace: (IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier | IWorkspace), options?: { verbose: boolean }): string;
+	registerFormatter(schema: string, formatter: LabelRules): IDisposable;
+	onDidRegisterFormatter: Event<RegisterFormatterEvent>;
+}
+
+export interface LabelRules {
+	uri: {
+		label: string; // myLabel:/${path}
+		separator: '/' | '\\' | '';
+		tildify?: boolean;
+		normalizeDriveLetter?: boolean;
+	};
+	workspace?: {
+		suffix: string;
+	};
+}
+
+const LABEL_SERVICE_ID = 'label';
+const sepRegexp = /\//g;
+const labelMatchingRegexp = /\$\{scheme\}|\$\{authority\}|\$\{path\}/g;
+
+function hasDriveLetter(path: string): boolean {
+	return isWindows && path && path[2] === ':';
+}
+
+export class LabelService implements ILabelService {
+	_serviceBrand: any;
+
+	private readonly formatters = new Map<string, LabelRules>();
+	private readonly _onDidRegisterFormatter = new Emitter<RegisterFormatterEvent>();
+
+	constructor(
+		@IEnvironmentService private environmentService: IEnvironmentService,
+		@IWorkspaceContextService private contextService: IWorkspaceContextService
+	) { }
+
+	get onDidRegisterFormatter(): Event<RegisterFormatterEvent> {
+		return this._onDidRegisterFormatter.event;
+	}
+
+	getUriLabel(resource: URI, relative?: boolean, forceNoTildify?: boolean): string {
+		if (!resource) {
+			return undefined;
+		}
+		const formatter = this.formatters.get(resource.scheme);
+		if (!formatter) {
+			return getPathLabel(resource.path, this.environmentService, relative ? this.contextService : undefined);
+		}
+
+		if (relative) {
+			const baseResource = this.contextService && this.contextService.getWorkspaceFolder(resource);
+			if (baseResource) {
+				let relativeLabel: string;
+				if (isEqual(baseResource.uri, resource, !isLinux)) {
+					relativeLabel = ''; // no label if resources are identical
+				} else {
+					const baseResourceLabel = this.formatUri(baseResource.uri, formatter, forceNoTildify);
+					relativeLabel = ltrim(this.formatUri(resource, formatter, forceNoTildify).substring(baseResourceLabel.length), formatter.uri.separator);
+				}
+
+				const hasMultipleRoots = this.contextService.getWorkspace().folders.length > 1;
+				if (hasMultipleRoots) {
+					const rootName = (baseResource && baseResource.name) ? baseResource.name : basenameOrAuthority(baseResource.uri);
+					relativeLabel = relativeLabel ? (rootName + ' • ' + relativeLabel) : rootName; // always show root basename if there are multiple
+				}
+
+				return relativeLabel;
+			}
+		}
+
+		return this.formatUri(resource, formatter, forceNoTildify);
+	}
+
+	getWorkspaceLabel(workspace: (IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier | IWorkspace), options?: { verbose: boolean }): string {
+		if (!isWorkspaceIdentifier(workspace) && !isSingleFolderWorkspaceIdentifier(workspace)) {
+			workspace = toWorkspaceIdentifier(workspace);
+			if (!workspace) {
+				return '';
+			}
+		}
+
+		// Workspace: Single Folder
+		if (isSingleFolderWorkspaceIdentifier(workspace)) {
+			// Folder on disk
+			const formatter = this.formatters.get(workspace.scheme);
+			const label = options && options.verbose ? this.getUriLabel(workspace) : basenameOrAuthority(workspace);
+			if (workspace.scheme === Schemas.file) {
+				return label;
+			}
+
+			const suffix = formatter && formatter.workspace && (typeof formatter.workspace.suffix === 'string') ? formatter.workspace.suffix : workspace.scheme;
+			return suffix ? `${label} (${suffix})` : label;
+		}
+
+		// Workspace: Untitled
+		if (isParent(workspace.configPath, this.environmentService.workspacesHome, !isLinux /* ignore case */)) {
+			return localize('untitledWorkspace', "Untitled (Workspace)");
+		}
+
+		// Workspace: Saved
+		const filename = basename(workspace.configPath);
+		const workspaceName = filename.substr(0, filename.length - WORKSPACE_EXTENSION.length - 1);
+		if (options && options.verbose) {
+			return localize('workspaceNameVerbose', "{0} (Workspace)", this.getUriLabel(URI.file(join(dirname(workspace.configPath), workspaceName))));
+		}
+
+		return localize('workspaceName', "{0} (Workspace)", workspaceName);
+	}
+
+	registerFormatter(scheme: string, formatter: LabelRules): IDisposable {
+		this.formatters.set(scheme, formatter);
+		this._onDidRegisterFormatter.fire({ scheme, formatter });
+
+		return {
+			dispose: () => this.formatters.delete(scheme)
+		};
+	}
+
+	private formatUri(resource: URI, formatter: LabelRules, forceNoTildify: boolean): string {
+		let label = formatter.uri.label.replace(labelMatchingRegexp, match => {
+			switch (match) {
+				case '${scheme}': return resource.scheme;
+				case '${authority}': return resource.authority;
+				case '${path}': return resource.path;
+				default: return '';
+			}
+		});
+
+		// convert \c:\something => C:\something
+		if (formatter.uri.normalizeDriveLetter && hasDriveLetter(label)) {
+			label = label.charAt(1).toUpperCase() + label.substr(2);
+		}
+
+		if (formatter.uri.tildify && !forceNoTildify) {
+			label = tildify(label, this.environmentService.userHome);
+		}
+
+		return label.replace(sepRegexp, formatter.uri.separator);
+	}
+}
+
+export const ILabelService = createDecorator<ILabelService>(LABEL_SERVICE_ID);
diff --git a/src/vs/platform/label/electron-browser/label.contribution.ts b/src/vs/platform/label/electron-browser/label.contribution.ts
new file mode 100644
index 00000000000..68bd62b54a7
--- /dev/null
+++ b/src/vs/platform/label/electron-browser/label.contribution.ts
@@ -0,0 +1,27 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+// TODO@Isidor bad layering
+// tslint:disable-next-line:import-patterns
+import { IWorkbenchContribution, IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions';
+import { ILabelService } from 'vs/platform/label/common/label';
+import { ipcRenderer as ipc } from 'electron';
+import { Registry } from 'vs/platform/registry/common/platform';
+import { LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
+
+/**
+ * Uri display registration needs to be shared from renderer to main.
+ * Since there will be another instance of the uri display service running on main.
+ */
+class LabelRegistrationContribution implements IWorkbenchContribution {
+
+	constructor(@ILabelService labelService: ILabelService) {
+		labelService.onDidRegisterFormatter(data => {
+			ipc.send('vscode:labelRegisterFormatter', data);
+		});
+	}
+}
+
+Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench).registerWorkbenchContribution(LabelRegistrationContribution, LifecyclePhase.Starting);
diff --git a/src/vs/platform/label/test/label.test.ts b/src/vs/platform/label/test/label.test.ts
new file mode 100644
index 00000000000..651638cc176
--- /dev/null
+++ b/src/vs/platform/label/test/label.test.ts
@@ -0,0 +1,54 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as assert from 'assert';
+import { LabelService } from 'vs/platform/label/common/label';
+import { TestEnvironmentService, TestContextService } from 'vs/workbench/test/workbenchTestServices';
+import { Schemas } from 'vs/base/common/network';
+import { TestWorkspace } from 'vs/platform/workspace/test/common/testWorkspace';
+import { URI } from 'vs/base/common/uri';
+import { nativeSep } from 'vs/base/common/paths';
+import { isWindows } from 'vs/base/common/platform';
+
+suite('URI Label', () => {
+
+	let labelService: LabelService;
+
+	setup(() => {
+		labelService = new LabelService(TestEnvironmentService, new TestContextService());
+	});
+
+	test('file scheme', function () {
+		labelService.registerFormatter(Schemas.file, {
+			uri: {
+				label: '${path}',
+				separator: nativeSep,
+				tildify: !isWindows,
+				normalizeDriveLetter: isWindows
+			}
+		});
+
+		const uri1 = TestWorkspace.folders[0].uri.with({ path: TestWorkspace.folders[0].uri.path.concat('/a/b/c/d') });
+		assert.equal(labelService.getUriLabel(uri1, true), isWindows ? 'a\\b\\c\\d' : 'a/b/c/d');
+		assert.equal(labelService.getUriLabel(uri1, false), isWindows ? 'C:\\testWorkspace\\a\\b\\c\\d' : '/testWorkspace/a/b/c/d');
+
+		const uri2 = URI.file('c:\\1/2/3');
+		assert.equal(labelService.getUriLabel(uri2, false), isWindows ? 'C:\\1\\2\\3' : '/c:\\1/2/3');
+	});
+
+	test('custom scheme', function () {
+		labelService.registerFormatter(Schemas.vscode, {
+			uri: {
+				label: 'LABEL/${path}/${authority}/END',
+				separator: '/',
+				tildify: true,
+				normalizeDriveLetter: true
+			}
+		});
+
+		const uri1 = URI.parse('vscode://microsoft.com/1/2/3/4/5');
+		assert.equal(labelService.getUriLabel(uri1, false), 'LABEL//1/2/3/4/5/microsoft.com/END');
+	});
+});
diff --git a/src/vs/platform/launch/electron-main/launchService.ts b/src/vs/platform/launch/electron-main/launchService.ts
new file mode 100644
index 00000000000..bb3c391ae99
--- /dev/null
+++ b/src/vs/platform/launch/electron-main/launchService.ts
@@ -0,0 +1,299 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+import { TPromise } from 'vs/base/common/winjs.base';
+import { IChannel } from 'vs/base/parts/ipc/node/ipc';
+import { ILogService } from 'vs/platform/log/common/log';
+import { IURLService } from 'vs/platform/url/common/url';
+import { IProcessEnvironment, isMacintosh } from 'vs/base/common/platform';
+import { ParsedArgs, IEnvironmentService } from 'vs/platform/environment/common/environment';
+import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
+import { OpenContext, IWindowSettings } from 'vs/platform/windows/common/windows';
+import { IWindowsMainService, ICodeWindow } from 'vs/platform/windows/electron-main/windows';
+import { whenDeleted } from 'vs/base/node/pfs';
+import { IWorkspacesMainService } from 'vs/platform/workspaces/common/workspaces';
+import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { URI, UriComponents } from 'vs/base/common/uri';
+import { BrowserWindow } from 'electron';
+import { Event } from 'vs/base/common/event';
+import { hasArgs } from 'vs/platform/environment/node/argv';
+
+export const ID = 'launchService';
+export const ILaunchService = createDecorator<ILaunchService>(ID);
+
+export interface IStartArguments {
+	args: ParsedArgs;
+	userEnv: IProcessEnvironment;
+}
+
+export interface IWindowInfo {
+	pid: number;
+	title: string;
+	folderURIs: UriComponents[];
+}
+
+export interface IMainProcessInfo {
+	mainPID: number;
+	mainArguments: string[];
+	windows: IWindowInfo[];
+}
+
+function parseOpenUrl(args: ParsedArgs): URI[] {
+	if (args['open-url'] && args._urls && args._urls.length > 0) {
+		// --open-url must contain -- followed by the url(s)
+		// process.argv is used over args._ as args._ are resolved to file paths at this point
+		return args._urls
+			.map(url => {
+				try {
+					return URI.parse(url);
+				} catch (err) {
+					return null;
+				}
+			})
+			.filter(uri => !!uri);
+	}
+
+	return [];
+}
+
+export interface ILaunchService {
+	_serviceBrand: any;
+	start(args: ParsedArgs, userEnv: IProcessEnvironment): TPromise<void>;
+	getMainProcessId(): TPromise<number>;
+	getMainProcessInfo(): TPromise<IMainProcessInfo>;
+	getLogsPath(): TPromise<string>;
+}
+
+export interface ILaunchChannel extends IChannel {
+	call(command: 'start', arg: IStartArguments): TPromise<void>;
+	call(command: 'get-main-process-id', arg: null): TPromise<any>;
+	call(command: 'get-main-process-info', arg: null): TPromise<any>;
+	call(command: 'get-logs-path', arg: null): TPromise<string>;
+	call(command: string, arg: any): TPromise<any>;
+}
+
+export class LaunchChannel implements ILaunchChannel {
+
+	constructor(private service: ILaunchService) { }
+
+	listen<T>(event: string): Event<T> {
+		throw new Error('No event found');
+	}
+
+	call(command: string, arg: any): TPromise<any> {
+		switch (command) {
+			case 'start':
+				const { args, userEnv } = arg as IStartArguments;
+				return this.service.start(args, userEnv);
+
+			case 'get-main-process-id':
+				return this.service.getMainProcessId();
+
+			case 'get-main-process-info':
+				return this.service.getMainProcessInfo();
+
+			case 'get-logs-path':
+				return this.service.getLogsPath();
+		}
+
+		return undefined;
+	}
+}
+
+export class LaunchChannelClient implements ILaunchService {
+
+	_serviceBrand: any;
+
+	constructor(private channel: ILaunchChannel) { }
+
+	start(args: ParsedArgs, userEnv: IProcessEnvironment): TPromise<void> {
+		return this.channel.call('start', { args, userEnv });
+	}
+
+	getMainProcessId(): TPromise<number> {
+		return this.channel.call('get-main-process-id', null);
+	}
+
+	getMainProcessInfo(): TPromise<IMainProcessInfo> {
+		return this.channel.call('get-main-process-info', null);
+	}
+
+	getLogsPath(): TPromise<string> {
+		return this.channel.call('get-logs-path', null);
+	}
+}
+
+export class LaunchService implements ILaunchService {
+
+	_serviceBrand: any;
+
+	constructor(
+		@ILogService private logService: ILogService,
+		@IWindowsMainService private windowsMainService: IWindowsMainService,
+		@IURLService private urlService: IURLService,
+		@IWorkspacesMainService private workspacesMainService: IWorkspacesMainService,
+		@IEnvironmentService private readonly environmentService: IEnvironmentService,
+		@IConfigurationService private readonly configurationService: IConfigurationService
+	) { }
+
+	start(args: ParsedArgs, userEnv: IProcessEnvironment): TPromise<void> {
+		this.logService.trace('Received data from other instance: ', args, userEnv);
+
+		const urlsToOpen = parseOpenUrl(args);
+
+		// Check early for open-url which is handled in URL service
+		if (urlsToOpen.length) {
+			let whenWindowReady = TPromise.as<any>(null);
+
+			// Create a window if there is none
+			if (this.windowsMainService.getWindowCount() === 0) {
+				const window = this.windowsMainService.openNewWindow(OpenContext.DESKTOP)[0];
+				whenWindowReady = window.ready();
+			}
+
+			// Make sure a window is open, ready to receive the url event
+			whenWindowReady.then(() => {
+				for (const url of urlsToOpen) {
+					this.urlService.open(url);
+				}
+			});
+
+			return TPromise.as(null);
+		}
+
+		// Otherwise handle in windows service
+		return this.startOpenWindow(args, userEnv);
+	}
+
+	private startOpenWindow(args: ParsedArgs, userEnv: IProcessEnvironment): TPromise<void> {
+		const context = !!userEnv['VSCODE_CLI'] ? OpenContext.CLI : OpenContext.DESKTOP;
+		let usedWindows: ICodeWindow[];
+
+		// Special case extension development
+		if (!!args.extensionDevelopmentPath) {
+			this.windowsMainService.openExtensionDevelopmentHostWindow({ context, cli: args, userEnv });
+		}
+
+		// Start without file/folder arguments
+		else if (!hasArgs(args._) && !hasArgs(args['folder-uri']) && !hasArgs(args['file-uri'])) {
+			let openNewWindow = false;
+
+			// Force new window
+			if (args['new-window'] || args['unity-launch']) {
+				openNewWindow = true;
+			}
+
+			// Force reuse window
+			else if (args['reuse-window']) {
+				openNewWindow = false;
+			}
+
+			// Otherwise check for settings
+			else {
+				const windowConfig = this.configurationService.getValue<IWindowSettings>('window');
+				const openWithoutArgumentsInNewWindowConfig = (windowConfig && windowConfig.openWithoutArgumentsInNewWindow) || 'default' /* default */;
+				switch (openWithoutArgumentsInNewWindowConfig) {
+					case 'on':
+						openNewWindow = true;
+						break;
+					case 'off':
+						openNewWindow = false;
+						break;
+					default:
+						openNewWindow = !isMacintosh; // prefer to restore running instance on macOS
+				}
+			}
+
+			if (openNewWindow) {
+				usedWindows = this.windowsMainService.open({ context, cli: args, userEnv, forceNewWindow: true, forceEmpty: true });
+			} else {
+				usedWindows = [this.windowsMainService.focusLastActive(args, context)];
+			}
+		}
+
+		// Start with file/folder arguments
+		else {
+			usedWindows = this.windowsMainService.open({
+				context,
+				cli: args,
+				userEnv,
+				forceNewWindow: args['new-window'],
+				preferNewWindow: !args['reuse-window'] && !args.wait,
+				forceReuseWindow: args['reuse-window'],
+				diffMode: args.diff,
+				addMode: args.add
+			});
+		}
+
+		// If the other instance is waiting to be killed, we hook up a window listener if one window
+		// is being used and only then resolve the startup promise which will kill this second instance.
+		// In addition, we poll for the wait marker file to be deleted to return.
+		if (args.wait && usedWindows.length === 1 && usedWindows[0]) {
+			return TPromise.any([
+				this.windowsMainService.waitForWindowCloseOrLoad(usedWindows[0].id),
+				whenDeleted(args.waitMarkerFilePath)
+			]).then(() => void 0, () => void 0);
+		}
+
+		return TPromise.as(null);
+	}
+
+	getMainProcessId(): TPromise<number> {
+		this.logService.trace('Received request for process ID from other instance.');
+
+		return TPromise.as(process.pid);
+	}
+
+	getMainProcessInfo(): TPromise<IMainProcessInfo> {
+		this.logService.trace('Received request for main process info from other instance.');
+
+		const windows: IWindowInfo[] = [];
+		BrowserWindow.getAllWindows().forEach(window => {
+			const codeWindow = this.windowsMainService.getWindowById(window.id);
+			if (codeWindow) {
+				windows.push(this.codeWindowToInfo(codeWindow));
+			} else {
+				windows.push(this.browserWindowToInfo(window));
+			}
+		});
+
+		return TPromise.wrap({
+			mainPID: process.pid,
+			mainArguments: process.argv,
+			windows
+		} as IMainProcessInfo);
+	}
+
+	getLogsPath(): TPromise<string> {
+		this.logService.trace('Received request for logs path from other instance.');
+
+		return TPromise.as(this.environmentService.logsPath);
+	}
+
+	private codeWindowToInfo(window: ICodeWindow): IWindowInfo {
+		const folderURIs: URI[] = [];
+
+		if (window.openedFolderUri) {
+			folderURIs.push(window.openedFolderUri);
+		} else if (window.openedWorkspace) {
+			const rootFolders = this.workspacesMainService.resolveWorkspaceSync(window.openedWorkspace.configPath).folders;
+			rootFolders.forEach(root => {
+				folderURIs.push(root.uri);
+			});
+		}
+
+		return this.browserWindowToInfo(window.win, folderURIs);
+	}
+
+	private browserWindowToInfo(win: BrowserWindow, folderURIs: URI[] = []): IWindowInfo {
+		return {
+			pid: win.webContents.getOSProcessId(),
+			title: win.getTitle(),
+			folderURIs
+		} as IWindowInfo;
+	}
+}
diff --git a/src/vs/platform/lifecycle/common/lifecycle.ts b/src/vs/platform/lifecycle/common/lifecycle.ts
index 3a92380ea5f..c0a663e258e 100644
--- a/src/vs/platform/lifecycle/common/lifecycle.ts
+++ b/src/vs/platform/lifecycle/common/lifecycle.ts
@@ -7,6 +7,7 @@
 import { TPromise } from 'vs/base/common/winjs.base';
 import { Event } from 'vs/base/common/event';
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
+import { isThenable } from 'vs/base/common/async';
 
 export const ILifecycleService = createDecorator<ILifecycleService>('lifecycleService');
 
@@ -23,7 +24,7 @@ export interface ShutdownEvent {
 	/**
 	 * Allows to veto the shutdown. The veto can be a long running operation.
 	 */
-	veto(value: boolean | TPromise<boolean>): void;
+	veto(value: boolean | Thenable<boolean>): void;
 
 	/**
 	 * The reason why Code is shutting down.
@@ -31,7 +32,7 @@ export interface ShutdownEvent {
 	reason: ShutdownReason;
 }
 
-export enum ShutdownReason {
+export const enum ShutdownReason {
 
 	/** Window is closed */
 	CLOSE = 1,
@@ -46,18 +47,33 @@ export enum ShutdownReason {
 	LOAD = 4
 }
 
-export enum StartupKind {
+export const enum StartupKind {
 	NewWindow = 1,
 	ReloadedWindow = 3,
 	ReopenedWindow = 4,
 }
+export function StartupKindToString(startupKind: StartupKind): string {
+	switch (startupKind) {
+		case StartupKind.NewWindow: return 'NewWindow';
+		case StartupKind.ReloadedWindow: return 'ReloadedWindow';
+		case StartupKind.ReopenedWindow: return 'ReopenedWindow';
+	}
+}
 
-export enum LifecyclePhase {
+export const enum LifecyclePhase {
 	Starting = 1,
 	Restoring = 2,
 	Running = 3,
 	Eventually = 4
 }
+export function LifecyclePhaseToString(phase: LifecyclePhase) {
+	switch (phase) {
+		case LifecyclePhase.Starting: return 'Starting';
+		case LifecyclePhase.Restoring: return 'Restoring';
+		case LifecyclePhase.Running: return 'Running';
+		case LifecyclePhase.Eventually: return 'Eventually';
+	}
+}
 
 /**
  * A lifecycle service informs about lifecycle events of the
@@ -108,12 +124,12 @@ export const NullLifecycleService: ILifecycleService = {
 };
 
 // Shared veto handling across main and renderer
-export function handleVetos(vetos: (boolean | TPromise<boolean>)[], onError: (error: Error) => void): TPromise<boolean /* veto */> {
+export function handleVetos(vetos: (boolean | Thenable<boolean>)[], onError: (error: Error) => void): TPromise<boolean /* veto */> {
 	if (vetos.length === 0) {
 		return TPromise.as(false);
 	}
 
-	const promises: TPromise<void>[] = [];
+	const promises: Thenable<void>[] = [];
 	let lazyValue = false;
 
 	for (let valueOrPromise of vetos) {
@@ -123,7 +139,7 @@ export function handleVetos(vetos: (boolean | TPromise<boolean>)[], onError: (er
 			return TPromise.as(true);
 		}
 
-		if (TPromise.is(valueOrPromise)) {
+		if (isThenable(valueOrPromise)) {
 			promises.push(valueOrPromise.then(value => {
 				if (value) {
 					lazyValue = true; // veto, done
diff --git a/src/vs/platform/lifecycle/electron-browser/lifecycleService.ts b/src/vs/platform/lifecycle/electron-browser/lifecycleService.ts
index 4b6efd06abb..d75d974b761 100644
--- a/src/vs/platform/lifecycle/electron-browser/lifecycleService.ts
+++ b/src/vs/platform/lifecycle/electron-browser/lifecycleService.ts
@@ -6,7 +6,7 @@
 
 import { TPromise } from 'vs/base/common/winjs.base';
 import { toErrorMessage } from 'vs/base/common/errorMessage';
-import { ILifecycleService, ShutdownEvent, ShutdownReason, StartupKind, LifecyclePhase, handleVetos } from 'vs/platform/lifecycle/common/lifecycle';
+import { ILifecycleService, ShutdownEvent, ShutdownReason, StartupKind, LifecyclePhase, handleVetos, LifecyclePhaseToString } from 'vs/platform/lifecycle/common/lifecycle';
 import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
 import { ipcRenderer as ipc } from 'electron';
 import { Event, Emitter } from 'vs/base/common/event';
@@ -20,7 +20,7 @@ export class LifecycleService implements ILifecycleService {
 
 	private static readonly _lastShutdownReasonKey = 'lifecyle.lastShutdownReason';
 
-	public _serviceBrand: any;
+	_serviceBrand: any;
 
 	private readonly _onWillShutdown = new Emitter<ShutdownEvent>();
 	private readonly _onShutdown = new Emitter<ShutdownReason>();
@@ -61,7 +61,7 @@ export class LifecycleService implements ILifecycleService {
 			this._storageService.store(LifecycleService._lastShutdownReasonKey, JSON.stringify(reply.reason), StorageScope.WORKSPACE);
 
 			// trigger onWillShutdown events and veto collecting
-			this.onBeforeUnload(reply.reason).done(veto => {
+			this.onBeforeUnload(reply.reason).then(veto => {
 				if (veto) {
 					this._logService.trace('lifecycle: onBeforeUnload prevented via veto');
 					this._storageService.remove(LifecycleService._lastShutdownReasonKey, StorageScope.WORKSPACE);
@@ -83,7 +83,7 @@ export class LifecycleService implements ILifecycleService {
 	}
 
 	private onBeforeUnload(reason: ShutdownReason): TPromise<boolean> {
-		const vetos: (boolean | TPromise<boolean>)[] = [];
+		const vetos: (boolean | Thenable<boolean>)[] = [];
 
 		this._onWillShutdown.fire({
 			veto(value) {
@@ -95,11 +95,11 @@ export class LifecycleService implements ILifecycleService {
 		return handleVetos(vetos, err => this._notificationService.error(toErrorMessage(err)));
 	}
 
-	public get phase(): LifecyclePhase {
+	get phase(): LifecyclePhase {
 		return this._phase;
 	}
 
-	public set phase(value: LifecyclePhase) {
+	set phase(value: LifecyclePhase) {
 		if (value < this.phase) {
 			throw new Error('Lifecycle cannot go backwards');
 		}
@@ -111,7 +111,7 @@ export class LifecycleService implements ILifecycleService {
 		this._logService.trace(`lifecycle: phase changed (value: ${value})`);
 
 		this._phase = value;
-		mark(`LifecyclePhase/${LifecyclePhase[value]}`);
+		mark(`LifecyclePhase/${LifecyclePhaseToString(value)}`);
 
 		if (this._phaseWhen.has(this._phase)) {
 			this._phaseWhen.get(this._phase).open();
@@ -119,7 +119,7 @@ export class LifecycleService implements ILifecycleService {
 		}
 	}
 
-	public when(phase: LifecyclePhase): Thenable<any> {
+	when(phase: LifecyclePhase): Thenable<any> {
 		if (phase <= this._phase) {
 			return Promise.resolve();
 		}
@@ -133,15 +133,15 @@ export class LifecycleService implements ILifecycleService {
 		return barrier.wait();
 	}
 
-	public get startupKind(): StartupKind {
+	get startupKind(): StartupKind {
 		return this._startupKind;
 	}
 
-	public get onWillShutdown(): Event<ShutdownEvent> {
+	get onWillShutdown(): Event<ShutdownEvent> {
 		return this._onWillShutdown.event;
 	}
 
-	public get onShutdown(): Event<ShutdownReason> {
+	get onShutdown(): Event<ShutdownReason> {
 		return this._onShutdown.event;
 	}
 }
diff --git a/src/vs/platform/lifecycle/electron-main/lifecycleMain.ts b/src/vs/platform/lifecycle/electron-main/lifecycleMain.ts
index a2388d8fa49..08641ed453d 100644
--- a/src/vs/platform/lifecycle/electron-main/lifecycleMain.ts
+++ b/src/vs/platform/lifecycle/electron-main/lifecycleMain.ts
@@ -18,7 +18,7 @@ import { isMacintosh, isWindows } from 'vs/base/common/platform';
 
 export const ILifecycleService = createDecorator<ILifecycleService>('lifecycleService');
 
-export enum UnloadReason {
+export const enum UnloadReason {
 	CLOSE = 1,
 	QUIT = 2,
 	RELOAD = 3,
@@ -129,15 +129,15 @@ export class LifecycleService implements ILifecycleService {
 		}
 	}
 
-	public get wasRestarted(): boolean {
+	get wasRestarted(): boolean {
 		return this._wasRestarted;
 	}
 
-	public get isQuitRequested(): boolean {
+	get isQuitRequested(): boolean {
 		return !!this.quitRequested;
 	}
 
-	public ready(): void {
+	ready(): void {
 		this.registerListeners();
 	}
 
@@ -178,7 +178,7 @@ export class LifecycleService implements ILifecycleService {
 		});
 	}
 
-	public registerWindow(window: ICodeWindow): void {
+	registerWindow(window: ICodeWindow): void {
 
 		// track window count
 		this.windowCounter++;
@@ -199,7 +199,7 @@ export class LifecycleService implements ILifecycleService {
 
 			// Otherwise prevent unload and handle it from window
 			e.preventDefault();
-			this.unload(window, UnloadReason.CLOSE).done(veto => {
+			this.unload(window, UnloadReason.CLOSE).then(veto => {
 				if (!veto) {
 					this.windowToCloseRequest[windowId] = true;
 
@@ -232,7 +232,7 @@ export class LifecycleService implements ILifecycleService {
 		});
 	}
 
-	public unload(window: ICodeWindow, reason: UnloadReason): TPromise<boolean /* veto */> {
+	unload(window: ICodeWindow, reason: UnloadReason): TPromise<boolean /* veto */> {
 
 		// Always allow to unload a window that is not yet ready
 		if (window.readyState !== ReadyState.READY) {
@@ -326,7 +326,7 @@ export class LifecycleService implements ILifecycleService {
 	 * A promise that completes to indicate if the quit request has been veto'd
 	 * by the user or not.
 	 */
-	public quit(fromUpdate?: boolean): TPromise<boolean /* veto */> {
+	quit(fromUpdate?: boolean): TPromise<boolean /* veto */> {
 		this.logService.trace('Lifecycle#quit()');
 
 		if (!this.pendingQuitPromise) {
@@ -362,13 +362,13 @@ export class LifecycleService implements ILifecycleService {
 		return this.pendingQuitPromise;
 	}
 
-	public kill(code?: number): void {
+	kill(code?: number): void {
 		this.logService.trace('Lifecycle#kill()');
 
 		app.exit(code);
 	}
 
-	public relaunch(options?: { addArgs?: string[], removeArgs?: string[] }): void {
+	relaunch(options?: { addArgs?: string[], removeArgs?: string[] }): void {
 		this.logService.trace('Lifecycle#relaunch()');
 
 		const args = process.argv.slice(1);
diff --git a/src/vs/platform/list/browser/listService.ts b/src/vs/platform/list/browser/listService.ts
index bc246f6ed0c..627ad10eeff 100644
--- a/src/vs/platform/list/browser/listService.ts
+++ b/src/vs/platform/list/browser/listService.ts
@@ -4,27 +4,35 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import { ITree, ITreeConfiguration, ITreeOptions } from 'vs/base/parts/tree/browser/tree';
-import { List, IListOptions, isSelectionRangeChangeEvent, isSelectionSingleChangeEvent, IMultipleSelectionController, IOpenController, DefaultStyleController } from 'vs/base/browser/ui/list/listWidget';
-import { createDecorator, IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IDisposable, toDisposable, combinedDisposable, dispose, Disposable } from 'vs/base/common/lifecycle';
-import { IContextKeyService, IContextKey, RawContextKey, ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { PagedList, IPagedRenderer } from 'vs/base/browser/ui/list/listPaging';
-import { IDelegate, IRenderer, IListMouseEvent, IListTouchEvent } from 'vs/base/browser/ui/list/list';
+import { addClass, addStandardDisposableListener, createStyleSheet, getTotalHeight, removeClass } from 'vs/base/browser/dom';
+import { IKeyboardEvent } from 'vs/base/browser/keyboardEvent';
+import { IInputOptions, InputBox } from 'vs/base/browser/ui/inputbox/inputBox';
+import { IListMouseEvent, IListTouchEvent, IRenderer, IVirtualDelegate } from 'vs/base/browser/ui/list/list';
+import { IPagedRenderer, PagedList } from 'vs/base/browser/ui/list/listPaging';
+import { DefaultStyleController, IListOptions, IMultipleSelectionController, IOpenController, isSelectionRangeChangeEvent, isSelectionSingleChangeEvent, List } from 'vs/base/browser/ui/list/listWidget';
+import { canceled, onUnexpectedError } from 'vs/base/common/errors';
+import { Emitter, Event } from 'vs/base/common/event';
+import { FuzzyScore } from 'vs/base/common/filters';
+import { KeyCode } from 'vs/base/common/keyCodes';
+import { combinedDisposable, Disposable, dispose, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
+import { ScrollbarVisibility } from 'vs/base/common/scrollable';
+import { isUndefinedOrNull } from 'vs/base/common/types';
+import { TPromise } from 'vs/base/common/winjs.base';
+import { IFilter, ITree, ITreeConfiguration, ITreeOptions } from 'vs/base/parts/tree/browser/tree';
+import { ClickBehavior, DefaultController, DefaultTreestyler, IControllerOptions, OpenMode } from 'vs/base/parts/tree/browser/treeDefaults';
 import { Tree } from 'vs/base/parts/tree/browser/treeImpl';
-import { attachListStyler, defaultListStyles, computeStyles } from 'vs/platform/theme/common/styler';
+import { localize } from 'vs/nls';
+import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { Extensions as ConfigurationExtensions, IConfigurationRegistry } from 'vs/platform/configuration/common/configurationRegistry';
+import { ContextKeyExpr, IContextKey, IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
+import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
+import { IEditorOptions } from 'vs/platform/editor/common/editor';
+import { createDecorator, IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
+import { Registry } from 'vs/platform/registry/common/platform';
+import { attachInputBoxStyler, attachListStyler, computeStyles, defaultListStyles } from 'vs/platform/theme/common/styler';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { InputFocusedContextKey } from 'vs/platform/workbench/common/contextkeys';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { localize } from 'vs/nls';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { Extensions as ConfigurationExtensions, IConfigurationRegistry } from 'vs/platform/configuration/common/configurationRegistry';
-import { DefaultController, IControllerOptions, OpenMode, ClickBehavior, DefaultTreestyler } from 'vs/base/parts/tree/browser/treeDefaults';
-import { isUndefinedOrNull } from 'vs/base/common/types';
-import { IEditorOptions } from 'vs/platform/editor/common/editor';
-import { Event, Emitter } from 'vs/base/common/event';
-import { createStyleSheet } from 'vs/base/browser/dom';
-import { ScrollbarVisibility } from 'vs/base/common/scrollable';
 
 export type ListWidget = List<any> | PagedList<any> | ITree;
 
@@ -90,16 +98,12 @@ export class ListService implements IListService {
 const RawWorkbenchListFocusContextKey = new RawContextKey<boolean>('listFocus', true);
 export const WorkbenchListSupportsMultiSelectContextKey = new RawContextKey<boolean>('listSupportsMultiselect', true);
 export const WorkbenchListFocusContextKey = ContextKeyExpr.and(RawWorkbenchListFocusContextKey, ContextKeyExpr.not(InputFocusedContextKey));
+export const WorkbenchListHasSelectionOrFocus = new RawContextKey<boolean>('listHasSelectionOrFocus', false);
 export const WorkbenchListDoubleSelection = new RawContextKey<boolean>('listDoubleSelection', false);
 export const WorkbenchListMultiSelection = new RawContextKey<boolean>('listMultiSelection', false);
 
 function createScopedContextKeyService(contextKeyService: IContextKeyService, widget: ListWidget): IContextKeyService {
 	const result = contextKeyService.createScoped(widget.getHTMLElement());
-
-	if (widget instanceof List || widget instanceof PagedList) {
-		WorkbenchListSupportsMultiSelectContextKey.bindTo(result);
-	}
-
 	RawWorkbenchListFocusContextKey.bindTo(result);
 	return result;
 }
@@ -199,6 +203,7 @@ export class WorkbenchList<T> extends List<T> {
 
 	readonly contextKeyService: IContextKeyService;
 
+	private listHasSelectionOrFocus: IContextKey<boolean>;
 	private listDoubleSelection: IContextKey<boolean>;
 	private listMultiSelection: IContextKey<boolean>;
 
@@ -206,7 +211,7 @@ export class WorkbenchList<T> extends List<T> {
 
 	constructor(
 		container: HTMLElement,
-		delegate: IDelegate<T>,
+		delegate: IVirtualDelegate<T>,
 		renderers: IRenderer<T, any>[],
 		options: IListOptions<T>,
 		@IContextKeyService contextKeyService: IContextKeyService,
@@ -225,6 +230,11 @@ export class WorkbenchList<T> extends List<T> {
 		);
 
 		this.contextKeyService = createScopedContextKeyService(contextKeyService, this);
+
+		const listSupportsMultiSelect = WorkbenchListSupportsMultiSelectContextKey.bindTo(this.contextKeyService);
+		listSupportsMultiSelect.set(!(options.multipleSelectionSupport === false));
+
+		this.listHasSelectionOrFocus = WorkbenchListHasSelectionOrFocus.bindTo(this.contextKeyService);
 		this.listDoubleSelection = WorkbenchListDoubleSelection.bindTo(this.contextKeyService);
 		this.listMultiSelection = WorkbenchListMultiSelection.bindTo(this.contextKeyService);
 
@@ -236,8 +246,17 @@ export class WorkbenchList<T> extends List<T> {
 			attachListStyler(this, themeService),
 			this.onSelectionChange(() => {
 				const selection = this.getSelection();
+				const focus = this.getFocus();
+
+				this.listHasSelectionOrFocus.set(selection.length > 0 || focus.length > 0);
 				this.listMultiSelection.set(selection.length > 1);
 				this.listDoubleSelection.set(selection.length === 2);
+			}),
+			this.onFocusChange(() => {
+				const selection = this.getSelection();
+				const focus = this.getFocus();
+
+				this.listHasSelectionOrFocus.set(selection.length > 0 || focus.length > 0);
 			})
 		]));
 
@@ -267,7 +286,7 @@ export class WorkbenchPagedList<T> extends PagedList<T> {
 
 	constructor(
 		container: HTMLElement,
-		delegate: IDelegate<number>,
+		delegate: IVirtualDelegate<number>,
 		renderers: IPagedRenderer<T, any>[],
 		options: IListOptions<T>,
 		@IContextKeyService contextKeyService: IContextKeyService,
@@ -287,6 +306,9 @@ export class WorkbenchPagedList<T> extends PagedList<T> {
 
 		this.contextKeyService = createScopedContextKeyService(contextKeyService, this);
 
+		const listSupportsMultiSelect = WorkbenchListSupportsMultiSelectContextKey.bindTo(this.contextKeyService);
+		listSupportsMultiSelect.set(!(options.multipleSelectionSupport === false));
+
 		this._useAltAsMultipleSelectionModifier = useAltAsMultipleSelectionModifier(configurationService);
 
 		this.disposables.push(combinedDisposable([
@@ -323,6 +345,7 @@ export class WorkbenchTree extends Tree {
 
 	protected disposables: IDisposable[];
 
+	private listHasSelectionOrFocus: IContextKey<boolean>;
 	private listDoubleSelection: IContextKey<boolean>;
 	private listMultiSelection: IContextKey<boolean>;
 
@@ -352,6 +375,10 @@ export class WorkbenchTree extends Tree {
 
 		this.disposables = [];
 		this.contextKeyService = createScopedContextKeyService(contextKeyService, this);
+
+		WorkbenchListSupportsMultiSelectContextKey.bindTo(this.contextKeyService);
+
+		this.listHasSelectionOrFocus = WorkbenchListHasSelectionOrFocus.bindTo(this.contextKeyService);
 		this.listDoubleSelection = WorkbenchListDoubleSelection.bindTo(this.contextKeyService);
 		this.listMultiSelection = WorkbenchListMultiSelection.bindTo(this.contextKeyService);
 
@@ -366,10 +393,20 @@ export class WorkbenchTree extends Tree {
 
 		this.disposables.push(this.onDidChangeSelection(() => {
 			const selection = this.getSelection();
+			const focus = this.getFocus();
+
+			this.listHasSelectionOrFocus.set((selection && selection.length > 0) || !!focus);
 			this.listDoubleSelection.set(selection && selection.length === 2);
 			this.listMultiSelection.set(selection && selection.length > 1);
 		}));
 
+		this.disposables.push(this.onDidChangeFocus(() => {
+			const selection = this.getSelection();
+			const focus = this.getFocus();
+
+			this.listHasSelectionOrFocus.set((selection && selection.length > 0) || !!focus);
+		}));
+
 		this.disposables.push(configurationService.onDidChangeConfiguration(e => {
 			if (e.affectsConfiguration(openModeSettingKey)) {
 				this._openOnSingleClick = useSingleClickToOpen(configurationService);
@@ -526,6 +563,241 @@ export class TreeResourceNavigator extends Disposable {
 	}
 }
 
+export interface IHighlighter {
+	getHighlights(tree: ITree, element: any, pattern: string): FuzzyScore;
+	getHighlightsStorageKey?(element: any): any;
+}
+
+export interface IHighlightingTreeConfiguration extends ITreeConfiguration {
+	highlighter: IHighlighter;
+}
+
+export interface IHighlightingTreeOptions extends ITreeOptions {
+	filterOnType?: boolean;
+}
+
+export class HighlightingTreeController extends WorkbenchTreeController {
+
+	constructor(
+		options: IControllerOptions,
+		private readonly onType: () => any,
+		@IConfigurationService configurationService: IConfigurationService,
+		@IKeybindingService private readonly _keybindingService: IKeybindingService,
+	) {
+		super(options, configurationService);
+	}
+
+	onKeyDown(tree: ITree, event: IKeyboardEvent) {
+		let handled = super.onKeyDown(tree, event);
+		if (handled) {
+			return true;
+		}
+		if (this.upKeyBindingDispatcher.has(event.keyCode)) {
+			return false;
+		}
+		if (this._keybindingService.mightProducePrintableCharacter(event)) {
+			this.onType();
+			return true;
+		}
+		return false;
+	}
+}
+
+class HightlightsFilter implements IFilter {
+
+	static add(config: ITreeConfiguration, options: IHighlightingTreeOptions): ITreeConfiguration {
+		let myFilter = new HightlightsFilter();
+		myFilter.enabled = options.filterOnType;
+		if (!config.filter) {
+			config.filter = myFilter;
+		} else {
+			let otherFilter = config.filter;
+			config.filter = {
+				isVisible(tree: ITree, element: any): boolean {
+					return myFilter.isVisible(tree, element) && otherFilter.isVisible(tree, element);
+				}
+			};
+		}
+		return config;
+	}
+
+	enabled: boolean = true;
+
+	isVisible(tree: ITree, element: any): boolean {
+		if (!this.enabled) {
+			return true;
+		}
+		let tree2 = (tree as HighlightingWorkbenchTree);
+		if (!tree2.isHighlighterScoring()) {
+			return true;
+		}
+		if (tree2.getHighlighterScore(element)) {
+			return true;
+		}
+		return false;
+	}
+}
+
+export class HighlightingWorkbenchTree extends WorkbenchTree {
+
+	protected readonly domNode: HTMLElement;
+	protected readonly inputContainer: HTMLElement;
+	protected readonly input: InputBox;
+
+	protected readonly highlighter: IHighlighter;
+	protected readonly highlights: Map<any, FuzzyScore>;
+
+	private readonly _onDidStartFilter: Emitter<this>;
+	readonly onDidStartFiltering: Event<this>;
+
+	constructor(
+		parent: HTMLElement,
+		treeConfiguration: IHighlightingTreeConfiguration,
+		treeOptions: IHighlightingTreeOptions,
+		listOptions: IInputOptions,
+		@IContextKeyService contextKeyService: IContextKeyService,
+		@IContextViewService contextViewService: IContextViewService,
+		@IListService listService: IListService,
+		@IThemeService themeService: IThemeService,
+		@IInstantiationService instantiationService: IInstantiationService,
+		@IConfigurationService configurationService: IConfigurationService
+	) {
+		// build html skeleton
+		const container = document.createElement('div');
+		container.className = 'highlighting-tree';
+		const inputContainer = document.createElement('div');
+		inputContainer.className = 'input';
+		const treeContainer = document.createElement('div');
+		treeContainer.className = 'tree';
+		container.appendChild(inputContainer);
+		container.appendChild(treeContainer);
+		parent.appendChild(container);
+
+		// create tree
+		treeConfiguration.controller = treeConfiguration.controller || instantiationService.createInstance(HighlightingTreeController, {}, () => this.onTypeInTree());
+		super(treeContainer, HightlightsFilter.add(treeConfiguration, treeOptions), treeOptions, contextKeyService, listService, themeService, instantiationService, configurationService);
+		this.highlighter = treeConfiguration.highlighter;
+		this.highlights = new Map<any, FuzzyScore>();
+
+		this.domNode = container;
+		addClass(this.domNode, 'inactive');
+
+		// create input
+		this.inputContainer = inputContainer;
+		this.input = new InputBox(inputContainer, contextViewService, listOptions);
+		this.input.setEnabled(false);
+		this.input.onDidChange(this.updateHighlights, this, this.disposables);
+		this.disposables.push(attachInputBoxStyler(this.input, themeService));
+		this.disposables.push(this.input);
+		this.disposables.push(addStandardDisposableListener(this.input.inputElement, 'keydown', event => {
+			//todo@joh make this command/context-key based
+			switch (event.keyCode) {
+				case KeyCode.UpArrow:
+				case KeyCode.DownArrow:
+				case KeyCode.Tab:
+					this.domFocus();
+					event.preventDefault();
+					break;
+				case KeyCode.Enter:
+					this.setSelection(this.getSelection());
+					event.preventDefault();
+					break;
+				case KeyCode.Escape:
+					this.input.value = '';
+					this.domFocus();
+					event.preventDefault();
+					break;
+			}
+		}));
+
+		this._onDidStartFilter = new Emitter<this>();
+		this.onDidStartFiltering = this._onDidStartFilter.event;
+		this.disposables.push(this._onDidStartFilter);
+	}
+
+	setInput(element: any): TPromise<any> {
+		this.input.setEnabled(false);
+		return super.setInput(element).then(value => {
+			if (!this.input.inputElement) {
+				// has been disposed in the meantime -> cancel
+				return Promise.reject(canceled());
+			}
+			this.input.setEnabled(true);
+			return value;
+		});
+	}
+
+	layout(height?: number, width?: number): void {
+		this.input.layout();
+		super.layout(isNaN(height) ? height : height - getTotalHeight(this.inputContainer), width);
+	}
+
+	private onTypeInTree(): void {
+		removeClass(this.domNode, 'inactive');
+		this.input.focus();
+		this.layout();
+		this._onDidStartFilter.fire(this);
+	}
+
+	private lastSelection: any[];
+
+	private updateHighlights(pattern: string): void {
+
+		// remember old selection
+		let defaultSelection: any[] = [];
+		if (!this.lastSelection && pattern) {
+			this.lastSelection = this.getSelection();
+		} else if (this.lastSelection && !pattern) {
+			defaultSelection = this.lastSelection;
+			this.lastSelection = [];
+		}
+
+		let topElement: any;
+		if (pattern) {
+			let nav = this.getNavigator(undefined, false);
+			let topScore: FuzzyScore;
+			while (nav.next()) {
+				let element = nav.current();
+				let score = this.highlighter.getHighlights(this, element, pattern);
+				this.highlights.set(this._getHighlightsStorageKey(element), score);
+				element.foo = 1;
+				if (!topScore || score && topScore[0] < score[0]) {
+					topScore = score;
+					topElement = element;
+				}
+			}
+		} else {
+			// no pattern, clear highlights
+			this.highlights.clear();
+		}
+
+		this.refresh().then(() => {
+			if (topElement) {
+				this.reveal(topElement, .5).then(_ => {
+					this.setSelection([topElement], this);
+					this.setFocus(topElement, this);
+				});
+			} else {
+				this.setSelection(defaultSelection, this);
+			}
+		}, onUnexpectedError);
+	}
+
+	isHighlighterScoring(): boolean {
+		return this.highlights.size > 0;
+	}
+
+	getHighlighterScore(element: any): FuzzyScore {
+		return this.highlights.get(this._getHighlightsStorageKey(element));
+	}
+
+	private _getHighlightsStorageKey(element: any): any {
+		return typeof this.highlighter.getHighlightsStorageKey === 'function'
+			? this.highlighter.getHighlightsStorageKey(element)
+			: element;
+	}
+}
+
 const configurationRegistry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration);
 
 configurationRegistry.registerConfiguration({
@@ -548,20 +820,16 @@ configurationRegistry.registerConfiguration({
 					'- `ctrlCmd` refers to a value the setting can take and should not be localized.',
 					'- `Control` and `Command` refer to the modifier keys Ctrl or Cmd on the keyboard and can be localized.'
 				]
-			}, "The modifier to be used to add an item in trees and lists to a multi-selection with the mouse (for example in the explorer, open editors and scm view). `ctrlCmd` maps to `Control` on Windows and Linux and to `Command` on macOS. The 'Open to Side' mouse gestures - if supported - will adapt such that they do not conflict with the multiselect modifier.")
+			}, "The modifier to be used to add an item in trees and lists to a multi-selection with the mouse (for example in the explorer, open editors and scm view). The 'Open to Side' mouse gestures - if supported - will adapt such that they do not conflict with the multiselect modifier.")
 		},
 		[openModeSettingKey]: {
 			'type': 'string',
 			'enum': ['singleClick', 'doubleClick'],
-			'enumDescriptions': [
-				localize('openMode.singleClick', "Opens items on mouse single click."),
-				localize('openMode.doubleClick', "Open items on mouse double click.")
-			],
 			'default': 'singleClick',
 			'description': localize({
 				key: 'openModeModifier',
 				comment: ['`singleClick` and `doubleClick` refers to a value the setting can take and should not be localized.']
-			}, "Controls how to open items in trees and lists using the mouse (if supported). Set to `singleClick` to open items with a single mouse click and `doubleClick` to only open via mouse double click. For parents with children in trees, this setting will control if a single click expands the parent or a double click. Note that some trees and lists might choose to ignore this setting if it is not applicable. ")
+			}, "Controls how to open items in trees and lists using the mouse (if supported). For parents with children in trees, this setting will control if a single click expands the parent or a double click. Note that some trees and lists might choose to ignore this setting if it is not applicable. ")
 		},
 		[horizontalScrollingKey]: {
 			'type': 'boolean',
diff --git a/src/vs/platform/localizations/common/localizations.ts b/src/vs/platform/localizations/common/localizations.ts
index 1f85c99a746..6aec8411f31 100644
--- a/src/vs/platform/localizations/common/localizations.ts
+++ b/src/vs/platform/localizations/common/localizations.ts
@@ -21,7 +21,7 @@ export interface ITranslation {
 	path: string;
 }
 
-export enum LanguageType {
+export const enum LanguageType {
 	Core = 1,
 	Contributed
 }
diff --git a/src/vs/platform/localizations/common/localizationsIpc.ts b/src/vs/platform/localizations/common/localizationsIpc.ts
deleted file mode 100644
index 51b6fb34147..00000000000
--- a/src/vs/platform/localizations/common/localizationsIpc.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-'use strict';
-
-import { TPromise } from 'vs/base/common/winjs.base';
-import { IChannel, eventToCall, eventFromCall } from 'vs/base/parts/ipc/common/ipc';
-import { Event, buffer } from 'vs/base/common/event';
-import { ILocalizationsService, LanguageType } from 'vs/platform/localizations/common/localizations';
-
-export interface ILocalizationsChannel extends IChannel {
-	call(command: 'event:onDidLanguagesChange'): TPromise<void>;
-	call(command: 'getLanguageIds'): TPromise<string[]>;
-	call(command: string, arg?: any): TPromise<any>;
-}
-
-export class LocalizationsChannel implements ILocalizationsChannel {
-
-	onDidLanguagesChange: Event<void>;
-
-	constructor(private service: ILocalizationsService) {
-		this.onDidLanguagesChange = buffer(service.onDidLanguagesChange, true);
-	}
-
-	call(command: string, arg?: any): TPromise<any> {
-		switch (command) {
-			case 'event:onDidLanguagesChange': return eventToCall(this.onDidLanguagesChange);
-			case 'getLanguageIds': return this.service.getLanguageIds(arg);
-		}
-		return undefined;
-	}
-}
-
-export class LocalizationsChannelClient implements ILocalizationsService {
-
-	_serviceBrand: any;
-
-	constructor(private channel: ILocalizationsChannel) { }
-
-	private _onDidLanguagesChange = eventFromCall<void>(this.channel, 'event:onDidLanguagesChange');
-	get onDidLanguagesChange(): Event<void> { return this._onDidLanguagesChange; }
-
-	getLanguageIds(type?: LanguageType): TPromise<string[]> {
-		return this.channel.call('getLanguageIds', type);
-	}
-}
\ No newline at end of file
diff --git a/src/vs/platform/localizations/node/localizations.ts b/src/vs/platform/localizations/node/localizations.ts
index b736df9096d..46bd114b4cf 100644
--- a/src/vs/platform/localizations/node/localizations.ts
+++ b/src/vs/platform/localizations/node/localizations.ts
@@ -8,7 +8,6 @@ import { createHash } from 'crypto';
 import { IExtensionManagementService, ILocalExtension, IExtensionIdentifier } from 'vs/platform/extensionManagement/common/extensionManagement';
 import { Disposable } from 'vs/base/common/lifecycle';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { join } from 'vs/base/common/paths';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { Limiter } from 'vs/base/common/async';
 import { areSameExtensions, getGalleryExtensionIdFromLocal, getIdFromLocalExtensionId } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
@@ -17,6 +16,8 @@ import { isValidLocalization, ILocalizationsService, LanguageType } from 'vs/pla
 import product from 'vs/platform/node/product';
 import { distinct, equals } from 'vs/base/common/arrays';
 import { Event, Emitter } from 'vs/base/common/event';
+import { Schemas } from 'vs/base/common/network';
+import { posix } from 'path';
 
 interface ILanguagePack {
 	hash: string;
@@ -27,7 +28,7 @@ interface ILanguagePack {
 	translations: { [id: string]: string };
 }
 
-const systemLanguages: string[] = ['de', 'en', 'en-US', 'es', 'fr', 'it', 'ja', 'ko', 'ru', 'zh-CN', 'zh-Hans', 'zh-TW', 'zh-Hant'];
+const systemLanguages: string[] = ['de', 'en', 'en-US', 'es', 'fr', 'it', 'ja', 'ko', 'ru', 'zh-CN', 'zh-TW'];
 if (product.quality !== 'stable') {
 	systemLanguages.push('hu');
 }
@@ -106,7 +107,7 @@ class LanguagePacksCache extends Disposable {
 		@ILogService private logService: ILogService
 	) {
 		super();
-		this.languagePacksFilePath = join(environmentService.userDataPath, 'languagepacks.json');
+		this.languagePacksFilePath = posix.join(environmentService.userDataPath, 'languagepacks.json');
 		this.languagePacksFileLimiter = new Limiter(1);
 	}
 
@@ -138,7 +139,7 @@ class LanguagePacksCache extends Disposable {
 	private createLanguagePacksFromExtension(languagePacks: { [language: string]: ILanguagePack }, extension: ILocalExtension): void {
 		const extensionIdentifier = { id: getGalleryExtensionIdFromLocal(extension), uuid: extension.identifier.uuid };
 		for (const localizationContribution of extension.manifest.contributes.localizations) {
-			if (isValidLocalization(localizationContribution)) {
+			if (extension.location.scheme === Schemas.file && isValidLocalization(localizationContribution)) {
 				let languagePack = languagePacks[localizationContribution.languageId];
 				if (!languagePack) {
 					languagePack = { hash: '', extensions: [], translations: {} };
@@ -151,7 +152,7 @@ class LanguagePacksCache extends Disposable {
 					languagePack.extensions.push({ extensionIdentifier, version: extension.manifest.version });
 				}
 				for (const translation of localizationContribution.translations) {
-					languagePack.translations[translation.id] = join(extension.path, translation.path);
+					languagePack.translations[translation.id] = posix.join(extension.location.fsPath, translation.path);
 				}
 			}
 		}
diff --git a/src/vs/platform/localizations/node/localizationsIpc.ts b/src/vs/platform/localizations/node/localizationsIpc.ts
new file mode 100644
index 00000000000..e58a97bd985
--- /dev/null
+++ b/src/vs/platform/localizations/node/localizationsIpc.ts
@@ -0,0 +1,56 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+import { TPromise } from 'vs/base/common/winjs.base';
+import { IChannel } from 'vs/base/parts/ipc/node/ipc';
+import { Event, buffer } from 'vs/base/common/event';
+import { ILocalizationsService, LanguageType } from 'vs/platform/localizations/common/localizations';
+
+export interface ILocalizationsChannel extends IChannel {
+	listen(event: 'onDidLanguagesChange'): Event<void>;
+	listen<T>(event: string, arg?: any): Event<T>;
+
+	call(command: 'getLanguageIds'): Thenable<string[]>;
+	call(command: string, arg?: any): Thenable<any>;
+}
+
+export class LocalizationsChannel implements ILocalizationsChannel {
+
+	onDidLanguagesChange: Event<void>;
+
+	constructor(private service: ILocalizationsService) {
+		this.onDidLanguagesChange = buffer(service.onDidLanguagesChange, true);
+	}
+
+	listen<T>(event: string): Event<any> {
+		switch (event) {
+			case 'onDidLanguagesChange': return this.onDidLanguagesChange;
+		}
+
+		throw new Error('No event found');
+	}
+
+	call(command: string, arg?: any): Thenable<any> {
+		switch (command) {
+			case 'getLanguageIds': return this.service.getLanguageIds(arg);
+		}
+		return undefined;
+	}
+}
+
+export class LocalizationsChannelClient implements ILocalizationsService {
+
+	_serviceBrand: any;
+
+	constructor(private channel: ILocalizationsChannel) { }
+
+	get onDidLanguagesChange(): Event<void> { return this.channel.listen('onDidLanguagesChange'); }
+
+	getLanguageIds(type?: LanguageType): TPromise<string[]> {
+		return TPromise.wrap(this.channel.call('getLanguageIds', type));
+	}
+}
\ No newline at end of file
diff --git a/src/vs/platform/log/common/bufferLog.ts b/src/vs/platform/log/common/bufferLog.ts
index 65fa32adb0e..437fd54d2f5 100644
--- a/src/vs/platform/log/common/bufferLog.ts
+++ b/src/vs/platform/log/common/bufferLog.ts
@@ -30,6 +30,15 @@ export class BufferLogService extends AbstractLogService implements ILogService
 	private buffer: ILog[] = [];
 	private _logger: ILogService | undefined = undefined;
 
+	constructor() {
+		super();
+		this._register(this.onDidChangeLogLevel(level => {
+			if (this._logger) {
+				this._logger.setLevel(level);
+			}
+		}));
+	}
+
 	set logger(logger: ILogService) {
 		this._logger = logger;
 
diff --git a/src/vs/platform/log/common/logIpc.ts b/src/vs/platform/log/node/logIpc.ts
similarity index 77%
rename from src/vs/platform/log/common/logIpc.ts
rename to src/vs/platform/log/node/logIpc.ts
index d39072ea674..ca2cb87d67c 100644
--- a/src/vs/platform/log/common/logIpc.ts
+++ b/src/vs/platform/log/node/logIpc.ts
@@ -3,14 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IChannel, eventToCall, eventFromCall } from 'vs/base/parts/ipc/common/ipc';
+import { IChannel } from 'vs/base/parts/ipc/node/ipc';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { LogLevel, ILogService, DelegatedLogService } from 'vs/platform/log/common/log';
 import { Event, buffer } from 'vs/base/common/event';
 
 export interface ILogLevelSetterChannel extends IChannel {
-	call(command: 'event:onDidChangeLogLevel'): TPromise<LogLevel>;
+	listen(event: 'onDidChangeLogLevel'): Event<LogLevel>;
+	listen<T>(event: string, arg?: any): Event<T>;
+
 	call(command: 'setLevel', logLevel: LogLevel): TPromise<void>;
+	call(command: string, arg?: any): TPromise<any>;
 }
 
 export class LogLevelSetterChannel implements ILogLevelSetterChannel {
@@ -21,9 +24,16 @@ export class LogLevelSetterChannel implements ILogLevelSetterChannel {
 		this.onDidChangeLogLevel = buffer(service.onDidChangeLogLevel, true);
 	}
 
+	listen<T>(event: string): Event<any> {
+		switch (event) {
+			case 'onDidChangeLogLevel': return this.onDidChangeLogLevel;
+		}
+
+		throw new Error('No event found');
+	}
+
 	call(command: string, arg?: any): TPromise<any> {
 		switch (command) {
-			case 'event:onDidChangeLogLevel': return eventToCall(this.onDidChangeLogLevel);
 			case 'setLevel': this.service.setLevel(arg); return TPromise.as(null);
 		}
 		return undefined;
@@ -34,8 +44,9 @@ export class LogLevelSetterChannelClient {
 
 	constructor(private channel: ILogLevelSetterChannel) { }
 
-	private _onDidChangeLogLevel = eventFromCall<LogLevel>(this.channel, 'event:onDidChangeLogLevel');
-	get onDidChangeLogLevel(): Event<LogLevel> { return this._onDidChangeLogLevel; }
+	get onDidChangeLogLevel(): Event<LogLevel> {
+		return this.channel.listen('onDidChangeLogLevel');
+	}
 
 	setLevel(level: LogLevel): TPromise<void> {
 		return this.channel.call('setLevel', level);
diff --git a/src/vs/platform/log/node/spdlogService.ts b/src/vs/platform/log/node/spdlogService.ts
index 5d579767204..d2bd5c19658 100644
--- a/src/vs/platform/log/node/spdlogService.ts
+++ b/src/vs/platform/log/node/spdlogService.ts
@@ -13,7 +13,7 @@ export function createSpdLogService(processName: string, logLevel: LogLevel, log
 	// Do not crash if spdlog cannot be loaded
 	try {
 		const _spdlog: typeof spdlog = require.__$__nodeRequire('spdlog');
-		_spdlog.setAsyncMode(8192, 2000);
+		_spdlog.setAsyncMode(8192, 500);
 		const logfilePath = path.join(logsFolder, `${processName}.log`);
 		const logger = new _spdlog.RotatingLogger(processName, logfilePath, 1024 * 1024 * 5, 6);
 		logger.setLevel(0);
@@ -25,6 +25,11 @@ export function createSpdLogService(processName: string, logLevel: LogLevel, log
 	return new NullLogService();
 }
 
+export function createRotatingLogger(name: string, filename: string, filesize: number, filecount: number): spdlog.RotatingLogger {
+	const _spdlog: typeof spdlog = require.__$__nodeRequire('spdlog');
+	return new _spdlog.RotatingLogger(name, filename, filesize, filecount);
+}
+
 class SpdLogService extends AbstractLogService implements ILogService {
 
 	_serviceBrand: any;
diff --git a/src/vs/platform/markers/common/markerService.ts b/src/vs/platform/markers/common/markerService.ts
index 8329796d9b6..e57da274003 100644
--- a/src/vs/platform/markers/common/markerService.ts
+++ b/src/vs/platform/markers/common/markerService.ts
@@ -8,7 +8,7 @@ import { isFalsyOrEmpty } from 'vs/base/common/arrays';
 import { Schemas } from 'vs/base/common/network';
 import { IDisposable } from 'vs/base/common/lifecycle';
 import { isEmptyObject } from 'vs/base/common/types';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { Event, Emitter, debounceEvent } from 'vs/base/common/event';
 import { IMarkerService, IMarkerData, IResourceMarker, IMarker, MarkerStatistics, MarkerSeverity } from './markers';
 
@@ -184,7 +184,7 @@ export class MarkerService implements IMarkerService {
 			message, source,
 			startLineNumber, startColumn, endLineNumber, endColumn,
 			relatedInformation,
-			customTags,
+			tags,
 		} = data;
 
 		if (!message) {
@@ -210,7 +210,7 @@ export class MarkerService implements IMarkerService {
 			endLineNumber,
 			endColumn,
 			relatedInformation,
-			customTags,
+			tags,
 		};
 	}
 
diff --git a/src/vs/platform/markers/common/markers.ts b/src/vs/platform/markers/common/markers.ts
index 69f34f9400f..59bd04c9735 100644
--- a/src/vs/platform/markers/common/markers.ts
+++ b/src/vs/platform/markers/common/markers.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { Event } from 'vs/base/common/event';
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
 import { localize } from 'vs/nls';
@@ -87,7 +87,7 @@ export interface IMarkerData {
 	endLineNumber: number;
 	endColumn: number;
 	relatedInformation?: IRelatedInformation[];
-	customTags?: MarkerTag[];
+	tags?: MarkerTag[];
 }
 
 export interface IResourceMarker {
@@ -107,7 +107,7 @@ export interface IMarker {
 	endLineNumber: number;
 	endColumn: number;
 	relatedInformation?: IRelatedInformation[];
-	customTags?: MarkerTag[];
+	tags?: MarkerTag[];
 }
 
 export interface MarkerStatistics {
diff --git a/src/vs/platform/markers/test/common/markerService.test.ts b/src/vs/platform/markers/test/common/markerService.test.ts
index 06495c239e4..e61abb8ec3e 100644
--- a/src/vs/platform/markers/test/common/markerService.test.ts
+++ b/src/vs/platform/markers/test/common/markerService.test.ts
@@ -6,7 +6,7 @@
 
 
 import * as assert from 'assert';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import * as markerService from 'vs/platform/markers/common/markerService';
 import { IMarkerData, MarkerSeverity } from 'vs/platform/markers/common/markers';
 
@@ -58,16 +58,16 @@ suite('Marker Service', () => {
 	test('changeOne override', () => {
 
 		let service = new markerService.MarkerService();
-		service.changeOne('far', URI.parse('/path/only.cs'), [randomMarkerData()]);
+		service.changeOne('far', URI.parse('file:///path/only.cs'), [randomMarkerData()]);
 		assert.equal(service.read().length, 1);
 		assert.equal(service.read({ owner: 'far' }).length, 1);
 
-		service.changeOne('boo', URI.parse('/path/only.cs'), [randomMarkerData()]);
+		service.changeOne('boo', URI.parse('file:///path/only.cs'), [randomMarkerData()]);
 		assert.equal(service.read().length, 2);
 		assert.equal(service.read({ owner: 'far' }).length, 1);
 		assert.equal(service.read({ owner: 'boo' }).length, 1);
 
-		service.changeOne('far', URI.parse('/path/only.cs'), [randomMarkerData(), randomMarkerData()]);
+		service.changeOne('far', URI.parse('file:///path/only.cs'), [randomMarkerData(), randomMarkerData()]);
 		assert.equal(service.read({ owner: 'far' }).length, 2);
 		assert.equal(service.read({ owner: 'boo' }).length, 1);
 
@@ -76,13 +76,13 @@ suite('Marker Service', () => {
 	test('changeOne/All clears', () => {
 
 		let service = new markerService.MarkerService();
-		service.changeOne('far', URI.parse('/path/only.cs'), [randomMarkerData()]);
-		service.changeOne('boo', URI.parse('/path/only.cs'), [randomMarkerData()]);
+		service.changeOne('far', URI.parse('file:///path/only.cs'), [randomMarkerData()]);
+		service.changeOne('boo', URI.parse('file:///path/only.cs'), [randomMarkerData()]);
 		assert.equal(service.read({ owner: 'far' }).length, 1);
 		assert.equal(service.read({ owner: 'boo' }).length, 1);
 		assert.equal(service.read().length, 2);
 
-		service.changeOne('far', URI.parse('/path/only.cs'), []);
+		service.changeOne('far', URI.parse('file:///path/only.cs'), []);
 		assert.equal(service.read({ owner: 'far' }).length, 0);
 		assert.equal(service.read({ owner: 'boo' }).length, 1);
 		assert.equal(service.read().length, 1);
diff --git a/src/vs/platform/menubar/common/menubar.ts b/src/vs/platform/menubar/common/menubar.ts
new file mode 100644
index 00000000000..3e58c3e4c9b
--- /dev/null
+++ b/src/vs/platform/menubar/common/menubar.ts
@@ -0,0 +1,65 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+import { TPromise } from 'vs/base/common/winjs.base';
+import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
+
+export const IMenubarService = createDecorator<IMenubarService>('menubarService');
+
+export interface IMenubarService {
+	_serviceBrand: any;
+
+	updateMenubar(windowId: number, menus: IMenubarData, additionalKeybindings?: Array<IMenubarKeybinding>): TPromise<void>;
+}
+
+export interface IMenubarData {
+	'Files'?: IMenubarMenu;
+	'Edit'?: IMenubarMenu;
+	[id: string]: IMenubarMenu;
+}
+
+export interface IMenubarMenu {
+	items: Array<MenubarMenuItem>;
+}
+
+export interface IMenubarKeybinding {
+	id: string;
+	label: string;
+	isNative: boolean;
+}
+
+export interface IMenubarMenuItemAction {
+	id: string;
+	label: string;
+	checked: boolean;
+	enabled: boolean;
+	keybinding?: IMenubarKeybinding;
+}
+
+export interface IMenubarMenuItemSubmenu {
+	id: string;
+	label: string;
+	submenu: IMenubarMenu;
+}
+
+export interface IMenubarMenuItemSeparator {
+	id: 'vscode.menubar.separator';
+}
+
+export type MenubarMenuItem = IMenubarMenuItemAction | IMenubarMenuItemSubmenu | IMenubarMenuItemSeparator;
+
+export function isMenubarMenuItemSubmenu(menuItem: MenubarMenuItem): menuItem is IMenubarMenuItemSubmenu {
+	return (<IMenubarMenuItemSubmenu>menuItem).submenu !== undefined;
+}
+
+export function isMenubarMenuItemAction(menuItem: MenubarMenuItem): menuItem is IMenubarMenuItemAction {
+	return (<IMenubarMenuItemAction>menuItem).checked !== undefined || (<IMenubarMenuItemAction>menuItem).enabled !== undefined;
+}
+
+export function isMenubarMenuItemSeparator(menuItem: MenubarMenuItem): menuItem is IMenubarMenuItemSeparator {
+	return (<IMenubarMenuItemSeparator>menuItem).id === 'vscode.menubar.separator';
+}
\ No newline at end of file
diff --git a/src/vs/platform/menubar/electron-main/menubar.ts b/src/vs/platform/menubar/electron-main/menubar.ts
new file mode 100644
index 00000000000..3113dadb3f6
--- /dev/null
+++ b/src/vs/platform/menubar/electron-main/menubar.ts
@@ -0,0 +1,789 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+import * as nls from 'vs/nls';
+import { isMacintosh, language } from 'vs/base/common/platform';
+import { IEnvironmentService } from 'vs/platform/environment/common/environment';
+import { app, shell, Menu, MenuItem, BrowserWindow } from 'electron';
+import { OpenContext, IRunActionInWindowRequest } from 'vs/platform/windows/common/windows';
+import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
+import { IUpdateService, StateType } from 'vs/platform/update/common/update';
+import product from 'vs/platform/node/product';
+import { RunOnceScheduler } from 'vs/base/common/async';
+import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { mnemonicMenuLabel as baseMnemonicLabel, unmnemonicLabel } from 'vs/base/common/labels';
+import { IWindowsMainService, IWindowsCountChangedEvent } from 'vs/platform/windows/electron-main/windows';
+import { IHistoryMainService } from 'vs/platform/history/common/history';
+import { IWorkspaceIdentifier, ISingleFolderWorkspaceIdentifier, isSingleFolderWorkspaceIdentifier, isWorkspaceIdentifier } from 'vs/platform/workspaces/common/workspaces';
+import { IMenubarData, IMenubarKeybinding, MenubarMenuItem, isMenubarMenuItemSeparator, isMenubarMenuItemSubmenu, isMenubarMenuItemAction } from 'vs/platform/menubar/common/menubar';
+import { URI } from 'vs/base/common/uri';
+import { ILabelService } from 'vs/platform/label/common/label';
+
+const telemetryFrom = 'menu';
+
+export class Menubar {
+
+	private static readonly MAX_MENU_RECENT_ENTRIES = 10;
+	private isQuitting: boolean;
+	private appMenuInstalled: boolean;
+	private closedLastWindow: boolean;
+
+	private menuUpdater: RunOnceScheduler;
+
+	private menubarMenus: IMenubarData;
+
+	private keybindings: { [commandId: string]: IMenubarKeybinding };
+
+	constructor(
+		@IUpdateService private updateService: IUpdateService,
+		@IInstantiationService instantiationService: IInstantiationService,
+		@IConfigurationService private configurationService: IConfigurationService,
+		@IWindowsMainService private windowsMainService: IWindowsMainService,
+		@IEnvironmentService private environmentService: IEnvironmentService,
+		@ITelemetryService private telemetryService: ITelemetryService,
+		@IHistoryMainService private historyMainService: IHistoryMainService,
+		@ILabelService private labelService: ILabelService
+	) {
+		this.menuUpdater = new RunOnceScheduler(() => this.doUpdateMenu(), 0);
+
+		this.keybindings = Object.create(null);
+
+		this.closedLastWindow = false;
+
+		this.install();
+
+		this.registerListeners();
+	}
+
+	private registerListeners(): void {
+
+		// Keep flag when app quits
+		app.on('will-quit', () => {
+			this.isQuitting = true;
+		});
+
+		// // Listen to some events from window service to update menu
+		this.historyMainService.onRecentlyOpenedChange(() => this.scheduleUpdateMenu());
+		this.windowsMainService.onWindowsCountChanged(e => this.onWindowsCountChanged(e));
+		// this.windowsMainService.onActiveWindowChanged(() => this.updateWorkspaceMenuItems());
+		// this.windowsMainService.onWindowReady(() => this.updateWorkspaceMenuItems());
+		// this.windowsMainService.onWindowClose(() => this.updateWorkspaceMenuItems());
+
+		// Update when auto save config changes
+		// this.configurationService.onDidChangeConfiguration(e => this.onConfigurationUpdated(e));
+
+		// Listen to update service
+		// this.updateService.onStateChange(() => this.updateMenu());
+	}
+
+	private get currentEnableMenuBarMnemonics(): boolean {
+		let enableMenuBarMnemonics = this.configurationService.getValue<boolean>('window.enableMenuBarMnemonics');
+		if (typeof enableMenuBarMnemonics !== 'boolean') {
+			enableMenuBarMnemonics = true;
+		}
+
+		return enableMenuBarMnemonics;
+	}
+
+	private get currentEnableNativeTabs(): boolean {
+		let enableNativeTabs = this.configurationService.getValue<boolean>('window.nativeTabs');
+		if (typeof enableNativeTabs !== 'boolean') {
+			enableNativeTabs = false;
+		}
+		return enableNativeTabs;
+	}
+
+	updateMenu(menus: IMenubarData, windowId: number, additionalKeybindings?: Array<IMenubarKeybinding>) {
+		this.menubarMenus = menus;
+		if (additionalKeybindings) {
+			additionalKeybindings.forEach(keybinding => {
+				this.keybindings[keybinding.id] = keybinding;
+			});
+		}
+
+		this.scheduleUpdateMenu();
+	}
+
+
+	private scheduleUpdateMenu(): void {
+		this.menuUpdater.schedule(); // buffer multiple attempts to update the menu
+	}
+
+	private doUpdateMenu(): void {
+
+		// Due to limitations in Electron, it is not possible to update menu items dynamically. The suggested
+		// workaround from Electron is to set the application menu again.
+		// See also https://github.com/electron/electron/issues/846
+		//
+		// Run delayed to prevent updating menu while it is open
+		if (!this.isQuitting) {
+			setTimeout(() => {
+				if (!this.isQuitting) {
+					this.install();
+				}
+			}, 10 /* delay this because there is an issue with updating a menu when it is open */);
+		}
+	}
+
+	private onWindowsCountChanged(e: IWindowsCountChangedEvent): void {
+		if (!isMacintosh) {
+			return;
+		}
+
+		// Update menu if window count goes from N > 0 or 0 > N to update menu item enablement
+		if ((e.oldCount === 0 && e.newCount > 0) || (e.oldCount > 0 && e.newCount === 0)) {
+			this.closedLastWindow = e.newCount === 0;
+			this.scheduleUpdateMenu();
+		}
+	}
+
+	private install(): void {
+
+		// Menus
+		const menubar = new Menu();
+
+		// Mac: Application
+		let macApplicationMenuItem: Electron.MenuItem;
+		if (isMacintosh) {
+			const applicationMenu = new Menu();
+			macApplicationMenuItem = new MenuItem({ label: product.nameShort, submenu: applicationMenu });
+			this.setMacApplicationMenu(applicationMenu);
+			menubar.append(macApplicationMenuItem);
+		}
+
+		// Mac: Dock
+		if (isMacintosh && !this.appMenuInstalled) {
+			this.appMenuInstalled = true;
+
+			const dockMenu = new Menu();
+			dockMenu.append(new MenuItem({ label: this.mnemonicLabel(nls.localize({ key: 'miNewWindow', comment: ['&& denotes a mnemonic'] }, "New &&Window")), click: () => this.windowsMainService.openNewWindow(OpenContext.DOCK) }));
+
+			app.dock.setMenu(dockMenu);
+		}
+
+		// File
+		const fileMenu = new Menu();
+		const fileMenuItem = new MenuItem({ label: this.mnemonicLabel(nls.localize({ key: 'mFile', comment: ['&& denotes a mnemonic'] }, "&&File")), submenu: fileMenu });
+
+		if (this.shouldDrawMenu('File')) {
+			if (this.shouldFallback('File')) {
+				this.setFallbackMenuById(fileMenu, 'File');
+			} else {
+				this.setMenuById(fileMenu, 'File');
+			}
+
+			menubar.append(fileMenuItem);
+		}
+
+
+		// Edit
+		const editMenu = new Menu();
+		const editMenuItem = new MenuItem({ label: this.mnemonicLabel(nls.localize({ key: 'mEdit', comment: ['&& denotes a mnemonic'] }, "&&Edit")), submenu: editMenu });
+
+		if (this.shouldDrawMenu('Edit')) {
+			this.setMenuById(editMenu, 'Edit');
+			menubar.append(editMenuItem);
+		}
+
+		// Selection
+		const selectionMenu = new Menu();
+		const selectionMenuItem = new MenuItem({ label: this.mnemonicLabel(nls.localize({ key: 'mSelection', comment: ['&& denotes a mnemonic'] }, "&&Selection")), submenu: selectionMenu });
+
+		if (this.shouldDrawMenu('Selection')) {
+			this.setMenuById(selectionMenu, 'Selection');
+			menubar.append(selectionMenuItem);
+		}
+
+		// View
+		const viewMenu = new Menu();
+		const viewMenuItem = new MenuItem({ label: this.mnemonicLabel(nls.localize({ key: 'mView', comment: ['&& denotes a mnemonic'] }, "&&View")), submenu: viewMenu });
+
+		if (this.shouldDrawMenu('View')) {
+			this.setMenuById(viewMenu, 'View');
+			menubar.append(viewMenuItem);
+		}
+
+		// Layout
+		const layoutMenu = new Menu();
+		const layoutMenuItem = new MenuItem({ label: this.mnemonicLabel(nls.localize({ key: 'mLayout', comment: ['&& denotes a mnemonic'] }, "&&Layout")), submenu: layoutMenu });
+
+		if (this.shouldDrawMenu('Layout')) {
+			this.setMenuById(layoutMenu, 'Layout');
+			menubar.append(layoutMenuItem);
+		}
+
+		// Go
+		const gotoMenu = new Menu();
+		const gotoMenuItem = new MenuItem({ label: this.mnemonicLabel(nls.localize({ key: 'mGoto', comment: ['&& denotes a mnemonic'] }, "&&Go")), submenu: gotoMenu });
+
+		if (this.shouldDrawMenu('Go')) {
+			this.setMenuById(gotoMenu, 'Go');
+			menubar.append(gotoMenuItem);
+		}
+
+		// Terminal
+		const terminalMenu = new Menu();
+		const terminalMenuItem = new MenuItem({ label: this.mnemonicLabel(nls.localize({ key: 'mTerminal', comment: ['&& denotes a mnemonic'] }, "&&Terminal")), submenu: terminalMenu });
+
+		if (this.shouldDrawMenu('Terminal')) {
+			this.setMenuById(terminalMenu, 'Terminal');
+			menubar.append(terminalMenuItem);
+		}
+
+		// Debug
+		const debugMenu = new Menu();
+		const debugMenuItem = new MenuItem({ label: this.mnemonicLabel(nls.localize({ key: 'mDebug', comment: ['&& denotes a mnemonic'] }, "&&Debug")), submenu: debugMenu });
+
+		if (this.shouldDrawMenu('Debug')) {
+			this.setMenuById(debugMenu, 'Debug');
+			menubar.append(debugMenuItem);
+		}
+
+		// Tasks
+		const taskMenu = new Menu();
+		const taskMenuItem = new MenuItem({ label: this.mnemonicLabel(nls.localize({ key: 'mTask', comment: ['&& denotes a mnemonic'] }, "&&Tasks")), submenu: taskMenu });
+
+		if (this.shouldDrawMenu('Tasks')) {
+			this.setMenuById(taskMenu, 'Tasks');
+			menubar.append(taskMenuItem);
+		}
+
+		// Mac: Window
+		let macWindowMenuItem: Electron.MenuItem;
+		if (this.shouldDrawMenu('Window')) {
+			const windowMenu = new Menu();
+			macWindowMenuItem = new MenuItem({ label: this.mnemonicLabel(nls.localize('mWindow', "Window")), submenu: windowMenu, role: 'window' });
+			this.setMacWindowMenu(windowMenu);
+		}
+
+		if (macWindowMenuItem) {
+			menubar.append(macWindowMenuItem);
+		}
+
+		// Preferences
+		if (!isMacintosh) {
+			const preferencesMenu = new Menu();
+			const preferencesMenuItem = new MenuItem({ label: this.mnemonicLabel(nls.localize({ key: 'mPreferences', comment: ['&& denotes a mnemonic'] }, "&&Preferences")), submenu: preferencesMenu });
+
+			if (this.shouldDrawMenu('Preferences')) {
+				if (this.shouldFallback('Preferences')) {
+					this.setFallbackMenuById(preferencesMenu, 'Preferences');
+				} else {
+					this.setMenuById(preferencesMenu, 'Preferences');
+				}
+				menubar.append(preferencesMenuItem);
+			}
+		}
+
+		// Help
+		const helpMenu = new Menu();
+		const helpMenuItem = new MenuItem({ label: this.mnemonicLabel(nls.localize({ key: 'mHelp', comment: ['&& denotes a mnemonic'] }, "&&Help")), submenu: helpMenu, role: 'help' });
+
+		if (this.shouldDrawMenu('Help')) {
+			if (this.shouldFallback('Help')) {
+				this.setFallbackMenuById(helpMenu, 'Help');
+			} else {
+				this.setMenuById(helpMenu, 'Help');
+			}
+			menubar.append(helpMenuItem);
+		}
+
+		if (menubar.items && menubar.items.length > 0) {
+			Menu.setApplicationMenu(menubar);
+		} else {
+			Menu.setApplicationMenu(null);
+		}
+	}
+
+	private setMacApplicationMenu(macApplicationMenu: Electron.Menu): void {
+		const about = new MenuItem({ label: nls.localize('mAbout', "About {0}", product.nameLong), role: 'about' });
+		const checkForUpdates = this.getUpdateMenuItems();
+
+		let preferences;
+		if (this.shouldDrawMenu('Preferences')) {
+			const preferencesMenu = new Menu();
+			this.setMenuById(preferencesMenu, 'Preferences');
+			preferences = new MenuItem({ label: this.mnemonicLabel(nls.localize({ key: 'miPreferences', comment: ['&& denotes a mnemonic'] }, "&&Preferences")), submenu: preferencesMenu });
+		}
+
+		const servicesMenu = new Menu();
+		const services = new MenuItem({ label: nls.localize('mServices', "Services"), role: 'services', submenu: servicesMenu });
+		const hide = new MenuItem({ label: nls.localize('mHide', "Hide {0}", product.nameLong), role: 'hide', accelerator: 'Command+H' });
+		const hideOthers = new MenuItem({ label: nls.localize('mHideOthers', "Hide Others"), role: 'hideothers', accelerator: 'Command+Alt+H' });
+		const showAll = new MenuItem({ label: nls.localize('mShowAll', "Show All"), role: 'unhide' });
+		const quit = new MenuItem(this.likeAction('workbench.action.quit', {
+			label: nls.localize('miQuit', "Quit {0}", product.nameLong), click: () => {
+				if (this.windowsMainService.getWindowCount() === 0 || !!BrowserWindow.getFocusedWindow()) {
+					this.windowsMainService.quit(); // fix for https://github.com/Microsoft/vscode/issues/39191
+				}
+			}
+		}));
+
+		const actions = [about];
+		actions.push(...checkForUpdates);
+
+		if (preferences) {
+			actions.push(...[
+				__separator__(),
+				preferences
+			]);
+		}
+
+		actions.push(...[
+			__separator__(),
+			services,
+			__separator__(),
+			hide,
+			hideOthers,
+			showAll,
+			__separator__(),
+			quit
+		]);
+
+		actions.forEach(i => macApplicationMenu.append(i));
+	}
+
+	private shouldDrawMenu(menuId: string): boolean {
+		// We need to draw an empty menu to override the electron default
+		if (!isMacintosh && this.configurationService.getValue('window.titleBarStyle') === 'custom') {
+			return false;
+		}
+
+		switch (menuId) {
+			case 'File':
+			case 'Help':
+				if (isMacintosh) {
+					return (this.windowsMainService.getWindowCount() === 0 && this.closedLastWindow) || (!!this.menubarMenus && !!this.menubarMenus[menuId]);
+				}
+
+			case 'Window':
+				if (isMacintosh) {
+					return (this.windowsMainService.getWindowCount() === 0 && this.closedLastWindow) || !!this.menubarMenus;
+				}
+
+			default:
+				return this.windowsMainService.getWindowCount() > 0 && (!!this.menubarMenus && !!this.menubarMenus[menuId]);
+		}
+	}
+
+	private shouldFallback(menuId: string): boolean {
+		return this.shouldDrawMenu(menuId) && (this.windowsMainService.getWindowCount() === 0 && this.closedLastWindow && isMacintosh);
+	}
+
+	private setFallbackMenuById(menu: Electron.Menu, menuId: string): void {
+		switch (menuId) {
+			case 'File':
+				const newFile = new MenuItem(this.likeAction('workbench.action.files.newUntitledFile', { label: this.mnemonicLabel(nls.localize({ key: 'miNewFile', comment: ['&& denotes a mnemonic'] }, "&&New File")), click: () => this.windowsMainService.openNewWindow(OpenContext.MENU) }));
+
+				const newWindow = new MenuItem(this.likeAction('workbench.action.newWindow', { label: this.mnemonicLabel(nls.localize({ key: 'miNewWindow', comment: ['&& denotes a mnemonic'] }, "New &&Window")), click: () => this.windowsMainService.openNewWindow(OpenContext.MENU) }));
+
+				const open = new MenuItem(this.likeAction('workbench.action.files.openFileFolder', { label: this.mnemonicLabel(nls.localize({ key: 'miOpen', comment: ['&& denotes a mnemonic'] }, "&&Open...")), click: (menuItem, win, event) => this.windowsMainService.pickFileFolderAndOpen({ forceNewWindow: this.isOptionClick(event), telemetryExtraData: { from: telemetryFrom } }) }));
+
+				const openWorkspace = new MenuItem(this.likeAction('workbench.action.openWorkspace', { label: this.mnemonicLabel(nls.localize({ key: 'miOpenWorkspace', comment: ['&& denotes a mnemonic'] }, "Open Wor&&kspace...")), click: (menuItem, win, event) => this.windowsMainService.pickWorkspaceAndOpen({ forceNewWindow: this.isOptionClick(event), telemetryExtraData: { from: telemetryFrom } }) }));
+
+				const openRecentMenu = new Menu();
+				this.setFallbackMenuById(openRecentMenu, 'Recent');
+				const openRecent = new MenuItem({ label: this.mnemonicLabel(nls.localize({ key: 'miOpenRecent', comment: ['&& denotes a mnemonic'] }, "Open &&Recent")), submenu: openRecentMenu });
+
+				menu.append(newFile);
+				menu.append(newWindow);
+				menu.append(__separator__());
+				menu.append(open);
+				menu.append(openWorkspace);
+				menu.append(openRecent);
+
+				break;
+
+			case 'Recent':
+				menu.append(this.createMenuItem(nls.localize({ key: 'miReopenClosedEditor', comment: ['&& denotes a mnemonic'] }, "&&Reopen Closed Editor"), 'workbench.action.reopenClosedEditor'));
+
+				this.insertRecentMenuItems(menu);
+
+				menu.append(__separator__());
+				menu.append(this.createMenuItem(nls.localize({ key: 'miMore', comment: ['&& denotes a mnemonic'] }, "&&More..."), 'workbench.action.openRecent'));
+				menu.append(__separator__());
+				menu.append(new MenuItem(this.likeAction('workbench.action.clearRecentFiles', { label: this.mnemonicLabel(nls.localize({ key: 'miClearRecentOpen', comment: ['&& denotes a mnemonic'] }, "&&Clear Recently Opened")), click: () => this.historyMainService.clearRecentlyOpened() })));
+
+				break;
+
+			case 'Help':
+				let twitterItem: MenuItem;
+				if (product.twitterUrl) {
+					twitterItem = new MenuItem({ label: this.mnemonicLabel(nls.localize({ key: 'miTwitter', comment: ['&& denotes a mnemonic'] }, "&&Join us on Twitter")), click: () => this.openUrl(product.twitterUrl, 'openTwitterUrl') });
+				}
+
+				let featureRequestsItem: MenuItem;
+				if (product.requestFeatureUrl) {
+					featureRequestsItem = new MenuItem({ label: this.mnemonicLabel(nls.localize({ key: 'miUserVoice', comment: ['&& denotes a mnemonic'] }, "&&Search Feature Requests")), click: () => this.openUrl(product.requestFeatureUrl, 'openUserVoiceUrl') });
+				}
+
+				let reportIssuesItem: MenuItem;
+				if (product.reportIssueUrl) {
+					const label = nls.localize({ key: 'miReportIssue', comment: ['&& denotes a mnemonic', 'Translate this to "Report Issue in English" in all languages please!'] }, "Report &&Issue");
+
+					reportIssuesItem = new MenuItem({ label: this.mnemonicLabel(label), click: () => this.openUrl(product.reportIssueUrl, 'openReportIssues') });
+				}
+
+				let licenseItem: MenuItem;
+				if (product.privacyStatementUrl) {
+					licenseItem = new MenuItem({
+						label: this.mnemonicLabel(nls.localize({ key: 'miLicense', comment: ['&& denotes a mnemonic'] }, "View &&License")), click: () => {
+							if (language) {
+								const queryArgChar = product.licenseUrl.indexOf('?') > 0 ? '&' : '?';
+								this.openUrl(`${product.licenseUrl}${queryArgChar}lang=${language}`, 'openLicenseUrl');
+							} else {
+								this.openUrl(product.licenseUrl, 'openLicenseUrl');
+							}
+						}
+					});
+				}
+
+				let privacyStatementItem: MenuItem;
+				if (product.privacyStatementUrl) {
+					privacyStatementItem = new MenuItem({
+						label: this.mnemonicLabel(nls.localize({ key: 'miPrivacyStatement', comment: ['&& denotes a mnemonic'] }, "&&Privacy Statement")), click: () => {
+							if (language) {
+								const queryArgChar = product.licenseUrl.indexOf('?') > 0 ? '&' : '?';
+								this.openUrl(`${product.privacyStatementUrl}${queryArgChar}lang=${language}`, 'openPrivacyStatement');
+							} else {
+								this.openUrl(product.privacyStatementUrl, 'openPrivacyStatement');
+							}
+						}
+					});
+				}
+
+				if (twitterItem) { menu.append(twitterItem); }
+				if (featureRequestsItem) { menu.append(featureRequestsItem); }
+				if (reportIssuesItem) { menu.append(reportIssuesItem); }
+				if ((twitterItem || featureRequestsItem || reportIssuesItem) && (licenseItem || privacyStatementItem)) { menu.append(__separator__()); }
+				if (licenseItem) { menu.append(licenseItem); }
+				if (privacyStatementItem) { menu.append(privacyStatementItem); }
+
+				break;
+		}
+	}
+
+	private setMenu(menu: Electron.Menu, items: Array<MenubarMenuItem>) {
+		items.forEach((item: MenubarMenuItem) => {
+			if (isMenubarMenuItemSeparator(item)) {
+				menu.append(__separator__());
+			} else if (isMenubarMenuItemSubmenu(item)) {
+				const submenu = new Menu();
+				const submenuItem = new MenuItem({ label: this.mnemonicLabel(item.label), submenu: submenu });
+				this.setMenu(submenu, item.submenu.items);
+				menu.append(submenuItem);
+			} else if (isMenubarMenuItemAction(item)) {
+				if (item.id === 'workbench.action.openRecent') {
+					this.insertRecentMenuItems(menu);
+				} else if (item.id === 'workbench.action.showAboutDialog') {
+					this.insertCheckForUpdatesItems(menu);
+				}
+
+				// Store the keybinding
+				if (item.keybinding) {
+					this.keybindings[item.id] = item.keybinding;
+				} else if (this.keybindings[item.id]) {
+					this.keybindings[item.id] = undefined;
+				}
+
+				const menuItem = this.createMenuItem(item.label, item.id, item.enabled, item.checked);
+				menu.append(menuItem);
+			}
+		});
+	}
+
+	private setMenuById(menu: Electron.Menu, menuId: string): void {
+		if (this.menubarMenus && this.menubarMenus[menuId]) {
+			this.setMenu(menu, this.menubarMenus[menuId].items);
+		}
+	}
+
+	private insertCheckForUpdatesItems(menu: Electron.Menu) {
+		const updateItems = this.getUpdateMenuItems();
+		if (updateItems.length) {
+			updateItems.forEach(i => menu.append(i));
+			menu.append(__separator__());
+		}
+	}
+
+	private insertRecentMenuItems(menu: Electron.Menu) {
+		const { workspaces, files } = this.historyMainService.getRecentlyOpened();
+
+		// Workspaces
+		if (workspaces.length > 0) {
+			for (let i = 0; i < Menubar.MAX_MENU_RECENT_ENTRIES && i < workspaces.length; i++) {
+				menu.append(this.createOpenRecentMenuItem(workspaces[i], 'openRecentWorkspace', false));
+			}
+
+			menu.append(__separator__());
+		}
+
+		// Files
+		if (files.length > 0) {
+			for (let i = 0; i < Menubar.MAX_MENU_RECENT_ENTRIES && i < files.length; i++) {
+				menu.append(this.createOpenRecentMenuItem(files[i], 'openRecentFile', true));
+			}
+
+			menu.append(__separator__());
+		}
+	}
+
+	private createOpenRecentMenuItem(workspaceOrFile: IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier | URI, commandId: string, isFile: boolean): Electron.MenuItem {
+		let label: string;
+		let uri: URI;
+		if (isSingleFolderWorkspaceIdentifier(workspaceOrFile) && !isFile) {
+			label = unmnemonicLabel(this.labelService.getWorkspaceLabel(workspaceOrFile, { verbose: true }));
+			uri = workspaceOrFile;
+		} else if (isWorkspaceIdentifier(workspaceOrFile)) {
+			label = this.labelService.getWorkspaceLabel(workspaceOrFile, { verbose: true });
+			uri = URI.file(workspaceOrFile.configPath);
+		} else {
+			label = unmnemonicLabel(this.labelService.getUriLabel(workspaceOrFile));
+			uri = workspaceOrFile;
+		}
+
+		return new MenuItem(this.likeAction(commandId, {
+			label,
+			click: (menuItem, win, event) => {
+				const openInNewWindow = this.isOptionClick(event);
+				const success = this.windowsMainService.open({
+					context: OpenContext.MENU,
+					cli: this.environmentService.args,
+					urisToOpen: [uri],
+					forceNewWindow: openInNewWindow,
+					forceOpenWorkspaceAsFile: isFile
+				}).length > 0;
+
+				if (!success) {
+					this.historyMainService.removeFromRecentlyOpened([workspaceOrFile]);
+				}
+			}
+		}, false));
+	}
+
+	private isOptionClick(event: Electron.Event): boolean {
+		return event && ((!isMacintosh && (event.ctrlKey || event.shiftKey)) || (isMacintosh && (event.metaKey || event.altKey)));
+	}
+
+	private createRoleMenuItem(label: string, commandId: string, role: any): Electron.MenuItem {
+		const options: Electron.MenuItemConstructorOptions = {
+			label: this.mnemonicLabel(label),
+			role,
+			enabled: true
+		};
+
+		return new MenuItem(this.withKeybinding(commandId, options));
+	}
+
+	private setMacWindowMenu(macWindowMenu: Electron.Menu): void {
+		const minimize = new MenuItem({ label: nls.localize('mMinimize', "Minimize"), role: 'minimize', accelerator: 'Command+M', enabled: this.windowsMainService.getWindowCount() > 0 });
+		const zoom = new MenuItem({ label: nls.localize('mZoom', "Zoom"), role: 'zoom', enabled: this.windowsMainService.getWindowCount() > 0 });
+		const bringAllToFront = new MenuItem({ label: nls.localize('mBringToFront', "Bring All to Front"), role: 'front', enabled: this.windowsMainService.getWindowCount() > 0 });
+		const switchWindow = this.createMenuItem(nls.localize({ key: 'miSwitchWindow', comment: ['&& denotes a mnemonic'] }, "Switch &&Window..."), 'workbench.action.switchWindow');
+
+		const nativeTabMenuItems: Electron.MenuItem[] = [];
+		if (this.currentEnableNativeTabs) {
+			nativeTabMenuItems.push(this.createMenuItem(nls.localize('mNewTab', "New Tab"), 'workbench.action.newWindowTab'));
+
+			nativeTabMenuItems.push(this.createRoleMenuItem(nls.localize('mShowPreviousTab', "Show Previous Tab"), 'workbench.action.showPreviousWindowTab', 'selectPreviousTab'));
+			nativeTabMenuItems.push(this.createRoleMenuItem(nls.localize('mShowNextTab', "Show Next Tab"), 'workbench.action.showNextWindowTab', 'selectNextTab'));
+			nativeTabMenuItems.push(this.createRoleMenuItem(nls.localize('mMoveTabToNewWindow', "Move Tab to New Window"), 'workbench.action.moveWindowTabToNewWindow', 'moveTabToNewWindow'));
+			nativeTabMenuItems.push(this.createRoleMenuItem(nls.localize('mMergeAllWindows', "Merge All Windows"), 'workbench.action.mergeAllWindowTabs', 'mergeAllWindows'));
+
+			nativeTabMenuItems.push(__separator__(), ...nativeTabMenuItems);
+		}
+
+		[
+			minimize,
+			zoom,
+			switchWindow,
+			...nativeTabMenuItems,
+			__separator__(),
+			bringAllToFront
+		].forEach(item => macWindowMenu.append(item));
+	}
+
+	private getUpdateMenuItems(): Electron.MenuItem[] {
+		const state = this.updateService.state;
+
+		switch (state.type) {
+			case StateType.Uninitialized:
+				return [];
+
+			case StateType.Idle:
+				return [new MenuItem({
+					label: nls.localize('miCheckForUpdates', "Check for Updates..."), click: () => setTimeout(() => {
+						this.reportMenuActionTelemetry('CheckForUpdate');
+
+						const focusedWindow = this.windowsMainService.getFocusedWindow();
+						const context = focusedWindow ? { windowId: focusedWindow.id } : null;
+						this.updateService.checkForUpdates(context);
+					}, 0)
+				})];
+
+			case StateType.CheckingForUpdates:
+				return [new MenuItem({ label: nls.localize('miCheckingForUpdates', "Checking For Updates..."), enabled: false })];
+
+			case StateType.AvailableForDownload:
+				return [new MenuItem({
+					label: nls.localize('miDownloadUpdate', "Download Available Update"), click: () => {
+						this.updateService.downloadUpdate();
+					}
+				})];
+
+			case StateType.Downloading:
+				return [new MenuItem({ label: nls.localize('miDownloadingUpdate', "Downloading Update..."), enabled: false })];
+
+			case StateType.Downloaded:
+				return [new MenuItem({
+					label: nls.localize('miInstallUpdate', "Install Update..."), click: () => {
+						this.reportMenuActionTelemetry('InstallUpdate');
+						this.updateService.applyUpdate();
+					}
+				})];
+
+			case StateType.Updating:
+				return [new MenuItem({ label: nls.localize('miInstallingUpdate', "Installing Update..."), enabled: false })];
+
+			case StateType.Ready:
+				return [new MenuItem({
+					label: nls.localize('miRestartToUpdate', "Restart to Update..."), click: () => {
+						this.reportMenuActionTelemetry('RestartToUpdate');
+						this.updateService.quitAndInstall();
+					}
+				})];
+		}
+	}
+
+	private createMenuItem(label: string, commandId: string | string[], enabled?: boolean, checked?: boolean): Electron.MenuItem;
+	private createMenuItem(label: string, click: () => void, enabled?: boolean, checked?: boolean): Electron.MenuItem;
+	private createMenuItem(arg1: string, arg2: any, arg3?: boolean, arg4?: boolean): Electron.MenuItem {
+		const label = this.mnemonicLabel(arg1);
+		const click: () => void = (typeof arg2 === 'function') ? arg2 : (menuItem: Electron.MenuItem, win: Electron.BrowserWindow, event: Electron.Event) => {
+			let commandId = arg2;
+			if (Array.isArray(arg2)) {
+				commandId = this.isOptionClick(event) ? arg2[1] : arg2[0]; // support alternative action if we got multiple action Ids and the option key was pressed while invoking
+			}
+
+			this.runActionInRenderer(commandId);
+		};
+		const enabled = typeof arg3 === 'boolean' ? arg3 : this.windowsMainService.getWindowCount() > 0;
+		const checked = typeof arg4 === 'boolean' ? arg4 : false;
+
+		const options: Electron.MenuItemConstructorOptions = {
+			label,
+			click,
+			enabled
+		};
+
+		if (checked) {
+			options['type'] = 'checkbox';
+			options['checked'] = checked;
+		}
+
+		let commandId: string;
+		if (typeof arg2 === 'string') {
+			commandId = arg2;
+		} else if (Array.isArray(arg2)) {
+			commandId = arg2[0];
+		}
+
+		// Add role for special case menu items
+		if (isMacintosh) {
+			if (commandId === 'editor.action.clipboardCutAction') {
+				options['role'] = 'cut';
+			} else if (commandId === 'editor.action.clipboardCopyAction') {
+				options['role'] = 'copy';
+			} else if (commandId === 'editor.action.clipboardPasteAction') {
+				options['role'] = 'paste';
+			}
+		}
+
+		return new MenuItem(this.withKeybinding(commandId, options));
+	}
+
+	private runActionInRenderer(id: string): void {
+		// We make sure to not run actions when the window has no focus, this helps
+		// for https://github.com/Microsoft/vscode/issues/25907 and specifically for
+		// https://github.com/Microsoft/vscode/issues/11928
+		const activeWindow = this.windowsMainService.getFocusedWindow();
+		if (activeWindow) {
+			this.windowsMainService.sendToFocused('vscode:runAction', { id, from: 'menu' } as IRunActionInWindowRequest);
+		}
+	}
+
+	private withKeybinding(commandId: string, options: Electron.MenuItemConstructorOptions): Electron.MenuItemConstructorOptions {
+		const binding = this.keybindings[commandId];
+
+		// Apply binding if there is one
+		if (binding && binding.label) {
+
+			// if the binding is native, we can just apply it
+			if (binding.isNative) {
+				options.accelerator = binding.label;
+			}
+
+			// the keybinding is not native so we cannot show it as part of the accelerator of
+			// the menu item. we fallback to a different strategy so that we always display it
+			else {
+				const bindingIndex = options.label.indexOf('[');
+				if (bindingIndex >= 0) {
+					options.label = `${options.label.substr(0, bindingIndex)} [${binding.label}]`;
+				} else {
+					options.label = `${options.label} [${binding.label}]`;
+				}
+			}
+		}
+
+		// Unset bindings if there is none
+		else {
+			options.accelerator = void 0;
+		}
+
+		return options;
+	}
+
+	private likeAction(commandId: string, options: Electron.MenuItemConstructorOptions, setAccelerator = !options.accelerator): Electron.MenuItemConstructorOptions {
+		if (setAccelerator) {
+			options = this.withKeybinding(commandId, options);
+		}
+
+		const originalClick = options.click;
+		options.click = (item, window, event) => {
+			this.reportMenuActionTelemetry(commandId);
+			if (originalClick) {
+				originalClick(item, window, event);
+			}
+		};
+
+		return options;
+	}
+
+	private openUrl(url: string, id: string): void {
+		shell.openExternal(url);
+		this.reportMenuActionTelemetry(id);
+	}
+
+	private reportMenuActionTelemetry(id: string): void {
+		/* __GDPR__
+			"workbenchActionExecuted" : {
+				"id" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+				"from": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+			}
+		*/
+		this.telemetryService.publicLog('workbenchActionExecuted', { id, from: telemetryFrom });
+	}
+
+	private mnemonicLabel(label: string): string {
+		return baseMnemonicLabel(label, !this.currentEnableMenuBarMnemonics);
+	}
+}
+
+function __separator__(): Electron.MenuItem {
+	return new MenuItem({ type: 'separator' });
+}
diff --git a/src/vs/platform/menubar/electron-main/menubarService.ts b/src/vs/platform/menubar/electron-main/menubarService.ts
new file mode 100644
index 00000000000..81c1113d606
--- /dev/null
+++ b/src/vs/platform/menubar/electron-main/menubarService.ts
@@ -0,0 +1,39 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+import { IMenubarService, IMenubarData, IMenubarKeybinding } from 'vs/platform/menubar/common/menubar';
+import { Menubar } from 'vs/platform/menubar/electron-main/menubar';
+import { ILogService } from 'vs/platform/log/common/log';
+import { TPromise } from 'vs/base/common/winjs.base';
+import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { isMacintosh, isWindows } from 'vs/base/common/platform';
+
+export class MenubarService implements IMenubarService {
+	_serviceBrand: any;
+
+	private _menubar: Menubar;
+
+	constructor(
+		@IInstantiationService private instantiationService: IInstantiationService,
+		@ILogService private logService: ILogService
+	) {
+		// Install Menu
+		if (isMacintosh && isWindows) {
+			this._menubar = this.instantiationService.createInstance(Menubar);
+		}
+	}
+
+	updateMenubar(windowId: number, menus: IMenubarData, additionalKeybindings?: Array<IMenubarKeybinding>): TPromise<void> {
+		this.logService.trace('menubarService#updateMenubar', windowId);
+
+		if (this._menubar) {
+			this._menubar.updateMenu(menus, windowId, additionalKeybindings);
+		}
+
+		return TPromise.as(null);
+	}
+}
\ No newline at end of file
diff --git a/src/vs/platform/menubar/node/menubarIpc.ts b/src/vs/platform/menubar/node/menubarIpc.ts
new file mode 100644
index 00000000000..c75535de80c
--- /dev/null
+++ b/src/vs/platform/menubar/node/menubarIpc.ts
@@ -0,0 +1,42 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+import { IChannel } from 'vs/base/parts/ipc/node/ipc';
+import { TPromise } from 'vs/base/common/winjs.base';
+import { IMenubarService, IMenubarData, IMenubarKeybinding } from 'vs/platform/menubar/common/menubar';
+import { Event } from 'vs/base/common/event';
+
+export interface IMenubarChannel extends IChannel {
+	call(command: 'updateMenubar', arg: [number, IMenubarData]): TPromise<void>;
+	call(command: string, arg?: any): TPromise<any>;
+}
+
+export class MenubarChannel implements IMenubarChannel {
+
+	constructor(private service: IMenubarService) { }
+
+	listen<T>(event: string, arg?: any): Event<T> {
+		throw new Error('No events');
+	}
+
+	call(command: string, arg?: any): TPromise<any> {
+		switch (command) {
+			case 'updateMenubar': return this.service.updateMenubar(arg[0], arg[1], arg[2]);
+		}
+		return undefined;
+	}
+}
+
+export class MenubarChannelClient implements IMenubarService {
+
+	_serviceBrand: any;
+
+	constructor(private channel: IMenubarChannel) { }
+
+	updateMenubar(windowId: number, menus: IMenubarData, additionalKeybindings?: Array<IMenubarKeybinding>): TPromise<void> {
+		return this.channel.call('updateMenubar', [windowId, menus, additionalKeybindings]);
+	}
+}
\ No newline at end of file
diff --git a/src/vs/platform/node/minimalTranslations.ts b/src/vs/platform/node/minimalTranslations.ts
index 25a1de9e412..42e71e0a725 100644
--- a/src/vs/platform/node/minimalTranslations.ts
+++ b/src/vs/platform/node/minimalTranslations.ts
@@ -9,9 +9,9 @@ import { localize } from 'vs/nls';
 // So that they are available for VS Code to use without downloading the entire language pack.
 
 export const minimumTranslatedStrings = {
-	showLanguagePackExtensions: localize('showLanguagePackExtensions', "VS Code is available in {0}. Search for language packs in the Marketplace to get started."),
+	showLanguagePackExtensions: localize('showLanguagePackExtensions', "Search language packs in the Marketplace to change the display language to {0}."),
 	searchMarketplace: localize('searchMarketplace', "Search Marketplace"),
-	installAndRestartMessage: localize('installAndRestartMessage', "VS Code is available in {0}. Please install the language pack to change the display language."),
+	installAndRestartMessage: localize('installAndRestartMessage', "Install language pack to change the display language to {0}."),
 	installAndRestart: localize('installAndRestart', "Install and Restart")
 };
 
diff --git a/src/vs/platform/node/package.ts b/src/vs/platform/node/package.ts
index fff85d911f2..93c32bc7117 100644
--- a/src/vs/platform/node/package.ts
+++ b/src/vs/platform/node/package.ts
@@ -4,13 +4,13 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as path from 'path';
-import uri from 'vs/base/common/uri';
+import { getPathFromAmdModule } from 'vs/base/common/amd';
 
 export interface IPackageConfiguration {
 	name: string;
 	version: string;
 }
 
-const rootPath = path.dirname(uri.parse(require.toUrl('')).fsPath);
+const rootPath = path.dirname(getPathFromAmdModule(require, ''));
 const packageJsonPath = path.join(rootPath, 'package.json');
-export default require.__$__nodeRequire(packageJsonPath) as IPackageConfiguration;
\ No newline at end of file
+export default require.__$__nodeRequire(packageJsonPath) as IPackageConfiguration;
diff --git a/src/vs/platform/node/product.ts b/src/vs/platform/node/product.ts
index f85d99660c5..dbb84fd473f 100644
--- a/src/vs/platform/node/product.ts
+++ b/src/vs/platform/node/product.ts
@@ -4,12 +4,16 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as path from 'path';
-import uri from 'vs/base/common/uri';
+import { getPathFromAmdModule } from 'vs/base/common/amd';
 
 export interface IProductConfiguration {
 	nameShort: string;
 	nameLong: string;
 	applicationName: string;
+	win32AppId: string;
+	win32x64AppId: string;
+	win32UserAppId: string;
+	win32x64UserAppId: string;
 	win32AppUserModelId: string;
 	win32MutexName: string;
 	darwinBundleIdentifier: string;
@@ -18,9 +22,11 @@ export interface IProductConfiguration {
 	downloadUrl: string;
 	updateUrl?: string;
 	quality?: string;
+	target?: string;
 	commit?: string;
 	settingsSearchBuildId?: number;
 	settingsSearchUrl?: string;
+	experimentsUrl?: string;
 	date: string;
 	extensionsGallery: {
 		serviceUrl: string;
@@ -30,7 +36,7 @@ export interface IProductConfiguration {
 	};
 	extensionTips: { [id: string]: string; };
 	extensionImportantTips: { [id: string]: { name: string; pattern: string; }; };
-	exeBasedExtensionTips: { [id: string]: any; };
+	exeBasedExtensionTips: { [id: string]: { friendlyName: string, windowsPath?: string, recommendations: string[] }; };
 	extensionKeywords: { [extension: string]: string[]; };
 	extensionAllowedBadgeProviders: string[];
 	extensionAllowedProposedApi: string[];
@@ -73,6 +79,7 @@ export interface IProductConfiguration {
 		'darwin': string;
 	};
 	logUploaderUrl: string;
+	portable?: string;
 }
 
 export interface ISurveyData {
@@ -83,7 +90,7 @@ export interface ISurveyData {
 	userProbability: number;
 }
 
-const rootPath = path.dirname(uri.parse(require.toUrl('')).fsPath);
+const rootPath = path.dirname(getPathFromAmdModule(require, ''));
 const productJsonPath = path.join(rootPath, 'product.json');
 const product = require.__$__nodeRequire(productJsonPath) as IProductConfiguration;
 
diff --git a/src/vs/base/test/node/zip/fixtures/extract.zip b/src/vs/platform/node/test/fixtures/extract.zip
similarity index 100%
rename from src/vs/base/test/node/zip/fixtures/extract.zip
rename to src/vs/platform/node/test/fixtures/extract.zip
diff --git a/src/vs/platform/node/test/zip.test.ts b/src/vs/platform/node/test/zip.test.ts
new file mode 100644
index 00000000000..4d2e138d29a
--- /dev/null
+++ b/src/vs/platform/node/test/zip.test.ts
@@ -0,0 +1,31 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+import * as assert from 'assert';
+import * as path from 'path';
+import * as os from 'os';
+import { extract } from 'vs/platform/node/zip';
+import { generateUuid } from 'vs/base/common/uuid';
+import { rimraf, exists } from 'vs/base/node/pfs';
+import { NullLogService } from 'vs/platform/log/common/log';
+import { getPathFromAmdModule } from 'vs/base/common/amd';
+import { createCancelablePromise } from 'vs/base/common/async';
+
+const fixtures = getPathFromAmdModule(require, './fixtures');
+
+suite('Zip', () => {
+
+	test('extract should handle directories', () => {
+		const fixture = path.join(fixtures, 'extract.zip');
+		const target = path.join(os.tmpdir(), generateUuid());
+
+		return createCancelablePromise(token => extract(fixture, target, {}, new NullLogService(), token)
+			.then(() => exists(path.join(target, 'extension')))
+			.then(exists => assert(exists))
+			.then(() => rimraf(target)));
+	});
+});
diff --git a/src/vs/platform/node/zip.ts b/src/vs/platform/node/zip.ts
new file mode 100644
index 00000000000..d84133cb68d
--- /dev/null
+++ b/src/vs/platform/node/zip.ts
@@ -0,0 +1,224 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as nls from 'vs/nls';
+import * as path from 'path';
+import { createWriteStream, WriteStream } from 'fs';
+import { Readable } from 'stream';
+import { nfcall, ninvoke, SimpleThrottler, createCancelablePromise } from 'vs/base/common/async';
+import { mkdirp, rimraf } from 'vs/base/node/pfs';
+import { TPromise } from 'vs/base/common/winjs.base';
+import { open as _openZip, Entry, ZipFile } from 'yauzl';
+import * as yazl from 'yazl';
+import { ILogService } from 'vs/platform/log/common/log';
+import { CancellationToken } from 'vs/base/common/cancellation';
+import { once } from 'vs/base/common/event';
+
+export interface IExtractOptions {
+	overwrite?: boolean;
+
+	/**
+	 * Source path within the ZIP archive. Only the files contained in this
+	 * path will be extracted.
+	 */
+	sourcePath?: string;
+}
+
+interface IOptions {
+	sourcePathRegex: RegExp;
+}
+
+export type ExtractErrorType = 'CorruptZip' | 'Incomplete';
+
+export class ExtractError extends Error {
+
+	readonly type: ExtractErrorType;
+	readonly cause: Error;
+
+	constructor(type: ExtractErrorType, cause: Error) {
+		let message = cause.message;
+
+		switch (type) {
+			case 'CorruptZip': message = `Corrupt ZIP: ${message}`; break;
+		}
+
+		super(message);
+		this.type = type;
+		this.cause = cause;
+	}
+}
+
+function modeFromEntry(entry: Entry) {
+	let attr = entry.externalFileAttributes >> 16 || 33188;
+
+	return [448 /* S_IRWXU */, 56 /* S_IRWXG */, 7 /* S_IRWXO */]
+		.map(mask => attr & mask)
+		.reduce((a, b) => a + b, attr & 61440 /* S_IFMT */);
+}
+
+function toExtractError(err: Error): ExtractError {
+	if (err instanceof ExtractError) {
+		return err;
+	}
+
+	let type: ExtractErrorType = void 0;
+
+	if (/end of central directory record signature not found/.test(err.message)) {
+		type = 'CorruptZip';
+	}
+
+	return new ExtractError(type, err);
+}
+
+function extractEntry(stream: Readable, fileName: string, mode: number, targetPath: string, options: IOptions, token: CancellationToken): TPromise<void> {
+	const dirName = path.dirname(fileName);
+	const targetDirName = path.join(targetPath, dirName);
+	if (targetDirName.indexOf(targetPath) !== 0) {
+		return TPromise.wrapError(new Error(nls.localize('invalid file', "Error extracting {0}. Invalid file.", fileName)));
+	}
+	const targetFileName = path.join(targetPath, fileName);
+
+	let istream: WriteStream;
+
+	once(token.onCancellationRequested)(() => {
+		if (istream) {
+			istream.close();
+		}
+	});
+
+	return mkdirp(targetDirName, void 0, token).then(() => new TPromise((c, e) => {
+		if (token.isCancellationRequested) {
+			return;
+		}
+
+		istream = createWriteStream(targetFileName, { mode });
+		istream.once('close', () => c(null));
+		istream.once('error', e);
+		stream.once('error', e);
+		stream.pipe(istream);
+	}));
+}
+
+function extractZip(zipfile: ZipFile, targetPath: string, options: IOptions, logService: ILogService, token: CancellationToken): Promise<void> {
+	let last = createCancelablePromise(() => Promise.resolve(null));
+	let extractedEntriesCount = 0;
+
+	once(token.onCancellationRequested)(() => {
+		logService.debug(targetPath, 'Cancelled.');
+		last.cancel();
+		zipfile.close();
+	});
+
+	return new Promise((c, e) => {
+		const throttler = new SimpleThrottler();
+
+		const readNextEntry = (token: CancellationToken) => {
+			if (token.isCancellationRequested) {
+				return;
+			}
+
+			extractedEntriesCount++;
+			zipfile.readEntry();
+		};
+
+		zipfile.once('error', e);
+		zipfile.once('close', () => last.then(() => {
+			if (token.isCancellationRequested || zipfile.entryCount === extractedEntriesCount) {
+				c(null);
+			} else {
+				e(new ExtractError('Incomplete', new Error(nls.localize('incompleteExtract', "Incomplete. Found {0} of {1} entries", extractedEntriesCount, zipfile.entryCount))));
+			}
+		}, e));
+		zipfile.readEntry();
+		zipfile.on('entry', (entry: Entry) => {
+
+			if (token.isCancellationRequested) {
+				return;
+			}
+
+			if (!options.sourcePathRegex.test(entry.fileName)) {
+				readNextEntry(token);
+				return;
+			}
+
+			const fileName = entry.fileName.replace(options.sourcePathRegex, '');
+
+			// directory file names end with '/'
+			if (/\/$/.test(fileName)) {
+				const targetFileName = path.join(targetPath, fileName);
+				last = createCancelablePromise(token => mkdirp(targetFileName, void 0, token).then(() => readNextEntry(token)));
+				return;
+			}
+
+			const stream = ninvoke(zipfile, zipfile.openReadStream, entry);
+			const mode = modeFromEntry(entry);
+
+			last = createCancelablePromise(token => throttler.queue(() => stream.then(stream => extractEntry(stream, fileName, mode, targetPath, options, token).then(() => readNextEntry(token)))));
+		});
+	});
+}
+
+function openZip(zipFile: string, lazy: boolean = false): TPromise<ZipFile> {
+	return nfcall<ZipFile>(_openZip, zipFile, lazy ? { lazyEntries: true } : void 0)
+		.then(null, err => TPromise.wrapError(toExtractError(err)));
+}
+
+export interface IFile {
+	path: string;
+	contents?: Buffer | string;
+	localPath?: string;
+}
+
+export function zip(zipPath: string, files: IFile[]): TPromise<string> {
+	return new TPromise<string>((c, e) => {
+		const zip = new yazl.ZipFile();
+		files.forEach(f => f.contents ? zip.addBuffer(typeof f.contents === 'string' ? Buffer.from(f.contents, 'utf8') : f.contents, f.path) : zip.addFile(f.localPath, f.path));
+		zip.end();
+
+		const zipStream = createWriteStream(zipPath);
+		zip.outputStream.pipe(zipStream);
+
+		zip.outputStream.once('error', e);
+		zipStream.once('error', e);
+		zipStream.once('finish', () => c(zipPath));
+	});
+}
+
+export function extract(zipPath: string, targetPath: string, options: IExtractOptions = {}, logService: ILogService, token: CancellationToken): TPromise<void> {
+	const sourcePathRegex = new RegExp(options.sourcePath ? `^${options.sourcePath}` : '');
+
+	let promise = openZip(zipPath, true);
+
+	if (options.overwrite) {
+		promise = promise.then(zipfile => rimraf(targetPath).then(() => zipfile));
+	}
+
+	return promise.then(zipfile => extractZip(zipfile, targetPath, { sourcePathRegex }, logService, token));
+}
+
+function read(zipPath: string, filePath: string): TPromise<Readable> {
+	return openZip(zipPath).then(zipfile => {
+		return new TPromise<Readable>((c, e) => {
+			zipfile.on('entry', (entry: Entry) => {
+				if (entry.fileName === filePath) {
+					ninvoke<Readable>(zipfile, zipfile.openReadStream, entry).then(stream => c(stream), err => e(err));
+				}
+			});
+
+			zipfile.once('close', () => e(new Error(nls.localize('notFound', "{0} not found inside zip.", filePath))));
+		});
+	});
+}
+
+export function buffer(zipPath: string, filePath: string): TPromise<Buffer> {
+	return read(zipPath, filePath).then(stream => {
+		return new TPromise<Buffer>((c, e) => {
+			const buffers: Buffer[] = [];
+			stream.once('error', e);
+			stream.on('data', b => buffers.push(b as Buffer));
+			stream.on('end', () => c(Buffer.concat(buffers)));
+		});
+	});
+}
diff --git a/src/vs/platform/notification/common/notification.ts b/src/vs/platform/notification/common/notification.ts
index 4b1315c077f..525d8f18a25 100644
--- a/src/vs/platform/notification/common/notification.ts
+++ b/src/vs/platform/notification/common/notification.ts
@@ -205,7 +205,7 @@ export class NoOpNotification implements INotificationHandle {
 
 	private readonly _onDidClose: Emitter<void> = new Emitter();
 
-	public get onDidClose(): Event<void> {
+	get onDidClose(): Event<void> {
 		return this._onDidClose.event;
 	}
 
diff --git a/src/vs/platform/opener/common/opener.ts b/src/vs/platform/opener/common/opener.ts
index 44e16595037..898fea0337e 100644
--- a/src/vs/platform/opener/common/opener.ts
+++ b/src/vs/platform/opener/common/opener.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
 
diff --git a/src/vs/platform/output/node/outputAppender.ts b/src/vs/platform/output/node/outputAppender.ts
new file mode 100644
index 00000000000..a7ffc9cd3d2
--- /dev/null
+++ b/src/vs/platform/output/node/outputAppender.ts
@@ -0,0 +1,24 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+import { createRotatingLogger } from 'vs/platform/log/node/spdlogService';
+import { RotatingLogger } from 'spdlog';
+
+export class OutputAppender {
+
+	private appender: RotatingLogger;
+
+	constructor(name: string, file: string) {
+		this.appender = createRotatingLogger(name, file, 1024 * 1024 * 30, 1);
+		this.appender.clearFormatters();
+	}
+
+	append(content: string): void {
+		this.appender.critical(content);
+	}
+
+	flush(): void {
+		this.appender.flush();
+	}
+}
\ No newline at end of file
diff --git a/src/vs/platform/progress/common/progress.ts b/src/vs/platform/progress/common/progress.ts
index a227d502d4b..405170fa1e1 100644
--- a/src/vs/platform/progress/common/progress.ts
+++ b/src/vs/platform/progress/common/progress.ts
@@ -4,7 +4,6 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import { TPromise } from 'vs/base/common/winjs.base';
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
 import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
 import { IDisposable, dispose, toDisposable } from 'vs/base/common/lifecycle';
@@ -24,7 +23,7 @@ export interface IProgressService {
 	 * Indicate progress for the duration of the provided promise. Progress will stop in
 	 * any case of promise completion, error or cancellation.
 	 */
-	showWhile(promise: TPromise<any>, delay?: number): TPromise<void>;
+	showWhile(promise: Thenable<any>, delay?: number): Thenable<void>;
 }
 
 export interface IProgressRunner {
@@ -64,36 +63,6 @@ export class Progress<T> implements IProgress<T> {
 	}
 }
 
-export enum ProgressLocation {
-	Explorer = 1,
-	Scm = 3,
-	Extensions = 5,
-	Window = 10,
-	Notification = 15
-}
-
-export interface IProgressOptions {
-	location: ProgressLocation;
-	title?: string;
-	source?: string;
-	total?: number;
-	cancellable?: boolean;
-}
-
-export interface IProgressStep {
-	message?: string;
-	increment?: number;
-}
-
-export const IProgressService2 = createDecorator<IProgressService2>('progressService2');
-
-export interface IProgressService2 {
-
-	_serviceBrand: any;
-
-	withProgress<P extends Thenable<R>, R=any>(options: IProgressOptions, task: (progress: IProgress<IProgressStep>) => P, onDidCancel?: () => void): P;
-}
-
 /**
  * A helper to show progress during a long running operation. If the operation
  * is started multiple times, only the last invocation will drive the progress.
@@ -156,4 +125,4 @@ export class LongRunningOperation {
 	dispose(): void {
 		this.currentOperationDisposables = dispose(this.currentOperationDisposables);
 	}
-}
\ No newline at end of file
+}
diff --git a/src/vs/platform/quickOpen/common/quickOpen.ts b/src/vs/platform/quickOpen/common/quickOpen.ts
index e5e1bffd9d4..b0b91b9e1b4 100644
--- a/src/vs/platform/quickOpen/common/quickOpen.ts
+++ b/src/vs/platform/quickOpen/common/quickOpen.ts
@@ -5,86 +5,9 @@
 'use strict';
 
 import { TPromise } from 'vs/base/common/winjs.base';
-import uri from 'vs/base/common/uri';
 import { Event } from 'vs/base/common/event';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { IQuickNavigateConfiguration, IAutoFocus, IEntryRunContext } from 'vs/base/parts/quickopen/common/quickOpen';
+import { IQuickNavigateConfiguration, IAutoFocus } from 'vs/base/parts/quickopen/common/quickOpen';
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { IAction } from 'vs/base/common/actions';
-import { FileKind } from 'vs/platform/files/common/files';
-
-export interface IFilePickOpenEntry extends IPickOpenEntry {
-	resource: uri;
-	fileKind?: FileKind;
-}
-
-export interface IPickOpenAction extends IAction {
-	run(item: IPickOpenItem): TPromise<any>;
-}
-
-export interface IPickOpenEntry {
-	id?: string;
-	label: string;
-	description?: string;
-	detail?: string;
-	tooltip?: string;
-	separator?: ISeparator;
-	alwaysShow?: boolean;
-	run?: (context: IEntryRunContext) => void;
-	action?: IAction;
-	payload?: any;
-}
-
-export interface IPickOpenItem {
-	index: number;
-	remove: () => void;
-	getId: () => string;
-	getResource: () => uri;
-	getPayload: () => any;
-}
-
-export interface ISeparator {
-	border?: boolean;
-	label?: string;
-}
-
-export interface IPickOptions {
-
-	/**
-	 * an optional string to show as place holder in the input box to guide the user what she picks on
-	 */
-	placeHolder?: string;
-
-	/**
-	 * optional auto focus settings
-	 */
-	autoFocus?: IAutoFocus;
-
-	/**
-	 * an optional flag to include the description when filtering the picks
-	 */
-	matchOnDescription?: boolean;
-
-	/**
-	 * an optional flag to include the detail when filtering the picks
-	 */
-	matchOnDetail?: boolean;
-
-	/**
-	 * an optional flag to not close the picker on focus lost
-	 */
-	ignoreFocusLost?: boolean;
-
-	/**
-	 * enables quick navigate in the picker to open an element without typing
-	 */
-	quickNavigateConfiguration?: IQuickNavigateConfiguration;
-
-	/**
-	 * a context key to set when this picker is active
-	 */
-	contextKey?: string;
-}
 
 export interface IShowOptions {
 	quickNavigateConfiguration?: IQuickNavigateConfiguration;
@@ -107,18 +30,6 @@ export interface IQuickOpenService {
 	 */
 	show(prefix?: string, options?: IShowOptions): TPromise<void>;
 
-	/**
-	 * A convenient way to bring up quick open as a picker with custom elements. This bypasses the quick open handler
-	 * registry and just leverages the quick open widget to select any kind of entries.
-	 *
-	 * Passing in a promise will allow you to resolve the elements in the background while quick open will show a
-	 * progress bar spinning.
-	 */
-	pick(picks: TPromise<string[]>, options?: IPickOptions, token?: CancellationToken): TPromise<string>;
-	pick<T extends IPickOpenEntry>(picks: TPromise<T[]>, options?: IPickOptions, token?: CancellationToken): TPromise<T>;
-	pick(picks: string[], options?: IPickOptions, token?: CancellationToken): TPromise<string>;
-	pick<T extends IPickOpenEntry>(picks: T[], options?: IPickOptions, token?: CancellationToken): TPromise<T>;
-
 	/**
 	 * Allows to navigate from the outside in an opened picker.
 	 */
diff --git a/src/vs/platform/quickinput/common/quickInput.ts b/src/vs/platform/quickinput/common/quickInput.ts
index 14edbfdfa22..e6d636c72e4 100644
--- a/src/vs/platform/quickinput/common/quickInput.ts
+++ b/src/vs/platform/quickinput/common/quickInput.ts
@@ -8,20 +8,36 @@ import { createDecorator } from 'vs/platform/instantiation/common/instantiation'
 import { TPromise } from 'vs/base/common/winjs.base';
 import { CancellationToken } from 'vs/base/common/cancellation';
 import { ResolvedKeybinding } from 'vs/base/common/keyCodes';
+import { URI } from 'vs/base/common/uri';
+import { Event } from 'vs/base/common/event';
 
-export interface IPickOpenEntry {
+export interface IQuickPickItem {
+	type?: 'item';
 	id?: string;
 	label: string;
 	description?: string;
 	detail?: string;
+	iconClasses?: string[];
+	buttons?: IQuickInputButton[];
 	picked?: boolean;
+	alwaysShow?: boolean;
+}
+
+export interface IQuickPickSeparator {
+	type: 'separator';
+	label?: string;
+}
+
+export interface IKeyMods {
+	readonly ctrlCmd: boolean;
+	readonly alt: boolean;
 }
 
 export interface IQuickNavigateConfiguration {
 	keybindings: ResolvedKeybinding[];
 }
 
-export interface IPickOptions {
+export interface IPickOptions<T extends IQuickPickItem> {
 
 	/**
 	 * an optional string to show as place holder in the input box to guide the user what she picks on
@@ -47,6 +63,25 @@ export interface IPickOptions {
 	 * an optional flag to make this picker multi-select
 	 */
 	canPickMany?: boolean;
+
+	/**
+	 * enables quick navigate in the picker to open an element without typing
+	 */
+	quickNavigate?: IQuickNavigateConfiguration;
+
+	/**
+	 * a context key to set when this picker is active
+	 */
+	contextKey?: string;
+
+	/**
+	 * an optional property for the item to focus initially.
+	 */
+	activeItem?: TPromise<T> | T;
+
+	onKeyMods?: (keyMods: IKeyMods) => void;
+	onDidFocus?: (entry: T) => void;
+	onDidTriggerItemButton?: (context: IQuickPickItemButtonContext<T>) => void;
 }
 
 export interface IInputOptions {
@@ -81,29 +116,135 @@ export interface IInputOptions {
 	/**
 	 * an optional function that is used to validate user input.
 	 */
-	validateInput?: (input: string) => TPromise<string>;
+	validateInput?: (input: string) => Thenable<string>;
 }
 
 export interface IQuickInput {
 
+	title: string | undefined;
+
+	step: number | undefined;
+
+	totalSteps: number | undefined;
+
+	enabled: boolean;
+
+	contextKey: string | undefined;
+
+	busy: boolean;
+
+	ignoreFocusOut: boolean;
+
+	show(): void;
+
+	hide(): void;
+
+	onDidHide: Event<void>;
+
+	dispose(): void;
+}
+
+export interface IQuickPick<T extends IQuickPickItem> extends IQuickInput {
+
+	value: string;
+
+	placeholder: string | undefined;
+
+	readonly onDidChangeValue: Event<string>;
+
+	readonly onDidAccept: Event<string>;
+
+	buttons: ReadonlyArray<IQuickInputButton>;
+
+	readonly onDidTriggerButton: Event<IQuickInputButton>;
+
+	readonly onDidTriggerItemButton: Event<IQuickPickItemButtonEvent<T>>;
+
+	items: ReadonlyArray<T | IQuickPickSeparator>;
+
+	canSelectMany: boolean;
+
+	matchOnDescription: boolean;
+
+	matchOnDetail: boolean;
+
+	quickNavigate: IQuickNavigateConfiguration | undefined;
+
+	activeItems: ReadonlyArray<T>;
+
+	readonly onDidChangeActive: Event<T[]>;
+
+	selectedItems: ReadonlyArray<T>;
+
+	readonly onDidChangeSelection: Event<T[]>;
+
+	readonly keyMods: IKeyMods;
+}
+
+export interface IInputBox extends IQuickInput {
+
+	value: string;
+
+	valueSelection: Readonly<[number, number]>;
+
+	placeholder: string | undefined;
+
+	password: boolean;
+
+	readonly onDidChangeValue: Event<string>;
+
+	readonly onDidAccept: Event<string>;
+
+	buttons: ReadonlyArray<IQuickInputButton>;
+
+	readonly onDidTriggerButton: Event<IQuickInputButton>;
+
+	prompt: string | undefined;
+
+	validationMessage: string | undefined;
+}
+
+export interface IQuickInputButton {
+	iconPath?: { dark: URI; light?: URI; };
+	iconClass?: string;
+	tooltip?: string;
+}
+
+export interface IQuickPickItemButtonEvent<T extends IQuickPickItem> {
+	button: IQuickInputButton;
+	item: T;
+}
+
+export interface IQuickPickItemButtonContext<T extends IQuickPickItem> extends IQuickPickItemButtonEvent<T> {
+	removeItem(): void;
+}
+
+export const IQuickInputService = createDecorator<IQuickInputService>('quickInputService');
+
+export type Omit<T, K extends keyof T> = Pick<T, Exclude<keyof T, K>>;
+
+export type QuickPickInput<T = IQuickPickItem> = T | IQuickPickSeparator;
+
+export interface IQuickInputService {
+
+	_serviceBrand: any;
+
 	/**
 	 * Opens the quick input box for selecting items and returns a promise with the user selected item(s) if any.
 	 */
-	pick<T extends IPickOpenEntry, O extends IPickOptions>(picks: TPromise<T[]>, options?: O, token?: CancellationToken): TPromise<O extends { canPickMany: true } ? T[] : T>;
+	pick<T extends IQuickPickItem>(picks: TPromise<QuickPickInput<T>[]> | QuickPickInput<T>[], options?: IPickOptions<T> & { canPickMany: true }, token?: CancellationToken): TPromise<T[]>;
+	pick<T extends IQuickPickItem>(picks: TPromise<QuickPickInput<T>[]> | QuickPickInput<T>[], options?: IPickOptions<T> & { canPickMany: false }, token?: CancellationToken): TPromise<T>;
+	pick<T extends IQuickPickItem>(picks: TPromise<QuickPickInput<T>[]> | QuickPickInput<T>[], options?: Omit<IPickOptions<T>, 'canPickMany'>, token?: CancellationToken): TPromise<T>;
 
 	/**
 	 * Opens the quick input box for text input and returns a promise with the user typed value if any.
 	 */
 	input(options?: IInputOptions, token?: CancellationToken): TPromise<string>;
-}
 
-export const IQuickInputService = createDecorator<IQuickInputService>('quickInputService');
+	backButton: IQuickInputButton;
 
-export interface IQuickInputService extends IQuickInput {
-
-	_serviceBrand: any;
-
-	multiStepInput<T>(handler: (input: IQuickInput, token: CancellationToken) => Thenable<T>, token?: CancellationToken): Thenable<T>;
+	createQuickPick<T extends IQuickPickItem>(): IQuickPick<T>;
+	createInputBox(): IInputBox;
 
 	focus(): void;
 
@@ -113,5 +254,7 @@ export interface IQuickInputService extends IQuickInput {
 
 	accept(): TPromise<void>;
 
+	back(): TPromise<void>;
+
 	cancel(): TPromise<void>;
 }
diff --git a/src/vs/platform/request/electron-browser/requestService.ts b/src/vs/platform/request/electron-browser/requestService.ts
index 265f57f3d46..c66762f4d49 100644
--- a/src/vs/platform/request/electron-browser/requestService.ts
+++ b/src/vs/platform/request/electron-browser/requestService.ts
@@ -8,18 +8,20 @@ import { TPromise } from 'vs/base/common/winjs.base';
 import { IRequestOptions, IRequestContext, IRequestFunction } from 'vs/base/node/request';
 import { Readable } from 'stream';
 import { RequestService as NodeRequestService } from 'vs/platform/request/node/requestService';
+import { CancellationToken } from 'vscode';
+import { canceled } from 'vs/base/common/errors';
 
 /**
  * This service exposes the `request` API, while using the global
  * or configured proxy settings.
  */
 export class RequestService extends NodeRequestService {
-	request(options: IRequestOptions): TPromise<IRequestContext> {
-		return super.request(options, xhrRequest);
+	request(options: IRequestOptions, token: CancellationToken): TPromise<IRequestContext> {
+		return super.request(options, token, xhrRequest);
 	}
 }
 
-export const xhrRequest: IRequestFunction = (options: IRequestOptions): TPromise<IRequestContext> => {
+export const xhrRequest: IRequestFunction = (options: IRequestOptions, token: CancellationToken): TPromise<IRequestContext> => {
 
 	const xhr = new XMLHttpRequest();
 	return new TPromise<IRequestContext>((resolve, reject) => {
@@ -66,12 +68,14 @@ export const xhrRequest: IRequestFunction = (options: IRequestOptions): TPromise
 			xhr.timeout = options.timeout;
 		}
 
-		xhr.send(options.data);
-		return null;
+		// TODO: remove any
+		xhr.send(options.data as any);
 
-	}, () => {
 		// cancel
-		xhr.abort();
+		token.onCancellationRequested(() => {
+			xhr.abort();
+			reject(canceled());
+		});
 	});
 };
 
diff --git a/src/vs/platform/request/electron-main/requestService.ts b/src/vs/platform/request/electron-main/requestService.ts
index 2d583abe0cd..e1b05b56ac6 100644
--- a/src/vs/platform/request/electron-main/requestService.ts
+++ b/src/vs/platform/request/electron-main/requestService.ts
@@ -9,6 +9,7 @@ import { IRequestOptions, IRequestContext, request, IRawRequestFunction } from '
 import { RequestService as NodeRequestService } from 'vs/platform/request/node/requestService';
 import { assign } from 'vs/base/common/objects';
 import { net } from 'electron';
+import { CancellationToken } from 'vs/base/common/cancellation';
 
 function getRawRequest(options: IRequestOptions): IRawRequestFunction {
 	return net.request as any as IRawRequestFunction;
@@ -16,7 +17,7 @@ function getRawRequest(options: IRequestOptions): IRawRequestFunction {
 
 export class RequestService extends NodeRequestService {
 
-	request(options: IRequestOptions): TPromise<IRequestContext> {
-		return super.request(options, options => request(assign({}, options || {}, { getRawRequest })));
+	request(options: IRequestOptions, token: CancellationToken): TPromise<IRequestContext> {
+		return super.request(options, token, options => request(assign({}, options || {}, { getRawRequest }), token));
 	}
-}
\ No newline at end of file
+}
diff --git a/src/vs/platform/request/node/request.ts b/src/vs/platform/request/node/request.ts
index b8d501fa2b5..a7bbfc284e5 100644
--- a/src/vs/platform/request/node/request.ts
+++ b/src/vs/platform/request/node/request.ts
@@ -10,13 +10,14 @@ import { createDecorator } from 'vs/platform/instantiation/common/instantiation'
 import { IRequestOptions, IRequestContext } from 'vs/base/node/request';
 import { IConfigurationRegistry, Extensions } from 'vs/platform/configuration/common/configurationRegistry';
 import { Registry } from 'vs/platform/registry/common/platform';
+import { CancellationToken } from 'vs/base/common/cancellation';
 
 export const IRequestService = createDecorator<IRequestService>('requestService2');
 
 export interface IRequestService {
 	_serviceBrand: any;
 
-	request(options: IRequestOptions): TPromise<IRequestContext>;
+	request(options: IRequestOptions, token: CancellationToken): TPromise<IRequestContext>;
 }
 
 export interface IHTTPConfiguration {
@@ -37,12 +38,12 @@ Registry.as<IConfigurationRegistry>(Extensions.Configuration)
 			'http.proxy': {
 				type: 'string',
 				pattern: '^https?://([^:]*(:[^@]*)?@)?([^:]+)(:\\d+)?/?$|^$',
-				description: localize('proxy', "The proxy setting to use. If not set will be taken from the http_proxy and https_proxy environment variables")
+				description: localize('proxy', "The proxy setting to use. If not set will be taken from the http_proxy and https_proxy environment variables.")
 			},
 			'http.proxyStrictSSL': {
 				type: 'boolean',
 				default: true,
-				description: localize('strictSSL', "Whether the proxy server certificate should be verified against the list of supplied CAs.")
+				description: localize('strictSSL', "Controls whether the proxy server certificate should be verified against the list of supplied CAs.")
 			},
 			'http.proxyAuthorization': {
 				type: ['null', 'string'],
@@ -50,4 +51,4 @@ Registry.as<IConfigurationRegistry>(Extensions.Configuration)
 				description: localize('proxyAuthorization', "The value to send as the 'Proxy-Authorization' header for every network request.")
 			}
 		}
-	});
\ No newline at end of file
+	});
diff --git a/src/vs/platform/request/node/requestService.ts b/src/vs/platform/request/node/requestService.ts
index 0f57b4e35ba..711f4561315 100644
--- a/src/vs/platform/request/node/requestService.ts
+++ b/src/vs/platform/request/node/requestService.ts
@@ -12,6 +12,7 @@ import { getProxyAgent } from 'vs/base/node/proxy';
 import { IRequestService, IHTTPConfiguration } from 'vs/platform/request/node/request';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { ILogService } from 'vs/platform/log/common/log';
+import { CancellationToken } from 'vs/base/common/cancellation';
 
 /**
  * This service exposes the `request` API, while using the global
@@ -40,18 +41,21 @@ export class RequestService implements IRequestService {
 		this.authorization = config.http && config.http.proxyAuthorization;
 	}
 
-	async request(options: IRequestOptions, requestFn: IRequestFunction = request): TPromise<IRequestContext> {
+	request(options: IRequestOptions, token: CancellationToken, requestFn: IRequestFunction = request): TPromise<IRequestContext> {
 		this.logService.trace('RequestService#request', options.url);
 
 		const { proxyUrl, strictSSL } = this;
+		const agentPromise = options.agent ? TPromise.wrap(options.agent) : TPromise.wrap(getProxyAgent(options.url, { proxyUrl, strictSSL }));
 
-		options.agent = options.agent || await getProxyAgent(options.url, { proxyUrl, strictSSL });
-		options.strictSSL = strictSSL;
+		return agentPromise.then(agent => {
+			options.agent = agent;
+			options.strictSSL = strictSSL;
 
-		if (this.authorization) {
-			options.headers = assign(options.headers || {}, { 'Proxy-Authorization': this.authorization });
-		}
+			if (this.authorization) {
+				options.headers = assign(options.headers || {}, { 'Proxy-Authorization': this.authorization });
+			}
 
-		return requestFn(options);
+			return requestFn(options, token);
+		});
 	}
 }
diff --git a/src/vs/platform/search/common/search.ts b/src/vs/platform/search/common/search.ts
index ded634a58a4..6196383c8df 100644
--- a/src/vs/platform/search/common/search.ts
+++ b/src/vs/platform/search/common/search.ts
@@ -9,10 +9,11 @@ import * as glob from 'vs/base/common/glob';
 import { IDisposable } from 'vs/base/common/lifecycle';
 import * as objects from 'vs/base/common/objects';
 import * as paths from 'vs/base/common/paths';
-import uri, { UriComponents } from 'vs/base/common/uri';
-import { PPromise, TPromise } from 'vs/base/common/winjs.base';
+import { URI as uri, UriComponents } from 'vs/base/common/uri';
+import { TPromise } from 'vs/base/common/winjs.base';
 import { IFilesConfiguration } from 'vs/platform/files/common/files';
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
+import { CancellationToken } from 'vs/base/common/cancellation';
 
 export const VIEW_ID = 'workbench.view.search';
 
@@ -24,10 +25,10 @@ export const ISearchService = createDecorator<ISearchService>('searchService');
  */
 export interface ISearchService {
 	_serviceBrand: any;
-	search(query: ISearchQuery): PPromise<ISearchComplete, ISearchProgressItem>;
+	search(query: ISearchQuery, token?: CancellationToken, onProgress?: (result: ISearchProgressItem) => void): TPromise<ISearchComplete>;
 	extendQuery(query: ISearchQuery): void;
 	clearCache(cacheKey: string): TPromise<void>;
-	registerSearchResultProvider(provider: ISearchResultProvider): IDisposable;
+	registerSearchResultProvider(scheme: string, type: SearchProviderType, provider: ISearchResultProvider): IDisposable;
 }
 
 export interface ISearchHistoryValues {
@@ -45,8 +46,18 @@ export interface ISearchHistoryService {
 	save(history: ISearchHistoryValues): void;
 }
 
+/**
+ * TODO@roblou - split text from file search entirely, or share code in a more natural way.
+ */
+export const enum SearchProviderType {
+	file,
+	fileIndex,
+	text
+}
+
 export interface ISearchResultProvider {
-	search(query: ISearchQuery): PPromise<ISearchComplete, ISearchProgressItem>;
+	search(query: ISearchQuery, onProgress?: (p: ISearchProgressItem) => void, token?: CancellationToken): TPromise<ISearchComplete>;
+	clearCache(cacheKey: string): TPromise<void>;
 }
 
 export interface IFolderQuery<U extends UriComponents=uri> {
@@ -75,6 +86,7 @@ export interface ICommonQueryOptions<U> {
 	disregardExcludeSettings?: boolean;
 	ignoreSymlinks?: boolean;
 	maxFileSize?: number;
+	previewOptions?: ITextSearchPreviewOptions;
 }
 
 export interface IQueryOptions extends ICommonQueryOptions<uri> {
@@ -95,7 +107,7 @@ export interface ISearchQueryProps<U extends UriComponents> extends ICommonQuery
 export type ISearchQuery = ISearchQueryProps<uri>;
 export type IRawSearchQuery = ISearchQueryProps<UriComponents>;
 
-export enum QueryType {
+export const enum QueryType {
 	File = 1,
 	Text = 2
 }
@@ -122,15 +134,33 @@ export interface IPatternInfo {
 
 export interface IFileMatch<U extends UriComponents = uri> {
 	resource?: U;
-	lineMatches?: ILineMatch[];
+	matches?: ITextSearchResult[];
 }
 
 export type IRawFileMatch2 = IFileMatch<UriComponents>;
 
-export interface ILineMatch {
-	preview: string;
-	lineNumber: number;
-	offsetAndLengths: number[][];
+export interface ITextSearchPreviewOptions {
+	maxLines: number;
+	leadingChars: number;
+	totalChars: number;
+}
+
+export interface ISearchRange {
+	readonly startLineNumber: number;
+	readonly startColumn: number;
+	readonly endLineNumber: number;
+	readonly endColumn: number;
+}
+
+export interface ITextSearchResultPreview {
+	text: string;
+	match: ISearchRange;
+}
+
+export interface ITextSearchResult {
+	uri?: uri;
+	range: ISearchRange;
+	preview: ITextSearchResultPreview;
 }
 
 export interface IProgress {
@@ -145,53 +175,97 @@ export interface ISearchProgressItem extends IFileMatch, IProgress {
 
 export interface ISearchCompleteStats {
 	limitHit?: boolean;
-	stats?: ISearchStats;
+	stats?: IFileSearchStats | ITextSearchStats;
 }
 
 export interface ISearchComplete extends ISearchCompleteStats {
 	results: IFileMatch[];
 }
 
-export interface ISearchStats {
+export interface ITextSearchStats {
+	type: 'textSearchProvider' | 'searchProcess';
+}
+
+export interface IFileSearchStats {
 	fromCache: boolean;
+	detailStats: ISearchEngineStats | ICachedSearchStats | IFileSearchProviderStats | IFileIndexProviderStats;
+
 	resultCount: number;
-	unsortedResultTime?: number;
-	sortedResultTime?: number;
+	type: 'fileIndexProvider' | 'fileSearchProvider' | 'searchProcess';
+	sortingTime?: number;
 }
 
-export interface ICachedSearchStats extends ISearchStats {
-	cacheLookupStartTime: number;
-	cacheFilterStartTime: number;
-	cacheLookupResultTime: number;
+export interface ICachedSearchStats {
+	cacheWasResolved: boolean;
+	cacheLookupTime: number;
+	cacheFilterTime: number;
 	cacheEntryCount: number;
-	joined?: ISearchStats;
 }
 
-export interface IUncachedSearchStats extends ISearchStats {
+export interface ISearchEngineStats {
 	traversal: string;
-	errors: string[];
-	fileWalkStartTime: number;
-	fileWalkResultTime: number;
+	fileWalkTime: number;
 	directoriesWalked: number;
 	filesWalked: number;
-	cmdForkStartTime?: number;
-	cmdForkResultTime?: number;
+	cmdTime: number;
 	cmdResultCount?: number;
 }
 
+export interface IFileSearchProviderStats {
+	providerTime: number;
+	postProcessTime: number;
+}
 
-// ---- very simple implementation of the search model --------------------
+export interface IFileIndexProviderStats {
+	providerTime: number;
+	providerResultCount: number;
+	fileWalkTime: number;
+	directoriesWalked: number;
+	filesWalked: number;
+}
 
 export class FileMatch implements IFileMatch {
-	public lineMatches: LineMatch[] = [];
+	public matches: ITextSearchResult[] = [];
 	constructor(public resource: uri) {
 		// empty
 	}
 }
 
-export class LineMatch implements ILineMatch {
-	constructor(public preview: string, public lineNumber: number, public offsetAndLengths: number[][]) {
-		// empty
+export class TextSearchResult implements ITextSearchResult {
+	range: ISearchRange;
+	preview: ITextSearchResultPreview;
+
+	constructor(fullLine: string, range: ISearchRange, previewOptions?: ITextSearchPreviewOptions) {
+		this.range = range;
+		if (previewOptions) {
+			const previewStart = Math.max(range.startColumn - previewOptions.leadingChars, 0);
+			const previewEnd = previewOptions.totalChars + previewStart;
+			const endOfMatchRangeInPreview = Math.min(previewEnd, range.endColumn - previewStart);
+
+			this.preview = {
+				text: fullLine.substring(previewStart, previewEnd),
+				match: new OneLineRange(0, range.startColumn - previewStart, endOfMatchRangeInPreview)
+			};
+		} else {
+			this.preview = {
+				text: fullLine,
+				match: new OneLineRange(0, range.startColumn, range.endColumn)
+			};
+		}
+	}
+}
+
+export class OneLineRange implements ISearchRange {
+	startLineNumber: number;
+	startColumn: number;
+	endLineNumber: number;
+	endColumn: number;
+
+	constructor(lineNumber: number, startColumn: number, endColumn: number) {
+		this.startLineNumber = lineNumber;
+		this.startColumn = startColumn;
+		this.endLineNumber = lineNumber;
+		this.endColumn = endColumn;
 	}
 }
 
diff --git a/src/vs/platform/search/test/common/search.test.ts b/src/vs/platform/search/test/common/search.test.ts
new file mode 100644
index 00000000000..c56b87b33a8
--- /dev/null
+++ b/src/vs/platform/search/test/common/search.test.ts
@@ -0,0 +1,115 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+'use strict';
+
+import * as assert from 'assert';
+import { TextSearchResult, OneLineRange, ITextSearchResult, ITextSearchPreviewOptions } from 'vs/platform/search/common/search';
+
+suite('TextSearchResult', () => {
+
+	const previewOptions1: ITextSearchPreviewOptions = {
+		leadingChars: 10,
+		maxLines: 1,
+		totalChars: 100
+	};
+
+	test('empty', () => {
+		assert.deepEqual(
+			new TextSearchResult('', new OneLineRange(5, 0, 0)),
+			<ITextSearchResult>{
+				preview: {
+					text: '',
+					match: new OneLineRange(0, 0, 0)
+				},
+				range: new OneLineRange(5, 0, 0)
+			});
+
+		assert.deepEqual(
+			new TextSearchResult('', new OneLineRange(5, 0, 0), previewOptions1),
+			<ITextSearchResult>{
+				preview: {
+					text: '',
+					match: new OneLineRange(0, 0, 0)
+				},
+				range: new OneLineRange(5, 0, 0)
+			});
+	});
+
+	test('short', () => {
+		assert.deepEqual(
+			new TextSearchResult('foo bar', new OneLineRange(5, 4, 7)),
+			<ITextSearchResult>{
+				preview: {
+					text: 'foo bar',
+					match: new OneLineRange(0, 4, 7)
+				},
+				range: new OneLineRange(5, 4, 7)
+			});
+
+		assert.deepEqual(
+			new TextSearchResult('foo bar', new OneLineRange(5, 4, 7), previewOptions1),
+			<ITextSearchResult>{
+				preview: {
+					text: 'foo bar',
+					match: new OneLineRange(0, 4, 7)
+				},
+				range: new OneLineRange(5, 4, 7)
+			});
+	});
+
+	test('leading', () => {
+		assert.deepEqual(
+			new TextSearchResult('long text very long text foo', new OneLineRange(5, 25, 28), previewOptions1),
+			<ITextSearchResult>{
+				preview: {
+					text: 'long text foo',
+					match: new OneLineRange(0, 10, 13)
+				},
+				range: new OneLineRange(5, 25, 28)
+			});
+	});
+
+	test('trailing', () => {
+		assert.deepEqual(
+			new TextSearchResult('foo long text very long text long text very long text long text very long text long text very long text long text very long text', new OneLineRange(5, 0, 3), previewOptions1),
+			<ITextSearchResult>{
+				preview: {
+					text: 'foo long text very long text long text very long text long text very long text long text very long t',
+					match: new OneLineRange(0, 0, 3)
+				},
+				range: new OneLineRange(5, 0, 3)
+			});
+	});
+
+	test('middle', () => {
+		assert.deepEqual(
+			new TextSearchResult('long text very long text long foo text very long text long text very long text long text very long text long text very long text', new OneLineRange(5, 30, 33), previewOptions1),
+			<ITextSearchResult>{
+				preview: {
+					text: 'text long foo text very long text long text very long text long text very long text long text very l',
+					match: new OneLineRange(0, 10, 13)
+				},
+				range: new OneLineRange(5, 30, 33)
+			});
+	});
+
+	test('truncating match', () => {
+		const previewOptions: ITextSearchPreviewOptions = {
+			leadingChars: 4,
+			maxLines: 1,
+			totalChars: 5
+		};
+
+		assert.deepEqual(
+			new TextSearchResult('foo bar', new OneLineRange(0, 4, 7), previewOptions),
+			<ITextSearchResult>{
+				preview: {
+					text: 'foo b',
+					match: new OneLineRange(0, 4, 5)
+				},
+				range: new OneLineRange(0, 4, 7)
+			});
+	});
+});
\ No newline at end of file
diff --git a/src/vs/platform/state/node/stateService.ts b/src/vs/platform/state/node/stateService.ts
index 12e1682db58..5238541eac1 100644
--- a/src/vs/platform/state/node/stateService.ts
+++ b/src/vs/platform/state/node/stateService.ts
@@ -6,7 +6,7 @@
 'use strict';
 
 import * as path from 'path';
-import * as fs from 'original-fs';
+import * as fs from 'fs';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { writeFileAndFlushSync } from 'vs/base/node/extfs';
 import { isUndefined, isUndefinedOrNull } from 'vs/base/common/types';
@@ -25,7 +25,7 @@ export class FileStorage {
 		}
 	}
 
-	public getItem<T>(key: string, defaultValue?: T): T {
+	getItem<T>(key: string, defaultValue?: T): T {
 		this.ensureLoaded();
 
 		const res = this.database[key];
@@ -36,7 +36,7 @@ export class FileStorage {
 		return res;
 	}
 
-	public setItem(key: string, data: any): void {
+	setItem(key: string, data: any): void {
 		this.ensureLoaded();
 
 		// Remove an item when it is undefined or null
@@ -55,7 +55,7 @@ export class FileStorage {
 		this.saveSync();
 	}
 
-	public removeItem(key: string): void {
+	removeItem(key: string): void {
 		this.ensureLoaded();
 
 		// Only update if the key is actually present (not undefined)
@@ -96,15 +96,15 @@ export class StateService implements IStateService {
 		this.fileStorage = new FileStorage(path.join(environmentService.userDataPath, 'storage.json'), error => logService.error(error));
 	}
 
-	public getItem<T>(key: string, defaultValue?: T): T {
+	getItem<T>(key: string, defaultValue?: T): T {
 		return this.fileStorage.getItem(key, defaultValue);
 	}
 
-	public setItem(key: string, data: any): void {
+	setItem(key: string, data: any): void {
 		this.fileStorage.setItem(key, data);
 	}
 
-	public removeItem(key: string): void {
+	removeItem(key: string): void {
 		this.fileStorage.removeItem(key);
 	}
 }
diff --git a/src/vs/platform/statusbar/common/statusbar.ts b/src/vs/platform/statusbar/common/statusbar.ts
index fffa1184e33..ec01e18ab13 100644
--- a/src/vs/platform/statusbar/common/statusbar.ts
+++ b/src/vs/platform/statusbar/common/statusbar.ts
@@ -11,7 +11,7 @@ import { ThemeColor } from 'vs/platform/theme/common/themeService';
 
 export const IStatusbarService = createDecorator<IStatusbarService>('statusbarService');
 
-export enum StatusbarAlignment {
+export const enum StatusbarAlignment {
 	LEFT, RIGHT
 }
 
diff --git a/src/vs/platform/storage/common/migration.ts b/src/vs/platform/storage/common/migration.ts
index 652ad4fdf5a..0e7a42f6e6c 100644
--- a/src/vs/platform/storage/common/migration.ts
+++ b/src/vs/platform/storage/common/migration.ts
@@ -7,7 +7,7 @@
 
 import { IStorage, StorageService } from 'vs/platform/storage/common/storageService';
 import { endsWith, startsWith, rtrim } from 'vs/base/common/strings';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { IWorkspaceIdentifier } from 'vs/platform/workspaces/common/workspaces';
 
 /**
diff --git a/src/vs/platform/storage/common/storage.ts b/src/vs/platform/storage/common/storage.ts
index 3f42a96053d..5d0c1161567 100644
--- a/src/vs/platform/storage/common/storage.ts
+++ b/src/vs/platform/storage/common/storage.ts
@@ -54,7 +54,7 @@ export interface IStorageService {
 	getBoolean(key: string, scope?: StorageScope, defaultValue?: boolean): boolean;
 }
 
-export enum StorageScope {
+export const enum StorageScope {
 
 	/**
 	 * The stored data will be scoped to all workspaces of this domain.
diff --git a/src/vs/platform/storage/common/storageService.ts b/src/vs/platform/storage/common/storageService.ts
index a15769237a5..cd60f29cd2e 100644
--- a/src/vs/platform/storage/common/storageService.ts
+++ b/src/vs/platform/storage/common/storageService.ts
@@ -21,13 +21,13 @@ export interface IStorage {
 
 export class StorageService implements IStorageService {
 
-	public _serviceBrand: any;
+	_serviceBrand: any;
 
-	public static readonly COMMON_PREFIX = 'storage://';
-	public static readonly GLOBAL_PREFIX = `${StorageService.COMMON_PREFIX}global/`;
-	public static readonly WORKSPACE_PREFIX = `${StorageService.COMMON_PREFIX}workspace/`;
-	public static readonly WORKSPACE_IDENTIFIER = 'workspaceidentifier';
-	public static readonly NO_WORKSPACE_IDENTIFIER = '__$noWorkspace__';
+	static readonly COMMON_PREFIX = 'storage://';
+	static readonly GLOBAL_PREFIX = `${StorageService.COMMON_PREFIX}global/`;
+	static readonly WORKSPACE_PREFIX = `${StorageService.COMMON_PREFIX}workspace/`;
+	static readonly WORKSPACE_IDENTIFIER = 'workspaceidentifier';
+	static readonly NO_WORKSPACE_IDENTIFIER = '__$noWorkspace__';
 
 	private _workspaceStorage: IStorage;
 	private _globalStorage: IStorage;
@@ -47,11 +47,11 @@ export class StorageService implements IStorageService {
 		this.setWorkspaceId(workspaceId, legacyWorkspaceId);
 	}
 
-	public get workspaceId(): string {
+	get workspaceId(): string {
 		return this._workspaceId;
 	}
 
-	public setWorkspaceId(workspaceId: string, legacyWorkspaceId?: number): void {
+	setWorkspaceId(workspaceId: string, legacyWorkspaceId?: number): void {
 		this._workspaceId = workspaceId;
 
 		// Calculate workspace storage key
@@ -64,11 +64,11 @@ export class StorageService implements IStorageService {
 		}
 	}
 
-	public get globalStorage(): IStorage {
+	get globalStorage(): IStorage {
 		return this._globalStorage;
 	}
 
-	public get workspaceStorage(): IStorage {
+	get workspaceStorage(): IStorage {
 		return this._workspaceStorage;
 	}
 
@@ -124,7 +124,7 @@ export class StorageService implements IStorageService {
 		}
 	}
 
-	public store(key: string, value: any, scope = StorageScope.GLOBAL): void {
+	store(key: string, value: any, scope = StorageScope.GLOBAL): void {
 		const storage = (scope === StorageScope.GLOBAL) ? this._globalStorage : this._workspaceStorage;
 
 		if (types.isUndefinedOrNull(value)) {
@@ -142,7 +142,7 @@ export class StorageService implements IStorageService {
 		}
 	}
 
-	public get(key: string, scope = StorageScope.GLOBAL, defaultValue?: any): string {
+	get(key: string, scope = StorageScope.GLOBAL, defaultValue?: any): string {
 		const storage = (scope === StorageScope.GLOBAL) ? this._globalStorage : this._workspaceStorage;
 
 		const value = storage.getItem(this.toStorageKey(key, scope));
@@ -153,7 +153,7 @@ export class StorageService implements IStorageService {
 		return value;
 	}
 
-	public getInteger(key: string, scope = StorageScope.GLOBAL, defaultValue?: number): number {
+	getInteger(key: string, scope = StorageScope.GLOBAL, defaultValue?: number): number {
 		const value = this.get(key, scope, defaultValue);
 
 		if (types.isUndefinedOrNull(value)) {
@@ -163,7 +163,7 @@ export class StorageService implements IStorageService {
 		return parseInt(value, 10);
 	}
 
-	public getBoolean(key: string, scope = StorageScope.GLOBAL, defaultValue?: boolean): boolean {
+	getBoolean(key: string, scope = StorageScope.GLOBAL, defaultValue?: boolean): boolean {
 		const value = this.get(key, scope, defaultValue);
 
 		if (types.isUndefinedOrNull(value)) {
@@ -177,7 +177,7 @@ export class StorageService implements IStorageService {
 		return value ? true : false;
 	}
 
-	public remove(key: string, scope = StorageScope.GLOBAL): void {
+	remove(key: string, scope = StorageScope.GLOBAL): void {
 		const storage = (scope === StorageScope.GLOBAL) ? this._globalStorage : this._workspaceStorage;
 		const storageKey = this.toStorageKey(key, scope);
 
@@ -201,11 +201,11 @@ export class InMemoryLocalStorage implements IStorage {
 		this.store = {};
 	}
 
-	public get length() {
+	get length() {
 		return Object.keys(this.store).length;
 	}
 
-	public key(index: number): string {
+	key(index: number): string {
 		const keys = Object.keys(this.store);
 		if (keys.length > index) {
 			return keys[index];
@@ -214,11 +214,11 @@ export class InMemoryLocalStorage implements IStorage {
 		return null;
 	}
 
-	public setItem(key: string, value: any): void {
+	setItem(key: string, value: any): void {
 		this.store[key] = value.toString();
 	}
 
-	public getItem(key: string): string {
+	getItem(key: string): string {
 		const item = this.store[key];
 		if (!types.isUndefinedOrNull(item)) {
 			return item;
@@ -227,7 +227,7 @@ export class InMemoryLocalStorage implements IStorage {
 		return null;
 	}
 
-	public removeItem(key: string): void {
+	removeItem(key: string): void {
 		delete this.store[key];
 	}
 }
diff --git a/src/vs/platform/storage/test/browser/migration.test.ts b/src/vs/platform/storage/test/browser/migration.test.ts
index 2750a3b2699..9e866cc4ca7 100644
--- a/src/vs/platform/storage/test/browser/migration.test.ts
+++ b/src/vs/platform/storage/test/browser/migration.test.ts
@@ -8,7 +8,7 @@
 import * as assert from 'assert';
 import { StorageService } from 'vs/platform/storage/common/storageService';
 import { parseStorage, migrateStorageToMultiRootWorkspace } from 'vs/platform/storage/common/migration';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { StorageScope } from 'vs/platform/storage/common/storage';
 import { startsWith } from 'vs/base/common/strings';
 
diff --git a/src/vs/platform/telemetry/common/experiments.ts b/src/vs/platform/telemetry/common/experiments.ts
deleted file mode 100644
index 861a0a14621..00000000000
--- a/src/vs/platform/telemetry/common/experiments.ts
+++ /dev/null
@@ -1,92 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-'use strict';
-
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IStorageService } from 'vs/platform/storage/common/storage';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { deepClone } from 'vs/base/common/objects';
-
-/* __GDPR__FRAGMENT__
-	"IExperiments" : {
-	}
-*/
-export interface IExperiments {
-}
-
-export const IExperimentService = createDecorator<IExperimentService>('experimentService');
-
-export interface IExperimentService {
-
-	_serviceBrand: any;
-
-	getExperiments(): IExperiments;
-}
-
-export class ExperimentService implements IExperimentService {
-
-	_serviceBrand: any;
-
-	private experiments: IExperiments = {}; // Shortcut while there are no experiments.
-
-	constructor(
-		@IStorageService private storageService: IStorageService,
-		@IConfigurationService private configurationService: IConfigurationService,
-	) { }
-
-	getExperiments() {
-		if (!this.experiments) {
-			this.experiments = loadExperiments(this.storageService, this.configurationService);
-		}
-		return this.experiments;
-	}
-}
-
-function loadExperiments(storageService: IStorageService, configurationService: IConfigurationService): IExperiments {
-	const experiments = splitExperimentsRandomness(storageService);
-	return applyOverrides(experiments, configurationService);
-}
-
-function applyOverrides(experiments: IExperiments, configurationService: IConfigurationService): IExperiments {
-	const experimentsConfig = getExperimentsOverrides(configurationService);
-	Object.keys(experiments).forEach(key => {
-		if (key in experimentsConfig) {
-			experiments[key] = experimentsConfig[key];
-		}
-	});
-	return experiments;
-}
-
-function splitExperimentsRandomness(storageService: IStorageService): IExperiments {
-	const random1 = getExperimentsRandomness(storageService);
-	const [/* random2 */, /* ripgrepQuickSearch */] = splitRandom(random1);
-	// const [/* random3 */, /* deployToAzureQuickLink */] = splitRandom(random2);
-	// const [random4, /* mergeQuickLinks */] = splitRandom(random3);
-	// const [random5, /* enableWelcomePage */] = splitRandom(random4);
-	return {
-		// ripgrepQuickSearch,
-	};
-}
-
-function getExperimentsRandomness(storageService: IStorageService) {
-	const key = 'experiments.randomness';
-	let valueString = storageService.get(key);
-	if (!valueString) {
-		valueString = Math.random().toString();
-		storageService.store(key, valueString);
-	}
-
-	return parseFloat(valueString);
-}
-
-function splitRandom(random: number): [number, boolean] {
-	const scaled = random * 2;
-	const i = Math.floor(scaled);
-	return [scaled - i, i === 1];
-}
-
-function getExperimentsOverrides(configurationService: IConfigurationService): IExperiments {
-	return deepClone(configurationService.getValue<any>('experiments')) || {};
-}
diff --git a/src/vs/platform/telemetry/common/telemetryIpc.ts b/src/vs/platform/telemetry/common/telemetryIpc.ts
deleted file mode 100644
index df3b884b3ed..00000000000
--- a/src/vs/platform/telemetry/common/telemetryIpc.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-'use strict';
-
-import { TPromise } from 'vs/base/common/winjs.base';
-import { IChannel } from 'vs/base/parts/ipc/common/ipc';
-import { ITelemetryAppender } from 'vs/platform/telemetry/common/telemetryUtils';
-
-export interface ITelemetryLog {
-	eventName: string;
-	data?: any;
-}
-
-export interface ITelemetryAppenderChannel extends IChannel {
-	call(command: 'log', data: ITelemetryLog): TPromise<void>;
-	call(command: string, arg: any): TPromise<any>;
-}
-
-export class TelemetryAppenderChannel implements ITelemetryAppenderChannel {
-
-	constructor(private appender: ITelemetryAppender) { }
-
-	call(command: string, { eventName, data }: ITelemetryLog): TPromise<any> {
-		this.appender.log(eventName, data);
-		return TPromise.as(null);
-	}
-}
-
-export class TelemetryAppenderClient implements ITelemetryAppender {
-
-	constructor(private channel: ITelemetryAppenderChannel) { }
-
-	log(eventName: string, data?: any): any {
-		this.channel.call('log', { eventName, data })
-			.done(null, err => `Failed to log telemetry: ${console.warn(err)}`);
-
-		return TPromise.as(null);
-	}
-
-	dispose(): any {
-		// TODO
-	}
-}
\ No newline at end of file
diff --git a/src/vs/platform/telemetry/common/telemetryService.ts b/src/vs/platform/telemetry/common/telemetryService.ts
index dba27cde4b1..72b7d856930 100644
--- a/src/vs/platform/telemetry/common/telemetryService.ts
+++ b/src/vs/platform/telemetry/common/telemetryService.ts
@@ -21,7 +21,6 @@ export interface ITelemetryServiceConfig {
 	appender: ITelemetryAppender;
 	commonProperties?: TPromise<{ [name: string]: any }>;
 	piiPaths?: string[];
-	userOptIn?: boolean;
 }
 
 export class TelemetryService implements ITelemetryService {
@@ -46,7 +45,7 @@ export class TelemetryService implements ITelemetryService {
 		this._appender = config.appender;
 		this._commonProperties = config.commonProperties || TPromise.as({});
 		this._piiPaths = config.piiPaths || [];
-		this._userOptIn = typeof config.userOptIn === 'undefined' ? true : config.userOptIn;
+		this._userOptIn = true;
 
 		// static cleanup pattern for: `file:///DANGEROUS/PATH/resources/app/Useful/Information`
 		this._cleanupPatterns = [/file:\/\/\/.*?\/resources\/app\//gi];
@@ -167,8 +166,9 @@ Registry.as<IConfigurationRegistry>(Extensions.Configuration).registerConfigurat
 	'properties': {
 		'telemetry.enableTelemetry': {
 			'type': 'boolean',
-			'description': localize('telemetry.enableTelemetry', "Enable usage data and errors to be sent to Microsoft."),
-			'default': true
+			'description': localize('telemetry.enableTelemetry', "Enable usage data and errors to be sent to a Microsoft online service."),
+			'default': true,
+			'tags': ['usesOnlineServices']
 		}
 	}
 });
\ No newline at end of file
diff --git a/src/vs/platform/telemetry/common/telemetryUtils.ts b/src/vs/platform/telemetry/common/telemetryUtils.ts
index 60edb06869e..a098c7723c1 100644
--- a/src/vs/platform/telemetry/common/telemetryUtils.ts
+++ b/src/vs/platform/telemetry/common/telemetryUtils.ts
@@ -8,10 +8,11 @@ import { TPromise } from 'vs/base/common/winjs.base';
 import { IDisposable } from 'vs/base/common/lifecycle';
 import { guessMimeTypes } from 'vs/base/common/mime';
 import * as paths from 'vs/base/common/paths';
-import URI from 'vs/base/common/uri';
-import { IConfigurationService, ConfigurationTarget } from 'vs/platform/configuration/common/configuration';
+import { URI } from 'vs/base/common/uri';
+import { IConfigurationService, ConfigurationTarget, ConfigurationTargetToString } from 'vs/platform/configuration/common/configuration';
 import { IKeybindingService, KeybindingSource } from 'vs/platform/keybinding/common/keybinding';
 import { ITelemetryService, ITelemetryInfo, ITelemetryData } from 'vs/platform/telemetry/common/telemetry';
+import { ILogService } from 'vs/platform/log/common/log';
 
 export const NullTelemetryService = new class implements ITelemetryService {
 	_serviceBrand: undefined;
@@ -30,13 +31,38 @@ export const NullTelemetryService = new class implements ITelemetryService {
 
 export interface ITelemetryAppender {
 	log(eventName: string, data: any): void;
+	dispose(): TPromise<any>;
 }
 
 export function combinedAppender(...appenders: ITelemetryAppender[]): ITelemetryAppender {
-	return { log: (e, d) => appenders.forEach(a => a.log(e, d)) };
+	return {
+		log: (e, d) => appenders.forEach(a => a.log(e, d)),
+		dispose: () => TPromise.join(appenders.map(a => a.dispose()))
+	};
 }
 
-export const NullAppender: ITelemetryAppender = { log: () => null };
+export const NullAppender: ITelemetryAppender = { log: () => null, dispose: () => TPromise.as(null) };
+
+
+export class LogAppender implements ITelemetryAppender {
+
+	private commonPropertiesRegex = /^sessionID$|^version$|^timestamp$|^commitHash$|^common\./;
+	constructor(@ILogService private readonly _logService: ILogService) { }
+
+	dispose(): TPromise<any> {
+		return TPromise.as(undefined);
+	}
+
+	log(eventName: string, data: any): void {
+		const strippedData = {};
+		Object.keys(data).forEach(key => {
+			if (!this.commonPropertiesRegex.test(key)) {
+				strippedData[key] = data[key];
+			}
+		});
+		this._logService.trace(`telemetry/${eventName}`, strippedData);
+	}
+}
 
 /* __GDPR__FRAGMENT__
 	"URIDescriptor" : {
@@ -87,8 +113,11 @@ const configurationValueWhitelist = [
 	'editor.multiCursorModifier',
 	'editor.quickSuggestions',
 	'editor.quickSuggestionsDelay',
-	'editor.parameterHints',
+	'editor.parameterHints.enabled',
+	'editor.parameterHints.cycle',
 	'editor.autoClosingBrackets',
+	'editor.autoClosingQuotes',
+	'editor.autoSurround',
 	'editor.autoIndent',
 	'editor.formatOnType',
 	'editor.formatOnPaste',
@@ -126,35 +155,39 @@ const configurationValueWhitelist = [
 	'editor.formatOnSave',
 	'editor.colorDecorators',
 
-	'window.zoomLevel',
-	'files.autoSave',
-	'files.hotExit',
+	'breadcrumbs.enabled',
+	'breadcrumbs.filePath',
+	'breadcrumbs.symbolPath',
+	'breadcrumbs.useQuickPick',
+	'explorer.openEditors.visible',
+	'extensions.autoUpdate',
 	'files.associations',
-	'workbench.statusBar.visible',
+	'files.autoGuessEncoding',
+	'files.autoSave',
+	'files.autoSaveDelay',
+	'files.encoding',
+	'files.eol',
+	'files.hotExit',
 	'files.trimTrailingWhitespace',
 	'git.confirmSync',
-	'workbench.sideBar.location',
-	'window.openFilesInNewWindow',
-	'javascript.validate.enable',
-	'window.restoreWindows',
-	'extensions.autoUpdate',
-	'files.eol',
-	'explorer.openEditors.visible',
-	'workbench.editor.enablePreview',
-	'files.autoSaveDelay',
-	'workbench.editor.showTabs',
-	'files.encoding',
-	'files.autoGuessEncoding',
 	'git.enabled',
 	'http.proxyStrictSSL',
-	'terminal.integrated.fontFamily',
-	'workbench.editor.enablePreviewFromQuickOpen',
-	'workbench.editor.swipeToNavigate',
+	'javascript.validate.enable',
 	'php.builtInCompletions.enable',
 	'php.validate.enable',
 	'php.validate.run',
-	'workbench.welcome.enabled',
+	'terminal.integrated.fontFamily',
+	'window.openFilesInNewWindow',
+	'window.restoreWindows',
+	'window.zoomLevel',
+	'workbench.editor.enablePreview',
+	'workbench.editor.enablePreviewFromQuickOpen',
+	'workbench.editor.showTabs',
+	'workbench.editor.swipeToNavigate',
+	'workbench.sideBar.location',
 	'workbench.startupEditor',
+	'workbench.statusBar.visible',
+	'workbench.welcome.enabled',
 ];
 
 export function configurationTelemetry(telemetryService: ITelemetryService, configurationService: IConfigurationService): IDisposable {
@@ -167,7 +200,7 @@ export function configurationTelemetry(telemetryService: ITelemetryService, conf
 				}
 			*/
 			telemetryService.publicLog('updateConfiguration', {
-				configurationSource: ConfigurationTarget[event.source],
+				configurationSource: ConfigurationTargetToString(event.source),
 				configurationKeys: flattenKeys(event.sourceConfig)
 			});
 			/* __GDPR__
@@ -177,7 +210,7 @@ export function configurationTelemetry(telemetryService: ITelemetryService, conf
 				}
 			*/
 			telemetryService.publicLog('updateConfigurationValues', {
-				configurationSource: ConfigurationTarget[event.source],
+				configurationSource: ConfigurationTargetToString(event.source),
 				configurationValues: flattenValues(event.sourceConfig, configurationValueWhitelist)
 			});
 		}
diff --git a/src/vs/platform/telemetry/node/appInsightsAppender.ts b/src/vs/platform/telemetry/node/appInsightsAppender.ts
index 898f5bfc02c..e8a7ead4570 100644
--- a/src/vs/platform/telemetry/node/appInsightsAppender.ts
+++ b/src/vs/platform/telemetry/node/appInsightsAppender.ts
@@ -9,6 +9,7 @@ import { isObject } from 'vs/base/common/types';
 import { safeStringify, mixin } from 'vs/base/common/objects';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { ITelemetryAppender } from 'vs/platform/telemetry/common/telemetryUtils';
+import { ILogService } from 'vs/platform/log/common/log';
 
 let _initialized = false;
 
@@ -53,7 +54,8 @@ export class AppInsightsAppender implements ITelemetryAppender {
 	constructor(
 		private _eventPrefix: string,
 		private _defaultData: { [key: string]: any },
-		aiKeyOrClientFactory: string | (() => typeof appInsights.client) // allow factory function for testing
+		aiKeyOrClientFactory: string | (() => typeof appInsights.client), // allow factory function for testing
+		@ILogService private _logService?: ILogService
 	) {
 		if (!this._defaultData) {
 			this._defaultData = Object.create(null);
@@ -133,8 +135,12 @@ export class AppInsightsAppender implements ITelemetryAppender {
 			return;
 		}
 		data = mixin(data, this._defaultData);
-		let { properties, measurements } = AppInsightsAppender._getData(data);
-		this._aiClient.trackEvent(this._eventPrefix + '/' + eventName, properties, measurements);
+		data = AppInsightsAppender._getData(data);
+
+		if (this._logService) {
+			this._logService.trace(`telemetry/${eventName}`, data);
+		}
+		this._aiClient.trackEvent(this._eventPrefix + '/' + eventName, data.properties, data.measurements);
 	}
 
 	dispose(): TPromise<any> {
diff --git a/src/vs/platform/telemetry/node/commonProperties.ts b/src/vs/platform/telemetry/node/commonProperties.ts
index e997435d9c1..d02cd24f2de 100644
--- a/src/vs/platform/telemetry/node/commonProperties.ts
+++ b/src/vs/platform/telemetry/node/commonProperties.ts
@@ -22,7 +22,7 @@ export function resolveCommonProperties(commit: string, version: string, machine
 	// __GDPR__COMMON__ "common.platformVersion" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
 	result['common.platformVersion'] = (os.release() || '').replace(/^(\d+)(\.\d+)?(\.\d+)?(.*)/, '$1$2$3');
 	// __GDPR__COMMON__ "common.platform" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-	result['common.platform'] = Platform.Platform[Platform.platform];
+	result['common.platform'] = Platform.PlatformToString(Platform.platform);
 	// __GDPR__COMMON__ "common.nodePlatform" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" }
 	result['common.nodePlatform'] = process.platform;
 	// __GDPR__COMMON__ "common.nodeArch" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" }
diff --git a/src/vs/platform/telemetry/node/telemetryIpc.ts b/src/vs/platform/telemetry/node/telemetryIpc.ts
new file mode 100644
index 00000000000..bbe1c20c9c6
--- /dev/null
+++ b/src/vs/platform/telemetry/node/telemetryIpc.ts
@@ -0,0 +1,51 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+import { TPromise } from 'vs/base/common/winjs.base';
+import { IChannel } from 'vs/base/parts/ipc/node/ipc';
+import { ITelemetryAppender } from 'vs/platform/telemetry/common/telemetryUtils';
+import { Event } from 'vs/base/common/event';
+
+export interface ITelemetryLog {
+	eventName: string;
+	data?: any;
+}
+
+export interface ITelemetryAppenderChannel extends IChannel {
+	call(command: 'log', data: ITelemetryLog): Thenable<void>;
+	call(command: string, arg: any): Thenable<any>;
+}
+
+export class TelemetryAppenderChannel implements ITelemetryAppenderChannel {
+
+	constructor(private appender: ITelemetryAppender) { }
+
+	listen<T>(event: string, arg?: any): Event<T> {
+		throw new Error('No events');
+	}
+
+	call(command: string, { eventName, data }: ITelemetryLog): Thenable<any> {
+		this.appender.log(eventName, data);
+		return TPromise.as(null);
+	}
+}
+
+export class TelemetryAppenderClient implements ITelemetryAppender {
+
+	constructor(private channel: ITelemetryAppenderChannel) { }
+
+	log(eventName: string, data?: any): any {
+		this.channel.call('log', { eventName, data })
+			.then(null, err => `Failed to log telemetry: ${console.warn(err)}`);
+
+		return TPromise.as(null);
+	}
+
+	dispose(): any {
+		// TODO
+	}
+}
\ No newline at end of file
diff --git a/src/vs/platform/telemetry/node/telemetryNodeUtils.ts b/src/vs/platform/telemetry/node/telemetryNodeUtils.ts
index 9f65136e10b..4e8e33d1800 100644
--- a/src/vs/platform/telemetry/node/telemetryNodeUtils.ts
+++ b/src/vs/platform/telemetry/node/telemetryNodeUtils.ts
@@ -5,7 +5,7 @@
 'use strict';
 
 import { TPromise } from 'vs/base/common/winjs.base';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import product from 'vs/platform/node/product';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
diff --git a/src/vs/platform/telemetry/test/electron-browser/appInsightsAppender.test.ts b/src/vs/platform/telemetry/test/electron-browser/appInsightsAppender.test.ts
index a298f26aa91..040a51185f9 100644
--- a/src/vs/platform/telemetry/test/electron-browser/appInsightsAppender.test.ts
+++ b/src/vs/platform/telemetry/test/electron-browser/appInsightsAppender.test.ts
@@ -6,6 +6,7 @@
 
 import * as assert from 'assert';
 import { AppInsightsAppender } from 'vs/platform/telemetry/node/appInsightsAppender';
+import { ILogService, AbstractLogService, LogLevel, DEFAULT_LOG_LEVEL } from 'vs/platform/log/common/log';
 
 interface IAppInsightsEvent {
 	eventName: string;
@@ -39,11 +40,61 @@ class AppInsightsMock {
 	}
 }
 
+class TestableLogService extends AbstractLogService implements ILogService {
+	_serviceBrand: any;
+
+	public logs: string[] = [];
+
+	constructor(logLevel: LogLevel = DEFAULT_LOG_LEVEL) {
+		super();
+		this.setLevel(logLevel);
+	}
+
+	trace(message: string, ...args: any[]): void {
+		if (this.getLevel() <= LogLevel.Trace) {
+			this.logs.push(message + JSON.stringify(args));
+		}
+	}
+
+	debug(message: string, ...args: any[]): void {
+		if (this.getLevel() <= LogLevel.Debug) {
+			this.logs.push(message);
+		}
+	}
+
+	info(message: string, ...args: any[]): void {
+		if (this.getLevel() <= LogLevel.Info) {
+			this.logs.push(message);
+		}
+	}
+
+	warn(message: string | Error, ...args: any[]): void {
+		if (this.getLevel() <= LogLevel.Warning) {
+			this.logs.push(message.toString());
+		}
+	}
+
+	error(message: string, ...args: any[]): void {
+		if (this.getLevel() <= LogLevel.Error) {
+			this.logs.push(message);
+		}
+	}
+
+	critical(message: string, ...args: any[]): void {
+		if (this.getLevel() <= LogLevel.Critical) {
+			this.logs.push(message);
+		}
+	}
+
+	dispose(): void { }
+}
+
 suite('AIAdapter', () => {
 	var appInsightsMock: AppInsightsMock;
 	var adapter: AppInsightsAppender;
 	var prefix = 'prefix';
 
+
 	setup(() => {
 		appInsightsMock = new AppInsightsMock();
 		adapter = new AppInsightsAppender(prefix, undefined, () => appInsightsMock);
@@ -141,4 +192,27 @@ suite('AIAdapter', () => {
 		assert.equal(appInsightsMock.events[0].properties['nestedObj.nestedObj2.nestedObj3'], JSON.stringify({ 'testProperty': 'test' }));
 		assert.equal(appInsightsMock.events[0].measurements['nestedObj.testMeasurement'], 1);
 	});
+
+	test('Do not Log Telemetry if log level is not trace', () => {
+		const logService = new TestableLogService(LogLevel.Info);
+		adapter = new AppInsightsAppender(prefix, { 'common.platform': 'Windows' }, () => appInsightsMock, logService);
+		adapter.log('testEvent', { hello: 'world', isTrue: true, numberBetween1And3: 2 });
+		assert.equal(logService.logs.length, 0);
+	});
+
+	test('Log Telemetry if log level is trace', () => {
+		const logService = new TestableLogService(LogLevel.Trace);
+		adapter = new AppInsightsAppender(prefix, { 'common.platform': 'Windows' }, () => appInsightsMock, logService);
+		adapter.log('testEvent', { hello: 'world', isTrue: true, numberBetween1And3: 2 });
+		assert.equal(logService.logs.length, 1);
+		assert.equal(logService.logs[0], 'telemetry/testEvent' + JSON.stringify([{
+			properties: {
+				hello: 'world',
+				'common.platform': 'Windows'
+			},
+			measurements: {
+				isTrue: 1, numberBetween1And3: 2
+			}
+		}]));
+	});
 });
\ No newline at end of file
diff --git a/src/vs/platform/telemetry/test/electron-browser/telemetryService.test.ts b/src/vs/platform/telemetry/test/electron-browser/telemetryService.test.ts
index d0b935f401d..8cd91f0803b 100644
--- a/src/vs/platform/telemetry/test/electron-browser/telemetryService.test.ts
+++ b/src/vs/platform/telemetry/test/electron-browser/telemetryService.test.ts
@@ -14,8 +14,6 @@ import * as Errors from 'vs/base/common/errors';
 import * as sinon from 'sinon';
 import { getConfigurationValue } from 'vs/platform/configuration/common/configuration';
 
-const optInStatusEventName: string = 'optInStatus';
-
 class TestTelemetryAppender implements ITelemetryAppender {
 
 	public events: any[];
@@ -34,8 +32,9 @@ class TestTelemetryAppender implements ITelemetryAppender {
 		return this.events.length;
 	}
 
-	public dispose() {
+	public dispose(): TPromise<any> {
 		this.isDisposed = true;
+		return TPromise.as(null);
 	}
 }
 
@@ -718,29 +717,9 @@ suite('TelemetryService', () => {
 		}
 	}));
 
-	test('Telemetry Service respects user opt-in settings', sinon.test(function () {
+	test('Telemetry Service sends events when enableTelemetry is on', sinon.test(function () {
 		let testAppender = new TestTelemetryAppender();
-		let service = new TelemetryService({ userOptIn: false, appender: testAppender }, undefined);
-
-		return service.publicLog('testEvent').then(() => {
-			assert.equal(testAppender.getEventsCount(), 0);
-			service.dispose();
-		});
-	}));
-
-	test('Telemetry Service does not sent optInStatus when user opted out', sinon.test(function () {
-		let testAppender = new TestTelemetryAppender();
-		let service = new TelemetryService({ userOptIn: false, appender: testAppender }, undefined);
-
-		return service.publicLog(optInStatusEventName, { optIn: false }).then(() => {
-			assert.equal(testAppender.getEventsCount(), 0);
-			service.dispose();
-		});
-	}));
-
-	test('Telemetry Service sends events when enableTelemetry is on even user optin is on', sinon.test(function () {
-		let testAppender = new TestTelemetryAppender();
-		let service = new TelemetryService({ userOptIn: true, appender: testAppender }, undefined);
+		let service = new TelemetryService({ appender: testAppender }, undefined);
 
 		return service.publicLog('testEvent').then(() => {
 			assert.equal(testAppender.getEventsCount(), 1);
diff --git a/src/vs/platform/theme/common/colorRegistry.ts b/src/vs/platform/theme/common/colorRegistry.ts
index 241993fb8f8..9af7371f18a 100644
--- a/src/vs/platform/theme/common/colorRegistry.ts
+++ b/src/vs/platform/theme/common/colorRegistry.ts
@@ -149,11 +149,11 @@ export function getColorRegistry(): IColorRegistry {
 
 // ----- base colors
 
-export const foreground = registerColor('foreground', { dark: '#CCCCCC', light: '#6C6C6C', hc: '#FFFFFF' }, nls.localize('foreground', "Overall foreground color. This color is only used if not overridden by a component."));
+export const foreground = registerColor('foreground', { dark: '#CCCCCC', light: '#616161', hc: '#FFFFFF' }, nls.localize('foreground', "Overall foreground color. This color is only used if not overridden by a component."));
 export const errorForeground = registerColor('errorForeground', { dark: '#F48771', light: '#A1260D', hc: '#F48771' }, nls.localize('errorForeground', "Overall foreground color for error messages. This color is only used if not overridden by a component."));
-export const descriptionForeground = registerColor('descriptionForeground', { light: transparent(foreground, 0.7), dark: transparent(foreground, 0.7), hc: transparent(foreground, 0.7) }, nls.localize('descriptionForeground', "Foreground color for description text providing additional information, for example for a label."));
+export const descriptionForeground = registerColor('descriptionForeground', { light: '#717171', dark: transparent(foreground, 0.7), hc: transparent(foreground, 0.7) }, nls.localize('descriptionForeground', "Foreground color for description text providing additional information, for example for a label."));
 
-export const focusBorder = registerColor('focusBorder', { dark: Color.fromHex('#0E639C').transparent(0.6), light: Color.fromHex('#007ACC').transparent(0.4), hc: '#F38518' }, nls.localize('focusBorder', "Overall border color for focused elements. This color is only used if not overridden by a component."));
+export const focusBorder = registerColor('focusBorder', { dark: Color.fromHex('#0E639C').transparent(0.8), light: Color.fromHex('#007ACC').transparent(0.4), hc: '#F38518' }, nls.localize('focusBorder', "Overall border color for focused elements. This color is only used if not overridden by a component."));
 
 export const contrastBorder = registerColor('contrastBorder', { light: null, dark: null, hc: '#6FC3DF' }, nls.localize('contrastBorder', "An extra border around elements to separate them from others for greater contrast."));
 export const activeContrastBorder = registerColor('contrastActiveBorder', { light: null, dark: null, hc: focusBorder }, nls.localize('activeContrastBorder', "An extra border around active elements to separate them from others for greater contrast."));
@@ -163,8 +163,8 @@ export const selectionBackground = registerColor('selection.background', { light
 // ------ text colors
 
 export const textSeparatorForeground = registerColor('textSeparator.foreground', { light: '#0000002e', dark: '#ffffff2e', hc: Color.black }, nls.localize('textSeparatorForeground', "Color for text separators."));
-export const textLinkForeground = registerColor('textLink.foreground', { light: '#4080D0', dark: '#4080D0', hc: '#4080D0' }, nls.localize('textLinkForeground', "Foreground color for links in text."));
-export const textLinkActiveForeground = registerColor('textLink.activeForeground', { light: '#4080D0', dark: '#4080D0', hc: '#4080D0' }, nls.localize('textLinkActiveForeground', "Foreground color for links in text when clicked on and on mouse hover."));
+export const textLinkForeground = registerColor('textLink.foreground', { light: '#006AB1', dark: '#3794FF', hc: '#3794FF' }, nls.localize('textLinkForeground', "Foreground color for links in text."));
+export const textLinkActiveForeground = registerColor('textLink.activeForeground', { light: '#006AB1', dark: '#3794FF', hc: '#3794FF' }, nls.localize('textLinkActiveForeground', "Foreground color for links in text when clicked on and on mouse hover."));
 export const textPreformatForeground = registerColor('textPreformat.foreground', { light: '#A31515', dark: '#D7BA7D', hc: '#D7BA7D' }, nls.localize('textPreformatForeground', "Foreground color for preformatted text segments."));
 export const textBlockQuoteBackground = registerColor('textBlockQuote.background', { light: '#7f7f7f1a', dark: '#7f7f7f1a', hc: null }, nls.localize('textBlockQuoteBackground', "Background color for block quotes in text."));
 export const textBlockQuoteBorder = registerColor('textBlockQuote.border', { light: '#007acc80', dark: '#007acc80', hc: Color.white }, nls.localize('textBlockQuoteBorder', "Border color for block quotes in text."));
@@ -177,13 +177,16 @@ export const inputBackground = registerColor('input.background', { dark: '#3C3C3
 export const inputForeground = registerColor('input.foreground', { dark: foreground, light: foreground, hc: foreground }, nls.localize('inputBoxForeground', "Input box foreground."));
 export const inputBorder = registerColor('input.border', { dark: null, light: null, hc: contrastBorder }, nls.localize('inputBoxBorder', "Input box border."));
 export const inputActiveOptionBorder = registerColor('inputOption.activeBorder', { dark: '#007ACC', light: '#007ACC', hc: activeContrastBorder }, nls.localize('inputBoxActiveOptionBorder', "Border color of activated options in input fields."));
-export const inputPlaceholderForeground = registerColor('input.placeholderForeground', { dark: null, light: null, hc: null }, nls.localize('inputPlaceholderForeground', "Input box foreground color for placeholder text."));
+export const inputPlaceholderForeground = registerColor('input.placeholderForeground', { light: transparent(foreground, 0.5), dark: transparent(foreground, 0.5), hc: transparent(foreground, 0.7) }, nls.localize('inputPlaceholderForeground', "Input box foreground color for placeholder text."));
 
 export const inputValidationInfoBackground = registerColor('inputValidation.infoBackground', { dark: '#063B49', light: '#D6ECF2', hc: Color.black }, nls.localize('inputValidationInfoBackground', "Input validation background color for information severity."));
+export const inputValidationInfoForeground = registerColor('inputValidation.infoForeground', { dark: null, light: null, hc: null }, nls.localize('inputValidationInfoForeground', "Input validation foreground color for information severity."));
 export const inputValidationInfoBorder = registerColor('inputValidation.infoBorder', { dark: '#007acc', light: '#007acc', hc: contrastBorder }, nls.localize('inputValidationInfoBorder', "Input validation border color for information severity."));
 export const inputValidationWarningBackground = registerColor('inputValidation.warningBackground', { dark: '#352A05', light: '#F6F5D2', hc: Color.black }, nls.localize('inputValidationWarningBackground', "Input validation background color for warning severity."));
+export const inputValidationWarningForeground = registerColor('inputValidation.warningForeground', { dark: null, light: null, hc: null }, nls.localize('inputValidationWarningForeground', "Input validation foreground color for warning severity."));
 export const inputValidationWarningBorder = registerColor('inputValidation.warningBorder', { dark: '#B89500', light: '#B89500', hc: contrastBorder }, nls.localize('inputValidationWarningBorder', "Input validation border color for warning severity."));
 export const inputValidationErrorBackground = registerColor('inputValidation.errorBackground', { dark: '#5A1D1D', light: '#F2DEDE', hc: Color.black }, nls.localize('inputValidationErrorBackground', "Input validation background color for error severity."));
+export const inputValidationErrorForeground = registerColor('inputValidation.errorForeground', { dark: null, light: null, hc: null }, nls.localize('inputValidationErrorForeground', "Input validation foreground color for error severity."));
 export const inputValidationErrorBorder = registerColor('inputValidation.errorBorder', { dark: '#BE1100', light: '#BE1100', hc: contrastBorder }, nls.localize('inputValidationErrorBorder', "Input validation border color for error severity."));
 
 export const selectBackground = registerColor('dropdown.background', { dark: '#3C3C3C', light: Color.white, hc: Color.black }, nls.localize('dropdownBackground', "Dropdown background."));
@@ -191,30 +194,30 @@ export const selectListBackground = registerColor('dropdown.listBackground', { d
 export const selectForeground = registerColor('dropdown.foreground', { dark: '#F0F0F0', light: null, hc: Color.white }, nls.localize('dropdownForeground', "Dropdown foreground."));
 export const selectBorder = registerColor('dropdown.border', { dark: selectBackground, light: '#CECECE', hc: contrastBorder }, nls.localize('dropdownBorder', "Dropdown border."));
 
-export const listFocusBackground = registerColor('list.focusBackground', { dark: '#073655', light: '#DCEBFC', hc: null }, nls.localize('listFocusBackground', "List/Tree background color for the focused item when the list/tree is active. An active list/tree has keyboard focus, an inactive does not."));
+export const listFocusBackground = registerColor('list.focusBackground', { dark: '#062F4A', light: '#DFF0FF', hc: null }, nls.localize('listFocusBackground', "List/Tree background color for the focused item when the list/tree is active. An active list/tree has keyboard focus, an inactive does not."));
 export const listFocusForeground = registerColor('list.focusForeground', { dark: null, light: null, hc: null }, nls.localize('listFocusForeground', "List/Tree foreground color for the focused item when the list/tree is active. An active list/tree has keyboard focus, an inactive does not."));
-export const listActiveSelectionBackground = registerColor('list.activeSelectionBackground', { dark: '#094771', light: '#3399FF', hc: null }, nls.localize('listActiveSelectionBackground', "List/Tree background color for the selected item when the list/tree is active. An active list/tree has keyboard focus, an inactive does not."));
+export const listActiveSelectionBackground = registerColor('list.activeSelectionBackground', { dark: '#094771', light: '#2477CE', hc: null }, nls.localize('listActiveSelectionBackground', "List/Tree background color for the selected item when the list/tree is active. An active list/tree has keyboard focus, an inactive does not."));
 export const listActiveSelectionForeground = registerColor('list.activeSelectionForeground', { dark: Color.white, light: Color.white, hc: null }, nls.localize('listActiveSelectionForeground', "List/Tree foreground color for the selected item when the list/tree is active. An active list/tree has keyboard focus, an inactive does not."));
-export const listInactiveSelectionBackground = registerColor('list.inactiveSelectionBackground', { dark: '#3F3F46', light: '#CCCEDB', hc: null }, nls.localize('listInactiveSelectionBackground', "List/Tree background color for the selected item when the list/tree is inactive. An active list/tree has keyboard focus, an inactive does not."));
+export const listInactiveSelectionBackground = registerColor('list.inactiveSelectionBackground', { dark: '#37373D', light: '#dddfea', hc: null }, nls.localize('listInactiveSelectionBackground', "List/Tree background color for the selected item when the list/tree is inactive. An active list/tree has keyboard focus, an inactive does not."));
 export const listInactiveSelectionForeground = registerColor('list.inactiveSelectionForeground', { dark: null, light: null, hc: null }, nls.localize('listInactiveSelectionForeground', "List/Tree foreground color for the selected item when the list/tree is inactive. An active list/tree has keyboard focus, an inactive does not."));
-export const listInactiveFocusBackground = registerColor('list.inactiveFocusBackground', { dark: '#313135', light: '#d8dae6', hc: null }, nls.localize('listInactiveSelectionBackground', "List/Tree background color for the selected item when the list/tree is inactive. An active list/tree has keyboard focus, an inactive does not."));
+export const listInactiveFocusBackground = registerColor('list.inactiveFocusBackground', { dark: '#313135', light: '#d8dae6', hc: null }, nls.localize('listInactiveFocusBackground', "List/Tree background color for the focused item when the list/tree is inactive. An active list/tree has keyboard focus, an inactive does not."));
 export const listHoverBackground = registerColor('list.hoverBackground', { dark: '#2A2D2E', light: '#F0F0F0', hc: null }, nls.localize('listHoverBackground', "List/Tree background when hovering over items using the mouse."));
 export const listHoverForeground = registerColor('list.hoverForeground', { dark: null, light: null, hc: null }, nls.localize('listHoverForeground', "List/Tree foreground when hovering over items using the mouse."));
 export const listDropBackground = registerColor('list.dropBackground', { dark: listFocusBackground, light: listFocusBackground, hc: null }, nls.localize('listDropBackground', "List/Tree drag and drop background when moving items around using the mouse."));
 export const listHighlightForeground = registerColor('list.highlightForeground', { dark: '#0097fb', light: '#007acc', hc: focusBorder }, nls.localize('highlight', 'List/Tree foreground color of the match highlights when searching inside the list/tree.'));
 export const listInvalidItemForeground = registerColor('list.invalidItemForeground', { dark: '#B89500', light: '#B89500', hc: '#B89500' }, nls.localize('invalidItemForeground', 'List/Tree foreground color for invalid items, for example an unresolved root in explorer.'));
-export const listErrorForeground = registerColor('list.errorForeground', { dark: '#ea4646', light: '#d60a0a', hc: null }, nls.localize('listErrorForeground', 'Foreground color of list items containing errors.'));
+export const listErrorForeground = registerColor('list.errorForeground', { dark: '#F88070', light: '#B01011', hc: null }, nls.localize('listErrorForeground', 'Foreground color of list items containing errors.'));
 export const listWarningForeground = registerColor('list.warningForeground', { dark: '#4d9e4d', light: '#117711', hc: null }, nls.localize('listWarningForeground', 'Foreground color of list items containing warnings.'));
 
-export const pickerGroupForeground = registerColor('pickerGroup.foreground', { dark: Color.fromHex('#0097FB').transparent(0.6), light: Color.fromHex('#007ACC').transparent(0.6), hc: Color.white }, nls.localize('pickerGroupForeground', "Quick picker color for grouping labels."));
+export const pickerGroupForeground = registerColor('pickerGroup.foreground', { dark: '#3794FF', light: '#006AB1', hc: Color.white }, nls.localize('pickerGroupForeground', "Quick picker color for grouping labels."));
 export const pickerGroupBorder = registerColor('pickerGroup.border', { dark: '#3F3F46', light: '#CCCEDB', hc: Color.white }, nls.localize('pickerGroupBorder', "Quick picker color for grouping borders."));
 
 export const buttonForeground = registerColor('button.foreground', { dark: Color.white, light: Color.white, hc: Color.white }, nls.localize('buttonForeground', "Button foreground color."));
 export const buttonBackground = registerColor('button.background', { dark: '#0E639C', light: '#007ACC', hc: null }, nls.localize('buttonBackground', "Button background color."));
 export const buttonHoverBackground = registerColor('button.hoverBackground', { dark: lighten(buttonBackground, 0.2), light: darken(buttonBackground, 0.2), hc: null }, nls.localize('buttonHoverBackground', "Button background color when hovering."));
 
-export const badgeBackground = registerColor('badge.background', { dark: '#4D4D4D', light: '#BEBEBE', hc: Color.black }, nls.localize('badgeBackground', "Badge background color. Badges are small information labels, e.g. for search results count."));
-export const badgeForeground = registerColor('badge.foreground', { dark: Color.white, light: Color.white, hc: Color.white }, nls.localize('badgeForeground', "Badge foreground color. Badges are small information labels, e.g. for search results count."));
+export const badgeBackground = registerColor('badge.background', { dark: '#4D4D4D', light: '#C4C4C4', hc: Color.black }, nls.localize('badgeBackground', "Badge background color. Badges are small information labels, e.g. for search results count."));
+export const badgeForeground = registerColor('badge.foreground', { dark: Color.white, light: '#333', hc: Color.white }, nls.localize('badgeForeground', "Badge foreground color. Badges are small information labels, e.g. for search results count."));
 
 export const scrollbarShadow = registerColor('scrollbar.shadow', { dark: '#000000', light: '#DDDDDD', hc: null }, nls.localize('scrollbarShadow', "Scrollbar shadow to indicate that the view is scrolled."));
 export const scrollbarSliderBackground = registerColor('scrollbarSlider.background', { dark: Color.fromHex('#797979').transparent(0.4), light: Color.fromHex('#646464').transparent(0.4), hc: transparent(contrastBorder, 0.6) }, nls.localize('scrollbarSliderBackground', "Scrollbar slider background color."));
@@ -287,6 +290,17 @@ export const diffRemoved = registerColor('diffEditor.removedTextBackground', { d
 export const diffInsertedOutline = registerColor('diffEditor.insertedTextBorder', { dark: null, light: null, hc: '#33ff2eff' }, nls.localize('diffEditorInsertedOutline', 'Outline color for the text that got inserted.'));
 export const diffRemovedOutline = registerColor('diffEditor.removedTextBorder', { dark: null, light: null, hc: '#FF008F' }, nls.localize('diffEditorRemovedOutline', 'Outline color for text that got removed.'));
 
+export const diffBorder = registerColor('diffEditor.border', { dark: null, light: null, hc: contrastBorder }, nls.localize('diffEditorBorder', 'Border color between the two text editors.'));
+
+/**
+ * Breadcrumb colors
+ */
+export const breadcrumbsForeground = registerColor('breadcrumb.foreground', { light: transparent(foreground, .8), dark: transparent(foreground, .8), hc: transparent(foreground, .8) }, nls.localize('breadcrumbsFocusForeground', "Color of focused breadcrumb items."));
+export const breadcrumbsBackground = registerColor('breadcrumb.background', { light: editorBackground, dark: editorBackground, hc: editorBackground }, nls.localize('breadcrumbsBackground', "Background color of breadcrumb items."));
+export const breadcrumbsFocusForeground = registerColor('breadcrumb.focusForeground', { light: darken(foreground, .2), dark: lighten(foreground, .1), hc: lighten(foreground, .1) }, nls.localize('breadcrumbsFocusForeground', "Color of focused breadcrumb items."));
+export const breadcrumbsActiveSelectionForeground = registerColor('breadcrumb.activeSelectionForeground', { light: darken(foreground, .2), dark: lighten(foreground, .1), hc: lighten(foreground, .1) }, nls.localize('breadcrumbsSelectedForegound', "Color of selected breadcrumb items."));
+export const breadcrumbsPickerBackground = registerColor('breadcrumbPicker.background', { light: editorWidgetBackground, dark: editorWidgetBackground, hc: editorWidgetBackground }, nls.localize('breadcrumbsSelectedBackground', "Background color of breadcrumb item picker."));
+
 /**
  * Merge-conflict colors
  */
diff --git a/src/vs/platform/theme/common/styler.ts b/src/vs/platform/theme/common/styler.ts
index 07dfd1d9551..c53e9f1c41b 100644
--- a/src/vs/platform/theme/common/styler.ts
+++ b/src/vs/platform/theme/common/styler.ts
@@ -6,7 +6,7 @@
 'use strict';
 
 import { ITheme, IThemeService } from 'vs/platform/theme/common/themeService';
-import { focusBorder, inputBackground, inputForeground, ColorIdentifier, selectForeground, selectBackground, selectListBackground, selectBorder, inputBorder, foreground, editorBackground, contrastBorder, inputActiveOptionBorder, listFocusBackground, listFocusForeground, listActiveSelectionBackground, listActiveSelectionForeground, listInactiveSelectionForeground, listInactiveSelectionBackground, listInactiveFocusBackground, listHoverBackground, listHoverForeground, listDropBackground, pickerGroupBorder, pickerGroupForeground, widgetShadow, inputValidationInfoBorder, inputValidationInfoBackground, inputValidationWarningBorder, inputValidationWarningBackground, inputValidationErrorBorder, inputValidationErrorBackground, activeContrastBorder, buttonForeground, buttonBackground, buttonHoverBackground, ColorFunction, lighten, badgeBackground, badgeForeground, progressBarBackground } from 'vs/platform/theme/common/colorRegistry';
+import { focusBorder, inputBackground, inputForeground, ColorIdentifier, selectForeground, selectBackground, selectListBackground, selectBorder, inputBorder, foreground, editorBackground, contrastBorder, inputActiveOptionBorder, listFocusBackground, listFocusForeground, listActiveSelectionBackground, listActiveSelectionForeground, listInactiveSelectionForeground, listInactiveSelectionBackground, listInactiveFocusBackground, listHoverBackground, listHoverForeground, listDropBackground, pickerGroupBorder, pickerGroupForeground, widgetShadow, inputValidationInfoBorder, inputValidationInfoBackground, inputValidationWarningBorder, inputValidationWarningBackground, inputValidationErrorBorder, inputValidationErrorBackground, activeContrastBorder, buttonForeground, buttonBackground, buttonHoverBackground, ColorFunction, badgeBackground, badgeForeground, progressBarBackground, breadcrumbsForeground, breadcrumbsFocusForeground, breadcrumbsActiveSelectionForeground, breadcrumbsBackground, editorWidgetBorder, inputValidationInfoForeground, inputValidationWarningForeground, inputValidationErrorForeground } from 'vs/platform/theme/common/colorRegistry';
 import { IDisposable } from 'vs/base/common/lifecycle';
 import { Color } from 'vs/base/common/color';
 import { mixin } from 'vs/base/common/objects';
@@ -89,10 +89,13 @@ export interface IInputBoxStyleOverrides extends IStyleOverrides {
 	inputActiveOptionBorder?: ColorIdentifier;
 	inputValidationInfoBorder?: ColorIdentifier;
 	inputValidationInfoBackground?: ColorIdentifier;
+	inputValidationInfoForeground?: ColorIdentifier;
 	inputValidationWarningBorder?: ColorIdentifier;
 	inputValidationWarningBackground?: ColorIdentifier;
+	inputValidationWarningForeground?: ColorIdentifier;
 	inputValidationErrorBorder?: ColorIdentifier;
 	inputValidationErrorBackground?: ColorIdentifier;
+	inputValidationErrorForeground?: ColorIdentifier;
 }
 
 export function attachInputBoxStyler(widget: IThemable, themeService: IThemeService, style?: IInputBoxStyleOverrides): IDisposable {
@@ -102,10 +105,13 @@ export function attachInputBoxStyler(widget: IThemable, themeService: IThemeServ
 		inputBorder: (style && style.inputBorder) || inputBorder,
 		inputValidationInfoBorder: (style && style.inputValidationInfoBorder) || inputValidationInfoBorder,
 		inputValidationInfoBackground: (style && style.inputValidationInfoBackground) || inputValidationInfoBackground,
+		inputValidationInfoForeground: (style && style.inputValidationInfoForeground) || inputValidationInfoForeground,
 		inputValidationWarningBorder: (style && style.inputValidationWarningBorder) || inputValidationWarningBorder,
 		inputValidationWarningBackground: (style && style.inputValidationWarningBackground) || inputValidationWarningBackground,
+		inputValidationWarningForeground: (style && style.inputValidationWarningForeground) || inputValidationWarningForeground,
 		inputValidationErrorBorder: (style && style.inputValidationErrorBorder) || inputValidationErrorBorder,
-		inputValidationErrorBackground: (style && style.inputValidationErrorBackground) || inputValidationErrorBackground
+		inputValidationErrorBackground: (style && style.inputValidationErrorBackground) || inputValidationErrorBackground,
+		inputValidationErrorForeground: (style && style.inputValidationErrorForeground) || inputValidationErrorForeground
 	} as IInputBoxStyleOverrides, widget);
 }
 
@@ -129,7 +135,8 @@ export function attachSelectBoxStyler(widget: IThemable, themeService: IThemeSer
 		listFocusOutline: (style && style.listFocusOutline) || activeContrastBorder,
 		listHoverBackground: (style && style.listHoverBackground) || listHoverBackground,
 		listHoverForeground: (style && style.listHoverForeground) || listHoverForeground,
-		listHoverOutline: (style && style.listFocusOutline) || activeContrastBorder
+		listHoverOutline: (style && style.listFocusOutline) || activeContrastBorder,
+		selectListBorder: (style && style.selectListBorder) || editorWidgetBorder
 	} as ISelectBoxStyleOverrides, widget);
 }
 
@@ -141,10 +148,13 @@ export function attachFindInputBoxStyler(widget: IThemable, themeService: ITheme
 		inputActiveOptionBorder: (style && style.inputActiveOptionBorder) || inputActiveOptionBorder,
 		inputValidationInfoBorder: (style && style.inputValidationInfoBorder) || inputValidationInfoBorder,
 		inputValidationInfoBackground: (style && style.inputValidationInfoBackground) || inputValidationInfoBackground,
+		inputValidationInfoForeground: (style && style.inputValidationInfoForeground) || inputValidationInfoForeground,
 		inputValidationWarningBorder: (style && style.inputValidationWarningBorder) || inputValidationWarningBorder,
 		inputValidationWarningBackground: (style && style.inputValidationWarningBackground) || inputValidationWarningBackground,
+		inputValidationWarningForeground: (style && style.inputValidationWarningForeground) || inputValidationWarningForeground,
 		inputValidationErrorBorder: (style && style.inputValidationErrorBorder) || inputValidationErrorBorder,
-		inputValidationErrorBackground: (style && style.inputValidationErrorBackground) || inputValidationErrorBackground
+		inputValidationErrorBackground: (style && style.inputValidationErrorBackground) || inputValidationErrorBackground,
+		inputValidationErrorForeground: (style && style.inputValidationErrorForeground) || inputValidationErrorForeground
 	} as IInputBoxStyleOverrides, widget);
 }
 
@@ -171,13 +181,16 @@ export function attachQuickOpenStyler(widget: IThemable, themeService: IThemeSer
 		inputBorder: (style && style.inputBorder) || inputBorder,
 		inputValidationInfoBorder: (style && style.inputValidationInfoBorder) || inputValidationInfoBorder,
 		inputValidationInfoBackground: (style && style.inputValidationInfoBackground) || inputValidationInfoBackground,
+		inputValidationInfoForeground: (style && style.inputValidationInfoForeground) || inputValidationInfoForeground,
 		inputValidationWarningBorder: (style && style.inputValidationWarningBorder) || inputValidationWarningBorder,
 		inputValidationWarningBackground: (style && style.inputValidationWarningBackground) || inputValidationWarningBackground,
+		inputValidationWarningForeground: (style && style.inputValidationWarningForeground) || inputValidationWarningForeground,
 		inputValidationErrorBorder: (style && style.inputValidationErrorBorder) || inputValidationErrorBorder,
 		inputValidationErrorBackground: (style && style.inputValidationErrorBackground) || inputValidationErrorBackground,
+		inputValidationErrorForeground: (style && style.inputValidationErrorForeground) || inputValidationErrorForeground,
 		listFocusBackground: (style && style.listFocusBackground) || listFocusBackground,
 		listFocusForeground: (style && style.listFocusForeground) || listFocusForeground,
-		listActiveSelectionBackground: (style && style.listActiveSelectionBackground) || lighten(listActiveSelectionBackground, 0.1),
+		listActiveSelectionBackground: (style && style.listActiveSelectionBackground) || listActiveSelectionBackground,
 		listActiveSelectionForeground: (style && style.listActiveSelectionForeground) || listActiveSelectionForeground,
 		listFocusAndSelectionBackground: style && style.listFocusAndSelectionBackground || listActiveSelectionBackground,
 		listFocusAndSelectionForeground: (style && style.listFocusAndSelectionForeground) || listActiveSelectionForeground,
@@ -219,7 +232,7 @@ export function attachListStyler(widget: IThemable, themeService: IThemeService,
 export const defaultListStyles: IColorMapping = {
 	listFocusBackground: listFocusBackground,
 	listFocusForeground: listFocusForeground,
-	listActiveSelectionBackground: lighten(listActiveSelectionBackground, 0.1),
+	listActiveSelectionBackground: listActiveSelectionBackground,
 	listActiveSelectionForeground: listActiveSelectionForeground,
 	listFocusAndSelectionBackground: listActiveSelectionBackground,
 	listFocusAndSelectionForeground: listActiveSelectionForeground,
@@ -261,4 +274,24 @@ export function attachProgressBarStyler(widget: IThemable, themeService: IThemeS
 
 export function attachStylerCallback(themeService: IThemeService, colors: { [name: string]: ColorIdentifier }, callback: styleFn): IDisposable {
 	return attachStyler(themeService, colors, callback);
-}
\ No newline at end of file
+}
+
+export interface IBreadcrumbsWidgetStyleOverrides extends IColorMapping {
+	breadcrumbsBackground?: ColorIdentifier | ColorFunction;
+	breadcrumbsForeground?: ColorIdentifier;
+	breadcrumbsHoverForeground?: ColorIdentifier;
+	breadcrumbsFocusForeground?: ColorIdentifier;
+	breadcrumbsFocusAndSelectionForeground?: ColorIdentifier;
+}
+
+export const defaultBreadcrumbsStyles = <IBreadcrumbsWidgetStyleOverrides>{
+	breadcrumbsBackground: breadcrumbsBackground,
+	breadcrumbsForeground: breadcrumbsForeground,
+	breadcrumbsHoverForeground: breadcrumbsFocusForeground,
+	breadcrumbsFocusForeground: breadcrumbsFocusForeground,
+	breadcrumbsFocusAndSelectionForeground: breadcrumbsActiveSelectionForeground,
+};
+
+export function attachBreadcrumbsStyler(widget: IThemable, themeService: IThemeService, style?: IBreadcrumbsWidgetStyleOverrides): IDisposable {
+	return attachStyler(themeService, { ...defaultBreadcrumbsStyles, ...style }, widget);
+}
diff --git a/src/vs/platform/theme/common/themeService.ts b/src/vs/platform/theme/common/themeService.ts
index c58b79603bc..7c1e2f9bae6 100644
--- a/src/vs/platform/theme/common/themeService.ts
+++ b/src/vs/platform/theme/common/themeService.ts
@@ -6,7 +6,7 @@
 
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
 import { Color } from 'vs/base/common/color';
-import { IDisposable } from 'vs/base/common/lifecycle';
+import { IDisposable, toDisposable } from 'vs/base/common/lifecycle';
 import * as platform from 'vs/platform/registry/common/platform';
 import { ColorIdentifier } from 'vs/platform/theme/common/colorRegistry';
 import { Event, Emitter } from 'vs/base/common/event';
@@ -111,12 +111,10 @@ class ThemingRegistry implements IThemingRegistry {
 	public onThemeChange(participant: IThemingParticipant): IDisposable {
 		this.themingParticipants.push(participant);
 		this.onThemingParticipantAddedEmitter.fire(participant);
-		return {
-			dispose: () => {
-				const idx = this.themingParticipants.indexOf(participant);
-				this.themingParticipants.splice(idx, 1);
-			}
-		};
+		return toDisposable(() => {
+			const idx = this.themingParticipants.indexOf(participant);
+			this.themingParticipants.splice(idx, 1);
+		});
 	}
 
 	public get onThemingParticipantAdded(): Event<IThemingParticipant> {
diff --git a/src/vs/platform/theme/test/electron-browser/colorRegistry.releaseTest.ts b/src/vs/platform/theme/test/electron-browser/colorRegistry.releaseTest.ts
index 39858929cb5..01335f98f8e 100644
--- a/src/vs/platform/theme/test/electron-browser/colorRegistry.releaseTest.ts
+++ b/src/vs/platform/theme/test/electron-browser/colorRegistry.releaseTest.ts
@@ -18,6 +18,8 @@ import { request, asText } from 'vs/base/node/request';
 import * as pfs from 'vs/base/node/pfs';
 import * as path from 'path';
 import * as assert from 'assert';
+import { getPathFromAmdModule } from 'vs/base/common/amd';
+import { CancellationToken } from 'vs/base/common/cancellation';
 
 
 interface ColorInfo {
@@ -40,7 +42,7 @@ export const experimental = []; // 'settings.modifiedItemForeground', 'editorUnn
 suite('Color Registry', function () {
 
 	test('all colors documented', async function () {
-		const reqContext = await request({ url: 'https://raw.githubusercontent.com/Microsoft/vscode-docs/vnext/docs/getstarted/theme-color-reference.md' });
+		const reqContext = await request({ url: 'https://raw.githubusercontent.com/Microsoft/vscode-docs/vnext/docs/getstarted/theme-color-reference.md' }, CancellationToken.None);
 		const content = await asText(reqContext);
 
 		const expression = /\-\s*\`([\w\.]+)\`: (.*)/g;
@@ -103,7 +105,7 @@ function getDescription(color: ColorContribution) {
 }
 
 async function getColorsFromExtension(): Promise<{ [id: string]: string }> {
-	let extPath = require.toUrl('../../../../../../extensions');
+	let extPath = getPathFromAmdModule(require, '../../../../../../extensions');
 	let extFolders = await pfs.readDirsInDir(extPath);
 	let result: { [id: string]: string } = Object.create(null);
 	for (let folder of extFolders) {
@@ -127,4 +129,4 @@ async function getColorsFromExtension(): Promise<{ [id: string]: string }> {
 
 	}
 	return result;
-}
\ No newline at end of file
+}
diff --git a/src/vs/platform/update/common/update.ts b/src/vs/platform/update/common/update.ts
index fbaebf81a99..62c53443088 100644
--- a/src/vs/platform/update/common/update.ts
+++ b/src/vs/platform/update/common/update.ts
@@ -37,7 +37,7 @@ export interface IUpdate {
  * Donwloaded: There is an update ready to be installed in the background (win32).
  */
 
-export enum StateType {
+export const enum StateType {
 	Uninitialized = 'uninitialized',
 	Idle = 'idle',
 	CheckingForUpdates = 'checking for updates',
@@ -48,8 +48,13 @@ export enum StateType {
 	Ready = 'ready',
 }
 
+export const enum UpdateType {
+	Setup,
+	Archive
+}
+
 export type Uninitialized = { type: StateType.Uninitialized };
-export type Idle = { type: StateType.Idle };
+export type Idle = { type: StateType.Idle, updateType: UpdateType };
 export type CheckingForUpdates = { type: StateType.CheckingForUpdates, context: any };
 export type AvailableForDownload = { type: StateType.AvailableForDownload, update: IUpdate };
 export type Downloading = { type: StateType.Downloading, update: IUpdate };
@@ -61,7 +66,7 @@ export type State = Uninitialized | Idle | CheckingForUpdates | AvailableForDown
 
 export const State = {
 	Uninitialized: { type: StateType.Uninitialized } as Uninitialized,
-	Idle: { type: StateType.Idle } as Idle,
+	Idle: (updateType: UpdateType) => ({ type: StateType.Idle, updateType }) as Idle,
 	CheckingForUpdates: (context: any) => ({ type: StateType.CheckingForUpdates, context } as CheckingForUpdates),
 	AvailableForDownload: (update: IUpdate) => ({ type: StateType.AvailableForDownload, update } as AvailableForDownload),
 	Downloading: (update: IUpdate) => ({ type: StateType.Downloading, update } as Downloading),
@@ -89,4 +94,6 @@ export interface IUpdateService {
 	downloadUpdate(): TPromise<void>;
 	applyUpdate(): TPromise<void>;
 	quitAndInstall(): TPromise<void>;
-}
\ No newline at end of file
+
+	isLatestVersion(): TPromise<boolean | undefined>;
+}
diff --git a/src/vs/platform/update/electron-main/abstractUpdateService.ts b/src/vs/platform/update/electron-main/abstractUpdateService.ts
index 6734f82fa36..218a14ee8ae 100644
--- a/src/vs/platform/update/electron-main/abstractUpdateService.ts
+++ b/src/vs/platform/update/electron-main/abstractUpdateService.ts
@@ -6,14 +6,16 @@
 'use strict';
 
 import { Event, Emitter } from 'vs/base/common/event';
-import { Throttler } from 'vs/base/common/async';
+import { Throttler, timeout } from 'vs/base/common/async';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { ILifecycleService } from 'vs/platform/lifecycle/electron-main/lifecycleMain';
 import product from 'vs/platform/node/product';
 import { TPromise } from 'vs/base/common/winjs.base';
-import { IUpdateService, State, StateType, AvailableForDownload } from 'vs/platform/update/common/update';
+import { IUpdateService, State, StateType, AvailableForDownload, UpdateType } from 'vs/platform/update/common/update';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { ILogService } from 'vs/platform/log/common/log';
+import { IRequestService } from 'vs/platform/request/node/request';
+import { CancellationToken } from 'vs/base/common/cancellation';
 
 export function createUpdateURL(platform: string, quality: string): string {
 	return `${product.updateUrl}/api/update/${platform}/${quality}/${product.commit}`;
@@ -23,6 +25,8 @@ export abstract class AbstractUpdateService implements IUpdateService {
 
 	_serviceBrand: any;
 
+	protected readonly url: string | undefined;
+
 	private _state: State = State.Uninitialized;
 	private throttler: Throttler = new Throttler();
 
@@ -43,7 +47,8 @@ export abstract class AbstractUpdateService implements IUpdateService {
 		@ILifecycleService private lifecycleService: ILifecycleService,
 		@IConfigurationService protected configurationService: IConfigurationService,
 		@IEnvironmentService private environmentService: IEnvironmentService,
-		@ILogService protected logService: ILogService
+		@IRequestService protected requestService: IRequestService,
+		@ILogService protected logService: ILogService,
 	) {
 		if (this.environmentService.disableUpdates) {
 			this.logService.info('update#ctor - updates are disabled');
@@ -62,16 +67,16 @@ export abstract class AbstractUpdateService implements IUpdateService {
 			return;
 		}
 
-		if (!this.setUpdateFeedUrl(quality)) {
+		this.url = this.buildUpdateFeedUrl(quality);
+		if (!this.url) {
 			this.logService.info('update#ctor - updates are disabled');
 			return;
 		}
 
-		this.setState({ type: StateType.Idle });
+		this.setState(State.Idle(this.getUpdateType()));
 
 		// Start checking for updates after 30 seconds
-		this.scheduleCheckForUpdates(30 * 1000)
-			.done(null, err => this.logService.error(err));
+		this.scheduleCheckForUpdates(30 * 1000).then(null, err => this.logService.error(err));
 	}
 
 	private getProductQuality(): string {
@@ -79,8 +84,8 @@ export abstract class AbstractUpdateService implements IUpdateService {
 		return quality === 'none' ? null : product.quality;
 	}
 
-	private scheduleCheckForUpdates(delay = 60 * 60 * 1000): TPromise<void> {
-		return TPromise.timeout(delay)
+	private scheduleCheckForUpdates(delay = 60 * 60 * 1000): Thenable<void> {
+		return timeout(delay)
 			.then(() => this.checkForUpdates(null))
 			.then(update => {
 				if (update) {
@@ -140,7 +145,7 @@ export abstract class AbstractUpdateService implements IUpdateService {
 
 		this.logService.trace('update#quitAndInstall(): before lifecycle quit()');
 
-		this.lifecycleService.quit(true /* from update */).done(vetod => {
+		this.lifecycleService.quit(true /* from update */).then(vetod => {
 			this.logService.trace(`update#quitAndInstall(): after lifecycle quit() with veto: ${vetod}`);
 			if (vetod) {
 				return;
@@ -153,10 +158,29 @@ export abstract class AbstractUpdateService implements IUpdateService {
 		return TPromise.as(null);
 	}
 
+	isLatestVersion(): TPromise<boolean | undefined> {
+		if (!this.url) {
+			return TPromise.as(undefined);
+		}
+		return this.requestService.request({ url: this.url }, CancellationToken.None).then(context => {
+			// The update server replies with 204 (No Content) when no
+			// update is available - that's all we want to know.
+			if (context.res.statusCode === 204) {
+				return true;
+			} else {
+				return false;
+			}
+		});
+	}
+
+	protected getUpdateType(): UpdateType {
+		return UpdateType.Archive;
+	}
+
 	protected doQuitAndInstall(): void {
 		// noop
 	}
 
-	protected abstract setUpdateFeedUrl(quality: string): boolean;
+	protected abstract buildUpdateFeedUrl(quality: string): string | undefined;
 	protected abstract doCheckForUpdates(context: any): void;
 }
diff --git a/src/vs/platform/update/electron-main/updateService.darwin.ts b/src/vs/platform/update/electron-main/updateService.darwin.ts
index a75576d9195..8ac8357ef63 100644
--- a/src/vs/platform/update/electron-main/updateService.darwin.ts
+++ b/src/vs/platform/update/electron-main/updateService.darwin.ts
@@ -11,11 +11,12 @@ import { Event, fromNodeEventEmitter } from 'vs/base/common/event';
 import { memoize } from 'vs/base/common/decorators';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { ILifecycleService } from 'vs/platform/lifecycle/electron-main/lifecycleMain';
-import { State, IUpdate, StateType } from 'vs/platform/update/common/update';
+import { State, IUpdate, StateType, UpdateType } from 'vs/platform/update/common/update';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { ILogService } from 'vs/platform/log/common/log';
 import { AbstractUpdateService, createUpdateURL } from 'vs/platform/update/electron-main/abstractUpdateService';
+import { IRequestService } from 'vs/platform/request/node/request';
 
 export class DarwinUpdateService extends AbstractUpdateService {
 
@@ -33,9 +34,10 @@ export class DarwinUpdateService extends AbstractUpdateService {
 		@IConfigurationService configurationService: IConfigurationService,
 		@ITelemetryService private telemetryService: ITelemetryService,
 		@IEnvironmentService environmentService: IEnvironmentService,
+		@IRequestService requestService: IRequestService,
 		@ILogService logService: ILogService
 	) {
-		super(lifecycleService, configurationService, environmentService, logService);
+		super(lifecycleService, configurationService, environmentService, requestService, logService);
 		this.onRawError(this.onError, this, this.disposables);
 		this.onRawUpdateAvailable(this.onUpdateAvailable, this, this.disposables);
 		this.onRawUpdateDownloaded(this.onUpdateDownloaded, this, this.disposables);
@@ -44,19 +46,19 @@ export class DarwinUpdateService extends AbstractUpdateService {
 
 	private onError(err: string): void {
 		this.logService.error('UpdateService error: ', err);
-		this.setState(State.Idle);
+		this.setState(State.Idle(UpdateType.Archive));
 	}
 
-	protected setUpdateFeedUrl(quality: string): boolean {
+	protected buildUpdateFeedUrl(quality: string): string | undefined {
+		const url = createUpdateURL('darwin', quality);
 		try {
-			electron.autoUpdater.setFeedURL(createUpdateURL('darwin', quality));
+			electron.autoUpdater.setFeedURL({ url });
 		} catch (e) {
 			// application is very likely not signed
 			this.logService.error('Failed to set update feed URL', e);
-			return false;
+			return undefined;
 		}
-
-		return true;
+		return url;
 	}
 
 	protected doCheckForUpdates(context: any): void {
@@ -99,7 +101,7 @@ export class DarwinUpdateService extends AbstractUpdateService {
 			*/
 		this.telemetryService.publicLog('update:notAvailable', { explicit: !!this.state.context });
 
-		this.setState(State.Idle);
+		this.setState(State.Idle(UpdateType.Archive));
 	}
 
 	protected doQuitAndInstall(): void {
diff --git a/src/vs/platform/update/electron-main/updateService.linux.ts b/src/vs/platform/update/electron-main/updateService.linux.ts
index 12d660bb203..cce8a725374 100644
--- a/src/vs/platform/update/electron-main/updateService.linux.ts
+++ b/src/vs/platform/update/electron-main/updateService.linux.ts
@@ -9,7 +9,7 @@ import product from 'vs/platform/node/product';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { ILifecycleService } from 'vs/platform/lifecycle/electron-main/lifecycleMain';
 import { IRequestService } from 'vs/platform/request/node/request';
-import { State, IUpdate, AvailableForDownload } from 'vs/platform/update/common/update';
+import { State, IUpdate, AvailableForDownload, UpdateType } from 'vs/platform/update/common/update';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { ILogService } from 'vs/platform/log/common/log';
@@ -17,27 +17,25 @@ import { createUpdateURL, AbstractUpdateService } from 'vs/platform/update/elect
 import { asJson } from 'vs/base/node/request';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { shell } from 'electron';
+import { CancellationToken } from 'vs/base/common/cancellation';
 
 export class LinuxUpdateService extends AbstractUpdateService {
 
 	_serviceBrand: any;
 
-	private url: string | undefined;
-
 	constructor(
 		@ILifecycleService lifecycleService: ILifecycleService,
 		@IConfigurationService configurationService: IConfigurationService,
 		@ITelemetryService private telemetryService: ITelemetryService,
 		@IEnvironmentService environmentService: IEnvironmentService,
-		@IRequestService private requestService: IRequestService,
+		@IRequestService requestService: IRequestService,
 		@ILogService logService: ILogService
 	) {
-		super(lifecycleService, configurationService, environmentService, logService);
+		super(lifecycleService, configurationService, environmentService, requestService, logService);
 	}
 
-	protected setUpdateFeedUrl(quality: string): boolean {
-		this.url = createUpdateURL(`linux-${process.arch}`, quality);
-		return true;
+	protected buildUpdateFeedUrl(quality: string): string {
+		return createUpdateURL(`linux-${process.arch}`, quality);
 	}
 
 	protected doCheckForUpdates(context: any): void {
@@ -47,7 +45,7 @@ export class LinuxUpdateService extends AbstractUpdateService {
 
 		this.setState(State.CheckingForUpdates(context));
 
-		this.requestService.request({ url: this.url })
+		this.requestService.request({ url: this.url }, CancellationToken.None)
 			.then<IUpdate>(asJson)
 			.then(update => {
 				if (!update || !update.url || !update.version || !update.productVersion) {
@@ -58,7 +56,7 @@ export class LinuxUpdateService extends AbstractUpdateService {
 						*/
 					this.telemetryService.publicLog('update:notAvailable', { explicit: !!context });
 
-					this.setState(State.Idle);
+					this.setState(State.Idle(UpdateType.Archive));
 				} else {
 					this.setState(State.AvailableForDownload(update));
 				}
@@ -72,7 +70,7 @@ export class LinuxUpdateService extends AbstractUpdateService {
 					}
 					*/
 				this.telemetryService.publicLog('update:notAvailable', { explicit: !!context });
-				this.setState(State.Idle);
+				this.setState(State.Idle(UpdateType.Archive));
 			});
 	}
 
@@ -84,8 +82,8 @@ export class LinuxUpdateService extends AbstractUpdateService {
 		} else {
 			shell.openExternal(state.update.url);
 		}
-		this.setState(State.Idle);
 
+		this.setState(State.Idle(UpdateType.Archive));
 		return TPromise.as(null);
 	}
 }
diff --git a/src/vs/platform/update/electron-main/updateService.win32.ts b/src/vs/platform/update/electron-main/updateService.win32.ts
index 220e80a782a..3d1772cfe97 100644
--- a/src/vs/platform/update/electron-main/updateService.win32.ts
+++ b/src/vs/platform/update/electron-main/updateService.win32.ts
@@ -5,7 +5,7 @@
 
 'use strict';
 
-import * as fs from 'original-fs';
+import * as fs from 'fs';
 import * as path from 'path';
 import * as pfs from 'vs/base/node/pfs';
 import { memoize } from 'vs/base/common/decorators';
@@ -14,7 +14,7 @@ import { ILifecycleService } from 'vs/platform/lifecycle/electron-main/lifecycle
 import { IRequestService } from 'vs/platform/request/node/request';
 import product from 'vs/platform/node/product';
 import { TPromise, Promise } from 'vs/base/common/winjs.base';
-import { State, IUpdate, StateType } from 'vs/platform/update/common/update';
+import { State, IUpdate, StateType, AvailableForDownload, UpdateType } from 'vs/platform/update/common/update';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { ILogService } from 'vs/platform/log/common/log';
@@ -23,6 +23,8 @@ import { download, asJson } from 'vs/base/node/request';
 import { checksum } from 'vs/base/node/crypto';
 import { tmpdir } from 'os';
 import { spawn } from 'child_process';
+import { shell } from 'electron';
+import { CancellationToken } from 'vs/base/common/cancellation';
 
 function pollUntil(fn: () => boolean, timeout = 1000): TPromise<void> {
 	return new TPromise<void>(c => {
@@ -43,16 +45,26 @@ interface IAvailableUpdate {
 	updateFilePath?: string;
 }
 
+let _updateType: UpdateType | undefined = undefined;
+function getUpdateType(): UpdateType {
+	if (typeof _updateType === 'undefined') {
+		_updateType = fs.existsSync(path.join(path.dirname(process.execPath), 'unins000.exe'))
+			? UpdateType.Setup
+			: UpdateType.Archive;
+	}
+
+	return _updateType;
+}
+
 export class Win32UpdateService extends AbstractUpdateService {
 
 	_serviceBrand: any;
 
-	private url: string | undefined;
 	private availableUpdate: IAvailableUpdate | undefined;
 
 	@memoize
 	get cachePath(): TPromise<string> {
-		const result = path.join(tmpdir(), `vscode-update-${process.arch}`);
+		const result = path.join(tmpdir(), `vscode-update-${product.target}-${process.arch}`);
 		return pfs.mkdirp(result, null).then(() => result);
 	}
 
@@ -61,19 +73,40 @@ export class Win32UpdateService extends AbstractUpdateService {
 		@IConfigurationService configurationService: IConfigurationService,
 		@ITelemetryService private telemetryService: ITelemetryService,
 		@IEnvironmentService environmentService: IEnvironmentService,
-		@IRequestService private requestService: IRequestService,
+		@IRequestService requestService: IRequestService,
 		@ILogService logService: ILogService
 	) {
-		super(lifecycleService, configurationService, environmentService, logService);
+		super(lifecycleService, configurationService, environmentService, requestService, logService);
+
+		if (getUpdateType() === UpdateType.Setup) {
+			/* __GDPR__
+				"update:win32SetupTarget" : {
+					"target" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+				}
+			*/
+			/* __GDPR__
+				"update:win<NUMBER>SetupTarget" : {
+					"target" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+				}
+			*/
+			telemetryService.publicLog('update:win32SetupTarget', { target: product.target });
+		}
 	}
 
-	protected setUpdateFeedUrl(quality: string): boolean {
-		if (!fs.existsSync(path.join(path.dirname(process.execPath), 'unins000.exe'))) {
-			return false;
+	protected buildUpdateFeedUrl(quality: string): string | undefined {
+		let platform = 'win32';
+
+		if (process.arch === 'x64') {
+			platform += '-x64';
 		}
 
-		this.url = createUpdateURL(process.arch === 'x64' ? 'win32-x64' : 'win32', quality);
-		return true;
+		if (getUpdateType() === UpdateType.Archive) {
+			platform += '-archive';
+		} else if (product.target === 'user') {
+			platform += '-user';
+		}
+
+		return createUpdateURL(platform, quality);
 	}
 
 	protected doCheckForUpdates(context: any): void {
@@ -83,10 +116,12 @@ export class Win32UpdateService extends AbstractUpdateService {
 
 		this.setState(State.CheckingForUpdates(context));
 
-		this.requestService.request({ url: this.url })
+		this.requestService.request({ url: this.url }, CancellationToken.None)
 			.then<IUpdate>(asJson)
 			.then(update => {
-				if (!update || !update.url || !update.version) {
+				const updateType = getUpdateType();
+
+				if (!update || !update.url || !update.version || !update.productVersion) {
 					/* __GDPR__
 							"update:notAvailable" : {
 								"explicit" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true }
@@ -94,7 +129,12 @@ export class Win32UpdateService extends AbstractUpdateService {
 						*/
 					this.telemetryService.publicLog('update:notAvailable', { explicit: !!context });
 
-					this.setState(State.Idle);
+					this.setState(State.Idle(updateType));
+					return TPromise.as(null);
+				}
+
+				if (updateType === UpdateType.Archive) {
+					this.setState(State.AvailableForDownload(update));
 					return TPromise.as(null);
 				}
 
@@ -111,7 +151,7 @@ export class Win32UpdateService extends AbstractUpdateService {
 							const hash = update.hash;
 							const downloadPath = `${updatePackagePath}.tmp`;
 
-							return this.requestService.request({ url })
+							return this.requestService.request({ url }, CancellationToken.None)
 								.then(context => download(downloadPath, context))
 								.then(hash ? () => checksum(downloadPath, update.hash) : () => null)
 								.then(() => pfs.rename(downloadPath, updatePackagePath))
@@ -123,7 +163,11 @@ export class Win32UpdateService extends AbstractUpdateService {
 						this.availableUpdate = { packagePath };
 
 						if (fastUpdatesEnabled && update.supportsFastUpdate) {
-							this.setState(State.Downloaded(update));
+							if (product.target === 'user') {
+								this.doApplyUpdate();
+							} else {
+								this.setState(State.Downloaded(update));
+							}
 						} else {
 							this.setState(State.Ready(update));
 						}
@@ -138,10 +182,16 @@ export class Win32UpdateService extends AbstractUpdateService {
 					}
 					*/
 				this.telemetryService.publicLog('update:notAvailable', { explicit: !!context });
-				this.setState(State.Idle);
+				this.setState(State.Idle(getUpdateType()));
 			});
 	}
 
+	protected doDownloadUpdate(state: AvailableForDownload): TPromise<void> {
+		shell.openExternal(state.update.url);
+		this.setState(State.Idle(getUpdateType()));
+		return TPromise.as(null);
+	}
+
 	private getUpdatePackagePath(version: string): TPromise<string> {
 		return this.cachePath.then(cachePath => path.join(cachePath, `CodeSetup-${product.quality}-${version}.exe`));
 	}
@@ -159,7 +209,11 @@ export class Win32UpdateService extends AbstractUpdateService {
 	}
 
 	protected doApplyUpdate(): TPromise<void> {
-		if (this.state.type !== StateType.Downloaded || !this.availableUpdate) {
+		if (this.state.type !== StateType.Downloaded && this.state.type !== StateType.Downloading) {
+			return TPromise.as(null);
+		}
+
+		if (!this.availableUpdate) {
 			return TPromise.as(null);
 		}
 
@@ -178,7 +232,7 @@ export class Win32UpdateService extends AbstractUpdateService {
 
 				child.once('exit', () => {
 					this.availableUpdate = undefined;
-					this.setState(State.Idle);
+					this.setState(State.Idle(getUpdateType()));
 				});
 
 				const readyMutexName = `${product.win32MutexName}-ready`;
@@ -207,4 +261,8 @@ export class Win32UpdateService extends AbstractUpdateService {
 			});
 		}
 	}
+
+	protected getUpdateType(): UpdateType {
+		return getUpdateType();
+	}
 }
diff --git a/src/vs/platform/update/node/update.config.contribution.ts b/src/vs/platform/update/node/update.config.contribution.ts
index 86ad52731dc..7ad60bdfc4f 100644
--- a/src/vs/platform/update/node/update.config.contribution.ts
+++ b/src/vs/platform/update/node/update.config.contribution.ts
@@ -21,18 +21,21 @@ configurationRegistry.registerConfiguration({
 			'enum': ['none', 'default'],
 			'default': 'default',
 			'scope': ConfigurationScope.APPLICATION,
-			'description': nls.localize('updateChannel', "Configure whether you receive automatic updates from an update channel. Requires a restart after change.")
+			'description': nls.localize('updateChannel', "Configure whether you receive automatic updates from an update channel. Requires a restart after change. The updates are fetched from an online service."),
+			'tags': ['usesOnlineServices']
 		},
 		'update.enableWindowsBackgroundUpdates': {
 			'type': 'boolean',
 			'default': true,
 			'scope': ConfigurationScope.APPLICATION,
-			'description': nls.localize('enableWindowsBackgroundUpdates', "Enables Windows background updates.")
+			'description': nls.localize('enableWindowsBackgroundUpdates', "Enables Windows background updates. The updates are fetched from an online service."),
+			'tags': ['usesOnlineServices']
 		},
 		'update.showReleaseNotes': {
 			'type': 'boolean',
 			'default': true,
-			'description': nls.localize('showReleaseNotes', "Show Release Notes after an update.")
+			'description': nls.localize('showReleaseNotes', "Show Release Notes after an update. The Release Notes are fetched from an online service."),
+			'tags': ['usesOnlineServices']
 		}
 	}
 });
diff --git a/src/vs/platform/update/common/updateIpc.ts b/src/vs/platform/update/node/updateIpc.ts
similarity index 75%
rename from src/vs/platform/update/common/updateIpc.ts
rename to src/vs/platform/update/node/updateIpc.ts
index 2e26e13ed3d..42d5b2ecaec 100644
--- a/src/vs/platform/update/common/updateIpc.ts
+++ b/src/vs/platform/update/node/updateIpc.ts
@@ -6,17 +6,20 @@
 'use strict';
 
 import { TPromise } from 'vs/base/common/winjs.base';
-import { IChannel, eventToCall, eventFromCall } from 'vs/base/parts/ipc/common/ipc';
+import { IChannel } from 'vs/base/parts/ipc/node/ipc';
 import { Event, Emitter } from 'vs/base/common/event';
-import { onUnexpectedError } from 'vs/base/common/errors';
-import { IUpdateService, State } from './update';
+import { IUpdateService, State } from 'vs/platform/update/common/update';
 
 export interface IUpdateChannel extends IChannel {
+	listen(event: 'onStateChange'): Event<State>;
+	listen<T>(command: string, arg?: any): Event<T>;
+
 	call(command: 'checkForUpdates', arg: any): TPromise<void>;
 	call(command: 'downloadUpdate'): TPromise<void>;
 	call(command: 'applyUpdate'): TPromise<void>;
 	call(command: 'quitAndInstall'): TPromise<void>;
 	call(command: '_getInitialState'): TPromise<State>;
+	call(command: 'isLatestVersion'): TPromise<boolean>;
 	call(command: string, arg?: any): TPromise<any>;
 }
 
@@ -24,14 +27,22 @@ export class UpdateChannel implements IUpdateChannel {
 
 	constructor(private service: IUpdateService) { }
 
+	listen<T>(event: string, arg?: any): Event<any> {
+		switch (event) {
+			case 'onStateChange': return this.service.onStateChange;
+		}
+
+		throw new Error('No event found');
+	}
+
 	call(command: string, arg?: any): TPromise<any> {
 		switch (command) {
-			case 'event:onStateChange': return eventToCall(this.service.onStateChange);
 			case 'checkForUpdates': return this.service.checkForUpdates(arg);
 			case 'downloadUpdate': return this.service.downloadUpdate();
 			case 'applyUpdate': return this.service.applyUpdate();
 			case 'quitAndInstall': return this.service.quitAndInstall();
 			case '_getInitialState': return TPromise.as(this.service.state);
+			case 'isLatestVersion': return this.service.isLatestVersion();
 		}
 		return undefined;
 	}
@@ -41,8 +52,6 @@ export class UpdateChannelClient implements IUpdateService {
 
 	_serviceBrand: any;
 
-	private _onRemoteStateChange = eventFromCall<State>(this.channel, 'event:onStateChange');
-
 	private _onStateChange = new Emitter<State>();
 	get onStateChange(): Event<State> { return this._onStateChange.event; }
 
@@ -53,13 +62,14 @@ export class UpdateChannelClient implements IUpdateService {
 		// always set this._state as the state changes
 		this.onStateChange(state => this._state = state);
 
-		channel.call('_getInitialState').done(state => {
+		channel.call('_getInitialState').then(state => {
 			// fire initial state
 			this._onStateChange.fire(state);
 
 			// fire subsequent states as they come in from remote
-			this._onRemoteStateChange(state => this._onStateChange.fire(state));
-		}, onUnexpectedError);
+
+			this.channel.listen('onStateChange')(state => this._onStateChange.fire(state));
+		});
 	}
 
 	checkForUpdates(context: any): TPromise<void> {
@@ -77,4 +87,8 @@ export class UpdateChannelClient implements IUpdateService {
 	quitAndInstall(): TPromise<void> {
 		return this.channel.call('quitAndInstall');
 	}
-}
\ No newline at end of file
+
+	isLatestVersion(): TPromise<boolean> {
+		return this.channel.call('isLatestVersion');
+	}
+}
diff --git a/src/vs/platform/url/common/url.ts b/src/vs/platform/url/common/url.ts
index 63bfc01b6c4..2d1582c4465 100644
--- a/src/vs/platform/url/common/url.ts
+++ b/src/vs/platform/url/common/url.ts
@@ -5,7 +5,7 @@
 
 'use strict';
 
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
 import { IDisposable } from 'vs/base/common/lifecycle';
 import { TPromise } from 'vs/base/common/winjs.base';
diff --git a/src/vs/platform/url/common/urlIpc.ts b/src/vs/platform/url/common/urlIpc.ts
deleted file mode 100644
index 0cc9ec695ad..00000000000
--- a/src/vs/platform/url/common/urlIpc.ts
+++ /dev/null
@@ -1,70 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-'use strict';
-
-import { TPromise } from 'vs/base/common/winjs.base';
-import { IChannel } from 'vs/base/parts/ipc/common/ipc';
-import { IURLHandler, IURLService } from './url';
-import URI from 'vs/base/common/uri';
-import { IDisposable } from 'vs/base/common/lifecycle';
-
-export interface IURLServiceChannel extends IChannel {
-	call(command: 'open', url: string): TPromise<boolean>;
-	call(command: string, arg?: any): TPromise<any>;
-}
-
-export class URLServiceChannel implements IURLServiceChannel {
-
-	constructor(private service: IURLService) { }
-
-	call(command: string, arg?: any): TPromise<any> {
-		switch (command) {
-			case 'open': return this.service.open(URI.revive(arg));
-		}
-		return undefined;
-	}
-}
-
-export class URLServiceChannelClient implements IURLService {
-
-	_serviceBrand: any;
-
-	constructor(private channel: IChannel) { }
-
-	open(url: URI): TPromise<boolean, any> {
-		return this.channel.call('open', url.toJSON());
-	}
-
-	registerHandler(handler: IURLHandler): IDisposable {
-		throw new Error('Not implemented.');
-	}
-}
-
-export interface IURLHandlerChannel extends IChannel {
-	call(command: 'handleURL', arg: any): TPromise<boolean>;
-	call(command: string, arg?: any): TPromise<any>;
-}
-
-export class URLHandlerChannel implements IURLHandlerChannel {
-
-	constructor(private handler: IURLHandler) { }
-
-	call(command: string, arg?: any): TPromise<any> {
-		switch (command) {
-			case 'handleURL': return this.handler.handleURL(URI.revive(arg));
-		}
-		return undefined;
-	}
-}
-
-export class URLHandlerChannelClient implements IURLHandler {
-
-	constructor(private channel: IChannel) { }
-
-	handleURL(uri: URI): TPromise<boolean> {
-		return this.channel.call('handleURL', uri.toJSON());
-	}
-}
\ No newline at end of file
diff --git a/src/vs/platform/url/common/urlService.ts b/src/vs/platform/url/common/urlService.ts
index f4fbab19d7d..0d71301aac0 100644
--- a/src/vs/platform/url/common/urlService.ts
+++ b/src/vs/platform/url/common/urlService.ts
@@ -6,9 +6,10 @@
 'use strict';
 
 import { IURLService, IURLHandler } from 'vs/platform/url/common/url';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { IDisposable, toDisposable } from 'vs/base/common/lifecycle';
 import { TPromise } from 'vs/base/common/winjs.base';
+import { first } from 'vs/base/common/async';
 
 declare module Array {
 	function from<T>(set: Set<T>): T[];
@@ -20,16 +21,9 @@ export class URLService implements IURLService {
 
 	private handlers = new Set<IURLHandler>();
 
-	async open(uri: URI): TPromise<boolean> {
+	open(uri: URI): TPromise<boolean> {
 		const handlers = Array.from(this.handlers);
-
-		for (const handler of handlers) {
-			if (await handler.handleURL(uri)) {
-				return true;
-			}
-		}
-
-		return false;
+		return first(handlers.map(h => () => h.handleURL(uri)), undefined, false);
 	}
 
 	registerHandler(handler: IURLHandler): IDisposable {
@@ -44,7 +38,7 @@ export class RelayURLService extends URLService implements IURLHandler {
 		super();
 	}
 
-	async open(uri: URI): TPromise<boolean> {
+	open(uri: URI): TPromise<boolean> {
 		return this.urlService.open(uri);
 	}
 
diff --git a/src/vs/platform/url/electron-browser/inactiveExtensionUrlHandler.ts b/src/vs/platform/url/electron-browser/inactiveExtensionUrlHandler.ts
deleted file mode 100644
index f8c42720026..00000000000
--- a/src/vs/platform/url/electron-browser/inactiveExtensionUrlHandler.ts
+++ /dev/null
@@ -1,149 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import { IURLService, IURLHandler } from 'vs/platform/url/common/url';
-import URI from 'vs/base/common/uri';
-import { TPromise } from 'vs/base/common/winjs.base';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { IDisposable, toDisposable, combinedDisposable } from 'vs/base/common/lifecycle';
-import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { localize } from 'vs/nls';
-
-const FIVE_MINUTES = 5 * 60 * 1000;
-const THIRTY_SECONDS = 30 * 1000;
-
-function isExtensionId(value: string): boolean {
-	return /^[a-z0-9][a-z0-9\-]*\.[a-z0-9][a-z0-9\-]*$/i.test(value);
-}
-
-export const IExtensionUrlHandler = createDecorator<IExtensionUrlHandler>('inactiveExtensionUrlHandler');
-
-export interface IExtensionUrlHandler {
-	readonly _serviceBrand: any;
-	registerExtensionHandler(extensionId: string, handler: IURLHandler): void;
-	unregisterExtensionHandler(extensionId: string): void;
-}
-
-/**
- * This class handles URLs which are directed towards inactive extensions.
- * If a URL is directed towards an inactive extension, it buffers it,
- * activates the extension and re-opens the URL once the extension registers
- * a URL handler. If the extension never registers a URL handler, the urls
- * will eventually be garbage collected.
- *
- * It also makes sure the user confirms opening URLs directed towards extensions.
- */
-export class ExtensionUrlHandler implements IExtensionUrlHandler, IURLHandler {
-
-	readonly _serviceBrand: any;
-
-	private extensionHandlers = new Map<string, IURLHandler>();
-	private uriBuffer = new Map<string, { timestamp: number, uri: URI }[]>();
-	private disposable: IDisposable;
-
-	constructor(
-		@IURLService urlService: IURLService,
-		@IExtensionService private extensionService: IExtensionService,
-		@IDialogService private dialogService: IDialogService
-	) {
-		const interval = setInterval(() => this.garbageCollect(), THIRTY_SECONDS);
-
-		this.disposable = combinedDisposable([
-			urlService.registerHandler(this),
-			toDisposable(() => clearInterval(interval))
-		]);
-	}
-
-	async handleURL(uri: URI): TPromise<boolean> {
-		if (!isExtensionId(uri.authority)) {
-			return false;
-		}
-
-		const extensionId = uri.authority;
-		const wasHandlerAvailable = this.extensionHandlers.has(extensionId);
-
-		const extensions = await this.extensionService.getExtensions();
-		const extension = extensions.filter(e => e.id === extensionId)[0];
-
-		if (!extension) {
-			return false;
-		}
-
-		const result = await this.dialogService.confirm({
-			message: localize('confirmUrl', "Allow an extension to open this URL?", extensionId),
-			detail: `${extension.displayName || extension.name} (${extensionId}) wants to open a URL:\n\n${uri.toString()}`
-		});
-
-		if (!result.confirmed) {
-			return true;
-		}
-
-		const handler = this.extensionHandlers.get(extensionId);
-		if (handler) {
-			if (!wasHandlerAvailable) {
-				// forward it directly
-				return handler.handleURL(uri);
-			}
-
-			// let the ExtensionUrlHandler instance handle this
-			return TPromise.as(false);
-		}
-
-		// collect URI for eventual extension activation
-		const timestamp = new Date().getTime();
-		let uris = this.uriBuffer.get(extensionId);
-
-		if (!uris) {
-			uris = [];
-			this.uriBuffer.set(extensionId, uris);
-		}
-
-		uris.push({ timestamp, uri });
-
-		// activate the extension
-		await this.extensionService.activateByEvent(`onUri:${extensionId}`);
-
-		return true;
-	}
-
-	registerExtensionHandler(extensionId: string, handler: IURLHandler): void {
-		this.extensionHandlers.set(extensionId, handler);
-
-		const uris = this.uriBuffer.get(extensionId) || [];
-
-		for (const { uri } of uris) {
-			handler.handleURL(uri);
-		}
-
-		this.uriBuffer.delete(extensionId);
-	}
-
-	unregisterExtensionHandler(extensionId: string): void {
-		this.extensionHandlers.delete(extensionId);
-	}
-
-	// forget about all uris buffered more than 5 minutes ago
-	private garbageCollect(): void {
-		const now = new Date().getTime();
-		const uriBuffer = new Map<string, { timestamp: number, uri: URI }[]>();
-
-		this.uriBuffer.forEach((uris, extensionId) => {
-			uris = uris.filter(({ timestamp }) => now - timestamp < FIVE_MINUTES);
-
-			if (uris.length > 0) {
-				uriBuffer.set(extensionId, uris);
-			}
-		});
-
-		this.uriBuffer = uriBuffer;
-	}
-
-	dispose(): void {
-		this.disposable.dispose();
-		this.extensionHandlers.clear();
-		this.uriBuffer.clear();
-	}
-}
\ No newline at end of file
diff --git a/src/vs/platform/url/electron-main/electronUrlListener.ts b/src/vs/platform/url/electron-main/electronUrlListener.ts
index b3b0fdf8bd1..1e5fac2620f 100644
--- a/src/vs/platform/url/electron-main/electronUrlListener.ts
+++ b/src/vs/platform/url/electron-main/electronUrlListener.ts
@@ -9,7 +9,7 @@ import { mapEvent, fromNodeEventEmitter, filterEvent, once } from 'vs/base/commo
 import { IURLService } from 'vs/platform/url/common/url';
 import product from 'vs/platform/node/product';
 import { app } from 'electron';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { IWindowsMainService } from 'vs/platform/windows/electron-main/windows';
 import { ReadyState } from 'vs/platform/windows/common/windows';
diff --git a/src/vs/platform/url/node/urlIpc.ts b/src/vs/platform/url/node/urlIpc.ts
new file mode 100644
index 00000000000..7122ab17100
--- /dev/null
+++ b/src/vs/platform/url/node/urlIpc.ts
@@ -0,0 +1,79 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+import { TPromise } from 'vs/base/common/winjs.base';
+import { IChannel } from 'vs/base/parts/ipc/node/ipc';
+import { URI } from 'vs/base/common/uri';
+import { IDisposable } from 'vs/base/common/lifecycle';
+import { Event } from 'vs/base/common/event';
+import { IURLService, IURLHandler } from 'vs/platform/url/common/url';
+
+export interface IURLServiceChannel extends IChannel {
+	call(command: 'open', url: string): Thenable<boolean>;
+	call(command: string, arg?: any): Thenable<any>;
+}
+
+export class URLServiceChannel implements IURLServiceChannel {
+
+	constructor(private service: IURLService) { }
+
+	listen<T>(event: string, arg?: any): Event<T> {
+		throw new Error('No events');
+	}
+
+	call(command: string, arg?: any): Thenable<any> {
+		switch (command) {
+			case 'open': return this.service.open(URI.revive(arg));
+		}
+		return undefined;
+	}
+}
+
+export class URLServiceChannelClient implements IURLService {
+
+	_serviceBrand: any;
+
+	constructor(private channel: IChannel) { }
+
+	open(url: URI): TPromise<boolean> {
+		return TPromise.wrap(this.channel.call('open', url.toJSON()));
+	}
+
+	registerHandler(handler: IURLHandler): IDisposable {
+		throw new Error('Not implemented.');
+	}
+}
+
+export interface IURLHandlerChannel extends IChannel {
+	call(command: 'handleURL', arg: any): Thenable<boolean>;
+	call(command: string, arg?: any): Thenable<any>;
+}
+
+export class URLHandlerChannel implements IURLHandlerChannel {
+
+	constructor(private handler: IURLHandler) { }
+
+	listen<T>(event: string, arg?: any): Event<T> {
+		throw new Error('No events');
+	}
+
+	call(command: string, arg?: any): Thenable<any> {
+		switch (command) {
+			case 'handleURL': return this.handler.handleURL(URI.revive(arg));
+		}
+		return undefined;
+	}
+}
+
+export class URLHandlerChannelClient implements IURLHandler {
+
+	constructor(private channel: IChannel) { }
+
+	handleURL(uri: URI): TPromise<boolean> {
+		return TPromise.wrap(this.channel.call('handleURL', uri.toJSON()));
+	}
+}
\ No newline at end of file
diff --git a/src/vs/platform/widget/browser/contextScopedHistoryWidget.ts b/src/vs/platform/widget/browser/contextScopedHistoryWidget.ts
new file mode 100644
index 00000000000..013485d5e42
--- /dev/null
+++ b/src/vs/platform/widget/browser/contextScopedHistoryWidget.ts
@@ -0,0 +1,76 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+'use strict';
+
+import { IContextKeyService, ContextKeyDefinedExpr, ContextKeyExpr, ContextKeyAndExpr, ContextKeyEqualsExpr, RawContextKey, IContextKey } from 'vs/platform/contextkey/common/contextkey';
+import { HistoryInputBox, IHistoryInputOptions } from 'vs/base/browser/ui/inputbox/inputBox';
+import { FindInput, IFindInputOptions } from 'vs/base/browser/ui/findinput/findInput';
+import { IContextViewProvider } from 'vs/base/browser/ui/contextview/contextview';
+import { IContextScopedWidget, getContextScopedWidget, createWidgetScopedContextKeyService, bindContextScopedWidget } from 'vs/platform/widget/common/contextScopedWidget';
+import { IHistoryNavigationWidget } from 'vs/base/browser/history';
+import { KeybindingsRegistry, KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
+import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
+
+export const HistoryNavigationWidgetContext = 'historyNavigationWidget';
+export const HistoryNavigationEnablementContext = 'historyNavigationEnabled';
+
+export interface IContextScopedHistoryNavigationWidget extends IContextScopedWidget {
+
+	historyNavigator: IHistoryNavigationWidget;
+
+}
+
+export function createAndBindHistoryNavigationWidgetScopedContextKeyService(contextKeyService: IContextKeyService, widget: IContextScopedHistoryNavigationWidget): { scopedContextKeyService: IContextKeyService, historyNavigationEnablement: IContextKey<boolean> } {
+	const scopedContextKeyService = createWidgetScopedContextKeyService(contextKeyService, widget);
+	bindContextScopedWidget(scopedContextKeyService, widget, HistoryNavigationWidgetContext);
+	const historyNavigationEnablement = new RawContextKey<boolean>(HistoryNavigationEnablementContext, true).bindTo(scopedContextKeyService);
+	return { scopedContextKeyService, historyNavigationEnablement };
+}
+
+export class ContextScopedHistoryInputBox extends HistoryInputBox {
+
+	constructor(container: HTMLElement, contextViewProvider: IContextViewProvider, options: IHistoryInputOptions,
+		@IContextKeyService contextKeyService: IContextKeyService
+	) {
+		super(container, contextViewProvider, options);
+		this._register(createAndBindHistoryNavigationWidgetScopedContextKeyService(contextKeyService, <IContextScopedHistoryNavigationWidget>{ target: this.element, historyNavigator: this }).scopedContextKeyService);
+	}
+
+}
+
+export class ContextScopedFindInput extends FindInput {
+
+	constructor(container: HTMLElement, contextViewProvider: IContextViewProvider, options: IFindInputOptions,
+		@IContextKeyService contextKeyService: IContextKeyService
+	) {
+		super(container, contextViewProvider, options);
+		this._register(createAndBindHistoryNavigationWidgetScopedContextKeyService(contextKeyService, <IContextScopedHistoryNavigationWidget>{ target: this.inputBox.element, historyNavigator: this.inputBox }).scopedContextKeyService);
+	}
+
+}
+
+KeybindingsRegistry.registerCommandAndKeybindingRule({
+	id: 'history.showPrevious',
+	weight: KeybindingWeight.WorkbenchContrib,
+	when: ContextKeyExpr.and(new ContextKeyDefinedExpr(HistoryNavigationWidgetContext), new ContextKeyEqualsExpr(HistoryNavigationEnablementContext, true)),
+	primary: KeyCode.UpArrow,
+	secondary: [KeyMod.Alt | KeyCode.UpArrow],
+	handler: (accessor, arg2) => {
+		const historyInputBox: IHistoryNavigationWidget = getContextScopedWidget<IContextScopedHistoryNavigationWidget>(accessor.get(IContextKeyService), HistoryNavigationWidgetContext).historyNavigator;
+		historyInputBox.showPreviousValue();
+	}
+});
+
+KeybindingsRegistry.registerCommandAndKeybindingRule({
+	id: 'history.showNext',
+	weight: KeybindingWeight.WorkbenchContrib,
+	when: new ContextKeyAndExpr([new ContextKeyDefinedExpr(HistoryNavigationWidgetContext), new ContextKeyEqualsExpr(HistoryNavigationEnablementContext, true)]),
+	primary: KeyCode.DownArrow,
+	secondary: [KeyMod.Alt | KeyCode.DownArrow],
+	handler: (accessor, arg2) => {
+		const historyInputBox: IHistoryNavigationWidget = getContextScopedWidget<IContextScopedHistoryNavigationWidget>(accessor.get(IContextKeyService), HistoryNavigationWidgetContext).historyNavigator;
+		historyInputBox.showNextValue();
+	}
+});
diff --git a/src/vs/platform/widget/browser/input.ts b/src/vs/platform/widget/browser/input.ts
deleted file mode 100644
index 51cdcbb5b72..00000000000
--- a/src/vs/platform/widget/browser/input.ts
+++ /dev/null
@@ -1,74 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-'use strict';
-
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { HistoryInputBox, IHistoryInputOptions } from 'vs/base/browser/ui/inputbox/inputBox';
-import { FindInput, IFindInputOptions } from 'vs/base/browser/ui/findinput/findInput';
-import { IContextViewProvider } from 'vs/base/browser/ui/contextview/contextview';
-import { createWidgetScopedContextKeyService, IWidget } from 'vs/platform/widget/browser/widget';
-import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
-import { ResolvedKeybindingItem } from 'vs/platform/keybinding/common/resolvedKeybindingItem';
-import { localize } from 'vs/nls';
-
-export const HistoryInputBoxContext = 'historyInputBox';
-
-export class ContextScopedHistoryInputBox extends HistoryInputBox implements IWidget {
-
-	constructor(container: HTMLElement, contextViewProvider: IContextViewProvider, options: IHistoryInputOptions,
-		@IContextKeyService contextKeyService: IContextKeyService
-	) {
-		super(container, contextViewProvider, options);
-		this._register(createWidgetScopedContextKeyService(contextKeyService, this, HistoryInputBoxContext));
-	}
-}
-
-export class ContextScopedFindInput extends FindInput {
-
-	constructor(container: HTMLElement, contextViewProvider: IContextViewProvider, options: IFindInputOptions,
-		@IContextKeyService contextKeyService: IContextKeyService
-	) {
-		super(container, contextViewProvider, options);
-		this._register(createWidgetScopedContextKeyService(contextKeyService, this.inputBox, HistoryInputBoxContext));
-	}
-
-}
-
-export function showDeprecatedWarning(notificationService: INotificationService, keybindingService: IKeybindingService, storageService: IStorageService): void {
-	const previousCommand = 'input.action.historyPrevious';
-	const nextCommand = 'input.action.historyNext';
-	let previousKeybinding: ResolvedKeybindingItem, nextKeybinding: ResolvedKeybindingItem;
-	for (const keybinding of keybindingService.getKeybindings()) {
-		if (keybinding.command === previousCommand) {
-			if (!keybinding.isDefault) {
-				return;
-			}
-			previousKeybinding = keybinding;
-		}
-		if (keybinding.command === nextCommand) {
-			if (!keybinding.isDefault) {
-				return;
-			}
-			nextKeybinding = keybinding;
-		}
-	}
-	const key = 'donotshow.historyNavigation.warning';
-	if (!storageService.getBoolean(key, StorageScope.GLOBAL, false)) {
-		const message = localize('showDeprecatedWarningMessage', "History navigation commands you are using are deprecated. Instead use following new commands: {0} and {1}", `${previousCommand} (${previousKeybinding.resolvedKeybinding.getLabel()})`, `${nextCommand} (${nextKeybinding.resolvedKeybinding.getLabel()})`);
-		notificationService.prompt(Severity.Warning, message, [
-			{
-				label: localize('more information', "More Information..."),
-				run: () => null
-			},
-			{
-				label: localize('Do not show again', "Don't show again"),
-				isSecondary: true,
-				run: () => storageService.store(key, true, StorageScope.GLOBAL)
-			}
-		]);
-	}
-}
\ No newline at end of file
diff --git a/src/vs/platform/widget/browser/widget.contribution.ts b/src/vs/platform/widget/browser/widget.contribution.ts
deleted file mode 100644
index 894ec6870ce..00000000000
--- a/src/vs/platform/widget/browser/widget.contribution.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-'use strict';
-
-import { KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { KeyCode } from 'vs/base/common/keyCodes';
-import { ContextKeyDefinedExpr, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { HistoryInputBoxContext } from 'vs/platform/widget/browser/input';
-import { HistoryInputBox } from 'vs/base/browser/ui/inputbox/inputBox';
-
-KeybindingsRegistry.registerCommandAndKeybindingRule({
-	id: 'input.action.historyPrevious',
-	weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
-	when: new ContextKeyDefinedExpr(HistoryInputBoxContext),
-	primary: KeyCode.UpArrow,
-	handler: (accessor, arg2) => {
-		const historyInputBox: HistoryInputBox = accessor.get(IContextKeyService).getContext(document.activeElement).getValue(HistoryInputBoxContext);
-		historyInputBox.showPreviousValue();
-	}
-});
-
-KeybindingsRegistry.registerCommandAndKeybindingRule({
-	id: 'input.action.historyNext',
-	weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
-	when: new ContextKeyDefinedExpr(HistoryInputBoxContext),
-	primary: KeyCode.DownArrow,
-	handler: (accessor, arg2) => {
-		const historyInputBox: HistoryInputBox = accessor.get(IContextKeyService).getContext(document.activeElement).getValue(HistoryInputBoxContext);
-		historyInputBox.showNextValue();
-	}
-});
diff --git a/src/vs/platform/widget/browser/widget.ts b/src/vs/platform/widget/browser/widget.ts
deleted file mode 100644
index a69bc135694..00000000000
--- a/src/vs/platform/widget/browser/widget.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-'use strict';
-
-import { IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
-
-export function createWidgetScopedContextKeyService(contextKeyService: IContextKeyService, widget: IWidget, contextKey: string): IContextKeyService {
-	const result = contextKeyService.createScoped(widget.element);
-	const widgetContext = new RawContextKey<IWidget>(contextKey, widget);
-	widgetContext.bindTo(result);
-	return result;
-}
-
-export interface IWidget {
-
-	readonly element: HTMLElement;
-
-}
\ No newline at end of file
diff --git a/src/vs/platform/widget/common/contextScopedWidget.ts b/src/vs/platform/widget/common/contextScopedWidget.ts
new file mode 100644
index 00000000000..4a552485026
--- /dev/null
+++ b/src/vs/platform/widget/common/contextScopedWidget.ts
@@ -0,0 +1,25 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+'use strict';
+
+import { IContextKeyService, RawContextKey, IContextKeyServiceTarget } from 'vs/platform/contextkey/common/contextkey';
+
+export function bindContextScopedWidget(contextKeyService: IContextKeyService, widget: IContextScopedWidget, contextKey: string): void {
+	new RawContextKey<IContextScopedWidget>(contextKey, widget).bindTo(contextKeyService);
+}
+
+export function createWidgetScopedContextKeyService(contextKeyService: IContextKeyService, widget: IContextScopedWidget): IContextKeyService {
+	return contextKeyService.createScoped(widget.target);
+}
+
+export function getContextScopedWidget<T extends IContextScopedWidget>(contextKeyService: IContextKeyService, contextKey: string): T {
+	return contextKeyService.getContext(document.activeElement).getValue(contextKey);
+}
+
+export interface IContextScopedWidget {
+
+	readonly target: IContextKeyServiceTarget;
+
+}
\ No newline at end of file
diff --git a/src/vs/platform/windows/common/windows.ts b/src/vs/platform/windows/common/windows.ts
index f548718cd75..d82d7c8227a 100644
--- a/src/vs/platform/windows/common/windows.ts
+++ b/src/vs/platform/windows/common/windows.ts
@@ -11,12 +11,13 @@ import { Event, latch, anyEvent } from 'vs/base/common/event';
 import { ITelemetryData } from 'vs/platform/telemetry/common/telemetry';
 import { IProcessEnvironment } from 'vs/base/common/platform';
 import { ParsedArgs } from 'vs/platform/environment/common/environment';
-import { IWorkspaceIdentifier, IWorkspaceFolderCreationData } from 'vs/platform/workspaces/common/workspaces';
+import { IWorkspaceIdentifier, IWorkspaceFolderCreationData, ISingleFolderWorkspaceIdentifier } from 'vs/platform/workspaces/common/workspaces';
 import { IRecentlyOpened } from 'vs/platform/history/common/history';
-import { ICommandAction } from 'vs/platform/actions/common/actions';
-import { PerformanceEntry } from 'vs/base/common/performance';
+import { ISerializableCommandAction } from 'vs/platform/actions/common/actions';
+import { ExportData } from 'vs/base/common/performance';
 import { LogLevel } from 'vs/platform/log/common/log';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
+import { URI, UriComponents } from 'vs/base/common/uri';
 
 export const IWindowsService = createDecorator<IWindowsService>('windowsService');
 
@@ -103,6 +104,9 @@ export interface IWindowsService {
 	onWindowOpen: Event<number>;
 	onWindowFocus: Event<number>;
 	onWindowBlur: Event<number>;
+	onWindowMaximize: Event<number>;
+	onWindowUnmaximize: Event<number>;
+	onRecentlyOpenedChange: Event<void>;
 
 	// Dialogs
 	pickFileFolderAndOpen(options: INativeOpenDialogOptions): TPromise<void>;
@@ -117,12 +121,13 @@ export interface IWindowsService {
 	openDevTools(windowId: number, options?: IDevToolsOptions): TPromise<void>;
 	toggleDevTools(windowId: number): TPromise<void>;
 	closeWorkspace(windowId: number): TPromise<void>;
+	enterWorkspace(windowId: number, path: string): TPromise<IEnterWorkspaceResult>;
 	createAndEnterWorkspace(windowId: number, folders?: IWorkspaceFolderCreationData[], path?: string): TPromise<IEnterWorkspaceResult>;
 	saveAndEnterWorkspace(windowId: number, path: string): TPromise<IEnterWorkspaceResult>;
 	toggleFullScreen(windowId: number): TPromise<void>;
 	setRepresentedFilename(windowId: number, fileName: string): TPromise<void>;
-	addRecentlyOpened(files: string[]): TPromise<void>;
-	removeFromRecentlyOpened(paths: string[]): TPromise<void>;
+	addRecentlyOpened(files: URI[]): TPromise<void>;
+	removeFromRecentlyOpened(paths: (IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier | URI | string)[]): TPromise<void>;
 	clearRecentlyOpened(): TPromise<void>;
 	getRecentlyOpened(windowId: number): TPromise<IRecentlyOpened>;
 	focusWindow(windowId: number): TPromise<void>;
@@ -131,12 +136,14 @@ export interface IWindowsService {
 	isMaximized(windowId: number): TPromise<boolean>;
 	maximizeWindow(windowId: number): TPromise<void>;
 	unmaximizeWindow(windowId: number): TPromise<void>;
+	minimizeWindow(windowId: number): TPromise<void>;
 	onWindowTitleDoubleClick(windowId: number): TPromise<void>;
 	setDocumentEdited(windowId: number, flag: boolean): TPromise<void>;
 	quit(): TPromise<void>;
 	relaunch(options: { addArgs?: string[], removeArgs?: string[] }): TPromise<void>;
 
 	// macOS Native Tabs
+	newWindowTab(): TPromise<void>;
 	showPreviousWindowTab(): TPromise<void>;
 	showNextWindowTab(): TPromise<void>;
 	moveWindowTabToNewWindow(): TPromise<void>;
@@ -144,20 +151,21 @@ export interface IWindowsService {
 	toggleWindowTabsBar(): TPromise<void>;
 
 	// macOS TouchBar
-	updateTouchBar(windowId: number, items: ICommandAction[][]): TPromise<void>;
+	updateTouchBar(windowId: number, items: ISerializableCommandAction[][]): TPromise<void>;
 
 	// Shared process
 	whenSharedProcessReady(): TPromise<void>;
 	toggleSharedProcess(): TPromise<void>;
 
 	// Global methods
-	openWindow(windowId: number, paths: string[], options?: { forceNewWindow?: boolean, forceReuseWindow?: boolean, forceOpenWorkspaceAsFile?: boolean; }): TPromise<void>;
+	openWindow(windowId: number, paths: URI[], options?: { forceNewWindow?: boolean, forceReuseWindow?: boolean, forceOpenWorkspaceAsFile?: boolean, args?: ParsedArgs }): TPromise<void>;
 	openNewWindow(): TPromise<void>;
 	showWindow(windowId: number): TPromise<void>;
-	getWindows(): TPromise<{ id: number; workspace?: IWorkspaceIdentifier; folderPath?: string; title: string; filename?: string; }[]>;
+	getWindows(): TPromise<{ id: number; workspace?: IWorkspaceIdentifier; folderUri?: ISingleFolderWorkspaceIdentifier; title: string; filename?: string; }[]>;
 	getWindowCount(): TPromise<number>;
 	log(severity: string, ...messages: string[]): TPromise<void>;
 	showItemInFolder(path: string): TPromise<void>;
+	getActiveWindowId(): TPromise<number | undefined>;
 
 	// This needs to be handled from browser process to prevent
 	// foreground ordering issues on Windows
@@ -181,6 +189,7 @@ export interface IWindowService {
 	_serviceBrand: any;
 
 	onDidChangeFocus: Event<boolean>;
+	onDidChangeMaximize: Event<boolean>;
 
 	getConfiguration(): IWindowConfiguration;
 	getCurrentWindowId(): number;
@@ -192,7 +201,8 @@ export interface IWindowService {
 	openDevTools(options?: IDevToolsOptions): TPromise<void>;
 	toggleDevTools(): TPromise<void>;
 	closeWorkspace(): TPromise<void>;
-	updateTouchBar(items: ICommandAction[][]): TPromise<void>;
+	updateTouchBar(items: ISerializableCommandAction[][]): TPromise<void>;
+	enterWorkspace(path: string): TPromise<IEnterWorkspaceResult>;
 	createAndEnterWorkspace(folders?: IWorkspaceFolderCreationData[], path?: string): TPromise<IEnterWorkspaceResult>;
 	saveAndEnterWorkspace(path: string): TPromise<IEnterWorkspaceResult>;
 	toggleFullScreen(): TPromise<void>;
@@ -200,9 +210,13 @@ export interface IWindowService {
 	getRecentlyOpened(): TPromise<IRecentlyOpened>;
 	focusWindow(): TPromise<void>;
 	closeWindow(): TPromise<void>;
-	openWindow(paths: string[], options?: { forceNewWindow?: boolean, forceReuseWindow?: boolean, forceOpenWorkspaceAsFile?: boolean; }): TPromise<void>;
+	openWindow(paths: URI[], options?: { forceNewWindow?: boolean, forceReuseWindow?: boolean, forceOpenWorkspaceAsFile?: boolean, args?: ParsedArgs }): TPromise<void>;
 	isFocused(): TPromise<boolean>;
 	setDocumentEdited(flag: boolean): TPromise<void>;
+	isMaximized(): TPromise<boolean>;
+	maximizeWindow(): TPromise<void>;
+	unmaximizeWindow(): TPromise<void>;
+	minimizeWindow(): TPromise<void>;
 	onWindowTitleDoubleClick(): TPromise<void>;
 	show(): TPromise<void>;
 	showMessageBox(options: MessageBoxOptions): TPromise<IMessageBoxResult>;
@@ -234,7 +248,7 @@ export interface IWindowSettings {
 	clickThroughInactive: boolean;
 }
 
-export enum OpenContext {
+export const enum OpenContext {
 
 	// opening when running from the command line
 	CLI,
@@ -255,7 +269,7 @@ export enum OpenContext {
 	API
 }
 
-export enum ReadyState {
+export const enum ReadyState {
 
 	/**
 	 * This window has not loaded any HTML yet
@@ -278,10 +292,25 @@ export enum ReadyState {
 	READY
 }
 
-export interface IPath {
+export interface IPath extends IPathData {
 
 	// the file path to open within a Code instance
-	filePath?: string;
+	fileUri?: URI;
+}
+
+export interface IPathsToWaitFor extends IPathsToWaitForData {
+	paths: IPath[];
+}
+
+export interface IPathsToWaitForData {
+	paths: IPathData[];
+	waitMarkerFilePath: string;
+}
+
+export interface IPathData {
+
+	// the file path to open within a Code instance
+	fileUri?: UriComponents;
 
 	// the line number in the file path to open
 	lineNumber?: number;
@@ -290,28 +319,25 @@ export interface IPath {
 	columnNumber?: number;
 }
 
-export interface IPathsToWaitFor {
-	paths: IPath[];
-	waitMarkerFilePath: string;
-}
-
 export interface IOpenFileRequest {
-	filesToOpen?: IPath[];
-	filesToCreate?: IPath[];
-	filesToDiff?: IPath[];
-	filesToWait?: IPathsToWaitFor;
+	filesToOpen?: IPathData[];
+	filesToCreate?: IPathData[];
+	filesToDiff?: IPathData[];
+	filesToWait?: IPathsToWaitForData;
 	termProgram?: string;
 }
 
 export interface IAddFoldersRequest {
-	foldersToAdd: IPath[];
+	foldersToAdd: UriComponents[];
 }
 
-export interface IWindowConfiguration extends ParsedArgs, IOpenFileRequest {
+export interface IWindowConfiguration extends ParsedArgs {
 	machineId: string;
 	windowId: number;
 	logLevel: LogLevel;
 
+	mainPid: number;
+
 	appRoot: string;
 	execPath: string;
 	isInitialStartup?: boolean;
@@ -322,19 +348,25 @@ export interface IWindowConfiguration extends ParsedArgs, IOpenFileRequest {
 	backupPath?: string;
 
 	workspace?: IWorkspaceIdentifier;
-	folderPath?: string;
+	folderUri?: ISingleFolderWorkspaceIdentifier;
 
 	zoomLevel?: number;
 	fullscreen?: boolean;
+	maximized?: boolean;
 	highContrast?: boolean;
-	baseTheme?: string;
-	backgroundColor?: string;
+	frameless?: boolean;
 	accessibilitySupport?: boolean;
 
-	perfEntries: PerformanceEntry[];
 	perfStartTime?: number;
 	perfAppReady?: number;
 	perfWindowLoadTime?: number;
+	perfEntries: ExportData;
+
+	filesToOpen?: IPath[];
+	filesToCreate?: IPath[];
+	filesToDiff?: IPath[];
+	filesToWait?: IPathsToWaitFor;
+	termProgram?: string;
 }
 
 export interface IRunActionInWindowRequest {
@@ -345,22 +377,34 @@ export interface IRunActionInWindowRequest {
 export class ActiveWindowManager implements IDisposable {
 
 	private disposables: IDisposable[] = [];
-	private _activeWindowId: number;
+	private firstActiveWindowIdPromise: TPromise<any> | null;
+	private _activeWindowId: number | undefined;
 
 	constructor(@IWindowsService windowsService: IWindowsService) {
 		const onActiveWindowChange = latch(anyEvent(windowsService.onWindowOpen, windowsService.onWindowFocus));
 		onActiveWindowChange(this.setActiveWindow, this, this.disposables);
+
+		this.firstActiveWindowIdPromise = windowsService.getActiveWindowId()
+			.then(id => (typeof this._activeWindowId === 'undefined') && this.setActiveWindow(id));
 	}
 
 	private setActiveWindow(windowId: number) {
+		if (this.firstActiveWindowIdPromise) {
+			this.firstActiveWindowIdPromise = null;
+		}
+
 		this._activeWindowId = windowId;
 	}
 
-	get activeClientId(): string {
-		return `window:${this._activeWindowId}`;
+	getActiveClientId(): TPromise<string> {
+		if (this.firstActiveWindowIdPromise) {
+			return this.firstActiveWindowIdPromise;
+		}
+
+		return TPromise.as(`window:${this._activeWindowId}`);
 	}
 
 	dispose() {
 		this.disposables = dispose(this.disposables);
 	}
-}
\ No newline at end of file
+}
diff --git a/src/vs/platform/windows/common/windowsIpc.ts b/src/vs/platform/windows/common/windowsIpc.ts
deleted file mode 100644
index 86b8cf27dfd..00000000000
--- a/src/vs/platform/windows/common/windowsIpc.ts
+++ /dev/null
@@ -1,355 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-'use strict';
-
-import { TPromise } from 'vs/base/common/winjs.base';
-import { Event, buffer } from 'vs/base/common/event';
-import { IChannel, eventToCall, eventFromCall } from 'vs/base/parts/ipc/common/ipc';
-import { IWindowsService, INativeOpenDialogOptions, IEnterWorkspaceResult, CrashReporterStartOptions, IMessageBoxResult, MessageBoxOptions, SaveDialogOptions, OpenDialogOptions, IDevToolsOptions } from 'vs/platform/windows/common/windows';
-import { IWorkspaceIdentifier, ISingleFolderWorkspaceIdentifier, IWorkspaceFolderCreationData } from 'vs/platform/workspaces/common/workspaces';
-import { IRecentlyOpened } from 'vs/platform/history/common/history';
-import { ICommandAction } from 'vs/platform/actions/common/actions';
-import URI from 'vs/base/common/uri';
-import { ParsedArgs } from 'vs/platform/environment/common/environment';
-
-export interface IWindowsChannel extends IChannel {
-	call(command: 'event:onWindowOpen'): TPromise<number>;
-	call(command: 'event:onWindowFocus'): TPromise<number>;
-	call(command: 'event:onWindowBlur'): TPromise<number>;
-	call(command: 'pickFileFolderAndOpen', arg: INativeOpenDialogOptions): TPromise<void>;
-	call(command: 'pickFileAndOpen', arg: INativeOpenDialogOptions): TPromise<void>;
-	call(command: 'pickFolderAndOpen', arg: INativeOpenDialogOptions): TPromise<void>;
-	call(command: 'pickWorkspaceAndOpen', arg: INativeOpenDialogOptions): TPromise<void>;
-	call(command: 'showMessageBox', arg: [number, MessageBoxOptions]): TPromise<IMessageBoxResult>;
-	call(command: 'showSaveDialog', arg: [number, SaveDialogOptions]): TPromise<string>;
-	call(command: 'showOpenDialog', arg: [number, OpenDialogOptions]): TPromise<string[]>;
-	call(command: 'reloadWindow', arg: [number, ParsedArgs]): TPromise<void>;
-	call(command: 'toggleDevTools', arg: number): TPromise<void>;
-	call(command: 'closeWorkspace', arg: number): TPromise<void>;
-	call(command: 'createAndEnterWorkspace', arg: [number, IWorkspaceFolderCreationData[], string]): TPromise<IEnterWorkspaceResult>;
-	call(command: 'saveAndEnterWorkspace', arg: [number, string]): TPromise<IEnterWorkspaceResult>;
-	call(command: 'toggleFullScreen', arg: number): TPromise<void>;
-	call(command: 'setRepresentedFilename', arg: [number, string]): TPromise<void>;
-	call(command: 'addRecentlyOpened', arg: string[]): TPromise<void>;
-	call(command: 'removeFromRecentlyOpened', arg: (IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier)[]): TPromise<void>;
-	call(command: 'clearRecentlyOpened'): TPromise<void>;
-	call(command: 'getRecentlyOpened', arg: number): TPromise<IRecentlyOpened>;
-	call(command: 'showPreviousWindowTab', arg: number): TPromise<void>;
-	call(command: 'showNextWindowTab', arg: number): TPromise<void>;
-	call(command: 'moveWindowTabToNewWindow', arg: number): TPromise<void>;
-	call(command: 'mergeAllWindowTabs', arg: number): TPromise<void>;
-	call(command: 'toggleWindowTabsBar', arg: number): TPromise<void>;
-	call(command: 'updateTouchBar', arg: [number, ICommandAction[][]]): TPromise<void>;
-	call(command: 'focusWindow', arg: number): TPromise<void>;
-	call(command: 'closeWindow', arg: number): TPromise<void>;
-	call(command: 'isFocused', arg: number): TPromise<boolean>;
-	call(command: 'isMaximized', arg: number): TPromise<boolean>;
-	call(command: 'maximizeWindow', arg: number): TPromise<void>;
-	call(command: 'unmaximizeWindow', arg: number): TPromise<void>;
-	call(command: 'onWindowTitleDoubleClick', arg: number): TPromise<void>;
-	call(command: 'setDocumentEdited', arg: [number, boolean]): TPromise<void>;
-	call(command: 'quit'): TPromise<void>;
-	call(command: 'openWindow', arg: [number, string[], { forceNewWindow?: boolean, forceReuseWindow?: boolean, forceOpenWorkspaceAsFile?: boolean }]): TPromise<void>;
-	call(command: 'openNewWindow'): TPromise<void>;
-	call(command: 'showWindow', arg: number): TPromise<void>;
-	call(command: 'getWindows'): TPromise<{ id: number; workspace?: IWorkspaceIdentifier; folderPath?: string; title: string; filename?: string; }[]>;
-	call(command: 'getWindowCount'): TPromise<number>;
-	call(command: 'relaunch', arg: { addArgs?: string[], removeArgs?: string[] }): TPromise<number>;
-	call(command: 'whenSharedProcessReady'): TPromise<void>;
-	call(command: 'toggleSharedProcess'): TPromise<void>;
-	call(command: 'log', arg: [string, string[]]): TPromise<void>;
-	call(command: 'showItemInFolder', arg: string): TPromise<void>;
-	call(command: 'openExternal', arg: string): TPromise<boolean>;
-	call(command: 'startCrashReporter', arg: CrashReporterStartOptions): TPromise<void>;
-	call(command: 'openAboutDialog'): TPromise<void>;
-	call(command: string, arg?: any): TPromise<any>;
-}
-
-export class WindowsChannel implements IWindowsChannel {
-
-	private onWindowOpen: Event<number>;
-	private onWindowFocus: Event<number>;
-	private onWindowBlur: Event<number>;
-
-	constructor(private service: IWindowsService) {
-		this.onWindowOpen = buffer(service.onWindowOpen, true);
-		this.onWindowFocus = buffer(service.onWindowFocus, true);
-		this.onWindowBlur = buffer(service.onWindowBlur, true);
-	}
-
-	call(command: string, arg?: any): TPromise<any> {
-		switch (command) {
-			case 'event:onWindowOpen': return eventToCall(this.onWindowOpen);
-			case 'event:onWindowFocus': return eventToCall(this.onWindowFocus);
-			case 'event:onWindowBlur': return eventToCall(this.onWindowBlur);
-			case 'pickFileFolderAndOpen': return this.service.pickFileFolderAndOpen(arg);
-			case 'pickFileAndOpen': return this.service.pickFileAndOpen(arg);
-			case 'pickFolderAndOpen': return this.service.pickFolderAndOpen(arg);
-			case 'pickWorkspaceAndOpen': return this.service.pickWorkspaceAndOpen(arg);
-			case 'showMessageBox': return this.service.showMessageBox(arg[0], arg[1]);
-			case 'showSaveDialog': return this.service.showSaveDialog(arg[0], arg[1]);
-			case 'showOpenDialog': return this.service.showOpenDialog(arg[0], arg[1]);
-			case 'reloadWindow': return this.service.reloadWindow(arg[0], arg[1]);
-			case 'openDevTools': return this.service.openDevTools(arg[0], arg[1]);
-			case 'toggleDevTools': return this.service.toggleDevTools(arg);
-			case 'closeWorkspace': return this.service.closeWorkspace(arg);
-			case 'createAndEnterWorkspace': {
-				const rawFolders: IWorkspaceFolderCreationData[] = arg[1];
-				let folders: IWorkspaceFolderCreationData[];
-				if (Array.isArray(rawFolders)) {
-					folders = rawFolders.map(rawFolder => {
-						return {
-							uri: URI.revive(rawFolder.uri), // convert raw URI back to real URI
-							name: rawFolder.name
-						} as IWorkspaceFolderCreationData;
-					});
-				}
-
-				return this.service.createAndEnterWorkspace(arg[0], folders, arg[2]);
-			}
-			case 'saveAndEnterWorkspace': return this.service.saveAndEnterWorkspace(arg[0], arg[1]);
-			case 'toggleFullScreen': return this.service.toggleFullScreen(arg);
-			case 'setRepresentedFilename': return this.service.setRepresentedFilename(arg[0], arg[1]);
-			case 'addRecentlyOpened': return this.service.addRecentlyOpened(arg);
-			case 'removeFromRecentlyOpened': return this.service.removeFromRecentlyOpened(arg);
-			case 'clearRecentlyOpened': return this.service.clearRecentlyOpened();
-			case 'showPreviousWindowTab': return this.service.showPreviousWindowTab();
-			case 'showNextWindowTab': return this.service.showNextWindowTab();
-			case 'moveWindowTabToNewWindow': return this.service.moveWindowTabToNewWindow();
-			case 'mergeAllWindowTabs': return this.service.mergeAllWindowTabs();
-			case 'toggleWindowTabsBar': return this.service.toggleWindowTabsBar();
-			case 'updateTouchBar': return this.service.updateTouchBar(arg[0], arg[1]);
-			case 'getRecentlyOpened': return this.service.getRecentlyOpened(arg);
-			case 'focusWindow': return this.service.focusWindow(arg);
-			case 'closeWindow': return this.service.closeWindow(arg);
-			case 'isFocused': return this.service.isFocused(arg);
-			case 'isMaximized': return this.service.isMaximized(arg);
-			case 'maximizeWindow': return this.service.maximizeWindow(arg);
-			case 'unmaximizeWindow': return this.service.unmaximizeWindow(arg);
-			case 'onWindowTitleDoubleClick': return this.service.onWindowTitleDoubleClick(arg);
-			case 'setDocumentEdited': return this.service.setDocumentEdited(arg[0], arg[1]);
-			case 'openWindow': return this.service.openWindow(arg[0], arg[1], arg[2]);
-			case 'openNewWindow': return this.service.openNewWindow();
-			case 'showWindow': return this.service.showWindow(arg);
-			case 'getWindows': return this.service.getWindows();
-			case 'getWindowCount': return this.service.getWindowCount();
-			case 'relaunch': return this.service.relaunch(arg[0]);
-			case 'whenSharedProcessReady': return this.service.whenSharedProcessReady();
-			case 'toggleSharedProcess': return this.service.toggleSharedProcess();
-			case 'quit': return this.service.quit();
-			case 'log': return this.service.log(arg[0], arg[1]);
-			case 'showItemInFolder': return this.service.showItemInFolder(arg);
-			case 'openExternal': return this.service.openExternal(arg);
-			case 'startCrashReporter': return this.service.startCrashReporter(arg);
-			case 'openAboutDialog': return this.service.openAboutDialog();
-		}
-		return undefined;
-	}
-}
-
-export class WindowsChannelClient implements IWindowsService {
-
-	_serviceBrand: any;
-
-	constructor(private channel: IWindowsChannel) { }
-
-	private _onWindowOpen: Event<number> = eventFromCall<number>(this.channel, 'event:onWindowOpen');
-	get onWindowOpen(): Event<number> { return this._onWindowOpen; }
-
-	private _onWindowFocus: Event<number> = eventFromCall<number>(this.channel, 'event:onWindowFocus');
-	get onWindowFocus(): Event<number> { return this._onWindowFocus; }
-
-	private _onWindowBlur: Event<number> = eventFromCall<number>(this.channel, 'event:onWindowBlur');
-	get onWindowBlur(): Event<number> { return this._onWindowBlur; }
-
-	pickFileFolderAndOpen(options: INativeOpenDialogOptions): TPromise<void> {
-		return this.channel.call('pickFileFolderAndOpen', options);
-	}
-
-	pickFileAndOpen(options: INativeOpenDialogOptions): TPromise<void> {
-		return this.channel.call('pickFileAndOpen', options);
-	}
-
-	pickFolderAndOpen(options: INativeOpenDialogOptions): TPromise<void> {
-		return this.channel.call('pickFolderAndOpen', options);
-	}
-
-	pickWorkspaceAndOpen(options: INativeOpenDialogOptions): TPromise<void> {
-		return this.channel.call('pickWorkspaceAndOpen', options);
-	}
-
-	showMessageBox(windowId: number, options: MessageBoxOptions): TPromise<IMessageBoxResult> {
-		return this.channel.call('showMessageBox', [windowId, options]);
-	}
-
-	showSaveDialog(windowId: number, options: SaveDialogOptions): TPromise<string> {
-		return this.channel.call('showSaveDialog', [windowId, options]);
-	}
-
-	showOpenDialog(windowId: number, options: OpenDialogOptions): TPromise<string[]> {
-		return this.channel.call('showOpenDialog', [windowId, options]);
-	}
-
-	reloadWindow(windowId: number, args?: ParsedArgs): TPromise<void> {
-		return this.channel.call('reloadWindow', [windowId, args]);
-	}
-
-	openDevTools(windowId: number, options?: IDevToolsOptions): TPromise<void> {
-		return this.channel.call('openDevTools', [windowId, options]);
-	}
-
-	toggleDevTools(windowId: number): TPromise<void> {
-		return this.channel.call('toggleDevTools', windowId);
-	}
-
-	closeWorkspace(windowId: number): TPromise<void> {
-		return this.channel.call('closeWorkspace', windowId);
-	}
-
-	createAndEnterWorkspace(windowId: number, folders?: IWorkspaceFolderCreationData[], path?: string): TPromise<IEnterWorkspaceResult> {
-		return this.channel.call('createAndEnterWorkspace', [windowId, folders, path]);
-	}
-
-	saveAndEnterWorkspace(windowId: number, path: string): TPromise<IEnterWorkspaceResult> {
-		return this.channel.call('saveAndEnterWorkspace', [windowId, path]);
-	}
-
-	toggleFullScreen(windowId: number): TPromise<void> {
-		return this.channel.call('toggleFullScreen', windowId);
-	}
-
-	setRepresentedFilename(windowId: number, fileName: string): TPromise<void> {
-		return this.channel.call('setRepresentedFilename', [windowId, fileName]);
-	}
-
-	addRecentlyOpened(files: string[]): TPromise<void> {
-		return this.channel.call('addRecentlyOpened', files);
-	}
-
-	removeFromRecentlyOpened(paths: string[]): TPromise<void> {
-		return this.channel.call('removeFromRecentlyOpened', paths);
-	}
-
-	clearRecentlyOpened(): TPromise<void> {
-		return this.channel.call('clearRecentlyOpened');
-	}
-
-	getRecentlyOpened(windowId: number): TPromise<IRecentlyOpened> {
-		return this.channel.call('getRecentlyOpened', windowId);
-	}
-
-	showPreviousWindowTab(): TPromise<void> {
-		return this.channel.call('showPreviousWindowTab');
-	}
-
-	showNextWindowTab(): TPromise<void> {
-		return this.channel.call('showNextWindowTab');
-	}
-
-	moveWindowTabToNewWindow(): TPromise<void> {
-		return this.channel.call('moveWindowTabToNewWindow');
-	}
-
-	mergeAllWindowTabs(): TPromise<void> {
-		return this.channel.call('mergeAllWindowTabs');
-	}
-
-	toggleWindowTabsBar(): TPromise<void> {
-		return this.channel.call('toggleWindowTabsBar');
-	}
-
-	focusWindow(windowId: number): TPromise<void> {
-		return this.channel.call('focusWindow', windowId);
-	}
-
-	closeWindow(windowId: number): TPromise<void> {
-		return this.channel.call('closeWindow', windowId);
-	}
-
-	isFocused(windowId: number): TPromise<boolean> {
-		return this.channel.call('isFocused', windowId);
-	}
-
-	isMaximized(windowId: number): TPromise<boolean> {
-		return this.channel.call('isMaximized', windowId);
-	}
-
-	maximizeWindow(windowId: number): TPromise<void> {
-		return this.channel.call('maximizeWindow', windowId);
-	}
-
-	unmaximizeWindow(windowId: number): TPromise<void> {
-		return this.channel.call('unmaximizeWindow', windowId);
-	}
-
-	onWindowTitleDoubleClick(windowId: number): TPromise<void> {
-		return this.channel.call('onWindowTitleDoubleClick', windowId);
-	}
-
-	setDocumentEdited(windowId: number, flag: boolean): TPromise<void> {
-		return this.channel.call('setDocumentEdited', [windowId, flag]);
-	}
-
-	quit(): TPromise<void> {
-		return this.channel.call('quit');
-	}
-
-	relaunch(options: { addArgs?: string[], removeArgs?: string[] }): TPromise<void> {
-		return this.channel.call('relaunch', [options]);
-	}
-
-	whenSharedProcessReady(): TPromise<void> {
-		return this.channel.call('whenSharedProcessReady');
-	}
-
-	toggleSharedProcess(): TPromise<void> {
-		return this.channel.call('toggleSharedProcess');
-	}
-
-	openWindow(windowId: number, paths: string[], options?: { forceNewWindow?: boolean, forceReuseWindow?: boolean, forceOpenWorkspaceAsFile?: boolean }): TPromise<void> {
-		return this.channel.call('openWindow', [windowId, paths, options]);
-	}
-
-	openNewWindow(): TPromise<void> {
-		return this.channel.call('openNewWindow');
-	}
-
-	showWindow(windowId: number): TPromise<void> {
-		return this.channel.call('showWindow', windowId);
-	}
-
-	getWindows(): TPromise<{ id: number; workspace?: IWorkspaceIdentifier; folderPath?: string; title: string; filename?: string; }[]> {
-		return this.channel.call('getWindows');
-	}
-
-	getWindowCount(): TPromise<number> {
-		return this.channel.call('getWindowCount');
-	}
-
-	log(severity: string, ...messages: string[]): TPromise<void> {
-		return this.channel.call('log', [severity, messages]);
-	}
-
-	showItemInFolder(path: string): TPromise<void> {
-		return this.channel.call('showItemInFolder', path);
-	}
-
-	openExternal(url: string): TPromise<boolean> {
-		return this.channel.call('openExternal', url);
-	}
-
-	startCrashReporter(config: CrashReporterStartOptions): TPromise<void> {
-		return this.channel.call('startCrashReporter', config);
-	}
-
-	updateTouchBar(windowId: number, items: ICommandAction[][]): TPromise<void> {
-		return this.channel.call('updateTouchBar', [windowId, items]);
-	}
-
-	openAboutDialog(): TPromise<void> {
-		return this.channel.call('openAboutDialog');
-	}
-}
diff --git a/src/vs/platform/windows/electron-browser/windowService.ts b/src/vs/platform/windows/electron-browser/windowService.ts
index 785106fbd91..ab83d870ea5 100644
--- a/src/vs/platform/windows/electron-browser/windowService.ts
+++ b/src/vs/platform/windows/electron-browser/windowService.ts
@@ -9,13 +9,15 @@ import { Event, filterEvent, mapEvent, anyEvent } from 'vs/base/common/event';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { IWindowService, IWindowsService, INativeOpenDialogOptions, IEnterWorkspaceResult, IMessageBoxResult, IWindowConfiguration, IDevToolsOptions } from 'vs/platform/windows/common/windows';
 import { IRecentlyOpened } from 'vs/platform/history/common/history';
-import { ICommandAction } from 'vs/platform/actions/common/actions';
+import { ISerializableCommandAction } from 'vs/platform/actions/common/actions';
 import { IWorkspaceFolderCreationData } from 'vs/platform/workspaces/common/workspaces';
 import { ParsedArgs } from 'vs/platform/environment/common/environment';
+import { URI } from 'vs/base/common/uri';
 
 export class WindowService implements IWindowService {
 
 	readonly onDidChangeFocus: Event<boolean>;
+	readonly onDidChangeMaximize: Event<boolean>;
 
 	_serviceBrand: any;
 
@@ -26,7 +28,10 @@ export class WindowService implements IWindowService {
 	) {
 		const onThisWindowFocus = mapEvent(filterEvent(windowsService.onWindowFocus, id => id === windowId), _ => true);
 		const onThisWindowBlur = mapEvent(filterEvent(windowsService.onWindowBlur, id => id === windowId), _ => false);
+		const onThisWindowMaximize = mapEvent(filterEvent(windowsService.onWindowMaximize, id => id === windowId), _ => true);
+		const onThisWindowUnmaximize = mapEvent(filterEvent(windowsService.onWindowUnmaximize, id => id === windowId), _ => false);
 		this.onDidChangeFocus = anyEvent(onThisWindowFocus, onThisWindowBlur);
+		this.onDidChangeMaximize = anyEvent(onThisWindowMaximize, onThisWindowUnmaximize);
 	}
 
 	getCurrentWindowId(): number {
@@ -77,6 +82,10 @@ export class WindowService implements IWindowService {
 		return this.windowsService.closeWorkspace(this.windowId);
 	}
 
+	enterWorkspace(path: string): TPromise<IEnterWorkspaceResult> {
+		return this.windowsService.enterWorkspace(this.windowId, path);
+	}
+
 	createAndEnterWorkspace(folders?: IWorkspaceFolderCreationData[], path?: string): TPromise<IEnterWorkspaceResult> {
 		return this.windowsService.createAndEnterWorkspace(this.windowId, folders, path);
 	}
@@ -85,7 +94,7 @@ export class WindowService implements IWindowService {
 		return this.windowsService.saveAndEnterWorkspace(this.windowId, path);
 	}
 
-	openWindow(paths: string[], options?: { forceNewWindow?: boolean, forceReuseWindow?: boolean, forceOpenWorkspaceAsFile?: boolean; }): TPromise<void> {
+	openWindow(paths: URI[], options?: { forceNewWindow?: boolean, forceReuseWindow?: boolean, forceOpenWorkspaceAsFile?: boolean, args?: ParsedArgs }): TPromise<void> {
 		return this.windowsService.openWindow(this.windowId, paths, options);
 	}
 
@@ -113,6 +122,22 @@ export class WindowService implements IWindowService {
 		return this.windowsService.isFocused(this.windowId);
 	}
 
+	isMaximized(): TPromise<boolean> {
+		return this.windowsService.isMaximized(this.windowId);
+	}
+
+	maximizeWindow(): TPromise<void> {
+		return this.windowsService.maximizeWindow(this.windowId);
+	}
+
+	unmaximizeWindow(): TPromise<void> {
+		return this.windowsService.unmaximizeWindow(this.windowId);
+	}
+
+	minimizeWindow(): TPromise<void> {
+		return this.windowsService.minimizeWindow(this.windowId);
+	}
+
 	onWindowTitleDoubleClick(): TPromise<void> {
 		return this.windowsService.onWindowTitleDoubleClick(this.windowId);
 	}
@@ -137,7 +162,7 @@ export class WindowService implements IWindowService {
 		return this.windowsService.showOpenDialog(this.windowId, options);
 	}
 
-	updateTouchBar(items: ICommandAction[][]): TPromise<void> {
+	updateTouchBar(items: ISerializableCommandAction[][]): TPromise<void> {
 		return this.windowsService.updateTouchBar(this.windowId, items);
 	}
 }
diff --git a/src/vs/platform/windows/electron-main/windows.ts b/src/vs/platform/windows/electron-main/windows.ts
index ce2eba8895b..66bdfc05a75 100644
--- a/src/vs/platform/windows/electron-main/windows.ts
+++ b/src/vs/platform/windows/electron-main/windows.ts
@@ -12,7 +12,8 @@ import { Event } from 'vs/base/common/event';
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
 import { IProcessEnvironment } from 'vs/base/common/platform';
 import { IWorkspaceIdentifier, IWorkspaceFolderCreationData } from 'vs/platform/workspaces/common/workspaces';
-import { ICommandAction } from 'vs/platform/actions/common/actions';
+import { ISerializableCommandAction } from 'vs/platform/actions/common/actions';
+import { URI } from 'vs/base/common/uri';
 
 export interface IWindowState {
 	width?: number;
@@ -23,7 +24,7 @@ export interface IWindowState {
 	display?: number;
 }
 
-export enum WindowMode {
+export const enum WindowMode {
 	Maximized,
 	Normal,
 	Minimized, // not used anymore, but also cannot remove due to existing stored UI state (needs migration)
@@ -35,7 +36,7 @@ export interface ICodeWindow {
 	win: Electron.BrowserWindow;
 	config: IWindowConfiguration;
 
-	openedFolderPath: string;
+	openedFolderUri: URI;
 	openedWorkspace: IWorkspaceIdentifier;
 	backupPath: string;
 
@@ -47,6 +48,8 @@ export interface ICodeWindow {
 	readyState: ReadyState;
 	ready(): TPromise<ICodeWindow>;
 
+	addTabbedWindow(window: ICodeWindow): void;
+
 	load(config: IWindowConfiguration, isReload?: boolean, disableExtensions?: boolean): void;
 	reload(configuration?: IWindowConfiguration, cli?: ParsedArgs): void;
 
@@ -64,7 +67,7 @@ export interface ICodeWindow {
 	getRepresentedFilename(): string;
 	onWindowTitleDoubleClick(): void;
 
-	updateTouchBar(items: ICommandAction[][]): void;
+	updateTouchBar(items: ISerializableCommandAction[][]): void;
 
 	setReady(): void;
 	serializeWindowState(): IWindowState;
@@ -92,6 +95,7 @@ export interface IWindowsMainService {
 	// methods
 	ready(initialUserEnv: IProcessEnvironment): void;
 	reload(win: ICodeWindow, cli?: ParsedArgs): void;
+	enterWorkspace(win: ICodeWindow, path: string): TPromise<IEnterWorkspaceResult>;
 	createAndEnterWorkspace(win: ICodeWindow, folders?: IWorkspaceFolderCreationData[], path?: string): TPromise<IEnterWorkspaceResult>;
 	saveAndEnterWorkspace(win: ICodeWindow, path: string): TPromise<IEnterWorkspaceResult>;
 	closeWorkspace(win: ICodeWindow): void;
@@ -108,6 +112,7 @@ export interface IWindowsMainService {
 	getLastActiveWindow(): ICodeWindow;
 	waitForWindowCloseOrLoad(windowId: number): TPromise<void>;
 	openNewWindow(context: OpenContext): ICodeWindow[];
+	openNewTabbedWindow(context: OpenContext): ICodeWindow[];
 	sendToFocused(channel: string, ...args: any[]): void;
 	sendToAll(channel: string, payload: any, windowIdsToIgnore?: number[]): void;
 	getFocusedWindow(): ICodeWindow;
@@ -122,9 +127,10 @@ export interface IOpenConfiguration {
 	contextWindowId?: number;
 	cli: ParsedArgs;
 	userEnv?: IProcessEnvironment;
-	pathsToOpen?: string[];
+	urisToOpen?: URI[];
 	preferNewWindow?: boolean;
 	forceNewWindow?: boolean;
+	forceNewTabbedWindow?: boolean;
 	forceReuseWindow?: boolean;
 	forceEmpty?: boolean;
 	diffMode?: boolean;
diff --git a/src/vs/platform/windows/electron-main/windowsService.ts b/src/vs/platform/windows/electron-main/windowsService.ts
index ebc2d68f0d6..0869cf26629 100644
--- a/src/vs/platform/windows/electron-main/windowsService.ts
+++ b/src/vs/platform/windows/electron-main/windowsService.ts
@@ -9,21 +9,21 @@ import * as nls from 'vs/nls';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { assign } from 'vs/base/common/objects';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import product from 'vs/platform/node/product';
 import { IWindowsService, OpenContext, INativeOpenDialogOptions, IEnterWorkspaceResult, IMessageBoxResult, IDevToolsOptions } from 'vs/platform/windows/common/windows';
 import { IEnvironmentService, ParsedArgs } from 'vs/platform/environment/common/environment';
 import { shell, crashReporter, app, Menu, clipboard } from 'electron';
-import { Event, fromNodeEventEmitter, mapEvent, filterEvent, anyEvent } from 'vs/base/common/event';
+import { Event, fromNodeEventEmitter, mapEvent, filterEvent, anyEvent, latch } from 'vs/base/common/event';
 import { IURLService, IURLHandler } from 'vs/platform/url/common/url';
 import { ILifecycleService } from 'vs/platform/lifecycle/electron-main/lifecycleMain';
 import { IWindowsMainService, ISharedProcess } from 'vs/platform/windows/electron-main/windows';
 import { IHistoryMainService, IRecentlyOpened } from 'vs/platform/history/common/history';
-import { IWorkspaceIdentifier, IWorkspaceFolderCreationData } from 'vs/platform/workspaces/common/workspaces';
-import { ICommandAction } from 'vs/platform/actions/common/actions';
+import { IWorkspaceIdentifier, IWorkspaceFolderCreationData, ISingleFolderWorkspaceIdentifier } from 'vs/platform/workspaces/common/workspaces';
+import { ISerializableCommandAction } from 'vs/platform/actions/common/actions';
 import { Schemas } from 'vs/base/common/network';
 import { mnemonicButtonLabel } from 'vs/base/common/labels';
-import { isWindows } from 'vs/base/common/platform';
+import { isWindows, isMacintosh } from 'vs/base/common/platform';
 import { ILogService } from 'vs/platform/log/common/log';
 
 export class WindowsService implements IWindowsService, IURLHandler, IDisposable {
@@ -32,13 +32,18 @@ export class WindowsService implements IWindowsService, IURLHandler, IDisposable
 
 	private disposables: IDisposable[] = [];
 
+	private _activeWindowId: number | undefined;
+
 	readonly onWindowOpen: Event<number> = filterEvent(fromNodeEventEmitter(app, 'browser-window-created', (_, w: Electron.BrowserWindow) => w.id), id => !!this.windowsMainService.getWindowById(id));
+	readonly onWindowBlur: Event<number> = filterEvent(fromNodeEventEmitter(app, 'browser-window-blur', (_, w: Electron.BrowserWindow) => w.id), id => !!this.windowsMainService.getWindowById(id));
+	readonly onWindowMaximize: Event<number> = filterEvent(fromNodeEventEmitter(app, 'browser-window-maximize', (_, w: Electron.BrowserWindow) => w.id), id => !!this.windowsMainService.getWindowById(id));
+	readonly onWindowUnmaximize: Event<number> = filterEvent(fromNodeEventEmitter(app, 'browser-window-unmaximize', (_, w: Electron.BrowserWindow) => w.id), id => !!this.windowsMainService.getWindowById(id));
 	readonly onWindowFocus: Event<number> = anyEvent(
 		mapEvent(filterEvent(mapEvent(this.windowsMainService.onWindowsCountChanged, () => this.windowsMainService.getLastActiveWindow()), w => !!w), w => w.id),
 		filterEvent(fromNodeEventEmitter(app, 'browser-window-focus', (_, w: Electron.BrowserWindow) => w.id), id => !!this.windowsMainService.getWindowById(id))
 	);
 
-	readonly onWindowBlur: Event<number> = filterEvent(fromNodeEventEmitter(app, 'browser-window-blur', (_, w: Electron.BrowserWindow) => w.id), id => !!this.windowsMainService.getWindowById(id));
+	readonly onRecentlyOpenedChange: Event<void> = this.historyService.onRecentlyOpenedChange;
 
 	constructor(
 		private sharedProcess: ISharedProcess,
@@ -50,6 +55,10 @@ export class WindowsService implements IWindowsService, IURLHandler, IDisposable
 		@ILogService private logService: ILogService
 	) {
 		urlService.registerHandler(this);
+
+		// remember last active window id
+		latch(anyEvent(this.onWindowOpen, this.onWindowFocus))
+			(id => this._activeWindowId = id, null, this.disposables);
 	}
 
 	pickFileFolderAndOpen(options: INativeOpenDialogOptions): TPromise<void> {
@@ -129,7 +138,7 @@ export class WindowsService implements IWindowsService, IURLHandler, IDisposable
 
 		if (codeWindow) {
 			const contents = codeWindow.win.webContents;
-			if (codeWindow.hasHiddenTitleBarStyle() && !codeWindow.win.isFullScreen() && !contents.isDevToolsOpened()) {
+			if (isMacintosh && codeWindow.hasHiddenTitleBarStyle() && !codeWindow.win.isFullScreen() && !contents.isDevToolsOpened()) {
 				contents.openDevTools({ mode: 'undocked' }); // due to https://github.com/electron/electron/issues/3647
 			} else {
 				contents.toggleDevTools();
@@ -139,7 +148,7 @@ export class WindowsService implements IWindowsService, IURLHandler, IDisposable
 		return TPromise.as(null);
 	}
 
-	updateTouchBar(windowId: number, items: ICommandAction[][]): TPromise<void> {
+	updateTouchBar(windowId: number, items: ISerializableCommandAction[][]): TPromise<void> {
 		this.logService.trace('windowsService#updateTouchBar', windowId);
 		const codeWindow = this.windowsMainService.getWindowById(windowId);
 
@@ -161,6 +170,17 @@ export class WindowsService implements IWindowsService, IURLHandler, IDisposable
 		return TPromise.as(null);
 	}
 
+	enterWorkspace(windowId: number, path: string): TPromise<IEnterWorkspaceResult> {
+		this.logService.trace('windowsService#enterWorkspace', windowId);
+		const codeWindow = this.windowsMainService.getWindowById(windowId);
+
+		if (codeWindow) {
+			return this.windowsMainService.enterWorkspace(codeWindow, path);
+		}
+
+		return TPromise.as(null);
+	}
+
 	createAndEnterWorkspace(windowId: number, folders?: IWorkspaceFolderCreationData[], path?: string): TPromise<IEnterWorkspaceResult> {
 		this.logService.trace('windowsService#createAndEnterWorkspace', windowId);
 		const codeWindow = this.windowsMainService.getWindowById(windowId);
@@ -205,14 +225,14 @@ export class WindowsService implements IWindowsService, IURLHandler, IDisposable
 		return TPromise.as(null);
 	}
 
-	addRecentlyOpened(files: string[]): TPromise<void> {
+	addRecentlyOpened(files: URI[]): TPromise<void> {
 		this.logService.trace('windowsService#addRecentlyOpened');
 		this.historyService.addRecentlyOpened(void 0, files);
 
 		return TPromise.as(null);
 	}
 
-	removeFromRecentlyOpened(paths: string[]): TPromise<void> {
+	removeFromRecentlyOpened(paths: (IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier | URI | string)[]): TPromise<void> {
 		this.logService.trace('windowsService#removeFromRecentlyOpened');
 		this.historyService.removeFromRecentlyOpened(paths);
 
@@ -231,12 +251,20 @@ export class WindowsService implements IWindowsService, IURLHandler, IDisposable
 		const codeWindow = this.windowsMainService.getWindowById(windowId);
 
 		if (codeWindow) {
-			return TPromise.as(this.historyService.getRecentlyOpened(codeWindow.config.workspace || codeWindow.config.folderPath, codeWindow.config.filesToOpen));
+			return TPromise.as(this.historyService.getRecentlyOpened(codeWindow.config.workspace || codeWindow.config.folderUri, codeWindow.config.filesToOpen));
 		}
 
 		return TPromise.as(this.historyService.getRecentlyOpened());
 	}
 
+	newWindowTab(): TPromise<void> {
+		this.logService.trace('windowsService#newWindowTab');
+
+		this.windowsMainService.openNewTabbedWindow(OpenContext.API);
+
+		return TPromise.as(void 0);
+	}
+
 	showPreviousWindowTab(): TPromise<void> {
 		this.logService.trace('windowsService#showPreviousWindowTab');
 		Menu.sendActionToFirstResponder('selectPreviousTab:');
@@ -338,6 +366,17 @@ export class WindowsService implements IWindowsService, IURLHandler, IDisposable
 		return TPromise.as(null);
 	}
 
+	minimizeWindow(windowId: number): TPromise<void> {
+		this.logService.trace('windowsService#minimizeWindow', windowId);
+		const codeWindow = this.windowsMainService.getWindowById(windowId);
+
+		if (codeWindow) {
+			codeWindow.win.minimize();
+		}
+
+		return TPromise.as(null);
+	}
+
 	onWindowTitleDoubleClick(windowId: number): TPromise<void> {
 		this.logService.trace('windowsService#onWindowTitleDoubleClick', windowId);
 		const codeWindow = this.windowsMainService.getWindowById(windowId);
@@ -360,7 +399,7 @@ export class WindowsService implements IWindowsService, IURLHandler, IDisposable
 		return TPromise.as(null);
 	}
 
-	openWindow(windowId: number, paths: string[], options?: { forceNewWindow?: boolean, forceReuseWindow?: boolean, forceOpenWorkspaceAsFile?: boolean }): TPromise<void> {
+	openWindow(windowId: number, paths: URI[], options?: { forceNewWindow?: boolean, forceReuseWindow?: boolean, forceOpenWorkspaceAsFile?: boolean, args?: ParsedArgs }): TPromise<void> {
 		this.logService.trace('windowsService#openWindow');
 		if (!paths || !paths.length) {
 			return TPromise.as(null);
@@ -369,8 +408,8 @@ export class WindowsService implements IWindowsService, IURLHandler, IDisposable
 		this.windowsMainService.open({
 			context: OpenContext.API,
 			contextWindowId: windowId,
-			cli: this.environmentService.args,
-			pathsToOpen: paths,
+			urisToOpen: paths,
+			cli: options && options.args ? { ...this.environmentService.args, ...options.args } : this.environmentService.args,
 			forceNewWindow: options && options.forceNewWindow,
 			forceReuseWindow: options && options.forceReuseWindow,
 			forceOpenWorkspaceAsFile: options && options.forceOpenWorkspaceAsFile
@@ -381,7 +420,9 @@ export class WindowsService implements IWindowsService, IURLHandler, IDisposable
 
 	openNewWindow(): TPromise<void> {
 		this.logService.trace('windowsService#openNewWindow');
+
 		this.windowsMainService.openNewWindow(OpenContext.API);
+
 		return TPromise.as(null);
 	}
 
@@ -396,10 +437,10 @@ export class WindowsService implements IWindowsService, IURLHandler, IDisposable
 		return TPromise.as(null);
 	}
 
-	getWindows(): TPromise<{ id: number; workspace?: IWorkspaceIdentifier; folderPath?: string; title: string; filename?: string; }[]> {
+	getWindows(): TPromise<{ id: number; workspace?: IWorkspaceIdentifier; folderUri?: ISingleFolderWorkspaceIdentifier; title: string; filename?: string; }[]> {
 		this.logService.trace('windowsService#getWindows');
 		const windows = this.windowsMainService.getWindows();
-		const result = windows.map(w => ({ id: w.id, workspace: w.openedWorkspace, openedFolderPath: w.openedFolderPath, title: w.win.getTitle(), filename: w.getRepresentedFilename() }));
+		const result = windows.map(w => ({ id: w.id, workspace: w.openedWorkspace, folderUri: w.openedFolderUri, title: w.win.getTitle(), filename: w.getRepresentedFilename() }));
 
 		return TPromise.as(result);
 	}
@@ -420,6 +461,10 @@ export class WindowsService implements IWindowsService, IURLHandler, IDisposable
 		return TPromise.as(null);
 	}
 
+	getActiveWindowId(): TPromise<number | undefined> {
+		return TPromise.as(this._activeWindowId);
+	}
+
 	openExternal(url: string): TPromise<boolean> {
 		this.logService.trace('windowsService#openExternal');
 		return TPromise.as(shell.openExternal(url));
@@ -459,14 +504,21 @@ export class WindowsService implements IWindowsService, IURLHandler, IDisposable
 		this.logService.trace('windowsService#openAboutDialog');
 		const lastActiveWindow = this.windowsMainService.getFocusedWindow() || this.windowsMainService.getLastActiveWindow();
 
+		let version = app.getVersion();
+
+		if (product.target) {
+			version = `${version} (${product.target} setup)`;
+		}
+
 		const detail = nls.localize('aboutDetail',
-			"Version {0}\nCommit {1}\nDate {2}\nShell {3}\nRenderer {4}\nNode {5}\nArchitecture {6}",
-			app.getVersion(),
+			"Version: {0}\nCommit: {1}\nDate: {2}\nElectron: {3}\nChrome: {4}\nNode.js: {5}\nV8: {6}\nArchitecture: {7}",
+			version,
 			product.commit || 'Unknown',
 			product.date || 'Unknown',
 			process.versions['electron'],
 			process.versions['chrome'],
 			process.versions['node'],
+			process.versions['v8'],
 			process.arch
 		);
 
@@ -491,24 +543,25 @@ export class WindowsService implements IWindowsService, IURLHandler, IDisposable
 		return TPromise.as(null);
 	}
 
-	async handleURL(uri: URI): TPromise<boolean> {
+	handleURL(uri: URI): TPromise<boolean> {
 		// Catch file URLs
 		if (uri.authority === Schemas.file && !!uri.path) {
-			return this.openFileForURI(URI.file(uri.fsPath));
+			this.openFileForURI(URI.file(uri.fsPath));
+			return TPromise.as(true);
 		}
 
-		return false;
+		return TPromise.wrap(false);
 	}
 
-	private async openFileForURI(uri: URI): TPromise<boolean> {
+	private openFileForURI(uri: URI): TPromise<boolean> {
 		const cli = assign(Object.create(null), this.environmentService.args, { goto: true });
-		const pathsToOpen = [uri.fsPath];
+		const urisToOpen = [uri];
 
-		this.windowsMainService.open({ context: OpenContext.API, cli, pathsToOpen });
-		return true;
+		this.windowsMainService.open({ context: OpenContext.API, cli, urisToOpen });
+		return TPromise.wrap(true);
 	}
 
 	dispose(): void {
 		this.disposables = dispose(this.disposables);
 	}
-}
\ No newline at end of file
+}
diff --git a/src/vs/platform/windows/node/windowsIpc.ts b/src/vs/platform/windows/node/windowsIpc.ts
new file mode 100644
index 00000000000..f5546a01615
--- /dev/null
+++ b/src/vs/platform/windows/node/windowsIpc.ts
@@ -0,0 +1,409 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+import { TPromise } from 'vs/base/common/winjs.base';
+import { Event, buffer } from 'vs/base/common/event';
+import { IChannel } from 'vs/base/parts/ipc/node/ipc';
+import { IWindowsService, INativeOpenDialogOptions, IEnterWorkspaceResult, CrashReporterStartOptions, IMessageBoxResult, MessageBoxOptions, SaveDialogOptions, OpenDialogOptions, IDevToolsOptions } from 'vs/platform/windows/common/windows';
+import { IWorkspaceIdentifier, IWorkspaceFolderCreationData, ISingleFolderWorkspaceIdentifier, isWorkspaceIdentifier } from 'vs/platform/workspaces/common/workspaces';
+import { IRecentlyOpened } from 'vs/platform/history/common/history';
+import { ISerializableCommandAction } from 'vs/platform/actions/common/actions';
+import { URI, UriComponents } from 'vs/base/common/uri';
+import { ParsedArgs } from 'vs/platform/environment/common/environment';
+
+export interface IWindowsChannel extends IChannel {
+	listen(event: 'onWindowOpen'): Event<number>;
+	listen(event: 'onWindowFocus'): Event<number>;
+	listen(event: 'onWindowBlur'): Event<number>;
+	listen(event: 'onWindowMaximize'): Event<number>;
+	listen(event: 'onWindowUnmaximize'): Event<number>;
+	listen(event: 'onRecentlyOpenedChange'): Event<void>;
+	listen<T>(event: string, arg?: any): Event<T>;
+
+	call(command: 'pickFileFolderAndOpen', arg: INativeOpenDialogOptions): Thenable<void>;
+	call(command: 'pickFileAndOpen', arg: INativeOpenDialogOptions): Thenable<void>;
+	call(command: 'pickFolderAndOpen', arg: INativeOpenDialogOptions): Thenable<void>;
+	call(command: 'pickWorkspaceAndOpen', arg: INativeOpenDialogOptions): Thenable<void>;
+	call(command: 'showMessageBox', arg: [number, MessageBoxOptions]): Thenable<IMessageBoxResult>;
+	call(command: 'showSaveDialog', arg: [number, SaveDialogOptions]): Thenable<string>;
+	call(command: 'showOpenDialog', arg: [number, OpenDialogOptions]): Thenable<string[]>;
+	call(command: 'reloadWindow', arg: [number, ParsedArgs]): Thenable<void>;
+	call(command: 'openDevTools', arg: [number, IDevToolsOptions]): Thenable<void>;
+	call(command: 'toggleDevTools', arg: number): Thenable<void>;
+	call(command: 'closeWorkspace', arg: number): Thenable<void>;
+	call(command: 'enterWorkspace', arg: [number, string]): Thenable<IEnterWorkspaceResult>;
+	call(command: 'createAndEnterWorkspace', arg: [number, IWorkspaceFolderCreationData[], string]): Thenable<IEnterWorkspaceResult>;
+	call(command: 'saveAndEnterWorkspace', arg: [number, string]): Thenable<IEnterWorkspaceResult>;
+	call(command: 'toggleFullScreen', arg: number): Thenable<void>;
+	call(command: 'setRepresentedFilename', arg: [number, string]): Thenable<void>;
+	call(command: 'addRecentlyOpened', arg: UriComponents[]): Thenable<void>;
+	call(command: 'removeFromRecentlyOpened', arg: (IWorkspaceIdentifier | UriComponents | string)[]): Thenable<void>;
+	call(command: 'clearRecentlyOpened'): Thenable<void>;
+	call(command: 'getRecentlyOpened', arg: number): Thenable<IRecentlyOpened>;
+	call(command: 'newWindowTab'): Thenable<void>;
+	call(command: 'showPreviousWindowTab'): Thenable<void>;
+	call(command: 'showNextWindowTab'): Thenable<void>;
+	call(command: 'moveWindowTabToNewWindow'): Thenable<void>;
+	call(command: 'mergeAllWindowTabs'): Thenable<void>;
+	call(command: 'toggleWindowTabsBar'): Thenable<void>;
+	call(command: 'updateTouchBar', arg: [number, ISerializableCommandAction[][]]): Thenable<void>;
+	call(command: 'focusWindow', arg: number): Thenable<void>;
+	call(command: 'closeWindow', arg: number): Thenable<void>;
+	call(command: 'isFocused', arg: number): Thenable<boolean>;
+	call(command: 'isMaximized', arg: number): Thenable<boolean>;
+	call(command: 'maximizeWindow', arg: number): Thenable<void>;
+	call(command: 'unmaximizeWindow', arg: number): Thenable<void>;
+	call(command: 'minimizeWindow', arg: number): Thenable<void>;
+	call(command: 'onWindowTitleDoubleClick', arg: number): Thenable<void>;
+	call(command: 'setDocumentEdited', arg: [number, boolean]): Thenable<void>;
+	call(command: 'quit'): Thenable<void>;
+	call(command: 'openWindow', arg: [number, URI[], { forceNewWindow?: boolean, forceReuseWindow?: boolean, forceOpenWorkspaceAsFile?: boolean, args?: ParsedArgs }]): Thenable<void>;
+	call(command: 'openNewWindow'): Thenable<void>;
+	call(command: 'showWindow', arg: number): Thenable<void>;
+	call(command: 'getWindows'): Thenable<{ id: number; workspace?: IWorkspaceIdentifier; folderUri?: ISingleFolderWorkspaceIdentifier; title: string; filename?: string; }[]>;
+	call(command: 'getWindowCount'): Thenable<number>;
+	call(command: 'relaunch', arg: [{ addArgs?: string[], removeArgs?: string[] }]): Thenable<void>;
+	call(command: 'whenSharedProcessReady'): Thenable<void>;
+	call(command: 'toggleSharedProcess'): Thenable<void>;
+	call(command: 'log', arg: [string, string[]]): Thenable<void>;
+	call(command: 'showItemInFolder', arg: string): Thenable<void>;
+	call(command: 'getActiveWindowId'): Thenable<number>;
+	call(command: 'openExternal', arg: string): Thenable<boolean>;
+	call(command: 'startCrashReporter', arg: CrashReporterStartOptions): Thenable<void>;
+	call(command: 'openAboutDialog'): Thenable<void>;
+}
+
+export class WindowsChannel implements IWindowsChannel {
+
+	private onWindowOpen: Event<number>;
+	private onWindowFocus: Event<number>;
+	private onWindowBlur: Event<number>;
+	private onWindowMaximize: Event<number>;
+	private onWindowUnmaximize: Event<number>;
+	private onRecentlyOpenedChange: Event<void>;
+
+	constructor(private service: IWindowsService) {
+		this.onWindowOpen = buffer(service.onWindowOpen, true);
+		this.onWindowFocus = buffer(service.onWindowFocus, true);
+		this.onWindowBlur = buffer(service.onWindowBlur, true);
+		this.onWindowMaximize = buffer(service.onWindowMaximize, true);
+		this.onWindowUnmaximize = buffer(service.onWindowUnmaximize, true);
+		this.onRecentlyOpenedChange = buffer(service.onRecentlyOpenedChange, true);
+	}
+
+	listen<T>(event: string, arg?: any): Event<any> {
+		switch (event) {
+			case 'onWindowOpen': return this.onWindowOpen;
+			case 'onWindowFocus': return this.onWindowFocus;
+			case 'onWindowBlur': return this.onWindowBlur;
+			case 'onWindowMaximize': return this.onWindowMaximize;
+			case 'onWindowUnmaximize': return this.onWindowUnmaximize;
+			case 'onRecentlyOpenedChange': return this.onRecentlyOpenedChange;
+		}
+
+		throw new Error('No event found');
+	}
+
+	call(command: string, arg?: any): Thenable<any> {
+		switch (command) {
+			case 'pickFileFolderAndOpen': return this.service.pickFileFolderAndOpen(arg);
+			case 'pickFileAndOpen': return this.service.pickFileAndOpen(arg);
+			case 'pickFolderAndOpen': return this.service.pickFolderAndOpen(arg);
+			case 'pickWorkspaceAndOpen': return this.service.pickWorkspaceAndOpen(arg);
+			case 'showMessageBox': return this.service.showMessageBox(arg[0], arg[1]);
+			case 'showSaveDialog': return this.service.showSaveDialog(arg[0], arg[1]);
+			case 'showOpenDialog': return this.service.showOpenDialog(arg[0], arg[1]);
+			case 'reloadWindow': return this.service.reloadWindow(arg[0], arg[1]);
+			case 'openDevTools': return this.service.openDevTools(arg[0], arg[1]);
+			case 'toggleDevTools': return this.service.toggleDevTools(arg);
+			case 'closeWorkspace': return this.service.closeWorkspace(arg);
+			case 'enterWorkspace': return this.service.enterWorkspace(arg[0], arg[1]);
+			case 'createAndEnterWorkspace': {
+				const rawFolders: IWorkspaceFolderCreationData[] = arg[1];
+				let folders: IWorkspaceFolderCreationData[];
+				if (Array.isArray(rawFolders)) {
+					folders = rawFolders.map(rawFolder => {
+						return {
+							uri: URI.revive(rawFolder.uri), // convert raw URI back to real URI
+							name: rawFolder.name
+						} as IWorkspaceFolderCreationData;
+					});
+				}
+
+				return this.service.createAndEnterWorkspace(arg[0], folders, arg[2]);
+			}
+			case 'saveAndEnterWorkspace': return this.service.saveAndEnterWorkspace(arg[0], arg[1]);
+			case 'toggleFullScreen': return this.service.toggleFullScreen(arg);
+			case 'setRepresentedFilename': return this.service.setRepresentedFilename(arg[0], arg[1]);
+			case 'addRecentlyOpened': return this.service.addRecentlyOpened(arg.map(URI.revive));
+			case 'removeFromRecentlyOpened': {
+				let paths: (IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier | URI | string)[] = arg;
+				if (Array.isArray(paths)) {
+					paths = paths.map(path => isWorkspaceIdentifier(path) ? path : URI.revive(path));
+				}
+				return this.service.removeFromRecentlyOpened(paths);
+			}
+			case 'clearRecentlyOpened': return this.service.clearRecentlyOpened();
+			case 'newWindowTab': return this.service.newWindowTab();
+			case 'showPreviousWindowTab': return this.service.showPreviousWindowTab();
+			case 'showNextWindowTab': return this.service.showNextWindowTab();
+			case 'moveWindowTabToNewWindow': return this.service.moveWindowTabToNewWindow();
+			case 'mergeAllWindowTabs': return this.service.mergeAllWindowTabs();
+			case 'toggleWindowTabsBar': return this.service.toggleWindowTabsBar();
+			case 'updateTouchBar': return this.service.updateTouchBar(arg[0], arg[1]);
+			case 'getRecentlyOpened': return this.service.getRecentlyOpened(arg);
+			case 'focusWindow': return this.service.focusWindow(arg);
+			case 'closeWindow': return this.service.closeWindow(arg);
+			case 'isFocused': return this.service.isFocused(arg);
+			case 'isMaximized': return this.service.isMaximized(arg);
+			case 'maximizeWindow': return this.service.maximizeWindow(arg);
+			case 'unmaximizeWindow': return this.service.unmaximizeWindow(arg);
+			case 'minimizeWindow': return this.service.minimizeWindow(arg);
+			case 'onWindowTitleDoubleClick': return this.service.onWindowTitleDoubleClick(arg);
+			case 'setDocumentEdited': return this.service.setDocumentEdited(arg[0], arg[1]);
+			case 'openWindow': return this.service.openWindow(arg[0], arg[1] ? (<URI[]>arg[1]).map(r => URI.revive(r)) : arg[1], arg[2]);
+			case 'openNewWindow': return this.service.openNewWindow();
+			case 'showWindow': return this.service.showWindow(arg);
+			case 'getWindows': return this.service.getWindows();
+			case 'getWindowCount': return this.service.getWindowCount();
+			case 'relaunch': return this.service.relaunch(arg[0]);
+			case 'whenSharedProcessReady': return this.service.whenSharedProcessReady();
+			case 'toggleSharedProcess': return this.service.toggleSharedProcess();
+			case 'quit': return this.service.quit();
+			case 'log': return this.service.log(arg[0], arg[1]);
+			case 'showItemInFolder': return this.service.showItemInFolder(arg);
+			case 'getActiveWindowId': return this.service.getActiveWindowId();
+			case 'openExternal': return this.service.openExternal(arg);
+			case 'startCrashReporter': return this.service.startCrashReporter(arg);
+			case 'openAboutDialog': return this.service.openAboutDialog();
+		}
+		return undefined;
+	}
+}
+
+export class WindowsChannelClient implements IWindowsService {
+
+	_serviceBrand: any;
+
+	constructor(private channel: IWindowsChannel) { }
+
+	get onWindowOpen(): Event<number> { return this.channel.listen('onWindowOpen'); }
+	get onWindowFocus(): Event<number> { return this.channel.listen('onWindowFocus'); }
+	get onWindowBlur(): Event<number> { return this.channel.listen('onWindowBlur'); }
+	get onWindowMaximize(): Event<number> { return this.channel.listen('onWindowMaximize'); }
+	get onWindowUnmaximize(): Event<number> { return this.channel.listen('onWindowUnmaximize'); }
+	get onRecentlyOpenedChange(): Event<void> { return this.channel.listen('onRecentlyOpenedChange'); }
+
+	pickFileFolderAndOpen(options: INativeOpenDialogOptions): TPromise<void> {
+		return TPromise.wrap(this.channel.call('pickFileFolderAndOpen', options));
+	}
+
+	pickFileAndOpen(options: INativeOpenDialogOptions): TPromise<void> {
+		return TPromise.wrap(this.channel.call('pickFileAndOpen', options));
+	}
+
+	pickFolderAndOpen(options: INativeOpenDialogOptions): TPromise<void> {
+		return TPromise.wrap(this.channel.call('pickFolderAndOpen', options));
+	}
+
+	pickWorkspaceAndOpen(options: INativeOpenDialogOptions): TPromise<void> {
+		return TPromise.wrap(this.channel.call('pickWorkspaceAndOpen', options));
+	}
+
+	showMessageBox(windowId: number, options: MessageBoxOptions): TPromise<IMessageBoxResult> {
+		return TPromise.wrap(this.channel.call('showMessageBox', [windowId, options]));
+	}
+
+	showSaveDialog(windowId: number, options: SaveDialogOptions): TPromise<string> {
+		return TPromise.wrap(this.channel.call('showSaveDialog', [windowId, options]));
+	}
+
+	showOpenDialog(windowId: number, options: OpenDialogOptions): TPromise<string[]> {
+		return TPromise.wrap(this.channel.call('showOpenDialog', [windowId, options]));
+	}
+
+	reloadWindow(windowId: number, args?: ParsedArgs): TPromise<void> {
+		return TPromise.wrap(this.channel.call('reloadWindow', [windowId, args]));
+	}
+
+	openDevTools(windowId: number, options?: IDevToolsOptions): TPromise<void> {
+		return TPromise.wrap(this.channel.call('openDevTools', [windowId, options]));
+	}
+
+	toggleDevTools(windowId: number): TPromise<void> {
+		return TPromise.wrap(this.channel.call('toggleDevTools', windowId));
+	}
+
+	closeWorkspace(windowId: number): TPromise<void> {
+		return TPromise.wrap(this.channel.call('closeWorkspace', windowId));
+	}
+
+	enterWorkspace(windowId: number, path: string): TPromise<IEnterWorkspaceResult> {
+		return TPromise.wrap(this.channel.call('enterWorkspace', [windowId, path]));
+	}
+
+	createAndEnterWorkspace(windowId: number, folders?: IWorkspaceFolderCreationData[], path?: string): TPromise<IEnterWorkspaceResult> {
+		return TPromise.wrap(this.channel.call('createAndEnterWorkspace', [windowId, folders, path]));
+	}
+
+	saveAndEnterWorkspace(windowId: number, path: string): TPromise<IEnterWorkspaceResult> {
+		return TPromise.wrap(this.channel.call('saveAndEnterWorkspace', [windowId, path]));
+	}
+
+	toggleFullScreen(windowId: number): TPromise<void> {
+		return TPromise.wrap(this.channel.call('toggleFullScreen', windowId));
+	}
+
+	setRepresentedFilename(windowId: number, fileName: string): TPromise<void> {
+		return TPromise.wrap(this.channel.call('setRepresentedFilename', [windowId, fileName]));
+	}
+
+	addRecentlyOpened(files: URI[]): TPromise<void> {
+		return TPromise.wrap(this.channel.call('addRecentlyOpened', files));
+	}
+
+	removeFromRecentlyOpened(paths: (IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier | URI)[]): TPromise<void> {
+		return TPromise.wrap(this.channel.call('removeFromRecentlyOpened', paths));
+	}
+
+	clearRecentlyOpened(): TPromise<void> {
+		return TPromise.wrap(this.channel.call('clearRecentlyOpened'));
+	}
+
+	getRecentlyOpened(windowId: number): TPromise<IRecentlyOpened> {
+		return TPromise.wrap(this.channel.call('getRecentlyOpened', windowId))
+			.then(recentlyOpened => {
+				recentlyOpened.workspaces = recentlyOpened.workspaces.map(workspace => isWorkspaceIdentifier(workspace) ? workspace : URI.revive(workspace));
+				recentlyOpened.files = recentlyOpened.files.map(URI.revive);
+				return recentlyOpened;
+			});
+	}
+
+	newWindowTab(): TPromise<void> {
+		return TPromise.wrap(this.channel.call('newWindowTab'));
+	}
+
+	showPreviousWindowTab(): TPromise<void> {
+		return TPromise.wrap(this.channel.call('showPreviousWindowTab'));
+	}
+
+	showNextWindowTab(): TPromise<void> {
+		return TPromise.wrap(this.channel.call('showNextWindowTab'));
+	}
+
+	moveWindowTabToNewWindow(): TPromise<void> {
+		return TPromise.wrap(this.channel.call('moveWindowTabToNewWindow'));
+	}
+
+	mergeAllWindowTabs(): TPromise<void> {
+		return TPromise.wrap(this.channel.call('mergeAllWindowTabs'));
+	}
+
+	toggleWindowTabsBar(): TPromise<void> {
+		return TPromise.wrap(this.channel.call('toggleWindowTabsBar'));
+	}
+
+	focusWindow(windowId: number): TPromise<void> {
+		return TPromise.wrap(this.channel.call('focusWindow', windowId));
+	}
+
+	closeWindow(windowId: number): TPromise<void> {
+		return TPromise.wrap(this.channel.call('closeWindow', windowId));
+	}
+
+	isFocused(windowId: number): TPromise<boolean> {
+		return TPromise.wrap(this.channel.call('isFocused', windowId));
+	}
+
+	isMaximized(windowId: number): TPromise<boolean> {
+		return TPromise.wrap(this.channel.call('isMaximized', windowId));
+	}
+
+	maximizeWindow(windowId: number): TPromise<void> {
+		return TPromise.wrap(this.channel.call('maximizeWindow', windowId));
+	}
+
+	unmaximizeWindow(windowId: number): TPromise<void> {
+		return TPromise.wrap(this.channel.call('unmaximizeWindow', windowId));
+	}
+
+	minimizeWindow(windowId: number): TPromise<void> {
+		return TPromise.wrap(this.channel.call('minimizeWindow', windowId));
+	}
+
+	onWindowTitleDoubleClick(windowId: number): TPromise<void> {
+		return TPromise.wrap(this.channel.call('onWindowTitleDoubleClick', windowId));
+	}
+
+	setDocumentEdited(windowId: number, flag: boolean): TPromise<void> {
+		return TPromise.wrap(this.channel.call('setDocumentEdited', [windowId, flag]));
+	}
+
+	quit(): TPromise<void> {
+		return TPromise.wrap(this.channel.call('quit'));
+	}
+
+	relaunch(options: { addArgs?: string[], removeArgs?: string[] }): TPromise<void> {
+		return TPromise.wrap(this.channel.call('relaunch', [options]));
+	}
+
+	whenSharedProcessReady(): TPromise<void> {
+		return TPromise.wrap(this.channel.call('whenSharedProcessReady'));
+	}
+
+	toggleSharedProcess(): TPromise<void> {
+		return TPromise.wrap(this.channel.call('toggleSharedProcess'));
+	}
+
+	openWindow(windowId: number, paths: URI[], options?: { forceNewWindow?: boolean, forceReuseWindow?: boolean, forceOpenWorkspaceAsFile?: boolean, args?: ParsedArgs }): TPromise<void> {
+		return TPromise.wrap(this.channel.call('openWindow', [windowId, paths, options]));
+	}
+
+	openNewWindow(): TPromise<void> {
+		return TPromise.wrap(this.channel.call('openNewWindow'));
+	}
+
+	showWindow(windowId: number): TPromise<void> {
+		return TPromise.wrap(this.channel.call('showWindow', windowId));
+	}
+
+	getWindows(): TPromise<{ id: number; workspace?: IWorkspaceIdentifier; folderUri?: ISingleFolderWorkspaceIdentifier; title: string; filename?: string; }[]> {
+		return TPromise.wrap(this.channel.call('getWindows').then(result => { result.forEach(win => win.folderUri = win.folderUri ? URI.revive(win.folderUri) : win.folderUri); return result; }));
+	}
+
+	getWindowCount(): TPromise<number> {
+		return TPromise.wrap(this.channel.call('getWindowCount'));
+	}
+
+	log(severity: string, ...messages: string[]): TPromise<void> {
+		return TPromise.wrap(this.channel.call('log', [severity, messages]));
+	}
+
+	showItemInFolder(path: string): TPromise<void> {
+		return TPromise.wrap(this.channel.call('showItemInFolder', path));
+	}
+
+	getActiveWindowId(): TPromise<number | undefined> {
+		return TPromise.wrap(this.channel.call('getActiveWindowId'));
+	}
+
+	openExternal(url: string): TPromise<boolean> {
+		return TPromise.wrap(this.channel.call('openExternal', url));
+	}
+
+	startCrashReporter(config: CrashReporterStartOptions): TPromise<void> {
+		return TPromise.wrap(this.channel.call('startCrashReporter', config));
+	}
+
+	updateTouchBar(windowId: number, items: ISerializableCommandAction[][]): TPromise<void> {
+		return TPromise.wrap(this.channel.call('updateTouchBar', [windowId, items]));
+	}
+
+	openAboutDialog(): TPromise<void> {
+		return TPromise.wrap(this.channel.call('openAboutDialog'));
+	}
+}
diff --git a/src/vs/platform/workbench/common/contextkeys.ts b/src/vs/platform/workbench/common/contextkeys.ts
index c4a740d8c28..d513b3e6c91 100644
--- a/src/vs/platform/workbench/common/contextkeys.ts
+++ b/src/vs/platform/workbench/common/contextkeys.ts
@@ -6,6 +6,11 @@
 'use strict';
 
 import { RawContextKey } from 'vs/platform/contextkey/common/contextkey';
+import { isMacintosh, isLinux, isWindows } from 'vs/base/common/platform';
 
 export const InputFocusedContextKey = 'inputFocus';
-export const InputFocusedContext = new RawContextKey<boolean>(InputFocusedContextKey, false);
\ No newline at end of file
+export const InputFocusedContext = new RawContextKey<boolean>(InputFocusedContextKey, false);
+export const FileDialogContext = new RawContextKey<string>('fileDialog', 'local');
+export const IsMacContext = new RawContextKey<boolean>('isMac', isMacintosh);
+export const IsLinuxContext = new RawContextKey<boolean>('isLinux', isLinux);
+export const IsWindowsContext = new RawContextKey<boolean>('isWindows', isWindows);
diff --git a/src/vs/platform/workspace/common/workspace.ts b/src/vs/platform/workspace/common/workspace.ts
index b9b31f4b2a0..78178fb4e68 100644
--- a/src/vs/platform/workspace/common/workspace.ts
+++ b/src/vs/platform/workspace/common/workspace.ts
@@ -4,19 +4,19 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import * as paths from 'vs/base/common/paths';
 import * as resources from 'vs/base/common/resources';
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
 import { TernarySearchTree } from 'vs/base/common/map';
 import { Event } from 'vs/base/common/event';
-import { ISingleFolderWorkspaceIdentifier, IWorkspaceIdentifier, IStoredWorkspaceFolder, isRawFileWorkspaceFolder, isRawUriWorkspaceFolder } from 'vs/platform/workspaces/common/workspaces';
+import { IWorkspaceIdentifier, IStoredWorkspaceFolder, isRawFileWorkspaceFolder, isRawUriWorkspaceFolder, ISingleFolderWorkspaceIdentifier } from 'vs/platform/workspaces/common/workspaces';
 import { coalesce, distinct } from 'vs/base/common/arrays';
 import { isLinux } from 'vs/base/common/platform';
 
 export const IWorkspaceContextService = createDecorator<IWorkspaceContextService>('contextService');
 
-export enum WorkbenchState {
+export const enum WorkbenchState {
 	EMPTY = 1,
 	FOLDER,
 	WORKSPACE
@@ -77,6 +77,14 @@ export interface IWorkspaceContextService {
 	isInsideWorkspace(resource: URI): boolean;
 }
 
+export namespace IWorkspace {
+	export function isIWorkspace(thing: any): thing is IWorkspace {
+		return thing && typeof thing === 'object'
+			&& typeof (thing as IWorkspace).id === 'string'
+			&& Array.isArray((thing as IWorkspace).folders);
+	}
+}
+
 export interface IWorkspace {
 
 	/**
@@ -84,11 +92,6 @@ export interface IWorkspace {
 	 */
 	readonly id: string;
 
-	/**
-	 * the name of the workspace.
-	 */
-	readonly name: string;
-
 	/**
 	 * Folders in the workspace.
 	 */
@@ -118,6 +121,15 @@ export interface IWorkspaceFolderData {
 	readonly index: number;
 }
 
+export namespace IWorkspaceFolder {
+	export function isIWorkspaceFolder(thing: any): thing is IWorkspaceFolder {
+		return thing && typeof thing === 'object'
+			&& URI.isUri((thing as IWorkspaceFolder).uri)
+			&& typeof (thing as IWorkspaceFolder).name === 'string'
+			&& typeof (thing as IWorkspaceFolder).toResource === 'function';
+	}
+}
+
 export interface IWorkspaceFolder extends IWorkspaceFolderData {
 
 	/**
@@ -133,7 +145,6 @@ export class Workspace implements IWorkspace {
 
 	constructor(
 		private _id: string,
-		private _name: string = '',
 		folders: WorkspaceFolder[] = [],
 		private _configuration: URI = null,
 		private _ctime?: number
@@ -141,48 +152,39 @@ export class Workspace implements IWorkspace {
 		this.folders = folders;
 	}
 
-	public update(workspace: Workspace) {
+	update(workspace: Workspace) {
 		this._id = workspace.id;
-		this._name = workspace.name;
 		this._configuration = workspace.configuration;
 		this._ctime = workspace.ctime;
 		this.folders = workspace.folders;
 	}
 
-	public get folders(): WorkspaceFolder[] {
+	get folders(): WorkspaceFolder[] {
 		return this._folders;
 	}
 
-	public set folders(folders: WorkspaceFolder[]) {
+	set folders(folders: WorkspaceFolder[]) {
 		this._folders = folders;
 		this.updateFoldersMap();
 	}
 
-	public get id(): string {
+	get id(): string {
 		return this._id;
 	}
 
-	public get ctime(): number {
+	get ctime(): number {
 		return this._ctime;
 	}
 
-	public get name(): string {
-		return this._name;
-	}
-
-	public set name(name: string) {
-		this._name = name;
-	}
-
-	public get configuration(): URI {
+	get configuration(): URI {
 		return this._configuration;
 	}
 
-	public set configuration(configuration: URI) {
+	set configuration(configuration: URI) {
 		this._configuration = configuration;
 	}
 
-	public getFolder(resource: URI): IWorkspaceFolder {
+	getFolder(resource: URI): IWorkspaceFolder {
 		if (!resource) {
 			return null;
 		}
@@ -197,8 +199,8 @@ export class Workspace implements IWorkspace {
 		}
 	}
 
-	public toJSON(): IWorkspace {
-		return { id: this.id, folders: this.folders, name: this.name, configuration: this.configuration };
+	toJSON(): IWorkspace {
+		return { id: this.id, folders: this.folders, configuration: this.configuration };
 	}
 }
 
@@ -216,7 +218,7 @@ export class WorkspaceFolder implements IWorkspaceFolder {
 	}
 
 	toResource(relativePath: string): URI {
-		return this.uri.with({ path: paths.join(this.uri.path, relativePath) });
+		return resources.joinPath(this.uri, relativePath);
 	}
 
 	toJSON(): IWorkspaceFolderData {
@@ -260,7 +262,7 @@ function toUri(path: string, relativeTo: URI): URI {
 			return URI.file(path);
 		}
 		if (relativeTo) {
-			return relativeTo.with({ path: paths.join(relativeTo.path, path) });
+			return resources.joinPath(relativeTo, path);
 		}
 	}
 	return null;
diff --git a/src/vs/platform/workspace/test/common/testWorkspace.ts b/src/vs/platform/workspace/test/common/testWorkspace.ts
index 6a204873e0c..2378eca9c79 100644
--- a/src/vs/platform/workspace/test/common/testWorkspace.ts
+++ b/src/vs/platform/workspace/test/common/testWorkspace.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { Workspace, toWorkspaceFolders } from 'vs/platform/workspace/common/workspace';
 import { isWindows } from 'vs/base/common/platform';
 
@@ -13,7 +13,6 @@ export const TestWorkspace = testWorkspace(wsUri);
 export function testWorkspace(resource: URI): Workspace {
 	return new Workspace(
 		resource.toString(),
-		resource.fsPath,
 		toWorkspaceFolders([{ path: resource.fsPath }])
 	);
-}
\ No newline at end of file
+}
diff --git a/src/vs/platform/workspace/test/common/workspace.test.ts b/src/vs/platform/workspace/test/common/workspace.test.ts
index ac6f0caf17f..c4c25fd4932 100644
--- a/src/vs/platform/workspace/test/common/workspace.test.ts
+++ b/src/vs/platform/workspace/test/common/workspace.test.ts
@@ -7,14 +7,14 @@
 
 import * as assert from 'assert';
 import { Workspace, toWorkspaceFolders, WorkspaceFolder } from 'vs/platform/workspace/common/workspace';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { IRawFileWorkspaceFolder } from 'vs/platform/workspaces/common/workspaces';
 
 suite('Workspace', () => {
 
 	test('getFolder returns the folder with given uri', () => {
 		const expected = new WorkspaceFolder({ uri: URI.file('/src/test'), name: '', index: 2 });
-		let testObject = new Workspace('', '', [new WorkspaceFolder({ uri: URI.file('/src/main'), name: '', index: 0 }), expected, new WorkspaceFolder({ uri: URI.file('/src/code'), name: '', index: 2 })]);
+		let testObject = new Workspace('', [new WorkspaceFolder({ uri: URI.file('/src/main'), name: '', index: 0 }), expected, new WorkspaceFolder({ uri: URI.file('/src/code'), name: '', index: 2 })]);
 
 		const actual = testObject.getFolder(expected.uri);
 
@@ -23,7 +23,7 @@ suite('Workspace', () => {
 
 	test('getFolder returns the folder if the uri is sub', () => {
 		const expected = new WorkspaceFolder({ uri: URI.file('/src/test'), name: '', index: 0 });
-		let testObject = new Workspace('', '', [expected, new WorkspaceFolder({ uri: URI.file('/src/main'), name: '', index: 1 }), new WorkspaceFolder({ uri: URI.file('/src/code'), name: '', index: 2 })]);
+		let testObject = new Workspace('', [expected, new WorkspaceFolder({ uri: URI.file('/src/main'), name: '', index: 1 }), new WorkspaceFolder({ uri: URI.file('/src/code'), name: '', index: 2 })]);
 
 		const actual = testObject.getFolder(URI.file('/src/test/a'));
 
@@ -32,7 +32,7 @@ suite('Workspace', () => {
 
 	test('getFolder returns the closest folder if the uri is sub', () => {
 		const expected = new WorkspaceFolder({ uri: URI.file('/src/test'), name: '', index: 2 });
-		let testObject = new Workspace('', '', [new WorkspaceFolder({ uri: URI.file('/src/main'), name: '', index: 0 }), new WorkspaceFolder({ uri: URI.file('/src/code'), name: '', index: 1 }), expected]);
+		let testObject = new Workspace('', [new WorkspaceFolder({ uri: URI.file('/src/main'), name: '', index: 0 }), new WorkspaceFolder({ uri: URI.file('/src/code'), name: '', index: 1 }), expected]);
 
 		const actual = testObject.getFolder(URI.file('/src/test/a'));
 
@@ -40,7 +40,7 @@ suite('Workspace', () => {
 	});
 
 	test('getFolder returns null if the uri is not sub', () => {
-		let testObject = new Workspace('', '', [new WorkspaceFolder({ uri: URI.file('/src/test'), name: '', index: 0 }), new WorkspaceFolder({ uri: URI.file('/src/code'), name: '', index: 1 })]);
+		let testObject = new Workspace('', [new WorkspaceFolder({ uri: URI.file('/src/test'), name: '', index: 0 }), new WorkspaceFolder({ uri: URI.file('/src/code'), name: '', index: 1 })]);
 
 		const actual = testObject.getFolder(URI.file('/src/main/a'));
 
diff --git a/src/vs/platform/workspaces/common/workspaces.ts b/src/vs/platform/workspaces/common/workspaces.ts
index d161a54cf90..656d04085ba 100644
--- a/src/vs/platform/workspaces/common/workspaces.ts
+++ b/src/vs/platform/workspaces/common/workspaces.ts
@@ -7,15 +7,10 @@
 
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
 import { TPromise } from 'vs/base/common/winjs.base';
-import { isParent } from 'vs/platform/files/common/files';
 import { localize } from 'vs/nls';
-import { basename, dirname, join } from 'vs/base/common/paths';
-import { isLinux } from 'vs/base/common/platform';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { Event } from 'vs/base/common/event';
-import { tildify, getPathLabel } from 'vs/base/common/labels';
-import { IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
-import URI from 'vs/base/common/uri';
+import { IWorkspaceFolder, IWorkspace } from 'vs/platform/workspace/common/workspace';
+import { URI } from 'vs/base/common/uri';
 
 export const IWorkspacesMainService = createDecorator<IWorkspacesMainService>('workspacesMainService');
 export const IWorkspacesService = createDecorator<IWorkspacesService>('workspacesService');
@@ -27,7 +22,7 @@ export const UNTITLED_WORKSPACE_NAME = 'workspace.json';
 /**
  * A single folder workspace identifier is just the path to the folder.
  */
-export type ISingleFolderWorkspaceIdentifier = string;
+export type ISingleFolderWorkspaceIdentifier = URI;
 
 export interface IWorkspaceIdentifier {
 	id: string;
@@ -92,6 +87,8 @@ export interface IWorkspacesMainService extends IWorkspacesService {
 
 	createWorkspaceSync(folders?: IWorkspaceFolderCreationData[]): IWorkspaceIdentifier;
 
+	resolveWorkspace(path: string): TPromise<IResolvedWorkspace>;
+
 	resolveWorkspaceSync(path: string): IResolvedWorkspace;
 
 	isUntitledWorkspace(workspace: IWorkspaceIdentifier): boolean;
@@ -109,30 +106,8 @@ export interface IWorkspacesService {
 	createWorkspace(folders?: IWorkspaceFolderCreationData[]): TPromise<IWorkspaceIdentifier>;
 }
 
-export function getWorkspaceLabel(workspace: (IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier), environmentService: IEnvironmentService, options?: { verbose: boolean }): string {
-
-	// Workspace: Single Folder
-	if (isSingleFolderWorkspaceIdentifier(workspace)) {
-		return tildify(workspace, environmentService.userHome);
-	}
-
-	// Workspace: Untitled
-	if (isParent(workspace.configPath, environmentService.workspacesHome, !isLinux /* ignore case */)) {
-		return localize('untitledWorkspace', "Untitled (Workspace)");
-	}
-
-	// Workspace: Saved
-	const filename = basename(workspace.configPath);
-	const workspaceName = filename.substr(0, filename.length - WORKSPACE_EXTENSION.length - 1);
-	if (options && options.verbose) {
-		return localize('workspaceNameVerbose', "{0} (Workspace)", getPathLabel(join(dirname(workspace.configPath), workspaceName), null, environmentService));
-	}
-
-	return localize('workspaceName', "{0} (Workspace)", workspaceName);
-}
-
 export function isSingleFolderWorkspaceIdentifier(obj: any): obj is ISingleFolderWorkspaceIdentifier {
-	return typeof obj === 'string';
+	return obj instanceof URI;
 }
 
 export function isWorkspaceIdentifier(obj: any): obj is IWorkspaceIdentifier {
@@ -140,3 +115,18 @@ export function isWorkspaceIdentifier(obj: any): obj is IWorkspaceIdentifier {
 
 	return workspaceIdentifier && typeof workspaceIdentifier.id === 'string' && typeof workspaceIdentifier.configPath === 'string';
 }
+
+export function toWorkspaceIdentifier(workspace: IWorkspace): IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier | undefined {
+	if (workspace.configuration) {
+		return {
+			configPath: workspace.configuration.fsPath,
+			id: workspace.id
+		};
+	}
+	if (workspace.folders.length === 1) {
+		return workspace.folders[0].uri;
+	}
+
+	// Empty workspace
+	return undefined;
+}
diff --git a/src/vs/platform/workspaces/common/workspacesIpc.ts b/src/vs/platform/workspaces/common/workspacesIpc.ts
deleted file mode 100644
index 91257d6d12e..00000000000
--- a/src/vs/platform/workspaces/common/workspacesIpc.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-'use strict';
-
-import { TPromise } from 'vs/base/common/winjs.base';
-import { IChannel } from 'vs/base/parts/ipc/common/ipc';
-import { IWorkspacesService, IWorkspaceIdentifier, IWorkspaceFolderCreationData, IWorkspacesMainService } from 'vs/platform/workspaces/common/workspaces';
-import URI from 'vs/base/common/uri';
-
-export interface IWorkspacesChannel extends IChannel {
-	call(command: 'createWorkspace', arg: [IWorkspaceFolderCreationData[]]): TPromise<string>;
-	call(command: string, arg?: any): TPromise<any>;
-}
-
-export class WorkspacesChannel implements IWorkspacesChannel {
-
-	constructor(private service: IWorkspacesMainService) { }
-
-	public call(command: string, arg?: any): TPromise<any> {
-		switch (command) {
-			case 'createWorkspace': {
-				const rawFolders: IWorkspaceFolderCreationData[] = arg;
-				let folders: IWorkspaceFolderCreationData[];
-				if (Array.isArray(rawFolders)) {
-					folders = rawFolders.map(rawFolder => {
-						return {
-							uri: URI.revive(rawFolder.uri), // convert raw URI back to real URI
-							name: rawFolder.name
-						} as IWorkspaceFolderCreationData;
-					});
-				}
-
-				return this.service.createWorkspace(folders);
-			}
-		}
-
-		return void 0;
-	}
-}
-
-export class WorkspacesChannelClient implements IWorkspacesService {
-
-	_serviceBrand: any;
-
-	constructor(private channel: IWorkspacesChannel) { }
-
-	public createWorkspace(folders?: IWorkspaceFolderCreationData[]): TPromise<IWorkspaceIdentifier> {
-		return this.channel.call('createWorkspace', folders);
-	}
-}
\ No newline at end of file
diff --git a/src/vs/platform/workspaces/electron-main/workspacesMainService.ts b/src/vs/platform/workspaces/electron-main/workspacesMainService.ts
index a339d3efafb..c91781b2987 100644
--- a/src/vs/platform/workspaces/electron-main/workspacesMainService.ts
+++ b/src/vs/platform/workspaces/electron-main/workspacesMainService.ts
@@ -24,7 +24,7 @@ import * as jsonEdit from 'vs/base/common/jsonEdit';
 import { applyEdit } from 'vs/base/common/jsonFormatter';
 import { massageFolderPathForWorkspace } from 'vs/platform/workspaces/node/workspaces';
 import { toWorkspaceFolders } from 'vs/platform/workspace/common/workspace';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { Schemas } from 'vs/base/common/network';
 
 export interface IStoredWorkspace {
@@ -33,7 +33,7 @@ export interface IStoredWorkspace {
 
 export class WorkspacesMainService implements IWorkspacesMainService {
 
-	public _serviceBrand: any;
+	_serviceBrand: any;
 
 	protected workspacesHome: string;
 
@@ -50,15 +50,23 @@ export class WorkspacesMainService implements IWorkspacesMainService {
 		this._onUntitledWorkspaceDeleted = new Emitter<IWorkspaceIdentifier>();
 	}
 
-	public get onWorkspaceSaved(): Event<IWorkspaceSavedEvent> {
+	get onWorkspaceSaved(): Event<IWorkspaceSavedEvent> {
 		return this._onWorkspaceSaved.event;
 	}
 
-	public get onUntitledWorkspaceDeleted(): Event<IWorkspaceIdentifier> {
+	get onUntitledWorkspaceDeleted(): Event<IWorkspaceIdentifier> {
 		return this._onUntitledWorkspaceDeleted.event;
 	}
 
-	public resolveWorkspaceSync(path: string): IResolvedWorkspace {
+	resolveWorkspace(path: string): TPromise<IResolvedWorkspace> {
+		if (!this.isWorkspacePath(path)) {
+			return TPromise.as(null); // does not look like a valid workspace config file
+		}
+
+		return readFile(path, 'utf8').then(contents => this.doResolveWorkspace(path, contents));
+	}
+
+	resolveWorkspaceSync(path: string): IResolvedWorkspace {
 		if (!this.isWorkspacePath(path)) {
 			return null; // does not look like a valid workspace config file
 		}
@@ -96,12 +104,7 @@ export class WorkspacesMainService implements IWorkspacesMainService {
 	private doParseStoredWorkspace(path: string, contents: string): IStoredWorkspace {
 
 		// Parse workspace file
-		let storedWorkspace: IStoredWorkspace;
-		try {
-			storedWorkspace = json.parse(contents); // use fault tolerant parser
-		} catch (error) {
-			throw new Error(`${path} cannot be parsed as JSON file (${error}).`);
-		}
+		let storedWorkspace: IStoredWorkspace = json.parse(contents); // use fault tolerant parser
 
 		// Filter out folders which do not have a path or uri set
 		if (Array.isArray(storedWorkspace.folders)) {
@@ -120,7 +123,7 @@ export class WorkspacesMainService implements IWorkspacesMainService {
 		return isParent(path, this.environmentService.workspacesHome, !isLinux /* ignore case */);
 	}
 
-	public createWorkspace(folders?: IWorkspaceFolderCreationData[]): TPromise<IWorkspaceIdentifier> {
+	createWorkspace(folders?: IWorkspaceFolderCreationData[]): TPromise<IWorkspaceIdentifier> {
 		const { workspace, configParent, storedWorkspace } = this.createUntitledWorkspace(folders);
 
 		return mkdirp(configParent).then(() => {
@@ -128,7 +131,7 @@ export class WorkspacesMainService implements IWorkspacesMainService {
 		});
 	}
 
-	public createWorkspaceSync(folders?: IWorkspaceFolderCreationData[]): IWorkspaceIdentifier {
+	createWorkspaceSync(folders?: IWorkspaceFolderCreationData[]): IWorkspaceIdentifier {
 		const { workspace, configParent, storedWorkspace } = this.createUntitledWorkspace(folders);
 
 		if (!existsSync(this.workspacesHome)) {
@@ -180,7 +183,7 @@ export class WorkspacesMainService implements IWorkspacesMainService {
 		};
 	}
 
-	public getWorkspaceId(workspaceConfigPath: string): string {
+	getWorkspaceId(workspaceConfigPath: string): string {
 		if (!isLinux) {
 			workspaceConfigPath = workspaceConfigPath.toLowerCase(); // sanitize for platform file system
 		}
@@ -188,11 +191,11 @@ export class WorkspacesMainService implements IWorkspacesMainService {
 		return createHash('md5').update(workspaceConfigPath).digest('hex');
 	}
 
-	public isUntitledWorkspace(workspace: IWorkspaceIdentifier): boolean {
+	isUntitledWorkspace(workspace: IWorkspaceIdentifier): boolean {
 		return this.isInsideWorkspacesHome(workspace.configPath);
 	}
 
-	public saveWorkspace(workspace: IWorkspaceIdentifier, targetConfigPath: string): TPromise<IWorkspaceIdentifier> {
+	saveWorkspace(workspace: IWorkspaceIdentifier, targetConfigPath: string): TPromise<IWorkspaceIdentifier> {
 
 		// Return early if target is same as source
 		if (isEqual(workspace.configPath, targetConfigPath, !isLinux)) {
@@ -247,7 +250,7 @@ export class WorkspacesMainService implements IWorkspacesMainService {
 		});
 	}
 
-	public deleteUntitledWorkspaceSync(workspace: IWorkspaceIdentifier): void {
+	deleteUntitledWorkspaceSync(workspace: IWorkspaceIdentifier): void {
 		if (!this.isUntitledWorkspace(workspace)) {
 			return; // only supported for untitled workspaces
 		}
@@ -267,7 +270,7 @@ export class WorkspacesMainService implements IWorkspacesMainService {
 		}
 	}
 
-	public getUntitledWorkspacesSync(): IWorkspaceIdentifier[] {
+	getUntitledWorkspacesSync(): IWorkspaceIdentifier[] {
 		let untitledWorkspacePaths: string[] = [];
 		try {
 			untitledWorkspacePaths = readdirSync(this.workspacesHome).map(folder => join(this.workspacesHome, folder, UNTITLED_WORKSPACE_NAME));
diff --git a/src/vs/platform/workspaces/node/workspacesIpc.ts b/src/vs/platform/workspaces/node/workspacesIpc.ts
new file mode 100644
index 00000000000..6ef88453c47
--- /dev/null
+++ b/src/vs/platform/workspaces/node/workspacesIpc.ts
@@ -0,0 +1,58 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+import { TPromise } from 'vs/base/common/winjs.base';
+import { IChannel } from 'vs/base/parts/ipc/node/ipc';
+import { IWorkspacesService, IWorkspaceIdentifier, IWorkspaceFolderCreationData, IWorkspacesMainService } from 'vs/platform/workspaces/common/workspaces';
+import { URI } from 'vs/base/common/uri';
+import { Event } from 'vs/base/common/event';
+
+export interface IWorkspacesChannel extends IChannel {
+	call(command: 'createWorkspace', arg: [IWorkspaceFolderCreationData[]]): Thenable<string>;
+	call(command: string, arg?: any): Thenable<any>;
+}
+
+export class WorkspacesChannel implements IWorkspacesChannel {
+
+	constructor(private service: IWorkspacesMainService) { }
+
+	listen<T>(event: string, arg?: any): Event<T> {
+		throw new Error('No events');
+	}
+
+	call(command: string, arg?: any): Thenable<any> {
+		switch (command) {
+			case 'createWorkspace': {
+				const rawFolders: IWorkspaceFolderCreationData[] = arg;
+				let folders: IWorkspaceFolderCreationData[];
+				if (Array.isArray(rawFolders)) {
+					folders = rawFolders.map(rawFolder => {
+						return {
+							uri: URI.revive(rawFolder.uri), // convert raw URI back to real URI
+							name: rawFolder.name
+						} as IWorkspaceFolderCreationData;
+					});
+				}
+
+				return this.service.createWorkspace(folders);
+			}
+		}
+
+		return void 0;
+	}
+}
+
+export class WorkspacesChannelClient implements IWorkspacesService {
+
+	_serviceBrand: any;
+
+	constructor(private channel: IWorkspacesChannel) { }
+
+	createWorkspace(folders?: IWorkspaceFolderCreationData[]): TPromise<IWorkspaceIdentifier> {
+		return TPromise.wrap(this.channel.call('createWorkspace', folders));
+	}
+}
\ No newline at end of file
diff --git a/src/vs/platform/workspaces/test/electron-main/workspacesMainService.test.ts b/src/vs/platform/workspaces/test/electron-main/workspacesMainService.test.ts
index 210d5253765..36d5df9557e 100644
--- a/src/vs/platform/workspaces/test/electron-main/workspacesMainService.test.ts
+++ b/src/vs/platform/workspaces/test/electron-main/workspacesMainService.test.ts
@@ -16,7 +16,7 @@ import { parseArgs } from 'vs/platform/environment/node/argv';
 import { WorkspacesMainService, IStoredWorkspace } from 'vs/platform/workspaces/electron-main/workspacesMainService';
 import { WORKSPACE_EXTENSION, IWorkspaceSavedEvent, IWorkspaceIdentifier, IRawFileWorkspaceFolder, IWorkspaceFolderCreationData, IRawUriWorkspaceFolder } from 'vs/platform/workspaces/common/workspaces';
 import { NullLogService } from 'vs/platform/log/common/log';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { getRandomTestPath } from 'vs/workbench/test/workbenchTestServices';
 import { isWindows } from 'vs/base/common/platform';
 import { normalizeDriveLetter } from 'vs/base/common/labels';
@@ -366,14 +366,22 @@ suite('WorkspacesMainService', () => {
 		assert.equal(0, untitled.length);
 
 		return createWorkspace([process.cwd(), os.tmpdir()]).then(untitledOne => {
+			assert.ok(fs.existsSync(untitledOne.configPath));
+
 			untitled = service.getUntitledWorkspacesSync();
 
 			assert.equal(1, untitled.length);
 			assert.equal(untitledOne.id, untitled[0].id);
 
 			return createWorkspace([os.tmpdir(), process.cwd()]).then(untitledTwo => {
+				assert.ok(fs.existsSync(untitledTwo.configPath));
+
 				untitled = service.getUntitledWorkspacesSync();
 
+				if (untitled.length === 1) {
+					assert.fail('Unexpected workspaces count, contents:\n' + fs.readFileSync(untitledTwo.configPath, 'utf8'));
+				}
+
 				assert.equal(2, untitled.length);
 
 				service.deleteUntitledWorkspaceSync(untitledOne);
diff --git a/src/vs/vscode.d.ts b/src/vs/vscode.d.ts
index c16e2810bca..c1f073939fe 100644
--- a/src/vs/vscode.d.ts
+++ b/src/vs/vscode.d.ts
@@ -754,7 +754,8 @@ declare module 'vscode' {
 		 * An optional view column in which the [editor](#TextEditor) should be shown.
 		 * The default is the [active](#ViewColumn.Active), other values are adjusted to
 		 * be `Min(column, columnCount + 1)`, the [active](#ViewColumn.Active)-column is
-		 * not adjusted.
+		 * not adjusted. Use [`ViewColumn.Beside`](#ViewColumn.Beside) to open the
+		 * editor to the side of the currently active one.
 		 */
 		viewColumn?: ViewColumn;
 
@@ -1230,24 +1231,41 @@ declare module 'vscode' {
 	 */
 	export class Uri {
 
+		/**
+		 * Create an URI from a string, e.g. `http://www.msft.com/some/path`,
+		 * `file:///usr/home`, or `scheme:with/path`.
+		 *
+		 * @see [Uri.toString](#Uri.toString)
+		 * @param value The string value of an Uri.
+		 * @return A new Uri instance.
+		 */
+		static parse(value: string): Uri;
+
 		/**
 		 * Create an URI from a file system path. The [scheme](#Uri.scheme)
 		 * will be `file`.
+		 *
+		 * The *difference* between `Uri#parse` and `Uri#file` is that the latter treats the argument
+		 * as path, not as stringified-uri. E.g. `Uri.file(path)` is *not* the same as
+		 * `Uri.parse('file://' + path)` because the path might contain characters that are
+		 * interpreted (# and ?). See the following sample:
+		 * ```ts
+		const good = URI.file('/coding/c#/project1');
+		good.scheme === 'file';
+		good.path === '/coding/c#/project1';
+		good.fragment === '';
+
+		const bad = URI.parse('file://' + '/coding/c#/project1');
+		bad.scheme === 'file';
+		bad.path === '/coding/c'; // path is now broken
+		bad.fragment === '/project1';
+		```
 		 *
 		 * @param path A file system or UNC path.
 		 * @return A new Uri instance.
 		 */
 		static file(path: string): Uri;
 
-		/**
-		 * Create an URI from a string. Will throw if the given value is not
-		 * valid.
-		 *
-		 * @param value The string value of an Uri.
-		 * @return A new Uri instance.
-		 */
-		static parse(value: string): Uri;
-
 		/**
 		 * Use the `file` and `parse` factory functions to create new `Uri` objects.
 		 */
@@ -1284,8 +1302,21 @@ declare module 'vscode' {
 		 * The string representing the corresponding file system path of this Uri.
 		 *
 		 * Will handle UNC paths and normalize windows drive letters to lower-case. Also
-		 * uses the platform specific path separator. Will *not* validate the path for
-		 * invalid characters and semantics. Will *not* look at the scheme of this Uri.
+		 * uses the platform specific path separator.
+		 *
+		 * * Will *not* validate the path for invalid characters and semantics.
+		 * * Will *not* look at the scheme of this Uri.
+		 * * The resulting string shall *not* be used for display purposes but
+		 * for disk operations, like `readFile` et al.
+		 *
+		 * The *difference* to the [`path`](#Uri.path)-property is the use of the platform specific
+		 * path separator and the handling of UNC paths. The sample below outlines the difference:
+		 * ```ts
+		const u = URI.parse('file://server/c$/folder/file.txt')
+		u.authority === 'server'
+		u.path === '/shares/c$/file.txt'
+		u.fsPath === '\\server\c$\folder\file.txt'
+		```
 		 */
 		readonly fsPath: string;
 
@@ -1307,8 +1338,10 @@ declare module 'vscode' {
 
 		/**
 		 * Returns a string representation of this Uri. The representation and normalization
-		 * of a URI depends on the scheme. The resulting string can be safely used with
-		 * [Uri.parse](#Uri.parse).
+		 * of a URI depends on the scheme.
+		 *
+		 * * The resulting string can be safely used with [Uri.parse](#Uri.parse).
+		 * * The resulting string shall *not* be used for display purposes.
 		 *
 		 * @param skipEncoding Do not percentage-encode the result, defaults to `false`. Note that
 		 *	the `#` and `?` characters occurring in the path will always be encoded.
@@ -2155,6 +2188,41 @@ declare module 'vscode' {
 		resolveCodeLens?(codeLens: CodeLens, token: CancellationToken): ProviderResult<CodeLens>;
 	}
 
+	/**
+	 * Information about where a symbol is defined.
+	 *
+	 * Provides additional metadata over normal [location](#Location) definitions, including the range of
+	 * the defining symbol
+	 */
+	export interface DefinitionLink {
+		/**
+		 * Span of the symbol being defined in the source file.
+		 *
+		 * Used as the underlined span for mouse definition hover. Defaults to the word range at
+		 * the definition position.
+		 */
+		originSelectionRange?: Range;
+
+		/**
+		 * The resource identifier of the definition.
+		 */
+		targetUri: Uri;
+
+		/**
+		 * The full range of the definition.
+		 *
+		 * For a class definition for example, this would be the entire body of the class definition.
+		 */
+		targetRange: Range;
+
+		/**
+		 * The span of the symbol definition.
+		 *
+		 * For a class definition, this would be the class name itself in the class definition.
+		 */
+		targetSelectionRange?: Range;
+	}
+
 	/**
 	 * The definition of a symbol represented as one or many [locations](#Location).
 	 * For most programming languages there is only one location at which a symbol is
@@ -2178,7 +2246,7 @@ declare module 'vscode' {
 		 * @return A definition or a thenable that resolves to such. The lack of a result can be
 		 * signaled by returning `undefined` or `null`.
 		 */
-		provideDefinition(document: TextDocument, position: Position, token: CancellationToken): ProviderResult<Definition>;
+		provideDefinition(document: TextDocument, position: Position, token: CancellationToken): ProviderResult<Definition | DefinitionLink[]>;
 	}
 
 	/**
@@ -2196,7 +2264,7 @@ declare module 'vscode' {
 		 * @return A definition or a thenable that resolves to such. The lack of a result can be
 		 * signaled by returning `undefined` or `null`.
 		 */
-		provideImplementation(document: TextDocument, position: Position, token: CancellationToken): ProviderResult<Definition>;
+		provideImplementation(document: TextDocument, position: Position, token: CancellationToken): ProviderResult<Definition | DefinitionLink[]>;
 	}
 
 	/**
@@ -2214,7 +2282,7 @@ declare module 'vscode' {
 		 * @return A definition or a thenable that resolves to such. The lack of a result can be
 		 * signaled by returning `undefined` or `null`.
 		 */
-		provideTypeDefinition(document: TextDocument, position: Position, token: CancellationToken): ProviderResult<Definition>;
+		provideTypeDefinition(document: TextDocument, position: Position, token: CancellationToken): ProviderResult<Definition | DefinitionLink[]>;
 	}
 
 	/**
@@ -2447,7 +2515,7 @@ declare module 'vscode' {
 		 * @param name The name of the symbol.
 		 * @param kind The kind of the symbol.
 		 * @param containerName The name of the symbol containing the symbol.
-		 * @param location The the location of the symbol.
+		 * @param location The location of the symbol.
 		 */
 		constructor(name: string, kind: SymbolKind, containerName: string, location: Location);
 
@@ -2465,6 +2533,56 @@ declare module 'vscode' {
 		constructor(name: string, kind: SymbolKind, range: Range, uri?: Uri, containerName?: string);
 	}
 
+	/**
+	 * Represents programming constructs like variables, classes, interfaces etc. that appear in a document. Document
+	 * symbols can be hierarchical and they have two ranges: one that encloses its definition and one that points to
+	 * its most interesting range, e.g. the range of an identifier.
+	 */
+	export class DocumentSymbol {
+
+		/**
+		 * The name of this symbol.
+		 */
+		name: string;
+
+		/**
+		 * More detail for this symbol, e.g the signature of a function.
+		 */
+		detail: string;
+
+		/**
+		 * The kind of this symbol.
+		 */
+		kind: SymbolKind;
+
+		/**
+		 * The range enclosing this symbol not including leading/trailing whitespace but everything else, e.g comments and code.
+		 */
+		range: Range;
+
+		/**
+		 * The range that should be selected and reveal when this symbol is being picked, e.g the name of a function.
+		 * Must be contained by the [`range`](#DocumentSymbol.range).
+		 */
+		selectionRange: Range;
+
+		/**
+		 * Children of this symbol, e.g. properties of a class.
+		 */
+		children: DocumentSymbol[];
+
+		/**
+		 * Creates a new document symbol.
+		 *
+		 * @param name The name of the symbol.
+		 * @param detail Details for the symbol.
+		 * @param kind The kind of the symbol.
+		 * @param range The full range of the symbol.
+		 * @param selectionRange The range that should be reveal.
+		 */
+		constructor(name: string, detail: string, kind: SymbolKind, range: Range, selectionRange: Range);
+	}
+
 	/**
 	 * The document symbol provider interface defines the contract between extensions and
 	 * the [go to symbol](https://code.visualstudio.com/docs/editor/editingevolved#_go-to-symbol)-feature.
@@ -2479,7 +2597,7 @@ declare module 'vscode' {
 		 * @return An array of document highlights or a thenable that resolves to such. The lack of a result can be
 		 * signaled by returning `undefined`, `null`, or an empty array.
 		 */
-		provideDocumentSymbols(document: TextDocument, token: CancellationToken): ProviderResult<SymbolInformation[]>;
+		provideDocumentSymbols(document: TextDocument, token: CancellationToken): ProviderResult<SymbolInformation[] | DocumentSymbol[]>;
 	}
 
 	/**
@@ -2489,16 +2607,17 @@ declare module 'vscode' {
 	export interface WorkspaceSymbolProvider {
 
 		/**
-		 * Project-wide search for a symbol matching the given query string. It is up to the provider
-		 * how to search given the query string, like substring, indexOf etc. To improve performance implementors can
-		 * skip the [location](#SymbolInformation.location) of symbols and implement `resolveWorkspaceSymbol` to do that
-		 * later.
+		 * Project-wide search for a symbol matching the given query string.
 		 *
 		 * The `query`-parameter should be interpreted in a *relaxed way* as the editor will apply its own highlighting
 		 * and scoring on the results. A good rule of thumb is to match case-insensitive and to simply check that the
 		 * characters of *query* appear in their order in a candidate symbol. Don't use prefix, substring, or similar
 		 * strict matching.
 		 *
+		 * To improve performance implementors can implement `resolveWorkspaceSymbol` and then provide symbols with partial
+		 * [location](#SymbolInformation.location)-objects, without a `range` defined. The editor will then call
+		 * `resolveWorkspaceSymbol` for selected symbols only, e.g. when opening a workspace symbol.
+		 *
 		 * @param query A non-empty query string.
 		 * @param token A cancellation token.
 		 * @return An array of document highlights or a thenable that resolves to such. The lack of a result can be
@@ -2620,13 +2739,15 @@ declare module 'vscode' {
 	}
 
 	/**
-	 * A workspace edit represents textual and files changes for
+	 * A workspace edit is a collection of textual and files changes for
 	 * multiple resources and documents.
+	 *
+	 * Use the [applyEdit](#workspace.applyEdit)-function to apply a workspace edit.
 	 */
 	export class WorkspaceEdit {
 
 		/**
-		 * The number of affected resources.
+		 * The number of affected resources of textual or resource changes.
 		 */
 		readonly size: number;
 
@@ -2657,7 +2778,8 @@ declare module 'vscode' {
 		delete(uri: Uri, range: Range): void;
 
 		/**
-		 * Check if this edit affects the given resource.
+		 * Check if a text edit for a resource exists.
+		 *
 		 * @param uri A resource identifier.
 		 * @return `true` if the given resource will be touched by this edit.
 		 */
@@ -2679,6 +2801,33 @@ declare module 'vscode' {
 		 */
 		get(uri: Uri): TextEdit[];
 
+		/**
+		 * Create a regular file.
+		 *
+		 * @param uri Uri of the new file..
+		 * @param options Defines if an existing file should be overwritten or be
+		 * ignored. When overwrite and ignoreIfExists are both set overwrite wins.
+		 */
+		createFile(uri: Uri, options?: { overwrite?: boolean, ignoreIfExists?: boolean }): void;
+
+		/**
+		 * Delete a file or folder.
+		 *
+		 * @param uri The uri of the file that is to be deleted.
+		 */
+		deleteFile(uri: Uri, options?: { recursive?: boolean, ignoreIfNotExists?: boolean }): void;
+
+		/**
+		 * Rename a file or folder.
+		 *
+		 * @param oldUri The existing file.
+		 * @param newUri The new location.
+		 * @param options Defines if existing files should be overwritten or be
+		 * ignored. When overwrite and ignoreIfExists are both set overwrite wins.
+		 */
+		renameFile(oldUri: Uri, newUri: Uri, options?: { overwrite?: boolean, ignoreIfExists?: boolean }): void;
+
+
 		/**
 		 * Get all text edits grouped by resource.
 		 *
@@ -2874,8 +3023,8 @@ declare module 'vscode' {
 	export class ParameterInformation {
 
 		/**
-		 * The label of this signature. Will be shown in
-		 * the UI.
+		 * The label of this signature. *Note*: Must be a substring of its
+		 * containing signature information's [label](#SignatureInformation.label).
 		 */
 		label: string;
 
@@ -3054,6 +3203,13 @@ declare module 'vscode' {
 		 */
 		filterText?: string;
 
+		/**
+		 * Select this item when showing. *Note* that only one completion item can be selected and
+		 * that the editor decides which item that is. The rule is that the *first* item of those
+		 * that match best is selected.
+		 */
+		preselect?: boolean;
+
 		/**
 		 * A string or snippet that should be inserted in a document when selecting
 		 * this completion. When `falsy` the [label](#CompletionItem.label)
@@ -3428,6 +3584,7 @@ declare module 'vscode' {
 		 * [Region](#FoldingRangeKind.Region). The kind is used to categorize folding ranges and used by commands
 		 * like 'Fold all comments'. See
 		 * [FoldingRangeKind](#FoldingRangeKind) for an enumeration of all kinds.
+		 * If not set, the range is originated from a syntax element.
 		 */
 		kind?: FoldingRangeKind;
 
@@ -3442,7 +3599,10 @@ declare module 'vscode' {
 	}
 
 	/**
-	 * An enumeration of all folding range kinds. The kind is used to categorize folding ranges.
+	 * An enumeration of specific folding range kinds. The kind is an optional field of a [FoldingRange](#FoldingRange)
+	 * and is used to distinguish specific folding ranges such as ranges originated from comments. The kind is used by commands like
+	 * `Fold all comments` or `Fold all regions`.
+	 * If the kind is not set on the range, the range originated from a syntax element other than comments, imports or region markers.
 	 */
 	export enum FoldingRangeKind {
 		/**
@@ -3454,7 +3614,7 @@ declare module 'vscode' {
 		 */
 		Imports = 2,
 		/**
-		 * Kind for folding range representing regions (for example a folding range marked by `#region` and `#endregion`).
+		 * Kind for folding range representing regions originating from folding markers like `#region` and `#endregion`.
 		 */
 		Region = 3
 	}
@@ -3884,6 +4044,23 @@ declare module 'vscode' {
 		constructor(location: Location, message: string);
 	}
 
+	/**
+	 * Additional metadata about the type of a diagnostic.
+	 */
+	export enum DiagnosticTag {
+		/**
+		 * Unused or unnecessary code.
+		 *
+		 * Diagnostics with this tag are rendered faded out. The amount of fading
+		 * is controlled by the `"editorUnnecessaryCode.opacity"` theme color. For
+		 * example, `"editorUnnecessaryCode.opacity": "#000000c0"` will render the
+		 * code with 75% opacity. For high contrast themes, use the
+		 * `"editorUnnecessaryCode.border"` theme color to underline unnecessary code
+		 * instead of fading it out.
+		 */
+		Unnecessary = 1,
+	}
+
 	/**
 	 * Represents a diagnostic, such as a compiler error or warning. Diagnostic objects
 	 * are only valid in the scope of a file.
@@ -3924,6 +4101,11 @@ declare module 'vscode' {
 		 */
 		relatedInformation?: DiagnosticRelatedInformation[];
 
+		/**
+		 * Additional metadata about the diagnostic.
+		 */
+		tags?: DiagnosticTag[];
+
 		/**
 		 * Creates a new diagnostic object.
 		 *
@@ -4020,17 +4202,23 @@ declare module 'vscode' {
 	}
 
 	/**
-	 * Denotes a column in the editor window. Columns are
-	 * used to show editors side by side.
+	 * Denotes a location of an editor in the window. Editors can be arranged in a grid
+	 * and each column represents one editor location in that grid by counting the editors
+	 * in order of their appearance.
 	 */
 	export enum ViewColumn {
 		/**
-		 * A *symbolic* editor column representing the currently
-		 * active column. This value can be used when opening editors, but the
-		 * *resolved* [viewColumn](#TextEditor.viewColumn)-value of editors will always
-		 * be `One`, `Two`, `Three`, or `undefined` but never `Active`.
+		 * A *symbolic* editor column representing the currently active column. This value
+		 * can be used when opening editors, but the *resolved* [viewColumn](#TextEditor.viewColumn)-value
+		 * of editors will always be `One`, `Two`, `Three`,... or `undefined` but never `Active`.
 		 */
 		Active = -1,
+		/**
+		 * A *symbolic* editor column representing the column to the side of the active one. This value
+		 * can be used when opening editors, but the *resolved* [viewColumn](#TextEditor.viewColumn)-value
+		 * of editors will always be `One`, `Two`, `Three`,... or `undefined` but never `Beside`.
+		 */
+		Beside = -2,
 		/**
 		 * The first editor column.
 		 */
@@ -4042,7 +4230,31 @@ declare module 'vscode' {
 		/**
 		 * The third editor column.
 		 */
-		Three = 3
+		Three = 3,
+		/**
+		 * The fourth editor column.
+		 */
+		Four = 4,
+		/**
+		 * The fifth editor column.
+		 */
+		Five = 5,
+		/**
+		 * The sixth editor column.
+		 */
+		Six = 6,
+		/**
+		 * The seventh editor column.
+		 */
+		Seven = 7,
+		/**
+		 * The eighth editor column.
+		 */
+		Eight = 8,
+		/**
+		 * The ninth editor column.
+		 */
+		Nine = 9
 	}
 
 	/**
@@ -4329,6 +4541,13 @@ declare module 'vscode' {
 		 * [`globalState`](#ExtensionContext.globalState) to store key value data.
 		 */
 		storagePath: string | undefined;
+
+		/**
+		 * An absolute file path of a directory in which the extension can create log files.
+		 * The directory might not exist on disk and creation is up to the extension. However,
+		 * the parent directory is guaranteed to be existent.
+		 */
+		logPath: string;
 	}
 
 	/**
@@ -4450,22 +4669,22 @@ declare module 'vscode' {
 		/**
 		 * The clean task group;
 		 */
-		public static Clean: TaskGroup;
+		static Clean: TaskGroup;
 
 		/**
 		 * The build task group;
 		 */
-		public static Build: TaskGroup;
+		static Build: TaskGroup;
 
 		/**
 		 * The rebuild all task group;
 		 */
-		public static Rebuild: TaskGroup;
+		static Rebuild: TaskGroup;
 
 		/**
 		 * The test all task group;
 		 */
-		public static Test: TaskGroup;
+		static Test: TaskGroup;
 
 		private constructor(id: string, label: string);
 	}
@@ -5290,7 +5509,7 @@ declare module 'vscode' {
 		/**
 		 * Content settings for the webview.
 		 */
-		readonly options: WebviewOptions;
+		options: WebviewOptions;
 
 		/**
 		 * Contents of the webview.
@@ -5358,6 +5577,11 @@ declare module 'vscode' {
 		 */
 		title: string;
 
+		/**
+		 * Icon for the panel shown in UI.
+		 */
+		iconPath?: Uri | { light: Uri; dark: Uri };
+
 		/**
 		 * Webview belonging to the panel.
 		 */
@@ -5371,13 +5595,16 @@ declare module 'vscode' {
 		/**
 		 * Editor position of the panel. This property is only set if the webview is in
 		 * one of the editor view columns.
-		 *
-		 * @deprecated
 		 */
 		readonly viewColumn?: ViewColumn;
 
 		/**
-		 * Is the panel currently visible?
+		 * Whether the panel is active (focused by the user).
+		 */
+		readonly active: boolean;
+
+		/**
+		 * Whether the panel is visible.
 		 */
 		readonly visible: boolean;
 
@@ -5427,6 +5654,52 @@ declare module 'vscode' {
 		readonly webviewPanel: WebviewPanel;
 	}
 
+	/**
+	 * Restore webview panels that have been persisted when vscode shuts down.
+	 *
+	 * There are two types of webview persistence:
+	 *
+	 * - Persistence within a session.
+	 * - Persistence across sessions (across restarts of VS Code).
+	 *
+	 * A `WebviewPanelSerializer` is only required for the second case: persisting a webview across sessions.
+	 *
+	 * Persistence within a session allows a webview to save its state when it becomes hidden
+	 * and restore its content from this state when it becomes visible again. It is powered entirely
+	 * by the webview content itself. To save off a persisted state, call `acquireVsCodeApi().setState()` with
+	 * any json serializable object. To restore the state again, call `getState()`
+	 *
+	 * ```js
+	 * // Within the webview
+	 * const vscode = acquireVsCodeApi();
+	 *
+	 * // Get existing state
+	 * const oldState = vscode.getState() || { value: 0 };
+	 *
+	 * // Update state
+	 * setState({ value: oldState.value + 1 })
+	 * ```
+	 *
+	 * A `WebviewPanelSerializer` extends this persistence across restarts of VS Code. When the editor is shutdown,
+	 * VS Code will save off the state from `setState` of all webviews that have a serializer. When the
+	 * webview first becomes visible after the restart, this state is passed to `deserializeWebviewPanel`.
+	 * The extension can then restore the old `WebviewPanel` from this state.
+	 */
+	interface WebviewPanelSerializer {
+		/**
+		 * Restore a webview panel from its seriailzed `state`.
+		 *
+		 * Called when a serialized webview first becomes visible.
+		 *
+		 * @param webviewPanel Webview panel to restore. The serializer should take ownership of this panel. The
+		 * serializer must restore the webview's `.html` and hook up all webview events.
+		 * @param state Persisted state from the webview content.
+		 *
+		 * @return Thanble indicating that the webview has been fully restored.
+		 */
+		deserializeWebviewPanel(webviewPanel: WebviewPanel, state: any): Thenable<void>;
+	}
+
 	/**
 	 * Namespace describing the environment the editor runs in.
 	 */
@@ -5574,6 +5847,21 @@ declare module 'vscode' {
 		readonly focused: boolean;
 	}
 
+	/**
+	 * A uri handler is responsible for handling system-wide [uris](#Uri).
+	 *
+	 * @see [window.registerUriHandler](#window.registerUriHandler).
+	 */
+	export interface UriHandler {
+
+		/**
+		 * Handle the provided system-wide [uri](#Uri).
+		 *
+		 * @see [window.registerUriHandler](#window.registerUriHandler).
+		 */
+		handleUri(uri: Uri): ProviderResult<void>;
+	}
+
 	/**
 	 * Namespace for dealing with the current window of the editor. That is visible
 	 * and active editors, as well as, UI elements to show messages, selections, and
@@ -5612,7 +5900,7 @@ declare module 'vscode' {
 		export const onDidChangeTextEditorSelection: Event<TextEditorSelectionChangeEvent>;
 
 		/**
-		 * An [event](#Event) which fires when the selection in an editor has changed.
+		 * An [event](#Event) which fires when the visible ranges of an editor has changed.
 		 */
 		export const onDidChangeTextEditorVisibleRanges: Event<TextEditorVisibleRangesChangeEvent>;
 
@@ -5626,6 +5914,17 @@ declare module 'vscode' {
 		 */
 		export const onDidChangeTextEditorViewColumn: Event<TextEditorViewColumnChangeEvent>;
 
+		/**
+		 * The currently opened terminals or an empty array.
+		 */
+		export const terminals: ReadonlyArray<Terminal>;
+
+		/**
+		 * An [event](#Event) which fires when a terminal has been created, either through the
+		 * [createTerminal](#window.createTerminal) API or commands.
+		 */
+		export const onDidOpenTerminal: Event<Terminal>;
+
 		/**
 		 * An [event](#Event) which fires when a terminal is disposed.
 		 */
@@ -5650,8 +5949,8 @@ declare module 'vscode' {
 		 *
 		 * @param document A text document to be shown.
 		 * @param column A view column in which the [editor](#TextEditor) should be shown. The default is the [active](#ViewColumn.Active), other values
-		 * are adjusted to be `Min(column, columnCount + 1)`, the [active](#ViewColumn.Active)-column is
-		 * not adjusted.
+		 * are adjusted to be `Min(column, columnCount + 1)`, the [active](#ViewColumn.Active)-column is not adjusted. Use [`ViewColumn.Beside`](#ViewColumn.Beside)
+		 * to open the editor to the side of the currently active one.
 		 * @param preserveFocus When `true` the editor will not take focus.
 		 * @return A promise that resolves to an [editor](#TextEditor).
 		 */
@@ -5902,6 +6201,29 @@ declare module 'vscode' {
 		 */
 		export function showInputBox(options?: InputBoxOptions, token?: CancellationToken): Thenable<string | undefined>;
 
+		/**
+		 * Creates a [QuickPick](#QuickPick) to let the user pick an item from a list
+		 * of items of type T.
+		 *
+		 * Note that in many cases the more convenient [window.showQuickPick](#window.showQuickPick)
+		 * is easier to use. [window.createQuickPick](#window.createQuickPick) should be used
+		 * when [window.showQuickPick](#window.showQuickPick) does not offer the required flexibility.
+		 *
+		 * @return A new [QuickPick](#QuickPick).
+		 */
+		export function createQuickPick<T extends QuickPickItem>(): QuickPick<T>;
+
+		/**
+		 * Creates a [InputBox](#InputBox) to let the user enter some text input.
+		 *
+		 * Note that in many cases the more convenient [window.showInputBox](#window.showInputBox)
+		 * is easier to use. [window.createInputBox](#window.createInputBox) should be used
+		 * when [window.showInputBox](#window.showInputBox) does not offer the required flexibility.
+		 *
+		 * @return A new [InputBox](#InputBox).
+		 */
+		export function createInputBox(): InputBox;
+
 		/**
 		 * Create a new [output channel](#OutputChannel) with the given name.
 		 *
@@ -6033,6 +6355,42 @@ declare module 'vscode' {
 		 * @returns a [TreeView](#TreeView).
 		 */
 		export function createTreeView<T>(viewId: string, options: { treeDataProvider: TreeDataProvider<T> }): TreeView<T>;
+
+		/**
+		 * Registers a [uri handler](#UriHandler) capable of handling system-wide [uris](#Uri).
+		 * In case there are multiple windows open, the topmost window will handle the uri.
+		 * A uri handler is scoped to the extension it is contributed from; it will only
+		 * be able to handle uris which are directed to the extension itself. A uri must respect
+		 * the following rules:
+		 *
+		 * - The uri-scheme must be the product name;
+		 * - The uri-authority must be the extension id (eg. `my.extension`);
+		 * - The uri-path, -query and -fragment parts are arbitrary.
+		 *
+		 * For example, if the `my.extension` extension registers a uri handler, it will only
+		 * be allowed to handle uris with the prefix `product-name://my.extension`.
+		 *
+		 * An extension can only register a single uri handler in its entire activation lifetime.
+		 *
+		 * * *Note:* There is an activation event `onUri` that fires when a uri directed for
+		 * the current extension is about to be handled.
+		 *
+		 * @param handler The uri handler to register for this extension.
+		 */
+		export function registerUriHandler(handler: UriHandler): Disposable;
+
+		/**
+		 * Registers a webview panel serializer.
+		 *
+		 * Extensions that support reviving should have an `"onWebviewPanel:viewType"` activation event and
+		 * make sure that [registerWebviewPanelSerializer](#registerWebviewPanelSerializer) is called during activation.
+		 *
+		 * Only a single serializer may be registered at a time for a given `viewType`.
+		 *
+		 * @param viewType Type of the webview panel that can be serialized.
+		 * @param serializer Webview serializer.
+		 */
+		export function registerWebviewPanelSerializer(viewType: string, serializer: WebviewPanelSerializer): Disposable;
 	}
 
 	/**
@@ -6043,7 +6401,31 @@ declare module 'vscode' {
 		/**
 		 * Element that is expanded or collapsed.
 		 */
-		element: T;
+		readonly element: T;
+
+	}
+
+	/**
+	 * The event that is fired when there is a change in [tree view's selection](#TreeView.selection)
+	 */
+	export interface TreeViewSelectionChangeEvent<T> {
+
+		/**
+		 * Selected elements.
+		 */
+		readonly selection: T[];
+
+	}
+
+	/**
+	 * The event that is fired when there is a change in [tree view's visibility](#TreeView.visible)
+	 */
+	export interface TreeViewVisibilityChangeEvent {
+
+		/**
+		 * `true` if the [tree view](#TreeView) is visible otherwise `false`.
+		 */
+		readonly visible: boolean;
 
 	}
 
@@ -6065,19 +6447,36 @@ declare module 'vscode' {
 		/**
 		 * Currently selected elements.
 		 */
-		readonly selection: ReadonlyArray<T>;
+		readonly selection: T[];
 
 		/**
-		 * Reveal an element. By default revealed element is selected.
+		 * Event that is fired when the [selection](#TreeView.selection) has changed
+		 */
+		readonly onDidChangeSelection: Event<TreeViewSelectionChangeEvent<T>>;
+
+		/**
+		 * `true` if the [tree view](#TreeView) is visible otherwise `false`.
+		 */
+		readonly visible: boolean;
+
+		/**
+		 * Event that is fired when [visibility](TreeView.visible) has changed
+		 */
+		readonly onDidChangeVisibility: Event<TreeViewVisibilityChangeEvent>;
+
+		/**
+		 * Reveals the given element in the tree view.
+		 * If the tree view is not visible then the tree view is shown and element is revealed.
 		 *
+		 * By default revealed element is selected and not focused.
 		 * In order to not to select, set the option `select` to `false`.
+		 * In order to focus, set the option `focus` to `true`.
 		 *
 		 * **NOTE:** [TreeDataProvider](#TreeDataProvider) is required to implement [getParent](#TreeDataProvider.getParent) method to access this API.
 		 */
-		reveal(element: T, options?: { select?: boolean }): Thenable<void>;
+		reveal(element: T, options?: { select?: boolean, focus?: boolean }): Thenable<void>;
 	}
 
-
 	/**
 	 * A data provider that provides tree data
 	 */
@@ -6151,7 +6550,7 @@ declare module 'vscode' {
 		tooltip?: string | undefined;
 
 		/**
-		 * The [command](#Command) which should be run when the tree item is selected.
+		 * The [command](#Command) that should be executed when the tree item is selected.
 		 */
 		command?: Command;
 
@@ -6289,6 +6688,269 @@ declare module 'vscode' {
 		cancellable?: boolean;
 	}
 
+	/**
+	 * A light-weight user input UI that is intially not visible. After
+	 * configuring it through its properties the extension can make it
+	 * visible by calling [QuickInput.show](#QuickInput.show).
+	 *
+	 * There are several reasons why this UI might have to be hidden and
+	 * the extension will be notified through [QuickInput.onDidHide](#QuickInput.onDidHide).
+	 * (Examples include: an explict call to [QuickInput.hide](#QuickInput.hide),
+	 * the user pressing Esc, some other input UI opening, etc.)
+	 *
+	 * A user pressing Enter or some other gesture implying acceptance
+	 * of the current state does not automatically hide this UI component.
+	 * It is up to the extension to decide whether to accept the user's input
+	 * and if the UI should indeed be hidden through a call to [QuickInput.hide](#QuickInput.hide).
+	 *
+	 * When the extension no longer needs this input UI, it should
+	 * [QuickInput.dispose](#QuickInput.dispose) it to allow for freeing up
+	 * any resources associated with it.
+	 *
+	 * See [QuickPick](#QuickPick) and [InputBox](#InputBox) for concrete UIs.
+	 */
+	export interface QuickInput {
+
+		/**
+		 * An optional title.
+		 */
+		title: string | undefined;
+
+		/**
+		 * An optional current step count.
+		 */
+		step: number | undefined;
+
+		/**
+		 * An optional total step count.
+		 */
+		totalSteps: number | undefined;
+
+		/**
+		 * If the UI should allow for user input. Defaults to true.
+		 *
+		 * Change this to false, e.g., while validating user input or
+		 * loading data for the next step in user input.
+		 */
+		enabled: boolean;
+
+		/**
+		 * If the UI should show a progress indicator. Defaults to false.
+		 *
+		 * Change this to true, e.g., while loading more data or validating
+		 * user input.
+		 */
+		busy: boolean;
+
+		/**
+		 * If the UI should stay open even when loosing UI focus. Defaults to false.
+		 */
+		ignoreFocusOut: boolean;
+
+		/**
+		 * Makes the input UI visible in its current configuration. Any other input
+		 * UI will first fire an [QuickInput.onDidHide](#QuickInput.onDidHide) event.
+		 */
+		show(): void;
+
+		/**
+		 * Hides this input UI. This will also fire an [QuickInput.onDidHide](#QuickInput.onDidHide)
+		 * event.
+		 */
+		hide(): void;
+
+		/**
+		 * An event signaling when this input UI is hidden.
+		 *
+		 * There are several reasons why this UI might have to be hidden and
+		 * the extension will be notified through [QuickInput.onDidHide](#QuickInput.onDidHide).
+		 * (Examples include: an explict call to [QuickInput.hide](#QuickInput.hide),
+		 * the user pressing Esc, some other input UI opening, etc.)
+		 */
+		onDidHide: Event<void>;
+
+		/**
+		 * Dispose of this input UI and any associated resources. If it is still
+		 * visible, it is first hidden. After this call the input UI is no longer
+		 * functional and no additional methods or properties on it should be
+		 * accessed. Instead a new input UI should be created.
+		 */
+		dispose(): void;
+	}
+
+	/**
+	 * A concrete [QuickInput](#QuickInput) to let the user pick an item from a
+	 * list of items of type T. The items can be filtered through a filter text field and
+	 * there is an option [canSelectMany](#QuickPick.canSelectMany) to allow for
+	 * selecting multiple items.
+	 *
+	 * Note that in many cases the more convenient [window.showQuickPick](#window.showQuickPick)
+	 * is easier to use. [window.createQuickPick](#window.createQuickPick) should be used
+	 * when [window.showQuickPick](#window.showQuickPick) does not offer the required flexibility.
+	 */
+	export interface QuickPick<T extends QuickPickItem> extends QuickInput {
+
+		/**
+		 * Current value of the filter text.
+		 */
+		value: string;
+
+		/**
+		 * Optional placeholder in the filter text.
+		 */
+		placeholder: string | undefined;
+
+		/**
+		 * An event signaling when the value of the filter text has changed.
+		 */
+		readonly onDidChangeValue: Event<string>;
+
+		/**
+		 * An event signaling when the user indicated acceptance of the selected item(s).
+		 */
+		readonly onDidAccept: Event<void>;
+
+		/**
+		 * Buttons for actions in the UI.
+		 */
+		buttons: ReadonlyArray<QuickInputButton>;
+
+		/**
+		 * An event signaling when a button was triggered.
+		 */
+		readonly onDidTriggerButton: Event<QuickInputButton>;
+
+		/**
+		 * Items to pick from.
+		 */
+		items: ReadonlyArray<T>;
+
+		/**
+		 * If multiple items can be selected at the same time. Defaults to false.
+		 */
+		canSelectMany: boolean;
+
+		/**
+		 * If the filter text should also be matched against the description of the items. Defaults to false.
+		 */
+		matchOnDescription: boolean;
+
+		/**
+		 * If the filter text should also be matched against the detail of the items. Defaults to false.
+		 */
+		matchOnDetail: boolean;
+
+		/**
+		 * Active items. This can be read and updated by the extension.
+		 */
+		activeItems: ReadonlyArray<T>;
+
+		/**
+		 * An event signaling when the active items have changed.
+		 */
+		readonly onDidChangeActive: Event<T[]>;
+
+		/**
+		 * Selected items. This can be read and updated by the extension.
+		 */
+		selectedItems: ReadonlyArray<T>;
+
+		/**
+		 * An event signaling when the selected items have changed.
+		 */
+		readonly onDidChangeSelection: Event<T[]>;
+	}
+
+	/**
+	 * A concrete [QuickInput](#QuickInput) to let the user input a text value.
+	 *
+	 * Note that in many cases the more convenient [window.showInputBox](#window.showInputBox)
+	 * is easier to use. [window.createInputBox](#window.createInputBox) should be used
+	 * when [window.showInputBox](#window.showInputBox) does not offer the required flexibility.
+	 */
+	export interface InputBox extends QuickInput {
+
+		/**
+		 * Current input value.
+		 */
+		value: string;
+
+		/**
+		 * Optional placeholder in the filter text.
+		 */
+		placeholder: string | undefined;
+
+		/**
+		 * If the input value should be hidden. Defaults to false.
+		 */
+		password: boolean;
+
+		/**
+		 * An event signaling when the value has changed.
+		 */
+		readonly onDidChangeValue: Event<string>;
+
+		/**
+		 * An event signaling when the user indicated acceptance of the input value.
+		 */
+		readonly onDidAccept: Event<void>;
+
+		/**
+		 * Buttons for actions in the UI.
+		 */
+		buttons: ReadonlyArray<QuickInputButton>;
+
+		/**
+		 * An event signaling when a button was triggered.
+		 */
+		readonly onDidTriggerButton: Event<QuickInputButton>;
+
+		/**
+		 * An optional prompt text providing some ask or explanation to the user.
+		 */
+		prompt: string | undefined;
+
+		/**
+		 * An optional validation message indicating a problem with the current input value.
+		 */
+		validationMessage: string | undefined;
+	}
+
+	/**
+	 * Button for an action in a [QuickPick](#QuickPick) or [InputBox](#InputBox).
+	 */
+	export interface QuickInputButton {
+
+		/**
+		 * Icon for the button.
+		 */
+		readonly iconPath: Uri | { light: Uri; dark: Uri } | ThemeIcon;
+
+		/**
+		 * An optional tooltip.
+		 */
+		readonly tooltip?: string | undefined;
+	}
+
+	/**
+	 * Predefined buttons for [QuickPick](#QuickPick) and [InputBox](#InputBox).
+	 */
+	export class QuickInputButtons {
+
+		/**
+		 * A back button for [QuickPick](#QuickPick) and [InputBox](#InputBox).
+		 *
+		 * When a navigation 'back' button is needed this one should be used for consistency.
+		 * It comes with a predefined icon, tooltip and location.
+		 */
+		static readonly Back: QuickInputButton;
+
+		/**
+		 * @hidden
+		 */
+		private constructor();
+	}
+
 	/**
 	 * An event describing an individual change in the text of a [document](#TextDocument).
 	 */
@@ -6593,12 +7255,17 @@ declare module 'vscode' {
 		export function saveAll(includeUntitled?: boolean): Thenable<boolean>;
 
 		/**
-		 * Make changes to one or many resources as defined by the given
+		 * Make changes to one or many resources or create, delete, and rename resources as defined by the given
 		 * [workspace edit](#WorkspaceEdit).
 		 *
-		 * When applying a workspace edit, the editor implements an 'all-or-nothing'-strategy,
-		 * that means failure to load one document or make changes to one document will cause
-		 * the edit to be rejected.
+		 * All changes of a workspace edit are applied in the same order in which they have been added. If
+		 * multiple textual inserts are made at the same position, these strings appear in the resulting text
+		 * in the order the 'inserts' were made. Invalid sequences like 'delete file a' -> 'insert text in file a'
+		 * cause failure of the operation.
+		 *
+		 * When applying a workspace edit that consists only of text edits an 'all-or-nothing'-strategy is used.
+		 * A workspace edit with resource creations or deletions aborts the operation, e.g. consective edits will
+		 * not be attempted, when a single edit fails.
 		 *
 		 * @param edit A workspace edit.
 		 * @return A thenable that resolves when the edit could be applied.
@@ -6731,13 +7398,13 @@ declare module 'vscode' {
 		export const onDidChangeConfiguration: Event<ConfigurationChangeEvent>;
 
 		/**
-		 * Register a task provider.
+		 * ~~Register a task provider.~~
+		 *
+		 * @deprecated Use the corresponding function on the `tasks` namespace instead
 		 *
 		 * @param type The task kind type this provider is registered for.
 		 * @param provider A task provider.
 		 * @return A [disposable](#Disposable) that unregisters this provider when being disposed.
-		 *
-		 * @deprecated Use the corresponding function on the `tasks` namespace instead
 		 */
 		export function registerTaskProvider(type: string, provider: TaskProvider): Disposable;
 
@@ -6752,7 +7419,7 @@ declare module 'vscode' {
 		 * @param options Immutable metadata about the provider.
 		 * @return A [disposable](#Disposable) that unregisters this provider when being disposed.
 		 */
-		export function registerFileSystemProvider(scheme: string, provider: FileSystemProvider, options?: { isCaseSensitive?: boolean }): Disposable;
+		export function registerFileSystemProvider(scheme: string, provider: FileSystemProvider, options?: { isCaseSensitive?: boolean, isReadonly?: boolean }): Disposable;
 	}
 
 	/**
@@ -7659,7 +8326,7 @@ declare module 'vscode' {
 
 	/**
 	 * Namespace for dealing with installed extensions. Extensions are represented
-	 * by an [extension](#Extension)-interface which allows to reflect on them.
+	 * by an [extension](#Extension)-interface which enables reflection on them.
 	 *
 	 * Extension writers can provide APIs to other extensions by returning their API public
 	 * surface from the `activate`-call.
diff --git a/src/vs/vscode.proposed.d.ts b/src/vs/vscode.proposed.d.ts
index 7f063470703..c1ac3219150 100644
--- a/src/vs/vscode.proposed.d.ts
+++ b/src/vs/vscode.proposed.d.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-// This is the place for API experiments and proposal.
+// This is the place for API experiments and proposals.
 
 declare module 'vscode' {
 
@@ -11,46 +11,360 @@ declare module 'vscode' {
 		export function sampleFunction(): Thenable<any>;
 	}
 
-	//#region Joh: remote, search provider
+	export namespace languages {
 
+		/**
+		 *
+		 */
+		export function changeLanguage(document: TextDocument, languageId: string): Thenable<void>;
+	}
+
+	//#region Joh - read/write in chunks
+
+	export interface FileSystemProvider {
+		open?(resource: Uri): number | Thenable<number>;
+		close?(fd: number): void | Thenable<void>;
+		read?(fd: number, pos: number, data: Uint8Array, offset: number, length: number): number | Thenable<number>;
+		write?(fd: number, pos: number, data: Uint8Array, offset: number, length: number): number | Thenable<number>;
+	}
+
+	//#endregion
+
+	//#region Rob: search provider
+
+	/**
+	 * The parameters of a query for text search.
+	 */
 	export interface TextSearchQuery {
+		/**
+		 * The text pattern to search for.
+		 */
 		pattern: string;
-		isRegExp: boolean;
-		isCaseSensitive: boolean;
-		isWordMatch: boolean;
+
+		/**
+		 * Whether or not `pattern` should be interpreted as a regular expression.
+		 */
+		isRegExp?: boolean;
+
+		/**
+		 * Whether or not the search should be case-sensitive.
+		 */
+		isCaseSensitive?: boolean;
+
+		/**
+		 * Whether or not to search for whole word matches only.
+		 */
+		isWordMatch?: boolean;
 	}
 
+	/**
+	 * A file glob pattern to match file paths against.
+	 * TODO@roblou - merge this with the GlobPattern docs/definition in vscode.d.ts.
+	 * @see [GlobPattern](#GlobPattern)
+	 */
+	export type GlobString = string;
+
+	/**
+	 * Options common to file and text search
+	 */
 	export interface SearchOptions {
+		/**
+		 * The root folder to search within.
+		 */
 		folder: Uri;
-		includes: string[]; // paths relative to folder
-		excludes: string[];
-		useIgnoreFiles?: boolean;
-		followSymlinks?: boolean;
+
+		/**
+		 * Files that match an `includes` glob pattern should be included in the search.
+		 */
+		includes: GlobString[];
+
+		/**
+		 * Files that match an `excludes` glob pattern should be excluded from the search.
+		 */
+		excludes: GlobString[];
+
+		/**
+		 * Whether external files that exclude files, like .gitignore, should be respected.
+		 * See the vscode setting `"search.useIgnoreFiles"`.
+		 */
+		useIgnoreFiles: boolean;
+
+		/**
+		 * Whether symlinks should be followed while searching.
+		 * See the vscode setting `"search.followSymlinks"`.
+		 */
+		followSymlinks: boolean;
 	}
 
+	/**
+	 * Options to specify the size of the result text preview.
+	 * These options don't affect the size of the match itself, just the amount of preview text.
+	 */
+	export interface TextSearchPreviewOptions {
+		/**
+		 * The maximum number of lines in the preview.
+		 * Only search providers that support multiline search will ever return more than one line in the match.
+		 */
+		maxLines: number;
+
+		/**
+		 * The maximum number of characters included before the start of the match.
+		 */
+		leadingChars: number;
+
+		/**
+		 * The maximum number of characters included per line.
+		 */
+		totalChars: number;
+	}
+
+	/**
+	 * Options that apply to text search.
+	 */
 	export interface TextSearchOptions extends SearchOptions {
-		previewOptions?: any; // total length? # of context lines? leading and trailing # of chars?
+		/**
+		 * The maximum number of results to be returned.
+		 */
+		maxResults: number;
+
+		/**
+		 * Options to specify the size of the result text preview.
+		 */
+		previewOptions?: TextSearchPreviewOptions;
+
+		/**
+		 * Exclude files larger than `maxFileSize` in bytes.
+		 */
 		maxFileSize?: number;
+
+		/**
+		 * Interpret files using this encoding.
+		 * See the vscode setting `"files.encoding"`
+		 */
 		encoding?: string;
 	}
 
-	export interface FileSearchOptions extends SearchOptions { }
-
-	export interface TextSearchResult {
-		path: string;
-		range: Range;
-
-		// For now, preview must be a single line of text
-		preview: { text: string, match: Range };
+	/**
+	 * The parameters of a query for file search.
+	 */
+	export interface FileSearchQuery {
+		/**
+		 * The search pattern to match against file paths.
+		 */
+		pattern: string;
 	}
 
-	export interface SearchProvider {
-		provideFileSearchResults?(options: FileSearchOptions, progress: Progress<string>, token: CancellationToken): Thenable<void>;
-		provideTextSearchResults?(query: TextSearchQuery, options: TextSearchOptions, progress: Progress<TextSearchResult>, token: CancellationToken): Thenable<void>;
+	/**
+	 * Options that apply to file search.
+	 */
+	export interface FileSearchOptions extends SearchOptions {
+		/**
+		 * The maximum number of results to be returned.
+		 */
+		maxResults: number;
+	}
+
+	/**
+	 * Options that apply to requesting the file index.
+	 */
+	export interface FileIndexOptions extends SearchOptions { }
+
+	/**
+	 * A preview of the text result.
+	 */
+	export interface TextSearchResultPreview {
+		/**
+		 * The matching line of text, or a portion of the matching line that contains the match.
+		 * For now, this can only be a single line.
+		 */
+		text: string;
+
+		/**
+		 * The Range within `text` corresponding to the text of the match.
+		 */
+		match: Range;
+	}
+
+	/**
+	 * A match from a text search
+	 */
+	export interface TextSearchResult {
+		/**
+		 * The uri for the matching document.
+		 */
+		uri: Uri;
+
+		/**
+		 * The range of the match within the document.
+		 */
+		range: Range;
+
+		/**
+		 * A preview of the text result.
+		 */
+		preview: TextSearchResultPreview;
+	}
+
+	/**
+	 * A FileIndexProvider provides a list of files in the given folder. VS Code will filter that list for searching with quickopen or from other extensions.
+	 *
+	 * A FileIndexProvider is the simpler of two ways to implement file search in VS Code. Use a FileIndexProvider if you are able to provide a listing of all files
+	 * in a folder, and want VS Code to filter them according to the user's search query.
+	 *
+	 * The FileIndexProvider will be invoked once when quickopen is opened, and VS Code will filter the returned list. It will also be invoked when
+	 * `workspace.findFiles` is called.
+	 *
+	 * If a [`FileSearchProvider`](#FileSearchProvider) is registered for the scheme, that provider will be used instead.
+	 */
+	export interface FileIndexProvider {
+		/**
+		 * Provide the set of files in the folder.
+		 * @param options A set of options to consider while searching.
+		 * @param token A cancellation token.
+		 */
+		provideFileIndex(options: FileIndexOptions, token: CancellationToken): Thenable<Uri[]>;
+	}
+
+	/**
+	 * A FileSearchProvider provides search results for files in the given folder that match a query string. It can be invoked by quickopen or other extensions.
+	 *
+	 * A FileSearchProvider is the more powerful of two ways to implement file search in VS Code. Use a FileSearchProvider if you wish to search within a folder for
+	 * all files that match the user's query.
+	 *
+	 * The FileSearchProvider will be invoked on every keypress in quickopen. When `workspace.findFiles` is called, it will be invoked with an empty query string,
+	 * and in that case, every file in the folder should be returned.
+	 *
+	 * @see [FileIndexProvider](#FileIndexProvider)
+	 */
+	export interface FileSearchProvider {
+		/**
+		 * Provide the set of files that match a certain file path pattern.
+		 * @param query The parameters for this query.
+		 * @param options A set of options to consider while searching files.
+		 * @param progress A progress callback that must be invoked for all results.
+		 * @param token A cancellation token.
+		 */
+		provideFileSearchResults(query: FileSearchQuery, options: FileSearchOptions, token: CancellationToken): Thenable<Uri[]>;
+	}
+
+	/**
+	 * A TextSearchProvider provides search results for text results inside files in the workspace.
+	 */
+	export interface TextSearchProvider {
+		/**
+		 * Provide results that match the given text pattern.
+		 * @param query The parameters for this query.
+		 * @param options A set of options to consider while searching.
+		 * @param progress A progress callback that must be invoked for all results.
+		 * @param token A cancellation token.
+		 */
+		provideTextSearchResults(query: TextSearchQuery, options: TextSearchOptions, progress: Progress<TextSearchResult>, token: CancellationToken): Thenable<void>;
+	}
+
+	/**
+	 * Options that can be set on a findTextInFiles search.
+	 */
+	export interface FindTextInFilesOptions {
+		/**
+		 * A [glob pattern](#GlobPattern) that defines the files to search for. The glob pattern
+		 * will be matched against the file paths of files relative to their workspace. Use a [relative pattern](#RelativePattern)
+		 * to restrict the search results to a [workspace folder](#WorkspaceFolder).
+		 */
+		include?: GlobPattern;
+
+		/**
+		 * A [glob pattern](#GlobPattern) that defines files and folders to exclude. The glob pattern
+		 * will be matched against the file paths of resulting matches relative to their workspace. When `undefined` only default excludes will
+		 * apply, when `null` no excludes will apply.
+		 */
+		exclude?: GlobPattern | null;
+
+		/**
+		 * The maximum number of results to search for
+		 */
+		maxResults?: number;
+
+		/**
+		 * Whether external files that exclude files, like .gitignore, should be respected.
+		 * See the vscode setting `"search.useIgnoreFiles"`.
+		 */
+		useIgnoreFiles?: boolean;
+
+		/**
+		 * Whether symlinks should be followed while searching.
+		 * See the vscode setting `"search.followSymlinks"`.
+		 */
+		followSymlinks?: boolean;
+
+		/**
+		 * Interpret files using this encoding.
+		 * See the vscode setting `"files.encoding"`
+		 */
+		encoding?: string;
+
+		/**
+		 * Options to specify the size of the result text preview.
+		 */
+		previewOptions?: TextSearchPreviewOptions;
 	}
 
 	export namespace workspace {
-		export function registerSearchProvider(scheme: string, provider: SearchProvider): Disposable;
+		/**
+		 * DEPRECATED
+		 */
+		export function registerSearchProvider(): Disposable;
+
+		/**
+		 * Register a file index provider.
+		 *
+		 * Only one provider can be registered per scheme.
+		 *
+		 * @param scheme The provider will be invoked for workspace folders that have this file scheme.
+		 * @param provider The provider.
+		 * @return A [disposable](#Disposable) that unregisters this provider when being disposed.
+		 */
+		export function registerFileIndexProvider(scheme: string, provider: FileIndexProvider): Disposable;
+
+		/**
+		 * Register a search provider.
+		 *
+		 * Only one provider can be registered per scheme.
+		 *
+		 * @param scheme The provider will be invoked for workspace folders that have this file scheme.
+		 * @param provider The provider.
+		 * @return A [disposable](#Disposable) that unregisters this provider when being disposed.
+		 */
+		export function registerFileSearchProvider(scheme: string, provider: FileSearchProvider): Disposable;
+
+		/**
+		 * Register a text search provider.
+		 *
+		 * Only one provider can be registered per scheme.
+		 *
+		 * @param scheme The provider will be invoked for workspace folders that have this file scheme.
+		 * @param provider The provider.
+		 * @return A [disposable](#Disposable) that unregisters this provider when being disposed.
+		 */
+		export function registerTextSearchProvider(scheme: string, provider: TextSearchProvider): Disposable;
+
+		/**
+		 * Search text in files across all [workspace folders](#workspace.workspaceFolders) in the workspace.
+		 * @param query The query parameters for the search - the search string, whether it's case-sensitive, or a regex, or matches whole words.
+		 * @param callback A callback, called for each result
+		 * @param token A token that can be used to signal cancellation to the underlying search engine.
+		 * @return A thenable that resolves when the search is complete.
+		 */
+		export function findTextInFiles(query: TextSearchQuery, callback: (result: TextSearchResult) => void, token?: CancellationToken): Thenable<void>;
+
+		/**
+		 * Search text in files across all [workspace folders](#workspace.workspaceFolders) in the workspace.
+		 * @param query The query parameters for the search - the search string, whether it's case-sensitive, or a regex, or matches whole words.
+		 * @param options An optional set of query options. Include and exclude patterns, maxResults, etc.
+		 * @param callback A callback, called for each result
+		 * @param token A token that can be used to signal cancellation to the underlying search engine.
+		 * @return A thenable that resolves when the search is complete.
+		 */
+		export function findTextInFiles(query: TextSearchQuery, options: FindTextInFilesOptions, callback: (result: TextSearchResult) => void, token?: CancellationToken): Thenable<void>;
 	}
 
 	//#endregion
@@ -92,12 +406,12 @@ declare module 'vscode' {
 
 	//todo@joh -> make class
 	export interface DecorationData {
-		priority?: number;
+		letter?: string;
 		title?: string;
-		bubble?: boolean;
-		abbreviation?: string;
 		color?: ThemeColor;
-		source?: string;
+		priority?: number;
+		bubble?: boolean;
+		source?: string; // hacky... we should remove it and use equality under the hood
 	}
 
 	export interface SourceControlResourceDecorations {
@@ -169,39 +483,16 @@ declare module 'vscode' {
 		Off = 7
 	}
 
-	/**
-	 * A logger for writing to an extension's log file, and accessing its dedicated log directory.
-	 */
-	export interface Logger {
-		trace(message: string, ...args: any[]): void;
-		debug(message: string, ...args: any[]): void;
-		info(message: string, ...args: any[]): void;
-		warn(message: string, ...args: any[]): void;
-		error(message: string | Error, ...args: any[]): void;
-		critical(message: string | Error, ...args: any[]): void;
-	}
-
-	export interface ExtensionContext {
-		/**
-		 * This extension's logger
-		 */
-		logger: Logger;
-
-		/**
-		 * Path where an extension can write log files.
-		 *
-		 * Extensions must create this directory before writing to it. The parent directory will always exist.
-		 */
-		readonly logDirectory: string;
-	}
-
 	export namespace env {
 		/**
 		 * Current logging level.
-		 *
-		 * @readonly
 		 */
 		export const logLevel: LogLevel;
+
+		/**
+		 * An [event](#Event) that fires when the log level has changed.
+		 */
+		export const onDidChangeLogLevel: Event<LogLevel>;
 	}
 
 	//#endregion
@@ -256,6 +547,23 @@ declare module 'vscode' {
 
 	//#endregion
 
+	//#region Joao: SCM selected provider
+
+	export interface SourceControl {
+
+		/**
+		 * Whether the source control is selected.
+		 */
+		readonly selected: boolean;
+
+		/**
+		 * An event signaling when the selection state changes.
+		 */
+		readonly onDidChangeSelection: Event<boolean>;
+	}
+
+	//#endregion
+
 	//#region Comments
 	/**
 	 * Comments provider related APIs are still in early stages, they may be changed significantly during our API experiments.
@@ -312,17 +620,14 @@ declare module 'vscode' {
 
 	interface DocumentCommentProvider {
 		provideDocumentComments(document: TextDocument, token: CancellationToken): Promise<CommentInfo>;
-		createNewCommentThread?(document: TextDocument, range: Range, text: string, token: CancellationToken): Promise<CommentThread>;
-		replyToCommentThread?(document: TextDocument, range: Range, commentThread: CommentThread, text: string, token: CancellationToken): Promise<CommentThread>;
-		onDidChangeCommentThreads?: Event<CommentThreadChangedEvent>;
+		createNewCommentThread(document: TextDocument, range: Range, text: string, token: CancellationToken): Promise<CommentThread>;
+		replyToCommentThread(document: TextDocument, range: Range, commentThread: CommentThread, text: string, token: CancellationToken): Promise<CommentThread>;
+		onDidChangeCommentThreads: Event<CommentThreadChangedEvent>;
 	}
 
 	interface WorkspaceCommentProvider {
 		provideWorkspaceComments(token: CancellationToken): Promise<CommentThread[]>;
-		createNewCommentThread?(document: TextDocument, range: Range, text: string, token: CancellationToken): Promise<CommentThread>;
-		replyToCommentThread?(document: TextDocument, range: Range, commentThread: CommentThread, text: string, token: CancellationToken): Promise<CommentThread>;
-
-		onDidChangeCommentThreads?: Event<CommentThreadChangedEvent>;
+		onDidChangeCommentThreads: Event<CommentThreadChangedEvent>;
 	}
 
 	namespace workspace {
@@ -337,53 +642,143 @@ declare module 'vscode' {
 		/**
 		 * Fires when the terminal's pty slave pseudo-device is written to. In other words, this
 		 * provides access to the raw data stream from the process running within the terminal,
-		 * including ANSI sequences.
+		 * including VT sequences.
 		 */
-		onData: Event<string>;
+		onDidWriteData: Event<string>;
 	}
 
-	export namespace window {
+	/**
+	 * Represents the dimensions of a terminal.
+	 */
+	export interface TerminalDimensions {
 		/**
-		 * The currently opened terminals or an empty array.
+		 * The number of columns in the terminal.
+		 */
+		readonly columns: number;
+
+		/**
+		 * The number of rows in the terminal.
+		 */
+		readonly rows: number;
+	}
+
+	/**
+	 * Represents a terminal without a process where all interaction and output in the terminal is
+	 * controlled by an extension. This is similar to an output window but has the same VT sequence
+	 * compatility as the regular terminal.
+	 *
+	 * Note that an instance of [Terminal](#Terminal) will be created when a TerminalRenderer is
+	 * created with all its APIs available for use by extensions. When using the Terminal object
+	 * of a TerminalRenderer it acts just like normal only the extension that created the
+	 * TerminalRenderer essentially acts as a process. For example when an
+	 * [Terminal.onDidWriteData](#Terminal.onDidWriteData) listener is registered, that will fire
+	 * when [TerminalRenderer.write](#TerminalRenderer.write) is called. Similarly when
+	 * [Terminal.sendText](#Terminal.sendText) is triggered that will fire the
+	 * [TerminalRenderer.onDidAcceptInput](#TerminalRenderer.onDidAcceptInput) event.
+	 *
+	 * **Example:** Create a terminal renderer, show it and write hello world in red
+	 * ```typescript
+	 * const renderer = window.createTerminalRenderer('foo');
+	 * renderer.terminal.then(t => t.show());
+	 * renderer.write('\x1b[31mHello world\x1b[0m');
+	 * ```
+	 */
+	export interface TerminalRenderer {
+		/**
+		 * The name of the terminal, this will appear in the terminal selector.
+		 */
+		name: string;
+
+		/**
+		 * The dimensions of the terminal, the rows and columns of the terminal can only be set to
+		 * a value smaller than the maximum value, if this is undefined the terminal will auto fit
+		 * to the maximum value [maximumDimensions](TerminalRenderer.maximumDimensions).
 		 *
-		 * @readonly
+		 * **Example:** Override the dimensions of a TerminalRenderer to 20 columns and 10 rows
+		 * ```typescript
+		 * terminalRenderer.dimensions = {
+		 *   cols: 20,
+		 *   rows: 10
+		 * };
+		 * ```
 		 */
-		export let terminals: Terminal[];
+		dimensions: TerminalDimensions | undefined;
 
 		/**
-		 * An [event](#Event) which fires when a terminal has been created, either through the
-		 * [createTerminal](#window.createTerminal) API or commands.
+		 * The maximum dimensions of the terminal, this will be undefined immediately after a
+		 * terminal renderer is created and also until the terminal becomes visible in the UI.
+		 * Listen to [onDidChangeMaximumDimensions](TerminalRenderer.onDidChangeMaximumDimensions)
+		 * to get notified when this value changes.
 		 */
-		export const onDidOpenTerminal: Event<Terminal>;
-	}
+		readonly maximumDimensions: TerminalDimensions | undefined;
 
-	//#endregion
+		/**
+		 * The corressponding [Terminal](#Terminal) for this TerminalRenderer.
+		 */
+		readonly terminal: Terminal;
 
-	//#region URLs
+		/**
+		 * Write text to the terminal. Unlike [Terminal.sendText](#Terminal.sendText) which sends
+		 * text to the underlying _process_, this will write the text to the terminal itself.
+		 *
+		 * **Example:** Write red text to the terminal
+		 * ```typescript
+		 * terminalRenderer.write('\x1b[31mHello world\x1b[0m');
+		 * ```
+		 *
+		 * **Example:** Move the cursor to the 10th row and 20th column and write an asterisk
+		 * ```typescript
+		 * terminalRenderer.write('\x1b[10;20H*');
+		 * ```
+		 *
+		 * @param text The text to write.
+		 */
+		write(text: string): void;
 
-	export interface ProtocolHandler {
-		handleUri(uri: Uri): void;
+		/**
+		 * An event which fires on keystrokes in the terminal or when an extension calls
+		 * [Terminal.sendText](#Terminal.sendText). Keystrokes are converted into their
+		 * corresponding VT sequence representation.
+		 *
+		 * **Example:** Simulate interaction with the terminal from an outside extension or a
+		 * workbench command such as `workbench.action.terminal.runSelectedText`
+		 * ```typescript
+		 * const terminalRenderer = window.createTerminalRenderer('test');
+		 * terminalRenderer.onDidAcceptInput(data => {
+		 *   cosole.log(data); // 'Hello world'
+		 * });
+		 * terminalRenderer.terminal.then(t => t.sendText('Hello world'));
+		 * ```
+		 */
+		readonly onDidAcceptInput: Event<string>;
+
+		/**
+		 * An event which fires when the [maximum dimensions](#TerminalRenderer.maimumDimensions) of
+		 * the terminal renderer change.
+		 */
+		readonly onDidChangeMaximumDimensions: Event<TerminalDimensions>;
 	}
 
 	export namespace window {
+		/**
+		 * The currently active terminal or `undefined`. The active terminal is the one that
+		 * currently has focus or most recently had focus.
+		 */
+		export const activeTerminal: Terminal | undefined;
 
 		/**
-		 * Registers a protocol handler capable of handling system-wide URIs.
+		 * An [event](#Event) which fires when the [active terminal](#window.activeTerminal)
+		 * has changed. *Note* that the event also fires when the active terminal changes
+		 * to `undefined`.
 		 */
-		export function registerProtocolHandler(handler: ProtocolHandler): Disposable;
-	}
+		export const onDidChangeActiveTerminal: Event<Terminal | undefined>;
 
-	//#endregion
-
-	//#region Joh: hierarchical document symbols, https://github.com/Microsoft/vscode/issues/34968
-
-	export class SymbolInformation2 extends SymbolInformation {
-		definingRange: Range;
-		children: SymbolInformation2[];
-	}
-
-	export interface DocumentSymbolProvider {
-		provideDocumentSymbols(document: TextDocument, token: CancellationToken): ProviderResult<SymbolInformation[] | SymbolInformation2[]>;
+		/**
+		 * Create a [TerminalRenderer](#TerminalRenderer).
+		 *
+		 * @param name The name of the terminal renderer, this shows up in the terminal selector.
+		 */
+		export function createTerminalRenderer(name: string): TerminalRenderer;
 	}
 
 	//#endregion
@@ -396,96 +791,68 @@ declare module 'vscode' {
 
 	//#endregion
 
-	//#region mjbvz: Unused diagnostics
-	/**
-	 * Additional metadata about the type of diagnostic.
-	 */
-	export enum DiagnosticTag {
-		/**
-		 * Unused or unnecessary code.
-		 */
-		Unnecessary = 1,
+	//#region mjbvz,joh: https://github.com/Microsoft/vscode/issues/43768
+	export interface FileRenameEvent {
+		readonly oldUri: Uri;
+		readonly newUri: Uri;
 	}
 
-	export interface Diagnostic {
-		/**
-		 * Additional metadata about the type of the diagnostic.
-		 */
-		customTags?: DiagnosticTag[];
-	}
-
-	//#endregion
-
-	//#region mjbvz: File rename events
-	export interface ResourceRenamedEvent {
-		readonly oldResource: Uri;
-		readonly newResource: Uri;
+	export interface FileWillRenameEvent {
+		readonly oldUri: Uri;
+		readonly newUri: Uri;
+		waitUntil(thenable: Thenable<WorkspaceEdit>): void;
 	}
 
 	export namespace workspace {
-		export const onDidRenameResource: Event<ResourceRenamedEvent>;
+		export const onWillRenameFile: Event<FileWillRenameEvent>;
+		export const onDidRenameFile: Event<FileRenameEvent>;
 	}
 	//#endregion
 
-	//#region mjbvz: Code action trigger
+	//#region Signature Help
+	/**
+	 * How a [Signature provider](#SignatureHelpProvider) was triggered
+	 */
+	export enum SignatureHelpTriggerReason {
+		/**
+		 * Signature help was invoked manually by the user or by a command.
+		 */
+		Invoke = 1,
+
+		/**
+		 * Signature help was triggered by a trigger character.
+		 */
+		TriggerCharacter = 2,
+
+		/**
+		 * Signature help was retriggered.
+		 *
+		 * Retriggers occur when the signature help is already active and can be caused by typing a trigger character
+		 * or by a cursor move.
+		 */
+		Retrigger = 3,
+	}
 
 	/**
-	 * How a [code action provider](#CodeActionProvider) was triggered
+	 * Contains additional information about the context in which a
+	 * [signature help provider](#SignatureHelpProvider.provideSignatureHelp) is triggered.
 	 */
-	export enum CodeActionTrigger {
+	export interface SignatureHelpContext {
 		/**
-		 * Provider was triggered automatically by VS Code.
+		 * Action that caused signature help to be requested.
 		 */
-		Automatic = 1,
+		readonly triggerReason: SignatureHelpTriggerReason;
 
 		/**
-		 * User requested code actions.
+		 * Character that caused signature help to be requested.
+		 *
+		 * This is `undefined` for manual triggers or retriggers for a cursor move.
 		 */
-		Manual = 2,
+		readonly triggerCharacter?: string;
 	}
 
-	interface CodeActionContext {
-		/**
-		 * How the code action provider was triggered.
-		 */
-		triggerKind?: CodeActionTrigger;
-	}
-
-	//#endregion
-
-
-	//#region Matt: WebView Serializer
-
-	/**
-	 * Restore webview panels that have been persisted when vscode shuts down.
-	 */
-	interface WebviewPanelSerializer {
-		/**
-		 * Restore a webview panel from its seriailzed `state`.
-		 *
-		 * Called when a serialized webview first becomes visible.
-		 *
-		 * @param webviewPanel Webview panel to restore. The serializer should take ownership of this panel.
-		 * @param state Persisted state.
-		 *
-		 * @return Thanble indicating that the webview has been fully restored.
-		 */
-		deserializeWebviewPanel(webviewPanel: WebviewPanel, state: any): Thenable<void>;
-	}
-
-	namespace window {
-		/**
-		 * Registers a webview panel serializer.
-		 *
-		 * Extensions that support reviving should have an `"onWebviewPanel:viewType"` activation method and
-		 * make sure that [registerWebviewPanelSerializer](#registerWebviewPanelSerializer) is called during activation.
-		 *
-		 * Only a single serializer may be registered at a time for a given `viewType`.
-		 *
-		 * @param viewType Type of the webview panel that can be serialized.
-		 * @param serializer Webview serializer.
-		 */
-		export function registerWebviewPanelSerializer(viewType: string, serializer: WebviewPanelSerializer): Disposable;
+	export interface SignatureHelpProvider {
+		provideSignatureHelp(document: TextDocument, position: Position, token: CancellationToken, context: SignatureHelpContext): ProviderResult<SignatureHelp>;
 	}
 
 	//#endregion
diff --git a/src/vs/workbench/api/browser/viewsContainersExtensionPoint.ts b/src/vs/workbench/api/browser/viewsContainersExtensionPoint.ts
index 45a415522da..7b079429f2c 100644
--- a/src/vs/workbench/api/browser/viewsContainersExtensionPoint.ts
+++ b/src/vs/workbench/api/browser/viewsContainersExtensionPoint.ts
@@ -7,7 +7,7 @@
 import { localize } from 'vs/nls';
 import { IJSONSchema } from 'vs/base/common/jsonSchema';
 import { ExtensionMessageCollector, ExtensionsRegistry, IExtensionPoint } from 'vs/workbench/services/extensions/common/extensionsRegistry';
-import { join } from 'vs/base/common/paths';
+import * as resources from 'vs/base/common/resources';
 import { createCSSRule } from 'vs/base/browser/dom';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { SyncActionDescriptor } from 'vs/platform/actions/common/actions';
@@ -29,6 +29,7 @@ import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions, IWo
 import { LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { IEditorGroupsService } from 'vs/workbench/services/group/common/editorGroupsService';
+import { URI } from 'vs/base/common/uri';
 
 export interface IUserFriendlyViewsContainerDescriptor {
 	id: string;
@@ -36,6 +37,12 @@ export interface IUserFriendlyViewsContainerDescriptor {
 	icon: string;
 }
 
+export interface IUserFriendlyViewsContainerDescriptor2 {
+	id: string;
+	title: string;
+	icon: URI;
+}
+
 const viewsContainerSchema: IJSONSchema = {
 	type: 'object',
 	properties: {
@@ -81,12 +88,13 @@ class ViewsContainersExtensionHandler implements IWorkbenchContribution {
 	private registerTestViewContainer(): void {
 		const title = localize('test', "Test");
 		const cssClass = `extensionViewlet-test`;
-		const icon = require.toUrl('./media/test.svg');
+		const icon = URI.parse(require.toUrl('./media/test.svg'));
 
-		this.registerCustomViewlet({ id: TEST_VIEW_CONTAINER_ID, title, icon }, TEST_VIEW_CONTAINER_ORDER, cssClass);
+		this.registerCustomViewlet({ id: TEST_VIEW_CONTAINER_ID, title, icon }, TEST_VIEW_CONTAINER_ORDER, cssClass, void 0);
 	}
 
 	private handleAndRegisterCustomViewContainers() {
+		let order = TEST_VIEW_CONTAINER_ORDER + 1;
 		viewsContainersExtensionPoint.setHandler((extensions) => {
 			for (let extension of extensions) {
 				const { value, collector } = extension;
@@ -96,7 +104,7 @@ class ViewsContainersExtensionHandler implements IWorkbenchContribution {
 					}
 					switch (entry.key) {
 						case 'activitybar':
-							this.registerCustomViewContainers(entry.value, extension.description);
+							order = this.registerCustomViewContainers(entry.value, extension.description, order);
 							break;
 					}
 				});
@@ -132,23 +140,23 @@ class ViewsContainersExtensionHandler implements IWorkbenchContribution {
 		return true;
 	}
 
-	private registerCustomViewContainers(containers: IUserFriendlyViewsContainerDescriptor[], extension: IExtensionDescription) {
-		containers.forEach((descriptor, index) => {
+	private registerCustomViewContainers(containers: IUserFriendlyViewsContainerDescriptor[], extension: IExtensionDescription, order: number): number {
+		containers.forEach(descriptor => {
 			const cssClass = `extensionViewlet-${descriptor.id}`;
-			// TODO@extensionLocation
-			const icon = join(extension.extensionLocation.fsPath, descriptor.icon);
-			this.registerCustomViewlet({ id: `workbench.view.extension.${descriptor.id}`, title: descriptor.title, icon }, TEST_VIEW_CONTAINER_ORDER + index + 1, cssClass);
+			const icon = resources.joinPath(extension.extensionLocation, descriptor.icon);
+			this.registerCustomViewlet({ id: `workbench.view.extension.${descriptor.id}`, title: descriptor.title, icon }, order++, cssClass, extension.id);
 		});
+		return order;
 	}
 
-	private registerCustomViewlet(descriptor: IUserFriendlyViewsContainerDescriptor, order: number, cssClass: string): void {
+	private registerCustomViewlet(descriptor: IUserFriendlyViewsContainerDescriptor2, order: number, cssClass: string, extensionId: string): void {
 		const viewContainersRegistry = Registry.as<IViewContainersRegistry>(ViewContainerExtensions.ViewContainersRegistry);
 		const viewletRegistry = Registry.as<ViewletRegistry>(ViewletExtensions.Viewlets);
 		const id = descriptor.id;
 
 		if (!viewletRegistry.getViewlet(id)) {
 
-			viewContainersRegistry.registerViewContainer(id);
+			viewContainersRegistry.registerViewContainer(id, extensionId);
 
 			// Register as viewlet
 			class CustomViewlet extends ViewContainerViewlet {
diff --git a/src/vs/workbench/api/browser/viewsExtensionPoint.ts b/src/vs/workbench/api/browser/viewsExtensionPoint.ts
index d70fc465c8e..edc30f694e0 100644
--- a/src/vs/workbench/api/browser/viewsExtensionPoint.ts
+++ b/src/vs/workbench/api/browser/viewsExtensionPoint.ts
@@ -17,7 +17,6 @@ import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions, IWo
 import { LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ProgressLocation } from 'vs/platform/progress/common/progress';
 import { VIEWLET_ID as EXPLORER } from 'vs/workbench/parts/files/common/files';
 import { VIEWLET_ID as SCM } from 'vs/workbench/parts/scm/common/scm';
 import { VIEWLET_ID as DEBUG } from 'vs/workbench/parts/debug/common/debug';
@@ -114,7 +113,7 @@ class ViewsContainersExtensionHandler implements IWorkbenchContribution {
 					}
 					const registeredViews = ViewsRegistry.getViews(container);
 					const viewIds = [];
-					const viewDescriptors = coalesce(entry.value.map(item => {
+					const viewDescriptors = coalesce(entry.value.map((item, index) => {
 						// validate
 						if (viewIds.indexOf(item.id) !== -1) {
 							collector.error(localize('duplicateView1', "Cannot register multiple views with same id `{0}` in the view container `{1}`", item.id, container.id));
@@ -133,7 +132,8 @@ class ViewsContainersExtensionHandler implements IWorkbenchContribution {
 							when: ContextKeyExpr.deserialize(item.when),
 							canToggleVisibility: true,
 							collapsed: this.showCollapsed(container),
-							treeViewer: this.instantiationService.createInstance(CustomTreeViewer, item.id, this.getProgressLocation(container))
+							treeViewer: this.instantiationService.createInstance(CustomTreeViewer, item.id, container),
+							order: extension.description.id === container.extensionId ? index + 1 : void 0
 						};
 
 						viewIds.push(viewDescriptor.id);
@@ -145,18 +145,6 @@ class ViewsContainersExtensionHandler implements IWorkbenchContribution {
 		});
 	}
 
-	private getProgressLocation(container: ViewContainer): ProgressLocation {
-		switch (container.id) {
-			case EXPLORER:
-				return ProgressLocation.Explorer;
-			case SCM:
-				return ProgressLocation.Scm;
-			case DEBUG:
-				return null /* No debug progress location yet */;
-		}
-		return null;
-	}
-
 	private isValidViewDescriptors(viewDescriptors: IUserFriendlyViewDescriptor[], collector: ExtensionMessageCollector): boolean {
 		if (!Array.isArray(viewDescriptors)) {
 			collector.error(localize('requirearray', "views must be an array"));
diff --git a/src/vs/workbench/api/electron-browser/mainThreadCommands.ts b/src/vs/workbench/api/electron-browser/mainThreadCommands.ts
index ad4bfc1165a..3f6db29fc94 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadCommands.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadCommands.ts
@@ -94,11 +94,11 @@ function _generateMarkdown(description: string | ICommandHandlerDescription): st
 		parts.push('\n\n');
 		if (description.args) {
 			for (let arg of description.args) {
-				parts.push(`* _${arg.name}_ ${arg.description || ''}\n`);
+				parts.push(`* _${arg.name}_ - ${arg.description || ''}\n`);
 			}
 		}
 		if (description.returns) {
-			parts.push(`* _(returns)_ ${description.returns}`);
+			parts.push(`* _(returns)_ - ${description.returns}`);
 		}
 		parts.push('\n\n');
 		return parts.join('');
diff --git a/src/vs/workbench/api/electron-browser/mainThreadComments.ts b/src/vs/workbench/api/electron-browser/mainThreadComments.ts
index fd3d2ef1e23..f1c5434edd9 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadComments.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadComments.ts
@@ -5,18 +5,18 @@
 'use strict';
 
 import { Disposable, IDisposable, dispose } from 'vs/base/common/lifecycle';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
+import { ICodeEditor, isCodeEditor, isDiffEditor, IDiffEditor } from 'vs/editor/browser/editorBrowser';
 import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
 import * as modes from 'vs/editor/common/modes';
 import { extHostNamedCustomer } from 'vs/workbench/api/electron-browser/extHostCustomers';
-import { keys } from '../../../base/common/map';
+import { keys } from 'vs/base/common/map';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { ExtHostCommentsShape, ExtHostContext, IExtHostContext, MainContext, MainThreadCommentsShape } from '../node/extHost.protocol';
 
 import { ICommentService } from 'vs/workbench/parts/comments/electron-browser/commentService';
 import { COMMENTS_PANEL_ID } from 'vs/workbench/parts/comments/electron-browser/commentsPanel';
 import { IPanelService } from 'vs/workbench/services/panel/common/panelService';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { ReviewController } from 'vs/workbench/parts/comments/electron-browser/commentsEditorContribution';
 
 @extHostNamedCustomer(MainContext.MainThreadComments)
@@ -25,6 +25,7 @@ export class MainThreadComments extends Disposable implements MainThreadComments
 	private _proxy: ExtHostCommentsShape;
 	private _documentProviders = new Map<number, IDisposable>();
 	private _workspaceProviders = new Map<number, IDisposable>();
+	private _firstSessionStart: boolean;
 
 	constructor(
 		extHostContext: IExtHostContext,
@@ -35,25 +36,28 @@ export class MainThreadComments extends Disposable implements MainThreadComments
 	) {
 		super();
 		this._disposables = [];
+		this._firstSessionStart = true;
 		this._proxy = extHostContext.getProxy(ExtHostContext.ExtHostComments);
 		this._disposables.push(this._editorService.onDidActiveEditorChange(e => {
-			const outerEditor = this.getFocusedEditor();
-			if (!outerEditor) {
+			const editors = this.getFocusedEditors();
+			if (!editors || !editors.length) {
 				return;
 			}
 
-			const controller = ReviewController.get(outerEditor);
-			if (!controller) {
-				return;
-			}
+			editors.forEach(editor => {
+				const controller = ReviewController.get(editor);
+				if (!controller) {
+					return;
+				}
 
-			if (!outerEditor.getModel()) {
-				return;
-			}
+				if (!editor.getModel()) {
+					return;
+				}
 
-			const outerEditorURI = outerEditor.getModel().uri;
-			this.provideDocumentComments(outerEditorURI).then(commentInfos => {
-				this._commentService.setComments(outerEditorURI, commentInfos.filter(info => info !== null));
+				const outerEditorURI = editor.getModel().uri;
+				this.provideDocumentComments(outerEditorURI).then(commentInfos => {
+					this._commentService.setDocumentComments(outerEditorURI, commentInfos.filter(info => info !== null));
+				});
 			});
 		}));
 	}
@@ -81,10 +85,13 @@ export class MainThreadComments extends Disposable implements MainThreadComments
 	$registerWorkspaceCommentProvider(handle: number): void {
 		this._workspaceProviders.set(handle, undefined);
 		this._panelService.setPanelEnablement(COMMENTS_PANEL_ID, true);
-		this._panelService.openPanel(COMMENTS_PANEL_ID);
+		if (this._firstSessionStart) {
+			this._panelService.openPanel(COMMENTS_PANEL_ID);
+			this._firstSessionStart = false;
+		}
 		this._proxy.$provideWorkspaceComments(handle).then(commentThreads => {
 			if (commentThreads) {
-				this._commentService.setAllComments(commentThreads);
+				this._commentService.setWorkspaceComments(handle, commentThreads);
 			}
 		});
 	}
@@ -96,8 +103,10 @@ export class MainThreadComments extends Disposable implements MainThreadComments
 
 	$unregisterWorkspaceCommentProvider(handle: number): void {
 		this._workspaceProviders.delete(handle);
-		this._panelService.setPanelEnablement(COMMENTS_PANEL_ID, false);
-		this._commentService.removeAllComments();
+		if (this._workspaceProviders.size === 0) {
+			this._panelService.setPanelEnablement(COMMENTS_PANEL_ID, false);
+		}
+		this._commentService.removeWorkspaceComments(handle);
 	}
 
 	$onDidCommentThreadsChange(handle: number, event: modes.CommentThreadChangedEvent) {
@@ -113,13 +122,25 @@ export class MainThreadComments extends Disposable implements MainThreadComments
 		this._documentProviders.clear();
 	}
 
-	getFocusedEditor(): ICodeEditor {
-		let editor = this._codeEditorService.getFocusedCodeEditor();
-		if (!editor) {
-			return this._editorService.activeTextEditorWidget as ICodeEditor;
+	getFocusedEditors(): ICodeEditor[] {
+		let activeControl = this._editorService.activeControl;
+		if (activeControl) {
+			if (isCodeEditor(activeControl.getControl())) {
+				return [this._editorService.activeControl.getControl() as ICodeEditor];
+			}
+
+			if (isDiffEditor(activeControl.getControl())) {
+				let diffEditor = activeControl.getControl() as IDiffEditor;
+				return [diffEditor.getOriginalEditor(), diffEditor.getModifiedEditor()];
+			}
 		}
 
-		return editor;
+		let editor = this._codeEditorService.getFocusedCodeEditor();
+
+		if (editor) {
+			return [editor];
+		}
+		return [];
 	}
 
 	async provideWorkspaceComments(): Promise<modes.CommentThread[]> {
diff --git a/src/vs/workbench/api/electron-browser/mainThreadConfiguration.ts b/src/vs/workbench/api/electron-browser/mainThreadConfiguration.ts
index 2b307d2d019..c375aa9faa7 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadConfiguration.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadConfiguration.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import URI, { UriComponents } from 'vs/base/common/uri';
+import { URI, UriComponents } from 'vs/base/common/uri';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { IDisposable } from 'vs/base/common/lifecycle';
 import { Registry } from 'vs/platform/registry/common/platform';
@@ -36,12 +36,12 @@ export class MainThreadConfiguration implements MainThreadConfigurationShape {
 		this._configurationListener.dispose();
 	}
 
-	$updateConfigurationOption(target: ConfigurationTarget, key: string, value: any, resourceUriComponenets: UriComponents): TPromise<void> {
+	$updateConfigurationOption(target: ConfigurationTarget, key: string, value: any, resourceUriComponenets: UriComponents): Thenable<void> {
 		const resource = resourceUriComponenets ? URI.revive(resourceUriComponenets) : null;
 		return this.writeConfiguration(target, key, value, resource);
 	}
 
-	$removeConfigurationOption(target: ConfigurationTarget, key: string, resourceUriComponenets: UriComponents): TPromise<void> {
+	$removeConfigurationOption(target: ConfigurationTarget, key: string, resourceUriComponenets: UriComponents): Thenable<void> {
 		const resource = resourceUriComponenets ? URI.revive(resourceUriComponenets) : null;
 		return this.writeConfiguration(target, key, undefined, resource);
 	}
diff --git a/src/vs/workbench/api/electron-browser/mainThreadDebugService.ts b/src/vs/workbench/api/electron-browser/mainThreadDebugService.ts
index c3e41323219..2d741ad475b 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadDebugService.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadDebugService.ts
@@ -5,8 +5,8 @@
 'use strict';
 
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
-import uri from 'vs/base/common/uri';
-import { IDebugService, IConfig, IDebugConfigurationProvider, IBreakpoint, IFunctionBreakpoint, IBreakpointData, IAdapterExecutable, ITerminalSettings, IDebugAdapter, IDebugAdapterProvider, ITerminalLauncher } from 'vs/workbench/parts/debug/common/debug';
+import { URI as uri } from 'vs/base/common/uri';
+import { IDebugService, IConfig, IDebugConfigurationProvider, IBreakpoint, IFunctionBreakpoint, IBreakpointData, IAdapterExecutable, ITerminalSettings, IDebugAdapter, IDebugAdapterProvider } from 'vs/workbench/parts/debug/common/debug';
 import { TPromise } from 'vs/base/common/winjs.base';
 import {
 	ExtHostContext, ExtHostDebugServiceShape, MainThreadDebugServiceShape, DebugSessionUUID, MainContext,
@@ -18,8 +18,6 @@ import { AbstractDebugAdapter } from 'vs/workbench/parts/debug/node/debugAdapter
 import * as paths from 'vs/base/common/paths';
 import { IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
 import { convertToVSCPaths, convertToDAPaths } from 'vs/workbench/parts/debug/common/debugUtils';
-import { ITerminalService } from 'vs/workbench/parts/terminal/common/terminal';
-import { AbstractTerminalLauncher } from 'vs/workbench/parts/debug/electron-browser/terminalSupport';
 
 
 @extHostNamedCustomer(MainContext.MainThreadDebugService)
@@ -30,18 +28,23 @@ export class MainThreadDebugService implements MainThreadDebugServiceShape, IDeb
 	private _breakpointEventsActive: boolean;
 	private _debugAdapters: Map<number, ExtensionHostDebugAdapter>;
 	private _debugAdaptersHandleCounter = 1;
-	private _terminalLauncher: ITerminalLauncher;
-
 
 	constructor(
 		extHostContext: IExtHostContext,
-		@IDebugService private debugService: IDebugService,
-		@ITerminalService private terminalService: ITerminalService,
+		@IDebugService private debugService: IDebugService
 	) {
 		this._proxy = extHostContext.getProxy(ExtHostContext.ExtHostDebugService);
 		this._toDispose = [];
-		this._toDispose.push(debugService.onDidNewSession(proc => this._proxy.$acceptDebugSessionStarted(<DebugSessionUUID>proc.getId(), proc.configuration.type, proc.getName(false))));
-		this._toDispose.push(debugService.onDidEndSession(proc => this._proxy.$acceptDebugSessionTerminated(<DebugSessionUUID>proc.getId(), proc.configuration.type, proc.getName(false))));
+		this._toDispose.push(debugService.onDidNewSession(session => {
+			this._proxy.$acceptDebugSessionStarted(<DebugSessionUUID>session.getId(), session.configuration.type, session.getName(false));
+		}));
+		// Need to start listening early to new session events because a custom event can come while a session is initialising
+		this._toDispose.push(debugService.onWillNewSession(session => {
+			this._toDispose.push(session.onDidCustomEvent(event => this._proxy.$acceptDebugSessionCustomEvent(session.getId(), session.configuration.type, session.configuration.name, event)));
+		}));
+		this._toDispose.push(debugService.onDidEndSession(session => {
+			this._proxy.$acceptDebugSessionTerminated(<DebugSessionUUID>session.getId(), session.configuration.type, session.getName(false));
+		}));
 		this._toDispose.push(debugService.getViewModel().onDidFocusSession(proc => {
 			if (proc) {
 				this._proxy.$acceptDebugSessionActiveChanged(<DebugSessionUUID>proc.getId(), proc.configuration.type, proc.getName(false));
@@ -50,14 +53,6 @@ export class MainThreadDebugService implements MainThreadDebugServiceShape, IDeb
 			}
 		}));
 
-		this._toDispose.push(debugService.onDidCustomEvent(event => {
-			if (event && event.sessionId) {
-				const process = this.debugService.getModel().getSessions().filter(p => p.getId() === event.sessionId).pop();
-				if (process) {
-					this._proxy.$acceptDebugSessionCustomEvent(event.sessionId, process.configuration.type, process.configuration.name, event);
-				}
-			}
-		}));
 		this._debugAdapters = new Map<number, ExtensionHostDebugAdapter>();
 	}
 
@@ -73,21 +68,18 @@ export class MainThreadDebugService implements MainThreadDebugServiceShape, IDeb
 	}
 
 	substituteVariables(folder: IWorkspaceFolder, config: IConfig): TPromise<IConfig> {
-		return this._proxy.$substituteVariables(folder.uri, config);
+		return TPromise.wrap(this._proxy.$substituteVariables(folder ? folder.uri : undefined, config));
 	}
 
 	runInTerminal(args: DebugProtocol.RunInTerminalRequestArguments, config: ITerminalSettings): TPromise<void> {
-		if (!this._terminalLauncher) {
-			this._terminalLauncher = new ExtensionTerminalLauncher(this.terminalService, this._proxy);
-		}
-		return this._terminalLauncher.runInTerminal(args, config);
+		return TPromise.wrap(this._proxy.$runInTerminal(args, config));
 	}
 
 	public dispose(): void {
 		this._toDispose = dispose(this._toDispose);
 	}
 
-	public $startBreakpointEvents(): TPromise<any> {
+	public $startBreakpointEvents(): Thenable<void> {
 
 		if (!this._breakpointEventsActive) {
 			this._breakpointEventsActive = true;
@@ -126,7 +118,7 @@ export class MainThreadDebugService implements MainThreadDebugServiceShape, IDeb
 		return TPromise.wrap<void>(undefined);
 	}
 
-	public $registerBreakpoints(DTOs: (ISourceMultiBreakpointDto | IFunctionBreakpointDto)[]): TPromise<void> {
+	public $registerBreakpoints(DTOs: (ISourceMultiBreakpointDto | IFunctionBreakpointDto)[]): Thenable<void> {
 
 		for (let dto of DTOs) {
 			if (dto.type === 'sourceMulti') {
@@ -149,7 +141,7 @@ export class MainThreadDebugService implements MainThreadDebugServiceShape, IDeb
 		return void 0;
 	}
 
-	public $unregisterBreakpoints(breakpointIds: string[], functionBreakpointIds: string[]): TPromise<void> {
+	public $unregisterBreakpoints(breakpointIds: string[], functionBreakpointIds: string[]): Thenable<void> {
 		breakpointIds.forEach(id => this.debugService.removeBreakpoints(id));
 		functionBreakpointIds.forEach(id => this.debugService.removeFunctionBreakpoints(id));
 		return void 0;
@@ -185,24 +177,24 @@ export class MainThreadDebugService implements MainThreadDebugServiceShape, IDeb
 		});
 	}
 
-	public $registerDebugConfigurationProvider(debugType: string, hasProvide: boolean, hasResolve: boolean, hasDebugAdapterExecutable: boolean, handle: number): TPromise<void> {
+	public $registerDebugConfigurationProvider(debugType: string, hasProvide: boolean, hasResolve: boolean, hasDebugAdapterExecutable: boolean, handle: number): Thenable<void> {
 
 		const provider = <IDebugConfigurationProvider>{
 			type: debugType
 		};
 		if (hasProvide) {
 			provider.provideDebugConfigurations = folder => {
-				return this._proxy.$provideDebugConfigurations(handle, folder);
+				return TPromise.wrap(this._proxy.$provideDebugConfigurations(handle, folder));
 			};
 		}
 		if (hasResolve) {
 			provider.resolveDebugConfiguration = (folder, debugConfiguration) => {
-				return this._proxy.$resolveDebugConfiguration(handle, folder, debugConfiguration);
+				return TPromise.wrap(this._proxy.$resolveDebugConfiguration(handle, folder, debugConfiguration));
 			};
 		}
 		if (hasDebugAdapterExecutable) {
 			provider.debugAdapterExecutable = (folder) => {
-				return this._proxy.$debugAdapterExecutable(handle, folder);
+				return TPromise.wrap(this._proxy.$debugAdapterExecutable(handle, folder));
 			};
 		}
 		this.debugService.getConfigurationManager().registerDebugConfigurationProvider(handle, provider);
@@ -210,12 +202,12 @@ export class MainThreadDebugService implements MainThreadDebugServiceShape, IDeb
 		return TPromise.wrap<void>(undefined);
 	}
 
-	public $unregisterDebugConfigurationProvider(handle: number): TPromise<any> {
+	public $unregisterDebugConfigurationProvider(handle: number): Thenable<void> {
 		this.debugService.getConfigurationManager().unregisterDebugConfigurationProvider(handle);
 		return TPromise.wrap<void>(undefined);
 	}
 
-	public $startDebugging(_folderUri: uri | undefined, nameOrConfiguration: string | IConfig): TPromise<boolean> {
+	public $startDebugging(_folderUri: uri | undefined, nameOrConfiguration: string | IConfig): Thenable<boolean> {
 		const folderUri = _folderUri ? uri.revive(_folderUri) : undefined;
 		const launch = this.debugService.getConfigurationManager().getLaunch(folderUri);
 		return this.debugService.startDebugging(launch, nameOrConfiguration).then(x => {
@@ -225,10 +217,10 @@ export class MainThreadDebugService implements MainThreadDebugServiceShape, IDeb
 		});
 	}
 
-	public $customDebugAdapterRequest(sessionId: DebugSessionUUID, request: string, args: any): TPromise<any> {
-		const process = this.debugService.getModel().getSessions().filter(p => p.getId() === sessionId).pop();
-		if (process) {
-			return process.raw.custom(request, args).then(response => {
+	public $customDebugAdapterRequest(sessionId: DebugSessionUUID, request: string, args: any): Thenable<any> {
+		const session = this.debugService.getSession(sessionId);
+		if (session) {
+			return session.customRequest(request, args).then(response => {
 				if (response && response.success) {
 					return response.body;
 				} else {
@@ -239,7 +231,7 @@ export class MainThreadDebugService implements MainThreadDebugServiceShape, IDeb
 		return TPromise.wrapError(new Error('debug session not found'));
 	}
 
-	public $appendDebugConsole(value: string): TPromise<any> {
+	public $appendDebugConsole(value: string): Thenable<void> {
 		// Use warning as severity to get the orange color for messages coming from the debug extension
 		this.debugService.logToRepl(value, severity.Warning);
 		return TPromise.wrap<void>(undefined);
@@ -283,7 +275,7 @@ class ExtensionHostDebugAdapter extends AbstractDebugAdapter {
 	}
 
 	public startSession(): TPromise<void> {
-		return this._proxy.$startDASession(this._handle, this._debugType, this._adapterExecutable, this._debugPort);
+		return TPromise.wrap(this._proxy.$startDASession(this._handle, this._debugType, this._adapterExecutable, this._debugPort));
 	}
 
 	public sendMessage(message: DebugProtocol.ProtocolMessage): void {
@@ -300,28 +292,6 @@ class ExtensionHostDebugAdapter extends AbstractDebugAdapter {
 	}
 
 	public stopSession(): TPromise<void> {
-		return this._proxy.$stopDASession(this._handle);
-	}
-}
-
-export class ExtensionTerminalLauncher extends AbstractTerminalLauncher {
-
-	constructor(
-		@ITerminalService terminalService: ITerminalService,
-		private _proxy: ExtHostDebugServiceShape
-	) {
-		super(terminalService);
-	}
-
-	protected runInExternalTerminal(args: DebugProtocol.RunInTerminalRequestArguments, config: ITerminalSettings): TPromise<void> {
-		return this._proxy.$runInTerminal(args, config);
-	}
-
-	protected isBusy(processId: number): TPromise<boolean> {
-		return this._proxy.$isTerminalBusy(processId);
-	}
-
-	protected prepareCommand(args: DebugProtocol.RunInTerminalRequestArguments, config: ITerminalSettings): TPromise<any> {
-		return this._proxy.$prepareCommandForTerminal(args, config);
+		return TPromise.wrap(this._proxy.$stopDASession(this._handle));
 	}
 }
diff --git a/src/vs/workbench/api/electron-browser/mainThreadDecorations.ts b/src/vs/workbench/api/electron-browser/mainThreadDecorations.ts
index 1f8d8af2c36..6d43cc159d3 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadDecorations.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadDecorations.ts
@@ -4,20 +4,20 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import URI, { UriComponents } from 'vs/base/common/uri';
+import { URI, UriComponents } from 'vs/base/common/uri';
 import { Emitter } from 'vs/base/common/event';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { ExtHostContext, MainContext, IExtHostContext, MainThreadDecorationsShape, ExtHostDecorationsShape, DecorationData, DecorationRequest } from '../node/extHost.protocol';
 import { extHostNamedCustomer } from 'vs/workbench/api/electron-browser/extHostCustomers';
 import { IDecorationsService, IDecorationData } from 'vs/workbench/services/decorations/browser/decorations';
-import { TPromise } from 'vs/base/common/winjs.base';
 import { values } from 'vs/base/common/collections';
+import { CancellationToken } from 'vs/base/common/cancellation';
 
 class DecorationRequestsQueue {
 
 	private _idPool = 0;
 	private _requests: { [id: number]: DecorationRequest } = Object.create(null);
-	private _resolver: { [id: number]: Function } = Object.create(null);
+	private _resolver: { [id: number]: (data: DecorationData) => any } = Object.create(null);
 
 	private _timer: number;
 
@@ -27,16 +27,18 @@ class DecorationRequestsQueue {
 		//
 	}
 
-	enqueue(handle: number, uri: URI): TPromise<DecorationData> {
+	enqueue(handle: number, uri: URI, token: CancellationToken): Promise<DecorationData> {
 		const id = ++this._idPool;
-		return new TPromise((resolve, reject) => {
+		const result = new Promise<DecorationData>(resolve => {
 			this._requests[id] = { id, handle, uri };
 			this._resolver[id] = resolve;
 			this._processQueue();
-		}, () => {
+		});
+		token.onCancellationRequested(() => {
 			delete this._requests[id];
 			delete this._resolver[id];
 		});
+		return result;
 	}
 
 	private _processQueue(): void {
@@ -48,7 +50,7 @@ class DecorationRequestsQueue {
 			// make request
 			const requests = this._requests;
 			const resolver = this._resolver;
-			this._proxy.$provideDecorations(values(requests)).then(data => {
+			this._proxy.$provideDecorations(values(requests), CancellationToken.None).then(data => {
 				for (const id in resolver) {
 					resolver[id](data[id]);
 				}
@@ -87,8 +89,8 @@ export class MainThreadDecorations implements MainThreadDecorationsShape {
 		const registration = this._decorationsService.registerDecorationsProvider({
 			label,
 			onDidChange: emitter.event,
-			provideDecorations: (uri) => {
-				return this._requestQueue.enqueue(handle, uri).then(data => {
+			provideDecorations: (uri, token) => {
+				return this._requestQueue.enqueue(handle, uri, token).then(data => {
 					if (!data) {
 						return undefined;
 					}
diff --git a/src/vs/workbench/api/electron-browser/mainThreadDiagnostics.ts b/src/vs/workbench/api/electron-browser/mainThreadDiagnostics.ts
index 3167a1a9037..343057b2703 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadDiagnostics.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadDiagnostics.ts
@@ -5,7 +5,7 @@
 'use strict';
 
 import { IMarkerService, IMarkerData } from 'vs/platform/markers/common/markers';
-import URI, { UriComponents } from 'vs/base/common/uri';
+import { URI, UriComponents } from 'vs/base/common/uri';
 import { MainThreadDiagnosticsShape, MainContext, IExtHostContext } from '../node/extHost.protocol';
 import { extHostNamedCustomer } from 'vs/workbench/api/electron-browser/extHostCustomers';
 
diff --git a/src/vs/workbench/api/electron-browser/mainThreadDialogs.ts b/src/vs/workbench/api/electron-browser/mainThreadDialogs.ts
index e43fa20ef2e..de567b45317 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadDialogs.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadDialogs.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { isFalsyOrEmpty } from 'vs/base/common/arrays';
 import { MainThreadDiaglogsShape, MainContext, IExtHostContext, MainThreadDialogOpenOptions, MainThreadDialogSaveOptions } from '../node/extHost.protocol';
 import { extHostNamedCustomer } from 'vs/workbench/api/electron-browser/extHostCustomers';
diff --git a/src/vs/workbench/api/electron-browser/mainThreadDocumentContentProviders.ts b/src/vs/workbench/api/electron-browser/mainThreadDocumentContentProviders.ts
index ccf9eeb2637..b7db1a22712 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadDocumentContentProviders.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadDocumentContentProviders.ts
@@ -4,17 +4,19 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import URI, { UriComponents } from 'vs/base/common/uri';
+import { onUnexpectedError } from 'vs/base/common/errors';
 import { IDisposable } from 'vs/base/common/lifecycle';
-import { TPromise } from 'vs/base/common/winjs.base';
-import { ITextModel, DefaultEndOfLine } from 'vs/editor/common/model';
+import { URI, UriComponents } from 'vs/base/common/uri';
 import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { MainThreadDocumentContentProvidersShape, ExtHostContext, ExtHostDocumentContentProvidersShape, MainContext, IExtHostContext } from '../node/extHost.protocol';
-import { createTextBuffer } from 'vs/editor/common/model/textModel';
-import { ITextModelService } from 'vs/editor/common/services/resolverService';
-import { IModeService } from 'vs/editor/common/services/modeService';
+import { EditOperation } from 'vs/editor/common/core/editOperation';
+import { Range } from 'vs/editor/common/core/range';
+import { ITextModel } from 'vs/editor/common/model';
+import { IEditorWorkerService } from 'vs/editor/common/services/editorWorkerService';
 import { IModelService } from 'vs/editor/common/services/modelService';
+import { IModeService } from 'vs/editor/common/services/modeService';
+import { ITextModelService } from 'vs/editor/common/services/resolverService';
 import { extHostNamedCustomer } from 'vs/workbench/api/electron-browser/extHostCustomers';
+import { ExtHostContext, ExtHostDocumentContentProvidersShape, IExtHostContext, MainContext, MainThreadDocumentContentProvidersShape } from '../node/extHost.protocol';
 
 @extHostNamedCustomer(MainContext.MainThreadDocumentContentProviders)
 export class MainThreadDocumentContentProviders implements MainThreadDocumentContentProvidersShape {
@@ -27,6 +29,7 @@ export class MainThreadDocumentContentProviders implements MainThreadDocumentCon
 		@ITextModelService private readonly _textModelResolverService: ITextModelService,
 		@IModeService private readonly _modeService: IModeService,
 		@IModelService private readonly _modelService: IModelService,
+		@IEditorWorkerService private readonly _editorWorkerService: IEditorWorkerService,
 		@ICodeEditorService codeEditorService: ICodeEditorService
 	) {
 		this._proxy = extHostContext.getProxy(ExtHostContext.ExtHostDocumentContentProviders);
@@ -40,7 +43,7 @@ export class MainThreadDocumentContentProviders implements MainThreadDocumentCon
 
 	$registerTextContentProvider(handle: number, scheme: string): void {
 		this._resourceContentProvider[handle] = this._textModelResolverService.registerTextModelContentProvider(scheme, {
-			provideTextContent: (uri: URI): TPromise<ITextModel> => {
+			provideTextContent: (uri: URI): Thenable<ITextModel> => {
 				return this._proxy.$provideTextDocumentContent(handle, uri).then(value => {
 					if (typeof value === 'string') {
 						const firstLineText = value.substr(0, 1 + value.search(/\r?\n/));
@@ -67,10 +70,11 @@ export class MainThreadDocumentContentProviders implements MainThreadDocumentCon
 			return;
 		}
 
-		const textBuffer = createTextBuffer(value, DefaultEndOfLine.CRLF);
-
-		if (!model.equalsTextBuffer(textBuffer)) {
-			model.setValueFromTextBuffer(textBuffer);
-		}
+		this._editorWorkerService.computeMoreMinimalEdits(model.uri, [{ text: value, range: model.getFullModelRange() }]).then(edits => {
+			if (edits.length > 0) {
+				// use the evil-edit as these models show in readonly-editor only
+				model.applyEdits(edits.map(edit => EditOperation.replace(Range.lift(edit.range), edit.text)));
+			}
+		}, onUnexpectedError);
 	}
 }
diff --git a/src/vs/workbench/api/electron-browser/mainThreadDocuments.ts b/src/vs/workbench/api/electron-browser/mainThreadDocuments.ts
index a85c61c9d4e..cf0f1d0f816 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadDocuments.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadDocuments.ts
@@ -4,13 +4,13 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import URI, { UriComponents } from 'vs/base/common/uri';
+import { URI, UriComponents } from 'vs/base/common/uri';
 import { toErrorMessage } from 'vs/base/common/errorMessage';
 import { IModelService, shouldSynchronizeModel } from 'vs/editor/common/services/modelService';
 import { IDisposable, dispose, IReference } from 'vs/base/common/lifecycle';
 import { TextFileModelChangeEvent, ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
 import { TPromise } from 'vs/base/common/winjs.base';
-import { IFileService, FileOperation } from 'vs/platform/files/common/files';
+import { IFileService } from 'vs/platform/files/common/files';
 import { IModeService } from 'vs/editor/common/services/modeService';
 import { IUntitledEditorService } from 'vs/workbench/services/untitled/common/untitledEditorService';
 import { ExtHostContext, MainThreadDocumentsShape, ExtHostDocumentsShape, IExtHostContext } from '../node/extHost.protocol';
@@ -119,12 +119,6 @@ export class MainThreadDocuments implements MainThreadDocumentsShape {
 			}
 		}));
 
-		this._toDispose.push(fileService.onAfterOperation(e => {
-			if (e.operation === FileOperation.MOVE) {
-				this._proxy.$onDidRename(e.resource, e.target.resource);
-			}
-		}));
-
 		this._modelToDisposeMap = Object.create(null);
 	}
 
@@ -175,11 +169,11 @@ export class MainThreadDocuments implements MainThreadDocumentsShape {
 
 	// --- from extension host process
 
-	$trySaveDocument(uri: UriComponents): TPromise<boolean> {
+	$trySaveDocument(uri: UriComponents): Thenable<boolean> {
 		return this._textFileService.save(URI.revive(uri));
 	}
 
-	$tryOpenDocument(_uri: UriComponents): TPromise<any> {
+	$tryOpenDocument(_uri: UriComponents): Thenable<any> {
 		const uri = URI.revive(_uri);
 		if (!uri.scheme || !(uri.fsPath || uri.authority)) {
 			return TPromise.wrapError(new Error(`Invalid uri. Scheme and authority or path must be set.`));
@@ -209,7 +203,7 @@ export class MainThreadDocuments implements MainThreadDocumentsShape {
 		});
 	}
 
-	$tryCreateDocument(options?: { language?: string, content?: string }): TPromise<URI> {
+	$tryCreateDocument(options?: { language?: string, content?: string }): Thenable<URI> {
 		return this._doCreateUntitled(void 0, options ? options.language : void 0, options ? options.content : void 0);
 	}
 
diff --git a/src/vs/workbench/api/electron-browser/mainThreadDocumentsAndEditors.ts b/src/vs/workbench/api/electron-browser/mainThreadDocumentsAndEditors.ts
index 503b0a3254e..be02a99220b 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadDocumentsAndEditors.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadDocumentsAndEditors.ts
@@ -24,7 +24,7 @@ import { ITextModelService } from 'vs/editor/common/services/resolverService';
 import { IUntitledEditorService } from 'vs/workbench/services/untitled/common/untitledEditorService';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { isDiffEditor, ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { IBulkEditService } from 'vs/editor/browser/services/bulkEditService';
 
 namespace mapset {
diff --git a/src/vs/workbench/api/electron-browser/mainThreadEditors.ts b/src/vs/workbench/api/electron-browser/mainThreadEditors.ts
index b1a55b0dd2b..232670fbde7 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadEditors.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadEditors.ts
@@ -10,7 +10,7 @@ import { localize } from 'vs/nls';
 import { disposed } from 'vs/base/common/errors';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { equals as objectEquals } from 'vs/base/common/objects';
-import URI, { UriComponents } from 'vs/base/common/uri';
+import { URI, UriComponents } from 'vs/base/common/uri';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { IBulkEditService } from 'vs/editor/browser/services/bulkEditService';
 import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
@@ -27,10 +27,12 @@ import { ExtHostContext, ExtHostEditorsShape, IExtHostContext, ITextDocumentShow
 import { MainThreadDocumentsAndEditors } from './mainThreadDocumentsAndEditors';
 import { MainThreadTextEditor } from './mainThreadEditor';
 import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { IFileService } from 'vs/platform/files/common/files';
 
 export class MainThreadTextEditors implements MainThreadTextEditorsShape {
 
+	private static INSTANCE_COUNT: number = 0;
+
+	private _instanceId: string;
 	private _proxy: ExtHostEditorsShape;
 	private _documentsAndEditors: MainThreadDocumentsAndEditors;
 	private _toDispose: IDisposable[];
@@ -46,6 +48,7 @@ export class MainThreadTextEditors implements MainThreadTextEditorsShape {
 		@IEditorService private readonly _editorService: IEditorService,
 		@IEditorGroupsService private readonly _editorGroupService: IEditorGroupsService
 	) {
+		this._instanceId = String(++MainThreadTextEditors.INSTANCE_COUNT);
 		this._proxy = extHostContext.getProxy(ExtHostContext.ExtHostEditors);
 		this._documentsAndEditors = documentsAndEditors;
 		this._toDispose = [];
@@ -57,6 +60,7 @@ export class MainThreadTextEditors implements MainThreadTextEditorsShape {
 
 		this._toDispose.push(this._editorService.onDidVisibleEditorsChange(() => this._updateActiveAndVisibleTextEditors()));
 		this._toDispose.push(this._editorGroupService.onDidRemoveGroup(() => this._updateActiveAndVisibleTextEditors()));
+		this._toDispose.push(this._editorGroupService.onDidMoveGroup(() => this._updateActiveAndVisibleTextEditors()));
 
 		this._registeredDecorationTypes = Object.create(null);
 	}
@@ -111,7 +115,7 @@ export class MainThreadTextEditors implements MainThreadTextEditorsShape {
 
 	// --- from extension host process
 
-	$tryShowTextDocument(resource: UriComponents, options: ITextDocumentShowOptions): TPromise<string> {
+	$tryShowTextDocument(resource: UriComponents, options: ITextDocumentShowOptions): Thenable<string> {
 		const uri = URI.revive(resource);
 
 		const editorOptions: ITextEditorOptions = {
@@ -133,7 +137,7 @@ export class MainThreadTextEditors implements MainThreadTextEditorsShape {
 		});
 	}
 
-	$tryShowEditor(id: string, position?: EditorViewColumn): TPromise<void> {
+	$tryShowEditor(id: string, position?: EditorViewColumn): Thenable<void> {
 		let mainThreadEditor = this._documentsAndEditors.getEditor(id);
 		if (mainThreadEditor) {
 			let model = mainThreadEditor.getModel();
@@ -145,7 +149,7 @@ export class MainThreadTextEditors implements MainThreadTextEditorsShape {
 		return undefined;
 	}
 
-	$tryHideEditor(id: string): TPromise<void> {
+	$tryHideEditor(id: string): Thenable<void> {
 		let mainThreadEditor = this._documentsAndEditors.getEditor(id);
 		if (mainThreadEditor) {
 			let editors = this._editorService.visibleControls;
@@ -158,7 +162,7 @@ export class MainThreadTextEditors implements MainThreadTextEditorsShape {
 		return undefined;
 	}
 
-	$trySetSelections(id: string, selections: ISelection[]): TPromise<void> {
+	$trySetSelections(id: string, selections: ISelection[]): Thenable<void> {
 		if (!this._documentsAndEditors.getEditor(id)) {
 			return TPromise.wrapError(disposed(`TextEditor(${id})`));
 		}
@@ -166,7 +170,8 @@ export class MainThreadTextEditors implements MainThreadTextEditorsShape {
 		return TPromise.as(null);
 	}
 
-	$trySetDecorations(id: string, key: string, ranges: IDecorationOptions[]): TPromise<void> {
+	$trySetDecorations(id: string, key: string, ranges: IDecorationOptions[]): Thenable<void> {
+		key = `${this._instanceId}-${key}`;
 		if (!this._documentsAndEditors.getEditor(id)) {
 			return TPromise.wrapError(disposed(`TextEditor(${id})`));
 		}
@@ -174,7 +179,8 @@ export class MainThreadTextEditors implements MainThreadTextEditorsShape {
 		return TPromise.as(null);
 	}
 
-	$trySetDecorationsFast(id: string, key: string, ranges: number[]): TPromise<void> {
+	$trySetDecorationsFast(id: string, key: string, ranges: number[]): Thenable<void> {
+		key = `${this._instanceId}-${key}`;
 		if (!this._documentsAndEditors.getEditor(id)) {
 			return TPromise.wrapError(disposed(`TextEditor(${id})`));
 		}
@@ -182,7 +188,7 @@ export class MainThreadTextEditors implements MainThreadTextEditorsShape {
 		return TPromise.as(null);
 	}
 
-	$tryRevealRange(id: string, range: IRange, revealType: TextEditorRevealType): TPromise<void> {
+	$tryRevealRange(id: string, range: IRange, revealType: TextEditorRevealType): Thenable<void> {
 		if (!this._documentsAndEditors.getEditor(id)) {
 			return TPromise.wrapError(disposed(`TextEditor(${id})`));
 		}
@@ -190,7 +196,7 @@ export class MainThreadTextEditors implements MainThreadTextEditorsShape {
 		return undefined;
 	}
 
-	$trySetOptions(id: string, options: ITextEditorConfigurationUpdate): TPromise<void> {
+	$trySetOptions(id: string, options: ITextEditorConfigurationUpdate): Thenable<void> {
 		if (!this._documentsAndEditors.getEditor(id)) {
 			return TPromise.wrapError(disposed(`TextEditor(${id})`));
 		}
@@ -198,19 +204,19 @@ export class MainThreadTextEditors implements MainThreadTextEditorsShape {
 		return TPromise.as(null);
 	}
 
-	$tryApplyEdits(id: string, modelVersionId: number, edits: ISingleEditOperation[], opts: IApplyEditsOptions): TPromise<boolean> {
+	$tryApplyEdits(id: string, modelVersionId: number, edits: ISingleEditOperation[], opts: IApplyEditsOptions): Thenable<boolean> {
 		if (!this._documentsAndEditors.getEditor(id)) {
 			return TPromise.wrapError<boolean>(disposed(`TextEditor(${id})`));
 		}
 		return TPromise.as(this._documentsAndEditors.getEditor(id).applyEdits(modelVersionId, edits, opts));
 	}
 
-	$tryApplyWorkspaceEdit(dto: WorkspaceEditDto): TPromise<boolean> {
+	$tryApplyWorkspaceEdit(dto: WorkspaceEditDto): Thenable<boolean> {
 		const { edits } = reviveWorkspaceEditDto(dto);
 		return this._bulkEditService.apply({ edits }, undefined).then(() => true, err => false);
 	}
 
-	$tryInsertSnippet(id: string, template: string, ranges: IRange[], opts: IUndoStopOptions): TPromise<boolean> {
+	$tryInsertSnippet(id: string, template: string, ranges: IRange[], opts: IUndoStopOptions): Thenable<boolean> {
 		if (!this._documentsAndEditors.getEditor(id)) {
 			return TPromise.wrapError<boolean>(disposed(`TextEditor(${id})`));
 		}
@@ -218,16 +224,18 @@ export class MainThreadTextEditors implements MainThreadTextEditorsShape {
 	}
 
 	$registerTextEditorDecorationType(key: string, options: IDecorationRenderOptions): void {
+		key = `${this._instanceId}-${key}`;
 		this._registeredDecorationTypes[key] = true;
 		this._codeEditorService.registerDecorationType(key, options);
 	}
 
 	$removeTextEditorDecorationType(key: string): void {
+		key = `${this._instanceId}-${key}`;
 		delete this._registeredDecorationTypes[key];
 		this._codeEditorService.removeDecorationType(key);
 	}
 
-	$getDiffInformation(id: string): TPromise<ILineChange[]> {
+	$getDiffInformation(id: string): Thenable<ILineChange[]> {
 		const editor = this._documentsAndEditors.getEditor(id);
 
 		if (!editor) {
@@ -253,19 +261,24 @@ CommandsRegistry.registerCommand('_workbench.open', function (accessor: Services
 	const editorService = accessor.get(IEditorService);
 	const editorGroupService = accessor.get(IEditorGroupsService);
 	const openerService = accessor.get(IOpenerService);
-	const fileService = accessor.get(IFileService);
 
 	const [resource, options, position] = args;
 
-	if (fileService.canHandleResource(resource)) {
-		return editorService.openEditor({ resource, options }, viewColumnToEditorGroup(editorGroupService, position)).then(() => void 0);
-	} else {
-		// http://, https://, command:id
-		//todo@ben make this proper
-		return openerService.open(resource).then(_ => void 0);
+	if (options || typeof position === 'number') {
+		// use editor options or editor view column as a hint to use the editor service for opening
+		return editorService.openEditor({ resource, options }, viewColumnToEditorGroup(editorGroupService, position)).then(_ => void 0);
 	}
+
+	if (resource && resource.scheme === 'command') {
+		// do not allow to execute commands from here
+		return TPromise.as(void 0);
+	}
+
+	// finally, delegate to opener service
+	return openerService.open(resource).then(_ => void 0);
 });
 
+
 CommandsRegistry.registerCommand('_workbench.diff', function (accessor: ServicesAccessor, args: [URI, URI, string, string, IEditorOptions, EditorViewColumn]) {
 	const editorService = accessor.get(IEditorService);
 	const editorGroupService = accessor.get(IEditorGroupsService);
diff --git a/src/vs/workbench/api/electron-browser/mainThreadFileSystem.ts b/src/vs/workbench/api/electron-browser/mainThreadFileSystem.ts
index 81593724b68..911c23e4589 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadFileSystem.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadFileSystem.ts
@@ -5,12 +5,12 @@
 'use strict';
 
 import { Emitter, Event } from 'vs/base/common/event';
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
-import URI from 'vs/base/common/uri';
-import { TPromise } from 'vs/base/common/winjs.base';
-import { FileWriteOptions, FileSystemProviderCapabilities, IFileChange, IFileService, IFileSystemProvider, IStat, IWatchOptions, FileType, FileOverwriteOptions } from 'vs/platform/files/common/files';
+import { IDisposable, dispose, toDisposable } from 'vs/base/common/lifecycle';
+import { URI } from 'vs/base/common/uri';
+import { FileWriteOptions, FileSystemProviderCapabilities, IFileChange, IFileService, IFileSystemProvider, IStat, IWatchOptions, FileType, FileOverwriteOptions, FileDeleteOptions } from 'vs/platform/files/common/files';
 import { extHostNamedCustomer } from 'vs/workbench/api/electron-browser/extHostCustomers';
 import { ExtHostContext, ExtHostFileSystemShape, IExtHostContext, IFileChangeDto, MainContext, MainThreadFileSystemShape } from '../node/extHost.protocol';
+import { LabelRules, ILabelService } from 'vs/platform/label/common/label';
 
 @extHostNamedCustomer(MainContext.MainThreadFileSystem)
 export class MainThreadFileSystem implements MainThreadFileSystemShape {
@@ -20,7 +20,8 @@ export class MainThreadFileSystem implements MainThreadFileSystemShape {
 
 	constructor(
 		extHostContext: IExtHostContext,
-		@IFileService private readonly _fileService: IFileService
+		@IFileService private readonly _fileService: IFileService,
+		@ILabelService private readonly _labelService: ILabelService
 	) {
 		this._proxy = extHostContext.getProxy(ExtHostContext.ExtHostFileSystem);
 	}
@@ -39,6 +40,10 @@ export class MainThreadFileSystem implements MainThreadFileSystemShape {
 		this._fileProvider.delete(handle);
 	}
 
+	$setUriFormatter(scheme: string, formatter: LabelRules): void {
+		this._labelService.registerFormatter(scheme, formatter);
+	}
+
 	$onFileSystemChange(handle: number, changes: IFileChangeDto[]): void {
 		this._fileProvider.get(handle).$onFileSystemChange(changes);
 	}
@@ -71,11 +76,9 @@ class RemoteFileSystemProvider implements IFileSystemProvider {
 	watch(resource: URI, opts: IWatchOptions) {
 		const session = Math.random();
 		this._proxy.$watch(this._handle, session, resource, opts);
-		return {
-			dispose: () => {
-				this._proxy.$unwatch(this._handle, session);
-			}
-		};
+		return toDisposable(() => {
+			this._proxy.$unwatch(this._handle, session);
+		});
 	}
 
 	$onFileSystemChange(changes: IFileChangeDto[]): void {
@@ -88,42 +91,57 @@ class RemoteFileSystemProvider implements IFileSystemProvider {
 
 	// --- forwarding calls
 
-	stat(resource: URI): TPromise<IStat> {
+	private static _asBuffer(data: Uint8Array): Buffer {
+		return Buffer.isBuffer(data) ? data : Buffer.from(data.buffer, data.byteOffset, data.byteLength);
+	}
+
+	stat(resource: URI): Thenable<IStat> {
 		return this._proxy.$stat(this._handle, resource).then(undefined, err => {
 			throw err;
 		});
 	}
 
-	readFile(resource: URI): TPromise<Uint8Array, any> {
-		return this._proxy.$readFile(this._handle, resource).then(encoded => {
-			return Buffer.from(encoded, 'base64');
-		});
+	readFile(resource: URI): Thenable<Uint8Array> {
+		return this._proxy.$readFile(this._handle, resource);
 	}
 
-	writeFile(resource: URI, content: Uint8Array, opts: FileWriteOptions): TPromise<void, any> {
-		let encoded = Buffer.isBuffer(content)
-			? content.toString('base64')
-			: Buffer.from(content.buffer, content.byteOffset, content.byteLength).toString('base64');
-		return this._proxy.$writeFile(this._handle, resource, encoded, opts);
+	writeFile(resource: URI, content: Uint8Array, opts: FileWriteOptions): Thenable<void> {
+		return this._proxy.$writeFile(this._handle, resource, RemoteFileSystemProvider._asBuffer(content), opts);
 	}
 
-	delete(resource: URI): TPromise<void, any> {
-		return this._proxy.$delete(this._handle, resource);
+	delete(resource: URI, opts: FileDeleteOptions): Thenable<void> {
+		return this._proxy.$delete(this._handle, resource, opts);
 	}
 
-	mkdir(resource: URI): TPromise<void, any> {
+	mkdir(resource: URI): Thenable<void> {
 		return this._proxy.$mkdir(this._handle, resource);
 	}
 
-	readdir(resource: URI): TPromise<[string, FileType][], any> {
+	readdir(resource: URI): Thenable<[string, FileType][]> {
 		return this._proxy.$readdir(this._handle, resource);
 	}
 
-	rename(resource: URI, target: URI, opts: FileOverwriteOptions): TPromise<void, any> {
+	rename(resource: URI, target: URI, opts: FileOverwriteOptions): Thenable<void> {
 		return this._proxy.$rename(this._handle, resource, target, opts);
 	}
 
-	copy(resource: URI, target: URI, opts: FileOverwriteOptions): TPromise<void, any> {
+	copy(resource: URI, target: URI, opts: FileOverwriteOptions): Thenable<void> {
 		return this._proxy.$copy(this._handle, resource, target, opts);
 	}
+
+	open(resource: URI): Thenable<number> {
+		return this._proxy.$open(this._handle, resource);
+	}
+
+	close(fd: number): Thenable<void> {
+		return this._proxy.$close(this._handle, fd);
+	}
+
+	read(fd: number, pos: number, data: Uint8Array, offset: number, length: number): Thenable<number> {
+		return this._proxy.$read(this._handle, fd, pos, RemoteFileSystemProvider._asBuffer(data), offset, length);
+	}
+
+	write(fd: number, pos: number, data: Uint8Array, offset: number, length: number): Thenable<number> {
+		return this._proxy.$write(this._handle, fd, pos, RemoteFileSystemProvider._asBuffer(data), offset, length);
+	}
 }
diff --git a/src/vs/workbench/api/electron-browser/mainThreadFileSystemEventService.ts b/src/vs/workbench/api/electron-browser/mainThreadFileSystemEventService.ts
index cda620bf166..5b6e9cf18be 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadFileSystemEventService.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadFileSystemEventService.ts
@@ -4,29 +4,32 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import { FileChangeType, IFileService } from 'vs/platform/files/common/files';
-import { ExtHostContext, ExtHostFileSystemEventServiceShape, FileSystemEvents, IExtHostContext } from '../node/extHost.protocol';
-import { IDisposable } from 'vs/base/common/lifecycle';
+import { IDisposable, dispose } from 'vs/base/common/lifecycle';
+import { FileChangeType, IFileService, FileOperation } from 'vs/platform/files/common/files';
 import { extHostCustomer } from 'vs/workbench/api/electron-browser/extHostCustomers';
+import { ExtHostContext, FileSystemEvents, IExtHostContext } from '../node/extHost.protocol';
+import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
 
 @extHostCustomer
 export class MainThreadFileSystemEventService {
 
-	private readonly _listener: IDisposable;
+	private readonly _listener = new Array<IDisposable>();
 
 	constructor(
 		extHostContext: IExtHostContext,
-		@IFileService fileService: IFileService
+		@IFileService fileService: IFileService,
+		@ITextFileService textfileService: ITextFileService,
 	) {
 
-		const proxy: ExtHostFileSystemEventServiceShape = extHostContext.getProxy(ExtHostContext.ExtHostFileSystemEventService);
+		const proxy = extHostContext.getProxy(ExtHostContext.ExtHostFileSystemEventService);
+
+		// file system events - (changes the editor and other make)
 		const events: FileSystemEvents = {
 			created: [],
 			changed: [],
 			deleted: []
 		};
-
-		this._listener = fileService.onFileChanges(event => {
+		fileService.onFileChanges(event => {
 			for (let change of event.changes) {
 				switch (change.type) {
 					case FileChangeType.ADDED:
@@ -45,10 +48,22 @@ export class MainThreadFileSystemEventService {
 			events.created.length = 0;
 			events.changed.length = 0;
 			events.deleted.length = 0;
-		});
+		}, undefined, this._listener);
+
+		// file operation events - (changes the editor makes)
+		fileService.onAfterOperation(e => {
+			if (e.operation === FileOperation.MOVE) {
+				proxy.$onFileRename(e.resource, e.target.resource);
+			}
+		}, undefined, this._listener);
+
+		textfileService.onWillMove(e => {
+			let promise = proxy.$onWillRename(e.oldResource, e.newResource);
+			e.waitUntil(promise);
+		}, undefined, this._listener);
 	}
 
 	dispose(): void {
-		this._listener.dispose();
+		dispose(this._listener);
 	}
 }
diff --git a/src/vs/workbench/api/electron-browser/mainThreadLanguageFeatures.ts b/src/vs/workbench/api/electron-browser/mainThreadLanguageFeatures.ts
index cd3f6607fe2..98ba77076ab 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadLanguageFeatures.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadLanguageFeatures.ts
@@ -4,24 +4,22 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import { TPromise } from 'vs/base/common/winjs.base';
 import { IDisposable } from 'vs/base/common/lifecycle';
 import { Emitter } from 'vs/base/common/event';
 import { ITextModel, ISingleEditOperation } from 'vs/editor/common/model';
 import * as modes from 'vs/editor/common/modes';
-import { WorkspaceSymbolProviderRegistry, IWorkspaceSymbolProvider } from 'vs/workbench/parts/search/common/search';
-import { wireCancellationToken } from 'vs/base/common/async';
+import * as search from 'vs/workbench/parts/search/common/search';
 import { CancellationToken } from 'vs/base/common/cancellation';
 import { Position as EditorPosition } from 'vs/editor/common/core/position';
 import { Range as EditorRange } from 'vs/editor/common/core/range';
-import { ExtHostContext, MainThreadLanguageFeaturesShape, ExtHostLanguageFeaturesShape, MainContext, IExtHostContext, ISerializedLanguageConfiguration, ISerializedRegExp, ISerializedIndentationRule, ISerializedOnEnterRule, LocationDto, SymbolInformationDto, CodeActionDto, reviveWorkspaceEditDto, ISerializedDocumentFilter } from '../node/extHost.protocol';
+import { ExtHostContext, MainThreadLanguageFeaturesShape, ExtHostLanguageFeaturesShape, MainContext, IExtHostContext, ISerializedLanguageConfiguration, ISerializedRegExp, ISerializedIndentationRule, ISerializedOnEnterRule, LocationDto, WorkspaceSymbolDto, CodeActionDto, reviveWorkspaceEditDto, ISerializedDocumentFilter, DefinitionLinkDto } from '../node/extHost.protocol';
 import { LanguageConfigurationRegistry } from 'vs/editor/common/modes/languageConfigurationRegistry';
 import { LanguageConfiguration, IndentationRule, OnEnterRule } from 'vs/editor/common/modes/languageConfiguration';
 import { IHeapService } from './mainThreadHeapService';
 import { IModeService } from 'vs/editor/common/services/modeService';
 import { extHostNamedCustomer } from 'vs/workbench/api/electron-browser/extHostCustomers';
 import * as typeConverters from 'vs/workbench/api/node/extHostTypeConverters';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { Selection } from 'vs/editor/common/core/selection';
 
 @extHostNamedCustomer(MainContext.MainThreadLanguageFeatures)
@@ -72,20 +70,31 @@ export class MainThreadLanguageFeatures implements MainThreadLanguageFeaturesSha
 		}
 	}
 
-	private static _reviveSymbolInformationDto(data: SymbolInformationDto): modes.SymbolInformation;
-	private static _reviveSymbolInformationDto(data: SymbolInformationDto[]): modes.SymbolInformation[];
-	private static _reviveSymbolInformationDto(data: SymbolInformationDto | SymbolInformationDto[]): modes.SymbolInformation | modes.SymbolInformation[] {
+	private static _reviveDefinitionLinkDto(data: DefinitionLinkDto): modes.DefinitionLink;
+	private static _reviveDefinitionLinkDto(data: DefinitionLinkDto[]): modes.DefinitionLink[];
+	private static _reviveDefinitionLinkDto(data: DefinitionLinkDto | DefinitionLinkDto[]): modes.DefinitionLink | modes.DefinitionLink[] {
 		if (!data) {
-			return <modes.SymbolInformation>data;
+			return <modes.DefinitionLink>data;
 		} else if (Array.isArray(data)) {
-			data.forEach(MainThreadLanguageFeatures._reviveSymbolInformationDto);
-			return <modes.SymbolInformation[]>data;
+			data.forEach(l => MainThreadLanguageFeatures._reviveDefinitionLinkDto(l));
+			return <modes.DefinitionLink[]>data;
+		} else {
+			data.uri = URI.revive(data.uri);
+			return <modes.DefinitionLink>data;
+		}
+	}
+
+	private static _reviveWorkspaceSymbolDto(data: WorkspaceSymbolDto): search.IWorkspaceSymbol;
+	private static _reviveWorkspaceSymbolDto(data: WorkspaceSymbolDto[]): search.IWorkspaceSymbol[];
+	private static _reviveWorkspaceSymbolDto(data: WorkspaceSymbolDto | WorkspaceSymbolDto[]): search.IWorkspaceSymbol | search.IWorkspaceSymbol[] {
+		if (!data) {
+			return <search.IWorkspaceSymbol>data;
+		} else if (Array.isArray(data)) {
+			data.forEach(MainThreadLanguageFeatures._reviveWorkspaceSymbolDto);
+			return <search.IWorkspaceSymbol[]>data;
 		} else {
 			data.location = MainThreadLanguageFeatures._reviveLocationDto(data.location);
-			if (data.children) {
-				data.children.forEach(MainThreadLanguageFeatures._reviveSymbolInformationDto);
-			}
-			return <modes.SymbolInformation>data;
+			return <search.IWorkspaceSymbol>data;
 		}
 	}
 
@@ -100,11 +109,11 @@ export class MainThreadLanguageFeatures implements MainThreadLanguageFeaturesSha
 
 	// --- outline
 
-	$registerOutlineSupport(handle: number, selector: ISerializedDocumentFilter[], extensionId: string): void {
+	$registerOutlineSupport(handle: number, selector: ISerializedDocumentFilter[], displayName: string): void {
 		this._registrations[handle] = modes.DocumentSymbolProviderRegistry.register(typeConverters.LanguageSelector.from(selector), <modes.DocumentSymbolProvider>{
-			extensionId,
-			provideDocumentSymbols: (model: ITextModel, token: CancellationToken): Thenable<modes.SymbolInformation[]> => {
-				return wireCancellationToken(token, this._proxy.$provideDocumentSymbols(handle, model.uri)).then(MainThreadLanguageFeatures._reviveSymbolInformationDto);
+			displayName,
+			provideDocumentSymbols: (model: ITextModel, token: CancellationToken): Thenable<modes.DocumentSymbol[]> => {
+				return this._proxy.$provideDocumentSymbols(handle, model.uri, token);
 			}
 		});
 	}
@@ -115,10 +124,10 @@ export class MainThreadLanguageFeatures implements MainThreadLanguageFeaturesSha
 
 		const provider = <modes.CodeLensProvider>{
 			provideCodeLenses: (model: ITextModel, token: CancellationToken): modes.ICodeLensSymbol[] | Thenable<modes.ICodeLensSymbol[]> => {
-				return this._heapService.trackRecursive(wireCancellationToken(token, this._proxy.$provideCodeLenses(handle, model.uri)));
+				return this._heapService.trackRecursive(this._proxy.$provideCodeLenses(handle, model.uri, token));
 			},
 			resolveCodeLens: (model: ITextModel, codeLens: modes.ICodeLensSymbol, token: CancellationToken): modes.ICodeLensSymbol | Thenable<modes.ICodeLensSymbol> => {
-				return this._heapService.trackRecursive(wireCancellationToken(token, this._proxy.$resolveCodeLens(handle, model.uri, codeLens)));
+				return this._heapService.trackRecursive(this._proxy.$resolveCodeLens(handle, model.uri, codeLens, token));
 			}
 		};
 
@@ -142,8 +151,8 @@ export class MainThreadLanguageFeatures implements MainThreadLanguageFeaturesSha
 
 	$registerDeclaractionSupport(handle: number, selector: ISerializedDocumentFilter[]): void {
 		this._registrations[handle] = modes.DefinitionProviderRegistry.register(typeConverters.LanguageSelector.from(selector), <modes.DefinitionProvider>{
-			provideDefinition: (model, position, token): Thenable<modes.Definition> => {
-				return wireCancellationToken(token, this._proxy.$provideDefinition(handle, model.uri, position)).then(MainThreadLanguageFeatures._reviveLocationDto);
+			provideDefinition: (model, position, token): Thenable<modes.DefinitionLink[]> => {
+				return this._proxy.$provideDefinition(handle, model.uri, position, token).then(MainThreadLanguageFeatures._reviveDefinitionLinkDto);
 			}
 		});
 	}
@@ -151,7 +160,7 @@ export class MainThreadLanguageFeatures implements MainThreadLanguageFeaturesSha
 	$registerImplementationSupport(handle: number, selector: ISerializedDocumentFilter[]): void {
 		this._registrations[handle] = modes.ImplementationProviderRegistry.register(typeConverters.LanguageSelector.from(selector), <modes.ImplementationProvider>{
 			provideImplementation: (model, position, token): Thenable<modes.Definition> => {
-				return wireCancellationToken(token, this._proxy.$provideImplementation(handle, model.uri, position)).then(MainThreadLanguageFeatures._reviveLocationDto);
+				return this._proxy.$provideImplementation(handle, model.uri, position, token).then(MainThreadLanguageFeatures._reviveDefinitionLinkDto);
 			}
 		});
 	}
@@ -159,7 +168,7 @@ export class MainThreadLanguageFeatures implements MainThreadLanguageFeaturesSha
 	$registerTypeDefinitionSupport(handle: number, selector: ISerializedDocumentFilter[]): void {
 		this._registrations[handle] = modes.TypeDefinitionProviderRegistry.register(typeConverters.LanguageSelector.from(selector), <modes.TypeDefinitionProvider>{
 			provideTypeDefinition: (model, position, token): Thenable<modes.Definition> => {
-				return wireCancellationToken(token, this._proxy.$provideTypeDefinition(handle, model.uri, position)).then(MainThreadLanguageFeatures._reviveLocationDto);
+				return this._proxy.$provideTypeDefinition(handle, model.uri, position, token).then(MainThreadLanguageFeatures._reviveDefinitionLinkDto);
 			}
 		});
 	}
@@ -169,7 +178,7 @@ export class MainThreadLanguageFeatures implements MainThreadLanguageFeaturesSha
 	$registerHoverProvider(handle: number, selector: ISerializedDocumentFilter[]): void {
 		this._registrations[handle] = modes.HoverProviderRegistry.register(typeConverters.LanguageSelector.from(selector), <modes.HoverProvider>{
 			provideHover: (model: ITextModel, position: EditorPosition, token: CancellationToken): Thenable<modes.Hover> => {
-				return wireCancellationToken(token, this._proxy.$provideHover(handle, model.uri, position));
+				return this._proxy.$provideHover(handle, model.uri, position, token);
 			}
 		});
 	}
@@ -179,7 +188,7 @@ export class MainThreadLanguageFeatures implements MainThreadLanguageFeaturesSha
 	$registerDocumentHighlightProvider(handle: number, selector: ISerializedDocumentFilter[]): void {
 		this._registrations[handle] = modes.DocumentHighlightProviderRegistry.register(typeConverters.LanguageSelector.from(selector), <modes.DocumentHighlightProvider>{
 			provideDocumentHighlights: (model: ITextModel, position: EditorPosition, token: CancellationToken): Thenable<modes.DocumentHighlight[]> => {
-				return wireCancellationToken(token, this._proxy.$provideDocumentHighlights(handle, model.uri, position));
+				return this._proxy.$provideDocumentHighlights(handle, model.uri, position, token);
 			}
 		});
 	}
@@ -189,7 +198,7 @@ export class MainThreadLanguageFeatures implements MainThreadLanguageFeaturesSha
 	$registerReferenceSupport(handle: number, selector: ISerializedDocumentFilter[]): void {
 		this._registrations[handle] = modes.ReferenceProviderRegistry.register(typeConverters.LanguageSelector.from(selector), <modes.ReferenceProvider>{
 			provideReferences: (model: ITextModel, position: EditorPosition, context: modes.ReferenceContext, token: CancellationToken): Thenable<modes.Location[]> => {
-				return wireCancellationToken(token, this._proxy.$provideReferences(handle, model.uri, position, context)).then(MainThreadLanguageFeatures._reviveLocationDto);
+				return this._proxy.$provideReferences(handle, model.uri, position, context, token).then(MainThreadLanguageFeatures._reviveLocationDto);
 			}
 		});
 	}
@@ -199,7 +208,7 @@ export class MainThreadLanguageFeatures implements MainThreadLanguageFeaturesSha
 	$registerQuickFixSupport(handle: number, selector: ISerializedDocumentFilter[], providedCodeActionKinds?: string[]): void {
 		this._registrations[handle] = modes.CodeActionProviderRegistry.register(typeConverters.LanguageSelector.from(selector), <modes.CodeActionProvider>{
 			provideCodeActions: (model: ITextModel, rangeOrSelection: EditorRange | Selection, context: modes.CodeActionContext, token: CancellationToken): Thenable<modes.CodeAction[]> => {
-				return this._heapService.trackRecursive(wireCancellationToken(token, this._proxy.$provideCodeActions(handle, model.uri, rangeOrSelection, context))).then(MainThreadLanguageFeatures._reviveCodeActionDto);
+				return this._heapService.trackRecursive(this._proxy.$provideCodeActions(handle, model.uri, rangeOrSelection, context, token)).then(MainThreadLanguageFeatures._reviveCodeActionDto);
 			},
 			providedCodeActionKinds
 		});
@@ -210,7 +219,7 @@ export class MainThreadLanguageFeatures implements MainThreadLanguageFeaturesSha
 	$registerDocumentFormattingSupport(handle: number, selector: ISerializedDocumentFilter[]): void {
 		this._registrations[handle] = modes.DocumentFormattingEditProviderRegistry.register(typeConverters.LanguageSelector.from(selector), <modes.DocumentFormattingEditProvider>{
 			provideDocumentFormattingEdits: (model: ITextModel, options: modes.FormattingOptions, token: CancellationToken): Thenable<ISingleEditOperation[]> => {
-				return wireCancellationToken(token, this._proxy.$provideDocumentFormattingEdits(handle, model.uri, options));
+				return this._proxy.$provideDocumentFormattingEdits(handle, model.uri, options, token);
 			}
 		});
 	}
@@ -218,7 +227,7 @@ export class MainThreadLanguageFeatures implements MainThreadLanguageFeaturesSha
 	$registerRangeFormattingSupport(handle: number, selector: ISerializedDocumentFilter[]): void {
 		this._registrations[handle] = modes.DocumentRangeFormattingEditProviderRegistry.register(typeConverters.LanguageSelector.from(selector), <modes.DocumentRangeFormattingEditProvider>{
 			provideDocumentRangeFormattingEdits: (model: ITextModel, range: EditorRange, options: modes.FormattingOptions, token: CancellationToken): Thenable<ISingleEditOperation[]> => {
-				return wireCancellationToken(token, this._proxy.$provideDocumentRangeFormattingEdits(handle, model.uri, range, options));
+				return this._proxy.$provideDocumentRangeFormattingEdits(handle, model.uri, range, options, token);
 			}
 		});
 	}
@@ -229,7 +238,7 @@ export class MainThreadLanguageFeatures implements MainThreadLanguageFeaturesSha
 			autoFormatTriggerCharacters,
 
 			provideOnTypeFormattingEdits: (model: ITextModel, position: EditorPosition, ch: string, options: modes.FormattingOptions, token: CancellationToken): Thenable<ISingleEditOperation[]> => {
-				return wireCancellationToken(token, this._proxy.$provideOnTypeFormattingEdits(handle, model.uri, position, ch, options));
+				return this._proxy.$provideOnTypeFormattingEdits(handle, model.uri, position, ch, options, token);
 			}
 		});
 	}
@@ -238,18 +247,18 @@ export class MainThreadLanguageFeatures implements MainThreadLanguageFeaturesSha
 
 	$registerNavigateTypeSupport(handle: number): void {
 		let lastResultId: number;
-		this._registrations[handle] = WorkspaceSymbolProviderRegistry.register(<IWorkspaceSymbolProvider>{
-			provideWorkspaceSymbols: (search: string): TPromise<modes.SymbolInformation[]> => {
-				return this._proxy.$provideWorkspaceSymbols(handle, search).then(result => {
+		this._registrations[handle] = search.WorkspaceSymbolProviderRegistry.register(<search.IWorkspaceSymbolProvider>{
+			provideWorkspaceSymbols: (search: string, token: CancellationToken): Thenable<search.IWorkspaceSymbol[]> => {
+				return this._proxy.$provideWorkspaceSymbols(handle, search, token).then(result => {
 					if (lastResultId !== undefined) {
 						this._proxy.$releaseWorkspaceSymbols(handle, lastResultId);
 					}
 					lastResultId = result._id;
-					return MainThreadLanguageFeatures._reviveSymbolInformationDto(result.symbols);
+					return MainThreadLanguageFeatures._reviveWorkspaceSymbolDto(result.symbols);
 				});
 			},
-			resolveWorkspaceSymbol: (item: modes.SymbolInformation): TPromise<modes.SymbolInformation> => {
-				return this._proxy.$resolveWorkspaceSymbol(handle, item).then(i => MainThreadLanguageFeatures._reviveSymbolInformationDto(i));
+			resolveWorkspaceSymbol: (item: search.IWorkspaceSymbol, token: CancellationToken): Thenable<search.IWorkspaceSymbol> => {
+				return this._proxy.$resolveWorkspaceSymbol(handle, item, token).then(i => MainThreadLanguageFeatures._reviveWorkspaceSymbolDto(i));
 			}
 		});
 	}
@@ -260,10 +269,10 @@ export class MainThreadLanguageFeatures implements MainThreadLanguageFeaturesSha
 
 		this._registrations[handle] = modes.RenameProviderRegistry.register(typeConverters.LanguageSelector.from(selector), <modes.RenameProvider>{
 			provideRenameEdits: (model: ITextModel, position: EditorPosition, newName: string, token: CancellationToken): Thenable<modes.WorkspaceEdit> => {
-				return wireCancellationToken(token, this._proxy.$provideRenameEdits(handle, model.uri, position, newName)).then(reviveWorkspaceEditDto);
+				return this._proxy.$provideRenameEdits(handle, model.uri, position, newName, token).then(reviveWorkspaceEditDto);
 			},
 			resolveRenameLocation: supportResolveLocation
-				? (model: ITextModel, position: EditorPosition, token: CancellationToken): Thenable<modes.RenameLocation> => wireCancellationToken(token, this._proxy.$resolveRenameLocation(handle, model.uri, position))
+				? (model: ITextModel, position: EditorPosition, token: CancellationToken): Thenable<modes.RenameLocation> => this._proxy.$resolveRenameLocation(handle, model.uri, position, token)
 				: undefined
 		});
 	}
@@ -274,7 +283,7 @@ export class MainThreadLanguageFeatures implements MainThreadLanguageFeaturesSha
 		this._registrations[handle] = modes.SuggestRegistry.register(typeConverters.LanguageSelector.from(selector), <modes.ISuggestSupport>{
 			triggerCharacters,
 			provideCompletionItems: (model: ITextModel, position: EditorPosition, context: modes.SuggestContext, token: CancellationToken): Thenable<modes.ISuggestResult> => {
-				return wireCancellationToken(token, this._proxy.$provideCompletionItems(handle, model.uri, position, context)).then(result => {
+				return this._proxy.$provideCompletionItems(handle, model.uri, position, context, token).then(result => {
 					if (!result) {
 						return result;
 					}
@@ -286,7 +295,7 @@ export class MainThreadLanguageFeatures implements MainThreadLanguageFeaturesSha
 				});
 			},
 			resolveCompletionItem: supportsResolveDetails
-				? (model, position, suggestion, token) => wireCancellationToken(token, this._proxy.$resolveCompletionItem(handle, model.uri, position, suggestion))
+				? (model, position, suggestion, token) => this._proxy.$resolveCompletionItem(handle, model.uri, position, suggestion, token)
 				: undefined
 		});
 	}
@@ -298,10 +307,9 @@ export class MainThreadLanguageFeatures implements MainThreadLanguageFeaturesSha
 
 			signatureHelpTriggerCharacters: triggerCharacter,
 
-			provideSignatureHelp: (model: ITextModel, position: EditorPosition, token: CancellationToken): Thenable<modes.SignatureHelp> => {
-				return wireCancellationToken(token, this._proxy.$provideSignatureHelp(handle, model.uri, position));
+			provideSignatureHelp: (model: ITextModel, position: EditorPosition, token: CancellationToken, context: modes.SignatureHelpContext): Thenable<modes.SignatureHelp> => {
+				return this._proxy.$provideSignatureHelp(handle, model.uri, position, context, token);
 			}
-
 		});
 	}
 
@@ -310,10 +318,10 @@ export class MainThreadLanguageFeatures implements MainThreadLanguageFeaturesSha
 	$registerDocumentLinkProvider(handle: number, selector: ISerializedDocumentFilter[]): void {
 		this._registrations[handle] = modes.LinkProviderRegistry.register(typeConverters.LanguageSelector.from(selector), <modes.LinkProvider>{
 			provideLinks: (model, token) => {
-				return this._heapService.trackRecursive(wireCancellationToken(token, this._proxy.$provideDocumentLinks(handle, model.uri)));
+				return this._heapService.trackRecursive(this._proxy.$provideDocumentLinks(handle, model.uri, token));
 			},
 			resolveLink: (link, token) => {
-				return wireCancellationToken(token, this._proxy.$resolveDocumentLink(handle, link));
+				return this._proxy.$resolveDocumentLink(handle, link, token);
 			}
 		});
 	}
@@ -324,7 +332,7 @@ export class MainThreadLanguageFeatures implements MainThreadLanguageFeaturesSha
 		const proxy = this._proxy;
 		this._registrations[handle] = modes.ColorProviderRegistry.register(typeConverters.LanguageSelector.from(selector), <modes.DocumentColorProvider>{
 			provideDocumentColors: (model, token) => {
-				return wireCancellationToken(token, proxy.$provideDocumentColors(handle, model.uri))
+				return proxy.$provideDocumentColors(handle, model.uri, token)
 					.then(documentColors => {
 						return documentColors.map(documentColor => {
 							const [red, green, blue, alpha] = documentColor.color;
@@ -344,10 +352,10 @@ export class MainThreadLanguageFeatures implements MainThreadLanguageFeaturesSha
 			},
 
 			provideColorPresentations: (model, colorInfo, token) => {
-				return wireCancellationToken(token, proxy.$provideColorPresentations(handle, model.uri, {
+				return proxy.$provideColorPresentations(handle, model.uri, {
 					color: [colorInfo.color.red, colorInfo.color.green, colorInfo.color.blue, colorInfo.color.alpha],
 					range: colorInfo.range
-				}));
+				}, token);
 			}
 		});
 	}
@@ -358,7 +366,7 @@ export class MainThreadLanguageFeatures implements MainThreadLanguageFeaturesSha
 		const proxy = this._proxy;
 		this._registrations[handle] = modes.FoldingRangeProviderRegistry.register(typeConverters.LanguageSelector.from(selector), <modes.FoldingRangeProvider>{
 			provideFoldingRanges: (model, context, token) => {
-				return wireCancellationToken(token, proxy.$provideFoldingRanges(handle, model.uri, context));
+				return proxy.$provideFoldingRanges(handle, model.uri, context, token);
 			}
 		});
 	}
diff --git a/src/vs/workbench/api/electron-browser/mainThreadLanguages.ts b/src/vs/workbench/api/electron-browser/mainThreadLanguages.ts
index 31e69556c69..d79b1864fbb 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadLanguages.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadLanguages.ts
@@ -5,7 +5,9 @@
 'use strict';
 
 import { TPromise } from 'vs/base/common/winjs.base';
+import { URI, UriComponents } from 'vs/base/common/uri';
 import { IModeService } from 'vs/editor/common/services/modeService';
+import { IModelService } from 'vs/editor/common/services/modelService';
 import { MainThreadLanguagesShape, MainContext, IExtHostContext } from '../node/extHost.protocol';
 import { extHostNamedCustomer } from 'vs/workbench/api/electron-browser/extHostCustomers';
 
@@ -13,18 +15,36 @@ import { extHostNamedCustomer } from 'vs/workbench/api/electron-browser/extHostC
 export class MainThreadLanguages implements MainThreadLanguagesShape {
 
 	private _modeService: IModeService;
+	private _modelService: IModelService;
 
 	constructor(
 		extHostContext: IExtHostContext,
-		@IModeService modeService: IModeService
+		@IModeService modeService: IModeService,
+		@IModelService modelService: IModelService
 	) {
 		this._modeService = modeService;
+		this._modelService = modelService;
 	}
 
 	public dispose(): void {
 	}
 
-	$getLanguages(): TPromise<string[]> {
+	$getLanguages(): Thenable<string[]> {
 		return TPromise.as(this._modeService.getRegisteredModes());
 	}
+
+	$changeLanguage(resource: UriComponents, languageId: string): Thenable<void> {
+		const uri = URI.revive(resource);
+		let model = this._modelService.getModel(uri);
+		if (!model) {
+			return TPromise.wrapError(new Error('Invalid uri'));
+		}
+		return this._modeService.getOrCreateMode(languageId).then(mode => {
+			if (mode.getId() !== languageId) {
+				return TPromise.wrapError<void>(new Error(`Unknown language id: ${languageId}`));
+			}
+			this._modelService.setMode(model, mode);
+			return undefined;
+		});
+	}
 }
diff --git a/src/vs/workbench/api/electron-browser/mainThreadOutputService.ts b/src/vs/workbench/api/electron-browser/mainThreadOutputService.ts
index 905dc07490d..9af44b16a08 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadOutputService.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadOutputService.ts
@@ -11,10 +11,13 @@ import { IPartService } from 'vs/workbench/services/part/common/partService';
 import { IPanelService } from 'vs/workbench/services/panel/common/panelService';
 import { MainThreadOutputServiceShape, MainContext, IExtHostContext } from '../node/extHost.protocol';
 import { extHostNamedCustomer } from 'vs/workbench/api/electron-browser/extHostCustomers';
+import { UriComponents, URI } from 'vs/base/common/uri';
 
 @extHostNamedCustomer(MainContext.MainThreadOutputService)
 export class MainThreadOutputService implements MainThreadOutputServiceShape {
 
+	private static _idPool = 1;
+
 	private readonly _outputService: IOutputService;
 	private readonly _partService: IPartService;
 	private readonly _panelService: IPanelService;
@@ -34,31 +37,37 @@ export class MainThreadOutputService implements MainThreadOutputServiceShape {
 		// Leave all the existing channels intact (e.g. might help with troubleshooting)
 	}
 
-	public $append(channelId: string, label: string, value: string): TPromise<void> {
-		this._getChannel(channelId, label).append(value);
-		return undefined;
+	public $register(label: string, log: boolean, file?: UriComponents): Thenable<string> {
+		const id = 'extension-output-#' + (MainThreadOutputService._idPool++);
+		Registry.as<IOutputChannelRegistry>(Extensions.OutputChannels).registerChannel({ id, label, file: file ? URI.revive(file) : null, log });
+		return TPromise.as(id);
 	}
 
-	public $clear(channelId: string, label: string): TPromise<void> {
-		this._getChannel(channelId, label).clear();
-		return undefined;
-	}
-
-	public $reveal(channelId: string, label: string, preserveFocus: boolean): TPromise<void> {
-		const channel = this._getChannel(channelId, label);
-		this._outputService.showChannel(channel.id, preserveFocus);
-		return undefined;
-	}
-
-	private _getChannel(channelId: string, label: string): IOutputChannel {
-		if (!Registry.as<IOutputChannelRegistry>(Extensions.OutputChannels).getChannel(channelId)) {
-			Registry.as<IOutputChannelRegistry>(Extensions.OutputChannels).registerChannel(channelId, label);
+	public $append(channelId: string, value: string): Thenable<void> {
+		const channel = this._getChannel(channelId);
+		if (channel) {
+			channel.append(value);
 		}
-
-		return this._outputService.getChannel(channelId);
+		return undefined;
 	}
 
-	public $close(channelId: string): TPromise<void> {
+	public $clear(channelId: string): Thenable<void> {
+		const channel = this._getChannel(channelId);
+		if (channel) {
+			channel.clear();
+		}
+		return undefined;
+	}
+
+	public $reveal(channelId: string, preserveFocus: boolean): Thenable<void> {
+		const channel = this._getChannel(channelId);
+		if (channel) {
+			this._outputService.showChannel(channel.id, preserveFocus);
+		}
+		return undefined;
+	}
+
+	public $close(channelId: string): Thenable<void> {
 		const panel = this._panelService.getActivePanel();
 		if (panel && panel.getId() === OUTPUT_PANEL_ID && channelId === this._outputService.getActiveChannel().id) {
 			return this._partService.setPanelHidden(true);
@@ -67,8 +76,15 @@ export class MainThreadOutputService implements MainThreadOutputServiceShape {
 		return undefined;
 	}
 
-	public $dispose(channelId: string, label: string): TPromise<void> {
-		this._getChannel(channelId, label).dispose();
+	public $dispose(channelId: string): Thenable<void> {
+		const channel = this._getChannel(channelId);
+		if (channel) {
+			channel.dispose();
+		}
 		return undefined;
 	}
+
+	private _getChannel(channelId: string): IOutputChannel {
+		return this._outputService.getChannel(channelId);
+	}
 }
diff --git a/src/vs/workbench/api/electron-browser/mainThreadProgress.ts b/src/vs/workbench/api/electron-browser/mainThreadProgress.ts
index 2aa8a46d301..8acaf3865c0 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadProgress.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadProgress.ts
@@ -4,9 +4,10 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import { IProgressService2, IProgress, IProgressOptions, IProgressStep } from 'vs/platform/progress/common/progress';
+import { IProgress } from 'vs/platform/progress/common/progress';
 import { MainThreadProgressShape, MainContext, IExtHostContext, ExtHostProgressShape, ExtHostContext } from '../node/extHost.protocol';
 import { extHostNamedCustomer } from 'vs/workbench/api/electron-browser/extHostCustomers';
+import { IProgressService2, IProgressStep, IProgressOptions } from 'vs/workbench/services/progress/common/progress';
 
 @extHostNamedCustomer(MainContext.MainThreadProgress)
 export class MainThreadProgress implements MainThreadProgressShape {
diff --git a/src/vs/workbench/api/electron-browser/mainThreadQuickOpen.ts b/src/vs/workbench/api/electron-browser/mainThreadQuickOpen.ts
index e98293c8a8a..f6f1c5fcf87 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadQuickOpen.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadQuickOpen.ts
@@ -5,16 +5,16 @@
 'use strict';
 
 import { TPromise } from 'vs/base/common/winjs.base';
-import { asWinJsPromise } from 'vs/base/common/async';
 import { IPickOptions, IInputOptions, IQuickInputService, IQuickInput } from 'vs/platform/quickinput/common/quickInput';
-import { InputBoxOptions, CancellationToken } from 'vscode';
-import { ExtHostContext, MainThreadQuickOpenShape, ExtHostQuickOpenShape, MyQuickPickItems, MainContext, IExtHostContext } from '../node/extHost.protocol';
+import { InputBoxOptions } from 'vscode';
+import { ExtHostContext, MainThreadQuickOpenShape, ExtHostQuickOpenShape, TransferQuickPickItems, MainContext, IExtHostContext, TransferQuickInput, TransferQuickInputButton } from 'vs/workbench/api/node/extHost.protocol';
 import { extHostNamedCustomer } from 'vs/workbench/api/electron-browser/extHostCustomers';
+import { URI } from 'vs/base/common/uri';
+import { CancellationToken } from 'vs/base/common/cancellation';
 
-interface MultiStepSession {
-	handle: number;
+interface QuickInputSession {
 	input: IQuickInput;
-	token: CancellationToken;
+	handlesToItems: Map<number, TransferQuickPickItems>;
 }
 
 @extHostNamedCustomer(MainContext.MainThreadQuickOpen)
@@ -22,11 +22,10 @@ export class MainThreadQuickOpen implements MainThreadQuickOpenShape {
 
 	private _proxy: ExtHostQuickOpenShape;
 	private _quickInputService: IQuickInputService;
-	private _doSetItems: (items: MyQuickPickItems[]) => any;
+	private _doSetItems: (items: TransferQuickPickItems[]) => any;
 	private _doSetError: (error: Error) => any;
-	private _contents: TPromise<MyQuickPickItems[]>;
+	private _contents: TPromise<TransferQuickPickItems[]>;
 	private _token: number = 0;
-	private _multiStep: MultiStepSession;
 
 	constructor(
 		extHostContext: IExtHostContext,
@@ -39,17 +38,10 @@ export class MainThreadQuickOpen implements MainThreadQuickOpenShape {
 	public dispose(): void {
 	}
 
-	$show(multiStepHandle: number | undefined, options: IPickOptions): TPromise<number | number[]> {
-
-		const multiStep = typeof multiStepHandle === 'number';
-		if (multiStep && !(this._multiStep && multiStepHandle === this._multiStep.handle && !this._multiStep.token.isCancellationRequested)) {
-			return TPromise.as(undefined);
-		}
-		const input: IQuickInput = multiStep ? this._multiStep.input : this._quickInputService;
-
+	$show(options: IPickOptions<TransferQuickPickItems>, token: CancellationToken): Thenable<number | number[]> {
 		const myToken = ++this._token;
 
-		this._contents = new TPromise<MyQuickPickItems[]>((c, e) => {
+		this._contents = new TPromise<TransferQuickPickItems[]>((c, e) => {
 			this._doSetItems = (items) => {
 				if (myToken === this._token) {
 					c(items);
@@ -63,39 +55,40 @@ export class MainThreadQuickOpen implements MainThreadQuickOpenShape {
 			};
 		});
 
+		options = {
+			...options,
+			onDidFocus: el => {
+				if (el) {
+					this._proxy.$onItemSelected((<TransferQuickPickItems>el).handle);
+				}
+			}
+		};
+
 		if (options.canPickMany) {
-			return asWinJsPromise(token => input.pick(this._contents, options as { canPickMany: true }, token)).then(items => {
+			return this._quickInputService.pick(this._contents, options as { canPickMany: true }, token).then(items => {
 				if (items) {
 					return items.map(item => item.handle);
 				}
 				return undefined;
-			}, undefined, progress => {
-				if (progress) {
-					this._proxy.$onItemSelected((<MyQuickPickItems>progress).handle);
-				}
 			});
 		} else {
-			return asWinJsPromise(token => input.pick(this._contents, options, token)).then(item => {
+			return this._quickInputService.pick(this._contents, options, token).then(item => {
 				if (item) {
 					return item.handle;
 				}
 				return undefined;
-			}, undefined, progress => {
-				if (progress) {
-					this._proxy.$onItemSelected((<MyQuickPickItems>progress).handle);
-				}
 			});
 		}
 	}
 
-	$setItems(items: MyQuickPickItems[]): TPromise<any> {
+	$setItems(items: TransferQuickPickItems[]): Thenable<void> {
 		if (this._doSetItems) {
 			this._doSetItems(items);
 		}
 		return undefined;
 	}
 
-	$setError(error: Error): TPromise<any> {
+	$setError(error: Error): Thenable<void> {
 		if (this._doSetError) {
 			this._doSetError(error);
 		}
@@ -104,14 +97,7 @@ export class MainThreadQuickOpen implements MainThreadQuickOpenShape {
 
 	// ---- input
 
-	$input(multiStepHandle: number | undefined, options: InputBoxOptions, validateInput: boolean): TPromise<string> {
-
-		const multiStep = typeof multiStepHandle === 'number';
-		if (multiStep && !(this._multiStep && multiStepHandle === this._multiStep.handle && !this._multiStep.token.isCancellationRequested)) {
-			return TPromise.as(undefined);
-		}
-		const input: IQuickInput = multiStep ? this._multiStep.input : this._quickInputService;
-
+	$input(options: InputBoxOptions, validateInput: boolean, token: CancellationToken): Thenable<string> {
 		const inputOptions: IInputOptions = Object.create(null);
 
 		if (options) {
@@ -129,27 +115,111 @@ export class MainThreadQuickOpen implements MainThreadQuickOpenShape {
 			};
 		}
 
-		return asWinJsPromise(token => input.input(inputOptions, token));
+		return this._quickInputService.input(inputOptions, token);
 	}
 
-	// ---- Multi-step input
+	// ---- QuickInput
 
-	$multiStep(handle: number): TPromise<never> {
-		let outerReject: (err: any) => void;
-		let innerResolve: (value: void) => void;
-		const promise = new TPromise<never>((_, rej) => outerReject = rej, () => innerResolve(undefined));
-		this._quickInputService.multiStepInput((input, token) => {
-			this._multiStep = { handle, input, token };
-			const promise = new TPromise<void>(res => innerResolve = res);
-			token.onCancellationRequested(() => innerResolve(undefined));
-			return promise;
-		})
-			.then(() => promise.cancel(), err => outerReject(err))
-			.then(() => {
-				if (this._multiStep && this._multiStep.handle === handle) {
-					this._multiStep = null;
+	private sessions = new Map<number, QuickInputSession>();
+
+	$createOrUpdate(params: TransferQuickInput): Thenable<void> {
+		const sessionId = params.id;
+		let session = this.sessions.get(sessionId);
+		if (!session) {
+			if (params.type === 'quickPick') {
+				const input = this._quickInputService.createQuickPick();
+				input.onDidAccept(() => {
+					this._proxy.$onDidAccept(sessionId);
+				});
+				input.onDidChangeActive(items => {
+					this._proxy.$onDidChangeActive(sessionId, items.map(item => (item as TransferQuickPickItems).handle));
+				});
+				input.onDidChangeSelection(items => {
+					this._proxy.$onDidChangeSelection(sessionId, items.map(item => (item as TransferQuickPickItems).handle));
+				});
+				input.onDidTriggerButton(button => {
+					this._proxy.$onDidTriggerButton(sessionId, (button as TransferQuickInputButton).handle);
+				});
+				input.onDidChangeValue(value => {
+					this._proxy.$onDidChangeValue(sessionId, value);
+				});
+				input.onDidHide(() => {
+					this._proxy.$onDidHide(sessionId);
+				});
+				session = {
+					input,
+					handlesToItems: new Map()
+				};
+			} else {
+				const input = this._quickInputService.createInputBox();
+				input.onDidAccept(() => {
+					this._proxy.$onDidAccept(sessionId);
+				});
+				input.onDidTriggerButton(button => {
+					this._proxy.$onDidTriggerButton(sessionId, (button as TransferQuickInputButton).handle);
+				});
+				input.onDidChangeValue(value => {
+					this._proxy.$onDidChangeValue(sessionId, value);
+				});
+				input.onDidHide(() => {
+					this._proxy.$onDidHide(sessionId);
+				});
+				session = {
+					input,
+					handlesToItems: new Map()
+				};
+			}
+			this.sessions.set(sessionId, session);
+		}
+		const { input, handlesToItems } = session;
+		for (const param in params) {
+			if (param === 'id' || param === 'type') {
+				continue;
+			}
+			if (param === 'visible') {
+				if (params.visible) {
+					input.show();
+				} else {
+					input.hide();
 				}
-			});
-		return promise;
+			} else if (param === 'items') {
+				handlesToItems.clear();
+				params[param].forEach(item => {
+					handlesToItems.set(item.handle, item);
+				});
+				input[param] = params[param];
+			} else if (param === 'activeItems' || param === 'selectedItems') {
+				input[param] = params[param]
+					.filter(handle => handlesToItems.has(handle))
+					.map(handle => handlesToItems.get(handle));
+			} else if (param === 'buttons') {
+				input[param] = params.buttons.map(button => {
+					if (button.handle === -1) {
+						return this._quickInputService.backButton;
+					}
+					const { iconPath, tooltip, handle } = button;
+					return {
+						iconPath: {
+							dark: URI.revive(iconPath.dark),
+							light: iconPath.light && URI.revive(iconPath.light)
+						},
+						tooltip,
+						handle
+					};
+				});
+			} else {
+				input[param] = params[param];
+			}
+		}
+		return TPromise.as(undefined);
+	}
+
+	$dispose(sessionId: number): Thenable<void> {
+		const session = this.sessions.get(sessionId);
+		if (session) {
+			session.input.dispose();
+			this.sessions.delete(sessionId);
+		}
+		return TPromise.as(undefined);
 	}
 }
diff --git a/src/vs/workbench/api/electron-browser/mainThreadSCM.ts b/src/vs/workbench/api/electron-browser/mainThreadSCM.ts
index 6bd43da77dc..e26b516c369 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadSCM.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadSCM.ts
@@ -6,8 +6,8 @@
 'use strict';
 
 import { TPromise } from 'vs/base/common/winjs.base';
-import URI, { UriComponents } from 'vs/base/common/uri';
-import { Event, Emitter } from 'vs/base/common/event';
+import { URI, UriComponents } from 'vs/base/common/uri';
+import { Event, Emitter, debounceEvent } from 'vs/base/common/event';
 import { assign } from 'vs/base/common/objects';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { ISCMService, ISCMRepository, ISCMProvider, ISCMResource, ISCMResourceGroup, ISCMResourceDecorations, IInputValidation } from 'vs/workbench/services/scm/common/scm';
@@ -15,6 +15,7 @@ import { ExtHostContext, MainThreadSCMShape, ExtHostSCMShape, SCMProviderFeature
 import { Command } from 'vs/editor/common/modes';
 import { extHostNamedCustomer } from 'vs/workbench/api/electron-browser/extHostCustomers';
 import { ISplice, Sequence } from 'vs/base/common/sequence';
+import { CancellationToken } from 'vs/base/common/cancellation';
 
 class MainThreadSCMResourceGroup implements ISCMResourceGroup {
 
@@ -73,7 +74,7 @@ class MainThreadSCMResource implements ISCMResource {
 		public decorations: ISCMResourceDecorations
 	) { }
 
-	open(): TPromise<void> {
+	open(): Thenable<void> {
 		return this.proxy.$executeResourceCommand(this.sourceControlHandle, this.groupHandle, this.handle);
 	}
 
@@ -241,7 +242,7 @@ class MainThreadSCMProvider implements ISCMProvider {
 			return TPromise.as(null);
 		}
 
-		return this.proxy.$provideOriginalResource(this.handle, uri)
+		return TPromise.wrap(this.proxy.$provideOriginalResource(this.handle, uri, CancellationToken.None))
 			.then(result => result && URI.revive(result));
 	}
 
@@ -270,6 +271,9 @@ export class MainThreadSCM implements MainThreadSCMShape {
 		@ISCMService private scmService: ISCMService
 	) {
 		this._proxy = extHostContext.getProxy(ExtHostContext.ExtHostSCM);
+
+		debounceEvent(scmService.onDidChangeSelectedRepositories, (_, e) => e, 100)
+			(this.onDidChangeSelectedRepositories, this, this._disposables);
 	}
 
 	dispose(): void {
@@ -401,20 +405,28 @@ export class MainThreadSCM implements MainThreadSCMShape {
 		}
 
 		if (enabled) {
-			repository.input.validateInput = async (value, pos): TPromise<IInputValidation | undefined> => {
-				const result = await this._proxy.$validateInput(sourceControlHandle, value, pos);
+			repository.input.validateInput = (value, pos): TPromise<IInputValidation | undefined> => {
+				return TPromise.wrap(this._proxy.$validateInput(sourceControlHandle, value, pos).then(result => {
+					if (!result) {
+						return undefined;
+					}
 
-				if (!result) {
-					return undefined;
-				}
-
-				return {
-					message: result[0],
-					type: result[1]
-				};
+					return {
+						message: result[0],
+						type: result[1]
+					};
+				}));
 			};
 		} else {
 			repository.input.validateInput = () => TPromise.as(undefined);
 		}
 	}
+
+	private onDidChangeSelectedRepositories(repositories: ISCMRepository[]): void {
+		const handles = repositories
+			.filter(r => r.provider instanceof MainThreadSCMProvider)
+			.map(r => (r.provider as MainThreadSCMProvider).handle);
+
+		this._proxy.$setSelectedSourceControls(handles);
+	}
 }
diff --git a/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.ts b/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.ts
index 6f10e6490be..2055bda2c70 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.ts
@@ -24,7 +24,7 @@ import { EditOperation } from 'vs/editor/common/core/editOperation';
 import { extHostCustomer } from 'vs/workbench/api/electron-browser/extHostCustomers';
 import { IEditorWorkerService } from 'vs/editor/common/services/editorWorkerService';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { IProgressService2, ProgressLocation } from 'vs/platform/progress/common/progress';
+import { IProgressService2, ProgressLocation } from 'vs/workbench/services/progress/common/progress';
 import { localize } from 'vs/nls';
 import { isFalsyOrEmpty } from 'vs/base/common/arrays';
 import { ILogService } from 'vs/platform/log/common/log';
@@ -37,6 +37,7 @@ import { applyCodeAction } from 'vs/editor/contrib/codeAction/codeActionCommands
 import { getCodeActions } from 'vs/editor/contrib/codeAction/codeAction';
 import { ICodeActionsOnSaveOptions } from 'vs/editor/common/config/editorOptions';
 import { IBulkEditService } from 'vs/editor/browser/services/bulkEditService';
+import { CancellationTokenSource } from 'vs/base/common/cancellation';
 
 export interface ISaveParticipantParticipant extends ISaveParticipant {
 	// progressMessage: string;
@@ -212,19 +213,24 @@ class FormatOnSaveParticipant implements ISaveParticipantParticipant {
 		const versionNow = model.getVersionId();
 		const { tabSize, insertSpaces } = model.getOptions();
 
-		const timeout = this._configurationService.getValue('editor.formatOnSaveTimeout', { overrideIdentifier: model.getLanguageIdentifier().language, resource: editorModel.getResource() });
+		const timeout = this._configurationService.getValue<number>('editor.formatOnSaveTimeout', { overrideIdentifier: model.getLanguageIdentifier().language, resource: editorModel.getResource() });
 
 		return new Promise<ISingleEditOperation[]>((resolve, reject) => {
-			setTimeout(() => reject(localize('timeout.formatOnSave', "Aborted format on save after {0}ms", timeout)), timeout);
-			getDocumentFormattingEdits(model, { tabSize, insertSpaces })
-				.then(edits => this._editorWorkerService.computeMoreMinimalEdits(model.uri, edits))
-				.then(resolve, err => {
-					if (!(err instanceof Error) || err.name !== NoProviderError.Name) {
-						reject(err);
-					} else {
-						resolve();
-					}
-				});
+			let source = new CancellationTokenSource();
+			let request = getDocumentFormattingEdits(model, { tabSize, insertSpaces }, source.token);
+
+			setTimeout(() => {
+				reject(localize('timeout.formatOnSave', "Aborted format on save after {0}ms", timeout));
+				source.cancel();
+			}, timeout);
+
+			request.then(edits => this._editorWorkerService.computeMoreMinimalEdits(model.uri, edits)).then(resolve, err => {
+				if (!(err instanceof Error) || err.name !== NoProviderError.Name) {
+					reject(err);
+				} else {
+					resolve();
+				}
+			});
 
 		}).then(edits => {
 			if (!isFalsyOrEmpty(edits) && versionNow === model.getVersionId()) {
diff --git a/src/vs/workbench/api/electron-browser/mainThreadSearch.ts b/src/vs/workbench/api/electron-browser/mainThreadSearch.ts
index 2fc636b81e1..e2f5950e12e 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadSearch.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadSearch.ts
@@ -5,14 +5,15 @@
 'use strict';
 
 import { isFalsyOrEmpty } from 'vs/base/common/arrays';
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
+import { dispose, IDisposable } from 'vs/base/common/lifecycle';
 import { values } from 'vs/base/common/map';
-import URI, { UriComponents } from 'vs/base/common/uri';
-import { PPromise, TPromise } from 'vs/base/common/winjs.base';
-import { IFileMatch, ISearchComplete, ISearchProgressItem, ISearchQuery, ISearchResultProvider, ISearchService, QueryType, IRawFileMatch2, ISearchCompleteStats } from 'vs/platform/search/common/search';
+import { URI, UriComponents } from 'vs/base/common/uri';
+import { TPromise } from 'vs/base/common/winjs.base';
+import { IFileMatch, IRawFileMatch2, ISearchComplete, ISearchCompleteStats, ISearchProgressItem, ISearchQuery, ISearchResultProvider, ISearchService, QueryType, SearchProviderType } from 'vs/platform/search/common/search';
+import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { extHostNamedCustomer } from 'vs/workbench/api/electron-browser/extHostCustomers';
 import { ExtHostContext, ExtHostSearchShape, IExtHostContext, MainContext, MainThreadSearchShape } from '../node/extHost.protocol';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
+import { CancellationToken } from 'vs/base/common/cancellation';
 
 @extHostNamedCustomer(MainContext.MainThreadSearch)
 export class MainThreadSearch implements MainThreadSearchShape {
@@ -29,12 +30,20 @@ export class MainThreadSearch implements MainThreadSearchShape {
 	}
 
 	dispose(): void {
-		this._searchProvider.forEach(value => dispose());
+		this._searchProvider.forEach(value => value.dispose());
 		this._searchProvider.clear();
 	}
 
-	$registerSearchProvider(handle: number, scheme: string): void {
-		this._searchProvider.set(handle, new RemoteSearchProvider(this._searchService, scheme, handle, this._proxy));
+	$registerTextSearchProvider(handle: number, scheme: string): void {
+		this._searchProvider.set(handle, new RemoteSearchProvider(this._searchService, SearchProviderType.text, scheme, handle, this._proxy));
+	}
+
+	$registerFileSearchProvider(handle: number, scheme: string): void {
+		this._searchProvider.set(handle, new RemoteSearchProvider(this._searchService, SearchProviderType.file, scheme, handle, this._proxy));
+	}
+
+	$registerFileIndexProvider(handle: number, scheme: string): void {
+		this._searchProvider.set(handle, new RemoteSearchProvider(this._searchService, SearchProviderType.fileIndex, scheme, handle, this._proxy));
 	}
 
 	$unregisterProvider(handle: number): void {
@@ -42,7 +51,11 @@ export class MainThreadSearch implements MainThreadSearchShape {
 		this._searchProvider.delete(handle);
 	}
 
-	$handleFindMatch(handle: number, session, data: UriComponents | IRawFileMatch2[]): void {
+	$handleFileMatch(handle: number, session, data: UriComponents[]): void {
+		this._searchProvider.get(handle).handleFindMatch(session, data);
+	}
+
+	$handleTextMatch(handle: number, session, data: IRawFileMatch2[]): void {
 		this._searchProvider.get(handle).handleFindMatch(session, data);
 	}
 
@@ -66,7 +79,7 @@ class SearchOperation {
 	addMatch(match: IFileMatch): void {
 		if (this.matches.has(match.resource.toString())) {
 			// Merge with previous IFileMatches
-			this.matches.get(match.resource.toString()).lineMatches.push(...match.lineMatches);
+			this.matches.get(match.resource.toString()).matches.push(...match.matches);
 		} else {
 			this.matches.set(match.resource.toString(), match);
 		}
@@ -75,81 +88,68 @@ class SearchOperation {
 	}
 }
 
-class RemoteSearchProvider implements ISearchResultProvider {
+class RemoteSearchProvider implements ISearchResultProvider, IDisposable {
 
 	private readonly _registrations: IDisposable[];
 	private readonly _searches = new Map<number, SearchOperation>();
 
 	constructor(
 		searchService: ISearchService,
+		type: SearchProviderType,
 		private readonly _scheme: string,
 		private readonly _handle: number,
 		private readonly _proxy: ExtHostSearchShape
 	) {
-		this._registrations = [searchService.registerSearchResultProvider(this)];
+		this._registrations = [searchService.registerSearchResultProvider(this._scheme, type, this)];
 	}
 
 	dispose(): void {
 		dispose(this._registrations);
 	}
 
-	search(query: ISearchQuery): PPromise<ISearchComplete, ISearchProgressItem> {
-
+	search(query: ISearchQuery, onProgress?: (p: ISearchProgressItem) => void, token: CancellationToken = CancellationToken.None): TPromise<ISearchComplete> {
 		if (isFalsyOrEmpty(query.folderQueries)) {
-			return PPromise.as(undefined);
+			return TPromise.as(undefined);
 		}
 
-		const folderQueriesForScheme = query.folderQueries.filter(fq => fq.folder.scheme === this._scheme);
-		if (!folderQueriesForScheme.length) {
-			return TPromise.wrap(null);
-		}
+		const search = new SearchOperation(onProgress);
+		this._searches.set(search.id, search);
 
-		query = {
-			...query,
-			folderQueries: folderQueriesForScheme
-		};
+		const searchP = query.type === QueryType.File
+			? this._proxy.$provideFileSearchResults(this._handle, search.id, query, token)
+			: this._proxy.$provideTextSearchResults(this._handle, search.id, query.contentPattern, query, token);
 
-		let outer: TPromise;
-
-		return new PPromise((resolve, reject, report) => {
-
-			const search = new SearchOperation(report);
-			this._searches.set(search.id, search);
-
-			outer = query.type === QueryType.File
-				? this._proxy.$provideFileSearchResults(this._handle, search.id, query)
-				: this._proxy.$provideTextSearchResults(this._handle, search.id, query.contentPattern, query);
-
-			outer.then((result: ISearchCompleteStats) => {
-				this._searches.delete(search.id);
-				resolve(({ results: values(search.matches), stats: result.stats, limitHit: result.limitHit }));
-			}, err => {
-				this._searches.delete(search.id);
-				reject(err);
-			});
-		}, () => {
-			if (outer) {
-				outer.cancel();
-			}
+		return TPromise.wrap(searchP).then((result: ISearchCompleteStats) => {
+			this._searches.delete(search.id);
+			return { results: values(search.matches), stats: result.stats, limitHit: result.limitHit };
+		}, err => {
+			this._searches.delete(search.id);
+			return TPromise.wrapError(err);
 		});
 	}
 
-	handleFindMatch(session: number, dataOrUri: UriComponents | IRawFileMatch2[]): void {
+	clearCache(cacheKey: string): TPromise<void> {
+		return TPromise.wrap(this._proxy.$clearCache(cacheKey));
+	}
+
+	handleFindMatch(session: number, dataOrUri: (UriComponents | IRawFileMatch2)[]): void {
 		if (!this._searches.has(session)) {
 			// ignore...
 			return;
 		}
 
 		const searchOp = this._searches.get(session);
-		if (Array.isArray(dataOrUri)) {
-			dataOrUri.forEach(m => {
+		dataOrUri.forEach(result => {
+			if ((<IRawFileMatch2>result).matches) {
 				searchOp.addMatch({
-					resource: URI.revive(m.resource),
-					lineMatches: m.lineMatches
+					resource: URI.revive((<IRawFileMatch2>result).resource),
+					matches: (<IRawFileMatch2>result).matches
 				});
-			});
-		} else {
-			searchOp.addMatch({ resource: URI.revive(dataOrUri) });
-		}
+			} else {
+				searchOp.addMatch({
+					resource: URI.revive(result)
+				});
+			}
+		});
 	}
 }
diff --git a/src/vs/workbench/api/electron-browser/mainThreadStorage.ts b/src/vs/workbench/api/electron-browser/mainThreadStorage.ts
index 403ddbdde6b..49d394106e9 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadStorage.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadStorage.ts
@@ -24,7 +24,7 @@ export class MainThreadStorage implements MainThreadStorageShape {
 	dispose(): void {
 	}
 
-	$getValue<T>(shared: boolean, key: string): TPromise<T> {
+	$getValue<T>(shared: boolean, key: string): Thenable<T> {
 		let jsonValue = this._storageService.get(key, shared ? StorageScope.GLOBAL : StorageScope.WORKSPACE);
 		if (!jsonValue) {
 			return TPromise.as(undefined);
@@ -38,7 +38,7 @@ export class MainThreadStorage implements MainThreadStorageShape {
 		}
 	}
 
-	$setValue(shared: boolean, key: string, value: any): TPromise<void> {
+	$setValue(shared: boolean, key: string, value: any): Thenable<void> {
 		let jsonValue: any;
 		try {
 			jsonValue = JSON.stringify(value);
diff --git a/src/vs/workbench/api/electron-browser/mainThreadTask.ts b/src/vs/workbench/api/electron-browser/mainThreadTask.ts
index ab2c0f3e367..b6f555f78b4 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadTask.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadTask.ts
@@ -6,11 +6,13 @@
 
 import * as nls from 'vs/nls';
 
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
+import { generateUuid } from 'vs/base/common/uuid';
 import * as Objects from 'vs/base/common/objects';
 import { TPromise } from 'vs/base/common/winjs.base';
 import * as Types from 'vs/base/common/types';
 import * as Platform from 'vs/base/common/platform';
+import { IStringDictionary } from 'vs/base/common/collections';
 
 import { IWorkspaceContextService, IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
 
@@ -37,10 +39,10 @@ namespace TaskExecutionDTO {
 			task: TaskDTO.from(value.task)
 		};
 	}
-	export function to(value: TaskExecutionDTO, workspace: IWorkspaceContextService): TaskExecution {
+	export function to(value: TaskExecutionDTO, workspace: IWorkspaceContextService, executeOnly: boolean): TaskExecution {
 		return {
 			id: value.id,
-			task: TaskDTO.to(value.task, workspace)
+			task: TaskDTO.to(value.task, workspace, executeOnly)
 		};
 	}
 }
@@ -69,8 +71,15 @@ namespace TaskDefinitionDTO {
 		delete result._key;
 		return result;
 	}
-	export function to(value: TaskDefinitionDTO): KeyedTaskIdentifier {
-		return TaskDefinition.createTaskIdentifier(value, console);
+	export function to(value: TaskDefinitionDTO, executeOnly: boolean): KeyedTaskIdentifier {
+		let result = TaskDefinition.createTaskIdentifier(value, console);
+		if (result === void 0 && executeOnly) {
+			result = {
+				_key: generateUuid(),
+				type: '$executeOnly'
+			};
+		}
+		return result;
 	}
 }
 
@@ -301,7 +310,7 @@ namespace TaskDTO {
 		return result;
 	}
 
-	export function to(task: TaskDTO, workspace: IWorkspaceContextService): Task {
+	export function to(task: TaskDTO, workspace: IWorkspaceContextService, executeOnly: boolean): Task {
 		if (typeof task.name !== 'string') {
 			return undefined;
 		}
@@ -320,10 +329,10 @@ namespace TaskDTO {
 		let source = TaskSourceDTO.to(task.source, workspace);
 
 		let label = nls.localize('task.label', '{0}: {1}', source.label, task.name);
-		let definition = TaskDefinitionDTO.to(task.definition);
+		let definition = TaskDefinitionDTO.to(task.definition, executeOnly);
 		let id = `${task.source.extensionId}.${definition._key}`;
 		let result: ContributedTask = {
-			_id: id, // uuidMap.getUUID(identifier),
+			_id: id, // uuidMap.getUUID(identifier)
 			_source: source,
 			_label: label,
 			type: definition.type,
@@ -384,10 +393,10 @@ export class MainThreadTask implements MainThreadTaskShape {
 		this._activeHandles = Object.create(null);
 	}
 
-	public $registerTaskProvider(handle: number): TPromise<void> {
+	public $registerTaskProvider(handle: number): Thenable<void> {
 		this._taskService.registerTaskProvider(handle, {
-			provideTasks: () => {
-				return this._proxy.$provideTasks(handle).then((value) => {
+			provideTasks: (validTypes: IStringDictionary<boolean>) => {
+				return TPromise.wrap(this._proxy.$provideTasks(handle, validTypes)).then((value) => {
 					let tasks: Task[] = [];
 					for (let task of value.tasks) {
 						let taskTransfer = task._source as any as ExtensionTaskSourceTransfer;
@@ -414,13 +423,13 @@ export class MainThreadTask implements MainThreadTaskShape {
 		return TPromise.wrap<void>(undefined);
 	}
 
-	public $unregisterTaskProvider(handle: number): TPromise<void> {
+	public $unregisterTaskProvider(handle: number): Thenable<void> {
 		this._taskService.unregisterTaskProvider(handle);
 		delete this._activeHandles[handle];
 		return TPromise.wrap<void>(undefined);
 	}
 
-	public $fetchTasks(filter?: TaskFilterDTO): TPromise<TaskDTO[]> {
+	public $fetchTasks(filter?: TaskFilterDTO): Thenable<TaskDTO[]> {
 		return this._taskService.tasks(TaskFilterDTO.to(filter)).then((tasks) => {
 			let result: TaskDTO[] = [];
 			for (let task of tasks) {
@@ -433,7 +442,7 @@ export class MainThreadTask implements MainThreadTaskShape {
 		});
 	}
 
-	public $executeTask(value: TaskHandleDTO | TaskDTO): TPromise<TaskExecutionDTO> {
+	public $executeTask(value: TaskHandleDTO | TaskDTO): Thenable<TaskExecutionDTO> {
 		return new TPromise<TaskExecutionDTO>((resolve, reject) => {
 			if (TaskHandleDTO.is(value)) {
 				let workspaceFolder = this._workspaceContextServer.getWorkspaceFolder(URI.revive(value.workspaceFolder));
@@ -448,7 +457,7 @@ export class MainThreadTask implements MainThreadTaskShape {
 					reject(new Error('Task not found'));
 				});
 			} else {
-				let task = TaskDTO.to(value, this._workspaceContextServer);
+				let task = TaskDTO.to(value, this._workspaceContextServer, true);
 				this._taskService.run(task);
 				let result: TaskExecutionDTO = {
 					id: task._id,
@@ -459,7 +468,7 @@ export class MainThreadTask implements MainThreadTaskShape {
 		});
 	}
 
-	public $terminateTask(id: string): TPromise<void> {
+	public $terminateTask(id: string): Thenable<void> {
 		return new TPromise<void>((resolve, reject) => {
 			this._taskService.getActiveTasks().then((tasks) => {
 				for (let task of tasks) {
@@ -494,12 +503,14 @@ export class MainThreadTask implements MainThreadTaskShape {
 		}
 		this._taskService.registerTaskSystem(key, {
 			platform: platform,
-			fileSystemScheme: key,
+			uriProvider: (path: string): URI => {
+				return URI.parse(`${info.scheme}://${info.authority}${path}`);
+			},
 			context: this._extHostContext,
 			resolveVariables: (workspaceFolder: IWorkspaceFolder, variables: Set<string>): TPromise<Map<string, string>> => {
 				let vars: string[] = [];
 				variables.forEach(item => vars.push(item));
-				return this._proxy.$resolveVariables(workspaceFolder.uri, vars).then(values => {
+				return TPromise.wrap(this._proxy.$resolveVariables(workspaceFolder.uri, vars)).then(values => {
 					let result = new Map<string, string>();
 					Object.keys(values).forEach(key => result.set(key, values[key]));
 					return result;
diff --git a/src/vs/workbench/api/electron-browser/mainThreadTerminalService.ts b/src/vs/workbench/api/electron-browser/mainThreadTerminalService.ts
index 58e3ab9786d..d9e2fe0ea58 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadTerminalService.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadTerminalService.ts
@@ -5,9 +5,9 @@
 'use strict';
 
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
-import { ITerminalService, ITerminalInstance, IShellLaunchConfig, ITerminalProcessExtHostProxy, ITerminalProcessExtHostRequest } from 'vs/workbench/parts/terminal/common/terminal';
+import { ITerminalService, ITerminalInstance, IShellLaunchConfig, ITerminalProcessExtHostProxy, ITerminalProcessExtHostRequest, ITerminalDimensions, EXT_HOST_CREATION_DELAY } from 'vs/workbench/parts/terminal/common/terminal';
 import { TPromise } from 'vs/base/common/winjs.base';
-import { ExtHostContext, ExtHostTerminalServiceShape, MainThreadTerminalServiceShape, MainContext, IExtHostContext, ShellLaunchConfigDto } from '../node/extHost.protocol';
+import { ExtHostContext, ExtHostTerminalServiceShape, MainThreadTerminalServiceShape, MainContext, IExtHostContext, ShellLaunchConfigDto } from 'vs/workbench/api/node/extHost.protocol';
 import { extHostNamedCustomer } from 'vs/workbench/api/electron-browser/extHostCustomers';
 
 @extHostNamedCustomer(MainContext.MainThreadTerminalService)
@@ -16,28 +16,35 @@ export class MainThreadTerminalService implements MainThreadTerminalServiceShape
 	private _proxy: ExtHostTerminalServiceShape;
 	private _toDispose: IDisposable[] = [];
 	private _terminalProcesses: { [id: number]: ITerminalProcessExtHostProxy } = {};
-	private _dataListeners: { [id: number]: IDisposable } = {};
+	private _terminalOnDidWriteDataListeners: { [id: number]: IDisposable } = {};
+	private _terminalOnDidAcceptInputListeners: { [id: number]: IDisposable } = {};
 
 	constructor(
 		extHostContext: IExtHostContext,
 		@ITerminalService private terminalService: ITerminalService
 	) {
 		this._proxy = extHostContext.getProxy(ExtHostContext.ExtHostTerminalService);
-		this._toDispose.push(terminalService.onInstanceCreated((terminalInstance) => {
+		this._toDispose.push(terminalService.onInstanceCreated((instance) => {
 			// Delay this message so the TerminalInstance constructor has a chance to finish and
 			// return the ID normally to the extension host. The ID that is passed here will be used
 			// to register non-extension API terminals in the extension host.
-			setTimeout(() => this._onTerminalOpened(terminalInstance), 100);
+			setTimeout(() => this._onTerminalOpened(instance), EXT_HOST_CREATION_DELAY);
 		}));
-		this._toDispose.push(terminalService.onInstanceDisposed(terminalInstance => this._onTerminalDisposed(terminalInstance)));
-		this._toDispose.push(terminalService.onInstanceProcessIdReady(terminalInstance => this._onTerminalProcessIdReady(terminalInstance)));
+		this._toDispose.push(terminalService.onInstanceDisposed(instance => this._onTerminalDisposed(instance)));
+		this._toDispose.push(terminalService.onInstanceProcessIdReady(instance => this._onTerminalProcessIdReady(instance)));
+		this._toDispose.push(terminalService.onInstanceDimensionsChanged(instance => this._onInstanceDimensionsChanged(instance)));
 		this._toDispose.push(terminalService.onInstanceRequestExtHostProcess(request => this._onTerminalRequestExtHostProcess(request)));
+		this._toDispose.push(terminalService.onActiveInstanceChanged(instance => this._onActiveTerminalChanged(instance ? instance.id : undefined)));
 
 		// Set initial ext host state
 		this.terminalService.terminalInstances.forEach(t => {
 			this._onTerminalOpened(t);
 			t.processReady.then(() => this._onTerminalProcessIdReady(t));
 		});
+		const activeInstance = this.terminalService.getActiveInstance();
+		if (activeInstance) {
+			this._proxy.$acceptActiveTerminalChanged(activeInstance.id);
+		}
 	}
 
 	public dispose(): void {
@@ -47,7 +54,7 @@ export class MainThreadTerminalService implements MainThreadTerminalServiceShape
 		// when the extension host process goes down ?
 	}
 
-	public $createTerminal(name?: string, shellPath?: string, shellArgs?: string[], cwd?: string, env?: { [key: string]: string }, waitOnExit?: boolean): TPromise<number> {
+	public $createTerminal(name?: string, shellPath?: string, shellArgs?: string[], cwd?: string, env?: { [key: string]: string }, waitOnExit?: boolean): Thenable<number> {
 		const shellLaunchConfig: IShellLaunchConfig = {
 			name,
 			executable: shellPath,
@@ -60,8 +67,13 @@ export class MainThreadTerminalService implements MainThreadTerminalServiceShape
 		return TPromise.as(this.terminalService.createTerminal(shellLaunchConfig).id);
 	}
 
+	public $createTerminalRenderer(name: string): Thenable<number> {
+		const instance = this.terminalService.createTerminalRenderer(name);
+		return TPromise.as(instance.id);
+	}
+
 	public $show(terminalId: number, preserveFocus: boolean): void {
-		let terminalInstance = this.terminalService.getInstanceFromId(terminalId);
+		const terminalInstance = this.terminalService.getInstanceFromId(terminalId);
 		if (terminalInstance) {
 			this.terminalService.setActiveInstance(terminalInstance);
 			this.terminalService.showPanel(!preserveFocus);
@@ -75,31 +87,86 @@ export class MainThreadTerminalService implements MainThreadTerminalServiceShape
 	}
 
 	public $dispose(terminalId: number): void {
-		let terminalInstance = this.terminalService.getInstanceFromId(terminalId);
+		const terminalInstance = this.terminalService.getInstanceFromId(terminalId);
 		if (terminalInstance) {
 			terminalInstance.dispose();
 		}
 	}
 
+	public $terminalRendererWrite(terminalId: number, text: string): void {
+		const terminalInstance = this.terminalService.getInstanceFromId(terminalId);
+		if (terminalInstance && terminalInstance.shellLaunchConfig.isRendererOnly) {
+			terminalInstance.write(text);
+		}
+	}
+
+	public $terminalRendererSetName(terminalId: number, name: string): void {
+		const terminalInstance = this.terminalService.getInstanceFromId(terminalId);
+		if (terminalInstance && terminalInstance.shellLaunchConfig.isRendererOnly) {
+			terminalInstance.setTitle(name, false);
+		}
+	}
+
+	public $terminalRendererSetDimensions(terminalId: number, dimensions: ITerminalDimensions): void {
+		const terminalInstance = this.terminalService.getInstanceFromId(terminalId);
+		if (terminalInstance && terminalInstance.shellLaunchConfig.isRendererOnly) {
+			terminalInstance.setDimensions(dimensions);
+		}
+	}
+
+	public $terminalRendererRegisterOnInputListener(terminalId: number): void {
+		const terminalInstance = this.terminalService.getInstanceFromId(terminalId);
+		if (!terminalInstance) {
+			return;
+		}
+
+		// Listener already registered
+		if (this._terminalOnDidAcceptInputListeners.hasOwnProperty(terminalId)) {
+			return;
+		}
+
+		// Register
+		this._terminalOnDidAcceptInputListeners[terminalId] = terminalInstance.onRendererInput(data => this._onTerminalRendererInput(terminalId, data));
+		terminalInstance.addDisposable(this._terminalOnDidAcceptInputListeners[terminalId]);
+	}
+
 	public $sendText(terminalId: number, text: string, addNewLine: boolean): void {
-		let terminalInstance = this.terminalService.getInstanceFromId(terminalId);
+		const terminalInstance = this.terminalService.getInstanceFromId(terminalId);
 		if (terminalInstance) {
 			terminalInstance.sendText(text, addNewLine);
 		}
 	}
 
 	public $registerOnDataListener(terminalId: number): void {
-		let terminalInstance = this.terminalService.getInstanceFromId(terminalId);
-		if (terminalInstance) {
-			this._dataListeners[terminalId] = terminalInstance.onData(data => this._onTerminalData(terminalId, data));
-			terminalInstance.onDisposed(instance => delete this._dataListeners[terminalId]);
+		const terminalInstance = this.terminalService.getInstanceFromId(terminalId);
+		if (!terminalInstance) {
+			return;
 		}
+
+		// Listener already registered
+		if (this._terminalOnDidWriteDataListeners[terminalId]) {
+			return;
+		}
+
+		// Register
+		this._terminalOnDidWriteDataListeners[terminalId] = terminalInstance.onData(data => {
+			this._onTerminalData(terminalId, data);
+		});
+		terminalInstance.addDisposable(this._terminalOnDidWriteDataListeners[terminalId]);
+	}
+
+	private _onActiveTerminalChanged(terminalId: number | undefined): void {
+		this._proxy.$acceptActiveTerminalChanged(terminalId);
 	}
 
 	private _onTerminalData(terminalId: number, data: string): void {
 		this._proxy.$acceptTerminalProcessData(terminalId, data);
 	}
 
+	private _onTerminalRendererInput(terminalId: number, data: string): void {
+		this._proxy.$acceptTerminalRendererInput(terminalId, data);
+	}
+
 	private _onTerminalDisposed(terminalInstance: ITerminalInstance): void {
 		this._proxy.$acceptTerminalClosed(terminalInstance.id);
 	}
@@ -112,6 +179,14 @@ export class MainThreadTerminalService implements MainThreadTerminalServiceShape
 		this._proxy.$acceptTerminalProcessId(terminalInstance.id, terminalInstance.processId);
 	}
 
+	private _onInstanceDimensionsChanged(instance: ITerminalInstance): void {
+		// Only send the dimensions if the terminal is a renderer only as there is no API to access
+		// dimensions on a plain Terminal.
+		if (instance.shellLaunchConfig.isRendererOnly) {
+			this._proxy.$acceptTerminalRendererDimensions(instance.id, instance.cols, instance.rows);
+		}
+	}
+
 	private _onTerminalRequestExtHostProcess(request: ITerminalProcessExtHostRequest): void {
 		this._terminalProcesses[request.proxy.terminalId] = request.proxy;
 		const shellLaunchConfigDto: ShellLaunchConfigDto = {
@@ -123,8 +198,8 @@ export class MainThreadTerminalService implements MainThreadTerminalServiceShape
 		};
 		this._proxy.$createProcess(request.proxy.terminalId, shellLaunchConfigDto, request.cols, request.rows);
 		request.proxy.onInput(data => this._proxy.$acceptProcessInput(request.proxy.terminalId, data));
-		request.proxy.onResize((cols, rows) => this._proxy.$acceptProcessResize(request.proxy.terminalId, cols, rows));
-		request.proxy.onShutdown(() => this._proxy.$acceptProcessShutdown(request.proxy.terminalId));
+		request.proxy.onResize(dimensions => this._proxy.$acceptProcessResize(request.proxy.terminalId, dimensions.cols, dimensions.rows));
+		request.proxy.onShutdown(immediate => this._proxy.$acceptProcessShutdown(request.proxy.terminalId, immediate));
 	}
 
 	public $sendProcessTitle(terminalId: number, title: string): void {
diff --git a/src/vs/workbench/api/electron-browser/mainThreadTreeViews.ts b/src/vs/workbench/api/electron-browser/mainThreadTreeViews.ts
index bf456a9571e..0b909bd4ba7 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadTreeViews.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadTreeViews.ts
@@ -34,13 +34,14 @@ export class MainThreadTreeViews extends Disposable implements MainThreadTreeVie
 		if (viewer) {
 			viewer.dataProvider = dataProvider;
 			this.registerListeners(treeViewId, viewer);
+			this._proxy.$setVisible(treeViewId, viewer.visible);
 		} else {
 			this.notificationService.error('No view is registered with id: ' + treeViewId);
 		}
 	}
 
-	$reveal(treeViewId: string, item: ITreeItem, parentChain: ITreeItem[], options?: { select?: boolean }): TPromise<void> {
-		return this.viewsService.openView(treeViewId)
+	$reveal(treeViewId: string, item: ITreeItem, parentChain: ITreeItem[], options: { select: boolean, focus: boolean }): Thenable<void> {
+		return this.viewsService.openView(treeViewId, options.focus)
 			.then(() => {
 				const viewer = this.getTreeViewer(treeViewId);
 				return viewer ? viewer.reveal(item, parentChain, options) : null;
@@ -61,6 +62,7 @@ export class MainThreadTreeViews extends Disposable implements MainThreadTreeVie
 		this._register(treeViewer.onDidExpandItem(item => this._proxy.$setExpanded(treeViewId, item.handle, true)));
 		this._register(treeViewer.onDidCollapseItem(item => this._proxy.$setExpanded(treeViewId, item.handle, false)));
 		this._register(treeViewer.onDidChangeSelection(items => this._proxy.$setSelection(treeViewId, items.map(({ handle }) => handle))));
+		this._register(treeViewer.onDidChangeVisibility(isVisible => this._proxy.$setVisible(treeViewId, isVisible)));
 	}
 
 	private getTreeViewer(treeViewId: string): ITreeViewer {
@@ -96,13 +98,13 @@ class TreeViewDataProvider implements ITreeViewDataProvider {
 		if (treeItem && treeItem.children) {
 			return TPromise.as(treeItem.children);
 		}
-		return this._proxy.$getChildren(this.treeViewId, treeItem ? treeItem.handle : void 0)
+		return TPromise.wrap(this._proxy.$getChildren(this.treeViewId, treeItem ? treeItem.handle : void 0)
 			.then(children => {
 				return this.postGetChildren(children);
 			}, err => {
 				this.notificationService.error(err);
 				return [];
-			});
+			}));
 	}
 
 	getItemsToRefresh(itemsToRefreshByHandle: { [treeItemHandle: string]: ITreeItem }): ITreeItem[] {
diff --git a/src/vs/workbench/api/electron-browser/mainThreadUrls.ts b/src/vs/workbench/api/electron-browser/mainThreadUrls.ts
index 7ba2ed813b1..f2ee377a15a 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadUrls.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadUrls.ts
@@ -7,9 +7,9 @@ import { ExtHostContext, IExtHostContext, MainContext, MainThreadUrlsShape, ExtH
 import { extHostNamedCustomer } from './extHostCustomers';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { IURLService, IURLHandler } from 'vs/platform/url/common/url';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { IDisposable } from 'vs/base/common/lifecycle';
-import { IExtensionUrlHandler } from 'vs/platform/url/electron-browser/inactiveExtensionUrlHandler';
+import { IExtensionUrlHandler } from 'vs/workbench/services/extensions/electron-browser/inactiveExtensionUrlHandler';
 
 class ExtensionUrlHandler implements IURLHandler {
 
@@ -24,7 +24,7 @@ class ExtensionUrlHandler implements IURLHandler {
 			return TPromise.as(false);
 		}
 
-		return this.proxy.$handleExternalUri(this.handle, uri).then(() => true);
+		return TPromise.wrap(this.proxy.$handleExternalUri(this.handle, uri)).then(() => true);
 	}
 }
 
@@ -42,7 +42,7 @@ export class MainThreadUrls implements MainThreadUrlsShape {
 		this.proxy = context.getProxy(ExtHostContext.ExtHostUrls);
 	}
 
-	$registerProtocolHandler(handle: number, extensionId: string): TPromise<void> {
+	$registerUriHandler(handle: number, extensionId: string): Thenable<void> {
 		const handler = new ExtensionUrlHandler(this.proxy, handle, extensionId);
 		const disposable = this.urlService.registerHandler(handler);
 
@@ -52,7 +52,7 @@ export class MainThreadUrls implements MainThreadUrlsShape {
 		return TPromise.as(null);
 	}
 
-	$unregisterProtocolHandler(handle: number): TPromise<void> {
+	$unregisterUriHandler(handle: number): Thenable<void> {
 		const tuple = this.handlers.get(handle);
 
 		if (!tuple) {
diff --git a/src/vs/workbench/api/electron-browser/mainThreadWebview.ts b/src/vs/workbench/api/electron-browser/mainThreadWebview.ts
index 9c81c36eeda..03c26a2eb02 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadWebview.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadWebview.ts
@@ -2,22 +2,22 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
+import { dispose, IDisposable } from 'vs/base/common/lifecycle';
 import * as map from 'vs/base/common/map';
-import URI, { UriComponents } from 'vs/base/common/uri';
+import { URI, UriComponents } from 'vs/base/common/uri';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { localize } from 'vs/nls';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { EditorViewColumn, viewColumnToEditorGroup, editorGroupToViewColumn } from 'vs/workbench/api/shared/editor';
 import { ILifecycleService } from 'vs/platform/lifecycle/common/lifecycle';
 import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { ExtHostContext, ExtHostWebviewsShape, IExtHostContext, MainContext, MainThreadWebviewsShape, WebviewPanelHandle } from 'vs/workbench/api/node/extHost.protocol';
+import { ExtHostContext, ExtHostWebviewsShape, IExtHostContext, MainContext, MainThreadWebviewsShape, WebviewPanelHandle, WebviewPanelShowOptions } from 'vs/workbench/api/node/extHost.protocol';
+import { editorGroupToViewColumn, EditorViewColumn, viewColumnToEditorGroup } from 'vs/workbench/api/shared/editor';
 import { WebviewEditor } from 'vs/workbench/parts/webview/electron-browser/webviewEditor';
 import { WebviewEditorInput } from 'vs/workbench/parts/webview/electron-browser/webviewEditorInput';
-import { IWebviewEditorService, WebviewInputOptions, WebviewReviver, ICreateWebViewShowOptions } from 'vs/workbench/parts/webview/electron-browser/webviewEditorService';
+import { ICreateWebViewShowOptions, IWebviewEditorService, WebviewInputOptions, WebviewReviver } from 'vs/workbench/parts/webview/electron-browser/webviewEditorService';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
 import { IEditorGroupsService } from 'vs/workbench/services/group/common/editorGroupsService';
+import * as vscode from 'vscode';
 import { extHostNamedCustomer } from './extHostCustomers';
 
 @extHostNamedCustomer(MainContext.MainThreadWebviews)
@@ -39,9 +39,8 @@ export class MainThreadWebviews implements MainThreadWebviewsShape, WebviewReviv
 
 	constructor(
 		context: IExtHostContext,
-		@IContextKeyService contextKeyService: IContextKeyService,
-		@IEditorGroupsService private readonly _editorGroupService: IEditorGroupsService,
 		@ILifecycleService lifecycleService: ILifecycleService,
+		@IEditorGroupsService private readonly _editorGroupService: IEditorGroupsService,
 		@IEditorService private readonly _editorService: IEditorService,
 		@IWebviewEditorService private readonly _webviewService: IWebviewEditorService,
 		@IOpenerService private readonly _openerService: IOpenerService,
@@ -59,11 +58,11 @@ export class MainThreadWebviews implements MainThreadWebviewsShape, WebviewReviv
 		}, this, this._toDispose);
 	}
 
-	dispose(): void {
+	public dispose(): void {
 		this._toDispose = dispose(this._toDispose);
 	}
 
-	$createWebviewPanel(
+	public $createWebviewPanel(
 		handle: WebviewPanelHandle,
 		viewType: string,
 		title: string,
@@ -77,10 +76,7 @@ export class MainThreadWebviews implements MainThreadWebviewsShape, WebviewReviv
 			mainThreadShowOptions.group = viewColumnToEditorGroup(this._editorGroupService, showOptions.viewColumn);
 		}
 
-		const webview = this._webviewService.createWebview(MainThreadWebviews.viewType, title, mainThreadShowOptions, {
-			...options,
-			localResourceRoots: Array.isArray(options.localResourceRoots) ? options.localResourceRoots.map(URI.revive) : undefined
-		}, URI.revive(extensionLocation), this.createWebviewEventDelegate(handle));
+		const webview = this._webviewService.createWebview(MainThreadWebviews.viewType, title, mainThreadShowOptions, reviveWebviewOptions(options), URI.revive(extensionLocation), this.createWebviewEventDelegate(handle));
 		webview.state = {
 			viewType: viewType,
 			state: undefined
@@ -90,33 +86,43 @@ export class MainThreadWebviews implements MainThreadWebviewsShape, WebviewReviv
 		this._activeWebview = handle;
 	}
 
-	$disposeWebview(handle: WebviewPanelHandle): void {
+	public $disposeWebview(handle: WebviewPanelHandle): void {
 		const webview = this.getWebview(handle);
 		webview.dispose();
 	}
 
-	$setTitle(handle: WebviewPanelHandle, value: string): void {
+	public $setTitle(handle: WebviewPanelHandle, value: string): void {
 		const webview = this.getWebview(handle);
 		webview.setName(value);
 	}
 
-	$setHtml(handle: WebviewPanelHandle, value: string): void {
+	public $setIconPath(handle: WebviewPanelHandle, value: { light: UriComponents, dark: UriComponents } | undefined): void {
+		const webview = this.getWebview(handle);
+		webview.iconPath = reviveWebviewIcon(value);
+	}
+
+	public $setHtml(handle: WebviewPanelHandle, value: string): void {
 		const webview = this.getWebview(handle);
 		webview.html = value;
 	}
 
-	$reveal(handle: WebviewPanelHandle, viewColumn: EditorViewColumn | null, preserveFocus: boolean): void {
+	public $setOptions(handle: WebviewPanelHandle, options: vscode.WebviewOptions): void {
+		const webview = this.getWebview(handle);
+		webview.setOptions(reviveWebviewOptions(options));
+	}
+
+	public $reveal(handle: WebviewPanelHandle, showOptions: WebviewPanelShowOptions): void {
 		const webview = this.getWebview(handle);
 		if (webview.isDisposed()) {
 			return;
 		}
 
-		const targetGroup = this._editorGroupService.getGroup(viewColumnToEditorGroup(this._editorGroupService, viewColumn));
+		const targetGroup = this._editorGroupService.getGroup(viewColumnToEditorGroup(this._editorGroupService, showOptions.viewColumn));
 
-		this._webviewService.revealWebview(webview, targetGroup || this._editorGroupService.activeGroup, preserveFocus);
+		this._webviewService.revealWebview(webview, targetGroup || this._editorGroupService.activeGroup, showOptions.preserveFocus);
 	}
 
-	async $postMessage(handle: WebviewPanelHandle, message: any): TPromise<boolean> {
+	public $postMessage(handle: WebviewPanelHandle, message: any): Thenable<boolean> {
 		const webview = this.getWebview(handle);
 		const editors = this._editorService.visibleControls
 			.filter(e => e instanceof WebviewEditor)
@@ -127,18 +133,18 @@ export class MainThreadWebviews implements MainThreadWebviewsShape, WebviewReviv
 			editor.sendMessage(message);
 		}
 
-		return (editors.length > 0);
+		return TPromise.as(editors.length > 0);
 	}
 
-	$registerSerializer(viewType: string): void {
+	public $registerSerializer(viewType: string): void {
 		this._revivers.add(viewType);
 	}
 
-	$unregisterSerializer(viewType: string): void {
+	public $unregisterSerializer(viewType: string): void {
 		this._revivers.delete(viewType);
 	}
 
-	reviveWebview(webview: WebviewEditorInput): TPromise<void> {
+	public reviveWebview(webview: WebviewEditorInput): TPromise<void> {
 		const viewType = webview.state.viewType;
 		return this._extensionService.activateByEvent(`onWebviewPanel:${viewType}`).then(() => {
 			const handle = 'revival-' + MainThreadWebviews.revivalPool++;
@@ -161,7 +167,7 @@ export class MainThreadWebviews implements MainThreadWebviewsShape, WebviewReviv
 		});
 	}
 
-	canRevive(webview: WebviewEditorInput): boolean {
+	public canRevive(webview: WebviewEditorInput): boolean {
 		if (webview.isDisposed() || !webview.state) {
 			return false;
 		}
@@ -177,7 +183,6 @@ export class MainThreadWebviews implements MainThreadWebviewsShape, WebviewReviv
 		});
 
 		return TPromise.as(false); // Don't veto shutdown
-
 	}
 
 	private createWebviewEventDelegate(handle: WebviewPanelHandle) {
@@ -185,21 +190,16 @@ export class MainThreadWebviews implements MainThreadWebviewsShape, WebviewReviv
 			onDidClickLink: uri => this.onDidClickLink(handle, uri),
 			onMessage: message => this._proxy.$onMessage(handle, message),
 			onDispose: () => {
+				const cleanUp = () => {
+					this._webviews.delete(handle);
+				};
 				this._proxy.$onDidDisposeWebviewPanel(handle).then(
-					() => this._webviews.delete(handle),
-					() => this._webviews.delete(handle));
+					cleanUp,
+					cleanUp);
 			}
 		};
 	}
 
-	private getWebview(handle: WebviewPanelHandle): WebviewEditorInput {
-		const webview = this._webviews.get(handle);
-		if (!webview) {
-			throw new Error('Unknown webview handle:' + handle);
-		}
-		return webview;
-	}
-
 	private onActiveEditorChanged() {
 		const activeEditor = this._editorService.activeControl;
 		let newActiveWebview: { input: WebviewEditorInput, handle: WebviewPanelHandle } | undefined = undefined;
@@ -215,7 +215,11 @@ export class MainThreadWebviews implements MainThreadWebviewsShape, WebviewReviv
 
 		if (newActiveWebview && newActiveWebview.handle === this._activeWebview) {
 			// Webview itself unchanged but position may have changed
-			this._proxy.$onDidChangeWebviewPanelViewState(newActiveWebview.handle, true, editorGroupToViewColumn(this._editorGroupService, newActiveWebview.input.group));
+			this._proxy.$onDidChangeWebviewPanelViewState(newActiveWebview.handle, {
+				active: true,
+				visible: true,
+				position: editorGroupToViewColumn(this._editorGroupService, newActiveWebview.input.group)
+			});
 			return;
 		}
 
@@ -223,13 +227,21 @@ export class MainThreadWebviews implements MainThreadWebviewsShape, WebviewReviv
 		if (typeof this._activeWebview !== 'undefined') {
 			const oldActiveWebview = this._webviews.get(this._activeWebview);
 			if (oldActiveWebview) {
-				this._proxy.$onDidChangeWebviewPanelViewState(this._activeWebview, false, editorGroupToViewColumn(this._editorGroupService, oldActiveWebview.group));
+				this._proxy.$onDidChangeWebviewPanelViewState(this._activeWebview, {
+					active: false,
+					visible: this._editorService.visibleControls.some(editor => editor.input && editor.input.matches(oldActiveWebview)),
+					position: editorGroupToViewColumn(this._editorGroupService, oldActiveWebview.group),
+				});
 			}
 		}
 
 		// Then for newly active
 		if (newActiveWebview) {
-			this._proxy.$onDidChangeWebviewPanelViewState(newActiveWebview.handle, true, editorGroupToViewColumn(this._editorGroupService, activeEditor.group));
+			this._proxy.$onDidChangeWebviewPanelViewState(newActiveWebview.handle, {
+				active: true,
+				visible: true,
+				position: editorGroupToViewColumn(this._editorGroupService, activeEditor.group)
+			});
 			this._activeWebview = newActiveWebview.handle;
 		} else {
 			this._activeWebview = undefined;
@@ -237,22 +249,23 @@ export class MainThreadWebviews implements MainThreadWebviewsShape, WebviewReviv
 	}
 
 	private onVisibleEditorsChanged(): void {
-		for (const workbenchEditor of this._editorService.visibleControls) {
-			if (!workbenchEditor.input) {
-				return;
-			}
+		this._webviews.forEach((input, handle) => {
+			for (const workbenchEditor of this._editorService.visibleControls) {
+				if (workbenchEditor.input && workbenchEditor.input.matches(input)) {
+					const editorPosition = editorGroupToViewColumn(this._editorGroupService, workbenchEditor.group);
 
-			this._webviews.forEach((input, handle) => {
-				const inputPosition = editorGroupToViewColumn(this._editorGroupService, input.group);
-				const editorPosition = editorGroupToViewColumn(this._editorGroupService, workbenchEditor.group);
-
-				if (workbenchEditor.input.matches(input) && inputPosition !== editorPosition) {
 					input.updateGroup(workbenchEditor.group.id);
-					this._proxy.$onDidChangeWebviewPanelViewState(handle, handle === this._activeWebview, editorPosition);
+					this._proxy.$onDidChangeWebviewPanelViewState(handle, {
+						active: handle === this._activeWebview,
+						visible: true,
+						position: editorPosition
+					});
+					break;
 				}
-			});
-		}
+			}
+		});
 	}
+
 	private onDidClickLink(handle: WebviewPanelHandle, link: URI): void {
 		if (!link) {
 			return;
@@ -265,6 +278,14 @@ export class MainThreadWebviews implements MainThreadWebviewsShape, WebviewReviv
 		}
 	}
 
+	private getWebview(handle: WebviewPanelHandle): WebviewEditorInput {
+		const webview = this._webviews.get(handle);
+		if (!webview) {
+			throw new Error('Unknown webview handle:' + handle);
+		}
+		return webview;
+	}
+
 	private static getDeserializationFailedContents(viewType: string) {
 		return `<!DOCTYPE html>
 		<html>
@@ -276,4 +297,24 @@ export class MainThreadWebviews implements MainThreadWebviewsShape, WebviewReviv
 			<body>${localize('errorMessage', "An error occurred while restoring view:{0}", viewType)}</body>
 		</html>`;
 	}
+}
+
+function reviveWebviewOptions(options: WebviewInputOptions): WebviewInputOptions {
+	return {
+		...options,
+		localResourceRoots: Array.isArray(options.localResourceRoots) ? options.localResourceRoots.map(URI.revive) : undefined
+	};
+}
+
+function reviveWebviewIcon(
+	value: { light: UriComponents, dark: UriComponents } | undefined
+): { light: URI, dark: URI } | undefined {
+	if (!value) {
+		return undefined;
+	}
+
+	return {
+		light: URI.revive(value.light),
+		dark: URI.revive(value.dark)
+	};
 }
\ No newline at end of file
diff --git a/src/vs/workbench/api/electron-browser/mainThreadWindow.ts b/src/vs/workbench/api/electron-browser/mainThreadWindow.ts
index 78a3143fd09..c072e83a5f9 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadWindow.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadWindow.ts
@@ -4,7 +4,6 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import { TPromise } from 'vs/base/common/winjs.base';
 import { IWindowService } from 'vs/platform/windows/common/windows';
 import { MainThreadWindowShape, ExtHostWindowShape, ExtHostContext, MainContext, IExtHostContext } from '../node/extHost.protocol';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
@@ -27,7 +26,7 @@ export class MainThreadWindow implements MainThreadWindowShape {
 			(this.proxy.$onDidChangeWindowFocus, this.proxy, this.disposables);
 	}
 
-	$getWindowVisibility(): TPromise<boolean> {
+	$getWindowVisibility(): Thenable<boolean> {
 		return this.windowService.isFocused();
 	}
 
diff --git a/src/vs/workbench/api/electron-browser/mainThreadWorkspace.ts b/src/vs/workbench/api/electron-browser/mainThreadWorkspace.ts
index c85997bc5d4..29a81a2b32d 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadWorkspace.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadWorkspace.ts
@@ -5,24 +5,32 @@
 'use strict';
 
 import { isPromiseCanceledError } from 'vs/base/common/errors';
-import URI, { UriComponents } from 'vs/base/common/uri';
-import { ISearchService, QueryType, ISearchQuery, IFolderQuery, ISearchConfiguration } from 'vs/platform/search/common/search';
-import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
-import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
+import { dispose, IDisposable } from 'vs/base/common/lifecycle';
+import { URI, UriComponents } from 'vs/base/common/uri';
 import { TPromise } from 'vs/base/common/winjs.base';
-import { MainThreadWorkspaceShape, ExtHostWorkspaceShape, ExtHostContext, MainContext, IExtHostContext } from '../node/extHost.protocol';
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
-import { extHostNamedCustomer } from 'vs/workbench/api/electron-browser/extHostCustomers';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IWorkspaceEditingService } from 'vs/workbench/services/workspace/common/workspaceEditing';
 import { localize } from 'vs/nls';
+import { CommandsRegistry } from 'vs/platform/commands/common/commands';
+import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { areSameExtensions } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
+import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
+import { ILabelService } from 'vs/platform/label/common/label';
+import { IFolderQuery, IPatternInfo, IQueryOptions, ISearchConfiguration, ISearchProgressItem, ISearchQuery, ISearchService, QueryType } from 'vs/platform/search/common/search';
 import { IStatusbarService } from 'vs/platform/statusbar/common/statusbar';
+import { IWindowService } from 'vs/platform/windows/common/windows';
+import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
+import { extHostNamedCustomer } from 'vs/workbench/api/electron-browser/extHostCustomers';
+import { QueryBuilder } from 'vs/workbench/parts/search/common/queryBuilder';
+import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
+import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
+import { IWorkspaceEditingService } from 'vs/workbench/services/workspace/common/workspaceEditing';
+import { ExtHostContext, ExtHostWorkspaceShape, IExtHostContext, MainContext, MainThreadWorkspaceShape } from '../node/extHost.protocol';
+import { CancellationTokenSource, CancellationToken } from 'vs/base/common/cancellation';
 
 @extHostNamedCustomer(MainContext.MainThreadWorkspace)
 export class MainThreadWorkspace implements MainThreadWorkspaceShape {
 
 	private readonly _toDispose: IDisposable[] = [];
-	private readonly _activeSearches: { [id: number]: TPromise<URI[]> } = Object.create(null);
+	private readonly _activeCancelTokens: { [id: number]: CancellationTokenSource } = Object.create(null);
 	private readonly _proxy: ExtHostWorkspaceShape;
 
 	constructor(
@@ -32,7 +40,9 @@ export class MainThreadWorkspace implements MainThreadWorkspaceShape {
 		@ITextFileService private readonly _textFileService: ITextFileService,
 		@IConfigurationService private readonly _configurationService: IConfigurationService,
 		@IWorkspaceEditingService private readonly _workspaceEditingService: IWorkspaceEditingService,
-		@IStatusbarService private readonly _statusbarService: IStatusbarService
+		@IStatusbarService private readonly _statusbarService: IStatusbarService,
+		@IInstantiationService private readonly _instantiationService: IInstantiationService,
+		@ILabelService private readonly _labelService: ILabelService
 	) {
 		this._proxy = extHostContext.getProxy(ExtHostContext.ExtHostWorkspace);
 		this._contextService.onDidChangeWorkspaceFolders(this._onDidChangeWorkspace, this, this._toDispose);
@@ -42,9 +52,9 @@ export class MainThreadWorkspace implements MainThreadWorkspaceShape {
 	dispose(): void {
 		dispose(this._toDispose);
 
-		for (let requestId in this._activeSearches) {
-			const search = this._activeSearches[requestId];
-			search.cancel();
+		for (let requestId in this._activeCancelTokens) {
+			const tokenSource = this._activeCancelTokens[requestId];
+			tokenSource.cancel();
 		}
 	}
 
@@ -92,12 +102,18 @@ export class MainThreadWorkspace implements MainThreadWorkspaceShape {
 	}
 
 	private _onDidChangeWorkspace(): void {
-		this._proxy.$acceptWorkspaceData(this._contextService.getWorkbenchState() === WorkbenchState.EMPTY ? null : this._contextService.getWorkspace());
+		const workspace = this._contextService.getWorkbenchState() === WorkbenchState.EMPTY ? null : this._contextService.getWorkspace();
+		this._proxy.$acceptWorkspaceData(workspace ? {
+			configuration: workspace.configuration,
+			folders: workspace.folders,
+			id: workspace.id,
+			name: this._labelService.getWorkspaceLabel(workspace)
+		} : null);
 	}
 
 	// --- search ---
 
-	$startSearch(includePattern: string, includeFolder: string, excludePatternOrDisregardExcludes: string | false, maxResults: number, requestId: number): Thenable<URI[]> {
+	$startFileSearch(includePattern: string, includeFolder: string, excludePatternOrDisregardExcludes: string | false, maxResults: number, token: CancellationToken): Thenable<URI[]> {
 		const workspace = this._contextService.getWorkspace();
 		if (!workspace.folders.length) {
 			return undefined;
@@ -128,15 +144,21 @@ export class MainThreadWorkspace implements MainThreadWorkspaceShape {
 			folderQueries,
 			type: QueryType.File,
 			maxResults,
-			includePattern: { [typeof includePattern === 'string' ? includePattern : undefined]: true },
-			excludePattern: { [typeof excludePatternOrDisregardExcludes === 'string' ? excludePatternOrDisregardExcludes : undefined]: true },
 			disregardExcludeSettings: excludePatternOrDisregardExcludes === false,
 			useRipgrep,
 			ignoreSymlinks
 		};
+		if (typeof includePattern === 'string') {
+			query.includePattern = { [includePattern]: true };
+		}
+
+		if (typeof excludePatternOrDisregardExcludes === 'string') {
+			query.excludePattern = { [excludePatternOrDisregardExcludes]: true };
+		}
+
 		this._searchService.extendQuery(query);
 
-		const search = this._searchService.search(query).then(result => {
+		return this._searchService.search(query, token).then(result => {
 			return result.results.map(m => m.resource);
 		}, err => {
 			if (!isPromiseCanceledError(err)) {
@@ -144,22 +166,55 @@ export class MainThreadWorkspace implements MainThreadWorkspaceShape {
 			}
 			return undefined;
 		});
+	}
 
-		this._activeSearches[requestId] = search;
-		const onDone = () => delete this._activeSearches[requestId];
-		search.done(onDone, onDone);
+	$startTextSearch(pattern: IPatternInfo, options: IQueryOptions, requestId: number, token: CancellationToken): Thenable<void> {
+		const workspace = this._contextService.getWorkspace();
+		const folders = workspace.folders.map(folder => folder.uri);
+
+		const queryBuilder = this._instantiationService.createInstance(QueryBuilder);
+		const query = queryBuilder.text(pattern, folders, options);
+
+		const onProgress = (p: ISearchProgressItem) => {
+			if (p.matches) {
+				this._proxy.$handleTextSearchResult(p, requestId);
+			}
+		};
+
+		const search = this._searchService.search(query, token, onProgress).then(
+			() => {
+				return null;
+			},
+			err => {
+				if (!isPromiseCanceledError(err)) {
+					return TPromise.wrapError(err);
+				}
+
+				return undefined;
+			});
 
 		return search;
 	}
 
-	$cancelSearch(requestId: number): Thenable<boolean> {
-		const search = this._activeSearches[requestId];
-		if (search) {
-			delete this._activeSearches[requestId];
-			search.cancel();
-			return TPromise.as(true);
-		}
-		return undefined;
+	$checkExists(includes: string[], token: CancellationToken): Thenable<boolean> {
+		const queryBuilder = this._instantiationService.createInstance(QueryBuilder);
+		const folders = this._contextService.getWorkspace().folders.map(folder => folder.uri);
+		const query = queryBuilder.file(folders, {
+			includePattern: includes.join(', '),
+			exists: true
+		});
+
+		return this._searchService.search(query, token).then(
+			result => {
+				return result.limitHit;
+			},
+			err => {
+				if (!isPromiseCanceledError(err)) {
+					return TPromise.wrapError(err);
+				}
+
+				return undefined;
+			});
 	}
 
 	// --- save & edit resources ---
@@ -170,3 +225,19 @@ export class MainThreadWorkspace implements MainThreadWorkspaceShape {
 		});
 	}
 }
+
+CommandsRegistry.registerCommand('_workbench.enterWorkspace', async function (accessor: ServicesAccessor, workspace: URI, disableExtensions: string[]) {
+	const workspaceEditingService = accessor.get(IWorkspaceEditingService);
+	const extensionService = accessor.get(IExtensionService);
+	const windowService = accessor.get(IWindowService);
+
+	if (disableExtensions && disableExtensions.length) {
+		const runningExtensions = await extensionService.getExtensions();
+		// If requested extension to disable is running, then reload window with given workspace
+		if (disableExtensions && runningExtensions.some(runningExtension => disableExtensions.some(id => areSameExtensions({ id }, { id: runningExtension.id })))) {
+			return windowService.openWindow([URI.file(workspace.fsPath)], { args: { _: [], 'disable-extension': disableExtensions } });
+		}
+	}
+
+	return workspaceEditingService.enterWorkspace(workspace.fsPath);
+});
diff --git a/src/vs/workbench/api/node/apiCommands.ts b/src/vs/workbench/api/node/apiCommands.ts
index 5be2fe4cba7..03dfaf4a9e1 100644
--- a/src/vs/workbench/api/node/apiCommands.ts
+++ b/src/vs/workbench/api/node/apiCommands.ts
@@ -4,12 +4,14 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
+import { isMalformedFileUri } from 'vs/base/common/resources';
 import * as vscode from 'vscode';
 import * as typeConverters from 'vs/workbench/api/node/extHostTypeConverters';
 import { CommandsRegistry, ICommandService, ICommandHandler } from 'vs/platform/commands/common/commands';
 import { ITextEditorOptions } from 'vs/platform/editor/common/editor';
 import { EditorViewColumn } from 'vs/workbench/api/shared/editor';
+import { EditorGroupLayout } from 'vs/workbench/services/group/common/editorGroupsService';
 
 // -----------------------------------------------------------------
 // The following commands are registered on both sides separately.
@@ -47,8 +49,14 @@ export class OpenFolderAPICommand {
 		if (!uri) {
 			return executor.executeCommand('_files.pickFolderAndOpen', forceNewWindow);
 		}
+		let correctedUri = isMalformedFileUri(uri);
+		if (correctedUri) {
+			// workaround for #55916 and #55891, will be removed in 1.28
+			console.warn(`'vscode.openFolder' command invoked with an invalid URI (file:// scheme missing): '${uri}'. Converted to a 'file://' URI: ${correctedUri}`);
+			uri = correctedUri;
+		}
 
-		return executor.executeCommand('_files.windowOpen', [uri.fsPath], forceNewWindow);
+		return executor.executeCommand('_files.windowOpen', [uri], forceNewWindow);
 	}
 }
 CommandsRegistry.registerCommand(OpenFolderAPICommand.ID, adjustHandler(OpenFolderAPICommand.execute));
@@ -98,3 +106,11 @@ export class RemoveFromRecentlyOpenedAPICommand {
 	}
 }
 CommandsRegistry.registerCommand(RemoveFromRecentlyOpenedAPICommand.ID, adjustHandler(RemoveFromRecentlyOpenedAPICommand.execute));
+
+export class SetEditorLayoutAPICommand {
+	public static ID = 'vscode.setEditorLayout';
+	public static execute(executor: ICommandsExecutor, layout: EditorGroupLayout): Thenable<any> {
+		return executor.executeCommand('layoutEditorGroups', layout);
+	}
+}
+CommandsRegistry.registerCommand(SetEditorLayoutAPICommand.ID, adjustHandler(SetEditorLayoutAPICommand.execute));
\ No newline at end of file
diff --git a/src/vs/workbench/api/node/extHost.api.impl.ts b/src/vs/workbench/api/node/extHost.api.impl.ts
index 74de308b1c0..d445d204876 100644
--- a/src/vs/workbench/api/node/extHost.api.impl.ts
+++ b/src/vs/workbench/api/node/extHost.api.impl.ts
@@ -37,7 +37,7 @@ import { ExtHostTask } from 'vs/workbench/api/node/extHostTask';
 import { ExtHostDebugService } from 'vs/workbench/api/node/extHostDebugService';
 import { ExtHostWindow } from 'vs/workbench/api/node/extHostWindow';
 import * as extHostTypes from 'vs/workbench/api/node/extHostTypes';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import Severity from 'vs/base/common/severity';
 import { IExtensionDescription } from 'vs/workbench/services/extensions/common/extensions';
 import { ExtHostExtensionService } from 'vs/workbench/api/node/extHostExtensionService';
@@ -46,7 +46,7 @@ import { CancellationTokenSource } from 'vs/base/common/cancellation';
 import * as vscode from 'vscode';
 import * as paths from 'vs/base/common/paths';
 import * as files from 'vs/platform/files/common/files';
-import { MainContext, ExtHostContext, IInitData, IExtHostContext } from './extHost.protocol';
+import { MainContext, ExtHostContext, IInitData, IMainContext } from './extHost.protocol';
 import * as languageConfiguration from 'vs/editor/common/modes/languageConfiguration';
 import { TextEditorCursorStyle } from 'vs/editor/common/config/editorOptions';
 import { ProxyIdentifier } from 'vs/workbench/services/extensions/node/proxyIdentifier';
@@ -61,6 +61,7 @@ import { ExtHostWebviews } from 'vs/workbench/api/node/extHostWebview';
 import { ExtHostComments } from './extHostComments';
 import { ExtHostSearch } from './extHostSearch';
 import { ExtHostUrls } from './extHostUrls';
+import { localize } from 'vs/nls';
 
 export interface IExtensionApiFactory {
 	(extension: IExtensionDescription): typeof vscode;
@@ -80,7 +81,7 @@ function proposedApiFunction<T>(extension: IExtensionDescription, fn: T): T {
 	if (extension.enableProposedApi) {
 		return fn;
 	} else {
-		return <any>throwProposedApiError;
+		return throwProposedApiError.bind(null, extension);
 	}
 }
 
@@ -89,7 +90,7 @@ function proposedApiFunction<T>(extension: IExtensionDescription, fn: T): T {
  */
 export function createApiFactory(
 	initData: IInitData,
-	rpcProtocol: IExtHostContext,
+	rpcProtocol: IMainContext,
 	extHostWorkspace: ExtHostWorkspace,
 	extHostConfiguration: ExtHostConfiguration,
 	extensionService: ExtHostExtensionService,
@@ -110,16 +111,16 @@ export function createApiFactory(
 	const extHostDocumentSaveParticipant = rpcProtocol.set(ExtHostContext.ExtHostDocumentSaveParticipant, new ExtHostDocumentSaveParticipant(extHostLogService, extHostDocuments, rpcProtocol.getProxy(MainContext.MainThreadTextEditors)));
 	const extHostEditors = rpcProtocol.set(ExtHostContext.ExtHostEditors, new ExtHostEditors(rpcProtocol, extHostDocumentsAndEditors));
 	const extHostCommands = rpcProtocol.set(ExtHostContext.ExtHostCommands, new ExtHostCommands(rpcProtocol, extHostHeapService, extHostLogService));
-	const extHostTreeViews = rpcProtocol.set(ExtHostContext.ExtHostTreeViews, new ExtHostTreeViews(rpcProtocol.getProxy(MainContext.MainThreadTreeViews), extHostCommands));
+	const extHostTreeViews = rpcProtocol.set(ExtHostContext.ExtHostTreeViews, new ExtHostTreeViews(rpcProtocol.getProxy(MainContext.MainThreadTreeViews), extHostCommands, extHostLogService));
 	rpcProtocol.set(ExtHostContext.ExtHostWorkspace, extHostWorkspace);
-	const extHostDebugService = rpcProtocol.set(ExtHostContext.ExtHostDebugService, new ExtHostDebugService(rpcProtocol, extHostWorkspace, extensionService, extHostDocumentsAndEditors, extHostConfiguration));
 	rpcProtocol.set(ExtHostContext.ExtHostConfiguration, extHostConfiguration);
 	const extHostDiagnostics = rpcProtocol.set(ExtHostContext.ExtHostDiagnostics, new ExtHostDiagnostics(rpcProtocol));
-	const extHostLanguageFeatures = rpcProtocol.set(ExtHostContext.ExtHostLanguageFeatures, new ExtHostLanguageFeatures(rpcProtocol, schemeTransformer, extHostDocuments, extHostCommands, extHostHeapService, extHostDiagnostics));
+	const extHostLanguageFeatures = rpcProtocol.set(ExtHostContext.ExtHostLanguageFeatures, new ExtHostLanguageFeatures(rpcProtocol, schemeTransformer, extHostDocuments, extHostCommands, extHostHeapService, extHostDiagnostics, extHostLogService));
 	const extHostFileSystem = rpcProtocol.set(ExtHostContext.ExtHostFileSystem, new ExtHostFileSystem(rpcProtocol, extHostLanguageFeatures));
-	const extHostFileSystemEvent = rpcProtocol.set(ExtHostContext.ExtHostFileSystemEventService, new ExtHostFileSystemEventService());
+	const extHostFileSystemEvent = rpcProtocol.set(ExtHostContext.ExtHostFileSystemEventService, new ExtHostFileSystemEventService(rpcProtocol, extHostDocumentsAndEditors));
 	const extHostQuickOpen = rpcProtocol.set(ExtHostContext.ExtHostQuickOpen, new ExtHostQuickOpen(rpcProtocol, extHostWorkspace, extHostCommands));
 	const extHostTerminalService = rpcProtocol.set(ExtHostContext.ExtHostTerminalService, new ExtHostTerminalService(rpcProtocol, extHostConfiguration, extHostLogService));
+	const extHostDebugService = rpcProtocol.set(ExtHostContext.ExtHostDebugService, new ExtHostDebugService(rpcProtocol, extHostWorkspace, extensionService, extHostDocumentsAndEditors, extHostConfiguration, extHostTerminalService));
 	const extHostSCM = rpcProtocol.set(ExtHostContext.ExtHostSCM, new ExtHostSCM(rpcProtocol, extHostCommands, extHostLogService));
 	const extHostSearch = rpcProtocol.set(ExtHostContext.ExtHostSearch, new ExtHostSearch(rpcProtocol, schemeTransformer));
 	const extHostTask = rpcProtocol.set(ExtHostContext.ExtHostTask, new ExtHostTask(rpcProtocol, extHostWorkspace, extHostDocumentsAndEditors, extHostConfiguration));
@@ -136,9 +137,12 @@ export function createApiFactory(
 	const extHostMessageService = new ExtHostMessageService(rpcProtocol);
 	const extHostDialogs = new ExtHostDialogs(rpcProtocol);
 	const extHostStatusBar = new ExtHostStatusBar(rpcProtocol);
-	const extHostOutputService = new ExtHostOutputService(rpcProtocol);
+	const extHostOutputService = new ExtHostOutputService(initData.logsLocation, rpcProtocol);
 	const extHostLanguages = new ExtHostLanguages(rpcProtocol);
 
+	// Register an output channel for exthost log
+	extHostOutputService.createOutputChannelFromLogFile(localize('extensionsLog', "Extension Host"), extHostLogService.logFile);
+
 	// Register API-ish commands
 	ExtHostApiCommands.register(extHostCommands);
 
@@ -226,8 +230,15 @@ export function createApiFactory(
 			get sessionId() { return initData.telemetryInfo.sessionId; },
 			get language() { return platform.language; },
 			get appName() { return product.nameLong; },
-			get appRoot() { return initData.environment.appRoot; },
-			get logLevel() { return extHostLogService.getLevel(); }
+			get appRoot() { return initData.environment.appRoot.fsPath; },
+			get logLevel() {
+				checkProposedApiEnabled(extension);
+				return extHostLogService.getLevel();
+			},
+			get onDidChangeLogLevel() {
+				checkProposedApiEnabled(extension);
+				return extHostLogService.onDidChangeLogLevel;
+			}
 		});
 
 		// namespace: extensions
@@ -255,14 +266,18 @@ export function createApiFactory(
 			getDiagnostics: (resource?: vscode.Uri) => {
 				return <any>extHostDiagnostics.getDiagnostics(resource);
 			},
-			getLanguages(): TPromise<string[]> {
+			getLanguages(): Thenable<string[]> {
 				return extHostLanguages.getLanguages();
 			},
+			changeLanguage(document: vscode.TextDocument, languageId: string): Thenable<void> {
+				checkProposedApiEnabled(extension);
+				return extHostLanguages.changeLanguage(document.uri, languageId);
+			},
 			match(selector: vscode.DocumentSelector, document: vscode.TextDocument): number {
 				return score(typeConverters.LanguageSelector.from(selector), document.uri, document.languageId, true);
 			},
 			registerCodeActionsProvider(selector: vscode.DocumentSelector, provider: vscode.CodeActionProvider, metadata?: vscode.CodeActionProviderMetadata): vscode.Disposable {
-				return extHostLanguageFeatures.registerCodeActionProvider(checkSelector(selector), provider, metadata);
+				return extHostLanguageFeatures.registerCodeActionProvider(checkSelector(selector), provider, extension, metadata);
 			},
 			registerCodeLensProvider(selector: vscode.DocumentSelector, provider: vscode.CodeLensProvider): vscode.Disposable {
 				return extHostLanguageFeatures.registerCodeLensProvider(checkSelector(selector), provider);
@@ -289,7 +304,7 @@ export function createApiFactory(
 				return extHostLanguageFeatures.registerRenameProvider(checkSelector(selector), provider);
 			},
 			registerDocumentSymbolProvider(selector: vscode.DocumentSelector, provider: vscode.DocumentSymbolProvider): vscode.Disposable {
-				return extHostLanguageFeatures.registerDocumentSymbolProvider(checkSelector(selector), provider, extension.id);
+				return extHostLanguageFeatures.registerDocumentSymbolProvider(checkSelector(selector), provider, extension);
 			},
 			registerWorkspaceSymbolProvider(provider: vscode.WorkspaceSymbolProvider): vscode.Disposable {
 				return extHostLanguageFeatures.registerWorkspaceSymbolProvider(provider);
@@ -331,10 +346,13 @@ export function createApiFactory(
 			get visibleTextEditors() {
 				return extHostEditors.getVisibleTextEditors();
 			},
-			get terminals() {
-				return proposedApiFunction(extension, extHostTerminalService.terminals);
+			get activeTerminal() {
+				return proposedApiFunction(extension, extHostTerminalService.activeTerminal);
 			},
-			showTextDocument(documentOrUri: vscode.TextDocument | vscode.Uri, columnOrOptions?: vscode.ViewColumn | vscode.TextDocumentShowOptions, preserveFocus?: boolean): TPromise<vscode.TextEditor> {
+			get terminals() {
+				return extHostTerminalService.terminals;
+			},
+			showTextDocument(documentOrUri: vscode.TextDocument | vscode.Uri, columnOrOptions?: vscode.ViewColumn | vscode.TextDocumentShowOptions, preserveFocus?: boolean): Thenable<vscode.TextEditor> {
 				let documentPromise: TPromise<vscode.TextDocument>;
 				if (URI.isUri(documentOrUri)) {
 					documentPromise = TPromise.wrap(workspace.openTextDocument(documentOrUri));
@@ -369,8 +387,11 @@ export function createApiFactory(
 			onDidCloseTerminal(listener, thisArg?, disposables?) {
 				return extHostTerminalService.onDidCloseTerminal(listener, thisArg, disposables);
 			},
-			onDidOpenTerminal: proposedApiFunction(extension, (listener, thisArg?, disposables?) => {
+			onDidOpenTerminal(listener, thisArg?, disposables?) {
 				return extHostTerminalService.onDidOpenTerminal(listener, thisArg, disposables);
+			},
+			onDidChangeActiveTerminal: proposedApiFunction(extension, (listener, thisArg?, disposables?) => {
+				return extHostTerminalService.onDidChangeActiveTerminal(listener, thisArg, disposables);
 			}),
 			get state() {
 				return extHostWindow.state;
@@ -388,13 +409,13 @@ export function createApiFactory(
 				return extHostMessageService.showMessage(extension, Severity.Error, message, first, rest);
 			},
 			showQuickPick(items: any, options: vscode.QuickPickOptions, token?: vscode.CancellationToken): any {
-				return extHostQuickOpen.showQuickPick(undefined, items, options, token);
+				return extHostQuickOpen.showQuickPick(items, options, token);
 			},
 			showWorkspaceFolderPick(options: vscode.WorkspaceFolderPickOptions) {
 				return extHostQuickOpen.showWorkspaceFolderPick(options);
 			},
 			showInputBox(options?: vscode.InputBoxOptions, token?: vscode.CancellationToken) {
-				return extHostQuickOpen.showInput(undefined, options, token);
+				return extHostQuickOpen.showInput(options, token);
 			},
 			showOpenDialog(options) {
 				return extHostDialogs.showOpenDialog(options);
@@ -415,11 +436,11 @@ export function createApiFactory(
 			withProgress<R>(options: vscode.ProgressOptions, task: (progress: vscode.Progress<{ message?: string; worked?: number }>, token: vscode.CancellationToken) => Thenable<R>) {
 				return extHostProgress.withProgress(extension, options, task);
 			},
-			createOutputChannel(name: string): vscode.OutputChannel {
-				return extHostOutputService.createOutputChannel(name);
+			createOutputChannel(name: string, push?: boolean): vscode.OutputChannel {
+				return extHostOutputService.createOutputChannel(name, push);
 			},
 			createWebviewPanel(viewType: string, title: string, showOptions: vscode.ViewColumn | { viewColumn: vscode.ViewColumn, preserveFocus?: boolean }, options: vscode.WebviewPanelOptions & vscode.WebviewOptions): vscode.WebviewPanel {
-				return extHostWebviews.createWebview(viewType, title, showOptions, options, extension.extensionLocation);
+				return extHostWebviews.createWebview(extension.extensionLocation, viewType, title, showOptions, options);
 			},
 			createTerminal(nameOrOptions: vscode.TerminalOptions | string, shellPath?: string, shellArgs?: string[]): vscode.Terminal {
 				if (typeof nameOrOptions === 'object') {
@@ -427,12 +448,18 @@ export function createApiFactory(
 				}
 				return extHostTerminalService.createTerminal(<string>nameOrOptions, shellPath, shellArgs);
 			},
+			createTerminalRenderer: proposedApiFunction(extension, (name: string) => {
+				return extHostTerminalService.createTerminalRenderer(name);
+			}),
 			registerTreeDataProvider(viewId: string, treeDataProvider: vscode.TreeDataProvider<any>): vscode.Disposable {
 				return extHostTreeViews.registerTreeDataProvider(viewId, treeDataProvider);
 			},
 			createTreeView(viewId: string, options: { treeDataProvider: vscode.TreeDataProvider<any> }): vscode.TreeView<any> {
 				return extHostTreeViews.createTreeView(viewId, options);
 			},
+			registerWebviewPanelSerializer: (viewType: string, serializer: vscode.WebviewPanelSerializer) => {
+				return extHostWebviews.registerWebviewPanelSerializer(viewType, serializer);
+			},
 			// proposed API
 			sampleFunction: proposedApiFunction(extension, () => {
 				return extHostMessageService.showMessage(extension, Severity.Info, 'Hello Proposed Api!', {}, []);
@@ -440,12 +467,15 @@ export function createApiFactory(
 			registerDecorationProvider: proposedApiFunction(extension, (provider: vscode.DecorationProvider) => {
 				return extHostDecorations.registerDecorationProvider(provider, extension.id);
 			}),
-			registerWebviewPanelSerializer: proposedApiFunction(extension, (viewType: string, serializer: vscode.WebviewPanelSerializer) => {
-				return extHostWebviews.registerWebviewPanelSerializer(viewType, serializer);
-			}),
-			registerProtocolHandler: proposedApiFunction(extension, (handler: vscode.ProtocolHandler) => {
-				return extHostUrls.registerProtocolHandler(extension.id, handler);
-			})
+			registerUriHandler(handler: vscode.UriHandler) {
+				return extHostUrls.registerUriHandler(extension.id, handler);
+			},
+			createQuickPick<T extends vscode.QuickPickItem>(): vscode.QuickPick<T> {
+				return extHostQuickOpen.createQuickPick(extension.id);
+			},
+			createInputBox(): vscode.InputBox {
+				return extHostQuickOpen.createInputBox(extension.id);
+			},
 		};
 
 		// namespace: workspace
@@ -463,7 +493,7 @@ export function createApiFactory(
 				return extHostWorkspace.getWorkspaceFolders();
 			},
 			get name() {
-				return extHostWorkspace.workspace ? extHostWorkspace.workspace.name : undefined;
+				return extHostWorkspace.name;
 			},
 			set name(value) {
 				throw errors.readonly();
@@ -480,10 +510,25 @@ export function createApiFactory(
 			findFiles: (include, exclude, maxResults?, token?) => {
 				return extHostWorkspace.findFiles(typeConverters.GlobPattern.from(include), typeConverters.GlobPattern.from(exclude), maxResults, extension.id, token);
 			},
+			findTextInFiles: (query: vscode.TextSearchQuery, optionsOrCallback, callbackOrToken?, token?: vscode.CancellationToken) => {
+				let options: vscode.FindTextInFilesOptions;
+				let callback: (result: vscode.TextSearchResult) => void;
+
+				if (typeof optionsOrCallback === 'object') {
+					options = optionsOrCallback;
+					callback = callbackOrToken;
+				} else {
+					options = {};
+					callback = optionsOrCallback;
+					token = callbackOrToken;
+				}
+
+				return extHostWorkspace.findTextInFiles(query, options || {}, callback, extension.id, token);
+			},
 			saveAll: (includeUntitled?) => {
 				return extHostWorkspace.saveAll(includeUntitled);
 			},
-			applyEdit(edit: vscode.WorkspaceEdit): TPromise<boolean> {
+			applyEdit(edit: vscode.WorkspaceEdit): Thenable<boolean> {
 				return extHostEditors.applyWorkspaceEdit(edit);
 			},
 			createFileSystemWatcher: (pattern, ignoreCreate, ignoreChange, ignoreDelete): vscode.FileSystemWatcher => {
@@ -496,7 +541,7 @@ export function createApiFactory(
 				throw errors.readonly();
 			},
 			openTextDocument(uriOrFileNameOrOptions?: vscode.Uri | string | { language?: string; content?: string; }) {
-				let uriPromise: TPromise<URI>;
+				let uriPromise: Thenable<URI>;
 
 				let options = uriOrFileNameOrOptions as { language?: string; content?: string; };
 				if (typeof uriOrFileNameOrOptions === 'string') {
@@ -547,8 +592,18 @@ export function createApiFactory(
 			registerFileSystemProvider(scheme, provider, options) {
 				return extHostFileSystem.registerFileSystemProvider(scheme, provider, options);
 			},
-			registerSearchProvider: proposedApiFunction(extension, (scheme, provider) => {
-				return extHostSearch.registerSearchProvider(scheme, provider);
+			registerFileSearchProvider: proposedApiFunction(extension, (scheme, provider) => {
+				return extHostSearch.registerFileSearchProvider(scheme, provider);
+			}),
+			registerSearchProvider: proposedApiFunction(extension, () => {
+				// Temp for live share in Insiders
+				return { dispose: () => { } };
+			}),
+			registerTextSearchProvider: proposedApiFunction(extension, (scheme, provider) => {
+				return extHostSearch.registerTextSearchProvider(scheme, provider);
+			}),
+			registerFileIndexProvider: proposedApiFunction(extension, (scheme, provider) => {
+				return extHostSearch.registerFileIndexProvider(scheme, provider);
 			}),
 			registerDocumentCommentProvider: proposedApiFunction(extension, (provider: vscode.DocumentCommentProvider) => {
 				return exthostCommentProviders.registerDocumentCommentProvider(provider);
@@ -556,8 +611,11 @@ export function createApiFactory(
 			registerWorkspaceCommentProvider: proposedApiFunction(extension, (provider: vscode.WorkspaceCommentProvider) => {
 				return exthostCommentProviders.registerWorkspaceCommentProvider(provider);
 			}),
-			onDidRenameResource: proposedApiFunction(extension, (listener, thisArg?, disposables?) => {
-				return extHostDocuments.onDidRenameResource(listener, thisArg, disposables);
+			onDidRenameFile: proposedApiFunction(extension, (listener, thisArg?, disposables?) => {
+				return extHostFileSystemEvent.onDidRenameFile(listener, thisArg, disposables);
+			}),
+			onWillRenameFile: proposedApiFunction(extension, (listener, thisArg?, disposables?) => {
+				return extHostFileSystemEvent.getOnWillRenameFileEvent(extension)(listener, thisArg, disposables);
 			})
 		};
 
@@ -642,39 +700,48 @@ export function createApiFactory(
 			version: pkg.version,
 			// namespaces
 			commands,
+			debug,
 			env,
 			extensions,
 			languages,
+			scm,
+			tasks,
 			window,
 			workspace,
-			scm,
-			debug,
-			tasks,
 			// types
 			Breakpoint: extHostTypes.Breakpoint,
 			CancellationTokenSource: CancellationTokenSource,
 			CodeAction: extHostTypes.CodeAction,
 			CodeActionKind: extHostTypes.CodeActionKind,
+			CodeActionTrigger: extHostTypes.CodeActionTrigger,
 			CodeLens: extHostTypes.CodeLens,
 			Color: extHostTypes.Color,
-			ColorPresentation: extHostTypes.ColorPresentation,
 			ColorInformation: extHostTypes.ColorInformation,
-			CodeActionTrigger: extHostTypes.CodeActionTrigger,
-			EndOfLine: extHostTypes.EndOfLine,
+			ColorPresentation: extHostTypes.ColorPresentation,
+			CommentThreadCollapsibleState: extHostTypes.CommentThreadCollapsibleState,
 			CompletionItem: extHostTypes.CompletionItem,
 			CompletionItemKind: extHostTypes.CompletionItemKind,
 			CompletionList: extHostTypes.CompletionList,
 			CompletionTriggerKind: extHostTypes.CompletionTriggerKind,
+			ConfigurationTarget: extHostTypes.ConfigurationTarget,
 			DebugAdapterExecutable: extHostTypes.DebugAdapterExecutable,
+			DecorationRangeBehavior: extHostTypes.DecorationRangeBehavior,
 			Diagnostic: extHostTypes.Diagnostic,
 			DiagnosticRelatedInformation: extHostTypes.DiagnosticRelatedInformation,
-			DiagnosticTag: extHostTypes.DiagnosticTag,
 			DiagnosticSeverity: extHostTypes.DiagnosticSeverity,
+			DiagnosticTag: extHostTypes.DiagnosticTag,
 			Disposable: extHostTypes.Disposable,
 			DocumentHighlight: extHostTypes.DocumentHighlight,
 			DocumentHighlightKind: extHostTypes.DocumentHighlightKind,
 			DocumentLink: extHostTypes.DocumentLink,
+			DocumentSymbol: extHostTypes.DocumentSymbol,
+			EndOfLine: extHostTypes.EndOfLine,
 			EventEmitter: Emitter,
+			FileChangeType: extHostTypes.FileChangeType,
+			FileSystemError: extHostTypes.FileSystemError,
+			FileType: files.FileType,
+			FoldingRange: extHostTypes.FoldingRange,
+			FoldingRangeKind: extHostTypes.FoldingRangeKind,
 			FunctionBreakpoint: extHostTypes.FunctionBreakpoint,
 			Hover: extHostTypes.Hover,
 			IndentAction: languageConfiguration.IndentAction,
@@ -684,60 +751,58 @@ export function createApiFactory(
 			OverviewRulerLane: OverviewRulerLane,
 			ParameterInformation: extHostTypes.ParameterInformation,
 			Position: extHostTypes.Position,
+			ProcessExecution: extHostTypes.ProcessExecution,
+			ProgressLocation: extHostTypes.ProgressLocation,
+			QuickInputButtons: extHostTypes.QuickInputButtons,
 			Range: extHostTypes.Range,
+			RelativePattern: extHostTypes.RelativePattern,
 			Selection: extHostTypes.Selection,
+			ShellExecution: extHostTypes.ShellExecution,
+			ShellQuoting: extHostTypes.ShellQuoting,
+			SignatureHelpTriggerReason: extHostTypes.SignatureHelpTriggerReason,
 			SignatureHelp: extHostTypes.SignatureHelp,
 			SignatureInformation: extHostTypes.SignatureInformation,
 			SnippetString: extHostTypes.SnippetString,
 			SourceBreakpoint: extHostTypes.SourceBreakpoint,
+			SourceControlInputBoxValidationType: extHostTypes.SourceControlInputBoxValidationType,
 			StatusBarAlignment: extHostTypes.StatusBarAlignment,
 			SymbolInformation: extHostTypes.SymbolInformation,
-			SymbolInformation2: class extends extHostTypes.SymbolInformation2 {
-				constructor(name, kind, containerName, location) {
-					checkProposedApiEnabled(extension);
-					super(name, kind, containerName, location);
-				}
-			},
 			SymbolKind: extHostTypes.SymbolKind,
-			SourceControlInputBoxValidationType: extHostTypes.SourceControlInputBoxValidationType,
+			Task: extHostTypes.Task,
+			TaskGroup: extHostTypes.TaskGroup,
+			TaskPanelKind: extHostTypes.TaskPanelKind,
+			TaskRevealKind: extHostTypes.TaskRevealKind,
+			TaskScope: extHostTypes.TaskScope,
 			TextDocumentSaveReason: extHostTypes.TextDocumentSaveReason,
 			TextEdit: extHostTypes.TextEdit,
 			TextEditorCursorStyle: TextEditorCursorStyle,
 			TextEditorLineNumbersStyle: extHostTypes.TextEditorLineNumbersStyle,
 			TextEditorRevealType: extHostTypes.TextEditorRevealType,
 			TextEditorSelectionChangeKind: extHostTypes.TextEditorSelectionChangeKind,
-			DecorationRangeBehavior: extHostTypes.DecorationRangeBehavior,
+			ThemeColor: extHostTypes.ThemeColor,
+			ThemeIcon: extHostTypes.ThemeIcon,
+			TreeItem: extHostTypes.TreeItem,
+			TreeItemCollapsibleState: extHostTypes.TreeItemCollapsibleState,
 			Uri: URI,
 			ViewColumn: extHostTypes.ViewColumn,
 			WorkspaceEdit: extHostTypes.WorkspaceEdit,
-			ProgressLocation: extHostTypes.ProgressLocation,
-			TreeItemCollapsibleState: extHostTypes.TreeItemCollapsibleState,
-			ThemeIcon: extHostTypes.ThemeIcon,
-			TreeItem: extHostTypes.TreeItem,
-			ThemeColor: extHostTypes.ThemeColor,
 			// functions
-			TaskRevealKind: extHostTypes.TaskRevealKind,
-			TaskPanelKind: extHostTypes.TaskPanelKind,
-			TaskGroup: extHostTypes.TaskGroup,
-			ProcessExecution: extHostTypes.ProcessExecution,
-			ShellExecution: extHostTypes.ShellExecution,
-			ShellQuoting: extHostTypes.ShellQuoting,
-			TaskScope: extHostTypes.TaskScope,
-			Task: extHostTypes.Task,
-			ConfigurationTarget: extHostTypes.ConfigurationTarget,
-			RelativePattern: extHostTypes.RelativePattern,
-
-			FileChangeType: extHostTypes.FileChangeType,
-			FileType: files.FileType,
-			FileSystemError: extHostTypes.FileSystemError,
-			FoldingRange: extHostTypes.FoldingRange,
-			FoldingRangeKind: extHostTypes.FoldingRangeKind,
-
-			CommentThreadCollapsibleState: extHostTypes.CommentThreadCollapsibleState
 		};
 	};
 }
 
+/**
+ * Returns the original fs path (using the original casing for the drive letter)
+ */
+export function originalFSPath(uri: URI): string {
+	const result = uri.fsPath;
+	if (/^[a-zA-Z]:/.test(result) && uri.path.charAt(1).toLowerCase() === result.charAt(0)) {
+		// Restore original drive letter casing
+		return uri.path.charAt(1) + result.substr(1);
+	}
+	return result;
+}
+
 class Extension<T> implements vscode.Extension<T> {
 
 	private _extensionService: ExtHostExtensionService;
@@ -749,7 +814,7 @@ class Extension<T> implements vscode.Extension<T> {
 	constructor(extensionService: ExtHostExtensionService, description: IExtensionDescription) {
 		this._extensionService = extensionService;
 		this.id = description.id;
-		this.extensionPath = paths.normalize(description.extensionLocation.fsPath, true);
+		this.extensionPath = paths.normalize(originalFSPath(description.extensionLocation), true);
 		this.packageJSON = description;
 	}
 
@@ -796,7 +861,9 @@ function defineAPI(factory: IExtensionApiFactory, extensionPaths: TernarySearchT
 
 		// fall back to a default implementation
 		if (!defaultApiImpl) {
-			console.warn(`Could not identify extension for 'vscode' require call from ${parent.filename}`);
+			let extensionPathsPretty = '';
+			extensionPaths.forEach((value, index) => extensionPathsPretty += `\t${index} -> ${value.id}\n`);
+			console.warn(`Could not identify extension for 'vscode' require call from ${parent.filename}. These are the extension path mappings: \n${extensionPathsPretty}`);
 			defaultApiImpl = factory(nullExtensionDescription);
 		}
 		return defaultApiImpl;
diff --git a/src/vs/workbench/api/node/extHost.protocol.ts b/src/vs/workbench/api/node/extHost.protocol.ts
index 3f9aa8b3f94..002f815ac7b 100644
--- a/src/vs/workbench/api/node/extHost.protocol.ts
+++ b/src/vs/workbench/api/node/extHost.protocol.ts
@@ -4,58 +4,50 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import { createMainContextProxyIdentifier as createMainId, createExtHostContextProxyIdentifier as createExtId, ProxyIdentifier, IRPCProtocol } from 'vs/workbench/services/extensions/node/proxyIdentifier';
-
-import * as vscode from 'vscode';
-
-import URI, { UriComponents } from 'vs/base/common/uri';
+import { SerializedError } from 'vs/base/common/errors';
+import { IDisposable } from 'vs/base/common/lifecycle';
 import Severity from 'vs/base/common/severity';
-import { TPromise } from 'vs/base/common/winjs.base';
-
-import { IMarkerData } from 'vs/platform/markers/common/markers';
-import { EditorViewColumn } from 'vs/workbench/api/shared/editor';
-import { IExtensionDescription } from 'vs/workbench/services/extensions/common/extensions';
-import { StatusbarAlignment as MainThreadStatusBarAlignment } from 'vs/platform/statusbar/common/statusbar';
-import { ITelemetryInfo } from 'vs/platform/telemetry/common/telemetry';
-import { ICommandHandlerDescription } from 'vs/platform/commands/common/commands';
-import { IProgressOptions, IProgressStep } from 'vs/platform/progress/common/progress';
-
-import * as editorCommon from 'vs/editor/common/editorCommon';
-import * as modes from 'vs/editor/common/modes';
-
-import { IConfigurationData, ConfigurationTarget, IConfigurationModel } from 'vs/platform/configuration/common/configuration';
-import { IConfig, IAdapterExecutable, ITerminalSettings } from 'vs/workbench/parts/debug/common/debug';
-
-import { IPickOpenEntry, IPickOptions } from 'vs/platform/quickinput/common/quickInput';
-import { SaveReason } from 'vs/workbench/services/textfile/common/textfiles';
+import { URI, UriComponents } from 'vs/base/common/uri';
 import { TextEditorCursorStyle } from 'vs/editor/common/config/editorOptions';
-import { EndOfLine, TextEditorLineNumbersStyle } from 'vs/workbench/api/node/extHostTypes';
-
-
-import { TaskSet } from 'vs/workbench/parts/tasks/common/tasks';
-import { IModelChangedEvent } from 'vs/editor/common/model/mirrorTextModel';
 import { IPosition } from 'vs/editor/common/core/position';
 import { IRange } from 'vs/editor/common/core/range';
 import { ISelection, Selection } from 'vs/editor/common/core/selection';
-
-import { ITreeItem } from 'vs/workbench/common/views';
-import { ThemeColor } from 'vs/platform/theme/common/themeService';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { SerializedError } from 'vs/base/common/errors';
-import { IStat, FileChangeType, IWatchOptions, FileSystemProviderCapabilities, FileWriteOptions, FileType, FileOverwriteOptions } from 'vs/platform/files/common/files';
-import { ConfigurationScope } from 'vs/platform/configuration/common/configurationRegistry';
-import { CommentRule, CharacterPair, EnterAction } from 'vs/editor/common/modes/languageConfiguration';
+import * as editorCommon from 'vs/editor/common/editorCommon';
 import { ISingleEditOperation } from 'vs/editor/common/model';
-import { IPatternInfo, IRawSearchQuery, IRawFileMatch2, ISearchCompleteStats } from 'vs/platform/search/common/search';
+import { IModelChangedEvent } from 'vs/editor/common/model/mirrorTextModel';
+import * as modes from 'vs/editor/common/modes';
+import { CharacterPair, CommentRule, EnterAction } from 'vs/editor/common/modes/languageConfiguration';
+import { ICommandHandlerDescription } from 'vs/platform/commands/common/commands';
+import { ConfigurationTarget, IConfigurationData, IConfigurationModel } from 'vs/platform/configuration/common/configuration';
+import { ConfigurationScope } from 'vs/platform/configuration/common/configurationRegistry';
+import { FileChangeType, FileDeleteOptions, FileOverwriteOptions, FileSystemProviderCapabilities, FileType, FileWriteOptions, IStat, IWatchOptions } from 'vs/platform/files/common/files';
+import { LabelRules } from 'vs/platform/label/common/label';
 import { LogLevel } from 'vs/platform/log/common/log';
-import { TaskExecutionDTO, TaskDTO, TaskHandleDTO, TaskFilterDTO, TaskProcessStartedDTO, TaskProcessEndedDTO, TaskSystemInfoDTO } from 'vs/workbench/api/shared/tasks';
+import { IMarkerData } from 'vs/platform/markers/common/markers';
+import { IPickOptions, IQuickInputButton, IQuickPickItem } from 'vs/platform/quickinput/common/quickInput';
+import { IPatternInfo, IQueryOptions, IRawFileMatch2, IRawSearchQuery, ISearchCompleteStats } from 'vs/platform/search/common/search';
+import { StatusbarAlignment as MainThreadStatusBarAlignment } from 'vs/platform/statusbar/common/statusbar';
+import { ITelemetryInfo } from 'vs/platform/telemetry/common/telemetry';
+import { ThemeColor } from 'vs/platform/theme/common/themeService';
+import { EndOfLine, IFileOperationOptions, TextEditorLineNumbersStyle } from 'vs/workbench/api/node/extHostTypes';
+import { EditorViewColumn } from 'vs/workbench/api/shared/editor';
+import { TaskDTO, TaskExecutionDTO, TaskFilterDTO, TaskHandleDTO, TaskProcessEndedDTO, TaskProcessStartedDTO, TaskSystemInfoDTO } from 'vs/workbench/api/shared/tasks';
+import { ITreeItem } from 'vs/workbench/common/views';
+import { IAdapterExecutable, IConfig, ITerminalSettings } from 'vs/workbench/parts/debug/common/debug';
+import { TaskSet } from 'vs/workbench/parts/tasks/common/tasks';
+import { ITerminalDimensions } from 'vs/workbench/parts/terminal/common/terminal';
+import { IExtensionDescription } from 'vs/workbench/services/extensions/common/extensions';
+import { createExtHostContextProxyIdentifier as createExtId, createMainContextProxyIdentifier as createMainId, IRPCProtocol, ProxyIdentifier } from 'vs/workbench/services/extensions/node/proxyIdentifier';
+import { IProgressOptions, IProgressStep } from 'vs/workbench/services/progress/common/progress';
+import { SaveReason } from 'vs/workbench/services/textfile/common/textfiles';
+import * as vscode from 'vscode';
+import { CancellationToken } from 'vs/base/common/cancellation';
 
 export interface IEnvironment {
 	isExtensionDevelopmentDebug: boolean;
-	appRoot: string;
-	appSettingsHome: string;
-	disableExtensions: boolean;
-	extensionDevelopmentPath: string;
+	appRoot: URI;
+	appSettingsHome: URI;
+	extensionDevelopmentLocationURI: URI;
 	extensionTestsPath: string;
 }
 
@@ -73,9 +65,8 @@ export interface IInitData {
 	extensions: IExtensionDescription[];
 	configuration: IConfigurationInitData;
 	telemetryInfo: ITelemetryInfo;
-	windowId: number;
 	logLevel: LogLevel;
-	logsPath: string;
+	logsLocation: URI;
 }
 
 export interface IConfigurationInitData extends IConfigurationData {
@@ -111,8 +102,8 @@ export interface MainThreadCommentsShape extends IDisposable {
 }
 
 export interface MainThreadConfigurationShape extends IDisposable {
-	$updateConfigurationOption(target: ConfigurationTarget, key: string, value: any, resource: UriComponents): TPromise<void>;
-	$removeConfigurationOption(target: ConfigurationTarget, key: string, resource: UriComponents): TPromise<void>;
+	$updateConfigurationOption(target: ConfigurationTarget, key: string, value: any, resource: UriComponents): Thenable<void>;
+	$removeConfigurationOption(target: ConfigurationTarget, key: string, resource: UriComponents): Thenable<void>;
 }
 
 export interface MainThreadDiagnosticsShape extends IDisposable {
@@ -153,9 +144,9 @@ export interface MainThreadDocumentContentProvidersShape extends IDisposable {
 }
 
 export interface MainThreadDocumentsShape extends IDisposable {
-	$tryCreateDocument(options?: { language?: string; content?: string; }): TPromise<UriComponents>;
-	$tryOpenDocument(uri: UriComponents): TPromise<void>;
-	$trySaveDocument(uri: UriComponents): TPromise<boolean>;
+	$tryCreateDocument(options?: { language?: string; content?: string; }): Thenable<UriComponents>;
+	$tryOpenDocument(uri: UriComponents): Thenable<void>;
+	$trySaveDocument(uri: UriComponents): Thenable<boolean>;
 }
 
 export interface ITextEditorConfigurationUpdate {
@@ -196,26 +187,26 @@ export interface ITextDocumentShowOptions {
 }
 
 export interface MainThreadTextEditorsShape extends IDisposable {
-	$tryShowTextDocument(resource: UriComponents, options: ITextDocumentShowOptions): TPromise<string>;
+	$tryShowTextDocument(resource: UriComponents, options: ITextDocumentShowOptions): Thenable<string>;
 	$registerTextEditorDecorationType(key: string, options: editorCommon.IDecorationRenderOptions): void;
 	$removeTextEditorDecorationType(key: string): void;
-	$tryShowEditor(id: string, position: EditorViewColumn): TPromise<void>;
-	$tryHideEditor(id: string): TPromise<void>;
-	$trySetOptions(id: string, options: ITextEditorConfigurationUpdate): TPromise<void>;
-	$trySetDecorations(id: string, key: string, ranges: editorCommon.IDecorationOptions[]): TPromise<void>;
-	$trySetDecorationsFast(id: string, key: string, ranges: number[]): TPromise<void>;
-	$tryRevealRange(id: string, range: IRange, revealType: TextEditorRevealType): TPromise<void>;
-	$trySetSelections(id: string, selections: ISelection[]): TPromise<void>;
-	$tryApplyEdits(id: string, modelVersionId: number, edits: ISingleEditOperation[], opts: IApplyEditsOptions): TPromise<boolean>;
-	$tryApplyWorkspaceEdit(workspaceEditDto: WorkspaceEditDto): TPromise<boolean>;
-	$tryInsertSnippet(id: string, template: string, selections: IRange[], opts: IUndoStopOptions): TPromise<boolean>;
-	$getDiffInformation(id: string): TPromise<editorCommon.ILineChange[]>;
+	$tryShowEditor(id: string, position: EditorViewColumn): Thenable<void>;
+	$tryHideEditor(id: string): Thenable<void>;
+	$trySetOptions(id: string, options: ITextEditorConfigurationUpdate): Thenable<void>;
+	$trySetDecorations(id: string, key: string, ranges: editorCommon.IDecorationOptions[]): Thenable<void>;
+	$trySetDecorationsFast(id: string, key: string, ranges: number[]): Thenable<void>;
+	$tryRevealRange(id: string, range: IRange, revealType: TextEditorRevealType): Thenable<void>;
+	$trySetSelections(id: string, selections: ISelection[]): Thenable<void>;
+	$tryApplyEdits(id: string, modelVersionId: number, edits: ISingleEditOperation[], opts: IApplyEditsOptions): Thenable<boolean>;
+	$tryApplyWorkspaceEdit(workspaceEditDto: WorkspaceEditDto): Thenable<boolean>;
+	$tryInsertSnippet(id: string, template: string, selections: IRange[], opts: IUndoStopOptions): Thenable<boolean>;
+	$getDiffInformation(id: string): Thenable<editorCommon.ILineChange[]>;
 }
 
 export interface MainThreadTreeViewsShape extends IDisposable {
 	$registerTreeViewDataProvider(treeViewId: string): void;
-	$refresh(treeViewId: string, itemsToRefresh?: { [treeItemHandle: string]: ITreeItem }): TPromise<void>;
-	$reveal(treeViewId: string, treeItem: ITreeItem, parentChain: ITreeItem[], options?: { select?: boolean }): TPromise<void>;
+	$refresh(treeViewId: string, itemsToRefresh?: { [treeItemHandle: string]: ITreeItem }): Thenable<void>;
+	$reveal(treeViewId: string, treeItem: ITreeItem, parentChain: ITreeItem[], options: { select: boolean, focus: boolean }): Thenable<void>;
 }
 
 export interface MainThreadErrorsShape extends IDisposable {
@@ -296,7 +287,8 @@ export interface MainThreadLanguageFeaturesShape extends IDisposable {
 }
 
 export interface MainThreadLanguagesShape extends IDisposable {
-	$getLanguages(): TPromise<string[]>;
+	$getLanguages(): Thenable<string[]>;
+	$changeLanguage(resource: UriComponents, languageId: string): Thenable<void>;
 }
 
 export interface MainThreadMessageOptions {
@@ -309,11 +301,12 @@ export interface MainThreadMessageServiceShape extends IDisposable {
 }
 
 export interface MainThreadOutputServiceShape extends IDisposable {
-	$append(channelId: string, label: string, value: string): TPromise<void>;
-	$clear(channelId: string, label: string): TPromise<void>;
-	$dispose(channelId: string, label: string): TPromise<void>;
-	$reveal(channelId: string, label: string, preserveFocus: boolean): TPromise<void>;
-	$close(channelId: string): TPromise<void>;
+	$register(label: string, log: boolean, file?: UriComponents): Thenable<string>;
+	$append(channelId: string, value: string): Thenable<void>;
+	$clear(channelId: string): Thenable<void>;
+	$reveal(channelId: string, preserveFocus: boolean): Thenable<void>;
+	$close(channelId: string): Thenable<void>;
+	$dispose(channelId: string): Thenable<void>;
 }
 
 export interface MainThreadProgressShape extends IDisposable {
@@ -324,28 +317,99 @@ export interface MainThreadProgressShape extends IDisposable {
 }
 
 export interface MainThreadTerminalServiceShape extends IDisposable {
-	$createTerminal(name?: string, shellPath?: string, shellArgs?: string[], cwd?: string, env?: { [key: string]: string }, waitOnExit?: boolean): TPromise<number>;
+	$createTerminal(name?: string, shellPath?: string, shellArgs?: string[], cwd?: string, env?: { [key: string]: string }, waitOnExit?: boolean): Thenable<number>;
+	$createTerminalRenderer(name: string): Thenable<number>;
 	$dispose(terminalId: number): void;
 	$hide(terminalId: number): void;
 	$sendText(terminalId: number, text: string, addNewLine: boolean): void;
 	$show(terminalId: number, preserveFocus: boolean): void;
 	$registerOnDataListener(terminalId: number): void;
 
+	// Process
 	$sendProcessTitle(terminalId: number, title: string): void;
 	$sendProcessData(terminalId: number, data: string): void;
 	$sendProcessPid(terminalId: number, pid: number): void;
 	$sendProcessExit(terminalId: number, exitCode: number): void;
+
+	// Renderer
+	$terminalRendererSetName(terminalId: number, name: string): void;
+	$terminalRendererSetDimensions(terminalId: number, dimensions: ITerminalDimensions): void;
+	$terminalRendererWrite(terminalId: number, text: string): void;
+	$terminalRendererRegisterOnInputListener(terminalId: number): void;
 }
 
-export interface MyQuickPickItems extends IPickOpenEntry {
+export interface TransferQuickPickItems extends IQuickPickItem {
 	handle: number;
 }
+
+export interface TransferQuickInputButton extends IQuickInputButton {
+	handle: number;
+}
+
+export type TransferQuickInput = TransferQuickPick | TransferInputBox;
+
+export interface BaseTransferQuickInput {
+
+	id: number;
+
+	type?: 'quickPick' | 'inputBox';
+
+	enabled?: boolean;
+
+	busy?: boolean;
+
+	visible?: boolean;
+}
+
+export interface TransferQuickPick extends BaseTransferQuickInput {
+
+	type?: 'quickPick';
+
+	value?: string;
+
+	placeholder?: string;
+
+	buttons?: TransferQuickInputButton[];
+
+	items?: TransferQuickPickItems[];
+
+	activeItems?: number[];
+
+	selectedItems?: number[];
+
+	canSelectMany?: boolean;
+
+	ignoreFocusOut?: boolean;
+
+	matchOnDescription?: boolean;
+
+	matchOnDetail?: boolean;
+}
+
+export interface TransferInputBox extends BaseTransferQuickInput {
+
+	type?: 'inputBox';
+
+	value?: string;
+
+	placeholder?: string;
+
+	password?: boolean;
+
+	buttons?: TransferQuickInputButton[];
+
+	prompt?: string;
+
+	validationMessage?: string;
+}
+
 export interface MainThreadQuickOpenShape extends IDisposable {
-	$show(multiStepHandle: number | undefined, options: IPickOptions): TPromise<number | number[]>;
-	$setItems(items: MyQuickPickItems[]): TPromise<any>;
-	$setError(error: Error): TPromise<any>;
-	$input(multiStepHandle: number | undefined, options: vscode.InputBoxOptions, validateInput: boolean): TPromise<string>;
-	$multiStep(handle: number): TPromise<never>;
+	$show(options: IPickOptions<TransferQuickPickItems>, token: CancellationToken): Thenable<number | number[]>;
+	$setItems(items: TransferQuickPickItems[]): Thenable<void>;
+	$setError(error: Error): Thenable<void>;
+	$input(options: vscode.InputBoxOptions, validateInput: boolean, token: CancellationToken): Thenable<string>;
+	$createOrUpdate(params: TransferQuickInput): Thenable<void>;
+	$dispose(id: number): Thenable<void>;
 }
 
 export interface MainThreadStatusBarShape extends IDisposable {
@@ -354,8 +418,8 @@ export interface MainThreadStatusBarShape extends IDisposable {
 }
 
 export interface MainThreadStorageShape extends IDisposable {
-	$getValue<T>(shared: boolean, key: string): TPromise<T>;
-	$setValue(shared: boolean, key: string, value: any): TPromise<void>;
+	$getValue<T>(shared: boolean, key: string): Thenable<T>;
+	$setValue(shared: boolean, key: string, value: any): Thenable<void>;
 }
 
 export interface MainThreadTelemetryShape extends IDisposable {
@@ -364,37 +428,51 @@ export interface MainThreadTelemetryShape extends IDisposable {
 
 export type WebviewPanelHandle = string;
 
+export interface WebviewPanelShowOptions {
+	readonly viewColumn?: EditorViewColumn;
+	readonly preserveFocus?: boolean;
+}
+
 export interface MainThreadWebviewsShape extends IDisposable {
-	$createWebviewPanel(handle: WebviewPanelHandle, viewType: string, title: string, viewOptions: { viewColumn: EditorViewColumn, preserveFocus: boolean }, options: vscode.WebviewPanelOptions & vscode.WebviewOptions, extensionLocation: UriComponents): void;
+	$createWebviewPanel(handle: WebviewPanelHandle, viewType: string, title: string, showOptions: WebviewPanelShowOptions, options: vscode.WebviewPanelOptions & vscode.WebviewOptions, extensionLocation: UriComponents): void;
 	$disposeWebview(handle: WebviewPanelHandle): void;
-	$reveal(handle: WebviewPanelHandle, viewColumn: EditorViewColumn | null, preserveFocus: boolean): void;
+	$reveal(handle: WebviewPanelHandle, showOptions: WebviewPanelShowOptions): void;
 	$setTitle(handle: WebviewPanelHandle, value: string): void;
+	$setIconPath(handle: WebviewPanelHandle, value: { light: UriComponents, dark: UriComponents } | undefined): void;
 	$setHtml(handle: WebviewPanelHandle, value: string): void;
+	$setOptions(handle: WebviewPanelHandle, options: vscode.WebviewOptions): void;
 	$postMessage(handle: WebviewPanelHandle, value: any): Thenable<boolean>;
 
 	$registerSerializer(viewType: string): void;
 	$unregisterSerializer(viewType: string): void;
 }
 
+export interface WebviewPanelViewState {
+	readonly active: boolean;
+	readonly visible: boolean;
+	readonly position: EditorViewColumn;
+}
+
 export interface ExtHostWebviewsShape {
 	$onMessage(handle: WebviewPanelHandle, message: any): void;
-	$onDidChangeWebviewPanelViewState(handle: WebviewPanelHandle, active: boolean, position: EditorViewColumn): void;
+	$onDidChangeWebviewPanelViewState(handle: WebviewPanelHandle, newState: WebviewPanelViewState): void;
 	$onDidDisposeWebviewPanel(handle: WebviewPanelHandle): Thenable<void>;
 	$deserializeWebviewPanel(newWebviewHandle: WebviewPanelHandle, viewType: string, title: string, state: any, position: EditorViewColumn, options: vscode.WebviewOptions): Thenable<void>;
 }
 
 export interface MainThreadUrlsShape extends IDisposable {
-	$registerProtocolHandler(handle: number, extensionId: string): TPromise<void>;
-	$unregisterProtocolHandler(handle: number): TPromise<void>;
+	$registerUriHandler(handle: number, extensionId: string): Thenable<void>;
+	$unregisterUriHandler(handle: number): Thenable<void>;
 }
 
 export interface ExtHostUrlsShape {
-	$handleExternalUri(handle: number, uri: UriComponents): TPromise<void>;
+	$handleExternalUri(handle: number, uri: UriComponents): Thenable<void>;
 }
 
 export interface MainThreadWorkspaceShape extends IDisposable {
-	$startSearch(includePattern: string, includeFolder: string, excludePatternOrDisregardExcludes: string | false, maxResults: number, requestId: number): Thenable<UriComponents[]>;
-	$cancelSearch(requestId: number): Thenable<boolean>;
+	$startFileSearch(includePattern: string, includeFolder: string, excludePatternOrDisregardExcludes: string | false, maxResults: number, token: CancellationToken): Thenable<UriComponents[]>;
+	$startTextSearch(query: IPatternInfo, options: IQueryOptions, requestId: number, token: CancellationToken): Thenable<void>;
+	$checkExists(includes: string[], token: CancellationToken): Thenable<boolean>;
 	$saveAll(includeUntitled?: boolean): Thenable<boolean>;
 	$updateWorkspaceFolders(extensionName: string, index: number, deleteCount: number, workspaceFoldersToAdd: { uri: UriComponents, name?: string }[]): Thenable<void>;
 }
@@ -407,22 +485,26 @@ export interface IFileChangeDto {
 export interface MainThreadFileSystemShape extends IDisposable {
 	$registerFileSystemProvider(handle: number, scheme: string, capabilities: FileSystemProviderCapabilities): void;
 	$unregisterProvider(handle: number): void;
+	$setUriFormatter(scheme: string, formatter: LabelRules): void;
 	$onFileSystemChange(handle: number, resource: IFileChangeDto[]): void;
 }
 
 export interface MainThreadSearchShape extends IDisposable {
-	$registerSearchProvider(handle: number, scheme: string): void;
+	$registerFileSearchProvider(handle: number, scheme: string): void;
+	$registerTextSearchProvider(handle: number, scheme: string): void;
+	$registerFileIndexProvider(handle: number, scheme: string): void;
 	$unregisterProvider(handle: number): void;
-	$handleFindMatch(handle: number, session: number, data: UriComponents | IRawFileMatch2[]): void;
+	$handleFileMatch(handle: number, session: number, data: UriComponents[]): void;
+	$handleTextMatch(handle: number, session: number, data: IRawFileMatch2[]): void;
 	$handleTelemetry(eventName: string, data: any): void;
 }
 
 export interface MainThreadTaskShape extends IDisposable {
-	$registerTaskProvider(handle: number): TPromise<void>;
-	$unregisterTaskProvider(handle: number): TPromise<void>;
-	$fetchTasks(filter?: TaskFilterDTO): TPromise<TaskDTO[]>;
-	$executeTask(task: TaskHandleDTO | TaskDTO): TPromise<TaskExecutionDTO>;
-	$terminateTask(id: string): TPromise<void>;
+	$registerTaskProvider(handle: number): Thenable<void>;
+	$unregisterTaskProvider(handle: number): Thenable<void>;
+	$fetchTasks(filter?: TaskFilterDTO): Thenable<TaskDTO[]>;
+	$executeTask(task: TaskHandleDTO | TaskDTO): Thenable<TaskExecutionDTO>;
+	$terminateTask(id: string): Thenable<void>;
 	$registerTaskSystem(scheme: string, info: TaskSystemInfoDTO): void;
 }
 
@@ -494,18 +576,18 @@ export interface MainThreadDebugServiceShape extends IDisposable {
 	$acceptDAMessage(handle: number, message: DebugProtocol.ProtocolMessage): void;
 	$acceptDAError(handle: number, name: string, message: string, stack: string): void;
 	$acceptDAExit(handle: number, code: number, signal: string): void;
-	$registerDebugConfigurationProvider(type: string, hasProvideMethod: boolean, hasResolveMethod: boolean, hasDebugAdapterExecutable: boolean, handle: number): TPromise<any>;
-	$unregisterDebugConfigurationProvider(handle: number): TPromise<any>;
-	$startDebugging(folder: UriComponents | undefined, nameOrConfig: string | vscode.DebugConfiguration): TPromise<boolean>;
-	$customDebugAdapterRequest(id: DebugSessionUUID, command: string, args: any): TPromise<any>;
-	$appendDebugConsole(value: string): TPromise<any>;
-	$startBreakpointEvents(): TPromise<any>;
-	$registerBreakpoints(breakpoints: (ISourceMultiBreakpointDto | IFunctionBreakpointDto)[]): TPromise<void>;
-	$unregisterBreakpoints(breakpointIds: string[], functionBreakpointIds: string[]): TPromise<void>;
+	$registerDebugConfigurationProvider(type: string, hasProvideMethod: boolean, hasResolveMethod: boolean, hasDebugAdapterExecutable: boolean, handle: number): Thenable<void>;
+	$unregisterDebugConfigurationProvider(handle: number): Thenable<void>;
+	$startDebugging(folder: UriComponents | undefined, nameOrConfig: string | vscode.DebugConfiguration): Thenable<boolean>;
+	$customDebugAdapterRequest(id: DebugSessionUUID, command: string, args: any): Thenable<any>;
+	$appendDebugConsole(value: string): Thenable<void>;
+	$startBreakpointEvents(): Thenable<void>;
+	$registerBreakpoints(breakpoints: (ISourceMultiBreakpointDto | IFunctionBreakpointDto)[]): Thenable<void>;
+	$unregisterBreakpoints(breakpointIds: string[], functionBreakpointIds: string[]): Thenable<void>;
 }
 
 export interface MainThreadWindowShape extends IDisposable {
-	$getWindowVisibility(): TPromise<boolean>;
+	$getWindowVisibility(): Thenable<boolean>;
 }
 
 // -- extension host
@@ -524,7 +606,7 @@ export interface ExtHostDiagnosticsShape {
 }
 
 export interface ExtHostDocumentContentProvidersShape {
-	$provideTextDocumentContent(handle: number, uri: UriComponents): TPromise<string>;
+	$provideTextDocumentContent(handle: number, uri: UriComponents): Promise<string>;
 }
 
 export interface IModelAddedData {
@@ -540,7 +622,6 @@ export interface ExtHostDocumentsShape {
 	$acceptModelSaved(strURL: UriComponents): void;
 	$acceptDirtyStateChanged(strURL: UriComponents, isDirty: boolean): void;
 	$acceptModelChanged(strURL: UriComponents, e: IModelChangedEvent, isDirty: boolean): void;
-	$onDidRename(oldURL: UriComponents, newURL: UriComponents): void;
 }
 
 export interface ExtHostDocumentSaveParticipantShape {
@@ -586,35 +667,42 @@ export interface ExtHostDocumentsAndEditorsShape {
 }
 
 export interface ExtHostTreeViewsShape {
-	$getChildren(treeViewId: string, treeItemHandle?: string): TPromise<ITreeItem[]>;
+	$getChildren(treeViewId: string, treeItemHandle?: string): Thenable<ITreeItem[]>;
 	$setExpanded(treeViewId: string, treeItemHandle: string, expanded: boolean): void;
 	$setSelection(treeViewId: string, treeItemHandles: string[]): void;
+	$setVisible(treeViewId: string, visible: boolean): void;
 }
 
 export interface ExtHostWorkspaceShape {
 	$acceptWorkspaceData(workspace: IWorkspaceData): void;
+	$handleTextSearchResult(result: IRawFileMatch2, requestId: number): void;
 }
 
 export interface ExtHostFileSystemShape {
-	$stat(handle: number, resource: UriComponents): TPromise<IStat>;
-	$readdir(handle: number, resource: UriComponents): TPromise<[string, FileType][]>;
-	$readFile(handle: number, resource: UriComponents): TPromise<string>;
-	$writeFile(handle: number, resource: UriComponents, base64Encoded: string, opts: FileWriteOptions): TPromise<void>;
-	$rename(handle: number, resource: UriComponents, target: UriComponents, opts: FileOverwriteOptions): TPromise<void>;
-	$copy(handle: number, resource: UriComponents, target: UriComponents, opts: FileOverwriteOptions): TPromise<void>;
-	$mkdir(handle: number, resource: UriComponents): TPromise<void>;
-	$delete(handle: number, resource: UriComponents): TPromise<void>;
+	$stat(handle: number, resource: UriComponents): Thenable<IStat>;
+	$readdir(handle: number, resource: UriComponents): Thenable<[string, FileType][]>;
+	$readFile(handle: number, resource: UriComponents): Thenable<Buffer>;
+	$writeFile(handle: number, resource: UriComponents, content: Buffer, opts: FileWriteOptions): Thenable<void>;
+	$rename(handle: number, resource: UriComponents, target: UriComponents, opts: FileOverwriteOptions): Thenable<void>;
+	$copy(handle: number, resource: UriComponents, target: UriComponents, opts: FileOverwriteOptions): Thenable<void>;
+	$mkdir(handle: number, resource: UriComponents): Thenable<void>;
+	$delete(handle: number, resource: UriComponents, opts: FileDeleteOptions): Thenable<void>;
 	$watch(handle: number, session: number, resource: UriComponents, opts: IWatchOptions): void;
 	$unwatch(handle: number, session: number): void;
+	$open(handle: number, resource: UriComponents): Thenable<number>;
+	$close(handle: number, fd: number): Thenable<void>;
+	$read(handle: number, fd: number, pos: number, data: Buffer, offset: number, length: number): Thenable<number>;
+	$write(handle: number, fd: number, pos: number, data: Buffer, offset: number, length: number): Thenable<number>;
 }
 
 export interface ExtHostSearchShape {
-	$provideFileSearchResults(handle: number, session: number, query: IRawSearchQuery): TPromise<ISearchCompleteStats>;
-	$provideTextSearchResults(handle: number, session: number, pattern: IPatternInfo, query: IRawSearchQuery): TPromise<ISearchCompleteStats>;
+	$provideFileSearchResults(handle: number, session: number, query: IRawSearchQuery, token: CancellationToken): Thenable<ISearchCompleteStats>;
+	$clearCache(cacheKey: string): Thenable<void>;
+	$provideTextSearchResults(handle: number, session: number, pattern: IPatternInfo, query: IRawSearchQuery, token: CancellationToken): Thenable<ISearchCompleteStats>;
 }
 
 export interface ExtHostExtensionServiceShape {
-	$activateByEvent(activationEvent: string): TPromise<void>;
+	$activateByEvent(activationEvent: string): Thenable<void>;
 }
 
 export interface FileSystemEvents {
@@ -624,6 +712,8 @@ export interface FileSystemEvents {
 }
 export interface ExtHostFileSystemEventServiceShape {
 	$onFileEvent(events: FileSystemEvents): void;
+	$onFileRename(oldUri: UriComponents, newUri: UriComponents): void;
+	$onWillRename(oldUri: UriComponents, newUri: UriComponents): Thenable<any>;
 }
 
 export interface ObjectIdentifier {
@@ -673,22 +763,28 @@ export interface LocationDto {
 	range: IRange;
 }
 
-export interface SymbolInformationDto extends IdObject {
+export interface DefinitionLinkDto {
+	origin?: IRange;
+	uri: UriComponents;
+	range: IRange;
+	selectionRange?: IRange;
+}
+
+export interface WorkspaceSymbolDto extends IdObject {
 	name: string;
 	containerName?: string;
 	kind: modes.SymbolKind;
 	location: LocationDto;
-	definingRange: IRange;
-	children?: SymbolInformationDto[];
 }
 
 export interface WorkspaceSymbolsDto extends IdObject {
-	symbols: SymbolInformationDto[];
+	symbols: WorkspaceSymbolDto[];
 }
 
 export interface ResourceFileEditDto {
 	oldUri: UriComponents;
 	newUri: UriComponents;
+	options: IFileOperationOptions;
 }
 
 export interface ResourceTextEditDto {
@@ -727,38 +823,44 @@ export interface CodeActionDto {
 }
 
 export interface ExtHostLanguageFeaturesShape {
-	$provideDocumentSymbols(handle: number, resource: UriComponents): TPromise<SymbolInformationDto[]>;
-	$provideCodeLenses(handle: number, resource: UriComponents): TPromise<modes.ICodeLensSymbol[]>;
-	$resolveCodeLens(handle: number, resource: UriComponents, symbol: modes.ICodeLensSymbol): TPromise<modes.ICodeLensSymbol>;
-	$provideDefinition(handle: number, resource: UriComponents, position: IPosition): TPromise<LocationDto | LocationDto[]>;
-	$provideImplementation(handle: number, resource: UriComponents, position: IPosition): TPromise<LocationDto | LocationDto[]>;
-	$provideTypeDefinition(handle: number, resource: UriComponents, position: IPosition): TPromise<LocationDto | LocationDto[]>;
-	$provideHover(handle: number, resource: UriComponents, position: IPosition): TPromise<modes.Hover>;
-	$provideDocumentHighlights(handle: number, resource: UriComponents, position: IPosition): TPromise<modes.DocumentHighlight[]>;
-	$provideReferences(handle: number, resource: UriComponents, position: IPosition, context: modes.ReferenceContext): TPromise<LocationDto[]>;
-	$provideCodeActions(handle: number, resource: UriComponents, rangeOrSelection: IRange | ISelection, context: modes.CodeActionContext): TPromise<CodeActionDto[]>;
-	$provideDocumentFormattingEdits(handle: number, resource: UriComponents, options: modes.FormattingOptions): TPromise<ISingleEditOperation[]>;
-	$provideDocumentRangeFormattingEdits(handle: number, resource: UriComponents, range: IRange, options: modes.FormattingOptions): TPromise<ISingleEditOperation[]>;
-	$provideOnTypeFormattingEdits(handle: number, resource: UriComponents, position: IPosition, ch: string, options: modes.FormattingOptions): TPromise<ISingleEditOperation[]>;
-	$provideWorkspaceSymbols(handle: number, search: string): TPromise<WorkspaceSymbolsDto>;
-	$resolveWorkspaceSymbol(handle: number, symbol: SymbolInformationDto): TPromise<SymbolInformationDto>;
+	$provideDocumentSymbols(handle: number, resource: UriComponents, token: CancellationToken): Thenable<modes.DocumentSymbol[]>;
+	$provideCodeLenses(handle: number, resource: UriComponents, token: CancellationToken): Thenable<modes.ICodeLensSymbol[]>;
+	$resolveCodeLens(handle: number, resource: UriComponents, symbol: modes.ICodeLensSymbol, token: CancellationToken): Thenable<modes.ICodeLensSymbol>;
+	$provideDefinition(handle: number, resource: UriComponents, position: IPosition, token: CancellationToken): Thenable<DefinitionLinkDto[]>;
+	$provideImplementation(handle: number, resource: UriComponents, position: IPosition, token: CancellationToken): Thenable<DefinitionLinkDto[]>;
+	$provideTypeDefinition(handle: number, resource: UriComponents, position: IPosition, token: CancellationToken): Thenable<DefinitionLinkDto[]>;
+	$provideHover(handle: number, resource: UriComponents, position: IPosition, token: CancellationToken): Thenable<modes.Hover>;
+	$provideDocumentHighlights(handle: number, resource: UriComponents, position: IPosition, token: CancellationToken): Thenable<modes.DocumentHighlight[]>;
+	$provideReferences(handle: number, resource: UriComponents, position: IPosition, context: modes.ReferenceContext, token: CancellationToken): Thenable<LocationDto[]>;
+	$provideCodeActions(handle: number, resource: UriComponents, rangeOrSelection: IRange | ISelection, context: modes.CodeActionContext, token: CancellationToken): Thenable<CodeActionDto[]>;
+	$provideDocumentFormattingEdits(handle: number, resource: UriComponents, options: modes.FormattingOptions, token: CancellationToken): Thenable<ISingleEditOperation[]>;
+	$provideDocumentRangeFormattingEdits(handle: number, resource: UriComponents, range: IRange, options: modes.FormattingOptions, token: CancellationToken): Thenable<ISingleEditOperation[]>;
+	$provideOnTypeFormattingEdits(handle: number, resource: UriComponents, position: IPosition, ch: string, options: modes.FormattingOptions, token: CancellationToken): Thenable<ISingleEditOperation[]>;
+	$provideWorkspaceSymbols(handle: number, search: string, token: CancellationToken): Thenable<WorkspaceSymbolsDto>;
+	$resolveWorkspaceSymbol(handle: number, symbol: WorkspaceSymbolDto, token: CancellationToken): Thenable<WorkspaceSymbolDto>;
 	$releaseWorkspaceSymbols(handle: number, id: number): void;
-	$provideRenameEdits(handle: number, resource: UriComponents, position: IPosition, newName: string): TPromise<WorkspaceEditDto>;
-	$resolveRenameLocation(handle: number, resource: UriComponents, position: IPosition): TPromise<modes.RenameLocation>;
-	$provideCompletionItems(handle: number, resource: UriComponents, position: IPosition, context: modes.SuggestContext): TPromise<SuggestResultDto>;
-	$resolveCompletionItem(handle: number, resource: UriComponents, position: IPosition, suggestion: modes.ISuggestion): TPromise<modes.ISuggestion>;
+	$provideRenameEdits(handle: number, resource: UriComponents, position: IPosition, newName: string, token: CancellationToken): Thenable<WorkspaceEditDto>;
+	$resolveRenameLocation(handle: number, resource: UriComponents, position: IPosition, token: CancellationToken): Thenable<modes.RenameLocation>;
+	$provideCompletionItems(handle: number, resource: UriComponents, position: IPosition, context: modes.SuggestContext, token: CancellationToken): Thenable<SuggestResultDto>;
+	$resolveCompletionItem(handle: number, resource: UriComponents, position: IPosition, suggestion: modes.ISuggestion, token: CancellationToken): Thenable<modes.ISuggestion>;
 	$releaseCompletionItems(handle: number, id: number): void;
-	$provideSignatureHelp(handle: number, resource: UriComponents, position: IPosition): TPromise<modes.SignatureHelp>;
-	$provideDocumentLinks(handle: number, resource: UriComponents): TPromise<modes.ILink[]>;
-	$resolveDocumentLink(handle: number, link: modes.ILink): TPromise<modes.ILink>;
-	$provideDocumentColors(handle: number, resource: UriComponents): TPromise<IRawColorInfo[]>;
-	$provideColorPresentations(handle: number, resource: UriComponents, colorInfo: IRawColorInfo): TPromise<modes.IColorPresentation[]>;
-	$provideFoldingRanges(handle: number, resource: UriComponents, context: modes.FoldingContext): TPromise<modes.FoldingRange[]>;
+	$provideSignatureHelp(handle: number, resource: UriComponents, position: IPosition, context: modes.SignatureHelpContext, token: CancellationToken): Thenable<modes.SignatureHelp>;
+	$provideDocumentLinks(handle: number, resource: UriComponents, token: CancellationToken): Thenable<modes.ILink[]>;
+	$resolveDocumentLink(handle: number, link: modes.ILink, token: CancellationToken): Thenable<modes.ILink>;
+	$provideDocumentColors(handle: number, resource: UriComponents, token: CancellationToken): Thenable<IRawColorInfo[]>;
+	$provideColorPresentations(handle: number, resource: UriComponents, colorInfo: IRawColorInfo, token: CancellationToken): Thenable<modes.IColorPresentation[]>;
+	$provideFoldingRanges(handle: number, resource: UriComponents, context: modes.FoldingContext, token: CancellationToken): Thenable<modes.FoldingRange[]>;
 }
 
 export interface ExtHostQuickOpenShape {
 	$onItemSelected(handle: number): void;
-	$validateInput(input: string): TPromise<string>;
+	$validateInput(input: string): Thenable<string>;
+	$onDidChangeActive(sessionId: number, handles: number[]): void;
+	$onDidChangeSelection(sessionId: number, handles: number[]): void;
+	$onDidAccept(sessionId: number): void;
+	$onDidChangeValue(sessionId: number, value: string): void;
+	$onDidTriggerButton(sessionId: number, handle: number): void;
+	$onDidHide(sessionId: number): void;
 }
 
 export interface ShellLaunchConfigDto {
@@ -772,28 +874,32 @@ export interface ShellLaunchConfigDto {
 export interface ExtHostTerminalServiceShape {
 	$acceptTerminalClosed(id: number): void;
 	$acceptTerminalOpened(id: number, name: string): void;
+	$acceptActiveTerminalChanged(id: number | null): void;
 	$acceptTerminalProcessId(id: number, processId: number): void;
 	$acceptTerminalProcessData(id: number, data: string): void;
+	$acceptTerminalRendererInput(id: number, data: string): void;
+	$acceptTerminalRendererDimensions(id: number, cols: number, rows: number): void;
 	$createProcess(id: number, shellLaunchConfig: ShellLaunchConfigDto, cols: number, rows: number): void;
 	$acceptProcessInput(id: number, data: string): void;
 	$acceptProcessResize(id: number, cols: number, rows: number): void;
-	$acceptProcessShutdown(id: number): void;
+	$acceptProcessShutdown(id: number, immediate: boolean): void;
 }
 
 export interface ExtHostSCMShape {
-	$provideOriginalResource(sourceControlHandle: number, uri: UriComponents): TPromise<UriComponents>;
-	$onInputBoxValueChange(sourceControlHandle: number, value: string): TPromise<void>;
-	$executeResourceCommand(sourceControlHandle: number, groupHandle: number, handle: number): TPromise<void>;
-	$validateInput(sourceControlHandle: number, value: string, cursorPosition: number): TPromise<[string, number] | undefined>;
+	$provideOriginalResource(sourceControlHandle: number, uri: UriComponents, token: CancellationToken): Thenable<UriComponents>;
+	$onInputBoxValueChange(sourceControlHandle: number, value: string): void;
+	$executeResourceCommand(sourceControlHandle: number, groupHandle: number, handle: number): Thenable<void>;
+	$validateInput(sourceControlHandle: number, value: string, cursorPosition: number): Thenable<[string, number] | undefined>;
+	$setSelectedSourceControls(selectedSourceControlHandles: number[]): Thenable<void>;
 }
 
 export interface ExtHostTaskShape {
-	$provideTasks(handle: number): TPromise<TaskSet>;
+	$provideTasks(handle: number, validTypes: { [key: string]: boolean; }): Thenable<TaskSet>;
 	$onDidStartTask(execution: TaskExecutionDTO): void;
 	$onDidStartTaskProcess(value: TaskProcessStartedDTO): void;
 	$onDidEndTaskProcess(value: TaskProcessEndedDTO): void;
 	$OnDidEndTask(execution: TaskExecutionDTO): void;
-	$resolveVariables(workspaceFolder: URI, variables: string[]): TPromise<any>;
+	$resolveVariables(workspaceFolder: UriComponents, variables: string[]): Thenable<any>;
 }
 
 export interface IBreakpointDto {
@@ -838,16 +944,14 @@ export interface ISourceMultiBreakpointDto {
 }
 
 export interface ExtHostDebugServiceShape {
-	$substituteVariables(folder: UriComponents | undefined, config: IConfig): TPromise<IConfig>;
-	$runInTerminal(args: DebugProtocol.RunInTerminalRequestArguments, config: ITerminalSettings): TPromise<void>;
-	$isTerminalBusy(processId: number): TPromise<boolean>;
-	$prepareCommandForTerminal(args: DebugProtocol.RunInTerminalRequestArguments, config: ITerminalSettings): TPromise<any>;
-	$startDASession(handle: number, debugType: string, adapterExecutableInfo: IAdapterExecutable | null, debugPort: number): TPromise<void>;
-	$stopDASession(handle: number): TPromise<void>;
-	$sendDAMessage(handle: number, message: DebugProtocol.ProtocolMessage): TPromise<void>;
-	$resolveDebugConfiguration(handle: number, folder: UriComponents | undefined, debugConfiguration: IConfig): TPromise<IConfig>;
-	$provideDebugConfigurations(handle: number, folder: UriComponents | undefined): TPromise<IConfig[]>;
-	$debugAdapterExecutable(handle: number, folder: UriComponents | undefined): TPromise<IAdapterExecutable>;
+	$substituteVariables(folder: UriComponents | undefined, config: IConfig): Thenable<IConfig>;
+	$runInTerminal(args: DebugProtocol.RunInTerminalRequestArguments, config: ITerminalSettings): Thenable<void>;
+	$startDASession(handle: number, debugType: string, adapterExecutableInfo: IAdapterExecutable | null, debugPort: number): Thenable<void>;
+	$stopDASession(handle: number): Thenable<void>;
+	$sendDAMessage(handle: number, message: DebugProtocol.ProtocolMessage): void;
+	$resolveDebugConfiguration(handle: number, folder: UriComponents | undefined, debugConfiguration: IConfig): Thenable<IConfig>;
+	$provideDebugConfigurations(handle: number, folder: UriComponents | undefined): Thenable<IConfig[]>;
+	$debugAdapterExecutable(handle: number, folder: UriComponents | undefined): Thenable<IAdapterExecutable>;
 	$acceptDebugSessionStarted(id: DebugSessionUUID, type: string, name: string): void;
 	$acceptDebugSessionTerminated(id: DebugSessionUUID, type: string, name: string): void;
 	$acceptDebugSessionActiveChanged(id: DebugSessionUUID | undefined, type?: string, name?: string): void;
@@ -866,7 +970,7 @@ export type DecorationData = [number, boolean, string, string, ThemeColor, strin
 export type DecorationReply = { [id: number]: DecorationData };
 
 export interface ExtHostDecorationsShape {
-	$provideDecorations(requests: DecorationRequest[]): TPromise<DecorationReply>;
+	$provideDecorations(requests: DecorationRequest[], token: CancellationToken): Thenable<DecorationReply>;
 }
 
 export interface ExtHostWindowShape {
@@ -882,10 +986,10 @@ export interface ExtHostProgressShape {
 }
 
 export interface ExtHostCommentsShape {
-	$provideDocumentComments(handle: number, document: UriComponents): TPromise<modes.CommentInfo>;
-	$createNewCommentThread?(handle: number, document: UriComponents, range: IRange, text: string): TPromise<modes.CommentThread>;
-	$replyToCommentThread?(handle: number, document: UriComponents, range: IRange, commentThread: modes.CommentThread, text: string): TPromise<modes.CommentThread>;
-	$provideWorkspaceComments(handle: number): TPromise<modes.CommentThread[]>;
+	$provideDocumentComments(handle: number, document: UriComponents): Thenable<modes.CommentInfo>;
+	$createNewCommentThread(handle: number, document: UriComponents, range: IRange, text: string): Thenable<modes.CommentThread>;
+	$replyToCommentThread(handle: number, document: UriComponents, range: IRange, commentThread: modes.CommentThread, text: string): Thenable<modes.CommentThread>;
+	$provideWorkspaceComments(handle: number): Thenable<modes.CommentThread[]>;
 }
 
 // --- proxy identifiers
diff --git a/src/vs/workbench/api/node/extHostApiCommands.ts b/src/vs/workbench/api/node/extHostApiCommands.ts
index 0227c874623..caafafe8a78 100644
--- a/src/vs/workbench/api/node/extHostApiCommands.ts
+++ b/src/vs/workbench/api/node/extHostApiCommands.ts
@@ -4,21 +4,22 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { IDisposable } from 'vs/base/common/lifecycle';
 import * as vscode from 'vscode';
 import * as typeConverters from 'vs/workbench/api/node/extHostTypeConverters';
 import * as types from 'vs/workbench/api/node/extHostTypes';
-import { IRawColorInfo } from 'vs/workbench/api/node/extHost.protocol';
-
+import { IRawColorInfo, WorkspaceEditDto } from 'vs/workbench/api/node/extHost.protocol';
 import { ISingleEditOperation } from 'vs/editor/common/model';
 import * as modes from 'vs/editor/common/modes';
+import * as search from 'vs/workbench/parts/search/common/search';
 import { ICommandHandlerDescription } from 'vs/platform/commands/common/commands';
 import { ExtHostCommands } from 'vs/workbench/api/node/extHostCommands';
-import { IWorkspaceSymbolProvider } from 'vs/workbench/parts/search/common/search';
 import { CustomCodeAction } from 'vs/workbench/api/node/extHostLanguageFeatures';
-import { ICommandsExecutor, PreviewHTMLAPICommand, OpenFolderAPICommand, DiffAPICommand, OpenAPICommand, RemoveFromRecentlyOpenedAPICommand } from './apiCommands';
+import { ICommandsExecutor, PreviewHTMLAPICommand, OpenFolderAPICommand, DiffAPICommand, OpenAPICommand, RemoveFromRecentlyOpenedAPICommand, SetEditorLayoutAPICommand } from './apiCommands';
+import { EditorGroupLayout } from 'vs/workbench/services/group/common/editorGroupsService';
+import { isFalsyOrEmpty } from 'vs/base/common/arrays';
 
 export class ExtHostApiCommands {
 
@@ -111,7 +112,7 @@ export class ExtHostApiCommands {
 			args: [
 				{ name: 'uri', description: 'Uri of a text document', constraint: URI }
 			],
-			returns: 'A promise that resolves to an array of SymbolInformation-instances.'
+			returns: 'A promise that resolves to an array of SymbolInformation and DocumentSymbol instances.'
 		});
 		this._register('vscode.executeCompletionItemProvider', this._executeCompletionItemProvider, {
 			description: 'Execute completion item provider.',
@@ -250,6 +251,13 @@ export class ExtHostApiCommands {
 				{ name: 'path', description: 'Path to remove from recently opened.', constraint: (value: any) => typeof value === 'string' }
 			]
 		});
+
+		this._register(SetEditorLayoutAPICommand.ID, adjustHandler(SetEditorLayoutAPICommand.execute), {
+			description: 'Sets the editor layout. The layout is described as object with an initial (optional) orientation (0 = horizontal, 1 = vertical) and an array of editor groups within. Each editor group can have a size and another array of editor groups that will be laid out orthogonal to the orientation. If editor group sizes are provided, their sum must be 1 to be applied per row or column. Example for a 2x2 grid: `{ orientation: 0, groups: [{ groups: [{}, {}], size: 0.5 }, { groups: [{}, {}], size: 0.5 }] }`',
+			args: [
+				{ name: 'layout', description: 'The editor layout to set.', constraint: (value: EditorGroupLayout) => typeof value === 'object' && Array.isArray(value.groups) }
+			]
+		});
 	}
 
 	// --- command impl
@@ -266,11 +274,11 @@ export class ExtHostApiCommands {
 	 * @return A promise that resolves to an array of symbol information.
 	 */
 	private _executeWorkspaceSymbolProvider(query: string): Thenable<types.SymbolInformation[]> {
-		return this._commands.executeCommand<[IWorkspaceSymbolProvider, modes.SymbolInformation[]][]>('_executeWorkspaceSymbolProvider', { query }).then(value => {
+		return this._commands.executeCommand<[search.IWorkspaceSymbolProvider, search.IWorkspaceSymbol[]][]>('_executeWorkspaceSymbolProvider', { query }).then(value => {
 			const result: types.SymbolInformation[] = [];
 			if (Array.isArray(value)) {
 				for (let tuple of value) {
-					result.push(...tuple[1].map(typeConverters.SymbolInformation.to));
+					result.push(...tuple[1].map(typeConverters.WorkspaceSymbol.to));
 				}
 			}
 			return result;
@@ -337,7 +345,7 @@ export class ExtHostApiCommands {
 			position: position && typeConverters.Position.from(position),
 			newName
 		};
-		return this._commands.executeCommand<modes.WorkspaceEdit>('_executeDocumentRenameProvider', args).then(value => {
+		return this._commands.executeCommand<WorkspaceEditDto>('_executeDocumentRenameProvider', args).then(value => {
 			if (!value) {
 				return undefined;
 			}
@@ -404,15 +412,35 @@ export class ExtHostApiCommands {
 		});
 	}
 
-	private _executeDocumentSymbolProvider(resource: URI): Thenable<types.SymbolInformation[]> {
+	private _executeDocumentSymbolProvider(resource: URI): Thenable<vscode.SymbolInformation[]> {
 		const args = {
 			resource
 		};
-		return this._commands.executeCommand<modes.IOutline>('_executeDocumentSymbolProvider', args).then(value => {
-			if (value && Array.isArray(value.entries)) {
-				return value.entries.map(typeConverters.SymbolInformation.to);
+		return this._commands.executeCommand<modes.DocumentSymbol[]>('_executeDocumentSymbolProvider', args).then(value => {
+			if (isFalsyOrEmpty(value)) {
+				return undefined;
 			}
-			return undefined;
+			class MergedInfo extends types.SymbolInformation implements vscode.DocumentSymbol {
+				static to(symbol: modes.DocumentSymbol): MergedInfo {
+					let res = new MergedInfo(
+						symbol.name,
+						typeConverters.SymbolKind.to(symbol.kind),
+						symbol.containerName,
+						new types.Location(resource, typeConverters.Range.to(symbol.range))
+					);
+					res.detail = symbol.detail;
+					res.range = res.location.range;
+					res.selectionRange = typeConverters.Range.to(symbol.selectionRange);
+					res.children = symbol.children && symbol.children.map(MergedInfo.to);
+					return res;
+				}
+
+				detail: string;
+				range: vscode.Range;
+				selectionRange: vscode.Range;
+				children: vscode.DocumentSymbol[];
+			}
+			return value.map(MergedInfo.to);
 		});
 	}
 
diff --git a/src/vs/workbench/api/node/extHostCommands.ts b/src/vs/workbench/api/node/extHostCommands.ts
index e1607cd562e..9eb67f348a4 100644
--- a/src/vs/workbench/api/node/extHostCommands.ts
+++ b/src/vs/workbench/api/node/extHostCommands.ts
@@ -131,6 +131,8 @@ export class ExtHostCommands implements ExtHostCommandsShape {
 	}
 
 	$executeContributedCommand<T>(id: string, ...args: any[]): Thenable<T> {
+		this._logService.trace('ExtHostCommands#$executeContributedCommand', id);
+
 		if (!this._commands.has(id)) {
 			return Promise.reject(new Error(`Contributed command '${id}' does not exist.`));
 		} else {
diff --git a/src/vs/workbench/api/node/extHostComments.ts b/src/vs/workbench/api/node/extHostComments.ts
index a6a85ba54e0..c981115c0a6 100644
--- a/src/vs/workbench/api/node/extHostComments.ts
+++ b/src/vs/workbench/api/node/extHostComments.ts
@@ -5,8 +5,8 @@
 
 'use strict';
 
-import { asWinJsPromise } from 'vs/base/common/async';
-import URI, { UriComponents } from 'vs/base/common/uri';
+import { asThenable } from 'vs/base/common/async';
+import { URI, UriComponents } from 'vs/base/common/uri';
 import { TPromise } from 'vs/base/common/winjs.base';
 import * as modes from 'vs/editor/common/modes';
 import { ExtHostDocuments } from 'vs/workbench/api/node/extHostDocuments';
@@ -15,6 +15,7 @@ import * as vscode from 'vscode';
 import { ExtHostCommentsShape, IMainContext, MainContext, MainThreadCommentsShape } from './extHost.protocol';
 import { CommandsConverter } from './extHostCommands';
 import { IRange } from 'vs/editor/common/core/range';
+import { CancellationToken } from 'vs/base/common/cancellation';
 
 export class ExtHostComments implements ExtHostCommentsShape {
 	private static handlePool = 0;
@@ -64,7 +65,7 @@ export class ExtHostComments implements ExtHostCommentsShape {
 		};
 	}
 
-	$createNewCommentThread(handle: number, uri: UriComponents, range: IRange, text: string): TPromise<modes.CommentThread> {
+	$createNewCommentThread(handle: number, uri: UriComponents, range: IRange, text: string): Thenable<modes.CommentThread> {
 		const data = this._documents.getDocumentData(URI.revive(uri));
 		const ran = <vscode.Range>extHostTypeConverter.Range.to(range);
 
@@ -72,13 +73,13 @@ export class ExtHostComments implements ExtHostCommentsShape {
 			return TPromise.as(null);
 		}
 
-		return asWinJsPromise(token => {
+		return asThenable(() => {
 			let provider = this._documentProviders.get(handle);
-			return provider.createNewCommentThread(data.document, ran, text, token);
+			return provider.createNewCommentThread(data.document, ran, text, CancellationToken.None);
 		}).then(commentThread => commentThread ? convertToCommentThread(commentThread, this._commandsConverter) : null);
 	}
 
-	$replyToCommentThread(handle: number, uri: UriComponents, range: IRange, thread: modes.CommentThread, text: string): TPromise<modes.CommentThread> {
+	$replyToCommentThread(handle: number, uri: UriComponents, range: IRange, thread: modes.CommentThread, text: string): Thenable<modes.CommentThread> {
 		const data = this._documents.getDocumentData(URI.revive(uri));
 		const ran = <vscode.Range>extHostTypeConverter.Range.to(range);
 
@@ -86,33 +87,33 @@ export class ExtHostComments implements ExtHostCommentsShape {
 			return TPromise.as(null);
 		}
 
-		return asWinJsPromise(token => {
+		return asThenable(() => {
 			let provider = this._documentProviders.get(handle);
-			return provider.replyToCommentThread(data.document, ran, convertFromCommentThread(thread), text, token);
+			return provider.replyToCommentThread(data.document, ran, convertFromCommentThread(thread), text, CancellationToken.None);
 		}).then(commentThread => commentThread ? convertToCommentThread(commentThread, this._commandsConverter) : null);
 	}
 
-	$provideDocumentComments(handle: number, uri: UriComponents): TPromise<modes.CommentInfo> {
+	$provideDocumentComments(handle: number, uri: UriComponents): Thenable<modes.CommentInfo> {
 		const data = this._documents.getDocumentData(URI.revive(uri));
 		if (!data || !data.document) {
 			return TPromise.as(null);
 		}
 
-		return asWinJsPromise(token => {
+		return asThenable(() => {
 			let provider = this._documentProviders.get(handle);
-			return provider.provideDocumentComments(data.document, token);
+			return provider.provideDocumentComments(data.document, CancellationToken.None);
 		})
 			.then(commentInfo => commentInfo ? convertCommentInfo(handle, commentInfo, this._commandsConverter) : null);
 	}
 
-	$provideWorkspaceComments(handle: number): TPromise<modes.CommentThread[]> {
+	$provideWorkspaceComments(handle: number): Thenable<modes.CommentThread[]> {
 		const provider = this._workspaceProviders.get(handle);
 		if (!provider) {
 			return TPromise.as(null);
 		}
 
-		return asWinJsPromise(token => {
-			return provider.provideWorkspaceComments(token);
+		return asThenable(() => {
+			return provider.provideWorkspaceComments(CancellationToken.None);
 		}).then(comments =>
 			comments.map(x => convertToCommentThread(x, this._commandsConverter)
 			));
diff --git a/src/vs/workbench/api/node/extHostConfiguration.ts b/src/vs/workbench/api/node/extHostConfiguration.ts
index 6798aad682a..c41f834005e 100644
--- a/src/vs/workbench/api/node/extHostConfiguration.ts
+++ b/src/vs/workbench/api/node/extHostConfiguration.ts
@@ -5,7 +5,7 @@
 'use strict';
 
 import { mixin, deepClone } from 'vs/base/common/objects';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { Event, Emitter } from 'vs/base/common/event';
 import * as vscode from 'vscode';
 import { ExtHostWorkspace } from 'vs/workbench/api/node/extHostWorkspace';
diff --git a/src/vs/workbench/api/node/extHostDebugService.ts b/src/vs/workbench/api/node/extHostDebugService.ts
index 4252cfab0b3..6bd5c081c1c 100644
--- a/src/vs/workbench/api/node/extHostDebugService.ts
+++ b/src/vs/workbench/api/node/extHostDebugService.ts
@@ -6,10 +6,11 @@
 
 import * as paths from 'vs/base/common/paths';
 import { Schemas } from 'vs/base/common/network';
-import URI, { UriComponents } from 'vs/base/common/uri';
+import { URI, UriComponents } from 'vs/base/common/uri';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { Event, Emitter } from 'vs/base/common/event';
-import { asWinJsPromise } from 'vs/base/common/async';
+import { asThenable } from 'vs/base/common/async';
+import * as nls from 'vs/nls';
 import {
 	MainContext, MainThreadDebugServiceShape, ExtHostDebugServiceShape, DebugSessionUUID,
 	IMainContext, IBreakpointsDeltaDto, ISourceMultiBreakpointDto, IFunctionBreakpointDto
@@ -24,11 +25,13 @@ import { ExtHostDocumentsAndEditors } from 'vs/workbench/api/node/extHostDocumen
 import { IAdapterExecutable, ITerminalSettings, IDebuggerContribution, IConfig, IDebugAdapter } from 'vs/workbench/parts/debug/common/debug';
 import { getTerminalLauncher, hasChildprocesses, prepareCommand } from 'vs/workbench/parts/debug/node/terminals';
 import { IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
-import { VariableResolver } from 'vs/workbench/services/configurationResolver/node/variableResolver';
-import { IStringDictionary } from 'vs/base/common/collections';
+import { AbstractVariableResolverService } from 'vs/workbench/services/configurationResolver/node/variableResolver';
 import { ExtHostConfiguration } from './extHostConfiguration';
 import { convertToVSCPaths, convertToDAPaths } from 'vs/workbench/parts/debug/common/debugUtils';
+import { ExtHostTerminalService } from 'vs/workbench/api/node/extHostTerminalService';
+import { IDisposable } from 'vs/base/common/lifecycle';
 import { IConfigurationResolverService } from 'vs/workbench/services/configurationResolver/common/configurationResolver';
+import { CancellationToken } from 'vs/base/common/cancellation';
 
 
 export class ExtHostDebugService implements ExtHostDebugServiceShape {
@@ -66,12 +69,16 @@ export class ExtHostDebugService implements ExtHostDebugServiceShape {
 
 	private _variableResolver: IConfigurationResolverService;
 
+	private _integratedTerminalInstance: vscode.Terminal;
+	private _terminalDisposedListener: IDisposable;
+
 
 	constructor(mainContext: IMainContext,
 		private _workspaceService: ExtHostWorkspace,
 		private _extensionService: ExtHostExtensionService,
 		private _editorsService: ExtHostDocumentsAndEditors,
-		private _configurationService: ExtHostConfiguration
+		private _configurationService: ExtHostConfiguration,
+		private _terminalService: ExtHostTerminalService
 	) {
 
 		this._handleCounter = 0;
@@ -118,35 +125,72 @@ export class ExtHostDebugService implements ExtHostDebugServiceShape {
 	}
 
 	public $runInTerminal(args: DebugProtocol.RunInTerminalRequestArguments, config: ITerminalSettings): TPromise<void> {
-		const terminalLauncher = getTerminalLauncher();
-		if (terminalLauncher) {
-			return terminalLauncher.runInTerminal(args, config);
+
+		if (args.kind === 'integrated') {
+
+			if (!this._terminalDisposedListener) {
+				// React on terminal disposed and check if that is the debug terminal #12956
+				this._terminalDisposedListener = this._terminalService.onDidCloseTerminal(terminal => {
+					if (this._integratedTerminalInstance && this._integratedTerminalInstance === terminal) {
+						this._integratedTerminalInstance = null;
+					}
+				});
+			}
+
+			return new TPromise(resolve => {
+				if (this._integratedTerminalInstance) {
+					this._integratedTerminalInstance.processId.then(pid => {
+						resolve(hasChildprocesses(pid));
+					}, err => {
+						resolve(true);
+					});
+				} else {
+					resolve(true);
+				}
+			}).then(needNewTerminal => {
+
+				if (needNewTerminal) {
+					this._integratedTerminalInstance = this._terminalService.createTerminal(args.title || nls.localize('debug.terminal.title', "debuggee"));
+				}
+
+				this._integratedTerminalInstance.show();
+
+				return new TPromise((resolve, error) => {
+					setTimeout(_ => {
+						const command = prepareCommand(args, config);
+						this._integratedTerminalInstance.sendText(command, true);
+						resolve(void 0);
+					}, 500);
+				});
+			});
+
+		} else if (args.kind === 'external') {
+
+			const terminalLauncher = getTerminalLauncher();
+			if (terminalLauncher) {
+				return terminalLauncher.runInTerminal(args, config);
+			}
 		}
 		return void 0;
 	}
 
-	public $isTerminalBusy(processId: number): TPromise<boolean> {
-		return asWinJsPromise(token => hasChildprocesses(processId));
-	}
-
-	public $prepareCommandForTerminal(args: DebugProtocol.RunInTerminalRequestArguments, config: ITerminalSettings): TPromise<any> {
-		return asWinJsPromise(token => prepareCommand(args, config));
-	}
-
 	public $substituteVariables(folderUri: UriComponents | undefined, config: IConfig): TPromise<IConfig> {
 		if (!this._variableResolver) {
 			this._variableResolver = new ExtHostVariableResolverService(this._workspaceService, this._editorsService, this._configurationService);
 		}
+		let ws: IWorkspaceFolder;
 		const folder = this.getFolder(folderUri);
-		let ws: IWorkspaceFolder = {
-			uri: folder.uri,
-			name: folder.name,
-			index: folder.index,
-			toResource: () => {
-				throw new Error('Not implemented');
-			}
-		};
-		return asWinJsPromise(token => DebugAdapter.substituteVariables(ws, config, this._variableResolver));
+		if (folder) {
+			ws = {
+				uri: folder.uri,
+				name: folder.name,
+				index: folder.index,
+				toResource: () => {
+					throw new Error('Not implemented');
+				}
+			};
+		}
+		return TPromise.wrap(this._variableResolver.resolveAny(ws, config));
 	}
 
 	public $startDASession(handle: number, debugType: string, adpaterExecutable: IAdapterExecutable | null, debugPort: number): TPromise<void> {
@@ -292,7 +336,7 @@ export class ExtHostDebugService implements ExtHostDebugServiceShape {
 		this.fireBreakpointChanges(a, r, c);
 	}
 
-	public addBreakpoints(breakpoints0: vscode.Breakpoint[]): TPromise<void> {
+	public addBreakpoints(breakpoints0: vscode.Breakpoint[]): Thenable<void> {
 
 		this.startBreakpoints();
 
@@ -358,7 +402,7 @@ export class ExtHostDebugService implements ExtHostDebugServiceShape {
 		return this._debugServiceProxy.$registerBreakpoints(dtos);
 	}
 
-	public removeBreakpoints(breakpoints0: vscode.Breakpoint[]): TPromise<void> {
+	public removeBreakpoints(breakpoints0: vscode.Breakpoint[]): Thenable<void> {
 
 		this.startBreakpoints();
 
@@ -383,9 +427,9 @@ export class ExtHostDebugService implements ExtHostDebugServiceShape {
 	private fireBreakpointChanges(added: vscode.Breakpoint[], removed: vscode.Breakpoint[], changed: vscode.Breakpoint[]) {
 		if (added.length > 0 || removed.length > 0 || changed.length > 0) {
 			this._onDidChangeBreakpoints.fire(Object.freeze({
-				added: Object.freeze<vscode.Breakpoint[]>(added),
-				removed: Object.freeze<vscode.Breakpoint[]>(removed),
-				changed: Object.freeze<vscode.Breakpoint[]>(changed)
+				added,
+				removed,
+				changed,
 			}));
 		}
 	}
@@ -408,7 +452,7 @@ export class ExtHostDebugService implements ExtHostDebugServiceShape {
 		});
 	}
 
-	public $provideDebugConfigurations(handle: number, folderUri: UriComponents | undefined): TPromise<vscode.DebugConfiguration[]> {
+	public $provideDebugConfigurations(handle: number, folderUri: UriComponents | undefined): Thenable<vscode.DebugConfiguration[]> {
 		let handler = this._handlers.get(handle);
 		if (!handler) {
 			return TPromise.wrapError<vscode.DebugConfiguration[]>(new Error('no handler found'));
@@ -416,10 +460,10 @@ export class ExtHostDebugService implements ExtHostDebugServiceShape {
 		if (!handler.provideDebugConfigurations) {
 			return TPromise.wrapError<vscode.DebugConfiguration[]>(new Error('handler has no method provideDebugConfigurations'));
 		}
-		return asWinJsPromise(token => handler.provideDebugConfigurations(this.getFolder(folderUri), token));
+		return asThenable(() => handler.provideDebugConfigurations(this.getFolder(folderUri), CancellationToken.None));
 	}
 
-	public $resolveDebugConfiguration(handle: number, folderUri: UriComponents | undefined, debugConfiguration: vscode.DebugConfiguration): TPromise<vscode.DebugConfiguration> {
+	public $resolveDebugConfiguration(handle: number, folderUri: UriComponents | undefined, debugConfiguration: vscode.DebugConfiguration): Thenable<vscode.DebugConfiguration> {
 		let handler = this._handlers.get(handle);
 		if (!handler) {
 			return TPromise.wrapError<vscode.DebugConfiguration>(new Error('no handler found'));
@@ -427,10 +471,10 @@ export class ExtHostDebugService implements ExtHostDebugServiceShape {
 		if (!handler.resolveDebugConfiguration) {
 			return TPromise.wrapError<vscode.DebugConfiguration>(new Error('handler has no method resolveDebugConfiguration'));
 		}
-		return asWinJsPromise(token => handler.resolveDebugConfiguration(this.getFolder(folderUri), debugConfiguration, token));
+		return asThenable(() => handler.resolveDebugConfiguration(this.getFolder(folderUri), debugConfiguration, CancellationToken.None));
 	}
 
-	public $debugAdapterExecutable(handle: number, folderUri: UriComponents | undefined): TPromise<vscode.DebugAdapterExecutable> {
+	public $debugAdapterExecutable(handle: number, folderUri: UriComponents | undefined): Thenable<vscode.DebugAdapterExecutable> {
 		let handler = this._handlers.get(handle);
 		if (!handler) {
 			return TPromise.wrapError<vscode.DebugAdapterExecutable>(new Error('no handler found'));
@@ -438,10 +482,10 @@ export class ExtHostDebugService implements ExtHostDebugServiceShape {
 		if (!handler.debugAdapterExecutable) {
 			return TPromise.wrapError<vscode.DebugAdapterExecutable>(new Error('handler has no method debugAdapterExecutable'));
 		}
-		return asWinJsPromise(token => handler.debugAdapterExecutable(this.getFolder(folderUri), token));
+		return asThenable(() => handler.debugAdapterExecutable(this.getFolder(folderUri), CancellationToken.None));
 	}
 
-	public startDebugging(folder: vscode.WorkspaceFolder | undefined, nameOrConfig: string | vscode.DebugConfiguration): TPromise<boolean> {
+	public startDebugging(folder: vscode.WorkspaceFolder | undefined, nameOrConfig: string | vscode.DebugConfiguration): Thenable<boolean> {
 		return this._debugServiceProxy.$startDebugging(folder ? folder.uri : undefined, nameOrConfig);
 	}
 
@@ -495,7 +539,7 @@ export class ExtHostDebugService implements ExtHostDebugServiceShape {
 		this._onDidReceiveDebugSessionCustomEvent.fire(ee);
 	}
 
-	private getFolder(_folderUri: UriComponents | undefined): vscode.WorkspaceFolder {
+	private getFolder(_folderUri: UriComponents | undefined): vscode.WorkspaceFolder | undefined {
 		if (_folderUri) {
 			const folderURI = URI.revive(_folderUri);
 			return this._workspaceService.resolveWorkspaceFolder(folderURI);
@@ -558,15 +602,12 @@ export class ExtHostDebugConsole implements vscode.DebugConsole {
 	}
 }
 
-export class ExtHostVariableResolverService implements IConfigurationResolverService {
+export class ExtHostVariableResolverService extends AbstractVariableResolverService {
 
-	_serviceBrand: any;
-	_variableResolver: VariableResolver;
-
-	constructor(workspace: ExtHostWorkspace, editors: ExtHostDocumentsAndEditors, configuration: ExtHostConfiguration) {
-		this._variableResolver = new VariableResolver({
+	constructor(workspaceService: ExtHostWorkspace, editorService: ExtHostDocumentsAndEditors, configurationService: ExtHostConfiguration) {
+		super({
 			getFolderUri: (folderName: string): URI => {
-				const folders = workspace.getWorkspaceFolders();
+				const folders = workspaceService.getWorkspaceFolders();
 				const found = folders.filter(f => f.name === folderName);
 				if (found && found.length > 0) {
 					return found[0].uri;
@@ -574,16 +615,16 @@ export class ExtHostVariableResolverService implements IConfigurationResolverSer
 				return undefined;
 			},
 			getWorkspaceFolderCount: (): number => {
-				return workspace.getWorkspaceFolders().length;
+				return workspaceService.getWorkspaceFolders().length;
 			},
 			getConfigurationValue: (folderUri: URI, section: string) => {
-				return configuration.getConfiguration(undefined, folderUri).get<string>(section);
+				return configurationService.getConfiguration(undefined, folderUri).get<string>(section);
 			},
 			getExecPath: (): string | undefined => {
 				return undefined;	// does not exist in EH
 			},
 			getFilePath: (): string | undefined => {
-				const activeEditor = editors.activeEditor();
+				const activeEditor = editorService.activeEditor();
 				if (activeEditor) {
 					const resource = activeEditor.document.uri;
 					if (resource.scheme === Schemas.file) {
@@ -593,34 +634,19 @@ export class ExtHostVariableResolverService implements IConfigurationResolverSer
 				return undefined;
 			},
 			getSelectedText: (): string | undefined => {
-				const activeEditor = editors.activeEditor();
+				const activeEditor = editorService.activeEditor();
 				if (activeEditor && !activeEditor.selection.isEmpty) {
 					return activeEditor.document.getText(activeEditor.selection);
 				}
 				return undefined;
 			},
 			getLineNumber: (): string => {
-				const activeEditor = editors.activeEditor();
+				const activeEditor = editorService.activeEditor();
 				if (activeEditor) {
 					return String(activeEditor.selection.end.line + 1);
 				}
 				return undefined;
 			}
-		}, process.env);
-	}
-
-	public resolve(root: IWorkspaceFolder, value: string): string;
-	public resolve(root: IWorkspaceFolder, value: string[]): string[];
-	public resolve(root: IWorkspaceFolder, value: IStringDictionary<string>): IStringDictionary<string>;
-	public resolve(root: IWorkspaceFolder, value: any): any {
-		return this._variableResolver.resolveAny(root ? root.uri : undefined, value);
-	}
-
-	public resolveAny<T>(root: IWorkspaceFolder, value: T, commandMapping?: IStringDictionary<string>): T {
-		return this._variableResolver.resolveAny(root ? root.uri : undefined, value, commandMapping);
-	}
-
-	public executeCommandVariables(configuration: any, variables: IStringDictionary<string>): TPromise<IStringDictionary<string>> {
-		throw new Error('findAndExecuteCommandVariables not implemented.');
+		});
 	}
 }
diff --git a/src/vs/workbench/api/node/extHostDecorations.ts b/src/vs/workbench/api/node/extHostDecorations.ts
index 77d9b441fc8..0e402fd31b3 100644
--- a/src/vs/workbench/api/node/extHostDecorations.ts
+++ b/src/vs/workbench/api/node/extHostDecorations.ts
@@ -5,27 +5,32 @@
 'use strict';
 
 import * as vscode from 'vscode';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { MainContext, IMainContext, ExtHostDecorationsShape, MainThreadDecorationsShape, DecorationData, DecorationRequest, DecorationReply } from 'vs/workbench/api/node/extHost.protocol';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { Disposable } from 'vs/workbench/api/node/extHostTypes';
-import { asWinJsPromise } from 'vs/base/common/async';
+import { CancellationToken } from 'vs/base/common/cancellation';
+
+interface ProviderData {
+	provider: vscode.DecorationProvider;
+	extensionId: string;
+}
 
 export class ExtHostDecorations implements ExtHostDecorationsShape {
 
 	private static _handlePool = 0;
 
-	private readonly _provider = new Map<number, vscode.DecorationProvider>();
+	private readonly _provider = new Map<number, ProviderData>();
 	private readonly _proxy: MainThreadDecorationsShape;
 
 	constructor(mainContext: IMainContext) {
 		this._proxy = mainContext.getProxy(MainContext.MainThreadDecorations);
 	}
 
-	registerDecorationProvider(provider: vscode.DecorationProvider, label: string): vscode.Disposable {
+	registerDecorationProvider(provider: vscode.DecorationProvider, extensionId: string): vscode.Disposable {
 		const handle = ExtHostDecorations._handlePool++;
-		this._provider.set(handle, provider);
-		this._proxy.$registerDecorationProvider(handle, label);
+		this._provider.set(handle, { provider, extensionId });
+		this._proxy.$registerDecorationProvider(handle, extensionId);
 
 		const listener = provider.onDidChangeDecorations(e => {
 			this._proxy.$onDidChange(handle, !e ? null : Array.isArray(e) ? e : [e]);
@@ -38,17 +43,20 @@ export class ExtHostDecorations implements ExtHostDecorationsShape {
 		});
 	}
 
-	$provideDecorations(requests: DecorationRequest[]): TPromise<DecorationReply> {
+	$provideDecorations(requests: DecorationRequest[], token: CancellationToken): Thenable<DecorationReply> {
 		const result: DecorationReply = Object.create(null);
 		return TPromise.join(requests.map(request => {
 			const { handle, uri, id } = request;
-			const provider = this._provider.get(handle);
-			if (!provider) {
+			if (!this._provider.has(handle)) {
 				// might have been unregistered in the meantime
 				return void 0;
 			}
-			return asWinJsPromise(token => provider.provideDecoration(URI.revive(uri), token)).then(data => {
-				result[id] = data && <DecorationData>[data.priority, data.bubble, data.title, data.abbreviation, data.color, data.source];
+			const { provider, extensionId } = this._provider.get(handle);
+			return Promise.resolve(provider.provideDecoration(URI.revive(uri), token)).then(data => {
+				if (data && data.letter && data.letter.length !== 1) {
+					console.warn(`INVALID decoration from extension '${extensionId}'. The 'letter' must be set and be one character, not '${data.letter}'.`);
+				}
+				result[id] = data && <DecorationData>[data.priority, data.bubble, data.title, data.letter, data.color, data.source];
 			}, err => {
 				console.error(err);
 			});
diff --git a/src/vs/workbench/api/node/extHostDiagnostics.ts b/src/vs/workbench/api/node/extHostDiagnostics.ts
index 9056054629e..0ceac3df023 100644
--- a/src/vs/workbench/api/node/extHostDiagnostics.ts
+++ b/src/vs/workbench/api/node/extHostDiagnostics.ts
@@ -6,27 +6,29 @@
 
 import { localize } from 'vs/nls';
 import { IMarkerData, MarkerSeverity } from 'vs/platform/markers/common/markers';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import * as vscode from 'vscode';
 import { MainContext, MainThreadDiagnosticsShape, ExtHostDiagnosticsShape, IMainContext } from './extHost.protocol';
-import { DiagnosticSeverity } from './extHostTypes';
+import { DiagnosticSeverity, Diagnostic } from './extHostTypes';
 import * as converter from './extHostTypeConverters';
-import { mergeSort } from 'vs/base/common/arrays';
+import { mergeSort, equals } from 'vs/base/common/arrays';
 import { Event, Emitter, debounceEvent, mapEvent } from 'vs/base/common/event';
 import { keys } from 'vs/base/common/map';
 
 export class DiagnosticCollection implements vscode.DiagnosticCollection {
 
 	private readonly _name: string;
+	private readonly _owner: string;
 	private readonly _maxDiagnosticsPerFile: number;
 	private readonly _onDidChangeDiagnostics: Emitter<(vscode.Uri | string)[]>;
+	private readonly _proxy: MainThreadDiagnosticsShape;
 
-	private _proxy: MainThreadDiagnosticsShape;
 	private _isDisposed = false;
 	private _data = new Map<string, vscode.Diagnostic[]>();
 
-	constructor(name: string, maxDiagnosticsPerFile: number, proxy: MainThreadDiagnosticsShape, onDidChangeDiagnostics: Emitter<(vscode.Uri | string)[]>) {
+	constructor(name: string, owner: string, maxDiagnosticsPerFile: number, proxy: MainThreadDiagnosticsShape, onDidChangeDiagnostics: Emitter<(vscode.Uri | string)[]>) {
 		this._name = name;
+		this._owner = owner;
 		this._maxDiagnosticsPerFile = maxDiagnosticsPerFile;
 		this._proxy = proxy;
 		this._onDidChangeDiagnostics = onDidChangeDiagnostics;
@@ -35,8 +37,7 @@ export class DiagnosticCollection implements vscode.DiagnosticCollection {
 	dispose(): void {
 		if (!this._isDisposed) {
 			this._onDidChangeDiagnostics.fire(keys(this._data));
-			this._proxy.$clear(this.name);
-			this._proxy = undefined;
+			this._proxy.$clear(this._owner);
 			this._data = undefined;
 			this._isDisposed = true;
 		}
@@ -61,9 +62,13 @@ export class DiagnosticCollection implements vscode.DiagnosticCollection {
 
 		this._checkDisposed();
 		let toSync: vscode.Uri[];
+		let hasChanged = true;
 
 		if (first instanceof URI) {
 
+			// check if this has actually changed
+			hasChanged = hasChanged && !equals(diagnostics, this.get(first), Diagnostic.isEqual);
+
 			if (!diagnostics) {
 				// remove this entry
 				this.delete(first);
@@ -102,6 +107,17 @@ export class DiagnosticCollection implements vscode.DiagnosticCollection {
 			}
 		}
 
+		// send event for extensions
+		this._onDidChangeDiagnostics.fire(toSync);
+
+		// if nothing has changed then there is nothing else to do
+		// we have updated the diagnostics but we don't send a message
+		// to the renderer. tho we have still send an event for other
+		// extensions because the diagnostic might carry more information
+		// than known to us
+		if (!hasChanged) {
+			return;
+		}
 		// compute change and send to main side
 		const entries: [URI, IMarkerData[]][] = [];
 		for (let uri of toSync) {
@@ -141,22 +157,21 @@ export class DiagnosticCollection implements vscode.DiagnosticCollection {
 			entries.push([uri, marker]);
 		}
 
-		this._onDidChangeDiagnostics.fire(toSync);
-		this._proxy.$changeMany(this.name, entries);
+		this._proxy.$changeMany(this._owner, entries);
 	}
 
 	delete(uri: vscode.Uri): void {
 		this._checkDisposed();
 		this._onDidChangeDiagnostics.fire([uri]);
 		this._data.delete(uri.toString());
-		this._proxy.$changeMany(this.name, [[uri, undefined]]);
+		this._proxy.$changeMany(this._owner, [[uri, undefined]]);
 	}
 
 	clear(): void {
 		this._checkDisposed();
 		this._onDidChangeDiagnostics.fire(keys(this._data));
 		this._data.clear();
-		this._proxy.$clear(this.name);
+		this._proxy.$clear(this._owner);
 	}
 
 	forEach(callback: (uri: URI, diagnostics: vscode.Diagnostic[], collection: DiagnosticCollection) => any, thisArg?: any): void {
@@ -204,7 +219,7 @@ export class ExtHostDiagnostics implements ExtHostDiagnosticsShape {
 	private static readonly _maxDiagnosticsPerFile: number = 1000;
 
 	private readonly _proxy: MainThreadDiagnosticsShape;
-	private readonly _collections: DiagnosticCollection[] = [];
+	private readonly _collections = new Map<string, DiagnosticCollection>();
 	private readonly _onDidChangeDiagnostics = new Emitter<(vscode.Uri | string)[]>();
 
 	static _debouncer(last: (vscode.Uri | string)[], current: (vscode.Uri | string)[]): (vscode.Uri | string)[] {
@@ -242,22 +257,28 @@ export class ExtHostDiagnostics implements ExtHostDiagnosticsShape {
 	}
 
 	createDiagnosticCollection(name: string): vscode.DiagnosticCollection {
+		let { _collections, _proxy, _onDidChangeDiagnostics } = this;
+		let owner: string;
 		if (!name) {
 			name = '_generated_diagnostic_collection_name_#' + ExtHostDiagnostics._idPool++;
+			owner = name;
+		} else if (!_collections.has(name)) {
+			owner = name;
+		} else {
+			console.warn(`DiagnosticCollection with name '${name}' does already exist.`);
+			do {
+				owner = name + ExtHostDiagnostics._idPool++;
+			} while (_collections.has(owner));
 		}
 
-		const { _collections, _proxy, _onDidChangeDiagnostics } = this;
 		const result = new class extends DiagnosticCollection {
 			constructor() {
-				super(name, ExtHostDiagnostics._maxDiagnosticsPerFile, _proxy, _onDidChangeDiagnostics);
-				_collections.push(this);
+				super(name, owner, ExtHostDiagnostics._maxDiagnosticsPerFile, _proxy, _onDidChangeDiagnostics);
+				_collections.set(owner, this);
 			}
 			dispose() {
 				super.dispose();
-				let idx = _collections.indexOf(this);
-				if (idx !== -1) {
-					_collections.splice(idx, 1);
-				}
+				_collections.delete(owner);
 			}
 		};
 
@@ -272,7 +293,7 @@ export class ExtHostDiagnostics implements ExtHostDiagnosticsShape {
 		} else {
 			let index = new Map<string, number>();
 			let res: [vscode.Uri, vscode.Diagnostic[]][] = [];
-			for (const collection of this._collections) {
+			this._collections.forEach(collection => {
 				collection.forEach((uri, diagnostics) => {
 					let idx = index.get(uri.toString());
 					if (typeof idx === 'undefined') {
@@ -282,18 +303,18 @@ export class ExtHostDiagnostics implements ExtHostDiagnosticsShape {
 					}
 					res[idx][1] = res[idx][1].concat(...diagnostics);
 				});
-			}
+			});
 			return res;
 		}
 	}
 
 	private _getDiagnostics(resource: vscode.Uri): vscode.Diagnostic[] {
 		let res: vscode.Diagnostic[] = [];
-		for (const collection of this._collections) {
+		this._collections.forEach(collection => {
 			if (collection.has(resource)) {
 				res = res.concat(collection.get(resource));
 			}
-		}
+		});
 		return res;
 	}
 }
diff --git a/src/vs/workbench/api/node/extHostDialogs.ts b/src/vs/workbench/api/node/extHostDialogs.ts
index 70360049526..4def91a52e7 100644
--- a/src/vs/workbench/api/node/extHostDialogs.ts
+++ b/src/vs/workbench/api/node/extHostDialogs.ts
@@ -5,7 +5,7 @@
 'use strict';
 
 import * as vscode from 'vscode';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { MainContext, MainThreadDiaglogsShape, IMainContext } from 'vs/workbench/api/node/extHost.protocol';
 
 export class ExtHostDialogs {
diff --git a/src/vs/workbench/api/node/extHostDocumentContentProviders.ts b/src/vs/workbench/api/node/extHostDocumentContentProviders.ts
index 8086a431f29..ee8cbe11120 100644
--- a/src/vs/workbench/api/node/extHostDocumentContentProviders.ts
+++ b/src/vs/workbench/api/node/extHostDocumentContentProviders.ts
@@ -5,16 +5,15 @@
 'use strict';
 
 import { onUnexpectedError } from 'vs/base/common/errors';
-import URI, { UriComponents } from 'vs/base/common/uri';
+import { URI, UriComponents } from 'vs/base/common/uri';
 import { IDisposable } from 'vs/base/common/lifecycle';
 import { Disposable } from 'vs/workbench/api/node/extHostTypes';
-import { TPromise } from 'vs/base/common/winjs.base';
 import * as vscode from 'vscode';
-import { asWinJsPromise } from 'vs/base/common/async';
 import { MainContext, ExtHostDocumentContentProvidersShape, MainThreadDocumentContentProvidersShape, IMainContext } from './extHost.protocol';
 import { ExtHostDocumentsAndEditors } from './extHostDocumentsAndEditors';
 import { Schemas } from 'vs/base/common/network';
 import { ILogService } from 'vs/platform/log/common/log';
+import { CancellationToken } from 'vs/base/common/cancellation';
 
 export class ExtHostDocumentContentProvider implements ExtHostDocumentContentProvidersShape {
 
@@ -86,11 +85,11 @@ export class ExtHostDocumentContentProvider implements ExtHostDocumentContentPro
 		});
 	}
 
-	$provideTextDocumentContent(handle: number, uri: UriComponents): TPromise<string> {
+	$provideTextDocumentContent(handle: number, uri: UriComponents): Promise<string> {
 		const provider = this._documentContentProviders.get(handle);
 		if (!provider) {
-			return TPromise.wrapError<string>(new Error(`unsupported uri-scheme: ${uri.scheme}`));
+			return Promise.reject(new Error(`unsupported uri-scheme: ${uri.scheme}`));
 		}
-		return asWinJsPromise(token => provider.provideTextDocumentContent(URI.revive(uri), token));
+		return Promise.resolve(provider.provideTextDocumentContent(URI.revive(uri), CancellationToken.None));
 	}
 }
diff --git a/src/vs/workbench/api/node/extHostDocumentData.ts b/src/vs/workbench/api/node/extHostDocumentData.ts
index 2eeef2a7d5f..fec31cda756 100644
--- a/src/vs/workbench/api/node/extHostDocumentData.ts
+++ b/src/vs/workbench/api/node/extHostDocumentData.ts
@@ -7,7 +7,7 @@
 import { ok } from 'vs/base/common/assert';
 import { regExpLeadsToEndlessLoop } from 'vs/base/common/strings';
 import { MirrorTextModel } from 'vs/editor/common/model/mirrorTextModel';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { Range, Position, EndOfLine } from 'vs/workbench/api/node/extHostTypes';
 import * as vscode from 'vscode';
 import { getWordAtText, ensureValidWordDefinition } from 'vs/editor/common/model/wordHelper';
@@ -99,7 +99,7 @@ export class ExtHostDocumentData extends MirrorTextModel {
 		this._isDirty = isDirty;
 	}
 
-	private _save(): TPromise<boolean> {
+	private _save(): Thenable<boolean> {
 		if (this._isDisposed) {
 			return TPromise.wrapError<boolean>(new Error('Document has been closed'));
 		}
diff --git a/src/vs/workbench/api/node/extHostDocumentSaveParticipant.ts b/src/vs/workbench/api/node/extHostDocumentSaveParticipant.ts
index 4d0a156a617..3b729f70916 100644
--- a/src/vs/workbench/api/node/extHostDocumentSaveParticipant.ts
+++ b/src/vs/workbench/api/node/extHostDocumentSaveParticipant.ts
@@ -5,7 +5,7 @@
 'use strict';
 
 import { Event } from 'vs/base/common/event';
-import URI, { UriComponents } from 'vs/base/common/uri';
+import { URI, UriComponents } from 'vs/base/common/uri';
 import { sequence, always } from 'vs/base/common/async';
 import { illegalState } from 'vs/base/common/errors';
 import { ExtHostDocumentSaveParticipantShape, MainThreadTextEditorsShape, ResourceTextEditDto } from 'vs/workbench/api/node/extHost.protocol';
diff --git a/src/vs/workbench/api/node/extHostDocuments.ts b/src/vs/workbench/api/node/extHostDocuments.ts
index e9122c83d72..53303a27602 100644
--- a/src/vs/workbench/api/node/extHostDocuments.ts
+++ b/src/vs/workbench/api/node/extHostDocuments.ts
@@ -5,7 +5,7 @@
 'use strict';
 
 import { Event, Emitter } from 'vs/base/common/event';
-import URI, { UriComponents } from 'vs/base/common/uri';
+import { URI, UriComponents } from 'vs/base/common/uri';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import * as TypeConverters from './extHostTypeConverters';
 import { TPromise } from 'vs/base/common/winjs.base';
@@ -21,18 +21,16 @@ export class ExtHostDocuments implements ExtHostDocumentsShape {
 	private _onDidRemoveDocument = new Emitter<vscode.TextDocument>();
 	private _onDidChangeDocument = new Emitter<vscode.TextDocumentChangeEvent>();
 	private _onDidSaveDocument = new Emitter<vscode.TextDocument>();
-	private _onDidRenameResource = new Emitter<vscode.ResourceRenamedEvent>();
 
 	readonly onDidAddDocument: Event<vscode.TextDocument> = this._onDidAddDocument.event;
 	readonly onDidRemoveDocument: Event<vscode.TextDocument> = this._onDidRemoveDocument.event;
 	readonly onDidChangeDocument: Event<vscode.TextDocumentChangeEvent> = this._onDidChangeDocument.event;
 	readonly onDidSaveDocument: Event<vscode.TextDocument> = this._onDidSaveDocument.event;
-	readonly onDidRenameResource: Event<vscode.ResourceRenamedEvent> = this._onDidRenameResource.event;
 
 	private _toDispose: IDisposable[];
 	private _proxy: MainThreadDocumentsShape;
 	private _documentsAndEditors: ExtHostDocumentsAndEditors;
-	private _documentLoader = new Map<string, TPromise<ExtHostDocumentData>>();
+	private _documentLoader = new Map<string, Thenable<ExtHostDocumentData>>();
 
 	constructor(mainContext: IMainContext, documentsAndEditors: ExtHostDocumentsAndEditors) {
 		this._proxy = mainContext.getProxy(MainContext.MainThreadDocuments);
@@ -71,7 +69,7 @@ export class ExtHostDocuments implements ExtHostDocumentsShape {
 		return undefined;
 	}
 
-	public ensureDocumentData(uri: URI): TPromise<ExtHostDocumentData> {
+	public ensureDocumentData(uri: URI): Thenable<ExtHostDocumentData> {
 
 		let cached = this._documentsAndEditors.getDocument(uri.toString());
 		if (cached) {
@@ -93,7 +91,7 @@ export class ExtHostDocuments implements ExtHostDocumentsShape {
 		return promise;
 	}
 
-	public createDocumentData(options?: { language?: string; content?: string }): TPromise<URI> {
+	public createDocumentData(options?: { language?: string; content?: string }): Thenable<URI> {
 		return this._proxy.$tryCreateDocument(options).then(data => URI.revive(data));
 	}
 
@@ -150,11 +148,4 @@ export class ExtHostDocuments implements ExtHostDocumentsShape {
 	public setWordDefinitionFor(modeId: string, wordDefinition: RegExp): void {
 		setWordDefinitionFor(modeId, wordDefinition);
 	}
-
-	public $onDidRename(oldURL: UriComponents, newURL: UriComponents): void {
-		const oldResource = URI.revive(oldURL);
-		const newResource = URI.revive(newURL);
-		this._onDidRenameResource.fire({ oldResource, newResource });
-	}
-
 }
diff --git a/src/vs/workbench/api/node/extHostDocumentsAndEditors.ts b/src/vs/workbench/api/node/extHostDocumentsAndEditors.ts
index ac627c91ece..87e6a76a3a0 100644
--- a/src/vs/workbench/api/node/extHostDocumentsAndEditors.ts
+++ b/src/vs/workbench/api/node/extHostDocumentsAndEditors.ts
@@ -11,7 +11,7 @@ import { ExtHostDocumentData } from './extHostDocumentData';
 import { ExtHostTextEditor } from './extHostTextEditor';
 import * as assert from 'assert';
 import * as typeConverters from './extHostTypeConverters';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { Disposable } from './extHostTypes';
 
 export class ExtHostDocumentsAndEditors implements ExtHostDocumentsAndEditorsShape {
diff --git a/src/vs/workbench/api/node/extHostExtensionActivator.ts b/src/vs/workbench/api/node/extHostExtensionActivator.ts
index c37e7b2dfe7..5218f66cda6 100644
--- a/src/vs/workbench/api/node/extHostExtensionActivator.ts
+++ b/src/vs/workbench/api/node/extHostExtensionActivator.ts
@@ -10,7 +10,6 @@ import Severity from 'vs/base/common/severity';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { ExtensionDescriptionRegistry } from 'vs/workbench/services/extensions/node/extensionDescriptionRegistry';
 import { IExtensionDescription } from 'vs/workbench/services/extensions/common/extensions';
-import { ExtHostLogger } from 'vs/workbench/api/node/extHostLogService';
 
 const hasOwnProperty = Object.hasOwnProperty;
 const NO_OP_VOID_PROMISE = TPromise.wrap<void>(void 0);
@@ -27,8 +26,7 @@ export interface IExtensionContext {
 	extensionPath: string;
 	storagePath: string;
 	asAbsolutePath(relativePath: string): string;
-	logger: ExtHostLogger;
-	readonly logDirectory: string;
+	readonly logPath: string;
 }
 
 /**
diff --git a/src/vs/workbench/api/node/extHostExtensionService.ts b/src/vs/workbench/api/node/extHostExtensionService.ts
index a274837583e..ecfdec1b3d1 100644
--- a/src/vs/workbench/api/node/extHostExtensionService.ts
+++ b/src/vs/workbench/api/node/extHostExtensionService.ts
@@ -12,8 +12,8 @@ import { TPromise } from 'vs/base/common/winjs.base';
 import { ExtensionDescriptionRegistry } from 'vs/workbench/services/extensions/node/extensionDescriptionRegistry';
 import { IExtensionDescription } from 'vs/workbench/services/extensions/common/extensions';
 import { ExtHostStorage } from 'vs/workbench/api/node/extHostStorage';
-import { createApiFactory, initializeExtensionApi, checkProposedApiEnabled } from 'vs/workbench/api/node/extHost.api.impl';
-import { MainContext, MainThreadExtensionServiceShape, IWorkspaceData, IEnvironment, IInitData, ExtHostExtensionServiceShape, MainThreadTelemetryShape, IExtHostContext } from './extHost.protocol';
+import { createApiFactory, initializeExtensionApi } from 'vs/workbench/api/node/extHost.api.impl';
+import { MainContext, MainThreadExtensionServiceShape, IWorkspaceData, IEnvironment, IInitData, ExtHostExtensionServiceShape, MainThreadTelemetryShape, IMainContext } from './extHost.protocol';
 import { IExtensionMemento, ExtensionsActivator, ActivatedExtension, IExtensionAPI, IExtensionContext, EmptyExtension, IExtensionModule, ExtensionActivationTimesBuilder, ExtensionActivationTimes, ExtensionActivationReason, ExtensionActivatedByEvent } from 'vs/workbench/api/node/extHostExtensionActivator';
 import { ExtHostConfiguration } from 'vs/workbench/api/node/extHostConfiguration';
 import { ExtHostWorkspace } from 'vs/workbench/api/node/extHostWorkspace';
@@ -21,7 +21,7 @@ import { TernarySearchTree } from 'vs/base/common/map';
 import { Barrier } from 'vs/base/common/async';
 import { ILogService } from 'vs/platform/log/common/log';
 import { ExtHostLogService } from 'vs/workbench/api/node/extHostLogService';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 
 class ExtensionMemento implements IExtensionMemento {
 
@@ -29,7 +29,7 @@ class ExtensionMemento implements IExtensionMemento {
 	private readonly _shared: boolean;
 	private readonly _storage: ExtHostStorage;
 
-	private readonly _init: TPromise<ExtensionMemento>;
+	private readonly _init: Thenable<ExtensionMemento>;
 	private _value: { [n: string]: any; };
 
 	constructor(id: string, global: boolean, storage: ExtHostStorage) {
@@ -43,7 +43,7 @@ class ExtensionMemento implements IExtensionMemento {
 		});
 	}
 
-	get whenReady(): TPromise<ExtensionMemento> {
+	get whenReady(): Thenable<ExtensionMemento> {
 		return this._init;
 	}
 
@@ -68,7 +68,7 @@ class ExtensionStoragePath {
 	private readonly _workspace: IWorkspaceData;
 	private readonly _environment: IEnvironment;
 
-	private readonly _ready: TPromise<string>;
+	private readonly _ready: Promise<string>;
 	private _value: string;
 
 	constructor(workspace: IWorkspaceData, environment: IEnvironment) {
@@ -77,7 +77,7 @@ class ExtensionStoragePath {
 		this._ready = this._getOrCreateWorkspaceStoragePath().then(value => this._value = value);
 	}
 
-	get whenReady(): TPromise<any> {
+	get whenReady(): Promise<any> {
 		return this._ready;
 	}
 
@@ -88,13 +88,13 @@ class ExtensionStoragePath {
 		return undefined;
 	}
 
-	private async _getOrCreateWorkspaceStoragePath(): TPromise<string> {
+	private async _getOrCreateWorkspaceStoragePath(): Promise<string> {
 		if (!this._workspace) {
 			return TPromise.as(undefined);
 		}
 
 		const storageName = this._workspace.id;
-		const storagePath = join(this._environment.appSettingsHome, 'workspaceStorage', storageName);
+		const storagePath = join(this._environment.appSettingsHome.fsPath, 'workspaceStorage', storageName);
 
 		const exists = await dirExists(storagePath);
 
@@ -136,7 +136,7 @@ export class ExtHostExtensionService implements ExtHostExtensionServiceShape {
 	 * This class is constructed manually because it is a service, so it doesn't use any ctor injection
 	 */
 	constructor(initData: IInitData,
-		extHostContext: IExtHostContext,
+		extHostContext: IMainContext,
 		extHostWorkspace: ExtHostWorkspace,
 		extHostConfiguration: ExtHostConfiguration,
 		extHostLogService: ExtHostLogService
@@ -361,14 +361,7 @@ export class ExtHostExtensionService implements ExtHostExtensionServiceShape {
 				get extensionPath() { return extensionDescription.extensionLocation.fsPath; },
 				storagePath: this._storagePath.value(extensionDescription),
 				asAbsolutePath: (relativePath: string) => { return join(extensionDescription.extensionLocation.fsPath, relativePath); },
-				get logger() {
-					checkProposedApiEnabled(extensionDescription);
-					return that._extHostLogService.getExtLogger(extensionDescription.id);
-				},
-				get logDirectory() {
-					checkProposedApiEnabled(extensionDescription);
-					return that._extHostLogService.getLogDirectory(extensionDescription.id);
-				}
+				logPath: that._extHostLogService.getLogDirectory(extensionDescription.id)
 			});
 		});
 	}
@@ -409,7 +402,7 @@ export class ExtHostExtensionService implements ExtHostExtensionServiceShape {
 
 	// -- called by main thread
 
-	public $activateByEvent(activationEvent: string): TPromise<void> {
+	public $activateByEvent(activationEvent: string): Thenable<void> {
 		return this.activateByEvent(activationEvent, false);
 	}
 }
diff --git a/src/vs/workbench/api/node/extHostFileSystem.ts b/src/vs/workbench/api/node/extHostFileSystem.ts
index 2fa4cc8844f..00a379eb808 100644
--- a/src/vs/workbench/api/node/extHostFileSystem.ts
+++ b/src/vs/workbench/api/node/extHostFileSystem.ts
@@ -4,17 +4,16 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import URI, { UriComponents } from 'vs/base/common/uri';
-import { TPromise } from 'vs/base/common/winjs.base';
+import { URI, UriComponents } from 'vs/base/common/uri';
 import { MainContext, IMainContext, ExtHostFileSystemShape, MainThreadFileSystemShape, IFileChangeDto } from './extHost.protocol';
 import * as vscode from 'vscode';
 import * as files from 'vs/platform/files/common/files';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { asWinJsPromise } from 'vs/base/common/async';
+import { IDisposable, toDisposable } from 'vs/base/common/lifecycle';
 import { values } from 'vs/base/common/map';
 import { Range, FileChangeType } from 'vs/workbench/api/node/extHostTypes';
 import { ExtHostLanguageFeatures } from 'vs/workbench/api/node/extHostLanguageFeatures';
 import { Schemas } from 'vs/base/common/network';
+import { LabelRules } from 'vs/platform/label/common/label';
 
 class FsLinkProvider implements vscode.DocumentLinkProvider {
 
@@ -83,7 +82,7 @@ export class ExtHostFileSystem implements ExtHostFileSystemShape {
 		extHostLanguageFeatures.registerDocumentLinkProvider('*', this._linkProvider);
 	}
 
-	registerFileSystemProvider(scheme: string, provider: vscode.FileSystemProvider, options: { isCaseSensitive?: boolean } = {}) {
+	registerFileSystemProvider(scheme: string, provider: vscode.FileSystemProvider, options: { isCaseSensitive?: boolean, isReadonly?: boolean } = {}) {
 
 		if (this._usedSchemes.has(scheme)) {
 			throw new Error(`a provider for the scheme '${scheme}' is already registered`);
@@ -98,9 +97,17 @@ export class ExtHostFileSystem implements ExtHostFileSystemShape {
 		if (options.isCaseSensitive) {
 			capabilites += files.FileSystemProviderCapabilities.PathCaseSensitive;
 		}
+		if (options.isReadonly) {
+			capabilites += files.FileSystemProviderCapabilities.Readonly;
+		}
 		if (typeof provider.copy === 'function') {
 			capabilites += files.FileSystemProviderCapabilities.FileFolderCopy;
 		}
+		if (typeof provider.open === 'function' && typeof provider.close === 'function'
+			&& typeof provider.read === 'function' && typeof provider.write === 'function'
+		) {
+			capabilites += files.FileSystemProviderCapabilities.FileOpenReadWriteClose;
+		}
 
 		this._proxy.$registerFileSystemProvider(handle, scheme, capabilites);
 
@@ -129,15 +136,17 @@ export class ExtHostFileSystem implements ExtHostFileSystemShape {
 			this._proxy.$onFileSystemChange(handle, mapped);
 		});
 
-		return {
-			dispose: () => {
-				subscription.dispose();
-				this._linkProvider.delete(scheme);
-				this._usedSchemes.delete(scheme);
-				this._fsProvider.delete(handle);
-				this._proxy.$unregisterProvider(handle);
-			}
-		};
+		return toDisposable(() => {
+			subscription.dispose();
+			this._linkProvider.delete(scheme);
+			this._usedSchemes.delete(scheme);
+			this._fsProvider.delete(handle);
+			this._proxy.$unregisterProvider(handle);
+		});
+	}
+
+	setUriFormatter(scheme: string, formatter: LabelRules): void {
+		this._proxy.$setUriFormatter(scheme, formatter);
 	}
 
 	private static _asIStat(stat: vscode.FileStat): files.IStat {
@@ -145,47 +154,43 @@ export class ExtHostFileSystem implements ExtHostFileSystemShape {
 		return { type, ctime, mtime, size };
 	}
 
-	$stat(handle: number, resource: UriComponents): TPromise<files.IStat, any> {
-		return asWinJsPromise(() => this._fsProvider.get(handle).stat(URI.revive(resource))).then(ExtHostFileSystem._asIStat);
+	$stat(handle: number, resource: UriComponents): Promise<files.IStat> {
+		return Promise.resolve(this._fsProvider.get(handle).stat(URI.revive(resource))).then(ExtHostFileSystem._asIStat);
 	}
 
-	$readdir(handle: number, resource: UriComponents): TPromise<[string, files.FileType][], any> {
-		return asWinJsPromise(() => this._fsProvider.get(handle).readDirectory(URI.revive(resource)));
+	$readdir(handle: number, resource: UriComponents): Promise<[string, files.FileType][]> {
+		return Promise.resolve(this._fsProvider.get(handle).readDirectory(URI.revive(resource)));
 	}
 
-	$readFile(handle: number, resource: UriComponents): TPromise<string> {
-		return asWinJsPromise(() => {
-			return this._fsProvider.get(handle).readFile(URI.revive(resource));
-		}).then(data => {
-			return Buffer.isBuffer(data) ? data.toString('base64') : Buffer.from(data.buffer, data.byteOffset, data.byteLength).toString('base64');
+	$readFile(handle: number, resource: UriComponents): Promise<Buffer> {
+		return Promise.resolve(this._fsProvider.get(handle).readFile(URI.revive(resource))).then(data => {
+			return Buffer.isBuffer(data) ? data : Buffer.from(data.buffer, data.byteOffset, data.byteLength);
 		});
 	}
 
-	$writeFile(handle: number, resource: UriComponents, base64Content: string, opts: files.FileWriteOptions): TPromise<void, any> {
-		return asWinJsPromise(() => this._fsProvider.get(handle).writeFile(URI.revive(resource), Buffer.from(base64Content, 'base64'), opts));
+	$writeFile(handle: number, resource: UriComponents, content: Buffer, opts: files.FileWriteOptions): Promise<void> {
+		return Promise.resolve(this._fsProvider.get(handle).writeFile(URI.revive(resource), content, opts));
 	}
 
-	$delete(handle: number, resource: UriComponents): TPromise<void, any> {
-		return asWinJsPromise(() => this._fsProvider.get(handle).delete(URI.revive(resource), { recursive: true }));
+	$delete(handle: number, resource: UriComponents, opts: files.FileDeleteOptions): Promise<void> {
+		return Promise.resolve(this._fsProvider.get(handle).delete(URI.revive(resource), opts));
 	}
 
-	$rename(handle: number, oldUri: UriComponents, newUri: UriComponents, opts: files.FileOverwriteOptions): TPromise<void, any> {
-		return asWinJsPromise(() => this._fsProvider.get(handle).rename(URI.revive(oldUri), URI.revive(newUri), opts));
+	$rename(handle: number, oldUri: UriComponents, newUri: UriComponents, opts: files.FileOverwriteOptions): Promise<void> {
+		return Promise.resolve(this._fsProvider.get(handle).rename(URI.revive(oldUri), URI.revive(newUri), opts));
 	}
 
-	$copy(handle: number, oldUri: UriComponents, newUri: UriComponents, opts: files.FileOverwriteOptions): TPromise<void, any> {
-		return asWinJsPromise(() => this._fsProvider.get(handle).copy(URI.revive(oldUri), URI.revive(newUri), opts));
+	$copy(handle: number, oldUri: UriComponents, newUri: UriComponents, opts: files.FileOverwriteOptions): Promise<void> {
+		return Promise.resolve(this._fsProvider.get(handle).copy(URI.revive(oldUri), URI.revive(newUri), opts));
 	}
 
-	$mkdir(handle: number, resource: UriComponents): TPromise<void, any> {
-		return asWinJsPromise(() => this._fsProvider.get(handle).createDirectory(URI.revive(resource)));
+	$mkdir(handle: number, resource: UriComponents): Promise<void> {
+		return Promise.resolve(this._fsProvider.get(handle).createDirectory(URI.revive(resource)));
 	}
 
 	$watch(handle: number, session: number, resource: UriComponents, opts: files.IWatchOptions): void {
-		asWinJsPromise(() => {
-			let subscription = this._fsProvider.get(handle).watch(URI.revive(resource), opts);
-			this._watches.set(session, subscription);
-		});
+		let subscription = this._fsProvider.get(handle).watch(URI.revive(resource), opts);
+		this._watches.set(session, subscription);
 	}
 
 	$unwatch(session: number): void {
@@ -195,4 +200,21 @@ export class ExtHostFileSystem implements ExtHostFileSystemShape {
 			this._watches.delete(session);
 		}
 	}
+
+	$open(handle: number, resource: UriComponents): Promise<number> {
+		return Promise.resolve(this._fsProvider.get(handle).open(URI.revive(resource)));
+	}
+
+	$close(handle: number, fd: number): Promise<void> {
+		return Promise.resolve(this._fsProvider.get(handle).close(fd));
+	}
+
+	$read(handle: number, fd: number, pos: number, data: Buffer, offset: number, length: number): Promise<number> {
+		return Promise.resolve(this._fsProvider.get(handle).read(fd, pos, data, offset, length));
+	}
+
+	$write(handle: number, fd: number, pos: number, data: Buffer, offset: number, length: number): Promise<number> {
+		return Promise.resolve(this._fsProvider.get(handle).write(fd, pos, data, offset, length));
+	}
+
 }
diff --git a/src/vs/workbench/api/node/extHostFileSystemEventService.ts b/src/vs/workbench/api/node/extHostFileSystemEventService.ts
index eeb7b256dcc..28e91aa10f3 100644
--- a/src/vs/workbench/api/node/extHostFileSystemEventService.ts
+++ b/src/vs/workbench/api/node/extHostFileSystemEventService.ts
@@ -4,18 +4,22 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import { Event, Emitter } from 'vs/base/common/event';
-import { Disposable } from './extHostTypes';
-import { parse, IRelativePattern } from 'vs/base/common/glob';
-import { Uri, FileSystemWatcher as _FileSystemWatcher } from 'vscode';
-import { FileSystemEvents, ExtHostFileSystemEventServiceShape } from './extHost.protocol';
-import URI from 'vs/base/common/uri';
+import { flatten } from 'vs/base/common/arrays';
+import { AsyncEmitter, Emitter, Event } from 'vs/base/common/event';
+import { IRelativePattern, parse } from 'vs/base/common/glob';
+import { URI, UriComponents } from 'vs/base/common/uri';
+import { ExtHostDocumentsAndEditors } from 'vs/workbench/api/node/extHostDocumentsAndEditors';
+import { IExtensionDescription } from 'vs/workbench/services/extensions/common/extensions';
+import * as vscode from 'vscode';
+import { ExtHostFileSystemEventServiceShape, FileSystemEvents, IMainContext, MainContext, ResourceFileEditDto, ResourceTextEditDto, MainThreadTextEditorsShape } from './extHost.protocol';
+import * as typeConverter from './extHostTypeConverters';
+import { Disposable, WorkspaceEdit } from './extHostTypes';
 
-class FileSystemWatcher implements _FileSystemWatcher {
+class FileSystemWatcher implements vscode.FileSystemWatcher {
 
-	private _onDidCreate = new Emitter<Uri>();
-	private _onDidChange = new Emitter<Uri>();
-	private _onDidDelete = new Emitter<Uri>();
+	private _onDidCreate = new Emitter<vscode.Uri>();
+	private _onDidChange = new Emitter<vscode.Uri>();
+	private _onDidDelete = new Emitter<vscode.Uri>();
 	private _disposable: Disposable;
 	private _config: number;
 
@@ -80,31 +84,100 @@ class FileSystemWatcher implements _FileSystemWatcher {
 		this._disposable.dispose();
 	}
 
-	get onDidCreate(): Event<Uri> {
+	get onDidCreate(): Event<vscode.Uri> {
 		return this._onDidCreate.event;
 	}
 
-	get onDidChange(): Event<Uri> {
+	get onDidChange(): Event<vscode.Uri> {
 		return this._onDidChange.event;
 	}
 
-	get onDidDelete(): Event<Uri> {
+	get onDidDelete(): Event<vscode.Uri> {
 		return this._onDidDelete.event;
 	}
 }
 
+interface WillRenameListener {
+	extension: IExtensionDescription;
+	(e: vscode.FileWillRenameEvent): any;
+}
+
 export class ExtHostFileSystemEventService implements ExtHostFileSystemEventServiceShape {
 
-	private _emitter = new Emitter<FileSystemEvents>();
+	private readonly _onFileEvent = new Emitter<FileSystemEvents>();
+	private readonly _onDidRenameFile = new Emitter<vscode.FileRenameEvent>();
+	private readonly _onWillRenameFile = new AsyncEmitter<vscode.FileWillRenameEvent>();
 
-	constructor() {
+	readonly onDidRenameFile: Event<vscode.FileRenameEvent> = this._onDidRenameFile.event;
+
+	constructor(
+		mainContext: IMainContext,
+		private readonly _extHostDocumentsAndEditors: ExtHostDocumentsAndEditors,
+		private readonly _mainThreadTextEditors: MainThreadTextEditorsShape = mainContext.getProxy(MainContext.MainThreadTextEditors)
+	) {
+		//
 	}
 
-	public createFileSystemWatcher(globPattern: string | IRelativePattern, ignoreCreateEvents?: boolean, ignoreChangeEvents?: boolean, ignoreDeleteEvents?: boolean): _FileSystemWatcher {
-		return new FileSystemWatcher(this._emitter.event, globPattern, ignoreCreateEvents, ignoreChangeEvents, ignoreDeleteEvents);
+	public createFileSystemWatcher(globPattern: string | IRelativePattern, ignoreCreateEvents?: boolean, ignoreChangeEvents?: boolean, ignoreDeleteEvents?: boolean): vscode.FileSystemWatcher {
+		return new FileSystemWatcher(this._onFileEvent.event, globPattern, ignoreCreateEvents, ignoreChangeEvents, ignoreDeleteEvents);
 	}
 
 	$onFileEvent(events: FileSystemEvents) {
-		this._emitter.fire(events);
+		this._onFileEvent.fire(events);
+	}
+
+	$onFileRename(oldUri: UriComponents, newUri: UriComponents) {
+		this._onDidRenameFile.fire(Object.freeze({ oldUri: URI.revive(oldUri), newUri: URI.revive(newUri) }));
+	}
+
+	getOnWillRenameFileEvent(extension: IExtensionDescription): Event<vscode.FileWillRenameEvent> {
+		return (listener, thisArg, disposables) => {
+			let wrappedListener = <WillRenameListener><any>function () {
+				listener.apply(thisArg, arguments);
+			};
+			wrappedListener.extension = extension;
+			return this._onWillRenameFile.event(wrappedListener, undefined, disposables);
+		};
+	}
+
+	$onWillRename(oldUriDto: UriComponents, newUriDto: UriComponents): Thenable<any> {
+		const oldUri = URI.revive(oldUriDto);
+		const newUri = URI.revive(newUriDto);
+
+		const edits: WorkspaceEdit[] = [];
+		return Promise.resolve(this._onWillRenameFile.fireAsync((bucket, _listener) => {
+			return {
+				oldUri,
+				newUri,
+				waitUntil: (thenable: Thenable<vscode.WorkspaceEdit>): void => {
+					if (Object.isFrozen(bucket)) {
+						throw new TypeError('waitUntil cannot be called async');
+					}
+					const index = bucket.length;
+					const wrappedThenable = Promise.resolve(thenable).then(result => {
+						// ignore all results except for WorkspaceEdits. Those
+						// are stored in a spare array
+						if (result instanceof WorkspaceEdit) {
+							edits[index] = result;
+						}
+					});
+					bucket.push(wrappedThenable);
+				}
+			};
+		}).then(() => {
+			if (edits.length === 0) {
+				return undefined;
+			}
+			// flatten all WorkspaceEdits collected via waitUntil-call
+			// and apply them in one go.
+			let allEdits = new Array<(ResourceFileEditDto | ResourceTextEditDto)[]>();
+			for (let edit of edits) {
+				if (edit) { // sparse array
+					let { edits } = typeConverter.WorkspaceEdit.from(edit, this._extHostDocumentsAndEditors);
+					allEdits.push(edits);
+				}
+			}
+			return this._mainThreadTextEditors.$tryApplyWorkspaceEdit({ edits: flatten(allEdits) });
+		}));
 	}
 }
diff --git a/src/vs/workbench/api/node/extHostLanguageFeatures.ts b/src/vs/workbench/api/node/extHostLanguageFeatures.ts
index 65a841ddd8b..fa47bf0e59e 100644
--- a/src/vs/workbench/api/node/extHostLanguageFeatures.ts
+++ b/src/vs/workbench/api/node/extHostLanguageFeatures.ts
@@ -4,26 +4,29 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import URI, { UriComponents } from 'vs/base/common/uri';
+import { URI, UriComponents } from 'vs/base/common/uri';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { mixin } from 'vs/base/common/objects';
 import * as vscode from 'vscode';
 import * as typeConvert from 'vs/workbench/api/node/extHostTypeConverters';
-import { Range, Disposable, CompletionList, SnippetString, CodeActionKind, SymbolInformation, SymbolInformation2 } from 'vs/workbench/api/node/extHostTypes';
+import { Range, Disposable, CompletionList, SnippetString, CodeActionKind, SymbolInformation, DocumentSymbol } from 'vs/workbench/api/node/extHostTypes';
 import { ISingleEditOperation } from 'vs/editor/common/model';
 import * as modes from 'vs/editor/common/modes';
 import { ExtHostHeapService } from 'vs/workbench/api/node/extHostHeapService';
 import { ExtHostDocuments } from 'vs/workbench/api/node/extHostDocuments';
 import { ExtHostCommands, CommandsConverter } from 'vs/workbench/api/node/extHostCommands';
 import { ExtHostDiagnostics } from 'vs/workbench/api/node/extHostDiagnostics';
-import { asWinJsPromise } from 'vs/base/common/async';
-import { MainContext, MainThreadLanguageFeaturesShape, ExtHostLanguageFeaturesShape, ObjectIdentifier, IRawColorInfo, IMainContext, IdObject, ISerializedRegExp, ISerializedIndentationRule, ISerializedOnEnterRule, ISerializedLanguageConfiguration, SymbolInformationDto, SuggestResultDto, WorkspaceSymbolsDto, SuggestionDto, CodeActionDto, ISerializedDocumentFilter } from './extHost.protocol';
+import { asThenable } from 'vs/base/common/async';
+import { MainContext, MainThreadLanguageFeaturesShape, ExtHostLanguageFeaturesShape, ObjectIdentifier, IRawColorInfo, IMainContext, IdObject, ISerializedRegExp, ISerializedIndentationRule, ISerializedOnEnterRule, ISerializedLanguageConfiguration, WorkspaceSymbolDto, SuggestResultDto, WorkspaceSymbolsDto, SuggestionDto, CodeActionDto, ISerializedDocumentFilter, WorkspaceEditDto } from './extHost.protocol';
 import { regExpLeadsToEndlessLoop } from 'vs/base/common/strings';
 import { IPosition } from 'vs/editor/common/core/position';
-import { IRange } from 'vs/editor/common/core/range';
+import { IRange, Range as EditorRange } from 'vs/editor/common/core/range';
 import { isFalsyOrEmpty } from 'vs/base/common/arrays';
 import { isObject } from 'vs/base/common/types';
 import { ISelection, Selection } from 'vs/editor/common/core/selection';
+import { IExtensionDescription } from 'vs/workbench/services/extensions/common/extensions';
+import { ILogService } from 'vs/platform/log/common/log';
+import { CancellationToken } from 'vs/base/common/cancellation';
 
 // --- adapter
 
@@ -37,21 +40,21 @@ class OutlineAdapter {
 		this._provider = provider;
 	}
 
-	provideDocumentSymbols(resource: URI): TPromise<SymbolInformationDto[]> {
+	provideDocumentSymbols(resource: URI, token: CancellationToken): Thenable<modes.DocumentSymbol[]> {
 		let doc = this._documents.getDocumentData(resource).document;
-		return asWinJsPromise(token => this._provider.provideDocumentSymbols(doc, token)).then(value => {
+		return asThenable(() => this._provider.provideDocumentSymbols(doc, token)).then(value => {
 			if (isFalsyOrEmpty(value)) {
 				return undefined;
 			}
-			let [probe] = value;
-			if (!(probe instanceof SymbolInformation2)) {
-				value = OutlineAdapter._asSymbolHierarchy(resource, <SymbolInformation[]>value);
+			if (value[0] instanceof DocumentSymbol) {
+				return (<DocumentSymbol[]>value).map(typeConvert.DocumentSymbol.from);
+			} else {
+				return OutlineAdapter._asDocumentSymbolTree(resource, <SymbolInformation[]>value);
 			}
-			return (<SymbolInformation2[]>value).map(typeConvert.SymbolInformation2.from);
 		});
 	}
 
-	private static _asSymbolHierarchy(resource: URI, info: SymbolInformation[]): vscode.SymbolInformation2[] {
+	private static _asDocumentSymbolTree(resource: URI, info: SymbolInformation[]): modes.DocumentSymbol[] {
 		// first sort by start (and end) and then loop over all elements
 		// and build a tree based on containment.
 		info = info.slice(0).sort((a, b) => {
@@ -61,13 +64,17 @@ class OutlineAdapter {
 			}
 			return res;
 		});
-		let res: SymbolInformation2[] = [];
-		let parentStack: SymbolInformation2[] = [];
+		let res: modes.DocumentSymbol[] = [];
+		let parentStack: modes.DocumentSymbol[] = [];
 		for (let i = 0; i < info.length; i++) {
-			let element = new SymbolInformation2(info[i].name, info[i].kind, '', info[i].location);
-			element.containerName = info[i].containerName;
-			element.location = info[i].location; // todo@joh make this proper
-			element.location.uri = element.location.uri || resource;
+			let element = <modes.DocumentSymbol>{
+				name: info[i].name,
+				kind: typeConvert.SymbolKind.from(info[i].kind),
+				containerName: info[i].containerName,
+				range: typeConvert.Range.from(info[i].location.range),
+				selectionRange: typeConvert.Range.from(info[i].location.range),
+				children: []
+			};
 
 			while (true) {
 				if (parentStack.length === 0) {
@@ -76,7 +83,7 @@ class OutlineAdapter {
 					break;
 				}
 				let parent = parentStack[parentStack.length - 1];
-				if (parent.definingRange.contains(element.definingRange) && !parent.definingRange.isEqual(element.definingRange)) {
+				if (EditorRange.containsRange(parent.range, element.range) && !EditorRange.equalsRange(parent.range, element.range)) {
 					parent.children.push(element);
 					parentStack.push(element);
 					break;
@@ -99,10 +106,10 @@ class CodeLensAdapter {
 		private readonly _provider: vscode.CodeLensProvider
 	) { }
 
-	provideCodeLenses(resource: URI): TPromise<modes.ICodeLensSymbol[]> {
+	provideCodeLenses(resource: URI, token: CancellationToken): Thenable<modes.ICodeLensSymbol[]> {
 		const doc = this._documents.getDocumentData(resource).document;
 
-		return asWinJsPromise(token => this._provider.provideCodeLenses(doc, token)).then(lenses => {
+		return asThenable(() => this._provider.provideCodeLenses(doc, token)).then(lenses => {
 			if (Array.isArray(lenses)) {
 				return lenses.map(lens => {
 					const id = this._heapService.keep(lens);
@@ -116,18 +123,18 @@ class CodeLensAdapter {
 		});
 	}
 
-	resolveCodeLens(resource: URI, symbol: modes.ICodeLensSymbol): TPromise<modes.ICodeLensSymbol> {
+	resolveCodeLens(resource: URI, symbol: modes.ICodeLensSymbol, token: CancellationToken): Thenable<modes.ICodeLensSymbol> {
 
 		const lens = this._heapService.get<vscode.CodeLens>(ObjectIdentifier.of(symbol));
 		if (!lens) {
 			return undefined;
 		}
 
-		let resolve: TPromise<vscode.CodeLens>;
+		let resolve: Thenable<vscode.CodeLens>;
 		if (typeof this._provider.resolveCodeLens !== 'function' || lens.isResolved) {
 			resolve = TPromise.as(lens);
 		} else {
-			resolve = asWinJsPromise(token => this._provider.resolveCodeLens(lens, token));
+			resolve = asThenable(() => this._provider.resolveCodeLens(lens, token));
 		}
 
 		return resolve.then(newLens => {
@@ -138,6 +145,15 @@ class CodeLensAdapter {
 	}
 }
 
+function convertToDefinitionLinks(value: vscode.Definition): modes.DefinitionLink[] {
+	if (Array.isArray(value)) {
+		return (value as (vscode.DefinitionLink | vscode.Location)[]).map(typeConvert.DefinitionLink.from);
+	} else if (value) {
+		return [typeConvert.DefinitionLink.from(value)];
+	}
+	return undefined;
+}
+
 class DefinitionAdapter {
 
 	constructor(
@@ -145,17 +161,10 @@ class DefinitionAdapter {
 		private readonly _provider: vscode.DefinitionProvider
 	) { }
 
-	provideDefinition(resource: URI, position: IPosition): TPromise<modes.Definition> {
+	provideDefinition(resource: URI, position: IPosition, token: CancellationToken): Thenable<modes.DefinitionLink[]> {
 		let doc = this._documents.getDocumentData(resource).document;
 		let pos = typeConvert.Position.to(position);
-		return asWinJsPromise(token => this._provider.provideDefinition(doc, pos, token)).then(value => {
-			if (Array.isArray(value)) {
-				return value.map(typeConvert.location.from);
-			} else if (value) {
-				return typeConvert.location.from(value);
-			}
-			return undefined;
-		});
+		return asThenable(() => this._provider.provideDefinition(doc, pos, token)).then(convertToDefinitionLinks);
 	}
 }
 
@@ -166,17 +175,10 @@ class ImplementationAdapter {
 		private readonly _provider: vscode.ImplementationProvider
 	) { }
 
-	provideImplementation(resource: URI, position: IPosition): TPromise<modes.Definition> {
+	provideImplementation(resource: URI, position: IPosition, token: CancellationToken): Thenable<modes.DefinitionLink[]> {
 		let doc = this._documents.getDocumentData(resource).document;
 		let pos = typeConvert.Position.to(position);
-		return asWinJsPromise(token => this._provider.provideImplementation(doc, pos, token)).then(value => {
-			if (Array.isArray(value)) {
-				return value.map(typeConvert.location.from);
-			} else if (value) {
-				return typeConvert.location.from(value);
-			}
-			return undefined;
-		});
+		return asThenable(() => this._provider.provideImplementation(doc, pos, token)).then(convertToDefinitionLinks);
 	}
 }
 
@@ -187,17 +189,10 @@ class TypeDefinitionAdapter {
 		private readonly _provider: vscode.TypeDefinitionProvider
 	) { }
 
-	provideTypeDefinition(resource: URI, position: IPosition): TPromise<modes.Definition> {
+	provideTypeDefinition(resource: URI, position: IPosition, token: CancellationToken): Thenable<modes.DefinitionLink[]> {
 		const doc = this._documents.getDocumentData(resource).document;
 		const pos = typeConvert.Position.to(position);
-		return asWinJsPromise(token => this._provider.provideTypeDefinition(doc, pos, token)).then(value => {
-			if (Array.isArray(value)) {
-				return value.map(typeConvert.location.from);
-			} else if (value) {
-				return typeConvert.location.from(value);
-			}
-			return undefined;
-		});
+		return asThenable(() => this._provider.provideTypeDefinition(doc, pos, token)).then(convertToDefinitionLinks);
 	}
 }
 
@@ -208,12 +203,12 @@ class HoverAdapter {
 		private readonly _provider: vscode.HoverProvider,
 	) { }
 
-	public provideHover(resource: URI, position: IPosition): TPromise<modes.Hover> {
+	public provideHover(resource: URI, position: IPosition, token: CancellationToken): Thenable<modes.Hover> {
 
 		let doc = this._documents.getDocumentData(resource).document;
 		let pos = typeConvert.Position.to(position);
 
-		return asWinJsPromise(token => this._provider.provideHover(doc, pos, token)).then(value => {
+		return asThenable(() => this._provider.provideHover(doc, pos, token)).then(value => {
 			if (!value || isFalsyOrEmpty(value.contents)) {
 				return undefined;
 			}
@@ -236,12 +231,12 @@ class DocumentHighlightAdapter {
 		private readonly _provider: vscode.DocumentHighlightProvider
 	) { }
 
-	provideDocumentHighlights(resource: URI, position: IPosition): TPromise<modes.DocumentHighlight[]> {
+	provideDocumentHighlights(resource: URI, position: IPosition, token: CancellationToken): Thenable<modes.DocumentHighlight[]> {
 
 		let doc = this._documents.getDocumentData(resource).document;
 		let pos = typeConvert.Position.to(position);
 
-		return asWinJsPromise(token => this._provider.provideDocumentHighlights(doc, pos, token)).then(value => {
+		return asThenable(() => this._provider.provideDocumentHighlights(doc, pos, token)).then(value => {
 			if (Array.isArray(value)) {
 				return value.map(typeConvert.DocumentHighlight.from);
 			}
@@ -257,11 +252,11 @@ class ReferenceAdapter {
 		private readonly _provider: vscode.ReferenceProvider
 	) { }
 
-	provideReferences(resource: URI, position: IPosition, context: modes.ReferenceContext): TPromise<modes.Location[]> {
+	provideReferences(resource: URI, position: IPosition, context: modes.ReferenceContext, token: CancellationToken): Thenable<modes.Location[]> {
 		let doc = this._documents.getDocumentData(resource).document;
 		let pos = typeConvert.Position.to(position);
 
-		return asWinJsPromise(token => this._provider.provideReferences(doc, pos, context, token)).then(value => {
+		return asThenable(() => this._provider.provideReferences(doc, pos, context, token)).then(value => {
 			if (Array.isArray(value)) {
 				return value.map(typeConvert.location.from);
 			}
@@ -280,10 +275,12 @@ class CodeActionAdapter {
 		private readonly _documents: ExtHostDocuments,
 		private readonly _commands: CommandsConverter,
 		private readonly _diagnostics: ExtHostDiagnostics,
-		private readonly _provider: vscode.CodeActionProvider
+		private readonly _provider: vscode.CodeActionProvider,
+		private readonly _logService: ILogService,
+		private readonly _extensionId: string
 	) { }
 
-	provideCodeActions(resource: URI, rangeOrSelection: IRange | ISelection, context: modes.CodeActionContext): TPromise<CodeActionDto[]> {
+	provideCodeActions(resource: URI, rangeOrSelection: IRange | ISelection, context: modes.CodeActionContext, token: CancellationToken): Thenable<CodeActionDto[]> {
 
 		const doc = this._documents.getDocumentData(resource).document;
 		const ran = Selection.isISelection(rangeOrSelection)
@@ -299,13 +296,10 @@ class CodeActionAdapter {
 
 		const codeActionContext: vscode.CodeActionContext = {
 			diagnostics: allDiagnostics,
-			only: context.only ? new CodeActionKind(context.only) : undefined,
-			triggerKind: context.trigger,
+			only: context.only ? new CodeActionKind(context.only) : undefined
 		};
 
-		return asWinJsPromise(token =>
-			this._provider.provideCodeActions(doc, ran, codeActionContext, token)
-		).then(commandsOrActions => {
+		return asThenable(() => this._provider.provideCodeActions(doc, ran, codeActionContext, token)).then(commandsOrActions => {
 			if (isFalsyOrEmpty(commandsOrActions)) {
 				return undefined;
 			}
@@ -322,6 +316,14 @@ class CodeActionAdapter {
 						command: this._commands.toInternal(candidate),
 					});
 				} else {
+					if (codeActionContext.only) {
+						if (!candidate.kind) {
+							this._logService.warn(`${this._extensionId} - Code actions of kind '${codeActionContext.only.value} 'requested but returned code action does not have a 'kind'. Code action will be dropped. Please set 'CodeAction.kind'.`);
+						} else if (!codeActionContext.only.contains(candidate.kind)) {
+							this._logService.warn(`${this._extensionId} -Code actions of kind '${codeActionContext.only.value} 'requested but returned code action is of kind '${candidate.kind.value}'. Code action will be dropped. Please check 'CodeActionContext.only' to only return requested code actions.`);
+						}
+					}
+
 					// new school: convert code action
 					result.push({
 						title: candidate.title,
@@ -349,11 +351,11 @@ class DocumentFormattingAdapter {
 		private readonly _provider: vscode.DocumentFormattingEditProvider
 	) { }
 
-	provideDocumentFormattingEdits(resource: URI, options: modes.FormattingOptions): TPromise<ISingleEditOperation[]> {
+	provideDocumentFormattingEdits(resource: URI, options: modes.FormattingOptions, token: CancellationToken): Thenable<ISingleEditOperation[]> {
 
 		const { document } = this._documents.getDocumentData(resource);
 
-		return asWinJsPromise(token => this._provider.provideDocumentFormattingEdits(document, <any>options, token)).then(value => {
+		return asThenable(() => this._provider.provideDocumentFormattingEdits(document, <any>options, token)).then(value => {
 			if (Array.isArray(value)) {
 				return value.map(typeConvert.TextEdit.from);
 			}
@@ -369,12 +371,12 @@ class RangeFormattingAdapter {
 		private readonly _provider: vscode.DocumentRangeFormattingEditProvider
 	) { }
 
-	provideDocumentRangeFormattingEdits(resource: URI, range: IRange, options: modes.FormattingOptions): TPromise<ISingleEditOperation[]> {
+	provideDocumentRangeFormattingEdits(resource: URI, range: IRange, options: modes.FormattingOptions, token: CancellationToken): Thenable<ISingleEditOperation[]> {
 
 		const { document } = this._documents.getDocumentData(resource);
 		const ran = typeConvert.Range.to(range);
 
-		return asWinJsPromise(token => this._provider.provideDocumentRangeFormattingEdits(document, ran, <any>options, token)).then(value => {
+		return asThenable(() => this._provider.provideDocumentRangeFormattingEdits(document, ran, <any>options, token)).then(value => {
 			if (Array.isArray(value)) {
 				return value.map(typeConvert.TextEdit.from);
 			}
@@ -392,12 +394,12 @@ class OnTypeFormattingAdapter {
 
 	autoFormatTriggerCharacters: string[] = []; // not here
 
-	provideOnTypeFormattingEdits(resource: URI, position: IPosition, ch: string, options: modes.FormattingOptions): TPromise<ISingleEditOperation[]> {
+	provideOnTypeFormattingEdits(resource: URI, position: IPosition, ch: string, options: modes.FormattingOptions, token: CancellationToken): Thenable<ISingleEditOperation[]> {
 
 		const { document } = this._documents.getDocumentData(resource);
 		const pos = typeConvert.Position.to(position);
 
-		return asWinJsPromise(token => this._provider.provideOnTypeFormattingEdits(document, pos, ch, <any>options, token)).then(value => {
+		return asThenable(() => this._provider.provideOnTypeFormattingEdits(document, pos, ch, <any>options, token)).then(value => {
 			if (Array.isArray(value)) {
 				return value.map(typeConvert.TextEdit.from);
 			}
@@ -416,9 +418,9 @@ class NavigateTypeAdapter {
 		this._provider = provider;
 	}
 
-	provideWorkspaceSymbols(search: string): TPromise<WorkspaceSymbolsDto> {
+	provideWorkspaceSymbols(search: string, token: CancellationToken): Thenable<WorkspaceSymbolsDto> {
 		const result: WorkspaceSymbolsDto = IdObject.mixin({ symbols: [] });
-		return asWinJsPromise(token => this._provider.provideWorkspaceSymbols(search, token)).then(value => {
+		return asThenable(() => this._provider.provideWorkspaceSymbols(search, token)).then(value => {
 			if (!isFalsyOrEmpty(value)) {
 				for (const item of value) {
 					if (!item) {
@@ -429,7 +431,7 @@ class NavigateTypeAdapter {
 						console.warn('INVALID SymbolInformation, lacks name', item);
 						continue;
 					}
-					const symbol = IdObject.mixin(typeConvert.SymbolInformation.from(item));
+					const symbol = IdObject.mixin(typeConvert.WorkspaceSymbol.from(item));
 					this._symbolCache[symbol._id] = item;
 					result.symbols.push(symbol);
 				}
@@ -442,7 +444,7 @@ class NavigateTypeAdapter {
 		});
 	}
 
-	resolveWorkspaceSymbol(symbol: SymbolInformationDto): TPromise<SymbolInformationDto> {
+	resolveWorkspaceSymbol(symbol: WorkspaceSymbolDto, token: CancellationToken): Thenable<WorkspaceSymbolDto> {
 
 		if (typeof this._provider.resolveWorkspaceSymbol !== 'function') {
 			return TPromise.as(symbol);
@@ -450,8 +452,8 @@ class NavigateTypeAdapter {
 
 		const item = this._symbolCache[symbol._id];
 		if (item) {
-			return asWinJsPromise(token => this._provider.resolveWorkspaceSymbol(item, token)).then(value => {
-				return value && mixin(symbol, typeConvert.SymbolInformation.from(value), true);
+			return asThenable(() => this._provider.resolveWorkspaceSymbol(item, token)).then(value => {
+				return value && mixin(symbol, typeConvert.WorkspaceSymbol.from(value), true);
 			});
 		}
 		return undefined;
@@ -479,35 +481,28 @@ class RenameAdapter {
 		private readonly _provider: vscode.RenameProvider
 	) { }
 
-	provideRenameEdits(resource: URI, position: IPosition, newName: string): TPromise<modes.WorkspaceEdit> {
+	provideRenameEdits(resource: URI, position: IPosition, newName: string, token: CancellationToken): Thenable<WorkspaceEditDto> {
 
 		let doc = this._documents.getDocumentData(resource).document;
 		let pos = typeConvert.Position.to(position);
 
-		return asWinJsPromise(token => this._provider.provideRenameEdits(doc, pos, newName, token)).then(value => {
+		return asThenable(() => this._provider.provideRenameEdits(doc, pos, newName, token)).then(value => {
 			if (!value) {
 				return undefined;
 			}
 			return typeConvert.WorkspaceEdit.from(value);
 		}, err => {
-			if (typeof err === 'string') {
-				return <modes.WorkspaceEdit>{
-					edits: undefined,
-					rejectReason: err
-				};
-			} else if (err instanceof Error && typeof err.message === 'string') {
-				return <modes.WorkspaceEdit>{
-					edits: undefined,
-					rejectReason: err.message
-				};
+			let rejectReason = RenameAdapter._asMessage(err);
+			if (rejectReason) {
+				return <WorkspaceEditDto>{ rejectReason, edits: undefined };
 			} else {
 				// generic error
-				return TPromise.wrapError<modes.WorkspaceEdit>(err);
+				return Promise.reject<WorkspaceEditDto>(err);
 			}
 		});
 	}
 
-	resolveRenameLocation(resource: URI, position: IPosition): TPromise<modes.RenameLocation> {
+	resolveRenameLocation(resource: URI, position: IPosition, token: CancellationToken): Thenable<modes.RenameLocation & modes.Rejection> {
 		if (typeof this._provider.prepareRename !== 'function') {
 			return TPromise.as(undefined);
 		}
@@ -515,7 +510,7 @@ class RenameAdapter {
 		let doc = this._documents.getDocumentData(resource).document;
 		let pos = typeConvert.Position.to(position);
 
-		return asWinJsPromise(token => this._provider.prepareRename(doc, pos, token)).then(rangeOrLocation => {
+		return asThenable(() => this._provider.prepareRename(doc, pos, token)).then(rangeOrLocation => {
 
 			let range: vscode.Range;
 			let text: string;
@@ -537,8 +532,25 @@ class RenameAdapter {
 				return undefined;
 			}
 			return { range: typeConvert.Range.from(range), text };
+		}, err => {
+			let rejectReason = RenameAdapter._asMessage(err);
+			if (rejectReason) {
+				return <modes.RenameLocation & modes.Rejection>{ rejectReason, range: undefined, text: undefined };
+			} else {
+				return Promise.reject(err);
+			}
 		});
 	}
+
+	private static _asMessage(err: any): string {
+		if (typeof err === 'string') {
+			return err;
+		} else if (err instanceof Error && typeof err.message === 'string') {
+			return err.message;
+		} else {
+			return undefined;
+		}
+	}
 }
 
 class SuggestAdapter {
@@ -560,14 +572,14 @@ class SuggestAdapter {
 		this._provider = provider;
 	}
 
-	provideCompletionItems(resource: URI, position: IPosition, context: modes.SuggestContext): TPromise<SuggestResultDto> {
+	provideCompletionItems(resource: URI, position: IPosition, context: modes.SuggestContext, token: CancellationToken): Thenable<SuggestResultDto> {
 
 		const doc = this._documents.getDocumentData(resource).document;
 		const pos = typeConvert.Position.to(position);
 
-		return asWinJsPromise<vscode.CompletionItem[] | vscode.CompletionList>(token => {
-			return this._provider.provideCompletionItems(doc, pos, token, typeConvert.CompletionContext.from(context));
-		}).then(value => {
+		return asThenable<vscode.CompletionItem[] | vscode.CompletionList>(
+			() => this._provider.provideCompletionItems(doc, pos, token, typeConvert.CompletionContext.from(context))
+		).then(value => {
 
 			const _id = this._idPool++;
 
@@ -607,7 +619,7 @@ class SuggestAdapter {
 		});
 	}
 
-	resolveCompletionItem(resource: URI, position: IPosition, suggestion: modes.ISuggestion): TPromise<modes.ISuggestion> {
+	resolveCompletionItem(resource: URI, position: IPosition, suggestion: modes.ISuggestion, token: CancellationToken): Thenable<modes.ISuggestion> {
 
 		if (typeof this._provider.resolveCompletionItem !== 'function') {
 			return TPromise.as(suggestion);
@@ -619,7 +631,7 @@ class SuggestAdapter {
 			return TPromise.as(suggestion);
 		}
 
-		return asWinJsPromise(token => this._provider.resolveCompletionItem(item, token)).then(resolvedItem => {
+		return asThenable(() => this._provider.resolveCompletionItem(item, token)).then(resolvedItem => {
 
 			if (!resolvedItem) {
 				return suggestion;
@@ -658,6 +670,7 @@ class SuggestAdapter {
 			documentation: item.documentation,
 			filterText: item.filterText,
 			sortText: item.sortText,
+			preselect: item.preselect,
 			//
 			insertText: undefined,
 			additionalTextEdits: item.additionalTextEdits && item.additionalTextEdits.map(typeConvert.TextEdit.from),
@@ -711,12 +724,12 @@ class SignatureHelpAdapter {
 		private readonly _provider: vscode.SignatureHelpProvider
 	) { }
 
-	provideSignatureHelp(resource: URI, position: IPosition): TPromise<modes.SignatureHelp> {
+	provideSignatureHelp(resource: URI, position: IPosition, context: modes.SignatureHelpContext, token: CancellationToken): Thenable<modes.SignatureHelp> {
 
 		const doc = this._documents.getDocumentData(resource).document;
 		const pos = typeConvert.Position.to(position);
 
-		return asWinJsPromise(token => this._provider.provideSignatureHelp(doc, pos, token)).then(value => {
+		return asThenable(() => this._provider.provideSignatureHelp(doc, pos, token, context)).then(value => {
 			if (value) {
 				return typeConvert.SignatureHelp.from(value);
 			}
@@ -733,10 +746,10 @@ class LinkProviderAdapter {
 		private readonly _provider: vscode.DocumentLinkProvider
 	) { }
 
-	provideLinks(resource: URI): TPromise<modes.ILink[]> {
+	provideLinks(resource: URI, token: CancellationToken): Thenable<modes.ILink[]> {
 		const doc = this._documents.getDocumentData(resource).document;
 
-		return asWinJsPromise(token => this._provider.provideDocumentLinks(doc, token)).then(links => {
+		return asThenable(() => this._provider.provideDocumentLinks(doc, token)).then(links => {
 			if (!Array.isArray(links)) {
 				return undefined;
 			}
@@ -751,7 +764,7 @@ class LinkProviderAdapter {
 		});
 	}
 
-	resolveLink(link: modes.ILink): TPromise<modes.ILink> {
+	resolveLink(link: modes.ILink, token: CancellationToken): Thenable<modes.ILink> {
 		if (typeof this._provider.resolveDocumentLink !== 'function') {
 			return undefined;
 		}
@@ -762,7 +775,7 @@ class LinkProviderAdapter {
 			return undefined;
 		}
 
-		return asWinJsPromise(token => this._provider.resolveDocumentLink(item, token)).then(value => {
+		return asThenable(() => this._provider.resolveDocumentLink(item, token)).then(value => {
 			if (value) {
 				return typeConvert.DocumentLink.from(value);
 			}
@@ -778,9 +791,9 @@ class ColorProviderAdapter {
 		private _provider: vscode.DocumentColorProvider
 	) { }
 
-	provideColors(resource: URI): TPromise<IRawColorInfo[]> {
+	provideColors(resource: URI, token: CancellationToken): Thenable<IRawColorInfo[]> {
 		const doc = this._documents.getDocumentData(resource).document;
-		return asWinJsPromise(token => this._provider.provideDocumentColors(doc, token)).then(colors => {
+		return asThenable(() => this._provider.provideDocumentColors(doc, token)).then(colors => {
 			if (!Array.isArray(colors)) {
 				return [];
 			}
@@ -796,11 +809,11 @@ class ColorProviderAdapter {
 		});
 	}
 
-	provideColorPresentations(resource: URI, raw: IRawColorInfo): TPromise<modes.IColorPresentation[]> {
+	provideColorPresentations(resource: URI, raw: IRawColorInfo, token: CancellationToken): Thenable<modes.IColorPresentation[]> {
 		const document = this._documents.getDocumentData(resource).document;
 		const range = typeConvert.Range.to(raw.range);
 		const color = typeConvert.Color.to(raw.color);
-		return asWinJsPromise(token => this._provider.provideColorPresentations(color, { document, range }, token)).then(value => {
+		return asThenable(() => this._provider.provideColorPresentations(color, { document, range }, token)).then(value => {
 			return value.map(typeConvert.ColorPresentation.from);
 		});
 	}
@@ -813,9 +826,9 @@ class FoldingProviderAdapter {
 		private _provider: vscode.FoldingRangeProvider
 	) { }
 
-	provideFoldingRanges(resource: URI, context: modes.FoldingContext): TPromise<modes.FoldingRange[]> {
+	provideFoldingRanges(resource: URI, context: modes.FoldingContext, token: CancellationToken): Thenable<modes.FoldingRange[]> {
 		const doc = this._documents.getDocumentData(resource).document;
-		return asWinJsPromise(token => this._provider.provideFoldingRanges(doc, context, token)).then(ranges => {
+		return asThenable(() => this._provider.provideFoldingRanges(doc, context, token)).then(ranges => {
 			if (!Array.isArray(ranges)) {
 				return void 0;
 			}
@@ -845,6 +858,7 @@ export class ExtHostLanguageFeatures implements ExtHostLanguageFeaturesShape {
 	private _heapService: ExtHostHeapService;
 	private _diagnostics: ExtHostDiagnostics;
 	private _adapter = new Map<number, Adapter>();
+	private readonly _logService: ILogService;
 
 	constructor(
 		mainContext: IMainContext,
@@ -852,7 +866,8 @@ export class ExtHostLanguageFeatures implements ExtHostLanguageFeaturesShape {
 		documents: ExtHostDocuments,
 		commands: ExtHostCommands,
 		heapMonitor: ExtHostHeapService,
-		diagnostics: ExtHostDiagnostics
+		diagnostics: ExtHostDiagnostics,
+		logService: ILogService
 	) {
 		this._schemeTransformer = schemeTransformer;
 		this._proxy = mainContext.getProxy(MainContext.MainThreadLanguageFeatures);
@@ -860,6 +875,7 @@ export class ExtHostLanguageFeatures implements ExtHostLanguageFeaturesShape {
 		this._commands = commands;
 		this._heapService = heapMonitor;
 		this._diagnostics = diagnostics;
+		this._logService = logService;
 	}
 
 	private _transformDocumentSelector(selector: vscode.DocumentSelector): ISerializedDocumentFilter[] {
@@ -909,7 +925,7 @@ export class ExtHostLanguageFeatures implements ExtHostLanguageFeaturesShape {
 		return ExtHostLanguageFeatures._handlePool++;
 	}
 
-	private _withAdapter<A, R>(handle: number, ctor: { new(...args: any[]): A }, callback: (adapter: A) => TPromise<R>): TPromise<R> {
+	private _withAdapter<A, R>(handle: number, ctor: { new(...args: any[]): A }, callback: (adapter: A) => Thenable<R>): Thenable<R> {
 		let adapter = this._adapter.get(handle);
 		if (!(adapter instanceof ctor)) {
 			return TPromise.wrapError<R>(new Error('no adapter found'));
@@ -925,14 +941,14 @@ export class ExtHostLanguageFeatures implements ExtHostLanguageFeaturesShape {
 
 	// --- outline
 
-	registerDocumentSymbolProvider(selector: vscode.DocumentSelector, provider: vscode.DocumentSymbolProvider, extensionId?: string): vscode.Disposable {
+	registerDocumentSymbolProvider(selector: vscode.DocumentSelector, provider: vscode.DocumentSymbolProvider, extension?: IExtensionDescription): vscode.Disposable {
 		const handle = this._addNewAdapter(new OutlineAdapter(this._documents, provider));
-		this._proxy.$registerOutlineSupport(handle, this._transformDocumentSelector(selector), extensionId);
+		this._proxy.$registerOutlineSupport(handle, this._transformDocumentSelector(selector), extension ? extension.displayName || extension.name : undefined);
 		return this._createDisposable(handle);
 	}
 
-	$provideDocumentSymbols(handle: number, resource: UriComponents): TPromise<SymbolInformationDto[]> {
-		return this._withAdapter(handle, OutlineAdapter, adapter => adapter.provideDocumentSymbols(URI.revive(resource)));
+	$provideDocumentSymbols(handle: number, resource: UriComponents, token: CancellationToken): Thenable<modes.DocumentSymbol[]> {
+		return this._withAdapter(handle, OutlineAdapter, adapter => adapter.provideDocumentSymbols(URI.revive(resource), token));
 	}
 
 	// --- code lens
@@ -953,12 +969,12 @@ export class ExtHostLanguageFeatures implements ExtHostLanguageFeaturesShape {
 		return result;
 	}
 
-	$provideCodeLenses(handle: number, resource: UriComponents): TPromise<modes.ICodeLensSymbol[]> {
-		return this._withAdapter(handle, CodeLensAdapter, adapter => adapter.provideCodeLenses(URI.revive(resource)));
+	$provideCodeLenses(handle: number, resource: UriComponents, token: CancellationToken): Thenable<modes.ICodeLensSymbol[]> {
+		return this._withAdapter(handle, CodeLensAdapter, adapter => adapter.provideCodeLenses(URI.revive(resource), token));
 	}
 
-	$resolveCodeLens(handle: number, resource: UriComponents, symbol: modes.ICodeLensSymbol): TPromise<modes.ICodeLensSymbol> {
-		return this._withAdapter(handle, CodeLensAdapter, adapter => adapter.resolveCodeLens(URI.revive(resource), symbol));
+	$resolveCodeLens(handle: number, resource: UriComponents, symbol: modes.ICodeLensSymbol, token: CancellationToken): Thenable<modes.ICodeLensSymbol> {
+		return this._withAdapter(handle, CodeLensAdapter, adapter => adapter.resolveCodeLens(URI.revive(resource), symbol, token));
 	}
 
 	// --- declaration
@@ -969,8 +985,8 @@ export class ExtHostLanguageFeatures implements ExtHostLanguageFeaturesShape {
 		return this._createDisposable(handle);
 	}
 
-	$provideDefinition(handle: number, resource: UriComponents, position: IPosition): TPromise<modes.Definition> {
-		return this._withAdapter(handle, DefinitionAdapter, adapter => adapter.provideDefinition(URI.revive(resource), position));
+	$provideDefinition(handle: number, resource: UriComponents, position: IPosition, token: CancellationToken): Thenable<modes.DefinitionLink[]> {
+		return this._withAdapter(handle, DefinitionAdapter, adapter => adapter.provideDefinition(URI.revive(resource), position, token));
 	}
 
 	registerImplementationProvider(selector: vscode.DocumentSelector, provider: vscode.ImplementationProvider): vscode.Disposable {
@@ -979,8 +995,8 @@ export class ExtHostLanguageFeatures implements ExtHostLanguageFeaturesShape {
 		return this._createDisposable(handle);
 	}
 
-	$provideImplementation(handle: number, resource: UriComponents, position: IPosition): TPromise<modes.Definition> {
-		return this._withAdapter(handle, ImplementationAdapter, adapter => adapter.provideImplementation(URI.revive(resource), position));
+	$provideImplementation(handle: number, resource: UriComponents, position: IPosition, token: CancellationToken): Thenable<modes.DefinitionLink[]> {
+		return this._withAdapter(handle, ImplementationAdapter, adapter => adapter.provideImplementation(URI.revive(resource), position, token));
 	}
 
 	registerTypeDefinitionProvider(selector: vscode.DocumentSelector, provider: vscode.TypeDefinitionProvider): vscode.Disposable {
@@ -989,8 +1005,8 @@ export class ExtHostLanguageFeatures implements ExtHostLanguageFeaturesShape {
 		return this._createDisposable(handle);
 	}
 
-	$provideTypeDefinition(handle: number, resource: UriComponents, position: IPosition): TPromise<modes.Definition> {
-		return this._withAdapter(handle, TypeDefinitionAdapter, adapter => adapter.provideTypeDefinition(URI.revive(resource), position));
+	$provideTypeDefinition(handle: number, resource: UriComponents, position: IPosition, token: CancellationToken): Thenable<modes.DefinitionLink[]> {
+		return this._withAdapter(handle, TypeDefinitionAdapter, adapter => adapter.provideTypeDefinition(URI.revive(resource), position, token));
 	}
 
 	// --- extra info
@@ -1001,8 +1017,8 @@ export class ExtHostLanguageFeatures implements ExtHostLanguageFeaturesShape {
 		return this._createDisposable(handle);
 	}
 
-	$provideHover(handle: number, resource: UriComponents, position: IPosition): TPromise<modes.Hover> {
-		return this._withAdapter(handle, HoverAdapter, adpater => adpater.provideHover(URI.revive(resource), position));
+	$provideHover(handle: number, resource: UriComponents, position: IPosition, token: CancellationToken): Thenable<modes.Hover> {
+		return this._withAdapter(handle, HoverAdapter, adapter => adapter.provideHover(URI.revive(resource), position, token));
 	}
 
 	// --- occurrences
@@ -1013,8 +1029,8 @@ export class ExtHostLanguageFeatures implements ExtHostLanguageFeaturesShape {
 		return this._createDisposable(handle);
 	}
 
-	$provideDocumentHighlights(handle: number, resource: UriComponents, position: IPosition): TPromise<modes.DocumentHighlight[]> {
-		return this._withAdapter(handle, DocumentHighlightAdapter, adapter => adapter.provideDocumentHighlights(URI.revive(resource), position));
+	$provideDocumentHighlights(handle: number, resource: UriComponents, position: IPosition, token: CancellationToken): Thenable<modes.DocumentHighlight[]> {
+		return this._withAdapter(handle, DocumentHighlightAdapter, adapter => adapter.provideDocumentHighlights(URI.revive(resource), position, token));
 	}
 
 	// --- references
@@ -1025,21 +1041,21 @@ export class ExtHostLanguageFeatures implements ExtHostLanguageFeaturesShape {
 		return this._createDisposable(handle);
 	}
 
-	$provideReferences(handle: number, resource: UriComponents, position: IPosition, context: modes.ReferenceContext): TPromise<modes.Location[]> {
-		return this._withAdapter(handle, ReferenceAdapter, adapter => adapter.provideReferences(URI.revive(resource), position, context));
+	$provideReferences(handle: number, resource: UriComponents, position: IPosition, context: modes.ReferenceContext, token: CancellationToken): Thenable<modes.Location[]> {
+		return this._withAdapter(handle, ReferenceAdapter, adapter => adapter.provideReferences(URI.revive(resource), position, context, token));
 	}
 
 	// --- quick fix
 
-	registerCodeActionProvider(selector: vscode.DocumentSelector, provider: vscode.CodeActionProvider, metadata?: vscode.CodeActionProviderMetadata): vscode.Disposable {
-		const handle = this._addNewAdapter(new CodeActionAdapter(this._documents, this._commands.converter, this._diagnostics, provider));
+	registerCodeActionProvider(selector: vscode.DocumentSelector, provider: vscode.CodeActionProvider, extension?: IExtensionDescription, metadata?: vscode.CodeActionProviderMetadata): vscode.Disposable {
+		const handle = this._addNewAdapter(new CodeActionAdapter(this._documents, this._commands.converter, this._diagnostics, provider, this._logService, extension ? extension.id : ''));
 		this._proxy.$registerQuickFixSupport(handle, this._transformDocumentSelector(selector), metadata && metadata.providedCodeActionKinds ? metadata.providedCodeActionKinds.map(kind => kind.value) : undefined);
 		return this._createDisposable(handle);
 	}
 
 
-	$provideCodeActions(handle: number, resource: UriComponents, rangeOrSelection: IRange | ISelection, context: modes.CodeActionContext): TPromise<CodeActionDto[]> {
-		return this._withAdapter(handle, CodeActionAdapter, adapter => adapter.provideCodeActions(URI.revive(resource), rangeOrSelection, context));
+	$provideCodeActions(handle: number, resource: UriComponents, rangeOrSelection: IRange | ISelection, context: modes.CodeActionContext, token: CancellationToken): Thenable<CodeActionDto[]> {
+		return this._withAdapter(handle, CodeActionAdapter, adapter => adapter.provideCodeActions(URI.revive(resource), rangeOrSelection, context, token));
 	}
 
 	// --- formatting
@@ -1050,8 +1066,8 @@ export class ExtHostLanguageFeatures implements ExtHostLanguageFeaturesShape {
 		return this._createDisposable(handle);
 	}
 
-	$provideDocumentFormattingEdits(handle: number, resource: UriComponents, options: modes.FormattingOptions): TPromise<ISingleEditOperation[]> {
-		return this._withAdapter(handle, DocumentFormattingAdapter, adapter => adapter.provideDocumentFormattingEdits(URI.revive(resource), options));
+	$provideDocumentFormattingEdits(handle: number, resource: UriComponents, options: modes.FormattingOptions, token: CancellationToken): Thenable<ISingleEditOperation[]> {
+		return this._withAdapter(handle, DocumentFormattingAdapter, adapter => adapter.provideDocumentFormattingEdits(URI.revive(resource), options, token));
 	}
 
 	registerDocumentRangeFormattingEditProvider(selector: vscode.DocumentSelector, provider: vscode.DocumentRangeFormattingEditProvider): vscode.Disposable {
@@ -1060,8 +1076,8 @@ export class ExtHostLanguageFeatures implements ExtHostLanguageFeaturesShape {
 		return this._createDisposable(handle);
 	}
 
-	$provideDocumentRangeFormattingEdits(handle: number, resource: UriComponents, range: IRange, options: modes.FormattingOptions): TPromise<ISingleEditOperation[]> {
-		return this._withAdapter(handle, RangeFormattingAdapter, adapter => adapter.provideDocumentRangeFormattingEdits(URI.revive(resource), range, options));
+	$provideDocumentRangeFormattingEdits(handle: number, resource: UriComponents, range: IRange, options: modes.FormattingOptions, token: CancellationToken): Thenable<ISingleEditOperation[]> {
+		return this._withAdapter(handle, RangeFormattingAdapter, adapter => adapter.provideDocumentRangeFormattingEdits(URI.revive(resource), range, options, token));
 	}
 
 	registerOnTypeFormattingEditProvider(selector: vscode.DocumentSelector, provider: vscode.OnTypeFormattingEditProvider, triggerCharacters: string[]): vscode.Disposable {
@@ -1070,8 +1086,8 @@ export class ExtHostLanguageFeatures implements ExtHostLanguageFeaturesShape {
 		return this._createDisposable(handle);
 	}
 
-	$provideOnTypeFormattingEdits(handle: number, resource: UriComponents, position: IPosition, ch: string, options: modes.FormattingOptions): TPromise<ISingleEditOperation[]> {
-		return this._withAdapter(handle, OnTypeFormattingAdapter, adapter => adapter.provideOnTypeFormattingEdits(URI.revive(resource), position, ch, options));
+	$provideOnTypeFormattingEdits(handle: number, resource: UriComponents, position: IPosition, ch: string, options: modes.FormattingOptions, token: CancellationToken): Thenable<ISingleEditOperation[]> {
+		return this._withAdapter(handle, OnTypeFormattingAdapter, adapter => adapter.provideOnTypeFormattingEdits(URI.revive(resource), position, ch, options, token));
 	}
 
 	// --- navigate types
@@ -1082,15 +1098,15 @@ export class ExtHostLanguageFeatures implements ExtHostLanguageFeaturesShape {
 		return this._createDisposable(handle);
 	}
 
-	$provideWorkspaceSymbols(handle: number, search: string): TPromise<WorkspaceSymbolsDto> {
-		return this._withAdapter(handle, NavigateTypeAdapter, adapter => adapter.provideWorkspaceSymbols(search));
+	$provideWorkspaceSymbols(handle: number, search: string, token: CancellationToken): Thenable<WorkspaceSymbolsDto> {
+		return this._withAdapter(handle, NavigateTypeAdapter, adapter => adapter.provideWorkspaceSymbols(search, token));
 	}
 
-	$resolveWorkspaceSymbol(handle: number, symbol: SymbolInformationDto): TPromise<SymbolInformationDto> {
-		return this._withAdapter(handle, NavigateTypeAdapter, adapter => adapter.resolveWorkspaceSymbol(symbol));
+	$resolveWorkspaceSymbol(handle: number, symbol: WorkspaceSymbolDto, token: CancellationToken): Thenable<WorkspaceSymbolDto> {
+		return this._withAdapter(handle, NavigateTypeAdapter, adapter => adapter.resolveWorkspaceSymbol(symbol, token));
 	}
 
-	$releaseWorkspaceSymbols(handle: number, id: number) {
+	$releaseWorkspaceSymbols(handle: number, id: number): void {
 		this._withAdapter(handle, NavigateTypeAdapter, adapter => adapter.releaseWorkspaceSymbols(id));
 	}
 
@@ -1102,12 +1118,12 @@ export class ExtHostLanguageFeatures implements ExtHostLanguageFeaturesShape {
 		return this._createDisposable(handle);
 	}
 
-	$provideRenameEdits(handle: number, resource: UriComponents, position: IPosition, newName: string): TPromise<modes.WorkspaceEdit> {
-		return this._withAdapter(handle, RenameAdapter, adapter => adapter.provideRenameEdits(URI.revive(resource), position, newName));
+	$provideRenameEdits(handle: number, resource: UriComponents, position: IPosition, newName: string, token: CancellationToken): Thenable<WorkspaceEditDto> {
+		return this._withAdapter(handle, RenameAdapter, adapter => adapter.provideRenameEdits(URI.revive(resource), position, newName, token));
 	}
 
-	$resolveRenameLocation(handle: number, resource: URI, position: IPosition): TPromise<modes.RenameLocation> {
-		return this._withAdapter(handle, RenameAdapter, adapter => adapter.resolveRenameLocation(URI.revive(resource), position));
+	$resolveRenameLocation(handle: number, resource: URI, position: IPosition, token: CancellationToken): Thenable<modes.RenameLocation> {
+		return this._withAdapter(handle, RenameAdapter, adapter => adapter.resolveRenameLocation(URI.revive(resource), position, token));
 	}
 
 	// --- suggestion
@@ -1118,12 +1134,12 @@ export class ExtHostLanguageFeatures implements ExtHostLanguageFeaturesShape {
 		return this._createDisposable(handle);
 	}
 
-	$provideCompletionItems(handle: number, resource: UriComponents, position: IPosition, context: modes.SuggestContext): TPromise<SuggestResultDto> {
-		return this._withAdapter(handle, SuggestAdapter, adapter => adapter.provideCompletionItems(URI.revive(resource), position, context));
+	$provideCompletionItems(handle: number, resource: UriComponents, position: IPosition, context: modes.SuggestContext, token: CancellationToken): Thenable<SuggestResultDto> {
+		return this._withAdapter(handle, SuggestAdapter, adapter => adapter.provideCompletionItems(URI.revive(resource), position, context, token));
 	}
 
-	$resolveCompletionItem(handle: number, resource: UriComponents, position: IPosition, suggestion: modes.ISuggestion): TPromise<modes.ISuggestion> {
-		return this._withAdapter(handle, SuggestAdapter, adapter => adapter.resolveCompletionItem(URI.revive(resource), position, suggestion));
+	$resolveCompletionItem(handle: number, resource: UriComponents, position: IPosition, suggestion: modes.ISuggestion, token: CancellationToken): Thenable<modes.ISuggestion> {
+		return this._withAdapter(handle, SuggestAdapter, adapter => adapter.resolveCompletionItem(URI.revive(resource), position, suggestion, token));
 	}
 
 	$releaseCompletionItems(handle: number, id: number): void {
@@ -1138,8 +1154,8 @@ export class ExtHostLanguageFeatures implements ExtHostLanguageFeaturesShape {
 		return this._createDisposable(handle);
 	}
 
-	$provideSignatureHelp(handle: number, resource: UriComponents, position: IPosition): TPromise<modes.SignatureHelp> {
-		return this._withAdapter(handle, SignatureHelpAdapter, adapter => adapter.provideSignatureHelp(URI.revive(resource), position));
+	$provideSignatureHelp(handle: number, resource: UriComponents, position: IPosition, context: modes.SignatureHelpContext, token: CancellationToken): Thenable<modes.SignatureHelp> {
+		return this._withAdapter(handle, SignatureHelpAdapter, adapter => adapter.provideSignatureHelp(URI.revive(resource), position, context, token));
 	}
 
 	// --- links
@@ -1150,12 +1166,12 @@ export class ExtHostLanguageFeatures implements ExtHostLanguageFeaturesShape {
 		return this._createDisposable(handle);
 	}
 
-	$provideDocumentLinks(handle: number, resource: UriComponents): TPromise<modes.ILink[]> {
-		return this._withAdapter(handle, LinkProviderAdapter, adapter => adapter.provideLinks(URI.revive(resource)));
+	$provideDocumentLinks(handle: number, resource: UriComponents, token: CancellationToken): Thenable<modes.ILink[]> {
+		return this._withAdapter(handle, LinkProviderAdapter, adapter => adapter.provideLinks(URI.revive(resource), token));
 	}
 
-	$resolveDocumentLink(handle: number, link: modes.ILink): TPromise<modes.ILink> {
-		return this._withAdapter(handle, LinkProviderAdapter, adapter => adapter.resolveLink(link));
+	$resolveDocumentLink(handle: number, link: modes.ILink, token: CancellationToken): Thenable<modes.ILink> {
+		return this._withAdapter(handle, LinkProviderAdapter, adapter => adapter.resolveLink(link, token));
 	}
 
 	registerColorProvider(selector: vscode.DocumentSelector, provider: vscode.DocumentColorProvider): vscode.Disposable {
@@ -1164,12 +1180,12 @@ export class ExtHostLanguageFeatures implements ExtHostLanguageFeaturesShape {
 		return this._createDisposable(handle);
 	}
 
-	$provideDocumentColors(handle: number, resource: UriComponents): TPromise<IRawColorInfo[]> {
-		return this._withAdapter(handle, ColorProviderAdapter, adapter => adapter.provideColors(URI.revive(resource)));
+	$provideDocumentColors(handle: number, resource: UriComponents, token: CancellationToken): Thenable<IRawColorInfo[]> {
+		return this._withAdapter(handle, ColorProviderAdapter, adapter => adapter.provideColors(URI.revive(resource), token));
 	}
 
-	$provideColorPresentations(handle: number, resource: UriComponents, colorInfo: IRawColorInfo): TPromise<modes.IColorPresentation[]> {
-		return this._withAdapter(handle, ColorProviderAdapter, adapter => adapter.provideColorPresentations(URI.revive(resource), colorInfo));
+	$provideColorPresentations(handle: number, resource: UriComponents, colorInfo: IRawColorInfo, token: CancellationToken): Thenable<modes.IColorPresentation[]> {
+		return this._withAdapter(handle, ColorProviderAdapter, adapter => adapter.provideColorPresentations(URI.revive(resource), colorInfo, token));
 	}
 
 	registerFoldingRangeProvider(selector: vscode.DocumentSelector, provider: vscode.FoldingRangeProvider): vscode.Disposable {
@@ -1178,8 +1194,8 @@ export class ExtHostLanguageFeatures implements ExtHostLanguageFeaturesShape {
 		return this._createDisposable(handle);
 	}
 
-	$provideFoldingRanges(handle: number, resource: UriComponents, context: vscode.FoldingContext): TPromise<modes.FoldingRange[]> {
-		return this._withAdapter(handle, FoldingProviderAdapter, adapter => adapter.provideFoldingRanges(URI.revive(resource), context));
+	$provideFoldingRanges(handle: number, resource: UriComponents, context: vscode.FoldingContext, token: CancellationToken): Thenable<modes.FoldingRange[]> {
+		return this._withAdapter(handle, FoldingProviderAdapter, adapter => adapter.provideFoldingRanges(URI.revive(resource), context, token));
 	}
 
 	// --- configuration
diff --git a/src/vs/workbench/api/node/extHostLanguages.ts b/src/vs/workbench/api/node/extHostLanguages.ts
index 33baf762390..f8dac71a3b3 100644
--- a/src/vs/workbench/api/node/extHostLanguages.ts
+++ b/src/vs/workbench/api/node/extHostLanguages.ts
@@ -4,8 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import { TPromise } from 'vs/base/common/winjs.base';
 import { MainContext, MainThreadLanguagesShape, IMainContext } from './extHost.protocol';
+import * as vscode from 'vscode';
 
 export class ExtHostLanguages {
 
@@ -17,7 +17,10 @@ export class ExtHostLanguages {
 		this._proxy = mainContext.getProxy(MainContext.MainThreadLanguages);
 	}
 
-	getLanguages(): TPromise<string[]> {
+	getLanguages(): Thenable<string[]> {
 		return this._proxy.$getLanguages();
 	}
+	changeLanguage(documentUri: vscode.Uri, languageId: string): Thenable<void> {
+		return this._proxy.$changeLanguage(documentUri, languageId);
+	}
 }
diff --git a/src/vs/workbench/api/node/extHostLogService.ts b/src/vs/workbench/api/node/extHostLogService.ts
index 6708690a2f4..3d614625904 100644
--- a/src/vs/workbench/api/node/extHostLogService.ts
+++ b/src/vs/workbench/api/node/extHostLogService.ts
@@ -4,78 +4,34 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import * as vscode from 'vscode';
 import { join } from 'vs/base/common/paths';
 import { LogLevel } from 'vs/workbench/api/node/extHostTypes';
 import { ILogService, DelegatedLogService } from 'vs/platform/log/common/log';
 import { createSpdLogService } from 'vs/platform/log/node/spdlogService';
 import { ExtHostLogServiceShape } from 'vs/workbench/api/node/extHost.protocol';
+import { ExtensionHostLogFileName } from 'vs/workbench/services/extensions/common/extensions';
+import { URI } from 'vs/base/common/uri';
 
 
 export class ExtHostLogService extends DelegatedLogService implements ILogService, ExtHostLogServiceShape {
 
-	private _loggers: Map<string, ExtHostLogger> = new Map();
+	private _logsPath: string;
+	readonly logFile: URI;
 
 	constructor(
-		private _windowId: number,
 		logLevel: LogLevel,
-		private _logsPath: string
+		logsPath: string,
 	) {
-		super(createSpdLogService(`exthost${_windowId}`, logLevel, _logsPath));
+		super(createSpdLogService(ExtensionHostLogFileName, logLevel, logsPath));
+		this._logsPath = logsPath;
+		this.logFile = URI.file(join(logsPath, `${ExtensionHostLogFileName}.log`));
 	}
 
 	$setLevel(level: LogLevel): void {
 		this.setLevel(level);
 	}
 
-	getExtLogger(extensionID: string): ExtHostLogger {
-		let logger = this._loggers.get(extensionID);
-		if (!logger) {
-			logger = this.createLogger(extensionID);
-			this._loggers.set(extensionID, logger);
-		}
-		return logger;
-	}
-
 	getLogDirectory(extensionID: string): string {
-		return join(this._logsPath, `${extensionID}_${this._windowId}`);
-	}
-
-	private createLogger(extensionID: string): ExtHostLogger {
-		const logsDirPath = this.getLogDirectory(extensionID);
-		const logService = createSpdLogService(extensionID, this.getLevel(), logsDirPath);
-		this._register(this.onDidChangeLogLevel(level => logService.setLevel(level)));
-		return new ExtHostLogger(logService);
-	}
-}
-
-export class ExtHostLogger implements vscode.Logger {
-
-	constructor(
-		private readonly _logService: ILogService
-	) { }
-
-	trace(message: string, ...args: any[]): void {
-		return this._logService.trace(message, ...args);
-	}
-
-	debug(message: string, ...args: any[]): void {
-		return this._logService.debug(message, ...args);
-	}
-
-	info(message: string, ...args: any[]): void {
-		return this._logService.info(message, ...args);
-	}
-
-	warn(message: string, ...args: any[]): void {
-		return this._logService.warn(message, ...args);
-	}
-
-	error(message: string | Error, ...args: any[]): void {
-		return this._logService.error(message, ...args);
-	}
-
-	critical(message: string | Error, ...args: any[]): void {
-		return this._logService.critical(message, ...args);
+		return join(this._logsPath, extensionID);
 	}
 }
diff --git a/src/vs/workbench/api/node/extHostOutputService.ts b/src/vs/workbench/api/node/extHostOutputService.ts
index b36f0bfb25e..1fd525bf8a4 100644
--- a/src/vs/workbench/api/node/extHostOutputService.ts
+++ b/src/vs/workbench/api/node/extHostOutputService.ts
@@ -6,38 +6,29 @@
 
 import { MainContext, MainThreadOutputServiceShape, IMainContext } from './extHost.protocol';
 import * as vscode from 'vscode';
+import { URI } from 'vs/base/common/uri';
+import { posix } from 'path';
+import { OutputAppender } from 'vs/platform/output/node/outputAppender';
+import { toLocalISOString } from 'vs/base/common/date';
 
-export class ExtHostOutputChannel implements vscode.OutputChannel {
+export abstract class AbstractExtHostOutputChannel implements vscode.OutputChannel {
 
-	private static _idPool = 1;
-
-	private _proxy: MainThreadOutputServiceShape;
-	private _name: string;
-	private _id: string;
+	protected readonly _id: Thenable<string>;
+	private readonly _name: string;
+	protected readonly _proxy: MainThreadOutputServiceShape;
 	private _disposed: boolean;
 
-	constructor(name: string, proxy: MainThreadOutputServiceShape) {
+	constructor(name: string, log: boolean, file: URI, proxy: MainThreadOutputServiceShape) {
 		this._name = name;
-		this._id = 'extension-output-#' + (ExtHostOutputChannel._idPool++);
 		this._proxy = proxy;
+		this._id = proxy.$register(this.name, log, file);
 	}
 
 	get name(): string {
 		return this._name;
 	}
 
-	dispose(): void {
-		if (!this._disposed) {
-			this._proxy.$dispose(this._id, this._name).then(() => {
-				this._disposed = true;
-			});
-		}
-	}
-
-	append(value: string): void {
-		this.validate();
-		this._proxy.$append(this._id, this._name, value);
-	}
+	abstract append(value: string): void;
 
 	appendLine(value: string): void {
 		this.validate();
@@ -46,44 +37,113 @@ export class ExtHostOutputChannel implements vscode.OutputChannel {
 
 	clear(): void {
 		this.validate();
-		this._proxy.$clear(this._id, this._name);
+		this._id.then(id => this._proxy.$clear(id));
 	}
 
 	show(columnOrPreserveFocus?: vscode.ViewColumn | boolean, preserveFocus?: boolean): void {
 		this.validate();
-		if (typeof columnOrPreserveFocus === 'boolean') {
-			preserveFocus = columnOrPreserveFocus;
-		}
-
-		this._proxy.$reveal(this._id, this._name, preserveFocus);
+		this._id.then(id => this._proxy.$reveal(id, typeof columnOrPreserveFocus === 'boolean' ? columnOrPreserveFocus : preserveFocus));
 	}
 
 	hide(): void {
 		this.validate();
-		this._proxy.$close(this._id);
+		this._id.then(id => this._proxy.$close(id));
 	}
 
-	private validate(): void {
+	protected validate(): void {
 		if (this._disposed) {
 			throw new Error('Channel has been closed');
 		}
 	}
+
+	dispose(): void {
+		if (!this._disposed) {
+			this._id
+				.then(id => this._proxy.$dispose(id))
+				.then(() => this._disposed = true);
+		}
+	}
+}
+
+export class ExtHostPushOutputChannel extends AbstractExtHostOutputChannel {
+
+	constructor(name: string, proxy: MainThreadOutputServiceShape) {
+		super(name, false, null, proxy);
+	}
+
+	append(value: string): void {
+		this.validate();
+		this._id.then(id => this._proxy.$append(id, value));
+	}
+}
+
+export class ExtHostOutputChannelBackedByFile extends AbstractExtHostOutputChannel {
+
+	private static _namePool = 1;
+	private _appender: OutputAppender;
+
+	constructor(name: string, outputDir: string, proxy: MainThreadOutputServiceShape) {
+		const fileName = `${ExtHostOutputChannelBackedByFile._namePool++}-${name}`;
+		const file = URI.file(posix.join(outputDir, `${fileName}.log`));
+
+		super(name, false, file, proxy);
+		this._appender = new OutputAppender(fileName, file.fsPath);
+	}
+
+	append(value: string): void {
+		this.validate();
+		this._appender.append(value);
+	}
+}
+
+export class ExtHostLogFileOutputChannel extends AbstractExtHostOutputChannel {
+
+	constructor(name: string, file: URI, proxy: MainThreadOutputServiceShape) {
+		super(name, true, file, proxy);
+	}
+
+	append(value: string): void {
+		throw new Error('Not supported');
+	}
 }
 
 export class ExtHostOutputService {
 
 	private _proxy: MainThreadOutputServiceShape;
+	private _outputDir: string;
 
-	constructor(mainContext: IMainContext) {
+	constructor(logsLocation: URI, mainContext: IMainContext) {
+		this._outputDir = posix.join(logsLocation.fsPath, `output_logging_${toLocalISOString(new Date()).replace(/-|:|\.\d+Z$/g, '')}`);
 		this._proxy = mainContext.getProxy(MainContext.MainThreadOutputService);
 	}
 
-	createOutputChannel(name: string): vscode.OutputChannel {
+	createOutputChannel(name: string, push: boolean): vscode.OutputChannel {
 		name = name.trim();
 		if (!name) {
 			throw new Error('illegal argument `name`. must not be falsy');
 		} else {
-			return new ExtHostOutputChannel(name, this._proxy);
+			if (push) {
+				return new ExtHostPushOutputChannel(name, this._proxy);
+			} else {
+				// Do not crash if logger cannot be created
+				try {
+					return new ExtHostOutputChannelBackedByFile(name, this._outputDir, this._proxy);
+				} catch (error) {
+					console.log(error);
+					return new ExtHostPushOutputChannel(name, this._proxy);
+				}
+			}
 		}
 	}
+
+	createOutputChannelFromLogFile(name: string, file: URI): vscode.OutputChannel {
+		name = name.trim();
+		if (!name) {
+			throw new Error('illegal argument `name`. must not be falsy');
+		}
+		if (!file) {
+			throw new Error('illegal argument `file`. must not be falsy');
+		}
+		return new ExtHostLogFileOutputChannel(name, file, this._proxy);
+	}
 }
diff --git a/src/vs/workbench/api/node/extHostProgress.ts b/src/vs/workbench/api/node/extHostProgress.ts
index a9f8427ef0a..0700313c48c 100644
--- a/src/vs/workbench/api/node/extHostProgress.ts
+++ b/src/vs/workbench/api/node/extHostProgress.ts
@@ -8,10 +8,11 @@ import { ProgressOptions } from 'vscode';
 import { MainThreadProgressShape, ExtHostProgressShape } from './extHost.protocol';
 import { ProgressLocation } from './extHostTypeConverters';
 import { IExtensionDescription } from 'vs/workbench/services/extensions/common/extensions';
-import { IProgressStep, Progress } from 'vs/platform/progress/common/progress';
+import { Progress } from 'vs/platform/progress/common/progress';
 import { localize } from 'vs/nls';
 import { CancellationTokenSource, CancellationToken } from 'vs/base/common/cancellation';
 import { debounce } from 'vs/base/common/decorators';
+import { IProgressStep } from 'vs/workbench/services/progress/common/progress';
 
 export class ExtHostProgress implements ExtHostProgressShape {
 
@@ -70,11 +71,14 @@ export class ExtHostProgress implements ExtHostProgressShape {
 
 function mergeProgress(result: IProgressStep, currentValue: IProgressStep): IProgressStep {
 	result.message = currentValue.message;
-	if (typeof currentValue.increment === 'number' && typeof result.message === 'number') {
-		result.increment += currentValue.increment;
-	} else if (typeof currentValue.increment === 'number') {
-		result.increment = currentValue.increment;
+	if (typeof currentValue.increment === 'number') {
+		if (typeof result.increment === 'number') {
+			result.increment += currentValue.increment;
+		} else {
+			result.increment = currentValue.increment;
+		}
 	}
+
 	return result;
 }
 
diff --git a/src/vs/workbench/api/node/extHostQuickOpen.ts b/src/vs/workbench/api/node/extHostQuickOpen.ts
index bb1af794ce9..c58075883bf 100644
--- a/src/vs/workbench/api/node/extHostQuickOpen.ts
+++ b/src/vs/workbench/api/node/extHostQuickOpen.ts
@@ -4,13 +4,18 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import { TPromise } from 'vs/base/common/winjs.base';
-import { wireCancellationToken, asWinJsPromise } from 'vs/base/common/async';
+import { asThenable } from 'vs/base/common/async';
 import { CancellationToken } from 'vs/base/common/cancellation';
-import { QuickPickOptions, QuickPickItem, InputBoxOptions, WorkspaceFolderPickOptions, WorkspaceFolder } from 'vscode';
-import { MainContext, MainThreadQuickOpenShape, ExtHostQuickOpenShape, MyQuickPickItems, IMainContext } from './extHost.protocol';
-import { ExtHostWorkspace } from 'vs/workbench/api/node/extHostWorkspace';
+import { Emitter } from 'vs/base/common/event';
+import { dispose, IDisposable } from 'vs/base/common/lifecycle';
+import { TPromise } from 'vs/base/common/winjs.base';
 import { ExtHostCommands } from 'vs/workbench/api/node/extHostCommands';
+import { ExtHostWorkspace } from 'vs/workbench/api/node/extHostWorkspace';
+import { InputBox, InputBoxOptions, QuickInput, QuickInputButton, QuickPick, QuickPickItem, QuickPickOptions, WorkspaceFolder, WorkspaceFolderPickOptions } from 'vscode';
+import { ExtHostQuickOpenShape, IMainContext, MainContext, MainThreadQuickOpenShape, TransferQuickPickItems, TransferQuickInput, TransferQuickInputButton } from './extHost.protocol';
+import { URI } from 'vs/base/common/uri';
+import { ThemeIcon, QuickInputButtons } from 'vs/workbench/api/node/extHostTypes';
+import { isPromiseCanceledError } from 'vs/base/common/errors';
 
 export type Item = string | QuickPickItem;
 
@@ -23,38 +28,40 @@ export class ExtHostQuickOpen implements ExtHostQuickOpenShape {
 	private _onDidSelectItem: (handle: number) => void;
 	private _validateInput: (input: string) => string | Thenable<string>;
 
+	private _sessions = new Map<number, ExtHostQuickInput>();
+
 	constructor(mainContext: IMainContext, workspace: ExtHostWorkspace, commands: ExtHostCommands) {
 		this._proxy = mainContext.getProxy(MainContext.MainThreadQuickOpen);
 		this._workspace = workspace;
 		this._commands = commands;
 	}
 
-	showQuickPick(multiStepHandle: number | undefined, itemsOrItemsPromise: QuickPickItem[] | Thenable<QuickPickItem[]>, options: QuickPickOptions & { canPickMany: true; }, token?: CancellationToken): Thenable<QuickPickItem[] | undefined>;
-	showQuickPick(multiStepHandle: number | undefined, itemsOrItemsPromise: string[] | Thenable<string[]>, options?: QuickPickOptions, token?: CancellationToken): Thenable<string | undefined>;
-	showQuickPick(multiStepHandle: number | undefined, itemsOrItemsPromise: QuickPickItem[] | Thenable<QuickPickItem[]>, options?: QuickPickOptions, token?: CancellationToken): Thenable<QuickPickItem | undefined>;
-	showQuickPick(multiStepHandle: number | undefined, itemsOrItemsPromise: Item[] | Thenable<Item[]>, options?: QuickPickOptions, token: CancellationToken = CancellationToken.None): Thenable<Item | Item[] | undefined> {
+	showQuickPick(itemsOrItemsPromise: QuickPickItem[] | Thenable<QuickPickItem[]>, options: QuickPickOptions & { canPickMany: true; }, token?: CancellationToken): Thenable<QuickPickItem[] | undefined>;
+	showQuickPick(itemsOrItemsPromise: string[] | Thenable<string[]>, options?: QuickPickOptions, token?: CancellationToken): Thenable<string | undefined>;
+	showQuickPick(itemsOrItemsPromise: QuickPickItem[] | Thenable<QuickPickItem[]>, options?: QuickPickOptions, token?: CancellationToken): Thenable<QuickPickItem | undefined>;
+	showQuickPick(itemsOrItemsPromise: Item[] | Thenable<Item[]>, options?: QuickPickOptions, token: CancellationToken = CancellationToken.None): Thenable<Item | Item[] | undefined> {
 
 		// clear state from last invocation
 		this._onDidSelectItem = undefined;
 
 		const itemsPromise = <TPromise<Item[]>>TPromise.wrap(itemsOrItemsPromise);
 
-		const quickPickWidget = this._proxy.$show(multiStepHandle, {
+		const quickPickWidget = this._proxy.$show({
 			placeHolder: options && options.placeHolder,
 			matchOnDescription: options && options.matchOnDescription,
 			matchOnDetail: options && options.matchOnDetail,
 			ignoreFocusLost: options && options.ignoreFocusOut,
 			canPickMany: options && options.canPickMany
-		});
+		}, token);
 
-		const promise = TPromise.any(<TPromise<number | Item[]>[]>[quickPickWidget, itemsPromise]).then(values => {
+		return TPromise.any(<TPromise<number | Item[]>[]>[quickPickWidget, itemsPromise]).then(values => {
 			if (values.key === '0') {
 				return undefined;
 			}
 
 			return itemsPromise.then(items => {
 
-				let pickItems: MyQuickPickItems[] = [];
+				let pickItems: TransferQuickPickItems[] = [];
 				for (let handle = 0; handle < items.length; handle++) {
 
 					let item = items[handle];
@@ -98,13 +105,16 @@ export class ExtHostQuickOpen implements ExtHostQuickOpenShape {
 					}
 					return undefined;
 				});
-			}, (err) => {
-				this._proxy.$setError(err);
-
-				return TPromise.wrapError(err);
 			});
+		}).then(null, err => {
+			if (isPromiseCanceledError(err)) {
+				return undefined;
+			}
+
+			this._proxy.$setError(err);
+
+			return TPromise.wrapError(err);
 		});
-		return wireCancellationToken<Item | Item[]>(token, promise, true);
 	}
 
 	$onItemSelected(handle: number): void {
@@ -115,18 +125,26 @@ export class ExtHostQuickOpen implements ExtHostQuickOpenShape {
 
 	// ---- input
 
-	showInput(multiStepHandle: number | undefined, options?: InputBoxOptions, token: CancellationToken = CancellationToken.None): Thenable<string> {
+	showInput(options?: InputBoxOptions, token: CancellationToken = CancellationToken.None): Thenable<string> {
 
 		// global validate fn used in callback below
 		this._validateInput = options && options.validateInput;
 
-		const promise = this._proxy.$input(multiStepHandle, options, typeof this._validateInput === 'function');
-		return wireCancellationToken(token, promise, true);
+		return this._proxy.$input(options, typeof this._validateInput === 'function', token)
+			.then(null, err => {
+				if (isPromiseCanceledError(err)) {
+					return undefined;
+				}
+
+				this._proxy.$setError(err);
+
+				return TPromise.wrapError(err);
+			});
 	}
 
-	$validateInput(input: string): TPromise<string> {
+	$validateInput(input: string): Thenable<string> {
 		if (this._validateInput) {
-			return asWinJsPromise(_ => this._validateInput(input));
+			return asThenable(() => this._validateInput(input));
 		}
 		return undefined;
 	}
@@ -142,4 +160,443 @@ export class ExtHostQuickOpen implements ExtHostQuickOpenShape {
 			return this._workspace.getWorkspaceFolders().filter(folder => folder.uri.toString() === selectedFolder.uri.toString())[0];
 		});
 	}
+
+	// ---- QuickInput
+
+	createQuickPick<T extends QuickPickItem>(extensionId: string): QuickPick<T> {
+		const session = new ExtHostQuickPick(this._proxy, extensionId, () => this._sessions.delete(session._id));
+		this._sessions.set(session._id, session);
+		return session;
+	}
+
+	createInputBox(extensionId: string): InputBox {
+		const session = new ExtHostInputBox(this._proxy, extensionId, () => this._sessions.delete(session._id));
+		this._sessions.set(session._id, session);
+		return session;
+	}
+
+	$onDidChangeValue(sessionId: number, value: string): void {
+		const session = this._sessions.get(sessionId);
+		if (session) {
+			session._fireDidChangeValue(value);
+		}
+	}
+
+	$onDidAccept(sessionId: number): void {
+		const session = this._sessions.get(sessionId);
+		if (session) {
+			session._fireDidAccept();
+		}
+	}
+
+	$onDidChangeActive(sessionId: number, handles: number[]): void {
+		const session = this._sessions.get(sessionId);
+		if (session instanceof ExtHostQuickPick) {
+			session._fireDidChangeActive(handles);
+		}
+	}
+
+	$onDidChangeSelection(sessionId: number, handles: number[]): void {
+		const session = this._sessions.get(sessionId);
+		if (session instanceof ExtHostQuickPick) {
+			session._fireDidChangeSelection(handles);
+		}
+	}
+
+	$onDidTriggerButton(sessionId: number, handle: number): void {
+		const session = this._sessions.get(sessionId);
+		if (session) {
+			session._fireDidTriggerButton(handle);
+		}
+	}
+
+	$onDidHide(sessionId: number): void {
+		const session = this._sessions.get(sessionId);
+		if (session) {
+			session._fireDidHide();
+		}
+	}
+}
+
+class ExtHostQuickInput implements QuickInput {
+
+	private static _nextId = 1;
+	_id = ExtHostQuickPick._nextId++;
+
+	private _title: string;
+	private _steps: number;
+	private _totalSteps: number;
+	private _visible = false;
+	private _enabled = true;
+	private _busy = false;
+	private _ignoreFocusOut = true;
+	private _value = '';
+	private _placeholder: string;
+	private _buttons: QuickInputButton[] = [];
+	private _handlesToButtons = new Map<number, QuickInputButton>();
+	private _onDidAcceptEmitter = new Emitter<void>();
+	private _onDidChangeValueEmitter = new Emitter<string>();
+	private _onDidTriggerButtonEmitter = new Emitter<QuickInputButton>();
+	private _onDidHideEmitter = new Emitter<void>();
+	private _updateTimeout: number;
+	private _pendingUpdate: TransferQuickInput = { id: this._id };
+
+	private _disposed = false;
+	protected _disposables: IDisposable[] = [
+		this._onDidTriggerButtonEmitter,
+		this._onDidHideEmitter,
+		this._onDidAcceptEmitter,
+		this._onDidChangeValueEmitter
+	];
+
+	constructor(protected _proxy: MainThreadQuickOpenShape, protected _extensionId: string, private _onDidDispose: () => void) {
+	}
+
+	get title() {
+		return this._title;
+	}
+
+	set title(title: string) {
+		this._title = title;
+		this.update({ title });
+	}
+
+	get step() {
+		return this._steps;
+	}
+
+	set step(step: number) {
+		this._steps = step;
+		this.update({ step });
+	}
+
+	get totalSteps() {
+		return this._totalSteps;
+	}
+
+	set totalSteps(totalSteps: number) {
+		this._totalSteps = totalSteps;
+		this.update({ totalSteps });
+	}
+
+	get enabled() {
+		return this._enabled;
+	}
+
+	set enabled(enabled: boolean) {
+		this._enabled = enabled;
+		this.update({ enabled });
+	}
+
+	get busy() {
+		return this._busy;
+	}
+
+	set busy(busy: boolean) {
+		this._busy = busy;
+		this.update({ busy });
+	}
+
+	get ignoreFocusOut() {
+		return this._ignoreFocusOut;
+	}
+
+	set ignoreFocusOut(ignoreFocusOut: boolean) {
+		this._ignoreFocusOut = ignoreFocusOut;
+		this.update({ ignoreFocusOut });
+	}
+
+	get value() {
+		return this._value;
+	}
+
+	set value(value: string) {
+		this._value = value;
+		this.update({ value });
+	}
+
+	get placeholder() {
+		return this._placeholder;
+	}
+
+	set placeholder(placeholder: string) {
+		this._placeholder = placeholder;
+		this.update({ placeholder });
+	}
+
+	onDidChangeValue = this._onDidChangeValueEmitter.event;
+
+	onDidAccept = this._onDidAcceptEmitter.event;
+
+	get buttons() {
+		return this._buttons;
+	}
+
+	set buttons(buttons: QuickInputButton[]) {
+		this._buttons = buttons.slice();
+		this._handlesToButtons.clear();
+		buttons.forEach((button, i) => {
+			const handle = button === QuickInputButtons.Back ? -1 : i;
+			this._handlesToButtons.set(handle, button);
+		});
+		this.update({
+			buttons: buttons.map<TransferQuickInputButton>((button, i) => ({
+				iconPath: getIconUris(button.iconPath),
+				tooltip: button.tooltip,
+				handle: button === QuickInputButtons.Back ? -1 : i,
+			}))
+		});
+	}
+
+	onDidTriggerButton = this._onDidTriggerButtonEmitter.event;
+
+	show(): void {
+		this._visible = true;
+		this.update({ visible: true });
+	}
+
+	hide(): void {
+		this._visible = false;
+		this.update({ visible: false });
+	}
+
+	onDidHide = this._onDidHideEmitter.event;
+
+	_fireDidAccept() {
+		this._onDidAcceptEmitter.fire();
+	}
+
+	_fireDidChangeValue(value) {
+		this._value = value;
+		this._onDidChangeValueEmitter.fire(value);
+	}
+
+	_fireDidTriggerButton(handle: number) {
+		const button = this._handlesToButtons.get(handle);
+		this._onDidTriggerButtonEmitter.fire(button);
+	}
+
+	_fireDidHide() {
+		this._onDidHideEmitter.fire();
+	}
+
+	public dispose(): void {
+		if (this._disposed) {
+			return;
+		}
+		this._disposed = true;
+		this._fireDidHide();
+		this._disposables = dispose(this._disposables);
+		if (this._updateTimeout) {
+			clearTimeout(this._updateTimeout);
+			this._updateTimeout = undefined;
+		}
+		this._onDidDispose();
+		this._proxy.$dispose(this._id);
+	}
+
+	protected update(properties: Record<string, any>): void {
+		if (this._disposed) {
+			return;
+		}
+		for (const key of Object.keys(properties)) {
+			const value = properties[key];
+			this._pendingUpdate[key] = value === undefined ? null : value;
+		}
+
+		if ('visible' in this._pendingUpdate) {
+			if (this._updateTimeout) {
+				clearTimeout(this._updateTimeout);
+				this._updateTimeout = undefined;
+			}
+			this.dispatchUpdate();
+		} else if (this._visible && !this._updateTimeout) {
+			// Defer the update so that multiple changes to setters dont cause a redraw each
+			this._updateTimeout = setTimeout(() => {
+				this._updateTimeout = undefined;
+				this.dispatchUpdate();
+			}, 0);
+		}
+	}
+
+	private dispatchUpdate() {
+		this._proxy.$createOrUpdate(this._pendingUpdate);
+		this._pendingUpdate = { id: this._id };
+	}
+}
+
+function getIconUris(iconPath: QuickInputButton['iconPath']) {
+	const light = getLightIconUri(iconPath);
+	return { dark: getDarkIconUri(iconPath) || light, light };
+}
+
+function getLightIconUri(iconPath: QuickInputButton['iconPath']) {
+	if (iconPath && !(iconPath instanceof ThemeIcon)) {
+		if (typeof iconPath === 'string'
+			|| iconPath instanceof URI) {
+			return getIconUri(iconPath);
+		}
+		return getIconUri(iconPath['light']);
+	}
+	return undefined;
+}
+
+function getDarkIconUri(iconPath: QuickInputButton['iconPath']) {
+	if (iconPath && !(iconPath instanceof ThemeIcon) && iconPath['dark']) {
+		return getIconUri(iconPath['dark']);
+	}
+	return undefined;
+}
+
+function getIconUri(iconPath: string | URI) {
+	if (iconPath instanceof URI) {
+		return iconPath;
+	}
+	return URI.file(iconPath);
+}
+
+class ExtHostQuickPick<T extends QuickPickItem> extends ExtHostQuickInput implements QuickPick<T> {
+
+	private _items: T[] = [];
+	private _handlesToItems = new Map<number, T>();
+	private _itemsToHandles = new Map<T, number>();
+	private _canSelectMany = false;
+	private _matchOnDescription = true;
+	private _matchOnDetail = true;
+	private _activeItems: T[] = [];
+	private _onDidChangeActiveEmitter = new Emitter<T[]>();
+	private _selectedItems: T[] = [];
+	private _onDidChangeSelectionEmitter = new Emitter<T[]>();
+
+	constructor(proxy: MainThreadQuickOpenShape, extensionId: string, onDispose: () => void) {
+		super(proxy, extensionId, onDispose);
+		this._disposables.push(
+			this._onDidChangeActiveEmitter,
+			this._onDidChangeSelectionEmitter,
+		);
+		this.update({ type: 'quickPick' });
+	}
+
+	get items() {
+		return this._items;
+	}
+
+	set items(items: T[]) {
+		this._items = items.slice();
+		this._handlesToItems.clear();
+		this._itemsToHandles.clear();
+		items.forEach((item, i) => {
+			this._handlesToItems.set(i, item);
+			this._itemsToHandles.set(item, i);
+		});
+		this.update({
+			items: items.map((item, i) => ({
+				label: item.label,
+				description: item.description,
+				handle: i,
+				detail: item.detail,
+				picked: item.picked
+			}))
+		});
+	}
+
+	get canSelectMany() {
+		return this._canSelectMany;
+	}
+
+	set canSelectMany(canSelectMany: boolean) {
+		this._canSelectMany = canSelectMany;
+		this.update({ canSelectMany });
+	}
+
+	get matchOnDescription() {
+		return this._matchOnDescription;
+	}
+
+	set matchOnDescription(matchOnDescription: boolean) {
+		this._matchOnDescription = matchOnDescription;
+		this.update({ matchOnDescription });
+	}
+
+	get matchOnDetail() {
+		return this._matchOnDetail;
+	}
+
+	set matchOnDetail(matchOnDetail: boolean) {
+		this._matchOnDetail = matchOnDetail;
+		this.update({ matchOnDetail });
+	}
+
+	get activeItems() {
+		return this._activeItems;
+	}
+
+	set activeItems(activeItems: T[]) {
+		this._activeItems = activeItems.filter(item => this._itemsToHandles.has(item));
+		this.update({ activeItems: this._activeItems.map(item => this._itemsToHandles.get(item)) });
+	}
+
+	onDidChangeActive = this._onDidChangeActiveEmitter.event;
+
+	get selectedItems() {
+		return this._selectedItems;
+	}
+
+	set selectedItems(selectedItems: T[]) {
+		this._selectedItems = selectedItems.filter(item => this._itemsToHandles.has(item));
+		this.update({ selectedItems: this._selectedItems.map(item => this._itemsToHandles.get(item)) });
+	}
+
+	onDidChangeSelection = this._onDidChangeSelectionEmitter.event;
+
+	_fireDidChangeActive(handles: number[]) {
+		const items = handles.map(handle => this._handlesToItems.get(handle));
+		this._activeItems = items;
+		this._onDidChangeActiveEmitter.fire(items);
+	}
+
+	_fireDidChangeSelection(handles: number[]) {
+		const items = handles.map(handle => this._handlesToItems.get(handle));
+		this._selectedItems = items;
+		this._onDidChangeSelectionEmitter.fire(items);
+	}
+}
+
+class ExtHostInputBox extends ExtHostQuickInput implements InputBox {
+
+	private _password: boolean;
+	private _prompt: string;
+	private _validationMessage: string;
+
+	constructor(proxy: MainThreadQuickOpenShape, extensionId: string, onDispose: () => void) {
+		super(proxy, extensionId, onDispose);
+		this.update({ type: 'inputBox' });
+	}
+
+	get password() {
+		return this._password;
+	}
+
+	set password(password: boolean) {
+		this._password = password;
+		this.update({ password });
+	}
+
+	get prompt() {
+		return this._prompt;
+	}
+
+	set prompt(prompt: string) {
+		this._prompt = prompt;
+		this.update({ prompt });
+	}
+
+	get validationMessage() {
+		return this._validationMessage;
+	}
+
+	set validationMessage(validationMessage: string) {
+		this._validationMessage = validationMessage;
+		this.update({ validationMessage });
+	}
 }
diff --git a/src/vs/workbench/api/node/extHostSCM.ts b/src/vs/workbench/api/node/extHostSCM.ts
index b008b72b086..f1996d5ea4b 100644
--- a/src/vs/workbench/api/node/extHostSCM.ts
+++ b/src/vs/workbench/api/node/extHostSCM.ts
@@ -4,12 +4,12 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import URI, { UriComponents } from 'vs/base/common/uri';
+import { URI, UriComponents } from 'vs/base/common/uri';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { Event, Emitter, once } from 'vs/base/common/event';
 import { debounce } from 'vs/base/common/decorators';
 import { dispose, IDisposable } from 'vs/base/common/lifecycle';
-import { asWinJsPromise } from 'vs/base/common/async';
+import { asThenable } from 'vs/base/common/async';
 import { IExtensionDescription } from 'vs/workbench/services/extensions/common/extensions';
 import { ExtHostCommands } from 'vs/workbench/api/node/extHostCommands';
 import { MainContext, MainThreadSCMShape, SCMRawResource, SCMRawResourceSplice, SCMRawResourceSplices, IMainContext, ExtHostSCMShape } from './extHost.protocol';
@@ -18,6 +18,7 @@ import { comparePaths } from 'vs/base/common/comparers';
 import * as vscode from 'vscode';
 import { ISplice } from 'vs/base/common/sequence';
 import { ILogService } from 'vs/platform/log/common/log';
+import { CancellationToken } from 'vs/base/common/cancellation';
 
 type ProviderHandle = number;
 type GroupHandle = number;
@@ -237,14 +238,14 @@ class ExtHostSourceControlResourceGroup implements vscode.SourceControlResourceG
 		return this._resourceStatesMap.get(handle);
 	}
 
-	async $executeResourceCommand(handle: number): TPromise<void> {
+	$executeResourceCommand(handle: number): Thenable<void> {
 		const command = this._resourceStatesCommandsMap.get(handle);
 
 		if (!command) {
-			return;
+			return Promise.resolve(null);
 		}
 
-		await this._commands.executeCommand(command.command, ...command.arguments);
+		return asThenable(() => this._commands.executeCommand(command.command, ...command.arguments));
 	}
 
 	_takeResourceStateSnapshot(): SCMRawResourceSplice[] {
@@ -395,6 +396,15 @@ class ExtHostSourceControl implements vscode.SourceControl {
 		this._proxy.$updateSourceControl(this.handle, { statusBarCommands: internal });
 	}
 
+	private _selected: boolean = false;
+
+	get selected(): boolean {
+		return this._selected;
+	}
+
+	private _onDidChangeSelection = new Emitter<boolean>();
+	readonly onDidChangeSelection = this._onDidChangeSelection.event;
+
 	private handle: number = ExtHostSourceControl._handlePool++;
 
 	constructor(
@@ -454,6 +464,11 @@ class ExtHostSourceControl implements vscode.SourceControl {
 		return this._groups.get(handle);
 	}
 
+	setSelectionState(selected: boolean): void {
+		this._selected = selected;
+		this._onDidChangeSelection.fire(selected);
+	}
+
 	dispose(): void {
 		this._groups.forEach(group => group.dispose());
 		this._proxy.$unregisterSourceControl(this.handle);
@@ -471,6 +486,8 @@ export class ExtHostSCM implements ExtHostSCMShape {
 	private _onDidChangeActiveProvider = new Emitter<vscode.SourceControl>();
 	get onDidChangeActiveProvider(): Event<vscode.SourceControl> { return this._onDidChangeActiveProvider.event; }
 
+	private _selectedSourceControlHandles = new Set<number>();
+
 	constructor(
 		mainContext: IMainContext,
 		private _commands: ExtHostCommands,
@@ -542,7 +559,7 @@ export class ExtHostSCM implements ExtHostSCMShape {
 		return inputBox;
 	}
 
-	$provideOriginalResource(sourceControlHandle: number, uriComponents: UriComponents): TPromise<UriComponents> {
+	$provideOriginalResource(sourceControlHandle: number, uriComponents: UriComponents, token: CancellationToken): Thenable<UriComponents> {
 		const uri = URI.revive(uriComponents);
 		this.logService.trace('ExtHostSCM#$provideOriginalResource', sourceControlHandle, uri.toString());
 
@@ -552,7 +569,7 @@ export class ExtHostSCM implements ExtHostSCMShape {
 			return TPromise.as(null);
 		}
 
-		return asWinJsPromise(token => sourceControl.quickDiffProvider.provideOriginalResource(uri, token));
+		return asThenable(() => sourceControl.quickDiffProvider.provideOriginalResource(uri, token));
 	}
 
 	$onInputBoxValueChange(sourceControlHandle: number, value: string): TPromise<void> {
@@ -568,25 +585,25 @@ export class ExtHostSCM implements ExtHostSCMShape {
 		return TPromise.as(null);
 	}
 
-	async $executeResourceCommand(sourceControlHandle: number, groupHandle: number, handle: number): TPromise<void> {
+	$executeResourceCommand(sourceControlHandle: number, groupHandle: number, handle: number): Thenable<void> {
 		this.logService.trace('ExtHostSCM#$executeResourceCommand', sourceControlHandle, groupHandle, handle);
 
 		const sourceControl = this._sourceControls.get(sourceControlHandle);
 
 		if (!sourceControl) {
-			return;
+			return TPromise.as(null);
 		}
 
 		const group = sourceControl.getResourceGroup(groupHandle);
 
 		if (!group) {
-			return;
+			return TPromise.as(null);
 		}
 
-		await group.$executeResourceCommand(handle);
+		return group.$executeResourceCommand(handle);
 	}
 
-	async $validateInput(sourceControlHandle: number, value: string, cursorPosition: number): TPromise<[string, number] | undefined> {
+	$validateInput(sourceControlHandle: number, value: string, cursorPosition: number): Thenable<[string, number] | undefined> {
 		this.logService.trace('ExtHostSCM#$validateInput', sourceControlHandle);
 
 		const sourceControl = this._sourceControls.get(sourceControlHandle);
@@ -599,12 +616,49 @@ export class ExtHostSCM implements ExtHostSCMShape {
 			return TPromise.as(undefined);
 		}
 
-		const result = await sourceControl.inputBox.validateInput(value, cursorPosition);
+		return asThenable(() => sourceControl.inputBox.validateInput(value, cursorPosition)).then(result => {
+			if (!result) {
+				return TPromise.as(undefined);
+			}
 
-		if (!result) {
-			return TPromise.as(undefined);
+			return TPromise.as<[string, number]>([result.message, result.type]);
+		});
+	}
+
+	$setSelectedSourceControls(selectedSourceControlHandles: number[]): Thenable<void> {
+		this.logService.trace('ExtHostSCM#$setSelectedSourceControls', selectedSourceControlHandles);
+
+		const set = new Set<number>();
+
+		for (const handle of selectedSourceControlHandles) {
+			set.add(handle);
 		}
 
-		return [result.message, result.type];
+		set.forEach(handle => {
+			if (!this._selectedSourceControlHandles.has(handle)) {
+				const sourceControl = this._sourceControls.get(handle);
+
+				if (!sourceControl) {
+					return;
+				}
+
+				sourceControl.setSelectionState(true);
+			}
+		});
+
+		this._selectedSourceControlHandles.forEach(handle => {
+			if (!set.has(handle)) {
+				const sourceControl = this._sourceControls.get(handle);
+
+				if (!sourceControl) {
+					return;
+				}
+
+				sourceControl.setSelectionState(false);
+			}
+		});
+
+		this._selectedSourceControlHandles = set;
+		return TPromise.as(null);
 	}
 }
diff --git a/src/vs/workbench/api/node/extHostSearch.fileIndex.ts b/src/vs/workbench/api/node/extHostSearch.fileIndex.ts
new file mode 100644
index 00000000000..4cc7e4d150a
--- /dev/null
+++ b/src/vs/workbench/api/node/extHostSearch.fileIndex.ts
@@ -0,0 +1,724 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+'use strict';
+
+import * as path from 'path';
+import * as arrays from 'vs/base/common/arrays';
+import { CancelablePromise, createCancelablePromise } from 'vs/base/common/async';
+import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
+import { toErrorMessage } from 'vs/base/common/errorMessage';
+import { canceled } from 'vs/base/common/errors';
+import * as glob from 'vs/base/common/glob';
+import * as resources from 'vs/base/common/resources';
+import { StopWatch } from 'vs/base/common/stopwatch';
+import * as strings from 'vs/base/common/strings';
+import { URI } from 'vs/base/common/uri';
+import { TPromise } from 'vs/base/common/winjs.base';
+import { compareItemsByScore, IItemAccessor, prepareQuery, ScorerCache } from 'vs/base/parts/quickopen/common/quickOpenScorer';
+import { ICachedSearchStats, IFileIndexProviderStats, IFileMatch, IFileSearchStats, IFolderQuery, IRawSearchQuery, ISearchCompleteStats, ISearchQuery } from 'vs/platform/search/common/search';
+import * as vscode from 'vscode';
+
+export interface IInternalFileMatch {
+	base: URI;
+	original?: URI;
+	relativePath?: string; // Not present for extraFiles or absolute path matches
+	basename: string;
+	size?: number;
+}
+
+/**
+ *  Computes the patterns that the provider handles. Discards sibling clauses and 'false' patterns
+ */
+export function resolvePatternsForProvider(globalPattern: glob.IExpression, folderPattern: glob.IExpression): string[] {
+	const merged = {
+		...(globalPattern || {}),
+		...(folderPattern || {})
+	};
+
+	return Object.keys(merged)
+		.filter(key => {
+			const value = merged[key];
+			return typeof value === 'boolean' && value;
+		});
+}
+
+export class QueryGlobTester {
+
+	private _excludeExpression: glob.IExpression;
+	private _parsedExcludeExpression: glob.ParsedExpression;
+
+	private _parsedIncludeExpression: glob.ParsedExpression;
+
+	constructor(config: ISearchQuery, folderQuery: IFolderQuery) {
+		this._excludeExpression = {
+			...(config.excludePattern || {}),
+			...(folderQuery.excludePattern || {})
+		};
+		this._parsedExcludeExpression = glob.parse(this._excludeExpression);
+
+		// Empty includeExpression means include nothing, so no {} shortcuts
+		let includeExpression: glob.IExpression = config.includePattern;
+		if (folderQuery.includePattern) {
+			if (includeExpression) {
+				includeExpression = {
+					...includeExpression,
+					...folderQuery.includePattern
+				};
+			} else {
+				includeExpression = folderQuery.includePattern;
+			}
+		}
+
+		if (includeExpression) {
+			this._parsedIncludeExpression = glob.parse(includeExpression);
+		}
+	}
+
+	/**
+	 * Guaranteed sync - siblingsFn should not return a promise.
+	 */
+	public includedInQuerySync(testPath: string, basename?: string, hasSibling?: (name: string) => boolean): boolean {
+		if (this._parsedExcludeExpression && this._parsedExcludeExpression(testPath, basename, hasSibling)) {
+			return false;
+		}
+
+		if (this._parsedIncludeExpression && !this._parsedIncludeExpression(testPath, basename, hasSibling)) {
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Guaranteed async.
+	 */
+	public includedInQuery(testPath: string, basename?: string, hasSibling?: (name: string) => boolean | TPromise<boolean>): TPromise<boolean> {
+		const excludeP = this._parsedExcludeExpression ?
+			TPromise.as(this._parsedExcludeExpression(testPath, basename, hasSibling)).then(result => !!result) :
+			TPromise.wrap(false);
+
+		return excludeP.then(excluded => {
+			if (excluded) {
+				return false;
+			}
+
+			return this._parsedIncludeExpression ?
+				TPromise.as(this._parsedIncludeExpression(testPath, basename, hasSibling)).then(result => !!result) :
+				TPromise.wrap(true);
+		}).then(included => {
+			return included;
+		});
+	}
+
+	public hasSiblingExcludeClauses(): boolean {
+		return hasSiblingClauses(this._excludeExpression);
+	}
+}
+
+function hasSiblingClauses(pattern: glob.IExpression): boolean {
+	for (let key in pattern) {
+		if (typeof pattern[key] !== 'boolean') {
+			return true;
+		}
+	}
+
+	return false;
+}
+
+export interface IDirectoryEntry {
+	base: URI;
+	relativePath: string;
+	basename: string;
+}
+
+export interface IDirectoryTree {
+	rootEntries: IDirectoryEntry[];
+	pathToEntries: { [relativePath: string]: IDirectoryEntry[] };
+}
+
+interface IInternalSearchComplete<T = IFileSearchStats> {
+	limitHit: boolean;
+	results: IInternalFileMatch[];
+	stats: T;
+}
+
+export class FileIndexSearchEngine {
+	private filePattern: string;
+	private normalizedFilePatternLowercase: string;
+	private includePattern: glob.ParsedExpression;
+	private maxResults: number;
+	private exists: boolean;
+	private isLimitHit: boolean;
+	private resultCount: number;
+	private isCanceled: boolean;
+
+	private filesWalked = 0;
+	private dirsWalked = 0;
+
+	private activeCancellationTokens: Set<CancellationTokenSource>;
+
+	private globalExcludePattern: glob.ParsedExpression;
+
+	constructor(private config: ISearchQuery, private provider: vscode.FileIndexProvider) {
+		this.filePattern = config.filePattern;
+		this.includePattern = config.includePattern && glob.parse(config.includePattern);
+		this.maxResults = config.maxResults || null;
+		this.exists = config.exists;
+		this.resultCount = 0;
+		this.isLimitHit = false;
+		this.activeCancellationTokens = new Set<CancellationTokenSource>();
+
+		if (this.filePattern) {
+			this.normalizedFilePatternLowercase = strings.stripWildcards(this.filePattern).toLowerCase();
+		}
+
+		this.globalExcludePattern = config.excludePattern && glob.parse(config.excludePattern);
+	}
+
+	public cancel(): void {
+		this.isCanceled = true;
+		this.activeCancellationTokens.forEach(t => t.cancel());
+		this.activeCancellationTokens = new Set();
+	}
+
+	public search(_onResult: (match: IInternalFileMatch) => void): TPromise<{ isLimitHit: boolean, stats: IFileIndexProviderStats }> {
+		if (this.config.folderQueries.length !== 1) {
+			throw new Error('Searches just one folder');
+		}
+
+		// Searches a single folder
+		const folderQuery = this.config.folderQueries[0];
+
+		return new TPromise<{ isLimitHit: boolean, stats: IFileIndexProviderStats }>((resolve, reject) => {
+			const onResult = (match: IInternalFileMatch) => {
+				this.resultCount++;
+				_onResult(match);
+			};
+
+			if (this.isCanceled) {
+				throw canceled();
+			}
+
+			// For each extra file
+			if (this.config.extraFileResources) {
+				this.config.extraFileResources
+					.forEach(extraFile => {
+						const extraFileStr = extraFile.toString(); // ?
+						const basename = path.basename(extraFileStr);
+						if (this.globalExcludePattern && this.globalExcludePattern(extraFileStr, basename)) {
+							return; // excluded
+						}
+
+						// File: Check for match on file pattern and include pattern
+						this.matchFile(onResult, { base: extraFile, basename });
+					});
+			}
+
+			return this.searchInFolder(folderQuery, _onResult)
+				.then(stats => {
+					resolve({
+						isLimitHit: this.isLimitHit,
+						stats
+					});
+				}, (errs: Error[]) => {
+					const errMsg = errs
+						.map(err => toErrorMessage(err))
+						.filter(msg => !!msg)[0];
+
+					reject(new Error(errMsg));
+				});
+		});
+	}
+
+	private searchInFolder(fq: IFolderQuery<URI>, onResult: (match: IInternalFileMatch) => void): TPromise<IFileIndexProviderStats> {
+		let cancellation = new CancellationTokenSource();
+		return new TPromise((resolve, reject) => {
+			const options = this.getSearchOptionsForFolder(fq);
+			const tree = this.initDirectoryTree();
+
+			const queryTester = new QueryGlobTester(this.config, fq);
+			const noSiblingsClauses = !queryTester.hasSiblingExcludeClauses();
+
+			const onProviderResult = (uri: URI) => {
+				if (this.isCanceled) {
+					return;
+				}
+
+				// TODO@rob - ???
+				const relativePath = path.relative(fq.folder.path, uri.path);
+				if (noSiblingsClauses) {
+					const basename = path.basename(uri.path);
+					this.matchFile(onResult, { base: fq.folder, relativePath, basename, original: uri });
+
+					return;
+				}
+
+				// TODO: Optimize siblings clauses with ripgrep here.
+				this.addDirectoryEntries(tree, fq.folder, relativePath, onResult);
+			};
+
+			let providerSW: StopWatch;
+			let providerTime: number;
+			let fileWalkTime: number;
+			new TPromise(resolve => process.nextTick(resolve))
+				.then(() => {
+					this.activeCancellationTokens.add(cancellation);
+					providerSW = StopWatch.create();
+					return this.provider.provideFileIndex(options, cancellation.token);
+				})
+				.then(results => {
+					providerTime = providerSW.elapsed();
+					const postProcessSW = StopWatch.create();
+					this.activeCancellationTokens.delete(cancellation);
+					if (this.isCanceled) {
+						return null;
+					}
+
+					results.forEach(onProviderResult);
+
+					this.matchDirectoryTree(tree, queryTester, onResult);
+					fileWalkTime = postProcessSW.elapsed();
+					return null;
+				}).then(
+					() => {
+						cancellation.dispose();
+						resolve(<IFileIndexProviderStats>{
+							providerTime,
+							fileWalkTime,
+							directoriesWalked: this.dirsWalked,
+							filesWalked: this.filesWalked
+						});
+					},
+					err => {
+						cancellation.dispose();
+						reject(err);
+					});
+		});
+	}
+
+	private getSearchOptionsForFolder(fq: IFolderQuery<URI>): vscode.FileIndexOptions {
+		const includes = resolvePatternsForProvider(this.config.includePattern, fq.includePattern);
+		const excludes = resolvePatternsForProvider(this.config.excludePattern, fq.excludePattern);
+
+		return {
+			folder: fq.folder,
+			excludes,
+			includes,
+			useIgnoreFiles: !this.config.disregardIgnoreFiles,
+			followSymlinks: !this.config.ignoreSymlinks
+		};
+	}
+
+	private initDirectoryTree(): IDirectoryTree {
+		const tree: IDirectoryTree = {
+			rootEntries: [],
+			pathToEntries: Object.create(null)
+		};
+		tree.pathToEntries['.'] = tree.rootEntries;
+		return tree;
+	}
+
+	private addDirectoryEntries({ pathToEntries }: IDirectoryTree, base: URI, relativeFile: string, onResult: (result: IInternalFileMatch) => void) {
+		// Support relative paths to files from a root resource (ignores excludes)
+		if (relativeFile === this.filePattern) {
+			const basename = path.basename(this.filePattern);
+			this.matchFile(onResult, { base: base, relativePath: this.filePattern, basename });
+		}
+
+		function add(relativePath: string) {
+			const basename = path.basename(relativePath);
+			const dirname = path.dirname(relativePath);
+			let entries = pathToEntries[dirname];
+			if (!entries) {
+				entries = pathToEntries[dirname] = [];
+				add(dirname);
+			}
+			entries.push({
+				base,
+				relativePath,
+				basename
+			});
+		}
+
+		add(relativeFile);
+	}
+
+	private matchDirectoryTree({ rootEntries, pathToEntries }: IDirectoryTree, queryTester: QueryGlobTester, onResult: (result: IInternalFileMatch) => void) {
+		const self = this;
+		const filePattern = this.filePattern;
+		function matchDirectory(entries: IDirectoryEntry[]) {
+			self.dirsWalked++;
+			for (let i = 0, n = entries.length; i < n; i++) {
+				const entry = entries[i];
+				const { relativePath, basename } = entry;
+
+				// Check exclude pattern
+				// If the user searches for the exact file name, we adjust the glob matching
+				// to ignore filtering by siblings because the user seems to know what she
+				// is searching for and we want to include the result in that case anyway
+				const hasSibling = glob.hasSiblingFn(() => entries.map(entry => entry.basename));
+				if (!queryTester.includedInQuerySync(relativePath, basename, filePattern !== basename ? hasSibling : undefined)) {
+					continue;
+				}
+
+				const sub = pathToEntries[relativePath];
+				if (sub) {
+					matchDirectory(sub);
+				} else {
+					self.filesWalked++;
+					if (relativePath === filePattern) {
+						continue; // ignore file if its path matches with the file pattern because that is already matched above
+					}
+
+					self.matchFile(onResult, entry);
+				}
+
+				if (self.isLimitHit) {
+					break;
+				}
+			}
+		}
+		matchDirectory(rootEntries);
+	}
+
+	private matchFile(onResult: (result: IInternalFileMatch) => void, candidate: IInternalFileMatch): void {
+		if (this.isFilePatternMatch(candidate.relativePath) && (!this.includePattern || this.includePattern(candidate.relativePath, candidate.basename))) {
+			if (this.exists || (this.maxResults && this.resultCount >= this.maxResults)) {
+				this.isLimitHit = true;
+				this.cancel();
+			}
+
+			if (!this.isLimitHit) {
+				onResult(candidate);
+			}
+		}
+	}
+
+	private isFilePatternMatch(path: string): boolean {
+		// Check for search pattern
+		if (this.filePattern) {
+			if (this.filePattern === '*') {
+				return true; // support the all-matching wildcard
+			}
+
+			return strings.fuzzyContains(path, this.normalizedFilePatternLowercase);
+		}
+
+		// No patterns means we match all
+		return true;
+	}
+}
+
+export class FileIndexSearchManager {
+
+	private static readonly BATCH_SIZE = 512;
+
+	private caches: { [cacheKey: string]: Cache; } = Object.create(null);
+
+	private readonly folderCacheKeys = new Map<string, Set<string>>();
+
+	public fileSearch(config: ISearchQuery, provider: vscode.FileIndexProvider, onBatch: (matches: IFileMatch[]) => void, token: CancellationToken): TPromise<ISearchCompleteStats> {
+		if (config.sortByScore) {
+			let sortedSearch = this.trySortedSearchFromCache(config, token);
+			if (!sortedSearch) {
+				const engineConfig = config.maxResults ?
+					{
+						...config,
+						...{ maxResults: null }
+					} :
+					config;
+
+				const engine = new FileIndexSearchEngine(engineConfig, provider);
+				sortedSearch = this.doSortedSearch(engine, config, token);
+			}
+
+			return sortedSearch.then(complete => {
+				this.sendAsBatches(complete.results, onBatch, FileIndexSearchManager.BATCH_SIZE);
+				return complete;
+			});
+		}
+
+		const engine = new FileIndexSearchEngine(config, provider);
+		return this.doSearch(engine, token)
+			.then(complete => {
+				this.sendAsBatches(complete.results, onBatch, FileIndexSearchManager.BATCH_SIZE);
+				return <ISearchCompleteStats>{
+					limitHit: complete.limitHit,
+					stats: {
+						type: 'fileIndexProvider',
+						detailStats: complete.stats,
+						fromCache: false,
+						resultCount: complete.results.length
+					}
+				};
+			});
+	}
+
+	private getFolderCacheKey(config: ISearchQuery): string {
+		const uri = config.folderQueries[0].folder.toString();
+		const folderCacheKey = config.cacheKey && `${uri}_${config.cacheKey}`;
+		if (!this.folderCacheKeys.get(config.cacheKey)) {
+			this.folderCacheKeys.set(config.cacheKey, new Set());
+		}
+
+		this.folderCacheKeys.get(config.cacheKey).add(folderCacheKey);
+
+		return folderCacheKey;
+	}
+
+	private rawMatchToSearchItem(match: IInternalFileMatch): IFileMatch {
+		return {
+			resource: match.original || resources.joinPath(match.base, match.relativePath)
+		};
+	}
+
+	private doSortedSearch(engine: FileIndexSearchEngine, config: ISearchQuery, token: CancellationToken): TPromise<IInternalSearchComplete> {
+		let allResultsPromise = createCancelablePromise<IInternalSearchComplete<IFileIndexProviderStats>>(token => {
+			return this.doSearch(engine, token);
+		});
+
+		const folderCacheKey = this.getFolderCacheKey(config);
+		let cache: Cache;
+		if (folderCacheKey) {
+			cache = this.getOrCreateCache(folderCacheKey);
+			const cacheRow: ICacheRow = {
+				promise: allResultsPromise,
+				resolved: false
+			};
+			cache.resultsToSearchCache[config.filePattern] = cacheRow;
+			allResultsPromise.then(() => {
+				cacheRow.resolved = true;
+			}, err => {
+				delete cache.resultsToSearchCache[config.filePattern];
+			});
+			allResultsPromise = this.preventCancellation(allResultsPromise);
+		}
+
+		return TPromise.wrap<IInternalSearchComplete>(
+			allResultsPromise.then(complete => {
+				const scorerCache: ScorerCache = cache ? cache.scorerCache : Object.create(null);
+				const sortSW = (typeof config.maxResults !== 'number' || config.maxResults > 0) && StopWatch.create();
+				return this.sortResults(config, complete.results, scorerCache, token)
+					.then(sortedResults => {
+						// sortingTime: -1 indicates a "sorted" search that was not sorted, i.e. populating the cache when quickopen is opened.
+						// Contrasting with findFiles which is not sorted and will have sortingTime: undefined
+						const sortingTime = sortSW ? sortSW.elapsed() : -1;
+						return <IInternalSearchComplete>{
+							limitHit: complete.limitHit || typeof config.maxResults === 'number' && complete.results.length > config.maxResults, // ??
+							results: sortedResults,
+							stats: {
+								detailStats: complete.stats,
+								fromCache: false,
+								resultCount: sortedResults.length,
+								sortingTime,
+								type: 'fileIndexProvider'
+							}
+						};
+					});
+			}));
+	}
+
+	private getOrCreateCache(cacheKey: string): Cache {
+		const existing = this.caches[cacheKey];
+		if (existing) {
+			return existing;
+		}
+		return this.caches[cacheKey] = new Cache();
+	}
+
+	private trySortedSearchFromCache(config: ISearchQuery, token: CancellationToken): TPromise<IInternalSearchComplete> {
+		const folderCacheKey = this.getFolderCacheKey(config);
+		const cache = folderCacheKey && this.caches[folderCacheKey];
+		if (!cache) {
+			return undefined;
+		}
+
+		const cached = this.getResultsFromCache(cache, config.filePattern, token);
+		if (cached) {
+			return cached.then(complete => {
+				const sortSW = StopWatch.create();
+				return this.sortResults(config, complete.results, cache.scorerCache, token)
+					.then(sortedResults => {
+						if (token && token.isCancellationRequested) {
+							throw canceled();
+						}
+
+						return <IInternalSearchComplete<IFileSearchStats>>{
+							limitHit: complete.limitHit || typeof config.maxResults === 'number' && complete.results.length > config.maxResults,
+							results: sortedResults,
+							stats: {
+								fromCache: true,
+								detailStats: complete.stats,
+								type: 'fileIndexProvider',
+								resultCount: sortedResults.length,
+								sortingTime: sortSW.elapsed()
+							}
+						};
+					});
+			});
+		}
+		return undefined;
+	}
+
+	private sortResults(config: IRawSearchQuery, results: IInternalFileMatch[], scorerCache: ScorerCache, token: CancellationToken): TPromise<IInternalFileMatch[]> {
+		// we use the same compare function that is used later when showing the results using fuzzy scoring
+		// this is very important because we are also limiting the number of results by config.maxResults
+		// and as such we want the top items to be included in this result set if the number of items
+		// exceeds config.maxResults.
+		const query = prepareQuery(config.filePattern);
+		const compare = (matchA: IInternalFileMatch, matchB: IInternalFileMatch) => compareItemsByScore(matchA, matchB, query, true, FileMatchItemAccessor, scorerCache);
+
+		return arrays.topAsync(results, compare, config.maxResults, 10000, token);
+	}
+
+	private sendAsBatches(rawMatches: IInternalFileMatch[], onBatch: (batch: IFileMatch[]) => void, batchSize: number) {
+		const serializedMatches = rawMatches.map(rawMatch => this.rawMatchToSearchItem(rawMatch));
+		if (batchSize && batchSize > 0) {
+			for (let i = 0; i < serializedMatches.length; i += batchSize) {
+				onBatch(serializedMatches.slice(i, i + batchSize));
+			}
+		} else {
+			onBatch(serializedMatches);
+		}
+	}
+
+	private getResultsFromCache(cache: Cache, searchValue: string, token: CancellationToken): TPromise<IInternalSearchComplete<ICachedSearchStats>> {
+		const cacheLookupSW = StopWatch.create();
+
+		if (path.isAbsolute(searchValue)) {
+			return null; // bypass cache if user looks up an absolute path where matching goes directly on disk
+		}
+
+		// Find cache entries by prefix of search value
+		const hasPathSep = searchValue.indexOf(path.sep) >= 0;
+		let cacheRow: ICacheRow;
+		for (let previousSearch in cache.resultsToSearchCache) {
+
+			// If we narrow down, we might be able to reuse the cached results
+			if (strings.startsWith(searchValue, previousSearch)) {
+				if (hasPathSep && previousSearch.indexOf(path.sep) < 0) {
+					continue; // since a path character widens the search for potential more matches, require it in previous search too
+				}
+
+				const row = cache.resultsToSearchCache[previousSearch];
+				cacheRow = {
+					promise: this.preventCancellation(row.promise),
+					resolved: row.resolved
+				};
+				break;
+			}
+		}
+
+		if (!cacheRow) {
+			return null;
+		}
+
+		const cacheLookupTime = cacheLookupSW.elapsed();
+		const cacheFilterSW = StopWatch.create();
+
+		return new TPromise<IInternalSearchComplete<ICachedSearchStats>>((c, e) => {
+			token.onCancellationRequested(() => e(canceled()));
+
+			cacheRow.promise.then(complete => {
+				if (token && token.isCancellationRequested) {
+					e(canceled());
+				}
+
+				// Pattern match on results
+				let results: IInternalFileMatch[] = [];
+				const normalizedSearchValueLowercase = strings.stripWildcards(searchValue).toLowerCase();
+				for (let i = 0; i < complete.results.length; i++) {
+					let entry = complete.results[i];
+
+					// Check if this entry is a match for the search value
+					if (!strings.fuzzyContains(entry.relativePath, normalizedSearchValueLowercase)) {
+						continue;
+					}
+
+					results.push(entry);
+				}
+
+				c(<IInternalSearchComplete<ICachedSearchStats>>{
+					limitHit: complete.limitHit,
+					results,
+					stats: {
+						cacheWasResolved: cacheRow.resolved,
+						cacheLookupTime,
+						cacheFilterTime: cacheFilterSW.elapsed(),
+						cacheEntryCount: complete.results.length
+					}
+				});
+			}, e);
+		});
+	}
+
+	private doSearch(engine: FileIndexSearchEngine, token: CancellationToken): TPromise<IInternalSearchComplete<IFileIndexProviderStats>> {
+		token.onCancellationRequested(() => engine.cancel());
+		const results: IInternalFileMatch[] = [];
+		const onResult = match => results.push(match);
+
+		return engine.search(onResult).then(result => {
+			return <IInternalSearchComplete<IFileIndexProviderStats>>{
+				limitHit: result.isLimitHit,
+				results,
+				stats: result.stats
+			};
+		});
+	}
+
+	public clearCache(cacheKey: string): TPromise<void> {
+		if (!this.folderCacheKeys.has(cacheKey)) {
+			return TPromise.wrap(undefined);
+		}
+
+		const expandedKeys = this.folderCacheKeys.get(cacheKey);
+		expandedKeys.forEach(key => delete this.caches[key]);
+
+		this.folderCacheKeys.delete(cacheKey);
+
+		return TPromise.as(undefined);
+	}
+
+	private preventCancellation<C>(promise: CancelablePromise<C>): CancelablePromise<C> {
+		return new class implements CancelablePromise<C> {
+			cancel() {
+				// Do nothing
+			}
+			then(resolve, reject) {
+				return promise.then(resolve, reject);
+			}
+			catch(reject?) {
+				return this.then(undefined, reject);
+			}
+		};
+	}
+}
+
+interface ICacheRow {
+	promise: CancelablePromise<IInternalSearchComplete<IFileIndexProviderStats>>;
+	resolved: boolean;
+}
+
+class Cache {
+
+	public resultsToSearchCache: { [searchValue: string]: ICacheRow; } = Object.create(null);
+
+	public scorerCache: ScorerCache = Object.create(null);
+}
+
+const FileMatchItemAccessor = new class implements IItemAccessor<IInternalFileMatch> {
+
+	public getItemLabel(match: IInternalFileMatch): string {
+		return match.basename; // e.g. myFile.txt
+	}
+
+	public getItemDescription(match: IInternalFileMatch): string {
+		return match.relativePath.substr(0, match.relativePath.length - match.basename.length - 1); // e.g. some/path/to/file
+	}
+
+	public getItemPath(match: IInternalFileMatch): string {
+		return match.relativePath; // e.g. some/path/to/file/myFile.txt
+	}
+};
diff --git a/src/vs/workbench/api/node/extHostSearch.ts b/src/vs/workbench/api/node/extHostSearch.ts
index c4cf892bd17..d84497b032b 100644
--- a/src/vs/workbench/api/node/extHostSearch.ts
+++ b/src/vs/workbench/api/node/extHostSearch.ts
@@ -4,23 +4,20 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import * as pfs from 'vs/base/node/pfs';
-import * as extfs from 'vs/base/node/extfs';
 import * as path from 'path';
-import * as arrays from 'vs/base/common/arrays';
+import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
 import { toErrorMessage } from 'vs/base/common/errorMessage';
 import * as glob from 'vs/base/common/glob';
-import * as strings from 'vs/base/common/strings';
-import URI, { UriComponents } from 'vs/base/common/uri';
-import { PPromise, TPromise } from 'vs/base/common/winjs.base';
-import { IItemAccessor, ScorerCache, compareItemsByScore, prepareQuery } from 'vs/base/parts/quickopen/common/quickOpenScorer';
-import { ICachedSearchStats, IFileMatch, IFolderQuery, IPatternInfo, IRawSearchQuery, ISearchQuery, ISearchCompleteStats, IRawFileMatch2 } from 'vs/platform/search/common/search';
+import { toDisposable } from 'vs/base/common/lifecycle';
+import * as resources from 'vs/base/common/resources';
+import { StopWatch } from 'vs/base/common/stopwatch';
+import { URI, UriComponents } from 'vs/base/common/uri';
+import { TPromise } from 'vs/base/common/winjs.base';
+import * as extfs from 'vs/base/node/extfs';
+import { IFileMatch, IFileSearchProviderStats, IFolderQuery, IPatternInfo, IRawSearchQuery, ISearchCompleteStats, ISearchQuery, ITextSearchResult } from 'vs/platform/search/common/search';
+import { FileIndexSearchManager, IDirectoryEntry, IDirectoryTree, IInternalFileMatch, QueryGlobTester, resolvePatternsForProvider } from 'vs/workbench/api/node/extHostSearch.fileIndex';
 import * as vscode from 'vscode';
 import { ExtHostSearchShape, IMainContext, MainContext, MainThreadSearchShape } from './extHost.protocol';
-import { CancellationTokenSource } from 'vs/base/common/cancellation';
-import { joinPath } from 'vs/base/common/resources';
-
-type OneOrMore<T> = T | T[];
 
 export interface ISchemeTransformer {
 	transformOutgoing(scheme: string): string;
@@ -29,16 +26,18 @@ export interface ISchemeTransformer {
 export class ExtHostSearch implements ExtHostSearchShape {
 
 	private readonly _proxy: MainThreadSearchShape;
-	private readonly _searchProvider = new Map<number, vscode.SearchProvider>();
+	private readonly _fileSearchProvider = new Map<number, vscode.FileSearchProvider>();
+	private readonly _textSearchProvider = new Map<number, vscode.TextSearchProvider>();
+	private readonly _fileIndexProvider = new Map<number, vscode.FileIndexProvider>();
 	private _handlePool: number = 0;
 
 	private _fileSearchManager: FileSearchManager;
+	private _fileIndexSearchManager: FileIndexSearchManager;
 
-	constructor(mainContext: IMainContext, private _schemeTransformer: ISchemeTransformer, private _extfs = extfs, private _pfs = pfs) {
+	constructor(mainContext: IMainContext, private _schemeTransformer: ISchemeTransformer, private _extfs = extfs) {
 		this._proxy = mainContext.getProxy(MainContext.MainThreadSearch);
-		this._fileSearchManager = new FileSearchManager(
-			(eventName: string, data: any) => this._proxy.$handleTelemetry(eventName, data),
-			this._pfs);
+		this._fileSearchManager = new FileSearchManager();
+		this._fileIndexSearchManager = new FileIndexSearchManager();
 	}
 
 	private _transformScheme(scheme: string): string {
@@ -48,72 +47,69 @@ export class ExtHostSearch implements ExtHostSearchShape {
 		return scheme;
 	}
 
-	registerSearchProvider(scheme: string, provider: vscode.SearchProvider) {
+	registerFileSearchProvider(scheme: string, provider: vscode.FileSearchProvider) {
 		const handle = this._handlePool++;
-		this._searchProvider.set(handle, provider);
-		this._proxy.$registerSearchProvider(handle, this._transformScheme(scheme));
-		return {
-			dispose: () => {
-				this._searchProvider.delete(handle);
-				this._proxy.$unregisterProvider(handle);
-			}
-		};
+		this._fileSearchProvider.set(handle, provider);
+		this._proxy.$registerFileSearchProvider(handle, this._transformScheme(scheme));
+		return toDisposable(() => {
+			this._fileSearchProvider.delete(handle);
+			this._proxy.$unregisterProvider(handle);
+		});
 	}
 
-	$provideFileSearchResults(handle: number, session: number, rawQuery: IRawSearchQuery): TPromise<ISearchCompleteStats> {
-		const provider = this._searchProvider.get(handle);
-		if (!provider.provideFileSearchResults) {
-			return TPromise.as(undefined);
-		}
+	registerTextSearchProvider(scheme: string, provider: vscode.TextSearchProvider) {
+		const handle = this._handlePool++;
+		this._textSearchProvider.set(handle, provider);
+		this._proxy.$registerTextSearchProvider(handle, this._transformScheme(scheme));
+		return toDisposable(() => {
+			this._textSearchProvider.delete(handle);
+			this._proxy.$unregisterProvider(handle);
+		});
+	}
 
+	registerFileIndexProvider(scheme: string, provider: vscode.FileIndexProvider) {
+		const handle = this._handlePool++;
+		this._fileIndexProvider.set(handle, provider);
+		this._proxy.$registerFileIndexProvider(handle, this._transformScheme(scheme));
+		return toDisposable(() => {
+			this._fileSearchProvider.delete(handle);
+			this._proxy.$unregisterProvider(handle); // TODO@roblou - unregisterFileIndexProvider
+		});
+	}
+
+	$provideFileSearchResults(handle: number, session: number, rawQuery: IRawSearchQuery, token: CancellationToken): Thenable<ISearchCompleteStats> {
+		const provider = this._fileSearchProvider.get(handle);
 		const query = reviveQuery(rawQuery);
-		return this._fileSearchManager.fileSearch(query, provider).then(
-			null,
-			null,
-			progress => {
-				if (Array.isArray(progress)) {
-					progress.forEach(p => {
-						this._proxy.$handleFindMatch(handle, session, p.resource);
-					});
-				} else {
-					this._proxy.$handleFindMatch(handle, session, progress.resource);
-				}
-			});
+		if (provider) {
+			return this._fileSearchManager.fileSearch(query, provider, batch => {
+				this._proxy.$handleFileMatch(handle, session, batch.map(p => p.resource));
+			}, token);
+		} else {
+			const indexProvider = this._fileIndexProvider.get(handle);
+			return this._fileIndexSearchManager.fileSearch(query, indexProvider, batch => {
+				this._proxy.$handleFileMatch(handle, session, batch.map(p => p.resource));
+			}, token);
+		}
 	}
 
-	$provideTextSearchResults(handle: number, session: number, pattern: IPatternInfo, rawQuery: IRawSearchQuery): TPromise<ISearchCompleteStats> {
-		const provider = this._searchProvider.get(handle);
+	$clearCache(cacheKey: string): Thenable<void> {
+		// Actually called once per provider.
+		// Only relevant to file index search.
+		return this._fileIndexSearchManager.clearCache(cacheKey);
+	}
+
+	$provideTextSearchResults(handle: number, session: number, pattern: IPatternInfo, rawQuery: IRawSearchQuery, token: CancellationToken): Thenable<ISearchCompleteStats> {
+		const provider = this._textSearchProvider.get(handle);
 		if (!provider.provideTextSearchResults) {
 			return TPromise.as(undefined);
 		}
 
 		const query = reviveQuery(rawQuery);
 		const engine = new TextSearchEngine(pattern, query, provider, this._extfs);
-		return engine.search().then(
-			null,
-			null,
-			progress => {
-				this._proxy.$handleFindMatch(handle, session, progress);
-			});
+		return engine.search(progress => this._proxy.$handleTextMatch(handle, session, progress), token);
 	}
 }
 
-/**
- *  Computes the patterns that the provider handles. Discards sibling clauses and 'false' patterns
- */
-function resolvePatternsForProvider(globalPattern: glob.IExpression, folderPattern: glob.IExpression): string[] {
-	const merged = {
-		...(globalPattern || {}),
-		...(folderPattern || {})
-	};
-
-	return Object.keys(merged)
-		.filter(key => {
-			const value = merged[key];
-			return typeof value === 'boolean' && value;
-		});
-}
-
 function reviveQuery(rawQuery: IRawSearchQuery): ISearchQuery {
 	return {
 		...rawQuery,
@@ -132,45 +128,38 @@ function reviveFolderQuery(rawFolderQuery: IFolderQuery<UriComponents>): IFolder
 }
 
 class TextSearchResultsCollector {
-	private _batchedCollector: BatchedCollector<IRawFileMatch2>;
+	private _batchedCollector: BatchedCollector<IFileMatch>;
 
 	private _currentFolderIdx: number;
-	private _currentRelativePath: string;
-	private _currentFileMatch: IRawFileMatch2;
+	private _currentUri: URI;
+	private _currentFileMatch: IFileMatch;
 
-	constructor(private folderQueries: IFolderQuery[], private _onResult: (result: IRawFileMatch2[]) => void) {
-		this._batchedCollector = new BatchedCollector<IRawFileMatch2>(512, items => this.sendItems(items));
+	constructor(private _onResult: (result: IFileMatch[]) => void) {
+		this._batchedCollector = new BatchedCollector<IFileMatch>(512, items => this.sendItems(items));
 	}
 
 	add(data: vscode.TextSearchResult, folderIdx: number): void {
 		// Collects TextSearchResults into IInternalFileMatches and collates using BatchedCollector.
 		// This is efficient for ripgrep which sends results back one file at a time. It wouldn't be efficient for other search
 		// providers that send results in random order. We could do this step afterwards instead.
-		if (this._currentFileMatch && (this._currentFolderIdx !== folderIdx || this._currentRelativePath !== data.path)) {
+		if (this._currentFileMatch && (this._currentFolderIdx !== folderIdx || resources.isEqual(this._currentUri, data.uri))) {
 			this.pushToCollector();
 			this._currentFileMatch = null;
 		}
 
 		if (!this._currentFileMatch) {
-			const resource = joinPath(this.folderQueries[folderIdx].folder, data.path);
 			this._currentFileMatch = {
-				resource,
-				lineMatches: []
+				resource: data.uri,
+				matches: []
 			};
 		}
 
-		// TODO@roblou - line text is sent for every match
-		const matchRange = data.preview.match;
-		this._currentFileMatch.lineMatches.push({
-			lineNumber: data.range.start.line,
-			preview: data.preview.text,
-			offsetAndLengths: [[matchRange.start.character, matchRange.end.character - matchRange.start.character]]
-		});
+		this._currentFileMatch.matches.push(extensionResultToFrontendResult(data));
 	}
 
 	private pushToCollector(): void {
 		const size = this._currentFileMatch ?
-			this._currentFileMatch.lineMatches.reduce((acc, match) => acc + match.offsetAndLengths.length, 0) :
+			this._currentFileMatch.matches.length :
 			0;
 		this._batchedCollector.addItem(this._currentFileMatch, size);
 	}
@@ -180,11 +169,31 @@ class TextSearchResultsCollector {
 		this._batchedCollector.flush();
 	}
 
-	private sendItems(items: IRawFileMatch2 | IRawFileMatch2[]): void {
-		this._onResult(Array.isArray(items) ? items : [items]);
+	private sendItems(items: IFileMatch[]): void {
+		this._onResult(items);
 	}
 }
 
+function extensionResultToFrontendResult(data: vscode.TextSearchResult): ITextSearchResult {
+	return {
+		preview: {
+			match: {
+				startLineNumber: data.preview.match.start.line,
+				startColumn: data.preview.match.start.character,
+				endLineNumber: data.preview.match.end.line,
+				endColumn: data.preview.match.end.character
+			},
+			text: data.preview.text
+		},
+		range: {
+			startLineNumber: data.range.start.line,
+			startColumn: data.range.start.character,
+			endLineNumber: data.range.end.line,
+			endColumn: data.range.end.character
+		}
+	};
+}
+
 /**
  * Collects items that have a size - before the cumulative size of collected items reaches START_BATCH_AFTER_COUNT, the callback is called for every
  * set of items collected.
@@ -202,7 +211,7 @@ class BatchedCollector<T> {
 	private batchSize = 0;
 	private timeoutHandle: number;
 
-	constructor(private maxBatchSize: number, private cb: (items: T | T[]) => void) {
+	constructor(private maxBatchSize: number, private cb: (items: T[]) => void) {
 	}
 
 	addItem(item: T, size: number): void {
@@ -210,11 +219,7 @@ class BatchedCollector<T> {
 			return;
 		}
 
-		if (this.maxBatchSize > 0) {
-			this.addItemToBatch(item, size);
-		} else {
-			this.cb(item);
-		}
+		this.addItemToBatch(item, size);
 	}
 
 	addItems(items: T[], size: number): void {
@@ -271,139 +276,34 @@ class BatchedCollector<T> {
 	}
 }
 
-interface IDirectoryEntry {
-	base: URI;
-	relativePath: string;
-	basename: string;
-}
-
-interface IDirectoryTree {
-	rootEntries: IDirectoryEntry[];
-	pathToEntries: { [relativePath: string]: IDirectoryEntry[] };
-}
-
-interface IInternalFileMatch {
-	base: URI;
-	relativePath?: string; // Not present for extraFiles or absolute path matches
-	basename: string;
-	size?: number;
-}
-
-class QueryGlobTester {
-
-	private _excludeExpression: glob.IExpression;
-	private _parsedExcludeExpression: glob.ParsedExpression;
-
-	private _parsedIncludeExpression: glob.ParsedExpression;
-
-	constructor(config: ISearchQuery, folderQuery: IFolderQuery) {
-		this._excludeExpression = {
-			...(config.excludePattern || {}),
-			...(folderQuery.excludePattern || {})
-		};
-		this._parsedExcludeExpression = glob.parse(this._excludeExpression);
-
-		// Empty includeExpression means include nothing, so no {} shortcuts
-		let includeExpression: glob.IExpression = config.includePattern;
-		if (folderQuery.includePattern) {
-			if (includeExpression) {
-				includeExpression = {
-					...includeExpression,
-					...folderQuery.includePattern
-				};
-			} else {
-				includeExpression = folderQuery.includePattern;
-			}
-		}
-
-		if (includeExpression) {
-			this._parsedIncludeExpression = glob.parse(includeExpression);
-		}
-	}
-
-	/**
-	 * Guaranteed sync - siblingsFn should not return a promise.
-	 */
-	public includedInQuerySync(testPath: string, basename?: string, siblingsFn?: () => string[]): boolean {
-		if (this._parsedExcludeExpression && this._parsedExcludeExpression(testPath, basename, siblingsFn)) {
-			return false;
-		}
-
-		if (this._parsedIncludeExpression && !this._parsedIncludeExpression(testPath, basename, siblingsFn)) {
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * Guaranteed async.
-	 */
-	public includedInQuery(testPath: string, basename?: string, siblingsFn?: () => string[] | TPromise<string[]>): TPromise<boolean> {
-		const excludeP = this._parsedExcludeExpression ?
-			TPromise.as(this._parsedExcludeExpression(testPath, basename, siblingsFn)).then(result => !!result) :
-			TPromise.wrap(false);
-
-		return excludeP.then(excluded => {
-			if (excluded) {
-				return false;
-			}
-
-			return this._parsedIncludeExpression ?
-				TPromise.as(this._parsedIncludeExpression(testPath, basename, siblingsFn)).then(result => !!result) :
-				TPromise.wrap(true);
-		}).then(included => {
-			return included;
-		});
-	}
-
-	public hasSiblingExcludeClauses(): boolean {
-		return hasSiblingClauses(this._excludeExpression);
-	}
-}
-
-function hasSiblingClauses(pattern: glob.IExpression): boolean {
-	for (let key in pattern) {
-		if (typeof pattern[key] !== 'boolean') {
-			return true;
-		}
-	}
-
-	return false;
-}
-
 class TextSearchEngine {
 
-	private activeCancellationTokens = new Set<CancellationTokenSource>();
 	private collector: TextSearchResultsCollector;
 
 	private isLimitHit: boolean;
 	private resultCount = 0;
-	private isCanceled: boolean;
 
-	constructor(private pattern: IPatternInfo, private config: ISearchQuery, private provider: vscode.SearchProvider, private _extfs: typeof extfs) {
+	constructor(private pattern: IPatternInfo, private config: ISearchQuery, private provider: vscode.TextSearchProvider, private _extfs: typeof extfs) {
 	}
 
-	public cancel(): void {
-		this.isCanceled = true;
-		this.activeCancellationTokens.forEach(t => t.cancel());
-		this.activeCancellationTokens = new Set();
-	}
-
-	public search(): PPromise<{ limitHit: boolean }, IRawFileMatch2[]> {
+	public search(onProgress: (matches: IFileMatch[]) => void, token: CancellationToken): TPromise<ISearchCompleteStats> {
 		const folderQueries = this.config.folderQueries;
+		const tokenSource = new CancellationTokenSource();
+		token.onCancellationRequested(() => tokenSource.cancel());
 
-		return new PPromise<{ limitHit: boolean }, IRawFileMatch2[]>((resolve, reject, _onResult) => {
-			this.collector = new TextSearchResultsCollector(this.config.folderQueries, _onResult);
+		return new TPromise<ISearchCompleteStats>((resolve, reject) => {
+			this.collector = new TextSearchResultsCollector(onProgress);
 
+			let isCanceled = false;
 			const onResult = (match: vscode.TextSearchResult, folderIdx: number) => {
-				if (this.isCanceled) {
+				if (isCanceled) {
 					return;
 				}
 
 				if (this.resultCount >= this.config.maxResults) {
 					this.isLimitHit = true;
-					this.cancel();
+					isCanceled = true;
+					tokenSource.cancel();
 				}
 
 				if (!this.isLimitHit) {
@@ -413,12 +313,19 @@ class TextSearchEngine {
 			};
 
 			// For each root folder
-			PPromise.join(folderQueries.map((fq, i) => {
-				return this.searchInFolder(fq).then(null, null, r => onResult(r, i));
+			TPromise.join(folderQueries.map((fq, i) => {
+				return this.searchInFolder(fq, r => onResult(r, i), tokenSource.token);
 			})).then(() => {
+				tokenSource.dispose();
 				this.collector.flush();
-				resolve({ limitHit: this.isLimitHit });
+				resolve({
+					limitHit: this.isLimitHit,
+					stats: {
+						type: 'textSearchProvider'
+					}
+				});
 			}, (errs: Error[]) => {
+				tokenSource.dispose();
 				const errMsg = errs
 					.map(err => toErrorMessage(err))
 					.filter(msg => !!msg)[0];
@@ -428,20 +335,20 @@ class TextSearchEngine {
 		});
 	}
 
-	private searchInFolder(folderQuery: IFolderQuery<URI>): PPromise<void, vscode.TextSearchResult> {
-		let cancellation = new CancellationTokenSource();
-		return new PPromise((resolve, reject, onResult) => {
+	private searchInFolder(folderQuery: IFolderQuery<URI>, onResult: (result: vscode.TextSearchResult) => void, token: CancellationToken): TPromise<void> {
+		return new TPromise((resolve, reject) => {
 
 			const queryTester = new QueryGlobTester(this.config, folderQuery);
 			const testingPs = [];
 			const progress = {
 				report: (result: vscode.TextSearchResult) => {
-					const siblingFn = folderQuery.folder.scheme === 'file' && (() => {
-						return this.readdir(path.dirname(path.join(folderQuery.folder.fsPath, result.path)));
+					const hasSibling = folderQuery.folder.scheme === 'file' && glob.hasSiblingPromiseFn(() => {
+						return this.readdir(path.dirname(result.uri.fsPath));
 					});
 
+					const relativePath = path.relative(folderQuery.folder.fsPath, result.uri.fsPath);
 					testingPs.push(
-						queryTester.includedInQuery(result.path, path.basename(result.path), siblingFn)
+						queryTester.includedInQuery(relativePath, path.basename(relativePath), hasSibling)
 							.then(included => {
 								if (included) {
 									onResult(result);
@@ -453,22 +360,14 @@ class TextSearchEngine {
 			const searchOptions = this.getSearchOptionsForFolder(folderQuery);
 			new TPromise(resolve => process.nextTick(resolve))
 				.then(() => {
-					this.activeCancellationTokens.add(cancellation);
-					return this.provider.provideTextSearchResults(patternInfoToQuery(this.pattern), searchOptions, progress, cancellation.token);
+					return this.provider.provideTextSearchResults(patternInfoToQuery(this.pattern), searchOptions, progress, token);
 				})
 				.then(() => {
-					this.activeCancellationTokens.delete(cancellation);
 					return TPromise.join(testingPs);
 				})
 				.then(
-					() => {
-						cancellation.dispose();
-						resolve(null);
-					},
-					err => {
-						cancellation.dispose();
-						reject(err);
-					});
+					() => resolve(null),
+					reject);
 		});
 	}
 
@@ -495,7 +394,9 @@ class TextSearchEngine {
 			useIgnoreFiles: !this.config.disregardIgnoreFiles,
 			followSymlinks: !this.config.ignoreSymlinks,
 			encoding: this.config.fileEncoding,
-			maxFileSize: this.config.maxFileSize
+			maxFileSize: this.config.maxFileSize,
+			maxResults: this.config.maxResults,
+			previewOptions: this.config.previewOptions
 		};
 	}
 }
@@ -511,39 +412,26 @@ function patternInfoToQuery(patternInfo: IPatternInfo): vscode.TextSearchQuery {
 
 class FileSearchEngine {
 	private filePattern: string;
-	private normalizedFilePatternLowercase: string;
 	private includePattern: glob.ParsedExpression;
 	private maxResults: number;
 	private exists: boolean;
-	// private maxFilesize: number;
 	private isLimitHit: boolean;
 	private resultCount: number;
 	private isCanceled: boolean;
 
 	private activeCancellationTokens: Set<CancellationTokenSource>;
 
-	// private filesWalked: number;
-	// private directoriesWalked: number;
-
 	private globalExcludePattern: glob.ParsedExpression;
 
-	constructor(private config: ISearchQuery, private provider: vscode.SearchProvider, private _pfs: typeof pfs) {
+	constructor(private config: ISearchQuery, private provider: vscode.FileSearchProvider) {
 		this.filePattern = config.filePattern;
 		this.includePattern = config.includePattern && glob.parse(config.includePattern);
 		this.maxResults = config.maxResults || null;
 		this.exists = config.exists;
-		// this.maxFilesize = config.maxFileSize || null;
 		this.resultCount = 0;
 		this.isLimitHit = false;
 		this.activeCancellationTokens = new Set<CancellationTokenSource>();
 
-		// this.filesWalked = 0;
-		// this.directoriesWalked = 0;
-
-		if (this.filePattern) {
-			this.normalizedFilePatternLowercase = strings.stripWildcards(this.filePattern).toLowerCase();
-		}
-
 		this.globalExcludePattern = config.excludePattern && glob.parse(config.excludePattern);
 	}
 
@@ -553,128 +441,113 @@ class FileSearchEngine {
 		this.activeCancellationTokens = new Set();
 	}
 
-	public search(): PPromise<{ isLimitHit: boolean }, IInternalFileMatch> {
+	public search(_onResult: (match: IInternalFileMatch) => void): TPromise<IInternalSearchComplete> {
 		const folderQueries = this.config.folderQueries;
 
-		return new PPromise<{ isLimitHit: boolean }, IInternalFileMatch>((resolve, reject, _onResult) => {
+		return new TPromise((resolve, reject) => {
 			const onResult = (match: IInternalFileMatch) => {
 				this.resultCount++;
 				_onResult(match);
 			};
 
 			// Support that the file pattern is a full path to a file that exists
-			this.checkFilePatternAbsoluteMatch().then(({ exists, size }) => {
-				if (this.isCanceled) {
-					return resolve({ isLimitHit: this.isLimitHit });
-				}
+			if (this.isCanceled) {
+				return resolve({ limitHit: this.isLimitHit });
+			}
 
-				// Report result from file pattern if matching
-				if (exists) {
-					onResult({
-						base: URI.file(this.filePattern),
-						basename: path.basename(this.filePattern),
-						size
+			// For each extra file
+			if (this.config.extraFileResources) {
+				this.config.extraFileResources
+					.forEach(extraFile => {
+						const extraFileStr = extraFile.toString(); // ?
+						const basename = path.basename(extraFileStr);
+						if (this.globalExcludePattern && this.globalExcludePattern(extraFileStr, basename)) {
+							return; // excluded
+						}
+
+						// File: Check for match on file pattern and include pattern
+						this.matchFile(onResult, { base: extraFile, basename });
 					});
+			}
 
-					// Optimization: a match on an absolute path is a good result and we do not
-					// continue walking the entire root paths array for other matches because
-					// it is very unlikely that another file would match on the full absolute path
-					return resolve({ isLimitHit: this.isLimitHit });
-				}
-
-				// For each extra file
-				if (this.config.extraFileResources) {
-					this.config.extraFileResources
-						.forEach(extraFile => {
-							const extraFileStr = extraFile.toString(); // ?
-							const basename = path.basename(extraFileStr);
-							if (this.globalExcludePattern && this.globalExcludePattern(extraFileStr, basename)) {
-								return; // excluded
-							}
-
-							// File: Check for match on file pattern and include pattern
-							this.matchFile(onResult, { base: extraFile, basename });
-						});
-				}
-
-				// For each root folder
-				PPromise.join(folderQueries.map(fq => {
-					return this.searchInFolder(fq).then(null, null, onResult);
-				})).then(() => {
-					resolve({ isLimitHit: this.isLimitHit });
-				}, (errs: Error[]) => {
-					const errMsg = errs
-						.map(err => toErrorMessage(err))
-						.filter(msg => !!msg)[0];
-
-					reject(new Error(errMsg));
+			// For each root folder
+			TPromise.join(folderQueries.map(fq => {
+				return this.searchInFolder(fq, onResult);
+			})).then(stats => {
+				resolve({
+					limitHit: this.isLimitHit,
+					stats: stats[0] // Only looking at single-folder workspace stats...
 				});
+			}, (errs: Error[]) => {
+				const errMsg = errs
+					.map(err => toErrorMessage(err))
+					.filter(msg => !!msg)[0];
+
+				reject(new Error(errMsg));
 			});
 		});
 	}
 
-	private searchInFolder(fq: IFolderQuery<URI>): PPromise<void, IInternalFileMatch> {
+	private searchInFolder(fq: IFolderQuery<URI>, onResult: (match: IInternalFileMatch) => void): TPromise<IFileSearchProviderStats> {
 		let cancellation = new CancellationTokenSource();
-		return new PPromise((resolve, reject, onResult) => {
+		return new TPromise((resolve, reject) => {
 			const options = this.getSearchOptionsForFolder(fq);
-			let filePatternSeen = false;
 			const tree = this.initDirectoryTree();
 
 			const queryTester = new QueryGlobTester(this.config, fq);
 			const noSiblingsClauses = !queryTester.hasSiblingExcludeClauses();
 
-			const onProviderResult = (relativePath: string) => {
-				if (this.isCanceled) {
-					return;
-				}
-
-				if (noSiblingsClauses) {
-					if (relativePath === this.filePattern) {
-						filePatternSeen = true;
-					}
-
-					const basename = path.basename(relativePath);
-					this.matchFile(onResult, { base: fq.folder, relativePath, basename });
-
-					return;
-				}
-
-				// TODO: Optimize siblings clauses with ripgrep here.
-				this.addDirectoryEntries(tree, fq.folder, relativePath, onResult);
-			};
-
-			new TPromise(resolve => process.nextTick(resolve))
+			let providerSW: StopWatch;
+			new TPromise(_resolve => process.nextTick(_resolve))
 				.then(() => {
 					this.activeCancellationTokens.add(cancellation);
-					return this.provider.provideFileSearchResults(options, { report: onProviderResult }, cancellation.token);
+
+					providerSW = StopWatch.create();
+					return this.provider.provideFileSearchResults(
+						{
+							pattern: this.config.filePattern || ''
+						},
+						options,
+						cancellation.token);
 				})
-				.then(() => {
+				.then(results => {
+					const providerTime = providerSW.elapsed();
+					const postProcessSW = StopWatch.create();
+
+					if (this.isCanceled) {
+						return null;
+					}
+
+					if (results) {
+						results.forEach(result => {
+							const relativePath = path.relative(fq.folder.fsPath, result.fsPath);
+
+							if (noSiblingsClauses) {
+								const basename = path.basename(result.fsPath);
+								this.matchFile(onResult, { base: fq.folder, relativePath, basename });
+
+								return;
+							}
+
+							// TODO: Optimize siblings clauses with ripgrep here.
+							this.addDirectoryEntries(tree, fq.folder, relativePath, onResult);
+						});
+					}
+
 					this.activeCancellationTokens.delete(cancellation);
 					if (this.isCanceled) {
 						return null;
 					}
 
-					if (noSiblingsClauses && this.isLimitHit) {
-						if (!filePatternSeen) {
-							// If the limit was hit, check whether filePattern is an exact relative match because it must be included
-							return this.checkFilePatternRelativeMatch(fq.folder).then(({ exists, size }) => {
-								if (exists) {
-									onResult({
-										base: fq.folder,
-										relativePath: this.filePattern,
-										basename: path.basename(this.filePattern),
-									});
-								}
-							});
-						}
-					}
-
 					this.matchDirectoryTree(tree, queryTester, onResult);
-					return null;
+					return <IFileSearchProviderStats>{
+						providerTime,
+						postProcessTime: postProcessSW.elapsed()
+					};
 				}).then(
-					() => {
+					stats => {
 						cancellation.dispose();
-						resolve(undefined);
+						resolve(stats);
 					},
 					err => {
 						cancellation.dispose();
@@ -692,7 +565,8 @@ class FileSearchEngine {
 			excludes,
 			includes,
 			useIgnoreFiles: !this.config.disregardIgnoreFiles,
-			followSymlinks: !this.config.ignoreSymlinks
+			followSymlinks: !this.config.ignoreSymlinks,
+			maxResults: this.config.maxResults
 		};
 	}
 
@@ -734,7 +608,7 @@ class FileSearchEngine {
 		const self = this;
 		const filePattern = this.filePattern;
 		function matchDirectory(entries: IDirectoryEntry[]) {
-			// self.directoriesWalked++;
+			const hasSibling = glob.hasSiblingFn(() => entries.map(entry => entry.basename));
 			for (let i = 0, n = entries.length; i < n; i++) {
 				const entry = entries[i];
 				const { relativePath, basename } = entry;
@@ -743,7 +617,7 @@ class FileSearchEngine {
 				// If the user searches for the exact file name, we adjust the glob matching
 				// to ignore filtering by siblings because the user seems to know what she
 				// is searching for and we want to include the result in that case anyway
-				if (!queryTester.includedInQuerySync(relativePath, basename, () => filePattern !== basename ? entries.map(entry => entry.basename) : [])) {
+				if (!queryTester.includedInQuerySync(relativePath, basename, filePattern !== basename ? hasSibling : undefined)) {
 					continue;
 				}
 
@@ -751,7 +625,6 @@ class FileSearchEngine {
 				if (sub) {
 					matchDirectory(sub);
 				} else {
-					// self.filesWalked++;
 					if (relativePath === filePattern) {
 						continue; // ignore file if its path matches with the file pattern because that is already matched above
 					}
@@ -767,64 +640,8 @@ class FileSearchEngine {
 		matchDirectory(rootEntries);
 	}
 
-	public getStats(): any {
-		return null;
-		// return {
-		// 	fromCache: false,
-		// 	traversal: Traversal[this.traversal],
-		// 	errors: this.errors,
-		// 	fileWalkStartTime: this.fileWalkStartTime,
-		// 	fileWalkResultTime: Date.now(),
-		// 	directoriesWalked: this.directoriesWalked,
-		// 	filesWalked: this.filesWalked,
-		// 	resultCount: this.resultCount,
-		// 	cmdForkResultTime: this.cmdForkResultTime,
-		// 	cmdResultCount: this.cmdResultCount
-		// };
-	}
-
-	/**
-	 * Return whether the file pattern is an absolute path to a file that exists.
-	 * TODO@roblou should use FS provider?
-	 */
-	private checkFilePatternAbsoluteMatch(): TPromise<{ exists: boolean, size?: number }> {
-		if (!this.filePattern || !path.isAbsolute(this.filePattern)) {
-			return TPromise.wrap({ exists: false });
-		}
-
-		return this._pfs.stat(this.filePattern)
-			.then(stat => {
-				return {
-					exists: !stat.isDirectory(),
-					size: stat.size
-				};
-			}, err => {
-				return {
-					exists: false
-				};
-			});
-	}
-
-	private checkFilePatternRelativeMatch(base: URI): TPromise<{ exists: boolean, size?: number }> {
-		if (!this.filePattern || path.isAbsolute(this.filePattern) || base.scheme !== 'file') {
-			return TPromise.wrap({ exists: false });
-		}
-
-		const absolutePath = path.join(base.fsPath, this.filePattern);
-		return this._pfs.stat(absolutePath).then(stat => {
-			return {
-				exists: !stat.isDirectory(),
-				size: stat.size
-			};
-		}, err => {
-			return {
-				exists: false
-			};
-		});
-	}
-
 	private matchFile(onResult: (result: IInternalFileMatch) => void, candidate: IInternalFileMatch): void {
-		if (this.isFilePatternMatch(candidate.relativePath) && (!this.includePattern || this.includePattern(candidate.relativePath, candidate.basename))) {
+		if (!this.includePattern || this.includePattern(candidate.relativePath, candidate.basename)) {
 			if (this.exists || (this.maxResults && this.resultCount >= this.maxResults)) {
 				this.isLimitHit = true;
 				this.cancel();
@@ -835,344 +652,81 @@ class FileSearchEngine {
 			}
 		}
 	}
+}
 
-	private isFilePatternMatch(path: string): boolean {
-		// Check for search pattern
-		if (this.filePattern) {
-			if (this.filePattern === '*') {
-				return true; // support the all-matching wildcard
-			}
-
-			return strings.fuzzyContains(path, this.normalizedFilePatternLowercase);
-		}
-
-		// No patterns means we match all
-		return true;
-	}
+interface IInternalSearchComplete {
+	limitHit: boolean;
+	stats?: IFileSearchProviderStats;
 }
 
 class FileSearchManager {
 
 	private static readonly BATCH_SIZE = 512;
 
-	private caches: { [cacheKey: string]: Cache; } = Object.create(null);
+	fileSearch(config: ISearchQuery, provider: vscode.FileSearchProvider, onBatch: (matches: IFileMatch[]) => void, token: CancellationToken): TPromise<ISearchCompleteStats> {
+		const engine = new FileSearchEngine(config, provider);
 
-	constructor(private telemetryCallback: (eventName: string, data: any) => void, private _pfs: typeof pfs) { }
+		let resultCount = 0;
+		const onInternalResult = (batch: IInternalFileMatch[]) => {
+			resultCount += batch.length;
+			onBatch(batch.map(m => this.rawMatchToSearchItem(m)));
+		};
 
-	public fileSearch(config: ISearchQuery, provider: vscode.SearchProvider): PPromise<ISearchCompleteStats, OneOrMore<IFileMatch>> {
-		if (config.sortByScore) {
-			let sortedSearch = this.trySortedSearchFromCache(config);
-			if (!sortedSearch) {
-				const engineConfig = config.maxResults ?
-					{
-						...config,
-						...{ maxResults: null }
-					} :
-					config;
-
-				const engine = new FileSearchEngine(engineConfig, provider, this._pfs);
-				sortedSearch = this.doSortedSearch(engine, provider, config);
-			}
-
-			return new PPromise<ISearchCompleteStats, OneOrMore<IFileMatch>>((c, e, p) => {
-				process.nextTick(() => { // allow caller to register progress callback first
-					sortedSearch.then(([result, rawMatches]) => {
-						const serializedMatches = rawMatches.map(rawMatch => this.rawMatchToSearchItem(rawMatch));
-						this.sendProgress(serializedMatches, p, FileSearchManager.BATCH_SIZE);
-						c(result);
-					}, e, p);
-				});
-			}, () => {
-				sortedSearch.cancel();
-			});
-		}
-
-		let searchPromise: PPromise<void, OneOrMore<IInternalFileMatch>>;
-		return new PPromise<ISearchCompleteStats, OneOrMore<IFileMatch>>((c, e, p) => {
-			const engine = new FileSearchEngine(config, provider, this._pfs);
-			searchPromise = this.doSearch(engine, provider, FileSearchManager.BATCH_SIZE)
-				.then(c, e, progress => {
-					if (Array.isArray(progress)) {
-						p(progress.map(m => this.rawMatchToSearchItem(m)));
-					} else if ((<IInternalFileMatch>progress).relativePath) {
-						p(this.rawMatchToSearchItem(<IInternalFileMatch>progress));
+		return this.doSearch(engine, FileSearchManager.BATCH_SIZE, onInternalResult, token).then(
+			result => {
+				return <ISearchCompleteStats>{
+					limitHit: result.limitHit,
+					stats: {
+						fromCache: false,
+						type: 'fileSearchProvider',
+						resultCount,
+						detailStats: result.stats
 					}
-				});
-		}, () => {
-			searchPromise.cancel();
-		});
+				};
+			});
 	}
 
 	private rawMatchToSearchItem(match: IInternalFileMatch): IFileMatch {
-		return {
-			resource: joinPath(match.base, match.relativePath)
-		};
-	}
-
-	private doSortedSearch(engine: FileSearchEngine, provider: vscode.SearchProvider, config: IRawSearchQuery): PPromise<[ISearchCompleteStats, IInternalFileMatch[]]> {
-		let searchPromise: PPromise<void, OneOrMore<IInternalFileMatch>>;
-		let allResultsPromise = new PPromise<[ISearchCompleteStats, IInternalFileMatch[]], OneOrMore<IInternalFileMatch>>((c, e, p) => {
-			let results: IInternalFileMatch[] = [];
-			searchPromise = this.doSearch(engine, provider, -1)
-				.then(result => {
-					c([result, results]);
-					this.telemetryCallback('fileSearch', null);
-				}, e, progress => {
-					if (Array.isArray(progress)) {
-						results = progress;
-					} else {
-						p(progress);
-					}
-				});
-		}, () => {
-			searchPromise.cancel();
-		});
-
-		let cache: Cache;
-		if (config.cacheKey) {
-			cache = this.getOrCreateCache(config.cacheKey);
-			cache.resultsToSearchCache[config.filePattern] = allResultsPromise;
-			allResultsPromise.then(null, err => {
-				delete cache.resultsToSearchCache[config.filePattern];
-			});
-			allResultsPromise = this.preventCancellation(allResultsPromise);
-		}
-
-		let chained: TPromise<void>;
-		return new PPromise<[ISearchCompleteStats, IInternalFileMatch[]]>((c, e, p) => {
-			chained = allResultsPromise.then(([result, results]) => {
-				const scorerCache: ScorerCache = cache ? cache.scorerCache : Object.create(null);
-				const unsortedResultTime = Date.now();
-				return this.sortResults(config, results, scorerCache)
-					.then(sortedResults => {
-						const sortedResultTime = Date.now();
-
-						c([{
-							stats: {
-								...result.stats,
-								...{ unsortedResultTime, sortedResultTime }
-							},
-							limitHit: result.limitHit || typeof config.maxResults === 'number' && results.length > config.maxResults
-						}, sortedResults]);
-					});
-			}, e, p);
-		}, () => {
-			chained.cancel();
-		});
-	}
-
-	private getOrCreateCache(cacheKey: string): Cache {
-		const existing = this.caches[cacheKey];
-		if (existing) {
-			return existing;
-		}
-		return this.caches[cacheKey] = new Cache();
-	}
-
-	private trySortedSearchFromCache(config: IRawSearchQuery): TPromise<[ISearchCompleteStats, IInternalFileMatch[]]> {
-		const cache = config.cacheKey && this.caches[config.cacheKey];
-		if (!cache) {
-			return undefined;
-		}
-
-		const cacheLookupStartTime = Date.now();
-		const cached = this.getResultsFromCache(cache, config.filePattern);
-		if (cached) {
-			let chained: TPromise<void>;
-			return new TPromise<[ISearchCompleteStats, IInternalFileMatch[]]>((c, e) => {
-				chained = cached.then(([result, results, cacheStats]) => {
-					const cacheLookupResultTime = Date.now();
-					return this.sortResults(config, results, cache.scorerCache)
-						.then(sortedResults => {
-							const sortedResultTime = Date.now();
-
-							const stats: ICachedSearchStats = {
-								fromCache: true,
-								cacheLookupStartTime: cacheLookupStartTime,
-								cacheFilterStartTime: cacheStats.cacheFilterStartTime,
-								cacheLookupResultTime: cacheLookupResultTime,
-								cacheEntryCount: cacheStats.cacheFilterResultCount,
-								resultCount: results.length
-							};
-							if (config.sortByScore) {
-								stats.unsortedResultTime = cacheLookupResultTime;
-								stats.sortedResultTime = sortedResultTime;
-							}
-							if (!cacheStats.cacheWasResolved) {
-								stats.joined = result.stats;
-							}
-							c([
-								{
-									limitHit: result.limitHit || typeof config.maxResults === 'number' && results.length > config.maxResults,
-									stats: stats
-								},
-								sortedResults
-							]);
-						});
-				}, e);
-			}, () => {
-				chained.cancel();
-			});
-		}
-		return undefined;
-	}
-
-	private sortResults(config: IRawSearchQuery, results: IInternalFileMatch[], scorerCache: ScorerCache): TPromise<IInternalFileMatch[]> {
-		// we use the same compare function that is used later when showing the results using fuzzy scoring
-		// this is very important because we are also limiting the number of results by config.maxResults
-		// and as such we want the top items to be included in this result set if the number of items
-		// exceeds config.maxResults.
-		const query = prepareQuery(config.filePattern);
-		const compare = (matchA: IInternalFileMatch, matchB: IInternalFileMatch) => compareItemsByScore(matchA, matchB, query, true, FileMatchItemAccessor, scorerCache);
-
-		return arrays.topAsync(results, compare, config.maxResults, 10000);
-	}
-
-	private sendProgress(results: IFileMatch[], progressCb: (batch: IFileMatch[]) => void, batchSize: number) {
-		if (batchSize && batchSize > 0) {
-			for (let i = 0; i < results.length; i += batchSize) {
-				progressCb(results.slice(i, i + batchSize));
-			}
+		if (match.relativePath) {
+			return {
+				resource: resources.joinPath(match.base, match.relativePath)
+			};
 		} else {
-			progressCb(results);
+			// extraFileResources
+			return {
+				resource: match.base
+			};
 		}
 	}
 
-	private getResultsFromCache(cache: Cache, searchValue: string): PPromise<[ISearchCompleteStats, IInternalFileMatch[], CacheStats]> {
-		if (path.isAbsolute(searchValue)) {
-			return null; // bypass cache if user looks up an absolute path where matching goes directly on disk
-		}
-
-		// Find cache entries by prefix of search value
-		const hasPathSep = searchValue.indexOf(path.sep) >= 0;
-		let cached: PPromise<[ISearchCompleteStats, IInternalFileMatch[]], OneOrMore<IInternalFileMatch>>;
-		let wasResolved: boolean;
-		for (let previousSearch in cache.resultsToSearchCache) {
-
-			// If we narrow down, we might be able to reuse the cached results
-			if (strings.startsWith(searchValue, previousSearch)) {
-				if (hasPathSep && previousSearch.indexOf(path.sep) < 0) {
-					continue; // since a path character widens the search for potential more matches, require it in previous search too
-				}
-
-				const c = cache.resultsToSearchCache[previousSearch];
-				c.then(() => { wasResolved = false; });
-				wasResolved = true;
-				cached = this.preventCancellation(c);
-				break;
-			}
-		}
-
-		if (!cached) {
-			return null;
-		}
-
-		return new PPromise<[ISearchCompleteStats, IInternalFileMatch[], CacheStats]>((c, e, p) => {
-			cached.then(([complete, cachedEntries]) => {
-				const cacheFilterStartTime = Date.now();
-
-				// Pattern match on results
-				let results: IInternalFileMatch[] = [];
-				const normalizedSearchValueLowercase = strings.stripWildcards(searchValue).toLowerCase();
-				for (let i = 0; i < cachedEntries.length; i++) {
-					let entry = cachedEntries[i];
-
-					// Check if this entry is a match for the search value
-					if (!strings.fuzzyContains(entry.relativePath, normalizedSearchValueLowercase)) {
-						continue;
-					}
-
-					results.push(entry);
-				}
-
-				c([complete, results, {
-					cacheWasResolved: wasResolved,
-					cacheFilterStartTime: cacheFilterStartTime,
-					cacheFilterResultCount: cachedEntries.length
-				}]);
-			}, e, p);
-		}, () => {
-			cached.cancel();
-		});
-	}
-
-	private doSearch(engine: FileSearchEngine, provider: vscode.SearchProvider, batchSize?: number): PPromise<ISearchCompleteStats, OneOrMore<IInternalFileMatch>> {
-		return new PPromise<ISearchCompleteStats, OneOrMore<IInternalFileMatch>>((c, e, p) => {
-			let batch: IInternalFileMatch[] = [];
-			engine.search().then(result => {
-				if (batch.length) {
-					p(batch);
-				}
-
-				c({
-					limitHit: result.isLimitHit,
-					stats: engine.getStats() // TODO@roblou
-				});
-			}, error => {
-				if (batch.length) {
-					p(batch);
-				}
-
-				e(error);
-			}, match => {
-				if (match) {
-					if (batchSize) {
-						batch.push(match);
-						if (batchSize > 0 && batch.length >= batchSize) {
-							p(batch);
-							batch = [];
-						}
-					} else {
-						p(match);
-					}
-				}
-			});
-		}, () => {
+	private doSearch(engine: FileSearchEngine, batchSize: number, onResultBatch: (matches: IInternalFileMatch[]) => void, token: CancellationToken): TPromise<IInternalSearchComplete> {
+		token.onCancellationRequested(() => {
 			engine.cancel();
 		});
-	}
 
-	public clearCache(cacheKey: string): TPromise<void> {
-		delete this.caches[cacheKey];
-		return TPromise.as(undefined);
-	}
+		const _onResult = match => {
+			if (match) {
+				batch.push(match);
+				if (batchSize > 0 && batch.length >= batchSize) {
+					onResultBatch(batch);
+					batch = [];
+				}
+			}
+		};
 
-	private preventCancellation<C, P>(promise: PPromise<C, P>): PPromise<C, P> {
-		return new PPromise<C, P>((c, e, p) => {
-			// Allow for piled up cancellations to come through first.
-			process.nextTick(() => {
-				promise.then(c, e, p);
-			});
-		}, () => {
-			// Do not propagate.
+		let batch: IInternalFileMatch[] = [];
+		return engine.search(_onResult).then(result => {
+			if (batch.length) {
+				onResultBatch(batch);
+			}
+
+			return result;
+		}, error => {
+			if (batch.length) {
+				onResultBatch(batch);
+			}
+
+			return TPromise.wrapError(error);
 		});
 	}
 }
-
-class Cache {
-
-	public resultsToSearchCache: { [searchValue: string]: PPromise<[ISearchCompleteStats, IInternalFileMatch[]], OneOrMore<IInternalFileMatch>>; } = Object.create(null);
-
-	public scorerCache: ScorerCache = Object.create(null);
-}
-
-const FileMatchItemAccessor = new class implements IItemAccessor<IInternalFileMatch> {
-
-	public getItemLabel(match: IInternalFileMatch): string {
-		return match.basename; // e.g. myFile.txt
-	}
-
-	public getItemDescription(match: IInternalFileMatch): string {
-		return match.relativePath.substr(0, match.relativePath.length - match.basename.length - 1); // e.g. some/path/to/file
-	}
-
-	public getItemPath(match: IInternalFileMatch): string {
-		return match.relativePath; // e.g. some/path/to/file/myFile.txt
-	}
-};
-
-interface CacheStats {
-	cacheWasResolved: boolean;
-	cacheFilterStartTime: number;
-	cacheFilterResultCount: number;
-}
diff --git a/src/vs/workbench/api/node/extHostStorage.ts b/src/vs/workbench/api/node/extHostStorage.ts
index 5a36bd5d550..534d5ef0c14 100644
--- a/src/vs/workbench/api/node/extHostStorage.ts
+++ b/src/vs/workbench/api/node/extHostStorage.ts
@@ -4,7 +4,6 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import { TPromise } from 'vs/base/common/winjs.base';
 import { MainContext, MainThreadStorageShape, IMainContext } from './extHost.protocol';
 
 export class ExtHostStorage {
@@ -15,11 +14,11 @@ export class ExtHostStorage {
 		this._proxy = mainContext.getProxy(MainContext.MainThreadStorage);
 	}
 
-	getValue<T>(shared: boolean, key: string, defaultValue?: T): TPromise<T> {
+	getValue<T>(shared: boolean, key: string, defaultValue?: T): Thenable<T> {
 		return this._proxy.$getValue<T>(shared, key).then(value => value || defaultValue);
 	}
 
-	setValue(shared: boolean, key: string, value: any): TPromise<void> {
+	setValue(shared: boolean, key: string, value: any): Thenable<void> {
 		return this._proxy.$setValue(shared, key, value);
 	}
 }
diff --git a/src/vs/workbench/api/node/extHostTask.ts b/src/vs/workbench/api/node/extHostTask.ts
index 9f298b613df..f6f4d07fd70 100644
--- a/src/vs/workbench/api/node/extHostTask.ts
+++ b/src/vs/workbench/api/node/extHostTask.ts
@@ -4,11 +4,11 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import URI, { UriComponents } from 'vs/base/common/uri';
+import { URI, UriComponents } from 'vs/base/common/uri';
 import * as nls from 'vs/nls';
 import { TPromise } from 'vs/base/common/winjs.base';
 import * as Objects from 'vs/base/common/objects';
-import { asWinJsPromise } from 'vs/base/common/async';
+import { asThenable } from 'vs/base/common/async';
 import { Event, Emitter } from 'vs/base/common/event';
 
 import { IExtensionDescription } from 'vs/workbench/services/extensions/common/extensions';
@@ -27,6 +27,7 @@ import { ExtHostVariableResolverService } from 'vs/workbench/api/node/extHostDeb
 import { ExtHostDocumentsAndEditors } from 'vs/workbench/api/node/extHostDocumentsAndEditors';
 import { ExtHostConfiguration } from 'vs/workbench/api/node/extHostConfiguration';
 import { IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
+import { CancellationToken } from 'vs/base/common/cancellation';
 
 /*
 namespace ProblemPattern {
@@ -803,7 +804,7 @@ export class ExtHostTask implements ExtHostTaskShape {
 		return result;
 	}
 
-	public terminateTask(execution: vscode.TaskExecution): TPromise<void> {
+	public terminateTask(execution: vscode.TaskExecution): Thenable<void> {
 		if (!(execution instanceof TaskExecutionImpl)) {
 			throw new Error('No valid task execution provided');
 		}
@@ -860,22 +861,32 @@ export class ExtHostTask implements ExtHostTaskShape {
 		}
 	}
 
-	public $provideTasks(handle: number): TPromise<tasks.TaskSet> {
+	public $provideTasks(handle: number, validTypes: { [key: string]: boolean; }): Thenable<tasks.TaskSet> {
 		let handler = this._handlers.get(handle);
 		if (!handler) {
 			return TPromise.wrapError<tasks.TaskSet>(new Error('no handler found'));
 		}
-		return asWinJsPromise(token => handler.provider.provideTasks(token)).then(value => {
+		return asThenable(() => handler.provider.provideTasks(CancellationToken.None)).then(value => {
+			let sanitized: vscode.Task[] = [];
+			for (let task of value) {
+				if (task.definition && validTypes[task.definition.type] === true) {
+					sanitized.push(task);
+				} else {
+					sanitized.push(task);
+					console.warn(`The task [${task.source}, ${task.name}] uses an undefined task type. The task will be ignored in the future.`);
+				}
+			}
 			let workspaceFolders = this._workspaceService.getWorkspaceFolders();
 			return {
-				tasks: Tasks.from(value, workspaceFolders && workspaceFolders.length > 0 ? workspaceFolders[0] : undefined, handler.extension),
+				tasks: Tasks.from(sanitized, workspaceFolders && workspaceFolders.length > 0 ? workspaceFolders[0] : undefined, handler.extension),
 				extension: handler.extension
 			};
 		});
 	}
 
-	public $resolveVariables(uri: URI, variables: string[]): any {
-		let result = Object.create(null);
+	public $resolveVariables(uriComponents: UriComponents, variables: string[]): any {
+		let uri: URI = URI.revive(uriComponents);
+		let result: { [key: string]: string; } = Object.create(null);
 		let workspaceFolder = this._workspaceService.resolveWorkspaceFolder(uri);
 		let resolver = new ExtHostVariableResolverService(this._workspaceService, this._editorService, this._configurationService);
 		let ws: IWorkspaceFolder = {
@@ -887,7 +898,7 @@ export class ExtHostTask implements ExtHostTaskShape {
 			}
 		};
 		for (let variable of variables) {
-			result.push(variable, resolver.resolve(ws, variable));
+			result[variable] = resolver.resolve(ws, variable);
 		}
 		return result;
 	}
diff --git a/src/vs/workbench/api/node/extHostTerminalService.ts b/src/vs/workbench/api/node/extHostTerminalService.ts
index c4f2e996461..e9bc45504fc 100644
--- a/src/vs/workbench/api/node/extHostTerminalService.ts
+++ b/src/vs/workbench/api/node/extHostTerminalService.ts
@@ -5,28 +5,77 @@
 'use strict';
 
 import * as vscode from 'vscode';
-import * as cp from 'child_process';
 import * as os from 'os';
 import * as platform from 'vs/base/common/platform';
 import * as terminalEnvironment from 'vs/workbench/parts/terminal/node/terminalEnvironment';
-import Uri from 'vs/base/common/uri';
 import { Event, Emitter } from 'vs/base/common/event';
 import { ExtHostTerminalServiceShape, MainContext, MainThreadTerminalServiceShape, IMainContext, ShellLaunchConfigDto } from 'vs/workbench/api/node/extHost.protocol';
-import { IMessageFromTerminalProcess } from 'vs/workbench/parts/terminal/node/terminal';
 import { ExtHostConfiguration } from 'vs/workbench/api/node/extHostConfiguration';
 import { ILogService } from 'vs/platform/log/common/log';
+import { EXT_HOST_CREATION_DELAY } from 'vs/workbench/parts/terminal/common/terminal';
+import { TerminalProcess } from 'vs/workbench/parts/terminal/node/terminalProcess';
 
-export class ExtHostTerminal implements vscode.Terminal {
-	private _name: string;
-	private _id: number;
-	private _proxy: MainThreadTerminalServiceShape;
-	private _disposed: boolean;
-	private _queuedRequests: ApiRequest[];
+const RENDERER_NO_PROCESS_ID = -1;
+
+export class BaseExtHostTerminal {
+	public _id: number;
+	protected _idPromise: Promise<number>;
+	private _idPromiseComplete: (value: number) => any;
+	private _disposed: boolean = false;
+	private _queuedRequests: ApiRequest[] = [];
+
+	constructor(
+		protected _proxy: MainThreadTerminalServiceShape,
+		id?: number
+	) {
+		this._idPromise = new Promise<number>(c => {
+			if (id !== undefined) {
+				this._id = id;
+				c(id);
+			} else {
+				this._idPromiseComplete = c;
+			}
+		});
+	}
+
+	public dispose(): void {
+		if (!this._disposed) {
+			this._disposed = true;
+			this._queueApiRequest(this._proxy.$dispose, []);
+		}
+	}
+
+	protected _checkDisposed() {
+		if (this._disposed) {
+			throw new Error('Terminal has already been disposed');
+		}
+	}
+
+	protected _queueApiRequest(callback: (...args: any[]) => void, args: any[]): void {
+		const request: ApiRequest = new ApiRequest(callback, args);
+		if (!this._id) {
+			this._queuedRequests.push(request);
+			return;
+		}
+		request.run(this._proxy, this._id);
+	}
+
+	public _runQueuedRequests(id: number): void {
+		this._id = id;
+		this._idPromiseComplete(id);
+		this._queuedRequests.forEach((r) => {
+			r.run(this._proxy, this._id);
+		});
+		this._queuedRequests.length = 0;
+	}
+}
+
+export class ExtHostTerminal extends BaseExtHostTerminal implements vscode.Terminal {
 	private _pidPromise: Promise<number>;
 	private _pidPromiseComplete: (value: number) => any;
 
 	private readonly _onData: Emitter<string> = new Emitter<string>();
-	public get onData(): Event<string> {
+	public get onDidWriteData(): Event<string> {
 		// Tell the main side to start sending data if it's not already
 		this._proxy.$registerOnDataListener(this._id);
 		return this._onData && this._onData.event;
@@ -34,17 +83,17 @@ export class ExtHostTerminal implements vscode.Terminal {
 
 	constructor(
 		proxy: MainThreadTerminalServiceShape,
-		name: string = '',
-		id?: number
+		private _name: string,
+		id?: number,
+		pid?: number
 	) {
-		this._proxy = proxy;
-		this._name = name;
-		if (id) {
-			this._id = id;
-		}
-		this._queuedRequests = [];
+		super(proxy, id);
 		this._pidPromise = new Promise<number>(c => {
-			this._pidPromiseComplete = c;
+			if (pid === RENDERER_NO_PROCESS_ID) {
+				c(undefined);
+			} else {
+				this._pidPromiseComplete = c;
+			}
 		});
 	}
 
@@ -56,11 +105,7 @@ export class ExtHostTerminal implements vscode.Terminal {
 		waitOnExit?: boolean
 	): void {
 		this._proxy.$createTerminal(this._name, shellPath, shellArgs, cwd, env, waitOnExit).then((id) => {
-			this._id = id;
-			this._queuedRequests.forEach((r) => {
-				r.run(this._proxy, this._id);
-			});
-			this._queuedRequests = [];
+			this._runQueuedRequests(id);
 		});
 	}
 
@@ -87,13 +132,6 @@ export class ExtHostTerminal implements vscode.Terminal {
 		this._queueApiRequest(this._proxy.$hide, []);
 	}
 
-	public dispose(): void {
-		if (!this._disposed) {
-			this._disposed = true;
-			this._queueApiRequest(this._proxy.$dispose, []);
-		}
-	}
-
 	public _setProcessId(processId: number): void {
 		// The event may fire 2 times when the panel is restored
 		if (this._pidPromiseComplete) {
@@ -105,34 +143,99 @@ export class ExtHostTerminal implements vscode.Terminal {
 	public _fireOnData(data: string): void {
 		this._onData.fire(data);
 	}
+}
 
-	private _queueApiRequest(callback: (...args: any[]) => void, args: any[]) {
-		let request: ApiRequest = new ApiRequest(callback, args);
-		if (!this._id) {
-			this._queuedRequests.push(request);
-			return;
-		}
-		request.run(this._proxy, this._id);
+export class ExtHostTerminalRenderer extends BaseExtHostTerminal implements vscode.TerminalRenderer {
+	public get name(): string { return this._name; }
+	public set name(newName: string) {
+		this._name = newName;
+		this._checkDisposed();
+		this._queueApiRequest(this._proxy.$terminalRendererSetName, [this._name]);
 	}
 
-	private _checkDisposed() {
-		if (this._disposed) {
-			throw new Error('Terminal has already been disposed');
+	private readonly _onInput: Emitter<string> = new Emitter<string>();
+	public get onDidAcceptInput(): Event<string> {
+		this._checkDisposed();
+		this._queueApiRequest(this._proxy.$terminalRendererRegisterOnInputListener, [this._id]);
+		// Tell the main side to start sending data if it's not already
+		// this._proxy.$terminalRendererRegisterOnDataListener(this._id);
+		return this._onInput && this._onInput.event;
+	}
+
+	private _dimensions: vscode.TerminalDimensions | undefined;
+	public get dimensions(): vscode.TerminalDimensions { return this._dimensions; }
+	public set dimensions(dimensions: vscode.TerminalDimensions) {
+		this._checkDisposed();
+		this._dimensions = dimensions;
+		this._queueApiRequest(this._proxy.$terminalRendererSetDimensions, [dimensions]);
+	}
+
+	private _maximumDimensions: vscode.TerminalDimensions;
+	public get maximumDimensions(): vscode.TerminalDimensions {
+		if (!this._maximumDimensions) {
+			return undefined;
 		}
+		return {
+			rows: this._maximumDimensions.rows,
+			columns: this._maximumDimensions.columns
+		};
+	}
+
+	private readonly _onDidChangeMaximumDimensions: Emitter<vscode.TerminalDimensions> = new Emitter<vscode.TerminalDimensions>();
+	public get onDidChangeMaximumDimensions(): Event<vscode.TerminalDimensions> {
+		return this._onDidChangeMaximumDimensions && this._onDidChangeMaximumDimensions.event;
+	}
+
+	public get terminal(): ExtHostTerminal {
+		return this._terminal;
+	}
+
+	constructor(
+		proxy: MainThreadTerminalServiceShape,
+		private _name: string,
+		private _terminal: ExtHostTerminal
+	) {
+		super(proxy);
+		this._proxy.$createTerminalRenderer(this._name).then(id => {
+			this._runQueuedRequests(id);
+			(<any>this._terminal)._runQueuedRequests(id);
+		});
+	}
+
+	public write(data: string): void {
+		this._checkDisposed();
+		this._queueApiRequest(this._proxy.$terminalRendererWrite, [data]);
+	}
+
+	public _fireOnInput(data: string): void {
+		this._onInput.fire(data);
+	}
+
+	public _setMaximumDimensions(columns: number, rows: number): void {
+		if (this._maximumDimensions && this._maximumDimensions.columns === columns && this._maximumDimensions.rows === rows) {
+			return;
+		}
+		this._maximumDimensions = { columns, rows };
+		this._onDidChangeMaximumDimensions.fire(this.maximumDimensions);
 	}
 }
 
 export class ExtHostTerminalService implements ExtHostTerminalServiceShape {
 	private _proxy: MainThreadTerminalServiceShape;
+	private _activeTerminal: ExtHostTerminal;
 	private _terminals: ExtHostTerminal[] = [];
-	private _terminalProcesses: { [id: number]: cp.ChildProcess } = {};
+	private _terminalProcesses: { [id: number]: TerminalProcess } = {};
+	private _terminalRenderers: ExtHostTerminalRenderer[] = [];
 
+	public get activeTerminal(): ExtHostTerminal { return this._activeTerminal; }
 	public get terminals(): ExtHostTerminal[] { return this._terminals; }
 
 	private readonly _onDidCloseTerminal: Emitter<vscode.Terminal> = new Emitter<vscode.Terminal>();
 	public get onDidCloseTerminal(): Event<vscode.Terminal> { return this._onDidCloseTerminal && this._onDidCloseTerminal.event; }
 	private readonly _onDidOpenTerminal: Emitter<vscode.Terminal> = new Emitter<vscode.Terminal>();
 	public get onDidOpenTerminal(): Event<vscode.Terminal> { return this._onDidOpenTerminal && this._onDidOpenTerminal.event; }
+	private readonly _onDidChangeActiveTerminal: Emitter<vscode.Terminal | undefined> = new Emitter<vscode.Terminal | undefined>();
+	public get onDidChangeActiveTerminal(): Event<vscode.Terminal | undefined> { return this._onDidChangeActiveTerminal && this._onDidChangeActiveTerminal.event; }
 
 	constructor(
 		mainContext: IMainContext,
@@ -143,53 +246,108 @@ export class ExtHostTerminalService implements ExtHostTerminalServiceShape {
 	}
 
 	public createTerminal(name?: string, shellPath?: string, shellArgs?: string[]): vscode.Terminal {
-		let terminal = new ExtHostTerminal(this._proxy, name);
+		const terminal = new ExtHostTerminal(this._proxy, name);
 		terminal.create(shellPath, shellArgs);
 		this._terminals.push(terminal);
 		return terminal;
 	}
 
 	public createTerminalFromOptions(options: vscode.TerminalOptions): vscode.Terminal {
-		let terminal = new ExtHostTerminal(this._proxy, options.name);
+		const terminal = new ExtHostTerminal(this._proxy, options.name);
 		terminal.create(options.shellPath, options.shellArgs, options.cwd, options.env /*, options.waitOnExit*/);
 		this._terminals.push(terminal);
 		return terminal;
 	}
 
-	public $acceptTerminalProcessData(id: number, data: string): void {
-		let index = this._getTerminalIndexById(id);
-		if (index === null) {
-			return;
+	public createTerminalRenderer(name: string): vscode.TerminalRenderer {
+		const terminal = new ExtHostTerminal(this._proxy, name);
+		terminal._setProcessId(undefined);
+		this._terminals.push(terminal);
+
+		const renderer = new ExtHostTerminalRenderer(this._proxy, name, terminal);
+		this._terminalRenderers.push(renderer);
+
+		return renderer;
+	}
+
+	public $acceptActiveTerminalChanged(id: number | null): void {
+		const original = this._activeTerminal;
+		if (id === null) {
+			this._activeTerminal = undefined;
+			if (original !== this._activeTerminal) {
+				this._onDidChangeActiveTerminal.fire(this._activeTerminal);
+			}
+		}
+		this._performTerminalIdAction(id, terminal => {
+			if (terminal) {
+				this._activeTerminal = terminal;
+				if (original !== this._activeTerminal) {
+					this._onDidChangeActiveTerminal.fire(this._activeTerminal);
+				}
+			}
+		});
+	}
+
+	public $acceptTerminalProcessData(id: number, data: string): void {
+		// TODO: Queue requests, currently the first 100ms of data may get missed
+		const terminal = this._getTerminalById(id);
+		if (terminal) {
+			terminal._fireOnData(data);
+		}
+	}
+
+	public $acceptTerminalRendererDimensions(id: number, cols: number, rows: number): void {
+		const renderer = this._getTerminalRendererById(id);
+		if (renderer) {
+			renderer._setMaximumDimensions(cols, rows);
+		}
+	}
+
+	public $acceptTerminalRendererInput(id: number, data: string): void {
+		const renderer = this._getTerminalRendererById(id);
+		if (renderer) {
+			renderer._fireOnInput(data);
 		}
-		const terminal = this._terminals[index];
-		terminal._fireOnData(data);
 	}
 
 	public $acceptTerminalClosed(id: number): void {
-		let index = this._getTerminalIndexById(id);
+		const index = this._getTerminalObjectIndexById(this.terminals, id);
 		if (index === null) {
 			return;
 		}
-		let terminal = this._terminals.splice(index, 1)[0];
+		const terminal = this._terminals.splice(index, 1)[0];
 		this._onDidCloseTerminal.fire(terminal);
 	}
 
 	public $acceptTerminalOpened(id: number, name: string): void {
-		let index = this._getTerminalIndexById(id);
+		const index = this._getTerminalObjectIndexById(this._terminals, id);
 		if (index !== null) {
 			// The terminal has already been created (via createTerminal*), only fire the event
 			this._onDidOpenTerminal.fire(this.terminals[index]);
 			return;
 		}
-		let terminal = new ExtHostTerminal(this._proxy, name, id);
+		const renderer = this._getTerminalRendererById(id);
+		const terminal = new ExtHostTerminal(this._proxy, name, id, renderer ? RENDERER_NO_PROCESS_ID : undefined);
 		this._terminals.push(terminal);
 		this._onDidOpenTerminal.fire(terminal);
 	}
 
 	public $acceptTerminalProcessId(id: number, processId: number): void {
+		this._performTerminalIdAction(id, terminal => terminal._setProcessId(processId));
+	}
+
+	private _performTerminalIdAction(id: number, callback: (terminal: ExtHostTerminal) => void): void {
 		let terminal = this._getTerminalById(id);
 		if (terminal) {
-			terminal._setProcessId(processId);
+			callback(terminal);
+		} else {
+			// Retry one more time in case the terminal has not yet been initialized.
+			setTimeout(() => {
+				terminal = this._getTerminalById(id);
+				if (terminal) {
+					callback(terminal);
+				}
+			}, EXT_HOST_CREATION_DELAY);
 		}
 	}
 
@@ -199,7 +357,6 @@ export class ExtHostTerminalService implements ExtHostTerminalServiceShape {
 
 		const terminalConfig = this._extHostConfiguration.getConfiguration('terminal.integrated');
 
-		const locale = terminalConfig.get('setLocaleVariables') ? platform.locale : undefined;
 		if (!shellLaunchConfig.executable) {
 			// TODO: This duplicates some of TerminalConfigHelper.mergeDefaultShellPathAndArgs and should be merged
 			// this._configHelper.mergeDefaultShellPathAndArgs(shellLaunchConfig);
@@ -213,7 +370,7 @@ export class ExtHostTerminalService implements ExtHostTerminalServiceShape {
 		}
 
 		// TODO: Base the cwd on the last active workspace root
-		// const lastActiveWorkspaceRootUri = this._historyService.getLastActiveWorkspaceRoot('file');
+		// const lastActiveWorkspaceRootUri = this._historyService.getLastActiveWorkspaceRoot(Schemas.file);
 		// this.initialCwd = terminalEnvironment.getCwd(shellLaunchConfig, lastActiveWorkspaceRootUri, this._configHelper);
 		const initialCwd = os.homedir();
 
@@ -223,61 +380,48 @@ export class ExtHostTerminalService implements ExtHostTerminalServiceShape {
 		// const platformKey = platform.isWindows ? 'windows' : (platform.isMacintosh ? 'osx' : 'linux');
 		// const envFromConfig = terminalEnvironment.resolveConfigurationVariables(this._configurationResolverService, { ...this._configHelper.config.env[platformKey] }, lastActiveWorkspaceRoot);
 		// const envFromShell = terminalEnvironment.resolveConfigurationVariables(this._configurationResolverService, { ...shellLaunchConfig.env }, lastActiveWorkspaceRoot);
-		// shellLaunchConfig.env = envFromShell;
 
 		// Merge process env with the env from config
-		const parentEnv = { ...process.env };
-		// terminalEnvironment.mergeEnvironments(parentEnv, envFromConfig);
+		const env = { ...process.env };
+		// terminalEnvironment.mergeEnvironments(env, envFromConfig);
+		terminalEnvironment.mergeEnvironments(env, shellLaunchConfig.env);
 
 		// Continue env initialization, merging in the env from the launch
 		// config and adding keys that are needed to create the process
-		const env = terminalEnvironment.createTerminalEnv(parentEnv, shellLaunchConfig, initialCwd, locale, cols, rows);
-		let cwd = Uri.parse(require.toUrl('../../parts/terminal/node')).fsPath;
-		const options = { env, cwd, execArgv: [] };
+		const locale = terminalConfig.get('setLocaleVariables') ? platform.locale : undefined;
+		terminalEnvironment.addTerminalEnvironmentKeys(env, locale);
 
 		// Fork the process and listen for messages
-		this._logService.debug(`Terminal process launching on ext host`, options);
-		this._terminalProcesses[id] = cp.fork(Uri.parse(require.toUrl('bootstrap')).fsPath, ['--type=terminal'], options);
-		this._terminalProcesses[id].on('message', (message: IMessageFromTerminalProcess) => {
-			switch (message.type) {
-				case 'pid': this._proxy.$sendProcessPid(id, <number>message.content); break;
-				case 'title': this._proxy.$sendProcessTitle(id, <string>message.content); break;
-				case 'data': this._proxy.$sendProcessData(id, <string>message.content); break;
-			}
-		});
-		this._terminalProcesses[id].on('exit', (exitCode) => this._onProcessExit(id, exitCode));
+		this._logService.debug(`Terminal process launching on ext host`, shellLaunchConfig, initialCwd, cols, rows, env);
+		this._terminalProcesses[id] = new TerminalProcess(shellLaunchConfig, initialCwd, cols, rows, env);
+		this._terminalProcesses[id].onProcessIdReady(pid => this._proxy.$sendProcessPid(id, pid));
+		this._terminalProcesses[id].onProcessTitleChanged(title => this._proxy.$sendProcessTitle(id, title));
+		this._terminalProcesses[id].onProcessData(data => this._proxy.$sendProcessData(id, data));
+		this._terminalProcesses[id].onProcessExit((exitCode) => this._onProcessExit(id, exitCode));
 	}
 
 	public $acceptProcessInput(id: number, data: string): void {
-		if (this._terminalProcesses[id].connected) {
-			this._terminalProcesses[id].send({ event: 'input', data });
-		}
+		this._terminalProcesses[id].input(data);
 	}
 
 	public $acceptProcessResize(id: number, cols: number, rows: number): void {
-		if (this._terminalProcesses[id].connected) {
-			try {
-				this._terminalProcesses[id].send({ event: 'resize', cols, rows });
-			} catch (error) {
-				// We tried to write to a closed pipe / channel.
-				if (error.code !== 'EPIPE' && error.code !== 'ERR_IPC_CHANNEL_CLOSED') {
-					throw (error);
-				}
+		try {
+			this._terminalProcesses[id].resize(cols, rows);
+		} catch (error) {
+			// We tried to write to a closed pipe / channel.
+			if (error.code !== 'EPIPE' && error.code !== 'ERR_IPC_CHANNEL_CLOSED') {
+				throw (error);
 			}
 		}
 	}
 
-	public $acceptProcessShutdown(id: number): void {
-		if (this._terminalProcesses[id].connected) {
-			this._terminalProcesses[id].send({ event: 'shutdown' });
-		}
+	public $acceptProcessShutdown(id: number, immediate: boolean): void {
+		this._terminalProcesses[id].shutdown(immediate);
 	}
 
 	private _onProcessExit(id: number, exitCode: number): void {
 		// Remove listeners
-		const process = this._terminalProcesses[id];
-		process.removeAllListeners('message');
-		process.removeAllListeners('exit');
+		this._terminalProcesses[id].dispose();
 
 		// Remove process reference
 		delete this._terminalProcesses[id];
@@ -286,16 +430,43 @@ export class ExtHostTerminalService implements ExtHostTerminalServiceShape {
 		this._proxy.$sendProcessExit(id, exitCode);
 	}
 
-	private _getTerminalById(id: number): ExtHostTerminal {
-		let index = this._getTerminalIndexById(id);
-		return index !== null ? this._terminals[index] : null;
+	private _getTerminalByIdEventually(id: number, retries: number = 5): Promise<ExtHostTerminal> {
+		return new Promise(c => {
+			if (retries === 0) {
+				c(undefined);
+				return;
+			}
+
+			const terminal = this._getTerminalById(id);
+			if (terminal) {
+				c(terminal);
+			} else {
+				// This should only be needed immediately after createTerminalRenderer is called as
+				// the ExtHostTerminal has not yet been iniitalized
+				setTimeout(() => {
+					c(this._getTerminalByIdEventually(id, retries - 1));
+				}, 200);
+			}
+		});
 	}
 
-	private _getTerminalIndexById(id: number): number {
+	private _getTerminalById(id: number): ExtHostTerminal {
+		return this._getTerminalObjectById(this._terminals, id);
+	}
+
+	private _getTerminalRendererById(id: number): ExtHostTerminalRenderer {
+		return this._getTerminalObjectById(this._terminalRenderers, id);
+	}
+
+	private _getTerminalObjectById<T extends ExtHostTerminal | ExtHostTerminalRenderer>(array: T[], id: number): T {
+		const index = this._getTerminalObjectIndexById(array, id);
+		return index !== null ? array[index] : null;
+	}
+
+	private _getTerminalObjectIndexById<T extends ExtHostTerminal | ExtHostTerminalRenderer>(array: T[], id: number): number {
 		let index: number = null;
-		this._terminals.some((terminal, i) => {
-			// TODO: This shouldn't be cas
-			let thisId = (<any>terminal)._id;
+		array.some((item, i) => {
+			const thisId = item._id;
 			if (thisId === id) {
 				index = i;
 				return true;
diff --git a/src/vs/workbench/api/node/extHostTextEditor.ts b/src/vs/workbench/api/node/extHostTextEditor.ts
index 0d9d7c2d9a7..5131242cf21 100644
--- a/src/vs/workbench/api/node/extHostTextEditor.ts
+++ b/src/vs/workbench/api/node/extHostTextEditor.ts
@@ -322,6 +322,7 @@ export class ExtHostTextEditor implements vscode.TextEditor {
 	private _visibleRanges: Range[];
 	private _viewColumn: vscode.ViewColumn;
 	private _disposed: boolean = false;
+	private _hasDecorationsForKey: { [key: string]: boolean; };
 
 	get id(): string { return this._id; }
 
@@ -337,6 +338,7 @@ export class ExtHostTextEditor implements vscode.TextEditor {
 		this._options = new ExtHostTextEditorOptions(this._proxy, this._id, options);
 		this._visibleRanges = visibleRanges;
 		this._viewColumn = viewColumn;
+		this._hasDecorationsForKey = Object.create(null);
 	}
 
 	dispose() {
@@ -436,6 +438,16 @@ export class ExtHostTextEditor implements vscode.TextEditor {
 	}
 
 	setDecorations(decorationType: vscode.TextEditorDecorationType, ranges: Range[] | vscode.DecorationOptions[]): void {
+		const willBeEmpty = (ranges.length === 0);
+		if (willBeEmpty && !this._hasDecorationsForKey[decorationType.key]) {
+			// avoid no-op call to the renderer
+			return;
+		}
+		if (willBeEmpty) {
+			delete this._hasDecorationsForKey[decorationType.key];
+		} else {
+			this._hasDecorationsForKey[decorationType.key] = true;
+		}
 		this._runOnProxy(
 			() => {
 				if (TypeConverters.isDecorationOptionsArr(ranges)) {
@@ -473,7 +485,7 @@ export class ExtHostTextEditor implements vscode.TextEditor {
 		);
 	}
 
-	private _trySetSelection(): TPromise<vscode.TextEditor> {
+	private _trySetSelection(): Thenable<vscode.TextEditor> {
 		let selection = this._selections.map(TypeConverters.Selection.from);
 		return this._runOnProxy(() => this._proxy.$trySetSelections(this._id, selection));
 	}
@@ -494,9 +506,14 @@ export class ExtHostTextEditor implements vscode.TextEditor {
 		return this._applyEdit(edit);
 	}
 
-	private _applyEdit(editBuilder: TextEditorEdit): TPromise<boolean> {
+	private _applyEdit(editBuilder: TextEditorEdit): Thenable<boolean> {
 		let editData = editBuilder.finalize();
 
+		// return when there is nothing to do
+		if (editData.edits.length === 0 && !editData.setEndOfLine) {
+			return TPromise.wrap(true);
+		}
+
 		// check that the edits are not overlapping (i.e. illegal)
 		let editRanges = editData.edits.map(edit => edit.range);
 
@@ -575,7 +592,7 @@ export class ExtHostTextEditor implements vscode.TextEditor {
 
 	// ---- util
 
-	private _runOnProxy(callback: () => TPromise<any>): TPromise<ExtHostTextEditor> {
+	private _runOnProxy(callback: () => Thenable<any>): Thenable<ExtHostTextEditor> {
 		if (this._disposed) {
 			console.warn('TextEditor is closed/disposed');
 			return TPromise.as(undefined);
@@ -589,7 +606,7 @@ export class ExtHostTextEditor implements vscode.TextEditor {
 	}
 }
 
-function warnOnError(promise: TPromise<any>): void {
+function warnOnError(promise: Thenable<any>): void {
 	promise.then(null, (err) => {
 		console.warn(err);
 	});
diff --git a/src/vs/workbench/api/node/extHostTextEditors.ts b/src/vs/workbench/api/node/extHostTextEditors.ts
index 4bbe0c52412..d1c332244af 100644
--- a/src/vs/workbench/api/node/extHostTextEditors.ts
+++ b/src/vs/workbench/api/node/extHostTextEditors.ts
@@ -6,12 +6,11 @@
 
 import { Event, Emitter } from 'vs/base/common/event';
 import { toThenable } from 'vs/base/common/async';
-import { TPromise } from 'vs/base/common/winjs.base';
 import { TextEditorSelectionChangeKind } from './extHostTypes';
 import * as TypeConverters from './extHostTypeConverters';
 import { TextEditorDecorationType, ExtHostTextEditor } from './extHostTextEditor';
 import { ExtHostDocumentsAndEditors } from './extHostDocumentsAndEditors';
-import { MainContext, MainThreadTextEditorsShape, ExtHostEditorsShape, ITextDocumentShowOptions, ITextEditorPositionData, IMainContext, WorkspaceEditDto, IEditorPropertiesChangeData } from './extHost.protocol';
+import { MainContext, MainThreadTextEditorsShape, ExtHostEditorsShape, ITextDocumentShowOptions, ITextEditorPositionData, IMainContext, IEditorPropertiesChangeData } from './extHost.protocol';
 import * as vscode from 'vscode';
 
 export class ExtHostEditors implements ExtHostEditorsShape {
@@ -53,10 +52,10 @@ export class ExtHostEditors implements ExtHostEditorsShape {
 		return this._extHostDocumentsAndEditors.allEditors();
 	}
 
-	showTextDocument(document: vscode.TextDocument, column: vscode.ViewColumn, preserveFocus: boolean): TPromise<vscode.TextEditor>;
-	showTextDocument(document: vscode.TextDocument, options: { column: vscode.ViewColumn, preserveFocus: boolean, pinned: boolean }): TPromise<vscode.TextEditor>;
-	showTextDocument(document: vscode.TextDocument, columnOrOptions: vscode.ViewColumn | vscode.TextDocumentShowOptions, preserveFocus?: boolean): TPromise<vscode.TextEditor>;
-	showTextDocument(document: vscode.TextDocument, columnOrOptions: vscode.ViewColumn | vscode.TextDocumentShowOptions, preserveFocus?: boolean): TPromise<vscode.TextEditor> {
+	showTextDocument(document: vscode.TextDocument, column: vscode.ViewColumn, preserveFocus: boolean): Thenable<vscode.TextEditor>;
+	showTextDocument(document: vscode.TextDocument, options: { column: vscode.ViewColumn, preserveFocus: boolean, pinned: boolean }): Thenable<vscode.TextEditor>;
+	showTextDocument(document: vscode.TextDocument, columnOrOptions: vscode.ViewColumn | vscode.TextDocumentShowOptions, preserveFocus?: boolean): Thenable<vscode.TextEditor>;
+	showTextDocument(document: vscode.TextDocument, columnOrOptions: vscode.ViewColumn | vscode.TextDocumentShowOptions, preserveFocus?: boolean): Thenable<vscode.TextEditor> {
 		let options: ITextDocumentShowOptions;
 		if (typeof columnOrOptions === 'number') {
 			options = {
@@ -90,24 +89,8 @@ export class ExtHostEditors implements ExtHostEditorsShape {
 		return new TextEditorDecorationType(this._proxy, options);
 	}
 
-	applyWorkspaceEdit(edit: vscode.WorkspaceEdit): TPromise<boolean> {
-
-		const dto: WorkspaceEditDto = { edits: [] };
-
-		for (let entry of edit.entries()) {
-			let [uri, uriOrEdits] = entry;
-			if (Array.isArray(uriOrEdits)) {
-				let doc = this._extHostDocumentsAndEditors.getDocument(uri.toString());
-				dto.edits.push({
-					resource: uri,
-					modelVersionId: doc && doc.version,
-					edits: uriOrEdits.map(TypeConverters.TextEdit.from)
-				});
-				// } else {
-				// 	dto.edits.push({ oldUri: uri, newUri: uriOrEdits });
-			}
-		}
-
+	applyWorkspaceEdit(edit: vscode.WorkspaceEdit): Thenable<boolean> {
+		const dto = TypeConverters.WorkspaceEdit.from(edit, this._extHostDocumentsAndEditors);
 		return this._proxy.$tryApplyWorkspaceEdit(dto);
 	}
 
diff --git a/src/vs/workbench/api/node/extHostTreeViews.ts b/src/vs/workbench/api/node/extHostTreeViews.ts
index 499e859b46f..af5b5fd47e2 100644
--- a/src/vs/workbench/api/node/extHostTreeViews.ts
+++ b/src/vs/workbench/api/node/extHostTreeViews.ts
@@ -7,16 +7,18 @@
 import { localize } from 'vs/nls';
 import * as vscode from 'vscode';
 import { basename } from 'vs/base/common/paths';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { debounceEvent, Emitter, Event } from 'vs/base/common/event';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { Disposable } from 'vs/base/common/lifecycle';
 import { ExtHostTreeViewsShape, MainThreadTreeViewsShape } from './extHost.protocol';
 import { ITreeItem, TreeViewItemHandleArg } from 'vs/workbench/common/views';
 import { ExtHostCommands, CommandsConverter } from 'vs/workbench/api/node/extHostCommands';
-import { asWinJsPromise } from 'vs/base/common/async';
+import { asThenable } from 'vs/base/common/async';
 import { TreeItemCollapsibleState, ThemeIcon } from 'vs/workbench/api/node/extHostTypes';
 import { isUndefinedOrNull } from 'vs/base/common/types';
+import { equals } from 'vs/base/common/arrays';
+import { ILogService } from 'vs/platform/log/common/log';
 
 type TreeItemHandle = string;
 
@@ -26,7 +28,8 @@ export class ExtHostTreeViews implements ExtHostTreeViewsShape {
 
 	constructor(
 		private _proxy: MainThreadTreeViewsShape,
-		private commands: ExtHostCommands
+		private commands: ExtHostCommands,
+		private logService: ILogService
 	) {
 		commands.registerArgumentProcessor({
 			processArgument: arg => {
@@ -52,7 +55,10 @@ export class ExtHostTreeViews implements ExtHostTreeViewsShape {
 			get onDidCollapseElement() { return treeView.onDidCollapseElement; },
 			get onDidExpandElement() { return treeView.onDidExpandElement; },
 			get selection() { return treeView.selectedElements; },
-			reveal: (element: T, options?: { select?: boolean }): Thenable<void> => {
+			get onDidChangeSelection() { return treeView.onDidChangeSelection; },
+			get visible() { return treeView.visible; },
+			get onDidChangeVisibility() { return treeView.onDidChangeVisibility; },
+			reveal: (element: T, options?: { select?: boolean, focus?: boolean }): Thenable<void> => {
 				return treeView.reveal(element, options);
 			},
 			dispose: () => {
@@ -62,7 +68,7 @@ export class ExtHostTreeViews implements ExtHostTreeViewsShape {
 		};
 	}
 
-	$getChildren(treeViewId: string, treeItemHandle?: string): TPromise<ITreeItem[]> {
+	$getChildren(treeViewId: string, treeItemHandle?: string): Thenable<ITreeItem[]> {
 		const treeView = this.treeViews.get(treeViewId);
 		if (!treeView) {
 			return TPromise.wrapError<ITreeItem[]>(new Error(localize('treeView.notRegistered', 'No tree view with id \'{0}\' registered.', treeViewId)));
@@ -86,8 +92,16 @@ export class ExtHostTreeViews implements ExtHostTreeViewsShape {
 		treeView.setSelection(treeItemHandles);
 	}
 
+	$setVisible(treeViewId: string, isVisible: boolean): void {
+		const treeView = this.treeViews.get(treeViewId);
+		if (!treeView) {
+			throw new Error(localize('treeView.notRegistered', 'No tree view with id \'{0}\' registered.', treeViewId));
+		}
+		treeView.setVisible(isVisible);
+	}
+
 	private createExtHostTreeViewer<T>(id: string, dataProvider: vscode.TreeDataProvider<T>): ExtHostTreeView<T> {
-		const treeView = new ExtHostTreeView<T>(id, dataProvider, this._proxy, this.commands.converter);
+		const treeView = new ExtHostTreeView<T>(id, dataProvider, this._proxy, this.commands.converter, this.logService);
 		this.treeViews.set(id, treeView);
 		return treeView;
 	}
@@ -113,8 +127,11 @@ class ExtHostTreeView<T> extends Disposable {
 	private elements: Map<TreeItemHandle, T> = new Map<TreeItemHandle, T>();
 	private nodes: Map<T, TreeNode> = new Map<T, TreeNode>();
 
-	private _selectedElements: T[] = [];
-	get selectedElements(): T[] { return this._selectedElements; }
+	private _visible: boolean = false;
+	get visible(): boolean { return this._visible; }
+
+	private _selectedHandles: TreeItemHandle[] = [];
+	get selectedElements(): T[] { return this._selectedHandles.map(handle => this.getExtensionElement(handle)).filter(element => !isUndefinedOrNull(element)); }
 
 	private _onDidExpandElement: Emitter<vscode.TreeViewExpansionEvent<T>> = this._register(new Emitter<vscode.TreeViewExpansionEvent<T>>());
 	readonly onDidExpandElement: Event<vscode.TreeViewExpansionEvent<T>> = this._onDidExpandElement.event;
@@ -122,9 +139,15 @@ class ExtHostTreeView<T> extends Disposable {
 	private _onDidCollapseElement: Emitter<vscode.TreeViewExpansionEvent<T>> = this._register(new Emitter<vscode.TreeViewExpansionEvent<T>>());
 	readonly onDidCollapseElement: Event<vscode.TreeViewExpansionEvent<T>> = this._onDidCollapseElement.event;
 
+	private _onDidChangeSelection: Emitter<vscode.TreeViewSelectionChangeEvent<T>> = this._register(new Emitter<vscode.TreeViewSelectionChangeEvent<T>>());
+	readonly onDidChangeSelection: Event<vscode.TreeViewSelectionChangeEvent<T>> = this._onDidChangeSelection.event;
+
+	private _onDidChangeVisibility: Emitter<vscode.TreeViewVisibilityChangeEvent> = this._register(new Emitter<vscode.TreeViewVisibilityChangeEvent>());
+	readonly onDidChangeVisibility: Event<vscode.TreeViewVisibilityChangeEvent> = this._onDidChangeVisibility.event;
+
 	private refreshPromise: TPromise<void> = TPromise.as(null);
 
-	constructor(private viewId: string, private dataProvider: vscode.TreeDataProvider<T>, private proxy: MainThreadTreeViewsShape, private commands: CommandsConverter) {
+	constructor(private viewId: string, private dataProvider: vscode.TreeDataProvider<T>, private proxy: MainThreadTreeViewsShape, private commands: CommandsConverter, private logService: ILogService) {
 		super();
 		this.proxy.$registerTreeViewDataProvider(viewId);
 		if (this.dataProvider.onDidChangeTreeData) {
@@ -144,7 +167,7 @@ class ExtHostTreeView<T> extends Disposable {
 		}
 	}
 
-	getChildren(parentHandle?: TreeItemHandle): TPromise<ITreeItem[]> {
+	getChildren(parentHandle?: TreeItemHandle): Thenable<ITreeItem[]> {
 		const parentElement = parentHandle ? this.getExtensionElement(parentHandle) : void 0;
 		if (parentHandle && !parentElement) {
 			console.error(`No tree item with id \'${parentHandle}\' found.`);
@@ -160,32 +183,46 @@ class ExtHostTreeView<T> extends Disposable {
 		return this.elements.get(treeItemHandle);
 	}
 
-	reveal(element: T, options?: { select?: boolean }): TPromise<void> {
+	reveal(element: T, options?: { select?: boolean, focus?: boolean }): TPromise<void> {
+		options = options ? options : { select: true, focus: false };
+		const select = isUndefinedOrNull(options.select) ? true : options.select;
+		const focus = isUndefinedOrNull(options.focus) ? false : options.focus;
+
 		if (typeof this.dataProvider.getParent !== 'function') {
 			return TPromise.wrapError(new Error(`Required registered TreeDataProvider to implement 'getParent' method to access 'reveal' method`));
 		}
 		return this.refreshPromise
 			.then(() => this.resolveUnknownParentChain(element))
 			.then(parentChain => this.resolveTreeNode(element, parentChain[parentChain.length - 1])
-				.then(treeNode => this.proxy.$reveal(this.viewId, treeNode.item, parentChain.map(p => p.item), options)));
+				.then(treeNode => this.proxy.$reveal(this.viewId, treeNode.item, parentChain.map(p => p.item), { select, focus })), error => this.logService.error(error));
 	}
 
 	setExpanded(treeItemHandle: TreeItemHandle, expanded: boolean): void {
 		const element = this.getExtensionElement(treeItemHandle);
 		if (element) {
 			if (expanded) {
-				this._onDidExpandElement.fire({ element });
+				this._onDidExpandElement.fire(Object.freeze({ element }));
 			} else {
-				this._onDidCollapseElement.fire({ element });
+				this._onDidCollapseElement.fire(Object.freeze({ element }));
 			}
 		}
 	}
 
 	setSelection(treeItemHandles: TreeItemHandle[]): void {
-		this._selectedElements = treeItemHandles.map(handle => this.getExtensionElement(handle)).filter(element => !isUndefinedOrNull(element));
+		if (!equals(this._selectedHandles, treeItemHandles)) {
+			this._selectedHandles = treeItemHandles;
+			this._onDidChangeSelection.fire(Object.freeze({ selection: this.selectedElements }));
+		}
 	}
 
-	private resolveUnknownParentChain(element: T): TPromise<TreeNode[]> {
+	setVisible(visible: boolean): void {
+		if (visible !== this._visible) {
+			this._visible = visible;
+			this._onDidChangeVisibility.fire(Object.freeze({ visible: this._visible }));
+		}
+	}
+
+	private resolveUnknownParentChain(element: T): Thenable<TreeNode[]> {
 		return this.resolveParent(element)
 			.then((parent) => {
 				if (!parent) {
@@ -200,16 +237,16 @@ class ExtHostTreeView<T> extends Disposable {
 			});
 	}
 
-	private resolveParent(element: T): TPromise<T> {
+	private resolveParent(element: T): Thenable<T> {
 		const node = this.nodes.get(element);
 		if (node) {
 			return TPromise.as(node.parent ? this.elements.get(node.parent.item.handle) : null);
 		}
-		return asWinJsPromise(() => this.dataProvider.getParent(element));
+		return asThenable(() => this.dataProvider.getParent(element));
 	}
 
-	private resolveTreeNode(element: T, parent?: TreeNode): TPromise<TreeNode> {
-		return asWinJsPromise(() => this.dataProvider.getTreeItem(element))
+	private resolveTreeNode(element: T, parent?: TreeNode): Thenable<TreeNode> {
+		return asThenable(() => this.dataProvider.getTreeItem(element))
 			.then(extTreeItem => this.createHandle(element, extTreeItem, parent, true))
 			.then(handle => this.getChildren(parent ? parent.item.handle : null)
 				.then(() => {
@@ -238,21 +275,21 @@ class ExtHostTreeView<T> extends Disposable {
 		return this.roots;
 	}
 
-	private fetchChildrenNodes(parentElement?: T): TPromise<TreeNode[]> {
+	private fetchChildrenNodes(parentElement?: T): Thenable<TreeNode[]> {
 		// clear children cache
 		this.clearChildren(parentElement);
 
 		const parentNode = parentElement ? this.nodes.get(parentElement) : void 0;
-		return asWinJsPromise(() => this.dataProvider.getChildren(parentElement))
+		return asThenable(() => this.dataProvider.getChildren(parentElement))
 			.then(elements => TPromise.join(
 				(elements || [])
 					.filter(element => !!element)
-					.map(element => asWinJsPromise(() => this.dataProvider.getTreeItem(element))
+					.map(element => asThenable(() => this.dataProvider.getTreeItem(element))
 						.then(extTreeItem => extTreeItem ? this.createAndRegisterTreeNode(element, extTreeItem, parentNode) : null))))
 			.then(nodes => nodes.filter(n => !!n));
 	}
 
-	private refresh(elements: T[]): TPromise<void> {
+	private refresh(elements: T[]): Thenable<void> {
 		const hasRoot = elements.some(element => !element);
 		if (hasRoot) {
 			this.clearAll(); // clear cache
@@ -308,11 +345,11 @@ class ExtHostTreeView<T> extends Disposable {
 			.then(() => Object.keys(itemsToRefresh).length ? this.proxy.$refresh(this.viewId, itemsToRefresh) : null);
 	}
 
-	private refreshNode(treeItemHandle: TreeItemHandle): TPromise<TreeNode> {
+	private refreshNode(treeItemHandle: TreeItemHandle): Thenable<TreeNode> {
 		const extElement = this.getExtensionElement(treeItemHandle);
 		const existing = this.nodes.get(extElement);
 		this.clearChildren(extElement); // clear children cache
-		return asWinJsPromise(() => this.dataProvider.getTreeItem(extElement))
+		return asThenable(() => this.dataProvider.getTreeItem(extElement))
 			.then(extTreeItem => {
 				if (extTreeItem) {
 					const newNode = this.createTreeNode(extElement, extTreeItem, existing.parent);
@@ -389,7 +426,7 @@ class ExtHostTreeView<T> extends Disposable {
 		return handle;
 	}
 
-	private getLightIconPath(extensionTreeItem: vscode.TreeItem): string {
+	private getLightIconPath(extensionTreeItem: vscode.TreeItem): URI {
 		if (extensionTreeItem.iconPath && !(extensionTreeItem.iconPath instanceof ThemeIcon)) {
 			if (typeof extensionTreeItem.iconPath === 'string'
 				|| extensionTreeItem.iconPath instanceof URI) {
@@ -400,18 +437,18 @@ class ExtHostTreeView<T> extends Disposable {
 		return void 0;
 	}
 
-	private getDarkIconPath(extensionTreeItem: vscode.TreeItem): string {
+	private getDarkIconPath(extensionTreeItem: vscode.TreeItem): URI {
 		if (extensionTreeItem.iconPath && !(extensionTreeItem.iconPath instanceof ThemeIcon) && extensionTreeItem.iconPath['dark']) {
 			return this.getIconPath(extensionTreeItem.iconPath['dark']);
 		}
 		return void 0;
 	}
 
-	private getIconPath(iconPath: string | URI): string {
+	private getIconPath(iconPath: string | URI): URI {
 		if (iconPath instanceof URI) {
-			return iconPath.toString();
+			return iconPath;
 		}
-		return URI.file(iconPath).toString();
+		return URI.file(iconPath);
 	}
 
 	private addNodeToCache(element: T, node: TreeNode): void {
@@ -492,4 +529,4 @@ class ExtHostTreeView<T> extends Disposable {
 	dispose() {
 		this.clearAll();
 	}
-}
\ No newline at end of file
+}
diff --git a/src/vs/workbench/api/node/extHostTypeConverters.ts b/src/vs/workbench/api/node/extHostTypeConverters.ts
index b4d705fe4a8..777a7816f7f 100644
--- a/src/vs/workbench/api/node/extHostTypeConverters.ts
+++ b/src/vs/workbench/api/node/extHostTypeConverters.ts
@@ -6,13 +6,14 @@
 
 import * as modes from 'vs/editor/common/modes';
 import * as types from './extHostTypes';
+import * as search from 'vs/workbench/parts/search/common/search';
 import { ITextEditorOptions } from 'vs/platform/editor/common/editor';
 import { EditorViewColumn } from 'vs/workbench/api/shared/editor';
 import { IDecorationOptions } from 'vs/editor/common/editorCommon';
 import { EndOfLineSequence } from 'vs/editor/common/model';
 import * as vscode from 'vscode';
-import URI from 'vs/base/common/uri';
-import { ProgressLocation as MainProgressLocation } from 'vs/platform/progress/common/progress';
+import { URI } from 'vs/base/common/uri';
+import { ProgressLocation as MainProgressLocation } from 'vs/workbench/services/progress/common/progress';
 import { SaveReason } from 'vs/workbench/services/textfile/common/textfiles';
 import { IPosition } from 'vs/editor/common/core/position';
 import { IRange } from 'vs/editor/common/core/range';
@@ -20,8 +21,10 @@ import { ISelection } from 'vs/editor/common/core/selection';
 import * as htmlContent from 'vs/base/common/htmlContent';
 import { IRelativePattern } from 'vs/base/common/glob';
 import * as languageSelector from 'vs/editor/common/modes/languageSelector';
-import { WorkspaceEditDto, ResourceTextEditDto } from 'vs/workbench/api/node/extHost.protocol';
+import { WorkspaceEditDto, ResourceTextEditDto, ResourceFileEditDto } from 'vs/workbench/api/node/extHost.protocol';
 import { MarkerSeverity, IRelatedInformation, IMarkerData, MarkerTag } from 'vs/platform/markers/common/markers';
+import { ACTIVE_GROUP, SIDE_GROUP } from 'vs/workbench/services/editor/common/editorService';
+import { ExtHostDocumentsAndEditors } from 'vs/workbench/api/node/extHostDocumentsAndEditors';
 
 export interface PositionLike {
 	line: number;
@@ -108,7 +111,7 @@ export namespace Diagnostic {
 			code: String(value.code),
 			severity: DiagnosticSeverity.from(value.severity),
 			relatedInformation: value.relatedInformation && value.relatedInformation.map(DiagnosticRelatedInformation.from),
-			customTags: Array.isArray(value.customTags) ? value.customTags.map(DiagnosticTag.from) : undefined,
+			tags: Array.isArray(value.tags) ? value.tags.map(DiagnosticTag.from) : undefined,
 		};
 	}
 }
@@ -158,29 +161,22 @@ export namespace DiagnosticSeverity {
 
 export namespace ViewColumn {
 	export function from(column?: vscode.ViewColumn): EditorViewColumn {
-		let editorColumn: EditorViewColumn;
-		if (column === <number>types.ViewColumn.One) {
-			editorColumn = 0;
-		} else if (column === <number>types.ViewColumn.Two) {
-			editorColumn = 1;
-		} else if (column === <number>types.ViewColumn.Three) {
-			editorColumn = 2;
-		} else {
-			// in any other case (no column or ViewColumn.Active), leave the
-			// editorColumn as undefined which signals to use the active column
-			editorColumn = undefined;
+		if (typeof column === 'number' && column >= types.ViewColumn.One) {
+			return column - 1; // adjust zero index (ViewColumn.ONE => 0)
 		}
-		return editorColumn;
+
+		if (column === types.ViewColumn.Beside) {
+			return SIDE_GROUP;
+		}
+
+		return ACTIVE_GROUP; // default is always the active group
 	}
 
 	export function to(position?: EditorViewColumn): vscode.ViewColumn {
-		if (position === 0) {
-			return <number>types.ViewColumn.One;
-		} else if (position === 1) {
-			return <number>types.ViewColumn.Two;
-		} else if (position === 2) {
-			return <number>types.ViewColumn.Three;
+		if (typeof position === 'number' && position >= 0) {
+			return position + 1; // adjust to index (ViewColumn.ONE => 1)
 		}
+
 		return undefined;
 	}
 }
@@ -274,18 +270,19 @@ export const TextEdit = {
 };
 
 export namespace WorkspaceEdit {
-	export function from(value: vscode.WorkspaceEdit): modes.WorkspaceEdit {
-		const result: modes.WorkspaceEdit = {
+	export function from(value: vscode.WorkspaceEdit, documents?: ExtHostDocumentsAndEditors): WorkspaceEditDto {
+		const result: WorkspaceEditDto = {
 			edits: []
 		};
-		for (const entry of value.entries()) {
+		for (const entry of (value as types.WorkspaceEdit)._allEntries()) {
 			const [uri, uriOrEdits] = entry;
 			if (Array.isArray(uriOrEdits)) {
 				// text edits
-				result.edits.push({ resource: uri, edits: uriOrEdits.map(TextEdit.from) });
+				let doc = documents ? documents.getDocument(uri.toString()) : undefined;
+				result.edits.push(<ResourceTextEditDto>{ resource: uri, modelVersionId: doc && doc.version, edits: uriOrEdits.map(TextEdit.from) });
 			} else {
 				// resource edits
-				result.edits.push({ oldUri: uri, newUri: uriOrEdits });
+				result.edits.push(<ResourceFileEditDto>{ oldUri: uri, newUri: uriOrEdits, options: entry[2] });
 			}
 		}
 		return result;
@@ -299,11 +296,12 @@ export namespace WorkspaceEdit {
 					URI.revive((<ResourceTextEditDto>edit).resource),
 					<types.TextEdit[]>(<ResourceTextEditDto>edit).edits.map(TextEdit.to)
 				);
-				// } else {
-				// 	result.renameResource(
-				// 		URI.revive((<ResourceFileEditDto>edit).oldUri),
-				// 		URI.revive((<ResourceFileEditDto>edit).newUri)
-				// 	);
+			} else {
+				result.renameFile(
+					URI.revive((<ResourceFileEditDto>edit).oldUri),
+					URI.revive((<ResourceFileEditDto>edit).newUri),
+					(<ResourceFileEditDto>edit).options
+				);
 			}
 		}
 		return result;
@@ -355,16 +353,16 @@ export namespace SymbolKind {
 	}
 }
 
-export namespace SymbolInformation {
-	export function from(info: vscode.SymbolInformation): modes.SymbolInformation {
-		return <modes.SymbolInformation>{
+export namespace WorkspaceSymbol {
+	export function from(info: vscode.SymbolInformation): search.IWorkspaceSymbol {
+		return <search.IWorkspaceSymbol>{
 			name: info.name,
 			kind: SymbolKind.from(info.kind),
 			containerName: info.containerName,
 			location: location.from(info.location)
 		};
 	}
-	export function to(info: modes.SymbolInformation): types.SymbolInformation {
+	export function to(info: search.IWorkspaceSymbol): types.SymbolInformation {
 		return new types.SymbolInformation(
 			info.name,
 			SymbolKind.to(info.kind),
@@ -374,27 +372,27 @@ export namespace SymbolInformation {
 	}
 }
 
-export namespace SymbolInformation2 {
-	export function from(info: vscode.SymbolInformation2): modes.SymbolInformation {
-		let result: modes.SymbolInformation = {
+export namespace DocumentSymbol {
+	export function from(info: vscode.DocumentSymbol): modes.DocumentSymbol {
+		let result: modes.DocumentSymbol = {
 			name: info.name,
-			detail: undefined,
-			location: location.from(info.location),
-			definingRange: Range.from(info.definingRange),
-			kind: SymbolKind.from(info.kind),
-			containerName: info.containerName
+			detail: info.detail,
+			range: Range.from(info.range),
+			selectionRange: Range.from(info.selectionRange),
+			kind: SymbolKind.from(info.kind)
 		};
 		if (info.children) {
 			result.children = info.children.map(from);
 		}
 		return result;
 	}
-	export function to(info: modes.SymbolInformation): vscode.SymbolInformation2 {
-		let result = new types.SymbolInformation2(
+	export function to(info: modes.DocumentSymbol): vscode.DocumentSymbol {
+		let result = new types.DocumentSymbol(
 			info.name,
+			info.detail,
 			SymbolKind.to(info.kind),
-			info.containerName,
-			location.to(info.location),
+			Range.to(info.range),
+			Range.to(info.selectionRange),
 		);
 		if (info.children) {
 			result.children = info.children.map(to) as any;
@@ -415,6 +413,23 @@ export const location = {
 	}
 };
 
+export namespace DefinitionLink {
+	export function from(value: vscode.Location | vscode.DefinitionLink): modes.DefinitionLink {
+		const definitionLink = <vscode.DefinitionLink>value;
+		const location = <vscode.Location>value;
+		return {
+			origin: definitionLink.originSelectionRange
+				? Range.from(definitionLink.originSelectionRange)
+				: undefined,
+			uri: definitionLink.targetUri ? definitionLink.targetUri : location.uri,
+			range: Range.from(definitionLink.targetRange ? definitionLink.targetRange : location.range),
+			selectionRange: definitionLink.targetSelectionRange
+				? Range.from(definitionLink.targetSelectionRange)
+				: undefined,
+		};
+	}
+}
+
 export namespace Hover {
 	export function from(hover: vscode.Hover): modes.Hover {
 		return <modes.Hover>{
@@ -514,6 +529,8 @@ export namespace Suggest {
 		result.documentation = htmlContent.isMarkdownString(suggestion.documentation) ? MarkdownString.to(suggestion.documentation) : suggestion.documentation;
 		result.sortText = suggestion.sortText;
 		result.filterText = suggestion.filterText;
+		result.preselect = suggestion.preselect;
+		result.commitCharacters = suggestion.commitCharacters;
 
 		// 'overwrite[Before|After]'-logic
 		let overwriteBefore = (typeof suggestion.overwriteBefore === 'number') ? suggestion.overwriteBefore : 0;
diff --git a/src/vs/workbench/api/node/extHostTypes.ts b/src/vs/workbench/api/node/extHostTypes.ts
index 916de5d9fbd..a0ef74e64bf 100644
--- a/src/vs/workbench/api/node/extHostTypes.ts
+++ b/src/vs/workbench/api/node/extHostTypes.ts
@@ -6,13 +6,15 @@
 
 import * as crypto from 'crypto';
 
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { illegalArgument } from 'vs/base/common/errors';
 import * as vscode from 'vscode';
 import { isMarkdownString } from 'vs/base/common/htmlContent';
 import { IRelativePattern } from 'vs/base/common/glob';
 import { relative } from 'path';
 import { startsWith } from 'vs/base/common/strings';
+import { values } from 'vs/base/common/map';
+import { coalesce, equals } from 'vs/base/common/arrays';
 
 export class Disposable {
 
@@ -492,38 +494,45 @@ export class TextEdit {
 	}
 }
 
+
+export interface IFileOperationOptions {
+	overwrite?: boolean;
+	ignoreIfExists?: boolean;
+	ignoreIfNotExists?: boolean;
+	recursive?: boolean;
+}
+
+export interface IFileOperation {
+	_type: 1;
+	from: URI;
+	to: URI;
+	options?: IFileOperationOptions;
+}
+
+export interface IFileTextEdit {
+	_type: 2;
+	uri: URI;
+	edit: TextEdit;
+}
+
 export class WorkspaceEdit implements vscode.WorkspaceEdit {
 
-	private _seqPool: number = 0;
+	private _edits = new Array<IFileOperation | IFileTextEdit>();
 
-	private _resourceEdits: { seq: number, from: URI, to: URI }[] = [];
-	private _textEdits = new Map<string, { seq: number, uri: URI, edits: TextEdit[] }>();
+	renameFile(from: vscode.Uri, to: vscode.Uri, options?: { overwrite?: boolean, ignoreIfExists?: boolean }): void {
+		this._edits.push({ _type: 1, from, to, options });
+	}
 
-	// createResource(uri: vscode.Uri): void {
-	// 	this.renameResource(undefined, uri);
-	// }
+	createFile(uri: vscode.Uri, options?: { overwrite?: boolean, ignoreIfExists?: boolean }): void {
+		this._edits.push({ _type: 1, from: undefined, to: uri, options });
+	}
 
-	// deleteResource(uri: vscode.Uri): void {
-	// 	this.renameResource(uri, undefined);
-	// }
-
-	// renameResource(from: vscode.Uri, to: vscode.Uri): void {
-	// 	this._resourceEdits.push({ seq: this._seqPool++, from, to });
-	// }
-
-	// resourceEdits(): [vscode.Uri, vscode.Uri][] {
-	// 	return this._resourceEdits.map(({ from, to }) => (<[vscode.Uri, vscode.Uri]>[from, to]));
-	// }
+	deleteFile(uri: vscode.Uri, options?: { recursive?: boolean, ignoreIfNotExists?: boolean }): void {
+		this._edits.push({ _type: 1, from: uri, to: undefined, options });
+	}
 
 	replace(uri: URI, range: Range, newText: string): void {
-		let edit = new TextEdit(range, newText);
-		let array = this.get(uri);
-		if (array) {
-			array.push(edit);
-		} else {
-			array = [edit];
-		}
-		this.set(uri, array);
+		this._edits.push({ _type: 2, uri, edit: new TextEdit(range, newText) });
 	}
 
 	insert(resource: URI, position: Position, newText: string): void {
@@ -535,55 +544,76 @@ export class WorkspaceEdit implements vscode.WorkspaceEdit {
 	}
 
 	has(uri: URI): boolean {
-		return this._textEdits.has(uri.toString());
+		for (const edit of this._edits) {
+			if (edit._type === 2 && edit.uri.toString() === uri.toString()) {
+				return true;
+			}
+		}
+		return false;
 	}
 
 	set(uri: URI, edits: TextEdit[]): void {
-		let data = this._textEdits.get(uri.toString());
-		if (!data) {
-			data = { seq: this._seqPool++, uri, edits: [] };
-			this._textEdits.set(uri.toString(), data);
-		}
 		if (!edits) {
-			data.edits = undefined;
+			// remove all text edits for `uri`
+			for (let i = 0; i < this._edits.length; i++) {
+				const element = this._edits[i];
+				if (element._type === 2 && element.uri.toString() === uri.toString()) {
+					this._edits[i] = undefined;
+				}
+			}
+			this._edits = coalesce(this._edits);
 		} else {
-			data.edits = edits.slice(0);
+			// append edit to the end
+			for (const edit of edits) {
+				if (edit) {
+					this._edits.push({ _type: 2, uri, edit });
+				}
+			}
 		}
 	}
 
 	get(uri: URI): TextEdit[] {
-		if (!this._textEdits.has(uri.toString())) {
+		let res: TextEdit[] = [];
+		for (let candidate of this._edits) {
+			if (candidate._type === 2 && candidate.uri.toString() === uri.toString()) {
+				res.push(candidate.edit);
+			}
+		}
+		if (res.length === 0) {
 			return undefined;
 		}
-		const { edits } = this._textEdits.get(uri.toString());
-		return edits ? edits.slice() : undefined;
+		return res;
 	}
 
 	entries(): [URI, TextEdit[]][] {
-		const res: [URI, TextEdit[]][] = [];
-		this._textEdits.forEach(value => res.push([value.uri, value.edits]));
-		return res.slice();
+		let textEdits = new Map<string, [URI, TextEdit[]]>();
+		for (let candidate of this._edits) {
+			if (candidate._type === 2) {
+				let textEdit = textEdits.get(candidate.uri.toString());
+				if (!textEdit) {
+					textEdit = [candidate.uri, []];
+					textEdits.set(candidate.uri.toString(), textEdit);
+				}
+				textEdit[1].push(candidate.edit);
+			}
+		}
+		return values(textEdits);
 	}
 
-	allEntries(): ([URI, TextEdit[]] | [URI, URI])[] {
-		return this.entries();
-		// 	// use the 'seq' the we have assigned when inserting
-		// 	// the operation and use that order in the resulting
-		// 	// array
-		// 	const res: ([URI, TextEdit[]] | [URI, URI])[] = [];
-		// 	this._textEdits.forEach(value => {
-		// 		const { seq, uri, edits } = value;
-		// 		res[seq] = [uri, edits];
-		// 	});
-		// 	this._resourceEdits.forEach(value => {
-		// 		const { seq, from, to } = value;
-		// 		res[seq] = [from, to];
-		// 	});
-		// 	return res;
+	_allEntries(): ([URI, TextEdit[]] | [URI, URI, IFileOperationOptions])[] {
+		let res: ([URI, TextEdit[]] | [URI, URI, IFileOperationOptions])[] = [];
+		for (let edit of this._edits) {
+			if (edit._type === 1) {
+				res.push([edit.from, edit.to, edit.options]);
+			} else {
+				res.push([edit.uri, [edit.edit]]);
+			}
+		}
+		return res;
 	}
 
 	get size(): number {
-		return this._textEdits.size + this._resourceEdits.length;
+		return this.entries().length;
 	}
 
 	toJSON(): any {
@@ -741,6 +771,18 @@ export class DiagnosticRelatedInformation {
 		this.location = location;
 		this.message = message;
 	}
+
+	static isEqual(a: DiagnosticRelatedInformation, b: DiagnosticRelatedInformation): boolean {
+		if (a === b) {
+			return true;
+		}
+		if (!a || !b) {
+			return false;
+		}
+		return a.message === b.message
+			&& a.location.range.isEqual(b.location.range)
+			&& a.location.uri.toString() === b.location.uri.toString();
+	}
 }
 
 export class Diagnostic {
@@ -751,7 +793,7 @@ export class Diagnostic {
 	code: string | number;
 	severity: DiagnosticSeverity;
 	relatedInformation: DiagnosticRelatedInformation[];
-	customTags?: DiagnosticTag[];
+	tags?: DiagnosticTag[];
 
 	constructor(range: Range, message: string, severity: DiagnosticSeverity = DiagnosticSeverity.Error) {
 		this.range = range;
@@ -768,6 +810,23 @@ export class Diagnostic {
 			code: this.code,
 		};
 	}
+
+	static isEqual(a: Diagnostic, b: Diagnostic): boolean {
+		if (a === b) {
+			return true;
+		}
+		if (!a || !b) {
+			return false;
+		}
+		return a.message === b.message
+			&& a.severity === b.severity
+			&& a.code === b.code
+			&& a.severity === b.severity
+			&& a.source === b.source
+			&& a.range.isEqual(b.range)
+			&& equals(a.tags, b.tags)
+			&& equals(a.relatedInformation, b.relatedInformation, DiagnosticRelatedInformation.isEqual);
+	}
 }
 
 export class Hover {
@@ -881,18 +940,29 @@ export class SymbolInformation {
 	}
 }
 
-export class SymbolInformation2 extends SymbolInformation {
-	definingRange: Range;
-	children: SymbolInformation2[];
-	constructor(name: string, kind: SymbolKind, containerName: string, location: Location) {
-		super(name, kind, containerName, location);
+export class DocumentSymbol {
+	name: string;
+	detail: string;
+	kind: SymbolKind;
+	range: Range;
+	selectionRange: Range;
+	children: DocumentSymbol[];
 
+	constructor(name: string, detail: string, kind: SymbolKind, range: Range, selectionRange: Range) {
+		this.name = name;
+		this.detail = detail;
+		this.kind = kind;
+		this.range = range;
+		this.selectionRange = selectionRange;
 		this.children = [];
-		this.definingRange = location.range;
-	}
 
+		if (!this.range.contains(this.selectionRange)) {
+			throw new Error('selectionRange must be contained in fullRange');
+		}
+	}
 }
 
+
 export enum CodeActionTrigger {
 	Automatic = 1,
 	Manual = 2,
@@ -1023,6 +1093,12 @@ export class SignatureHelp {
 	}
 }
 
+export enum SignatureHelpTriggerReason {
+	Invoke = 1,
+	TriggerCharacter = 2,
+	Retrigger = 3,
+}
+
 export enum CompletionTriggerKind {
 	Invoke = 0,
 	TriggerCharacter = 1,
@@ -1062,7 +1138,7 @@ export enum CompletionItemKind {
 	TypeParameter = 24
 }
 
-export class CompletionItem {
+export class CompletionItem implements vscode.CompletionItem {
 
 	label: string;
 	kind: CompletionItemKind;
@@ -1070,8 +1146,10 @@ export class CompletionItem {
 	documentation: string | MarkdownString;
 	sortText: string;
 	filterText: string;
+	preselect: boolean;
 	insertText: string | SnippetString;
 	range: Range;
+	commitCharacters: string[];
 	textEdit: TextEdit;
 	additionalTextEdits: TextEdit[];
 	command: vscode.Command;
@@ -1089,6 +1167,7 @@ export class CompletionItem {
 			documentation: this.documentation,
 			sortText: this.sortText,
 			filterText: this.filterText,
+			preselect: this.preselect,
 			insertText: this.insertText,
 			textEdit: this.textEdit
 		};
@@ -1109,9 +1188,16 @@ export class CompletionList {
 
 export enum ViewColumn {
 	Active = -1,
+	Beside = -2,
 	One = 1,
 	Two = 2,
-	Three = 3
+	Three = 3,
+	Four = 4,
+	Five = 5,
+	Six = 6,
+	Seven = 7,
+	Eight = 8,
+	Nine = 9
 }
 
 export enum StatusBarAlignment {
@@ -1906,3 +1992,10 @@ export enum CommentThreadCollapsibleState {
 	 */
 	Expanded = 1
 }
+
+export class QuickInputButtons {
+
+	static readonly Back: vscode.QuickInputButton = { iconPath: 'back.svg' };
+
+	private constructor() { }
+}
diff --git a/src/vs/workbench/api/node/extHostUrls.ts b/src/vs/workbench/api/node/extHostUrls.ts
index 534dfb4f02a..f8b7b37f9f4 100644
--- a/src/vs/workbench/api/node/extHostUrls.ts
+++ b/src/vs/workbench/api/node/extHostUrls.ts
@@ -5,9 +5,10 @@
 
 import * as vscode from 'vscode';
 import { MainContext, IMainContext, ExtHostUrlsShape, MainThreadUrlsShape } from './extHost.protocol';
-import URI, { UriComponents } from 'vs/base/common/uri';
+import { URI, UriComponents } from 'vs/base/common/uri';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { toDisposable } from 'vs/base/common/lifecycle';
+import { onUnexpectedError } from 'vs/base/common/errors';
 
 export class ExtHostUrls implements ExtHostUrlsShape {
 
@@ -15,7 +16,7 @@ export class ExtHostUrls implements ExtHostUrlsShape {
 	private readonly _proxy: MainThreadUrlsShape;
 
 	private handles = new Set<string>();
-	private handlers = new Map<number, vscode.ProtocolHandler>();
+	private handlers = new Map<number, vscode.UriHandler>();
 
 	constructor(
 		mainContext: IMainContext
@@ -23,7 +24,7 @@ export class ExtHostUrls implements ExtHostUrlsShape {
 		this._proxy = mainContext.getProxy(MainContext.MainThreadUrls);
 	}
 
-	registerProtocolHandler(extensionId: string, handler: vscode.ProtocolHandler): vscode.Disposable {
+	registerUriHandler(extensionId: string, handler: vscode.UriHandler): vscode.Disposable {
 		if (this.handles.has(extensionId)) {
 			throw new Error(`Protocol handler already registered for extension ${extensionId}`);
 		}
@@ -31,23 +32,27 @@ export class ExtHostUrls implements ExtHostUrlsShape {
 		const handle = ExtHostUrls.HandlePool++;
 		this.handles.add(extensionId);
 		this.handlers.set(handle, handler);
-		this._proxy.$registerProtocolHandler(handle, extensionId);
+		this._proxy.$registerUriHandler(handle, extensionId);
 
 		return toDisposable(() => {
 			this.handles.delete(extensionId);
 			this.handlers.delete(handle);
-			this._proxy.$unregisterProtocolHandler(handle);
+			this._proxy.$unregisterUriHandler(handle);
 		});
 	}
 
-	$handleExternalUri(handle: number, uri: UriComponents): TPromise<void> {
+	$handleExternalUri(handle: number, uri: UriComponents): Thenable<void> {
 		const handler = this.handlers.get(handle);
 
 		if (!handler) {
 			return TPromise.as(null);
 		}
+		try {
+			handler.handleUri(URI.revive(uri));
+		} catch (err) {
+			onUnexpectedError(err);
+		}
 
-		handler.handleUri(URI.revive(uri));
 		return TPromise.as(null);
 	}
-}
\ No newline at end of file
+}
diff --git a/src/vs/workbench/api/node/extHostWebview.ts b/src/vs/workbench/api/node/extHostWebview.ts
index ecaf9a5c215..ee366c67c41 100644
--- a/src/vs/workbench/api/node/extHostWebview.ts
+++ b/src/vs/workbench/api/node/extHostWebview.ts
@@ -3,14 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { MainContext, MainThreadWebviewsShape, IMainContext, ExtHostWebviewsShape, WebviewPanelHandle } from './extHost.protocol';
-import * as vscode from 'vscode';
-import { Event, Emitter } from 'vs/base/common/event';
+import { Emitter, Event } from 'vs/base/common/event';
+import { URI } from 'vs/base/common/uri';
+import { TPromise } from 'vs/base/common/winjs.base';
 import * as typeConverters from 'vs/workbench/api/node/extHostTypeConverters';
 import { EditorViewColumn } from 'vs/workbench/api/shared/editor';
-import { TPromise } from 'vs/base/common/winjs.base';
+import * as vscode from 'vscode';
+import { ExtHostWebviewsShape, IMainContext, MainContext, MainThreadWebviewsShape, WebviewPanelHandle, WebviewPanelViewState } from './extHost.protocol';
 import { Disposable } from './extHostTypes';
-import URI from 'vs/base/common/uri';
+
+type IconPath = URI | { light: URI, dark: URI };
 
 export class ExtHostWebview implements vscode.Webview {
 	private readonly _handle: WebviewPanelHandle;
@@ -19,7 +21,7 @@ export class ExtHostWebview implements vscode.Webview {
 	private _options: vscode.WebviewOptions;
 	private _isDisposed: boolean = false;
 
-	readonly _onMessageEmitter = new Emitter<any>();
+	public readonly _onMessageEmitter = new Emitter<any>();
 	public readonly onDidReceiveMessage: Event<any> = this._onMessageEmitter.event;
 
 	constructor(
@@ -32,16 +34,16 @@ export class ExtHostWebview implements vscode.Webview {
 		this._options = options;
 	}
 
-	dispose() {
+	public dispose() {
 		this._onMessageEmitter.dispose();
 	}
 
-	get html(): string {
+	public get html(): string {
 		this.assertNotDisposed();
 		return this._html;
 	}
 
-	set html(value: string) {
+	public set html(value: string) {
 		this.assertNotDisposed();
 		if (this._html !== value) {
 			this._html = value;
@@ -49,11 +51,17 @@ export class ExtHostWebview implements vscode.Webview {
 		}
 	}
 
-	get options(): vscode.WebviewOptions {
+	public get options(): vscode.WebviewOptions {
 		this.assertNotDisposed();
 		return this._options;
 	}
 
+	public set options(newOptions: vscode.WebviewOptions) {
+		this.assertNotDisposed();
+		this._proxy.$setOptions(this._handle, newOptions);
+		this._options = newOptions;
+	}
+
 	public postMessage(message: any): Thenable<boolean> {
 		this.assertNotDisposed();
 		return this._proxy.$postMessage(this._handle, message);
@@ -72,12 +80,14 @@ export class ExtHostWebviewPanel implements vscode.WebviewPanel {
 	private readonly _proxy: MainThreadWebviewsShape;
 	private readonly _viewType: string;
 	private _title: string;
+	private _iconPath: IconPath;
 
 	private readonly _options: vscode.WebviewPanelOptions;
 	private readonly _webview: ExtHostWebview;
 	private _isDisposed: boolean = false;
 	private _viewColumn: vscode.ViewColumn;
 	private _visible: boolean = true;
+	private _active: boolean = true;
 
 	readonly _onDisposeEmitter = new Emitter<void>();
 	public readonly onDidDispose: Event<void> = this._onDisposeEmitter.event;
@@ -143,6 +153,20 @@ export class ExtHostWebviewPanel implements vscode.WebviewPanel {
 		}
 	}
 
+	get iconPath(): IconPath | undefined {
+		this.assertNotDisposed();
+		return this._iconPath;
+	}
+
+	set iconPath(value: IconPath | undefined) {
+		this.assertNotDisposed();
+		if (this._iconPath !== value) {
+			this._iconPath = value;
+
+			this._proxy.$setIconPath(this._handle, URI.isUri(value) ? { light: value, dark: value } : value);
+		}
+	}
+
 	get options() {
 		return this._options;
 	}
@@ -157,7 +181,17 @@ export class ExtHostWebviewPanel implements vscode.WebviewPanel {
 		this._viewColumn = value;
 	}
 
-	get visible(): boolean {
+	public get active(): boolean {
+		this.assertNotDisposed();
+		return this._active;
+	}
+
+	_setActive(value: boolean) {
+		this.assertNotDisposed();
+		this._active = value;
+	}
+
+	public get visible(): boolean {
 		this.assertNotDisposed();
 		return this._visible;
 	}
@@ -174,9 +208,10 @@ export class ExtHostWebviewPanel implements vscode.WebviewPanel {
 
 	public reveal(viewColumn?: vscode.ViewColumn, preserveFocus?: boolean): void {
 		this.assertNotDisposed();
-		this._proxy.$reveal(this._handle,
-			viewColumn ? typeConverters.ViewColumn.from(viewColumn) : undefined,
-			!!preserveFocus);
+		this._proxy.$reveal(this._handle, {
+			viewColumn: viewColumn ? typeConverters.ViewColumn.from(viewColumn) : undefined,
+			preserveFocus: !!preserveFocus
+		});
 	}
 
 	private assertNotDisposed() {
@@ -189,8 +224,11 @@ export class ExtHostWebviewPanel implements vscode.WebviewPanel {
 export class ExtHostWebviews implements ExtHostWebviewsShape {
 	private static webviewHandlePool = 1;
 
-	private readonly _proxy: MainThreadWebviewsShape;
+	private static newHandle(): WebviewPanelHandle {
+		return ExtHostWebviews.webviewHandlePool++ + '';
+	}
 
+	private readonly _proxy: MainThreadWebviewsShape;
 	private readonly _webviewPanels = new Map<WebviewPanelHandle, ExtHostWebviewPanel>();
 	private readonly _serializers = new Map<string, vscode.WebviewPanelSerializer>();
 
@@ -200,22 +238,20 @@ export class ExtHostWebviews implements ExtHostWebviewsShape {
 		this._proxy = mainContext.getProxy(MainContext.MainThreadWebviews);
 	}
 
-	createWebview(
+	public createWebview(
+		extensionLocation: URI,
 		viewType: string,
 		title: string,
 		showOptions: vscode.ViewColumn | { viewColumn: vscode.ViewColumn, preserveFocus?: boolean },
-		options: (vscode.WebviewPanelOptions & vscode.WebviewOptions) | undefined,
-		extensionLocation: URI
+		options: (vscode.WebviewPanelOptions & vscode.WebviewOptions) = {},
 	): vscode.WebviewPanel {
-		options = options || {};
-
 		const viewColumn = typeof showOptions === 'object' ? showOptions.viewColumn : showOptions;
 		const webviewShowOptions = {
 			viewColumn: typeConverters.ViewColumn.from(viewColumn),
 			preserveFocus: typeof showOptions === 'object' && !!showOptions.preserveFocus
 		};
 
-		const handle = ExtHostWebviews.webviewHandlePool++ + '';
+		const handle = ExtHostWebviews.newHandle();
 		this._proxy.$createWebviewPanel(handle, viewType, title, webviewShowOptions, options, extensionLocation);
 
 		const webview = new ExtHostWebview(handle, this._proxy, options);
@@ -224,7 +260,7 @@ export class ExtHostWebviews implements ExtHostWebviewsShape {
 		return panel;
 	}
 
-	registerWebviewPanelSerializer(
+	public registerWebviewPanelSerializer(
 		viewType: string,
 		serializer: vscode.WebviewPanelSerializer
 	): vscode.Disposable {
@@ -241,19 +277,26 @@ export class ExtHostWebviews implements ExtHostWebviewsShape {
 		});
 	}
 
-	$onMessage(handle: WebviewPanelHandle, message: any): void {
+	public $onMessage(
+		handle: WebviewPanelHandle,
+		message: any
+	): void {
 		const panel = this.getWebviewPanel(handle);
 		if (panel) {
 			panel.webview._onMessageEmitter.fire(message);
 		}
 	}
 
-	$onDidChangeWebviewPanelViewState(handle: WebviewPanelHandle, visible: boolean, position: EditorViewColumn): void {
+	public $onDidChangeWebviewPanelViewState(
+		handle: WebviewPanelHandle,
+		newState: WebviewPanelViewState
+	): void {
 		const panel = this.getWebviewPanel(handle);
 		if (panel) {
-			const viewColumn = typeConverters.ViewColumn.to(position);
-			if (panel.visible !== visible || panel.viewColumn !== viewColumn) {
-				panel._setVisible(visible);
+			const viewColumn = typeConverters.ViewColumn.to(newState.position);
+			if (panel.active !== newState.active || panel.visible !== newState.visible || panel.viewColumn !== viewColumn) {
+				panel._setActive(newState.active);
+				panel._setVisible(newState.visible);
 				panel._setViewColumn(viewColumn);
 				panel._onDidChangeViewStateEmitter.fire({ webviewPanel: panel });
 			}
diff --git a/src/vs/workbench/api/node/extHostWorkspace.ts b/src/vs/workbench/api/node/extHostWorkspace.ts
index 7fd58a461ac..26f0f0bf0bb 100644
--- a/src/vs/workbench/api/node/extHostWorkspace.ts
+++ b/src/vs/workbench/api/node/extHostWorkspace.ts
@@ -4,22 +4,27 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import URI from 'vs/base/common/uri';
-import { Event, Emitter } from 'vs/base/common/event';
-import { normalize } from 'vs/base/common/paths';
+import { join, relative } from 'path';
 import { delta as arrayDelta } from 'vs/base/common/arrays';
-import { relative, posix } from 'path';
-import { Workspace, WorkspaceFolder } from 'vs/platform/workspace/common/workspace';
-import { IWorkspaceData, ExtHostWorkspaceShape, MainContext, MainThreadWorkspaceShape, IMainContext, MainThreadMessageServiceShape } from './extHost.protocol';
-import * as vscode from 'vscode';
-import { compare } from 'vs/base/common/strings';
+import { Emitter, Event } from 'vs/base/common/event';
 import { TernarySearchTree } from 'vs/base/common/map';
-import { basenameOrAuthority, isEqual } from 'vs/base/common/resources';
+import { Counter } from 'vs/base/common/numbers';
+import { normalize } from 'vs/base/common/paths';
 import { isLinux } from 'vs/base/common/platform';
-import { IExtensionDescription } from 'vs/workbench/services/extensions/common/extensions';
+import { basenameOrAuthority, dirname, isEqual } from 'vs/base/common/resources';
+import { compare } from 'vs/base/common/strings';
+import { URI } from 'vs/base/common/uri';
+import { TPromise } from 'vs/base/common/winjs.base';
 import { localize } from 'vs/nls';
-import { Severity } from 'vs/platform/notification/common/notification';
 import { ILogService } from 'vs/platform/log/common/log';
+import { Severity } from 'vs/platform/notification/common/notification';
+import { IQueryOptions, IRawFileMatch2 } from 'vs/platform/search/common/search';
+import { Workspace, WorkspaceFolder } from 'vs/platform/workspace/common/workspace';
+import { Range } from 'vs/workbench/api/node/extHostTypes';
+import { IExtensionDescription } from 'vs/workbench/services/extensions/common/extensions';
+import * as vscode from 'vscode';
+import { ExtHostWorkspaceShape, IMainContext, IWorkspaceData, MainContext, MainThreadMessageServiceShape, MainThreadWorkspaceShape } from './extHost.protocol';
+import { CancellationToken } from 'vs/base/common/cancellation';
 
 function isFolderEqual(folderA: URI, folderB: URI): boolean {
 	return isEqual(folderA, folderB, !isLinux);
@@ -104,8 +109,8 @@ class ExtHostWorkspaceImpl extends Workspace {
 	private readonly _workspaceFolders: vscode.WorkspaceFolder[] = [];
 	private readonly _structure = TernarySearchTree.forPaths<vscode.WorkspaceFolder>();
 
-	private constructor(id: string, name: string, folders: vscode.WorkspaceFolder[]) {
-		super(id, name, folders.map(f => new WorkspaceFolder(f)));
+	private constructor(id: string, private _name: string, folders: vscode.WorkspaceFolder[]) {
+		super(id, folders.map(f => new WorkspaceFolder(f)));
 
 		// setup the workspace folder data structure
 		folders.forEach(folder => {
@@ -114,6 +119,10 @@ class ExtHostWorkspaceImpl extends Workspace {
 		});
 	}
 
+	get name(): string {
+		return this._name;
+	}
+
 	get workspaceFolders(): vscode.WorkspaceFolder[] {
 		return this._workspaceFolders.slice(0);
 	}
@@ -121,7 +130,7 @@ class ExtHostWorkspaceImpl extends Workspace {
 	getWorkspaceFolder(uri: URI, resolveParent?: boolean): vscode.WorkspaceFolder {
 		if (resolveParent && this._structure.get(uri.toString())) {
 			// `uri` is a workspace folder so we check for its parent
-			uri = uri.with({ path: posix.dirname(uri.path) });
+			uri = dirname(uri);
 		}
 		return this._structure.findSubstr(uri.toString());
 	}
@@ -133,8 +142,6 @@ class ExtHostWorkspaceImpl extends Workspace {
 
 export class ExtHostWorkspace implements ExtHostWorkspaceShape {
 
-	private static _requestIdPool = 0;
-
 	private readonly _onDidChangeWorkspace = new Emitter<vscode.WorkspaceFoldersChangeEvent>();
 	private readonly _proxy: MainThreadWorkspaceShape;
 
@@ -145,10 +152,13 @@ export class ExtHostWorkspace implements ExtHostWorkspaceShape {
 
 	readonly onDidChangeWorkspace: Event<vscode.WorkspaceFoldersChangeEvent> = this._onDidChangeWorkspace.event;
 
+	private readonly _activeSearchCallbacks: ((match: IRawFileMatch2) => any)[] = [];
+
 	constructor(
 		mainContext: IMainContext,
 		data: IWorkspaceData,
-		private _logService: ILogService
+		private _logService: ILogService,
+		private _requestIdProvider: Counter
 	) {
 		this._proxy = mainContext.getProxy(MainContext.MainThreadWorkspace);
 		this._messageService = mainContext.getProxy(MainContext.MainThreadMessageService);
@@ -161,6 +171,10 @@ export class ExtHostWorkspace implements ExtHostWorkspaceShape {
 		return this._actualWorkspace;
 	}
 
+	get name(): string {
+		return this._actualWorkspace ? this._actualWorkspace.name : undefined;
+	}
+
 	private get _actualWorkspace(): ExtHostWorkspaceImpl {
 		return this._unconfirmedWorkspace || this._confirmedWorkspace;
 	}
@@ -263,6 +277,7 @@ export class ExtHostWorkspace implements ExtHostWorkspaceShape {
 		if (folders.length === 0) {
 			return undefined;
 		}
+		// #54483 @Joh Why are we still using fsPath?
 		return folders[0].uri.fsPath;
 	}
 
@@ -324,18 +339,16 @@ export class ExtHostWorkspace implements ExtHostWorkspaceShape {
 
 		// Events
 		this._onDidChangeWorkspace.fire(Object.freeze({
-			added: Object.freeze<vscode.WorkspaceFolder[]>(added),
-			removed: Object.freeze<vscode.WorkspaceFolder[]>(removed)
+			added,
+			removed,
 		}));
 	}
 
 	// --- search ---
 
-	findFiles(include: vscode.GlobPattern, exclude: vscode.GlobPattern, maxResults: number, extensionId: string, token?: vscode.CancellationToken): Thenable<vscode.Uri[]> {
+	findFiles(include: vscode.GlobPattern, exclude: vscode.GlobPattern, maxResults: number, extensionId: string, token: vscode.CancellationToken = CancellationToken.None): Thenable<vscode.Uri[]> {
 		this._logService.trace(`extHostWorkspace#findFiles: fileSearch, extension: ${extensionId}, entryPoint: findFiles`);
 
-		const requestId = ExtHostWorkspace._requestIdPool++;
-
 		let includePattern: string;
 		let includeFolder: string;
 		if (include) {
@@ -358,11 +371,80 @@ export class ExtHostWorkspace implements ExtHostWorkspaceShape {
 			}
 		}
 
-		const result = this._proxy.$startSearch(includePattern, includeFolder, excludePatternOrDisregardExcludes, maxResults, requestId);
-		if (token) {
-			token.onCancellationRequested(() => this._proxy.$cancelSearch(requestId));
+		if (token && token.isCancellationRequested) {
+			return TPromise.wrap([]);
+		}
+
+		return this._proxy.$startFileSearch(includePattern, includeFolder, excludePatternOrDisregardExcludes, maxResults, token)
+			.then(data => Array.isArray(data) ? data.map(URI.revive) : []);
+	}
+
+	findTextInFiles(query: vscode.TextSearchQuery, options: vscode.FindTextInFilesOptions, callback: (result: vscode.TextSearchResult) => void, extensionId: string, token: vscode.CancellationToken = CancellationToken.None) {
+		this._logService.trace(`extHostWorkspace#findTextInFiles: textSearch, extension: ${extensionId}, entryPoint: findTextInFiles`);
+
+		if (options.previewOptions && options.previewOptions.totalChars <= options.previewOptions.leadingChars) {
+			throw new Error('findTextInFiles: previewOptions.totalChars must be > previewOptions.leadingChars');
+		}
+
+		const requestId = this._requestIdProvider.getNext();
+
+		const globPatternToString = (pattern: vscode.GlobPattern | string) => {
+			if (typeof pattern === 'string') {
+				return pattern;
+			}
+
+			return join(pattern.base, pattern.pattern);
+		};
+
+		const queryOptions: IQueryOptions = {
+			ignoreSymlinks: typeof options.followSymlinks === 'boolean' ? !options.followSymlinks : undefined,
+			disregardIgnoreFiles: typeof options.useIgnoreFiles === 'boolean' ? !options.useIgnoreFiles : undefined,
+			disregardExcludeSettings: options.exclude === null,
+			fileEncoding: options.encoding,
+			maxResults: options.maxResults,
+			previewOptions: options.previewOptions,
+
+			includePattern: options.include && globPatternToString(options.include),
+			excludePattern: options.exclude && globPatternToString(options.exclude)
+		};
+
+		let isCanceled = false;
+
+		this._activeSearchCallbacks[requestId] = p => {
+			if (isCanceled) {
+				return;
+			}
+
+			p.matches.forEach(match => {
+				callback({
+					uri: URI.revive(p.resource),
+					preview: {
+						text: match.preview.text,
+						match: new Range(match.preview.match.startLineNumber, match.preview.match.startColumn, match.preview.match.endLineNumber, match.preview.match.endColumn)
+					},
+					range: new Range(match.range.startLineNumber, match.range.startColumn, match.range.endLineNumber, match.range.endColumn)
+				});
+			});
+		};
+
+		if (token.isCancellationRequested) {
+			return TPromise.wrap(undefined);
+		}
+
+		return this._proxy.$startTextSearch(query, queryOptions, requestId, token).then(
+			() => {
+				delete this._activeSearchCallbacks[requestId];
+			},
+			err => {
+				delete this._activeSearchCallbacks[requestId];
+				return TPromise.wrapError(err);
+			});
+	}
+
+	$handleTextSearchResult(result: IRawFileMatch2, requestId: number): void {
+		if (this._activeSearchCallbacks[requestId]) {
+			this._activeSearchCallbacks[requestId](result);
 		}
-		return result.then(data => Array.isArray(data) ? data.map(URI.revive) : []);
 	}
 
 	saveAll(includeUntitled?: boolean): Thenable<boolean> {
diff --git a/src/vs/workbench/api/shared/editor.ts b/src/vs/workbench/api/shared/editor.ts
index 7c537a8edd0..6faf61d1063 100644
--- a/src/vs/workbench/api/shared/editor.ts
+++ b/src/vs/workbench/api/shared/editor.ts
@@ -9,18 +9,14 @@ import { IEditorGroupsService, IEditorGroup, GroupsOrder } from 'vs/workbench/se
 import { GroupIdentifier } from 'vs/workbench/common/editor';
 import { ACTIVE_GROUP, SIDE_GROUP } from 'vs/workbench/services/editor/common/editorService';
 
-// TODO@api this was previously a hardcoded list of editor positions (ONE, TWO, THREE)
-// that with the introduction of grid editor feature is now unbounded. This should be
-// revisited when the grid functionality is exposed to extensions,
-
 export type EditorViewColumn = number;
 
 export function viewColumnToEditorGroup(editorGroupService: IEditorGroupsService, position?: EditorViewColumn): GroupIdentifier {
-	if (typeof position !== 'number') {
-		return ACTIVE_GROUP; // prefer active group when position is undefined
+	if (typeof position !== 'number' || position === ACTIVE_GROUP) {
+		return ACTIVE_GROUP; // prefer active group when position is undefined or passed in as such
 	}
 
-	const groups = editorGroupService.getGroups(GroupsOrder.CREATION_TIME);
+	const groups = editorGroupService.getGroups(GroupsOrder.GRID_APPEARANCE);
 
 	let candidate = groups[position];
 	if (candidate) {
@@ -29,14 +25,14 @@ export function viewColumnToEditorGroup(editorGroupService: IEditorGroupsService
 
 	let firstGroup = groups[0];
 	if (groups.length === 1 && firstGroup.count === 0) {
-		return firstGroup.id; // first editor should always open in first group
+		return firstGroup.id; // first editor should always open in first group independent from position provided
 	}
 
-	return SIDE_GROUP; // open to the side if group not found
+	return SIDE_GROUP; // open to the side if group not found or we are instructed to
 }
 
 export function editorGroupToViewColumn(editorGroupService: IEditorGroupsService, editorGroup: IEditorGroup | GroupIdentifier): EditorViewColumn {
-	const group = typeof editorGroup === 'number' ? editorGroupService.getGroup(editorGroup) : editorGroup;
+	const group = (typeof editorGroup === 'number') ? editorGroupService.getGroup(editorGroup) : editorGroup;
 
-	return editorGroupService.getGroups(GroupsOrder.CREATION_TIME).indexOf(group);
+	return editorGroupService.getGroups(GroupsOrder.GRID_APPEARANCE).indexOf(group);
 }
\ No newline at end of file
diff --git a/src/vs/workbench/api/shared/tasks.ts b/src/vs/workbench/api/shared/tasks.ts
index 7efd4ae6437..c03895bfb41 100644
--- a/src/vs/workbench/api/shared/tasks.ts
+++ b/src/vs/workbench/api/shared/tasks.ts
@@ -106,5 +106,7 @@ export interface TaskFilterDTO {
 }
 
 export interface TaskSystemInfoDTO {
+	scheme: string;
+	authority: string;
 	platform: string;
 }
\ No newline at end of file
diff --git a/src/vs/workbench/browser/actions.ts b/src/vs/workbench/browser/actions.ts
index 8538ba3afdb..2f0aceb67e5 100644
--- a/src/vs/workbench/browser/actions.ts
+++ b/src/vs/workbench/browser/actions.ts
@@ -6,7 +6,6 @@
 
 import { TPromise } from 'vs/base/common/winjs.base';
 import { Registry } from 'vs/platform/registry/common/platform';
-import * as types from 'vs/base/common/types';
 import { Action, IAction } from 'vs/base/common/actions';
 import { BaseActionItem, Separator } from 'vs/base/browser/ui/actionbar/actionbar';
 import { ITree, IActionProvider } from 'vs/base/parts/tree/browser/tree';
@@ -20,35 +19,35 @@ export class ActionBarContributor {
 	/**
 	 * Returns true if this contributor has actions for the given context.
 	 */
-	public hasActions(context: any): boolean {
+	hasActions(context: any): boolean {
 		return false;
 	}
 
 	/**
 	 * Returns an array of primary actions in the given context.
 	 */
-	public getActions(context: any): IAction[] {
+	getActions(context: any): IAction[] {
 		return [];
 	}
 
 	/**
 	 * Returns true if this contributor has secondary actions for the given context.
 	 */
-	public hasSecondaryActions(context: any): boolean {
+	hasSecondaryActions(context: any): boolean {
 		return false;
 	}
 
 	/**
 	 * Returns an array of secondary actions in the given context.
 	 */
-	public getSecondaryActions(context: any): IAction[] {
+	getSecondaryActions(context: any): IAction[] {
 		return [];
 	}
 
 	/**
 	 * Can return a specific IActionItem to render the given action.
 	 */
-	public getActionItem(context: any, action: Action): BaseActionItem {
+	getActionItem(context: any, action: Action): BaseActionItem {
 		return null;
 	}
 }
@@ -80,7 +79,7 @@ export class ContributableActionProvider implements IActionProvider {
 		};
 	}
 
-	public hasActions(tree: ITree, element: any): boolean {
+	hasActions(tree: ITree, element: any): boolean {
 		const context = this.toContext(tree, element);
 
 		const contributors = this.registry.getActionBarContributors(Scope.VIEWER);
@@ -94,7 +93,7 @@ export class ContributableActionProvider implements IActionProvider {
 		return false;
 	}
 
-	public getActions(tree: ITree, element: any): TPromise<IAction[]> {
+	getActions(tree: ITree, element: any): TPromise<IAction[]> {
 		const actions: IAction[] = [];
 		const context = this.toContext(tree, element);
 
@@ -110,7 +109,7 @@ export class ContributableActionProvider implements IActionProvider {
 		return TPromise.as(prepareActions(actions));
 	}
 
-	public hasSecondaryActions(tree: ITree, element: any): boolean {
+	hasSecondaryActions(tree: ITree, element: any): boolean {
 		const context = this.toContext(tree, element);
 
 		const contributors = this.registry.getActionBarContributors(Scope.VIEWER);
@@ -124,7 +123,7 @@ export class ContributableActionProvider implements IActionProvider {
 		return false;
 	}
 
-	public getSecondaryActions(tree: ITree, element: any): TPromise<IAction[]> {
+	getSecondaryActions(tree: ITree, element: any): TPromise<IAction[]> {
 		const actions: IAction[] = [];
 		const context = this.toContext(tree, element);
 
@@ -140,7 +139,7 @@ export class ContributableActionProvider implements IActionProvider {
 		return TPromise.as(prepareActions(actions));
 	}
 
-	public getActionItem(tree: ITree, element: any, action: Action): BaseActionItem {
+	getActionItem(tree: ITree, element: any, action: Action): BaseActionItem {
 		const contributors = this.registry.getActionBarContributors(Scope.VIEWER);
 		const context = this.toContext(tree, element);
 
@@ -163,36 +162,6 @@ export function prepareActions(actions: IAction[]): IAction[] {
 		return actions;
 	}
 
-	// Patch order if not provided
-	let lastOrder = -1;
-	let orderOffset = 0;
-	for (let l = 0; l < actions.length; l++) {
-		const a = <any>actions[l];
-		if (types.isUndefinedOrNull(a.order)) {
-			a.order = ++lastOrder;
-			orderOffset++;
-		} else {
-			a.order += orderOffset;
-		}
-
-		lastOrder = a.order;
-	}
-
-	// Sort by order
-	actions = actions.sort((first: Action, second: Action) => {
-		const firstOrder = first.order;
-		const secondOrder = second.order;
-		if (firstOrder < secondOrder) {
-			return -1;
-		}
-
-		if (firstOrder > secondOrder) {
-			return 1;
-		}
-
-		return 0;
-	});
-
 	// Clean up leading separators
 	let firstIndexOfAction = -1;
 	for (let i = 0; i < actions.length; i++) {
@@ -279,7 +248,7 @@ class ActionBarRegistry implements IActionBarRegistry {
 	private actionBarContributorInstances: { [scope: string]: ActionBarContributor[] } = Object.create(null);
 	private instantiationService: IInstantiationService;
 
-	public setInstantiationService(service: IInstantiationService): void {
+	setInstantiationService(service: IInstantiationService): void {
 		this.instantiationService = service;
 
 		while (this.actionBarContributorConstructors.length > 0) {
@@ -301,7 +270,7 @@ class ActionBarRegistry implements IActionBarRegistry {
 		return this.actionBarContributorInstances[scope] || [];
 	}
 
-	public getActionBarActionsForContext(scope: string, context: any): IAction[] {
+	getActionBarActionsForContext(scope: string, context: any): IAction[] {
 		const actions: IAction[] = [];
 
 		// Go through contributors for scope
@@ -316,7 +285,7 @@ class ActionBarRegistry implements IActionBarRegistry {
 		return actions;
 	}
 
-	public getSecondaryActionBarActionsForContext(scope: string, context: any): IAction[] {
+	getSecondaryActionBarActionsForContext(scope: string, context: any): IAction[] {
 		const actions: IAction[] = [];
 
 		// Go through contributors
@@ -331,7 +300,7 @@ class ActionBarRegistry implements IActionBarRegistry {
 		return actions;
 	}
 
-	public getActionItemForContext(scope: string, context: any, action: Action): BaseActionItem {
+	getActionItemForContext(scope: string, context: any, action: Action): BaseActionItem {
 		const contributors = this.getContributors(scope);
 		for (let i = 0; i < contributors.length; i++) {
 			const contributor = contributors[i];
@@ -344,7 +313,7 @@ class ActionBarRegistry implements IActionBarRegistry {
 		return null;
 	}
 
-	public registerActionBarContributor(scope: string, ctor: IConstructorSignature0<ActionBarContributor>): void {
+	registerActionBarContributor(scope: string, ctor: IConstructorSignature0<ActionBarContributor>): void {
 		if (!this.instantiationService) {
 			this.actionBarContributorConstructors.push({
 				scope: scope,
@@ -355,7 +324,7 @@ class ActionBarRegistry implements IActionBarRegistry {
 		}
 	}
 
-	public getActionBarContributors(scope: string): ActionBarContributor[] {
+	getActionBarContributors(scope: string): ActionBarContributor[] {
 		return this.getContributors(scope).slice(0);
 	}
 }
diff --git a/src/vs/workbench/browser/actions/toggleActivityBarVisibility.ts b/src/vs/workbench/browser/actions/toggleActivityBarVisibility.ts
index 3018aeda0d8..9f504717d73 100644
--- a/src/vs/workbench/browser/actions/toggleActivityBarVisibility.ts
+++ b/src/vs/workbench/browser/actions/toggleActivityBarVisibility.ts
@@ -8,15 +8,15 @@ import { TPromise } from 'vs/base/common/winjs.base';
 import * as nls from 'vs/nls';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { Action } from 'vs/base/common/actions';
-import { SyncActionDescriptor } from 'vs/platform/actions/common/actions';
+import { SyncActionDescriptor, MenuId, MenuRegistry } from 'vs/platform/actions/common/actions';
 import { IWorkbenchActionRegistry, Extensions } from 'vs/workbench/common/actions';
 import { IConfigurationService, ConfigurationTarget } from 'vs/platform/configuration/common/configuration';
 import { IPartService, Parts } from 'vs/workbench/services/part/common/partService';
 
 export class ToggleActivityBarVisibilityAction extends Action {
 
-	public static readonly ID = 'workbench.action.toggleActivityBarVisibility';
-	public static readonly LABEL = nls.localize('toggleActivityBar', "Toggle Activity Bar Visibility");
+	static readonly ID = 'workbench.action.toggleActivityBarVisibility';
+	static readonly LABEL = nls.localize('toggleActivityBar', "Toggle Activity Bar Visibility");
 
 	private static readonly activityBarVisibleKey = 'workbench.activityBar.visible';
 
@@ -31,7 +31,7 @@ export class ToggleActivityBarVisibilityAction extends Action {
 		this.enabled = !!this.partService;
 	}
 
-	public run(): TPromise<any> {
+	run(): TPromise<any> {
 		const visibility = this.partService.isVisible(Parts.ACTIVITYBAR_PART);
 		const newVisibilityValue = !visibility;
 
@@ -40,4 +40,13 @@ export class ToggleActivityBarVisibilityAction extends Action {
 }
 
 const registry = Registry.as<IWorkbenchActionRegistry>(Extensions.WorkbenchActions);
-registry.registerWorkbenchAction(new SyncActionDescriptor(ToggleActivityBarVisibilityAction, ToggleActivityBarVisibilityAction.ID, ToggleActivityBarVisibilityAction.LABEL), 'View: Toggle Activity Bar Visibility', nls.localize('view', "View"));
\ No newline at end of file
+registry.registerWorkbenchAction(new SyncActionDescriptor(ToggleActivityBarVisibilityAction, ToggleActivityBarVisibilityAction.ID, ToggleActivityBarVisibilityAction.LABEL), 'View: Toggle Activity Bar Visibility', nls.localize('view', "View"));
+
+MenuRegistry.appendMenuItem(MenuId.MenubarAppearanceMenu, {
+	group: '2_workbench_layout',
+	command: {
+		id: ToggleActivityBarVisibilityAction.ID,
+		title: nls.localize({ key: 'miToggleActivityBar', comment: ['&& denotes a mnemonic'] }, "Toggle &&Activity Bar")
+	},
+	order: 4
+});
diff --git a/src/vs/workbench/browser/actions/toggleCenteredLayout.ts b/src/vs/workbench/browser/actions/toggleCenteredLayout.ts
index 663541555e4..4be449f24ac 100644
--- a/src/vs/workbench/browser/actions/toggleCenteredLayout.ts
+++ b/src/vs/workbench/browser/actions/toggleCenteredLayout.ts
@@ -7,14 +7,14 @@ import { TPromise } from 'vs/base/common/winjs.base';
 import * as nls from 'vs/nls';
 import { Action } from 'vs/base/common/actions';
 import { Registry } from 'vs/platform/registry/common/platform';
-import { SyncActionDescriptor } from 'vs/platform/actions/common/actions';
+import { SyncActionDescriptor, MenuRegistry, MenuId } from 'vs/platform/actions/common/actions';
 import { IWorkbenchActionRegistry, Extensions } from 'vs/workbench/common/actions';
 import { IPartService } from 'vs/workbench/services/part/common/partService';
 
 class ToggleCenteredLayout extends Action {
 
-	public static readonly ID = 'workbench.action.toggleCenteredLayout';
-	public static readonly LABEL = nls.localize('toggleCenteredLayout', "Toggle Centered Layout");
+	static readonly ID = 'workbench.action.toggleCenteredLayout';
+	static readonly LABEL = nls.localize('toggleCenteredLayout', "Toggle Centered Layout");
 
 	constructor(
 		id: string,
@@ -25,7 +25,7 @@ class ToggleCenteredLayout extends Action {
 		this.enabled = !!this.partService;
 	}
 
-	public run(): TPromise<any> {
+	run(): TPromise<any> {
 		this.partService.centerEditorLayout(!this.partService.isEditorLayoutCentered());
 
 		return TPromise.as(null);
@@ -34,3 +34,21 @@ class ToggleCenteredLayout extends Action {
 
 const registry = Registry.as<IWorkbenchActionRegistry>(Extensions.WorkbenchActions);
 registry.registerWorkbenchAction(new SyncActionDescriptor(ToggleCenteredLayout, ToggleCenteredLayout.ID, ToggleCenteredLayout.LABEL), 'View: Toggle Centered Layout', nls.localize('view', "View"));
+
+MenuRegistry.appendMenuItem(MenuId.MenubarAppearanceMenu, {
+	group: '1_toggle_view',
+	command: {
+		id: ToggleCenteredLayout.ID,
+		title: nls.localize('miToggleCenteredLayout', "Toggle Centered Layout")
+	},
+	order: 3
+});
+
+MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
+	group: '2_layouts',
+	command: {
+		id: 'workbench.action.editorLayoutCentered',
+		title: nls.localize({ key: 'miCenteredEditorLayout', comment: ['&& denotes a mnemonic'] }, "&&Centered")
+	},
+	order: 2
+});
diff --git a/src/vs/workbench/browser/actions/toggleEditorLayout.ts b/src/vs/workbench/browser/actions/toggleEditorLayout.ts
index b65f251ae75..32b9cc1c921 100644
--- a/src/vs/workbench/browser/actions/toggleEditorLayout.ts
+++ b/src/vs/workbench/browser/actions/toggleEditorLayout.ts
@@ -9,7 +9,7 @@ import { TPromise } from 'vs/base/common/winjs.base';
 import * as nls from 'vs/nls';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { Action } from 'vs/base/common/actions';
-import { SyncActionDescriptor } from 'vs/platform/actions/common/actions';
+import { SyncActionDescriptor, MenuRegistry, MenuId } from 'vs/platform/actions/common/actions';
 import { IWorkbenchActionRegistry, Extensions } from 'vs/workbench/common/actions';
 import { KeyMod, KeyCode } from 'vs/base/common/keyCodes';
 import { dispose, IDisposable } from 'vs/base/common/lifecycle';
@@ -19,8 +19,8 @@ import { IEditorGroupsService, GroupOrientation } from 'vs/workbench/services/gr
 
 export class ToggleEditorLayoutAction extends Action {
 
-	public static readonly ID = 'workbench.action.toggleEditorGroupLayout';
-	public static readonly LABEL = nls.localize('flipLayout', "Flip Editor Group Layout");
+	static readonly ID = 'workbench.action.toggleEditorGroupLayout';
+	static readonly LABEL = nls.localize('flipLayout', "Toggle Vertical/Horizontal Editor Layout");
 
 	private toDispose: IDisposable[];
 
@@ -48,14 +48,14 @@ export class ToggleEditorLayoutAction extends Action {
 		this.enabled = this.editorGroupService.count > 1;
 	}
 
-	public run(): TPromise<any> {
+	run(): TPromise<any> {
 		const newOrientation = (this.editorGroupService.orientation === GroupOrientation.VERTICAL) ? GroupOrientation.HORIZONTAL : GroupOrientation.VERTICAL;
 		this.editorGroupService.setGroupOrientation(newOrientation);
 
 		return TPromise.as(null);
 	}
 
-	public dispose(): void {
+	dispose(): void {
 		this.toDispose = dispose(this.toDispose);
 
 		super.dispose();
@@ -73,4 +73,13 @@ CommandsRegistry.registerCommand('_workbench.editor.setGroupOrientation', functi
 
 const registry = Registry.as<IWorkbenchActionRegistry>(Extensions.WorkbenchActions);
 const group = nls.localize('view', "View");
-registry.registerWorkbenchAction(new SyncActionDescriptor(ToggleEditorLayoutAction, ToggleEditorLayoutAction.ID, ToggleEditorLayoutAction.LABEL, { primary: KeyMod.Shift | KeyMod.Alt | KeyCode.KEY_0, mac: { primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.KEY_0 } }), 'View: Flip Editor Group Layout', group);
\ No newline at end of file
+registry.registerWorkbenchAction(new SyncActionDescriptor(ToggleEditorLayoutAction, ToggleEditorLayoutAction.ID, ToggleEditorLayoutAction.LABEL, { primary: KeyMod.Shift | KeyMod.Alt | KeyCode.KEY_0, mac: { primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.KEY_0 } }), 'View: Flip Editor Group Layout', group);
+
+MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
+	group: 'z_flip',
+	command: {
+		id: ToggleEditorLayoutAction.ID,
+		title: nls.localize({ key: 'miToggleEditorLayout', comment: ['&& denotes a mnemonic'] }, "Flip &&Layout")
+	},
+	order: 1
+});
diff --git a/src/vs/workbench/browser/actions/toggleSidebarPosition.ts b/src/vs/workbench/browser/actions/toggleSidebarPosition.ts
index b0a223a0ab6..3c64a5a1c6d 100644
--- a/src/vs/workbench/browser/actions/toggleSidebarPosition.ts
+++ b/src/vs/workbench/browser/actions/toggleSidebarPosition.ts
@@ -8,15 +8,15 @@ import { TPromise } from 'vs/base/common/winjs.base';
 import * as nls from 'vs/nls';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { Action } from 'vs/base/common/actions';
-import { SyncActionDescriptor } from 'vs/platform/actions/common/actions';
+import { SyncActionDescriptor, MenuRegistry, MenuId } from 'vs/platform/actions/common/actions';
 import { IWorkbenchActionRegistry, Extensions } from 'vs/workbench/common/actions';
 import { IPartService, Position } from 'vs/workbench/services/part/common/partService';
 import { IConfigurationService, ConfigurationTarget } from 'vs/platform/configuration/common/configuration';
 
 export class ToggleSidebarPositionAction extends Action {
 
-	public static readonly ID = 'workbench.action.toggleSidebarPosition';
-	public static readonly LABEL = nls.localize('toggleSidebarPosition', "Toggle Side Bar Position");
+	static readonly ID = 'workbench.action.toggleSidebarPosition';
+	static readonly LABEL = nls.localize('toggleSidebarPosition', "Toggle Side Bar Position");
 
 	private static readonly sidebarPositionConfigurationKey = 'workbench.sideBar.location';
 
@@ -31,7 +31,7 @@ export class ToggleSidebarPositionAction extends Action {
 		this.enabled = !!this.partService && !!this.configurationService;
 	}
 
-	public run(): TPromise<any> {
+	run(): TPromise<any> {
 		const position = this.partService.getSideBarPosition();
 		const newPositionValue = (position === Position.LEFT) ? 'right' : 'left';
 
@@ -41,3 +41,12 @@ export class ToggleSidebarPositionAction extends Action {
 
 const registry = Registry.as<IWorkbenchActionRegistry>(Extensions.WorkbenchActions);
 registry.registerWorkbenchAction(new SyncActionDescriptor(ToggleSidebarPositionAction, ToggleSidebarPositionAction.ID, ToggleSidebarPositionAction.LABEL), 'View: Toggle Side Bar Position', nls.localize('view', "View"));
+
+MenuRegistry.appendMenuItem(MenuId.MenubarAppearanceMenu, {
+	group: '2_workbench_layout',
+	command: {
+		id: ToggleSidebarPositionAction.ID,
+		title: nls.localize({ key: 'miMoveSidebarLeftRight', comment: ['&& denotes a mnemonic'] }, "&&Move Side Bar Left/Right")
+	},
+	order: 2
+});
diff --git a/src/vs/workbench/browser/actions/toggleSidebarVisibility.ts b/src/vs/workbench/browser/actions/toggleSidebarVisibility.ts
index 72afba76346..e69151cac2b 100644
--- a/src/vs/workbench/browser/actions/toggleSidebarVisibility.ts
+++ b/src/vs/workbench/browser/actions/toggleSidebarVisibility.ts
@@ -8,15 +8,15 @@ import { TPromise } from 'vs/base/common/winjs.base';
 import * as nls from 'vs/nls';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { Action } from 'vs/base/common/actions';
-import { SyncActionDescriptor } from 'vs/platform/actions/common/actions';
+import { SyncActionDescriptor, MenuRegistry, MenuId } from 'vs/platform/actions/common/actions';
 import { IWorkbenchActionRegistry, Extensions } from 'vs/workbench/common/actions';
 import { IPartService, Parts } from 'vs/workbench/services/part/common/partService';
 import { KeyMod, KeyCode } from 'vs/base/common/keyCodes';
 
 export class ToggleSidebarVisibilityAction extends Action {
 
-	public static readonly ID = 'workbench.action.toggleSidebarVisibility';
-	public static readonly LABEL = nls.localize('toggleSidebar', "Toggle Side Bar Visibility");
+	static readonly ID = 'workbench.action.toggleSidebarVisibility';
+	static readonly LABEL = nls.localize('toggleSidebar', "Toggle Side Bar Visibility");
 
 	constructor(
 		id: string,
@@ -28,11 +28,20 @@ export class ToggleSidebarVisibilityAction extends Action {
 		this.enabled = !!this.partService;
 	}
 
-	public run(): TPromise<any> {
+	run(): TPromise<any> {
 		const hideSidebar = this.partService.isVisible(Parts.SIDEBAR_PART);
 		return this.partService.setSideBarHidden(hideSidebar);
 	}
 }
 
 const registry = Registry.as<IWorkbenchActionRegistry>(Extensions.WorkbenchActions);
-registry.registerWorkbenchAction(new SyncActionDescriptor(ToggleSidebarVisibilityAction, ToggleSidebarVisibilityAction.ID, ToggleSidebarVisibilityAction.LABEL, { primary: KeyMod.CtrlCmd | KeyCode.KEY_B }), 'View: Toggle Side Bar Visibility', nls.localize('view', "View"));
\ No newline at end of file
+registry.registerWorkbenchAction(new SyncActionDescriptor(ToggleSidebarVisibilityAction, ToggleSidebarVisibilityAction.ID, ToggleSidebarVisibilityAction.LABEL, { primary: KeyMod.CtrlCmd | KeyCode.KEY_B }), 'View: Toggle Side Bar Visibility', nls.localize('view', "View"));
+
+MenuRegistry.appendMenuItem(MenuId.MenubarAppearanceMenu, {
+	group: '2_workbench_layout',
+	command: {
+		id: ToggleSidebarVisibilityAction.ID,
+		title: nls.localize({ key: 'miToggleSidebar', comment: ['&& denotes a mnemonic'] }, "&&Toggle Side Bar")
+	},
+	order: 1
+});
diff --git a/src/vs/workbench/browser/actions/toggleStatusbarVisibility.ts b/src/vs/workbench/browser/actions/toggleStatusbarVisibility.ts
index da09591e2d0..2ec27e5f765 100644
--- a/src/vs/workbench/browser/actions/toggleStatusbarVisibility.ts
+++ b/src/vs/workbench/browser/actions/toggleStatusbarVisibility.ts
@@ -8,15 +8,15 @@ import { TPromise } from 'vs/base/common/winjs.base';
 import * as nls from 'vs/nls';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { Action } from 'vs/base/common/actions';
-import { SyncActionDescriptor } from 'vs/platform/actions/common/actions';
+import { SyncActionDescriptor, MenuRegistry, MenuId } from 'vs/platform/actions/common/actions';
 import { IWorkbenchActionRegistry, Extensions } from 'vs/workbench/common/actions';
 import { IConfigurationService, ConfigurationTarget } from 'vs/platform/configuration/common/configuration';
 import { IPartService, Parts } from 'vs/workbench/services/part/common/partService';
 
 export class ToggleStatusbarVisibilityAction extends Action {
 
-	public static readonly ID = 'workbench.action.toggleStatusbarVisibility';
-	public static readonly LABEL = nls.localize('toggleStatusbar', "Toggle Status Bar Visibility");
+	static readonly ID = 'workbench.action.toggleStatusbarVisibility';
+	static readonly LABEL = nls.localize('toggleStatusbar', "Toggle Status Bar Visibility");
 
 	private static readonly statusbarVisibleKey = 'workbench.statusBar.visible';
 
@@ -31,7 +31,7 @@ export class ToggleStatusbarVisibilityAction extends Action {
 		this.enabled = !!this.partService;
 	}
 
-	public run(): TPromise<any> {
+	run(): TPromise<any> {
 		const visibility = this.partService.isVisible(Parts.STATUSBAR_PART);
 		const newVisibilityValue = !visibility;
 
@@ -40,4 +40,13 @@ export class ToggleStatusbarVisibilityAction extends Action {
 }
 
 const registry = Registry.as<IWorkbenchActionRegistry>(Extensions.WorkbenchActions);
-registry.registerWorkbenchAction(new SyncActionDescriptor(ToggleStatusbarVisibilityAction, ToggleStatusbarVisibilityAction.ID, ToggleStatusbarVisibilityAction.LABEL), 'View: Toggle Status Bar Visibility', nls.localize('view', "View"));
\ No newline at end of file
+registry.registerWorkbenchAction(new SyncActionDescriptor(ToggleStatusbarVisibilityAction, ToggleStatusbarVisibilityAction.ID, ToggleStatusbarVisibilityAction.LABEL), 'View: Toggle Status Bar Visibility', nls.localize('view', "View"));
+
+MenuRegistry.appendMenuItem(MenuId.MenubarAppearanceMenu, {
+	group: '2_workbench_layout',
+	command: {
+		id: ToggleStatusbarVisibilityAction.ID,
+		title: nls.localize({ key: 'miToggleStatusbar', comment: ['&& denotes a mnemonic'] }, "&&Toggle Status Bar")
+	},
+	order: 3
+});
diff --git a/src/vs/workbench/browser/actions/toggleTabsVisibility.ts b/src/vs/workbench/browser/actions/toggleTabsVisibility.ts
index 9bf5df9e7a3..ebfb647ffab 100644
--- a/src/vs/workbench/browser/actions/toggleTabsVisibility.ts
+++ b/src/vs/workbench/browser/actions/toggleTabsVisibility.ts
@@ -15,8 +15,8 @@ import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
 
 export class ToggleTabsVisibilityAction extends Action {
 
-	public static readonly ID = 'workbench.action.toggleTabsVisibility';
-	public static readonly LABEL = nls.localize('toggleTabs', "Toggle Tab Visibility");
+	static readonly ID = 'workbench.action.toggleTabsVisibility';
+	static readonly LABEL = nls.localize('toggleTabs', "Toggle Tab Visibility");
 
 	private static readonly tabsVisibleKey = 'workbench.editor.showTabs';
 
@@ -28,7 +28,7 @@ export class ToggleTabsVisibilityAction extends Action {
 		super(id, label);
 	}
 
-	public run(): TPromise<any> {
+	run(): TPromise<any> {
 		const visibility = this.configurationService.getValue<string>(ToggleTabsVisibilityAction.tabsVisibleKey);
 		const newVisibilityValue = !visibility;
 
diff --git a/src/vs/workbench/browser/actions/toggleZenMode.ts b/src/vs/workbench/browser/actions/toggleZenMode.ts
index 3d58623c10c..a13035026da 100644
--- a/src/vs/workbench/browser/actions/toggleZenMode.ts
+++ b/src/vs/workbench/browser/actions/toggleZenMode.ts
@@ -8,14 +8,14 @@ import * as nls from 'vs/nls';
 import { Action } from 'vs/base/common/actions';
 import { KeyCode, KeyMod, KeyChord } from 'vs/base/common/keyCodes';
 import { Registry } from 'vs/platform/registry/common/platform';
-import { SyncActionDescriptor } from 'vs/platform/actions/common/actions';
+import { SyncActionDescriptor, MenuRegistry, MenuId } from 'vs/platform/actions/common/actions';
 import { IWorkbenchActionRegistry, Extensions } from 'vs/workbench/common/actions';
 import { IPartService } from 'vs/workbench/services/part/common/partService';
 
 class ToggleZenMode extends Action {
 
-	public static readonly ID = 'workbench.action.toggleZenMode';
-	public static readonly LABEL = nls.localize('toggleZenMode', "Toggle Zen Mode");
+	static readonly ID = 'workbench.action.toggleZenMode';
+	static readonly LABEL = nls.localize('toggleZenMode', "Toggle Zen Mode");
 
 	constructor(
 		id: string,
@@ -26,11 +26,20 @@ class ToggleZenMode extends Action {
 		this.enabled = !!this.partService;
 	}
 
-	public run(): TPromise<any> {
+	run(): TPromise<any> {
 		this.partService.toggleZenMode();
 		return TPromise.as(null);
 	}
 }
 
 const registry = Registry.as<IWorkbenchActionRegistry>(Extensions.WorkbenchActions);
-registry.registerWorkbenchAction(new SyncActionDescriptor(ToggleZenMode, ToggleZenMode.ID, ToggleZenMode.LABEL, { primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_K, KeyCode.KEY_Z) }), 'View: Toggle Zen Mode', nls.localize('view', "View"));
\ No newline at end of file
+registry.registerWorkbenchAction(new SyncActionDescriptor(ToggleZenMode, ToggleZenMode.ID, ToggleZenMode.LABEL, { primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_K, KeyCode.KEY_Z) }), 'View: Toggle Zen Mode', nls.localize('view', "View"));
+
+MenuRegistry.appendMenuItem(MenuId.MenubarAppearanceMenu, {
+	group: '1_toggle_view',
+	command: {
+		id: ToggleZenMode.ID,
+		title: nls.localize('miToggleZenMode', "Toggle Zen Mode")
+	},
+	order: 2
+});
diff --git a/src/vs/workbench/browser/actions/workspaceActions.ts b/src/vs/workbench/browser/actions/workspaceActions.ts
index a916997520c..b7b97385cda 100644
--- a/src/vs/workbench/browser/actions/workspaceActions.ts
+++ b/src/vs/workbench/browser/actions/workspaceActions.ts
@@ -19,6 +19,8 @@ import { IEditorService } from 'vs/workbench/services/editor/common/editorServic
 import { ICommandService } from 'vs/platform/commands/common/commands';
 import { IHistoryService } from 'vs/workbench/services/history/common/history';
 import { ADD_ROOT_FOLDER_COMMAND_ID, ADD_ROOT_FOLDER_LABEL, PICK_WORKSPACE_FOLDER_COMMAND_ID, defaultWorkspacePath, defaultFilePath, defaultFolderPath } from 'vs/workbench/browser/actions/workspaceCommands';
+import { URI } from 'vs/base/common/uri';
+import { Schemas } from 'vs/base/common/network';
 
 export class OpenFileAction extends Action {
 
@@ -36,7 +38,8 @@ export class OpenFileAction extends Action {
 	}
 
 	run(event?: any, data?: ITelemetryData): TPromise<any> {
-		return this.windowService.pickFileAndOpen({ telemetryExtraData: data, dialogOptions: { defaultPath: defaultFilePath(this.contextService, this.historyService) } });
+		const defaultPathURI = defaultFilePath(this.contextService, this.historyService, Schemas.file);
+		return this.windowService.pickFileAndOpen({ telemetryExtraData: data, dialogOptions: { defaultPath: defaultPathURI && defaultPathURI.fsPath } });
 	}
 }
 
@@ -56,7 +59,8 @@ export class OpenFolderAction extends Action {
 	}
 
 	run(event?: any, data?: ITelemetryData): TPromise<any> {
-		return this.windowService.pickFolderAndOpen({ telemetryExtraData: data, dialogOptions: { defaultPath: defaultFolderPath(this.contextService, this.historyService) } });
+		const defaultPathURI = defaultFolderPath(this.contextService, this.historyService, Schemas.file);
+		return this.windowService.pickFolderAndOpen({ telemetryExtraData: data, dialogOptions: { defaultPath: defaultPathURI && defaultPathURI.fsPath } });
 	}
 }
 
@@ -76,7 +80,8 @@ export class OpenFileFolderAction extends Action {
 	}
 
 	run(event?: any, data?: ITelemetryData): TPromise<any> {
-		return this.windowService.pickFileFolderAndOpen({ telemetryExtraData: data, dialogOptions: { defaultPath: defaultFilePath(this.contextService, this.historyService) } });
+		const defaultPathURI = defaultFilePath(this.contextService, this.historyService, Schemas.file);
+		return this.windowService.pickFileFolderAndOpen({ telemetryExtraData: data, dialogOptions: { defaultPath: defaultPathURI && defaultPathURI.fsPath } });
 	}
 }
 
@@ -93,7 +98,7 @@ export class AddRootFolderAction extends Action {
 		super(id, label);
 	}
 
-	public run(): TPromise<any> {
+	run(): TPromise<any> {
 		return this.commandService.executeCommand(ADD_ROOT_FOLDER_COMMAND_ID);
 	}
 }
@@ -113,7 +118,7 @@ export class GlobalRemoveRootFolderAction extends Action {
 		super(id, label);
 	}
 
-	public run(): TPromise<any> {
+	run(): TPromise<any> {
 		const state = this.contextService.getWorkbenchState();
 
 		// Workspace / Folder
@@ -148,7 +153,7 @@ export class SaveWorkspaceAsAction extends Action {
 		super(id, label);
 	}
 
-	public run(): TPromise<any> {
+	run(): TPromise<any> {
 		return this.getNewWorkspaceConfigPath().then(configPath => {
 			if (configPath) {
 				switch (this.contextService.getWorkbenchState()) {
@@ -167,11 +172,12 @@ export class SaveWorkspaceAsAction extends Action {
 	}
 
 	private getNewWorkspaceConfigPath(): TPromise<string> {
+		const defaultPathURI = defaultWorkspacePath(this.contextService, this.historyService, this.environmentService, Schemas.file);
 		return this.windowService.showSaveDialog({
 			buttonLabel: mnemonicButtonLabel(nls.localize({ key: 'save', comment: ['&& denotes a mnemonic'] }, "&&Save")),
 			title: nls.localize('saveWorkspace', "Save Workspace"),
 			filters: WORKSPACE_FILTER,
-			defaultPath: defaultWorkspacePath(this.contextService, this.historyService, this.environmentService)
+			defaultPath: defaultPathURI && defaultPathURI.fsPath
 		});
 	}
 }
@@ -192,15 +198,16 @@ export class OpenWorkspaceAction extends Action {
 		super(id, label);
 	}
 
-	public run(event?: any, data?: ITelemetryData): TPromise<any> {
-		return this.windowService.pickWorkspaceAndOpen({ telemetryExtraData: data, dialogOptions: { defaultPath: defaultWorkspacePath(this.contextService, this.historyService, this.environmentService) } });
+	run(event?: any, data?: ITelemetryData): TPromise<any> {
+		const defaultPathURI = defaultWorkspacePath(this.contextService, this.historyService, this.environmentService, Schemas.file);
+		return this.windowService.pickWorkspaceAndOpen({ telemetryExtraData: data, dialogOptions: { defaultPath: defaultPathURI && defaultPathURI.fsPath } });
 	}
 }
 
 export class OpenWorkspaceConfigFileAction extends Action {
 
-	public static readonly ID = 'workbench.action.openWorkspaceConfigFile';
-	public static readonly LABEL = nls.localize('openWorkspaceConfigFile', "Open Workspace Configuration File");
+	static readonly ID = 'workbench.action.openWorkspaceConfigFile';
+	static readonly LABEL = nls.localize('openWorkspaceConfigFile', "Open Workspace Configuration File");
 
 	constructor(
 		id: string,
@@ -213,15 +220,15 @@ export class OpenWorkspaceConfigFileAction extends Action {
 		this.enabled = !!this.workspaceContextService.getWorkspace().configuration;
 	}
 
-	public run(): TPromise<any> {
+	run(): TPromise<any> {
 		return this.editorService.openEditor({ resource: this.workspaceContextService.getWorkspace().configuration });
 	}
 }
 
 export class DuplicateWorkspaceInNewWindowAction extends Action {
 
-	public static readonly ID = 'workbench.action.duplicateWorkspaceInNewWindow';
-	public static readonly LABEL = nls.localize('duplicateWorkspaceInNewWindow', "Duplicate Workspace in New Window");
+	static readonly ID = 'workbench.action.duplicateWorkspaceInNewWindow';
+	static readonly LABEL = nls.localize('duplicateWorkspaceInNewWindow', "Duplicate Workspace in New Window");
 
 	constructor(
 		id: string,
@@ -234,12 +241,12 @@ export class DuplicateWorkspaceInNewWindowAction extends Action {
 		super(id, label);
 	}
 
-	public run(): TPromise<any> {
+	run(): TPromise<any> {
 		const folders = this.workspaceContextService.getWorkspace().folders;
 
 		return this.workspacesService.createWorkspace(folders).then(newWorkspace => {
 			return this.workspaceEditingService.copyWorkspaceSettings(newWorkspace).then(() => {
-				return this.windowService.openWindow([newWorkspace.configPath], { forceNewWindow: true });
+				return this.windowService.openWindow([URI.file(newWorkspace.configPath)], { forceNewWindow: true });
 			});
 		});
 	}
diff --git a/src/vs/workbench/browser/actions/workspaceCommands.ts b/src/vs/workbench/browser/actions/workspaceCommands.ts
index d598e0b465c..27cdd158e37 100644
--- a/src/vs/workbench/browser/actions/workspaceCommands.ts
+++ b/src/vs/workbench/browser/actions/workspaceCommands.ts
@@ -10,19 +10,23 @@ import * as nls from 'vs/nls';
 import { IWindowService } from 'vs/platform/windows/common/windows';
 import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
 import { IWorkspaceEditingService } from 'vs/workbench/services/workspace/common/workspaceEditing';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import * as resources from 'vs/base/common/resources';
 import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet';
-import { dirname } from 'vs/base/common/paths';
-import { IQuickOpenService, IFilePickOpenEntry, IPickOptions } from 'vs/platform/quickOpen/common/quickOpen';
 import { CancellationToken } from 'vs/base/common/cancellation';
-import { mnemonicButtonLabel, getPathLabel } from 'vs/base/common/labels';
+import { mnemonicButtonLabel } from 'vs/base/common/labels';
 import { CommandsRegistry } from 'vs/platform/commands/common/commands';
 import { IHistoryService } from 'vs/workbench/services/history/common/history';
 import { FileKind, isParent } from 'vs/platform/files/common/files';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
 import { isLinux } from 'vs/base/common/platform';
+import { ILabelService } from 'vs/platform/label/common/label';
+import { IQuickInputService, IPickOptions, IQuickPickItem } from 'vs/platform/quickinput/common/quickInput';
+import { getIconClasses } from 'vs/workbench/browser/labels';
+import { IModelService } from 'vs/editor/common/services/modelService';
+import { IModeService } from 'vs/editor/common/services/modeService';
+import { Schemas } from 'vs/base/common/network';
 
 export const ADD_ROOT_FOLDER_COMMAND_ID = 'addRootFolder';
 export const ADD_ROOT_FOLDER_LABEL = nls.localize('addFolderToWorkspace', "Add Folder to Workspace...");
@@ -30,26 +34,27 @@ export const ADD_ROOT_FOLDER_LABEL = nls.localize('addFolderToWorkspace', "Add F
 export const PICK_WORKSPACE_FOLDER_COMMAND_ID = '_workbench.pickWorkspaceFolder';
 
 function pickFolders(buttonLabel: string, title: string, windowService: IWindowService, contextService: IWorkspaceContextService, historyService: IHistoryService): TPromise<string[]> {
+	const defaultPathURI = defaultFolderPath(contextService, historyService, Schemas.file);
 	return windowService.showOpenDialog({
 		buttonLabel,
 		title,
 		properties: ['multiSelections', 'openDirectory', 'createDirectory'],
-		defaultPath: defaultFolderPath(contextService, historyService)
+		defaultPath: defaultPathURI && defaultPathURI.fsPath
 	});
 }
 
-export function defaultFolderPath(contextService: IWorkspaceContextService, historyService: IHistoryService): string {
+export function defaultFolderPath(contextService: IWorkspaceContextService, historyService: IHistoryService, schemeFilter: string): URI {
 	let candidate: URI;
 
 	// Check for last active file root first...
-	candidate = historyService.getLastActiveWorkspaceRoot('file');
+	candidate = historyService.getLastActiveWorkspaceRoot(schemeFilter);
 
 	// ...then for last active file
 	if (!candidate) {
-		candidate = historyService.getLastActiveFile();
+		candidate = historyService.getLastActiveFile(schemeFilter);
 	}
 
-	return candidate ? dirname(candidate.fsPath) : void 0;
+	return candidate ? resources.dirname(candidate) : void 0;
 }
 
 
@@ -62,29 +67,29 @@ function services(accessor: ServicesAccessor): { windowService: IWindowService,
 	};
 }
 
-export function defaultFilePath(contextService: IWorkspaceContextService, historyService: IHistoryService): string {
+export function defaultFilePath(contextService: IWorkspaceContextService, historyService: IHistoryService, schemeFilter: string): URI {
 	let candidate: URI;
 
 	// Check for last active file first...
-	candidate = historyService.getLastActiveFile();
+	candidate = historyService.getLastActiveFile(schemeFilter);
 
 	// ...then for last active file root
 	if (!candidate) {
-		candidate = historyService.getLastActiveWorkspaceRoot('file');
+		candidate = historyService.getLastActiveWorkspaceRoot(schemeFilter);
 	}
 
-	return candidate ? dirname(candidate.fsPath) : void 0;
+	return candidate ? resources.dirname(candidate) : void 0;
 }
 
-export function defaultWorkspacePath(contextService: IWorkspaceContextService, historyService: IHistoryService, environmentService: IEnvironmentService): string {
+export function defaultWorkspacePath(contextService: IWorkspaceContextService, historyService: IHistoryService, environmentService: IEnvironmentService, schemeFilter: string): URI {
 
 	// Check for current workspace config file first...
-	if (contextService.getWorkbenchState() === WorkbenchState.WORKSPACE && !isUntitledWorkspace(contextService.getWorkspace().configuration.fsPath, environmentService)) {
-		return dirname(contextService.getWorkspace().configuration.fsPath);
+	if (schemeFilter === Schemas.file && contextService.getWorkbenchState() === WorkbenchState.WORKSPACE && !isUntitledWorkspace(contextService.getWorkspace().configuration.fsPath, environmentService)) {
+		return resources.dirname(contextService.getWorkspace().configuration);
 	}
 
 	// ...then fallback to default folder path
-	return defaultFolderPath(contextService, historyService);
+	return defaultFolderPath(contextService, historyService, schemeFilter);
 }
 
 function isUntitledWorkspace(path: string, environmentService: IEnvironmentService): boolean {
@@ -97,8 +102,8 @@ CommandsRegistry.registerCommand({
 	id: 'workbench.action.files.openFileFolderInNewWindow',
 	handler: (accessor: ServicesAccessor) => {
 		const { windowService, historyService, contextService } = services(accessor);
-
-		windowService.pickFileFolderAndOpen({ forceNewWindow: true, dialogOptions: { defaultPath: defaultFilePath(contextService, historyService) } });
+		const defaultPathURI = defaultFilePath(contextService, historyService, Schemas.file);
+		windowService.pickFileFolderAndOpen({ forceNewWindow: true, dialogOptions: { defaultPath: defaultPathURI && defaultPathURI.fsPath } });
 	}
 });
 
@@ -106,8 +111,8 @@ CommandsRegistry.registerCommand({
 	id: '_files.pickFolderAndOpen',
 	handler: (accessor: ServicesAccessor, forceNewWindow: boolean) => {
 		const { windowService, historyService, contextService } = services(accessor);
-
-		windowService.pickFolderAndOpen({ forceNewWindow, dialogOptions: { defaultPath: defaultFolderPath(contextService, historyService) } });
+		const defaultPathURI = defaultFolderPath(contextService, historyService, Schemas.file);
+		windowService.pickFolderAndOpen({ forceNewWindow, dialogOptions: { defaultPath: defaultPathURI && defaultPathURI.fsPath } });
 	}
 });
 
@@ -115,8 +120,8 @@ CommandsRegistry.registerCommand({
 	id: 'workbench.action.files.openFolderInNewWindow',
 	handler: (accessor: ServicesAccessor) => {
 		const { windowService, historyService, contextService } = services(accessor);
-
-		windowService.pickFolderAndOpen({ forceNewWindow: true, dialogOptions: { defaultPath: defaultFolderPath(contextService, historyService) } });
+		const defaultPathURI = defaultFolderPath(contextService, historyService, Schemas.file);
+		windowService.pickFolderAndOpen({ forceNewWindow: true, dialogOptions: { defaultPath: defaultPathURI && defaultPathURI.fsPath } });
 	}
 });
 
@@ -124,8 +129,8 @@ CommandsRegistry.registerCommand({
 	id: 'workbench.action.files.openFileInNewWindow',
 	handler: (accessor: ServicesAccessor) => {
 		const { windowService, historyService, contextService } = services(accessor);
-
-		windowService.pickFileAndOpen({ forceNewWindow: true, dialogOptions: { defaultPath: defaultFilePath(contextService, historyService) } });
+		const defaultPathURI = defaultFilePath(contextService, historyService, Schemas.file);
+		windowService.pickFileAndOpen({ forceNewWindow: true, dialogOptions: { defaultPath: defaultPathURI && defaultPathURI.fsPath } });
 	}
 });
 
@@ -133,8 +138,8 @@ CommandsRegistry.registerCommand({
 	id: 'workbench.action.openWorkspaceInNewWindow',
 	handler: (accessor: ServicesAccessor) => {
 		const { windowService, historyService, contextService, environmentService } = services(accessor);
-
-		windowService.pickWorkspaceAndOpen({ forceNewWindow: true, dialogOptions: { defaultPath: defaultWorkspacePath(contextService, historyService, environmentService) } });
+		const defaultPathURI = defaultWorkspacePath(contextService, historyService, environmentService, Schemas.file);
+		windowService.pickWorkspaceAndOpen({ forceNewWindow: true, dialogOptions: { defaultPath: defaultPathURI && defaultPathURI.fsPath } });
 	}
 });
 
@@ -157,10 +162,12 @@ CommandsRegistry.registerCommand({
 	}
 });
 
-CommandsRegistry.registerCommand(PICK_WORKSPACE_FOLDER_COMMAND_ID, function (accessor, args?: [IPickOptions, CancellationToken]) {
+CommandsRegistry.registerCommand(PICK_WORKSPACE_FOLDER_COMMAND_ID, function (accessor, args?: [IPickOptions<IQuickPickItem>, CancellationToken]) {
+	const quickInputService = accessor.get(IQuickInputService);
+	const labelService = accessor.get(ILabelService);
 	const contextService = accessor.get(IWorkspaceContextService);
-	const quickOpenService = accessor.get(IQuickOpenService);
-	const environmentService = accessor.get(IEnvironmentService);
+	const modelService = accessor.get(IModelService);
+	const modeService = accessor.get(IModeService);
 
 	const folders = contextService.getWorkspace().folders;
 	if (!folders.length) {
@@ -170,14 +177,13 @@ CommandsRegistry.registerCommand(PICK_WORKSPACE_FOLDER_COMMAND_ID, function (acc
 	const folderPicks = folders.map(folder => {
 		return {
 			label: folder.name,
-			description: getPathLabel(resources.dirname(folder.uri), void 0, environmentService),
+			description: labelService.getUriLabel(resources.dirname(folder.uri), true),
 			folder,
-			resource: folder.uri,
-			fileKind: FileKind.ROOT_FOLDER
-		} as IFilePickOpenEntry;
+			iconClasses: getIconClasses(modelService, modeService, folder.uri, FileKind.ROOT_FOLDER)
+		} as IQuickPickItem;
 	});
 
-	let options: IPickOptions;
+	let options: IPickOptions<IQuickPickItem>;
 	if (args) {
 		options = args[0];
 	}
@@ -186,8 +192,8 @@ CommandsRegistry.registerCommand(PICK_WORKSPACE_FOLDER_COMMAND_ID, function (acc
 		options = Object.create(null);
 	}
 
-	if (!options.autoFocus) {
-		options.autoFocus = { autoFocusFirstEntry: true };
+	if (!options.activeItem) {
+		options.activeItem = folderPicks[0];
 	}
 
 	if (!options.placeHolder) {
@@ -207,7 +213,7 @@ CommandsRegistry.registerCommand(PICK_WORKSPACE_FOLDER_COMMAND_ID, function (acc
 		token = CancellationToken.None;
 	}
 
-	return quickOpenService.pick(folderPicks, options, token).then(pick => {
+	return quickInputService.pick(folderPicks, options, token).then(pick => {
 		if (!pick) {
 			return void 0;
 		}
diff --git a/src/vs/workbench/browser/composite.ts b/src/vs/workbench/browser/composite.ts
index 006fcc3c3a5..1287623d743 100644
--- a/src/vs/workbench/browser/composite.ts
+++ b/src/vs/workbench/browser/composite.ts
@@ -12,8 +12,7 @@ import { IComposite, ICompositeControl } from 'vs/workbench/common/composite';
 import { Event, Emitter } from 'vs/base/common/event';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { IConstructorSignature0, IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { IFocusTracker, trackFocus, Dimension } from 'vs/base/browser/dom';
+import { trackFocus, Dimension } from 'vs/base/browser/dom';
 
 /**
  * Composites are layed out in the sidebar and panel part of the workbench. At a time only one composite
@@ -26,17 +25,27 @@ import { IFocusTracker, trackFocus, Dimension } from 'vs/base/browser/dom';
  * layout and focus call, but only one create and dispose call.
  */
 export abstract class Composite extends Component implements IComposite {
-	private readonly _onTitleAreaUpdate: Emitter<void>;
-	private readonly _onDidFocus: Emitter<void>;
 
-	private _focusTracker?: IFocusTracker;
-	private _focusListenerDisposable?: IDisposable;
+	private readonly _onTitleAreaUpdate: Emitter<void> = this._register(new Emitter<void>());
+	get onTitleAreaUpdate(): Event<void> { return this._onTitleAreaUpdate.event; }
+
+	private _onDidFocus: Emitter<void>;
+	get onDidFocus(): Event<void> {
+		if (!this._onDidFocus) {
+			this._onDidFocus = this._register(new Emitter<void>());
+
+			const focusTracker = this._register(trackFocus(this.getContainer()));
+			this._register(focusTracker.onDidFocus(() => this._onDidFocus.fire()));
+		}
+
+		return this._onDidFocus.event;
+	}
+
+	protected actionRunner: IActionRunner;
 
 	private visible: boolean;
 	private parent: HTMLElement;
 
-	protected actionRunner: IActionRunner;
-
 	/**
 	 * Create a new composite with the given ID and context.
 	 */
@@ -48,11 +57,9 @@ export abstract class Composite extends Component implements IComposite {
 		super(id, themeService);
 
 		this.visible = false;
-		this._onTitleAreaUpdate = new Emitter<void>();
-		this._onDidFocus = new Emitter<void>();
 	}
 
-	public getTitle(): string {
+	getTitle(): string {
 		return null;
 	}
 
@@ -60,44 +67,32 @@ export abstract class Composite extends Component implements IComposite {
 		return this._telemetryService;
 	}
 
-	public get onTitleAreaUpdate(): Event<void> {
-		return this._onTitleAreaUpdate.event;
-	}
-
 	/**
 	 * Note: Clients should not call this method, the workbench calls this
 	 * method. Calling it otherwise may result in unexpected behavior.
 	 *
-	 * Called to create this composite on the provided builder. This method is only
+	 * Called to create this composite on the provided parent. This method is only
 	 * called once during the lifetime of the workbench.
 	 * Note that DOM-dependent calculations should be performed from the setVisible()
 	 * call. Only then the composite will be part of the DOM.
 	 */
-	public create(parent: HTMLElement): TPromise<void> {
+	create(parent: HTMLElement): TPromise<void> {
 		this.parent = parent;
 
 		return TPromise.as(null);
 	}
 
-	public updateStyles(): void {
+	updateStyles(): void {
 		super.updateStyles();
 	}
 
 	/**
 	 * Returns the container this composite is being build in.
 	 */
-	public getContainer(): HTMLElement {
+	getContainer(): HTMLElement {
 		return this.parent;
 	}
 
-	public get onDidFocus(): Event<any> {
-		this._focusTracker = trackFocus(this.getContainer());
-		this._focusListenerDisposable = this._focusTracker.onDidFocus(() => {
-			this._onDidFocus.fire();
-		});
-		return this._onDidFocus.event;
-	}
-
 	/**
 	 * Note: Clients should not call this method, the workbench calls this
 	 * method. Calling it otherwise may result in unexpected behavior.
@@ -110,7 +105,7 @@ export abstract class Composite extends Component implements IComposite {
 	 * to do a long running operation from this call. Typically this operation should be
 	 * fast though because setVisible might be called many times during a session.
 	 */
-	public setVisible(visible: boolean): TPromise<void> {
+	setVisible(visible: boolean): TPromise<void> {
 		this.visible = visible;
 
 		return TPromise.as(null);
@@ -119,19 +114,19 @@ export abstract class Composite extends Component implements IComposite {
 	/**
 	 * Called when this composite should receive keyboard focus.
 	 */
-	public focus(): void {
+	focus(): void {
 		// Subclasses can implement
 	}
 
 	/**
 	 * Layout the contents of this composite using the provided dimensions.
 	 */
-	public abstract layout(dimension: Dimension): void;
+	abstract layout(dimension: Dimension): void;
 
 	/**
 	 * Returns an array of actions to show in the action bar of the composite.
 	 */
-	public getActions(): IAction[] {
+	getActions(): IAction[] {
 		return [];
 	}
 
@@ -139,14 +134,14 @@ export abstract class Composite extends Component implements IComposite {
 	 * Returns an array of actions to show in the action bar of the composite
 	 * in a less prominent way then action from getActions.
 	 */
-	public getSecondaryActions(): IAction[] {
+	getSecondaryActions(): IAction[] {
 		return [];
 	}
 
 	/**
 	 * Returns an array of actions to show in the context menu of the composite
 	 */
-	public getContextMenuActions(): IAction[] {
+	getContextMenuActions(): IAction[] {
 		return [];
 	}
 
@@ -156,7 +151,7 @@ export abstract class Composite extends Component implements IComposite {
 	 * of an action. Returns null to indicate that the action is not rendered through
 	 * an action item.
 	 */
-	public getActionItem(action: IAction): IActionItem {
+	getActionItem(action: IAction): IActionItem {
 		return null;
 	}
 
@@ -164,7 +159,7 @@ export abstract class Composite extends Component implements IComposite {
 	 * Returns the instance of IActionRunner to use with this composite for the
 	 * composite tool bar.
 	 */
-	public getActionRunner(): IActionRunner {
+	getActionRunner(): IActionRunner {
 		if (!this.actionRunner) {
 			this.actionRunner = new ActionRunner();
 		}
@@ -185,43 +180,28 @@ export abstract class Composite extends Component implements IComposite {
 	/**
 	 * Returns true if this composite is currently visible and false otherwise.
 	 */
-	public isVisible(): boolean {
+	isVisible(): boolean {
 		return this.visible;
 	}
 
 	/**
 	 * Returns the underlying composite control or null if it is not accessible.
 	 */
-	public getControl(): ICompositeControl {
+	getControl(): ICompositeControl {
 		return null;
 	}
-
-	public dispose(): void {
-		this._onTitleAreaUpdate.dispose();
-		this._onDidFocus.dispose();
-
-		if (this._focusTracker) {
-			this._focusTracker.dispose();
-		}
-
-		if (this._focusListenerDisposable) {
-			this._focusListenerDisposable.dispose();
-		}
-
-		super.dispose();
-	}
 }
 
 /**
  * A composite descriptor is a leightweight descriptor of a composite in the workbench.
  */
 export abstract class CompositeDescriptor<T extends Composite> {
-	public id: string;
-	public name: string;
-	public cssClass: string;
-	public order: number;
-	public keybindingId: string;
-	public enabled: boolean;
+	id: string;
+	name: string;
+	cssClass: string;
+	order: number;
+	keybindingId: string;
+	enabled: boolean;
 
 	private ctor: IConstructorSignature0<T>;
 
@@ -235,7 +215,7 @@ export abstract class CompositeDescriptor<T extends Composite> {
 		this.keybindingId = keybindingId;
 	}
 
-	public instantiate(instantiationService: IInstantiationService): T {
+	instantiate(instantiationService: IInstantiationService): T {
 		return instantiationService.createInstance(this.ctor);
 	}
 }
@@ -243,13 +223,9 @@ export abstract class CompositeDescriptor<T extends Composite> {
 export abstract class CompositeRegistry<T extends Composite> {
 
 	private readonly _onDidRegister: Emitter<CompositeDescriptor<T>> = new Emitter<CompositeDescriptor<T>>();
-	readonly onDidRegister: Event<CompositeDescriptor<T>> = this._onDidRegister.event;
+	get onDidRegister(): Event<CompositeDescriptor<T>> { return this._onDidRegister.event; }
 
-	private composites: CompositeDescriptor<T>[];
-
-	constructor() {
-		this.composites = [];
-	}
+	private composites: CompositeDescriptor<T>[] = [];
 
 	protected registerComposite(descriptor: CompositeDescriptor<T>): void {
 		if (this.compositeById(descriptor.id) !== null) {
@@ -260,7 +236,7 @@ export abstract class CompositeRegistry<T extends Composite> {
 		this._onDidRegister.fire(descriptor);
 	}
 
-	public getComposite(id: string): CompositeDescriptor<T> {
+	getComposite(id: string): CompositeDescriptor<T> {
 		return this.compositeById(id);
 	}
 
diff --git a/src/vs/workbench/browser/dnd.ts b/src/vs/workbench/browser/dnd.ts
index aff0742f1ce..94b601a5154 100644
--- a/src/vs/workbench/browser/dnd.ts
+++ b/src/vs/workbench/browser/dnd.ts
@@ -6,23 +6,22 @@
 'use strict';
 
 import { WORKSPACE_EXTENSION, IWorkspacesService } from 'vs/platform/workspaces/common/workspaces';
-import { extname, basename } from 'vs/base/common/paths';
+import { extname, basename, normalize } from 'vs/base/common/paths';
 import { IFileService } from 'vs/platform/files/common/files';
 import { IWindowsService, IWindowService } from 'vs/platform/windows/common/windows';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
 import { IBackupFileService } from 'vs/workbench/services/backup/common/backup';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { Schemas } from 'vs/base/common/network';
 import { IUntitledEditorService } from 'vs/workbench/services/untitled/common/untitledEditorService';
-import { onUnexpectedError } from 'vs/base/common/errors';
 import { DefaultEndOfLine } from 'vs/editor/common/model';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IEditorViewState } from 'vs/editor/common/editorCommon';
 import { DataTransfers } from 'vs/base/browser/dnd';
 import { DefaultDragAndDrop } from 'vs/base/parts/tree/browser/treeDefaults';
 import { DragMouseEvent } from 'vs/base/browser/mouseEvent';
-import { getPathLabel } from 'vs/base/common/labels';
+import { normalizeDriveLetter } from 'vs/base/common/labels';
 import { MIME_BINARY } from 'vs/base/common/mime';
 import { ITree, IDragAndDropData } from 'vs/base/parts/tree/browser/tree';
 import { isWindows } from 'vs/base/common/platform';
@@ -176,7 +175,7 @@ export class ResourcesDropHandler {
 		}
 
 		// Make the window active to handle the drop properly within
-		return this.windowService.focusWindow().then(() => {
+		this.windowService.focusWindow().then(() => {
 
 			// Check for special things being dropped
 			return this.doHandleDrop(untitledOrFileResources).then(isWorkspaceOpening => {
@@ -187,7 +186,7 @@ export class ResourcesDropHandler {
 				// Add external ones to recently open list unless dropped resource is a workspace
 				const filesToAddToHistory = untitledOrFileResources.filter(d => d.isExternal && d.resource.scheme === Schemas.file).map(d => d.resource);
 				if (filesToAddToHistory.length) {
-					this.windowsService.addRecentlyOpened(filesToAddToHistory.map(resource => resource.fsPath));
+					this.windowsService.addRecentlyOpened(filesToAddToHistory);
 				}
 
 				const editors: IResourceEditor[] = untitledOrFileResources.map(untitledOrFileResource => ({
@@ -207,7 +206,7 @@ export class ResourcesDropHandler {
 					afterDrop(targetGroup);
 				});
 			});
-		}).done(null, onUnexpectedError);
+		});
 	}
 
 	private doHandleDrop(untitledOrFileResources: (IDraggedResource | IDraggedEditor)[]): TPromise<boolean> {
@@ -290,16 +289,16 @@ export class ResourcesDropHandler {
 			// Pass focus to window
 			this.windowService.focusWindow();
 
-			let workspacesToOpen: TPromise<string[]>;
+			let workspacesToOpen: TPromise<URI[]>;
 
 			// Open in separate windows if we drop workspaces or just one folder
 			if (workspaces.length > 0 || folders.length === 1) {
-				workspacesToOpen = TPromise.as([...workspaces, ...folders].map(resources => resources.fsPath));
+				workspacesToOpen = TPromise.as([...workspaces, ...folders].map(resources => resources));
 			}
 
 			// Multiple folders: Create new workspace with folders and open
 			else if (folders.length > 1) {
-				workspacesToOpen = this.workspacesService.createWorkspace(folders.map(folder => ({ uri: folder }))).then(workspace => [workspace.configPath]);
+				workspacesToOpen = this.workspacesService.createWorkspace(folders.map(folder => ({ uri: folder }))).then(workspace => [URI.file(workspace.configPath)]);
 			}
 
 			// Open
@@ -370,7 +369,7 @@ export function fillResourceDataTransfers(accessor: ServicesAccessor, resources:
 
 	// Text: allows to paste into text-capable areas
 	const lineDelimiter = isWindows ? '\r\n' : '\n';
-	event.dataTransfer.setData(DataTransfers.TEXT, sources.map(source => source.resource.scheme === Schemas.file ? getPathLabel(source.resource) : source.resource.toString()).join(lineDelimiter));
+	event.dataTransfer.setData(DataTransfers.TEXT, sources.map(source => source.resource.scheme === Schemas.file ? normalize(normalizeDriveLetter(source.resource.fsPath), true) : source.resource.toString()).join(lineDelimiter));
 
 	// Download URL: enables support to drag a tab as file to desktop (only single file supported)
 	if (firstSource.resource.scheme === Schemas.file) {
@@ -517,4 +516,4 @@ export class DragAndDropObserver extends Disposable {
 			this.callbacks.onDrop(e);
 		}));
 	}
-}
\ No newline at end of file
+}
diff --git a/src/vs/workbench/browser/editor.ts b/src/vs/workbench/browser/editor.ts
index 525a263c59f..0b3c009786a 100644
--- a/src/vs/workbench/browser/editor.ts
+++ b/src/vs/workbench/browser/editor.ts
@@ -66,19 +66,19 @@ export class EditorDescriptor implements IEditorDescriptor {
 		this.name = name;
 	}
 
-	public instantiate(instantiationService: IInstantiationService): BaseEditor {
+	instantiate(instantiationService: IInstantiationService): BaseEditor {
 		return instantiationService.createInstance(this.ctor);
 	}
 
-	public getId(): string {
+	getId(): string {
 		return this.id;
 	}
 
-	public getName(): string {
+	getName(): string {
 		return this.name;
 	}
 
-	public describes(obj: any): boolean {
+	describes(obj: any): boolean {
 		return obj instanceof BaseEditor && (<BaseEditor>obj).getId() === this.id;
 	}
 }
@@ -86,15 +86,11 @@ export class EditorDescriptor implements IEditorDescriptor {
 const INPUT_DESCRIPTORS_PROPERTY = '__$inputDescriptors';
 
 class EditorRegistry implements IEditorRegistry {
-	private editors: EditorDescriptor[];
+	private editors: EditorDescriptor[] = [];
 
-	constructor() {
-		this.editors = [];
-	}
-
-	public registerEditor(descriptor: EditorDescriptor, editorInputDescriptor: SyncDescriptor<EditorInput>): void;
-	public registerEditor(descriptor: EditorDescriptor, editorInputDescriptor: SyncDescriptor<EditorInput>[]): void;
-	public registerEditor(descriptor: EditorDescriptor, editorInputDescriptor: any): void {
+	registerEditor(descriptor: EditorDescriptor, editorInputDescriptor: SyncDescriptor<EditorInput>): void;
+	registerEditor(descriptor: EditorDescriptor, editorInputDescriptor: SyncDescriptor<EditorInput>[]): void;
+	registerEditor(descriptor: EditorDescriptor, editorInputDescriptor: any): void {
 
 		// Support both non-array and array parameter
 		let inputDescriptors: SyncDescriptor<EditorInput>[] = [];
@@ -109,7 +105,7 @@ class EditorRegistry implements IEditorRegistry {
 		this.editors.push(descriptor);
 	}
 
-	public getEditor(input: EditorInput): EditorDescriptor {
+	getEditor(input: EditorInput): EditorDescriptor {
 		const findEditorDescriptors = (input: EditorInput, byInstanceOf?: boolean): EditorDescriptor[] => {
 			const matchingDescriptors: EditorDescriptor[] = [];
 
@@ -161,7 +157,7 @@ class EditorRegistry implements IEditorRegistry {
 		return null;
 	}
 
-	public getEditorById(editorId: string): EditorDescriptor {
+	getEditorById(editorId: string): EditorDescriptor {
 		for (let i = 0; i < this.editors.length; i++) {
 			const editor = this.editors[i];
 			if (editor.getId() === editorId) {
@@ -172,15 +168,15 @@ class EditorRegistry implements IEditorRegistry {
 		return null;
 	}
 
-	public getEditors(): EditorDescriptor[] {
+	getEditors(): EditorDescriptor[] {
 		return this.editors.slice(0);
 	}
 
-	public setEditors(editorsToSet: EditorDescriptor[]): void {
+	setEditors(editorsToSet: EditorDescriptor[]): void {
 		this.editors = editorsToSet;
 	}
 
-	public getEditorInputs(): any[] {
+	getEditorInputs(): any[] {
 		const inputClasses: any[] = [];
 		for (let i = 0; i < this.editors.length; i++) {
 			const editor = this.editors[i];
diff --git a/src/vs/workbench/browser/labels.ts b/src/vs/workbench/browser/labels.ts
index 2564f98ca85..e8ecc74e37c 100644
--- a/src/vs/workbench/browser/labels.ts
+++ b/src/vs/workbench/browser/labels.ts
@@ -5,19 +5,16 @@
 
 'use strict';
 
-import uri from 'vs/base/common/uri';
+import { URI as uri } from 'vs/base/common/uri';
 import * as resources from 'vs/base/common/resources';
 import { IconLabel, IIconLabelValueOptions, IIconLabelCreationOptions } from 'vs/base/browser/ui/iconLabel/iconLabel';
 import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
 import { IModeService } from 'vs/editor/common/services/modeService';
 import { toResource, IEditorInput } from 'vs/workbench/common/editor';
-import { getPathLabel, IWorkspaceFolderProvider } from 'vs/base/common/labels';
 import { PLAINTEXT_MODE_ID } from 'vs/editor/common/modes/modesRegistry';
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { IModelService } from 'vs/editor/common/services/modelService';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { IUntitledEditorService } from 'vs/workbench/services/untitled/common/untitledEditorService';
 import { IDecorationsService, IResourceDecorationChangeEvent, IDecorationData } from 'vs/workbench/services/decorations/browser/decorations';
 import { Schemas } from 'vs/base/common/network';
@@ -26,6 +23,7 @@ import { ITextModel } from 'vs/editor/common/model';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { Event, Emitter } from 'vs/base/common/event';
 import { DataUri } from 'vs/workbench/common/resources';
+import { ILabelService } from 'vs/platform/label/common/label';
 
 export interface IResourceLabel {
 	name: string;
@@ -40,51 +38,47 @@ export interface IResourceLabelOptions extends IIconLabelValueOptions {
 
 export class ResourceLabel extends IconLabel {
 
-	private toDispose: IDisposable[];
+	private _onDidRender = this._register(new Emitter<void>());
+	get onDidRender(): Event<void> { return this._onDidRender.event; }
+
 	private label: IResourceLabel;
 	private options: IResourceLabelOptions;
 	private computedIconClasses: string[];
 	private lastKnownConfiguredLangId: string;
 	private computedPathLabel: string;
 
-	private _onDidRender = new Emitter<void>();
-	readonly onDidRender: Event<void> = this._onDidRender.event;
-
 	constructor(
 		container: HTMLElement,
 		options: IIconLabelCreationOptions,
 		@IExtensionService private extensionService: IExtensionService,
-		@IWorkspaceContextService protected contextService: IWorkspaceContextService,
 		@IConfigurationService private configurationService: IConfigurationService,
 		@IModeService private modeService: IModeService,
 		@IModelService private modelService: IModelService,
-		@IEnvironmentService protected environmentService: IEnvironmentService,
 		@IDecorationsService protected decorationsService: IDecorationsService,
-		@IThemeService private themeService: IThemeService
+		@IThemeService private themeService: IThemeService,
+		@ILabelService protected labelService: ILabelService
 	) {
 		super(container, options);
 
-		this.toDispose = [];
-
 		this.registerListeners();
 	}
 
 	private registerListeners(): void {
 
 		// update when extensions are registered with potentially new languages
-		this.toDispose.push(this.extensionService.onDidRegisterExtensions(() => this.render(true /* clear cache */)));
+		this._register(this.extensionService.onDidRegisterExtensions(() => this.render(true /* clear cache */)));
 
 		// react to model mode changes
-		this.toDispose.push(this.modelService.onModelModeChanged(e => this.onModelModeChanged(e)));
+		this._register(this.modelService.onModelModeChanged(e => this.onModelModeChanged(e)));
 
 		// react to file decoration changes
-		this.toDispose.push(this.decorationsService.onDidChangeDecorations(this.onFileDecorationsChanges, this));
+		this._register(this.decorationsService.onDidChangeDecorations(this.onFileDecorationsChanges, this));
 
 		// react to theme changes
-		this.toDispose.push(this.themeService.onThemeChange(() => this.render(false)));
+		this._register(this.themeService.onThemeChange(() => this.render(false)));
 
 		// react to files.associations changes
-		this.toDispose.push(this.configurationService.onDidChangeConfiguration(e => {
+		this._register(this.configurationService.onDidChangeConfiguration(e => {
 			if (e.affectsConfiguration(FILES_ASSOCIATIONS_CONFIG)) {
 				this.render(true /* clear cache */);
 			}
@@ -121,7 +115,7 @@ export class ResourceLabel extends IconLabel {
 		}
 	}
 
-	public setLabel(label: IResourceLabel, options?: IResourceLabelOptions): void {
+	setLabel(label: IResourceLabel, options?: IResourceLabelOptions): void {
 		const hasResourceChanged = this.hasResourceChanged(label, options);
 
 		this.label = label;
@@ -145,6 +139,10 @@ export class ResourceLabel extends IconLabel {
 			return true; // same resource but different kind (file, folder)
 		}
 
+		if (newResource && this.computedPathLabel !== this.labelService.getUriLabel(newResource)) {
+			return true;
+		}
+
 		if (newResource && oldResource) {
 			return newResource.toString() !== oldResource.toString();
 		}
@@ -156,7 +154,7 @@ export class ResourceLabel extends IconLabel {
 		return true;
 	}
 
-	public clear(): void {
+	clear(): void {
 		this.label = void 0;
 		this.options = void 0;
 		this.lastKnownConfiguredLangId = void 0;
@@ -187,6 +185,7 @@ export class ResourceLabel extends IconLabel {
 			title: '',
 			italic: this.options && this.options.italic,
 			matches: this.options && this.options.matches,
+			extraClasses: []
 		};
 
 		const resource = this.label.resource;
@@ -196,17 +195,18 @@ export class ResourceLabel extends IconLabel {
 			iconLabelOptions.title = this.options.title;
 		} else if (resource && resource.scheme !== Schemas.data /* do not accidentally inline Data URIs */) {
 			if (!this.computedPathLabel) {
-				this.computedPathLabel = getPathLabel(resource, void 0, this.environmentService);
+				this.computedPathLabel = this.labelService.getUriLabel(resource);
 			}
 
 			iconLabelOptions.title = this.computedPathLabel;
 		}
 
-		if (!this.computedIconClasses) {
-			this.computedIconClasses = getIconClasses(this.modelService, this.modeService, resource, this.options && this.options.fileKind);
+		if (this.options && !this.options.hideIcon) {
+			if (!this.computedIconClasses) {
+				this.computedIconClasses = getIconClasses(this.modelService, this.modeService, resource, this.options && this.options.fileKind);
+			}
+			iconLabelOptions.extraClasses = this.computedIconClasses.slice(0);
 		}
-
-		iconLabelOptions.extraClasses = this.computedIconClasses.slice(0);
 		if (this.options && this.options.extraClasses) {
 			iconLabelOptions.extraClasses.push(...this.options.extraClasses);
 		}
@@ -238,10 +238,9 @@ export class ResourceLabel extends IconLabel {
 		this._onDidRender.fire();
 	}
 
-	public dispose(): void {
+	dispose(): void {
 		super.dispose();
 
-		this.toDispose = dispose(this.toDispose);
 		this.label = void 0;
 		this.options = void 0;
 		this.lastKnownConfiguredLangId = void 0;
@@ -252,7 +251,7 @@ export class ResourceLabel extends IconLabel {
 
 export class EditorLabel extends ResourceLabel {
 
-	public setEditor(editor: IEditorInput, options?: IResourceLabelOptions): void {
+	setEditor(editor: IEditorInput, options?: IResourceLabelOptions): void {
 		this.setLabel({
 			resource: toResource(editor, { supportSideBySide: true }),
 			name: editor.getName(),
@@ -264,7 +263,6 @@ export class EditorLabel extends ResourceLabel {
 export interface IFileLabelOptions extends IResourceLabelOptions {
 	hideLabel?: boolean;
 	hidePath?: boolean;
-	root?: uri;
 }
 
 export class FileLabel extends ResourceLabel {
@@ -273,19 +271,19 @@ export class FileLabel extends ResourceLabel {
 		container: HTMLElement,
 		options: IIconLabelCreationOptions,
 		@IExtensionService extensionService: IExtensionService,
-		@IWorkspaceContextService contextService: IWorkspaceContextService,
+		@IWorkspaceContextService private contextService: IWorkspaceContextService,
 		@IConfigurationService configurationService: IConfigurationService,
 		@IModeService modeService: IModeService,
 		@IModelService modelService: IModelService,
-		@IEnvironmentService environmentService: IEnvironmentService,
 		@IDecorationsService decorationsService: IDecorationsService,
 		@IThemeService themeService: IThemeService,
 		@IUntitledEditorService private untitledEditorService: IUntitledEditorService,
+		@ILabelService labelService: ILabelService
 	) {
-		super(container, options, extensionService, contextService, configurationService, modeService, modelService, environmentService, decorationsService, themeService);
+		super(container, options, extensionService, configurationService, modeService, modelService, decorationsService, themeService, labelService);
 	}
 
-	public setFile(resource: uri, options?: IFileLabelOptions): void {
+	setFile(resource: uri, options?: IFileLabelOptions): void {
 		const hideLabel = options && options.hideLabel;
 		let name: string;
 		if (!hideLabel) {
@@ -304,17 +302,7 @@ export class FileLabel extends ResourceLabel {
 		let description: string;
 		const hidePath = (options && options.hidePath) || (resource.scheme === Schemas.untitled && !this.untitledEditorService.hasAssociatedFilePath(resource));
 		if (!hidePath) {
-			let rootProvider: IWorkspaceFolderProvider;
-			if (options && options.root) {
-				rootProvider = {
-					getWorkspaceFolder(): { uri } { return { uri: options.root }; },
-					getWorkspace(): { folders: { uri: uri }[]; } { return { folders: [{ uri: options.root }] }; },
-				};
-			} else {
-				rootProvider = this.contextService;
-			}
-
-			description = getPathLabel(resources.dirname(resource), rootProvider, this.environmentService);
+			description = this.labelService.getUriLabel(resources.dirname(resource), true);
 		}
 
 		this.setLabel({ resource, name, description }, options);
@@ -345,15 +333,17 @@ export function getIconClasses(modelService: IModelService, modeService: IModeSe
 		// Files
 		else {
 
-			// Name
-			classes.push(`${name}-name-file-icon`);
+			// Name & Extension(s)
+			if (name) {
+				classes.push(`${name}-name-file-icon`);
 
-			// Extension(s)
-			const dotSegments = name.split('.');
-			for (let i = 1; i < dotSegments.length; i++) {
-				classes.push(`${dotSegments.slice(i).join('.')}-ext-file-icon`); // add each combination of all found extensions if more than one
+				const dotSegments = name.split('.');
+				for (let i = 1; i < dotSegments.length; i++) {
+					classes.push(`${dotSegments.slice(i).join('.')}-ext-file-icon`); // add each combination of all found extensions if more than one
+				}
+
+				classes.push(`ext-file-icon`); // extra segment to increase file-ext score
 			}
-			classes.push(`ext-file-icon`); // extra segment to increase file-ext score
 
 			// Configured Language
 			let configuredLangId = getConfiguredLangId(modelService, resource);
diff --git a/src/vs/workbench/browser/layout.ts b/src/vs/workbench/browser/layout.ts
index d28eade1226..750950e9534 100644
--- a/src/vs/workbench/browser/layout.ts
+++ b/src/vs/workbench/browser/layout.ts
@@ -5,7 +5,6 @@
 'use strict';
 
 import { TPromise } from 'vs/base/common/winjs.base';
-import * as errors from 'vs/base/common/errors';
 import { QuickOpenController } from 'vs/workbench/browser/parts/quickopen/quickOpenController';
 import { QuickInputService } from 'vs/workbench/browser/parts/quickinput/quickInput';
 import { Sash, ISashEvent, IVerticalSashLayoutProvider, IHorizontalSashLayoutProvider, Orientation } from 'vs/base/browser/ui/sash/sash';
@@ -14,8 +13,8 @@ import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet';
 import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
 import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
 import { Disposable } from 'vs/base/common/lifecycle';
-import { getZoomFactor } from 'vs/base/browser/browser';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
+import { isMacintosh } from 'vs/base/common/platform';
 import { memoize } from 'vs/base/common/decorators';
 import { NotificationsCenter } from 'vs/workbench/browser/parts/notifications/notificationsCenter';
 import { NotificationsToasts } from 'vs/workbench/browser/parts/notifications/notificationsToasts';
@@ -27,8 +26,9 @@ import { ActivitybarPart } from 'vs/workbench/browser/parts/activitybar/activity
 import { SidebarPart } from 'vs/workbench/browser/parts/sidebar/sidebarPart';
 import { PanelPart } from 'vs/workbench/browser/parts/panel/panelPart';
 import { StatusbarPart } from 'vs/workbench/browser/parts/statusbar/statusbarPart';
+import { getZoomFactor } from 'vs/base/browser/browser';
 
-const TITLE_BAR_HEIGHT = 22;
+const TITLE_BAR_HEIGHT = isMacintosh ? 22 : 30;
 const STATUS_BAR_HEIGHT = 22;
 const ACTIVITY_BAR_WIDTH = 50;
 
@@ -69,7 +69,6 @@ export class WorkbenchLayout extends Disposable implements IVerticalSashLayoutPr
 	private _panelHeight: number;
 	private _panelWidth: number;
 
-	// Take parts as an object bag since instatation service does not have typings for constructors with 9+ arguments
 	constructor(
 		private parent: HTMLElement,
 		private workbenchContainer: HTMLElement,
@@ -117,23 +116,23 @@ export class WorkbenchLayout extends Disposable implements IVerticalSashLayoutPr
 
 	private registerListeners(): void {
 		this._register(this.themeService.onThemeChange(_ => this.layout()));
-		this._register(this.parts.editor.onDidPreferredSizeChange(() => this.onDidPreferredSizeChange()));
+		this._register(this.parts.editor.onDidSizeConstraintsChange(() => this.onDidEditorSizeConstraintsChange()));
 
 		this.registerSashListeners();
 	}
 
-	private onDidPreferredSizeChange(): void {
+	private onDidEditorSizeConstraintsChange(): void {
 		if (this.workbenchSize && (this.sidebarWidth || this.panelHeight)) {
 			if (this.editorGroupService.count > 1) {
-				const preferredEditorPartSize = this.parts.editor.preferredSize;
+				const minimumEditorPartSize = new Dimension(this.parts.editor.minimumWidth, this.parts.editor.minimumHeight);
 
-				const sidebarOverflow = this.workbenchSize.width - this.sidebarWidth < preferredEditorPartSize.width;
+				const sidebarOverflow = this.workbenchSize.width - this.sidebarWidth < minimumEditorPartSize.width;
 
 				let panelOverflow = false;
 				if (this.partService.getPanelPosition() === Position.RIGHT) {
-					panelOverflow = this.workbenchSize.width - this.panelWidth - this.sidebarWidth < preferredEditorPartSize.width;
+					panelOverflow = this.workbenchSize.width - this.panelWidth - this.sidebarWidth < minimumEditorPartSize.width;
 				} else {
-					panelOverflow = this.workbenchSize.height - this.panelHeight < preferredEditorPartSize.height;
+					panelOverflow = this.workbenchSize.height - this.panelHeight < minimumEditorPartSize.height;
 				}
 
 				// Trigger a layout if we detect that either sidebar or panel overflow
@@ -191,11 +190,11 @@ export class WorkbenchLayout extends Disposable implements IVerticalSashLayoutPr
 			minSidebarWidth = 0;
 		}
 
-		return Math.max(this.partLayoutInfo.panel.minWidth, this.workbenchSize.width - this.parts.editor.preferredSize.width - minSidebarWidth - this.activitybarWidth);
+		return Math.max(this.partLayoutInfo.panel.minWidth, this.workbenchSize.width - this.parts.editor.minimumWidth - minSidebarWidth - this.activitybarWidth);
 	}
 
 	private computeMaxPanelHeight(): number {
-		return Math.max(this.partLayoutInfo.panel.minHeight, this.sidebarHeight /* simplification for: window.height - status.height - title-height */ - this.parts.editor.preferredSize.height);
+		return Math.max(this.partLayoutInfo.panel.minHeight, this.sidebarHeight /* simplification for: window.height - status.height - title-height */ - this.parts.editor.minimumHeight);
 	}
 
 	private get sidebarWidth(): number {
@@ -208,13 +207,13 @@ export class WorkbenchLayout extends Disposable implements IVerticalSashLayoutPr
 
 	private set sidebarWidth(value: number) {
 		const panelMinWidth = this.partService.getPanelPosition() === Position.RIGHT && this.partService.isVisible(Parts.PANEL_PART) ? this.partLayoutInfo.panel.minWidth : 0;
-		const maxSidebarWidth = this.workbenchSize.width - this.activitybarWidth - this.parts.editor.preferredSize.width - panelMinWidth;
+		const maxSidebarWidth = this.workbenchSize.width - this.activitybarWidth - this.parts.editor.minimumWidth - panelMinWidth;
 
 		this._sidebarWidth = Math.max(this.partLayoutInfo.sidebar.minWidth, Math.min(maxSidebarWidth, value));
 	}
 
 	@memoize
-	private get partLayoutInfo() {
+	public get partLayoutInfo() {
 		return {
 			titlebar: {
 				height: TITLE_BAR_HEIGHT
@@ -294,7 +293,7 @@ export class WorkbenchLayout extends Disposable implements IVerticalSashLayoutPr
 			}
 
 			if (doLayout) {
-				promise.done(() => this.layout({ source: Parts.SIDEBAR_PART }), errors.onUnexpectedError);
+				promise.then(() => this.layout({ source: Parts.SIDEBAR_PART }));
 			}
 		}));
 
@@ -332,7 +331,7 @@ export class WorkbenchLayout extends Disposable implements IVerticalSashLayoutPr
 			}
 
 			if (doLayout) {
-				promise.done(() => this.layout({ source: Parts.PANEL_PART }), errors.onUnexpectedError);
+				promise.then(() => this.layout({ source: Parts.PANEL_PART }));
 			}
 		}));
 
@@ -370,7 +369,7 @@ export class WorkbenchLayout extends Disposable implements IVerticalSashLayoutPr
 			}
 
 			if (doLayout) {
-				promise.done(() => this.layout({ source: Parts.PANEL_PART }), errors.onUnexpectedError);
+				promise.then(() => this.layout({ source: Parts.PANEL_PART }));
 			}
 		}));
 
@@ -397,7 +396,7 @@ export class WorkbenchLayout extends Disposable implements IVerticalSashLayoutPr
 			let optimalWidth = activeViewlet && activeViewlet.getOptimalWidth();
 			this.sidebarWidth = Math.max(optimalWidth, DEFAULT_SIDEBAR_PART_WIDTH);
 			this.storageService.store(WorkbenchLayout.sashXOneWidthSettingsKey, this.sidebarWidth, StorageScope.GLOBAL);
-			this.partService.setSideBarHidden(false).done(() => this.layout(), errors.onUnexpectedError);
+			this.partService.setSideBarHidden(false).then(() => this.layout());
 		}));
 
 		this._register(this.sashXTwo.onDidReset(() => {
@@ -417,6 +416,7 @@ export class WorkbenchLayout extends Disposable implements IVerticalSashLayoutPr
 		const isSidebarHidden = !this.partService.isVisible(Parts.SIDEBAR_PART);
 		const sidebarPosition = this.partService.getSideBarPosition();
 		const panelPosition = this.partService.getPanelPosition();
+		const menubarVisibility = this.partService.getMenubarVisibility();
 
 		// Sidebar
 		if (this.sidebarWidth === -1) {
@@ -424,7 +424,7 @@ export class WorkbenchLayout extends Disposable implements IVerticalSashLayoutPr
 		}
 
 		this.statusbarHeight = isStatusbarHidden ? 0 : this.partLayoutInfo.statusbar.height;
-		this.titlebarHeight = isTitlebarHidden ? 0 : this.partLayoutInfo.titlebar.height / getZoomFactor(); // adjust for zoom prevention
+		this.titlebarHeight = isTitlebarHidden ? 0 : this.partLayoutInfo.titlebar.height / (!menubarVisibility || menubarVisibility === 'hidden' ? getZoomFactor() : 1); // adjust for zoom prevention
 
 		this.sidebarHeight = this.workbenchSize.height - this.statusbarHeight - this.titlebarHeight;
 		let sidebarSize = new Dimension(this.sidebarWidth, this.sidebarHeight);
@@ -486,10 +486,10 @@ export class WorkbenchLayout extends Disposable implements IVerticalSashLayoutPr
 		editorSize.width = this.workbenchSize.width - sidebarSize.width - activityBarSize.width - (panelPosition === Position.RIGHT ? panelDimension.width : 0);
 		editorSize.height = sidebarSize.height - (panelPosition === Position.BOTTOM ? panelDimension.height : 0);
 
-		// Adjust for Editor Part preferred width
-		const preferredEditorPartSize = this.parts.editor.preferredSize;
-		if (editorSize.width < preferredEditorPartSize.width) {
-			const missingPreferredEditorWidth = preferredEditorPartSize.width - editorSize.width;
+		// Adjust for Editor Part minimum width
+		const minimumEditorPartSize = new Dimension(this.parts.editor.minimumWidth, this.parts.editor.minimumHeight);
+		if (editorSize.width < minimumEditorPartSize.width) {
+			const missingPreferredEditorWidth = minimumEditorPartSize.width - editorSize.width;
 			let outstandingMissingPreferredEditorWidth = missingPreferredEditorWidth;
 
 			// Take from Panel if Panel Position on the Right and Visible
@@ -512,9 +512,9 @@ export class WorkbenchLayout extends Disposable implements IVerticalSashLayoutPr
 			}
 		}
 
-		// Adjust for Editor Part preferred height
-		if (editorSize.height < preferredEditorPartSize.height) {
-			const missingPreferredEditorHeight = preferredEditorPartSize.height - editorSize.height;
+		// Adjust for Editor Part minimum height
+		if (editorSize.height < minimumEditorPartSize.height) {
+			const missingPreferredEditorHeight = minimumEditorPartSize.height - editorSize.height;
 			let outstandingMissingPreferredEditorHeight = missingPreferredEditorHeight;
 
 			// Take from Panel if Panel Position on the Bottom and Visible
@@ -702,7 +702,6 @@ export class WorkbenchLayout extends Disposable implements IVerticalSashLayoutPr
 		return this.panelMaximized;
 	}
 
-	// change part size along the main axis
 	resizePart(part: Parts, sizeChange: number): void {
 		const panelPosition = this.partService.getPanelPosition();
 		const sizeChangePxWidth = this.workbenchSize.width * (sizeChange / 100);
@@ -713,9 +712,8 @@ export class WorkbenchLayout extends Disposable implements IVerticalSashLayoutPr
 			case Parts.SIDEBAR_PART:
 				this.sidebarWidth = this.sidebarWidth + sizeChangePxWidth; // Sidebar can not become smaller than MIN_PART_WIDTH
 
-				const preferredEditorPartSize = this.parts.editor.preferredSize;
-				if (this.workbenchSize.width - this.sidebarWidth < preferredEditorPartSize.width) {
-					this.sidebarWidth = this.workbenchSize.width - preferredEditorPartSize.width;
+				if (this.workbenchSize.width - this.sidebarWidth < this.parts.editor.minimumWidth) {
+					this.sidebarWidth = this.workbenchSize.width - this.parts.editor.minimumWidth;
 				}
 
 				doLayout = true;
diff --git a/src/vs/workbench/browser/media/part.css b/src/vs/workbench/browser/media/part.css
index 94f68267136..fc87a52eaf3 100644
--- a/src/vs/workbench/browser/media/part.css
+++ b/src/vs/workbench/browser/media/part.css
@@ -30,9 +30,15 @@
 	padding-left: 12px;
 }
 
-.monaco-workbench > .part > .title > .title-label span {
+.monaco-workbench > .part > .title > .title-label h2 {
 	font-size: 11px;
 	cursor: default;
+	font-weight: normal;
+	-webkit-margin-before: 0;
+	-webkit-margin-after: 0;
+	overflow: hidden;
+	white-space: nowrap;
+	text-overflow: ellipsis;
 }
 
 .monaco-workbench > .part > .title > .title-label a {
diff --git a/src/vs/workbench/browser/panel.ts b/src/vs/workbench/browser/panel.ts
index 8b05f420b0b..f046282ca36 100644
--- a/src/vs/workbench/browser/panel.ts
+++ b/src/vs/workbench/browser/panel.ts
@@ -31,28 +31,28 @@ export class PanelRegistry extends CompositeRegistry<Panel> {
 	/**
 	 * Registers a panel to the platform.
 	 */
-	public registerPanel(descriptor: PanelDescriptor): void {
+	registerPanel(descriptor: PanelDescriptor): void {
 		super.registerComposite(descriptor);
 	}
 
 	/**
 	 * Returns an array of registered panels known to the platform.
 	 */
-	public getPanels(): PanelDescriptor[] {
+	getPanels(): PanelDescriptor[] {
 		return this.getComposites() as PanelDescriptor[];
 	}
 
 	/**
 	 * Sets the id of the panel that should open on startup by default.
 	 */
-	public setDefaultPanelId(id: string): void {
+	setDefaultPanelId(id: string): void {
 		this.defaultPanelId = id;
 	}
 
 	/**
 	 * Gets the id of the panel that should open on startup by default.
 	 */
-	public getDefaultPanelId(): string {
+	getDefaultPanelId(): string {
 		return this.defaultPanelId;
 	}
 }
@@ -76,7 +76,7 @@ export abstract class TogglePanelAction extends Action {
 		this.panelId = panelId;
 	}
 
-	public run(): TPromise<any> {
+	run(): TPromise<any> {
 
 		if (this.isPanelShowing()) {
 			return this.partService.setPanelHidden(true);
diff --git a/src/vs/workbench/browser/part.ts b/src/vs/workbench/browser/part.ts
index 8f147ff99bc..a7ea04b455e 100644
--- a/src/vs/workbench/browser/part.ts
+++ b/src/vs/workbench/browser/part.ts
@@ -47,7 +47,7 @@ export abstract class Part extends Component {
 	 *
 	 * Called to create title and content area of the part.
 	 */
-	public create(parent: HTMLElement): void {
+	create(parent: HTMLElement): void {
 		this.parent = parent;
 		this.titleArea = this.createTitleArea(parent);
 		this.contentArea = this.createContentArea(parent);
@@ -60,7 +60,7 @@ export abstract class Part extends Component {
 	/**
 	 * Returns the overall part container.
 	 */
-	public getContainer(): HTMLElement {
+	getContainer(): HTMLElement {
 		return this.parent;
 	}
 
@@ -95,7 +95,7 @@ export abstract class Part extends Component {
 	/**
 	 * Layout title and content area in the given dimension.
 	 */
-	public layout(dimension: Dimension): Dimension[] {
+	layout(dimension: Dimension): Dimension[] {
 		return this.partLayout.layout(dimension);
 	}
 }
@@ -106,7 +106,7 @@ export class PartLayout {
 
 	constructor(container: HTMLElement, private options: IPartOptions, titleArea: HTMLElement, private contentArea: HTMLElement) { }
 
-	public layout(dimension: Dimension): Dimension[] {
+	layout(dimension: Dimension): Dimension[] {
 		const { width, height } = dimension;
 
 		// Return the applied sizes to title and content
diff --git a/src/vs/workbench/browser/parts/activitybar/activitybarActions.ts b/src/vs/workbench/browser/parts/activitybar/activitybarActions.ts
index 366b81fe440..d13513f70f7 100644
--- a/src/vs/workbench/browser/parts/activitybar/activitybarActions.ts
+++ b/src/vs/workbench/browser/parts/activitybar/activitybarActions.ts
@@ -21,8 +21,9 @@ import { activeContrastBorder, focusBorder } from 'vs/platform/theme/common/colo
 import { StandardMouseEvent } from 'vs/base/browser/mouseEvent';
 import { KeyCode } from 'vs/base/common/keyCodes';
 import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-import { ActivityAction, ActivityActionItem, ICompositeBarColors } from 'vs/workbench/browser/parts/compositebar/compositeBarActions';
+import { ActivityAction, ActivityActionItem, ICompositeBarColors, ToggleCompositePinnedAction, ICompositeBar } from 'vs/workbench/browser/parts/compositeBarActions';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
+import { URI } from 'vs/base/common/uri';
 
 export class ViewletActivityAction extends ActivityAction {
 
@@ -39,7 +40,7 @@ export class ViewletActivityAction extends ActivityAction {
 		super(activity);
 	}
 
-	public run(event: any): TPromise<any> {
+	run(event: any): TPromise<any> {
 		if (event instanceof MouseEvent && event.button === 2) {
 			return TPromise.as(false); // do not run on right click
 		}
@@ -85,7 +86,7 @@ export class ToggleViewletAction extends Action {
 		super(_viewlet.id, _viewlet.name);
 	}
 
-	public run(): TPromise<any> {
+	run(): TPromise<any> {
 		const sideBarVisible = this.partService.isVisible(Parts.SIDEBAR_PART);
 		const activeViewlet = this.viewletService.getActiveViewlet();
 
@@ -116,33 +117,34 @@ export class GlobalActivityActionItem extends ActivityActionItem {
 		super(action, { draggable: false, colors, icon: true }, themeService);
 	}
 
-	public render(container: HTMLElement): void {
+	render(container: HTMLElement): void {
 		super.render(container);
 
 		// Context menus are triggered on mouse down so that an item can be picked
 		// and executed with releasing the mouse over it
-		this.$container.on(DOM.EventType.MOUSE_DOWN, (e: MouseEvent) => {
+
+		this._register(DOM.addDisposableListener(this.container, DOM.EventType.MOUSE_DOWN, (e: MouseEvent) => {
 			DOM.EventHelper.stop(e, true);
 
 			const event = new StandardMouseEvent(e);
 			this.showContextMenu({ x: event.posx, y: event.posy });
-		});
+		}));
 
-		this.$container.on(DOM.EventType.KEY_UP, (e: KeyboardEvent) => {
+		this._register(DOM.addDisposableListener(this.container, DOM.EventType.KEY_UP, (e: KeyboardEvent) => {
 			let event = new StandardKeyboardEvent(e);
 			if (event.equals(KeyCode.Enter) || event.equals(KeyCode.Space)) {
 				DOM.EventHelper.stop(e, true);
 
-				this.showContextMenu(this.$container.getHTMLElement());
+				this.showContextMenu(this.container);
 			}
-		});
+		}));
 
-		this.$container.on(TouchEventType.Tap, (e: GestureEvent) => {
+		this._register(DOM.addDisposableListener(this.container, TouchEventType.Tap, (e: GestureEvent) => {
 			DOM.EventHelper.stop(e, true);
 
 			const event = new StandardMouseEvent(e);
 			this.showContextMenu({ x: event.posx, y: event.posy });
-		});
+		}));
 	}
 
 	private showContextMenu(location: HTMLElement | { x: number, y: number }): void {
@@ -158,6 +160,41 @@ export class GlobalActivityActionItem extends ActivityActionItem {
 	}
 }
 
+export class PlaceHolderViewletActivityAction extends ViewletActivityAction {
+
+	constructor(
+		id: string, iconUrl: URI,
+		@IViewletService viewletService: IViewletService,
+		@IPartService partService: IPartService,
+		@ITelemetryService telemetryService: ITelemetryService
+	) {
+		super({ id, name: id, cssClass: `extensionViewlet-placeholder-${id.replace(/\./g, '-')}` }, viewletService, partService, telemetryService);
+
+		const iconClass = `.monaco-workbench > .activitybar .monaco-action-bar .action-label.${this.class}`; // Generate Placeholder CSS to show the icon in the activity bar
+		DOM.createCSSRule(iconClass, `-webkit-mask: url('${iconUrl || ''}') no-repeat 50% 50%`);
+		this.enabled = false;
+	}
+
+	setActivity(activity: IActivity): void {
+		this.activity = activity;
+		this.enabled = true;
+	}
+}
+
+export class PlaceHolderToggleCompositePinnedAction extends ToggleCompositePinnedAction {
+
+	constructor(id: string, compositeBar: ICompositeBar) {
+		super({ id, name: id, cssClass: void 0 }, compositeBar);
+
+		this.enabled = false;
+	}
+
+	setActivity(activity: IActivity): void {
+		this.label = activity.name;
+		this.enabled = true;
+	}
+}
+
 registerThemingParticipant((theme: ITheme, collector: ICssStyleCollector) => {
 
 	// Styling with Outline color (e.g. high contrast theme)
diff --git a/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts b/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts
index 6f53eadda76..36376370888 100644
--- a/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts
+++ b/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts
@@ -8,36 +8,39 @@
 import 'vs/css!./media/activitybarpart';
 import * as nls from 'vs/nls';
 import { illegalArgument } from 'vs/base/common/errors';
-import { $ } from 'vs/base/browser/builder';
 import { ActionsOrientation, ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
-import { GlobalActivityExtensions, IGlobalActivityRegistry, IActivity } from 'vs/workbench/common/activity';
+import { GlobalActivityExtensions, IGlobalActivityRegistry } from 'vs/workbench/common/activity';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { Part } from 'vs/workbench/browser/part';
-import { GlobalActivityActionItem, GlobalActivityAction, ViewletActivityAction, ToggleViewletAction } from 'vs/workbench/browser/parts/activitybar/activitybarActions';
+import { GlobalActivityActionItem, GlobalActivityAction, ViewletActivityAction, ToggleViewletAction, PlaceHolderToggleCompositePinnedAction, PlaceHolderViewletActivityAction } from 'vs/workbench/browser/parts/activitybar/activitybarActions';
 import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet';
 import { IBadge } from 'vs/workbench/services/activity/common/activity';
 import { IPartService, Parts, Position as SideBarPosition } from 'vs/workbench/services/part/common/partService';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IDisposable, toDisposable } from 'vs/base/common/lifecycle';
 import { ToggleActivityBarVisibilityAction } from 'vs/workbench/browser/actions/toggleActivityBarVisibility';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
+import { IThemeService, registerThemingParticipant } from 'vs/platform/theme/common/themeService';
 import { ACTIVITY_BAR_BACKGROUND, ACTIVITY_BAR_BORDER, ACTIVITY_BAR_FOREGROUND, ACTIVITY_BAR_BADGE_BACKGROUND, ACTIVITY_BAR_BADGE_FOREGROUND, ACTIVITY_BAR_DRAG_AND_DROP_BACKGROUND } from 'vs/workbench/common/theme';
 import { contrastBorder } from 'vs/platform/theme/common/colorRegistry';
-import { CompositeBar } from 'vs/workbench/browser/parts/compositebar/compositeBar';
-import { ToggleCompositePinnedAction, ICompositeBar } from 'vs/workbench/browser/parts/compositebar/compositeBarActions';
-import { ViewletDescriptor } from 'vs/workbench/browser/viewlet';
-import { Dimension, createCSSRule } from 'vs/base/browser/dom';
+import { CompositeBar } from 'vs/workbench/browser/parts/compositeBar';
+import { isMacintosh } from 'vs/base/common/platform';
+import { ILifecycleService, LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
+import { scheduleAtNextAnimationFrame, Dimension, addClass } from 'vs/base/browser/dom';
+import { Color } from 'vs/base/common/color';
 import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
 import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
+import { URI } from 'vs/base/common/uri';
+import { ToggleCompositePinnedAction } from 'vs/workbench/browser/parts/compositeBarActions';
+import { ViewletDescriptor } from 'vs/workbench/browser/viewlet';
 
 interface IPlaceholderComposite {
 	id: string;
-	iconUrl: string;
+	iconUrl: URI;
 }
 
 export class ActivitybarPart extends Part {
 
+	private static readonly ACTION_HEIGHT = 50;
 	private static readonly PINNED_VIEWLETS = 'workbench.activity.pinnedViewlets';
 	private static readonly PLACEHOLDER_VIEWLETS = 'workbench.activity.placeholderViewlets';
 	private static readonly COLORS = {
@@ -46,18 +49,15 @@ export class ActivitybarPart extends Part {
 		badgeForeground: ACTIVITY_BAR_BADGE_FOREGROUND,
 		dragAndDropBackground: ACTIVITY_BAR_DRAG_AND_DROP_BACKGROUND
 	};
-	private static readonly ACTION_HEIGHT = 50;
-
-	public _serviceBrand: any;
 
 	private dimension: Dimension;
 
 	private globalActionBar: ActionBar;
-	private globalActivityIdToActions: { [globalActivityId: string]: GlobalActivityAction; };
+	private globalActivityIdToActions: { [globalActivityId: string]: GlobalActivityAction; } = Object.create(null);
 
 	private placeholderComposites: IPlaceholderComposite[] = [];
 	private compositeBar: CompositeBar;
-	private compositeActions: { [compositeId: string]: { activityAction: ViewletActivityAction, pinnedAction: ToggleCompositePinnedAction } };
+	private compositeActions: { [compositeId: string]: { activityAction: ViewletActivityAction, pinnedAction: ToggleCompositePinnedAction } } = Object.create(null);
 
 	constructor(
 		id: string,
@@ -65,15 +65,13 @@ export class ActivitybarPart extends Part {
 		@IInstantiationService private instantiationService: IInstantiationService,
 		@IPartService private partService: IPartService,
 		@IThemeService themeService: IThemeService,
+		@ILifecycleService private lifecycleService: ILifecycleService,
 		@IStorageService private storageService: IStorageService,
-		@IExtensionService extensionService: IExtensionService,
+		@IExtensionService private extensionService: IExtensionService
 	) {
 		super(id, { hasTitle: false }, themeService);
 
-		this.globalActivityIdToActions = Object.create(null);
-
-		this.compositeActions = Object.create(null);
-		this.compositeBar = this.instantiationService.createInstance(CompositeBar, {
+		this.compositeBar = this._register(this.instantiationService.createInstance(CompositeBar, {
 			icon: true,
 			storageId: ActivitybarPart.PINNED_VIEWLETS,
 			orientation: ActionsOrientation.VERTICAL,
@@ -87,41 +85,47 @@ export class ActivitybarPart extends Part {
 			compositeSize: 50,
 			colors: ActivitybarPart.COLORS,
 			overflowActionSize: ActivitybarPart.ACTION_HEIGHT
+		}));
+
+		const previousState = this.storageService.get(ActivitybarPart.PLACEHOLDER_VIEWLETS, StorageScope.GLOBAL, '[]');
+		this.placeholderComposites = <IPlaceholderComposite[]>JSON.parse(previousState);
+		this.placeholderComposites.forEach((s) => {
+			if (typeof s.iconUrl === 'object') {
+				s.iconUrl = URI.revive(s.iconUrl);
+			} else {
+				s.iconUrl = void 0;
+			}
 		});
-		const previousState = this.storageService.get(ActivitybarPart.PLACEHOLDER_VIEWLETS, StorageScope.GLOBAL, void 0);
-		this.placeholderComposites = previousState ? JSON.parse(previousState) : this.compositeBar.getCompositesFromStorage().map(id => (<IPlaceholderComposite>{ id, iconUrl: void 0 }));
 
 		this.registerListeners();
 		this.updateCompositebar();
-		this.updatePlaceholderComposites();
-
-		extensionService.onDidRegisterExtensions(() => this.onDidRegisterExtensions());
-	}
-
-	private onDidRegisterExtensions(): void {
-		this.removeNotExistingPlaceholderComposites();
-		this.updateCompositebar();
 	}
 
 	private registerListeners(): void {
-
-		this.toUnbind.push(this.viewletService.onDidViewletRegister(() => this.updateCompositebar()));
+		this._register(this.viewletService.onDidViewletRegister(() => this.updateCompositebar()));
 
 		// Activate viewlet action on opening of a viewlet
-		this.toUnbind.push(this.viewletService.onDidViewletOpen(viewlet => this.compositeBar.activateComposite(viewlet.getId())));
+		this._register(this.viewletService.onDidViewletOpen(viewlet => this.compositeBar.activateComposite(viewlet.getId())));
 
 		// Deactivate viewlet action on close
-		this.toUnbind.push(this.viewletService.onDidViewletClose(viewlet => this.compositeBar.deactivateComposite(viewlet.getId())));
-		this.toUnbind.push(this.viewletService.onDidViewletEnablementChange(({ id, enabled }) => {
+		this._register(this.viewletService.onDidViewletClose(viewlet => this.compositeBar.deactivateComposite(viewlet.getId())));
+		this._register(this.viewletService.onDidViewletEnablementChange(({ id, enabled }) => {
 			if (enabled) {
 				this.compositeBar.addComposite(this.viewletService.getViewlet(id));
 			} else {
-				this.removeComposite(id);
+				this.removeComposite(id, true);
 			}
 		}));
+
+		this._register(this.extensionService.onDidRegisterExtensions(() => this.onDidRegisterExtensions()));
 	}
 
-	public showActivity(viewletOrActionId: string, badge: IBadge, clazz?: string, priority?: number): IDisposable {
+	private onDidRegisterExtensions(): void {
+		this.removeNotExistingComposites();
+		this.updateCompositebar();
+	}
+
+	showActivity(viewletOrActionId: string, badge: IBadge, clazz?: string, priority?: number): IDisposable {
 		if (this.viewletService.getViewlet(viewletOrActionId)) {
 			return this.compositeBar.showActivity(viewletOrActionId, badge, clazz, priority);
 		}
@@ -144,36 +148,62 @@ export class ActivitybarPart extends Part {
 		return toDisposable(() => action.setBadge(undefined));
 	}
 
-	public createContentArea(parent: HTMLElement): HTMLElement {
-		const $el = $(parent);
-		const $result = $('.content').appendTo($el);
+	createContentArea(parent: HTMLElement): HTMLElement {
+		const content = document.createElement('div');
+		addClass(content, 'content');
+		parent.appendChild(content);
 
 		// Top Actionbar with action items for each viewlet action
-		this.compositeBar.create($result.getHTMLElement());
+		this.compositeBar.create(content);
 
 		// Top Actionbar with action items for each viewlet action
-		this.createGlobalActivityActionBar($('.global-activity').appendTo($result).getHTMLElement());
+		const globalActivities = document.createElement('div');
+		addClass(globalActivities, 'global-activity');
+		content.appendChild(globalActivities);
 
-		return $result.getHTMLElement();
+		this.createGlobalActivityActionBar(globalActivities);
+
+		// TODO@Ben: workaround for https://github.com/Microsoft/vscode/issues/45700
+		// It looks like there are rendering glitches on macOS with Chrome 61 when
+		// using --webkit-mask with a background color that is different from the image
+		// The workaround is to promote the element onto its own drawing layer. We do
+		// this only after the workbench has loaded because otherwise there is ugly flicker.
+		if (isMacintosh) {
+			this.lifecycleService.when(LifecyclePhase.Running).then(() => {
+				scheduleAtNextAnimationFrame(() => { // another delay...
+					scheduleAtNextAnimationFrame(() => { // ...to prevent more flickering on startup
+						registerThemingParticipant((theme, collector) => {
+							const activityBarForeground = theme.getColor(ACTIVITY_BAR_FOREGROUND);
+							if (activityBarForeground && !activityBarForeground.equals(Color.white)) {
+								// only apply this workaround if the color is different from the image one (white)
+								collector.addRule('.monaco-workbench .activitybar > .content .monaco-action-bar .action-label { will-change: transform; }');
+							}
+						});
+					});
+				});
+			});
+		}
+
+		return content;
 	}
 
-	public updateStyles(): void {
+	updateStyles(): void {
 		super.updateStyles();
 
 		// Part container
-		const container = $(this.getContainer());
+		const container = this.getContainer();
 		const background = this.getColor(ACTIVITY_BAR_BACKGROUND);
-		container.style('background-color', background);
+		container.style.backgroundColor = background;
 
 		const borderColor = this.getColor(ACTIVITY_BAR_BORDER) || this.getColor(contrastBorder);
 		const isPositionLeft = this.partService.getSideBarPosition() === SideBarPosition.LEFT;
-		container.style('box-sizing', borderColor && isPositionLeft ? 'border-box' : null);
-		container.style('border-right-width', borderColor && isPositionLeft ? '1px' : null);
-		container.style('border-right-style', borderColor && isPositionLeft ? 'solid' : null);
-		container.style('border-right-color', isPositionLeft ? borderColor : null);
-		container.style('border-left-width', borderColor && !isPositionLeft ? '1px' : null);
-		container.style('border-left-style', borderColor && !isPositionLeft ? 'solid' : null);
-		container.style('border-left-color', !isPositionLeft ? borderColor : null);
+		container.style.boxSizing = borderColor && isPositionLeft ? 'border-box' : null;
+		container.style.borderRightWidth = borderColor && isPositionLeft ? '1px' : null;
+		container.style.borderRightStyle = borderColor && isPositionLeft ? 'solid' : null;
+		container.style.borderRightColor = isPositionLeft ? borderColor : null;
+		container.style.borderLeftWidth = borderColor && !isPositionLeft ? '1px' : null;
+		container.style.borderLeftStyle = borderColor && !isPositionLeft ? 'solid' : null;
+		container.style.borderLeftColor = !isPositionLeft ? borderColor : null;
 	}
 
 	private createGlobalActivityActionBar(container: HTMLElement): void {
@@ -183,13 +213,12 @@ export class ActivitybarPart extends Part {
 			.map(d => this.instantiationService.createInstance(d))
 			.map(a => new GlobalActivityAction(a));
 
-		this.globalActionBar = new ActionBar(container, {
+		this.globalActionBar = this._register(new ActionBar(container, {
 			actionItemProvider: a => this.instantiationService.createInstance(GlobalActivityActionItem, a, ActivitybarPart.COLORS),
 			orientation: ActionsOrientation.VERTICAL,
 			ariaLabel: nls.localize('globalActions', "Global Actions"),
 			animated: false
-		});
-		this.toUnbind.push(this.globalActionBar);
+		}));
 
 		actions.forEach(a => {
 			this.globalActivityIdToActions[a.id] = a;
@@ -209,12 +238,14 @@ export class ActivitybarPart extends Part {
 			} else {
 				const placeHolderComposite = this.placeholderComposites.filter(c => c.id === compositeId)[0];
 				compositeActions = {
-					activityAction: this.instantiationService.createInstance(PlaceHolderViewletActivityAction, compositeId, placeHolderComposite.iconUrl),
+					activityAction: this.instantiationService.createInstance(PlaceHolderViewletActivityAction, compositeId, placeHolderComposite && placeHolderComposite.iconUrl),
 					pinnedAction: new PlaceHolderToggleCompositePinnedAction(compositeId, this.compositeBar)
 				};
 			}
+
 			this.compositeActions[compositeId] = compositeActions;
 		}
+
 		return compositeActions;
 	}
 
@@ -237,26 +268,21 @@ export class ActivitybarPart extends Part {
 		}
 	}
 
-	private updatePlaceholderComposites(): void {
-		const viewlets = this.viewletService.getViewlets();
-		for (const { id } of this.placeholderComposites) {
+	private removeNotExistingComposites(): void {
+		const viewlets = this.viewletService.getAllViewlets();
+		for (const { id } of this.compositeBar.getComposites()) {
 			if (viewlets.every(viewlet => viewlet.id !== id)) {
-				this.compositeBar.addComposite({ id, name: id, order: void 0 });
+				this.removeComposite(id, false);
 			}
 		}
 	}
 
-	private removeNotExistingPlaceholderComposites(): void {
-		const viewlets = this.viewletService.getViewlets();
-		for (const { id } of this.placeholderComposites) {
-			if (viewlets.every(viewlet => viewlet.id !== id)) {
-				this.removeComposite(id);
-			}
+	private removeComposite(compositeId: string, hide: boolean): void {
+		if (hide) {
+			this.compositeBar.hideComposite(compositeId);
+		} else {
+			this.compositeBar.removeComposite(compositeId);
 		}
-	}
-
-	private removeComposite(compositeId: string): void {
-		this.compositeBar.removeComposite(compositeId);
 		const compositeActions = this.compositeActions[compositeId];
 		if (compositeActions) {
 			compositeActions.activityAction.dispose();
@@ -268,21 +294,18 @@ export class ActivitybarPart extends Part {
 	private enableCompositeActions(viewlet: ViewletDescriptor): void {
 		const { activityAction, pinnedAction } = this.getCompositeActions(viewlet.id);
 		if (activityAction instanceof PlaceHolderViewletActivityAction) {
-			activityAction.enable(viewlet);
+			activityAction.setActivity(viewlet);
 		}
 		if (pinnedAction instanceof PlaceHolderToggleCompositePinnedAction) {
-			pinnedAction.enable(viewlet);
+			pinnedAction.setActivity(viewlet);
 		}
 	}
 
-	public getPinned(): string[] {
+	getPinned(): string[] {
 		return this.viewletService.getViewlets().map(v => v.id).filter(id => this.compositeBar.isPinned(id));
 	}
 
-	/**
-	 * Layout title, content and status area in the given dimension.
-	 */
-	public layout(dimension: Dimension): Dimension[] {
+	layout(dimension: Dimension): Dimension[] {
 		if (!this.partService.isVisible(Parts.ACTIVITYBAR_PART)) {
 			return [dimension];
 		}
@@ -302,62 +325,10 @@ export class ActivitybarPart extends Part {
 		return sizes;
 	}
 
-	public shutdown(): void {
-		const state = this.viewletService.getViewlets().map(viewlet => ({ id: viewlet.id, iconUrl: viewlet.iconUrl }));
+	shutdown(): void {
+		const state = this.viewletService.getAllViewlets().map(({ id, iconUrl }) => ({ id, iconUrl }));
 		this.storageService.store(ActivitybarPart.PLACEHOLDER_VIEWLETS, JSON.stringify(state), StorageScope.GLOBAL);
+
 		super.shutdown();
 	}
-
-	public dispose(): void {
-		if (this.compositeBar) {
-			this.compositeBar.dispose();
-			this.compositeBar = null;
-		}
-
-		if (this.globalActionBar) {
-			this.globalActionBar.dispose();
-			this.globalActionBar = null;
-		}
-
-		super.dispose();
-	}
 }
-
-class PlaceHolderViewletActivityAction extends ViewletActivityAction {
-
-	constructor(
-		id: string, iconUrl: string,
-		@IViewletService viewletService: IViewletService,
-		@IPartService partService: IPartService,
-		@ITelemetryService telemetryService: ITelemetryService
-	) {
-		super({ id, name: id, cssClass: `extensionViewlet-placeholder-${id.replace(/\./g, '-')}` }, viewletService, partService, telemetryService);
-		// Generate Placeholder CSS to show the icon in the activity bar
-		const iconClass = `.monaco-workbench > .activitybar .monaco-action-bar .action-label.${this.class}`;
-		createCSSRule(iconClass, `-webkit-mask: url('${iconUrl || ''}') no-repeat 50% 50%`);
-		this.enabled = false;
-	}
-
-	enable(activity: IActivity): void {
-		this.label = activity.name;
-		this.class = activity.cssClass;
-		this.enabled = true;
-	}
-
-}
-
-class PlaceHolderToggleCompositePinnedAction extends ToggleCompositePinnedAction {
-
-	constructor(
-		id: string, compositeBar: ICompositeBar
-	) {
-		super({ id, name: id, cssClass: void 0 }, compositeBar);
-		this.enabled = false;
-	}
-
-	enable(activity: IActivity): void {
-		this.label = activity.name;
-		this.enabled = true;
-	}
-
-}
\ No newline at end of file
diff --git a/src/vs/workbench/browser/parts/compositeBar.ts b/src/vs/workbench/browser/parts/compositeBar.ts
new file mode 100644
index 00000000000..343b3c18c4d
--- /dev/null
+++ b/src/vs/workbench/browser/parts/compositeBar.ts
@@ -0,0 +1,657 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+import * as nls from 'vs/nls';
+import { Action, IAction } from 'vs/base/common/actions';
+import { illegalArgument } from 'vs/base/common/errors';
+import * as arrays from 'vs/base/common/arrays';
+import { IDisposable, toDisposable } from 'vs/base/common/lifecycle';
+import { IBadge } from 'vs/workbench/services/activity/common/activity';
+import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
+import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { ActionBar, ActionsOrientation, Separator } from 'vs/base/browser/ui/actionbar/actionbar';
+import { CompositeActionItem, CompositeOverflowActivityAction, ICompositeActivity, CompositeOverflowActivityActionItem, ActivityAction, ICompositeBar, ICompositeBarColors, DraggedCompositeIdentifier } from 'vs/workbench/browser/parts/compositeBarActions';
+import { TPromise } from 'vs/base/common/winjs.base';
+import { Dimension, $, addDisposableListener, EventType, EventHelper } from 'vs/base/browser/dom';
+import { StandardMouseEvent } from 'vs/base/browser/mouseEvent';
+import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
+import { Widget } from 'vs/base/browser/ui/widget';
+import { isUndefinedOrNull } from 'vs/base/common/types';
+import { LocalSelectionTransfer } from 'vs/workbench/browser/dnd';
+
+export interface ICompositeBarOptions {
+	icon: boolean;
+	storageId: string;
+	orientation: ActionsOrientation;
+	colors: ICompositeBarColors;
+	compositeSize: number;
+	overflowActionSize: number;
+	getActivityAction: (compositeId: string) => ActivityAction;
+	getCompositePinnedAction: (compositeId: string) => Action;
+	getOnCompositeClickAction: (compositeId: string) => Action;
+	getContextMenuActions: () => Action[];
+	openComposite: (compositeId: string) => TPromise<any>;
+	getDefaultCompositeId: () => string;
+	hidePart: () => TPromise<any>;
+}
+
+export class CompositeBar extends Widget implements ICompositeBar {
+
+	private dimension: Dimension;
+
+	private compositeSwitcherBar: ActionBar;
+	private compositeOverflowAction: CompositeOverflowActivityAction;
+	private compositeOverflowActionItem: CompositeOverflowActivityActionItem;
+
+	private model: CompositeBarModel;
+	private visibleComposites: string[];
+	private compositeSizeInBar: Map<string, number>;
+
+	private compositeTransfer: LocalSelectionTransfer<DraggedCompositeIdentifier>;
+
+	constructor(
+		private options: ICompositeBarOptions,
+		@IInstantiationService private instantiationService: IInstantiationService,
+		@IStorageService storageService: IStorageService,
+		@IContextMenuService private contextMenuService: IContextMenuService
+	) {
+		super();
+
+		this.model = new CompositeBarModel(options, storageService);
+		this.visibleComposites = [];
+		this.compositeSizeInBar = new Map<string, number>();
+		this.compositeTransfer = LocalSelectionTransfer.getInstance<DraggedCompositeIdentifier>();
+	}
+
+	getComposites(): ICompositeBarItem[] {
+		return this.model.items;
+	}
+
+	create(parent: HTMLElement): HTMLElement {
+		const actionBarDiv = parent.appendChild($('.composite-bar'));
+		this.compositeSwitcherBar = this._register(new ActionBar(actionBarDiv, {
+			actionItemProvider: (action: Action) => {
+				if (action instanceof CompositeOverflowActivityAction) {
+					return this.compositeOverflowActionItem;
+				}
+				const item = this.model.findItem(action.id);
+				return item && this.instantiationService.createInstance(CompositeActionItem, action, item.pinnedAction, () => this.getContextMenuActions(), this.options.colors, this.options.icon, this);
+			},
+			orientation: this.options.orientation,
+			ariaLabel: nls.localize('activityBarAriaLabel', "Active View Switcher"),
+			animated: false,
+		}));
+
+		// Contextmenu for composites
+		this._register(addDisposableListener(parent, EventType.CONTEXT_MENU, e => this.showContextMenu(e)));
+
+		// Allow to drop at the end to move composites to the end
+		this._register(addDisposableListener(parent, EventType.DROP, (e: DragEvent) => {
+			if (this.compositeTransfer.hasData(DraggedCompositeIdentifier.prototype)) {
+				EventHelper.stop(e, true);
+
+				const draggedCompositeId = this.compositeTransfer.getData(DraggedCompositeIdentifier.prototype)[0].id;
+				this.compositeTransfer.clearData(DraggedCompositeIdentifier.prototype);
+
+				const targetItem = this.model.visibleItems[this.model.visibleItems.length - 1];
+				if (targetItem && targetItem.id !== draggedCompositeId) {
+					this.move(draggedCompositeId, targetItem.id);
+				}
+			}
+		}));
+
+		return actionBarDiv;
+	}
+
+	layout(dimension: Dimension): void {
+		this.dimension = dimension;
+		if (dimension.height === 0 || dimension.width === 0) {
+			// Do not layout if not visible. Otherwise the size measurment would be computed wrongly
+			return;
+		}
+
+		if (this.compositeSizeInBar.size === 0) {
+			// Compute size of each composite by getting the size from the css renderer
+			// Size is later used for overflow computation
+			this.computeSizes(this.model.visibleItems);
+		}
+
+		this.updateCompositeSwitcher();
+	}
+
+	addComposite({ id, name, order }: { id: string; name: string, order: number }): void {
+		// Add to the model
+		if (this.model.add(id, name, order)) {
+			this.computeSizes([this.model.findItem(id)]);
+			this.updateCompositeSwitcher();
+		}
+	}
+
+	removeComposite(id: string): void {
+
+		// If it pinned, unpin it first
+		if (this.isPinned(id)) {
+			this.unpin(id);
+		}
+
+		// Remove from the model
+		if (this.model.remove(id)) {
+			this.updateCompositeSwitcher();
+		}
+	}
+
+	hideComposite(id: string): void {
+		if (this.model.hide(id)) {
+			this.resetActiveComposite(id);
+			this.updateCompositeSwitcher();
+		}
+	}
+
+	activateComposite(id: string): void {
+		const previousActiveItem = this.model.activeItem;
+		if (this.model.activate(id)) {
+			// Update if current composite is neither visible nor pinned
+			// or previous active composite is not pinned
+			if (this.visibleComposites.indexOf(id) === - 1 || !this.model.activeItem.pinned || (previousActiveItem && !previousActiveItem.pinned)) {
+				this.updateCompositeSwitcher();
+			}
+		}
+	}
+
+	deactivateComposite(id: string): void {
+		const previousActiveItem = this.model.activeItem;
+		if (this.model.deactivate()) {
+			if (previousActiveItem && !previousActiveItem.pinned) {
+				this.updateCompositeSwitcher();
+			}
+		}
+	}
+
+	showActivity(compositeId: string, badge: IBadge, clazz?: string, priority?: number): IDisposable {
+		if (!badge) {
+			throw illegalArgument('badge');
+		}
+
+		if (typeof priority !== 'number') {
+			priority = 0;
+		}
+
+		const activity: ICompositeActivity = { badge, clazz, priority };
+		this.model.addActivity(compositeId, activity);
+		return toDisposable(() => this.model.removeActivity(compositeId, activity));
+	}
+
+	pin(compositeId: string, open?: boolean): void {
+		if (this.model.setPinned(compositeId, true)) {
+			this.updateCompositeSwitcher();
+
+			if (open) {
+				this.options.openComposite(compositeId).then(() => this.activateComposite(compositeId)); // Activate after opening
+			}
+		}
+	}
+
+	unpin(compositeId: string): void {
+		if (this.model.setPinned(compositeId, false)) {
+
+			this.updateCompositeSwitcher();
+
+			this.resetActiveComposite(compositeId);
+		}
+	}
+
+	private resetActiveComposite(compositeId: string) {
+		const defaultCompositeId = this.options.getDefaultCompositeId();
+
+		// Case: composite is not the active one or the active one is a different one
+		// Solv: we do nothing
+		if (!this.model.activeItem || this.model.activeItem.id !== compositeId) {
+			return;
+		}
+
+		// Deactivate itself
+		this.deactivateComposite(compositeId);
+
+		// Case: composite is not the default composite and default composite is still showing
+		// Solv: we open the default composite
+		if (defaultCompositeId !== compositeId && this.isPinned(defaultCompositeId)) {
+			this.options.openComposite(defaultCompositeId);
+		}
+
+		// Case: we closed the last visible composite
+		// Solv: we hide the part
+		else if (this.visibleComposites.length === 1) {
+			this.options.hidePart();
+		}
+
+		// Case: we closed the default composite
+		// Solv: we open the next visible composite from top
+		else {
+			this.options.openComposite(this.visibleComposites.filter(cid => cid !== compositeId)[0]);
+		}
+	}
+
+	isPinned(compositeId: string): boolean {
+		const item = this.model.findItem(compositeId);
+		return item && item.pinned;
+	}
+
+	move(compositeId: string, toCompositeId: string): void {
+		if (this.model.move(compositeId, toCompositeId)) {
+			// timeout helps to prevent artifacts from showing up
+			setTimeout(() => this.updateCompositeSwitcher(), 0);
+		}
+	}
+
+	getAction(compositeId): ActivityAction {
+		const item = this.model.findItem(compositeId);
+		return item && item.activityAction;
+	}
+
+	private computeSizes(items: ICompositeBarItem[]): void {
+		const size = this.options.compositeSize;
+		if (size) {
+			items.forEach(composite => this.compositeSizeInBar.set(composite.id, size));
+		} else {
+			if (this.dimension && this.dimension.height !== 0 && this.dimension.width !== 0) {
+				// Compute sizes only if visible. Otherwise the size measurment would be computed wrongly.
+				const currentItemsLength = this.compositeSwitcherBar.items.length;
+				this.compositeSwitcherBar.push(items.map(composite => composite.activityAction));
+				items.map((composite, index) => this.compositeSizeInBar.set(composite.id, this.options.orientation === ActionsOrientation.VERTICAL
+					? this.compositeSwitcherBar.getHeight(currentItemsLength + index)
+					: this.compositeSwitcherBar.getWidth(currentItemsLength + index)
+				));
+				items.forEach(() => this.compositeSwitcherBar.pull(this.compositeSwitcherBar.items.length - 1));
+			}
+		}
+	}
+
+	private updateCompositeSwitcher(): void {
+		if (!this.compositeSwitcherBar || !this.dimension) {
+			return; // We have not been rendered yet so there is nothing to update.
+		}
+
+		let compositesToShow = this.model.visibleItems.filter(item =>
+			item.pinned
+			|| (this.model.activeItem && this.model.activeItem.id === item.id) /* Show the active composite even if it is not pinned */
+		).map(item => item.id);
+
+		// Ensure we are not showing more composites than we have height for
+		let overflows = false;
+		let maxVisible = compositesToShow.length;
+		let size = 0;
+		const limit = this.options.orientation === ActionsOrientation.VERTICAL ? this.dimension.height : this.dimension.width;
+		for (let i = 0; i < compositesToShow.length && size <= limit; i++) {
+			size += this.compositeSizeInBar.get(compositesToShow[i]);
+			if (size > limit) {
+				maxVisible = i;
+			}
+		}
+		overflows = compositesToShow.length > maxVisible;
+
+		if (overflows) {
+			size -= this.compositeSizeInBar.get(compositesToShow[maxVisible]);
+			compositesToShow = compositesToShow.slice(0, maxVisible);
+			size += this.options.overflowActionSize;
+		}
+		// Check if we need to make extra room for the overflow action
+		if (size > limit) {
+			size -= this.compositeSizeInBar.get(compositesToShow.pop());
+		}
+
+		// We always try show the active composite
+		if (this.model.activeItem && compositesToShow.every(compositeId => compositeId !== this.model.activeItem.id)) {
+			const removedComposite = compositesToShow.pop();
+			size = size - this.compositeSizeInBar.get(removedComposite) + this.compositeSizeInBar.get(this.model.activeItem.id);
+			compositesToShow.push(this.model.activeItem.id);
+		}
+
+		// The active composite might have bigger size than the removed composite, check for overflow again
+		if (size > limit) {
+			compositesToShow.length ? compositesToShow.splice(compositesToShow.length - 2, 1) : compositesToShow.pop();
+		}
+
+		const visibleCompositesChange = !arrays.equals(compositesToShow, this.visibleComposites);
+
+		// Pull out overflow action if there is a composite change so that we can add it to the end later
+		if (this.compositeOverflowAction && visibleCompositesChange) {
+			this.compositeSwitcherBar.pull(this.compositeSwitcherBar.length() - 1);
+
+			this.compositeOverflowAction.dispose();
+			this.compositeOverflowAction = null;
+
+			this.compositeOverflowActionItem.dispose();
+			this.compositeOverflowActionItem = null;
+		}
+
+		// Pull out composites that overflow or got hidden
+		const compositesToRemove: number[] = [];
+		this.visibleComposites.forEach((compositeId, index) => {
+			if (compositesToShow.indexOf(compositeId) === -1) {
+				compositesToRemove.push(index);
+			}
+		});
+		compositesToRemove.reverse().forEach(index => {
+			const actionItem = this.compositeSwitcherBar.items[index];
+			this.compositeSwitcherBar.pull(index);
+			actionItem.dispose();
+			this.visibleComposites.splice(index, 1);
+		});
+
+		// Update the positions of the composites
+		compositesToShow.forEach((compositeId, newIndex) => {
+			const currentIndex = this.visibleComposites.indexOf(compositeId);
+			if (newIndex !== currentIndex) {
+				if (currentIndex !== -1) {
+					const actionItem = this.compositeSwitcherBar.items[currentIndex];
+					this.compositeSwitcherBar.pull(currentIndex);
+					actionItem.dispose();
+					this.visibleComposites.splice(currentIndex, 1);
+				}
+
+				this.compositeSwitcherBar.push(this.model.findItem(compositeId).activityAction, { label: true, icon: this.options.icon, index: newIndex });
+				this.visibleComposites.splice(newIndex, 0, compositeId);
+			}
+		});
+
+		// Add overflow action as needed
+		if ((visibleCompositesChange && overflows) || this.compositeSwitcherBar.length() === 0) {
+			this.compositeOverflowAction = this.instantiationService.createInstance(CompositeOverflowActivityAction, () => this.compositeOverflowActionItem.showMenu());
+			this.compositeOverflowActionItem = this.instantiationService.createInstance(
+				CompositeOverflowActivityActionItem,
+				this.compositeOverflowAction,
+				() => this.getOverflowingComposites(),
+				() => this.model.activeItem ? this.model.activeItem.id : void 0,
+				(compositeId: string) => {
+					const item = this.model.findItem(compositeId);
+					return item && item.activity[0] && item.activity[0].badge;
+				},
+				this.options.getOnCompositeClickAction,
+				this.options.colors
+			);
+
+			this.compositeSwitcherBar.push(this.compositeOverflowAction, { label: false, icon: true });
+		}
+
+		// Persist
+		this.model.saveState();
+	}
+
+	private getOverflowingComposites(): { id: string, name: string }[] {
+		let overflowingIds = this.model.visibleItems.filter(item => item.pinned).map(item => item.id);
+
+		// Show the active composite even if it is not pinned
+		if (this.model.activeItem && !this.model.activeItem.pinned) {
+			overflowingIds.push(this.model.activeItem.id);
+		}
+
+		overflowingIds = overflowingIds.filter(compositeId => this.visibleComposites.indexOf(compositeId) === -1);
+		return this.model.visibleItems.filter(c => overflowingIds.indexOf(c.id) !== -1);
+	}
+
+	private showContextMenu(e: MouseEvent): void {
+		EventHelper.stop(e, true);
+		const event = new StandardMouseEvent(e);
+		this.contextMenuService.showContextMenu({
+			getAnchor: () => { return { x: event.posx, y: event.posy }; },
+			getActions: () => TPromise.as(this.getContextMenuActions())
+		});
+	}
+
+	private getContextMenuActions(): IAction[] {
+		const actions: IAction[] = this.model.visibleItems
+			.map(({ id, name, activityAction }) => (<IAction>{
+				id,
+				label: name || id,
+				checked: this.isPinned(id),
+				enabled: activityAction.enabled,
+				run: () => {
+					if (this.isPinned(id)) {
+						this.unpin(id);
+					} else {
+						this.pin(id, true);
+					}
+				}
+			}));
+		const otherActions = this.options.getContextMenuActions();
+		if (otherActions.length) {
+			actions.push(new Separator());
+			actions.push(...otherActions);
+		}
+		return actions;
+	}
+}
+
+interface ISerializedCompositeBarItem {
+	id: string;
+	pinned: boolean;
+	order: number;
+	visible: boolean;
+}
+
+interface ICompositeBarItem extends ISerializedCompositeBarItem {
+	name: string;
+	activityAction: ActivityAction;
+	pinnedAction: Action;
+	activity: ICompositeActivity[];
+}
+
+class CompositeBarModel {
+
+	private readonly options: ICompositeBarOptions;
+	readonly items: ICompositeBarItem[];
+
+	activeItem: ICompositeBarItem;
+
+	constructor(
+		options: ICompositeBarOptions,
+		private storageService: IStorageService,
+	) {
+		this.options = options;
+		this.items = this.loadItemStates();
+	}
+
+	get visibleItems(): ICompositeBarItem[] {
+		return this.items.filter(item => item.visible);
+	}
+
+	private createCompositeBarItem(id: string, name: string, order: number, pinned: boolean, visible: boolean): ICompositeBarItem {
+		const options = this.options;
+		return {
+			id, name, pinned, order, visible,
+			activity: [],
+			get activityAction() {
+				return options.getActivityAction(id);
+			},
+			get pinnedAction() {
+				return options.getCompositePinnedAction(id);
+			}
+		};
+	}
+
+	add(id: string, name: string, order: number): boolean {
+		const item = this.findItem(id);
+		if (item) {
+			let changed = false;
+			item.name = name;
+			if (!isUndefinedOrNull(order)) {
+				changed = item.order !== order;
+				item.order = order;
+			}
+			if (!item.visible) {
+				item.visible = true;
+				changed = true;
+			}
+			return changed;
+		} else {
+			const item = this.createCompositeBarItem(id, name, order, true, true);
+			if (isUndefinedOrNull(order)) {
+				this.items.push(item);
+			} else {
+				let index = 0;
+				while (index < this.items.length && this.items[index].order < order) {
+					index++;
+				}
+				this.items.splice(index, 0, item);
+			}
+			return true;
+		}
+	}
+
+	remove(id: string): boolean {
+		for (let index = 0; index < this.items.length; index++) {
+			if (this.items[index].id === id) {
+				this.items.splice(index, 1);
+				return true;
+			}
+		}
+		return false;
+	}
+
+	hide(id: string): boolean {
+		for (const item of this.items) {
+			if (item.id === id) {
+				if (item.visible) {
+					item.visible = false;
+					return true;
+				}
+				return false;
+			}
+		}
+		return false;
+	}
+
+	move(compositeId: string, toCompositeId: string): boolean {
+
+		const fromIndex = this.findIndex(compositeId);
+		const toIndex = this.findIndex(toCompositeId);
+
+		// Make sure both items are known to the model
+		if (fromIndex === -1 || toIndex === -1) {
+			return false;
+		}
+
+		const sourceItem = this.items.splice(fromIndex, 1)[0];
+		this.items.splice(toIndex, 0, sourceItem);
+
+		// Make sure a moved composite gets pinned
+		sourceItem.pinned = true;
+
+		return true;
+	}
+
+	setPinned(id: string, pinned: boolean): boolean {
+		for (let index = 0; index < this.items.length; index++) {
+			const item = this.items[index];
+			if (item.id === id) {
+				if (item.pinned !== pinned) {
+					item.pinned = pinned;
+					return true;
+				}
+				return false;
+			}
+		}
+		return false;
+	}
+
+	addActivity(id: string, activity: ICompositeActivity): boolean {
+		const item = this.findItem(id);
+		if (item) {
+			const stack = item.activity;
+			for (let i = 0; i <= stack.length; i++) {
+				if (i === stack.length) {
+					stack.push(activity);
+					break;
+				} else if (stack[i].priority <= activity.priority) {
+					stack.splice(i, 0, activity);
+					break;
+				}
+			}
+			this.updateActivity(id);
+			return true;
+		}
+		return false;
+	}
+
+	removeActivity(id: string, activity: ICompositeActivity): boolean {
+		const item = this.findItem(id);
+		if (item) {
+			const index = item.activity.indexOf(activity);
+			if (index !== -1) {
+				item.activity.splice(index, 1);
+				this.updateActivity(id);
+				return true;
+			}
+		}
+		return false;
+	}
+
+	updateActivity(id: string): void {
+		const item = this.findItem(id);
+		if (item) {
+			if (item.activity.length) {
+				const [{ badge, clazz }] = item.activity;
+				item.activityAction.setBadge(badge, clazz);
+			}
+			else {
+				item.activityAction.setBadge(undefined);
+			}
+		}
+	}
+
+	activate(id: string): boolean {
+		if (!this.activeItem || this.activeItem.id !== id) {
+			if (this.activeItem) {
+				this.deactivate();
+			}
+			for (let index = 0; index < this.items.length; index++) {
+				const item = this.items[index];
+				if (item.id === id) {
+					this.activeItem = item;
+					this.activeItem.activityAction.activate();
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+
+	deactivate(): boolean {
+		if (this.activeItem) {
+			this.activeItem.activityAction.deactivate();
+			this.activeItem = void 0;
+			return true;
+		}
+		return false;
+	}
+
+	findItem(id: string): ICompositeBarItem {
+		return this.items.filter(item => item.id === id)[0];
+	}
+
+	private findIndex(id: string): number {
+		for (let index = 0; index < this.items.length; index++) {
+			if (this.items[index].id === id) {
+				return index;
+			}
+		}
+		return -1;
+	}
+
+	private loadItemStates(): ICompositeBarItem[] {
+		const storedStates = <Array<string | ISerializedCompositeBarItem>>JSON.parse(this.storageService.get(this.options.storageId, StorageScope.GLOBAL, '[]'));
+		return <ICompositeBarItem[]>storedStates.map(c => {
+			const serialized: ISerializedCompositeBarItem = typeof c === 'string' /* migration from pinned states to composites states */ ? { id: c, pinned: true, order: void 0, visible: true } : c;
+			return this.createCompositeBarItem(serialized.id, void 0, serialized.order, serialized.pinned, isUndefinedOrNull(serialized.visible) ? true : serialized.visible);
+		});
+	}
+
+	saveState(): void {
+		const serialized = this.items.map(({ id, pinned, order, visible }) => ({ id, pinned, order, visible }));
+		this.storageService.store(this.options.storageId, JSON.stringify(serialized), StorageScope.GLOBAL);
+	}
+}
diff --git a/src/vs/workbench/browser/parts/compositeBarActions.ts b/src/vs/workbench/browser/parts/compositeBarActions.ts
new file mode 100644
index 00000000000..5937ddcbad7
--- /dev/null
+++ b/src/vs/workbench/browser/parts/compositeBarActions.ts
@@ -0,0 +1,651 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+import * as nls from 'vs/nls';
+import { Action } from 'vs/base/common/actions';
+import { TPromise } from 'vs/base/common/winjs.base';
+import * as dom from 'vs/base/browser/dom';
+import { BaseActionItem, IBaseActionItemOptions, Separator } from 'vs/base/browser/ui/actionbar/actionbar';
+import { ICommandService } from 'vs/platform/commands/common/commands';
+import { dispose, IDisposable, Disposable, toDisposable } from 'vs/base/common/lifecycle';
+import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
+import { IThemeService, ITheme } from 'vs/platform/theme/common/themeService';
+import { TextBadge, NumberBadge, IBadge, IconBadge, ProgressBadge } from 'vs/workbench/services/activity/common/activity';
+import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { contrastBorder } from 'vs/platform/theme/common/colorRegistry';
+import { DelayedDragHandler } from 'vs/base/browser/dnd';
+import { IActivity } from 'vs/workbench/common/activity';
+import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
+import { Event, Emitter } from 'vs/base/common/event';
+import { DragAndDropObserver, LocalSelectionTransfer } from 'vs/workbench/browser/dnd';
+
+export interface ICompositeActivity {
+	badge: IBadge;
+	clazz: string;
+	priority: number;
+}
+
+export interface ICompositeBar {
+	/**
+	 * Unpins a composite from the composite bar.
+	 */
+	unpin(compositeId: string): void;
+
+	/**
+	 * Pin a composite inside the composite bar.
+	 */
+	pin(compositeId: string): void;
+
+	/**
+	 * Find out if a composite is pinned in the composite bar.
+	 */
+	isPinned(compositeId: string): boolean;
+
+	/**
+	 * Reorder composite ordering by moving a composite to the location of another composite.
+	 */
+	move(compositeId: string, tocompositeId: string): void;
+}
+
+export class ActivityAction extends Action {
+
+	private _onDidChangeActivity = new Emitter<this>();
+	get onDidChangeActivity(): Event<this> { return this._onDidChangeActivity.event; }
+
+	private _onDidChangeBadge = new Emitter<this>();
+	get onDidChangeBadge(): Event<this> { return this._onDidChangeBadge.event; }
+
+	private badge: IBadge;
+	private clazz: string | undefined;
+
+	constructor(private _activity: IActivity) {
+		super(_activity.id, _activity.name, _activity.cssClass);
+
+		this.badge = null;
+	}
+
+	get activity(): IActivity {
+		return this._activity;
+	}
+
+	set activity(activity: IActivity) {
+		this._activity = activity;
+		this._onDidChangeActivity.fire(this);
+	}
+
+	activate(): void {
+		if (!this.checked) {
+			this._setChecked(true);
+		}
+	}
+
+	deactivate(): void {
+		if (this.checked) {
+			this._setChecked(false);
+		}
+	}
+
+	getBadge(): IBadge {
+		return this.badge;
+	}
+
+	getClass(): string | undefined {
+		return this.clazz;
+	}
+
+	setBadge(badge: IBadge, clazz?: string): void {
+		this.badge = badge;
+		this.clazz = clazz;
+		this._onDidChangeBadge.fire(this);
+	}
+
+	dispose(): void {
+		this._onDidChangeActivity.dispose();
+		this._onDidChangeBadge.dispose();
+
+		super.dispose();
+	}
+}
+
+export interface ICompositeBarColors {
+	backgroundColor: string;
+	badgeBackground: string;
+	badgeForeground: string;
+	dragAndDropBackground: string;
+}
+
+export interface IActivityActionItemOptions extends IBaseActionItemOptions {
+	icon?: boolean;
+	colors: ICompositeBarColors;
+}
+
+export class ActivityActionItem extends BaseActionItem {
+	protected container: HTMLElement;
+	protected label: HTMLElement;
+	protected badge: HTMLElement;
+	protected options: IActivityActionItemOptions;
+
+	private badgeContent: HTMLElement;
+	private badgeDisposable: IDisposable = Disposable.None;
+	private mouseUpTimeout: number;
+
+	constructor(
+		action: ActivityAction,
+		options: IActivityActionItemOptions,
+		@IThemeService protected themeService: IThemeService
+	) {
+		super(null, action, options);
+
+		this._register(this.themeService.onThemeChange(this.onThemeChange, this));
+		this._register(action.onDidChangeActivity(this.updateActivity, this));
+		this._register(action.onDidChangeBadge(this.updateBadge, this));
+	}
+
+	protected get activity(): IActivity {
+		return (this._action as ActivityAction).activity;
+	}
+
+	protected updateStyles(): void {
+		const theme = this.themeService.getTheme();
+
+		// Label
+		if (this.label && this.options.icon) {
+			const background = theme.getColor(this.options.colors.backgroundColor);
+
+			this.label.style.backgroundColor = background ? background.toString() : null;
+		}
+
+		// Badge
+		if (this.badgeContent) {
+			const badgeForeground = theme.getColor(this.options.colors.badgeForeground);
+			const badgeBackground = theme.getColor(this.options.colors.badgeBackground);
+			const contrastBorderColor = theme.getColor(contrastBorder);
+
+			this.badgeContent.style.color = badgeForeground ? badgeForeground.toString() : null;
+			this.badgeContent.style.backgroundColor = badgeBackground ? badgeBackground.toString() : null;
+
+			this.badgeContent.style.borderStyle = contrastBorderColor ? 'solid' : null;
+			this.badgeContent.style.borderWidth = contrastBorderColor ? '1px' : null;
+			this.badgeContent.style.borderColor = contrastBorderColor ? contrastBorderColor.toString() : null;
+		}
+	}
+
+	render(container: HTMLElement): void {
+		super.render(container);
+
+		this.container = container;
+
+		// Make the container tab-able for keyboard navigation
+		this.container.tabIndex = 0;
+		this.container.setAttribute('role', this.options.icon ? 'button' : 'tab');
+
+		// Try hard to prevent keyboard only focus feedback when using mouse
+		this._register(dom.addDisposableListener(this.container, dom.EventType.MOUSE_DOWN, () => {
+			dom.addClass(this.container, 'clicked');
+		}));
+
+		this._register(dom.addDisposableListener(this.container, dom.EventType.MOUSE_UP, () => {
+			if (this.mouseUpTimeout) {
+				clearTimeout(this.mouseUpTimeout);
+			}
+
+			this.mouseUpTimeout = setTimeout(() => {
+				dom.removeClass(this.container, 'clicked');
+			}, 800); // delayed to prevent focus feedback from showing on mouse up
+		}));
+
+		// Label
+		this.label = dom.append(this.element, dom.$('a.action-label'));
+
+		// Badge
+		this.badge = dom.append(this.element, dom.$('.badge'));
+		this.badgeContent = dom.append(this.badge, dom.$('.badge-content'));
+
+		dom.hide(this.badge);
+
+		this.updateActivity();
+		this.updateStyles();
+	}
+
+	private onThemeChange(theme: ITheme): void {
+		this.updateStyles();
+	}
+
+	protected updateActivity(): void {
+		this.updateLabel();
+		this.updateTitle(this.activity.name);
+		this.updateBadge();
+	}
+
+	protected updateBadge(): void {
+		const action = this.getAction();
+		if (!this.badge || !this.badgeContent || !(action instanceof ActivityAction)) {
+			return;
+		}
+
+		const badge = action.getBadge();
+		const clazz = action.getClass();
+
+		this.badgeDisposable.dispose();
+		this.badgeDisposable = Disposable.None;
+
+		dom.clearNode(this.badgeContent);
+		dom.hide(this.badge);
+
+		if (badge) {
+
+			// Number
+			if (badge instanceof NumberBadge) {
+				if (badge.number) {
+					let number = badge.number.toString();
+					if (badge.number > 9999) {
+						number = nls.localize('largeNumberBadge', '10k+');
+					} else if (badge.number > 999) {
+						number = number.charAt(0) + 'k';
+					}
+					this.badgeContent.textContent = number;
+					dom.show(this.badge);
+				}
+			}
+
+			// Text
+			else if (badge instanceof TextBadge) {
+				this.badgeContent.textContent = badge.text;
+				dom.show(this.badge);
+			}
+
+			// Text
+			else if (badge instanceof IconBadge) {
+				dom.show(this.badge);
+			}
+
+			// Progress
+			else if (badge instanceof ProgressBadge) {
+				dom.show(this.badge);
+			}
+
+			if (clazz) {
+				dom.addClasses(this.badge, clazz);
+				this.badgeDisposable = toDisposable(() => dom.removeClasses(this.badge, clazz));
+			}
+		}
+
+		// Title
+		let title: string;
+		if (badge && badge.getDescription()) {
+			if (this.activity.name) {
+				title = nls.localize('badgeTitle', "{0} - {1}", this.activity.name, badge.getDescription());
+			} else {
+				title = badge.getDescription();
+			}
+		} else {
+			title = this.activity.name;
+		}
+		this.updateTitle(title);
+	}
+
+	protected updateLabel(): void {
+		if (this.activity.cssClass) {
+			dom.addClasses(this.label, this.activity.cssClass);
+		}
+		if (!this.options.icon) {
+			this.label.textContent = this.getAction().label;
+		}
+	}
+
+	private updateTitle(title: string): void {
+		[this.label, this.badge, this.container].forEach(element => {
+			if (element) {
+				element.setAttribute('aria-label', title);
+				element.title = title;
+			}
+		});
+	}
+
+	dispose(): void {
+		super.dispose();
+
+		if (this.mouseUpTimeout) {
+			clearTimeout(this.mouseUpTimeout);
+		}
+
+		this.badge.remove();
+	}
+}
+
+export class CompositeOverflowActivityAction extends ActivityAction {
+
+	constructor(
+		private showMenu: () => void
+	) {
+		super({
+			id: 'additionalComposites.action',
+			name: nls.localize('additionalViews', "Additional Views"),
+			cssClass: 'toggle-more'
+		});
+	}
+
+	run(event: any): TPromise<any> {
+		this.showMenu();
+
+		return TPromise.as(true);
+	}
+}
+
+export class CompositeOverflowActivityActionItem extends ActivityActionItem {
+	private actions: Action[];
+
+	constructor(
+		action: ActivityAction,
+		private getOverflowingComposites: () => { id: string, name: string }[],
+		private getActiveCompositeId: () => string,
+		private getBadge: (compositeId: string) => IBadge,
+		private getCompositeOpenAction: (compositeId: string) => Action,
+		colors: ICompositeBarColors,
+		@IContextMenuService private contextMenuService: IContextMenuService,
+		@IThemeService themeService: IThemeService
+	) {
+		super(action, { icon: true, colors }, themeService);
+	}
+
+	showMenu(): void {
+		if (this.actions) {
+			dispose(this.actions);
+		}
+
+		this.actions = this.getActions();
+
+		this.contextMenuService.showContextMenu({
+			getAnchor: () => this.element,
+			getActions: () => TPromise.as(this.actions),
+			onHide: () => dispose(this.actions)
+		});
+	}
+
+	private getActions(): Action[] {
+		return this.getOverflowingComposites().map(composite => {
+			const action = this.getCompositeOpenAction(composite.id);
+			action.radio = this.getActiveCompositeId() === action.id;
+
+			const badge = this.getBadge(composite.id);
+			let suffix: string | number;
+			if (badge instanceof NumberBadge) {
+				suffix = badge.number;
+			} else if (badge instanceof TextBadge) {
+				suffix = badge.text;
+			}
+
+			if (suffix) {
+				action.label = nls.localize('numberBadge', "{0} ({1})", composite.name, suffix);
+			} else {
+				action.label = composite.name;
+			}
+
+			return action;
+		});
+	}
+
+	dispose(): void {
+		super.dispose();
+
+		this.actions = dispose(this.actions);
+	}
+}
+
+class ManageExtensionAction extends Action {
+
+	constructor(
+		@ICommandService private commandService: ICommandService
+	) {
+		super('activitybar.manage.extension', nls.localize('manageExtension', "Manage Extension"));
+	}
+
+	run(id: string): TPromise<any> {
+		return this.commandService.executeCommand('_extensions.manage', id);
+	}
+}
+
+export class DraggedCompositeIdentifier {
+	constructor(private _compositeId: string) { }
+
+	get id(): string {
+		return this._compositeId;
+	}
+}
+
+export class CompositeActionItem extends ActivityActionItem {
+
+	private static manageExtensionAction: ManageExtensionAction;
+
+	private compositeActivity: IActivity;
+	private cssClass: string;
+	private compositeTransfer: LocalSelectionTransfer<DraggedCompositeIdentifier>;
+
+	constructor(
+		private compositeActivityAction: ActivityAction,
+		private toggleCompositePinnedAction: Action,
+		private contextMenuActionsProvider: () => Action[],
+		colors: ICompositeBarColors,
+		icon: boolean,
+		private compositeBar: ICompositeBar,
+		@IContextMenuService private contextMenuService: IContextMenuService,
+		@IKeybindingService private keybindingService: IKeybindingService,
+		@IInstantiationService instantiationService: IInstantiationService,
+		@IThemeService themeService: IThemeService
+	) {
+		super(compositeActivityAction, { draggable: true, colors, icon }, themeService);
+
+		this.cssClass = compositeActivityAction.class;
+		this.compositeTransfer = LocalSelectionTransfer.getInstance<DraggedCompositeIdentifier>();
+
+		if (!CompositeActionItem.manageExtensionAction) {
+			CompositeActionItem.manageExtensionAction = instantiationService.createInstance(ManageExtensionAction);
+		}
+
+		this._register(compositeActivityAction.onDidChangeActivity(() => { this.compositeActivity = null; this.updateActivity(); }, this));
+	}
+
+	protected get activity(): IActivity {
+		if (!this.compositeActivity) {
+			let activityName: string;
+			const keybinding = this.getKeybindingLabel(this.compositeActivityAction.activity.keybindingId);
+			if (keybinding) {
+				activityName = nls.localize('titleKeybinding', "{0} ({1})", this.compositeActivityAction.activity.name, keybinding);
+			} else {
+				activityName = this.compositeActivityAction.activity.name;
+			}
+
+			this.compositeActivity = {
+				id: this.compositeActivityAction.activity.id,
+				cssClass: this.cssClass,
+				name: activityName
+			};
+		}
+
+		return this.compositeActivity;
+	}
+
+	private getKeybindingLabel(id: string): string {
+		const kb = this.keybindingService.lookupKeybinding(id);
+		if (kb) {
+			return kb.getLabel();
+		}
+
+		return null;
+	}
+
+	render(container: HTMLElement): void {
+		super.render(container);
+
+		this.updateChecked();
+		this.updateEnabled();
+
+		this._register(dom.addDisposableListener(this.container, dom.EventType.CONTEXT_MENU, e => {
+			dom.EventHelper.stop(e, true);
+
+			this.showContextMenu(container);
+		}));
+
+		// Allow to drag
+		this._register(dom.addDisposableListener(this.container, dom.EventType.DRAG_START, (e: DragEvent) => {
+			e.dataTransfer.effectAllowed = 'move';
+
+			// Registe as dragged to local transfer
+			this.compositeTransfer.setData([new DraggedCompositeIdentifier(this.activity.id)], DraggedCompositeIdentifier.prototype);
+
+			// Trigger the action even on drag start to prevent clicks from failing that started a drag
+			if (!this.getAction().checked) {
+				this.getAction().run();
+			}
+		}));
+
+		this._register(new DragAndDropObserver(this.container, {
+			onDragEnter: e => {
+				if (this.compositeTransfer.hasData(DraggedCompositeIdentifier.prototype) && this.compositeTransfer.getData(DraggedCompositeIdentifier.prototype)[0].id !== this.activity.id) {
+					this.updateFromDragging(container, true);
+				}
+			},
+
+			onDragLeave: e => {
+				if (this.compositeTransfer.hasData(DraggedCompositeIdentifier.prototype)) {
+					this.updateFromDragging(container, false);
+				}
+			},
+
+			onDragEnd: e => {
+				if (this.compositeTransfer.hasData(DraggedCompositeIdentifier.prototype)) {
+					this.updateFromDragging(container, false);
+
+					this.compositeTransfer.clearData(DraggedCompositeIdentifier.prototype);
+				}
+			},
+
+			onDrop: e => {
+				dom.EventHelper.stop(e, true);
+
+				if (this.compositeTransfer.hasData(DraggedCompositeIdentifier.prototype)) {
+					const draggedCompositeId = this.compositeTransfer.getData(DraggedCompositeIdentifier.prototype)[0].id;
+					if (draggedCompositeId !== this.activity.id) {
+						this.updateFromDragging(container, false);
+						this.compositeTransfer.clearData(DraggedCompositeIdentifier.prototype);
+
+						this.compositeBar.move(draggedCompositeId, this.activity.id);
+					}
+				}
+			}
+		}));
+
+		// Activate on drag over to reveal targets
+		[this.badge, this.label].forEach(b => new DelayedDragHandler(b, () => {
+			if (!this.compositeTransfer.hasData(DraggedCompositeIdentifier.prototype) && !this.getAction().checked) {
+				this.getAction().run();
+			}
+		}));
+
+		this.updateStyles();
+	}
+
+	private updateFromDragging(element: HTMLElement, isDragging: boolean): void {
+		const theme = this.themeService.getTheme();
+		const dragBackground = theme.getColor(this.options.colors.dragAndDropBackground);
+
+		element.style.backgroundColor = isDragging && dragBackground ? dragBackground.toString() : null;
+	}
+
+	private showContextMenu(container: HTMLElement): void {
+		const actions: Action[] = [this.toggleCompositePinnedAction];
+		if ((<any>this.compositeActivityAction.activity).extensionId) {
+			actions.push(new Separator());
+			actions.push(CompositeActionItem.manageExtensionAction);
+		}
+
+		const isPinned = this.compositeBar.isPinned(this.activity.id);
+		if (isPinned) {
+			this.toggleCompositePinnedAction.label = nls.localize('hide', "Hide");
+			this.toggleCompositePinnedAction.checked = false;
+		} else {
+			this.toggleCompositePinnedAction.label = nls.localize('keep', "Keep");
+		}
+
+		const otherActions = this.contextMenuActionsProvider();
+		if (otherActions.length) {
+			actions.push(new Separator());
+			actions.push(...otherActions);
+		}
+
+		this.contextMenuService.showContextMenu({
+			getAnchor: () => container,
+			getActionsContext: () => this.activity.id,
+			getActions: () => TPromise.as(actions)
+		});
+	}
+
+	focus(): void {
+		this.container.focus();
+	}
+
+	protected updateClass(): void {
+		if (this.cssClass) {
+			dom.removeClasses(this.label, this.cssClass);
+		}
+
+		this.cssClass = this.getAction().class;
+		if (this.cssClass) {
+			dom.addClasses(this.label, this.cssClass);
+		}
+	}
+
+	protected updateChecked(): void {
+		if (this.getAction().checked) {
+			dom.addClass(this.container, 'checked');
+			this.container.setAttribute('aria-label', nls.localize('compositeActive', "{0} active", this.container.title));
+		} else {
+			dom.removeClass(this.container, 'checked');
+			this.container.setAttribute('aria-label', this.container.title);
+		}
+	}
+
+	protected updateEnabled(): void {
+		if (this.getAction().enabled) {
+			dom.removeClass(this.element, 'disabled');
+		} else {
+			dom.addClass(this.element, 'disabled');
+		}
+	}
+
+	dispose(): void {
+		super.dispose();
+
+		this.compositeTransfer.clearData(DraggedCompositeIdentifier.prototype);
+
+		this.label.remove();
+	}
+}
+
+export class ToggleCompositePinnedAction extends Action {
+
+	constructor(
+		private activity: IActivity,
+		private compositeBar: ICompositeBar
+	) {
+		super('show.toggleCompositePinned', activity ? activity.name : nls.localize('toggle', "Toggle View Pinned"));
+
+		this.checked = this.activity && this.compositeBar.isPinned(this.activity.id);
+	}
+
+	run(context: string): TPromise<any> {
+		const id = this.activity ? this.activity.id : context;
+
+		if (this.compositeBar.isPinned(id)) {
+			this.compositeBar.unpin(id);
+		} else {
+			this.compositeBar.pin(id);
+		}
+
+		return TPromise.as(true);
+	}
+}
diff --git a/src/vs/workbench/browser/parts/compositePart.ts b/src/vs/workbench/browser/parts/compositePart.ts
index 7eba9f60160..ac8e350ea58 100644
--- a/src/vs/workbench/browser/parts/compositePart.ts
+++ b/src/vs/workbench/browser/parts/compositePart.ts
@@ -10,7 +10,6 @@ import * as nls from 'vs/nls';
 import { defaultGenerator } from 'vs/base/common/idGenerator';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
-import { Builder, $ } from 'vs/base/browser/builder';
 import * as strings from 'vs/base/common/strings';
 import { Emitter } from 'vs/base/common/event';
 import * as types from 'vs/base/common/types';
@@ -35,7 +34,7 @@ import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { attachProgressBarStyler } from 'vs/platform/theme/common/styler';
 import { INotificationService } from 'vs/platform/notification/common/notification';
-import { Dimension } from 'vs/base/browser/dom';
+import { Dimension, append, $, addClass, hide, show, addClasses } from 'vs/base/browser/dom';
 
 export interface ICompositeTitleLabel {
 
@@ -51,21 +50,24 @@ export interface ICompositeTitleLabel {
 }
 
 export abstract class CompositePart<T extends Composite> extends Part {
+
+	protected _onDidCompositeOpen = this._register(new Emitter<IComposite>());
+	protected _onDidCompositeClose = this._register(new Emitter<IComposite>());
+
+	protected toolBar: ToolBar;
+
 	private instantiatedCompositeListeners: IDisposable[];
-	private mapCompositeToCompositeContainer: { [compositeId: string]: Builder; };
+	private mapCompositeToCompositeContainer: { [compositeId: string]: HTMLElement; };
 	private mapActionsBindingToComposite: { [compositeId: string]: () => void; };
 	private mapProgressServiceToComposite: { [compositeId: string]: IProgressService; };
 	private activeComposite: Composite;
 	private lastActiveCompositeId: string;
 	private instantiatedComposites: Composite[];
 	private titleLabel: ICompositeTitleLabel;
-	protected toolBar: ToolBar;
 	private progressBar: ProgressBar;
 	private contentAreaSize: Dimension;
 	private telemetryActionsListener: IDisposable;
 	private currentCompositeOpenToken: string;
-	protected _onDidCompositeOpen = new Emitter<IComposite>();
-	protected _onDidCompositeClose = new Emitter<IComposite>();
 
 	constructor(
 		private notificationService: INotificationService,
@@ -219,13 +221,12 @@ export abstract class CompositePart<T extends Composite> extends Part {
 		if (!compositeContainer) {
 
 			// Build Container off-DOM
-			compositeContainer = $().div({
-				'class': ['composite', this.compositeCSSClass],
-				id: composite.getId()
-			}, div => {
-				createCompositePromise = composite.create(div.getHTMLElement()).then(() => {
-					composite.updateStyles();
-				});
+			compositeContainer = $('.composite');
+			addClasses(compositeContainer, this.compositeCSSClass);
+			compositeContainer.id = composite.getId();
+
+			createCompositePromise = composite.create(compositeContainer).then(() => {
+				composite.updateStyles();
 			});
 
 			// Remember composite container
@@ -252,8 +253,8 @@ export abstract class CompositePart<T extends Composite> extends Part {
 			}
 
 			// Take Composite on-DOM and show
-			compositeContainer.build(this.getContentArea());
-			compositeContainer.show();
+			this.getContentArea().appendChild(compositeContainer);
+			show(compositeContainer);
 
 			// Setup action runner
 			this.toolBar.actionRunner = composite.getActionRunner();
@@ -386,8 +387,8 @@ export abstract class CompositePart<T extends Composite> extends Part {
 		return composite.setVisible(false).then(() => {
 
 			// Take Container Off-DOM and hide
-			compositeContainer.offDOM();
-			compositeContainer.hide();
+			compositeContainer.remove();
+			hide(compositeContainer);
 
 			// Clear any running Progress
 			this.progressBar.stop().hide();
@@ -400,48 +401,41 @@ export abstract class CompositePart<T extends Composite> extends Part {
 		});
 	}
 
-	public createTitleArea(parent: HTMLElement): HTMLElement {
+	createTitleArea(parent: HTMLElement): HTMLElement {
 
 		// Title Area Container
-		const titleArea = $(parent).div({
-			'class': ['composite', 'title']
-		});
+		const titleArea = append(parent, $('.composite'));
+		addClass(titleArea, 'title');
 
 		// Left Title Label
-		this.titleLabel = this.createTitleLabel(titleArea.getHTMLElement());
+		this.titleLabel = this.createTitleLabel(titleArea);
 
 		// Right Actions Container
-		$(titleArea).div({
-			'class': 'title-actions'
-		}, div => {
+		const titleActionsContainer = append(titleArea, $('.title-actions'));
 
-			// Toolbar
-			this.toolBar = new ToolBar(div.getHTMLElement(), this.contextMenuService, {
-				actionItemProvider: action => this.actionItemProvider(action as Action),
-				orientation: ActionsOrientation.HORIZONTAL,
-				getKeyBinding: action => this.keybindingService.lookupKeybinding(action.id)
-			});
-		});
+		// Toolbar
+		this.toolBar = this._register(new ToolBar(titleActionsContainer, this.contextMenuService, {
+			actionItemProvider: action => this.actionItemProvider(action as Action),
+			orientation: ActionsOrientation.HORIZONTAL,
+			getKeyBinding: action => this.keybindingService.lookupKeybinding(action.id)
+		}));
 
-		return titleArea.getHTMLElement();
+		return titleArea;
 	}
 
 	protected createTitleLabel(parent: HTMLElement): ICompositeTitleLabel {
-		let titleLabel: Builder;
-		$(parent).div({
-			'class': 'title-label'
-		}, div => {
-			titleLabel = div.span();
-		});
+		const titleContainer = append(parent, $('.title-label'));
+		const titleLabel = append(titleContainer, $('h2'));
 
 		const $this = this;
 		return {
 			updateTitle: (id, title, keybinding) => {
-				titleLabel.safeInnerHtml(title);
-				titleLabel.title(keybinding ? nls.localize('titleTooltip', "{0} ({1})", title, keybinding) : title);
+				titleLabel.innerHTML = strings.escape(title);
+				titleLabel.title = keybinding ? nls.localize('titleTooltip', "{0} ({1})", title, keybinding) : title;
 			},
+
 			updateStyles: () => {
-				titleLabel.style('color', $this.getColor($this.titleForegroundColor));
+				titleLabel.style.color = $this.getColor($this.titleForegroundColor);
 			}
 		};
 	}
@@ -463,21 +457,21 @@ export abstract class CompositePart<T extends Composite> extends Part {
 		return undefined;
 	}
 
-	public createContentArea(parent: HTMLElement): HTMLElement {
-		return $(parent).div({
-			'class': 'content'
-		}, div => {
-			this.progressBar = new ProgressBar(div.getHTMLElement());
-			this.toUnbind.push(attachProgressBarStyler(this.progressBar, this.themeService));
-			this.progressBar.hide();
-		}).getHTMLElement();
+	createContentArea(parent: HTMLElement): HTMLElement {
+		const contentContainer = append(parent, $('.content'));
+
+		this.progressBar = this._register(new ProgressBar(contentContainer));
+		this._register(attachProgressBarStyler(this.progressBar, this.themeService));
+		this.progressBar.hide();
+
+		return contentContainer;
 	}
 
 	private onError(error: any): void {
 		this.notificationService.error(types.isString(error) ? new Error(error) : error);
 	}
 
-	public getProgressIndicator(id: string): IProgressService {
+	getProgressIndicator(id: string): IProgressService {
 		return this.mapProgressServiceToComposite[id];
 	}
 
@@ -489,7 +483,7 @@ export abstract class CompositePart<T extends Composite> extends Part {
 		return [];
 	}
 
-	public layout(dimension: Dimension): Dimension[] {
+	layout(dimension: Dimension): Dimension[] {
 
 		// Pass to super
 		const sizes = super.layout(dimension);
@@ -503,13 +497,13 @@ export abstract class CompositePart<T extends Composite> extends Part {
 		return sizes;
 	}
 
-	public shutdown(): void {
+	shutdown(): void {
 		this.instantiatedComposites.forEach(i => i.shutdown());
 
 		super.shutdown();
 	}
 
-	public dispose(): void {
+	dispose(): void {
 		this.mapCompositeToCompositeContainer = null;
 		this.mapProgressServiceToComposite = null;
 		this.mapActionsBindingToComposite = null;
@@ -519,13 +513,8 @@ export abstract class CompositePart<T extends Composite> extends Part {
 		}
 
 		this.instantiatedComposites = [];
-
 		this.instantiatedCompositeListeners = dispose(this.instantiatedCompositeListeners);
 
-		this.progressBar.dispose();
-		this.toolBar.dispose();
-
-		// Super Dispose
 		super.dispose();
 	}
 }
diff --git a/src/vs/workbench/browser/parts/compositebar/compositeBar.ts b/src/vs/workbench/browser/parts/compositebar/compositeBar.ts
deleted file mode 100644
index 54b7a6c74e0..00000000000
--- a/src/vs/workbench/browser/parts/compositebar/compositeBar.ts
+++ /dev/null
@@ -1,626 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-'use strict';
-
-import * as nls from 'vs/nls';
-import { Action, IAction } from 'vs/base/common/actions';
-import { illegalArgument } from 'vs/base/common/errors';
-import * as arrays from 'vs/base/common/arrays';
-import { IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { IBadge } from 'vs/workbench/services/activity/common/activity';
-import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ActionBar, ActionsOrientation, Separator } from 'vs/base/browser/ui/actionbar/actionbar';
-import { CompositeActionItem, CompositeOverflowActivityAction, ICompositeActivity, CompositeOverflowActivityActionItem, ActivityAction, ICompositeBar, ICompositeBarColors } from 'vs/workbench/browser/parts/compositebar/compositeBarActions';
-import { TPromise } from 'vs/base/common/winjs.base';
-import { Dimension, $, addDisposableListener, EventType, EventHelper } from 'vs/base/browser/dom';
-import { StandardMouseEvent } from 'vs/base/browser/mouseEvent';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { Widget } from 'vs/base/browser/ui/widget';
-
-export interface ICompositeBarOptions {
-	icon: boolean;
-	storageId: string;
-	orientation: ActionsOrientation;
-	colors: ICompositeBarColors;
-	compositeSize: number;
-	overflowActionSize: number;
-	getActivityAction: (compositeId: string) => ActivityAction;
-	getCompositePinnedAction: (compositeId: string) => Action;
-	getOnCompositeClickAction: (compositeId: string) => Action;
-	getContextMenuActions: () => Action[];
-	openComposite: (compositeId: string) => TPromise<any>;
-	getDefaultCompositeId: () => string;
-	hidePart: () => TPromise<any>;
-}
-
-export class CompositeBar extends Widget implements ICompositeBar {
-
-	private dimension: Dimension;
-
-	private compositeSwitcherBar: ActionBar;
-	private compositeOverflowAction: CompositeOverflowActivityAction;
-	private compositeOverflowActionItem: CompositeOverflowActivityActionItem;
-
-	private model: CompositeBarModel;
-	private storedState: ISerializedCompositeBarItem[];
-	private visibleComposites: string[];
-	private compositeSizeInBar: Map<string, number>;
-
-	constructor(
-		private options: ICompositeBarOptions,
-		@IInstantiationService private instantiationService: IInstantiationService,
-		@IStorageService private storageService: IStorageService,
-		@IContextMenuService private contextMenuService: IContextMenuService
-	) {
-		super();
-		this.model = new CompositeBarModel(options);
-		this.storedState = this.loadCompositeItemsFromStorage();
-		this.visibleComposites = [];
-		this.compositeSizeInBar = new Map<string, number>();
-	}
-
-	public getCompositesFromStorage(): string[] {
-		return this.storedState.map(s => s.id);
-	}
-
-	public create(parent: HTMLElement): HTMLElement {
-		const actionBarDiv = parent.appendChild($('.composite-bar'));
-		this.compositeSwitcherBar = this._register(new ActionBar(actionBarDiv, {
-			actionItemProvider: (action: Action) => {
-				if (action instanceof CompositeOverflowActivityAction) {
-					return this.compositeOverflowActionItem;
-				}
-				const item = this.model.findItem(action.id);
-				return item && this.instantiationService.createInstance(CompositeActionItem, action, item.pinnedAction, this.options.colors, this.options.icon, this);
-			},
-			orientation: this.options.orientation,
-			ariaLabel: nls.localize('activityBarAriaLabel', "Active View Switcher"),
-			animated: false,
-		}));
-
-		// Contextmenu for composites
-		this._register(addDisposableListener(parent, EventType.CONTEXT_MENU, e => this.showContextMenu(e)));
-
-		// Allow to drop at the end to move composites to the end
-		this._register(addDisposableListener(parent, EventType.DROP, (e: DragEvent) => {
-			const draggedCompositeId = CompositeActionItem.getDraggedCompositeId();
-			if (draggedCompositeId) {
-				EventHelper.stop(e, true);
-				CompositeActionItem.clearDraggedComposite();
-
-				const targetItem = this.model.items[this.model.items.length - 1];
-				if (targetItem && targetItem.id !== draggedCompositeId) {
-					this.move(draggedCompositeId, targetItem.id);
-				}
-			}
-		}));
-
-		return actionBarDiv;
-	}
-
-	public layout(dimension: Dimension): void {
-		this.dimension = dimension;
-		if (dimension.height === 0 || dimension.width === 0) {
-			// Do not layout if not visible. Otherwise the size measurment would be computed wrongly
-			return;
-		}
-
-		if (this.compositeSizeInBar.size === 0) {
-			// Compute size of each composite by getting the size from the css renderer
-			// Size is later used for overflow computation
-			this.computeSizes(this.model.items);
-		}
-
-		this.updateCompositeSwitcher();
-	}
-
-	public addComposite({ id, name, order }: { id: string; name: string, order: number }): void {
-		const state = this.storedState.filter(s => s.id === id)[0];
-		const pinned = state ? state.pinned : true;
-		let index = order >= 0 ? order : this.model.items.length;
-
-		if (state) {
-			// Find the index by looking its previous item
-			index = 0;
-			for (let i = this.storedState.indexOf(state) - 1; i >= 0; i--) {
-				const previousItemId = this.storedState[i].id;
-				const previousItemIndex = this.model.findIndex(previousItemId);
-				if (previousItemIndex !== -1) {
-					index = previousItemIndex + 1;
-					break;
-				}
-			}
-		}
-
-		// Add to the model
-		if (this.model.add(id, name, order, index)) {
-			this.computeSizes([this.model.findItem(id)]);
-			if (pinned) {
-				this.pin(id);
-			} else {
-				this.updateCompositeSwitcher();
-			}
-		}
-	}
-
-	public removeComposite(id: string): void {
-
-		// If it pinned, unpin it first
-		if (this.isPinned(id)) {
-			this.unpin(id);
-		}
-
-		// Remove from the model
-		if (this.model.remove(id)) {
-			this.updateCompositeSwitcher();
-		}
-	}
-
-	public activateComposite(id: string): void {
-		const previousActiveItem = this.model.activeItem;
-		if (this.model.activate(id)) {
-			// Update if current composite is neither visible nor pinned
-			// or previous active composite is not pinned
-			if (this.visibleComposites.indexOf(id) === - 1 || !this.model.activeItem.pinned || (previousActiveItem && !previousActiveItem.pinned)) {
-				this.updateCompositeSwitcher();
-			}
-		}
-	}
-
-	public deactivateComposite(id: string): void {
-		const previousActiveItem = this.model.activeItem;
-		if (this.model.deactivate()) {
-			if (previousActiveItem && !previousActiveItem.pinned) {
-				this.updateCompositeSwitcher();
-			}
-		}
-	}
-
-	public showActivity(compositeId: string, badge: IBadge, clazz?: string, priority?: number): IDisposable {
-		if (!badge) {
-			throw illegalArgument('badge');
-		}
-
-		if (typeof priority !== 'number') {
-			priority = 0;
-		}
-
-		const activity: ICompositeActivity = { badge, clazz, priority };
-		this.model.addActivity(compositeId, activity);
-		return toDisposable(() => this.model.removeActivity(compositeId, activity));
-	}
-
-	public pin(compositeId: string, open?: boolean): void {
-		if (this.model.setPinned(compositeId, true)) {
-			this.updateCompositeSwitcher();
-
-			if (open) {
-				this.options.openComposite(compositeId)
-					.done(() => this.activateComposite(compositeId)); // Activate after opening
-			}
-		}
-	}
-
-	public unpin(compositeId: string): void {
-		if (this.model.setPinned(compositeId, false)) {
-
-			this.updateCompositeSwitcher();
-
-			const defaultCompositeId = this.options.getDefaultCompositeId();
-
-			// Case: composite is not the active one or the active one is a different one
-			// Solv: we do nothing
-			if (!this.model.activeItem || this.model.activeItem.id !== compositeId) {
-				return;
-			}
-
-			// Deactivate itself
-			this.deactivateComposite(compositeId);
-
-			// Case: composite is not the default composite and default composite is still showing
-			// Solv: we open the default composite
-			if (defaultCompositeId !== compositeId && this.isPinned(defaultCompositeId)) {
-				this.options.openComposite(defaultCompositeId);
-			}
-
-			// Case: we closed the last visible composite
-			// Solv: we hide the part
-			else if (this.visibleComposites.length === 1) {
-				this.options.hidePart();
-			}
-
-			// Case: we closed the default composite
-			// Solv: we open the next visible composite from top
-			else {
-				this.options.openComposite(this.visibleComposites.filter(cid => cid !== compositeId)[0]);
-			}
-
-		}
-
-	}
-
-	public isPinned(compositeId: string): boolean {
-		const item = this.model.findItem(compositeId);
-		return item && item.pinned;
-	}
-
-	public move(compositeId: string, toCompositeId: string): void {
-		if (this.model.move(compositeId, toCompositeId)) {
-			// timeout helps to prevent artifacts from showing up
-			setTimeout(() => this.updateCompositeSwitcher(), 0);
-		}
-	}
-
-	public getAction(compositeId): ActivityAction {
-		const item = this.model.findItem(compositeId);
-		return item && item.activityAction;
-	}
-
-	private computeSizes(items: ICompositeBarItem[]): void {
-		const size = this.options.compositeSize;
-		if (size) {
-			items.forEach(composite => this.compositeSizeInBar.set(composite.id, size));
-		} else {
-			if (this.dimension && this.dimension.height !== 0 && this.dimension.width !== 0) {
-				// Compute sizes only if visible. Otherwise the size measurment would be computed wrongly.
-				const currentItemsLength = this.compositeSwitcherBar.items.length;
-				this.compositeSwitcherBar.push(items.map(composite => composite.activityAction));
-				items.map((composite, index) => this.compositeSizeInBar.set(composite.id, this.options.orientation === ActionsOrientation.VERTICAL
-					? this.compositeSwitcherBar.getHeight(currentItemsLength + index)
-					: this.compositeSwitcherBar.getWidth(currentItemsLength + index)
-				));
-				items.forEach(() => this.compositeSwitcherBar.pull(this.compositeSwitcherBar.items.length - 1));
-			}
-		}
-	}
-
-	private updateCompositeSwitcher(): void {
-		if (!this.compositeSwitcherBar || !this.dimension) {
-			return; // We have not been rendered yet so there is nothing to update.
-		}
-
-		let compositesToShow = this.model.items.filter(item =>
-			item.pinned
-			|| (this.model.activeItem && this.model.activeItem.id === item.id) /* Show the active composite even if it is not pinned */
-		).map(item => item.id);
-
-		// Ensure we are not showing more composites than we have height for
-		let overflows = false;
-		let maxVisible = compositesToShow.length;
-		let size = 0;
-		const limit = this.options.orientation === ActionsOrientation.VERTICAL ? this.dimension.height : this.dimension.width;
-		for (let i = 0; i < compositesToShow.length && size <= limit; i++) {
-			size += this.compositeSizeInBar.get(compositesToShow[i]);
-			if (size > limit) {
-				maxVisible = i;
-			}
-		}
-		overflows = compositesToShow.length > maxVisible;
-
-		if (overflows) {
-			size -= this.compositeSizeInBar.get(compositesToShow[maxVisible]);
-			compositesToShow = compositesToShow.slice(0, maxVisible);
-			size += this.options.overflowActionSize;
-		}
-		// Check if we need to make extra room for the overflow action
-		if (size > limit) {
-			size -= this.compositeSizeInBar.get(compositesToShow.pop());
-		}
-
-		// We always try show the active composite
-		if (this.model.activeItem && compositesToShow.every(compositeId => compositeId !== this.model.activeItem.id)) {
-			const removedComposite = compositesToShow.pop();
-			size = size - this.compositeSizeInBar.get(removedComposite) + this.compositeSizeInBar.get(this.model.activeItem.id);
-			compositesToShow.push(this.model.activeItem.id);
-		}
-
-		// The active composite might have bigger size than the removed composite, check for overflow again
-		if (size > limit) {
-			compositesToShow.length ? compositesToShow.splice(compositesToShow.length - 2, 1) : compositesToShow.pop();
-		}
-
-		const visibleCompositesChange = !arrays.equals(compositesToShow, this.visibleComposites);
-
-		// Pull out overflow action if there is a composite change so that we can add it to the end later
-		if (this.compositeOverflowAction && visibleCompositesChange) {
-			this.compositeSwitcherBar.pull(this.compositeSwitcherBar.length() - 1);
-
-			this.compositeOverflowAction.dispose();
-			this.compositeOverflowAction = null;
-
-			this.compositeOverflowActionItem.dispose();
-			this.compositeOverflowActionItem = null;
-		}
-
-		// Pull out composites that overflow or got hidden
-		const compositesToRemove: number[] = [];
-		this.visibleComposites.forEach((compositeId, index) => {
-			if (compositesToShow.indexOf(compositeId) === -1) {
-				compositesToRemove.push(index);
-			}
-		});
-		compositesToRemove.reverse().forEach(index => {
-			const actionItem = this.compositeSwitcherBar.items[index];
-			this.compositeSwitcherBar.pull(index);
-			actionItem.dispose();
-			this.visibleComposites.splice(index, 1);
-		});
-
-		// Update the positions of the composites
-		compositesToShow.forEach((compositeId, newIndex) => {
-			const currentIndex = this.visibleComposites.indexOf(compositeId);
-			if (newIndex !== currentIndex) {
-				if (currentIndex !== -1) {
-					const actionItem = this.compositeSwitcherBar.items[currentIndex];
-					this.compositeSwitcherBar.pull(currentIndex);
-					actionItem.dispose();
-					this.visibleComposites.splice(currentIndex, 1);
-				}
-
-				this.compositeSwitcherBar.push(this.model.findItem(compositeId).activityAction, { label: true, icon: this.options.icon, index: newIndex });
-				this.visibleComposites.splice(newIndex, 0, compositeId);
-			}
-		});
-
-		// Add overflow action as needed
-		if ((visibleCompositesChange && overflows) || this.compositeSwitcherBar.length() === 0) {
-			this.compositeOverflowAction = this.instantiationService.createInstance(CompositeOverflowActivityAction, () => this.compositeOverflowActionItem.showMenu());
-			this.compositeOverflowActionItem = this.instantiationService.createInstance(
-				CompositeOverflowActivityActionItem,
-				this.compositeOverflowAction,
-				() => this.getOverflowingComposites(),
-				() => this.model.activeItem ? this.model.activeItem.id : void 0,
-				(compositeId: string) => {
-					const item = this.model.findItem(compositeId);
-					return item && item.activity[0] && item.activity[0].badge;
-				},
-				this.options.getOnCompositeClickAction,
-				this.options.colors
-			);
-
-			this.compositeSwitcherBar.push(this.compositeOverflowAction, { label: false, icon: true });
-		}
-
-		// Persist
-		this.saveCompositeItems();
-	}
-
-	private getOverflowingComposites(): { id: string, name: string }[] {
-		let overflowingIds = this.model.items.filter(item => item.pinned).map(item => item.id);
-
-		// Show the active composite even if it is not pinned
-		if (this.model.activeItem && !this.model.activeItem.pinned) {
-			overflowingIds.push(this.model.activeItem.id);
-		}
-
-		overflowingIds = overflowingIds.filter(compositeId => this.visibleComposites.indexOf(compositeId) === -1);
-		return this.model.items.filter(c => overflowingIds.indexOf(c.id) !== -1);
-	}
-
-	private showContextMenu(e: MouseEvent): void {
-		EventHelper.stop(e, true);
-		const event = new StandardMouseEvent(e);
-		const actions: IAction[] = this.model.items
-			.map(({ id, name, activityAction }) => (<IAction>{
-				id,
-				label: name,
-				checked: this.isPinned(id),
-				enabled: activityAction.enabled,
-				run: () => {
-					if (this.isPinned(id)) {
-						this.unpin(id);
-					} else {
-						this.pin(id, true);
-					}
-				}
-			}));
-		const otherActions = this.options.getContextMenuActions();
-		if (otherActions.length) {
-			actions.push(new Separator());
-			actions.push(...otherActions);
-		}
-		this.contextMenuService.showContextMenu({
-			getAnchor: () => { return { x: event.posx, y: event.posy }; },
-			getActions: () => TPromise.as(actions),
-		});
-	}
-
-	private loadCompositeItemsFromStorage(): ISerializedCompositeBarItem[] {
-		const storedStates = <Array<string | ISerializedCompositeBarItem>>JSON.parse(this.storageService.get(this.options.storageId, StorageScope.GLOBAL, '[]'));
-		const compositeStates = <ISerializedCompositeBarItem[]>storedStates.map(c =>
-			typeof c === 'string' /* migration from pinned states to composites states */ ? { id: c, pinned: true } : c);
-		return compositeStates;
-	}
-
-	private saveCompositeItems(): void {
-		this.storedState = this.model.toJSON();
-		this.storageService.store(this.options.storageId, JSON.stringify(this.storedState), StorageScope.GLOBAL);
-	}
-}
-
-interface ISerializedCompositeBarItem {
-	id: string;
-	pinned: boolean;
-	order: number;
-}
-
-interface ICompositeBarItem extends ISerializedCompositeBarItem {
-	name: string;
-	activityAction: ActivityAction;
-	pinnedAction: Action;
-	activity: ICompositeActivity[];
-}
-
-class CompositeBarModel {
-
-	readonly items: ICompositeBarItem[] = [];
-	activeItem: ICompositeBarItem;
-
-	constructor(private options: ICompositeBarOptions) { }
-
-	private createCompositeBarItem(id: string, name: string, order: number, pinned: boolean): ICompositeBarItem {
-		const options = this.options;
-		return {
-			id, name, pinned, order, activity: [],
-			get activityAction() {
-				return options.getActivityAction(id);
-			},
-			get pinnedAction() {
-				return options.getCompositePinnedAction(id);
-			}
-		};
-	}
-
-	add(id: string, name: string, order: number, index: number): boolean {
-		const item = this.findItem(id);
-		if (item) {
-			item.order = order;
-			item.name = name;
-			return false;
-		} else {
-			if (index === void 0) {
-				index = 0;
-				while (index < this.items.length && this.items[index].order < order) {
-					index++;
-				}
-			}
-			this.items.splice(index, 0, this.createCompositeBarItem(id, name, order, false));
-			return true;
-		}
-	}
-
-	remove(id: string): boolean {
-		for (let index = 0; index < this.items.length; index++) {
-			if (this.items[index].id === id) {
-				this.items.splice(index, 1);
-				return true;
-			}
-		}
-		return false;
-	}
-
-	move(compositeId: string, toCompositeId: string): boolean {
-
-		const fromIndex = this.findIndex(compositeId);
-		const toIndex = this.findIndex(toCompositeId);
-
-		// Make sure both items are known to the model
-		if (fromIndex === -1 || toIndex === -1) {
-			return false;
-		}
-
-		const sourceItem = this.items.splice(fromIndex, 1)[0];
-		this.items.splice(toIndex, 0, sourceItem);
-
-		// Make sure a moved composite gets pinned
-		sourceItem.pinned = true;
-
-		return true;
-	}
-
-	setPinned(id: string, pinned: boolean): boolean {
-		for (let index = 0; index < this.items.length; index++) {
-			const item = this.items[index];
-			if (item.id === id) {
-				if (item.pinned !== pinned) {
-					item.pinned = pinned;
-					return true;
-				}
-				return false;
-			}
-		}
-		return false;
-	}
-
-	addActivity(id: string, activity: ICompositeActivity): boolean {
-		const item = this.findItem(id);
-		if (item) {
-			const stack = item.activity;
-			for (let i = 0; i <= stack.length; i++) {
-				if (i === stack.length) {
-					stack.push(activity);
-					break;
-				} else if (stack[i].priority <= activity.priority) {
-					stack.splice(i, 0, activity);
-					break;
-				}
-			}
-			this.updateActivity(id);
-			return true;
-		}
-		return false;
-	}
-
-	removeActivity(id: string, activity: ICompositeActivity): boolean {
-		const item = this.findItem(id);
-		if (item) {
-			const index = item.activity.indexOf(activity);
-			if (index !== -1) {
-				item.activity.splice(index, 1);
-				this.updateActivity(id);
-				return true;
-			}
-		}
-		return false;
-	}
-
-	updateActivity(id: string): void {
-		const item = this.findItem(id);
-		if (item) {
-			if (item.activity.length) {
-				const [{ badge, clazz }] = item.activity;
-				item.activityAction.setBadge(badge, clazz);
-			}
-			else {
-				item.activityAction.setBadge(undefined);
-			}
-		}
-	}
-
-	activate(id: string): boolean {
-		if (!this.activeItem || this.activeItem.id !== id) {
-			if (this.activeItem) {
-				this.deactivate();
-			}
-			for (let index = 0; index < this.items.length; index++) {
-				const item = this.items[index];
-				if (item.id === id) {
-					this.activeItem = item;
-					this.activeItem.activityAction.activate();
-					return true;
-				}
-			}
-		}
-		return false;
-	}
-
-	deactivate(): boolean {
-		if (this.activeItem) {
-			this.activeItem.activityAction.deactivate();
-			this.activeItem = void 0;
-			return true;
-		}
-		return false;
-	}
-
-	findItem(id: string): ICompositeBarItem {
-		return this.items.filter(item => item.id === id)[0];
-	}
-
-	findIndex(id: string): number {
-		for (let index = 0; index < this.items.length; index++) {
-			if (this.items[index].id === id) {
-				return index;
-			}
-		}
-		return -1;
-	}
-
-	toJSON(): ISerializedCompositeBarItem[] {
-		return this.items.map(({ id, pinned, order }) => ({ id, pinned, order }));
-	}
-}
diff --git a/src/vs/workbench/browser/parts/compositebar/compositeBarActions.ts b/src/vs/workbench/browser/parts/compositebar/compositeBarActions.ts
deleted file mode 100644
index 001dd3a6842..00000000000
--- a/src/vs/workbench/browser/parts/compositebar/compositeBarActions.ts
+++ /dev/null
@@ -1,626 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-'use strict';
-
-import * as nls from 'vs/nls';
-import { Action } from 'vs/base/common/actions';
-import { TPromise } from 'vs/base/common/winjs.base';
-import * as dom from 'vs/base/browser/dom';
-import { Builder, $ } from 'vs/base/browser/builder';
-import { BaseActionItem, IBaseActionItemOptions, Separator } from 'vs/base/browser/ui/actionbar/actionbar';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { dispose, IDisposable, empty, toDisposable } from 'vs/base/common/lifecycle';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { IThemeService, ITheme } from 'vs/platform/theme/common/themeService';
-import { TextBadge, NumberBadge, IBadge, IconBadge, ProgressBadge } from 'vs/workbench/services/activity/common/activity';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { contrastBorder } from 'vs/platform/theme/common/colorRegistry';
-import { DelayedDragHandler } from 'vs/base/browser/dnd';
-import { IActivity } from 'vs/workbench/common/activity';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { Event, Emitter } from 'vs/base/common/event';
-
-export interface ICompositeActivity {
-	badge: IBadge;
-	clazz: string;
-	priority: number;
-}
-
-export interface ICompositeBar {
-	/**
-	 * Unpins a composite from the composite bar.
-	 */
-	unpin(compositeId: string): void;
-
-	/**
-	 * Pin a composite inside the composite bar.
-	 */
-	pin(compositeId: string): void;
-
-	/**
-	 * Find out if a composite is pinned in the composite bar.
-	 */
-	isPinned(compositeId: string): boolean;
-
-	/**
-	 * Reorder composite ordering by moving a composite to the location of another composite.
-	 */
-	move(compositeId: string, tocompositeId: string): void;
-}
-
-export class ActivityAction extends Action {
-	private badge: IBadge;
-	private clazz: string | undefined;
-	private _onDidChangeBadge = new Emitter<this>();
-
-	constructor(private _activity: IActivity) {
-		super(_activity.id, _activity.name, _activity.cssClass);
-
-		this.badge = null;
-	}
-
-	public get activity(): IActivity {
-		return this._activity;
-	}
-
-	public get onDidChangeBadge(): Event<this> {
-		return this._onDidChangeBadge.event;
-	}
-
-	public activate(): void {
-		if (!this.checked) {
-			this._setChecked(true);
-		}
-	}
-
-	public deactivate(): void {
-		if (this.checked) {
-			this._setChecked(false);
-		}
-	}
-
-	public getBadge(): IBadge {
-		return this.badge;
-	}
-
-	public getClass(): string | undefined {
-		return this.clazz;
-	}
-
-	public setBadge(badge: IBadge, clazz?: string): void {
-		this.badge = badge;
-		this.clazz = clazz;
-		this._onDidChangeBadge.fire(this);
-	}
-}
-
-export interface ICompositeBarColors {
-	backgroundColor: string;
-	badgeBackground: string;
-	badgeForeground: string;
-	dragAndDropBackground: string;
-}
-
-export interface IActivityActionItemOptions extends IBaseActionItemOptions {
-	icon?: boolean;
-	colors: ICompositeBarColors;
-}
-
-export class ActivityActionItem extends BaseActionItem {
-	protected $container: Builder;
-	protected $label: Builder;
-	protected $badge: Builder;
-	protected options: IActivityActionItemOptions;
-
-	private $badgeContent: Builder;
-	private badgeDisposable: IDisposable = empty;
-	private mouseUpTimeout: number;
-
-	constructor(
-		action: ActivityAction,
-		options: IActivityActionItemOptions,
-		@IThemeService protected themeService: IThemeService
-	) {
-		super(null, action, options);
-
-		this.themeService.onThemeChange(this.onThemeChange, this, this._callOnDispose);
-		action.onDidChangeBadge(this.handleBadgeChangeEvenet, this, this._callOnDispose);
-	}
-
-	protected get activity(): IActivity {
-		return (this._action as ActivityAction).activity;
-	}
-
-	protected updateStyles(): void {
-		const theme = this.themeService.getTheme();
-
-		// Label
-		if (this.$label && this.options.icon) {
-			const background = theme.getColor(this.options.colors.backgroundColor);
-
-			this.$label.style('background-color', background ? background.toString() : null);
-		}
-
-		// Badge
-		if (this.$badgeContent) {
-			const badgeForeground = theme.getColor(this.options.colors.badgeForeground);
-			const badgeBackground = theme.getColor(this.options.colors.badgeBackground);
-			const contrastBorderColor = theme.getColor(contrastBorder);
-
-			this.$badgeContent.style('color', badgeForeground ? badgeForeground.toString() : null);
-			this.$badgeContent.style('background-color', badgeBackground ? badgeBackground.toString() : null);
-
-			this.$badgeContent.style('border-style', contrastBorderColor ? 'solid' : null);
-			this.$badgeContent.style('border-width', contrastBorderColor ? '1px' : null);
-			this.$badgeContent.style('border-color', contrastBorderColor ? contrastBorderColor.toString() : null);
-		}
-	}
-
-	public render(container: HTMLElement): void {
-		super.render(container);
-
-		// Make the container tab-able for keyboard navigation
-		this.$container = $(container).attr({
-			tabIndex: '0',
-			role: 'button',
-			title: this.activity.name
-		});
-
-		// Try hard to prevent keyboard only focus feedback when using mouse
-		this.$container.on(dom.EventType.MOUSE_DOWN, () => {
-			this.$container.addClass('clicked');
-		});
-
-		this.$container.on(dom.EventType.MOUSE_UP, () => {
-			if (this.mouseUpTimeout) {
-				clearTimeout(this.mouseUpTimeout);
-			}
-
-			this.mouseUpTimeout = setTimeout(() => {
-				this.$container.removeClass('clicked');
-			}, 800); // delayed to prevent focus feedback from showing on mouse up
-		});
-
-		// Label
-		this.$label = $('a.action-label').appendTo(this.builder);
-		if (this.activity.cssClass) {
-			this.$label.addClass(this.activity.cssClass);
-		}
-		if (!this.options.icon) {
-			this.$label.text(this.getAction().label);
-		}
-
-		this.$badge = this.builder.clone().div({ 'class': 'badge' }, badge => {
-			this.$badgeContent = badge.div({ 'class': 'badge-content' });
-		});
-
-		this.$badge.hide();
-
-		this.updateStyles();
-	}
-
-	private onThemeChange(theme: ITheme): void {
-		this.updateStyles();
-	}
-
-	protected updateBadge(badge: IBadge, clazz?: string): void {
-		if (!this.$badge || !this.$badgeContent) {
-			return;
-		}
-
-		this.badgeDisposable.dispose();
-		this.badgeDisposable = empty;
-
-		this.$badgeContent.empty();
-		this.$badge.hide();
-
-		if (badge) {
-
-			// Number
-			if (badge instanceof NumberBadge) {
-				if (badge.number) {
-					let number = badge.number.toString();
-					if (badge.number > 9999) {
-						number = nls.localize('largeNumberBadge', '10k+');
-					} else if (badge.number > 999) {
-						number = number.charAt(0) + 'k';
-					}
-					this.$badgeContent.text(number);
-					this.$badge.show();
-				}
-			}
-
-			// Text
-			else if (badge instanceof TextBadge) {
-				this.$badgeContent.text(badge.text);
-				this.$badge.show();
-			}
-
-			// Text
-			else if (badge instanceof IconBadge) {
-				this.$badge.show();
-			}
-
-			// Progress
-			else if (badge instanceof ProgressBadge) {
-				this.$badge.show();
-			}
-
-			if (clazz) {
-				this.$badge.addClass(clazz);
-				this.badgeDisposable = toDisposable(() => this.$badge.removeClass(clazz));
-			}
-		}
-
-		// Title
-		let title: string;
-		if (badge && badge.getDescription()) {
-			if (this.activity.name) {
-				title = nls.localize('badgeTitle', "{0} - {1}", this.activity.name, badge.getDescription());
-			} else {
-				title = badge.getDescription();
-			}
-		} else {
-			title = this.activity.name;
-		}
-
-		[this.$label, this.$badge, this.$container].forEach(b => {
-			if (b) {
-				b.attr('aria-label', title);
-				b.title(title);
-			}
-		});
-	}
-
-	private handleBadgeChangeEvenet(): void {
-		const action = this.getAction();
-		if (action instanceof ActivityAction) {
-			this.updateBadge(action.getBadge(), action.getClass());
-		}
-	}
-
-	public dispose(): void {
-		super.dispose();
-
-		if (this.mouseUpTimeout) {
-			clearTimeout(this.mouseUpTimeout);
-		}
-
-		this.$badge.destroy();
-	}
-}
-
-export class CompositeOverflowActivityAction extends ActivityAction {
-
-	constructor(
-		private showMenu: () => void
-	) {
-		super({
-			id: 'additionalComposites.action',
-			name: nls.localize('additionalViews', "Additional Views"),
-			cssClass: 'toggle-more'
-		});
-	}
-
-	public run(event: any): TPromise<any> {
-		this.showMenu();
-
-		return TPromise.as(true);
-	}
-}
-
-export class CompositeOverflowActivityActionItem extends ActivityActionItem {
-	private actions: Action[];
-
-	constructor(
-		action: ActivityAction,
-		private getOverflowingComposites: () => { id: string, name: string }[],
-		private getActiveCompositeId: () => string,
-		private getBadge: (compositeId: string) => IBadge,
-		private getCompositeOpenAction: (compositeId: string) => Action,
-		colors: ICompositeBarColors,
-		@IContextMenuService private contextMenuService: IContextMenuService,
-		@IThemeService themeService: IThemeService
-	) {
-		super(action, { icon: true, colors }, themeService);
-	}
-
-	public showMenu(): void {
-		if (this.actions) {
-			dispose(this.actions);
-		}
-
-		this.actions = this.getActions();
-
-		this.contextMenuService.showContextMenu({
-			getAnchor: () => this.builder.getHTMLElement(),
-			getActions: () => TPromise.as(this.actions),
-			onHide: () => dispose(this.actions)
-		});
-	}
-
-	private getActions(): Action[] {
-		return this.getOverflowingComposites().map(composite => {
-			const action = this.getCompositeOpenAction(composite.id);
-			action.radio = this.getActiveCompositeId() === action.id;
-
-			const badge = this.getBadge(composite.id);
-			let suffix: string | number;
-			if (badge instanceof NumberBadge) {
-				suffix = badge.number;
-			} else if (badge instanceof TextBadge) {
-				suffix = badge.text;
-			}
-
-			if (suffix) {
-				action.label = nls.localize('numberBadge', "{0} ({1})", composite.name, suffix);
-			} else {
-				action.label = composite.name;
-			}
-
-			return action;
-		});
-	}
-
-	public dispose(): void {
-		super.dispose();
-
-		this.actions = dispose(this.actions);
-	}
-}
-
-class ManageExtensionAction extends Action {
-
-	constructor(
-		@ICommandService private commandService: ICommandService
-	) {
-		super('activitybar.manage.extension', nls.localize('manageExtension', "Manage Extension"));
-	}
-
-	public run(id: string): TPromise<any> {
-		return this.commandService.executeCommand('_extensions.manage', id);
-	}
-}
-
-export class CompositeActionItem extends ActivityActionItem {
-
-	private static manageExtensionAction: ManageExtensionAction;
-	private static draggedCompositeId: string;
-
-	private compositeActivity: IActivity;
-	private cssClass: string;
-
-	constructor(
-		private compositeActivityAction: ActivityAction,
-		private toggleCompositePinnedAction: Action,
-		colors: ICompositeBarColors,
-		icon: boolean,
-		private compositeBar: ICompositeBar,
-		@IContextMenuService private contextMenuService: IContextMenuService,
-		@IKeybindingService private keybindingService: IKeybindingService,
-		@IInstantiationService instantiationService: IInstantiationService,
-		@IThemeService themeService: IThemeService
-	) {
-		super(compositeActivityAction, { draggable: true, colors, icon }, themeService);
-
-		this.cssClass = compositeActivityAction.class;
-
-		if (!CompositeActionItem.manageExtensionAction) {
-			CompositeActionItem.manageExtensionAction = instantiationService.createInstance(ManageExtensionAction);
-		}
-	}
-
-	protected get activity(): IActivity {
-		if (!this.compositeActivity) {
-			let activityName: string;
-			const keybinding = this.getKeybindingLabel(this.compositeActivityAction.activity.keybindingId);
-			if (keybinding) {
-				activityName = nls.localize('titleKeybinding', "{0} ({1})", this.compositeActivityAction.activity.name, keybinding);
-			} else {
-				activityName = this.compositeActivityAction.activity.name;
-			}
-
-			this.compositeActivity = {
-				id: this.compositeActivityAction.activity.id,
-				cssClass: this.cssClass,
-				name: activityName
-			};
-		}
-
-		return this.compositeActivity;
-	}
-
-	private getKeybindingLabel(id: string): string {
-		const kb = this.keybindingService.lookupKeybinding(id);
-		if (kb) {
-			return kb.getLabel();
-		}
-
-		return null;
-	}
-
-	public render(container: HTMLElement): void {
-		super.render(container);
-
-		this._updateChecked();
-		this._updateEnabled();
-
-		this.$container.on('contextmenu', e => {
-			dom.EventHelper.stop(e, true);
-
-			this.showContextMenu(container);
-		});
-
-		// Allow to drag
-		this.$container.on(dom.EventType.DRAG_START, (e: DragEvent) => {
-			e.dataTransfer.effectAllowed = 'move';
-			this.setDraggedComposite(this.activity.id);
-
-			// Trigger the action even on drag start to prevent clicks from failing that started a drag
-			if (!this.getAction().checked) {
-				this.getAction().run();
-			}
-		});
-
-		// Drag enter
-		let counter = 0; // see https://github.com/Microsoft/vscode/issues/14470
-		this.$container.on(dom.EventType.DRAG_ENTER, (e: DragEvent) => {
-			const draggedCompositeId = CompositeActionItem.getDraggedCompositeId();
-			if (draggedCompositeId && draggedCompositeId !== this.activity.id) {
-				counter++;
-				this.updateFromDragging(container, true);
-			}
-		});
-
-		// Drag leave
-		this.$container.on(dom.EventType.DRAG_LEAVE, (e: DragEvent) => {
-			const draggedCompositeId = CompositeActionItem.getDraggedCompositeId();
-			if (draggedCompositeId) {
-				counter--;
-				if (counter === 0) {
-					this.updateFromDragging(container, false);
-				}
-			}
-		});
-
-		// Drag end
-		this.$container.on(dom.EventType.DRAG_END, (e: DragEvent) => {
-			const draggedCompositeId = CompositeActionItem.getDraggedCompositeId();
-			if (draggedCompositeId) {
-				counter = 0;
-				this.updateFromDragging(container, false);
-
-				CompositeActionItem.clearDraggedComposite();
-			}
-		});
-
-		// Drop
-		this.$container.on(dom.EventType.DROP, (e: DragEvent) => {
-			dom.EventHelper.stop(e, true);
-
-			const draggedCompositeId = CompositeActionItem.getDraggedCompositeId();
-			if (draggedCompositeId && draggedCompositeId !== this.activity.id) {
-				this.updateFromDragging(container, false);
-				CompositeActionItem.clearDraggedComposite();
-
-				this.compositeBar.move(draggedCompositeId, this.activity.id);
-			}
-		});
-
-		// Activate on drag over to reveal targets
-		[this.$badge, this.$label].forEach(b => new DelayedDragHandler(b.getHTMLElement(), () => {
-			if (!CompositeActionItem.getDraggedCompositeId() && !this.getAction().checked) {
-				this.getAction().run();
-			}
-		}));
-
-		this.updateStyles();
-	}
-
-	private updateFromDragging(element: HTMLElement, isDragging: boolean): void {
-		const theme = this.themeService.getTheme();
-		const dragBackground = theme.getColor(this.options.colors.dragAndDropBackground);
-
-		element.style.backgroundColor = isDragging && dragBackground ? dragBackground.toString() : null;
-	}
-
-	public static getDraggedCompositeId(): string {
-		return CompositeActionItem.draggedCompositeId;
-	}
-
-	private setDraggedComposite(compositeId: string): void {
-		CompositeActionItem.draggedCompositeId = compositeId;
-	}
-
-	public static clearDraggedComposite(): void {
-		CompositeActionItem.draggedCompositeId = void 0;
-	}
-
-	private showContextMenu(container: HTMLElement): void {
-		const actions: Action[] = [this.toggleCompositePinnedAction];
-		if ((<any>this.compositeActivityAction.activity).extensionId) {
-			actions.push(new Separator());
-			actions.push(CompositeActionItem.manageExtensionAction);
-		}
-
-		const isPinned = this.compositeBar.isPinned(this.activity.id);
-		if (isPinned) {
-			this.toggleCompositePinnedAction.label = nls.localize('hide', "Hide");
-			this.toggleCompositePinnedAction.checked = false;
-		} else {
-			this.toggleCompositePinnedAction.label = nls.localize('keep', "Keep");
-		}
-
-		this.contextMenuService.showContextMenu({
-			getAnchor: () => container,
-			getActionsContext: () => this.activity.id,
-			getActions: () => TPromise.as(actions)
-		});
-	}
-
-	public focus(): void {
-		this.$container.domFocus();
-	}
-
-	protected _updateClass(): void {
-		if (this.cssClass) {
-			this.$label.removeClass(this.cssClass);
-		}
-
-		this.cssClass = this.getAction().class;
-		if (this.cssClass) {
-			this.$label.addClass(this.cssClass);
-		}
-	}
-
-	protected _updateChecked(): void {
-		if (this.getAction().checked) {
-			this.$container.addClass('checked');
-		} else {
-			this.$container.removeClass('checked');
-		}
-	}
-
-	protected _updateEnabled(): void {
-		if (this.getAction().enabled) {
-			this.builder.removeClass('disabled');
-		} else {
-			this.builder.addClass('disabled');
-		}
-	}
-
-	public dispose(): void {
-		super.dispose();
-
-		CompositeActionItem.clearDraggedComposite();
-
-		this.$label.destroy();
-	}
-}
-
-export class ToggleCompositePinnedAction extends Action {
-
-	constructor(
-		private activity: IActivity,
-		private compositeBar: ICompositeBar
-	) {
-		super('show.toggleCompositePinned', activity ? activity.name : nls.localize('toggle', "Toggle View Pinned"));
-
-		this.checked = this.activity && this.compositeBar.isPinned(this.activity.id);
-	}
-
-	public run(context: string): TPromise<any> {
-		const id = this.activity ? this.activity.id : context;
-
-		if (this.compositeBar.isPinned(id)) {
-			this.compositeBar.unpin(id);
-		} else {
-			this.compositeBar.pin(id);
-		}
-
-		return TPromise.as(true);
-	}
-}
diff --git a/src/vs/workbench/browser/parts/editor/baseEditor.ts b/src/vs/workbench/browser/parts/editor/baseEditor.ts
index 1a18aa8f6f4..2d62841051a 100644
--- a/src/vs/workbench/browser/parts/editor/baseEditor.ts
+++ b/src/vs/workbench/browser/parts/editor/baseEditor.ts
@@ -6,11 +6,18 @@
 
 import { TPromise } from 'vs/base/common/winjs.base';
 import { Panel } from 'vs/workbench/browser/panel';
-import { EditorInput, EditorOptions, IEditor } from 'vs/workbench/common/editor';
+import { EditorInput, EditorOptions, IEditor, GroupIdentifier, IEditorMemento } from 'vs/workbench/common/editor';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { CancellationToken } from 'vs/base/common/cancellation';
-import { IEditorGroup } from 'vs/workbench/services/group/common/editorGroupsService';
+import { IEditorGroup, IEditorGroupsService } from 'vs/workbench/services/group/common/editorGroupsService';
+import { IStorageService } from 'vs/platform/storage/common/storage';
+import { LRUCache } from 'vs/base/common/map';
+import { URI } from 'vs/base/common/uri';
+import { once, Event } from 'vs/base/common/event';
+import { isEmptyObject } from 'vs/base/common/types';
+import { DEFAULT_EDITOR_MIN_DIMENSIONS, DEFAULT_EDITOR_MAX_DIMENSIONS } from 'vs/workbench/browser/parts/editor/editor';
+import { Scope } from 'vs/workbench/common/memento';
 
 /**
  * The base class of editors in the workbench. Editors register themselves for specific editor inputs.
@@ -27,6 +34,15 @@ import { IEditorGroup } from 'vs/workbench/services/group/common/editorGroupsSer
  */
 export abstract class BaseEditor extends Panel implements IEditor {
 
+	private static readonly EDITOR_MEMENTOS: Map<string, EditorMemento<any>> = new Map<string, EditorMemento<any>>();
+
+	readonly minimumWidth = DEFAULT_EDITOR_MIN_DIMENSIONS.width;
+	readonly maximumWidth = DEFAULT_EDITOR_MAX_DIMENSIONS.width;
+	readonly minimumHeight = DEFAULT_EDITOR_MIN_DIMENSIONS.height;
+	readonly maximumHeight = DEFAULT_EDITOR_MAX_DIMENSIONS.height;
+
+	readonly onDidSizeConstraintsChange: Event<{ width: number; height: number; }> = Event.None;
+
 	protected _input: EditorInput;
 
 	private _options: EditorOptions;
@@ -128,18 +144,161 @@ export abstract class BaseEditor extends Panel implements IEditor {
 		this._group = group;
 	}
 
-	/**
-	 * Subclasses can set this to false if it does not make sense to center editor input.
-	 */
-	supportsCenteredLayout(): boolean {
-		return true;
+	protected getEditorMemento<T>(storageService: IStorageService, editorGroupService: IEditorGroupsService, key: string, limit: number = 10): IEditorMemento<T> {
+		const mementoKey = `${this.getId()}${key}`;
+
+		let editorMemento = BaseEditor.EDITOR_MEMENTOS.get(mementoKey);
+		if (!editorMemento) {
+			editorMemento = new EditorMemento(this.getId(), key, this.getMemento(storageService, Scope.WORKSPACE), limit, editorGroupService);
+			BaseEditor.EDITOR_MEMENTOS.set(mementoKey, editorMemento);
+		}
+
+		return editorMemento;
+	}
+
+	shutdown(): void {
+
+		// Shutdown all editor memento for this editor type
+		BaseEditor.EDITOR_MEMENTOS.forEach(editorMemento => {
+			if (editorMemento.id === this.getId()) {
+				editorMemento.shutdown();
+			}
+		});
+
+		super.shutdown();
 	}
 
 	dispose(): void {
 		this._input = null;
 		this._options = null;
 
-		// Super Dispose
 		super.dispose();
 	}
 }
+
+interface MapGroupToMemento<T> {
+	[group: number]: T;
+}
+
+export class EditorMemento<T> implements IEditorMemento<T> {
+	private cache: LRUCache<string, MapGroupToMemento<T>>;
+	private cleanedUp = false;
+
+	constructor(
+		private _id: string,
+		private key: string,
+		private memento: object,
+		private limit: number,
+		private editorGroupService: IEditorGroupsService
+	) { }
+
+	get id(): string {
+		return this._id;
+	}
+
+	saveState(group: IEditorGroup, resource: URI, state: T): void;
+	saveState(group: IEditorGroup, editor: EditorInput, state: T): void;
+	saveState(group: IEditorGroup, resourceOrEditor: URI | EditorInput, state: T): void {
+		const resource = this.doGetResource(resourceOrEditor);
+		if (!resource || !group) {
+			return; // we are not in a good state to save any state for a resource
+		}
+
+		const cache = this.doLoad();
+
+		let mementoForResource = cache.get(resource.toString());
+		if (!mementoForResource) {
+			mementoForResource = Object.create(null) as MapGroupToMemento<T>;
+			cache.set(resource.toString(), mementoForResource);
+		}
+
+		mementoForResource[group.id] = state;
+
+		// Automatically clear when editor input gets disposed if any
+		if (resourceOrEditor instanceof EditorInput) {
+			once(resourceOrEditor.onDispose)(() => {
+				this.clearState(resource);
+			});
+		}
+	}
+
+	loadState(group: IEditorGroup, resource: URI): T;
+	loadState(group: IEditorGroup, editor: EditorInput): T;
+	loadState(group: IEditorGroup, resourceOrEditor: URI | EditorInput): T {
+		const resource = this.doGetResource(resourceOrEditor);
+		if (!resource || !group) {
+			return void 0; // we are not in a good state to load any state for a resource
+		}
+
+		const cache = this.doLoad();
+
+		const mementoForResource = cache.get(resource.toString());
+		if (mementoForResource) {
+			return mementoForResource[group.id];
+		}
+
+		return void 0;
+	}
+
+	clearState(resource: URI): void;
+	clearState(editor: EditorInput): void;
+	clearState(resourceOrEditor: URI | EditorInput): void {
+		const resource = this.doGetResource(resourceOrEditor);
+		if (resource) {
+			const cache = this.doLoad();
+			cache.delete(resource.toString());
+		}
+	}
+
+	private doGetResource(resourceOrEditor: URI | EditorInput): URI {
+		if (resourceOrEditor instanceof EditorInput) {
+			return resourceOrEditor.getResource();
+		}
+
+		return resourceOrEditor;
+	}
+
+	private doLoad(): LRUCache<string, MapGroupToMemento<T>> {
+		if (!this.cache) {
+			this.cache = new LRUCache<string, MapGroupToMemento<T>>(this.limit);
+
+			// Restore from serialized map state
+			const rawEditorMemento = this.memento[this.key];
+			if (Array.isArray(rawEditorMemento)) {
+				this.cache.fromJSON(rawEditorMemento);
+			}
+		}
+
+		return this.cache;
+	}
+
+	shutdown(): void {
+		const cache = this.doLoad();
+
+		// Cleanup once during shutdown
+		if (!this.cleanedUp) {
+			this.cleanUp();
+			this.cleanedUp = true;
+		}
+
+		this.memento[this.key] = cache.toJSON();
+	}
+
+	private cleanUp(): void {
+		const cache = this.doLoad();
+
+		// Remove groups from states that no longer exist
+		cache.forEach((mapGroupToMemento, resource) => {
+			Object.keys(mapGroupToMemento).forEach(group => {
+				const groupId: GroupIdentifier = Number(group);
+				if (!this.editorGroupService.getGroup(groupId)) {
+					delete mapGroupToMemento[groupId];
+
+					if (isEmptyObject(mapGroupToMemento)) {
+						cache.delete(resource);
+					}
+				}
+			});
+		});
+	}
+}
\ No newline at end of file
diff --git a/src/vs/workbench/browser/parts/editor/binaryDiffEditor.ts b/src/vs/workbench/browser/parts/editor/binaryDiffEditor.ts
index 8383ebf5b42..203fb0368aa 100644
--- a/src/vs/workbench/browser/parts/editor/binaryDiffEditor.ts
+++ b/src/vs/workbench/browser/parts/editor/binaryDiffEditor.ts
@@ -18,7 +18,7 @@ import { BaseBinaryResourceEditor } from 'vs/workbench/browser/parts/editor/bina
  */
 export class BinaryResourceDiffEditor extends SideBySideEditor {
 
-	public static readonly ID = BINARY_DIFF_EDITOR_ID;
+	static readonly ID = BINARY_DIFF_EDITOR_ID;
 
 	constructor(
 		@ITelemetryService telemetryService: ITelemetryService,
@@ -28,7 +28,7 @@ export class BinaryResourceDiffEditor extends SideBySideEditor {
 		super(telemetryService, instantiationService, themeService);
 	}
 
-	public getMetadata(): string {
+	getMetadata(): string {
 		const master = this.masterEditor;
 		const details = this.detailsEditor;
 
diff --git a/src/vs/workbench/browser/parts/editor/binaryEditor.ts b/src/vs/workbench/browser/parts/editor/binaryEditor.ts
index 47de56f9791..1fdec9309cc 100644
--- a/src/vs/workbench/browser/parts/editor/binaryEditor.ts
+++ b/src/vs/workbench/browser/parts/editor/binaryEditor.ts
@@ -8,7 +8,6 @@
 import * as nls from 'vs/nls';
 import { Event, Emitter } from 'vs/base/common/event';
 import { TPromise } from 'vs/base/common/winjs.base';
-import { Builder, $ } from 'vs/base/browser/builder';
 import { EditorInput, EditorOptions } from 'vs/workbench/common/editor';
 import { BaseEditor } from 'vs/workbench/browser/parts/editor/baseEditor';
 import { BinaryEditorModel } from 'vs/workbench/common/editor/binaryEditorModel';
@@ -17,10 +16,11 @@ import { DomScrollableElement } from 'vs/base/browser/ui/scrollbar/scrollableEle
 import { ScrollbarVisibility } from 'vs/base/common/scrollable';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { ResourceViewerContext, ResourceViewer } from 'vs/workbench/browser/parts/editor/resourceViewer';
-import URI from 'vs/base/common/uri';
-import { Dimension } from 'vs/base/browser/dom';
+import { URI } from 'vs/base/common/uri';
+import { Dimension, size, clearNode } from 'vs/base/browser/dom';
 import { IFileService } from 'vs/platform/files/common/files';
 import { CancellationToken } from 'vs/base/common/cancellation';
+import { dispose } from 'vs/base/common/lifecycle';
 
 export interface IOpenCallbacks {
 	openInternal: (input: EditorInput, options: EditorOptions) => void;
@@ -32,11 +32,12 @@ export interface IOpenCallbacks {
  */
 export abstract class BaseBinaryResourceEditor extends BaseEditor {
 
-	private readonly _onMetadataChanged: Emitter<void>;
+	private readonly _onMetadataChanged: Emitter<void> = this._register(new Emitter<void>());
+	get onMetadataChanged(): Event<void> { return this._onMetadataChanged.event; }
 
 	private callbacks: IOpenCallbacks;
 	private metadata: string;
-	private binaryContainer: Builder;
+	private binaryContainer: HTMLElement;
 	private scrollbar: DomScrollableElement;
 	private resourceViewerContext: ResourceViewerContext;
 
@@ -49,37 +50,29 @@ export abstract class BaseBinaryResourceEditor extends BaseEditor {
 	) {
 		super(id, telemetryService, themeService);
 
-		this._onMetadataChanged = new Emitter<void>();
-		this.toUnbind.push(this._onMetadataChanged);
-
 		this.callbacks = callbacks;
 	}
 
-	public get onMetadataChanged(): Event<void> {
-		return this._onMetadataChanged.event;
-	}
-
-	public getTitle(): string {
+	getTitle(): string {
 		return this.input ? this.input.getName() : nls.localize('binaryEditor', "Binary Viewer");
 	}
 
 	protected createEditor(parent: HTMLElement): void {
 
 		// Container for Binary
-		const binaryContainerElement = document.createElement('div');
-		binaryContainerElement.className = 'binary-container';
-		this.binaryContainer = $(binaryContainerElement);
-		this.binaryContainer.style('outline', 'none');
-		this.binaryContainer.tabindex(0); // enable focus support from the editor part (do not remove)
+		this.binaryContainer = document.createElement('div');
+		this.binaryContainer.className = 'binary-container';
+		this.binaryContainer.style.outline = 'none';
+		this.binaryContainer.tabIndex = 0; // enable focus support from the editor part (do not remove)
 
 		// Custom Scrollbars
-		this.scrollbar = new DomScrollableElement(binaryContainerElement, { horizontal: ScrollbarVisibility.Auto, vertical: ScrollbarVisibility.Auto });
+		this.scrollbar = this._register(new DomScrollableElement(this.binaryContainer, { horizontal: ScrollbarVisibility.Auto, vertical: ScrollbarVisibility.Auto }));
 		parent.appendChild(this.scrollbar.getDomNode());
 	}
 
-	public setInput(input: EditorInput, options: EditorOptions, token: CancellationToken): Thenable<void> {
+	setInput(input: EditorInput, options: EditorOptions, token: CancellationToken): Thenable<void> {
 		return super.setInput(input, options, token).then(() => {
-			return input.resolve(true).then(model => {
+			return input.resolve().then(model => {
 
 				// Check for cancellation
 				if (token.isCancellationRequested) {
@@ -95,7 +88,7 @@ export abstract class BaseBinaryResourceEditor extends BaseEditor {
 				this.resourceViewerContext = ResourceViewer.show(
 					{ name: model.getName(), resource: model.getResource(), size: model.getSize(), etag: model.getETag(), mime: model.getMime() },
 					this._fileService,
-					this.binaryContainer.getHTMLElement(),
+					this.binaryContainer,
 					this.scrollbar,
 					resource => this.callbacks.openInternal(input, options),
 					resource => this.callbacks.openExternal(resource),
@@ -109,47 +102,44 @@ export abstract class BaseBinaryResourceEditor extends BaseEditor {
 
 	private handleMetadataChanged(meta: string): void {
 		this.metadata = meta;
+
 		this._onMetadataChanged.fire();
 	}
 
-	public getMetadata(): string {
+	getMetadata(): string {
 		return this.metadata;
 	}
 
-	public supportsCenteredLayout(): boolean {
-		return false;
-	}
-
-	public clearInput(): void {
+	clearInput(): void {
 
 		// Clear Meta
 		this.handleMetadataChanged(null);
 
-		// Empty HTML Container
-		$(this.binaryContainer).empty();
+		// Clear Resource Viewer
+		clearNode(this.binaryContainer);
+		this.resourceViewerContext = dispose(this.resourceViewerContext);
 
 		super.clearInput();
 	}
 
-	public layout(dimension: Dimension): void {
+	layout(dimension: Dimension): void {
 
 		// Pass on to Binary Container
-		this.binaryContainer.size(dimension.width, dimension.height);
+		size(this.binaryContainer, dimension.width, dimension.height);
 		this.scrollbar.scanDomNode();
-		if (this.resourceViewerContext) {
+		if (this.resourceViewerContext && this.resourceViewerContext.layout) {
 			this.resourceViewerContext.layout(dimension);
 		}
 	}
 
-	public focus(): void {
-		this.binaryContainer.domFocus();
+	focus(): void {
+		this.binaryContainer.focus();
 	}
 
-	public dispose(): void {
+	dispose(): void {
+		this.binaryContainer.remove();
 
-		// Destroy Container
-		this.binaryContainer.destroy();
-		this.scrollbar.dispose();
+		this.resourceViewerContext = dispose(this.resourceViewerContext);
 
 		super.dispose();
 	}
diff --git a/src/vs/workbench/browser/parts/editor/breadcrumbs.ts b/src/vs/workbench/browser/parts/editor/breadcrumbs.ts
new file mode 100644
index 00000000000..5a11594b7d8
--- /dev/null
+++ b/src/vs/workbench/browser/parts/editor/breadcrumbs.ts
@@ -0,0 +1,155 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+import { BreadcrumbsWidget } from 'vs/base/browser/ui/breadcrumbs/breadcrumbsWidget';
+import { Emitter, Event } from 'vs/base/common/event';
+import * as glob from 'vs/base/common/glob';
+import { IDisposable } from 'vs/base/common/lifecycle';
+import { localize } from 'vs/nls';
+import { IConfigurationOverrides, IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { Extensions, IConfigurationRegistry } from 'vs/platform/configuration/common/configurationRegistry';
+import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
+import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
+import { Registry } from 'vs/platform/registry/common/platform';
+import { GroupIdentifier } from 'vs/workbench/common/editor';
+
+export const IBreadcrumbsService = createDecorator<IBreadcrumbsService>('IEditorBreadcrumbsService');
+
+export interface IBreadcrumbsService {
+
+	_serviceBrand: any;
+
+	register(group: GroupIdentifier, widget: BreadcrumbsWidget): IDisposable;
+
+	getWidget(group: GroupIdentifier): BreadcrumbsWidget;
+}
+
+
+export class BreadcrumbsService implements IBreadcrumbsService {
+
+	_serviceBrand: any;
+
+	private readonly _map = new Map<number, BreadcrumbsWidget>();
+
+	register(group: number, widget: BreadcrumbsWidget): IDisposable {
+		if (this._map.has(group)) {
+			throw new Error(`group (${group}) has already a widget`);
+		}
+		this._map.set(group, widget);
+		return {
+			dispose: () => this._map.delete(group)
+		};
+	}
+
+	getWidget(group: number): BreadcrumbsWidget {
+		return this._map.get(group);
+	}
+}
+
+registerSingleton(IBreadcrumbsService, BreadcrumbsService);
+
+
+//#region config
+
+export abstract class BreadcrumbsConfig<T> {
+
+	name: string;
+	onDidChange: Event<void>;
+
+	abstract getValue(overrides?: IConfigurationOverrides): T;
+	abstract updateValue(value: T, overrides?: IConfigurationOverrides): Thenable<void>;
+	abstract dispose(): void;
+
+	private constructor() {
+		// internal
+	}
+
+	static IsEnabled = BreadcrumbsConfig._stub<boolean>('breadcrumbs.enabled');
+	static UseQuickPick = BreadcrumbsConfig._stub<boolean>('breadcrumbs.useQuickPick');
+	static FilePath = BreadcrumbsConfig._stub<'on' | 'off' | 'last'>('breadcrumbs.filePath');
+	static SymbolPath = BreadcrumbsConfig._stub<'on' | 'off' | 'last'>('breadcrumbs.symbolPath');
+	static FilterOnType = BreadcrumbsConfig._stub<boolean>('breadcrumbs.filterOnType');
+
+	static FileExcludes = BreadcrumbsConfig._stub<glob.IExpression>('files.exclude');
+
+	private static _stub<T>(name: string): { bindTo(service: IConfigurationService): BreadcrumbsConfig<T> } {
+		return {
+			bindTo(service) {
+				let onDidChange = new Emitter<void>();
+
+				let listener = service.onDidChangeConfiguration(e => {
+					if (e.affectsConfiguration(name)) {
+						onDidChange.fire(undefined);
+					}
+				});
+
+				return new class implements BreadcrumbsConfig<T>{
+					readonly name = name;
+					readonly onDidChange = onDidChange.event;
+					getValue(overrides?: IConfigurationOverrides): T {
+						return service.getValue(name, overrides);
+					}
+					updateValue(newValue: T, overrides?: IConfigurationOverrides): Thenable<void> {
+						return service.updateValue(name, newValue, overrides);
+					}
+					dispose(): void {
+						listener.dispose();
+						onDidChange.dispose();
+					}
+				};
+			}
+		};
+	}
+}
+
+Registry.as<IConfigurationRegistry>(Extensions.Configuration).registerConfiguration({
+	id: 'breadcrumbs',
+	title: localize('title', "Breadcrumb Navigation"),
+	order: 101,
+	type: 'object',
+	properties: {
+		'breadcrumbs.enabled': {
+			description: localize('enabled', "Enable/disable navigation breadcrumbs"),
+			type: 'boolean',
+			default: false
+		},
+		// 'breadcrumbs.useQuickPick': {
+		// 	description: localize('useQuickPick', "Use quick pick instead of breadcrumb-pickers."),
+		// 	type: 'boolean',
+		// 	default: false
+		// },
+		'breadcrumbs.filePath': {
+			description: localize('filepath', "Controls whether and how file paths are shown in the breadcrumbs view."),
+			type: 'string',
+			default: 'on',
+			enum: ['on', 'off', 'last'],
+			enumDescriptions: [
+				localize('filepath.on', "Show the file path in the breadcrumbs view."),
+				localize('filepath.off', "Do not show the file path in the breadcrumbs view."),
+				localize('filepath.last', "Only show the last element of the file path in the breadcrumbs view."),
+			]
+		},
+		'breadcrumbs.symbolPath': {
+			description: localize('symbolpath', "Controls whether and how symbols are shown in the breadcrumbs view."),
+			type: 'string',
+			default: 'on',
+			enum: ['on', 'off', 'last'],
+			enumDescriptions: [
+				localize('symbolpath.on', "Show all symbols in the breadcrumbs view."),
+				localize('symbolpath.off', "Do not show symbols in the breadcrumbs view."),
+				localize('symbolpath.last', "Only show the current symbol in the breadcrumbs view."),
+			]
+		},
+		// 'breadcrumbs.filterOnType': {
+		// 	description: localize('filterOnType', "Controls whether the breadcrumb picker filters or highlights when typing."),
+		// 	type: 'boolean',
+		// 	default: false
+		// },
+	}
+});
+
+//#endregion
diff --git a/src/vs/workbench/browser/parts/editor/breadcrumbsControl.ts b/src/vs/workbench/browser/parts/editor/breadcrumbsControl.ts
new file mode 100644
index 00000000000..e08f3dc0ea3
--- /dev/null
+++ b/src/vs/workbench/browser/parts/editor/breadcrumbsControl.ts
@@ -0,0 +1,607 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+import * as dom from 'vs/base/browser/dom';
+import { StandardMouseEvent } from 'vs/base/browser/mouseEvent';
+import { BreadcrumbsItem, BreadcrumbsWidget, IBreadcrumbsItemEvent } from 'vs/base/browser/ui/breadcrumbs/breadcrumbsWidget';
+import { IconLabel } from 'vs/base/browser/ui/iconLabel/iconLabel';
+import { tail } from 'vs/base/common/arrays';
+import { timeout } from 'vs/base/common/async';
+import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
+import { combinedDisposable, dispose, IDisposable } from 'vs/base/common/lifecycle';
+import { Schemas } from 'vs/base/common/network';
+import { isEqual } from 'vs/base/common/resources';
+import { URI } from 'vs/base/common/uri';
+import 'vs/css!./media/breadcrumbscontrol';
+import { ICodeEditor, isCodeEditor, isDiffEditor } from 'vs/editor/browser/editorBrowser';
+import { Range } from 'vs/editor/common/core/range';
+import { ICodeEditorViewState, ScrollType } from 'vs/editor/common/editorCommon';
+import { symbolKindToCssClass } from 'vs/editor/common/modes';
+import { OutlineElement, OutlineGroup, OutlineModel, TreeElement } from 'vs/editor/contrib/documentSymbols/outlineModel';
+import { localize } from 'vs/nls';
+import { MenuId, MenuRegistry } from 'vs/platform/actions/common/actions';
+import { CommandsRegistry } from 'vs/platform/commands/common/commands';
+import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { ContextKeyExpr, IContextKey, IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
+import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
+import { FileKind, IFileService, IFileStat } from 'vs/platform/files/common/files';
+import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
+import { KeybindingsRegistry, KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
+import { IListService, WorkbenchListFocusContextKey } from 'vs/platform/list/browser/listService';
+import { IQuickOpenService } from 'vs/platform/quickOpen/common/quickOpen';
+import { ColorIdentifier, ColorFunction } from 'vs/platform/theme/common/colorRegistry';
+import { attachBreadcrumbsStyler } from 'vs/platform/theme/common/styler';
+import { IThemeService } from 'vs/platform/theme/common/themeService';
+import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
+import { FileLabel } from 'vs/workbench/browser/labels';
+import { BreadcrumbsConfig, IBreadcrumbsService } from 'vs/workbench/browser/parts/editor/breadcrumbs';
+import { BreadcrumbElement, EditorBreadcrumbsModel, FileElement } from 'vs/workbench/browser/parts/editor/breadcrumbsModel';
+import { BreadcrumbsPicker, createBreadcrumbsPicker } from 'vs/workbench/browser/parts/editor/breadcrumbsPicker';
+import { EditorGroupView } from 'vs/workbench/browser/parts/editor/editorGroupView';
+import { SideBySideEditorInput } from 'vs/workbench/common/editor';
+import { ACTIVE_GROUP, ACTIVE_GROUP_TYPE, IEditorService, SIDE_GROUP, SIDE_GROUP_TYPE } from 'vs/workbench/services/editor/common/editorService';
+import { IEditorGroupsService } from 'vs/workbench/services/group/common/editorGroupsService';
+
+class Item extends BreadcrumbsItem {
+
+	private readonly _disposables: IDisposable[] = [];
+
+	constructor(
+		readonly element: BreadcrumbElement,
+		readonly options: IBreadcrumbsControlOptions,
+		@IInstantiationService private readonly _instantiationService: IInstantiationService
+	) {
+		super();
+	}
+
+	dispose(): void {
+		dispose(this._disposables);
+	}
+
+	equals(other: BreadcrumbsItem): boolean {
+		if (!(other instanceof Item)) {
+			return false;
+		}
+		if (this.element instanceof FileElement && other.element instanceof FileElement) {
+			return isEqual(this.element.uri, other.element.uri);
+		}
+		if (this.element instanceof TreeElement && other.element instanceof TreeElement) {
+			return this.element.id === other.element.id;
+		}
+		return false;
+	}
+
+	render(container: HTMLElement): void {
+		if (this.element instanceof FileElement) {
+			// file/folder
+			let label = this._instantiationService.createInstance(FileLabel, container, {});
+			label.setFile(this.element.uri, {
+				hidePath: true,
+				hideIcon: this.element.kind === FileKind.FOLDER || !this.options.showFileIcons,
+				fileKind: this.element.kind,
+				fileDecorations: { colors: this.options.showDecorationColors, badges: false },
+			});
+			dom.addClass(container, FileKind[this.element.kind].toLowerCase());
+			this._disposables.push(label);
+
+		} else if (this.element instanceof OutlineModel) {
+			// has outline element but not in one
+			let label = document.createElement('div');
+			label.innerHTML = '&hellip;';
+			label.className = 'hint-more';
+			container.appendChild(label);
+
+		} else if (this.element instanceof OutlineGroup) {
+			// provider
+			let label = new IconLabel(container);
+			label.setValue(this.element.provider.displayName);
+			this._disposables.push(label);
+
+		} else if (this.element instanceof OutlineElement) {
+			// symbol
+			if (this.options.showSymbolIcons) {
+				let icon = document.createElement('div');
+				icon.className = symbolKindToCssClass(this.element.symbol.kind);
+				container.appendChild(icon);
+				dom.addClass(container, 'shows-symbol-icon');
+			}
+			let label = new IconLabel(container);
+			let title = this.element.symbol.name.replace(/\r|\n|\r\n/g, '\u23CE');
+			label.setValue(title);
+			this._disposables.push(label);
+		}
+	}
+}
+
+export interface IBreadcrumbsControlOptions {
+	showFileIcons: boolean;
+	showSymbolIcons: boolean;
+	showDecorationColors: boolean;
+	breadcrumbsBackground: ColorIdentifier | ColorFunction;
+}
+
+export class BreadcrumbsControl {
+
+	static HEIGHT = 22;
+
+	static readonly Payload_Reveal = {};
+	static readonly Payload_RevealAside = {};
+	static readonly Payload_Pick = {};
+
+	static CK_BreadcrumbsPossible = new RawContextKey('breadcrumbsPossible', false);
+	static CK_BreadcrumbsVisible = new RawContextKey('breadcrumbsVisible', false);
+	static CK_BreadcrumbsActive = new RawContextKey('breadcrumbsActive', false);
+
+	private readonly _ckBreadcrumbsPossible: IContextKey<boolean>;
+	private readonly _ckBreadcrumbsVisible: IContextKey<boolean>;
+	private readonly _ckBreadcrumbsActive: IContextKey<boolean>;
+
+	private readonly _cfUseQuickPick: BreadcrumbsConfig<boolean>;
+
+	readonly domNode: HTMLDivElement;
+	private readonly _widget: BreadcrumbsWidget;
+
+	private _disposables = new Array<IDisposable>();
+	private _breadcrumbsDisposables = new Array<IDisposable>();
+	private _breadcrumbsPickerShowing = false;
+
+	constructor(
+		container: HTMLElement,
+		private readonly _options: IBreadcrumbsControlOptions,
+		private readonly _editorGroup: EditorGroupView,
+		@IContextKeyService private readonly _contextKeyService: IContextKeyService,
+		@IContextViewService private readonly _contextViewService: IContextViewService,
+		@IEditorService private readonly _editorService: IEditorService,
+		@IWorkspaceContextService private readonly _workspaceService: IWorkspaceContextService,
+		@IInstantiationService private readonly _instantiationService: IInstantiationService,
+		@IThemeService private readonly _themeService: IThemeService,
+		@IQuickOpenService private readonly _quickOpenService: IQuickOpenService,
+		@IConfigurationService private readonly _configurationService: IConfigurationService,
+		@IFileService private readonly _fileService: IFileService,
+		@IBreadcrumbsService breadcrumbsService: IBreadcrumbsService,
+	) {
+		this.domNode = document.createElement('div');
+		dom.addClass(this.domNode, 'breadcrumbs-control');
+		dom.append(container, this.domNode);
+
+		this._widget = new BreadcrumbsWidget(this.domNode);
+		this._widget.onDidSelectItem(this._onSelectEvent, this, this._disposables);
+		this._widget.onDidFocusItem(this._onFocusEvent, this, this._disposables);
+		this._widget.onDidChangeFocus(this._updateCkBreadcrumbsActive, this, this._disposables);
+		this._disposables.push(attachBreadcrumbsStyler(this._widget, this._themeService, { breadcrumbsBackground: _options.breadcrumbsBackground }));
+
+		this._ckBreadcrumbsPossible = BreadcrumbsControl.CK_BreadcrumbsPossible.bindTo(this._contextKeyService);
+		this._ckBreadcrumbsVisible = BreadcrumbsControl.CK_BreadcrumbsVisible.bindTo(this._contextKeyService);
+		this._ckBreadcrumbsActive = BreadcrumbsControl.CK_BreadcrumbsActive.bindTo(this._contextKeyService);
+
+		this._cfUseQuickPick = BreadcrumbsConfig.UseQuickPick.bindTo(_configurationService);
+
+		this._disposables.push(breadcrumbsService.register(this._editorGroup.id, this._widget));
+	}
+
+	dispose(): void {
+		this._disposables = dispose(this._disposables);
+		this._breadcrumbsDisposables = dispose(this._breadcrumbsDisposables);
+		this._ckBreadcrumbsPossible.reset();
+		this._ckBreadcrumbsVisible.reset();
+		this._ckBreadcrumbsActive.reset();
+		this._cfUseQuickPick.dispose();
+		this._widget.dispose();
+		this.domNode.remove();
+	}
+
+	layout(dim: dom.Dimension): void {
+		this._widget.layout(dim);
+	}
+
+	isHidden(): boolean {
+		return dom.hasClass(this.domNode, 'hidden');
+	}
+
+	hide(): void {
+		this._breadcrumbsDisposables = dispose(this._breadcrumbsDisposables);
+		this._ckBreadcrumbsVisible.set(false);
+		dom.toggleClass(this.domNode, 'hidden', true);
+	}
+
+	update(): boolean {
+		this._breadcrumbsDisposables = dispose(this._breadcrumbsDisposables);
+
+		// honor diff editors and such
+		let input = this._editorGroup.activeEditor;
+		if (input instanceof SideBySideEditorInput) {
+			input = input.master;
+		}
+
+		if (!input || !input.getResource() || (input.getResource().scheme !== Schemas.untitled && !this._fileService.canHandleResource(input.getResource()))) {
+			// cleanup and return when there is no input or when
+			// we cannot handle this input
+			this._ckBreadcrumbsPossible.set(false);
+			if (!this.isHidden()) {
+				this.hide();
+				return true;
+			} else {
+				return false;
+			}
+		}
+
+		dom.toggleClass(this.domNode, 'hidden', false);
+		this._ckBreadcrumbsVisible.set(true);
+		this._ckBreadcrumbsPossible.set(true);
+
+		let editor = this._getActiveCodeEditor();
+		let model = new EditorBreadcrumbsModel(input.getResource(), editor, this._workspaceService, this._configurationService);
+		dom.toggleClass(this.domNode, 'relative-path', model.isRelative());
+
+		let updateBreadcrumbs = () => {
+			let items = model.getElements().map(element => new Item(element, this._options, this._instantiationService));
+			this._widget.setItems(items);
+			this._widget.reveal(items[items.length - 1]);
+		};
+		let listener = model.onDidUpdate(updateBreadcrumbs);
+		updateBreadcrumbs();
+		this._breadcrumbsDisposables = [model, listener];
+
+		// close picker on hide/update
+		this._breadcrumbsDisposables.push({
+			dispose: () => {
+				if (this._breadcrumbsPickerShowing) {
+					this._contextViewService.hideContextView(this);
+				}
+			}
+		});
+
+		return true;
+	}
+
+	private _getActiveCodeEditor(): ICodeEditor {
+		let control = this._editorGroup.activeControl.getControl();
+		let editor: ICodeEditor;
+		if (isCodeEditor(control)) {
+			editor = control as ICodeEditor;
+		} else if (isDiffEditor(control)) {
+			editor = control.getModifiedEditor();
+		}
+		return editor;
+	}
+
+	private _onFocusEvent(event: IBreadcrumbsItemEvent): void {
+		if (event.item && this._breadcrumbsPickerShowing) {
+			return this._widget.setSelection(event.item);
+		}
+	}
+
+	private _onSelectEvent(event: IBreadcrumbsItemEvent): void {
+		if (!event.item) {
+			return;
+		}
+
+		this._editorGroup.focus();
+		const { element } = event.item as Item;
+
+		const group = this._getEditorGroup(event.payload);
+		if (group !== undefined) {
+			// reveal the item
+			this._widget.setFocused(undefined);
+			this._widget.setSelection(undefined);
+			this._revealInEditor(event, element, group);
+			return;
+		}
+
+		if (this._cfUseQuickPick.getValue()) {
+			// using quick pick
+			this._widget.setFocused(undefined);
+			this._widget.setSelection(undefined);
+			this._quickOpenService.show(element instanceof TreeElement ? '@' : '');
+			return;
+		}
+
+		// show picker
+		let picker: BreadcrumbsPicker;
+		let editor = this._getActiveCodeEditor();
+		let editorDecorations: string[] = [];
+		let editorViewState: ICodeEditorViewState;
+
+		this._contextViewService.showContextView({
+			render: (parent: HTMLElement) => {
+				picker = createBreadcrumbsPicker(this._instantiationService, parent, element);
+				let selectListener = picker.onDidPickElement(data => {
+					if (data.target) {
+						editorViewState = undefined;
+					}
+					this._contextViewService.hideContextView(this);
+					this._revealInEditor(event, data.target, this._getEditorGroup(data.payload && data.payload.originalEvent));
+				});
+				let focusListener = picker.onDidFocusElement(data => {
+					if (!editor || !(data.target instanceof OutlineElement)) {
+						return;
+					}
+					if (!editorViewState) {
+						editorViewState = editor.saveViewState();
+					}
+					const { symbol } = data.target;
+					editor.revealRangeInCenter(symbol.range, ScrollType.Smooth);
+					editorDecorations = editor.deltaDecorations(editorDecorations, [{
+						range: symbol.range,
+						options: {
+							className: 'rangeHighlight',
+							isWholeLine: true
+						}
+					}]);
+
+				});
+				this._breadcrumbsPickerShowing = true;
+				this._updateCkBreadcrumbsActive();
+
+				return combinedDisposable([selectListener, focusListener, picker]);
+			},
+			getAnchor: () => {
+				let maxInnerWidth = window.innerWidth - 8 /*a little less the the full widget*/;
+				let pickerHeight = Math.min(330, window.innerHeight * 0.4);
+				let pickerWidth = Math.min(maxInnerWidth, Math.max(240, maxInnerWidth / 4.17));
+				let pickerArrowSize = 8;
+				let pickerArrowOffset: number;
+
+				let data = dom.getDomNodePagePosition(event.node.firstChild as HTMLElement);
+				let y = data.top + data.height - pickerArrowSize;
+				let x = data.left;
+				if (x + pickerWidth >= maxInnerWidth) {
+					x = maxInnerWidth - pickerWidth;
+				}
+				if (event.payload instanceof StandardMouseEvent) {
+					let maxPickerArrowOffset = pickerWidth - 2 * pickerArrowSize;
+					pickerArrowOffset = event.payload.posx - x;
+					if (pickerArrowOffset > maxPickerArrowOffset) {
+						x = Math.min(maxInnerWidth - pickerWidth, x + pickerArrowOffset - maxPickerArrowOffset);
+						pickerArrowOffset = maxPickerArrowOffset;
+					}
+				} else {
+					pickerArrowOffset = (data.left + (data.width * .3)) - x;
+				}
+				picker.setInput(element, pickerHeight, pickerWidth, pickerArrowSize, Math.max(0, pickerArrowOffset));
+				return { x, y };
+			},
+			onHide: (data) => {
+				if (editor) {
+					editor.deltaDecorations(editorDecorations, []);
+					if (editorViewState) {
+						editor.restoreViewState(editorViewState);
+					}
+				}
+				this._breadcrumbsPickerShowing = false;
+				this._updateCkBreadcrumbsActive();
+				if (data === this) {
+					this._widget.setFocused(undefined);
+					this._widget.setSelection(undefined);
+				}
+			}
+		});
+	}
+
+	private _updateCkBreadcrumbsActive(): void {
+		const value = this._widget.isDOMFocused() || this._breadcrumbsPickerShowing;
+		this._ckBreadcrumbsActive.set(value);
+	}
+
+	private _revealInEditor(event: IBreadcrumbsItemEvent, element: any, group: SIDE_GROUP_TYPE | ACTIVE_GROUP_TYPE): void {
+		if (element instanceof FileElement) {
+			if (element.kind === FileKind.FILE) {
+				// open file in editor
+				this._editorService.openEditor({ resource: element.uri }, group);
+			} else {
+				// show next picker
+				let items = this._widget.getItems();
+				let idx = items.indexOf(event.item);
+				this._widget.setFocused(items[idx + 1]);
+				this._widget.setSelection(items[idx + 1], BreadcrumbsControl.Payload_Pick);
+			}
+
+		} else if (element instanceof OutlineElement) {
+			// open symbol in editor
+			let model = OutlineModel.get(element);
+			this._editorService.openEditor({
+				resource: model.textModel.uri,
+				options: {
+					selection: Range.collapseToStart(element.symbol.selectionRange),
+					revealInCenterIfOutsideViewport: true
+				}
+			}, group);
+		}
+	}
+
+	private _getEditorGroup(data: StandardMouseEvent | object): SIDE_GROUP_TYPE | ACTIVE_GROUP_TYPE | undefined {
+		if (data === BreadcrumbsControl.Payload_RevealAside || (data instanceof StandardMouseEvent && data.altKey)) {
+			return SIDE_GROUP;
+		} else if (data === BreadcrumbsControl.Payload_Reveal || (data instanceof StandardMouseEvent && data.metaKey)) {
+			return ACTIVE_GROUP;
+		} else {
+			return undefined;
+		}
+	}
+}
+
+//#region commands
+
+// toggle command
+MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
+	command: {
+		id: 'breadcrumbs.toggle',
+		title: localize('cmd.toggle', "Toggle Breadcrumbs"),
+		category: localize('cmd.category', "View")
+	}
+});
+MenuRegistry.appendMenuItem(MenuId.MenubarViewMenu, {
+	group: '5_editor',
+	order: 99,
+	command: {
+		id: 'breadcrumbs.toggle',
+		title: localize('miToggleBreadcrumbs', "Toggle &&Breadcrumbs")
+	}
+});
+CommandsRegistry.registerCommand('breadcrumbs.toggle', accessor => {
+	let config = accessor.get(IConfigurationService);
+	let value = BreadcrumbsConfig.IsEnabled.bindTo(config).getValue();
+	BreadcrumbsConfig.IsEnabled.bindTo(config).updateValue(!value);
+});
+
+// focus/focus-and-select
+function focusAndSelectHandler(accessor: ServicesAccessor, select: boolean): void {
+	// find widget and focus/select
+	const groups = accessor.get(IEditorGroupsService);
+	const breadcrumbs = accessor.get(IBreadcrumbsService);
+	const widget = breadcrumbs.getWidget(groups.activeGroup.id);
+	if (widget) {
+		const item = tail(widget.getItems());
+		widget.setFocused(item);
+		if (select) {
+			widget.setSelection(item, BreadcrumbsControl.Payload_Pick);
+		}
+	}
+}
+MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
+	command: {
+		id: 'breadcrumbs.focusAndSelect',
+		title: localize('cmd.focus', "Focus Breadcrumbs"),
+		precondition: BreadcrumbsControl.CK_BreadcrumbsVisible
+	}
+});
+KeybindingsRegistry.registerCommandAndKeybindingRule({
+	id: 'breadcrumbs.focusAndSelect',
+	weight: KeybindingWeight.WorkbenchContrib,
+	primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.US_DOT,
+	when: BreadcrumbsControl.CK_BreadcrumbsPossible,
+	handler: accessor => focusAndSelectHandler(accessor, true)
+});
+KeybindingsRegistry.registerCommandAndKeybindingRule({
+	id: 'breadcrumbs.focus',
+	weight: KeybindingWeight.WorkbenchContrib,
+	primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.US_SEMICOLON,
+	when: BreadcrumbsControl.CK_BreadcrumbsPossible,
+	handler: accessor => focusAndSelectHandler(accessor, false)
+});
+
+// this commands is only enabled when breadcrumbs are
+// disabled which it then enables and focuses
+KeybindingsRegistry.registerCommandAndKeybindingRule({
+	id: 'breadcrumbs.toggleToOn',
+	weight: KeybindingWeight.WorkbenchContrib,
+	primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.US_DOT,
+	when: ContextKeyExpr.not('config.breadcrumbs.enabled'),
+	handler: async accessor => {
+		const instant = accessor.get(IInstantiationService);
+		const config = accessor.get(IConfigurationService);
+		// check if enabled and iff not enable
+		const isEnabled = BreadcrumbsConfig.IsEnabled.bindTo(config);
+		if (!isEnabled.getValue()) {
+			await isEnabled.updateValue(true);
+			await timeout(50); // hacky - the widget might not be ready yet...
+		}
+		return instant.invokeFunction(focusAndSelectHandler, true);
+	}
+});
+
+// navigation
+KeybindingsRegistry.registerCommandAndKeybindingRule({
+	id: 'breadcrumbs.focusNext',
+	weight: KeybindingWeight.WorkbenchContrib,
+	primary: KeyCode.RightArrow,
+	secondary: [KeyMod.CtrlCmd | KeyCode.RightArrow],
+	mac: {
+		primary: KeyCode.RightArrow,
+		secondary: [KeyMod.Alt | KeyCode.RightArrow],
+	},
+	when: ContextKeyExpr.and(BreadcrumbsControl.CK_BreadcrumbsVisible, BreadcrumbsControl.CK_BreadcrumbsActive),
+	handler(accessor) {
+		const groups = accessor.get(IEditorGroupsService);
+		const breadcrumbs = accessor.get(IBreadcrumbsService);
+		breadcrumbs.getWidget(groups.activeGroup.id).focusNext();
+	}
+});
+KeybindingsRegistry.registerCommandAndKeybindingRule({
+	id: 'breadcrumbs.focusPrevious',
+	weight: KeybindingWeight.WorkbenchContrib,
+	primary: KeyCode.LeftArrow,
+	secondary: [KeyMod.CtrlCmd | KeyCode.LeftArrow],
+	mac: {
+		primary: KeyCode.LeftArrow,
+		secondary: [KeyMod.Alt | KeyCode.LeftArrow],
+	},
+	when: ContextKeyExpr.and(BreadcrumbsControl.CK_BreadcrumbsVisible, BreadcrumbsControl.CK_BreadcrumbsActive),
+	handler(accessor) {
+		const groups = accessor.get(IEditorGroupsService);
+		const breadcrumbs = accessor.get(IBreadcrumbsService);
+		breadcrumbs.getWidget(groups.activeGroup.id).focusPrev();
+	}
+});
+KeybindingsRegistry.registerCommandAndKeybindingRule({
+	id: 'breadcrumbs.selectFocused',
+	weight: KeybindingWeight.WorkbenchContrib,
+	primary: KeyCode.Enter,
+	secondary: [KeyCode.DownArrow],
+	when: ContextKeyExpr.and(BreadcrumbsControl.CK_BreadcrumbsVisible, BreadcrumbsControl.CK_BreadcrumbsActive),
+	handler(accessor) {
+		const groups = accessor.get(IEditorGroupsService);
+		const breadcrumbs = accessor.get(IBreadcrumbsService);
+		const widget = breadcrumbs.getWidget(groups.activeGroup.id);
+		widget.setSelection(widget.getFocused(), BreadcrumbsControl.Payload_Pick);
+	}
+});
+KeybindingsRegistry.registerCommandAndKeybindingRule({
+	id: 'breadcrumbs.revealFocused',
+	weight: KeybindingWeight.WorkbenchContrib,
+	primary: KeyCode.Space,
+	secondary: [KeyMod.CtrlCmd | KeyCode.Enter],
+	when: ContextKeyExpr.and(BreadcrumbsControl.CK_BreadcrumbsVisible, BreadcrumbsControl.CK_BreadcrumbsActive),
+	handler(accessor) {
+		const groups = accessor.get(IEditorGroupsService);
+		const breadcrumbs = accessor.get(IBreadcrumbsService);
+		const widget = breadcrumbs.getWidget(groups.activeGroup.id);
+		widget.setSelection(widget.getFocused(), BreadcrumbsControl.Payload_Reveal);
+	}
+});
+KeybindingsRegistry.registerCommandAndKeybindingRule({
+	id: 'breadcrumbs.selectEditor',
+	weight: KeybindingWeight.WorkbenchContrib + 1,
+	primary: KeyCode.Escape,
+	when: ContextKeyExpr.and(BreadcrumbsControl.CK_BreadcrumbsVisible, BreadcrumbsControl.CK_BreadcrumbsActive),
+	handler(accessor) {
+		const groups = accessor.get(IEditorGroupsService);
+		const breadcrumbs = accessor.get(IBreadcrumbsService);
+		breadcrumbs.getWidget(groups.activeGroup.id).setFocused(undefined);
+		breadcrumbs.getWidget(groups.activeGroup.id).setSelection(undefined);
+		groups.activeGroup.activeControl.focus();
+	}
+});
+KeybindingsRegistry.registerCommandAndKeybindingRule({
+	id: 'breadcrumbs.revealFocusedFromTreeAside',
+	weight: KeybindingWeight.WorkbenchContrib,
+	primary: KeyMod.CtrlCmd | KeyCode.Enter,
+	when: ContextKeyExpr.and(BreadcrumbsControl.CK_BreadcrumbsVisible, BreadcrumbsControl.CK_BreadcrumbsActive, WorkbenchListFocusContextKey),
+	handler(accessor) {
+		const editors = accessor.get(IEditorService);
+		const lists = accessor.get(IListService);
+		const element = <OutlineElement | IFileStat>lists.lastFocusedList.getFocus();
+		if (element instanceof OutlineElement) {
+			// open symbol in editor
+			return editors.openEditor({
+				resource: OutlineModel.get(element).textModel.uri,
+				options: { selection: Range.collapseToStart(element.symbol.selectionRange) }
+			}, SIDE_GROUP);
+
+		} else if (URI.isUri(element.resource)) {
+			// open file in editor
+			return editors.openEditor({
+				resource: element.resource,
+			}, SIDE_GROUP);
+
+		} else {
+			// ignore
+			return undefined;
+		}
+	}
+});
+//#endregion
diff --git a/src/vs/workbench/browser/parts/editor/breadcrumbsModel.ts b/src/vs/workbench/browser/parts/editor/breadcrumbsModel.ts
new file mode 100644
index 00000000000..6459aadebb3
--- /dev/null
+++ b/src/vs/workbench/browser/parts/editor/breadcrumbsModel.ts
@@ -0,0 +1,230 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+import { equals } from 'vs/base/common/arrays';
+import { TimeoutTimer } from 'vs/base/common/async';
+import { CancellationTokenSource } from 'vs/base/common/cancellation';
+import { size } from 'vs/base/common/collections';
+import { onUnexpectedError } from 'vs/base/common/errors';
+import { debounceEvent, Emitter, Event } from 'vs/base/common/event';
+import { dispose, IDisposable } from 'vs/base/common/lifecycle';
+import { isEqual, dirname } from 'vs/base/common/resources';
+import { URI } from 'vs/base/common/uri';
+import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
+import { IPosition } from 'vs/editor/common/core/position';
+import { DocumentSymbolProviderRegistry } from 'vs/editor/common/modes';
+import { OutlineElement, OutlineGroup, OutlineModel, TreeElement } from 'vs/editor/contrib/documentSymbols/outlineModel';
+import { IWorkspaceContextService, IWorkspaceFolder, WorkbenchState } from 'vs/platform/workspace/common/workspace';
+import { Schemas } from 'vs/base/common/network';
+import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { BreadcrumbsConfig } from 'vs/workbench/browser/parts/editor/breadcrumbs';
+import { FileKind } from 'vs/platform/files/common/files';
+
+export class FileElement {
+	constructor(
+		readonly uri: URI,
+		readonly kind: FileKind
+	) { }
+}
+
+export type BreadcrumbElement = FileElement | OutlineModel | OutlineGroup | OutlineElement;
+
+type FileInfo = { path: FileElement[], folder: IWorkspaceFolder };
+
+export class EditorBreadcrumbsModel {
+
+	private readonly _disposables: IDisposable[] = [];
+	private readonly _fileInfo: FileInfo;
+
+	private readonly _cfgFilePath: BreadcrumbsConfig<'on' | 'off' | 'last'>;
+	private readonly _cfgSymbolPath: BreadcrumbsConfig<'on' | 'off' | 'last'>;
+
+	private _outlineElements: (OutlineModel | OutlineGroup | OutlineElement)[] = [];
+	private _outlineDisposables: IDisposable[] = [];
+
+	private _onDidUpdate = new Emitter<this>();
+	readonly onDidUpdate: Event<this> = this._onDidUpdate.event;
+
+	constructor(
+		private readonly _uri: URI,
+		private readonly _editor: ICodeEditor | undefined,
+		@IWorkspaceContextService workspaceService: IWorkspaceContextService,
+		@IConfigurationService configurationService: IConfigurationService,
+	) {
+
+		this._cfgFilePath = BreadcrumbsConfig.FilePath.bindTo(configurationService);
+		this._cfgSymbolPath = BreadcrumbsConfig.SymbolPath.bindTo(configurationService);
+
+		this._disposables.push(this._cfgFilePath.onDidChange(_ => this._onDidUpdate.fire(this)));
+		this._disposables.push(this._cfgSymbolPath.onDidChange(_ => this._onDidUpdate.fire(this)));
+
+		this._fileInfo = EditorBreadcrumbsModel._initFilePathInfo(this._uri, workspaceService);
+		this._bindToEditor();
+		this._onDidUpdate.fire(this);
+	}
+
+	dispose(): void {
+		this._cfgFilePath.dispose();
+		this._cfgSymbolPath.dispose();
+		dispose(this._disposables);
+	}
+
+	isRelative(): boolean {
+		return Boolean(this._fileInfo.folder);
+	}
+
+	getElements(): ReadonlyArray<BreadcrumbElement> {
+		let result: BreadcrumbElement[] = [];
+
+		// file path elements
+		if (this._cfgFilePath.getValue() === 'on') {
+			result = result.concat(this._fileInfo.path);
+		} else if (this._cfgFilePath.getValue() === 'last' && this._fileInfo.path.length > 0) {
+			result = result.concat(this._fileInfo.path.slice(-1));
+		}
+
+		// symbol path elements
+		if (this._cfgSymbolPath.getValue() === 'on') {
+			result = result.concat(this._outlineElements);
+		} else if (this._cfgSymbolPath.getValue() === 'last' && this._outlineElements.length > 0) {
+			result = result.concat(this._outlineElements.slice(-1));
+		}
+
+		return result;
+	}
+
+	private static _initFilePathInfo(uri: URI, workspaceService: IWorkspaceContextService): FileInfo {
+
+		if (uri.scheme === Schemas.untitled) {
+			return {
+				folder: undefined,
+				path: []
+			};
+		}
+
+		let info: FileInfo = {
+			folder: workspaceService.getWorkspaceFolder(uri),
+			path: []
+		};
+
+		while (uri.path !== '/') {
+			if (info.folder && isEqual(info.folder.uri, uri)) {
+				break;
+			}
+			info.path.unshift(new FileElement(uri, info.path.length === 0 ? FileKind.FILE : FileKind.FOLDER));
+			uri = dirname(uri);
+		}
+
+		if (info.folder && workspaceService.getWorkbenchState() === WorkbenchState.WORKSPACE) {
+			info.path.unshift(new FileElement(info.folder.uri, FileKind.ROOT_FOLDER));
+		}
+		return info;
+	}
+
+	private _bindToEditor(): void {
+		if (!this._editor) {
+			return;
+		}
+		// update as model changes
+		this._disposables.push(DocumentSymbolProviderRegistry.onDidChange(_ => this._updateOutline()));
+		this._disposables.push(this._editor.onDidChangeModel(_ => this._updateOutline()));
+		this._disposables.push(this._editor.onDidChangeModelLanguage(_ => this._updateOutline()));
+		this._disposables.push(debounceEvent(this._editor.onDidChangeModelContent, _ => _, 350)(_ => this._updateOutline(true)));
+		this._updateOutline();
+
+		// stop when editor dies
+		this._disposables.push(this._editor.onDidDispose(() => this._outlineDisposables = dispose(this._outlineDisposables)));
+	}
+
+	private _updateOutline(didChangeContent?: boolean): void {
+
+		this._outlineDisposables = dispose(this._outlineDisposables);
+		if (!didChangeContent) {
+			this._updateOutlineElements([]);
+		}
+
+		const buffer = this._editor.getModel();
+		if (!buffer || !DocumentSymbolProviderRegistry.has(buffer) || !isEqual(buffer.uri, this._uri)) {
+			return;
+		}
+
+		const source = new CancellationTokenSource();
+		const versionIdThen = buffer.getVersionId();
+		const timeout = new TimeoutTimer();
+
+		this._outlineDisposables.push({
+			dispose: () => {
+				source.cancel();
+				source.dispose();
+				timeout.dispose();
+			}
+		});
+
+		OutlineModel.create(buffer, source.token).then(model => {
+			if (TreeElement.empty(model)) {
+				// empty -> no outline elements
+				this._updateOutlineElements([]);
+
+			} else {
+				// copy the model
+				model = model.adopt();
+
+				this._updateOutlineElements(this._getOutlineElements(model, this._editor.getPosition()));
+				this._outlineDisposables.push(this._editor.onDidChangeCursorPosition(_ => {
+					timeout.cancelAndSet(() => {
+						if (!buffer.isDisposed() && versionIdThen === buffer.getVersionId() && this._editor.getModel()) {
+							this._updateOutlineElements(this._getOutlineElements(model, this._editor.getPosition()));
+						}
+					}, 150);
+				}));
+			}
+		}).catch(err => {
+			this._updateOutlineElements([]);
+			onUnexpectedError(err);
+		});
+	}
+
+	private _getOutlineElements(model: OutlineModel, position: IPosition): (OutlineModel | OutlineGroup | OutlineElement)[] {
+		if (!model) {
+			return [];
+		}
+		let item: OutlineGroup | OutlineElement = model.getItemEnclosingPosition(position);
+		if (!item) {
+			return [model];
+		}
+		let chain: (OutlineGroup | OutlineElement)[] = [];
+		while (item) {
+			chain.push(item);
+			let parent = item.parent;
+			if (parent instanceof OutlineModel) {
+				break;
+			}
+			if (parent instanceof OutlineGroup && size(parent.parent.children) === 1) {
+				break;
+			}
+			item = parent;
+		}
+		return chain.reverse();
+	}
+
+	private _updateOutlineElements(elements: (OutlineModel | OutlineGroup | OutlineElement)[]): void {
+		if (!equals(elements, this._outlineElements, EditorBreadcrumbsModel._outlineElementEquals)) {
+			this._outlineElements = elements;
+			this._onDidUpdate.fire(this);
+		}
+	}
+
+	private static _outlineElementEquals(a: OutlineModel | OutlineGroup | OutlineElement, b: OutlineModel | OutlineGroup | OutlineElement): boolean {
+		if (a === b) {
+			return true;
+		} else if (!a || !b) {
+			return false;
+		} else {
+			return a.id === b.id;
+		}
+	}
+}
diff --git a/src/vs/workbench/browser/parts/editor/breadcrumbsPicker.ts b/src/vs/workbench/browser/parts/editor/breadcrumbsPicker.ts
new file mode 100644
index 00000000000..2207e488347
--- /dev/null
+++ b/src/vs/workbench/browser/parts/editor/breadcrumbsPicker.ts
@@ -0,0 +1,484 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+import { onDidChangeZoomLevel } from 'vs/base/browser/browser';
+import * as dom from 'vs/base/browser/dom';
+import { compareFileNames } from 'vs/base/common/comparers';
+import { onUnexpectedError } from 'vs/base/common/errors';
+import { Emitter, Event } from 'vs/base/common/event';
+import { createMatches, FuzzyScore, fuzzyScore } from 'vs/base/common/filters';
+import * as glob from 'vs/base/common/glob';
+import { dispose, IDisposable } from 'vs/base/common/lifecycle';
+import { join } from 'vs/base/common/paths';
+import { basename, dirname, isEqual } from 'vs/base/common/resources';
+import { URI } from 'vs/base/common/uri';
+import { TPromise } from 'vs/base/common/winjs.base';
+import { IDataSource, IFilter, IRenderer, ISorter, ITree } from 'vs/base/parts/tree/browser/tree';
+import 'vs/css!./media/breadcrumbscontrol';
+import { OutlineElement, OutlineModel, TreeElement } from 'vs/editor/contrib/documentSymbols/outlineModel';
+import { OutlineDataSource, OutlineItemComparator, OutlineRenderer } from 'vs/editor/contrib/documentSymbols/outlineTree';
+import { localize } from 'vs/nls';
+import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { FileKind, IFileService, IFileStat } from 'vs/platform/files/common/files';
+import { IConstructorSignature1, IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { HighlightingWorkbenchTree, IHighlighter, IHighlightingTreeConfiguration, IHighlightingTreeOptions } from 'vs/platform/list/browser/listService';
+import { breadcrumbsPickerBackground, widgetShadow } from 'vs/platform/theme/common/colorRegistry';
+import { IWorkspace, IWorkspaceContextService, IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
+import { FileLabel } from 'vs/workbench/browser/labels';
+import { BreadcrumbsConfig } from 'vs/workbench/browser/parts/editor/breadcrumbs';
+import { BreadcrumbElement, FileElement } from 'vs/workbench/browser/parts/editor/breadcrumbsModel';
+import { IFileIconTheme, IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService';
+
+export function createBreadcrumbsPicker(instantiationService: IInstantiationService, parent: HTMLElement, element: BreadcrumbElement): BreadcrumbsPicker {
+	let ctor: IConstructorSignature1<HTMLElement, BreadcrumbsPicker> = element instanceof FileElement ? BreadcrumbsFilePicker : BreadcrumbsOutlinePicker;
+	return instantiationService.createInstance(ctor, parent);
+}
+
+interface ILayoutInfo {
+	// height: number;
+	width: number;
+	arrowSize: number;
+	arrowOffset: number;
+	inputHeight: number;
+}
+
+export abstract class BreadcrumbsPicker {
+
+	protected readonly _disposables = new Array<IDisposable>();
+	protected readonly _domNode: HTMLDivElement;
+	protected readonly _arrow: HTMLDivElement;
+	protected readonly _treeContainer: HTMLDivElement;
+	protected readonly _tree: HighlightingWorkbenchTree;
+	protected readonly _focus: dom.IFocusTracker;
+	private _layoutInfo: ILayoutInfo;
+
+	private readonly _onDidPickElement = new Emitter<{ target: any, payload: any }>();
+	readonly onDidPickElement: Event<{ target: any, payload: any }> = this._onDidPickElement.event;
+
+	private readonly _onDidFocusElement = new Emitter<{ target: any, payload: any }>();
+	readonly onDidFocusElement: Event<{ target: any, payload: any }> = this._onDidFocusElement.event;
+
+	constructor(
+		parent: HTMLElement,
+		@IInstantiationService protected readonly _instantiationService: IInstantiationService,
+		@IWorkbenchThemeService protected readonly _themeService: IWorkbenchThemeService,
+		@IConfigurationService private readonly _configurationService: IConfigurationService,
+	) {
+		this._domNode = document.createElement('div');
+		this._domNode.className = 'monaco-breadcrumbs-picker show-file-icons';
+		parent.appendChild(this._domNode);
+
+		this._focus = dom.trackFocus(this._domNode);
+		this._focus.onDidBlur(_ => this._onDidPickElement.fire({ target: undefined, payload: undefined }), undefined, this._disposables);
+		this._disposables.push(onDidChangeZoomLevel(_ => this._onDidPickElement.fire({ target: undefined, payload: undefined })));
+
+		const theme = this._themeService.getTheme();
+		const color = theme.getColor(breadcrumbsPickerBackground);
+
+		this._arrow = document.createElement('div');
+		this._arrow.style.width = '0';
+		this._arrow.style.borderStyle = 'solid';
+		this._arrow.style.borderWidth = '8px';
+		this._arrow.style.borderColor = `transparent transparent ${color.toString()}`;
+		this._domNode.appendChild(this._arrow);
+
+		this._treeContainer = document.createElement('div');
+		this._treeContainer.style.background = color.toString();
+		this._treeContainer.style.paddingTop = '2px';
+		this._treeContainer.style.boxShadow = `0px 5px 8px ${this._themeService.getTheme().getColor(widgetShadow)}`;
+		this._domNode.appendChild(this._treeContainer);
+
+		const filterConfig = BreadcrumbsConfig.FilterOnType.bindTo(this._configurationService);
+		this._disposables.push(filterConfig);
+
+		const treeConifg = this._completeTreeConfiguration({ dataSource: undefined, renderer: undefined, highlighter: undefined });
+		this._tree = this._instantiationService.createInstance(
+			HighlightingWorkbenchTree,
+			this._treeContainer,
+			treeConifg,
+			<IHighlightingTreeOptions>{ useShadows: false, filterOnType: filterConfig.getValue(), showTwistie: false, twistiePixels: 12 },
+			{ placeholder: localize('placeholder', "Find") }
+		);
+		this._disposables.push(this._tree.onDidChangeSelection(e => {
+			if (e.payload !== this._tree) {
+				const target = this._getTargetFromEvent(e.selection[0], e.payload);
+				if (target) {
+					setTimeout(_ => {// need to debounce here because this disposes the tree and the tree doesn't like to be disposed on click
+						this._onDidPickElement.fire({ target, payload: e.payload });
+					}, 0);
+				}
+			}
+		}));
+		this._disposables.push(this._tree.onDidChangeFocus(e => {
+			const target = this._getTargetFromEvent(e.focus, e.payload);
+			if (target) {
+				this._onDidFocusElement.fire({ target, payload: e.payload });
+			}
+		}));
+		this._disposables.push(this._tree.onDidStartFiltering(() => {
+			this._layoutInfo.inputHeight = 36;
+			this._layout();
+		}));
+		this._disposables.push(this._tree.onDidExpandItem(() => {
+			this._layout();
+		}));
+		this._disposables.push(this._tree.onDidCollapseItem(() => {
+			this._layout();
+		}));
+
+		// tree icon theme specials
+		dom.addClass(this._treeContainer, 'file-icon-themable-tree');
+		dom.addClass(this._treeContainer, 'show-file-icons');
+		const onFileIconThemeChange = (fileIconTheme: IFileIconTheme) => {
+			dom.toggleClass(this._treeContainer, 'align-icons-and-twisties', fileIconTheme.hasFileIcons && !fileIconTheme.hasFolderIcons);
+			dom.toggleClass(this._treeContainer, 'hide-arrows', fileIconTheme.hidesExplorerArrows === true);
+		};
+		this._disposables.push(_themeService.onDidFileIconThemeChange(onFileIconThemeChange));
+		onFileIconThemeChange(_themeService.getFileIconTheme());
+
+		this._domNode.focus();
+	}
+
+	dispose(): void {
+		dispose(this._disposables);
+		this._onDidPickElement.dispose();
+		this._tree.dispose();
+		this._focus.dispose();
+	}
+
+	setInput(input: any, height: number, width: number, arrowSize: number, arrowOffset: number): void {
+		let actualInput = this._getInput(input);
+		this._tree.setInput(actualInput).then(() => {
+
+			this._layoutInfo = { width, arrowSize, arrowOffset, inputHeight: 0 };
+			this._layout();
+
+			// use proper selection, reveal
+			let selection = this._getInitialSelection(this._tree, input);
+			if (selection) {
+				return this._tree.reveal(selection, .5).then(() => {
+					this._tree.setSelection([selection], this._tree);
+					this._tree.setFocus(selection);
+					this._tree.domFocus();
+				});
+			} else {
+				this._tree.focusFirst();
+				this._tree.setSelection([this._tree.getFocus()], this._tree);
+				this._tree.domFocus();
+				return Promise.resolve(null);
+			}
+		}, onUnexpectedError);
+	}
+
+	private _layout(info: ILayoutInfo = this._layoutInfo): void {
+
+		let count = 0;
+		let nav = this._tree.getNavigator(undefined, false);
+		while (nav.next() && count < 13) { count += 1; }
+
+		let treeHeight = count * 22;
+		let totalHeight = treeHeight + 2 + info.arrowSize;
+
+		this._domNode.style.height = `${totalHeight}px`;
+		this._domNode.style.width = `${info.width}px`;
+		this._arrow.style.borderWidth = `${info.arrowSize}px`;
+		this._arrow.style.marginLeft = `${info.arrowOffset}px`;
+		this._treeContainer.style.height = `${treeHeight}px`;
+		this._treeContainer.style.width = `${info.width}px`;
+		this._tree.layout();
+		this._layoutInfo = info;
+
+	}
+
+	protected abstract _getInput(input: BreadcrumbElement): any;
+	protected abstract _getInitialSelection(tree: ITree, input: BreadcrumbElement): any;
+	protected abstract _completeTreeConfiguration(config: IHighlightingTreeConfiguration): IHighlightingTreeConfiguration;
+	protected abstract _getTargetFromEvent(element: any, payload: any): any | undefined;
+}
+
+//#region - Files
+
+export class FileDataSource implements IDataSource {
+
+	private readonly _parents = new WeakMap<object, IWorkspaceFolder | IFileStat>();
+
+	constructor(
+		@IFileService private readonly _fileService: IFileService,
+	) { }
+
+	getId(tree: ITree, element: IWorkspace | IWorkspaceFolder | IFileStat | URI): string {
+		if (URI.isUri(element)) {
+			return element.toString();
+		} else if (IWorkspace.isIWorkspace(element)) {
+			return element.id;
+		} else if (IWorkspaceFolder.isIWorkspaceFolder(element)) {
+			return element.uri.toString();
+		} else {
+			return element.resource.toString();
+		}
+	}
+
+	hasChildren(tree: ITree, element: IWorkspace | IWorkspaceFolder | IFileStat | URI): boolean {
+		return URI.isUri(element) || IWorkspace.isIWorkspace(element) || IWorkspaceFolder.isIWorkspaceFolder(element) || element.isDirectory;
+	}
+
+	getChildren(tree: ITree, element: IWorkspace | IWorkspaceFolder | IFileStat | URI): TPromise<IWorkspaceFolder[] | IFileStat[]> {
+		if (IWorkspace.isIWorkspace(element)) {
+			return TPromise.as(element.folders).then(folders => {
+				for (let child of folders) {
+					this._parents.set(element, child);
+				}
+				return folders;
+			});
+		}
+		let uri: URI;
+		if (IWorkspaceFolder.isIWorkspaceFolder(element)) {
+			uri = element.uri;
+		} else if (URI.isUri(element)) {
+			uri = element;
+		} else {
+			uri = element.resource;
+		}
+		return this._fileService.resolveFile(uri).then(stat => {
+			for (let child of stat.children) {
+				this._parents.set(stat, child);
+			}
+			return stat.children;
+		});
+	}
+
+	getParent(tree: ITree, element: IWorkspace | URI | IWorkspaceFolder | IFileStat): TPromise<IWorkspaceFolder | IFileStat> {
+		return TPromise.as(this._parents.get(element));
+	}
+}
+
+export class FileFilter implements IFilter {
+
+	private readonly _cachedExpressions = new Map<string, glob.ParsedExpression>();
+	private readonly _disposables: IDisposable[] = [];
+
+	constructor(
+		@IWorkspaceContextService private readonly _workspaceService: IWorkspaceContextService,
+		@IConfigurationService configService: IConfigurationService,
+	) {
+		const config = BreadcrumbsConfig.FileExcludes.bindTo(configService);
+		const update = () => {
+			_workspaceService.getWorkspace().folders.forEach(folder => {
+				const excludesConfig = config.getValue({ resource: folder.uri });
+				if (!excludesConfig) {
+					return;
+				}
+				// adjust patterns to be absolute in case they aren't
+				// free floating (**/)
+				const adjustedConfig: glob.IExpression = {};
+				for (const pattern in excludesConfig) {
+					if (typeof excludesConfig[pattern] !== 'boolean') {
+						continue;
+					}
+					let patternAbs = pattern.indexOf('**/') !== 0
+						? join(folder.uri.path, pattern)
+						: pattern;
+
+					adjustedConfig[patternAbs] = excludesConfig[pattern];
+				}
+				this._cachedExpressions.set(folder.uri.toString(), glob.parse(adjustedConfig));
+			});
+		};
+		update();
+		this._disposables.push(
+			config,
+			config.onDidChange(update),
+			_workspaceService.onDidChangeWorkspaceFolders(update)
+		);
+	}
+
+	dispose(): void {
+		dispose(this._disposables);
+	}
+
+	isVisible(tree: ITree, element: IWorkspaceFolder | IFileStat): boolean {
+		if (IWorkspaceFolder.isIWorkspaceFolder(element)) {
+			// not a file
+			return true;
+		}
+		const folder = this._workspaceService.getWorkspaceFolder(element.resource);
+		if (!folder || !this._cachedExpressions.has(folder.uri.toString())) {
+			// no folder or no filer
+			return true;
+		}
+
+		const expression = this._cachedExpressions.get(folder.uri.toString());
+		return !expression(element.resource.path, basename(element.resource));
+	}
+}
+
+export class FileHighlighter implements IHighlighter {
+	getHighlightsStorageKey(element: IFileStat | IWorkspaceFolder): string {
+		return IWorkspaceFolder.isIWorkspaceFolder(element) ? element.uri.toString() : element.resource.toString();
+	}
+	getHighlights(tree: ITree, element: IFileStat | IWorkspaceFolder, pattern: string): FuzzyScore {
+		return fuzzyScore(pattern, element.name, undefined, true);
+	}
+}
+
+export class FileRenderer implements IRenderer {
+
+	constructor(
+		@IInstantiationService private readonly _instantiationService: IInstantiationService,
+		@IConfigurationService private readonly _configService: IConfigurationService,
+	) { }
+
+	getHeight(tree: ITree, element: any): number {
+		return 22;
+	}
+
+	getTemplateId(tree: ITree, element: any): string {
+		return 'FileStat';
+	}
+
+	renderTemplate(tree: ITree, templateId: string, container: HTMLElement) {
+		return this._instantiationService.createInstance(FileLabel, container, { supportHighlights: true });
+	}
+
+	renderElement(tree: ITree, element: IFileStat | IWorkspaceFolder, templateId: string, templateData: FileLabel): void {
+		let fileDecorations = this._configService.getValue<{ colors: boolean, badges: boolean }>('explorer.decorations');
+		let resource: URI;
+		let fileKind: FileKind;
+		if (IWorkspaceFolder.isIWorkspaceFolder(element)) {
+			resource = element.uri;
+			fileKind = FileKind.ROOT_FOLDER;
+		} else {
+			resource = element.resource;
+			fileKind = element.isDirectory ? FileKind.FOLDER : FileKind.FILE;
+		}
+		templateData.setFile(resource, {
+			fileKind,
+			hidePath: true,
+			fileDecorations: fileDecorations,
+			matches: createMatches((tree as HighlightingWorkbenchTree).getHighlighterScore(element)),
+			extraClasses: ['picker-item']
+		});
+	}
+
+	disposeTemplate(tree: ITree, templateId: string, templateData: FileLabel): void {
+		templateData.dispose();
+	}
+}
+
+export class FileSorter implements ISorter {
+	compare(tree: ITree, a: IFileStat | IWorkspaceFolder, b: IFileStat | IWorkspaceFolder): number {
+		if (IWorkspaceFolder.isIWorkspaceFolder(a) && IWorkspaceFolder.isIWorkspaceFolder(b)) {
+			return a.index - b.index;
+		} else {
+			if ((a as IFileStat).isDirectory === (b as IFileStat).isDirectory) {
+				// same type -> compare on names
+				return compareFileNames(a.name, b.name);
+			} else if ((a as IFileStat).isDirectory) {
+				return -1;
+			} else {
+				return 1;
+			}
+		}
+	}
+}
+
+export class BreadcrumbsFilePicker extends BreadcrumbsPicker {
+
+	constructor(
+		parent: HTMLElement,
+		@IInstantiationService instantiationService: IInstantiationService,
+		@IWorkbenchThemeService themeService: IWorkbenchThemeService,
+		@IConfigurationService configService: IConfigurationService,
+		@IWorkspaceContextService private readonly _workspaceService: IWorkspaceContextService,
+	) {
+		super(parent, instantiationService, themeService, configService);
+	}
+
+	protected _getInput(input: BreadcrumbElement): any {
+		let { uri, kind } = (input as FileElement);
+		if (kind === FileKind.ROOT_FOLDER) {
+			return this._workspaceService.getWorkspace();
+		} else {
+			return dirname(uri);
+		}
+	}
+
+	protected _getInitialSelection(tree: ITree, input: BreadcrumbElement): any {
+		let { uri } = (input as FileElement);
+		let nav = tree.getNavigator();
+		while (nav.next()) {
+			let cur = nav.current();
+			let candidate = IWorkspaceFolder.isIWorkspaceFolder(cur) ? cur.uri : (cur as IFileStat).resource;
+			if (isEqual(uri, candidate)) {
+				return cur;
+			}
+		}
+		return undefined;
+	}
+
+	protected _completeTreeConfiguration(config: IHighlightingTreeConfiguration): IHighlightingTreeConfiguration {
+		// todo@joh reuse explorer implementations?
+		const filter = this._instantiationService.createInstance(FileFilter);
+		this._disposables.push(filter);
+
+		config.dataSource = this._instantiationService.createInstance(FileDataSource);
+		config.renderer = this._instantiationService.createInstance(FileRenderer);
+		config.sorter = new FileSorter();
+		config.highlighter = new FileHighlighter();
+		config.filter = filter;
+		return config;
+	}
+
+	protected _getTargetFromEvent(element: any, _payload: any): any | undefined {
+		if (element && !IWorkspaceFolder.isIWorkspaceFolder(element) && !(element as IFileStat).isDirectory) {
+			return new FileElement((element as IFileStat).resource, FileKind.FILE);
+		}
+	}
+}
+//#endregion
+
+//#region - Symbols
+
+class OutlineHighlighter implements IHighlighter {
+	getHighlights(tree: ITree, element: OutlineElement, pattern: string): FuzzyScore {
+		OutlineModel.get(element).updateMatches(pattern);
+		return element.score;
+	}
+}
+
+export class BreadcrumbsOutlinePicker extends BreadcrumbsPicker {
+
+	protected _getInput(input: BreadcrumbElement): any {
+		let element = input as TreeElement;
+		let model = OutlineModel.get(element);
+		model.updateMatches('');
+		return model;
+	}
+
+	protected _getInitialSelection(_tree: ITree, input: BreadcrumbElement): any {
+		return input instanceof OutlineModel ? undefined : input;
+	}
+
+	protected _completeTreeConfiguration(config: IHighlightingTreeConfiguration): IHighlightingTreeConfiguration {
+		config.dataSource = this._instantiationService.createInstance(OutlineDataSource);
+		config.renderer = this._instantiationService.createInstance(OutlineRenderer);
+		config.sorter = new OutlineItemComparator();
+		config.highlighter = new OutlineHighlighter();
+		return config;
+	}
+
+	protected _getTargetFromEvent(element: any, payload: any): any | undefined {
+		if (payload && payload.didClickOnTwistie) {
+			return;
+		}
+		if (element instanceof OutlineElement) {
+			return element;
+		}
+	}
+}
+
+//#endregion
diff --git a/src/vs/workbench/browser/parts/editor/editor.contribution.ts b/src/vs/workbench/browser/parts/editor/editor.contribution.ts
index fa58cd1702a..924fc705a8e 100644
--- a/src/vs/workbench/browser/parts/editor/editor.contribution.ts
+++ b/src/vs/workbench/browser/parts/editor/editor.contribution.ts
@@ -6,10 +6,11 @@
 
 import { Registry } from 'vs/platform/registry/common/platform';
 import * as nls from 'vs/nls';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { Action, IAction } from 'vs/base/common/actions';
 import { IEditorQuickOpenEntry, IQuickOpenRegistry, Extensions as QuickOpenExtensions, QuickOpenHandlerDescriptor } from 'vs/workbench/browser/quickopen';
-import { StatusbarItemDescriptor, StatusbarAlignment, IStatusbarRegistry, Extensions as StatusExtensions } from 'vs/workbench/browser/parts/statusbar/statusbar';
+import { StatusbarItemDescriptor, IStatusbarRegistry, Extensions as StatusExtensions } from 'vs/workbench/browser/parts/statusbar/statusbar';
+import { StatusbarAlignment } from 'vs/platform/statusbar/common/statusbar';
 import { IEditorRegistry, EditorDescriptor, Extensions as EditorExtensions } from 'vs/workbench/browser/editor';
 import { EditorInput, IEditorInputFactory, SideBySideEditorInput, IEditorInputFactoryRegistry, Extensions as EditorInputExtensions } from 'vs/workbench/common/editor';
 import { TextResourceEditor } from 'vs/workbench/browser/parts/editor/textResourceEditor';
@@ -37,13 +38,13 @@ import {
 	ShowEditorsInActiveGroupAction, MoveEditorToLastGroupAction, OpenFirstEditorInGroup, MoveGroupUpAction, MoveGroupDownAction, FocusLastGroupAction, SplitEditorLeftAction, SplitEditorRightAction,
 	SplitEditorUpAction, SplitEditorDownAction, MoveEditorToLeftGroupAction, MoveEditorToRightGroupAction, MoveEditorToAboveGroupAction, MoveEditorToBelowGroupAction, CloseAllEditorGroupsAction,
 	JoinAllGroupsAction, FocusLeftGroup, FocusAboveGroup, FocusRightGroup, FocusBelowGroup, EditorLayoutSingleAction, EditorLayoutTwoColumnsAction, EditorLayoutThreeColumnsAction, EditorLayoutTwoByTwoGridAction,
-	EditorLayoutTwoRowsAction, EditorLayoutThreeRowsAction, EditorLayoutTwoColumnsBottomAction, EditorLayoutTwoColumnsRightAction, EditorLayoutCenteredAction, NewEditorGroupLeftAction, NewEditorGroupRightAction,
-	NewEditorGroupAboveAction, NewEditorGroupBelowAction
+	EditorLayoutTwoRowsAction, EditorLayoutThreeRowsAction, EditorLayoutTwoColumnsBottomAction, EditorLayoutTwoRowsRightAction, NewEditorGroupLeftAction, NewEditorGroupRightAction,
+	NewEditorGroupAboveAction, NewEditorGroupBelowAction, SplitEditorOrthogonalAction
 } from 'vs/workbench/browser/parts/editor/editorActions';
 import * as editorCommands from 'vs/workbench/browser/parts/editor/editorCommands';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { getQuickNavigateHandler, inQuickOpenContext } from 'vs/workbench/browser/parts/quickopen/quickopen';
-import { KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRegistry';
+import { KeybindingsRegistry, KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
 import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
 import { isMacintosh } from 'vs/base/common/platform';
 import { AllEditorsPicker, ActiveEditorGroupPicker } from 'vs/workbench/browser/parts/editor/editorPicker';
@@ -109,10 +110,9 @@ class UntitledEditorInputFactory implements IEditorInputFactory {
 
 	constructor(
 		@ITextFileService private textFileService: ITextFileService
-	) {
-	}
+	) { }
 
-	public serialize(editorInput: EditorInput): string {
+	serialize(editorInput: EditorInput): string {
 		if (!this.textFileService.isHotExitEnabled) {
 			return null; // never restore untitled unless hot exit is enabled
 		}
@@ -121,7 +121,7 @@ class UntitledEditorInputFactory implements IEditorInputFactory {
 
 		let resource = untitledEditorInput.getResource();
 		if (untitledEditorInput.hasAssociatedFilePath) {
-			resource = URI.file(resource.fsPath); // untitled with associated file path use the file schema
+			resource = resource.with({ scheme: Schemas.file }); // untitled with associated file path use the file schema
 		}
 
 		const serialized: ISerializedUntitledEditorInput = {
@@ -134,7 +134,7 @@ class UntitledEditorInputFactory implements IEditorInputFactory {
 		return JSON.stringify(serialized);
 	}
 
-	public deserialize(instantiationService: IInstantiationService, serializedEditorInput: string): UntitledEditorInput {
+	deserialize(instantiationService: IInstantiationService, serializedEditorInput: string): UntitledEditorInput {
 		return instantiationService.invokeFunction<UntitledEditorInput>(accessor => {
 			const deserialized: ISerializedUntitledEditorInput = JSON.parse(serializedEditorInput);
 			const resource = !!deserialized.resourceJSON ? URI.revive(deserialized.resourceJSON) : URI.parse(deserialized.resource);
@@ -163,7 +163,7 @@ interface ISerializedSideBySideEditorInput {
 // Register Side by Side Editor Input Factory
 class SideBySideEditorInputFactory implements IEditorInputFactory {
 
-	public serialize(editorInput: EditorInput): string {
+	serialize(editorInput: EditorInput): string {
 		const input = <SideBySideEditorInput>editorInput;
 
 		if (input.details && input.master) {
@@ -191,7 +191,7 @@ class SideBySideEditorInputFactory implements IEditorInputFactory {
 		return null;
 	}
 
-	public deserialize(instantiationService: IInstantiationService, serializedEditorInput: string): EditorInput {
+	deserialize(instantiationService: IInstantiationService, serializedEditorInput: string): EditorInput {
 		const deserialized: ISerializedSideBySideEditorInput = JSON.parse(serializedEditorInput);
 
 		const registry = Registry.as<IEditorInputFactoryRegistry>(EditorInputExtensions.EditorInputFactories);
@@ -230,13 +230,13 @@ export class QuickOpenActionContributor extends ActionBarContributor {
 		super();
 	}
 
-	public hasActions(context: any): boolean {
+	hasActions(context: any): boolean {
 		const entry = this.getEntry(context);
 
 		return !!entry;
 	}
 
-	public getActions(context: any): IAction[] {
+	getActions(context: any): IAction[] {
 		const actions: Action[] = [];
 
 		const entry = this.getEntry(context);
@@ -319,6 +319,7 @@ registry.registerWorkbenchAction(new SyncActionDescriptor(CloseAllEditorGroupsAc
 registry.registerWorkbenchAction(new SyncActionDescriptor(CloseLeftEditorsInGroupAction, CloseLeftEditorsInGroupAction.ID, CloseLeftEditorsInGroupAction.LABEL), 'View: Close Editors in Group to the Left', category);
 registry.registerWorkbenchAction(new SyncActionDescriptor(CloseEditorsInOtherGroupsAction, CloseEditorsInOtherGroupsAction.ID, CloseEditorsInOtherGroupsAction.LABEL), 'View: Close Editors in Other Groups', category);
 registry.registerWorkbenchAction(new SyncActionDescriptor(SplitEditorAction, SplitEditorAction.ID, SplitEditorAction.LABEL, { primary: KeyMod.CtrlCmd | KeyCode.US_BACKSLASH }), 'View: Split Editor', category);
+registry.registerWorkbenchAction(new SyncActionDescriptor(SplitEditorOrthogonalAction, SplitEditorOrthogonalAction.ID, SplitEditorOrthogonalAction.LABEL, { primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_K, KeyMod.CtrlCmd | KeyCode.US_BACKSLASH) }), 'View: Split Editor Orthogonal', category);
 registry.registerWorkbenchAction(new SyncActionDescriptor(SplitEditorLeftAction, SplitEditorLeftAction.ID, SplitEditorLeftAction.LABEL), 'View: Split Editor Left', category);
 registry.registerWorkbenchAction(new SyncActionDescriptor(SplitEditorRightAction, SplitEditorRightAction.ID, SplitEditorRightAction.LABEL), 'View: Split Editor Right', category);
 registry.registerWorkbenchAction(new SyncActionDescriptor(SplitEditorUpAction, SplitEditorUpAction.ID, SplitEditorUpAction.LABEL), 'Split Editor Up', category);
@@ -328,7 +329,7 @@ registry.registerWorkbenchAction(new SyncActionDescriptor(JoinAllGroupsAction, J
 registry.registerWorkbenchAction(new SyncActionDescriptor(NavigateBetweenGroupsAction, NavigateBetweenGroupsAction.ID, NavigateBetweenGroupsAction.LABEL), 'View: Navigate Between Editor Groups', category);
 registry.registerWorkbenchAction(new SyncActionDescriptor(ResetGroupSizesAction, ResetGroupSizesAction.ID, ResetGroupSizesAction.LABEL), 'View: Reset Editor Group Sizes', category);
 registry.registerWorkbenchAction(new SyncActionDescriptor(MaximizeGroupAction, MaximizeGroupAction.ID, MaximizeGroupAction.LABEL), 'View: Maximize Editor Group and Hide Sidebar', category);
-registry.registerWorkbenchAction(new SyncActionDescriptor(MinimizeOtherGroupsAction, MinimizeOtherGroupsAction.ID, MinimizeOtherGroupsAction.LABEL), 'View: Minimize Other Editor Groups', category);
+registry.registerWorkbenchAction(new SyncActionDescriptor(MinimizeOtherGroupsAction, MinimizeOtherGroupsAction.ID, MinimizeOtherGroupsAction.LABEL), 'View: Maximize Editor Group', category);
 registry.registerWorkbenchAction(new SyncActionDescriptor(MoveEditorLeftInGroupAction, MoveEditorLeftInGroupAction.ID, MoveEditorLeftInGroupAction.LABEL, { primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.PageUp, mac: { primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_K, KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.LeftArrow) } }), 'View: Move Editor Left', category);
 registry.registerWorkbenchAction(new SyncActionDescriptor(MoveEditorRightInGroupAction, MoveEditorRightInGroupAction.ID, MoveEditorRightInGroupAction.LABEL, { primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.PageDown, mac: { primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_K, KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.RightArrow) } }), 'View: Move Editor Right', category);
 registry.registerWorkbenchAction(new SyncActionDescriptor(MoveGroupLeftAction, MoveGroupLeftAction.ID, MoveGroupLeftAction.LABEL, { primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_K, KeyCode.LeftArrow) }), 'View: Move Editor Group Left', category);
@@ -368,9 +369,8 @@ registry.registerWorkbenchAction(new SyncActionDescriptor(EditorLayoutThreeColum
 registry.registerWorkbenchAction(new SyncActionDescriptor(EditorLayoutTwoRowsAction, EditorLayoutTwoRowsAction.ID, EditorLayoutTwoRowsAction.LABEL), 'View: Two Rows Editor Layout', category);
 registry.registerWorkbenchAction(new SyncActionDescriptor(EditorLayoutThreeRowsAction, EditorLayoutThreeRowsAction.ID, EditorLayoutThreeRowsAction.LABEL), 'View: Three Rows Editor Layout', category);
 registry.registerWorkbenchAction(new SyncActionDescriptor(EditorLayoutTwoByTwoGridAction, EditorLayoutTwoByTwoGridAction.ID, EditorLayoutTwoByTwoGridAction.LABEL), 'View: Grid Editor Layout (2x2)', category);
-registry.registerWorkbenchAction(new SyncActionDescriptor(EditorLayoutTwoColumnsRightAction, EditorLayoutTwoColumnsRightAction.ID, EditorLayoutTwoColumnsRightAction.LABEL), 'View: Two Columns Right Editor Layout', category);
+registry.registerWorkbenchAction(new SyncActionDescriptor(EditorLayoutTwoRowsRightAction, EditorLayoutTwoRowsRightAction.ID, EditorLayoutTwoRowsRightAction.LABEL), 'View: Two Rows Right Editor Layout', category);
 registry.registerWorkbenchAction(new SyncActionDescriptor(EditorLayoutTwoColumnsBottomAction, EditorLayoutTwoColumnsBottomAction.ID, EditorLayoutTwoColumnsBottomAction.LABEL), 'View: Two Columns Bottom Editor Layout', category);
-registry.registerWorkbenchAction(new SyncActionDescriptor(EditorLayoutCenteredAction, EditorLayoutCenteredAction.ID, EditorLayoutCenteredAction.LABEL), 'View: Centered Editor Layout', category);
 
 // Register Editor Picker Actions including quick navigate support
 const openNextEditorKeybinding = { primary: KeyMod.CtrlCmd | KeyCode.Tab, mac: { primary: KeyMod.WinCtrl | KeyCode.Tab } };
@@ -381,7 +381,7 @@ registry.registerWorkbenchAction(new SyncActionDescriptor(OpenPreviousRecentlyUs
 const quickOpenNavigateNextInEditorPickerId = 'workbench.action.quickOpenNavigateNextInEditorPicker';
 KeybindingsRegistry.registerCommandAndKeybindingRule({
 	id: quickOpenNavigateNextInEditorPickerId,
-	weight: KeybindingsRegistry.WEIGHT.workbenchContrib(50),
+	weight: KeybindingWeight.WorkbenchContrib + 50,
 	handler: getQuickNavigateHandler(quickOpenNavigateNextInEditorPickerId, true),
 	when: editorPickerContext,
 	primary: openNextEditorKeybinding.primary,
@@ -391,7 +391,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 const quickOpenNavigatePreviousInEditorPickerId = 'workbench.action.quickOpenNavigatePreviousInEditorPicker';
 KeybindingsRegistry.registerCommandAndKeybindingRule({
 	id: quickOpenNavigatePreviousInEditorPickerId,
-	weight: KeybindingsRegistry.WEIGHT.workbenchContrib(50),
+	weight: KeybindingWeight.WorkbenchContrib + 50,
 	handler: getQuickNavigateHandler(quickOpenNavigatePreviousInEditorPickerId, false),
 	when: editorPickerContext,
 	primary: openPreviousEditorKeybinding.primary,
@@ -404,12 +404,12 @@ editorCommands.setup();
 // Touch Bar
 if (isMacintosh) {
 	MenuRegistry.appendMenuItem(MenuId.TouchBarContext, {
-		command: { id: NavigateBackwardsAction.ID, title: NavigateBackwardsAction.LABEL, iconPath: { dark: URI.parse(require.toUrl('vs/workbench/browser/parts/editor/media/back-tb.png')).fsPath } },
+		command: { id: NavigateBackwardsAction.ID, title: NavigateBackwardsAction.LABEL, iconLocation: { dark: URI.parse(require.toUrl('vs/workbench/browser/parts/editor/media/back-tb.png')) } },
 		group: 'navigation'
 	});
 
 	MenuRegistry.appendMenuItem(MenuId.TouchBarContext, {
-		command: { id: NavigateForwardAction.ID, title: NavigateForwardAction.LABEL, iconPath: { dark: URI.parse(require.toUrl('vs/workbench/browser/parts/editor/media/forward-tb.png')).fsPath } },
+		command: { id: NavigateForwardAction.ID, title: NavigateForwardAction.LABEL, iconLocation: { dark: URI.parse(require.toUrl('vs/workbench/browser/parts/editor/media/forward-tb.png')) } },
 		group: 'navigation'
 	});
 }
@@ -446,17 +446,17 @@ function appendEditorToolItem(primary: IEditorToolItem, alternative: IEditorTool
 		command: {
 			id: primary.id,
 			title: primary.title,
-			iconPath: {
-				dark: URI.parse(require.toUrl(`vs/workbench/browser/parts/editor/media/${primary.iconDark}`)).fsPath,
-				light: URI.parse(require.toUrl(`vs/workbench/browser/parts/editor/media/${primary.iconLight}`)).fsPath
+			iconLocation: {
+				dark: URI.parse(require.toUrl(`vs/workbench/browser/parts/editor/media/${primary.iconDark}`)),
+				light: URI.parse(require.toUrl(`vs/workbench/browser/parts/editor/media/${primary.iconLight}`))
 			}
 		},
 		alt: {
 			id: alternative.id,
 			title: alternative.title,
-			iconPath: {
-				dark: URI.parse(require.toUrl(`vs/workbench/browser/parts/editor/media/${alternative.iconDark}`)).fsPath,
-				light: URI.parse(require.toUrl(`vs/workbench/browser/parts/editor/media/${alternative.iconLight}`)).fsPath
+			iconLocation: {
+				dark: URI.parse(require.toUrl(`vs/workbench/browser/parts/editor/media/${alternative.iconDark}`)),
+				light: URI.parse(require.toUrl(`vs/workbench/browser/parts/editor/media/${alternative.iconLight}`))
 			}
 		},
 		group: 'navigation',
@@ -503,8 +503,8 @@ appendEditorToolItem(
 	{
 		id: editorCommands.CLOSE_EDITOR_COMMAND_ID,
 		title: nls.localize('close', "Close"),
-		iconDark: 'close-editor-inverse.svg',
-		iconLight: 'close-editor.svg'
+		iconDark: 'close-big-inverse-alt.svg',
+		iconLight: 'close-big-alt.svg'
 	}, {
 		id: editorCommands.CLOSE_EDITORS_IN_GROUP_COMMAND_ID,
 		title: nls.localize('closeAll', "Close All"),
@@ -519,8 +519,8 @@ appendEditorToolItem(
 	{
 		id: editorCommands.CLOSE_EDITOR_COMMAND_ID,
 		title: nls.localize('close', "Close"),
-		iconDark: 'close-dirty-inverse.svg',
-		iconLight: 'close-dirty.svg'
+		iconDark: 'close-dirty-inverse-alt.svg',
+		iconLight: 'close-dirty-alt.svg'
 	}, {
 		id: editorCommands.CLOSE_EDITORS_IN_GROUP_COMMAND_ID,
 		title: nls.localize('closeAll', "Close All"),
@@ -537,3 +537,312 @@ MenuRegistry.appendMenuItem(MenuId.CommandPalette, { command: { id: editorComman
 MenuRegistry.appendMenuItem(MenuId.CommandPalette, { command: { id: editorCommands.CLOSE_SAVED_EDITORS_COMMAND_ID, title: nls.localize('closeSavedEditors', "Close Saved Editors in Group"), category } });
 MenuRegistry.appendMenuItem(MenuId.CommandPalette, { command: { id: editorCommands.CLOSE_OTHER_EDITORS_IN_GROUP_COMMAND_ID, title: nls.localize('closeOtherEditors', "Close Other Editors in Group"), category } });
 MenuRegistry.appendMenuItem(MenuId.CommandPalette, { command: { id: editorCommands.CLOSE_EDITORS_TO_THE_RIGHT_COMMAND_ID, title: nls.localize('closeRightEditors', "Close Editors to the Right in Group"), category } });
+
+// File menu
+MenuRegistry.appendMenuItem(MenuId.MenubarRecentMenu, {
+	group: '1_editor',
+	command: {
+		id: ReopenClosedEditorAction.ID,
+		title: nls.localize({ key: 'miReopenClosedEditor', comment: ['&& denotes a mnemonic'] }, "&&Reopen Closed Editor")
+	},
+	order: 1
+});
+
+MenuRegistry.appendMenuItem(MenuId.MenubarRecentMenu, {
+	group: 'z_clear',
+	command: {
+		id: ClearRecentFilesAction.ID,
+		title: nls.localize({ key: 'miClearRecentOpen', comment: ['&& denotes a mnemonic'] }, "&&Clear Recently Opened")
+	},
+	order: 1
+});
+
+// Layout menu
+MenuRegistry.appendMenuItem(MenuId.MenubarViewMenu, {
+	group: '2_appearance',
+	title: nls.localize({ key: 'miEditorLayout', comment: ['&& denotes a mnemonic'] }, "Editor &&Layout"),
+	submenu: MenuId.MenubarLayoutMenu,
+	order: 2
+});
+
+MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
+	group: '1_split',
+	command: {
+		id: editorCommands.SPLIT_EDITOR_UP,
+		title: nls.localize({ key: 'miSplitEditorUp', comment: ['&& denotes a mnemonic'] }, "Split &&Up")
+	},
+	order: 1
+});
+
+MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
+	group: '1_split',
+	command: {
+		id: editorCommands.SPLIT_EDITOR_DOWN,
+		title: nls.localize({ key: 'miSplitEditorDown', comment: ['&& denotes a mnemonic'] }, "Split &&Down")
+	},
+	order: 2
+});
+
+MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
+	group: '1_split',
+	command: {
+		id: editorCommands.SPLIT_EDITOR_LEFT,
+		title: nls.localize({ key: 'miSplitEditorLeft', comment: ['&& denotes a mnemonic'] }, "Split &&Left")
+	},
+	order: 3
+});
+
+MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
+	group: '1_split',
+	command: {
+		id: editorCommands.SPLIT_EDITOR_RIGHT,
+		title: nls.localize({ key: 'miSplitEditorRight', comment: ['&& denotes a mnemonic'] }, "Split &&Right")
+	},
+	order: 4
+});
+
+MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
+	group: '2_layouts',
+	command: {
+		id: EditorLayoutSingleAction.ID,
+		title: nls.localize({ key: 'miSingleColumnEditorLayout', comment: ['&& denotes a mnemonic'] }, "&&Single")
+	},
+	order: 1
+});
+
+MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
+	group: '2_layouts',
+	command: {
+		id: EditorLayoutTwoColumnsAction.ID,
+		title: nls.localize({ key: 'miTwoColumnsEditorLayout', comment: ['&& denotes a mnemonic'] }, "&&Two Columns")
+	},
+	order: 3
+});
+
+MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
+	group: '2_layouts',
+	command: {
+		id: EditorLayoutThreeColumnsAction.ID,
+		title: nls.localize({ key: 'miThreeColumnsEditorLayout', comment: ['&& denotes a mnemonic'] }, "T&&hree Columns")
+	},
+	order: 4
+});
+
+MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
+	group: '2_layouts',
+	command: {
+		id: EditorLayoutTwoRowsAction.ID,
+		title: nls.localize({ key: 'miTwoRowsEditorLayout', comment: ['&& denotes a mnemonic'] }, "T&&wo Rows")
+	},
+	order: 5
+});
+
+MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
+	group: '2_layouts',
+	command: {
+		id: EditorLayoutThreeRowsAction.ID,
+		title: nls.localize({ key: 'miThreeRowsEditorLayout', comment: ['&& denotes a mnemonic'] }, "Three &&Rows")
+	},
+	order: 6
+});
+
+MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
+	group: '2_layouts',
+	command: {
+		id: EditorLayoutTwoByTwoGridAction.ID,
+		title: nls.localize({ key: 'miTwoByTwoGridEditorLayout', comment: ['&& denotes a mnemonic'] }, "&&Grid (2x2)")
+	},
+	order: 7
+});
+
+MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
+	group: '2_layouts',
+	command: {
+		id: EditorLayoutTwoRowsRightAction.ID,
+		title: nls.localize({ key: 'miTwoRowsRightEditorLayout', comment: ['&& denotes a mnemonic'] }, "Two R&&ows Right")
+	},
+	order: 8
+});
+
+MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
+	group: '2_layouts',
+	command: {
+		id: EditorLayoutTwoColumnsBottomAction.ID,
+		title: nls.localize({ key: 'miTwoColumnsBottomEditorLayout', comment: ['&& denotes a mnemonic'] }, "Two &&Columns Bottom")
+	},
+	order: 9
+});
+
+// Main Menu Bar Contributions:
+
+// Forward/Back
+MenuRegistry.appendMenuItem(MenuId.MenubarGoMenu, {
+	group: '1_fwd_back',
+	command: {
+		id: 'workbench.action.navigateBack',
+		title: nls.localize({ key: 'miBack', comment: ['&& denotes a mnemonic'] }, "&&Back"),
+		precondition: ContextKeyExpr.has('canNavigateBack')
+	},
+	order: 1
+});
+
+MenuRegistry.appendMenuItem(MenuId.MenubarGoMenu, {
+	group: '1_fwd_back',
+	command: {
+		id: 'workbench.action.navigateForward',
+		title: nls.localize({ key: 'miForward', comment: ['&& denotes a mnemonic'] }, "&&Forward"),
+		precondition: ContextKeyExpr.has('canNavigateForward')
+	},
+	order: 2
+});
+
+// Switch Editor
+MenuRegistry.appendMenuItem(MenuId.MenubarSwitchEditorMenu, {
+	group: '1_any',
+	command: {
+		id: 'workbench.action.nextEditor',
+		title: nls.localize({ key: 'miNextEditor', comment: ['&& denotes a mnemonic'] }, "&&Next Editor")
+	},
+	order: 1
+});
+
+MenuRegistry.appendMenuItem(MenuId.MenubarSwitchEditorMenu, {
+	group: '1_any',
+	command: {
+		id: 'workbench.action.previousEditor',
+		title: nls.localize({ key: 'miPreviousEditor', comment: ['&& denotes a mnemonic'] }, "&&Previous Editor")
+	},
+	order: 2
+});
+
+MenuRegistry.appendMenuItem(MenuId.MenubarSwitchEditorMenu, {
+	group: '2_used',
+	command: {
+		id: 'workbench.action.openNextRecentlyUsedEditorInGroup',
+		title: nls.localize({ key: 'miNextEditorInGroup', comment: ['&& denotes a mnemonic'] }, "&&Next Used Editor in Group")
+	},
+	order: 1
+});
+
+MenuRegistry.appendMenuItem(MenuId.MenubarSwitchEditorMenu, {
+	group: '2_used',
+	command: {
+		id: 'workbench.action.openPreviousRecentlyUsedEditorInGroup',
+		title: nls.localize({ key: 'miPreviousEditorInGroup', comment: ['&& denotes a mnemonic'] }, "&&Previous Used Editor in Group")
+	},
+	order: 2
+});
+
+MenuRegistry.appendMenuItem(MenuId.MenubarGoMenu, {
+	group: '2_switch',
+	title: nls.localize({ key: 'miSwitchEditor', comment: ['&& denotes a mnemonic'] }, "Switch &&Editor"),
+	submenu: MenuId.MenubarSwitchEditorMenu,
+	order: 1
+});
+
+// Switch Group
+MenuRegistry.appendMenuItem(MenuId.MenubarSwitchGroupMenu, {
+	group: '1_focus_index',
+	command: {
+		id: 'workbench.action.focusFirstEditorGroup',
+		title: nls.localize({ key: 'miFocusFirstGroup', comment: ['&& denotes a mnemonic'] }, "Group &&1")
+	},
+	order: 1
+});
+
+MenuRegistry.appendMenuItem(MenuId.MenubarSwitchGroupMenu, {
+	group: '1_focus_index',
+	command: {
+		id: 'workbench.action.focusSecondEditorGroup',
+		title: nls.localize({ key: 'miFocusSecondGroup', comment: ['&& denotes a mnemonic'] }, "Group &&2")
+	},
+	order: 2
+});
+
+MenuRegistry.appendMenuItem(MenuId.MenubarSwitchGroupMenu, {
+	group: '1_focus_index',
+	command: {
+		id: 'workbench.action.focusThirdEditorGroup',
+		title: nls.localize({ key: 'miFocusThirdGroup', comment: ['&& denotes a mnemonic'] }, "Group &&3")
+	},
+	order: 3
+});
+
+MenuRegistry.appendMenuItem(MenuId.MenubarSwitchGroupMenu, {
+	group: '1_focus_index',
+	command: {
+		id: 'workbench.action.focusFourthEditorGroup',
+		title: nls.localize({ key: 'miFocusFourthGroup', comment: ['&& denotes a mnemonic'] }, "Group &&4")
+	},
+	order: 4
+});
+
+MenuRegistry.appendMenuItem(MenuId.MenubarSwitchGroupMenu, {
+	group: '1_focus_index',
+	command: {
+		id: 'workbench.action.focusFifthEditorGroup',
+		title: nls.localize({ key: 'miFocusFifthGroup', comment: ['&& denotes a mnemonic'] }, "Group &&5")
+	},
+	order: 5
+});
+
+MenuRegistry.appendMenuItem(MenuId.MenubarSwitchGroupMenu, {
+	group: '2_next_prev',
+	command: {
+		id: 'workbench.action.focusNextGroup',
+		title: nls.localize({ key: 'miNextGroup', comment: ['&& denotes a mnemonic'] }, "&&Next Group")
+	},
+	order: 1
+});
+
+MenuRegistry.appendMenuItem(MenuId.MenubarSwitchGroupMenu, {
+	group: '2_next_prev',
+	command: {
+		id: 'workbench.action.focusPreviousGroup',
+		title: nls.localize({ key: 'miPreviousGroup', comment: ['&& denotes a mnemonic'] }, "&&Previous Group")
+	},
+	order: 2
+});
+
+MenuRegistry.appendMenuItem(MenuId.MenubarSwitchGroupMenu, {
+	group: '3_directional',
+	command: {
+		id: 'workbench.action.focusLeftGroup',
+		title: nls.localize({ key: 'miFocusLeftGroup', comment: ['&& denotes a mnemonic'] }, "Group &&Left")
+	},
+	order: 1
+});
+
+MenuRegistry.appendMenuItem(MenuId.MenubarSwitchGroupMenu, {
+	group: '3_directional',
+	command: {
+		id: 'workbench.action.focusRightGroup',
+		title: nls.localize({ key: 'miFocusRightGroup', comment: ['&& denotes a mnemonic'] }, "Group &&Right")
+	},
+	order: 2
+});
+
+MenuRegistry.appendMenuItem(MenuId.MenubarSwitchGroupMenu, {
+	group: '3_directional',
+	command: {
+		id: 'workbench.action.focusAboveGroup',
+		title: nls.localize({ key: 'miFocusAboveGroup', comment: ['&& denotes a mnemonic'] }, "Group &&Above")
+	},
+	order: 3
+});
+
+MenuRegistry.appendMenuItem(MenuId.MenubarSwitchGroupMenu, {
+	group: '3_directional',
+	command: {
+		id: 'workbench.action.focusBelowGroup',
+		title: nls.localize({ key: 'miFocusBelowGroup', comment: ['&& denotes a mnemonic'] }, "Group &&Below")
+	},
+	order: 4
+});
+
+MenuRegistry.appendMenuItem(MenuId.MenubarGoMenu, {
+	group: '2_switch',
+	title: nls.localize({ key: 'miSwitchGroup', comment: ['&& denotes a mnemonic'] }, "Switch &&Group"),
+	submenu: MenuId.MenubarSwitchGroupMenu,
+	order: 2
+});
\ No newline at end of file
diff --git a/src/vs/workbench/browser/parts/editor/editor.ts b/src/vs/workbench/browser/parts/editor/editor.ts
index 74518dd76c1..248fa7871f5 100644
--- a/src/vs/workbench/browser/parts/editor/editor.ts
+++ b/src/vs/workbench/browser/parts/editor/editor.ts
@@ -21,8 +21,8 @@ import { IEditorService } from 'vs/workbench/services/editor/common/editorServic
 
 export const EDITOR_TITLE_HEIGHT = 35;
 
-export const EDITOR_MIN_DIMENSIONS = new Dimension(220, 70);
-export const EDITOR_MAX_DIMENSIONS = new Dimension(Number.POSITIVE_INFINITY, Number.POSITIVE_INFINITY);
+export const DEFAULT_EDITOR_MIN_DIMENSIONS = new Dimension(220, 70);
+export const DEFAULT_EDITOR_MAX_DIMENSIONS = new Dimension(Number.POSITIVE_INFINITY, Number.POSITIVE_INFINITY);
 
 export interface IEditorPartOptions extends IWorkbenchEditorPartConfiguration {
 	iconTheme?: string;
@@ -117,6 +117,7 @@ export interface IEditorGroupView extends IDisposable, ISerializableView, IEdito
 	isEmpty(): boolean;
 	setActive(isActive: boolean): void;
 	setLabel(label: string): void;
+	relayout(): void;
 
 	shutdown(): void;
 }
@@ -159,4 +160,4 @@ export interface EditorGroupsServiceImpl extends IEditorGroupsService {
 	 * A promise that resolves when groups have been restored.
 	 */
 	readonly whenRestored: TPromise<void>;
-}
\ No newline at end of file
+}
diff --git a/src/vs/workbench/browser/parts/editor/editorActions.ts b/src/vs/workbench/browser/parts/editor/editorActions.ts
index 5b97aceda66..5c579fa655d 100644
--- a/src/vs/workbench/browser/parts/editor/editorActions.ts
+++ b/src/vs/workbench/browser/parts/editor/editorActions.ts
@@ -37,32 +37,32 @@ export class ExecuteCommandAction extends Action {
 		super(id, label);
 	}
 
-	public run(): TPromise<any> {
+	run(): TPromise<any> {
 		return this.commandService.executeCommand(this.commandId, this.commandArgs);
 	}
 }
 
-export class SplitEditorAction extends Action {
-
-	public static readonly ID = 'workbench.action.splitEditor';
-	public static readonly LABEL = nls.localize('splitEditor', "Split Editor");
-
+export class BaseSplitEditorAction extends Action {
 	private toDispose: IDisposable[] = [];
 	private direction: GroupDirection;
 
 	constructor(
 		id: string,
 		label: string,
-		@IEditorGroupsService private editorGroupService: IEditorGroupsService,
-		@IConfigurationService private configurationService: IConfigurationService
+		protected editorGroupService: IEditorGroupsService,
+		protected configurationService: IConfigurationService
 	) {
 		super(id, label);
 
-		this.direction = preferredSideBySideGroupDirection(configurationService);
+		this.direction = this.getDirection();
 
 		this.registerListeners();
 	}
 
+	protected getDirection(): GroupDirection {
+		return preferredSideBySideGroupDirection(this.configurationService);
+	}
+
 	private registerListeners(): void {
 		this.toDispose.push(this.configurationService.onDidChangeConfiguration(e => {
 			if (e.affectsConfiguration('workbench.editor.openSideBySideDirection')) {
@@ -71,23 +71,59 @@ export class SplitEditorAction extends Action {
 		}));
 	}
 
-	public run(context?: IEditorIdentifier): TPromise<any> {
+	run(context?: IEditorIdentifier): TPromise<any> {
 		splitEditor(this.editorGroupService, this.direction, context);
 
 		return TPromise.as(true);
 	}
 
-	public dispose(): void {
+	dispose(): void {
 		super.dispose();
 
 		this.toDispose = dispose(this.toDispose);
 	}
 }
 
+export class SplitEditorAction extends BaseSplitEditorAction {
+
+	static readonly ID = 'workbench.action.splitEditor';
+	static readonly LABEL = nls.localize('splitEditor', "Split Editor");
+
+	constructor(
+		id: string,
+		label: string,
+		@IEditorGroupsService editorGroupService: IEditorGroupsService,
+		@IConfigurationService configurationService: IConfigurationService
+	) {
+		super(id, label, editorGroupService, configurationService);
+	}
+}
+
+export class SplitEditorOrthogonalAction extends BaseSplitEditorAction {
+
+	static readonly ID = 'workbench.action.splitEditorOrthogonal';
+	static readonly LABEL = nls.localize('splitEditorOrthogonal', "Split Editor Orthogonal");
+
+	constructor(
+		id: string,
+		label: string,
+		@IEditorGroupsService editorGroupService: IEditorGroupsService,
+		@IConfigurationService configurationService: IConfigurationService
+	) {
+		super(id, label, editorGroupService, configurationService);
+	}
+
+	protected getDirection(): GroupDirection {
+		const direction = preferredSideBySideGroupDirection(this.configurationService);
+
+		return direction === GroupDirection.RIGHT ? GroupDirection.DOWN : GroupDirection.RIGHT;
+	}
+}
+
 export class SplitEditorLeftAction extends ExecuteCommandAction {
 
-	public static readonly ID = SPLIT_EDITOR_LEFT;
-	public static readonly LABEL = nls.localize('splitEditorGroupLeft', "Split Editor Left");
+	static readonly ID = SPLIT_EDITOR_LEFT;
+	static readonly LABEL = nls.localize('splitEditorGroupLeft', "Split Editor Left");
 
 	constructor(
 		id: string,
@@ -100,8 +136,8 @@ export class SplitEditorLeftAction extends ExecuteCommandAction {
 
 export class SplitEditorRightAction extends ExecuteCommandAction {
 
-	public static readonly ID = SPLIT_EDITOR_RIGHT;
-	public static readonly LABEL = nls.localize('splitEditorGroupRight', "Split Editor Right");
+	static readonly ID = SPLIT_EDITOR_RIGHT;
+	static readonly LABEL = nls.localize('splitEditorGroupRight', "Split Editor Right");
 
 	constructor(
 		id: string,
@@ -114,8 +150,8 @@ export class SplitEditorRightAction extends ExecuteCommandAction {
 
 export class SplitEditorUpAction extends ExecuteCommandAction {
 
-	public static readonly ID = SPLIT_EDITOR_UP;
-	public static readonly LABEL = nls.localize('splitEditorGroupUp', "Split Editor Up");
+	static readonly ID = SPLIT_EDITOR_UP;
+	static readonly LABEL = nls.localize('splitEditorGroupUp', "Split Editor Up");
 
 	constructor(
 		id: string,
@@ -128,8 +164,8 @@ export class SplitEditorUpAction extends ExecuteCommandAction {
 
 export class SplitEditorDownAction extends ExecuteCommandAction {
 
-	public static readonly ID = SPLIT_EDITOR_DOWN;
-	public static readonly LABEL = nls.localize('splitEditorGroupDown', "Split Editor Down");
+	static readonly ID = SPLIT_EDITOR_DOWN;
+	static readonly LABEL = nls.localize('splitEditorGroupDown', "Split Editor Down");
 
 	constructor(
 		id: string,
@@ -142,8 +178,8 @@ export class SplitEditorDownAction extends ExecuteCommandAction {
 
 export class JoinTwoGroupsAction extends Action {
 
-	public static readonly ID = 'workbench.action.joinTwoGroups';
-	public static readonly LABEL = nls.localize('joinTwoGroups', "Join Editor Group with Next Group");
+	static readonly ID = 'workbench.action.joinTwoGroups';
+	static readonly LABEL = nls.localize('joinTwoGroups', "Join Editor Group with Next Group");
 
 	constructor(
 		id: string,
@@ -153,7 +189,7 @@ export class JoinTwoGroupsAction extends Action {
 		super(id, label);
 	}
 
-	public run(context?: IEditorIdentifier): TPromise<any> {
+	run(context?: IEditorIdentifier): TPromise<any> {
 		let sourceGroup: IEditorGroup;
 		if (context && typeof context.groupId === 'number') {
 			sourceGroup = this.editorGroupService.getGroup(context.groupId);
@@ -177,8 +213,8 @@ export class JoinTwoGroupsAction extends Action {
 
 export class JoinAllGroupsAction extends Action {
 
-	public static readonly ID = 'workbench.action.joinAllGroups';
-	public static readonly LABEL = nls.localize('joinAllGroups', "Join All Editor Groups");
+	static readonly ID = 'workbench.action.joinAllGroups';
+	static readonly LABEL = nls.localize('joinAllGroups', "Join All Editor Groups");
 
 	constructor(
 		id: string,
@@ -188,7 +224,7 @@ export class JoinAllGroupsAction extends Action {
 		super(id, label);
 	}
 
-	public run(context?: IEditorIdentifier): TPromise<any> {
+	run(context?: IEditorIdentifier): TPromise<any> {
 		mergeAllGroups(this.editorGroupService);
 
 		return TPromise.as(true);
@@ -197,8 +233,8 @@ export class JoinAllGroupsAction extends Action {
 
 export class NavigateBetweenGroupsAction extends Action {
 
-	public static readonly ID = 'workbench.action.navigateEditorGroups';
-	public static readonly LABEL = nls.localize('navigateEditorGroups', "Navigate Between Editor Groups");
+	static readonly ID = 'workbench.action.navigateEditorGroups';
+	static readonly LABEL = nls.localize('navigateEditorGroups', "Navigate Between Editor Groups");
 
 	constructor(
 		id: string,
@@ -208,7 +244,7 @@ export class NavigateBetweenGroupsAction extends Action {
 		super(id, label);
 	}
 
-	public run(): TPromise<any> {
+	run(): TPromise<any> {
 		const nextGroup = this.editorGroupService.findGroup({ location: GroupLocation.NEXT }, this.editorGroupService.activeGroup, true);
 		nextGroup.focus();
 
@@ -218,8 +254,8 @@ export class NavigateBetweenGroupsAction extends Action {
 
 export class FocusActiveGroupAction extends Action {
 
-	public static readonly ID = 'workbench.action.focusActiveEditorGroup';
-	public static readonly LABEL = nls.localize('focusActiveEditorGroup', "Focus Active Editor Group");
+	static readonly ID = 'workbench.action.focusActiveEditorGroup';
+	static readonly LABEL = nls.localize('focusActiveEditorGroup', "Focus Active Editor Group");
 
 	constructor(
 		id: string,
@@ -229,7 +265,7 @@ export class FocusActiveGroupAction extends Action {
 		super(id, label);
 	}
 
-	public run(): TPromise<any> {
+	run(): TPromise<any> {
 		this.editorGroupService.activeGroup.focus();
 
 		return TPromise.as(true);
@@ -247,7 +283,7 @@ export abstract class BaseFocusGroupAction extends Action {
 		super(id, label);
 	}
 
-	public run(): TPromise<any> {
+	run(): TPromise<any> {
 		const group = this.editorGroupService.findGroup(this.scope, this.editorGroupService.activeGroup, true);
 		if (group) {
 			group.focus();
@@ -259,8 +295,8 @@ export abstract class BaseFocusGroupAction extends Action {
 
 export class FocusFirstGroupAction extends BaseFocusGroupAction {
 
-	public static readonly ID = 'workbench.action.focusFirstEditorGroup';
-	public static readonly LABEL = nls.localize('focusFirstEditorGroup', "Focus First Editor Group");
+	static readonly ID = 'workbench.action.focusFirstEditorGroup';
+	static readonly LABEL = nls.localize('focusFirstEditorGroup', "Focus First Editor Group");
 
 	constructor(
 		id: string,
@@ -273,8 +309,8 @@ export class FocusFirstGroupAction extends BaseFocusGroupAction {
 
 export class FocusLastGroupAction extends BaseFocusGroupAction {
 
-	public static readonly ID = 'workbench.action.focusLastEditorGroup';
-	public static readonly LABEL = nls.localize('focusLastEditorGroup', "Focus Last Editor Group");
+	static readonly ID = 'workbench.action.focusLastEditorGroup';
+	static readonly LABEL = nls.localize('focusLastEditorGroup', "Focus Last Editor Group");
 
 	constructor(
 		id: string,
@@ -287,8 +323,8 @@ export class FocusLastGroupAction extends BaseFocusGroupAction {
 
 export class FocusNextGroup extends BaseFocusGroupAction {
 
-	public static readonly ID = 'workbench.action.focusNextGroup';
-	public static readonly LABEL = nls.localize('focusNextGroup', "Focus Next Editor Group");
+	static readonly ID = 'workbench.action.focusNextGroup';
+	static readonly LABEL = nls.localize('focusNextGroup', "Focus Next Editor Group");
 
 	constructor(
 		id: string,
@@ -301,8 +337,8 @@ export class FocusNextGroup extends BaseFocusGroupAction {
 
 export class FocusPreviousGroup extends BaseFocusGroupAction {
 
-	public static readonly ID = 'workbench.action.focusPreviousGroup';
-	public static readonly LABEL = nls.localize('focusPreviousGroup', "Focus Previous Editor Group");
+	static readonly ID = 'workbench.action.focusPreviousGroup';
+	static readonly LABEL = nls.localize('focusPreviousGroup', "Focus Previous Editor Group");
 
 	constructor(
 		id: string,
@@ -315,8 +351,8 @@ export class FocusPreviousGroup extends BaseFocusGroupAction {
 
 export class FocusLeftGroup extends BaseFocusGroupAction {
 
-	public static readonly ID = 'workbench.action.focusLeftGroup';
-	public static readonly LABEL = nls.localize('focusLeftGroup', "Focus Left Editor Group");
+	static readonly ID = 'workbench.action.focusLeftGroup';
+	static readonly LABEL = nls.localize('focusLeftGroup', "Focus Left Editor Group");
 
 	constructor(
 		id: string,
@@ -329,8 +365,8 @@ export class FocusLeftGroup extends BaseFocusGroupAction {
 
 export class FocusRightGroup extends BaseFocusGroupAction {
 
-	public static readonly ID = 'workbench.action.focusRightGroup';
-	public static readonly LABEL = nls.localize('focusRightGroup', "Focus Right Editor Group");
+	static readonly ID = 'workbench.action.focusRightGroup';
+	static readonly LABEL = nls.localize('focusRightGroup', "Focus Right Editor Group");
 
 	constructor(
 		id: string,
@@ -343,8 +379,8 @@ export class FocusRightGroup extends BaseFocusGroupAction {
 
 export class FocusAboveGroup extends BaseFocusGroupAction {
 
-	public static readonly ID = 'workbench.action.focusAboveGroup';
-	public static readonly LABEL = nls.localize('focusAboveGroup', "Focus Above Editor Group");
+	static readonly ID = 'workbench.action.focusAboveGroup';
+	static readonly LABEL = nls.localize('focusAboveGroup', "Focus Above Editor Group");
 
 	constructor(
 		id: string,
@@ -357,8 +393,8 @@ export class FocusAboveGroup extends BaseFocusGroupAction {
 
 export class FocusBelowGroup extends BaseFocusGroupAction {
 
-	public static readonly ID = 'workbench.action.focusBelowGroup';
-	public static readonly LABEL = nls.localize('focusBelowGroup', "Focus Below Editor Group");
+	static readonly ID = 'workbench.action.focusBelowGroup';
+	static readonly LABEL = nls.localize('focusBelowGroup', "Focus Below Editor Group");
 
 	constructor(
 		id: string,
@@ -371,8 +407,8 @@ export class FocusBelowGroup extends BaseFocusGroupAction {
 
 export class OpenToSideFromQuickOpenAction extends Action {
 
-	public static readonly OPEN_TO_SIDE_ID = 'workbench.action.openToSide';
-	public static readonly OPEN_TO_SIDE_LABEL = nls.localize('openToSide', "Open to the Side");
+	static readonly OPEN_TO_SIDE_ID = 'workbench.action.openToSide';
+	static readonly OPEN_TO_SIDE_LABEL = nls.localize('openToSide', "Open to the Side");
 
 	constructor(
 		@IEditorService private editorService: IEditorService,
@@ -383,13 +419,13 @@ export class OpenToSideFromQuickOpenAction extends Action {
 		this.updateClass();
 	}
 
-	public updateClass(): void {
+	updateClass(): void {
 		const preferredDirection = preferredSideBySideGroupDirection(this.configurationService);
 
 		this.class = (preferredDirection === GroupDirection.RIGHT) ? 'quick-open-sidebyside-vertical' : 'quick-open-sidebyside-horizontal';
 	}
 
-	public run(context: any): TPromise<any> {
+	run(context: any): TPromise<any> {
 		const entry = toEditorQuickOpenEntry(context);
 		if (entry) {
 			const input = entry.getInput();
@@ -427,8 +463,8 @@ export function toEditorQuickOpenEntry(element: any): IEditorQuickOpenEntry {
 
 export class CloseEditorAction extends Action {
 
-	public static readonly ID = 'workbench.action.closeActiveEditor';
-	public static readonly LABEL = nls.localize('closeEditor', "Close Editor");
+	static readonly ID = 'workbench.action.closeActiveEditor';
+	static readonly LABEL = nls.localize('closeEditor', "Close Editor");
 
 	constructor(
 		id: string,
@@ -438,15 +474,15 @@ export class CloseEditorAction extends Action {
 		super(id, label, 'close-editor-action');
 	}
 
-	public run(context?: IEditorCommandsContext): TPromise<any> {
+	run(context?: IEditorCommandsContext): TPromise<any> {
 		return this.commandService.executeCommand(CLOSE_EDITOR_COMMAND_ID, void 0, context);
 	}
 }
 
 export class CloseOneEditorAction extends Action {
 
-	public static readonly ID = 'workbench.action.closeActiveEditor';
-	public static readonly LABEL = nls.localize('closeOneEditor', "Close");
+	static readonly ID = 'workbench.action.closeActiveEditor';
+	static readonly LABEL = nls.localize('closeOneEditor', "Close");
 
 	constructor(
 		id: string,
@@ -456,7 +492,7 @@ export class CloseOneEditorAction extends Action {
 		super(id, label, 'close-editor-action');
 	}
 
-	public run(context?: IEditorCommandsContext): TPromise<any> {
+	run(context?: IEditorCommandsContext): TPromise<any> {
 		let group: IEditorGroup;
 		let editorIndex: number;
 		if (context) {
@@ -490,8 +526,8 @@ export class CloseOneEditorAction extends Action {
 
 export class RevertAndCloseEditorAction extends Action {
 
-	public static readonly ID = 'workbench.action.revertAndCloseActiveEditor';
-	public static readonly LABEL = nls.localize('revertAndCloseActiveEditor', "Revert and Close Editor");
+	static readonly ID = 'workbench.action.revertAndCloseActiveEditor';
+	static readonly LABEL = nls.localize('revertAndCloseActiveEditor', "Revert and Close Editor");
 
 	constructor(
 		id: string,
@@ -501,7 +537,7 @@ export class RevertAndCloseEditorAction extends Action {
 		super(id, label);
 	}
 
-	public run(): TPromise<any> {
+	run(): TPromise<any> {
 		const activeControl = this.editorService.activeControl;
 		if (activeControl) {
 			const editor = activeControl.input;
@@ -523,8 +559,8 @@ export class RevertAndCloseEditorAction extends Action {
 
 export class CloseLeftEditorsInGroupAction extends Action {
 
-	public static readonly ID = 'workbench.action.closeEditorsToTheLeft';
-	public static readonly LABEL = nls.localize('closeEditorsToTheLeft', "Close Editors to the Left in Group");
+	static readonly ID = 'workbench.action.closeEditorsToTheLeft';
+	static readonly LABEL = nls.localize('closeEditorsToTheLeft', "Close Editors to the Left in Group");
 
 	constructor(
 		id: string,
@@ -535,7 +571,7 @@ export class CloseLeftEditorsInGroupAction extends Action {
 		super(id, label);
 	}
 
-	public run(context?: IEditorIdentifier): TPromise<any> {
+	run(context?: IEditorIdentifier): TPromise<any> {
 		const { group, editor } = getTarget(this.editorService, this.editorGroupService, context);
 		if (group && editor) {
 			return group.closeEditors({ direction: CloseDirection.LEFT, except: editor });
@@ -580,7 +616,7 @@ export abstract class BaseCloseAllAction extends Action {
 		return groupsToClose;
 	}
 
-	public run(): TPromise<any> {
+	run(): TPromise<any> {
 
 		// Just close all if there are no or one dirty editor
 		if (this.textFileService.getDirty().length < 2) {
@@ -615,8 +651,8 @@ export abstract class BaseCloseAllAction extends Action {
 
 export class CloseAllEditorsAction extends BaseCloseAllAction {
 
-	public static readonly ID = 'workbench.action.closeAllEditors';
-	public static readonly LABEL = nls.localize('closeAllEditors', "Close All Editors");
+	static readonly ID = 'workbench.action.closeAllEditors';
+	static readonly LABEL = nls.localize('closeAllEditors', "Close All Editors");
 
 	constructor(
 		id: string,
@@ -634,8 +670,8 @@ export class CloseAllEditorsAction extends BaseCloseAllAction {
 
 export class CloseAllEditorGroupsAction extends BaseCloseAllAction {
 
-	public static readonly ID = 'workbench.action.closeAllGroups';
-	public static readonly LABEL = nls.localize('closeAllGroups', "Close All Editor Groups");
+	static readonly ID = 'workbench.action.closeAllGroups';
+	static readonly LABEL = nls.localize('closeAllGroups', "Close All Editor Groups");
 
 	constructor(
 		id: string,
@@ -655,8 +691,8 @@ export class CloseAllEditorGroupsAction extends BaseCloseAllAction {
 
 export class CloseEditorsInOtherGroupsAction extends Action {
 
-	public static readonly ID = 'workbench.action.closeEditorsInOtherGroups';
-	public static readonly LABEL = nls.localize('closeEditorsInOtherGroups', "Close Editors in Other Groups");
+	static readonly ID = 'workbench.action.closeEditorsInOtherGroups';
+	static readonly LABEL = nls.localize('closeEditorsInOtherGroups', "Close Editors in Other Groups");
 
 	constructor(
 		id: string,
@@ -666,7 +702,7 @@ export class CloseEditorsInOtherGroupsAction extends Action {
 		super(id, label);
 	}
 
-	public run(context?: IEditorIdentifier): TPromise<any> {
+	run(context?: IEditorIdentifier): TPromise<any> {
 		const groupToSkip = context ? this.editorGroupService.getGroup(context.groupId) : this.editorGroupService.activeGroup;
 		return TPromise.join(this.editorGroupService.getGroups(GroupsOrder.MOST_RECENTLY_ACTIVE).map(g => {
 			if (g.id === groupToSkip.id) {
@@ -689,7 +725,7 @@ export class BaseMoveGroupAction extends Action {
 		super(id, label);
 	}
 
-	public run(context?: IEditorIdentifier): TPromise<any> {
+	run(context?: IEditorIdentifier): TPromise<any> {
 		let sourceGroup: IEditorGroup;
 		if (context && typeof context.groupId === 'number') {
 			sourceGroup = this.editorGroupService.getGroup(context.groupId);
@@ -735,8 +771,8 @@ export class BaseMoveGroupAction extends Action {
 
 export class MoveGroupLeftAction extends BaseMoveGroupAction {
 
-	public static readonly ID = 'workbench.action.moveActiveEditorGroupLeft';
-	public static readonly LABEL = nls.localize('moveActiveGroupLeft', "Move Editor Group Left");
+	static readonly ID = 'workbench.action.moveActiveEditorGroupLeft';
+	static readonly LABEL = nls.localize('moveActiveGroupLeft', "Move Editor Group Left");
 
 	constructor(
 		id: string,
@@ -749,8 +785,8 @@ export class MoveGroupLeftAction extends BaseMoveGroupAction {
 
 export class MoveGroupRightAction extends BaseMoveGroupAction {
 
-	public static readonly ID = 'workbench.action.moveActiveEditorGroupRight';
-	public static readonly LABEL = nls.localize('moveActiveGroupRight', "Move Editor Group Right");
+	static readonly ID = 'workbench.action.moveActiveEditorGroupRight';
+	static readonly LABEL = nls.localize('moveActiveGroupRight', "Move Editor Group Right");
 
 	constructor(
 		id: string,
@@ -763,8 +799,8 @@ export class MoveGroupRightAction extends BaseMoveGroupAction {
 
 export class MoveGroupUpAction extends BaseMoveGroupAction {
 
-	public static readonly ID = 'workbench.action.moveActiveEditorGroupUp';
-	public static readonly LABEL = nls.localize('moveActiveGroupUp', "Move Editor Group Up");
+	static readonly ID = 'workbench.action.moveActiveEditorGroupUp';
+	static readonly LABEL = nls.localize('moveActiveGroupUp', "Move Editor Group Up");
 
 	constructor(
 		id: string,
@@ -777,8 +813,8 @@ export class MoveGroupUpAction extends BaseMoveGroupAction {
 
 export class MoveGroupDownAction extends BaseMoveGroupAction {
 
-	public static readonly ID = 'workbench.action.moveActiveEditorGroupDown';
-	public static readonly LABEL = nls.localize('moveActiveGroupDown', "Move Editor Group Down");
+	static readonly ID = 'workbench.action.moveActiveEditorGroupDown';
+	static readonly LABEL = nls.localize('moveActiveGroupDown', "Move Editor Group Down");
 
 	constructor(
 		id: string,
@@ -791,14 +827,14 @@ export class MoveGroupDownAction extends BaseMoveGroupAction {
 
 export class MinimizeOtherGroupsAction extends Action {
 
-	public static readonly ID = 'workbench.action.minimizeOtherEditors';
-	public static readonly LABEL = nls.localize('minimizeOtherEditorGroups', "Minimize Other Editor Groups");
+	static readonly ID = 'workbench.action.minimizeOtherEditors';
+	static readonly LABEL = nls.localize('minimizeOtherEditorGroups', "Maximize Editor Group");
 
 	constructor(id: string, label: string, @IEditorGroupsService private editorGroupService: IEditorGroupsService) {
 		super(id, label);
 	}
 
-	public run(): TPromise<any> {
+	run(): TPromise<any> {
 		this.editorGroupService.arrangeGroups(GroupsArrangement.MINIMIZE_OTHERS);
 
 		return TPromise.as(false);
@@ -807,14 +843,14 @@ export class MinimizeOtherGroupsAction extends Action {
 
 export class ResetGroupSizesAction extends Action {
 
-	public static readonly ID = 'workbench.action.evenEditorWidths';
-	public static readonly LABEL = nls.localize('evenEditorGroups', "Reset Editor Group Sizes");
+	static readonly ID = 'workbench.action.evenEditorWidths';
+	static readonly LABEL = nls.localize('evenEditorGroups', "Reset Editor Group Sizes");
 
 	constructor(id: string, label: string, @IEditorGroupsService private editorGroupService: IEditorGroupsService) {
 		super(id, label);
 	}
 
-	public run(): TPromise<any> {
+	run(): TPromise<any> {
 		this.editorGroupService.arrangeGroups(GroupsArrangement.EVEN);
 
 		return TPromise.as(false);
@@ -823,8 +859,8 @@ export class ResetGroupSizesAction extends Action {
 
 export class MaximizeGroupAction extends Action {
 
-	public static readonly ID = 'workbench.action.maximizeEditor';
-	public static readonly LABEL = nls.localize('maximizeEditor', "Maximize Editor Group and Hide Sidebar");
+	static readonly ID = 'workbench.action.maximizeEditor';
+	static readonly LABEL = nls.localize('maximizeEditor', "Maximize Editor Group and Hide Sidebar");
 
 	constructor(
 		id: string,
@@ -836,7 +872,7 @@ export class MaximizeGroupAction extends Action {
 		super(id, label);
 	}
 
-	public run(): TPromise<any> {
+	run(): TPromise<any> {
 		if (this.editorService.activeEditor) {
 			this.editorGroupService.arrangeGroups(GroupsArrangement.MINIMIZE_OTHERS);
 
@@ -858,7 +894,7 @@ export abstract class BaseNavigateEditorAction extends Action {
 		super(id, label);
 	}
 
-	public run(): TPromise<any> {
+	run(): TPromise<any> {
 		const result = this.navigate();
 		if (!result) {
 			return TPromise.as(false);
@@ -878,8 +914,8 @@ export abstract class BaseNavigateEditorAction extends Action {
 
 export class OpenNextEditor extends BaseNavigateEditorAction {
 
-	public static readonly ID = 'workbench.action.nextEditor';
-	public static readonly LABEL = nls.localize('openNextEditor', "Open Next Editor");
+	static readonly ID = 'workbench.action.nextEditor';
+	static readonly LABEL = nls.localize('openNextEditor', "Open Next Editor");
 
 	constructor(
 		id: string,
@@ -913,8 +949,8 @@ export class OpenNextEditor extends BaseNavigateEditorAction {
 
 export class OpenPreviousEditor extends BaseNavigateEditorAction {
 
-	public static readonly ID = 'workbench.action.previousEditor';
-	public static readonly LABEL = nls.localize('openPreviousEditor', "Open Previous Editor");
+	static readonly ID = 'workbench.action.previousEditor';
+	static readonly LABEL = nls.localize('openPreviousEditor', "Open Previous Editor");
 
 	constructor(
 		id: string,
@@ -948,8 +984,8 @@ export class OpenPreviousEditor extends BaseNavigateEditorAction {
 
 export class OpenNextEditorInGroup extends BaseNavigateEditorAction {
 
-	public static readonly ID = 'workbench.action.nextEditorInGroup';
-	public static readonly LABEL = nls.localize('nextEditorInGroup', "Open Next Editor in Group");
+	static readonly ID = 'workbench.action.nextEditorInGroup';
+	static readonly LABEL = nls.localize('nextEditorInGroup', "Open Next Editor in Group");
 
 	constructor(
 		id: string,
@@ -971,8 +1007,8 @@ export class OpenNextEditorInGroup extends BaseNavigateEditorAction {
 
 export class OpenPreviousEditorInGroup extends BaseNavigateEditorAction {
 
-	public static readonly ID = 'workbench.action.previousEditorInGroup';
-	public static readonly LABEL = nls.localize('openPreviousEditorInGroup', "Open Previous Editor in Group");
+	static readonly ID = 'workbench.action.previousEditorInGroup';
+	static readonly LABEL = nls.localize('openPreviousEditorInGroup', "Open Previous Editor in Group");
 
 	constructor(
 		id: string,
@@ -994,8 +1030,8 @@ export class OpenPreviousEditorInGroup extends BaseNavigateEditorAction {
 
 export class OpenFirstEditorInGroup extends BaseNavigateEditorAction {
 
-	public static readonly ID = 'workbench.action.firstEditorInGroup';
-	public static readonly LABEL = nls.localize('firstEditorInGroup', "Open First Editor in Group");
+	static readonly ID = 'workbench.action.firstEditorInGroup';
+	static readonly LABEL = nls.localize('firstEditorInGroup', "Open First Editor in Group");
 
 	constructor(
 		id: string,
@@ -1016,8 +1052,8 @@ export class OpenFirstEditorInGroup extends BaseNavigateEditorAction {
 
 export class OpenLastEditorInGroup extends BaseNavigateEditorAction {
 
-	public static readonly ID = 'workbench.action.lastEditorInGroup';
-	public static readonly LABEL = nls.localize('lastEditorInGroup', "Open Last Editor in Group");
+	static readonly ID = 'workbench.action.lastEditorInGroup';
+	static readonly LABEL = nls.localize('lastEditorInGroup', "Open Last Editor in Group");
 
 	constructor(
 		id: string,
@@ -1038,14 +1074,14 @@ export class OpenLastEditorInGroup extends BaseNavigateEditorAction {
 
 export class NavigateForwardAction extends Action {
 
-	public static readonly ID = 'workbench.action.navigateForward';
-	public static readonly LABEL = nls.localize('navigateNext', "Go Forward");
+	static readonly ID = 'workbench.action.navigateForward';
+	static readonly LABEL = nls.localize('navigateNext', "Go Forward");
 
 	constructor(id: string, label: string, @IHistoryService private historyService: IHistoryService) {
 		super(id, label);
 	}
 
-	public run(): TPromise<any> {
+	run(): TPromise<any> {
 		this.historyService.forward();
 
 		return TPromise.as(null);
@@ -1054,14 +1090,14 @@ export class NavigateForwardAction extends Action {
 
 export class NavigateBackwardsAction extends Action {
 
-	public static readonly ID = 'workbench.action.navigateBack';
-	public static readonly LABEL = nls.localize('navigatePrevious', "Go Back");
+	static readonly ID = 'workbench.action.navigateBack';
+	static readonly LABEL = nls.localize('navigatePrevious', "Go Back");
 
 	constructor(id: string, label: string, @IHistoryService private historyService: IHistoryService) {
 		super(id, label);
 	}
 
-	public run(): TPromise<any> {
+	run(): TPromise<any> {
 		this.historyService.back();
 
 		return TPromise.as(null);
@@ -1070,14 +1106,14 @@ export class NavigateBackwardsAction extends Action {
 
 export class NavigateLastAction extends Action {
 
-	public static readonly ID = 'workbench.action.navigateLast';
-	public static readonly LABEL = nls.localize('navigateLast', "Go Last");
+	static readonly ID = 'workbench.action.navigateLast';
+	static readonly LABEL = nls.localize('navigateLast', "Go Last");
 
 	constructor(id: string, label: string, @IHistoryService private historyService: IHistoryService) {
 		super(id, label);
 	}
 
-	public run(): TPromise<any> {
+	run(): TPromise<any> {
 		this.historyService.last();
 
 		return TPromise.as(null);
@@ -1086,8 +1122,8 @@ export class NavigateLastAction extends Action {
 
 export class ReopenClosedEditorAction extends Action {
 
-	public static readonly ID = 'workbench.action.reopenClosedEditor';
-	public static readonly LABEL = nls.localize('reopenClosedEditor', "Reopen Closed Editor");
+	static readonly ID = 'workbench.action.reopenClosedEditor';
+	static readonly LABEL = nls.localize('reopenClosedEditor', "Reopen Closed Editor");
 
 	constructor(
 		id: string,
@@ -1097,7 +1133,7 @@ export class ReopenClosedEditorAction extends Action {
 		super(id, label);
 	}
 
-	public run(): TPromise<any> {
+	run(): TPromise<any> {
 		this.historyService.reopenLastClosedEditor();
 
 		return TPromise.as(false);
@@ -1106,8 +1142,8 @@ export class ReopenClosedEditorAction extends Action {
 
 export class ClearRecentFilesAction extends Action {
 
-	public static readonly ID = 'workbench.action.clearRecentFiles';
-	public static readonly LABEL = nls.localize('clearRecentFiles', "Clear Recently Opened");
+	static readonly ID = 'workbench.action.clearRecentFiles';
+	static readonly LABEL = nls.localize('clearRecentFiles', "Clear Recently Opened");
 
 	constructor(
 		id: string,
@@ -1117,7 +1153,7 @@ export class ClearRecentFilesAction extends Action {
 		super(id, label);
 	}
 
-	public run(): TPromise<any> {
+	run(): TPromise<any> {
 		this.windowsService.clearRecentlyOpened();
 
 		return TPromise.as(false);
@@ -1126,8 +1162,8 @@ export class ClearRecentFilesAction extends Action {
 
 export class ShowEditorsInActiveGroupAction extends QuickOpenAction {
 
-	public static readonly ID = 'workbench.action.showEditorsInActiveGroup';
-	public static readonly LABEL = nls.localize('showEditorsInActiveGroup', "Show Editors in Active Group");
+	static readonly ID = 'workbench.action.showEditorsInActiveGroup';
+	static readonly LABEL = nls.localize('showEditorsInActiveGroup', "Show Editors in Active Group");
 
 	constructor(
 		actionId: string,
@@ -1140,8 +1176,8 @@ export class ShowEditorsInActiveGroupAction extends QuickOpenAction {
 
 export class ShowAllEditorsAction extends QuickOpenAction {
 
-	public static readonly ID = 'workbench.action.showAllEditors';
-	public static readonly LABEL = nls.localize('showAllEditors', "Show All Editors");
+	static readonly ID = 'workbench.action.showAllEditors';
+	static readonly LABEL = nls.localize('showAllEditors', "Show All Editors");
 
 	constructor(actionId: string, actionLabel: string, @IQuickOpenService quickOpenService: IQuickOpenService) {
 		super(actionId, actionLabel, NAVIGATE_ALL_EDITORS_GROUP_PREFIX, quickOpenService);
@@ -1159,7 +1195,7 @@ export class BaseQuickOpenEditorInGroupAction extends Action {
 		super(id, label);
 	}
 
-	public run(): TPromise<any> {
+	run(): TPromise<any> {
 		const keys = this.keybindingService.lookupKeybindings(this.id);
 
 
@@ -1172,8 +1208,8 @@ export class BaseQuickOpenEditorInGroupAction extends Action {
 
 export class OpenPreviousRecentlyUsedEditorInGroupAction extends BaseQuickOpenEditorInGroupAction {
 
-	public static readonly ID = 'workbench.action.openPreviousRecentlyUsedEditorInGroup';
-	public static readonly LABEL = nls.localize('openPreviousRecentlyUsedEditorInGroup', "Open Previous Recently Used Editor in Group");
+	static readonly ID = 'workbench.action.openPreviousRecentlyUsedEditorInGroup';
+	static readonly LABEL = nls.localize('openPreviousRecentlyUsedEditorInGroup', "Open Previous Recently Used Editor in Group");
 
 	constructor(
 		id: string,
@@ -1187,8 +1223,8 @@ export class OpenPreviousRecentlyUsedEditorInGroupAction extends BaseQuickOpenEd
 
 export class OpenNextRecentlyUsedEditorInGroupAction extends BaseQuickOpenEditorInGroupAction {
 
-	public static readonly ID = 'workbench.action.openNextRecentlyUsedEditorInGroup';
-	public static readonly LABEL = nls.localize('openNextRecentlyUsedEditorInGroup', "Open Next Recently Used Editor in Group");
+	static readonly ID = 'workbench.action.openNextRecentlyUsedEditorInGroup';
+	static readonly LABEL = nls.localize('openNextRecentlyUsedEditorInGroup', "Open Next Recently Used Editor in Group");
 
 	constructor(
 		id: string,
@@ -1202,8 +1238,8 @@ export class OpenNextRecentlyUsedEditorInGroupAction extends BaseQuickOpenEditor
 
 export class OpenPreviousEditorFromHistoryAction extends Action {
 
-	public static readonly ID = 'workbench.action.openPreviousEditorFromHistory';
-	public static readonly LABEL = nls.localize('navigateEditorHistoryByInput', "Open Previous Editor from History");
+	static readonly ID = 'workbench.action.openPreviousEditorFromHistory';
+	static readonly LABEL = nls.localize('navigateEditorHistoryByInput', "Open Previous Editor from History");
 
 	constructor(
 		id: string,
@@ -1214,7 +1250,7 @@ export class OpenPreviousEditorFromHistoryAction extends Action {
 		super(id, label);
 	}
 
-	public run(): TPromise<any> {
+	run(): TPromise<any> {
 		const keys = this.keybindingService.lookupKeybindings(this.id);
 
 		this.quickOpenService.show(null, { quickNavigateConfiguration: { keybindings: keys } });
@@ -1225,14 +1261,14 @@ export class OpenPreviousEditorFromHistoryAction extends Action {
 
 export class OpenNextRecentlyUsedEditorAction extends Action {
 
-	public static readonly ID = 'workbench.action.openNextRecentlyUsedEditor';
-	public static readonly LABEL = nls.localize('openNextRecentlyUsedEditor', "Open Next Recently Used Editor");
+	static readonly ID = 'workbench.action.openNextRecentlyUsedEditor';
+	static readonly LABEL = nls.localize('openNextRecentlyUsedEditor', "Open Next Recently Used Editor");
 
 	constructor(id: string, label: string, @IHistoryService private historyService: IHistoryService) {
 		super(id, label);
 	}
 
-	public run(): TPromise<any> {
+	run(): TPromise<any> {
 		this.historyService.forward(true);
 
 		return TPromise.as(null);
@@ -1241,14 +1277,14 @@ export class OpenNextRecentlyUsedEditorAction extends Action {
 
 export class OpenPreviousRecentlyUsedEditorAction extends Action {
 
-	public static readonly ID = 'workbench.action.openPreviousRecentlyUsedEditor';
-	public static readonly LABEL = nls.localize('openPreviousRecentlyUsedEditor', "Open Previous Recently Used Editor");
+	static readonly ID = 'workbench.action.openPreviousRecentlyUsedEditor';
+	static readonly LABEL = nls.localize('openPreviousRecentlyUsedEditor', "Open Previous Recently Used Editor");
 
 	constructor(id: string, label: string, @IHistoryService private historyService: IHistoryService) {
 		super(id, label);
 	}
 
-	public run(): TPromise<any> {
+	run(): TPromise<any> {
 		this.historyService.back(true);
 
 		return TPromise.as(null);
@@ -1257,8 +1293,8 @@ export class OpenPreviousRecentlyUsedEditorAction extends Action {
 
 export class ClearEditorHistoryAction extends Action {
 
-	public static readonly ID = 'workbench.action.clearEditorHistory';
-	public static readonly LABEL = nls.localize('clearEditorHistory', "Clear Editor History");
+	static readonly ID = 'workbench.action.clearEditorHistory';
+	static readonly LABEL = nls.localize('clearEditorHistory', "Clear Editor History");
 
 	constructor(
 		id: string,
@@ -1268,7 +1304,7 @@ export class ClearEditorHistoryAction extends Action {
 		super(id, label);
 	}
 
-	public run(): TPromise<any> {
+	run(): TPromise<any> {
 
 		// Editor history
 		this.historyService.clear();
@@ -1279,8 +1315,8 @@ export class ClearEditorHistoryAction extends Action {
 
 export class MoveEditorLeftInGroupAction extends ExecuteCommandAction {
 
-	public static readonly ID = 'workbench.action.moveEditorLeftInGroup';
-	public static readonly LABEL = nls.localize('moveEditorLeft', "Move Editor Left");
+	static readonly ID = 'workbench.action.moveEditorLeftInGroup';
+	static readonly LABEL = nls.localize('moveEditorLeft', "Move Editor Left");
 
 	constructor(
 		id: string,
@@ -1293,8 +1329,8 @@ export class MoveEditorLeftInGroupAction extends ExecuteCommandAction {
 
 export class MoveEditorRightInGroupAction extends ExecuteCommandAction {
 
-	public static readonly ID = 'workbench.action.moveEditorRightInGroup';
-	public static readonly LABEL = nls.localize('moveEditorRight', "Move Editor Right");
+	static readonly ID = 'workbench.action.moveEditorRightInGroup';
+	static readonly LABEL = nls.localize('moveEditorRight', "Move Editor Right");
 
 	constructor(
 		id: string,
@@ -1307,8 +1343,8 @@ export class MoveEditorRightInGroupAction extends ExecuteCommandAction {
 
 export class MoveEditorToPreviousGroupAction extends ExecuteCommandAction {
 
-	public static readonly ID = 'workbench.action.moveEditorToPreviousGroup';
-	public static readonly LABEL = nls.localize('moveEditorToPreviousGroup', "Move Editor into Previous Group");
+	static readonly ID = 'workbench.action.moveEditorToPreviousGroup';
+	static readonly LABEL = nls.localize('moveEditorToPreviousGroup', "Move Editor into Previous Group");
 
 	constructor(
 		id: string,
@@ -1321,8 +1357,8 @@ export class MoveEditorToPreviousGroupAction extends ExecuteCommandAction {
 
 export class MoveEditorToNextGroupAction extends ExecuteCommandAction {
 
-	public static readonly ID = 'workbench.action.moveEditorToNextGroup';
-	public static readonly LABEL = nls.localize('moveEditorToNextGroup', "Move Editor into Next Group");
+	static readonly ID = 'workbench.action.moveEditorToNextGroup';
+	static readonly LABEL = nls.localize('moveEditorToNextGroup', "Move Editor into Next Group");
 
 	constructor(
 		id: string,
@@ -1335,8 +1371,8 @@ export class MoveEditorToNextGroupAction extends ExecuteCommandAction {
 
 export class MoveEditorToAboveGroupAction extends ExecuteCommandAction {
 
-	public static readonly ID = 'workbench.action.moveEditorToAboveGroup';
-	public static readonly LABEL = nls.localize('moveEditorToAboveGroup', "Move Editor into Above Group");
+	static readonly ID = 'workbench.action.moveEditorToAboveGroup';
+	static readonly LABEL = nls.localize('moveEditorToAboveGroup', "Move Editor into Above Group");
 
 	constructor(
 		id: string,
@@ -1349,8 +1385,8 @@ export class MoveEditorToAboveGroupAction extends ExecuteCommandAction {
 
 export class MoveEditorToBelowGroupAction extends ExecuteCommandAction {
 
-	public static readonly ID = 'workbench.action.moveEditorToBelowGroup';
-	public static readonly LABEL = nls.localize('moveEditorToBelowGroup', "Move Editor into Below Group");
+	static readonly ID = 'workbench.action.moveEditorToBelowGroup';
+	static readonly LABEL = nls.localize('moveEditorToBelowGroup', "Move Editor into Below Group");
 
 	constructor(
 		id: string,
@@ -1363,8 +1399,8 @@ export class MoveEditorToBelowGroupAction extends ExecuteCommandAction {
 
 export class MoveEditorToLeftGroupAction extends ExecuteCommandAction {
 
-	public static readonly ID = 'workbench.action.moveEditorToLeftGroup';
-	public static readonly LABEL = nls.localize('moveEditorToLeftGroup', "Move Editor into Left Group");
+	static readonly ID = 'workbench.action.moveEditorToLeftGroup';
+	static readonly LABEL = nls.localize('moveEditorToLeftGroup', "Move Editor into Left Group");
 
 	constructor(
 		id: string,
@@ -1377,8 +1413,8 @@ export class MoveEditorToLeftGroupAction extends ExecuteCommandAction {
 
 export class MoveEditorToRightGroupAction extends ExecuteCommandAction {
 
-	public static readonly ID = 'workbench.action.moveEditorToRightGroup';
-	public static readonly LABEL = nls.localize('moveEditorToRightGroup', "Move Editor into Right Group");
+	static readonly ID = 'workbench.action.moveEditorToRightGroup';
+	static readonly LABEL = nls.localize('moveEditorToRightGroup', "Move Editor into Right Group");
 
 	constructor(
 		id: string,
@@ -1391,8 +1427,8 @@ export class MoveEditorToRightGroupAction extends ExecuteCommandAction {
 
 export class MoveEditorToFirstGroupAction extends ExecuteCommandAction {
 
-	public static readonly ID = 'workbench.action.moveEditorToFirstGroup';
-	public static readonly LABEL = nls.localize('moveEditorToFirstGroup', "Move Editor into First Group");
+	static readonly ID = 'workbench.action.moveEditorToFirstGroup';
+	static readonly LABEL = nls.localize('moveEditorToFirstGroup', "Move Editor into First Group");
 
 	constructor(
 		id: string,
@@ -1405,8 +1441,8 @@ export class MoveEditorToFirstGroupAction extends ExecuteCommandAction {
 
 export class MoveEditorToLastGroupAction extends ExecuteCommandAction {
 
-	public static readonly ID = 'workbench.action.moveEditorToLastGroup';
-	public static readonly LABEL = nls.localize('moveEditorToLastGroup', "Move Editor into Last Group");
+	static readonly ID = 'workbench.action.moveEditorToLastGroup';
+	static readonly LABEL = nls.localize('moveEditorToLastGroup', "Move Editor into Last Group");
 
 	constructor(
 		id: string,
@@ -1419,8 +1455,8 @@ export class MoveEditorToLastGroupAction extends ExecuteCommandAction {
 
 export class EditorLayoutSingleAction extends ExecuteCommandAction {
 
-	public static readonly ID = 'workbench.action.editorLayoutSingle';
-	public static readonly LABEL = nls.localize('editorLayoutSingle', "Single Column Editor Layout");
+	static readonly ID = 'workbench.action.editorLayoutSingle';
+	static readonly LABEL = nls.localize('editorLayoutSingle', "Single Column Editor Layout");
 
 	constructor(
 		id: string,
@@ -1433,8 +1469,8 @@ export class EditorLayoutSingleAction extends ExecuteCommandAction {
 
 export class EditorLayoutTwoColumnsAction extends ExecuteCommandAction {
 
-	public static readonly ID = 'workbench.action.editorLayoutTwoColumns';
-	public static readonly LABEL = nls.localize('editorLayoutTwoColumns', "Two Columns Editor Layout");
+	static readonly ID = 'workbench.action.editorLayoutTwoColumns';
+	static readonly LABEL = nls.localize('editorLayoutTwoColumns', "Two Columns Editor Layout");
 
 	constructor(
 		id: string,
@@ -1447,8 +1483,8 @@ export class EditorLayoutTwoColumnsAction extends ExecuteCommandAction {
 
 export class EditorLayoutThreeColumnsAction extends ExecuteCommandAction {
 
-	public static readonly ID = 'workbench.action.editorLayoutThreeColumns';
-	public static readonly LABEL = nls.localize('editorLayoutThreeColumns', "Three Columns Editor Layout");
+	static readonly ID = 'workbench.action.editorLayoutThreeColumns';
+	static readonly LABEL = nls.localize('editorLayoutThreeColumns', "Three Columns Editor Layout");
 
 	constructor(
 		id: string,
@@ -1461,8 +1497,8 @@ export class EditorLayoutThreeColumnsAction extends ExecuteCommandAction {
 
 export class EditorLayoutTwoRowsAction extends ExecuteCommandAction {
 
-	public static readonly ID = 'workbench.action.editorLayoutTwoRows';
-	public static readonly LABEL = nls.localize('editorLayoutTwoRows', "Two Rows Editor Layout");
+	static readonly ID = 'workbench.action.editorLayoutTwoRows';
+	static readonly LABEL = nls.localize('editorLayoutTwoRows', "Two Rows Editor Layout");
 
 	constructor(
 		id: string,
@@ -1475,8 +1511,8 @@ export class EditorLayoutTwoRowsAction extends ExecuteCommandAction {
 
 export class EditorLayoutThreeRowsAction extends ExecuteCommandAction {
 
-	public static readonly ID = 'workbench.action.editorLayoutThreeRows';
-	public static readonly LABEL = nls.localize('editorLayoutThreeRows', "Three Rows Editor Layout");
+	static readonly ID = 'workbench.action.editorLayoutThreeRows';
+	static readonly LABEL = nls.localize('editorLayoutThreeRows', "Three Rows Editor Layout");
 
 	constructor(
 		id: string,
@@ -1489,8 +1525,8 @@ export class EditorLayoutThreeRowsAction extends ExecuteCommandAction {
 
 export class EditorLayoutTwoByTwoGridAction extends ExecuteCommandAction {
 
-	public static readonly ID = 'workbench.action.editorLayoutTwoByTwoGrid';
-	public static readonly LABEL = nls.localize('editorLayoutTwoByTwoGrid', "Grid Editor Layout (2x2)");
+	static readonly ID = 'workbench.action.editorLayoutTwoByTwoGrid';
+	static readonly LABEL = nls.localize('editorLayoutTwoByTwoGrid', "Grid Editor Layout (2x2)");
 
 	constructor(
 		id: string,
@@ -1503,8 +1539,8 @@ export class EditorLayoutTwoByTwoGridAction extends ExecuteCommandAction {
 
 export class EditorLayoutTwoColumnsBottomAction extends ExecuteCommandAction {
 
-	public static readonly ID = 'workbench.action.editorLayoutTwoColumnsBottom';
-	public static readonly LABEL = nls.localize('editorLayoutTwoColumnsBottom', "Two Columns Bottom Editor Layout");
+	static readonly ID = 'workbench.action.editorLayoutTwoColumnsBottom';
+	static readonly LABEL = nls.localize('editorLayoutTwoColumnsBottom', "Two Columns Bottom Editor Layout");
 
 	constructor(
 		id: string,
@@ -1515,10 +1551,10 @@ export class EditorLayoutTwoColumnsBottomAction extends ExecuteCommandAction {
 	}
 }
 
-export class EditorLayoutTwoColumnsRightAction extends ExecuteCommandAction {
+export class EditorLayoutTwoRowsRightAction extends ExecuteCommandAction {
 
-	public static readonly ID = 'workbench.action.editorLayoutTwoColumnsRight';
-	public static readonly LABEL = nls.localize('editorLayoutTwoColumnsRight', "Two Columns Right Editor Layout");
+	static readonly ID = 'workbench.action.editorLayoutTwoRowsRight';
+	static readonly LABEL = nls.localize('editorLayoutTwoRowsRight', "Two Rows Right Editor Layout");
 
 	constructor(
 		id: string,
@@ -1529,34 +1565,6 @@ export class EditorLayoutTwoColumnsRightAction extends ExecuteCommandAction {
 	}
 }
 
-export class EditorLayoutCenteredAction extends Action {
-
-	public static readonly ID = 'workbench.action.editorLayoutCentered';
-	public static readonly LABEL = nls.localize('editorLayoutCentered', "Centered Editor Layout");
-
-	constructor(
-		id: string,
-		label: string,
-		@IPartService private partService: IPartService,
-		@IEditorGroupsService private editorGroupService: IEditorGroupsService
-	) {
-		super(id, label);
-	}
-
-	public run(): TPromise<any> {
-
-		// Ensure we can enter centered editor layout even if there are more than 1 groups
-		if (this.editorGroupService.count > 1) {
-			mergeAllGroups(this.editorGroupService);
-		}
-
-		// Center editor layout
-		this.partService.centerEditorLayout(true);
-
-		return TPromise.as(true);
-	}
-}
-
 export class BaseCreateEditorGroupAction extends Action {
 
 	constructor(
@@ -1568,7 +1576,7 @@ export class BaseCreateEditorGroupAction extends Action {
 		super(id, label);
 	}
 
-	public run(): TPromise<any> {
+	run(): TPromise<any> {
 		this.editorGroupService.addGroup(this.editorGroupService.activeGroup, this.direction, { activate: true });
 
 		return TPromise.as(true);
@@ -1577,8 +1585,8 @@ export class BaseCreateEditorGroupAction extends Action {
 
 export class NewEditorGroupLeftAction extends BaseCreateEditorGroupAction {
 
-	public static readonly ID = 'workbench.action.newGroupLeft';
-	public static readonly LABEL = nls.localize('newEditorLeft', "New Editor Group to the Left");
+	static readonly ID = 'workbench.action.newGroupLeft';
+	static readonly LABEL = nls.localize('newEditorLeft', "New Editor Group to the Left");
 
 	constructor(
 		id: string,
@@ -1591,8 +1599,8 @@ export class NewEditorGroupLeftAction extends BaseCreateEditorGroupAction {
 
 export class NewEditorGroupRightAction extends BaseCreateEditorGroupAction {
 
-	public static readonly ID = 'workbench.action.newGroupRight';
-	public static readonly LABEL = nls.localize('newEditorRight', "New Editor Group to the Right");
+	static readonly ID = 'workbench.action.newGroupRight';
+	static readonly LABEL = nls.localize('newEditorRight', "New Editor Group to the Right");
 
 	constructor(
 		id: string,
@@ -1605,8 +1613,8 @@ export class NewEditorGroupRightAction extends BaseCreateEditorGroupAction {
 
 export class NewEditorGroupAboveAction extends BaseCreateEditorGroupAction {
 
-	public static readonly ID = 'workbench.action.newGroupAbove';
-	public static readonly LABEL = nls.localize('newEditorAbove', "New Editor Group Above");
+	static readonly ID = 'workbench.action.newGroupAbove';
+	static readonly LABEL = nls.localize('newEditorAbove', "New Editor Group Above");
 
 	constructor(
 		id: string,
@@ -1619,8 +1627,8 @@ export class NewEditorGroupAboveAction extends BaseCreateEditorGroupAction {
 
 export class NewEditorGroupBelowAction extends BaseCreateEditorGroupAction {
 
-	public static readonly ID = 'workbench.action.newGroupBelow';
-	public static readonly LABEL = nls.localize('newEditorBelow', "New Editor Group Below");
+	static readonly ID = 'workbench.action.newGroupBelow';
+	static readonly LABEL = nls.localize('newEditorBelow', "New Editor Group Below");
 
 	constructor(
 		id: string,
@@ -1629,4 +1637,4 @@ export class NewEditorGroupBelowAction extends BaseCreateEditorGroupAction {
 	) {
 		super(id, label, GroupDirection.DOWN, editorGroupService);
 	}
-}
\ No newline at end of file
+}
diff --git a/src/vs/workbench/browser/parts/editor/editorCommands.ts b/src/vs/workbench/browser/parts/editor/editorCommands.ts
index a39c9c9f3f1..3e5bdba9ba0 100644
--- a/src/vs/workbench/browser/parts/editor/editorCommands.ts
+++ b/src/vs/workbench/browser/parts/editor/editorCommands.ts
@@ -6,14 +6,14 @@
 import * as nls from 'vs/nls';
 import * as types from 'vs/base/common/types';
 import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRegistry';
+import { KeybindingsRegistry, KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
 import { TextCompareEditorVisibleContext, EditorInput, IEditorIdentifier, IEditorCommandsContext, ActiveEditorGroupEmptyContext, MultipleEditorGroupsContext, CloseDirection, IEditor, IEditorInput } from 'vs/workbench/common/editor';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
 import { TextDiffEditor } from 'vs/workbench/browser/parts/editor/textDiffEditor';
 import { KeyMod, KeyCode, KeyChord } from 'vs/base/common/keyCodes';
 import { TPromise } from 'vs/base/common/winjs.base';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { IQuickOpenService } from 'vs/platform/quickOpen/common/quickOpen';
 import { IDiffEditorOptions } from 'vs/editor/common/config/editorOptions';
 import { IListService } from 'vs/platform/list/browser/listService';
@@ -22,7 +22,8 @@ import { distinct } from 'vs/base/common/arrays';
 import { IEditorGroupsService, IEditorGroup, GroupDirection, GroupLocation, GroupsOrder, preferredSideBySideGroupDirection, EditorGroupLayout } from 'vs/workbench/services/group/common/editorGroupsService';
 import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { CommandsRegistry } from 'vs/platform/commands/common/commands';
+import { CommandsRegistry, ICommandHandler } from 'vs/platform/commands/common/commands';
+import { MenuRegistry, MenuId } from 'vs/platform/actions/common/actions';
 
 export const CLOSE_SAVED_EDITORS_COMMAND_ID = 'workbench.action.closeUnmodifiedEditors';
 export const CLOSE_EDITORS_IN_GROUP_COMMAND_ID = 'workbench.action.closeEditorsInGroup';
@@ -46,6 +47,8 @@ export const SPLIT_EDITOR_RIGHT = 'workbench.action.splitEditorRight';
 export const NAVIGATE_ALL_EDITORS_GROUP_PREFIX = 'edt ';
 export const NAVIGATE_IN_ACTIVE_GROUP_PREFIX = 'edt active ';
 
+export const OPEN_EDITOR_AT_INDEX_COMMAND_ID = 'workbench.action.openEditorAtIndex';
+
 export interface ActiveEditorMoveArguments {
 	to?: 'first' | 'last' | 'left' | 'right' | 'up' | 'down' | 'center' | 'position' | 'previous' | 'next';
 	by?: 'tab' | 'group';
@@ -75,7 +78,7 @@ const isActiveEditorMoveArg = function (arg: ActiveEditorMoveArguments): boolean
 function registerActiveEditorMoveCommand(): void {
 	KeybindingsRegistry.registerCommandAndKeybindingRule({
 		id: MOVE_ACTIVE_EDITOR_COMMAND_ID,
-		weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
+		weight: KeybindingWeight.WorkbenchContrib,
 		when: EditorContextKeys.editorTextFocus,
 		primary: null,
 		handler: (accessor, args: any) => moveActiveEditor(args, accessor),
@@ -138,8 +141,8 @@ function moveActiveTab(args: ActiveEditorMoveArguments, control: IEditor, access
 
 function moveActiveEditorToGroup(args: ActiveEditorMoveArguments, control: IEditor, accessor: ServicesAccessor): void {
 	const editorGroupService = accessor.get(IEditorGroupsService);
+	const configurationService = accessor.get(IConfigurationService);
 
-	const groups = editorGroupService.groups;
 	const sourceGroup = control.group;
 	let targetGroup: IEditorGroup;
 
@@ -179,12 +182,15 @@ function moveActiveEditorToGroup(args: ActiveEditorMoveArguments, control: IEdit
 			break;
 		case 'next':
 			targetGroup = editorGroupService.findGroup({ location: GroupLocation.NEXT }, sourceGroup);
+			if (!targetGroup) {
+				targetGroup = editorGroupService.addGroup(sourceGroup, preferredSideBySideGroupDirection(configurationService));
+			}
 			break;
 		case 'center':
-			targetGroup = groups[(groups.length / 2) - 1];
+			targetGroup = editorGroupService.getGroups(GroupsOrder.GRID_APPEARANCE)[(editorGroupService.count / 2) - 1];
 			break;
 		case 'position':
-			targetGroup = groups[args.value - 1];
+			targetGroup = editorGroupService.getGroups(GroupsOrder.GRID_APPEARANCE)[args.value - 1];
 			break;
 	}
 
@@ -219,17 +225,17 @@ export function mergeAllGroups(editorGroupService: IEditorGroupsService): void {
 function registerDiffEditorCommands(): void {
 	KeybindingsRegistry.registerCommandAndKeybindingRule({
 		id: 'workbench.action.compareEditor.nextChange',
-		weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
+		weight: KeybindingWeight.WorkbenchContrib,
 		when: TextCompareEditorVisibleContext,
-		primary: null,
+		primary: KeyMod.Alt | KeyCode.F5,
 		handler: accessor => navigateInDiffEditor(accessor, true)
 	});
 
 	KeybindingsRegistry.registerCommandAndKeybindingRule({
 		id: 'workbench.action.compareEditor.previousChange',
-		weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
+		weight: KeybindingWeight.WorkbenchContrib,
 		when: TextCompareEditorVisibleContext,
-		primary: null,
+		primary: KeyMod.Alt | KeyMod.Shift | KeyCode.F5,
 		handler: accessor => navigateInDiffEditor(accessor, false)
 	});
 
@@ -244,7 +250,7 @@ function registerDiffEditorCommands(): void {
 
 	KeybindingsRegistry.registerCommandAndKeybindingRule({
 		id: TOGGLE_DIFF_INLINE_MODE,
-		weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
+		weight: KeybindingWeight.WorkbenchContrib,
 		when: void 0,
 		primary: void 0,
 		handler: (accessor, resourceOrContext: URI | IEditorCommandsContext, context?: IEditorCommandsContext) => {
@@ -260,9 +266,33 @@ function registerDiffEditorCommands(): void {
 			}
 		}
 	});
+
+	MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
+		command: {
+			id: TOGGLE_DIFF_INLINE_MODE,
+			title: nls.localize('toggleInlineView', "Compare: Toggle Inline View")
+		},
+		when: ContextKeyExpr.has('textCompareEditorActive')
+	});
 }
 
 function registerOpenEditorAtIndexCommands(): void {
+	const openEditorAtIndex: ICommandHandler = (accessor: ServicesAccessor, editorIndex: number): void => {
+		const editorService = accessor.get(IEditorService);
+		const activeControl = editorService.activeControl;
+		if (activeControl) {
+			const editor = activeControl.group.getEditor(editorIndex);
+			if (editor) {
+				editorService.openEditor(editor);
+			}
+		}
+	};
+
+	// This command takes in the editor index number to open as an argument
+	CommandsRegistry.registerCommand({
+		id: OPEN_EDITOR_AT_INDEX_COMMAND_ID,
+		handler: openEditorAtIndex
+	});
 
 	// Keybindings to focus a specific index in the tab folder if tabs are enabled
 	for (let i = 0; i < 9; i++) {
@@ -270,24 +300,12 @@ function registerOpenEditorAtIndexCommands(): void {
 		const visibleIndex = i + 1;
 
 		KeybindingsRegistry.registerCommandAndKeybindingRule({
-			id: 'workbench.action.openEditorAtIndex' + visibleIndex,
-			weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
+			id: OPEN_EDITOR_AT_INDEX_COMMAND_ID + visibleIndex,
+			weight: KeybindingWeight.WorkbenchContrib,
 			when: void 0,
 			primary: KeyMod.Alt | toKeyCode(visibleIndex),
 			mac: { primary: KeyMod.WinCtrl | toKeyCode(visibleIndex) },
-			handler: accessor => {
-				const editorService = accessor.get(IEditorService);
-
-				const activeControl = editorService.activeControl;
-				if (activeControl) {
-					const editor = activeControl.group.getEditor(editorIndex);
-					if (editor) {
-						return editorService.openEditor(editor).then(() => void 0);
-					}
-				}
-
-				return void 0;
-			}
+			handler: accessor => openEditorAtIndex(accessor, editorIndex)
 		});
 	}
 
@@ -315,7 +333,7 @@ function registerFocusEditorGroupAtIndexCommands(): void {
 	for (let groupIndex = 1; groupIndex < 8; groupIndex++) {
 		KeybindingsRegistry.registerCommandAndKeybindingRule({
 			id: toCommandId(groupIndex),
-			weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
+			weight: KeybindingWeight.WorkbenchContrib,
 			when: void 0,
 			primary: KeyMod.CtrlCmd | toKeyCode(groupIndex),
 			handler: accessor => {
@@ -330,7 +348,7 @@ function registerFocusEditorGroupAtIndexCommands(): void {
 				}
 
 				// Group exists: just focus
-				const groups = editorGroupService.getGroups(GroupsOrder.CREATION_TIME);
+				const groups = editorGroupService.getGroups(GroupsOrder.GRID_APPEARANCE);
 				if (groups[groupIndex]) {
 					return groups[groupIndex].focus();
 				}
@@ -419,7 +437,7 @@ function registerCloseEditorCommands() {
 
 	KeybindingsRegistry.registerCommandAndKeybindingRule({
 		id: CLOSE_SAVED_EDITORS_COMMAND_ID,
-		weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
+		weight: KeybindingWeight.WorkbenchContrib,
 		when: void 0,
 		primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_K, KeyCode.KEY_U),
 		handler: (accessor, resourceOrContext: URI | IEditorCommandsContext, context?: IEditorCommandsContext) => {
@@ -439,7 +457,7 @@ function registerCloseEditorCommands() {
 
 	KeybindingsRegistry.registerCommandAndKeybindingRule({
 		id: CLOSE_EDITORS_IN_GROUP_COMMAND_ID,
-		weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
+		weight: KeybindingWeight.WorkbenchContrib,
 		when: void 0,
 		primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_K, KeyCode.KEY_W),
 		handler: (accessor, resourceOrContext: URI | IEditorCommandsContext, context?: IEditorCommandsContext) => {
@@ -459,7 +477,7 @@ function registerCloseEditorCommands() {
 
 	KeybindingsRegistry.registerCommandAndKeybindingRule({
 		id: CLOSE_EDITOR_COMMAND_ID,
-		weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
+		weight: KeybindingWeight.WorkbenchContrib,
 		when: void 0,
 		primary: KeyMod.CtrlCmd | KeyCode.KEY_W,
 		win: { primary: KeyMod.CtrlCmd | KeyCode.F4, secondary: [KeyMod.CtrlCmd | KeyCode.KEY_W] },
@@ -487,7 +505,7 @@ function registerCloseEditorCommands() {
 
 	KeybindingsRegistry.registerCommandAndKeybindingRule({
 		id: CLOSE_EDITOR_GROUP_COMMAND_ID,
-		weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
+		weight: KeybindingWeight.WorkbenchContrib,
 		when: ContextKeyExpr.and(ActiveEditorGroupEmptyContext, MultipleEditorGroupsContext),
 		primary: KeyMod.CtrlCmd | KeyCode.KEY_W,
 		win: { primary: KeyMod.CtrlCmd | KeyCode.F4, secondary: [KeyMod.CtrlCmd | KeyCode.KEY_W] },
@@ -508,7 +526,7 @@ function registerCloseEditorCommands() {
 
 	KeybindingsRegistry.registerCommandAndKeybindingRule({
 		id: CLOSE_OTHER_EDITORS_IN_GROUP_COMMAND_ID,
-		weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
+		weight: KeybindingWeight.WorkbenchContrib,
 		when: void 0,
 		primary: void 0,
 		mac: { primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.KEY_T },
@@ -537,7 +555,7 @@ function registerCloseEditorCommands() {
 
 	KeybindingsRegistry.registerCommandAndKeybindingRule({
 		id: CLOSE_EDITORS_TO_THE_RIGHT_COMMAND_ID,
-		weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
+		weight: KeybindingWeight.WorkbenchContrib,
 		when: void 0,
 		primary: void 0,
 		handler: (accessor, resourceOrContext: URI | IEditorCommandsContext, context?: IEditorCommandsContext) => {
@@ -554,7 +572,7 @@ function registerCloseEditorCommands() {
 
 	KeybindingsRegistry.registerCommandAndKeybindingRule({
 		id: KEEP_EDITOR_COMMAND_ID,
-		weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
+		weight: KeybindingWeight.WorkbenchContrib,
 		when: void 0,
 		primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_K, KeyCode.Enter),
 		handler: (accessor, resourceOrContext: URI | IEditorCommandsContext, context?: IEditorCommandsContext) => {
@@ -571,7 +589,7 @@ function registerCloseEditorCommands() {
 
 	KeybindingsRegistry.registerCommandAndKeybindingRule({
 		id: SHOW_EDITORS_IN_GROUP,
-		weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
+		weight: KeybindingWeight.WorkbenchContrib,
 		when: void 0,
 		primary: void 0,
 		handler: (accessor, resourceOrContext: URI | IEditorCommandsContext, context?: IEditorCommandsContext) => {
diff --git a/src/vs/workbench/browser/parts/editor/editorControl.ts b/src/vs/workbench/browser/parts/editor/editorControl.ts
index f74ab3e5616..e962ca518aa 100644
--- a/src/vs/workbench/browser/parts/editor/editorControl.ts
+++ b/src/vs/workbench/browser/parts/editor/editorControl.ts
@@ -15,8 +15,7 @@ import { IPartService } from 'vs/workbench/services/part/common/partService';
 import { BaseEditor } from 'vs/workbench/browser/parts/editor/baseEditor';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IProgressService, LongRunningOperation } from 'vs/platform/progress/common/progress';
-import { toWinJsPromise } from 'vs/base/common/async';
-import { IEditorGroupView } from 'vs/workbench/browser/parts/editor/editor';
+import { IEditorGroupView, DEFAULT_EDITOR_MIN_DIMENSIONS, DEFAULT_EDITOR_MAX_DIMENSIONS } from 'vs/workbench/browser/parts/editor/editor';
 import { Event, Emitter } from 'vs/base/common/event';
 
 export interface IOpenEditorResult {
@@ -26,17 +25,24 @@ export interface IOpenEditorResult {
 
 export class EditorControl extends Disposable {
 
+	get minimumWidth() { return this._activeControl ? this._activeControl.minimumWidth : DEFAULT_EDITOR_MIN_DIMENSIONS.width; }
+	get minimumHeight() { return this._activeControl ? this._activeControl.minimumHeight : DEFAULT_EDITOR_MIN_DIMENSIONS.height; }
+	get maximumWidth() { return this._activeControl ? this._activeControl.maximumWidth : DEFAULT_EDITOR_MAX_DIMENSIONS.width; }
+	get maximumHeight() { return this._activeControl ? this._activeControl.maximumHeight : DEFAULT_EDITOR_MAX_DIMENSIONS.height; }
+
 	private _onDidFocus: Emitter<void> = this._register(new Emitter<void>());
 	get onDidFocus(): Event<void> { return this._onDidFocus.event; }
 
-	private activeControlFocusListener: IDisposable;
-
-	private dimension: Dimension;
-	private editorOperation: LongRunningOperation;
+	private _onDidSizeConstraintsChange = this._register(new Emitter<{ width: number; height: number; }>());
+	get onDidSizeConstraintsChange(): Event<{ width: number; height: number; }> { return this._onDidSizeConstraintsChange.event; }
 
 	private _activeControl: BaseEditor;
 	private controls: BaseEditor[] = [];
 
+	private activeControlDisposeables: IDisposable[] = [];
+	private dimension: Dimension;
+	private editorOperation: LongRunningOperation;
+
 	constructor(
 		private parent: HTMLElement,
 		private groupView: IEditorGroupView,
@@ -76,16 +82,13 @@ export class EditorControl extends Disposable {
 		// Create editor
 		const control = this.doCreateEditorControl(descriptor);
 
-		// Remember editor as active
-		this._activeControl = control;
+		// Set editor as active
+		this.doSetActiveControl(control);
 
 		// Show editor
 		this.parent.appendChild(control.getContainer());
 		show(control.getContainer());
 
-		// Track focus
-		this.activeControlFocusListener = control.onDidFocus(() => this._onDidFocus.fire());
-
 		// Indicate to editor that it is now visible
 		control.setVisible(true, this.groupView);
 
@@ -129,13 +132,29 @@ export class EditorControl extends Disposable {
 		return control;
 	}
 
+	private doSetActiveControl(control: BaseEditor) {
+		this._activeControl = control;
+
+		// Clear out previous active control listeners
+		this.activeControlDisposeables = dispose(this.activeControlDisposeables);
+
+		// Listen to control changes
+		if (control) {
+			this.activeControlDisposeables.push(control.onDidSizeConstraintsChange(e => this._onDidSizeConstraintsChange.fire(e)));
+			this.activeControlDisposeables.push(control.onDidFocus(() => this._onDidFocus.fire()));
+		}
+
+		// Indicate that size constraints could have changed due to new editor
+		this._onDidSizeConstraintsChange.fire();
+	}
+
 	private doSetInput(control: BaseEditor, editor: EditorInput, options: EditorOptions): TPromise<boolean> {
 
 		// If the input did not change, return early and only apply the options
 		// unless the options instruct us to force open it even if it is the same
-		const forceOpen = options && options.forceOpen;
+		const forceReload = options && options.forceReload;
 		const inputMatches = control.input && control.input.matches(editor);
-		if (inputMatches && !forceOpen) {
+		if (inputMatches && !forceReload) {
 
 			// Forward options
 			control.setOptions(options);
@@ -155,7 +174,7 @@ export class EditorControl extends Disposable {
 
 		// Call into editor control
 		const editorWillChange = !inputMatches;
-		return toWinJsPromise(control.setInput(editor, options, operation.token)).then(() => {
+		return TPromise.wrap(control.setInput(editor, options, operation.token)).then(() => {
 
 			// Focus (unless prevented or another operation is running)
 			if (operation.isCurrent()) {
@@ -196,10 +215,7 @@ export class EditorControl extends Disposable {
 		this._activeControl.setVisible(false, this.groupView);
 
 		// Clear active control
-		this._activeControl = null;
-
-		// Clear focus listener
-		this.activeControlFocusListener = dispose(this.activeControlFocusListener);
+		this.doSetActiveControl(null);
 	}
 
 	closeEditor(editor: EditorInput): void {
@@ -223,8 +239,8 @@ export class EditorControl extends Disposable {
 	}
 
 	dispose(): void {
-		this.activeControlFocusListener = dispose(this.activeControlFocusListener);
+		this.activeControlDisposeables = dispose(this.activeControlDisposeables);
 
 		super.dispose();
 	}
-}
\ No newline at end of file
+}
diff --git a/src/vs/workbench/browser/parts/editor/editorDropTarget.ts b/src/vs/workbench/browser/parts/editor/editorDropTarget.ts
index 700ed71d572..f1469891010 100644
--- a/src/vs/workbench/browser/parts/editor/editorDropTarget.ts
+++ b/src/vs/workbench/browser/parts/editor/editorDropTarget.ts
@@ -17,6 +17,7 @@ import { isMacintosh } from 'vs/base/common/platform';
 import { GroupDirection, MergeGroupMode } from 'vs/workbench/services/group/common/editorGroupsService';
 import { toDisposable } from 'vs/base/common/lifecycle';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { RunOnceScheduler } from 'vs/base/common/async';
 
 interface IDropOperation {
 	splitDirection?: GroupDirection;
@@ -25,7 +26,6 @@ interface IDropOperation {
 class DropOverlay extends Themable {
 
 	private static OVERLAY_ID = 'monaco-workbench-editor-drop-overlay';
-	private static EDGE_DISTANCE_THRESHOLD = 0.3;
 
 	private container: HTMLElement;
 	private overlay: HTMLElement;
@@ -33,6 +33,8 @@ class DropOverlay extends Themable {
 	private currentDropOperation: IDropOperation;
 	private _disposed: boolean;
 
+	private cleanupOverlayScheduler: RunOnceScheduler;
+
 	private readonly editorTransfer = LocalSelectionTransfer.getInstance<DraggedEditorIdentifier>();
 	private readonly groupTransfer = LocalSelectionTransfer.getInstance<DraggedEditorGroupIdentifier>();
 
@@ -44,6 +46,8 @@ class DropOverlay extends Themable {
 	) {
 		super(themeService);
 
+		this.cleanupOverlayScheduler = this._register(new RunOnceScheduler(() => this.dispose(), 300));
+
 		this.create();
 	}
 
@@ -58,8 +62,14 @@ class DropOverlay extends Themable {
 		this.container = document.createElement('div');
 		this.container.id = DropOverlay.OVERLAY_ID;
 		this.container.style.top = `${overlayOffsetHeight}px`;
+
+		// Parent
 		this.groupView.element.appendChild(this.container);
-		this._register(toDisposable(() => this.groupView.element.removeChild(this.container)));
+		addClass(this.groupView.element, 'dragged-over');
+		this._register(toDisposable(() => {
+			this.groupView.element.removeChild(this.container);
+			removeClass(this.groupView.element, 'dragged-over');
+		}));
 
 		// Overlay
 		this.overlay = document.createElement('div');
@@ -112,7 +122,12 @@ class DropOverlay extends Themable {
 				}
 
 				// Position overlay
-				this.positionOverlay(e.offsetX, e.offsetY);
+				this.positionOverlay(e.offsetX, e.offsetY, isDraggingGroup);
+
+				// Make sure to stop any running cleanup scheduler to remove the overlay
+				if (this.cleanupOverlayScheduler.isScheduled()) {
+					this.cleanupOverlayScheduler.cancel();
+				}
 			},
 
 			onDragLeave: e => this.dispose(),
@@ -139,9 +154,9 @@ class DropOverlay extends Themable {
 			// To protect against this issue we always destroy the overlay as soon as we detect a
 			// mouse event over it. The delay is used to guarantee we are not interfering with the
 			// actual DROP event that can also trigger a mouse over event.
-			setTimeout(() => {
-				this.dispose();
-			}, 300);
+			if (!this.cleanupOverlayScheduler.isScheduled()) {
+				this.cleanupOverlayScheduler.schedule();
+			}
 		}));
 	}
 
@@ -249,50 +264,112 @@ class DropOverlay extends Themable {
 		return (e.ctrlKey && !isMacintosh) || (e.altKey && isMacintosh);
 	}
 
-	private positionOverlay(mousePosX: number, mousePosY: number): void {
-		const groupViewWidth = this.groupView.element.clientWidth;
-		const groupViewHeight = this.groupView.element.clientHeight;
+	private positionOverlay(mousePosX: number, mousePosY: number, isDraggingGroup: boolean): void {
+		const preferSplitVertically = this.accessor.partOptions.openSideBySideDirection === 'right';
 
-		const topEdgeDistance = mousePosY;
-		const leftEdgeDistance = mousePosX;
-		const rightEdgeDistance = groupViewWidth - mousePosX;
-		const bottomEdgeDistance = groupViewHeight - mousePosY;
+		const editorControlWidth = this.groupView.element.clientWidth;
+		const editorControlHeight = this.groupView.element.clientHeight - this.getOverlayOffsetHeight();
 
-		const edgeWidthThreshold = groupViewWidth * DropOverlay.EDGE_DISTANCE_THRESHOLD;
-		const edgeHeightThreshold = groupViewHeight * DropOverlay.EDGE_DISTANCE_THRESHOLD;
-
-		// Find new split location given edge distance and thresholds
-		let splitDirection: GroupDirection;
-		switch (Math.min(topEdgeDistance, leftEdgeDistance, rightEdgeDistance, bottomEdgeDistance)) {
-			case topEdgeDistance:
-				if (topEdgeDistance < edgeHeightThreshold) {
-					splitDirection = GroupDirection.UP;
-					this.doPositionOverlay({ top: '0', left: '0', width: '100%', height: '50%' });
-				}
-				break;
-			case bottomEdgeDistance:
-				if (bottomEdgeDistance < edgeHeightThreshold) {
-					splitDirection = GroupDirection.DOWN;
-					this.doPositionOverlay({ top: '50%', left: '0', width: '100%', height: '50%' });
-				}
-				break;
-			case leftEdgeDistance:
-				if (leftEdgeDistance < edgeWidthThreshold) {
-					splitDirection = GroupDirection.LEFT;
-					this.doPositionOverlay({ top: '0', left: '0', width: '50%', height: '100%' });
-				}
-				break;
-			case rightEdgeDistance:
-				if (rightEdgeDistance < edgeWidthThreshold) {
-					splitDirection = GroupDirection.RIGHT;
-					this.doPositionOverlay({ top: '0', left: '50%', width: '50%', height: '100%' });
-				}
-				break;
+		let edgeWidthThresholdFactor: number;
+		if (isDraggingGroup) {
+			edgeWidthThresholdFactor = preferSplitVertically ? 0.3 : 0.1; // give larger threshold when dragging group depending on preferred split direction
+		} else {
+			edgeWidthThresholdFactor = 0.1; // 10% threshold to split if dragging editors
 		}
 
-		// No split, position overlay over entire group
-		if (typeof splitDirection !== 'number') {
-			this.doPositionOverlay({ top: '0', left: '0', width: '100%', height: '100%' });
+		let edgeHeightThresholdFactor: number;
+		if (isDraggingGroup) {
+			edgeHeightThresholdFactor = preferSplitVertically ? 0.1 : 0.3; // give larger threshold when dragging group depending on preferred split direction
+		} else {
+			edgeHeightThresholdFactor = 0.1; // 10% threshold to split if dragging editors
+		}
+
+		const edgeWidthThreshold = editorControlWidth * edgeWidthThresholdFactor;
+		const edgeHeightThreshold = editorControlHeight * edgeHeightThresholdFactor;
+
+		const splitWidthThreshold = editorControlWidth / 3;		// offer to split left/right at 33%
+		const splitHeightThreshold = editorControlHeight / 3;	// offer to split up/down at 33%
+
+		// Enable to debug the drop threshold square
+		// let child = this.overlay.children.item(0) as HTMLElement || this.overlay.appendChild(document.createElement('div'));
+		// child.style.backgroundColor = 'red';
+		// child.style.position = 'absolute';
+		// child.style.width = (groupViewWidth - (2 * edgeWidthThreshold)) + 'px';
+		// child.style.height = (groupViewHeight - (2 * edgeHeightThreshold)) + 'px';
+		// child.style.left = edgeWidthThreshold + 'px';
+		// child.style.top = edgeHeightThreshold + 'px';
+
+		// No split if mouse is above certain threshold in the center of the view
+		let splitDirection: GroupDirection;
+		if (
+			mousePosX > edgeWidthThreshold && mousePosX < editorControlWidth - edgeWidthThreshold &&
+			mousePosY > edgeHeightThreshold && mousePosY < editorControlHeight - edgeHeightThreshold
+		) {
+			splitDirection = void 0;
+		}
+
+		// Offer to split otherwise
+		else {
+
+			// User prefers to split vertically: offer a larger hitzone
+			// for this direction like so:
+			// ----------------------------------------------
+			// |		|		SPLIT UP		|			|
+			// | SPLIT 	|-----------------------|	SPLIT	|
+			// |		|		  MERGE			|			|
+			// | LEFT	|-----------------------|	RIGHT	|
+			// |		|		SPLIT DOWN		|			|
+			// ----------------------------------------------
+			if (preferSplitVertically) {
+				if (mousePosX < splitWidthThreshold) {
+					splitDirection = GroupDirection.LEFT;
+				} else if (mousePosX > splitWidthThreshold * 2) {
+					splitDirection = GroupDirection.RIGHT;
+				} else if (mousePosY < editorControlHeight / 2) {
+					splitDirection = GroupDirection.UP;
+				} else {
+					splitDirection = GroupDirection.DOWN;
+				}
+			}
+
+			// User prefers to split horizontally: offer a larger hitzone
+			// for this direction like so:
+			// ----------------------------------------------
+			// |				SPLIT UP					|
+			// |--------------------------------------------|
+			// |  SPLIT LEFT  |	   MERGE	|  SPLIT RIGHT  |
+			// |--------------------------------------------|
+			// |				SPLIT DOWN					|
+			// ----------------------------------------------
+			else {
+				if (mousePosY < splitHeightThreshold) {
+					splitDirection = GroupDirection.UP;
+				} else if (mousePosY > splitHeightThreshold * 2) {
+					splitDirection = GroupDirection.DOWN;
+				} else if (mousePosX < editorControlWidth / 2) {
+					splitDirection = GroupDirection.LEFT;
+				} else {
+					splitDirection = GroupDirection.RIGHT;
+				}
+			}
+		}
+
+		// Draw overlay based on split direction
+		switch (splitDirection) {
+			case GroupDirection.UP:
+				this.doPositionOverlay({ top: '0', left: '0', width: '100%', height: '50%' });
+				break;
+			case GroupDirection.DOWN:
+				this.doPositionOverlay({ top: '50%', left: '0', width: '100%', height: '50%' });
+				break;
+			case GroupDirection.LEFT:
+				this.doPositionOverlay({ top: '0', left: '0', width: '50%', height: '100%' });
+				break;
+			case GroupDirection.RIGHT:
+				this.doPositionOverlay({ top: '0', left: '50%', width: '50%', height: '100%' });
+				break;
+			default:
+				this.doPositionOverlay({ top: '0', left: '0', width: '100%', height: '100%' });
 		}
 
 		// Make sure the overlay is visible now
@@ -306,6 +383,16 @@ class DropOverlay extends Themable {
 	}
 
 	private doPositionOverlay(options: { top: string, left: string, width: string, height: string }): void {
+
+		// Container
+		const offsetHeight = this.getOverlayOffsetHeight();
+		if (offsetHeight) {
+			this.container.style.height = `calc(100% - ${offsetHeight}px)`;
+		} else {
+			this.container.style.height = '100%';
+		}
+
+		// Overlay
 		this.overlay.style.top = options.top;
 		this.overlay.style.left = options.left;
 		this.overlay.style.width = options.width;
diff --git a/src/vs/workbench/browser/parts/editor/editorGroupView.ts b/src/vs/workbench/browser/parts/editor/editorGroupView.ts
index 4823e1f0839..3d7d84cc022 100644
--- a/src/vs/workbench/browser/parts/editor/editorGroupView.ts
+++ b/src/vs/workbench/browser/parts/editor/editorGroupView.ts
@@ -9,7 +9,7 @@ import 'vs/css!./media/editorgroupview';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { EditorGroup, IEditorOpenOptions, EditorCloseEvent, ISerializedEditorGroup, isSerializedEditorGroup } from 'vs/workbench/common/editor/editorGroup';
 import { EditorInput, EditorOptions, GroupIdentifier, ConfirmResult, SideBySideEditorInput, CloseDirection, IEditorCloseEvent, EditorGroupActiveEditorDirtyContext } from 'vs/workbench/common/editor';
-import { Event, Emitter, once } from 'vs/base/common/event';
+import { Event, Emitter, once, Relay } from 'vs/base/common/event';
 import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
 import { addClass, addClasses, Dimension, trackFocus, toggleClass, removeClass, addDisposableListener, EventType, EventHelper, findParentWithClass, clearNode, isAncestor } from 'vs/base/browser/dom';
 import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
@@ -34,7 +34,7 @@ import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { RunOnceWorker } from 'vs/base/common/async';
 import { EventType as TouchEventType, GestureEvent } from 'vs/base/browser/touch';
 import { TitleControl } from 'vs/workbench/browser/parts/editor/titleControl';
-import { IEditorGroupsAccessor, IEditorGroupView, IEditorPartOptionsChangeEvent, EDITOR_TITLE_HEIGHT, EDITOR_MIN_DIMENSIONS, EDITOR_MAX_DIMENSIONS, getActiveTextEditorOptions, IEditorOpeningEvent } from 'vs/workbench/browser/parts/editor/editor';
+import { IEditorGroupsAccessor, IEditorGroupView, IEditorPartOptionsChangeEvent, getActiveTextEditorOptions, IEditorOpeningEvent } from 'vs/workbench/browser/parts/editor/editor';
 import { IUntitledEditorService } from 'vs/workbench/services/untitled/common/untitledEditorService';
 import { join } from 'vs/base/common/paths';
 import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
@@ -197,6 +197,7 @@ export class EditorGroupView extends Themable implements IEditorGroupView {
 
 		// Editor control
 		this.editorControl = this._register(this.scopedInstantiationService.createInstance(EditorControl, this.editorContainer, this));
+		this._onDidChange.input = this.editorControl.onDidSizeConstraintsChange;
 
 		// Track Focus
 		this.doTrackFocus();
@@ -336,8 +337,10 @@ export class EditorGroupView extends Themable implements IEditorGroupView {
 				target = (e as GestureEvent).initialTarget as HTMLElement;
 			}
 
-			if (findParentWithClass(target, 'monaco-action-bar', this.titleContainer)) {
-				return; // not when clicking on actions
+			if (findParentWithClass(target, 'monaco-action-bar', this.titleContainer) ||
+				findParentWithClass(target, 'monaco-breadcrumb-item', this.titleContainer)
+			) {
+				return; // not when clicking on actions or breadcrumbs
 			}
 
 			// timeout to keep focus in editor after mouse up
@@ -720,6 +723,11 @@ export class EditorGroupView extends Themable implements IEditorGroupView {
 
 	openEditor(editor: EditorInput, options?: EditorOptions): TPromise<void> {
 
+		// Guard against invalid inputs
+		if (!editor) {
+			return TPromise.as(void 0);
+		}
+
 		// Editor opening event allows for prevention
 		const event = new EditorOpeningEvent(this._group.id, editor, options);
 		this._onWillOpenEditor.fire(event);
@@ -748,17 +756,20 @@ export class EditorGroupView extends Themable implements IEditorGroupView {
 			openEditorOptions.active = true;
 		}
 
+		// Set group active unless we open inactive or preserve focus
+		// Do this before we open the editor in the group to prevent a false
+		// active editor change event before the editor is loaded
+		// (see https://github.com/Microsoft/vscode/issues/51679)
+		if (openEditorOptions.active && (!options || !options.preserveFocus)) {
+			this.accessor.activateGroup(this);
+		}
+
 		// Update model
 		this._group.openEditor(editor, openEditorOptions);
 
 		// Show editor
 		const showEditorResult = this.doShowEditor(editor, openEditorOptions.active, options);
 
-		// Set group active unless we open inactive or preserve focus
-		if (openEditorOptions.active && (!options || !options.preserveFocus)) {
-			this.accessor.activateGroup(this);
-		}
-
 		return showEditorResult;
 	}
 
@@ -1274,14 +1285,15 @@ export class EditorGroupView extends Themable implements IEditorGroupView {
 		if (activeReplacement) {
 
 			// Open replacement as active editor
-			return this.doOpenEditor(activeReplacement.replacement, activeReplacement.options).then(() => {
+			const openEditorResult = this.doOpenEditor(activeReplacement.replacement, activeReplacement.options);
 
-				// Close previous active editor
-				this.doCloseInactiveEditor(activeReplacement.editor);
+			// Close previous active editor
+			this.doCloseInactiveEditor(activeReplacement.editor);
 
-				// Forward to title control
-				this.titleAreaControl.closeEditor(activeReplacement.editor);
-			});
+			// Forward to title control
+			this.titleAreaControl.closeEditor(activeReplacement.editor);
+
+			return openEditorResult;
 		}
 
 		return TPromise.as(void 0);
@@ -1294,9 +1306,10 @@ export class EditorGroupView extends Themable implements IEditorGroupView {
 	//#region Themable
 
 	protected updateStyles(): void {
+		const isEmpty = this.isEmpty();
 
 		// Container
-		if (this.isEmpty()) {
+		if (isEmpty) {
 			this.element.style.backgroundColor = this.getColor(EDITOR_GROUP_EMPTY_BACKGROUND);
 		} else {
 			this.element.style.backgroundColor = null;
@@ -1305,10 +1318,16 @@ export class EditorGroupView extends Themable implements IEditorGroupView {
 		// Title control
 		const { showTabs } = this.accessor.partOptions;
 		const borderColor = this.getColor(EDITOR_GROUP_HEADER_TABS_BORDER) || this.getColor(contrastBorder);
+
+		if (!isEmpty && showTabs && borderColor) {
+			addClass(this.titleContainer, 'title-border-bottom');
+			this.titleContainer.style.setProperty('--title-border-bottom-color', borderColor.toString());
+		} else {
+			removeClass(this.titleContainer, 'title-border-bottom');
+			this.titleContainer.style.removeProperty('--title-border-bottom-color');
+		}
+
 		this.titleContainer.style.backgroundColor = this.getColor(showTabs ? EDITOR_GROUP_HEADER_TABS_BACKGROUND : EDITOR_GROUP_HEADER_NO_TABS_BACKGROUND);
-		this.titleContainer.style.borderBottomWidth = (borderColor && showTabs) ? '1px' : null;
-		this.titleContainer.style.borderBottomStyle = (borderColor && showTabs) ? 'solid' : null;
-		this.titleContainer.style.borderBottomColor = showTabs ? borderColor : null;
 
 		// Editor container
 		this.editorContainer.style.backgroundColor = this.getColor(editorBackground);
@@ -1320,19 +1339,27 @@ export class EditorGroupView extends Themable implements IEditorGroupView {
 
 	readonly element: HTMLElement = document.createElement('div');
 
-	readonly minimumWidth = EDITOR_MIN_DIMENSIONS.width;
-	readonly minimumHeight = EDITOR_MIN_DIMENSIONS.height;
-	readonly maximumWidth = EDITOR_MAX_DIMENSIONS.width;
-	readonly maximumHeight = EDITOR_MAX_DIMENSIONS.height;
+	get minimumWidth(): number { return this.editorControl.minimumWidth; }
+	get minimumHeight(): number { return this.editorControl.minimumHeight; }
+	get maximumWidth(): number { return this.editorControl.maximumWidth; }
+	get maximumHeight(): number { return this.editorControl.maximumHeight; }
 
-	get onDidChange() { return Event.None; } // only needed if minimum sizes ever change
+	private _onDidChange = this._register(new Relay<{ width: number; height: number; }>());
+	readonly onDidChange: Event<{ width: number; height: number; }> = this._onDidChange.event;
 
 	layout(width: number, height: number): void {
 		this.dimension = new Dimension(width, height);
 
 		// Forward to controls
-		this.titleAreaControl.layout(new Dimension(this.dimension.width, EDITOR_TITLE_HEIGHT));
-		this.editorControl.layout(new Dimension(this.dimension.width, this.dimension.height - EDITOR_TITLE_HEIGHT));
+		this.titleAreaControl.layout(new Dimension(this.dimension.width, this.titleAreaControl.getPreferredHeight()));
+		this.editorControl.layout(new Dimension(this.dimension.width, this.dimension.height - this.titleAreaControl.getPreferredHeight()));
+	}
+
+	relayout(): void {
+		if (this.dimension) {
+			const { width, height } = this.dimension;
+			this.layout(width, height);
+		}
 	}
 
 	toJSON(): ISerializedEditorGroup {
@@ -1351,6 +1378,7 @@ export class EditorGroupView extends Themable implements IEditorGroupView {
 		this._onWillDispose.fire();
 
 		this.titleAreaControl.dispose();
+		// this.editorControl = null;
 
 		super.dispose();
 	}
diff --git a/src/vs/workbench/browser/parts/editor/editorPart.ts b/src/vs/workbench/browser/parts/editor/editorPart.ts
index 339dcc7d78d..eac59365565 100644
--- a/src/vs/workbench/browser/parts/editor/editorPart.ts
+++ b/src/vs/workbench/browser/parts/editor/editorPart.ts
@@ -8,32 +8,31 @@
 import 'vs/workbench/browser/parts/editor/editor.contribution';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { Part } from 'vs/workbench/browser/part';
-import { Dimension, isAncestor, toggleClass, addClass, clearNode } from 'vs/base/browser/dom';
-import { Event, Emitter, once } from 'vs/base/common/event';
+import { Dimension, isAncestor, toggleClass, addClass, $ } from 'vs/base/browser/dom';
+import { Event, Emitter, once, Relay, anyEvent } from 'vs/base/common/event';
 import { contrastBorder, editorBackground } from 'vs/platform/theme/common/colorRegistry';
 import { GroupDirection, IAddGroupOptions, GroupsArrangement, GroupOrientation, IMergeGroupOptions, MergeGroupMode, ICopyEditorOptions, GroupsOrder, GroupChangeKind, GroupLocation, IFindGroupScope, EditorGroupLayout, GroupLayoutArgument } from 'vs/workbench/services/group/common/editorGroupsService';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { Direction, SerializableGrid, Sizing, ISerializedGrid, Orientation, ISerializedNode, GridBranchNode, isGridBranchNode, GridNode } from 'vs/base/browser/ui/grid/grid';
+import { Direction, SerializableGrid, Sizing, ISerializedGrid, Orientation, GridBranchNode, isGridBranchNode, GridNode, createSerializedGrid, Grid } from 'vs/base/browser/ui/grid/grid';
 import { GroupIdentifier, IWorkbenchEditorConfiguration } from 'vs/workbench/common/editor';
 import { values } from 'vs/base/common/map';
-import { EDITOR_GROUP_BORDER } from 'vs/workbench/common/theme';
+import { EDITOR_GROUP_BORDER, EDITOR_PANE_BACKGROUND } from 'vs/workbench/common/theme';
 import { distinct } from 'vs/base/common/arrays';
-import { IEditorGroupsAccessor, IEditorGroupView, IEditorPartOptions, getEditorPartOptions, impactsEditorPartOptions, IEditorPartOptionsChangeEvent, EDITOR_MAX_DIMENSIONS, EDITOR_MIN_DIMENSIONS, EditorGroupsServiceImpl } from 'vs/workbench/browser/parts/editor/editor';
+import { IEditorGroupsAccessor, IEditorGroupView, IEditorPartOptions, getEditorPartOptions, impactsEditorPartOptions, IEditorPartOptionsChangeEvent, EditorGroupsServiceImpl } from 'vs/workbench/browser/parts/editor/editor';
 import { EditorGroupView } from 'vs/workbench/browser/parts/editor/editorGroupView';
 import { IConfigurationService, IConfigurationChangeEvent } from 'vs/platform/configuration/common/configuration';
 import { IDisposable, dispose, toDisposable } from 'vs/base/common/lifecycle';
 import { assign } from 'vs/base/common/objects';
-import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
+import { IStorageService } from 'vs/platform/storage/common/storage';
 import { Scope } from 'vs/workbench/common/memento';
 import { ISerializedEditorGroup, isSerializedEditorGroup } from 'vs/workbench/common/editor/editorGroup';
 import { TValueCallback, TPromise } from 'vs/base/common/winjs.base';
 import { always } from 'vs/base/common/async';
-import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
-import { IWindowService } from 'vs/platform/windows/common/windows';
-import { ILifecycleService, LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
 import { EditorDropTarget } from 'vs/workbench/browser/parts/editor/editorDropTarget';
 import { localize } from 'vs/nls';
 import { Color } from 'vs/base/common/color';
+import { CenteredViewLayout } from 'vs/base/browser/ui/centered/centeredViewLayout';
+import { IView, orthogonal } from 'vs/base/browser/ui/grid/gridview';
 
 interface IEditorPartUIState {
 	serializedGrid: ISerializedGrid;
@@ -41,11 +40,54 @@ interface IEditorPartUIState {
 	mostRecentActiveGroups: GroupIdentifier[];
 }
 
+class GridWidgetView<T extends IView> implements IView {
+
+	readonly element: HTMLElement = $('.grid-view-container');
+
+	get minimumWidth(): number { return this.gridWidget ? this.gridWidget.minimumWidth : 0; }
+	get maximumWidth(): number { return this.gridWidget ? this.gridWidget.maximumWidth : Number.POSITIVE_INFINITY; }
+	get minimumHeight(): number { return this.gridWidget ? this.gridWidget.minimumHeight : 0; }
+	get maximumHeight(): number { return this.gridWidget ? this.gridWidget.maximumHeight : Number.POSITIVE_INFINITY; }
+
+	private _onDidChange = new Relay<{ width: number; height: number; }>();
+	readonly onDidChange: Event<{ width: number; height: number; }> = this._onDidChange.event;
+
+	private _gridWidget: Grid<T>;
+
+	get gridWidget(): Grid<T> {
+		return this._gridWidget;
+	}
+
+	set gridWidget(grid: Grid<T>) {
+		this.element.innerHTML = '';
+
+		if (grid) {
+			this.element.appendChild(grid.element);
+			this._onDidChange.input = grid.onDidChange;
+		} else {
+			this._onDidChange.input = Event.None;
+		}
+
+		this._gridWidget = grid;
+	}
+
+	layout(width: number, height: number): void {
+		if (this.gridWidget) {
+			this.gridWidget.layout(width, height);
+		}
+	}
+
+	dispose(): void {
+		this._onDidChange.dispose();
+	}
+}
+
 export class EditorPart extends Part implements EditorGroupsServiceImpl, IEditorGroupsAccessor {
 
 	_serviceBrand: any;
 
 	private static readonly EDITOR_PART_UI_STATE_STORAGE_KEY = 'editorpart.state';
+	private static readonly EDITOR_PART_CENTERED_VIEW_STORAGE_KEY = 'editorpart.centeredview';
 
 	//#region Events
 
@@ -64,6 +106,10 @@ export class EditorPart extends Part implements EditorGroupsServiceImpl, IEditor
 	private _onDidMoveGroup: Emitter<IEditorGroupView> = this._register(new Emitter<IEditorGroupView>());
 	get onDidMoveGroup(): Event<IEditorGroupView> { return this._onDidMoveGroup.event; }
 
+	private onDidSetGridWidget = this._register(new Emitter<{ width: number; height: number; }>());
+	private _onDidSizeConstraintsChange = this._register(new Relay<{ width: number; height: number; }>());
+	get onDidSizeConstraintsChange(): Event<{ width: number; height: number; }> { return anyEvent(this.onDidSetGridWidget.event, this._onDidSizeConstraintsChange.event); }
+
 	private _onDidPreferredSizeChange: Emitter<void> = this._register(new Emitter<void>());
 	get onDidPreferredSizeChange(): Event<void> { return this._onDidPreferredSizeChange.event; }
 
@@ -73,6 +119,8 @@ export class EditorPart extends Part implements EditorGroupsServiceImpl, IEditor
 	private _preferredSize: Dimension;
 
 	private memento: object;
+	private globalMemento: object;
+
 	private _partOptions: IEditorPartOptions;
 
 	private _activeGroup: IEditorGroupView;
@@ -80,28 +128,28 @@ export class EditorPart extends Part implements EditorGroupsServiceImpl, IEditor
 	private mostRecentActiveGroups: GroupIdentifier[] = [];
 
 	private container: HTMLElement;
+	private centeredLayoutWidget: CenteredViewLayout;
 	private gridWidget: SerializableGrid<IEditorGroupView>;
+	private gridWidgetView: GridWidgetView<IEditorGroupView>;
 
 	private _whenRestored: TPromise<void>;
 	private whenRestoredComplete: TValueCallback<void>;
 
-	private previousUIState: IEditorPartUIState;
-
 	constructor(
 		id: string,
 		private restorePreviousState: boolean,
 		@IInstantiationService private instantiationService: IInstantiationService,
 		@IThemeService themeService: IThemeService,
 		@IConfigurationService private configurationService: IConfigurationService,
-		@IStorageService private storageService: IStorageService,
-		@INotificationService private notificationService: INotificationService,
-		@IWindowService private windowService: IWindowService,
-		@ILifecycleService private lifecycleService: ILifecycleService
+		@IStorageService private storageService: IStorageService
 	) {
 		super(id, { hasTitle: false }, themeService);
 
+		this.gridWidgetView = new GridWidgetView<IEditorGroupView>();
+
 		this._partOptions = getEditorPartOptions(this.configurationService.getValue<IWorkbenchEditorConfiguration>());
 		this.memento = this.getMemento(this.storageService, Scope.WORKSPACE);
+		this.globalMemento = this.getMemento(this.storageService, Scope.GLOBAL);
 
 		this._whenRestored = new TPromise(resolve => {
 			this.whenRestoredComplete = resolve;
@@ -239,7 +287,7 @@ export class EditorPart extends Part implements EditorGroupsServiceImpl, IEditor
 
 	private doFindGroupByLocation(location: GroupLocation, source: IEditorGroupView | GroupIdentifier, wrap?: boolean): IEditorGroupView {
 		const sourceGroupView = this.assertGroupView(source);
-		const groups = this.getGroups(GroupsOrder.CREATION_TIME);
+		const groups = this.getGroups(GroupsOrder.GRID_APPEARANCE);
 		const index = groups.indexOf(sourceGroupView);
 
 		switch (location) {
@@ -294,25 +342,12 @@ export class EditorPart extends Part implements EditorGroupsServiceImpl, IEditor
 
 		// Even all group sizes
 		if (arrangement === GroupsArrangement.EVEN) {
-			this.groups.forEach(group => {
-				this.gridWidget.resetViewSize(group);
-			});
+			this.gridWidget.distributeViewSizes();
 		}
 
 		// Maximize the current active group
 		else {
-			this.groups.forEach(group => {
-				const orientation = this.gridWidget.getOrientation(group);
-
-				let newSize: number;
-				if (this.activeGroup === group) {
-					newSize = orientation === Orientation.HORIZONTAL ? EDITOR_MAX_DIMENSIONS.width : EDITOR_MAX_DIMENSIONS.height;
-				} else {
-					newSize = orientation === Orientation.HORIZONTAL ? EDITOR_MIN_DIMENSIONS.width : EDITOR_MIN_DIMENSIONS.height;
-				}
-
-				this.gridWidget.resizeView(group, newSize);
-			});
+			this.gridWidget.maximizeViewSize(this.activeGroup);
 		}
 	}
 
@@ -332,85 +367,85 @@ export class EditorPart extends Part implements EditorGroupsServiceImpl, IEditor
 
 	applyLayout(layout: EditorGroupLayout): void {
 		const gridHasFocus = isAncestor(document.activeElement, this.container);
-		const groupsInGridOrder = this.getGroups(GroupsOrder.GRID_APPEARANCE);
 
 		// Determine how many groups we need overall
-		let groupsInLayout = 0;
+		let layoutGroupsCount = 0;
 		function countGroups(groups: GroupLayoutArgument[]): void {
 			groups.forEach(group => {
 				if (Array.isArray(group.groups)) {
 					countGroups(group.groups);
 				} else {
-					groupsInLayout++;
+					layoutGroupsCount++;
 				}
 			});
 		}
 		countGroups(layout.groups);
 
 		// If we currently have too many groups, merge them into the last one
-		if (groupsInLayout < groupsInGridOrder.length) {
-			const lastGroupInLayout = groupsInGridOrder[groupsInLayout - 1];
-			groupsInGridOrder.forEach((group, index) => {
-				if (index >= groupsInLayout) {
+		let currentGroupViews = this.getGroups(GroupsOrder.GRID_APPEARANCE);
+		if (layoutGroupsCount < currentGroupViews.length) {
+			const lastGroupInLayout = currentGroupViews[layoutGroupsCount - 1];
+			currentGroupViews.forEach((group, index) => {
+				if (index >= layoutGroupsCount) {
 					this.mergeGroup(group, lastGroupInLayout);
 				}
 			});
+
+			currentGroupViews = this.getGroups(GroupsOrder.GRID_APPEARANCE);
 		}
 
-		// Apply orientation
-		if (typeof layout.orientation === 'number') {
-			this.setGroupOrientation(layout.orientation);
-		}
+		const activeGroup = this.activeGroup;
 
-		// Build layout
-		let currentGroupIndex = 0;
-		const buildLayout = (groups: IEditorGroupView[], descriptions: GroupLayoutArgument[], direction: GroupDirection) => {
-			if (descriptions.length === 0) {
-				return; // we need at least one group to layout
+		// Prepare grid descriptor to create new grid from
+		const gridDescriptor = createSerializedGrid({
+			orientation: this.toGridViewOrientation(
+				layout.orientation,
+				this.isTwoDimensionalGrid() ?
+					this.gridWidget.orientation :			// preserve original orientation for 2-dimensional grids
+					orthogonal(this.gridWidget.orientation) // otherwise flip (fix https://github.com/Microsoft/vscode/issues/52975)
+			),
+			groups: layout.groups
+		});
+
+		// Recreate gridwidget with descriptor
+		this.doCreateGridControlWithState(gridDescriptor, activeGroup.id, currentGroupViews);
+
+		// Layout
+		this.doLayout(this.dimension);
+
+		// Update container
+		this.updateContainer();
+
+		// Mark preferred size as changed
+		this.resetPreferredSize();
+
+		// Events for groups that got added
+		this.getGroups(GroupsOrder.GRID_APPEARANCE).forEach(groupView => {
+			if (currentGroupViews.indexOf(groupView) === -1) {
+				this._onDidAddGroup.fire(groupView);
 			}
+		});
 
-			// Either move existing or add a new group for each item in the description
-			let totalProportions = 0;
-			descriptions.forEach((description, index) => {
-				if (index > 0) {
-					currentGroupIndex++;
-					const existingGroup = groupsInGridOrder[currentGroupIndex];
-					if (existingGroup) {
-						groups.push(this.moveGroup(existingGroup, groups[index - 1], direction));
-					} else {
-						groups.push(this.addGroup(groups[index - 1], direction));
-					}
-				}
+		// Update labels
+		this.updateGroupLabels();
 
-				if (typeof description.size === 'number') {
-					totalProportions += description.size;
-				}
-			});
-
-			// Apply proportions if they are valid (sum() === 1)
-			if (totalProportions === 1) {
-				const totalSize = groups.map(group => this.getSize(group)).reduce(((prev, cur) => prev + cur));
-				descriptions.forEach((description, index) => {
-					this.setSize(groups[index], totalSize * description.size);
-				});
-			}
-
-			// Continue building layout if description.groups is array-type
-			descriptions.forEach((description, index) => {
-				if (Array.isArray(description.groups)) {
-					buildLayout([groups[index]], description.groups, direction === GroupDirection.RIGHT ? GroupDirection.DOWN : GroupDirection.RIGHT);
-				}
-			});
-		};
-
-		buildLayout([groupsInGridOrder[0]], layout.groups, this.orientation === GroupOrientation.HORIZONTAL ? GroupDirection.RIGHT : GroupDirection.DOWN);
-
-		// Restore Focus
+		// Restore focus as needed
 		if (gridHasFocus) {
 			this._activeGroup.focus();
 		}
 	}
 
+	private isTwoDimensionalGrid(): boolean {
+		const views = this.gridWidget.getViews();
+		if (isGridBranchNode(views)) {
+			// the grid is 2-dimensional if any children
+			// of the grid is a branch node
+			return views.children.some(child => isGridBranchNode(child));
+		}
+
+		return false;
+	}
+
 	addGroup(location: IEditorGroupView | GroupIdentifier, direction: GroupDirection, options?: IAddGroupOptions): IEditorGroupView {
 		const locationView = this.assertGroupView(location);
 
@@ -443,6 +478,9 @@ export class EditorPart extends Part implements EditorGroupsServiceImpl, IEditor
 		// Event
 		this._onDidAddGroup.fire(newGroupView);
 
+		// Update labels
+		this.updateGroupLabels();
+
 		return newGroupView;
 	}
 
@@ -506,6 +544,14 @@ export class EditorPart extends Part implements EditorGroupsServiceImpl, IEditor
 		// Mark group as new active
 		group.setActive(true);
 
+		// Maximize the group if it is currently minimized
+		if (this.gridWidget) {
+			const viewSize = this.gridWidget.getViewSize2(group);
+			if (viewSize.width === group.minimumWidth || viewSize.height === group.minimumHeight) {
+				this.arrangeGroups(GroupsArrangement.MINIMIZE_OTHERS);
+			}
+		}
+
 		// Event
 		this._onDidActiveGroupChange.fire(group);
 	}
@@ -533,6 +579,14 @@ export class EditorPart extends Part implements EditorGroupsServiceImpl, IEditor
 		}
 	}
 
+	private toGridViewOrientation(orientation: GroupOrientation, fallback?: Orientation): Orientation {
+		if (typeof orientation === 'number') {
+			return orientation === GroupOrientation.HORIZONTAL ? Orientation.HORIZONTAL : Orientation.VERTICAL;
+		}
+
+		return fallback;
+	}
+
 	removeGroup(group: IEditorGroupView | GroupIdentifier): void {
 		const groupView = this.assertGroupView(group);
 		if (this.groupViews.size === 1) {
@@ -583,12 +637,8 @@ export class EditorPart extends Part implements EditorGroupsServiceImpl, IEditor
 			this._activeGroup.focus();
 		}
 
-		// Update labels: since our labels are created using the index of the
-		// group, removing a group might produce gaps. So we iterate over all
-		// groups and reassign the label based on the index.
-		this.getGroups(GroupsOrder.CREATION_TIME).forEach((group, index) => {
-			group.setLabel(this.getGroupLabel(index + 1));
-		});
+		// Update labels
+		this.updateGroupLabels();
 
 		// Update container
 		this.updateContainer();
@@ -600,10 +650,6 @@ export class EditorPart extends Part implements EditorGroupsServiceImpl, IEditor
 		this._onDidRemoveGroup.fire(groupView);
 	}
 
-	private getGroupLabel(index: number): string {
-		return localize('groupLabel', "Group {0}", index);
-	}
-
 	moveGroup(group: IEditorGroupView | GroupIdentifier, location: IEditorGroupView | GroupIdentifier, direction: GroupDirection): IEditorGroupView {
 		const sourceView = this.assertGroupView(group);
 		const targetView = this.assertGroupView(location);
@@ -654,7 +700,7 @@ export class EditorPart extends Part implements EditorGroupsServiceImpl, IEditor
 		// Move/Copy editors over into target
 		let index = (options && typeof options.index === 'number') ? options.index : targetView.count;
 		sourceView.editors.forEach(editor => {
-			const inactive = !sourceView.isActive(editor);
+			const inactive = !sourceView.isActive(editor) || this._activeGroup !== sourceView;
 			const copyOptions: ICopyEditorOptions = { index, inactive, preserveFocus: inactive };
 
 			if (options && options.mode === MergeGroupMode.COPY_EDITORS) {
@@ -690,6 +736,11 @@ export class EditorPart extends Part implements EditorGroupsServiceImpl, IEditor
 
 	//#region Part
 
+	get minimumWidth(): number { return this.centeredLayoutWidget.minimumWidth; }
+	get maximumWidth(): number { return this.centeredLayoutWidget.maximumWidth; }
+	get minimumHeight(): number { return this.centeredLayoutWidget.minimumHeight; }
+	get maximumHeight(): number { return this.centeredLayoutWidget.maximumHeight; }
+
 	get preferredSize(): Dimension {
 		if (!this._preferredSize) {
 			this._preferredSize = new Dimension(this.gridWidget.minimumWidth, this.gridWidget.minimumHeight);
@@ -707,14 +758,16 @@ export class EditorPart extends Part implements EditorGroupsServiceImpl, IEditor
 		this._onDidPreferredSizeChange.fire();
 	}
 
-	private getGridSeparatorBorder(): Color {
+	private get gridSeparatorBorder(): Color {
 		return this.theme.getColor(EDITOR_GROUP_BORDER) || this.theme.getColor(contrastBorder) || Color.transparent;
 	}
 
 	protected updateStyles(): void {
 		this.container.style.backgroundColor = this.getColor(editorBackground);
 
-		this.gridWidget.style({ separatorBorder: this.getGridSeparatorBorder() });
+		const separatorBorderStyle = { separatorBorder: this.gridSeparatorBorder, background: this.theme.getColor(EDITOR_PANE_BACKGROUND) || Color.transparent };
+		this.gridWidget.style(separatorBorderStyle);
+		this.centeredLayoutWidget.styles(separatorBorderStyle);
 	}
 
 	createContentArea(parent: HTMLElement): HTMLElement {
@@ -724,8 +777,10 @@ export class EditorPart extends Part implements EditorGroupsServiceImpl, IEditor
 		addClass(this.container, 'content');
 		parent.appendChild(this.container);
 
-		// Grid control
-		this.doCreateGridControl(this.container);
+		// Grid control with center layout
+		this.doCreateGridControl();
+
+		this.centeredLayoutWidget = this._register(new CenteredViewLayout(this.container, this.gridWidgetView, this.globalMemento[EditorPart.EDITOR_PART_CENTERED_VIEW_STORAGE_KEY]));
 
 		// Drop support
 		this._register(this.instantiationService.createInstance(EditorDropTarget, this, this.container));
@@ -733,17 +788,25 @@ export class EditorPart extends Part implements EditorGroupsServiceImpl, IEditor
 		return this.container;
 	}
 
-	private doCreateGridControl(container: HTMLElement): void {
+	centerLayout(active: boolean): void {
+		this.centeredLayoutWidget.activate(active);
+	}
+
+	isLayoutCentered(): boolean {
+		return this.centeredLayoutWidget.isActive();
+	}
+
+	private doCreateGridControl(): void {
 
 		// Grid Widget (with previous UI state)
 		if (this.restorePreviousState) {
-			this.doCreateGridControlWithPreviousState(container);
+			this.doCreateGridControlWithPreviousState();
 		}
 
 		// Grid Widget (no previous UI state or failed to restore)
 		if (!this.gridWidget) {
 			const initialGroup = this.doCreateGroupView();
-			this.gridWidget = this._register(new SerializableGrid(container, initialGroup));
+			this.doSetGridWidget(new SerializableGrid(initialGroup));
 
 			// Ensure a group is active
 			this.doSetGroupActive(initialGroup);
@@ -756,200 +819,107 @@ export class EditorPart extends Part implements EditorGroupsServiceImpl, IEditor
 		this.updateContainer();
 	}
 
-	private doCreateGridControlWithPreviousState(container: HTMLElement): void {
-		const uiState = this.doGetPreviousState();
+	private doCreateGridControlWithPreviousState(): void {
+		const uiState = this.memento[EditorPart.EDITOR_PART_UI_STATE_STORAGE_KEY] as IEditorPartUIState;
 		if (uiState && uiState.serializedGrid) {
-			try {
-				this.previousUIState = uiState;
 
-				// MRU
-				this.mostRecentActiveGroups = uiState.mostRecentActiveGroups;
+			// MRU
+			this.mostRecentActiveGroups = uiState.mostRecentActiveGroups;
 
-				// Grid Widget
-				this.gridWidget = this._register(SerializableGrid.deserialize(container, uiState.serializedGrid, {
-					fromJSON: (serializedEditorGroup: ISerializedEditorGroup) => {
-						const groupView = this.doCreateGroupView(serializedEditorGroup);
-						if (groupView.id === uiState.activeGroup) {
-							this.doSetGroupActive(groupView);
-						}
+			// Grid Widget
+			this.doCreateGridControlWithState(uiState.serializedGrid, uiState.activeGroup);
 
-						return groupView;
-					}
-				}, { styles: { separatorBorder: this.getGridSeparatorBorder() } }));
-
-				// Ensure last active group has focus
-				this._activeGroup.focus();
-			} catch (error) {
-				if (this.gridWidget) {
-					this.gridWidget.dispose();
-					this.gridWidget = void 0;
-				}
-
-				clearNode(container);
-				this.groupViews.forEach(group => group.dispose());
-				this.groupViews.clear();
-				this._activeGroup = void 0;
-				this.mostRecentActiveGroups = [];
-
-				this.gridError(error); // TODO@ben remove this safe guard once the grid is stable
-			}
+			// Ensure last active group has focus
+			this._activeGroup.focus();
 		}
 	}
 
-	private doGetPreviousState(): IEditorPartUIState {
-		const legacyState = this.doGetPreviousLegacyState();
-		if (legacyState) {
-			return legacyState; // TODO@ben remove after a while
+	private doCreateGridControlWithState(serializedGrid: ISerializedGrid, activeGroupId: GroupIdentifier, editorGroupViewsToReuse?: IEditorGroupView[]): void {
+
+		// Determine group views to reuse if any
+		let reuseGroupViews: IEditorGroupView[];
+		if (editorGroupViewsToReuse) {
+			reuseGroupViews = editorGroupViewsToReuse.slice(0); // do not modify original array
+		} else {
+			reuseGroupViews = [];
 		}
 
-		return this.memento[EditorPart.EDITOR_PART_UI_STATE_STORAGE_KEY] as IEditorPartUIState;
-	}
-
-	private doGetPreviousLegacyState(): IEditorPartUIState {
-		const LEGACY_EDITOR_PART_UI_STATE_STORAGE_KEY = 'editorpart.uiState';
-		const LEGACY_STACKS_MODEL_STORAGE_KEY = 'editorStacks.model';
-
-		interface ILegacyEditorPartUIState {
-			ratio: number[];
-			groupOrientation: 'vertical' | 'horizontal';
-		}
-
-		interface ISerializedLegacyEditorStacksModel {
-			groups: ISerializedEditorGroup[];
-			active: number;
-		}
-
-		let legacyUIState: ISerializedLegacyEditorStacksModel;
-		const legacyUIStateRaw = this.storageService.get(LEGACY_STACKS_MODEL_STORAGE_KEY, StorageScope.WORKSPACE);
-		if (legacyUIStateRaw) {
-			try {
-				legacyUIState = JSON.parse(legacyUIStateRaw);
-			} catch (error) { /* ignore */ }
-		}
-
-		if (legacyUIState) {
-			this.storageService.remove(LEGACY_STACKS_MODEL_STORAGE_KEY, StorageScope.WORKSPACE);
-		}
-
-		const legacyPartState = this.memento[LEGACY_EDITOR_PART_UI_STATE_STORAGE_KEY] as ILegacyEditorPartUIState;
-		if (legacyPartState) {
-			delete this.memento[LEGACY_EDITOR_PART_UI_STATE_STORAGE_KEY];
-		}
-
-		if (legacyUIState && Array.isArray(legacyUIState.groups) && legacyUIState.groups.length > 0) {
-			const splitHorizontally = legacyPartState && legacyPartState.groupOrientation === 'horizontal';
-
-			const legacyState: IEditorPartUIState = Object.create(null);
-
-			const positionOneGroup = legacyUIState.groups[0];
-			const positionTwoGroup = legacyUIState.groups[1];
-			const positionThreeGroup = legacyUIState.groups[2];
-
-			legacyState.activeGroup = legacyUIState.active;
-			legacyState.mostRecentActiveGroups = [legacyUIState.active];
-
-			if (positionTwoGroup || positionThreeGroup) {
-				if (!positionThreeGroup) {
-					legacyState.mostRecentActiveGroups.push(legacyState.activeGroup === 0 ? 1 : 0);
+		// Create new
+		const gridWidget = SerializableGrid.deserialize(serializedGrid, {
+			fromJSON: (serializedEditorGroup: ISerializedEditorGroup) => {
+				let groupView: IEditorGroupView;
+				if (reuseGroupViews.length > 0) {
+					groupView = reuseGroupViews.shift();
 				} else {
-					if (legacyState.activeGroup === 0) {
-						legacyState.mostRecentActiveGroups.push(1, 2);
-					} else if (legacyState.activeGroup === 1) {
-						legacyState.mostRecentActiveGroups.push(0, 2);
-					} else {
-						legacyState.mostRecentActiveGroups.push(0, 1);
-					}
-				}
-			}
-
-			const toNode = function (group: ISerializedEditorGroup, size: number): ISerializedNode {
-				return {
-					data: group,
-					size,
-					type: 'leaf'
-				};
-			};
-
-			const baseSize = 1200; // just some number because layout() was not called yet, but we only need the proportions
-
-			// No split editor
-			if (!positionTwoGroup) {
-				legacyState.serializedGrid = {
-					width: baseSize,
-					height: baseSize,
-					orientation: splitHorizontally ? Orientation.VERTICAL : Orientation.HORIZONTAL,
-					root: toNode(positionOneGroup, baseSize)
-				};
-			}
-
-			// Split editor (2 or 3 columns)
-			else {
-				const children: ISerializedNode[] = [];
-
-				const size = positionThreeGroup ? baseSize / 3 : baseSize / 2;
-
-				children.push(toNode(positionOneGroup, size));
-				children.push(toNode(positionTwoGroup, size));
-
-				if (positionThreeGroup) {
-					children.push(toNode(positionThreeGroup, size));
+					groupView = this.doCreateGroupView(serializedEditorGroup);
 				}
 
-				legacyState.serializedGrid = {
-					width: baseSize,
-					height: baseSize,
-					orientation: splitHorizontally ? Orientation.VERTICAL : Orientation.HORIZONTAL,
-					root: {
-						data: children,
-						size: baseSize,
-						type: 'branch'
-					}
-				};
-			}
+				if (groupView.id === activeGroupId) {
+					this.doSetGroupActive(groupView);
+				}
 
-			return legacyState;
+				return groupView;
+			}
+		}, { styles: { separatorBorder: this.gridSeparatorBorder } });
+
+		// Set it
+		this.doSetGridWidget(gridWidget);
+	}
+
+	private doSetGridWidget(gridWidget?: SerializableGrid<IEditorGroupView>): void {
+		if (this.gridWidget) {
+			this.gridWidget.dispose();
 		}
 
-		return void 0;
+		this.gridWidget = gridWidget;
+		this.gridWidgetView.gridWidget = gridWidget;
+
+		if (gridWidget) {
+			this._onDidSizeConstraintsChange.input = gridWidget.onDidChange;
+		}
+
+		this.onDidSetGridWidget.fire();
 	}
 
 	private updateContainer(): void {
 		toggleClass(this.container, 'empty', this.isEmpty());
 	}
 
-	private isEmpty(): boolean {
-		return this.groupViews.size === 1 && this._activeGroup.isEmpty();
+	private updateGroupLabels(): void {
+
+		// Since our labels are created using the index of the
+		// group, adding/removing a group might produce gaps.
+		// So we iterate over all groups and reassign the label
+		// based on the index.
+		this.getGroups(GroupsOrder.GRID_APPEARANCE).forEach((group, index) => {
+			group.setLabel(this.getGroupLabel(index + 1));
+		});
 	}
 
-	// TODO@ben this should be removed once the gridwidget is stable
-	private gridError(error: Error): void {
-		console.error(error);
+	private getGroupLabel(index: number): string {
+		return localize('groupLabel', "Group {0}", index);
+	}
 
-		if (this.previousUIState) {
-			console.error('Serialized Grid State: ', this.previousUIState);
-		}
-
-		this.lifecycleService.when(LifecyclePhase.Running).then(() => {
-			this.notificationService.prompt(Severity.Error, `Grid Issue: ${error}. Please report this error stack with reproducible steps.`, [{ label: 'Open DevTools', run: () => this.windowService.openDevTools() }]);
-		});
+	private isEmpty(): boolean {
+		return this.groupViews.size === 1 && this._activeGroup.isEmpty();
 	}
 
 	layout(dimension: Dimension): Dimension[] {
 		const sizes = super.layout(dimension);
 
-		this.dimension = sizes[1];
+		this.doLayout(sizes[1]);
+
+		return sizes;
+	}
+
+	private doLayout(dimension: Dimension): void {
+		this.dimension = dimension;
 
 		// Layout Grid
-		try {
-			this.gridWidget.layout(this.dimension.width, this.dimension.height);
-		} catch (error) {
-			this.gridError(error);
-		}
+		this.centeredLayoutWidget.layout(this.dimension.width, this.dimension.height);
 
 		// Event
 		this._onDidLayout.fire(dimension);
-
-		return sizes;
 	}
 
 	shutdown(): void {
@@ -969,6 +939,9 @@ export class EditorPart extends Part implements EditorGroupsServiceImpl, IEditor
 			}
 		}
 
+		// Persist centered view state
+		this.globalMemento[EditorPart.EDITOR_PART_CENTERED_VIEW_STORAGE_KEY] = this.centeredLayoutWidget.state;
+
 		// Forward to all groups
 		this.groupViews.forEach(group => group.shutdown());
 
@@ -981,8 +954,13 @@ export class EditorPart extends Part implements EditorGroupsServiceImpl, IEditor
 		this.groupViews.forEach(group => group.dispose());
 		this.groupViews.clear();
 
+		// Grid widget
+		if (this.gridWidget) {
+			this.gridWidget.dispose();
+		}
+
 		super.dispose();
 	}
 
 	//#endregion
-}
\ No newline at end of file
+}
diff --git a/src/vs/workbench/browser/parts/editor/editorPicker.ts b/src/vs/workbench/browser/parts/editor/editorPicker.ts
index a1b7a48374d..a5fe420b742 100644
--- a/src/vs/workbench/browser/parts/editor/editorPicker.ts
+++ b/src/vs/workbench/browser/parts/editor/editorPicker.ts
@@ -7,7 +7,7 @@
 import 'vs/css!./media/editorpicker';
 import { TPromise } from 'vs/base/common/winjs.base';
 import * as nls from 'vs/nls';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { IIconLabelValueOptions } from 'vs/base/browser/ui/iconLabel/iconLabel';
 import { IAutoFocus, Mode, IEntryRunContext, IQuickNavigateConfiguration, IModel } from 'vs/base/parts/quickopen/common/quickOpen';
 import { QuickOpenModel, QuickOpenEntry, QuickOpenEntryGroup, QuickOpenItemAccessor } from 'vs/base/parts/quickopen/browser/quickOpenModel';
@@ -20,6 +20,7 @@ import { IEditorGroupsService, IEditorGroup, EditorsOrder, GroupsOrder } from 'v
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { EditorInput, toResource } from 'vs/workbench/common/editor';
 import { compareItemsByScore, scoreItem, ScorerCache, prepareQuery } from 'vs/base/parts/quickopen/common/quickOpenScorer';
+import { CancellationToken } from 'vs/base/common/cancellation';
 
 export class EditorPickerEntry extends QuickOpenEntryGroup {
 
@@ -32,38 +33,38 @@ export class EditorPickerEntry extends QuickOpenEntryGroup {
 		super();
 	}
 
-	public getLabelOptions(): IIconLabelValueOptions {
+	getLabelOptions(): IIconLabelValueOptions {
 		return {
 			extraClasses: getIconClasses(this.modelService, this.modeService, this.getResource()),
 			italic: !this._group.isPinned(this.editor)
 		};
 	}
 
-	public getLabel(): string {
+	getLabel(): string {
 		return this.editor.getName();
 	}
 
-	public getIcon(): string {
+	getIcon(): string {
 		return this.editor.isDirty() ? 'dirty' : '';
 	}
 
-	public get group(): IEditorGroup {
+	get group(): IEditorGroup {
 		return this._group;
 	}
 
-	public getResource(): URI {
+	getResource(): URI {
 		return toResource(this.editor, { supportSideBySide: true });
 	}
 
-	public getAriaLabel(): string {
+	getAriaLabel(): string {
 		return nls.localize('entryAriaLabel', "{0}, editor group picker", this.getLabel());
 	}
 
-	public getDescription(): string {
+	getDescription(): string {
 		return this.editor.getDescription();
 	}
 
-	public run(mode: Mode, context: IEntryRunContext): boolean {
+	run(mode: Mode, context: IEntryRunContext): boolean {
 		if (mode === Mode.OPEN) {
 			return this.runOpen(context);
 		}
@@ -91,7 +92,7 @@ export abstract class BaseEditorPicker extends QuickOpenHandler {
 		this.scorerCache = Object.create(null);
 	}
 
-	public getResults(searchValue: string): TPromise<QuickOpenModel> {
+	getResults(searchValue: string, token: CancellationToken): TPromise<QuickOpenModel> {
 		const editorEntries = this.getEditorEntries();
 		if (!editorEntries.length) {
 			return TPromise.as(null);
@@ -117,7 +118,7 @@ export abstract class BaseEditorPicker extends QuickOpenHandler {
 
 		// Sorting
 		if (query.value) {
-			const groups = this.editorGroupService.getGroups(GroupsOrder.CREATION_TIME);
+			const groups = this.editorGroupService.getGroups(GroupsOrder.GRID_APPEARANCE);
 			entries.sort((e1, e2) => {
 				if (e1.group !== e2.group) {
 					return groups.indexOf(e1.group) - groups.indexOf(e2.group); // older groups first
@@ -142,7 +143,7 @@ export abstract class BaseEditorPicker extends QuickOpenHandler {
 		return TPromise.as(new QuickOpenModel(entries));
 	}
 
-	public onClose(canceled: boolean): void {
+	onClose(canceled: boolean): void {
 		this.scorerCache = Object.create(null);
 	}
 
@@ -151,7 +152,7 @@ export abstract class BaseEditorPicker extends QuickOpenHandler {
 
 export class ActiveEditorGroupPicker extends BaseEditorPicker {
 
-	public static readonly ID = 'workbench.picker.activeEditors';
+	static readonly ID = 'workbench.picker.activeEditors';
 
 	protected getEditorEntries(): EditorPickerEntry[] {
 		return this.group.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE).map((editor, index) => this.instantiationService.createInstance(EditorPickerEntry, editor, this.group));
@@ -161,7 +162,7 @@ export class ActiveEditorGroupPicker extends BaseEditorPicker {
 		return this.editorGroupService.activeGroup;
 	}
 
-	public getEmptyLabel(searchString: string): string {
+	getEmptyLabel(searchString: string): string {
 		if (searchString) {
 			return nls.localize('noResultsFoundInGroup', "No matching opened editor found in group");
 		}
@@ -169,7 +170,7 @@ export class ActiveEditorGroupPicker extends BaseEditorPicker {
 		return nls.localize('noOpenedEditors', "List of opened editors is currently empty in group");
 	}
 
-	public getAutoFocus(searchValue: string, context: { model: IModel<QuickOpenEntry>, quickNavigateConfiguration?: IQuickNavigateConfiguration }): IAutoFocus {
+	getAutoFocus(searchValue: string, context: { model: IModel<QuickOpenEntry>, quickNavigateConfiguration?: IQuickNavigateConfiguration }): IAutoFocus {
 		if (searchValue || !context.quickNavigateConfiguration) {
 			return {
 				autoFocusFirstEntry: true
@@ -201,12 +202,12 @@ export class ActiveEditorGroupPicker extends BaseEditorPicker {
 
 export class AllEditorsPicker extends BaseEditorPicker {
 
-	public static readonly ID = 'workbench.picker.editors';
+	static readonly ID = 'workbench.picker.editors';
 
 	protected getEditorEntries(): EditorPickerEntry[] {
 		const entries: EditorPickerEntry[] = [];
 
-		this.editorGroupService.getGroups(GroupsOrder.CREATION_TIME).forEach(group => {
+		this.editorGroupService.getGroups(GroupsOrder.GRID_APPEARANCE).forEach(group => {
 			group.editors.forEach(editor => {
 				entries.push(this.instantiationService.createInstance(EditorPickerEntry, editor, group));
 			});
@@ -215,7 +216,7 @@ export class AllEditorsPicker extends BaseEditorPicker {
 		return entries;
 	}
 
-	public getEmptyLabel(searchString: string): string {
+	getEmptyLabel(searchString: string): string {
 		if (searchString) {
 			return nls.localize('noResultsFound', "No matching opened editor found");
 		}
@@ -223,7 +224,7 @@ export class AllEditorsPicker extends BaseEditorPicker {
 		return nls.localize('noOpenedEditorsAllGroups', "List of opened editors is currently empty");
 	}
 
-	public getAutoFocus(searchValue: string, context: { model: IModel<QuickOpenEntry>, quickNavigateConfiguration?: IQuickNavigateConfiguration }): IAutoFocus {
+	getAutoFocus(searchValue: string, context: { model: IModel<QuickOpenEntry>, quickNavigateConfiguration?: IQuickNavigateConfiguration }): IAutoFocus {
 		if (searchValue) {
 			return {
 				autoFocusFirstEntry: true
diff --git a/src/vs/workbench/browser/parts/editor/editorStatus.ts b/src/vs/workbench/browser/parts/editor/editorStatus.ts
index 525764c38fa..63896f3611d 100644
--- a/src/vs/workbench/browser/parts/editor/editorStatus.ts
+++ b/src/vs/workbench/browser/parts/editor/editorStatus.ts
@@ -12,8 +12,7 @@ import { $, append, runAtThisOrScheduleAtNextAnimationFrame, addDisposableListen
 import * as strings from 'vs/base/common/strings';
 import * as paths from 'vs/base/common/paths';
 import * as types from 'vs/base/common/types';
-import uri from 'vs/base/common/uri';
-import * as errors from 'vs/base/common/errors';
+import { URI as uri } from 'vs/base/common/uri';
 import { IStatusbarItem } from 'vs/workbench/browser/parts/statusbar/statusbar';
 import { Action } from 'vs/base/common/actions';
 import { language, LANGUAGE_DEFAULT, AccessibilitySupport } from 'vs/base/common/platform';
@@ -31,7 +30,7 @@ import { IndentUsingSpaces, IndentUsingTabs, DetectIndentation, IndentationToSpa
 import { BaseBinaryResourceEditor } from 'vs/workbench/browser/parts/editor/binaryEditor';
 import { BinaryResourceDiffEditor } from 'vs/workbench/browser/parts/editor/binaryDiffEditor';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { IQuickOpenService, IPickOpenEntry, IFilePickOpenEntry } from 'vs/platform/quickOpen/common/quickOpen';
+import { IQuickOpenService } from 'vs/platform/quickOpen/common/quickOpen';
 import { IWorkspaceConfigurationService } from 'vs/workbench/services/configuration/common/configuration';
 import { SUPPORTED_ENCODINGS, IFileService, FILES_ASSOCIATIONS_CONFIG } from 'vs/platform/files/common/files';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
@@ -58,15 +57,18 @@ import { Schemas } from 'vs/base/common/network';
 import { IAnchor } from 'vs/base/browser/ui/contextview/contextview';
 import { Themable } from 'vs/workbench/common/theme';
 import { IPreferencesService } from 'vs/workbench/services/preferences/common/preferences';
+import { IQuickInputService, IQuickPickItem, QuickPickInput } from 'vs/platform/quickinput/common/quickInput';
+import { getIconClasses } from 'vs/workbench/browser/labels';
+import { timeout } from 'vs/base/common/async';
 
 class SideBySideEditorEncodingSupport implements IEncodingSupport {
 	constructor(private master: IEncodingSupport, private details: IEncodingSupport) { }
 
-	public getEncoding(): string {
+	getEncoding(): string {
 		return this.master.getEncoding(); // always report from modified (right hand) side
 	}
 
-	public setEncoding(encoding: string, mode: EncodingMode): void {
+	setEncoding(encoding: string, mode: EncodingMode): void {
 		[this.master, this.details].forEach(s => s.setEncoding(encoding, mode));
 	}
 }
@@ -128,7 +130,7 @@ class StateChange {
 		this.metadata = false;
 	}
 
-	public combine(other: StateChange) {
+	combine(other: StateChange) {
 		this.indentation = this.indentation || other.indentation;
 		this.selectionStatus = this.selectionStatus || other.selectionStatus;
 		this.mode = this.mode || other.mode;
@@ -153,28 +155,28 @@ interface StateDelta {
 
 class State {
 	private _selectionStatus: string;
-	public get selectionStatus(): string { return this._selectionStatus; }
+	get selectionStatus(): string { return this._selectionStatus; }
 
 	private _mode: string;
-	public get mode(): string { return this._mode; }
+	get mode(): string { return this._mode; }
 
 	private _encoding: string;
-	public get encoding(): string { return this._encoding; }
+	get encoding(): string { return this._encoding; }
 
 	private _EOL: string;
-	public get EOL(): string { return this._EOL; }
+	get EOL(): string { return this._EOL; }
 
 	private _indentation: string;
-	public get indentation(): string { return this._indentation; }
+	get indentation(): string { return this._indentation; }
 
 	private _tabFocusMode: boolean;
-	public get tabFocusMode(): boolean { return this._tabFocusMode; }
+	get tabFocusMode(): boolean { return this._tabFocusMode; }
 
 	private _screenReaderMode: boolean;
-	public get screenReaderMode(): boolean { return this._screenReaderMode; }
+	get screenReaderMode(): boolean { return this._screenReaderMode; }
 
 	private _metadata: string;
-	public get metadata(): string { return this._metadata; }
+	get metadata(): string { return this._metadata; }
 
 	constructor() {
 		this._selectionStatus = null;
@@ -186,7 +188,7 @@ class State {
 		this._metadata = null;
 	}
 
-	public update(update: StateDelta): StateChange {
+	update(update: StateDelta): StateChange {
 		const e = new StateChange();
 		let somethingChanged = false;
 
@@ -277,7 +279,6 @@ function hide(el: HTMLElement): void {
 }
 
 export class EditorStatus implements IStatusbarItem {
-
 	private state: State;
 	private element: HTMLElement;
 	private tabFocusModeElement: HTMLElement;
@@ -308,7 +309,7 @@ export class EditorStatus implements IStatusbarItem {
 		this.state = new State();
 	}
 
-	public render(container: HTMLElement): IDisposable {
+	render(container: HTMLElement): IDisposable {
 		this.element = append(container, $('.editor-statusbar-item'));
 
 		this.tabFocusModeElement = append(this.element, $('a.editor-status-tabfocusmode.status-bar-info'));
@@ -492,13 +493,13 @@ export class EditorStatus implements IStatusbarItem {
 	private onModeClick(): void {
 		const action = this.instantiationService.createInstance(ChangeModeAction, ChangeModeAction.ID, ChangeModeAction.LABEL);
 
-		action.run().done(null, errors.onUnexpectedError);
+		action.run();
 		action.dispose();
 	}
 
 	private onIndentationClick(): void {
 		const action = this.instantiationService.createInstance(ChangeIndentationAction, ChangeIndentationAction.ID, ChangeIndentationAction.LABEL);
-		action.run().done(null, errors.onUnexpectedError);
+		action.run();
 		action.dispose();
 	}
 
@@ -524,14 +525,14 @@ export class EditorStatus implements IStatusbarItem {
 	private onEOLClick(): void {
 		const action = this.instantiationService.createInstance(ChangeEOLAction, ChangeEOLAction.ID, ChangeEOLAction.LABEL);
 
-		action.run().done(null, errors.onUnexpectedError);
+		action.run();
 		action.dispose();
 	}
 
 	private onEncodingClick(): void {
 		const action = this.instantiationService.createInstance(ChangeEncodingAction, ChangeEncodingAction.ID, ChangeEncodingAction.LABEL);
 
-		action.run().done(null, errors.onUnexpectedError);
+		action.run();
 		action.dispose();
 	}
 
@@ -824,8 +825,8 @@ export class ShowLanguageExtensionsAction extends Action {
 
 export class ChangeModeAction extends Action {
 
-	public static readonly ID = 'workbench.action.editor.changeLanguageMode';
-	public static readonly LABEL = nls.localize('changeMode', "Change Language Mode");
+	static readonly ID = 'workbench.action.editor.changeLanguageMode';
+	static readonly LABEL = nls.localize('changeMode', "Change Language Mode");
 
 	constructor(
 		actionId: string,
@@ -834,7 +835,7 @@ export class ChangeModeAction extends Action {
 		@IModelService private modelService: IModelService,
 		@IEditorService private editorService: IEditorService,
 		@IWorkspaceConfigurationService private configurationService: IWorkspaceConfigurationService,
-		@IQuickOpenService private quickOpenService: IQuickOpenService,
+		@IQuickInputService private quickInputService: IQuickInputService,
 		@IPreferencesService private preferencesService: IPreferencesService,
 		@IInstantiationService private instantiationService: IInstantiationService,
 		@IUntitledEditorService private untitledEditorService: IUntitledEditorService
@@ -842,10 +843,10 @@ export class ChangeModeAction extends Action {
 		super(actionId, actionLabel);
 	}
 
-	public run(): TPromise<any> {
+	run(): TPromise<any> {
 		const activeTextEditorWidget = getCodeEditor(this.editorService.activeTextEditorWidget);
 		if (!activeTextEditorWidget) {
-			return this.quickOpenService.pick([{ label: nls.localize('noEditor', "No text editor active at this time") }]);
+			return this.quickInputService.pick([{ label: nls.localize('noEditor', "No text editor active at this time") }]);
 		}
 
 		const textModel = activeTextEditorWidget.getModel();
@@ -866,7 +867,7 @@ export class ChangeModeAction extends Action {
 
 		// All languages are valid picks
 		const languages = this.modeService.getRegisteredLanguageNames();
-		const picks: IPickOpenEntry[] = languages.sort().map((lang, index) => {
+		const picks: QuickPickInput[] = languages.sort().map((lang, index) => {
 			let description: string;
 			if (currentModeId === lang) {
 				description = nls.localize('languageDescription', "({0}) - Configured Language", this.modeService.getModeIdForLanguageName(lang.toLowerCase()));
@@ -886,20 +887,20 @@ export class ChangeModeAction extends Action {
 				}
 			}
 
-			return <IFilePickOpenEntry>{
+			return <IQuickPickItem>{
 				label: lang,
-				resource: fakeResource,
+				iconClasses: getIconClasses(this.modelService, this.modeService, fakeResource),
 				description
 			};
 		});
 
 		if (hasLanguageSupport) {
-			picks[0].separator = { border: true, label: nls.localize('languagesPicks', "languages (identifier)") };
+			picks.unshift({ type: 'separator', label: nls.localize('languagesPicks', "languages (identifier)") });
 		}
 
 		// Offer action to configure via settings
-		let configureModeAssociations: IPickOpenEntry;
-		let configureModeSettings: IPickOpenEntry;
+		let configureModeAssociations: IQuickPickItem;
+		let configureModeSettings: IQuickPickItem;
 		let galleryAction: Action;
 		if (hasLanguageSupport) {
 			const ext = paths.extname(resource.fsPath) || paths.basename(resource.fsPath);
@@ -916,7 +917,7 @@ export class ChangeModeAction extends Action {
 		}
 
 		// Offer to "Auto Detect"
-		const autoDetectMode: IPickOpenEntry = {
+		const autoDetectMode: IQuickPickItem = {
 			label: nls.localize('autoDetect', "Auto Detect")
 		};
 
@@ -924,7 +925,7 @@ export class ChangeModeAction extends Action {
 			picks.unshift(autoDetectMode);
 		}
 
-		return this.quickOpenService.pick(picks, { placeHolder: nls.localize('pickLanguage', "Select Language Mode"), matchOnDescription: true }).then(pick => {
+		return this.quickInputService.pick(picks, { placeHolder: nls.localize('pickLanguage', "Select Language Mode"), matchOnDescription: true }).then(pick => {
 			if (!pick) {
 				return;
 			}
@@ -988,18 +989,18 @@ export class ChangeModeAction extends Action {
 		const currentAssociation = this.modeService.getModeIdByFilenameOrFirstLine(basename);
 
 		const languages = this.modeService.getRegisteredLanguageNames();
-		const picks: IPickOpenEntry[] = languages.sort().map((lang, index) => {
+		const picks: IQuickPickItem[] = languages.sort().map((lang, index) => {
 			const id = this.modeService.getModeIdForLanguageName(lang.toLowerCase());
 
-			return <IPickOpenEntry>{
+			return <IQuickPickItem>{
 				id,
 				label: lang,
 				description: (id === currentAssociation) ? nls.localize('currentAssociation', "Current Association") : void 0
 			};
 		});
 
-		TPromise.timeout(50 /* quick open is sensitive to being opened so soon after another */).done(() => {
-			this.quickOpenService.pick(picks, { placeHolder: nls.localize('pickLanguageToConfigure', "Select Language Mode to Associate with '{0}'", extension || basename) }).done(language => {
+		setTimeout(() => {
+			this.quickInputService.pick(picks, { placeHolder: nls.localize('pickLanguageToConfigure', "Select Language Mode to Associate with '{0}'", extension || basename) }).then(language => {
 				if (language) {
 					const fileAssociationsConfig = this.configurationService.inspect(FILES_ASSOCIATIONS_CONFIG);
 
@@ -1027,39 +1028,39 @@ export class ChangeModeAction extends Action {
 					this.configurationService.updateValue(FILES_ASSOCIATIONS_CONFIG, currentAssociations, target);
 				}
 			});
-		});
+		}, 50 /* quick open is sensitive to being opened so soon after another */);
 	}
 }
 
-export interface IChangeEOLEntry extends IPickOpenEntry {
+export interface IChangeEOLEntry extends IQuickPickItem {
 	eol: EndOfLineSequence;
 }
 
 class ChangeIndentationAction extends Action {
 
-	public static readonly ID = 'workbench.action.editor.changeIndentation';
-	public static readonly LABEL = nls.localize('changeIndentation', "Change Indentation");
+	static readonly ID = 'workbench.action.editor.changeIndentation';
+	static readonly LABEL = nls.localize('changeIndentation', "Change Indentation");
 
 	constructor(
 		actionId: string,
 		actionLabel: string,
 		@IEditorService private editorService: IEditorService,
-		@IQuickOpenService private quickOpenService: IQuickOpenService
+		@IQuickInputService private quickInputService: IQuickInputService
 	) {
 		super(actionId, actionLabel);
 	}
 
-	public run(): TPromise<any> {
+	run(): TPromise<any> {
 		const activeTextEditorWidget = getCodeEditor(this.editorService.activeTextEditorWidget);
 		if (!activeTextEditorWidget) {
-			return this.quickOpenService.pick([{ label: nls.localize('noEditor', "No text editor active at this time") }]);
+			return this.quickInputService.pick([{ label: nls.localize('noEditor', "No text editor active at this time") }]);
 		}
 
 		if (!isWritableCodeEditor(activeTextEditorWidget)) {
-			return this.quickOpenService.pick([{ label: nls.localize('noWritableCodeEditor', "The active code editor is read-only.") }]);
+			return this.quickInputService.pick([{ label: nls.localize('noWritableCodeEditor', "The active code editor is read-only.") }]);
 		}
 
-		const picks = [
+		const picks: QuickPickInput<IQuickPickItem & { run(): void }>[] = [
 			activeTextEditorWidget.getAction(IndentUsingSpaces.ID),
 			activeTextEditorWidget.getAction(IndentUsingTabs.ID),
 			activeTextEditorWidget.getAction(DetectIndentation.ID),
@@ -1078,35 +1079,35 @@ class ChangeIndentationAction extends Action {
 			};
 		});
 
-		(<IPickOpenEntry>picks[0]).separator = { label: nls.localize('indentView', "change view") };
-		(<IPickOpenEntry>picks[3]).separator = { label: nls.localize('indentConvert', "convert file"), border: true };
+		picks.splice(3, 0, { type: 'separator', label: nls.localize('indentConvert', "convert file") });
+		picks.unshift({ type: 'separator', label: nls.localize('indentView', "change view") });
 
-		return this.quickOpenService.pick(picks, { placeHolder: nls.localize('pickAction', "Select Action"), matchOnDetail: true }).then(action => action && action.run());
+		return this.quickInputService.pick(picks, { placeHolder: nls.localize('pickAction', "Select Action"), matchOnDetail: true }).then(action => action && action.run());
 	}
 }
 
 export class ChangeEOLAction extends Action {
 
-	public static readonly ID = 'workbench.action.editor.changeEOL';
-	public static readonly LABEL = nls.localize('changeEndOfLine', "Change End of Line Sequence");
+	static readonly ID = 'workbench.action.editor.changeEOL';
+	static readonly LABEL = nls.localize('changeEndOfLine', "Change End of Line Sequence");
 
 	constructor(
 		actionId: string,
 		actionLabel: string,
 		@IEditorService private editorService: IEditorService,
-		@IQuickOpenService private quickOpenService: IQuickOpenService
+		@IQuickInputService private quickInputService: IQuickInputService
 	) {
 		super(actionId, actionLabel);
 	}
 
-	public run(): TPromise<any> {
+	run(): TPromise<any> {
 		const activeTextEditorWidget = getCodeEditor(this.editorService.activeTextEditorWidget);
 		if (!activeTextEditorWidget) {
-			return this.quickOpenService.pick([{ label: nls.localize('noEditor', "No text editor active at this time") }]);
+			return this.quickInputService.pick([{ label: nls.localize('noEditor', "No text editor active at this time") }]);
 		}
 
 		if (!isWritableCodeEditor(activeTextEditorWidget)) {
-			return this.quickOpenService.pick([{ label: nls.localize('noWritableCodeEditor', "The active code editor is read-only.") }]);
+			return this.quickInputService.pick([{ label: nls.localize('noWritableCodeEditor', "The active code editor is read-only.") }]);
 		}
 
 		const textModel = activeTextEditorWidget.getModel();
@@ -1118,7 +1119,7 @@ export class ChangeEOLAction extends Action {
 
 		const selectedIndex = (textModel && textModel.getEOL() === '\n') ? 0 : 1;
 
-		return this.quickOpenService.pick(EOLOptions, { placeHolder: nls.localize('pickEndOfLine', "Select End of Line Sequence"), autoFocus: { autoFocusIndex: selectedIndex } }).then(eol => {
+		return this.quickInputService.pick(EOLOptions, { placeHolder: nls.localize('pickEndOfLine', "Select End of Line Sequence"), activeItem: EOLOptions[selectedIndex] }).then(eol => {
 			if (eol) {
 				const activeCodeEditor = getCodeEditor(this.editorService.activeTextEditorWidget);
 				if (activeCodeEditor && isWritableCodeEditor(activeCodeEditor)) {
@@ -1132,35 +1133,35 @@ export class ChangeEOLAction extends Action {
 
 export class ChangeEncodingAction extends Action {
 
-	public static readonly ID = 'workbench.action.editor.changeEncoding';
-	public static readonly LABEL = nls.localize('changeEncoding', "Change File Encoding");
+	static readonly ID = 'workbench.action.editor.changeEncoding';
+	static readonly LABEL = nls.localize('changeEncoding', "Change File Encoding");
 
 	constructor(
 		actionId: string,
 		actionLabel: string,
 		@IEditorService private editorService: IEditorService,
-		@IQuickOpenService private quickOpenService: IQuickOpenService,
+		@IQuickInputService private quickInputService: IQuickInputService,
 		@ITextResourceConfigurationService private textResourceConfigurationService: ITextResourceConfigurationService,
 		@IFileService private fileService: IFileService
 	) {
 		super(actionId, actionLabel);
 	}
 
-	public run(): TPromise<any> {
+	run(): TPromise<any> {
 		if (!getCodeEditor(this.editorService.activeTextEditorWidget)) {
-			return this.quickOpenService.pick([{ label: nls.localize('noEditor', "No text editor active at this time") }]);
+			return this.quickInputService.pick([{ label: nls.localize('noEditor', "No text editor active at this time") }]);
 		}
 
 		let activeControl = this.editorService.activeControl;
 		let encodingSupport: IEncodingSupport = toEditorWithEncodingSupport(activeControl.input);
 		if (!encodingSupport) {
-			return this.quickOpenService.pick([{ label: nls.localize('noFileEditor', "No file active at this time") }]);
+			return this.quickInputService.pick([{ label: nls.localize('noFileEditor', "No file active at this time") }]);
 		}
 
-		let pickActionPromise: TPromise<IPickOpenEntry>;
+		let pickActionPromise: TPromise<IQuickPickItem>;
 
-		let saveWithEncodingPick: IPickOpenEntry;
-		let reopenWithEncodingPick: IPickOpenEntry;
+		let saveWithEncodingPick: IQuickPickItem;
+		let reopenWithEncodingPick: IQuickPickItem;
 		if (language === LANGUAGE_DEFAULT) {
 			saveWithEncodingPick = { label: nls.localize('saveWithEncoding', "Save with Encoding") };
 			reopenWithEncodingPick = { label: nls.localize('reopenWithEncoding', "Reopen with Encoding") };
@@ -1174,7 +1175,7 @@ export class ChangeEncodingAction extends Action {
 		} else if (!isWritableBaseEditor(activeControl)) {
 			pickActionPromise = TPromise.as(reopenWithEncodingPick);
 		} else {
-			pickActionPromise = this.quickOpenService.pick([reopenWithEncodingPick, saveWithEncodingPick], { placeHolder: nls.localize('pickAction', "Select Action"), matchOnDetail: true });
+			pickActionPromise = this.quickInputService.pick([reopenWithEncodingPick, saveWithEncodingPick], { placeHolder: nls.localize('pickAction', "Select Action"), matchOnDetail: true });
 		}
 
 		return pickActionPromise.then(action => {
@@ -1184,7 +1185,7 @@ export class ChangeEncodingAction extends Action {
 
 			const resource = toResource(activeControl.input, { supportSideBySide: true });
 
-			return TPromise.timeout(50 /* quick open is sensitive to being opened so soon after another */)
+			return timeout(50 /* quick open is sensitive to being opened so soon after another */)
 				.then(() => {
 					if (!resource || !this.fileService.canHandleResource(resource)) {
 						return TPromise.as(null); // encoding detection only possible for resources the file service can handle
@@ -1201,7 +1202,7 @@ export class ChangeEncodingAction extends Action {
 					let aliasMatchIndex: number;
 
 					// All encodings are valid picks
-					const picks: IPickOpenEntry[] = Object.keys(SUPPORTED_ENCODINGS)
+					const picks: QuickPickInput[] = Object.keys(SUPPORTED_ENCODINGS)
 						.sort((k1, k2) => {
 							if (k1 === configuredEncoding) {
 								return -1;
@@ -1230,13 +1231,14 @@ export class ChangeEncodingAction extends Action {
 
 					// If we have a guessed encoding, show it first unless it matches the configured encoding
 					if (guessedEncoding && configuredEncoding !== guessedEncoding && SUPPORTED_ENCODINGS[guessedEncoding]) {
-						picks[0].separator = { border: true };
+						picks.unshift({ type: 'separator' });
 						picks.unshift({ id: guessedEncoding, label: SUPPORTED_ENCODINGS[guessedEncoding].labelLong, description: nls.localize('guessedEncoding', "Guessed from content") });
 					}
 
-					return this.quickOpenService.pick(picks, {
+					const items = picks.filter(p => p.type !== 'separator') as IQuickPickItem[];
+					return this.quickInputService.pick(picks, {
 						placeHolder: isReopenWithEncoding ? nls.localize('pickEncodingForReopen', "Select File Encoding to Reopen File") : nls.localize('pickEncodingForSave', "Select File Encoding to Save with"),
-						autoFocus: { autoFocusIndex: typeof directMatchIndex === 'number' ? directMatchIndex : typeof aliasMatchIndex === 'number' ? aliasMatchIndex : void 0 }
+						activeItem: items[typeof directMatchIndex === 'number' ? directMatchIndex : typeof aliasMatchIndex === 'number' ? aliasMatchIndex : -1]
 					}).then(encoding => {
 						if (encoding) {
 							activeControl = this.editorService.activeControl;
@@ -1264,7 +1266,7 @@ class ScreenReaderDetectedExplanation extends Themable {
 		super(themeService);
 	}
 
-	public get visible(): boolean {
+	get visible(): boolean {
 		return this._visible;
 	}
 
@@ -1284,7 +1286,7 @@ class ScreenReaderDetectedExplanation extends Themable {
 		}
 	}
 
-	public show(anchorElement: HTMLElement): void {
+	show(anchorElement: HTMLElement): void {
 		this._visible = true;
 
 		this.contextViewService.showContextView({
@@ -1308,7 +1310,7 @@ class ScreenReaderDetectedExplanation extends Themable {
 		});
 	}
 
-	public hide(): void {
+	hide(): void {
 		this.contextViewService.hideContextView();
 	}
 
diff --git a/src/vs/workbench/browser/parts/editor/media/breadcrumbscontrol.css b/src/vs/workbench/browser/parts/editor/media/breadcrumbscontrol.css
new file mode 100644
index 00000000000..42d88269f09
--- /dev/null
+++ b/src/vs/workbench/browser/parts/editor/media/breadcrumbscontrol.css
@@ -0,0 +1,55 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+.monaco-workbench>.part.editor>.content .editor-group-container .breadcrumbs-control.hidden {
+	display: none;
+}
+
+.monaco-workbench>.part.editor>.content .editor-group-container .breadcrumbs-control .monaco-breadcrumb-item.selected .monaco-icon-label,
+.monaco-workbench>.part.editor>.content .editor-group-container .breadcrumbs-control .monaco-breadcrumb-item.focused .monaco-icon-label {
+	text-decoration-line: underline;
+}
+
+.monaco-workbench>.part.editor>.content .editor-group-container .breadcrumbs-control .monaco-breadcrumb-item.selected .hint-more,
+.monaco-workbench>.part.editor>.content .editor-group-container .breadcrumbs-control .monaco-breadcrumb-item.focused .hint-more {
+	text-decoration-line: underline;
+}
+
+/* todo@joh move somewhere else */
+
+.monaco-workbench .monaco-breadcrumbs-picker .picker-item {
+	line-height: 22px;
+	flex: 1;
+}
+
+.monaco-workbench .monaco-breadcrumbs-picker .highlighting-tree {
+	height: 100%;
+	overflow: hidden;
+	display: flex;
+	flex-direction: column;
+}
+
+.monaco-workbench .monaco-breadcrumbs-picker .highlighting-tree>.input {
+	padding: 5px 9px;
+	position: relative;
+	box-sizing: border-box;
+	height: 36px;
+}
+
+.monaco-workbench .monaco-breadcrumbs-picker .highlighting-tree>.tree {
+	height: calc(100% - 36px);
+}
+
+.monaco-workbench .monaco-breadcrumbs-picker .highlighting-tree.inactive>.input {
+	display: none;
+}
+
+.monaco-workbench .monaco-breadcrumbs-picker .highlighting-tree.inactive>.tree {
+	height: 100%;
+}
+
+.monaco-workbench .monaco-breadcrumbs-picker .highlighting-tree .monaco-highlighted-label .highlight{
+	font-weight: bold;
+}
diff --git a/src/vs/workbench/browser/parts/editor/media/close-editor.svg b/src/vs/workbench/browser/parts/editor/media/close-big-alt.svg
similarity index 100%
rename from src/vs/workbench/browser/parts/editor/media/close-editor.svg
rename to src/vs/workbench/browser/parts/editor/media/close-big-alt.svg
diff --git a/src/vs/workbench/browser/parts/editor/media/close-editor-inverse.svg b/src/vs/workbench/browser/parts/editor/media/close-big-inverse-alt.svg
similarity index 100%
rename from src/vs/workbench/browser/parts/editor/media/close-editor-inverse.svg
rename to src/vs/workbench/browser/parts/editor/media/close-big-inverse-alt.svg
diff --git a/src/vs/workbench/browser/parts/editor/media/close-big-inverse.svg b/src/vs/workbench/browser/parts/editor/media/close-big-inverse.svg
index ce0e5896405..a174033d912 100644
--- a/src/vs/workbench/browser/parts/editor/media/close-big-inverse.svg
+++ b/src/vs/workbench/browser/parts/editor/media/close-big-inverse.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="3 3 16 16" enable-background="new 3 3 16 16"><polygon fill="#C5C5C5" points="12.597,11.042 15.4,13.845 13.844,15.4 11.042,12.598 8.239,15.4 6.683,13.845 9.485,11.042 6.683,8.239 8.238,6.683 11.042,9.486 13.845,6.683 15.4,8.239"/></svg>
\ No newline at end of file
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M9.784 8L13 11.217 11.215 13 8.001 9.786 4.785 13 3 11.216l3.214-3.215L3 4.785 4.784 3 8 6.216 11.216 3 13 4.785 9.784 8.001z" fill="#C5C5C5"/></svg>
\ No newline at end of file
diff --git a/src/vs/workbench/browser/parts/editor/media/close-big.svg b/src/vs/workbench/browser/parts/editor/media/close-big.svg
index fde34404d4e..f4038b8bfa5 100644
--- a/src/vs/workbench/browser/parts/editor/media/close-big.svg
+++ b/src/vs/workbench/browser/parts/editor/media/close-big.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="3 3 16 16" enable-background="new 3 3 16 16"><polygon fill="#424242" points="12.597,11.042 15.4,13.845 13.844,15.4 11.042,12.598 8.239,15.4 6.683,13.845 9.485,11.042 6.683,8.239 8.238,6.683 11.042,9.486 13.845,6.683 15.4,8.239"/></svg>
\ No newline at end of file
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M9.784 8L13 11.217 11.215 13 8.001 9.786 4.785 13 3 11.216l3.214-3.215L3 4.785 4.784 3 8 6.216 11.216 3 13 4.785 9.784 8.001z" fill="#424242"/></svg>
\ No newline at end of file
diff --git a/src/vs/workbench/browser/parts/editor/media/close-dirty-alt.svg b/src/vs/workbench/browser/parts/editor/media/close-dirty-alt.svg
new file mode 100644
index 00000000000..409e5fa539c
--- /dev/null
+++ b/src/vs/workbench/browser/parts/editor/media/close-dirty-alt.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" enable-background="new 0 0 16 16" height="16" width="16"><circle fill="#424242" cx="8" cy="8" r="4"/></svg>
\ No newline at end of file
diff --git a/src/vs/workbench/browser/parts/editor/media/close-dirty-inverse-alt.svg b/src/vs/workbench/browser/parts/editor/media/close-dirty-inverse-alt.svg
new file mode 100644
index 00000000000..02dafab76fc
--- /dev/null
+++ b/src/vs/workbench/browser/parts/editor/media/close-dirty-inverse-alt.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" enable-background="new 0 0 16 16" height="16" width="16"><circle fill="#C5C5C5" cx="8" cy="8" r="4"/></svg>
\ No newline at end of file
diff --git a/src/vs/workbench/browser/parts/editor/media/close-statusview-inverse.svg b/src/vs/workbench/browser/parts/editor/media/close-statusview-inverse.svg
new file mode 100644
index 00000000000..ce0e5896405
--- /dev/null
+++ b/src/vs/workbench/browser/parts/editor/media/close-statusview-inverse.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="3 3 16 16" enable-background="new 3 3 16 16"><polygon fill="#C5C5C5" points="12.597,11.042 15.4,13.845 13.844,15.4 11.042,12.598 8.239,15.4 6.683,13.845 9.485,11.042 6.683,8.239 8.238,6.683 11.042,9.486 13.845,6.683 15.4,8.239"/></svg>
\ No newline at end of file
diff --git a/src/vs/workbench/browser/parts/editor/media/close-statusview.svg b/src/vs/workbench/browser/parts/editor/media/close-statusview.svg
new file mode 100644
index 00000000000..fde34404d4e
--- /dev/null
+++ b/src/vs/workbench/browser/parts/editor/media/close-statusview.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="3 3 16 16" enable-background="new 3 3 16 16"><polygon fill="#424242" points="12.597,11.042 15.4,13.845 13.844,15.4 11.042,12.598 8.239,15.4 6.683,13.845 9.485,11.042 6.683,8.239 8.238,6.683 11.042,9.486 13.845,6.683 15.4,8.239"/></svg>
\ No newline at end of file
diff --git a/src/vs/workbench/browser/parts/editor/media/editorgroupview.css b/src/vs/workbench/browser/parts/editor/media/editorgroupview.css
index 99508ecaff5..37f00da2fdc 100644
--- a/src/vs/workbench/browser/parts/editor/media/editorgroupview.css
+++ b/src/vs/workbench/browser/parts/editor/media/editorgroupview.css
@@ -13,8 +13,9 @@
 	opacity: 0.5; /* dimmed to indicate inactive state */
 }
 
-.monaco-workbench > .part.editor > .content .editor-group-container.empty.active {
-	opacity: 1; /* indicate active group through undimmed state */
+.monaco-workbench > .part.editor > .content .editor-group-container.empty.active,
+.monaco-workbench > .part.editor > .content .editor-group-container.empty.dragged-over {
+	opacity: 1; /* indicate active/dragged-over group through undimmed state */
 }
 
 /* Letterpress */
@@ -42,10 +43,28 @@
 /* Title */
 
 .monaco-workbench > .part.editor > .content .editor-group-container > .title {
-	height: 35px;
+	position: relative;
 	display: flex;
+	flex-wrap: nowrap;
 	box-sizing:	border-box;
 	overflow: hidden;
+	justify-content: space-between;
+}
+
+.monaco-workbench > .part.editor > .content .editor-group-container > .title.tabs {
+	flex-wrap: wrap;
+}
+
+.monaco-workbench > .part.editor > .content .editor-group-container > .title.title-border-bottom::after {
+	content: '';
+	position: absolute;
+	bottom: 0;
+	left: 0;
+	z-index: 5;
+	pointer-events: none;
+	background-color: var(--title-border-bottom-color);
+	width: 100%;
+	height: 1px;
 }
 
 .monaco-workbench > .part.editor > .content .editor-group-container.empty > .title {
@@ -73,12 +92,12 @@
 }
 
 .vs .monaco-workbench > .part.editor > .content .editor-group-container > .editor-group-container-toolbar .close-editor-group {
-	background-image: url('close.svg');
+	background-image: url('close-big.svg');
 }
 
 .vs-dark .monaco-workbench > .part.editor > .content .editor-group-container > .editor-group-container-toolbar .close-editor-group,
 .hc-black .monaco-workbench > .part.editor > .content .editor-group-container > .editor-group-container-toolbar .close-editor-group {
-	background-image: url('close-inverse.svg');
+	background-image: url('close-big-inverse.svg');
 }
 
 /* Editor */
@@ -93,4 +112,9 @@
 
 .monaco-workbench > .part.editor > .content .editor-group-container > .editor-container > .editor-instance {
 	height: 100%;
-}
\ No newline at end of file
+}
+
+.monaco-workbench > .part.editor > .content .grid-view-container {
+	width: 100%;
+	height: 100%;
+}
diff --git a/src/vs/workbench/browser/parts/editor/media/editorstatus.css b/src/vs/workbench/browser/parts/editor/media/editorstatus.css
index cc723196439..204d01c7f16 100644
--- a/src/vs/workbench/browser/parts/editor/media/editorstatus.css
+++ b/src/vs/workbench/browser/parts/editor/media/editorstatus.css
@@ -70,10 +70,10 @@
 }
 
 .monaco-shell.vs .screen-reader-detected-explanation .cancel {
-	background: url('close-big.svg') center center no-repeat;
+	background: url('close-statusview.svg') center center no-repeat;
 }
 
 .monaco-shell.vs-dark .screen-reader-detected-explanation .cancel,
 .monaco-shell.hc-black .screen-reader-detected-explanation .cancel {
-	background: url('close-big-inverse.svg') center center no-repeat;
+	background: url('close-statusview-inverse.svg') center center no-repeat;
 }
\ No newline at end of file
diff --git a/src/vs/workbench/browser/parts/editor/media/notabstitlecontrol.css b/src/vs/workbench/browser/parts/editor/media/notabstitlecontrol.css
index 7a2683b4f03..44e3897ded7 100644
--- a/src/vs/workbench/browser/parts/editor/media/notabstitlecontrol.css
+++ b/src/vs/workbench/browser/parts/editor/media/notabstitlecontrol.css
@@ -3,6 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+.monaco-workbench > .part.editor > .content .editor-group-container > .title > .label-container {
+	display: flex;
+	justify-content: flex-start;
+	align-items: center;
+	overflow: hidden;
+	flex: auto;
+}
+
 /* Title Label */
 
 .monaco-workbench > .part.editor > .content .editor-group-container > .title .title-label {
@@ -13,17 +21,67 @@
 	padding-left: 20px;
 }
 
+.monaco-workbench > .part.editor > .content .editor-group-container > .title.breadcrumbs .no-tabs.title-label {
+	flex: none;
+}
+
 .monaco-workbench > .part.editor > .content .editor-group-container > .title .monaco-icon-label::before {
 	height: 35px; /* tweak the icon size of the editor labels when icons are enabled */
 }
 
+/* Breadcrumbs */
+
+.monaco-workbench > .part.editor > .content .editor-group-container > .title.breadcrumbs .breadcrumbs-control {
+	flex: 1 50%;
+	overflow: hidden;
+	padding: 0 6px;
+}
+
+.monaco-workbench > .part.editor > .content .editor-group-container > .title.breadcrumbs .breadcrumbs-control .monaco-breadcrumb-item {
+	font-size: 0.9em;
+}
+
+.monaco-workbench > .part.editor > .content .editor-group-container > .title.breadcrumbs .breadcrumbs-control.preview .monaco-breadcrumb-item {
+	font-style: italic;
+}
+
+.monaco-workbench > .part.editor > .content .editor-group-container > .title.breadcrumbs .breadcrumbs-control .monaco-breadcrumb-item::before {
+	content: '/';
+	opacity: 1;
+	height: inherit;
+	width: inherit;
+	background-image: none;
+}
+
+.monaco-workbench.windows > .part.editor > .content .editor-group-container > .title.breadcrumbs .breadcrumbs-control .monaco-breadcrumb-item::before  {
+	content: '\\';
+}
+
+.monaco-workbench > .part.editor > .content .editor-group-container > .title.breadcrumbs .breadcrumbs-control .monaco-breadcrumb-item.root_folder::before,
+.monaco-workbench > .part.editor > .content .editor-group-container > .title.breadcrumbs .breadcrumbs-control .monaco-breadcrumb-item.root_folder + .monaco-breadcrumb-item::before,
+.monaco-workbench > .part.editor > .content .editor-group-container > .title.breadcrumbs .breadcrumbs-control.relative-path .monaco-breadcrumb-item:nth-child(2)::before {
+	/* workspace folder, item following workspace folder, or relative path -> hide first seperator */
+	display: none;
+}
+
+.monaco-workbench > .part.editor > .content .editor-group-container > .title.breadcrumbs .breadcrumbs-control .monaco-breadcrumb-item.root_folder::after {
+	/* use dot separator for workspace folder */
+	content: '•';
+	padding: 0 4px;
+}
+
+.monaco-workbench > .part.editor > .content .editor-group-container > .title.breadcrumbs .breadcrumbs-control .monaco-breadcrumb-item:last-child {
+	padding-right: 4px; /* does not have trailing separator*/
+}
+
 /* Title Actions */
 .monaco-workbench > .part.editor > .content .editor-group-container > .title .title-actions {
 	display: flex;
 	flex: initial;
 	opacity: 0.5;
+	height: 35px;
 }
 
 .monaco-workbench > .part.editor > .content .editor-group-container.active > .title .title-actions {
 	opacity: 1;
-}
\ No newline at end of file
+}
diff --git a/src/vs/workbench/browser/parts/editor/media/tabstitlecontrol.css b/src/vs/workbench/browser/parts/editor/media/tabstitlecontrol.css
index ffea31b5e53..020706de84f 100644
--- a/src/vs/workbench/browser/parts/editor/media/tabstitlecontrol.css
+++ b/src/vs/workbench/browser/parts/editor/media/tabstitlecontrol.css
@@ -32,6 +32,7 @@
 /* Tab */
 
 .monaco-workbench > .part.editor > .content .editor-group-container > .title .tabs-container > .tab {
+	position: relative;
 	display: flex;
 	white-space: nowrap;
 	cursor: pointer;
@@ -59,7 +60,7 @@
 
 .monaco-workbench > .part.editor > .content .editor-group-container > .title .tabs-container > .tab.sizing-shrink.close-button-left::after,
 .monaco-workbench > .part.editor > .content .editor-group-container > .title .tabs-container > .tab.sizing-shrink.close-button-off::after {
-	content: "";
+	content: '';
 	display: flex;
 	flex: 0;
 	width: 5px; /* Reserve space to hide tab fade when close button is left or off (fixes https://github.com/Microsoft/vscode/issues/45728) */
@@ -84,6 +85,37 @@
 	padding-right: 10px;
 }
 
+/* Tab border top/bottom */
+
+.monaco-workbench > .part.editor > .content .editor-group-container > .title .tabs-container > .tab > .tab-border-top-container,
+.monaco-workbench > .part.editor > .content .editor-group-container > .title .tabs-container > .tab > .tab-border-bottom-container {
+	display: none; /* hidden by default until a color is provided (see below) */
+}
+
+.monaco-workbench > .part.editor > .content .editor-group-container > .title .tabs-container > .tab.active.tab-border-top > .tab-border-top-container {
+	display: block;
+	position: absolute;
+	top: 0;
+	left: 0;
+	z-index: 6; /* over possible title border */
+	pointer-events: none;
+	background-color: var(--tab-border-top-color);
+	width: 100%;
+	height: 1px;
+}
+
+.monaco-workbench > .part.editor > .content .editor-group-container > .title .tabs-container > .tab.active.tab-border-bottom > .tab-border-bottom-container {
+	display: block;
+	position: absolute;
+	bottom: 0;
+	left: 0;
+	z-index: 6; /* over possible title border */
+	pointer-events: none;
+	background-color: var(--tab-border-bottom-color);
+	width: 100%;
+	height: 1px;
+}
+
 /* Tab Label */
 
 .monaco-workbench > .part.editor > .content .editor-group-container > .title .tabs-container > .tab .tab-label {
@@ -96,7 +128,7 @@
 }
 
 .monaco-workbench > .part.editor > .content .editor-group-container > .title .tabs-container >  .tab.sizing-shrink > .tab-label::after {
-	content: "";
+	content: '';
 	position: absolute;
 	right: 0;
 	height: 100%;
@@ -105,6 +137,10 @@
 	padding: 0;
 }
 
+.monaco-workbench > .part.editor > .content .editor-group-container > .title .tabs-container >  .tab.sizing-shrink:focus > .tab-label::after {
+	opacity: 0; /* when tab has the focus this shade breaks the tab border (fixes https://github.com/Microsoft/vscode/issues/57819) */
+}
+
 .monaco-workbench > .part.editor > .content .editor-group-container > .title .tabs-container > .tab.sizing-fit .monaco-icon-label,
 .monaco-workbench > .part.editor > .content .editor-group-container > .title .tabs-container > .tab.sizing-fit .monaco-icon-label > .monaco-icon-label-description-container {
 	overflow: visible; /* fixes https://github.com/Microsoft/vscode/issues/20182 */
@@ -136,8 +172,9 @@
 }
 
 .monaco-workbench > .part.editor > .content .editor-group-container > .title .tabs-container > .tab.dirty.close-button-right.sizing-shrink > .tab-close,
-.monaco-workbench > .part.editor > .content .editor-group-container > .title .tabs-container > .tab.close-button-right.sizing-shrink:hover > .tab-close {
-	overflow: visible; /* ...but still show the close button on hover and when dirty */
+.monaco-workbench > .part.editor > .content .editor-group-container > .title .tabs-container > .tab.close-button-right.sizing-shrink:hover > .tab-close,
+.monaco-workbench > .part.editor > .content .editor-group-container > .title .tabs-container > .tab.close-button-right.sizing-shrink > .tab-close:focus-within {
+	overflow: visible; /* ...but still show the close button on hover, focus and when dirty */
 }
 
 .monaco-workbench > .part.editor > .content .editor-group-container > .title .tabs-container > .tab.close-button-off > .tab-close {
@@ -220,4 +257,35 @@
 	cursor: default;
 	flex: initial;
 	padding-left: 4px;
-}
\ No newline at end of file
+	height: 35px;
+}
+
+/* Breadcrumbs */
+
+.monaco-workbench > .part.editor > .content .editor-group-container > .title .tabs-breadcrumbs .breadcrumbs-control {
+	flex: 1 100%;
+	height: 22px;
+	cursor: default;
+}
+
+.monaco-workbench > .part.editor > .content .editor-group-container > .title .tabs-breadcrumbs .breadcrumbs-control .monaco-icon-label {
+	height: 22px;
+	line-height: 22px;
+}
+
+.monaco-workbench > .part.editor > .content .editor-group-container > .title .tabs-breadcrumbs .breadcrumbs-control .monaco-icon-label::before {
+	height: 22px; /* tweak the icon size of the editor labels when icons are enabled */
+}
+
+.monaco-workbench > .part.editor > .content .editor-group-container > .title .tabs-breadcrumbs  .breadcrumbs-control .monaco-breadcrumb-item {
+	max-width: 80%;
+}
+
+.monaco-workbench > .part.editor > .content .editor-group-container > .title .tabs-breadcrumbs  .breadcrumbs-control .monaco-breadcrumb-item::before {
+	min-width: 16px;
+	height: 22px;
+}
+
+.monaco-workbench > .part.editor > .content .editor-group-container > .title .tabs-breadcrumbs  .breadcrumbs-control .monaco-breadcrumb-item:last-child {
+	padding-right: 8px;
+}
diff --git a/src/vs/workbench/browser/parts/editor/media/titlecontrol.css b/src/vs/workbench/browser/parts/editor/media/titlecontrol.css
index 79479a2046f..41e78a153f2 100644
--- a/src/vs/workbench/browser/parts/editor/media/titlecontrol.css
+++ b/src/vs/workbench/browser/parts/editor/media/titlecontrol.css
@@ -11,11 +11,6 @@
 	flex: 1;
 }
 
-.monaco-workbench > .part.editor > .content .editor-group-container.centered > .title .title-label {
-	flex-direction: row;
-	justify-content: center;
-}
-
 .monaco-workbench > .part.editor > .content .editor-group-container > .title .title-label a,
 .monaco-workbench > .part.editor > .content .editor-group-container > .title .tabs-container > .tab .tab-label a {
 	text-decoration: none;
@@ -26,7 +21,7 @@
 .monaco-workbench > .part.editor > .content .editor-group-container > .title .tabs-container > .tab .monaco-icon-label::before,
 .monaco-workbench > .part.editor > .content .editor-group-container > .title .title-label a,
 .monaco-workbench > .part.editor > .content .editor-group-container > .title .tabs-container > .tab .tab-label a,
-.monaco-workbench > .part.editor > .content .editor-group-container > .title .title-label span,
+.monaco-workbench > .part.editor > .content .editor-group-container > .title .title-label h2,
 .monaco-workbench > .part.editor > .content .editor-group-container > .title .tabs-container > .tab .tab-label span {
 	cursor: pointer;
 }
diff --git a/src/vs/workbench/browser/parts/editor/noTabsTitleControl.ts b/src/vs/workbench/browser/parts/editor/noTabsTitleControl.ts
index 0d85263c31c..3fac0488955 100644
--- a/src/vs/workbench/browser/parts/editor/noTabsTitleControl.ts
+++ b/src/vs/workbench/browser/parts/editor/noTabsTitleControl.ts
@@ -11,15 +11,21 @@ import { TitleControl, IToolbarActions } from 'vs/workbench/browser/parts/editor
 import { ResourceLabel } from 'vs/workbench/browser/labels';
 import { TAB_ACTIVE_FOREGROUND, TAB_UNFOCUSED_ACTIVE_FOREGROUND } from 'vs/workbench/common/theme';
 import { EventType as TouchEventType, GestureEvent, Gesture } from 'vs/base/browser/touch';
-import { addDisposableListener, EventType, addClass, EventHelper, removeClass } from 'vs/base/browser/dom';
-import { IEditorPartOptions } from 'vs/workbench/browser/parts/editor/editor';
+import { addDisposableListener, EventType, addClass, EventHelper, removeClass, toggleClass } from 'vs/base/browser/dom';
+import { IEditorPartOptions, EDITOR_TITLE_HEIGHT } from 'vs/workbench/browser/parts/editor/editor';
 import { IAction } from 'vs/base/common/actions';
 import { CLOSE_EDITOR_COMMAND_ID } from 'vs/workbench/browser/parts/editor/editorCommands';
+import { Color } from 'vs/base/common/color';
+
+interface IRenderedEditorLabel {
+	editor: IEditorInput;
+	pinned: boolean;
+}
 
 export class NoTabsTitleControl extends TitleControl {
 	private titleContainer: HTMLElement;
 	private editorLabel: ResourceLabel;
-	private lastRenderedActiveEditor: IEditorInput;
+	private activeLabel: IRenderedEditorLabel = Object.create(null);
 
 	protected create(parent: HTMLElement): void {
 		this.titleContainer = parent;
@@ -31,10 +37,19 @@ export class NoTabsTitleControl extends TitleControl {
 		// Gesture Support
 		Gesture.addTarget(this.titleContainer);
 
+		const labelContainer = document.createElement('div');
+		addClass(labelContainer, 'label-container');
+		this.titleContainer.appendChild(labelContainer);
+
 		// Editor Label
-		this.editorLabel = this._register(this.instantiationService.createInstance(ResourceLabel, this.titleContainer, void 0));
+		this.editorLabel = this._register(this.instantiationService.createInstance(ResourceLabel, labelContainer, void 0));
 		this._register(this.editorLabel.onClick(e => this.onTitleLabelClick(e)));
 
+		// Breadcrumbs
+		this.createBreadcrumbsControl(labelContainer, { showFileIcons: false, showSymbolIcons: true, showDecorationColors: false, breadcrumbsBackground: () => Color.transparent });
+		toggleClass(this.titleContainer, 'breadcrumbs', Boolean(this.breadcrumbsControl));
+		this.toDispose.push({ dispose: () => removeClass(this.titleContainer, 'breadcrumbs') }); // import to remove because the container is a shared dom node
+
 		// Right Actions Container
 		const actionsContainer = document.createElement('div');
 		addClass(actionsContainer, 'title-actions');
@@ -80,12 +95,21 @@ export class NoTabsTitleControl extends TitleControl {
 
 		// Close editor on middle mouse click
 		if (e instanceof MouseEvent && e.button === 1 /* Middle Button */) {
+			EventHelper.stop(e, true /* for https://github.com/Microsoft/vscode/issues/56715 */);
+
 			this.group.closeEditor(this.group.activeEditor);
 		}
 	}
 
+	getPreferredHeight(): number {
+		return EDITOR_TITLE_HEIGHT;
+	}
+
 	openEditor(editor: IEditorInput): void {
-		this.ifActiveEditorChanged(() => this.redraw());
+		const activeEditorChanged = this.ifActiveEditorChanged(() => this.redraw());
+		if (!activeEditorChanged) {
+			this.ifActiveEditorPropertiesChanged(() => this.redraw());
+		}
 	}
 
 	closeEditor(editor: IEditorInput): void {
@@ -136,16 +160,36 @@ export class NoTabsTitleControl extends TitleControl {
 		this.redraw();
 	}
 
-	private ifActiveEditorChanged(fn: () => void): void {
+	protected handleBreadcrumbsEnablementChange(): void {
+		toggleClass(this.titleContainer, 'breadcrumbs', Boolean(this.breadcrumbsControl));
+		this.redraw();
+	}
+
+	private ifActiveEditorChanged(fn: () => void): boolean {
 		if (
-			!this.lastRenderedActiveEditor && this.group.activeEditor || 	// active editor changed from null => editor
-			this.lastRenderedActiveEditor && !this.group.activeEditor || 	// active editor changed from editor => null
-			!this.group.isActive(this.lastRenderedActiveEditor)				// active editor changed from editorA => editorB
+			!this.activeLabel.editor && this.group.activeEditor || 	// active editor changed from null => editor
+			this.activeLabel.editor && !this.group.activeEditor || 	// active editor changed from editor => null
+			!this.group.isActive(this.activeLabel.editor)			// active editor changed from editorA => editorB
 		) {
 			fn();
+
+			return true;
+		}
+
+		return false;
+	}
+
+	private ifActiveEditorPropertiesChanged(fn: () => void): void {
+		if (!this.activeLabel.editor || !this.group.activeEditor) {
+			return; // need an active editor to check for properties changed
+		}
+
+		if (this.activeLabel.pinned !== this.group.isPinned(this.group.activeEditor)) {
+			fn(); // only run if pinned state has changed
 		}
 	}
 
+
 	private ifEditorIsActive(editor: IEditorInput, fn: () => void): void {
 		if (this.group.isActive(editor)) {
 			fn();  // only run if editor is current active
@@ -154,7 +198,21 @@ export class NoTabsTitleControl extends TitleControl {
 
 	private redraw(): void {
 		const editor = this.group.activeEditor;
-		this.lastRenderedActiveEditor = editor;
+
+		const isEditorPinned = this.group.isPinned(this.group.activeEditor);
+		const isGroupActive = this.accessor.activeGroup === this.group;
+
+		this.activeLabel = { editor, pinned: isEditorPinned };
+
+		// Update Breadcrumbs
+		if (this.breadcrumbsControl) {
+			if (isGroupActive) {
+				this.breadcrumbsControl.update();
+				toggleClass(this.breadcrumbsControl.domNode, 'preview', !isEditorPinned);
+			} else {
+				this.breadcrumbsControl.hide();
+			}
+		}
 
 		// Clear if there is no editor
 		if (!editor) {
@@ -165,8 +223,6 @@ export class NoTabsTitleControl extends TitleControl {
 
 		// Otherwise render it
 		else {
-			const isEditorPinned = this.group.isPinned(this.group.activeEditor);
-			const isGroupActive = this.accessor.activeGroup === this.group;
 
 			// Dirty state
 			this.updateEditorDirty(editor);
@@ -177,7 +233,9 @@ export class NoTabsTitleControl extends TitleControl {
 
 			const { labelFormat } = this.accessor.partOptions;
 			let description: string;
-			if (labelFormat === 'default' && !isGroupActive) {
+			if (this.breadcrumbsControl && !this.breadcrumbsControl.isHidden()) {
+				description = ''; // hide description when showing breadcrumbs
+			} else if (labelFormat === 'default' && !isGroupActive) {
 				description = ''; // hide description when group is not active and style is 'default'
 			} else {
 				description = editor.getDescription(this.getVerbosity(labelFormat)) || '';
@@ -188,7 +246,7 @@ export class NoTabsTitleControl extends TitleControl {
 				title = ''; // dont repeat what is already shown
 			}
 
-			this.editorLabel.setLabel({ name, description, resource }, { title, italic: !isEditorPinned, extraClasses: ['title-label'] });
+			this.editorLabel.setLabel({ name, description, resource }, { title, italic: !isEditorPinned, extraClasses: ['no-tabs', 'title-label'] });
 			if (isGroupActive) {
 				this.editorLabel.element.style.color = this.getColor(TAB_ACTIVE_FOREGROUND);
 			} else {
diff --git a/src/vs/workbench/browser/parts/editor/rangeDecorations.ts b/src/vs/workbench/browser/parts/editor/rangeDecorations.ts
index 6924bfb1f12..01b87948707 100644
--- a/src/vs/workbench/browser/parts/editor/rangeDecorations.ts
+++ b/src/vs/workbench/browser/parts/editor/rangeDecorations.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IDisposable } from 'vs/base/common/lifecycle';
-import URI from 'vs/base/common/uri';
+import { IDisposable, Disposable } from 'vs/base/common/lifecycle';
+import { URI } from 'vs/base/common/uri';
 import { Event, Emitter } from 'vs/base/common/event';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { IRange } from 'vs/editor/common/core/range';
@@ -19,27 +19,29 @@ export interface IRangeHighlightDecoration {
 	isWholeLine?: boolean;
 }
 
-export class RangeHighlightDecorations implements IDisposable {
+export class RangeHighlightDecorations extends Disposable {
 
 	private rangeHighlightDecorationId: string = null;
 	private editor: ICodeEditor = null;
 	private editorDisposables: IDisposable[] = [];
 
-	private readonly _onHighlightRemoved: Emitter<void> = new Emitter<void>();
-	public readonly onHighlghtRemoved: Event<void> = this._onHighlightRemoved.event;
+	private readonly _onHighlightRemoved: Emitter<void> = this._register(new Emitter<void>());
+	get onHighlghtRemoved(): Event<void> { return this._onHighlightRemoved.event; }
 
 	constructor(@IEditorService private editorService: IEditorService) {
+		super();
 	}
 
-	public removeHighlightRange() {
+	removeHighlightRange() {
 		if (this.editor && this.editor.getModel() && this.rangeHighlightDecorationId) {
 			this.editor.deltaDecorations([this.rangeHighlightDecorationId], []);
 			this._onHighlightRemoved.fire();
 		}
+
 		this.rangeHighlightDecorationId = null;
 	}
 
-	public highlightRange(range: IRangeHighlightDecoration, editor?: ICodeEditor) {
+	highlightRange(range: IRangeHighlightDecoration, editor?: ICodeEditor) {
 		editor = editor ? editor : this.getEditor(range);
 		if (editor) {
 			this.doHighlightRange(editor, range);
@@ -48,9 +50,11 @@ export class RangeHighlightDecorations implements IDisposable {
 
 	private doHighlightRange(editor: ICodeEditor, selectionRange: IRangeHighlightDecoration) {
 		this.removeHighlightRange();
+
 		editor.changeDecorations((changeAccessor: IModelDecorationsChangeAccessor) => {
 			this.rangeHighlightDecorationId = changeAccessor.addDecoration(selectionRange.range, this.createRangeHighlightDecoration(selectionRange.isWholeLine));
 		});
+
 		this.setEditor(editor);
 	}
 
@@ -62,6 +66,7 @@ export class RangeHighlightDecorations implements IDisposable {
 				return this.editorService.activeTextEditorWidget as ICodeEditor;
 			}
 		}
+
 		return null;
 	}
 
@@ -107,7 +112,9 @@ export class RangeHighlightDecorations implements IDisposable {
 		return (isWholeLine ? RangeHighlightDecorations._WHOLE_LINE_RANGE_HIGHLIGHT : RangeHighlightDecorations._RANGE_HIGHLIGHT);
 	}
 
-	public dispose() {
+	dispose() {
+		super.dispose();
+
 		if (this.editor && this.editor.getModel()) {
 			this.removeHighlightRange();
 			this.disposeEditorListeners();
diff --git a/src/vs/workbench/browser/parts/editor/resourceViewer.ts b/src/vs/workbench/browser/parts/editor/resourceViewer.ts
index b7962916769..298583135d3 100644
--- a/src/vs/workbench/browser/parts/editor/resourceViewer.ts
+++ b/src/vs/workbench/browser/parts/editor/resourceViewer.ts
@@ -6,17 +6,17 @@
 import 'vs/css!./media/resourceviewer';
 import * as nls from 'vs/nls';
 import * as mimes from 'vs/base/common/mime';
-import URI from 'vs/base/common/uri';
-import { Builder, $ } from 'vs/base/browser/builder';
+import { URI } from 'vs/base/common/uri';
 import * as DOM from 'vs/base/browser/dom';
 import { DomScrollableElement } from 'vs/base/browser/ui/scrollbar/scrollableElement';
 import { LRUCache } from 'vs/base/common/map';
 import { Schemas } from 'vs/base/common/network';
 import { clamp } from 'vs/base/common/numbers';
 import { Themable } from 'vs/workbench/common/theme';
-import { IStatusbarItem, StatusbarItemDescriptor, IStatusbarRegistry, Extensions, StatusbarAlignment } from 'vs/workbench/browser/parts/statusbar/statusbar';
+import { IStatusbarItem, StatusbarItemDescriptor, IStatusbarRegistry, Extensions } from 'vs/workbench/browser/parts/statusbar/statusbar';
+import { StatusbarAlignment } from 'vs/platform/statusbar/common/statusbar';
 import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { IDisposable } from 'vs/base/common/lifecycle';
+import { IDisposable, Disposable, combinedDisposable } from 'vs/base/common/lifecycle';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { TPromise } from 'vs/base/common/winjs.base';
@@ -35,12 +35,12 @@ export interface IResourceDescriptor {
 }
 
 class BinarySize {
-	public static readonly KB = 1024;
-	public static readonly MB = BinarySize.KB * BinarySize.KB;
-	public static readonly GB = BinarySize.MB * BinarySize.KB;
-	public static readonly TB = BinarySize.GB * BinarySize.KB;
+	static readonly KB = 1024;
+	static readonly MB = BinarySize.KB * BinarySize.KB;
+	static readonly GB = BinarySize.MB * BinarySize.KB;
+	static readonly TB = BinarySize.GB * BinarySize.KB;
 
-	public static formatSize(size: number): string {
+	static formatSize(size: number): string {
 		if (size < BinarySize.KB) {
 			return nls.localize('sizeB', "{0}B", size);
 		}
@@ -61,8 +61,8 @@ class BinarySize {
 	}
 }
 
-export interface ResourceViewerContext {
-	layout(dimension: DOM.Dimension): void;
+export interface ResourceViewerContext extends IDisposable {
+	layout?(dimension: DOM.Dimension): void;
 }
 
 /**
@@ -73,7 +73,7 @@ export class ResourceViewer {
 
 	private static readonly MAX_OPEN_INTERNAL_SIZE = BinarySize.MB * 200; // max size until we offer an action to open internally
 
-	public static show(
+	static show(
 		descriptor: IResourceDescriptor,
 		fileService: IFileService,
 		container: HTMLElement,
@@ -81,10 +81,10 @@ export class ResourceViewer {
 		openInternalClb: (uri: URI) => void,
 		openExternalClb: (uri: URI) => void,
 		metadataClb: (meta: string) => void
-	): ResourceViewerContext | null {
+	): ResourceViewerContext {
 
 		// Ensure CSS class
-		$(container).setClass('monaco-resource-viewer');
+		container.className = 'monaco-resource-viewer';
 
 		// Images
 		if (ResourceViewer.isImageResource(descriptor)) {
@@ -93,21 +93,20 @@ export class ResourceViewer {
 
 		// Large Files
 		if (descriptor.size > ResourceViewer.MAX_OPEN_INTERNAL_SIZE) {
-			FileTooLargeFileView.create(container, descriptor, scrollbar, metadataClb);
+			return FileTooLargeFileView.create(container, descriptor, scrollbar, metadataClb);
 		}
 
 		// Seemingly Binary Files
 		else {
-			FileSeemsBinaryFileView.create(container, descriptor, scrollbar, openInternalClb, metadataClb);
+			return FileSeemsBinaryFileView.create(container, descriptor, scrollbar, openInternalClb, metadataClb);
 		}
-
-		return null;
 	}
 
 	private static isImageResource(descriptor: IResourceDescriptor) {
 		const mime = getMime(descriptor);
 
-		return mime.indexOf('image/') >= 0;
+		// Chrome does not support tiffs
+		return mime.indexOf('image/') >= 0 && mime !== 'image/tiff';
 	}
 }
 
@@ -115,21 +114,19 @@ class ImageView {
 	private static readonly MAX_IMAGE_SIZE = BinarySize.MB; // showing images inline is memory intense, so we have a limit
 	private static readonly BASE64_MARKER = 'base64,';
 
-	public static create(
+	static create(
 		container: HTMLElement,
 		descriptor: IResourceDescriptor,
 		fileService: IFileService,
 		scrollbar: DomScrollableElement,
 		openExternalClb: (uri: URI) => void,
 		metadataClb: (meta: string) => void
-	): ResourceViewerContext | null {
+	): ResourceViewerContext {
 		if (ImageView.shouldShowImageInline(descriptor)) {
 			return InlineImageView.create(container, descriptor, fileService, scrollbar, metadataClb);
 		}
 
-		LargeImageView.create(container, descriptor, openExternalClb);
-
-		return null;
+		return LargeImageView.create(container, descriptor, openExternalClb);
 	}
 
 	private static shouldShowImageInline(descriptor: IResourceDescriptor): boolean {
@@ -153,76 +150,78 @@ class ImageView {
 }
 
 class LargeImageView {
-	public static create(
+	static create(
 		container: HTMLElement,
 		descriptor: IResourceDescriptor,
 		openExternalClb: (uri: URI) => void
 	) {
-		const size = BinarySize.formatSize(descriptor.size);
+		DOM.clearNode(container);
 
-		const imageContainer = $(container)
-			.empty()
-			.p({
-				text: nls.localize('largeImageError', "The image is not displayed in the editor because it is too large ({0}).", size)
-			});
+		const disposables: IDisposable[] = [];
+
+		const label = document.createElement('p');
+		label.textContent = nls.localize('largeImageError', "The image is not displayed in the editor because it is too large ({0}).", BinarySize.formatSize(descriptor.size));
+		container.appendChild(label);
 
 		if (descriptor.resource.scheme !== Schemas.data) {
-			imageContainer.append($('a', {
-				role: 'button',
-				class: 'embedded-link',
-				text: nls.localize('resourceOpenExternalButton', "Open image using external program?")
-			}).on(DOM.EventType.CLICK, (e) => {
-				openExternalClb(descriptor.resource);
-			}));
+			const link = DOM.append(label, DOM.$('a.embedded-link'));
+			link.setAttribute('role', 'button');
+			link.textContent = nls.localize('resourceOpenExternalButton', "Open image using external program?");
+
+			disposables.push(DOM.addDisposableListener(link, DOM.EventType.CLICK, () => openExternalClb(descriptor.resource)));
 		}
+
+		return combinedDisposable(disposables);
 	}
 }
 
 class FileTooLargeFileView {
-	public static create(
+	static create(
 		container: HTMLElement,
 		descriptor: IResourceDescriptor,
 		scrollbar: DomScrollableElement,
 		metadataClb: (meta: string) => void
 	) {
+		DOM.clearNode(container);
+
 		const size = BinarySize.formatSize(descriptor.size);
 
-		$(container)
-			.empty()
-			.span({
-				text: nls.localize('nativeFileTooLargeError', "The file is not displayed in the editor because it is too large ({0}).", size)
-			});
+		const label = document.createElement('span');
+		label.textContent = nls.localize('nativeFileTooLargeError', "The file is not displayed in the editor because it is too large ({0}).", size);
+		container.appendChild(label);
 
 		if (metadataClb) {
 			metadataClb(size);
 		}
 
 		scrollbar.scanDomNode();
+
+		return Disposable.None;
 	}
 }
 
 class FileSeemsBinaryFileView {
-	public static create(
+	static create(
 		container: HTMLElement,
 		descriptor: IResourceDescriptor,
 		scrollbar: DomScrollableElement,
 		openInternalClb: (uri: URI) => void,
 		metadataClb: (meta: string) => void
 	) {
-		const binaryContainer = $(container)
-			.empty()
-			.p({
-				text: nls.localize('nativeBinaryError', "The file is not displayed in the editor because it is either binary or uses an unsupported text encoding.")
-			});
+		DOM.clearNode(container);
+
+		const disposables: IDisposable[] = [];
+
+		const label = document.createElement('p');
+		label.textContent = nls.localize('nativeBinaryError', "The file is not displayed in the editor because it is either binary or uses an unsupported text encoding.");
+		container.appendChild(label);
 
 		if (descriptor.resource.scheme !== Schemas.data) {
-			binaryContainer.append($('a', {
-				role: 'button',
-				class: 'embedded-link',
-				text: nls.localize('openAsText', "Do you want to open it anyway?")
-			}).on(DOM.EventType.CLICK, (e) => {
-				openInternalClb(descriptor.resource);
-			}));
+			const link = DOM.append(label, DOM.$('a.embedded-link'));
+			link.setAttribute('role', 'button');
+			link.textContent = nls.localize('openAsText', "Do you want to open it anyway?");
+
+			disposables.push(DOM.addDisposableListener(link, DOM.EventType.CLICK, () => openInternalClb(descriptor.resource)));
 		}
 
 		if (metadataClb) {
@@ -230,17 +229,20 @@ class FileSeemsBinaryFileView {
 		}
 
 		scrollbar.scanDomNode();
+
+		return combinedDisposable(disposables);
 	}
 }
 
 type Scale = number | 'fit';
 
 class ZoomStatusbarItem extends Themable implements IStatusbarItem {
+
+	static instance: ZoomStatusbarItem;
+
 	showTimeout: number;
-	public static instance: ZoomStatusbarItem;
 
 	private statusBarItem: HTMLElement;
-
 	private onSelectScale?: (scale: Scale) => void;
 
 	constructor(
@@ -249,8 +251,10 @@ class ZoomStatusbarItem extends Themable implements IStatusbarItem {
 		@IThemeService themeService: IThemeService
 	) {
 		super(themeService);
+
 		ZoomStatusbarItem.instance = this;
-		this.toUnbind.push(editorService.onDidActiveEditorChange(() => this.onActiveEditorChanged()));
+
+		this._register(editorService.onDidActiveEditorChange(() => this.onActiveEditorChanged()));
 	}
 
 	private onActiveEditorChanged(): void {
@@ -258,7 +262,7 @@ class ZoomStatusbarItem extends Themable implements IStatusbarItem {
 		this.onSelectScale = void 0;
 	}
 
-	public show(scale: Scale, onSelectScale: (scale: number) => void) {
+	show(scale: Scale, onSelectScale: (scale: number) => void) {
 		clearTimeout(this.showTimeout);
 		this.showTimeout = setTimeout(() => {
 			this.onSelectScale = onSelectScale;
@@ -267,22 +271,22 @@ class ZoomStatusbarItem extends Themable implements IStatusbarItem {
 		}, 0);
 	}
 
-	public hide() {
+	hide() {
 		this.statusBarItem.style.display = 'none';
 	}
 
-	public render(container: HTMLElement): IDisposable {
+	render(container: HTMLElement): IDisposable {
 		if (!this.statusBarItem && container) {
-			this.statusBarItem = $(container).a()
-				.addClass('.zoom-statusbar-item')
-				.on('click', () => {
-					this.contextMenuService.showContextMenu({
-						getAnchor: () => container,
-						getActions: () => TPromise.as(this.zoomActions)
-					});
-				})
-				.getHTMLElement();
+			this.statusBarItem = DOM.append(container, DOM.$('a.zoom-statusbar-item'));
+			this.statusBarItem.setAttribute('role', 'button');
 			this.statusBarItem.style.display = 'none';
+
+			DOM.addDisposableListener(this.statusBarItem, DOM.EventType.CLICK, () => {
+				this.contextMenuService.showContextMenu({
+					getAnchor: () => container,
+					getActions: () => TPromise.as(this.zoomActions)
+				});
+			});
 		}
 
 		return this;
@@ -301,7 +305,7 @@ class ZoomStatusbarItem extends Themable implements IStatusbarItem {
 					this.onSelectScale(scale);
 				}
 
-				return null;
+				return void 0;
 			}));
 	}
 
@@ -358,15 +362,18 @@ class InlineImageView {
 	 */
 	private static readonly imageStateCache = new LRUCache<string, ImageState>(100);
 
-	public static create(
+	static create(
 		container: HTMLElement,
 		descriptor: IResourceDescriptor,
 		fileService: IFileService,
 		scrollbar: DomScrollableElement,
 		metadataClb: (meta: string) => void
 	) {
-		const context = {
-			layout(dimension: DOM.Dimension) { }
+		const disposables: IDisposable[] = [];
+
+		const context: ResourceViewerContext = {
+			layout(dimension: DOM.Dimension) { },
+			dispose: () => combinedDisposable(disposables).dispose()
 		};
 
 		const cacheKey = descriptor.resource.toString();
@@ -376,41 +383,40 @@ class InlineImageView {
 
 		const initialState: ImageState = InlineImageView.imageStateCache.get(cacheKey) || { scale: 'fit', offsetX: 0, offsetY: 0 };
 		let scale = initialState.scale;
-		let img: Builder | null = null;
-		let imgElement: HTMLImageElement | null = null;
+		let image: HTMLImageElement = null;
 
 		function updateScale(newScale: Scale) {
-			if (!img || !imgElement.parentElement) {
+			if (!image || !image.parentElement) {
 				return;
 			}
 
 			if (newScale === 'fit') {
 				scale = 'fit';
-				img.addClass('scale-to-fit');
-				img.removeClass('pixelated');
-				img.style('min-width', 'auto');
-				img.style('width', 'auto');
+				DOM.addClass(image, 'scale-to-fit');
+				DOM.removeClass(image, 'pixelated');
+				image.style.minWidth = 'auto';
+				image.style.width = 'auto';
 				InlineImageView.imageStateCache.set(cacheKey, null);
 			} else {
-				const oldWidth = imgElement.width;
-				const oldHeight = imgElement.height;
+				const oldWidth = image.width;
+				const oldHeight = image.height;
 
 				scale = clamp(newScale, InlineImageView.MIN_SCALE, InlineImageView.MAX_SCALE);
 				if (scale >= InlineImageView.PIXELATION_THRESHOLD) {
-					img.addClass('pixelated');
+					DOM.addClass(image, 'pixelated');
 				} else {
-					img.removeClass('pixelated');
+					DOM.removeClass(image, 'pixelated');
 				}
 
-				const { scrollTop, scrollLeft } = imgElement.parentElement;
-				const dx = (scrollLeft + imgElement.parentElement.clientWidth / 2) / imgElement.parentElement.scrollWidth;
-				const dy = (scrollTop + imgElement.parentElement.clientHeight / 2) / imgElement.parentElement.scrollHeight;
+				const { scrollTop, scrollLeft } = image.parentElement;
+				const dx = (scrollLeft + image.parentElement.clientWidth / 2) / image.parentElement.scrollWidth;
+				const dy = (scrollTop + image.parentElement.clientHeight / 2) / image.parentElement.scrollHeight;
 
-				img.removeClass('scale-to-fit');
-				img.style('min-width', `${(imgElement.naturalWidth * scale)}px`);
-				img.style('width', `${(imgElement.naturalWidth * scale)}px`);
+				DOM.removeClass(image, 'scale-to-fit');
+				image.style.minWidth = `${(image.naturalWidth * scale)}px`;
+				image.style.widows = `${(image.naturalWidth * scale)}px`;
 
-				const newWidth = imgElement.width;
+				const newWidth = image.width;
 				const scaleFactor = (newWidth - oldWidth) / oldWidth;
 
 				const newScrollLeft = ((oldWidth * scaleFactor * dx) + scrollLeft);
@@ -428,123 +434,126 @@ class InlineImageView {
 		}
 
 		function firstZoom() {
-			scale = imgElement.clientWidth / imgElement.naturalWidth;
+			scale = image.clientWidth / image.naturalWidth;
 			updateScale(scale);
 		}
 
-		$(container)
-			.on(DOM.EventType.KEY_DOWN, (e: KeyboardEvent, c) => {
-				if (!img) {
-					return;
-				}
-				ctrlPressed = e.ctrlKey;
-				altPressed = e.altKey;
+		disposables.push(DOM.addDisposableListener(container, DOM.EventType.KEY_DOWN, (e: KeyboardEvent) => {
+			if (!image) {
+				return;
+			}
+			ctrlPressed = e.ctrlKey;
+			altPressed = e.altKey;
 
-				if (platform.isMacintosh ? altPressed : ctrlPressed) {
-					c.removeClass('zoom-in').addClass('zoom-out');
-				}
-			})
-			.on(DOM.EventType.KEY_UP, (e: KeyboardEvent, c) => {
-				if (!img) {
-					return;
-				}
+			if (platform.isMacintosh ? altPressed : ctrlPressed) {
+				DOM.removeClass(container, 'zoom-in');
+				DOM.addClass(container, 'zoom-out');
+			}
+		}));
 
-				ctrlPressed = e.ctrlKey;
-				altPressed = e.altKey;
+		disposables.push(DOM.addDisposableListener(container, DOM.EventType.KEY_UP, (e: KeyboardEvent) => {
+			if (!image) {
+				return;
+			}
 
-				if (!(platform.isMacintosh ? altPressed : ctrlPressed)) {
-					c.removeClass('zoom-out').addClass('zoom-in');
-				}
-			})
-			.on(DOM.EventType.CLICK, (e: MouseEvent) => {
-				if (!img) {
-					return;
-				}
+			ctrlPressed = e.ctrlKey;
+			altPressed = e.altKey;
 
-				if (e.button !== 0) {
-					return;
-				}
+			if (!(platform.isMacintosh ? altPressed : ctrlPressed)) {
+				DOM.removeClass(container, 'zoom-out');
+				DOM.addClass(container, 'zoom-in');
+			}
+		}));
 
-				// left click
-				if (scale === 'fit') {
-					firstZoom();
-				}
+		disposables.push(DOM.addDisposableListener(container, DOM.EventType.CLICK, (e: MouseEvent) => {
+			if (!image) {
+				return;
+			}
 
-				if (!(platform.isMacintosh ? altPressed : ctrlPressed)) { // zoom in
-					let i = 0;
-					for (; i < InlineImageView.zoomLevels.length; ++i) {
-						if (InlineImageView.zoomLevels[i] > scale) {
-							break;
-						}
+			if (e.button !== 0) {
+				return;
+			}
+
+			// left click
+			if (scale === 'fit') {
+				firstZoom();
+			}
+
+			if (!(platform.isMacintosh ? altPressed : ctrlPressed)) { // zoom in
+				let i = 0;
+				for (; i < InlineImageView.zoomLevels.length; ++i) {
+					if (InlineImageView.zoomLevels[i] > scale) {
+						break;
 					}
-					updateScale(InlineImageView.zoomLevels[i] || InlineImageView.MAX_SCALE);
-				} else {
-					let i = InlineImageView.zoomLevels.length - 1;
-					for (; i >= 0; --i) {
-						if (InlineImageView.zoomLevels[i] < scale) {
-							break;
-						}
+				}
+				updateScale(InlineImageView.zoomLevels[i] || InlineImageView.MAX_SCALE);
+			} else {
+				let i = InlineImageView.zoomLevels.length - 1;
+				for (; i >= 0; --i) {
+					if (InlineImageView.zoomLevels[i] < scale) {
+						break;
 					}
-					updateScale(InlineImageView.zoomLevels[i] || InlineImageView.MIN_SCALE);
-				}
-			})
-			.on(DOM.EventType.WHEEL, (e: WheelEvent) => {
-				if (!img) {
-					return;
 				}
+				updateScale(InlineImageView.zoomLevels[i] || InlineImageView.MIN_SCALE);
+			}
+		}));
 
-				const isScrollWhellKeyPressed = platform.isMacintosh ? altPressed : ctrlPressed;
-				if (!isScrollWhellKeyPressed && !e.ctrlKey) { // pinching is reported as scroll wheel + ctrl
-					return;
-				}
+		disposables.push(DOM.addDisposableListener(container, DOM.EventType.WHEEL, (e: WheelEvent) => {
+			if (!image) {
+				return;
+			}
 
-				e.preventDefault();
-				e.stopPropagation();
+			const isScrollWhellKeyPressed = platform.isMacintosh ? altPressed : ctrlPressed;
+			if (!isScrollWhellKeyPressed && !e.ctrlKey) { // pinching is reported as scroll wheel + ctrl
+				return;
+			}
 
-				if (scale === 'fit') {
-					firstZoom();
-				}
+			e.preventDefault();
+			e.stopPropagation();
 
-				let delta = e.deltaY < 0 ? 1 : -1;
+			if (scale === 'fit') {
+				firstZoom();
+			}
 
-				// Pinching should increase the scale
-				if (e.ctrlKey && !isScrollWhellKeyPressed) {
-					delta *= -1;
-				}
-				updateScale(scale as number * (1 - delta * InlineImageView.SCALE_PINCH_FACTOR));
-			})
-			.on(DOM.EventType.SCROLL, () => {
-				if (!imgElement || !imgElement.parentElement || scale === 'fit') {
-					return;
-				}
+			let delta = e.deltaY < 0 ? 1 : -1;
 
-				const entry = InlineImageView.imageStateCache.get(cacheKey);
-				if (entry) {
-					const { scrollTop, scrollLeft } = imgElement.parentElement;
-					InlineImageView.imageStateCache.set(cacheKey, { scale: entry.scale, offsetX: scrollLeft, offsetY: scrollTop });
-				}
-			});
+			// Pinching should increase the scale
+			if (e.ctrlKey && !isScrollWhellKeyPressed) {
+				delta *= -1;
+			}
+			updateScale(scale as number * (1 - delta * InlineImageView.SCALE_PINCH_FACTOR));
+		}));
 
-		$(container)
-			.empty()
-			.addClass('image', 'zoom-in')
-			.img({})
-			.style('visibility', 'hidden')
-			.addClass('scale-to-fit')
-			.on(DOM.EventType.LOAD, (e, i) => {
-				img = i;
-				imgElement = img.getHTMLElement() as HTMLImageElement;
-				metadataClb(nls.localize('imgMeta', '{0}x{1} {2}', imgElement.naturalWidth, imgElement.naturalHeight, BinarySize.formatSize(descriptor.size)));
-				scrollbar.scanDomNode();
-				img.style('visibility', 'visible');
-				updateScale(scale);
-				if (initialState.scale !== 'fit') {
-					scrollbar.setScrollPosition({
-						scrollLeft: initialState.offsetX,
-						scrollTop: initialState.offsetY,
-					});
-				}
-			});
+		disposables.push(DOM.addDisposableListener(container, DOM.EventType.SCROLL, () => {
+			if (!image || !image.parentElement || scale === 'fit') {
+				return;
+			}
+
+			const entry = InlineImageView.imageStateCache.get(cacheKey);
+			if (entry) {
+				const { scrollTop, scrollLeft } = image.parentElement;
+				InlineImageView.imageStateCache.set(cacheKey, { scale: entry.scale, offsetX: scrollLeft, offsetY: scrollTop });
+			}
+		}));
+
+		DOM.clearNode(container);
+		DOM.addClasses(container, 'image', 'zoom-in');
+
+		image = DOM.append(container, DOM.$('img.scale-to-fit'));
+		image.style.visibility = 'hidden';
+
+		disposables.push(DOM.addDisposableListener(image, DOM.EventType.LOAD, e => {
+			metadataClb(nls.localize('imgMeta', '{0}x{1} {2}', image.naturalWidth, image.naturalHeight, BinarySize.formatSize(descriptor.size)));
+			scrollbar.scanDomNode();
+			image.style.visibility = 'visible';
+			updateScale(scale);
+			if (initialState.scale !== 'fit') {
+				scrollbar.setScrollPosition({
+					scrollLeft: initialState.offsetX,
+					scrollTop: initialState.offsetY,
+				});
+			}
+		}));
 
 		InlineImageView.imageSrc(descriptor, fileService).then(dataUri => {
 			const imgs = container.getElementsByTagName('img');
@@ -563,6 +572,7 @@ class InlineImageView {
 
 		return fileService.resolveContent(descriptor.resource, { encoding: 'base64' }).then(data => {
 			const mime = getMime(descriptor);
+
 			return `data:${mime};base64,${data.value}`;
 		});
 	}
@@ -571,7 +581,7 @@ class InlineImageView {
 function getMime(descriptor: IResourceDescriptor) {
 	let mime = descriptor.mime;
 	if (!mime && descriptor.resource.scheme !== Schemas.data) {
-		mime = mimes.getMediaMime(descriptor.resource.toString());
+		mime = mimes.getMediaMime(descriptor.resource.path);
 	}
 	return mime || mimes.MIME_BINARY;
 }
diff --git a/src/vs/workbench/browser/parts/editor/sideBySideEditor.ts b/src/vs/workbench/browser/parts/editor/sideBySideEditor.ts
index beaeeb75ed3..b38e32f681a 100644
--- a/src/vs/workbench/browser/parts/editor/sideBySideEditor.ts
+++ b/src/vs/workbench/browser/parts/editor/sideBySideEditor.ts
@@ -8,7 +8,6 @@ import * as DOM from 'vs/base/browser/dom';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { EditorInput, EditorOptions, SideBySideEditorInput, IEditorControl, IEditor } from 'vs/workbench/common/editor';
 import { BaseEditor } from 'vs/workbench/browser/parts/editor/baseEditor';
-import { VSash } from 'vs/base/browser/ui/sash/sash';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
@@ -16,20 +15,46 @@ import { scrollbarShadow } from 'vs/platform/theme/common/colorRegistry';
 import { IEditorRegistry, Extensions as EditorExtensions } from 'vs/workbench/browser/editor';
 import { CancellationToken } from 'vs/base/common/cancellation';
 import { IEditorGroup } from 'vs/workbench/services/group/common/editorGroupsService';
+import { SplitView, Sizing, Orientation } from 'vs/base/browser/ui/splitview/splitview';
+import { Event, Relay, anyEvent, mapEvent, Emitter } from 'vs/base/common/event';
 
 export class SideBySideEditor extends BaseEditor {
 
-	public static readonly ID: string = 'workbench.editor.sidebysideEditor';
+	static readonly ID: string = 'workbench.editor.sidebysideEditor';
 
-	private dimension: DOM.Dimension;
+	get minimumMasterWidth() { return this.masterEditor ? this.masterEditor.minimumWidth : 0; }
+	get maximumMasterWidth() { return this.masterEditor ? this.masterEditor.maximumWidth : Number.POSITIVE_INFINITY; }
+	get minimumMasterHeight() { return this.masterEditor ? this.masterEditor.minimumHeight : 0; }
+	get maximumMasterHeight() { return this.masterEditor ? this.masterEditor.maximumHeight : Number.POSITIVE_INFINITY; }
+
+	get minimumDetailsWidth() { return this.detailsEditor ? this.detailsEditor.minimumWidth : 0; }
+	get maximumDetailsWidth() { return this.detailsEditor ? this.detailsEditor.maximumWidth : Number.POSITIVE_INFINITY; }
+	get minimumDetailsHeight() { return this.detailsEditor ? this.detailsEditor.minimumHeight : 0; }
+	get maximumDetailsHeight() { return this.detailsEditor ? this.detailsEditor.maximumHeight : Number.POSITIVE_INFINITY; }
+
+	// these setters need to exist because this extends from BaseEditor
+	set minimumWidth(value: number) { /* noop */ }
+	set maximumWidth(value: number) { /* noop */ }
+	set minimumHeight(value: number) { /* noop */ }
+	set maximumHeight(value: number) { /* noop */ }
+
+	get minimumWidth() { return this.minimumMasterWidth + this.minimumDetailsWidth; }
+	get maximumWidth() { return this.maximumMasterWidth + this.maximumDetailsWidth; }
+	get minimumHeight() { return this.minimumMasterHeight + this.minimumDetailsHeight; }
+	get maximumHeight() { return this.maximumMasterHeight + this.maximumDetailsHeight; }
 
 	protected masterEditor: BaseEditor;
-	private masterEditorContainer: HTMLElement;
-
 	protected detailsEditor: BaseEditor;
+
+	private masterEditorContainer: HTMLElement;
 	private detailsEditorContainer: HTMLElement;
 
-	private sash: VSash;
+	private splitview: SplitView;
+	private dimension: DOM.Dimension = new DOM.Dimension(0, 0);
+
+	private onDidCreateEditors = this._register(new Emitter<{ width: number; height: number; }>());
+	private _onDidSizeConstraintsChange = this._register(new Relay<{ width: number; height: number; }>());
+	readonly onDidSizeConstraintsChange: Event<{ width: number; height: number; }> = anyEvent(this.onDidCreateEditors.event, this._onDidSizeConstraintsChange.event);
 
 	constructor(
 		@ITelemetryService telemetryService: ITelemetryService,
@@ -41,16 +66,38 @@ export class SideBySideEditor extends BaseEditor {
 
 	protected createEditor(parent: HTMLElement): void {
 		DOM.addClass(parent, 'side-by-side-editor');
-		this.createSash(parent);
+
+		this.splitview = this._register(new SplitView(parent, { orientation: Orientation.HORIZONTAL }));
+		this._register(this.splitview.onDidSashReset(() => this.splitview.distributeViewSizes()));
+
+		this.detailsEditorContainer = DOM.$('.details-editor-container');
+		this.splitview.addView({
+			element: this.detailsEditorContainer,
+			layout: size => this.detailsEditor && this.detailsEditor.layout(new DOM.Dimension(size, this.dimension.height)),
+			minimumSize: 220,
+			maximumSize: Number.POSITIVE_INFINITY,
+			onDidChange: Event.None
+		}, Sizing.Distribute);
+
+		this.masterEditorContainer = DOM.$('.master-editor-container');
+		this.splitview.addView({
+			element: this.masterEditorContainer,
+			layout: size => this.masterEditor && this.masterEditor.layout(new DOM.Dimension(size, this.dimension.height)),
+			minimumSize: 220,
+			maximumSize: Number.POSITIVE_INFINITY,
+			onDidChange: Event.None
+		}, Sizing.Distribute);
+
+		this.updateStyles();
 	}
 
-	public setInput(newInput: SideBySideEditorInput, options: EditorOptions, token: CancellationToken): Thenable<void> {
+	setInput(newInput: SideBySideEditorInput, options: EditorOptions, token: CancellationToken): Thenable<void> {
 		const oldInput = <SideBySideEditorInput>this.input;
 		return super.setInput(newInput, options, token)
 			.then(() => this.updateInput(oldInput, newInput, options, token));
 	}
 
-	public setOptions(options: EditorOptions): void {
+	setOptions(options: EditorOptions): void {
 		if (this.masterEditor) {
 			this.masterEditor.setOptions(options);
 		}
@@ -66,7 +113,7 @@ export class SideBySideEditor extends BaseEditor {
 		super.setEditorVisible(visible, group);
 	}
 
-	public clearInput(): void {
+	clearInput(): void {
 		if (this.masterEditor) {
 			this.masterEditor.clearInput();
 		}
@@ -77,57 +124,49 @@ export class SideBySideEditor extends BaseEditor {
 		super.clearInput();
 	}
 
-	public focus(): void {
+	focus(): void {
 		if (this.masterEditor) {
 			this.masterEditor.focus();
 		}
 	}
 
-	public layout(dimension: DOM.Dimension): void {
+	layout(dimension: DOM.Dimension): void {
 		this.dimension = dimension;
-		this.sash.setDimenesion(this.dimension);
+		this.splitview.layout(dimension.width);
 	}
 
-	public getControl(): IEditorControl {
+	getControl(): IEditorControl {
 		if (this.masterEditor) {
 			return this.masterEditor.getControl();
 		}
 		return null;
 	}
 
-	public getMasterEditor(): IEditor {
+	getMasterEditor(): IEditor {
 		return this.masterEditor;
 	}
 
-	public getDetailsEditor(): IEditor {
+	getDetailsEditor(): IEditor {
 		return this.detailsEditor;
 	}
 
-	public supportsCenteredLayout(): boolean {
-		return false;
-	}
-
-	private updateInput(oldInput: SideBySideEditorInput, newInput: SideBySideEditorInput, options: EditorOptions, token: CancellationToken): void {
+	private updateInput(oldInput: SideBySideEditorInput, newInput: SideBySideEditorInput, options: EditorOptions, token: CancellationToken): Thenable<void> {
 		if (!newInput.matches(oldInput)) {
 			if (oldInput) {
 				this.disposeEditors();
 			}
-			this.createEditorContainers();
 
 			return this.setNewInput(newInput, options, token);
-		} else {
-			this.detailsEditor.setInput(newInput.details, null, token);
-			this.masterEditor.setInput(newInput.master, options, token);
-
-			return void 0;
 		}
+
+		return TPromise.join([this.detailsEditor.setInput(newInput.details, null, token), this.masterEditor.setInput(newInput.master, options, token)]).then(() => void 0);
 	}
 
-	private setNewInput(newInput: SideBySideEditorInput, options: EditorOptions, token: CancellationToken): void {
+	private setNewInput(newInput: SideBySideEditorInput, options: EditorOptions, token: CancellationToken): Thenable<void> {
 		const detailsEditor = this._createEditor(<EditorInput>newInput.details, this.detailsEditorContainer);
 		const masterEditor = this._createEditor(<EditorInput>newInput.master, this.masterEditorContainer);
 
-		this.onEditorsCreated(detailsEditor, masterEditor, newInput.details, newInput.master, options, token);
+		return this.onEditorsCreated(detailsEditor, masterEditor, newInput.details, newInput.master, options, token);
 	}
 
 	private _createEditor(editorInput: EditorInput, container: HTMLElement): BaseEditor {
@@ -143,21 +182,18 @@ export class SideBySideEditor extends BaseEditor {
 	private onEditorsCreated(details: BaseEditor, master: BaseEditor, detailsInput: EditorInput, masterInput: EditorInput, options: EditorOptions, token: CancellationToken): TPromise<void> {
 		this.detailsEditor = details;
 		this.masterEditor = master;
-		this.dolayout(this.sash.getVerticalSashLeft());
+
+		this._onDidSizeConstraintsChange.input = anyEvent(
+			mapEvent(details.onDidSizeConstraintsChange, () => undefined),
+			mapEvent(master.onDidSizeConstraintsChange, () => undefined)
+		);
+
+		this.onDidCreateEditors.fire();
+
 		return TPromise.join([this.detailsEditor.setInput(detailsInput, null, token), this.masterEditor.setInput(masterInput, options, token)]).then(() => this.focus());
 	}
 
-	private createEditorContainers(): void {
-		const parentElement = this.getContainer();
-		this.detailsEditorContainer = DOM.append(parentElement, DOM.$('.details-editor-container'));
-		this.detailsEditorContainer.style.position = 'absolute';
-		this.masterEditorContainer = DOM.append(parentElement, DOM.$('.master-editor-container'));
-		this.masterEditorContainer.style.position = 'absolute';
-
-		this.updateStyles();
-	}
-
-	public updateStyles(): void {
+	updateStyles(): void {
 		super.updateStyles();
 
 		if (this.masterEditorContainer) {
@@ -165,52 +201,24 @@ export class SideBySideEditor extends BaseEditor {
 		}
 	}
 
-	private createSash(parentElement: HTMLElement): void {
-		this.sash = this._register(new VSash(parentElement, 220));
-		this._register(this.sash.onPositionChange(position => this.dolayout(position)));
-	}
-
-	private dolayout(splitPoint: number): void {
-		if (!this.detailsEditor || !this.masterEditor || !this.dimension) {
-			return;
-		}
-		const masterEditorWidth = this.dimension.width - splitPoint;
-		const detailsEditorWidth = this.dimension.width - masterEditorWidth;
-
-		this.detailsEditorContainer.style.width = `${detailsEditorWidth}px`;
-		this.detailsEditorContainer.style.height = `${this.dimension.height}px`;
-		this.detailsEditorContainer.style.left = '0px';
-
-		this.masterEditorContainer.style.width = `${masterEditorWidth}px`;
-		this.masterEditorContainer.style.height = `${this.dimension.height}px`;
-		this.masterEditorContainer.style.left = `${splitPoint}px`;
-
-		this.detailsEditor.layout(new DOM.Dimension(detailsEditorWidth, this.dimension.height));
-		this.masterEditor.layout(new DOM.Dimension(masterEditorWidth, this.dimension.height));
-	}
-
 	private disposeEditors(): void {
-		const parentContainer = this.getContainer();
 		if (this.detailsEditor) {
 			this.detailsEditor.dispose();
 			this.detailsEditor = null;
 		}
+
 		if (this.masterEditor) {
 			this.masterEditor.dispose();
 			this.masterEditor = null;
 		}
-		if (this.detailsEditorContainer) {
-			parentContainer.removeChild(this.detailsEditorContainer);
-			this.detailsEditorContainer = null;
-		}
-		if (this.masterEditorContainer) {
-			parentContainer.removeChild(this.masterEditorContainer);
-			this.masterEditorContainer = null;
-		}
+
+		this.detailsEditorContainer.innerHTML = '';
+		this.masterEditorContainer.innerHTML = '';
 	}
 
-	public dispose(): void {
+	dispose(): void {
 		this.disposeEditors();
+
 		super.dispose();
 	}
 }
diff --git a/src/vs/workbench/browser/parts/editor/tabsTitleControl.ts b/src/vs/workbench/browser/parts/editor/tabsTitleControl.ts
index 5356db9ba28..5893cb53424 100644
--- a/src/vs/workbench/browser/parts/editor/tabsTitleControl.ts
+++ b/src/vs/workbench/browser/parts/editor/tabsTitleControl.ts
@@ -27,8 +27,8 @@ import { ScrollableElement } from 'vs/base/browser/ui/scrollbar/scrollableElemen
 import { ScrollbarVisibility } from 'vs/base/common/scrollable';
 import { getOrSet } from 'vs/base/common/map';
 import { IThemeService, registerThemingParticipant, ITheme, ICssStyleCollector } from 'vs/platform/theme/common/themeService';
-import { TAB_INACTIVE_BACKGROUND, TAB_ACTIVE_BACKGROUND, TAB_ACTIVE_FOREGROUND, TAB_INACTIVE_FOREGROUND, TAB_BORDER, EDITOR_DRAG_AND_DROP_BACKGROUND, TAB_UNFOCUSED_ACTIVE_FOREGROUND, TAB_UNFOCUSED_INACTIVE_FOREGROUND, TAB_UNFOCUSED_ACTIVE_BORDER, TAB_ACTIVE_BORDER, TAB_HOVER_BACKGROUND, TAB_HOVER_BORDER, TAB_UNFOCUSED_HOVER_BACKGROUND, TAB_UNFOCUSED_HOVER_BORDER, EDITOR_GROUP_HEADER_TABS_BACKGROUND, WORKBENCH_BACKGROUND, TAB_ACTIVE_BORDER_TOP, TAB_UNFOCUSED_ACTIVE_BORDER_TOP, EDITOR_GROUP_HEADER_TABS_BORDER } from 'vs/workbench/common/theme';
-import { activeContrastBorder, contrastBorder, editorBackground } from 'vs/platform/theme/common/colorRegistry';
+import { TAB_INACTIVE_BACKGROUND, TAB_ACTIVE_BACKGROUND, TAB_ACTIVE_FOREGROUND, TAB_INACTIVE_FOREGROUND, TAB_BORDER, EDITOR_DRAG_AND_DROP_BACKGROUND, TAB_UNFOCUSED_ACTIVE_FOREGROUND, TAB_UNFOCUSED_INACTIVE_FOREGROUND, TAB_UNFOCUSED_ACTIVE_BORDER, TAB_ACTIVE_BORDER, TAB_HOVER_BACKGROUND, TAB_HOVER_BORDER, TAB_UNFOCUSED_HOVER_BACKGROUND, TAB_UNFOCUSED_HOVER_BORDER, EDITOR_GROUP_HEADER_TABS_BACKGROUND, WORKBENCH_BACKGROUND, TAB_ACTIVE_BORDER_TOP, TAB_UNFOCUSED_ACTIVE_BORDER_TOP } from 'vs/workbench/common/theme';
+import { activeContrastBorder, contrastBorder, editorBackground, breadcrumbsBackground } from 'vs/platform/theme/common/colorRegistry';
 import { ResourcesDropHandler, fillResourceDataTransfers, DraggedEditorIdentifier, DraggedEditorGroupIdentifier, DragAndDropObserver } from 'vs/workbench/browser/dnd';
 import { Color } from 'vs/base/common/color';
 import { INotificationService } from 'vs/platform/notification/common/notification';
@@ -39,6 +39,8 @@ import { addClass, addDisposableListener, hasClass, EventType, EventHelper, remo
 import { localize } from 'vs/nls';
 import { IEditorGroupsAccessor, IEditorPartOptions, IEditorGroupView } from 'vs/workbench/browser/parts/editor/editor';
 import { CloseOneEditorAction } from 'vs/workbench/browser/parts/editor/editorActions';
+import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { BreadcrumbsControl } from 'vs/workbench/browser/parts/editor/breadcrumbsControl';
 
 interface IEditorInputLabel {
 	name: string;
@@ -78,9 +80,10 @@ export class TabsTitleControl extends TitleControl {
 		@IMenuService menuService: IMenuService,
 		@IQuickOpenService quickOpenService: IQuickOpenService,
 		@IThemeService themeService: IThemeService,
-		@IExtensionService extensionService: IExtensionService
+		@IExtensionService extensionService: IExtensionService,
+		@IConfigurationService configurationService: IConfigurationService
 	) {
-		super(parent, accessor, group, contextMenuService, instantiationService, contextKeyService, keybindingService, telemetryService, notificationService, menuService, quickOpenService, themeService, extensionService);
+		super(parent, accessor, group, contextMenuService, instantiationService, contextKeyService, keybindingService, telemetryService, notificationService, menuService, quickOpenService, themeService, extensionService, configurationService);
 	}
 
 	protected create(parent: HTMLElement): void {
@@ -108,6 +111,12 @@ export class TabsTitleControl extends TitleControl {
 
 		// Close Action
 		this.closeOneEditorAction = this._register(this.instantiationService.createInstance(CloseOneEditorAction, CloseOneEditorAction.ID, CloseOneEditorAction.LABEL));
+
+		// Breadcrumbs
+		const breadcrumbsContainer = document.createElement('div');
+		addClass(breadcrumbsContainer, 'tabs-breadcrumbs');
+		this.titleContainer.appendChild(breadcrumbsContainer);
+		this.createBreadcrumbsControl(breadcrumbsContainer, { showFileIcons: true, showSymbolIcons: true, showDecorationColors: false, breadcrumbsBackground: breadcrumbsBackground });
 	}
 
 	private createScrollbar(): void {
@@ -128,6 +137,19 @@ export class TabsTitleControl extends TitleControl {
 		this.titleContainer.appendChild(this.scrollbar.getDomNode());
 	}
 
+	private updateBreadcrumbsControl(): void {
+		if (this.breadcrumbsControl && this.breadcrumbsControl.update()) {
+			// relayout when we have a breadcrumbs and when update changed
+			// its hidden-status
+			this.group.relayout();
+		}
+	}
+
+	protected handleBreadcrumbsEnablementChange(): void {
+		// relayout when breadcrumbs are enable/disabled
+		this.group.relayout();
+	}
+
 	private registerContainerListeners(): void {
 
 		// Group dragging
@@ -168,6 +190,7 @@ export class TabsTitleControl extends TitleControl {
 
 				// Return if the target is not on the tabs container
 				if (e.target !== this.tabsContainer) {
+					this.updateDropFeedback(this.tabsContainer, false); // fixes https://github.com/Microsoft/vscode/issues/52093
 					return;
 				}
 
@@ -239,6 +262,9 @@ export class TabsTitleControl extends TitleControl {
 
 		// Redraw all tabs
 		this.redraw();
+
+		// Update Breadcrumbs
+		this.updateBreadcrumbsControl();
 	}
 
 	closeEditor(editor: IEditorInput): void {
@@ -286,6 +312,9 @@ export class TabsTitleControl extends TitleControl {
 
 			this.clearEditorActionsToolbar();
 		}
+
+		// Update Breadcrumbs
+		this.updateBreadcrumbsControl();
 	}
 
 	moveEditor(editor: IEditorInput, fromIndex: number, targetIndex: number): void {
@@ -382,6 +411,11 @@ export class TabsTitleControl extends TitleControl {
 		// Gesture Support
 		Gesture.addTarget(tabContainer);
 
+		// Tab Border Top
+		const tabBorderTopContainer = document.createElement('div');
+		addClass(tabBorderTopContainer, 'tab-border-top-container');
+		tabContainer.appendChild(tabBorderTopContainer);
+
 		// Tab Editor Label
 		const editorLabel = this.instantiationService.createInstance(ResourceLabel, tabContainer, void 0);
 		this.tabLabelWidgets.push(editorLabel);
@@ -391,6 +425,11 @@ export class TabsTitleControl extends TitleControl {
 		addClass(tabCloseContainer, 'tab-close');
 		tabContainer.appendChild(tabCloseContainer);
 
+		// Tab Border Bottom
+		const tabBorderBottomContainer = document.createElement('div');
+		addClass(tabBorderBottomContainer, 'tab-border-bottom-container');
+		tabContainer.appendChild(tabBorderBottomContainer);
+
 		const tabActionRunner = new EditorCommandsContextActionRunner({ groupId: this.group.id, editorIndex: index });
 
 		const tabActionBar = new ActionBar(tabCloseContainer, { ariaLabel: localize('araLabelTabActions', "Tab actions"), actionRunner: tabActionRunner });
@@ -451,6 +490,8 @@ export class TabsTitleControl extends TitleControl {
 			tab.blur();
 
 			if (e.button === 1 /* Middle Button*/ && !this.originatesFromTabActionBar(e)) {
+				e.stopPropagation(); // for https://github.com/Microsoft/vscode/issues/56715
+
 				this.blockRevealActiveTabOnce();
 				this.closeOneEditorAction.run({ groupId: this.group.id, editorIndex: index });
 			}
@@ -830,19 +871,22 @@ export class TabsTitleControl extends TitleControl {
 			tabContainer.setAttribute('aria-selected', 'true');
 			tabContainer.style.backgroundColor = this.getColor(TAB_ACTIVE_BACKGROUND);
 
-			const activeTabBorderColor = this.getColor(isGroupActive ? TAB_ACTIVE_BORDER : TAB_UNFOCUSED_ACTIVE_BORDER);
-			const activeTabBorderColorTop = this.getColor(isGroupActive ? TAB_ACTIVE_BORDER_TOP : TAB_UNFOCUSED_ACTIVE_BORDER_TOP);
-			if (activeTabBorderColor) {
-				// Use boxShadow for the active tab border because if we also have a editor group header
-				// color, the two colors would collide and the tab border never shows up.
-				// see https://github.com/Microsoft/vscode/issues/33111
-				// In case of tabs container having a border, we need to inset -2px for the border to show up.
-				const hasTabsContainerBorder = !!this.getColor(EDITOR_GROUP_HEADER_TABS_BORDER);
-				tabContainer.style.boxShadow = `${activeTabBorderColor} 0 ${hasTabsContainerBorder ? -2 : -1}px inset`;
-			} else if (activeTabBorderColorTop) {
-				tabContainer.style.boxShadow = `${activeTabBorderColorTop} 0 2px inset`;
+			const activeTabBorderColorBottom = this.getColor(isGroupActive ? TAB_ACTIVE_BORDER : TAB_UNFOCUSED_ACTIVE_BORDER);
+			if (activeTabBorderColorBottom) {
+				addClass(tabContainer, 'tab-border-bottom');
+				tabContainer.style.setProperty('--tab-border-bottom-color', activeTabBorderColorBottom.toString());
 			} else {
-				tabContainer.style.boxShadow = null;
+				removeClass(tabContainer, 'tab-border-bottom');
+				tabContainer.style.removeProperty('--tab-border-bottom-color');
+			}
+
+			const activeTabBorderColorTop = this.getColor(isGroupActive ? TAB_ACTIVE_BORDER_TOP : TAB_UNFOCUSED_ACTIVE_BORDER_TOP);
+			if (activeTabBorderColorTop) {
+				addClass(tabContainer, 'tab-border-top');
+				tabContainer.style.setProperty('--tab-border-top-color', activeTabBorderColorTop.toString());
+			} else {
+				removeClass(tabContainer, 'tab-border-top');
+				tabContainer.style.removeProperty('--tab-border-top-color');
 			}
 
 			// Label
@@ -896,6 +940,11 @@ export class TabsTitleControl extends TitleControl {
 			return;
 		}
 
+		if (this.breadcrumbsControl && !this.breadcrumbsControl.isHidden()) {
+			this.breadcrumbsControl.layout({ width: dimension.width, height: BreadcrumbsControl.HEIGHT });
+			this.scrollbar.getDomNode().style.height = `${dimension.height - BreadcrumbsControl.HEIGHT}px`;
+		}
+
 		const visibleContainerWidth = this.tabsContainer.offsetWidth;
 		const totalContainerWidth = this.tabsContainer.scrollWidth;
 
@@ -1115,13 +1164,13 @@ registerThemingParticipant((theme: ITheme, collector: ICssStyleCollector) => {
 			const adjustedColor = tabHoverBackground.flatten(adjustedTabBackground);
 			const adjustedColorDrag = tabHoverBackground.flatten(adjustedTabDragBackground);
 			collector.addRule(`
-				.monaco-workbench > .part.editor > .content:not(.dragged-over) .editor-group-container > .title.active .tabs-container > .tab.sizing-shrink:not(.dragged):hover > .tab-label::after {
-					background: linear-gradient(to left, ${adjustedColor}, transparent);
+				.monaco-workbench > .part.editor > .content:not(.dragged-over) .editor-group-container.active > .title .tabs-container > .tab.sizing-shrink:not(.dragged):hover > .tab-label::after {
+					background: linear-gradient(to left, ${adjustedColor}, transparent) !important;
 				}
 
 
-				.monaco-workbench > .part.editor > .content.dragged-over .editor-group-container > .title.active .tabs-container > .tab.sizing-shrink:not(.dragged):hover > .tab-label::after {
-					background: linear-gradient(to left, ${adjustedColorDrag}, transparent);
+				.monaco-workbench > .part.editor > .content.dragged-over .editor-group-container.active > .title .tabs-container > .tab.sizing-shrink:not(.dragged):hover > .tab-label::after {
+					background: linear-gradient(to left, ${adjustedColorDrag}, transparent) !important;
 				}
 			`);
 		}
@@ -1132,11 +1181,11 @@ registerThemingParticipant((theme: ITheme, collector: ICssStyleCollector) => {
 			const adjustedColorDrag = tabUnfocusedHoverBackground.flatten(adjustedTabDragBackground);
 			collector.addRule(`
 				.monaco-workbench > .part.editor > .content:not(.dragged-over) .editor-group-container > .title .tabs-container > .tab.sizing-shrink:not(.dragged):hover > .tab-label::after {
-					background: linear-gradient(to left, ${adjustedColor}, transparent);
+					background: linear-gradient(to left, ${adjustedColor}, transparent) !important;
 				}
 
 				.monaco-workbench > .part.editor > .content.dragged-over .editor-group-container > .title .tabs-container > .tab.sizing-shrink:not(.dragged):hover > .tab-label::after {
-					background: linear-gradient(to left, ${adjustedColorDrag}, transparent);
+					background: linear-gradient(to left, ${adjustedColorDrag}, transparent) !important;
 				}
 			`);
 		}
@@ -1147,7 +1196,7 @@ registerThemingParticipant((theme: ITheme, collector: ICssStyleCollector) => {
 			collector.addRule(`
 			.monaco-workbench > .part.editor > .content.dragged-over .editor-group-container.active > .title .tabs-container > .tab.sizing-shrink.dragged-over:not(.active):not(.dragged) > .tab-label::after,
 			.monaco-workbench > .part.editor > .content.dragged-over .editor-group-container > .title .tabs-container > .tab.sizing-shrink.dragged-over:not(.dragged) > .tab-label::after {
-				background: linear-gradient(to left, ${adjustedColorDrag}, transparent);
+				background: linear-gradient(to left, ${adjustedColorDrag}, transparent) !important;
 			}
 		`);
 		}
@@ -1174,7 +1223,6 @@ registerThemingParticipant((theme: ITheme, collector: ICssStyleCollector) => {
 			const adjustedColor = tabInactiveBackground.flatten(adjustedTabBackground);
 			const adjustedColorDrag = tabInactiveBackground.flatten(adjustedTabDragBackground);
 			collector.addRule(`
-			.monaco-workbench > .part.editor > .content .editor-group-container > .title
 			.monaco-workbench > .part.editor > .content:not(.dragged-over) .editor-group-container > .title .tabs-container > .tab.sizing-shrink:not(.dragged) > .tab-label::after {
 				background: linear-gradient(to left, ${adjustedColor}, transparent);
 			}
diff --git a/src/vs/workbench/browser/parts/editor/textDiffEditor.ts b/src/vs/workbench/browser/parts/editor/textDiffEditor.ts
index 33b9d3da093..bb7224c8951 100644
--- a/src/vs/workbench/browser/parts/editor/textDiffEditor.ts
+++ b/src/vs/workbench/browser/parts/editor/textDiffEditor.ts
@@ -14,7 +14,7 @@ import * as types from 'vs/base/common/types';
 import { IDiffEditor } from 'vs/editor/browser/editorBrowser';
 import { IDiffEditorOptions, IEditorOptions as ICodeEditorOptions } from 'vs/editor/common/config/editorOptions';
 import { BaseTextEditor, IEditorConfiguration } from 'vs/workbench/browser/parts/editor/textEditor';
-import { TextEditorOptions, EditorInput, EditorOptions, TEXT_DIFF_EDITOR_ID, IEditorInputFactoryRegistry, Extensions as EditorInputExtensions, ITextDiffEditor } from 'vs/workbench/common/editor';
+import { TextEditorOptions, EditorInput, EditorOptions, TEXT_DIFF_EDITOR_ID, IEditorInputFactoryRegistry, Extensions as EditorInputExtensions, ITextDiffEditor, IEditorMemento } from 'vs/workbench/common/editor';
 import { ResourceEditorInput } from 'vs/workbench/common/editor/resourceEditorInput';
 import { DiffEditorInput } from 'vs/workbench/common/editor/diffEditorInput';
 import { DiffNavigator } from 'vs/editor/browser/widget/diffNavigator';
@@ -31,21 +31,23 @@ import { ScrollType, IDiffEditorViewState, IDiffEditorModel } from 'vs/editor/co
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { Registry } from 'vs/platform/registry/common/platform';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { once } from 'vs/base/common/event';
 import { IEditorGroupsService } from 'vs/workbench/services/group/common/editorGroupsService';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { CancellationToken } from 'vs/base/common/cancellation';
+import { EditorMemento } from 'vs/workbench/browser/parts/editor/baseEditor';
+import { IWindowService } from 'vs/platform/windows/common/windows';
 
 /**
  * The text editor that leverages the diff text editor for the editing experience.
  */
 export class TextDiffEditor extends BaseTextEditor implements ITextDiffEditor {
 
-	public static readonly ID = TEXT_DIFF_EDITOR_ID;
+	static readonly ID = TEXT_DIFF_EDITOR_ID;
 
 	private diffNavigator: DiffNavigator;
-	private diffNavigatorDisposables: IDisposable[];
+	private diffNavigatorDisposables: IDisposable[] = [];
 	private nextDiffAction: NavigateAction;
 	private previousDiffAction: NavigateAction;
 	private toggleIgnoreTrimWhitespaceAction: ToggleIgnoreTrimWhitespaceAction;
@@ -60,22 +62,22 @@ export class TextDiffEditor extends BaseTextEditor implements ITextDiffEditor {
 		@IThemeService themeService: IThemeService,
 		@IEditorGroupsService editorGroupService: IEditorGroupsService,
 		@ITextFileService textFileService: ITextFileService,
+		@IWindowService windowService: IWindowService
 	) {
-		super(TextDiffEditor.ID, telemetryService, instantiationService, storageService, configurationService, themeService, textFileService, editorService, editorGroupService);
+		super(TextDiffEditor.ID, telemetryService, instantiationService, storageService, configurationService, themeService, textFileService, editorService, editorGroupService, windowService);
 
-		this.diffNavigatorDisposables = [];
-		this.toUnbind.push(this._actualConfigurationService.onDidChangeConfiguration((e) => {
+		this._register(this._actualConfigurationService.onDidChangeConfiguration((e) => {
 			if (e.affectsConfiguration('diffEditor.ignoreTrimWhitespace')) {
 				this.updateIgnoreTrimWhitespaceAction();
 			}
 		}));
 	}
 
-	protected getEditorViewStateStorage(): object {
-		return Object.create(null); // do not persist in storage as diff editors are never persisted
+	protected getEditorMemento<T>(storageService: IStorageService, editorGroupService: IEditorGroupsService, key: string, limit: number = 10): IEditorMemento<T> {
+		return new EditorMemento(this.getId(), key, Object.create(null), limit, editorGroupService); // do not persist in storage as diff editors are never persisted
 	}
 
-	public getTitle(): string {
+	getTitle(): string {
 		if (this.input) {
 			return this.input.getName();
 		}
@@ -83,7 +85,7 @@ export class TextDiffEditor extends BaseTextEditor implements ITextDiffEditor {
 		return nls.localize('textDiffEditor', "Text Diff Editor");
 	}
 
-	public createEditorControl(parent: HTMLElement, configuration: ICodeEditorOptions): IDiffEditor {
+	createEditorControl(parent: HTMLElement, configuration: ICodeEditorOptions): IDiffEditor {
 
 		// Actions
 		this.nextDiffAction = new NavigateAction(this, true);
@@ -94,7 +96,7 @@ export class TextDiffEditor extends BaseTextEditor implements ITextDiffEditor {
 		return this.instantiationService.createInstance(DiffEditorWidget, parent, configuration);
 	}
 
-	public setInput(input: EditorInput, options: EditorOptions, token: CancellationToken): Thenable<void> {
+	setInput(input: EditorInput, options: EditorOptions, token: CancellationToken): Thenable<void> {
 
 		// Dispose previous diff navigator
 		this.diffNavigatorDisposables = dispose(this.diffNavigatorDisposables);
@@ -104,7 +106,7 @@ export class TextDiffEditor extends BaseTextEditor implements ITextDiffEditor {
 
 		// Set input and resolve
 		return super.setInput(input, options, token).then(() => {
-			return input.resolve(true).then(resolvedModel => {
+			return input.resolve().then(resolvedModel => {
 
 				// Check for cancellation
 				if (token.isCancellationRequested) {
@@ -118,7 +120,8 @@ export class TextDiffEditor extends BaseTextEditor implements ITextDiffEditor {
 
 				// Set Editor Model
 				const diffEditor = this.getControl();
-				diffEditor.setModel((<TextDiffEditorModel>resolvedModel).textDiffEditorModel);
+				const resolvedDiffEditorModel = <TextDiffEditorModel>resolvedModel;
+				diffEditor.setModel(resolvedDiffEditorModel.textDiffEditorModel);
 
 				// Apply Options from TextOptions
 				let optionsGotApplied = false;
@@ -132,6 +135,7 @@ export class TextDiffEditor extends BaseTextEditor implements ITextDiffEditor {
 					hasPreviousViewState = this.restoreTextDiffEditorViewState(input);
 				}
 
+				// Diff navigator
 				this.diffNavigator = new DiffNavigator(diffEditor, {
 					alwaysRevealFirst: !optionsGotApplied && !hasPreviousViewState // only reveal first change if we had no options or viewstate
 				});
@@ -142,7 +146,11 @@ export class TextDiffEditor extends BaseTextEditor implements ITextDiffEditor {
 					this.previousDiffAction.updateEnablement();
 				}));
 
+				// Enablement of actions
 				this.updateIgnoreTrimWhitespaceAction();
+
+				// Readonly flag
+				diffEditor.updateOptions({ readOnly: resolvedDiffEditorModel.isReadonly() });
 			}, error => {
 
 				// In case we tried to open a file and the response indicates that this is not a text file, fallback to binary diff.
@@ -156,17 +164,13 @@ export class TextDiffEditor extends BaseTextEditor implements ITextDiffEditor {
 		});
 	}
 
-	public setOptions(options: EditorOptions): void {
+	setOptions(options: EditorOptions): void {
 		const textOptions = <TextEditorOptions>options;
 		if (textOptions && types.isFunction(textOptions.apply)) {
 			textOptions.apply(this.getControl(), ScrollType.Smooth);
 		}
 	}
 
-	public supportsCenteredLayout(): boolean {
-		return false;
-	}
-
 	private restoreTextDiffEditorViewState(input: EditorInput): boolean {
 		if (input instanceof DiffEditorInput) {
 			const resource = this.toDiffEditorViewStateResource(input);
@@ -230,6 +234,7 @@ export class TextDiffEditor extends BaseTextEditor implements ITextDiffEditor {
 		const options: IDiffEditorOptions = super.getConfigurationOverrides();
 
 		options.readOnly = this.isReadOnly();
+		options.lineDecorationsWidth = '2ch';
 
 		return options;
 	}
@@ -268,7 +273,7 @@ export class TextDiffEditor extends BaseTextEditor implements ITextDiffEditor {
 		return (<FileOperationError>error).fileOperationResult === FileOperationResult.FILE_IS_BINARY;
 	}
 
-	public clearInput(): void {
+	clearInput(): void {
 
 		// Dispose previous diff navigator
 		this.diffNavigatorDisposables = dispose(this.diffNavigatorDisposables);
@@ -283,11 +288,11 @@ export class TextDiffEditor extends BaseTextEditor implements ITextDiffEditor {
 		super.clearInput();
 	}
 
-	public getDiffNavigator(): DiffNavigator {
+	getDiffNavigator(): DiffNavigator {
 		return this.diffNavigator;
 	}
 
-	public getActions(): IAction[] {
+	getActions(): IAction[] {
 		return [
 			this.toggleIgnoreTrimWhitespaceAction,
 			this.previousDiffAction,
@@ -295,7 +300,7 @@ export class TextDiffEditor extends BaseTextEditor implements ITextDiffEditor {
 		];
 	}
 
-	public getControl(): IDiffEditor {
+	getControl(): IDiffEditor {
 		return super.getControl() as IDiffEditor;
 	}
 
@@ -372,7 +377,7 @@ export class TextDiffEditor extends BaseTextEditor implements ITextDiffEditor {
 		return URI.from({ scheme: 'diff', path: `${btoa(original.toString())}${btoa(modified.toString())}` });
 	}
 
-	public dispose(): void {
+	dispose(): void {
 		this.diffNavigatorDisposables = dispose(this.diffNavigatorDisposables);
 
 		super.dispose();
@@ -397,7 +402,7 @@ class NavigateAction extends Action {
 		this.enabled = false;
 	}
 
-	public run(): TPromise<any> {
+	run(): TPromise<any> {
 		if (this.next) {
 			this.editor.getDiffNavigator().next();
 		} else {
@@ -407,7 +412,7 @@ class NavigateAction extends Action {
 		return null;
 	}
 
-	public updateEnablement(): void {
+	updateEnablement(): void {
 		this.enabled = this.editor.getDiffNavigator().canNavigate();
 	}
 }
@@ -424,12 +429,12 @@ class ToggleIgnoreTrimWhitespaceAction extends Action {
 		this.label = nls.localize('toggleIgnoreTrimWhitespace.label', "Ignore Trim Whitespace");
 	}
 
-	public updateClassName(ignoreTrimWhitespace: boolean): void {
+	updateClassName(ignoreTrimWhitespace: boolean): void {
 		this._isChecked = ignoreTrimWhitespace;
 		this.class = `textdiff-editor-action toggleIgnoreTrimWhitespace${this._isChecked ? ' is-checked' : ''}`;
 	}
 
-	public run(): TPromise<any> {
+	run(): TPromise<any> {
 		this._configurationService.updateValue(`diffEditor.ignoreTrimWhitespace`, !this._isChecked);
 		return null;
 	}
diff --git a/src/vs/workbench/browser/parts/editor/textEditor.ts b/src/vs/workbench/browser/parts/editor/textEditor.ts
index 16ba8b23f83..e47bdd9ac16 100644
--- a/src/vs/workbench/browser/parts/editor/textEditor.ts
+++ b/src/vs/workbench/browser/parts/editor/textEditor.ts
@@ -6,20 +6,18 @@
 'use strict';
 
 import * as nls from 'vs/nls';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import * as objects from 'vs/base/common/objects';
 import * as types from 'vs/base/common/types';
-import * as errors from 'vs/base/common/errors';
 import * as DOM from 'vs/base/browser/dom';
 import { CodeEditorWidget } from 'vs/editor/browser/widget/codeEditorWidget';
-import { EditorInput, EditorOptions, EditorViewStateMemento, ITextEditor } from 'vs/workbench/common/editor';
+import { EditorInput, EditorOptions, IEditorMemento, ITextEditor } from 'vs/workbench/common/editor';
 import { BaseEditor } from 'vs/workbench/browser/parts/editor/baseEditor';
 import { IEditorViewState, IEditor } from 'vs/editor/common/editorCommon';
 import { IStorageService } from 'vs/platform/storage/common/storage';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { Scope } from 'vs/workbench/common/memento';
 import { ITextFileService, SaveReason, AutoSaveMode } from 'vs/workbench/services/textfile/common/textfiles';
 import { ITextResourceConfigurationService } from 'vs/editor/common/services/resourceConfiguration';
 import { IEditorOptions } from 'vs/editor/common/config/editorOptions';
@@ -27,6 +25,7 @@ import { isDiffEditor, isCodeEditor, ICodeEditor, getCodeEditor } from 'vs/edito
 import { IEditorGroupsService, IEditorGroup } from 'vs/workbench/services/group/common/editorGroupsService';
 import { CancellationToken } from 'vs/base/common/cancellation';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
+import { IWindowService } from 'vs/platform/windows/common/windows';
 
 const TEXT_EDITOR_VIEW_STATE_PREFERENCE_KEY = 'textEditorViewState';
 
@@ -44,28 +43,25 @@ export abstract class BaseTextEditor extends BaseEditor implements ITextEditor {
 	private _editorContainer: HTMLElement;
 	private hasPendingConfigurationChange: boolean;
 	private lastAppliedEditorOptions: IEditorOptions;
-	private editorViewStateMemento: EditorViewStateMemento<IEditorViewState>;
+	private editorMemento: IEditorMemento<IEditorViewState>;
 
 	constructor(
 		id: string,
 		@ITelemetryService telemetryService: ITelemetryService,
 		@IInstantiationService private readonly _instantiationService: IInstantiationService,
-		@IStorageService private storageService: IStorageService,
+		@IStorageService storageService: IStorageService,
 		@ITextResourceConfigurationService private readonly _configurationService: ITextResourceConfigurationService,
 		@IThemeService protected themeService: IThemeService,
 		@ITextFileService private readonly _textFileService: ITextFileService,
 		@IEditorService protected editorService: IEditorService,
 		@IEditorGroupsService protected editorGroupService: IEditorGroupsService,
+		@IWindowService private windowService: IWindowService
 	) {
 		super(id, telemetryService, themeService);
 
-		this.editorViewStateMemento = new EditorViewStateMemento<IEditorViewState>(editorGroupService, this.getEditorViewStateStorage(), TEXT_EDITOR_VIEW_STATE_PREFERENCE_KEY, 100);
+		this.editorMemento = this.getEditorMemento<IEditorViewState>(storageService, editorGroupService, TEXT_EDITOR_VIEW_STATE_PREFERENCE_KEY, 100);
 
-		this.toUnbind.push(this.configurationService.onDidChangeConfiguration(e => this.handleConfigurationChangeEvent(this.configurationService.getValue<IEditorConfiguration>(this.getResource()))));
-	}
-
-	protected getEditorViewStateStorage(): object {
-		return this.getMemento(this.storageService, Scope.WORKSPACE);
+		this._register(this.configurationService.onDidChangeConfiguration(e => this.handleConfigurationChangeEvent(this.configurationService.getValue<IEditorConfiguration>(this.getResource()))));
 	}
 
 	protected get instantiationService(): IInstantiationService {
@@ -135,33 +131,35 @@ export abstract class BaseTextEditor extends BaseEditor implements ITextEditor {
 
 		// Editor for Text
 		this._editorContainer = parent;
-		this.editorControl = this.createEditorControl(parent, this.computeConfiguration(this.configurationService.getValue<IEditorConfiguration>(this.getResource())));
+		this.editorControl = this._register(this.createEditorControl(parent, this.computeConfiguration(this.configurationService.getValue<IEditorConfiguration>(this.getResource()))));
 
 		// Model & Language changes
 		const codeEditor = getCodeEditor(this.editorControl);
 		if (codeEditor) {
-			this.toUnbind.push(codeEditor.onDidChangeModelLanguage(e => this.updateEditorConfiguration()));
-			this.toUnbind.push(codeEditor.onDidChangeModel(e => this.updateEditorConfiguration()));
+			this._register(codeEditor.onDidChangeModelLanguage(e => this.updateEditorConfiguration()));
+			this._register(codeEditor.onDidChangeModel(e => this.updateEditorConfiguration()));
 		}
 
 		// Application & Editor focus change to respect auto save settings
 		if (isCodeEditor(this.editorControl)) {
-			this.toUnbind.push(this.editorControl.onDidBlurEditorWidget(() => this.onEditorFocusLost()));
+			this._register(this.editorControl.onDidBlurEditorWidget(() => this.onEditorFocusLost()));
 		} else if (isDiffEditor(this.editorControl)) {
-			this.toUnbind.push(this.editorControl.getOriginalEditor().onDidBlurEditorWidget(() => this.onEditorFocusLost()));
-			this.toUnbind.push(this.editorControl.getModifiedEditor().onDidBlurEditorWidget(() => this.onEditorFocusLost()));
+			this._register(this.editorControl.getOriginalEditor().onDidBlurEditorWidget(() => this.onEditorFocusLost()));
+			this._register(this.editorControl.getModifiedEditor().onDidBlurEditorWidget(() => this.onEditorFocusLost()));
 		}
 
-		this.toUnbind.push(this.editorService.onDidActiveEditorChange(() => this.onEditorFocusLost()));
-		this.toUnbind.push(DOM.addDisposableListener(window, DOM.EventType.BLUR, () => this.onWindowFocusLost()));
+		this._register(this.editorService.onDidActiveEditorChange(() => this.onEditorFocusLost()));
+		this._register(this.windowService.onDidChangeFocus(focused => this.onWindowFocusChange(focused)));
 	}
 
 	private onEditorFocusLost(): void {
 		this.maybeTriggerSaveAll(SaveReason.FOCUS_CHANGE);
 	}
 
-	private onWindowFocusLost(): void {
-		this.maybeTriggerSaveAll(SaveReason.WINDOW_CHANGE);
+	private onWindowFocusChange(focused: boolean): void {
+		if (!focused) {
+			this.maybeTriggerSaveAll(SaveReason.WINDOW_CHANGE);
+		}
 	}
 
 	private maybeTriggerSaveAll(reason: SaveReason): void {
@@ -174,7 +172,7 @@ export abstract class BaseTextEditor extends BaseEditor implements ITextEditor {
 			(reason === SaveReason.FOCUS_CHANGE && mode === AutoSaveMode.ON_FOCUS_CHANGE)
 		) {
 			if (this.textFileService.isDirty()) {
-				this.textFileService.saveAll(void 0, { reason }).done(null, errors.onUnexpectedError);
+				this.textFileService.saveAll(void 0, { reason });
 			}
 		}
 	}
@@ -191,7 +189,7 @@ export abstract class BaseTextEditor extends BaseEditor implements ITextEditor {
 		return this.instantiationService.createInstance(CodeEditorWidget, parent, configuration, {});
 	}
 
-	public setInput(input: EditorInput, options: EditorOptions, token: CancellationToken): Thenable<void> {
+	setInput(input: EditorInput, options: EditorOptions, token: CancellationToken): Thenable<void> {
 		return super.setInput(input, options, token).then(() => {
 
 			// Update editor options after having set the input. We do this because there can be
@@ -214,17 +212,17 @@ export abstract class BaseTextEditor extends BaseEditor implements ITextEditor {
 		super.setEditorVisible(visible, group);
 	}
 
-	public focus(): void {
+	focus(): void {
 		this.editorControl.focus();
 	}
 
-	public layout(dimension: DOM.Dimension): void {
+	layout(dimension: DOM.Dimension): void {
 
 		// Pass on to Editor
 		this.editorControl.layout(dimension);
 	}
 
-	public getControl(): IEditor {
+	getControl(): IEditor {
 		return this.editorControl;
 	}
 
@@ -237,7 +235,7 @@ export abstract class BaseTextEditor extends BaseEditor implements ITextEditor {
 			return;
 		}
 
-		this.editorViewStateMemento.saveState(this.group, resource, editorViewState);
+		this.editorMemento.saveState(this.group, resource, editorViewState);
 	}
 
 	protected retrieveTextEditorViewState(resource: URI): IEditorViewState {
@@ -264,7 +262,7 @@ export abstract class BaseTextEditor extends BaseEditor implements ITextEditor {
 	 */
 	protected clearTextEditorViewState(resources: URI[]): void {
 		resources.forEach(resource => {
-			this.editorViewStateMemento.clearState(resource);
+			this.editorMemento.clearState(resource);
 		});
 	}
 
@@ -272,7 +270,7 @@ export abstract class BaseTextEditor extends BaseEditor implements ITextEditor {
 	 * Loads the text editor view state for the given resource and returns it.
 	 */
 	protected loadTextEditorViewState(resource: URI): IEditorViewState {
-		return this.editorViewStateMemento.loadState(this.group, resource);
+		return this.editorMemento.loadState(this.group, resource);
 	}
 
 	private updateEditorConfiguration(configuration = this.configurationService.getValue<IEditorConfiguration>(this.getResource())): void {
@@ -314,17 +312,8 @@ export abstract class BaseTextEditor extends BaseEditor implements ITextEditor {
 
 	protected abstract getAriaLabel(): string;
 
-	protected saveMemento(): void {
-
-		// ensure to first save our view state memento
-		this.editorViewStateMemento.save();
-
-		super.saveMemento();
-	}
-
-	public dispose(): void {
+	dispose(): void {
 		this.lastAppliedEditorOptions = void 0;
-		this.editorControl.dispose();
 
 		super.dispose();
 	}
diff --git a/src/vs/workbench/browser/parts/editor/textResourceEditor.ts b/src/vs/workbench/browser/parts/editor/textResourceEditor.ts
index e58de5a1c6e..dfa60893d52 100644
--- a/src/vs/workbench/browser/parts/editor/textResourceEditor.ts
+++ b/src/vs/workbench/browser/parts/editor/textResourceEditor.ts
@@ -25,6 +25,7 @@ import { ScrollType } from 'vs/editor/common/editorCommon';
 import { IEditorGroupsService } from 'vs/workbench/services/group/common/editorGroupsService';
 import { CancellationToken } from 'vs/base/common/cancellation';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
+import { IWindowService } from 'vs/platform/windows/common/windows';
 
 /**
  * An editor implementation that is capable of showing the contents of resource inputs. Uses
@@ -41,12 +42,13 @@ export class AbstractTextResourceEditor extends BaseTextEditor {
 		@IThemeService themeService: IThemeService,
 		@IEditorGroupsService editorGroupService: IEditorGroupsService,
 		@ITextFileService textFileService: ITextFileService,
-		@IEditorService editorService: IEditorService
+		@IEditorService editorService: IEditorService,
+		@IWindowService windowService: IWindowService
 	) {
-		super(id, telemetryService, instantiationService, storageService, configurationService, themeService, textFileService, editorService, editorGroupService);
+		super(id, telemetryService, instantiationService, storageService, configurationService, themeService, textFileService, editorService, editorGroupService, windowService);
 	}
 
-	public getTitle(): string {
+	getTitle(): string {
 		if (this.input) {
 			return this.input.getName();
 		}
@@ -54,14 +56,14 @@ export class AbstractTextResourceEditor extends BaseTextEditor {
 		return nls.localize('textEditor', "Text Editor");
 	}
 
-	public setInput(input: EditorInput, options: EditorOptions, token: CancellationToken): Thenable<void> {
+	setInput(input: EditorInput, options: EditorOptions, token: CancellationToken): Thenable<void> {
 
 		// Remember view settings if input changes
 		this.saveTextResourceEditorViewState(this.input);
 
 		// Set input and resolve
 		return super.setInput(input, options, token).then(() => {
-			return input.resolve(true).then((resolvedModel: EditorModel) => {
+			return input.resolve().then((resolvedModel: EditorModel) => {
 
 				// Check for cancellation
 				if (token.isCancellationRequested) {
@@ -104,7 +106,7 @@ export class AbstractTextResourceEditor extends BaseTextEditor {
 		}
 	}
 
-	public setOptions(options: EditorOptions): void {
+	setOptions(options: EditorOptions): void {
 		const textOptions = <TextEditorOptions>options;
 		if (textOptions && types.isFunction(textOptions.apply)) {
 			textOptions.apply(this.getControl(), ScrollType.Smooth);
@@ -140,7 +142,7 @@ export class AbstractTextResourceEditor extends BaseTextEditor {
 	 * This allows users to click on the output panel to stop scrolling when they see something of interest.
 	 * To resume, they should scroll to the end of the output panel again.
 	 */
-	public revealLastLine(smart: boolean): void {
+	revealLastLine(smart: boolean): void {
 		const codeEditor = <ICodeEditor>this.getControl();
 		const model = codeEditor.getModel();
 
@@ -152,7 +154,7 @@ export class AbstractTextResourceEditor extends BaseTextEditor {
 		}
 	}
 
-	public clearInput(): void {
+	clearInput(): void {
 
 		// Keep editor view state in settings to restore when coming back
 		this.saveTextResourceEditorViewState(this.input);
@@ -163,7 +165,7 @@ export class AbstractTextResourceEditor extends BaseTextEditor {
 		super.clearInput();
 	}
 
-	public shutdown(): void {
+	shutdown(): void {
 
 		// Save View State (only for untitled)
 		if (this.input instanceof UntitledEditorInput) {
@@ -200,7 +202,7 @@ export class AbstractTextResourceEditor extends BaseTextEditor {
 
 export class TextResourceEditor extends AbstractTextResourceEditor {
 
-	public static readonly ID = 'workbench.editors.textResourceEditor';
+	static readonly ID = 'workbench.editors.textResourceEditor';
 
 	constructor(
 		@ITelemetryService telemetryService: ITelemetryService,
@@ -210,8 +212,9 @@ export class TextResourceEditor extends AbstractTextResourceEditor {
 		@IThemeService themeService: IThemeService,
 		@ITextFileService textFileService: ITextFileService,
 		@IEditorService editorService: IEditorService,
-		@IEditorGroupsService editorGroupService: IEditorGroupsService
+		@IEditorGroupsService editorGroupService: IEditorGroupsService,
+		@IWindowService windowService: IWindowService
 	) {
-		super(TextResourceEditor.ID, telemetryService, instantiationService, storageService, configurationService, themeService, editorGroupService, textFileService, editorService);
+		super(TextResourceEditor.ID, telemetryService, instantiationService, storageService, configurationService, themeService, editorGroupService, textFileService, editorService, windowService);
 	}
 }
diff --git a/src/vs/workbench/browser/parts/editor/titleControl.ts b/src/vs/workbench/browser/parts/editor/titleControl.ts
index 8ddd3329287..297bac18a96 100644
--- a/src/vs/workbench/browser/parts/editor/titleControl.ts
+++ b/src/vs/workbench/browser/parts/editor/titleControl.ts
@@ -5,38 +5,41 @@
 
 'use strict';
 
-import 'vs/css!./media/titlecontrol';
-import { localize } from 'vs/nls';
-import { prepareActions } from 'vs/workbench/browser/actions';
-import { IAction, Action, IRunEvent } from 'vs/base/common/actions';
-import { TPromise } from 'vs/base/common/winjs.base';
-import { BaseEditor } from 'vs/workbench/browser/parts/editor/baseEditor';
-import * as arrays from 'vs/base/common/arrays';
-import { toResource, IEditorCommandsContext, IEditorInput, EditorCommandsContextActionRunner } from 'vs/workbench/common/editor';
-import { IActionItem, ActionsOrientation } from 'vs/base/browser/ui/actionbar/actionbar';
-import { ToolBar } from 'vs/base/browser/ui/toolbar/toolbar';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { StandardMouseEvent } from 'vs/base/browser/mouseEvent';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IQuickOpenService } from 'vs/platform/quickOpen/common/quickOpen';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { ResolvedKeybinding } from 'vs/base/common/keyCodes';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
-import { createActionItem, fillInContextMenuActions, fillInActionBarActions } from 'vs/platform/actions/browser/menuItemActionItem';
-import { IMenuService, MenuId, IMenu, ExecuteCommandAction } from 'vs/platform/actions/common/actions';
-import { ResourceContextKey } from 'vs/workbench/common/resources';
-import { IThemeService, registerThemingParticipant, ITheme, ICssStyleCollector } from 'vs/platform/theme/common/themeService';
-import { Themable } from 'vs/workbench/common/theme';
-import { getCodeEditor } from 'vs/editor/browser/editorBrowser';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { Dimension, addDisposableListener, EventType } from 'vs/base/browser/dom';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { IEditorGroupsAccessor, IEditorPartOptions, IEditorGroupView } from 'vs/workbench/browser/parts/editor/editor';
-import { listActiveSelectionBackground, listActiveSelectionForeground } from 'vs/platform/theme/common/colorRegistry';
-import { LocalSelectionTransfer, DraggedEditorGroupIdentifier, DraggedEditorIdentifier, fillResourceDataTransfers } from 'vs/workbench/browser/dnd';
 import { applyDragImage } from 'vs/base/browser/dnd';
+import { addDisposableListener, Dimension, EventType } from 'vs/base/browser/dom';
+import { StandardMouseEvent } from 'vs/base/browser/mouseEvent';
+import { ActionsOrientation, IActionItem } from 'vs/base/browser/ui/actionbar/actionbar';
+import { ToolBar } from 'vs/base/browser/ui/toolbar/toolbar';
+import { Action, IAction, IRunEvent } from 'vs/base/common/actions';
+import * as arrays from 'vs/base/common/arrays';
+import { ResolvedKeybinding } from 'vs/base/common/keyCodes';
+import { dispose, IDisposable } from 'vs/base/common/lifecycle';
+import { TPromise } from 'vs/base/common/winjs.base';
+import 'vs/css!./media/titlecontrol';
+import { getCodeEditor } from 'vs/editor/browser/editorBrowser';
+import { localize } from 'vs/nls';
+import { createActionItem, fillInActionBarActions, fillInContextMenuActions } from 'vs/platform/actions/browser/menuItemActionItem';
+import { ExecuteCommandAction, IMenu, IMenuService, MenuId } from 'vs/platform/actions/common/actions';
+import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
+import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
+import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
+import { INotificationService } from 'vs/platform/notification/common/notification';
+import { IQuickOpenService } from 'vs/platform/quickOpen/common/quickOpen';
+import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
+import { listActiveSelectionBackground, listActiveSelectionForeground } from 'vs/platform/theme/common/colorRegistry';
+import { ICssStyleCollector, ITheme, IThemeService, registerThemingParticipant } from 'vs/platform/theme/common/themeService';
+import { prepareActions } from 'vs/workbench/browser/actions';
+import { DraggedEditorGroupIdentifier, DraggedEditorIdentifier, fillResourceDataTransfers, LocalSelectionTransfer } from 'vs/workbench/browser/dnd';
+import { BaseEditor } from 'vs/workbench/browser/parts/editor/baseEditor';
+import { BreadcrumbsConfig } from 'vs/workbench/browser/parts/editor/breadcrumbs';
+import { BreadcrumbsControl, IBreadcrumbsControlOptions } from 'vs/workbench/browser/parts/editor/breadcrumbsControl';
+import { EDITOR_TITLE_HEIGHT, IEditorGroupsAccessor, IEditorGroupView, IEditorPartOptions } from 'vs/workbench/browser/parts/editor/editor';
+import { EditorCommandsContextActionRunner, IEditorCommandsContext, IEditorInput, toResource } from 'vs/workbench/common/editor';
+import { ResourceContextKey } from 'vs/workbench/common/resources';
+import { Themable } from 'vs/workbench/common/theme';
+import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
 
 export interface IToolbarActions {
 	primary: IAction[];
@@ -48,6 +51,8 @@ export abstract class TitleControl extends Themable {
 	protected readonly groupTransfer = LocalSelectionTransfer.getInstance<DraggedEditorGroupIdentifier>();
 	protected readonly editorTransfer = LocalSelectionTransfer.getInstance<DraggedEditorIdentifier>();
 
+	protected breadcrumbsControl: BreadcrumbsControl;
+
 	private currentPrimaryEditorActionIds: string[] = [];
 	private currentSecondaryEditorActionIds: string[] = [];
 	protected editorActionsToolbar: ToolBar;
@@ -72,7 +77,8 @@ export abstract class TitleControl extends Themable {
 		@IMenuService private menuService: IMenuService,
 		@IQuickOpenService protected quickOpenService: IQuickOpenService,
 		@IThemeService themeService: IThemeService,
-		@IExtensionService private extensionService: IExtensionService
+		@IExtensionService private extensionService: IExtensionService,
+		@IConfigurationService protected configurationService: IConfigurationService
 	) {
 		super(themeService);
 
@@ -89,6 +95,27 @@ export abstract class TitleControl extends Themable {
 
 	protected abstract create(parent: HTMLElement): void;
 
+	protected createBreadcrumbsControl(container: HTMLElement, options: IBreadcrumbsControlOptions): void {
+		const config = this._register(BreadcrumbsConfig.IsEnabled.bindTo(this.configurationService));
+		this._register(config.onDidChange(() => {
+			const value = config.getValue();
+			if (!value && this.breadcrumbsControl) {
+				this.breadcrumbsControl.dispose();
+				this.breadcrumbsControl = undefined;
+				this.handleBreadcrumbsEnablementChange();
+			} else if (value && !this.breadcrumbsControl) {
+				this.breadcrumbsControl = this.instantiationService.createInstance(BreadcrumbsControl, container, options, this.group);
+				this.breadcrumbsControl.update();
+				this.handleBreadcrumbsEnablementChange();
+			}
+		}));
+		if (config.getValue()) {
+			this.breadcrumbsControl = this.instantiationService.createInstance(BreadcrumbsControl, container, options, this.group);
+		}
+	}
+
+	protected abstract handleBreadcrumbsEnablementChange(): void;
+
 	protected createEditorActionsToolBar(container: HTMLElement): void {
 		const context = { groupId: this.group.id } as IEditorCommandsContext;
 
@@ -327,9 +354,18 @@ export abstract class TitleControl extends Themable {
 
 	layout(dimension: Dimension): void {
 		// Optionally implemented in subclasses
+
+		if (this.breadcrumbsControl) {
+			this.breadcrumbsControl.layout(undefined);
+		}
+	}
+
+	getPreferredHeight(): number {
+		return EDITOR_TITLE_HEIGHT + (this.breadcrumbsControl && !this.breadcrumbsControl.isHidden() ? BreadcrumbsControl.HEIGHT : 0);
 	}
 
 	dispose(): void {
+		this.breadcrumbsControl = dispose(this.breadcrumbsControl);
 		this.editorToolBarMenuDisposables = dispose(this.editorToolBarMenuDisposables);
 
 		super.dispose();
diff --git a/src/vs/workbench/browser/parts/notifications/media/notificationsList.css b/src/vs/workbench/browser/parts/notifications/media/notificationsList.css
index 73fad28fcc0..24552a04bd6 100644
--- a/src/vs/workbench/browser/parts/notifications/media/notificationsList.css
+++ b/src/vs/workbench/browser/parts/notifications/media/notificationsList.css
@@ -115,7 +115,6 @@
 /** Notification: Source */
 
 .monaco-workbench .notifications-list-container .notification-list-item .notification-list-item-source {
-	opacity: 0.7;
 	flex: 1;
 	font-size: 12px;
 	overflow: hidden; /* always give away space to buttons container */
diff --git a/src/vs/workbench/browser/parts/notifications/notificationsActions.ts b/src/vs/workbench/browser/parts/notifications/notificationsActions.ts
index 71923117b10..da0751e329b 100644
--- a/src/vs/workbench/browser/parts/notifications/notificationsActions.ts
+++ b/src/vs/workbench/browser/parts/notifications/notificationsActions.ts
@@ -18,8 +18,8 @@ import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService
 
 export class ClearNotificationAction extends Action {
 
-	public static readonly ID = CLEAR_NOTIFICATION;
-	public static readonly LABEL = localize('clearNotification', "Clear Notification");
+	static readonly ID = CLEAR_NOTIFICATION;
+	static readonly LABEL = localize('clearNotification', "Clear Notification");
 
 	constructor(
 		id: string,
@@ -29,7 +29,7 @@ export class ClearNotificationAction extends Action {
 		super(id, label, 'clear-notification-action');
 	}
 
-	public run(notification: INotificationViewItem): TPromise<any> {
+	run(notification: INotificationViewItem): TPromise<any> {
 		this.commandService.executeCommand(CLEAR_NOTIFICATION, notification);
 
 		return TPromise.as(void 0);
@@ -38,8 +38,8 @@ export class ClearNotificationAction extends Action {
 
 export class ClearAllNotificationsAction extends Action {
 
-	public static readonly ID = CLEAR_ALL_NOTIFICATIONS;
-	public static readonly LABEL = localize('clearNotifications', "Clear All Notifications");
+	static readonly ID = CLEAR_ALL_NOTIFICATIONS;
+	static readonly LABEL = localize('clearNotifications', "Clear All Notifications");
 
 	constructor(
 		id: string,
@@ -49,7 +49,7 @@ export class ClearAllNotificationsAction extends Action {
 		super(id, label, 'clear-all-notifications-action');
 	}
 
-	public run(notification: INotificationViewItem): TPromise<any> {
+	run(notification: INotificationViewItem): TPromise<any> {
 		this.commandService.executeCommand(CLEAR_ALL_NOTIFICATIONS);
 
 		return TPromise.as(void 0);
@@ -58,8 +58,8 @@ export class ClearAllNotificationsAction extends Action {
 
 export class HideNotificationsCenterAction extends Action {
 
-	public static readonly ID = HIDE_NOTIFICATIONS_CENTER;
-	public static readonly LABEL = localize('hideNotificationsCenter', "Hide Notifications");
+	static readonly ID = HIDE_NOTIFICATIONS_CENTER;
+	static readonly LABEL = localize('hideNotificationsCenter', "Hide Notifications");
 
 	constructor(
 		id: string,
@@ -69,7 +69,7 @@ export class HideNotificationsCenterAction extends Action {
 		super(id, label, 'hide-all-notifications-action');
 	}
 
-	public run(notification: INotificationViewItem): TPromise<any> {
+	run(notification: INotificationViewItem): TPromise<any> {
 		this.commandService.executeCommand(HIDE_NOTIFICATIONS_CENTER);
 
 		return TPromise.as(void 0);
@@ -78,8 +78,8 @@ export class HideNotificationsCenterAction extends Action {
 
 export class ExpandNotificationAction extends Action {
 
-	public static readonly ID = EXPAND_NOTIFICATION;
-	public static readonly LABEL = localize('expandNotification', "Expand Notification");
+	static readonly ID = EXPAND_NOTIFICATION;
+	static readonly LABEL = localize('expandNotification', "Expand Notification");
 
 	constructor(
 		id: string,
@@ -89,7 +89,7 @@ export class ExpandNotificationAction extends Action {
 		super(id, label, 'expand-notification-action');
 	}
 
-	public run(notification: INotificationViewItem): TPromise<any> {
+	run(notification: INotificationViewItem): TPromise<any> {
 		this.commandService.executeCommand(EXPAND_NOTIFICATION, notification);
 
 		return TPromise.as(void 0);
@@ -98,8 +98,8 @@ export class ExpandNotificationAction extends Action {
 
 export class CollapseNotificationAction extends Action {
 
-	public static readonly ID = COLLAPSE_NOTIFICATION;
-	public static readonly LABEL = localize('collapseNotification', "Collapse Notification");
+	static readonly ID = COLLAPSE_NOTIFICATION;
+	static readonly LABEL = localize('collapseNotification', "Collapse Notification");
 
 	constructor(
 		id: string,
@@ -109,7 +109,7 @@ export class CollapseNotificationAction extends Action {
 		super(id, label, 'collapse-notification-action');
 	}
 
-	public run(notification: INotificationViewItem): TPromise<any> {
+	run(notification: INotificationViewItem): TPromise<any> {
 		this.commandService.executeCommand(COLLAPSE_NOTIFICATION, notification);
 
 		return TPromise.as(void 0);
@@ -118,8 +118,8 @@ export class CollapseNotificationAction extends Action {
 
 export class ConfigureNotificationAction extends Action {
 
-	public static readonly ID = 'workbench.action.configureNotification';
-	public static readonly LABEL = localize('configureNotification', "Configure Notification");
+	static readonly ID = 'workbench.action.configureNotification';
+	static readonly LABEL = localize('configureNotification', "Configure Notification");
 
 	constructor(
 		id: string,
@@ -129,15 +129,15 @@ export class ConfigureNotificationAction extends Action {
 		super(id, label, 'configure-notification-action');
 	}
 
-	public get configurationActions(): IAction[] {
+	get configurationActions(): IAction[] {
 		return this._configurationActions;
 	}
 }
 
 export class CopyNotificationMessageAction extends Action {
 
-	public static readonly ID = 'workbench.action.copyNotificationMessage';
-	public static readonly LABEL = localize('copyNotification', "Copy Text");
+	static readonly ID = 'workbench.action.copyNotificationMessage';
+	static readonly LABEL = localize('copyNotification', "Copy Text");
 
 	constructor(
 		id: string,
@@ -147,7 +147,7 @@ export class CopyNotificationMessageAction extends Action {
 		super(id, label);
 	}
 
-	public run(notification: INotificationViewItem): TPromise<any> {
+	run(notification: INotificationViewItem): TPromise<any> {
 		this.clipboardService.writeText(notification.message.raw);
 
 		return TPromise.as(void 0);
@@ -174,7 +174,7 @@ export class NotificationActionRunner extends ActionRunner {
 		this.telemetryService.publicLog('workbenchActionExecuted', { id: action.id, from: 'message' });
 
 		// Run and make sure to notify on any error again
-		super.runAction(action, context).done(null, error => this.notificationService.error(error));
+		super.runAction(action, context).then(null, error => this.notificationService.error(error));
 
 		return TPromise.as(void 0);
 	}
diff --git a/src/vs/workbench/browser/parts/notifications/notificationsAlerts.ts b/src/vs/workbench/browser/parts/notifications/notificationsAlerts.ts
index 9d7e25af5ab..f6c6d6379f3 100644
--- a/src/vs/workbench/browser/parts/notifications/notificationsAlerts.ts
+++ b/src/vs/workbench/browser/parts/notifications/notificationsAlerts.ts
@@ -8,15 +8,14 @@
 import { alert } from 'vs/base/browser/ui/aria/aria';
 import { localize } from 'vs/nls';
 import { INotificationViewItem, INotificationsModel, NotificationChangeType, INotificationChangeEvent } from 'vs/workbench/common/notifications';
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
+import { Disposable } from 'vs/base/common/lifecycle';
 import { toErrorMessage } from 'vs/base/common/errorMessage';
 import { Severity } from 'vs/platform/notification/common/notification';
 
-export class NotificationsAlerts {
-	private toDispose: IDisposable[];
+export class NotificationsAlerts extends Disposable {
 
 	constructor(private model: INotificationsModel) {
-		this.toDispose = [];
+		super();
 
 		// Alert initial notifications if any
 		model.notifications.forEach(n => this.ariaAlert(n));
@@ -25,7 +24,7 @@ export class NotificationsAlerts {
 	}
 
 	private registerListeners(): void {
-		this.toDispose.push(this.model.onDidNotificationChange(e => this.onDidNotificationChange(e)));
+		this._register(this.model.onDidNotificationChange(e => this.onDidNotificationChange(e)));
 	}
 
 	private onDidNotificationChange(e: INotificationChangeEvent): void {
@@ -57,8 +56,4 @@ export class NotificationsAlerts {
 
 		alert(alertText);
 	}
-
-	public dispose(): void {
-		this.toDispose = dispose(this.toDispose);
-	}
 }
\ No newline at end of file
diff --git a/src/vs/workbench/browser/parts/notifications/notificationsCenter.ts b/src/vs/workbench/browser/parts/notifications/notificationsCenter.ts
index 750aeb9764f..c1aae8802de 100644
--- a/src/vs/workbench/browser/parts/notifications/notificationsCenter.ts
+++ b/src/vs/workbench/browser/parts/notifications/notificationsCenter.ts
@@ -29,13 +29,15 @@ export class NotificationsCenter extends Themable {
 
 	private static MAX_DIMENSIONS = new Dimension(450, 400);
 
+	private readonly _onDidChangeVisibility: Emitter<void> = this._register(new Emitter<void>());
+	get onDidChangeVisibility(): Event<void> { return this._onDidChangeVisibility.event; }
+
 	private notificationsCenterContainer: HTMLElement;
 	private notificationsCenterHeader: HTMLElement;
 	private notificationsCenterTitle: HTMLSpanElement;
 	private notificationsList: NotificationsList;
 	private _isVisible: boolean;
 	private workbenchDimensions: Dimension;
-	private readonly _onDidChangeVisibility: Emitter<void>;
 	private notificationsCenterVisibleContextKey: IContextKey<boolean>;
 
 	constructor(
@@ -50,27 +52,20 @@ export class NotificationsCenter extends Themable {
 	) {
 		super(themeService);
 
-		this._onDidChangeVisibility = new Emitter<void>();
-		this.toUnbind.push(this._onDidChangeVisibility);
-
 		this.notificationsCenterVisibleContextKey = NotificationsCenterVisibleContext.bindTo(contextKeyService);
 
 		this.registerListeners();
 	}
 
 	private registerListeners(): void {
-		this.toUnbind.push(this.model.onDidNotificationChange(e => this.onDidNotificationChange(e)));
+		this._register(this.model.onDidNotificationChange(e => this.onDidNotificationChange(e)));
 	}
 
-	public get onDidChangeVisibility(): Event<void> {
-		return this._onDidChangeVisibility.event;
-	}
-
-	public get isVisible(): boolean {
+	get isVisible(): boolean {
 		return this._isVisible;
 	}
 
-	public show(): void {
+	show(): void {
 		if (this._isVisible) {
 			this.notificationsList.show(true /* focus */);
 
@@ -111,9 +106,9 @@ export class NotificationsCenter extends Themable {
 
 	private updateTitle(): void {
 		if (this.model.notifications.length === 0) {
-			this.notificationsCenterTitle.innerText = localize('notificationsEmpty', "No new notifications");
+			this.notificationsCenterTitle.textContent = localize('notificationsEmpty', "No new notifications");
 		} else {
-			this.notificationsCenterTitle.innerText = localize('notifications', "Notifications");
+			this.notificationsCenterTitle.textContent = localize('notifications', "Notifications");
 		}
 	}
 
@@ -138,21 +133,17 @@ export class NotificationsCenter extends Themable {
 		addClass(toolbarContainer, 'notifications-center-header-toolbar');
 		this.notificationsCenterHeader.appendChild(toolbarContainer);
 
-		const actionRunner = this.instantiationService.createInstance(NotificationActionRunner);
-		this.toUnbind.push(actionRunner);
+		const actionRunner = this._register(this.instantiationService.createInstance(NotificationActionRunner));
 
-		const notificationsToolBar = new ActionBar(toolbarContainer, {
+		const notificationsToolBar = this._register(new ActionBar(toolbarContainer, {
 			ariaLabel: localize('notificationsToolbar', "Notification Center Actions"),
 			actionRunner
-		});
-		this.toUnbind.push(notificationsToolBar);
+		}));
 
-		const hideAllAction = this.instantiationService.createInstance(HideNotificationsCenterAction, HideNotificationsCenterAction.ID, HideNotificationsCenterAction.LABEL);
-		this.toUnbind.push(hideAllAction);
+		const hideAllAction = this._register(this.instantiationService.createInstance(HideNotificationsCenterAction, HideNotificationsCenterAction.ID, HideNotificationsCenterAction.LABEL));
 		notificationsToolBar.push(hideAllAction, { icon: true, label: false, keybinding: this.getKeybindingLabel(hideAllAction) });
 
-		const clearAllAction = this.instantiationService.createInstance(ClearAllNotificationsAction, ClearAllNotificationsAction.ID, ClearAllNotificationsAction.LABEL);
-		this.toUnbind.push(clearAllAction);
+		const clearAllAction = this._register(this.instantiationService.createInstance(ClearAllNotificationsAction, ClearAllNotificationsAction.ID, ClearAllNotificationsAction.LABEL));
 		notificationsToolBar.push(clearAllAction, { icon: true, label: false, keybinding: this.getKeybindingLabel(clearAllAction) });
 
 		// Notifications List
@@ -204,7 +195,7 @@ export class NotificationsCenter extends Themable {
 		}
 	}
 
-	public hide(): void {
+	hide(): void {
 		if (!this._isVisible || !this.notificationsCenterContainer) {
 			return; // already hidden
 		}
@@ -244,7 +235,7 @@ export class NotificationsCenter extends Themable {
 		}
 	}
 
-	public layout(dimension: Dimension): void {
+	layout(dimension: Dimension): void {
 		this.workbenchDimensions = dimension;
 
 		if (this._isVisible && this.notificationsCenterContainer) {
@@ -278,7 +269,7 @@ export class NotificationsCenter extends Themable {
 		}
 	}
 
-	public clearAll(): void {
+	clearAll(): void {
 
 		// Hide notifications center first
 		this.hide();
diff --git a/src/vs/workbench/browser/parts/notifications/notificationsCommands.ts b/src/vs/workbench/browser/parts/notifications/notificationsCommands.ts
index 858f3bbe848..9519578fe60 100644
--- a/src/vs/workbench/browser/parts/notifications/notificationsCommands.ts
+++ b/src/vs/workbench/browser/parts/notifications/notificationsCommands.ts
@@ -7,7 +7,7 @@
 
 import { CommandsRegistry } from 'vs/platform/commands/common/commands';
 import { RawContextKey, ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRegistry';
+import { KeybindingsRegistry, KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
 import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
 import { INotificationViewItem, isNotificationViewItem } from 'vs/workbench/common/notifications';
 import { MenuRegistry, MenuId } from 'vs/platform/actions/common/actions';
@@ -88,7 +88,7 @@ export function registerNotificationCommands(center: INotificationsCenterControl
 	// Hide Notifications Center
 	KeybindingsRegistry.registerCommandAndKeybindingRule({
 		id: HIDE_NOTIFICATIONS_CENTER,
-		weight: KeybindingsRegistry.WEIGHT.workbenchContrib(50),
+		weight: KeybindingWeight.WorkbenchContrib + 50,
 		when: NotificationsCenterVisibleContext,
 		primary: KeyCode.Escape,
 		handler: accessor => center.hide()
@@ -106,7 +106,7 @@ export function registerNotificationCommands(center: INotificationsCenterControl
 	// Clear Notification
 	KeybindingsRegistry.registerCommandAndKeybindingRule({
 		id: CLEAR_NOTIFICATION,
-		weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
+		weight: KeybindingWeight.WorkbenchContrib,
 		when: NotificationFocusedContext,
 		primary: KeyCode.Delete,
 		mac: {
@@ -123,7 +123,7 @@ export function registerNotificationCommands(center: INotificationsCenterControl
 	// Expand Notification
 	KeybindingsRegistry.registerCommandAndKeybindingRule({
 		id: EXPAND_NOTIFICATION,
-		weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
+		weight: KeybindingWeight.WorkbenchContrib,
 		when: NotificationFocusedContext,
 		primary: KeyCode.RightArrow,
 		handler: (accessor, args?: any) => {
@@ -137,7 +137,7 @@ export function registerNotificationCommands(center: INotificationsCenterControl
 	// Collapse Notification
 	KeybindingsRegistry.registerCommandAndKeybindingRule({
 		id: COLLAPSE_NOTIFICATION,
-		weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
+		weight: KeybindingWeight.WorkbenchContrib,
 		when: NotificationFocusedContext,
 		primary: KeyCode.LeftArrow,
 		handler: (accessor, args?: any) => {
@@ -151,7 +151,7 @@ export function registerNotificationCommands(center: INotificationsCenterControl
 	// Toggle Notification
 	KeybindingsRegistry.registerCommandAndKeybindingRule({
 		id: TOGGLE_NOTIFICATION,
-		weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
+		weight: KeybindingWeight.WorkbenchContrib,
 		when: NotificationFocusedContext,
 		primary: KeyCode.Space,
 		secondary: [KeyCode.Enter],
@@ -166,7 +166,7 @@ export function registerNotificationCommands(center: INotificationsCenterControl
 	// Hide Toasts
 	KeybindingsRegistry.registerCommandAndKeybindingRule({
 		id: HIDE_NOTIFICATION_TOAST,
-		weight: KeybindingsRegistry.WEIGHT.workbenchContrib(50),
+		weight: KeybindingWeight.WorkbenchContrib + 50,
 		when: NotificationsToastsVisibleContext,
 		primary: KeyCode.Escape,
 		handler: accessor => toasts.hide()
@@ -178,7 +178,7 @@ export function registerNotificationCommands(center: INotificationsCenterControl
 	// Focus Next Toast
 	KeybindingsRegistry.registerCommandAndKeybindingRule({
 		id: FOCUS_NEXT_NOTIFICATION_TOAST,
-		weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
+		weight: KeybindingWeight.WorkbenchContrib,
 		when: ContextKeyExpr.and(NotificationFocusedContext, NotificationsToastsVisibleContext),
 		primary: KeyCode.DownArrow,
 		handler: (accessor) => {
@@ -189,7 +189,7 @@ export function registerNotificationCommands(center: INotificationsCenterControl
 	// Focus Previous Toast
 	KeybindingsRegistry.registerCommandAndKeybindingRule({
 		id: FOCUS_PREVIOUS_NOTIFICATION_TOAST,
-		weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
+		weight: KeybindingWeight.WorkbenchContrib,
 		when: ContextKeyExpr.and(NotificationFocusedContext, NotificationsToastsVisibleContext),
 		primary: KeyCode.UpArrow,
 		handler: (accessor) => {
@@ -200,7 +200,7 @@ export function registerNotificationCommands(center: INotificationsCenterControl
 	// Focus First Toast
 	KeybindingsRegistry.registerCommandAndKeybindingRule({
 		id: FOCUS_FIRST_NOTIFICATION_TOAST,
-		weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
+		weight: KeybindingWeight.WorkbenchContrib,
 		when: ContextKeyExpr.and(NotificationFocusedContext, NotificationsToastsVisibleContext),
 		primary: KeyCode.PageUp,
 		secondary: [KeyCode.Home],
@@ -212,7 +212,7 @@ export function registerNotificationCommands(center: INotificationsCenterControl
 	// Focus Last Toast
 	KeybindingsRegistry.registerCommandAndKeybindingRule({
 		id: FOCUS_LAST_NOTIFICATION_TOAST,
-		weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
+		weight: KeybindingWeight.WorkbenchContrib,
 		when: ContextKeyExpr.and(NotificationFocusedContext, NotificationsToastsVisibleContext),
 		primary: KeyCode.PageDown,
 		secondary: [KeyCode.End],
diff --git a/src/vs/workbench/browser/parts/notifications/notificationsList.ts b/src/vs/workbench/browser/parts/notifications/notificationsList.ts
index 3f4cb3ad968..094a62f91fd 100644
--- a/src/vs/workbench/browser/parts/notifications/notificationsList.ts
+++ b/src/vs/workbench/browser/parts/notifications/notificationsList.ts
@@ -38,7 +38,7 @@ export class NotificationsList extends Themable {
 		this.viewModel = [];
 	}
 
-	public show(focus?: boolean): void {
+	show(focus?: boolean): void {
 		if (this.isVisible) {
 			if (focus) {
 				this.list.domFocus();
@@ -67,47 +67,43 @@ export class NotificationsList extends Themable {
 		this.listContainer = document.createElement('div');
 		addClass(this.listContainer, 'notifications-list-container');
 
-		const actionRunner = this.instantiationService.createInstance(NotificationActionRunner);
-		this.toUnbind.push(actionRunner);
+		const actionRunner = this._register(this.instantiationService.createInstance(NotificationActionRunner));
 
 		// Notification Renderer
 		const renderer = this.instantiationService.createInstance(NotificationRenderer, actionRunner);
 
 		// List
-		this.list = <WorkbenchList<INotificationViewItem>>this.instantiationService.createInstance(
+		this.list = this._register(<WorkbenchList<INotificationViewItem>>this.instantiationService.createInstance(
 			WorkbenchList,
 			this.listContainer,
 			new NotificationsListDelegate(this.listContainer),
 			[renderer],
 			this.options
-		);
-		this.toUnbind.push(this.list);
+		));
 
 		// Context menu to copy message
-		const copyAction = this.instantiationService.createInstance(CopyNotificationMessageAction, CopyNotificationMessageAction.ID, CopyNotificationMessageAction.LABEL);
-		this.toUnbind.push(copyAction);
-		this.toUnbind.push(this.list.onContextMenu(e => {
+		const copyAction = this._register(this.instantiationService.createInstance(CopyNotificationMessageAction, CopyNotificationMessageAction.ID, CopyNotificationMessageAction.LABEL));
+		this._register((this.list.onContextMenu(e => {
 			this.contextMenuService.showContextMenu({
 				getAnchor: () => e.anchor,
 				getActions: () => TPromise.as([copyAction]),
 				getActionsContext: () => e.element,
 				actionRunner
 			});
-		}));
+		})));
 
 		// Toggle on double click
-		this.toUnbind.push(this.list.onMouseDblClick(event => (event.element as INotificationViewItem).toggle()));
+		this._register((this.list.onMouseDblClick(event => (event.element as INotificationViewItem).toggle())));
 
 		// Clear focus when DOM focus moves out
 		// Use document.hasFocus() to not clear the focus when the entire window lost focus
 		// This ensures that when the focus comes back, the notifciation is still focused
-		const listFocusTracker = trackFocus(this.list.getHTMLElement());
-		listFocusTracker.onDidBlur(() => {
+		const listFocusTracker = this._register(trackFocus(this.list.getHTMLElement()));
+		this._register(listFocusTracker.onDidBlur(() => {
 			if (document.hasFocus()) {
 				this.list.setFocus([]);
 			}
-		});
-		this.toUnbind.push(listFocusTracker);
+		}));
 
 		// Context key
 		NotificationFocusedContext.bindTo(this.list.contextKeyService);
@@ -115,7 +111,7 @@ export class NotificationsList extends Themable {
 		// Only allow for focus in notifications, as the
 		// selection is too strong over the contents of
 		// the notification
-		this.toUnbind.push(this.list.onSelectionChange(e => {
+		this._register(this.list.onSelectionChange(e => {
 			if (e.indexes.length > 0) {
 				this.list.setSelection([]);
 			}
@@ -126,7 +122,7 @@ export class NotificationsList extends Themable {
 		this.updateStyles();
 	}
 
-	public updateNotificationsList(start: number, deleteCount: number, items: INotificationViewItem[] = []) {
+	updateNotificationsList(start: number, deleteCount: number, items: INotificationViewItem[] = []) {
 		const listHasDOMFocus = isAncestor(document.activeElement, this.listContainer);
 
 		// Remember focus and relative top of that item
@@ -177,7 +173,7 @@ export class NotificationsList extends Themable {
 		}
 	}
 
-	public hide(): void {
+	hide(): void {
 		if (!this.isVisible || !this.list) {
 			return; // already hidden
 		}
@@ -192,7 +188,7 @@ export class NotificationsList extends Themable {
 		this.viewModel = [];
 	}
 
-	public focusFirst(): void {
+	focusFirst(): void {
 		if (!this.isVisible || !this.list) {
 			return; // hidden
 		}
@@ -201,7 +197,7 @@ export class NotificationsList extends Themable {
 		this.list.domFocus();
 	}
 
-	public hasFocus(): boolean {
+	hasFocus(): boolean {
 		if (!this.isVisible || !this.list) {
 			return false; // hidden
 		}
@@ -222,7 +218,7 @@ export class NotificationsList extends Themable {
 		}
 	}
 
-	public layout(width: number, maxHeight?: number): void {
+	layout(width: number, maxHeight?: number): void {
 		if (this.list) {
 			this.listContainer.style.width = `${width}px`;
 
@@ -234,7 +230,7 @@ export class NotificationsList extends Themable {
 		}
 	}
 
-	public dispose(): void {
+	dispose(): void {
 		this.hide();
 
 		super.dispose();
diff --git a/src/vs/workbench/browser/parts/notifications/notificationsStatus.ts b/src/vs/workbench/browser/parts/notifications/notificationsStatus.ts
index 32f884d0fc6..fe7e047fc1b 100644
--- a/src/vs/workbench/browser/parts/notifications/notificationsStatus.ts
+++ b/src/vs/workbench/browser/parts/notifications/notificationsStatus.ts
@@ -7,13 +7,12 @@
 
 import { INotificationsModel, INotificationChangeEvent, NotificationChangeType, INotificationViewItem } from 'vs/workbench/common/notifications';
 import { IStatusbarService, StatusbarAlignment } from 'vs/platform/statusbar/common/statusbar';
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
+import { IDisposable, Disposable } from 'vs/base/common/lifecycle';
 import { HIDE_NOTIFICATIONS_CENTER, SHOW_NOTIFICATIONS_CENTER } from 'vs/workbench/browser/parts/notifications/notificationsCommands';
 import { localize } from 'vs/nls';
 
-export class NotificationsStatus {
+export class NotificationsStatus extends Disposable {
 	private statusItem: IDisposable;
-	private toDispose: IDisposable[];
 	private isNotificationsCenterVisible: boolean;
 	private _counter: Set<INotificationViewItem>;
 
@@ -21,7 +20,8 @@ export class NotificationsStatus {
 		private model: INotificationsModel,
 		@IStatusbarService private statusbarService: IStatusbarService
 	) {
-		this.toDispose = [];
+		super();
+
 		this._counter = new Set<INotificationViewItem>();
 
 		this.updateNotificationsStatusItem();
@@ -33,7 +33,7 @@ export class NotificationsStatus {
 		return this._counter.size;
 	}
 
-	public update(isCenterVisible: boolean): void {
+	update(isCenterVisible: boolean): void {
 		if (this.isNotificationsCenterVisible !== isCenterVisible) {
 			this.isNotificationsCenterVisible = isCenterVisible;
 
@@ -44,7 +44,7 @@ export class NotificationsStatus {
 	}
 
 	private registerListeners(): void {
-		this.toDispose.push(this.model.onDidNotificationChange(e => this.onDidNotificationChange(e)));
+		this._register(this.model.onDidNotificationChange(e => this.onDidNotificationChange(e)));
 	}
 
 	private onDidNotificationChange(e: INotificationChangeEvent): void {
@@ -101,8 +101,8 @@ export class NotificationsStatus {
 		return localize('notifications', "{0} New Notifications", this.count);
 	}
 
-	public dispose() {
-		this.toDispose = dispose(this.toDispose);
+	dispose() {
+		super.dispose();
 
 		if (this.statusItem) {
 			this.statusItem.dispose();
diff --git a/src/vs/workbench/browser/parts/notifications/notificationsToasts.ts b/src/vs/workbench/browser/parts/notifications/notificationsToasts.ts
index 3c51fb8c2f0..17eb959b455 100644
--- a/src/vs/workbench/browser/parts/notifications/notificationsToasts.ts
+++ b/src/vs/workbench/browser/parts/notifications/notificationsToasts.ts
@@ -80,7 +80,7 @@ export class NotificationsToasts extends Themable {
 	}
 
 	private registerListeners(): void {
-		this.toUnbind.push(this.model.onDidNotificationChange(e => this.onDidNotificationChange(e)));
+		this._register(this.model.onDidNotificationChange(e => this.onDidNotificationChange(e)));
 	}
 
 	private onDidNotificationChange(e: INotificationChangeEvent): void {
@@ -185,7 +185,7 @@ export class NotificationsToasts extends Themable {
 			let timeoutHandle: number;
 			const hideAfterTimeout = () => {
 				timeoutHandle = setTimeout(() => {
-					const showsProgress = item.progress && !item.progress.state.done;
+					const showsProgress = item.hasProgress() && !item.progress.state.done;
 					if (!notificationList.hasFocus() && !item.expanded && !isMouseOverToast && !showsProgress) {
 						this.removeToast(item);
 					} else {
@@ -265,7 +265,7 @@ export class NotificationsToasts extends Themable {
 		this.notificationsToastsVisibleContextKey.set(false);
 	}
 
-	public hide(): void {
+	hide(): void {
 		const focusGroup = isAncestor(document.activeElement, this.notificationsToastsContainer);
 
 		this.removeToasts();
@@ -275,7 +275,7 @@ export class NotificationsToasts extends Themable {
 		}
 	}
 
-	public focus(): boolean {
+	focus(): boolean {
 		const toasts = this.getToasts(ToastVisibility.VISIBLE);
 		if (toasts.length > 0) {
 			toasts[0].list.focusFirst();
@@ -286,7 +286,7 @@ export class NotificationsToasts extends Themable {
 		return false;
 	}
 
-	public focusNext(): boolean {
+	focusNext(): boolean {
 		const toasts = this.getToasts(ToastVisibility.VISIBLE);
 		for (let i = 0; i < toasts.length; i++) {
 			const toast = toasts[i];
@@ -305,7 +305,7 @@ export class NotificationsToasts extends Themable {
 		return false;
 	}
 
-	public focusPrevious(): boolean {
+	focusPrevious(): boolean {
 		const toasts = this.getToasts(ToastVisibility.VISIBLE);
 		for (let i = 0; i < toasts.length; i++) {
 			const toast = toasts[i];
@@ -324,7 +324,7 @@ export class NotificationsToasts extends Themable {
 		return false;
 	}
 
-	public focusFirst(): boolean {
+	focusFirst(): boolean {
 		const toast = this.getToasts(ToastVisibility.VISIBLE)[0];
 		if (toast) {
 			toast.list.focusFirst();
@@ -335,7 +335,7 @@ export class NotificationsToasts extends Themable {
 		return false;
 	}
 
-	public focusLast(): boolean {
+	focusLast(): boolean {
 		const toasts = this.getToasts(ToastVisibility.VISIBLE);
 		if (toasts.length > 0) {
 			toasts[toasts.length - 1].list.focusFirst();
@@ -346,7 +346,7 @@ export class NotificationsToasts extends Themable {
 		return false;
 	}
 
-	public update(isCenterVisible: boolean): void {
+	update(isCenterVisible: boolean): void {
 		if (this.isNotificationsCenterVisible !== isCenterVisible) {
 			this.isNotificationsCenterVisible = isCenterVisible;
 
@@ -391,7 +391,7 @@ export class NotificationsToasts extends Themable {
 		return notificationToasts.reverse(); // from newest to oldest
 	}
 
-	public layout(dimension: Dimension): void {
+	layout(dimension: Dimension): void {
 		this.workbenchDimensions = dimension;
 
 		const maxDimensions = this.computeMaxDimensions();
diff --git a/src/vs/workbench/browser/parts/notifications/notificationsViewer.ts b/src/vs/workbench/browser/parts/notifications/notificationsViewer.ts
index 035b52716f8..055f280bb41 100644
--- a/src/vs/workbench/browser/parts/notifications/notificationsViewer.ts
+++ b/src/vs/workbench/browser/parts/notifications/notificationsViewer.ts
@@ -5,10 +5,10 @@
 
 'use strict';
 
-import { IDelegate, IRenderer } from 'vs/base/browser/ui/list/list';
-import { clearNode, addClass, removeClass, toggleClass, addDisposableListener } from 'vs/base/browser/dom';
+import { IVirtualDelegate, IRenderer } from 'vs/base/browser/ui/list/list';
+import { clearNode, addClass, removeClass, toggleClass, addDisposableListener, EventType, EventHelper } from 'vs/base/browser/dom';
 import { IOpenerService } from 'vs/platform/opener/common/opener';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { onUnexpectedError } from 'vs/base/common/errors';
 import { localize } from 'vs/nls';
 import { ButtonGroup } from 'vs/base/browser/ui/button/button';
@@ -26,7 +26,7 @@ import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { ProgressBar } from 'vs/base/browser/ui/progressbar/progressbar';
 import { Severity } from 'vs/platform/notification/common/notification';
 
-export class NotificationsListDelegate implements IDelegate<INotificationViewItem> {
+export class NotificationsListDelegate implements IVirtualDelegate<INotificationViewItem> {
 
 	private static readonly ROW_HEIGHT = 42;
 	private static readonly LINE_HEIGHT = 22;
@@ -46,7 +46,7 @@ export class NotificationsListDelegate implements IDelegate<INotificationViewIte
 		return offsetHelper;
 	}
 
-	public getHeight(notification: INotificationViewItem): number {
+	getHeight(notification: INotificationViewItem): number {
 
 		// First row: message and actions
 		let expandedHeight = NotificationsListDelegate.ROW_HEIGHT;
@@ -102,7 +102,7 @@ export class NotificationsListDelegate implements IDelegate<INotificationViewIte
 		return preferredHeight;
 	}
 
-	public getTemplateId(element: INotificationViewItem): string {
+	getTemplateId(element: INotificationViewItem): string {
 		if (element instanceof NotificationViewItem) {
 			return NotificationRenderer.TEMPLATE_ID;
 		}
@@ -135,7 +135,7 @@ interface IMessageActionHandler {
 
 class NotificationMessageRenderer {
 
-	public static render(message: INotificationMessage, actionHandler?: IMessageActionHandler): HTMLElement {
+	static render(message: INotificationMessage, actionHandler?: IMessageActionHandler): HTMLElement {
 		const messageContainer = document.createElement('span');
 
 		// Message has no links
@@ -181,7 +181,7 @@ class NotificationMessageRenderer {
 
 export class NotificationRenderer implements IRenderer<INotificationViewItem, INotificationTemplateData> {
 
-	public static readonly TEMPLATE_ID = 'notification';
+	static readonly TEMPLATE_ID = 'notification';
 
 	constructor(
 		private actionRunner: IActionRunner,
@@ -191,11 +191,11 @@ export class NotificationRenderer implements IRenderer<INotificationViewItem, IN
 	) {
 	}
 
-	public get templateId() {
+	get templateId() {
 		return NotificationRenderer.TEMPLATE_ID;
 	}
 
-	public renderTemplate(container: HTMLElement): INotificationTemplateData {
+	renderTemplate(container: HTMLElement): INotificationTemplateData {
 		const data: INotificationTemplateData = Object.create(null);
 		data.toDispose = [];
 
@@ -274,11 +274,15 @@ export class NotificationRenderer implements IRenderer<INotificationViewItem, IN
 		return data;
 	}
 
-	public renderElement(notification: INotificationViewItem, index: number, data: INotificationTemplateData): void {
+	renderElement(notification: INotificationViewItem, index: number, data: INotificationTemplateData): void {
 		data.renderer.setInput(notification);
 	}
 
-	public disposeTemplate(templateData: INotificationTemplateData): void {
+	disposeElement(): void {
+		// noop
+	}
+
+	disposeTemplate(templateData: INotificationTemplateData): void {
 		templateData.toDispose = dispose(templateData.toDispose);
 	}
 }
@@ -291,7 +295,7 @@ export class NotificationTemplateRenderer {
 
 	private static readonly SEVERITIES: ('info' | 'warning' | 'error')[] = ['info', 'warning', 'error'];
 
-	private inputDisposeables: IDisposable[];
+	private inputDisposeables: IDisposable[] = [];
 
 	constructor(
 		private template: INotificationTemplateData,
@@ -301,8 +305,6 @@ export class NotificationTemplateRenderer {
 		@IThemeService private themeService: IThemeService,
 		@IKeybindingService private keybindingService: IKeybindingService
 	) {
-		this.inputDisposeables = [];
-
 		if (!NotificationTemplateRenderer.closeNotificationAction) {
 			NotificationTemplateRenderer.closeNotificationAction = instantiationService.createInstance(ClearNotificationAction, ClearNotificationAction.ID, ClearNotificationAction.LABEL);
 			NotificationTemplateRenderer.expandNotificationAction = instantiationService.createInstance(ExpandNotificationAction, ExpandNotificationAction.ID, ExpandNotificationAction.LABEL);
@@ -310,7 +312,7 @@ export class NotificationTemplateRenderer {
 		}
 	}
 
-	public setInput(notification: INotificationViewItem): void {
+	setInput(notification: INotificationViewItem): void {
 		this.inputDisposeables = dispose(this.inputDisposeables);
 
 		this.render(notification);
@@ -320,6 +322,13 @@ export class NotificationTemplateRenderer {
 
 		// Container
 		toggleClass(this.template.container, 'expanded', notification.expanded);
+		this.inputDisposeables.push(addDisposableListener(this.template.container, EventType.MOUSE_UP, e => {
+			if (e.button === 1 /* Middle Button */) {
+				EventHelper.stop(e);
+
+				notification.close();
+			}
+		}));
 
 		// Severity Icon
 		this.renderSeverity(notification);
@@ -417,10 +426,10 @@ export class NotificationTemplateRenderer {
 
 	private renderSource(notification): void {
 		if (notification.expanded && notification.source) {
-			this.template.source.innerText = localize('notificationSource', "Source: {0}", notification.source);
+			this.template.source.textContent = localize('notificationSource', "Source: {0}", notification.source);
 			this.template.source.title = notification.source;
 		} else {
-			this.template.source.innerText = '';
+			this.template.source.textContent = '';
 			this.template.source.removeAttribute('title');
 		}
 	}
@@ -435,8 +444,7 @@ export class NotificationTemplateRenderer {
 				button.label = action.label;
 
 				this.inputDisposeables.push(button.onDidClick(e => {
-					e.preventDefault();
-					e.stopPropagation();
+					EventHelper.stop(e, true);
 
 					// Run action
 					this.actionRunner.run(action, notification);
@@ -501,7 +509,7 @@ export class NotificationTemplateRenderer {
 		return keybinding ? keybinding.getLabel() : void 0;
 	}
 
-	public dispose(): void {
+	dispose(): void {
 		this.inputDisposeables = dispose(this.inputDisposeables);
 	}
-}
\ No newline at end of file
+}
diff --git a/src/vs/workbench/browser/parts/panel/media/panelpart.css b/src/vs/workbench/browser/parts/panel/media/panelpart.css
index 0c58440f0d4..cfd1137cf35 100644
--- a/src/vs/workbench/browser/parts/panel/media/panelpart.css
+++ b/src/vs/workbench/browser/parts/panel/media/panelpart.css
@@ -81,16 +81,19 @@
 }
 
 .monaco-workbench  > .part.panel > .title > .panel-switcher-container > .monaco-action-bar .badge {
-	margin-left: 4px;
+	margin-left: 8px;
 }
 
 .monaco-workbench  > .part.panel > .title > .panel-switcher-container > .monaco-action-bar .badge .badge-content {
-	padding: 0.2em 0.5em;
+	padding: 0.3em 0.5em;
 	border-radius: 1em;
 	font-weight: normal;
 	text-align: center;
-	display: inline;
-}
+	display: inline-block;
+	min-width: 1.6em;
+	line-height: 1em;
+	box-sizing: border-box;
+	}
 
 /** Actions */
 
diff --git a/src/vs/workbench/browser/parts/panel/panelActions.ts b/src/vs/workbench/browser/parts/panel/panelActions.ts
index b1451168b72..54d4f61d040 100644
--- a/src/vs/workbench/browser/parts/panel/panelActions.ts
+++ b/src/vs/workbench/browser/parts/panel/panelActions.ts
@@ -10,14 +10,15 @@ import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { KeyMod, KeyCode } from 'vs/base/common/keyCodes';
 import { Action } from 'vs/base/common/actions';
 import { Registry } from 'vs/platform/registry/common/platform';
-import { SyncActionDescriptor } from 'vs/platform/actions/common/actions';
+import { SyncActionDescriptor, MenuId, MenuRegistry } from 'vs/platform/actions/common/actions';
 import { IWorkbenchActionRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/actions';
 import { IPanelService } from 'vs/workbench/services/panel/common/panelService';
 import { IPartService, Parts, Position } from 'vs/workbench/services/part/common/partService';
-import { ActivityAction } from 'vs/workbench/browser/parts/compositebar/compositeBarActions';
+import { ActivityAction } from 'vs/workbench/browser/parts/compositeBarActions';
 import { IActivity } from 'vs/workbench/common/activity';
 
 export class ClosePanelAction extends Action {
+
 	static readonly ID = 'workbench.action.closePanel';
 	static LABEL = nls.localize('closePanel', "Close Panel");
 
@@ -29,12 +30,13 @@ export class ClosePanelAction extends Action {
 		super(id, name, 'hide-panel-action');
 	}
 
-	public run(): TPromise<any> {
+	run(): TPromise<any> {
 		return this.partService.setPanelHidden(true);
 	}
 }
 
 export class TogglePanelAction extends Action {
+
 	static readonly ID = 'workbench.action.togglePanel';
 	static LABEL = nls.localize('togglePanel', "Toggle Panel");
 
@@ -46,15 +48,15 @@ export class TogglePanelAction extends Action {
 		super(id, name, partService.isVisible(Parts.PANEL_PART) ? 'panel expanded' : 'panel');
 	}
 
-	public run(): TPromise<any> {
+	run(): TPromise<any> {
 		return this.partService.setPanelHidden(this.partService.isVisible(Parts.PANEL_PART));
 	}
 }
 
 class FocusPanelAction extends Action {
 
-	public static readonly ID = 'workbench.action.focusPanel';
-	public static readonly LABEL = nls.localize('focusPanel', "Focus into Panel");
+	static readonly ID = 'workbench.action.focusPanel';
+	static readonly LABEL = nls.localize('focusPanel', "Focus into Panel");
 
 	constructor(
 		id: string,
@@ -65,7 +67,7 @@ class FocusPanelAction extends Action {
 		super(id, label);
 	}
 
-	public run(): TPromise<any> {
+	run(): TPromise<any> {
 
 		// Show panel
 		if (!this.partService.isVisible(Parts.PANEL_PART)) {
@@ -83,10 +85,12 @@ class FocusPanelAction extends Action {
 
 export class TogglePanelPositionAction extends Action {
 
-	public static readonly ID = 'workbench.action.togglePanelPosition';
-	public static readonly LABEL = nls.localize('toggledPanelPosition', "Toggle Panel Position");
+	static readonly ID = 'workbench.action.togglePanelPosition';
+	static readonly LABEL = nls.localize('toggledPanelPosition', "Toggle Panel Position");
+
 	private static readonly MOVE_TO_RIGHT_LABEL = nls.localize('moveToRight', "Move to Right");
 	private static readonly MOVE_TO_BOTTOM_LABEL = nls.localize('moveToBottom', "Move to Bottom");
+
 	private toDispose: IDisposable[];
 
 	constructor(
@@ -106,12 +110,12 @@ export class TogglePanelPositionAction extends Action {
 		setClassAndLabel();
 	}
 
-	public run(): TPromise<any> {
+	run(): TPromise<any> {
 		const position = this.partService.getPanelPosition();
 		return this.partService.setPanelPosition(position === Position.BOTTOM ? Position.RIGHT : Position.BOTTOM);
 	}
 
-	public dispose(): void {
+	dispose(): void {
 		super.dispose();
 		this.toDispose = dispose(this.toDispose);
 	}
@@ -119,10 +123,12 @@ export class TogglePanelPositionAction extends Action {
 
 export class ToggleMaximizedPanelAction extends Action {
 
-	public static readonly ID = 'workbench.action.toggleMaximizedPanel';
-	public static readonly LABEL = nls.localize('toggleMaximizedPanel', "Toggle Maximized Panel");
+	static readonly ID = 'workbench.action.toggleMaximizedPanel';
+	static readonly LABEL = nls.localize('toggleMaximizedPanel', "Toggle Maximized Panel");
+
 	private static readonly MAXIMIZE_LABEL = nls.localize('maximizePanel', "Maximize Panel Size");
 	private static readonly RESTORE_LABEL = nls.localize('minimizePanel', "Restore Panel Size");
+
 	private toDispose: IDisposable[];
 
 	constructor(
@@ -139,13 +145,12 @@ export class ToggleMaximizedPanelAction extends Action {
 		}));
 	}
 
-	public run(): TPromise<any> {
-		// Show panel
+	run(): TPromise<any> {
 		return (!this.partService.isVisible(Parts.PANEL_PART) ? this.partService.setPanelHidden(false) : TPromise.as(null))
 			.then(() => this.partService.toggleMaximizedPanel());
 	}
 
-	public dispose(): void {
+	dispose(): void {
 		super.dispose();
 		this.toDispose = dispose(this.toDispose);
 	}
@@ -160,7 +165,7 @@ export class PanelActivityAction extends ActivityAction {
 		super(activity);
 	}
 
-	public run(event: any): TPromise<any> {
+	run(event: any): TPromise<any> {
 		return this.panelService.openPanel(this.activity.id, true).then(() => this.activate());
 	}
 }
@@ -172,3 +177,12 @@ actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(ToggleMaximizedP
 actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(ClosePanelAction, ClosePanelAction.ID, ClosePanelAction.LABEL), 'View: Close Panel', nls.localize('view', "View"));
 actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(TogglePanelPositionAction, TogglePanelPositionAction.ID, TogglePanelPositionAction.LABEL), 'View: Toggle Panel Position', nls.localize('view', "View"));
 actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(ToggleMaximizedPanelAction, ToggleMaximizedPanelAction.ID, undefined), 'View: Toggle Panel Position', nls.localize('view', "View"));
+
+MenuRegistry.appendMenuItem(MenuId.MenubarAppearanceMenu, {
+	group: '2_workbench_layout',
+	command: {
+		id: TogglePanelAction.ID,
+		title: nls.localize({ key: 'miTogglePanel', comment: ['&& denotes a mnemonic'] }, "Toggle &&Panel")
+	},
+	order: 5
+});
diff --git a/src/vs/workbench/browser/parts/panel/panelPart.ts b/src/vs/workbench/browser/parts/panel/panelPart.ts
index f076f3a9ff1..1880db49212 100644
--- a/src/vs/workbench/browser/parts/panel/panelPart.ts
+++ b/src/vs/workbench/browser/parts/panel/panelPart.ts
@@ -7,7 +7,6 @@ import 'vs/css!./media/panelpart';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { IAction } from 'vs/base/common/actions';
 import { Event } from 'vs/base/common/event';
-import { $ } from 'vs/base/browser/builder';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { ActionsOrientation } from 'vs/base/browser/ui/actionbar/actionbar';
 import { IPanel } from 'vs/workbench/common/panel';
@@ -24,13 +23,13 @@ import { ClosePanelAction, TogglePanelPositionAction, PanelActivityAction, Toggl
 import { IThemeService, registerThemingParticipant, ITheme, ICssStyleCollector } from 'vs/platform/theme/common/themeService';
 import { PANEL_BACKGROUND, PANEL_BORDER, PANEL_ACTIVE_TITLE_FOREGROUND, PANEL_INACTIVE_TITLE_FOREGROUND, PANEL_ACTIVE_TITLE_BORDER, PANEL_DRAG_AND_DROP_BACKGROUND } from 'vs/workbench/common/theme';
 import { activeContrastBorder, focusBorder, contrastBorder, editorBackground, badgeBackground, badgeForeground } from 'vs/platform/theme/common/colorRegistry';
-import { CompositeBar } from 'vs/workbench/browser/parts/compositebar/compositeBar';
-import { ToggleCompositePinnedAction } from 'vs/workbench/browser/parts/compositebar/compositeBarActions';
+import { CompositeBar } from 'vs/workbench/browser/parts/compositeBar';
+import { ToggleCompositePinnedAction } from 'vs/workbench/browser/parts/compositeBarActions';
 import { IBadge } from 'vs/workbench/services/activity/common/activity';
 import { INotificationService } from 'vs/platform/notification/common/notification';
 import { Dimension } from 'vs/base/browser/dom';
 import { localize } from 'vs/nls';
-import { dispose, IDisposable } from 'vs/base/common/lifecycle';
+import { IDisposable } from 'vs/base/common/lifecycle';
 import { RawContextKey, IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 
 const ActivePanleContextId = 'activePanel';
@@ -38,18 +37,18 @@ export const ActivePanelContext = new RawContextKey<string>(ActivePanleContextId
 
 export class PanelPart extends CompositePart<Panel> implements IPanelService {
 
-	public static readonly activePanelSettingsKey = 'workbench.panelpart.activepanelid';
+	static readonly activePanelSettingsKey = 'workbench.panelpart.activepanelid';
+
 	private static readonly PINNED_PANELS = 'workbench.panel.pinnedPanels';
 	private static readonly MIN_COMPOSITE_BAR_WIDTH = 50;
 
-	public _serviceBrand: any;
+	_serviceBrand: any;
 
 	private activePanelContextKey: IContextKey<string>;
 	private blockOpeningPanel: boolean;
 	private compositeBar: CompositeBar;
-	private compositeActions: { [compositeId: string]: { activityAction: PanelActivityAction, pinnedAction: ToggleCompositePinnedAction } };
+	private compositeActions: { [compositeId: string]: { activityAction: PanelActivityAction, pinnedAction: ToggleCompositePinnedAction } } = Object.create(null);
 	private dimension: Dimension;
-	private disposables: IDisposable[] = [];
 
 	constructor(
 		id: string,
@@ -82,8 +81,7 @@ export class PanelPart extends CompositePart<Panel> implements IPanelService {
 			{ hasTitle: true }
 		);
 
-		this.compositeActions = Object.create(null);
-		this.compositeBar = this.instantiationService.createInstance(CompositeBar, {
+		this.compositeBar = this._register(this.instantiationService.createInstance(CompositeBar, {
 			icon: false,
 			storageId: PanelPart.PINNED_PANELS,
 			orientation: ActionsOrientation.HORIZONTAL,
@@ -102,31 +100,31 @@ export class PanelPart extends CompositePart<Panel> implements IPanelService {
 				badgeForeground,
 				dragAndDropBackground: PANEL_DRAG_AND_DROP_BACKGROUND
 			}
-		});
-		this.toUnbind.push(this.compositeBar);
+		}));
+
 		for (const panel of this.getPanels()) {
 			this.compositeBar.addComposite(panel);
 		}
+
 		this.activePanelContextKey = ActivePanelContext.bindTo(contextKeyService);
-		this.onDidPanelOpen(this._onDidPanelOpen, this, this.disposables);
-		this.onDidPanelClose(this._onDidPanelClose, this, this.disposables);
 
 		this.registerListeners();
 	}
 
 	private registerListeners(): void {
+		this._register(this.onDidPanelOpen(this._onDidPanelOpen, this));
+		this._register(this.onDidPanelClose(this._onDidPanelClose, this));
 
-		this.toUnbind.push(this.registry.onDidRegister(panelDescriptor => this.compositeBar.addComposite(panelDescriptor)));
+		this._register(this.registry.onDidRegister(panelDescriptor => this.compositeBar.addComposite(panelDescriptor)));
 
 		// Activate panel action on opening of a panel
-		this.toUnbind.push(this.onDidPanelOpen(panel => {
+		this._register(this.onDidPanelOpen(panel => {
 			this.compositeBar.activateComposite(panel.getId());
-			// Need to relayout composite bar since different panels have different action bar width
-			this.layoutCompositeBar();
+			this.layoutCompositeBar(); // Need to relayout composite bar since different panels have different action bar width
 		}));
 
 		// Deactivate panel action on close
-		this.toUnbind.push(this.onDidPanelClose(panel => this.compositeBar.deactivateComposite(panel.getId())));
+		this._register(this.onDidPanelClose(panel => this.compositeBar.deactivateComposite(panel.getId())));
 	}
 
 	private _onDidPanelOpen(panel: IPanel): void {
@@ -141,26 +139,26 @@ export class PanelPart extends CompositePart<Panel> implements IPanelService {
 		}
 	}
 
-	public get onDidPanelOpen(): Event<IPanel> {
+	get onDidPanelOpen(): Event<IPanel> {
 		return this._onDidCompositeOpen.event;
 	}
 
-	public get onDidPanelClose(): Event<IPanel> {
+	get onDidPanelClose(): Event<IPanel> {
 		return this._onDidCompositeClose.event;
 	}
 
-	public updateStyles(): void {
+	updateStyles(): void {
 		super.updateStyles();
 
-		const container = $(this.getContainer());
-		container.style('background-color', this.getColor(PANEL_BACKGROUND));
-		container.style('border-left-color', this.getColor(PANEL_BORDER) || this.getColor(contrastBorder));
+		const container = this.getContainer();
+		container.style.backgroundColor = this.getColor(PANEL_BACKGROUND);
+		container.style.borderLeftColor = this.getColor(PANEL_BORDER) || this.getColor(contrastBorder);
 
-		const title = $(this.getTitleArea());
-		title.style('border-top-color', this.getColor(PANEL_BORDER) || this.getColor(contrastBorder));
+		const title = this.getTitleArea();
+		title.style.borderTopColor = this.getColor(PANEL_BORDER) || this.getColor(contrastBorder);
 	}
 
-	public openPanel(id: string, focus?: boolean): TPromise<Panel> {
+	openPanel(id: string, focus?: boolean): TPromise<Panel> {
 		if (this.blockOpeningPanel) {
 			return TPromise.as(null); // Workaround against a potential race condition
 		}
@@ -179,7 +177,7 @@ export class PanelPart extends CompositePart<Panel> implements IPanelService {
 		return promise.then(() => this.openComposite(id, focus));
 	}
 
-	public showActivity(panelId: string, badge: IBadge, clazz?: string): IDisposable {
+	showActivity(panelId: string, badge: IBadge, clazz?: string): IDisposable {
 		return this.compositeBar.showActivity(panelId, badge, clazz);
 	}
 
@@ -187,13 +185,13 @@ export class PanelPart extends CompositePart<Panel> implements IPanelService {
 		return this.getPanels().filter(p => p.id === panelId).pop();
 	}
 
-	public getPanels(): PanelDescriptor[] {
+	getPanels(): PanelDescriptor[] {
 		return Registry.as<PanelRegistry>(PanelExtensions.Panels).getPanels()
 			.filter(p => p.enabled)
 			.sort((v1, v2) => v1.order - v2.order);
 	}
 
-	public setPanelEnablement(id: string, enabled: boolean): void {
+	setPanelEnablement(id: string, enabled: boolean): void {
 		const descriptor = Registry.as<PanelRegistry>(PanelExtensions.Panels).getPanels().filter(p => p.id === id).pop();
 		if (descriptor && descriptor.enabled !== enabled) {
 			descriptor.enabled = enabled;
@@ -213,15 +211,15 @@ export class PanelPart extends CompositePart<Panel> implements IPanelService {
 		];
 	}
 
-	public getActivePanel(): IPanel {
+	getActivePanel(): IPanel {
 		return this.getActiveComposite();
 	}
 
-	public getLastActivePanelId(): string {
+	getLastActivePanelId(): string {
 		return this.getLastActiveCompositetId();
 	}
 
-	public hideActivePanel(): TPromise<void> {
+	hideActivePanel(): TPromise<void> {
 		return this.hideActiveComposite().then(composite => void 0);
 	}
 
@@ -242,7 +240,7 @@ export class PanelPart extends CompositePart<Panel> implements IPanelService {
 		};
 	}
 
-	public layout(dimension: Dimension): Dimension[] {
+	layout(dimension: Dimension): Dimension[] {
 		if (!this.partService.isVisible(Parts.PANEL_PART)) {
 			return [dimension];
 		}
@@ -283,7 +281,7 @@ export class PanelPart extends CompositePart<Panel> implements IPanelService {
 	}
 
 	private removeComposite(compositeId: string): void {
-		this.compositeBar.removeComposite(compositeId);
+		this.compositeBar.hideComposite(compositeId);
 		const compositeActions = this.compositeActions[compositeId];
 		if (compositeActions) {
 			compositeActions.activityAction.dispose();
@@ -299,11 +297,6 @@ export class PanelPart extends CompositePart<Panel> implements IPanelService {
 		}
 		return this.toolBar.getItemsWidth();
 	}
-
-	dispose(): void {
-		super.dispose();
-		this.disposables = dispose(this.disposables);
-	}
 }
 
 registerThemingParticipant((theme: ITheme, collector: ICssStyleCollector) => {
diff --git a/src/vs/workbench/browser/parts/quickinput/media/dark/arrow-left.svg b/src/vs/workbench/browser/parts/quickinput/media/dark/arrow-left.svg
new file mode 100644
index 00000000000..0d24c218ae1
--- /dev/null
+++ b/src/vs/workbench/browser/parts/quickinput/media/dark/arrow-left.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="10px" height="16px" viewBox="0 0 10 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>arrow-left</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="arrow-left" fill="#c5c5c5">
+            <polygon id="Shape" points="6 3 0 8 6 13 6 10 10 10 10 6 6 6"></polygon>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/vs/workbench/browser/parts/quickinput/media/light/arrow-left.svg b/src/vs/workbench/browser/parts/quickinput/media/light/arrow-left.svg
new file mode 100644
index 00000000000..b8362b27458
--- /dev/null
+++ b/src/vs/workbench/browser/parts/quickinput/media/light/arrow-left.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="10px" height="16px" viewBox="0 0 10 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>arrow-left</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="arrow-left" fill="#424242">
+            <polygon id="Shape" points="6 3 0 8 6 13 6 10 10 10 10 6 6 6"></polygon>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/vs/workbench/browser/parts/quickinput/quickInput.contribution.ts b/src/vs/workbench/browser/parts/quickinput/quickInput.contribution.ts
index 5aea4a4cfce..7e5bc7f43a0 100644
--- a/src/vs/workbench/browser/parts/quickinput/quickInput.contribution.ts
+++ b/src/vs/workbench/browser/parts/quickinput/quickInput.contribution.ts
@@ -4,7 +4,15 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import { QuickPickManyToggle } from 'vs/workbench/browser/parts/quickinput/quickInput';
-import { KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRegistry';
+import { QuickPickManyToggle, BackAction } from 'vs/workbench/browser/parts/quickinput/quickInput';
+import { KeybindingsRegistry, KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
+import { Registry } from 'vs/platform/registry/common/platform';
+import { IWorkbenchActionRegistry, Extensions as ActionExtensions } from 'vs/workbench/common/actions';
+import { SyncActionDescriptor } from 'vs/platform/actions/common/actions';
+import { KeyMod, KeyCode } from 'vs/base/common/keyCodes';
+import { inQuickOpenContext } from 'vs/workbench/browser/parts/quickopen/quickopen';
 
 KeybindingsRegistry.registerCommandAndKeybindingRule(QuickPickManyToggle);
+
+const registry = Registry.as<IWorkbenchActionRegistry>(ActionExtensions.WorkbenchActions);
+registry.registerWorkbenchAction(new SyncActionDescriptor(BackAction, BackAction.ID, BackAction.LABEL, { primary: null, win: { primary: KeyMod.Alt | KeyCode.LeftArrow }, mac: { primary: KeyMod.WinCtrl | KeyCode.US_MINUS }, linux: { primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.US_MINUS } }, inQuickOpenContext, KeybindingWeight.WorkbenchContrib + 50), 'Back');
diff --git a/src/vs/workbench/browser/parts/quickinput/quickInput.css b/src/vs/workbench/browser/parts/quickinput/quickInput.css
index 630d3d6ba5f..113c80a9abc 100644
--- a/src/vs/workbench/browser/parts/quickinput/quickInput.css
+++ b/src/vs/workbench/browser/parts/quickinput/quickInput.css
@@ -12,6 +12,39 @@
 	margin-left: -300px;
 }
 
+.quick-input-titlebar {
+	display: flex;
+}
+
+.quick-input-left-action-bar {
+	display: flex;
+	margin-left: 4px;
+	flex: 1;
+}
+
+.quick-input-left-action-bar.monaco-action-bar .actions-container {
+	justify-content: flex-start;
+}
+
+.quick-input-title {
+	padding: 3px 0px;
+	text-align: center;
+}
+
+.quick-input-right-action-bar {
+	display: flex;
+	margin-right: 4px;
+	flex: 1;
+}
+
+.quick-input-titlebar .monaco-action-bar .action-label.icon {
+	margin: 0;
+	width: 19px;
+	height: 100%;
+	background-position: center;
+	background-repeat: no-repeat;
+}
+
 .quick-input-header {
 	display: flex;
 	padding: 6px 6px 4px 6px;
@@ -32,10 +65,15 @@
 	flex-grow: 1;
 }
 
-.quick-input-widget[data-type=pickMany] .quick-input-box {
+.quick-input-widget.show-checkboxes .quick-input-box {
 	margin-left: 5px;
 }
 
+.quick-input-visible-count {
+	position: absolute;
+	left: -10000px;
+}
+
 .quick-input-count {
 	align-self: center;
 	position: absolute;
@@ -60,6 +98,10 @@
 	margin: 0px 11px;
 }
 
+.quick-input-progress.monaco-progress-container {
+	position: relative;
+}
+
 .quick-input-progress.monaco-progress-container,
 .quick-input-progress.monaco-progress-container .progress-bit {
 	height: 2px;
@@ -75,12 +117,22 @@
 }
 
 .quick-input-list .quick-input-list-entry {
+	box-sizing: border-box;
 	overflow: hidden;
 	display: flex;
 	height: 100%;
 	padding: 0 6px;
 }
 
+.quick-input-list .quick-input-list-entry.quick-input-list-separator-border {
+	border-top-width: 1px;
+	border-top-style: solid;
+}
+
+.quick-input-list .monaco-list-row:first-child .quick-input-list-entry.quick-input-list-separator-border {
+	border-top-style: none;
+}
+
 .quick-input-list .quick-input-list-label {
 	overflow: hidden;
 	display: flex;
@@ -103,10 +155,17 @@
 	margin-left: 5px;
 }
 
-.quick-input-widget[data-type=pickMany] .quick-input-list .quick-input-list-rows {
+.quick-input-widget.show-checkboxes .quick-input-list .quick-input-list-rows {
 	margin-left: 10px;
 }
 
+.quick-input-widget .quick-input-list .quick-input-list-checkbox {
+	display: none;
+}
+.quick-input-widget.show-checkboxes .quick-input-list .quick-input-list-checkbox {
+	display: inline;
+}
+
 .quick-input-list .quick-input-list-rows > .quick-input-list-row {
 	display: flex;
 	align-items: center;
@@ -119,8 +178,50 @@
 .quick-input-list .quick-input-list-label-meta {
 	opacity: 0.7;
 	line-height: normal;
+	text-overflow: ellipsis;
+	overflow: hidden;
 }
 
 .quick-input-list .monaco-highlighted-label .highlight {
 	font-weight: bold;
-}
\ No newline at end of file
+}
+
+.quick-input-list .quick-input-list-separator {
+	margin-right: 18px;
+}
+
+.quick-input-list .quick-input-list-entry.has-actions:hover .quick-input-list-separator,
+.quick-input-list .monaco-list-row.focused .quick-input-list-entry.has-actions .quick-input-list-separator {
+	margin-right: 0;
+}
+
+.quick-input-list .quick-input-list-entry-action-bar {
+	display: none;
+	flex: 0;
+	overflow: visible;
+}
+
+.quick-input-list .quick-input-list-entry-action-bar .action-label.icon {
+	margin: 0;
+	width: 19px;
+	height: 100%;
+	background-position: center;
+	background-repeat: no-repeat;
+}
+
+.quick-input-list .quick-input-list-entry-action-bar {
+	margin-top: 1px;
+}
+
+.quick-input-list .quick-input-list-entry-action-bar ul:first-child .action-label.icon {
+	margin-left: 2px;
+}
+
+.quick-input-list .quick-input-list-entry-action-bar ul:last-child .action-label.icon {
+	margin-right: 8px;
+}
+
+.quick-input-list .quick-input-list-entry:hover .quick-input-list-entry-action-bar,
+.quick-input-list .monaco-list-row.focused .quick-input-list-entry-action-bar {
+	display: flex;
+}
diff --git a/src/vs/workbench/browser/parts/quickinput/quickInput.ts b/src/vs/workbench/browser/parts/quickinput/quickInput.ts
index dffd902c812..9c83f648d77 100644
--- a/src/vs/workbench/browser/parts/quickinput/quickInput.ts
+++ b/src/vs/workbench/browser/parts/quickinput/quickInput.ts
@@ -7,7 +7,7 @@
 
 import 'vs/css!./quickInput';
 import { Component } from 'vs/workbench/common/component';
-import { IQuickInputService, IPickOpenEntry, IPickOptions, IInputOptions, IQuickNavigateConfiguration, IQuickInput } from 'vs/platform/quickinput/common/quickInput';
+import { IQuickInputService, IQuickPickItem, IPickOptions, IInputOptions, IQuickNavigateConfiguration, IQuickPick, IQuickInput, IQuickInputButton, IInputBox, IQuickPickItemButtonEvent, QuickPickInput, IQuickPickSeparator, IKeyMods } from 'vs/platform/quickinput/common/quickInput';
 import { IPartService } from 'vs/workbench/services/part/common/partService';
 import * as dom from 'vs/base/browser/dom';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
@@ -16,7 +16,7 @@ import { contrastBorder, widgetShadow } from 'vs/platform/theme/common/colorRegi
 import { SIDE_BAR_BACKGROUND, SIDE_BAR_FOREGROUND } from 'vs/workbench/common/theme';
 import { IQuickOpenService } from 'vs/platform/quickOpen/common/quickOpen';
 import { TPromise } from 'vs/base/common/winjs.base';
-import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
+import { CancellationToken } from 'vs/base/common/cancellation';
 import { QuickInputList } from './quickInputList';
 import { QuickInputBox } from './quickInputBox';
 import { KeyCode } from 'vs/base/common/keyCodes';
@@ -28,136 +28,514 @@ import { CountBadge } from 'vs/base/browser/ui/countBadge/countBadge';
 import { attachBadgeStyler, attachProgressBarStyler, attachButtonStyler } from 'vs/platform/theme/common/styler';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { ProgressBar } from 'vs/base/browser/ui/progressbar/progressbar';
-import { chain, debounceEvent } from 'vs/base/common/event';
+import { debounceEvent, Emitter, Event } from 'vs/base/common/event';
 import { Button } from 'vs/base/browser/ui/button/button';
 import { dispose, IDisposable } from 'vs/base/common/lifecycle';
-import { onUnexpectedError, canceled } from 'vs/base/common/errors';
 import Severity from 'vs/base/common/severity';
 import { IEditorGroupsService } from 'vs/workbench/services/group/common/editorGroupsService';
 import { IContextKeyService, RawContextKey, IContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { ICommandAndKeybindingRule, KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRegistry';
+import { ICommandAndKeybindingRule, KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
 import { inQuickOpenContext } from 'vs/workbench/browser/parts/quickopen/quickopen';
+import { ActionBar, ActionItem } from 'vs/base/browser/ui/actionbar/actionbar';
+import { Action } from 'vs/base/common/actions';
+import { URI } from 'vs/base/common/uri';
+import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
+import { equals } from 'vs/base/common/arrays';
+import { TimeoutTimer } from 'vs/base/common/async';
+import { getIconClass } from 'vs/workbench/browser/parts/quickinput/quickInputUtils';
+import { AccessibilitySupport } from 'vs/base/common/platform';
+import * as browser from 'vs/base/browser/browser';
+import { IEditorOptions } from 'vs/editor/common/config/editorOptions';
 
 const $ = dom.$;
 
-type InputParameters = PickOneParameters | PickManyParameters | TextInputParameters;
+type Writeable<T> = { -readonly [P in keyof T]: T[P] };
 
-export interface BaseInputParameters {
-	readonly type: 'pickOne' | 'pickMany' | 'textInput';
-	readonly ignoreFocusLost?: boolean;
-}
-
-export interface PickParameters<T extends IPickOpenEntry = IPickOpenEntry> extends BaseInputParameters {
-	readonly type: 'pickOne' | 'pickMany';
-	readonly picks: TPromise<T[]>;
-	readonly matchOnDescription?: boolean;
-	readonly matchOnDetail?: boolean;
-	readonly placeHolder?: string;
-}
-
-export interface PickOneParameters<T extends IPickOpenEntry = IPickOpenEntry> extends PickParameters<T> {
-	readonly type: 'pickOne';
-}
-
-export interface PickManyParameters<T extends IPickOpenEntry = IPickOpenEntry> extends PickParameters<T> {
-	readonly type: 'pickMany';
-}
-
-export interface TextInputParameters extends BaseInputParameters {
-	readonly type: 'textInput';
-	readonly value?: string;
-	readonly valueSelection?: [number, number];
-	readonly prompt?: string;
-	readonly placeHolder?: string;
-	readonly password?: boolean;
-	readonly validateInput?: (input: string) => TPromise<string>;
-}
+const backButton = {
+	iconPath: {
+		dark: URI.parse(require.toUrl('vs/workbench/browser/parts/quickinput/media/dark/arrow-left.svg')),
+		light: URI.parse(require.toUrl('vs/workbench/browser/parts/quickinput/media/light/arrow-left.svg'))
+	},
+	tooltip: localize('quickInput.back', "Back"),
+	handle: -1 // TODO
+};
 
 interface QuickInputUI {
 	container: HTMLElement;
+	leftActionBar: ActionBar;
+	title: HTMLElement;
+	rightActionBar: ActionBar;
 	checkAll: HTMLInputElement;
 	inputBox: QuickInputBox;
+	visibleCount: CountBadge;
 	count: CountBadge;
 	message: HTMLElement;
+	progressBar: ProgressBar;
 	list: QuickInputList;
-	close: (ok?: true | Thenable<never>) => void;
+	onDidAccept: Event<void>;
+	onDidTriggerButton: Event<IQuickInputButton>;
+	ignoreFocusOut: boolean;
+	keyMods: Writeable<IKeyMods>;
+	isScreenReaderOptimized(): boolean;
+	show(controller: QuickInput): void;
+	setVisibilities(visibilities: Visibilities): void;
+	setComboboxAccessibility(enabled: boolean): void;
+	setEnabled(enabled: boolean): void;
+	setContextKey(contextKey?: string): void;
+	hide(): void;
 }
 
-interface InputController<R> {
-	readonly showUI: { [k in keyof QuickInputUI]?: boolean; } & { ok?: boolean; };
-	readonly result: TPromise<R>;
-	readonly ready: TPromise<void>;
-	readonly resolve: (ok?: true | Thenable<never>) => void | TPromise<void>;
+type Visibilities = {
+	title?: boolean;
+	checkAll?: boolean;
+	inputBox?: boolean;
+	visibleCount?: boolean;
+	count?: boolean;
+	message?: boolean;
+	list?: boolean;
+	ok?: boolean;
+};
+
+class QuickInput implements IQuickInput {
+
+	private _title: string;
+	private _steps: number;
+	private _totalSteps: number;
+	protected visible = false;
+	private _enabled = true;
+	private _contextKey: string;
+	private _busy = false;
+	private _ignoreFocusOut = false;
+	private _buttons: IQuickInputButton[] = [];
+	private buttonsUpdated = false;
+	private onDidTriggerButtonEmitter = new Emitter<IQuickInputButton>();
+	private onDidHideEmitter = new Emitter<void>();
+
+	protected visibleDisposables: IDisposable[] = [];
+	protected disposables: IDisposable[] = [
+		this.onDidTriggerButtonEmitter,
+		this.onDidHideEmitter,
+	];
+
+	private busyDelay: TimeoutTimer;
+
+	constructor(protected ui: QuickInputUI) {
+	}
+
+	get title() {
+		return this._title;
+	}
+
+	set title(title: string) {
+		this._title = title;
+		this.update();
+	}
+
+	get step() {
+		return this._steps;
+	}
+
+	set step(step: number) {
+		this._steps = step;
+		this.update();
+	}
+
+	get totalSteps() {
+		return this._totalSteps;
+	}
+
+	set totalSteps(totalSteps: number) {
+		this._totalSteps = totalSteps;
+		this.update();
+	}
+
+	get enabled() {
+		return this._enabled;
+	}
+
+	set enabled(enabled: boolean) {
+		this._enabled = enabled;
+		this.update();
+	}
+
+	get contextKey() {
+		return this._contextKey;
+	}
+
+	set contextKey(contextKey: string) {
+		this._contextKey = contextKey;
+		this.update();
+	}
+
+	get busy() {
+		return this._busy;
+	}
+
+	set busy(busy: boolean) {
+		this._busy = busy;
+		this.update();
+	}
+
+	get ignoreFocusOut() {
+		return this._ignoreFocusOut;
+	}
+
+	set ignoreFocusOut(ignoreFocusOut: boolean) {
+		this._ignoreFocusOut = ignoreFocusOut;
+		this.update();
+	}
+
+	get buttons() {
+		return this._buttons;
+	}
+
+	set buttons(buttons: IQuickInputButton[]) {
+		this._buttons = buttons;
+		this.buttonsUpdated = true;
+		this.update();
+	}
+
+	onDidTriggerButton = this.onDidTriggerButtonEmitter.event;
+
+	show(): void {
+		if (this.visible) {
+			return;
+		}
+		this.visibleDisposables.push(
+			this.ui.onDidTriggerButton(button => {
+				if (this.buttons.indexOf(button) !== -1) {
+					this.onDidTriggerButtonEmitter.fire(button);
+				}
+			}),
+		);
+		this.ui.show(this);
+		this.visible = true;
+		this.update();
+	}
+
+	hide(): void {
+		if (!this.visible) {
+			return;
+		}
+		this.ui.hide();
+	}
+
+	didHide(): void {
+		this.visible = false;
+		this.visibleDisposables = dispose(this.visibleDisposables);
+		this.onDidHideEmitter.fire();
+	}
+
+	onDidHide = this.onDidHideEmitter.event;
+
+	protected update() {
+		if (!this.visible) {
+			return;
+		}
+		const title = this.getTitle();
+		if (this.ui.title.textContent !== title) {
+			this.ui.title.textContent = title;
+		}
+		if (this.busy && !this.busyDelay) {
+			this.busyDelay = new TimeoutTimer();
+			this.busyDelay.setIfNotSet(() => {
+				if (this.visible) {
+					this.ui.progressBar.infinite();
+				}
+			}, 800);
+		}
+		if (!this.busy && this.busyDelay) {
+			this.ui.progressBar.stop();
+			this.busyDelay.cancel();
+			this.busyDelay = null;
+		}
+		if (this.buttonsUpdated) {
+			this.buttonsUpdated = false;
+			this.ui.leftActionBar.clear();
+			const leftButtons = this.buttons.filter(button => button === backButton);
+			this.ui.leftActionBar.push(leftButtons.map((button, index) => {
+				const action = new Action(`id-${index}`, '', button.iconClass || getIconClass(button.iconPath), true, () => this.onDidTriggerButtonEmitter.fire(button));
+				action.tooltip = button.tooltip;
+				return action;
+			}), { icon: true, label: false });
+			this.ui.rightActionBar.clear();
+			const rightButtons = this.buttons.filter(button => button !== backButton);
+			this.ui.rightActionBar.push(rightButtons.map((button, index) => {
+				const action = new Action(`id-${index}`, '', button.iconClass || getIconClass(button.iconPath), true, () => this.onDidTriggerButtonEmitter.fire(button));
+				action.tooltip = button.tooltip;
+				return action;
+			}), { icon: true, label: false });
+		}
+		this.ui.ignoreFocusOut = this.ignoreFocusOut;
+		this.ui.setEnabled(this.enabled);
+		this.ui.setContextKey(this.contextKey);
+	}
+
+	private getTitle() {
+		if (this.title && this.step) {
+			return `${this.title} (${this.getSteps()})`;
+		}
+		if (this.title) {
+			return this.title;
+		}
+		if (this.step) {
+			return this.getSteps();
+		}
+		return '';
+	}
+
+	private getSteps() {
+		if (this.step && this.totalSteps) {
+			return localize('quickInput.steps', "{0}/{1}", this.step, this.totalSteps);
+		}
+		if (this.step) {
+			return String(this.step);
+		}
+		return '';
+	}
+
+	public dispose(): void {
+		this.hide();
+		this.disposables = dispose(this.disposables);
+	}
 }
 
-class PickOneController<T extends IPickOpenEntry> implements InputController<T> {
-	public showUI = { inputBox: true, list: true };
-	public result: TPromise<T>;
-	public ready: TPromise<void>;
-	public resolve: (ok?: true | Thenable<never>) => void;
-	public progress: (value: T) => void;
-	private closed = false;
-	private quickNavigate = false;
-	private disposables: IDisposable[] = [];
+class QuickPick<T extends IQuickPickItem> extends QuickInput implements IQuickPick<T> {
 
-	constructor(private ui: QuickInputUI, parameters: PickOneParameters<T>) {
-		this.result = new TPromise<T>((resolve, reject, progress) => {
-			this.resolve = ok => resolve(ok === true ? <T>ui.list.getFocusedElements()[0] : ok);
-			this.progress = progress;
-		});
-		this.result.then(() => this.dispose());
+	private _value = '';
+	private _placeholder;
+	private onDidChangeValueEmitter = new Emitter<string>();
+	private onDidAcceptEmitter = new Emitter<string>();
+	private _items: (T | IQuickPickSeparator)[] = [];
+	private itemsUpdated = false;
+	private _canSelectMany = false;
+	private _matchOnDescription = false;
+	private _matchOnDetail = false;
+	private _activeItems: T[] = [];
+	private activeItemsUpdated = false;
+	private activeItemsToConfirm: T[] = [];
+	private onDidChangeActiveEmitter = new Emitter<T[]>();
+	private _selectedItems: T[] = [];
+	private selectedItemsUpdated = false;
+	private selectedItemsToConfirm: T[] = [];
+	private onDidChangeSelectionEmitter = new Emitter<T[]>();
+	private onDidTriggerItemButtonEmitter = new Emitter<IQuickPickItemButtonEvent<T>>();
 
-		ui.inputBox.value = '';
-		ui.inputBox.setPlaceholder(parameters.placeHolder || '');
-		ui.list.matchOnDescription = parameters.matchOnDescription;
-		ui.list.matchOnDetail = parameters.matchOnDetail;
-		ui.list.setElements([]);
+	quickNavigate: IQuickNavigateConfiguration;
 
-		this.ready = parameters.picks.then(elements => {
-			if (this.closed) {
+	constructor(ui: QuickInputUI) {
+		super(ui);
+		this.disposables.push(
+			this.onDidChangeValueEmitter,
+			this.onDidAcceptEmitter,
+			this.onDidChangeActiveEmitter,
+			this.onDidChangeSelectionEmitter,
+			this.onDidTriggerItemButtonEmitter,
+		);
+	}
+
+	get value() {
+		return this._value;
+	}
+
+	set value(value: string) {
+		this._value = value || '';
+		this.update();
+	}
+
+	get placeholder() {
+		return this._placeholder;
+	}
+
+	set placeholder(placeholder: string) {
+		this._placeholder = placeholder;
+		this.update();
+	}
+
+	onDidChangeValue = this.onDidChangeValueEmitter.event;
+
+	onDidAccept = this.onDidAcceptEmitter.event;
+
+	get items() {
+		return this._items;
+	}
+
+	set items(items: (T | IQuickPickSeparator)[]) {
+		this._items = items;
+		this.itemsUpdated = true;
+		this.update();
+	}
+
+	get canSelectMany() {
+		return this._canSelectMany;
+	}
+
+	set canSelectMany(canSelectMany: boolean) {
+		this._canSelectMany = canSelectMany;
+		this.update();
+	}
+
+	get matchOnDescription() {
+		return this._matchOnDescription;
+	}
+
+	set matchOnDescription(matchOnDescription: boolean) {
+		this._matchOnDescription = matchOnDescription;
+		this.update();
+	}
+
+	get matchOnDetail() {
+		return this._matchOnDetail;
+	}
+
+	set matchOnDetail(matchOnDetail: boolean) {
+		this._matchOnDetail = matchOnDetail;
+		this.update();
+	}
+
+	get activeItems() {
+		return this._activeItems;
+	}
+
+	set activeItems(activeItems: T[]) {
+		this._activeItems = activeItems;
+		this.activeItemsUpdated = true;
+		this.update();
+	}
+
+	onDidChangeActive = this.onDidChangeActiveEmitter.event;
+
+	get selectedItems() {
+		return this._selectedItems;
+	}
+
+	set selectedItems(selectedItems: T[]) {
+		this._selectedItems = selectedItems;
+		this.selectedItemsUpdated = true;
+		this.update();
+	}
+
+	get keyMods() {
+		return this.ui.keyMods;
+	}
+
+	onDidChangeSelection = this.onDidChangeSelectionEmitter.event;
+
+	onDidTriggerItemButton = this.onDidTriggerItemButtonEmitter.event;
+
+	show() {
+		if (!this.visible) {
+			this.visibleDisposables.push(
+				this.ui.inputBox.onDidChange(value => {
+					if (value === this.value) {
+						return;
+					}
+					this._value = value;
+					this.ui.list.filter(this.ui.inputBox.value);
+					if (!this.ui.isScreenReaderOptimized() && !this.canSelectMany) {
+						this.ui.list.focus('First');
+					}
+					this.onDidChangeValueEmitter.fire(value);
+				}),
+				this.ui.inputBox.onKeyDown(event => {
+					switch (event.keyCode) {
+						case KeyCode.DownArrow:
+							this.ui.list.focus('Next');
+							if (this.canSelectMany) {
+								this.ui.list.domFocus();
+							}
+							break;
+						case KeyCode.UpArrow:
+							if (this.ui.list.getFocusedElements().length) {
+								this.ui.list.focus('Previous');
+							} else {
+								this.ui.list.focus('Last');
+							}
+							if (this.canSelectMany) {
+								this.ui.list.domFocus();
+							}
+							break;
+						case KeyCode.PageDown:
+							if (this.ui.list.getFocusedElements().length) {
+								this.ui.list.focus('NextPage');
+							} else {
+								this.ui.list.focus('First');
+							}
+							if (this.canSelectMany) {
+								this.ui.list.domFocus();
+							}
+							break;
+						case KeyCode.PageUp:
+							if (this.ui.list.getFocusedElements().length) {
+								this.ui.list.focus('PreviousPage');
+							} else {
+								this.ui.list.focus('Last');
+							}
+							if (this.canSelectMany) {
+								this.ui.list.domFocus();
+							}
+							break;
+					}
+				}),
+				this.ui.onDidAccept(() => {
+					if (!this.canSelectMany && this.activeItems[0]) {
+						this._selectedItems = [this.activeItems[0]];
+						this.onDidChangeSelectionEmitter.fire(this.selectedItems);
+					}
+					this.onDidAcceptEmitter.fire();
+				}),
+				this.ui.list.onDidChangeFocus(focusedItems => {
+					if (this.activeItemsUpdated) {
+						return; // Expect another event.
+					}
+					if (this.activeItemsToConfirm !== this._activeItems && equals(focusedItems, this._activeItems, (a, b) => a === b)) {
+						return;
+					}
+					this._activeItems = focusedItems as T[];
+					this.onDidChangeActiveEmitter.fire(focusedItems as T[]);
+				}),
+				this.ui.list.onDidChangeSelection(selectedItems => {
+					if (this.canSelectMany) {
+						if (selectedItems.length) {
+							this.ui.list.setSelectedElements([]);
+						}
+						return;
+					}
+					if (this.selectedItemsToConfirm !== this._selectedItems && equals(selectedItems, this._selectedItems, (a, b) => a === b)) {
+						return;
+					}
+					this._selectedItems = selectedItems as T[];
+					this.onDidChangeSelectionEmitter.fire(selectedItems as T[]);
+					this.onDidAcceptEmitter.fire();
+				}),
+				this.ui.list.onChangedCheckedElements(checkedItems => {
+					if (!this.canSelectMany) {
+						return;
+					}
+					if (this.selectedItemsToConfirm !== this._selectedItems && equals(checkedItems, this._selectedItems, (a, b) => a === b)) {
+						return;
+					}
+					this._selectedItems = checkedItems as T[];
+					this.onDidChangeSelectionEmitter.fire(checkedItems as T[]);
+				}),
+				this.ui.list.onButtonTriggered(event => this.onDidTriggerItemButtonEmitter.fire(event as IQuickPickItemButtonEvent<T>)),
+				this.registerQuickNavigation()
+			);
+		}
+		super.show(); // TODO: Why have show() bubble up while update() trickles down? (Could move setComboboxAccessibility() here.)
+	}
+
+	private registerQuickNavigation() {
+		return dom.addDisposableListener(this.ui.container, dom.EventType.KEY_UP, (e: KeyboardEvent) => {
+			if (this.canSelectMany || !this.quickNavigate) {
 				return;
 			}
 
-			ui.list.setElements(elements);
-			ui.list.filter(ui.inputBox.value);
-			ui.list.focus('First');
-
-			this.disposables.push(
-				ui.list.onSelectionChange(elements => {
-					if (elements[0]) {
-						ui.close(true);
-					}
-				}),
-				ui.inputBox.onDidChange(value => {
-					ui.list.filter(value);
-					ui.list.focus('First');
-				}),
-				ui.inputBox.onKeyDown(event => {
-					switch (event.keyCode) {
-						case KeyCode.DownArrow:
-							ui.list.focus('Next');
-							break;
-						case KeyCode.UpArrow:
-							ui.list.focus('Previous');
-							break;
-					}
-				})
-			);
-		});
-	}
-
-	configureQuickNavigate(quickNavigate: IQuickNavigateConfiguration) {
-		if (this.quickNavigate) {
-			return;
-		}
-		this.quickNavigate = true;
-
-		this.disposables.push(dom.addDisposableListener(this.ui.container, dom.EventType.KEY_UP, (e: KeyboardEvent) => {
 			const keyboardEvent: StandardKeyboardEvent = new StandardKeyboardEvent(e as KeyboardEvent);
 			const keyCode = keyboardEvent.keyCode;
 
 			// Select element when keys are pressed that signal it
-			const quickNavKeys = quickNavigate.keybindings;
+			const quickNavKeys = this.quickNavigate.keybindings;
 			const wasTriggerKeyPressed = keyCode === KeyCode.Enter || quickNavKeys.some(k => {
 				const [firstPart, chordPart] = k.getParts();
 				if (chordPart) {
@@ -187,159 +565,195 @@ class PickOneController<T extends IPickOpenEntry> implements InputController<T>
 				return false;
 			});
 
-			if (wasTriggerKeyPressed) {
-				this.ui.close(true);
+			if (wasTriggerKeyPressed && this.activeItems[0]) {
+				this._selectedItems = [this.activeItems[0]];
+				this.onDidChangeSelectionEmitter.fire(this.selectedItems);
+				this.onDidAcceptEmitter.fire();
 			}
-		}));
+		});
 	}
 
-	private dispose() {
-		this.closed = true;
-		this.disposables = dispose(this.disposables);
+	protected update() {
+		super.update();
+		if (!this.visible) {
+			return;
+		}
+		if (this.ui.inputBox.value !== this.value) {
+			this.ui.inputBox.value = this.value;
+		}
+		if (this.ui.inputBox.placeholder !== (this.placeholder || '')) {
+			this.ui.inputBox.placeholder = (this.placeholder || '');
+		}
+		if (this.itemsUpdated) {
+			this.itemsUpdated = false;
+			this.ui.list.setElements(this.items);
+			this.ui.list.filter(this.ui.inputBox.value);
+			this.ui.checkAll.checked = this.ui.list.getAllVisibleChecked();
+			this.ui.visibleCount.setCount(this.ui.list.getVisibleCount());
+			this.ui.count.setCount(this.ui.list.getCheckedCount());
+			if (!this.ui.isScreenReaderOptimized() && !this.canSelectMany) {
+				this.ui.list.focus('First');
+			}
+		}
+		if (this.ui.container.classList.contains('show-checkboxes') !== this.canSelectMany) {
+			if (this.canSelectMany) {
+				this.ui.list.clearFocus();
+			} else if (!this.ui.isScreenReaderOptimized()) {
+				this.ui.list.focus('First');
+			}
+		}
+		if (this.activeItemsUpdated) {
+			this.activeItemsUpdated = false;
+			this.activeItemsToConfirm = this._activeItems;
+			this.ui.list.setFocusedElements(this.activeItems);
+			if (this.activeItemsToConfirm === this._activeItems) {
+				this.activeItemsToConfirm = null;
+			}
+		}
+		if (this.selectedItemsUpdated) {
+			this.selectedItemsUpdated = false;
+			this.selectedItemsToConfirm = this._selectedItems;
+			if (this.canSelectMany) {
+				this.ui.list.setCheckedElements(this.selectedItems);
+			} else {
+				this.ui.list.setSelectedElements(this.selectedItems);
+			}
+			if (this.selectedItemsToConfirm === this._selectedItems) {
+				this.selectedItemsToConfirm = null;
+			}
+		}
+		this.ui.list.matchOnDescription = this.matchOnDescription;
+		this.ui.list.matchOnDetail = this.matchOnDetail;
+		this.ui.setComboboxAccessibility(true);
+		this.ui.setVisibilities(this.canSelectMany ? { title: !!this.title || !!this.step, checkAll: true, inputBox: true, visibleCount: true, count: true, ok: true, list: true } : { title: !!this.title || !!this.step, inputBox: true, visibleCount: true, list: true });
 	}
 }
 
-class PickManyController<T extends IPickOpenEntry> implements InputController<T[]> {
-	public showUI = { checkAll: true, inputBox: true, count: true, ok: true, list: true };
-	public result: TPromise<T[]>;
-	public ready: TPromise<void>;
-	public resolve: (ok?: true | Thenable<never>) => void;
-	public progress: (value: T) => void;
-	private closed = false;
-	private disposables: IDisposable[] = [];
+class InputBox extends QuickInput implements IInputBox {
 
-	constructor(ui: QuickInputUI, parameters: PickManyParameters<T>) {
-		this.result = new TPromise<T[]>((resolve, reject, progress) => {
-			this.resolve = ok => resolve(ok === true ? <T[]>ui.list.getCheckedElements() : ok);
-			this.progress = progress;
-		});
-		this.result.then(() => this.dispose());
+	private static noPromptMessage = localize('inputModeEntry', "Press 'Enter' to confirm your input or 'Escape' to cancel");
 
-		ui.inputBox.value = '';
-		ui.inputBox.setPlaceholder(parameters.placeHolder || '');
-		ui.list.matchOnDescription = parameters.matchOnDescription;
-		ui.list.matchOnDetail = parameters.matchOnDetail;
-		ui.list.setElements([]);
-		ui.checkAll.checked = ui.list.getAllVisibleChecked();
-		ui.count.setCount(ui.list.getCheckedCount());
+	private _value = '';
+	private _valueSelection: Readonly<[number, number]>;
+	private valueSelectionUpdated = true;
+	private _placeholder: string;
+	private _password = false;
+	private _prompt: string;
+	private noValidationMessage = InputBox.noPromptMessage;
+	private _validationMessage: string;
+	private onDidValueChangeEmitter = new Emitter<string>();
+	private onDidAcceptEmitter = new Emitter<string>();
 
-		this.ready = parameters.picks.then(elements => {
-			if (this.closed) {
-				return;
-			}
+	constructor(ui: QuickInputUI) {
+		super(ui);
+		this.disposables.push(
+			this.onDidValueChangeEmitter,
+			this.onDidAcceptEmitter,
+		);
+	}
 
-			ui.list.setElements(elements, true);
-			ui.list.filter(ui.inputBox.value);
-			ui.checkAll.checked = ui.list.getAllVisibleChecked();
-			ui.count.setCount(ui.list.getCheckedCount());
+	get value() {
+		return this._value;
+	}
 
-			this.disposables.push(
-				ui.inputBox.onDidChange(value => {
-					ui.list.filter(value);
+	set value(value: string) {
+		this._value = value || '';
+		this.update();
+	}
+
+	set valueSelection(valueSelection: Readonly<[number, number]>) {
+		this._valueSelection = valueSelection;
+		this.valueSelectionUpdated = true;
+		this.update();
+	}
+
+	get placeholder() {
+		return this._placeholder;
+	}
+
+	set placeholder(placeholder: string) {
+		this._placeholder = placeholder;
+		this.update();
+	}
+
+	get password() {
+		return this._password;
+	}
+
+	set password(password: boolean) {
+		this._password = password;
+		this.update();
+	}
+
+	get prompt() {
+		return this._prompt;
+	}
+
+	set prompt(prompt: string) {
+		this._prompt = prompt;
+		this.noValidationMessage = prompt
+			? localize('inputModeEntryDescription', "{0} (Press 'Enter' to confirm or 'Escape' to cancel)", prompt)
+			: InputBox.noPromptMessage;
+		this.update();
+	}
+
+	get validationMessage() {
+		return this._validationMessage;
+	}
+
+	set validationMessage(validationMessage: string) {
+		this._validationMessage = validationMessage;
+		this.update();
+	}
+
+	onDidChangeValue = this.onDidValueChangeEmitter.event;
+
+	onDidAccept = this.onDidAcceptEmitter.event;
+
+	show() {
+		if (!this.visible) {
+			this.visibleDisposables.push(
+				this.ui.inputBox.onDidChange(value => {
+					if (value === this.value) {
+						return;
+					}
+					this._value = value;
+					this.onDidValueChangeEmitter.fire(value);
 				}),
-				ui.inputBox.onKeyDown(event => {
-					switch (event.keyCode) {
-						case KeyCode.DownArrow:
-							ui.list.focus('First');
-							ui.list.domFocus();
-							break;
-						case KeyCode.UpArrow:
-							ui.list.focus('Last');
-							ui.list.domFocus();
-							break;
-					}
-				})
+				this.ui.onDidAccept(() => this.onDidAcceptEmitter.fire()),
 			);
-		});
-	}
-
-	private dispose() {
-		this.closed = true;
-		this.disposables = dispose(this.disposables);
-	}
-}
-
-class TextInputController implements InputController<string> {
-	public showUI = { inputBox: true, message: true };
-	public result: TPromise<string>;
-	public ready = TPromise.as(null);
-	public resolveResult: (string) => void;
-	private validationValue: string;
-	private validation: TPromise<string>;
-	private defaultMessage: string;
-	private disposables: IDisposable[] = [];
-
-	constructor(private ui: QuickInputUI, private parameters: TextInputParameters) {
-		this.result = new TPromise<string>((resolve, reject, progress) => {
-			this.resolveResult = resolve;
-		});
-		this.result.then(() => this.dispose());
-
-		ui.inputBox.value = parameters.value || '';
-		const selection = parameters.valueSelection;
-		ui.inputBox.select(selection && { start: selection[0], end: selection[1] });
-		ui.inputBox.setPlaceholder(parameters.placeHolder || '');
-		this.defaultMessage = parameters.prompt
-			? localize('inputModeEntryDescription', "{0} (Press 'Enter' to confirm or 'Escape' to cancel)", parameters.prompt)
-			: localize('inputModeEntry', "Press 'Enter' to confirm your input or 'Escape' to cancel");
-		ui.message.textContent = this.defaultMessage;
-		ui.inputBox.setPassword(parameters.password);
-
-		if (parameters.validateInput) {
-			const onDidChange = debounceEvent(ui.inputBox.onDidChange, (last, cur) => cur, 100);
-			this.disposables.push(onDidChange(() => this.didChange()));
-			if (ui.inputBox.value) {
-				// Replicating old behavior: only fire if value is not empty.
-				this.didChange();
-			}
+			this.valueSelectionUpdated = true;
 		}
+		super.show();
 	}
 
-	didChange() {
-		this.updatedValidation()
-			.then(validationError => {
-				this.ui.message.textContent = validationError || this.defaultMessage;
-				this.ui.inputBox.showDecoration(validationError ? Severity.Error : Severity.Ignore);
-			})
-			.then(null, onUnexpectedError);
-	}
-
-	resolve(ok?: true | Thenable<never>) {
-		if (ok === true) {
-			return this.updatedValidation()
-				.then(validationError => {
-					if (validationError) {
-						throw canceled();
-					}
-					this.resolveResult(this.ui.inputBox.value);
-				});
-		} else {
-			this.resolveResult(ok);
+	protected update() {
+		super.update();
+		if (!this.visible) {
+			return;
 		}
-		return null;
-	}
-
-	private updatedValidation() {
-		if (this.parameters.validateInput) {
-			const value = this.ui.inputBox.value;
-			if (value !== this.validationValue) {
-				this.validationValue = value;
-				this.validation = this.parameters.validateInput(value)
-					.then(validationError => {
-						if (this.validationValue !== value) {
-							throw canceled();
-						}
-						return validationError;
-					});
-			}
-		} else if (!this.validation) {
-			this.validation = TPromise.as(null);
+		if (this.ui.inputBox.value !== this.value) {
+			this.ui.inputBox.value = this.value;
 		}
-		return this.validation;
-	}
-
-	private dispose() {
-		this.disposables = dispose(this.disposables);
+		if (this.valueSelectionUpdated) {
+			this.valueSelectionUpdated = false;
+			this.ui.inputBox.select(this._valueSelection && { start: this._valueSelection[0], end: this._valueSelection[1] });
+		}
+		if (this.ui.inputBox.placeholder !== (this.placeholder || '')) {
+			this.ui.inputBox.placeholder = (this.placeholder || '');
+		}
+		if (this.ui.inputBox.password !== this.password) {
+			this.ui.inputBox.password = this.password;
+		}
+		if (!this.validationMessage && this.ui.message.textContent !== this.noValidationMessage) {
+			this.ui.message.textContent = this.noValidationMessage;
+			this.ui.inputBox.showDecoration(Severity.Ignore);
+		}
+		if (this.validationMessage && this.ui.message.textContent !== this.validationMessage) {
+			this.ui.message.textContent = this.validationMessage;
+			this.ui.inputBox.showDecoration(Severity.Error);
+		}
+		this.ui.setVisibilities({ title: !!this.title || !!this.step, inputBox: true, message: true });
 	}
 }
 
@@ -350,19 +764,24 @@ export class QuickInputService extends Component implements IQuickInputService {
 	private static readonly ID = 'workbench.component.quickinput';
 	private static readonly MAX_WIDTH = 600; // Max total width of quick open widget
 
+	private idPrefix = 'quickInput_'; // Constant since there is still only one.
 	private layoutDimensions: dom.Dimension;
+	private titleBar: HTMLElement;
 	private filterContainer: HTMLElement;
+	private visibleCountContainer: HTMLElement;
 	private countContainer: HTMLElement;
 	private okContainer: HTMLElement;
+	private ok: Button;
 	private ui: QuickInputUI;
-	private ready = false;
-	private progressBar: ProgressBar;
-	private ignoreFocusLost = false;
+	private comboboxAccessibility = false;
+	private enabled = true;
 	private inQuickOpenWidgets: Record<string, boolean> = {};
 	private inQuickOpenContext: IContextKey<boolean>;
+	private contexts: { [id: string]: IContextKey<boolean>; } = Object.create(null);
+	private onDidAcceptEmitter = this._register(new Emitter<void>());
+	private onDidTriggerButtonEmitter = this._register(new Emitter<IQuickInputButton>());
 
-	private controller: InputController<any>;
-	private multiStepHandle: CancellationTokenSource;
+	private controller: QuickInput;
 
 	constructor(
 		@IEnvironmentService private environmentService: IEnvironmentService,
@@ -371,13 +790,14 @@ export class QuickInputService extends Component implements IQuickInputService {
 		@IPartService private partService: IPartService,
 		@IQuickOpenService private quickOpenService: IQuickOpenService,
 		@IEditorGroupsService private editorGroupService: IEditorGroupsService,
-		@IContextKeyService contextKeyService: IContextKeyService,
+		@IKeybindingService private keybindingService: IKeybindingService,
+		@IContextKeyService private contextKeyService: IContextKeyService,
 		@IThemeService themeService: IThemeService
 	) {
 		super(QuickInputService.ID, themeService);
 		this.inQuickOpenContext = new RawContextKey<boolean>('inQuickOpen', false).bindTo(contextKeyService);
-		this.toUnbind.push(this.quickOpenService.onShow(() => this.inQuickOpen('quickOpen', true)));
-		this.toUnbind.push(this.quickOpenService.onHide(() => this.inQuickOpen('quickOpen', false)));
+		this._register(this.quickOpenService.onShow(() => this.inQuickOpen('quickOpen', true)));
+		this._register(this.quickOpenService.onHide(() => this.inQuickOpen('quickOpen', false)));
 	}
 
 	private inQuickOpen(widget: 'quickInput' | 'quickOpen', open: boolean) {
@@ -397,25 +817,65 @@ export class QuickInputService extends Component implements IQuickInputService {
 		}
 	}
 
+	private setContextKey(id?: string) {
+		let key: IContextKey<boolean>;
+		if (id) {
+			key = this.contexts[id];
+			if (!key) {
+				key = new RawContextKey<boolean>(id, false)
+					.bindTo(this.contextKeyService);
+				this.contexts[id] = key;
+			}
+		}
+
+		if (key && key.get()) {
+			return; // already active context
+		}
+
+		this.resetContextKeys();
+
+		if (key) {
+			key.set(true);
+		}
+	}
+
+	private resetContextKeys() {
+		for (const key in this.contexts) {
+			if (this.contexts[key].get()) {
+				this.contexts[key].reset();
+			}
+		}
+	}
+
 	private create() {
 		if (this.ui) {
 			return;
 		}
 
-		const workbench = document.getElementById(this.partService.getWorkbenchElementId());
-		const container = dom.append(workbench, $('.quick-input-widget'));
+		const workbench = this.partService.getWorkbenchElement();
+		const container = dom.append(workbench, $('.quick-input-widget.show-file-icons'));
 		container.tabIndex = -1;
 		container.style.display = 'none';
 
+		this.titleBar = dom.append(container, $('.quick-input-titlebar'));
+
+		const leftActionBar = this._register(new ActionBar(this.titleBar));
+		leftActionBar.domNode.classList.add('quick-input-left-action-bar');
+
+		const title = dom.append(this.titleBar, $('.quick-input-title'));
+
+		const rightActionBar = this._register(new ActionBar(this.titleBar));
+		rightActionBar.domNode.classList.add('quick-input-right-action-bar');
+
 		const headerContainer = dom.append(container, $('.quick-input-header'));
 
 		const checkAll = <HTMLInputElement>dom.append(headerContainer, $('input.quick-input-check-all'));
 		checkAll.type = 'checkbox';
-		this.toUnbind.push(dom.addStandardDisposableListener(checkAll, dom.EventType.CHANGE, e => {
+		this._register(dom.addStandardDisposableListener(checkAll, dom.EventType.CHANGE, e => {
 			const checked = checkAll.checked;
 			list.setAllVisibleChecked(checked);
 		}));
-		this.toUnbind.push(dom.addDisposableListener(checkAll, dom.EventType.CLICK, e => {
+		this._register(dom.addDisposableListener(checkAll, dom.EventType.CLICK, e => {
 			if (e.x || e.y) { // Avoid 'click' triggered by 'space'...
 				inputBox.setFocus();
 			}
@@ -423,252 +883,422 @@ export class QuickInputService extends Component implements IQuickInputService {
 
 		this.filterContainer = dom.append(headerContainer, $('.quick-input-filter'));
 
-		const inputBox = new QuickInputBox(this.filterContainer);
-		this.toUnbind.push(inputBox);
+		const inputBox = this._register(new QuickInputBox(this.filterContainer));
+
+		this.visibleCountContainer = dom.append(this.filterContainer, $('.quick-input-visible-count'));
+		this.visibleCountContainer.setAttribute('aria-live', 'polite');
+		this.visibleCountContainer.setAttribute('aria-atomic', 'true');
+		const visibleCount = new CountBadge(this.visibleCountContainer, { countFormat: localize({ key: 'quickInput.visibleCount', comment: ['This tells the user how many items are shown in a list of items to select from. The items can be anything. Currently not visible, but read by screen readers.'] }, "{0} Results") });
 
 		this.countContainer = dom.append(this.filterContainer, $('.quick-input-count'));
+		this.countContainer.setAttribute('aria-live', 'polite');
 		const count = new CountBadge(this.countContainer, { countFormat: localize({ key: 'quickInput.countSelected', comment: ['This tells the user how many items are selected in a list of items to select from. The items can be anything.'] }, "{0} Selected") });
-		this.toUnbind.push(attachBadgeStyler(count, this.themeService));
+		this._register(attachBadgeStyler(count, this.themeService));
 
 		this.okContainer = dom.append(headerContainer, $('.quick-input-action'));
-		const ok = new Button(this.okContainer);
-		attachButtonStyler(ok, this.themeService);
-		ok.label = localize('ok', "OK");
-		this.toUnbind.push(ok.onDidClick(e => {
-			if (this.ready) {
-				this.close(true);
-			}
+		this.ok = new Button(this.okContainer);
+		attachButtonStyler(this.ok, this.themeService);
+		this.ok.label = localize('ok', "OK");
+		this._register(this.ok.onDidClick(e => {
+			this.onDidAcceptEmitter.fire();
 		}));
 
 		const message = dom.append(container, $('.quick-input-message'));
 
-		this.progressBar = new ProgressBar(container);
-		dom.addClass(this.progressBar.getContainer(), 'quick-input-progress');
-		this.toUnbind.push(attachProgressBarStyler(this.progressBar, this.themeService));
+		const progressBar = new ProgressBar(container);
+		dom.addClass(progressBar.getContainer(), 'quick-input-progress');
+		this._register(attachProgressBarStyler(progressBar, this.themeService));
 
-		const list = this.instantiationService.createInstance(QuickInputList, container);
-		this.toUnbind.push(list);
-		this.toUnbind.push(list.onAllVisibleCheckedChanged(checked => {
+		const list = this._register(this.instantiationService.createInstance(QuickInputList, container, this.idPrefix + 'list'));
+		this._register(list.onChangedAllVisibleChecked(checked => {
 			checkAll.checked = checked;
 		}));
-		this.toUnbind.push(list.onCheckedCountChanged(c => {
+		this._register(list.onChangedVisibleCount(c => {
+			visibleCount.setCount(c);
+		}));
+		this._register(list.onChangedCheckedCount(c => {
 			count.setCount(c);
 		}));
-		this.toUnbind.push(list.onLeave(() => {
+		this._register(list.onLeave(() => {
 			// Defer to avoid the input field reacting to the triggering key.
 			setTimeout(() => {
 				inputBox.setFocus();
-				list.clearFocus();
+				if (this.controller instanceof QuickPick && this.controller.canSelectMany) {
+					list.clearFocus();
+				}
 			}, 0);
 		}));
-		this.toUnbind.push(
-			chain(list.onFocusChange)
-				.map(e => e[0])
-				.filter(e => !!e)
-				.latch()
-				.on(e => {
-					// TODO
-					if (this.controller instanceof PickOneController || this.controller instanceof PickManyController) {
-						this.controller.progress(e);
-					}
-				})
-		);
-
-		this.toUnbind.push(dom.addDisposableListener(container, 'focusout', (e: FocusEvent) => {
-			if (e.relatedTarget === container) {
-				(<HTMLElement>e.target).focus();
-				return;
-			}
-			for (let element = <Element>e.relatedTarget; element; element = element.parentElement) {
-				if (element === container) {
-					return;
-				}
-			}
-			if (!this.ignoreFocusLost && !this.environmentService.args['sticky-quickopen'] && this.configurationService.getValue(CLOSE_ON_FOCUS_LOST_CONFIG)) {
-				this.close(undefined, true);
+		this._register(list.onDidChangeFocus(() => {
+			if (this.comboboxAccessibility) {
+				this.ui.inputBox.setAttribute('aria-activedescendant', this.ui.list.getActiveDescendant());
 			}
 		}));
-		this.toUnbind.push(dom.addDisposableListener(container, dom.EventType.KEY_DOWN, (e: KeyboardEvent) => {
+
+		const focusTracker = dom.trackFocus(container);
+		this._register(focusTracker);
+		this._register(focusTracker.onDidBlur(() => {
+			if (!this.ui.ignoreFocusOut && !this.environmentService.args['sticky-quickopen'] && this.configurationService.getValue(CLOSE_ON_FOCUS_LOST_CONFIG)) {
+				this.hide(true);
+			}
+		}));
+		this._register(dom.addDisposableListener(container, dom.EventType.KEY_DOWN, (e: KeyboardEvent) => {
 			const event = new StandardKeyboardEvent(e);
 			switch (event.keyCode) {
 				case KeyCode.Enter:
-					if (this.ready) {
-						dom.EventHelper.stop(e, true);
-						this.close(true);
-					}
+					dom.EventHelper.stop(e, true);
+					this.onDidAcceptEmitter.fire();
 					break;
 				case KeyCode.Escape:
 					dom.EventHelper.stop(e, true);
-					this.close();
+					this.hide();
 					break;
 				case KeyCode.Tab:
 					if (!event.altKey && !event.ctrlKey && !event.metaKey) {
-						const inputs = [].slice.call(container.querySelectorAll('input'))
-							.filter(input => input.style.display !== 'none');
-						if (event.shiftKey && event.target === inputs[0]) {
+						const selectors = ['.action-label.icon'];
+						if (container.classList.contains('show-checkboxes')) {
+							selectors.push('input');
+						} else {
+							selectors.push('input[type=text]');
+						}
+						if (this.ui.list.isDisplayed()) {
+							selectors.push('.monaco-list');
+						}
+						const stops = container.querySelectorAll<HTMLElement>(selectors.join(', '));
+						if (event.shiftKey && event.target === stops[0]) {
 							dom.EventHelper.stop(e, true);
-							inputs[inputs.length - 1].focus();
-						} else if (!event.shiftKey && event.target === inputs[inputs.length - 1]) {
+							stops[stops.length - 1].focus();
+						} else if (!event.shiftKey && event.target === stops[stops.length - 1]) {
 							dom.EventHelper.stop(e, true);
-							inputs[0].focus();
+							stops[0].focus();
 						}
 					}
 					break;
 			}
 		}));
+		this._register(dom.addDisposableListener(container, dom.EventType.KEY_DOWN, (e: KeyboardEvent) => {
+			const event = new StandardKeyboardEvent(e);
+			switch (event.keyCode) {
+				case KeyCode.Ctrl:
+				case KeyCode.Meta:
+					this.ui.keyMods.ctrlCmd = true;
+					break;
+				case KeyCode.Alt:
+					this.ui.keyMods.alt = true;
+					break;
+			}
+		}));
+		this._register(dom.addDisposableListener(container, dom.EventType.KEY_UP, (e: KeyboardEvent) => {
+			const event = new StandardKeyboardEvent(e);
+			switch (event.keyCode) {
+				case KeyCode.Ctrl:
+				case KeyCode.Meta:
+					this.ui.keyMods.ctrlCmd = false;
+					break;
+				case KeyCode.Alt:
+					this.ui.keyMods.alt = false;
+					break;
+			}
+		}));
 
-		this.toUnbind.push(this.quickOpenService.onShow(() => this.close()));
+		this._register(this.quickOpenService.onShow(() => this.hide(true)));
 
-		this.ui = { container, checkAll, inputBox, count, message, list, close: ok => this.close(ok) };
+		this.ui = {
+			container,
+			leftActionBar,
+			title,
+			rightActionBar,
+			checkAll,
+			inputBox,
+			visibleCount,
+			count,
+			message,
+			progressBar,
+			list,
+			onDidAccept: this.onDidAcceptEmitter.event,
+			onDidTriggerButton: this.onDidTriggerButtonEmitter.event,
+			ignoreFocusOut: false,
+			keyMods: { ctrlCmd: false, alt: false },
+			isScreenReaderOptimized: () => this.isScreenReaderOptimized(),
+			show: controller => this.show(controller),
+			hide: () => this.hide(),
+			setVisibilities: visibilities => this.setVisibilities(visibilities),
+			setComboboxAccessibility: enabled => this.setComboboxAccessibility(enabled),
+			setEnabled: enabled => this.setEnabled(enabled),
+			setContextKey: contextKey => this.setContextKey(contextKey),
+		};
 		this.updateStyles();
 	}
 
-	private close(ok?: true | Thenable<never>, focusLost?: boolean) {
-		if (!this.isDisplayed()) {
-			return TPromise.as(undefined);
-		}
-		if (this.controller) {
-			const resolved = this.controller.resolve(ok);
-			if (resolved) {
-				const result = resolved
-					.then(() => {
-						this.inQuickOpen('quickInput', false);
-						this.ui.container.style.display = 'none';
-						if (!focusLost) {
-							this.editorGroupService.activeGroup.focus();
+	pick<T extends IQuickPickItem, O extends IPickOptions<T>>(picks: TPromise<QuickPickInput<T>[]> | QuickPickInput<T>[], options: O = <O>{}, token: CancellationToken = CancellationToken.None): TPromise<O extends { canPickMany: true } ? T[] : T> {
+		return new TPromise<O extends { canPickMany: true } ? T[] : T>((doResolve, reject) => {
+			let resolve = (result: any) => {
+				resolve = doResolve;
+				if (options.onKeyMods) {
+					options.onKeyMods(input.keyMods);
+				}
+				doResolve(result);
+			};
+			if (token.isCancellationRequested) {
+				resolve(undefined);
+				return;
+			}
+			const input = this.createQuickPick<T>();
+			let activeItem: T;
+			const disposables = [
+				input,
+				input.onDidAccept(() => {
+					if (input.canSelectMany) {
+						resolve(<any>input.selectedItems.slice());
+						input.hide();
+					} else {
+						const result = input.activeItems[0];
+						if (result) {
+							resolve(<any>result);
+							input.hide();
+						}
+					}
+				}),
+				input.onDidChangeActive(items => {
+					const focused = items[0];
+					if (focused && options.onDidFocus) {
+						options.onDidFocus(focused);
+					}
+				}),
+				input.onDidChangeSelection(items => {
+					if (!input.canSelectMany) {
+						const result = items[0];
+						if (result) {
+							resolve(<any>result);
+							input.hide();
+						}
+					}
+				}),
+				input.onDidTriggerItemButton(event => options.onDidTriggerItemButton && options.onDidTriggerItemButton({
+					...event,
+					removeItem: () => {
+						const index = input.items.indexOf(event.item);
+						if (index !== -1) {
+							const items = input.items.slice();
+							items.splice(index, 1);
+							input.items = items;
+						}
+					}
+				})),
+				input.onDidChangeValue(value => {
+					if (activeItem && !value && (input.activeItems.length !== 1 || input.activeItems[0] !== activeItem)) {
+						input.activeItems = [activeItem];
+					}
+				}),
+				token.onCancellationRequested(() => {
+					input.hide();
+				}),
+				input.onDidHide(() => {
+					dispose(disposables);
+					resolve(undefined);
+				}),
+			];
+			input.canSelectMany = options.canPickMany;
+			input.placeholder = options.placeHolder;
+			input.ignoreFocusOut = options.ignoreFocusLost;
+			input.matchOnDescription = options.matchOnDescription;
+			input.matchOnDetail = options.matchOnDetail;
+			input.quickNavigate = options.quickNavigate;
+			input.contextKey = options.contextKey;
+			input.busy = true;
+			TPromise.join([picks, options.activeItem])
+				.then(([items, _activeItem]) => {
+					activeItem = _activeItem;
+					input.busy = false;
+					input.items = items;
+					if (input.canSelectMany) {
+						input.selectedItems = items.filter(item => item.type !== 'separator' && item.picked) as T[];
+					}
+					if (activeItem) {
+						input.activeItems = [activeItem];
+					}
+				});
+			input.show();
+			TPromise.wrap(picks).then(null, err => {
+				reject(err);
+				input.hide();
+			});
+		});
+	}
+
+	input(options: IInputOptions = {}, token: CancellationToken = CancellationToken.None): TPromise<string> {
+		return new TPromise<string>((resolve, reject) => {
+			if (token.isCancellationRequested) {
+				resolve(undefined);
+				return;
+			}
+			const input = this.createInputBox();
+			const validateInput = options.validateInput || (() => TPromise.as(undefined));
+			const onDidValueChange = debounceEvent(input.onDidChangeValue, (last, cur) => cur, 100);
+			let validationValue = options.value || '';
+			let validation = TPromise.wrap(validateInput(validationValue));
+			const disposables = [
+				input,
+				onDidValueChange(value => {
+					if (value !== validationValue) {
+						validation = TPromise.wrap(validateInput(value));
+						validationValue = value;
+					}
+					validation.then(result => {
+						if (value === validationValue) {
+							input.validationMessage = result;
 						}
 					});
-				result.then(null, onUnexpectedError);
-				return result;
-			}
-		}
-		this.inQuickOpen('quickInput', false);
-		this.ui.container.style.display = 'none';
-		if (!focusLost) {
-			this.editorGroupService.activeGroup.focus();
-		}
-		return TPromise.as(undefined);
+				}),
+				input.onDidAccept(() => {
+					const value = input.value;
+					if (value !== validationValue) {
+						validation = TPromise.wrap(validateInput(value));
+						validationValue = value;
+					}
+					validation.then(result => {
+						if (!result) {
+							resolve(value);
+							input.hide();
+						} else if (value === validationValue) {
+							input.validationMessage = result;
+						}
+					});
+				}),
+				token.onCancellationRequested(() => {
+					input.hide();
+				}),
+				input.onDidHide(() => {
+					dispose(disposables);
+					resolve(undefined);
+				}),
+			];
+			input.value = options.value;
+			input.valueSelection = options.valueSelection;
+			input.prompt = options.prompt;
+			input.placeholder = options.placeHolder;
+			input.password = options.password;
+			input.ignoreFocusOut = options.ignoreFocusLost;
+			input.show();
+		});
 	}
 
-	pick<T extends IPickOpenEntry, O extends IPickOptions>(picks: TPromise<T[]>, options: O = <O>{}, token?: CancellationToken): TPromise<O extends { canPickMany: true } ? T[] : T> {
-		return this._pick(undefined, picks, options, token);
+	backButton = backButton;
+
+	createQuickPick<T extends IQuickPickItem>(): IQuickPick<T> {
+		this.create();
+		return new QuickPick<T>(this.ui);
 	}
 
-	private _pick<T extends IPickOpenEntry, O extends IPickOptions>(handle: CancellationTokenSource | undefined, picks: TPromise<T[]>, options: O = <O>{}, token?: CancellationToken): TPromise<O extends { canPickMany: true } ? T[] : T> {
-		return <any>this._show(handle, <any>{
-			type: options.canPickMany ? 'pickMany' : 'pickOne',
-			picks,
-			placeHolder: options.placeHolder,
-			matchOnDescription: options.matchOnDescription,
-			matchOnDetail: options.matchOnDetail,
-			ignoreFocusLost: options.ignoreFocusLost
-		}, token);
+	createInputBox(): IInputBox {
+		this.create();
+		return new InputBox(this.ui);
 	}
 
-	input(options: IInputOptions = {}, token?: CancellationToken): TPromise<string> {
-		return this._input(undefined, options, token);
-	}
-
-	private _input(handle: CancellationTokenSource | undefined, options: IInputOptions = {}, token?: CancellationToken): TPromise<string> {
-		return this._show(handle, {
-			type: 'textInput',
-			value: options.value,
-			valueSelection: options.valueSelection,
-			prompt: options.prompt,
-			placeHolder: options.placeHolder,
-			password: options.password,
-			ignoreFocusLost: options.ignoreFocusLost,
-			validateInput: options.validateInput,
-		}, token);
-	}
-
-	private _show<T extends IPickOpenEntry, P extends PickOneParameters<T> | PickManyParameters<T>>(multiStepHandle: CancellationTokenSource | undefined, parameters: P, token?: CancellationToken): TPromise<P extends PickManyParameters<T> ? T[] : T>;
-	private _show(multiStepHandle: CancellationTokenSource | undefined, parameters: TextInputParameters, token?: CancellationToken): TPromise<string>;
-	private _show<R>(multiStepHandle: CancellationTokenSource | undefined, parameters: InputParameters, token: CancellationToken = CancellationToken.None): TPromise<R> {
-		if (multiStepHandle && multiStepHandle !== this.multiStepHandle) {
-			multiStepHandle.cancel();
-			return TPromise.as(undefined);
-		}
-		if (!multiStepHandle && this.multiStepHandle) {
-			this.multiStepHandle.cancel();
-		}
-
+	private show(controller: QuickInput) {
 		this.create();
 		this.quickOpenService.close();
-		if (this.controller) {
-			this.controller.resolve();
+		const oldController = this.controller;
+		this.controller = controller;
+		if (oldController) {
+			oldController.didHide();
 		}
 
-		this.ui.container.setAttribute('data-type', parameters.type);
-
-		this.ignoreFocusLost = parameters.ignoreFocusLost;
-
-		this.progressBar.stop();
-		this.ready = false;
-
-		this.controller = this.createController(parameters);
-		this.ui.checkAll.style.display = this.controller.showUI.checkAll ? '' : 'none';
-		this.filterContainer.style.display = this.controller.showUI.inputBox ? '' : 'none';
+		this.setEnabled(true);
+		this.ui.leftActionBar.clear();
+		this.ui.title.textContent = '';
+		this.ui.rightActionBar.clear();
+		this.ui.checkAll.checked = false;
+		// this.ui.inputBox.value = ''; Avoid triggering an event.
+		this.ui.inputBox.placeholder = '';
+		this.ui.inputBox.password = false;
 		this.ui.inputBox.showDecoration(Severity.Ignore);
-		this.countContainer.style.display = this.controller.showUI.count ? '' : 'none';
-		this.okContainer.style.display = this.controller.showUI.ok ? '' : 'none';
-		this.ui.message.style.display = this.controller.showUI.message ? '' : 'none';
-		this.ui.list.display(this.controller.showUI.list);
+		this.ui.visibleCount.setCount(0);
+		this.ui.count.setCount(0);
+		this.ui.message.textContent = '';
+		this.ui.progressBar.stop();
+		this.ui.list.setElements([]);
+		this.ui.list.matchOnDescription = false;
+		this.ui.list.matchOnDetail = false;
+		this.ui.ignoreFocusOut = false;
+		this.ui.keyMods.ctrlCmd = false;
+		this.ui.keyMods.alt = false;
+		this.setComboboxAccessibility(false);
+
+		const keybinding = this.keybindingService.lookupKeybinding(BackAction.ID);
+		backButton.tooltip = keybinding ? localize('quickInput.backWithKeybinding', "Back ({0})", keybinding.getLabel()) : localize('quickInput.back', "Back");
+
+		this.inQuickOpen('quickInput', true);
+		this.resetContextKeys();
 
-		if (this.ui.container.style.display === 'none') {
-			this.inQuickOpen('quickInput', true);
-		}
 		this.ui.container.style.display = '';
 		this.updateLayout();
 		this.ui.inputBox.setFocus();
-
-		const d = token.onCancellationRequested(() => this.close());
-		this.controller.result.then(() => d.dispose(), () => d.dispose());
-
-		const wasController = this.controller;
-
-		const delay = TPromise.timeout(800);
-		delay.then(() => {
-			if (this.controller === wasController) {
-				this.progressBar.infinite();
-			}
-		}, () => { /* ignore */ });
-
-		this.controller.ready.then(() => {
-			delay.cancel();
-			if (this.controller !== wasController) {
-				return;
-			}
-
-			this.progressBar.stop();
-			this.ready = true;
-
-			this.updateLayout();
-		}).then(null, reason => this.close(TPromise.wrapError(reason)));
-
-		return this.controller.result;
 	}
 
-	private createController(parameters: InputParameters) {
-		switch (parameters.type) {
-			case 'pickOne': return new PickOneController(this.ui, parameters);
-			case 'pickMany': return new PickManyController(this.ui, parameters);
-			case 'textInput': return new TextInputController(this.ui, parameters);
-			default: ((p: never) => {
-				throw new Error(`Unknown input type: ${(<any>p).type}`);
-			})(parameters);
+	private setVisibilities(visibilities: Visibilities) {
+		this.ui.title.style.display = visibilities.title ? '' : 'none';
+		this.ui.checkAll.style.display = visibilities.checkAll ? '' : 'none';
+		this.filterContainer.style.display = visibilities.inputBox ? '' : 'none';
+		this.visibleCountContainer.style.display = visibilities.visibleCount ? '' : 'none';
+		this.countContainer.style.display = visibilities.count ? '' : 'none';
+		this.okContainer.style.display = visibilities.ok ? '' : 'none';
+		this.ui.message.style.display = visibilities.message ? '' : 'none';
+		this.ui.list.display(visibilities.list);
+		this.ui.container.classList[visibilities.checkAll ? 'add' : 'remove']('show-checkboxes');
+		this.updateLayout(); // TODO
+	}
+
+	private setComboboxAccessibility(enabled: boolean) {
+		if (enabled !== this.comboboxAccessibility) {
+			this.comboboxAccessibility = enabled;
+			if (this.comboboxAccessibility) {
+				this.ui.inputBox.setAttribute('role', 'combobox');
+				this.ui.inputBox.setAttribute('aria-haspopup', 'true');
+				this.ui.inputBox.setAttribute('aria-autocomplete', 'list');
+				this.ui.inputBox.setAttribute('aria-activedescendant', this.ui.list.getActiveDescendant());
+			} else {
+				this.ui.inputBox.removeAttribute('role');
+				this.ui.inputBox.removeAttribute('aria-haspopup');
+				this.ui.inputBox.removeAttribute('aria-autocomplete');
+				this.ui.inputBox.removeAttribute('aria-activedescendant');
+			}
 		}
 	}
 
-	multiStepInput<T>(handler: (input: IQuickInput, token: CancellationToken) => Thenable<T>, token = CancellationToken.None): Thenable<T> {
-		if (this.multiStepHandle) {
-			this.multiStepHandle.cancel();
+	private isScreenReaderOptimized() {
+		const detected = browser.getAccessibilitySupport() === AccessibilitySupport.Enabled;
+		const config = this.configurationService.getValue<IEditorOptions>('editor').accessibilitySupport;
+		return config === 'on' || (config === 'auto' && detected);
+	}
+
+	private setEnabled(enabled: boolean) {
+		if (enabled !== this.enabled) {
+			this.enabled = enabled;
+			for (const item of this.ui.leftActionBar.items) {
+				(item as ActionItem).getAction().enabled = enabled;
+			}
+			for (const item of this.ui.rightActionBar.items) {
+				(item as ActionItem).getAction().enabled = enabled;
+			}
+			this.ui.checkAll.disabled = !enabled;
+			// this.ui.inputBox.enabled = enabled; Avoid loosing focus.
+			this.ok.enabled = enabled;
+			this.ui.list.enabled = enabled;
+		}
+	}
+
+	private hide(focusLost?: boolean) {
+		const controller = this.controller;
+		if (controller) {
+			this.controller = null;
+			this.inQuickOpen('quickInput', false);
+			this.resetContextKeys();
+			this.ui.container.style.display = 'none';
+			if (!focusLost) {
+				this.editorGroupService.activeGroup.focus();
+			}
+			controller.didHide();
 		}
-		this.multiStepHandle = new CancellationTokenSource();
-		return TPromise.wrap(handler({
-			pick: this._pick.bind(this, this.multiStepHandle),
-			input: this._input.bind(this, this.multiStepHandle)
-		}, this.multiStepHandle.token));
 	}
 
 	focus() {
@@ -678,7 +1308,7 @@ export class QuickInputService extends Component implements IQuickInputService {
 	}
 
 	toggle() {
-		if (this.isDisplayed() && this.controller instanceof PickManyController) {
+		if (this.isDisplayed() && this.controller instanceof QuickPick && this.controller.canSelectMany) {
 			this.ui.list.toggleCheckbox();
 		}
 	}
@@ -686,18 +1316,25 @@ export class QuickInputService extends Component implements IQuickInputService {
 	navigate(next: boolean, quickNavigate?: IQuickNavigateConfiguration) {
 		if (this.isDisplayed() && this.ui.list.isDisplayed()) {
 			this.ui.list.focus(next ? 'Next' : 'Previous');
-			if (quickNavigate && this.controller instanceof PickOneController) {
-				this.controller.configureQuickNavigate(quickNavigate);
+			if (quickNavigate && this.controller instanceof QuickPick) {
+				this.controller.quickNavigate = quickNavigate;
 			}
 		}
 	}
 
 	accept() {
-		return this.close(true);
+		this.onDidAcceptEmitter.fire();
+		return TPromise.as(undefined);
+	}
+
+	back() {
+		this.onDidTriggerButtonEmitter.fire(this.backButton);
+		return TPromise.as(undefined);
 	}
 
 	cancel() {
-		return this.close();
+		this.hide();
+		return TPromise.as(undefined);
 	}
 
 	layout(dimension: dom.Dimension): void {
@@ -723,9 +1360,10 @@ export class QuickInputService extends Component implements IQuickInputService {
 	protected updateStyles() {
 		const theme = this.themeService.getTheme();
 		if (this.ui) {
+			// TODO
+			const titleColor = { dark: 'rgba(255, 255, 255, 0.105)', light: 'rgba(0,0,0,.06)', hc: 'black' }[theme.type];
+			this.titleBar.style.backgroundColor = titleColor ? titleColor.toString() : undefined;
 			this.ui.inputBox.style(theme);
-		}
-		if (this.ui) {
 			const sideBarBackground = theme.getColor(SIDE_BAR_BACKGROUND);
 			this.ui.container.style.backgroundColor = sideBarBackground ? sideBarBackground.toString() : undefined;
 			const sideBarForeground = theme.getColor(SIDE_BAR_FOREGROUND);
@@ -744,7 +1382,7 @@ export class QuickInputService extends Component implements IQuickInputService {
 
 export const QuickPickManyToggle: ICommandAndKeybindingRule = {
 	id: 'workbench.action.quickPickManyToggle',
-	weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
+	weight: KeybindingWeight.WorkbenchContrib,
 	when: inQuickOpenContext,
 	primary: undefined,
 	handler: accessor => {
@@ -752,3 +1390,18 @@ export const QuickPickManyToggle: ICommandAndKeybindingRule = {
 		quickInputService.toggle();
 	}
 };
+
+export class BackAction extends Action {
+
+	public static readonly ID = 'workbench.action.quickInputBack';
+	public static readonly LABEL = localize('back', "Back");
+
+	constructor(id: string, label: string, @IQuickInputService private quickInputService: IQuickInputService) {
+		super(id, label);
+	}
+
+	public run(): TPromise<any> {
+		this.quickInputService.back();
+		return TPromise.as(null);
+	}
+}
diff --git a/src/vs/workbench/browser/parts/quickinput/quickInputBox.ts b/src/vs/workbench/browser/parts/quickinput/quickInputBox.ts
index b99245aece5..5ec8b988067 100644
--- a/src/vs/workbench/browser/parts/quickinput/quickInputBox.ts
+++ b/src/vs/workbench/browser/parts/quickinput/quickInputBox.ts
@@ -9,7 +9,7 @@ import 'vs/css!./quickInput';
 import * as dom from 'vs/base/browser/dom';
 import { InputBox, IRange, MessageType } from 'vs/base/browser/ui/inputbox/inputBox';
 import { localize } from 'vs/nls';
-import { inputBackground, inputForeground, inputBorder, inputValidationInfoBackground, inputValidationInfoBorder, inputValidationWarningBackground, inputValidationWarningBorder, inputValidationErrorBackground, inputValidationErrorBorder } from 'vs/platform/theme/common/colorRegistry';
+import { inputBackground, inputForeground, inputBorder, inputValidationInfoBackground, inputValidationInfoForeground, inputValidationInfoBorder, inputValidationWarningBackground, inputValidationWarningForeground, inputValidationWarningBorder, inputValidationErrorBackground, inputValidationErrorForeground, inputValidationErrorBorder } from 'vs/platform/theme/common/colorRegistry';
 import { ITheme } from 'vs/platform/theme/common/themeService';
 import { dispose, IDisposable } from 'vs/base/common/lifecycle';
 import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
@@ -33,12 +33,6 @@ export class QuickInputBox {
 			ariaLabel: DEFAULT_INPUT_ARIA_LABEL
 		});
 		this.disposables.push(this.inputBox);
-
-		// ARIA
-		const inputElement = this.inputBox.inputElement;
-		inputElement.setAttribute('role', 'combobox');
-		inputElement.setAttribute('aria-haspopup', 'false');
-		inputElement.setAttribute('aria-autocomplete', 'list');
 	}
 
 	onKeyDown = (handler: (event: StandardKeyboardEvent) => void): IDisposable => {
@@ -67,8 +61,32 @@ export class QuickInputBox {
 		this.inputBox.setPlaceHolder(placeholder);
 	}
 
-	setPassword(isPassword: boolean): void {
-		this.inputBox.inputElement.type = isPassword ? 'password' : 'text';
+	get placeholder() {
+		return this.inputBox.inputElement.getAttribute('placeholder');
+	}
+
+	set placeholder(placeholder: string) {
+		this.inputBox.setPlaceHolder(placeholder);
+	}
+
+	get password() {
+		return this.inputBox.inputElement.type === 'password';
+	}
+
+	set password(password: boolean) {
+		this.inputBox.inputElement.type = password ? 'password' : 'text';
+	}
+
+	set enabled(enabled: boolean) {
+		this.inputBox.setEnabled(enabled);
+	}
+
+	setAttribute(name: string, value: string) {
+		this.inputBox.inputElement.setAttribute(name, value);
+	}
+
+	removeAttribute(name: string) {
+		this.inputBox.inputElement.removeAttribute(name);
 	}
 
 	showDecoration(decoration: Severity): void {
@@ -93,10 +111,13 @@ export class QuickInputBox {
 			inputBackground: theme.getColor(inputBackground),
 			inputBorder: theme.getColor(inputBorder),
 			inputValidationInfoBackground: theme.getColor(inputValidationInfoBackground),
+			inputValidationInfoForeground: theme.getColor(inputValidationInfoForeground),
 			inputValidationInfoBorder: theme.getColor(inputValidationInfoBorder),
 			inputValidationWarningBackground: theme.getColor(inputValidationWarningBackground),
+			inputValidationWarningForeground: theme.getColor(inputValidationWarningForeground),
 			inputValidationWarningBorder: theme.getColor(inputValidationWarningBorder),
 			inputValidationErrorBackground: theme.getColor(inputValidationErrorBackground),
+			inputValidationErrorForeground: theme.getColor(inputValidationErrorForeground),
 			inputValidationErrorBorder: theme.getColor(inputValidationErrorBorder),
 		});
 	}
diff --git a/src/vs/workbench/browser/parts/quickinput/quickInputList.ts b/src/vs/workbench/browser/parts/quickinput/quickInputList.ts
index 1af9308ea94..3bb2a9c4d12 100644
--- a/src/vs/workbench/browser/parts/quickinput/quickInputList.ts
+++ b/src/vs/workbench/browser/parts/quickinput/quickInputList.ts
@@ -6,12 +6,12 @@
 'use strict';
 
 import 'vs/css!./quickInput';
-import { IDelegate, IRenderer } from 'vs/base/browser/ui/list/list';
+import { IVirtualDelegate, IRenderer } from 'vs/base/browser/ui/list/list';
 import * as dom from 'vs/base/browser/dom';
 import { dispose, IDisposable } from 'vs/base/common/lifecycle';
 import { WorkbenchList } from 'vs/platform/list/browser/listService';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IPickOpenEntry } from 'vs/platform/quickinput/common/quickInput';
+import { IQuickPickItem, IQuickPickItemButtonEvent, IQuickPickSeparator } from 'vs/platform/quickinput/common/quickInput';
 import { IMatch } from 'vs/base/common/filters';
 import { matchesFuzzyOcticonAware, parseOcticons } from 'vs/base/common/octicon';
 import { compareAnything } from 'vs/base/common/comparers';
@@ -24,20 +24,31 @@ import { HighlightedLabel } from 'vs/base/browser/ui/highlightedlabel/highlighte
 import { memoize } from 'vs/base/common/decorators';
 import { range } from 'vs/base/common/arrays';
 import * as platform from 'vs/base/common/platform';
-import { listFocusBackground } from 'vs/platform/theme/common/colorRegistry';
+import { listFocusBackground, pickerGroupBorder, pickerGroupForeground } from 'vs/platform/theme/common/colorRegistry';
 import { registerThemingParticipant } from 'vs/platform/theme/common/themeService';
+import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
+import { Action } from 'vs/base/common/actions';
+import { getIconClass } from 'vs/workbench/browser/parts/quickinput/quickInputUtils';
 
 const $ = dom.$;
 
 interface IListElement {
 	index: number;
-	item: IPickOpenEntry;
-	checked?: boolean;
+	item: IQuickPickItem;
+	saneLabel: string;
+	saneDescription?: string;
+	saneDetail?: string;
+	checked: boolean;
+	separator: IQuickPickSeparator;
+	fireButtonTriggered: (event: IQuickPickItemButtonEvent<IQuickPickItem>) => void;
 }
 
 class ListElement implements IListElement {
 	index: number;
-	item: IPickOpenEntry;
+	item: IQuickPickItem;
+	saneLabel: string;
+	saneDescription?: string;
+	saneDetail?: string;
 	shouldAlwaysShow = false;
 	hidden = false;
 	private _onChecked = new Emitter<boolean>();
@@ -52,9 +63,11 @@ class ListElement implements IListElement {
 			this._onChecked.fire(value);
 		}
 	}
+	separator: IQuickPickSeparator;
 	labelHighlights?: IMatch[];
 	descriptionHighlights?: IMatch[];
 	detailHighlights?: IMatch[];
+	fireButtonTriggered: (event: IQuickPickItemButtonEvent<IQuickPickItem>) => void;
 
 	constructor(init: IListElement) {
 		assign(this, init);
@@ -62,9 +75,12 @@ class ListElement implements IListElement {
 }
 
 interface IListElementTemplateData {
+	entry: HTMLDivElement;
 	checkbox: HTMLInputElement;
 	label: IconLabel;
 	detail: HighlightedLabel;
+	separator: HTMLDivElement;
+	actionBar: ActionBar;
 	element: ListElement;
 	toDisposeElement: IDisposable[];
 	toDisposeTemplate: IDisposable[];
@@ -83,10 +99,10 @@ class ListElementRenderer implements IRenderer<ListElement, IListElementTemplate
 		data.toDisposeElement = [];
 		data.toDisposeTemplate = [];
 
-		const entry = dom.append(container, $('.quick-input-list-entry'));
+		data.entry = dom.append(container, $('.quick-input-list-entry'));
 
 		// Checkbox
-		const label = dom.append(entry, $('label.quick-input-list-label'));
+		const label = dom.append(data.entry, $('label.quick-input-list-label'));
 		data.checkbox = <HTMLInputElement>dom.append(label, $('input.quick-input-list-checkbox'));
 		data.checkbox.type = 'checkbox';
 		data.toDisposeTemplate.push(dom.addStandardDisposableListener(data.checkbox, dom.EventType.CHANGE, e => {
@@ -105,31 +121,77 @@ class ListElementRenderer implements IRenderer<ListElement, IListElementTemplate
 		const detailContainer = dom.append(row2, $('.quick-input-list-label-meta'));
 		data.detail = new HighlightedLabel(detailContainer);
 
+		// Separator
+		data.separator = dom.append(data.entry, $('.quick-input-list-separator'));
+
+		// Actions
+		data.actionBar = new ActionBar(data.entry);
+		data.actionBar.domNode.classList.add('quick-input-list-entry-action-bar');
+		data.toDisposeTemplate.push(data.actionBar);
+
 		return data;
 	}
 
 	renderElement(element: ListElement, index: number, data: IListElementTemplateData): void {
 		data.toDisposeElement = dispose(data.toDisposeElement);
 		data.element = element;
-		if (element.checked === undefined) {
-			data.checkbox.style.display = 'none';
-		} else {
-			data.checkbox.style.display = '';
-			data.checkbox.checked = element.checked;
-			data.toDisposeElement.push(element.onChecked(checked => data.checkbox.checked = checked));
-		}
+		data.checkbox.checked = element.checked;
+		data.toDisposeElement.push(element.onChecked(checked => data.checkbox.checked = checked));
 
 		const { labelHighlights, descriptionHighlights, detailHighlights } = element;
 
 		// Label
 		const options: IIconLabelValueOptions = Object.create(null);
 		options.matches = labelHighlights || [];
-		options.descriptionTitle = element.item.description;
+		options.descriptionTitle = element.saneDescription;
 		options.descriptionMatches = descriptionHighlights || [];
-		data.label.setValue(element.item.label, element.item.description, options);
+		options.extraClasses = element.item.iconClasses;
+		data.label.setValue(element.saneLabel, element.saneDescription, options);
 
 		// Meta
-		data.detail.set(element.item.detail, detailHighlights);
+		data.detail.set(element.saneDetail, detailHighlights);
+
+		// ARIA label
+		data.entry.setAttribute('aria-label', [element.saneLabel, element.saneDescription, element.saneDetail]
+			.filter(s => !!s)
+			.join(', '));
+
+		// Separator
+		if (element.separator && element.separator.label) {
+			data.separator.textContent = element.separator.label;
+			data.separator.style.display = null;
+		} else {
+			data.separator.style.display = 'none';
+		}
+		if (element.separator) {
+			dom.addClass(data.entry, 'quick-input-list-separator-border');
+		} else {
+			dom.removeClass(data.entry, 'quick-input-list-separator-border');
+		}
+
+		// Actions
+		data.actionBar.clear();
+		const buttons = element.item.buttons;
+		if (buttons && buttons.length) {
+			data.actionBar.push(buttons.map((button, index) => {
+				const action = new Action(`id-${index}`, '', button.iconClass || getIconClass(button.iconPath), true, () => {
+					element.fireButtonTriggered({
+						button,
+						item: element.item
+					});
+					return null;
+				});
+				action.tooltip = button.tooltip;
+				return action;
+			}), { icon: true, label: false });
+			dom.addClass(data.entry, 'has-actions');
+		} else {
+			dom.removeClass(data.entry, 'has-actions');
+		}
+	}
+
+	disposeElement(element: ListElement, index: number, data: IListElementTemplateData): void {
+		data.toDisposeElement = dispose(data.toDisposeElement);
 	}
 
 	disposeTemplate(data: IListElementTemplateData): void {
@@ -138,10 +200,10 @@ class ListElementRenderer implements IRenderer<ListElement, IListElementTemplate
 	}
 }
 
-class ListElementDelegate implements IDelegate<ListElement> {
+class ListElementDelegate implements IVirtualDelegate<ListElement> {
 
 	getHeight(element: ListElement): number {
-		return element.item.detail ? 44 : 22;
+		return element.saneDetail ? 44 : 22;
 	}
 
 	getTemplateId(element: ListElement): string {
@@ -151,15 +213,24 @@ class ListElementDelegate implements IDelegate<ListElement> {
 
 export class QuickInputList {
 
+	readonly id: string;
 	private container: HTMLElement;
 	private list: WorkbenchList<ListElement>;
+	private inputElements: (IQuickPickItem | IQuickPickSeparator)[];
 	private elements: ListElement[] = [];
+	private elementsToIndexes = new Map<IQuickPickItem, number>();
 	matchOnDescription = false;
 	matchOnDetail = false;
-	private _onAllVisibleCheckedChanged = new Emitter<boolean>(); // TODO: Debounce
-	onAllVisibleCheckedChanged: Event<boolean> = this._onAllVisibleCheckedChanged.event;
-	private _onCheckedCountChanged = new Emitter<number>(); // TODO: Debounce
-	onCheckedCountChanged: Event<number> = this._onCheckedCountChanged.event;
+	private _onChangedAllVisibleChecked = new Emitter<boolean>();
+	onChangedAllVisibleChecked: Event<boolean> = this._onChangedAllVisibleChecked.event;
+	private _onChangedCheckedCount = new Emitter<number>();
+	onChangedCheckedCount: Event<number> = this._onChangedCheckedCount.event;
+	private _onChangedVisibleCount = new Emitter<number>();
+	onChangedVisibleCount: Event<number> = this._onChangedVisibleCount.event;
+	private _onChangedCheckedElements = new Emitter<IQuickPickItem[]>();
+	onChangedCheckedElements: Event<IQuickPickItem[]> = this._onChangedCheckedElements.event;
+	private _onButtonTriggered = new Emitter<IQuickPickItemButtonEvent<IQuickPickItem>>();
+	onButtonTriggered = this._onButtonTriggered.event;
 	private _onLeave = new Emitter<void>();
 	onLeave: Event<void> = this._onLeave.event;
 	private _fireCheckedEvents = true;
@@ -168,14 +239,18 @@ export class QuickInputList {
 
 	constructor(
 		private parent: HTMLElement,
+		id: string,
 		@IInstantiationService private instantiationService: IInstantiationService
 	) {
+		this.id = id;
 		this.container = dom.append(this.parent, $('.quick-input-list'));
 		const delegate = new ListElementDelegate();
 		this.list = this.instantiationService.createInstance(WorkbenchList, this.container, delegate, [new ListElementRenderer()], {
 			identityProvider: element => element.label,
+			openController: { shouldOpen: () => false }, // Workaround #58124
 			multipleSelectionSupport: false
 		}) as WorkbenchList<ListElement>;
+		this.list.getHTMLElement().id = id;
 		this.disposables.push(this.list);
 		this.disposables.push(this.list.onKeyDown(e => {
 			const event = new StandardKeyboardEvent(e);
@@ -189,12 +264,14 @@ export class QuickInputList {
 					}
 					break;
 				case KeyCode.UpArrow:
+				case KeyCode.PageUp:
 					const focus1 = this.list.getFocus();
 					if (focus1.length === 1 && focus1[0] === 0) {
 						this._onLeave.fire();
 					}
 					break;
 				case KeyCode.DownArrow:
+				case KeyCode.PageDown:
 					const focus2 = this.list.getFocus();
 					if (focus2.length === 1 && focus2[0] === this.list.length - 1) {
 						this._onLeave.fire();
@@ -207,20 +284,15 @@ export class QuickInputList {
 				this._onLeave.fire();
 			}
 		}));
-		this.disposables.push(this.list.onSelectionChange(e => {
-			if (e.elements.length) {
-				this.list.setSelection([]);
-			}
-		}));
 	}
 
 	@memoize
-	get onFocusChange() {
+	get onDidChangeFocus() {
 		return mapEvent(this.list.onFocusChange, e => e.elements.map(e => e.item));
 	}
 
 	@memoize
-	get onSelectionChange() {
+	get onDidChangeSelection() {
 		return mapEvent(this.list.onSelectionChange, e => e.elements.map(e => e.item));
 	}
 
@@ -253,6 +325,17 @@ export class QuickInputList {
 		return count;
 	}
 
+	getVisibleCount() {
+		let count = 0;
+		const elements = this.elements;
+		for (let i = 0, n = elements.length; i < n; i++) {
+			if (!elements[i].hidden) {
+				count++;
+			}
+		}
+		return count;
+	}
+
 	setAllVisibleChecked(checked: boolean) {
 		try {
 			this._fireCheckedEvents = false;
@@ -267,23 +350,35 @@ export class QuickInputList {
 		}
 	}
 
-	setElements(elements: IPickOpenEntry[], canCheck = false): void {
+	setElements(inputElements: (IQuickPickItem | IQuickPickSeparator)[]): void {
 		this.elementDisposables = dispose(this.elementDisposables);
-		this.elements = elements.map((item, index) => new ListElement({
-			index,
-			item,
-			checked: canCheck ? !!item.picked : undefined
-		}));
-		if (canCheck) {
-			this.elementDisposables.push(...this.elements.map(element => element.onChecked(() => this.fireCheckedEvents())));
-		}
+		const fireButtonTriggered = (event: IQuickPickItemButtonEvent<IQuickPickItem>) => this.fireButtonTriggered(event);
+		this.inputElements = inputElements;
+		this.elements = inputElements.reduce((result, item, index) => {
+			if (item.type !== 'separator') {
+				const previous = index && inputElements[index - 1];
+				result.push(new ListElement({
+					index,
+					item,
+					saneLabel: item.label && item.label.replace(/\r?\n/g, ' '),
+					saneDescription: item.description && item.description.replace(/\r?\n/g, ' '),
+					saneDetail: item.detail && item.detail.replace(/\r?\n/g, ' '),
+					checked: false,
+					separator: previous && previous.type === 'separator' ? previous : undefined,
+					fireButtonTriggered
+				}));
+			}
+			return result;
+		}, [] as ListElement[]);
+		this.elementDisposables.push(...this.elements.map(element => element.onChecked(() => this.fireCheckedEvents())));
+
+		this.elementsToIndexes = this.elements.reduce((map, element, index) => {
+			map.set(element.item, index);
+			return map;
+		}, new Map<IQuickPickItem, number>());
 		this.list.splice(0, this.list.length, this.elements);
 		this.list.setFocus([]);
-	}
-
-	getCheckedElements() {
-		return this.elements.filter(e => e.checked)
-			.map(e => e.item);
+		this._onChangedVisibleCount.fire(this.elements.length);
 	}
 
 	getFocusedElements() {
@@ -291,15 +386,61 @@ export class QuickInputList {
 			.map(e => e.item);
 	}
 
+	setFocusedElements(items: IQuickPickItem[]) {
+		this.list.setFocus(items
+			.filter(item => this.elementsToIndexes.has(item))
+			.map(item => this.elementsToIndexes.get(item)));
+	}
+
+	getActiveDescendant() {
+		return this.list.getHTMLElement().getAttribute('aria-activedescendant');
+	}
+
+	getSelectedElements() {
+		return this.list.getSelectedElements()
+			.map(e => e.item);
+	}
+
+	setSelectedElements(items: IQuickPickItem[]) {
+		this.list.setSelection(items
+			.filter(item => this.elementsToIndexes.has(item))
+			.map(item => this.elementsToIndexes.get(item)));
+	}
+
+	getCheckedElements() {
+		return this.elements.filter(e => e.checked)
+			.map(e => e.item);
+	}
+
+	setCheckedElements(items: IQuickPickItem[]) {
+		try {
+			this._fireCheckedEvents = false;
+			const checked = new Set();
+			for (const item of items) {
+				checked.add(item);
+			}
+			for (const element of this.elements) {
+				element.checked = checked.has(element.item);
+			}
+		} finally {
+			this._fireCheckedEvents = true;
+			this.fireCheckedEvents();
+		}
+	}
+
+	set enabled(value: boolean) {
+		this.list.getHTMLElement().style.pointerEvents = value ? null : 'none';
+	}
+
 	focus(what: 'First' | 'Last' | 'Next' | 'Previous' | 'NextPage' | 'PreviousPage'): void {
 		if (!this.list.length) {
 			return;
 		}
 
-		if (what === 'Next' && this.list.getFocus()[0] === this.list.length - 1) {
+		if ((what === 'Next' || what === 'NextPage') && this.list.getFocus()[0] === this.list.length - 1) {
 			what = 'First';
 		}
-		if (what === 'Previous' && this.list.getFocus()[0] === 0) {
+		if ((what === 'Previous' || what === 'PreviousPage') && this.list.getFocus()[0] === 0) {
 			what = 'Last';
 		}
 
@@ -329,15 +470,17 @@ export class QuickInputList {
 				element.descriptionHighlights = undefined;
 				element.detailHighlights = undefined;
 				element.hidden = false;
+				const previous = element.index && this.inputElements[element.index - 1];
+				element.separator = previous && previous.type === 'separator' ? previous : undefined;
 			});
 		}
 
 		// Filter by value (since we support octicons, use octicon aware fuzzy matching)
 		else {
 			this.elements.forEach(element => {
-				const labelHighlights = matchesFuzzyOcticonAware(query, parseOcticons(element.item.label));
-				const descriptionHighlights = this.matchOnDescription ? matchesFuzzyOcticonAware(query, parseOcticons(element.item.description || '')) : undefined;
-				const detailHighlights = this.matchOnDetail ? matchesFuzzyOcticonAware(query, parseOcticons(element.item.detail || '')) : undefined;
+				const labelHighlights = matchesFuzzyOcticonAware(query, parseOcticons(element.saneLabel));
+				const descriptionHighlights = this.matchOnDescription ? matchesFuzzyOcticonAware(query, parseOcticons(element.saneDescription || '')) : undefined;
+				const detailHighlights = this.matchOnDetail ? matchesFuzzyOcticonAware(query, parseOcticons(element.saneDetail || '')) : undefined;
 
 				if (element.shouldAlwaysShow || labelHighlights || descriptionHighlights || detailHighlights) {
 					element.labelHighlights = labelHighlights;
@@ -348,27 +491,32 @@ export class QuickInputList {
 					element.labelHighlights = undefined;
 					element.descriptionHighlights = undefined;
 					element.detailHighlights = undefined;
-					element.hidden = true;
+					element.hidden = !element.item.alwaysShow;
 				}
+				element.separator = undefined;
 			});
 		}
 
 		const shownElements = this.elements.filter(element => !element.hidden);
 
 		// Sort by value
-		const normalizedSearchValue = query.toLowerCase();
-		shownElements.sort((a, b) => {
-			if (!query) {
-				return a.index - b.index; // restore natural order
-			}
-			return compareEntries(a, b, normalizedSearchValue);
-		});
+		if (query) {
+			const normalizedSearchValue = query.toLowerCase();
+			shownElements.sort((a, b) => {
+				return compareEntries(a, b, normalizedSearchValue);
+			});
+		}
 
+		this.elementsToIndexes = shownElements.reduce((map, element, index) => {
+			map.set(element.item, index);
+			return map;
+		}, new Map<IQuickPickItem, number>());
 		this.list.splice(0, this.list.length, shownElements);
 		this.list.setFocus([]);
 		this.list.layout();
 
-		this._onAllVisibleCheckedChanged.fire(this.getAllVisibleChecked());
+		this._onChangedAllVisibleChecked.fire(this.getAllVisibleChecked());
+		this._onChangedVisibleCount.fire(shownElements.length);
 	}
 
 	toggleCheckbox() {
@@ -400,10 +548,15 @@ export class QuickInputList {
 
 	private fireCheckedEvents() {
 		if (this._fireCheckedEvents) {
-			this._onAllVisibleCheckedChanged.fire(this.getAllVisibleChecked());
-			this._onCheckedCountChanged.fire(this.getCheckedCount());
+			this._onChangedAllVisibleChecked.fire(this.getAllVisibleChecked());
+			this._onChangedCheckedCount.fire(this.getCheckedCount());
+			this._onChangedCheckedElements.fire(this.getCheckedElements());
 		}
 	}
+
+	private fireButtonTriggered(event: IQuickPickItemButtonEvent<IQuickPickItem>) {
+		this._onButtonTriggered.fire(event);
+	}
 }
 
 function compareEntries(elementA: ListElement, elementB: ListElement, lookFor: string): number {
@@ -418,7 +571,7 @@ function compareEntries(elementA: ListElement, elementB: ListElement, lookFor: s
 		return 1;
 	}
 
-	return compareAnything(elementA.item.label, elementB.item.label, lookFor);
+	return compareAnything(elementA.saneLabel, elementB.saneLabel, lookFor);
 }
 
 registerThemingParticipant((theme, collector) => {
@@ -428,4 +581,12 @@ registerThemingParticipant((theme, collector) => {
 		collector.addRule(`.quick-input-list .monaco-list .monaco-list-row.focused { background-color:  ${listInactiveFocusBackground}; }`);
 		collector.addRule(`.quick-input-list .monaco-list .monaco-list-row.focused:hover { background-color:  ${listInactiveFocusBackground}; }`);
 	}
+	const pickerGroupBorderColor = theme.getColor(pickerGroupBorder);
+	if (pickerGroupBorderColor) {
+		collector.addRule(`.quick-input-list .quick-input-list-entry { border-top-color:  ${pickerGroupBorderColor}; }`);
+	}
+	const pickerGroupForegroundColor = theme.getColor(pickerGroupForeground);
+	if (pickerGroupForegroundColor) {
+		collector.addRule(`.quick-input-list .quick-input-list-separator { color:  ${pickerGroupForegroundColor}; }`);
+	}
 });
diff --git a/src/vs/workbench/browser/parts/quickinput/quickInputUtils.ts b/src/vs/workbench/browser/parts/quickinput/quickInputUtils.ts
new file mode 100644
index 00000000000..1feda0eee00
--- /dev/null
+++ b/src/vs/workbench/browser/parts/quickinput/quickInputUtils.ts
@@ -0,0 +1,28 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import 'vs/css!./quickInput';
+import * as dom from 'vs/base/browser/dom';
+import { URI } from 'vs/base/common/uri';
+import { IdGenerator } from 'vs/base/common/idGenerator';
+
+const iconPathToClass = {};
+const iconClassGenerator = new IdGenerator('quick-input-button-icon-');
+
+export function getIconClass(iconPath: { dark: URI; light?: URI; }) {
+	let iconClass: string;
+
+	const key = iconPath.dark.toString();
+	if (iconPathToClass[key]) {
+		iconClass = iconPathToClass[key];
+	} else {
+		iconClass = iconClassGenerator.nextId();
+		dom.createCSSRule(`.${iconClass}`, `background-image: url("${(iconPath.light || iconPath.dark).toString()}")`);
+		dom.createCSSRule(`.vs-dark .${iconClass}, .hc-black .${iconClass}`, `background-image: url("${iconPath.dark.toString()}")`);
+		iconPathToClass[key] = iconClass;
+	}
+
+	return iconClass;
+}
diff --git a/src/vs/workbench/browser/parts/quickopen/quickOpenController.ts b/src/vs/workbench/browser/parts/quickopen/quickOpenController.ts
index e19932ffc94..d3d4c3be25a 100644
--- a/src/vs/workbench/browser/parts/quickopen/quickOpenController.ts
+++ b/src/vs/workbench/browser/parts/quickopen/quickOpenController.ts
@@ -10,18 +10,15 @@ import { TPromise, ValueCallback } from 'vs/base/common/winjs.base';
 import * as nls from 'vs/nls';
 import * as browser from 'vs/base/browser/browser';
 import * as strings from 'vs/base/common/strings';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import * as resources from 'vs/base/common/resources';
-import { defaultGenerator } from 'vs/base/common/idGenerator';
 import * as types from 'vs/base/common/types';
-import { Action, IAction } from 'vs/base/common/actions';
+import { Action } from 'vs/base/common/actions';
 import { IIconLabelValueOptions } from 'vs/base/browser/ui/iconLabel/iconLabel';
-import { CancellationToken } from 'vs/base/common/cancellation';
 import { Mode, IEntryRunContext, IAutoFocus, IQuickNavigateConfiguration, IModel } from 'vs/base/parts/quickopen/common/quickOpen';
-import { QuickOpenEntry, QuickOpenModel, QuickOpenEntryGroup, compareEntries, QuickOpenItemAccessorClass } from 'vs/base/parts/quickopen/browser/quickOpenModel';
+import { QuickOpenEntry, QuickOpenModel, QuickOpenEntryGroup, QuickOpenItemAccessorClass } from 'vs/base/parts/quickopen/browser/quickOpenModel';
 import { QuickOpenWidget, HideReason } from 'vs/base/parts/quickopen/browser/quickOpenWidget';
 import { ContributableActionProvider } from 'vs/workbench/browser/actions';
-import * as labels from 'vs/base/common/labels';
 import { ITextFileService, AutoSaveMode } from 'vs/workbench/services/textfile/common/textfiles';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { IResourceInput } from 'vs/platform/editor/common/editor';
@@ -34,74 +31,56 @@ import { Event, Emitter } from 'vs/base/common/event';
 import { IPartService } from 'vs/workbench/services/part/common/partService';
 import { QuickOpenHandler, QuickOpenHandlerDescriptor, IQuickOpenRegistry, Extensions, EditorQuickOpenEntry, CLOSE_ON_FOCUS_LOST_CONFIG } from 'vs/workbench/browser/quickopen';
 import * as errors from 'vs/base/common/errors';
-import { IPickOpenEntry, IFilePickOpenEntry, IQuickOpenService, IPickOptions, IShowOptions, IPickOpenItem } from 'vs/platform/quickOpen/common/quickOpen';
+import { IQuickOpenService, IShowOptions } from 'vs/platform/quickOpen/common/quickOpen';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
 import { IContextKeyService, RawContextKey, IContextKey } from 'vs/platform/contextkey/common/contextkey';
 import { IHistoryService } from 'vs/workbench/services/history/common/history';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { SIDE_BAR_BACKGROUND, SIDE_BAR_FOREGROUND } from 'vs/workbench/common/theme';
 import { attachQuickOpenStyler } from 'vs/platform/theme/common/styler';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { ITree, IActionProvider } from 'vs/base/parts/tree/browser/tree';
-import { BaseActionItem } from 'vs/base/browser/ui/actionbar/actionbar';
-import { FileKind, IFileService } from 'vs/platform/files/common/files';
+import { IFileService } from 'vs/platform/files/common/files';
 import { scoreItem, ScorerCache, compareItemsByScore, prepareQuery } from 'vs/base/parts/quickopen/common/quickOpenScorer';
 import { WorkbenchTree } from 'vs/platform/list/browser/listService';
-import { matchesFuzzyOcticonAware, parseOcticons, IParsedOcticons } from 'vs/base/common/octicon';
-import { IMatch } from 'vs/base/common/filters';
 import { Schemas } from 'vs/base/common/network';
-import Severity from 'vs/base/common/severity';
 import { INotificationService } from 'vs/platform/notification/common/notification';
 import { Dimension, addClass } from 'vs/base/browser/dom';
 import { IEditorService, ACTIVE_GROUP, SIDE_GROUP } from 'vs/workbench/services/editor/common/editorService';
 import { IEditorGroupsService } from 'vs/workbench/services/group/common/editorGroupsService';
+import { ILabelService } from 'vs/platform/label/common/label';
+import { timeout } from 'vs/base/common/async';
+import { IQuickInputService, IQuickPickItem } from 'vs/platform/quickinput/common/quickInput';
+import { CancellationTokenSource, CancellationToken } from 'vs/base/common/cancellation';
 
 const HELP_PREFIX = '?';
 
-interface IInternalPickOptions {
-	contextKey?: string;
-	value?: string;
-	valueSelection?: [number, number];
-	placeHolder?: string;
-	inputDecoration?: Severity;
-	password?: boolean;
-	autoFocus?: IAutoFocus;
-	matchOnDescription?: boolean;
-	matchOnDetail?: boolean;
-	ignoreFocusLost?: boolean;
-	quickNavigateConfiguration?: IQuickNavigateConfiguration;
-	onDidType?: (value: string) => any;
-}
-
 export class QuickOpenController extends Component implements IQuickOpenService {
 
 	private static readonly MAX_SHORT_RESPONSE_TIME = 500;
-
-	public _serviceBrand: any;
-
 	private static readonly ID = 'workbench.component.quickopen';
 
-	private readonly _onShow: Emitter<void>;
-	private readonly _onHide: Emitter<void>;
+	_serviceBrand: any;
+
+	private readonly _onShow: Emitter<void> = this._register(new Emitter<void>());
+	get onShow(): Event<void> { return this._onShow.event; }
+
+	private readonly _onHide: Emitter<void> = this._register(new Emitter<void>());
+	get onHide(): Event<void> { return this._onHide.event; }
 
 	private quickOpenWidget: QuickOpenWidget;
-	private pickOpenWidget: QuickOpenWidget;
-	private layoutDimensions: Dimension;
-	private mapResolvedHandlersToPrefix: { [prefix: string]: TPromise<QuickOpenHandler>; };
-	private mapContextKeyToContext: { [id: string]: IContextKey<boolean>; };
-	private handlerOnOpenCalled: { [prefix: string]: boolean; };
-	private currentResultToken: string;
-	private currentPickerToken: string;
-	private promisesToCompleteOnHide: ValueCallback[];
+	private dimension: Dimension;
+	private mapResolvedHandlersToPrefix: { [prefix: string]: TPromise<QuickOpenHandler>; } = Object.create(null);
+	private mapContextKeyToContext: { [id: string]: IContextKey<boolean>; } = Object.create(null);
+	private handlerOnOpenCalled: { [prefix: string]: boolean; } = Object.create(null);
+	private promisesToCompleteOnHide: ValueCallback[] = [];
 	private previousActiveHandlerDescriptor: QuickOpenHandlerDescriptor;
 	private actionProvider = new ContributableActionProvider();
 	private closeOnFocusLost: boolean;
 	private editorHistoryHandler: EditorHistoryHandler;
+	private pendingGetResultsInvocation: CancellationTokenSource;
 
 	constructor(
-		@IEditorService private editorService: IEditorService,
 		@IEditorGroupsService private editorGroupService: IEditorGroupsService,
 		@INotificationService private notificationService: INotificationService,
 		@IContextKeyService private contextKeyService: IContextKeyService,
@@ -113,26 +92,17 @@ export class QuickOpenController extends Component implements IQuickOpenService
 	) {
 		super(QuickOpenController.ID, themeService);
 
-		this.mapResolvedHandlersToPrefix = {};
-		this.handlerOnOpenCalled = {};
-		this.mapContextKeyToContext = {};
-
-		this.promisesToCompleteOnHide = [];
-
 		this.editorHistoryHandler = this.instantiationService.createInstance(EditorHistoryHandler);
 
-		this._onShow = new Emitter<void>();
-		this._onHide = new Emitter<void>();
-
 		this.updateConfiguration();
 
 		this.registerListeners();
 	}
 
 	private registerListeners(): void {
-		this.toUnbind.push(this.configurationService.onDidChangeConfiguration(e => this.updateConfiguration()));
-		this.toUnbind.push(this.partService.onTitleBarVisibilityChange(() => this.positionQuickOpenWidget()));
-		this.toUnbind.push(browser.onDidChangeZoomLevel(() => this.positionQuickOpenWidget()));
+		this._register(this.configurationService.onDidChangeConfiguration(() => this.updateConfiguration()));
+		this._register(this.partService.onTitleBarVisibilityChange(() => this.positionQuickOpenWidget()));
+		this._register(browser.onDidChangeZoomLevel(() => this.positionQuickOpenWidget()));
 	}
 
 	private updateConfiguration(): void {
@@ -143,300 +113,28 @@ export class QuickOpenController extends Component implements IQuickOpenService
 		}
 	}
 
-	public get onShow(): Event<void> {
-		return this._onShow.event;
-	}
-
-	public get onHide(): Event<void> {
-		return this._onHide.event;
-	}
-
-	public navigate(next: boolean, quickNavigate?: IQuickNavigateConfiguration): void {
+	navigate(next: boolean, quickNavigate?: IQuickNavigateConfiguration): void {
 		if (this.quickOpenWidget) {
 			this.quickOpenWidget.navigate(next, quickNavigate);
 		}
+	}
 
-		if (this.pickOpenWidget) {
-			this.pickOpenWidget.navigate(next, quickNavigate);
+	accept(): void {
+		if (this.quickOpenWidget && this.quickOpenWidget.isVisible()) {
+			this.quickOpenWidget.accept();
 		}
 	}
 
-	public pick(picks: TPromise<string[]>, options?: IPickOptions, token?: CancellationToken): TPromise<string>;
-	public pick<T extends IPickOpenEntry>(picks: TPromise<T[]>, options?: IPickOptions, token?: CancellationToken): TPromise<string>;
-	public pick(picks: string[], options?: IPickOptions, token?: CancellationToken): TPromise<string>;
-	public pick<T extends IPickOpenEntry>(picks: T[], options?: IPickOptions, token?: CancellationToken): TPromise<T>;
-	public pick(arg1: string[] | TPromise<string[]> | IPickOpenEntry[] | TPromise<IPickOpenEntry[]>, options?: IPickOptions, token?: CancellationToken): TPromise<string | IPickOpenEntry> {
-		if (!options) {
-			options = Object.create(null);
+	focus(): void {
+		if (this.quickOpenWidget && this.quickOpenWidget.isVisible()) {
+			this.quickOpenWidget.focus();
 		}
-
-		let arrayPromise: TPromise<string[] | IPickOpenEntry[]>;
-		if (Array.isArray(arg1)) {
-			arrayPromise = TPromise.as(arg1);
-		} else if (TPromise.is(arg1)) {
-			arrayPromise = arg1;
-		} else {
-			throw new Error('illegal input');
-		}
-
-		let isAboutStrings = false;
-		const entryPromise = arrayPromise.then(elements => {
-			return (<Array<string | IPickOpenEntry>>elements).map(element => {
-				if (typeof element === 'string') {
-					isAboutStrings = true;
-
-					return <IPickOpenEntry>{ label: element };
-				} else {
-					return element;
-				}
-			});
-		});
-
-		if (this.pickOpenWidget && this.pickOpenWidget.isVisible()) {
-			this.pickOpenWidget.hide(HideReason.CANCELED);
-		}
-
-		return new TPromise<string | IPickOpenEntry>((resolve, reject, progress) => {
-
-			function onItem(item: IPickOpenEntry): string | IPickOpenEntry {
-				return item && isAboutStrings ? item.label : item;
-			}
-
-			this.doPick(entryPromise, options, token).then(item => resolve(onItem(item)), err => reject(err), item => progress(onItem(item)));
-		});
 	}
 
-	private doPick(picksPromise: TPromise<IPickOpenEntry[]>, options: IInternalPickOptions, token: CancellationToken = CancellationToken.None): TPromise<IPickOpenEntry> {
-		const autoFocus = options.autoFocus;
-
-		// Use a generated token to avoid race conditions from long running promises
-		const currentPickerToken = defaultGenerator.nextId();
-		this.currentPickerToken = currentPickerToken;
-
-		// Update context
-		this.setQuickOpenContextKey(options.contextKey);
-
-		// Create upon first open
-		if (!this.pickOpenWidget) {
-			this.pickOpenWidget = new QuickOpenWidget(
-				document.getElementById(this.partService.getWorkbenchElementId()),
-				{
-					onOk: () => { /* ignore, handle later */ },
-					onCancel: () => { /* ignore, handle later */ },
-					onType: (value: string) => { /* ignore, handle later */ },
-					onShow: () => this.handleOnShow(true),
-					onHide: (reason) => this.handleOnHide(true, reason)
-				}, {
-					inputPlaceHolder: options.placeHolder || '',
-					keyboardSupport: false,
-					treeCreator: (container, config, opts) => this.instantiationService.createInstance(WorkbenchTree, container, config, opts)
-				}
-			);
-			this.toUnbind.push(attachQuickOpenStyler(this.pickOpenWidget, this.themeService, { background: SIDE_BAR_BACKGROUND, foreground: SIDE_BAR_FOREGROUND }));
-
-			const pickOpenContainer = this.pickOpenWidget.create();
-			addClass(pickOpenContainer, 'show-file-icons');
-			this.positionQuickOpenWidget();
+	close(): void {
+		if (this.quickOpenWidget && this.quickOpenWidget.isVisible()) {
+			this.quickOpenWidget.hide(HideReason.CANCELED);
 		}
-
-		// Update otherwise
-		else {
-			this.pickOpenWidget.setPlaceHolder(options.placeHolder || '');
-		}
-
-		// Respect input value
-		if (options.value) {
-			this.pickOpenWidget.setValue(options.value, options.valueSelection);
-		}
-
-		// Respect password
-		this.pickOpenWidget.setPassword(options.password);
-
-		// Input decoration
-		if (!types.isUndefinedOrNull(options.inputDecoration)) {
-			this.pickOpenWidget.showInputDecoration(options.inputDecoration);
-		} else {
-			this.pickOpenWidget.clearInputDecoration();
-		}
-
-		// Layout
-		if (this.layoutDimensions) {
-			this.pickOpenWidget.layout(this.layoutDimensions);
-		}
-
-		return new TPromise<IPickOpenEntry>((complete, error, progress) => {
-
-			// Detect cancellation while pick promise is loading
-			this.pickOpenWidget.setCallbacks({
-				onCancel: () => { complete(void 0); },
-				onOk: () => { /* ignore, handle later */ },
-				onType: (value: string) => { /* ignore, handle later */ },
-			});
-
-			// hide widget when being cancelled
-			token.onCancellationRequested(e => {
-				if (this.currentPickerToken === currentPickerToken) {
-					this.pickOpenWidget.hide(HideReason.CANCELED);
-				}
-			});
-
-			let picksPromiseDone = false;
-
-			// Resolve picks
-			picksPromise.then(picks => {
-				if (this.currentPickerToken !== currentPickerToken) {
-					return complete(void 0); // Return as canceled if another request came after or user canceled
-				}
-
-				picksPromiseDone = true;
-
-				// Reset Progress
-				this.pickOpenWidget.getProgressBar().stop().hide();
-
-				// Model
-				const model = new QuickOpenModel([], new PickOpenActionProvider());
-				const entries = picks.map((e, index) => this.instantiationService.createInstance(PickOpenEntry, e, index, () => progress(e), () => this.pickOpenWidget.refresh()));
-				if (picks.length === 0) {
-					entries.push(this.instantiationService.createInstance(PickOpenEntry, { label: nls.localize('emptyPicks', "There are no entries to pick from") }, 0, null, null));
-				}
-
-				model.setEntries(entries);
-
-				// Handlers
-				const callbacks = {
-					onOk: () => {
-						if (picks.length === 0) {
-							return complete(null);
-						}
-
-						let index = -1;
-						let context: IEntryRunContext;
-						entries.forEach(entry => {
-							if (entry.shouldRunWithContext) {
-								index = entry.index;
-								context = entry.shouldRunWithContext;
-							}
-						});
-
-						const selectedPick = picks[index];
-
-						if (selectedPick && typeof selectedPick.run === 'function') {
-							selectedPick.run(context);
-						}
-
-						complete(selectedPick || null);
-					},
-					onCancel: () => complete(void 0),
-					onFocusLost: () => !this.closeOnFocusLost || options.ignoreFocusLost,
-					onType: (value: string) => {
-
-						// the caller takes care of all input
-						if (options.onDidType) {
-							options.onDidType(value);
-							return;
-						}
-
-						if (picks.length === 0) {
-							return;
-						}
-
-						value = value ? strings.trim(value) : value;
-
-						// Reset filtering
-						if (!value) {
-							entries.forEach(e => {
-								e.setHighlights(null);
-								e.setHidden(false);
-							});
-						}
-
-						// Filter by value (since we support octicons, use octicon aware fuzzy matching)
-						else {
-							entries.forEach(entry => {
-								const { labelHighlights, descriptionHighlights, detailHighlights } = entry.matchesFuzzy(value, options);
-
-								if (entry.shouldAlwaysShow() || labelHighlights || descriptionHighlights || detailHighlights) {
-									entry.setHighlights(labelHighlights, descriptionHighlights, detailHighlights);
-									entry.setHidden(false);
-								} else {
-									entry.setHighlights(null, null, null);
-									entry.setHidden(true);
-								}
-							});
-						}
-
-						// Sort by value
-						const normalizedSearchValue = value ? strings.stripWildcards(value.toLowerCase()) : value;
-						model.entries.sort((pickA: PickOpenEntry, pickB: PickOpenEntry) => {
-							if (!value) {
-								return pickA.index - pickB.index; // restore natural order
-							}
-
-							return compareEntries(pickA, pickB, normalizedSearchValue);
-						});
-
-						this.pickOpenWidget.refresh(model, value ? { autoFocusFirstEntry: true } : autoFocus);
-					},
-					onShow: () => this.handleOnShow(true),
-					onHide: (reason: HideReason) => this.handleOnHide(true, reason)
-				};
-				this.pickOpenWidget.setCallbacks(callbacks);
-
-				// Set input
-				if (!this.pickOpenWidget.isVisible()) {
-					this.pickOpenWidget.show(model, { autoFocus, quickNavigateConfiguration: options.quickNavigateConfiguration });
-				} else {
-					this.pickOpenWidget.setInput(model, autoFocus);
-				}
-
-				// The user might have typed something (or options.value was set) so we need to play back
-				// the input box value through our callbacks to filter the result accordingly.
-				const inputValue = this.pickOpenWidget.getInputBox().value;
-				if (inputValue) {
-					callbacks.onType(inputValue);
-				}
-			}, (err) => {
-				this.pickOpenWidget.hide();
-
-				error(err);
-			});
-
-			// Progress if task takes a long time
-			TPromise.timeout(800).then(() => {
-				if (!picksPromiseDone && this.currentPickerToken === currentPickerToken) {
-					this.pickOpenWidget.getProgressBar().infinite().show();
-				}
-			});
-
-			// Show picker empty if resolving takes a while
-			if (!picksPromiseDone) {
-				this.pickOpenWidget.show(new QuickOpenModel());
-			}
-		});
-	}
-
-	public accept(): void {
-		[this.quickOpenWidget, this.pickOpenWidget].forEach(w => {
-			if (w && w.isVisible()) {
-				w.accept();
-			}
-		});
-	}
-
-	public focus(): void {
-		[this.quickOpenWidget, this.pickOpenWidget].forEach(w => {
-			if (w && w.isVisible()) {
-				w.focus();
-			}
-		});
-	}
-
-	public close(): void {
-		[this.quickOpenWidget, this.pickOpenWidget].forEach(w => {
-			if (w && w.isVisible()) {
-				w.hide(HideReason.CANCELED);
-			}
-		});
 	}
 
 	private emitQuickOpenVisibilityChange(isVisible: boolean): void {
@@ -447,7 +145,7 @@ export class QuickOpenController extends Component implements IQuickOpenService
 		}
 	}
 
-	public show(prefix?: string, options?: IShowOptions): TPromise<void> {
+	show(prefix?: string, options?: IShowOptions): TPromise<void> {
 		let quickNavigateConfiguration = options ? options.quickNavigateConfiguration : void 0;
 		let inputSelection = options ? options.inputSelection : void 0;
 		let autoFocus = options ? options.autoFocus : void 0;
@@ -461,26 +159,26 @@ export class QuickOpenController extends Component implements IQuickOpenService
 		const handlerDescriptor = registry.getQuickOpenHandler(prefix) || registry.getDefaultQuickOpenHandler();
 
 		// Trigger onOpen
-		this.resolveHandler(handlerDescriptor).done(null, errors.onUnexpectedError);
+		this.resolveHandler(handlerDescriptor);
 
 		// Create upon first open
 		if (!this.quickOpenWidget) {
-			this.quickOpenWidget = new QuickOpenWidget(
-				document.getElementById(this.partService.getWorkbenchElementId()),
+			this.quickOpenWidget = this._register(new QuickOpenWidget(
+				this.partService.getWorkbenchElement(),
 				{
 					onOk: () => { /* ignore */ },
 					onCancel: () => { /* ignore */ },
 					onType: (value: string) => this.onType(value || ''),
-					onShow: () => this.handleOnShow(false),
-					onHide: (reason) => this.handleOnHide(false, reason),
+					onShow: () => this.handleOnShow(),
+					onHide: (reason) => this.handleOnHide(reason),
 					onFocusLost: () => !this.closeOnFocusLost
 				}, {
 					inputPlaceHolder: this.hasHandler(HELP_PREFIX) ? nls.localize('quickOpenInput', "Type '?' to get help on the actions you can take from here") : '',
 					keyboardSupport: false,
 					treeCreator: (container, config, opts) => this.instantiationService.createInstance(WorkbenchTree, container, config, opts)
 				}
-			);
-			this.toUnbind.push(attachQuickOpenStyler(this.quickOpenWidget, this.themeService, { background: SIDE_BAR_BACKGROUND, foreground: SIDE_BAR_FOREGROUND }));
+			));
+			this._register(attachQuickOpenStyler(this.quickOpenWidget, this.themeService, { background: SIDE_BAR_BACKGROUND, foreground: SIDE_BAR_FOREGROUND }));
 
 			const quickOpenContainer = this.quickOpenWidget.create();
 			addClass(quickOpenContainer, 'show-file-icons');
@@ -488,8 +186,8 @@ export class QuickOpenController extends Component implements IQuickOpenService
 		}
 
 		// Layout
-		if (this.layoutDimensions) {
-			this.quickOpenWidget.layout(this.layoutDimensions);
+		if (this.dimension) {
+			this.quickOpenWidget.layout(this.dimension);
 		}
 
 		// Show quick open with prefix or editor history
@@ -507,8 +205,8 @@ export class QuickOpenController extends Component implements IQuickOpenService
 					if (!quickNavigateConfiguration) {
 						autoFocus = { autoFocusFirstEntry: true };
 					} else {
-						const visibleEditorCount = this.editorService.visibleEditors.length;
-						autoFocus = { autoFocusFirstEntry: visibleEditorCount === 0, autoFocusSecondEntry: visibleEditorCount !== 0 };
+						const autoFocusFirstEntry = this.editorGroupService.activeGroup.count === 0;
+						autoFocus = { autoFocusFirstEntry, autoFocusSecondEntry: !autoFocusFirstEntry };
 					}
 				}
 
@@ -534,44 +232,33 @@ export class QuickOpenController extends Component implements IQuickOpenService
 		if (this.quickOpenWidget) {
 			this.quickOpenWidget.getElement().style.top = `${titlebarOffset}px`;
 		}
-
-		if (this.pickOpenWidget) {
-			this.pickOpenWidget.getElement().style.top = `${titlebarOffset}px`;
-		}
 	}
 
-	private handleOnShow(isPicker: boolean): void {
-		if (isPicker && this.quickOpenWidget) {
-			this.quickOpenWidget.hide(HideReason.FOCUS_LOST);
-		} else if (!isPicker && this.pickOpenWidget) {
-			this.pickOpenWidget.hide(HideReason.FOCUS_LOST);
-		}
-
+	private handleOnShow(): void {
 		this.emitQuickOpenVisibilityChange(true);
 	}
 
-	private handleOnHide(isPicker: boolean, reason: HideReason): void {
-		if (!isPicker) {
+	private handleOnHide(reason: HideReason): void {
 
-			// Clear state
-			this.previousActiveHandlerDescriptor = null;
+		// Clear state
+		this.previousActiveHandlerDescriptor = null;
 
-			// Pass to handlers
-			for (let prefix in this.mapResolvedHandlersToPrefix) {
-				if (this.mapResolvedHandlersToPrefix.hasOwnProperty(prefix)) {
-					const promise = this.mapResolvedHandlersToPrefix[prefix];
-					promise.then(handler => {
-						this.handlerOnOpenCalled[prefix] = false;
+		// Cancel pending results calls
+		this.cancelPendingGetResultsInvocation();
 
-						handler.onClose(reason === HideReason.CANCELED); // Don't check if onOpen was called to preserve old behaviour for now
-					});
-				}
-			}
+		// Pass to handlers
+		for (let prefix in this.mapResolvedHandlersToPrefix) {
+			const promise = this.mapResolvedHandlersToPrefix[prefix];
+			promise.then(handler => {
+				this.handlerOnOpenCalled[prefix] = false;
 
-			// Complete promises that are waiting
-			while (this.promisesToCompleteOnHide.length) {
-				this.promisesToCompleteOnHide.pop()(true);
-			}
+				handler.onClose(reason === HideReason.CANCELED); // Don't check if onOpen was called to preserve old behaviour for now
+			});
+		}
+
+		// Complete promises that are waiting
+		while (this.promisesToCompleteOnHide.length) {
+			this.promisesToCompleteOnHide.pop()(true);
 		}
 
 		if (reason !== HideReason.FOCUS_LOST) {
@@ -585,6 +272,14 @@ export class QuickOpenController extends Component implements IQuickOpenService
 		this.emitQuickOpenVisibilityChange(false);
 	}
 
+	private cancelPendingGetResultsInvocation(): void {
+		if (this.pendingGetResultsInvocation) {
+			this.pendingGetResultsInvocation.cancel();
+			this.pendingGetResultsInvocation.dispose();
+			this.pendingGetResultsInvocation = null;
+		}
+	}
+
 	private resetQuickOpenContextKeys(): void {
 		Object.keys(this.mapContextKeyToContext).forEach(k => this.mapContextKeyToContext[k].reset());
 	}
@@ -627,6 +322,12 @@ export class QuickOpenController extends Component implements IQuickOpenService
 
 	private onType(value: string): void {
 
+		// cancel any pending get results invocation and create new
+		this.cancelPendingGetResultsInvocation();
+		const pendingResultsInvocationTokenSource = new CancellationTokenSource();
+		const pendingResultsInvocationToken = pendingResultsInvocationTokenSource.token;
+		this.pendingGetResultsInvocation = pendingResultsInvocationTokenSource;
+
 		// look for a handler
 		const registry = Registry.as<IQuickOpenRegistry>(Extensions.Quickopen);
 		const handlerDescriptor = registry.getQuickOpenHandler(value);
@@ -634,10 +335,6 @@ export class QuickOpenController extends Component implements IQuickOpenService
 		const instantProgress = handlerDescriptor && handlerDescriptor.instantProgress;
 		const contextKey = handlerDescriptor ? handlerDescriptor.contextKey : defaultHandlerDescriptor.contextKey;
 
-		// Use a generated token to avoid race conditions from long running promises
-		const currentResultToken = defaultGenerator.nextId();
-		this.currentResultToken = currentResultToken;
-
 		// Reset Progress
 		if (!instantProgress) {
 			this.quickOpenWidget.getProgressBar().stop().hide();
@@ -656,8 +353,7 @@ export class QuickOpenController extends Component implements IQuickOpenService
 		if (!trimmedValue) {
 
 			// Trigger onOpen
-			this.resolveHandler(handlerDescriptor || defaultHandlerDescriptor)
-				.done(null, errors.onUnexpectedError);
+			this.resolveHandler(handlerDescriptor || defaultHandlerDescriptor);
 
 			this.quickOpenWidget.setInput(this.getEditorHistoryWithGroupLabel(), { autoFocusFirstEntry: true });
 
@@ -668,42 +364,47 @@ export class QuickOpenController extends Component implements IQuickOpenService
 		let resultPromiseDone = false;
 
 		if (handlerDescriptor) {
-			resultPromise = this.handleSpecificHandler(handlerDescriptor, value, currentResultToken);
+			resultPromise = this.handleSpecificHandler(handlerDescriptor, value, pendingResultsInvocationToken);
 		}
 
 		// Otherwise handle default handlers if no specific handler present
 		else {
-			resultPromise = this.handleDefaultHandler(defaultHandlerDescriptor, value, currentResultToken);
+			resultPromise = this.handleDefaultHandler(defaultHandlerDescriptor, value, pendingResultsInvocationToken);
 		}
 
 		// Remember as the active one
 		this.previousActiveHandlerDescriptor = handlerDescriptor;
 
 		// Progress if task takes a long time
-		TPromise.timeout(instantProgress ? 0 : 800).then(() => {
-			if (!resultPromiseDone && currentResultToken === this.currentResultToken) {
+		setTimeout(() => {
+			if (!resultPromiseDone && !pendingResultsInvocationToken.isCancellationRequested) {
 				this.quickOpenWidget.getProgressBar().infinite().show();
 			}
-		});
+		}, instantProgress ? 0 : 800);
 
 		// Promise done handling
-		resultPromise.done(() => {
+		resultPromise.then(() => {
 			resultPromiseDone = true;
 
-			if (currentResultToken === this.currentResultToken) {
+			if (!pendingResultsInvocationToken.isCancellationRequested) {
 				this.quickOpenWidget.getProgressBar().hide();
 			}
+
+			pendingResultsInvocationTokenSource.dispose();
 		}, (error: any) => {
 			resultPromiseDone = true;
+
+			pendingResultsInvocationTokenSource.dispose();
+
 			errors.onUnexpectedError(error);
 			this.notificationService.error(types.isString(error) ? new Error(error) : error);
 		});
 	}
 
-	private handleDefaultHandler(handler: QuickOpenHandlerDescriptor, value: string, currentResultToken: string): TPromise<void> {
+	private handleDefaultHandler(handler: QuickOpenHandlerDescriptor, value: string, token: CancellationToken): TPromise<void> {
 
 		// Fill in history results if matching
-		const matchingHistoryEntries = this.editorHistoryHandler.getResults(value);
+		const matchingHistoryEntries = this.editorHistoryHandler.getResults(value, token);
 		if (matchingHistoryEntries.length > 0) {
 			matchingHistoryEntries[0] = new EditorHistoryEntryGroup(matchingHistoryEntries[0], nls.localize('historyMatches', "recently opened"), false);
 		}
@@ -719,8 +420,15 @@ export class QuickOpenController extends Component implements IQuickOpenService
 			const previousInput = this.quickOpenWidget.getInput();
 			const wasShowingHistory = previousInput && previousInput.entries && previousInput.entries.some(e => e instanceof EditorHistoryEntry || e instanceof EditorHistoryEntryGroup);
 			if (wasShowingHistory || matchingHistoryEntries.length > 0) {
-				(resolvedHandler.hasShortResponseTime() ? TPromise.timeout(QuickOpenController.MAX_SHORT_RESPONSE_TIME) : TPromise.as(undefined)).then(() => {
-					if (this.currentResultToken === currentResultToken && !inputSet) {
+				let responseDelay: Thenable<void>;
+				if (resolvedHandler.hasShortResponseTime()) {
+					responseDelay = timeout(QuickOpenController.MAX_SHORT_RESPONSE_TIME);
+				} else {
+					responseDelay = Promise.resolve(void 0);
+				}
+
+				responseDelay.then(() => {
+					if (!token.isCancellationRequested && !inputSet) {
 						this.quickOpenWidget.setInput(quickOpenModel, { autoFocusFirstEntry: true });
 						inputSet = true;
 					}
@@ -728,8 +436,8 @@ export class QuickOpenController extends Component implements IQuickOpenService
 			}
 
 			// Get results
-			return resolvedHandler.getResults(value).then(result => {
-				if (this.currentResultToken === currentResultToken) {
+			return resolvedHandler.getResults(value, token).then(result => {
+				if (!token.isCancellationRequested) {
 
 					// now is the time to show the input if we did not have set it before
 					if (!inputSet) {
@@ -775,7 +483,7 @@ export class QuickOpenController extends Component implements IQuickOpenService
 		}
 	}
 
-	private handleSpecificHandler(handlerDescriptor: QuickOpenHandlerDescriptor, value: string, currentResultToken: string): TPromise<void> {
+	private handleSpecificHandler(handlerDescriptor: QuickOpenHandlerDescriptor, value: string, token: CancellationToken): TPromise<void> {
 		return this.resolveHandler(handlerDescriptor).then((resolvedHandler: QuickOpenHandler) => {
 
 			// Remove handler prefix from search value
@@ -804,8 +512,8 @@ export class QuickOpenController extends Component implements IQuickOpenService
 			}
 
 			// Receive Results from Handler and apply
-			return resolvedHandler.getResults(value).then(result => {
-				if (this.currentResultToken === currentResultToken) {
+			return resolvedHandler.getResults(value, token).then(result => {
+				if (!token.isCancellationRequested) {
 					if (!result || !result.entries.length) {
 						const model = new QuickOpenModel([new PlaceholderQuickOpenEntry(resolvedHandler.getEmptyLabel(value))]);
 						this.showModel(model, resolvedHandler.getAutoFocus(value, { model, quickNavigateConfiguration: this.quickOpenWidget.getQuickNavigateConfiguration() }), resolvedHandler.getAriaLabel());
@@ -880,27 +588,11 @@ export class QuickOpenController extends Component implements IQuickOpenService
 		return this.mapResolvedHandlersToPrefix[id] = TPromise.as(handler.instantiate(this.instantiationService));
 	}
 
-	public layout(dimension: Dimension): void {
-		this.layoutDimensions = dimension;
+	layout(dimension: Dimension): void {
+		this.dimension = dimension;
 		if (this.quickOpenWidget) {
-			this.quickOpenWidget.layout(this.layoutDimensions);
+			this.quickOpenWidget.layout(this.dimension);
 		}
-
-		if (this.pickOpenWidget) {
-			this.pickOpenWidget.layout(this.layoutDimensions);
-		}
-	}
-
-	public dispose(): void {
-		if (this.quickOpenWidget) {
-			this.quickOpenWidget.dispose();
-		}
-
-		if (this.pickOpenWidget) {
-			this.pickOpenWidget.dispose();
-		}
-
-		super.dispose();
 	}
 }
 
@@ -913,174 +605,11 @@ class PlaceholderQuickOpenEntry extends QuickOpenEntryGroup {
 		this.placeHolderLabel = placeHolderLabel;
 	}
 
-	public getLabel(): string {
+	getLabel(): string {
 		return this.placeHolderLabel;
 	}
 }
 
-class PickOpenEntry extends PlaceholderQuickOpenEntry implements IPickOpenItem {
-	private _shouldRunWithContext: IEntryRunContext;
-	private description: string;
-	private detail: string;
-	private tooltip: string;
-	private descriptionTooltip: string;
-	private hasSeparator: boolean;
-	private separatorLabel: string;
-	private alwaysShow: boolean;
-	private resource: URI;
-	private fileKind: FileKind;
-	private _action: IAction;
-	private removed: boolean;
-	private payload: any;
-	private labelOcticons: IParsedOcticons;
-	private descriptionOcticons: IParsedOcticons;
-	private detailOcticons: IParsedOcticons;
-
-	constructor(
-		item: IPickOpenEntry,
-		private _index: number,
-		private onPreview: () => void,
-		private onRemove: () => void,
-		@IModeService private modeService: IModeService,
-		@IModelService private modelService: IModelService
-	) {
-		super(item.label);
-
-		this.description = item.description;
-		this.detail = item.detail;
-		this.tooltip = item.tooltip;
-		this.descriptionOcticons = item.description ? parseOcticons(item.description) : void 0;
-		this.descriptionTooltip = this.descriptionOcticons ? this.descriptionOcticons.text : void 0;
-		this.hasSeparator = item.separator && item.separator.border;
-		this.separatorLabel = item.separator && item.separator.label;
-		this.alwaysShow = item.alwaysShow;
-		this._action = item.action;
-		this.payload = item.payload;
-
-		const fileItem = <IFilePickOpenEntry>item;
-		this.resource = fileItem.resource;
-		this.fileKind = fileItem.fileKind;
-	}
-
-	public matchesFuzzy(query: string, options: IInternalPickOptions): { labelHighlights: IMatch[], descriptionHighlights: IMatch[], detailHighlights: IMatch[] } {
-		if (!this.labelOcticons) {
-			this.labelOcticons = parseOcticons(this.getLabel()); // parse on demand
-		}
-
-		const detail = this.getDetail();
-		if (detail && options.matchOnDetail && !this.detailOcticons) {
-			this.detailOcticons = parseOcticons(detail); // parse on demand
-		}
-
-		return {
-			labelHighlights: matchesFuzzyOcticonAware(query, this.labelOcticons),
-			descriptionHighlights: options.matchOnDescription && this.descriptionOcticons ? matchesFuzzyOcticonAware(query, this.descriptionOcticons) : void 0,
-			detailHighlights: options.matchOnDetail && this.detailOcticons ? matchesFuzzyOcticonAware(query, this.detailOcticons) : void 0
-		};
-	}
-
-	public getPayload(): any {
-		return this.payload;
-	}
-
-	public remove(): void {
-		super.setHidden(true);
-		this.removed = true;
-
-		this.onRemove();
-	}
-
-	public isHidden(): boolean {
-		return this.removed || super.isHidden();
-	}
-
-	public get action(): IAction {
-		return this._action;
-	}
-
-	public get index(): number {
-		return this._index;
-	}
-
-	public getLabelOptions(): IIconLabelValueOptions {
-		return {
-			extraClasses: this.resource ? getIconClasses(this.modelService, this.modeService, this.resource, this.fileKind) : []
-		};
-	}
-
-	public get shouldRunWithContext(): IEntryRunContext {
-		return this._shouldRunWithContext;
-	}
-
-	public getDescription(): string {
-		return this.description;
-	}
-
-	public getDetail(): string {
-		return this.detail;
-	}
-
-	public getTooltip(): string {
-		return this.tooltip;
-	}
-
-	public getDescriptionTooltip(): string {
-		return this.descriptionTooltip;
-	}
-
-	public showBorder(): boolean {
-		return this.hasSeparator;
-	}
-
-	public getGroupLabel(): string {
-		return this.separatorLabel;
-	}
-
-	public shouldAlwaysShow(): boolean {
-		return this.alwaysShow;
-	}
-
-	public getResource(): URI {
-		return this.resource;
-	}
-
-	public run(mode: Mode, context: IEntryRunContext): boolean {
-		if (mode === Mode.OPEN) {
-			this._shouldRunWithContext = context;
-
-			return true;
-		}
-
-		if (mode === Mode.PREVIEW && this.onPreview) {
-			this.onPreview();
-		}
-
-		return false;
-	}
-}
-
-class PickOpenActionProvider implements IActionProvider {
-	public hasActions(tree: ITree, element: PickOpenEntry): boolean {
-		return !!element.action;
-	}
-
-	public getActions(tree: ITree, element: PickOpenEntry): TPromise<IAction[]> {
-		return TPromise.as(element.action ? [element.action] : []);
-	}
-
-	public hasSecondaryActions(tree: ITree, element: PickOpenEntry): boolean {
-		return false;
-	}
-
-	public getSecondaryActions(tree: ITree, element: PickOpenEntry): TPromise<IAction[]> {
-		return TPromise.as([]);
-	}
-
-	public getActionItem(tree: ITree, element: PickOpenEntry, action: Action): BaseActionItem {
-		return null;
-	}
-}
-
 class EditorHistoryHandler {
 	private scorerCache: ScorerCache;
 
@@ -1092,7 +621,7 @@ class EditorHistoryHandler {
 		this.scorerCache = Object.create(null);
 	}
 
-	public getResults(searchValue?: string): QuickOpenEntry[] {
+	getResults(searchValue?: string, token?: CancellationToken): QuickOpenEntry[] {
 
 		// Massage search for scoring
 		const query = prepareQuery(searchValue);
@@ -1137,7 +666,7 @@ class EditorHistoryHandler {
 
 			// Sort by score and provide a fallback sorter that keeps the
 			// recency of items in case the score for items is the same
-			.sort((e1, e2) => compareItemsByScore(e1, e2, query, false, accessor, this.scorerCache, (e1, e2, query, accessor) => -1));
+			.sort((e1, e2) => compareItemsByScore(e1, e2, query, false, accessor, this.scorerCache, () => -1));
 	}
 }
 
@@ -1147,7 +676,7 @@ class EditorHistoryItemAccessorClass extends QuickOpenItemAccessorClass {
 		super();
 	}
 
-	public getItemDescription(entry: QuickOpenEntry): string {
+	getItemDescription(entry: QuickOpenEntry): string {
 		return this.allowMatchOnDescription ? entry.getDescription() : void 0;
 	}
 }
@@ -1172,9 +701,8 @@ export class EditorHistoryEntry extends EditorQuickOpenEntry {
 		@IModeService private modeService: IModeService,
 		@IModelService private modelService: IModelService,
 		@ITextFileService private textFileService: ITextFileService,
-		@IWorkspaceContextService contextService: IWorkspaceContextService,
 		@IConfigurationService private configurationService: IConfigurationService,
-		@IEnvironmentService environmentService: IEnvironmentService,
+		@ILabelService labelService: ILabelService,
 		@IFileService fileService: IFileService
 	) {
 		super(editorService);
@@ -1189,8 +717,8 @@ export class EditorHistoryEntry extends EditorQuickOpenEntry {
 		} else {
 			const resourceInput = input as IResourceInput;
 			this.resource = resourceInput.resource;
-			this.label = labels.getBaseLabel(resourceInput.resource);
-			this.description = labels.getPathLabel(resources.dirname(this.resource), contextService, environmentService);
+			this.label = resources.basenameOrAuthority(resourceInput.resource);
+			this.description = labelService.getUriLabel(resources.dirname(this.resource), true);
 			this.dirty = this.resource && this.textFileService.isDirty(this.resource);
 
 			if (this.dirty && this.textFileService.getAutoSaveMode() === AutoSaveMode.AFTER_SHORT_DELAY) {
@@ -1199,37 +727,37 @@ export class EditorHistoryEntry extends EditorQuickOpenEntry {
 		}
 	}
 
-	public getIcon(): string {
+	getIcon(): string {
 		return this.dirty ? 'dirty' : '';
 	}
 
-	public getLabel(): string {
+	getLabel(): string {
 		return this.label;
 	}
 
-	public getLabelOptions(): IIconLabelValueOptions {
+	getLabelOptions(): IIconLabelValueOptions {
 		return {
 			extraClasses: getIconClasses(this.modelService, this.modeService, this.resource)
 		};
 	}
 
-	public getAriaLabel(): string {
+	getAriaLabel(): string {
 		return nls.localize('entryAriaLabel', "{0}, recently opened", this.getLabel());
 	}
 
-	public getDescription(): string {
+	getDescription(): string {
 		return this.description;
 	}
 
-	public getResource(): URI {
+	getResource(): URI {
 		return this.resource;
 	}
 
-	public getInput(): IEditorInput | IResourceInput {
+	getInput(): IEditorInput | IResourceInput {
 		return this.input;
 	}
 
-	public run(mode: Mode, context: IEntryRunContext): boolean {
+	run(mode: Mode, context: IEntryRunContext): boolean {
 		if (mode === Mode.OPEN) {
 			const sideBySide = !context.quickNavigateConfiguration && (context.keymods.alt || context.keymods.ctrlCmd);
 			const pinned = !this.configurationService.getValue<IWorkbenchEditorConfiguration>().workbench.editor.enablePreviewFromQuickOpen || context.keymods.alt;
@@ -1261,21 +789,23 @@ function resourceForEditorHistory(input: EditorInput, fileService: IFileService)
 
 export class RemoveFromEditorHistoryAction extends Action {
 
-	public static readonly ID = 'workbench.action.removeFromEditorHistory';
-	public static readonly LABEL = nls.localize('removeFromEditorHistory', "Remove From History");
+	static readonly ID = 'workbench.action.removeFromEditorHistory';
+	static readonly LABEL = nls.localize('removeFromEditorHistory', "Remove From History");
 
 	constructor(
 		id: string,
 		label: string,
-		@IQuickOpenService private quickOpenService: IQuickOpenService,
+		@IQuickInputService private quickInputService: IQuickInputService,
+		@IModelService private modelService: IModelService,
+		@IModeService private modeService: IModeService,
 		@IInstantiationService private instantiationService: IInstantiationService,
 		@IHistoryService private historyService: IHistoryService
 	) {
 		super(id, label);
 	}
 
-	public run(): TPromise<any> {
-		interface IHistoryPickEntry extends IFilePickOpenEntry {
+	run(): TPromise<any> {
+		interface IHistoryPickEntry extends IQuickPickItem {
 			input: IEditorInput | IResourceInput;
 		}
 
@@ -1285,13 +815,13 @@ export class RemoveFromEditorHistoryAction extends Action {
 
 			return <IHistoryPickEntry>{
 				input: h,
-				resource: entry.getResource(),
+				iconClasses: getIconClasses(this.modelService, this.modeService, entry.getResource()),
 				label: entry.getLabel(),
 				description: entry.getDescription()
 			};
 		});
 
-		return this.quickOpenService.pick(picks, { placeHolder: nls.localize('pickHistory', "Select an editor entry to remove from history"), autoFocus: { autoFocusFirstEntry: true }, matchOnDescription: true }).then(pick => {
+		return this.quickInputService.pick(picks, { placeHolder: nls.localize('pickHistory', "Select an editor entry to remove from history"), matchOnDescription: true }).then(pick => {
 			if (pick) {
 				this.historyService.remove(pick.input);
 			}
diff --git a/src/vs/workbench/browser/parts/quickopen/quickopen.contribution.ts b/src/vs/workbench/browser/parts/quickopen/quickopen.contribution.ts
index 3f4ad79d9b0..95a8a593377 100644
--- a/src/vs/workbench/browser/parts/quickopen/quickopen.contribution.ts
+++ b/src/vs/workbench/browser/parts/quickopen/quickopen.contribution.ts
@@ -9,14 +9,14 @@ import { IQuickOpenService } from 'vs/platform/quickOpen/common/quickOpen';
 import { SyncActionDescriptor, MenuRegistry, MenuId } from 'vs/platform/actions/common/actions';
 import { KeyMod, KeyCode } from 'vs/base/common/keyCodes';
 import { IWorkbenchActionRegistry, Extensions as ActionExtensions } from 'vs/workbench/common/actions';
-import { KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRegistry';
+import { KeybindingsRegistry, KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
 import { RemoveFromEditorHistoryAction } from 'vs/workbench/browser/parts/quickopen/quickOpenController';
 import { QuickOpenSelectNextAction, QuickOpenSelectPreviousAction, inQuickOpenContext, getQuickNavigateHandler, QuickOpenNavigateNextAction, QuickOpenNavigatePreviousAction, defaultQuickOpenContext, QUICKOPEN_ACTION_ID, QUICKOPEN_ACION_LABEL } from 'vs/workbench/browser/parts/quickopen/quickopen';
 import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
 
 KeybindingsRegistry.registerCommandAndKeybindingRule({
 	id: 'workbench.action.closeQuickOpen',
-	weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
+	weight: KeybindingWeight.WorkbenchContrib,
 	when: inQuickOpenContext,
 	primary: KeyCode.Escape, secondary: [KeyMod.Shift | KeyCode.Escape],
 	handler: accessor => {
@@ -29,7 +29,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 
 KeybindingsRegistry.registerCommandAndKeybindingRule({
 	id: 'workbench.action.acceptSelectedQuickOpenItem',
-	weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
+	weight: KeybindingWeight.WorkbenchContrib,
 	when: inQuickOpenContext,
 	primary: null,
 	handler: accessor => {
@@ -42,7 +42,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 
 KeybindingsRegistry.registerCommandAndKeybindingRule({
 	id: 'workbench.action.focusQuickOpen',
-	weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
+	weight: KeybindingWeight.WorkbenchContrib,
 	when: inQuickOpenContext,
 	primary: null,
 	handler: accessor => {
@@ -59,7 +59,7 @@ const globalQuickOpenKeybinding = { primary: KeyMod.CtrlCmd | KeyCode.KEY_P, sec
 
 KeybindingsRegistry.registerKeybindingRule({
 	id: QUICKOPEN_ACTION_ID,
-	weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
+	weight: KeybindingWeight.WorkbenchContrib,
 	when: undefined,
 	primary: globalQuickOpenKeybinding.primary,
 	secondary: globalQuickOpenKeybinding.secondary,
@@ -70,8 +70,8 @@ MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
 	command: { id: QUICKOPEN_ACTION_ID, title: QUICKOPEN_ACION_LABEL }
 });
 
-registry.registerWorkbenchAction(new SyncActionDescriptor(QuickOpenSelectNextAction, QuickOpenSelectNextAction.ID, QuickOpenSelectNextAction.LABEL, { primary: null, mac: { primary: KeyMod.WinCtrl | KeyCode.KEY_N } }, inQuickOpenContext, KeybindingsRegistry.WEIGHT.workbenchContrib(50)), 'Select Next in Quick Open');
-registry.registerWorkbenchAction(new SyncActionDescriptor(QuickOpenSelectPreviousAction, QuickOpenSelectPreviousAction.ID, QuickOpenSelectPreviousAction.LABEL, { primary: null, mac: { primary: KeyMod.WinCtrl | KeyCode.KEY_P } }, inQuickOpenContext, KeybindingsRegistry.WEIGHT.workbenchContrib(50)), 'Select Previous in Quick Open');
+registry.registerWorkbenchAction(new SyncActionDescriptor(QuickOpenSelectNextAction, QuickOpenSelectNextAction.ID, QuickOpenSelectNextAction.LABEL, { primary: null, mac: { primary: KeyMod.WinCtrl | KeyCode.KEY_N } }, inQuickOpenContext, KeybindingWeight.WorkbenchContrib + 50), 'Select Next in Quick Open');
+registry.registerWorkbenchAction(new SyncActionDescriptor(QuickOpenSelectPreviousAction, QuickOpenSelectPreviousAction.ID, QuickOpenSelectPreviousAction.LABEL, { primary: null, mac: { primary: KeyMod.WinCtrl | KeyCode.KEY_P } }, inQuickOpenContext, KeybindingWeight.WorkbenchContrib + 50), 'Select Previous in Quick Open');
 registry.registerWorkbenchAction(new SyncActionDescriptor(QuickOpenNavigateNextAction, QuickOpenNavigateNextAction.ID, QuickOpenNavigateNextAction.LABEL), 'Navigate Next in Quick Open');
 registry.registerWorkbenchAction(new SyncActionDescriptor(QuickOpenNavigatePreviousAction, QuickOpenNavigatePreviousAction.ID, QuickOpenNavigatePreviousAction.LABEL), 'Navigate Previous in Quick Open');
 registry.registerWorkbenchAction(new SyncActionDescriptor(RemoveFromEditorHistoryAction, RemoveFromEditorHistoryAction.ID, RemoveFromEditorHistoryAction.LABEL), 'Remove From History');
@@ -79,7 +79,7 @@ registry.registerWorkbenchAction(new SyncActionDescriptor(RemoveFromEditorHistor
 const quickOpenNavigateNextInFilePickerId = 'workbench.action.quickOpenNavigateNextInFilePicker';
 KeybindingsRegistry.registerCommandAndKeybindingRule({
 	id: quickOpenNavigateNextInFilePickerId,
-	weight: KeybindingsRegistry.WEIGHT.workbenchContrib(50),
+	weight: KeybindingWeight.WorkbenchContrib + 50,
 	handler: getQuickNavigateHandler(quickOpenNavigateNextInFilePickerId, true),
 	when: defaultQuickOpenContext,
 	primary: globalQuickOpenKeybinding.primary,
@@ -90,7 +90,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 const quickOpenNavigatePreviousInFilePickerId = 'workbench.action.quickOpenNavigatePreviousInFilePicker';
 KeybindingsRegistry.registerCommandAndKeybindingRule({
 	id: quickOpenNavigatePreviousInFilePickerId,
-	weight: KeybindingsRegistry.WEIGHT.workbenchContrib(50),
+	weight: KeybindingWeight.WorkbenchContrib + 50,
 	handler: getQuickNavigateHandler(quickOpenNavigatePreviousInFilePickerId, false),
 	when: defaultQuickOpenContext,
 	primary: globalQuickOpenKeybinding.primary | KeyMod.Shift,
diff --git a/src/vs/workbench/browser/parts/quickopen/quickopen.ts b/src/vs/workbench/browser/parts/quickopen/quickopen.ts
index a13daae1be5..f0a4175911d 100644
--- a/src/vs/workbench/browser/parts/quickopen/quickopen.ts
+++ b/src/vs/workbench/browser/parts/quickopen/quickopen.ts
@@ -53,7 +53,7 @@ export class BaseQuickOpenNavigateAction extends Action {
 		super(id, label);
 	}
 
-	public run(event?: any): TPromise<any> {
+	run(event?: any): TPromise<any> {
 		const keys = this.keybindingService.lookupKeybindings(this.id);
 		const quickNavigate = this.quickNavigate ? { keybindings: keys } : void 0;
 
@@ -80,8 +80,8 @@ export function getQuickNavigateHandler(id: string, next?: boolean): ICommandHan
 
 export class QuickOpenNavigateNextAction extends BaseQuickOpenNavigateAction {
 
-	public static readonly ID = 'workbench.action.quickOpenNavigateNext';
-	public static readonly LABEL = nls.localize('quickNavigateNext', "Navigate Next in Quick Open");
+	static readonly ID = 'workbench.action.quickOpenNavigateNext';
+	static readonly LABEL = nls.localize('quickNavigateNext', "Navigate Next in Quick Open");
 
 	constructor(
 		id: string,
@@ -96,8 +96,8 @@ export class QuickOpenNavigateNextAction extends BaseQuickOpenNavigateAction {
 
 export class QuickOpenNavigatePreviousAction extends BaseQuickOpenNavigateAction {
 
-	public static readonly ID = 'workbench.action.quickOpenNavigatePrevious';
-	public static readonly LABEL = nls.localize('quickNavigatePrevious', "Navigate Previous in Quick Open");
+	static readonly ID = 'workbench.action.quickOpenNavigatePrevious';
+	static readonly LABEL = nls.localize('quickNavigatePrevious', "Navigate Previous in Quick Open");
 
 	constructor(
 		id: string,
@@ -112,8 +112,8 @@ export class QuickOpenNavigatePreviousAction extends BaseQuickOpenNavigateAction
 
 export class QuickOpenSelectNextAction extends BaseQuickOpenNavigateAction {
 
-	public static readonly ID = 'workbench.action.quickOpenSelectNext';
-	public static readonly LABEL = nls.localize('quickSelectNext', "Select Next in Quick Open");
+	static readonly ID = 'workbench.action.quickOpenSelectNext';
+	static readonly LABEL = nls.localize('quickSelectNext', "Select Next in Quick Open");
 
 	constructor(
 		id: string,
@@ -128,8 +128,8 @@ export class QuickOpenSelectNextAction extends BaseQuickOpenNavigateAction {
 
 export class QuickOpenSelectPreviousAction extends BaseQuickOpenNavigateAction {
 
-	public static readonly ID = 'workbench.action.quickOpenSelectPrevious';
-	public static readonly LABEL = nls.localize('quickSelectPrevious', "Select Previous in Quick Open");
+	static readonly ID = 'workbench.action.quickOpenSelectPrevious';
+	static readonly LABEL = nls.localize('quickSelectPrevious', "Select Previous in Quick Open");
 
 	constructor(
 		id: string,
diff --git a/src/vs/workbench/browser/parts/sidebar/media/sidebarpart.css b/src/vs/workbench/browser/parts/sidebar/media/sidebarpart.css
index 312dae4c272..9a5f5bd6e00 100644
--- a/src/vs/workbench/browser/parts/sidebar/media/sidebarpart.css
+++ b/src/vs/workbench/browser/parts/sidebar/media/sidebarpart.css
@@ -12,7 +12,7 @@
 	visibility: hidden !important;
 }
 
-.monaco-workbench > .sidebar > .title > .title-label span {
+.monaco-workbench > .sidebar > .title > .title-label h2 {
 	text-transform: uppercase;
 }
 
diff --git a/src/vs/workbench/browser/parts/sidebar/sidebarPart.ts b/src/vs/workbench/browser/parts/sidebar/sidebarPart.ts
index d4826a2b8f6..556cdfd222e 100644
--- a/src/vs/workbench/browser/parts/sidebar/sidebarPart.ts
+++ b/src/vs/workbench/browser/parts/sidebar/sidebarPart.ts
@@ -26,15 +26,12 @@ import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { contrastBorder } from 'vs/platform/theme/common/colorRegistry';
 import { SIDE_BAR_TITLE_FOREGROUND, SIDE_BAR_BACKGROUND, SIDE_BAR_FOREGROUND, SIDE_BAR_BORDER } from 'vs/workbench/common/theme';
 import { INotificationService } from 'vs/platform/notification/common/notification';
-import { Dimension, EventType } from 'vs/base/browser/dom';
-import { $ } from 'vs/base/browser/builder';
+import { Dimension, EventType, addDisposableListener } from 'vs/base/browser/dom';
 import { StandardMouseEvent } from 'vs/base/browser/mouseEvent';
 
 export class SidebarPart extends CompositePart<Viewlet> {
 
-	public static readonly activeViewletSettingsKey = 'workbench.sidebar.activeviewletid';
-
-	public _serviceBrand: any;
+	static readonly activeViewletSettingsKey = 'workbench.sidebar.activeviewletid';
 
 	private blockOpeningViewlet: boolean;
 
@@ -69,41 +66,44 @@ export class SidebarPart extends CompositePart<Viewlet> {
 		);
 	}
 
-	public get onDidViewletOpen(): Event<IViewlet> {
+	get onDidViewletOpen(): Event<IViewlet> {
 		return this._onDidCompositeOpen.event as Event<IViewlet>;
 	}
 
-	public get onDidViewletClose(): Event<IViewlet> {
+	get onDidViewletClose(): Event<IViewlet> {
 		return this._onDidCompositeClose.event as Event<IViewlet>;
 	}
 
-	public createTitleArea(parent: HTMLElement): HTMLElement {
+	createTitleArea(parent: HTMLElement): HTMLElement {
 		const titleArea = super.createTitleArea(parent);
-		$(titleArea).on(EventType.CONTEXT_MENU, (e: MouseEvent) => this.onTitleAreaContextMenu(new StandardMouseEvent(e)));
+
+		this._register(addDisposableListener(titleArea, EventType.CONTEXT_MENU, e => {
+			this.onTitleAreaContextMenu(new StandardMouseEvent(e));
+		}));
 
 		return titleArea;
 	}
 
-	public updateStyles(): void {
+	updateStyles(): void {
 		super.updateStyles();
 
 		// Part container
-		const container = $(this.getContainer());
+		const container = this.getContainer();
 
-		container.style('background-color', this.getColor(SIDE_BAR_BACKGROUND));
-		container.style('color', this.getColor(SIDE_BAR_FOREGROUND));
+		container.style.backgroundColor = this.getColor(SIDE_BAR_BACKGROUND);
+		container.style.color = this.getColor(SIDE_BAR_FOREGROUND);
 
 		const borderColor = this.getColor(SIDE_BAR_BORDER) || this.getColor(contrastBorder);
 		const isPositionLeft = this.partService.getSideBarPosition() === SideBarPosition.LEFT;
-		container.style('border-right-width', borderColor && isPositionLeft ? '1px' : null);
-		container.style('border-right-style', borderColor && isPositionLeft ? 'solid' : null);
-		container.style('border-right-color', isPositionLeft ? borderColor : null);
-		container.style('border-left-width', borderColor && !isPositionLeft ? '1px' : null);
-		container.style('border-left-style', borderColor && !isPositionLeft ? 'solid' : null);
-		container.style('border-left-color', !isPositionLeft ? borderColor : null);
+		container.style.borderRightWidth = borderColor && isPositionLeft ? '1px' : null;
+		container.style.borderRightStyle = borderColor && isPositionLeft ? 'solid' : null;
+		container.style.borderRightColor = isPositionLeft ? borderColor : null;
+		container.style.borderLeftWidth = borderColor && !isPositionLeft ? '1px' : null;
+		container.style.borderLeftStyle = borderColor && !isPositionLeft ? 'solid' : null;
+		container.style.borderLeftColor = !isPositionLeft ? borderColor : null;
 	}
 
-	public openViewlet(id: string, focus?: boolean): TPromise<Viewlet> {
+	openViewlet(id: string, focus?: boolean): TPromise<Viewlet> {
 		if (this.blockOpeningViewlet) {
 			return TPromise.as(null); // Workaround against a potential race condition
 		}
@@ -122,19 +122,19 @@ export class SidebarPart extends CompositePart<Viewlet> {
 		return promise.then(() => this.openComposite(id, focus)) as TPromise<Viewlet>;
 	}
 
-	public getActiveViewlet(): IViewlet {
+	getActiveViewlet(): IViewlet {
 		return <IViewlet>this.getActiveComposite();
 	}
 
-	public getLastActiveViewletId(): string {
+	getLastActiveViewletId(): string {
 		return this.getLastActiveCompositetId();
 	}
 
-	public hideActiveViewlet(): TPromise<void> {
+	hideActiveViewlet(): TPromise<void> {
 		return this.hideActiveComposite().then(composite => void 0);
 	}
 
-	public layout(dimension: Dimension): Dimension[] {
+	layout(dimension: Dimension): Dimension[] {
 		if (!this.partService.isVisible(Parts.SIDEBAR_PART)) {
 			return [dimension];
 		}
@@ -162,8 +162,8 @@ export class SidebarPart extends CompositePart<Viewlet> {
 
 class FocusSideBarAction extends Action {
 
-	public static readonly ID = 'workbench.action.focusSideBar';
-	public static readonly LABEL = nls.localize('focusSideBar', "Focus into Side Bar");
+	static readonly ID = 'workbench.action.focusSideBar';
+	static readonly LABEL = nls.localize('focusSideBar', "Focus into Side Bar");
 
 	constructor(
 		id: string,
@@ -174,7 +174,7 @@ class FocusSideBarAction extends Action {
 		super(id, label);
 	}
 
-	public run(): TPromise<any> {
+	run(): TPromise<any> {
 
 		// Show side bar
 		if (!this.partService.isVisible(Parts.SIDEBAR_PART)) {
diff --git a/src/vs/workbench/browser/parts/statusbar/media/statusbarpart.css b/src/vs/workbench/browser/parts/statusbar/media/statusbarpart.css
index c0f06e8e485..ca12bec91c5 100644
--- a/src/vs/workbench/browser/parts/statusbar/media/statusbarpart.css
+++ b/src/vs/workbench/browser/parts/statusbar/media/statusbarpart.css
@@ -5,6 +5,7 @@
 
 .monaco-workbench > .part.statusbar {
 	box-sizing: border-box;
+	cursor: default;
 	width: 100%;
 	height: 22px;
 	font-size: 12px;
@@ -52,7 +53,6 @@
 }
 
 .monaco-workbench > .part.statusbar > .statusbar-entry > span {
-	cursor: default;
 	height: 100%;
 }
 
diff --git a/src/vs/workbench/browser/parts/statusbar/statusbar.ts b/src/vs/workbench/browser/parts/statusbar/statusbar.ts
index d46fd03dc31..f51d5a858aa 100644
--- a/src/vs/workbench/browser/parts/statusbar/statusbar.ts
+++ b/src/vs/workbench/browser/parts/statusbar/statusbar.ts
@@ -6,7 +6,7 @@
 
 import { Registry } from 'vs/platform/registry/common/platform';
 import { IDisposable } from 'vs/base/common/lifecycle';
-import * as statusbarService from 'vs/platform/statusbar/common/statusbar';
+import { StatusbarAlignment } from 'vs/platform/statusbar/common/statusbar';
 import { SyncDescriptor0, createSyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
 import { IConstructorSignature0 } from 'vs/platform/instantiation/common/instantiation';
 
@@ -14,13 +14,10 @@ export interface IStatusbarItem {
 	render(element: HTMLElement): IDisposable;
 }
 
-export import StatusbarAlignment = statusbarService.StatusbarAlignment;
-
 export class StatusbarItemDescriptor {
-
-	public syncDescriptor: SyncDescriptor0<IStatusbarItem>;
-	public alignment: StatusbarAlignment;
-	public priority: number;
+	syncDescriptor: SyncDescriptor0<IStatusbarItem>;
+	alignment: StatusbarAlignment;
+	priority: number;
 
 	constructor(ctor: IConstructorSignature0<IStatusbarItem>, alignment?: StatusbarAlignment, priority?: number) {
 		this.syncDescriptor = createSyncDescriptor(ctor);
@@ -42,11 +39,11 @@ class StatusbarRegistry implements IStatusbarRegistry {
 		this._items = [];
 	}
 
-	public get items(): StatusbarItemDescriptor[] {
+	get items(): StatusbarItemDescriptor[] {
 		return this._items;
 	}
 
-	public registerStatusbarItem(descriptor: StatusbarItemDescriptor): void {
+	registerStatusbarItem(descriptor: StatusbarItemDescriptor): void {
 		this._items.push(descriptor);
 	}
 }
diff --git a/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts b/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts
index beebc378ade..25b7534e351 100644
--- a/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts
+++ b/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts
@@ -9,17 +9,16 @@ import 'vs/css!./media/statusbarpart';
 import * as nls from 'vs/nls';
 import { toErrorMessage } from 'vs/base/common/errorMessage';
 import { TPromise } from 'vs/base/common/winjs.base';
-import { dispose, IDisposable } from 'vs/base/common/lifecycle';
-import { $ } from 'vs/base/browser/builder';
+import { dispose, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
 import { OcticonLabel } from 'vs/base/browser/ui/octiconLabel/octiconLabel';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { ICommandService } from 'vs/platform/commands/common/commands';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { Part } from 'vs/workbench/browser/part';
-import { StatusbarAlignment, IStatusbarRegistry, Extensions, IStatusbarItem } from 'vs/workbench/browser/parts/statusbar/statusbar';
+import { IStatusbarRegistry, Extensions, IStatusbarItem } from 'vs/workbench/browser/parts/statusbar/statusbar';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IStatusbarService, IStatusbarEntry } from 'vs/platform/statusbar/common/statusbar';
+import { StatusbarAlignment, IStatusbarService, IStatusbarEntry } from 'vs/platform/statusbar/common/statusbar';
 import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
 import { Action } from 'vs/base/common/actions';
 import { IThemeService, registerThemingParticipant, ITheme, ICssStyleCollector } from 'vs/platform/theme/common/themeService';
@@ -28,15 +27,15 @@ import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/
 import { contrastBorder } from 'vs/platform/theme/common/colorRegistry';
 import { isThemeColor } from 'vs/editor/common/editorCommon';
 import { Color } from 'vs/base/common/color';
-import { addClass, EventHelper, createStyleSheet } from 'vs/base/browser/dom';
+import { addClass, EventHelper, createStyleSheet, addDisposableListener } from 'vs/base/browser/dom';
 import { INotificationService } from 'vs/platform/notification/common/notification';
 
 export class StatusbarPart extends Part implements IStatusbarService {
 
-	public _serviceBrand: any;
+	_serviceBrand: any;
 
-	private static readonly PRIORITY_PROP = 'priority';
-	private static readonly ALIGNMENT_PROP = 'alignment';
+	private static readonly PRIORITY_PROP = 'statusbar-entry-priority';
+	private static readonly ALIGNMENT_PROP = 'statusbar-entry-alignment';
 
 	private statusItemsContainer: HTMLElement;
 	private statusMsgDispose: IDisposable;
@@ -55,10 +54,10 @@ export class StatusbarPart extends Part implements IStatusbarService {
 	}
 
 	private registerListeners(): void {
-		this.toUnbind.push(this.contextService.onDidChangeWorkbenchState(() => this.updateStyles()));
+		this._register(this.contextService.onDidChangeWorkbenchState(() => this.updateStyles()));
 	}
 
-	public addEntry(entry: IStatusbarEntry, alignment: StatusbarAlignment, priority: number = 0): IDisposable {
+	addEntry(entry: IStatusbarEntry, alignment: StatusbarAlignment, priority: number = 0): IDisposable {
 
 		// Render entry in status bar
 		const el = this.doCreateStatusItem(alignment, priority, entry.showBeak ? 'has-beak' : void 0);
@@ -71,7 +70,7 @@ export class StatusbarPart extends Part implements IStatusbarService {
 		let inserted = false;
 		for (let i = 0; i < neighbours.length; i++) {
 			const neighbour = neighbours[i];
-			const nPriority = $(neighbour).getProperty(StatusbarPart.PRIORITY_PROP);
+			const nPriority = Number(neighbour.getAttribute(StatusbarPart.PRIORITY_PROP));
 			if (
 				alignment === StatusbarAlignment.LEFT && nPriority < priority ||
 				alignment === StatusbarAlignment.RIGHT && nPriority > priority
@@ -86,15 +85,13 @@ export class StatusbarPart extends Part implements IStatusbarService {
 			container.appendChild(el);
 		}
 
-		return {
-			dispose: () => {
-				$(el).destroy();
+		return toDisposable(() => {
+			el.remove();
 
-				if (toDispose) {
-					toDispose.dispose();
-				}
+			if (toDispose) {
+				toDispose.dispose();
 			}
-		};
+		});
 	}
 
 	private getEntries(alignment: StatusbarAlignment): HTMLElement[] {
@@ -104,7 +101,7 @@ export class StatusbarPart extends Part implements IStatusbarService {
 		const children = container.children;
 		for (let i = 0; i < children.length; i++) {
 			const childElement = <HTMLElement>children.item(i);
-			if ($(childElement).getProperty(StatusbarPart.ALIGNMENT_PROP) === alignment) {
+			if (Number(childElement.getAttribute(StatusbarPart.ALIGNMENT_PROP)) === alignment) {
 				entries.push(childElement);
 			}
 		}
@@ -112,7 +109,7 @@ export class StatusbarPart extends Part implements IStatusbarService {
 		return entries;
 	}
 
-	public createContentArea(parent: HTMLElement): HTMLElement {
+	createContentArea(parent: HTMLElement): HTMLElement {
 		this.statusItemsContainer = parent;
 
 		// Fill in initial items that were contributed from the registry
@@ -122,16 +119,13 @@ export class StatusbarPart extends Part implements IStatusbarService {
 		const rightDescriptors = registry.items.filter(d => d.alignment === StatusbarAlignment.RIGHT).sort((a, b) => a.priority - b.priority);
 
 		const descriptors = rightDescriptors.concat(leftDescriptors); // right first because they float
-
-		this.toUnbind.push(...descriptors.map(descriptor => {
+		descriptors.forEach(descriptor => {
 			const item = this.instantiationService.createInstance(descriptor.syncDescriptor);
 			const el = this.doCreateStatusItem(descriptor.alignment, descriptor.priority);
 
-			const dispose = item.render(el);
+			this._register(item.render(el));
 			this.statusItemsContainer.appendChild(el);
-
-			return dispose;
-		}));
+		});
 
 		return this.statusItemsContainer;
 	}
@@ -139,22 +133,22 @@ export class StatusbarPart extends Part implements IStatusbarService {
 	protected updateStyles(): void {
 		super.updateStyles();
 
-		const container = $(this.getContainer());
+		const container = this.getContainer();
 
 		// Background colors
 		const backgroundColor = this.getColor(this.contextService.getWorkbenchState() !== WorkbenchState.EMPTY ? STATUS_BAR_BACKGROUND : STATUS_BAR_NO_FOLDER_BACKGROUND);
-		container.style('background-color', backgroundColor);
-		container.style('color', this.getColor(this.contextService.getWorkbenchState() !== WorkbenchState.EMPTY ? STATUS_BAR_FOREGROUND : STATUS_BAR_NO_FOLDER_FOREGROUND));
+		container.style.backgroundColor = backgroundColor;
+		container.style.color = this.getColor(this.contextService.getWorkbenchState() !== WorkbenchState.EMPTY ? STATUS_BAR_FOREGROUND : STATUS_BAR_NO_FOLDER_FOREGROUND);
 
 		// Border color
 		const borderColor = this.getColor(this.contextService.getWorkbenchState() !== WorkbenchState.EMPTY ? STATUS_BAR_BORDER : STATUS_BAR_NO_FOLDER_BORDER) || this.getColor(contrastBorder);
-		container.style('border-top-width', borderColor ? '1px' : null);
-		container.style('border-top-style', borderColor ? 'solid' : null);
-		container.style('border-top-color', borderColor);
+		container.style.borderTopWidth = borderColor ? '1px' : null;
+		container.style.borderTopStyle = borderColor ? 'solid' : null;
+		container.style.borderTopColor = borderColor;
 
 		// Notification Beak
 		if (!this.styleElement) {
-			this.styleElement = createStyleSheet(container.getHTMLElement());
+			this.styleElement = createStyleSheet(container);
 		}
 
 		this.styleElement.innerHTML = `.monaco-workbench > .part.statusbar > .statusbar-item.has-beak:before { border-bottom-color: ${backgroundColor}; }`;
@@ -173,13 +167,13 @@ export class StatusbarPart extends Part implements IStatusbarService {
 			addClass(el, 'left');
 		}
 
-		$(el).setProperty(StatusbarPart.PRIORITY_PROP, priority);
-		$(el).setProperty(StatusbarPart.ALIGNMENT_PROP, alignment);
+		el.setAttribute(StatusbarPart.PRIORITY_PROP, String(priority));
+		el.setAttribute(StatusbarPart.ALIGNMENT_PROP, String(alignment));
 
 		return el;
 	}
 
-	public setStatusMessage(message: string, autoDisposeAfter: number = -1, delayBy: number = 0): IDisposable {
+	setStatusMessage(message: string, autoDisposeAfter: number = -1, delayBy: number = 0): IDisposable {
 		if (this.statusMsgDispose) {
 			this.statusMsgDispose.dispose(); // dismiss any previous
 		}
@@ -238,7 +232,7 @@ class StatusBarEntryItem implements IStatusbarItem {
 		}
 	}
 
-	public render(el: HTMLElement): IDisposable {
+	render(el: HTMLElement): IDisposable {
 		let toDispose: IDisposable[] = [];
 		addClass(el, 'statusbar-entry');
 
@@ -247,7 +241,7 @@ class StatusBarEntryItem implements IStatusbarItem {
 		if (this.entry.command) {
 			textContainer = document.createElement('a');
 
-			$(textContainer).on('click', () => this.executeCommand(this.entry.command, this.entry.arguments), toDispose);
+			toDispose.push(addDisposableListener(textContainer, 'click', () => this.executeCommand(this.entry.command, this.entry.arguments)));
 		} else {
 			textContainer = document.createElement('span');
 		}
@@ -257,7 +251,7 @@ class StatusBarEntryItem implements IStatusbarItem {
 
 		// Tooltip
 		if (this.entry.tooltip) {
-			$(textContainer).title(this.entry.tooltip);
+			textContainer.title = this.entry.tooltip;
 		}
 
 		// Color
@@ -268,15 +262,15 @@ class StatusBarEntryItem implements IStatusbarItem {
 				color = (this.themeService.getTheme().getColor(colorId) || Color.transparent).toString();
 				toDispose.push(this.themeService.onThemeChange(theme => {
 					let colorValue = (this.themeService.getTheme().getColor(colorId) || Color.transparent).toString();
-					$(textContainer).color(colorValue);
+					textContainer.style.color = colorValue;
 				}));
 			}
-			$(textContainer).color(color);
+			textContainer.style.color = color;
 		}
 
 		// Context Menu
 		if (this.entry.extensionId) {
-			$(textContainer).on('contextmenu', e => {
+			toDispose.push(addDisposableListener(textContainer, 'contextmenu', e => {
 				EventHelper.stop(e, true);
 
 				this.contextMenuService.showContextMenu({
@@ -284,7 +278,7 @@ class StatusBarEntryItem implements IStatusbarItem {
 					getActionsContext: () => this.entry.extensionId,
 					getActions: () => TPromise.as([manageExtensionAction])
 				});
-			}, toDispose);
+			}));
 		}
 
 		el.appendChild(textContainer);
@@ -312,7 +306,7 @@ class StatusBarEntryItem implements IStatusbarItem {
 			}
 		*/
 		this.telemetryService.publicLog('workbenchActionExecuted', { id, from: 'status bar' });
-		this.commandService.executeCommand(id, ...args).done(undefined, err => this.notificationService.error(toErrorMessage(err)));
+		this.commandService.executeCommand(id, ...args).then(undefined, err => this.notificationService.error(toErrorMessage(err)));
 	}
 }
 
@@ -324,7 +318,7 @@ class ManageExtensionAction extends Action {
 		super('statusbar.manage.extension', nls.localize('manageExtension', "Manage Extension"));
 	}
 
-	public run(extensionId: string): TPromise<any> {
+	run(extensionId: string): TPromise<any> {
 		return this.commandService.executeCommand('_extensions.manage', extensionId);
 	}
 }
diff --git a/src/vs/workbench/browser/parts/titlebar/media/chrome-close-dark.svg b/src/vs/workbench/browser/parts/titlebar/media/chrome-close-dark.svg
new file mode 100644
index 00000000000..bb243036bb5
--- /dev/null
+++ b/src/vs/workbench/browser/parts/titlebar/media/chrome-close-dark.svg
@@ -0,0 +1 @@
+<svg width="11" height="11" viewBox="0 0 11 11" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M6.279 5.5L11 10.221l-.779.779L5.5 6.279.779 11 0 10.221 4.721 5.5 0 .779.779 0 5.5 4.721 10.221 0 11 .779 6.279 5.5z" fill="#fff"/></svg>
\ No newline at end of file
diff --git a/src/vs/workbench/browser/parts/titlebar/media/chrome-close.svg b/src/vs/workbench/browser/parts/titlebar/media/chrome-close.svg
new file mode 100644
index 00000000000..7abec27cd97
--- /dev/null
+++ b/src/vs/workbench/browser/parts/titlebar/media/chrome-close.svg
@@ -0,0 +1 @@
+<svg width="11" height="11" viewBox="0 0 11 11" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M6.279 5.5L11 10.221l-.779.779L5.5 6.279.779 11 0 10.221 4.721 5.5 0 .779.779 0 5.5 4.721 10.221 0 11 .779 6.279 5.5z" fill="#000"/></svg>
\ No newline at end of file
diff --git a/src/vs/workbench/browser/parts/titlebar/media/chrome-maximize-dark.svg b/src/vs/workbench/browser/parts/titlebar/media/chrome-maximize-dark.svg
new file mode 100644
index 00000000000..b6645e8c829
--- /dev/null
+++ b/src/vs/workbench/browser/parts/titlebar/media/chrome-maximize-dark.svg
@@ -0,0 +1 @@
+<svg width="11" height="11" viewBox="0 0 11 11" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M11 0v11H0V0h11zM9.899 1.101H1.1V9.9H9.9V1.1z" fill="#fff"/></svg>
\ No newline at end of file
diff --git a/src/vs/workbench/browser/parts/titlebar/media/chrome-maximize.svg b/src/vs/workbench/browser/parts/titlebar/media/chrome-maximize.svg
new file mode 100644
index 00000000000..781322be05f
--- /dev/null
+++ b/src/vs/workbench/browser/parts/titlebar/media/chrome-maximize.svg
@@ -0,0 +1 @@
+<svg width="11" height="11" viewBox="0 0 11 11" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M11 0v11H0V0h11zM9.899 1.101H1.1V9.9H9.9V1.1z" fill="#000"/></svg>
\ No newline at end of file
diff --git a/src/vs/workbench/browser/parts/titlebar/media/chrome-minimize-dark.svg b/src/vs/workbench/browser/parts/titlebar/media/chrome-minimize-dark.svg
new file mode 100644
index 00000000000..1f6a7016f85
--- /dev/null
+++ b/src/vs/workbench/browser/parts/titlebar/media/chrome-minimize-dark.svg
@@ -0,0 +1 @@
+<svg width="11" height="11" viewBox="0 0 11 11" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M11 4.399V5.5H0V4.399h11z" fill="#fff"/></svg>
\ No newline at end of file
diff --git a/src/vs/workbench/browser/parts/titlebar/media/chrome-minimize.svg b/src/vs/workbench/browser/parts/titlebar/media/chrome-minimize.svg
new file mode 100644
index 00000000000..80ecf45c9ab
--- /dev/null
+++ b/src/vs/workbench/browser/parts/titlebar/media/chrome-minimize.svg
@@ -0,0 +1 @@
+<svg width="11" height="11" viewBox="0 0 11 11" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M11 4.399V5.5H0V4.399h11z" fill="#000"/></svg>
\ No newline at end of file
diff --git a/src/vs/workbench/browser/parts/titlebar/media/chrome-restore-dark.svg b/src/vs/workbench/browser/parts/titlebar/media/chrome-restore-dark.svg
new file mode 100644
index 00000000000..d9f814370b0
--- /dev/null
+++ b/src/vs/workbench/browser/parts/titlebar/media/chrome-restore-dark.svg
@@ -0,0 +1 @@
+<svg width="11" height="11" viewBox="0 0 11 11" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M11 8.798H8.798V11H0V2.202h2.202V0H11v8.798zm-3.298-5.5h-6.6v6.6h6.6v-6.6zM9.9 1.1H3.298v1.101h5.5v5.5h1.1v-6.6z" fill="#fff"/></svg>
\ No newline at end of file
diff --git a/src/vs/workbench/browser/parts/titlebar/media/chrome-restore.svg b/src/vs/workbench/browser/parts/titlebar/media/chrome-restore.svg
new file mode 100644
index 00000000000..3ab78151c17
--- /dev/null
+++ b/src/vs/workbench/browser/parts/titlebar/media/chrome-restore.svg
@@ -0,0 +1 @@
+<svg width="11" height="11" viewBox="0 0 11 11" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M11 8.798H8.798V11H0V2.202h2.202V0H11v8.798zm-3.298-5.5h-6.6v6.6h6.6v-6.6zM9.9 1.1H3.298v1.101h5.5v5.5h1.1v-6.6z" fill="#000"/></svg>
\ No newline at end of file
diff --git a/src/vs/workbench/browser/parts/titlebar/media/code-icon.svg b/src/vs/workbench/browser/parts/titlebar/media/code-icon.svg
new file mode 100644
index 00000000000..cc61f81ea5a
--- /dev/null
+++ b/src/vs/workbench/browser/parts/titlebar/media/code-icon.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1024 1024"><style>.st0{fill:#f6f6f6;fill-opacity:0}.st1{fill:#fff}.st2{fill:#167abf}</style><path class="st0" d="M1024 1024H0V0h1024v1024z"/><path class="st1" d="M1024 85.333v853.333H0V85.333h1024z"/><path class="st2" d="M0 85.333h298.667v853.333H0V85.333zm1024 0v853.333H384V85.333h640zm-554.667 160h341.333v-64H469.333v64zm341.334 533.334H469.333v64h341.333l.001-64zm128-149.334H597.333v64h341.333l.001-64zm0-149.333H597.333v64h341.333l.001-64zm0-149.333H597.333v64h341.333l.001-64z"/></svg>
\ No newline at end of file
diff --git a/src/vs/workbench/browser/parts/titlebar/media/titlebarpart.css b/src/vs/workbench/browser/parts/titlebar/media/titlebarpart.css
index 12c110e78fe..42965aae65c 100644
--- a/src/vs/workbench/browser/parts/titlebar/media/titlebarpart.css
+++ b/src/vs/workbench/browser/parts/titlebar/media/titlebarpart.css
@@ -6,26 +6,196 @@
 .monaco-workbench > .part.titlebar {
 	box-sizing: border-box;
 	width: 100%;
-	font-size: 12px;
 	padding: 0 70px;
 	overflow: hidden;
 	flex-shrink: 0;
 	align-items: center;
 	justify-content: center;
 	user-select: none;
-	-webkit-app-region: drag;
 	zoom: 1; /* prevent zooming */
 	line-height: 22px;
 	height: 22px;
 	display: flex;
 }
 
+.monaco-workbench > .part.titlebar > .titlebar-drag-region {
+	top: 0;
+	left: 0;
+	display: block;
+	position: absolute;
+	width: 100%;
+	height: 100%;
+	z-index: -1;
+	-webkit-app-region: drag;
+}
+
 .monaco-workbench > .part.titlebar > .window-title {
 	flex: 0 1 auto;
+	font-size: 12px;
 	overflow: hidden;
 	white-space: nowrap;
-	line-height: 22px;
 	text-overflow: ellipsis;
-	-webkit-app-region: drag;
+	margin-left: auto;
+	margin-right: auto;
 	zoom: 1; /* prevent zooming */
+}
+
+/* Windows/Linux: Rules for custom title (icon, window controls)  */
+
+.monaco-workbench.windows > .part.titlebar,
+.monaco-workbench.linux > .part.titlebar {
+	padding: 0;
+	height: 30px;
+	line-height: 30px;
+	justify-content: left;
+	overflow: visible;
+}
+
+.monaco-workbench.linux > .part.titlebar > .window-title {
+	font-size: inherit;
+}
+
+.monaco-workbench.windows > .part.titlebar > .resizer,
+.monaco-workbench.linux > .part.titlebar > .resizer {
+	-webkit-app-region: no-drag;
+	position: absolute;
+	top: 0;
+	width: 100%;
+	height: 20%;
+}
+
+.monaco-workbench.windows.fullscreen > .part.titlebar > .resizer,
+.monaco-workbench.linux.fullscreen > .part.titlebar > .resizer {
+	display: none;
+}
+
+
+.monaco-workbench > .part.titlebar > .window-appicon {
+	width: 35px;
+	height: 100%;
+	position: relative;
+	z-index: 99;
+	background-image: url('code-icon.svg');
+	background-repeat: no-repeat;
+	background-position: center center;
+	background-size: 16px;
+	flex-shrink: 0;
+}
+
+.monaco-workbench.fullscreen > .part.titlebar > .window-appicon {
+	display: none;
+}
+
+.monaco-workbench > .part.titlebar > .window-controls-container {
+	display: flex;
+	flex-grow: 0;
+	flex-shrink: 0;
+	text-align: center;
+	position: relative;
+	z-index: 99;
+	-webkit-app-region: no-drag;
+	height: 100%;
+	width: 138px;
+}
+
+.monaco-workbench.fullscreen > .part.titlebar > .window-controls-container {
+	display: none;
+}
+
+.monaco-workbench > .part.titlebar > .window-controls-container > .window-icon-bg {
+	display: inline-block;
+	-webkit-app-region: no-drag;
+	height: 100%;
+	width: 33.34%;
+}
+
+.monaco-workbench > .part.titlebar > .window-controls-container .window-icon svg {
+	shape-rendering: crispEdges;
+	text-align: center;
+}
+
+.monaco-workbench > .part.titlebar.titlebar > .window-controls-container .window-close {
+	-webkit-mask: url('chrome-close.svg') no-repeat 50% 50%;
+}
+
+.monaco-workbench > .part.titlebar.titlebar > .window-controls-container .window-unmaximize {
+	-webkit-mask: url('chrome-restore.svg') no-repeat 50% 50%;
+}
+
+.monaco-workbench > .part.titlebar > .window-controls-container .window-maximize {
+	-webkit-mask: url('chrome-maximize.svg') no-repeat 50% 50%;
+}
+
+.monaco-workbench > .part.titlebar > .window-controls-container .window-minimize {
+	-webkit-mask: url('chrome-minimize.svg') no-repeat 50% 50%;
+}
+
+.monaco-workbench > .part.titlebar > .window-controls-container > .window-icon-bg > .window-icon {
+	height: 100%;
+	width: 100%;
+	-webkit-mask-size: 23.1%;
+}
+
+.monaco-workbench > .part.titlebar > .window-controls-container > .window-icon-bg:hover {
+	background-color: rgba(255, 255, 255, 0.1);
+}
+
+.monaco-workbench > .part.titlebar.light > .window-controls-container > .window-icon-bg:hover {
+	background-color: rgba(0, 0, 0, 0.1);
+}
+
+.monaco-workbench > .part.titlebar > .window-controls-container > .window-icon-bg.window-close-bg:hover {
+	background-color: rgba(232, 17, 35, 0.9);
+}
+
+.monaco-workbench > .part.titlebar > .window-controls-container .window-icon.window-close:hover {
+	background-color: white;
+}
+
+/* Menubar styles */
+
+.monaco-workbench .menubar {
+	display: flex;
+	flex-shrink: 1;
+	box-sizing: border-box;
+	height: 30px;
+	-webkit-app-region: no-drag;
+	overflow: hidden;
+	flex-wrap: wrap;
+}
+
+.monaco-workbench.fullscreen .menubar {
+	margin: 0px;
+	padding: 0px 5px;
+}
+
+.monaco-workbench .menubar > .menubar-menu-button {
+	align-items: center;
+	box-sizing: border-box;
+	padding: 0px 8px;
+	cursor: default;
+	-webkit-app-region: no-drag;
+	zoom: 1;
+	white-space: nowrap;
+}
+
+.monaco-workbench .menubar .menubar-menu-items-holder {
+	position: absolute;
+	left: 0px;
+	opacity: 1;
+	z-index: 2000;
+}
+
+.monaco-workbench .menubar .menubar-menu-items-holder.monaco-menu-container {
+	font-family: "Segoe WPC", "Segoe UI", ".SFNSDisplay-Light", "SFUIText-Light", "HelveticaNeue-Light", sans-serif, "Droid Sans Fallback";
+	outline: 0;
+	border: none;
+}
+
+.monaco-workbench .menubar .menubar-menu-items-holder.monaco-menu-container :focus {
+	outline: 0;
+}
+
+.hc-black .monaco-workbench .menubar .menubar-menu-items-holder.monaco-menu-container {
+	border: 2px solid #6FC3DF;
 }
\ No newline at end of file
diff --git a/src/vs/workbench/browser/parts/titlebar/menubarControl.ts b/src/vs/workbench/browser/parts/titlebar/menubarControl.ts
new file mode 100644
index 00000000000..e43deecb44d
--- /dev/null
+++ b/src/vs/workbench/browser/parts/titlebar/menubarControl.ts
@@ -0,0 +1,1381 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+import * as nls from 'vs/nls';
+import * as browser from 'vs/base/browser/browser';
+import * as strings from 'vs/base/common/strings';
+import { IMenubarMenu, IMenubarMenuItemAction, IMenubarMenuItemSubmenu, IMenubarKeybinding } from 'vs/platform/menubar/common/menubar';
+import { IMenuService, MenuId, IMenu, SubmenuItemAction } from 'vs/platform/actions/common/actions';
+import { IThemeService, registerThemingParticipant, ITheme, ICssStyleCollector } from 'vs/platform/theme/common/themeService';
+import { IWindowService, MenuBarVisibility, IWindowsService } from 'vs/platform/windows/common/windows';
+import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
+import { ActionRunner, IActionRunner, IAction, Action } from 'vs/base/common/actions';
+import { Separator } from 'vs/base/browser/ui/actionbar/actionbar';
+import * as DOM from 'vs/base/browser/dom';
+import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
+import { isMacintosh } from 'vs/base/common/platform';
+import { Menu, IMenuOptions, SubmenuAction, MENU_MNEMONIC_REGEX, cleanMnemonic, MENU_ESCAPED_MNEMONIC_REGEX } from 'vs/base/browser/ui/menu/menu';
+import { KeyCode, KeyCodeUtils } from 'vs/base/common/keyCodes';
+import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
+import { IConfigurationService, IConfigurationChangeEvent } from 'vs/platform/configuration/common/configuration';
+import { Event, Emitter } from 'vs/base/common/event';
+import { IDisposable, Disposable, dispose } from 'vs/base/common/lifecycle';
+import { domEvent } from 'vs/base/browser/event';
+import { IRecentlyOpened } from 'vs/platform/history/common/history';
+import { IWorkspaceIdentifier, ISingleFolderWorkspaceIdentifier, isSingleFolderWorkspaceIdentifier, isWorkspaceIdentifier } from 'vs/platform/workspaces/common/workspaces';
+import { RunOnceScheduler } from 'vs/base/common/async';
+import { MENUBAR_SELECTION_FOREGROUND, MENUBAR_SELECTION_BACKGROUND, MENUBAR_SELECTION_BORDER, TITLE_BAR_ACTIVE_FOREGROUND, TITLE_BAR_INACTIVE_FOREGROUND, MENU_BACKGROUND, MENU_FOREGROUND, MENU_SELECTION_BACKGROUND, MENU_SELECTION_FOREGROUND, MENU_SELECTION_BORDER } from 'vs/workbench/common/theme';
+import { URI } from 'vs/base/common/uri';
+import { ILabelService } from 'vs/platform/label/common/label';
+import { foreground } from 'vs/platform/theme/common/colorRegistry';
+import { IUpdateService, StateType } from 'vs/platform/update/common/update';
+import { Gesture, EventType, GestureEvent } from 'vs/base/browser/touch';
+
+const $ = DOM.$;
+
+interface CustomMenu {
+	title: string;
+	buttonElement: HTMLElement;
+	titleElement: HTMLElement;
+	actions?: IAction[];
+}
+
+enum MenubarState {
+	HIDDEN,
+	VISIBLE,
+	FOCUSED,
+	OPEN
+}
+
+export class MenubarControl extends Disposable {
+
+	private keys = [
+		'files.autoSave',
+		'window.menuBarVisibility',
+		'editor.multiCursorModifier',
+		'workbench.sideBar.location',
+		'workbench.statusBar.visible',
+		'workbench.activityBar.visible',
+		'window.enableMenuBarMnemonics',
+		'window.nativeTabs'
+	];
+
+	private topLevelMenus: {
+		'File': IMenu;
+		'Edit': IMenu;
+		'Selection': IMenu;
+		'View': IMenu;
+		'Go': IMenu;
+		'Debug': IMenu;
+		'Terminal': IMenu;
+		'Window'?: IMenu;
+		'Help': IMenu;
+		[index: string]: IMenu;
+	};
+
+	private topLevelTitles = {
+		'File': nls.localize({ key: 'mFile', comment: ['&& denotes a mnemonic'] }, "&&File"),
+		'Edit': nls.localize({ key: 'mEdit', comment: ['&& denotes a mnemonic'] }, "&&Edit"),
+		'Selection': nls.localize({ key: 'mSelection', comment: ['&& denotes a mnemonic'] }, "&&Selection"),
+		'View': nls.localize({ key: 'mView', comment: ['&& denotes a mnemonic'] }, "&&View"),
+		'Go': nls.localize({ key: 'mGoto', comment: ['&& denotes a mnemonic'] }, "&&Go"),
+		'Debug': nls.localize({ key: 'mDebug', comment: ['&& denotes a mnemonic'] }, "&&Debug"),
+		'Terminal': nls.localize({ key: 'mTerminal', comment: ['&& denotes a mnemonic'] }, "&&Terminal"),
+		'Help': nls.localize({ key: 'mHelp', comment: ['&& denotes a mnemonic'] }, "&&Help")
+	};
+
+	private focusedMenu: {
+		index: number;
+		holder?: HTMLElement;
+		widget?: Menu;
+	};
+
+	private customMenus: CustomMenu[];
+
+	private menuUpdater: RunOnceScheduler;
+	private actionRunner: IActionRunner;
+	private focusToReturn: HTMLElement;
+	private container: HTMLElement;
+	private recentlyOpened: IRecentlyOpened;
+	private updatePending: boolean;
+	private _focusState: MenubarState;
+
+	// Input-related
+	private _mnemonicsInUse: boolean;
+	private openedViaKeyboard: boolean;
+	private awaitingAltRelease: boolean;
+	private ignoreNextMouseUp: boolean;
+	private mnemonics: Map<KeyCode, number>;
+
+	private _onVisibilityChange: Emitter<boolean>;
+
+	private static MAX_MENU_RECENT_ENTRIES = 10;
+
+	constructor(
+		@IThemeService themeService: IThemeService,
+		@IMenuService private menuService: IMenuService,
+		@IWindowService private windowService: IWindowService,
+		@IWindowsService private windowsService: IWindowsService,
+		@IContextKeyService private contextKeyService: IContextKeyService,
+		@IKeybindingService private keybindingService: IKeybindingService,
+		@IConfigurationService private configurationService: IConfigurationService,
+		@ILabelService private labelService: ILabelService,
+		@IUpdateService private updateService: IUpdateService
+	) {
+
+		super();
+
+		this.topLevelMenus = {
+			'File': this._register(this.menuService.createMenu(MenuId.MenubarFileMenu, this.contextKeyService)),
+			'Edit': this._register(this.menuService.createMenu(MenuId.MenubarEditMenu, this.contextKeyService)),
+			'Selection': this._register(this.menuService.createMenu(MenuId.MenubarSelectionMenu, this.contextKeyService)),
+			'View': this._register(this.menuService.createMenu(MenuId.MenubarViewMenu, this.contextKeyService)),
+			'Go': this._register(this.menuService.createMenu(MenuId.MenubarGoMenu, this.contextKeyService)),
+			'Debug': this._register(this.menuService.createMenu(MenuId.MenubarDebugMenu, this.contextKeyService)),
+			'Terminal': this._register(this.menuService.createMenu(MenuId.MenubarTerminalMenu, this.contextKeyService)),
+			'Help': this._register(this.menuService.createMenu(MenuId.MenubarHelpMenu, this.contextKeyService))
+		};
+
+		if (isMacintosh) {
+			this.topLevelMenus['Preferences'] = this._register(this.menuService.createMenu(MenuId.MenubarPreferencesMenu, this.contextKeyService));
+		}
+
+		this.menuUpdater = this._register(new RunOnceScheduler(() => this.doSetupMenubar(), 200));
+
+		this.actionRunner = this._register(new ActionRunner());
+		this._register(this.actionRunner.onDidBeforeRun(() => {
+			this.setUnfocusedState();
+		}));
+
+		this._onVisibilityChange = this._register(new Emitter<boolean>());
+
+		if (isMacintosh || this.currentTitlebarStyleSetting !== 'custom') {
+			for (let topLevelMenuName of Object.keys(this.topLevelMenus)) {
+				this._register(this.topLevelMenus[topLevelMenuName].onDidChange(() => this.setupMenubar()));
+			}
+			this.doSetupMenubar();
+		}
+
+		this._focusState = MenubarState.HIDDEN;
+
+		this.windowService.getRecentlyOpened().then((recentlyOpened) => {
+			this.recentlyOpened = recentlyOpened;
+		});
+
+		this.registerListeners();
+	}
+
+	private get currentEnableMenuBarMnemonics(): boolean {
+		let enableMenuBarMnemonics = this.configurationService.getValue<boolean>('window.enableMenuBarMnemonics');
+		if (typeof enableMenuBarMnemonics !== 'boolean') {
+			enableMenuBarMnemonics = true;
+		}
+
+		return enableMenuBarMnemonics;
+	}
+
+	private get currentAutoSaveSetting(): string {
+		return this.configurationService.getValue<string>('files.autoSave');
+	}
+
+	private get currentSidebarPosition(): string {
+		return this.configurationService.getValue<string>('workbench.sideBar.location');
+	}
+
+	private get currentStatusBarVisibility(): boolean {
+		let setting = this.configurationService.getValue<boolean>('workbench.statusBar.visible');
+		if (typeof setting !== 'boolean') {
+			setting = true;
+		}
+
+		return setting;
+	}
+
+	private get currentActivityBarVisibility(): boolean {
+		let setting = this.configurationService.getValue<boolean>('workbench.activityBar.visible');
+		if (typeof setting !== 'boolean') {
+			setting = true;
+		}
+
+		return setting;
+	}
+
+	private get currentMenubarVisibility(): MenuBarVisibility {
+		return this.configurationService.getValue<MenuBarVisibility>('window.menuBarVisibility');
+	}
+
+	private get currentTitlebarStyleSetting(): string {
+		return this.configurationService.getValue<string>('window.titleBarStyle');
+	}
+
+	private get focusState(): MenubarState {
+		return this._focusState;
+	}
+
+	private set focusState(value: MenubarState) {
+		if (this._focusState >= MenubarState.FOCUSED && value < MenubarState.FOCUSED) {
+			// Losing focus, update the menu if needed
+
+			if (this.updatePending) {
+				this.menuUpdater.schedule();
+				this.updatePending = false;
+			}
+		}
+
+		if (value === this._focusState) {
+			return;
+		}
+
+		const isVisible = this.isVisible;
+		const isOpen = this.isOpen;
+		const isFocused = this.isFocused;
+
+		this._focusState = value;
+
+		switch (value) {
+			case MenubarState.HIDDEN:
+				if (isVisible) {
+					this.hideMenubar();
+				}
+
+				if (isOpen) {
+					this.cleanupCustomMenu();
+				}
+
+				if (isFocused) {
+					this.focusedMenu = null;
+
+					if (this.focusToReturn) {
+						this.focusToReturn.focus();
+						this.focusToReturn = null;
+					}
+				}
+
+
+				break;
+			case MenubarState.VISIBLE:
+				if (!isVisible) {
+					this.showMenubar();
+				}
+
+				if (isOpen) {
+					this.cleanupCustomMenu();
+				}
+
+				if (isFocused) {
+					if (this.focusedMenu) {
+						this.customMenus[this.focusedMenu.index].buttonElement.blur();
+					}
+
+					this.focusedMenu = null;
+
+					if (this.focusToReturn) {
+						this.focusToReturn.focus();
+						this.focusToReturn = null;
+					}
+				}
+
+				break;
+			case MenubarState.FOCUSED:
+				if (!isVisible) {
+					this.showMenubar();
+				}
+
+				if (isOpen) {
+					this.cleanupCustomMenu();
+				}
+
+				if (this.focusedMenu) {
+					this.customMenus[this.focusedMenu.index].buttonElement.focus();
+				}
+				break;
+			case MenubarState.OPEN:
+				if (!isVisible) {
+					this.showMenubar();
+				}
+
+				if (this.focusedMenu) {
+					this.showCustomMenu(this.focusedMenu.index, this.openedViaKeyboard);
+				}
+				break;
+		}
+
+		this._focusState = value;
+	}
+
+	private get mnemonicsInUse(): boolean {
+		return this._mnemonicsInUse;
+	}
+
+	private set mnemonicsInUse(value: boolean) {
+		this._mnemonicsInUse = value;
+	}
+
+	private get isVisible(): boolean {
+		return this.focusState >= MenubarState.VISIBLE;
+	}
+
+	private get isFocused(): boolean {
+		return this.focusState >= MenubarState.FOCUSED;
+	}
+
+	private get isOpen(): boolean {
+		return this.focusState >= MenubarState.OPEN;
+	}
+
+	private onDidChangeFullscreen(): void {
+		this.setUnfocusedState();
+	}
+
+	private onDidChangeWindowFocus(hasFocus: boolean): void {
+		if (this.container) {
+			if (hasFocus) {
+				DOM.removeClass(this.container, 'inactive');
+			} else {
+				DOM.addClass(this.container, 'inactive');
+				this.setUnfocusedState();
+				this.awaitingAltRelease = false;
+			}
+		}
+	}
+
+	private onConfigurationUpdated(event: IConfigurationChangeEvent): void {
+		if (this.keys.some(key => event.affectsConfiguration(key))) {
+			this.setupMenubar();
+		}
+
+		if (event.affectsConfiguration('window.menuBarVisibility')) {
+			this.setUnfocusedState();
+		}
+	}
+
+	private setUnfocusedState(): void {
+		if (this.currentMenubarVisibility === 'toggle' || this.currentMenubarVisibility === 'hidden') {
+			this.focusState = MenubarState.HIDDEN;
+		} else if (this.currentMenubarVisibility === 'default' && browser.isFullscreen()) {
+			this.focusState = MenubarState.HIDDEN;
+		} else {
+			this.focusState = MenubarState.VISIBLE;
+		}
+
+		this.ignoreNextMouseUp = false;
+		this.mnemonicsInUse = false;
+		this.updateMnemonicVisibility(false);
+	}
+
+	private hideMenubar(): void {
+		this.container.style.display = 'none';
+		this._onVisibilityChange.fire(false);
+	}
+
+	private showMenubar(): void {
+		this.container.style.display = 'flex';
+		this._onVisibilityChange.fire(true);
+	}
+
+	private onModifierKeyToggled(modifierKeyStatus: IModifierKeyStatus): void {
+		const allModifiersReleased = !modifierKeyStatus.altKey && !modifierKeyStatus.ctrlKey && !modifierKeyStatus.shiftKey;
+
+		if (this.currentMenubarVisibility === 'hidden') {
+			return;
+		}
+
+		// Alt key pressed while menu is focused. This should return focus away from the menubar
+		if (this.isFocused && modifierKeyStatus.lastKeyPressed === 'alt' && modifierKeyStatus.altKey) {
+			this.setUnfocusedState();
+			this.mnemonicsInUse = false;
+			this.awaitingAltRelease = true;
+		}
+
+		// Clean alt key press and release
+		if (allModifiersReleased && modifierKeyStatus.lastKeyPressed === 'alt' && modifierKeyStatus.lastKeyReleased === 'alt') {
+			if (!this.awaitingAltRelease) {
+				if (!this.isFocused) {
+					this.mnemonicsInUse = true;
+					this.focusedMenu = { index: 0 };
+					this.focusState = MenubarState.FOCUSED;
+				} else if (!this.isOpen) {
+					this.setUnfocusedState();
+				}
+			}
+		}
+
+		// Alt key released
+		if (!modifierKeyStatus.altKey && modifierKeyStatus.lastKeyReleased === 'alt') {
+			this.awaitingAltRelease = false;
+		}
+
+		if (this.currentEnableMenuBarMnemonics && this.customMenus && !this.isOpen) {
+			this.updateMnemonicVisibility((!this.awaitingAltRelease && modifierKeyStatus.altKey) || this.mnemonicsInUse);
+		}
+	}
+
+	private updateMnemonicVisibility(visible: boolean): void {
+		if (this.customMenus) {
+			this.customMenus.forEach(customMenu => {
+				if (customMenu.titleElement.children.length) {
+					let child = customMenu.titleElement.children.item(0) as HTMLElement;
+					if (child) {
+						child.style.textDecoration = visible ? 'underline' : null;
+					}
+				}
+			});
+		}
+	}
+
+	private onRecentlyOpenedChange(): void {
+		this.windowService.getRecentlyOpened().then(recentlyOpened => {
+			this.recentlyOpened = recentlyOpened;
+			this.setupMenubar();
+		});
+	}
+
+	private registerListeners(): void {
+		// Update when config changes
+		this._register(this.configurationService.onDidChangeConfiguration(e => this.onConfigurationUpdated(e)));
+
+		// Listen to update service
+		this.updateService.onStateChange(() => this.setupMenubar());
+
+		// Listen for context changes
+		this._register(this.contextKeyService.onDidChangeContext(() => this.setupMenubar()));
+
+		// Listen for changes in recently opened menu
+		this._register(this.windowsService.onRecentlyOpenedChange(() => { this.onRecentlyOpenedChange(); }));
+
+		// Listen to keybindings change
+		this._register(this.keybindingService.onDidUpdateKeybindings(() => this.setupMenubar()));
+
+		// These listeners only apply when the custom menubar is being used
+		if (!isMacintosh && this.currentTitlebarStyleSetting === 'custom') {
+			// Listen to fullscreen changes
+			this._register(browser.onDidChangeFullscreen(() => this.onDidChangeFullscreen()));
+
+			// Listen for alt key presses
+			this._register(ModifierKeyEmitter.getInstance(this.windowService).event(this.onModifierKeyToggled, this));
+
+			// Listen for window focus changes
+			this._register(this.windowService.onDidChangeFocus(e => this.onDidChangeWindowFocus(e)));
+		}
+	}
+
+	private doSetupMenubar(): void {
+		if (!isMacintosh && this.currentTitlebarStyleSetting === 'custom') {
+			this.setupCustomMenubar();
+		}
+
+		// TODO@sbatten Uncomment to bring back dynamic menubar
+		// else {
+		// 	// Send menus to main process to be rendered by Electron
+		// 	const menubarData = {};
+		// 	if (this.getMenubarMenus(menubarData)) {
+		// 		this.menubarService.updateMenubar(this.windowService.getCurrentWindowId(), menubarData, this.getAdditionalKeybindings());
+		// 	}
+		// }
+	}
+
+	private setupMenubar(): void {
+		this.menuUpdater.schedule();
+	}
+
+	private registerMnemonic(menuIndex: number, mnemonic: string): void {
+		this.mnemonics.set(KeyCodeUtils.fromString(mnemonic), menuIndex);
+	}
+
+	private setCheckedStatus(action: IAction | IMenubarMenuItemAction) {
+		switch (action.id) {
+			case 'workbench.action.toggleAutoSave':
+				action.checked = this.currentAutoSaveSetting !== 'off';
+				break;
+
+			default:
+				break;
+		}
+	}
+
+	private calculateActionLabel(action: IAction | IMenubarMenuItemAction): string {
+		let label = action.label;
+		switch (action.id) {
+			case 'workbench.action.toggleSidebarPosition':
+				if (this.currentSidebarPosition !== 'right') {
+					label = nls.localize({ key: 'miMoveSidebarRight', comment: ['&& denotes a mnemonic'] }, "&&Move Side Bar Right");
+				} else {
+					label = nls.localize({ key: 'miMoveSidebarLeft', comment: ['&& denotes a mnemonic'] }, "&&Move Side Bar Left");
+				}
+				break;
+
+			case 'workbench.action.toggleStatusbarVisibility':
+				if (this.currentStatusBarVisibility) {
+					label = nls.localize({ key: 'miHideStatusbar', comment: ['&& denotes a mnemonic'] }, "&&Hide Status Bar");
+				} else {
+					label = nls.localize({ key: 'miShowStatusbar', comment: ['&& denotes a mnemonic'] }, "&&Show Status Bar");
+				}
+				break;
+
+			case 'workbench.action.toggleActivityBarVisibility':
+				if (this.currentActivityBarVisibility) {
+					label = nls.localize({ key: 'miHideActivityBar', comment: ['&& denotes a mnemonic'] }, "Hide &&Activity Bar");
+				} else {
+					label = nls.localize({ key: 'miShowActivityBar', comment: ['&& denotes a mnemonic'] }, "Show &&Activity Bar");
+				}
+				break;
+
+			default:
+				break;
+		}
+
+		return label;
+	}
+
+	private createOpenRecentMenuAction(workspace: IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier | URI, commandId: string, isFile: boolean): IAction {
+
+		let label: string;
+		let uri: URI;
+
+		if (isSingleFolderWorkspaceIdentifier(workspace) && !isFile) {
+			label = this.labelService.getWorkspaceLabel(workspace, { verbose: true });
+			uri = workspace;
+		} else if (isWorkspaceIdentifier(workspace)) {
+			label = this.labelService.getWorkspaceLabel(workspace, { verbose: true });
+			uri = URI.file(workspace.configPath);
+		} else {
+			uri = workspace;
+			label = this.labelService.getUriLabel(uri);
+		}
+
+		return new Action(commandId, label, undefined, undefined, (event) => {
+			const openInNewWindow = event && ((!isMacintosh && (event.ctrlKey || event.shiftKey)) || (isMacintosh && (event.metaKey || event.altKey)));
+
+			return this.windowService.openWindow([uri], {
+				forceNewWindow: openInNewWindow,
+				forceOpenWorkspaceAsFile: isFile
+			});
+		});
+	}
+
+	private getOpenRecentActions(): IAction[] {
+		if (!this.recentlyOpened) {
+			return [];
+		}
+
+		const { workspaces, files } = this.recentlyOpened;
+
+		const result: IAction[] = [];
+
+		if (workspaces.length > 0) {
+			for (let i = 0; i < MenubarControl.MAX_MENU_RECENT_ENTRIES && i < workspaces.length; i++) {
+				result.push(this.createOpenRecentMenuAction(workspaces[i], 'openRecentWorkspace', false));
+			}
+
+			result.push(new Separator());
+		}
+
+		if (files.length > 0) {
+			for (let i = 0; i < MenubarControl.MAX_MENU_RECENT_ENTRIES && i < files.length; i++) {
+				result.push(this.createOpenRecentMenuAction(files[i], 'openRecentFile', false));
+			}
+
+			result.push(new Separator());
+		}
+
+		return result;
+	}
+
+	private getUpdateAction(): IAction | null {
+		const state = this.updateService.state;
+
+		switch (state.type) {
+			case StateType.Uninitialized:
+				return null;
+
+			case StateType.Idle:
+				const windowId = this.windowService.getCurrentWindowId();
+				return new Action('update.check', nls.localize('checkForUpdates', "Check for Updates..."), undefined, true, () =>
+					this.updateService.checkForUpdates({ windowId }));
+
+			case StateType.CheckingForUpdates:
+				return new Action('update.checking', nls.localize('checkingForUpdates', "Checking For Updates..."), undefined, false);
+
+			case StateType.AvailableForDownload:
+				return new Action('update.downloadNow', nls.localize('download now', "Download Now"), null, true, () =>
+					this.updateService.downloadUpdate());
+
+			case StateType.Downloading:
+				return new Action('update.downloading', nls.localize('DownloadingUpdate', "Downloading Update..."), undefined, false);
+
+			case StateType.Downloaded:
+				return new Action('update.install', nls.localize('installUpdate...', "Install Update..."), undefined, true, () =>
+					this.updateService.applyUpdate());
+
+			case StateType.Updating:
+				return new Action('update.updating', nls.localize('installingUpdate', "Installing Update..."), undefined, false);
+
+			case StateType.Ready:
+				return new Action('update.restart', nls.localize('restartToUpdate', "Restart to Update..."), undefined, true, () =>
+					this.updateService.quitAndInstall());
+		}
+	}
+
+	private insertActionsBefore(nextAction: IAction, target: IAction[]): void {
+		switch (nextAction.id) {
+			case 'workbench.action.openRecent':
+				target.push(...this.getOpenRecentActions());
+				break;
+
+			case 'workbench.action.showAboutDialog':
+				if (!isMacintosh) {
+					const updateAction = this.getUpdateAction();
+					if (updateAction) {
+						target.push(updateAction);
+						target.push(new Separator());
+					}
+				}
+
+				break;
+
+			default:
+				break;
+		}
+	}
+
+	private setupCustomMenubar(): void {
+		// Don't update while using the menu
+		if (this.isFocused) {
+			this.updatePending = true;
+			return;
+		}
+
+		this.container.attributes['role'] = 'menubar';
+
+		const firstTimeSetup = this.customMenus === undefined;
+		if (firstTimeSetup) {
+			this.customMenus = [];
+			this.mnemonics = new Map<KeyCode, number>();
+		}
+
+		let idx = 0;
+
+		for (let menuTitle of Object.keys(this.topLevelMenus)) {
+			const menu: IMenu = this.topLevelMenus[menuTitle];
+			let menuIndex = idx++;
+			const cleanMenuLabel = cleanMnemonic(this.topLevelTitles[menuTitle]);
+
+			// Create the top level menu button element
+			if (firstTimeSetup) {
+
+				const buttonElement = $('div.menubar-menu-button', { 'role': 'menuitem', 'tabindex': 0, 'aria-label': cleanMenuLabel, 'aria-haspopup': true });
+				const titleElement = $('div.menubar-menu-title', { 'role': 'none', 'aria-hidden': true });
+
+				buttonElement.appendChild(titleElement);
+				this.container.appendChild(buttonElement);
+
+				this.customMenus.push({
+					title: menuTitle,
+					buttonElement: buttonElement,
+					titleElement: titleElement
+				});
+			}
+
+			// Update the button label to reflect mnemonics
+			this.customMenus[menuIndex].titleElement.innerHTML = this.currentEnableMenuBarMnemonics ?
+				strings.escape(this.topLevelTitles[menuTitle]).replace(MENU_ESCAPED_MNEMONIC_REGEX, '<mnemonic aria-hidden="true">$1</mnemonic>') :
+				cleanMenuLabel;
+
+			let mnemonicMatches = MENU_MNEMONIC_REGEX.exec(this.topLevelTitles[menuTitle]);
+
+			// Register mnemonics
+			if (mnemonicMatches) {
+				let mnemonic = !!mnemonicMatches[1] ? mnemonicMatches[1] : mnemonicMatches[2];
+
+				if (firstTimeSetup) {
+					this.registerMnemonic(menuIndex, mnemonic);
+				}
+
+				if (this.currentEnableMenuBarMnemonics) {
+					this.customMenus[menuIndex].buttonElement.setAttribute('aria-keyshortcuts', 'Alt+' + mnemonic.toLocaleLowerCase());
+				} else {
+					this.customMenus[menuIndex].buttonElement.removeAttribute('aria-keyshortcuts');
+				}
+			}
+
+			// Update the menu actions
+			const updateActions = (menu: IMenu, target: IAction[]) => {
+				target.splice(0);
+				let groups = menu.getActions();
+				for (let group of groups) {
+					const [, actions] = group;
+
+					for (let action of actions) {
+						this.insertActionsBefore(action, target);
+						if (action instanceof SubmenuItemAction) {
+							const submenu = this.menuService.createMenu(action.item.submenu, this.contextKeyService);
+							const submenuActions = [];
+							updateActions(submenu, submenuActions);
+							target.push(new SubmenuAction(action.label, submenuActions));
+						} else {
+							action.label = this.calculateActionLabel(action);
+							this.setCheckedStatus(action);
+							target.push(action);
+						}
+					}
+
+					target.push(new Separator());
+				}
+
+				target.pop();
+			};
+
+			this.customMenus[menuIndex].actions = [];
+			if (firstTimeSetup) {
+				this._register(menu.onDidChange(() => updateActions(menu, this.customMenus[menuIndex].actions)));
+			}
+
+			updateActions(menu, this.customMenus[menuIndex].actions);
+
+			if (firstTimeSetup) {
+				this._register(DOM.addDisposableListener(this.customMenus[menuIndex].buttonElement, DOM.EventType.KEY_UP, (e) => {
+					let event = new StandardKeyboardEvent(e as KeyboardEvent);
+					let eventHandled = true;
+
+					if ((event.equals(KeyCode.DownArrow) || event.equals(KeyCode.Enter)) && !this.isOpen) {
+						this.focusedMenu = { index: menuIndex };
+						this.openedViaKeyboard = true;
+						this.focusState = MenubarState.OPEN;
+					} else {
+						eventHandled = false;
+					}
+
+					if (eventHandled) {
+						event.preventDefault();
+						event.stopPropagation();
+					}
+				}));
+
+				Gesture.addTarget(this.customMenus[menuIndex].buttonElement);
+				this._register(DOM.addDisposableListener(this.customMenus[menuIndex].buttonElement, EventType.Tap, (e: GestureEvent) => {
+					// Ignore this touch if the menu is touched
+					if (this.isOpen && this.focusedMenu.holder && DOM.isAncestor(e.initialTarget as HTMLElement, this.focusedMenu.holder)) {
+						return;
+					}
+
+					this.ignoreNextMouseUp = false;
+					this.onMenuTriggered(menuIndex, true);
+
+					e.preventDefault();
+					e.stopPropagation();
+				}));
+
+				this._register(DOM.addDisposableListener(this.customMenus[menuIndex].buttonElement, DOM.EventType.MOUSE_DOWN, (e) => {
+					if (!this.isOpen) {
+						// Open the menu with mouse down and ignore the following mouse up event
+						this.ignoreNextMouseUp = true;
+						this.onMenuTriggered(menuIndex, true);
+					} else {
+						this.ignoreNextMouseUp = false;
+					}
+
+					e.preventDefault();
+					e.stopPropagation();
+				}));
+
+				this._register(DOM.addDisposableListener(this.customMenus[menuIndex].buttonElement, DOM.EventType.MOUSE_UP, (e) => {
+					if (!this.ignoreNextMouseUp) {
+						this.onMenuTriggered(menuIndex, true);
+					} else {
+						this.ignoreNextMouseUp = false;
+					}
+
+					e.preventDefault();
+					e.stopPropagation();
+				}));
+
+				this._register(DOM.addDisposableListener(this.customMenus[menuIndex].buttonElement, DOM.EventType.CLICK, (e) => {
+					e.preventDefault();
+					e.stopPropagation();
+				}));
+
+				this._register(DOM.addDisposableListener(this.customMenus[menuIndex].buttonElement, DOM.EventType.MOUSE_ENTER, () => {
+					if (this.isOpen && !this.isCurrentMenu(menuIndex)) {
+						this.customMenus[menuIndex].buttonElement.focus();
+						this.cleanupCustomMenu();
+						this.showCustomMenu(menuIndex, false);
+					} else if (this.isFocused && !this.isOpen) {
+						this.focusedMenu = { index: menuIndex };
+						this.customMenus[menuIndex].buttonElement.focus();
+					}
+				}));
+			}
+		}
+
+		if (firstTimeSetup) {
+			this._register(DOM.addDisposableListener(this.container, DOM.EventType.KEY_DOWN, (e) => {
+				let event = new StandardKeyboardEvent(e as KeyboardEvent);
+				let eventHandled = true;
+				const key = !!e.key ? KeyCodeUtils.fromString(e.key) : KeyCode.Unknown;
+
+				if (event.equals(KeyCode.LeftArrow) || (event.shiftKey && event.keyCode === KeyCode.Tab)) {
+					this.focusPrevious();
+				} else if (event.equals(KeyCode.RightArrow) || event.equals(KeyCode.Tab)) {
+					this.focusNext();
+				} else if (event.equals(KeyCode.Escape) && this.isFocused && !this.isOpen) {
+					this.setUnfocusedState();
+				} else if (!this.isOpen && !event.ctrlKey && this.currentEnableMenuBarMnemonics && this.mnemonicsInUse && this.mnemonics.has(key)) {
+					const menuIndex = this.mnemonics.get(key);
+					this.onMenuTriggered(menuIndex, false);
+				} else {
+					eventHandled = false;
+				}
+
+				if (eventHandled) {
+					event.preventDefault();
+					event.stopPropagation();
+				}
+			}));
+
+			this._register(DOM.addDisposableListener(window, DOM.EventType.CLICK, () => {
+				// This click is outside the menubar so it counts as a focus out
+				if (this.isFocused) {
+					this.setUnfocusedState();
+				}
+			}));
+
+			this._register(DOM.addDisposableListener(this.container, DOM.EventType.FOCUS_IN, (e) => {
+				let event = e as FocusEvent;
+
+				if (event.relatedTarget) {
+					if (!this.container.contains(event.relatedTarget as HTMLElement)) {
+						this.focusToReturn = event.relatedTarget as HTMLElement;
+					}
+				}
+			}));
+
+			this._register(DOM.addDisposableListener(this.container, DOM.EventType.FOCUS_OUT, (e) => {
+				let event = e as FocusEvent;
+
+				if (event.relatedTarget) {
+					if (!this.container.contains(event.relatedTarget as HTMLElement)) {
+						this.focusToReturn = null;
+						this.setUnfocusedState();
+					}
+				}
+			}));
+
+			this._register(DOM.addDisposableListener(window, DOM.EventType.KEY_DOWN, (e) => {
+				if (!this.currentEnableMenuBarMnemonics || !e.altKey || e.ctrlKey) {
+					return;
+				}
+
+				const key = KeyCodeUtils.fromString(e.key);
+				if (!this.mnemonics.has(key)) {
+					return;
+				}
+
+				// Prevent conflicts with keybindings
+				const standardKeyboardEvent = new StandardKeyboardEvent(e);
+				const resolvedResult = this.keybindingService.softDispatch(standardKeyboardEvent, standardKeyboardEvent.target);
+				if (resolvedResult) {
+					return;
+				}
+
+				this.mnemonicsInUse = true;
+				this.updateMnemonicVisibility(true);
+
+				const menuIndex = this.mnemonics.get(key);
+				this.onMenuTriggered(menuIndex, false);
+			}));
+		}
+	}
+
+	private onMenuTriggered(menuIndex: number, clicked: boolean) {
+		if (this.isOpen) {
+			if (this.isCurrentMenu(menuIndex)) {
+				this.setUnfocusedState();
+			} else {
+				this.cleanupCustomMenu();
+				this.showCustomMenu(menuIndex, this.openedViaKeyboard);
+			}
+		} else {
+			this.focusedMenu = { index: menuIndex };
+			this.openedViaKeyboard = !clicked;
+			this.focusState = MenubarState.OPEN;
+		}
+	}
+
+	private focusPrevious(): void {
+
+		if (!this.focusedMenu) {
+			return;
+		}
+
+		let newFocusedIndex = (this.focusedMenu.index - 1 + this.customMenus.length) % this.customMenus.length;
+
+		if (newFocusedIndex === this.focusedMenu.index) {
+			return;
+		}
+
+		if (this.isOpen) {
+			this.cleanupCustomMenu();
+			this.showCustomMenu(newFocusedIndex);
+		} else if (this.isFocused) {
+			this.focusedMenu.index = newFocusedIndex;
+			this.customMenus[newFocusedIndex].buttonElement.focus();
+		}
+	}
+
+	private focusNext(): void {
+		if (!this.focusedMenu) {
+			return;
+		}
+
+		let newFocusedIndex = (this.focusedMenu.index + 1) % this.customMenus.length;
+
+		if (newFocusedIndex === this.focusedMenu.index) {
+			return;
+		}
+
+		if (this.isOpen) {
+			this.cleanupCustomMenu();
+			this.showCustomMenu(newFocusedIndex);
+		} else if (this.isFocused) {
+			this.focusedMenu.index = newFocusedIndex;
+			this.customMenus[newFocusedIndex].buttonElement.focus();
+		}
+	}
+
+	private getMenubarKeybinding(id: string): IMenubarKeybinding {
+		const binding = this.keybindingService.lookupKeybinding(id);
+		if (!binding) {
+			return null;
+		}
+
+		// first try to resolve a native accelerator
+		const electronAccelerator = binding.getElectronAccelerator();
+		if (electronAccelerator) {
+			return { id, label: electronAccelerator, isNative: true };
+		}
+
+		// we need this fallback to support keybindings that cannot show in electron menus (e.g. chords)
+		const acceleratorLabel = binding.getLabel();
+		if (acceleratorLabel) {
+			return { id, label: acceleratorLabel, isNative: false };
+		}
+
+		return null;
+	}
+
+	private populateMenuItems(menu: IMenu, menuToPopulate: IMenubarMenu) {
+		let groups = menu.getActions();
+		for (let group of groups) {
+			const [, actions] = group;
+
+			actions.forEach(menuItem => {
+
+				if (menuItem instanceof SubmenuItemAction) {
+					const submenu = { items: [] };
+					this.populateMenuItems(this.menuService.createMenu(menuItem.item.submenu, this.contextKeyService), submenu);
+
+					let menubarSubmenuItem: IMenubarMenuItemSubmenu = {
+						id: menuItem.id,
+						label: menuItem.label,
+						submenu: submenu
+					};
+
+					menuToPopulate.items.push(menubarSubmenuItem);
+				} else {
+					let menubarMenuItem: IMenubarMenuItemAction = {
+						id: menuItem.id,
+						label: menuItem.label,
+						checked: menuItem.checked,
+						enabled: menuItem.enabled,
+						keybinding: this.getMenubarKeybinding(menuItem.id)
+					};
+
+					this.setCheckedStatus(menubarMenuItem);
+					menubarMenuItem.label = this.calculateActionLabel(menubarMenuItem);
+
+					menuToPopulate.items.push(menubarMenuItem);
+				}
+			});
+
+			menuToPopulate.items.push({ id: 'vscode.menubar.separator' });
+		}
+
+		if (menuToPopulate.items.length > 0) {
+			menuToPopulate.items.pop();
+		}
+	}
+
+	// private getAdditionalKeybindings(): Array<IMenubarKeybinding> {
+	// 	const keybindings = [];
+	// 	if (isMacintosh) {
+	// 		keybindings.push(this.getMenubarKeybinding('workbench.action.quit'));
+	// 	}
+
+	// 	return keybindings;
+	// }
+
+	// private getMenubarMenus(menubarData: IMenubarData): boolean {
+	// 	if (!menubarData) {
+	// 		return false;
+	// 	}
+
+	// 	for (let topLevelMenuName of Object.keys(this.topLevelMenus)) {
+	// 		const menu = this.topLevelMenus[topLevelMenuName];
+	// 		let menubarMenu: IMenubarMenu = { items: [] };
+	// 		this.populateMenuItems(menu, menubarMenu);
+	// 		if (menubarMenu.items.length === 0) {
+	// 			// Menus are incomplete
+	// 			return false;
+	// 		}
+	// 		menubarData[topLevelMenuName] = menubarMenu;
+	// 	}
+
+	// 	return true;
+	// }
+
+	private isCurrentMenu(menuIndex: number): boolean {
+		if (!this.focusedMenu) {
+			return false;
+		}
+
+		return this.focusedMenu.index === menuIndex;
+	}
+
+	private cleanupCustomMenu(): void {
+		if (this.focusedMenu) {
+			// Remove focus from the menus first
+			this.customMenus[this.focusedMenu.index].buttonElement.focus();
+
+			if (this.focusedMenu.holder) {
+				DOM.removeClass(this.focusedMenu.holder.parentElement, 'open');
+				this.focusedMenu.holder.remove();
+			}
+
+			if (this.focusedMenu.widget) {
+				this.focusedMenu.widget.dispose();
+			}
+
+			this.focusedMenu = { index: this.focusedMenu.index };
+		}
+	}
+
+	private showCustomMenu(menuIndex: number, selectFirst = true): void {
+		const customMenu = this.customMenus[menuIndex];
+		const menuHolder = $('div.menubar-menu-items-holder');
+
+		DOM.addClass(customMenu.buttonElement, 'open');
+		menuHolder.style.top = `${this.container.clientHeight}px`;
+		menuHolder.style.left = `${customMenu.buttonElement.getBoundingClientRect().left}px`;
+
+		customMenu.buttonElement.appendChild(menuHolder);
+
+		let menuOptions: IMenuOptions = {
+			getKeyBinding: (action) => this.keybindingService.lookupKeybinding(action.id),
+			actionRunner: this.actionRunner,
+			enableMnemonics: this.mnemonicsInUse && this.currentEnableMenuBarMnemonics,
+			ariaLabel: customMenu.buttonElement.attributes['aria-label'].value
+		};
+
+		let menuWidget = this._register(new Menu(menuHolder, customMenu.actions, menuOptions));
+
+		this._register(menuWidget.onDidCancel(() => {
+			this.focusState = MenubarState.FOCUSED;
+		}));
+
+		this._register(menuWidget.onDidBlur(() => {
+			setTimeout(() => {
+				this.cleanupCustomMenu();
+			}, 100);
+		}));
+
+		menuWidget.focus(selectFirst);
+
+		this.focusedMenu = {
+			index: menuIndex,
+			holder: menuHolder,
+			widget: menuWidget
+		};
+	}
+
+	public get onVisibilityChange(): Event<boolean> {
+		return this._onVisibilityChange.event;
+	}
+
+	public layout(dimension: DOM.Dimension) {
+		if (this.container) {
+			this.container.style.height = `${dimension.height}px`;
+		}
+
+		if (!this.isVisible) {
+			this.hideMenubar();
+		} else {
+			this.showMenubar();
+		}
+	}
+
+	public getMenubarItemsDimensions(): DOM.Dimension {
+		if (this.customMenus) {
+			const left = this.customMenus[0].buttonElement.getBoundingClientRect().left;
+			const right = this.customMenus[this.customMenus.length - 1].buttonElement.getBoundingClientRect().right;
+			return new DOM.Dimension(right - left, this.container.clientHeight);
+		}
+
+		return new DOM.Dimension(0, 0);
+	}
+
+	public create(parent: HTMLElement): HTMLElement {
+		this.container = parent;
+
+		// Build the menubar
+		if (this.container) {
+			this.doSetupMenubar();
+
+			if (!isMacintosh && this.currentTitlebarStyleSetting === 'custom') {
+				this.setUnfocusedState();
+			}
+		}
+
+		return this.container;
+	}
+}
+
+registerThemingParticipant((theme: ITheme, collector: ICssStyleCollector) => {
+	const menubarActiveWindowFgColor = theme.getColor(TITLE_BAR_ACTIVE_FOREGROUND);
+	if (menubarActiveWindowFgColor) {
+		collector.addRule(`
+		.monaco-workbench .menubar > .menubar-menu-button {
+			color: ${menubarActiveWindowFgColor};
+		}
+		`);
+	}
+
+	const menubarInactiveWindowFgColor = theme.getColor(TITLE_BAR_INACTIVE_FOREGROUND);
+	if (menubarInactiveWindowFgColor) {
+		collector.addRule(`
+			.monaco-workbench .menubar.inactive > .menubar-menu-button {
+				color: ${menubarInactiveWindowFgColor};
+			}
+		`);
+	}
+
+
+	const menubarSelectedFgColor = theme.getColor(MENUBAR_SELECTION_FOREGROUND);
+	if (menubarSelectedFgColor) {
+		collector.addRule(`
+			.monaco-workbench .menubar > .menubar-menu-button.open,
+			.monaco-workbench .menubar > .menubar-menu-button:focus,
+			.monaco-workbench .menubar:not(:focus-within) > .menubar-menu-button:hover {
+				color: ${menubarSelectedFgColor};
+			}
+		`);
+	}
+
+	const menubarSelectedBgColor = theme.getColor(MENUBAR_SELECTION_BACKGROUND);
+	if (menubarSelectedBgColor) {
+		collector.addRule(`
+			.monaco-workbench .menubar > .menubar-menu-button.open,
+			.monaco-workbench .menubar > .menubar-menu-button:focus,
+			.monaco-workbench .menubar:not(:focus-within) > .menubar-menu-button:hover {
+				background-color: ${menubarSelectedBgColor};
+			}
+		`);
+	}
+
+	const menubarSelectedBorderColor = theme.getColor(MENUBAR_SELECTION_BORDER);
+	if (menubarSelectedBorderColor) {
+		collector.addRule(`
+			.monaco-workbench .menubar > .menubar-menu-button:hover {
+				outline: dashed 1px;
+			}
+
+			.monaco-workbench .menubar > .menubar-menu-button.open,
+			.monaco-workbench .menubar > .menubar-menu-button:focus {
+				outline: solid 1px;
+			}
+
+			.monaco-workbench .menubar > .menubar-menu-button.open,
+			.monaco-workbench .menubar > .menubar-menu-button:focus,
+			.monaco-workbench .menubar > .menubar-menu-button:hover {
+				outline-offset: -1px;
+				outline-color: ${menubarSelectedBorderColor};
+			}
+		`);
+	}
+
+	const menuShadow = theme.getColor('widget.shadow');
+	if (menuShadow) {
+		collector.addRule(`
+			.monaco-shell .monaco-workbench .monaco-menu-container {
+				box-shadow: 0 2px 4px ${menuShadow};
+			}
+		`);
+	}
+
+	const menuBgColor = theme.getColor(MENU_BACKGROUND);
+	if (menuBgColor) {
+		collector.addRule(`
+			.monaco-shell .monaco-menu .monaco-action-bar.vertical,
+			.monaco-shell .monaco-menu .monaco-action-bar.vertical .action-item {
+				background-color: ${menuBgColor};
+			}
+		`);
+	}
+
+	let menuFgColor = theme.getColor(MENU_FOREGROUND);
+	if (!menuFgColor) {
+		menuFgColor = theme.getColor(foreground);
+	}
+
+	if (menuFgColor) {
+		collector.addRule(`
+			.monaco-shell .monaco-menu .monaco-action-bar.vertical,
+			.monaco-shell .monaco-menu .monaco-action-bar.vertical .action-item {
+				color: ${menuFgColor};
+			}
+
+			.monaco-shell .monaco-menu .monaco-action-bar.vertical .action-item .action-menu-item .menu-item-check,
+			.monaco-shell .monaco-menu .monaco-action-bar.vertical .action-item .action-menu-item .submenu-indicator {
+				background-color: ${menuFgColor};
+			}
+		`);
+	}
+
+	const selectedMenuItemBgColor = theme.getColor(MENU_SELECTION_BACKGROUND);
+	if (menuBgColor) {
+		collector.addRule(`
+			.monaco-shell .monaco-menu .monaco-action-bar.vertical .action-item.focused {
+					background-color: ${selectedMenuItemBgColor};
+				}
+		`);
+	}
+
+	const selectedMenuItemFgColor = theme.getColor(MENU_SELECTION_FOREGROUND);
+	if (selectedMenuItemFgColor) {
+		collector.addRule(`
+		.monaco-shell .monaco-menu .monaco-action-bar.vertical .action-item.focused {
+				color: ${selectedMenuItemFgColor};
+			}
+
+		.monaco-shell .monaco-menu .monaco-action-bar.vertical .action-item.focused .action-menu-item .menu-item-check,
+		.monaco-shell .monaco-menu .monaco-action-bar.vertical .action-item.focused .action-menu-item .submenu-indicator {
+			background-color: ${selectedMenuItemFgColor};
+		}
+		`);
+	}
+
+	const selectedMenuItemBorderColor = theme.getColor(MENU_SELECTION_BORDER);
+	if (selectedMenuItemBorderColor) {
+		collector.addRule(`
+		.monaco-shell .monaco-menu .monaco-action-bar.vertical .action-item.focused {
+				border: 1px solid ${selectedMenuItemBorderColor};
+			}
+		`);
+	}
+});
+
+type ModifierKey = 'alt' | 'ctrl' | 'shift';
+
+interface IModifierKeyStatus {
+	altKey: boolean;
+	shiftKey: boolean;
+	ctrlKey: boolean;
+	lastKeyPressed?: ModifierKey;
+	lastKeyReleased?: ModifierKey;
+}
+
+
+class ModifierKeyEmitter extends Emitter<IModifierKeyStatus> {
+
+	private _subscriptions: IDisposable[] = [];
+	private _keyStatus: IModifierKeyStatus;
+	private static instance: ModifierKeyEmitter;
+
+	private constructor(windowService: IWindowService) {
+		super();
+
+		this._keyStatus = {
+			altKey: false,
+			shiftKey: false,
+			ctrlKey: false
+		};
+
+		this._subscriptions.push(domEvent(document.body, 'keydown')(e => {
+			const event = new StandardKeyboardEvent(e);
+
+			if (e.altKey && !this._keyStatus.altKey) {
+				this._keyStatus.lastKeyPressed = 'alt';
+			} else if (e.ctrlKey && !this._keyStatus.ctrlKey) {
+				this._keyStatus.lastKeyPressed = 'ctrl';
+			} else if (e.shiftKey && !this._keyStatus.shiftKey) {
+				this._keyStatus.lastKeyPressed = 'shift';
+			} else if (event.keyCode !== KeyCode.Alt) {
+				this._keyStatus.lastKeyPressed = undefined;
+			} else {
+				return;
+			}
+
+			this._keyStatus.altKey = e.altKey;
+			this._keyStatus.ctrlKey = e.ctrlKey;
+			this._keyStatus.shiftKey = e.shiftKey;
+
+			if (this._keyStatus.lastKeyPressed) {
+				this.fire(this._keyStatus);
+			}
+		}));
+		this._subscriptions.push(domEvent(document.body, 'keyup')(e => {
+			if (!e.altKey && this._keyStatus.altKey) {
+				this._keyStatus.lastKeyReleased = 'alt';
+			} else if (!e.ctrlKey && this._keyStatus.ctrlKey) {
+				this._keyStatus.lastKeyReleased = 'ctrl';
+			} else if (!e.shiftKey && this._keyStatus.shiftKey) {
+				this._keyStatus.lastKeyReleased = 'shift';
+			} else {
+				this._keyStatus.lastKeyReleased = undefined;
+			}
+
+			if (this._keyStatus.lastKeyPressed !== this._keyStatus.lastKeyReleased) {
+				this._keyStatus.lastKeyPressed = undefined;
+			}
+
+			this._keyStatus.altKey = e.altKey;
+			this._keyStatus.ctrlKey = e.ctrlKey;
+			this._keyStatus.shiftKey = e.shiftKey;
+
+			if (this._keyStatus.lastKeyReleased) {
+				this.fire(this._keyStatus);
+			}
+		}));
+		this._subscriptions.push(domEvent(document.body, 'mousedown')(e => {
+			this._keyStatus.lastKeyPressed = undefined;
+		}));
+
+		this._subscriptions.push(windowService.onDidChangeFocus(focused => {
+			if (!focused) {
+				this._keyStatus.lastKeyPressed = undefined;
+				this._keyStatus.lastKeyReleased = undefined;
+				this._keyStatus.altKey = false;
+				this._keyStatus.shiftKey = false;
+				this._keyStatus.shiftKey = false;
+
+				this.fire(this._keyStatus);
+			}
+		}));
+	}
+
+	static getInstance(windowService: IWindowService) {
+		if (!ModifierKeyEmitter.instance) {
+			ModifierKeyEmitter.instance = new ModifierKeyEmitter(windowService);
+		}
+
+		return ModifierKeyEmitter.instance;
+	}
+
+	dispose() {
+		super.dispose();
+		this._subscriptions = dispose(this._subscriptions);
+	}
+}
diff --git a/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts b/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts
index 63be5a66917..3c10e3bb14d 100644
--- a/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts
+++ b/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts
@@ -7,12 +7,11 @@
 
 import 'vs/css!./media/titlebarpart';
 import { TPromise } from 'vs/base/common/winjs.base';
-import { Builder, $ } from 'vs/base/browser/builder';
 import * as paths from 'vs/base/common/paths';
 import { Part } from 'vs/workbench/browser/part';
 import { ITitleService, ITitleProperties } from 'vs/workbench/services/title/common/titleService';
 import { getZoomFactor } from 'vs/base/browser/browser';
-import { IWindowService, IWindowsService } from 'vs/platform/windows/common/windows';
+import { IWindowService, IWindowsService, MenuBarVisibility } from 'vs/platform/windows/common/windows';
 import * as errors from 'vs/base/common/errors';
 import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
 import { StandardMouseEvent } from 'vs/base/browser/mouseEvent';
@@ -21,20 +20,25 @@ import { IConfigurationService, IConfigurationChangeEvent } from 'vs/platform/co
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import * as nls from 'vs/nls';
-import * as labels from 'vs/base/common/labels';
 import { EditorInput, toResource, Verbosity } from 'vs/workbench/common/editor';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
+import { IThemeService, registerThemingParticipant, ITheme, ICssStyleCollector } from 'vs/platform/theme/common/themeService';
 import { TITLE_BAR_ACTIVE_BACKGROUND, TITLE_BAR_ACTIVE_FOREGROUND, TITLE_BAR_INACTIVE_FOREGROUND, TITLE_BAR_INACTIVE_BACKGROUND, TITLE_BAR_BORDER } from 'vs/workbench/common/theme';
-import { isMacintosh, isWindows } from 'vs/base/common/platform';
-import URI from 'vs/base/common/uri';
+import { isMacintosh, isWindows, isLinux } from 'vs/base/common/platform';
+import { URI } from 'vs/base/common/uri';
+import { Color } from 'vs/base/common/color';
 import { trim } from 'vs/base/common/strings';
-import { addDisposableListener, EventType, EventHelper, Dimension } from 'vs/base/browser/dom';
+import { EventType, EventHelper, Dimension, isAncestor, hide, show, removeClass, addClass, append, $, addDisposableListener } from 'vs/base/browser/dom';
+import { MenubarControl } from 'vs/workbench/browser/parts/titlebar/menubarControl';
+import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { template, getBaseLabel } from 'vs/base/common/labels';
+import { ILabelService } from 'vs/platform/label/common/label';
+import { Event } from 'vs/base/common/event';
 
 export class TitlebarPart extends Part implements ITitleService {
 
-	public _serviceBrand: any;
+	_serviceBrand: any;
 
 	private static readonly NLS_UNSUPPORTED = nls.localize('patchedWindowTitle', "[Unsupported]");
 	private static readonly NLS_USER_IS_ADMIN = isWindows ? nls.localize('userIsAdmin', "[Administrator]") : nls.localize('userIsSudo', "[Superuser]");
@@ -42,12 +46,27 @@ export class TitlebarPart extends Part implements ITitleService {
 	private static readonly TITLE_DIRTY = '\u25cf ';
 	private static readonly TITLE_SEPARATOR = isMacintosh ? ' — ' : ' - '; // macOS uses special - separator
 
-	private titleContainer: Builder;
-	private title: Builder;
+	private titleContainer: HTMLElement;
+	private title: HTMLElement;
+	private dragRegion: HTMLElement;
+	private windowControls: HTMLElement;
+	private maxRestoreControl: HTMLElement;
+	private appIcon: HTMLElement;
+	private menubarPart: MenubarControl;
+	private menubar: HTMLElement;
+	private resizer: HTMLElement;
+
 	private pendingTitle: string;
-	private initialTitleFontSize: number;
 	private representedFileName: string;
 
+	private initialSizing: {
+		titleFontSize?: number;
+		titlebarHeight?: number;
+		controlsWidth?: number;
+		appIconSize?: number;
+		appIconWidth?: number;
+	} = Object.create(null);
+
 	private isInactive: boolean;
 
 	private properties: ITitleProperties;
@@ -62,7 +81,9 @@ export class TitlebarPart extends Part implements ITitleService {
 		@IEditorService private editorService: IEditorService,
 		@IEnvironmentService private environmentService: IEnvironmentService,
 		@IWorkspaceContextService private contextService: IWorkspaceContextService,
-		@IThemeService themeService: IThemeService
+		@IInstantiationService private instantiationService: IInstantiationService,
+		@IThemeService themeService: IThemeService,
+		@ILabelService private labelService: ILabelService
 	) {
 		super(id, { hasTitle: false }, themeService);
 
@@ -73,13 +94,13 @@ export class TitlebarPart extends Part implements ITitleService {
 	}
 
 	private registerListeners(): void {
-		this.toUnbind.push(addDisposableListener(window, EventType.BLUR, () => this.onBlur()));
-		this.toUnbind.push(addDisposableListener(window, EventType.FOCUS, () => this.onFocus()));
-		this.toUnbind.push(this.configurationService.onDidChangeConfiguration(e => this.onConfigurationChanged(e)));
-		this.toUnbind.push(this.editorService.onDidActiveEditorChange(() => this.onActiveEditorChange()));
-		this.toUnbind.push(this.contextService.onDidChangeWorkspaceFolders(() => this.setTitle(this.getWindowTitle())));
-		this.toUnbind.push(this.contextService.onDidChangeWorkbenchState(() => this.setTitle(this.getWindowTitle())));
-		this.toUnbind.push(this.contextService.onDidChangeWorkspaceName(() => this.setTitle(this.getWindowTitle())));
+		this._register(this.windowService.onDidChangeFocus(focused => focused ? this.onFocus() : this.onBlur()));
+		this._register(this.configurationService.onDidChangeConfiguration(e => this.onConfigurationChanged(e)));
+		this._register(this.editorService.onDidActiveEditorChange(() => this.onActiveEditorChange()));
+		this._register(this.contextService.onDidChangeWorkspaceFolders(() => this.setTitle(this.getWindowTitle())));
+		this._register(this.contextService.onDidChangeWorkbenchState(() => this.setTitle(this.getWindowTitle())));
+		this._register(this.contextService.onDidChangeWorkspaceName(() => this.setTitle(this.getWindowTitle())));
+		this._register(this.labelService.onDidRegisterFormatter(() => this.setTitle(this.getWindowTitle())));
 	}
 
 	private onBlur(): void {
@@ -98,6 +119,25 @@ export class TitlebarPart extends Part implements ITitleService {
 		}
 	}
 
+	private onMenubarVisibilityChanged(visible: boolean) {
+		if (isWindows || isLinux) {
+			// Hide title when toggling menu bar
+			if (this.configurationService.getValue<MenuBarVisibility>('window.menuBarVisibility') === 'toggle' && visible) {
+				this.title.style.visibility = 'hidden';
+
+				// Hack to fix issue #52522 with layered webkit-app-region elements appearing under cursor
+				hide(this.dragRegion);
+				setTimeout(() => show(this.dragRegion), 50);
+			} else {
+				this.title.style.visibility = null;
+			}
+		}
+	}
+
+	onMenubarVisibilityChange(): Event<boolean> {
+		return this.menubarPart.onVisibilityChange;
+	}
+
 	private onActiveEditorChange(): void {
 
 		// Dispose old listeners
@@ -156,7 +196,7 @@ export class TitlebarPart extends Part implements ITitleService {
 		return title;
 	}
 
-	public updateProperties(properties: ITitleProperties): void {
+	updateProperties(properties: ITitleProperties): void {
 		const isAdmin = typeof properties.isAdmin === 'boolean' ? properties.isAdmin : this.properties.isAdmin;
 		const isPure = typeof properties.isPure === 'boolean' ? properties.isPure : this.properties.isPure;
 
@@ -202,16 +242,16 @@ export class TitlebarPart extends Part implements ITitleService {
 		const activeEditorShort = editor ? editor.getTitle(Verbosity.SHORT) : '';
 		const activeEditorMedium = editor ? editor.getTitle(Verbosity.MEDIUM) : activeEditorShort;
 		const activeEditorLong = editor ? editor.getTitle(Verbosity.LONG) : activeEditorMedium;
-		const rootName = workspace.name;
-		const rootPath = root ? labels.getPathLabel(root, void 0, this.environmentService) : '';
+		const rootName = this.labelService.getWorkspaceLabel(workspace);
+		const rootPath = root ? this.labelService.getUriLabel(root) : '';
 		const folderName = folder ? folder.name : '';
-		const folderPath = folder ? labels.getPathLabel(folder.uri, void 0, this.environmentService) : '';
+		const folderPath = folder ? this.labelService.getUriLabel(folder.uri) : '';
 		const dirty = editor && editor.isDirty() ? TitlebarPart.TITLE_DIRTY : '';
 		const appName = this.environmentService.appNameLong;
 		const separator = TitlebarPart.TITLE_SEPARATOR;
 		const titleTemplate = this.configurationService.getValue<string>('window.title');
 
-		return labels.template(titleTemplate, {
+		return template(titleTemplate, {
 			activeEditorShort,
 			activeEditorLong,
 			activeEditorMedium,
@@ -225,43 +265,136 @@ export class TitlebarPart extends Part implements ITitleService {
 		});
 	}
 
-	public createContentArea(parent: HTMLElement): HTMLElement {
-		this.titleContainer = $(parent);
+	createContentArea(parent: HTMLElement): HTMLElement {
+		this.titleContainer = parent;
+
+		// Draggable region that we can manipulate for #52522
+		this.dragRegion = append(this.titleContainer, $('div.titlebar-drag-region'));
+
+		// App Icon (Windows/Linux)
+		if (!isMacintosh) {
+			this.appIcon = append(this.titleContainer, $('div.window-appicon'));
+		}
+
+		// Menubar: the menubar part which is responsible for populating both the custom and native menubars
+		this.menubarPart = this.instantiationService.createInstance(MenubarControl);
+		this.menubar = append(this.titleContainer, $('div.menubar'));
+		this.menubar.setAttribute('role', 'menubar');
+
+		this.menubarPart.create(this.menubar);
+
+		if (!isMacintosh) {
+			this._register(this.menubarPart.onVisibilityChange(e => this.onMenubarVisibilityChanged(e)));
+		}
 
 		// Title
-		this.title = $(this.titleContainer).div({ class: 'window-title' });
+		this.title = append(this.titleContainer, $('div.window-title'));
 		if (this.pendingTitle) {
-			this.title.text(this.pendingTitle);
+			this.title.innerText = this.pendingTitle;
+		} else {
+			this.setTitle(this.getWindowTitle());
 		}
 
 		// Maximize/Restore on doubleclick
-		this.titleContainer.on(EventType.DBLCLICK, (e) => {
-			EventHelper.stop(e);
-
-			this.onTitleDoubleclick();
-		});
-
-		// Context menu on title
-		this.title.on([EventType.CONTEXT_MENU, EventType.MOUSE_DOWN], (e: MouseEvent) => {
-			if (e.type === EventType.CONTEXT_MENU || e.metaKey) {
+		if (isMacintosh) {
+			this._register(addDisposableListener(this.titleContainer, EventType.DBLCLICK, e => {
 				EventHelper.stop(e);
 
-				this.onContextMenu(e);
-			}
+				this.onTitleDoubleclick();
+			}));
+		}
+
+		// Context menu on title
+		[EventType.CONTEXT_MENU, EventType.MOUSE_DOWN].forEach(event => {
+			this._register(addDisposableListener(this.title, event, e => {
+				if (e.type === EventType.CONTEXT_MENU || e.metaKey) {
+					EventHelper.stop(e);
+
+					this.onContextMenu(e);
+				}
+			}));
 		});
 
+		// Window Controls (Windows/Linux)
+		if (!isMacintosh) {
+			this.windowControls = append(this.titleContainer, $('div.window-controls-container'));
+
+
+			// Minimize
+			const minimizeIconContainer = append(this.windowControls, $('div.window-icon-bg'));
+			const minimizeIcon = append(minimizeIconContainer, $('div.window-icon'));
+			addClass(minimizeIcon, 'window-minimize');
+			this._register(addDisposableListener(minimizeIcon, EventType.CLICK, e => {
+				this.windowService.minimizeWindow();
+			}));
+
+			// Restore
+			const restoreIconContainer = append(this.windowControls, $('div.window-icon-bg'));
+			this.maxRestoreControl = append(restoreIconContainer, $('div.window-icon'));
+			addClass(this.maxRestoreControl, 'window-max-restore');
+			this._register(addDisposableListener(this.maxRestoreControl, EventType.CLICK, e => {
+				this.windowService.isMaximized().then((maximized) => {
+					if (maximized) {
+						return this.windowService.unmaximizeWindow();
+					}
+
+					return this.windowService.maximizeWindow();
+				});
+			}));
+
+			// Close
+			const closeIconContainer = append(this.windowControls, $('div.window-icon-bg'));
+			addClass(closeIconContainer, 'window-close-bg');
+			const closeIcon = append(closeIconContainer, $('div.window-icon'));
+			addClass(closeIcon, 'window-close');
+			this._register(addDisposableListener(closeIcon, EventType.CLICK, e => {
+				this.windowService.closeWindow();
+			}));
+
+			// Resizer
+			this.resizer = append(this.titleContainer, $('div.resizer'));
+
+			const isMaximized = this.windowService.getConfiguration().maximized ? true : false;
+			this.onDidChangeMaximized(isMaximized);
+			this.windowService.onDidChangeMaximize(this.onDidChangeMaximized, this);
+		}
+
 		// Since the title area is used to drag the window, we do not want to steal focus from the
 		// currently active element. So we restore focus after a timeout back to where it was.
-		this.titleContainer.on([EventType.MOUSE_DOWN], () => {
+		this._register(addDisposableListener(this.titleContainer, EventType.MOUSE_DOWN, e => {
+			if (e.target && isAncestor(e.target as HTMLElement, this.menubar)) {
+				return;
+			}
+
 			const active = document.activeElement;
 			setTimeout(() => {
 				if (active instanceof HTMLElement) {
 					active.focus();
 				}
 			}, 0 /* need a timeout because we are in capture phase */);
-		}, void 0, true /* use capture to know the currently active element properly */);
+		}, true /* use capture to know the currently active element properly */));
 
-		return this.titleContainer.getHTMLElement();
+		return this.titleContainer;
+	}
+
+	private onDidChangeMaximized(maximized: boolean) {
+		if (this.maxRestoreControl) {
+			if (maximized) {
+				removeClass(this.maxRestoreControl, 'window-maximize');
+				addClass(this.maxRestoreControl, 'window-unmaximize');
+			} else {
+				removeClass(this.maxRestoreControl, 'window-unmaximize');
+				addClass(this.maxRestoreControl, 'window-maximize');
+			}
+		}
+
+		if (this.resizer) {
+			if (maximized) {
+				hide(this.resizer);
+			} else {
+				show(this.resizer);
+			}
+		}
 	}
 
 	protected updateStyles(): void {
@@ -269,11 +402,25 @@ export class TitlebarPart extends Part implements ITitleService {
 
 		// Part container
 		if (this.titleContainer) {
-			this.titleContainer.style('color', this.getColor(this.isInactive ? TITLE_BAR_INACTIVE_FOREGROUND : TITLE_BAR_ACTIVE_FOREGROUND));
-			this.titleContainer.style('background-color', this.getColor(this.isInactive ? TITLE_BAR_INACTIVE_BACKGROUND : TITLE_BAR_ACTIVE_BACKGROUND));
+			if (this.isInactive) {
+				addClass(this.titleContainer, 'inactive');
+			} else {
+				removeClass(this.titleContainer, 'inactive');
+			}
+
+			const titleBackground = this.getColor(this.isInactive ? TITLE_BAR_INACTIVE_BACKGROUND : TITLE_BAR_ACTIVE_BACKGROUND);
+			this.titleContainer.style.backgroundColor = titleBackground;
+			if (Color.fromHex(titleBackground).isLighter()) {
+				addClass(this.titleContainer, 'light');
+			} else {
+				removeClass(this.titleContainer, 'light');
+			}
+
+			const titleForeground = this.getColor(this.isInactive ? TITLE_BAR_INACTIVE_FOREGROUND : TITLE_BAR_ACTIVE_FOREGROUND);
+			this.titleContainer.style.color = titleForeground;
 
 			const titleBorder = this.getColor(TITLE_BAR_BORDER);
-			this.titleContainer.style('border-bottom', titleBorder ? `1px solid ${titleBorder}` : null);
+			this.titleContainer.style.borderBottom = titleBorder ? `1px solid ${titleBorder}` : null;
 		}
 	}
 
@@ -315,9 +462,9 @@ export class TitlebarPart extends Part implements ITitleService {
 
 				let label: string;
 				if (!isFile) {
-					label = labels.getBaseLabel(paths.dirname(path));
+					label = getBaseLabel(paths.dirname(path));
 				} else {
-					label = labels.getBaseLabel(path);
+					label = getBaseLabel(path);
 				}
 
 				actions.push(new ShowItemInFolderAction(path, label || paths.sep, this.windowsService));
@@ -327,26 +474,86 @@ export class TitlebarPart extends Part implements ITitleService {
 		return actions;
 	}
 
-	public setTitle(title: string): void {
+	setTitle(title: string): void {
 
 		// Always set the native window title to identify us properly to the OS
 		window.document.title = title;
 
 		// Apply if we can
 		if (this.title) {
-			this.title.text(title);
+			this.title.innerText = title;
 		} else {
 			this.pendingTitle = title;
 		}
 	}
 
-	public layout(dimension: Dimension): Dimension[] {
-
-		// To prevent zooming we need to adjust the font size with the zoom factor
-		if (typeof this.initialTitleFontSize !== 'number') {
-			this.initialTitleFontSize = parseInt(this.titleContainer.getComputedStyle().fontSize, 10);
+	private updateLayout(dimension: Dimension) {
+		// Store initital title sizing if we need to prevent zooming
+		if (typeof this.initialSizing.titleFontSize !== 'number') {
+			this.initialSizing.titleFontSize = parseInt(getComputedStyle(this.title).fontSize, 10);
 		}
-		this.titleContainer.style({ fontSize: `${this.initialTitleFontSize / getZoomFactor()}px` });
+
+		if (typeof this.initialSizing.titlebarHeight !== 'number') {
+			this.initialSizing.titlebarHeight = parseInt(getComputedStyle(this.title).height, 10);
+		}
+
+		// Only prevent zooming behavior on macOS or when the menubar is not visible
+		if (isMacintosh || this.configurationService.getValue<MenuBarVisibility>('window.menuBarVisibility') === 'hidden') {
+			// To prevent zooming we need to adjust the font size with the zoom factor
+			const newHeight = this.initialSizing.titlebarHeight / getZoomFactor();
+			this.title.style.fontSize = `${this.initialSizing.titleFontSize / getZoomFactor()}px`;
+			this.title.style.lineHeight = `${newHeight}px`;
+
+			// Windows/Linux specific layout
+			if (isWindows || isLinux) {
+				if (typeof this.initialSizing.controlsWidth !== 'number') {
+					this.initialSizing.controlsWidth = parseInt(getComputedStyle(this.windowControls).width, 10);
+				}
+
+				const appIconComputedStyles = getComputedStyle(this.appIcon);
+				if (typeof this.initialSizing.appIconWidth !== 'number') {
+					this.initialSizing.appIconWidth = parseInt(appIconComputedStyles.width, 10);
+				}
+
+				if (typeof this.initialSizing.appIconSize !== 'number') {
+					this.initialSizing.appIconSize = parseInt(appIconComputedStyles.backgroundSize, 10);
+				}
+
+				const currentAppIconHeight = parseInt(appIconComputedStyles.height, 10);
+				const newControlsWidth = this.initialSizing.controlsWidth / getZoomFactor();
+				const newAppIconWidth = this.initialSizing.appIconWidth / getZoomFactor();
+				const newAppIconSize = this.initialSizing.appIconSize / getZoomFactor();
+
+				// Adjust app icon mimic menubar
+				this.appIcon.style.width = `${newAppIconWidth}px`;
+				this.appIcon.style.backgroundSize = `${newAppIconSize}px`;
+				this.appIcon.style.paddingTop = `${(newHeight - currentAppIconHeight) / 2.0}px`;
+				this.appIcon.style.paddingBottom = `${(newHeight - currentAppIconHeight) / 2.0}px`;
+
+				// Adjust windows controls
+				this.windowControls.style.width = `${newControlsWidth}px`;
+			}
+		} else {
+			// We need to undo zoom prevention
+			this.title.style.fontSize = null;
+			this.title.style.lineHeight = null;
+
+			this.appIcon.style.width = null;
+			this.appIcon.style.backgroundSize = null;
+			this.appIcon.style.paddingTop = null;
+			this.appIcon.style.paddingBottom = null;
+
+			this.windowControls.style.width = null;
+		}
+
+		if (this.menubarPart) {
+			const menubarDimension = new Dimension(undefined, dimension.height);
+			this.menubarPart.layout(menubarDimension);
+		}
+	}
+
+	layout(dimension: Dimension): Dimension[] {
+		this.updateLayout(dimension);
 
 		return super.layout(dimension);
 	}
@@ -358,7 +565,27 @@ class ShowItemInFolderAction extends Action {
 		super('showItemInFolder.action.id', label);
 	}
 
-	public run(): TPromise<void> {
+	run(): TPromise<void> {
 		return this.windowsService.showItemInFolder(this.path);
 	}
-}
\ No newline at end of file
+}
+
+registerThemingParticipant((theme: ITheme, collector: ICssStyleCollector) => {
+	const titlebarActiveFg = theme.getColor(TITLE_BAR_ACTIVE_FOREGROUND);
+	if (titlebarActiveFg) {
+		collector.addRule(`
+		.monaco-workbench > .part.titlebar > .window-controls-container .window-icon {
+			background-color: ${titlebarActiveFg};
+		}
+		`);
+	}
+
+	const titlebarInactiveFg = theme.getColor(TITLE_BAR_INACTIVE_FOREGROUND);
+	if (titlebarInactiveFg) {
+		collector.addRule(`
+		.monaco-workbench > .part.titlebar.inactive > .window-controls-container .window-icon {
+				background-color: ${titlebarInactiveFg};
+			}
+		`);
+	}
+});
diff --git a/src/vs/workbench/browser/parts/views/customView.ts b/src/vs/workbench/browser/parts/views/customView.ts
index 04a9eabae59..212fbe26b9d 100644
--- a/src/vs/workbench/browser/parts/views/customView.ts
+++ b/src/vs/workbench/browser/parts/views/customView.ts
@@ -5,7 +5,7 @@
 
 import 'vs/css!./media/views';
 import { Event, Emitter } from 'vs/base/common/event';
-import { IDisposable, dispose, empty as EmptyDisposable, toDisposable, Disposable } from 'vs/base/common/lifecycle';
+import { IDisposable, dispose, Disposable, toDisposable } from 'vs/base/common/lifecycle';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { IAction, IActionItem, ActionRunner } from 'vs/base/common/actions';
@@ -14,26 +14,26 @@ import { IContextMenuService } from 'vs/platform/contextview/browser/contextView
 import { IMenuService, MenuId, MenuItemAction } from 'vs/platform/actions/common/actions';
 import { ContextAwareMenuItemActionItem, fillInActionBarActions, fillInContextMenuActions } from 'vs/platform/actions/browser/menuItemActionItem';
 import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IViewsService, ITreeViewer, ITreeItem, TreeItemCollapsibleState, ITreeViewDataProvider, TreeViewItemHandleArg, ICustomViewDescriptor, ViewsRegistry } from 'vs/workbench/common/views';
+import { IViewsService, ITreeViewer, ITreeItem, TreeItemCollapsibleState, ITreeViewDataProvider, TreeViewItemHandleArg, ICustomViewDescriptor, ViewsRegistry, ViewContainer } from 'vs/workbench/common/views';
 import { IViewletViewOptions, FileIconThemableWorkbenchTree } from 'vs/workbench/browser/parts/views/viewsViewlet';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { INotificationService } from 'vs/platform/notification/common/notification';
-import { ProgressLocation, IProgressService2 } from 'vs/platform/progress/common/progress';
+import { IProgressService2 } from 'vs/workbench/services/progress/common/progress';
 import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
 import { IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService';
 import { ICommandService } from 'vs/platform/commands/common/commands';
 import * as DOM from 'vs/base/browser/dom';
-import * as errors from 'vs/base/common/errors';
 import { isUndefinedOrNull } from 'vs/base/common/types';
 import { IDataSource, ITree, IRenderer, ContextMenuEvent } from 'vs/base/parts/tree/browser/tree';
 import { ResourceLabel } from 'vs/workbench/browser/labels';
 import { ActionBar, IActionItemProvider, ActionItem } from 'vs/base/browser/ui/actionbar/actionbar';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { basename } from 'vs/base/common/paths';
 import { LIGHT, FileThemeIcon, FolderThemeIcon } from 'vs/platform/theme/common/themeService';
 import { FileKind } from 'vs/platform/files/common/files';
 import { WorkbenchTreeController } from 'vs/platform/list/browser/listService';
 import { ViewletPanel, IViewletPanelOptions } from 'vs/workbench/browser/parts/views/panelViewlet';
+import { IMouseEvent } from 'vs/base/browser/mouseEvent';
 
 export class CustomTreeViewPanel extends ViewletPanel {
 
@@ -108,7 +108,7 @@ export class CustomTreeViewPanel extends ViewletPanel {
 class TitleMenus implements IDisposable {
 
 	private disposables: IDisposable[] = [];
-	private titleDisposable: IDisposable = EmptyDisposable;
+	private titleDisposable: IDisposable = Disposable.None;
 	private titleActions: IAction[] = [];
 	private titleSecondaryActions: IAction[] = [];
 
@@ -122,7 +122,7 @@ class TitleMenus implements IDisposable {
 	) {
 		if (this.titleDisposable) {
 			this.titleDisposable.dispose();
-			this.titleDisposable = EmptyDisposable;
+			this.titleDisposable = Disposable.None;
 		}
 
 		const _contextKeyService = this.contextKeyService.createScoped();
@@ -192,18 +192,27 @@ export class CustomTreeViewer extends Disposable implements ITreeViewer {
 	private _onDidChangeSelection: Emitter<ITreeItem[]> = this._register(new Emitter<ITreeItem[]>());
 	readonly onDidChangeSelection: Event<ITreeItem[]> = this._onDidChangeSelection.event;
 
+	private _onDidChangeVisibility: Emitter<boolean> = this._register(new Emitter<boolean>());
+	readonly onDidChangeVisibility: Event<boolean> = this._onDidChangeVisibility.event;
+
 	constructor(
 		private id: string,
-		private progressLocation: ProgressLocation,
+		private container: ViewContainer,
 		@IExtensionService private extensionService: IExtensionService,
 		@IWorkbenchThemeService private themeService: IWorkbenchThemeService,
 		@IInstantiationService private instantiationService: IInstantiationService,
-		@ICommandService private commandService: ICommandService
+		@ICommandService private commandService: ICommandService,
+		@IConfigurationService private configurationService: IConfigurationService
 	) {
 		super();
 		this.root = new Root();
 		this._register(this.themeService.onDidFileIconThemeChange(() => this.doRefresh([this.root]) /** soft refresh **/));
 		this._register(this.themeService.onThemeChange(() => this.doRefresh([this.root]) /** soft refresh **/));
+		this._register(this.configurationService.onDidChangeConfiguration(e => {
+			if (e.affectsConfiguration('explorer.decorations')) {
+				this.doRefresh([this.root]); /** soft refresh **/
+			}
+		}));
 	}
 
 	get dataProvider(): ITreeViewDataProvider {
@@ -238,7 +247,12 @@ export class CustomTreeViewer extends Disposable implements ITreeViewer {
 		return this._hasIconForLeafNode;
 	}
 
+	get visible(): boolean {
+		return this.isVisible;
+	}
+
 	setVisibility(isVisible: boolean): void {
+		isVisible = !!isVisible;
 		if (this.isVisible === isVisible) {
 			return;
 		}
@@ -266,6 +280,8 @@ export class CustomTreeViewer extends Disposable implements ITreeViewer {
 				this.elementsToRefresh = [];
 			}
 		}
+
+		this._onDidChangeVisibility.fire(this.isVisible);
 	}
 
 	focus(): void {
@@ -273,7 +289,7 @@ export class CustomTreeViewer extends Disposable implements ITreeViewer {
 			// Make sure the current selected element is revealed
 			const selectedElement = this.tree.getSelection()[0];
 			if (selectedElement) {
-				this.tree.reveal(selectedElement, 0.5).done(null, errors.onUnexpectedError);
+				this.tree.reveal(selectedElement, 0.5);
 			}
 
 			// Pass Focus to Viewer
@@ -292,7 +308,7 @@ export class CustomTreeViewer extends Disposable implements ITreeViewer {
 		this.treeContainer = DOM.$('.tree-explorer-viewlet-tree-view');
 		const actionItemProvider = (action: IAction) => action instanceof MenuItemAction ? this.instantiationService.createInstance(ContextAwareMenuItemActionItem, action) : undefined;
 		const menus = this.instantiationService.createInstance(TreeMenus, this.id);
-		const dataSource = this.instantiationService.createInstance(TreeDataSource, this, this.progressLocation);
+		const dataSource = this.instantiationService.createInstance(TreeDataSource, this, this.container);
 		const renderer = this.instantiationService.createInstance(TreeRenderer, this.id, menus, actionItemProvider);
 		const controller = this.instantiationService.createInstance(TreeController, this.id, menus);
 		this.tree = this.instantiationService.createInstance(FileIconThemableWorkbenchTree, this.treeContainer, { dataSource, renderer, controller }, {});
@@ -336,13 +352,15 @@ export class CustomTreeViewer extends Disposable implements ITreeViewer {
 		return TPromise.as(null);
 	}
 
-	reveal(item: ITreeItem, parentChain: ITreeItem[], options?: { select?: boolean }): TPromise<void> {
+	reveal(item: ITreeItem, parentChain: ITreeItem[], options?: { select?: boolean, focus?: boolean }): TPromise<void> {
 		if (this.tree && this.isVisible) {
-			options = options ? options : { select: true };
+			options = options ? options : { select: false, focus: false };
+			const select = isUndefinedOrNull(options.select) ? false : options.select;
+			const focus = isUndefinedOrNull(options.focus) ? false : options.focus;
+
 			const root: Root = this.tree.getInput();
 			const promise = root.children ? TPromise.as(null) : this.refresh(); // Refresh if root is not populated
 			return promise.then(() => {
-				const select = isUndefinedOrNull(options.select) ? true : options.select;
 				var result = TPromise.as(null);
 				parentChain.forEach((e) => {
 					result = result.then(() => this.tree.expand(e));
@@ -352,6 +370,10 @@ export class CustomTreeViewer extends Disposable implements ITreeViewer {
 						if (select) {
 							this.tree.setSelection([item], { source: 'api' });
 						}
+						if (focus) {
+							this.focus();
+							this.tree.setFocus(item);
+						}
 					});
 			});
 		}
@@ -373,7 +395,7 @@ export class CustomTreeViewer extends Disposable implements ITreeViewer {
 	}
 
 	private onSelection({ payload }: any): void {
-		if (payload && payload.source === 'api') {
+		if (payload && (!!payload.didClickOnTwistie || payload.source === 'api')) {
 			return;
 		}
 		const selection: ITreeItem = this.tree.getSelection()[0];
@@ -395,37 +417,36 @@ class TreeDataSource implements IDataSource {
 
 	constructor(
 		private treeView: ITreeViewer,
-		private location: ProgressLocation,
+		private container: ViewContainer,
 		@IProgressService2 private progressService: IProgressService2
 	) {
 	}
 
-	public getId(tree: ITree, node: ITreeItem): string {
+	getId(tree: ITree, node: ITreeItem): string {
 		return node.handle;
 	}
 
-	public hasChildren(tree: ITree, node: ITreeItem): boolean {
+	hasChildren(tree: ITree, node: ITreeItem): boolean {
 		return this.treeView.dataProvider && node.collapsibleState !== TreeItemCollapsibleState.None;
 	}
 
-	public getChildren(tree: ITree, node: ITreeItem): TPromise<any[]> {
+	getChildren(tree: ITree, node: ITreeItem): TPromise<any[]> {
 		if (this.treeView.dataProvider) {
-			return this.location ? this.progressService.withProgress({ location: this.location }, () => this.treeView.dataProvider.getChildren(node)) : this.treeView.dataProvider.getChildren(node);
+			return this.progressService.withProgress({ location: this.container }, () => this.treeView.dataProvider.getChildren(node));
 		}
 		return TPromise.as([]);
 	}
 
-	public shouldAutoexpand(tree: ITree, node: ITreeItem): boolean {
+	shouldAutoexpand(tree: ITree, node: ITreeItem): boolean {
 		return node.collapsibleState === TreeItemCollapsibleState.Expanded;
 	}
 
-	public getParent(tree: ITree, node: any): TPromise<any> {
+	getParent(tree: ITree, node: any): TPromise<any> {
 		return TPromise.as(null);
 	}
 }
 
 interface ITreeExplorerTemplateData {
-	label: HTMLElement;
 	resourceLabel: ResourceLabel;
 	icon: HTMLElement;
 	actionBar: ActionBar;
@@ -442,57 +463,54 @@ class TreeRenderer implements IRenderer {
 		private menus: TreeMenus,
 		private actionItemProvider: IActionItemProvider,
 		@IInstantiationService private instantiationService: IInstantiationService,
-		@IWorkbenchThemeService private themeService: IWorkbenchThemeService
+		@IWorkbenchThemeService private themeService: IWorkbenchThemeService,
+		@IConfigurationService private configurationService: IConfigurationService,
 	) {
 	}
 
-	public getHeight(tree: ITree, element: any): number {
+	getHeight(tree: ITree, element: any): number {
 		return TreeRenderer.ITEM_HEIGHT;
 	}
 
-	public getTemplateId(tree: ITree, element: any): string {
+	getTemplateId(tree: ITree, element: any): string {
 		return TreeRenderer.TREE_TEMPLATE_ID;
 	}
 
-	public renderTemplate(tree: ITree, templateId: string, container: HTMLElement): ITreeExplorerTemplateData {
+	renderTemplate(tree: ITree, templateId: string, container: HTMLElement): ITreeExplorerTemplateData {
 		DOM.addClass(container, 'custom-view-tree-node-item');
 
 		const icon = DOM.append(container, DOM.$('.custom-view-tree-node-item-icon'));
-		const label = DOM.append(container, DOM.$('.custom-view-tree-node-item-label'));
 		const resourceLabel = this.instantiationService.createInstance(ResourceLabel, container, {});
-		const actionsContainer = DOM.append(container, DOM.$('.actions'));
+		DOM.addClass(resourceLabel.element, 'custom-view-tree-node-item-resourceLabel');
+		const actionsContainer = DOM.append(resourceLabel.element, DOM.$('.actions'));
 		const actionBar = new ActionBar(actionsContainer, {
 			actionItemProvider: this.actionItemProvider,
 			actionRunner: new MultipleSelectionActionRunner(() => tree.getSelection())
 		});
 
-		return { label, resourceLabel, icon, actionBar, aligner: new Aligner(container, tree, this.themeService) };
+		return { resourceLabel, icon, actionBar, aligner: new Aligner(container, tree, this.themeService) };
 	}
 
-	public renderElement(tree: ITree, node: ITreeItem, templateId: string, templateData: ITreeExplorerTemplateData): void {
+	renderElement(tree: ITree, node: ITreeItem, templateId: string, templateData: ITreeExplorerTemplateData): void {
 		const resource = node.resourceUri ? URI.revive(node.resourceUri) : null;
 		const label = node.label ? node.label : resource ? basename(resource.path) : '';
 		const icon = this.themeService.getTheme().type === LIGHT ? node.icon : node.iconDark;
+		const iconUrl = icon ? URI.revive(icon) : null;
+		const title = node.tooltip ? node.tooltip : resource ? void 0 : label;
 
 		// reset
 		templateData.resourceLabel.clear();
 		templateData.actionBar.clear();
-		templateData.label.textContent = '';
-		DOM.removeClass(templateData.label, 'custom-view-tree-node-item-label');
-		DOM.removeClass(templateData.resourceLabel.element, 'custom-view-tree-node-item-resourceLabel');
 
-		if ((resource || node.themeIcon) && !icon) {
-			const title = node.tooltip ? node.tooltip : resource ? void 0 : label;
-			templateData.resourceLabel.setLabel({ name: label, resource: resource ? resource : URI.parse('_icon_resource') }, { fileKind: this.getFileKind(node), title });
-			DOM.addClass(templateData.resourceLabel.element, 'custom-view-tree-node-item-resourceLabel');
+		if (resource || node.themeIcon) {
+			const fileDecorations = this.configurationService.getValue<{ colors: boolean, badges: boolean }>('explorer.decorations');
+			templateData.resourceLabel.setLabel({ name: label, resource: resource ? resource : URI.parse('missing:_icon_resource') }, { fileKind: this.getFileKind(node), title, hideIcon: !!iconUrl, fileDecorations, extraClasses: ['custom-view-tree-node-item-resourceLabel'] });
 		} else {
-			templateData.label.textContent = label;
-			DOM.addClass(templateData.label, 'custom-view-tree-node-item-label');
-			templateData.label.title = typeof node.tooltip === 'string' ? node.tooltip : label;
+			templateData.resourceLabel.setLabel({ name: label }, { title, hideIcon: true, extraClasses: ['custom-view-tree-node-item-resourceLabel'] });
 		}
 
-		templateData.icon.style.backgroundImage = icon ? `url('${icon}')` : '';
-		DOM.toggleClass(templateData.icon, 'custom-view-tree-node-item-icon', !!icon);
+		templateData.icon.style.backgroundImage = iconUrl ? `url('${iconUrl.toString(true)}')` : '';
+		DOM.toggleClass(templateData.icon, 'custom-view-tree-node-item-icon', !!iconUrl);
 		templateData.actionBar.context = (<TreeViewItemHandleArg>{ $treeViewId: this.treeViewId, $treeItemHandle: node.handle });
 		templateData.actionBar.push(this.menus.getResourceActions(node), { icon: true, label: false });
 
@@ -511,7 +529,7 @@ class TreeRenderer implements IRenderer {
 		return node.collapsibleState === TreeItemCollapsibleState.Collapsed || node.collapsibleState === TreeItemCollapsibleState.Expanded ? FileKind.FOLDER : FileKind.FILE;
 	}
 
-	public disposeTemplate(tree: ITree, templateId: string, templateData: ITreeExplorerTemplateData): void {
+	disposeTemplate(tree: ITree, templateId: string, templateData: ITreeExplorerTemplateData): void {
 		templateData.resourceLabel.dispose();
 		templateData.actionBar.dispose();
 		templateData.aligner.dispose();
@@ -586,7 +604,11 @@ class TreeController extends WorkbenchTreeController {
 		super({}, configurationService);
 	}
 
-	public onContextMenu(tree: ITree, node: ITreeItem, event: ContextMenuEvent): boolean {
+	protected shouldToggleExpansion(element: ITreeItem, event: IMouseEvent, origin: string): boolean {
+		return element.command ? this.isClickOnTwistie(event) : super.shouldToggleExpansion(element, event, origin);
+	}
+
+	onContextMenu(tree: ITree, node: ITreeItem, event: ContextMenuEvent): boolean {
 		event.preventDefault();
 		event.stopPropagation();
 
diff --git a/src/vs/workbench/browser/parts/views/media/panelviewlet.css b/src/vs/workbench/browser/parts/views/media/panelviewlet.css
index adddb24399d..9691ecbdeb7 100644
--- a/src/vs/workbench/browser/parts/views/media/panelviewlet.css
+++ b/src/vs/workbench/browser/parts/views/media/panelviewlet.css
@@ -3,8 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-.monaco-panel-view .panel > .panel-header > .title {
+.monaco-panel-view .panel > .panel-header h3.title {
 	white-space: nowrap;
 	text-overflow: ellipsis;
 	overflow: hidden;
+	font-size: 11px;
+	-webkit-margin-before: 0;
+	-webkit-margin-after: 0;
 }
diff --git a/src/vs/workbench/browser/parts/views/media/views.css b/src/vs/workbench/browser/parts/views/media/views.css
index 7d9c1184814..2bffac61f30 100644
--- a/src/vs/workbench/browser/parts/views/media/views.css
+++ b/src/vs/workbench/browser/parts/views/media/views.css
@@ -58,6 +58,10 @@
 	display: inline-block;
 }
 
+.tree-explorer-viewlet-tree-view .monaco-tree .monaco-tree-row {
+	padding-right: 12px;
+}
+
 .tree-explorer-viewlet-tree-view .monaco-tree .monaco-tree-row .custom-view-tree-node-item {
 	display: flex;
 	height: 22px;
@@ -68,8 +72,7 @@
 	flex-wrap: nowrap
 }
 
-.tree-explorer-viewlet-tree-view .monaco-tree .monaco-tree-row .custom-view-tree-node-item .custom-view-tree-node-item-resourceLabel,
-.tree-explorer-viewlet-tree-view .monaco-tree .monaco-tree-row .custom-view-tree-node-item > .custom-view-tree-node-item-label {
+.tree-explorer-viewlet-tree-view .monaco-tree .monaco-tree-row .custom-view-tree-node-item .custom-view-tree-node-item-resourceLabel {
 	flex: 1;
 	text-overflow: ellipsis;
 	overflow: hidden;
@@ -85,18 +88,25 @@
 	-webkit-font-smoothing: antialiased;
 }
 
-.tree-explorer-viewlet-tree-view .monaco-tree .monaco-tree-row .custom-view-tree-node-item > .actions {
-	display: none;
-	padding-right: 6px;
+.tree-explorer-viewlet-tree-view .monaco-tree .monaco-tree-row .custom-view-tree-node-item > .custom-view-tree-node-item-resourceLabel .monaco-icon-label-description-container {
+	flex: 1;
 }
 
-.tree-explorer-viewlet-tree-view .monaco-tree .monaco-tree-row:hover .custom-view-tree-node-item > .actions,
-.tree-explorer-viewlet-tree-view .monaco-tree .monaco-tree-row.selected .custom-view-tree-node-item > .actions,
-.tree-explorer-viewlet-tree-view .monaco-tree .monaco-tree-row.focused .custom-view-tree-node-item > .actions {
+.tree-explorer-viewlet-tree-view .monaco-tree .monaco-tree-row .custom-view-tree-node-item > .custom-view-tree-node-item-resourceLabel::after {
+	padding-right: 0px;
+}
+
+.tree-explorer-viewlet-tree-view .monaco-tree .monaco-tree-row .custom-view-tree-node-item > .custom-view-tree-node-item-resourceLabel > .actions {
+	display: none;
+}
+
+.tree-explorer-viewlet-tree-view .monaco-tree .monaco-tree-row:hover .custom-view-tree-node-item > .custom-view-tree-node-item-resourceLabel > .actions,
+.tree-explorer-viewlet-tree-view .monaco-tree .monaco-tree-row.selected .custom-view-tree-node-item > .custom-view-tree-node-item-resourceLabel > .actions,
+.tree-explorer-viewlet-tree-view .monaco-tree .monaco-tree-row.focused .custom-view-tree-node-item > .custom-view-tree-node-item-resourceLabel > .actions {
 	display: block;
 }
 
-.tree-explorer-viewlet-tree-view .monaco-tree .custom-view-tree-node-item > .actions .action-label {
+.tree-explorer-viewlet-tree-view .monaco-tree .custom-view-tree-node-item > .custom-view-tree-node-item-resourceLabel > .actions .action-label {
 	width: 16px;
 	height: 100%;
 	background-position: 50% 50%;
diff --git a/src/vs/workbench/browser/parts/views/panelViewlet.ts b/src/vs/workbench/browser/parts/views/panelViewlet.ts
index 12297203748..a647bf39021 100644
--- a/src/vs/workbench/browser/parts/views/panelViewlet.ts
+++ b/src/vs/workbench/browser/parts/views/panelViewlet.ts
@@ -27,6 +27,7 @@ import { PanelView, IPanelViewOptions, IPanelOptions, Panel } from 'vs/base/brow
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IPartService } from 'vs/workbench/services/part/common/partService';
 import { StandardMouseEvent } from 'vs/base/browser/mouseEvent';
+import { IView } from 'vs/workbench/common/views';
 
 export interface IPanelColors extends IColorMapping {
 	dropBackground?: ColorIdentifier;
@@ -41,14 +42,17 @@ export interface IViewletPanelOptions extends IPanelOptions {
 	title: string;
 }
 
-export abstract class ViewletPanel extends Panel {
+export abstract class ViewletPanel extends Panel implements IView {
 
 	private static AlwaysShowActionsConfig = 'workbench.view.alwaysShowHeaderActions';
 
 	private _onDidFocus = new Emitter<void>();
 	readonly onDidFocus: Event<void> = this._onDidFocus.event;
 
-	private _onDidChangeTitleArea = new Emitter<void>();
+	private _onDidBlur = new Emitter<void>();
+	readonly onDidBlur: Event<void> = this._onDidBlur.event;
+
+	protected _onDidChangeTitleArea = new Emitter<void>();
 	readonly onDidChangeTitleArea: Event<void> = this._onDidChangeTitleArea.event;
 
 	private _isVisible: boolean;
@@ -90,12 +94,13 @@ export abstract class ViewletPanel extends Panel {
 		const focusTracker = trackFocus(this.element);
 		this.disposables.push(focusTracker);
 		this.disposables.push(focusTracker.onDidFocus(() => this._onDidFocus.fire()));
+		this.disposables.push(focusTracker.onDidBlur(() => this._onDidBlur.fire()));
 	}
 
 	protected renderHeader(container: HTMLElement): void {
 		this.headerContainer = container;
 
-		this.renderHeaderTitle(container);
+		this.renderHeaderTitle(container, this.title);
 
 		const actions = append(container, $('.actions'));
 		this.toolbar = new ToolBar(actions, this.contextMenuService, {
@@ -114,8 +119,8 @@ export abstract class ViewletPanel extends Panel {
 		this.updateActionsVisibility();
 	}
 
-	protected renderHeaderTitle(container: HTMLElement): void {
-		append(container, $('.title', null, this.title));
+	protected renderHeaderTitle(container: HTMLElement, title: string): void {
+		append(container, $('h3.title', null, title));
 	}
 
 	focus(): void {
@@ -202,12 +207,12 @@ export class PanelViewlet extends Viewlet {
 		super(id, partService, telemetryService, themeService);
 	}
 
-	async create(parent: HTMLElement): TPromise<void> {
-		super.create(parent);
-
-		this.panelview = this._register(new PanelView(parent, this.options));
-		this._register(this.panelview.onDidDrop(({ from, to }) => this.movePanel(from as ViewletPanel, to as ViewletPanel)));
-		this._register(addDisposableListener(parent, EventType.CONTEXT_MENU, (e: MouseEvent) => this.showContextMenu(new StandardMouseEvent(e))));
+	create(parent: HTMLElement): TPromise<void> {
+		return super.create(parent).then(() => {
+			this.panelview = this._register(new PanelView(parent, this.options));
+			this._register(this.panelview.onDidDrop(({ from, to }) => this.movePanel(from as ViewletPanel, to as ViewletPanel)));
+			this._register(addDisposableListener(parent, EventType.CONTEXT_MENU, (e: MouseEvent) => this.showContextMenu(new StandardMouseEvent(e))));
+		});
 	}
 
 	private showContextMenu(event: StandardMouseEvent): void {
diff --git a/src/vs/workbench/browser/parts/views/views.ts b/src/vs/workbench/browser/parts/views/views.ts
index 5ccc6b4542f..3370c6f5bbb 100644
--- a/src/vs/workbench/browser/parts/views/views.ts
+++ b/src/vs/workbench/browser/parts/views/views.ts
@@ -7,7 +7,7 @@ import 'vs/css!./media/views';
 import { Disposable } from 'vs/base/common/lifecycle';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { TPromise } from 'vs/base/common/winjs.base';
-import { IViewsService, ViewsRegistry, IViewsViewlet, ViewContainer, IViewDescriptor, IViewContainersRegistry, Extensions as ViewContainerExtensions, TEST_VIEW_CONTAINER_ID } from 'vs/workbench/common/views';
+import { IViewsService, ViewsRegistry, IViewsViewlet, ViewContainer, IViewDescriptor, IViewContainersRegistry, Extensions as ViewContainerExtensions, TEST_VIEW_CONTAINER_ID, IView } from 'vs/workbench/common/views';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { ViewletRegistry, Extensions as ViewletExtensions } from 'vs/workbench/browser/viewlet';
 import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
@@ -173,11 +173,6 @@ class ViewDescriptorCollection extends Disposable {
 	}
 }
 
-export interface IView {
-	viewDescriptor: IViewDescriptor;
-	visible: boolean;
-}
-
 export interface IViewState {
 	visible: boolean;
 	collapsed: boolean;
@@ -321,26 +316,17 @@ export class ContributableViewsModel extends Disposable {
 	}
 
 	private compareViewDescriptors(a: IViewDescriptor, b: IViewDescriptor): number {
-		const viewStateA = this.viewStates.get(a.id);
-		const viewStateB = this.viewStates.get(b.id);
-
-		let orderA = viewStateA && viewStateA.order;
-		orderA = typeof orderA === 'number' ? orderA : a.order;
-		orderA = typeof orderA === 'number' ? orderA : Number.POSITIVE_INFINITY;
-
-		let orderB = viewStateB && viewStateB.order;
-		orderB = typeof orderB === 'number' ? orderB : b.order;
-		orderB = typeof orderB === 'number' ? orderB : Number.POSITIVE_INFINITY;
-
-		if (orderA !== orderB) {
-			return orderA - orderB;
-		}
-
 		if (a.id === b.id) {
 			return 0;
 		}
 
-		return a.id < b.id ? -1 : 1;
+		return (this.getViewOrder(a) - this.getViewOrder(b)) || (a.id < b.id ? -1 : 1);
+	}
+
+	private getViewOrder(viewDescriptor: IViewDescriptor): number {
+		const viewState = this.viewStates.get(viewDescriptor.id);
+		const viewOrder = viewState && typeof viewState.order === 'number' ? viewState.order : viewDescriptor.order;
+		return typeof viewOrder === 'number' ? viewOrder : Number.MAX_VALUE;
 	}
 
 	private onDidChangeViewDescriptors(viewDescriptors: IViewDescriptor[]): void {
@@ -355,13 +341,12 @@ export class ContributableViewsModel extends Disposable {
 		for (const viewDescriptor of viewDescriptors) {
 			const viewState = this.viewStates.get(viewDescriptor.id);
 			if (viewState) {
-				if (isUndefinedOrNull(viewState.collapsed)) {
-					// collapsed state was not set, so set it from view descriptor
-					viewState.collapsed = !!viewDescriptor.collapsed;
-				}
+				// set defaults if not set
+				viewState.visible = isUndefinedOrNull(viewState.visible) ? !viewDescriptor.hideByDefault : viewState.visible;
+				viewState.collapsed = isUndefinedOrNull(viewState.collapsed) ? !!viewDescriptor.collapsed : viewState.collapsed;
 			} else {
 				this.viewStates.set(viewDescriptor.id, {
-					visible: true,
+					visible: !viewDescriptor.hideByDefault,
 					collapsed: viewDescriptor.collapsed
 				});
 			}
@@ -436,8 +421,8 @@ export class PersistentContributableViewsModel extends ContributableViewsModel {
 		this.storageService = storageService;
 		this.contextService = contextService;
 
-		this._register(this.onDidAdd(() => this.saveVisibilityStates()));
-		this._register(this.onDidRemove(() => this.saveVisibilityStates()));
+		this._register(this.onDidAdd(viewDescriptorRefs => this.saveVisibilityStates(viewDescriptorRefs.map(r => r.viewDescriptor))));
+		this._register(this.onDidRemove(viewDescriptorRefs => this.saveVisibilityStates(viewDescriptorRefs.map(r => r.viewDescriptor))));
 	}
 
 	saveViewsStates(): void {
@@ -451,9 +436,9 @@ export class PersistentContributableViewsModel extends ContributableViewsModel {
 		this.storageService.store(this.viewletStateStorageId, JSON.stringify(storedViewsStates), this.contextService.getWorkbenchState() !== WorkbenchState.EMPTY ? StorageScope.WORKSPACE : StorageScope.GLOBAL);
 	}
 
-	private saveVisibilityStates(): void {
-		const storedViewsVisibilityStates: { id: string, isHidden: boolean }[] = [];
-		for (const viewDescriptor of this.viewDescriptors) {
+	private saveVisibilityStates(viewDescriptors: IViewDescriptor[]): void {
+		const storedViewsVisibilityStates = PersistentContributableViewsModel.loadViewsVisibilityState(this.hiddenViewsStorageId, this.storageService, this.contextService);
+		for (const viewDescriptor of viewDescriptors) {
 			if (viewDescriptor.canToggleVisibility) {
 				const viewState = this.viewStates.get(viewDescriptor.id);
 				storedViewsVisibilityStates.push({ id: viewDescriptor.id, isHidden: viewState ? !viewState.visible : void 0 });
@@ -465,8 +450,7 @@ export class PersistentContributableViewsModel extends ContributableViewsModel {
 	private static loadViewsStates(viewletStateStorageId: string, hiddenViewsStorageId: string, storageService: IStorageService, contextService: IWorkspaceContextService): Map<string, IViewState> {
 		const viewStates = new Map<string, IViewState>();
 		const storedViewsStates = JSON.parse(storageService.get(viewletStateStorageId, contextService.getWorkbenchState() !== WorkbenchState.EMPTY ? StorageScope.WORKSPACE : StorageScope.GLOBAL, '{}'));
-		const storedVisibilityStates = <Array<string | { id: string, isHidden: boolean }>>JSON.parse(storageService.get(hiddenViewsStorageId, StorageScope.GLOBAL, '[]'));
-		const viewsVisibilityStates = <{ id: string, isHidden: boolean }[]>storedVisibilityStates.map(c => typeof c === 'string' /* migration */ ? { id: c, isHidden: true } : c);
+		const viewsVisibilityStates = PersistentContributableViewsModel.loadViewsVisibilityState(hiddenViewsStorageId, storageService, contextService);
 		for (const { id, isHidden } of viewsVisibilityStates) {
 			const viewState = storedViewsStates[id];
 			if (viewState) {
@@ -478,12 +462,17 @@ export class PersistentContributableViewsModel extends ContributableViewsModel {
 		}
 		for (const id of Object.keys(storedViewsStates)) {
 			if (!viewStates.has(id)) {
-				viewStates.set(id, <IViewState>{ ...storedViewsStates[id], ...{ visible: true } });
+				viewStates.set(id, <IViewState>{ ...storedViewsStates[id] });
 			}
 		}
 		return viewStates;
 	}
 
+	private static loadViewsVisibilityState(hiddenViewsStorageId: string, storageService: IStorageService, contextService: IWorkspaceContextService): { id: string, isHidden: boolean }[] {
+		const storedVisibilityStates = <Array<string | { id: string, isHidden: boolean }>>JSON.parse(storageService.get(hiddenViewsStorageId, StorageScope.GLOBAL, '[]'));
+		return <{ id: string, isHidden: boolean }[]>storedVisibilityStates.map(c => typeof c === 'string' /* migration */ ? { id: c, isHidden: true } : c);
+	}
+
 	dispose(): void {
 		this.saveViewsStates();
 		super.dispose();
@@ -500,17 +489,18 @@ export class ViewsService extends Disposable implements IViewsService {
 		@IInstantiationService private instantiationService: IInstantiationService,
 		@ILifecycleService private lifecycleService: ILifecycleService,
 		@IViewletService private viewletService: IViewletService,
-		@IStorageService private storageService: IStorageService
+		@IStorageService private storageService: IStorageService,
+		@IWorkspaceContextService private workspaceContextService: IWorkspaceContextService
 	) {
 		super();
 
 		const viewContainersRegistry = Registry.as<IViewContainersRegistry>(ViewContainerExtensions.ViewContainersRegistry);
 		viewContainersRegistry.all.forEach(viewContainer => this.onDidRegisterViewContainer(viewContainer));
 		this._register(viewContainersRegistry.onDidRegister(viewContainer => this.onDidRegisterViewContainer(viewContainer)));
-		this._register(Registry.as<ViewletRegistry>(ViewletExtensions.Viewlets).onDidRegister(viewlet => this.viewletService.setViewletEnablement(viewlet.id, this.storageService.getBoolean(`viewservice.${viewlet.id}.enablement`, StorageScope.GLOBAL, viewlet.id !== TEST_VIEW_CONTAINER_ID))));
+		this._register(Registry.as<ViewletRegistry>(ViewletExtensions.Viewlets).onDidRegister(viewlet => this.viewletService.setViewletEnablement(viewlet.id, this.storageService.getBoolean(`viewservice.${viewlet.id}.enablement`, this.getStorageScope(), viewlet.id !== TEST_VIEW_CONTAINER_ID))));
 	}
 
-	openView(id: string, focus: boolean): TPromise<void> {
+	openView(id: string, focus: boolean): TPromise<IView> {
 		const viewDescriptor = ViewsRegistry.getView(id);
 		if (viewDescriptor) {
 			const viewletDescriptor = this.viewletService.getViewlet(viewDescriptor.container.id);
@@ -539,6 +529,10 @@ export class ViewsService extends Disposable implements IViewsService {
 	private updateViewletEnablement(viewContainer: ViewContainer, viewDescriptorCollection: ViewDescriptorCollection): void {
 		const enabled = viewDescriptorCollection.viewDescriptors.length > 0;
 		this.viewletService.setViewletEnablement(viewContainer.id, enabled);
-		this.storageService.store(`viewservice.${viewContainer.id}.enablement`, enabled, StorageScope.GLOBAL);
+		this.storageService.store(`viewservice.${viewContainer.id}.enablement`, enabled, this.getStorageScope());
+	}
+
+	private getStorageScope(): StorageScope {
+		return this.workspaceContextService.getWorkbenchState() === WorkbenchState.EMPTY ? StorageScope.GLOBAL : StorageScope.WORKSPACE;
 	}
 }
\ No newline at end of file
diff --git a/src/vs/workbench/browser/parts/views/viewsViewlet.ts b/src/vs/workbench/browser/parts/views/viewsViewlet.ts
index 9764a44dc74..b2544d75ffe 100644
--- a/src/vs/workbench/browser/parts/views/viewsViewlet.ts
+++ b/src/vs/workbench/browser/parts/views/viewsViewlet.ts
@@ -4,7 +4,6 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { TPromise } from 'vs/base/common/winjs.base';
-import * as errors from 'vs/base/common/errors';
 import * as DOM from 'vs/base/browser/dom';
 import { Scope } from 'vs/workbench/common/memento';
 import { dispose, IDisposable, combinedDisposable, toDisposable } from 'vs/base/common/lifecycle';
@@ -13,7 +12,7 @@ import { Separator } from 'vs/base/browser/ui/actionbar/actionbar';
 import { firstIndex } from 'vs/base/common/arrays';
 import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
 import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { IViewDescriptor, IViewsViewlet, IViewContainersRegistry, Extensions as ViewContainerExtensions } from 'vs/workbench/common/views';
+import { IViewDescriptor, IViewsViewlet, IViewContainersRegistry, Extensions as ViewContainerExtensions, IView } from 'vs/workbench/common/views';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
@@ -89,7 +88,7 @@ export abstract class TreeViewsViewletPanel extends ViewletPanel {
 		// Make sure the current selected element is revealed
 		const selectedElement = this.tree.getSelection()[0];
 		if (selectedElement) {
-			this.tree.reveal(selectedElement, 0.5).done(null, errors.onUnexpectedError);
+			this.tree.reveal(selectedElement, 0.5);
 		}
 
 		// Pass Focus to Viewer
@@ -144,31 +143,31 @@ export abstract class ViewContainerViewlet extends PanelViewlet implements IView
 		this._register(toDisposable(() => this.viewDisposables = dispose(this.viewDisposables)));
 	}
 
-	async create(parent: HTMLElement): TPromise<void> {
-		await super.create(parent);
-
-		this._register(this.onDidSashChange(() => this.saveViewSizes()));
-		this.viewsModel.onDidAdd(added => this.onDidAddViews(added));
-		this.viewsModel.onDidRemove(removed => this.onDidRemoveViews(removed));
-		const addedViews: IAddedViewDescriptorRef[] = this.viewsModel.visibleViewDescriptors.map((viewDescriptor, index) => {
-			const size = this.viewsModel.getSize(viewDescriptor.id);
-			const collapsed = this.viewsModel.isCollapsed(viewDescriptor.id);
-			return ({ viewDescriptor, index, size, collapsed });
-		});
-		if (addedViews.length) {
-			this.onDidAddViews(addedViews);
-		}
-
-		// Update headers after and title contributed views after available, since we read from cache in the beginning to know if the viewlet has single view or not. Ref #29609
-		this.extensionService.whenInstalledExtensionsRegistered().then(() => {
-			this.areExtensionsReady = true;
-			if (this.panels.length) {
-				this.updateTitleArea();
-				this.updateViewHeaders();
+	create(parent: HTMLElement): TPromise<void> {
+		return super.create(parent).then(() => {
+			this._register(this.onDidSashChange(() => this.saveViewSizes()));
+			this.viewsModel.onDidAdd(added => this.onDidAddViews(added));
+			this.viewsModel.onDidRemove(removed => this.onDidRemoveViews(removed));
+			const addedViews: IAddedViewDescriptorRef[] = this.viewsModel.visibleViewDescriptors.map((viewDescriptor, index) => {
+				const size = this.viewsModel.getSize(viewDescriptor.id);
+				const collapsed = this.viewsModel.isCollapsed(viewDescriptor.id);
+				return ({ viewDescriptor, index, size, collapsed });
+			});
+			if (addedViews.length) {
+				this.onDidAddViews(addedViews);
 			}
-		});
 
-		this.focus();
+			// Update headers after and title contributed views after available, since we read from cache in the beginning to know if the viewlet has single view or not. Ref #29609
+			this.extensionService.whenInstalledExtensionsRegistered().then(() => {
+				this.areExtensionsReady = true;
+				if (this.panels.length) {
+					this.updateTitleArea();
+					this.updateViewHeaders();
+				}
+			});
+
+			this.focus();
+		});
 	}
 
 	getContextMenuActions(): IAction[] {
@@ -198,7 +197,7 @@ export abstract class ViewContainerViewlet extends PanelViewlet implements IView
 			.then(() => void 0);
 	}
 
-	openView(id: string, focus?: boolean): TPromise<void> {
+	openView(id: string, focus?: boolean): TPromise<IView> {
 		if (focus) {
 			this.focus();
 		}
@@ -207,11 +206,11 @@ export abstract class ViewContainerViewlet extends PanelViewlet implements IView
 			this.toggleViewVisibility(id);
 		}
 		view = this.getView(id);
-		if (view) {
-			view.setExpanded(true);
+		view.setExpanded(true);
+		if (focus) {
 			view.focus();
 		}
-		return TPromise.as(null);
+		return TPromise.as(view);
 	}
 
 	movePanel(from: ViewletPanel, to: ViewletPanel): void {
@@ -334,8 +333,16 @@ export abstract class ViewContainerViewlet extends PanelViewlet implements IView
 		});
 	}
 
-	private toggleViewVisibility(id: string): void {
-		this.viewsModel.setVisible(id, !this.viewsModel.isVisible(id));
+	private toggleViewVisibility(viewId: string): void {
+		const visible = !this.viewsModel.isVisible(viewId);
+		/* __GDPR__
+			"views.toggleVisibility" : {
+				"viewId" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+				"visible": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+			}
+		*/
+		this.telemetryService.publicLog('views.toggledVisibility', { viewId, visible });
+		this.viewsModel.setVisible(viewId, visible);
 	}
 
 	private saveViewSizes(): void {
@@ -369,7 +376,7 @@ export abstract class ViewContainerViewlet extends PanelViewlet implements IView
 	private computeInitialSizes(): { [id: string]: number } {
 		let sizes = {};
 		if (this.dimension) {
-			let totalWeight = 0;
+			const totalWeight = this.viewsModel.visibleViewDescriptors.reduce((totalWeight, { weight }) => totalWeight + (weight || 20), 0);
 			for (const viewDescriptor of this.viewsModel.visibleViewDescriptors) {
 				sizes[viewDescriptor.id] = this.dimension.height * (viewDescriptor.weight || 20) / totalWeight;
 			}
diff --git a/src/vs/workbench/browser/quickopen.ts b/src/vs/workbench/browser/quickopen.ts
index 407acc7b5d5..3675ccf763e 100644
--- a/src/vs/workbench/browser/quickopen.ts
+++ b/src/vs/workbench/browser/quickopen.ts
@@ -19,6 +19,7 @@ import { IResourceInput, IEditorOptions } from 'vs/platform/editor/common/editor
 import { IQuickOpenService } from 'vs/platform/quickOpen/common/quickOpen';
 import { IConstructorSignature0, IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IEditorService, SIDE_GROUP, ACTIVE_GROUP } from 'vs/workbench/services/editor/common/editorService';
+import { CancellationToken } from 'vs/base/common/cancellation';
 
 export const CLOSE_ON_FOCUS_LOST_CONFIG = 'workbench.quickOpen.closeOnFocusLost';
 
@@ -42,21 +43,21 @@ export class QuickOpenHandler {
 	 * As such, returning the same model instance across multiple searches will yield best
 	 * results in terms of performance when many items are shown.
 	 */
-	public getResults(searchValue: string): TPromise<IModel<any>> {
+	getResults(searchValue: string, token: CancellationToken): TPromise<IModel<any>> {
 		return TPromise.as(null);
 	}
 
 	/**
 	 * The ARIA label to apply when this quick open handler is active in quick open.
 	 */
-	public getAriaLabel(): string {
+	getAriaLabel(): string {
 		return null;
 	}
 
 	/**
 	 * Extra CSS class name to add to the quick open widget to do custom styling of entries.
 	 */
-	public getClass(): string {
+	getClass(): string {
 		return null;
 	}
 
@@ -64,14 +65,14 @@ export class QuickOpenHandler {
 	 * Indicates if the handler can run in the current environment. Return a string if the handler cannot run but has
 	 * a good message to show in this case.
 	 */
-	public canRun(): boolean | string {
+	canRun(): boolean | string {
 		return true;
 	}
 
 	/**
 	 * Hints to the outside that this quick open handler typically returns results fast.
 	 */
-	public hasShortResponseTime(): boolean {
+	hasShortResponseTime(): boolean {
 		return false;
 	}
 
@@ -79,14 +80,14 @@ export class QuickOpenHandler {
 	 * Indicates if the handler wishes the quick open widget to automatically select the first result entry or an entry
 	 * based on a specific prefix match.
 	 */
-	public getAutoFocus(searchValue: string, context: { model: IModel<QuickOpenEntry>, quickNavigateConfiguration?: IQuickNavigateConfiguration }): IAutoFocus {
+	getAutoFocus(searchValue: string, context: { model: IModel<QuickOpenEntry>, quickNavigateConfiguration?: IQuickNavigateConfiguration }): IAutoFocus {
 		return {};
 	}
 
 	/**
 	 * Indicates to the handler that the quick open widget has been opened.
 	 */
-	public onOpen(): void {
+	onOpen(): void {
 		return;
 	}
 
@@ -94,21 +95,21 @@ export class QuickOpenHandler {
 	 * Indicates to the handler that the quick open widget has been closed. Allows to free up any resources as needed.
 	 * The parameter canceled indicates if the quick open widget was closed with an entry being run or not.
 	 */
-	public onClose(canceled: boolean): void {
+	onClose(canceled: boolean): void {
 		return;
 	}
 
 	/**
 	 * Allows to return a label that will be placed to the side of the results from this handler or null if none.
 	 */
-	public getGroupLabel(): string {
+	getGroupLabel(): string {
 		return null;
 	}
 
 	/**
 	 * Allows to return a label that will be used when there are no results found
 	 */
-	public getEmptyLabel(searchString: string): string {
+	getEmptyLabel(searchString: string): string {
 		if (searchString.length > 0) {
 			return nls.localize('noResultsMatching', "No results matching");
 		}
@@ -126,11 +127,11 @@ export interface QuickOpenHandlerHelpEntry {
  * A lightweight descriptor of a quick open handler.
  */
 export class QuickOpenHandlerDescriptor {
-	public prefix: string;
-	public description: string;
-	public contextKey: string;
-	public helpEntries: QuickOpenHandlerHelpEntry[];
-	public instantProgress: boolean;
+	prefix: string;
+	description: string;
+	contextKey: string;
+	helpEntries: QuickOpenHandlerHelpEntry[];
+	instantProgress: boolean;
 
 	private id: string;
 	private ctor: IConstructorSignature0<QuickOpenHandler>;
@@ -151,11 +152,11 @@ export class QuickOpenHandlerDescriptor {
 		}
 	}
 
-	public getId(): string {
+	getId(): string {
 		return this.id;
 	}
 
-	public instantiate(instantiationService: IInstantiationService): QuickOpenHandler {
+	instantiate(instantiationService: IInstantiationService): QuickOpenHandler {
 		return instantiationService.createInstance(this.ctor);
 	}
 }
@@ -193,14 +194,10 @@ export interface IQuickOpenRegistry {
 }
 
 class QuickOpenRegistry implements IQuickOpenRegistry {
-	private handlers: QuickOpenHandlerDescriptor[];
+	private handlers: QuickOpenHandlerDescriptor[] = [];
 	private defaultHandler: QuickOpenHandlerDescriptor;
 
-	constructor() {
-		this.handlers = [];
-	}
-
-	public registerQuickOpenHandler(descriptor: QuickOpenHandlerDescriptor): void {
+	registerQuickOpenHandler(descriptor: QuickOpenHandlerDescriptor): void {
 		this.handlers.push(descriptor);
 
 		// sort the handlers by decreasing prefix length, such that longer
@@ -208,19 +205,19 @@ class QuickOpenRegistry implements IQuickOpenRegistry {
 		this.handlers.sort((h1, h2) => h2.prefix.length - h1.prefix.length);
 	}
 
-	public registerDefaultQuickOpenHandler(descriptor: QuickOpenHandlerDescriptor): void {
+	registerDefaultQuickOpenHandler(descriptor: QuickOpenHandlerDescriptor): void {
 		this.defaultHandler = descriptor;
 	}
 
-	public getQuickOpenHandlers(): QuickOpenHandlerDescriptor[] {
+	getQuickOpenHandlers(): QuickOpenHandlerDescriptor[] {
 		return this.handlers.slice(0);
 	}
 
-	public getQuickOpenHandler(text: string): QuickOpenHandlerDescriptor {
+	getQuickOpenHandler(text: string): QuickOpenHandlerDescriptor {
 		return text ? arrays.first(this.handlers, h => strings.startsWith(text, h.prefix), null) : null;
 	}
 
-	public getDefaultQuickOpenHandler(): QuickOpenHandlerDescriptor {
+	getDefaultQuickOpenHandler(): QuickOpenHandlerDescriptor {
 		return this.defaultHandler;
 	}
 }
@@ -249,19 +246,19 @@ export class EditorQuickOpenEntry extends QuickOpenEntry implements IEditorQuick
 		super();
 	}
 
-	public get editorService() {
+	get editorService() {
 		return this._editorService;
 	}
 
-	public getInput(): IResourceInput | IEditorInput {
+	getInput(): IResourceInput | IEditorInput {
 		return null;
 	}
 
-	public getOptions(): IEditorOptions {
+	getOptions(): IEditorOptions {
 		return null;
 	}
 
-	public run(mode: Mode, context: IEntryRunContext): boolean {
+	run(mode: Mode, context: IEntryRunContext): boolean {
 		const hideWidget = (mode === Mode.OPEN);
 
 		if (mode === Mode.OPEN || mode === Mode.OPEN_IN_BACKGROUND) {
@@ -304,11 +301,11 @@ export class EditorQuickOpenEntry extends QuickOpenEntry implements IEditorQuick
  */
 export class EditorQuickOpenEntryGroup extends QuickOpenEntryGroup implements IEditorQuickOpenEntry {
 
-	public getInput(): IEditorInput | IResourceInput {
+	getInput(): IEditorInput | IResourceInput {
 		return null;
 	}
 
-	public getOptions(): IEditorOptions {
+	getOptions(): IEditorOptions {
 		return null;
 	}
 }
@@ -328,7 +325,7 @@ export class QuickOpenAction extends Action {
 		this.enabled = !!this.quickOpenService;
 	}
 
-	public run(context?: any): TPromise<void> {
+	run(context?: any): TPromise<void> {
 
 		// Show with prefix
 		this.quickOpenService.show(this.prefix);
diff --git a/src/vs/workbench/browser/viewlet.ts b/src/vs/workbench/browser/viewlet.ts
index b67b491a4b1..5d0bc64e5e8 100644
--- a/src/vs/workbench/browser/viewlet.ts
+++ b/src/vs/workbench/browser/viewlet.ts
@@ -18,6 +18,7 @@ import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IPartService } from 'vs/workbench/services/part/common/partService';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { IEditorGroupsService } from 'vs/workbench/services/group/common/editorGroupsService';
+import { URI } from 'vs/base/common/uri';
 
 export abstract class Viewlet extends Composite implements IViewlet {
 
@@ -29,11 +30,11 @@ export abstract class Viewlet extends Composite implements IViewlet {
 		super(id, telemetryService, themeService);
 	}
 
-	public getOptimalWidth(): number {
+	getOptimalWidth(): number {
 		return null;
 	}
 
-	public getContextMenuActions(): IAction[] {
+	getContextMenuActions(): IAction[] {
 		return [<IAction>{
 			id: ToggleSidebarVisibilityAction.ID,
 			label: nls.localize('compositePart.hideSideBarLabel', "Hide Side Bar"),
@@ -54,12 +55,12 @@ export class ViewletDescriptor extends CompositeDescriptor<Viewlet> {
 		name: string,
 		cssClass?: string,
 		order?: number,
-		private _iconUrl?: string
+		private _iconUrl?: URI
 	) {
 		super(ctor, id, name, cssClass, order, id);
 	}
 
-	public get iconUrl(): string {
+	get iconUrl(): URI {
 		return this._iconUrl;
 	}
 }
@@ -74,35 +75,35 @@ export class ViewletRegistry extends CompositeRegistry<Viewlet> {
 	/**
 	 * Registers a viewlet to the platform.
 	 */
-	public registerViewlet(descriptor: ViewletDescriptor): void {
+	registerViewlet(descriptor: ViewletDescriptor): void {
 		super.registerComposite(descriptor);
 	}
 
 	/**
 	 * Returns the viewlet descriptor for the given id or null if none.
 	 */
-	public getViewlet(id: string): ViewletDescriptor {
+	getViewlet(id: string): ViewletDescriptor {
 		return this.getComposite(id) as ViewletDescriptor;
 	}
 
 	/**
 	 * Returns an array of registered viewlets known to the platform.
 	 */
-	public getViewlets(): ViewletDescriptor[] {
+	getViewlets(): ViewletDescriptor[] {
 		return this.getComposites() as ViewletDescriptor[];
 	}
 
 	/**
 	 * Sets the id of the viewlet that should open on startup by default.
 	 */
-	public setDefaultViewletId(id: string): void {
+	setDefaultViewletId(id: string): void {
 		this.defaultViewletId = id;
 	}
 
 	/**
 	 * Gets the id of the viewlet that should open on startup by default.
 	 */
-	public getDefaultViewletId(): string {
+	getDefaultViewletId(): string {
 		return this.defaultViewletId;
 	}
 }
@@ -128,7 +129,7 @@ export class ToggleViewletAction extends Action {
 		this.enabled = !!this.viewletService && !!this.editorGroupService;
 	}
 
-	public run(): TPromise<any> {
+	run(): TPromise<any> {
 
 		// Pass focus to viewlet if not open or focused
 		if (this.otherViewletShowing() || !this.sidebarHasFocus()) {
diff --git a/src/vs/workbench/buildfile.js b/src/vs/workbench/buildfile.js
index 4b83a39ab10..1dfb66c06b4 100644
--- a/src/vs/workbench/buildfile.js
+++ b/src/vs/workbench/buildfile.js
@@ -27,8 +27,6 @@ exports.collectModules = function () {
 		createModuleDescription('vs/workbench/services/files/node/watcher/nsfw/watcherApp', []),
 
 		createModuleDescription('vs/workbench/node/extensionHostProcess', []),
-
-		createModuleDescription('vs/workbench/parts/terminal/node/terminalProcess', [])
 	];
 
 	return modules;
diff --git a/src/vs/workbench/common/actions.ts b/src/vs/workbench/common/actions.ts
index a2533c808d4..723636de8bc 100644
--- a/src/vs/workbench/common/actions.ts
+++ b/src/vs/workbench/common/actions.ts
@@ -6,13 +6,14 @@
 
 import { TPromise } from 'vs/base/common/winjs.base';
 import { Registry } from 'vs/platform/registry/common/platform';
-import { KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRegistry';
+import { KeybindingsRegistry, KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
 import { ICommandHandler, CommandsRegistry } from 'vs/platform/commands/common/commands';
 import { SyncActionDescriptor, MenuRegistry, MenuId } from 'vs/platform/actions/common/actions';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IDisposable, combinedDisposable } from 'vs/base/common/lifecycle';
 import { ILifecycleService, LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
 import { INotificationService } from 'vs/platform/notification/common/notification';
+import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
 
 export const Extensions = {
 	WorkbenchActions: 'workbench.contributions.actions'
@@ -24,29 +25,28 @@ export interface IWorkbenchActionRegistry {
 	 * Registers a workbench action to the platform. Workbench actions are not
 	 * visible by default and can only be invoked through a keybinding if provided.
 	 */
-	registerWorkbenchAction(descriptor: SyncActionDescriptor, alias: string, category?: string): IDisposable;
+	registerWorkbenchAction(descriptor: SyncActionDescriptor, alias: string, category?: string, when?: ContextKeyExpr): IDisposable;
 }
 
 Registry.add(Extensions.WorkbenchActions, new class implements IWorkbenchActionRegistry {
 
-	registerWorkbenchAction(descriptor: SyncActionDescriptor, alias: string, category?: string): IDisposable {
-		return this._registerWorkbenchCommandFromAction(descriptor, alias, category);
+	registerWorkbenchAction(descriptor: SyncActionDescriptor, alias: string, category?: string, when?: ContextKeyExpr): IDisposable {
+		return this._registerWorkbenchCommandFromAction(descriptor, alias, category, when);
 	}
 
-	private _registerWorkbenchCommandFromAction(descriptor: SyncActionDescriptor, alias: string, category?: string): IDisposable {
+	private _registerWorkbenchCommandFromAction(descriptor: SyncActionDescriptor, alias: string, category?: string, when?: ContextKeyExpr): IDisposable {
 		let registrations: IDisposable[] = [];
 
 		// command
 		registrations.push(CommandsRegistry.registerCommand(descriptor.id, this._createCommandHandler(descriptor)));
 
 		// keybinding
-		const when = descriptor.keybindingContext;
-		const weight = (typeof descriptor.keybindingWeight === 'undefined' ? KeybindingsRegistry.WEIGHT.workbenchContrib() : descriptor.keybindingWeight);
+		const weight = (typeof descriptor.keybindingWeight === 'undefined' ? KeybindingWeight.WorkbenchContrib : descriptor.keybindingWeight);
 		const keybindings = descriptor.keybindings;
 		KeybindingsRegistry.registerKeybindingRule({
 			id: descriptor.id,
 			weight: weight,
-			when: when,
+			when: descriptor.keybindingContext,
 			primary: keybindings && keybindings.primary,
 			secondary: keybindings && keybindings.secondary,
 			win: keybindings && keybindings.win,
@@ -74,7 +74,7 @@ Registry.add(Extensions.WorkbenchActions, new class implements IWorkbenchActionR
 
 			MenuRegistry.addCommand(command);
 
-			registrations.push(MenuRegistry.appendMenuItem(MenuId.CommandPalette, { command }));
+			registrations.push(MenuRegistry.appendMenuItem(MenuId.CommandPalette, { command, when }));
 		}
 
 		// TODO@alex,joh
diff --git a/src/vs/workbench/common/component.ts b/src/vs/workbench/common/component.ts
index 99cafcca30c..f855f0a8a30 100644
--- a/src/vs/workbench/common/component.ts
+++ b/src/vs/workbench/common/component.ts
@@ -45,7 +45,7 @@ export class Component extends Themable implements IWorkbenchComponent {
 		this.componentMemento = new Memento(this.id);
 	}
 
-	public getId(): string {
+	getId(): string {
 		return this.id;
 	}
 
@@ -73,7 +73,7 @@ export class Component extends Themable implements IWorkbenchComponent {
 		this.componentMemento.saveMemento();
 	}
 
-	public shutdown(): void {
+	shutdown(): void {
 
 		// Save Memento
 		this.saveMemento();
diff --git a/src/vs/workbench/common/contributions.ts b/src/vs/workbench/common/contributions.ts
index fb6612f3a7c..46d05c51c77 100644
--- a/src/vs/workbench/common/contributions.ts
+++ b/src/vs/workbench/common/contributions.ts
@@ -6,7 +6,8 @@
 
 import { Registry } from 'vs/platform/registry/common/platform';
 import { IInstantiationService, IConstructorSignature0 } from 'vs/platform/instantiation/common/instantiation';
-import { ILifecycleService, LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
+import { ILifecycleService, LifecyclePhase, LifecyclePhaseToString } from 'vs/platform/lifecycle/common/lifecycle';
+import { mark } from 'vs/base/common/performance';
 
 // --- Workbench Contribution Registry
 
@@ -45,7 +46,7 @@ export class WorkbenchContributionsRegistry implements IWorkbenchContributionsRe
 
 	private toBeInstantiated: Map<LifecyclePhase, IConstructorSignature0<IWorkbenchContribution>[]> = new Map<LifecyclePhase, IConstructorSignature0<IWorkbenchContribution>[]>();
 
-	public registerWorkbenchContribution(ctor: IWorkbenchContributionSignature, phase: LifecyclePhase = LifecyclePhase.Starting): void {
+	registerWorkbenchContribution(ctor: IWorkbenchContributionSignature, phase: LifecyclePhase = LifecyclePhase.Starting): void {
 
 		// Instantiate directly if we are already matching the provided phase
 		if (this.instantiationService && this.lifecycleService && this.lifecycleService.phase >= phase) {
@@ -64,7 +65,7 @@ export class WorkbenchContributionsRegistry implements IWorkbenchContributionsRe
 		}
 	}
 
-	public start(instantiationService: IInstantiationService, lifecycleService: ILifecycleService): void {
+	start(instantiationService: IInstantiationService, lifecycleService: ILifecycleService): void {
 		this.instantiationService = instantiationService;
 		this.lifecycleService = lifecycleService;
 
@@ -89,13 +90,16 @@ export class WorkbenchContributionsRegistry implements IWorkbenchContributionsRe
 	}
 
 	private doInstantiateByPhase(instantiationService: IInstantiationService, phase: LifecyclePhase): void {
+		mark(`LifecyclePhase/${LifecyclePhaseToString(phase)}/createContrib:start`);
 		const toBeInstantiated = this.toBeInstantiated.get(phase);
 		if (toBeInstantiated) {
 			while (toBeInstantiated.length > 0) {
-				instantiationService.createInstance(toBeInstantiated.shift());
+				const ctor = toBeInstantiated.shift();
+				instantiationService.createInstance(ctor);
 			}
 		}
+		mark(`LifecyclePhase/${LifecyclePhaseToString(phase)}/createContrib:end`);
 	}
 }
 
-Registry.add(Extensions.Workbench, new WorkbenchContributionsRegistry());
\ No newline at end of file
+Registry.add(Extensions.Workbench, new WorkbenchContributionsRegistry());
diff --git a/src/vs/workbench/common/editor.ts b/src/vs/workbench/common/editor.ts
index 9a0e6fe7579..0ec4e750428 100644
--- a/src/vs/workbench/common/editor.ts
+++ b/src/vs/workbench/common/editor.ts
@@ -8,8 +8,8 @@ import { TPromise } from 'vs/base/common/winjs.base';
 import { Event, Emitter, once } from 'vs/base/common/event';
 import * as objects from 'vs/base/common/objects';
 import * as types from 'vs/base/common/types';
-import URI from 'vs/base/common/uri';
-import { IDisposable, dispose, Disposable } from 'vs/base/common/lifecycle';
+import { URI } from 'vs/base/common/uri';
+import { IDisposable, Disposable } from 'vs/base/common/lifecycle';
 import { IEditor as ICodeEditor, IEditorViewState, ScrollType, IDiffEditor } from 'vs/editor/common/editorCommon';
 import { IEditorModel, IEditorOptions, ITextEditorOptions, IBaseResourceInput } from 'vs/platform/editor/common/editor';
 import { IInstantiationService, IConstructorSignature0 } from 'vs/platform/instantiation/common/instantiation';
@@ -17,15 +17,16 @@ import { RawContextKey, ContextKeyExpr } from 'vs/platform/contextkey/common/con
 import { Registry } from 'vs/platform/registry/common/platform';
 import { ITextModel } from 'vs/editor/common/model';
 import { Schemas } from 'vs/base/common/network';
-import { LRUCache } from 'vs/base/common/map';
-import { IEditorGroupsService, IEditorGroup } from 'vs/workbench/services/group/common/editorGroupsService';
+import { IEditorGroup } from 'vs/workbench/services/group/common/editorGroupsService';
 import { ICompositeControl } from 'vs/workbench/common/composite';
 import { ActionRunner, IAction } from 'vs/base/common/actions';
 
+export const ActiveEditorContext = new RawContextKey<string>('activeEditor', null);
 export const EditorsVisibleContext = new RawContextKey<boolean>('editorIsOpen', false);
 export const EditorGroupActiveEditorDirtyContext = new RawContextKey<boolean>('groupActiveEditorDirty', false);
 export const NoEditorsVisibleContext: ContextKeyExpr = EditorsVisibleContext.toNegated();
 export const TextCompareEditorVisibleContext = new RawContextKey<boolean>('textCompareEditorVisible', false);
+export const TextCompareEditorActiveContext = new RawContextKey<boolean>('textCompareEditorActive', false);
 export const ActiveEditorGroupEmptyContext = new RawContextKey<boolean>('activeEditorGroupEmpty', false);
 export const MultipleEditorGroupsContext = new RawContextKey<boolean>('multipleEditorGroups', false);
 export const SingleEditorGroupsContext = MultipleEditorGroupsContext.toNegated();
@@ -59,6 +60,31 @@ export interface IEditor {
 	 */
 	group: IEditorGroup;
 
+	/**
+	 * The minimum width of this editor.
+	 */
+	readonly minimumWidth: number;
+
+	/**
+	 * The maximum width of this editor.
+	 */
+	readonly maximumWidth: number;
+
+	/**
+	 * The minimum height of this editor.
+	 */
+	readonly minimumHeight: number;
+
+	/**
+	 * The maximum height of this editor.
+	 */
+	readonly maximumHeight: number;
+
+	/**
+	 * An event to notify whenever minimum/maximum width/height changes.
+	 */
+	readonly onDidSizeConstraintsChange: Event<{ width: number; height: number; }>;
+
 	/**
 	 * Returns the unique identifier of this editor.
 	 */
@@ -223,7 +249,7 @@ export interface IResourceSideBySideInput extends IBaseResourceInput {
 	detailResource: URI;
 }
 
-export enum Verbosity {
+export const enum Verbosity {
 	SHORT,
 	MEDIUM,
 	LONG
@@ -254,6 +280,11 @@ export interface IEditorInput extends IDisposable {
 	 */
 	getResource(): URI;
 
+	/**
+	 * Unique type identifier for this inpput.
+	 */
+	getTypeId(): string;
+
 	/**
 	 * Returns the display name of this input.
 	 */
@@ -294,46 +325,28 @@ export interface IEditorInput extends IDisposable {
  * Editor inputs are lightweight objects that can be passed to the workbench API to open inside the editor part.
  * Each editor input is mapped to an editor that is capable of opening it through the Platform facade.
  */
-export abstract class EditorInput implements IEditorInput {
-	private readonly _onDispose: Emitter<void>;
-	protected _onDidChangeDirty: Emitter<void>;
-	protected _onDidChangeLabel: Emitter<void>;
+export abstract class EditorInput extends Disposable implements IEditorInput {
 
-	private disposed: boolean;
+	protected readonly _onDidChangeDirty: Emitter<void> = this._register(new Emitter<void>());
+	get onDidChangeDirty(): Event<void> { return this._onDidChangeDirty.event; }
 
-	constructor() {
-		this._onDidChangeDirty = new Emitter<void>();
-		this._onDidChangeLabel = new Emitter<void>();
-		this._onDispose = new Emitter<void>();
+	protected readonly _onDidChangeLabel: Emitter<void> = this._register(new Emitter<void>());
+	get onDidChangeLabel(): Event<void> { return this._onDidChangeLabel.event; }
 
-		this.disposed = false;
-	}
+	private readonly _onDispose: Emitter<void> = this._register(new Emitter<void>());
+	get onDispose(): Event<void> { return this._onDispose.event; }
+
+	private disposed: boolean = false;
 
 	/**
-	 * Fired when the dirty state of this input changes.
+	 * Returns the unique type identifier of this input.
 	 */
-	public get onDidChangeDirty(): Event<void> {
-		return this._onDidChangeDirty.event;
-	}
-
-	/**
-	 * Fired when the label this input changes.
-	 */
-	public get onDidChangeLabel(): Event<void> {
-		return this._onDidChangeLabel.event;
-	}
-
-	/**
-	 * Fired when the model gets disposed.
-	 */
-	public get onDispose(): Event<void> {
-		return this._onDispose.event;
-	}
+	abstract getTypeId(): string;
 
 	/**
 	 * Returns the associated resource of this input if any.
 	 */
-	public getResource(): URI {
+	getResource(): URI {
 		return null;
 	}
 
@@ -341,7 +354,7 @@ export abstract class EditorInput implements IEditorInput {
 	 * Returns the name of this input that can be shown to the user. Examples include showing the name of the input
 	 * above the editor area when the input is shown.
 	 */
-	public getName(): string {
+	getName(): string {
 		return null;
 	}
 
@@ -349,24 +362,23 @@ export abstract class EditorInput implements IEditorInput {
 	 * Returns the description of this input that can be shown to the user. Examples include showing the description of
 	 * the input above the editor area to the side of the name of the input.
 	 */
-	public getDescription(verbosity?: Verbosity): string {
+	getDescription(verbosity?: Verbosity): string {
 		return null;
 	}
 
-	public getTitle(verbosity?: Verbosity): string {
+	/**
+	 * Returns the title of this input that can be shown to the user. Examples include showing the title of
+	 * the input above the editor area as hover over the input label.
+	 */
+	getTitle(verbosity?: Verbosity): string {
 		return this.getName();
 	}
 
-	/**
-	 * Returns the unique type identifier of this input.
-	 */
-	public abstract getTypeId(): string;
-
 	/**
 	 * Returns the preferred editor for this input. A list of candidate editors is passed in that whee registered
 	 * for the input. This allows subclasses to decide late which editor to use for the input on a case by case basis.
 	 */
-	public getPreferredEditorId(candidates: string[]): string {
+	getPreferredEditorId(candidates: string[]): string {
 		if (candidates && candidates.length > 0) {
 			return candidates[0];
 		}
@@ -379,7 +391,7 @@ export abstract class EditorInput implements IEditorInput {
 	 *
 	 * Subclasses should extend if they can contribute.
 	 */
-	public getTelemetryDescriptor(): object {
+	getTelemetryDescriptor(): object {
 		/* __GDPR__FRAGMENT__
 			"EditorTelemetryDescriptor" : {
 				"typeId" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
@@ -390,89 +402,85 @@ export abstract class EditorInput implements IEditorInput {
 
 	/**
 	 * Returns a type of EditorModel that represents the resolved input. Subclasses should
-	 * override to provide a meaningful model. The optional second argument allows to specify
-	 * if the EditorModel should be refreshed before returning it. Depending on the implementation
-	 * this could mean to refresh the editor model contents with the version from disk.
+	 * override to provide a meaningful model.
 	 */
-	public abstract resolve(refresh?: boolean): TPromise<IEditorModel>;
+	abstract resolve(): TPromise<IEditorModel>;
 
 	/**
 	 * An editor that is dirty will be asked to be saved once it closes.
 	 */
-	public isDirty(): boolean {
+	isDirty(): boolean {
 		return false;
 	}
 
 	/**
 	 * Subclasses should bring up a proper dialog for the user if the editor is dirty and return the result.
 	 */
-	public confirmSave(): TPromise<ConfirmResult> {
+	confirmSave(): TPromise<ConfirmResult> {
 		return TPromise.wrap(ConfirmResult.DONT_SAVE);
 	}
 
 	/**
 	 * Saves the editor if it is dirty. Subclasses return a promise with a boolean indicating the success of the operation.
 	 */
-	public save(): TPromise<boolean> {
+	save(): TPromise<boolean> {
 		return TPromise.as(true);
 	}
 
 	/**
 	 * Reverts the editor if it is dirty. Subclasses return a promise with a boolean indicating the success of the operation.
 	 */
-	public revert(options?: IRevertOptions): TPromise<boolean> {
+	revert(options?: IRevertOptions): TPromise<boolean> {
 		return TPromise.as(true);
 	}
 
 	/**
 	 * Called when this input is no longer opened in any editor. Subclasses can free resources as needed.
 	 */
-	public close(): void {
+	close(): void {
 		this.dispose();
 	}
 
 	/**
 	 * Subclasses can set this to false if it does not make sense to split the editor input.
 	 */
-	public supportsSplitEditor(): boolean {
+	supportsSplitEditor(): boolean {
 		return true;
 	}
 
 	/**
 	 * Returns true if this input is identical to the otherInput.
 	 */
-	public matches(otherInput: any): boolean {
+	matches(otherInput: any): boolean {
 		return this === otherInput;
 	}
 
+	/**
+	 * Returns whether this input was disposed or not.
+	 */
+	isDisposed(): boolean {
+		return this.disposed;
+	}
+
 	/**
 	 * Called when an editor input is no longer needed. Allows to free up any resources taken by
 	 * resolving the editor input.
 	 */
-	public dispose(): void {
+	dispose(): void {
 		this.disposed = true;
 		this._onDispose.fire();
 
-		this._onDidChangeDirty.dispose();
-		this._onDidChangeLabel.dispose();
-		this._onDispose.dispose();
-	}
-
-	/**
-	 * Returns whether this input was disposed or not.
-	 */
-	public isDisposed(): boolean {
-		return this.disposed;
+		super.dispose();
 	}
 }
 
-export enum ConfirmResult {
+export const enum ConfirmResult {
 	SAVE,
 	DONT_SAVE,
 	CANCEL
 }
 
-export enum EncodingMode {
+export const enum EncodingMode {
 
 	/**
 	 * Instructs the encoding support to encode the current input with the provided encoding
@@ -520,13 +528,11 @@ export interface IFileEditorInput extends IEditorInput, IEncodingSupport {
  */
 export class SideBySideEditorInput extends EditorInput {
 
-	public static readonly ID: string = 'workbench.editorinputs.sidebysideEditorInput';
-
-	private _toUnbind: IDisposable[];
+	static readonly ID: string = 'workbench.editorinputs.sidebysideEditorInput';
 
 	constructor(private name: string, private description: string, private _details: EditorInput, private _master: EditorInput) {
 		super();
-		this._toUnbind = [];
+
 		this.registerListeners();
 	}
 
@@ -538,23 +544,23 @@ export class SideBySideEditorInput extends EditorInput {
 		return this._details;
 	}
 
-	public isDirty(): boolean {
+	isDirty(): boolean {
 		return this.master.isDirty();
 	}
 
-	public confirmSave(): TPromise<ConfirmResult> {
+	confirmSave(): TPromise<ConfirmResult> {
 		return this.master.confirmSave();
 	}
 
-	public save(): TPromise<boolean> {
+	save(): TPromise<boolean> {
 		return this.master.save();
 	}
 
-	public revert(): TPromise<boolean> {
+	revert(): TPromise<boolean> {
 		return this.master.revert();
 	}
 
-	public getTelemetryDescriptor(): object {
+	getTelemetryDescriptor(): object {
 		const descriptor = this.master.getTelemetryDescriptor();
 		return objects.assign(descriptor, super.getTelemetryDescriptor());
 	}
@@ -563,29 +569,25 @@ export class SideBySideEditorInput extends EditorInput {
 
 		// When the details or master input gets disposed, dispose this diff editor input
 		const onceDetailsDisposed = once(this.details.onDispose);
-		this._toUnbind.push(onceDetailsDisposed(() => {
+		this._register(onceDetailsDisposed(() => {
 			if (!this.isDisposed()) {
 				this.dispose();
 			}
 		}));
 
 		const onceMasterDisposed = once(this.master.onDispose);
-		this._toUnbind.push(onceMasterDisposed(() => {
+		this._register(onceMasterDisposed(() => {
 			if (!this.isDisposed()) {
 				this.dispose();
 			}
 		}));
 
 		// Reemit some events from the master side to the outside
-		this._toUnbind.push(this.master.onDidChangeDirty(() => this._onDidChangeDirty.fire()));
-		this._toUnbind.push(this.master.onDidChangeLabel(() => this._onDidChangeLabel.fire()));
+		this._register(this.master.onDidChangeDirty(() => this._onDidChangeDirty.fire()));
+		this._register(this.master.onDidChangeLabel(() => this._onDidChangeLabel.fire()));
 	}
 
-	public get toUnbind() {
-		return this._toUnbind;
-	}
-
-	public resolve(refresh?: boolean): TPromise<EditorModel> {
+	resolve(): TPromise<EditorModel> {
 		return TPromise.as(null);
 	}
 
@@ -593,19 +595,15 @@ export class SideBySideEditorInput extends EditorInput {
 		return SideBySideEditorInput.ID;
 	}
 
-	public getName(): string {
+	getName(): string {
 		return this.name;
 	}
 
-	public getDescription(): string {
+	getDescription(): string {
 		return this.description;
 	}
 
-	public supportsSplitEditor(): boolean {
-		return false;
-	}
-
-	public matches(otherInput: any): boolean {
+	matches(otherInput: any): boolean {
 		if (super.matches(otherInput) === true) {
 			return true;
 		}
@@ -621,11 +619,6 @@ export class SideBySideEditorInput extends EditorInput {
 
 		return false;
 	}
-
-	public dispose(): void {
-		this._toUnbind = dispose(this._toUnbind);
-		super.dispose();
-	}
 }
 
 export interface ITextEditorModel extends IEditorModel {
@@ -638,40 +631,30 @@ export interface ITextEditorModel extends IEditorModel {
  * are typically cached for some while because they are expensive to construct.
  */
 export class EditorModel extends Disposable implements IEditorModel {
-	private readonly _onDispose: Emitter<void>;
 
-	constructor() {
-		super();
-		this._onDispose = new Emitter<void>();
-	}
-
-	/**
-	 * Fired when the model gets disposed.
-	 */
-	public get onDispose(): Event<void> {
-		return this._onDispose.event;
-	}
+	private readonly _onDispose: Emitter<void> = this._register(new Emitter<void>());
+	get onDispose(): Event<void> { return this._onDispose.event; }
 
 	/**
 	 * Causes this model to load returning a promise when loading is completed.
 	 */
-	public load(): TPromise<EditorModel> {
+	load(): TPromise<EditorModel> {
 		return TPromise.as(this);
 	}
 
 	/**
 	 * Returns whether this model was loaded or not.
 	 */
-	public isResolved(): boolean {
+	isResolved(): boolean {
 		return true;
 	}
 
 	/**
 	 * Subclasses should implement to free resources that have been claimed through loading.
 	 */
-	public dispose(): void {
+	dispose(): void {
 		this._onDispose.fire();
-		this._onDispose.dispose();
+
 		super.dispose();
 	}
 }
@@ -695,11 +678,11 @@ export class EditorOptions implements IEditorOptions {
 	/**
 	 * Helper to create EditorOptions inline.
 	 */
-	public static create(settings: IEditorOptions): EditorOptions {
+	static create(settings: IEditorOptions): EditorOptions {
 		const options = new EditorOptions();
 
 		options.preserveFocus = settings.preserveFocus;
-		options.forceOpen = settings.forceOpen;
+		options.forceReload = settings.forceReload;
 		options.revealIfVisible = settings.revealIfVisible;
 		options.revealIfOpened = settings.revealIfOpened;
 		options.pinned = settings.pinned;
@@ -713,41 +696,41 @@ export class EditorOptions implements IEditorOptions {
 	 * Tells the editor to not receive keyboard focus when the editor is being opened. By default,
 	 * the editor will receive keyboard focus on open.
 	 */
-	public preserveFocus: boolean;
+	preserveFocus: boolean;
 
 	/**
-	 * Tells the editor to replace the editor input in the editor even if it is identical to the one
-	 * already showing. By default, the editor will not replace the input if it is identical to the
+	 * Tells the editor to reload the editor input in the editor even if it is identical to the one
+	 * already showing. By default, the editor will not reload the input if it is identical to the
 	 * one showing.
 	 */
-	public forceOpen: boolean;
+	forceReload: boolean;
 
 	/**
 	 * Will reveal the editor if it is already opened and visible in any of the opened editor groups.
 	 */
-	public revealIfVisible: boolean;
+	revealIfVisible: boolean;
 
 	/**
 	 * Will reveal the editor if it is already opened (even when not visible) in any of the opened editor groups.
 	 */
-	public revealIfOpened: boolean;
+	revealIfOpened: boolean;
 
 	/**
 	 * An editor that is pinned remains in the editor stack even when another editor is being opened.
 	 * An editor that is not pinned will always get replaced by another editor that is not pinned.
 	 */
-	public pinned: boolean;
+	pinned: boolean;
 
 	/**
 	 * The index in the document stack where to insert the editor into when opening.
 	 */
-	public index: number;
+	index: number;
 
 	/**
 	 * An active editor that is opened will show its contents directly. Set to true to open an editor
 	 * in the background.
 	 */
-	public inactive: boolean;
+	inactive: boolean;
 }
 
 /**
@@ -762,7 +745,7 @@ export class TextEditorOptions extends EditorOptions {
 	private revealInCenterIfOutsideViewport: boolean;
 	private editorViewState: IEditorViewState;
 
-	public static from(input?: IBaseResourceInput): TextEditorOptions {
+	static from(input?: IBaseResourceInput): TextEditorOptions {
 		if (!input || !input.options) {
 			return null;
 		}
@@ -773,7 +756,7 @@ export class TextEditorOptions extends EditorOptions {
 	/**
 	 * Helper to convert options bag to real class
 	 */
-	public static create(options: ITextEditorOptions = Object.create(null)): TextEditorOptions {
+	static create(options: ITextEditorOptions = Object.create(null)): TextEditorOptions {
 		const textEditorOptions = new TextEditorOptions();
 
 		if (options.selection) {
@@ -785,8 +768,8 @@ export class TextEditorOptions extends EditorOptions {
 			textEditorOptions.editorViewState = options.viewState as IEditorViewState;
 		}
 
-		if (options.forceOpen) {
-			textEditorOptions.forceOpen = true;
+		if (options.forceReload) {
+			textEditorOptions.forceReload = true;
 		}
 
 		if (options.revealIfVisible) {
@@ -823,14 +806,14 @@ export class TextEditorOptions extends EditorOptions {
 	/**
 	 * Returns if this options object has objects defined for the editor.
 	 */
-	public hasOptionsDefined(): boolean {
+	hasOptionsDefined(): boolean {
 		return !!this.editorViewState || (!types.isUndefinedOrNull(this.startLineNumber) && !types.isUndefinedOrNull(this.startColumn));
 	}
 
 	/**
 	 * Tells the editor to set show the given selection when the editor is being opened.
 	 */
-	public selection(startLineNumber: number, startColumn: number, endLineNumber: number = startLineNumber, endColumn: number = startColumn): EditorOptions {
+	selection(startLineNumber: number, startColumn: number, endLineNumber: number = startLineNumber, endColumn: number = startColumn): EditorOptions {
 		this.startLineNumber = startLineNumber;
 		this.startColumn = startColumn;
 		this.endLineNumber = endLineNumber;
@@ -842,7 +825,7 @@ export class TextEditorOptions extends EditorOptions {
 	/**
 	 * Create a TextEditorOptions inline to be used when the editor is opening.
 	 */
-	public static fromEditor(editor: ICodeEditor, settings?: IEditorOptions): TextEditorOptions {
+	static fromEditor(editor: ICodeEditor, settings?: IEditorOptions): TextEditorOptions {
 		const options = TextEditorOptions.create(settings);
 
 		// View state
@@ -856,7 +839,7 @@ export class TextEditorOptions extends EditorOptions {
 	 *
 	 * @return if something was applied
 	 */
-	public apply(editor: ICodeEditor, scrollType: ScrollType): boolean {
+	apply(editor: ICodeEditor, scrollType: ScrollType): boolean {
 
 		// View state
 		return this.applyViewState(editor, scrollType);
@@ -1014,120 +997,21 @@ export function toResource(editor: IEditorInput, options?: IResourceOptions): UR
 	return null;
 }
 
-export enum CloseDirection {
+export const enum CloseDirection {
 	LEFT,
 	RIGHT
 }
 
-interface MapGroupToViewStates<T> {
-	[group: number]: T;
-}
+export interface IEditorMemento<T> {
 
-export class EditorViewStateMemento<T> {
-	private cache: LRUCache<string, MapGroupToViewStates<T>>;
+	saveState(group: IEditorGroup, resource: URI, state: T): void;
+	saveState(group: IEditorGroup, editor: EditorInput, state: T): void;
 
-	constructor(
-		private editorGroupService: IEditorGroupsService,
-		private memento: object,
-		private key: string,
-		private limit: number = 10
-	) { }
+	loadState(group: IEditorGroup, resource: URI): T;
+	loadState(group: IEditorGroup, editor: EditorInput): T;
 
-	public saveState(group: IEditorGroup, resource: URI, state: T): void;
-	public saveState(group: IEditorGroup, editor: EditorInput, state: T): void;
-	public saveState(group: IEditorGroup, resourceOrEditor: URI | EditorInput, state: T): void {
-		const resource = this.doGetResource(resourceOrEditor);
-		if (!resource || !group) {
-			return; // we are not in a good state to save any viewstate for a resource
-		}
-
-		const cache = this.doLoad();
-
-		let viewStates = cache.get(resource.toString());
-		if (!viewStates) {
-			viewStates = Object.create(null) as MapGroupToViewStates<T>;
-			cache.set(resource.toString(), viewStates);
-		}
-
-		viewStates[group.id] = state;
-
-		// Automatically clear when editor input gets disposed if any
-		if (resourceOrEditor instanceof EditorInput) {
-			once(resourceOrEditor.onDispose)(() => {
-				this.clearState(resource);
-			});
-		}
-	}
-
-	public loadState(group: IEditorGroup, resource: URI): T;
-	public loadState(group: IEditorGroup, editor: EditorInput): T;
-	public loadState(group: IEditorGroup, resourceOrEditor: URI | EditorInput): T {
-		const resource = this.doGetResource(resourceOrEditor);
-		if (!resource || !group) {
-			return void 0; // we are not in a good state to load any viewstate for a resource
-		}
-
-		const cache = this.doLoad();
-
-		const viewStates = cache.get(resource.toString());
-		if (viewStates) {
-			return viewStates[group.id];
-		}
-
-		return void 0;
-	}
-
-	public clearState(resource: URI): void;
-	public clearState(editor: EditorInput): void;
-	public clearState(resourceOrEditor: URI | EditorInput): void {
-		const resource = this.doGetResource(resourceOrEditor);
-		if (resource) {
-			const cache = this.doLoad();
-			cache.delete(resource.toString());
-		}
-	}
-
-	private doGetResource(resourceOrEditor: URI | EditorInput): URI {
-		if (resourceOrEditor instanceof EditorInput) {
-			return resourceOrEditor.getResource();
-		}
-
-		return resourceOrEditor;
-	}
-
-	private doLoad(): LRUCache<string, MapGroupToViewStates<T>> {
-		if (!this.cache) {
-			this.cache = new LRUCache<string, MapGroupToViewStates<T>>(this.limit);
-
-			// Restore from serialized map state
-			const rawViewState = this.memento[this.key];
-			if (Array.isArray(rawViewState)) {
-				this.cache.fromJSON(rawViewState);
-			}
-		}
-
-		return this.cache;
-	}
-
-	public save(): void {
-		const cache = this.doLoad();
-
-		// Remove groups from states that no longer exist
-		cache.forEach((mapGroupToViewStates, resource) => {
-			Object.keys(mapGroupToViewStates).forEach(group => {
-				const groupId: GroupIdentifier = Number(group);
-				if (!this.editorGroupService.getGroup(groupId)) {
-					delete mapGroupToViewStates[groupId];
-
-					if (types.isEmptyObject(mapGroupToViewStates)) {
-						cache.delete(resource);
-					}
-				}
-			});
-		});
-
-		this.memento[this.key] = cache.toJSON();
-	}
+	clearState(resource: URI): void;
+	clearState(editor: EditorInput): void;
 }
 
 class EditorInputFactoryRegistry implements IEditorInputFactoryRegistry {
@@ -1136,10 +1020,7 @@ class EditorInputFactoryRegistry implements IEditorInputFactoryRegistry {
 	private editorInputFactoryConstructors: { [editorInputId: string]: IConstructorSignature0<IEditorInputFactory> } = Object.create(null);
 	private editorInputFactoryInstances: { [editorInputId: string]: IEditorInputFactory } = Object.create(null);
 
-	constructor() {
-	}
-
-	public setInstantiationService(service: IInstantiationService): void {
+	setInstantiationService(service: IInstantiationService): void {
 		this.instantiationService = service;
 
 		for (let key in this.editorInputFactoryConstructors) {
@@ -1155,15 +1036,15 @@ class EditorInputFactoryRegistry implements IEditorInputFactoryRegistry {
 		this.editorInputFactoryInstances[editorInputId] = instance;
 	}
 
-	public registerFileInputFactory(factory: IFileInputFactory): void {
+	registerFileInputFactory(factory: IFileInputFactory): void {
 		this.fileInputFactory = factory;
 	}
 
-	public getFileInputFactory(): IFileInputFactory {
+	getFileInputFactory(): IFileInputFactory {
 		return this.fileInputFactory;
 	}
 
-	public registerEditorInputFactory(editorInputId: string, ctor: IConstructorSignature0<IEditorInputFactory>): void {
+	registerEditorInputFactory(editorInputId: string, ctor: IConstructorSignature0<IEditorInputFactory>): void {
 		if (!this.instantiationService) {
 			this.editorInputFactoryConstructors[editorInputId] = ctor;
 		} else {
@@ -1171,7 +1052,7 @@ class EditorInputFactoryRegistry implements IEditorInputFactoryRegistry {
 		}
 	}
 
-	public getEditorInputFactory(editorInputId: string): IEditorInputFactory {
+	getEditorInputFactory(editorInputId: string): IEditorInputFactory {
 		return this.editorInputFactoryInstances[editorInputId];
 	}
 }
diff --git a/src/vs/workbench/common/editor/binaryEditorModel.ts b/src/vs/workbench/common/editor/binaryEditorModel.ts
index d4f34881d8c..f1f425dc7a8 100644
--- a/src/vs/workbench/common/editor/binaryEditorModel.ts
+++ b/src/vs/workbench/common/editor/binaryEditorModel.ts
@@ -6,7 +6,7 @@
 
 import { TPromise } from 'vs/base/common/winjs.base';
 import { EditorModel } from 'vs/workbench/common/editor';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { IFileService } from 'vs/platform/files/common/files';
 import { Schemas } from 'vs/base/common/network';
 import { DataUri } from 'vs/workbench/common/resources';
@@ -44,39 +44,39 @@ export class BinaryEditorModel extends EditorModel {
 	/**
 	 * The name of the binary resource.
 	 */
-	public getName(): string {
+	getName(): string {
 		return this.name;
 	}
 
 	/**
 	 * The resource of the binary resource.
 	 */
-	public getResource(): URI {
+	getResource(): URI {
 		return this.resource;
 	}
 
 	/**
 	 * The size of the binary resource if known.
 	 */
-	public getSize(): number {
+	getSize(): number {
 		return this.size;
 	}
 
 	/**
 	 * The mime of the binary resource if known.
 	 */
-	public getMime(): string {
+	getMime(): string {
 		return this.mime;
 	}
 
 	/**
 	 * The etag of the binary resource if known.
 	 */
-	public getETag(): string {
+	getETag(): string {
 		return this.etag;
 	}
 
-	public load(): TPromise<EditorModel> {
+	load(): TPromise<EditorModel> {
 
 		// Make sure to resolve up to date stat for file resources
 		if (this.fileService.canHandleResource(this.resource)) {
diff --git a/src/vs/workbench/common/editor/dataUriEditorInput.ts b/src/vs/workbench/common/editor/dataUriEditorInput.ts
index c1d785bd73b..77e36cf47e0 100644
--- a/src/vs/workbench/common/editor/dataUriEditorInput.ts
+++ b/src/vs/workbench/common/editor/dataUriEditorInput.ts
@@ -7,7 +7,7 @@
 
 import { TPromise } from 'vs/base/common/winjs.base';
 import { EditorInput } from 'vs/workbench/common/editor';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { BinaryEditorModel } from 'vs/workbench/common/editor/binaryEditorModel';
 import { DataUri } from 'vs/workbench/common/resources';
@@ -49,27 +49,27 @@ export class DataUriEditorInput extends EditorInput {
 		}
 	}
 
-	public getResource(): URI {
+	getResource(): URI {
 		return this.resource;
 	}
 
-	public getTypeId(): string {
+	getTypeId(): string {
 		return DataUriEditorInput.ID;
 	}
 
-	public getName(): string {
+	getName(): string {
 		return this.name;
 	}
 
-	public getDescription(): string {
+	getDescription(): string {
 		return this.description;
 	}
 
-	public resolve(refresh?: boolean): TPromise<BinaryEditorModel> {
+	resolve(): TPromise<BinaryEditorModel> {
 		return this.instantiationService.createInstance(BinaryEditorModel, this.resource, this.getName()).load().then(m => m as BinaryEditorModel);
 	}
 
-	public matches(otherInput: any): boolean {
+	matches(otherInput: any): boolean {
 		if (super.matches(otherInput) === true) {
 			return true;
 		}
diff --git a/src/vs/workbench/common/editor/diffEditorInput.ts b/src/vs/workbench/common/editor/diffEditorInput.ts
index 7554329bd52..36f7632e566 100644
--- a/src/vs/workbench/common/editor/diffEditorInput.ts
+++ b/src/vs/workbench/common/editor/diffEditorInput.ts
@@ -16,7 +16,7 @@ import { TextDiffEditorModel } from 'vs/workbench/common/editor/textDiffEditorMo
  */
 export class DiffEditorInput extends SideBySideEditorInput {
 
-	public static readonly ID = 'workbench.editors.diffEditorInput';
+	static readonly ID = 'workbench.editors.diffEditorInput';
 
 	private cachedModel: DiffEditorModel;
 
@@ -24,7 +24,7 @@ export class DiffEditorInput extends SideBySideEditorInput {
 		super(name, description, original, modified);
 	}
 
-	public getTypeId(): string {
+	getTypeId(): string {
 		return DiffEditorInput.ID;
 	}
 
@@ -36,23 +36,13 @@ export class DiffEditorInput extends SideBySideEditorInput {
 		return this.master;
 	}
 
-	public resolve(refresh?: boolean): TPromise<EditorModel> {
-		let modelPromise: TPromise<EditorModel>;
-
-		// Use Cached Model
-		if (this.cachedModel && !refresh) {
-			modelPromise = TPromise.as<EditorModel>(this.cachedModel);
-		}
+	resolve(): TPromise<EditorModel> {
 
 		// Create Model - we never reuse our cached model if refresh is true because we cannot
 		// decide for the inputs within if the cached model can be reused or not. There may be
 		// inputs that need to be loaded again and thus we always recreate the model and dispose
 		// the previous one - if any.
-		else {
-			modelPromise = this.createModel(refresh);
-		}
-
-		return modelPromise.then((resolvedModel: DiffEditorModel) => {
+		return this.createModel().then(resolvedModel => {
 			if (this.cachedModel) {
 				this.cachedModel.dispose();
 			}
@@ -63,7 +53,7 @@ export class DiffEditorInput extends SideBySideEditorInput {
 		});
 	}
 
-	public getPreferredEditorId(candidates: string[]): string {
+	getPreferredEditorId(candidates: string[]): string {
 		return this.forceOpenAsBinary ? BINARY_DIFF_EDITOR_ID : TEXT_DIFF_EDITOR_ID;
 	}
 
@@ -71,9 +61,9 @@ export class DiffEditorInput extends SideBySideEditorInput {
 
 		// Join resolve call over two inputs and build diff editor model
 		return TPromise.join([
-			this.originalInput.resolve(refresh),
-			this.modifiedInput.resolve(refresh)
-		]).then((models) => {
+			this.originalInput.resolve(),
+			this.modifiedInput.resolve()
+		]).then(models => {
 			const originalEditorModel = models[0];
 			const modifiedEditorModel = models[1];
 
@@ -87,7 +77,7 @@ export class DiffEditorInput extends SideBySideEditorInput {
 		});
 	}
 
-	public dispose(): void {
+	dispose(): void {
 
 		// Free the diff editor model but do not propagate the dispose() call to the two inputs
 		// We never created the two inputs (original and modified) so we can not dispose
diff --git a/src/vs/workbench/common/editor/diffEditorModel.ts b/src/vs/workbench/common/editor/diffEditorModel.ts
index 47c74e1daf3..232e915b631 100644
--- a/src/vs/workbench/common/editor/diffEditorModel.ts
+++ b/src/vs/workbench/common/editor/diffEditorModel.ts
@@ -23,15 +23,15 @@ export class DiffEditorModel extends EditorModel {
 		this._modifiedModel = modifiedModel;
 	}
 
-	public get originalModel(): EditorModel {
+	get originalModel(): EditorModel {
 		return this._originalModel as EditorModel;
 	}
 
-	public get modifiedModel(): EditorModel {
+	get modifiedModel(): EditorModel {
 		return this._modifiedModel as EditorModel;
 	}
 
-	public load(): TPromise<EditorModel> {
+	load(): TPromise<EditorModel> {
 		return TPromise.join([
 			this._originalModel.load(),
 			this._modifiedModel.load()
@@ -40,11 +40,11 @@ export class DiffEditorModel extends EditorModel {
 		});
 	}
 
-	public isResolved(): boolean {
+	isResolved(): boolean {
 		return this.originalModel.isResolved() && this.modifiedModel.isResolved();
 	}
 
-	public dispose(): void {
+	dispose(): void {
 
 		// Do not propagate the dispose() call to the two models inside. We never created the two models
 		// (original and modified) so we can not dispose them without sideeffects. Rather rely on the
diff --git a/src/vs/workbench/common/editor/editorGroup.ts b/src/vs/workbench/common/editor/editorGroup.ts
index ed1162c922e..d35ba11c3b7 100644
--- a/src/vs/workbench/common/editor/editorGroup.ts
+++ b/src/vs/workbench/common/editor/editorGroup.ts
@@ -7,7 +7,7 @@
 
 import { Event, Emitter, once } from 'vs/base/common/event';
 import { Extensions, IEditorInputFactoryRegistry, EditorInput, toResource, IEditorIdentifier, IEditorCloseEvent, GroupIdentifier, SideBySideEditorInput, CloseDirection } from 'vs/workbench/common/editor';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IConfigurationService, IConfigurationChangeEvent } from 'vs/platform/configuration/common/configuration';
 import { dispose, IDisposable, Disposable } from 'vs/base/common/lifecycle';
diff --git a/src/vs/workbench/common/editor/resourceEditorInput.ts b/src/vs/workbench/common/editor/resourceEditorInput.ts
index 0d19259d23a..0d14f8910ce 100644
--- a/src/vs/workbench/common/editor/resourceEditorInput.ts
+++ b/src/vs/workbench/common/editor/resourceEditorInput.ts
@@ -6,7 +6,7 @@
 
 import { TPromise } from 'vs/base/common/winjs.base';
 import { EditorInput, ITextEditorModel } from 'vs/workbench/common/editor';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { IReference } from 'vs/base/common/lifecycle';
 import { telemetryURIDescriptor } from 'vs/platform/telemetry/common/telemetryUtils';
 import { ITextModelService } from 'vs/editor/common/services/resolverService';
@@ -40,37 +40,37 @@ export class ResourceEditorInput extends EditorInput {
 		this.resource = resource;
 	}
 
-	public getResource(): URI {
+	getResource(): URI {
 		return this.resource;
 	}
 
-	public getTypeId(): string {
+	getTypeId(): string {
 		return ResourceEditorInput.ID;
 	}
 
-	public getName(): string {
+	getName(): string {
 		return this.name;
 	}
 
-	public setName(name: string): void {
+	setName(name: string): void {
 		if (this.name !== name) {
 			this.name = name;
 			this._onDidChangeLabel.fire();
 		}
 	}
 
-	public getDescription(): string {
+	getDescription(): string {
 		return this.description;
 	}
 
-	public setDescription(description: string): void {
+	setDescription(description: string): void {
 		if (this.description !== description) {
 			this.description = description;
 			this._onDidChangeLabel.fire();
 		}
 	}
 
-	public getTelemetryDescriptor(): object {
+	getTelemetryDescriptor(): object {
 		const descriptor = super.getTelemetryDescriptor();
 		descriptor['resource'] = telemetryURIDescriptor(this.resource, path => this.hashService.createSHA1(path));
 
@@ -82,7 +82,7 @@ export class ResourceEditorInput extends EditorInput {
 		return descriptor;
 	}
 
-	public resolve(refresh?: boolean): TPromise<ITextEditorModel> {
+	resolve(): TPromise<ITextEditorModel> {
 		if (!this.modelReference) {
 			this.modelReference = this.textModelResolverService.createModelReference(this.resource);
 		}
@@ -101,7 +101,7 @@ export class ResourceEditorInput extends EditorInput {
 		});
 	}
 
-	public matches(otherInput: any): boolean {
+	matches(otherInput: any): boolean {
 		if (super.matches(otherInput) === true) {
 			return true;
 		}
@@ -116,9 +116,9 @@ export class ResourceEditorInput extends EditorInput {
 		return false;
 	}
 
-	public dispose(): void {
+	dispose(): void {
 		if (this.modelReference) {
-			this.modelReference.done(ref => ref.dispose());
+			this.modelReference.then(ref => ref.dispose());
 			this.modelReference = null;
 		}
 
diff --git a/src/vs/workbench/common/editor/resourceEditorModel.ts b/src/vs/workbench/common/editor/resourceEditorModel.ts
index a195fbe3ebe..b990774ae65 100644
--- a/src/vs/workbench/common/editor/resourceEditorModel.ts
+++ b/src/vs/workbench/common/editor/resourceEditorModel.ts
@@ -5,7 +5,7 @@
 'use strict';
 
 import { BaseTextEditorModel } from 'vs/workbench/common/editor/textEditorModel';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { IModeService } from 'vs/editor/common/services/modeService';
 import { IModelService } from 'vs/editor/common/services/modelService';
 
@@ -24,4 +24,8 @@ export class ResourceEditorModel extends BaseTextEditorModel {
 		// TODO@Joao: force this class to dispose the underlying model
 		this.createdEditorModel = true;
 	}
+
+	isReadonly(): boolean {
+		return true;
+	}
 }
\ No newline at end of file
diff --git a/src/vs/workbench/common/editor/textDiffEditorModel.ts b/src/vs/workbench/common/editor/textDiffEditorModel.ts
index dc199593c22..dd26af7c5f2 100644
--- a/src/vs/workbench/common/editor/textDiffEditorModel.ts
+++ b/src/vs/workbench/common/editor/textDiffEditorModel.ts
@@ -31,7 +31,7 @@ export class TextDiffEditorModel extends DiffEditorModel {
 		return this._modifiedModel as BaseTextEditorModel;
 	}
 
-	public load(): TPromise<EditorModel> {
+	load(): TPromise<EditorModel> {
 		return super.load().then(() => {
 			this.updateTextDiffEditorModel();
 
@@ -58,15 +58,19 @@ export class TextDiffEditorModel extends DiffEditorModel {
 		}
 	}
 
-	public get textDiffEditorModel(): IDiffEditorModel {
+	get textDiffEditorModel(): IDiffEditorModel {
 		return this._textDiffEditorModel;
 	}
 
-	public isResolved(): boolean {
+	isResolved(): boolean {
 		return !!this._textDiffEditorModel;
 	}
 
-	public dispose(): void {
+	isReadonly(): boolean {
+		return this.modifiedModel.isReadonly();
+	}
+
+	dispose(): void {
 
 		// Free the diff editor model but do not propagate the dispose() call to the two models
 		// inside. We never created the two models (original and modified) so we can not dispose
@@ -76,4 +80,4 @@ export class TextDiffEditorModel extends DiffEditorModel {
 
 		super.dispose();
 	}
-}
\ No newline at end of file
+}
diff --git a/src/vs/workbench/common/editor/textEditorModel.ts b/src/vs/workbench/common/editor/textEditorModel.ts
index 3d87656feb7..5f694f64d85 100644
--- a/src/vs/workbench/common/editor/textEditorModel.ts
+++ b/src/vs/workbench/common/editor/textEditorModel.ts
@@ -8,7 +8,7 @@ import { TPromise } from 'vs/base/common/winjs.base';
 import { ITextModel, ITextBufferFactory } from 'vs/editor/common/model';
 import { IMode } from 'vs/editor/common/modes';
 import { EditorModel } from 'vs/workbench/common/editor';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { ITextEditorModel } from 'vs/editor/common/services/resolverService';
 import { IModeService } from 'vs/editor/common/services/modeService';
 import { IModelService } from 'vs/editor/common/services/modelService';
@@ -19,8 +19,10 @@ import { ITextSnapshot } from 'vs/platform/files/common/files';
  * The base text editor model leverages the code editor model. This class is only intended to be subclassed and not instantiated.
  */
 export abstract class BaseTextEditorModel extends EditorModel implements ITextEditorModel {
-	private textEditorModelHandle: URI;
+
 	protected createdEditorModel: boolean;
+
+	private textEditorModelHandle: URI;
 	private modelDisposeListener: IDisposable;
 
 	constructor(
@@ -60,10 +62,12 @@ export abstract class BaseTextEditorModel extends EditorModel implements ITextEd
 		});
 	}
 
-	public get textEditorModel(): ITextModel {
+	get textEditorModel(): ITextModel {
 		return this.textEditorModelHandle ? this.modelService.getModel(this.textEditorModelHandle) : null;
 	}
 
+	abstract isReadonly(): boolean;
+
 	/**
 	 * Creates the text editor model with the provided value, modeId (can be comma separated for multiple values) and optional resource URL.
 	 */
@@ -124,7 +128,7 @@ export abstract class BaseTextEditorModel extends EditorModel implements ITextEd
 		this.modelService.updateModel(this.textEditorModel, newValue);
 	}
 
-	public createSnapshot(): ITextSnapshot {
+	createSnapshot(): ITextSnapshot {
 		const model = this.textEditorModel;
 		if (model) {
 			return model.createSnapshot(true /* Preserve BOM */);
@@ -133,11 +137,11 @@ export abstract class BaseTextEditorModel extends EditorModel implements ITextEd
 		return null;
 	}
 
-	public isResolved(): boolean {
+	isResolved(): boolean {
 		return !!this.textEditorModelHandle;
 	}
 
-	public dispose(): void {
+	dispose(): void {
 		if (this.modelDisposeListener) {
 			this.modelDisposeListener.dispose(); // dispose this first because it will trigger another dispose() otherwise
 			this.modelDisposeListener = null;
diff --git a/src/vs/workbench/common/editor/untitledEditorInput.ts b/src/vs/workbench/common/editor/untitledEditorInput.ts
index 6778205ccda..c0728b9cd11 100644
--- a/src/vs/workbench/common/editor/untitledEditorInput.ts
+++ b/src/vs/workbench/common/editor/untitledEditorInput.ts
@@ -5,39 +5,37 @@
 'use strict';
 
 import { TPromise } from 'vs/base/common/winjs.base';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { suggestFilename } from 'vs/base/common/mime';
 import { memoize } from 'vs/base/common/decorators';
-import * as labels from 'vs/base/common/labels';
 import { PLAINTEXT_MODE_ID } from 'vs/editor/common/modes/modesRegistry';
 import * as paths from 'vs/base/common/paths';
 import * as resources from 'vs/base/common/resources';
 import { EditorInput, IEncodingSupport, EncodingMode, ConfirmResult, Verbosity } from 'vs/workbench/common/editor';
 import { UntitledEditorModel } from 'vs/workbench/common/editor/untitledEditorModel';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { Event, Emitter } from 'vs/base/common/event';
 import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
 import { telemetryURIDescriptor } from 'vs/platform/telemetry/common/telemetryUtils';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { IHashService } from 'vs/workbench/services/hash/common/hashService';
+import { ILabelService } from 'vs/platform/label/common/label';
 
 /**
  * An editor input to be used for untitled text buffers.
  */
 export class UntitledEditorInput extends EditorInput implements IEncodingSupport {
 
-	public static readonly ID: string = 'workbench.editors.untitledEditorInput';
+	static readonly ID: string = 'workbench.editors.untitledEditorInput';
 
 	private _hasAssociatedFilePath: boolean;
 	private cachedModel: UntitledEditorModel;
 	private modelResolve: TPromise<UntitledEditorModel>;
 
-	private readonly _onDidModelChangeContent: Emitter<void>;
-	private readonly _onDidModelChangeEncoding: Emitter<void>;
+	private readonly _onDidModelChangeContent: Emitter<void> = this._register(new Emitter<void>());
+	get onDidModelChangeContent(): Event<void> { return this._onDidModelChangeContent.event; }
 
-	private toUnbind: IDisposable[];
+	private readonly _onDidModelChangeEncoding: Emitter<void> = this._register(new Emitter<void>());
+	get onDidModelChangeEncoding(): Event<void> { return this._onDidModelChangeEncoding.event; }
 
 	constructor(
 		private resource: URI,
@@ -46,41 +44,28 @@ export class UntitledEditorInput extends EditorInput implements IEncodingSupport
 		private initialValue: string,
 		private preferredEncoding: string,
 		@IInstantiationService private instantiationService: IInstantiationService,
-		@IWorkspaceContextService private contextService: IWorkspaceContextService,
 		@ITextFileService private textFileService: ITextFileService,
-		@IEnvironmentService private environmentService: IEnvironmentService,
-		@IHashService private hashService: IHashService
+		@IHashService private hashService: IHashService,
+		@ILabelService private labelService: ILabelService
 	) {
 		super();
 
 		this._hasAssociatedFilePath = hasAssociatedFilePath;
-		this.toUnbind = [];
-
-		this._onDidModelChangeContent = new Emitter<void>();
-		this._onDidModelChangeEncoding = new Emitter<void>();
 	}
 
-	public get hasAssociatedFilePath(): boolean {
+	get hasAssociatedFilePath(): boolean {
 		return this._hasAssociatedFilePath;
 	}
 
-	public get onDidModelChangeContent(): Event<void> {
-		return this._onDidModelChangeContent.event;
-	}
-
-	public get onDidModelChangeEncoding(): Event<void> {
-		return this._onDidModelChangeEncoding.event;
-	}
-
-	public getTypeId(): string {
+	getTypeId(): string {
 		return UntitledEditorInput.ID;
 	}
 
-	public getResource(): URI {
+	getResource(): URI {
 		return this.resource;
 	}
 
-	public getModeId(): string {
+	getModeId(): string {
 		if (this.cachedModel) {
 			return this.cachedModel.getModeId();
 		}
@@ -88,26 +73,26 @@ export class UntitledEditorInput extends EditorInput implements IEncodingSupport
 		return this.modeId;
 	}
 
-	public getName(): string {
+	getName(): string {
 		return this.hasAssociatedFilePath ? resources.basenameOrAuthority(this.resource) : this.resource.path;
 	}
 
 	@memoize
 	private get shortDescription(): string {
-		return paths.basename(labels.getPathLabel(resources.dirname(this.resource), void 0, this.environmentService));
+		return paths.basename(this.labelService.getUriLabel(resources.dirname(this.resource)));
 	}
 
 	@memoize
 	private get mediumDescription(): string {
-		return labels.getPathLabel(resources.dirname(this.resource), this.contextService, this.environmentService);
+		return this.labelService.getUriLabel(resources.dirname(this.resource), true);
 	}
 
 	@memoize
 	private get longDescription(): string {
-		return labels.getPathLabel(resources.dirname(this.resource), void 0, this.environmentService);
+		return this.labelService.getUriLabel(resources.dirname(this.resource));
 	}
 
-	public getDescription(verbosity: Verbosity = Verbosity.MEDIUM): string {
+	getDescription(verbosity: Verbosity = Verbosity.MEDIUM): string {
 		if (!this.hasAssociatedFilePath) {
 			return null;
 		}
@@ -136,15 +121,15 @@ export class UntitledEditorInput extends EditorInput implements IEncodingSupport
 
 	@memoize
 	private get mediumTitle(): string {
-		return labels.getPathLabel(this.resource, this.contextService, this.environmentService);
+		return this.labelService.getUriLabel(this.resource, true);
 	}
 
 	@memoize
 	private get longTitle(): string {
-		return labels.getPathLabel(this.resource, void 0, this.environmentService);
+		return this.labelService.getUriLabel(this.resource);
 	}
 
-	public getTitle(verbosity: Verbosity): string {
+	getTitle(verbosity: Verbosity): string {
 		if (!this.hasAssociatedFilePath) {
 			return this.getName();
 		}
@@ -165,7 +150,7 @@ export class UntitledEditorInput extends EditorInput implements IEncodingSupport
 		return title;
 	}
 
-	public isDirty(): boolean {
+	isDirty(): boolean {
 		if (this.cachedModel) {
 			return this.cachedModel.isDirty();
 		}
@@ -179,15 +164,15 @@ export class UntitledEditorInput extends EditorInput implements IEncodingSupport
 		return this.hasAssociatedFilePath;
 	}
 
-	public confirmSave(): TPromise<ConfirmResult> {
+	confirmSave(): TPromise<ConfirmResult> {
 		return this.textFileService.confirmSave([this.resource]);
 	}
 
-	public save(): TPromise<boolean> {
+	save(): TPromise<boolean> {
 		return this.textFileService.save(this.resource);
 	}
 
-	public revert(): TPromise<boolean> {
+	revert(): TPromise<boolean> {
 		if (this.cachedModel) {
 			this.cachedModel.revert();
 		}
@@ -197,7 +182,7 @@ export class UntitledEditorInput extends EditorInput implements IEncodingSupport
 		return TPromise.as(true);
 	}
 
-	public suggestFileName(): string {
+	suggestFileName(): string {
 		if (!this.hasAssociatedFilePath) {
 			if (this.cachedModel) {
 				const modeId = this.cachedModel.getModeId();
@@ -210,7 +195,7 @@ export class UntitledEditorInput extends EditorInput implements IEncodingSupport
 		return this.getName();
 	}
 
-	public getEncoding(): string {
+	getEncoding(): string {
 		if (this.cachedModel) {
 			return this.cachedModel.getEncoding();
 		}
@@ -218,7 +203,7 @@ export class UntitledEditorInput extends EditorInput implements IEncodingSupport
 		return this.preferredEncoding;
 	}
 
-	public setEncoding(encoding: string, mode: EncodingMode /* ignored, we only have Encode */): void {
+	setEncoding(encoding: string, mode: EncodingMode /* ignored, we only have Encode */): void {
 		this.preferredEncoding = encoding;
 
 		if (this.cachedModel) {
@@ -226,7 +211,7 @@ export class UntitledEditorInput extends EditorInput implements IEncodingSupport
 		}
 	}
 
-	public resolve(): TPromise<UntitledEditorModel> {
+	resolve(): TPromise<UntitledEditorModel> {
 
 		// Join a model resolve if we have had one before
 		if (this.modelResolve) {
@@ -241,17 +226,17 @@ export class UntitledEditorInput extends EditorInput implements IEncodingSupport
 	}
 
 	private createModel(): UntitledEditorModel {
-		const model = this.instantiationService.createInstance(UntitledEditorModel, this.modeId, this.resource, this.hasAssociatedFilePath, this.initialValue, this.preferredEncoding);
+		const model = this._register(this.instantiationService.createInstance(UntitledEditorModel, this.modeId, this.resource, this.hasAssociatedFilePath, this.initialValue, this.preferredEncoding));
 
 		// re-emit some events from the model
-		this.toUnbind.push(model.onDidChangeContent(() => this._onDidModelChangeContent.fire()));
-		this.toUnbind.push(model.onDidChangeDirty(() => this._onDidChangeDirty.fire()));
-		this.toUnbind.push(model.onDidChangeEncoding(() => this._onDidModelChangeEncoding.fire()));
+		this._register(model.onDidChangeContent(() => this._onDidModelChangeContent.fire()));
+		this._register(model.onDidChangeDirty(() => this._onDidChangeDirty.fire()));
+		this._register(model.onDidChangeEncoding(() => this._onDidModelChangeEncoding.fire()));
 
 		return model;
 	}
 
-	public getTelemetryDescriptor(): object {
+	getTelemetryDescriptor(): object {
 		const descriptor = super.getTelemetryDescriptor();
 		descriptor['resource'] = telemetryURIDescriptor(this.getResource(), path => this.hashService.createSHA1(path));
 
@@ -263,7 +248,7 @@ export class UntitledEditorInput extends EditorInput implements IEncodingSupport
 		return descriptor;
 	}
 
-	public matches(otherInput: any): boolean {
+	matches(otherInput: any): boolean {
 		if (super.matches(otherInput) === true) {
 			return true;
 		}
@@ -278,21 +263,9 @@ export class UntitledEditorInput extends EditorInput implements IEncodingSupport
 		return false;
 	}
 
-	public dispose(): void {
-		this._onDidModelChangeContent.dispose();
-		this._onDidModelChangeEncoding.dispose();
-
-		// Listeners
-		dispose(this.toUnbind);
-
-		// Model
-		if (this.cachedModel) {
-			this.cachedModel.dispose();
-			this.cachedModel = null;
-		}
-
+	dispose(): void {
 		this.modelResolve = void 0;
 
 		super.dispose();
 	}
-}
\ No newline at end of file
+}
diff --git a/src/vs/workbench/common/editor/untitledEditorModel.ts b/src/vs/workbench/common/editor/untitledEditorModel.ts
index c7033b68d95..a13b567ce0d 100644
--- a/src/vs/workbench/common/editor/untitledEditorModel.ts
+++ b/src/vs/workbench/common/editor/untitledEditorModel.ts
@@ -4,11 +4,10 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { IEncodingSupport } from 'vs/workbench/common/editor';
 import { BaseTextEditorModel } from 'vs/workbench/common/editor/textEditorModel';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { PLAINTEXT_MODE_ID } from 'vs/editor/common/modes/modesRegistry';
 import { CONTENT_CHANGE_EVENT_BUFFER_DELAY } from 'vs/platform/files/common/files';
 import { IModeService } from 'vs/editor/common/services/modeService';
@@ -23,19 +22,20 @@ import { createTextBufferFactory } from 'vs/editor/common/model/textModel';
 
 export class UntitledEditorModel extends BaseTextEditorModel implements IEncodingSupport {
 
-	public static DEFAULT_CONTENT_CHANGE_BUFFER_DELAY = CONTENT_CHANGE_EVENT_BUFFER_DELAY;
+	static DEFAULT_CONTENT_CHANGE_BUFFER_DELAY = CONTENT_CHANGE_EVENT_BUFFER_DELAY;
 
-	private toDispose: IDisposable[];
+	private readonly _onDidChangeContent: Emitter<void> = this._register(new Emitter<void>());
+	get onDidChangeContent(): Event<void> { return this._onDidChangeContent.event; }
+
+	private readonly _onDidChangeDirty: Emitter<void> = this._register(new Emitter<void>());
+	get onDidChangeDirty(): Event<void> { return this._onDidChangeDirty.event; }
+
+	private readonly _onDidChangeEncoding: Emitter<void> = this._register(new Emitter<void>());
+	get onDidChangeEncoding(): Event<void> { return this._onDidChangeEncoding.event; }
 
 	private dirty: boolean;
-	private readonly _onDidChangeContent: Emitter<void>;
-	private readonly _onDidChangeDirty: Emitter<void>;
-	private readonly _onDidChangeEncoding: Emitter<void>;
-
 	private versionId: number;
-
 	private contentChangeEventScheduler: RunOnceScheduler;
-
 	private configuredEncoding: string;
 
 	constructor(
@@ -53,35 +53,12 @@ export class UntitledEditorModel extends BaseTextEditorModel implements IEncodin
 
 		this.dirty = false;
 		this.versionId = 0;
-		this.toDispose = [];
 
-		this._onDidChangeContent = new Emitter<void>();
-		this.toDispose.push(this._onDidChangeContent);
-
-		this._onDidChangeDirty = new Emitter<void>();
-		this.toDispose.push(this._onDidChangeDirty);
-
-		this._onDidChangeEncoding = new Emitter<void>();
-		this.toDispose.push(this._onDidChangeEncoding);
-
-		this.contentChangeEventScheduler = new RunOnceScheduler(() => this._onDidChangeContent.fire(), UntitledEditorModel.DEFAULT_CONTENT_CHANGE_BUFFER_DELAY);
-		this.toDispose.push(this.contentChangeEventScheduler);
+		this.contentChangeEventScheduler = this._register(new RunOnceScheduler(() => this._onDidChangeContent.fire(), UntitledEditorModel.DEFAULT_CONTENT_CHANGE_BUFFER_DELAY));
 
 		this.registerListeners();
 	}
 
-	public get onDidChangeContent(): Event<void> {
-		return this._onDidChangeContent.event;
-	}
-
-	public get onDidChangeDirty(): Event<void> {
-		return this._onDidChangeDirty.event;
-	}
-
-	public get onDidChangeEncoding(): Event<void> {
-		return this._onDidChangeEncoding.event;
-	}
-
 	protected getOrCreateMode(modeService: IModeService, modeId: string, firstLineText?: string): TPromise<IMode> {
 		if (!modeId || modeId === PLAINTEXT_MODE_ID) {
 			return modeService.getOrCreateModeByFilenameOrFirstLine(this.resource.fsPath, firstLineText); // lookup mode via resource path if the provided modeId is unspecific
@@ -93,7 +70,7 @@ export class UntitledEditorModel extends BaseTextEditorModel implements IEncodin
 	private registerListeners(): void {
 
 		// Config Changes
-		this.toDispose.push(this.configurationService.onDidChangeConfiguration(e => this.onConfigurationChange()));
+		this._register(this.configurationService.onDidChangeConfiguration(e => this.onConfigurationChange()));
 	}
 
 	private onConfigurationChange(): void {
@@ -108,11 +85,11 @@ export class UntitledEditorModel extends BaseTextEditorModel implements IEncodin
 		}
 	}
 
-	public getVersionId(): number {
+	getVersionId(): number {
 		return this.versionId;
 	}
 
-	public getModeId(): string {
+	getModeId(): string {
 		if (this.textEditorModel) {
 			return this.textEditorModel.getLanguageIdentifier().language;
 		}
@@ -120,11 +97,11 @@ export class UntitledEditorModel extends BaseTextEditorModel implements IEncodin
 		return null;
 	}
 
-	public getEncoding(): string {
+	getEncoding(): string {
 		return this.preferredEncoding || this.configuredEncoding;
 	}
 
-	public setEncoding(encoding: string): void {
+	setEncoding(encoding: string): void {
 		const oldEncoding = this.getEncoding();
 		this.preferredEncoding = encoding;
 
@@ -134,7 +111,7 @@ export class UntitledEditorModel extends BaseTextEditorModel implements IEncodin
 		}
 	}
 
-	public isDirty(): boolean {
+	isDirty(): boolean {
 		return this.dirty;
 	}
 
@@ -147,18 +124,18 @@ export class UntitledEditorModel extends BaseTextEditorModel implements IEncodin
 		this._onDidChangeDirty.fire();
 	}
 
-	public getResource(): URI {
+	getResource(): URI {
 		return this.resource;
 	}
 
-	public revert(): void {
+	revert(): void {
 		this.setDirty(false);
 
 		// Handle content change event buffered
 		this.contentChangeEventScheduler.schedule();
 	}
 
-	public load(): TPromise<UntitledEditorModel> {
+	load(): TPromise<UntitledEditorModel> {
 
 		// Check for backups first
 		return this.backupFileService.loadBackupResource(this.resource).then(backupResource => {
@@ -185,10 +162,10 @@ export class UntitledEditorModel extends BaseTextEditorModel implements IEncodin
 				this.configuredEncoding = this.configurationService.getValue<string>(this.resource, 'files.encoding');
 
 				// Listen to content changes
-				this.toDispose.push(this.textEditorModel.onDidChangeContent(() => this.onModelContentChanged()));
+				this._register(this.textEditorModel.onDidChangeContent(() => this.onModelContentChanged()));
 
 				// Listen to mode changes
-				this.toDispose.push(this.textEditorModel.onDidChangeLanguage(() => this.onConfigurationChange())); // mode change can have impact on config
+				this._register(this.textEditorModel.onDidChangeLanguage(() => this.onConfigurationChange())); // mode change can have impact on config
 
 				return model;
 			});
@@ -228,9 +205,7 @@ export class UntitledEditorModel extends BaseTextEditorModel implements IEncodin
 		this.contentChangeEventScheduler.schedule();
 	}
 
-	public dispose(): void {
-		super.dispose();
-
-		this.toDispose = dispose(this.toDispose);
+	isReadonly(): boolean {
+		return false;
 	}
 }
diff --git a/src/vs/workbench/common/extensionHostProtocol.ts b/src/vs/workbench/common/extensionHostProtocol.ts
new file mode 100644
index 00000000000..70715366c45
--- /dev/null
+++ b/src/vs/workbench/common/extensionHostProtocol.ts
@@ -0,0 +1,37 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+export const enum MessageType {
+	Initialized,
+	Ready,
+	Terminate
+}
+
+export function createMessageOfType(type: MessageType): Buffer {
+	const result = Buffer.allocUnsafe(1);
+
+	switch (type) {
+		case MessageType.Initialized: result.writeUInt8(1, 0); break;
+		case MessageType.Ready: result.writeUInt8(2, 0); break;
+		case MessageType.Terminate: result.writeUInt8(3, 0); break;
+	}
+
+	return result;
+}
+
+export function isMessageOfType(message: Buffer, type: MessageType): boolean {
+	if (message.length !== 1) {
+		return false;
+	}
+
+	switch (message.readUInt8(0)) {
+		case 1: return type === MessageType.Initialized;
+		case 2: return type === MessageType.Ready;
+		case 3: return type === MessageType.Terminate;
+		default: return false;
+	}
+}
\ No newline at end of file
diff --git a/src/vs/workbench/common/memento.ts b/src/vs/workbench/common/memento.ts
index 251a4e7a637..e9ac376a4c9 100644
--- a/src/vs/workbench/common/memento.ts
+++ b/src/vs/workbench/common/memento.ts
@@ -10,7 +10,7 @@ import { IStorageService, StorageScope } from 'vs/platform/storage/common/storag
 /**
  * Supported memento scopes.
  */
-export enum Scope {
+export const enum Scope {
 
 	/**
 	 * The memento will be scoped to all workspaces of this domain.
diff --git a/src/vs/workbench/common/notifications.ts b/src/vs/workbench/common/notifications.ts
index 37a912ff71d..7b92f4d048e 100644
--- a/src/vs/workbench/common/notifications.ts
+++ b/src/vs/workbench/common/notifications.ts
@@ -8,7 +8,7 @@
 import { INotification, INotificationHandle, INotificationActions, INotificationProgress, NoOpNotification, Severity, NotificationMessage } from 'vs/platform/notification/common/notification';
 import { toErrorMessage } from 'vs/base/common/errorMessage';
 import { Event, Emitter, once } from 'vs/base/common/event';
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
+import { Disposable } from 'vs/base/common/lifecycle';
 import { isPromiseCanceledError, isErrorWithActions } from 'vs/base/common/errors';
 
 export interface INotificationsModel {
@@ -19,7 +19,7 @@ export interface INotificationsModel {
 	notify(notification: INotification): INotificationHandle;
 }
 
-export enum NotificationChangeType {
+export const enum NotificationChangeType {
 	ADD,
 	CHANGE,
 	REMOVE
@@ -44,7 +44,9 @@ export interface INotificationChangeEvent {
 }
 
 export class NotificationHandle implements INotificationHandle {
+
 	private readonly _onDidClose: Emitter<void> = new Emitter();
+	get onDidClose(): Event<void> { return this._onDidClose.event; }
 
 	constructor(private item: INotificationViewItem, private closeItem: (item: INotificationViewItem) => void) {
 		this.registerListeners();
@@ -57,58 +59,42 @@ export class NotificationHandle implements INotificationHandle {
 		});
 	}
 
-	public get onDidClose(): Event<void> {
-		return this._onDidClose.event;
-	}
-
-	public get progress(): INotificationProgress {
+	get progress(): INotificationProgress {
 		return this.item.progress;
 	}
 
-	public updateSeverity(severity: Severity): void {
+	updateSeverity(severity: Severity): void {
 		this.item.updateSeverity(severity);
 	}
 
-	public updateMessage(message: NotificationMessage): void {
+	updateMessage(message: NotificationMessage): void {
 		this.item.updateMessage(message);
 	}
 
-	public updateActions(actions?: INotificationActions): void {
+	updateActions(actions?: INotificationActions): void {
 		this.item.updateActions(actions);
 	}
 
-	public close(): void {
+	close(): void {
 		this.closeItem(this.item);
 		this._onDidClose.dispose();
 	}
 }
 
-export class NotificationsModel implements INotificationsModel {
+export class NotificationsModel extends Disposable implements INotificationsModel {
 
 	private static NO_OP_NOTIFICATION = new NoOpNotification();
 
-	private _notifications: INotificationViewItem[];
+	private readonly _onDidNotificationChange: Emitter<INotificationChangeEvent> = this._register(new Emitter<INotificationChangeEvent>());
+	get onDidNotificationChange(): Event<INotificationChangeEvent> { return this._onDidNotificationChange.event; }
 
-	private readonly _onDidNotificationChange: Emitter<INotificationChangeEvent>;
-	private toDispose: IDisposable[];
+	private _notifications: INotificationViewItem[] = [];
 
-	constructor() {
-		this._notifications = [];
-		this.toDispose = [];
-
-		this._onDidNotificationChange = new Emitter<INotificationChangeEvent>();
-		this.toDispose.push(this._onDidNotificationChange);
-	}
-
-	public get notifications(): INotificationViewItem[] {
+	get notifications(): INotificationViewItem[] {
 		return this._notifications;
 	}
 
-	public get onDidNotificationChange(): Event<INotificationChangeEvent> {
-		return this._onDidNotificationChange.event;
-	}
-
-	public notify(notification: INotification): INotificationHandle {
+	notify(notification: INotification): INotificationHandle {
 		const item = this.createViewItem(notification);
 		if (!item) {
 			return NotificationsModel.NO_OP_NOTIFICATION; // return early if this is a no-op
@@ -187,10 +173,6 @@ export class NotificationsModel implements INotificationsModel {
 
 		return item;
 	}
-
-	public dispose(): void {
-		this.toDispose = dispose(this.toDispose);
-	}
 }
 
 export interface INotificationViewItem {
@@ -226,7 +208,7 @@ export function isNotificationViewItem(obj: any): obj is INotificationViewItem {
 	return obj instanceof NotificationViewItem;
 }
 
-export enum NotificationViewItemLabelKind {
+export const enum NotificationViewItemLabelKind {
 	SEVERITY,
 	MESSAGE,
 	ACTIONS,
@@ -250,29 +232,23 @@ export interface INotificationViewItemProgress extends INotificationProgress {
 	dispose(): void;
 }
 
-export class NotificationViewItemProgress implements INotificationViewItemProgress {
+export class NotificationViewItemProgress extends Disposable implements INotificationViewItemProgress {
 	private _state: INotificationViewItemProgressState;
 
-	private readonly _onDidChange: Emitter<void>;
-	private toDispose: IDisposable[];
+	private readonly _onDidChange: Emitter<void> = this._register(new Emitter<void>());
+	get onDidChange(): Event<void> { return this._onDidChange.event; }
 
 	constructor() {
-		this.toDispose = [];
-		this._state = Object.create(null);
+		super();
 
-		this._onDidChange = new Emitter<void>();
-		this.toDispose.push(this._onDidChange);
+		this._state = Object.create(null);
 	}
 
-	public get state(): INotificationViewItemProgressState {
+	get state(): INotificationViewItemProgressState {
 		return this._state;
 	}
 
-	public get onDidChange(): Event<void> {
-		return this._onDidChange.event;
-	}
-
-	public infinite(): void {
+	infinite(): void {
 		if (this._state.infinite) {
 			return;
 		}
@@ -286,7 +262,7 @@ export class NotificationViewItemProgress implements INotificationViewItemProgre
 		this._onDidChange.fire();
 	}
 
-	public done(): void {
+	done(): void {
 		if (this._state.done) {
 			return;
 		}
@@ -300,7 +276,7 @@ export class NotificationViewItemProgress implements INotificationViewItemProgre
 		this._onDidChange.fire();
 	}
 
-	public total(value: number): void {
+	total(value: number): void {
 		if (this._state.total === value) {
 			return;
 		}
@@ -313,7 +289,7 @@ export class NotificationViewItemProgress implements INotificationViewItemProgre
 		this._onDidChange.fire();
 	}
 
-	public worked(value: number): void {
+	worked(value: number): void {
 		if (typeof this._state.worked === 'number') {
 			this._state.worked += value;
 		} else {
@@ -325,10 +301,6 @@ export class NotificationViewItemProgress implements INotificationViewItemProgre
 
 		this._onDidChange.fire();
 	}
-
-	public dispose(): void {
-		this.toDispose = dispose(this.toDispose);
-	}
 }
 
 export interface IMessageLink {
@@ -345,7 +317,7 @@ export interface INotificationMessage {
 	links: IMessageLink[];
 }
 
-export class NotificationViewItem implements INotificationViewItem {
+export class NotificationViewItem extends Disposable implements INotificationViewItem {
 
 	private static MAX_MESSAGE_LENGTH = 1000;
 
@@ -354,16 +326,20 @@ export class NotificationViewItem implements INotificationViewItem {
 	private static LINK_REGEX = /\[([^\]]+)\]\((https?:\/\/[^\)\s]+)\)/gi;
 
 	private _expanded: boolean;
-	private toDispose: IDisposable[];
 
 	private _actions: INotificationActions;
 	private _progress: NotificationViewItemProgress;
 
-	private readonly _onDidExpansionChange: Emitter<void>;
-	private readonly _onDidClose: Emitter<void>;
-	private readonly _onDidLabelChange: Emitter<INotificationViewItemLabelChangeEvent>;
+	private readonly _onDidExpansionChange: Emitter<void> = this._register(new Emitter<void>());
+	get onDidExpansionChange(): Event<void> { return this._onDidExpansionChange.event; }
 
-	public static create(notification: INotification): INotificationViewItem {
+	private readonly _onDidClose: Emitter<void> = this._register(new Emitter<void>());
+	get onDidClose(): Event<void> { return this._onDidClose.event; }
+
+	private readonly _onDidLabelChange: Emitter<INotificationViewItemLabelChangeEvent> = this._register(new Emitter<INotificationViewItemLabelChangeEvent>());
+	get onDidLabelChange(): Event<INotificationViewItemLabelChangeEvent> { return this._onDidLabelChange.event; }
+
+	static create(notification: INotification): INotificationViewItem {
 		if (!notification || !notification.message || isPromiseCanceledError(notification.message)) {
 			return null; // we need a message to show
 		}
@@ -426,18 +402,9 @@ export class NotificationViewItem implements INotificationViewItem {
 	}
 
 	private constructor(private _severity: Severity, private _message: INotificationMessage, private _source: string, actions?: INotificationActions) {
-		this.toDispose = [];
+		super();
 
 		this.setActions(actions);
-
-		this._onDidExpansionChange = new Emitter<void>();
-		this.toDispose.push(this._onDidExpansionChange);
-
-		this._onDidLabelChange = new Emitter<INotificationViewItemLabelChangeEvent>();
-		this.toDispose.push(this._onDidLabelChange);
-
-		this._onDidClose = new Emitter<void>();
-		this.toDispose.push(this._onDidClose);
 	}
 
 	private setActions(actions: INotificationActions): void {
@@ -457,62 +424,49 @@ export class NotificationViewItem implements INotificationViewItem {
 		this._expanded = actions.primary.length > 0;
 	}
 
-	public get onDidExpansionChange(): Event<void> {
-		return this._onDidExpansionChange.event;
-	}
-
-	public get onDidLabelChange(): Event<INotificationViewItemLabelChangeEvent> {
-		return this._onDidLabelChange.event;
-	}
-
-	public get onDidClose(): Event<void> {
-		return this._onDidClose.event;
-	}
-
-	public get canCollapse(): boolean {
+	get canCollapse(): boolean {
 		return this._actions.primary.length === 0;
 	}
 
-	public get expanded(): boolean {
+	get expanded(): boolean {
 		return this._expanded;
 	}
 
-	public get severity(): Severity {
+	get severity(): Severity {
 		return this._severity;
 	}
 
-	public hasProgress(): boolean {
+	hasProgress(): boolean {
 		return !!this._progress;
 	}
 
-	public get progress(): INotificationViewItemProgress {
+	get progress(): INotificationViewItemProgress {
 		if (!this._progress) {
-			this._progress = new NotificationViewItemProgress();
-			this.toDispose.push(this._progress);
-			this.toDispose.push(this._progress.onDidChange(() => this._onDidLabelChange.fire({ kind: NotificationViewItemLabelKind.PROGRESS })));
+			this._progress = this._register(new NotificationViewItemProgress());
+			this._register(this._progress.onDidChange(() => this._onDidLabelChange.fire({ kind: NotificationViewItemLabelKind.PROGRESS })));
 		}
 
 		return this._progress;
 	}
 
-	public get message(): INotificationMessage {
+	get message(): INotificationMessage {
 		return this._message;
 	}
 
-	public get source(): string {
+	get source(): string {
 		return this._source;
 	}
 
-	public get actions(): INotificationActions {
+	get actions(): INotificationActions {
 		return this._actions;
 	}
 
-	public updateSeverity(severity: Severity): void {
+	updateSeverity(severity: Severity): void {
 		this._severity = severity;
 		this._onDidLabelChange.fire({ kind: NotificationViewItemLabelKind.SEVERITY });
 	}
 
-	public updateMessage(input: NotificationMessage): void {
+	updateMessage(input: NotificationMessage): void {
 		const message = NotificationViewItem.parseNotificationMessage(input);
 		if (!message) {
 			return;
@@ -522,13 +476,13 @@ export class NotificationViewItem implements INotificationViewItem {
 		this._onDidLabelChange.fire({ kind: NotificationViewItemLabelKind.MESSAGE });
 	}
 
-	public updateActions(actions?: INotificationActions): void {
+	updateActions(actions?: INotificationActions): void {
 		this.setActions(actions);
 
 		this._onDidLabelChange.fire({ kind: NotificationViewItemLabelKind.ACTIONS });
 	}
 
-	public expand(): void {
+	expand(): void {
 		if (this._expanded || !this.canCollapse) {
 			return;
 		}
@@ -537,7 +491,7 @@ export class NotificationViewItem implements INotificationViewItem {
 		this._onDidExpansionChange.fire();
 	}
 
-	public collapse(skipEvents?: boolean): void {
+	collapse(skipEvents?: boolean): void {
 		if (!this._expanded || !this.canCollapse) {
 			return;
 		}
@@ -549,7 +503,7 @@ export class NotificationViewItem implements INotificationViewItem {
 		}
 	}
 
-	public toggle(): void {
+	toggle(): void {
 		if (this._expanded) {
 			this.collapse();
 		} else {
@@ -557,13 +511,13 @@ export class NotificationViewItem implements INotificationViewItem {
 		}
 	}
 
-	public close(): void {
+	close(): void {
 		this._onDidClose.fire();
 
-		this.toDispose = dispose(this.toDispose);
+		this.dispose();
 	}
 
-	public equals(other: INotificationViewItem): boolean {
+	equals(other: INotificationViewItem): boolean {
 		if (this.hasProgress() || other.hasProgress()) {
 			return false;
 		}
diff --git a/src/vs/workbench/common/resources.ts b/src/vs/workbench/common/resources.ts
index 4809497f2a8..c109f2e0e8b 100644
--- a/src/vs/workbench/common/resources.ts
+++ b/src/vs/workbench/common/resources.ts
@@ -5,13 +5,15 @@
 
 'use strict';
 
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import * as paths from 'vs/base/common/paths';
 import { RawContextKey, IContextKeyService, IContextKey } from 'vs/platform/contextkey/common/contextkey';
 import { IModeService } from 'vs/editor/common/services/modeService';
 import { IFileService } from 'vs/platform/files/common/files';
+import { Disposable } from 'vs/base/common/lifecycle';
+import { Schemas } from 'vs/base/common/network';
 
-export class ResourceContextKey implements IContextKey<URI> {
+export class ResourceContextKey extends Disposable implements IContextKey<URI> {
 
 	static Scheme = new RawContextKey<string>('resourceScheme', undefined);
 	static Filename = new RawContextKey<string>('resourceFilename', undefined);
@@ -19,7 +21,8 @@ export class ResourceContextKey implements IContextKey<URI> {
 	static Resource = new RawContextKey<URI>('resource', undefined);
 	static Extension = new RawContextKey<string>('resourceExtname', undefined);
 	static HasResource = new RawContextKey<boolean>('resourceSet', false);
-	static IsFile = new RawContextKey<boolean>('resourceIsFile', false);
+	static IsFileSystemResource = new RawContextKey<boolean>('isFileSystemResource', false);
+	static IsFileSystemResourceOrUntitled = new RawContextKey<boolean>('isFileSystemResourceOrUntitled', false);
 
 	private _resourceKey: IContextKey<URI>;
 	private _schemeKey: IContextKey<string>;
@@ -27,20 +30,30 @@ export class ResourceContextKey implements IContextKey<URI> {
 	private _langIdKey: IContextKey<string>;
 	private _extensionKey: IContextKey<string>;
 	private _hasResource: IContextKey<boolean>;
-	private _isFile: IContextKey<boolean>;
+	private _isfileSystemResource: IContextKey<boolean>;
+	private _isFileSystemResourceOrUntitled: IContextKey<boolean>;
 
 	constructor(
 		@IContextKeyService contextKeyService: IContextKeyService,
-		@IModeService private readonly _modeService: IModeService,
-		@IFileService private readonly _fileService: IFileService
+		@IFileService private readonly _fileService: IFileService,
+		@IModeService private readonly _modeService: IModeService
 	) {
+		super();
+
 		this._schemeKey = ResourceContextKey.Scheme.bindTo(contextKeyService);
 		this._filenameKey = ResourceContextKey.Filename.bindTo(contextKeyService);
 		this._langIdKey = ResourceContextKey.LangId.bindTo(contextKeyService);
 		this._resourceKey = ResourceContextKey.Resource.bindTo(contextKeyService);
 		this._extensionKey = ResourceContextKey.Extension.bindTo(contextKeyService);
 		this._hasResource = ResourceContextKey.HasResource.bindTo(contextKeyService);
-		this._isFile = ResourceContextKey.IsFile.bindTo(contextKeyService);
+		this._isfileSystemResource = ResourceContextKey.IsFileSystemResource.bindTo(contextKeyService);
+		this._isFileSystemResourceOrUntitled = ResourceContextKey.IsFileSystemResourceOrUntitled.bindTo(contextKeyService);
+
+		this._register(_fileService.onDidChangeFileSystemProviderRegistrations(() => {
+			const resource = this._resourceKey.get();
+			this._isfileSystemResource.set(resource && _fileService.canHandleResource(resource));
+			this._isFileSystemResourceOrUntitled.set(this._isfileSystemResource.get() || this._schemeKey.get() === Schemas.untitled);
+		}));
 	}
 
 	set(value: URI) {
@@ -50,7 +63,8 @@ export class ResourceContextKey implements IContextKey<URI> {
 		this._langIdKey.set(value && this._modeService.getModeIdByFilenameOrFirstLine(value.fsPath));
 		this._extensionKey.set(value && paths.extname(value.fsPath));
 		this._hasResource.set(!!value);
-		this._isFile.set(value && this._fileService.canHandleResource(value));
+		this._isfileSystemResource.set(value && this._fileService.canHandleResource(value));
+		this._isFileSystemResourceOrUntitled.set(this._isfileSystemResource.get() || this._schemeKey.get() === Schemas.untitled);
 	}
 
 	reset(): void {
@@ -60,10 +74,9 @@ export class ResourceContextKey implements IContextKey<URI> {
 		this._langIdKey.reset();
 		this._extensionKey.reset();
 		this._hasResource.reset();
-		this._isFile.reset();
 	}
 
-	public get(): URI {
+	get(): URI {
 		return this._resourceKey.get();
 	}
 }
diff --git a/src/vs/workbench/common/theme.ts b/src/vs/workbench/common/theme.ts
index fffeb82d9f1..8dbf7693c79 100644
--- a/src/vs/workbench/common/theme.ts
+++ b/src/vs/workbench/common/theme.ts
@@ -4,8 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as nls from 'vs/nls';
-import { registerColor, editorBackground, contrastBorder, transparent, editorWidgetBackground, textLinkForeground, lighten, darken, focusBorder } from 'vs/platform/theme/common/colorRegistry';
-import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
+import { registerColor, editorBackground, contrastBorder, transparent, editorWidgetBackground, textLinkForeground, lighten, darken, focusBorder, activeContrastBorder, listActiveSelectionForeground, listActiveSelectionBackground } from 'vs/platform/theme/common/colorRegistry';
+import { Disposable } from 'vs/base/common/lifecycle';
 import { IThemeService, ITheme } from 'vs/platform/theme/common/themeService';
 import { Color } from 'vs/base/common/color';
 
@@ -64,7 +64,7 @@ export const TAB_ACTIVE_BORDER_TOP = registerColor('tab.activeBorderTop', {
 	dark: null,
 	light: null,
 	hc: null
-}, nls.localize('tabActiveBorderTop', "Border to the top of an active tab. The border will not show if a bottom border is already defined (via tab.activeBorder or tab.unfocusedActiveBorder). Tabs are the containers for editors in the editor area. Multiple tabs can be opened in one editor group. There can be multiple editor groups."));
+}, nls.localize('tabActiveBorderTop', "Border to the top of an active tab. Tabs are the containers for editors in the editor area. Multiple tabs can be opened in one editor group. There can be multiple editor groups."));
 
 export const TAB_UNFOCUSED_ACTIVE_BORDER = registerColor('tab.unfocusedActiveBorder', {
 	dark: transparent(TAB_ACTIVE_BORDER, 0.5),
@@ -76,7 +76,7 @@ export const TAB_UNFOCUSED_ACTIVE_BORDER_TOP = registerColor('tab.unfocusedActiv
 	dark: transparent(TAB_ACTIVE_BORDER_TOP, 0.5),
 	light: transparent(TAB_ACTIVE_BORDER_TOP, 0.7),
 	hc: null
-}, nls.localize('tabActiveUnfocusedBorderTop', "Border to the top of an active tab in an unfocused group. The border will not show if a bottom border is already defined (via tab.activeBorder or tab.unfocusedActiveBorder). Tabs are the containers for editors in the editor area. Multiple tabs can be opened in one editor group. There can be multiple editor groups."));
+}, nls.localize('tabActiveUnfocusedBorderTop', "Border to the top of an active tab in an unfocused group. Tabs are the containers for editors in the editor area. Multiple tabs can be opened in one editor group. There can be multiple editor groups."));
 
 export const TAB_HOVER_BORDER = registerColor('tab.hoverBorder', {
 	dark: null,
@@ -117,11 +117,17 @@ export const TAB_UNFOCUSED_INACTIVE_FOREGROUND = registerColor('tab.unfocusedIna
 
 // < --- Editors --- >
 
+export const EDITOR_PANE_BACKGROUND = registerColor('editorPane.background', {
+	dark: editorBackground,
+	light: editorBackground,
+	hc: editorBackground
+}, nls.localize('editorPaneBackground', "Background color of the editor pane visible on the left and right side of the centered editor layout."));
+
 registerColor('editorGroup.background', {
 	dark: null,
 	light: null,
 	hc: null
-}, nls.localize('editorGroupBackground', "Deprecated background color of an editor group."), false, nls.localize('deprecatedEditorGroupBackground', "Deprecated: Background color of an editor group is no longer being supported with the introduction of the grid editor lyout. You can use editorGroup.emptyBackground to set the background color of empty editor groups."));
+}, nls.localize('editorGroupBackground', "Deprecated background color of an editor group."), false, nls.localize('deprecatedEditorGroupBackground', "Deprecated: Background color of an editor group is no longer being supported with the introduction of the grid editor layout. You can use editorGroup.emptyBackground to set the background color of empty editor groups."));
 
 export const EDITOR_GROUP_EMPTY_BACKGROUND = registerColor('editorGroup.emptyBackground', {
 	dark: null,
@@ -161,7 +167,7 @@ export const EDITOR_GROUP_BORDER = registerColor('editorGroup.border', {
 
 export const EDITOR_DRAG_AND_DROP_BACKGROUND = registerColor('editorGroup.dropBackground', {
 	dark: Color.fromHex('#53595D').transparent(0.5),
-	light: Color.fromHex('#3399FF').transparent(0.18),
+	light: Color.fromHex('#2677CB').transparent(0.18),
 	hc: null
 }, nls.localize('editorDragAndDropBackground', "Background color when dragging editors around. The color should have transparency so that the editor contents can still shine through."));
 
@@ -188,7 +194,7 @@ export const PANEL_ACTIVE_TITLE_FOREGROUND = registerColor('panelTitle.activeFor
 }, nls.localize('panelActiveTitleForeground', "Title color for the active panel. Panels are shown below the editor area and contain views like output and integrated terminal."));
 
 export const PANEL_INACTIVE_TITLE_FOREGROUND = registerColor('panelTitle.inactiveForeground', {
-	dark: transparent(PANEL_ACTIVE_TITLE_FOREGROUND, 0.5),
+	dark: transparent(PANEL_ACTIVE_TITLE_FOREGROUND, 0.6),
 	light: transparent(PANEL_ACTIVE_TITLE_FOREGROUND, 0.75),
 	hc: Color.white
 }, nls.localize('panelInactiveTitleForeground', "Title color for the inactive panel. Panels are shown below the editor area and contain views like output and integrated terminal."));
@@ -201,7 +207,7 @@ export const PANEL_ACTIVE_TITLE_BORDER = registerColor('panelTitle.activeBorder'
 
 export const PANEL_DRAG_AND_DROP_BACKGROUND = registerColor('panel.dropBackground', {
 	dark: Color.white.transparent(0.12),
-	light: Color.fromHex('#3399FF').transparent(0.18),
+	light: Color.fromHex('#2677CB').transparent(0.18),
 	hc: Color.white.transparent(0.12)
 }, nls.localize('panelDragAndDropBackground', "Drag and drop feedback color for the panel title items. The color should have transparency so that the panel entries can still shine through. Panels are shown below the editor area and contain views like output and integrated terminal."));
 
@@ -388,6 +394,56 @@ export const TITLE_BAR_BORDER = registerColor('titleBar.border', {
 	hc: contrastBorder
 }, nls.localize('titleBarBorder', "Title bar border color. Note that this color is currently only supported on macOS."));
 
+// < --- Menubar --- >
+
+export const MENUBAR_SELECTION_FOREGROUND = registerColor('menubar.selectionForeground', {
+	dark: TITLE_BAR_ACTIVE_FOREGROUND,
+	light: TITLE_BAR_ACTIVE_FOREGROUND,
+	hc: TITLE_BAR_ACTIVE_FOREGROUND
+}, nls.localize('menubarSelectionForeground', "Foreground color of the selected menu item in the menubar."));
+
+export const MENUBAR_SELECTION_BACKGROUND = registerColor('menubar.selectionBackground', {
+	dark: transparent(Color.white, 0.1),
+	light: transparent(Color.black, 0.1),
+	hc: null
+}, nls.localize('menubarSelectionBackground', "Background color of the selected menu item in the menubar."));
+
+export const MENUBAR_SELECTION_BORDER = registerColor('menubar.selectionBorder', {
+	dark: null,
+	light: null,
+	hc: activeContrastBorder
+}, nls.localize('menubarSelectionBorder', "Border color of the selected menu item in the menubar."));
+
+export const MENU_FOREGROUND = registerColor('menu.foreground', {
+	dark: SIDE_BAR_FOREGROUND,
+	light: SIDE_BAR_FOREGROUND,
+	hc: SIDE_BAR_FOREGROUND
+}, nls.localize('menuForeground', "Foreground color of menu items."));
+
+export const MENU_BACKGROUND = registerColor('menu.background', {
+	dark: SIDE_BAR_BACKGROUND,
+	light: SIDE_BAR_BACKGROUND,
+	hc: SIDE_BAR_BACKGROUND
+}, nls.localize('menuBackground', "Background color of menu items."));
+
+export const MENU_SELECTION_FOREGROUND = registerColor('menu.selectionForeground', {
+	dark: listActiveSelectionForeground,
+	light: listActiveSelectionForeground,
+	hc: listActiveSelectionForeground
+}, nls.localize('menuSelectionForeground', "Foreground color of the selected menu item in menus."));
+
+export const MENU_SELECTION_BACKGROUND = registerColor('menu.selectionBackground', {
+	dark: listActiveSelectionBackground,
+	light: listActiveSelectionBackground,
+	hc: listActiveSelectionBackground
+}, nls.localize('menuSelectionBackground', "Background color of the selected menu item in menus."));
+
+export const MENU_SELECTION_BORDER = registerColor('menu.selectionBorder', {
+	dark: null,
+	light: null,
+	hc: null
+}, nls.localize('menuSelectionBorder', "Border color of the selected menu item in menus."));
+
 // < --- Notifications --- >
 
 export const NOTIFICATIONS_CENTER_BORDER = registerColor('notificationCenter.border', {
@@ -455,10 +511,6 @@ export class Themable extends Disposable {
 		this._register(this.themeService.onThemeChange(theme => this.onThemeChange(theme)));
 	}
 
-	protected get toUnbind(): IDisposable[] {
-		return this._toDispose;
-	}
-
 	protected onThemeChange(theme: ITheme): void {
 		this.theme = theme;
 
diff --git a/src/vs/workbench/common/views.ts b/src/vs/workbench/common/views.ts
index a8559736bfd..408aa711d46 100644
--- a/src/vs/workbench/common/views.ts
+++ b/src/vs/workbench/common/views.ts
@@ -42,7 +42,7 @@ export interface IViewContainersRegistry {
 	 *
 	 * @returns the registered ViewContainer.
 	 */
-	registerViewContainer(id: string): ViewContainer;
+	registerViewContainer(id: string, extensionId?: string): ViewContainer;
 
 	/**
 	 * Returns the view container with given id.
@@ -54,7 +54,7 @@ export interface IViewContainersRegistry {
 }
 
 export class ViewContainer {
-	protected constructor(readonly id: string) { }
+	protected constructor(readonly id: string, readonly extensionId: string) { }
 }
 
 class ViewContainersRegistryImpl implements IViewContainersRegistry {
@@ -68,11 +68,11 @@ class ViewContainersRegistryImpl implements IViewContainersRegistry {
 		return values(this.viewContainers);
 	}
 
-	registerViewContainer(id: string): ViewContainer {
+	registerViewContainer(id: string, extensionId: string): ViewContainer {
 		if (!this.viewContainers.has(id)) {
 			const viewContainer = new class extends ViewContainer {
 				constructor() {
-					super(id);
+					super(id, extensionId);
 				}
 			};
 			this.viewContainers.set(id, viewContainer);
@@ -96,7 +96,7 @@ export interface IViewDescriptor {
 
 	readonly container: ViewContainer;
 
-	// TODO do we really need this?!
+	// TODO@Sandeep do we really need this?!
 	readonly ctor: any;
 
 	readonly when?: ContextKeyExpr;
@@ -109,6 +109,7 @@ export interface IViewDescriptor {
 
 	readonly canToggleVisibility?: boolean;
 
+	// Applies only to newly created views
 	readonly hideByDefault?: boolean;
 }
 
@@ -194,9 +195,15 @@ export const ViewsRegistry: IViewsRegistry = new class implements IViewsRegistry
 	}
 };
 
+export interface IView {
+
+	readonly id: string;
+
+}
+
 export interface IViewsViewlet extends IViewlet {
 
-	openView(id: string, focus?: boolean): TPromise<void>;
+	openView(id: string, focus?: boolean): TPromise<IView>;
 
 }
 
@@ -205,7 +212,7 @@ export const IViewsService = createDecorator<IViewsService>('viewsService');
 export interface IViewsService {
 	_serviceBrand: any;
 
-	openView(id: string, focus?: boolean): TPromise<void>;
+	openView(id: string, focus?: boolean): TPromise<IView>;
 }
 
 // Custom views
@@ -220,6 +227,10 @@ export interface ITreeViewer extends IDisposable {
 
 	readonly onDidChangeSelection: Event<ITreeItem[]>;
 
+	readonly onDidChangeVisibility: Event<boolean>;
+
+	readonly visible: boolean;
+
 	refresh(treeItems?: ITreeItem[]): TPromise<void>;
 
 	setVisibility(visible: boolean): void;
@@ -237,7 +248,7 @@ export interface ITreeViewer extends IDisposable {
 
 export interface ICustomViewDescriptor extends IViewDescriptor {
 
-	treeViewer: ITreeViewer;
+	readonly treeViewer: ITreeViewer;
 
 }
 
@@ -262,9 +273,9 @@ export interface ITreeItem {
 
 	label?: string;
 
-	icon?: string;
+	icon?: UriComponents;
 
-	iconDark?: string;
+	iconDark?: UriComponents;
 
 	themeIcon?: ThemeIcon;
 
@@ -277,7 +288,6 @@ export interface ITreeItem {
 	command?: Command;
 
 	children?: ITreeItem[];
-
 }
 
 export interface ITreeViewDataProvider {
diff --git a/src/vs/workbench/electron-browser/actions.ts b/src/vs/workbench/electron-browser/actions.ts
index 1a54d767562..660b45d0f40 100644
--- a/src/vs/workbench/electron-browser/actions.ts
+++ b/src/vs/workbench/electron-browser/actions.ts
@@ -7,40 +7,30 @@
 
 import 'vs/css!./media/actions';
 
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { Action } from 'vs/base/common/actions';
 import { IWindowService, IWindowsService, MenuBarVisibility } from 'vs/platform/windows/common/windows';
 import * as nls from 'vs/nls';
 import product from 'vs/platform/node/product';
-import pkg from 'vs/platform/node/package';
 import * as errors from 'vs/base/common/errors';
 import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { IConfigurationService, ConfigurationTarget } from 'vs/platform/configuration/common/configuration';
 import { IWorkspaceConfigurationService } from 'vs/workbench/services/configuration/common/configuration';
-import * as paths from 'vs/base/common/paths';
-import { isMacintosh, isLinux } from 'vs/base/common/platform';
-import { IQuickOpenService, IFilePickOpenEntry, ISeparator, IPickOpenAction, IPickOpenItem } from 'vs/platform/quickOpen/common/quickOpen';
+import { isMacintosh, isLinux, language } from 'vs/base/common/platform';
 import * as browser from 'vs/base/browser/browser';
-import { IIntegrityService } from 'vs/platform/integrity/common/integrity';
-import { IEntryRunContext } from 'vs/base/parts/quickopen/common/quickOpen';
-import { ITimerService, IStartupMetrics } from 'vs/workbench/services/timer/common/timerService';
-import { IEditorGroupsService, GroupDirection } from 'vs/workbench/services/group/common/editorGroupsService';
+import { IEditorGroupsService, GroupDirection, GroupLocation, IFindGroupScope } from 'vs/workbench/services/group/common/editorGroupsService';
 import { IPanelService } from 'vs/workbench/services/panel/common/panelService';
 import { IPartService, Parts, Position as PartPosition } from 'vs/workbench/services/part/common/partService';
 import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import * as os from 'os';
-import { webFrame } from 'electron';
-import { getPathLabel, getBaseLabel } from 'vs/base/common/labels';
+import { webFrame, shell } from 'electron';
+import { getBaseLabel } from 'vs/base/common/labels';
 import { IViewlet } from 'vs/workbench/common/viewlet';
 import { IPanel } from 'vs/workbench/common/panel';
-import { IWorkspaceIdentifier, getWorkspaceLabel, ISingleFolderWorkspaceIdentifier, isSingleFolderWorkspaceIdentifier } from 'vs/platform/workspaces/common/workspaces';
+import { IWorkspaceIdentifier, ISingleFolderWorkspaceIdentifier, isSingleFolderWorkspaceIdentifier, isWorkspaceIdentifier } from 'vs/platform/workspaces/common/workspaces';
 import { FileKind } from 'vs/platform/files/common/files';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IExtensionService, ActivationTimes } from 'vs/workbench/services/extensions/common/extensions';
-import { getEntries } from 'vs/base/common/performance';
 import { IssueType } from 'vs/platform/issue/common/issue';
 import { domEvent } from 'vs/base/browser/event';
 import { once } from 'vs/base/common/event';
@@ -50,19 +40,25 @@ import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { Context } from 'vs/platform/contextkey/browser/contextKeyService';
 import { IWorkbenchIssueService } from 'vs/workbench/services/issue/common/issue';
 import { INotificationService } from 'vs/platform/notification/common/notification';
+import { ILabelService } from 'vs/platform/label/common/label';
+import { dirname } from 'vs/base/common/resources';
+import { IModelService } from 'vs/editor/common/services/modelService';
+import { IModeService } from 'vs/editor/common/services/modeService';
+import { IQuickInputService, IQuickPickItem, IQuickInputButton, IQuickPickSeparator, IKeyMods } from 'vs/platform/quickinput/common/quickInput';
+import { getIconClasses } from 'vs/workbench/browser/labels';
 
 // --- actions
 
 export class CloseCurrentWindowAction extends Action {
 
-	public static readonly ID = 'workbench.action.closeWindow';
-	public static readonly LABEL = nls.localize('closeWindow', "Close Window");
+	static readonly ID = 'workbench.action.closeWindow';
+	static readonly LABEL = nls.localize('closeWindow', "Close Window");
 
 	constructor(id: string, label: string, @IWindowService private windowService: IWindowService) {
 		super(id, label);
 	}
 
-	public run(): TPromise<boolean> {
+	run(): TPromise<boolean> {
 		this.windowService.closeWindow();
 
 		return TPromise.as(true);
@@ -142,7 +138,7 @@ export class ToggleMenuBarAction extends Action {
 		super(id, label);
 	}
 
-	public run(): TPromise<void> {
+	run(): TPromise<void> {
 		let currentVisibilityValue = this.configurationService.getValue<MenuBarVisibility>(ToggleMenuBarAction.menuBarVisibilityKey);
 		if (typeof currentVisibilityValue !== 'string') {
 			currentVisibilityValue = 'default';
@@ -170,7 +166,7 @@ export class ToggleDevToolsAction extends Action {
 		super(id, label);
 	}
 
-	public run(): TPromise<void> {
+	run(): TPromise<void> {
 		return this.windowsService.toggleDevTools();
 	}
 }
@@ -198,14 +194,14 @@ export abstract class BaseZoomAction extends Action {
 			browser.setZoomLevel(webFrame.getZoomLevel(), /*isTrusted*/false);
 		};
 
-		this.configurationService.updateValue(BaseZoomAction.SETTING_KEY, level).done(() => applyZoom());
+		this.configurationService.updateValue(BaseZoomAction.SETTING_KEY, level).then(() => applyZoom());
 	}
 }
 
 export class ZoomInAction extends BaseZoomAction {
 
-	public static readonly ID = 'workbench.action.zoomIn';
-	public static readonly LABEL = nls.localize('zoomIn', "Zoom In");
+	static readonly ID = 'workbench.action.zoomIn';
+	static readonly LABEL = nls.localize('zoomIn', "Zoom In");
 
 	constructor(
 		id: string,
@@ -215,7 +211,7 @@ export class ZoomInAction extends BaseZoomAction {
 		super(id, label, configurationService);
 	}
 
-	public run(): TPromise<boolean> {
+	run(): TPromise<boolean> {
 		this.setConfiguredZoomLevel(webFrame.getZoomLevel() + 1);
 
 		return TPromise.as(true);
@@ -224,8 +220,8 @@ export class ZoomInAction extends BaseZoomAction {
 
 export class ZoomOutAction extends BaseZoomAction {
 
-	public static readonly ID = 'workbench.action.zoomOut';
-	public static readonly LABEL = nls.localize('zoomOut', "Zoom Out");
+	static readonly ID = 'workbench.action.zoomOut';
+	static readonly LABEL = nls.localize('zoomOut', "Zoom Out");
 
 	constructor(
 		id: string,
@@ -235,7 +231,7 @@ export class ZoomOutAction extends BaseZoomAction {
 		super(id, label, configurationService);
 	}
 
-	public run(): TPromise<boolean> {
+	run(): TPromise<boolean> {
 		this.setConfiguredZoomLevel(webFrame.getZoomLevel() - 1);
 
 		return TPromise.as(true);
@@ -244,8 +240,8 @@ export class ZoomOutAction extends BaseZoomAction {
 
 export class ZoomResetAction extends BaseZoomAction {
 
-	public static readonly ID = 'workbench.action.zoomReset';
-	public static readonly LABEL = nls.localize('zoomReset', "Reset Zoom");
+	static readonly ID = 'workbench.action.zoomReset';
+	static readonly LABEL = nls.localize('zoomReset', "Reset Zoom");
 
 	constructor(
 		id: string,
@@ -255,287 +251,13 @@ export class ZoomResetAction extends BaseZoomAction {
 		super(id, label, configurationService);
 	}
 
-	public run(): TPromise<boolean> {
+	run(): TPromise<boolean> {
 		this.setConfiguredZoomLevel(0);
 
 		return TPromise.as(true);
 	}
 }
 
-/* Copied from loader.ts */
-enum LoaderEventType {
-	LoaderAvailable = 1,
-
-	BeginLoadingScript = 10,
-	EndLoadingScriptOK = 11,
-	EndLoadingScriptError = 12,
-
-	BeginInvokeFactory = 21,
-	EndInvokeFactory = 22,
-
-	NodeBeginEvaluatingScript = 31,
-	NodeEndEvaluatingScript = 32,
-
-	NodeBeginNativeRequire = 33,
-	NodeEndNativeRequire = 34
-}
-
-interface ILoaderEvent {
-	type: LoaderEventType;
-	timestamp: number;
-	detail: string;
-}
-
-export class ShowStartupPerformance extends Action {
-
-	public static readonly ID = 'workbench.action.appPerf';
-	public static readonly LABEL = nls.localize('appPerf', "Startup Performance");
-
-	constructor(
-		id: string,
-		label: string,
-		@IWindowService private windowService: IWindowService,
-		@ITimerService private timerService: ITimerService,
-		@IEnvironmentService private environmentService: IEnvironmentService,
-		@IExtensionService private extensionService: IExtensionService
-	) {
-		super(id, label);
-	}
-
-	public run(): TPromise<boolean> {
-
-		// Show dev tools
-		this.windowService.openDevTools();
-
-		// Print to console
-		setTimeout(() => {
-			(<any>console).group('Startup Performance Measurement');
-			const metrics: IStartupMetrics = this.timerService.startupMetrics;
-			console.log(`OS: ${metrics.platform} (${metrics.release})`);
-			console.log(`CPUs: ${metrics.cpus.model} (${metrics.cpus.count} x ${metrics.cpus.speed})`);
-			console.log(`Memory (System): ${(metrics.totalmem / (1024 * 1024 * 1024)).toFixed(2)}GB (${(metrics.freemem / (1024 * 1024 * 1024)).toFixed(2)}GB free)`);
-			console.log(`Memory (Process): ${(metrics.meminfo.workingSetSize / 1024).toFixed(2)}MB working set (${(metrics.meminfo.peakWorkingSetSize / 1024).toFixed(2)}MB peak, ${(metrics.meminfo.privateBytes / 1024).toFixed(2)}MB private, ${(metrics.meminfo.sharedBytes / 1024).toFixed(2)}MB shared)`);
-			console.log(`VM (likelyhood): ${metrics.isVMLikelyhood}%`);
-			console.log(`Initial Startup: ${metrics.initialStartup}`);
-			console.log(`Screen Reader Active: ${metrics.hasAccessibilitySupport}`);
-			console.log(`Empty Workspace: ${metrics.emptyWorkbench}`);
-
-			let nodeModuleLoadTime: number;
-			if (this.environmentService.performance) {
-				const nodeModuleTimes = this.analyzeNodeModulesLoadTimes();
-				nodeModuleLoadTime = nodeModuleTimes.duration;
-			}
-
-			(<any>console).table(this.getStartupMetricsTable(nodeModuleLoadTime));
-
-			if (this.environmentService.performance) {
-				const data = this.analyzeLoaderStats();
-				for (let type in data) {
-					(<any>console).groupCollapsed(`Loader: ${type}`);
-					(<any>console).table(data[type]);
-					(<any>console).groupEnd();
-				}
-			}
-
-			(<any>console).groupEnd();
-
-			(<any>console).group('Extension Activation Stats');
-			let extensionsActivationTimes: { [id: string]: ActivationTimes; } = {};
-			let extensionsStatus = this.extensionService.getExtensionsStatus();
-			for (let id in extensionsStatus) {
-				const status = extensionsStatus[id];
-				if (status.activationTimes) {
-					extensionsActivationTimes[id] = status.activationTimes;
-				}
-			}
-			(<any>console).table(extensionsActivationTimes);
-			(<any>console).groupEnd();
-
-			(<any>console).group('Raw Startup Timers (CSV)');
-			let value = `Name\tStart\n`;
-			let entries = getEntries('mark').slice(0).sort((a, b) => a.startTime - b.startTime);
-			for (const entry of entries) {
-				value += `${entry.name}\t${entry.startTime}\n`;
-			}
-			console.log(value);
-			(<any>console).groupEnd();
-		}, 1000);
-
-		return TPromise.as(true);
-	}
-
-	private getStartupMetricsTable(nodeModuleLoadTime?: number): any[] {
-		const table: any[] = [];
-		const metrics: IStartupMetrics = this.timerService.startupMetrics;
-
-		if (metrics.initialStartup) {
-			table.push({ Topic: '[main] start => app.isReady', 'Took (ms)': metrics.timers.ellapsedAppReady });
-			table.push({ Topic: '[main] nls:start => nls:end', 'Took (ms)': metrics.timers.ellapsedNlsGeneration });
-			table.push({ Topic: '[main] app.isReady => window.loadUrl()', 'Took (ms)': metrics.timers.ellapsedWindowLoad });
-		}
-
-		table.push({ Topic: '[renderer] window.loadUrl() => begin to require(workbench.main.js)', 'Took (ms)': metrics.timers.ellapsedWindowLoadToRequire });
-		table.push({ Topic: '[renderer] require(workbench.main.js)', 'Took (ms)': metrics.timers.ellapsedRequire });
-
-		if (nodeModuleLoadTime) {
-			table.push({ Topic: '[renderer] -> of which require() node_modules', 'Took (ms)': nodeModuleLoadTime });
-		}
-
-		table.push({ Topic: '[renderer] create extension host => extensions onReady()', 'Took (ms)': metrics.timers.ellapsedExtensions });
-		table.push({ Topic: '[renderer] restore viewlet', 'Took (ms)': metrics.timers.ellapsedViewletRestore });
-		table.push({ Topic: '[renderer] restore editor view state', 'Took (ms)': metrics.timers.ellapsedEditorRestore });
-		table.push({ Topic: '[renderer] overall workbench load', 'Took (ms)': metrics.timers.ellapsedWorkbench });
-		table.push({ Topic: '------------------------------------------------------' });
-		table.push({ Topic: '[main, renderer] start => extensions ready', 'Took (ms)': metrics.timers.ellapsedExtensionsReady });
-		table.push({ Topic: '[main, renderer] start => workbench ready', 'Took (ms)': metrics.ellapsed });
-
-		return table;
-	}
-
-	private analyzeNodeModulesLoadTimes(): { table: any[], duration: number } {
-		const stats = <ILoaderEvent[]>(<any>require).getStats();
-		const result = [];
-
-		let total = 0;
-
-		for (let i = 0, len = stats.length; i < len; i++) {
-			if (stats[i].type === LoaderEventType.NodeEndNativeRequire) {
-				if (stats[i - 1].type === LoaderEventType.NodeBeginNativeRequire && stats[i - 1].detail === stats[i].detail) {
-					const entry: any = {};
-					const dur = (stats[i].timestamp - stats[i - 1].timestamp);
-					entry['Event'] = 'nodeRequire ' + stats[i].detail;
-					entry['Took (ms)'] = dur.toFixed(2);
-					total += dur;
-					entry['Start (ms)'] = '**' + stats[i - 1].timestamp.toFixed(2);
-					entry['End (ms)'] = '**' + stats[i - 1].timestamp.toFixed(2);
-					result.push(entry);
-				}
-			}
-		}
-
-		if (total > 0) {
-			result.push({ Event: '------------------------------------------------------' });
-
-			const entry: any = {};
-			entry['Event'] = '[renderer] total require() node_modules';
-			entry['Took (ms)'] = total.toFixed(2);
-			entry['Start (ms)'] = '**';
-			entry['End (ms)'] = '**';
-			result.push(entry);
-		}
-
-		return { table: result, duration: Math.round(total) };
-	}
-
-	private analyzeLoaderStats(): { [type: string]: any[] } {
-		const stats = <ILoaderEvent[]>(<any>require).getStats().slice(0).sort((a: ILoaderEvent, b: ILoaderEvent) => {
-			if (a.detail < b.detail) {
-				return -1;
-			} else if (a.detail > b.detail) {
-				return 1;
-			} else if (a.type < b.type) {
-				return -1;
-			} else if (a.type > b.type) {
-				return 1;
-			} else {
-				return 0;
-			}
-		});
-
-		class Tick {
-
-			public readonly duration: number;
-			public readonly detail: string;
-
-			constructor(public readonly start: ILoaderEvent, public readonly end: ILoaderEvent) {
-				console.assert(start.detail === end.detail);
-
-				this.duration = this.end.timestamp - this.start.timestamp;
-				this.detail = start.detail;
-			}
-
-			toTableObject() {
-				return {
-					['Path']: this.start.detail,
-					['Took (ms)']: this.duration.toFixed(2),
-					// ['Start (ms)']: this.start.timestamp,
-					// ['End (ms)']: this.end.timestamp
-				};
-			}
-
-			static compareUsingStartTimestamp(a: Tick, b: Tick): number {
-				if (a.start.timestamp < b.start.timestamp) {
-					return -1;
-				} else if (a.start.timestamp > b.start.timestamp) {
-					return 1;
-				} else {
-					return 0;
-				}
-			}
-		}
-
-		const ticks: { [type: number]: Tick[] } = {
-			[LoaderEventType.BeginLoadingScript]: [],
-			[LoaderEventType.BeginInvokeFactory]: [],
-			[LoaderEventType.NodeBeginEvaluatingScript]: [],
-			[LoaderEventType.NodeBeginNativeRequire]: [],
-		};
-
-		for (let i = 1; i < stats.length - 1; i++) {
-			const stat = stats[i];
-			const nextStat = stats[i + 1];
-
-			if (nextStat.type - stat.type > 2) {
-				//bad?!
-				break;
-			}
-
-			i += 1;
-			ticks[stat.type].push(new Tick(stat, nextStat));
-		}
-
-		ticks[LoaderEventType.BeginInvokeFactory].sort(Tick.compareUsingStartTimestamp);
-		ticks[LoaderEventType.BeginInvokeFactory].sort(Tick.compareUsingStartTimestamp);
-		ticks[LoaderEventType.NodeBeginEvaluatingScript].sort(Tick.compareUsingStartTimestamp);
-		ticks[LoaderEventType.NodeBeginNativeRequire].sort(Tick.compareUsingStartTimestamp);
-
-		const ret = {
-			'Load Script': ticks[LoaderEventType.BeginLoadingScript].map(t => t.toTableObject()),
-			'(Node) Load Script': ticks[LoaderEventType.NodeBeginNativeRequire].map(t => t.toTableObject()),
-			'Eval Script': ticks[LoaderEventType.BeginInvokeFactory].map(t => t.toTableObject()),
-			'(Node) Eval Script': ticks[LoaderEventType.NodeBeginEvaluatingScript].map(t => t.toTableObject()),
-		};
-
-		function total(ticks: Tick[]): number {
-			let sum = 0;
-			for (const tick of ticks) {
-				sum += tick.duration;
-			}
-			return sum;
-		}
-
-		// totals
-		ret['Load Script'].push({
-			['Path']: 'TOTAL TIME',
-			['Took (ms)']: total(ticks[LoaderEventType.BeginLoadingScript]).toFixed(2)
-		});
-		ret['Eval Script'].push({
-			['Path']: 'TOTAL TIME',
-			['Took (ms)']: total(ticks[LoaderEventType.BeginInvokeFactory]).toFixed(2)
-		});
-		ret['(Node) Load Script'].push({
-			['Path']: 'TOTAL TIME',
-			['Took (ms)']: total(ticks[LoaderEventType.NodeBeginNativeRequire]).toFixed(2)
-		});
-		ret['(Node) Eval Script'].push({
-			['Path']: 'TOTAL TIME',
-			['Took (ms)']: total(ticks[LoaderEventType.NodeBeginEvaluatingScript]).toFixed(2)
-		});
-
-		return ret;
-	}
-}
-
 export class ReloadWindowAction extends Action {
 
 	static readonly ID = 'workbench.action.reloadWindow';
@@ -573,79 +295,62 @@ export class ReloadWindowWithExtensionsDisabledAction extends Action {
 }
 
 export abstract class BaseSwitchWindow extends Action {
-	private closeWindowAction: CloseWindowAction;
+
+	private closeWindowAction: IQuickInputButton = {
+		iconClass: 'action-remove-from-recently-opened',
+		tooltip: nls.localize('close', "Close Window")
+	};
 
 	constructor(
 		id: string,
 		label: string,
 		private windowsService: IWindowsService,
 		private windowService: IWindowService,
-		private quickOpenService: IQuickOpenService,
+		private quickInputService: IQuickInputService,
 		private keybindingService: IKeybindingService,
-		private instantiationService: IInstantiationService
+		private modelService: IModelService,
+		private modeService: IModeService,
 	) {
 		super(id, label);
 
-		this.closeWindowAction = this.instantiationService.createInstance(CloseWindowAction);
 	}
 
 	protected abstract isQuickNavigate(): boolean;
 
-	public run(): TPromise<void> {
+	run(): TPromise<void> {
 		const currentWindowId = this.windowService.getCurrentWindowId();
 
 		return this.windowsService.getWindows().then(windows => {
 			const placeHolder = nls.localize('switchWindowPlaceHolder', "Select a window to switch to");
-			const picks = windows.map(win => ({
-				payload: win.id,
-				resource: win.filename ? URI.file(win.filename) : win.folderPath ? URI.file(win.folderPath) : win.workspace ? URI.file(win.workspace.configPath) : void 0,
-				fileKind: win.filename ? FileKind.FILE : win.workspace ? FileKind.ROOT_FOLDER : win.folderPath ? FileKind.FOLDER : FileKind.FILE,
-				label: win.title,
-				description: (currentWindowId === win.id) ? nls.localize('current', "Current Window") : void 0,
-				run: () => {
-					setTimeout(() => {
-						// Bug: somehow when not running this code in a timeout, it is not possible to use this picker
-						// with quick navigate keys (not able to trigger quick navigate once running it once).
-						this.windowsService.showWindow(win.id).done(null, errors.onUnexpectedError);
-					});
-				},
-				action: (!this.isQuickNavigate() && currentWindowId !== win.id) ? this.closeWindowAction : void 0
-			} as IFilePickOpenEntry));
-
-			this.quickOpenService.pick(picks, {
-				contextKey: 'inWindowsPicker',
-				autoFocus: { autoFocusFirstEntry: true },
-				placeHolder,
-				quickNavigateConfiguration: this.isQuickNavigate() ? { keybindings: this.keybindingService.lookupKeybindings(this.id) } : void 0
+			const picks = windows.map(win => {
+				const resource = win.filename ? URI.file(win.filename) : win.folderUri ? win.folderUri : win.workspace ? URI.file(win.workspace.configPath) : void 0;
+				const fileKind = win.filename ? FileKind.FILE : win.workspace ? FileKind.ROOT_FOLDER : win.folderUri ? FileKind.FOLDER : FileKind.FILE;
+				return {
+					payload: win.id,
+					label: win.title,
+					iconClasses: getIconClasses(this.modelService, this.modeService, resource, fileKind),
+					description: (currentWindowId === win.id) ? nls.localize('current', "Current Window") : void 0,
+					buttons: (!this.isQuickNavigate() && currentWindowId !== win.id) ? [this.closeWindowAction] : void 0
+				} as (IQuickPickItem & { payload: number });
 			});
-		});
-	}
 
-	public dispose(): void {
-		super.dispose();
+			const autoFocusIndex = (picks.indexOf(picks.filter(pick => pick.payload === currentWindowId)[0]) + 1) % picks.length;
 
-		this.closeWindowAction.dispose();
-	}
-}
-
-class CloseWindowAction extends Action implements IPickOpenAction {
-
-	public static readonly ID = 'workbench.action.closeWindow';
-	public static readonly LABEL = nls.localize('close', "Close Window");
-
-	constructor(
-		@IWindowsService private windowsService: IWindowsService
-	) {
-		super(CloseWindowAction.ID, CloseWindowAction.LABEL);
-
-		this.class = 'action-remove-from-recently-opened';
-	}
-
-	public run(item: IPickOpenItem): TPromise<boolean> {
-		return this.windowsService.closeWindow(item.getPayload()).then(() => {
-			item.remove();
-
-			return true;
+			return this.quickInputService.pick(picks, {
+				contextKey: 'inWindowsPicker',
+				activeItem: picks[autoFocusIndex],
+				placeHolder,
+				quickNavigate: this.isQuickNavigate() ? { keybindings: this.keybindingService.lookupKeybindings(this.id) } : void 0,
+				onDidTriggerItemButton: context => {
+					this.windowsService.closeWindow(context.item.payload).then(() => {
+						context.removeItem();
+					});
+				}
+			});
+		}).then(pick => {
+			if (pick) {
+				this.windowsService.showWindow(pick.payload);
+			}
 		});
 	}
 }
@@ -660,11 +365,12 @@ export class SwitchWindow extends BaseSwitchWindow {
 		label: string,
 		@IWindowsService windowsService: IWindowsService,
 		@IWindowService windowService: IWindowService,
-		@IQuickOpenService quickOpenService: IQuickOpenService,
+		@IQuickInputService quickInputService: IQuickInputService,
 		@IKeybindingService keybindingService: IKeybindingService,
-		@IInstantiationService instantiationService: IInstantiationService
+		@IModelService modelService: IModelService,
+		@IModeService modeService: IModeService,
 	) {
-		super(id, label, windowsService, windowService, quickOpenService, keybindingService, instantiationService);
+		super(id, label, windowsService, windowService, quickInputService, keybindingService, modelService, modeService);
 	}
 
 	protected isQuickNavigate(): boolean {
@@ -682,11 +388,12 @@ export class QuickSwitchWindow extends BaseSwitchWindow {
 		label: string,
 		@IWindowsService windowsService: IWindowsService,
 		@IWindowService windowService: IWindowService,
-		@IQuickOpenService quickOpenService: IQuickOpenService,
+		@IQuickInputService quickInputService: IQuickInputService,
 		@IKeybindingService keybindingService: IKeybindingService,
-		@IInstantiationService instantiationService: IInstantiationService
+		@IModelService modelService: IModelService,
+		@IModeService modeService: IModeService,
 	) {
-		super(id, label, windowsService, windowService, quickOpenService, keybindingService, instantiationService);
+		super(id, label, windowsService, windowService, quickInputService, keybindingService, modelService, modeService);
 	}
 
 	protected isQuickNavigate(): boolean {
@@ -697,128 +404,122 @@ export class QuickSwitchWindow extends BaseSwitchWindow {
 export const inRecentFilesPickerContextKey = 'inRecentFilesPicker';
 
 export abstract class BaseOpenRecentAction extends Action {
-	private removeAction: RemoveFromRecentlyOpened;
+
+	private removeFromRecentlyOpened: IQuickInputButton = {
+		iconClass: 'action-remove-from-recently-opened',
+		tooltip: nls.localize('remove', "Remove from Recently Opened")
+	};
 
 	constructor(
 		id: string,
 		label: string,
 		private windowService: IWindowService,
-		private quickOpenService: IQuickOpenService,
+		private windowsService: IWindowsService,
+		private quickInputService: IQuickInputService,
 		private contextService: IWorkspaceContextService,
 		private environmentService: IEnvironmentService,
+		private labelService: ILabelService,
 		private keybindingService: IKeybindingService,
-		instantiationService: IInstantiationService
+		private modelService: IModelService,
+		private modeService: IModeService,
 	) {
 		super(id, label);
-
-		this.removeAction = instantiationService.createInstance(RemoveFromRecentlyOpened);
 	}
 
 	protected abstract isQuickNavigate(): boolean;
 
-	public run(): TPromise<void> {
+	run(): TPromise<void> {
 		return this.windowService.getRecentlyOpened()
 			.then(({ workspaces, files }) => this.openRecent(workspaces, files));
 	}
 
-	private openRecent(recentWorkspaces: (IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier)[], recentFiles: string[]): void {
+	private openRecent(recentWorkspaces: (IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier)[], recentFiles: URI[]): void {
 
-		function toPick(workspace: IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier, separator: ISeparator, fileKind: FileKind, environmentService: IEnvironmentService, removeAction?: RemoveFromRecentlyOpened): IFilePickOpenEntry {
-			let path: string;
+		const toPick = (workspace: IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier | URI, fileKind: FileKind, environmentService: IEnvironmentService, labelService: ILabelService, buttons: IQuickInputButton[]) => {
+			let resource: URI;
 			let label: string;
 			let description: string;
-			if (isSingleFolderWorkspaceIdentifier(workspace)) {
-				path = workspace;
-				label = getBaseLabel(path);
-				description = getPathLabel(paths.dirname(path), null, environmentService);
+			if (isSingleFolderWorkspaceIdentifier(workspace) && fileKind !== FileKind.FILE) {
+				resource = workspace;
+				label = labelService.getWorkspaceLabel(workspace);
+				description = labelService.getUriLabel(dirname(resource));
+			} else if (isWorkspaceIdentifier(workspace)) {
+				resource = URI.file(workspace.configPath);
+				label = labelService.getWorkspaceLabel(workspace);
+				description = labelService.getUriLabel(dirname(resource));
 			} else {
-				path = workspace.configPath;
-				label = getWorkspaceLabel(workspace, environmentService);
-				description = getPathLabel(paths.dirname(workspace.configPath), null, environmentService);
+				resource = workspace;
+				label = getBaseLabel(workspace);
+				description = labelService.getUriLabel(dirname(resource));
 			}
 
 			return {
-				resource: URI.file(path),
-				fileKind,
+				iconClasses: getIconClasses(this.modelService, this.modeService, resource, fileKind),
 				label,
 				description,
-				separator,
-				run: context => {
-					setTimeout(() => {
-						// Bug: somehow when not running this code in a timeout, it is not possible to use this picker
-						// with quick navigate keys (not able to trigger quick navigate once running it once).
-						runPick(path, fileKind === FileKind.FILE, context);
-					});
-				},
-				action: removeAction
+				buttons,
+				workspace,
+				resource,
+				fileKind,
 			};
-		}
-
-		const runPick = (path: string, isFile: boolean, context: IEntryRunContext) => {
-			const forceNewWindow = context.keymods.ctrlCmd;
-			this.windowService.openWindow([path], { forceNewWindow, forceOpenWorkspaceAsFile: isFile });
 		};
 
-		const workspacePicks: IFilePickOpenEntry[] = recentWorkspaces.map((workspace, index) => toPick(workspace, index === 0 ? { label: nls.localize('workspaces', "workspaces") } : void 0, isSingleFolderWorkspaceIdentifier(workspace) ? FileKind.FOLDER : FileKind.ROOT_FOLDER, this.environmentService, !this.isQuickNavigate() ? this.removeAction : void 0));
-		const filePicks: IFilePickOpenEntry[] = recentFiles.map((p, index) => toPick(p, index === 0 ? { label: nls.localize('files', "files"), border: true } : void 0, FileKind.FILE, this.environmentService, !this.isQuickNavigate() ? this.removeAction : void 0));
+		const runPick = (resource: URI, isFile: boolean, keyMods: IKeyMods) => {
+			const forceNewWindow = keyMods.ctrlCmd;
+			return this.windowService.openWindow([resource], { forceNewWindow, forceOpenWorkspaceAsFile: isFile });
+		};
+
+		const workspacePicks = recentWorkspaces.map(workspace => toPick(workspace, isSingleFolderWorkspaceIdentifier(workspace) ? FileKind.FOLDER : FileKind.ROOT_FOLDER, this.environmentService, this.labelService, !this.isQuickNavigate() ? [this.removeFromRecentlyOpened] : void 0));
+		const filePicks = recentFiles.map(p => toPick(p, FileKind.FILE, this.environmentService, this.labelService, !this.isQuickNavigate() ? [this.removeFromRecentlyOpened] : void 0));
 
 		// focus second entry if the first recent workspace is the current workspace
 		let autoFocusSecondEntry: boolean = recentWorkspaces[0] && this.contextService.isCurrentWorkspace(recentWorkspaces[0]);
 
-		this.quickOpenService.pick([...workspacePicks, ...filePicks], {
+		let keyMods: IKeyMods;
+		const workspaceSeparator: IQuickPickSeparator = { type: 'separator', label: nls.localize('workspaces', "workspaces") };
+		const fileSeparator: IQuickPickSeparator = { type: 'separator', label: nls.localize('files', "files") };
+		const picks = [workspaceSeparator, ...workspacePicks, fileSeparator, ...filePicks];
+		this.quickInputService.pick(picks, {
 			contextKey: inRecentFilesPickerContextKey,
-			autoFocus: { autoFocusFirstEntry: !autoFocusSecondEntry, autoFocusSecondEntry: autoFocusSecondEntry },
+			activeItem: [...workspacePicks, ...filePicks][autoFocusSecondEntry ? 1 : 0],
 			placeHolder: isMacintosh ? nls.localize('openRecentPlaceHolderMac', "Select to open (hold Cmd-key to open in new window)") : nls.localize('openRecentPlaceHolder', "Select to open (hold Ctrl-key to open in new window)"),
 			matchOnDescription: true,
-			quickNavigateConfiguration: this.isQuickNavigate() ? { keybindings: this.keybindingService.lookupKeybindings(this.id) } : void 0
-		}).done(null, errors.onUnexpectedError);
-	}
-
-	public dispose(): void {
-		super.dispose();
-
-		this.removeAction.dispose();
-	}
-}
-
-class RemoveFromRecentlyOpened extends Action implements IPickOpenAction {
-
-	public static readonly ID = 'workbench.action.removeFromRecentlyOpened';
-	public static readonly LABEL = nls.localize('remove', "Remove from Recently Opened");
-
-	constructor(
-		@IWindowsService private windowsService: IWindowsService
-	) {
-		super(RemoveFromRecentlyOpened.ID, RemoveFromRecentlyOpened.LABEL);
-
-		this.class = 'action-remove-from-recently-opened';
-	}
-
-	public run(item: IPickOpenItem): TPromise<boolean> {
-		return this.windowsService.removeFromRecentlyOpened([item.getResource().fsPath]).then(() => {
-			item.remove();
-
-			return true;
-		});
+			onKeyMods: mods => keyMods = mods,
+			quickNavigate: this.isQuickNavigate() ? { keybindings: this.keybindingService.lookupKeybindings(this.id) } : void 0,
+			onDidTriggerItemButton: context => {
+				this.windowsService.removeFromRecentlyOpened([context.item.workspace]).then(() => {
+					context.removeItem();
+				}).then(null, errors.onUnexpectedError);
+			}
+		})
+			.then(pick => {
+				if (pick) {
+					return runPick(pick.resource, pick.fileKind === FileKind.FILE, keyMods);
+				}
+				return null;
+			});
 	}
 }
 
 export class OpenRecentAction extends BaseOpenRecentAction {
 
-	public static readonly ID = 'workbench.action.openRecent';
-	public static readonly LABEL = nls.localize('openRecent', "Open Recent...");
+	static readonly ID = 'workbench.action.openRecent';
+	static readonly LABEL = nls.localize('openRecent', "Open Recent...");
 
 	constructor(
 		id: string,
 		label: string,
 		@IWindowService windowService: IWindowService,
-		@IQuickOpenService quickOpenService: IQuickOpenService,
+		@IWindowsService windowsService: IWindowsService,
+		@IQuickInputService quickInputService: IQuickInputService,
 		@IWorkspaceContextService contextService: IWorkspaceContextService,
 		@IEnvironmentService environmentService: IEnvironmentService,
 		@IKeybindingService keybindingService: IKeybindingService,
-		@IInstantiationService instantiationService: IInstantiationService
+		@IModelService modelService: IModelService,
+		@IModeService modeService: IModeService,
+		@ILabelService labelService: ILabelService
 	) {
-		super(id, label, windowService, quickOpenService, contextService, environmentService, keybindingService, instantiationService);
+		super(id, label, windowService, windowsService, quickInputService, contextService, environmentService, labelService, keybindingService, modelService, modeService);
 	}
 
 	protected isQuickNavigate(): boolean {
@@ -828,20 +529,23 @@ export class OpenRecentAction extends BaseOpenRecentAction {
 
 export class QuickOpenRecentAction extends BaseOpenRecentAction {
 
-	public static readonly ID = 'workbench.action.quickOpenRecent';
-	public static readonly LABEL = nls.localize('quickOpenRecent', "Quick Open Recent...");
+	static readonly ID = 'workbench.action.quickOpenRecent';
+	static readonly LABEL = nls.localize('quickOpenRecent', "Quick Open Recent...");
 
 	constructor(
 		id: string,
 		label: string,
 		@IWindowService windowService: IWindowService,
-		@IQuickOpenService quickOpenService: IQuickOpenService,
+		@IWindowsService windowsService: IWindowsService,
+		@IQuickInputService quickInputService: IQuickInputService,
 		@IWorkspaceContextService contextService: IWorkspaceContextService,
 		@IEnvironmentService environmentService: IEnvironmentService,
 		@IKeybindingService keybindingService: IKeybindingService,
-		@IInstantiationService instantiationService: IInstantiationService
+		@IModelService modelService: IModelService,
+		@IModeService modeService: IModeService,
+		@ILabelService labelService: ILabelService
 	) {
-		super(id, label, windowService, quickOpenService, contextService, environmentService, keybindingService, instantiationService);
+		super(id, label, windowService, windowsService, quickInputService, contextService, environmentService, labelService, keybindingService, modelService, modeService);
 	}
 
 	protected isQuickNavigate(): boolean {
@@ -850,8 +554,8 @@ export class QuickOpenRecentAction extends BaseOpenRecentAction {
 }
 
 export class OpenIssueReporterAction extends Action {
-	public static readonly ID = 'workbench.action.openIssueReporter';
-	public static readonly LABEL = nls.localize({ key: 'reportIssueInEnglish', comment: ['Translate this to "Report Issue in English" in all languages please!'] }, "Report Issue");
+	static readonly ID = 'workbench.action.openIssueReporter';
+	static readonly LABEL = nls.localize({ key: 'reportIssueInEnglish', comment: ['Translate this to "Report Issue in English" in all languages please!'] }, "Report Issue");
 
 	constructor(
 		id: string,
@@ -861,15 +565,15 @@ export class OpenIssueReporterAction extends Action {
 		super(id, label);
 	}
 
-	public run(): TPromise<boolean> {
+	run(): TPromise<boolean> {
 		return this.issueService.openReporter()
 			.then(() => true);
 	}
 }
 
 export class OpenProcessExplorer extends Action {
-	public static readonly ID = 'workbench.action.openProcessExplorer';
-	public static readonly LABEL = nls.localize('openProcessExplorer', "Open Process Explorer");
+	static readonly ID = 'workbench.action.openProcessExplorer';
+	static readonly LABEL = nls.localize('openProcessExplorer', "Open Process Explorer");
 
 	constructor(
 		id: string,
@@ -879,15 +583,15 @@ export class OpenProcessExplorer extends Action {
 		super(id, label);
 	}
 
-	public run(): TPromise<boolean> {
+	run(): TPromise<boolean> {
 		return this.issueService.openProcessExplorer()
 			.then(() => true);
 	}
 }
 
 export class ReportPerformanceIssueUsingReporterAction extends Action {
-	public static readonly ID = 'workbench.action.reportPerformanceIssueUsingReporter';
-	public static readonly LABEL = nls.localize('reportPerformanceIssue', "Report Performance Issue");
+	static readonly ID = 'workbench.action.reportPerformanceIssueUsingReporter';
+	static readonly LABEL = nls.localize('reportPerformanceIssue', "Report Performance Issue");
 
 	constructor(
 		id: string,
@@ -897,141 +601,21 @@ export class ReportPerformanceIssueUsingReporterAction extends Action {
 		super(id, label);
 	}
 
-	public run(): TPromise<boolean> {
+	run(): TPromise<boolean> {
 		// TODO: Reporter should send timings table as well
 		return this.issueService.openReporter({ issueType: IssueType.PerformanceIssue })
 			.then(() => true);
 	}
 }
 
-// NOTE: This is still used when running --prof-startup, which already opens a dialog, so the reporter is not used.
-export class ReportPerformanceIssueAction extends Action {
-
-	public static readonly ID = 'workbench.action.reportPerformanceIssue';
-	public static readonly LABEL = nls.localize('reportPerformanceIssue', "Report Performance Issue");
-
-	constructor(
-		id: string,
-		label: string,
-		@IIntegrityService private integrityService: IIntegrityService,
-		@IEnvironmentService private environmentService: IEnvironmentService,
-		@ITimerService private timerService: ITimerService
-	) {
-		super(id, label);
-	}
-
-	public run(appendix?: string): TPromise<boolean> {
-		this.integrityService.isPure().then(res => {
-			const issueUrl = this.generatePerformanceIssueUrl(product.reportIssueUrl, pkg.name, pkg.version, product.commit, product.date, res.isPure, appendix);
-
-			window.open(issueUrl);
-		});
-
-		return TPromise.wrap(true);
-	}
-
-	private generatePerformanceIssueUrl(baseUrl: string, name: string, version: string, commit: string, date: string, isPure: boolean, appendix?: string): string {
-
-		if (!appendix) {
-			appendix = `Additional Steps to Reproduce (if any):
-
-1.
-2.`;
-		}
-
-		let nodeModuleLoadTime: number;
-		if (this.environmentService.performance) {
-			nodeModuleLoadTime = this.computeNodeModulesLoadTime();
-		}
-
-		const metrics: IStartupMetrics = this.timerService.startupMetrics;
-
-		const osVersion = `${os.type()} ${os.arch()} ${os.release()}`;
-		const queryStringPrefix = baseUrl.indexOf('?') === -1 ? '?' : '&';
-		const body = encodeURIComponent(
-			`- VSCode Version: <code>${name} ${version}${isPure ? '' : ' **[Unsupported]**'} (${product.commit || 'Commit unknown'}, ${product.date || 'Date unknown'})</code>
-- OS Version: <code>${osVersion}</code>
-- CPUs: <code>${metrics.cpus.model} (${metrics.cpus.count} x ${metrics.cpus.speed})</code>
-- Memory (System): <code>${(metrics.totalmem / (1024 * 1024 * 1024)).toFixed(2)}GB (${(metrics.freemem / (1024 * 1024 * 1024)).toFixed(2)}GB free)</code>
-- Memory (Process): <code>${(metrics.meminfo.workingSetSize / 1024).toFixed(2)}MB working set (${(metrics.meminfo.peakWorkingSetSize / 1024).toFixed(2)}MB peak, ${(metrics.meminfo.privateBytes / 1024).toFixed(2)}MB private, ${(metrics.meminfo.sharedBytes / 1024).toFixed(2)}MB shared)</code>
-- Load (avg): <code>${metrics.loadavg.map(l => Math.round(l)).join(', ')}</code>
-- VM: <code>${metrics.isVMLikelyhood}%</code>
-- Initial Startup: <code>${metrics.initialStartup ? 'yes' : 'no'}</code>
-- Screen Reader: <code>${metrics.hasAccessibilitySupport ? 'yes' : 'no'}</code>
-- Empty Workspace: <code>${metrics.emptyWorkbench ? 'yes' : 'no'}</code>
-- Timings:
-
-${this.generatePerformanceTable(nodeModuleLoadTime)}
-
----
-
-${appendix}`
-		);
-
-		return `${baseUrl}${queryStringPrefix}body=${body}`;
-	}
-
-	private computeNodeModulesLoadTime(): number {
-		const stats = <ILoaderEvent[]>(<any>require).getStats();
-		let total = 0;
-
-		for (let i = 0, len = stats.length; i < len; i++) {
-			if (stats[i].type === LoaderEventType.NodeEndNativeRequire) {
-				if (stats[i - 1].type === LoaderEventType.NodeBeginNativeRequire && stats[i - 1].detail === stats[i].detail) {
-					const dur = (stats[i].timestamp - stats[i - 1].timestamp);
-					total += dur;
-				}
-			}
-		}
-
-		return Math.round(total);
-	}
-
-	private generatePerformanceTable(nodeModuleLoadTime?: number): string {
-		let tableHeader = `|Component|Task|Time (ms)|
-|---|---|---|`;
-
-		const table = this.getStartupMetricsTable(nodeModuleLoadTime).map(e => {
-			return `|${e.component}|${e.task}|${e.time}|`;
-		}).join('\n');
-
-		return `${tableHeader}\n${table}`;
-	}
-
-	private getStartupMetricsTable(nodeModuleLoadTime?: number): { component: string, task: string; time: number; }[] {
-		const table: any[] = [];
-		const metrics: IStartupMetrics = this.timerService.startupMetrics;
-
-		if (metrics.initialStartup) {
-			table.push({ component: 'main', task: 'start => app.isReady', time: metrics.timers.ellapsedAppReady });
-			table.push({ component: 'main', task: 'app.isReady => window.loadUrl()', time: metrics.timers.ellapsedWindowLoad });
-		}
-
-		table.push({ component: 'renderer', task: 'window.loadUrl() => begin to require(workbench.main.js)', time: metrics.timers.ellapsedWindowLoadToRequire });
-		table.push({ component: 'renderer', task: 'require(workbench.main.js)', time: metrics.timers.ellapsedRequire });
-
-		if (nodeModuleLoadTime) {
-			table.push({ component: 'renderer', task: '-> of which require() node_modules', time: nodeModuleLoadTime });
-		}
-
-		table.push({ component: 'renderer', task: 'create extension host => extensions onReady()', time: metrics.timers.ellapsedExtensions });
-		table.push({ component: 'renderer', task: 'restore viewlet', time: metrics.timers.ellapsedViewletRestore });
-		table.push({ component: 'renderer', task: 'restore editor view state', time: metrics.timers.ellapsedEditorRestore });
-		table.push({ component: 'renderer', task: 'overall workbench load', time: metrics.timers.ellapsedWorkbench });
-		table.push({ component: 'main + renderer', task: 'start => extensions ready', time: metrics.timers.ellapsedExtensionsReady });
-		table.push({ component: 'main + renderer', task: 'start => workbench ready', time: metrics.ellapsed });
-
-		return table;
-	}
-}
 
 export class KeybindingsReferenceAction extends Action {
 
-	public static readonly ID = 'workbench.action.keybindingsReference';
-	public static readonly LABEL = nls.localize('keybindingsReference', "Keyboard Shortcuts Reference");
+	static readonly ID = 'workbench.action.keybindingsReference';
+	static readonly LABEL = nls.localize('keybindingsReference', "Keyboard Shortcuts Reference");
 
 	private static readonly URL = isLinux ? product.keyboardShortcutsUrlLinux : isMacintosh ? product.keyboardShortcutsUrlMac : product.keyboardShortcutsUrlWin;
-	public static readonly AVAILABLE = !!KeybindingsReferenceAction.URL;
+	static readonly AVAILABLE = !!KeybindingsReferenceAction.URL;
 
 	constructor(
 		id: string,
@@ -1040,7 +624,7 @@ export class KeybindingsReferenceAction extends Action {
 		super(id, label);
 	}
 
-	public run(): TPromise<void> {
+	run(): TPromise<void> {
 		window.open(KeybindingsReferenceAction.URL);
 		return null;
 	}
@@ -1048,11 +632,11 @@ export class KeybindingsReferenceAction extends Action {
 
 export class OpenDocumentationUrlAction extends Action {
 
-	public static readonly ID = 'workbench.action.openDocumentationUrl';
-	public static readonly LABEL = nls.localize('openDocumentationUrl', "Documentation");
+	static readonly ID = 'workbench.action.openDocumentationUrl';
+	static readonly LABEL = nls.localize('openDocumentationUrl', "Documentation");
 
 	private static readonly URL = product.documentationUrl;
-	public static readonly AVAILABLE = !!OpenDocumentationUrlAction.URL;
+	static readonly AVAILABLE = !!OpenDocumentationUrlAction.URL;
 
 	constructor(
 		id: string,
@@ -1061,7 +645,7 @@ export class OpenDocumentationUrlAction extends Action {
 		super(id, label);
 	}
 
-	public run(): TPromise<void> {
+	run(): TPromise<void> {
 		window.open(OpenDocumentationUrlAction.URL);
 		return null;
 	}
@@ -1069,11 +653,11 @@ export class OpenDocumentationUrlAction extends Action {
 
 export class OpenIntroductoryVideosUrlAction extends Action {
 
-	public static readonly ID = 'workbench.action.openIntroductoryVideosUrl';
-	public static readonly LABEL = nls.localize('openIntroductoryVideosUrl', "Introductory Videos");
+	static readonly ID = 'workbench.action.openIntroductoryVideosUrl';
+	static readonly LABEL = nls.localize('openIntroductoryVideosUrl', "Introductory Videos");
 
 	private static readonly URL = product.introductoryVideosUrl;
-	public static readonly AVAILABLE = !!OpenIntroductoryVideosUrlAction.URL;
+	static readonly AVAILABLE = !!OpenIntroductoryVideosUrlAction.URL;
 
 	constructor(
 		id: string,
@@ -1082,7 +666,7 @@ export class OpenIntroductoryVideosUrlAction extends Action {
 		super(id, label);
 	}
 
-	public run(): TPromise<void> {
+	run(): TPromise<void> {
 		window.open(OpenIntroductoryVideosUrlAction.URL);
 		return null;
 	}
@@ -1090,11 +674,11 @@ export class OpenIntroductoryVideosUrlAction extends Action {
 
 export class OpenTipsAndTricksUrlAction extends Action {
 
-	public static readonly ID = 'workbench.action.openTipsAndTricksUrl';
-	public static readonly LABEL = nls.localize('openTipsAndTricksUrl', "Tips and Tricks");
+	static readonly ID = 'workbench.action.openTipsAndTricksUrl';
+	static readonly LABEL = nls.localize('openTipsAndTricksUrl', "Tips and Tricks");
 
 	private static readonly URL = product.tipsAndTricksUrl;
-	public static readonly AVAILABLE = !!OpenTipsAndTricksUrlAction.URL;
+	static readonly AVAILABLE = !!OpenTipsAndTricksUrlAction.URL;
 
 	constructor(
 		id: string,
@@ -1103,7 +687,7 @@ export class OpenTipsAndTricksUrlAction extends Action {
 		super(id, label);
 	}
 
-	public run(): TPromise<void> {
+	run(): TPromise<void> {
 		window.open(OpenTipsAndTricksUrlAction.URL);
 		return null;
 	}
@@ -1123,7 +707,7 @@ export class ToggleSharedProcessAction extends Action {
 	}
 }
 
-export enum Direction {
+export const enum Direction {
 	Next,
 	Previous,
 }
@@ -1141,7 +725,7 @@ export abstract class BaseNavigationAction extends Action {
 		super(id, label);
 	}
 
-	public run(): TPromise<any> {
+	run(): TPromise<any> {
 		const isEditorFocus = this.partService.hasFocus(Parts.EDITOR_PART);
 		const isPanelFocus = this.partService.hasFocus(Parts.PANEL_PART);
 		const isSidebarFocus = this.partService.hasFocus(Parts.SIDEBAR_PART);
@@ -1197,27 +781,29 @@ export abstract class BaseNavigationAction extends Action {
 	}
 
 	protected navigateAcrossEditorGroup(direction: GroupDirection): TPromise<boolean> {
-		const nextGroup = this.editorGroupService.findGroup({ direction }, this.editorGroupService.activeGroup);
-		if (nextGroup) {
-			nextGroup.focus();
+		return this.doNavigateToEditorGroup({ direction });
+	}
+
+	protected navigateToEditorGroup(location: GroupLocation): TPromise<boolean> {
+		return this.doNavigateToEditorGroup({ location });
+	}
+
+	private doNavigateToEditorGroup(scope: IFindGroupScope): TPromise<boolean> {
+		const targetGroup = this.editorGroupService.findGroup(scope, this.editorGroupService.activeGroup);
+		if (targetGroup) {
+			targetGroup.focus();
 
 			return TPromise.as(true);
 		}
 
 		return TPromise.as(false);
 	}
-
-	protected navigateToActiveEditorGroup(): TPromise<boolean> {
-		this.editorGroupService.activeGroup.focus();
-
-		return TPromise.as(true);
-	}
 }
 
 export class NavigateLeftAction extends BaseNavigationAction {
 
-	public static readonly ID = 'workbench.action.navigateLeft';
-	public static readonly LABEL = nls.localize('navigateLeft', "Navigate to the View on the Left");
+	static readonly ID = 'workbench.action.navigateLeft';
+	static readonly LABEL = nls.localize('navigateLeft', "Navigate to the View on the Left");
 
 	constructor(
 		id: string,
@@ -1251,7 +837,7 @@ export class NavigateLeftAction extends BaseNavigationAction {
 		}
 
 		if (!isPanelPositionDown) {
-			return this.navigateToActiveEditorGroup();
+			return this.navigateToEditorGroup(GroupLocation.LAST);
 		}
 
 		return TPromise.as(false);
@@ -1259,7 +845,7 @@ export class NavigateLeftAction extends BaseNavigationAction {
 
 	protected navigateOnSidebarFocus(isSidebarPositionLeft: boolean, isPanelPositionDown: boolean): TPromise<boolean> {
 		if (!isSidebarPositionLeft) {
-			return this.navigateToActiveEditorGroup();
+			return this.navigateToEditorGroup(GroupLocation.LAST);
 		}
 
 		return TPromise.as(false);
@@ -1268,8 +854,8 @@ export class NavigateLeftAction extends BaseNavigationAction {
 
 export class NavigateRightAction extends BaseNavigationAction {
 
-	public static readonly ID = 'workbench.action.navigateRight';
-	public static readonly LABEL = nls.localize('navigateRight', "Navigate to the View on the Right");
+	static readonly ID = 'workbench.action.navigateRight';
+	static readonly LABEL = nls.localize('navigateRight', "Navigate to the View on the Right");
 
 	constructor(
 		id: string,
@@ -1311,7 +897,7 @@ export class NavigateRightAction extends BaseNavigationAction {
 
 	protected navigateOnSidebarFocus(isSidebarPositionLeft: boolean, isPanelPositionDown: boolean): TPromise<boolean> {
 		if (isSidebarPositionLeft) {
-			return this.navigateToActiveEditorGroup();
+			return this.navigateToEditorGroup(GroupLocation.FIRST);
 		}
 
 		return TPromise.as(false);
@@ -1320,8 +906,8 @@ export class NavigateRightAction extends BaseNavigationAction {
 
 export class NavigateUpAction extends BaseNavigationAction {
 
-	public static readonly ID = 'workbench.action.navigateUp';
-	public static readonly LABEL = nls.localize('navigateUp', "Navigate to the View Above");
+	static readonly ID = 'workbench.action.navigateUp';
+	static readonly LABEL = nls.localize('navigateUp', "Navigate to the View Above");
 
 	constructor(
 		id: string,
@@ -1340,7 +926,7 @@ export class NavigateUpAction extends BaseNavigationAction {
 
 	protected navigateOnPanelFocus(isSidebarPositionLeft: boolean, isPanelPositionDown: boolean): TPromise<boolean> {
 		if (isPanelPositionDown) {
-			return this.navigateToActiveEditorGroup();
+			return this.navigateToEditorGroup(GroupLocation.LAST);
 		}
 
 		return TPromise.as(false);
@@ -1349,8 +935,8 @@ export class NavigateUpAction extends BaseNavigationAction {
 
 export class NavigateDownAction extends BaseNavigationAction {
 
-	public static readonly ID = 'workbench.action.navigateDown';
-	public static readonly LABEL = nls.localize('navigateDown', "Navigate to the View Below");
+	static readonly ID = 'workbench.action.navigateDown';
+	static readonly LABEL = nls.localize('navigateDown', "Navigate to the View Below");
 
 	constructor(
 		id: string,
@@ -1415,8 +1001,8 @@ export abstract class BaseResizeViewAction extends Action {
 
 export class IncreaseViewSizeAction extends BaseResizeViewAction {
 
-	public static readonly ID = 'workbench.action.increaseViewSize';
-	public static readonly LABEL = nls.localize('increaseViewSize', "Increase Current View Size");
+	static readonly ID = 'workbench.action.increaseViewSize';
+	static readonly LABEL = nls.localize('increaseViewSize', "Increase Current View Size");
 
 	constructor(
 		id: string,
@@ -1426,7 +1012,7 @@ export class IncreaseViewSizeAction extends BaseResizeViewAction {
 		super(id, label, partService);
 	}
 
-	public run(): TPromise<boolean> {
+	run(): TPromise<boolean> {
 		this.resizePart(BaseResizeViewAction.RESIZE_INCREMENT);
 		return TPromise.as(true);
 	}
@@ -1434,8 +1020,8 @@ export class IncreaseViewSizeAction extends BaseResizeViewAction {
 
 export class DecreaseViewSizeAction extends BaseResizeViewAction {
 
-	public static readonly ID = 'workbench.action.decreaseViewSize';
-	public static readonly LABEL = nls.localize('decreaseViewSize', "Decrease Current View Size");
+	static readonly ID = 'workbench.action.decreaseViewSize';
+	static readonly LABEL = nls.localize('decreaseViewSize', "Decrease Current View Size");
 
 	constructor(
 		id: string,
@@ -1446,16 +1032,34 @@ export class DecreaseViewSizeAction extends BaseResizeViewAction {
 		super(id, label, partService);
 	}
 
-	public run(): TPromise<boolean> {
+	run(): TPromise<boolean> {
 		this.resizePart(-BaseResizeViewAction.RESIZE_INCREMENT);
 		return TPromise.as(true);
 	}
 }
 
+export class NewWindowTab extends Action {
+
+	static readonly ID = 'workbench.action.newWindowTab';
+	static readonly LABEL = nls.localize('newTab', "New Window Tab");
+
+	constructor(
+		id: string,
+		label: string,
+		@IWindowsService private windowsService: IWindowsService
+	) {
+		super(NewWindowTab.ID, NewWindowTab.LABEL);
+	}
+
+	run(): TPromise<boolean> {
+		return this.windowsService.newWindowTab().then(() => true);
+	}
+}
+
 export class ShowPreviousWindowTab extends Action {
 
-	public static readonly ID = 'workbench.action.showPreviousWindowTab';
-	public static readonly LABEL = nls.localize('showPreviousTab', "Show Previous Window Tab");
+	static readonly ID = 'workbench.action.showPreviousWindowTab';
+	static readonly LABEL = nls.localize('showPreviousTab', "Show Previous Window Tab");
 
 	constructor(
 		id: string,
@@ -1465,15 +1069,15 @@ export class ShowPreviousWindowTab extends Action {
 		super(ShowPreviousWindowTab.ID, ShowPreviousWindowTab.LABEL);
 	}
 
-	public run(): TPromise<boolean> {
+	run(): TPromise<boolean> {
 		return this.windowsService.showPreviousWindowTab().then(() => true);
 	}
 }
 
 export class ShowNextWindowTab extends Action {
 
-	public static readonly ID = 'workbench.action.showNextWindowTab';
-	public static readonly LABEL = nls.localize('showNextWindowTab', "Show Next Window Tab");
+	static readonly ID = 'workbench.action.showNextWindowTab';
+	static readonly LABEL = nls.localize('showNextWindowTab', "Show Next Window Tab");
 
 	constructor(
 		id: string,
@@ -1483,15 +1087,15 @@ export class ShowNextWindowTab extends Action {
 		super(ShowNextWindowTab.ID, ShowNextWindowTab.LABEL);
 	}
 
-	public run(): TPromise<boolean> {
+	run(): TPromise<boolean> {
 		return this.windowsService.showNextWindowTab().then(() => true);
 	}
 }
 
 export class MoveWindowTabToNewWindow extends Action {
 
-	public static readonly ID = 'workbench.action.moveWindowTabToNewWindow';
-	public static readonly LABEL = nls.localize('moveWindowTabToNewWindow', "Move Window Tab to New Window");
+	static readonly ID = 'workbench.action.moveWindowTabToNewWindow';
+	static readonly LABEL = nls.localize('moveWindowTabToNewWindow', "Move Window Tab to New Window");
 
 	constructor(
 		id: string,
@@ -1501,15 +1105,15 @@ export class MoveWindowTabToNewWindow extends Action {
 		super(MoveWindowTabToNewWindow.ID, MoveWindowTabToNewWindow.LABEL);
 	}
 
-	public run(): TPromise<boolean> {
+	run(): TPromise<boolean> {
 		return this.windowsService.moveWindowTabToNewWindow().then(() => true);
 	}
 }
 
 export class MergeAllWindowTabs extends Action {
 
-	public static readonly ID = 'workbench.action.mergeAllWindowTabs';
-	public static readonly LABEL = nls.localize('mergeAllWindowTabs', "Merge All Windows");
+	static readonly ID = 'workbench.action.mergeAllWindowTabs';
+	static readonly LABEL = nls.localize('mergeAllWindowTabs', "Merge All Windows");
 
 	constructor(
 		id: string,
@@ -1519,15 +1123,15 @@ export class MergeAllWindowTabs extends Action {
 		super(MergeAllWindowTabs.ID, MergeAllWindowTabs.LABEL);
 	}
 
-	public run(): TPromise<boolean> {
+	run(): TPromise<boolean> {
 		return this.windowsService.mergeAllWindowTabs().then(() => true);
 	}
 }
 
 export class ToggleWindowTabsBar extends Action {
 
-	public static readonly ID = 'workbench.action.toggleWindowTabsBar';
-	public static readonly LABEL = nls.localize('toggleWindowTabsBar', "Toggle Window Tabs Bar");
+	static readonly ID = 'workbench.action.toggleWindowTabsBar';
+	static readonly LABEL = nls.localize('toggleWindowTabsBar', "Toggle Window Tabs Bar");
 
 	constructor(
 		id: string,
@@ -1537,15 +1141,111 @@ export class ToggleWindowTabsBar extends Action {
 		super(ToggleWindowTabsBar.ID, ToggleWindowTabsBar.LABEL);
 	}
 
-	public run(): TPromise<boolean> {
+	run(): TPromise<boolean> {
 		return this.windowsService.toggleWindowTabsBar().then(() => true);
 	}
 }
 
+export class OpenTwitterUrlAction extends Action {
+
+	static readonly ID = 'workbench.action.openTwitterUrl';
+	static LABEL = nls.localize('openTwitterUrl', "Join us on Twitter", product.applicationName);
+
+	constructor(
+		id: string,
+		label: string
+	) {
+		super(id, label);
+	}
+
+	run(): TPromise<boolean> {
+		if (product.twitterUrl) {
+			return TPromise.as(shell.openExternal(product.twitterUrl));
+		}
+
+		return TPromise.as(false);
+	}
+}
+
+export class OpenRequestFeatureUrlAction extends Action {
+
+	static readonly ID = 'workbench.action.openRequestFeatureUrl';
+	static LABEL = nls.localize('openUserVoiceUrl', "Search Feature Requests");
+
+	constructor(
+		id: string,
+		label: string
+	) {
+		super(id, label);
+	}
+
+	run(): TPromise<boolean> {
+		if (product.requestFeatureUrl) {
+			return TPromise.as(shell.openExternal(product.requestFeatureUrl));
+		}
+
+		return TPromise.as(false);
+	}
+}
+
+export class OpenLicenseUrlAction extends Action {
+
+	static readonly ID = 'workbench.action.openLicenseUrl';
+	static LABEL = nls.localize('openLicenseUrl', "View License");
+
+	constructor(
+		id: string,
+		label: string
+	) {
+		super(id, label);
+	}
+
+	run(): TPromise<boolean> {
+		if (product.licenseUrl) {
+			if (language) {
+				const queryArgChar = product.licenseUrl.indexOf('?') > 0 ? '&' : '?';
+				return TPromise.as(shell.openExternal(`${product.licenseUrl}${queryArgChar}lang=${language}`));
+			} else {
+				return TPromise.as(shell.openExternal(product.licenseUrl));
+			}
+		}
+
+		return TPromise.as(false);
+	}
+}
+
+
+export class OpenPrivacyStatementUrlAction extends Action {
+
+	static readonly ID = 'workbench.action.openPrivacyStatementUrl';
+	static LABEL = nls.localize('openPrivacyStatement', "Privacy Statement");
+
+	constructor(
+		id: string,
+		label: string
+	) {
+		super(id, label);
+	}
+
+	run(): TPromise<boolean> {
+		if (product.privacyStatementUrl) {
+			if (language) {
+				const queryArgChar = product.privacyStatementUrl.indexOf('?') > 0 ? '&' : '?';
+				return TPromise.as(shell.openExternal(`${product.privacyStatementUrl}${queryArgChar}lang=${language}`));
+			} else {
+				return TPromise.as(shell.openExternal(product.privacyStatementUrl));
+			}
+		}
+
+
+		return TPromise.as(false);
+	}
+}
+
 export class ShowAboutDialogAction extends Action {
 
-	public static readonly ID = 'workbench.action.showAboutDialog';
-	public static LABEL = nls.localize('about', "About {0}", product.applicationName);
+	static readonly ID = 'workbench.action.showAboutDialog';
+	static LABEL = nls.localize('about', "About {0}", product.applicationName);
 
 	constructor(
 		id: string,
@@ -1562,8 +1262,8 @@ export class ShowAboutDialogAction extends Action {
 
 export class InspectContextKeysAction extends Action {
 
-	public static readonly ID = 'workbench.action.inspectContextKeys';
-	public static LABEL = nls.localize('inspect context keys', "Inspect Context Keys");
+	static readonly ID = 'workbench.action.inspectContextKeys';
+	static LABEL = nls.localize('inspect context keys', "Inspect Context Keys");
 
 	constructor(
 		id: string,
diff --git a/src/vs/workbench/electron-browser/bootstrap/index.html b/src/vs/workbench/electron-browser/bootstrap/index.html
deleted file mode 100644
index c14ebbe8653..00000000000
--- a/src/vs/workbench/electron-browser/bootstrap/index.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
-<!DOCTYPE html>
-<html>
-	<head>
-		<meta charset="utf-8" />
-		<meta http-equiv="Content-Security-Policy" content="default-src 'none'; img-src 'self' https: data:; media-src 'none'; child-src 'self'; object-src 'self'; script-src 'self'; style-src 'self' 'unsafe-inline'; connect-src 'self' https:; font-src 'self' https:;">
-	</head>
-	<body class="monaco-shell vs-dark" aria-label="">
-		<script src="preload.js"></script>
-	</body>
-
-	<!-- Startup via index.js -->
-	<script src="index.js"></script>
-</html>
\ No newline at end of file
diff --git a/src/vs/workbench/electron-browser/bootstrap/index.js b/src/vs/workbench/electron-browser/bootstrap/index.js
deleted file mode 100644
index 75f6dc4d7f6..00000000000
--- a/src/vs/workbench/electron-browser/bootstrap/index.js
+++ /dev/null
@@ -1,265 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-// Warning: Do not use the `let` declarator in this file, it breaks our minification
-
-'use strict';
-
-/*global window,document,define*/
-
-const perf = require('../../../base/common/performance');
-perf.mark('renderer/started');
-
-const path = require('path');
-const fs = require('fs');
-const electron = require('electron');
-const remote = electron.remote;
-const ipc = electron.ipcRenderer;
-
-process.lazyEnv = new Promise(function (resolve) {
-	const handle = setTimeout(function () {
-		resolve();
-		console.warn('renderer did not receive lazyEnv in time');
-	}, 10000);
-	ipc.once('vscode:acceptShellEnv', function (event, shellEnv) {
-		clearTimeout(handle);
-		assign(process.env, shellEnv);
-		resolve(process.env);
-	});
-	ipc.send('vscode:fetchShellEnv');
-});
-
-Error.stackTraceLimit = 100; // increase number of stack frames (from 10, https://github.com/v8/v8/wiki/Stack-Trace-API)
-
-function onError(error, enableDeveloperTools) {
-	if (enableDeveloperTools) {
-		remote.getCurrentWebContents().openDevTools();
-	}
-
-	console.error('[uncaught exception]: ' + error);
-
-	if (error.stack) {
-		console.error(error.stack);
-	}
-}
-
-function assign(destination, source) {
-	return Object.keys(source)
-		.reduce(function (r, key) { r[key] = source[key]; return r; }, destination);
-}
-
-function parseURLQueryArgs() {
-	const search = window.location.search || '';
-
-	return search.split(/[?&]/)
-		.filter(function (param) { return !!param; })
-		.map(function (param) { return param.split('='); })
-		.filter(function (param) { return param.length === 2; })
-		.reduce(function (r, param) { r[param[0]] = decodeURIComponent(param[1]); return r; }, {});
-}
-
-function uriFromPath(_path) {
-	var pathName = path.resolve(_path).replace(/\\/g, '/');
-	if (pathName.length > 0 && pathName.charAt(0) !== '/') {
-		pathName = '/' + pathName;
-	}
-
-	return encodeURI('file://' + pathName);
-}
-
-function readFile(file) {
-	return new Promise(function(resolve, reject) {
-		fs.readFile(file, 'utf8', function(err, data) {
-			if (err) {
-				reject(err);
-				return;
-			}
-			resolve(data);
-		});
-	});
-}
-
-function registerListeners(enableDeveloperTools) {
-
-	// Devtools & reload support
-	var listener;
-	if (enableDeveloperTools) {
-		const extractKey = function (e) {
-			return [
-				e.ctrlKey ? 'ctrl-' : '',
-				e.metaKey ? 'meta-' : '',
-				e.altKey ? 'alt-' : '',
-				e.shiftKey ? 'shift-' : '',
-				e.keyCode
-			].join('');
-		};
-
-		const TOGGLE_DEV_TOOLS_KB = (process.platform === 'darwin' ? 'meta-alt-73' : 'ctrl-shift-73'); // mac: Cmd-Alt-I, rest: Ctrl-Shift-I
-		const RELOAD_KB = (process.platform === 'darwin' ? 'meta-82' : 'ctrl-82'); // mac: Cmd-R, rest: Ctrl-R
-
-		listener = function (e) {
-			const key = extractKey(e);
-			if (key === TOGGLE_DEV_TOOLS_KB) {
-				remote.getCurrentWebContents().toggleDevTools();
-			} else if (key === RELOAD_KB) {
-				remote.getCurrentWindow().reload();
-			}
-		};
-		window.addEventListener('keydown', listener);
-	}
-
-	process.on('uncaughtException', function (error) { onError(error, enableDeveloperTools); });
-
-	return function () {
-		if (listener) {
-			window.removeEventListener('keydown', listener);
-			listener = void 0;
-		}
-	};
-}
-
-function main() {
-	const webFrame = require('electron').webFrame;
-	const args = parseURLQueryArgs();
-	const configuration = JSON.parse(args['config'] || '{}') || {};
-
-	//#region Add support for using node_modules.asar
-	(function () {
-		const path = require('path');
-		const Module = require('module');
-		let NODE_MODULES_PATH = path.join(configuration.appRoot, 'node_modules');
-		if (/[a-z]\:/.test(NODE_MODULES_PATH)) {
-			// Make drive letter uppercase
-			NODE_MODULES_PATH = NODE_MODULES_PATH.charAt(0).toUpperCase() + NODE_MODULES_PATH.substr(1);
-		}
-		const NODE_MODULES_ASAR_PATH = NODE_MODULES_PATH + '.asar';
-
-		const originalResolveLookupPaths = Module._resolveLookupPaths;
-		Module._resolveLookupPaths = function (request, parent, newReturn) {
-			const result = originalResolveLookupPaths(request, parent, newReturn);
-
-			const paths = newReturn ? result : result[1];
-			for (let i = 0, len = paths.length; i < len; i++) {
-				if (paths[i] === NODE_MODULES_PATH) {
-					paths.splice(i, 0, NODE_MODULES_ASAR_PATH);
-					break;
-				}
-			}
-
-			return result;
-		};
-	})();
-	//#endregion
-
-	// Correctly inherit the parent's environment
-	assign(process.env, configuration.userEnv);
-	perf.importEntries(configuration.perfEntries);
-
-	// Get the nls configuration into the process.env as early as possible.
-	var nlsConfig = { availableLanguages: {} };
-	const config = process.env['VSCODE_NLS_CONFIG'];
-	if (config) {
-		process.env['VSCODE_NLS_CONFIG'] = config;
-		try {
-			nlsConfig = JSON.parse(config);
-		} catch (e) { /*noop*/ }
-	}
-
-	if (nlsConfig._resolvedLanguagePackCoreLocation) {
-		let bundles = Object.create(null);
-		nlsConfig.loadBundle = function(bundle, language, cb) {
-			let result = bundles[bundle];
-			if (result) {
-				cb(undefined, result);
-				return;
-			}
-			let bundleFile = path.join(nlsConfig._resolvedLanguagePackCoreLocation, bundle.replace(/\//g, '!') + '.nls.json');
-			readFile(bundleFile).then(function (content) {
-				let json = JSON.parse(content);
-				bundles[bundle] = json;
-				cb(undefined, json);
-			})
-				.catch(cb);
-		};
-	}
-
-	var locale = nlsConfig.availableLanguages['*'] || 'en';
-	if (locale === 'zh-tw') {
-		locale = 'zh-Hant';
-	} else if (locale === 'zh-cn') {
-		locale = 'zh-Hans';
-	}
-	window.document.documentElement.setAttribute('lang', locale);
-
-	const enableDeveloperTools = (process.env['VSCODE_DEV'] || !!configuration.extensionDevelopmentPath) && !configuration.extensionTestsPath;
-	const unbind = registerListeners(enableDeveloperTools);
-
-	// disable pinch zoom & apply zoom level early to avoid glitches
-	const zoomLevel = configuration.zoomLevel;
-	webFrame.setVisualZoomLevelLimits(1, 1);
-	if (typeof zoomLevel === 'number' && zoomLevel !== 0) {
-		webFrame.setZoomLevel(zoomLevel);
-	}
-
-	// Load the loader and start loading the workbench
-	const loaderFilename = configuration.appRoot + '/out/vs/loader.js';
-	const loaderSource = require('fs').readFileSync(loaderFilename);
-	require('vm').runInThisContext(loaderSource, { filename: loaderFilename });
-	var define = global.define;
-	global.define = undefined;
-
-	window.nodeRequire = require.__$__nodeRequire;
-
-	define('fs', ['original-fs'], function (originalFS) { return originalFS; }); // replace the patched electron fs with the original node fs for all AMD code
-
-	window.MonacoEnvironment = {};
-
-	const onNodeCachedData = window.MonacoEnvironment.onNodeCachedData = [];
-	require.config({
-		baseUrl: uriFromPath(configuration.appRoot) + '/out',
-		'vs/nls': nlsConfig,
-		recordStats: !!configuration.performance,
-		nodeCachedDataDir: configuration.nodeCachedDataDir,
-		onNodeCachedData: function () { onNodeCachedData.push(arguments); },
-		nodeModules: [/*BUILD->INSERT_NODE_MODULES*/]
-	});
-
-	if (nlsConfig.pseudo) {
-		require(['vs/nls'], function (nlsPlugin) {
-			nlsPlugin.setPseudoTranslation(nlsConfig.pseudo);
-		});
-	}
-
-	// Perf Counters
-	window.MonacoEnvironment.timers = {
-		isInitialStartup: !!configuration.isInitialStartup,
-		hasAccessibilitySupport: !!configuration.accessibilitySupport,
-		start: configuration.perfStartTime,
-		windowLoad: configuration.perfWindowLoadTime
-	};
-
-	perf.mark('willLoadWorkbenchMain');
-	require([
-		'vs/workbench/workbench.main',
-		'vs/nls!vs/workbench/workbench.main',
-		'vs/css!vs/workbench/workbench.main'
-	], function () {
-		perf.mark('didLoadWorkbenchMain');
-
-		process.lazyEnv.then(function () {
-			perf.mark('main/startup');
-			require('vs/workbench/electron-browser/main')
-				.startup(configuration)
-				.done(function () {
-					unbind(); // since the workbench is running, unbind our developer related listeners and let the workbench handle them
-				}, function (error) {
-					onError(error, enableDeveloperTools);
-				});
-		});
-	});
-
-}
-
-main();
diff --git a/src/vs/workbench/electron-browser/bootstrap/preload.js b/src/vs/workbench/electron-browser/bootstrap/preload.js
deleted file mode 100644
index d451c2d5fb7..00000000000
--- a/src/vs/workbench/electron-browser/bootstrap/preload.js
+++ /dev/null
@@ -1,39 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-'use strict';
-
-(function() {
-	function getConfig() {
-		const queryParams = window.location.search.substring(1).split('&');
-		for (var i = 0; i < queryParams.length; i++) {
-			var kv = queryParams[i].split('=');
-			if (kv[0] === 'config' && kv[1]) {
-				return JSON.parse(decodeURIComponent(kv[1]));
-			}
-		}
-		return {};
-	}
-	try {
-		const config = getConfig();
-		const document = window.document;
-
-		// sets the base theme class ('vs', 'vs-dark', 'hc-black')
-		const baseTheme = config.baseTheme || 'vs';
-		document.body.className = 'monaco-shell ' + baseTheme;
-
-		// adds a stylesheet with the backgrdound color
-		var backgroundColor = config.backgroundColor;
-		if (!backgroundColor) {
-			backgroundColor = baseTheme === 'hc-black' ? '#000000' : (baseTheme === 'vs' ? '#FFFFFF' : '#1E1E1E');
-		}
-		const foregroundColor = baseTheme === 'hc-black' ? '#FFFFFF' : (baseTheme === 'vs' ? '#6C6C6C' : '#CCCCCC');
-		const style = document.createElement('style');
-		style.innerHTML = '.monaco-shell { background-color:' + backgroundColor + '; color:' + foregroundColor + '; }';
-		document.head.appendChild(style);
-
-	} catch (error) {
-		console.error(error);
-	}
-})();
\ No newline at end of file
diff --git a/src/vs/workbench/electron-browser/commands.ts b/src/vs/workbench/electron-browser/commands.ts
index ecb6e315f43..fe2277003fd 100644
--- a/src/vs/workbench/electron-browser/commands.ts
+++ b/src/vs/workbench/electron-browser/commands.ts
@@ -7,18 +7,19 @@
 
 import { KeyMod, KeyChord, KeyCode } from 'vs/base/common/keyCodes';
 import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRegistry';
+import { KeybindingsRegistry, KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
 import { IPartService } from 'vs/workbench/services/part/common/partService';
 import { IWindowsService, IWindowService } from 'vs/platform/windows/common/windows';
 import { List } from 'vs/base/browser/ui/list/listWidget';
-import * as errors from 'vs/base/common/errors';
 import { CommandsRegistry } from 'vs/platform/commands/common/commands';
-import { WorkbenchListFocusContextKey, IListService, WorkbenchListSupportsMultiSelectContextKey, ListWidget } from 'vs/platform/list/browser/listService';
+import { WorkbenchListFocusContextKey, IListService, WorkbenchListSupportsMultiSelectContextKey, ListWidget, WorkbenchListHasSelectionOrFocus } from 'vs/platform/list/browser/listService';
 import { PagedList } from 'vs/base/browser/ui/list/listPaging';
 import { range } from 'vs/base/common/arrays';
 import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
 import { ITree } from 'vs/base/parts/tree/browser/tree';
 import { InEditorZenModeContext, NoEditorsVisibleContext, SingleEditorGroupsContext } from 'vs/workbench/common/editor';
+import { IWorkspaceIdentifier, ISingleFolderWorkspaceIdentifier } from 'vs/platform/workspaces/common/workspaces';
+import { URI } from 'vs/base/common/uri';
 
 // --- List Commands
 
@@ -32,6 +33,7 @@ function ensureDOMFocus(widget: ListWidget): void {
 	}
 }
 
+export const QUIT_ID = 'workbench.action.quit';
 export function registerCommands(): void {
 
 	function focusDown(accessor: ServicesAccessor, arg2?: number): void {
@@ -57,13 +59,13 @@ export function registerCommands(): void {
 			const tree = focused;
 
 			tree.focusNext(count, { origin: 'keyboard' });
-			tree.reveal(tree.getFocus()).done(null, errors.onUnexpectedError);
+			tree.reveal(tree.getFocus());
 		}
 	}
 
 	KeybindingsRegistry.registerCommandAndKeybindingRule({
 		id: 'list.focusDown',
-		weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
+		weight: KeybindingWeight.WorkbenchContrib,
 		when: WorkbenchListFocusContextKey,
 		primary: KeyCode.DownArrow,
 		mac: {
@@ -104,8 +106,8 @@ export function registerCommands(): void {
 
 	KeybindingsRegistry.registerCommandAndKeybindingRule({
 		id: 'list.expandSelectionDown',
-		weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
-		when: WorkbenchListFocusContextKey,
+		weight: KeybindingWeight.WorkbenchContrib,
+		when: ContextKeyExpr.and(WorkbenchListFocusContextKey, WorkbenchListSupportsMultiSelectContextKey),
 		primary: KeyMod.Shift | KeyCode.DownArrow,
 		handler: (accessor, arg2) => {
 			const focused = accessor.get(IListService).lastFocusedList;
@@ -159,13 +161,13 @@ export function registerCommands(): void {
 			const tree = focused;
 
 			tree.focusPrevious(count, { origin: 'keyboard' });
-			tree.reveal(tree.getFocus()).done(null, errors.onUnexpectedError);
+			tree.reveal(tree.getFocus());
 		}
 	}
 
 	KeybindingsRegistry.registerCommandAndKeybindingRule({
 		id: 'list.focusUp',
-		weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
+		weight: KeybindingWeight.WorkbenchContrib,
 		when: WorkbenchListFocusContextKey,
 		primary: KeyCode.UpArrow,
 		mac: {
@@ -177,8 +179,8 @@ export function registerCommands(): void {
 
 	KeybindingsRegistry.registerCommandAndKeybindingRule({
 		id: 'list.expandSelectionUp',
-		weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
-		when: WorkbenchListFocusContextKey,
+		weight: KeybindingWeight.WorkbenchContrib,
+		when: ContextKeyExpr.and(WorkbenchListFocusContextKey, WorkbenchListSupportsMultiSelectContextKey),
 		primary: KeyMod.Shift | KeyCode.UpArrow,
 		handler: (accessor, arg2) => {
 			const focused = accessor.get(IListService).lastFocusedList;
@@ -211,7 +213,7 @@ export function registerCommands(): void {
 
 	KeybindingsRegistry.registerCommandAndKeybindingRule({
 		id: 'list.collapse',
-		weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
+		weight: KeybindingWeight.WorkbenchContrib,
 		when: WorkbenchListFocusContextKey,
 		primary: KeyCode.LeftArrow,
 		mac: {
@@ -234,14 +236,14 @@ export function registerCommands(): void {
 					}
 
 					return void 0;
-				}).done(null, errors.onUnexpectedError);
+				});
 			}
 		}
 	});
 
 	KeybindingsRegistry.registerCommandAndKeybindingRule({
 		id: 'list.expand',
-		weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
+		weight: KeybindingWeight.WorkbenchContrib,
 		when: WorkbenchListFocusContextKey,
 		primary: KeyCode.RightArrow,
 		handler: (accessor) => {
@@ -260,14 +262,14 @@ export function registerCommands(): void {
 					}
 
 					return void 0;
-				}).done(null, errors.onUnexpectedError);
+				});
 			}
 		}
 	});
 
 	KeybindingsRegistry.registerCommandAndKeybindingRule({
 		id: 'list.focusPageUp',
-		weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
+		weight: KeybindingWeight.WorkbenchContrib,
 		when: WorkbenchListFocusContextKey,
 		primary: KeyCode.PageUp,
 		handler: (accessor) => {
@@ -289,14 +291,14 @@ export function registerCommands(): void {
 				const tree = focused;
 
 				tree.focusPreviousPage({ origin: 'keyboard' });
-				tree.reveal(tree.getFocus()).done(null, errors.onUnexpectedError);
+				tree.reveal(tree.getFocus());
 			}
 		}
 	});
 
 	KeybindingsRegistry.registerCommandAndKeybindingRule({
 		id: 'list.focusPageDown',
-		weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
+		weight: KeybindingWeight.WorkbenchContrib,
 		when: WorkbenchListFocusContextKey,
 		primary: KeyCode.PageDown,
 		handler: (accessor) => {
@@ -318,14 +320,14 @@ export function registerCommands(): void {
 				const tree = focused;
 
 				tree.focusNextPage({ origin: 'keyboard' });
-				tree.reveal(tree.getFocus()).done(null, errors.onUnexpectedError);
+				tree.reveal(tree.getFocus());
 			}
 		}
 	});
 
 	KeybindingsRegistry.registerCommandAndKeybindingRule({
 		id: 'list.focusFirst',
-		weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
+		weight: KeybindingWeight.WorkbenchContrib,
 		when: WorkbenchListFocusContextKey,
 		primary: KeyCode.Home,
 		handler: accessor => listFocusFirst(accessor)
@@ -333,7 +335,7 @@ export function registerCommands(): void {
 
 	KeybindingsRegistry.registerCommandAndKeybindingRule({
 		id: 'list.focusFirstChild',
-		weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
+		weight: KeybindingWeight.WorkbenchContrib,
 		when: WorkbenchListFocusContextKey,
 		primary: null,
 		handler: accessor => listFocusFirst(accessor, { fromFocused: true })
@@ -358,13 +360,13 @@ export function registerCommands(): void {
 			const tree = focused;
 
 			tree.focusFirst({ origin: 'keyboard' }, options && options.fromFocused ? tree.getFocus() : void 0);
-			tree.reveal(tree.getFocus()).done(null, errors.onUnexpectedError);
+			tree.reveal(tree.getFocus());
 		}
 	}
 
 	KeybindingsRegistry.registerCommandAndKeybindingRule({
 		id: 'list.focusLast',
-		weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
+		weight: KeybindingWeight.WorkbenchContrib,
 		when: WorkbenchListFocusContextKey,
 		primary: KeyCode.End,
 		handler: accessor => listFocusLast(accessor)
@@ -372,7 +374,7 @@ export function registerCommands(): void {
 
 	KeybindingsRegistry.registerCommandAndKeybindingRule({
 		id: 'list.focusLastChild',
-		weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
+		weight: KeybindingWeight.WorkbenchContrib,
 		when: WorkbenchListFocusContextKey,
 		primary: null,
 		handler: accessor => listFocusLast(accessor, { fromFocused: true })
@@ -397,13 +399,13 @@ export function registerCommands(): void {
 			const tree = focused;
 
 			tree.focusLast({ origin: 'keyboard' }, options && options.fromFocused ? tree.getFocus() : void 0);
-			tree.reveal(tree.getFocus()).done(null, errors.onUnexpectedError);
+			tree.reveal(tree.getFocus());
 		}
 	}
 
 	KeybindingsRegistry.registerCommandAndKeybindingRule({
 		id: 'list.select',
-		weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
+		weight: KeybindingWeight.WorkbenchContrib,
 		when: WorkbenchListFocusContextKey,
 		primary: KeyCode.Enter,
 		mac: {
@@ -434,7 +436,7 @@ export function registerCommands(): void {
 
 	KeybindingsRegistry.registerCommandAndKeybindingRule({
 		id: 'list.selectAll',
-		weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
+		weight: KeybindingWeight.WorkbenchContrib,
 		when: ContextKeyExpr.and(WorkbenchListFocusContextKey, WorkbenchListSupportsMultiSelectContextKey),
 		primary: KeyMod.CtrlCmd | KeyCode.KEY_A,
 		handler: (accessor) => {
@@ -450,7 +452,7 @@ export function registerCommands(): void {
 
 	KeybindingsRegistry.registerCommandAndKeybindingRule({
 		id: 'list.toggleExpand',
-		weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
+		weight: KeybindingWeight.WorkbenchContrib,
 		when: WorkbenchListFocusContextKey,
 		primary: KeyCode.Space,
 		handler: (accessor) => {
@@ -470,14 +472,31 @@ export function registerCommands(): void {
 
 	KeybindingsRegistry.registerCommandAndKeybindingRule({
 		id: 'list.clear',
-		weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
-		when: WorkbenchListFocusContextKey,
+		weight: KeybindingWeight.WorkbenchContrib,
+		when: ContextKeyExpr.and(WorkbenchListFocusContextKey, WorkbenchListHasSelectionOrFocus),
 		primary: KeyCode.Escape,
 		handler: (accessor) => {
 			const focused = accessor.get(IListService).lastFocusedList;
 
-			// Tree only
-			if (focused && !(focused instanceof List || focused instanceof PagedList)) {
+			// List
+			if (focused instanceof List || focused instanceof PagedList) {
+				const list = focused;
+
+				if (list.getSelection().length > 0) {
+					list.setSelection([]);
+
+					return void 0;
+				}
+
+				if (list.getFocus().length > 0) {
+					list.setFocus([]);
+
+					return void 0;
+				}
+			}
+
+			// Tree
+			else if (focused) {
 				const tree = focused;
 
 				if (tree.getSelection().length) {
@@ -499,7 +518,7 @@ export function registerCommands(): void {
 
 	KeybindingsRegistry.registerCommandAndKeybindingRule({
 		id: 'workbench.action.closeWindow', // close the window when the last editor is closed by reusing the same keybinding
-		weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
+		weight: KeybindingWeight.WorkbenchContrib,
 		when: ContextKeyExpr.and(NoEditorsVisibleContext, SingleEditorGroupsContext),
 		primary: KeyMod.CtrlCmd | KeyCode.KEY_W,
 		handler: accessor => {
@@ -510,7 +529,7 @@ export function registerCommands(): void {
 
 	KeybindingsRegistry.registerCommandAndKeybindingRule({
 		id: 'workbench.action.exitZenMode',
-		weight: KeybindingsRegistry.WEIGHT.editorContrib(-1000),
+		weight: KeybindingWeight.EditorContrib - 1000,
 		handler(accessor: ServicesAccessor, configurationOrName: any) {
 			const partService = accessor.get(IPartService);
 			partService.toggleZenMode();
@@ -520,8 +539,8 @@ export function registerCommands(): void {
 	});
 
 	KeybindingsRegistry.registerCommandAndKeybindingRule({
-		id: 'workbench.action.quit',
-		weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
+		id: QUIT_ID,
+		weight: KeybindingWeight.WorkbenchContrib,
 		handler(accessor: ServicesAccessor) {
 			const windowsService = accessor.get(IWindowsService);
 			windowsService.quit();
@@ -531,7 +550,7 @@ export function registerCommands(): void {
 		win: { primary: void 0 }
 	});
 
-	CommandsRegistry.registerCommand('_workbench.removeFromRecentlyOpened', function (accessor: ServicesAccessor, path: string) {
+	CommandsRegistry.registerCommand('_workbench.removeFromRecentlyOpened', function (accessor: ServicesAccessor, path: IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier | URI | string) {
 		const windowsService = accessor.get(IWindowsService);
 
 		return windowsService.removeFromRecentlyOpened([path]).then(() => void 0);
diff --git a/src/vs/workbench/electron-browser/main.contribution.ts b/src/vs/workbench/electron-browser/main.contribution.ts
index a75f5da965b..355f6c69a27 100644
--- a/src/vs/workbench/electron-browser/main.contribution.ts
+++ b/src/vs/workbench/electron-browser/main.contribution.ts
@@ -14,14 +14,16 @@ import { IConfigurationRegistry, Extensions as ConfigurationExtensions, Configur
 import { IWorkbenchActionRegistry, Extensions } from 'vs/workbench/common/actions';
 import { KeyMod, KeyChord, KeyCode } from 'vs/base/common/keyCodes';
 import { isWindows, isLinux, isMacintosh } from 'vs/base/common/platform';
-import { KeybindingsReferenceAction, OpenDocumentationUrlAction, OpenIntroductoryVideosUrlAction, OpenTipsAndTricksUrlAction, OpenIssueReporterAction, ReportPerformanceIssueUsingReporterAction, ZoomResetAction, ZoomOutAction, ZoomInAction, ToggleFullScreenAction, ToggleMenuBarAction, CloseWorkspaceAction, CloseCurrentWindowAction, SwitchWindow, NewWindowAction, NavigateUpAction, NavigateDownAction, NavigateLeftAction, NavigateRightAction, IncreaseViewSizeAction, DecreaseViewSizeAction, ShowStartupPerformance, ToggleSharedProcessAction, QuickSwitchWindow, QuickOpenRecentAction, inRecentFilesPickerContextKey, ShowAboutDialogAction, InspectContextKeysAction, OpenProcessExplorer } from 'vs/workbench/electron-browser/actions';
-import { registerCommands } from 'vs/workbench/electron-browser/commands';
+import { KeybindingsReferenceAction, OpenDocumentationUrlAction, OpenIntroductoryVideosUrlAction, OpenTipsAndTricksUrlAction, OpenIssueReporterAction, ReportPerformanceIssueUsingReporterAction, ZoomResetAction, ZoomOutAction, ZoomInAction, ToggleFullScreenAction, ToggleMenuBarAction, CloseWorkspaceAction, CloseCurrentWindowAction, SwitchWindow, NewWindowAction, NavigateUpAction, NavigateDownAction, NavigateLeftAction, NavigateRightAction, IncreaseViewSizeAction, DecreaseViewSizeAction, ToggleSharedProcessAction, QuickSwitchWindow, QuickOpenRecentAction, inRecentFilesPickerContextKey, ShowAboutDialogAction, InspectContextKeysAction, OpenProcessExplorer, OpenTwitterUrlAction, OpenRequestFeatureUrlAction, OpenPrivacyStatementUrlAction, OpenLicenseUrlAction, OpenRecentAction } from 'vs/workbench/electron-browser/actions';
+import { registerCommands, QUIT_ID } from 'vs/workbench/electron-browser/commands';
 import { AddRootFolderAction, GlobalRemoveRootFolderAction, OpenWorkspaceAction, SaveWorkspaceAsAction, OpenWorkspaceConfigFileAction, DuplicateWorkspaceInNewWindowAction, OpenFileFolderAction, OpenFileAction, OpenFolderAction } from 'vs/workbench/browser/actions/workspaceActions';
 import { ContextKeyExpr, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
 import { inQuickOpenContext, getQuickNavigateHandler } from 'vs/workbench/browser/parts/quickopen/quickopen';
-import { KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRegistry';
+import { KeybindingsRegistry, KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
 import { CommandsRegistry } from 'vs/platform/commands/common/commands';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { ADD_ROOT_FOLDER_COMMAND_ID } from 'vs/workbench/browser/actions/workspaceCommands';
+import { FileDialogContext, IsMacContext } from 'vs/platform/workbench/common/contextkeys';
 
 // Contribute Commands
 registerCommands();
@@ -37,11 +39,12 @@ workbenchActionsRegistry.registerWorkbenchAction(new SyncActionDescriptor(Switch
 workbenchActionsRegistry.registerWorkbenchAction(new SyncActionDescriptor(QuickSwitchWindow, QuickSwitchWindow.ID, QuickSwitchWindow.LABEL), 'Quick Switch Window...');
 workbenchActionsRegistry.registerWorkbenchAction(new SyncActionDescriptor(QuickOpenRecentAction, QuickOpenRecentAction.ID, QuickOpenRecentAction.LABEL), 'File: Quick Open Recent...', fileCategory);
 
+const isLocal = FileDialogContext.isEqualTo('local');
 if (isMacintosh) {
-	workbenchActionsRegistry.registerWorkbenchAction(new SyncActionDescriptor(OpenFileFolderAction, OpenFileFolderAction.ID, OpenFileFolderAction.LABEL, { primary: KeyMod.CtrlCmd | KeyCode.KEY_O }), 'File: Open...', fileCategory);
+	workbenchActionsRegistry.registerWorkbenchAction(new SyncActionDescriptor(OpenFileFolderAction, OpenFileFolderAction.ID, OpenFileFolderAction.LABEL, { primary: KeyMod.CtrlCmd | KeyCode.KEY_O }, isLocal), 'File: Open...', fileCategory, isLocal);
 } else {
-	workbenchActionsRegistry.registerWorkbenchAction(new SyncActionDescriptor(OpenFileAction, OpenFileAction.ID, OpenFileAction.LABEL, { primary: KeyMod.CtrlCmd | KeyCode.KEY_O }), 'File: Open File...', fileCategory);
-	workbenchActionsRegistry.registerWorkbenchAction(new SyncActionDescriptor(OpenFolderAction, OpenFolderAction.ID, OpenFolderAction.LABEL, { primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_K, KeyMod.CtrlCmd | KeyCode.KEY_O) }), 'File: Open Folder...', fileCategory);
+	workbenchActionsRegistry.registerWorkbenchAction(new SyncActionDescriptor(OpenFileAction, OpenFileAction.ID, OpenFileAction.LABEL, { primary: KeyMod.CtrlCmd | KeyCode.KEY_O }, isLocal), 'File: Open File...', fileCategory, isLocal);
+	workbenchActionsRegistry.registerWorkbenchAction(new SyncActionDescriptor(OpenFolderAction, OpenFolderAction.ID, OpenFolderAction.LABEL, { primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_K, KeyMod.CtrlCmd | KeyCode.KEY_O) }, isLocal), 'File: Open Folder...', fileCategory, isLocal);
 }
 
 workbenchActionsRegistry.registerWorkbenchAction(new SyncActionDescriptor(CloseWorkspaceAction, CloseWorkspaceAction.ID, CloseWorkspaceAction.LABEL, { primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_K, KeyCode.KEY_F) }), 'File: Close Workspace', fileCategory);
@@ -66,6 +69,10 @@ if (OpenTipsAndTricksUrlAction.AVAILABLE) {
 	workbenchActionsRegistry.registerWorkbenchAction(new SyncActionDescriptor(OpenTipsAndTricksUrlAction, OpenTipsAndTricksUrlAction.ID, OpenTipsAndTricksUrlAction.LABEL), 'Help: Tips and Tricks', helpCategory);
 }
 
+workbenchActionsRegistry.registerWorkbenchAction(new SyncActionDescriptor(OpenTwitterUrlAction, OpenTwitterUrlAction.ID, OpenTwitterUrlAction.LABEL), 'Help: Join us on Twitter', helpCategory);
+workbenchActionsRegistry.registerWorkbenchAction(new SyncActionDescriptor(OpenRequestFeatureUrlAction, OpenRequestFeatureUrlAction.ID, OpenRequestFeatureUrlAction.LABEL), 'Help: Search Feature Requests', helpCategory);
+workbenchActionsRegistry.registerWorkbenchAction(new SyncActionDescriptor(OpenLicenseUrlAction, OpenLicenseUrlAction.ID, OpenLicenseUrlAction.LABEL), 'Help: View License', helpCategory);
+workbenchActionsRegistry.registerWorkbenchAction(new SyncActionDescriptor(OpenPrivacyStatementUrlAction, OpenPrivacyStatementUrlAction.ID, OpenPrivacyStatementUrlAction.LABEL), 'Help: Privacy Statement', helpCategory);
 workbenchActionsRegistry.registerWorkbenchAction(new SyncActionDescriptor(ShowAboutDialogAction, ShowAboutDialogAction.ID, ShowAboutDialogAction.LABEL), 'Help: About', helpCategory);
 
 workbenchActionsRegistry.registerWorkbenchAction(
@@ -101,15 +108,11 @@ workbenchActionsRegistry.registerWorkbenchAction(new SyncActionDescriptor(Increa
 workbenchActionsRegistry.registerWorkbenchAction(new SyncActionDescriptor(DecreaseViewSizeAction, DecreaseViewSizeAction.ID, DecreaseViewSizeAction.LABEL, null), 'View: Decrease Current View Size', viewCategory);
 
 const workspacesCategory = nls.localize('workspaces', "Workspaces");
-workbenchActionsRegistry.registerWorkbenchAction(new SyncActionDescriptor(AddRootFolderAction, AddRootFolderAction.ID, AddRootFolderAction.LABEL), 'Workspaces: Add Folder to Workspace...', workspacesCategory);
+workbenchActionsRegistry.registerWorkbenchAction(new SyncActionDescriptor(AddRootFolderAction, AddRootFolderAction.ID, AddRootFolderAction.LABEL), 'Workspaces: Add Folder to Workspace...', workspacesCategory, isLocal);
 workbenchActionsRegistry.registerWorkbenchAction(new SyncActionDescriptor(GlobalRemoveRootFolderAction, GlobalRemoveRootFolderAction.ID, GlobalRemoveRootFolderAction.LABEL), 'Workspaces: Remove Folder from Workspace...', workspacesCategory);
-workbenchActionsRegistry.registerWorkbenchAction(new SyncActionDescriptor(OpenWorkspaceAction, OpenWorkspaceAction.ID, OpenWorkspaceAction.LABEL), 'Workspaces: Open Workspace...', workspacesCategory);
-workbenchActionsRegistry.registerWorkbenchAction(new SyncActionDescriptor(SaveWorkspaceAsAction, SaveWorkspaceAsAction.ID, SaveWorkspaceAsAction.LABEL), 'Workspaces: Save Workspace As...', workspacesCategory);
+workbenchActionsRegistry.registerWorkbenchAction(new SyncActionDescriptor(OpenWorkspaceAction, OpenWorkspaceAction.ID, OpenWorkspaceAction.LABEL), 'Workspaces: Open Workspace...', workspacesCategory, isLocal);
+workbenchActionsRegistry.registerWorkbenchAction(new SyncActionDescriptor(SaveWorkspaceAsAction, SaveWorkspaceAsAction.ID, SaveWorkspaceAsAction.LABEL), 'Workspaces: Save Workspace As...', workspacesCategory, isLocal);
 workbenchActionsRegistry.registerWorkbenchAction(new SyncActionDescriptor(DuplicateWorkspaceInNewWindowAction, DuplicateWorkspaceInNewWindowAction.ID, DuplicateWorkspaceInNewWindowAction.LABEL), 'Workspaces: Duplicate Workspace in New Window', workspacesCategory);
-// Support old command id
-CommandsRegistry.registerCommand('workbench.action.openFolderAsWorkspaceInNewWindow', serviceAccesor => {
-	serviceAccesor.get(IInstantiationService).createInstance(DuplicateWorkspaceInNewWindowAction, DuplicateWorkspaceInNewWindowAction.ID, DuplicateWorkspaceInNewWindowAction.LABEL).run();
-});
 
 CommandsRegistry.registerCommand(OpenWorkspaceConfigFileAction.ID, serviceAccessor => {
 	serviceAccessor.get(IInstantiationService).createInstance(OpenWorkspaceConfigFileAction, OpenWorkspaceConfigFileAction.ID, OpenWorkspaceConfigFileAction.LABEL).run();
@@ -124,7 +127,6 @@ MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
 
 // Developer related actions
 const developerCategory = nls.localize('developer', "Developer");
-workbenchActionsRegistry.registerWorkbenchAction(new SyncActionDescriptor(ShowStartupPerformance, ShowStartupPerformance.ID, ShowStartupPerformance.LABEL), 'Developer: Startup Performance', developerCategory);
 workbenchActionsRegistry.registerWorkbenchAction(new SyncActionDescriptor(ToggleSharedProcessAction, ToggleSharedProcessAction.ID, ToggleSharedProcessAction.LABEL), 'Developer: Toggle Shared Process', developerCategory);
 workbenchActionsRegistry.registerWorkbenchAction(new SyncActionDescriptor(InspectContextKeysAction, InspectContextKeysAction.ID, InspectContextKeysAction.LABEL), 'Developer: Inspect Context Keys', developerCategory);
 workbenchActionsRegistry.registerWorkbenchAction(new SyncActionDescriptor(OpenProcessExplorer, OpenProcessExplorer.ID, OpenProcessExplorer.LABEL), 'Developer: Open Process Explorer', developerCategory);
@@ -134,7 +136,7 @@ const recentFilesPickerContext = ContextKeyExpr.and(inQuickOpenContext, ContextK
 const quickOpenNavigateNextInRecentFilesPickerId = 'workbench.action.quickOpenNavigateNextInRecentFilesPicker';
 KeybindingsRegistry.registerCommandAndKeybindingRule({
 	id: quickOpenNavigateNextInRecentFilesPickerId,
-	weight: KeybindingsRegistry.WEIGHT.workbenchContrib(50),
+	weight: KeybindingWeight.WorkbenchContrib + 50,
 	handler: getQuickNavigateHandler(quickOpenNavigateNextInRecentFilesPickerId, true),
 	when: recentFilesPickerContext,
 	primary: KeyMod.CtrlCmd | KeyCode.KEY_R,
@@ -144,13 +146,330 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 const quickOpenNavigatePreviousInRecentFilesPicker = 'workbench.action.quickOpenNavigatePreviousInRecentFilesPicker';
 KeybindingsRegistry.registerCommandAndKeybindingRule({
 	id: quickOpenNavigatePreviousInRecentFilesPicker,
-	weight: KeybindingsRegistry.WEIGHT.workbenchContrib(50),
+	weight: KeybindingWeight.WorkbenchContrib + 50,
 	handler: getQuickNavigateHandler(quickOpenNavigatePreviousInRecentFilesPicker, false),
 	when: recentFilesPickerContext,
 	primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KEY_R,
 	mac: { primary: KeyMod.WinCtrl | KeyMod.Shift | KeyCode.KEY_R }
 });
 
+// Menu registration - file menu
+
+MenuRegistry.appendMenuItem(MenuId.MenubarFileMenu, {
+	group: '1_new',
+	command: {
+		id: NewWindowAction.ID,
+		title: nls.localize({ key: 'miNewWindow', comment: ['&& denotes a mnemonic'] }, "New &&Window")
+	},
+	order: 2
+});
+
+MenuRegistry.appendMenuItem(MenuId.MenubarFileMenu, {
+	group: '2_open',
+	command: {
+		id: OpenFileAction.ID,
+		title: nls.localize({ key: 'miOpenFile', comment: ['&& denotes a mnemonic'] }, "&&Open File...")
+	},
+	order: 1,
+	when: ContextKeyExpr.and(IsMacContext.toNegated(), isLocal)
+});
+
+MenuRegistry.appendMenuItem(MenuId.MenubarFileMenu, {
+	group: '2_open',
+	command: {
+		id: OpenFolderAction.ID,
+		title: nls.localize({ key: 'miOpenFolder', comment: ['&& denotes a mnemonic'] }, "Open &&Folder...")
+	},
+	order: 2,
+	when: ContextKeyExpr.and(IsMacContext.toNegated(), isLocal)
+});
+
+MenuRegistry.appendMenuItem(MenuId.MenubarFileMenu, {
+	group: '2_open',
+	command: {
+		id: OpenFileFolderAction.ID,
+		title: nls.localize({ key: 'miOpen', comment: ['&& denotes a mnemonic'] }, "&&Open...")
+	},
+	order: 1,
+	when: ContextKeyExpr.and(IsMacContext, isLocal)
+});
+
+MenuRegistry.appendMenuItem(MenuId.MenubarFileMenu, {
+	group: '2_open',
+	command: {
+		id: OpenWorkspaceAction.ID,
+		title: nls.localize({ key: 'miOpenWorkspace', comment: ['&& denotes a mnemonic'] }, "Open Wor&&kspace...")
+	},
+	order: 3,
+	when: isLocal
+});
+
+MenuRegistry.appendMenuItem(MenuId.MenubarFileMenu, {
+	title: nls.localize({ key: 'miOpenRecent', comment: ['&& denotes a mnemonic'] }, "Open &&Recent"),
+	submenu: MenuId.MenubarRecentMenu,
+	group: '2_open',
+	order: 4
+});
+
+
+// More
+MenuRegistry.appendMenuItem(MenuId.MenubarRecentMenu, {
+	group: 'y_more',
+	command: {
+		id: OpenRecentAction.ID,
+		title: nls.localize({ key: 'miMore', comment: ['&& denotes a mnemonic'] }, "&&More...")
+	},
+	order: 1
+});
+
+MenuRegistry.appendMenuItem(MenuId.MenubarFileMenu, {
+	group: '3_workspace',
+	command: {
+		id: ADD_ROOT_FOLDER_COMMAND_ID,
+		title: nls.localize({ key: 'miAddFolderToWorkspace', comment: ['&& denotes a mnemonic'] }, "A&&dd Folder to Workspace...")
+	},
+	order: 1,
+	when: isLocal
+});
+
+MenuRegistry.appendMenuItem(MenuId.MenubarFileMenu, {
+	group: '3_workspace',
+	command: {
+		id: SaveWorkspaceAsAction.ID,
+		title: nls.localize('miSaveWorkspaceAs', "Save Workspace As...")
+	},
+	order: 2,
+	when: isLocal
+});
+
+MenuRegistry.appendMenuItem(MenuId.MenubarFileMenu, {
+	title: nls.localize({ key: 'miPreferences', comment: ['&& denotes a mnemonic'] }, "&&Preferences"),
+	submenu: MenuId.MenubarPreferencesMenu,
+	group: '5_autosave',
+	order: 2,
+	when: IsMacContext.toNegated()
+});
+
+MenuRegistry.appendMenuItem(MenuId.MenubarFileMenu, {
+	group: '6_close',
+	command: {
+		id: CloseWorkspaceAction.ID,
+		title: nls.localize({ key: 'miCloseFolder', comment: ['&& denotes a mnemonic'] }, "Close &&Folder"),
+		precondition: new RawContextKey<number>('workspaceFolderCount', 0).notEqualsTo('0')
+	},
+	order: 3,
+	when: new RawContextKey<string>('workbenchState', '').notEqualsTo('workspace')
+});
+
+MenuRegistry.appendMenuItem(MenuId.MenubarFileMenu, {
+	group: '6_close',
+	command: {
+		id: CloseWorkspaceAction.ID,
+		title: nls.localize({ key: 'miCloseWorkspace', comment: ['&& denotes a mnemonic'] }, "Close &&Workspace")
+	},
+	order: 3,
+	when: new RawContextKey<string>('workbenchState', '').isEqualTo('workspace')
+});
+
+MenuRegistry.appendMenuItem(MenuId.MenubarFileMenu, {
+	group: '6_close',
+	command: {
+		id: CloseCurrentWindowAction.ID,
+		title: nls.localize({ key: 'miCloseWindow', comment: ['&& denotes a mnemonic'] }, "Clos&&e Window")
+	},
+	order: 4
+});
+
+MenuRegistry.appendMenuItem(MenuId.MenubarFileMenu, {
+	group: 'z_Exit',
+	command: {
+		id: QUIT_ID,
+		title: nls.localize({ key: 'miExit', comment: ['&& denotes a mnemonic'] }, "E&&xit")
+	},
+	order: 1,
+	when: IsMacContext.toNegated()
+});
+
+// Appereance menu
+MenuRegistry.appendMenuItem(MenuId.MenubarViewMenu, {
+	group: '2_appearance',
+	title: nls.localize({ key: 'miAppearance', comment: ['&& denotes a mnemonic'] }, "&&Appearance"),
+	submenu: MenuId.MenubarAppearanceMenu,
+	order: 1
+});
+
+MenuRegistry.appendMenuItem(MenuId.MenubarAppearanceMenu, {
+	group: '1_toggle_view',
+	command: {
+		id: ToggleFullScreenAction.ID,
+		title: nls.localize({ key: 'miToggleFullScreen', comment: ['&& denotes a mnemonic'] }, "Toggle &&Full Screen")
+	},
+	order: 1
+});
+
+MenuRegistry.appendMenuItem(MenuId.MenubarAppearanceMenu, {
+	group: '1_toggle_view',
+	command: {
+		id: ToggleMenuBarAction.ID,
+		title: nls.localize({ key: 'miToggleMenuBar', comment: ['&& denotes a mnemonic'] }, "Toggle Menu &&Bar")
+	},
+	order: 4
+});
+
+// Zoom
+
+MenuRegistry.appendMenuItem(MenuId.MenubarAppearanceMenu, {
+	group: '3_zoom',
+	command: {
+		id: ZoomInAction.ID,
+		title: nls.localize({ key: 'miZoomIn', comment: ['&& denotes a mnemonic'] }, "&&Zoom In")
+	},
+	order: 1
+});
+
+MenuRegistry.appendMenuItem(MenuId.MenubarAppearanceMenu, {
+	group: '3_zoom',
+	command: {
+		id: ZoomOutAction.ID,
+		title: nls.localize({ key: 'miZoomOut', comment: ['&& denotes a mnemonic'] }, "&&Zoom Out")
+	},
+	order: 2
+});
+
+MenuRegistry.appendMenuItem(MenuId.MenubarAppearanceMenu, {
+	group: '3_zoom',
+	command: {
+		id: ZoomResetAction.ID,
+		title: nls.localize({ key: 'miZoomReset', comment: ['&& denotes a mnemonic'] }, "&&Reset Zoom")
+	},
+	order: 3
+});
+
+// Help
+
+MenuRegistry.appendMenuItem(MenuId.MenubarHelpMenu, {
+	group: '1_welcome',
+	command: {
+		id: 'workbench.action.openDocumentationUrl',
+		title: nls.localize({ key: 'miDocumentation', comment: ['&& denotes a mnemonic'] }, "&&Documentation")
+	},
+	order: 3
+});
+
+MenuRegistry.appendMenuItem(MenuId.MenubarHelpMenu, {
+	group: '1_welcome',
+	command: {
+		id: 'update.showCurrentReleaseNotes',
+		title: nls.localize({ key: 'miReleaseNotes', comment: ['&& denotes a mnemonic'] }, "&&Release Notes")
+	},
+	order: 4
+});
+
+// Reference
+MenuRegistry.appendMenuItem(MenuId.MenubarHelpMenu, {
+	group: '2_reference',
+	command: {
+		id: 'workbench.action.keybindingsReference',
+		title: nls.localize({ key: 'miKeyboardShortcuts', comment: ['&& denotes a mnemonic'] }, "&&Keyboard Shortcuts Reference")
+	},
+	order: 1
+});
+
+MenuRegistry.appendMenuItem(MenuId.MenubarHelpMenu, {
+	group: '2_reference',
+	command: {
+		id: 'workbench.action.openIntroductoryVideosUrl',
+		title: nls.localize({ key: 'miIntroductoryVideos', comment: ['&& denotes a mnemonic'] }, "Introductory &&Videos")
+	},
+	order: 2
+});
+
+MenuRegistry.appendMenuItem(MenuId.MenubarHelpMenu, {
+	group: '2_reference',
+	command: {
+		id: 'workbench.action.openTipsAndTricksUrl',
+		title: nls.localize({ key: 'miTipsAndTricks', comment: ['&& denotes a mnemonic'] }, "&&Tips and Tricks")
+	},
+	order: 3
+});
+
+// Feedback
+MenuRegistry.appendMenuItem(MenuId.MenubarHelpMenu, {
+	group: '3_feedback',
+	command: {
+		id: 'workbench.action.openTwitterUrl',
+		title: nls.localize({ key: 'miTwitter', comment: ['&& denotes a mnemonic'] }, "&&Join us on Twitter")
+	},
+	order: 1
+});
+
+MenuRegistry.appendMenuItem(MenuId.MenubarHelpMenu, {
+	group: '3_feedback',
+	command: {
+		id: 'workbench.action.openRequestFeatureUrl',
+		title: nls.localize({ key: 'miUserVoice', comment: ['&& denotes a mnemonic'] }, "&&Search Feature Requests")
+	},
+	order: 2
+});
+
+MenuRegistry.appendMenuItem(MenuId.MenubarHelpMenu, {
+	group: '3_feedback',
+	command: {
+		id: 'workbench.action.openIssueReporter',
+		title: nls.localize({ key: 'miReportIssue', comment: ['&& denotes a mnemonic', 'Translate this to "Report Issue in English" in all languages please!'] }, "Report &&Issue")
+	},
+	order: 3
+});
+
+// Legal
+MenuRegistry.appendMenuItem(MenuId.MenubarHelpMenu, {
+	group: '4_legal',
+	command: {
+		id: 'workbench.action.openLicenseUrl',
+		title: nls.localize({ key: 'miLicense', comment: ['&& denotes a mnemonic'] }, "View &&License")
+	},
+	order: 1
+});
+
+MenuRegistry.appendMenuItem(MenuId.MenubarHelpMenu, {
+	group: '4_legal',
+	command: {
+		id: 'workbench.action.openPrivacyStatementUrl',
+		title: nls.localize({ key: 'miPrivacyStatement', comment: ['&& denotes a mnemonic'] }, "&&Privacy Statement")
+	},
+	order: 2
+});
+
+// Tools
+MenuRegistry.appendMenuItem(MenuId.MenubarHelpMenu, {
+	group: '5_tools',
+	command: {
+		id: 'workbench.action.toggleDevTools',
+		title: nls.localize({ key: 'miToggleDevTools', comment: ['&& denotes a mnemonic'] }, "&&Toggle Developer Tools")
+	},
+	order: 1
+});
+
+MenuRegistry.appendMenuItem(MenuId.MenubarHelpMenu, {
+	group: '5_tools',
+	command: {
+		id: 'workbench.action.openProcessExplorer',
+		title: nls.localize({ key: 'miOpenProcessExplorerer', comment: ['&& denotes a mnemonic'] }, "Open &&Process Explorer")
+	},
+	order: 2
+});
+
+// About
+MenuRegistry.appendMenuItem(MenuId.MenubarHelpMenu, {
+	group: 'z_about',
+	command: {
+		id: 'workbench.action.showAboutDialog',
+		title: nls.localize({ key: 'miAbout', comment: ['&& denotes a mnemonic'] }, "&&About")
+	},
+	order: 1,
+	when: IsMacContext.toNegated()
+});
+
 // Configuration: Workbench
 const configurationRegistry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration);
 
@@ -162,7 +481,7 @@ configurationRegistry.registerConfiguration({
 	'properties': {
 		'workbench.editor.showTabs': {
 			'type': 'boolean',
-			'description': nls.localize('showEditorTabs', "Controls if opened editors should show in tabs or not."),
+			'description': nls.localize('showEditorTabs', "Controls whether opened editors should show in tabs or not."),
 			'default': true
 		},
 		'workbench.editor.labelFormat': {
@@ -175,52 +494,58 @@ configurationRegistry.registerConfiguration({
 				nls.localize('workbench.editor.labelFormat.long', "Show the name of the file followed by it's absolute path.")
 			],
 			'default': 'default',
-			'description': nls.localize({ comment: ['This is the description for a setting. Values surrounded by parenthesis are not to be translated.'], key: 'tabDescription' },
-				"Controls the format of the label for an editor. Changing this setting can for example make it easier to understand the location of a file:\n- short:   'parent'\n- medium:  'workspace/src/parent'\n- long:    '/home/user/workspace/src/parent'\n- default: '.../parent', when another tab shares the same title, or the relative workspace path if tabs are disabled"),
+			'description': nls.localize({
+				comment: ['This is the description for a setting. Values surrounded by parenthesis are not to be translated.'],
+				key: 'tabDescription'
+			}, "Controls the format of the label for an editor."),
 		},
 		'workbench.editor.tabCloseButton': {
 			'type': 'string',
 			'enum': ['left', 'right', 'off'],
 			'default': 'right',
-			'description': nls.localize({ comment: ['This is the description for a setting. Values surrounded by single quotes are not to be translated.'], key: 'editorTabCloseButton' }, "Controls the position of the editor's tabs close buttons or disables them when set to 'off'.")
+			'description': nls.localize({ comment: ['This is the description for a setting. Values surrounded by single quotes are not to be translated.'], key: 'editorTabCloseButton' }, "Controls the position of the editor's tabs close buttons, or disables them when set to 'off'.")
 		},
 		'workbench.editor.tabSizing': {
 			'type': 'string',
 			'enum': ['fit', 'shrink'],
 			'default': 'fit',
-			'description': nls.localize({ comment: ['This is the description for a setting. Values surrounded by single quotes are not to be translated.'], key: 'tabSizing' }, "Controls the sizing of editor tabs. Set to 'fit' to keep tabs always large enough to show the full editor label. Set to 'shrink' to allow tabs to get smaller when the available space is not enough to show all tabs at once.")
+			'enumDescriptions': [
+				nls.localize('workbench.editor.tabSizing.fit', "Always keep tabs large enough to show the full editor label."),
+				nls.localize('workbench.editor.tabSizing.shrink', "Allow tabs to get smaller when the available space is not enough to show all tabs at once.")
+			],
+			'description': nls.localize({ comment: ['This is the description for a setting. Values surrounded by single quotes are not to be translated.'], key: 'tabSizing' }, "Controls the sizing of editor tabs.")
 		},
 		'workbench.editor.showIcons': {
 			'type': 'boolean',
-			'description': nls.localize('showIcons', "Controls if opened editors should show with an icon or not. This requires an icon theme to be enabled as well."),
+			'description': nls.localize('showIcons', "Controls whether opened editors should show with an icon or not. This requires an icon theme to be enabled as well."),
 			'default': true
 		},
 		'workbench.editor.enablePreview': {
 			'type': 'boolean',
-			'description': nls.localize('enablePreview', "Controls if opened editors show as preview. Preview editors are reused until they are kept (e.g. via double click or editing) and show up with an italic font style."),
+			'description': nls.localize('enablePreview', "Controls whether opened editors show as preview. Preview editors are reused until they are kept (e.g. via double click or editing) and show up with an italic font style."),
 			'default': true
 		},
 		'workbench.editor.enablePreviewFromQuickOpen': {
 			'type': 'boolean',
-			'description': nls.localize('enablePreviewFromQuickOpen', "Controls if opened editors from Quick Open show as preview. Preview editors are reused until they are kept (e.g. via double click or editing)."),
+			'description': nls.localize('enablePreviewFromQuickOpen', "Controls whether opened editors from Quick Open show as preview. Preview editors are reused until they are kept (e.g. via double click or editing)."),
 			'default': true
 		},
 		'workbench.editor.closeOnFileDelete': {
 			'type': 'boolean',
-			'description': nls.localize('closeOnFileDelete', "Controls if editors showing a file should close automatically when the file is deleted or renamed by some other process. Disabling this will keep the editor open as dirty on such an event. Note that deleting from within the application will always close the editor and that dirty files will never close to preserve your data."),
-			'default': true
+			'description': nls.localize('closeOnFileDelete', "Controls whether editors showing a file that was opened during the session should close automatically when getting deleted or renamed by some other process. Disabling this will keep the editor open  on such an event. Note that deleting from within the application will always close the editor and that dirty files will never close to preserve your data."),
+			'default': false
 		},
 		'workbench.editor.openPositioning': {
 			'type': 'string',
 			'enum': ['left', 'right', 'first', 'last'],
 			'default': 'right',
-			'description': nls.localize({ comment: ['This is the description for a setting. Values surrounded by single quotes are not to be translated.'], key: 'editorOpenPositioning' }, "Controls where editors open. Select 'left' or 'right' to open editors to the left or right of the currently active one. Select 'first' or 'last' to open editors independently from the currently active one.")
+			'markdownDescription': nls.localize({ comment: ['This is the description for a setting. Values surrounded by single quotes are not to be translated.'], key: 'editorOpenPositioning' }, "Controls where editors open. Select `left` or `right` to open editors to the left or right of the currently active one. Select `first` or `last` to open editors independently from the currently active one.")
 		},
 		'workbench.editor.openSideBySideDirection': {
 			'type': 'string',
 			'enum': ['right', 'down'],
 			'default': 'right',
-			'description': nls.localize('sideBySideDirection', "Controls the default direction of editors that are opened side by side (e.g. from the explorer). By default, editors will open on the rigth hand side of the currently active one. If changed to open down, the editors will open below the currently active one.")
+			'markdownDescription': nls.localize('sideBySideDirection', "Controls the default direction of editors that are opened side by side (e.g. from the explorer). By default, editors will open on the right hand side of the currently active one. If changed to `down`, the editors will open below the currently active one.")
 		},
 		'workbench.editor.closeEmptyGroups': {
 			'type': 'boolean',
@@ -229,7 +554,7 @@ configurationRegistry.registerConfiguration({
 		},
 		'workbench.editor.revealIfOpen': {
 			'type': 'boolean',
-			'description': nls.localize('revealIfOpen', "Controls if an editor is revealed in any of the visible groups if opened. If disabled, an editor will prefer to open in the currently active editor group. If enabled, an already opened editor will be revealed instead of opened again in the currently active editor group. Note that there are some cases where this setting is ignored, e.g. when forcing an editor to open in a specific group or to the side of the currently active group."),
+			'description': nls.localize('revealIfOpen', "Controls whether an editor is revealed in any of the visible groups if opened. If disabled, an editor will prefer to open in the currently active editor group. If enabled, an already opened editor will be revealed instead of opened again in the currently active editor group. Note that there are some cases where this setting is ignored, e.g. when forcing an editor to open in a specific group or to the side of the currently active group."),
 			'default': false
 		},
 		'workbench.editor.swipeToNavigate': {
@@ -245,17 +570,22 @@ configurationRegistry.registerConfiguration({
 		},
 		'workbench.commandPalette.preserveInput': {
 			'type': 'boolean',
-			'description': nls.localize('preserveInput', "Controls if the last typed input to the command palette should be restored when opening it the next time."),
+			'description': nls.localize('preserveInput', "Controls whether the last typed input to the command palette should be restored when opening it the next time."),
 			'default': false
 		},
 		'workbench.quickOpen.closeOnFocusLost': {
 			'type': 'boolean',
-			'description': nls.localize('closeOnFocusLost', "Controls if Quick Open should close automatically once it loses focus."),
+			'description': nls.localize('closeOnFocusLost', "Controls whether Quick Open should close automatically once it loses focus."),
 			'default': true
 		},
 		'workbench.settings.openDefaultSettings': {
 			'type': 'boolean',
-			'description': nls.localize('openDefaultSettings', "Controls if opening settings also opens an editor showing all default settings."),
+			'description': nls.localize('openDefaultSettings', "Controls whether opening settings also opens an editor showing all default settings."),
+			'default': true
+		},
+		'workbench.settings.openDefaultKeybindings': {
+			'type': 'boolean',
+			'description': nls.localize('openDefaultKeybindings', "Controls whether opening keybinding settings also opens an editor showing all default keybindings."),
 			'default': true
 		},
 		'workbench.sideBar.location': {
@@ -290,7 +620,7 @@ configurationRegistry.registerConfiguration({
 			'enum': ['default', 'antialiased', 'none', 'auto'],
 			'default': 'default',
 			'description':
-				nls.localize('fontAliasing', "Controls font aliasing method in the workbench.\n- default: Sub-pixel font smoothing. On most non-retina displays this will give the sharpest text\n- antialiased: Smooth the font on the level of the pixel, as opposed to the subpixel. Can make the font appear lighter overall\n- none: Disables font smoothing. Text will show with jagged sharp edges\n- auto: Applies `default` or `antialiased` automatically based on the DPI of displays."),
+				nls.localize('fontAliasing', "Controls font aliasing method in the workbench."),
 			'enumDescriptions': [
 				nls.localize('workbench.fontAliasing.default', "Sub-pixel font smoothing. On most non-retina displays this will give the sharpest text."),
 				nls.localize('workbench.fontAliasing.antialiased', "Smooth the font on the level of the pixel, as opposed to the subpixel. Can make the font appear lighter overall."),
@@ -301,8 +631,38 @@ configurationRegistry.registerConfiguration({
 		},
 		'workbench.settings.enableNaturalLanguageSearch': {
 			'type': 'boolean',
-			'description': nls.localize('enableNaturalLanguageSettingsSearch', "Controls whether to enable the natural language search mode for settings."),
-			'default': true
+			'description': nls.localize('enableNaturalLanguageSettingsSearch', "Controls whether to enable the natural language search mode for settings. The natural language search is provided by an online service."),
+			'default': true,
+			'scope': ConfigurationScope.WINDOW,
+			'tags': ['usesOnlineServices']
+		},
+		'workbench.settings.settingsSearchTocBehavior': {
+			'type': 'string',
+			'enum': ['hide', 'filter'],
+			'enumDescriptions': [
+				nls.localize('settingsSearchTocBehavior.hide', "Hide the Table of Contents while searching."),
+				nls.localize('settingsSearchTocBehavior.filter', "Filter the Table of Contents to just categories that have matching settings. Clicking a category will filter the results to that category."),
+			],
+			'description': nls.localize('settingsSearchTocBehavior', "Controls the behavior of the settings editor Table of Contents while searching."),
+			'default': 'filter',
+			'scope': ConfigurationScope.WINDOW
+		},
+		'workbench.settings.editor': {
+			'type': 'string',
+			'enum': ['ui', 'json'],
+			'enumDescriptions': [
+				nls.localize('settings.editor.ui', "Use the settings UI editor."),
+				nls.localize('settings.editor.json', "Use the JSON file editor."),
+			],
+			'description': nls.localize('settings.editor.desc', "Determines which settings editor to use by default."),
+			'default': 'ui',
+			'scope': ConfigurationScope.WINDOW
+		},
+		'workbench.enableExperiments': {
+			'type': 'boolean',
+			'description': nls.localize('workbench.enableExperiments', "Fetches experiments to run from a Microsoft online service."),
+			'default': true,
+			'tags': ['usesOnlineServices']
 		}
 	}
 });
@@ -319,41 +679,41 @@ configurationRegistry.registerConfiguration({
 			'type': 'string',
 			'enum': ['on', 'off', 'default'],
 			'enumDescriptions': [
-				nls.localize('window.openFilesInNewWindow.on', "Files will open in a new window"),
-				nls.localize('window.openFilesInNewWindow.off', "Files will open in the window with the files' folder open or the last active window"),
+				nls.localize('window.openFilesInNewWindow.on', "Files will open in a new window."),
+				nls.localize('window.openFilesInNewWindow.off', "Files will open in the window with the files' folder open or the last active window."),
 				isMacintosh ?
-					nls.localize('window.openFilesInNewWindow.defaultMac', "Files will open in the window with the files' folder open or the last active window unless opened via the Dock or from Finder") :
-					nls.localize('window.openFilesInNewWindow.default', "Files will open in a new window unless picked from within the application (e.g. via the File menu)")
+					nls.localize('window.openFilesInNewWindow.defaultMac', "Files will open in the window with the files' folder open or the last active window unless opened via the Dock or from Finder.") :
+					nls.localize('window.openFilesInNewWindow.default', "Files will open in a new window unless picked from within the application (e.g. via the File menu).")
 			],
 			'default': 'off',
 			'scope': ConfigurationScope.APPLICATION,
-			'description':
+			'markdownDescription':
 				isMacintosh ?
-					nls.localize('openFilesInNewWindowMac', "Controls if files should open in a new window.\n- default: files will open in the window with the files' folder open or the last active window unless opened via the Dock or from Finder\n- on: files will open in a new window\n- off: files will open in the window with the files' folder open or the last active window\nNote that there can still be cases where this setting is ignored (e.g. when using the -new-window or -reuse-window command line option).") :
-					nls.localize('openFilesInNewWindow', "Controls if files should open in a new window.\n- default: files will open in a new window unless picked from within the application (e.g. via the File menu)\n- on: files will open in a new window\n- off: files will open in the window with the files' folder open or the last active window\nNote that there can still be cases where this setting is ignored (e.g. when using the -new-window or -reuse-window command line option).")
+					nls.localize('openFilesInNewWindowMac', "Controls whether files should open in a new window. \nNote that there can still be cases where this setting is ignored (e.g. when using the `--new-window` or `--reuse-window` command line option).") :
+					nls.localize('openFilesInNewWindow', "Controls whether files should open in a new window.\nNote that there can still be cases where this setting is ignored (e.g. when using the `--new-window` or `--reuse-window` command line option).")
 		},
 		'window.openFoldersInNewWindow': {
 			'type': 'string',
 			'enum': ['on', 'off', 'default'],
 			'enumDescriptions': [
-				nls.localize('window.openFoldersInNewWindow.on', "Folders will open in a new window"),
-				nls.localize('window.openFoldersInNewWindow.off', "Folders will replace the last active window"),
-				nls.localize('window.openFoldersInNewWindow.default', "Folders will open in a new window unless a folder is picked from within the application (e.g. via the File menu)")
+				nls.localize('window.openFoldersInNewWindow.on', "Folders will open in a new window."),
+				nls.localize('window.openFoldersInNewWindow.off', "Folders will replace the last active window."),
+				nls.localize('window.openFoldersInNewWindow.default', "Folders will open in a new window unless a folder is picked from within the application (e.g. via the File menu).")
 			],
 			'default': 'default',
 			'scope': ConfigurationScope.APPLICATION,
-			'description': nls.localize('openFoldersInNewWindow', "Controls if folders should open in a new window or replace the last active window.\n- default: folders will open in a new window unless a folder is picked from within the application (e.g. via the File menu)\n- on: folders will open in a new window\n- off: folders will replace the last active window\nNote that there can still be cases where this setting is ignored (e.g. when using the -new-window or -reuse-window command line option).")
+			'markdownDescription': nls.localize('openFoldersInNewWindow', "Controls whether folders should open in a new window or replace the last active window.\nNote that there can still be cases where this setting is ignored (e.g. when using the `--new-window` or `--reuse-window` command line option).")
 		},
 		'window.openWithoutArgumentsInNewWindow': {
 			'type': 'string',
 			'enum': ['on', 'off'],
 			'enumDescriptions': [
-				nls.localize('window.openWithoutArgumentsInNewWindow.on', "Open a new empty window"),
-				nls.localize('window.openWithoutArgumentsInNewWindow.off', "Focus the last active running instance")
+				nls.localize('window.openWithoutArgumentsInNewWindow.on', "Open a new empty window."),
+				nls.localize('window.openWithoutArgumentsInNewWindow.off', "Focus the last active running instance.")
 			],
 			'default': isMacintosh ? 'off' : 'on',
 			'scope': ConfigurationScope.APPLICATION,
-			'description': nls.localize('openWithoutArgumentsInNewWindow', "Controls if a new empty window should open when starting a second instance without arguments or if the last running instance should get focus.\n- on: open a new empty window\n- off: the last active running instance will get focus\nNote that there can still be cases where this setting is ignored (e.g. when using the -new-window or -reuse-window command line option).")
+			'markdownDescription': nls.localize('openWithoutArgumentsInNewWindow', "Controls whether a new empty window should open when starting a second instance without arguments or if the last running instance should get focus.\nNote that there can still be cases where this setting is ignored (e.g. when using the `--new-window` or `--reuse-window` command line option).")
 		},
 		'window.restoreWindows': {
 			'type': 'string',
@@ -366,13 +726,13 @@ configurationRegistry.registerConfiguration({
 			],
 			'default': 'one',
 			'scope': ConfigurationScope.APPLICATION,
-			'description': nls.localize('restoreWindows', "Controls how windows are being reopened after a restart. Select 'none' to always start with an empty workspace, 'one' to reopen the last window you worked on, 'folders' to reopen all windows that had folders opened or 'all' to reopen all windows of your last session.")
+			'description': nls.localize('restoreWindows', "Controls how windows are being reopened after a restart.")
 		},
 		'window.restoreFullscreen': {
 			'type': 'boolean',
 			'default': false,
 			'scope': ConfigurationScope.APPLICATION,
-			'description': nls.localize('restoreFullscreen', "Controls if a window should restore to full screen mode if it was exited in full screen mode.")
+			'description': nls.localize('restoreFullscreen', "Controls whether a window should restore to full screen mode if it was exited in full screen mode.")
 		},
 		'window.zoomLevel': {
 			'type': 'number',
@@ -382,8 +742,8 @@ configurationRegistry.registerConfiguration({
 		'window.title': {
 			'type': 'string',
 			'default': isMacintosh ? '${activeEditorShort}${separator}${rootName}' : '${dirty}${activeEditorShort}${separator}${rootName}${separator}${appName}',
-			'description': nls.localize({ comment: ['This is the description for a setting. Values surrounded by parenthesis are not to be translated.'], key: 'title' },
-				"Controls the window title based on the active editor. Variables are substituted based on the context:\n\${activeEditorShort}: the file name (e.g. myFile.txt)\n\${activeEditorMedium}: the path of the file relative to the workspace folder (e.g. myFolder/myFile.txt)\n\${activeEditorLong}: the full path of the file (e.g. /Users/Development/myProject/myFolder/myFile.txt)\n\${folderName}: name of the workspace folder the file is contained in (e.g. myFolder)\n\${folderPath}: file path of the workspace folder the file is contained in (e.g. /Users/Development/myFolder)\n\${rootName}: name of the workspace (e.g. myFolder or myWorkspace)\n\${rootPath}: file path of the workspace (e.g. /Users/Development/myWorkspace)\n\${appName}: e.g. VS Code\n\${dirty}: a dirty indicator if the active editor is dirty\n\${separator}: a conditional separator (\" - \") that only shows when surrounded by variables with values or static text")
+			'markdownDescription': nls.localize({ comment: ['This is the description for a setting. Values surrounded by parenthesis are not to be translated.'], key: 'title' },
+				"Controls the window title based on the active editor. Variables are substituted based on the context:\n- `\${activeEditorShort}`: the file name (e.g. myFile.txt).\n- `\${activeEditorMedium}`: the path of the file relative to the workspace folder (e.g. myFolder/myFile.txt).\n- `\${activeEditorLong}`: the full path of the file (e.g. /Users/Development/myProject/myFolder/myFile.txt).\n- `\${folderName}`: name of the workspace folder the file is contained in (e.g. myFolder).\n- `\${folderPath}`: file path of the workspace folder the file is contained in (e.g. /Users/Development/myFolder).\n- `\${rootName}`: name of the workspace (e.g. myFolder or myWorkspace).\n- `\${rootPath}`: file path of the workspace (e.g. /Users/Development/myWorkspace).\n- `\${appName}`: e.g. VS Code.\n- `\${dirty}`: a dirty indicator if the active editor is dirty.\n- `\${separator}`: a conditional separator (\" - \") that only shows when surrounded by variables with values or static text.")
 		},
 		'window.newWindowDimensions': {
 			'type': 'string',
@@ -396,12 +756,12 @@ configurationRegistry.registerConfiguration({
 			],
 			'default': 'default',
 			'scope': ConfigurationScope.APPLICATION,
-			'description': nls.localize('newWindowDimensions', "Controls the dimensions of opening a new window when at least one window is already opened. By default, a new window will open in the center of the screen with small dimensions. When set to 'inherit', the window will get the same dimensions as the last window that was active. When set to 'maximized', the window will open maximized and fullscreen if configured to 'fullscreen'. Note that this setting does not have an impact on the first window that is opened. The first window will always restore the size and location as you left it before closing.")
+			'description': nls.localize('newWindowDimensions', "Controls the dimensions of opening a new window when at least one window is already opened. Note that this setting does not have an impact on the first window that is opened. The first window will always restore the size and location as you left it before closing.")
 		},
 		'window.closeWhenEmpty': {
 			'type': 'boolean',
 			'default': false,
-			'description': nls.localize('closeWhenEmpty', "Controls if closing the last editor should also close the window. This setting only applies for windows that do not show folders.")
+			'description': nls.localize('closeWhenEmpty', "Controls whether closing the last editor should also close the window. This setting only applies for windows that do not show folders.")
 		},
 		'window.menuBarVisibility': {
 			'type': 'string',
@@ -433,10 +793,9 @@ configurationRegistry.registerConfiguration({
 		'window.titleBarStyle': {
 			'type': 'string',
 			'enum': ['native', 'custom'],
-			'default': 'custom',
+			'default': isLinux ? 'native' : 'custom',
 			'scope': ConfigurationScope.APPLICATION,
-			'description': nls.localize('titleBarStyle', "Adjust the appearance of the window title bar. Changes require a full restart to apply."),
-			'included': isMacintosh
+			'description': nls.localize('titleBarStyle', "Adjust the appearance of the window title bar. Changes require a full restart to apply.")
 		},
 		'window.nativeTabs': {
 			'type': 'boolean',
@@ -449,7 +808,7 @@ configurationRegistry.registerConfiguration({
 			'type': 'boolean',
 			'default': false,
 			'scope': ConfigurationScope.APPLICATION,
-			'description': nls.localize('window.smoothScrollingWorkaround', "Enable this workaround if scrolling is no longer smooth after restoring a minimized VS Code window. This is a workaround for an issue (https://github.com/Microsoft/vscode/issues/13612) where scrolling starts to lag on devices with precision trackpads like the Surface devices from Microsoft. Enabling this workaround can result in a little bit of layout flickering after restoring the window from minimized state but is otherwise harmless."),
+			'markdownDescription': nls.localize('window.smoothScrollingWorkaround', "Enable this workaround if scrolling is no longer smooth after restoring a minimized VS Code window. This is a workaround for an issue (https://github.com/Microsoft/vscode/issues/13612) where scrolling starts to lag on devices with precision trackpads like the Surface devices from Microsoft. Enabling this workaround can result in a little bit of layout flickering after restoring the window from minimized state but is otherwise harmless. Note: in order for this workaround to function, make sure to also set `#window.titleBarStyle#` to `native`."),
 			'included': isWindows
 		},
 		'window.clickThroughInactive': {
@@ -472,32 +831,32 @@ configurationRegistry.registerConfiguration({
 		'zenMode.fullScreen': {
 			'type': 'boolean',
 			'default': true,
-			'description': nls.localize('zenMode.fullScreen', "Controls if turning on Zen Mode also puts the workbench into full screen mode.")
+			'description': nls.localize('zenMode.fullScreen', "Controls whether turning on Zen Mode also puts the workbench into full screen mode.")
 		},
 		'zenMode.centerLayout': {
 			'type': 'boolean',
 			'default': true,
-			'description': nls.localize('zenMode.centerLayout', "Controls if turning on Zen Mode also centers the layout.")
+			'description': nls.localize('zenMode.centerLayout', "Controls whether turning on Zen Mode also centers the layout.")
 		},
 		'zenMode.hideTabs': {
 			'type': 'boolean',
 			'default': true,
-			'description': nls.localize('zenMode.hideTabs', "Controls if turning on Zen Mode also hides workbench tabs.")
+			'description': nls.localize('zenMode.hideTabs', "Controls whether turning on Zen Mode also hides workbench tabs.")
 		},
 		'zenMode.hideStatusBar': {
 			'type': 'boolean',
 			'default': true,
-			'description': nls.localize('zenMode.hideStatusBar', "Controls if turning on Zen Mode also hides the status bar at the bottom of the workbench.")
+			'description': nls.localize('zenMode.hideStatusBar', "Controls whether turning on Zen Mode also hides the status bar at the bottom of the workbench.")
 		},
 		'zenMode.hideActivityBar': {
 			'type': 'boolean',
 			'default': true,
-			'description': nls.localize('zenMode.hideActivityBar', "Controls if turning on Zen Mode also hides the activity bar at the left of the workbench.")
+			'description': nls.localize('zenMode.hideActivityBar', "Controls whether turning on Zen Mode also hides the activity bar at the left of the workbench.")
 		},
 		'zenMode.restore': {
 			'type': 'boolean',
 			'default': false,
-			'description': nls.localize('zenMode.restore', "Controls if a window should restore to zen mode if it was exited in zen mode.")
+			'description': nls.localize('zenMode.restore', "Controls whether a window should restore to zen mode if it was exited in zen mode.")
 		}
 	}
 });
diff --git a/src/vs/workbench/electron-browser/main.ts b/src/vs/workbench/electron-browser/main.ts
index 087bbe40d24..5323ed87b65 100644
--- a/src/vs/workbench/electron-browser/main.ts
+++ b/src/vs/workbench/electron-browser/main.ts
@@ -14,44 +14,48 @@ import { domContentLoaded } from 'vs/base/browser/dom';
 import * as errors from 'vs/base/common/errors';
 import * as comparer from 'vs/base/common/comparers';
 import * as platform from 'vs/base/common/platform';
-import * as paths from 'vs/base/common/paths';
-import uri from 'vs/base/common/uri';
-import * as strings from 'vs/base/common/strings';
+import { URI as uri } from 'vs/base/common/uri';
 import { IWorkspaceContextService, Workspace, WorkbenchState } from 'vs/platform/workspace/common/workspace';
 import { WorkspaceService } from 'vs/workbench/services/configuration/node/configurationService';
 import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
 import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
-import { realpath } from 'vs/base/node/pfs';
+import { stat } from 'vs/base/node/pfs';
 import { EnvironmentService } from 'vs/platform/environment/node/environmentService';
 import * as gracefulFs from 'graceful-fs';
-import { IInitData } from 'vs/workbench/services/timer/common/timerService';
-import { TimerService } from 'vs/workbench/services/timer/node/timerService';
 import { KeyboardMapperFactory } from 'vs/workbench/services/keybinding/electron-browser/keybindingService';
 import { IWindowConfiguration, IWindowsService } from 'vs/platform/windows/common/windows';
-import { WindowsChannelClient } from 'vs/platform/windows/common/windowsIpc';
+import { WindowsChannelClient } from 'vs/platform/windows/node/windowsIpc';
 import { IStorageService } from 'vs/platform/storage/common/storage';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { StorageService, inMemoryLocalStorageInstance, IStorage } from 'vs/platform/storage/common/storageService';
 import { Client as ElectronIPCClient } from 'vs/base/parts/ipc/electron-browser/ipc.electron-browser';
 import { webFrame } from 'electron';
-import { UpdateChannelClient } from 'vs/platform/update/common/updateIpc';
+import { UpdateChannelClient } from 'vs/platform/update/node/updateIpc';
 import { IUpdateService } from 'vs/platform/update/common/update';
-import { URLHandlerChannel, URLServiceChannelClient } from 'vs/platform/url/common/urlIpc';
+import { URLHandlerChannel, URLServiceChannelClient } from 'vs/platform/url/node/urlIpc';
 import { IURLService } from 'vs/platform/url/common/url';
-import { WorkspacesChannelClient } from 'vs/platform/workspaces/common/workspacesIpc';
-import { IWorkspacesService } from 'vs/platform/workspaces/common/workspaces';
+import { WorkspacesChannelClient } from 'vs/platform/workspaces/node/workspacesIpc';
+import { IWorkspacesService, ISingleFolderWorkspaceIdentifier } from 'vs/platform/workspaces/common/workspaces';
 import { createSpdLogService } from 'vs/platform/log/node/spdlogService';
 import * as fs from 'fs';
 import { ConsoleLogService, MultiplexLogService, ILogService } from 'vs/platform/log/common/log';
-import { IssueChannelClient } from 'vs/platform/issue/common/issueIpc';
+import { IssueChannelClient } from 'vs/platform/issue/node/issueIpc';
 import { IIssueService } from 'vs/platform/issue/common/issue';
-import { LogLevelSetterChannelClient, FollowerLogService } from 'vs/platform/log/common/logIpc';
+import { LogLevelSetterChannelClient, FollowerLogService } from 'vs/platform/log/node/logIpc';
 import { RelayURLService } from 'vs/platform/url/common/urlService';
+import { MenubarChannelClient } from 'vs/platform/menubar/node/menubarIpc';
+import { IMenubarService } from 'vs/platform/menubar/common/menubar';
+import { Schemas } from 'vs/base/common/network';
+import { sanitizeFilePath } from 'vs/base/node/extfs';
 
 gracefulFs.gracefulify(fs); // enable gracefulFs
 
 export function startup(configuration: IWindowConfiguration): TPromise<void> {
 
+	revive(configuration);
+
+	perf.importEntries(configuration.perfEntries);
+
 	// Ensure others can listen to zoom level changes
 	browser.setZoomFactor(webFrame.getZoomFactor());
 
@@ -72,6 +76,22 @@ export function startup(configuration: IWindowConfiguration): TPromise<void> {
 	return openWorkbench(configuration);
 }
 
+function revive(workbench: IWindowConfiguration) {
+	if (workbench.folderUri) {
+		workbench.folderUri = uri.revive(workbench.folderUri);
+	}
+	const filesToWaitPaths = workbench.filesToWait && workbench.filesToWait.paths;
+	[filesToWaitPaths, workbench.filesToOpen, workbench.filesToCreate, workbench.filesToDiff].forEach(paths => {
+		if (Array.isArray(paths)) {
+			paths.forEach(path => {
+				if (path.fileUri) {
+					path.fileUri = uri.revive(path.fileUri);
+				}
+			});
+		}
+	});
+}
+
 function openWorkbench(configuration: IWindowConfiguration): TPromise<void> {
 	const mainProcessClient = new ElectronIPCClient(`window:${configuration.windowId}`);
 	const mainServices = createMainProcessServices(mainProcessClient, configuration);
@@ -83,7 +103,6 @@ function openWorkbench(configuration: IWindowConfiguration): TPromise<void> {
 	// Since the configuration service is one of the core services that is used in so many places, we initialize it
 	// right before startup of the workbench shell to have its data ready for consumers
 	return createAndInitializeWorkspaceService(configuration, environmentService).then(workspaceService => {
-		const timerService = new TimerService((<any>window).MonacoEnvironment.timers as IInitData, workspaceService.getWorkbenchState() === WorkbenchState.EMPTY);
 		const storageService = createStorageService(workspaceService, environmentService);
 
 		return domContentLoaded().then(() => {
@@ -95,7 +114,6 @@ function openWorkbench(configuration: IWindowConfiguration): TPromise<void> {
 				configurationService: workspaceService,
 				environmentService,
 				logService,
-				timerService,
 				storageService
 			}, mainServices, mainProcessClient, configuration);
 			shell.open();
@@ -104,7 +122,7 @@ function openWorkbench(configuration: IWindowConfiguration): TPromise<void> {
 			(<any>self).require.config({
 				onError: (err: any) => {
 					if (err.errorCode === 'load') {
-						shell.onUnexpectedError(loaderError(err));
+						shell.onUnexpectedError(new Error(nls.localize('loaderErrorNative', "Failed to load a required file. Please restart the application to try again. Details: {0}", JSON.stringify(err))));
 					}
 				}
 			});
@@ -113,44 +131,30 @@ function openWorkbench(configuration: IWindowConfiguration): TPromise<void> {
 }
 
 function createAndInitializeWorkspaceService(configuration: IWindowConfiguration, environmentService: EnvironmentService): TPromise<WorkspaceService> {
-	return validateSingleFolderPath(configuration).then(() => {
+	return validateFolderUri(configuration.folderUri, configuration.verbose).then(validatedFolderUri => {
+
 		const workspaceService = new WorkspaceService(environmentService);
 
-		return workspaceService.initialize(configuration.workspace || configuration.folderPath || configuration).then(() => workspaceService, error => workspaceService);
+		return workspaceService.initialize(configuration.workspace || validatedFolderUri || configuration).then(() => workspaceService, error => workspaceService);
 	});
 }
 
-function validateSingleFolderPath(configuration: IWindowConfiguration): TPromise<void> {
+function validateFolderUri(folderUri: ISingleFolderWorkspaceIdentifier, verbose: boolean): TPromise<uri> {
 
-	// Return early if we do not have a single folder path
-	if (!configuration.folderPath) {
-		return TPromise.as(void 0);
+	// Return early if we do not have a single folder uri or if it is a non file uri
+	if (!folderUri || folderUri.scheme !== Schemas.file) {
+		return TPromise.as(folderUri);
 	}
 
-	// Otherwise: use realpath to resolve symbolic links to the truth
-	return realpath(configuration.folderPath).then(realFolderPath => {
-
-		// For some weird reason, node adds a trailing slash to UNC paths
-		// we never ever want trailing slashes as our workspace path unless
-		// someone opens root ("/").
-		// See also https://github.com/nodejs/io.js/issues/1765
-		if (paths.isUNC(realFolderPath) && strings.endsWith(realFolderPath, paths.nativeSep)) {
-			realFolderPath = strings.rtrim(realFolderPath, paths.nativeSep);
-		}
-
-		return realFolderPath;
-	}, error => {
-		if (configuration.verbose) {
+	// Ensure absolute existing folder path
+	const sanitizedFolderPath = sanitizeFilePath(folderUri.fsPath, process.env['VSCODE_CWD'] || process.cwd());
+	return stat(sanitizedFolderPath).then(stat => uri.file(sanitizedFolderPath), error => {
+		if (verbose) {
 			errors.onUnexpectedError(error);
 		}
 
 		// Treat any error case as empty workbench case (no folder path)
 		return null;
-
-	}).then(realFolderPathOrNull => {
-
-		// Update config with real path if we have one
-		configuration.folderPath = realFolderPathOrNull;
 	});
 }
 
@@ -190,10 +194,7 @@ function createStorageService(workspaceService: IWorkspaceContextService, enviro
 	if (disableStorage) {
 		storage = inMemoryLocalStorageInstance;
 	} else {
-		// TODO@Ben remove me after a while
-		perf.mark('willAccessLocalStorage');
 		storage = window.localStorage;
-		perf.mark('didAccessLocalStorage');
 	}
 
 	return new StorageService(storage, storage, workspaceId, secondaryWorkspaceId);
@@ -227,16 +228,11 @@ function createMainProcessServices(mainProcessClient: ElectronIPCClient, configu
 	const issueChannel = mainProcessClient.getChannel('issue');
 	serviceCollection.set(IIssueService, new SyncDescriptor(IssueChannelClient, issueChannel));
 
+	const menubarChannel = mainProcessClient.getChannel('menubar');
+	serviceCollection.set(IMenubarService, new SyncDescriptor(MenubarChannelClient, menubarChannel));
+
 	const workspacesChannel = mainProcessClient.getChannel('workspaces');
 	serviceCollection.set(IWorkspacesService, new WorkspacesChannelClient(workspacesChannel));
 
 	return serviceCollection;
-}
-
-function loaderError(err: Error): Error {
-	if (platform.isWeb) {
-		return new Error(nls.localize('loaderError', "Failed to load a required file. Either you are no longer connected to the internet or the server you are connected to is offline. Please refresh the browser to try again."));
-	}
-
-	return new Error(nls.localize('loaderErrorNative', "Failed to load a required file. Please restart the application to try again. Details: {0}", JSON.stringify(err)));
-}
+}
\ No newline at end of file
diff --git a/src/vs/workbench/electron-browser/media/shell.css b/src/vs/workbench/electron-browser/media/shell.css
index 2d3ce109261..306a4b4e6db 100644
--- a/src/vs/workbench/electron-browser/media/shell.css
+++ b/src/vs/workbench/electron-browser/media/shell.css
@@ -15,11 +15,16 @@
 
 /* Font Families (with CJK support) */
 
-.monaco-shell { font-family: -apple-system, BlinkMacSystemFont, "Segoe WPC", "Segoe UI", "HelveticaNeue-Light", "Ubuntu", "Droid Sans", sans-serif; }
-.monaco-shell:lang(zh-Hans) { font-family: -apple-system, BlinkMacSystemFont, "Segoe WPC", "Segoe UI", "HelveticaNeue-Light", "Noto Sans", "Microsoft YaHei", "PingFang SC", "Hiragino Sans GB", "Source Han Sans SC", "Source Han Sans CN", "Source Han Sans", sans-serif; }
-.monaco-shell:lang(zh-Hant) { font-family: -apple-system, BlinkMacSystemFont, "Segoe WPC", "Segoe UI", "HelveticaNeue-Light", "Noto Sans", "Microsoft Jhenghei", "PingFang TC", "Source Han Sans TC", "Source Han Sans", "Source Han Sans TW", sans-serif; }
-.monaco-shell:lang(ja) { font-family: -apple-system, BlinkMacSystemFont, "Segoe WPC", "Segoe UI", "HelveticaNeue-Light", "Noto Sans", "Meiryo", "Hiragino Kaku Gothic Pro", "Source Han Sans J", "Source Han Sans JP", "Source Han Sans", "Sazanami Gothic", "IPA Gothic", sans-serif; }
-.monaco-shell:lang(ko) { font-family: -apple-system, BlinkMacSystemFont, "Segoe WPC", "Segoe UI", "HelveticaNeue-Light", "Noto Sans", "Malgun Gothic", "Nanum Gothic", "Dotom", "Apple SD Gothic Neo", "AppleGothic", "Source Han Sans K", "Source Han Sans JR", "Source Han Sans", "UnDotum", "FBaekmuk Gulim", sans-serif; }
+.monaco-shell,
+.monaco-shell .monaco-menu-container .monaco-menu { font-family: -apple-system, BlinkMacSystemFont, "Segoe WPC", "Segoe UI", "HelveticaNeue-Light", "Ubuntu", "Droid Sans", sans-serif; }
+.monaco-shell:lang(zh-Hans),
+.monaco-shell:lang(zh-Hans) .monaco-menu-container .monaco-menu { font-family: -apple-system, BlinkMacSystemFont, "Segoe WPC", "Segoe UI", "HelveticaNeue-Light", "Noto Sans", "Microsoft YaHei", "PingFang SC", "Hiragino Sans GB", "Source Han Sans SC", "Source Han Sans CN", "Source Han Sans", sans-serif; }
+.monaco-shell:lang(zh-Hant),
+.monaco-shell:lang(zh-Hant) .monaco-menu-container .monaco-menu { font-family: -apple-system, BlinkMacSystemFont, "Segoe WPC", "Segoe UI", "HelveticaNeue-Light", "Noto Sans", "Microsoft Jhenghei", "PingFang TC", "Source Han Sans TC", "Source Han Sans", "Source Han Sans TW", sans-serif; }
+.monaco-shell:lang(ja),
+.monaco-shell:lang(ja) .monaco-menu-container .monaco-menu { font-family: -apple-system, BlinkMacSystemFont, "Segoe WPC", "Segoe UI", "HelveticaNeue-Light", "Noto Sans", "Meiryo", "Hiragino Kaku Gothic Pro", "Source Han Sans J", "Source Han Sans JP", "Source Han Sans", "Sazanami Gothic", "IPA Gothic", sans-serif; }
+.monaco-shell:lang(ko),
+.monaco-shell:lang(ko) .monaco-menu-container .monaco-menu { font-family: -apple-system, BlinkMacSystemFont, "Segoe WPC", "Segoe UI", "HelveticaNeue-Light", "Noto Sans", "Malgun Gothic", "Nanum Gothic", "Dotom", "Apple SD Gothic Neo", "AppleGothic", "Source Han Sans K", "Source Han Sans JR", "Source Han Sans", "UnDotum", "FBaekmuk Gulim", sans-serif; }
 
 @keyframes fadeIn { from { opacity: 0; } to { opacity: 1; } }
 
@@ -65,6 +70,40 @@
 	cursor: pointer;
 }
 
+.monaco-shell .monaco-menu .monaco-action-bar.vertical {
+	padding: .5em 0;
+}
+
+.monaco-shell .monaco-menu .monaco-action-bar.vertical .action-menu-item {
+	height: 1.8em;
+}
+
+.monaco-shell .monaco-menu .monaco-action-bar.vertical .action-label:not(.separator),
+.monaco-shell .monaco-menu .monaco-action-bar.vertical .keybinding {
+	font-size: inherit;
+	padding: 0 2em;
+}
+
+.monaco-shell .monaco-menu .monaco-action-bar.vertical .menu-item-check {
+	font-size: inherit;
+	width: 2em;
+}
+
+.monaco-shell .monaco-menu .monaco-action-bar.vertical .action-label.separator {
+	font-size: inherit;
+	padding: 0.2em 0 0 0;
+	margin-bottom: 0.2em;
+}
+
+.monaco-shell .monaco-menu .monaco-action-bar.vertical .submenu-indicator {
+	font-size: 60%;
+	padding: 0 1.8em;
+}
+
+.monaco-shell .monaco-menu .action-item {
+	cursor: default;
+}
+
 /* START Keyboard Focus Indication Styles */
 
 .monaco-shell [tabindex="0"]:focus,
@@ -85,7 +124,6 @@
 .monaco-shell input[type="button"]:active,
 .monaco-shell input[type="checkbox"]:active,
 .monaco-shell .monaco-tree .monaco-tree-row
-.monaco-action-bar .action-item [tabindex="0"]:hover,
 .monaco-shell .monaco-tree.focused.no-focused-item:active:before {
 	outline: 0 !important; /* fixes some flashing outlines from showing up when clicking */
 }
@@ -94,8 +132,6 @@
 	border: none; /* outline is a square, but border has a radius, so we avoid this glitch when focused (https://github.com/Microsoft/vscode/issues/26045) */
 }
 
-
-
 .monaco-shell .monaco-tree.focused .monaco-tree-row.focused [tabindex="0"]:focus {
 	outline-width: 1px; /* higher contrast color for focusable elements in a row that shows focus feedback */
 	outline-style: solid;
diff --git a/src/vs/workbench/electron-browser/media/workbench.css b/src/vs/workbench/electron-browser/media/workbench.css
index 0968fc3040e..28c4a57c000 100644
--- a/src/vs/workbench/electron-browser/media/workbench.css
+++ b/src/vs/workbench/electron-browser/media/workbench.css
@@ -3,10 +3,6 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-.monaco-workbench-container {
-	position: absolute;
-}
-
 .monaco-workbench {
 	font-size: 13px;
 	line-height: 1.4em;
diff --git a/src/vs/workbench/electron-browser/resources.ts b/src/vs/workbench/electron-browser/resources.ts
index fce07d4794d..fe28a4b3267 100644
--- a/src/vs/workbench/electron-browser/resources.ts
+++ b/src/vs/workbench/electron-browser/resources.ts
@@ -5,22 +5,23 @@
 
 'use strict';
 
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import * as objects from 'vs/base/common/objects';
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
+import { Disposable } from 'vs/base/common/lifecycle';
 import { Event, Emitter } from 'vs/base/common/event';
 import { IConfigurationService, IConfigurationChangeEvent } from 'vs/platform/configuration/common/configuration';
 import { ParsedExpression, IExpression, parse } from 'vs/base/common/glob';
 import { relative } from 'path';
 import { normalize } from 'vs/base/common/paths';
 
-export class ResourceGlobMatcher {
+export class ResourceGlobMatcher extends Disposable {
 
 	private static readonly NO_ROOT: string = null;
 
-	private readonly _onExpressionChange: Emitter<void>;
-	private toUnbind: IDisposable[];
+	private readonly _onExpressionChange: Emitter<void> = this._register(new Emitter<void>());
+	get onExpressionChange(): Event<void> { return this._onExpressionChange.event; }
+
 	private mapRootToParsedExpression: Map<string, ParsedExpression>;
 	private mapRootToExpressionConfig: Map<string, IExpression>;
 
@@ -30,30 +31,24 @@ export class ResourceGlobMatcher {
 		@IWorkspaceContextService private contextService: IWorkspaceContextService,
 		@IConfigurationService private configurationService: IConfigurationService
 	) {
-		this.toUnbind = [];
+		super();
 
 		this.mapRootToParsedExpression = new Map<string, ParsedExpression>();
 		this.mapRootToExpressionConfig = new Map<string, IExpression>();
 
-		this._onExpressionChange = new Emitter<void>();
-		this.toUnbind.push(this._onExpressionChange);
-
 		this.updateExcludes(false);
 
 		this.registerListeners();
 	}
 
-	public get onExpressionChange(): Event<void> {
-		return this._onExpressionChange.event;
-	}
-
 	private registerListeners(): void {
-		this.toUnbind.push(this.configurationService.onDidChangeConfiguration(e => {
+		this._register(this.configurationService.onDidChangeConfiguration(e => {
 			if (this.shouldUpdate(e)) {
 				this.updateExcludes(true);
 			}
 		}));
-		this.toUnbind.push(this.contextService.onDidChangeWorkspaceFolders(() => this.updateExcludes(true)));
+
+		this._register(this.contextService.onDidChangeWorkspaceFolders(() => this.updateExcludes(true)));
 	}
 
 	private updateExcludes(fromEvent: boolean): void {
@@ -98,7 +93,7 @@ export class ResourceGlobMatcher {
 		}
 	}
 
-	public matches(resource: URI): boolean {
+	matches(resource: URI): boolean {
 		const folder = this.contextService.getWorkspaceFolder(resource);
 
 		let expressionForRoot: ParsedExpression;
@@ -121,8 +116,4 @@ export class ResourceGlobMatcher {
 
 		return !!expressionForRoot(resourcePathToMatch);
 	}
-
-	public dispose(): void {
-		this.toUnbind = dispose(this.toUnbind);
-	}
 }
\ No newline at end of file
diff --git a/src/vs/workbench/electron-browser/shell.ts b/src/vs/workbench/electron-browser/shell.ts
index 975def9b462..4f87c195ef7 100644
--- a/src/vs/workbench/electron-browser/shell.ts
+++ b/src/vs/workbench/electron-browser/shell.ts
@@ -10,18 +10,16 @@ import 'vs/css!./media/shell';
 import * as platform from 'vs/base/common/platform';
 import * as perf from 'vs/base/common/performance';
 import * as aria from 'vs/base/browser/ui/aria/aria';
-import { dispose, IDisposable } from 'vs/base/common/lifecycle';
+import { Disposable, toDisposable } from 'vs/base/common/lifecycle';
 import * as errors from 'vs/base/common/errors';
 import { toErrorMessage } from 'vs/base/common/errorMessage';
 import product from 'vs/platform/node/product';
 import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
 import pkg from 'vs/platform/node/package';
-import { ContextViewService } from 'vs/platform/contextview/browser/contextViewService';
 import { Workbench, IWorkbenchStartedInfo } from 'vs/workbench/electron-browser/workbench';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { NullTelemetryService, configurationTelemetry } from 'vs/platform/telemetry/common/telemetryUtils';
-import { IExperimentService, ExperimentService } from 'vs/platform/telemetry/common/experiments';
-import { ITelemetryAppenderChannel, TelemetryAppenderClient } from 'vs/platform/telemetry/common/telemetryIpc';
+import { NullTelemetryService, configurationTelemetry, combinedAppender, LogAppender } from 'vs/platform/telemetry/common/telemetryUtils';
+import { ITelemetryAppenderChannel, TelemetryAppenderClient } from 'vs/platform/telemetry/node/telemetryIpc';
 import { TelemetryService, ITelemetryServiceConfig } from 'vs/platform/telemetry/common/telemetryService';
 import ErrorTelemetry from 'vs/platform/telemetry/browser/errorTelemetry';
 import { ElectronWindow } from 'vs/workbench/electron-browser/window';
@@ -47,7 +45,6 @@ import { IStorageService } from 'vs/platform/storage/common/storage';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
 import { InstantiationService } from 'vs/platform/instantiation/common/instantiationService';
-import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
 import { ILifecycleService, LifecyclePhase, ShutdownReason, StartupKind } from 'vs/platform/lifecycle/common/lifecycle';
 import { IMarkerService } from 'vs/platform/markers/common/markers';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
@@ -60,12 +57,11 @@ import { WorkbenchModeServiceImpl } from 'vs/workbench/services/mode/common/work
 import { IModeService } from 'vs/editor/common/services/modeService';
 import { IUntitledEditorService, UntitledEditorService } from 'vs/workbench/services/untitled/common/untitledEditorService';
 import { ICrashReporterService, NullCrashReporterService, CrashReporterService } from 'vs/workbench/services/crashReporter/electron-browser/crashReporterService';
-import { getDelayedChannel, IPCClient } from 'vs/base/parts/ipc/common/ipc';
+import { getDelayedChannel, IPCClient } from 'vs/base/parts/ipc/node/ipc';
 import { connect as connectNet } from 'vs/base/parts/ipc/node/ipc.net';
-import { IExtensionManagementChannel, ExtensionManagementChannelClient } from 'vs/platform/extensionManagement/common/extensionManagementIpc';
-import { IExtensionManagementService, IExtensionEnablementService } from 'vs/platform/extensionManagement/common/extensionManagement';
+import { IExtensionManagementChannel, ExtensionManagementChannelClient } from 'vs/platform/extensionManagement/node/extensionManagementIpc';
+import { IExtensionManagementService, IExtensionEnablementService, IExtensionManagementServerService, IExtensionGalleryService } from 'vs/platform/extensionManagement/common/extensionManagement';
 import { ExtensionEnablementService } from 'vs/platform/extensionManagement/common/extensionEnablementService';
-import { ITimerService } from 'vs/workbench/services/timer/common/timerService';
 import { BareFontInfo } from 'vs/editor/common/config/fontInfo';
 import { restoreFontInfo, readFontInfo, saveFontInfo } from 'vs/editor/browser/config/configuration';
 import * as browser from 'vs/base/browser/browser';
@@ -84,7 +80,7 @@ import { ILogService } from 'vs/platform/log/common/log';
 import { WORKBENCH_BACKGROUND } from 'vs/workbench/common/theme';
 import { stat } from 'fs';
 import { join } from 'path';
-import { ILocalizationsChannel, LocalizationsChannelClient } from 'vs/platform/localizations/common/localizationsIpc';
+import { ILocalizationsChannel, LocalizationsChannelClient } from 'vs/platform/localizations/node/localizationsIpc';
 import { ILocalizationsService } from 'vs/platform/localizations/common/localizations';
 import { IWorkbenchIssueService } from 'vs/workbench/services/issue/common/issue';
 import { WorkbenchIssueService } from 'vs/workbench/services/issue/electron-browser/workbenchIssueService';
@@ -92,11 +88,17 @@ import { INotificationService } from 'vs/platform/notification/common/notificati
 import { NotificationService } from 'vs/workbench/services/notification/common/notificationService';
 import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
 import { DialogService } from 'vs/workbench/services/dialogs/electron-browser/dialogService';
-import { DialogChannel } from 'vs/platform/dialogs/common/dialogIpc';
-import { EventType, addDisposableListener, addClass, getClientArea } from 'vs/base/browser/dom';
+import { DialogChannel } from 'vs/platform/dialogs/node/dialogIpc';
+import { EventType, addDisposableListener, addClass } from 'vs/base/browser/dom';
 import { IOpenerService } from 'vs/platform/opener/common/opener';
 import { OpenerService } from 'vs/editor/browser/services/openerService';
 import { SearchHistoryService } from 'vs/workbench/services/search/node/searchHistoryService';
+import { MulitExtensionManagementService } from 'vs/platform/extensionManagement/node/multiExtensionManagement';
+import { ExtensionManagementServerService } from 'vs/workbench/services/extensions/node/extensionManagementServerService';
+import { DownloadServiceChannel } from 'vs/platform/download/node/downloadIpc';
+import { DefaultURITransformer } from 'vs/base/common/uriIpc';
+import { ExtensionGalleryService } from 'vs/platform/extensionManagement/node/extensionGalleryService';
+import { ILabelService } from 'vs/platform/label/common/label';
 
 /**
  * Services that we require for the Shell
@@ -106,7 +108,6 @@ export interface ICoreServices {
 	configurationService: IConfigurationService;
 	environmentService: IEnvironmentService;
 	logService: ILogService;
-	timerService: ITimerService;
 	storageService: IStorageService;
 }
 
@@ -114,34 +115,31 @@ export interface ICoreServices {
  * The workbench shell contains the workbench with a rich header containing navigation and the activity bar.
  * With the Shell being the top level element in the page, it is also responsible for driving the layouting.
  */
-export class WorkbenchShell {
+export class WorkbenchShell extends Disposable {
 	private storageService: IStorageService;
 	private environmentService: IEnvironmentService;
+	private labelService: ILabelService;
 	private logService: ILogService;
-	private contextViewService: ContextViewService;
 	private configurationService: IConfigurationService;
 	private contextService: IWorkspaceContextService;
 	private telemetryService: ITelemetryService;
-	private experimentService: IExperimentService;
 	private extensionService: ExtensionService;
 	private broadcastService: IBroadcastService;
-	private timerService: ITimerService;
 	private themeService: WorkbenchThemeService;
 	private lifecycleService: LifecycleService;
 	private mainProcessServices: ServiceCollection;
 	private notificationService: INotificationService;
 
 	private container: HTMLElement;
-	private toUnbind: IDisposable[];
 	private previousErrorValue: string;
 	private previousErrorTime: number;
-	private content: HTMLElement;
-	private contentsContainer: HTMLElement;
 
 	private configuration: IWindowConfiguration;
 	private workbench: Workbench;
 
 	constructor(container: HTMLElement, coreServices: ICoreServices, mainProcessServices: ServiceCollection, private mainProcessClient: IPCClient, configuration: IWindowConfiguration) {
+		super();
+
 		this.container = container;
 
 		this.configuration = configuration;
@@ -150,32 +148,26 @@ export class WorkbenchShell {
 		this.configurationService = coreServices.configurationService;
 		this.environmentService = coreServices.environmentService;
 		this.logService = coreServices.logService;
-		this.timerService = coreServices.timerService;
 		this.storageService = coreServices.storageService;
 
 		this.mainProcessServices = mainProcessServices;
 
-		this.toUnbind = [];
 		this.previousErrorTime = 0;
 	}
 
-	private createContents(parent: HTMLElement): HTMLElement {
+	private renderContents(): void {
 
 		// ARIA
 		aria.setARIAContainer(document.body);
 
-		// Workbench Container
-		const workbenchContainer = document.createElement('div');
-		parent.appendChild(workbenchContainer);
-
 		// Instantiation service with services
-		const [instantiationService, serviceCollection] = this.initServiceCollection(parent);
+		const [instantiationService, serviceCollection] = this.initServiceCollection(this.container);
 
 		// Workbench
-		this.workbench = this.createWorkbench(instantiationService, serviceCollection, parent, workbenchContainer);
+		this.workbench = this.createWorkbench(instantiationService, serviceCollection, this.container);
 
 		// Window
-		this.workbench.getInstantiationService().createInstance(ElectronWindow, this.container);
+		this.workbench.getInstantiationService().createInstance(ElectronWindow);
 
 		// Handle case where workbench is not starting up properly
 		const timeoutHandle = setTimeout(() => {
@@ -185,19 +177,27 @@ export class WorkbenchShell {
 		this.lifecycleService.when(LifecyclePhase.Running).then(() => {
 			clearTimeout(timeoutHandle);
 		});
-
-		return workbenchContainer;
 	}
 
-	private createWorkbench(instantiationService: IInstantiationService, serviceCollection: ServiceCollection, parent: HTMLElement, workbenchContainer: HTMLElement): Workbench {
+	private createWorkbench(instantiationService: IInstantiationService, serviceCollection: ServiceCollection, container: HTMLElement): Workbench {
+
+		function handleStartupError(logService: ILogService, error: Error): void {
+
+			// Log it
+			logService.error(toErrorMessage(error, true));
+
+			// Rethrow
+			throw error;
+		}
+
 		try {
-			const workbench = instantiationService.createInstance(Workbench, parent, workbenchContainer, this.configuration, serviceCollection, this.lifecycleService, this.mainProcessClient);
+			const workbench = instantiationService.createInstance(Workbench, container, this.configuration, serviceCollection, this.lifecycleService, this.mainProcessClient);
 
 			// Set lifecycle phase to `Restoring`
 			this.lifecycleService.phase = LifecyclePhase.Restoring;
 
 			// Startup Workbench
-			workbench.startup().done(startupInfos => {
+			workbench.startup().then(startupInfos => {
 
 				// Set lifecycle phase to `Runnning` so that other contributions can now do something
 				this.lifecycleService.phase = LifecyclePhase.Running;
@@ -210,28 +210,24 @@ export class WorkbenchShell {
 					eventuallPhaseTimeoutHandle = void 0;
 					this.lifecycleService.phase = LifecyclePhase.Eventually;
 				}, 3000);
-				this.toUnbind.push({
-					dispose: () => {
-						if (eventuallPhaseTimeoutHandle) {
-							clearTimeout(eventuallPhaseTimeoutHandle);
-						}
+
+				this._register(toDisposable(() => {
+					if (eventuallPhaseTimeoutHandle) {
+						clearTimeout(eventuallPhaseTimeoutHandle);
 					}
-				});
+				}));
 
 				// localStorage metrics (TODO@Ben remove me later)
 				if (!this.environmentService.extensionTestsPath && this.contextService.getWorkbenchState() === WorkbenchState.FOLDER) {
 					this.logLocalStorageMetrics();
 				}
-			});
+			}, error => handleStartupError(this.logService, error));
 
 			return workbench;
 		} catch (error) {
+			handleStartupError(this.logService, error);
 
-			// Log it
-			this.logService.error(toErrorMessage(error, true));
-
-			// Rethrow
-			throw error;
+			return void 0;
 		}
 	}
 
@@ -251,7 +247,6 @@ export class WorkbenchShell {
 				"customKeybindingsCount": { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
 				"theme": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
 				"language": { "classification": "SystemMetaData", "purpose": "BusinessInsight" },
-				"experiments": { "${inline}": [ "${IExperiments}" ] },
 				"pinnedViewlets": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
 				"restoredViewlet": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
 				"restoredEditors": { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
@@ -269,7 +264,6 @@ export class WorkbenchShell {
 			customKeybindingsCount: info.customKeybindingsCount,
 			theme: this.themeService.getColorTheme().id,
 			language: platform.language,
-			experiments: this.experimentService.getExperiments(),
 			pinnedViewlets: info.pinnedViewlets,
 			restoredViewlet: info.restoredViewlet,
 			restoredEditors: info.restoredEditorsCount,
@@ -332,10 +326,9 @@ export class WorkbenchShell {
 		serviceCollection.set(IWorkspaceContextService, this.contextService);
 		serviceCollection.set(IConfigurationService, this.configurationService);
 		serviceCollection.set(IEnvironmentService, this.environmentService);
-		serviceCollection.set(ILogService, this.logService);
-		this.toUnbind.push(this.logService);
+		serviceCollection.set(ILabelService, this.labelService);
+		serviceCollection.set(ILogService, this._register(this.logService));
 
-		serviceCollection.set(ITimerService, this.timerService);
 		serviceCollection.set(IStorageService, this.storageService);
 		this.mainProcessServices.forEach((serviceIdentifier, serviceInstance) => {
 			serviceCollection.set(serviceIdentifier, serviceInstance);
@@ -354,8 +347,10 @@ export class WorkbenchShell {
 		const sharedProcess = (<IWindowsService>serviceCollection.get(IWindowsService)).whenSharedProcessReady()
 			.then(() => connectNet(this.environmentService.sharedIPCHandle, `window:${this.configuration.windowId}`));
 
-		sharedProcess
-			.done(client => client.registerChannel('dialog', instantiationService.createInstance(DialogChannel)));
+		sharedProcess.then(client => {
+			client.registerChannel('download', new DownloadServiceChannel());
+			client.registerChannel('dialog', instantiationService.createInstance(DialogChannel));
+		});
 
 		// Warm up font cache information before building up too many dom elements
 		restoreFontInfo(this.storageService);
@@ -364,34 +359,24 @@ export class WorkbenchShell {
 		// Hash
 		serviceCollection.set(IHashService, new SyncDescriptor(HashService));
 
-		// Experiments
-		this.experimentService = instantiationService.createInstance(ExperimentService);
-		serviceCollection.set(IExperimentService, this.experimentService);
-
 		// Telemetry
-		if (this.environmentService.isBuilt && !this.environmentService.isExtensionDevelopment && !this.environmentService.args['disable-telemetry'] && !!product.enableTelemetry) {
-			const channel = getDelayedChannel<ITelemetryAppenderChannel>(sharedProcess.then(c => c.getChannel('telemetryAppender')));
-			const commit = product.commit;
-			const version = pkg.version;
 
+		if (!this.environmentService.isExtensionDevelopment && !this.environmentService.args['disable-telemetry'] && !!product.enableTelemetry) {
+			const channel = getDelayedChannel<ITelemetryAppenderChannel>(sharedProcess.then(c => c.getChannel('telemetryAppender')));
 			const config: ITelemetryServiceConfig = {
-				appender: new TelemetryAppenderClient(channel),
-				commonProperties: resolveWorkbenchCommonProperties(this.storageService, commit, version, this.configuration.machineId, this.environmentService.installSourcePath),
+				appender: combinedAppender(new TelemetryAppenderClient(channel), new LogAppender(this.logService)),
+				commonProperties: resolveWorkbenchCommonProperties(this.storageService, product.commit, pkg.version, this.configuration.machineId, this.environmentService.installSourcePath),
 				piiPaths: [this.environmentService.appRoot, this.environmentService.extensionsPath]
 			};
 
-			const telemetryService = instantiationService.createInstance(TelemetryService, config);
-			this.telemetryService = telemetryService;
-
-			const errorTelemetry = new ErrorTelemetry(telemetryService);
-
-			this.toUnbind.push(telemetryService, errorTelemetry);
+			this.telemetryService = this._register(instantiationService.createInstance(TelemetryService, config));
+			this._register(new ErrorTelemetry(this.telemetryService));
 		} else {
 			this.telemetryService = NullTelemetryService;
 		}
 
 		serviceCollection.set(ITelemetryService, this.telemetryService);
-		this.toUnbind.push(configurationTelemetry(this.telemetryService, this.configurationService));
+		this._register(configurationTelemetry(this.telemetryService, this.configurationService));
 
 		let crashReporterService = NullCrashReporterService;
 		if (!this.environmentService.disableCrashReporter && product.crashReporter && product.hockeyApp) {
@@ -402,35 +387,33 @@ export class WorkbenchShell {
 		serviceCollection.set(IDialogService, instantiationService.createInstance(DialogService));
 
 		const lifecycleService = instantiationService.createInstance(LifecycleService);
-		this.toUnbind.push(lifecycleService.onShutdown(reason => this.dispose(reason)));
+		this._register(lifecycleService.onShutdown(reason => this.dispose(reason)));
 		serviceCollection.set(ILifecycleService, lifecycleService);
 		this.lifecycleService = lifecycleService;
 
-		const extensionManagementChannel = getDelayedChannel<IExtensionManagementChannel>(sharedProcess.then(c => c.getChannel('extensions')));
-		serviceCollection.set(IExtensionManagementService, new SyncDescriptor(ExtensionManagementChannelClient, extensionManagementChannel));
-
-		const extensionEnablementService = instantiationService.createInstance(ExtensionEnablementService);
-		serviceCollection.set(IExtensionEnablementService, extensionEnablementService);
-		this.toUnbind.push(extensionEnablementService);
-
 		serviceCollection.set(IRequestService, new SyncDescriptor(RequestService));
+		serviceCollection.set(IExtensionGalleryService, new SyncDescriptor(ExtensionGalleryService));
+
+		const extensionManagementChannel = getDelayedChannel<IExtensionManagementChannel>(sharedProcess.then(c => c.getChannel('extensions')));
+		const extensionManagementChannelClient = new ExtensionManagementChannelClient(extensionManagementChannel, DefaultURITransformer);
+		serviceCollection.set(IExtensionManagementServerService, new SyncDescriptor(ExtensionManagementServerService, extensionManagementChannelClient));
+		serviceCollection.set(IExtensionManagementService, new SyncDescriptor(MulitExtensionManagementService));
+
+		const extensionEnablementService = this._register(instantiationService.createInstance(ExtensionEnablementService));
+		serviceCollection.set(IExtensionEnablementService, extensionEnablementService);
+
 
 		this.extensionService = instantiationService.createInstance(ExtensionService);
 		serviceCollection.set(IExtensionService, this.extensionService);
 
 		perf.mark('willLoadExtensions');
-		this.extensionService.whenInstalledExtensionsRegistered().done(() => {
-			perf.mark('didLoadExtensions');
-		});
+		this.extensionService.whenInstalledExtensionsRegistered().then(() => perf.mark('didLoadExtensions'));
 
 		this.themeService = instantiationService.createInstance(WorkbenchThemeService, document.body);
 		serviceCollection.set(IWorkbenchThemeService, this.themeService);
 
 		serviceCollection.set(ICommandService, new SyncDescriptor(CommandService));
 
-		this.contextViewService = instantiationService.createInstance(ContextViewService, this.container);
-		serviceCollection.set(IContextViewService, this.contextViewService);
-
 		serviceCollection.set(IMarkerService, new SyncDescriptor(MarkerService));
 
 		serviceCollection.set(IModeService, new SyncDescriptor(WorkbenchModeServiceImpl));
@@ -463,7 +446,17 @@ export class WorkbenchShell {
 		return [instantiationService, serviceCollection];
 	}
 
-	public open(): void {
+	open(): void {
+
+		// Listen on unhandled rejection events
+		window.addEventListener('unhandledrejection', (event: PromiseRejectionEvent) => {
+
+			// See https://developer.mozilla.org/en-US/docs/Web/API/PromiseRejectionEvent
+			errors.onUnexpectedError(event.reason);
+
+			// Prevent the printing of this event to the console
+			event.preventDefault();
+		});
 
 		// Listen on unexpected errors
 		errors.setUnexpectedErrorHandler((error: any) => {
@@ -473,13 +466,8 @@ export class WorkbenchShell {
 		// Shell Class for CSS Scoping
 		addClass(this.container, 'monaco-shell');
 
-		// Controls
-		this.content = document.createElement('div');
-		addClass(this.content, 'monaco-shell-content');
-		this.container.appendChild(this.content);
-
 		// Create Contents
-		this.contentsContainer = this.createContents(this.content);
+		this.renderContents();
 
 		// Layout
 		this.layout();
@@ -491,10 +479,14 @@ export class WorkbenchShell {
 	private registerListeners(): void {
 
 		// Resize
-		this.toUnbind.push(addDisposableListener(window, EventType.RESIZE, () => this.layout()));
+		this._register(addDisposableListener(window, EventType.RESIZE, e => {
+			if (e.target === window) {
+				this.layout();
+			}
+		}));
 	}
 
-	public onUnexpectedError(error: any): void {
+	onUnexpectedError(error: any): void {
 		const errorMsg = toErrorMessage(error, true);
 		if (!errorMsg) {
 			return;
@@ -518,19 +510,11 @@ export class WorkbenchShell {
 	}
 
 	private layout(): void {
-		const clientArea = getClientArea(this.container);
-
-		this.contentsContainer.style.width = `${clientArea.width}px`;
-		this.contentsContainer.style.height = `${clientArea.height}px`;
-
-		this.contextViewService.layout();
 		this.workbench.layout();
 	}
 
-	public dispose(reason = ShutdownReason.QUIT): void {
-
-		// Dispose bindings
-		this.toUnbind = dispose(this.toUnbind);
+	dispose(reason = ShutdownReason.QUIT): void {
+		super.dispose();
 
 		// Keep font info for next startup around
 		saveFontInfo(this.storageService);
@@ -542,6 +526,7 @@ export class WorkbenchShell {
 	}
 }
 
+
 registerThemingParticipant((theme: ITheme, collector: ICssStyleCollector) => {
 
 	// Foreground
diff --git a/src/vs/workbench/electron-browser/window.ts b/src/vs/workbench/electron-browser/window.ts
index 4552d8a7555..83cc52d8a47 100644
--- a/src/vs/workbench/electron-browser/window.ts
+++ b/src/vs/workbench/electron-browser/window.ts
@@ -6,29 +6,26 @@
 'use strict';
 
 import * as nls from 'vs/nls';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import * as errors from 'vs/base/common/errors';
-import * as types from 'vs/base/common/types';
 import { TPromise } from 'vs/base/common/winjs.base';
 import * as arrays from 'vs/base/common/arrays';
 import * as objects from 'vs/base/common/objects';
 import * as DOM from 'vs/base/browser/dom';
 import { Separator } from 'vs/base/browser/ui/actionbar/actionbar';
 import { IAction, Action } from 'vs/base/common/actions';
-import { AutoSaveConfiguration, IFileService } from 'vs/platform/files/common/files';
+import { IFileService } from 'vs/platform/files/common/files';
 import { toResource, IUntitledResourceInput } from 'vs/workbench/common/editor';
 import { IEditorService, IResourceEditor } from 'vs/workbench/services/editor/common/editorService';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IWorkspaceConfigurationService } from 'vs/workbench/services/configuration/common/configuration';
-import { IWindowsService, IWindowService, IWindowSettings, IPath, IOpenFileRequest, IWindowsConfiguration, IAddFoldersRequest, IRunActionInWindowRequest } from 'vs/platform/windows/common/windows';
+import { IWindowsService, IWindowService, IWindowSettings, IOpenFileRequest, IWindowsConfiguration, IAddFoldersRequest, IRunActionInWindowRequest, IPathData } from 'vs/platform/windows/common/windows';
 import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { ITitleService } from 'vs/workbench/services/title/common/titleService';
-import { IWorkbenchThemeService, VS_HC_THEME, VS_DARK_THEME } from 'vs/workbench/services/themes/common/workbenchThemeService';
+import { IWorkbenchThemeService, VS_HC_THEME } from 'vs/workbench/services/themes/common/workbenchThemeService';
 import * as browser from 'vs/base/browser/browser';
 import { ICommandService } from 'vs/platform/commands/common/commands';
 import { IResourceInput } from 'vs/platform/editor/common/editor';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
 import { KeyboardMapperFactory } from 'vs/workbench/services/keybinding/electron-browser/keybindingService';
 import { Themable } from 'vs/workbench/common/theme';
 import { ipcRenderer as ipc, webFrame } from 'electron';
@@ -38,7 +35,6 @@ import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { fillInActionBarActions } from 'vs/platform/actions/browser/menuItemActionItem';
 import { RunOnceScheduler } from 'vs/base/common/async';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
-import { ConfigurationTarget } from 'vs/platform/configuration/common/configuration';
 import { LifecyclePhase, ILifecycleService } from 'vs/platform/lifecycle/common/lifecycle';
 import { IWorkspaceFolderCreationData } from 'vs/platform/workspaces/common/workspaces';
 import { IIntegrityService } from 'vs/platform/integrity/common/integrity';
@@ -46,6 +42,8 @@ import { AccessibilitySupport, isRootUser, isWindows, isMacintosh } from 'vs/bas
 import product from 'vs/platform/node/product';
 import { INotificationService } from 'vs/platform/notification/common/notification';
 import { EditorServiceImpl } from 'vs/workbench/browser/parts/editor/editor';
+import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
+import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 
 const TextInputActions: IAction[] = [
 	new Action('undo', nls.localize('undo', "Undo"), null, true, () => document.execCommand('undo') && TPromise.as(true)),
@@ -60,8 +58,6 @@ const TextInputActions: IAction[] = [
 
 export class ElectronWindow extends Themable {
 
-	private static readonly AUTO_SAVE_SETTING = 'files.autoSave';
-
 	private touchBarMenu: IMenu;
 	private touchBarUpdater: RunOnceScheduler;
 	private touchBarDisposables: IDisposable[];
@@ -70,10 +66,9 @@ export class ElectronWindow extends Themable {
 	private previousConfiguredZoomLevel: number;
 
 	private addFoldersScheduler: RunOnceScheduler;
-	private pendingFoldersToAdd: IAddFoldersRequest[];
+	private pendingFoldersToAdd: URI[];
 
 	constructor(
-		shellContainer: HTMLElement,
 		@IEditorService private editorService: EditorServiceImpl,
 		@IWindowsService private windowsService: IWindowsService,
 		@IWindowService private windowService: IWindowService,
@@ -97,8 +92,7 @@ export class ElectronWindow extends Themable {
 		this.touchBarDisposables = [];
 
 		this.pendingFoldersToAdd = [];
-		this.addFoldersScheduler = new RunOnceScheduler(() => this.doAddFolders(), 100);
-		this.toUnbind.push(this.addFoldersScheduler);
+		this.addFoldersScheduler = this._register(new RunOnceScheduler(() => this.doAddFolders(), 100));
 
 		this.registerListeners();
 		this.create();
@@ -107,7 +101,7 @@ export class ElectronWindow extends Themable {
 	private registerListeners(): void {
 
 		// React to editor input changes
-		this.toUnbind.push(this.editorService.onDidActiveEditorChange(() => this.updateTouchbarMenu()));
+		this._register(this.editorService.onDidActiveEditorChange(() => this.updateTouchbarMenu()));
 
 		// prevent opening a real URL inside the shell
 		[DOM.EventType.DRAG_OVER, DOM.EventType.DROP].forEach(event => {
@@ -134,7 +128,7 @@ export class ElectronWindow extends Themable {
 				args.push({ from: request.from }); // TODO@telemetry this is a bit weird to send this to every action?
 			}
 
-			this.commandService.executeCommand(request.id, ...args).done(_ => {
+			this.commandService.executeCommand(request.id, ...args).then(_ => {
 				/* __GDPR__
 					"commandExecuted" : {
 						"id" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
@@ -157,11 +151,11 @@ export class ElectronWindow extends Themable {
 			}
 
 			// Resolve keys using the keybinding service and send back to browser process
-			this.resolveKeybindings(actionIds).done(keybindings => {
+			this.resolveKeybindings(actionIds).then(keybindings => {
 				if (keybindings.length) {
 					ipc.send('vscode:keybindingsResolved', JSON.stringify(keybindings));
 				}
-			}, () => errors.onUnexpectedError);
+			});
 		});
 
 		ipc.on('vscode:reportError', (event: any, error: string) => {
@@ -183,11 +177,6 @@ export class ElectronWindow extends Themable {
 			this.notificationService.info(message);
 		});
 
-		// Support toggling auto save
-		ipc.on('vscode.toggleAutoSave', () => {
-			this.toggleAutoSave();
-		});
-
 		// Fullscreen Events
 		ipc.on('vscode:enterFullScreen', () => {
 			this.lifecycleService.when(LifecyclePhase.Running).then(() => {
@@ -215,7 +204,7 @@ export class ElectronWindow extends Themable {
 			const windowConfig = this.configurationService.getValue<IWindowSettings>('window');
 			if (windowConfig && windowConfig.autoDetectHighContrast) {
 				this.lifecycleService.when(LifecyclePhase.Running).then(() => {
-					this.themeService.setColorTheme(VS_DARK_THEME, null);
+					this.themeService.restoreColorTheme();
 				});
 			}
 		});
@@ -232,7 +221,7 @@ export class ElectronWindow extends Themable {
 
 		// Zoom level changes
 		this.updateWindowZoomLevel();
-		this.toUnbind.push(this.configurationService.onDidChangeConfiguration(e => {
+		this._register(this.configurationService.onDidChangeConfiguration(e => {
 			if (e.affectsConfiguration('window.zoomLevel')) {
 				this.updateWindowZoomLevel();
 			}
@@ -246,12 +235,12 @@ export class ElectronWindow extends Themable {
 		if (e.target instanceof HTMLElement) {
 			const target = <HTMLElement>e.target;
 			if (target.nodeName && (target.nodeName.toLowerCase() === 'input' || target.nodeName.toLowerCase() === 'textarea')) {
-				e.preventDefault();
-				e.stopPropagation();
+				DOM.EventHelper.stop(e, true);
 
 				this.contextMenuService.showContextMenu({
 					getAnchor: () => e,
-					getActions: () => TPromise.as(TextInputActions)
+					getActions: () => TPromise.as(TextInputActions),
+					onHide: () => target.focus() // fixes https://github.com/Microsoft/vscode/issues/52948
 				});
 			}
 		}
@@ -394,19 +383,16 @@ export class ElectronWindow extends Themable {
 				if (!binding) {
 					return null;
 				}
-
 				// first try to resolve a native accelerator
 				const electronAccelerator = binding.getElectronAccelerator();
 				if (electronAccelerator) {
 					return { id, label: electronAccelerator, isNative: true };
 				}
-
 				// we need this fallback to support keybindings that cannot show in electron menus (e.g. chords)
 				const acceleratorLabel = binding.getLabel();
 				if (acceleratorLabel) {
 					return { id, label: acceleratorLabel, isNative: false };
 				}
-
 				return null;
 			}));
 		});
@@ -415,7 +401,7 @@ export class ElectronWindow extends Themable {
 	private onAddFoldersRequest(request: IAddFoldersRequest): void {
 
 		// Buffer all pending requests
-		this.pendingFoldersToAdd.push(request);
+		this.pendingFoldersToAdd.push(...request.foldersToAdd.map(f => URI.revive(f)));
 
 		// Delay the adding of folders a bit to buffer in case more requests are coming
 		if (!this.addFoldersScheduler.isScheduled()) {
@@ -426,13 +412,13 @@ export class ElectronWindow extends Themable {
 	private doAddFolders(): void {
 		const foldersToAdd: IWorkspaceFolderCreationData[] = [];
 
-		this.pendingFoldersToAdd.forEach(request => {
-			foldersToAdd.push(...request.foldersToAdd.map(folderToAdd => ({ uri: URI.file(folderToAdd.filePath) })));
+		this.pendingFoldersToAdd.forEach(folder => {
+			foldersToAdd.push(({ uri: folder }));
 		});
 
 		this.pendingFoldersToAdd = [];
 
-		this.workspaceEditingService.addFolders(foldersToAdd).done(null, errors.onUnexpectedError);
+		this.workspaceEditingService.addFolders(foldersToAdd);
 	}
 
 	private onOpenFiles(request: IOpenFileRequest): void {
@@ -459,12 +445,12 @@ export class ElectronWindow extends Themable {
 			// In wait mode, listen to changes to the editors and wait until the files
 			// are closed that the user wants to wait for. When this happens we delete
 			// the wait marker file to signal to the outside that editing is done.
-			const resourcesToWaitFor = request.filesToWait.paths.map(p => URI.file(p.filePath));
+			const resourcesToWaitFor = request.filesToWait.paths.map(p => URI.revive(p.fileUri));
 			const waitMarkerFile = URI.file(request.filesToWait.waitMarkerFilePath);
 			const unbind = this.editorService.onDidCloseEditor(() => {
 				if (resourcesToWaitFor.every(resource => !this.editorService.isOpen({ resource }))) {
 					unbind.dispose();
-					this.fileService.del(waitMarkerFile).done(null, errors.onUnexpectedError);
+					this.fileService.del(waitMarkerFile);
 				}
 			});
 		}
@@ -488,9 +474,9 @@ export class ElectronWindow extends Themable {
 		});
 	}
 
-	private toInputs(paths: IPath[], isNew: boolean): IResourceEditor[] {
+	private toInputs(paths: IPathData[], isNew: boolean): IResourceEditor[] {
 		return paths.map(p => {
-			const resource = URI.file(p.filePath);
+			const resource = URI.revive(p.fileUri);
 			let input: IResourceInput | IUntitledResourceInput;
 			if (isNew) {
 				input = { filePath: resource.fsPath, options: { pinned: true } } as IUntitledResourceInput;
@@ -509,24 +495,7 @@ export class ElectronWindow extends Themable {
 		});
 	}
 
-	private toggleAutoSave(): void {
-		const setting = this.configurationService.inspect(ElectronWindow.AUTO_SAVE_SETTING);
-		let userAutoSaveConfig = setting.user;
-		if (types.isUndefinedOrNull(userAutoSaveConfig)) {
-			userAutoSaveConfig = setting.default; // use default if setting not defined
-		}
-
-		let newAutoSaveValue: string;
-		if ([AutoSaveConfiguration.AFTER_DELAY, AutoSaveConfiguration.ON_FOCUS_CHANGE, AutoSaveConfiguration.ON_WINDOW_CHANGE].some(s => s === userAutoSaveConfig)) {
-			newAutoSaveValue = AutoSaveConfiguration.OFF;
-		} else {
-			newAutoSaveValue = AutoSaveConfiguration.AFTER_DELAY;
-		}
-
-		this.configurationService.updateValue(ElectronWindow.AUTO_SAVE_SETTING, newAutoSaveValue, ConfigurationTarget.USER);
-	}
-
-	public dispose(): void {
+	dispose(): void {
 		this.touchBarDisposables = dispose(this.touchBarDisposables);
 
 		super.dispose();
diff --git a/src/vs/workbench/electron-browser/workbench.ts b/src/vs/workbench/electron-browser/workbench.ts
index 040fb9c88f3..71b75413be6 100644
--- a/src/vs/workbench/electron-browser/workbench.ts
+++ b/src/vs/workbench/electron-browser/workbench.ts
@@ -12,18 +12,17 @@ import { TPromise } from 'vs/base/common/winjs.base';
 import { IDisposable, dispose, toDisposable, Disposable } from 'vs/base/common/lifecycle';
 import { Event, Emitter } from 'vs/base/common/event';
 import * as DOM from 'vs/base/browser/dom';
-import { Builder, $ } from 'vs/base/browser/builder';
 import { RunOnceScheduler } from 'vs/base/common/async';
 import * as browser from 'vs/base/browser/browser';
 import * as perf from 'vs/base/common/performance';
 import * as errors from 'vs/base/common/errors';
-import { BackupFileService } from 'vs/workbench/services/backup/node/backupFileService';
+import { BackupFileService, InMemoryBackupFileService } from 'vs/workbench/services/backup/node/backupFileService';
 import { IBackupFileService } from 'vs/workbench/services/backup/common/backup';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { isWindows, isLinux, isMacintosh } from 'vs/base/common/platform';
 import { IResourceInput } from 'vs/platform/editor/common/editor';
 import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions';
-import { IEditorInputFactoryRegistry, Extensions as EditorExtensions, TextCompareEditorVisibleContext, TEXT_DIFF_EDITOR_ID, EditorsVisibleContext, InEditorZenModeContext, ActiveEditorGroupEmptyContext, MultipleEditorGroupsContext, IUntitledResourceInput, IResourceDiffInput, SplitEditorsVertically } from 'vs/workbench/common/editor';
+import { IEditorInputFactoryRegistry, Extensions as EditorExtensions, TextCompareEditorVisibleContext, TEXT_DIFF_EDITOR_ID, EditorsVisibleContext, InEditorZenModeContext, ActiveEditorGroupEmptyContext, MultipleEditorGroupsContext, IUntitledResourceInput, IResourceDiffInput, SplitEditorsVertically, TextCompareEditorActiveContext, ActiveEditorContext } from 'vs/workbench/common/editor';
 import { HistoryService } from 'vs/workbench/services/history/electron-browser/history';
 import { ActivitybarPart } from 'vs/workbench/browser/parts/activitybar/activitybarPart';
 import { SidebarPart } from 'vs/workbench/browser/parts/sidebar/sidebarPart';
@@ -38,10 +37,11 @@ import { QuickOpenController } from 'vs/workbench/browser/parts/quickopen/quickO
 import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
 import { QuickInputService } from 'vs/workbench/browser/parts/quickinput/quickInput';
 import { getServices } from 'vs/platform/instantiation/common/extensions';
-import { Position, Parts, IPartService, ILayoutOptions, IDimension } from 'vs/workbench/services/part/common/partService';
+import { Position, Parts, IPartService, ILayoutOptions, IDimension, PositionToString } from 'vs/workbench/services/part/common/partService';
 import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
 import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
-import { ContextMenuService } from 'vs/workbench/services/contextview/electron-browser/contextmenuService';
+import { ContextMenuService as NativeContextMenuService } from 'vs/workbench/services/contextview/electron-browser/contextmenuService';
+import { ContextMenuService as HTMLContextMenuService } from 'vs/platform/contextview/browser/contextMenuService';
 import { WorkbenchKeybindingService } from 'vs/workbench/services/keybinding/electron-browser/keybindingService';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { WorkspaceService, DefaultConfigurationExportHelper } from 'vs/workbench/services/configuration/node/configurationService';
@@ -70,30 +70,30 @@ import { TextFileService } from 'vs/workbench/services/textfile/electron-browser
 import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
 import { ISCMService } from 'vs/workbench/services/scm/common/scm';
 import { SCMService } from 'vs/workbench/services/scm/common/scmService';
-import { IProgressService2 } from 'vs/platform/progress/common/progress';
+import { IProgressService2 } from 'vs/workbench/services/progress/common/progress';
 import { ProgressService2 } from 'vs/workbench/services/progress/browser/progressService2';
 import { TextModelResolverService } from 'vs/workbench/services/textmodelResolver/common/textModelResolverService';
 import { ITextModelService } from 'vs/editor/common/services/resolverService';
 import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
 import { ShutdownReason } from 'vs/platform/lifecycle/common/lifecycle';
 import { LifecycleService } from 'vs/platform/lifecycle/electron-browser/lifecycleService';
-import { IWindowService, IWindowConfiguration as IWindowSettings, IWindowConfiguration, IPath } from 'vs/platform/windows/common/windows';
+import { IWindowService, IWindowConfiguration as IWindowSettings, IWindowConfiguration, IPath, MenuBarVisibility } from 'vs/platform/windows/common/windows';
 import { IStatusbarService } from 'vs/platform/statusbar/common/statusbar';
 import { IMenuService, SyncActionDescriptor } from 'vs/platform/actions/common/actions';
 import { MenuService } from 'vs/workbench/services/actions/common/menuService';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
+import { IContextMenuService, IContextViewService } from 'vs/platform/contextview/browser/contextView';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { IWorkbenchActionRegistry, Extensions } from 'vs/workbench/common/actions';
-import { OpenRecentAction, ToggleDevToolsAction, ReloadWindowAction, ShowPreviousWindowTab, MoveWindowTabToNewWindow, MergeAllWindowTabs, ShowNextWindowTab, ToggleWindowTabsBar, ReloadWindowWithExtensionsDisabledAction } from 'vs/workbench/electron-browser/actions';
+import { OpenRecentAction, ToggleDevToolsAction, ReloadWindowAction, ShowPreviousWindowTab, MoveWindowTabToNewWindow, MergeAllWindowTabs, ShowNextWindowTab, ToggleWindowTabsBar, ReloadWindowWithExtensionsDisabledAction, NewWindowTab } from 'vs/workbench/electron-browser/actions';
 import { KeyMod, KeyCode } from 'vs/base/common/keyCodes';
 import { IWorkspaceEditingService } from 'vs/workbench/services/workspace/common/workspaceEditing';
 import { WorkspaceEditingService } from 'vs/workbench/services/workspace/node/workspaceEditingService';
 import { FileDecorationsService } from 'vs/workbench/services/decorations/browser/decorationsService';
 import { IDecorationsService } from 'vs/workbench/services/decorations/browser/decorations';
 import { ActivityService } from 'vs/workbench/services/activity/browser/activityService';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { IListService, ListService } from 'vs/platform/list/browser/listService';
-import { InputFocusedContext } from 'vs/platform/workbench/common/contextkeys';
+import { InputFocusedContext, IsMacContext, IsLinuxContext, IsWindowsContext, FileDialogContext } from 'vs/platform/workbench/common/contextkeys';
 import { IViewsService } from 'vs/workbench/common/views';
 import { ViewsService } from 'vs/workbench/browser/parts/views/views';
 import { INotificationService } from 'vs/platform/notification/common/notification';
@@ -103,14 +103,20 @@ import { NotificationsAlerts } from 'vs/workbench/browser/parts/notifications/no
 import { NotificationsStatus } from 'vs/workbench/browser/parts/notifications/notificationsStatus';
 import { registerNotificationCommands } from 'vs/workbench/browser/parts/notifications/notificationsCommands';
 import { NotificationsToasts } from 'vs/workbench/browser/parts/notifications/notificationsToasts';
-import { IPCClient } from 'vs/base/parts/ipc/common/ipc';
+import { IPCClient } from 'vs/base/parts/ipc/node/ipc';
 import { registerWindowDriver } from 'vs/platform/driver/electron-browser/driver';
 import { IPreferencesService } from 'vs/workbench/services/preferences/common/preferences';
 import { PreferencesService } from 'vs/workbench/services/preferences/browser/preferencesService';
 import { IEditorService, IResourceEditor } from 'vs/workbench/services/editor/common/editorService';
-import { IEditorGroupsService, GroupDirection, preferredSideBySideGroupDirection, GroupOrientation } from 'vs/workbench/services/group/common/editorGroupsService';
+import { IEditorGroupsService, GroupDirection, preferredSideBySideGroupDirection } from 'vs/workbench/services/group/common/editorGroupsService';
 import { EditorService } from 'vs/workbench/services/editor/browser/editorService';
-import { IExtensionUrlHandler, ExtensionUrlHandler } from 'vs/platform/url/electron-browser/inactiveExtensionUrlHandler';
+import { IExtensionUrlHandler, ExtensionUrlHandler } from 'vs/workbench/services/extensions/electron-browser/inactiveExtensionUrlHandler';
+import { ContextViewService } from 'vs/platform/contextview/browser/contextViewService';
+import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
+import { TelemetryService } from 'vs/platform/telemetry/common/telemetryService';
+import { WorkbenchThemeService } from 'vs/workbench/services/themes/electron-browser/workbenchThemeService';
+import { IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService';
+import { LabelService, ILabelService } from 'vs/platform/label/common/label';
 
 interface WorkbenchParams {
 	configuration: IWindowConfiguration;
@@ -167,6 +173,7 @@ interface IZenMode {
 export class Workbench extends Disposable implements IPartService {
 
 	private static readonly sidebarHiddenStorageKey = 'workbench.sidebar.hidden';
+	private static readonly menubarVisibilityConfigurationKey = 'window.menuBarVisibility';
 	private static readonly sidebarRestoreStorageKey = 'workbench.sidebar.restore';
 	private static readonly panelHiddenStorageKey = 'workbench.panel.hidden';
 	private static readonly zenModeActiveStorageKey = 'workbench.zenmode.active';
@@ -182,8 +189,7 @@ export class Workbench extends Disposable implements IPartService {
 	_serviceBrand: any;
 
 	private workbenchParams: WorkbenchParams;
-	private workbenchContainer: Builder;
-	private workbench: Builder;
+	private workbench: HTMLElement;
 	private workbenchStarted: boolean;
 	private workbenchCreated: boolean;
 	private workbenchShutdown: boolean;
@@ -191,6 +197,7 @@ export class Workbench extends Disposable implements IPartService {
 	private editorService: EditorService;
 	private editorGroupService: IEditorGroupsService;
 	private viewletService: IViewletService;
+	private contextViewService: ContextViewService;
 	private contextKeyService: IContextKeyService;
 	private keybindingService: IKeybindingService;
 	private backupFileService: IBackupFileService;
@@ -212,21 +219,21 @@ export class Workbench extends Disposable implements IPartService {
 	private sideBarHidden: boolean;
 	private statusBarHidden: boolean;
 	private activityBarHidden: boolean;
+	private menubarToggled: boolean;
 	private sideBarPosition: Position;
 	private panelPosition: Position;
 	private panelHidden: boolean;
+	private menubarVisibility: MenuBarVisibility;
 	private zenMode: IZenMode;
-	private centeredEditorLayoutActive: boolean;
 	private fontAliasing: FontAliasingOption;
 	private hasInitialFilesToOpen: boolean;
 
 	private inZenMode: IContextKey<boolean>;
 	private sideBarVisibleContext: IContextKey<boolean>;
 
-	private closeEmptyWindowScheduler: RunOnceScheduler = new RunOnceScheduler(() => this.onAllEditorsClosed(), 50);
+	private closeEmptyWindowScheduler: RunOnceScheduler = this._register(new RunOnceScheduler(() => this.onAllEditorsClosed(), 50));
 
 	constructor(
-		private parent: HTMLElement,
 		private container: HTMLElement,
 		private configuration: IWindowConfiguration,
 		serviceCollection: ServiceCollection,
@@ -236,9 +243,11 @@ export class Workbench extends Disposable implements IPartService {
 		@IWorkspaceContextService private contextService: IWorkspaceContextService,
 		@IStorageService private storageService: IStorageService,
 		@IConfigurationService private configurationService: WorkspaceService,
+		@IWorkbenchThemeService private themeService: WorkbenchThemeService,
 		@IEnvironmentService private environmentService: IEnvironmentService,
 		@IWindowService private windowService: IWindowService,
-		@INotificationService private notificationService: NotificationService
+		@INotificationService private notificationService: NotificationService,
+		@ITelemetryService private telemetryService: TelemetryService
 	) {
 		super();
 
@@ -287,11 +296,13 @@ export class Workbench extends Disposable implements IPartService {
 	}
 
 	private createWorkbench(): void {
-		this.workbenchContainer = $('.monaco-workbench-container');
-		this.workbench = $().div({
-			'class': `monaco-workbench ${isWindows ? 'windows' : isLinux ? 'linux' : 'mac'}`,
-			id: Identifiers.WORKBENCH_CONTAINER
-		}).appendTo(this.workbenchContainer);
+		this.workbench = document.createElement('div');
+		this.workbench.id = Identifiers.WORKBENCH_CONTAINER;
+		DOM.addClasses(this.workbench, 'monaco-workbench', isWindows ? 'windows' : isLinux ? 'linux' : 'mac');
+
+		this._register(DOM.addDisposableListener(this.workbench, DOM.EventType.SCROLL, () => {
+			this.workbench.scrollTop = 0; // Prevent workbench from scrolling #55456
+		}));
 	}
 
 	private createGlobalActions(): void {
@@ -307,6 +318,7 @@ export class Workbench extends Disposable implements IPartService {
 		// Actions for macOS native tabs management (only when enabled)
 		const windowConfig = this.configurationService.getValue<IWindowConfiguration>();
 		if (windowConfig && windowConfig.window && windowConfig.window.nativeTabs) {
+			registry.registerWorkbenchAction(new SyncActionDescriptor(NewWindowTab, NewWindowTab.ID, NewWindowTab.LABEL), 'New Window Tab');
 			registry.registerWorkbenchAction(new SyncActionDescriptor(ShowPreviousWindowTab, ShowPreviousWindowTab.ID, ShowPreviousWindowTab.LABEL), 'Show Previous Window Tab');
 			registry.registerWorkbenchAction(new SyncActionDescriptor(ShowNextWindowTab, ShowNextWindowTab.ID, ShowNextWindowTab.LABEL), 'Show Next Window Tab');
 			registry.registerWorkbenchAction(new SyncActionDescriptor(MoveWindowTabToNewWindow, MoveWindowTabToNewWindow.ID, MoveWindowTabToNewWindow.LABEL), 'Move Window Tab to New Window');
@@ -324,6 +336,10 @@ export class Workbench extends Disposable implements IPartService {
 		// Clipboard
 		serviceCollection.set(IClipboardService, new ClipboardService());
 
+		// Uri Display
+		const labelService = new LabelService(this.environmentService, this.contextService);
+		serviceCollection.set(ILabelService, labelService);
+
 		// Status bar
 		this.statusbarPart = this.instantiationService.createInstance(StatusbarPart, Identifiers.STATUSBAR_PART);
 		this._register(toDisposable(() => this.statusbarPart.shutdown()));
@@ -342,8 +358,16 @@ export class Workbench extends Disposable implements IPartService {
 		// List
 		serviceCollection.set(IListService, this.instantiationService.createInstance(ListService));
 
-		// Context Menu
-		serviceCollection.set(IContextMenuService, new SyncDescriptor(ContextMenuService));
+		// Context view service
+		this.contextViewService = this.instantiationService.createInstance(ContextViewService, this.workbench);
+		serviceCollection.set(IContextViewService, this.contextViewService);
+
+		// Use themable context menus when custom titlebar is enabled to match custom menubar
+		if (!isMacintosh && this.getCustomTitleBarStyle() === 'custom') {
+			serviceCollection.set(IContextMenuService, new SyncDescriptor(HTMLContextMenuService, null, this.telemetryService, this.notificationService, this.contextViewService));
+		} else {
+			serviceCollection.set(IContextMenuService, new SyncDescriptor(NativeContextMenuService));
+		}
 
 		// Menus/Actions
 		serviceCollection.set(IMenuService, new SyncDescriptor(MenuService));
@@ -375,6 +399,7 @@ export class Workbench extends Disposable implements IPartService {
 		this.fileService = this.instantiationService.createInstance(RemoteFileService);
 		serviceCollection.set(IFileService, this.fileService);
 		this.configurationService.acquireFileService(this.fileService);
+		this.themeService.acquireFileService(this.fileService);
 
 		// Editor and Group services
 		const restorePreviousEditorState = !this.hasInitialFilesToOpen;
@@ -389,11 +414,16 @@ export class Workbench extends Disposable implements IPartService {
 		this.titlebarPart = this.instantiationService.createInstance(TitlebarPart, Identifiers.TITLEBAR_PART);
 		this._register(toDisposable(() => this.titlebarPart.shutdown()));
 		serviceCollection.set(ITitleService, this.titlebarPart);
+
 		// History
 		serviceCollection.set(IHistoryService, new SyncDescriptor(HistoryService));
 
 		// Backup File Service
-		this.backupFileService = this.instantiationService.createInstance(BackupFileService, this.workbenchParams.configuration.backupPath);
+		if (this.workbenchParams.configuration.backupPath) {
+			this.backupFileService = this.instantiationService.createInstance(BackupFileService, this.workbenchParams.configuration.backupPath);
+		} else {
+			this.backupFileService = new InMemoryBackupFileService();
+		}
 		serviceCollection.set(IBackupFileService, this.backupFileService);
 
 		// Text File Service
@@ -463,7 +493,7 @@ export class Workbench extends Disposable implements IPartService {
 		// Listen to editor closing (if we run with --wait)
 		const filesToWait = this.workbenchParams.configuration.filesToWait;
 		if (filesToWait) {
-			const resourcesToWaitFor = filesToWait.paths.map(p => URI.file(p.filePath));
+			const resourcesToWaitFor = filesToWait.paths.map(p => p.fileUri);
 			const waitMarkerFile = URI.file(filesToWait.waitMarkerFilePath);
 			const listenerDispose = this.editorService.onDidCloseEditor(() => this.onEditorClosed(listenerDispose, resourcesToWaitFor, waitMarkerFile));
 
@@ -485,9 +515,10 @@ export class Workbench extends Disposable implements IPartService {
 		// Apply as CSS class
 		const isFullscreen = browser.isFullscreen();
 		if (isFullscreen) {
-			this.workbench.addClass('fullscreen');
+			DOM.addClass(this.workbench, 'fullscreen');
 		} else {
-			this.workbench.removeClass('fullscreen');
+			DOM.removeClass(this.workbench, 'fullscreen');
+
 			if (this.zenMode.transitionedToFullScreen && this.zenMode.active) {
 				this.toggleZenMode();
 			}
@@ -501,6 +532,20 @@ export class Workbench extends Disposable implements IPartService {
 		}
 	}
 
+	private onMenubarToggled(visible: boolean) {
+		if (visible !== this.menubarToggled) {
+			this.menubarToggled = visible;
+
+			if (this.menubarVisibility === 'toggle' || (browser.isFullscreen() && this.menubarVisibility === 'default')) {
+				if (browser.isFullscreen() && this.menubarVisibility === 'default') {
+					this._onTitleBarVisibilityChange.fire();
+				}
+
+				this.layout();
+			}
+		}
+	}
+
 	private onEditorClosed(listenerDispose: IDisposable, resourcesToWaitFor: URI[], waitMarkerFile: URI): void {
 
 		// In wait mode, listen to changes to the editors and wait until the files
@@ -508,7 +553,7 @@ export class Workbench extends Disposable implements IPartService {
 		// the wait marker file to signal to the outside that editing is done.
 		if (resourcesToWaitFor.every(resource => !this.editorService.isOpen({ resource }))) {
 			listenerDispose.dispose();
-			this.fileService.del(waitMarkerFile).done(null, errors.onUnexpectedError);
+			this.fileService.del(waitMarkerFile);
 		}
 	}
 
@@ -558,6 +603,9 @@ export class Workbench extends Disposable implements IPartService {
 				this.setActivityBarHidden(newActivityBarHiddenValue, skipLayout);
 			}
 		}
+
+		const newMenubarVisibility = this.configurationService.getValue<MenuBarVisibility>(Workbench.menubarVisibilityConfigurationKey);
+		this.setMenubarVisibility(newMenubarVisibility, skipLayout);
 	}
 
 	//#endregion
@@ -565,17 +613,26 @@ export class Workbench extends Disposable implements IPartService {
 	private handleContextKeys(): void {
 		this.inZenMode = InEditorZenModeContext.bindTo(this.contextKeyService);
 
+		IsMacContext.bindTo(this.contextKeyService);
+		IsLinuxContext.bindTo(this.contextKeyService);
+		IsWindowsContext.bindTo(this.contextKeyService);
+		FileDialogContext.bindTo(this.contextKeyService);
+
 		const sidebarVisibleContextRaw = new RawContextKey<boolean>('sidebarVisible', false);
 		this.sideBarVisibleContext = sidebarVisibleContextRaw.bindTo(this.contextKeyService);
 
+		const activeEditorContext = ActiveEditorContext.bindTo(this.contextKeyService);
 		const editorsVisibleContext = EditorsVisibleContext.bindTo(this.contextKeyService);
 		const textCompareEditorVisible = TextCompareEditorVisibleContext.bindTo(this.contextKeyService);
+		const textCompareEditorActive = TextCompareEditorActiveContext.bindTo(this.contextKeyService);
 		const activeEditorGroupEmpty = ActiveEditorGroupEmptyContext.bindTo(this.contextKeyService);
 		const multipleEditorGroups = MultipleEditorGroupsContext.bindTo(this.contextKeyService);
 
 		const updateEditorContextKeys = () => {
+			const activeControl = this.editorService.activeControl;
 			const visibleEditors = this.editorService.visibleControls;
 
+			textCompareEditorActive.set(activeControl && activeControl.getId() === TEXT_DIFF_EDITOR_ID);
 			textCompareEditorVisible.set(visibleEditors.some(control => control.getId() === TEXT_DIFF_EDITOR_ID));
 
 			if (visibleEditors.length > 0) {
@@ -595,6 +652,12 @@ export class Workbench extends Disposable implements IPartService {
 			} else {
 				multipleEditorGroups.reset();
 			}
+
+			if (activeControl) {
+				activeEditorContext.set(activeControl.getId());
+			} else {
+				activeEditorContext.reset();
+			}
 		};
 
 		this.editorPart.whenRestored.then(() => updateEditorContextKeys());
@@ -678,17 +741,20 @@ export class Workbench extends Disposable implements IPartService {
 		const panelRegistry = Registry.as<PanelRegistry>(PanelExtensions.Panels);
 		const panelId = this.storageService.get(PanelPart.activePanelSettingsKey, StorageScope.WORKSPACE, panelRegistry.getDefaultPanelId());
 		if (!this.panelHidden && !!panelId) {
-			restorePromises.push(this.panelPart.openPanel(panelId, false));
+			perf.mark('willRestorePanel');
+			const isPanelToRestoreEnabled = !!this.panelPart.getPanels().filter(p => p.id === panelId).length;
+			const panelIdToRestore = isPanelToRestoreEnabled ? panelId : panelRegistry.getDefaultPanelId();
+			restorePromises.push(this.panelPart.openPanel(panelIdToRestore, false).then(() => perf.mark('didRestorePanel')));
 		}
 
 		// Restore Zen Mode if active
 		if (this.storageService.getBoolean(Workbench.zenModeActiveStorageKey, StorageScope.WORKSPACE, false)) {
-			this.toggleZenMode(true);
+			this.toggleZenMode(true, true);
 		}
 
 		// Restore Forced Editor Center Mode
 		if (this.storageService.getBoolean(Workbench.centeredEditorLayoutActiveStorageKey, StorageScope.WORKSPACE, false)) {
-			this.centeredEditorLayoutActive = true;
+			this.centerEditorLayout(true);
 		}
 
 		const onRestored = (error?: Error): IWorkbenchStartedInfo => {
@@ -734,7 +800,8 @@ export class Workbench extends Disposable implements IPartService {
 				return TPromise.as([<IResourceDiffInput>{
 					leftResource: filesToDiff[0].resource,
 					rightResource: filesToDiff[1].resource,
-					options: { pinned: true }
+					options: { pinned: true },
+					forceFile: true
 				}]);
 			}
 
@@ -770,12 +837,12 @@ export class Workbench extends Disposable implements IPartService {
 		}
 
 		return paths.map(p => {
-			const resource = URI.file(p.filePath);
+			const resource = p.fileUri;
 			let input: IResourceInput | IUntitledResourceInput;
 			if (isNew) {
 				input = { filePath: resource.fsPath, options: { pinned: true } } as IUntitledResourceInput;
 			} else {
-				input = { resource, options: { pinned: true } } as IResourceInput;
+				input = { resource, options: { pinned: true }, forceFile: true } as IResourceInput;
 			}
 
 			if (!isNew && p.lineNumber) {
@@ -822,6 +889,10 @@ export class Workbench extends Disposable implements IPartService {
 		// Panel position
 		this.setPanelPositionFromStorageOrConfig();
 
+		// Menubar visibility
+		const menuBarVisibility = this.configurationService.getValue<MenuBarVisibility>(Workbench.menubarVisibilityConfigurationKey);
+		this.setMenubarVisibility(menuBarVisibility, true);
+
 		// Statusbar visibility
 		const statusBarVisible = this.configurationService.getValue<string>(Workbench.statusbarVisibleConfigurationKey);
 		this.statusBarHidden = !statusBarVisible;
@@ -842,9 +913,6 @@ export class Workbench extends Disposable implements IPartService {
 			wasPanelVisible: false,
 			transitionDisposeables: []
 		};
-
-		// Centered Editor Layout
-		this.centeredEditorLayoutActive = false;
 	}
 
 	private setPanelPositionFromStorageOrConfig() {
@@ -854,12 +922,8 @@ export class Workbench extends Disposable implements IPartService {
 	}
 
 	private getCustomTitleBarStyle(): 'custom' {
-		if (!isMacintosh) {
-			return null; // custom title bar is only supported on Mac currently
-		}
-
 		const isDev = !this.environmentService.isBuilt || this.environmentService.isExtensionDevelopment;
-		if (isDev) {
+		if (isMacintosh && isDev) {
 			return null; // not enabled when developing due to https://github.com/electron/electron/issues/3647
 		}
 
@@ -884,9 +948,9 @@ export class Workbench extends Disposable implements IPartService {
 
 		// Adjust CSS
 		if (hidden) {
-			this.workbench.addClass('nostatusbar');
+			DOM.addClass(this.workbench, 'nostatusbar');
 		} else {
-			this.workbench.removeClass('nostatusbar');
+			DOM.removeClass(this.workbench, 'nostatusbar');
 		}
 
 		// Layout
@@ -911,7 +975,7 @@ export class Workbench extends Disposable implements IPartService {
 		this.workbenchLayout = this.instantiationService.createInstance(
 			WorkbenchLayout,
 			this.container,
-			this.workbench.getHTMLElement(),
+			this.workbench,
 			{
 				titlebar: this.titlebarPart,
 				activitybar: this.activitybarPart,
@@ -931,27 +995,23 @@ export class Workbench extends Disposable implements IPartService {
 
 		// Apply sidebar state as CSS class
 		if (this.sideBarHidden) {
-			this.workbench.addClass('nosidebar');
+			DOM.addClass(this.workbench, 'nosidebar');
 		}
+
 		if (this.panelHidden) {
-			this.workbench.addClass('nopanel');
+			DOM.addClass(this.workbench, 'nopanel');
 		}
+
 		if (this.statusBarHidden) {
-			this.workbench.addClass('nostatusbar');
+			DOM.addClass(this.workbench, 'nostatusbar');
 		}
 
 		// Apply font aliasing
 		this.setFontAliasing(this.fontAliasing);
 
-		// Apply title style if shown
-		const titleStyle = this.getCustomTitleBarStyle();
-		if (titleStyle) {
-			DOM.addClass(this.parent, `titlebar-style-${titleStyle}`);
-		}
-
 		// Apply fullscreen state
 		if (browser.isFullscreen()) {
-			this.workbench.addClass('fullscreen');
+			DOM.addClass(this.workbench, 'fullscreen');
 		}
 
 		// Create Parts
@@ -965,81 +1025,70 @@ export class Workbench extends Disposable implements IPartService {
 		// Notification Handlers
 		this.createNotificationsHandlers();
 
+
+		// Menubar visibility changes
+		if ((isWindows || isLinux) && this.getCustomTitleBarStyle() === 'custom') {
+			this.titlebarPart.onMenubarVisibilityChange()(e => this.onMenubarToggled(e));
+		}
+
 		// Add Workbench to DOM
-		this.workbenchContainer.build(this.container);
+		this.container.appendChild(this.workbench);
 	}
 
 	private createTitlebarPart(): void {
-		const titlebarContainer = $(this.workbench).div({
-			'class': ['part', 'titlebar'],
-			id: Identifiers.TITLEBAR_PART,
-			role: 'contentinfo'
-		});
+		const titlebarContainer = this.createPart(Identifiers.TITLEBAR_PART, ['part', 'titlebar'], 'contentinfo');
 
-		this.titlebarPart.create(titlebarContainer.getHTMLElement());
+		this.titlebarPart.create(titlebarContainer);
 	}
 
 	private createActivityBarPart(): void {
-		const activitybarPartContainer = $(this.workbench)
-			.div({
-				'class': ['part', 'activitybar', this.sideBarPosition === Position.LEFT ? 'left' : 'right'],
-				id: Identifiers.ACTIVITYBAR_PART,
-				role: 'navigation'
-			});
+		const activitybarPartContainer = this.createPart(Identifiers.ACTIVITYBAR_PART, ['part', 'activitybar', this.sideBarPosition === Position.LEFT ? 'left' : 'right'], 'navigation');
 
-		this.activitybarPart.create(activitybarPartContainer.getHTMLElement());
+		this.activitybarPart.create(activitybarPartContainer);
 	}
 
 	private createSidebarPart(): void {
-		const sidebarPartContainer = $(this.workbench)
-			.div({
-				'class': ['part', 'sidebar', this.sideBarPosition === Position.LEFT ? 'left' : 'right'],
-				id: Identifiers.SIDEBAR_PART,
-				role: 'complementary'
-			});
+		const sidebarPartContainer = this.createPart(Identifiers.SIDEBAR_PART, ['part', 'sidebar', this.sideBarPosition === Position.LEFT ? 'left' : 'right'], 'complementary');
 
-		this.sidebarPart.create(sidebarPartContainer.getHTMLElement());
+		this.sidebarPart.create(sidebarPartContainer);
 	}
 
 	private createPanelPart(): void {
-		const panelPartContainer = $(this.workbench)
-			.div({
-				'class': ['part', 'panel', this.panelPosition === Position.BOTTOM ? 'bottom' : 'right'],
-				id: Identifiers.PANEL_PART,
-				role: 'complementary'
-			});
+		const panelPartContainer = this.createPart(Identifiers.PANEL_PART, ['part', 'panel', this.panelPosition === Position.BOTTOM ? 'bottom' : 'right'], 'complementary');
 
-		this.panelPart.create(panelPartContainer.getHTMLElement());
+		this.panelPart.create(panelPartContainer);
 	}
 
 	private createEditorPart(): void {
-		const editorContainer = $(this.workbench)
-			.div({
-				'class': ['part', 'editor'],
-				id: Identifiers.EDITOR_PART,
-				role: 'main'
-			});
+		const editorContainer = this.createPart(Identifiers.EDITOR_PART, ['part', 'editor'], 'main');
 
-		this.editorPart.create(editorContainer.getHTMLElement());
+		this.editorPart.create(editorContainer);
 	}
 
 	private createStatusbarPart(): void {
-		const statusbarContainer = $(this.workbench).div({
-			'class': ['part', 'statusbar'],
-			id: Identifiers.STATUSBAR_PART,
-			role: 'contentinfo'
-		});
+		const statusbarContainer = this.createPart(Identifiers.STATUSBAR_PART, ['part', 'statusbar'], 'contentinfo');
 
-		this.statusbarPart.create(statusbarContainer.getHTMLElement());
+		this.statusbarPart.create(statusbarContainer);
+	}
+
+	private createPart(id: string, classes: string[], role: string): HTMLElement {
+		const part = document.createElement('div');
+		classes.forEach(clazz => DOM.addClass(part, clazz));
+		part.id = id;
+		part.setAttribute('role', role);
+
+		this.workbench.appendChild(part);
+
+		return part;
 	}
 
 	private createNotificationsHandlers(): void {
 
 		// Notifications Center
-		this.notificationsCenter = this._register(this.instantiationService.createInstance(NotificationsCenter, this.workbench.getHTMLElement(), this.notificationService.model));
+		this.notificationsCenter = this._register(this.instantiationService.createInstance(NotificationsCenter, this.workbench, this.notificationService.model));
 
 		// Notifications Toasts
-		this.notificationsToasts = this._register(this.instantiationService.createInstance(NotificationsToasts, this.workbench.getHTMLElement(), this.notificationService.model));
+		this.notificationsToasts = this._register(this.instantiationService.createInstance(NotificationsToasts, this.workbench, this.notificationService.model));
 
 		// Notifications Alerts
 		this._register(this.instantiationService.createInstance(NotificationsAlerts, this.notificationService.model));
@@ -1090,13 +1139,13 @@ export class Workbench extends Disposable implements IPartService {
 
 	//#region IPartService
 
-	private _onTitleBarVisibilityChange: Emitter<void> = new Emitter<void>();
+	private _onTitleBarVisibilityChange: Emitter<void> = this._register(new Emitter<void>());
 	get onTitleBarVisibilityChange(): Event<void> { return this._onTitleBarVisibilityChange.event; }
 
 	get onEditorLayout(): Event<IDimension> { return this.editorPart.onDidLayout; }
 
 	isCreated(): boolean {
-		return this.workbenchCreated && this.workbenchStarted;
+		return !!(this.workbenchCreated && this.workbenchStarted);
 	}
 
 	hasFocus(part: Parts): boolean {
@@ -1138,7 +1187,19 @@ export class Workbench extends Disposable implements IPartService {
 	isVisible(part: Parts): boolean {
 		switch (part) {
 			case Parts.TITLEBAR_PART:
-				return this.getCustomTitleBarStyle() && !browser.isFullscreen();
+				if (this.getCustomTitleBarStyle() !== 'custom') {
+					return false;
+				} else if (!browser.isFullscreen()) {
+					return true;
+				} else if (isMacintosh) {
+					return false;
+				} else if (this.menubarVisibility === 'visible') {
+					return true;
+				} else if (this.menubarVisibility === 'toggle' || this.menubarVisibility === 'default') {
+					return this.menubarToggled;
+				}
+
+				return false;
 			case Parts.SIDEBAR_PART:
 				return !this.sideBarHidden;
 			case Parts.PANEL_PART:
@@ -1155,17 +1216,20 @@ export class Workbench extends Disposable implements IPartService {
 	getTitleBarOffset(): number {
 		let offset = 0;
 		if (this.isVisible(Parts.TITLEBAR_PART)) {
-			offset = 22 / browser.getZoomFactor(); // adjust the position based on title bar size and zoom factor
+			offset = this.workbenchLayout.partLayoutInfo.titlebar.height;
+			if (isMacintosh || this.menubarVisibility === 'hidden') {
+				offset /= browser.getZoomFactor();
+			}
 		}
 
 		return offset;
 	}
 
-	getWorkbenchElementId(): string {
-		return Identifiers.WORKBENCH_CONTAINER;
+	getWorkbenchElement(): HTMLElement {
+		return this.workbench;
 	}
 
-	toggleZenMode(skipLayout?: boolean): void {
+	toggleZenMode(skipLayout?: boolean, restoring = false): void {
 		this.zenMode.active = !this.zenMode.active;
 		this.zenMode.transitionDisposeables = dispose(this.zenMode.transitionDisposeables);
 
@@ -1178,13 +1242,13 @@ export class Workbench extends Disposable implements IPartService {
 			const config = this.configurationService.getValue<IZenModeSettings>('zenMode');
 
 			toggleFullScreen = !browser.isFullscreen() && config.fullScreen;
-			this.zenMode.transitionedToFullScreen = toggleFullScreen;
+			this.zenMode.transitionedToFullScreen = restoring ? config.fullScreen : toggleFullScreen;
 			this.zenMode.transitionedToCenteredEditorLayout = !this.isEditorLayoutCentered() && config.centerLayout;
 			this.zenMode.wasSideBarVisible = this.isVisible(Parts.SIDEBAR_PART);
 			this.zenMode.wasPanelVisible = this.isVisible(Parts.PANEL_PART);
 
-			this.setPanelHidden(true, true).done(void 0, errors.onUnexpectedError);
-			this.setSideBarHidden(true, true).done(void 0, errors.onUnexpectedError);
+			this.setPanelHidden(true, true);
+			this.setSideBarHidden(true, true);
 
 			if (config.hideActivityBar) {
 				this.setActivityBarHidden(true, true);
@@ -1206,11 +1270,11 @@ export class Workbench extends Disposable implements IPartService {
 		// Zen Mode Inactive
 		else {
 			if (this.zenMode.wasPanelVisible) {
-				this.setPanelHidden(false, true).done(void 0, errors.onUnexpectedError);
+				this.setPanelHidden(false, true);
 			}
 
 			if (this.zenMode.wasSideBarVisible) {
-				this.setSideBarHidden(false, true).done(void 0, errors.onUnexpectedError);
+				this.setSideBarHidden(false, true);
 			}
 
 			if (this.zenMode.transitionedToCenteredEditorLayout) {
@@ -1232,50 +1296,27 @@ export class Workbench extends Disposable implements IPartService {
 		}
 
 		if (toggleFullScreen) {
-			this.windowService.toggleFullScreen().done(void 0, errors.onUnexpectedError);
+			this.windowService.toggleFullScreen();
 		}
 	}
 
 	layout(options?: ILayoutOptions): void {
+		this.contextViewService.layout();
+
 		if (this.workbenchStarted && !this.workbenchShutdown) {
 			this.workbenchLayout.layout(options);
 		}
 	}
 
 	isEditorLayoutCentered(): boolean {
-		return this.centeredEditorLayoutActive;
+		return this.editorPart.isLayoutCentered();
 	}
 
-	// TODO@ben support centered editor layout using empty groups or not? functionality missing:
-	// - resize sashes left and right in sync
-	// - IEditorInput.supportsCenteredEditorLayout() no longer supported
-	// - should we just allow to enter layout even if groups > 1? what does it then mean to be
-	//   actively in centered editor layout though?
 	centerEditorLayout(active: boolean, skipLayout?: boolean): void {
-		this.centeredEditorLayoutActive = active;
-		this.storageService.store(Workbench.centeredEditorLayoutActiveStorageKey, this.centeredEditorLayoutActive, StorageScope.WORKSPACE);
+		this.storageService.store(Workbench.centeredEditorLayoutActiveStorageKey, active, StorageScope.WORKSPACE);
 
 		// Enter Centered Editor Layout
-		if (active) {
-			if (this.editorGroupService.count === 1) {
-				const activeGroup = this.editorGroupService.activeGroup;
-				this.editorGroupService.addGroup(activeGroup, GroupDirection.LEFT);
-				this.editorGroupService.addGroup(activeGroup, GroupDirection.RIGHT);
-
-				this.editorGroupService.applyLayout({ groups: [{ size: 0.2 }, { size: 0.6 }, { size: 0.2 }], orientation: GroupOrientation.HORIZONTAL });
-			}
-		}
-
-		// Leave Centered Editor Layout
-		else {
-			if (this.editorGroupService.count === 3) {
-				this.editorGroupService.groups.forEach(group => {
-					if (group.count === 0) {
-						this.editorGroupService.removeGroup(group);
-					}
-				});
-			}
-		}
+		this.editorPart.centerLayout(active);
 
 		if (!skipLayout) {
 			this.layout();
@@ -1309,9 +1350,9 @@ export class Workbench extends Disposable implements IPartService {
 
 		// Adjust CSS
 		if (hidden) {
-			this.workbench.addClass('nosidebar');
+			DOM.addClass(this.workbench, 'nosidebar');
 		} else {
-			this.workbench.removeClass('nosidebar');
+			DOM.removeClass(this.workbench, 'nosidebar');
 		}
 
 		// If sidebar becomes hidden, also hide the current active Viewlet if any
@@ -1360,9 +1401,9 @@ export class Workbench extends Disposable implements IPartService {
 
 		// Adjust CSS
 		if (hidden) {
-			this.workbench.addClass('nopanel');
+			DOM.addClass(this.workbench, 'nopanel');
 		} else {
-			this.workbench.removeClass('nopanel');
+			DOM.removeClass(this.workbench, 'nopanel');
 		}
 
 		// If panel part becomes hidden, also hide the current active panel if any
@@ -1411,7 +1452,7 @@ export class Workbench extends Disposable implements IPartService {
 
 	setSideBarPosition(position: Position): void {
 		if (this.sideBarHidden) {
-			this.setSideBarHidden(false, true /* Skip Layout */).done(void 0, errors.onUnexpectedError);
+			this.setSideBarHidden(false, true /* Skip Layout */);
 		}
 
 		const newPositionValue = (position === Position.LEFT) ? 'left' : 'right';
@@ -1432,6 +1473,20 @@ export class Workbench extends Disposable implements IPartService {
 		this.workbenchLayout.layout();
 	}
 
+	setMenubarVisibility(visibility: MenuBarVisibility, skipLayout: boolean): void {
+		if (this.menubarVisibility !== visibility) {
+			this.menubarVisibility = visibility;
+
+			if (!skipLayout) {
+				this.workbenchLayout.layout();
+			}
+		}
+	}
+
+	getMenubarVisibility(): MenuBarVisibility {
+		return this.menubarVisibility;
+	}
+
 	getPanelPosition(): Position {
 		return this.panelPosition;
 	}
@@ -1441,7 +1496,7 @@ export class Workbench extends Disposable implements IPartService {
 			const newPositionValue = (position === Position.BOTTOM) ? 'bottom' : 'right';
 			const oldPositionValue = (this.panelPosition === Position.BOTTOM) ? 'bottom' : 'right';
 			this.panelPosition = position;
-			this.storageService.store(Workbench.panelPositionStorageKey, Position[this.panelPosition].toLowerCase(), StorageScope.WORKSPACE);
+			this.storageService.store(Workbench.panelPositionStorageKey, PositionToString(this.panelPosition).toLowerCase(), StorageScope.WORKSPACE);
 
 			// Adjust CSS
 			DOM.removeClass(this.panelPart.getContainer(), oldPositionValue);
@@ -1456,4 +1511,4 @@ export class Workbench extends Disposable implements IPartService {
 	}
 
 	//#endregion
-}
\ No newline at end of file
+}
diff --git a/src/vs/workbench/node/extensionHostMain.ts b/src/vs/workbench/node/extensionHostMain.ts
index 7adcb13e853..8fbb0efc2e2 100644
--- a/src/vs/workbench/node/extensionHostMain.ts
+++ b/src/vs/workbench/node/extensionHostMain.ts
@@ -13,17 +13,17 @@ import { ExtHostExtensionService } from 'vs/workbench/api/node/extHostExtensionS
 import { ExtHostConfiguration } from 'vs/workbench/api/node/extHostConfiguration';
 import { ExtHostWorkspace } from 'vs/workbench/api/node/extHostWorkspace';
 import { IExtensionDescription } from 'vs/workbench/services/extensions/common/extensions';
-import { QueryType, ISearchQuery } from 'vs/platform/search/common/search';
-import { DiskSearch } from 'vs/workbench/services/search/node/searchService';
-import { IInitData, IEnvironment, IWorkspaceData, MainContext } from 'vs/workbench/api/node/extHost.protocol';
+import { IInitData, IEnvironment, IWorkspaceData, MainContext, MainThreadWorkspaceShape } from 'vs/workbench/api/node/extHost.protocol';
 import * as errors from 'vs/base/common/errors';
-import * as glob from 'vs/base/common/glob';
 import { ExtensionActivatedByEvent } from 'vs/workbench/api/node/extHostExtensionActivator';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
-import { IMessagePassingProtocol } from 'vs/base/parts/ipc/common/ipc';
+import { IMessagePassingProtocol } from 'vs/base/parts/ipc/node/ipc';
 import { RPCProtocol } from 'vs/workbench/services/extensions/node/rpcProtocol';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { ExtHostLogService } from 'vs/workbench/api/node/extHostLogService';
+import { timeout } from 'vs/base/common/async';
+import { Counter } from 'vs/base/common/numbers';
+import { CancellationTokenSource } from 'vs/base/common/cancellation';
 
 const nativeExit = process.exit.bind(process);
 function patchProcess(allowExit: boolean) {
@@ -41,8 +41,8 @@ function patchProcess(allowExit: boolean) {
 		console.warn(err.stack);
 	};
 }
+
 export function exit(code?: number) {
-	// TODO@electron
 	// See https://github.com/Microsoft/vscode/issues/32990
 	// calling process.exit() does not exit the process when the process is being debugged
 	// It waits for the debugger to disconnect, but in our version, the debugger does not
@@ -75,8 +75,9 @@ interface ITestRunner {
 
 export class ExtensionHostMain {
 
+	private static readonly WORKSPACE_CONTAINS_TIMEOUT = 5000;
+
 	private _isTerminating: boolean = false;
-	private _diskSearch: DiskSearch;
 	private _workspace: IWorkspaceData;
 	private _environment: IEnvironment;
 	private _extensionService: ExtHostExtensionService;
@@ -84,19 +85,26 @@ export class ExtensionHostMain {
 	private _extHostLogService: ExtHostLogService;
 	private disposables: IDisposable[] = [];
 
+	private _searchRequestIdProvider: Counter;
+	private _mainThreadWorkspace: MainThreadWorkspaceShape;
+
 	constructor(protocol: IMessagePassingProtocol, initData: IInitData) {
+		const rpcProtocol = new RPCProtocol(protocol);
+
+		// ensure URIs are transformed and revived
+		initData = this.transform(initData, rpcProtocol);
 		this._environment = initData.environment;
+		this._workspace = initData.workspace;
 
 		const allowExit = !!this._environment.extensionTestsPath; // to support other test frameworks like Jasmin that use process.exit (https://github.com/Microsoft/vscode/issues/37708)
 		patchProcess(allowExit);
 
 		// services
-		const rpcProtocol = new RPCProtocol(protocol);
-		this._workspace = rpcProtocol.transformIncomingURIs(initData.workspace);
-
-		this._extHostLogService = new ExtHostLogService(initData.windowId, initData.logLevel, initData.logsPath);
+		this._extHostLogService = new ExtHostLogService(initData.logLevel, initData.logsLocation.fsPath);
 		this.disposables.push(this._extHostLogService);
-		const extHostWorkspace = new ExtHostWorkspace(rpcProtocol, initData.workspace, this._extHostLogService);
+
+		this._searchRequestIdProvider = new Counter();
+		const extHostWorkspace = new ExtHostWorkspace(rpcProtocol, initData.workspace, this._extHostLogService, this._searchRequestIdProvider);
 
 		this._extHostLogService.info('extension host started');
 		this._extHostLogService.trace('initData', initData);
@@ -124,6 +132,7 @@ export class ExtensionHostMain {
 				return `${error.name || 'Error'}: ${error.message || ''}${stackTraceMessage}`;
 			};
 		});
+
 		const mainThreadExtensions = rpcProtocol.getProxy(MainContext.MainThreadExtensionService);
 		const mainThreadErrors = rpcProtocol.getProxy(MainContext.MainThreadErrors);
 		errors.setUnexpectedErrorHandler(err => {
@@ -136,13 +145,10 @@ export class ExtensionHostMain {
 			}
 		});
 
-		// Configure the watchdog to kill our process if the JS event loop is unresponsive for more than 10s
-		// if (!initData.environment.isExtensionDevelopmentDebug) {
-		// 	watchdog.start(10000);
-		// }
+		this._mainThreadWorkspace = rpcProtocol.getProxy(MainContext.MainThreadWorkspace);
 	}
 
-	public start(): TPromise<void> {
+	start(): TPromise<void> {
 		return this._extensionService.onExtensionAPIReady()
 			.then(() => this.handleEagerExtensions())
 			.then(() => this.handleExtensionTests())
@@ -151,7 +157,7 @@ export class ExtensionHostMain {
 			});
 	}
 
-	public terminate(): void {
+	terminate(): void {
 		if (this._isTerminating) {
 			// we are already shutting down...
 			return;
@@ -166,9 +172,9 @@ export class ExtensionHostMain {
 
 		let allPromises: TPromise<void>[] = [];
 		try {
-			let allExtensions = this._extensionService.getAllExtensionDescriptions();
-			let allExtensionsIds = allExtensions.map(ext => ext.id);
-			let activatedExtensions = allExtensionsIds.filter(id => this._extensionService.isActivated(id));
+			const allExtensions = this._extensionService.getAllExtensionDescriptions();
+			const allExtensionsIds = allExtensions.map(ext => ext.id);
+			const activatedExtensions = allExtensionsIds.filter(id => this._extensionService.isActivated(id));
 
 			allPromises = activatedExtensions.map((extensionId) => {
 				return this._extensionService.deactivate(extensionId);
@@ -177,11 +183,11 @@ export class ExtensionHostMain {
 			// TODO: write to log once we have one
 		}
 
-		let extensionsDeactivated = TPromise.join(allPromises).then<void>(() => void 0);
+		const extensionsDeactivated = TPromise.join(allPromises).then<void>(() => void 0);
 
 		// Give extensions 1 second to wrap up any async dispose, then exit
 		setTimeout(() => {
-			TPromise.any<void>([TPromise.timeout(4000), extensionsDeactivated]).then(() => exit(), () => exit());
+			Promise.race([timeout(4000), extensionsDeactivated]).then(() => exit(), () => exit());
 		}, 1000);
 	}
 
@@ -190,6 +196,7 @@ export class ExtensionHostMain {
 		this._extensionService.activateByEvent('*', true).then(null, (err) => {
 			console.error(err);
 		});
+
 		return this.handleWorkspaceContainsEagerExtensions();
 	}
 
@@ -206,7 +213,7 @@ export class ExtensionHostMain {
 	}
 
 	private handleWorkspaceContainsEagerExtension(desc: IExtensionDescription): TPromise<void> {
-		let activationEvents = desc.activationEvents;
+		const activationEvents = desc.activationEvents;
 		if (!activationEvents) {
 			return TPromise.as(void 0);
 		}
@@ -216,7 +223,7 @@ export class ExtensionHostMain {
 
 		for (let i = 0; i < activationEvents.length; i++) {
 			if (/^workspaceContains:/.test(activationEvents[i])) {
-				let fileNameOrGlob = activationEvents[i].substr('workspaceContains:'.length);
+				const fileNameOrGlob = activationEvents[i].substr('workspaceContains:'.length);
 				if (fileNameOrGlob.indexOf('*') >= 0 || fileNameOrGlob.indexOf('?') >= 0) {
 					globPatterns.push(fileNameOrGlob);
 				} else {
@@ -229,21 +236,21 @@ export class ExtensionHostMain {
 			return TPromise.as(void 0);
 		}
 
-		let fileNamePromise = TPromise.join(fileNames.map((fileName) => this.activateIfFileName(desc.id, fileName))).then(() => { });
-		let globPatternPromise = this.activateIfGlobPatterns(desc.id, globPatterns);
+		const fileNamePromise = TPromise.join(fileNames.map((fileName) => this.activateIfFileName(desc.id, fileName))).then(() => { });
+		const globPatternPromise = this.activateIfGlobPatterns(desc.id, globPatterns);
 
 		return TPromise.join([fileNamePromise, globPatternPromise]).then(() => { });
 	}
 
-	private async activateIfFileName(extensionId: string, fileName: string): TPromise<void> {
-		// find exact path
+	private async activateIfFileName(extensionId: string, fileName: string): Promise<void> {
 
+		// find exact path
 		for (const { uri } of this._workspace.folders) {
 			if (await pfs.exists(join(URI.revive(uri).fsPath, fileName))) {
 				// the file was found
 				return (
 					this._extensionService.activateById(extensionId, new ExtensionActivatedByEvent(true, `workspaceContains:${fileName}`))
-						.done(null, err => console.error(err))
+						.then(null, err => console.error(err))
 				);
 			}
 		}
@@ -251,43 +258,39 @@ export class ExtensionHostMain {
 		return undefined;
 	}
 
-	private async activateIfGlobPatterns(extensionId: string, globPatterns: string[]): TPromise<void> {
+	private async activateIfGlobPatterns(extensionId: string, globPatterns: string[]): Promise<void> {
 		this._extHostLogService.trace(`extensionHostMain#activateIfGlobPatterns: fileSearch, extension: ${extensionId}, entryPoint: workspaceContains`);
 
 		if (globPatterns.length === 0) {
 			return TPromise.as(void 0);
 		}
 
-		if (!this._diskSearch) {
-			// Shut down this search process after 1s
-			this._diskSearch = new DiskSearch(false, 1000);
+		const tokenSource = new CancellationTokenSource();
+		const searchP = this._mainThreadWorkspace.$checkExists(globPatterns, tokenSource.token);
+
+		const timer = setTimeout(async () => {
+			tokenSource.cancel();
+			this._extensionService.activateById(extensionId, new ExtensionActivatedByEvent(true, `workspaceContainsTimeout:${globPatterns.join(',')}`))
+				.then(null, err => console.error(err));
+		}, ExtensionHostMain.WORKSPACE_CONTAINS_TIMEOUT);
+
+		let exists: boolean;
+		try {
+			exists = await searchP;
+		} catch (err) {
+			if (!errors.isPromiseCanceledError(err)) {
+				console.error(err);
+			}
 		}
 
-		let includes: glob.IExpression = {};
-		globPatterns.forEach((globPattern) => {
-			includes[globPattern] = true;
-		});
+		tokenSource.dispose();
+		clearTimeout(timer);
 
-		const folderQueries = this._workspace.folders.map(folder => ({ folder: URI.revive(folder.uri) }));
-		const config = this._extHostConfiguration.getConfiguration('search');
-		const useRipgrep = config.get('useRipgrep', true);
-		const followSymlinks = config.get('followSymlinks', true);
-
-		const query: ISearchQuery = {
-			folderQueries,
-			type: QueryType.File,
-			exists: true,
-			includePattern: includes,
-			useRipgrep,
-			ignoreSymlinks: !followSymlinks
-		};
-
-		let result = await this._diskSearch.search(query);
-		if (result.limitHit) {
+		if (exists) {
 			// a file was found matching one of the glob patterns
 			return (
 				this._extensionService.activateById(extensionId, new ExtensionActivatedByEvent(true, `workspaceContains:${globPatterns.join(',')}`))
-					.done(null, err => console.error(err))
+					.then(null, err => console.error(err))
 			);
 		}
 
@@ -295,7 +298,7 @@ export class ExtensionHostMain {
 	}
 
 	private handleExtensionTests(): TPromise<void> {
-		if (!this._environment.extensionTestsPath || !this._environment.extensionDevelopmentPath) {
+		if (!this._environment.extensionTestsPath || !this._environment.extensionDevelopmentLocationURI) {
 			return TPromise.as(null);
 		}
 
@@ -332,6 +335,16 @@ export class ExtensionHostMain {
 		return TPromise.wrapError<void>(new Error(requireError ? requireError.toString() : nls.localize('extensionTestError', "Path {0} does not point to a valid extension test runner.", this._environment.extensionTestsPath)));
 	}
 
+	private transform(initData: IInitData, rpcProtocol: RPCProtocol): IInitData {
+		initData.extensions.forEach((ext) => (<any>ext).extensionLocation = URI.revive(ext.extensionLocation));
+		initData.environment.appRoot = URI.revive(initData.environment.appRoot);
+		initData.environment.appSettingsHome = URI.revive(initData.environment.appSettingsHome);
+		initData.environment.extensionDevelopmentLocationURI = URI.revive(initData.environment.extensionDevelopmentLocationURI);
+		initData.logsLocation = URI.revive(initData.logsLocation);
+		initData.workspace = rpcProtocol.transformIncomingURIs(initData.workspace);
+		return initData;
+	}
+
 	private gracefulExit(code: number): void {
 		// to give the PH process a chance to flush any outstanding console
 		// messages to the main process, we delay the exit() by some time
diff --git a/src/vs/workbench/node/extensionHostProcess.ts b/src/vs/workbench/node/extensionHostProcess.ts
index b91ad78ad4d..f05f72a92a9 100644
--- a/src/vs/workbench/node/extensionHostProcess.ts
+++ b/src/vs/workbench/node/extensionHostProcess.ts
@@ -8,10 +8,29 @@
 import { onUnexpectedError } from 'vs/base/common/errors';
 import { ExtensionHostMain, exit } from 'vs/workbench/node/extensionHostMain';
 import { IInitData } from 'vs/workbench/api/node/extHost.protocol';
-import { IMessagePassingProtocol } from 'vs/base/parts/ipc/common/ipc';
+import { IMessagePassingProtocol } from 'vs/base/parts/ipc/node/ipc';
 import { Protocol } from 'vs/base/parts/ipc/node/ipc.net';
 import { createConnection } from 'net';
 import { Event, filterEvent } from 'vs/base/common/event';
+import { createMessageOfType, MessageType, isMessageOfType } from 'vs/workbench/common/extensionHostProtocol';
+
+// With Electron 2.x and node.js 8.x the "natives" module
+// can cause a native crash (see https://github.com/nodejs/node/issues/19891 and
+// https://github.com/electron/electron/issues/10905). To prevent this from
+// happening we essentially blocklist this module from getting loaded in any
+// extension by patching the node require() function.
+(function () {
+	const Module = require.__$__nodeRequire('module') as any;
+	const originalLoad = Module._load;
+
+	Module._load = function (request) {
+		if (request === 'natives') {
+			throw new Error('Either the extension or a NPM dependency is using the "natives" node module which is unsupported as it can cause a crash of the extension host. Click [here](https://go.microsoft.com/fwlink/?linkid=871887) to find out more');
+		}
+
+		return originalLoad.apply(this, arguments);
+	};
+})();
 
 interface IRendererConnection {
 	protocol: IMessagePassingProtocol;
@@ -43,7 +62,7 @@ function createExtHostProtocol(): Promise<IMessagePassingProtocol> {
 			private _terminating = false;
 
 			readonly onMessage: Event<any> = filterEvent(protocol.onMessage, msg => {
-				if (msg.type !== '__$terminate') {
+				if (!isMessageOfType(msg, MessageType.Terminate)) {
 					return true;
 				}
 				this._terminating = true;
@@ -67,7 +86,7 @@ function connectToRenderer(protocol: IMessagePassingProtocol): Promise<IRenderer
 		const first = protocol.onMessage(raw => {
 			first.dispose();
 
-			const initData = <IInitData>JSON.parse(raw);
+			const initData = <IInitData>JSON.parse(raw.toString());
 
 			// Print a console message when rejection isn't handled within N seconds. For details:
 			// see https://nodejs.org/api/process.html#process_event_unhandledrejection
@@ -84,6 +103,7 @@ function connectToRenderer(protocol: IMessagePassingProtocol): Promise<IRenderer
 					}
 				}, 1000);
 			});
+
 			process.on('rejectionHandled', (promise: Promise<any>) => {
 				const idx = unhandledPromises.indexOf(promise);
 				if (idx >= 0) {
@@ -106,13 +126,13 @@ function connectToRenderer(protocol: IMessagePassingProtocol): Promise<IRenderer
 			}, 5000);
 
 			// Tell the outside that we are initialized
-			protocol.send('initialized');
+			protocol.send(createMessageOfType(MessageType.Initialized));
 
 			c({ protocol, initData });
 		});
 
 		// Tell the outside that we are ready to receive messages
-		protocol.send('ready');
+		protocol.send(createMessageOfType(MessageType.Ready));
 	});
 }
 
@@ -128,8 +148,6 @@ createExtHostProtocol().then(protocol => {
 	return extensionHostMain.start();
 }).catch(err => console.error(err));
 
-
-
 function patchExecArgv() {
 	// when encountering the prevent-inspect flag we delete this
 	// and the prior flag
diff --git a/src/vs/workbench/parts/backup/common/backupModelTracker.ts b/src/vs/workbench/parts/backup/common/backupModelTracker.ts
index 4cb9b8c7670..ab46ef0fde4 100644
--- a/src/vs/workbench/parts/backup/common/backupModelTracker.ts
+++ b/src/vs/workbench/parts/backup/common/backupModelTracker.ts
@@ -5,10 +5,9 @@
 
 'use strict';
 
-import Uri from 'vs/base/common/uri';
-import * as errors from 'vs/base/common/errors';
+import { URI as Uri } from 'vs/base/common/uri';
 import { IBackupFileService } from 'vs/workbench/services/backup/common/backup';
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
+import { Disposable } from 'vs/base/common/lifecycle';
 import { ITextFileService, TextFileModelChangeEvent, StateChange } from 'vs/workbench/services/textfile/common/textfiles';
 import { IUntitledEditorService } from 'vs/workbench/services/untitled/common/untitledEditorService';
 import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
@@ -17,12 +16,11 @@ import { IFilesConfiguration, AutoSaveConfiguration, CONTENT_CHANGE_EVENT_BUFFER
 
 const AUTO_SAVE_AFTER_DELAY_DISABLED_TIME = CONTENT_CHANGE_EVENT_BUFFER_DELAY + 500;
 
-export class BackupModelTracker implements IWorkbenchContribution {
+export class BackupModelTracker extends Disposable implements IWorkbenchContribution {
 
-	public _serviceBrand: any;
+	_serviceBrand: any;
 
 	private configuredAutoSaveAfterDelay: boolean;
-	private toDispose: IDisposable[];
 
 	constructor(
 		@IBackupFileService private backupFileService: IBackupFileService,
@@ -30,27 +28,24 @@ export class BackupModelTracker implements IWorkbenchContribution {
 		@IUntitledEditorService private untitledEditorService: IUntitledEditorService,
 		@IConfigurationService private configurationService: IConfigurationService
 	) {
-		this.toDispose = [];
+		super();
 
 		this.registerListeners();
 	}
 
 	private registerListeners() {
-		if (!this.backupFileService.backupEnabled) {
-			return;
-		}
 
 		// Listen for text file model changes
-		this.toDispose.push(this.textFileService.models.onModelContentChanged((e) => this.onTextFileModelChanged(e)));
-		this.toDispose.push(this.textFileService.models.onModelSaved((e) => this.discardBackup(e.resource)));
-		this.toDispose.push(this.textFileService.models.onModelDisposed((e) => this.discardBackup(e)));
+		this._register(this.textFileService.models.onModelContentChanged((e) => this.onTextFileModelChanged(e)));
+		this._register(this.textFileService.models.onModelSaved((e) => this.discardBackup(e.resource)));
+		this._register(this.textFileService.models.onModelDisposed((e) => this.discardBackup(e)));
 
 		// Listen for untitled model changes
-		this.toDispose.push(this.untitledEditorService.onDidChangeContent((e) => this.onUntitledModelChanged(e)));
-		this.toDispose.push(this.untitledEditorService.onDidDisposeModel((e) => this.discardBackup(e)));
+		this._register(this.untitledEditorService.onDidChangeContent((e) => this.onUntitledModelChanged(e)));
+		this._register(this.untitledEditorService.onDidDisposeModel((e) => this.discardBackup(e)));
 
 		// Listen to config changes
-		this.toDispose.push(this.configurationService.onDidChangeConfiguration(e => this.onConfigurationChange(this.configurationService.getValue<IFilesConfiguration>())));
+		this._register(this.configurationService.onDidChangeConfiguration(e => this.onConfigurationChange(this.configurationService.getValue<IFilesConfiguration>())));
 	}
 
 	private onConfigurationChange(configuration: IFilesConfiguration): void {
@@ -72,24 +67,20 @@ export class BackupModelTracker implements IWorkbenchContribution {
 			// Do not backup when auto save after delay is configured
 			if (!this.configuredAutoSaveAfterDelay) {
 				const model = this.textFileService.models.get(event.resource);
-				this.backupFileService.backupResource(model.getResource(), model.createSnapshot(), model.getVersionId()).done(null, errors.onUnexpectedError);
+				this.backupFileService.backupResource(model.getResource(), model.createSnapshot(), model.getVersionId());
 			}
 		}
 	}
 
 	private onUntitledModelChanged(resource: Uri): void {
 		if (this.untitledEditorService.isDirty(resource)) {
-			this.untitledEditorService.loadOrCreate({ resource }).then(model => this.backupFileService.backupResource(resource, model.createSnapshot(), model.getVersionId())).done(null, errors.onUnexpectedError);
+			this.untitledEditorService.loadOrCreate({ resource }).then(model => this.backupFileService.backupResource(resource, model.createSnapshot(), model.getVersionId()));
 		} else {
 			this.discardBackup(resource);
 		}
 	}
 
 	private discardBackup(resource: Uri): void {
-		this.backupFileService.discardResourceBackup(resource).done(null, errors.onUnexpectedError);
-	}
-
-	public dispose(): void {
-		this.toDispose = dispose(this.toDispose);
+		this.backupFileService.discardResourceBackup(resource);
 	}
 }
\ No newline at end of file
diff --git a/src/vs/workbench/parts/backup/common/backupRestorer.ts b/src/vs/workbench/parts/backup/common/backupRestorer.ts
index c9fba97e14b..c0ec7e46645 100644
--- a/src/vs/workbench/parts/backup/common/backupRestorer.ts
+++ b/src/vs/workbench/parts/backup/common/backupRestorer.ts
@@ -5,11 +5,10 @@
 
 'use strict';
 
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { IUntitledEditorService } from 'vs/workbench/services/untitled/common/untitledEditorService';
 import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
-import * as errors from 'vs/base/common/errors';
 import { IBackupFileService } from 'vs/workbench/services/backup/common/backup';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { IResourceInput } from 'vs/platform/editor/common/editor';
@@ -35,11 +34,7 @@ export class BackupRestorer implements IWorkbenchContribution {
 	}
 
 	private restoreBackups(): void {
-		if (this.backupFileService.backupEnabled) {
-			this.lifecycleService.when(LifecyclePhase.Running).then(() => {
-				this.doRestoreBackups().done(null, errors.onUnexpectedError);
-			});
-		}
+		this.lifecycleService.when(LifecyclePhase.Running).then(() => this.doRestoreBackups());
 	}
 
 	private doRestoreBackups(): TPromise<URI[]> {
diff --git a/src/vs/workbench/parts/cli/electron-browser/cli.contribution.ts b/src/vs/workbench/parts/cli/electron-browser/cli.contribution.ts
index 5e754fb953d..29c3894ea60 100644
--- a/src/vs/workbench/parts/cli/electron-browser/cli.contribution.ts
+++ b/src/vs/workbench/parts/cli/electron-browser/cli.contribution.ts
@@ -10,7 +10,6 @@ import * as pfs from 'vs/base/node/pfs';
 import * as platform from 'vs/base/common/platform';
 import { nfcall } from 'vs/base/common/async';
 import { TPromise } from 'vs/base/common/winjs.base';
-import URI from 'vs/base/common/uri';
 import { Action } from 'vs/base/common/actions';
 import { IWorkbenchActionRegistry, Extensions as ActionExtensions } from 'vs/workbench/common/actions';
 import { Registry } from 'vs/platform/registry/common/platform';
@@ -20,6 +19,7 @@ import { INotificationService } from 'vs/platform/notification/common/notificati
 import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
 import Severity from 'vs/base/common/severity';
 import { ILogService } from 'vs/platform/log/common/log';
+import { getPathFromAmdModule } from 'vs/base/common/amd';
 
 function ignore<T>(code: string, value: T = null): (err: any) => TPromise<T> {
 	return err => err.code === code ? TPromise.as<T>(value) : TPromise.wrapError<T>(err);
@@ -28,7 +28,7 @@ function ignore<T>(code: string, value: T = null): (err: any) => TPromise<T> {
 let _source: string = null;
 function getSource(): string {
 	if (!_source) {
-		const root = URI.parse(require.toUrl('')).fsPath;
+		const root = getPathFromAmdModule(require, '');
 		_source = path.resolve(root, '..', 'bin', 'code');
 	}
 	return _source;
@@ -70,20 +70,16 @@ class InstallAction extends Action {
 					if (!isAvailable || isInstalled) {
 						return TPromise.as(null);
 					} else {
-						const createSymlink = () => {
-							return pfs.unlink(this.target)
-								.then(null, ignore('ENOENT'))
-								.then(() => pfs.symlink(getSource(), this.target));
-						};
+						return pfs.unlink(this.target)
+							.then(null, ignore('ENOENT'))
+							.then(() => pfs.symlink(getSource(), this.target))
+							.then(null, err => {
+								if (err.code === 'EACCES' || err.code === 'ENOENT') {
+									return this.createBinFolderAndSymlinkAsAdmin();
+								}
 
-						return createSymlink().then(null, err => {
-							if (err.code === 'EACCES' || err.code === 'ENOENT') {
-								return this.createBinFolder()
-									.then(() => createSymlink());
-							}
-
-							return TPromise.wrapError(err);
-						});
+								return TPromise.wrapError(err);
+							});
 					}
 				})
 				.then(() => {
@@ -101,18 +97,18 @@ class InstallAction extends Action {
 			.then(null, ignore('ENOENT', false));
 	}
 
-	private createBinFolder(): TPromise<void> {
+	private createBinFolderAndSymlinkAsAdmin(): TPromise<void> {
 		return new TPromise<void>((c, e) => {
 			const buttons = [nls.localize('ok', "OK"), nls.localize('cancel2', "Cancel")];
 
 			this.dialogService.show(Severity.Info, nls.localize('warnEscalation', "Code will now prompt with 'osascript' for Administrator privileges to install the shell command."), buttons, { cancelId: 1 }).then(choice => {
 				switch (choice) {
 					case 0 /* OK */:
-						const command = 'osascript -e "do shell script \\"mkdir -p /usr/local/bin && chown \\" & (do shell script (\\"whoami\\")) & \\" /usr/local/bin\\" with administrator privileges"';
+						const command = 'osascript -e "do shell script \\"mkdir -p /usr/local/bin && ln -sf \'' + getSource() + '\' \'' + this.target + '\'\\" with administrator privileges"';
 
 						nfcall(cp.exec, command, {})
 							.then(null, _ => TPromise.wrapError(new Error(nls.localize('cantCreateBinFolder', "Unable to create '/usr/local/bin'."))))
-							.done(c, e);
+							.then(c, e);
 						break;
 					case 1 /* Cancel */:
 						e(new Error(nls.localize('aborted', "Aborted")));
@@ -132,7 +128,8 @@ class UninstallAction extends Action {
 		id: string,
 		label: string,
 		@INotificationService private notificationService: INotificationService,
-		@ILogService private logService: ILogService
+		@ILogService private logService: ILogService,
+		@IDialogService private dialogService: IDialogService
 	) {
 		super(id, label);
 	}
@@ -149,12 +146,42 @@ class UninstallAction extends Action {
 				return undefined;
 			}
 
-			return pfs.unlink(this.target)
-				.then(null, ignore('ENOENT'))
-				.then(() => {
-					this.logService.trace('cli#uninstall', this.target);
-					this.notificationService.info(nls.localize('successFrom', "Shell command '{0}' successfully uninstalled from PATH.", product.applicationName));
-				});
+			const uninstall = () => {
+				return pfs.unlink(this.target)
+					.then(null, ignore('ENOENT'));
+			};
+
+			return uninstall().then(null, err => {
+				if (err.code === 'EACCES') {
+					return this.deleteSymlinkAsAdmin();
+				}
+
+				return TPromise.wrapError(err);
+			}).then(() => {
+				this.logService.trace('cli#uninstall', this.target);
+				this.notificationService.info(nls.localize('successFrom', "Shell command '{0}' successfully uninstalled from PATH.", product.applicationName));
+			});
+		});
+	}
+
+	private deleteSymlinkAsAdmin(): TPromise<void> {
+		return new TPromise<void>((c, e) => {
+			const buttons = [nls.localize('ok', "OK"), nls.localize('cancel2', "Cancel")];
+
+			this.dialogService.show(Severity.Info, nls.localize('warnEscalationUninstall', "Code will now prompt with 'osascript' for Administrator privileges to uninstall the shell command."), buttons, { cancelId: 1 }).then(choice => {
+				switch (choice) {
+					case 0 /* OK */:
+						const command = 'osascript -e "do shell script \\"rm \'' + this.target + '\'\\" with administrator privileges"';
+
+						nfcall(cp.exec, command, {})
+							.then(null, _ => TPromise.wrapError(new Error(nls.localize('cantUninstall', "Unable to uninstall the shell command '{0}'.", this.target))))
+							.then(c, e);
+						break;
+					case 1 /* Cancel */:
+						e(new Error(nls.localize('aborted', "Aborted")));
+						break;
+				}
+			});
 		});
 	}
 }
diff --git a/src/vs/workbench/parts/codeEditor/browser/media/suggestEnabledInput.css b/src/vs/workbench/parts/codeEditor/browser/media/suggestEnabledInput.css
new file mode 100644
index 00000000000..65fd4a3c8ba
--- /dev/null
+++ b/src/vs/workbench/parts/codeEditor/browser/media/suggestEnabledInput.css
@@ -0,0 +1,27 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+.suggest-input-container {
+	padding: 3px 4px 5px;
+}
+
+.suggest-input-container .monaco-editor-background,
+.suggest-input-container .monaco-editor,
+.suggest-input-container .mtk1 {
+	/* allow the embedded monaco to be styled from the outer context */
+	background-color: transparent;
+	color: inherit;
+}
+
+.suggest-input-container .suggest-input-placeholder {
+	position: absolute;
+	z-index: 1;
+	overflow: hidden;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+	pointer-events: none;
+	margin-top: 2px;
+	margin-left: 1px;
+}
\ No newline at end of file
diff --git a/src/vs/workbench/parts/codeEditor/electron-browser/menuPreventer.ts b/src/vs/workbench/parts/codeEditor/browser/menuPreventer.ts
similarity index 100%
rename from src/vs/workbench/parts/codeEditor/electron-browser/menuPreventer.ts
rename to src/vs/workbench/parts/codeEditor/browser/menuPreventer.ts
diff --git a/src/vs/workbench/parts/codeEditor/browser/simpleEditorOptions.ts b/src/vs/workbench/parts/codeEditor/browser/simpleEditorOptions.ts
new file mode 100644
index 00000000000..a18c1f0479d
--- /dev/null
+++ b/src/vs/workbench/parts/codeEditor/browser/simpleEditorOptions.ts
@@ -0,0 +1,31 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { IEditorOptions } from 'vs/editor/common/config/editorOptions';
+
+export function getSimpleEditorOptions(): IEditorOptions {
+	return {
+		wordWrap: 'on',
+		overviewRulerLanes: 0,
+		glyphMargin: false,
+		lineNumbers: 'off',
+		folding: false,
+		selectOnLineNumbers: false,
+		hideCursorInOverviewRuler: true,
+		selectionHighlight: false,
+		scrollbar: {
+			horizontal: 'hidden'
+		},
+		lineDecorationsWidth: 0,
+		overviewRulerBorder: false,
+		scrollBeyondLastLine: false,
+		renderLineHighlight: 'none',
+		fixedOverflowWidgets: true,
+		acceptSuggestionOnEnter: 'smart',
+		minimap: {
+			enabled: false
+		}
+	};
+}
diff --git a/src/vs/workbench/parts/codeEditor/browser/suggestEnabledInput.ts b/src/vs/workbench/parts/codeEditor/browser/suggestEnabledInput.ts
new file mode 100644
index 00000000000..62d86f7f955
--- /dev/null
+++ b/src/vs/workbench/parts/codeEditor/browser/suggestEnabledInput.ts
@@ -0,0 +1,260 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+import { $, addClass, append, Dimension, removeClass } from 'vs/base/browser/dom';
+import { Widget } from 'vs/base/browser/ui/widget';
+import { Color } from 'vs/base/common/color';
+import { chain, Emitter, Event } from 'vs/base/common/event';
+import { KeyCode } from 'vs/base/common/keyCodes';
+import { dispose, IDisposable } from 'vs/base/common/lifecycle';
+import { isMacintosh } from 'vs/base/common/platform';
+import { URI as uri } from 'vs/base/common/uri';
+import 'vs/css!./media/suggestEnabledInput';
+import { CodeEditorWidget } from 'vs/editor/browser/widget/codeEditorWidget';
+import { IEditorOptions } from 'vs/editor/common/config/editorOptions';
+import { Position } from 'vs/editor/common/core/position';
+import { Range } from 'vs/editor/common/core/range';
+import { ITextModel } from 'vs/editor/common/model';
+import * as modes from 'vs/editor/common/modes';
+import { IModelService } from 'vs/editor/common/services/modelService';
+import { ContextMenuController } from 'vs/editor/contrib/contextmenu/contextmenu';
+import { SnippetController2 } from 'vs/editor/contrib/snippet/snippetController2';
+import { SuggestController } from 'vs/editor/contrib/suggest/suggestController';
+import { IContextKey } from 'vs/platform/contextkey/common/contextkey';
+import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { ColorIdentifier, inputBackground, inputBorder, inputForeground, inputPlaceholderForeground } from 'vs/platform/theme/common/colorRegistry';
+import { attachStyler, IStyleOverrides, IThemable } from 'vs/platform/theme/common/styler';
+import { IThemeService } from 'vs/platform/theme/common/themeService';
+import { MenuPreventer } from 'vs/workbench/parts/codeEditor/browser/menuPreventer';
+import { getSimpleEditorOptions } from 'vs/workbench/parts/codeEditor/browser/simpleEditorOptions';
+import { EditOperation } from 'vs/editor/common/core/editOperation';
+
+interface SuggestResultsProvider {
+	/**
+	 * Provider function for suggestion results.
+	 *
+	 * @param query the full text of the input.
+	 */
+	provideResults: (query: string) => string[];
+
+	/**
+	 * Trigger characters for this input. Suggestions will appear when one of these is typed,
+	 * or upon `ctrl+space` triggering at a word boundary.
+	 *
+	 * Defaults to the empty array.
+	 */
+	triggerCharacters?: string[];
+
+	/**
+	 * Defines the sorting function used when showing results.
+	 *
+	 * Defaults to the identity function.
+	 */
+	sortKey?: (result: string) => string;
+}
+
+interface SuggestEnabledInputOptions {
+	/**
+	 * The text to show when no input is present.
+	 *
+	 * Defaults to the empty string.
+	 */
+	placeholderText?: string;
+
+	/**
+	 * Context key tracking the focus state of this element
+	 */
+	focusContextKey?: IContextKey<boolean>;
+}
+
+export interface ISuggestEnabledInputStyleOverrides extends IStyleOverrides {
+	inputBackground?: ColorIdentifier;
+	inputForeground?: ColorIdentifier;
+	inputBorder?: ColorIdentifier;
+	inputPlaceholderForeground?: ColorIdentifier;
+}
+
+type ISuggestEnabledInputStyles = {
+	[P in keyof ISuggestEnabledInputStyleOverrides]: Color;
+};
+
+
+export function attachSuggestEnabledInputBoxStyler(widget: IThemable, themeService: IThemeService, style?: ISuggestEnabledInputStyleOverrides): IDisposable {
+	return attachStyler(themeService, {
+		inputBackground: (style && style.inputBackground) || inputBackground,
+		inputForeground: (style && style.inputForeground) || inputForeground,
+		inputBorder: (style && style.inputBorder) || inputBorder,
+		inputPlaceholderForeground: (style && style.inputPlaceholderForeground) || inputPlaceholderForeground,
+	} as ISuggestEnabledInputStyleOverrides, widget);
+}
+
+
+export class SuggestEnabledInput extends Widget implements IThemable {
+
+	private _onShouldFocusResults = new Emitter<void>();
+	readonly onShouldFocusResults: Event<void> = this._onShouldFocusResults.event;
+
+	private _onEnter = new Emitter<void>();
+	readonly onEnter: Event<void> = this._onEnter.event;
+
+	private _onInputDidChange = new Emitter<string>();
+	readonly onInputDidChange: Event<string> = this._onInputDidChange.event;
+
+	private disposables: IDisposable[] = [];
+	private inputWidget: CodeEditorWidget;
+	private stylingContainer: HTMLDivElement;
+	private placeholderText: HTMLDivElement;
+
+	constructor(
+		id: string,
+		parent: HTMLElement,
+		suggestionProvider: SuggestResultsProvider,
+		ariaLabel: string,
+		resourceHandle: string,
+		options: SuggestEnabledInputOptions,
+		@IInstantiationService instantiationService: IInstantiationService,
+		@IModelService modelService: IModelService,
+	) {
+		super();
+
+		this.stylingContainer = append(parent, $('.suggest-input-container'));
+		this.placeholderText = append(this.stylingContainer, $('.suggest-input-placeholder', null, options.placeholderText || ''));
+
+		this.inputWidget = instantiationService.createInstance(CodeEditorWidget, this.stylingContainer,
+			mixinHTMLInputStyleOptions(getSimpleEditorOptions(), ariaLabel),
+			{
+				contributions: [SuggestController, SnippetController2, ContextMenuController, MenuPreventer],
+				isSimpleWidget: true,
+			});
+
+		let scopeHandle = uri.parse(resourceHandle);
+		this.inputWidget.setModel(modelService.createModel('', null, scopeHandle, true));
+
+		this.disposables.push(this.inputWidget.onDidPaste(() => this.setValue(this.getValue()))); // setter cleanses
+
+		this.disposables.push((this.inputWidget.onDidFocusEditorText(() => {
+			if (options.focusContextKey) { options.focusContextKey.set(true); }
+			addClass(this.stylingContainer, 'synthetic-focus');
+		})));
+		this.disposables.push((this.inputWidget.onDidBlurEditorText(() => {
+			if (options.focusContextKey) { options.focusContextKey.set(false); }
+			removeClass(this.stylingContainer, 'synthetic-focus');
+		})));
+
+		const onKeyDownMonaco = chain(this.inputWidget.onKeyDown);
+		onKeyDownMonaco.filter(e => e.keyCode === KeyCode.Enter).on(e => { e.preventDefault(); this._onEnter.fire(); }, this, this.disposables);
+		onKeyDownMonaco.filter(e => e.keyCode === KeyCode.DownArrow && (isMacintosh ? e.metaKey : e.ctrlKey)).on(() => this._onShouldFocusResults.fire(), this, this.disposables);
+
+		let preexistingContent = this.getValue();
+		this.disposables.push(this.inputWidget.getModel().onDidChangeContent(() => {
+			let content = this.getValue();
+			this.placeholderText.style.visibility = content ? 'hidden' : 'visible';
+			if (preexistingContent.trim() === content.trim()) { return; }
+			this._onInputDidChange.fire();
+			preexistingContent = content;
+		}));
+
+		let validatedSuggestProvider = {
+			provideResults: suggestionProvider.provideResults,
+			sortKey: suggestionProvider.sortKey || (a => a),
+			triggerCharacters: suggestionProvider.triggerCharacters || []
+		};
+
+		this.disposables.push(modes.SuggestRegistry.register({ scheme: scopeHandle.scheme, pattern: '**/' + scopeHandle.path, hasAccessToAllModels: true }, {
+			triggerCharacters: validatedSuggestProvider.triggerCharacters,
+			provideCompletionItems: (model: ITextModel, position: Position, _context: modes.SuggestContext) => {
+				let query = model.getValue();
+
+				let wordStart = query.lastIndexOf(' ', position.column - 1) + 1;
+				let alreadyTypedCount = position.column - wordStart - 1;
+
+				// dont show suggestions if the user has typed something, but hasn't used the trigger character
+				if (alreadyTypedCount > 0 && (validatedSuggestProvider.triggerCharacters).indexOf(query[wordStart]) === -1) { return { suggestions: [] }; }
+
+				return {
+					suggestions: suggestionProvider.provideResults(query).map(result => {
+						return {
+							label: result,
+							insertText: result,
+							overwriteBefore: alreadyTypedCount,
+							sortText: validatedSuggestProvider.sortKey(result),
+							type: <modes.SuggestionType>'keyword'
+						};
+					})
+				};
+			}
+		}));
+	}
+
+	public setValue(val: string) {
+		val = val.replace(/\s/g, ' ');
+		const fullRange = new Range(1, 1, 1, this.getValue().length + 1);
+		this.inputWidget.executeEdits('suggestEnabledInput.setValue', [EditOperation.replace(fullRange, val)]);
+		this.inputWidget.setScrollTop(0);
+		this.inputWidget.setPosition(new Position(1, val.length + 1));
+	}
+
+	public getValue(): string {
+		return this.inputWidget.getValue();
+	}
+
+
+	public style(colors: ISuggestEnabledInputStyles): void {
+		this.stylingContainer.style.backgroundColor = colors.inputBackground && colors.inputBackground.toString();
+		this.stylingContainer.style.color = colors.inputForeground && colors.inputForeground.toString();
+		this.placeholderText.style.color = colors.inputPlaceholderForeground && colors.inputPlaceholderForeground.toString();
+
+		this.stylingContainer.style.borderWidth = '1px';
+		this.stylingContainer.style.borderStyle = 'solid';
+		this.stylingContainer.style.borderColor = colors.inputBorder ?
+			colors.inputBorder.toString() :
+			'transparent';
+
+		const cursor = this.stylingContainer.getElementsByClassName('cursor')[0] as HTMLDivElement;
+		if (cursor) {
+			cursor.style.backgroundColor = colors.inputForeground && colors.inputForeground.toString();
+		}
+	}
+
+	public focus(selectAll?: boolean): void {
+		this.inputWidget.focus();
+
+		if (selectAll && this.inputWidget.getValue()) {
+			this.selectAll();
+		}
+	}
+
+	public layout(dimension: Dimension): void {
+		this.inputWidget.layout(dimension);
+		this.placeholderText.style.width = `${dimension.width}px`;
+	}
+
+	private selectAll(): void {
+		this.inputWidget.setSelection(new Range(1, 1, 1, this.getValue().length + 1));
+	}
+
+	dispose(): void {
+		this.disposables = dispose(this.disposables);
+		super.dispose();
+	}
+}
+
+
+function mixinHTMLInputStyleOptions(config: IEditorOptions, ariaLabel?: string): IEditorOptions {
+	config.fontSize = 13;
+	config.lineHeight = 22;
+	config.wordWrap = 'off';
+	config.scrollbar.vertical = 'hidden';
+	config.roundedSelection = false;
+	config.ariaLabel = ariaLabel || '';
+	config.renderIndentGuides = false;
+	config.cursorWidth = 1;
+	config.snippetSuggestions = 'none';
+	config.suggest = { filterGraceful: false };
+	config.fontFamily = ' -apple-system, BlinkMacSystemFont, "Segoe WPC", "Segoe UI", "HelveticaNeue-Light", "Ubuntu", "Droid Sans", sans-serif';
+	return config;
+}
diff --git a/src/vs/workbench/parts/codeEditor/codeEditor.contribution.ts b/src/vs/workbench/parts/codeEditor/codeEditor.contribution.ts
index cc4c07f981a..d66877173a1 100644
--- a/src/vs/workbench/parts/codeEditor/codeEditor.contribution.ts
+++ b/src/vs/workbench/parts/codeEditor/codeEditor.contribution.ts
@@ -6,7 +6,7 @@
 import './electron-browser/accessibility';
 import './electron-browser/inspectKeybindings';
 import './electron-browser/largeFileOptimizations';
-import './electron-browser/menuPreventer';
+import './browser/menuPreventer';
 import './electron-browser/selectionClipboard';
 import './electron-browser/textMate/inspectTMScopes';
 import './electron-browser/toggleMinimap';
diff --git a/src/vs/workbench/parts/codeEditor/electron-browser/accessibility.ts b/src/vs/workbench/parts/codeEditor/electron-browser/accessibility.ts
index a9e4ec6741e..ab344b9b990 100644
--- a/src/vs/workbench/parts/codeEditor/electron-browser/accessibility.ts
+++ b/src/vs/workbench/parts/codeEditor/electron-browser/accessibility.ts
@@ -29,8 +29,8 @@ import * as editorOptions from 'vs/editor/common/config/editorOptions';
 import * as platform from 'vs/base/common/platform';
 import { alert } from 'vs/base/browser/ui/aria/aria';
 import { IOpenerService } from 'vs/platform/opener/common/opener';
-import URI from 'vs/base/common/uri';
-import { KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRegistry';
+import { URI } from 'vs/base/common/uri';
+import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
 
 const CONTEXT_ACCESSIBILITY_WIDGET_VISIBLE = new RawContextKey<boolean>('accessibilityHelpWidgetVisible', false);
 
@@ -286,7 +286,8 @@ class ShowAccessibilityHelpAction extends EditorAction {
 			precondition: null,
 			kbOpts: {
 				kbExpr: EditorContextKeys.focus,
-				primary: KeyMod.Alt | KeyCode.F1
+				primary: KeyMod.Alt | KeyCode.F1,
+				weight: KeybindingWeight.EditorContrib
 			}
 		});
 	}
@@ -309,7 +310,7 @@ registerEditorCommand(new AccessibilityHelpCommand({
 	precondition: CONTEXT_ACCESSIBILITY_WIDGET_VISIBLE,
 	handler: x => x.hide(),
 	kbOpts: {
-		weight: KeybindingsRegistry.WEIGHT.editorContrib(100),
+		weight: KeybindingWeight.EditorContrib + 100,
 		kbExpr: EditorContextKeys.focus,
 		primary: KeyCode.Escape, secondary: [KeyMod.Shift | KeyCode.Escape]
 	}
diff --git a/src/vs/workbench/parts/codeEditor/electron-browser/languageConfiguration/languageConfigurationExtensionPoint.ts b/src/vs/workbench/parts/codeEditor/electron-browser/languageConfiguration/languageConfigurationExtensionPoint.ts
index 5f5612b0a5e..a7f79a6be50 100644
--- a/src/vs/workbench/parts/codeEditor/electron-browser/languageConfiguration/languageConfigurationExtensionPoint.ts
+++ b/src/vs/workbench/parts/codeEditor/electron-browser/languageConfiguration/languageConfigurationExtensionPoint.ts
@@ -7,7 +7,6 @@
 import * as nls from 'vs/nls';
 import * as types from 'vs/base/common/types';
 import { parse, ParseError } from 'vs/base/common/json';
-import { readFile } from 'vs/base/node/pfs';
 import { CharacterPair, LanguageConfiguration, IAutoClosingPair, IAutoClosingPairConditional, IndentationRule, CommentRule, FoldingRules } from 'vs/editor/common/modes/languageConfiguration';
 import { IModeService } from 'vs/editor/common/services/modeService';
 import { LanguageConfigurationRegistry } from 'vs/editor/common/modes/languageConfigurationRegistry';
@@ -16,6 +15,8 @@ import { Registry } from 'vs/platform/registry/common/platform';
 import { IJSONSchema } from 'vs/base/common/jsonSchema';
 import { LanguageIdentifier } from 'vs/editor/common/modes';
 import { ITextMateService } from 'vs/workbench/services/textMate/electron-browser/textMateService';
+import { URI } from 'vs/base/common/uri';
+import { IFileService } from 'vs/platform/files/common/files';
 
 interface IRegExp {
 	pattern: string;
@@ -37,6 +38,7 @@ interface ILanguageConfiguration {
 	wordPattern?: string | IRegExp;
 	indentationRules?: IIndentationRules;
 	folding?: FoldingRules;
+	autoCloseBefore?: string;
 }
 
 function isStringArr(something: string[]): boolean {
@@ -61,14 +63,13 @@ function isCharacterPair(something: CharacterPair): boolean {
 
 export class LanguageConfigurationFileHandler {
 
-	private _modeService: IModeService;
 	private _done: boolean[];
 
 	constructor(
 		@ITextMateService textMateService: ITextMateService,
-		@IModeService modeService: IModeService
+		@IModeService private readonly _modeService: IModeService,
+		@IFileService private readonly _fileService: IFileService
 	) {
-		this._modeService = modeService;
 		this._done = [];
 
 		// Listen for hints that a language configuration is needed/usefull and then load it once
@@ -85,15 +86,15 @@ export class LanguageConfigurationFileHandler {
 		this._done[languageIdentifier.id] = true;
 
 		let configurationFiles = this._modeService.getConfigurationFiles(languageIdentifier.language);
-		configurationFiles.forEach((configFilePath) => this._handleConfigFile(languageIdentifier, configFilePath));
+		configurationFiles.forEach((configFileLocation) => this._handleConfigFile(languageIdentifier, configFileLocation));
 	}
 
-	private _handleConfigFile(languageIdentifier: LanguageIdentifier, configFilePath: string): void {
-		readFile(configFilePath).then((fileContents) => {
+	private _handleConfigFile(languageIdentifier: LanguageIdentifier, configFileLocation: URI): void {
+		this._fileService.resolveContent(configFileLocation, { encoding: 'utf8' }).then((contents) => {
 			const errors: ParseError[] = [];
-			const configuration = <ILanguageConfiguration>parse(fileContents.toString(), errors);
+			const configuration = <ILanguageConfiguration>parse(contents.value.toString(), errors);
 			if (errors.length) {
-				console.error(nls.localize('parseErrors', "Errors parsing {0}: {1}", configFilePath, errors.join('\n')));
+				console.error(nls.localize('parseErrors', "Errors parsing {0}: {1}", configFileLocation.toString(), errors.join('\n')));
 			}
 			this._handleConfig(languageIdentifier, configuration);
 		}, (err) => {
@@ -274,6 +275,11 @@ export class LanguageConfigurationFileHandler {
 			richEditConfig.surroundingPairs = surroundingPairs;
 		}
 
+		const autoCloseBefore = configuration.autoCloseBefore;
+		if (typeof autoCloseBefore === 'string') {
+			richEditConfig.autoCloseBefore = autoCloseBefore;
+		}
+
 		if (configuration.wordPattern) {
 			try {
 				let wordPattern = this._parseRegex(configuration.wordPattern);
@@ -433,6 +439,11 @@ const schema: IJSONSchema = {
 				}]
 			}
 		},
+		autoCloseBefore: {
+			default: ';:.,=}])> \n\t',
+			description: nls.localize('schema.autoCloseBefore', 'Defines what characters must be after the cursor in order for bracket or quote autoclosing to occur when using the \'languageDefined\' autoclosing setting. This is typically the set of characters which can not start an expression.'),
+			type: 'string',
+		},
 		surroundingPairs: {
 			default: [['(', ')'], ['[', ']'], ['{', '}']],
 			description: nls.localize('schema.surroundingPairs', 'Defines the bracket pairs that can be used to surround a selected string.'),
diff --git a/src/vs/workbench/parts/codeEditor/electron-browser/simpleEditorOptions.ts b/src/vs/workbench/parts/codeEditor/electron-browser/simpleEditorOptions.ts
new file mode 100644
index 00000000000..4e3a0f1a14c
--- /dev/null
+++ b/src/vs/workbench/parts/codeEditor/electron-browser/simpleEditorOptions.ts
@@ -0,0 +1,26 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { ICodeEditorWidgetOptions } from 'vs/editor/browser/widget/codeEditorWidget';
+import { MenuPreventer } from 'vs/workbench/parts/codeEditor/browser/menuPreventer';
+import { SelectionClipboard } from 'vs/workbench/parts/codeEditor/electron-browser/selectionClipboard';
+import { ContextMenuController } from 'vs/editor/contrib/contextmenu/contextmenu';
+import { SuggestController } from 'vs/editor/contrib/suggest/suggestController';
+import { SnippetController2 } from 'vs/editor/contrib/snippet/snippetController2';
+import { TabCompletionController } from 'vs/workbench/parts/snippets/electron-browser/tabCompletion';
+
+export function getSimpleCodeEditorWidgetOptions(): ICodeEditorWidgetOptions {
+	return {
+		isSimpleWidget: true,
+		contributions: [
+			MenuPreventer,
+			SelectionClipboard,
+			ContextMenuController,
+			SuggestController,
+			SnippetController2,
+			TabCompletionController,
+		]
+	};
+}
\ No newline at end of file
diff --git a/src/vs/workbench/parts/codeEditor/electron-browser/toggleMinimap.ts b/src/vs/workbench/parts/codeEditor/electron-browser/toggleMinimap.ts
index 8361e7b855b..36617f7b8c3 100644
--- a/src/vs/workbench/parts/codeEditor/electron-browser/toggleMinimap.ts
+++ b/src/vs/workbench/parts/codeEditor/electron-browser/toggleMinimap.ts
@@ -10,7 +10,7 @@ import { Registry } from 'vs/platform/registry/common/platform';
 import { IWorkbenchActionRegistry, Extensions as ActionExtensions } from 'vs/workbench/common/actions';
 import { Action } from 'vs/base/common/actions';
 import { TPromise } from 'vs/base/common/winjs.base';
-import { SyncActionDescriptor } from 'vs/platform/actions/common/actions';
+import { SyncActionDescriptor, MenuRegistry, MenuId } from 'vs/platform/actions/common/actions';
 
 export class ToggleMinimapAction extends Action {
 	public static readonly ID = 'editor.action.toggleMinimap';
@@ -32,3 +32,12 @@ export class ToggleMinimapAction extends Action {
 
 const registry = Registry.as<IWorkbenchActionRegistry>(ActionExtensions.WorkbenchActions);
 registry.registerWorkbenchAction(new SyncActionDescriptor(ToggleMinimapAction, ToggleMinimapAction.ID, ToggleMinimapAction.LABEL), 'View: Toggle Minimap');
+
+MenuRegistry.appendMenuItem(MenuId.MenubarViewMenu, {
+	group: '5_editor',
+	command: {
+		id: ToggleMinimapAction.ID,
+		title: nls.localize({ key: 'miToggleMinimap', comment: ['&& denotes a mnemonic'] }, "Toggle &&Minimap")
+	},
+	order: 2
+});
diff --git a/src/vs/workbench/parts/codeEditor/electron-browser/toggleMultiCursorModifier.ts b/src/vs/workbench/parts/codeEditor/electron-browser/toggleMultiCursorModifier.ts
index e7b79739e01..608554450f8 100644
--- a/src/vs/workbench/parts/codeEditor/electron-browser/toggleMultiCursorModifier.ts
+++ b/src/vs/workbench/parts/codeEditor/electron-browser/toggleMultiCursorModifier.ts
@@ -6,11 +6,15 @@
 
 import { TPromise } from 'vs/base/common/winjs.base';
 import * as nls from 'vs/nls';
+import * as platform from 'vs/base/common/platform';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { Action } from 'vs/base/common/actions';
-import { SyncActionDescriptor } from 'vs/platform/actions/common/actions';
+import { SyncActionDescriptor, MenuRegistry, MenuId } from 'vs/platform/actions/common/actions';
 import { IWorkbenchActionRegistry, Extensions } from 'vs/workbench/common/actions';
 import { IConfigurationService, ConfigurationTarget } from 'vs/platform/configuration/common/configuration';
+import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions, IWorkbenchContribution } from 'vs/workbench/common/contributions';
+import { LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
+import { RawContextKey, IContextKeyService, IContextKey } from 'vs/platform/contextkey/common/contextkey';
 
 export class ToggleMultiCursorModifierAction extends Action {
 
@@ -35,5 +39,55 @@ export class ToggleMultiCursorModifierAction extends Action {
 	}
 }
 
+const multiCursorModifier = new RawContextKey<string>('multiCursorModifier', 'altKey');
+
+class MultiCursorModifierContextKeyController implements IWorkbenchContribution {
+
+	private readonly _multiCursorModifier: IContextKey<string>;
+
+	constructor(
+		@IConfigurationService private readonly configurationService: IConfigurationService,
+		@IContextKeyService contextKeyService: IContextKeyService
+	) {
+		this._multiCursorModifier = multiCursorModifier.bindTo(contextKeyService);
+		configurationService.onDidChangeConfiguration((e) => {
+			if (e.affectsConfiguration('editor.multiCursorModifier')) {
+				this._update();
+			}
+		});
+	}
+
+	private _update(): void {
+		const editorConf = this.configurationService.getValue<{ multiCursorModifier: 'ctrlCmd' | 'alt' }>('editor');
+		const value = (editorConf.multiCursorModifier === 'ctrlCmd' ? 'ctrlCmd' : 'altKey');
+		this._multiCursorModifier.set(value);
+	}
+}
+
+Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench).registerWorkbenchContribution(MultiCursorModifierContextKeyController, LifecyclePhase.Running);
+
+
 const registry = Registry.as<IWorkbenchActionRegistry>(Extensions.WorkbenchActions);
 registry.registerWorkbenchAction(new SyncActionDescriptor(ToggleMultiCursorModifierAction, ToggleMultiCursorModifierAction.ID, ToggleMultiCursorModifierAction.LABEL), 'Toggle Multi-Cursor Modifier');
+MenuRegistry.appendMenuItem(MenuId.MenubarSelectionMenu, {
+	group: '3_multi',
+	command: {
+		id: ToggleMultiCursorModifierAction.ID,
+		title: nls.localize('miMultiCursorAlt', "Switch to Alt+Click for Multi-Cursor")
+	},
+	when: multiCursorModifier.isEqualTo('ctrlCmd'),
+	order: 1
+});
+MenuRegistry.appendMenuItem(MenuId.MenubarSelectionMenu, {
+	group: '3_multi',
+	command: {
+		id: ToggleMultiCursorModifierAction.ID,
+		title: (
+			platform.isMacintosh
+				? nls.localize('miMultiCursorCmd', "Switch to Cmd+Click for Multi-Cursor")
+				: nls.localize('miMultiCursorCtrl', "Switch to Ctrl+Click for Multi-Cursor")
+		)
+	},
+	when: multiCursorModifier.isEqualTo('altKey'),
+	order: 1
+});
\ No newline at end of file
diff --git a/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderControlCharacter.ts b/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderControlCharacter.ts
index 7c35e71b00c..42c4e6bf068 100644
--- a/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderControlCharacter.ts
+++ b/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderControlCharacter.ts
@@ -10,7 +10,7 @@ import { Registry } from 'vs/platform/registry/common/platform';
 import { IWorkbenchActionRegistry, Extensions as ActionExtensions } from 'vs/workbench/common/actions';
 import { Action } from 'vs/base/common/actions';
 import { TPromise } from 'vs/base/common/winjs.base';
-import { SyncActionDescriptor } from 'vs/platform/actions/common/actions';
+import { SyncActionDescriptor, MenuRegistry, MenuId } from 'vs/platform/actions/common/actions';
 
 export class ToggleRenderControlCharacterAction extends Action {
 
@@ -33,3 +33,12 @@ export class ToggleRenderControlCharacterAction extends Action {
 
 const registry = Registry.as<IWorkbenchActionRegistry>(ActionExtensions.WorkbenchActions);
 registry.registerWorkbenchAction(new SyncActionDescriptor(ToggleRenderControlCharacterAction, ToggleRenderControlCharacterAction.ID, ToggleRenderControlCharacterAction.LABEL), 'View: Toggle Control Characters');
+
+MenuRegistry.appendMenuItem(MenuId.MenubarViewMenu, {
+	group: '5_editor',
+	command: {
+		id: ToggleRenderControlCharacterAction.ID,
+		title: nls.localize({ key: 'miToggleRenderControlCharacters', comment: ['&& denotes a mnemonic'] }, "Toggle &&Control Characters")
+	},
+	order: 4
+});
diff --git a/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderWhitespace.ts b/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderWhitespace.ts
index 856e35dce60..d9a61a863eb 100644
--- a/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderWhitespace.ts
+++ b/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderWhitespace.ts
@@ -10,7 +10,7 @@ import { Registry } from 'vs/platform/registry/common/platform';
 import { IWorkbenchActionRegistry, Extensions as ActionExtensions } from 'vs/workbench/common/actions';
 import { Action } from 'vs/base/common/actions';
 import { TPromise } from 'vs/base/common/winjs.base';
-import { SyncActionDescriptor } from 'vs/platform/actions/common/actions';
+import { SyncActionDescriptor, MenuRegistry, MenuId } from 'vs/platform/actions/common/actions';
 
 export class ToggleRenderWhitespaceAction extends Action {
 
@@ -41,3 +41,12 @@ export class ToggleRenderWhitespaceAction extends Action {
 
 const registry = Registry.as<IWorkbenchActionRegistry>(ActionExtensions.WorkbenchActions);
 registry.registerWorkbenchAction(new SyncActionDescriptor(ToggleRenderWhitespaceAction, ToggleRenderWhitespaceAction.ID, ToggleRenderWhitespaceAction.LABEL), 'View: Toggle Render Whitespace');
+
+MenuRegistry.appendMenuItem(MenuId.MenubarViewMenu, {
+	group: '5_editor',
+	command: {
+		id: ToggleRenderWhitespaceAction.ID,
+		title: nls.localize({ key: 'miToggleRenderWhitespace', comment: ['&& denotes a mnemonic'] }, "Toggle &&Render Whitespace")
+	},
+	order: 3
+});
diff --git a/src/vs/workbench/parts/codeEditor/electron-browser/toggleWordWrap.ts b/src/vs/workbench/parts/codeEditor/electron-browser/toggleWordWrap.ts
index 96f4858f078..bea4e2e3faa 100644
--- a/src/vs/workbench/parts/codeEditor/electron-browser/toggleWordWrap.ts
+++ b/src/vs/workbench/parts/codeEditor/electron-browser/toggleWordWrap.ts
@@ -13,11 +13,12 @@ import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService
 import { MenuRegistry, MenuId } from 'vs/platform/actions/common/actions';
 import { ContextKeyExpr, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { Disposable } from 'vs/base/common/lifecycle';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { InternalEditorOptions, EDITOR_DEFAULTS } from 'vs/editor/common/config/editorOptions';
 import { ITextResourceConfigurationService } from 'vs/editor/common/services/resourceConfiguration';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
 import { INotificationService } from 'vs/platform/notification/common/notification';
+import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
 
 const transientWordWrapState = 'transientWordWrapState';
 const isWordWrapMinifiedKey = 'isWordWrapMinified';
@@ -130,17 +131,19 @@ function applyWordWrapState(editor: ICodeEditor, state: IWordWrapState): void {
 	});
 }
 
+const TOGGLE_WORD_WRAP_ID = 'editor.action.toggleWordWrap';
 class ToggleWordWrapAction extends EditorAction {
 
 	constructor() {
 		super({
-			id: 'editor.action.toggleWordWrap',
+			id: TOGGLE_WORD_WRAP_ID,
 			label: nls.localize('toggle.wordwrap', "View: Toggle Word Wrap"),
 			alias: 'View: Toggle Word Wrap',
 			precondition: null,
 			kbOpts: {
 				kbExpr: null,
-				primary: KeyMod.Alt | KeyCode.KEY_Z
+				primary: KeyMod.Alt | KeyCode.KEY_Z,
+				weight: KeybindingWeight.EditorContrib
 			}
 		});
 	}
@@ -255,9 +258,9 @@ registerEditorAction(ToggleWordWrapAction);
 
 MenuRegistry.appendMenuItem(MenuId.EditorTitle, {
 	command: {
-		id: 'editor.action.toggleWordWrap',
+		id: TOGGLE_WORD_WRAP_ID,
 		title: nls.localize('unwrapMinified', "Disable wrapping for this file"),
-		iconPath: { dark: URI.parse(require.toUrl('vs/workbench/parts/codeEditor/electron-browser/media/WordWrap_16x.svg')).fsPath }
+		iconLocation: { dark: URI.parse(require.toUrl('vs/workbench/parts/codeEditor/electron-browser/media/WordWrap_16x.svg')) }
 	},
 	group: 'navigation',
 	order: 1,
@@ -269,9 +272,9 @@ MenuRegistry.appendMenuItem(MenuId.EditorTitle, {
 });
 MenuRegistry.appendMenuItem(MenuId.EditorTitle, {
 	command: {
-		id: 'editor.action.toggleWordWrap',
+		id: TOGGLE_WORD_WRAP_ID,
 		title: nls.localize('wrapMinified', "Enable wrapping for this file"),
-		iconPath: { dark: URI.parse(require.toUrl('vs/workbench/parts/codeEditor/electron-browser/media/WordWrap_16x.svg')).fsPath }
+		iconLocation: { dark: URI.parse(require.toUrl('vs/workbench/parts/codeEditor/electron-browser/media/WordWrap_16x.svg')) }
 	},
 	group: 'navigation',
 	order: 1,
@@ -281,3 +284,14 @@ MenuRegistry.appendMenuItem(MenuId.EditorTitle, {
 		ContextKeyExpr.not(isWordWrapMinifiedKey)
 	)
 });
+
+
+// View menu
+MenuRegistry.appendMenuItem(MenuId.MenubarViewMenu, {
+	group: '5_editor',
+	command: {
+		id: TOGGLE_WORD_WRAP_ID,
+		title: nls.localize({ key: 'miToggleWordWrap', comment: ['&& denotes a mnemonic'] }, "Toggle &&Word Wrap")
+	},
+	order: 1
+});
diff --git a/src/vs/workbench/parts/codeEditor/electron-browser/workbenchReferenceSearch.ts b/src/vs/workbench/parts/codeEditor/electron-browser/workbenchReferenceSearch.ts
index 8155d1693a0..260c669fa73 100644
--- a/src/vs/workbench/parts/codeEditor/electron-browser/workbenchReferenceSearch.ts
+++ b/src/vs/workbench/parts/codeEditor/electron-browser/workbenchReferenceSearch.ts
@@ -4,128 +4,38 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import { IInstantiationService, optional, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
+import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
 import { IStorageService } from 'vs/platform/storage/common/storage';
-import { ICodeEditor, isCodeEditor } from 'vs/editor/browser/editorBrowser';
+import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
 import { registerEditorContribution } from 'vs/editor/browser/editorExtensions';
-import { ITextModelService } from 'vs/editor/common/services/resolverService';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { INotificationService } from 'vs/platform/notification/common/notification';
 import { ReferencesController } from 'vs/editor/contrib/referenceSearch/referencesController';
-import { CommandsRegistry, ICommandHandler } from 'vs/platform/commands/common/commands';
-import { TPromise } from 'vs/base/common/winjs.base';
-import { ReferencesModel } from 'vs/editor/contrib/referenceSearch/referencesModel';
-import { Range } from 'vs/editor/common/core/range';
-import { Position, IPosition } from 'vs/editor/common/core/position';
-import URI from 'vs/base/common/uri';
-import { Location } from 'vs/editor/common/modes';
-import { provideReferences, defaultReferenceSearchOptions } from 'vs/editor/contrib/referenceSearch/referenceSearch';
 import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 
 export class WorkbenchReferencesController extends ReferencesController {
 
 	public constructor(
 		editor: ICodeEditor,
 		@IContextKeyService contextKeyService: IContextKeyService,
-		@ICodeEditorService codeEditorService: ICodeEditorService,
-		@ITextModelService textModelResolverService: ITextModelService,
+		@ICodeEditorService editorService: ICodeEditorService,
 		@INotificationService notificationService: INotificationService,
 		@IInstantiationService instantiationService: IInstantiationService,
-		@IWorkspaceContextService contextService: IWorkspaceContextService,
 		@IStorageService storageService: IStorageService,
-		@IThemeService themeService: IThemeService,
 		@IConfigurationService configurationService: IConfigurationService,
-		@optional(IEnvironmentService) environmentService: IEnvironmentService
 	) {
 		super(
 			false,
 			editor,
 			contextKeyService,
-			codeEditorService,
-			textModelResolverService,
+			editorService,
 			notificationService,
 			instantiationService,
-			contextService,
 			storageService,
-			themeService,
 			configurationService,
-			environmentService
 		);
 	}
 }
 
 registerEditorContribution(WorkbenchReferencesController);
-
-let findReferencesCommand: ICommandHandler = (accessor: ServicesAccessor, resource: URI, position: IPosition) => {
-
-	if (!(resource instanceof URI)) {
-		throw new Error('illegal argument, uri');
-	}
-	if (!position) {
-		throw new Error('illegal argument, position');
-	}
-
-	return accessor.get(IEditorService).openEditor({ resource }).then(editor => {
-		let control = editor.getControl();
-		if (!isCodeEditor(control)) {
-			return undefined;
-		}
-
-		let controller = ReferencesController.get(control);
-		if (!controller) {
-			return undefined;
-		}
-
-		let references = provideReferences(control.getModel(), Position.lift(position)).then(references => new ReferencesModel(references));
-		let range = new Range(position.lineNumber, position.column, position.lineNumber, position.column);
-		return TPromise.as(controller.toggleWidget(range, references, defaultReferenceSearchOptions));
-	});
-};
-
-let showReferencesCommand: ICommandHandler = (accessor: ServicesAccessor, resource: URI, position: IPosition, references: Location[]) => {
-	if (!(resource instanceof URI)) {
-		throw new Error('illegal argument, uri expected');
-	}
-
-	return accessor.get(IEditorService).openEditor({ resource }).then(editor => {
-		let control = editor.getControl();
-		if (!isCodeEditor(control)) {
-			return undefined;
-		}
-
-		let controller = ReferencesController.get(control);
-		if (!controller) {
-			return undefined;
-		}
-
-		return TPromise.as(controller.toggleWidget(
-			new Range(position.lineNumber, position.column, position.lineNumber, position.column),
-			TPromise.as(new ReferencesModel(references)),
-			defaultReferenceSearchOptions)).then(() => true);
-	});
-};
-
-// register commands
-
-CommandsRegistry.registerCommand({
-	id: 'editor.action.findReferences',
-	handler: findReferencesCommand
-});
-
-CommandsRegistry.registerCommand({
-	id: 'editor.action.showReferences',
-	handler: showReferencesCommand,
-	description: {
-		description: 'Show references at a position in a file',
-		args: [
-			{ name: 'uri', description: 'The text document in which to show references', constraint: URI },
-			{ name: 'position', description: 'The position at which to show', constraint: Position.isIPosition },
-			{ name: 'locations', description: 'An array of locations.', constraint: Array },
-		]
-	}
-});
diff --git a/src/vs/workbench/parts/comments/common/commentModel.ts b/src/vs/workbench/parts/comments/common/commentModel.ts
index 2cf98fa3dcb..a1fde2ad8bb 100644
--- a/src/vs/workbench/parts/comments/common/commentModel.ts
+++ b/src/vs/workbench/parts/comments/common/commentModel.ts
@@ -5,11 +5,12 @@
 
 'use strict';
 
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { IRange } from 'vs/editor/common/core/range';
 import { Comment, CommentThread, CommentThreadChangedEvent } from 'vs/editor/common/modes';
-import { groupBy, firstIndex } from 'vs/base/common/arrays';
+import { groupBy, firstIndex, flatten } from 'vs/base/common/arrays';
 import { localize } from 'vs/nls';
+import { values } from 'vs/base/common/map';
 
 export class CommentNode {
 	threadId: string;
@@ -54,21 +55,30 @@ export class ResourceWithCommentThreads {
 
 export class CommentsModel {
 	resourceCommentThreads: ResourceWithCommentThreads[];
+	commentThreadsMap: Map<number, ResourceWithCommentThreads[]>;
 
 	constructor() {
 		this.resourceCommentThreads = [];
+		this.commentThreadsMap = new Map<number, ResourceWithCommentThreads[]>();
 	}
 
-	public setCommentThreads(commentThreads: CommentThread[]): void {
-		this.resourceCommentThreads = [];
-		this.addCommentThreads(commentThreads);
+	public setCommentThreads(owner: number, commentThreads: CommentThread[]): void {
+		this.commentThreadsMap.set(owner, this.groupByResource(commentThreads));
+		this.resourceCommentThreads = flatten(values(this.commentThreadsMap));
 	}
 
-	public updateCommentThreads(event: CommentThreadChangedEvent): void {
-		event.removed.forEach(thread => {
+	public updateCommentThreads(event: CommentThreadChangedEvent): boolean {
+		const { owner, removed, changed, added } = event;
+		if (!this.commentThreadsMap.has(owner)) {
+			return false;
+		}
+
+		let threadsForOwner = this.commentThreadsMap.get(owner);
+
+		removed.forEach(thread => {
 			// Find resource that has the comment thread
-			const matchingResourceIndex = firstIndex(this.resourceCommentThreads, (resourceData) => resourceData.id === thread.resource);
-			const matchingResourceData = this.resourceCommentThreads[matchingResourceIndex];
+			const matchingResourceIndex = firstIndex(threadsForOwner, (resourceData) => resourceData.id === thread.resource);
+			const matchingResourceData = threadsForOwner[matchingResourceIndex];
 
 			// Find comment node on resource that is that thread and remove it
 			const index = firstIndex(matchingResourceData.commentThreads, (commentThread) => commentThread.threadId === thread.threadId);
@@ -76,21 +86,34 @@ export class CommentsModel {
 
 			// If the comment thread was the last thread for a resource, remove that resource from the list
 			if (matchingResourceData.commentThreads.length === 0) {
-				this.resourceCommentThreads.splice(matchingResourceIndex, 1);
+				threadsForOwner.splice(matchingResourceIndex, 1);
 			}
 		});
 
-		event.changed.forEach(thread => {
+		changed.forEach(thread => {
 			// Find resource that has the comment thread
-			const matchingResourceIndex = firstIndex(this.resourceCommentThreads, (resourceData) => resourceData.id === thread.resource);
-			const matchingResourceData = this.resourceCommentThreads[matchingResourceIndex];
+			const matchingResourceIndex = firstIndex(threadsForOwner, (resourceData) => resourceData.id === thread.resource);
+			const matchingResourceData = threadsForOwner[matchingResourceIndex];
 
 			// Find comment node on resource that is that thread and replace it
 			const index = firstIndex(matchingResourceData.commentThreads, (commentThread) => commentThread.threadId === thread.threadId);
 			matchingResourceData.commentThreads[index] = ResourceWithCommentThreads.createCommentNode(URI.parse(matchingResourceData.id), thread);
 		});
 
-		this.addCommentThreads(event.added);
+		added.forEach(thread => {
+			const existingResource = threadsForOwner.filter(resourceWithThreads => resourceWithThreads.resource.toString() === thread.resource);
+			if (existingResource.length) {
+				const resource = existingResource[0];
+				resource.commentThreads.push(ResourceWithCommentThreads.createCommentNode(resource.resource, thread));
+			} else {
+				threadsForOwner.push(new ResourceWithCommentThreads(URI.parse(thread.resource), [thread]));
+			}
+		});
+
+		this.commentThreadsMap.set(owner, threadsForOwner);
+		this.resourceCommentThreads = flatten(values(this.commentThreadsMap));
+
+		return removed.length > 0 || changed.length > 0 || added.length > 0;
 	}
 
 	public hasCommentThreads(): boolean {
@@ -105,15 +128,18 @@ export class CommentsModel {
 		}
 	}
 
-	private addCommentThreads(commentThreads: CommentThread[]): void {
+	private groupByResource(commentThreads: CommentThread[]): ResourceWithCommentThreads[] {
+		const resourceCommentThreads = [];
 		const commentThreadsByResource = new Map<string, ResourceWithCommentThreads>();
 		for (const group of groupBy(commentThreads, CommentsModel._compareURIs)) {
 			commentThreadsByResource.set(group[0].resource, new ResourceWithCommentThreads(URI.parse(group[0].resource), group));
 		}
 
 		commentThreadsByResource.forEach((v, i, m) => {
-			this.resourceCommentThreads.push(v);
+			resourceCommentThreads.push(v);
 		});
+
+		return resourceCommentThreads;
 	}
 
 	private static _compareURIs(a: CommentThread, b: CommentThread) {
diff --git a/src/vs/workbench/parts/comments/common/reviewModel.ts b/src/vs/workbench/parts/comments/common/reviewModel.ts
deleted file mode 100644
index 2c3b962122f..00000000000
--- a/src/vs/workbench/parts/comments/common/reviewModel.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-'use strict';
-
-import { Emitter, Event } from 'vs/base/common/event';
-
-export enum ReviewStyle {
-	Complete,
-	Inline,
-	Gutter
-}
-
-export class ReviewModel {
-	private _style: ReviewStyle;
-	public get style(): ReviewStyle { return this._style; }
-	private _onDidChangeStyle = new Emitter<ReviewStyle>();
-	public get onDidChangeStyle(): Event<ReviewStyle> { return this._onDidChangeStyle.event; }
-
-	constructor() {
-		this._style = ReviewStyle.Inline;
-	}
-
-	setStyle(style: ReviewStyle) {
-		this._style = style;
-		this._onDidChangeStyle.fire(this._style);
-	}
-}
\ No newline at end of file
diff --git a/src/vs/workbench/parts/comments/electron-browser/commentGlyphWidget.ts b/src/vs/workbench/parts/comments/electron-browser/commentGlyphWidget.ts
index 44d7a10810e..379481a63ed 100644
--- a/src/vs/workbench/parts/comments/electron-browser/commentGlyphWidget.ts
+++ b/src/vs/workbench/parts/comments/electron-browser/commentGlyphWidget.ts
@@ -4,37 +4,38 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import { ICodeEditor, IContentWidget, IContentWidgetPosition, ContentWidgetPositionPreference } from 'vs/editor/browser/editorBrowser';
+import { ICodeEditor, IContentWidgetPosition, ContentWidgetPositionPreference } from 'vs/editor/browser/editorBrowser';
+import { ModelDecorationOptions } from 'vs/editor/common/model/textModel';
 
-export class CommentGlyphWidget implements IContentWidget {
-	private _id: string;
+export class CommentGlyphWidget {
 	private _lineNumber: number;
-	private _domNode: HTMLDivElement;
 	private _editor: ICodeEditor;
+	private commentsDecorations: string[] = [];
+	private _commentsOptions: ModelDecorationOptions;
 
-	constructor(id: string, editor: ICodeEditor, lineNumber: number, disabled: boolean, onClick: () => void) {
-		this._id = id;
-		this._domNode = document.createElement('div');
-		this._domNode.className = disabled ? 'comment-hint commenting-disabled' : 'comment-hint';
-		this._domNode.addEventListener('click', onClick);
 
+	constructor(editor: ICodeEditor, lineNumber: number, commentsOptions: ModelDecorationOptions, onClick: () => void) {
+		this._commentsOptions = commentsOptions;
 		this._lineNumber = lineNumber;
-
 		this._editor = editor;
-		this._editor.addContentWidget(this);
-
+		this.update();
 	}
 
-	getDomNode(): HTMLElement {
-		return this._domNode;
-	}
+	update() {
+		let commentsDecorations = [{
+			range: {
+				startLineNumber: this._lineNumber, startColumn: 1,
+				endLineNumber: this._lineNumber, endColumn: 1
+			},
+			options: this._commentsOptions
+		}];
 
-	getId(): string {
-		return this._id;
+		this.commentsDecorations = this._editor.deltaDecorations(this.commentsDecorations, commentsDecorations);
 	}
 
 	setLineNumber(lineNumber: number): void {
 		this._lineNumber = lineNumber;
+		this.update();
 	}
 
 	getPosition(): IContentWidgetPosition {
@@ -46,4 +47,10 @@ export class CommentGlyphWidget implements IContentWidget {
 			preference: [ContentWidgetPositionPreference.EXACT]
 		};
 	}
+
+	dispose() {
+		if (this.commentsDecorations) {
+			this._editor.deltaDecorations(this.commentsDecorations, []);
+		}
+	}
 }
\ No newline at end of file
diff --git a/src/vs/workbench/parts/comments/electron-browser/commentService.ts b/src/vs/workbench/parts/comments/electron-browser/commentService.ts
index 427fbb6f338..c458cce2bd8 100644
--- a/src/vs/workbench/parts/comments/electron-browser/commentService.ts
+++ b/src/vs/workbench/parts/comments/electron-browser/commentService.ts
@@ -5,15 +5,14 @@
 
 'use strict';
 
-import { CommentThread, DocumentCommentProvider, CommentThreadChangedEvent, CommentInfo, WorkspaceCommentProvider } from 'vs/editor/common/modes';
+import { CommentThread, DocumentCommentProvider, CommentThreadChangedEvent, CommentInfo } from 'vs/editor/common/modes';
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
 import { Event, Emitter } from 'vs/base/common/event';
 import { Disposable } from 'vs/base/common/lifecycle';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { Range } from 'vs/editor/common/core/range';
-import { TPromise } from 'vs/base/common/winjs.base';
-import { asWinJsPromise } from 'vs/base/common/async';
 import { keys } from 'vs/base/common/map';
+import { CancellationToken } from 'vs/base/common/cancellation';
 
 export const ICommentService = createDecorator<ICommentService>('commentService');
 
@@ -22,22 +21,27 @@ export interface IResourceCommentThreadEvent {
 	commentInfos: CommentInfo[];
 }
 
+export interface IWorkspaceCommentThreadsEvent {
+	ownerId: number;
+	commentThreads: CommentThread[];
+}
+
 export interface ICommentService {
 	_serviceBrand: any;
 	readonly onDidSetResourceCommentInfos: Event<IResourceCommentThreadEvent>;
-	readonly onDidSetAllCommentThreads: Event<CommentThread[]>;
+	readonly onDidSetAllCommentThreads: Event<IWorkspaceCommentThreadsEvent>;
 	readonly onDidUpdateCommentThreads: Event<CommentThreadChangedEvent>;
 	readonly onDidSetDataProvider: Event<void>;
 	readonly onDidDeleteDataProvider: Event<number>;
-	setComments(resource: URI, commentInfos: CommentInfo[]): void;
-	setAllComments(commentsByResource: CommentThread[]): void;
-	removeAllComments(): void;
-	registerDataProvider(owner: number, commentProvider: DocumentCommentProvider | WorkspaceCommentProvider): void;
+	setDocumentComments(resource: URI, commentInfos: CommentInfo[]): void;
+	setWorkspaceComments(owner: number, commentsByResource: CommentThread[]): void;
+	removeWorkspaceComments(owner: number): void;
+	registerDataProvider(owner: number, commentProvider: DocumentCommentProvider): void;
 	unregisterDataProvider(owner: number): void;
 	updateComments(event: CommentThreadChangedEvent): void;
-	createNewCommenThread(owner: number, resource: URI, range: Range, text: string): TPromise<CommentThread>;
-	replyToCommentThread(owner: number, resource: URI, range: Range, thread: CommentThread, text: string): TPromise<CommentThread>;
-	getComments(resource: URI): TPromise<CommentInfo[]>;
+	createNewCommentThread(owner: number, resource: URI, range: Range, text: string): Promise<CommentThread>;
+	replyToCommentThread(owner: number, resource: URI, range: Range, thread: CommentThread, text: string): Promise<CommentThread>;
+	getComments(resource: URI): Promise<CommentInfo[]>;
 }
 
 export class CommentService extends Disposable implements ICommentService {
@@ -52,31 +56,31 @@ export class CommentService extends Disposable implements ICommentService {
 	private readonly _onDidSetResourceCommentInfos: Emitter<IResourceCommentThreadEvent> = this._register(new Emitter<IResourceCommentThreadEvent>());
 	readonly onDidSetResourceCommentInfos: Event<IResourceCommentThreadEvent> = this._onDidSetResourceCommentInfos.event;
 
-	private readonly _onDidSetAllCommentThreads: Emitter<CommentThread[]> = this._register(new Emitter<CommentThread[]>());
-	readonly onDidSetAllCommentThreads: Event<CommentThread[]> = this._onDidSetAllCommentThreads.event;
+	private readonly _onDidSetAllCommentThreads: Emitter<IWorkspaceCommentThreadsEvent> = this._register(new Emitter<IWorkspaceCommentThreadsEvent>());
+	readonly onDidSetAllCommentThreads: Event<IWorkspaceCommentThreadsEvent> = this._onDidSetAllCommentThreads.event;
 
 	private readonly _onDidUpdateCommentThreads: Emitter<CommentThreadChangedEvent> = this._register(new Emitter<CommentThreadChangedEvent>());
 	readonly onDidUpdateCommentThreads: Event<CommentThreadChangedEvent> = this._onDidUpdateCommentThreads.event;
 
-	private _commentProviders = new Map<number, (DocumentCommentProvider | WorkspaceCommentProvider)>();
+	private _commentProviders = new Map<number, DocumentCommentProvider>();
 
 	constructor() {
 		super();
 	}
 
-	setComments(resource: URI, commentInfos: CommentInfo[]): void {
+	setDocumentComments(resource: URI, commentInfos: CommentInfo[]): void {
 		this._onDidSetResourceCommentInfos.fire({ resource, commentInfos });
 	}
 
-	setAllComments(commentsByResource: CommentThread[]): void {
-		this._onDidSetAllCommentThreads.fire(commentsByResource);
+	setWorkspaceComments(owner: number, commentsByResource: CommentThread[]): void {
+		this._onDidSetAllCommentThreads.fire({ ownerId: owner, commentThreads: commentsByResource });
 	}
 
-	removeAllComments(): void {
-		this._onDidSetAllCommentThreads.fire([]);
+	removeWorkspaceComments(owner: number): void {
+		this._onDidSetAllCommentThreads.fire({ ownerId: owner, commentThreads: [] });
 	}
 
-	registerDataProvider(owner: number, commentProvider: DocumentCommentProvider | WorkspaceCommentProvider) {
+	registerDataProvider(owner: number, commentProvider: DocumentCommentProvider) {
 		this._commentProviders.set(owner, commentProvider);
 		this._onDidSetDataProvider.fire();
 	}
@@ -90,35 +94,35 @@ export class CommentService extends Disposable implements ICommentService {
 		this._onDidUpdateCommentThreads.fire(event);
 	}
 
-	createNewCommenThread(owner: number, resource: URI, range: Range, text: string): TPromise<CommentThread> {
+	createNewCommentThread(owner: number, resource: URI, range: Range, text: string): Promise<CommentThread> {
 		const commentProvider = this._commentProviders.get(owner);
 
 		if (commentProvider) {
-			return asWinJsPromise(token => commentProvider.createNewCommentThread(resource, range, text, token));
+			return commentProvider.createNewCommentThread(resource, range, text, CancellationToken.None);
 		}
 
 		return null;
 	}
 
-	replyToCommentThread(owner: number, resource: URI, range: Range, thread: CommentThread, text: string): TPromise<CommentThread> {
+	replyToCommentThread(owner: number, resource: URI, range: Range, thread: CommentThread, text: string): Promise<CommentThread> {
 		const commentProvider = this._commentProviders.get(owner);
 
 		if (commentProvider) {
-			return asWinJsPromise(token => commentProvider.replyToCommentThread(resource, range, thread, text, token));
+			return commentProvider.replyToCommentThread(resource, range, thread, text, CancellationToken.None);
 		}
 
 		return null;
 	}
 
-	async getComments(resource: URI): TPromise<CommentInfo[]> {
+	getComments(resource: URI): Promise<CommentInfo[]> {
 		const result = [];
 		for (const handle of keys(this._commentProviders)) {
 			const provider = this._commentProviders.get(handle);
 			if ((<DocumentCommentProvider>provider).provideDocumentComments) {
-				result.push(asWinJsPromise(token => (<DocumentCommentProvider>provider).provideDocumentComments(resource, token)));
+				result.push((<DocumentCommentProvider>provider).provideDocumentComments(resource, CancellationToken.None));
 			}
 		}
 
-		return TPromise.join(result);
+		return Promise.all(result);
 	}
 }
diff --git a/src/vs/workbench/parts/comments/electron-browser/commentThreadWidget.ts b/src/vs/workbench/parts/comments/electron-browser/commentThreadWidget.ts
index da24f1bb0df..eebb171da24 100644
--- a/src/vs/workbench/parts/comments/electron-browser/commentThreadWidget.ts
+++ b/src/vs/workbench/parts/comments/electron-browser/commentThreadWidget.ts
@@ -5,7 +5,6 @@
 'use strict';
 
 import * as nls from 'vs/nls';
-import { $ } from 'vs/base/browser/builder';
 import * as dom from 'vs/base/browser/dom';
 import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
 import { Button } from 'vs/base/browser/ui/button/button';
@@ -14,65 +13,72 @@ import * as arrays from 'vs/base/common/arrays';
 import { Color } from 'vs/base/common/color';
 import { Emitter, Event } from 'vs/base/common/event';
 import { IDisposable } from 'vs/base/common/lifecycle';
+import * as platform from 'vs/base/common/platform';
+import * as strings from 'vs/base/common/strings';
 import { ICodeEditor, IEditorMouseEvent, MouseTargetType } from 'vs/editor/browser/editorBrowser';
 import * as modes from 'vs/editor/common/modes';
 import { peekViewBorder } from 'vs/editor/contrib/referenceSearch/referencesWidget';
 import { IOptions, ZoneWidget } from 'vs/editor/contrib/zoneWidget/zoneWidget';
 import { attachButtonStyler } from 'vs/platform/theme/common/styler';
 import { ITheme, IThemeService } from 'vs/platform/theme/common/themeService';
-import { renderMarkdown } from 'vs/base/browser/htmlContentRenderer';
 import { CommentGlyphWidget } from 'vs/workbench/parts/comments/electron-browser/commentGlyphWidget';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IModelService } from 'vs/editor/common/services/modelService';
 import { SimpleCommentEditor } from './simpleCommentEditor';
-import URI from 'vs/base/common/uri';
-import { transparent, editorForeground } from 'vs/platform/theme/common/colorRegistry';
+import { URI } from 'vs/base/common/uri';
+import { transparent, editorForeground, textLinkActiveForeground, textLinkForeground, focusBorder, textBlockQuoteBackground, textBlockQuoteBorder, contrastBorder, inputValidationErrorBorder, inputValidationErrorBackground, inputValidationErrorForeground } from 'vs/platform/theme/common/colorRegistry';
 import { IModeService } from 'vs/editor/common/services/modeService';
 import { IKeyboardEvent } from 'vs/base/browser/keyboardEvent';
 import { KeyCode } from 'vs/base/common/keyCodes';
 import { ICommentService } from 'vs/workbench/parts/comments/electron-browser/commentService';
 import { Range, IRange } from 'vs/editor/common/core/range';
 import { IPosition } from 'vs/editor/common/core/position';
+import { IOpenerService } from 'vs/platform/opener/common/opener';
+import { MarkdownRenderer } from 'vs/editor/contrib/markdown/markdownRenderer';
+import { IMarginData } from 'vs/editor/browser/controller/mouseTarget';
+import { ModelDecorationOptions } from 'vs/editor/common/model/textModel';
 
 export const COMMENTEDITOR_DECORATION_KEY = 'commenteditordecoration';
-const EXPAND_ACTION_CLASS = 'expand-review-action octicon octicon-chevron-down';
-const COLLAPSE_ACTION_CLASS = 'expand-review-action octicon octicon-chevron-up';
+const COLLAPSE_ACTION_CLASS = 'expand-review-action octicon octicon-x';
 const COMMENT_SCHEME = 'comment';
 
-declare var ResizeObserver: any;
 export class CommentNode {
 	private _domNode: HTMLElement;
 	private _body: HTMLElement;
 	private _md: HTMLElement;
 	private _clearTimeout: any;
+
 	public get domNode(): HTMLElement {
 		return this._domNode;
 	}
-	constructor(public comment: modes.Comment) {
-		this._domNode = $('div.review-comment').getHTMLElement();
-		this._domNode.tabIndex = 0;
-		let avatar = $('div.avatar-container').appendTo(this._domNode).getHTMLElement();
-		let img = <HTMLImageElement>$('img.avatar').appendTo(avatar).getHTMLElement();
-		img.src = comment.gravatar;
-		let commentDetailsContainer = $('.review-comment-contents').appendTo(this._domNode).getHTMLElement();
 
-		let header = $('div').appendTo(commentDetailsContainer).getHTMLElement();
-		let author = $('strong.author').appendTo(header).getHTMLElement();
+	constructor(
+		public comment: modes.Comment,
+		private markdownRenderer: MarkdownRenderer,
+	) {
+		this._domNode = dom.$('div.review-comment');
+		this._domNode.tabIndex = 0;
+		let avatar = dom.append(this._domNode, dom.$('div.avatar-container'));
+		let img = <HTMLImageElement>dom.append(avatar, dom.$('img.avatar'));
+		img.src = comment.gravatar;
+		let commentDetailsContainer = dom.append(this._domNode, dom.$('.review-comment-contents'));
+
+		let header = dom.append(commentDetailsContainer, dom.$('div'));
+		let author = dom.append(header, dom.$('strong.author'));
 		author.innerText = comment.userName;
-		this._body = $('div.comment-body').appendTo(commentDetailsContainer).getHTMLElement();
-		this._md = renderMarkdown(comment.body);
+		this._body = dom.append(commentDetailsContainer, dom.$('div.comment-body'));
+		this._md = this.markdownRenderer.render(comment.body).element;
 		this._body.appendChild(this._md);
 
 		this._domNode.setAttribute('aria-label', `${comment.userName}, ${comment.body.value}`);
 		this._domNode.setAttribute('role', 'treeitem');
-		this._domNode.title = `${comment.userName}, ${comment.body.value}`;
 		this._clearTimeout = null;
 	}
 
 	update(newComment: modes.Comment) {
 		if (newComment.body !== this.comment.body) {
 			this._body.removeChild(this._md);
-			this._md = renderMarkdown(newComment.body);
+			this._md = this.markdownRenderer.render(newComment.body).element;
 			this._body.appendChild(this._md);
 		}
 
@@ -91,11 +97,10 @@ export class CommentNode {
 }
 
 let INMEM_MODEL_ID = 0;
+
 export class ReviewZoneWidget extends ZoneWidget {
 	private _headElement: HTMLElement;
-	protected _primaryHeading: HTMLElement;
-	protected _secondaryHeading: HTMLElement;
-	protected _metaHeading: HTMLElement;
+	protected _headingLabel: HTMLElement;
 	protected _actionbarWidget: ActionBar;
 	private _bodyElement: HTMLElement;
 	private _commentEditor: ICodeEditor;
@@ -105,13 +110,17 @@ export class ReviewZoneWidget extends ZoneWidget {
 	private _reviewThreadReplyButton: HTMLElement;
 	private _resizeObserver: any;
 	private _onDidClose = new Emitter<ReviewZoneWidget>();
+	private _onDidCreateThread = new Emitter<ReviewZoneWidget>();
 	private _isCollapsed;
-	private _toggleAction: Action;
+	private _collapseAction: Action;
 	private _commentThread: modes.CommentThread;
 	private _commentGlyph: CommentGlyphWidget;
 	private _owner: number;
-	private _decorationIDs: string[];
 	private _localToDispose: IDisposable[];
+	private _globalToDispose: IDisposable[];
+	private _markdownRenderer: MarkdownRenderer;
+	private _styleElement: HTMLStyleElement;
+	private _error: HTMLElement;
 
 	public get owner(): number {
 		return this._owner;
@@ -126,6 +135,7 @@ export class ReviewZoneWidget extends ZoneWidget {
 		private modelService: IModelService,
 		private themeService: IThemeService,
 		private commentService: ICommentService,
+		private openerService: IOpenerService,
 		editor: ICodeEditor,
 		owner: number,
 		commentThread: modes.CommentThread,
@@ -136,32 +146,39 @@ export class ReviewZoneWidget extends ZoneWidget {
 		this._owner = owner;
 		this._commentThread = commentThread;
 		this._isCollapsed = commentThread.collapsibleState !== modes.CommentThreadCollapsibleState.Expanded;
-		this._decorationIDs = [];
+		this._globalToDispose = [];
 		this._localToDispose = [];
 		this.create();
-		this.themeService.onThemeChange(this._applyTheme, this);
+
+		this._styleElement = dom.createStyleSheet(this.domNode);
+		this._globalToDispose.push(this.themeService.onThemeChange(this._applyTheme, this));
+		this._globalToDispose.push(this.editor.onDidChangeConfiguration(e => {
+			if (e.fontInfo) {
+				this._applyTheme(this.themeService.getTheme());
+			}
+		}));
+		this._applyTheme(this.themeService.getTheme());
+
+		this._markdownRenderer = new MarkdownRenderer(editor, this.modeService, this.openerService);
 	}
 
 	public get onDidClose(): Event<ReviewZoneWidget> {
 		return this._onDidClose.event;
 	}
 
+	public get onDidCreateThread(): Event<ReviewZoneWidget> {
+		return this._onDidCreateThread.event;
+	}
+
 	protected revealLine(lineNumber: number) {
 		// we don't do anything here as we always do the reveal ourselves.
 	}
 
 	public reveal(commentId?: string) {
 		if (this._isCollapsed) {
-			if (this._decorationIDs && this._decorationIDs.length) {
-				let range = this.editor.getModel().getDecorationRange(this._decorationIDs[0]);
-				this.show(range, 2);
-			} else {
-				this.show({ lineNumber: this._commentThread.range.startLineNumber, column: 1 }, 2);
-			}
+			this.show({ lineNumber: this._commentThread.range.startLineNumber, column: 1 }, 2);
 		}
 
-		this._bodyElement.focus();
-
 		if (commentId) {
 			let height = this.editor.getLayoutInfo().height;
 			let matchedNode = this._commentElements.filter(commentNode => commentNode.comment.commentId === commentId);
@@ -170,7 +187,6 @@ export class ReviewZoneWidget extends ZoneWidget {
 				const commentCoords = dom.getDomNodePagePosition(matchedNode[0].domNode);
 
 				this.editor.setScrollTop(this.editor.getTopForLineNumber(this._commentThread.range.startLineNumber) - height / 2 + commentCoords.top - commentThreadCoords.top);
-				matchedNode[0].focus();
 				return;
 			}
 		}
@@ -180,55 +196,40 @@ export class ReviewZoneWidget extends ZoneWidget {
 
 	protected _fillContainer(container: HTMLElement): void {
 		this.setCssClass('review-widget');
-		this._headElement = <HTMLDivElement>$('.head').getHTMLElement();
+		this._headElement = <HTMLDivElement>dom.$('.head');
 		container.appendChild(this._headElement);
 		this._fillHead(this._headElement);
 
-		this._bodyElement = <HTMLDivElement>$('.body').getHTMLElement();
+		this._bodyElement = <HTMLDivElement>dom.$('.body');
 		container.appendChild(this._bodyElement);
 	}
 
 	protected _fillHead(container: HTMLElement): void {
-		var titleElement = $('.review-title').
-			appendTo(this._headElement).
-			getHTMLElement();
+		var titleElement = dom.append(this._headElement, dom.$('.review-title'));
 
-		this._primaryHeading = $('span.filename').appendTo(titleElement).getHTMLElement();
-		this._secondaryHeading = $('span.dirname').appendTo(titleElement).getHTMLElement();
-		this._metaHeading = $('span.meta').appendTo(titleElement).getHTMLElement();
+		this._headingLabel = dom.append(titleElement, dom.$('span.filename'));
+		this.createThreadLabel();
 
-		let primaryHeading = 'Participants:';
-		$(this._primaryHeading).safeInnerHtml(primaryHeading);
-		this._primaryHeading.setAttribute('aria-label', primaryHeading);
-
-		let secondaryHeading = this._commentThread.comments.filter(arrays.uniqueFilter(comment => comment.userName)).map(comment => `@${comment.userName}`).join(', ');
-		$(this._secondaryHeading).safeInnerHtml(secondaryHeading);
-		this._secondaryHeading.setAttribute('aria-label', secondaryHeading);
-
-		const actionsContainer = $('.review-actions').appendTo(this._headElement);
-		this._actionbarWidget = new ActionBar(actionsContainer.getHTMLElement(), {});
+		const actionsContainer = dom.append(this._headElement, dom.$('.review-actions'));
+		this._actionbarWidget = new ActionBar(actionsContainer, {});
 		this._disposables.push(this._actionbarWidget);
 
-		this._toggleAction = new Action('review.expand', nls.localize('label.expand', "Expand"), this._isCollapsed ? EXPAND_ACTION_CLASS : COLLAPSE_ACTION_CLASS, true, () => {
-			if (this._isCollapsed) {
-				this.show({ lineNumber: this._commentThread.range.startLineNumber, column: 1 }, 2);
-			}
-			else {
-				if (this._commentThread.comments.length === 0) {
-					this.dispose();
-					return null;
-				}
-				this._isCollapsed = true;
-				this.hide();
+		this._collapseAction = new Action('review.expand', nls.localize('label.collapse', "Collapse"), COLLAPSE_ACTION_CLASS, true, () => {
+			if (this._commentThread.comments.length === 0) {
+				this.dispose();
+				return null;
 			}
+			this._isCollapsed = true;
+			this.hide();
+
 			return null;
 		});
 
-		this._actionbarWidget.push(this._toggleAction, { label: false, icon: true });
+		this._actionbarWidget.push(this._collapseAction, { label: false, icon: true });
 	}
 
 	toggleExpand() {
-		this._toggleAction.run();
+		this._collapseAction.run();
 	}
 
 	update(commentThread: modes.CommentThread) {
@@ -255,16 +256,6 @@ export class ReviewZoneWidget extends ZoneWidget {
 			this._commentsElement.removeChild(commentElementsToDel[i].domNode);
 		}
 
-		if (this._commentElements.length === 0) {
-			this._commentThread = commentThread;
-			commentThread.comments.forEach(comment => {
-				let newElement = new CommentNode(comment);
-				this._commentElements.push(newElement);
-				this._commentsElement.appendChild(newElement.domNode);
-			});
-			return;
-		}
-
 		let lastCommentElement: HTMLElement = null;
 		let newCommentNodeList: CommentNode[] = [];
 		for (let i = newCommentsLen - 1; i >= 0; i--) {
@@ -274,7 +265,7 @@ export class ReviewZoneWidget extends ZoneWidget {
 				lastCommentElement = oldCommentNode[0].domNode;
 				newCommentNodeList.unshift(oldCommentNode[0]);
 			} else {
-				let newElement = new CommentNode(currentComment);
+				let newElement = new CommentNode(currentComment, this._markdownRenderer);
 				newCommentNodeList.unshift(newElement);
 				if (lastCommentElement) {
 					this._commentsElement.insertBefore(newElement.domNode, lastCommentElement);
@@ -288,58 +279,36 @@ export class ReviewZoneWidget extends ZoneWidget {
 
 		this._commentThread = commentThread;
 		this._commentElements = newCommentNodeList;
-		let secondaryHeading = this._commentThread.comments.filter(arrays.uniqueFilter(comment => comment.userName)).map(comment => `@${comment.userName}`).join(', ');
-		$(this._secondaryHeading).safeInnerHtml(secondaryHeading);
+		this.createThreadLabel();
 	}
 
 	protected _doLayout(heightInPixel: number, widthInPixel: number): void {
-		this._commentEditor.layout({ height: (this._commentEditor.hasWidgetFocus() ? 5 : 1) * 18, width: widthInPixel - 20 /* margin */ });
+		this._commentEditor.layout({ height: (this._commentEditor.hasWidgetFocus() ? 5 : 1) * 18, width: widthInPixel - 54 /* margin 20px * 10 + scrollbar 14px*/ });
 	}
 
-	display(lineNumber: number) {
-		this._commentGlyph = new CommentGlyphWidget(`review_${lineNumber}`, this.editor, lineNumber, false, () => {
+	display(lineNumber: number, commentsOptions: ModelDecorationOptions) {
+		this._commentGlyph = new CommentGlyphWidget(this.editor, lineNumber, commentsOptions, () => {
 			this.toggleExpand();
 		});
-		this.editor.layoutContentWidget(this._commentGlyph);
 
 		this._localToDispose.push(this.editor.onMouseDown(e => this.onEditorMouseDown(e)));
 		this._localToDispose.push(this.editor.onMouseUp(e => this.onEditorMouseUp(e)));
-		this._localToDispose.push(this.editor.onDidChangeModelContent((e) => {
-			// If the widget has been opened, the position is set and can be relied on for updating the glyph position
-			if (this.position) {
-				if (this.position.lineNumber !== this._commentGlyph.getPosition().position.lineNumber) {
-					this._commentGlyph.setLineNumber(this.position.lineNumber);
-					this.editor.layoutContentWidget(this._commentGlyph);
-				}
-			} else {
-				// Otherwise manually calculate position change :(
-				const positionChange = e.changes.map(change => {
-					if (change.range.startLineNumber < change.range.endLineNumber) {
-						return change.range.startLineNumber - change.range.endLineNumber;
-					} else {
-						return change.text.split(e.eol).length - 1;
-					}
-				}).reduce((prev, curr) => prev + curr, 0);
-				this._commentGlyph.setLineNumber(this._commentGlyph.getPosition().position.lineNumber + positionChange);
-				this.editor.layoutContentWidget(this._commentGlyph);
-			}
-		}));
 		var headHeight = Math.ceil(this.editor.getConfiguration().lineHeight * 1.2);
 		this._headElement.style.height = `${headHeight}px`;
 		this._headElement.style.lineHeight = this._headElement.style.height;
 
-		this._commentsElement = $('div.comments-container').appendTo(this._bodyElement).getHTMLElement();
+		this._commentsElement = dom.append(this._bodyElement, dom.$('div.comments-container'));
 		this._commentsElement.setAttribute('role', 'presentation');
 
 		this._commentElements = [];
 		for (let i = 0; i < this._commentThread.comments.length; i++) {
-			let newCommentNode = new CommentNode(this._commentThread.comments[i]);
+			let newCommentNode = new CommentNode(this._commentThread.comments[i], this._markdownRenderer);
 			this._commentElements.push(newCommentNode);
 			this._commentsElement.appendChild(newCommentNode.domNode);
 		}
 
 		const hasExistingComments = this._commentThread.comments.length > 0;
-		this._commentForm = $('.comment-form').appendTo(this._bodyElement).getHTMLElement();
+		this._commentForm = dom.append(this._bodyElement, dom.$('.comment-form'));
 		this._commentEditor = this.instantiationService.createInstance(SimpleCommentEditor, this._commentForm, SimpleCommentEditor.getEditorOptions());
 		const modeId = hasExistingComments ? this._commentThread.threadId : ++INMEM_MODEL_ID;
 		const resource = URI.parse(`${COMMENT_SCHEME}:commentinput-${modeId}.md`);
@@ -351,66 +320,66 @@ export class ReviewZoneWidget extends ZoneWidget {
 		this.setCommentEditorDecorations();
 
 		// Only add the additional step of clicking a reply button to expand the textarea when there are existing comments
-		this.createCommentButton();
+		if (hasExistingComments) {
+			this.createReplyButton();
+		} else {
+			if (!dom.hasClass(this._commentForm, 'expand')) {
+				dom.addClass(this._commentForm, 'expand');
+				this._commentEditor.focus();
+			}
+		}
+
 
 		this._localToDispose.push(this._commentEditor.onKeyDown((ev: IKeyboardEvent) => {
 			const hasExistingComments = this._commentThread.comments.length > 0;
-			if (this._commentEditor.getModel().getValueLength() === 0 && ev.keyCode === KeyCode.Escape && hasExistingComments) {
-				if (dom.hasClass(this._commentForm, 'expand')) {
-					dom.removeClass(this._commentForm, 'expand');
+
+			if (this._commentEditor.getModel().getValueLength() === 0 && ev.keyCode === KeyCode.Escape) {
+				if (hasExistingComments) {
+					if (dom.hasClass(this._commentForm, 'expand')) {
+						dom.removeClass(this._commentForm, 'expand');
+					}
+				} else {
+					this.dispose();
 				}
 			}
+
+			if (this._commentEditor.getModel().getValueLength() !== 0 && ev.keyCode === KeyCode.Enter && (ev.ctrlKey || ev.metaKey)) {
+				let lineNumber = this._commentGlyph.getPosition().position.lineNumber;
+				this.createComment(lineNumber);
+			}
 		}));
 
-		const formActions = $('.form-actions').appendTo(this._commentForm).getHTMLElement();
+		this._error = dom.append(this._commentForm, dom.$('.validation-error.hidden'));
+
+		const formActions = dom.append(this._commentForm, dom.$('.form-actions'));
 
 		const button = new Button(formActions);
 		attachButtonStyler(button, this.themeService);
 		button.label = 'Add comment';
-		button.onDidClick(async () => {
-			let newCommentThread;
-			if (this._commentThread.threadId) {
-				// reply
-				newCommentThread = await this.commentService.replyToCommentThread(
-					this._owner,
-					this.editor.getModel().uri,
-					new Range(lineNumber, 1, lineNumber, 1),
-					this._commentThread,
-					this._commentEditor.getValue()
-				);
+
+		button.enabled = false;
+		this._localToDispose.push(this._commentEditor.onDidChangeModelContent(_ => {
+			if (this._commentEditor.getValue()) {
+				button.enabled = true;
 			} else {
-				newCommentThread = await this.commentService.createNewCommenThread(
-					this._owner,
-					this.editor.getModel().uri,
-					new Range(lineNumber, 1, lineNumber, 1),
-					this._commentEditor.getValue()
-				);
+				button.enabled = false;
 			}
+		}));
 
-			this._commentEditor.setValue('');
-			if (dom.hasClass(this._commentForm, 'expand')) {
-				dom.removeClass(this._commentForm, 'expand');
-			}
-
-			if (newCommentThread) {
-				this.update(newCommentThread);
-			}
+		button.onDidClick(async () => {
+			let lineNumber = this._commentGlyph.getPosition().position.lineNumber;
+			this.createComment(lineNumber);
 		});
 
+		this._resizeObserver = new MutationObserver(this._refresh.bind(this));
 
-		this._resizeObserver = new ResizeObserver(entries => {
-			if (entries[0].target === this._bodyElement && !this._isCollapsed) {
-				const lineHeight = this.editor.getConfiguration().lineHeight;
-				const arrowHeight = Math.round(lineHeight / 3);
-				const frameThickness = Math.round(lineHeight / 9) * 2;
-
-				const computedLinesNumber = Math.ceil((headHeight + entries[0].contentRect.height + arrowHeight + frameThickness) / lineHeight);
-				this._relayout(computedLinesNumber);
-			}
+		this._resizeObserver.observe(this._bodyElement, {
+			attributes: true,
+			childList: true,
+			characterData: true,
+			subtree: true
 		});
 
-		this._resizeObserver.observe(this._bodyElement);
-
 		if (this._commentThread.collapsibleState === modes.CommentThreadCollapsibleState.Expanded) {
 			this.show({ lineNumber: lineNumber, column: 1 }, 2);
 		}
@@ -421,108 +390,196 @@ export class ReviewZoneWidget extends ZoneWidget {
 		}
 	}
 
-	createCommentButton() {
-		const hasExistingComments = this._commentThread.comments.length > 0;
-		if (hasExistingComments) {
-			this._reviewThreadReplyButton = <HTMLButtonElement>$('button.review-thread-reply-button').appendTo(this._commentForm).getHTMLElement();
-			this._reviewThreadReplyButton.title = 'Reply...';
-			this._reviewThreadReplyButton.textContent = 'Reply...';
-			// bind click/escape actions for reviewThreadReplyButton and textArea
-			this._reviewThreadReplyButton.onclick = () => {
-				if (!dom.hasClass(this._commentForm, 'expand')) {
-					dom.addClass(this._commentForm, 'expand');
-					this._commentEditor.focus();
-				}
-			};
+	private async createComment(lineNumber: number): Promise<void> {
+		try {
+			let newCommentThread;
+			const isReply = this._commentThread.threadId !== null;
 
-			this._commentEditor.onDidBlurEditorWidget(() => {
-				if (this._commentEditor.getModel().getValueLength() === 0 && dom.hasClass(this._commentForm, 'expand')) {
+			if (isReply) {
+				newCommentThread = await this.commentService.replyToCommentThread(
+					this._owner,
+					this.editor.getModel().uri,
+					new Range(lineNumber, 1, lineNumber, 1),
+					this._commentThread,
+					this._commentEditor.getValue()
+				);
+			} else {
+				newCommentThread = await this.commentService.createNewCommentThread(
+					this._owner,
+					this.editor.getModel().uri,
+					new Range(lineNumber, 1, lineNumber, 1),
+					this._commentEditor.getValue()
+				);
+
+				if (newCommentThread) {
+					this.createReplyButton();
+				}
+			}
+
+			if (newCommentThread) {
+				this._commentEditor.setValue('');
+				if (dom.hasClass(this._commentForm, 'expand')) {
 					dom.removeClass(this._commentForm, 'expand');
 				}
-			});
+				this._commentEditor.getDomNode().style.outline = '';
+				this._error.textContent = '';
+				dom.addClass(this._error, 'hidden');
+				this.update(newCommentThread);
+
+				if (!isReply) {
+					this._onDidCreateThread.fire(this);
+				}
+			}
+		} catch (e) {
+			this._error.textContent = e.message
+				? nls.localize('commentCreationError', "Adding a comment failed: {0}.", e.message)
+				: nls.localize('commentCreationDefaultError', "Adding a comment failed. Please try again or report an issue with the extension if the problem persists.");
+			this._commentEditor.getDomNode().style.outline = `1px solid ${this.themeService.getTheme().getColor(inputValidationErrorBorder)}`;
+			dom.removeClass(this._error, 'hidden');
+		}
+	}
+
+	private createThreadLabel() {
+		let label: string;
+		if (this._commentThread.comments.length) {
+			const participantsList = this._commentThread.comments.filter(arrays.uniqueFilter(comment => comment.userName)).map(comment => `@${comment.userName}`).join(', ');
+			label = nls.localize('commentThreadParticipants', "Participants: {0}", participantsList);
 		} else {
-			dom.addClass(this._commentForm, 'expand');
+			label = nls.localize('startThread', "Start discussion");
+		}
+
+		this._headingLabel.innerHTML = strings.escape(label);
+		this._headingLabel.setAttribute('aria-label', label);
+	}
+
+	private createReplyButton() {
+		this._reviewThreadReplyButton = <HTMLButtonElement>dom.append(this._commentForm, dom.$('button.review-thread-reply-button'));
+		this._reviewThreadReplyButton.title = nls.localize('reply', "Reply...");
+		this._reviewThreadReplyButton.textContent = nls.localize('reply', "Reply...");
+		// bind click/escape actions for reviewThreadReplyButton and textArea
+		this._reviewThreadReplyButton.onclick = () => {
+			if (!dom.hasClass(this._commentForm, 'expand')) {
+				dom.addClass(this._commentForm, 'expand');
+				this._commentEditor.focus();
+			}
+		};
+
+		this._commentEditor.onDidBlurEditorWidget(() => {
+			if (this._commentEditor.getModel().getValueLength() === 0 && dom.hasClass(this._commentForm, 'expand')) {
+				dom.removeClass(this._commentForm, 'expand');
+			}
+		});
+	}
+
+	_refresh() {
+		if (!this._isCollapsed && this._bodyElement) {
+			let dimensions = dom.getClientArea(this._bodyElement);
+			const headHeight = Math.ceil(this.editor.getConfiguration().lineHeight * 1.2);
+			const lineHeight = this.editor.getConfiguration().lineHeight;
+			const arrowHeight = Math.round(lineHeight / 3);
+			const frameThickness = Math.round(lineHeight / 9) * 2;
+
+			const computedLinesNumber = Math.ceil((headHeight + dimensions.height + arrowHeight + frameThickness) / lineHeight);
+			this._relayout(computedLinesNumber);
 		}
 	}
 
 	private setCommentEditorDecorations() {
-		let model = this._commentEditor.getModel();
-		let valueLength = model.getValueLength();
-		const hasExistingComments = this._commentThread.comments.length > 0;
-		let placeholder = valueLength > 0 ? '' : (hasExistingComments ? 'Reply...' : 'Type a new comment');
-		const decorations = [{
-			range: {
-				startLineNumber: 0,
-				endLineNumber: 0,
-				startColumn: 0,
-				endColumn: 1
-			},
-			renderOptions: {
-				after: {
-					contentText: placeholder,
-					color: transparent(editorForeground, 0.4)(this.themeService.getTheme()).toString()
+		const model = this._commentEditor && this._commentEditor.getModel();
+		if (model) {
+			let valueLength = model.getValueLength();
+			const hasExistingComments = this._commentThread.comments.length > 0;
+			let keybinding = platform.isMacintosh ? 'Cmd+Enter' : 'Ctrl+Enter';
+			let placeholder = valueLength > 0
+				? ''
+				: (hasExistingComments
+					? `Reply... (press ${keybinding} to submit)`
+					: `Type a new comment (press ${keybinding} to submit)`);
+			const decorations = [{
+				range: {
+					startLineNumber: 0,
+					endLineNumber: 0,
+					startColumn: 0,
+					endColumn: 1
+				},
+				renderOptions: {
+					after: {
+						contentText: placeholder,
+						color: transparent(editorForeground, 0.4)(this.themeService.getTheme()).toString()
+					}
 				}
-			}
-		}];
+			}];
 
-		this._commentEditor.setDecorations(COMMENTEDITOR_DECORATION_KEY, decorations);
+			this._commentEditor.setDecorations(COMMENTEDITOR_DECORATION_KEY, decorations);
+		}
 	}
 
-	private mouseDownInfo: { lineNumber: number, iconClicked: boolean };
+	private mouseDownInfo: { lineNumber: number };
 
 	private onEditorMouseDown(e: IEditorMouseEvent): void {
-		if (!e.event.leftButton) {
-			return;
-		}
+		this.mouseDownInfo = null;
+
+		const range = e.target.range;
 
-		let range = e.target.range;
 		if (!range) {
 			return;
 		}
 
-		let iconClicked = false;
-		switch (e.target.type) {
-			case MouseTargetType.GUTTER_GLYPH_MARGIN:
-				iconClicked = true;
-				break;
-			default:
-				return;
+		if (!e.event.leftButton) {
+			return;
 		}
 
-		this.mouseDownInfo = { lineNumber: range.startLineNumber, iconClicked };
+		if (e.target.type !== MouseTargetType.GUTTER_LINE_DECORATIONS) {
+			return;
+		}
+
+		const data = e.target.detail as IMarginData;
+		const gutterOffsetX = data.offsetX - data.glyphMarginWidth - data.lineNumbersWidth - data.glyphMarginLeft;
+
+		// don't collide with folding and git decorations
+		if (gutterOffsetX > 14) {
+			return;
+		}
+
+		this.mouseDownInfo = { lineNumber: range.startLineNumber };
 	}
 
 	private onEditorMouseUp(e: IEditorMouseEvent): void {
 		if (!this.mouseDownInfo) {
 			return;
 		}
-		let lineNumber = this.mouseDownInfo.lineNumber;
-		let iconClicked = this.mouseDownInfo.iconClicked;
 
-		let range = e.target.range;
+		const { lineNumber } = this.mouseDownInfo;
+		this.mouseDownInfo = null;
+
+		const range = e.target.range;
+
 		if (!range || range.startLineNumber !== lineNumber) {
 			return;
 		}
 
-		if (this.position && this.position.lineNumber !== lineNumber) {
+		if (e.target.type !== MouseTargetType.GUTTER_LINE_DECORATIONS) {
 			return;
 		}
 
-		if (!this.position && lineNumber !== this._commentThread.range.startLineNumber) {
+		if (!e.target.element) {
 			return;
 		}
 
-		if (iconClicked) {
-			if (e.target.type !== MouseTargetType.GUTTER_GLYPH_MARGIN) {
-				return;
+		if (this._commentGlyph && this._commentGlyph.getPosition().position.lineNumber !== lineNumber) {
+			return;
+		}
+
+		if (e.target.element.className.indexOf('comment-thread') >= 0) {
+			if (this._isCollapsed) {
+				this.show({ lineNumber: lineNumber, column: 1 }, 2);
+			} else {
+				this.hide();
+				if (this._commentThread === null || this._commentThread.threadId === null) {
+					this.dispose();
+				}
 			}
 		}
-
-		if (this._isCollapsed) {
-			this.show({ lineNumber: lineNumber, column: 1 }, 2);
-		} else {
-			this.hide();
-		}
 	}
 
 	private _applyTheme(theme: ITheme) {
@@ -531,11 +588,72 @@ export class ReviewZoneWidget extends ZoneWidget {
 			arrowColor: borderColor,
 			frameColor: borderColor
 		});
+
+		const content: string[] = [];
+		const linkColor = theme.getColor(textLinkForeground);
+		if (linkColor) {
+			content.push(`.monaco-editor .review-widget .body .review-comment a { color: ${linkColor} }`);
+		}
+
+		const linkActiveColor = theme.getColor(textLinkActiveForeground);
+		if (linkActiveColor) {
+			content.push(`.monaco-editor .review-widget .body .review-comment a:hover, a:active { color: ${linkActiveColor} }`);
+		}
+
+		const focusColor = theme.getColor(focusBorder);
+		if (focusColor) {
+			content.push(`.monaco-editor .review-widget .body .review-comment a:focus { outline: 1px solid ${focusColor}; }`);
+			content.push(`.monaco-editor .review-widget .body .comment-form .monaco-editor.focused { outline: 1px solid ${focusColor}; }`);
+		}
+
+		const blockQuoteBackground = theme.getColor(textBlockQuoteBackground);
+		if (blockQuoteBackground) {
+			content.push(`.monaco-editor .review-widget .body .review-comment blockquote { background: ${blockQuoteBackground}; }`);
+		}
+
+		const blockQuoteBOrder = theme.getColor(textBlockQuoteBorder);
+		if (blockQuoteBOrder) {
+			content.push(`.monaco-editor .review-widget .body .review-comment blockquote { border-color: ${blockQuoteBOrder}; }`);
+		}
+
+		const hcBorder = theme.getColor(contrastBorder);
+		if (hcBorder) {
+			content.push(`.monaco-editor .review-widget .body .comment-form .review-thread-reply-button { outline-color: ${hcBorder}; }`);
+			content.push(`.monaco-editor .review-widget .body .comment-form .monaco-editor { outline: 1px solid ${hcBorder}; }`);
+		}
+
+		const errorBorder = theme.getColor(inputValidationErrorBorder);
+		if (errorBorder) {
+			content.push(`.monaco-editor .review-widget .body .comment-form .validation-error { border: 1px solid ${errorBorder}; }`);
+		}
+
+		const errorBackground = theme.getColor(inputValidationErrorBackground);
+		if (errorBackground) {
+			content.push(`.monaco-editor .review-widget .body .comment-form .validation-error { background: ${errorBackground}; }`);
+		}
+
+		const errorForeground = theme.getColor(inputValidationErrorForeground);
+		if (errorForeground) {
+			content.push(`.monaco-editor .review-widget .body .comment-form .validation-error { color: ${errorForeground}; }`);
+		}
+
+		const fontInfo = this.editor.getConfiguration().fontInfo;
+		content.push(`.monaco-editor .review-widget .body code {
+			font-family: ${fontInfo.fontFamily};
+			font-size: ${fontInfo.fontSize}px;
+			font-weight: ${fontInfo.fontWeight};
+		}`);
+
+		this._styleElement.innerHTML = content.join('\n');
+
+		// Editor decorations should also be responsive to theme changes
+		this.setCommentEditorDecorations();
 	}
 
 	show(rangeOrPos: IRange | IPosition, heightInLines: number): void {
 		this._isCollapsed = false;
 		super.show(rangeOrPos, heightInLines);
+		this._refresh();
 	}
 
 	hide() {
@@ -549,13 +667,13 @@ export class ReviewZoneWidget extends ZoneWidget {
 			this._resizeObserver.disconnect();
 			this._resizeObserver = null;
 		}
-		this.editor.changeDecorations(accessor => {
-			accessor.deltaDecorations(this._decorationIDs, []);
-		});
+
 		if (this._commentGlyph) {
-			this.editor.removeContentWidget(this._commentGlyph);
+			this._commentGlyph.dispose();
 			this._commentGlyph = null;
 		}
+
+		this._globalToDispose.forEach(global => global.dispose());
 		this._localToDispose.forEach(local => local.dispose());
 		this._onDidClose.fire();
 	}
diff --git a/src/vs/workbench/parts/comments/electron-browser/comments.contribution.ts b/src/vs/workbench/parts/comments/electron-browser/comments.contribution.ts
index 751fd1a1371..80bdf78ac19 100644
--- a/src/vs/workbench/parts/comments/electron-browser/comments.contribution.ts
+++ b/src/vs/workbench/parts/comments/electron-browser/comments.contribution.ts
@@ -36,6 +36,6 @@ Registry.as<PanelRegistry>(PanelExtensions.Panels).registerPanel(new PanelDescri
 ));
 
 // Register view location updater
-Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench).registerWorkbenchContribution(CommentPanelVisibilityUpdater, LifecyclePhase.Running);
+Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench).registerWorkbenchContribution(CommentPanelVisibilityUpdater, LifecyclePhase.Restoring);
 
 registerSingleton(ICommentService, CommentService);
diff --git a/src/vs/workbench/parts/comments/electron-browser/commentsEditorContribution.ts b/src/vs/workbench/parts/comments/electron-browser/commentsEditorContribution.ts
index a61caf0eaf1..b1b4b18fff5 100644
--- a/src/vs/workbench/parts/comments/electron-browser/commentsEditorContribution.ts
+++ b/src/vs/workbench/parts/comments/electron-browser/commentsEditorContribution.ts
@@ -5,29 +5,35 @@
 'use strict';
 
 import 'vs/css!./media/review';
-import { $ } from 'vs/base/browser/builder';
+import * as nls from 'vs/nls';
+import { $ } from 'vs/base/browser/dom';
+import { findFirstInSorted } from 'vs/base/common/arrays';
 import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
-import { ICodeEditor, IEditorMouseEvent, IViewZone } from 'vs/editor/browser/editorBrowser';
-import { registerEditorContribution } from 'vs/editor/browser/editorExtensions';
+import { ICodeEditor, IEditorMouseEvent, IViewZone, MouseTargetType } from 'vs/editor/browser/editorBrowser';
+import { registerEditorContribution, EditorAction, registerEditorAction } from 'vs/editor/browser/editorExtensions';
 import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
 import { EmbeddedCodeEditorWidget } from 'vs/editor/browser/widget/embeddedCodeEditorWidget';
 import { IEditorContribution } from 'vs/editor/common/editorCommon';
+import { IRange } from 'vs/editor/common/core/range';
 import * as modes from 'vs/editor/common/modes';
-import { peekViewEditorBackground, peekViewResultsBackground, peekViewResultsSelectionBackground } from 'vs/editor/contrib/referenceSearch/referencesWidget';
+import { peekViewResultsBackground, peekViewResultsSelectionBackground, peekViewTitleBackground } from 'vs/editor/contrib/referenceSearch/referencesWidget';
 import { IContextKey, IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
 import { ServicesAccessor, IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { editorForeground } from 'vs/platform/theme/common/colorRegistry';
+import { KeybindingsRegistry, KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
+import { editorForeground, registerColor } from 'vs/platform/theme/common/colorRegistry';
 import { IThemeService, registerThemingParticipant } from 'vs/platform/theme/common/themeService';
 import { CommentThreadCollapsibleState } from 'vs/workbench/api/node/extHostTypes';
-import { ReviewModel } from 'vs/workbench/parts/comments/common/reviewModel';
-import { CommentGlyphWidget } from 'vs/workbench/parts/comments/electron-browser/commentGlyphWidget';
 import { ReviewZoneWidget, COMMENTEDITOR_DECORATION_KEY } from 'vs/workbench/parts/comments/electron-browser/commentThreadWidget';
 import { ICommentService } from 'vs/workbench/parts/comments/electron-browser/commentService';
 import { IModelService } from 'vs/editor/common/services/modelService';
 import { IModeService } from 'vs/editor/common/services/modeService';
+import { IOpenerService } from 'vs/platform/opener/common/opener';
+import { ModelDecorationOptions } from 'vs/editor/common/model/textModel';
+import { IModelDecorationOptions } from 'vs/editor/common/model';
+import { Color, RGBA } from 'vs/base/common/color';
+import { IMarginData } from 'vs/editor/browser/controller/mouseTarget';
+import { INotificationService } from 'vs/platform/notification/common/notification';
 
 export const ctxReviewPanelVisible = new RawContextKey<boolean>('reviewPanelVisible', false);
 
@@ -42,7 +48,7 @@ export class ReviewViewZone implements IViewZone {
 		this.afterLineNumber = afterLineNumber;
 		this.callback = onDomNodeTop;
 
-		this.domNode = $('.review-viewzone').getHTMLElement();
+		this.domNode = $('.review-viewzone');
 	}
 
 	onDomNodeTop(top: number): void {
@@ -50,6 +56,110 @@ export class ReviewViewZone implements IViewZone {
 	}
 }
 
+const overviewRulerDefault = new Color(new RGBA(197, 197, 197, 1));
+
+export const overviewRulerCommentingRangeForeground = registerColor('editorGutter.commentRangeForeground', { dark: overviewRulerDefault, light: overviewRulerDefault, hc: overviewRulerDefault }, nls.localize('editorGutterCommentRangeForeground', 'Editor gutter decoration color for commenting ranges.'));
+
+class CommentingRangeDecoration {
+	private _decorationId: string;
+
+	get id(): string {
+		return this._decorationId;
+	}
+
+	constructor(private _editor: ICodeEditor, private _ownerId: number, private _range: IRange, private _reply: modes.Command, commentingOptions: ModelDecorationOptions) {
+		const startLineNumber = _range.startLineNumber;
+		const endLineNumber = _range.endLineNumber;
+		let commentingRangeDecorations = [{
+			range: {
+				startLineNumber: startLineNumber, startColumn: 1,
+				endLineNumber: endLineNumber, endColumn: 1
+			},
+			options: commentingOptions
+		}];
+
+		let model = this._editor.getModel();
+		if (model) {
+			this._decorationId = model.deltaDecorations([this._decorationId], commentingRangeDecorations)[0];
+		}
+	}
+
+	getCommentAction(): { replyCommand: modes.Command, ownerId: number } {
+		return {
+			replyCommand: this._reply,
+			ownerId: this._ownerId
+		};
+	}
+
+	getOriginalRange() {
+		return this._range;
+	}
+
+	getActiveRange() {
+		return this._editor.getModel().getDecorationRange(this._decorationId);
+	}
+}
+class CommentingRangeDecorator {
+
+	static createDecoration(className: string, foregroundColor: string, options: { gutter: boolean, overview: boolean }): ModelDecorationOptions {
+		const decorationOptions: IModelDecorationOptions = {
+			isWholeLine: true,
+		};
+
+		decorationOptions.linesDecorationsClassName = `comment-range-glyph ${className}`;
+		return ModelDecorationOptions.createDynamic(decorationOptions);
+	}
+
+	private commentingOptions: ModelDecorationOptions;
+	public commentsOptions: ModelDecorationOptions;
+	private commentingRangeDecorations: CommentingRangeDecoration[] = [];
+	private disposables: IDisposable[] = [];
+
+	constructor(
+	) {
+		const options = { gutter: true, overview: false };
+		this.commentingOptions = CommentingRangeDecorator.createDecoration('comment-diff-added', overviewRulerCommentingRangeForeground, options);
+		this.commentsOptions = CommentingRangeDecorator.createDecoration('comment-thread', overviewRulerCommentingRangeForeground, options);
+	}
+
+	update(editor: ICodeEditor, commentInfos: modes.CommentInfo[]) {
+		let model = editor.getModel();
+		if (!model) {
+			return;
+		}
+
+		let commentingRangeDecorations = [];
+		for (let i = 0; i < commentInfos.length; i++) {
+			let info = commentInfos[i];
+			info.commentingRanges.forEach(range => {
+				commentingRangeDecorations.push(new CommentingRangeDecoration(editor, info.owner, range, info.reply, this.commentingOptions));
+			});
+		}
+
+		let oldDecorations = this.commentingRangeDecorations.map(decoration => decoration.id);
+		editor.deltaDecorations(oldDecorations, []);
+
+		this.commentingRangeDecorations = commentingRangeDecorations;
+	}
+
+	getMatchedCommentAction(line: number) {
+		for (let i = 0; i < this.commentingRangeDecorations.length; i++) {
+			let range = this.commentingRangeDecorations[i].getActiveRange();
+
+			if (range.startLineNumber <= line && line <= range.endLineNumber) {
+				return this.commentingRangeDecorations[i].getCommentAction();
+			}
+		}
+
+		return null;
+	}
+
+	dispose(): void {
+		this.disposables = dispose(this.disposables);
+		this.commentingRangeDecorations = [];
+	}
+}
+
 export class ReviewController implements IEditorContribution {
 	private globalToDispose: IDisposable[];
 	private localToDispose: IDisposable[];
@@ -58,9 +168,11 @@ export class ReviewController implements IEditorContribution {
 	private _commentWidgets: ReviewZoneWidget[];
 	private _reviewPanelVisible: IContextKey<boolean>;
 	private _commentInfos: modes.CommentInfo[];
-	private _reviewModel: ReviewModel;
-	private _newCommentGlyph: CommentGlyphWidget;
-	private _hasSetComments: boolean;
+	// private _hasSetComments: boolean;
+	private _commentingRangeDecorator: CommentingRangeDecorator;
+	private mouseDownInfo: { lineNumber: number } | null = null;
+	private _commentingRangeSpaceReserved = false;
+
 
 	constructor(
 		editor: ICodeEditor,
@@ -72,7 +184,7 @@ export class ReviewController implements IEditorContribution {
 		@IModeService private modeService: IModeService,
 		@IModelService private modelService: IModelService,
 		@ICodeEditorService private codeEditorService: ICodeEditorService,
-
+		@IOpenerService private openerService: IOpenerService
 	) {
 		this.editor = editor;
 		this.globalToDispose = [];
@@ -80,30 +192,10 @@ export class ReviewController implements IEditorContribution {
 		this._commentInfos = [];
 		this._commentWidgets = [];
 		this._newCommentWidget = null;
-		this._newCommentGlyph = null;
-		this._hasSetComments = false;
+		// this._hasSetComments = false;
 
 		this._reviewPanelVisible = ctxReviewPanelVisible.bindTo(contextKeyService);
-		this._reviewModel = new ReviewModel();
-
-		this._reviewModel.onDidChangeStyle(style => {
-			if (this._newCommentWidget) {
-				this._newCommentWidget.dispose();
-				this._newCommentWidget = null;
-			}
-
-			this._commentWidgets.forEach(zone => {
-				zone.dispose();
-			});
-
-			this._commentInfos.forEach(info => {
-				info.threads.forEach(thread => {
-					let zoneWidget = new ReviewZoneWidget(this.instantiationService, this.modeService, this.modelService, this.themeService, this.commentService, this.editor, info.owner, thread, {});
-					zoneWidget.display(thread.range.startLineNumber);
-					this._commentWidgets.push(zoneWidget);
-				});
-			});
-		});
+		this._commentingRangeDecorator = new CommentingRangeDecorator();
 
 		this.globalToDispose.push(this.commentService.onDidDeleteDataProvider(e => {
 			// Remove new comment widget and glyph, refresh comments
@@ -112,11 +204,6 @@ export class ReviewController implements IEditorContribution {
 				this._newCommentWidget = null;
 			}
 
-			if (this._newCommentGlyph) {
-				this.editor.removeContentWidget(this._newCommentGlyph);
-				this._newCommentGlyph = null;
-			}
-
 			this.getComments();
 		}));
 
@@ -154,6 +241,56 @@ export class ReviewController implements IEditorContribution {
 		}
 	}
 
+	public nextCommentThread(): void {
+		if (!this._commentWidgets.length) {
+			return;
+		}
+
+		const after = this.editor.getSelection().getEndPosition();
+		const sortedWidgets = this._commentWidgets.sort((a, b) => {
+			if (a.commentThread.range.startLineNumber < b.commentThread.range.startLineNumber) {
+				return -1;
+			}
+
+			if (a.commentThread.range.startLineNumber > b.commentThread.range.startLineNumber) {
+				return 1;
+			}
+
+			if (a.commentThread.range.startColumn < b.commentThread.range.startColumn) {
+				return -1;
+			}
+
+			if (a.commentThread.range.startColumn > b.commentThread.range.startColumn) {
+				return 1;
+			}
+
+			return 0;
+		});
+
+		let idx = findFirstInSorted(sortedWidgets, widget => {
+			if (widget.commentThread.range.startLineNumber > after.lineNumber) {
+				return true;
+			}
+
+			if (widget.commentThread.range.startLineNumber < after.lineNumber) {
+				return false;
+			}
+
+			if (widget.commentThread.range.startColumn > after.column) {
+				return true;
+			}
+			return false;
+		});
+
+		if (idx === this._commentWidgets.length) {
+			this._commentWidgets[0].reveal();
+			this.editor.setSelection(this._commentWidgets[0].commentThread.range);
+		} else {
+			sortedWidgets[idx].reveal();
+			this.editor.setSelection(sortedWidgets[idx].commentThread.range);
+		}
+	}
+
 	getId(): string {
 		return ID;
 	}
@@ -174,33 +311,30 @@ export class ReviewController implements IEditorContribution {
 	public onModelChanged(): void {
 		this.localToDispose = dispose(this.localToDispose);
 		if (this._newCommentWidget) {
-			// todo store view state.
+			// todo@peng store view state.
 			this._newCommentWidget.dispose();
 			this._newCommentWidget = null;
 		}
 
-		if (this._newCommentGlyph) {
-			this.editor.removeContentWidget(this._newCommentGlyph);
-			this._newCommentGlyph = null;
-		}
-
 		this._commentWidgets.forEach(zone => {
 			zone.dispose();
 		});
 		this._commentWidgets = [];
 
-		this.localToDispose.push(this.editor.onMouseMove(e => this.onEditorMouseMove(e)));
+		this.localToDispose.push(this.editor.onMouseDown(e => this.onEditorMouseDown(e)));
+		this.localToDispose.push(this.editor.onMouseUp(e => this.onEditorMouseUp(e)));
 		this.localToDispose.push(this.editor.onDidChangeModelContent(() => {
-			if (this._newCommentGlyph) {
-				this.editor.removeContentWidget(this._newCommentGlyph);
-				this._newCommentGlyph = null;
-			}
 		}));
 		this.localToDispose.push(this.commentService.onDidUpdateCommentThreads(e => {
 			const editorURI = this.editor && this.editor.getModel() && this.editor.getModel().uri;
 			if (!editorURI) {
 				return;
 			}
+
+			if (!this._commentInfos.some(info => info.owner === e.owner)) {
+				return;
+			}
+
 			let added = e.added.filter(thread => thread.resource.toString() === editorURI.toString());
 			let removed = e.removed.filter(thread => thread.resource.toString() === editorURI.toString());
 			let changed = e.changed.filter(thread => thread.resource.toString() === editorURI.toString());
@@ -222,8 +356,8 @@ export class ReviewController implements IEditorContribution {
 				}
 			});
 			added.forEach(thread => {
-				let zoneWidget = new ReviewZoneWidget(this.instantiationService, this.modeService, this.modelService, this.themeService, this.commentService, this.editor, e.owner, thread, {});
-				zoneWidget.display(thread.range.startLineNumber);
+				let zoneWidget = new ReviewZoneWidget(this.instantiationService, this.modeService, this.modelService, this.themeService, this.commentService, this.openerService, this.editor, e.owner, thread, {});
+				zoneWidget.display(thread.range.startLineNumber, this._commentingRangeDecorator.commentsOptions);
 				this._commentWidgets.push(zoneWidget);
 				this._commentInfos.filter(info => info.owner === e.owner)[0].threads.push(thread);
 			});
@@ -231,7 +365,12 @@ export class ReviewController implements IEditorContribution {
 	}
 
 	private addComment(lineNumber: number) {
-		let newCommentInfo = this.getNewCommentAction(lineNumber);
+		if (this._newCommentWidget !== null) {
+			this.notificationService.warn(`Please submit the comment at line ${this._newCommentWidget.position.lineNumber} before creating a new one.`);
+			return;
+		}
+
+		let newCommentInfo = this._commentingRangeDecorator.getMatchedCommentAction(lineNumber);
 		if (!newCommentInfo) {
 			return;
 		}
@@ -239,7 +378,7 @@ export class ReviewController implements IEditorContribution {
 		// add new comment
 		this._reviewPanelVisible.set(true);
 		const { replyCommand, ownerId } = newCommentInfo;
-		this._newCommentWidget = new ReviewZoneWidget(this.instantiationService, this.modeService, this.modelService, this.themeService, this.commentService, this.editor, ownerId, {
+		this._newCommentWidget = new ReviewZoneWidget(this.instantiationService, this.modeService, this.modelService, this.themeService, this.commentService, this.openerService, this.editor, ownerId, {
 			threadId: null,
 			resource: null,
 			comments: [],
@@ -253,94 +392,131 @@ export class ReviewController implements IEditorContribution {
 			collapsibleState: CommentThreadCollapsibleState.Expanded,
 		}, {});
 
-		this._newCommentWidget.onDidClose(e => {
+		this.localToDispose.push(this._newCommentWidget.onDidClose(e => {
 			this._newCommentWidget = null;
-		});
-		this._newCommentWidget.display(lineNumber);
+		}));
+
+		this.localToDispose.push(this._newCommentWidget.onDidCreateThread(commentWidget => {
+			const thread = commentWidget.commentThread;
+			this._commentWidgets.push(commentWidget);
+			this._commentInfos.filter(info => info.owner === commentWidget.owner)[0].threads.push(thread);
+			this._newCommentWidget = null;
+		}));
+
+		this._newCommentWidget.display(lineNumber, this._commentingRangeDecorator.commentsOptions);
 	}
 
-	private onEditorMouseMove(e: IEditorMouseEvent): void {
-		if (!this._hasSetComments) {
+	private onEditorMouseDown(e: IEditorMouseEvent): void {
+		this.mouseDownInfo = null;
+
+		const range = e.target.range;
+
+		if (!range) {
 			return;
 		}
 
-		const hasCommentingRanges = this._commentInfos.length && this._commentInfos.some(info => !!info.commentingRanges.length);
-		if (hasCommentingRanges && e.target.position && e.target.position.lineNumber !== undefined) {
-			if (this._newCommentGlyph && e.target.element.className !== 'comment-hint') {
-				this.editor.removeContentWidget(this._newCommentGlyph);
-			}
+		if (!e.event.leftButton) {
+			return;
+		}
 
+		if (e.target.type !== MouseTargetType.GUTTER_LINE_DECORATIONS) {
+			return;
+		}
+
+		const data = e.target.detail as IMarginData;
+		const gutterOffsetX = data.offsetX - data.glyphMarginWidth - data.lineNumbersWidth - data.glyphMarginLeft;
+
+		// don't collide with folding and git decorations
+		if (gutterOffsetX > 14) {
+			return;
+		}
+
+		this.mouseDownInfo = { lineNumber: range.startLineNumber };
+	}
+
+	private onEditorMouseUp(e: IEditorMouseEvent): void {
+		if (!this.mouseDownInfo) {
+			return;
+		}
+
+		const { lineNumber } = this.mouseDownInfo;
+		this.mouseDownInfo = null;
+
+		const range = e.target.range;
+
+		if (!range || range.startLineNumber !== lineNumber) {
+			return;
+		}
+
+		if (e.target.type !== MouseTargetType.GUTTER_LINE_DECORATIONS) {
+			return;
+		}
+
+		if (!e.target.element) {
+			return;
+		}
+
+		if (e.target.element.className.indexOf('comment-diff-added') >= 0) {
 			const lineNumber = e.target.position.lineNumber;
-			if (!this.isExistingCommentThreadAtLine(lineNumber)) {
-				this._newCommentGlyph = this.isLineInCommentingRange(lineNumber)
-					? this._newCommentGlyph = new CommentGlyphWidget('comment-hint', this.editor, lineNumber, false, () => {
-						this.addComment(lineNumber);
-					})
-					: this._newCommentGlyph = new CommentGlyphWidget('comment-hint', this.editor, lineNumber, true, () => {
-						this.notificationService.warn('Commenting is not supported outside of diff hunk areas.');
-					});
-
-				this.editor.layoutContentWidget(this._newCommentGlyph);
-			}
+			this.addComment(lineNumber);
 		}
 	}
 
-	private getNewCommentAction(line: number): { replyCommand: modes.Command, ownerId: number } {
-		for (let i = 0; i < this._commentInfos.length; i++) {
-			const commentInfo = this._commentInfos[i];
-			const lineWithinRange = commentInfo.commentingRanges.some(range =>
-				range.startLineNumber <= line && line <= range.endLineNumber
-			);
-
-			if (lineWithinRange) {
-				return {
-					replyCommand: commentInfo.reply,
-					ownerId: commentInfo.owner
-				};
-			}
-		}
-
-		return null;
-	}
-
-	private isLineInCommentingRange(line: number): boolean {
-		return this._commentInfos.some(commentInfo => {
-			return commentInfo.commentingRanges.some(range =>
-				range.startLineNumber <= line && line <= range.endLineNumber
-			);
-		});
-	}
-
-	private isExistingCommentThreadAtLine(line: number): boolean {
-		const existingThread = this._commentInfos.some(commentInfo => {
-			return commentInfo.threads.some(thread =>
-				thread.range.startLineNumber === line
-			);
-		});
-
-		const existingNewComment = this._newCommentWidget && this._newCommentWidget.position && this._newCommentWidget.position.lineNumber === line;
-
-		return existingThread || existingNewComment;
-	}
-
 	setComments(commentInfos: modes.CommentInfo[]): void {
 		this._commentInfos = commentInfos;
-		this._hasSetComments = true;
+		let lineDecorationsWidth: number = this.editor.getConfiguration().layoutInfo.decorationsWidth;
+
+		if (this._commentInfos.some(info => Boolean(info.commentingRanges && info.commentingRanges.length))) {
+			if (!this._commentingRangeSpaceReserved) {
+				this._commentingRangeSpaceReserved = true;
+				let extraEditorClassName = [];
+				if (this.editor.getRawConfiguration().extraEditorClassName) {
+					extraEditorClassName = this.editor.getRawConfiguration().extraEditorClassName.split(' ');
+				}
+
+				if (this.editor.getConfiguration().contribInfo.folding) {
+					lineDecorationsWidth -= 16;
+				}
+				lineDecorationsWidth += 9;
+				extraEditorClassName.push('inline-comment');
+				this.editor.updateOptions({
+					extraEditorClassName: extraEditorClassName.join(' '),
+					lineDecorationsWidth: lineDecorationsWidth
+				});
+
+				// we only update the lineDecorationsWidth property but keep the width of the whole editor.
+				const originalLayoutInfo = this.editor.getLayoutInfo();
+
+				this.editor.layout({
+					width: originalLayoutInfo.width,
+					height: originalLayoutInfo.height
+				});
+			}
+		}
+
+		// this._hasSetComments = true;
 
 		// create viewzones
 		this._commentWidgets.forEach(zone => {
 			zone.dispose();
 		});
 
+		this._commentWidgets = [];
+
 		this._commentInfos.forEach(info => {
 			info.threads.forEach(thread => {
-				let zoneWidget = new ReviewZoneWidget(this.instantiationService, this.modeService, this.modelService, this.themeService, this.commentService, this.editor, info.owner, thread, {});
-				zoneWidget.display(thread.range.startLineNumber);
+				let zoneWidget = new ReviewZoneWidget(this.instantiationService, this.modeService, this.modelService, this.themeService, this.commentService, this.openerService, this.editor, info.owner, thread, {});
+				zoneWidget.display(thread.range.startLineNumber, this._commentingRangeDecorator.commentsOptions);
 				this._commentWidgets.push(zoneWidget);
 			});
 		});
-	}
 
+		const commentingRanges = [];
+		this._commentInfos.forEach(info => {
+			commentingRanges.push(...info.commentingRanges);
+		});
+		this._commentingRangeDecorator.update(this.editor, this._commentInfos);
+	}
 
 	public closeWidget(): void {
 		this._reviewPanelVisible.reset();
@@ -359,12 +535,31 @@ export class ReviewController implements IEditorContribution {
 	}
 }
 
-registerEditorContribution(ReviewController);
+export class NextCommentThreadAction extends EditorAction {
 
+	constructor() {
+		super({
+			id: 'editor.action.nextCommentThreadAction',
+			label: nls.localize('nextCommentThreadAction', "Go to Next Comment Thread"),
+			alias: 'Go to Next Comment Thread',
+			precondition: null,
+		});
+	}
+
+	public run(accessor: ServicesAccessor, editor: ICodeEditor): void {
+		let controller = ReviewController.get(editor);
+		if (controller) {
+			controller.nextCommentThread();
+		}
+	}
+}
+
+registerEditorContribution(ReviewController);
+registerEditorAction(NextCommentThreadAction);
 
 KeybindingsRegistry.registerCommandAndKeybindingRule({
 	id: 'closeReviewPanel',
-	weight: KeybindingsRegistry.WEIGHT.editorContrib(),
+	weight: KeybindingWeight.EditorContrib,
 	primary: KeyCode.Escape,
 	secondary: [KeyMod.Shift | KeyCode.Escape],
 	when: ctxReviewPanelVisible,
@@ -405,7 +600,7 @@ registerThemingParticipant((theme, collector) => {
 			`}`);
 	}
 
-	let monacoEditorBackground = theme.getColor(peekViewEditorBackground);
+	let monacoEditorBackground = theme.getColor(peekViewTitleBackground);
 	if (monacoEditorBackground) {
 		collector.addRule(
 			`.monaco-editor .review-widget .body .comment-form .review-thread-reply-button {` +
@@ -439,4 +634,22 @@ registerThemingParticipant((theme, collector) => {
 			`}`
 		);
 	}
+
+	const commentingRangeForeground = theme.getColor(overviewRulerCommentingRangeForeground);
+	if (commentingRangeForeground) {
+		collector.addRule(`
+			.monaco-editor .comment-diff-added {
+				border-left: 3px solid ${commentingRangeForeground};
+			}
+			.monaco-editor .comment-diff-added:before {
+				background: ${commentingRangeForeground};
+			}
+			.monaco-editor .comment-thread {
+				border-left: 3px solid ${commentingRangeForeground};
+			}
+			.monaco-editor .comment-thread:before {
+				background: ${commentingRangeForeground};
+			}
+		`);
+	}
 });
diff --git a/src/vs/workbench/parts/comments/electron-browser/commentsPanel.ts b/src/vs/workbench/parts/comments/electron-browser/commentsPanel.ts
index d75c7d5aa5d..7a890b78107 100644
--- a/src/vs/workbench/parts/comments/electron-browser/commentsPanel.ts
+++ b/src/vs/workbench/parts/comments/electron-browser/commentsPanel.ts
@@ -10,7 +10,7 @@ import { debounceEvent } from 'vs/base/common/event';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { CollapseAllAction, DefaultAccessibilityProvider, DefaultController, DefaultDragAndDrop } from 'vs/base/parts/tree/browser/treeDefaults';
 import { isCodeEditor, isDiffEditor } from 'vs/editor/browser/editorBrowser';
-import { CommentThread, CommentThreadChangedEvent } from 'vs/editor/common/modes';
+import { CommentThreadChangedEvent } from 'vs/editor/common/modes';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { TreeResourceNavigator, WorkbenchTree } from 'vs/platform/list/browser/listService';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
@@ -19,9 +19,11 @@ import { Panel } from 'vs/workbench/browser/panel';
 import { CommentNode, CommentsModel, ResourceWithCommentThreads } from 'vs/workbench/parts/comments/common/commentModel';
 import { ReviewController } from 'vs/workbench/parts/comments/electron-browser/commentsEditorContribution';
 import { CommentsDataFilter, CommentsDataSource, CommentsModelRenderer } from 'vs/workbench/parts/comments/electron-browser/commentsTreeViewer';
-import { ICommentService } from 'vs/workbench/parts/comments/electron-browser/commentService';
+import { ICommentService, IWorkspaceCommentThreadsEvent } from 'vs/workbench/parts/comments/electron-browser/commentService';
 import { IEditorService, ACTIVE_GROUP, SIDE_GROUP } from 'vs/workbench/services/editor/common/editorService';
 import { ICommandService } from 'vs/platform/commands/common/commands';
+import { textLinkForeground, textLinkActiveForeground, focusBorder } from 'vs/platform/theme/common/colorRegistry';
+import { IOpenerService } from 'vs/platform/opener/common/opener';
 
 export const COMMENTS_PANEL_ID = 'workbench.panel.comments';
 export const COMMENTS_PANEL_TITLE = 'Comments';
@@ -39,6 +41,7 @@ export class CommentsPanel extends Panel {
 		@ICommentService private commentService: ICommentService,
 		@IEditorService private editorService: IEditorService,
 		@ICommandService private commandService: ICommandService,
+		@IOpenerService private openerService: IOpenerService,
 		@ITelemetryService telemetryService: ITelemetryService,
 		@IThemeService themeService: IThemeService
 	) {
@@ -60,9 +63,37 @@ export class CommentsPanel extends Panel {
 		this.commentService.onDidSetAllCommentThreads(this.onAllCommentsChanged, this);
 		this.commentService.onDidUpdateCommentThreads(this.onCommentsUpdated, this);
 
+		const styleElement = dom.createStyleSheet(parent);
+		this.applyStyles(styleElement);
+		this.themeService.onThemeChange(_ => {
+			this.applyStyles(styleElement);
+		});
+
 		return this.render();
 	}
 
+	private applyStyles(styleElement: HTMLStyleElement) {
+		const content: string[] = [];
+
+		const theme = this.themeService.getTheme();
+		const linkColor = theme.getColor(textLinkForeground);
+		if (linkColor) {
+			content.push(`.comments-panel .comments-panel-container a { color: ${linkColor}; }`);
+		}
+
+		const linkActiveColor = theme.getColor(textLinkActiveForeground);
+		if (linkActiveColor) {
+			content.push(`.comments-panel .comments-panel-container a:hover, a:active { color: ${linkActiveColor}; }`);
+		}
+
+		const focusColor = theme.getColor(focusBorder);
+		if (focusColor) {
+			content.push(`.comments-panel .commenst-panel-container a:focus { outline-color: ${focusColor}; }`);
+		}
+
+		styleElement.innerHTML = content.join('\n');
+	}
+
 	private render(): TPromise<void> {
 		dom.toggleClass(this.treeContainer, 'hidden', !this.commentsModel.hasCommentThreads());
 		return this.tree.setInput(this.commentsModel).then(() => {
@@ -73,7 +104,7 @@ export class CommentsPanel extends Panel {
 	public getActions(): IAction[] {
 		if (!this.collapseAllAction) {
 			this.collapseAllAction = this.instantiationService.createInstance(CollapseAllAction, this.tree, this.commentsModel.hasCommentThreads());
-			this.toUnbind.push(this.collapseAllAction);
+			this._register(this.collapseAllAction);
 		}
 
 		return [this.collapseAllAction];
@@ -101,7 +132,7 @@ export class CommentsPanel extends Panel {
 	private createTree(): void {
 		this.tree = this.instantiationService.createInstance(WorkbenchTree, this.treeContainer, {
 			dataSource: new CommentsDataSource(),
-			renderer: new CommentsModelRenderer(this.instantiationService),
+			renderer: new CommentsModelRenderer(this.instantiationService, this.openerService),
 			accessibilityProvider: new DefaultAccessibilityProvider,
 			controller: new DefaultController(),
 			dnd: new DefaultDragAndDrop(),
@@ -201,7 +232,6 @@ export class CommentsPanel extends Panel {
 				const control = editor.getControl();
 				if (threadToReveal && isCodeEditor(control)) {
 					const controller = ReviewController.get(control);
-					console.log(commentToReveal.command);
 					controller.revealCommentThread(threadToReveal, commentToReveal.commentId);
 				}
 				setCommentsForFile = null;
@@ -212,6 +242,18 @@ export class CommentsPanel extends Panel {
 		return true;
 	}
 
+	public setVisible(visible: boolean): TPromise<void> {
+		const wasVisible = this.isVisible();
+		return super.setVisible(visible)
+			.then(() => {
+				if (this.isVisible()) {
+					if (!wasVisible) {
+						this.refresh();
+					}
+				}
+			});
+	}
+
 	private refresh(): void {
 		if (this.isVisible()) {
 			this.collapseAllAction.enabled = this.commentsModel.hasCommentThreads();
@@ -225,13 +267,15 @@ export class CommentsPanel extends Panel {
 		}
 	}
 
-	private onAllCommentsChanged(e: CommentThread[]): void {
-		this.commentsModel.setCommentThreads(e);
+	private onAllCommentsChanged(e: IWorkspaceCommentThreadsEvent): void {
+		this.commentsModel.setCommentThreads(e.ownerId, e.commentThreads);
 		this.refresh();
 	}
 
 	private onCommentsUpdated(e: CommentThreadChangedEvent): void {
-		this.commentsModel.updateCommentThreads(e);
-		this.refresh();
+		const didUpdate = this.commentsModel.updateCommentThreads(e);
+		if (didUpdate) {
+			this.refresh();
+		}
 	}
 }
diff --git a/src/vs/workbench/parts/comments/electron-browser/commentsTreeViewer.ts b/src/vs/workbench/parts/comments/electron-browser/commentsTreeViewer.ts
index df16d651425..4ead88c0914 100644
--- a/src/vs/workbench/parts/comments/electron-browser/commentsTreeViewer.ts
+++ b/src/vs/workbench/parts/comments/electron-browser/commentsTreeViewer.ts
@@ -4,10 +4,15 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as dom from 'vs/base/browser/dom';
+import * as nls from 'vs/nls';
 import { renderMarkdown } from 'vs/base/browser/htmlContentRenderer';
+import { onUnexpectedError } from 'vs/base/common/errors';
+import { Disposable } from 'vs/base/common/lifecycle';
+import { URI } from 'vs/base/common/uri';
 import { Promise, TPromise } from 'vs/base/common/winjs.base';
 import { IDataSource, IFilter, IRenderer as ITreeRenderer, ITree } from 'vs/base/parts/tree/browser/tree';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { IOpenerService } from 'vs/platform/opener/common/opener';
 import { FileLabel } from 'vs/workbench/browser/labels';
 import { CommentNode, CommentsModel, ResourceWithCommentThreads } from 'vs/workbench/parts/comments/common/commentModel';
 
@@ -59,6 +64,7 @@ interface ICommentThreadTemplateData {
 	icon: HTMLImageElement;
 	userName: HTMLSpanElement;
 	commentText: HTMLElement;
+	disposables: Disposable[];
 }
 
 export class CommentsModelRenderer implements ITreeRenderer {
@@ -67,7 +73,8 @@ export class CommentsModelRenderer implements ITreeRenderer {
 
 
 	constructor(
-		@IInstantiationService private instantiationService: IInstantiationService
+		@IInstantiationService private instantiationService: IInstantiationService,
+		@IOpenerService private openerService: IOpenerService
 	) {
 	}
 
@@ -99,6 +106,10 @@ export class CommentsModelRenderer implements ITreeRenderer {
 		switch (templateId) {
 			case CommentsModelRenderer.RESOURCE_ID:
 				(<IResourceTemplateData>templateData).resourceLabel.dispose();
+				break;
+			case CommentsModelRenderer.COMMENT_ID:
+				(<ICommentThreadTemplateData>templateData).disposables.forEach(disposeable => disposeable.dispose());
+				break;
 		}
 	}
 
@@ -124,6 +135,7 @@ export class CommentsModelRenderer implements ITreeRenderer {
 		const labelContainer = dom.append(container, dom.$('.comment-container'));
 		data.userName = dom.append(labelContainer, dom.$('.user'));
 		data.commentText = dom.append(labelContainer, dom.$('.text'));
+		data.disposables = [];
 
 		return data;
 	}
@@ -134,7 +146,26 @@ export class CommentsModelRenderer implements ITreeRenderer {
 
 	private renderCommentElement(tree: ITree, element: CommentNode, templateData: ICommentThreadTemplateData) {
 		templateData.userName.textContent = element.comment.userName;
-		templateData.commentText.innerHTML = renderMarkdown(element.comment.body, { inline: true }).innerHTML;
+		templateData.commentText.innerHTML = '';
+		const renderedComment = renderMarkdown(element.comment.body, {
+			inline: true,
+			actionHandler: {
+				callback: (content) => {
+					this.openerService.open(URI.parse(content)).then(void 0, onUnexpectedError);
+				},
+				disposeables: templateData.disposables
+			}
+		});
+
+		const images = renderedComment.getElementsByTagName('img');
+		for (let i = 0; i < images.length; i++) {
+			const image = images[i];
+			const textDescription = dom.$('');
+			textDescription.textContent = image.alt ? nls.localize('imageWithLabel', "Image: {0}", image.alt) : nls.localize('image', "Image");
+			image.parentNode.replaceChild(textDescription, image);
+		}
+
+		templateData.commentText.appendChild(renderedComment);
 	}
 }
 
diff --git a/src/vs/workbench/parts/comments/electron-browser/media/panel.css b/src/vs/workbench/parts/comments/electron-browser/media/panel.css
index 45268e182f1..3c2b37bcf3f 100644
--- a/src/vs/workbench/parts/comments/electron-browser/media/panel.css
+++ b/src/vs/workbench/parts/comments/electron-browser/media/panel.css
@@ -30,8 +30,15 @@
 	opacity: 0.5;
 }
 
+.comments-panel .comments-panel-container .tree-container .comment-container .text {
+	flex: 1;
+	min-width: 0;
+}
+
 .comments-panel .comments-panel-container .tree-container .comment-container .text * {
 	margin: 0;
+	text-overflow: ellipsis;
+	overflow: hidden;
 }
 
 .comments-panel .comments-panel-container .message-box-container {
@@ -49,6 +56,5 @@
 
 .comments-panel .comments-panel-container .tree-container .comment-container {
 	line-height: 22px;
-	text-overflow: ellipsis;
-	overflow: hidden;
+	margin-right: 5px;
 }
\ No newline at end of file
diff --git a/src/vs/workbench/parts/comments/electron-browser/media/review.css b/src/vs/workbench/parts/comments/electron-browser/media/review.css
index 9854ade1898..c3bd18b08e0 100644
--- a/src/vs/workbench/parts/comments/electron-browser/media/review.css
+++ b/src/vs/workbench/parts/comments/electron-browser/media/review.css
@@ -10,11 +10,8 @@
 	background-position: center center;
 }
 
-.monaco-editor .comment-hint{
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	height: 16px;
+.monaco-editor .comment-hint {
+	height: 20px;
 	width: 20px;
 	padding-left: 2px;
 	background: url('comment.svg') center center no-repeat;
@@ -38,6 +35,13 @@
 	display: flex;
 }
 
+.monaco-editor .review-widget .body .review-comment blockquote {
+	margin: 0 7px 0 5px;
+	padding: 0 16px 0 10px;
+	border-left-width: 5px;
+	border-left-style: solid;
+}
+
 .monaco-editor .review-widget .body .review-comment .avatar-container {
 	margin-top: 4px !important;
 }
@@ -55,6 +59,7 @@
 
 .monaco-editor .review-widget .body .review-comment .review-comment-contents {
 	margin-left: 20px;
+	user-select: text;
 }
 
 .monaco-editor .review-widget .body pre {
@@ -112,6 +117,10 @@
 	padding: 0 0.4em;
 }
 
+.monaco-editor .review-widget .body span {
+	white-space: pre;
+}
+
 .monaco-editor .review-widget .body .comment-body img {
 	max-width: 100%;
 }
@@ -121,6 +130,29 @@
 	padding: 8px 0;
 }
 
+.monaco-editor .review-widget .body .comment-form .validation-error {
+	display: inline-block;
+	overflow: hidden;
+	text-align: left;
+	width: 100%;
+	box-sizing:	border-box;
+	-webkit-box-sizing:	border-box;
+	-o-box-sizing:		border-box;
+	-moz-box-sizing:	border-box;
+	-ms-box-sizing:		border-box;
+	padding: 0.4em;
+	font-size: 12px;
+	line-height: 17px;
+	min-height: 34px;
+	margin-top: -1px;
+	margin-left: -1px;
+	word-wrap: break-word;
+}
+
+.monaco-editor .review-widget .body .comment-form .validation-error.hidden {
+	display: none;
+}
+
 .monaco-editor .review-widget .body .comment-form.expand .review-thread-reply-button {
 	display: none;
 }
@@ -128,7 +160,7 @@
 .monaco-editor .review-widget .body .comment-form.expand .monaco-editor,
 .monaco-editor .review-widget .body .comment-form.expand .form-actions {
 	display: block;
-	box-sizing: border-box;
+	box-sizing: content-box;
 }
 
 .monaco-editor .review-widget .body .comment-form .review-thread-reply-button {
@@ -136,7 +168,7 @@
 	display: block;
 	width: 100%;
 	resize: vertical;
-	border-radius: 3px;
+	border-radius: 0;
 	box-sizing: border-box;
 	padding: 6px 12px;
 	font-weight: 600;
@@ -144,6 +176,7 @@
 	white-space: nowrap;
 	border: 0px;
 	cursor: text;
+	outline: 1px solid transparent;
 }
 
 .monaco-editor .review-widget .body .comment-form .review-thread-reply-button:focus {
@@ -158,6 +191,7 @@
 	max-height: 500px;
 	border-radius: 3px;
 	border: 0px;
+	padding: 6px 0 6px 12px;
 }
 
 .monaco-editor .review-widget .body .comment-form .form-actions {
@@ -186,7 +220,7 @@
 	display: inline-block;
 	font-size: 13px;
 	margin-left: 20px;
-	cursor: pointer;
+	cursor: default;
 }
 
 .monaco-editor .review-widget .head .review-title .dirname:not(:empty) {
@@ -233,4 +267,60 @@
 .monaco-editor .review-widget>.body {
 	border-top: 1px solid;
 	position: relative;
-}
\ No newline at end of file
+}
+
+.monaco-editor .comment-range-glyph {
+	margin-left: 5px;
+	width: 4px !important;
+	cursor: pointer;
+	z-index: 10;
+}
+
+.monaco-editor .comment-range-glyph:before {
+	position: absolute;
+	content: '';
+	height: 100%;
+	width: 0;
+	left: -2px;
+	transition: width 80ms linear, left 80ms linear;
+}
+
+.monaco-editor .margin-view-overlays>div:hover>.comment-range-glyph.comment-diff-added:before {
+	position: absolute;
+	content: '+';
+	height: 100%;
+	width: 9px;
+	left: -6px;
+	z-index: 10;
+	color: black;
+}
+
+.monaco-editor .comment-range-glyph.comment-thread {
+	z-index: 20;
+}
+
+.monaco-editor .comment-range-glyph.comment-thread:before {
+	position: absolute;
+	content: '◆';
+	font-size: 10px;
+	height: 100%;
+	line-height: 100%;
+	width: 9px;
+	left: -6px;
+	z-index: 20;
+	color: black;
+	text-align: center;
+	display:flex;
+	flex-direction:row;
+	align-items: center;
+	justify-content: center;
+
+}
+
+.monaco-editor.inline-comment .margin-view-overlays .folding {
+	margin-left: 14px;
+}
+
+.monaco-editor.inline-comment .margin-view-overlays .dirty-diff-glyph {
+	margin-left: 14px;
+}
diff --git a/src/vs/workbench/parts/comments/electron-browser/simpleCommentEditor.ts b/src/vs/workbench/parts/comments/electron-browser/simpleCommentEditor.ts
index 3bbb410d3f5..a103105c641 100644
--- a/src/vs/workbench/parts/comments/electron-browser/simpleCommentEditor.ts
+++ b/src/vs/workbench/parts/comments/electron-browser/simpleCommentEditor.ts
@@ -12,7 +12,7 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti
 import { ICommandService } from 'vs/platform/commands/common/commands';
 
 // Allowed Editor Contributions:
-import { MenuPreventer } from 'vs/workbench/parts/codeEditor/electron-browser/menuPreventer';
+import { MenuPreventer } from 'vs/workbench/parts/codeEditor/browser/menuPreventer';
 import { SelectionClipboard } from 'vs/workbench/parts/codeEditor/electron-browser/selectionClipboard';
 import { ContextMenuController } from 'vs/editor/contrib/contextmenu/contextmenu';
 import { SuggestController } from 'vs/editor/contrib/suggest/suggestController';
diff --git a/src/vs/workbench/parts/debug/browser/baseDebugView.ts b/src/vs/workbench/parts/debug/browser/baseDebugView.ts
index e3cc797de24..dec53bb654a 100644
--- a/src/vs/workbench/parts/debug/browser/baseDebugView.ts
+++ b/src/vs/workbench/parts/debug/browser/baseDebugView.ts
@@ -19,7 +19,6 @@ import { IControllerOptions } from 'vs/base/parts/tree/browser/treeDefaults';
 import { fillInContextMenuActions } from 'vs/platform/actions/browser/menuItemActionItem';
 import { KeyCode } from 'vs/base/common/keyCodes';
 import { IKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-import { onUnexpectedError } from 'vs/base/common/errors';
 import { WorkbenchTreeController } from 'vs/platform/list/browser/listService';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 
@@ -83,16 +82,16 @@ export function renderExpressionValue(expressionOrValue: IExpression | string, c
 		}
 	}
 
-	if (options.maxValueLength && value.length > options.maxValueLength) {
+	if (options.maxValueLength && value && value.length > options.maxValueLength) {
 		value = value.substr(0, options.maxValueLength) + '...';
 	}
 	if (value && !options.preserveWhitespace) {
 		container.textContent = replaceWhitespace(value);
 	} else {
-		container.textContent = value;
+		container.textContent = value || '';
 	}
 	if (options.showHover) {
-		container.title = value;
+		container.title = value || '';
 	}
 }
 
@@ -103,18 +102,15 @@ export function renderVariable(variable: Variable, data: IVariableTemplateData,
 		dom.toggleClass(data.name, 'virtual', !!variable.presentationHint && variable.presentationHint.kind === 'virtual');
 	}
 
-	if (variable.value) {
-		data.name.textContent += (typeof variable.name === 'string') ? ':' : '';
-		renderExpressionValue(variable, data.value, {
-			showChanged,
-			maxValueLength: MAX_VALUE_RENDER_LENGTH_IN_VIEWLET,
-			preserveWhitespace: false,
-			showHover: true,
-			colorize: true
-		});
-	} else {
-		data.value.textContent = '';
-		data.value.title = '';
+	renderExpressionValue(variable, data.value, {
+		showChanged,
+		maxValueLength: MAX_VALUE_RENDER_LENGTH_IN_VIEWLET,
+		preserveWhitespace: false,
+		showHover: true,
+		colorize: true
+	});
+	if (variable.value && typeof variable.name === 'string') {
+		data.name.textContent += ':';
 	}
 }
 
@@ -154,11 +150,11 @@ export function renderRenameBox(debugService: IDebugService, contextViewService:
 				if (renamed && element.value !== inputBox.value) {
 					element.setVariable(inputBox.value)
 						// if everything went fine we need to refresh ui elements since the variable update can change watch and variables view
-						.done(() => {
+						.then(() => {
 							tree.refresh(element, false);
 							// Need to force watch expressions to update since a variable change can have an effect on watches
 							debugService.focusStackFrame(debugService.getViewModel().focusedStackFrame);
-						}, onUnexpectedError);
+						});
 				}
 			}
 
diff --git a/src/vs/workbench/parts/debug/browser/breakpointsView.ts b/src/vs/workbench/parts/debug/browser/breakpointsView.ts
index 1879a7ad4a7..3703cf37902 100644
--- a/src/vs/workbench/parts/debug/browser/breakpointsView.ts
+++ b/src/vs/workbench/parts/debug/browser/breakpointsView.ts
@@ -6,7 +6,6 @@
 import * as nls from 'vs/nls';
 import * as resources from 'vs/base/common/resources';
 import * as dom from 'vs/base/browser/dom';
-import { onUnexpectedError } from 'vs/base/common/errors';
 import { IAction, Action } from 'vs/base/common/actions';
 import { IDebugService, IBreakpoint, CONTEXT_BREAKPOINTS_FOCUSED, EDITOR_CONTRIBUTION_ID, State, DEBUG_SCHEME, IFunctionBreakpoint, IExceptionBreakpoint, IEnablement, IDebugEditorContribution } from 'vs/workbench/parts/debug/common/debug';
 import { ExceptionBreakpoint, FunctionBreakpoint, Breakpoint } from 'vs/workbench/parts/debug/common/debugModel';
@@ -16,14 +15,10 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { Constants } from 'vs/editor/common/core/uint';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { getPathLabel } from 'vs/base/common/labels';
 import { dispose, IDisposable } from 'vs/base/common/lifecycle';
-import { basename } from 'vs/base/common/paths';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { Separator } from 'vs/base/browser/ui/actionbar/actionbar';
-import { IDelegate, IListContextMenuEvent, IRenderer } from 'vs/base/browser/ui/list/list';
+import { IVirtualDelegate, IListContextMenuEvent, IRenderer } from 'vs/base/browser/ui/list/list';
 import { IEditor } from 'vs/workbench/common/editor';
 import { InputBox } from 'vs/base/browser/ui/inputbox/inputBox';
 import { IKeyboardEvent } from 'vs/base/browser/keyboardEvent';
@@ -33,12 +28,20 @@ import { IViewletViewOptions } from 'vs/workbench/browser/parts/views/viewsViewl
 import { attachInputBoxStyler } from 'vs/platform/theme/common/styler';
 import { isCodeEditor } from 'vs/editor/browser/editorBrowser';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
 import { IEditorService, SIDE_GROUP, ACTIVE_GROUP } from 'vs/workbench/services/editor/common/editorService';
-import { ViewletPanel } from 'vs/workbench/browser/parts/views/panelViewlet';
+import { ViewletPanel, IViewletPanelOptions } from 'vs/workbench/browser/parts/views/panelViewlet';
+import { ILabelService } from 'vs/platform/label/common/label';
 
 const $ = dom.$;
 
+function createCheckbox(): HTMLInputElement {
+	const checkbox = <HTMLInputElement>$('input');
+	checkbox.type = 'checkbox';
+	checkbox.tabIndex = -1;
+
+	return checkbox;
+}
+
 export class BreakpointsView extends ViewletPanel {
 
 	private static readonly MAX_VISIBLE_FILES = 9;
@@ -58,7 +61,7 @@ export class BreakpointsView extends ViewletPanel {
 		@IContextViewService private contextViewService: IContextViewService,
 		@IConfigurationService configurationService: IConfigurationService
 	) {
-		super(options, keybindingService, contextMenuService, configurationService);
+		super({ ...(options as IViewletPanelOptions), ariaHeaderLabel: nls.localize('breakpointsSection', "Breakpoints Section") }, keybindingService, contextMenuService, configurationService);
 
 		this.minimumBodySize = this.maximumBodySize = this.getExpandedBodySize();
 		this.settings = options.viewletSettings;
@@ -86,19 +89,31 @@ export class BreakpointsView extends ViewletPanel {
 		this.disposables.push(this.list.onOpen(e => {
 			let isSingleClick = false;
 			let isDoubleClick = false;
+			let isMiddleClick = false;
 			let openToSide = false;
 
 			const browserEvent = e.browserEvent;
 			if (browserEvent instanceof MouseEvent) {
 				isSingleClick = browserEvent.detail === 1;
 				isDoubleClick = browserEvent.detail === 2;
+				isMiddleClick = browserEvent.button === 1;
 				openToSide = (browserEvent.ctrlKey || browserEvent.metaKey || browserEvent.altKey);
 			}
 
 			const focused = this.list.getFocusedElements();
 			const element = focused.length ? focused[0] : undefined;
+
+			if (isMiddleClick) {
+				if (element instanceof Breakpoint) {
+					this.debugService.removeBreakpoints(element.getId());
+				} else if (element instanceof FunctionBreakpoint) {
+					this.debugService.removeFunctionBreakpoints(element.getId());
+				}
+				return;
+			}
+
 			if (element instanceof Breakpoint) {
-				openBreakpointSource(element, openToSide, isSingleClick, this.debugService, this.editorService).done(undefined, onUnexpectedError);
+				openBreakpointSource(element, openToSide, isSingleClick, this.debugService, this.editorService);
 			}
 			if (isDoubleClick && element instanceof FunctionBreakpoint && element !== this.debugService.getViewModel().getSelectedFunctionBreakpoint()) {
 				this.debugService.getViewModel().setSelectedFunctionBreakpoint(element);
@@ -221,7 +236,7 @@ export class BreakpointsView extends ViewletPanel {
 	}
 }
 
-class BreakpointsDelegate implements IDelegate<IEnablement> {
+class BreakpointsDelegate implements IVirtualDelegate<IEnablement> {
 
 	constructor(private debugService: IDebugService) {
 		// noop
@@ -279,9 +294,7 @@ class BreakpointsRenderer implements IRenderer<IBreakpoint, IBreakpointTemplateD
 
 	constructor(
 		@IDebugService private debugService: IDebugService,
-		@IWorkspaceContextService private contextService: IWorkspaceContextService,
-		@IEnvironmentService private environmentService: IEnvironmentService,
-		@ITextFileService private textFileService: ITextFileService
+		@ILabelService private labelService: ILabelService
 	) {
 		// noop
 	}
@@ -297,8 +310,7 @@ class BreakpointsRenderer implements IRenderer<IBreakpoint, IBreakpointTemplateD
 		data.breakpoint = dom.append(container, $('.breakpoint'));
 
 		data.icon = $('.icon');
-		data.checkbox = <HTMLInputElement>$('input');
-		data.checkbox.type = 'checkbox';
+		data.checkbox = createCheckbox();
 		data.toDispose = [];
 		data.toDispose.push(dom.addStandardDisposableListener(data.checkbox, 'change', (e) => {
 			this.debugService.enableOrDisableBreakpoints(!data.context.enabled, data.context);
@@ -320,29 +332,28 @@ class BreakpointsRenderer implements IRenderer<IBreakpoint, IBreakpointTemplateD
 		data.context = breakpoint;
 		dom.toggleClass(data.breakpoint, 'disabled', !this.debugService.getModel().areBreakpointsActivated());
 
-		data.name.textContent = basename(getPathLabel(breakpoint.uri, this.contextService));
+		data.name.textContent = resources.basenameOrAuthority(breakpoint.uri);
 		data.lineNumber.textContent = breakpoint.lineNumber.toString();
 		if (breakpoint.column) {
 			data.lineNumber.textContent += `:${breakpoint.column}`;
 		}
-		data.filePath.textContent = getPathLabel(resources.dirname(breakpoint.uri), this.contextService, this.environmentService);
+		data.filePath.textContent = this.labelService.getUriLabel(resources.dirname(breakpoint.uri), true);
 		data.checkbox.checked = breakpoint.enabled;
 
-		const { message, className } = getBreakpointMessageAndClassName(this.debugService, this.textFileService, breakpoint);
+		const { message, className } = getBreakpointMessageAndClassName(this.debugService, breakpoint);
 		data.icon.className = className + ' icon';
-		data.icon.title = message ? message : '';
+		data.breakpoint.title = breakpoint.message || message || '';
 
 		const debugActive = this.debugService.state === State.Running || this.debugService.state === State.Stopped;
 		if (debugActive && !breakpoint.verified) {
 			dom.addClass(data.breakpoint, 'disabled');
-			if (breakpoint.message) {
-				data.breakpoint.title = breakpoint.message;
-			}
-		} else if (breakpoint.condition || breakpoint.hitCondition) {
-			data.breakpoint.title = breakpoint.condition ? breakpoint.condition : breakpoint.hitCondition;
 		}
 	}
 
+	disposeElement(): void {
+		// noop
+	}
+
 	disposeTemplate(templateData: IBreakpointTemplateData): void {
 		dispose(templateData.toDispose);
 	}
@@ -366,8 +377,7 @@ class ExceptionBreakpointsRenderer implements IRenderer<IExceptionBreakpoint, IB
 		const data: IBreakpointTemplateData = Object.create(null);
 		data.breakpoint = dom.append(container, $('.breakpoint'));
 
-		data.checkbox = <HTMLInputElement>$('input');
-		data.checkbox.type = 'checkbox';
+		data.checkbox = createCheckbox();
 		data.toDispose = [];
 		data.toDispose.push(dom.addStandardDisposableListener(data.checkbox, 'change', (e) => {
 			this.debugService.enableOrDisableBreakpoints(!data.context.enabled, data.context);
@@ -388,6 +398,10 @@ class ExceptionBreakpointsRenderer implements IRenderer<IExceptionBreakpoint, IB
 		data.checkbox.checked = exceptionBreakpoint.enabled;
 	}
 
+	disposeElement(): void {
+		// noop
+	}
+
 	disposeTemplate(templateData: IBaseBreakpointTemplateData): void {
 		dispose(templateData.toDispose);
 	}
@@ -396,8 +410,7 @@ class ExceptionBreakpointsRenderer implements IRenderer<IExceptionBreakpoint, IB
 class FunctionBreakpointsRenderer implements IRenderer<FunctionBreakpoint, IBaseBreakpointWithIconTemplateData> {
 
 	constructor(
-		@IDebugService private debugService: IDebugService,
-		@ITextFileService private textFileService: ITextFileService
+		@IDebugService private debugService: IDebugService
 	) {
 		// noop
 	}
@@ -413,8 +426,7 @@ class FunctionBreakpointsRenderer implements IRenderer<FunctionBreakpoint, IBase
 		data.breakpoint = dom.append(container, $('.breakpoint'));
 
 		data.icon = $('.icon');
-		data.checkbox = <HTMLInputElement>$('input');
-		data.checkbox.type = 'checkbox';
+		data.checkbox = createCheckbox();
 		data.toDispose = [];
 		data.toDispose.push(dom.addStandardDisposableListener(data.checkbox, 'change', (e) => {
 			this.debugService.enableOrDisableBreakpoints(!data.context.enabled, data.context);
@@ -431,7 +443,7 @@ class FunctionBreakpointsRenderer implements IRenderer<FunctionBreakpoint, IBase
 	renderElement(functionBreakpoint: FunctionBreakpoint, index: number, data: IBaseBreakpointWithIconTemplateData): void {
 		data.context = functionBreakpoint;
 		data.name.textContent = functionBreakpoint.name;
-		const { className, message } = getBreakpointMessageAndClassName(this.debugService, this.textFileService, functionBreakpoint);
+		const { className, message } = getBreakpointMessageAndClassName(this.debugService, functionBreakpoint);
 		data.icon.className = className + ' icon';
 		data.icon.title = message ? message : '';
 		data.checkbox.checked = functionBreakpoint.enabled;
@@ -439,12 +451,16 @@ class FunctionBreakpointsRenderer implements IRenderer<FunctionBreakpoint, IBase
 
 		// Mark function breakpoints as disabled if deactivated or if debug type does not support them #9099
 		const session = this.debugService.getViewModel().focusedSession;
-		dom.toggleClass(data.breakpoint, 'disalbed', (session && !session.raw.capabilities.supportsFunctionBreakpoints) || !this.debugService.getModel().areBreakpointsActivated());
-		if (session && !session.raw.capabilities.supportsFunctionBreakpoints) {
+		dom.toggleClass(data.breakpoint, 'disabled', (session && !session.capabilities.supportsFunctionBreakpoints) || !this.debugService.getModel().areBreakpointsActivated());
+		if (session && !session.capabilities.supportsFunctionBreakpoints) {
 			data.breakpoint.title = nls.localize('functionBreakpointsNotSupported', "Function breakpoints are not supported by this debug type");
 		}
 	}
 
+	disposeElement(): void {
+		// noop
+	}
+
 	disposeTemplate(templateData: IBaseBreakpointWithIconTemplateData): void {
 		dispose(templateData.toDispose);
 	}
@@ -481,9 +497,9 @@ class FunctionBreakpointInputRenderer implements IRenderer<IFunctionBreakpoint,
 				template.reactedOnEvent = true;
 				this.debugService.getViewModel().setSelectedFunctionBreakpoint(undefined);
 				if (inputBox.value && (renamed || template.breakpoint.name)) {
-					this.debugService.renameFunctionBreakpoint(template.breakpoint.getId(), renamed ? inputBox.value : template.breakpoint.name).done(null, onUnexpectedError);
+					this.debugService.renameFunctionBreakpoint(template.breakpoint.getId(), renamed ? inputBox.value : template.breakpoint.name);
 				} else {
-					this.debugService.removeFunctionBreakpoints(template.breakpoint.getId()).done(null, onUnexpectedError);
+					this.debugService.removeFunctionBreakpoints(template.breakpoint.getId());
 				}
 			}
 		};
@@ -498,9 +514,12 @@ class FunctionBreakpointInputRenderer implements IRenderer<IFunctionBreakpoint,
 			}
 		}));
 		toDispose.push(dom.addDisposableListener(inputBox.inputElement, 'blur', () => {
-			if (!template.breakpoint.name) {
-				wrapUp(true);
-			}
+			// Need to react with a timeout on the blur event due to possible concurent splices #56443
+			setTimeout(() => {
+				if (!template.breakpoint.name) {
+					wrapUp(true);
+				}
+			});
 		}));
 
 		template.inputBox = inputBox;
@@ -516,6 +535,10 @@ class FunctionBreakpointInputRenderer implements IRenderer<IFunctionBreakpoint,
 		data.inputBox.select();
 	}
 
+	disposeElement(): void {
+		// noop
+	}
+
 	disposeTemplate(templateData: IInputTemplateData): void {
 		dispose(templateData.toDispose);
 	}
@@ -550,7 +573,7 @@ export function openBreakpointSource(breakpoint: IBreakpoint, sideBySide: boolea
 	}, sideBySide ? SIDE_GROUP : ACTIVE_GROUP);
 }
 
-export function getBreakpointMessageAndClassName(debugService: IDebugService, textFileService: ITextFileService, breakpoint: IBreakpoint | FunctionBreakpoint): { message?: string, className: string } {
+export function getBreakpointMessageAndClassName(debugService: IDebugService, breakpoint: IBreakpoint | FunctionBreakpoint): { message?: string, className: string } {
 	const state = debugService.state;
 	const debugActive = state === State.Running || state === State.Stopped;
 
@@ -573,7 +596,7 @@ export function getBreakpointMessageAndClassName(debugService: IDebugService, te
 
 	const session = debugService.getViewModel().focusedSession;
 	if (breakpoint instanceof FunctionBreakpoint) {
-		if (session && !session.raw.capabilities.supportsFunctionBreakpoints) {
+		if (session && !session.capabilities.supportsFunctionBreakpoints) {
 			return {
 				className: 'debug-function-breakpoint-unverified',
 				message: nls.localize('functionBreakpointUnsupported', "Function breakpoints not supported by this debug type"),
@@ -585,51 +608,42 @@ export function getBreakpointMessageAndClassName(debugService: IDebugService, te
 		};
 	}
 
-	if (debugActive && textFileService.isDirty(breakpoint.uri)) {
-		return {
-			className: 'debug-breakpoint-unverified',
-			message: appendMessage(nls.localize('breakpointDirtydHover', "Unverified breakpoint. File is modified, please restart debug session.")),
-		};
-	}
+	if (breakpoint.logMessage || breakpoint.condition || breakpoint.hitCondition) {
+		const messages = [];
+		if (breakpoint.logMessage) {
+			if (session && !session.capabilities.supportsLogPoints) {
+				return {
+					className: 'debug-breakpoint-unsupported',
+					message: nls.localize('logBreakpointUnsupported', "Logpoints not supported by this debug type"),
+				};
+			}
 
-	if (breakpoint.logMessage) {
-		if (session && !session.raw.capabilities.supportsLogPoints) {
-			return {
-				className: 'debug-breakpoint-unsupported',
-				message: nls.localize('logBreakpointUnsupported', "Logpoints not supported by this debug type"),
-			};
+			messages.push(nls.localize('logMessage', "Log Message: {0}", breakpoint.logMessage));
 		}
 
-		return {
-			className: 'debug-breakpoint-log',
-			message: appendMessage(breakpoint.logMessage)
-		};
-	}
-
-	if (breakpoint.condition || breakpoint.hitCondition) {
-		if (session && breakpoint.condition && !session.raw.capabilities.supportsConditionalBreakpoints) {
+		if (session && breakpoint.condition && !session.capabilities.supportsConditionalBreakpoints) {
 			return {
 				className: 'debug-breakpoint-unsupported',
 				message: nls.localize('conditionalBreakpointUnsupported', "Conditional breakpoints not supported by this debug type"),
 			};
 		}
-		if (session && breakpoint.hitCondition && !session.raw.capabilities.supportsHitConditionalBreakpoints) {
+		if (session && breakpoint.hitCondition && !session.capabilities.supportsHitConditionalBreakpoints) {
 			return {
 				className: 'debug-breakpoint-unsupported',
 				message: nls.localize('hitBreakpointUnsupported', "Hit conditional breakpoints not supported by this debug type"),
 			};
 		}
 
-		if (breakpoint.condition && breakpoint.hitCondition) {
-			return {
-				className: 'debug-breakpoint-conditional',
-				message: appendMessage(`Expression: ${breakpoint.condition}\nHitCount: ${breakpoint.hitCondition}`)
-			};
+		if (breakpoint.condition) {
+			messages.push(nls.localize('expression', "Expression: {0}", breakpoint.condition));
+		}
+		if (breakpoint.hitCondition) {
+			messages.push(nls.localize('hitCount', "Hit Count: {0}", breakpoint.hitCondition));
 		}
 
 		return {
-			className: 'debug-breakpoint-conditional',
-			message: appendMessage(breakpoint.condition ? breakpoint.condition : breakpoint.hitCondition)
+			className: breakpoint.logMessage ? 'debug-breakpoint-log' : 'debug-breakpoint-conditional',
+			message: appendMessage(messages.join('\n'))
 		};
 	}
 
diff --git a/src/vs/workbench/parts/debug/browser/debugActionItems.ts b/src/vs/workbench/parts/debug/browser/debugActionItems.ts
index 1f97268895f..005ea7570c9 100644
--- a/src/vs/workbench/parts/debug/browser/debugActionItems.ts
+++ b/src/vs/workbench/parts/debug/browser/debugActionItems.ts
@@ -4,7 +4,6 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as nls from 'vs/nls';
-import * as errors from 'vs/base/common/errors';
 import { IAction, IActionRunner } from 'vs/base/common/actions';
 import { KeyCode } from 'vs/base/common/keyCodes';
 import * as dom from 'vs/base/browser/dom';
@@ -47,7 +46,7 @@ export class StartDebugActionItem implements IActionItem {
 		@IContextViewService contextViewService: IContextViewService,
 	) {
 		this.toDispose = [];
-		this.selectBox = new SelectBox([], -1, contextViewService);
+		this.selectBox = new SelectBox([], -1, contextViewService, null, { ariaLabel: nls.localize('debugLaunchConfigurations', 'Debug Launch Configurations') });
 		this.toDispose.push(this.selectBox);
 		this.toDispose.push(attachSelectBoxStyler(this.selectBox, themeService, {
 			selectBackground: SIDE_BAR_BACKGROUND
@@ -72,11 +71,12 @@ export class StartDebugActionItem implements IActionItem {
 		dom.addClass(container, 'start-debug-action-item');
 		this.start = dom.append(container, $('.icon'));
 		this.start.title = this.action.label;
+		this.start.setAttribute('role', 'button');
 		this.start.tabIndex = 0;
 
 		this.toDispose.push(dom.addDisposableListener(this.start, dom.EventType.CLICK, () => {
 			this.start.blur();
-			this.actionRunner.run(this.action, this.context).done(null, errors.onUnexpectedError);
+			this.actionRunner.run(this.action, this.context);
 		}));
 
 		this.toDispose.push(dom.addDisposableListener(this.start, dom.EventType.MOUSE_DOWN, (e: MouseEvent) => {
@@ -94,7 +94,7 @@ export class StartDebugActionItem implements IActionItem {
 		this.toDispose.push(dom.addDisposableListener(this.start, dom.EventType.KEY_DOWN, (e: KeyboardEvent) => {
 			const event = new StandardKeyboardEvent(e);
 			if (event.equals(KeyCode.Enter)) {
-				this.actionRunner.run(this.action, this.context).done(null, errors.onUnexpectedError);
+				this.actionRunner.run(this.action, this.context);
 			}
 			if (event.equals(KeyCode.RightArrow)) {
 				this.selectBox.focus();
@@ -177,7 +177,7 @@ export class StartDebugActionItem implements IActionItem {
 			const label = inWorkspace ? nls.localize("addConfigTo", "Add Config ({0})...", l.name) : nls.localize('addConfiguration', "Add Configuration...");
 			this.options.push({
 				label, handler: () => {
-					this.commandService.executeCommand('debug.addConfiguration', l.uri.toString()).done(undefined, errors.onUnexpectedError);
+					this.commandService.executeCommand('debug.addConfiguration', l.uri.toString());
 					return false;
 				}
 			});
@@ -194,7 +194,7 @@ export class FocusSessionActionItem extends SelectActionItem {
 		@IThemeService themeService: IThemeService,
 		@IContextViewService contextViewService: IContextViewService
 	) {
-		super(null, action, [], -1, contextViewService);
+		super(null, action, [], -1, contextViewService, { ariaLabel: nls.localize('debugSession', 'Debug Session') });
 
 		this.toDispose.push(attachSelectBoxStyler(this.selectBox, themeService));
 
diff --git a/src/vs/workbench/parts/debug/browser/debugActions.ts b/src/vs/workbench/parts/debug/browser/debugActions.ts
index d1f29cf4eed..bcc80595b08 100644
--- a/src/vs/workbench/parts/debug/browser/debugActions.ts
+++ b/src/vs/workbench/parts/debug/browser/debugActions.ts
@@ -9,11 +9,12 @@ import * as lifecycle from 'vs/base/common/lifecycle';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { ICommandService } from 'vs/platform/commands/common/commands';
+import * as aria from 'vs/base/browser/ui/aria/aria';
 import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
 import { IFileService } from 'vs/platform/files/common/files';
-import { IDebugService, State, ISession, IThread, IEnablement, IBreakpoint, IStackFrame, REPL_ID, SessionState }
+import { IDebugService, State, IDebugSession, IThread, IEnablement, IBreakpoint, IStackFrame, REPL_ID }
 	from 'vs/workbench/parts/debug/common/debug';
-import { Variable, Expression, Thread, Breakpoint, Session } from 'vs/workbench/parts/debug/common/debugModel';
+import { Variable, Expression, Thread, Breakpoint } from 'vs/workbench/parts/debug/common/debugModel';
 import { IPartService } from 'vs/workbench/services/part/common/partService';
 import { IPanelService } from 'vs/workbench/services/panel/common/panelService';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
@@ -25,6 +26,7 @@ import { ITree } from 'vs/base/parts/tree/browser/tree';
 import { first } from 'vs/base/common/arrays';
 import { IHistoryService } from 'vs/workbench/services/history/common/history';
 import { memoize } from 'vs/base/common/decorators';
+import { Schemas } from 'vs/base/common/network';
 
 export abstract class AbstractDebugAction extends Action {
 
@@ -112,7 +114,7 @@ export class ConfigureAction extends AbstractDebugAction {
 			configurationManager.selectConfiguration(configurationManager.getLaunches()[0]);
 		}
 
-		return configurationManager.selectedConfiguration.launch.openConfigFile(sideBySide);
+		return configurationManager.selectedConfiguration.launch.openConfigFile(sideBySide, false);
 	}
 }
 
@@ -136,12 +138,12 @@ export class StartAction extends AbstractDebugAction {
 	public run(): TPromise<any> {
 		const configurationManager = this.debugService.getConfigurationManager();
 		let launch = configurationManager.selectedConfiguration.launch;
-		if (!launch) {
-			const rootUri = this.historyService.getLastActiveWorkspaceRoot();
+		if (!launch || launch.getConfigurationNames().length === 0) {
+			const rootUri = this.historyService.getLastActiveWorkspaceRoot(Schemas.file);
 			launch = configurationManager.getLaunch(rootUri);
 			if (!launch || launch.getConfigurationNames().length === 0) {
 				const launches = configurationManager.getLaunches();
-				launch = first(launches, l => !!l.getConfigurationNames().length, launches.length ? launches[0] : launch);
+				launch = first(launches, l => !!l.getConfigurationNames().length, launch);
 			}
 
 			configurationManager.selectConfiguration(launch);
@@ -224,12 +226,12 @@ export class RestartAction extends AbstractDebugAction {
 		return new StartAction(StartAction.ID, StartAction.LABEL, this.debugService, this.keybindingService, this.contextService, this.historyService);
 	}
 
-	private setLabel(session: ISession): void {
-		this.updateLabel(session && session.state === SessionState.ATTACH ? RestartAction.RECONNECT_LABEL : RestartAction.LABEL);
+	private setLabel(session: IDebugSession): void {
+		this.updateLabel(session && session.configuration.request === 'attach' ? RestartAction.RECONNECT_LABEL : RestartAction.LABEL);
 	}
 
-	public run(session: ISession): TPromise<any> {
-		if (!(session instanceof Session)) {
+	public run(session: IDebugSession): TPromise<any> {
+		if (!session || !session.getId) {
 			session = this.debugService.getViewModel().focusedSession;
 		}
 
@@ -323,8 +325,8 @@ export class StopAction extends AbstractDebugAction {
 		super(id, label, 'debug-action stop', debugService, keybindingService, 80);
 	}
 
-	public run(session: ISession): TPromise<any> {
-		if (!(session instanceof Session)) {
+	public run(session: IDebugSession): TPromise<any> {
+		if (!session || !session.getId) {
 			session = this.debugService.getViewModel().focusedSession;
 		}
 
@@ -587,7 +589,7 @@ export class SetValueAction extends AbstractDebugAction {
 
 	protected isEnabled(state: State): boolean {
 		const session = this.debugService.getViewModel().focusedSession;
-		return super.isEnabled(state) && state === State.Stopped && session && session.raw.capabilities.supportsSetVariable;
+		return super.isEnabled(state) && state === State.Stopped && session && session.capabilities.supportsSetVariable;
 	}
 }
 
@@ -691,6 +693,7 @@ export class ClearReplAction extends AbstractDebugAction {
 
 	public run(): TPromise<any> {
 		this.debugService.removeReplExpressions();
+		aria.status(nls.localize('debugConsoleCleared', "Debug console was cleared"));
 
 		// focus back to repl
 		return this.panelService.openPanel(REPL_ID, true);
@@ -800,7 +803,7 @@ export class StepBackAction extends AbstractDebugAction {
 	protected isEnabled(state: State): boolean {
 		const session = this.debugService.getViewModel().focusedSession;
 		return super.isEnabled(state) && state === State.Stopped &&
-			session && session.raw.capabilities.supportsStepBack;
+			session && session.capabilities.supportsStepBack;
 	}
 }
 
@@ -823,7 +826,7 @@ export class ReverseContinueAction extends AbstractDebugAction {
 	protected isEnabled(state: State): boolean {
 		const session = this.debugService.getViewModel().focusedSession;
 		return super.isEnabled(state) && state === State.Stopped &&
-			session && session.raw.capabilities.supportsStepBack;
+			session && session.capabilities.supportsStepBack;
 	}
 }
 
diff --git a/src/vs/workbench/parts/debug/browser/debugActionsWidget.ts b/src/vs/workbench/parts/debug/browser/debugActionsWidget.ts
index 15a5f4e83a9..1733710138a 100644
--- a/src/vs/workbench/parts/debug/browser/debugActionsWidget.ts
+++ b/src/vs/workbench/parts/debug/browser/debugActionsWidget.ts
@@ -5,9 +5,7 @@
 
 import 'vs/css!./media/debugActionsWidget';
 import * as errors from 'vs/base/common/errors';
-import * as strings from 'vs/base/common/strings';
 import * as browser from 'vs/base/browser/browser';
-import { $, Builder } from 'vs/base/browser/builder';
 import * as dom from 'vs/base/browser/dom';
 import * as arrays from 'vs/base/common/arrays';
 import { StandardMouseEvent } from 'vs/base/browser/mouseEvent';
@@ -31,8 +29,10 @@ import { INotificationService } from 'vs/platform/notification/common/notificati
 import { RunOnceScheduler } from 'vs/base/common/async';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IDisposable } from 'vs/base/common/lifecycle';
+import { isExtensionHostDebugging } from 'vs/workbench/parts/debug/common/debugUtils';
 
 const DEBUG_ACTIONS_WIDGET_POSITION_KEY = 'debug.actionswidgetposition';
+const DEBUG_ACTIONS_WIDGET_Y_KEY = 'debug.actionswidgety';
 
 export const debugToolBarBackground = registerColor('debugToolBar.background', {
 	dark: '#333333',
@@ -47,8 +47,8 @@ export const debugToolBarBorder = registerColor('debugToolBar.border', {
 
 export class DebugActionsWidget extends Themable implements IWorkbenchContribution {
 
-	private $el: Builder;
-	private dragArea: Builder;
+	private $el: HTMLElement;
+	private dragArea: HTMLElement;
 	private actionBar: ActionBar;
 	private allActions: AbstractDebugAction[] = [];
 	private activeActions: AbstractDebugAction[];
@@ -71,15 +71,15 @@ export class DebugActionsWidget extends Themable implements IWorkbenchContributi
 	) {
 		super(themeService);
 
-		this.$el = $().div().addClass('debug-actions-widget').style('top', `${partService.getTitleBarOffset()}px`);
-		this.dragArea = $().div().addClass('drag-area');
-		this.$el.append(this.dragArea);
+		this.$el = dom.$('div.debug-actions-widget');
+		this.$el.style.top = `${partService.getTitleBarOffset()}px`;
 
-		const actionBarContainter = $().div().addClass('.action-bar-container');
-		this.$el.append(actionBarContainter);
+		this.dragArea = dom.append(this.$el, dom.$('div.drag-area'));
+
+		const actionBarContainer = dom.append(this.$el, dom.$('div.action-bar-container'));
 
 		this.activeActions = [];
-		this.actionBar = new ActionBar(actionBarContainter.getHTMLElement(), {
+		this.actionBar = this._register(new ActionBar(actionBarContainer, {
 			orientation: ActionsOrientation.HORIZONTAL,
 			actionItemProvider: (action: IAction) => {
 				if (action.id === FocusSessionAction.ID) {
@@ -88,28 +88,26 @@ export class DebugActionsWidget extends Themable implements IWorkbenchContributi
 
 				return null;
 			}
-		});
+		}));
 
-		this.updateScheduler = new RunOnceScheduler(() => {
+		this.updateScheduler = this._register(new RunOnceScheduler(() => {
 			const state = this.debugService.state;
 			const toolBarLocation = this.configurationService.getValue<IDebugConfiguration>('debug').toolBarLocation;
-			if (state === State.Inactive || this.configurationService.getValue<IDebugConfiguration>('debug').hideActionBar
-				|| toolBarLocation === 'docked' || toolBarLocation === 'hidden') {
+			if (state === State.Inactive || state === State.Initializing || toolBarLocation === 'docked' || toolBarLocation === 'hidden') {
 				return this.hide();
 			}
 
-			const actions = DebugActionsWidget.getActions(this.allActions, this.toUnbind, this.debugService, this.keybindingService, this.instantiationService);
+			const actions = DebugActionsWidget.getActions(this.allActions, this.toDispose, this.debugService, this.keybindingService, this.instantiationService);
 			if (!arrays.equals(actions, this.activeActions, (first, second) => first.id === second.id)) {
 				this.actionBar.clear();
 				this.actionBar.push(actions, { icon: true, label: false });
 				this.activeActions = actions;
 			}
 			this.show();
-		}, 20);
+		}, 20));
 
 		this.updateStyles();
 
-		this.toUnbind.push(this.actionBar);
 		this.registerListeners();
 
 		this.hide();
@@ -117,10 +115,10 @@ export class DebugActionsWidget extends Themable implements IWorkbenchContributi
 	}
 
 	private registerListeners(): void {
-		this.toUnbind.push(this.debugService.onDidChangeState(() => this.updateScheduler.schedule()));
-		this.toUnbind.push(this.debugService.getViewModel().onDidFocusSession(() => this.updateScheduler.schedule()));
-		this.toUnbind.push(this.configurationService.onDidChangeConfiguration(e => this.onDidConfigurationChange(e)));
-		this.toUnbind.push(this.actionBar.actionRunner.onDidRun((e: IRunEvent) => {
+		this._register(this.debugService.onDidChangeState(() => this.updateScheduler.schedule()));
+		this._register(this.debugService.getViewModel().onDidFocusSession(() => this.updateScheduler.schedule()));
+		this._register(this.configurationService.onDidChangeConfiguration(e => this.onDidConfigurationChange(e)));
+		this._register(this.actionBar.actionRunner.onDidRun((e: IRunEvent) => {
 			// check for error
 			if (e.error && !errors.isPromiseCanceledError(e.error)) {
 				this.notificationService.error(e.error);
@@ -137,85 +135,95 @@ export class DebugActionsWidget extends Themable implements IWorkbenchContributi
 				this.telemetryService.publicLog('workbenchActionExecuted', { id: e.action.id, from: 'debugActionsWidget' });
 			}
 		}));
-		$(window).on(dom.EventType.RESIZE, () => this.setXCoordinate(), this.toUnbind);
+		this._register(dom.addDisposableListener(window, dom.EventType.RESIZE, () => this.setCoordinates()));
 
-		this.dragArea.on(dom.EventType.MOUSE_UP, (event: MouseEvent) => {
+		this._register(dom.addDisposableListener(this.dragArea, dom.EventType.MOUSE_UP, (event: MouseEvent) => {
 			const mouseClickEvent = new StandardMouseEvent(event);
 			if (mouseClickEvent.detail === 2) {
 				// double click on debug bar centers it again #8250
-				const widgetWidth = this.$el.getHTMLElement().clientWidth;
-				this.setXCoordinate(0.5 * window.innerWidth - 0.5 * widgetWidth);
+				const widgetWidth = this.$el.clientWidth;
+				this.setCoordinates(0.5 * window.innerWidth - 0.5 * widgetWidth, 0);
 				this.storePosition();
 			}
-		});
+		}));
 
-		this.dragArea.on(dom.EventType.MOUSE_DOWN, (event: MouseEvent) => {
-			const $window = $(window);
-			this.dragArea.addClass('dragged');
+		this._register(dom.addDisposableListener(this.dragArea, dom.EventType.MOUSE_DOWN, (event: MouseEvent) => {
+			dom.addClass(this.dragArea, 'dragged');
 
-			$window.on('mousemove', (e: MouseEvent) => {
+			const mouseMoveListener = dom.addDisposableListener(window, 'mousemove', (e: MouseEvent) => {
 				const mouseMoveEvent = new StandardMouseEvent(e);
 				// Prevent default to stop editor selecting text #8524
 				mouseMoveEvent.preventDefault();
 				// Reduce x by width of drag handle to reduce jarring #16604
-				this.setXCoordinate(mouseMoveEvent.posx - 14);
-			}).once('mouseup', (e: MouseEvent) => {
-				this.storePosition();
-				this.dragArea.removeClass('dragged');
-				$window.off('mousemove');
+				this.setCoordinates(mouseMoveEvent.posx - 14, mouseMoveEvent.posy - this.partService.getTitleBarOffset());
 			});
-		});
 
-		this.toUnbind.push(this.partService.onTitleBarVisibilityChange(() => this.positionDebugWidget()));
-		this.toUnbind.push(browser.onDidChangeZoomLevel(() => this.positionDebugWidget()));
+			const mouseUpListener = dom.addDisposableListener(window, 'mouseup', (e: MouseEvent) => {
+				this.storePosition();
+				dom.removeClass(this.dragArea, 'dragged');
+
+				mouseMoveListener.dispose();
+				mouseUpListener.dispose();
+			});
+		}));
+
+		this._register(this.partService.onTitleBarVisibilityChange(() => this.setYCoordinate()));
+		this._register(browser.onDidChangeZoomLevel(() => this.setYCoordinate()));
 	}
 
 	private storePosition(): void {
-		const position = parseFloat(this.$el.getComputedStyle().left) / window.innerWidth;
-		this.storageService.store(DEBUG_ACTIONS_WIDGET_POSITION_KEY, position, StorageScope.WORKSPACE);
+		const position = parseFloat(dom.getComputedStyle(this.$el).left) / window.innerWidth;
+		this.storageService.store(DEBUG_ACTIONS_WIDGET_POSITION_KEY, position, StorageScope.GLOBAL);
 	}
 
 	protected updateStyles(): void {
 		super.updateStyles();
 
 		if (this.$el) {
-			this.$el.style('background-color', this.getColor(debugToolBarBackground));
+			this.$el.style.backgroundColor = this.getColor(debugToolBarBackground);
 
 			const widgetShadowColor = this.getColor(widgetShadow);
-			this.$el.style('box-shadow', widgetShadowColor ? `0 5px 8px ${widgetShadowColor}` : null);
+			this.$el.style.boxShadow = widgetShadowColor ? `0 5px 8px ${widgetShadowColor}` : null;
 
 			const contrastBorderColor = this.getColor(contrastBorder);
 			const borderColor = this.getColor(debugToolBarBorder);
 
 			if (contrastBorderColor) {
-				this.$el.style('border', `1px solid ${contrastBorderColor}`);
+				this.$el.style.border = `1px solid ${contrastBorderColor}`;
 			} else {
-				this.$el.style({
-					'border': borderColor ? `solid ${borderColor}` : 'none',
-					'border-width': '1px 0'
-				});
+				this.$el.style.border = borderColor ? `solid ${borderColor}` : 'none';
+				this.$el.style.border = '1px 0';
 			}
 		}
 	}
 
-	private positionDebugWidget(): void {
+	private setYCoordinate(y = 0): void {
 		const titlebarOffset = this.partService.getTitleBarOffset();
-
-		$(this.$el).style('top', `${titlebarOffset}px`);
+		this.$el.style.top = `${titlebarOffset + y}px`;
 	}
 
-	private setXCoordinate(x?: number): void {
+	private setCoordinates(x?: number, y?: number): void {
 		if (!this.isVisible) {
 			return;
 		}
-		const widgetWidth = this.$el.getHTMLElement().clientWidth;
+		const widgetWidth = this.$el.clientWidth;
 		if (x === undefined) {
-			const positionPercentage = this.storageService.get(DEBUG_ACTIONS_WIDGET_POSITION_KEY, StorageScope.WORKSPACE);
+			const positionPercentage = this.storageService.get(DEBUG_ACTIONS_WIDGET_POSITION_KEY, StorageScope.GLOBAL);
 			x = positionPercentage !== undefined ? parseFloat(positionPercentage) * window.innerWidth : (0.5 * window.innerWidth - 0.5 * widgetWidth);
 		}
 
 		x = Math.max(0, Math.min(x, window.innerWidth - widgetWidth)); // do not allow the widget to overflow on the right
-		this.$el.style('left', `${x}px`);
+		this.$el.style.left = `${x}px`;
+
+		if (y === undefined) {
+			y = this.storageService.getInteger(DEBUG_ACTIONS_WIDGET_Y_KEY, StorageScope.GLOBAL, 0);
+		}
+		const titleAreaHeight = 35;
+		if ((y < titleAreaHeight / 2) || (y > titleAreaHeight + titleAreaHeight / 2)) {
+			const moveToTop = y < titleAreaHeight;
+			this.setYCoordinate(moveToTop ? 0 : titleAreaHeight);
+			this.storageService.store(DEBUG_ACTIONS_WIDGET_Y_KEY, moveToTop ? 0 : 2 * titleAreaHeight, StorageScope.GLOBAL);
+		}
 	}
 
 	private onDidConfigurationChange(event: IConfigurationChangeEvent): void {
@@ -226,24 +234,25 @@ export class DebugActionsWidget extends Themable implements IWorkbenchContributi
 
 	private show(): void {
 		if (this.isVisible) {
+			this.setCoordinates();
 			return;
 		}
 		if (!this.isBuilt) {
 			this.isBuilt = true;
-			this.$el.build(document.getElementById(this.partService.getWorkbenchElementId()));
+			this.partService.getWorkbenchElement().appendChild(this.$el);
 		}
 
 		this.isVisible = true;
-		this.$el.show();
-		this.setXCoordinate();
+		dom.show(this.$el);
+		this.setCoordinates();
 	}
 
 	private hide(): void {
 		this.isVisible = false;
-		this.$el.hide();
+		dom.hide(this.$el);
 	}
 
-	public static getActions(allActions: AbstractDebugAction[], toUnbind: IDisposable[], debugService: IDebugService, keybindingService: IKeybindingService, instantiationService: IInstantiationService): AbstractDebugAction[] {
+	public static getActions(allActions: AbstractDebugAction[], toDispose: IDisposable[], debugService: IDebugService, keybindingService: IKeybindingService, instantiationService: IInstantiationService): AbstractDebugAction[] {
 		if (allActions.length === 0) {
 			allActions.push(new ContinueAction(ContinueAction.ID, ContinueAction.LABEL, debugService, keybindingService));
 			allActions.push(new PauseAction(PauseAction.ID, PauseAction.LABEL, debugService, keybindingService));
@@ -256,14 +265,12 @@ export class DebugActionsWidget extends Themable implements IWorkbenchContributi
 			allActions.push(new StepBackAction(StepBackAction.ID, StepBackAction.LABEL, debugService, keybindingService));
 			allActions.push(new ReverseContinueAction(ReverseContinueAction.ID, ReverseContinueAction.LABEL, debugService, keybindingService));
 			allActions.push(instantiationService.createInstance(FocusSessionAction, FocusSessionAction.ID, FocusSessionAction.LABEL));
-			allActions.forEach(a => {
-				toUnbind.push(a);
-			});
+			allActions.forEach(a => toDispose.push(a));
 		}
 
 		const state = debugService.state;
 		const session = debugService.getViewModel().focusedSession;
-		const attached = session && session.configuration.request === 'attach' && session.configuration.type && !strings.equalsIgnoreCase(session.configuration.type, 'extensionHost');
+		const attached = session && session.configuration.request === 'attach' && !isExtensionHostDebugging(session.configuration);
 
 		return allActions.filter(a => {
 			if (a.id === ContinueAction.ID) {
@@ -273,10 +280,10 @@ export class DebugActionsWidget extends Themable implements IWorkbenchContributi
 				return state === State.Running;
 			}
 			if (a.id === StepBackAction.ID) {
-				return session && session.raw.capabilities.supportsStepBack;
+				return session && session.capabilities.supportsStepBack;
 			}
 			if (a.id === ReverseContinueAction.ID) {
-				return session && session.raw.capabilities.supportsStepBack;
+				return session && session.capabilities.supportsStepBack;
 			}
 			if (a.id === DisconnectAction.ID) {
 				return attached;
@@ -296,7 +303,7 @@ export class DebugActionsWidget extends Themable implements IWorkbenchContributi
 		super.dispose();
 
 		if (this.$el) {
-			this.$el.destroy();
+			this.$el.remove();
 			delete this.$el;
 		}
 	}
diff --git a/src/vs/workbench/parts/debug/browser/debugCommands.ts b/src/vs/workbench/parts/debug/browser/debugCommands.ts
index 8a36c1e3150..c9c77ba7795 100644
--- a/src/vs/workbench/parts/debug/browser/debugCommands.ts
+++ b/src/vs/workbench/parts/debug/browser/debugCommands.ts
@@ -7,11 +7,10 @@ import * as nls from 'vs/nls';
 import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { List } from 'vs/base/browser/ui/list/listWidget';
-import * as errors from 'vs/base/common/errors';
-import { KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRegistry';
+import { KeybindingsRegistry, KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
 import { IListService } from 'vs/platform/list/browser/listService';
 import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
-import { IDebugService, IEnablement, CONTEXT_BREAKPOINTS_FOCUSED, CONTEXT_WATCH_EXPRESSIONS_FOCUSED, CONTEXT_VARIABLES_FOCUSED, EDITOR_CONTRIBUTION_ID, IDebugEditorContribution, CONTEXT_IN_DEBUG_MODE, CONTEXT_NOT_IN_DEBUG_REPL, CONTEXT_EXPRESSION_SELECTED, CONTEXT_BREAKPOINT_SELECTED } from 'vs/workbench/parts/debug/common/debug';
+import { IDebugService, IEnablement, CONTEXT_BREAKPOINTS_FOCUSED, CONTEXT_WATCH_EXPRESSIONS_FOCUSED, CONTEXT_VARIABLES_FOCUSED, EDITOR_CONTRIBUTION_ID, IDebugEditorContribution, CONTEXT_IN_DEBUG_MODE, CONTEXT_EXPRESSION_SELECTED, CONTEXT_BREAKPOINT_SELECTED } from 'vs/workbench/parts/debug/common/debug';
 import { Expression, Variable, Breakpoint, FunctionBreakpoint } from 'vs/workbench/parts/debug/common/debugModel';
 import { IExtensionsViewlet, VIEWLET_ID as EXTENSIONS_VIEWLET_ID } from 'vs/workbench/parts/extensions/common/extensions';
 import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet';
@@ -23,14 +22,16 @@ import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
 import { openBreakpointSource } from 'vs/workbench/parts/debug/browser/breakpointsView';
 import { INotificationService } from 'vs/platform/notification/common/notification';
 import { InputFocusedContext } from 'vs/platform/workbench/common/contextkeys';
-import { CommandsRegistry } from 'vs/platform/commands/common/commands';
 import { ServicesAccessor } from 'vs/editor/browser/editorExtensions';
 
+export const ADD_CONFIGURATION_ID = 'debug.addConfiguration';
+export const TOGGLE_INLINE_BREAKPOINT_ID = 'editor.debug.action.toggleInlineBreakpoint';
+
 export function registerCommands(): void {
 
 	KeybindingsRegistry.registerCommandAndKeybindingRule({
 		id: 'debug.toggleBreakpoint',
-		weight: KeybindingsRegistry.WEIGHT.workbenchContrib(5),
+		weight: KeybindingWeight.WorkbenchContrib + 5,
 		when: ContextKeyExpr.and(CONTEXT_BREAKPOINTS_FOCUSED, InputFocusedContext.toNegated()),
 		primary: KeyCode.Space,
 		handler: (accessor) => {
@@ -40,7 +41,7 @@ export function registerCommands(): void {
 			if (list instanceof List) {
 				const focused = <IEnablement[]>list.getFocusedElements();
 				if (focused && focused.length) {
-					debugService.enableOrDisableBreakpoints(!focused[0].enabled, focused[0]).done(null, errors.onUnexpectedError);
+					debugService.enableOrDisableBreakpoints(!focused[0].enabled, focused[0]);
 				}
 			}
 		}
@@ -48,7 +49,7 @@ export function registerCommands(): void {
 
 	KeybindingsRegistry.registerCommandAndKeybindingRule({
 		id: 'debug.enableOrDisableBreakpoint',
-		weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
+		weight: KeybindingWeight.WorkbenchContrib,
 		primary: undefined,
 		when: EditorContextKeys.editorTextFocus,
 		handler: (accessor) => {
@@ -61,7 +62,7 @@ export function registerCommands(): void {
 					const position = widget.getPosition();
 					const bps = debugService.getModel().getBreakpoints({ uri: model.uri, lineNumber: position.lineNumber });
 					if (bps.length) {
-						debugService.enableOrDisableBreakpoints(!bps[0].enabled, bps[0]).done(null, errors.onUnexpectedError);
+						debugService.enableOrDisableBreakpoints(!bps[0].enabled, bps[0]);
 					}
 				}
 			}
@@ -70,7 +71,7 @@ export function registerCommands(): void {
 
 	KeybindingsRegistry.registerCommandAndKeybindingRule({
 		id: 'debug.renameWatchExpression',
-		weight: KeybindingsRegistry.WEIGHT.workbenchContrib(5),
+		weight: KeybindingWeight.WorkbenchContrib + 5,
 		when: CONTEXT_WATCH_EXPRESSIONS_FOCUSED,
 		primary: KeyCode.F2,
 		mac: { primary: KeyCode.Enter },
@@ -91,7 +92,7 @@ export function registerCommands(): void {
 
 	KeybindingsRegistry.registerCommandAndKeybindingRule({
 		id: 'debug.setVariable',
-		weight: KeybindingsRegistry.WEIGHT.workbenchContrib(5),
+		weight: KeybindingWeight.WorkbenchContrib + 5,
 		when: CONTEXT_VARIABLES_FOCUSED,
 		primary: KeyCode.F2,
 		mac: { primary: KeyCode.Enter },
@@ -112,7 +113,7 @@ export function registerCommands(): void {
 
 	KeybindingsRegistry.registerCommandAndKeybindingRule({
 		id: 'debug.removeWatchExpression',
-		weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
+		weight: KeybindingWeight.WorkbenchContrib,
 		when: ContextKeyExpr.and(CONTEXT_WATCH_EXPRESSIONS_FOCUSED, CONTEXT_EXPRESSION_SELECTED.toNegated()),
 		primary: KeyCode.Delete,
 		mac: { primary: KeyMod.CtrlCmd | KeyCode.Backspace },
@@ -133,7 +134,7 @@ export function registerCommands(): void {
 
 	KeybindingsRegistry.registerCommandAndKeybindingRule({
 		id: 'debug.removeBreakpoint',
-		weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
+		weight: KeybindingWeight.WorkbenchContrib,
 		when: ContextKeyExpr.and(CONTEXT_BREAKPOINTS_FOCUSED, CONTEXT_BREAKPOINT_SELECTED.toNegated()),
 		primary: KeyCode.Delete,
 		mac: { primary: KeyMod.CtrlCmd | KeyCode.Backspace },
@@ -147,9 +148,9 @@ export function registerCommands(): void {
 				const focused = list.getFocusedElements();
 				const element = focused.length ? focused[0] : undefined;
 				if (element instanceof Breakpoint) {
-					debugService.removeBreakpoints(element.getId()).done(null, errors.onUnexpectedError);
+					debugService.removeBreakpoints(element.getId());
 				} else if (element instanceof FunctionBreakpoint) {
-					debugService.removeFunctionBreakpoints(element.getId()).done(null, errors.onUnexpectedError);
+					debugService.removeFunctionBreakpoints(element.getId());
 				}
 			}
 		}
@@ -157,7 +158,7 @@ export function registerCommands(): void {
 
 	KeybindingsRegistry.registerCommandAndKeybindingRule({
 		id: 'debug.installAdditionalDebuggers',
-		weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
+		weight: KeybindingWeight.WorkbenchContrib,
 		when: undefined,
 		primary: undefined,
 		handler: (accessor) => {
@@ -172,8 +173,8 @@ export function registerCommands(): void {
 	});
 
 	KeybindingsRegistry.registerCommandAndKeybindingRule({
-		id: 'debug.addConfiguration',
-		weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
+		id: ADD_CONFIGURATION_ID,
+		weight: KeybindingWeight.WorkbenchContrib,
 		when: undefined,
 		primary: undefined,
 		handler: (accessor, launchUri: string) => {
@@ -184,7 +185,7 @@ export function registerCommands(): void {
 			}
 			const launch = manager.getLaunches().filter(l => l.uri.toString() === launchUri).pop() || manager.selectedConfiguration.launch;
 
-			return launch.openConfigFile(false).done(({ editor, created }) => {
+			return launch.openConfigFile(false, false).then(({ editor, created }) => {
 				if (editor && !created) {
 					const codeEditor = <ICodeEditor>editor.getControl();
 					if (codeEditor) {
@@ -197,7 +198,6 @@ export function registerCommands(): void {
 		}
 	});
 
-	const INLINE_BREAKPOINT_COMMAND_ID = 'editor.debug.action.toggleInlineBreakpoint';
 	const inlineBreakpointHandler = (accessor: ServicesAccessor) => {
 		const debugService = accessor.get(IDebugService);
 		const editorService = accessor.get(IEditorService);
@@ -219,37 +219,33 @@ export function registerCommands(): void {
 		return TPromise.as(null);
 	};
 	KeybindingsRegistry.registerCommandAndKeybindingRule({
-		weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
+		weight: KeybindingWeight.WorkbenchContrib,
 		primary: KeyMod.Shift | KeyCode.F9,
 		when: EditorContextKeys.editorTextFocus,
-		id: INLINE_BREAKPOINT_COMMAND_ID,
-		handler: inlineBreakpointHandler
-	});
-	CommandsRegistry.registerCommand({
-		id: 'editor.debug.action.toggleColumnBreakpoint',
+		id: TOGGLE_INLINE_BREAKPOINT_ID,
 		handler: inlineBreakpointHandler
 	});
 
 	MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
 		command: {
-			id: INLINE_BREAKPOINT_COMMAND_ID,
+			id: TOGGLE_INLINE_BREAKPOINT_ID,
 			title: nls.localize('inlineBreakpoint', "Inline Breakpoint"),
 			category: nls.localize('debug', "Debug")
 		}
 	});
 	MenuRegistry.appendMenuItem(MenuId.EditorContext, {
 		command: {
-			id: INLINE_BREAKPOINT_COMMAND_ID,
+			id: TOGGLE_INLINE_BREAKPOINT_ID,
 			title: nls.localize('addInlineBreakpoint', "Add Inline Breakpoint")
 		},
-		when: ContextKeyExpr.and(CONTEXT_IN_DEBUG_MODE, CONTEXT_NOT_IN_DEBUG_REPL, EditorContextKeys.writable),
+		when: ContextKeyExpr.and(CONTEXT_IN_DEBUG_MODE, EditorContextKeys.writable, EditorContextKeys.editorTextFocus),
 		group: 'debug',
 		order: 1
 	});
 
 	KeybindingsRegistry.registerCommandAndKeybindingRule({
 		id: 'debug.openBreakpointToSide',
-		weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
+		weight: KeybindingWeight.WorkbenchContrib,
 		when: CONTEXT_BREAKPOINTS_FOCUSED,
 		primary: KeyMod.CtrlCmd | KeyCode.Enter,
 		secondary: [KeyMod.Alt | KeyCode.Enter],
diff --git a/src/vs/workbench/parts/debug/browser/debugContentProvider.ts b/src/vs/workbench/parts/debug/browser/debugContentProvider.ts
index f7370887789..ba1059a13ca 100644
--- a/src/vs/workbench/parts/debug/browser/debugContentProvider.ts
+++ b/src/vs/workbench/parts/debug/browser/debugContentProvider.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import uri from 'vs/base/common/uri';
+import { URI as uri } from 'vs/base/common/uri';
 import { localize } from 'vs/nls';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { guessMimeTypes, MIME_TEXT } from 'vs/base/common/mime';
@@ -12,7 +12,7 @@ import { IModelService } from 'vs/editor/common/services/modelService';
 import { IModeService } from 'vs/editor/common/services/modeService';
 import { ITextModelService, ITextModelContentProvider } from 'vs/editor/common/services/resolverService';
 import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
-import { DEBUG_SCHEME, IDebugService, ISession } from 'vs/workbench/parts/debug/common/debug';
+import { DEBUG_SCHEME, IDebugService, IDebugSession } from 'vs/workbench/parts/debug/common/debug';
 import { Source } from 'vs/workbench/parts/debug/common/debugSource';
 
 /**
@@ -41,13 +41,11 @@ export class DebugContentProvider implements IWorkbenchContribution, ITextModelC
 
 	public provideTextContent(resource: uri): TPromise<ITextModel> {
 
-		let session: ISession;
-		let sourceRef: number;
+		let session: IDebugSession;
 
 		if (resource.query) {
 			const data = Source.getEncodedDebugData(resource);
 			session = this.debugService.getModel().getSessions().filter(p => p.getId() === data.sessionId).pop();
-			sourceRef = data.sourceReference;
 		}
 
 		if (!session) {
@@ -58,39 +56,21 @@ export class DebugContentProvider implements IWorkbenchContribution, ITextModelC
 		if (!session) {
 			return TPromise.wrapError<ITextModel>(new Error(localize('unable', "Unable to resolve the resource without a debug session")));
 		}
-		const source = session.getSourceForUri(resource);
-		let rawSource: DebugProtocol.Source;
-		if (source) {
-			rawSource = source.raw;
-			if (!sourceRef) {
-				sourceRef = source.reference;
-			}
-		} else {
-			// create a Source
-			rawSource = {
-				path: resource.with({ scheme: '', query: '' }).toString(true),	// Remove debug: scheme
-				sourceReference: sourceRef
-			};
-		}
-
 		const createErrModel = (message: string) => {
 			this.debugService.sourceIsNotAvailable(resource);
 			const modePromise = this.modeService.getOrCreateMode(MIME_TEXT);
-			const model = this.modelService.createModel(message, modePromise, resource);
-
-			return model;
+			return this.modelService.createModel(message, modePromise, resource);
 		};
 
-		return session.raw.source({ sourceReference: sourceRef, source: rawSource }).then(response => {
+		return session.loadSource(resource).then(response => {
 			if (!response) {
 				return createErrModel(localize('canNotResolveSource', "Could not resolve resource {0}, no response from debug extension.", resource.toString()));
 			}
 
 			const mime = response.body.mimeType || guessMimeTypes(resource.path)[0];
 			const modePromise = this.modeService.getOrCreateMode(mime);
-			const model = this.modelService.createModel(response.body.content, modePromise, resource);
+			return this.modelService.createModel(response.body.content, modePromise, resource);
 
-			return model;
 		}, (err: DebugProtocol.ErrorResponse) => createErrModel(err.message));
 	}
 }
diff --git a/src/vs/workbench/parts/debug/browser/debugEditorActions.ts b/src/vs/workbench/parts/debug/browser/debugEditorActions.ts
index 4c871d8342b..3d00826481d 100644
--- a/src/vs/workbench/parts/debug/browser/debugEditorActions.ts
+++ b/src/vs/workbench/parts/debug/browser/debugEditorActions.ts
@@ -10,23 +10,26 @@ import { Range } from 'vs/editor/common/core/range';
 import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
 import { ServicesAccessor, registerEditorAction, EditorAction, IActionOptions } from 'vs/editor/browser/editorExtensions';
 import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { IDebugService, CONTEXT_IN_DEBUG_MODE, CONTEXT_NOT_IN_DEBUG_REPL, CONTEXT_DEBUG_STATE, State, REPL_ID, VIEWLET_ID, IDebugEditorContribution, EDITOR_CONTRIBUTION_ID, BreakpointWidgetContext, IBreakpoint } from 'vs/workbench/parts/debug/common/debug';
+import { IDebugService, CONTEXT_IN_DEBUG_MODE, CONTEXT_DEBUG_STATE, State, REPL_ID, VIEWLET_ID, IDebugEditorContribution, EDITOR_CONTRIBUTION_ID, BreakpointWidgetContext, IBreakpoint } from 'vs/workbench/parts/debug/common/debug';
 import { IPanelService } from 'vs/workbench/services/panel/common/panelService';
 import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { openBreakpointSource } from 'vs/workbench/parts/debug/browser/breakpointsView';
+import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
 
+export const TOGGLE_BREAKPOINT_ID = 'editor.debug.action.toggleBreakpoint';
 class ToggleBreakpointAction extends EditorAction {
 	constructor() {
 		super({
-			id: 'editor.debug.action.toggleBreakpoint',
+			id: TOGGLE_BREAKPOINT_ID,
 			label: nls.localize('toggleBreakpointAction', "Debug: Toggle Breakpoint"),
 			alias: 'Debug: Toggle Breakpoint',
 			precondition: null,
 			kbOpts: {
 				kbExpr: EditorContextKeys.editorTextFocus,
-				primary: KeyCode.F9
+				primary: KeyCode.F9,
+				weight: KeybindingWeight.EditorContrib
 			}
 		});
 	}
@@ -49,11 +52,12 @@ class ToggleBreakpointAction extends EditorAction {
 	}
 }
 
+export const TOGGLE_CONDITIONAL_BREAKPOINT_ID = 'editor.debug.action.conditionalBreakpoint';
 class ConditionalBreakpointAction extends EditorAction {
 
 	constructor() {
 		super({
-			id: 'editor.debug.action.conditionalBreakpoint',
+			id: TOGGLE_CONDITIONAL_BREAKPOINT_ID,
 			label: nls.localize('conditionalBreakpointEditorAction', "Debug: Add Conditional Breakpoint..."),
 			alias: 'Debug: Add Conditional Breakpoint...',
 			precondition: null
@@ -70,11 +74,12 @@ class ConditionalBreakpointAction extends EditorAction {
 	}
 }
 
+export const TOGGLE_LOG_POINT_ID = 'editor.debug.action.toggleLogPoint';
 class LogPointAction extends EditorAction {
 
 	constructor() {
 		super({
-			id: 'editor.debug.action.toggleLogPoint',
+			id: TOGGLE_LOG_POINT_ID,
 			label: nls.localize('logPointEditorAction', "Debug: Add Logpoint..."),
 			alias: 'Debug: Add Logpoint...',
 			precondition: null
@@ -98,7 +103,7 @@ class RunToCursorAction extends EditorAction {
 			id: 'editor.debug.action.runToCursor',
 			label: nls.localize('runToCursor', "Run to Cursor"),
 			alias: 'Debug: Run to Cursor',
-			precondition: ContextKeyExpr.and(CONTEXT_IN_DEBUG_MODE, CONTEXT_NOT_IN_DEBUG_REPL, EditorContextKeys.writable, CONTEXT_DEBUG_STATE.isEqualTo('stopped')),
+			precondition: ContextKeyExpr.and(CONTEXT_IN_DEBUG_MODE, EditorContextKeys.writable, CONTEXT_DEBUG_STATE.isEqualTo('stopped'), EditorContextKeys.editorTextFocus),
 			menuOpts: {
 				group: 'debug',
 				order: 2
@@ -113,7 +118,7 @@ class RunToCursorAction extends EditorAction {
 		}
 
 		let breakpointToRemove: IBreakpoint;
-		const oneTimeListener = debugService.getViewModel().focusedSession.raw.onDidEvent(event => {
+		const oneTimeListener = debugService.getViewModel().focusedSession.onDidCustomEvent(event => {
 			if (event.event === 'stopped' || event.event === 'exit') {
 				if (breakpointToRemove) {
 					debugService.removeBreakpoints(breakpointToRemove.getId());
@@ -141,7 +146,7 @@ class SelectionToReplAction extends EditorAction {
 			id: 'editor.debug.action.selectionToRepl',
 			label: nls.localize('debugEvaluate', "Debug: Evaluate"),
 			alias: 'Debug: Evaluate',
-			precondition: ContextKeyExpr.and(EditorContextKeys.hasNonEmptySelection, CONTEXT_IN_DEBUG_MODE, CONTEXT_NOT_IN_DEBUG_REPL),
+			precondition: ContextKeyExpr.and(EditorContextKeys.hasNonEmptySelection, CONTEXT_IN_DEBUG_MODE, EditorContextKeys.editorTextFocus),
 			menuOpts: {
 				group: 'debug',
 				order: 0
@@ -167,7 +172,7 @@ class SelectionToWatchExpressionsAction extends EditorAction {
 			id: 'editor.debug.action.selectionToWatch',
 			label: nls.localize('debugAddToWatch', "Debug: Add to Watch"),
 			alias: 'Debug: Add to Watch',
-			precondition: ContextKeyExpr.and(EditorContextKeys.hasNonEmptySelection, CONTEXT_IN_DEBUG_MODE, CONTEXT_NOT_IN_DEBUG_REPL),
+			precondition: ContextKeyExpr.and(EditorContextKeys.hasNonEmptySelection, CONTEXT_IN_DEBUG_MODE, EditorContextKeys.editorTextFocus),
 			menuOpts: {
 				group: 'debug',
 				order: 1
@@ -194,7 +199,8 @@ class ShowDebugHoverAction extends EditorAction {
 			precondition: CONTEXT_IN_DEBUG_MODE,
 			kbOpts: {
 				kbExpr: EditorContextKeys.editorTextFocus,
-				primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_K, KeyMod.CtrlCmd | KeyCode.KEY_I)
+				primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_K, KeyMod.CtrlCmd | KeyCode.KEY_I),
+				weight: KeybindingWeight.EditorContrib
 			}
 		});
 	}
diff --git a/src/vs/workbench/parts/debug/browser/debugEditorModelManager.ts b/src/vs/workbench/parts/debug/browser/debugEditorModelManager.ts
index 4b21fa882fb..185e38174a3 100644
--- a/src/vs/workbench/parts/debug/browser/debugEditorModelManager.ts
+++ b/src/vs/workbench/parts/debug/browser/debugEditorModelManager.ts
@@ -12,7 +12,6 @@ import { IDebugService, IBreakpoint, State, IBreakpointUpdateData } from 'vs/wor
 import { IModelService } from 'vs/editor/common/services/modelService';
 import { MarkdownString } from 'vs/base/common/htmlContent';
 import { getBreakpointMessageAndClassName } from 'vs/workbench/parts/debug/browser/breakpointsView';
-import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
 
 interface IBreakpointDecoration {
 	decorationId: string;
@@ -38,7 +37,6 @@ export class DebugEditorModelManager implements IWorkbenchContribution {
 	constructor(
 		@IModelService private modelService: IModelService,
 		@IDebugService private debugService: IDebugService,
-		@ITextFileService private textFileService: ITextFileService
 	) {
 		this.modelDataMap = new Map<string, IDebugEditorModelData>();
 		this.toDispose = [];
@@ -277,7 +275,7 @@ export class DebugEditorModelManager implements IWorkbenchContribution {
 	}
 
 	private getBreakpointDecorationOptions(breakpoint: IBreakpoint): IModelDecorationOptions {
-		const { className, message } = getBreakpointMessageAndClassName(this.debugService, this.textFileService, breakpoint);
+		const { className, message } = getBreakpointMessageAndClassName(this.debugService, breakpoint);
 		let glyphMarginHoverMessage: MarkdownString;
 
 		if (message) {
diff --git a/src/vs/workbench/parts/debug/browser/debugQuickOpen.ts b/src/vs/workbench/parts/debug/browser/debugQuickOpen.ts
index 66905ae107a..6661ad6ffb9 100644
--- a/src/vs/workbench/parts/debug/browser/debugQuickOpen.ts
+++ b/src/vs/workbench/parts/debug/browser/debugQuickOpen.ts
@@ -11,10 +11,10 @@ import * as QuickOpen from 'vs/base/parts/quickopen/common/quickOpen';
 import * as Model from 'vs/base/parts/quickopen/browser/quickOpenModel';
 import { IDebugService, ILaunch } from 'vs/workbench/parts/debug/common/debug';
 import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
-import * as errors from 'vs/base/common/errors';
 import { ICommandService } from 'vs/platform/commands/common/commands';
 import { StartAction } from 'vs/workbench/parts/debug/browser/debugActions';
 import { INotificationService } from 'vs/platform/notification/common/notification';
+import { CancellationToken } from 'vs/base/common/cancellation';
 
 class AddConfigEntry extends Model.QuickOpenEntry {
 
@@ -38,7 +38,7 @@ class AddConfigEntry extends Model.QuickOpenEntry {
 		if (mode === QuickOpen.Mode.PREVIEW) {
 			return false;
 		}
-		this.commandService.executeCommand('debug.addConfiguration', this.launch.uri.toString()).done(undefined, errors.onUnexpectedError);
+		this.commandService.executeCommand('debug.addConfiguration', this.launch.uri.toString());
 
 		return true;
 	}
@@ -68,7 +68,7 @@ class StartDebugEntry extends Model.QuickOpenEntry {
 		}
 		// Run selected debug configuration
 		this.debugService.getConfigurationManager().selectConfiguration(this.launch, this.configurationName);
-		this.debugService.startDebugging(this.launch).done(undefined, e => this.notificationService.error(e));
+		this.debugService.startDebugging(this.launch).then(undefined, e => this.notificationService.error(e));
 
 		return true;
 	}
@@ -77,6 +77,7 @@ class StartDebugEntry extends Model.QuickOpenEntry {
 export class DebugQuickOpenHandler extends Quickopen.QuickOpenHandler {
 
 	public static readonly ID = 'workbench.picker.launch';
+
 	private autoFocusIndex: number;
 
 	constructor(
@@ -92,13 +93,13 @@ export class DebugQuickOpenHandler extends Quickopen.QuickOpenHandler {
 		return nls.localize('debugAriaLabel', "Type a name of a launch configuration to run.");
 	}
 
-	public getResults(input: string): TPromise<Model.QuickOpenModel> {
+	public getResults(input: string, token: CancellationToken): TPromise<Model.QuickOpenModel> {
 		const configurations: Model.QuickOpenEntry[] = [];
 
 		const configManager = this.debugService.getConfigurationManager();
 		const launches = configManager.getLaunches();
 		for (let launch of launches) {
-			launch.getConfigurationNames().map(config => ({ config: config, highlights: Filters.matchesContiguousSubString(input, config) }))
+			launch.getConfigurationNames().map(config => ({ config: config, highlights: Filters.matchesFuzzy(input, config, true) }))
 				.filter(({ highlights }) => !!highlights)
 				.forEach(({ config, highlights }) => {
 					if (launch === configManager.selectedConfiguration.launch && config === configManager.selectedConfiguration.name) {
@@ -110,7 +111,7 @@ export class DebugQuickOpenHandler extends Quickopen.QuickOpenHandler {
 		launches.filter(l => !l.hidden).forEach((l, index) => {
 
 			const label = this.contextService.getWorkbenchState() === WorkbenchState.WORKSPACE ? nls.localize("addConfigTo", "Add Config ({0})...", l.name) : nls.localize('addConfiguration', "Add Configuration...");
-			const entry = new AddConfigEntry(label, l, this.commandService, this.contextService, Filters.matchesContiguousSubString(input, label));
+			const entry = new AddConfigEntry(label, l, this.commandService, this.contextService, Filters.matchesFuzzy(input, label, true));
 			if (index === 0) {
 				configurations.push(new Model.QuickOpenEntryGroup(entry, undefined, true));
 			} else {
diff --git a/src/vs/workbench/parts/debug/browser/debugStatus.ts b/src/vs/workbench/parts/debug/browser/debugStatus.ts
index f72afca4b5d..4ada0c1e5f4 100644
--- a/src/vs/workbench/parts/debug/browser/debugStatus.ts
+++ b/src/vs/workbench/parts/debug/browser/debugStatus.ts
@@ -5,8 +5,7 @@
 
 import * as nls from 'vs/nls';
 import * as dom from 'vs/base/browser/dom';
-import * as errors from 'vs/base/common/errors';
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
+import { IDisposable } from 'vs/base/common/lifecycle';
 import { IQuickOpenService } from 'vs/platform/quickOpen/common/quickOpen';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { IStatusbarItem } from 'vs/workbench/browser/parts/statusbar/statusbar';
@@ -18,7 +17,6 @@ import { STATUS_BAR_DEBUGGING_FOREGROUND, isStatusbarInDebugMode } from 'vs/work
 const $ = dom.$;
 
 export class DebugStatus extends Themable implements IStatusbarItem {
-	private toDispose: IDisposable[];
 	private container: HTMLElement;
 	private statusBarItem: HTMLElement;
 	private label: HTMLElement;
@@ -32,28 +30,23 @@ export class DebugStatus extends Themable implements IStatusbarItem {
 		@IConfigurationService configurationService: IConfigurationService
 	) {
 		super(themeService);
-		this.toDispose = [];
-		this.toDispose.push(this.debugService.getConfigurationManager().onDidSelectConfiguration(e => {
+		this._register(this.debugService.getConfigurationManager().onDidSelectConfiguration(e => {
 			this.setLabel();
 		}));
-		this.toDispose.push(this.debugService.onDidChangeState(state => {
+		this._register(this.debugService.onDidChangeState(state => {
 			if (state !== State.Inactive && this.showInStatusBar === 'onFirstSessionStart') {
 				this.doRender();
 			}
 		}));
 		this.showInStatusBar = configurationService.getValue<IDebugConfiguration>('debug').showInStatusBar;
-		this.toDispose.push(configurationService.onDidChangeConfiguration(e => {
+		this._register(configurationService.onDidChangeConfiguration(e => {
 			if (e.affectsConfiguration('debug.showInStatusBar')) {
 				this.showInStatusBar = configurationService.getValue<IDebugConfiguration>('debug').showInStatusBar;
-				if (this.showInStatusBar === 'never' && this.statusBarItem) {
-					this.statusBarItem.hidden = true;
-				} else {
-					if (this.statusBarItem) {
-						this.statusBarItem.hidden = false;
-					}
-					if (this.showInStatusBar === 'always') {
-						this.doRender();
-					}
+				if (this.showInStatusBar === 'always') {
+					this.doRender();
+				}
+				if (this.statusBarItem) {
+					dom.toggleClass(this.statusBarItem, 'hidden', this.showInStatusBar === 'never');
 				}
 			}
 		}));
@@ -82,9 +75,7 @@ export class DebugStatus extends Themable implements IStatusbarItem {
 	private doRender(): void {
 		if (!this.statusBarItem && this.container) {
 			this.statusBarItem = dom.append(this.container, $('.debug-statusbar-item'));
-			this.toDispose.push(dom.addDisposableListener(this.statusBarItem, 'click', () => {
-				this.quickOpenService.show('debug ').done(undefined, errors.onUnexpectedError);
-			}));
+			this._register(dom.addDisposableListener(this.statusBarItem, 'click', () => this.quickOpenService.show('debug ')));
 			this.statusBarItem.title = nls.localize('selectAndStartDebug', "Select and start debug configuration");
 			const a = dom.append(this.statusBarItem, $('a'));
 			this.icon = dom.append(a, $('.icon'));
@@ -99,17 +90,11 @@ export class DebugStatus extends Themable implements IStatusbarItem {
 		if (this.label && this.statusBarItem) {
 			const manager = this.debugService.getConfigurationManager();
 			const name = manager.selectedConfiguration.name;
-			if (name && manager.selectedConfiguration.launch) {
-				this.statusBarItem.style.display = 'block';
+			const nameAndLaunchPresent = name && manager.selectedConfiguration.launch;
+			dom.toggleClass(this.statusBarItem, 'hidden', this.showInStatusBar === 'never' || !nameAndLaunchPresent);
+			if (nameAndLaunchPresent) {
 				this.label.textContent = manager.getLaunches().length > 1 ? `${name} (${manager.selectedConfiguration.launch.name})` : name;
-			} else {
-				this.statusBarItem.style.display = 'none';
 			}
 		}
 	}
-
-	public dispose(): void {
-		super.dispose();
-		this.toDispose = dispose(this.toDispose);
-	}
 }
diff --git a/src/vs/workbench/parts/debug/browser/debugViewlet.ts b/src/vs/workbench/parts/debug/browser/debugViewlet.ts
index 04f9c90f3db..30ffc30d939 100644
--- a/src/vs/workbench/parts/debug/browser/debugViewlet.ts
+++ b/src/vs/workbench/parts/debug/browser/debugViewlet.ts
@@ -66,10 +66,10 @@ export class DebugViewlet extends ViewContainerViewlet {
 		}));
 	}
 
-	async create(parent: HTMLElement): TPromise<void> {
-		await super.create(parent);
-
-		DOM.addClass(parent, 'debug-viewlet');
+	create(parent: HTMLElement): TPromise<void> {
+		return super.create(parent).then(() => {
+			DOM.addClass(parent, 'debug-viewlet');
+		});
 	}
 
 	public focus(): void {
@@ -105,7 +105,7 @@ export class DebugViewlet extends ViewContainerViewlet {
 			return [this.startAction, this.configureAction, this.toggleReplAction];
 		}
 
-		return DebugActionsWidget.getActions(this.allActions, this.toUnbind, this.debugService, this.keybindingService, this.instantiationService);
+		return DebugActionsWidget.getActions(this.allActions, this.toDispose, this.debugService, this.keybindingService, this.instantiationService);
 	}
 
 	public get showInitialDebugActions(): boolean {
@@ -226,7 +226,7 @@ export class FocusWatchViewAction extends Action {
 export class FocusCallStackViewAction extends Action {
 
 	static readonly ID = 'workbench.debug.action.focusCallStackView';
-	static LABEL = nls.localize({ comment: ['Debug is a noun in this context, not a verb.'], key: 'debugFocusCallStackView' }, 'Focus CallStack');
+	static LABEL = nls.localize({ comment: ['Debug is a noun in this context, not a verb.'], key: 'debugFocusCallStackView' }, 'Focus Call Stack');
 
 	constructor(id: string, label: string,
 		@IViewletService private viewletService: IViewletService
diff --git a/src/vs/workbench/parts/debug/browser/linkDetector.ts b/src/vs/workbench/parts/debug/browser/linkDetector.ts
index e26b2ba73c0..8846aa76a91 100644
--- a/src/vs/workbench/parts/debug/browser/linkDetector.ts
+++ b/src/vs/workbench/parts/debug/browser/linkDetector.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import uri from 'vs/base/common/uri';
+import { URI as uri } from 'vs/base/common/uri';
 import { isMacintosh } from 'vs/base/common/platform';
 import * as errors from 'vs/base/common/errors';
 import { IMouseEvent, StandardMouseEvent } from 'vs/base/browser/mouseEvent';
@@ -106,6 +106,6 @@ export class LinkDetector {
 					startColumn: column
 				}
 			}
-		}, group).done(null, errors.onUnexpectedError);
+		}, group).then(null, errors.onUnexpectedError);
 	}
 }
diff --git a/src/vs/workbench/parts/debug/browser/loadedScriptsView.ts b/src/vs/workbench/parts/debug/browser/loadedScriptsView.ts
new file mode 100644
index 00000000000..1a71a9f3c36
--- /dev/null
+++ b/src/vs/workbench/parts/debug/browser/loadedScriptsView.ts
@@ -0,0 +1,543 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as nls from 'vs/nls';
+import { TreeViewsViewletPanel, IViewletViewOptions } from 'vs/workbench/browser/parts/views/viewsViewlet';
+import { TPromise } from 'vs/base/common/winjs.base';
+import * as dom from 'vs/base/browser/dom';
+import { normalize, isAbsolute, sep } from 'vs/base/common/paths';
+import { IViewletPanelOptions } from 'vs/workbench/browser/parts/views/panelViewlet';
+import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
+import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
+import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { WorkbenchTree, TreeResourceNavigator } from 'vs/platform/list/browser/listService';
+import { renderViewTree, twistiePixels } from 'vs/workbench/parts/debug/browser/baseDebugView';
+import { IAccessibilityProvider, ITree, IRenderer, IDataSource } from 'vs/base/parts/tree/browser/tree';
+import { IDebugSession, IDebugService, IModel, CONTEXT_LOADED_SCRIPTS_ITEM_TYPE } from 'vs/workbench/parts/debug/common/debug';
+import { Source } from 'vs/workbench/parts/debug/common/debugSource';
+import { IWorkspaceContextService, IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
+import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
+import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
+import { IEnvironmentService } from 'vs/platform/environment/common/environment';
+import { tildify } from 'vs/base/common/labels';
+import { isWindows } from 'vs/base/common/platform';
+import { URI } from 'vs/base/common/uri';
+import { ltrim } from 'vs/base/common/strings';
+import { RunOnceScheduler } from 'vs/base/common/async';
+
+const SMART = true;
+
+const $ = dom.$;
+
+const SESSION_TEMPLATE_ID = 'session';
+const SOURCE_TEMPLATE_ID = 'source';
+const ROOT_FOLDER_TEMPLATE_ID = 'node';
+
+class BaseTreeItem {
+
+	private _showedMoreThanOne: boolean;
+	private _children: { [key: string]: BaseTreeItem; };
+	private _source: Source;
+
+	constructor(private _parent: BaseTreeItem, private _label: string) {
+		this._children = {};
+		this._showedMoreThanOne = false;
+	}
+
+	setSource(session: IDebugSession, source: Source): void {
+		this._source = source;
+	}
+
+	createIfNeeded<T extends BaseTreeItem>(key: string, factory: (parent: BaseTreeItem, label: string) => T): T {
+		let child = <T>this._children[key];
+		if (!child) {
+			child = factory(this, key);
+			this._children[key] = child;
+		}
+		return child;
+	}
+
+	remove(key: string): void {
+		delete this._children[key];
+	}
+
+	getTemplateId(): string {
+		return SOURCE_TEMPLATE_ID;
+	}
+
+	// a dynamic ID based on the parent chain; required for reparenting (see #55448)
+	getId(): string {
+		const parent = this.getParent();
+		return parent ? `${parent.getId()}/${this._label}` : this._label;
+	}
+
+	// skips intermediate single-child nodes
+	getParent(): BaseTreeItem {
+		if (this._parent) {
+			if (this._parent.isSkipped()) {
+				return this._parent.getParent();
+			}
+			return this._parent;
+		}
+		return undefined;
+	}
+
+	isSkipped(): boolean {
+		if (this._parent) {
+			if (this._parent.oneChild()) {
+				return true;	// skipped if I'm the only child of my parents
+			}
+			return false;
+		}
+		return true;	// roots are never skipped
+	}
+
+	// skips intermediate single-child nodes
+	hasChildren(): boolean {
+		const child = this.oneChild();
+		if (child) {
+			return child.hasChildren();
+		}
+		return Object.keys(this._children).length > 0;
+	}
+
+	// skips intermediate single-child nodes
+	getChildren(): TPromise<BaseTreeItem[]> {
+		const child = this.oneChild();
+		if (child) {
+			return child.getChildren();
+		}
+		const array = Object.keys(this._children).map(key => this._children[key]);
+		return TPromise.as(array.sort((a, b) => this.compare(a, b)));
+	}
+
+	// skips intermediate single-child nodes
+	getLabel(separateRootFolder = true) {
+		const child = this.oneChild();
+		if (child) {
+			const sep = (this instanceof RootFolderTreeItem && separateRootFolder) ? ' • ' : '/';
+			return `${this._label}${sep}${child.getLabel()}`;
+		}
+		return this._label;
+	}
+
+	// skips intermediate single-child nodes
+	getHoverLabel(): string {
+		let label = this.getLabel(false);
+		const parent = this.getParent();
+		if (parent) {
+			const hover = parent.getHoverLabel();
+			if (hover) {
+				return `${hover}/${label}`;
+			}
+		}
+		return label;
+	}
+
+	// skips intermediate single-child nodes
+	getSource(): Source {
+		const child = this.oneChild();
+		if (child) {
+			return child.getSource();
+		}
+		return this._source;
+	}
+
+	protected compare(a: BaseTreeItem, b: BaseTreeItem): number {
+		if (a._label && b._label) {
+			return a._label.localeCompare(b._label);
+		}
+		return 0;
+	}
+
+	private oneChild(): BaseTreeItem {
+		if (SMART && !this._showedMoreThanOne) {
+			const keys = Object.keys(this._children);
+			if (keys.length === 1) {
+				return this._children[keys[0]];
+			}
+			// if a node had more than one child once, it will never be skipped again
+			if (keys.length > 1) {
+				this._showedMoreThanOne = true;
+			}
+		}
+		return undefined;
+	}
+}
+
+class RootFolderTreeItem extends BaseTreeItem {
+
+	constructor(parent: BaseTreeItem, public folder: IWorkspaceFolder) {
+		super(parent, folder.name);
+	}
+
+	getTemplateId(): string {
+		return ROOT_FOLDER_TEMPLATE_ID;
+	}
+}
+
+class RootTreeItem extends BaseTreeItem {
+
+	constructor(private _debugModel: IModel, private _environmentService: IEnvironmentService, private _contextService: IWorkspaceContextService) {
+		super(undefined, 'Root');
+		this._debugModel.getSessions().forEach(session => {
+			this.add(session);
+		});
+	}
+
+	add(session: IDebugSession): SessionTreeItem {
+		return this.createIfNeeded(session.getId(), () => new SessionTreeItem(this, session, this._environmentService, this._contextService));
+	}
+}
+
+class SessionTreeItem extends BaseTreeItem {
+
+	private static URL_REGEXP = /^(https?:\/\/[^/]+)(\/.*)$/;
+
+	private _session: IDebugSession;
+	private _initialized: boolean;
+
+	constructor(parent: BaseTreeItem, session: IDebugSession, private _environmentService: IEnvironmentService, private rootProvider: IWorkspaceContextService) {
+		super(parent, session.getName(true));
+		this._initialized = false;
+		this._session = session;
+	}
+
+	getHoverLabel(): string {
+		return undefined;
+	}
+
+	getTemplateId(): string {
+		return SESSION_TEMPLATE_ID;
+	}
+
+	hasChildren(): boolean {
+		return true;
+	}
+
+	getChildren(): TPromise<BaseTreeItem[]> {
+
+		if (!this._initialized) {
+			this._initialized = true;
+			return this._session.getLoadedSources().then(paths => {
+				paths.forEach(path => this.addPath(path));
+				return super.getChildren();
+			});
+		}
+
+		return super.getChildren();
+	}
+
+	protected compare(a: BaseTreeItem, b: BaseTreeItem): number {
+		const acat = this.category(a);
+		const bcat = this.category(b);
+		if (acat !== bcat) {
+			return acat - bcat;
+		}
+		return super.compare(a, b);
+	}
+
+	private category(item: BaseTreeItem): number {
+
+		// workspace scripts come at the beginning in "folder" order
+		if (item instanceof RootFolderTreeItem) {
+			return item.folder.index;
+		}
+
+		// <...> come at the very end
+		const l = item.getLabel();
+		if (l && /^<.+>$/.test(l)) {
+			return 1000;
+		}
+
+		// everything else in between
+		return 999;
+	}
+
+	addPath(source: Source): void {
+
+		let folder: IWorkspaceFolder;
+		let url: string;
+
+		let path = source.raw.path;
+
+		const match = SessionTreeItem.URL_REGEXP.exec(path);
+		if (match && match.length === 3) {
+			url = match[1];
+			path = decodeURI(match[2]);
+		} else {
+			if (isAbsolute(path)) {
+				const resource = URI.file(path);
+
+				// return early if we can resolve a relative path label from the root folder
+				folder = this.rootProvider ? this.rootProvider.getWorkspaceFolder(resource) : null;
+				if (folder) {
+					// strip off the root folder path
+					path = normalize(ltrim(resource.path.substr(folder.uri.path.length), sep), true);
+					const hasMultipleRoots = this.rootProvider.getWorkspace().folders.length > 1;
+					if (hasMultipleRoots) {
+						path = '/' + path;
+					} else {
+						// don't show root folder
+						folder = undefined;
+					}
+				} else {
+					// on unix try to tildify absolute paths
+					path = normalize(path, true);
+					if (!isWindows) {
+						path = tildify(path, this._environmentService.userHome);
+					}
+				}
+			}
+		}
+
+		let x: BaseTreeItem = this;
+		path.split(/[\/\\]/).forEach((segment, i) => {
+			if (i === 0 && folder) {
+				x = x.createIfNeeded(folder.name, parent => new RootFolderTreeItem(parent, folder));
+			} else if (i === 0 && url) {
+				x = x.createIfNeeded(url, parent => new BaseTreeItem(parent, url));
+			} else {
+				x = x.createIfNeeded(segment, parent => new BaseTreeItem(parent, segment));
+			}
+		});
+
+		x.setSource(this._session, source);
+	}
+}
+
+export class LoadedScriptsView extends TreeViewsViewletPanel {
+
+	private static readonly MEMENTO = 'loadedscriptsview.memento';
+
+	private treeContainer: HTMLElement;
+	private loadedScriptsItemType: IContextKey<string>;
+	private settings: any;
+
+	constructor(
+		options: IViewletViewOptions,
+		@IContextMenuService contextMenuService: IContextMenuService,
+		@IKeybindingService keybindingService: IKeybindingService,
+		@IInstantiationService private instantiationService: IInstantiationService,
+		@IConfigurationService configurationService: IConfigurationService,
+		@IEditorService private editorService: IEditorService,
+		@IContextKeyService contextKeyService: IContextKeyService,
+		@IWorkspaceContextService private contextService: IWorkspaceContextService,
+		@IEnvironmentService private environmentService: IEnvironmentService,
+		@IDebugService private debugService: IDebugService
+	) {
+		super({ ...(options as IViewletPanelOptions), ariaHeaderLabel: nls.localize('loadedScriptsSection', "Loaded Scripts Section") }, keybindingService, contextMenuService, configurationService);
+		this.settings = options.viewletSettings;
+		this.loadedScriptsItemType = CONTEXT_LOADED_SCRIPTS_ITEM_TYPE.bindTo(contextKeyService);
+	}
+
+	protected renderBody(container: HTMLElement): void {
+		dom.addClass(container, 'debug-loaded-scripts');
+
+		this.treeContainer = renderViewTree(container);
+
+		this.tree = this.instantiationService.createInstance(WorkbenchTree, this.treeContainer,
+			{
+				dataSource: new LoadedScriptsDataSource(),
+				renderer: this.instantiationService.createInstance(LoadedScriptsRenderer),
+				accessibilityProvider: new LoadedSciptsAccessibilityProvider(),
+			},
+			{
+				ariaLabel: nls.localize({ comment: ['Debug is a noun in this context, not a verb.'], key: 'loadedScriptsAriaLabel' }, "Debug Loaded Scripts"),
+				twistiePixels
+			}
+		);
+
+		const callstackNavigator = new TreeResourceNavigator(this.tree);
+		this.disposables.push(callstackNavigator);
+		this.disposables.push(callstackNavigator.openResource(e => {
+
+			const element = e.element;
+
+			if (element instanceof BaseTreeItem) {
+				const source = element.getSource();
+				if (source && source.available) {
+					const nullRange = { startLineNumber: 0, startColumn: 0, endLineNumber: 0, endColumn: 0 };
+					source.openInEditor(this.editorService, nullRange, e.editorOptions.preserveFocus, e.sideBySide, e.editorOptions.pinned);
+				}
+			}
+		}));
+
+		this.disposables.push(this.tree.onDidChangeFocus(() => {
+			const focus = this.tree.getFocus();
+			if (focus instanceof SessionTreeItem) {
+				this.loadedScriptsItemType.set('session');
+			} else {
+				this.loadedScriptsItemType.reset();
+			}
+		}));
+
+		let nextRefreshIsRecursive = false;
+		const refreshScheduler = new RunOnceScheduler(() => {
+			if (this.tree) {
+				this.tree.refresh(undefined, nextRefreshIsRecursive);
+				nextRefreshIsRecursive = false;
+			}
+		}, 300);
+		this.disposables.push(refreshScheduler);
+
+		const root = new RootTreeItem(this.debugService.getModel(), this.environmentService, this.contextService);
+		this.tree.setInput(root);
+
+		const registerLoadedSourceListener = (session: IDebugSession) => {
+			this.disposables.push(session.onDidLoadedSource(event => {
+				const sessionRoot = root.add(session);
+				sessionRoot.addPath(event.source);
+				nextRefreshIsRecursive = true;
+				refreshScheduler.schedule();
+			}));
+		};
+
+		this.disposables.push(this.debugService.onDidNewSession(registerLoadedSourceListener));
+		this.debugService.getModel().getSessions().forEach(registerLoadedSourceListener);
+
+		this.disposables.push(this.debugService.onDidEndSession(session => {
+			root.remove(session.getId());
+			refreshScheduler.schedule();
+		}));
+	}
+
+	layoutBody(size: number): void {
+		if (this.treeContainer) {
+			this.treeContainer.style.height = size + 'px';
+		}
+		super.layoutBody(size);
+	}
+
+	public shutdown(): void {
+		this.settings[LoadedScriptsView.MEMENTO] = !this.isExpanded();
+		super.shutdown();
+	}
+
+	dispose(): void {
+		this.tree = undefined;
+		super.dispose();
+	}
+}
+
+// A good example of data source, renderers, action providers and accessibilty providers can be found in the callStackView.ts
+
+class LoadedScriptsDataSource implements IDataSource {
+
+	getId(tree: ITree, element: any): string {
+		return element.getId();
+	}
+
+	hasChildren(tree: ITree, element: any): boolean {
+		return element.hasChildren();
+	}
+
+	getChildren(tree: ITree, element: any): TPromise<any> {
+		return element.getChildren();
+	}
+
+	getParent(tree: ITree, element: any): TPromise<any> {
+		return TPromise.as(element.getParent());
+	}
+
+	shouldAutoexpand?(tree: ITree, element: any): boolean {
+		return element instanceof RootTreeItem || element instanceof SessionTreeItem;
+	}
+}
+
+interface ISessionTemplateData {
+	session: HTMLElement;
+}
+
+interface ISourceTemplateData {
+	source: HTMLElement;
+}
+
+interface INodeTemplateData {
+	node: HTMLElement;
+}
+
+class LoadedScriptsRenderer implements IRenderer {
+
+	getHeight(tree: ITree, element: any): number {
+		return 22;
+	}
+
+	getTemplateId(tree: ITree, element: any): string {
+		return element.getTemplateId();
+	}
+
+	renderTemplate(tree: ITree, templateId: string, container: HTMLElement) {
+
+		if (templateId === SESSION_TEMPLATE_ID) {
+			let data: ISessionTemplateData = Object.create(null);
+			data.session = dom.append(container, $('.session'));
+			return data;
+		}
+
+		if (templateId === SOURCE_TEMPLATE_ID) {
+			let data: ISourceTemplateData = Object.create(null);
+			data.source = dom.append(container, $('.source'));
+			return data;
+		}
+
+		let data: INodeTemplateData = Object.create(null);
+		data.node = dom.append(container, $('.node'));
+		return data;
+	}
+
+	renderElement(tree: ITree, element: any, templateId: string, templateData: any): void {
+		if (templateId === SESSION_TEMPLATE_ID) {
+			this.renderSession(element, templateData);
+		} else if (templateId === SOURCE_TEMPLATE_ID) {
+			this.renderSource(element, templateData);
+		} else if (templateId === ROOT_FOLDER_TEMPLATE_ID) {
+			this.renderNode(element, templateData);
+		}
+	}
+
+	disposeTemplate(tree: ITree, templateId: string, templateData: any): void {
+		// noop
+	}
+
+	private renderSession(session: SessionTreeItem, data: ISessionTemplateData): void {
+		data.session.title = nls.localize('loadedScriptsSession', "Session");
+		data.session.textContent = session.getLabel();
+	}
+
+	private renderSource(source: BaseTreeItem, data: ISourceTemplateData): void {
+		data.source.title = source.getHoverLabel();
+		data.source.textContent = source.getLabel();
+	}
+
+	private renderNode(node: BaseTreeItem, data: INodeTemplateData): void {
+		data.node.title = node.getHoverLabel();
+		data.node.textContent = node.getLabel();
+	}
+}
+
+class LoadedSciptsAccessibilityProvider implements IAccessibilityProvider {
+
+	public getAriaLabel(tree: ITree, element: any): string {
+
+		if (element instanceof RootFolderTreeItem) {
+			return nls.localize('loadedScriptsRootFolderAriaLabel', "Workspace folder {0}, loaded script, debug", element.getLabel());
+		}
+
+		if (element instanceof SessionTreeItem) {
+			return nls.localize('loadedScriptsSessionAriaLabel', "Session {0}, loaded script, debug", element.getLabel());
+		}
+
+		if (element instanceof BaseTreeItem) {
+			if (element.hasChildren()) {
+				return nls.localize('loadedScriptsFolderAriaLabel', "Folder {0}, loaded script, debug", element.getLabel());
+			} else {
+				return nls.localize('loadedScriptsSourceAriaLabel', "{0}, loaded script, debug", element.getLabel());
+			}
+		}
+		return null;
+	}
+}
diff --git a/src/vs/workbench/parts/debug/browser/media/debug.contribution.css b/src/vs/workbench/parts/debug/browser/media/debug.contribution.css
index 6637cb84e53..0785081abcb 100644
--- a/src/vs/workbench/parts/debug/browser/media/debug.contribution.css
+++ b/src/vs/workbench/parts/debug/browser/media/debug.contribution.css
@@ -53,7 +53,7 @@
 }
 
 .debug-breakpoint,
-.monaco-editor .debug-breakpoint-column.debug-breakpoint-column::before {
+.monaco-editor .debug-breakpoint-column::before {
 	background: url('breakpoint.svg') center center no-repeat;
 }
 
@@ -90,11 +90,13 @@
 	background: url('breakpoint-log.svg') center center no-repeat;
 }
 
-.debug-breakpoint-log-disabled {
+.debug-breakpoint-log-disabled,
+.monaco-editor .debug-breakpoint-log-disabled-column::before {
 	background: url('breakpoint-log-disabled.svg') center center no-repeat;
 }
 
-.debug-breakpoint-log-unverified {
+.debug-breakpoint-log-unverified,
+.monaco-editor .debug-breakpoint-log-unverified-column::before {
 	background: url('breakpoint-log-unverified.svg') center center no-repeat;
 }
 
diff --git a/src/vs/workbench/parts/debug/browser/media/debugActionsWidget.css b/src/vs/workbench/parts/debug/browser/media/debugActionsWidget.css
index 49fe1168cbc..aa51f17126a 100644
--- a/src/vs/workbench/parts/debug/browser/media/debugActionsWidget.css
+++ b/src/vs/workbench/parts/debug/browser/media/debugActionsWidget.css
@@ -13,12 +13,12 @@
 	padding-left: 7px;
 }
 
-.monaco-workbench .debug-actions-widget .monaco-action-bar .action-item.select-container {
-	margin-right: 7px;
+.monaco-workbench .debug-actions-widget .monaco-action-bar .action-item {
+	height: 32px;
 }
 
-.monaco-workbench .debug-actions-widget .monaco-action-bar .action-item .monaco-select-box {
-	margin-top: 6px;
+.monaco-workbench .debug-actions-widget .monaco-action-bar .action-item.select-container {
+	margin-right: 7px;
 }
 
 .monaco-workbench .debug-actions-widget .drag-area {
diff --git a/src/vs/workbench/parts/debug/browser/media/debugViewlet.css b/src/vs/workbench/parts/debug/browser/media/debugViewlet.css
index ea156779fae..48ab4d9099a 100644
--- a/src/vs/workbench/parts/debug/browser/media/debugViewlet.css
+++ b/src/vs/workbench/parts/debug/browser/media/debugViewlet.css
@@ -109,6 +109,7 @@
 	font-size: 0.9em;
 	padding: 0 3px;
 	margin-left: 0.8em;
+	line-height: 20px;
 }
 
 .debug-viewlet .monaco-tree .monaco-tree-row.selected .line-number,
@@ -350,6 +351,10 @@
 
 /* Breakpoints */
 
+.debug-viewlet .monaco-list-row {
+	line-height: 22px;
+}
+
 .debug-viewlet .debug-breakpoints .monaco-list-row .breakpoint {
 	padding-left: 2px;
 }
@@ -372,6 +377,7 @@
 .debug-viewlet .debug-breakpoints .breakpoint > .icon {
 	width: 19px;
 	height: 19px;
+	min-width: 19px;
 }
 
 .debug-viewlet .debug-breakpoints .breakpoint > .file-path {
@@ -383,6 +389,11 @@
 	overflow: hidden;
 }
 
+.debug-viewlet .debug-breakpoints .breakpoint .name {
+	overflow: hidden;
+	text-overflow: ellipsis
+}
+
 .debug-viewlet .debug-action.remove {
 	background: url('remove.svg') center center no-repeat;
 }
diff --git a/src/vs/workbench/parts/debug/browser/media/repl.css b/src/vs/workbench/parts/debug/browser/media/repl.css
index aeac80ce280..639dec32635 100644
--- a/src/vs/workbench/parts/debug/browser/media/repl.css
+++ b/src/vs/workbench/parts/debug/browser/media/repl.css
@@ -135,7 +135,11 @@
 	background: url('clear-repl-inverse.svg') center center no-repeat;
 }
 
-/* Output coloring */
+/* Output coloring  and styling */
+
+.monaco-workbench .repl .repl-tree .monaco-tree .monaco-tree-row > .content > .output.expression > .ignore {
+	font-style: italic;
+}
 
 .vs .monaco-workbench .repl .repl-tree .monaco-tree .monaco-tree-row > .content > .output.expression > .warn {
 	color: #cd9731;
@@ -224,4 +228,4 @@
 .monaco-workbench .repl .repl-tree .monaco-tree .monaco-tree-row > .content > .output.expression a {
 	text-decoration: underline;
 	cursor: pointer;
-}
\ No newline at end of file
+}
diff --git a/src/vs/workbench/parts/debug/browser/media/restart-inverse.svg b/src/vs/workbench/parts/debug/browser/media/restart-inverse.svg
index 5cda703e42e..eb8116ac100 100644
--- a/src/vs/workbench/parts/debug/browser/media/restart-inverse.svg
+++ b/src/vs/workbench/parts/debug/browser/media/restart-inverse.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.icon-canvas-transparent,.icon-vs-out{fill:#252526;}.icon-canvas-transparent{opacity:0;}.icon-vs-action-green{fill:#89d185;}</style></defs><title>restart</title><g id="canvas"><path class="icon-canvas-transparent" d="M16,0V16H0V0Z"/></g><g id="outline" style="display: none;"><path class="icon-vs-out" d="M8.5,1A7.5,7.5,0,0,0,4,2.527V1H0V9H3.068l-2.057.583.272.962A7.5,7.5,0,1,0,8.5,1Zm0,11A3.515,3.515,0,0,1,5.131,9.455L5,9H8V5.036A3.6,3.6,0,0,1,8.5,5a3.5,3.5,0,0,1,0,7Z"/></g><g id="iconBg"><path class="icon-vs-action-green" d="M15,8.5A6.5,6.5,0,0,1,2.245,10.272l1.924-.544A4.509,4.509,0,1,0,4.764,6H7V8H1V2H3V5.07A6.486,6.486,0,0,1,15,8.5Z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><style>.st0{fill:#252526;fill-opacity:0}.st1{display:none}.st2{display:inline;fill:#252526}.st3{fill:#89d185}</style><title>restart</title><path class="st0" d="M16 0v16H0V0h16z" id="canvas"/><g id="outline" class="st1" style="display: none;"><path class="st2" d="M8.5 1C6.9 1 5.3 1.5 4 2.5V1H0v8h3.1L1 9.6l.3 1c1.1 4 5.3 6.3 9.3 5.2s6.3-5.3 5.2-9.3C14.8 3.2 11.9 1 8.5 1zm0 11c-1.6 0-2.9-1-3.4-2.5L5 9h3V5h.5C10.4 5 12 6.6 12 8.5S10.4 12 8.5 12z"/></g><path class="st3" d="M15 8c0 3.6-2.9 6.5-6.5 6.5-2.9 0-5.5-1.9-6.3-4.7l1.9-.5c.7 2.4 3.2 3.8 5.6 3.1 2.4-.7 3.8-3.2 3.1-5.6S9.7 3 7.3 3.7c-1 .3-1.9.9-2.5 1.8H7v2H1v-6h2v3.1c1.9-3 5.9-4 8.9-2.1C13.8 3.7 15 5.7 15 8z" id="iconBg"/></svg>
\ No newline at end of file
diff --git a/src/vs/workbench/parts/debug/browser/media/restart.svg b/src/vs/workbench/parts/debug/browser/media/restart.svg
index 1f6f664acff..64971fd7870 100644
--- a/src/vs/workbench/parts/debug/browser/media/restart.svg
+++ b/src/vs/workbench/parts/debug/browser/media/restart.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.icon-canvas-transparent,.icon-vs-out{fill:#f6f6f6;}.icon-canvas-transparent{opacity:0;}.icon-vs-action-green{fill:#388a34;}</style></defs><title>restart</title><g id="canvas"><path class="icon-canvas-transparent" d="M16,0V16H0V0Z"/></g><g id="outline" style="display: none;"><path class="icon-vs-out" d="M8.5,1A7.5,7.5,0,0,0,4,2.527V1H0V9H3.068l-2.057.583.272.962A7.5,7.5,0,1,0,8.5,1Zm0,11A3.515,3.515,0,0,1,5.131,9.455L5,9H8V5.036A3.6,3.6,0,0,1,8.5,5a3.5,3.5,0,0,1,0,7Z"/></g><g id="iconBg"><path class="icon-vs-action-green" d="M15,8.5A6.5,6.5,0,0,1,2.245,10.272l1.924-.544A4.509,4.509,0,1,0,4.764,6H7V8H1V2H3V5.07A6.486,6.486,0,0,1,15,8.5Z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><style>.st0{fill:#f6f6f6;fill-opacity:0}.st1{display:none}.st2{display:inline;fill:#f6f6f6}.st3{fill:#388a34}</style><title>restart</title><path class="st0" d="M16 0v16H0V0h16z" id="canvas"/><g id="outline" class="st1" style="display: none;"><path class="st2" d="M8.5 1C6.9 1 5.3 1.5 4 2.5V1H0v8h3.1L1 9.6l.3 1c1.1 4 5.3 6.3 9.3 5.2s6.3-5.3 5.2-9.3C14.8 3.2 11.9 1 8.5 1zm0 11c-1.6 0-2.9-1-3.4-2.5L5 9h3V5h.5C10.4 5 12 6.6 12 8.5S10.4 12 8.5 12z"/></g><path class="st3" d="M15 8c0 3.6-2.9 6.5-6.5 6.5-2.9 0-5.5-1.9-6.3-4.7l1.9-.5c.7 2.4 3.2 3.8 5.6 3.1 2.4-.7 3.8-3.2 3.1-5.6S9.7 3 7.3 3.7c-1 .3-1.9.9-2.5 1.8H7v2H1v-6h2v3.1c1.9-3 5.9-4 8.9-2.1C13.8 3.7 15 5.7 15 8z" id="iconBg"/></svg>
\ No newline at end of file
diff --git a/src/vs/workbench/parts/debug/browser/statusbarColorProvider.ts b/src/vs/workbench/parts/debug/browser/statusbarColorProvider.ts
index ed2b380111e..afb16080fcd 100644
--- a/src/vs/workbench/parts/debug/browser/statusbarColorProvider.ts
+++ b/src/vs/workbench/parts/debug/browser/statusbarColorProvider.ts
@@ -49,8 +49,8 @@ export class StatusBarColorProvider extends Themable implements IWorkbenchContri
 	}
 
 	private registerListeners(): void {
-		this.toUnbind.push(this.debugService.onDidChangeState(state => this.updateStyles()));
-		this.toUnbind.push(this.contextService.onDidChangeWorkbenchState(state => this.updateStyles()));
+		this._register(this.debugService.onDidChangeState(state => this.updateStyles()));
+		this._register(this.contextService.onDidChangeWorkbenchState(state => this.updateStyles()));
 	}
 
 	protected updateStyles(): void {
diff --git a/src/vs/workbench/parts/debug/common/debug.ts b/src/vs/workbench/parts/debug/common/debug.ts
index ca2d0ad7dca..eec024ae381 100644
--- a/src/vs/workbench/parts/debug/common/debug.ts
+++ b/src/vs/workbench/parts/debug/common/debug.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as nls from 'vs/nls';
-import uri from 'vs/base/common/uri';
+import { URI as uri } from 'vs/base/common/uri';
 import { TPromise } from 'vs/base/common/winjs.base';
 import severity from 'vs/base/common/severity';
 import { Event } from 'vs/base/common/event';
@@ -17,12 +17,15 @@ import { Position } from 'vs/editor/common/core/position';
 import { ISuggestion } from 'vs/editor/common/modes';
 import { Source } from 'vs/workbench/parts/debug/common/debugSource';
 import { Range, IRange } from 'vs/editor/common/core/range';
-import { RawContextKey, ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
+import { RawContextKey } from 'vs/platform/contextkey/common/contextkey';
 import { IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { IDisposable } from 'vs/base/common/lifecycle';
 import { IViewContainersRegistry, ViewContainer, Extensions as ViewContainerExtensions } from 'vs/workbench/common/views';
 import { Registry } from 'vs/platform/registry/common/platform';
+import { TaskIdentifier } from 'vs/workbench/parts/tasks/common/tasks';
+import { TelemetryService } from 'vs/platform/telemetry/common/telemetryService';
+import { IOutputService } from 'vs/workbench/parts/output/common/output';
 
 export const VIEWLET_ID = 'workbench.view.debug';
 export const VIEW_CONTAINER: ViewContainer = Registry.as<IViewContainersRegistry>(ViewContainerExtensions.ViewContainersRegistry).registerViewContainer(VIEWLET_ID);
@@ -30,17 +33,15 @@ export const VIEW_CONTAINER: ViewContainer = Registry.as<IViewContainersRegistry
 export const VARIABLES_VIEW_ID = 'workbench.debug.variablesView';
 export const WATCH_VIEW_ID = 'workbench.debug.watchExpressionsView';
 export const CALLSTACK_VIEW_ID = 'workbench.debug.callStackView';
+export const LOADED_SCRIPTS_VIEW_ID = 'workbench.debug.loadedScriptsView';
 export const BREAKPOINTS_VIEW_ID = 'workbench.debug.breakPointsView';
 export const REPL_ID = 'workbench.panel.repl';
 export const DEBUG_SERVICE_ID = 'debugService';
 export const CONTEXT_DEBUG_TYPE = new RawContextKey<string>('debugType', undefined);
-export const CONTEXT_DEBUG_STATE = new RawContextKey<string>('debugState', undefined);
+export const CONTEXT_DEBUG_STATE = new RawContextKey<string>('debugState', 'inactive');
 export const CONTEXT_IN_DEBUG_MODE = new RawContextKey<boolean>('inDebugMode', false);
-export const CONTEXT_NOT_IN_DEBUG_MODE: ContextKeyExpr = CONTEXT_IN_DEBUG_MODE.toNegated();
+export const CONTEXT_NOT_IN_DEBUG_MODE = CONTEXT_IN_DEBUG_MODE.toNegated();
 export const CONTEXT_IN_DEBUG_REPL = new RawContextKey<boolean>('inDebugRepl', false);
-export const CONTEXT_NOT_IN_DEBUG_REPL: ContextKeyExpr = CONTEXT_IN_DEBUG_REPL.toNegated();
-export const CONTEXT_ON_FIRST_DEBUG_REPL_LINE = new RawContextKey<boolean>('onFirstDebugReplLine', false);
-export const CONTEXT_ON_LAST_DEBUG_REPL_LINE = new RawContextKey<boolean>('onLastDebugReplLine', false);
 export const CONTEXT_BREAKPOINT_WIDGET_VISIBLE = new RawContextKey<boolean>('breakpointWidgetVisible', false);
 export const CONTEXT_IN_BREAKPOINT_WIDGET = new RawContextKey<boolean>('inBreakpointWidget', false);
 export const CONTEXT_BREAKPOINTS_FOCUSED = new RawContextKey<boolean>('breakpointsFocused', true);
@@ -49,13 +50,15 @@ export const CONTEXT_VARIABLES_FOCUSED = new RawContextKey<boolean>('variablesFo
 export const CONTEXT_EXPRESSION_SELECTED = new RawContextKey<boolean>('expressionSelected', false);
 export const CONTEXT_BREAKPOINT_SELECTED = new RawContextKey<boolean>('breakpointSelected', false);
 export const CONTEXT_CALLSTACK_ITEM_TYPE = new RawContextKey<string>('callStackItemType', undefined);
+export const CONTEXT_LOADED_SCRIPTS_SUPPORTED = new RawContextKey<boolean>('loadedScriptsSupported', false);
+export const CONTEXT_LOADED_SCRIPTS_ITEM_TYPE = new RawContextKey<string>('loadedScriptsItemType', undefined);
 
 export const EDITOR_CONTRIBUTION_ID = 'editor.contrib.debug';
 export const DEBUG_SCHEME = 'debug';
 export const INTERNAL_CONSOLE_OPTIONS_SCHEMA = {
 	enum: ['neverOpen', 'openOnSessionStart', 'openOnFirstSessionStart'],
 	default: 'openOnFirstSessionStart',
-	description: nls.localize('internalConsoleOptions', "Controls behavior of the internal debug console.")
+	description: nls.localize('internalConsoleOptions', "Controls when the internal debug console should open.")
 };
 
 // raw
@@ -107,51 +110,95 @@ export interface IExpression extends IReplElement, IExpressionContainer {
 	readonly type?: string;
 }
 
-export interface IRawSession {
-	readonly root: IWorkspaceFolder;
-	stackTrace(args: DebugProtocol.StackTraceArguments): TPromise<DebugProtocol.StackTraceResponse>;
-	exceptionInfo(args: DebugProtocol.ExceptionInfoArguments): TPromise<DebugProtocol.ExceptionInfoResponse>;
-	scopes(args: DebugProtocol.ScopesArguments): TPromise<DebugProtocol.ScopesResponse>;
-	variables(args: DebugProtocol.VariablesArguments): TPromise<DebugProtocol.VariablesResponse>;
-	evaluate(args: DebugProtocol.EvaluateArguments): TPromise<DebugProtocol.EvaluateResponse>;
-
-	readonly capabilities: DebugProtocol.Capabilities;
-	disconnect(restart?: boolean, force?: boolean): TPromise<DebugProtocol.DisconnectResponse>;
-	custom(request: string, args: any): TPromise<DebugProtocol.Response>;
-	onDidEvent: Event<DebugProtocol.Event>;
-	onDidInitialize: Event<DebugProtocol.InitializedEvent>;
-	onDidExitAdapter: Event<{ sessionId: string }>;
-	restartFrame(args: DebugProtocol.RestartFrameArguments, threadId: number): TPromise<DebugProtocol.RestartFrameResponse>;
-
-	next(args: DebugProtocol.NextArguments): TPromise<DebugProtocol.NextResponse>;
-	stepIn(args: DebugProtocol.StepInArguments): TPromise<DebugProtocol.StepInResponse>;
-	stepOut(args: DebugProtocol.StepOutArguments): TPromise<DebugProtocol.StepOutResponse>;
-	continue(args: DebugProtocol.ContinueArguments): TPromise<DebugProtocol.ContinueResponse>;
-	pause(args: DebugProtocol.PauseArguments): TPromise<DebugProtocol.PauseResponse>;
-	terminateThreads(args: DebugProtocol.TerminateThreadsArguments): TPromise<DebugProtocol.TerminateThreadsResponse>;
-	stepBack(args: DebugProtocol.StepBackArguments): TPromise<DebugProtocol.StepBackResponse>;
-	reverseContinue(args: DebugProtocol.ReverseContinueArguments): TPromise<DebugProtocol.ReverseContinueResponse>;
-
-	completions(args: DebugProtocol.CompletionsArguments): TPromise<DebugProtocol.CompletionsResponse>;
-	setVariable(args: DebugProtocol.SetVariableArguments): TPromise<DebugProtocol.SetVariableResponse>;
-	source(args: DebugProtocol.SourceArguments): TPromise<DebugProtocol.SourceResponse>;
+export interface IDebugger {
+	createDebugAdapter(root: IWorkspaceFolder, outputService: IOutputService, debugPort?: number): TPromise<IDebugAdapter>;
+	runInTerminal(args: DebugProtocol.RunInTerminalRequestArguments): TPromise<void>;
+	getCustomTelemetryService(): TPromise<TelemetryService>;
 }
 
-export enum SessionState {
-	ATTACH,
-	LAUNCH
+export type ActualBreakpoints = { [id: string]: DebugProtocol.Breakpoint };
+
+export enum State {
+	Inactive,
+	Initializing,
+	Stopped,
+	Running
 }
 
-export interface ISession extends ITreeElement {
-	getName(includeRoot: boolean): string;
+export class AdapterEndEvent {
+	error?: Error;
+	sessionLengthInSeconds: number;
+	emittedStopped: boolean;
+}
+
+export interface LoadedSourceEvent {
+	reason: string;
+	source: Source;
+}
+
+export interface IDebugSession extends ITreeElement, IDisposable {
+
 	readonly configuration: IConfig;
-	readonly raw: IRawSession;
-	readonly state: SessionState;
+	readonly unresolvedConfiguration: IConfig;
+	readonly state: State;
+	readonly root: IWorkspaceFolder;
+
+	getName(includeRoot: boolean): string;
+
 	getSourceForUri(modelUri: uri): Source;
+	getSource(raw: DebugProtocol.Source): Source;
+
+	rawUpdate(data: IRawModelUpdate): void;
+
+	// session events
+	onDidEndAdapter: Event<AdapterEndEvent>;
+	onDidChangeState: Event<State>;
+
+	// DA capabilities
+	readonly capabilities: DebugProtocol.Capabilities;
+
+	// DAP events
+
+	onDidLoadedSource: Event<LoadedSourceEvent>;
+	onDidCustomEvent: Event<DebugProtocol.Event>;
+
+	// DAP request
+
+	initialize(dbgr: IDebugger): TPromise<void>;
+	launchOrAttach(config: IConfig): TPromise<void>;
+	restart(): TPromise<DebugProtocol.RestartResponse>;
+	terminate(restart?: boolean /* false */): TPromise<void>;
+	disconnect(restart?: boolean /* false */): TPromise<void>;
+
+	sendBreakpoints(modelUri: uri, bpts: IBreakpoint[], sourceModified: boolean): TPromise<ActualBreakpoints | undefined>;
+	sendFunctionBreakpoints(fbps: IFunctionBreakpoint[]): TPromise<ActualBreakpoints | undefined>;
+	sendExceptionBreakpoints(exbpts: IExceptionBreakpoint[]): TPromise<any>;
+
+	stackTrace(threadId: number, startFrame: number, levels: number): TPromise<DebugProtocol.StackTraceResponse>;
+	exceptionInfo(threadId: number): TPromise<IExceptionInfo>;
+	scopes(frameId: number): TPromise<DebugProtocol.ScopesResponse>;
+	variables(variablesReference: number, filter: 'indexed' | 'named', start: number, count: number): TPromise<DebugProtocol.VariablesResponse>;
+	evaluate(expression: string, frameId?: number, context?: string): TPromise<DebugProtocol.EvaluateResponse>;
+	customRequest(request: string, args: any): TPromise<DebugProtocol.Response>;
+
+	restartFrame(frameId: number, threadId: number): TPromise<DebugProtocol.RestartFrameResponse>;
+	next(threadId: number): TPromise<DebugProtocol.NextResponse>;
+	stepIn(threadId: number): TPromise<DebugProtocol.StepInResponse>;
+	stepOut(threadId: number): TPromise<DebugProtocol.StepOutResponse>;
+	stepBack(threadId: number): TPromise<DebugProtocol.StepBackResponse>;
+	continue(threadId: number): TPromise<DebugProtocol.ContinueResponse>;
+	reverseContinue(threadId: number): TPromise<DebugProtocol.ReverseContinueResponse>;
+	pause(threadId: number): TPromise<DebugProtocol.PauseResponse>;
+	terminateThreads(threadIds: number[]): TPromise<DebugProtocol.TerminateThreadsResponse>;
+
+	completions(frameId: number, text: string, position: Position, overwriteBefore: number): TPromise<ISuggestion[]>;
+	setVariable(variablesReference: number, name: string, value: string): TPromise<DebugProtocol.SetVariableResponse>;
+	loadSource(resource: uri): TPromise<DebugProtocol.SourceResponse>;
+	getLoadedSources(): TPromise<Source[]>;
+
 	getThread(threadId: number): IThread;
 	getAllThreads(): ReadonlyArray<IThread>;
-	getSource(raw: DebugProtocol.Source): Source;
-	completions(frameId: number, text: string, position: Position, overwriteBefore: number): TPromise<ISuggestion[]>;
+	clearThreads(removeThreads: boolean, reference?: number): void;
 }
 
 export interface IThread extends ITreeElement {
@@ -159,7 +206,7 @@ export interface IThread extends ITreeElement {
 	/**
 	 * Process the thread belongs to
 	 */
-	readonly session: ISession;
+	readonly session: IDebugSession;
 
 	/**
 	 * Id of the thread generated by the debug adapter backend.
@@ -291,7 +338,7 @@ export interface IViewModel extends ITreeElement {
 	/**
 	 * Returns the focused debug session or null if no session is stopped.
 	 */
-	readonly focusedSession: ISession;
+	readonly focusedSession: IDebugSession;
 
 	/**
 	 * Returns the focused thread or null if no thread is stopped.
@@ -310,13 +357,13 @@ export interface IViewModel extends ITreeElement {
 
 	isMultiSessionView(): boolean;
 
-	onDidFocusSession: Event<ISession | undefined>;
+	onDidFocusSession: Event<IDebugSession | undefined>;
 	onDidFocusStackFrame: Event<{ stackFrame: IStackFrame, explicit: boolean }>;
 	onDidSelectExpression: Event<IExpression>;
 }
 
 export interface IModel extends ITreeElement {
-	getSessions(): ReadonlyArray<ISession>;
+	getSessions(): ReadonlyArray<IDebugSession>;
 	getBreakpoints(filter?: { uri?: uri, lineNumber?: number, column?: number, enabledOnly?: boolean }): ReadonlyArray<IBreakpoint>;
 	areBreakpointsActivated(): boolean;
 	getFunctionBreakpoints(): ReadonlyArray<IFunctionBreakpoint>;
@@ -340,15 +387,6 @@ export interface IBreakpointsChangeEvent {
 	sessionOnly?: boolean;
 }
 
-// Debug enums
-
-export enum State {
-	Inactive,
-	Initializing,
-	Stopped,
-	Running
-}
-
 // Debug configuration interfaces
 
 export interface IDebugConfiguration {
@@ -356,7 +394,6 @@ export interface IDebugConfiguration {
 	openDebug: 'neverOpen' | 'openOnSessionStart' | 'openOnFirstSessionStart' | 'openOnDebugBreak';
 	openExplorerOnEnd: boolean;
 	inlineValues: boolean;
-	hideActionBar: boolean;
 	toolBarLocation: 'floating' | 'docked' | 'hidden';
 	showInStatusBar: 'never' | 'always' | 'onFirstSessionStart';
 	internalConsoleOptions: 'neverOpen' | 'openOnSessionStart' | 'openOnFirstSessionStart';
@@ -372,8 +409,8 @@ export interface IGlobalConfig {
 
 export interface IEnvConfig {
 	internalConsoleOptions?: 'neverOpen' | 'openOnSessionStart' | 'openOnFirstSessionStart';
-	preLaunchTask?: string;
-	postDebugTask?: string;
+	preLaunchTask?: string | TaskIdentifier;
+	postDebugTask?: string | TaskIdentifier;
 	debugServer?: number;
 	noDebug?: boolean;
 }
@@ -393,6 +430,7 @@ export interface IConfig extends IEnvConfig {
 	// internals
 	__sessionId?: string;
 	__restart?: any;
+	__autoAttach?: boolean;
 	port?: number; // TODO
 }
 
@@ -409,7 +447,7 @@ export interface IDebugAdapter extends IDisposable {
 	startSession(): TPromise<void>;
 	sendMessage(message: DebugProtocol.ProtocolMessage): void;
 	sendResponse(response: DebugProtocol.Response): void;
-	sendRequest(command: string, args: any, clb: (result: DebugProtocol.Response) => void): void;
+	sendRequest(command: string, args: any, clb: (result: DebugProtocol.Response) => void, timemout?: number): void;
 	stopSession(): TPromise<void>;
 }
 
@@ -562,17 +600,13 @@ export interface ILaunch {
 	/**
 	 * Opens the launch.json file. Creates if it does not exist.
 	 */
-	openConfigFile(sideBySide: boolean, type?: string): TPromise<{ editor: IEditor, created: boolean }>;
+	openConfigFile(sideBySide: boolean, preserveFocus: boolean, type?: string): TPromise<{ editor: IEditor, created: boolean }>;
 }
 
 // Debug service interfaces
 
 export const IDebugService = createDecorator<IDebugService>(DEBUG_SERVICE_ID);
 
-export interface DebugEvent extends DebugProtocol.Event {
-	sessionId?: string;
-}
-
 export interface IDebugService {
 	_serviceBrand: any;
 
@@ -589,17 +623,17 @@ export interface IDebugService {
 	/**
 	 * Allows to register on new session events.
 	 */
-	onDidNewSession: Event<ISession>;
+	onDidNewSession: Event<IDebugSession>;
+
+	/**
+	 * Allows to register on sessions about to be created (not yet fully initialised)
+	 */
+	onWillNewSession: Event<IDebugSession>;
 
 	/**
 	 * Allows to register on end session events.
 	 */
-	onDidEndSession: Event<ISession>;
-
-	/**
-	 * Allows to register on custom DAP events.
-	 */
-	onDidCustomEvent: Event<DebugEvent>;
+	onDidEndSession: Event<IDebugSession>;
 
 	/**
 	 * Gets the current configuration manager.
@@ -609,7 +643,7 @@ export interface IDebugService {
 	/**
 	 * Sets the focused stack frame and evaluates all expressions against the newly focused stack frame,
 	 */
-	focusStackFrame(focusedStackFrame: IStackFrame, thread?: IThread, session?: ISession, explicit?: boolean): void;
+	focusStackFrame(focusedStackFrame: IStackFrame, thread?: IThread, session?: IDebugSession, explicit?: boolean): void;
 
 	/**
 	 * Adds new breakpoints to the model for the file specified with the uri. Notifies debug adapter of breakpoint changes.
@@ -656,6 +690,12 @@ export interface IDebugService {
 	 */
 	removeFunctionBreakpoints(id?: string): TPromise<void>;
 
+	/**
+	 * Sends all breakpoints to the passed session.
+	 * If session is not passed, sends all breakpoints to each session.
+	 */
+	sendAllBreakpoints(session?: IDebugSession): TPromise<any>;
+
 	/**
 	 * Adds a new expression to the repl.
 	 */
@@ -669,7 +709,7 @@ export interface IDebugService {
 	/**
 	 * Appends the passed string to the debug repl.
 	 */
-	logToRepl(value: string, sev?: severity): void;
+	logToRepl(value: string | IExpression, sev?: severity, source?: IReplElementSource): void;
 
 	/**
 	 * Adds a new watch expression and evaluates it against the debug adapter.
@@ -701,18 +741,23 @@ export interface IDebugService {
 	/**
 	 * Restarts a session or creates a new one if there is no active session.
 	 */
-	restartSession(session: ISession): TPromise<any>;
+	restartSession(session: IDebugSession, restartData?: any): TPromise<any>;
 
 	/**
 	 * Stops the session. If the session does not exist then stops all sessions.
 	 */
-	stopSession(session: ISession): TPromise<any>;
+	stopSession(session: IDebugSession): TPromise<any>;
 
 	/**
 	 * Makes unavailable all sources with the passed uri. Source will appear as grayed out in callstack view.
 	 */
 	sourceIsNotAvailable(uri: uri): void;
 
+	/**
+	 * returns Session with the given ID (or undefined if ID is not found)
+	 */
+	getSession(sessionId: string): IDebugSession;
+
 	/**
 	 * Gets the current debug model.
 	 */
@@ -722,10 +767,15 @@ export interface IDebugService {
 	 * Gets the current view model.
 	 */
 	getViewModel(): IViewModel;
+
+	/**
+	 * Try to auto focus the top stack frame of the passed thread.
+	 */
+	tryToAutoFocusStackFrame(thread: IThread): TPromise<any>;
 }
 
 // Editor interfaces
-export enum BreakpointWidgetContext {
+export const enum BreakpointWidgetContext {
 	CONDITION = 0,
 	HIT_COUNT = 1,
 	LOG_MESSAGE = 2
diff --git a/src/vs/workbench/parts/debug/common/debugModel.ts b/src/vs/workbench/parts/debug/common/debugModel.ts
index 6e8edd9f7cf..ec1f0121bd1 100644
--- a/src/vs/workbench/parts/debug/common/debugModel.ts
+++ b/src/vs/workbench/parts/debug/common/debugModel.ts
@@ -4,29 +4,26 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as nls from 'vs/nls';
-import uri from 'vs/base/common/uri';
+import { URI as uri } from 'vs/base/common/uri';
 import * as resources from 'vs/base/common/resources';
 import { TPromise } from 'vs/base/common/winjs.base';
 import * as lifecycle from 'vs/base/common/lifecycle';
 import { Event, Emitter } from 'vs/base/common/event';
 import { generateUuid } from 'vs/base/common/uuid';
-import * as errors from 'vs/base/common/errors';
 import { RunOnceScheduler } from 'vs/base/common/async';
 import severity from 'vs/base/common/severity';
 import { isObject, isString, isUndefinedOrNull } from 'vs/base/common/types';
 import { distinct } from 'vs/base/common/arrays';
 import { Range, IRange } from 'vs/editor/common/core/range';
-import { ISuggestion } from 'vs/editor/common/modes';
-import { Position } from 'vs/editor/common/core/position';
 import {
-	ITreeElement, IExpression, IExpressionContainer, ISession, IStackFrame, IExceptionBreakpoint, IBreakpoint, IFunctionBreakpoint, IModel, IReplElementSource,
-	IConfig, IRawSession, IThread, IRawModelUpdate, IScope, IRawStoppedDetails, IEnablement, IBreakpointData, IExceptionInfo, IReplElement, SessionState, IBreakpointsChangeEvent, IBreakpointUpdateData, IBaseBreakpoint
+	ITreeElement, IExpression, IExpressionContainer, IDebugSession, IStackFrame, IExceptionBreakpoint, IBreakpoint, IFunctionBreakpoint, IModel, IReplElementSource,
+	IThread, IRawModelUpdate, IScope, IRawStoppedDetails, IEnablement, IBreakpointData, IExceptionInfo, IReplElement, IBreakpointsChangeEvent, IBreakpointUpdateData, IBaseBreakpoint
 } from 'vs/workbench/parts/debug/common/debug';
 import { Source } from 'vs/workbench/parts/debug/common/debugSource';
-import { mixin } from 'vs/base/common/objects';
 import { commonSuffixLength } from 'vs/base/common/strings';
 import { sep } from 'vs/base/common/paths';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
+import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
 
 const MAX_REPL_LENGTH = 10000;
 
@@ -115,7 +112,7 @@ export class ExpressionContainer implements IExpressionContainer {
 	protected children: TPromise<IExpression[]>;
 
 	constructor(
-		protected session: ISession,
+		protected session: IDebugSession,
 		private _reference: number,
 		private id: string,
 		public namedVariables = 0,
@@ -188,16 +185,12 @@ export class ExpressionContainer implements IExpressionContainer {
 	}
 
 	private fetchVariables(start: number, count: number, filter: 'indexed' | 'named'): TPromise<Variable[]> {
-		return this.session.raw.variables({
-			variablesReference: this.reference,
-			start,
-			count,
-			filter
-		}).then(response => {
-			return response && response.body && response.body.variables ? distinct(response.body.variables.filter(v => !!v && isString(v.name)), v => v.name).map(
-				v => new Variable(this.session, this, v.variablesReference, v.name, v.evaluateName, v.value, v.namedVariables, v.indexedVariables, v.presentationHint, v.type)
-			) : [];
-		}, (e: Error) => [new Variable(this.session, this, 0, null, e.message, '', 0, 0, { kind: 'virtual' }, null, false)]);
+		return this.session.variables(this.reference, filter, start, count).then(response => {
+			return response && response.body && response.body.variables
+				? distinct(response.body.variables.filter(v => !!v && isString(v.name)), v => v.name).map(
+					v => new Variable(this.session, this, v.variablesReference, v.name, v.evaluateName, v.value, v.namedVariables, v.indexedVariables, v.presentationHint, v.type))
+				: [];
+		}, (e: Error) => [new Variable(this.session, this, 0, e.message, e.message, '', 0, 0, { kind: 'virtual' }, null, false)]);
 	}
 
 	// The adapter explicitly sents the children count of an expression only if there are lots of children which should be chunked.
@@ -233,7 +226,7 @@ export class Expression extends ExpressionContainer implements IExpression {
 		}
 	}
 
-	public evaluate(session: ISession, stackFrame: IStackFrame, context: string): TPromise<void> {
+	public evaluate(session: IDebugSession, stackFrame: IStackFrame, context: string): TPromise<void> {
 		if (!session || (!stackFrame && context !== 'repl')) {
 			this.value = context === 'repl' ? nls.localize('startDebugFirst', "Please start a debug session to evaluate") : Expression.DEFAULT_VALUE;
 			this.available = false;
@@ -243,11 +236,7 @@ export class Expression extends ExpressionContainer implements IExpression {
 		}
 
 		this.session = session;
-		return session.raw.evaluate({
-			expression: this.name,
-			frameId: stackFrame ? stackFrame.frameId : undefined,
-			context
-		}).then(response => {
+		return session.evaluate(this.name, stackFrame ? stackFrame.frameId : undefined, context).then(response => {
 			this.available = !!(response && response.body);
 			if (response && response.body) {
 				this.value = response.body.result;
@@ -274,7 +263,7 @@ export class Variable extends ExpressionContainer implements IExpression {
 	public errorMessage: string;
 
 	constructor(
-		session: ISession,
+		session: IDebugSession,
 		public parent: IExpressionContainer,
 		reference: number,
 		public name: string,
@@ -292,11 +281,7 @@ export class Variable extends ExpressionContainer implements IExpression {
 	}
 
 	public setVariable(value: string): TPromise<any> {
-		return this.session.raw.setVariable({
-			name: this.name,
-			value,
-			variablesReference: (<ExpressionContainer>this.parent).reference
-		}).then(response => {
+		return this.session.setVariable((<ExpressionContainer>this.parent).reference, name, value).then(response => {
 			if (response && response.body) {
 				this.value = response.body.value;
 				this.type = response.body.type || this.type;
@@ -352,7 +337,7 @@ export class StackFrame implements IStackFrame {
 
 	public getScopes(): TPromise<IScope[]> {
 		if (!this.scopes) {
-			this.scopes = this.thread.session.raw.scopes({ frameId: this.frameId }).then(response => {
+			this.scopes = this.thread.session.scopes(this.frameId).then(response => {
 				return response && response.body && response.body.scopes ?
 					response.body.scopes.map((rs, index) => new Scope(this, index, rs.name, rs.variablesReference, rs.expensive, rs.namedVariables, rs.indexedVariables,
 						rs.line && rs.column && rs.endLine && rs.endColumn ? new Range(rs.line, rs.column, rs.endLine, rs.endColumn) : null)) : [];
@@ -393,7 +378,7 @@ export class StackFrame implements IStackFrame {
 	}
 
 	public restart(): TPromise<any> {
-		return this.thread.session.raw.restartFrame({ frameId: this.frameId }, this.thread.threadId);
+		return this.thread.session.restartFrame(this.frameId, this.thread.threadId);
 	}
 
 	public toString(): string {
@@ -412,7 +397,7 @@ export class Thread implements IThread {
 	public stoppedDetails: IRawStoppedDetails;
 	public stopped: boolean;
 
-	constructor(public session: ISession, public name: string, public threadId: number) {
+	constructor(public session: IDebugSession, public name: string, public threadId: number) {
 		this.stoppedDetails = null;
 		this.callStack = [];
 		this.staleCallStack = [];
@@ -461,7 +446,7 @@ export class Thread implements IThread {
 	}
 
 	private getCallStackImpl(startFrame: number, levels: number): TPromise<IStackFrame[]> {
-		return this.session.raw.stackTrace({ threadId: this.threadId, startFrame, levels }).then(response => {
+		return this.session.stackTrace(this.threadId, startFrame, levels).then(response => {
 			if (!response || !response.body) {
 				return [];
 			}
@@ -493,223 +478,48 @@ export class Thread implements IThread {
 	 * Returns exception info promise if the exception was thrown, otherwise null
 	 */
 	public get exceptionInfo(): TPromise<IExceptionInfo> {
-		const session = this.session.raw;
 		if (this.stoppedDetails && this.stoppedDetails.reason === 'exception') {
-			if (!session.capabilities.supportsExceptionInfoRequest) {
-				return TPromise.as({
-					description: this.stoppedDetails.text,
-					breakMode: null
-				});
+			if (this.session.capabilities.supportsExceptionInfoRequest) {
+				return this.session.exceptionInfo(this.threadId);
 			}
-
-			return session.exceptionInfo({ threadId: this.threadId }).then(exception => {
-				if (!exception) {
-					return null;
-				}
-
-				return {
-					id: exception.body.exceptionId,
-					description: exception.body.description,
-					breakMode: exception.body.breakMode,
-					details: exception.body.details
-				};
+			return TPromise.as({
+				description: this.stoppedDetails.text,
+				breakMode: null
 			});
 		}
-
 		return TPromise.as(null);
 	}
 
 	public next(): TPromise<any> {
-		return this.session.raw.next({ threadId: this.threadId });
+		return this.session.next(this.threadId);
 	}
 
 	public stepIn(): TPromise<any> {
-		return this.session.raw.stepIn({ threadId: this.threadId });
+		return this.session.stepIn(this.threadId);
 	}
 
 	public stepOut(): TPromise<any> {
-		return this.session.raw.stepOut({ threadId: this.threadId });
+		return this.session.stepOut(this.threadId);
 	}
 
 	public stepBack(): TPromise<any> {
-		return this.session.raw.stepBack({ threadId: this.threadId });
+		return this.session.stepBack(this.threadId);
 	}
 
 	public continue(): TPromise<any> {
-		return this.session.raw.continue({ threadId: this.threadId });
+		return this.session.continue(this.threadId);
 	}
 
 	public pause(): TPromise<any> {
-		return this.session.raw.pause({ threadId: this.threadId });
+		return this.session.pause(this.threadId);
 	}
 
 	public terminate(): TPromise<any> {
-		return this.session.raw.terminateThreads({ threadIds: [this.threadId] });
+		return this.session.terminateThreads([this.threadId]);
 	}
 
 	public reverseContinue(): TPromise<any> {
-		return this.session.raw.reverseContinue({ threadId: this.threadId });
-	}
-}
-
-export class Session implements ISession {
-
-	private sources: Map<string, Source>;
-	private threads: Map<number, Thread>;
-
-	constructor(private _configuration: { resolved: IConfig, unresolved: IConfig }, private session: IRawSession & ITreeElement) {
-		this.threads = new Map<number, Thread>();
-		this.sources = new Map<string, Source>();
-	}
-
-	public get configuration(): IConfig {
-		return this._configuration.resolved;
-	}
-
-	public get unresolvedConfiguration(): IConfig {
-		return this._configuration.unresolved;
-	}
-
-	public get raw(): IRawSession & ITreeElement {
-		return this.session;
-	}
-
-	public set raw(value: IRawSession & ITreeElement) {
-		this.session = value;
-	}
-
-	public getName(includeRoot: boolean): string {
-		return includeRoot && this.raw.root ? `${this.configuration.name} (${resources.basenameOrAuthority(this.raw.root.uri)})` : this.configuration.name;
-	}
-
-	public get state(): SessionState {
-		return this.configuration.type === 'attach' ? SessionState.ATTACH : SessionState.LAUNCH;
-	}
-
-	public getSourceForUri(modelUri: uri): Source {
-		return this.sources.get(modelUri.toString());
-	}
-
-	public getSource(raw: DebugProtocol.Source): Source {
-		let source = new Source(raw, this.getId());
-		if (this.sources.has(source.uri.toString())) {
-			source = this.sources.get(source.uri.toString());
-			source.raw = mixin(source.raw, raw);
-			if (source.raw && raw) {
-				// Always take the latest presentation hint from adapter #42139
-				source.raw.presentationHint = raw.presentationHint;
-			}
-		} else {
-			this.sources.set(source.uri.toString(), source);
-		}
-
-		return source;
-	}
-
-	public getThread(threadId: number): Thread {
-		return this.threads.get(threadId);
-	}
-
-	public getAllThreads(): IThread[] {
-		const result: IThread[] = [];
-		this.threads.forEach(t => result.push(t));
-		return result;
-	}
-
-	public getId(): string {
-		return this.session.getId();
-	}
-
-	public rawUpdate(data: IRawModelUpdate): void {
-
-		if (data.thread && !this.threads.has(data.threadId)) {
-			// A new thread came in, initialize it.
-			this.threads.set(data.threadId, new Thread(this, data.thread.name, data.thread.id));
-		} else if (data.thread && data.thread.name) {
-			// Just the thread name got updated #18244
-			this.threads.get(data.threadId).name = data.thread.name;
-		}
-
-		if (data.stoppedDetails) {
-			// Set the availability of the threads' callstacks depending on
-			// whether the thread is stopped or not
-			if (data.stoppedDetails.allThreadsStopped) {
-				this.threads.forEach(thread => {
-					thread.stoppedDetails = thread.threadId === data.threadId ? data.stoppedDetails : { reason: undefined };
-					thread.stopped = true;
-					thread.clearCallStack();
-				});
-			} else if (this.threads.has(data.threadId)) {
-				// One thread is stopped, only update that thread.
-				const thread = this.threads.get(data.threadId);
-				thread.stoppedDetails = data.stoppedDetails;
-				thread.clearCallStack();
-				thread.stopped = true;
-			}
-		}
-	}
-
-	public clearThreads(removeThreads: boolean, reference: number = undefined): void {
-		if (reference !== undefined && reference !== null) {
-			if (this.threads.has(reference)) {
-				const thread = this.threads.get(reference);
-				thread.clearCallStack();
-				thread.stoppedDetails = undefined;
-				thread.stopped = false;
-
-				if (removeThreads) {
-					this.threads.delete(reference);
-				}
-			}
-		} else {
-			this.threads.forEach(thread => {
-				thread.clearCallStack();
-				thread.stoppedDetails = undefined;
-				thread.stopped = false;
-			});
-
-			if (removeThreads) {
-				this.threads.clear();
-				ExpressionContainer.allValues.clear();
-			}
-		}
-	}
-
-	public completions(frameId: number, text: string, position: Position, overwriteBefore: number): TPromise<ISuggestion[]> {
-		if (!this.raw.capabilities.supportsCompletionsRequest) {
-			return TPromise.as([]);
-		}
-
-		return this.raw.completions({
-			frameId,
-			text,
-			column: position.column,
-			line: position.lineNumber
-		}).then(response => {
-			const result: ISuggestion[] = [];
-			if (response && response.body && response.body.targets) {
-				response.body.targets.forEach(item => {
-					if (item && item.label) {
-						result.push({
-							label: item.label,
-							insertText: item.text || item.label,
-							type: item.type,
-							filterText: item.start && item.length && text.substr(item.start, item.length).concat(item.label),
-							overwriteBefore: item.length || overwriteBefore
-						});
-					}
-				});
-			}
-
-			return result;
-		}, () => []);
-	}
-
-	setNotAvailable(modelUri: uri) {
-		const source = this.sources.get(modelUri.toString());
-		if (source) {
-			source.available = false;
-		}
+		return this.session.reverseContinue(this.threadId);
 	}
 }
 
@@ -786,6 +596,7 @@ export class Breakpoint extends BaseBreakpoint implements IBreakpoint {
 		hitCondition: string,
 		logMessage: string,
 		private _adapterData: any,
+		private textFileService: ITextFileService,
 		id = generateUuid()
 	) {
 		super(enabled, hitCondition, condition, logMessage, id);
@@ -793,7 +604,16 @@ export class Breakpoint extends BaseBreakpoint implements IBreakpoint {
 
 	public get lineNumber(): number {
 		const data = this.getSessionData();
-		return data && typeof data.line === 'number' ? data.line : this._lineNumber;
+		return this.verified && data && typeof data.line === 'number' ? data.line : this._lineNumber;
+	}
+
+	public get verified(): boolean {
+		const data = this.getSessionData();
+		if (data) {
+			return data.verified && !this.textFileService.isDirty(this.uri);
+		}
+
+		return true;
 	}
 
 	public get column(): number {
@@ -804,7 +624,14 @@ export class Breakpoint extends BaseBreakpoint implements IBreakpoint {
 
 	public get message(): string {
 		const data = this.getSessionData();
-		return data ? data.message : undefined;
+		if (!data) {
+			return undefined;
+		}
+		if (this.textFileService.isDirty(this.uri)) {
+			return nls.localize('breakpointDirtydHover', "Unverified breakpoint. File is modified, please restart debug session.");
+		}
+
+		return data.message;
 	}
 
 	public get adapterData(): any {
@@ -859,7 +686,8 @@ export class FunctionBreakpoint extends BaseBreakpoint implements IFunctionBreak
 		hitCondition: string,
 		condition: string,
 		logMessage: string,
-		id = generateUuid()) {
+		id = generateUuid()
+	) {
 		super(enabled, hitCondition, condition, logMessage, id);
 	}
 
@@ -897,7 +725,7 @@ export class ThreadAndSessionIds implements ITreeElement {
 
 export class Model implements IModel {
 
-	private sessions: Session[];
+	private sessions: IDebugSession[];
 	private toDispose: lifecycle.IDisposable[];
 	private replElements: IReplElement[];
 	private schedulers = new Map<string, RunOnceScheduler>();
@@ -912,7 +740,8 @@ export class Model implements IModel {
 		private breakpointsActivated: boolean,
 		private functionBreakpoints: FunctionBreakpoint[],
 		private exceptionBreakpoints: ExceptionBreakpoint[],
-		private watchExpressions: Expression[]
+		private watchExpressions: Expression[],
+		private textFileService: ITextFileService
 	) {
 		this.sessions = [];
 		this.replElements = [];
@@ -927,15 +756,12 @@ export class Model implements IModel {
 		return 'root';
 	}
 
-	public getSessions(): Session[] {
+	public getSessions(): IDebugSession[] {
 		return this.sessions;
 	}
 
-	public addSession(configuration: { resolved: IConfig, unresolved: IConfig }, raw: IRawSession & ITreeElement): Session {
-		const session = new Session(configuration, raw);
+	public addSession(session: IDebugSession): void {
 		this.sessions.push(session);
-
-		return session;
 	}
 
 	public removeSession(id: string): void {
@@ -979,12 +805,12 @@ export class Model implements IModel {
 	}
 
 	public fetchCallStack(thread: Thread): TPromise<void> {
-		if (thread.session.raw.capabilities.supportsDelayedStackTraceLoading) {
+		if (thread.session.capabilities.supportsDelayedStackTraceLoading) {
 			// For improved performance load the first stack frame and then load the rest async.
 			return thread.fetchCallStack(1).then(() => {
 				if (!this.schedulers.has(thread.getId())) {
 					this.schedulers.set(thread.getId(), new RunOnceScheduler(() => {
-						thread.fetchCallStack(19).done(() => this._onDidChangeCallStack.fire(), errors.onUnexpectedError);
+						thread.fetchCallStack(19).then(() => this._onDidChangeCallStack.fire());
 					}, 420));
 				}
 
@@ -1053,7 +879,7 @@ export class Model implements IModel {
 	}
 
 	public addBreakpoints(uri: uri, rawData: IBreakpointData[], fireEvent = true): IBreakpoint[] {
-		const newBreakpoints = rawData.map(rawBp => new Breakpoint(uri, rawBp.lineNumber, rawBp.column, rawBp.enabled, rawBp.condition, rawBp.hitCondition, rawBp.logMessage, undefined, rawBp.id));
+		const newBreakpoints = rawData.map(rawBp => new Breakpoint(uri, rawBp.lineNumber, rawBp.column, rawBp.enabled, rawBp.condition, rawBp.hitCondition, rawBp.logMessage, undefined, this.textFileService, rawBp.id));
 		newBreakpoints.forEach(bp => bp.setSessionId(this.breakpointsSessionId));
 		this.breakpoints = this.breakpoints.concat(newBreakpoints);
 		this.breakpointsActivated = true;
@@ -1192,7 +1018,7 @@ export class Model implements IModel {
 		return this.replElements;
 	}
 
-	public addReplExpression(session: ISession, stackFrame: IStackFrame, name: string): TPromise<void> {
+	public addReplExpression(session: IDebugSession, stackFrame: IStackFrame, name: string): TPromise<void> {
 		const expression = new Expression(name);
 		this.addReplElements([expression]);
 		return expression.evaluate(session, stackFrame, 'repl')
@@ -1269,7 +1095,7 @@ export class Model implements IModel {
 	}
 
 	public sourceIsNotAvailable(uri: uri): void {
-		this.sessions.forEach(p => p.setNotAvailable(uri));
+		this.sessions.forEach(p => p.getSourceForUri(uri).available = false);
 		this._onDidChangeCallStack.fire();
 	}
 
diff --git a/src/vs/workbench/parts/debug/common/debugProtocol.d.ts b/src/vs/workbench/parts/debug/common/debugProtocol.d.ts
index 62b866aa293..5bec6d838af 100644
--- a/src/vs/workbench/parts/debug/common/debugProtocol.d.ts
+++ b/src/vs/workbench/parts/debug/common/debugProtocol.d.ts
@@ -18,7 +18,7 @@ declare module DebugProtocol {
 		type: string;
 	}
 
-	/** A client or server-initiated request. */
+	/** A client or debug adapter initiated request. */
 	export interface Request extends ProtocolMessage {
 		// type: 'request';
 		/** The command to execute. */
@@ -27,7 +27,7 @@ declare module DebugProtocol {
 		arguments?: any;
 	}
 
-	/** Server-initiated event. */
+	/** A debug adapter initiated event. */
 	export interface Event extends ProtocolMessage {
 		// type: 'event';
 		/** Type of event. */
@@ -36,7 +36,7 @@ declare module DebugProtocol {
 		body?: any;
 	}
 
-	/** Response to a request. */
+	/** Response for a request. */
 	export interface Response extends ProtocolMessage {
 		// type: 'response';
 		/** Sequence number of the corresponding request. */
@@ -51,16 +51,24 @@ declare module DebugProtocol {
 		body?: any;
 	}
 
+	/** On error (whenever 'success' is false), the body can provide more details. */
+	export interface ErrorResponse extends Response {
+		body: {
+			/** An optional, structured error message. */
+			error?: Message;
+		};
+	}
+
 	/** Event message for 'initialized' event type.
 		This event indicates that the debug adapter is ready to accept configuration requests (e.g. SetBreakpointsRequest, SetExceptionBreakpointsRequest).
-		A debug adapter is expected to send this event when it is ready to accept configuration requests (but not before the InitializeRequest has finished).
+		A debug adapter is expected to send this event when it is ready to accept configuration requests (but not before the 'initialize' request has finished).
 		The sequence of events/requests is as follows:
-		- adapters sends InitializedEvent (after the InitializeRequest has returned)
-		- frontend sends zero or more SetBreakpointsRequest
-		- frontend sends one SetFunctionBreakpointsRequest
-		- frontend sends a SetExceptionBreakpointsRequest if one or more exceptionBreakpointFilters have been defined (or if supportsConfigurationDoneRequest is not defined or false)
+		- adapters sends 'initialized' event (after the 'initialize' request has returned)
+		- frontend sends zero or more 'setBreakpoints' requests
+		- frontend sends one 'setFunctionBreakpoints' request
+		- frontend sends a 'setExceptionBreakpoints' request if one or more 'exceptionBreakpointFilters' have been defined (or if 'supportsConfigurationDoneRequest' is not defined or false)
 		- frontend sends other future configuration requests
-		- frontend sends one ConfigurationDoneRequest to indicate the end of the configuration
+		- frontend sends one 'configurationDone' request to indicate the end of the configuration.
 	*/
 	export interface InitializedEvent extends Event {
 		// event: 'initialized';
@@ -75,10 +83,10 @@ declare module DebugProtocol {
 		body: {
 			/** The reason for the event.
 				For backward compatibility this string is shown in the UI if the 'description' attribute is missing (but it must not be translated).
-				Values: 'step', 'breakpoint', 'exception', 'pause', 'entry', etc.
+				Values: 'step', 'breakpoint', 'exception', 'pause', 'entry', 'goto', etc.
 			*/
 			reason: string;
-			/** The full reason for the event, e.g. 'Paused on exception'. This string is shown in the UI as is. */
+			/** The full reason for the event, e.g. 'Paused on exception'. This string is shown in the UI as is and must be translated. */
 			description?: string;
 			/** The thread which was stopped. */
 			threadId?: number;
@@ -86,9 +94,9 @@ declare module DebugProtocol {
 			preserveFocusHint?: boolean;
 			/** Additional information. E.g. if reason is 'exception', text contains the exception name. This string is shown in the UI. */
 			text?: string;
-			/** If allThreadsStopped is true, a debug adapter can announce that all threads have stopped.
-				*  The client should use this information to enable that all threads can be expanded to access their stacktraces.
-				*  If the attribute is missing or false, only the thread with the given threadId can be expanded.
+			/** If 'allThreadsStopped' is true, a debug adapter can announce that all threads have stopped.
+				- The client should use this information to enable that all threads can be expanded to access their stacktraces.
+				- If the attribute is missing or false, only the thread with the given threadId can be expanded.
 			*/
 			allThreadsStopped?: boolean;
 		};
@@ -97,20 +105,20 @@ declare module DebugProtocol {
 	/** Event message for 'continued' event type.
 		The event indicates that the execution of the debuggee has continued.
 		Please note: a debug adapter is not expected to send this event in response to a request that implies that execution continues, e.g. 'launch' or 'continue'.
-		It is only necessary to send a ContinuedEvent if there was no previous request that implied this.
+		It is only necessary to send a 'continued' event if there was no previous request that implied this.
 	*/
 	export interface ContinuedEvent extends Event {
 		// event: 'continued';
 		body: {
 			/** The thread which was continued. */
 			threadId: number;
-			/** If allThreadsContinued is true, a debug adapter can announce that all threads have continued. */
+			/** If 'allThreadsContinued' is true, a debug adapter can announce that all threads have continued. */
 			allThreadsContinued?: boolean;
 		};
 	}
 
 	/** Event message for 'exited' event type.
-		The event indicates that the debuggee has exited.
+		The event indicates that the debuggee has exited and returns its exit code.
 	*/
 	export interface ExitedEvent extends Event {
 		// event: 'exited';
@@ -120,8 +128,8 @@ declare module DebugProtocol {
 		};
 	}
 
-	/** Event message for 'terminated' event types.
-		The event indicates that debugging of the debuggee has terminated.
+	/** Event message for 'terminated' event type.
+		The event indicates that debugging of the debuggee has terminated. This does **not** mean that the debuggee itself has exited.
 	*/
 	export interface TerminatedEvent extends Event {
 		// event: 'terminated';
@@ -160,7 +168,7 @@ declare module DebugProtocol {
 			category?: string;
 			/** The output to report. */
 			output: string;
-			/** If an attribute 'variablesReference' exists and its value is > 0, the output contains objects which can be retrieved by passing variablesReference to the VariablesRequest. */
+			/** If an attribute 'variablesReference' exists and its value is > 0, the output contains objects which can be retrieved by passing 'variablesReference' to the 'variables' request. */
 			variablesReference?: number;
 			/** An optional source location where the output was produced. */
 			source?: Source;
@@ -249,8 +257,8 @@ declare module DebugProtocol {
 		};
 	}
 
-	/** runInTerminal request; value of command field is 'runInTerminal'.
-		With this request a debug adapter can run a command in a terminal.
+	/** RunInTerminal request; value of command field is 'runInTerminal'.
+		This request is sent from the debug adapter to the client to run a command in a terminal. This is typically used to launch the debuggee in a terminal provided by the client.
 	*/
 	export interface RunInTerminalRequest extends Request {
 		// command: 'runInTerminal';
@@ -271,7 +279,7 @@ declare module DebugProtocol {
 		env?: { [key: string]: string | null; };
 	}
 
-	/** Response to Initialize request. */
+	/** Response to 'runInTerminal' request. */
 	export interface RunInTerminalResponse extends Response {
 		body: {
 			/** The process ID. */
@@ -279,15 +287,11 @@ declare module DebugProtocol {
 		};
 	}
 
-	/** On error that is whenever 'success' is false, the body can provide more details. */
-	export interface ErrorResponse extends Response {
-		body: {
-			/** An optional, structured error message. */
-			error?: Message;
-		};
-	}
-
-	/** Initialize request; value of command field is 'initialize'. */
+	/** Initialize request; value of command field is 'initialize'.
+		The 'initialize' request is sent as the first request from the client to the debug adapter in order to configure it with client capabilities and to retrieve capabilities from the debug adapter.
+		Until the debug adapter has responded to with an 'initialize' response, the client must not send any additional requests or events to the debug adapter. In addition the debug adapter is not allowed to send any requests or events to the client until it has responded with an 'initialize' response.
+		The 'initialize' request may only be sent once.
+	*/
 	export interface InitializeRequest extends Request {
 		// command: 'initialize';
 		arguments: InitializeRequestArguments;
@@ -326,16 +330,14 @@ declare module DebugProtocol {
 	}
 
 	/** ConfigurationDone request; value of command field is 'configurationDone'.
-		The client of the debug protocol must send this request at the end of the sequence of configuration requests (which was started by the InitializedEvent).
+		The client of the debug protocol must send this request at the end of the sequence of configuration requests (which was started by the 'initialized' event).
 	*/
 	export interface ConfigurationDoneRequest extends Request {
 		// command: 'configurationDone';
 		arguments?: ConfigurationDoneArguments;
 	}
 
-	/** Arguments for 'configurationDone' request.
-		The configurationDone request has no standardized attributes.
-	*/
+	/** Arguments for 'configurationDone' request. */
 	export interface ConfigurationDoneArguments {
 	}
 
@@ -343,7 +345,9 @@ declare module DebugProtocol {
 	export interface ConfigurationDoneResponse extends Response {
 	}
 
-	/** Launch request; value of command field is 'launch'. */
+	/** Launch request; value of command field is 'launch'.
+		The launch request is sent from the client to the debug adapter to start the debuggee with or without debugging (if 'noDebug' is true). Since launching is debugger/runtime specific, the arguments for this request are not part of this specification.
+	*/
 	export interface LaunchRequest extends Request {
 		// command: 'launch';
 		arguments: LaunchRequestArguments;
@@ -364,7 +368,9 @@ declare module DebugProtocol {
 	export interface LaunchResponse extends Response {
 	}
 
-	/** Attach request; value of command field is 'attach'. */
+	/** Attach request; value of command field is 'attach'.
+		The attach request is sent from the client to the debug adapter to attach to a debuggee that is already running. Since attaching is debugger/runtime specific, the arguments for this request are not part of this specification.
+	*/
 	export interface AttachRequest extends Request {
 		// command: 'attach';
 		arguments: AttachRequestArguments;
@@ -394,9 +400,7 @@ declare module DebugProtocol {
 		arguments?: RestartArguments;
 	}
 
-	/** Arguments for 'restart' request.
-		The restart request has no standardized attributes.
-	*/
+	/** Arguments for 'restart' request. */
 	export interface RestartArguments {
 	}
 
@@ -404,7 +408,9 @@ declare module DebugProtocol {
 	export interface RestartResponse extends Response {
 	}
 
-	/** Disconnect request; value of command field is 'disconnect'. */
+	/** Disconnect request; value of command field is 'disconnect'.
+		The 'disconnect' request is sent from the client to the debug adapter in order to stop debugging. It asks the debug adapter to disconnect from the debuggee and to terminate the debug adapter. If the debuggee has been started with the 'launch' request, the 'disconnect' request terminates the debuggee. If the 'attach' request was used to connect to the debuggee, 'disconnect' does not terminate the debuggee. This behavior can be controlled with the 'terminateDebuggee' (if supported by the debug adapter).
+	*/
 	export interface DisconnectRequest extends Request {
 		// command: 'disconnect';
 		arguments?: DisconnectArguments;
@@ -412,6 +418,8 @@ declare module DebugProtocol {
 
 	/** Arguments for 'disconnect' request. */
 	export interface DisconnectArguments {
+		/** A value of true indicates that this 'disconnect' request is part of a restart sequence. */
+		restart?: boolean;
 		/** Indicates whether the debuggee should be terminated when the debugger is disconnected.
 			If unspecified, the debug adapter is free to do whatever it thinks is best.
 			A client can only rely on this attribute being properly honored if a debug adapter returns true for the 'supportTerminateDebuggee' capability.
@@ -423,10 +431,28 @@ declare module DebugProtocol {
 	export interface DisconnectResponse extends Response {
 	}
 
+	/** Terminate request; value of command field is 'terminate'.
+		The 'terminate' request is sent from the client to the debug adapter in order to give the debuggee a chance for terminating itself.
+	*/
+	export interface TerminateRequest extends Request {
+		// command: 'terminate';
+		arguments?: TerminateArguments;
+	}
+
+	/** Arguments for 'terminate' request. */
+	export interface TerminateArguments {
+		/** A value of true indicates that this 'terminate' request is part of a restart sequence. */
+		restart?: boolean;
+	}
+
+	/** Response to 'terminate' request. This is just an acknowledgement, so no body field is required. */
+	export interface TerminateResponse extends Response {
+	}
+
 	/** SetBreakpoints request; value of command field is 'setBreakpoints'.
 		Sets multiple breakpoints for a single source and clears all previous breakpoints in that source.
 		To clear all breakpoint for a source, specify an empty array.
-		When a breakpoint is hit, a StoppedEvent (event type 'breakpoint') is generated.
+		When a breakpoint is hit, a 'stopped' event (with reason 'breakpoint') is generated.
 	*/
 	export interface SetBreakpointsRequest extends Request {
 		// command: 'setBreakpoints';
@@ -435,7 +461,7 @@ declare module DebugProtocol {
 
 	/** Arguments for 'setBreakpoints' request. */
 	export interface SetBreakpointsArguments {
-		/** The source location of the breakpoints; either source.path or source.reference must be specified. */
+		/** The source location of the breakpoints; either 'source.path' or 'source.reference' must be specified. */
 		source: Source;
 		/** The code locations of the breakpoints. */
 		breakpoints?: SourceBreakpoint[];
@@ -449,11 +475,11 @@ declare module DebugProtocol {
 		Returned is information about each breakpoint created by this request.
 		This includes the actual code location and whether the breakpoint could be verified.
 		The breakpoints returned are in the same order as the elements of the 'breakpoints'
-		(or the deprecated 'lines') in the SetBreakpointsArguments.
+		(or the deprecated 'lines') array in the arguments.
 	*/
 	export interface SetBreakpointsResponse extends Response {
 		body: {
-			/** Information about the breakpoints. The array elements are in the same order as the elements of the 'breakpoints' (or the deprecated 'lines') in the SetBreakpointsArguments. */
+			/** Information about the breakpoints. The array elements are in the same order as the elements of the 'breakpoints' (or the deprecated 'lines') array in the arguments. */
 			breakpoints: Breakpoint[];
 		};
 	}
@@ -461,7 +487,7 @@ declare module DebugProtocol {
 	/** SetFunctionBreakpoints request; value of command field is 'setFunctionBreakpoints'.
 		Sets multiple function breakpoints and clears all previous function breakpoints.
 		To clear all function breakpoint, specify an empty array.
-		When a function breakpoint is hit, a StoppedEvent (event type 'function breakpoint') is generated.
+		When a function breakpoint is hit, a 'stopped' event (event type 'function breakpoint') is generated.
 	*/
 	export interface SetFunctionBreakpointsRequest extends Request {
 		// command: 'setFunctionBreakpoints';
@@ -485,7 +511,7 @@ declare module DebugProtocol {
 	}
 
 	/** SetExceptionBreakpoints request; value of command field is 'setExceptionBreakpoints'.
-		The request configures the debuggers response to thrown exceptions. If an exception is configured to break, a StoppedEvent is fired (event type 'exception').
+		The request configures the debuggers response to thrown exceptions. If an exception is configured to break, a 'stopped' event is fired (with reason 'exception').
 	*/
 	export interface SetExceptionBreakpointsRequest extends Request {
 		// command: 'setExceptionBreakpoints';
@@ -514,21 +540,21 @@ declare module DebugProtocol {
 
 	/** Arguments for 'continue' request. */
 	export interface ContinueArguments {
-		/** Continue execution for the specified thread (if possible). If the backend cannot continue on a single thread but will continue on all threads, it should set the allThreadsContinued attribute in the response to true. */
+		/** Continue execution for the specified thread (if possible). If the backend cannot continue on a single thread but will continue on all threads, it should set the 'allThreadsContinued' attribute in the response to true. */
 		threadId: number;
 	}
 
 	/** Response to 'continue' request. */
 	export interface ContinueResponse extends Response {
 		body: {
-			/** If true, the continue request has ignored the specified thread and continued all threads instead. If this attribute is missing a value of 'true' is assumed for backward compatibility. */
+			/** If true, the 'continue' request has ignored the specified thread and continued all threads instead. If this attribute is missing a value of 'true' is assumed for backward compatibility. */
 			allThreadsContinued?: boolean;
 		};
 	}
 
 	/** Next request; value of command field is 'next'.
 		The request starts the debuggee to run again for one step.
-		The debug adapter first sends the NextResponse and then a StoppedEvent (event type 'step') after the step has completed.
+		The debug adapter first sends the response and then a 'stopped' event (with reason 'step') after the step has completed.
 	*/
 	export interface NextRequest extends Request {
 		// command: 'next';
@@ -548,7 +574,7 @@ declare module DebugProtocol {
 	/** StepIn request; value of command field is 'stepIn'.
 		The request starts the debuggee to step into a function/method if possible.
 		If it cannot step into a target, 'stepIn' behaves like 'next'.
-		The debug adapter first sends the StepInResponse and then a StoppedEvent (event type 'step') after the step has completed.
+		The debug adapter first sends the response and then a 'stopped' event (with reason 'step') after the step has completed.
 		If there are multiple function/method calls (or other targets) on the source line,
 		the optional argument 'targetId' can be used to control into which target the 'stepIn' should occur.
 		The list of possible targets for a given source line can be retrieved via the 'stepInTargets' request.
@@ -572,7 +598,7 @@ declare module DebugProtocol {
 
 	/** StepOut request; value of command field is 'stepOut'.
 		The request starts the debuggee to run again for one step.
-		The debug adapter first sends the StepOutResponse and then a StoppedEvent (event type 'step') after the step has completed.
+		The debug adapter first sends the response and then a 'stopped' event (with reason 'step') after the step has completed.
 	*/
 	export interface StepOutRequest extends Request {
 		// command: 'stepOut';
@@ -591,7 +617,7 @@ declare module DebugProtocol {
 
 	/** StepBack request; value of command field is 'stepBack'.
 		The request starts the debuggee to run one step backwards.
-		The debug adapter first sends the StepBackResponse and then a StoppedEvent (event type 'step') after the step has completed. Clients should only call this request if the capability supportsStepBack is true.
+		The debug adapter first sends the response and then a 'stopped' event (with reason 'step') after the step has completed. Clients should only call this request if the capability 'supportsStepBack' is true.
 	*/
 	export interface StepBackRequest extends Request {
 		// command: 'stepBack';
@@ -609,7 +635,7 @@ declare module DebugProtocol {
 	}
 
 	/** ReverseContinue request; value of command field is 'reverseContinue'.
-		The request starts the debuggee to run backward. Clients should only call this request if the capability supportsStepBack is true.
+		The request starts the debuggee to run backward. Clients should only call this request if the capability 'supportsStepBack' is true.
 	*/
 	export interface ReverseContinueRequest extends Request {
 		// command: 'reverseContinue';
@@ -628,7 +654,7 @@ declare module DebugProtocol {
 
 	/** RestartFrame request; value of command field is 'restartFrame'.
 		The request restarts execution of the specified stackframe.
-		The debug adapter first sends the RestartFrameResponse and then a StoppedEvent (event type 'restart') after the restart has completed.
+		The debug adapter first sends the response and then a 'stopped' event (with reason 'restart') after the restart has completed.
 	*/
 	export interface RestartFrameRequest extends Request {
 		// command: 'restartFrame';
@@ -649,7 +675,7 @@ declare module DebugProtocol {
 		The request sets the location where the debuggee will continue to run.
 		This makes it possible to skip the execution of code or to executed code again.
 		The code between the current location and the goto target is not executed but skipped.
-		The debug adapter first sends the GotoResponse and then a StoppedEvent (event type 'goto').
+		The debug adapter first sends the response and then a 'stopped' event with reason 'goto'.
 	*/
 	export interface GotoRequest extends Request {
 		// command: 'goto';
@@ -670,7 +696,7 @@ declare module DebugProtocol {
 
 	/** Pause request; value of command field is 'pause'.
 		The request suspenses the debuggee.
-		The debug adapter first sends the PauseResponse and then a StoppedEvent (event type 'pause') after the thread has been paused successfully.
+		The debug adapter first sends the response and then a 'stopped' event (with reason 'pause') after the thread has been paused successfully.
 	*/
 	export interface PauseRequest extends Request {
 		// command: 'pause';
@@ -687,7 +713,9 @@ declare module DebugProtocol {
 	export interface PauseResponse extends Response {
 	}
 
-	/** StackTrace request; value of command field is 'stackTrace'. The request returns a stacktrace from the current execution state. */
+	/** StackTrace request; value of command field is 'stackTrace'.
+		The request returns a stacktrace from the current execution state.
+	*/
 	export interface StackTraceRequest extends Request {
 		// command: 'stackTrace';
 		arguments: StackTraceArguments;
@@ -770,7 +798,7 @@ declare module DebugProtocol {
 		};
 	}
 
-	/** setVariable request; value of command field is 'setVariable'.
+	/** SetVariable request; value of command field is 'setVariable'.
 		Set the variable with the given name in the variable container to a new value.
 	*/
 	export interface SetVariableRequest extends Request {
@@ -836,7 +864,7 @@ declare module DebugProtocol {
 		};
 	}
 
-	/** Thread request; value of command field is 'threads'.
+	/** Threads request; value of command field is 'threads'.
 		The request retrieves a list of all threads.
 	*/
 	export interface ThreadsRequest extends Request {
@@ -851,7 +879,7 @@ declare module DebugProtocol {
 		};
 	}
 
-	/** Terminate thread request; value of command field is 'terminateThreads'.
+	/** TerminateThreads request; value of command field is 'terminateThreads'.
 		The request terminates the threads with the given ids.
 	*/
 	export interface TerminateThreadsRequest extends Request {
@@ -869,7 +897,9 @@ declare module DebugProtocol {
 	export interface TerminateThreadsResponse extends Response {
 	}
 
-	/** Modules can be retrieved from the debug adapter with the ModulesRequest which can either return all modules or a range of modules to support paging. */
+	/** Modules request; value of command field is 'modules'.
+		Modules can be retrieved from the debug adapter with the ModulesRequest which can either return all modules or a range of modules to support paging.
+	*/
 	export interface ModulesRequest extends Request {
 		// command: 'modules';
 		arguments: ModulesArguments;
@@ -893,15 +923,15 @@ declare module DebugProtocol {
 		};
 	}
 
-	/** Retrieves the set of all sources currently loaded by the debugged process. */
+	/** LoadedSources request; value of command field is 'loadedSources'.
+		Retrieves the set of all sources currently loaded by the debugged process.
+	*/
 	export interface LoadedSourcesRequest extends Request {
 		// command: 'loadedSources';
 		arguments?: LoadedSourcesArguments;
 	}
 
-	/** Arguments for 'loadedSources' request.
-		The 'loadedSources' request has no standardized arguments.
-	*/
+	/** Arguments for 'loadedSources' request. */
 	export interface LoadedSourcesArguments {
 	}
 
@@ -1057,7 +1087,7 @@ declare module DebugProtocol {
 		};
 	}
 
-	/** CompletionsRequest request; value of command field is 'completions'.
+	/** Completions request; value of command field is 'completions'.
 		Returns a list of possible completions for a given caret position and text.
 		The CompletionsRequest may only be called if the 'supportsCompletionsRequest' capability exists and is true.
 	*/
@@ -1086,8 +1116,8 @@ declare module DebugProtocol {
 		};
 	}
 
-	/** ExceptionInfoRequest request; value of command field is 'exceptionInfo'.
-		Retrieves the details of the exception that caused the StoppedEvent to be raised.
+	/** ExceptionInfo request; value of command field is 'exceptionInfo'.
+		Retrieves the details of the exception that caused this event to be raised.
 	*/
 	export interface ExceptionInfoRequest extends Request {
 		// command: 'exceptionInfo';
@@ -1166,6 +1196,8 @@ declare module DebugProtocol {
 		supportsTerminateThreadsRequest?: boolean;
 		/** The debug adapter supports the 'setExpression' request. */
 		supportsSetExpression?: boolean;
+		/** The debug adapter supports the 'terminate' request. */
+		supportsTerminateRequest?: boolean;
 	}
 
 	/** An ExceptionBreakpointsFilter is shown in the UI as an option for configuring how exceptions are dealt with. */
@@ -1269,7 +1301,7 @@ declare module DebugProtocol {
 	export interface Source {
 		/** The short name of the source. Every source returned from the debug adapter has a name. When sending a source to the debug adapter this name is optional. */
 		name?: string;
-		/** The path of the source to be shown in the UI. It is only used to locate and load the content of the source if no sourceReference is specified (or its vaule is 0). */
+		/** The path of the source to be shown in the UI. It is only used to locate and load the content of the source if no sourceReference is specified (or its value is 0). */
 		path?: string;
 		/** If sourceReference > 0 the contents of the source must be retrieved through the SourceRequest (even if a path is specified). A sourceReference is only valid for a session, so it must not be used to persist a source. */
 		sourceReference?: number;
diff --git a/src/vs/workbench/parts/debug/common/debugSource.ts b/src/vs/workbench/parts/debug/common/debugSource.ts
index 71510c78264..d684be1212a 100644
--- a/src/vs/workbench/parts/debug/common/debugSource.ts
+++ b/src/vs/workbench/parts/debug/common/debugSource.ts
@@ -5,7 +5,7 @@
 
 import * as nls from 'vs/nls';
 import { TPromise } from 'vs/base/common/winjs.base';
-import uri from 'vs/base/common/uri';
+import { URI as uri } from 'vs/base/common/uri';
 import * as paths from 'vs/base/common/paths';
 import * as resources from 'vs/base/common/resources';
 import { DEBUG_SCHEME } from 'vs/workbench/parts/debug/common/debug';
diff --git a/src/vs/workbench/parts/debug/common/debugUtils.ts b/src/vs/workbench/parts/debug/common/debugUtils.ts
index e3c78db313c..5d1f7bf6405 100644
--- a/src/vs/workbench/parts/debug/common/debugUtils.ts
+++ b/src/vs/workbench/parts/debug/common/debugUtils.ts
@@ -3,6 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { equalsIgnoreCase } from 'vs/base/common/strings';
+import { IConfig } from 'vs/workbench/parts/debug/common/debug';
+
 const _formatPIIRegexp = /{([^}]+)}/g;
 
 export function formatPII(value: string, excludePII: boolean, args: { [key: string]: string }): string {
@@ -17,6 +20,10 @@ export function formatPII(value: string, excludePII: boolean, args: { [key: stri
 	});
 }
 
+export function isExtensionHostDebugging(config: IConfig) {
+	return config.type && equalsIgnoreCase(config.type === 'vslsShare' ? (<any>config).adapterProxy.configuration.type : config.type, 'extensionhost');
+}
+
 export function getExactExpressionStartAndEnd(lineContent: string, looseStart: number, looseEnd: number): { start: number, end: number } {
 	let matchingExpression: string = undefined;
 	let startOffset = 0;
diff --git a/src/vs/workbench/parts/debug/common/debugViewModel.ts b/src/vs/workbench/parts/debug/common/debugViewModel.ts
index 7c945318b01..55f4be39b3d 100644
--- a/src/vs/workbench/parts/debug/common/debugViewModel.ts
+++ b/src/vs/workbench/parts/debug/common/debugViewModel.ts
@@ -4,41 +4,45 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { Event, Emitter } from 'vs/base/common/event';
-import { CONTEXT_EXPRESSION_SELECTED, IViewModel, IStackFrame, ISession, IThread, IExpression, IFunctionBreakpoint, CONTEXT_BREAKPOINT_SELECTED } from 'vs/workbench/parts/debug/common/debug';
+import { CONTEXT_EXPRESSION_SELECTED, IViewModel, IStackFrame, IDebugSession, IThread, IExpression, IFunctionBreakpoint, CONTEXT_BREAKPOINT_SELECTED, CONTEXT_LOADED_SCRIPTS_SUPPORTED } from 'vs/workbench/parts/debug/common/debug';
 import { IContextKeyService, IContextKey } from 'vs/platform/contextkey/common/contextkey';
 
 export class ViewModel implements IViewModel {
 
+	firstSessionStart = true;
+
 	private _focusedStackFrame: IStackFrame;
-	private _focusedSession: ISession;
+	private _focusedSession: IDebugSession;
 	private _focusedThread: IThread;
 	private selectedExpression: IExpression;
 	private selectedFunctionBreakpoint: IFunctionBreakpoint;
-	private readonly _onDidFocusSession: Emitter<ISession | undefined>;
+	private readonly _onDidFocusSession: Emitter<IDebugSession | undefined>;
 	private readonly _onDidFocusStackFrame: Emitter<{ stackFrame: IStackFrame, explicit: boolean }>;
 	private readonly _onDidSelectExpression: Emitter<IExpression>;
 	private multiSessionView: boolean;
 	private expressionSelectedContextKey: IContextKey<boolean>;
 	private breakpointSelectedContextKey: IContextKey<boolean>;
+	private loadedScriptsSupportedContextKey: IContextKey<boolean>;
 
 	constructor(contextKeyService: IContextKeyService) {
-		this._onDidFocusSession = new Emitter<ISession | undefined>();
+		this._onDidFocusSession = new Emitter<IDebugSession | undefined>();
 		this._onDidFocusStackFrame = new Emitter<{ stackFrame: IStackFrame, explicit: boolean }>();
 		this._onDidSelectExpression = new Emitter<IExpression>();
 		this.multiSessionView = false;
 		this.expressionSelectedContextKey = CONTEXT_EXPRESSION_SELECTED.bindTo(contextKeyService);
 		this.breakpointSelectedContextKey = CONTEXT_BREAKPOINT_SELECTED.bindTo(contextKeyService);
+		this.loadedScriptsSupportedContextKey = CONTEXT_LOADED_SCRIPTS_SUPPORTED.bindTo(contextKeyService);
 	}
 
-	public getId(): string {
+	getId(): string {
 		return 'root';
 	}
 
-	public get focusedSession(): ISession {
+	get focusedSession(): IDebugSession {
 		return this._focusedSession;
 	}
 
-	public get focusedThread(): IThread {
+	get focusedThread(): IThread {
 		if (this._focusedStackFrame) {
 			return this._focusedStackFrame.thread;
 		}
@@ -52,61 +56,63 @@ export class ViewModel implements IViewModel {
 		return undefined;
 	}
 
-	public get focusedStackFrame(): IStackFrame {
+	get focusedStackFrame(): IStackFrame {
 		return this._focusedStackFrame;
 	}
 
-	public setFocus(stackFrame: IStackFrame, thread: IThread, session: ISession, explicit: boolean): void {
-		let shouldEmit = this._focusedSession !== session || this._focusedThread !== thread || this._focusedStackFrame !== stackFrame;
+	setFocus(stackFrame: IStackFrame, thread: IThread, session: IDebugSession, explicit: boolean): void {
+		const shouldEmit = this._focusedSession !== session || this._focusedThread !== thread || this._focusedStackFrame !== stackFrame;
 
+		this._focusedStackFrame = stackFrame;
+		this._focusedThread = thread;
 		if (this._focusedSession !== session) {
 			this._focusedSession = session;
 			this._onDidFocusSession.fire(session);
 		}
-		this._focusedThread = thread;
-		this._focusedStackFrame = stackFrame;
+
+		this.loadedScriptsSupportedContextKey.set(session && session.capabilities.supportsLoadedSourcesRequest);
 
 		if (shouldEmit) {
 			this._onDidFocusStackFrame.fire({ stackFrame, explicit });
 		}
 	}
 
-	public get onDidFocusSession(): Event<ISession> {
+	get onDidFocusSession(): Event<IDebugSession> {
 		return this._onDidFocusSession.event;
 	}
 
-	public get onDidFocusStackFrame(): Event<{ stackFrame: IStackFrame, explicit: boolean }> {
+	get onDidFocusStackFrame(): Event<{ stackFrame: IStackFrame, explicit: boolean }> {
 		return this._onDidFocusStackFrame.event;
 	}
 
-	public getSelectedExpression(): IExpression {
+	getSelectedExpression(): IExpression {
 		return this.selectedExpression;
 	}
 
-	public setSelectedExpression(expression: IExpression) {
+	setSelectedExpression(expression: IExpression) {
 		this.selectedExpression = expression;
 		this.expressionSelectedContextKey.set(!!expression);
 		this._onDidSelectExpression.fire(expression);
 	}
 
-	public get onDidSelectExpression(): Event<IExpression> {
+	get onDidSelectExpression(): Event<IExpression> {
 		return this._onDidSelectExpression.event;
 	}
 
-	public getSelectedFunctionBreakpoint(): IFunctionBreakpoint {
+	getSelectedFunctionBreakpoint(): IFunctionBreakpoint {
 		return this.selectedFunctionBreakpoint;
 	}
 
-	public setSelectedFunctionBreakpoint(functionBreakpoint: IFunctionBreakpoint): void {
+	setSelectedFunctionBreakpoint(functionBreakpoint: IFunctionBreakpoint): void {
 		this.selectedFunctionBreakpoint = functionBreakpoint;
 		this.breakpointSelectedContextKey.set(!!functionBreakpoint);
 	}
 
-	public isMultiSessionView(): boolean {
+	isMultiSessionView(): boolean {
 		return this.multiSessionView;
 	}
 
-	public setMultiSessionView(isMultiSessionView: boolean): void {
+	setMultiSessionView(isMultiSessionView: boolean): void {
 		this.multiSessionView = isMultiSessionView;
 	}
 }
diff --git a/src/vs/workbench/parts/debug/common/replHistory.ts b/src/vs/workbench/parts/debug/common/replHistory.ts
deleted file mode 100644
index 92beb99600d..00000000000
--- a/src/vs/workbench/parts/debug/common/replHistory.ts
+++ /dev/null
@@ -1,117 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-const MAX_HISTORY_ENTRIES = 50;
-
-/**
- * The repl history has the following characteristics:
- * - the history is stored in local storage up to N items
- * - every time a expression is evaluated, it is being added to the history
- * - when starting to navigate in history, the current expression is remembered to be able to go back
- * - when navigating in history and making changes to any expression, these changes are remembered until a expression is evaluated
- * - the navigation state is not remembered so that the user always ends up at the end of the history stack when evaluating a expression
- */
-export class ReplHistory {
-
-	private historyPointer: number;
-	private currentExpressionStoredMarkers: boolean;
-	private historyOverwrites: Map<string, string>;
-
-	constructor(private history: string[]) {
-		this.historyPointer = this.history.length;
-		this.currentExpressionStoredMarkers = false;
-		this.historyOverwrites = new Map<string, string>();
-	}
-
-	public next(): string {
-		return this.navigate(false);
-	}
-
-	public previous(): string {
-		return this.navigate(true);
-	}
-
-	private navigate(previous: boolean): string {
-		// validate new pointer
-		let newPointer = -1;
-		if (previous && this.historyPointer > 0 && this.history.length > this.historyPointer - 1) {
-			newPointer = this.historyPointer - 1;
-		} else if (!previous && this.history.length > this.historyPointer + 1) {
-			newPointer = this.historyPointer + 1;
-		}
-
-		if (newPointer >= 0) {
-
-			// remember pointer for next navigation
-			this.historyPointer = newPointer;
-
-			// check for overwrite
-			if (this.historyOverwrites.has(newPointer.toString())) {
-				return this.historyOverwrites.get(newPointer.toString());
-			}
-
-			return this.history[newPointer];
-		}
-
-		return null;
-	}
-
-	public remember(expression: string, fromPrevious: boolean): void {
-		let previousPointer: number;
-
-		// this method is called after the user has navigated in the history. Therefor we need to
-		// restore the value of the pointer from the point when the user started the navigation.
-		if (fromPrevious) {
-			previousPointer = this.historyPointer + 1;
-		} else {
-			previousPointer = this.historyPointer - 1;
-		}
-
-		// when the user starts to navigate in history, add the current expression to the history
-		// once so that the user can always navigate back to it and does not loose its data.
-		if (previousPointer === this.history.length && !this.currentExpressionStoredMarkers) {
-			this.history.push(expression);
-			this.currentExpressionStoredMarkers = true;
-		}
-
-		// keep edits that are made to history items up until the user actually evaluates a expression
-		else {
-			this.historyOverwrites.set(previousPointer.toString(), expression);
-		}
-	}
-
-	public evaluated(expression: string): void {
-		// clear current expression that was stored previously to support history navigation now on evaluate
-		if (this.currentExpressionStoredMarkers) {
-			this.history.pop();
-		}
-
-		// keep in local history if expression provided and not equal to previous expression stored in history
-		if (expression && (this.history.length === 0 || this.history[this.history.length - 1] !== expression)) {
-			this.history.push(expression);
-		}
-
-		// advance History Pointer to the end
-		this.historyPointer = this.history.length;
-
-		// reset marker
-		this.currentExpressionStoredMarkers = false;
-
-		// reset overwrites
-		this.historyOverwrites.clear();
-	}
-
-	public save(): string[] {
-		// remove current expression from history since it was not evaluated
-		if (this.currentExpressionStoredMarkers) {
-			this.history.pop();
-		}
-		if (this.history.length > MAX_HISTORY_ENTRIES) {
-			this.history = this.history.splice(this.history.length - MAX_HISTORY_ENTRIES, MAX_HISTORY_ENTRIES);
-		}
-
-		return this.history;
-	}
-}
diff --git a/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.ts b/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.ts
index bbf587bfb00..3bcac2b3693 100644
--- a/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.ts
+++ b/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.ts
@@ -5,7 +5,6 @@
 
 import 'vs/css!../browser/media/breakpointWidget';
 import * as nls from 'vs/nls';
-import * as errors from 'vs/base/common/errors';
 import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
 import { SelectBox } from 'vs/base/browser/ui/selectBox/selectBox';
 import * as lifecycle from 'vs/base/common/lifecycle';
@@ -17,24 +16,24 @@ import { IContextViewService } from 'vs/platform/contextview/browser/contextView
 import { IDebugService, IBreakpoint, BreakpointWidgetContext as Context, CONTEXT_BREAKPOINT_WIDGET_VISIBLE, DEBUG_SCHEME, IDebugEditorContribution, EDITOR_CONTRIBUTION_ID, CONTEXT_IN_BREAKPOINT_WIDGET } from 'vs/workbench/parts/debug/common/debug';
 import { attachSelectBoxStyler } from 'vs/platform/theme/common/styler';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { SimpleDebugEditor } from 'vs/workbench/parts/debug/electron-browser/simpleDebugEditor';
 import { createDecorator, IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { ServicesAccessor, EditorCommand, registerEditorCommand } from 'vs/editor/browser/editorExtensions';
 import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
 import { IModelService } from 'vs/editor/common/services/modelService';
-import uri from 'vs/base/common/uri';
+import { URI as uri } from 'vs/base/common/uri';
 import { SuggestRegistry, ISuggestResult, SuggestContext } from 'vs/editor/common/modes';
 import { CancellationToken } from 'vs/base/common/cancellation';
 import { ITextModel } from 'vs/editor/common/model';
-import { wireCancellationToken } from 'vs/base/common/async';
 import { provideSuggestionItems } from 'vs/editor/contrib/suggest/suggest';
-import { TPromise } from 'vs/base/common/winjs.base';
 import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
 import { transparent, editorForeground } from 'vs/platform/theme/common/colorRegistry';
 import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
 import { IDecorationOptions } from 'vs/editor/common/editorCommon';
 import { CodeEditorWidget } from 'vs/editor/browser/widget/codeEditorWidget';
+import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
+import { getSimpleCodeEditorWidgetOptions } from 'vs/workbench/parts/codeEditor/electron-browser/simpleEditorOptions';
+import { getSimpleEditorOptions } from 'vs/workbench/parts/codeEditor/browser/simpleEditorOptions';
 
 const $ = dom.$;
 const IPrivateBreakpointWidgetService = createDecorator<IPrivateBreakpointWidgetService>('privateBreakopintWidgetService');
@@ -129,7 +128,7 @@ export class BreakpointWidget extends ZoneWidget implements IPrivateBreakpointWi
 
 	protected _fillContainer(container: HTMLElement): void {
 		this.setCssClass('breakpoint-widget');
-		const selectBox = new SelectBox([nls.localize('expression', "Expression"), nls.localize('hitCount', "Hit Count"), nls.localize('logMessage', "Log Message")], this.context, this.contextViewService);
+		const selectBox = new SelectBox([nls.localize('expression', "Expression"), nls.localize('hitCount', "Hit Count"), nls.localize('logMessage', "Log Message")], this.context, this.contextViewService, null, { ariaLabel: nls.localize('breakpointType', 'Breakpoint Type') });
 		this.toDispose.push(attachSelectBoxStyler(selectBox, this.themeService));
 		this.selectContainer = $('.breakpoint-select-container');
 		selectBox.render(dom.append(container, this.selectContainer));
@@ -183,7 +182,7 @@ export class BreakpointWidget extends ZoneWidget implements IPrivateBreakpointWi
 					condition,
 					hitCondition,
 					logMessage
-				}]).done(null, errors.onUnexpectedError);
+				}]);
 			}
 		}
 
@@ -201,11 +200,11 @@ export class BreakpointWidget extends ZoneWidget implements IPrivateBreakpointWi
 		const scopedInstatiationService = this.instantiationService.createChild(new ServiceCollection(
 			[IContextKeyService, scopedContextKeyService], [IPrivateBreakpointWidgetService, this]));
 
-		const options = SimpleDebugEditor.getEditorOptions();
-		const codeEditorWidgetOptions = SimpleDebugEditor.getCodeEditorWidgetOptions();
+		const options = getSimpleEditorOptions();
+		const codeEditorWidgetOptions = getSimpleCodeEditorWidgetOptions();
 		this.input = scopedInstatiationService.createInstance(CodeEditorWidget, container, options, codeEditorWidgetOptions);
 		CONTEXT_IN_BREAKPOINT_WIDGET.bindTo(scopedContextKeyService).set(true);
-		const model = this.modelService.createModel('', null, uri.parse(`${DEBUG_SCHEME}:breakpointinput`), true);
+		const model = this.modelService.createModel('', null, uri.parse(`${DEBUG_SCHEME}:${this.editor.getId()}:breakpointinput`), true);
 		this.input.setModel(model);
 		this.toDispose.push(model);
 		const setDecorations = () => {
@@ -218,9 +217,9 @@ export class BreakpointWidget extends ZoneWidget implements IPrivateBreakpointWi
 
 		this.toDispose.push(SuggestRegistry.register({ scheme: DEBUG_SCHEME, hasAccessToAllModels: true }, {
 			provideCompletionItems: (model: ITextModel, position: Position, _context: SuggestContext, token: CancellationToken): Thenable<ISuggestResult> => {
-				let suggestionsPromise: TPromise<ISuggestResult>;
+				let suggestionsPromise: Promise<ISuggestResult>;
 				if (this.context === Context.CONDITION || this.context === Context.LOG_MESSAGE && this.isCurlyBracketOpen()) {
-					suggestionsPromise = provideSuggestionItems(this.editor.getModel(), new Position(this.lineNumber, 1), 'none', undefined, _context).then(suggestions => {
+					suggestionsPromise = provideSuggestionItems(this.editor.getModel(), new Position(this.lineNumber, 1), 'none', undefined, _context, token).then(suggestions => {
 
 						let overwriteBefore = 0;
 						if (this.context === Context.CONDITION) {
@@ -242,10 +241,10 @@ export class BreakpointWidget extends ZoneWidget implements IPrivateBreakpointWi
 						};
 					});
 				} else {
-					suggestionsPromise = TPromise.as({ suggestions: [] });
+					suggestionsPromise = Promise.resolve({ suggestions: [] });
 				}
 
-				return wireCancellationToken(token, suggestionsPromise);
+				return suggestionsPromise;
 			}
 		}));
 	}
@@ -298,7 +297,8 @@ class AcceptBreakpointWidgetInputAction extends EditorCommand {
 			precondition: CONTEXT_BREAKPOINT_WIDGET_VISIBLE,
 			kbOpts: {
 				kbExpr: CONTEXT_IN_BREAKPOINT_WIDGET,
-				primary: KeyCode.Enter
+				primary: KeyCode.Enter,
+				weight: KeybindingWeight.EditorContrib
 			}
 		});
 	}
@@ -317,7 +317,8 @@ class CloseBreakpointWidgetCommand extends EditorCommand {
 			kbOpts: {
 				kbExpr: EditorContextKeys.textInputFocus,
 				primary: KeyCode.Escape,
-				secondary: [KeyMod.Shift | KeyCode.Escape]
+				secondary: [KeyMod.Shift | KeyCode.Escape],
+				weight: KeybindingWeight.EditorContrib
 			}
 		});
 	}
diff --git a/src/vs/workbench/parts/debug/electron-browser/callStackView.ts b/src/vs/workbench/parts/debug/electron-browser/callStackView.ts
index 36a064b1969..df72e464cfa 100644
--- a/src/vs/workbench/parts/debug/electron-browser/callStackView.ts
+++ b/src/vs/workbench/parts/debug/electron-browser/callStackView.ts
@@ -7,10 +7,9 @@ import * as nls from 'vs/nls';
 import { RunOnceScheduler } from 'vs/base/common/async';
 import * as dom from 'vs/base/browser/dom';
 import { TPromise } from 'vs/base/common/winjs.base';
-import * as errors from 'vs/base/common/errors';
 import { TreeViewsViewletPanel, IViewletViewOptions } from 'vs/workbench/browser/parts/views/viewsViewlet';
-import { IDebugService, State, IStackFrame, ISession, IThread, CONTEXT_CALLSTACK_ITEM_TYPE } from 'vs/workbench/parts/debug/common/debug';
-import { Thread, StackFrame, ThreadAndSessionIds, Session, Model } from 'vs/workbench/parts/debug/common/debugModel';
+import { IDebugService, State, IStackFrame, IDebugSession, IThread, CONTEXT_CALLSTACK_ITEM_TYPE } from 'vs/workbench/parts/debug/common/debug';
+import { Thread, StackFrame, ThreadAndSessionIds, Model } from 'vs/workbench/parts/debug/common/debugModel';
 import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { MenuId } from 'vs/platform/actions/common/actions';
@@ -27,6 +26,8 @@ import { IConfigurationService } from 'vs/platform/configuration/common/configur
 import { Separator } from 'vs/base/browser/ui/actionbar/actionbar';
 import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { IViewletPanelOptions } from 'vs/workbench/browser/parts/views/panelViewlet';
+import { ILabelService } from 'vs/platform/label/common/label';
+import { DebugSession } from 'vs/workbench/parts/debug/electron-browser/debugSession';
 
 const $ = dom.$;
 
@@ -81,15 +82,15 @@ export class CallStackView extends TreeViewsViewletPanel {
 
 			this.needsRefresh = false;
 			(this.tree.getInput() === newTreeInput ? this.tree.refresh() : this.tree.setInput(newTreeInput))
-				.done(() => this.updateTreeSelection(), errors.onUnexpectedError);
+				.then(() => this.updateTreeSelection());
 		}, 50);
 	}
 
 	protected renderHeaderTitle(container: HTMLElement): void {
-		const title = dom.append(container, $('.title.debug-call-stack-title'));
-		const name = dom.append(title, $('span'));
-		name.textContent = this.options.title;
-		this.pauseMessage = dom.append(title, $('span.pause-message'));
+		let titleContainer = dom.append(container, $('.debug-call-stack-title'));
+		super.renderHeaderTitle(titleContainer, this.options.title);
+
+		this.pauseMessage = dom.append(titleContainer, $('span.pause-message'));
 		this.pauseMessage.hidden = true;
 		this.pauseMessageLabel = dom.append(this.pauseMessage, $('span.label'));
 	}
@@ -120,12 +121,12 @@ export class CallStackView extends TreeViewsViewletPanel {
 			const element = e.element;
 			if (element instanceof StackFrame) {
 				this.debugService.focusStackFrame(element, element.thread, element.thread.session, true);
-				element.openInEditor(this.editorService, e.editorOptions.preserveFocus, e.sideBySide, e.editorOptions.pinned).done(undefined, errors.onUnexpectedError);
+				element.openInEditor(this.editorService, e.editorOptions.preserveFocus, e.sideBySide, e.editorOptions.pinned);
 			}
 			if (element instanceof Thread) {
 				this.debugService.focusStackFrame(undefined, element, element.session, true);
 			}
-			if (element instanceof Session) {
+			if (element instanceof DebugSession) {
 				this.debugService.focusStackFrame(undefined, undefined, element, true);
 			}
 			if (element instanceof ThreadAndSessionIds) {
@@ -133,7 +134,7 @@ export class CallStackView extends TreeViewsViewletPanel {
 				const thread = session && session.getThread(element.threadId);
 				if (thread) {
 					(<Thread>thread).fetchCallStack()
-						.done(() => this.tree.refresh(), errors.onUnexpectedError);
+						.then(() => this.tree.refresh());
 				}
 			}
 		}));
@@ -143,7 +144,7 @@ export class CallStackView extends TreeViewsViewletPanel {
 				this.callStackItemType.set('stackFrame');
 			} else if (focus instanceof Thread) {
 				this.callStackItemType.set('thread');
-			} else if (focus instanceof Session) {
+			} else if (focus instanceof DebugSession) {
 				this.callStackItemType.set('session');
 			} else {
 				this.callStackItemType.reset();
@@ -166,7 +167,7 @@ export class CallStackView extends TreeViewsViewletPanel {
 				return;
 			}
 
-			this.updateTreeSelection().done(undefined, errors.onUnexpectedError);
+			this.updateTreeSelection();
 		}));
 
 		// Schedule the update of the call stack tree if the viewlet is opened after a session started #14684
@@ -191,7 +192,7 @@ export class CallStackView extends TreeViewsViewletPanel {
 		const stackFrame = this.debugService.getViewModel().focusedStackFrame;
 		const thread = this.debugService.getViewModel().focusedThread;
 		const session = this.debugService.getViewModel().focusedSession;
-		const updateSelection = (element: IStackFrame | ISession) => {
+		const updateSelection = (element: IStackFrame | IDebugSession) => {
 			this.ignoreSelectionChangedEvent = true;
 			try {
 				this.tree.setSelection([element]);
@@ -270,7 +271,7 @@ class CallStackActionProvider implements IActionProvider {
 
 	public getSecondaryActions(tree: ITree, element: any): TPromise<IAction[]> {
 		const actions: IAction[] = [];
-		if (element instanceof Session) {
+		if (element instanceof DebugSession) {
 			actions.push(this.instantiationService.createInstance(RestartAction, RestartAction.ID, RestartAction.LABEL));
 			actions.push(new StopAction(StopAction.ID, StopAction.LABEL, this.debugService, this.keybindingService));
 		} else if (element instanceof Thread) {
@@ -287,7 +288,7 @@ class CallStackActionProvider implements IActionProvider {
 			actions.push(new Separator());
 			actions.push(new TerminateThreadAction(TerminateThreadAction.ID, TerminateThreadAction.LABEL, this.debugService, this.keybindingService));
 		} else if (element instanceof StackFrame) {
-			if (element.thread.session.raw.capabilities.supportsRestartFrame) {
+			if (element.thread.session.capabilities.supportsRestartFrame) {
 				actions.push(new RestartFrameAction(RestartFrameAction.ID, RestartFrameAction.LABEL, this.debugService, this.keybindingService));
 			}
 			actions.push(new CopyStackTraceAction(CopyStackTraceAction.ID, CopyStackTraceAction.LABEL));
@@ -312,7 +313,7 @@ class CallStackDataSource implements IDataSource {
 	}
 
 	public hasChildren(tree: ITree, element: any): boolean {
-		return element instanceof Model || element instanceof Session || (element instanceof Thread && (<Thread>element).stopped);
+		return element instanceof Model || element instanceof DebugSession || (element instanceof Thread && (<Thread>element).stopped);
 	}
 
 	public getChildren(tree: ITree, element: any): TPromise<any> {
@@ -323,7 +324,7 @@ class CallStackDataSource implements IDataSource {
 			return TPromise.as(element.getSessions());
 		}
 
-		const session = <ISession>element;
+		const session = <IDebugSession>element;
 		return TPromise.as(session.getAllThreads());
 	}
 
@@ -335,7 +336,7 @@ class CallStackDataSource implements IDataSource {
 		}
 
 		return callStackPromise.then(() => {
-			if (callStack.length === 1 && thread.session.raw.capabilities.supportsDelayedStackTraceLoading) {
+			if (callStack.length === 1 && thread.session.capabilities.supportsDelayedStackTraceLoading) {
 				// To reduce flashing of the call stack view simply append the stale call stack
 				// once we have the correct data the tree will refresh and we will no longer display it.
 				callStack = callStack.concat(thread.getStaleCallStack().slice(1));
@@ -397,6 +398,7 @@ class CallStackRenderer implements IRenderer {
 
 	constructor(
 		@IWorkspaceContextService private contextService: IWorkspaceContextService,
+		@ILabelService private labelService: ILabelService
 	) {
 		// noop
 	}
@@ -406,7 +408,7 @@ class CallStackRenderer implements IRenderer {
 	}
 
 	public getTemplateId(tree: ITree, element: any): string {
-		if (element instanceof Session) {
+		if (element instanceof DebugSession) {
 			return CallStackRenderer.SESSION_TEMPLATE_ID;
 		}
 		if (element instanceof Thread) {
@@ -476,11 +478,11 @@ class CallStackRenderer implements IRenderer {
 		} else if (templateId === CallStackRenderer.ERROR_TEMPLATE_ID) {
 			this.renderError(element, templateData);
 		} else if (templateId === CallStackRenderer.LOAD_MORE_TEMPLATE_ID) {
-			this.renderLoadMore(element, templateData);
+			this.renderLoadMore(templateData);
 		}
 	}
 
-	private renderSession(session: ISession, data: ISessionTemplateData): void {
+	private renderSession(session: IDebugSession, data: ISessionTemplateData): void {
 		data.session.title = nls.localize({ key: 'session', comment: ['Session is a noun'] }, "Session");
 		data.name.textContent = session.getName(this.contextService.getWorkbenchState() === WorkbenchState.WORKSPACE);
 		const stoppedThread = session.getAllThreads().filter(t => t.stopped).pop();
@@ -506,7 +508,7 @@ class CallStackRenderer implements IRenderer {
 		data.label.title = element;
 	}
 
-	private renderLoadMore(element: any, data: ILoadMoreTemplateData): void {
+	private renderLoadMore(data: ILoadMoreTemplateData): void {
 		data.label.textContent = nls.localize('loadMoreStackFrames', "Load More Stack Frames");
 	}
 
@@ -515,7 +517,7 @@ class CallStackRenderer implements IRenderer {
 		dom.toggleClass(data.stackFrame, 'label', stackFrame.presentationHint === 'label');
 		dom.toggleClass(data.stackFrame, 'subtle', stackFrame.presentationHint === 'subtle');
 
-		data.file.title = stackFrame.source.raw.path || stackFrame.source.name;
+		data.file.title = stackFrame.source.inMemory ? stackFrame.source.name : this.labelService.getUriLabel(stackFrame.source.uri);
 		if (stackFrame.source.raw.origin) {
 			data.file.title += `\n${stackFrame.source.raw.origin}`;
 		}
diff --git a/src/vs/workbench/parts/debug/electron-browser/debug.contribution.ts b/src/vs/workbench/parts/debug/electron-browser/debug.contribution.ts
index 4026503292e..c3c269519db 100644
--- a/src/vs/workbench/parts/debug/electron-browser/debug.contribution.ts
+++ b/src/vs/workbench/parts/debug/electron-browser/debug.contribution.ts
@@ -10,12 +10,13 @@ import { KeyMod, KeyCode } from 'vs/base/common/keyCodes';
 import { SyncActionDescriptor, MenuRegistry, MenuId } from 'vs/platform/actions/common/actions';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { KeybindingsRegistry, IKeybindings } from 'vs/platform/keybinding/common/keybindingsRegistry';
+import { KeybindingWeight, IKeybindings } from 'vs/platform/keybinding/common/keybindingsRegistry';
 import { IConfigurationRegistry, Extensions as ConfigurationExtensions } from 'vs/platform/configuration/common/configurationRegistry';
 import { IWorkbenchActionRegistry, Extensions as WorkbenchActionRegistryExtensions } from 'vs/workbench/common/actions';
 import { ToggleViewletAction, Extensions as ViewletExtensions, ViewletRegistry, ViewletDescriptor } from 'vs/workbench/browser/viewlet';
 import { TogglePanelAction, Extensions as PanelExtensions, PanelRegistry, PanelDescriptor } from 'vs/workbench/browser/panel';
-import { StatusbarItemDescriptor, StatusbarAlignment, IStatusbarRegistry, Extensions as StatusExtensions } from 'vs/workbench/browser/parts/statusbar/statusbar';
+import { StatusbarItemDescriptor, IStatusbarRegistry, Extensions as StatusExtensions } from 'vs/workbench/browser/parts/statusbar/statusbar';
+import { StatusbarAlignment } from 'vs/platform/statusbar/common/statusbar';
 import { VariablesView } from 'vs/workbench/parts/debug/electron-browser/variablesView';
 import { BreakpointsView } from 'vs/workbench/parts/debug/browser/breakpointsView';
 import { WatchExpressionsView } from 'vs/workbench/parts/debug/electron-browser/watchExpressionsView';
@@ -23,27 +24,27 @@ import { CallStackView } from 'vs/workbench/parts/debug/electron-browser/callSta
 import { Extensions as WorkbenchExtensions, IWorkbenchContributionsRegistry } from 'vs/workbench/common/contributions';
 import {
 	IDebugService, VIEWLET_ID, REPL_ID, CONTEXT_NOT_IN_DEBUG_MODE, CONTEXT_IN_DEBUG_MODE, INTERNAL_CONSOLE_OPTIONS_SCHEMA,
-	CONTEXT_DEBUG_STATE, VARIABLES_VIEW_ID, CALLSTACK_VIEW_ID, WATCH_VIEW_ID, BREAKPOINTS_VIEW_ID, VIEW_CONTAINER
+	CONTEXT_DEBUG_STATE, VARIABLES_VIEW_ID, CALLSTACK_VIEW_ID, WATCH_VIEW_ID, BREAKPOINTS_VIEW_ID, VIEW_CONTAINER, LOADED_SCRIPTS_VIEW_ID, CONTEXT_LOADED_SCRIPTS_SUPPORTED
 } from 'vs/workbench/parts/debug/common/debug';
 import { IPartService } from 'vs/workbench/services/part/common/partService';
 import { IPanelService } from 'vs/workbench/services/panel/common/panelService';
 import { DebugEditorModelManager } from 'vs/workbench/parts/debug/browser/debugEditorModelManager';
 import {
 	StepOverAction, ClearReplAction, FocusReplAction, StepIntoAction, StepOutAction, StartAction, RestartAction, ContinueAction, StopAction, DisconnectAction, PauseAction, AddFunctionBreakpointAction,
-	ConfigureAction, DisableAllBreakpointsAction, EnableAllBreakpointsAction, RemoveAllBreakpointsAction, RunAction, ReapplyBreakpointsAction, SelectAndStartAction, TerminateThreadAction
+	ConfigureAction, DisableAllBreakpointsAction, EnableAllBreakpointsAction, RemoveAllBreakpointsAction, RunAction, ReapplyBreakpointsAction, SelectAndStartAction, TerminateThreadAction, ToggleReplAction
 } from 'vs/workbench/parts/debug/browser/debugActions';
 import { DebugActionsWidget } from 'vs/workbench/parts/debug/browser/debugActionsWidget';
 import * as service from 'vs/workbench/parts/debug/electron-browser/debugService';
 import { DebugContentProvider } from 'vs/workbench/parts/debug/browser/debugContentProvider';
 import 'vs/workbench/parts/debug/electron-browser/debugEditorContribution';
 import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet';
-import { registerCommands } from 'vs/workbench/parts/debug/browser/debugCommands';
+import { registerCommands, ADD_CONFIGURATION_ID, TOGGLE_INLINE_BREAKPOINT_ID } from 'vs/workbench/parts/debug/browser/debugCommands';
 import { IQuickOpenRegistry, Extensions as QuickOpenExtensions, QuickOpenHandlerDescriptor } from 'vs/workbench/browser/quickopen';
 import { StatusBarColorProvider } from 'vs/workbench/parts/debug/browser/statusbarColorProvider';
 import { ViewsRegistry } from 'vs/workbench/common/views';
 import { isMacintosh } from 'vs/base/common/platform';
 import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { DebugViewlet, FocusVariablesViewAction, FocusBreakpointsViewAction, FocusCallStackViewAction, FocusWatchViewAction } from 'vs/workbench/parts/debug/browser/debugViewlet';
 import { Repl } from 'vs/workbench/parts/debug/electron-browser/repl';
 import { DebugQuickOpenHandler } from 'vs/workbench/parts/debug/browser/debugQuickOpen';
@@ -51,6 +52,8 @@ import { DebugStatus } from 'vs/workbench/parts/debug/browser/debugStatus';
 import { LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
 import { launchSchemaId } from 'vs/workbench/services/configuration/common/configuration';
 import { IEditorGroupsService } from 'vs/workbench/services/group/common/editorGroupsService';
+import { LoadedScriptsView } from 'vs/workbench/parts/debug/browser/loadedScriptsView';
+import { TOGGLE_LOG_POINT_ID, TOGGLE_CONDITIONAL_BREAKPOINT_ID, TOGGLE_BREAKPOINT_ID } from 'vs/workbench/parts/debug/browser/debugEditorActions';
 
 class OpenDebugViewletAction extends ToggleViewletAction {
 	public static readonly ID = VIEWLET_ID;
@@ -111,6 +114,7 @@ Registry.as<PanelRegistry>(PanelExtensions.Panels).setDefaultPanelId(REPL_ID);
 ViewsRegistry.registerViews([{ id: VARIABLES_VIEW_ID, name: nls.localize('variables', "Variables"), ctor: VariablesView, order: 10, weight: 40, container: VIEW_CONTAINER, canToggleVisibility: true }]);
 ViewsRegistry.registerViews([{ id: WATCH_VIEW_ID, name: nls.localize('watch', "Watch"), ctor: WatchExpressionsView, order: 20, weight: 10, container: VIEW_CONTAINER, canToggleVisibility: true }]);
 ViewsRegistry.registerViews([{ id: CALLSTACK_VIEW_ID, name: nls.localize('callStack', "Call Stack"), ctor: CallStackView, order: 30, weight: 30, container: VIEW_CONTAINER, canToggleVisibility: true }]);
+ViewsRegistry.registerViews([{ id: LOADED_SCRIPTS_VIEW_ID, name: nls.localize('loadedScripts', "Loaded Scripts"), ctor: LoadedScriptsView, order: 35, weight: 5, container: VIEW_CONTAINER, canToggleVisibility: true, collapsed: true, when: CONTEXT_LOADED_SCRIPTS_SUPPORTED }]);
 ViewsRegistry.registerViews([{ id: BREAKPOINTS_VIEW_ID, name: nls.localize('breakpoints', "Breakpoints"), ctor: BreakpointsView, order: 40, weight: 20, container: VIEW_CONTAINER, canToggleVisibility: true }]);
 
 // register action to open viewlet
@@ -127,7 +131,7 @@ const debugCategory = nls.localize('debugCategory', "Debug");
 registry.registerWorkbenchAction(new SyncActionDescriptor(
 	StartAction, StartAction.ID, StartAction.LABEL, { primary: KeyCode.F5 }, CONTEXT_NOT_IN_DEBUG_MODE), 'Debug: Start Debugging', debugCategory);
 registry.registerWorkbenchAction(new SyncActionDescriptor(StepOverAction, StepOverAction.ID, StepOverAction.LABEL, { primary: KeyCode.F10 }, CONTEXT_IN_DEBUG_MODE), 'Debug: Step Over', debugCategory);
-registry.registerWorkbenchAction(new SyncActionDescriptor(StepIntoAction, StepIntoAction.ID, StepIntoAction.LABEL, { primary: KeyCode.F11 }, CONTEXT_IN_DEBUG_MODE, KeybindingsRegistry.WEIGHT.workbenchContrib(1)), 'Debug: Step Into', debugCategory);
+registry.registerWorkbenchAction(new SyncActionDescriptor(StepIntoAction, StepIntoAction.ID, StepIntoAction.LABEL, { primary: KeyCode.F11 }, CONTEXT_IN_DEBUG_MODE, KeybindingWeight.WorkbenchContrib + 1), 'Debug: Step Into', debugCategory);
 registry.registerWorkbenchAction(new SyncActionDescriptor(StepOutAction, StepOutAction.ID, StepOutAction.LABEL, { primary: KeyMod.Shift | KeyCode.F11 }, CONTEXT_IN_DEBUG_MODE), 'Debug: Step Out', debugCategory);
 registry.registerWorkbenchAction(new SyncActionDescriptor(RestartAction, RestartAction.ID, RestartAction.LABEL, { primary: KeyMod.Shift | KeyMod.CtrlCmd | KeyCode.F5 }, CONTEXT_IN_DEBUG_MODE), 'Debug: Restart', debugCategory);
 registry.registerWorkbenchAction(new SyncActionDescriptor(StopAction, StopAction.ID, StopAction.LABEL, { primary: KeyMod.Shift | KeyCode.F5 }, CONTEXT_IN_DEBUG_MODE), 'Debug: Stop', debugCategory);
@@ -147,7 +151,7 @@ registry.registerWorkbenchAction(new SyncActionDescriptor(FocusReplAction, Focus
 registry.registerWorkbenchAction(new SyncActionDescriptor(SelectAndStartAction, SelectAndStartAction.ID, SelectAndStartAction.LABEL), 'Debug: Select and Start Debugging', debugCategory);
 registry.registerWorkbenchAction(new SyncActionDescriptor(FocusVariablesViewAction, FocusVariablesViewAction.ID, FocusVariablesViewAction.LABEL), 'Debug: Focus Variables', debugCategory);
 registry.registerWorkbenchAction(new SyncActionDescriptor(FocusWatchViewAction, FocusWatchViewAction.ID, FocusWatchViewAction.LABEL), 'Debug: Focus Watch', debugCategory);
-registry.registerWorkbenchAction(new SyncActionDescriptor(FocusCallStackViewAction, FocusCallStackViewAction.ID, FocusCallStackViewAction.LABEL), 'Debug: Focus CallStack', debugCategory);
+registry.registerWorkbenchAction(new SyncActionDescriptor(FocusCallStackViewAction, FocusCallStackViewAction.ID, FocusCallStackViewAction.LABEL), 'Debug: Focus Call Stack', debugCategory);
 registry.registerWorkbenchAction(new SyncActionDescriptor(FocusBreakpointsViewAction, FocusBreakpointsViewAction.ID, FocusBreakpointsViewAction.LABEL), 'Debug: Focus Breakpoints', debugCategory);
 
 
@@ -175,39 +179,39 @@ configurationRegistry.registerConfiguration({
 	properties: {
 		'debug.allowBreakpointsEverywhere': {
 			type: 'boolean',
-			description: nls.localize({ comment: ['This is the description for a setting'], key: 'allowBreakpointsEverywhere' }, "Allows setting breakpoint in any file"),
+			description: nls.localize({ comment: ['This is the description for a setting'], key: 'allowBreakpointsEverywhere' }, "Allow setting breakpoints in any file."),
 			default: false
 		},
 		'debug.openExplorerOnEnd': {
 			type: 'boolean',
-			description: nls.localize({ comment: ['This is the description for a setting'], key: 'openExplorerOnEnd' }, "Automatically open explorer view on the end of a debug session"),
+			description: nls.localize({ comment: ['This is the description for a setting'], key: 'openExplorerOnEnd' }, "Automatically open the explorer view at the end of a debug session"),
 			default: false
 		},
 		'debug.inlineValues': {
 			type: 'boolean',
-			description: nls.localize({ comment: ['This is the description for a setting'], key: 'inlineValues' }, "Show variable values inline in editor while debugging"),
+			description: nls.localize({ comment: ['This is the description for a setting'], key: 'inlineValues' }, "Show variable values inline in editor while debugging."),
 			default: false
 		},
 		'debug.toolBarLocation': {
 			enum: ['floating', 'docked', 'hidden'],
-			description: nls.localize({ comment: ['This is the description for a setting'], key: 'toolBarLocation' }, "Controls the location of the debug toolbar. Either \"floating\" in all views, \"docked\" in the debug view, or \"hidden\""),
+			markdownDescription: nls.localize({ comment: ['This is the description for a setting'], key: 'toolBarLocation' }, "Controls the location of the debug toolbar. Either `floating` in all views, `docked` in the debug view, or `hidden`"),
 			default: 'floating'
 		},
 		'debug.showInStatusBar': {
 			enum: ['never', 'always', 'onFirstSessionStart'],
 			enumDescriptions: [nls.localize('never', "Never show debug in status bar"), nls.localize('always', "Always show debug in status bar"), nls.localize('onFirstSessionStart', "Show debug in status bar only after debug was started for the first time")],
-			description: nls.localize({ comment: ['This is the description for a setting'], key: 'showInStatusBar' }, "Controls when the debug status bar should be visible"),
+			description: nls.localize({ comment: ['This is the description for a setting'], key: 'showInStatusBar' }, "Controls when the debug status bar should be visible."),
 			default: 'onFirstSessionStart'
 		},
 		'debug.internalConsoleOptions': INTERNAL_CONSOLE_OPTIONS_SCHEMA,
 		'debug.openDebug': {
 			enum: ['neverOpen', 'openOnSessionStart', 'openOnFirstSessionStart', 'openOnDebugBreak'],
-			default: 'openOnFirstSessionStart',
-			description: nls.localize('openDebug', "Controls whether debug view should be open on debugging session start.")
+			default: 'openOnSessionStart',
+			description: nls.localize('openDebug', "Controls when the debug view should open.")
 		},
 		'debug.enableAllHovers': {
 			type: 'boolean',
-			description: nls.localize({ comment: ['This is the description for a setting'], key: 'enableAllHovers' }, "Controls if the non debug hovers should be enabled while debugging. If true the hover providers will be called to provide a hover. Regular hovers will not be shown even if this setting is true."),
+			description: nls.localize({ comment: ['This is the description for a setting'], key: 'enableAllHovers' }, "Controls whether the non-debug hovers should be enabled while debugging. When enabled the hover providers will be called to provide a hover. Regular hovers will not be shown even if this setting is enabled."),
 			default: false
 		},
 		'launch': {
@@ -225,13 +229,224 @@ registerCommands();
 const statusBar = Registry.as<IStatusbarRegistry>(StatusExtensions.Statusbar);
 statusBar.registerStatusbarItem(new StatusbarItemDescriptor(DebugStatus, StatusbarAlignment.LEFT, 30 /* Low Priority */));
 
+// View menu
+
+MenuRegistry.appendMenuItem(MenuId.MenubarViewMenu, {
+	group: '3_views',
+	command: {
+		id: VIEWLET_ID,
+		title: nls.localize({ key: 'miViewDebug', comment: ['&& denotes a mnemonic'] }, "&&Debug")
+	},
+	order: 4
+});
+
+MenuRegistry.appendMenuItem(MenuId.MenubarViewMenu, {
+	group: '4_panels',
+	command: {
+		id: ToggleReplAction.ID,
+		title: nls.localize({ key: 'miToggleDebugConsole', comment: ['&& denotes a mnemonic'] }, "De&&bug Console")
+	},
+	order: 2
+});
+
+// Debug menu
+
+MenuRegistry.appendMenuItem(MenuId.MenubarDebugMenu, {
+	group: '1_debug',
+	command: {
+		id: StartAction.ID,
+		title: nls.localize({ key: 'miStartDebugging', comment: ['&& denotes a mnemonic'] }, "&&Start Debugging")
+	},
+	order: 1
+});
+
+MenuRegistry.appendMenuItem(MenuId.MenubarDebugMenu, {
+	group: '1_debug',
+	command: {
+		id: RunAction.ID,
+		title: nls.localize({ key: 'miStartWithoutDebugging', comment: ['&& denotes a mnemonic'] }, "Start &&Without Debugging")
+	},
+	order: 2
+});
+
+MenuRegistry.appendMenuItem(MenuId.MenubarDebugMenu, {
+	group: '1_debug',
+	command: {
+		id: StopAction.ID,
+		title: nls.localize({ key: 'miStopDebugging', comment: ['&& denotes a mnemonic'] }, "&&Stop Debugging"),
+		precondition: CONTEXT_IN_DEBUG_MODE
+	},
+	order: 3
+});
+
+MenuRegistry.appendMenuItem(MenuId.MenubarDebugMenu, {
+	group: '1_debug',
+	command: {
+		id: RestartAction.ID,
+		title: nls.localize({ key: 'miRestart Debugging', comment: ['&& denotes a mnemonic'] }, "&&Restart Debugging"),
+		precondition: CONTEXT_IN_DEBUG_MODE
+	},
+	order: 4
+});
+
+// Configuration
+MenuRegistry.appendMenuItem(MenuId.MenubarDebugMenu, {
+	group: '2_configuration',
+	command: {
+		id: ConfigureAction.ID,
+		title: nls.localize({ key: 'miOpenConfigurations', comment: ['&& denotes a mnemonic'] }, "Open &&Configurations")
+	},
+	order: 1
+});
+
+MenuRegistry.appendMenuItem(MenuId.MenubarDebugMenu, {
+	group: '2_configuration',
+	command: {
+		id: ADD_CONFIGURATION_ID,
+		title: nls.localize({ key: 'miAddConfiguration', comment: ['&& denotes a mnemonic'] }, "Add Configuration...")
+	},
+	order: 2
+});
+
+// Step Commands
+MenuRegistry.appendMenuItem(MenuId.MenubarDebugMenu, {
+	group: '3_step',
+	command: {
+		id: StepOverAction.ID,
+		title: nls.localize({ key: 'miStepOver', comment: ['&& denotes a mnemonic'] }, "Step &&Over"),
+		precondition: CONTEXT_DEBUG_STATE.isEqualTo('stopped')
+	},
+	order: 1
+});
+
+MenuRegistry.appendMenuItem(MenuId.MenubarDebugMenu, {
+	group: '3_step',
+	command: {
+		id: StepIntoAction.ID,
+		title: nls.localize({ key: 'miStepInto', comment: ['&& denotes a mnemonic'] }, "Step &&Into"),
+		precondition: CONTEXT_DEBUG_STATE.isEqualTo('stopped')
+	},
+	order: 2
+});
+
+MenuRegistry.appendMenuItem(MenuId.MenubarDebugMenu, {
+	group: '3_step',
+	command: {
+		id: StepOutAction.ID,
+		title: nls.localize({ key: 'miStepOut', comment: ['&& denotes a mnemonic'] }, "Step O&&ut"),
+		precondition: CONTEXT_DEBUG_STATE.isEqualTo('stopped')
+	},
+	order: 3
+});
+
+MenuRegistry.appendMenuItem(MenuId.MenubarDebugMenu, {
+	group: '3_step',
+	command: {
+		id: ContinueAction.ID,
+		title: nls.localize({ key: 'miContinue', comment: ['&& denotes a mnemonic'] }, "&&Continue"),
+		precondition: CONTEXT_DEBUG_STATE.isEqualTo('stopped')
+	},
+	order: 4
+});
+
+// New Breakpoints
+MenuRegistry.appendMenuItem(MenuId.MenubarDebugMenu, {
+	group: '4_new_breakpoint',
+	command: {
+		id: TOGGLE_BREAKPOINT_ID,
+		title: nls.localize({ key: 'miToggleBreakpoint', comment: ['&& denotes a mnemonic'] }, "Toggle &&Breakpoint")
+	},
+	order: 1
+});
+
+MenuRegistry.appendMenuItem(MenuId.MenubarNewBreakpointMenu, {
+	group: '1_breakpoints',
+	command: {
+		id: TOGGLE_CONDITIONAL_BREAKPOINT_ID,
+		title: nls.localize({ key: 'miConditionalBreakpoint', comment: ['&& denotes a mnemonic'] }, "&&Conditional Breakpoint...")
+	},
+	order: 1
+});
+
+MenuRegistry.appendMenuItem(MenuId.MenubarNewBreakpointMenu, {
+	group: '1_breakpoints',
+	command: {
+		id: TOGGLE_INLINE_BREAKPOINT_ID,
+		title: nls.localize({ key: 'miInlineBreakpoint', comment: ['&& denotes a mnemonic'] }, "Inline Breakp&&oint")
+	},
+	order: 2
+});
+
+MenuRegistry.appendMenuItem(MenuId.MenubarNewBreakpointMenu, {
+	group: '1_breakpoints',
+	command: {
+		id: AddFunctionBreakpointAction.ID,
+		title: nls.localize({ key: 'miFunctionBreakpoint', comment: ['&& denotes a mnemonic'] }, "&&Function Breakpoint...")
+	},
+	order: 3
+});
+
+MenuRegistry.appendMenuItem(MenuId.MenubarNewBreakpointMenu, {
+	group: '1_breakpoints',
+	command: {
+		id: TOGGLE_LOG_POINT_ID,
+		title: nls.localize({ key: 'miLogPoint', comment: ['&& denotes a mnemonic'] }, "&&Logpoint...")
+	},
+	order: 4
+});
+
+MenuRegistry.appendMenuItem(MenuId.MenubarDebugMenu, {
+	group: '4_new_breakpoint',
+	title: nls.localize({ key: 'miNewBreakpoint', comment: ['&& denotes a mnemonic'] }, "&&New Breakpoint"),
+	submenu: MenuId.MenubarNewBreakpointMenu,
+	order: 2
+});
+
+// Modify Breakpoints
+MenuRegistry.appendMenuItem(MenuId.MenubarDebugMenu, {
+	group: '5_breakpoints',
+	command: {
+		id: EnableAllBreakpointsAction.ID,
+		title: nls.localize({ key: 'miEnableAllBreakpoints', comment: ['&& denotes a mnemonic'] }, "Enable All Breakpoints")
+	},
+	order: 1
+});
+
+MenuRegistry.appendMenuItem(MenuId.MenubarDebugMenu, {
+	group: '5_breakpoints',
+	command: {
+		id: DisableAllBreakpointsAction.ID,
+		title: nls.localize({ key: 'miDisableAllBreakpoints', comment: ['&& denotes a mnemonic'] }, "Disable A&&ll Breakpoints")
+	},
+	order: 2
+});
+
+MenuRegistry.appendMenuItem(MenuId.MenubarDebugMenu, {
+	group: '5_breakpoints',
+	command: {
+		id: RemoveAllBreakpointsAction.ID,
+		title: nls.localize({ key: 'miRemoveAllBreakpoints', comment: ['&& denotes a mnemonic'] }, "Remove &&All Breakpoints")
+	},
+	order: 3
+});
+
+// Install Debuggers
+MenuRegistry.appendMenuItem(MenuId.MenubarDebugMenu, {
+	group: 'z_install',
+	command: {
+		id: 'debug.installAdditionalDebuggers',
+		title: nls.localize({ key: 'miInstallAdditionalDebuggers', comment: ['&& denotes a mnemonic'] }, "&&Install Additional Debuggers...")
+	},
+	order: 1
+});
+
 // Touch Bar
 if (isMacintosh) {
 
 	const registerTouchBarEntry = (id: string, title: string, order, when: ContextKeyExpr, icon: string) => {
 		MenuRegistry.appendMenuItem(MenuId.TouchBarContext, {
 			command: {
-				id, title, iconPath: { dark: URI.parse(require.toUrl(`vs/workbench/parts/debug/electron-browser/media/${icon}`)).fsPath }
+				id, title, iconLocation: { dark: URI.parse(require.toUrl(`vs/workbench/parts/debug/electron-browser/media/${icon}`)) }
 			},
 			when,
 			group: '9_debug',
diff --git a/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.ts b/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.ts
index da5740eba43..0062a0fdc73 100644
--- a/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.ts
+++ b/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.ts
@@ -9,8 +9,8 @@ import { Event, Emitter } from 'vs/base/common/event';
 import { TPromise } from 'vs/base/common/winjs.base';
 import * as strings from 'vs/base/common/strings';
 import * as objects from 'vs/base/common/objects';
-import uri from 'vs/base/common/uri';
-import * as paths from 'vs/base/common/paths';
+import { URI as uri } from 'vs/base/common/uri';
+import * as resources from 'vs/base/common/resources';
 import { IJSONSchema } from 'vs/base/common/jsonSchema';
 import { ITextModel } from 'vs/editor/common/model';
 import { IEditor } from 'vs/workbench/common/editor';
@@ -25,7 +25,6 @@ import { ICommandService } from 'vs/platform/commands/common/commands';
 import { IDebugConfigurationProvider, ICompound, IDebugConfiguration, IConfig, IGlobalConfig, IConfigurationManager, ILaunch, IAdapterExecutable, IDebugAdapterProvider, IDebugAdapter, ITerminalSettings, ITerminalLauncher } from 'vs/workbench/parts/debug/common/debug';
 import { Debugger } from 'vs/workbench/parts/debug/node/debugger';
 import { IEditorService, ACTIVE_GROUP, SIDE_GROUP } from 'vs/workbench/services/editor/common/editorService';
-import { IQuickOpenService } from 'vs/platform/quickOpen/common/quickOpen';
 import { isCodeEditor } from 'vs/editor/browser/editorBrowser';
 import { launchSchemaId } from 'vs/workbench/services/configuration/common/configuration';
 import { IPreferencesService } from 'vs/workbench/services/preferences/common/preferences';
@@ -33,6 +32,7 @@ import { TerminalLauncher } from 'vs/workbench/parts/debug/electron-browser/term
 import { Registry } from 'vs/platform/registry/common/platform';
 import { IJSONContributionRegistry, Extensions as JSONExtensions } from 'vs/platform/jsonschemas/common/jsonContributionRegistry';
 import { launchSchema, debuggersExtPoint, breakpointsExtPoint } from 'vs/workbench/parts/debug/common/debugSchemas';
+import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
 
 const jsonRegistry = Registry.as<IJSONContributionRegistry>(JSONExtensions.JSONContribution);
 jsonRegistry.registerSchema(launchSchemaId, launchSchema);
@@ -57,7 +57,7 @@ export class ConfigurationManager implements IConfigurationManager {
 		@IWorkspaceContextService private contextService: IWorkspaceContextService,
 		@IEditorService private editorService: IEditorService,
 		@IConfigurationService private configurationService: IConfigurationService,
-		@IQuickOpenService private quickOpenService: IQuickOpenService,
+		@IQuickInputService private quickInputService: IQuickInputService,
 		@IInstantiationService private instantiationService: IInstantiationService,
 		@ICommandService private commandService: ICommandService,
 		@IStorageService private storageService: IStorageService,
@@ -347,10 +347,11 @@ export class ConfigurationManager implements IConfigurationManager {
 			}
 
 			candidates = candidates.sort((first, second) => first.label.localeCompare(second.label));
-			return this.quickOpenService.pick([...candidates, { label: 'More...', separator: { border: true } }], { placeHolder: nls.localize('selectDebug', "Select Environment") })
+			const picks = candidates.map(c => ({ label: c.label, debugger: c }));
+			return this.quickInputService.pick<(typeof picks)[0]>([...picks, { type: 'separator' }, { label: 'More...', debugger: undefined }], { placeHolder: nls.localize('selectDebug', "Select Environment") })
 				.then(picked => {
-					if (picked instanceof Debugger) {
-						return picked;
+					if (picked && picked.debugger) {
+						return picked.debugger;
 					}
 					if (picked) {
 						this.commandService.executeCommand('debug.installAdditionalDebuggers');
@@ -390,7 +391,7 @@ class Launch implements ILaunch {
 	}
 
 	public get uri(): uri {
-		return this.workspace.uri.with({ path: paths.join(this.workspace.uri.path, '/.vscode/launch.json') });
+		return resources.joinPath(this.workspace.uri, '/.vscode/launch.json');
 	}
 
 	public get name(): string {
@@ -441,15 +442,13 @@ class Launch implements ILaunch {
 		return config.configurations.filter(config => config && config.name === name).shift();
 	}
 
-	public openConfigFile(sideBySide: boolean, type?: string): TPromise<{ editor: IEditor, created: boolean }> {
-		return this.configurationManager.activateDebuggers().then(() => {
-			const resource = this.uri;
-			let created = false;
-
-			return this.fileService.resolveContent(resource).then(content => content.value, err => {
-
-				// launch.json not found: create one by collecting launch configs from debugConfigProviders
+	public openConfigFile(sideBySide: boolean, preserveFocus: boolean, type?: string): TPromise<{ editor: IEditor, created: boolean }> {
+		const resource = this.uri;
+		let created = false;
 
+		return this.fileService.resolveContent(resource).then(content => content.value, err => {
+			// launch.json not found: create one by collecting launch configs from debugConfigProviders
+			return this.configurationManager.activateDebuggers().then(() => {
 				return this.configurationManager.guessDebugger(type).then(adapter => {
 					if (adapter) {
 						return this.configurationManager.provideDebugConfigurations(this.workspace.uri, adapter.type).then(initialConfigs => {
@@ -470,31 +469,31 @@ class Launch implements ILaunch {
 						return content;
 					});
 				});
-			}).then(content => {
-				if (!content) {
-					return undefined;
-				}
-				const index = content.indexOf(`"${this.configurationManager.selectedConfiguration.name}"`);
-				let startLineNumber = 1;
-				for (let i = 0; i < index; i++) {
-					if (content.charAt(i) === '\n') {
-						startLineNumber++;
-					}
-				}
-				const selection = startLineNumber > 1 ? { startLineNumber, startColumn: 4 } : undefined;
-
-				return this.editorService.openEditor({
-					resource: resource,
-					options: {
-						forceOpen: true,
-						selection,
-						pinned: created,
-						revealIfVisible: true
-					},
-				}, sideBySide ? SIDE_GROUP : ACTIVE_GROUP).then(editor => ({ editor, created }));
-			}, (error) => {
-				throw new Error(nls.localize('DebugConfig.failed', "Unable to create 'launch.json' file inside the '.vscode' folder ({0}).", error));
 			});
+		}).then(content => {
+			if (!content) {
+				return { editor: undefined, created: false };
+			}
+			const index = content.indexOf(`"${this.configurationManager.selectedConfiguration.name}"`);
+			let startLineNumber = 1;
+			for (let i = 0; i < index; i++) {
+				if (content.charAt(i) === '\n') {
+					startLineNumber++;
+				}
+			}
+			const selection = startLineNumber > 1 ? { startLineNumber, startColumn: 4 } : undefined;
+
+			return this.editorService.openEditor({
+				resource,
+				options: {
+					selection,
+					preserveFocus,
+					pinned: created,
+					revealIfVisible: true
+				},
+			}, sideBySide ? SIDE_GROUP : ACTIVE_GROUP).then(editor => ({ editor, created }));
+		}, (error) => {
+			throw new Error(nls.localize('DebugConfig.failed', "Unable to create 'launch.json' file inside the '.vscode' folder ({0}).", error));
 		});
 	}
 }
@@ -523,8 +522,11 @@ class WorkspaceLaunch extends Launch implements ILaunch {
 		return this.configurationService.inspect<IGlobalConfig>('launch').workspace;
 	}
 
-	openConfigFile(sideBySide: boolean, type?: string): TPromise<{ editor: IEditor, created: boolean }> {
-		return this.editorService.openEditor({ resource: this.contextService.getWorkspace().configuration }).then(editor => ({ editor, created: false }));
+	openConfigFile(sideBySide: boolean, preserveFocus: boolean, type?: string): TPromise<{ editor: IEditor, created: boolean }> {
+		return this.editorService.openEditor({
+			resource: this.contextService.getWorkspace().configuration,
+			options: { preserveFocus }
+		}, sideBySide ? SIDE_GROUP : ACTIVE_GROUP).then(editor => ({ editor, created: false }));
 	}
 }
 
@@ -557,7 +559,7 @@ class UserLaunch extends Launch implements ILaunch {
 		return this.configurationService.inspect<IGlobalConfig>('launch').user;
 	}
 
-	openConfigFile(sideBySide: boolean, type?: string): TPromise<{ editor: IEditor, created: boolean }> {
-		return this.preferencesService.openGlobalSettings().then(editor => ({ editor, created: false }));
+	openConfigFile(sideBySide: boolean, preserveFocus: boolean, type?: string): TPromise<{ editor: IEditor, created: boolean }> {
+		return this.preferencesService.openGlobalSettings(false, { preserveFocus }).then(editor => ({ editor, created: false }));
 	}
 }
diff --git a/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.ts b/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.ts
index 06da05910b3..c884878dd4e 100644
--- a/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.ts
+++ b/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.ts
@@ -4,12 +4,11 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as nls from 'vs/nls';
-import * as errors from 'vs/base/common/errors';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { RunOnceScheduler } from 'vs/base/common/async';
 import * as lifecycle from 'vs/base/common/lifecycle';
 import * as env from 'vs/base/common/platform';
-import uri from 'vs/base/common/uri';
+import { URI as uri } from 'vs/base/common/uri';
 import { visit } from 'vs/base/common/json';
 import severity from 'vs/base/common/severity';
 import { Constants } from 'vs/editor/common/core/uint';
@@ -21,12 +20,12 @@ import { DEFAULT_WORD_REGEXP } from 'vs/editor/common/model/wordHelper';
 import { ICodeEditor, IEditorMouseEvent, MouseTargetType } from 'vs/editor/browser/editorBrowser';
 import { registerEditorContribution } from 'vs/editor/browser/editorExtensions';
 import { IDecorationOptions } from 'vs/editor/common/editorCommon';
-import { IModelDecorationOptions, IModelDeltaDecoration, TrackedRangeStickiness } from 'vs/editor/common/model';
+import { IModelDecorationOptions, IModelDeltaDecoration, TrackedRangeStickiness, ITextModel } from 'vs/editor/common/model';
 import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
 import { Range } from 'vs/editor/common/core/range';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { IConfigurationService, IConfigurationOverrides } from 'vs/platform/configuration/common/configuration';
 import { ICommandService } from 'vs/platform/commands/common/commands';
 import { IContextKeyService, IContextKey } from 'vs/platform/contextkey/common/contextkey';
 import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
@@ -46,6 +45,8 @@ import { ContextSubMenu } from 'vs/base/browser/contextmenu';
 import { memoize } from 'vs/base/common/decorators';
 import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
 import { getHover } from 'vs/editor/contrib/hover/getHover';
+import { IEditorHoverOptions } from 'vs/editor/common/config/editorOptions';
+import { CancellationToken } from 'vs/base/common/cancellation';
 
 const HOVER_DELAY = 300;
 const LAUNCH_JSON_REGEX = /launch\.json$/;
@@ -262,7 +263,7 @@ export class DebugEditorContribution implements IDebugEditorContribution {
 		this.toDispose.push(this.editor.onDidChangeModel(() => {
 			const stackFrame = this.debugService.getViewModel().focusedStackFrame;
 			const model = this.editor.getModel();
-			this.editor.updateOptions({ hover: !stackFrame || !model || model.uri.toString() !== stackFrame.source.uri.toString() });
+			this._applyHoverConfiguration(model, stackFrame);
 			this.closeBreakpointWidget();
 			this.toggleExceptionWidget();
 			this.hideHoverWidget();
@@ -278,6 +279,32 @@ export class DebugEditorContribution implements IDebugEditorContribution {
 		}));
 	}
 
+	private _applyHoverConfiguration(model: ITextModel, stackFrame: IStackFrame): void {
+		if (stackFrame && model && model.uri.toString() === stackFrame.source.uri.toString()) {
+			this.editor.updateOptions({
+				hover: {
+					enabled: !stackFrame || !model || model.uri.toString() !== stackFrame.source.uri.toString()
+				}
+			});
+		} else {
+			let overrides: IConfigurationOverrides;
+			if (model) {
+				overrides = {
+					resource: model.uri,
+					overrideIdentifier: model.getLanguageIdentifier().language
+				};
+			}
+			const defaultConfiguration = this.configurationService.getValue<IEditorHoverOptions>('editor.hover', overrides);
+			this.editor.updateOptions({
+				hover: {
+					enabled: defaultConfiguration.enabled,
+					delay: defaultConfiguration.delay,
+					sticky: defaultConfiguration.sticky
+				}
+			});
+		}
+	}
+
 	public getId(): string {
 		return EDITOR_CONTRIBUTION_ID;
 	}
@@ -323,11 +350,10 @@ export class DebugEditorContribution implements IDebugEditorContribution {
 
 	private onFocusStackFrame(sf: IStackFrame): void {
 		const model = this.editor.getModel();
+		this._applyHoverConfiguration(model, sf);
 		if (model && sf && sf.source.uri.toString() === model.uri.toString()) {
-			this.editor.updateOptions({ hover: false });
 			this.toggleExceptionWidget();
 		} else {
-			this.editor.updateOptions({ hover: true });
 			this.hideHoverWidget();
 		}
 
@@ -353,7 +379,7 @@ export class DebugEditorContribution implements IDebugEditorContribution {
 	@memoize
 	private get provideNonDebugHoverScheduler(): RunOnceScheduler {
 		const scheduler = new RunOnceScheduler(() => {
-			getHover(this.editor.getModel(), this.nonDebugHoverPosition);
+			getHover(this.editor.getModel(), this.nonDebugHoverPosition, CancellationToken.None);
 		}, HOVER_DELAY);
 		this.toDispose.push(scheduler);
 
@@ -489,7 +515,7 @@ export class DebugEditorContribution implements IDebugEditorContribution {
 		if (model && LAUNCH_JSON_REGEX.test(model.uri.toString())) {
 			this.configurationWidget = this.instantiationService.createInstance(FloatingClickWidget, this.editor, nls.localize('addConfiguration', "Add Configuration..."), null);
 			this.configurationWidget.render();
-			this.toDispose.push(this.configurationWidget.onClick(() => this.addLaunchConfiguration().done(undefined, errors.onUnexpectedError)));
+			this.toDispose.push(this.configurationWidget.onClick(() => this.addLaunchConfiguration()));
 		}
 	}
 
diff --git a/src/vs/workbench/parts/debug/electron-browser/debugHover.ts b/src/vs/workbench/parts/debug/electron-browser/debugHover.ts
index 6e43c34d40b..0777fb627fa 100644
--- a/src/vs/workbench/parts/debug/electron-browser/debugHover.ts
+++ b/src/vs/workbench/parts/debug/electron-browser/debugHover.ts
@@ -152,7 +152,7 @@ export class DebugHoverWidget implements IContentWidget {
 		}
 
 		let promise: TPromise<IExpression>;
-		if (session.raw.capabilities.supportsEvaluateForHovers) {
+		if (session.capabilities.supportsEvaluateForHovers) {
 			const result = new Expression(matchingExpression);
 			promise = result.evaluate(session, this.debugService.getViewModel().focusedStackFrame, 'hover').then(() => result);
 		} else {
diff --git a/src/vs/workbench/parts/debug/electron-browser/debugService.ts b/src/vs/workbench/parts/debug/electron-browser/debugService.ts
index 135d6e164a9..c9aa576f4b9 100644
--- a/src/vs/workbench/parts/debug/electron-browser/debugService.ts
+++ b/src/vs/workbench/parts/debug/electron-browser/debugService.ts
@@ -4,13 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as nls from 'vs/nls';
-import * as lifecycle from 'vs/base/common/lifecycle';
 import { Event, Emitter } from 'vs/base/common/event';
 import * as resources from 'vs/base/common/resources';
-import * as strings from 'vs/base/common/strings';
-import { generateUuid } from 'vs/base/common/uuid';
-import uri from 'vs/base/common/uri';
-import * as platform from 'vs/base/common/platform';
+import { URI as uri } from 'vs/base/common/uri';
 import { first, distinct } from 'vs/base/common/arrays';
 import { isObject, isUndefinedOrNull } from 'vs/base/common/types';
 import * as errors from 'vs/base/common/errors';
@@ -20,15 +16,13 @@ import * as aria from 'vs/base/browser/ui/aria/aria';
 import { IContextKeyService, IContextKey } from 'vs/platform/contextkey/common/contextkey';
 import { IMarkerService } from 'vs/platform/markers/common/markers';
 import { ILifecycleService } from 'vs/platform/lifecycle/common/lifecycle';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
+import { IExtensionService, IExtensionDescription } from 'vs/workbench/services/extensions/common/extensions';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { FileChangesEvent, FileChangeType, IFileService } from 'vs/platform/files/common/files';
 import { IWindowService } from 'vs/platform/windows/common/windows';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
-import * as debug from 'vs/workbench/parts/debug/common/debug';
-import { RawDebugSession } from 'vs/workbench/parts/debug/electron-browser/rawDebugSession';
-import { Model, ExceptionBreakpoint, FunctionBreakpoint, Breakpoint, Expression, RawObjectReplElement, ExpressionContainer, Session, Thread } from 'vs/workbench/parts/debug/common/debugModel';
+import { Model, ExceptionBreakpoint, FunctionBreakpoint, Breakpoint, Expression, RawObjectReplElement } from 'vs/workbench/parts/debug/common/debugModel';
 import { ViewModel } from 'vs/workbench/parts/debug/common/debugViewModel';
 import * as debugactions from 'vs/workbench/parts/debug/browser/debugActions';
 import { ConfigurationManager } from 'vs/workbench/parts/debug/electron-browser/debugConfigurationManager';
@@ -43,18 +37,18 @@ import { ITextFileService } from 'vs/workbench/services/textfile/common/textfile
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IWorkspaceContextService, WorkbenchState, IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { EXTENSION_LOG_BROADCAST_CHANNEL, EXTENSION_ATTACH_BROADCAST_CHANNEL, EXTENSION_TERMINATE_BROADCAST_CHANNEL, EXTENSION_CLOSE_EXTHOST_BROADCAST_CHANNEL, EXTENSION_RELOAD_BROADCAST_CHANNEL } from 'vs/platform/extensions/common/extensionHost';
-import { IBroadcastService, IBroadcast } from 'vs/platform/broadcast/electron-browser/broadcastService';
+import { EXTENSION_LOG_BROADCAST_CHANNEL, EXTENSION_ATTACH_BROADCAST_CHANNEL, EXTENSION_TERMINATE_BROADCAST_CHANNEL, EXTENSION_RELOAD_BROADCAST_CHANNEL, EXTENSION_CLOSE_EXTHOST_BROADCAST_CHANNEL } from 'vs/platform/extensions/common/extensionHost';
+import { IBroadcastService } from 'vs/platform/broadcast/electron-browser/broadcastService';
 import { IRemoteConsoleLog, parse, getFirstFrame } from 'vs/base/node/console';
-import { Source } from 'vs/workbench/parts/debug/common/debugSource';
-import { TaskEvent, TaskEventKind } from 'vs/workbench/parts/tasks/common/tasks';
+import { TaskEvent, TaskEventKind, TaskIdentifier } from 'vs/workbench/parts/tasks/common/tasks';
 import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
 import { INotificationService } from 'vs/platform/notification/common/notification';
 import { IAction, Action } from 'vs/base/common/actions';
-import { normalizeDriveLetter } from 'vs/base/common/labels';
-import { RunOnceScheduler } from 'vs/base/common/async';
-import product from 'vs/platform/node/product';
 import { deepClone, equals } from 'vs/base/common/objects';
+import { DebugSession } from 'vs/workbench/parts/debug/electron-browser/debugSession';
+import { dispose, IDisposable } from 'vs/base/common/lifecycle';
+import { IDebugService, State, IDebugSession, CONTEXT_DEBUG_TYPE, CONTEXT_DEBUG_STATE, CONTEXT_IN_DEBUG_MODE, IThread, IDebugConfiguration, VIEWLET_ID, REPL_ID, IConfig, ILaunch, IViewModel, IConfigurationManager, IModel, IReplElementSource, IEnablement, IBreakpoint, IBreakpointData, IExpression, ICompound, IGlobalConfig, IStackFrame, AdapterEndEvent } from 'vs/workbench/parts/debug/common/debug';
+import { isExtensionHostDebugging } from 'vs/workbench/parts/debug/common/debugUtils';
 
 const DEBUG_BREAKPOINTS_KEY = 'debug.breakpoint';
 const DEBUG_BREAKPOINTS_ACTIVATED_KEY = 'debug.breakpointactivated';
@@ -62,28 +56,25 @@ const DEBUG_FUNCTION_BREAKPOINTS_KEY = 'debug.functionbreakpoint';
 const DEBUG_EXCEPTION_BREAKPOINTS_KEY = 'debug.exceptionbreakpoint';
 const DEBUG_WATCH_EXPRESSIONS_KEY = 'debug.watchexpressions';
 
-export class DebugService implements debug.IDebugService {
-	public _serviceBrand: any;
+export class DebugService implements IDebugService {
+	_serviceBrand: any;
 
-	private sessionStates: Map<string, debug.State>;
-	private readonly _onDidChangeState: Emitter<debug.State>;
-	private readonly _onDidNewSession: Emitter<debug.ISession>;
-	private readonly _onDidEndSession: Emitter<debug.ISession>;
-	private readonly _onDidCustomEvent: Emitter<debug.DebugEvent>;
+	private readonly _onDidChangeState: Emitter<State>;
+	private readonly _onDidNewSession: Emitter<IDebugSession>;
+	private readonly _onWillNewSession: Emitter<IDebugSession>;
+	private readonly _onDidEndSession: Emitter<IDebugSession>;
 	private model: Model;
 	private viewModel: ViewModel;
-	private allSessions: Map<string, debug.ISession>;
 	private configurationManager: ConfigurationManager;
-	private toDispose: lifecycle.IDisposable[];
-	private toDisposeOnSessionEnd: Map<string, lifecycle.IDisposable[]>;
-	private inDebugMode: IContextKey<boolean>;
+	private allSessions = new Map<string, IDebugSession>();
+	private toDispose: IDisposable[];
 	private debugType: IContextKey<string>;
 	private debugState: IContextKey<string>;
+	private inDebugMode: IContextKey<boolean>;
 	private breakpointsToSendOnResourceSaved: Set<string>;
-	private firstSessionStart: boolean;
 	private skipRunningTask: boolean;
-	private previousState: debug.State;
-	private fetchThreadsSchedulers: Map<string, RunOnceScheduler>;
+	private initializing = false;
+	private previousState: State;
 
 	constructor(
 		@IStorageService private storageService: IStorageService,
@@ -108,159 +99,656 @@ export class DebugService implements debug.IDebugService {
 		@IConfigurationService private configurationService: IConfigurationService,
 	) {
 		this.toDispose = [];
-		this.toDisposeOnSessionEnd = new Map<string, lifecycle.IDisposable[]>();
+
 		this.breakpointsToSendOnResourceSaved = new Set<string>();
-		this._onDidChangeState = new Emitter<debug.State>();
-		this._onDidNewSession = new Emitter<debug.ISession>();
-		this._onDidEndSession = new Emitter<debug.ISession>();
-		this._onDidCustomEvent = new Emitter<debug.DebugEvent>();
-		this.sessionStates = new Map<string, debug.State>();
-		this.allSessions = new Map<string, debug.ISession>();
-		this.fetchThreadsSchedulers = new Map<string, RunOnceScheduler>();
+
+		this._onDidChangeState = new Emitter<State>();
+		this._onDidNewSession = new Emitter<IDebugSession>();
+		this._onWillNewSession = new Emitter<IDebugSession>();
+		this._onDidEndSession = new Emitter<IDebugSession>();
 
 		this.configurationManager = this.instantiationService.createInstance(ConfigurationManager);
 		this.toDispose.push(this.configurationManager);
-		this.inDebugMode = debug.CONTEXT_IN_DEBUG_MODE.bindTo(contextKeyService);
-		this.debugType = debug.CONTEXT_DEBUG_TYPE.bindTo(contextKeyService);
-		this.debugState = debug.CONTEXT_DEBUG_STATE.bindTo(contextKeyService);
+
+		this.debugType = CONTEXT_DEBUG_TYPE.bindTo(contextKeyService);
+		this.debugState = CONTEXT_DEBUG_STATE.bindTo(contextKeyService);
+		this.inDebugMode = CONTEXT_IN_DEBUG_MODE.bindTo(contextKeyService);
 
 		this.model = new Model(this.loadBreakpoints(), this.storageService.getBoolean(DEBUG_BREAKPOINTS_ACTIVATED_KEY, StorageScope.WORKSPACE, true), this.loadFunctionBreakpoints(),
-			this.loadExceptionBreakpoints(), this.loadWatchExpressions());
+			this.loadExceptionBreakpoints(), this.loadWatchExpressions(), this.textFileService);
 		this.toDispose.push(this.model);
+
 		this.viewModel = new ViewModel(contextKeyService);
-		this.firstSessionStart = true;
 
-		this.registerListeners();
-	}
-
-	private registerListeners(): void {
 		this.toDispose.push(this.fileService.onFileChanges(e => this.onFileChanges(e)));
 		this.lifecycleService.onShutdown(this.store, this);
 		this.lifecycleService.onShutdown(this.dispose, this);
-		this.toDispose.push(this.broadcastService.onBroadcast(this.onBroadcast, this));
+
+		this.toDispose.push(this.broadcastService.onBroadcast(broadcast => {
+			const session = this.getSession(broadcast.payload.debugId);
+			if (session) {
+				switch (broadcast.channel) {
+
+					case EXTENSION_ATTACH_BROADCAST_CHANNEL:
+						// EH was started in debug mode -> attach to it
+						this.attachExtensionHost(session, broadcast.payload.port);
+						break;
+
+					case EXTENSION_TERMINATE_BROADCAST_CHANNEL:
+						// EH was terminated
+						session.disconnect();
+						break;
+
+					case EXTENSION_LOG_BROADCAST_CHANNEL:
+						// extension logged output -> show it in REPL
+						this.addToRepl(session, broadcast.payload.logEntry);
+						break;
+				}
+			}
+		}, this));
+
 		this.toDispose.push(this.viewModel.onDidFocusSession(s => {
 			const id = s ? s.getId() : undefined;
 			this.model.setBreakpointsSessionId(id);
+			this.onStateChange();
 		}));
 	}
 
-	private onBroadcast(broadcast: IBroadcast): void {
+	getSession(sessionId: string): IDebugSession {
+		return this.allSessions.get(sessionId);
+	}
 
-		// attach: PH is ready to be attached to
-		const session = <Session>this.allSessions.get(broadcast.payload.debugId);
-		if (!session) {
-			// Ignore attach events for sessions that never existed (wrong vscode windows)
-			return;
-		}
-		const raw = <RawDebugSession>session.raw;
+	getModel(): IModel {
+		return this.model;
+	}
 
-		if (broadcast.channel === EXTENSION_ATTACH_BROADCAST_CHANNEL) {
-			const initialAttach = session.configuration.request === 'launch';
+	getViewModel(): IViewModel {
+		return this.viewModel;
+	}
 
-			session.configuration.request = 'attach';
-			session.configuration.port = broadcast.payload.port;
-			// Do not end process on initial attach (since the request is still 'launch')
-			if (initialAttach) {
-				const root = raw.root;
-				lifecycle.dispose(this.toDisposeOnSessionEnd[raw.getId()]);
-				this.initializeRawSession(root, { resolved: session.configuration, unresolved: session.unresolvedConfiguration }, session.getId(), session).then(session => {
-					(<RawDebugSession>session.raw).attach(session.configuration);
-				});
-			} else {
-				this.onRawSessionEnd(raw);
-				this.doCreateSession(session.raw.root, { resolved: session.configuration, unresolved: session.unresolvedConfiguration }, session.getId());
-			}
+	getConfigurationManager(): IConfigurationManager {
+		return this.configurationManager;
+	}
 
-			return;
+	sourceIsNotAvailable(uri: uri): void {
+		this.model.sourceIsNotAvailable(uri);
+	}
+
+	dispose(): void {
+		this.toDispose = dispose(this.toDispose);
+	}
+
+	//---- state management
+
+	get state(): State {
+		const focusedSession = this.viewModel.focusedSession;
+		if (focusedSession) {
+			return focusedSession.state;
 		}
 
-		if (broadcast.channel === EXTENSION_TERMINATE_BROADCAST_CHANNEL) {
-			this.onRawSessionEnd(raw);
-			return;
-		}
+		return this.initializing ? State.Initializing : State.Inactive;
+	}
 
-		// an extension logged output, show it inside the REPL
-		if (broadcast.channel === EXTENSION_LOG_BROADCAST_CHANNEL) {
-			let extensionOutput: IRemoteConsoleLog = broadcast.payload.logEntry;
-			let sev = extensionOutput.severity === 'warn' ? severity.Warning : extensionOutput.severity === 'error' ? severity.Error : severity.Info;
-
-			const { args, stack } = parse(extensionOutput);
-			let source: debug.IReplElementSource;
-			if (stack) {
-				const frame = getFirstFrame(stack);
-				if (frame) {
-					source = {
-						column: frame.column,
-						lineNumber: frame.line,
-						source: session.getSource({
-							name: resources.basenameOrAuthority(frame.uri),
-							path: frame.uri.fsPath
-						})
-					};
-				}
-			}
-
-			// add output for each argument logged
-			let simpleVals: any[] = [];
-			for (let i = 0; i < args.length; i++) {
-				let a = args[i];
-
-				// undefined gets printed as 'undefined'
-				if (typeof a === 'undefined') {
-					simpleVals.push('undefined');
-				}
-
-				// null gets printed as 'null'
-				else if (a === null) {
-					simpleVals.push('null');
-				}
-
-				// objects & arrays are special because we want to inspect them in the REPL
-				else if (isObject(a) || Array.isArray(a)) {
-
-					// flush any existing simple values logged
-					if (simpleVals.length) {
-						this.logToRepl(simpleVals.join(' '), sev, source);
-						simpleVals = [];
-					}
-
-					// show object
-					this.logToRepl(new RawObjectReplElement((<any>a).prototype, a, undefined, nls.localize('snapshotObj', "Only primitive values are shown for this object.")), sev, source);
-				}
-
-				// string: watch out for % replacement directive
-				// string substitution and formatting @ https://developer.chrome.com/devtools/docs/console
-				else if (typeof a === 'string') {
-					let buf = '';
-
-					for (let j = 0, len = a.length; j < len; j++) {
-						if (a[j] === '%' && (a[j + 1] === 's' || a[j + 1] === 'i' || a[j + 1] === 'd')) {
-							i++; // read over substitution
-							buf += !isUndefinedOrNull(args[i]) ? args[i] : ''; // replace
-							j++; // read over directive
-						} else {
-							buf += a[j];
-						}
-					}
-
-					simpleVals.push(buf);
-				}
-
-				// number or boolean is joined together
-				else {
-					simpleVals.push(a);
-				}
-			}
-
-			// flush simple values
-			// always append a new line for output coming from an extension such that separate logs go to separate lines #23695
-			if (simpleVals.length) {
-				this.logToRepl(simpleVals.join(' ') + '\n', sev, source);
-			}
+	private startInitializingState() {
+		if (!this.initializing) {
+			this.initializing = true;
+			this.onStateChange();
 		}
 	}
 
-	private tryToAutoFocusStackFrame(thread: debug.IThread): TPromise<any> {
+	private endInitializingState() {
+		if (this.initializing) {
+			this.initializing = false;
+			this.onStateChange();
+		}
+	}
+
+	private onStateChange(): void {
+		const state = this.state;
+		if (this.previousState !== state) {
+			const stateLabel = State[state];
+			if (stateLabel) {
+				this.debugState.set(stateLabel.toLowerCase());
+				this.inDebugMode.set(state !== State.Inactive);
+			}
+			this.previousState = state;
+			this._onDidChangeState.fire(state);
+		}
+	}
+
+	get onDidChangeState(): Event<State> {
+		return this._onDidChangeState.event;
+	}
+
+	get onDidNewSession(): Event<IDebugSession> {
+		return this._onDidNewSession.event;
+	}
+
+	get onWillNewSession(): Event<IDebugSession> {
+		return this._onWillNewSession.event;
+	}
+
+	get onDidEndSession(): Event<IDebugSession> {
+		return this._onDidEndSession.event;
+	}
+
+	//---- life cycle management
+
+	/**
+	 * main entry point
+	 */
+	startDebugging(launch: ILaunch, configOrName?: IConfig | string, noDebug = false, unresolvedConfiguration?: IConfig, ): TPromise<void> {
+
+		// make sure to save all files and that the configuration is up to date
+		return this.extensionService.activateByEvent('onDebug').then(() =>
+			this.textFileService.saveAll().then(() =>
+				this.configurationService.reloadConfiguration(launch ? launch.workspace : undefined).then(() =>
+					this.extensionService.whenInstalledExtensionsRegistered().then(() => {
+
+						if (this.model.getSessions().length === 0) {
+							this.removeReplExpressions();
+							this.allSessions.clear();
+						}
+
+						let config: IConfig, compound: ICompound;
+						if (!configOrName) {
+							configOrName = this.configurationManager.selectedConfiguration.name;
+						}
+						if (typeof configOrName === 'string' && launch) {
+							config = launch.getConfiguration(configOrName);
+							compound = launch.getCompound(configOrName);
+
+							const sessions = this.model.getSessions();
+							const alreadyRunningMessage = nls.localize('configurationAlreadyRunning', "There is already a debug configuration \"{0}\" running.", configOrName);
+							if (sessions.some(s => s.getName(false) === configOrName && (!launch || !launch.workspace || !s.root || s.root.uri.toString() === launch.workspace.uri.toString()))) {
+								return TPromise.wrapError(new Error(alreadyRunningMessage));
+							}
+							if (compound && compound.configurations && sessions.some(p => compound.configurations.indexOf(p.getName(false)) !== -1)) {
+								return TPromise.wrapError(new Error(alreadyRunningMessage));
+							}
+						} else if (typeof configOrName !== 'string') {
+							config = configOrName;
+						}
+
+						if (compound) {
+							if (!compound.configurations) {
+								return TPromise.wrapError(new Error(nls.localize({ key: 'compoundMustHaveConfigurations', comment: ['compound indicates a "compounds" configuration item', '"configurations" is an attribute and should not be localized'] },
+									"Compound must have \"configurations\" attribute set in order to start multiple configurations.")));
+							}
+
+							return TPromise.join(compound.configurations.map(configData => {
+								const name = typeof configData === 'string' ? configData : configData.name;
+								if (name === compound.name) {
+									return TPromise.as(null);
+								}
+
+								let launchForName: ILaunch;
+								if (typeof configData === 'string') {
+									const launchesContainingName = this.configurationManager.getLaunches().filter(l => !!l.getConfiguration(name));
+									if (launchesContainingName.length === 1) {
+										launchForName = launchesContainingName[0];
+									} else if (launchesContainingName.length > 1 && launchesContainingName.indexOf(launch) >= 0) {
+										// If there are multiple launches containing the configuration give priority to the configuration in the current launch
+										launchForName = launch;
+									} else {
+										return TPromise.wrapError(new Error(launchesContainingName.length === 0 ? nls.localize('noConfigurationNameInWorkspace', "Could not find launch configuration '{0}' in the workspace.", name)
+											: nls.localize('multipleConfigurationNamesInWorkspace', "There are multiple launch configurations '{0}' in the workspace. Use folder name to qualify the configuration.", name)));
+									}
+								} else if (configData.folder) {
+									const launchesMatchingConfigData = this.configurationManager.getLaunches().filter(l => l.workspace && l.workspace.name === configData.folder && !!l.getConfiguration(configData.name));
+									if (launchesMatchingConfigData.length === 1) {
+										launchForName = launchesMatchingConfigData[0];
+									} else {
+										return TPromise.wrapError(new Error(nls.localize('noFolderWithName', "Can not find folder with name '{0}' for configuration '{1}' in compound '{2}'.", configData.folder, configData.name, compound.name)));
+									}
+								}
+
+								return this.startDebugging(launchForName, name, noDebug, unresolvedConfiguration);
+							}));
+						}
+						if (configOrName && !config) {
+							const message = !!launch ? nls.localize('configMissing', "Configuration '{0}' is missing in 'launch.json'.", typeof configOrName === 'string' ? configOrName : JSON.stringify(configOrName)) :
+								nls.localize('launchJsonDoesNotExist', "'launch.json' does not exist.");
+							return TPromise.wrapError(new Error(message));
+						}
+
+						// We keep the debug type in a separate variable 'type' so that a no-folder config has no attributes.
+						// Storing the type in the config would break extensions that assume that the no-folder case is indicated by an empty config.
+						let type: string;
+						if (config) {
+							type = config.type;
+						} else {
+							// a no-folder workspace has no launch.config
+							config = <IConfig>{};
+						}
+						unresolvedConfiguration = unresolvedConfiguration || deepClone(config);
+
+						if (noDebug) {
+							config.noDebug = true;
+						}
+
+						return (type ? TPromise.as(null) : this.configurationManager.guessDebugger().then(a => type = a && a.type)).then(() =>
+							this.configurationManager.resolveConfigurationByProviders(launch && launch.workspace ? launch.workspace.uri : undefined, type, config).then(config => {
+								// a falsy config indicates an aborted launch
+								if (config && config.type) {
+									return this.createSession(launch, config, unresolvedConfiguration);
+								}
+
+								if (launch && type) {
+									return launch.openConfigFile(false, true, type).then(() => undefined);
+								}
+
+								return undefined;
+							})
+						).then(() => undefined);
+					})
+				)));
+	}
+
+	private createSession(launch: ILaunch, config: IConfig, unresolvedConfig: IConfig): TPromise<void> {
+
+		this.startInitializingState();
+
+		return this.textFileService.saveAll().then(() =>
+			this.substituteVariables(launch, config).then(resolvedConfig => {
+
+				if (!resolvedConfig) {
+					// User canceled resolving of interactive variables, silently return
+					return undefined;
+				}
+
+				if (!this.configurationManager.getDebugger(resolvedConfig.type) || (config.request !== 'attach' && config.request !== 'launch')) {
+					let message: string;
+					if (config.request !== 'attach' && config.request !== 'launch') {
+						message = config.request ? nls.localize('debugRequestNotSupported', "Attribute '{0}' has an unsupported value '{1}' in the chosen debug configuration.", 'request', config.request)
+							: nls.localize('debugRequesMissing', "Attribute '{0}' is missing from the chosen debug configuration.", 'request');
+
+					} else {
+						message = resolvedConfig.type ? nls.localize('debugTypeNotSupported', "Configured debug type '{0}' is not supported.", resolvedConfig.type) :
+							nls.localize('debugTypeMissing', "Missing property 'type' for the chosen launch configuration.");
+					}
+
+					return this.showError(message);
+				}
+
+				const workspace = launch ? launch.workspace : undefined;
+				return this.runTask(workspace, resolvedConfig.preLaunchTask, resolvedConfig, unresolvedConfig).then(success => {
+					if (success) {
+						return this.doCreateSession(workspace, { resolved: resolvedConfig, unresolved: unresolvedConfig });
+					}
+					return undefined;
+				});
+			}, err => {
+				if (err && err.message) {
+					return this.showError(err.message);
+				}
+				if (this.contextService.getWorkbenchState() === WorkbenchState.EMPTY) {
+					return this.showError(nls.localize('noFolderWorkspaceDebugError', "The active file can not be debugged. Make sure it is saved on disk and that you have a debug extension installed for that file type."));
+				}
+
+				return launch && launch.openConfigFile(false, true).then(editor => void 0);
+			})
+		).then(() => {
+			this.endInitializingState();
+		}, err => {
+			this.endInitializingState();
+			return TPromise.wrapError(err);
+		});
+	}
+
+	private attachExtensionHost(session: IDebugSession, port: number): TPromise<void> {
+
+		session.configuration.request = 'attach';
+		session.configuration.port = port;
+		const dbgr = this.configurationManager.getDebugger(session.configuration.type);
+
+		return session.initialize(dbgr).then(() => {
+			session.launchOrAttach(session.configuration).then(() => {
+				this.focusStackFrame(undefined, undefined, session);
+			});
+		});
+	}
+
+	private doCreateSession(root: IWorkspaceFolder, configuration: { resolved: IConfig, unresolved: IConfig }): TPromise<any> {
+
+		const session = <IDebugSession>this.instantiationService.createInstance(DebugSession, configuration, root, this.model);
+		this.allSessions.set(session.getId(), session);
+
+		// register listeners as the very first thing!
+		this.registerSessionListeners(session);
+
+		// since the Session is now properly registered under its ID and hooked, we can announce it
+		// this event doesn't go to extensions
+		this._onWillNewSession.fire(session);
+
+		const resolved = configuration.resolved;
+		const dbgr = this.configurationManager.getDebugger(resolved.type);
+
+		return session.initialize(dbgr).then(() => {
+
+			return session.launchOrAttach(resolved).then(() => {
+
+				this.focusStackFrame(undefined, undefined, session);
+
+				// since the initialized response has arrived announce the new Session (including extensions)
+				this._onDidNewSession.fire(session);
+
+				const internalConsoleOptions = resolved.internalConsoleOptions || this.configurationService.getValue<IDebugConfiguration>('debug').internalConsoleOptions;
+				if (internalConsoleOptions === 'openOnSessionStart' || (this.viewModel.firstSessionStart && internalConsoleOptions === 'openOnFirstSessionStart')) {
+					this.panelService.openPanel(REPL_ID, false);
+				}
+
+				const openDebug = this.configurationService.getValue<IDebugConfiguration>('debug').openDebug;
+				// Open debug viewlet based on the visibility of the side bar and openDebug setting
+				if (openDebug === 'openOnSessionStart' || (openDebug === 'openOnFirstSessionStart' && this.viewModel.firstSessionStart)) {
+					this.viewletService.openViewlet(VIEWLET_ID);
+				}
+				this.viewModel.firstSessionStart = false;
+
+				this.debugType.set(resolved.type);
+				if (this.model.getSessions().length > 1) {
+					this.viewModel.setMultiSessionView(true);
+				}
+
+				return this.telemetryDebugSessionStart(root, resolved.type, dbgr.extensionDescription);
+
+			}).then(() => session, (error: Error | string) => {
+
+				if (session) {
+					session.dispose();
+				}
+
+				if (errors.isPromiseCanceledError(error)) {
+					// don't show 'canceled' error messages to the user #7906
+					return TPromise.as(undefined);
+				}
+
+				// Show the repl if some error got logged there #5870
+				if (this.model.getReplElements().length > 0) {
+					this.panelService.openPanel(REPL_ID, false);
+				}
+
+				if (resolved && resolved.request === 'attach' && resolved.__autoAttach) {
+					// ignore attach timeouts in auto attach mode
+				} else {
+					const errorMessage = error instanceof Error ? error.message : error;
+					this.telemetryDebugMisconfiguration(resolved ? resolved.type : undefined, errorMessage);
+					this.showError(errorMessage, errors.isErrorWithActions(error) ? error.actions : []);
+				}
+				return TPromise.as(undefined);
+			});
+
+		}).then(undefined, error => {
+
+			if (session) {
+				session.dispose();
+			}
+
+			if (errors.isPromiseCanceledError(error)) {
+				// don't show 'canceled' error messages to the user #7906
+				return TPromise.as(null);
+			}
+			return TPromise.wrapError(error);
+		});
+	}
+
+	private registerSessionListeners(session: IDebugSession): void {
+
+		this.toDispose.push(session.onDidChangeState((state) => {
+			if (state === State.Running && this.viewModel.focusedSession && this.viewModel.focusedSession.getId() === session.getId()) {
+				this.focusStackFrame(undefined);
+			}
+			this.onStateChange();
+		}));
+
+		this.toDispose.push(session.onDidEndAdapter(adapterExitEvent => {
+
+			if (adapterExitEvent.error) {
+				this.notificationService.error(nls.localize('debugAdapterCrash', "Debug adapter process has terminated unexpectedly ({0})", adapterExitEvent.error.message || adapterExitEvent.error.toString()));
+			}
+
+			// 'Run without debugging' mode VSCode must terminate the extension host. More details: #3905
+			if (isExtensionHostDebugging(session.configuration) && session.state === State.Running && session.configuration.noDebug) {
+				this.broadcastService.broadcast({
+					channel: EXTENSION_CLOSE_EXTHOST_BROADCAST_CHANNEL,
+					payload: [session.root.uri.toString()]
+				});
+			}
+
+			this.telemetryDebugSessionStop(session, adapterExitEvent);
+
+			if (session.configuration.postDebugTask) {
+				this.doRunTask(session.root, session.configuration.postDebugTask).then(undefined, err =>
+					this.notificationService.error(err)
+				);
+			}
+			session.dispose();
+			this._onDidEndSession.fire(session);
+
+			const focusedSession = this.viewModel.focusedSession;
+			if (focusedSession && focusedSession.getId() === session.getId()) {
+				this.focusStackFrame(undefined);
+			}
+
+			if (this.model.getSessions().length === 0) {
+				this.debugType.reset();
+				this.viewModel.setMultiSessionView(false);
+
+				if (this.partService.isVisible(Parts.SIDEBAR_PART) && this.configurationService.getValue<IDebugConfiguration>('debug').openExplorerOnEnd) {
+					this.viewletService.openViewlet(EXPLORER_VIEWLET_ID);
+				}
+			}
+
+		}));
+	}
+
+	restartSession(session: IDebugSession, restartData?: any): TPromise<any> {
+
+
+		return this.textFileService.saveAll().then(() => {
+
+			const unresolvedConfiguration = session.unresolvedConfiguration;
+			if (session.capabilities.supportsRestartRequest) {
+				return this.runTask(session.root, session.configuration.postDebugTask, session.configuration, unresolvedConfiguration)
+					.then(success => success ? this.runTask(session.root, session.configuration.preLaunchTask, session.configuration, unresolvedConfiguration)
+						.then(success => success ? session.restart() : undefined) : TPromise.as(<any>undefined));
+			}
+
+			const focusedSession = this.viewModel.focusedSession;
+			const preserveFocus = focusedSession && session.getId() === focusedSession.getId();
+
+			// Do not run preLaunch and postDebug tasks for automatic restarts
+			const isAutoRestart = !!restartData;
+			this.skipRunningTask = isAutoRestart;
+
+			if (isExtensionHostDebugging(session.configuration) && session.root) {
+				return this.broadcastService.broadcast({
+					channel: EXTENSION_RELOAD_BROADCAST_CHANNEL,
+					payload: [session.root.uri.toString()]
+				});
+			}
+
+			// If the restart is automatic  -> disconnect, otherwise -> terminate #55064
+			return (isAutoRestart ? session.disconnect(true) : session.terminate(true)).then(() => {
+
+				return new TPromise<void>((c, e) => {
+					setTimeout(() => {
+						// Read the configuration again if a launch.json has been changed, if not just use the inmemory configuration
+						let configToUse = session.configuration;
+
+						const launch = session.root ? this.configurationManager.getLaunch(session.root.uri) : undefined;
+						if (launch) {
+							const config = launch.getConfiguration(session.configuration.name);
+							if (config && !equals(config, unresolvedConfiguration)) {
+								// Take the type from the session since the debug extension might overwrite it #21316
+								configToUse = config;
+								configToUse.type = session.configuration.type;
+								configToUse.noDebug = session.configuration.noDebug;
+							}
+						}
+						configToUse.__restart = restartData;
+						this.skipRunningTask = isAutoRestart;
+						this.startDebugging(launch, configToUse, configToUse.noDebug, unresolvedConfiguration).then(() => c(null), err => e(err));
+					}, 300);
+				});
+			}).then(() => {
+				if (preserveFocus) {
+					// Restart should preserve the focused session
+					const restartedSession = this.model.getSessions().filter(p => p.configuration.name === session.configuration.name).pop();
+					if (restartedSession && restartedSession !== this.viewModel.focusedSession) {
+						this.focusStackFrame(undefined, undefined, restartedSession);
+					}
+				}
+			});
+		});
+	}
+
+	stopSession(session: IDebugSession): TPromise<any> {
+
+		if (session) {
+			return session.terminate();
+		}
+
+		const sessions = this.model.getSessions();
+		if (sessions.length) {
+			return TPromise.join(sessions.map(s => s.terminate()));
+		}
+
+		this._onDidChangeState.fire();	// TODO@AW why state change?
+		return undefined;
+	}
+
+	private substituteVariables(launch: ILaunch | undefined, config: IConfig): TPromise<IConfig> {
+		const dbg = this.configurationManager.getDebugger(config.type);
+		if (dbg) {
+			let folder: IWorkspaceFolder = undefined;
+			if (launch && launch.workspace) {
+				folder = launch.workspace;
+			} else {
+				const folders = this.contextService.getWorkspace().folders;
+				if (folders.length === 1) {
+					folder = folders[0];
+				}
+			}
+			return dbg.substituteVariables(folder, config).then(config => {
+				return config;
+			}, (err: Error) => {
+				this.showError(err.message);
+				return undefined;	// bail out
+			});
+		}
+		return TPromise.as(config);
+	}
+
+	private showError(message: string, actions: IAction[] = []): TPromise<any> {
+		const configureAction = this.instantiationService.createInstance(debugactions.ConfigureAction, debugactions.ConfigureAction.ID, debugactions.ConfigureAction.LABEL);
+		actions.push(configureAction);
+		return this.dialogService.show(severity.Error, message, actions.map(a => a.label).concat(nls.localize('cancel', "Cancel")), { cancelId: actions.length }).then(choice => {
+			if (choice < actions.length) {
+				return actions[choice].run();
+			}
+
+			return TPromise.as(null);
+		});
+	}
+
+	//---- task management
+
+	private runTask(root: IWorkspaceFolder, taskId: string | TaskIdentifier, config: IConfig, unresolvedConfig: IConfig): TPromise<boolean> {
+
+		const debugAnywayAction = new Action('debug.debugAnyway', nls.localize('debugAnyway', "Debug Anyway"), undefined, true, () => {
+			return this.doCreateSession(root, { resolved: config, unresolved: unresolvedConfig });
+		});
+
+		return this.doRunTask(root, taskId).then((taskSummary: ITaskSummary) => {
+			const errorCount = config.preLaunchTask ? this.markerService.getStatistics().errors : 0;
+			const successExitCode = taskSummary && taskSummary.exitCode === 0;
+			const failureExitCode = taskSummary && taskSummary.exitCode !== undefined && taskSummary.exitCode !== 0;
+			if (successExitCode || (errorCount === 0 && !failureExitCode)) {
+				return true;
+			}
+
+			const taskId = typeof config.preLaunchTask === 'string' ? config.preLaunchTask : JSON.stringify(config.preLaunchTask);
+			const message = errorCount > 1
+				? nls.localize('preLaunchTaskErrors', "Build errors have been detected during preLaunchTask '{0}'.", taskId)
+				: errorCount === 1
+					? nls.localize('preLaunchTaskError', "Build error has been detected during preLaunchTask '{0}'.", taskId)
+					: nls.localize('preLaunchTaskExitCode', "The preLaunchTask '{0}' terminated with exit code {1}.", taskId, taskSummary.exitCode);
+
+			const showErrorsAction = new Action('debug.showErrors', nls.localize('showErrors', "Show Errors"), undefined, true, () => {
+				return this.panelService.openPanel(Constants.MARKERS_PANEL_ID).then(() => undefined);
+			});
+
+			return this.showError(message, [debugAnywayAction, showErrorsAction]).then(() => false);
+		}, (err: TaskError) => {
+			return this.showError(err.message, [debugAnywayAction, this.taskService.configureAction()]).then(() => false);
+		});
+	}
+
+	private doRunTask(root: IWorkspaceFolder, taskId: string | TaskIdentifier): TPromise<ITaskSummary> {
+		if (!taskId || this.skipRunningTask) {
+			this.skipRunningTask = false;
+			return TPromise.as(null);
+		}
+		// run a task before starting a debug session
+		return this.taskService.getTask(root, taskId).then(task => {
+			if (!task) {
+				const errorMessage = typeof taskId === 'string'
+					? nls.localize('DebugTaskNotFoundWithTaskId', "Could not find the task '{0}'.", taskId)
+					: nls.localize('DebugTaskNotFound', "Could not find the specified task.");
+				return TPromise.wrapError(errors.create(errorMessage));
+			}
+
+			function once(kind: TaskEventKind, event: Event<TaskEvent>): Event<TaskEvent> {
+				return (listener, thisArgs = null, disposables?) => {
+					const result = event(e => {
+						if (e.kind === kind) {
+							result.dispose();
+							return listener.call(thisArgs, e);
+						}
+					}, null, disposables);
+					return result;
+				};
+			}
+			// If a task is missing the problem matcher the promise will never complete, so we need to have a workaround #35340
+			let taskStarted = false;
+			const promise = this.taskService.getActiveTasks().then(tasks => {
+				if (tasks.filter(t => t._id === task._id).length) {
+					// task is already running - nothing to do.
+					return TPromise.as(null);
+				}
+				once(TaskEventKind.Active, this.taskService.onDidStateChange)((taskEvent) => {
+					taskStarted = true;
+				});
+				const taskPromise = this.taskService.run(task);
+				if (task.isBackground) {
+					return new TPromise((c, e) => once(TaskEventKind.Inactive, this.taskService.onDidStateChange)(() => c(null)));
+				}
+
+				return taskPromise;
+			});
+
+			return new TPromise((c, e) => {
+				promise.then(result => {
+					taskStarted = true;
+					c(result);
+				}, error => e(error));
+
+				setTimeout(() => {
+					if (!taskStarted) {
+						const errorMessage = typeof taskId === 'string'
+							? nls.localize('taskNotTrackedWithTaskId', "The specified task cannot be tracked.")
+							: nls.localize('taskNotTracked', "The task '{0}' cannot be tracked.", JSON.stringify(taskId));
+						e({ severity: severity.Error, message: errorMessage });
+					}
+				}, 10000);
+			});
+		});
+	}
+
+	//---- focus management
+
+	tryToAutoFocusStackFrame(thread: IThread): TPromise<any> {
 		const callStack = thread.getCallStack();
 		if (!callStack.length || (this.viewModel.focusedStackFrame && this.viewModel.focusedStackFrame.thread.getId() === thread.getId())) {
 			return TPromise.as(null);
@@ -274,8 +762,8 @@ export class DebugService implements debug.IDebugService {
 
 		this.focusStackFrame(stackFrameToFocus);
 		if (thread.stoppedDetails) {
-			if (this.configurationService.getValue<debug.IDebugConfiguration>('debug').openDebug === 'openOnDebugBreak') {
-				this.viewletService.openViewlet(debug.VIEWLET_ID).done(undefined, errors.onUnexpectedError);
+			if (this.configurationService.getValue<IDebugConfiguration>('debug').openDebug === 'openOnDebugBreak') {
+				this.viewletService.openViewlet(VIEWLET_ID);
 			}
 			this.windowService.focusWindow();
 			aria.alert(nls.localize('debuggingPaused', "Debugging paused, reason {0}, {1} {2}", thread.stoppedDetails.reason, stackFrameToFocus.source ? stackFrameToFocus.source.name : '', stackFrameToFocus.range.startLineNumber));
@@ -284,189 +772,281 @@ export class DebugService implements debug.IDebugService {
 		return stackFrameToFocus.openInEditor(this.editorService, true);
 	}
 
-	private registerSessionListeners(session: debug.ISession, raw: RawDebugSession): void {
-		this.toDisposeOnSessionEnd.get(raw.getId()).push(raw);
-
-		this.toDisposeOnSessionEnd.get(raw.getId()).push(raw.onDidInitialize(event => {
-			aria.status(nls.localize('debuggingStarted', "Debugging started."));
-			const sendConfigurationDone = () => {
-				if (raw && raw.capabilities.supportsConfigurationDoneRequest) {
-					return raw.configurationDone().done(null, e => {
-						// Disconnect the debug session on configuration done error #10596
-						if (raw) {
-							raw.disconnect().done(null, errors.onUnexpectedError);
-						}
-						this.notificationService.error(e.message);
-					});
-				}
-			};
-
-			this.sendAllBreakpoints(session).then(sendConfigurationDone, sendConfigurationDone)
-				.done(() => this.fetchThreads(raw), errors.onUnexpectedError);
-		}));
-
-		this.toDisposeOnSessionEnd.get(session.getId()).push(raw.onDidStop(event => {
-			this.updateStateAndEmit(session.getId(), debug.State.Stopped);
-			this.fetchThreads(raw, event.body).done(() => {
-				const thread = session && session.getThread(event.body.threadId);
-				if (thread) {
-					// Call fetch call stack twice, the first only return the top stack frame.
-					// Second retrieves the rest of the call stack. For performance reasons #25605
-					this.model.fetchCallStack(<Thread>thread).then(() => {
-						return !event.body.preserveFocusHint ? this.tryToAutoFocusStackFrame(thread) : undefined;
-					});
-				}
-			}, errors.onUnexpectedError);
-		}));
-
-		this.toDisposeOnSessionEnd.get(session.getId()).push(raw.onDidThread(event => {
-			if (event.body.reason === 'started') {
-				// debounce to reduce threadsRequest frequency and improve performance
-				let scheduler = this.fetchThreadsSchedulers.get(session.getId());
-				if (!scheduler) {
-					scheduler = new RunOnceScheduler(() => {
-						this.fetchThreads(raw).done(undefined, errors.onUnexpectedError);
-					}, 100);
-					this.fetchThreadsSchedulers.set(session.getId(), scheduler);
-					this.toDisposeOnSessionEnd.get(session.getId()).push(scheduler);
-				}
-				if (!scheduler.isScheduled()) {
-					scheduler.schedule();
-				}
-			} else if (event.body.reason === 'exited') {
-				this.model.clearThreads(session.getId(), true, event.body.threadId);
+	focusStackFrame(stackFrame: IStackFrame, thread?: IThread, session?: IDebugSession, explicit?: boolean): void {
+		if (!session) {
+			if (stackFrame || thread) {
+				session = stackFrame ? stackFrame.thread.session : thread.session;
+			} else {
+				const sessions = this.model.getSessions();
+				session = sessions.length ? sessions[0] : undefined;
 			}
-		}));
+		}
 
-		this.toDisposeOnSessionEnd.get(session.getId()).push(raw.onDidTerminateDebugee(event => {
-			aria.status(nls.localize('debuggingStopped', "Debugging stopped."));
-			if (session && session.getId() === event.sessionId) {
-				if (event.body && event.body.restart && session) {
-					this.restartSession(session, event.body.restart).done(null, err => this.notificationService.error(err.message));
-				} else {
-					raw.disconnect().done(null, errors.onUnexpectedError);
-				}
+		if (!thread) {
+			if (stackFrame) {
+				thread = stackFrame.thread;
+			} else {
+				const threads = session ? session.getAllThreads() : undefined;
+				thread = threads && threads.length ? threads[0] : undefined;
 			}
-		}));
+		}
 
-		this.toDisposeOnSessionEnd.get(session.getId()).push(raw.onDidContinued(event => {
-			const threadId = event.body.allThreadsContinued !== false ? undefined : event.body.threadId;
-			this.model.clearThreads(session.getId(), false, threadId);
-			if (this.viewModel.focusedSession.getId() === session.getId()) {
-				this.focusStackFrame(undefined, this.viewModel.focusedThread, this.viewModel.focusedSession);
+		if (!stackFrame) {
+			if (thread) {
+				const callStack = thread.getCallStack();
+				stackFrame = callStack && callStack.length ? callStack[0] : null;
 			}
-			this.updateStateAndEmit(session.getId(), debug.State.Running);
-		}));
+		}
 
-		let outputPromises: TPromise<void>[] = [];
-		this.toDisposeOnSessionEnd.get(session.getId()).push(raw.onDidOutput(event => {
-			if (!event.body) {
-				return;
-			}
-
-			const outputSeverity = event.body.category === 'stderr' ? severity.Error : event.body.category === 'console' ? severity.Warning : severity.Info;
-			if (event.body.category === 'telemetry') {
-				// only log telemetry events from debug adapter if the debug extension provided the telemetry key
-				// and the user opted in telemetry
-				if (raw.customTelemetryService && this.telemetryService.isOptedIn) {
-					// __GDPR__TODO__ We're sending events in the name of the debug extension and we can not ensure that those are declared correctly.
-					raw.customTelemetryService.publicLog(event.body.output, event.body.data);
-				}
-
-				return;
-			}
-
-			// Make sure to append output in the correct order by properly waiting on preivous promises #33822
-			const waitFor = outputPromises.slice();
-			const source = event.body.source ? {
-				lineNumber: event.body.line,
-				column: event.body.column ? event.body.column : 1,
-				source: session.getSource(event.body.source)
-			} : undefined;
-			if (event.body.variablesReference) {
-				const container = new ExpressionContainer(session, event.body.variablesReference, generateUuid());
-				outputPromises.push(container.getChildren().then(children => {
-					return TPromise.join(waitFor).then(() => children.forEach(child => {
-						// Since we can not display multiple trees in a row, we are displaying these variables one after the other (ignoring their names)
-						child.name = null;
-						this.logToRepl(child, outputSeverity, source);
-					}));
-				}));
-			} else if (typeof event.body.output === 'string') {
-				TPromise.join(waitFor).then(() => this.logToRepl(event.body.output, outputSeverity, source));
-			}
-			TPromise.join(outputPromises).then(() => outputPromises = []);
-		}));
-
-		this.toDisposeOnSessionEnd.get(session.getId()).push(raw.onDidBreakpoint(event => {
-			const id = event.body && event.body.breakpoint ? event.body.breakpoint.id : undefined;
-			const breakpoint = this.model.getBreakpoints().filter(bp => bp.idFromAdapter === id).pop();
-			const functionBreakpoint = this.model.getFunctionBreakpoints().filter(bp => bp.idFromAdapter === id).pop();
-
-			if (event.body.reason === 'new' && event.body.breakpoint.source) {
-				const source = session.getSource(event.body.breakpoint.source);
-				const bps = this.model.addBreakpoints(source.uri, [{
-					column: event.body.breakpoint.column,
-					enabled: true,
-					lineNumber: event.body.breakpoint.line,
-				}], false);
-				if (bps.length === 1) {
-					this.model.updateBreakpoints({ [bps[0].getId()]: event.body.breakpoint });
-				}
-			}
-
-			if (event.body.reason === 'removed') {
-				if (breakpoint) {
-					this.model.removeBreakpoints([breakpoint]);
-				}
-				if (functionBreakpoint) {
-					this.model.removeFunctionBreakpoints(functionBreakpoint.getId());
-				}
-			}
-
-			if (event.body.reason === 'changed') {
-				if (breakpoint) {
-					if (!breakpoint.column) {
-						event.body.breakpoint.column = undefined;
-					}
-					this.model.setBreakpointSessionData(session.getId(), { [breakpoint.getId()]: event.body.breakpoint });
-				}
-				if (functionBreakpoint) {
-					this.model.setBreakpointSessionData(session.getId(), { [functionBreakpoint.getId()]: event.body.breakpoint });
-				}
-			}
-		}));
-
-		this.toDisposeOnSessionEnd.get(session.getId()).push(raw.onDidExitAdapter(event => {
-			// 'Run without debugging' mode VSCode must terminate the extension host. More details: #3905
-			if (strings.equalsIgnoreCase(session.configuration.type, 'extensionhost') && this.sessionStates.get(session.getId()) === debug.State.Running &&
-				session && session.raw.root && session.configuration.noDebug) {
-				this.broadcastService.broadcast({
-					channel: EXTENSION_CLOSE_EXTHOST_BROADCAST_CHANNEL,
-					payload: [session.raw.root.uri.fsPath]
-				});
-			}
-			if (session && session.getId() === event.sessionId) {
-				this.onRawSessionEnd(raw);
-			}
-		}));
-
-		this.toDisposeOnSessionEnd.get(session.getId()).push(raw.onDidCustomEvent(event => {
-			this._onDidCustomEvent.fire(event);
-		}));
+		this.viewModel.setFocus(stackFrame, thread, session, explicit);
 	}
 
-	private fetchThreads(session: RawDebugSession, stoppedDetails?: debug.IRawStoppedDetails): TPromise<any> {
-		return session.threads().then(response => {
-			if (response && response.body && response.body.threads) {
-				response.body.threads.forEach(thread => {
-					this.model.rawUpdate({
-						sessionId: session.getId(),
-						threadId: thread.id,
-						thread,
-						stoppedDetails: stoppedDetails && thread.id === stoppedDetails.threadId ? stoppedDetails : undefined
-					});
-				});
+	//---- REPL
+
+	addReplExpression(name: string): TPromise<void> {
+		return this.model.addReplExpression(this.viewModel.focusedSession, this.viewModel.focusedStackFrame, name)
+			// Evaluate all watch expressions and fetch variables again since repl evaluation might have changed some.
+			.then(() => this.focusStackFrame(this.viewModel.focusedStackFrame, this.viewModel.focusedThread, this.viewModel.focusedSession));
+	}
+
+	removeReplExpressions(): void {
+		this.model.removeReplExpressions();
+	}
+
+	private addToRepl(session: IDebugSession, extensionOutput: IRemoteConsoleLog) {
+
+		let sev = extensionOutput.severity === 'warn' ? severity.Warning : extensionOutput.severity === 'error' ? severity.Error : severity.Info;
+
+		const { args, stack } = parse(extensionOutput);
+		let source: IReplElementSource;
+		if (stack) {
+			const frame = getFirstFrame(stack);
+			if (frame) {
+				source = {
+					column: frame.column,
+					lineNumber: frame.line,
+					source: session.getSource({
+						name: resources.basenameOrAuthority(frame.uri),
+						path: frame.uri.fsPath
+					})
+				};
+			}
+		}
+
+		// add output for each argument logged
+		let simpleVals: any[] = [];
+		for (let i = 0; i < args.length; i++) {
+			let a = args[i];
+
+			// undefined gets printed as 'undefined'
+			if (typeof a === 'undefined') {
+				simpleVals.push('undefined');
+			}
+
+			// null gets printed as 'null'
+			else if (a === null) {
+				simpleVals.push('null');
+			}
+
+			// objects & arrays are special because we want to inspect them in the REPL
+			else if (isObject(a) || Array.isArray(a)) {
+
+				// flush any existing simple values logged
+				if (simpleVals.length) {
+					this.logToRepl(simpleVals.join(' '), sev, source);
+					simpleVals = [];
+				}
+
+				// show object
+				this.logToRepl(new RawObjectReplElement((<any>a).prototype, a, undefined, nls.localize('snapshotObj', "Only primitive values are shown for this object.")), sev, source);
+			}
+
+			// string: watch out for % replacement directive
+			// string substitution and formatting @ https://developer.chrome.com/devtools/docs/console
+			else if (typeof a === 'string') {
+				let buf = '';
+
+				for (let j = 0, len = a.length; j < len; j++) {
+					if (a[j] === '%' && (a[j + 1] === 's' || a[j + 1] === 'i' || a[j + 1] === 'd' || a[j + 1] === 'O')) {
+						i++; // read over substitution
+						buf += !isUndefinedOrNull(args[i]) ? args[i] : ''; // replace
+						j++; // read over directive
+					} else {
+						buf += a[j];
+					}
+				}
+
+				simpleVals.push(buf);
+			}
+
+			// number or boolean is joined together
+			else {
+				simpleVals.push(a);
+			}
+		}
+
+		// flush simple values
+		// always append a new line for output coming from an extension such that separate logs go to separate lines #23695
+		if (simpleVals.length) {
+			this.logToRepl(simpleVals.join(' ') + '\n', sev, source);
+		}
+	}
+
+	logToRepl(value: string | IExpression, sev = severity.Info, source?: IReplElementSource): void {
+		const clearAnsiSequence = '\u001b[2J';
+		if (typeof value === 'string' && value.indexOf(clearAnsiSequence) >= 0) {
+			// [2J is the ansi escape sequence for clearing the display http://ascii-table.com/ansi-escape-sequences.php
+			this.model.removeReplExpressions();
+			this.model.appendToRepl(nls.localize('consoleCleared', "Console was cleared"), severity.Ignore);
+			value = value.substr(value.lastIndexOf(clearAnsiSequence) + clearAnsiSequence.length);
+		}
+
+		this.model.appendToRepl(value, sev, source);
+	}
+
+	//---- watches
+
+	addWatchExpression(name: string): void {
+		const we = this.model.addWatchExpression(name);
+		this.viewModel.setSelectedExpression(we);
+	}
+
+	renameWatchExpression(id: string, newName: string): void {
+		return this.model.renameWatchExpression(id, newName);
+	}
+
+	moveWatchExpression(id: string, position: number): void {
+		this.model.moveWatchExpression(id, position);
+	}
+
+	removeWatchExpressions(id?: string): void {
+		this.model.removeWatchExpressions(id);
+	}
+
+	//---- breakpoints
+
+	enableOrDisableBreakpoints(enable: boolean, breakpoint?: IEnablement): TPromise<void> {
+		if (breakpoint) {
+			this.model.setEnablement(breakpoint, enable);
+			if (breakpoint instanceof Breakpoint) {
+				return this.sendBreakpoints(breakpoint.uri);
+			} else if (breakpoint instanceof FunctionBreakpoint) {
+				return this.sendFunctionBreakpoints();
+			}
+
+			return this.sendExceptionBreakpoints();
+		}
+
+		this.model.enableOrDisableAllBreakpoints(enable);
+		return this.sendAllBreakpoints();
+	}
+
+	addBreakpoints(uri: uri, rawBreakpoints: IBreakpointData[]): TPromise<IBreakpoint[]> {
+		const breakpoints = this.model.addBreakpoints(uri, rawBreakpoints);
+		breakpoints.forEach(bp => aria.status(nls.localize('breakpointAdded', "Added breakpoint, line {0}, file {1}", bp.lineNumber, uri.fsPath)));
+
+		return this.sendBreakpoints(uri).then(() => breakpoints);
+	}
+
+	updateBreakpoints(uri: uri, data: { [id: string]: DebugProtocol.Breakpoint }, sendOnResourceSaved: boolean): void {
+		this.model.updateBreakpoints(data);
+		if (sendOnResourceSaved) {
+			this.breakpointsToSendOnResourceSaved.add(uri.toString());
+		} else {
+			this.sendBreakpoints(uri);
+		}
+	}
+
+	removeBreakpoints(id?: string): TPromise<any> {
+		const toRemove = this.model.getBreakpoints().filter(bp => !id || bp.getId() === id);
+		toRemove.forEach(bp => aria.status(nls.localize('breakpointRemoved', "Removed breakpoint, line {0}, file {1}", bp.lineNumber, bp.uri.fsPath)));
+		const urisToClear = distinct(toRemove, bp => bp.uri.toString()).map(bp => bp.uri);
+
+		this.model.removeBreakpoints(toRemove);
+
+		return TPromise.join(urisToClear.map(uri => this.sendBreakpoints(uri)));
+	}
+
+	setBreakpointsActivated(activated: boolean): TPromise<void> {
+		this.model.setBreakpointsActivated(activated);
+		return this.sendAllBreakpoints();
+	}
+
+	addFunctionBreakpoint(name?: string, id?: string): void {
+		const newFunctionBreakpoint = this.model.addFunctionBreakpoint(name || '', id);
+		this.viewModel.setSelectedFunctionBreakpoint(newFunctionBreakpoint);
+	}
+
+	renameFunctionBreakpoint(id: string, newFunctionName: string): TPromise<void> {
+		this.model.renameFunctionBreakpoint(id, newFunctionName);
+		return this.sendFunctionBreakpoints();
+	}
+
+	removeFunctionBreakpoints(id?: string): TPromise<void> {
+		this.model.removeFunctionBreakpoints(id);
+		return this.sendFunctionBreakpoints();
+	}
+
+	sendAllBreakpoints(session?: IDebugSession): TPromise<any> {
+		return TPromise.join(distinct(this.model.getBreakpoints(), bp => bp.uri.toString()).map(bp => this.sendBreakpoints(bp.uri, false, session)))
+			.then(() => this.sendFunctionBreakpoints(session))
+			// send exception breakpoints at the end since some debug adapters rely on the order
+			.then(() => this.sendExceptionBreakpoints(session));
+	}
+
+	private sendBreakpoints(modelUri: uri, sourceModified = false, session?: IDebugSession): TPromise<void> {
+
+		const breakpointsToSend = this.model.getBreakpoints({ uri: modelUri, enabledOnly: true });
+
+		return this.sendToOneOrAllSessions(session, s => {
+			return s.sendBreakpoints(modelUri, breakpointsToSend, sourceModified).then(data => {
+				if (data) {
+					this.model.setBreakpointSessionData(s.getId(), data);
+				}
+			});
+		});
+	}
+
+	private sendFunctionBreakpoints(session?: IDebugSession): TPromise<void> {
+
+		const breakpointsToSend = this.model.getFunctionBreakpoints().filter(fbp => fbp.enabled && this.model.areBreakpointsActivated());
+
+		return this.sendToOneOrAllSessions(session, s => {
+			return s.sendFunctionBreakpoints(breakpointsToSend).then(data => {
+				if (data) {
+					this.model.setBreakpointSessionData(s.getId(), data);
+				}
+			});
+		});
+	}
+
+	private sendExceptionBreakpoints(session?: IDebugSession): TPromise<void> {
+
+		const enabledExceptionBps = this.model.getExceptionBreakpoints().filter(exb => exb.enabled);
+
+		return this.sendToOneOrAllSessions(session, s => {
+			return s.sendExceptionBreakpoints(enabledExceptionBps);
+		});
+	}
+
+	private sendToOneOrAllSessions(session: IDebugSession, send: (session: IDebugSession) => TPromise<void>): TPromise<void> {
+		if (session) {
+			return send(session);
+		}
+		return TPromise.join(this.model.getSessions().map(s => send(s))).then(() => void 0);
+	}
+
+	private onFileChanges(fileChangesEvent: FileChangesEvent): void {
+		const toRemove = this.model.getBreakpoints().filter(bp =>
+			fileChangesEvent.contains(bp.uri, FileChangeType.DELETED));
+		if (toRemove.length) {
+			this.model.removeBreakpoints(toRemove);
+		}
+
+		fileChangesEvent.getUpdated().forEach(event => {
+
+			if (this.breakpointsToSendOnResourceSaved.delete(event.resource.toString())) {
+				this.sendBreakpoints(event.resource, true);
 			}
 		});
 	}
@@ -475,7 +1055,7 @@ export class DebugService implements debug.IDebugService {
 		let result: Breakpoint[];
 		try {
 			result = JSON.parse(this.storageService.get(DEBUG_BREAKPOINTS_KEY, StorageScope.WORKSPACE, '[]')).map((breakpoint: any) => {
-				return new Breakpoint(uri.parse(breakpoint.uri.external || breakpoint.source.uri.external), breakpoint.lineNumber, breakpoint.column, breakpoint.enabled, breakpoint.condition, breakpoint.hitCondition, breakpoint.logMessage, breakpoint.adapterData);
+				return new Breakpoint(uri.parse(breakpoint.uri.external || breakpoint.source.uri.external), breakpoint.lineNumber, breakpoint.column, breakpoint.enabled, breakpoint.condition, breakpoint.hitCondition, breakpoint.logMessage, breakpoint.adapterData, this.textFileService);
 			});
 		} catch (e) { }
 
@@ -515,825 +1095,6 @@ export class DebugService implements debug.IDebugService {
 		return result || [];
 	}
 
-	public get state(): debug.State {
-		const focusedThread = this.viewModel.focusedThread;
-		if (focusedThread && focusedThread.stopped) {
-			return debug.State.Stopped;
-		}
-		const focusedSession = this.viewModel.focusedSession;
-		if (focusedSession && this.sessionStates.has(focusedSession.getId())) {
-			return this.sessionStates.get(focusedSession.getId());
-		}
-		if (this.sessionStates.size > 0) {
-			return debug.State.Initializing;
-		}
-
-		return debug.State.Inactive;
-	}
-
-	public get onDidChangeState(): Event<debug.State> {
-		return this._onDidChangeState.event;
-	}
-
-	public get onDidNewSession(): Event<debug.ISession> {
-		return this._onDidNewSession.event;
-	}
-
-	public get onDidEndSession(): Event<debug.ISession> {
-		return this._onDidEndSession.event;
-	}
-
-	public get onDidCustomEvent(): Event<debug.DebugEvent> {
-		return this._onDidCustomEvent.event;
-	}
-
-	private updateStateAndEmit(sessionId?: string, newState?: debug.State): void {
-		if (sessionId) {
-			if (newState === debug.State.Inactive) {
-				this.sessionStates.delete(sessionId);
-			} else {
-				this.sessionStates.set(sessionId, newState);
-			}
-		}
-
-		const state = this.state;
-		if (this.previousState !== state) {
-			const stateLabel = debug.State[state];
-			if (stateLabel) {
-				this.debugState.set(stateLabel.toLowerCase());
-			}
-			this.previousState = state;
-			this._onDidChangeState.fire(state);
-		}
-	}
-
-	public focusStackFrame(stackFrame: debug.IStackFrame, thread?: debug.IThread, session?: debug.ISession, explicit?: boolean): void {
-		if (!session) {
-			if (stackFrame || thread) {
-				session = stackFrame ? stackFrame.thread.session : thread.session;
-			} else {
-				const sessions = this.model.getSessions();
-				session = sessions.length ? sessions[0] : undefined;
-			}
-		}
-
-		if (!thread) {
-			if (stackFrame) {
-				thread = stackFrame.thread;
-			} else {
-				const threads = session ? session.getAllThreads() : undefined;
-				thread = threads && threads.length ? threads[0] : undefined;
-			}
-		}
-
-		if (!stackFrame) {
-			if (thread) {
-				const callStack = thread.getCallStack();
-				stackFrame = callStack && callStack.length ? callStack[0] : null;
-			}
-		}
-
-		this.viewModel.setFocus(stackFrame, thread, session, explicit);
-		this.updateStateAndEmit();
-	}
-
-	public enableOrDisableBreakpoints(enable: boolean, breakpoint?: debug.IEnablement): TPromise<void> {
-		if (breakpoint) {
-			this.model.setEnablement(breakpoint, enable);
-			if (breakpoint instanceof Breakpoint) {
-				return this.sendBreakpoints(breakpoint.uri);
-			} else if (breakpoint instanceof FunctionBreakpoint) {
-				return this.sendFunctionBreakpoints();
-			}
-
-			return this.sendExceptionBreakpoints();
-		}
-
-		this.model.enableOrDisableAllBreakpoints(enable);
-		return this.sendAllBreakpoints();
-	}
-
-	public addBreakpoints(uri: uri, rawBreakpoints: debug.IBreakpointData[]): TPromise<debug.IBreakpoint[]> {
-		const breakpoints = this.model.addBreakpoints(uri, rawBreakpoints);
-		breakpoints.forEach(bp => aria.status(nls.localize('breakpointAdded', "Added breakpoint, line {0}, file {1}", bp.lineNumber, uri.fsPath)));
-
-		return this.sendBreakpoints(uri).then(() => breakpoints);
-	}
-
-	public updateBreakpoints(uri: uri, data: { [id: string]: DebugProtocol.Breakpoint }, sendOnResourceSaved: boolean): void {
-		this.model.updateBreakpoints(data);
-		if (sendOnResourceSaved) {
-			this.breakpointsToSendOnResourceSaved.add(uri.toString());
-		} else {
-			this.sendBreakpoints(uri);
-		}
-	}
-
-	public removeBreakpoints(id?: string): TPromise<any> {
-		const toRemove = this.model.getBreakpoints().filter(bp => !id || bp.getId() === id);
-		toRemove.forEach(bp => aria.status(nls.localize('breakpointRemoved', "Removed breakpoint, line {0}, file {1}", bp.lineNumber, bp.uri.fsPath)));
-		const urisToClear = distinct(toRemove, bp => bp.uri.toString()).map(bp => bp.uri);
-
-		this.model.removeBreakpoints(toRemove);
-
-		return TPromise.join(urisToClear.map(uri => this.sendBreakpoints(uri)));
-	}
-
-	public setBreakpointsActivated(activated: boolean): TPromise<void> {
-		this.model.setBreakpointsActivated(activated);
-		return this.sendAllBreakpoints();
-	}
-
-	public addFunctionBreakpoint(name?: string, id?: string): void {
-		const newFunctionBreakpoint = this.model.addFunctionBreakpoint(name || '', id);
-		this.viewModel.setSelectedFunctionBreakpoint(newFunctionBreakpoint);
-	}
-
-	public renameFunctionBreakpoint(id: string, newFunctionName: string): TPromise<void> {
-		this.model.renameFunctionBreakpoint(id, newFunctionName);
-		return this.sendFunctionBreakpoints();
-	}
-
-	public removeFunctionBreakpoints(id?: string): TPromise<void> {
-		this.model.removeFunctionBreakpoints(id);
-		return this.sendFunctionBreakpoints();
-	}
-
-	public addReplExpression(name: string): TPromise<void> {
-		return this.model.addReplExpression(this.viewModel.focusedSession, this.viewModel.focusedStackFrame, name)
-			// Evaluate all watch expressions and fetch variables again since repl evaluation might have changed some.
-			.then(() => this.focusStackFrame(this.viewModel.focusedStackFrame, this.viewModel.focusedThread, this.viewModel.focusedSession));
-	}
-
-	public removeReplExpressions(): void {
-		this.model.removeReplExpressions();
-	}
-
-	public logToRepl(value: string | debug.IExpression, sev = severity.Info, source?: debug.IReplElementSource): void {
-		const clearAnsiSequence = '\\u001b[2J';
-		if (typeof value === 'string' && value.indexOf(clearAnsiSequence) >= 0) {
-			// [2J is the ansi escape sequence for clearing the display http://ascii-table.com/ansi-escape-sequences.php
-			this.model.removeReplExpressions();
-			value = value.substr(value.indexOf(clearAnsiSequence) + clearAnsiSequence.length);
-		}
-
-		this.model.appendToRepl(value, sev, source);
-	}
-
-	public addWatchExpression(name: string): void {
-		const we = this.model.addWatchExpression(name);
-		this.viewModel.setSelectedExpression(we);
-	}
-
-	public renameWatchExpression(id: string, newName: string): void {
-		return this.model.renameWatchExpression(id, newName);
-	}
-
-	public moveWatchExpression(id: string, position: number): void {
-		this.model.moveWatchExpression(id, position);
-	}
-
-	public removeWatchExpressions(id?: string): void {
-		this.model.removeWatchExpressions(id);
-	}
-
-	public startDebugging(launch: debug.ILaunch, configOrName?: debug.IConfig | string, noDebug = false, unresolvedConfiguration?: debug.IConfig, ): TPromise<void> {
-		const sessionId = generateUuid();
-		this.updateStateAndEmit(sessionId, debug.State.Initializing);
-		const wrapUpState = () => {
-			if (this.sessionStates.get(sessionId) === debug.State.Initializing) {
-				this.updateStateAndEmit(sessionId, debug.State.Inactive);
-			}
-		};
-
-		// make sure to save all files and that the configuration is up to date
-		return this.extensionService.activateByEvent('onDebug').then(() => this.textFileService.saveAll().then(() => this.configurationService.reloadConfiguration(launch ? launch.workspace : undefined).then(() =>
-			this.extensionService.whenInstalledExtensionsRegistered().then(() => {
-				if (this.model.getSessions().length === 0) {
-					this.removeReplExpressions();
-					this.allSessions.clear();
-				}
-
-				let config: debug.IConfig, compound: debug.ICompound;
-				if (!configOrName) {
-					configOrName = this.configurationManager.selectedConfiguration.name;
-				}
-				if (typeof configOrName === 'string' && launch) {
-					config = launch.getConfiguration(configOrName);
-					compound = launch.getCompound(configOrName);
-
-					const sessions = this.model.getSessions();
-					const alreadyRunningMessage = nls.localize('configurationAlreadyRunning', "There is already a debug configuration \"{0}\" running.", configOrName);
-					if (sessions.some(p => p.getName(false) === configOrName && (!launch || !launch.workspace || !p.raw.root || p.raw.root.uri.toString() === launch.workspace.uri.toString()))) {
-						return TPromise.wrapError(new Error(alreadyRunningMessage));
-					}
-					if (compound && compound.configurations && sessions.some(p => compound.configurations.indexOf(p.getName(false)) !== -1)) {
-						return TPromise.wrapError(new Error(alreadyRunningMessage));
-					}
-				} else if (typeof configOrName !== 'string') {
-					config = configOrName;
-				}
-
-				if (compound) {
-					if (!compound.configurations) {
-						return TPromise.wrapError(new Error(nls.localize({ key: 'compoundMustHaveConfigurations', comment: ['compound indicates a "compounds" configuration item', '"configurations" is an attribute and should not be localized'] },
-							"Compound must have \"configurations\" attribute set in order to start multiple configurations.")));
-					}
-
-					return TPromise.join(compound.configurations.map(configData => {
-						const name = typeof configData === 'string' ? configData : configData.name;
-						if (name === compound.name) {
-							return TPromise.as(null);
-						}
-
-						let launchForName: debug.ILaunch;
-						if (typeof configData === 'string') {
-							const launchesContainingName = this.configurationManager.getLaunches().filter(l => !!l.getConfiguration(name));
-							if (launchesContainingName.length === 1) {
-								launchForName = launchesContainingName[0];
-							} else if (launchesContainingName.length > 1 && launchesContainingName.indexOf(launch) >= 0) {
-								// If there are multiple launches containing the configuration give priority to the configuration in the current launch
-								launchForName = launch;
-							} else {
-								return TPromise.wrapError(new Error(launchesContainingName.length === 0 ? nls.localize('noConfigurationNameInWorkspace', "Could not find launch configuration '{0}' in the workspace.", name)
-									: nls.localize('multipleConfigurationNamesInWorkspace', "There are multiple launch configurations '{0}' in the workspace. Use folder name to qualify the configuration.", name)));
-							}
-						} else if (configData.folder) {
-							const launchesMatchingConfigData = this.configurationManager.getLaunches().filter(l => l.workspace && l.workspace.name === configData.folder && !!l.getConfiguration(configData.name));
-							if (launchesMatchingConfigData.length === 1) {
-								launchForName = launchesMatchingConfigData[0];
-							} else {
-								return TPromise.wrapError(new Error(nls.localize('noFolderWithName', "Can not find folder with name '{0}' for configuration '{1}' in compound '{2}'.", configData.folder, configData.name, compound.name)));
-							}
-						}
-
-						return this.startDebugging(launchForName, name, noDebug, unresolvedConfiguration);
-					}));
-				}
-				if (configOrName && !config) {
-					const message = !!launch ? nls.localize('configMissing', "Configuration '{0}' is missing in 'launch.json'.", configOrName) :
-						nls.localize('launchJsonDoesNotExist', "'launch.json' does not exist.");
-					return TPromise.wrapError(new Error(message));
-				}
-
-				// We keep the debug type in a separate variable 'type' so that a no-folder config has no attributes.
-				// Storing the type in the config would break extensions that assume that the no-folder case is indicated by an empty config.
-				let type: string;
-				if (config) {
-					type = config.type;
-				} else {
-					// a no-folder workspace has no launch.config
-					config = <debug.IConfig>{};
-				}
-				unresolvedConfiguration = unresolvedConfiguration || deepClone(config);
-
-				if (noDebug) {
-					config.noDebug = true;
-				}
-
-				return (type ? TPromise.as(null) : this.configurationManager.guessDebugger().then(a => type = a && a.type)).then(() =>
-					this.configurationManager.resolveConfigurationByProviders(launch && launch.workspace ? launch.workspace.uri : undefined, type, config).then(config => {
-						// a falsy config indicates an aborted launch
-						if (config && config.type) {
-							return this.createSession(launch, config, unresolvedConfiguration, sessionId);
-						}
-
-						if (launch && type) {
-							return launch.openConfigFile(false, type).done(undefined, errors.onUnexpectedError);
-						}
-					})
-				).then(() => undefined);
-			})
-		))).then(() => wrapUpState(), err => {
-			wrapUpState();
-			return TPromise.wrapError(err);
-		});
-	}
-
-	private substituteVariables(launch: debug.ILaunch | undefined, config: debug.IConfig): TPromise<debug.IConfig> {
-		const dbg = this.configurationManager.getDebugger(config.type);
-		if (dbg) {
-			let folder: IWorkspaceFolder = undefined;
-			if (launch && launch.workspace) {
-				folder = launch.workspace;
-			} else {
-				const folders = this.contextService.getWorkspace().folders;
-				if (folders.length === 1) {
-					folder = folders[0];
-				}
-			}
-			return dbg.substituteVariables(folder, config).then(config => {
-				return config;
-			}, (err: Error) => {
-				this.showError(err.message);
-				return undefined;	// bail out
-			});
-		}
-		return TPromise.as(config);
-	}
-
-	private createSession(launch: debug.ILaunch, config: debug.IConfig, unresolvedConfig: debug.IConfig, sessionId: string): TPromise<void> {
-		return this.textFileService.saveAll().then(() =>
-			this.substituteVariables(launch, config).then(resolvedConfig => {
-
-				if (!resolvedConfig) {
-					// User canceled resolving of interactive variables, silently return
-					return undefined;
-				}
-
-				if (!this.configurationManager.getDebugger(resolvedConfig.type) || (config.request !== 'attach' && config.request !== 'launch')) {
-					let message: string;
-					if (config.request !== 'attach' && config.request !== 'launch') {
-						message = config.request ? nls.localize('debugRequestNotSupported', "Attribute '{0}' has an unsupported value '{1}' in the chosen debug configuration.", 'request', config.request)
-							: nls.localize('debugRequesMissing', "Attribute '{0}' is missing from the chosen debug configuration.", 'request');
-
-					} else {
-						message = resolvedConfig.type ? nls.localize('debugTypeNotSupported', "Configured debug type '{0}' is not supported.", resolvedConfig.type) :
-							nls.localize('debugTypeMissing', "Missing property 'type' for the chosen launch configuration.");
-					}
-
-					return this.showError(message);
-				}
-
-				this.toDisposeOnSessionEnd.set(sessionId, []);
-
-				const workspace = launch ? launch.workspace : undefined;
-				const debugAnywayAction = new Action('debug.debugAnyway', nls.localize('debugAnyway', "Debug Anyway"), undefined, true, () => {
-					return this.doCreateSession(workspace, { resolved: resolvedConfig, unresolved: unresolvedConfig }, sessionId);
-				});
-
-				return this.runTask(sessionId, workspace, resolvedConfig.preLaunchTask).then((taskSummary: ITaskSummary) => {
-					const errorCount = resolvedConfig.preLaunchTask ? this.markerService.getStatistics().errors : 0;
-					const successExitCode = taskSummary && taskSummary.exitCode === 0;
-					const failureExitCode = taskSummary && taskSummary.exitCode !== undefined && taskSummary.exitCode !== 0;
-					if (successExitCode || (errorCount === 0 && !failureExitCode)) {
-						return this.doCreateSession(workspace, { resolved: resolvedConfig, unresolved: unresolvedConfig }, sessionId);
-					}
-
-					const message = errorCount > 1 ? nls.localize('preLaunchTaskErrors', "Build errors have been detected during preLaunchTask '{0}'.", resolvedConfig.preLaunchTask) :
-						errorCount === 1 ? nls.localize('preLaunchTaskError', "Build error has been detected during preLaunchTask '{0}'.", resolvedConfig.preLaunchTask) :
-							nls.localize('preLaunchTaskExitCode', "The preLaunchTask '{0}' terminated with exit code {1}.", resolvedConfig.preLaunchTask, taskSummary.exitCode);
-
-					const showErrorsAction = new Action('debug.showErrors', nls.localize('showErrors', "Show Errors"), undefined, true, () => {
-						return this.panelService.openPanel(Constants.MARKERS_PANEL_ID).then(() => undefined);
-					});
-
-					return this.showError(message, [debugAnywayAction, showErrorsAction]);
-				}, (err: TaskError) => {
-					return this.showError(err.message, [debugAnywayAction, this.taskService.configureAction()]);
-				});
-			}, err => {
-				if (err && err.message) {
-					return this.showError(err.message);
-				}
-				if (this.contextService.getWorkbenchState() === WorkbenchState.EMPTY) {
-					return this.showError(nls.localize('noFolderWorkspaceDebugError', "The active file can not be debugged. Make sure it is saved on disk and that you have a debug extension installed for that file type."));
-				}
-
-				return launch && launch.openConfigFile(false).then(editor => void 0);
-			})
-		);
-	}
-
-	private initializeRawSession(root: IWorkspaceFolder, configuration: { resolved: debug.IConfig, unresolved: debug.IConfig }, sessionId: string, session?: Session): TPromise<Session> {
-		const dbg = this.configurationManager.getDebugger(configuration.resolved.type);
-		return dbg.getCustomTelemetryService().then(customTelemetryService => {
-
-			const raw = this.instantiationService.createInstance(RawDebugSession, sessionId, configuration.resolved.debugServer, dbg, customTelemetryService, root);
-			if (!session) {
-				session = this.model.addSession(configuration, raw);
-				this.allSessions.set(session.getId(), session);
-			} else {
-				session.raw = raw;
-			}
-			this.registerSessionListeners(session, raw);
-
-			return raw.initialize({
-				clientID: 'vscode',
-				clientName: product.nameLong,
-				adapterID: configuration.resolved.type,
-				pathFormat: 'path',
-				linesStartAt1: true,
-				columnsStartAt1: true,
-				supportsVariableType: true, // #8858
-				supportsVariablePaging: true, // #9537
-				supportsRunInTerminalRequest: true, // #10574
-				locale: platform.locale
-			}).then((result: DebugProtocol.InitializeResponse) => {
-				this.model.setExceptionBreakpoints(raw.capabilities.exceptionBreakpointFilters);
-				return session;
-			});
-		});
-	}
-
-	private doCreateSession(root: IWorkspaceFolder, configuration: { resolved: debug.IConfig, unresolved: debug.IConfig }, sessionId: string): TPromise<debug.ISession> {
-
-		const resolved = configuration.resolved;
-		resolved.__sessionId = sessionId;
-		this.inDebugMode.set(true);
-
-		const dbg = this.configurationManager.getDebugger(resolved.type);
-		return this.initializeRawSession(root, configuration, sessionId).then(session => {
-			const raw = <RawDebugSession>session.raw;
-			return (resolved.request === 'attach' ? raw.attach(resolved) : raw.launch(resolved))
-				.then((result: DebugProtocol.Response) => {
-					if (raw.disconnected) {
-						return TPromise.as(null);
-					}
-					this.focusStackFrame(undefined, undefined, session);
-					this._onDidNewSession.fire(session);
-
-					const internalConsoleOptions = resolved.internalConsoleOptions || this.configurationService.getValue<debug.IDebugConfiguration>('debug').internalConsoleOptions;
-					if (internalConsoleOptions === 'openOnSessionStart' || (this.firstSessionStart && internalConsoleOptions === 'openOnFirstSessionStart')) {
-						this.panelService.openPanel(debug.REPL_ID, false).done(undefined, errors.onUnexpectedError);
-					}
-
-					const openDebug = this.configurationService.getValue<debug.IDebugConfiguration>('debug').openDebug;
-					// Open debug viewlet based on the visibility of the side bar and openDebug setting
-					if (openDebug === 'openOnSessionStart' || (openDebug === 'openOnFirstSessionStart' && this.firstSessionStart)) {
-						this.viewletService.openViewlet(debug.VIEWLET_ID);
-					}
-					this.firstSessionStart = false;
-
-					this.debugType.set(resolved.type);
-					if (this.model.getSessions().length > 1) {
-						this.viewModel.setMultiSessionView(true);
-					}
-					this.updateStateAndEmit(raw.getId(), debug.State.Running);
-
-					/* __GDPR__
-						"debugSessionStart" : {
-							"type": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-							"breakpointCount": { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
-							"exceptionBreakpoints": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-							"watchExpressionsCount": { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
-							"extensionName": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" },
-							"isBuiltin": { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true},
-							"launchJsonExists": { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true }
-						}
-					*/
-					return this.telemetryService.publicLog('debugSessionStart', {
-						type: resolved.type,
-						breakpointCount: this.model.getBreakpoints().length,
-						exceptionBreakpoints: this.model.getExceptionBreakpoints(),
-						watchExpressionsCount: this.model.getWatchExpressions().length,
-						extensionName: dbg.extensionDescription.id,
-						isBuiltin: dbg.extensionDescription.isBuiltin,
-						launchJsonExists: root && !!this.configurationService.getValue<debug.IGlobalConfig>('launch', { resource: root.uri })
-					});
-				}).then(() => session, (error: Error | string) => {
-					if (errors.isPromiseCanceledError(error)) {
-						// Do not show 'canceled' error messages to the user #7906
-						return TPromise.as(null);
-					}
-
-					const errorMessage = error instanceof Error ? error.message : error;
-					/* __GDPR__
-						"debugMisconfiguration" : {
-							"type" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-							"error": { "classification": "CallstackOrException", "purpose": "FeatureInsight" }
-						}
-					*/
-					this.telemetryService.publicLog('debugMisconfiguration', { type: resolved ? resolved.type : undefined, error: errorMessage });
-					this.updateStateAndEmit(raw.getId(), debug.State.Inactive);
-					if (!raw.disconnected) {
-						raw.disconnect().done(null, errors.onUnexpectedError);
-					} else if (session) {
-						this.model.removeSession(session.getId());
-					}
-
-					// Show the repl if some error got logged there #5870
-					if (this.model.getReplElements().length > 0) {
-						this.panelService.openPanel(debug.REPL_ID, false).done(undefined, errors.onUnexpectedError);
-					}
-					if (this.model.getReplElements().length === 0) {
-						this.inDebugMode.reset();
-					}
-
-					this.showError(errorMessage, errors.isErrorWithActions(error) ? error.actions : []);
-					return undefined;
-				});
-		});
-	}
-
-	private showError(message: string, actions: IAction[] = []): TPromise<any> {
-		const configureAction = this.instantiationService.createInstance(debugactions.ConfigureAction, debugactions.ConfigureAction.ID, debugactions.ConfigureAction.LABEL);
-		actions.push(configureAction);
-		return this.dialogService.show(severity.Error, message, actions.map(a => a.label).concat(nls.localize('cancel', "Cancel")), { cancelId: actions.length }).then(choice => {
-			if (choice < actions.length) {
-				return actions[choice].run();
-			}
-
-			return TPromise.as(null);
-		});
-	}
-
-	private runTask(sessionId: string, root: IWorkspaceFolder, taskName: string): TPromise<ITaskSummary> {
-		if (!taskName || this.skipRunningTask) {
-			this.skipRunningTask = false;
-			return TPromise.as(null);
-		}
-
-		// run a task before starting a debug session
-		return this.taskService.getTask(root, taskName).then(task => {
-			if (!task) {
-				return TPromise.wrapError(errors.create(nls.localize('DebugTaskNotFound', "Could not find the task \'{0}\'.", taskName)));
-			}
-
-			function once(kind: TaskEventKind, event: Event<TaskEvent>): Event<TaskEvent> {
-				return (listener, thisArgs = null, disposables?) => {
-					const result = event(e => {
-						if (e.kind === kind) {
-							result.dispose();
-							return listener.call(thisArgs, e);
-						}
-					}, null, disposables);
-					return result;
-				};
-			}
-			// If a task is missing the problem matcher the promise will never complete, so we need to have a workaround #35340
-			let taskStarted = false;
-			const promise = this.taskService.getActiveTasks().then(tasks => {
-				if (tasks.filter(t => t._id === task._id).length) {
-					// task is already running - nothing to do.
-					return TPromise.as(null);
-				}
-				this.toDisposeOnSessionEnd.get(sessionId).push(
-					once(TaskEventKind.Active, this.taskService.onDidStateChange)(() => {
-						taskStarted = true;
-					})
-				);
-				const taskPromise = this.taskService.run(task);
-				if (task.isBackground) {
-					return new TPromise((c, e) => this.toDisposeOnSessionEnd.get(sessionId).push(
-						once(TaskEventKind.Inactive, this.taskService.onDidStateChange)(() => c(null)))
-					);
-				}
-
-				return taskPromise;
-			});
-
-			return new TPromise((c, e) => {
-				promise.then(result => {
-					taskStarted = true;
-					c(result);
-				}, error => e(error));
-
-				setTimeout(() => {
-					if (!taskStarted) {
-						e({ severity: severity.Error, message: nls.localize('taskNotTracked', "The task '{0}' cannot be tracked.", taskName) });
-					}
-				}, 10000);
-			});
-		});
-	}
-
-	public sourceIsNotAvailable(uri: uri): void {
-		this.model.sourceIsNotAvailable(uri);
-	}
-
-	public restartSession(session: debug.ISession, restartData?: any): TPromise<any> {
-		return this.textFileService.saveAll().then(() => {
-			if (session.raw.capabilities.supportsRestartRequest) {
-				return this.runTask(session.getId(), session.raw.root, session.configuration.postDebugTask)
-					.then(() => this.runTask(session.getId(), session.raw.root, session.configuration.preLaunchTask))
-					.then(() => <TPromise>session.raw.custom('restart', null));
-			}
-			const focusedSession = this.viewModel.focusedSession;
-			const preserveFocus = focusedSession && session.getId() === focusedSession.getId();
-			// Do not run preLaunch and postDebug tasks for automatic restarts
-			this.skipRunningTask = !!restartData;
-
-			return session.raw.disconnect(true).then(() => {
-				if (strings.equalsIgnoreCase(session.configuration.type, 'extensionHost') && session.raw.root) {
-					return this.broadcastService.broadcast({
-						channel: EXTENSION_RELOAD_BROADCAST_CHANNEL,
-						payload: [session.raw.root.uri.fsPath]
-					});
-				}
-
-				return new TPromise<void>((c, e) => {
-					setTimeout(() => {
-						// Read the configuration again if a launch.json has been changed, if not just use the inmemory configuration
-						let configToUse = session.configuration;
-
-						const launch = session.raw.root ? this.configurationManager.getLaunch(session.raw.root.uri) : undefined;
-						const unresolvedConfiguration = (<Session>session).unresolvedConfiguration;
-						if (launch) {
-							const config = launch.getConfiguration(session.configuration.name);
-							if (config && !equals(config, unresolvedConfiguration)) {
-								// Take the type from the session since the debug extension might overwrite it #21316
-								configToUse = config;
-								configToUse.type = session.configuration.type;
-								configToUse.noDebug = session.configuration.noDebug;
-							}
-						}
-						configToUse.__restart = restartData;
-						this.skipRunningTask = !!restartData;
-						this.startDebugging(launch, configToUse, configToUse.noDebug, unresolvedConfiguration).then(() => c(null), err => e(err));
-					}, 300);
-				});
-			}).then(() => {
-				if (preserveFocus) {
-					// Restart should preserve the focused session
-					const restartedSession = this.model.getSessions().filter(p => p.configuration.name === session.configuration.name).pop();
-					if (restartedSession && restartedSession !== this.viewModel.focusedSession) {
-						this.focusStackFrame(undefined, undefined, restartedSession);
-					}
-				}
-			});
-		});
-	}
-
-	public stopSession(session: debug.ISession): TPromise<any> {
-		if (session) {
-			return session.raw.disconnect(false, true);
-		}
-
-		const sessions = this.model.getSessions();
-		if (sessions.length) {
-			return TPromise.join(sessions.map(s => s.raw.disconnect(false, true)));
-		}
-
-		this.sessionStates.clear();
-		this._onDidChangeState.fire();
-		return undefined;
-	}
-
-	private onRawSessionEnd(raw: RawDebugSession): void {
-		const breakpoints = this.model.getBreakpoints();
-		const session = this.model.getSessions().filter(p => p.getId() === raw.getId()).pop();
-		/* __GDPR__
-			"debugSessionStop" : {
-				"type" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-				"success": { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
-				"sessionLengthInSeconds": { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
-				"breakpointCount": { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
-				"watchExpressionsCount": { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true }
-			}
-		*/
-		this.telemetryService.publicLog('debugSessionStop', {
-			type: session && session.configuration.type,
-			success: raw.emittedStopped || breakpoints.length === 0,
-			sessionLengthInSeconds: raw.getLengthInSeconds(),
-			breakpointCount: breakpoints.length,
-			watchExpressionsCount: this.model.getWatchExpressions().length
-		});
-
-		this.model.removeSession(raw.getId());
-		if (session) {
-			this._onDidEndSession.fire(session);
-			if (session.configuration.postDebugTask) {
-				this.runTask(session.getId(), session.raw.root, session.configuration.postDebugTask).done(undefined, err =>
-					this.notificationService.error(err)
-				);
-			}
-		}
-
-		lifecycle.dispose(this.toDisposeOnSessionEnd.get(raw.getId()));
-		const focusedSession = this.viewModel.focusedSession;
-		if (focusedSession && focusedSession.getId() === raw.getId()) {
-			this.focusStackFrame(null);
-		}
-		this.updateStateAndEmit(raw.getId(), debug.State.Inactive);
-
-		if (this.model.getSessions().length === 0) {
-			this.inDebugMode.reset();
-			this.debugType.reset();
-			this.viewModel.setMultiSessionView(false);
-
-			if (this.partService.isVisible(Parts.SIDEBAR_PART) && this.configurationService.getValue<debug.IDebugConfiguration>('debug').openExplorerOnEnd) {
-				this.viewletService.openViewlet(EXPLORER_VIEWLET_ID).done(null, errors.onUnexpectedError);
-			}
-		}
-	}
-
-	public getModel(): debug.IModel {
-		return this.model;
-	}
-
-	public getViewModel(): debug.IViewModel {
-		return this.viewModel;
-	}
-
-	public getConfigurationManager(): debug.IConfigurationManager {
-		return this.configurationManager;
-	}
-
-	private sendAllBreakpoints(session?: debug.ISession): TPromise<any> {
-		return TPromise.join(distinct(this.model.getBreakpoints(), bp => bp.uri.toString()).map(bp => this.sendBreakpoints(bp.uri, false, session)))
-			.then(() => this.sendFunctionBreakpoints(session))
-			// send exception breakpoints at the end since some debug adapters rely on the order
-			.then(() => this.sendExceptionBreakpoints(session));
-	}
-
-	private sendBreakpoints(modelUri: uri, sourceModified = false, session?: debug.ISession): TPromise<void> {
-
-		const sendBreakpointsToSession = (session: debug.ISession): TPromise<void> => {
-			const raw = <RawDebugSession>session.raw;
-			if (!raw.readyForBreakpoints) {
-				return TPromise.as(null);
-			}
-
-			const breakpointsToSend = this.model.getBreakpoints({ uri: modelUri, enabledOnly: true });
-
-			const source = session.getSourceForUri(modelUri);
-			let rawSource: DebugProtocol.Source;
-			if (source) {
-				rawSource = source.raw;
-			} else {
-				const data = Source.getEncodedDebugData(modelUri);
-				rawSource = { name: data.name, path: data.path, sourceReference: data.sourceReference };
-			}
-
-			if (breakpointsToSend.length && !rawSource.adapterData) {
-				rawSource.adapterData = breakpointsToSend[0].adapterData;
-			}
-			// Normalize all drive letters going out from vscode to debug adapters so we are consistent with our resolving #43959
-			rawSource.path = normalizeDriveLetter(rawSource.path);
-
-			return raw.setBreakpoints({
-				source: rawSource,
-				lines: breakpointsToSend.map(bp => bp.lineNumber),
-				breakpoints: breakpointsToSend.map(bp => ({ line: bp.lineNumber, column: bp.column, condition: bp.condition, hitCondition: bp.hitCondition, logMessage: bp.logMessage })),
-				sourceModified
-			}).then(response => {
-				if (!response || !response.body) {
-					return;
-				}
-
-				const data = Object.create(null);
-				for (let i = 0; i < breakpointsToSend.length; i++) {
-					data[breakpointsToSend[i].getId()] = response.body.breakpoints[i];
-				}
-				this.model.setBreakpointSessionData(raw.getId(), data);
-			});
-		};
-
-		return this.sendToOneOrAllSessions(session, sendBreakpointsToSession);
-	}
-
-	private sendFunctionBreakpoints(session?: debug.ISession): TPromise<void> {
-		const sendFunctionBreakpointsToSession = (session: debug.ISession): TPromise<void> => {
-			const raw = <RawDebugSession>session.raw;
-			if (!raw.readyForBreakpoints || !raw.capabilities.supportsFunctionBreakpoints) {
-				return TPromise.as(null);
-			}
-
-			const breakpointsToSend = this.model.getFunctionBreakpoints().filter(fbp => fbp.enabled && this.model.areBreakpointsActivated());
-			return raw.setFunctionBreakpoints({ breakpoints: breakpointsToSend }).then(response => {
-				if (!response || !response.body) {
-					return;
-				}
-
-				const data = Object.create(null);
-				for (let i = 0; i < breakpointsToSend.length; i++) {
-					data[breakpointsToSend[i].getId()] = response.body.breakpoints[i];
-				}
-				this.model.setBreakpointSessionData(raw.getId(), data);
-			});
-		};
-
-		return this.sendToOneOrAllSessions(session, sendFunctionBreakpointsToSession);
-	}
-
-	private sendExceptionBreakpoints(session?: debug.ISession): TPromise<void> {
-		const sendExceptionBreakpointsToSession = (session: debug.ISession): TPromise<any> => {
-			const raw = <RawDebugSession>session.raw;
-			if (!raw.readyForBreakpoints || this.model.getExceptionBreakpoints().length === 0) {
-				return TPromise.as(null);
-			}
-
-			const enabledExceptionBps = this.model.getExceptionBreakpoints().filter(exb => exb.enabled);
-			return raw.setExceptionBreakpoints({ filters: enabledExceptionBps.map(exb => exb.filter) });
-		};
-
-		return this.sendToOneOrAllSessions(session, sendExceptionBreakpointsToSession);
-	}
-
-	private sendToOneOrAllSessions(session: debug.ISession, send: (session: debug.ISession) => TPromise<void>): TPromise<void> {
-		if (session) {
-			return send(session);
-		}
-
-		return TPromise.join(this.model.getSessions().map(s => send(s))).then(() => void 0);
-	}
-
-	private onFileChanges(fileChangesEvent: FileChangesEvent): void {
-		const toRemove = this.model.getBreakpoints().filter(bp =>
-			fileChangesEvent.contains(bp.uri, FileChangeType.DELETED));
-		if (toRemove.length) {
-			this.model.removeBreakpoints(toRemove);
-		}
-
-		fileChangesEvent.getUpdated().forEach(event => {
-
-			if (this.breakpointsToSendOnResourceSaved.delete(event.resource.toString())) {
-				this.sendBreakpoints(event.resource, true).done(null, errors.onUnexpectedError);
-			}
-		});
-	}
-
 	private store(): void {
 		const breakpoints = this.model.getBreakpoints();
 		if (breakpoints.length) {
@@ -1370,8 +1131,63 @@ export class DebugService implements debug.IDebugService {
 		}
 	}
 
-	public dispose(): void {
-		this.toDisposeOnSessionEnd.forEach(toDispose => lifecycle.dispose(toDispose));
-		this.toDispose = lifecycle.dispose(this.toDispose);
+	//---- telemetry
+
+	private telemetryDebugSessionStart(root: IWorkspaceFolder, type: string, extension: IExtensionDescription): TPromise<any> {
+		/* __GDPR__
+			"debugSessionStart" : {
+				"type": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+				"breakpointCount": { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+				"exceptionBreakpoints": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+				"watchExpressionsCount": { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+				"extensionName": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" },
+				"isBuiltin": { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true},
+				"launchJsonExists": { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true }
+			}
+		*/
+		return this.telemetryService.publicLog('debugSessionStart', {
+			type: type,
+			breakpointCount: this.model.getBreakpoints().length,
+			exceptionBreakpoints: this.model.getExceptionBreakpoints(),
+			watchExpressionsCount: this.model.getWatchExpressions().length,
+			extensionName: extension.id,
+			isBuiltin: extension.isBuiltin,
+			launchJsonExists: root && !!this.configurationService.getValue<IGlobalConfig>('launch', { resource: root.uri })
+		});
+	}
+
+	private telemetryDebugSessionStop(session: IDebugSession, adapterExitEvent: AdapterEndEvent): TPromise<any> {
+
+		const breakpoints = this.model.getBreakpoints();
+
+		/* __GDPR__
+			"debugSessionStop" : {
+				"type" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+				"success": { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+				"sessionLengthInSeconds": { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+				"breakpointCount": { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+				"watchExpressionsCount": { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true }
+			}
+		*/
+		return this.telemetryService.publicLog('debugSessionStop', {
+			type: session && session.configuration.type,
+			success: adapterExitEvent.emittedStopped || breakpoints.length === 0,
+			sessionLengthInSeconds: adapterExitEvent.sessionLengthInSeconds,
+			breakpointCount: breakpoints.length,
+			watchExpressionsCount: this.model.getWatchExpressions().length
+		});
+	}
+
+	private telemetryDebugMisconfiguration(debugType: string, message: string): TPromise<any> {
+		/* __GDPR__
+			"debugMisconfiguration" : {
+				"type" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+				"error": { "classification": "CallstackOrException", "purpose": "FeatureInsight" }
+			}
+		*/
+		return this.telemetryService.publicLog('debugMisconfiguration', {
+			type: debugType,
+			error: message
+		});
 	}
 }
diff --git a/src/vs/workbench/parts/debug/electron-browser/debugSession.ts b/src/vs/workbench/parts/debug/electron-browser/debugSession.ts
new file mode 100644
index 00000000000..5e1b8eab69a
--- /dev/null
+++ b/src/vs/workbench/parts/debug/electron-browser/debugSession.ts
@@ -0,0 +1,752 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { URI as uri } from 'vs/base/common/uri';
+import * as resources from 'vs/base/common/resources';
+import * as nls from 'vs/nls';
+import * as platform from 'vs/base/common/platform';
+import severity from 'vs/base/common/severity';
+import { TPromise } from 'vs/base/common/winjs.base';
+import { Event, Emitter } from 'vs/base/common/event';
+import { ISuggestion } from 'vs/editor/common/modes';
+import { Position } from 'vs/editor/common/core/position';
+import * as aria from 'vs/base/browser/ui/aria/aria';
+import { IDebugSession, IConfig, IThread, IRawModelUpdate, IDebugService, IRawStoppedDetails, State, LoadedSourceEvent, IFunctionBreakpoint, IExceptionBreakpoint, ActualBreakpoints, IBreakpoint, IExceptionInfo, AdapterEndEvent, IDebugger } from 'vs/workbench/parts/debug/common/debug';
+import { Source } from 'vs/workbench/parts/debug/common/debugSource';
+import { mixin } from 'vs/base/common/objects';
+import { Thread, ExpressionContainer, Model } from 'vs/workbench/parts/debug/common/debugModel';
+import { RawDebugSession } from 'vs/workbench/parts/debug/electron-browser/rawDebugSession';
+import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import product from 'vs/platform/node/product';
+import { INotificationService } from 'vs/platform/notification/common/notification';
+import { IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
+import { IDisposable, dispose } from 'vs/base/common/lifecycle';
+import { RunOnceScheduler } from 'vs/base/common/async';
+import { generateUuid } from 'vs/base/common/uuid';
+import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
+import { normalizeDriveLetter } from 'vs/base/common/labels';
+
+export class DebugSession implements IDebugSession {
+
+	private id: string;
+	private _raw: RawDebugSession;
+	private _state: State;
+	private _nullCapabilities: DebugProtocol.Capabilities;
+
+	private sources = new Map<string, Source>();
+	private threads = new Map<number, Thread>();
+	private rawListeners: IDisposable[] = [];
+	private fetchThreadsScheduler: RunOnceScheduler;
+
+	private readonly _onDidChangeState = new Emitter<State>();
+	private readonly _onDidEndAdapter = new Emitter<AdapterEndEvent>();
+
+	private readonly _onDidLoadedSource = new Emitter<LoadedSourceEvent>();
+	private readonly _onDidCustomEvent = new Emitter<DebugProtocol.Event>();
+
+
+	constructor(
+		private _configuration: { resolved: IConfig, unresolved: IConfig },
+		public root: IWorkspaceFolder,
+		private model: Model,
+		@IInstantiationService private instantiationService: IInstantiationService,
+		@INotificationService private notificationService: INotificationService,
+		@IDebugService private debugService: IDebugService,
+		@ITelemetryService private telemetryService: ITelemetryService,
+	) {
+		this.id = generateUuid();
+		this.state = State.Initializing;
+		this._nullCapabilities = Object.create(null);
+	}
+
+	getId(): string {
+		return this.id;
+	}
+
+	get configuration(): IConfig {
+		return this._configuration.resolved;
+	}
+
+	get unresolvedConfiguration(): IConfig {
+		return this._configuration.unresolved;
+	}
+
+	getName(includeRoot: boolean): string {
+		return includeRoot && this.root ? `${this.configuration.name} (${resources.basenameOrAuthority(this.root.uri)})` : this.configuration.name;
+	}
+
+	get state(): State {
+		return this._state;
+	}
+
+	set state(value: State) {
+		if (this._state !== value) {
+			this._state = value;
+			this._onDidChangeState.fire(value);
+		}
+	}
+
+	get capabilities(): DebugProtocol.Capabilities {
+		return this._raw ? this._raw.capabilities : this._nullCapabilities;
+	}
+
+	//---- events
+
+	get onDidChangeState(): Event<State> {
+		return this._onDidChangeState.event;
+	}
+
+	get onDidEndAdapter(): Event<AdapterEndEvent> {
+		return this._onDidEndAdapter.event;
+	}
+
+	//---- DAP events
+
+	get onDidCustomEvent(): Event<DebugProtocol.Event> {
+		return this._onDidCustomEvent.event;
+	}
+
+	get onDidLoadedSource(): Event<LoadedSourceEvent> {
+		return this._onDidLoadedSource.event;
+	}
+
+
+	//---- DAP requests
+
+	/**
+	 * create and initialize a new debug adapter for this session
+	 */
+	initialize(dbgr: IDebugger): TPromise<void> {
+
+		if (this._raw) {
+			// if there was already a connection make sure to remove old listeners
+			this.dispose();	// TODO: do not use dispose for this!
+		}
+
+		return dbgr.getCustomTelemetryService().then(customTelemetryService => {
+
+			this._raw = this.instantiationService.createInstance(RawDebugSession, this._configuration.resolved.debugServer, dbgr, customTelemetryService, this.root);
+
+			this.registerListeners();
+
+			return this._raw.initialize({
+				clientID: 'vscode',
+				clientName: product.nameLong,
+				adapterID: this.configuration.type,
+				pathFormat: 'path',
+				linesStartAt1: true,
+				columnsStartAt1: true,
+				supportsVariableType: true, // #8858
+				supportsVariablePaging: true, // #9537
+				supportsRunInTerminalRequest: true, // #10574
+				locale: platform.locale
+			}).then(response => {
+				this.model.addSession(this);
+				this.state = State.Running;
+				this.model.setExceptionBreakpoints(this._raw.capabilities.exceptionBreakpointFilters);
+			});
+		});
+	}
+
+	/**
+	 * launch or attach to the debuggee
+	 */
+	launchOrAttach(config: IConfig): TPromise<void> {
+		if (this._raw) {
+
+			// __sessionID only used for EH debugging (but we add it always for now...)
+			config.__sessionId = this.getId();
+
+			return this._raw.launchOrAttach(config).then(result => {
+				return void 0;
+			});
+		}
+		return TPromise.wrapError(new Error('no debug adapter'));
+	}
+
+	/**
+	 * end the current debug adapter session
+	 */
+	terminate(restart = false): TPromise<void> {
+		if (this._raw) {
+			if (this._raw.capabilities.supportsTerminateRequest && this._configuration.resolved.request === 'launch') {
+				return this._raw.terminate(restart).then(response => {
+					return void 0;
+				});
+			}
+			return this._raw.disconnect(restart).then(response => {
+				return void 0;
+			});
+		}
+		return TPromise.wrapError(new Error('no debug adapter'));
+	}
+
+	/**
+	 * end the current debug adapter session
+	 */
+	disconnect(restart = false): TPromise<void> {
+		if (this._raw) {
+			return this._raw.disconnect(restart).then(response => {
+				return void 0;
+			});
+		}
+		return TPromise.wrapError(new Error('no debug adapter'));
+	}
+
+	/**
+	 * restart debug adapter session
+	 */
+	restart(): TPromise<DebugProtocol.RestartResponse> {
+		if (this._raw) {
+			return this._raw.restart();
+		}
+		return TPromise.wrapError(new Error('no debug adapter'));
+	}
+
+	sendBreakpoints(modelUri: uri, breakpointsToSend: IBreakpoint[], sourceModified: boolean): TPromise<ActualBreakpoints | undefined> {
+
+		if (!this._raw) {
+			return TPromise.wrapError(new Error('no debug adapter'));
+		}
+
+		if (!this._raw.readyForBreakpoints) {
+			return TPromise.as(undefined);
+		}
+
+		const source = this.getSourceForUri(modelUri);
+		let rawSource: DebugProtocol.Source;
+		if (source) {
+			rawSource = source.raw;
+		} else {
+			const data = Source.getEncodedDebugData(modelUri);
+			rawSource = { name: data.name, path: data.path, sourceReference: data.sourceReference };
+		}
+
+		if (breakpointsToSend.length && !rawSource.adapterData) {
+			rawSource.adapterData = breakpointsToSend[0].adapterData;
+		}
+		// Normalize all drive letters going out from vscode to debug adapters so we are consistent with our resolving #43959
+		rawSource.path = normalizeDriveLetter(rawSource.path);
+
+		return this._raw.setBreakpoints({
+			source: rawSource,
+			lines: breakpointsToSend.map(bp => bp.lineNumber),
+			breakpoints: breakpointsToSend.map(bp => ({ line: bp.lineNumber, column: bp.column, condition: bp.condition, hitCondition: bp.hitCondition, logMessage: bp.logMessage })),
+			sourceModified
+		}).then(response => {
+
+			if (response && response.body) {
+				const data: ActualBreakpoints = Object.create(null);
+				for (let i = 0; i < breakpointsToSend.length; i++) {
+					data[breakpointsToSend[i].getId()] = response.body.breakpoints[i];
+				}
+				this.model.setBreakpointSessionData(this.getId(), data);
+				return data;
+			}
+			return undefined;
+		});
+	}
+
+	sendFunctionBreakpoints(fbpts: IFunctionBreakpoint[]): TPromise<ActualBreakpoints | undefined> {
+		if (this._raw) {
+			if (this._raw.readyForBreakpoints) {
+				return this._raw.setFunctionBreakpoints({ breakpoints: fbpts }).then(response => {
+					if (response && response.body) {
+						const data: ActualBreakpoints = Object.create(null);
+						for (let i = 0; i < fbpts.length; i++) {
+							data[fbpts[i].getId()] = response.body.breakpoints[i];
+						}
+						return data;
+					}
+					return undefined;
+				});
+			}
+			return TPromise.as(undefined);
+		}
+		return TPromise.wrapError(new Error('no debug adapter'));
+	}
+
+	sendExceptionBreakpoints(exbpts: IExceptionBreakpoint[]): TPromise<any> {
+		if (this._raw) {
+			if (this._raw.readyForBreakpoints && exbpts.length > 0) {
+				return this._raw.setExceptionBreakpoints({ filters: exbpts.map(exb => exb.filter) });
+			}
+			return TPromise.as(null);
+		}
+		return TPromise.wrapError(new Error('no debug adapter'));
+	}
+
+	customRequest(request: string, args: any): TPromise<DebugProtocol.Response> {
+		if (this._raw) {
+			return this._raw.custom(request, args);
+		}
+		return TPromise.wrapError(new Error('no debug adapter'));
+	}
+
+	stackTrace(threadId: number, startFrame: number, levels: number): TPromise<DebugProtocol.StackTraceResponse> {
+		if (this._raw) {
+			return this._raw.stackTrace({ threadId, startFrame, levels });
+		}
+		return TPromise.wrapError(new Error('no debug adapter'));
+	}
+
+	exceptionInfo(threadId: number): TPromise<IExceptionInfo> {
+		if (this._raw) {
+			return this._raw.exceptionInfo({ threadId }).then(response => {
+				if (response) {
+					return {
+						id: response.body.exceptionId,
+						description: response.body.description,
+						breakMode: response.body.breakMode,
+						details: response.body.details
+					};
+				}
+				return null;
+			});
+		}
+		return TPromise.wrapError(new Error('no debug adapter'));
+	}
+
+	scopes(frameId: number): TPromise<DebugProtocol.ScopesResponse> {
+		if (this._raw) {
+			return this._raw.scopes({ frameId });
+		}
+		return TPromise.wrapError(new Error('no debug adapter'));
+	}
+
+	variables(variablesReference: number, filter: 'indexed' | 'named', start: number, count: number): TPromise<DebugProtocol.VariablesResponse | undefined> {
+		if (this._raw) {
+			return this._raw.variables({ variablesReference, filter, start, count });
+		}
+		return TPromise.as(undefined);
+	}
+
+	evaluate(expression: string, frameId: number, context?: string): TPromise<DebugProtocol.EvaluateResponse> {
+		if (this._raw) {
+			return this._raw.evaluate({ expression, frameId, context });
+		}
+		return TPromise.wrapError(new Error('no debug adapter'));
+	}
+
+	restartFrame(frameId: number, threadId: number): TPromise<DebugProtocol.RestartFrameResponse> {
+		if (this._raw) {
+			return this._raw.restartFrame({ frameId }, threadId);
+		}
+		return TPromise.wrapError(new Error('no debug adapter'));
+	}
+
+	next(threadId: number): TPromise<DebugProtocol.NextResponse> {
+		if (this._raw) {
+			return this._raw.next({ threadId });
+		}
+		return TPromise.wrapError(new Error('no debug adapter'));
+	}
+
+	stepIn(threadId: number): TPromise<DebugProtocol.StepInResponse> {
+		if (this._raw) {
+			return this._raw.stepIn({ threadId });
+		}
+		return TPromise.wrapError(new Error('no debug adapter'));
+	}
+
+	stepOut(threadId: number): TPromise<DebugProtocol.StepOutResponse> {
+		if (this._raw) {
+			return this._raw.stepOut({ threadId });
+		}
+		return TPromise.wrapError(new Error('no debug adapter'));
+	}
+
+	stepBack(threadId: number): TPromise<DebugProtocol.StepBackResponse> {
+		if (this._raw) {
+			return this._raw.stepBack({ threadId });
+		}
+		return TPromise.wrapError(new Error('no debug adapter'));
+	}
+
+	continue(threadId: number): TPromise<DebugProtocol.ContinueResponse> {
+		if (this._raw) {
+			return this._raw.continue({ threadId });
+		}
+		return TPromise.wrapError(new Error('no debug adapter'));
+	}
+
+	reverseContinue(threadId: number): TPromise<DebugProtocol.ReverseContinueResponse> {
+		if (this._raw) {
+			return this._raw.reverseContinue({ threadId });
+		}
+		return TPromise.wrapError(new Error('no debug adapter'));
+	}
+
+	pause(threadId: number): TPromise<DebugProtocol.PauseResponse> {
+		if (this._raw) {
+			return this._raw.pause({ threadId });
+		}
+		return TPromise.wrapError(new Error('no debug adapter'));
+	}
+
+	terminateThreads(threadIds?: number[]): TPromise<DebugProtocol.TerminateThreadsResponse> {
+		if (this._raw) {
+			return this._raw.terminateThreads({ threadIds });
+		}
+		return TPromise.wrapError(new Error('no debug adapter'));
+	}
+
+	setVariable(variablesReference: number, name: string, value: string): TPromise<DebugProtocol.SetVariableResponse> {
+		if (this._raw) {
+			return this._raw.setVariable({ variablesReference, name, value });
+		}
+		return TPromise.wrapError(new Error('no debug adapter'));
+	}
+
+	loadSource(resource: uri): TPromise<DebugProtocol.SourceResponse> {
+
+		if (!this._raw) {
+			return TPromise.wrapError(new Error('no debug adapter'));
+		}
+
+		const source = this.getSourceForUri(resource);
+		let rawSource: DebugProtocol.Source;
+		if (source) {
+			rawSource = source.raw;
+		} else {
+			// create a Source
+
+			let sourceRef: number;
+			if (resource.query) {
+				const data = Source.getEncodedDebugData(resource);
+				sourceRef = data.sourceReference;
+			}
+
+			rawSource = {
+				path: resource.with({ scheme: '', query: '' }).toString(true),	// Remove debug: scheme
+				sourceReference: sourceRef
+			};
+		}
+
+		return this._raw.source({ sourceReference: rawSource.sourceReference, source: rawSource });
+	}
+
+	getLoadedSources(): TPromise<Source[]> {
+		if (this._raw) {
+			return this._raw.loadedSources({}).then(response => {
+				return response.body.sources.map(src => this.getSource(src));
+			}, () => {
+				return [];
+			});
+		}
+		return TPromise.wrapError(new Error('no debug adapter'));
+	}
+
+	completions(frameId: number, text: string, position: Position, overwriteBefore: number): TPromise<ISuggestion[]> {
+		if (this._raw) {
+			return this._raw.completions({
+				frameId,
+				text,
+				column: position.column,
+				line: position.lineNumber
+			}).then(response => {
+
+				const result: ISuggestion[] = [];
+				if (response && response.body && response.body.targets) {
+					response.body.targets.forEach(item => {
+						if (item && item.label) {
+							result.push({
+								label: item.label,
+								insertText: item.text || item.label,
+								type: item.type,
+								filterText: item.start && item.length && text.substr(item.start, item.length).concat(item.label),
+								overwriteBefore: item.length || overwriteBefore
+							});
+						}
+					});
+				}
+
+				return result;
+			});
+		}
+		return TPromise.wrapError(new Error('no debug adapter'));
+	}
+
+	//---- threads
+
+	getThread(threadId: number): Thread {
+		return this.threads.get(threadId);
+	}
+
+	getAllThreads(): IThread[] {
+		const result: IThread[] = [];
+		this.threads.forEach(t => result.push(t));
+		return result;
+	}
+
+	clearThreads(removeThreads: boolean, reference: number = undefined): void {
+		if (reference !== undefined && reference !== null) {
+			if (this.threads.has(reference)) {
+				const thread = this.threads.get(reference);
+				thread.clearCallStack();
+				thread.stoppedDetails = undefined;
+				thread.stopped = false;
+
+				if (removeThreads) {
+					this.threads.delete(reference);
+				}
+			}
+		} else {
+			this.threads.forEach(thread => {
+				thread.clearCallStack();
+				thread.stoppedDetails = undefined;
+				thread.stopped = false;
+			});
+
+			if (removeThreads) {
+				this.threads.clear();
+				ExpressionContainer.allValues.clear();
+			}
+		}
+	}
+
+	rawUpdate(data: IRawModelUpdate): void {
+
+		if (data.thread && !this.threads.has(data.threadId)) {
+			// A new thread came in, initialize it.
+			this.threads.set(data.threadId, new Thread(this, data.thread.name, data.thread.id));
+		} else if (data.thread && data.thread.name) {
+			// Just the thread name got updated #18244
+			this.threads.get(data.threadId).name = data.thread.name;
+		}
+
+		if (data.stoppedDetails) {
+			// Set the availability of the threads' callstacks depending on
+			// whether the thread is stopped or not
+			if (data.stoppedDetails.allThreadsStopped) {
+				this.threads.forEach(thread => {
+					thread.stoppedDetails = thread.threadId === data.threadId ? data.stoppedDetails : { reason: undefined };
+					thread.stopped = true;
+					thread.clearCallStack();
+				});
+			} else if (this.threads.has(data.threadId)) {
+				// One thread is stopped, only update that thread.
+				const thread = this.threads.get(data.threadId);
+				thread.stoppedDetails = data.stoppedDetails;
+				thread.clearCallStack();
+				thread.stopped = true;
+			}
+		}
+	}
+
+	private fetchThreads(stoppedDetails?: IRawStoppedDetails): TPromise<any> {
+		return this._raw.threads().then(response => {
+			if (response && response.body && response.body.threads) {
+				response.body.threads.forEach(thread => {
+					this.model.rawUpdate({
+						sessionId: this.getId(),
+						threadId: thread.id,
+						thread,
+						stoppedDetails: stoppedDetails && thread.id === stoppedDetails.threadId ? stoppedDetails : undefined
+					});
+				});
+			}
+		});
+	}
+
+	//---- private
+
+	private registerListeners(): void {
+
+		this.rawListeners.push(this._raw.onDidInitialize(() => {
+			aria.status(nls.localize('debuggingStarted', "Debugging started."));
+			const sendConfigurationDone = () => {
+				if (this._raw && this._raw.capabilities.supportsConfigurationDoneRequest) {
+					return this._raw.configurationDone().then(null, e => {
+						// Disconnect the debug session on configuration done error #10596
+						if (this._raw) {
+							this._raw.disconnect();
+						}
+						this.notificationService.error(e.message);
+					});
+				}
+
+				return undefined;
+			};
+
+			// Send all breakpoints
+			this.debugService.sendAllBreakpoints(this).then(sendConfigurationDone, sendConfigurationDone)
+				.then(() => this.fetchThreads());
+		}));
+
+		this.rawListeners.push(this._raw.onDidStop(event => {
+			this.state = State.Stopped;
+			this.fetchThreads(event.body).then(() => {
+				const thread = this.getThread(event.body.threadId);
+				if (thread) {
+					// Call fetch call stack twice, the first only return the top stack frame.
+					// Second retrieves the rest of the call stack. For performance reasons #25605
+					this.model.fetchCallStack(<Thread>thread).then(() => {
+						return !event.body.preserveFocusHint ? this.debugService.tryToAutoFocusStackFrame(thread) : undefined;
+					});
+				}
+			});
+		}));
+
+		this.rawListeners.push(this._raw.onDidThread(event => {
+			if (event.body.reason === 'started') {
+				// debounce to reduce threadsRequest frequency and improve performance
+				if (!this.fetchThreadsScheduler) {
+					this.fetchThreadsScheduler = new RunOnceScheduler(() => {
+						this.fetchThreads();
+					}, 100);
+					this.rawListeners.push(this.fetchThreadsScheduler);
+				}
+				if (!this.fetchThreadsScheduler.isScheduled()) {
+					this.fetchThreadsScheduler.schedule();
+				}
+			} else if (event.body.reason === 'exited') {
+				this.model.clearThreads(this.getId(), true, event.body.threadId);
+			}
+		}));
+
+		this.rawListeners.push(this._raw.onDidTerminateDebugee(event => {
+			aria.status(nls.localize('debuggingStopped', "Debugging stopped."));
+			if (event.body && event.body.restart) {
+				this.debugService.restartSession(this, event.body.restart).then(null, err => this.notificationService.error(err.message));
+			} else {
+				this._raw.disconnect();
+			}
+		}));
+
+		this.rawListeners.push(this._raw.onDidContinued(event => {
+			const threadId = event.body.allThreadsContinued !== false ? undefined : event.body.threadId;
+			this.model.clearThreads(this.getId(), false, threadId);
+			this.state = State.Running;
+		}));
+
+		let outputPromises: TPromise<void>[] = [];
+		this.rawListeners.push(this._raw.onDidOutput(event => {
+			if (!event.body) {
+				return;
+			}
+
+			const outputSeverity = event.body.category === 'stderr' ? severity.Error : event.body.category === 'console' ? severity.Warning : severity.Info;
+			if (event.body.category === 'telemetry') {
+				// only log telemetry events from debug adapter if the debug extension provided the telemetry key
+				// and the user opted in telemetry
+				if (this._raw.customTelemetryService && this.telemetryService.isOptedIn) {
+					// __GDPR__TODO__ We're sending events in the name of the debug extension and we can not ensure that those are declared correctly.
+					this._raw.customTelemetryService.publicLog(event.body.output, event.body.data);
+				}
+
+				return;
+			}
+
+			// Make sure to append output in the correct order by properly waiting on preivous promises #33822
+			const waitFor = outputPromises.slice();
+			const source = event.body.source ? {
+				lineNumber: event.body.line,
+				column: event.body.column ? event.body.column : 1,
+				source: this.getSource(event.body.source)
+			} : undefined;
+			if (event.body.variablesReference) {
+				const container = new ExpressionContainer(this, event.body.variablesReference, generateUuid());
+				outputPromises.push(container.getChildren().then(children => {
+					return TPromise.join(waitFor).then(() => children.forEach(child => {
+						// Since we can not display multiple trees in a row, we are displaying these variables one after the other (ignoring their names)
+						child.name = null;
+						this.debugService.logToRepl(child, outputSeverity, source);
+					}));
+				}));
+			} else if (typeof event.body.output === 'string') {
+				TPromise.join(waitFor).then(() => this.debugService.logToRepl(event.body.output, outputSeverity, source));
+			}
+			TPromise.join(outputPromises).then(() => outputPromises = []);
+		}));
+
+		this.rawListeners.push(this._raw.onDidBreakpoint(event => {
+			const id = event.body && event.body.breakpoint ? event.body.breakpoint.id : undefined;
+			const breakpoint = this.model.getBreakpoints().filter(bp => bp.idFromAdapter === id).pop();
+			const functionBreakpoint = this.model.getFunctionBreakpoints().filter(bp => bp.idFromAdapter === id).pop();
+
+			if (event.body.reason === 'new' && event.body.breakpoint.source) {
+				const source = this.getSource(event.body.breakpoint.source);
+				const bps = this.model.addBreakpoints(source.uri, [{
+					column: event.body.breakpoint.column,
+					enabled: true,
+					lineNumber: event.body.breakpoint.line,
+				}], false);
+				if (bps.length === 1) {
+					this.model.updateBreakpoints({ [bps[0].getId()]: event.body.breakpoint });
+				}
+			}
+
+			if (event.body.reason === 'removed') {
+				if (breakpoint) {
+					this.model.removeBreakpoints([breakpoint]);
+				}
+				if (functionBreakpoint) {
+					this.model.removeFunctionBreakpoints(functionBreakpoint.getId());
+				}
+			}
+
+			if (event.body.reason === 'changed') {
+				if (breakpoint) {
+					if (!breakpoint.column) {
+						event.body.breakpoint.column = undefined;
+					}
+					this.model.setBreakpointSessionData(this.getId(), { [breakpoint.getId()]: event.body.breakpoint });
+				}
+				if (functionBreakpoint) {
+					this.model.setBreakpointSessionData(this.getId(), { [functionBreakpoint.getId()]: event.body.breakpoint });
+				}
+			}
+		}));
+
+		this.rawListeners.push(this._raw.onDidLoadedSource(event => {
+			this._onDidLoadedSource.fire({
+				reason: event.body.reason,
+				source: this.getSource(event.body.source)
+			});
+		}));
+
+		this.rawListeners.push(this._raw.onDidCustomEvent(event => {
+			this._onDidCustomEvent.fire(event);
+		}));
+
+		this.rawListeners.push(this._raw.onDidExitAdapter(event => {
+			this._onDidEndAdapter.fire(event);
+		}));
+	}
+
+	dispose(): void {
+		dispose(this.rawListeners);
+		this.model.clearThreads(this.getId(), true);
+		this.model.removeSession(this.getId());
+		this.fetchThreadsScheduler = undefined;
+		if (this._raw) {
+			this._raw.disconnect();
+		}
+		this._raw = undefined;
+	}
+
+	//---- sources
+
+	getSourceForUri(modelUri: uri): Source {
+		return this.sources.get(modelUri.toString());
+	}
+
+	getSource(raw: DebugProtocol.Source): Source {
+		let source = new Source(raw, this.getId());
+		if (this.sources.has(source.uri.toString())) {
+			source = this.sources.get(source.uri.toString());
+			source.raw = mixin(source.raw, raw);
+			if (source.raw && raw) {
+				// Always take the latest presentation hint from adapter #42139
+				source.raw.presentationHint = raw.presentationHint;
+			}
+		} else {
+			this.sources.set(source.uri.toString(), source);
+		}
+
+		return source;
+	}
+}
diff --git a/src/vs/workbench/parts/debug/electron-browser/electronDebugActions.ts b/src/vs/workbench/parts/debug/electron-browser/electronDebugActions.ts
index c7745f86c64..ca825394e33 100644
--- a/src/vs/workbench/parts/debug/electron-browser/electronDebugActions.ts
+++ b/src/vs/workbench/parts/debug/electron-browser/electronDebugActions.ts
@@ -26,7 +26,7 @@ export class CopyValueAction extends Action {
 		if (this.value instanceof Variable) {
 			const frameId = this.debugService.getViewModel().focusedStackFrame.frameId;
 			const session = this.debugService.getViewModel().focusedSession;
-			return session.raw.evaluate({ expression: this.value.evaluateName, frameId }).then(result => {
+			return session.evaluate(this.value.evaluateName, frameId).then(result => {
 				clipboard.writeText(result.body.result);
 			}, err => clipboard.writeText(this.value.value));
 		}
diff --git a/src/vs/workbench/parts/debug/electron-browser/rawDebugSession.ts b/src/vs/workbench/parts/debug/electron-browser/rawDebugSession.ts
index 645efdd8418..473552f09e4 100644
--- a/src/vs/workbench/parts/debug/electron-browser/rawDebugSession.ts
+++ b/src/vs/workbench/parts/debug/electron-browser/rawDebugSession.ts
@@ -10,87 +10,93 @@ import { Action } from 'vs/base/common/actions';
 import * as errors from 'vs/base/common/errors';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import * as debug from 'vs/workbench/parts/debug/common/debug';
-import { Debugger } from 'vs/workbench/parts/debug/node/debugger';
 import { IOutputService } from 'vs/workbench/parts/output/common/output';
 import { IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
-import { INotificationService } from 'vs/platform/notification/common/notification';
 import { formatPII } from 'vs/workbench/parts/debug/common/debugUtils';
-import { SocketDebugAdapter } from 'vs/workbench/parts/debug/node/debugAdapter';
+import { IDebugAdapter, IConfig, AdapterEndEvent, IDebugger } from 'vs/workbench/parts/debug/common/debug';
 
+export class RawDebugSession {
 
-export interface SessionExitedEvent extends debug.DebugEvent {
-	body: {
-		exitCode: number,
-		sessionId: string
-	};
-}
-
-export interface SessionTerminatedEvent extends debug.DebugEvent {
-	body: {
-		restart?: boolean,
-		sessionId: string
-	};
-}
-
-export class RawDebugSession implements debug.IRawSession {
-
-	private debugAdapter: debug.IDebugAdapter;
-
-	public emittedStopped: boolean;
-	public readyForBreakpoints: boolean;
-
-	private cachedInitServerP: TPromise<void>;
-	private startTime: number;
-	public disconnected: boolean;
-	private sentPromises: TPromise<DebugProtocol.Response>[];
-	private _capabilities: DebugProtocol.Capabilities;
+	private debugAdapter: IDebugAdapter;
+	private cachedInitDebugAdapterP: TPromise<void>;
 	private allThreadsContinued: boolean;
+	private _readyForBreakpoints: boolean;
+	private _capabilities: DebugProtocol.Capabilities;
 
+	// shutdown
+	private inShutdown: boolean;
+	private terminated: boolean;
+	private firedAdapterExitEvent: boolean;
+
+	// telemetry
+	private startTime: number;
+	private emittedStopped: boolean;
+
+	// DAP events
 	private readonly _onDidInitialize: Emitter<DebugProtocol.InitializedEvent>;
 	private readonly _onDidStop: Emitter<DebugProtocol.StoppedEvent>;
 	private readonly _onDidContinued: Emitter<DebugProtocol.ContinuedEvent>;
-	private readonly _onDidTerminateDebugee: Emitter<SessionTerminatedEvent>;
+	private readonly _onDidTerminateDebugee: Emitter<DebugProtocol.TerminatedEvent>;
 	private readonly _onDidExitDebugee: Emitter<DebugProtocol.ExitedEvent>;
-	private readonly _onDidExitAdapter: Emitter<{ sessionId: string }>;
 	private readonly _onDidThread: Emitter<DebugProtocol.ThreadEvent>;
 	private readonly _onDidOutput: Emitter<DebugProtocol.OutputEvent>;
 	private readonly _onDidBreakpoint: Emitter<DebugProtocol.BreakpointEvent>;
-	private readonly _onDidCustomEvent: Emitter<debug.DebugEvent>;
+	private readonly _onDidLoadedSource: Emitter<DebugProtocol.LoadedSourceEvent>;
+	private readonly _onDidCustomEvent: Emitter<DebugProtocol.Event>;
 	private readonly _onDidEvent: Emitter<DebugProtocol.Event>;
 
+	// DA events
+	private readonly _onDidExitAdapter: Emitter<AdapterEndEvent>;
+
 	constructor(
-		private id: string,
 		private debugServerPort: number,
-		private _debugger: Debugger,
+		private _debugger: IDebugger,
 		public customTelemetryService: ITelemetryService,
-		public root: IWorkspaceFolder,
-		@INotificationService private notificationService: INotificationService,
+		private root: IWorkspaceFolder,
 		@ITelemetryService private telemetryService: ITelemetryService,
 		@IOutputService private outputService: IOutputService
 	) {
+		this._readyForBreakpoints = false;
+		this.inShutdown = false;
+		this.firedAdapterExitEvent = false;
+
 		this.emittedStopped = false;
-		this.readyForBreakpoints = false;
+
 		this.allThreadsContinued = true;
-		this.sentPromises = [];
 
 		this._onDidInitialize = new Emitter<DebugProtocol.InitializedEvent>();
 		this._onDidStop = new Emitter<DebugProtocol.StoppedEvent>();
 		this._onDidContinued = new Emitter<DebugProtocol.ContinuedEvent>();
-		this._onDidTerminateDebugee = new Emitter<SessionTerminatedEvent>();
+		this._onDidTerminateDebugee = new Emitter<DebugProtocol.TerminatedEvent>();
 		this._onDidExitDebugee = new Emitter<DebugProtocol.ExitedEvent>();
-		this._onDidExitAdapter = new Emitter<{ sessionId: string }>();
 		this._onDidThread = new Emitter<DebugProtocol.ThreadEvent>();
 		this._onDidOutput = new Emitter<DebugProtocol.OutputEvent>();
 		this._onDidBreakpoint = new Emitter<DebugProtocol.BreakpointEvent>();
-		this._onDidCustomEvent = new Emitter<debug.DebugEvent>();
+		this._onDidLoadedSource = new Emitter<DebugProtocol.LoadedSourceEvent>();
+		this._onDidCustomEvent = new Emitter<DebugProtocol.Event>();
 		this._onDidEvent = new Emitter<DebugProtocol.Event>();
+
+		this._onDidExitAdapter = new Emitter<AdapterEndEvent>();
 	}
 
-	public getId(): string {
-		return this.id;
+	public get onDidExitAdapter(): Event<AdapterEndEvent> {
+		return this._onDidExitAdapter.event;
 	}
 
+	public get capabilities(): DebugProtocol.Capabilities {
+		return this._capabilities || {};
+	}
+
+	/**
+	 * DA is ready to accepts setBreakpoint requests.
+	 * Becomes true after "initialized" events has been received.
+	 */
+	public get readyForBreakpoints(): boolean {
+		return this._readyForBreakpoints;
+	}
+
+	//---- DAP events
+
 	public get onDidInitialize(): Event<DebugProtocol.InitializedEvent> {
 		return this._onDidInitialize.event;
 	}
@@ -103,7 +109,7 @@ export class RawDebugSession implements debug.IRawSession {
 		return this._onDidContinued.event;
 	}
 
-	public get onDidTerminateDebugee(): Event<SessionTerminatedEvent> {
+	public get onDidTerminateDebugee(): Event<DebugProtocol.TerminatedEvent> {
 		return this._onDidTerminateDebugee.event;
 	}
 
@@ -111,10 +117,6 @@ export class RawDebugSession implements debug.IRawSession {
 		return this._onDidExitDebugee.event;
 	}
 
-	public get onDidExitAdapter(): Event<{ sessionId: string }> {
-		return this._onDidExitAdapter.event;
-	}
-
 	public get onDidThread(): Event<DebugProtocol.ThreadEvent> {
 		return this._onDidThread.event;
 	}
@@ -127,7 +129,11 @@ export class RawDebugSession implements debug.IRawSession {
 		return this._onDidBreakpoint.event;
 	}
 
-	public get onDidCustomEvent(): Event<debug.DebugEvent> {
+	public get onDidLoadedSource(): Event<DebugProtocol.LoadedSourceEvent> {
+		return this._onDidLoadedSource.event;
+	}
+
+	public get onDidCustomEvent(): Event<DebugProtocol.Event> {
 		return this._onDidCustomEvent.event;
 	}
 
@@ -135,173 +141,46 @@ export class RawDebugSession implements debug.IRawSession {
 		return this._onDidEvent.event;
 	}
 
-	private initServer(): TPromise<void> {
-
-		if (this.cachedInitServerP) {
-			return this.cachedInitServerP;
-		}
-
-		const startSessionP = this.startSession();
-
-		this.cachedInitServerP = startSessionP.then(() => {
-			this.startTime = new Date().getTime();
-		}, err => {
-			this.cachedInitServerP = null;
-			return TPromise.wrapError(err);
-		});
-
-		return this.cachedInitServerP;
-	}
-
-	private startSession(): TPromise<void> {
-
-		return this._debugger.createDebugAdapter(this.root, this.outputService, this.debugServerPort).then(debugAdapter => {
-
-			this.debugAdapter = debugAdapter;
-
-			this.debugAdapter.onError(err => this.onDebugAdapterError(err));
-			this.debugAdapter.onEvent(event => this.onDapEvent(event));
-			this.debugAdapter.onRequest(request => this.dispatchRequest(request));
-			this.debugAdapter.onExit(code => this.onDebugAdapterExit());
-
-			return this.debugAdapter.startSession();
-		});
-	}
-
-	public custom(request: string, args: any): TPromise<DebugProtocol.Response> {
-		return this.send(request, args);
-	}
-
-	private send<R extends DebugProtocol.Response>(command: string, args: any, cancelOnDisconnect = true): TPromise<R> {
-		return this.initServer().then(() => {
-			const promise = this.internalSend<R>(command, args).then(response => response, (errorResponse: DebugProtocol.ErrorResponse) => {
-				const error = errorResponse && errorResponse.body ? errorResponse.body.error : null;
-				const errorMessage = errorResponse ? errorResponse.message : '';
-				const telemetryMessage = error ? formatPII(error.format, true, error.variables) : errorMessage;
-				if (error && error.sendTelemetry) {
-					/* __GDPR__
-						"debugProtocolErrorResponse" : {
-							"error" : { "classification": "CallstackOrException", "purpose": "FeatureInsight" }
-						}
-					*/
-					this.telemetryService.publicLog('debugProtocolErrorResponse', { error: telemetryMessage });
-					if (this.customTelemetryService) {
-						/* __GDPR__TODO__
-							The message is sent in the name of the adapter but the adapter doesn't know about it.
-							However, since adapters are an open-ended set, we can not declared the events statically either.
-						*/
-						this.customTelemetryService.publicLog('debugProtocolErrorResponse', { error: telemetryMessage });
-					}
-				}
-
-				const userMessage = error ? formatPII(error.format, false, error.variables) : errorMessage;
-				if (error && error.url) {
-					const label = error.urlLabel ? error.urlLabel : nls.localize('moreInfo', "More Info");
-					return TPromise.wrapError<R>(errors.create(userMessage, {
-						actions: [new Action('debug.moreInfo', label, null, true, () => {
-							window.open(error.url);
-							return TPromise.as(null);
-						})]
-					}));
-				}
-
-				return errors.isPromiseCanceledError(errorResponse) ? undefined : TPromise.wrapError<R>(new Error(userMessage));
-			});
-
-			if (cancelOnDisconnect) {
-				this.sentPromises.push(promise);
-			}
-			return promise;
-		});
-	}
-
-	private internalSend<R extends DebugProtocol.Response>(command: string, args: any): TPromise<R> {
-		let errorCallback: (error: Error) => void;
-		return new TPromise<R>((completeDispatch, errorDispatch) => {
-			errorCallback = errorDispatch;
-			this.debugAdapter.sendRequest(command, args, (result: R) => {
-				if (result.success) {
-					completeDispatch(result);
-				} else {
-					errorDispatch(result);
-				}
-			});
-		}, () => errorCallback(errors.canceled()));
-	}
-
-	private onDapEvent(event: debug.DebugEvent): void {
-		event.sessionId = this.id;
-
-		if (event.event === 'initialized') {
-			this.readyForBreakpoints = true;
-			this._onDidInitialize.fire(event);
-		} else if (event.event === 'capabilities' && event.body) {
-			const capabilites = (<DebugProtocol.CapabilitiesEvent>event).body.capabilities;
-			this._capabilities = objects.mixin(this._capabilities, capabilites);
-		} else if (event.event === 'stopped') {
-			this.emittedStopped = true;
-			this._onDidStop.fire(<DebugProtocol.StoppedEvent>event);
-		} else if (event.event === 'continued') {
-			this.allThreadsContinued = (<DebugProtocol.ContinuedEvent>event).body.allThreadsContinued === false ? false : true;
-			this._onDidContinued.fire(<DebugProtocol.ContinuedEvent>event);
-		} else if (event.event === 'thread') {
-			this._onDidThread.fire(<DebugProtocol.ThreadEvent>event);
-		} else if (event.event === 'output') {
-			this._onDidOutput.fire(<DebugProtocol.OutputEvent>event);
-		} else if (event.event === 'breakpoint') {
-			this._onDidBreakpoint.fire(<DebugProtocol.BreakpointEvent>event);
-		} else if (event.event === 'terminated') {
-			this._onDidTerminateDebugee.fire(<SessionTerminatedEvent>event);
-		} else if (event.event === 'exit') {
-			this._onDidExitDebugee.fire(<SessionExitedEvent>event);
-		} else {
-			this._onDidCustomEvent.fire(event);
-		}
-
-		this._onDidEvent.fire(event);
-	}
-
-	public get capabilities(): DebugProtocol.Capabilities {
-		return this._capabilities || {};
-	}
+	//---- DAP requests
 
 	public initialize(args: DebugProtocol.InitializeRequestArguments): TPromise<DebugProtocol.InitializeResponse> {
-		return this.send('initialize', args).then(response => this.readCapabilities(response));
+		return this.send('initialize', args).then((response: DebugProtocol.InitializeResponse) => {
+			this.mergeCapabilities(response.body);
+			return response;
+		});
 	}
 
-	private readCapabilities(response: DebugProtocol.Response): DebugProtocol.Response {
-		if (response) {
-			this._capabilities = objects.mixin(this._capabilities, response.body);
+	public launchOrAttach(config: IConfig): TPromise<DebugProtocol.Response> {
+		return this.send(config.request, config).then(response => {
+			this.mergeCapabilities(response.body);
+			return response;
+		});
+	}
+
+	public restart(): TPromise<DebugProtocol.RestartResponse> {
+		if (this.capabilities.supportsRestartRequest) {
+			return this.send('restart', null);
 		}
-
-		return response;
-	}
-
-	public launch(args: DebugProtocol.LaunchRequestArguments): TPromise<DebugProtocol.LaunchResponse> {
-		return this.send('launch', args).then(response => this.readCapabilities(response));
-	}
-
-	public attach(args: DebugProtocol.AttachRequestArguments): TPromise<DebugProtocol.AttachResponse> {
-		return this.send('attach', args).then(response => this.readCapabilities(response));
+		return TPromise.wrapError(new Error('restart not supported'));
 	}
 
 	public next(args: DebugProtocol.NextArguments): TPromise<DebugProtocol.NextResponse> {
 		return this.send('next', args).then(response => {
-			this.fireFakeContinued(args.threadId);
+			this.fireSimulatedContinuedEvent(args.threadId);
 			return response;
 		});
 	}
 
 	public stepIn(args: DebugProtocol.StepInArguments): TPromise<DebugProtocol.StepInResponse> {
 		return this.send('stepIn', args).then(response => {
-			this.fireFakeContinued(args.threadId);
+			this.fireSimulatedContinuedEvent(args.threadId);
 			return response;
 		});
 	}
 
 	public stepOut(args: DebugProtocol.StepOutArguments): TPromise<DebugProtocol.StepOutResponse> {
 		return this.send('stepOut', args).then(response => {
-			this.fireFakeContinued(args.threadId);
+			this.fireSimulatedContinuedEvent(args.threadId);
 			return response;
 		});
 	}
@@ -311,7 +190,7 @@ export class RawDebugSession implements debug.IRawSession {
 			if (response && response.body && response.body.allThreadsContinued !== undefined) {
 				this.allThreadsContinued = response.body.allThreadsContinued;
 			}
-			this.fireFakeContinued(args.threadId, this.allThreadsContinued);
+			this.fireSimulatedContinuedEvent(args.threadId, this.allThreadsContinued);
 			return response;
 		});
 	}
@@ -330,34 +209,37 @@ export class RawDebugSession implements debug.IRawSession {
 
 	public restartFrame(args: DebugProtocol.RestartFrameArguments, threadId: number): TPromise<DebugProtocol.RestartFrameResponse> {
 		return this.send('restartFrame', args).then(response => {
-			this.fireFakeContinued(threadId);
+			this.fireSimulatedContinuedEvent(threadId);
 			return response;
 		});
 	}
 
 	public completions(args: DebugProtocol.CompletionsArguments): TPromise<DebugProtocol.CompletionsResponse> {
-		return this.send<DebugProtocol.CompletionsResponse>('completions', args);
+		if (this.capabilities.supportsCompletionsRequest) {
+			return this.send<DebugProtocol.CompletionsResponse>('completions', args);
+		}
+		return TPromise.wrapError(new Error('completions not supported'));
 	}
 
-	public disconnect(restart = false, force = false): TPromise<DebugProtocol.DisconnectResponse> {
-		if (this.disconnected && force) {
-			return this.stopServer();
+	/**
+	 * Try terminate the debuggee softly
+	 */
+	public terminate(restart = false): TPromise<DebugProtocol.TerminateResponse> {
+		if (this.capabilities.supportsTerminateRequest) {
+			if (!this.terminated) {
+				this.terminated = true;
+				return this.send('terminate', { restart });
+			}
+			return this.disconnect(restart);
 		}
+		return TPromise.wrapError(new Error('terminated not supported'));
+	}
 
-		// Cancel all sent promises on disconnect so debug trees are not left in a broken state #3666.
-		// Give a 1s timeout to give a chance for some promises to complete.
-		setTimeout(() => {
-			this.sentPromises.forEach(p => p && p.cancel());
-			this.sentPromises = [];
-		}, 1000);
-
-		if (this.debugAdapter && !this.disconnected) {
-			// point of no return: from now on don't report any errors
-			this.disconnected = true;
-			return this.send('disconnect', { restart: restart }, false).then(() => this.stopServer(), () => this.stopServer());
-		}
-
-		return TPromise.as(null);
+	/**
+	 * Terminate the debuggee
+	 */
+	public disconnect(restart = false): TPromise<any> {
+		return this.shutdown(undefined, restart);
 	}
 
 	public setBreakpoints(args: DebugProtocol.SetBreakpointsArguments): TPromise<DebugProtocol.SetBreakpointsResponse> {
@@ -365,7 +247,10 @@ export class RawDebugSession implements debug.IRawSession {
 	}
 
 	public setFunctionBreakpoints(args: DebugProtocol.SetFunctionBreakpointsArguments): TPromise<DebugProtocol.SetFunctionBreakpointsResponse> {
-		return this.send<DebugProtocol.SetFunctionBreakpointsResponse>('setFunctionBreakpoints', args);
+		if (this.capabilities.supportsFunctionBreakpoints) {
+			return this.send<DebugProtocol.SetFunctionBreakpointsResponse>('setFunctionBreakpoints', args);
+		}
+		return TPromise.wrapError(new Error('setFunctionBreakpoints not supported'));
 	}
 
 	public setExceptionBreakpoints(args: DebugProtocol.SetExceptionBreakpointsArguments): TPromise<DebugProtocol.SetExceptionBreakpointsResponse> {
@@ -396,6 +281,13 @@ export class RawDebugSession implements debug.IRawSession {
 		return this.send<DebugProtocol.SourceResponse>('source', args);
 	}
 
+	public loadedSources(args: DebugProtocol.LoadedSourcesArguments): TPromise<DebugProtocol.LoadedSourcesResponse> {
+		if (this.capabilities.supportsLoadedSourcesRequest) {
+			return this.send<DebugProtocol.LoadedSourcesResponse>('loadedSources', args);
+		}
+		return TPromise.wrapError(new Error('loadedSources not supported'));
+	}
+
 	public threads(): TPromise<DebugProtocol.ThreadsResponse> {
 		return this.send<DebugProtocol.ThreadsResponse>('threads', null);
 	}
@@ -407,7 +299,7 @@ export class RawDebugSession implements debug.IRawSession {
 	public stepBack(args: DebugProtocol.StepBackArguments): TPromise<DebugProtocol.StepBackResponse> {
 		return this.send('stepBack', args).then(response => {
 			if (response.body === undefined) {
-				this.fireFakeContinued(args.threadId);
+				this.fireSimulatedContinuedEvent(args.threadId);
 			}
 			return response;
 		});
@@ -416,14 +308,145 @@ export class RawDebugSession implements debug.IRawSession {
 	public reverseContinue(args: DebugProtocol.ReverseContinueArguments): TPromise<DebugProtocol.ReverseContinueResponse> {
 		return this.send('reverseContinue', args).then(response => {
 			if (response.body === undefined) {
-				this.fireFakeContinued(args.threadId);
+				this.fireSimulatedContinuedEvent(args.threadId);
 			}
 			return response;
 		});
 	}
 
-	public getLengthInSeconds(): number {
-		return (new Date().getTime() - this.startTime) / 1000;
+	public custom(request: string, args: any): TPromise<DebugProtocol.Response> {
+		return this.send(request, args);
+	}
+
+	//---- private
+
+	private startAdapter(): TPromise<void> {
+
+		if (!this.cachedInitDebugAdapterP) {
+
+			const startSessionP = this._debugger.createDebugAdapter(this.root, this.outputService, this.debugServerPort).then(debugAdapter => {
+
+				this.debugAdapter = debugAdapter;
+
+				this.debugAdapter.onError(err => {
+					this.shutdown(err);
+				});
+
+				this.debugAdapter.onExit(code => {
+					if (code !== 0) {
+						this.shutdown(new Error(`exit code: ${code}`));
+					} else {
+						// normal exit
+						this.shutdown();
+					}
+				});
+
+				this.debugAdapter.onEvent(event => this.onDapEvent(event));
+				this.debugAdapter.onRequest(request => this.dispatchRequest(request));
+
+				return this.debugAdapter.startSession();
+			});
+
+			this.cachedInitDebugAdapterP = startSessionP.then(() => {
+				this.startTime = new Date().getTime();
+			}, err => {
+				return TPromise.wrapError(err);
+			});
+		}
+
+		return this.cachedInitDebugAdapterP;
+	}
+
+	private shutdown(error?: Error, restart = false): TPromise<any> {
+		if (!this.inShutdown) {
+			this.inShutdown = true;
+			if (this.debugAdapter) {
+				return this.send('disconnect', { restart }, 500).then(() => {
+					this.stopAdapter(error);
+				}, () => {
+					// ignore error
+					this.stopAdapter(error);
+				});
+			}
+			return this.stopAdapter(error);
+		}
+		return TPromise.as(undefined);
+	}
+
+	private stopAdapter(error?: Error): TPromise<any> {
+		if (this.debugAdapter) {
+			const da = this.debugAdapter;
+			this.debugAdapter = null;
+			return da.stopSession().then(_ => {
+				this.fireAdapterExitEvent(error);
+			}, err => {
+				this.fireAdapterExitEvent(error);
+			});
+		} else {
+			this.fireAdapterExitEvent(error);
+		}
+		return TPromise.as(undefined);
+	}
+
+	private fireAdapterExitEvent(error?: Error): void {
+		if (!this.firedAdapterExitEvent) {
+			this.firedAdapterExitEvent = true;
+
+			const e: AdapterEndEvent = {
+				emittedStopped: this.emittedStopped,
+				sessionLengthInSeconds: (new Date().getTime() - this.startTime) / 1000
+			};
+			if (error) {
+				e.error = error;
+			}
+			this._onDidExitAdapter.fire(e);
+		}
+	}
+
+	private onDapEvent(event: DebugProtocol.Event): void {
+
+		switch (event.event) {
+			case 'initialized':
+				this._readyForBreakpoints = true;
+				this._onDidInitialize.fire(event);
+				break;
+			case 'loadedSource':
+				this._onDidLoadedSource.fire(<DebugProtocol.LoadedSourceEvent>event);
+				break;
+			case 'capabilities':
+				if (event.body) {
+					const capabilites = (<DebugProtocol.CapabilitiesEvent>event).body.capabilities;
+					this.mergeCapabilities(capabilites);
+				}
+				break;
+			case 'stopped':
+				this.emittedStopped = true;
+				this._onDidStop.fire(<DebugProtocol.StoppedEvent>event);
+				break;
+			case 'continued':
+				this.allThreadsContinued = (<DebugProtocol.ContinuedEvent>event).body.allThreadsContinued === false ? false : true;
+				this._onDidContinued.fire(<DebugProtocol.ContinuedEvent>event);
+				break;
+			case 'thread':
+				this._onDidThread.fire(<DebugProtocol.ThreadEvent>event);
+				break;
+			case 'output':
+				this._onDidOutput.fire(<DebugProtocol.OutputEvent>event);
+				break;
+			case 'breakpoint':
+				this._onDidBreakpoint.fire(<DebugProtocol.BreakpointEvent>event);
+				break;
+			case 'terminated':
+				this._onDidTerminateDebugee.fire(<DebugProtocol.TerminatedEvent>event);
+				break;
+			case 'exit':
+				this._onDidExitDebugee.fire(<DebugProtocol.ExitedEvent>event);
+				break;
+			default:
+				this._onDidCustomEvent.fire(event);
+				break;
+		}
+		this._onDidEvent.fire(event);
 	}
 
 	private dispatchRequest(request: DebugProtocol.Request): void {
@@ -436,39 +459,93 @@ export class RawDebugSession implements debug.IRawSession {
 			success: true
 		};
 
-		if (request.command === 'runInTerminal') {
+		const safeSendResponse = (response) => this.debugAdapter && this.debugAdapter.sendResponse(response);
 
-			this._debugger.runInTerminal(<DebugProtocol.RunInTerminalRequestArguments>request.arguments).then(_ => {
-				response.body = {};
-				this.debugAdapter.sendResponse(response);
-			}, err => {
+		switch (request.command) {
+			case 'runInTerminal':
+				this._debugger.runInTerminal(<DebugProtocol.RunInTerminalRequestArguments>request.arguments).then(_ => {
+					response.body = {};
+					safeSendResponse(response);
+				}, err => {
+					response.success = false;
+					response.message = err.message;
+					safeSendResponse(response);
+				});
+				break;
+			case 'handshake':
+				try {
+					const vsda = <any>require.__$__nodeRequire('vsda');
+					const obj = new vsda.signer();
+					const sig = obj.sign(request.arguments.value);
+					response.body = {
+						signature: sig
+					};
+					safeSendResponse(response);
+				} catch (e) {
+					response.success = false;
+					response.message = e.message;
+					safeSendResponse(response);
+				}
+				break;
+			default:
 				response.success = false;
-				response.message = err.message;
-				this.debugAdapter.sendResponse(response);
-			});
-
-		} else if (request.command === 'handshake') {
-			try {
-				const vsda = <any>require.__$__nodeRequire('vsda');
-				const obj = new vsda.signer();
-				const sig = obj.sign(request.arguments.value);
-				response.body = {
-					signature: sig
-				};
-				this.debugAdapter.sendResponse(response);
-			} catch (e) {
-				response.success = false;
-				response.message = e.message;
-				this.debugAdapter.sendResponse(response);
-			}
-		} else {
-			response.success = false;
-			response.message = `unknown request '${request.command}'`;
-			this.debugAdapter.sendResponse(response);
+				response.message = `unknown request '${request.command}'`;
+				safeSendResponse(response);
+				break;
 		}
 	}
 
-	private fireFakeContinued(threadId: number, allThreadsContinued = false): void {
+	private send<R extends DebugProtocol.Response>(command: string, args: any, timeout?: number): TPromise<R> {
+
+		return this.startAdapter().then(() => {
+
+			return new TPromise<R>((completeDispatch, errorDispatch) => {
+				this.debugAdapter.sendRequest(command, args, (response: R) => {
+					if (response.success) {
+						completeDispatch(response);
+					} else {
+						errorDispatch(response);
+					}
+				}, timeout);
+			}).then(response => response, err => TPromise.wrapError(this.handleErrorResponse(err)));
+		});
+	}
+
+	private handleErrorResponse(errorResponse: DebugProtocol.Response): Error {
+
+		if (errorResponse.command === 'canceled' && errorResponse.message === 'canceled') {
+			return errors.canceled();
+		}
+
+		const error = errorResponse && errorResponse.body ? errorResponse.body.error : null;
+		const errorMessage = errorResponse ? errorResponse.message : '';
+
+		if (error && error.sendTelemetry) {
+			const telemetryMessage = error ? formatPII(error.format, true, error.variables) : errorMessage;
+			this.telemetryDebugProtocolErrorResponse(telemetryMessage);
+		}
+
+		const userMessage = error ? formatPII(error.format, false, error.variables) : errorMessage;
+		if (error && error.url) {
+			const label = error.urlLabel ? error.urlLabel : nls.localize('moreInfo', "More Info");
+			return errors.create(userMessage, {
+				actions: [new Action('debug.moreInfo', label, null, true, () => {
+					window.open(error.url);
+					return TPromise.as(null);
+				})]
+			});
+		}
+
+		return new Error(userMessage);
+	}
+
+	private mergeCapabilities(capabilities: DebugProtocol.Capabilities): void {
+		if (capabilities) {
+			this._capabilities = objects.mixin(this._capabilities, capabilities);
+		}
+	}
+
+	private fireSimulatedContinuedEvent(threadId: number, allThreadsContinued = false): void {
 		this._onDidContinued.fire({
 			type: 'event',
 			event: 'continued',
@@ -480,38 +557,19 @@ export class RawDebugSession implements debug.IRawSession {
 		});
 	}
 
-	private stopServer(): TPromise<any> {
-
-		if (/* this.socket !== null */ this.debugAdapter instanceof SocketDebugAdapter) {
-			this.debugAdapter.stopSession();
-			this.cachedInitServerP = null;
+	private telemetryDebugProtocolErrorResponse(telemetryMessage: string) {
+		/* __GDPR__
+			"debugProtocolErrorResponse" : {
+				"error" : { "classification": "CallstackOrException", "purpose": "FeatureInsight" }
+			}
+		*/
+		this.telemetryService.publicLog('debugProtocolErrorResponse', { error: telemetryMessage });
+		if (this.customTelemetryService) {
+			/* __GDPR__TODO__
+				The message is sent in the name of the adapter but the adapter doesn't know about it.
+				However, since adapters are an open-ended set, we can not declared the events statically either.
+			*/
+			this.customTelemetryService.publicLog('debugProtocolErrorResponse', { error: telemetryMessage });
 		}
-
-		this._onDidExitAdapter.fire({ sessionId: this.getId() });
-		this.disconnected = true;
-		if (!this.debugAdapter || this.debugAdapter instanceof SocketDebugAdapter) {
-			return TPromise.as(null);
-		}
-
-
-		return this.debugAdapter.stopSession();
-	}
-
-	private onDebugAdapterError(err: Error): void {
-		this.notificationService.error(err.message || err.toString());
-		this.stopServer().done(null, errors.onUnexpectedError);
-	}
-
-	private onDebugAdapterExit(): void {
-		this.debugAdapter = null;
-		this.cachedInitServerP = null;
-		if (!this.disconnected) {
-			this.notificationService.error(nls.localize('debugAdapterCrash', "Debug adapter process has terminated unexpectedly"));
-		}
-		this._onDidExitAdapter.fire({ sessionId: this.getId() });
-	}
-
-	public dispose(): void {
-		this.disconnect().done(null, errors.onUnexpectedError);
 	}
 }
diff --git a/src/vs/workbench/parts/debug/electron-browser/repl.ts b/src/vs/workbench/parts/debug/electron-browser/repl.ts
index b1cc5998947..9ebd5e49f77 100644
--- a/src/vs/workbench/parts/debug/electron-browser/repl.ts
+++ b/src/vs/workbench/parts/debug/electron-browser/repl.ts
@@ -5,12 +5,12 @@
 
 import 'vs/css!vs/workbench/parts/debug/browser/media/repl';
 import * as nls from 'vs/nls';
-import uri from 'vs/base/common/uri';
-import { wireCancellationToken } from 'vs/base/common/async';
+import { URI as uri } from 'vs/base/common/uri';
 import { TPromise } from 'vs/base/common/winjs.base';
 import * as errors from 'vs/base/common/errors';
 import { IAction } from 'vs/base/common/actions';
 import * as dom from 'vs/base/browser/dom';
+import * as aria from 'vs/base/browser/ui/aria/aria';
 import { isMacintosh } from 'vs/base/common/platform';
 import { CancellationToken } from 'vs/base/common/cancellation';
 import { KeyCode } from 'vs/base/common/keyCodes';
@@ -24,14 +24,12 @@ import { registerEditorAction, ServicesAccessor, EditorAction, EditorCommand, re
 import { IModelService } from 'vs/editor/common/services/modelService';
 import { MenuId } from 'vs/platform/actions/common/actions';
 import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
-import { IContextKeyService, ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
+import { IContextKeyService, ContextKeyExpr, IContextKey } from 'vs/platform/contextkey/common/contextkey';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IInstantiationService, createDecorator } from 'vs/platform/instantiation/common/instantiation';
 import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
 import { ReplExpressionsRenderer, ReplExpressionsController, ReplExpressionsDataSource, ReplExpressionsActionProvider, ReplExpressionsAccessibilityProvider } from 'vs/workbench/parts/debug/electron-browser/replViewer';
-import { SimpleDebugEditor } from 'vs/workbench/parts/debug/electron-browser/simpleDebugEditor';
 import { ClearReplAction } from 'vs/workbench/parts/debug/browser/debugActions';
-import { ReplHistory } from 'vs/workbench/parts/debug/common/replHistory';
 import { Panel } from 'vs/workbench/browser/panel';
 import { IPanelService } from 'vs/workbench/services/panel/common/panelService';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
@@ -43,7 +41,13 @@ import { dispose } from 'vs/base/common/lifecycle';
 import { OpenMode, ClickBehavior } from 'vs/base/parts/tree/browser/treeDefaults';
 import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
 import { CodeEditorWidget } from 'vs/editor/browser/widget/codeEditorWidget';
-import { IDebugService, REPL_ID, DEBUG_SCHEME, CONTEXT_ON_FIRST_DEBUG_REPL_LINE, CONTEXT_IN_DEBUG_REPL, CONTEXT_ON_LAST_DEBUG_REPL_LINE } from 'vs/workbench/parts/debug/common/debug';
+import { IDebugService, REPL_ID, DEBUG_SCHEME, CONTEXT_IN_DEBUG_REPL } from 'vs/workbench/parts/debug/common/debug';
+import { HistoryNavigator } from 'vs/base/common/history';
+import { IHistoryNavigationWidget } from 'vs/base/browser/history';
+import { createAndBindHistoryNavigationWidgetScopedContextKeyService } from 'vs/platform/widget/browser/contextScopedHistoryWidget';
+import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
+import { getSimpleCodeEditorWidgetOptions } from 'vs/workbench/parts/codeEditor/electron-browser/simpleEditorOptions';
+import { getSimpleEditorOptions } from 'vs/workbench/parts/codeEditor/browser/simpleEditorOptions';
 
 const $ = dom.$;
 
@@ -57,17 +61,16 @@ const IPrivateReplService = createDecorator<IPrivateReplService>('privateReplSer
 
 export interface IPrivateReplService {
 	_serviceBrand: any;
-	navigateHistory(previous: boolean): void;
 	acceptReplInput(): void;
 	getVisibleContent(): string;
 }
 
-export class Repl extends Panel implements IPrivateReplService {
+export class Repl extends Panel implements IPrivateReplService, IHistoryNavigationWidget {
 	public _serviceBrand: any;
 
 	private static readonly HALF_WIDTH_TYPICAL = 'n';
 
-	private static HISTORY: ReplHistory;
+	private history: HistoryNavigator<string>;
 	private static readonly REFRESH_DELAY = 500; // delay in ms to refresh the repl for new elements to show
 	private static readonly REPL_INPUT_INITIAL_HEIGHT = 19;
 	private static readonly REPL_INPUT_MAX_HEIGHT = 170;
@@ -83,6 +86,7 @@ export class Repl extends Panel implements IPrivateReplService {
 	private dimension: dom.Dimension;
 	private replInputHeight: number;
 	private model: ITextModel;
+	private historyNavigationEnablement: IContextKey<boolean>;
 
 	constructor(
 		@IDebugService private debugService: IDebugService,
@@ -97,14 +101,15 @@ export class Repl extends Panel implements IPrivateReplService {
 		super(REPL_ID, telemetryService, themeService);
 
 		this.replInputHeight = Repl.REPL_INPUT_INITIAL_HEIGHT;
+		this.history = new HistoryNavigator(JSON.parse(this.storageService.get(HISTORY_STORAGE_KEY, StorageScope.WORKSPACE, '[]')), 50);
 		this.registerListeners();
 	}
 
 	private registerListeners(): void {
-		this.toUnbind.push(this.debugService.getModel().onDidChangeReplElements(() => {
+		this._register(this.debugService.getModel().onDidChangeReplElements(() => {
 			this.refreshReplElements(this.debugService.getModel().getReplElements().length === 0);
 		}));
-		this.toUnbind.push(this.panelService.onDidPanelOpen(panel => this.refreshReplElements(true)));
+		this._register(this.panelService.onDidPanelOpen(panel => this.refreshReplElements(true)));
 	}
 
 	private refreshReplElements(noDelay: boolean): void {
@@ -144,10 +149,6 @@ export class Repl extends Panel implements IPrivateReplService {
 			controller
 		}, replTreeOptions);
 
-		if (!Repl.HISTORY) {
-			Repl.HISTORY = new ReplHistory(JSON.parse(this.storageService.get(HISTORY_STORAGE_KEY, StorageScope.WORKSPACE, '[]')));
-		}
-
 		return this.tree.setInput(this.debugService.getModel());
 	}
 
@@ -155,7 +156,7 @@ export class Repl extends Panel implements IPrivateReplService {
 		if (!visible) {
 			dispose(this.model);
 		} else {
-			this.model = this.modelService.createModel('', null, uri.parse(`${DEBUG_SCHEME}:input`), true);
+			this.model = this.modelService.createModel('', null, uri.parse(`${DEBUG_SCHEME}:replinput`), true);
 			this.replInput.setModel(this.model);
 		}
 
@@ -165,63 +166,77 @@ export class Repl extends Panel implements IPrivateReplService {
 	private createReplInput(container: HTMLElement): void {
 		this.replInputContainer = dom.append(container, $('.repl-input-wrapper'));
 
-		const scopedContextKeyService = this.contextKeyService.createScoped(this.replInputContainer);
-		this.toUnbind.push(scopedContextKeyService);
+		const { scopedContextKeyService, historyNavigationEnablement } = createAndBindHistoryNavigationWidgetScopedContextKeyService(this.contextKeyService, { target: this.replInputContainer, historyNavigator: this });
+		this.historyNavigationEnablement = historyNavigationEnablement;
+		this._register(scopedContextKeyService);
 		CONTEXT_IN_DEBUG_REPL.bindTo(scopedContextKeyService).set(true);
-		const onFirstReplLine = CONTEXT_ON_FIRST_DEBUG_REPL_LINE.bindTo(scopedContextKeyService);
-		onFirstReplLine.set(true);
-		const onLastReplLine = CONTEXT_ON_LAST_DEBUG_REPL_LINE.bindTo(scopedContextKeyService);
-		onLastReplLine.set(true);
 
 		const scopedInstantiationService = this.instantiationService.createChild(new ServiceCollection(
 			[IContextKeyService, scopedContextKeyService], [IPrivateReplService, this]));
-		this.replInput = scopedInstantiationService.createInstance(CodeEditorWidget, this.replInputContainer, SimpleDebugEditor.getEditorOptions(), SimpleDebugEditor.getCodeEditorWidgetOptions());
+		this.replInput = scopedInstantiationService.createInstance(CodeEditorWidget, this.replInputContainer, getSimpleEditorOptions(), getSimpleCodeEditorWidgetOptions());
 
-		modes.SuggestRegistry.register({ scheme: DEBUG_SCHEME, hasAccessToAllModels: true }, {
+		modes.SuggestRegistry.register({ scheme: DEBUG_SCHEME, pattern: '**/replinput', hasAccessToAllModels: true }, {
 			triggerCharacters: ['.'],
 			provideCompletionItems: (model: ITextModel, position: Position, _context: modes.SuggestContext, token: CancellationToken): Thenable<modes.ISuggestResult> => {
-				const word = this.replInput.getModel().getWordAtPosition(position);
-				const overwriteBefore = word ? word.word.length : 0;
-				const text = this.replInput.getModel().getLineContent(position.lineNumber);
-				const focusedStackFrame = this.debugService.getViewModel().focusedStackFrame;
-				const frameId = focusedStackFrame ? focusedStackFrame.frameId : undefined;
+				// Disable history navigation because up and down are used to navigate through the suggest widget
+				this.historyNavigationEnablement.set(false);
+
 				const focusedSession = this.debugService.getViewModel().focusedSession;
-				const completions = focusedSession ? focusedSession.completions(frameId, text, position, overwriteBefore) : TPromise.as([]);
-				return wireCancellationToken(token, completions.then(suggestions => ({
-					suggestions
-				})));
+				if (focusedSession && focusedSession.capabilities.supportsCompletionsRequest) {
+
+					const word = this.replInput.getModel().getWordAtPosition(position);
+					const overwriteBefore = word ? word.word.length : 0;
+					const text = this.replInput.getModel().getLineContent(position.lineNumber);
+					const focusedStackFrame = this.debugService.getViewModel().focusedStackFrame;
+					const frameId = focusedStackFrame ? focusedStackFrame.frameId : undefined;
+
+					return focusedSession.completions(frameId, text, position, overwriteBefore).then(suggestions => {
+						return { suggestions };
+					}, err => {
+						return { suggestions: [] };
+					});
+				}
+				return TPromise.as({ suggestions: [] });
 			}
 		});
 
-		this.toUnbind.push(this.replInput.onDidScrollChange(e => {
+		this._register(this.replInput.onDidScrollChange(e => {
 			if (!e.scrollHeightChanged) {
 				return;
 			}
 			this.replInputHeight = Math.max(Repl.REPL_INPUT_INITIAL_HEIGHT, Math.min(Repl.REPL_INPUT_MAX_HEIGHT, e.scrollHeight, this.dimension.height));
 			this.layout(this.dimension);
 		}));
-		this.toUnbind.push(this.replInput.onDidChangeCursorPosition(e => {
-			onFirstReplLine.set(e.position.lineNumber === 1);
-			onLastReplLine.set(e.position.lineNumber === this.replInput.getModel().getLineCount());
+		this._register(this.replInput.onDidChangeModelContent(() => {
+			this.historyNavigationEnablement.set(this.replInput.getModel().getValue() === '');
 		}));
 
-		this.toUnbind.push(dom.addStandardDisposableListener(this.replInputContainer, dom.EventType.FOCUS, () => dom.addClass(this.replInputContainer, 'synthetic-focus')));
-		this.toUnbind.push(dom.addStandardDisposableListener(this.replInputContainer, dom.EventType.BLUR, () => dom.removeClass(this.replInputContainer, 'synthetic-focus')));
+		this._register(dom.addStandardDisposableListener(this.replInputContainer, dom.EventType.FOCUS, () => dom.addClass(this.replInputContainer, 'synthetic-focus')));
+		this._register(dom.addStandardDisposableListener(this.replInputContainer, dom.EventType.BLUR, () => dom.removeClass(this.replInputContainer, 'synthetic-focus')));
 	}
 
-	public navigateHistory(previous: boolean): void {
-		const historyInput = previous ? Repl.HISTORY.previous() : Repl.HISTORY.next();
+	private navigateHistory(previous: boolean): void {
+		const historyInput = previous ? this.history.previous() : this.history.next();
 		if (historyInput) {
-			Repl.HISTORY.remember(this.replInput.getValue(), previous);
 			this.replInput.setValue(historyInput);
+			aria.status(historyInput);
 			// always leave cursor at the end.
 			this.replInput.setPosition({ lineNumber: 1, column: historyInput.length + 1 });
+			this.historyNavigationEnablement.set(true);
 		}
 	}
 
+	public showPreviousValue(): void {
+		this.navigateHistory(true);
+	}
+
+	public showNextValue(): void {
+		this.navigateHistory(false);
+	}
+
 	public acceptReplInput(): void {
 		this.debugService.addReplExpression(this.replInput.getValue());
-		Repl.HISTORY.evaluated(this.replInput.getValue());
+		this.history.add(this.replInput.getValue());
 		this.replInput.setValue('');
 		// Trigger a layout to shrink a potential multi line input
 		this.replInputHeight = Repl.REPL_INPUT_INITIAL_HEIGHT;
@@ -277,16 +292,14 @@ export class Repl extends Panel implements IPrivateReplService {
 				this.instantiationService.createInstance(ClearReplAction, ClearReplAction.ID, ClearReplAction.LABEL)
 			];
 
-			this.actions.forEach(a => {
-				this.toUnbind.push(a);
-			});
+			this.actions.forEach(a => this._register(a));
 		}
 
 		return this.actions;
 	}
 
 	public shutdown(): void {
-		const replHistory = Repl.HISTORY.save();
+		const replHistory = this.history.getHistory();
 		if (replHistory.length) {
 			this.storageService.store(HISTORY_STORAGE_KEY, JSON.stringify(replHistory), StorageScope.WORKSPACE);
 		} else {
@@ -300,54 +313,6 @@ export class Repl extends Panel implements IPrivateReplService {
 	}
 }
 
-class ReplHistoryPreviousAction extends EditorAction {
-
-	constructor() {
-		super({
-			id: 'repl.action.historyPrevious',
-			label: nls.localize('actions.repl.historyPrevious', "History Previous"),
-			alias: 'History Previous',
-			precondition: CONTEXT_IN_DEBUG_REPL,
-			kbOpts: {
-				kbExpr: CONTEXT_ON_FIRST_DEBUG_REPL_LINE,
-				primary: KeyCode.UpArrow,
-				weight: 50
-			},
-			menuOpts: {
-				group: 'debug'
-			}
-		});
-	}
-
-	public run(accessor: ServicesAccessor, editor: ICodeEditor): void | TPromise<void> {
-		accessor.get(IPrivateReplService).navigateHistory(true);
-	}
-}
-
-class ReplHistoryNextAction extends EditorAction {
-
-	constructor() {
-		super({
-			id: 'repl.action.historyNext',
-			label: nls.localize('actions.repl.historyNext', "History Next"),
-			alias: 'History Next',
-			precondition: CONTEXT_IN_DEBUG_REPL,
-			kbOpts: {
-				kbExpr: CONTEXT_ON_LAST_DEBUG_REPL_LINE,
-				primary: KeyCode.DownArrow,
-				weight: 50
-			},
-			menuOpts: {
-				group: 'debug'
-			}
-		});
-	}
-
-	public run(accessor: ServicesAccessor, editor: ICodeEditor): void | TPromise<void> {
-		accessor.get(IPrivateReplService).navigateHistory(false);
-	}
-}
-
 class AcceptReplInputAction extends EditorAction {
 
 	constructor() {
@@ -358,7 +323,8 @@ class AcceptReplInputAction extends EditorAction {
 			precondition: CONTEXT_IN_DEBUG_REPL,
 			kbOpts: {
 				kbExpr: EditorContextKeys.textInputFocus,
-				primary: KeyCode.Enter
+				primary: KeyCode.Enter,
+				weight: KeybindingWeight.EditorContrib
 			}
 		});
 	}
@@ -385,8 +351,6 @@ export class ReplCopyAllAction extends EditorAction {
 	}
 }
 
-registerEditorAction(ReplHistoryPreviousAction);
-registerEditorAction(ReplHistoryNextAction);
 registerEditorAction(AcceptReplInputAction);
 registerEditorAction(ReplCopyAllAction);
 
diff --git a/src/vs/workbench/parts/debug/electron-browser/replViewer.ts b/src/vs/workbench/parts/debug/electron-browser/replViewer.ts
index 0ff3980542b..008bb89550e 100644
--- a/src/vs/workbench/parts/debug/electron-browser/replViewer.ts
+++ b/src/vs/workbench/parts/debug/electron-browser/replViewer.ts
@@ -7,7 +7,6 @@ import * as nls from 'vs/nls';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { IAction } from 'vs/base/common/actions';
 import * as lifecycle from 'vs/base/common/lifecycle';
-import * as errors from 'vs/base/common/errors';
 import { isFullWidthCharacter, removeAnsiEscapeCodes, endsWith } from 'vs/base/common/strings';
 import { IActionItem, Separator } from 'vs/base/browser/ui/actionbar/actionbar';
 import * as dom from 'vs/base/browser/dom';
@@ -24,6 +23,7 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { LinkDetector } from 'vs/workbench/parts/debug/browser/linkDetector';
 import { handleANSIOutput } from 'vs/workbench/parts/debug/browser/debugANSIHandling';
+import { ILabelService } from 'vs/platform/label/common/label';
 
 const $ = dom.$;
 
@@ -95,7 +95,8 @@ export class ReplExpressionsRenderer implements IRenderer {
 
 	constructor(
 		@IEditorService private editorService: IEditorService,
-		@IInstantiationService private instantiationService: IInstantiationService
+		@IInstantiationService private instantiationService: IInstantiationService,
+		@ILabelService private labelService: ILabelService
 	) {
 		this.linkDetector = this.instantiationService.createInstance(LinkDetector);
 	}
@@ -201,7 +202,7 @@ export class ReplExpressionsRenderer implements IRenderer {
 						startColumn: source.column,
 						endLineNumber: source.lineNumber,
 						endColumn: source.column
-					}).done(undefined, errors.onUnexpectedError);
+					});
 				}
 			}));
 
@@ -256,9 +257,9 @@ export class ReplExpressionsRenderer implements IRenderer {
 		let result = handleANSIOutput(element.value, this.linkDetector);
 		templateData.value.appendChild(result);
 
-		dom.addClass(templateData.value, (element.severity === severity.Warning) ? 'warn' : (element.severity === severity.Error) ? 'error' : 'info');
+		dom.addClass(templateData.value, (element.severity === severity.Warning) ? 'warn' : (element.severity === severity.Error) ? 'error' : (element.severity === severity.Ignore) ? 'ignore' : 'info');
 		templateData.source.textContent = element.sourceData ? `${element.sourceData.source.name}:${element.sourceData.lineNumber}` : '';
-		templateData.source.title = element.sourceData ? element.sourceData.source.uri.toString() : '';
+		templateData.source.title = element.sourceData ? this.labelService.getUriLabel(element.sourceData.source.uri) : '';
 		templateData.getReplElementSource = () => element.sourceData;
 	}
 
diff --git a/src/vs/workbench/parts/debug/electron-browser/simpleDebugEditor.ts b/src/vs/workbench/parts/debug/electron-browser/simpleDebugEditor.ts
deleted file mode 100644
index 720b75f1cad..00000000000
--- a/src/vs/workbench/parts/debug/electron-browser/simpleDebugEditor.ts
+++ /dev/null
@@ -1,57 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import { IEditorOptions } from 'vs/editor/common/config/editorOptions';
-import { ICodeEditorWidgetOptions } from 'vs/editor/browser/widget/codeEditorWidget';
-
-// Allowed Editor Contributions:
-import { MenuPreventer } from 'vs/workbench/parts/codeEditor/electron-browser/menuPreventer';
-import { SelectionClipboard } from 'vs/workbench/parts/codeEditor/electron-browser/selectionClipboard';
-import { ContextMenuController } from 'vs/editor/contrib/contextmenu/contextmenu';
-import { SuggestController } from 'vs/editor/contrib/suggest/suggestController';
-import { SnippetController2 } from 'vs/editor/contrib/snippet/snippetController2';
-import { TabCompletionController } from 'vs/workbench/parts/snippets/electron-browser/tabCompletion';
-
-export class SimpleDebugEditor {
-
-	public static getCodeEditorWidgetOptions(): ICodeEditorWidgetOptions {
-		return {
-			isSimpleWidget: true,
-			contributions: [
-				MenuPreventer,
-				SelectionClipboard,
-				ContextMenuController,
-				SuggestController,
-				SnippetController2,
-				TabCompletionController,
-			]
-		};
-	}
-
-	public static getEditorOptions(): IEditorOptions {
-		return {
-			wordWrap: 'on',
-			overviewRulerLanes: 0,
-			glyphMargin: false,
-			lineNumbers: 'off',
-			folding: false,
-			selectOnLineNumbers: false,
-			hideCursorInOverviewRuler: true,
-			selectionHighlight: false,
-			scrollbar: {
-				horizontal: 'hidden'
-			},
-			lineDecorationsWidth: 0,
-			overviewRulerBorder: false,
-			scrollBeyondLastLine: false,
-			renderLineHighlight: 'none',
-			fixedOverflowWidgets: true,
-			acceptSuggestionOnEnter: 'smart',
-			minimap: {
-				enabled: false
-			}
-		};
-	}
-}
diff --git a/src/vs/workbench/parts/debug/electron-browser/terminalSupport.ts b/src/vs/workbench/parts/debug/electron-browser/terminalSupport.ts
index e9abd1de5f1..91fc2c53456 100644
--- a/src/vs/workbench/parts/debug/electron-browser/terminalSupport.ts
+++ b/src/vs/workbench/parts/debug/electron-browser/terminalSupport.ts
@@ -11,18 +11,21 @@ import { ITerminalService as IExternalTerminalService } from 'vs/workbench/parts
 import { ITerminalLauncher, ITerminalSettings } from 'vs/workbench/parts/debug/common/debug';
 import { hasChildprocesses, prepareCommand } from 'vs/workbench/parts/debug/node/terminals';
 
-export class AbstractTerminalLauncher implements ITerminalLauncher {
+export class TerminalLauncher implements ITerminalLauncher {
 
 	private integratedTerminalInstance: ITerminalInstance;
 	private terminalDisposedListener: IDisposable;
 
-	constructor(private terminalService: ITerminalService) {
+	constructor(
+		@ITerminalService private terminalService: ITerminalService,
+		@IExternalTerminalService private nativeTerminalService: IExternalTerminalService
+	) {
 	}
 
-	async runInTerminal(args: DebugProtocol.RunInTerminalRequestArguments, config: ITerminalSettings): TPromise<void> {
+	runInTerminal(args: DebugProtocol.RunInTerminalRequestArguments, config: ITerminalSettings): TPromise<void> {
 
 		if (args.kind === 'external') {
-			return this.runInExternalTerminal(args, config);
+			return this.nativeTerminalService.runInTerminal(args.title, args.cwd, args.args, args.env || {});
 		}
 
 		if (!this.terminalDisposedListener) {
@@ -35,46 +38,19 @@ export class AbstractTerminalLauncher implements ITerminalLauncher {
 		}
 
 		let t = this.integratedTerminalInstance;
-		if ((t && await this.isBusy(t.processId)) || !t) {
+		if ((t && hasChildprocesses(t.processId)) || !t) {
 			t = this.terminalService.createTerminal({ name: args.title || nls.localize('debug.terminal.title', "debuggee") });
 			this.integratedTerminalInstance = t;
 		}
 		this.terminalService.setActiveInstance(t);
 		this.terminalService.showPanel(true);
 
-		const command = await this.prepareCommand(args, config);
-
 		return new TPromise((resolve, error) => {
 			setTimeout(_ => {
+				const command = prepareCommand(args, config);
 				t.sendText(command, true);
 				resolve(void 0);
 			}, 500);
 		});
 	}
-
-	protected runInExternalTerminal(args: DebugProtocol.RunInTerminalRequestArguments, config: ITerminalSettings): TPromise<void> {
-		return void 0;
-	}
-
-	protected isBusy(processId: number): TPromise<boolean> {
-		return TPromise.as(hasChildprocesses(processId));
-	}
-
-	protected prepareCommand(args: DebugProtocol.RunInTerminalRequestArguments, config: ITerminalSettings): TPromise<string> {
-		return TPromise.as(prepareCommand(args, config));
-	}
-}
-
-export class TerminalLauncher extends AbstractTerminalLauncher {
-
-	constructor(
-		@ITerminalService terminalService: ITerminalService,
-		@IExternalTerminalService private nativeTerminalService: IExternalTerminalService
-	) {
-		super(terminalService);
-	}
-
-	runInExternalTerminal(args: DebugProtocol.RunInTerminalRequestArguments, config: ITerminalSettings): TPromise<void> {
-		return this.nativeTerminalService.runInTerminal(args.title, args.cwd, args.args, args.env || {});
-	}
 }
diff --git a/src/vs/workbench/parts/debug/electron-browser/variablesView.ts b/src/vs/workbench/parts/debug/electron-browser/variablesView.ts
index 20121402450..076d4cb8f90 100644
--- a/src/vs/workbench/parts/debug/electron-browser/variablesView.ts
+++ b/src/vs/workbench/parts/debug/electron-browser/variablesView.ts
@@ -6,7 +6,6 @@
 import * as nls from 'vs/nls';
 import { RunOnceScheduler, sequence } from 'vs/base/common/async';
 import * as dom from 'vs/base/browser/dom';
-import * as errors from 'vs/base/common/errors';
 import { IActionProvider, ITree, IDataSource, IRenderer, IAccessibilityProvider } from 'vs/base/parts/tree/browser/tree';
 import { CollapseAction } from 'vs/workbench/browser/viewlet';
 import { TreeViewsViewletPanel, IViewletViewOptions } from 'vs/workbench/browser/parts/views/viewsViewlet';
@@ -77,7 +76,7 @@ export class VariablesView extends TreeViewsViewletPanel {
 					}
 					return undefined;
 				});
-			}).done(null, errors.onUnexpectedError);
+			});
 		}, 400);
 	}
 
@@ -124,7 +123,7 @@ export class VariablesView extends TreeViewsViewletPanel {
 
 		this.disposables.push(this.debugService.getViewModel().onDidSelectExpression(expression => {
 			if (expression instanceof Variable) {
-				this.tree.refresh(expression, false).done(null, errors.onUnexpectedError);
+				this.tree.refresh(expression, false);
 			}
 		}));
 	}
@@ -318,7 +317,7 @@ class VariablesController extends BaseDebugController {
 	protected onLeftClick(tree: ITree, element: any, event: IMouseEvent): boolean {
 		// double click on primitive value: open input box to be able to set the value
 		const session = this.debugService.getViewModel().focusedSession;
-		if (element instanceof Variable && event.detail === 2 && session && session.raw.capabilities.supportsSetVariable) {
+		if (element instanceof Variable && event.detail === 2 && session && session.capabilities.supportsSetVariable) {
 			const expression = <IExpression>element;
 			this.debugService.getViewModel().setSelectedExpression(expression);
 			return true;
diff --git a/src/vs/workbench/parts/debug/electron-browser/watchExpressionsView.ts b/src/vs/workbench/parts/debug/electron-browser/watchExpressionsView.ts
index c1b3079a4c2..36de5bfdf70 100644
--- a/src/vs/workbench/parts/debug/electron-browser/watchExpressionsView.ts
+++ b/src/vs/workbench/parts/debug/electron-browser/watchExpressionsView.ts
@@ -8,7 +8,6 @@ import { RunOnceScheduler } from 'vs/base/common/async';
 import * as dom from 'vs/base/browser/dom';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { TPromise } from 'vs/base/common/winjs.base';
-import * as errors from 'vs/base/common/errors';
 import { IActionProvider, ITree, IDataSource, IRenderer, IAccessibilityProvider, IDragAndDropData, IDragOverReaction, DRAG_OVER_REJECT } from 'vs/base/parts/tree/browser/tree';
 import { CollapseAction } from 'vs/workbench/browser/viewlet';
 import { TreeViewsViewletPanel, IViewletViewOptions } from 'vs/workbench/browser/parts/views/viewsViewlet';
@@ -50,12 +49,12 @@ export class WatchExpressionsView extends TreeViewsViewletPanel {
 		@IInstantiationService private instantiationService: IInstantiationService,
 		@IConfigurationService configurationService: IConfigurationService
 	) {
-		super({ ...(options as IViewletPanelOptions), ariaHeaderLabel: nls.localize('expressionsSection', "Expressions Section") }, keybindingService, contextMenuService, configurationService);
+		super({ ...(options as IViewletPanelOptions), ariaHeaderLabel: nls.localize('watchExpressionsSection', "Watch Expressions Section") }, keybindingService, contextMenuService, configurationService);
 		this.settings = options.viewletSettings;
 
 		this.onWatchExpressionsUpdatedScheduler = new RunOnceScheduler(() => {
 			this.needsRefresh = false;
-			this.tree.refresh().done(undefined, errors.onUnexpectedError);
+			this.tree.refresh();
 		}, 50);
 	}
 
@@ -90,9 +89,9 @@ export class WatchExpressionsView extends TreeViewsViewletPanel {
 				return;
 			}
 
-			this.tree.refresh().done(() => {
+			this.tree.refresh().then(() => {
 				return we instanceof Expression ? this.tree.reveal(we) : TPromise.as(true);
-			}, errors.onUnexpectedError);
+			});
 		}));
 		this.disposables.push(this.debugService.getViewModel().onDidFocusStackFrame(() => {
 			if (!this.isExpanded() || !this.isVisible()) {
@@ -107,7 +106,7 @@ export class WatchExpressionsView extends TreeViewsViewletPanel {
 
 		this.disposables.push(this.debugService.getViewModel().onDidSelectExpression(expression => {
 			if (expression instanceof Expression) {
-				this.tree.refresh(expression, false).done(null, errors.onUnexpectedError);
+				this.tree.refresh(expression, false);
 			}
 		}));
 	}
@@ -177,7 +176,7 @@ class WatchExpressionsActionProvider implements IActionProvider {
 			if (element instanceof Variable) {
 				const variable = <Variable>element;
 				if (!variable.hasChildren) {
-					actions.push(new CopyValueAction(CopyValueAction.ID, CopyValueAction.LABEL, variable.value, this.debugService));
+					actions.push(new CopyValueAction(CopyValueAction.ID, CopyValueAction.LABEL, variable, this.debugService));
 				}
 				actions.push(new Separator());
 			}
@@ -300,16 +299,17 @@ class WatchExpressionsRenderer implements IRenderer {
 		}
 
 		data.name.textContent = watchExpression.name;
-		if (watchExpression.value) {
+		renderExpressionValue(watchExpression, data.value, {
+			showChanged: true,
+			maxValueLength: MAX_VALUE_RENDER_LENGTH_IN_VIEWLET,
+			preserveWhitespace: false,
+			showHover: true,
+			colorize: true
+		});
+		data.name.title = watchExpression.type ? watchExpression.type : watchExpression.value;
+
+		if (typeof watchExpression.value === 'string') {
 			data.name.textContent += ':';
-			renderExpressionValue(watchExpression, data.value, {
-				showChanged: true,
-				maxValueLength: MAX_VALUE_RENDER_LENGTH_IN_VIEWLET,
-				preserveWhitespace: false,
-				showHover: true,
-				colorize: true
-			});
-			data.name.title = watchExpression.type ? watchExpression.type : watchExpression.value;
 		}
 	}
 
diff --git a/src/vs/workbench/parts/debug/node/debugAdapter.ts b/src/vs/workbench/parts/debug/node/debugAdapter.ts
index befbb0fd4e8..12bb2e8e956 100644
--- a/src/vs/workbench/parts/debug/node/debugAdapter.ts
+++ b/src/vs/workbench/parts/debug/node/debugAdapter.ts
@@ -12,16 +12,12 @@ import * as paths from 'vs/base/common/paths';
 import * as strings from 'vs/base/common/strings';
 import * as objects from 'vs/base/common/objects';
 import * as platform from 'vs/base/common/platform';
-import * as stdfork from 'vs/base/node/stdFork';
 import { Emitter, Event } from 'vs/base/common/event';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { ExtensionsChannelId } from 'vs/platform/extensionManagement/common/extensionManagement';
 import { IExtensionDescription } from 'vs/workbench/services/extensions/common/extensions';
 import { IOutputService } from 'vs/workbench/parts/output/common/output';
-import { IDebugAdapter, IAdapterExecutable, IDebuggerContribution, IPlatformSpecificAdapterContribution, IConfig } from 'vs/workbench/parts/debug/common/debug';
-import { IConfigurationResolverService } from 'vs/workbench/services/configurationResolver/common/configurationResolver';
-import { IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
-import { IStringDictionary } from 'vs/base/common/collections';
+import { IDebugAdapter, IAdapterExecutable, IDebuggerContribution, IPlatformSpecificAdapterContribution } from 'vs/workbench/parts/debug/common/debug';
 
 /**
  * Abstract implementation of the low level API for a debug adapter.
@@ -39,7 +35,7 @@ export abstract class AbstractDebugAdapter implements IDebugAdapter {
 
 	constructor() {
 		this.sequence = 1;
-		this.pendingRequests = new Map<number, (e: DebugProtocol.Response) => void>();
+		this.pendingRequests = new Map();
 
 		this._onError = new Emitter<Error>();
 		this._onExit = new Emitter<number>();
@@ -83,7 +79,7 @@ export abstract class AbstractDebugAdapter implements IDebugAdapter {
 		}
 	}
 
-	public sendRequest(command: string, args: any, clb: (result: DebugProtocol.Response) => void): void {
+	public sendRequest(command: string, args: any, clb: (result: DebugProtocol.Response) => void, timeout?: number): void {
 
 		const request: any = {
 			command: command
@@ -94,6 +90,25 @@ export abstract class AbstractDebugAdapter implements IDebugAdapter {
 
 		this.internalSend('request', request);
 
+		if (typeof timeout === 'number') {
+			const timer = setTimeout(() => {
+				clearTimeout(timer);
+				const clb = this.pendingRequests.get(request.seq);
+				if (clb) {
+					this.pendingRequests.delete(request.seq);
+					const err: DebugProtocol.Response = {
+						type: 'response',
+						seq: 0,
+						request_seq: request.seq,
+						success: false,
+						command,
+						message: `timeout after ${timeout} ms`
+					};
+					clb(err);
+				}
+			}, timeout);
+		}
+
 		if (clb) {
 			// store callback for this request
 			this.pendingRequests.set(request.seq, clb);
@@ -130,6 +145,24 @@ export abstract class AbstractDebugAdapter implements IDebugAdapter {
 
 		this.sendMessage(message);
 	}
+
+	protected cancelPending() {
+		const pending = this.pendingRequests;
+		this.pendingRequests = new Map();
+		setTimeout(_ => {
+			pending.forEach((callback, request_seq) => {
+				const err: DebugProtocol.Response = {
+					type: 'response',
+					seq: 0,
+					request_seq,
+					success: false,
+					command: 'canceled',
+					message: 'canceled'
+				};
+				callback(err);
+			});
+		}, 1000);
+	}
 }
 
 /**
@@ -149,7 +182,7 @@ export abstract class StreamDebugAdapter extends AbstractDebugAdapter {
 		super();
 	}
 
-	public connect(readable: stream.Readable, writable: stream.Writable): void {
+	protected connect(readable: stream.Readable, writable: stream.Writable): void {
 
 		this.outputStream = writable;
 		this.rawData = Buffer.allocUnsafe(0);
@@ -157,16 +190,16 @@ export abstract class StreamDebugAdapter extends AbstractDebugAdapter {
 
 		readable.on('data', (data: Buffer) => this.handleData(data));
 
-		// readable.on('close', () => {
-		// 	this._emitEvent(new Event('close'));
-		// });
-		// readable.on('error', (error) => {
-		// 	this._emitEvent(new Event('error', 'readable error: ' + (error && error.message)));
-		// });
+		readable.on('close', () => {
+			this._onError.fire(new Error('readable.close event'));
+		});
+		readable.on('error', (error) => {
+			this._onError.fire(error);
+		});
 
-		// writable.on('error', (error) => {
-		// 	this._emitEvent(new Event('error', 'writable error: ' + (error && error.message)));
-		// });
+		writable.on('error', (error) => {
+			this._onError.fire(error);
+		});
 	}
 
 	public sendMessage(message: DebugProtocol.ProtocolMessage): void {
@@ -241,11 +274,15 @@ export class SocketDebugAdapter extends StreamDebugAdapter {
 	}
 
 	stopSession(): TPromise<void> {
-		if (this.socket !== null) {
+
+		// Cancel all sent promises on disconnect so debug trees are not left in a broken state #3666.
+		this.cancelPending();
+
+		if (this.socket) {
 			this.socket.end();
 			this.socket = undefined;
 		}
-		return void 0;
+		return TPromise.as(undefined);
 	}
 }
 
@@ -286,15 +323,17 @@ export class DebugAdapter extends StreamDebugAdapter {
 					"Cannot determine executable for debug adapter '{0}'.", this.debugType)));
 			}
 
-			if (this.adapterExecutable.command === 'node' && this.outputService) {
+			if (this.adapterExecutable.command === 'node') {
 				if (Array.isArray(this.adapterExecutable.args) && this.adapterExecutable.args.length > 0) {
-					stdfork.fork(this.adapterExecutable.args[0], this.adapterExecutable.args.slice(1), {}, (err, child) => {
-						if (err) {
-							e(new Error(nls.localize('unableToLaunchDebugAdapter', "Unable to launch debug adapter from '{0}'.", this.adapterExecutable.args[0])));
-						}
-						this.serverProcess = child;
-						c(null);
+					const child = cp.fork(this.adapterExecutable.args[0], this.adapterExecutable.args.slice(1), {
+						execArgv: ['-e', 'delete process.env.ELECTRON_RUN_AS_NODE;require(process.argv[1])'],
+						silent: true
 					});
+					if (!child.pid) {
+						e(new Error(nls.localize('unableToLaunchDebugAdapter', "Unable to launch debug adapter from '{0}'.", this.adapterExecutable.args[0])));
+					}
+					this.serverProcess = child;
+					c(null);
 				} else {
 					e(new Error(nls.localize('unableToLaunchDebugAdapterNoArgs', "Unable to launch debug adapter.")));
 				}
@@ -324,6 +363,13 @@ export class DebugAdapter extends StreamDebugAdapter {
 
 	stopSession(): TPromise<void> {
 
+		// Cancel all sent promises on disconnect so debug trees are not left in a broken state #3666.
+		this.cancelPending();
+
+		if (!this.serverProcess) {
+			return TPromise.as(null);
+		}
+
 		// when killing a process in windows its child
 		// processes are *not* killed but become root
 		// processes. Therefore we use TASKKILL.EXE
@@ -399,7 +445,6 @@ export class DebugAdapter extends StreamDebugAdapter {
 				if (debuggers && debuggers.length > 0) {
 					debuggers.filter(dbg => strings.equalsIgnoreCase(dbg.type, debugType)).forEach(dbg => {
 						// extract relevant attributes and make then absolute where needed
-						// TODO@extensionLocation
 						const extractedDbg = DebugAdapter.extract(dbg, ed.extensionLocation.fsPath);
 
 						// merge
@@ -440,26 +485,4 @@ export class DebugAdapter extends StreamDebugAdapter {
 			};
 		}
 	}
-
-	static substituteVariables(workspaceFolder: IWorkspaceFolder, config: IConfig, resolverService: IConfigurationResolverService, commandValueMapping?: IStringDictionary<string>): IConfig {
-
-		const result = objects.deepClone(config) as IConfig;
-
-		// hoist platform specific attributes to top level
-		if (platform.isWindows && result.windows) {
-			Object.keys(result.windows).forEach(key => result[key] = result.windows[key]);
-		} else if (platform.isMacintosh && result.osx) {
-			Object.keys(result.osx).forEach(key => result[key] = result.osx[key]);
-		} else if (platform.isLinux && result.linux) {
-			Object.keys(result.linux).forEach(key => result[key] = result.linux[key]);
-		}
-
-		// delete all platform specific sections
-		delete result.windows;
-		delete result.osx;
-		delete result.linux;
-
-		// substitute all variables in string values
-		return resolverService.resolveAny(workspaceFolder, result, commandValueMapping);
-	}
 }
diff --git a/src/vs/workbench/parts/debug/node/debugger.ts b/src/vs/workbench/parts/debug/node/debugger.ts
index b16771d21d2..169c8e1fab5 100644
--- a/src/vs/workbench/parts/debug/node/debugger.ts
+++ b/src/vs/workbench/parts/debug/node/debugger.ts
@@ -8,10 +8,10 @@ import { TPromise } from 'vs/base/common/winjs.base';
 import { Client as TelemetryClient } from 'vs/base/parts/ipc/node/ipc.cp';
 import * as strings from 'vs/base/common/strings';
 import * as objects from 'vs/base/common/objects';
-import { TelemetryAppenderClient } from 'vs/platform/telemetry/common/telemetryIpc';
+import { TelemetryAppenderClient } from 'vs/platform/telemetry/node/telemetryIpc';
 import { IJSONSchema, IJSONSchemaSnippet } from 'vs/base/common/jsonSchema';
 import { IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
-import { IConfig, IDebuggerContribution, IAdapterExecutable, INTERNAL_CONSOLE_OPTIONS_SCHEMA, IConfigurationManager, IDebugAdapter, IDebugConfiguration, ITerminalSettings } from 'vs/workbench/parts/debug/common/debug';
+import { IConfig, IDebuggerContribution, IAdapterExecutable, INTERNAL_CONSOLE_OPTIONS_SCHEMA, IConfigurationManager, IDebugAdapter, IDebugConfiguration, ITerminalSettings, IDebugger } from 'vs/workbench/parts/debug/common/debug';
 import { IExtensionDescription } from 'vs/workbench/services/extensions/common/extensions';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { ICommandService } from 'vs/platform/commands/common/commands';
@@ -19,11 +19,12 @@ import { IOutputService } from 'vs/workbench/parts/output/common/output';
 import { DebugAdapter, SocketDebugAdapter } from 'vs/workbench/parts/debug/node/debugAdapter';
 import { IConfigurationResolverService } from 'vs/workbench/services/configurationResolver/common/configurationResolver';
 import { TelemetryService } from 'vs/platform/telemetry/common/telemetryService';
-import uri from 'vs/base/common/uri';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { memoize } from 'vs/base/common/decorators';
+import { TaskDefinitionRegistry } from 'vs/workbench/parts/tasks/common/taskDefinitionRegistry';
+import { getPathFromAmdModule } from 'vs/base/common/amd';
 
-export class Debugger {
+export class Debugger implements IDebugger {
 
 	private mergedExtensionDescriptions: IExtensionDescription[];
 
@@ -72,23 +73,13 @@ export class Debugger {
 	}
 
 	public substituteVariables(folder: IWorkspaceFolder, config: IConfig): TPromise<IConfig> {
-
-		// first resolve command variables (which might have a UI)
-		return this.configurationResolverService.executeCommandVariables(config, this.variables).then(commandValueMapping => {
-
-			if (!commandValueMapping) { // cancelled by user
-				return null;
-			}
-
-			// now substitute all other variables
-			return (this.inEH() ? this.configurationManager.substituteVariables(this.type, folder, config) : TPromise.as(config)).then(config => {
-				try {
-					return TPromise.as(DebugAdapter.substituteVariables(folder, config, this.configurationResolverService, commandValueMapping));
-				} catch (e) {
-					return TPromise.wrapError(e);
-				}
+		if (this.inEH()) {
+			return this.configurationManager.substituteVariables(this.type, folder, config).then(config => {
+				return this.configurationResolverService.resolveWithCommands(folder, config, this.variables);
 			});
-		});
+		} else {
+			return this.configurationResolverService.resolveWithCommands(folder, config, this.variables);
+		}
 	}
 
 	public runInTerminal(args: DebugProtocol.RunInTerminalRequestArguments): TPromise<void> {
@@ -98,7 +89,7 @@ export class Debugger {
 
 	private inEH(): boolean {
 		const debugConfigs = this.configurationService.getValue<IDebugConfiguration>('debug');
-		return debugConfigs.extensionHostDebugAdapter;
+		return debugConfigs.extensionHostDebugAdapter || this.extensionDescription.extensionLocation.scheme !== 'file';
 	}
 
 	public get label(): string {
@@ -182,7 +173,7 @@ export class Debugger {
 			return telemetryInfo;
 		}).then(data => {
 			const client = new TelemetryClient(
-				uri.parse(require.toUrl('bootstrap')).fsPath,
+				getPathFromAmdModule(require, 'bootstrap-fork'),
 				{
 					serverName: 'Debug Telemetry',
 					timeout: 1000 * 60 * 5,
@@ -207,6 +198,7 @@ export class Debugger {
 			return null;
 		}
 		// fill in the default configuration attributes shared by all adapters.
+		const taskSchema = TaskDefinitionRegistry.getJsonSchema();
 		return Object.keys(this.debuggerContribution.configurationAttributes).map(request => {
 			const attributes: IJSONSchema = this.debuggerContribution.configurationAttributes[request];
 			const defaultRequired = ['name', 'type', 'request'];
@@ -239,12 +231,16 @@ export class Debugger {
 				default: 4711
 			};
 			properties['preLaunchTask'] = {
-				type: ['string', 'null'],
+				anyOf: [taskSchema, {
+					type: ['string', 'null'],
+				}],
 				default: '',
 				description: nls.localize('debugPrelaunchTask', "Task to run before debug session starts.")
 			};
 			properties['postDebugTask'] = {
-				type: ['string', 'null'],
+				anyOf: [taskSchema, {
+					type: ['string', 'null'],
+				}],
 				default: '',
 				description: nls.localize('debugPostDebugTask', "Task to run after debug session ends.")
 			};
diff --git a/src/vs/workbench/parts/debug/node/telemetryApp.ts b/src/vs/workbench/parts/debug/node/telemetryApp.ts
index db5e7ec6f62..490dc714fcc 100644
--- a/src/vs/workbench/parts/debug/node/telemetryApp.ts
+++ b/src/vs/workbench/parts/debug/node/telemetryApp.ts
@@ -5,7 +5,7 @@
 
 import { Server } from 'vs/base/parts/ipc/node/ipc.cp';
 import { AppInsightsAppender } from 'vs/platform/telemetry/node/appInsightsAppender';
-import { TelemetryAppenderChannel } from 'vs/platform/telemetry/common/telemetryIpc';
+import { TelemetryAppenderChannel } from 'vs/platform/telemetry/node/telemetryIpc';
 
 const appender = new AppInsightsAppender(process.argv[2], JSON.parse(process.argv[3]), process.argv[4]);
 process.once('exit', () => appender.dispose());
diff --git a/src/vs/workbench/parts/debug/node/terminals.ts b/src/vs/workbench/parts/debug/node/terminals.ts
index a46ea642248..a50d767ded0 100644
--- a/src/vs/workbench/parts/debug/node/terminals.ts
+++ b/src/vs/workbench/parts/debug/node/terminals.ts
@@ -11,8 +11,8 @@ import * as env from 'vs/base/common/platform';
 import * as pfs from 'vs/base/node/pfs';
 import { assign } from 'vs/base/common/objects';
 import { TPromise } from 'vs/base/common/winjs.base';
-import uri from 'vs/base/common/uri';
 import { ITerminalLauncher, ITerminalSettings } from 'vs/workbench/parts/debug/common/debug';
+import { getPathFromAmdModule } from 'vs/base/common/amd';
 
 const TERMINAL_TITLE = nls.localize('console.title', "VS Code Console");
 
@@ -55,7 +55,7 @@ export function getDefaultTerminalLinuxReady(): TPromise<string> {
 			}
 
 			c('xterm');
-		}, () => { });
+		});
 	}
 	return _DEFAULT_TERMINAL_LINUX_READY;
 }
@@ -132,7 +132,7 @@ class MacTerminalService extends TerminalLauncher {
 				// and then launches the program inside that window.
 
 				const script = terminalApp === MacTerminalService.DEFAULT_TERMINAL_OSX ? 'TerminalHelper' : 'iTermHelper';
-				const scriptpath = uri.parse(require.toUrl(`vs/workbench/parts/execution/electron-browser/${script}.scpt`)).fsPath;
+				const scriptpath = getPathFromAmdModule(require, `vs/workbench/parts/execution/electron-browser/${script}.scpt`);
 
 				const osaArgs = [
 					scriptpath,
@@ -312,7 +312,7 @@ export function prepareCommand(args: DebugProtocol.RunInTerminalRequestArguments
 
 	// try to determine the shell type
 	shell = shell.trim().toLowerCase();
-	if (shell.indexOf('powershell') >= 0) {
+	if (shell.indexOf('powershell') >= 0 || shell.indexOf('pwsh') >= 0) {
 		shellType = ShellType.powershell;
 	} else if (shell.indexOf('cmd.exe') >= 0) {
 		shellType = ShellType.cmd;
@@ -415,4 +415,4 @@ export function prepareCommand(args: DebugProtocol.RunInTerminalRequestArguments
 	}
 
 	return command;
-}
\ No newline at end of file
+}
diff --git a/src/vs/workbench/parts/debug/test/browser/baseDebugView.test.ts b/src/vs/workbench/parts/debug/test/browser/baseDebugView.test.ts
index d52a69598b8..837cb46a9b6 100644
--- a/src/vs/workbench/parts/debug/test/browser/baseDebugView.test.ts
+++ b/src/vs/workbench/parts/debug/test/browser/baseDebugView.test.ts
@@ -6,7 +6,7 @@
 import * as assert from 'assert';
 import { replaceWhitespace, renderExpressionValue, renderVariable } from 'vs/workbench/parts/debug/browser/baseDebugView';
 import * as dom from 'vs/base/browser/dom';
-import { Expression, Variable, Session, Scope, StackFrame, Thread } from 'vs/workbench/parts/debug/common/debugModel';
+import { Expression, Variable, Scope, StackFrame, Thread } from 'vs/workbench/parts/debug/common/debugModel';
 import { MockSession } from 'vs/workbench/parts/debug/test/common/mockDebug';
 const $ = dom.$;
 
@@ -52,8 +52,7 @@ suite('Debug - Base Debug View', () => {
 	});
 
 	test('render variable', () => {
-		const rawSession = new MockSession();
-		const session = new Session({ resolved: { name: 'mockSession', type: 'node', request: 'launch' }, unresolved: undefined }, rawSession);
+		const session = new MockSession();
 		const thread = new Thread(session, 'mockthread', 1);
 		const stackFrame = new StackFrame(thread, 1, null, 'app.js', 'normal', { startLineNumber: 1, startColumn: 1, endLineNumber: undefined, endColumn: undefined }, 0);
 		const scope = new Scope(stackFrame, 1, 'local', 1, false, 10, 10);
diff --git a/src/vs/workbench/parts/debug/test/browser/debugANSIHandling.test.ts b/src/vs/workbench/parts/debug/test/browser/debugANSIHandling.test.ts
index 9c7fb85fc49..c8e8ed02750 100644
--- a/src/vs/workbench/parts/debug/test/browser/debugANSIHandling.test.ts
+++ b/src/vs/workbench/parts/debug/test/browser/debugANSIHandling.test.ts
@@ -40,7 +40,7 @@ suite('Debug - ANSI Handling', () => {
 			assert(dom.hasClass(child, 'class1'));
 			assert(dom.hasClass(child, 'class2'));
 		} else {
-			assert.fail();
+			assert.fail('Unexpected assertion error');
 		}
 
 		child = root.lastChild;
@@ -49,7 +49,7 @@ suite('Debug - ANSI Handling', () => {
 			assert(dom.hasClass(child, 'class2'));
 			assert(dom.hasClass(child, 'class3'));
 		} else {
-			assert.fail();
+			assert.fail('Unexpected assertion error');
 		}
 	});
 
@@ -66,7 +66,7 @@ suite('Debug - ANSI Handling', () => {
 		if (child instanceof HTMLSpanElement) {
 			return child;
 		} else {
-			assert.fail();
+			assert.fail('Unexpected assertion error');
 			return null;
 		}
 	}
@@ -170,7 +170,7 @@ suite('Debug - ANSI Handling', () => {
 			if (child instanceof HTMLSpanElement) {
 				assertions[i](child);
 			} else {
-				assert.fail();
+				assert.fail('Unexpected assertion error');
 			}
 		}
 	}
diff --git a/src/vs/workbench/parts/debug/test/common/debugSource.test.ts b/src/vs/workbench/parts/debug/test/common/debugSource.test.ts
index fd2656f96a6..807a2c0ba03 100644
--- a/src/vs/workbench/parts/debug/test/common/debugSource.test.ts
+++ b/src/vs/workbench/parts/debug/test/common/debugSource.test.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as assert from 'assert';
-import uri from 'vs/base/common/uri';
+import { URI as uri } from 'vs/base/common/uri';
 import { Source } from 'vs/workbench/parts/debug/common/debugSource';
 import { normalize } from 'vs/base/common/paths';
 
diff --git a/src/vs/workbench/parts/debug/test/common/debugViewModel.test.ts b/src/vs/workbench/parts/debug/test/common/debugViewModel.test.ts
index 733ae781c37..a466b211fe4 100644
--- a/src/vs/workbench/parts/debug/test/common/debugViewModel.test.ts
+++ b/src/vs/workbench/parts/debug/test/common/debugViewModel.test.ts
@@ -5,7 +5,7 @@
 
 import * as assert from 'assert';
 import { ViewModel } from 'vs/workbench/parts/debug/common/debugViewModel';
-import { StackFrame, Expression, Thread, Session } from 'vs/workbench/parts/debug/common/debugModel';
+import { StackFrame, Expression, Thread } from 'vs/workbench/parts/debug/common/debugModel';
 import { MockSession } from 'vs/workbench/parts/debug/test/common/mockDebug';
 import { MockContextKeyService } from 'vs/platform/keybinding/test/common/mockKeybindingService';
 
@@ -23,8 +23,7 @@ suite('Debug - View Model', () => {
 	test('focused stack frame', () => {
 		assert.equal(model.focusedStackFrame, null);
 		assert.equal(model.focusedThread, null);
-		const mockSession = new MockSession();
-		const session = new Session({ resolved: { name: 'mockSession', type: 'node', request: 'launch' }, unresolved: undefined }, mockSession);
+		const session = new MockSession();
 		const thread = new Thread(session, 'myThread', 1);
 		const frame = new StackFrame(thread, 1, null, 'app.js', 'normal', { startColumn: 1, startLineNumber: 1, endColumn: undefined, endLineNumber: undefined }, 0);
 		model.setFocus(frame, thread, session, false);
diff --git a/src/vs/workbench/parts/debug/test/common/mockDebug.ts b/src/vs/workbench/parts/debug/test/common/mockDebug.ts
index aaa7993b320..bd2be3b46d2 100644
--- a/src/vs/workbench/parts/debug/test/common/mockDebug.ts
+++ b/src/vs/workbench/parts/debug/test/common/mockDebug.ts
@@ -3,28 +3,36 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import uri from 'vs/base/common/uri';
-import { Event, Emitter } from 'vs/base/common/event';
+import { URI as uri } from 'vs/base/common/uri';
+import { Event } from 'vs/base/common/event';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
-import { ILaunch, IDebugService, State, DebugEvent, ISession, IConfigurationManager, IStackFrame, IBreakpointData, IBreakpointUpdateData, IConfig, IModel, IViewModel, IRawSession, IBreakpoint } from 'vs/workbench/parts/debug/common/debug';
+import { Position } from 'vs/editor/common/core/position';
+import { ILaunch, IDebugService, State, IDebugSession, IConfigurationManager, IStackFrame, IBreakpointData, IBreakpointUpdateData, IConfig, IModel, IViewModel, IBreakpoint, LoadedSourceEvent, IThread, IRawModelUpdate, ActualBreakpoints, IFunctionBreakpoint, IExceptionBreakpoint, IDebugger, IExceptionInfo, AdapterEndEvent } from 'vs/workbench/parts/debug/common/debug';
+import { Source } from 'vs/workbench/parts/debug/common/debugSource';
+import { ISuggestion } from 'vs/editor/common/modes';
 
 export class MockDebugService implements IDebugService {
+
 	public _serviceBrand: any;
 
+	getSession(sessionId: string): IDebugSession {
+		return undefined;
+	}
+
 	public get state(): State {
 		return null;
 	}
 
-	public get onDidCustomEvent(): Event<DebugEvent> {
+	public get onWillNewSession(): Event<IDebugSession> {
 		return null;
 	}
 
-	public get onDidNewSession(): Event<ISession> {
+	public get onDidNewSession(): Event<IDebugSession> {
 		return null;
 	}
 
-	public get onDidEndSession(): Event<ISession> {
+	public get onDidEndSession(): Event<IDebugSession> {
 		return null;
 	}
 
@@ -39,6 +47,10 @@ export class MockDebugService implements IDebugService {
 	public focusStackFrame(focusedStackFrame: IStackFrame): void {
 	}
 
+	sendAllBreakpoints(session?: IDebugSession): TPromise<any> {
+		return TPromise.as(null);
+	}
+
 	public addBreakpoints(uri: uri, rawBreakpoints: IBreakpointData[]): TPromise<IBreakpoint[]> {
 		return TPromise.as(null);
 	}
@@ -108,19 +120,161 @@ export class MockDebugService implements IDebugService {
 	public logToRepl(value: string): void { }
 
 	public sourceIsNotAvailable(uri: uri): void { }
+
+	public tryToAutoFocusStackFrame(thread: IThread): TPromise<any> {
+		return TPromise.as(null);
+	}
 }
 
-export class MockSession implements IRawSession {
+export class MockSession implements IDebugSession {
+
+	configuration: IConfig = { type: 'mock', request: 'launch' };
+	unresolvedConfiguration: IConfig = { type: 'mock', request: 'launch' };
+	state = State.Stopped;
+	root: IWorkspaceFolder;
+	capabilities: DebugProtocol.Capabilities = {};
+
+	getId(): string {
+		return 'mock';
+	}
+
+	getName(includeRoot: boolean): string {
+		return 'mockname';
+	}
+
+	getSourceForUri(modelUri: uri): Source {
+		return null;
+	}
+
+	getThread(threadId: number): IThread {
+		return null;
+	}
+
+	get onDidCustomEvent(): Event<DebugProtocol.Event> {
+		return null;
+	}
+
+	get onDidLoadedSource(): Event<LoadedSourceEvent> {
+		return null;
+	}
+
+	get onDidChangeState(): Event<State> {
+		return null;
+	}
+
+	get onDidEndAdapter(): Event<AdapterEndEvent> {
+		return null;
+	}
+
+	getAllThreads(): ReadonlyArray<IThread> {
+		return [];
+	}
+
+	getSource(raw: DebugProtocol.Source): Source {
+		return undefined;
+	}
+
+	getLoadedSources(): TPromise<Source[]> {
+		return TPromise.as([]);
+	}
+
+	completions(frameId: number, text: string, position: Position, overwriteBefore: number): TPromise<ISuggestion[]> {
+		return TPromise.as([]);
+	}
+
+	clearThreads(removeThreads: boolean, reference?: number): void { }
+
+	rawUpdate(data: IRawModelUpdate): void { }
+
+	initialize(dbgr: IDebugger): TPromise<void> {
+		throw new Error('Method not implemented.');
+	}
+	launchOrAttach(config: IConfig): TPromise<void> {
+		throw new Error('Method not implemented.');
+	}
+	restart(): TPromise<DebugProtocol.RestartResponse> {
+		throw new Error('Method not implemented.');
+	}
+	sendBreakpoints(modelUri: uri, bpts: IBreakpoint[], sourceModified: boolean): TPromise<ActualBreakpoints> {
+		throw new Error('Method not implemented.');
+	}
+	sendFunctionBreakpoints(fbps: IFunctionBreakpoint[]): TPromise<ActualBreakpoints> {
+		throw new Error('Method not implemented.');
+	}
+	sendExceptionBreakpoints(exbpts: IExceptionBreakpoint[]): TPromise<any> {
+		throw new Error('Method not implemented.');
+	}
+	customRequest(request: string, args: any): TPromise<DebugProtocol.Response> {
+		throw new Error('Method not implemented.');
+	}
+	stackTrace(threadId: number, startFrame: number, levels: number): TPromise<DebugProtocol.StackTraceResponse> {
+		throw new Error('Method not implemented.');
+	}
+	exceptionInfo(threadId: number): TPromise<IExceptionInfo> {
+		throw new Error('Method not implemented.');
+	}
+	scopes(frameId: number): TPromise<DebugProtocol.ScopesResponse> {
+		throw new Error('Method not implemented.');
+	}
+	variables(variablesReference: number, filter: 'indexed' | 'named', start: number, count: number): TPromise<DebugProtocol.VariablesResponse> {
+		throw new Error('Method not implemented.');
+	}
+	evaluate(expression: string, frameId: number, context?: string): TPromise<DebugProtocol.EvaluateResponse> {
+		throw new Error('Method not implemented.');
+	}
+	restartFrame(frameId: number, threadId: number): TPromise<DebugProtocol.RestartFrameResponse> {
+		throw new Error('Method not implemented.');
+	}
+	next(threadId: number): TPromise<DebugProtocol.NextResponse> {
+		throw new Error('Method not implemented.');
+	}
+	stepIn(threadId: number): TPromise<DebugProtocol.StepInResponse> {
+		throw new Error('Method not implemented.');
+	}
+	stepOut(threadId: number): TPromise<DebugProtocol.StepOutResponse> {
+		throw new Error('Method not implemented.');
+	}
+	stepBack(threadId: number): TPromise<DebugProtocol.StepBackResponse> {
+		throw new Error('Method not implemented.');
+	}
+	continue(threadId: number): TPromise<DebugProtocol.ContinueResponse> {
+		throw new Error('Method not implemented.');
+	}
+	reverseContinue(threadId: number): TPromise<DebugProtocol.ReverseContinueResponse> {
+		throw new Error('Method not implemented.');
+	}
+	pause(threadId: number): TPromise<DebugProtocol.PauseResponse> {
+		throw new Error('Method not implemented.');
+	}
+	terminateThreads(threadIds: number[]): TPromise<DebugProtocol.TerminateThreadsResponse> {
+		throw new Error('Method not implemented.');
+	}
+	setVariable(variablesReference: number, name: string, value: string): TPromise<DebugProtocol.SetVariableResponse> {
+		throw new Error('Method not implemented.');
+	}
+	loadSource(resource: uri): TPromise<DebugProtocol.SourceResponse> {
+		throw new Error('Method not implemented.');
+	}
+
+	terminate(restart = false): TPromise<void> {
+		throw new Error('Method not implemented.');
+	}
+	disconnect(restart = false): TPromise<void> {
+		throw new Error('Method not implemented.');
+	}
+
+	dispose(): void { }
+}
+
+export class MockRawSession {
+
+	capabilities: DebugProtocol.Capabilities;
+	disconnected: boolean;
+	sessionLengthInSeconds: number;
 
 	public readyForBreakpoints = true;
 	public emittedStopped = true;
 
-	public getId() {
-		return 'mockrawsession';
-	}
-
-	public root: IWorkspaceFolder;
-
 	public getLengthInSeconds(): number {
 		return 100;
 	}
@@ -147,7 +301,7 @@ export class MockSession implements IRawSession {
 		return TPromise.as(null);
 	}
 
-	public attach(args: DebugProtocol.AttachRequestArguments): TPromise<DebugProtocol.AttachResponse> {
+	public launchOrAttach(args: IConfig): TPromise<DebugProtocol.Response> {
 		return TPromise.as(null);
 	}
 
@@ -163,30 +317,15 @@ export class MockSession implements IRawSession {
 		return TPromise.as(null);
 	}
 
-	public get capabilities(): DebugProtocol.Capabilities {
-		return {};
-	}
-
-	public get onDidEvent(): Event<DebugEvent> {
-		return null;
-	}
-
-	public get onDidInitialize(): Event<DebugProtocol.InitializedEvent> {
-		const emitter = new Emitter<DebugProtocol.InitializedEvent>();
-		return emitter.event;
-	}
-
-	public get onDidExitAdapter(): Event<{ sessionId: string }> {
-		const emitter = new Emitter<{ sessionId: string }>();
-		return emitter.event;
-	}
-
-
 	public custom(request: string, args: any): TPromise<DebugProtocol.Response> {
 		return TPromise.as(null);
 	}
 
-	public disconnect(restart?: boolean, force?: boolean): TPromise<DebugProtocol.DisconnectResponse> {
+	public terminate(restart = false): TPromise<DebugProtocol.TerminateResponse> {
+		return TPromise.as(null);
+	}
+
+	public disconnect(restart?: boolean): TPromise<any> {
 		return TPromise.as(null);
 	}
 
@@ -218,7 +357,7 @@ export class MockSession implements IRawSession {
 		return TPromise.as(null);
 	}
 
-	public terminateThreads(args: DebugProtocol.TerminateThreadsArguments): TPromise<DebugProtocol.TerminateThreadsResponse, any> {
+	public terminateThreads(args: DebugProtocol.TerminateThreadsArguments): TPromise<DebugProtocol.TerminateThreadsResponse> {
 		return TPromise.as(null);
 	}
 
@@ -242,6 +381,10 @@ export class MockSession implements IRawSession {
 		return TPromise.as(null);
 	}
 
+	public loadedSources(args: DebugProtocol.LoadedSourcesArguments): TPromise<DebugProtocol.LoadedSourcesResponse> {
+		return TPromise.as(null);
+	}
+
 	public setBreakpoints(args: DebugProtocol.SetBreakpointsArguments): TPromise<DebugProtocol.SetBreakpointsResponse> {
 		return TPromise.as(null);
 	}
diff --git a/src/vs/workbench/parts/debug/test/common/replHistory.test.ts b/src/vs/workbench/parts/debug/test/common/replHistory.test.ts
deleted file mode 100644
index 5f8639491dd..00000000000
--- a/src/vs/workbench/parts/debug/test/common/replHistory.test.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import * as assert from 'assert';
-import { ReplHistory } from 'vs/workbench/parts/debug/common/replHistory';
-
-suite('Debug - Repl History', () => {
-	let history: ReplHistory;
-
-	setup(() => {
-		history = new ReplHistory(['one', 'two', 'three', 'four', 'five']);
-	});
-
-	teardown(() => {
-		history = null;
-	});
-
-	test('previous and next', () => {
-		assert.equal(history.previous(), 'five');
-		assert.equal(history.previous(), 'four');
-		assert.equal(history.previous(), 'three');
-		assert.equal(history.previous(), 'two');
-		assert.equal(history.previous(), 'one');
-		assert.equal(history.previous(), null);
-		assert.equal(history.next(), 'two');
-		assert.equal(history.next(), 'three');
-		assert.equal(history.next(), 'four');
-		assert.equal(history.next(), 'five');
-	});
-
-	test('evaluated and remember', () => {
-		history.evaluated('six');
-		assert.equal(history.previous(), 'six');
-		assert.equal(history.previous(), 'five');
-		assert.equal(history.next(), 'six');
-
-		history.remember('six++', true);
-		assert.equal(history.next(), 'six++');
-		assert.equal(history.previous(), 'six');
-
-		history.evaluated('seven');
-		assert.equal(history.previous(), 'seven');
-		assert.equal(history.previous(), 'six');
-	});
-});
diff --git a/src/vs/workbench/parts/debug/test/node/debugModel.test.ts b/src/vs/workbench/parts/debug/test/electron-browser/debugModel.test.ts
similarity index 86%
rename from src/vs/workbench/parts/debug/test/node/debugModel.test.ts
rename to src/vs/workbench/parts/debug/test/electron-browser/debugModel.test.ts
index e480fb71cb6..8785367244f 100644
--- a/src/vs/workbench/parts/debug/test/node/debugModel.test.ts
+++ b/src/vs/workbench/parts/debug/test/electron-browser/debugModel.test.ts
@@ -4,20 +4,21 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as assert from 'assert';
-import uri from 'vs/base/common/uri';
+import { URI as uri } from 'vs/base/common/uri';
 import severity from 'vs/base/common/severity';
-import { SimpleReplElement, Model, Session, Expression, RawObjectReplElement, StackFrame, Thread } from 'vs/workbench/parts/debug/common/debugModel';
+import { SimpleReplElement, Model, Expression, RawObjectReplElement, StackFrame, Thread } from 'vs/workbench/parts/debug/common/debugModel';
 import * as sinon from 'sinon';
-import { MockSession } from 'vs/workbench/parts/debug/test/common/mockDebug';
+import { MockRawSession } from 'vs/workbench/parts/debug/test/common/mockDebug';
 import { Source } from 'vs/workbench/parts/debug/common/debugSource';
+import { DebugSession } from 'vs/workbench/parts/debug/electron-browser/debugSession';
 
 suite('Debug - Model', () => {
 	let model: Model;
-	let rawSession: MockSession;
+	let rawSession: MockRawSession;
 
 	setup(() => {
-		model = new Model([], true, [], [], []);
-		rawSession = new MockSession();
+		model = new Model([], true, [], [], [], <any>{ isDirty: (e: any) => false });
+		rawSession = new MockRawSession();
 	});
 
 	teardown(() => {
@@ -108,18 +109,18 @@ suite('Debug - Model', () => {
 	test('threads simple', () => {
 		const threadId = 1;
 		const threadName = 'firstThread';
+		const session = new DebugSession({ resolved: { name: 'mockSession', type: 'node', request: 'launch' }, unresolved: undefined }, undefined, model, undefined, undefined, undefined, undefined);
+		model.addSession(session);
 
-		model.addSession({ resolved: { name: 'mockSession', type: 'node', request: 'launch' }, unresolved: undefined }, rawSession);
 		assert.equal(model.getSessions().length, 1);
 		model.rawUpdate({
-			sessionId: rawSession.getId(),
+			sessionId: session.getId(),
 			threadId: threadId,
 			thread: {
 				id: threadId,
 				name: threadName
 			}
 		});
-		const session = model.getSessions().filter(p => p.getId() === rawSession.getId()).pop();
 
 		assert.equal(session.getThread(threadId).name, threadName);
 
@@ -140,9 +141,13 @@ suite('Debug - Model', () => {
 		const stoppedReason = 'breakpoint';
 
 		// Add the threads
-		model.addSession({ resolved: { name: 'mockSession', type: 'node', request: 'launch' }, unresolved: undefined }, rawSession);
+		const session = new DebugSession({ resolved: { name: 'mockSession', type: 'node', request: 'launch' }, unresolved: undefined }, undefined, model, undefined, undefined, undefined, undefined);
+		model.addSession(session);
+
+		session['_raw'] = <any>rawSession;
+
 		model.rawUpdate({
-			sessionId: rawSession.getId(),
+			sessionId: session.getId(),
 			threadId: threadId1,
 			thread: {
 				id: threadId1,
@@ -151,7 +156,7 @@ suite('Debug - Model', () => {
 		});
 
 		model.rawUpdate({
-			sessionId: rawSession.getId(),
+			sessionId: session.getId(),
 			threadId: threadId2,
 			thread: {
 				id: threadId2,
@@ -161,7 +166,7 @@ suite('Debug - Model', () => {
 
 		// Stopped event with all threads stopped
 		model.rawUpdate({
-			sessionId: rawSession.getId(),
+			sessionId: session.getId(),
 			threadId: threadId1,
 			stoppedDetails: {
 				reason: stoppedReason,
@@ -169,7 +174,6 @@ suite('Debug - Model', () => {
 				allThreadsStopped: true
 			},
 		});
-		const session = model.getSessions().filter(p => p.getId() === rawSession.getId()).pop();
 
 		const thread1 = session.getThread(threadId1);
 		const thread2 = session.getThread(threadId2);
@@ -230,10 +234,14 @@ suite('Debug - Model', () => {
 		const runningThreadId = 2;
 		const runningThreadName = 'runningThread';
 		const stoppedReason = 'breakpoint';
-		model.addSession({ resolved: { name: 'mockSession', type: 'node', request: 'launch' }, unresolved: undefined }, rawSession);
+		const session = new DebugSession({ resolved: { name: 'mockSession', type: 'node', request: 'launch' }, unresolved: undefined }, undefined, model, undefined, undefined, undefined, undefined);
+		model.addSession(session);
+
+		session['_raw'] = <any>rawSession;
+
 		// Add the threads
 		model.rawUpdate({
-			sessionId: rawSession.getId(),
+			sessionId: session.getId(),
 			threadId: stoppedThreadId,
 			thread: {
 				id: stoppedThreadId,
@@ -242,7 +250,7 @@ suite('Debug - Model', () => {
 		});
 
 		model.rawUpdate({
-			sessionId: rawSession.getId(),
+			sessionId: session.getId(),
 			threadId: runningThreadId,
 			thread: {
 				id: runningThreadId,
@@ -252,7 +260,7 @@ suite('Debug - Model', () => {
 
 		// Stopped event with only one thread stopped
 		model.rawUpdate({
-			sessionId: rawSession.getId(),
+			sessionId: session.getId(),
 			threadId: stoppedThreadId,
 			stoppedDetails: {
 				reason: stoppedReason,
@@ -260,7 +268,6 @@ suite('Debug - Model', () => {
 				allThreadsStopped: false
 			}
 		});
-		const session = model.getSessions().filter(p => p.getId() === rawSession.getId()).pop();
 
 		const stoppedThread = session.getThread(stoppedThreadId);
 		const runningThread = session.getThread(runningThreadId);
@@ -341,12 +348,15 @@ suite('Debug - Model', () => {
 
 	test('repl expressions', () => {
 		assert.equal(model.getReplElements().length, 0);
-		const session = new Session({ resolved: { name: 'mockSession', type: 'node', request: 'launch' }, unresolved: undefined }, rawSession);
+		const session = new DebugSession({ resolved: { name: 'mockSession', type: 'node', request: 'launch' }, unresolved: undefined }, undefined, model, undefined, undefined, undefined, undefined);
+		model.addSession(session);
+
+		session['_raw'] = <any>rawSession;
 		const thread = new Thread(session, 'mockthread', 1);
 		const stackFrame = new StackFrame(thread, 1, null, 'app.js', 'normal', { startLineNumber: 1, startColumn: 1, endLineNumber: 1, endColumn: 10 }, 1);
-		model.addReplExpression(session, stackFrame, 'myVariable').done();
-		model.addReplExpression(session, stackFrame, 'myVariable').done();
-		model.addReplExpression(session, stackFrame, 'myVariable').done();
+		model.addReplExpression(session, stackFrame, 'myVariable').then();
+		model.addReplExpression(session, stackFrame, 'myVariable').then();
+		model.addReplExpression(session, stackFrame, 'myVariable').then();
 
 		assert.equal(model.getReplElements().length, 3);
 		model.getReplElements().forEach(re => {
@@ -360,7 +370,9 @@ suite('Debug - Model', () => {
 	});
 
 	test('stack frame get specific source name', () => {
-		const session = new Session({ resolved: { name: 'mockSession', type: 'node', request: 'launch' }, unresolved: undefined }, rawSession);
+		const session = new DebugSession({ resolved: { name: 'mockSession', type: 'node', request: 'launch' }, unresolved: undefined }, undefined, model, undefined, undefined, undefined, undefined);
+		model.addSession(session);
+
 		let firstStackFrame: StackFrame;
 		let secondStackFrame: StackFrame;
 		const thread = new class extends Thread {
diff --git a/src/vs/workbench/parts/debug/test/node/debugger.test.ts b/src/vs/workbench/parts/debug/test/node/debugger.test.ts
index a0b9a5dabee..ba40f30db8e 100644
--- a/src/vs/workbench/parts/debug/test/node/debugger.test.ts
+++ b/src/vs/workbench/parts/debug/test/node/debugger.test.ts
@@ -9,7 +9,7 @@ import * as platform from 'vs/base/common/platform';
 import { IAdapterExecutable, IConfigurationManager } from 'vs/workbench/parts/debug/common/debug';
 import { Debugger } from 'vs/workbench/parts/debug/node/debugger';
 import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { DebugAdapter } from 'vs/workbench/parts/debug/node/debugAdapter';
 
diff --git a/src/vs/workbench/parts/emmet/browser/actions/showEmmetCommands.ts b/src/vs/workbench/parts/emmet/browser/actions/showEmmetCommands.ts
index ea18fc77506..c144579d4aa 100644
--- a/src/vs/workbench/parts/emmet/browser/actions/showEmmetCommands.ts
+++ b/src/vs/workbench/parts/emmet/browser/actions/showEmmetCommands.ts
@@ -12,6 +12,7 @@ import { registerEditorAction, EditorAction, ServicesAccessor } from 'vs/editor/
 import { IQuickOpenService } from 'vs/platform/quickOpen/common/quickOpen';
 import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
+import { MenuId } from 'vs/platform/actions/common/actions';
 
 const EMMET_COMMANDS_PREFIX = '>Emmet: ';
 
@@ -23,6 +24,12 @@ class ShowEmmetCommandsAction extends EditorAction {
 			label: nls.localize('showEmmetCommands', "Show Emmet Commands"),
 			alias: 'Show Emmet Commands',
 			precondition: EditorContextKeys.writable,
+			menubarOpts: {
+				menuId: MenuId.MenubarEditMenu,
+				group: '5_insert',
+				title: nls.localize({ key: 'miShowEmmetCommands', comment: ['&& denotes a mnemonic'] }, "E&&mmet..."),
+				order: 4
+			}
 		});
 	}
 
diff --git a/src/vs/workbench/parts/emmet/electron-browser/actions/expandAbbreviation.ts b/src/vs/workbench/parts/emmet/electron-browser/actions/expandAbbreviation.ts
index 5a9512f8999..42968c4b846 100644
--- a/src/vs/workbench/parts/emmet/electron-browser/actions/expandAbbreviation.ts
+++ b/src/vs/workbench/parts/emmet/electron-browser/actions/expandAbbreviation.ts
@@ -10,6 +10,8 @@ import { registerEditorAction } from 'vs/editor/browser/editorExtensions';
 import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
 import { KeyCode } from 'vs/base/common/keyCodes';
 import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
+import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
+import { MenuId } from 'vs/platform/actions/common/actions';
 
 class ExpandAbbreviationAction extends EmmetEditorAction {
 
@@ -26,7 +28,14 @@ class ExpandAbbreviationAction extends EmmetEditorAction {
 					EditorContextKeys.editorTextFocus,
 					EditorContextKeys.tabDoesNotMoveFocus,
 					ContextKeyExpr.has('config.emmet.triggerExpansionOnTab')
-				)
+				),
+				weight: KeybindingWeight.EditorContrib
+			},
+			menubarOpts: {
+				menuId: MenuId.MenubarEditMenu,
+				group: '5_insert',
+				title: nls.localize({ key: 'miEmmetExpandAbbreviation', comment: ['&& denotes a mnemonic'] }, "Emmet: E&&xpand Abbreviation"),
+				order: 3
 			}
 		});
 
diff --git a/src/vs/workbench/parts/execution/electron-browser/execution.contribution.ts b/src/vs/workbench/parts/execution/electron-browser/execution.contribution.ts
index 3bd97be51bb..92e979c5480 100644
--- a/src/vs/workbench/parts/execution/electron-browser/execution.contribution.ts
+++ b/src/vs/workbench/parts/execution/electron-browser/execution.contribution.ts
@@ -10,7 +10,7 @@ import { Registry } from 'vs/platform/registry/common/platform';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
 import * as paths from 'vs/base/common/paths';
-import uri from 'vs/base/common/uri';
+import { URI as uri } from 'vs/base/common/uri';
 import { ITerminalService } from 'vs/workbench/parts/execution/common/execution';
 import { MenuId, MenuRegistry } from 'vs/platform/actions/common/actions';
 import { KeyMod, KeyCode } from 'vs/base/common/keyCodes';
@@ -20,7 +20,7 @@ import { getDefaultTerminalWindows, getDefaultTerminalLinuxReady, DEFAULT_TERMIN
 import { WinTerminalService, MacTerminalService, LinuxTerminalService } from 'vs/workbench/parts/execution/electron-browser/terminalService';
 import { IHistoryService } from 'vs/workbench/services/history/common/history';
 import { ResourceContextKey } from 'vs/workbench/common/resources';
-import { KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRegistry';
+import { KeybindingsRegistry, KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
 import { IFileService } from 'vs/platform/files/common/files';
 import { IListService } from 'vs/platform/list/browser/listService';
 import { getMultiSelectedResources } from 'vs/workbench/parts/files/browser/files';
@@ -40,37 +40,41 @@ if (env.isWindows) {
 getDefaultTerminalLinuxReady().then(defaultTerminalLinux => {
 	let configurationRegistry = Registry.as<IConfigurationRegistry>(Extensions.Configuration);
 	configurationRegistry.registerConfiguration({
-		'id': 'externalTerminal',
-		'order': 100,
-		'title': nls.localize('terminalConfigurationTitle', "External Terminal"),
-		'type': 'object',
-		'properties': {
+		id: 'externalTerminal',
+		order: 100,
+		title: nls.localize('terminalConfigurationTitle', "External Terminal"),
+		type: 'object',
+		properties: {
 			'terminal.explorerKind': {
-				'type': 'string',
-				'enum': [
+				type: 'string',
+				enum: [
 					'integrated',
 					'external'
 				],
-				'description': nls.localize('explorer.openInTerminalKind', "Customizes what kind of terminal to launch."),
-				'default': 'integrated'
+				enumDescriptions: [
+					nls.localize('terminal.explorerKind.integrated', "Use VS Code's integrated terminal."),
+					nls.localize('terminal.explorerKind.external', "Use the configured external terminal.")
+				],
+				description: nls.localize('explorer.openInTerminalKind', "Customizes what kind of terminal to launch."),
+				default: 'integrated'
 			},
 			'terminal.external.windowsExec': {
-				'type': 'string',
-				'description': nls.localize('terminal.external.windowsExec', "Customizes which terminal to run on Windows."),
-				'default': getDefaultTerminalWindows(),
-				'scope': ConfigurationScope.APPLICATION
+				type: 'string',
+				description: nls.localize('terminal.external.windowsExec', "Customizes which terminal to run on Windows."),
+				default: getDefaultTerminalWindows(),
+				scope: ConfigurationScope.APPLICATION
 			},
 			'terminal.external.osxExec': {
-				'type': 'string',
-				'description': nls.localize('terminal.external.osxExec', "Customizes which terminal application to run on OS X."),
-				'default': DEFAULT_TERMINAL_OSX,
-				'scope': ConfigurationScope.APPLICATION
+				type: 'string',
+				description: nls.localize('terminal.external.osxExec', "Customizes which terminal application to run on macOS."),
+				default: DEFAULT_TERMINAL_OSX,
+				scope: ConfigurationScope.APPLICATION
 			},
 			'terminal.external.linuxExec': {
-				'type': 'string',
-				'description': nls.localize('terminal.external.linuxExec', "Customizes which terminal to run on Linux."),
-				'default': defaultTerminalLinux,
-				'scope': ConfigurationScope.APPLICATION
+				type: 'string',
+				description: nls.localize('terminal.external.linuxExec', "Customizes which terminal to run on Linux."),
+				default: defaultTerminalLinux,
+				scope: ConfigurationScope.APPLICATION
 			}
 		}
 	});
@@ -109,7 +113,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 	id: OPEN_NATIVE_CONSOLE_COMMAND_ID,
 	primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KEY_C,
 	when: KEYBINDING_CONTEXT_TERMINAL_NOT_FOCUSED,
-	weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
+	weight: KeybindingWeight.WorkbenchContrib,
 	handler: (accessor) => {
 		const historyService = accessor.get(IHistoryService);
 		const terminalService = accessor.get(ITerminalService);
@@ -118,7 +122,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 			terminalService.openTerminal(root.fsPath);
 		} else {
 			// Opens current file's folder, if no folder is open in editor
-			const activeFile = historyService.getLastActiveFile();
+			const activeFile = historyService.getLastActiveFile(Schemas.file);
 			if (activeFile) {
 				terminalService.openTerminal(paths.dirname(activeFile.fsPath));
 			}
@@ -129,15 +133,13 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
 	command: {
 		id: OPEN_NATIVE_CONSOLE_COMMAND_ID,
-		title: env.isWindows ? nls.localize('globalConsoleActionWin', "Open New Command Prompt") :
-			nls.localize('globalConsoleActionMacLinux', "Open New Terminal")
+		title: nls.localize('globalConsoleAction', "Open New Terminal")
 	}
 });
 
 const openConsoleCommand = {
 	id: OPEN_IN_TERMINAL_COMMAND_ID,
-	title: env.isWindows ? nls.localize('scopedConsoleActionWin', "Open in Command Prompt") :
-		nls.localize('scopedConsoleActionMacLinux', "Open in Terminal")
+	title: nls.localize('scopedConsoleAction', "Open in Terminal")
 };
 MenuRegistry.appendMenuItem(MenuId.OpenEditorsContext, {
 	group: 'navigation',
diff --git a/src/vs/workbench/parts/execution/electron-browser/terminal.ts b/src/vs/workbench/parts/execution/electron-browser/terminal.ts
index c6dab0141ca..9017299073e 100644
--- a/src/vs/workbench/parts/execution/electron-browser/terminal.ts
+++ b/src/vs/workbench/parts/execution/electron-browser/terminal.ts
@@ -32,7 +32,7 @@ export function getDefaultTerminalLinuxReady(): TPromise<string> {
 			}
 
 			c('xterm');
-		}, () => { });
+		});
 	}
 	return _DEFAULT_TERMINAL_LINUX_READY;
 }
diff --git a/src/vs/workbench/parts/execution/electron-browser/terminalService.ts b/src/vs/workbench/parts/execution/electron-browser/terminalService.ts
index 275f11a662e..9327fcd7e78 100644
--- a/src/vs/workbench/parts/execution/electron-browser/terminalService.ts
+++ b/src/vs/workbench/parts/execution/electron-browser/terminalService.ts
@@ -9,14 +9,13 @@ import * as cp from 'child_process';
 import * as path from 'path';
 import * as processes from 'vs/base/node/processes';
 import * as nls from 'vs/nls';
-import * as errors from 'vs/base/common/errors';
 import { assign } from 'vs/base/common/objects';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { ITerminalService } from 'vs/workbench/parts/execution/common/execution';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { ITerminalConfiguration, getDefaultTerminalWindows, getDefaultTerminalLinuxReady, DEFAULT_TERMINAL_OSX } from 'vs/workbench/parts/execution/electron-browser/terminal';
-import uri from 'vs/base/common/uri';
 import { IProcessEnvironment } from 'vs/base/common/platform';
+import { getPathFromAmdModule } from 'vs/base/common/amd';
 
 const TERMINAL_TITLE = nls.localize('console.title', "VS Code Console");
 
@@ -38,8 +37,7 @@ export class WinTerminalService implements ITerminalService {
 	public openTerminal(cwd?: string): void {
 		const configuration = this._configurationService.getValue<ITerminalConfiguration>();
 
-		this.spawnTerminal(cp, configuration, processes.getWindowsShell(), cwd)
-			.done(null, errors.onUnexpectedError);
+		this.spawnTerminal(cp, configuration, processes.getWindowsShell(), cwd);
 	}
 
 	public runInTerminal(title: string, dir: string, args: string[], envVars: IProcessEnvironment): TPromise<void> {
@@ -126,7 +124,7 @@ export class MacTerminalService implements ITerminalService {
 	public openTerminal(cwd?: string): void {
 		const configuration = this._configurationService.getValue<ITerminalConfiguration>();
 
-		this.spawnTerminal(cp, configuration, cwd).done(null, errors.onUnexpectedError);
+		this.spawnTerminal(cp, configuration, cwd);
 	}
 
 	public runInTerminal(title: string, dir: string, args: string[], envVars: IProcessEnvironment): TPromise<void> {
@@ -143,7 +141,7 @@ export class MacTerminalService implements ITerminalService {
 				// and then launches the program inside that window.
 
 				const script = terminalApp === DEFAULT_TERMINAL_OSX ? 'TerminalHelper' : 'iTermHelper';
-				const scriptpath = uri.parse(require.toUrl(`vs/workbench/parts/execution/electron-browser/${script}.scpt`)).fsPath;
+				const scriptpath = getPathFromAmdModule(require, `vs/workbench/parts/execution/electron-browser/${script}.scpt`);
 
 				const osaArgs = [
 					scriptpath,
@@ -218,8 +216,7 @@ export class LinuxTerminalService implements ITerminalService {
 	public openTerminal(cwd?: string): void {
 		const configuration = this._configurationService.getValue<ITerminalConfiguration>();
 
-		this.spawnTerminal(cp, configuration, cwd)
-			.done(null, errors.onUnexpectedError);
+		this.spawnTerminal(cp, configuration, cwd);
 	}
 
 	public runInTerminal(title: string, dir: string, args: string[], envVars: IProcessEnvironment): TPromise<void> {
diff --git a/src/vs/workbench/parts/experiments/electron-browser/experimentalPrompt.ts b/src/vs/workbench/parts/experiments/electron-browser/experimentalPrompt.ts
new file mode 100644
index 00000000000..cee00f64590
--- /dev/null
+++ b/src/vs/workbench/parts/experiments/electron-browser/experimentalPrompt.ts
@@ -0,0 +1,92 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet';
+import { INotificationService, Severity, IPromptChoice } from 'vs/platform/notification/common/notification';
+import { IExperimentService, IExperiment, ExperimentActionType, IExperimentActionPromptProperties, IExperimentActionPromptCommand, ExperimentState } from 'vs/workbench/parts/experiments/node/experimentService';
+import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
+import { IExtensionsViewlet } from 'vs/workbench/parts/extensions/common/extensions';
+import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
+import { Disposable, IDisposable, dispose } from 'vs/base/common/lifecycle';
+
+export class ExperimentalPrompts extends Disposable implements IWorkbenchContribution {
+	private _disposables: IDisposable[] = [];
+
+	constructor(
+		@IExperimentService private experimentService: IExperimentService,
+		@IViewletService private viewletService: IViewletService,
+		@INotificationService private notificationService: INotificationService,
+		@ITelemetryService private telemetryService: ITelemetryService
+
+	) {
+		super();
+		this.experimentService.onExperimentEnabled(e => {
+			if (e.action && e.action.type === ExperimentActionType.Prompt && e.state === ExperimentState.Run) {
+				this.showExperimentalPrompts(e);
+			}
+		}, this, this._disposables);
+	}
+
+	private showExperimentalPrompts(experiment: IExperiment): void {
+		if (!experiment || !experiment.enabled || !experiment.action || experiment.state !== ExperimentState.Run) {
+			return;
+		}
+
+		const logTelemetry = (commandText?: string) => {
+			/* __GDPR__
+				"experimentalPrompts" : {
+					"experimentId": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+					"commandText": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+					"cancelled": { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true }
+				}
+			*/
+			this.telemetryService.publicLog('experimentalPrompts', {
+				experimentId: experiment.id,
+				commandText,
+				cancelled: !commandText
+			});
+		};
+
+		const actionProperties = (<IExperimentActionPromptProperties>experiment.action.properties);
+		if (!actionProperties || !actionProperties.promptText) {
+			return;
+		}
+		if (!actionProperties.commands) {
+			actionProperties.commands = [];
+		}
+
+		const choices: IPromptChoice[] = actionProperties.commands.map((command: IExperimentActionPromptCommand) => {
+			return {
+				label: command.text,
+				run: () => {
+					logTelemetry(command.text);
+					if (command.externalLink) {
+						window.open(command.externalLink);
+						return;
+					}
+					if (command.curatedExtensionsKey && Array.isArray(command.curatedExtensionsList)) {
+						this.viewletService.openViewlet('workbench.view.extensions', true)
+							.then(viewlet => viewlet as IExtensionsViewlet)
+							.then(viewlet => {
+								if (viewlet) {
+									viewlet.search('curated:' + command.curatedExtensionsKey);
+								}
+							});
+						return;
+					}
+
+					this.experimentService.markAsCompleted(experiment.id);
+
+				}
+			};
+		});
+
+		this.notificationService.prompt(Severity.Info, actionProperties.promptText, choices, logTelemetry);
+	}
+
+	dispose() {
+		this._disposables = dispose(this._disposables);
+	}
+}
diff --git a/src/vs/workbench/parts/experiments/electron-browser/experiments.contribution.ts b/src/vs/workbench/parts/experiments/electron-browser/experiments.contribution.ts
new file mode 100644
index 00000000000..93811199b24
--- /dev/null
+++ b/src/vs/workbench/parts/experiments/electron-browser/experiments.contribution.ts
@@ -0,0 +1,16 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+
+import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
+import { IExperimentService, ExperimentService } from 'vs/workbench/parts/experiments/node/experimentService';
+import { Registry } from 'vs/platform/registry/common/platform';
+import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions';
+import { LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
+import { ExperimentalPrompts } from 'vs/workbench/parts/experiments/electron-browser/experimentalPrompt';
+
+registerSingleton(IExperimentService, ExperimentService);
+
+Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench).registerWorkbenchContribution(ExperimentalPrompts, LifecyclePhase.Eventually);
diff --git a/src/vs/workbench/parts/experiments/node/experimentService.ts b/src/vs/workbench/parts/experiments/node/experimentService.ts
new file mode 100644
index 00000000000..7ecb48803a4
--- /dev/null
+++ b/src/vs/workbench/parts/experiments/node/experimentService.ts
@@ -0,0 +1,435 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import product from 'vs/platform/node/product';
+
+import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
+import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
+import { IEnvironmentService } from 'vs/platform/environment/common/environment';
+import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
+import { ILifecycleService, LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
+import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { IExtensionManagementService, LocalExtensionType } from 'vs/platform/extensionManagement/common/extensionManagement';
+import { IRequestService } from 'vs/platform/request/node/request';
+import { TPromise } from 'vs/base/common/winjs.base';
+import { language } from 'vs/base/common/platform';
+import { Disposable, IDisposable, dispose } from 'vs/base/common/lifecycle';
+import { match } from 'vs/base/common/glob';
+import { asJson } from 'vs/base/node/request';
+import { Emitter, Event } from 'vs/base/common/event';
+import { ITextFileService, StateChange } from 'vs/workbench/services/textfile/common/textfiles';
+import { WorkspaceStats } from 'vs/workbench/parts/stats/node/workspaceStats';
+import { CancellationToken } from 'vs/base/common/cancellation';
+
+interface IExperimentStorageState {
+	enabled: boolean;
+	state: ExperimentState;
+	editCount?: number;
+	lastEditedDate?: string;
+}
+
+export const enum ExperimentState {
+	Evaluating,
+	NoRun,
+	Run,
+	Complete
+}
+
+interface IRawExperiment {
+	id: string;
+	enabled?: boolean;
+	condition?: {
+		insidersOnly?: boolean;
+		displayLanguage?: string;
+		installedExtensions?: {
+			excludes?: string[];
+			includes?: string[];
+		},
+		fileEdits?: {
+			filePathPattern?: string;
+			workspaceIncludes?: string[];
+			workspaceExcludes?: string[];
+			minEditCount: number;
+		},
+		experimentsPreviouslyRun?: {
+			excludes?: string[];
+			includes?: string[];
+		}
+		userProbability?: number;
+	};
+	action?: IExperimentAction;
+}
+
+interface IExperimentAction {
+	type: ExperimentActionType;
+	properties: any;
+}
+
+export enum ExperimentActionType {
+	Custom = 'Custom',
+	Prompt = 'Prompt',
+	AddToRecommendations = 'AddToRecommendations'
+}
+
+export interface IExperimentActionPromptProperties {
+	promptText: string;
+	commands: IExperimentActionPromptCommand[];
+}
+
+export interface IExperimentActionPromptCommand {
+	text: string;
+	externalLink?: string;
+	curatedExtensionsKey?: string;
+	curatedExtensionsList?: string[];
+}
+
+export interface IExperiment {
+	id: string;
+	enabled: boolean;
+	state: ExperimentState;
+	action?: IExperimentAction;
+}
+
+export interface IExperimentService {
+	_serviceBrand: any;
+	getExperimentById(id: string): TPromise<IExperiment>;
+	getExperimentsByType(type: ExperimentActionType): TPromise<IExperiment[]>;
+	getCuratedExtensionsList(curatedExtensionsKey: string): TPromise<string[]>;
+	markAsCompleted(experimentId: string): void;
+
+	onExperimentEnabled: Event<IExperiment>;
+}
+
+export const IExperimentService = createDecorator<IExperimentService>('experimentService');
+
+export class ExperimentService extends Disposable implements IExperimentService {
+	_serviceBrand: any;
+	private _experiments: IExperiment[] = [];
+	private _loadExperimentsPromise: TPromise<void>;
+	private _curatedMapping = Object.create(null);
+	private _disposables: IDisposable[] = [];
+
+	private readonly _onExperimentEnabled: Emitter<IExperiment> = new Emitter<IExperiment>();
+
+	onExperimentEnabled: Event<IExperiment> = this._onExperimentEnabled.event;
+	constructor(
+		@IStorageService private storageService: IStorageService,
+		@IExtensionManagementService private extensionManagementService: IExtensionManagementService,
+		@ITextFileService private textFileService: ITextFileService,
+		@IEnvironmentService private environmentService: IEnvironmentService,
+		@ITelemetryService private telemetryService: ITelemetryService,
+		@ILifecycleService private lifecycleService: ILifecycleService,
+		@IRequestService private requestService: IRequestService,
+		@IConfigurationService private configurationService: IConfigurationService
+	) {
+		super();
+
+		this._loadExperimentsPromise = TPromise.wrap(this.lifecycleService.when(LifecyclePhase.Eventually)).then(() => this.loadExperiments());
+	}
+
+	public getExperimentById(id: string): TPromise<IExperiment> {
+		return this._loadExperimentsPromise.then(() => {
+			return this._experiments.filter(x => x.id === id)[0];
+		});
+	}
+
+	public getExperimentsByType(type: ExperimentActionType): TPromise<IExperiment[]> {
+		return this._loadExperimentsPromise.then(() => {
+			if (type === ExperimentActionType.Custom) {
+				return this._experiments.filter(x => x.enabled && (!x.action || x.action.type === type));
+			}
+			return this._experiments.filter(x => x.enabled && x.action && x.action.type === type);
+		});
+	}
+
+	public getCuratedExtensionsList(curatedExtensionsKey: string): TPromise<string[]> {
+		return this._loadExperimentsPromise.then(() => {
+			for (let i = 0; i < this._experiments.length; i++) {
+				if (this._experiments[i].enabled
+					&& this._experiments[i].state === ExperimentState.Run
+					&& this._curatedMapping[this._experiments[i].id]
+					&& this._curatedMapping[this._experiments[i].id].curatedExtensionsKey === curatedExtensionsKey) {
+					return this._curatedMapping[this._experiments[i].id].curatedExtensionsList;
+				}
+			}
+			return [];
+		});
+	}
+
+	public markAsCompleted(experimentId: string): void {
+		const storageKey = 'experiments.' + experimentId;
+		const experimentState: IExperimentStorageState = safeParse(this.storageService.get(storageKey, StorageScope.GLOBAL), {});
+		experimentState.state = ExperimentState.Complete;
+		this.storageService.store(storageKey, JSON.stringify(experimentState), StorageScope.GLOBAL);
+	}
+
+	protected getExperiments(): TPromise<IRawExperiment[]> {
+		if (!product.experimentsUrl || this.configurationService.getValue('workbench.enableExperiments') === false) {
+			return TPromise.as([]);
+		}
+		return this.requestService.request({ type: 'GET', url: product.experimentsUrl }, CancellationToken.None).then(context => {
+			if (context.res.statusCode !== 200) {
+				return TPromise.as(null);
+			}
+			return asJson(context).then(result => {
+				return Array.isArray<IRawExperiment>(result['experiments']) ? result['experiments'] : [];
+			});
+		}, () => TPromise.as(null));
+	}
+
+	private loadExperiments(): TPromise<any> {
+		return this.getExperiments().then(rawExperiments => {
+			// Offline mode
+			if (!rawExperiments) {
+				const allExperimentIdsFromStorage = safeParse(this.storageService.get('allExperiments', StorageScope.GLOBAL), []);
+				if (Array.isArray(allExperimentIdsFromStorage)) {
+					allExperimentIdsFromStorage.forEach(experimentId => {
+						const storageKey = 'experiments.' + experimentId;
+						const experimentState: IExperimentStorageState = safeParse(this.storageService.get(storageKey, StorageScope.GLOBAL), null);
+						if (experimentState) {
+							this._experiments.push({
+								id: experimentId,
+								enabled: experimentState.enabled,
+								state: experimentState.state
+							});
+						}
+					});
+				}
+				return TPromise.as(null);
+			}
+
+			// Clear disbaled/deleted experiments from storage
+			const allExperimentIdsFromStorage = safeParse(this.storageService.get('allExperiments', StorageScope.GLOBAL), []);
+			const enabledExperiments = rawExperiments.filter(experiment => !!experiment.enabled).map(experiment => experiment.id.toLowerCase());
+			if (Array.isArray(allExperimentIdsFromStorage)) {
+				allExperimentIdsFromStorage.forEach(experiment => {
+					if (enabledExperiments.indexOf(experiment) === -1) {
+						this.storageService.remove('experiments.' + experiment);
+					}
+				});
+			}
+			this.storageService.store('allExperiments', JSON.stringify(enabledExperiments), StorageScope.GLOBAL);
+
+			const promises = rawExperiments.map(experiment => {
+				const processedExperiment: IExperiment = {
+					id: experiment.id,
+					enabled: !!experiment.enabled,
+					state: !!experiment.enabled ? ExperimentState.Evaluating : ExperimentState.NoRun
+				};
+
+				if (experiment.action) {
+					processedExperiment.action = {
+						type: ExperimentActionType[experiment.action.type] || ExperimentActionType.Custom,
+						properties: experiment.action.properties
+					};
+					if (processedExperiment.action.type === ExperimentActionType.Prompt) {
+						((<IExperimentActionPromptProperties>processedExperiment.action.properties).commands || []).forEach(x => {
+							if (x.curatedExtensionsKey && Array.isArray(x.curatedExtensionsList)) {
+								this._curatedMapping[experiment.id] = x;
+							}
+						});
+					}
+				}
+				this._experiments.push(processedExperiment);
+
+				if (!processedExperiment.enabled) {
+					return TPromise.as(null);
+				}
+
+				const storageKey = 'experiments.' + experiment.id;
+				const experimentState: IExperimentStorageState = safeParse(this.storageService.get(storageKey, StorageScope.GLOBAL), {});
+				if (!experimentState.hasOwnProperty('enabled')) {
+					experimentState.enabled = processedExperiment.enabled;
+				}
+				if (!experimentState.hasOwnProperty('state')) {
+					experimentState.state = processedExperiment.enabled ? ExperimentState.Evaluating : ExperimentState.NoRun;
+				} else {
+					processedExperiment.state = experimentState.state;
+				}
+
+				return this.shouldRunExperiment(experiment, processedExperiment).then((state: ExperimentState) => {
+					experimentState.state = processedExperiment.state = state;
+					this.storageService.store(storageKey, JSON.stringify(experimentState));
+
+					if (state === ExperimentState.Run) {
+						this.fireRunExperiment(processedExperiment);
+					}
+					return TPromise.as(null);
+				});
+
+			});
+			return TPromise.join(promises).then(() => {
+				/* __GDPR__
+					"experiments" : {
+						"experiments" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+					}
+				*/
+				this.telemetryService.publicLog('experiments', { experiments: this._experiments });
+			});
+		});
+	}
+
+	private fireRunExperiment(experiment: IExperiment) {
+		this._onExperimentEnabled.fire(experiment);
+		const runExperimentIdsFromStorage: string[] = safeParse(this.storageService.get('currentOrPreviouslyRunExperiments', StorageScope.GLOBAL), []);
+		if (runExperimentIdsFromStorage.indexOf(experiment.id)) {
+			runExperimentIdsFromStorage.push(experiment.id);
+			this.storageService.store('currentOrPreviouslyRunExperiments', JSON.stringify(runExperimentIdsFromStorage));
+		}
+	}
+
+	private checkExperimentDependencies(experiment: IRawExperiment): boolean {
+		if (experiment.condition.experimentsPreviouslyRun) {
+			const runExperimentIdsFromStorage: string[] = safeParse(this.storageService.get('currentOrPreviouslyRunExperiments', StorageScope.GLOBAL), []);
+			let includeCheck = true;
+			let excludeCheck = true;
+			if (Array.isArray(experiment.condition.experimentsPreviouslyRun.includes)) {
+				includeCheck = runExperimentIdsFromStorage.some(x => experiment.condition.experimentsPreviouslyRun.includes.indexOf(x) > -1);
+			}
+			if (includeCheck && Array.isArray(experiment.condition.experimentsPreviouslyRun.excludes)) {
+				excludeCheck = !runExperimentIdsFromStorage.some(x => experiment.condition.experimentsPreviouslyRun.excludes.indexOf(x) > -1);
+			}
+			if (!includeCheck || !excludeCheck) {
+				return false;
+			}
+		}
+		return true;
+	}
+
+	private shouldRunExperiment(experiment: IRawExperiment, processedExperiment: IExperiment): TPromise<ExperimentState> {
+		if (processedExperiment.state !== ExperimentState.Evaluating) {
+			return TPromise.wrap(processedExperiment.state);
+		}
+
+		if (!experiment.enabled) {
+			return TPromise.wrap(ExperimentState.NoRun);
+		}
+
+		if (!experiment.condition) {
+			return TPromise.wrap(ExperimentState.Run);
+		}
+
+		if (!this.checkExperimentDependencies(experiment)) {
+			return TPromise.wrap(ExperimentState.NoRun);
+		}
+
+		if (this.environmentService.appQuality === 'stable' && experiment.condition.insidersOnly === true) {
+			return TPromise.wrap(ExperimentState.NoRun);
+		}
+
+		if (typeof experiment.condition.displayLanguage === 'string') {
+			let localeToCheck = experiment.condition.displayLanguage.toLowerCase();
+			let displayLanguage = language.toLowerCase();
+
+			if (localeToCheck !== displayLanguage) {
+				const a = displayLanguage.indexOf('-');
+				const b = localeToCheck.indexOf('-');
+				if (a > -1) {
+					displayLanguage = displayLanguage.substr(0, a);
+				}
+				if (b > -1) {
+					localeToCheck = localeToCheck.substr(0, b);
+				}
+				if (displayLanguage !== localeToCheck) {
+					return TPromise.wrap(ExperimentState.NoRun);
+				}
+			}
+		}
+
+		if (!experiment.condition.userProbability) {
+			experiment.condition.userProbability = 1;
+		}
+
+		let extensionsCheckPromise = TPromise.as(true);
+		if (experiment.condition.installedExtensions) {
+			extensionsCheckPromise = this.extensionManagementService.getInstalled(LocalExtensionType.User).then(locals => {
+				let includesCheck = true;
+				let excludesCheck = true;
+				const localExtensions = locals.map(local => `${local.manifest.publisher.toLowerCase()}.${local.manifest.name.toLowerCase()}`);
+				if (Array.isArray(experiment.condition.installedExtensions.includes) && experiment.condition.installedExtensions.includes.length) {
+					const extensionIncludes = experiment.condition.installedExtensions.includes.map(e => e.toLowerCase());
+					includesCheck = localExtensions.some(e => extensionIncludes.indexOf(e) > -1);
+				}
+				if (Array.isArray(experiment.condition.installedExtensions.excludes) && experiment.condition.installedExtensions.excludes.length) {
+					const extensionExcludes = experiment.condition.installedExtensions.excludes.map(e => e.toLowerCase());
+					excludesCheck = !localExtensions.some(e => extensionExcludes.indexOf(e) > -1);
+				}
+				return includesCheck && excludesCheck;
+			});
+		}
+
+		const storageKey = 'experiments.' + experiment.id;
+		const experimentState: IExperimentStorageState = safeParse(this.storageService.get(storageKey, StorageScope.GLOBAL), {});
+
+		return extensionsCheckPromise.then(success => {
+			if (!success || !experiment.condition.fileEdits || typeof experiment.condition.fileEdits.minEditCount !== 'number') {
+				const runExperiment = success && Math.random() < experiment.condition.userProbability;
+				return runExperiment ? ExperimentState.Run : ExperimentState.NoRun;
+			}
+
+			experimentState.editCount = experimentState.editCount || 0;
+			if (experimentState.editCount >= experiment.condition.fileEdits.minEditCount) {
+				return ExperimentState.Run;
+			}
+
+			const onSaveHandler = this.textFileService.models.onModelsSaved(e => {
+				const date = new Date().toDateString();
+				const latestExperimentState: IExperimentStorageState = safeParse(this.storageService.get(storageKey, StorageScope.GLOBAL), {});
+				if (latestExperimentState.state !== ExperimentState.Evaluating) {
+					onSaveHandler.dispose();
+					return;
+				}
+				e.forEach(event => {
+					if (event.kind !== StateChange.SAVED
+						|| latestExperimentState.state !== ExperimentState.Evaluating
+						|| date === latestExperimentState.lastEditedDate
+						|| latestExperimentState.editCount >= experiment.condition.fileEdits.minEditCount) {
+						return;
+					}
+					let filePathCheck = true;
+					let workspaceCheck = true;
+
+					if (typeof experiment.condition.fileEdits.filePathPattern === 'string') {
+						filePathCheck = match(experiment.condition.fileEdits.filePathPattern, event.resource.fsPath);
+					}
+					if (Array.isArray(experiment.condition.fileEdits.workspaceIncludes) && experiment.condition.fileEdits.workspaceIncludes.length) {
+						workspaceCheck = experiment.condition.fileEdits.workspaceIncludes.some(x => !!WorkspaceStats.tags[x]);
+					}
+					if (workspaceCheck && Array.isArray(experiment.condition.fileEdits.workspaceExcludes) && experiment.condition.fileEdits.workspaceExcludes.length) {
+						workspaceCheck = !experiment.condition.fileEdits.workspaceExcludes.some(x => !!WorkspaceStats.tags[x]);
+					}
+					if (filePathCheck && workspaceCheck) {
+						latestExperimentState.editCount = (latestExperimentState.editCount || 0) + 1;
+						latestExperimentState.lastEditedDate = date;
+						this.storageService.store(storageKey, JSON.stringify(latestExperimentState), StorageScope.GLOBAL);
+					}
+				});
+				if (latestExperimentState.editCount >= experiment.condition.fileEdits.minEditCount) {
+					processedExperiment.state = latestExperimentState.state = (Math.random() < experiment.condition.userProbability && this.checkExperimentDependencies(experiment)) ? ExperimentState.Run : ExperimentState.NoRun;
+					this.storageService.store(storageKey, JSON.stringify(latestExperimentState), StorageScope.GLOBAL);
+					if (latestExperimentState.state === ExperimentState.Run && ExperimentActionType[experiment.action.type] === ExperimentActionType.Prompt) {
+						this.fireRunExperiment(processedExperiment);
+					}
+				}
+			});
+			this._disposables.push(onSaveHandler);
+			return ExperimentState.Evaluating;
+		});
+	}
+
+	dispose() {
+		this._disposables = dispose(this._disposables);
+	}
+}
+
+
+function safeParse(text: string, defaultObject: any) {
+	try {
+		return JSON.parse(text) || defaultObject;
+	}
+	catch (e) {
+		return defaultObject;
+	}
+}
diff --git a/src/vs/workbench/parts/experiments/test/electron-browser/experimentalPrompts.test.ts b/src/vs/workbench/parts/experiments/test/electron-browser/experimentalPrompts.test.ts
new file mode 100644
index 00000000000..3edba678b81
--- /dev/null
+++ b/src/vs/workbench/parts/experiments/test/electron-browser/experimentalPrompts.test.ts
@@ -0,0 +1,114 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+import * as assert from 'assert';
+
+import { IExperiment, ExperimentActionType, IExperimentService, ExperimentState } from 'vs/workbench/parts/experiments/node/experimentService';
+
+import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
+import { Emitter } from 'vs/base/common/event';
+import { TestExperimentService } from 'vs/workbench/parts/experiments/test/node/experimentService.test';
+import { ExperimentalPrompts } from 'vs/workbench/parts/experiments/electron-browser/experimentalPrompt';
+import { IStorageService } from 'vs/platform/storage/common/storage';
+import { INotificationService, Severity, IPromptChoice } from 'vs/platform/notification/common/notification';
+import { ILifecycleService } from 'vs/platform/lifecycle/common/lifecycle';
+import { TestLifecycleService } from 'vs/workbench/test/workbenchTestServices';
+import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
+import { NullTelemetryService } from 'vs/platform/telemetry/common/telemetryUtils';
+import { TestNotificationService } from 'vs/platform/notification/test/common/testNotificationService';
+import { TPromise } from 'vs/base/common/winjs.base';
+
+suite('Experimental Prompts', () => {
+	let instantiationService: TestInstantiationService;
+	let experimentService: TestExperimentService;
+	let experimentalPrompt: ExperimentalPrompts;
+	let onExperimentEnabledEvent: Emitter<IExperiment>;
+
+	let storageData = {};
+	const promptText = 'Hello there! Can you see this?';
+	const experiment: IExperiment =
+	{
+		id: 'experiment1',
+		enabled: true,
+		state: ExperimentState.Run,
+		action: {
+			type: ExperimentActionType.Prompt,
+			properties: {
+				promptText,
+				commands: [
+					{
+						text: 'Yes',
+						dontShowAgain: true
+					},
+					{
+						text: 'No'
+					}
+				]
+			}
+		}
+	};
+
+	suiteSetup(() => {
+		instantiationService = new TestInstantiationService();
+
+		instantiationService.stub(ILifecycleService, new TestLifecycleService());
+		instantiationService.stub(ITelemetryService, NullTelemetryService);
+
+		onExperimentEnabledEvent = new Emitter<IExperiment>();
+
+	});
+
+	setup(() => {
+		storageData = {};
+		instantiationService.stub(IStorageService, {
+			get: (a, b, c) => a === 'experiments.experiment1' ? JSON.stringify(storageData) : c,
+			store: (a, b, c) => {
+				if (a === 'experiments.experiment1') {
+					storageData = JSON.parse(b);
+				}
+			}
+		});
+		instantiationService.stub(INotificationService, new TestNotificationService());
+		experimentService = instantiationService.createInstance(TestExperimentService);
+		experimentService.onExperimentEnabled = onExperimentEnabledEvent.event;
+		instantiationService.stub(IExperimentService, experimentService);
+	});
+
+	teardown(() => {
+		if (experimentService) {
+			experimentService.dispose();
+		}
+		if (experimentalPrompt) {
+			experimentalPrompt.dispose();
+		}
+	});
+
+
+	test('Show experimental prompt if experiment should be run. Choosing an option should mark experiment as complete', () => {
+
+		storageData = {
+			enabled: true,
+			state: ExperimentState.Run
+		};
+
+		instantiationService.stub(INotificationService, {
+			prompt: (a: Severity, b: string, c: IPromptChoice[], d) => {
+				assert.equal(b, promptText);
+				assert.equal(c.length, 2);
+				c[0].run();
+			}
+		});
+
+		experimentalPrompt = instantiationService.createInstance(ExperimentalPrompts);
+		onExperimentEnabledEvent.fire(experiment);
+
+		return TPromise.as(null).then(result => {
+			assert.equal(storageData['state'], ExperimentState.Complete);
+		});
+
+	});
+});
\ No newline at end of file
diff --git a/src/vs/workbench/parts/experiments/test/node/experimentService.test.ts b/src/vs/workbench/parts/experiments/test/node/experimentService.test.ts
new file mode 100644
index 00000000000..0d6d97a54f8
--- /dev/null
+++ b/src/vs/workbench/parts/experiments/test/node/experimentService.test.ts
@@ -0,0 +1,713 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+import * as assert from 'assert';
+import { ExperimentService, ExperimentActionType, ExperimentState } from 'vs/workbench/parts/experiments/node/experimentService';
+import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
+import { IStorageService } from 'vs/platform/storage/common/storage';
+import { IEnvironmentService } from 'vs/platform/environment/common/environment';
+import { TestLifecycleService } from 'vs/workbench/test/workbenchTestServices';
+import {
+	IExtensionManagementService, DidInstallExtensionEvent, DidUninstallExtensionEvent, InstallExtensionEvent, IExtensionIdentifier,
+	IExtensionEnablementService, ILocalExtension, LocalExtensionType
+} from 'vs/platform/extensionManagement/common/extensionManagement';
+import { ExtensionManagementService, getLocalExtensionIdFromManifest } from 'vs/platform/extensionManagement/node/extensionManagementService';
+import { Emitter } from 'vs/base/common/event';
+import { TestExtensionEnablementService } from 'vs/platform/extensionManagement/test/common/extensionEnablementService.test';
+import { URLService } from 'vs/platform/url/common/urlService';
+import { IURLService } from 'vs/platform/url/common/url';
+import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
+import { NullTelemetryService } from 'vs/platform/telemetry/common/telemetryUtils';
+import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
+import { ILifecycleService } from 'vs/platform/lifecycle/common/lifecycle';
+import { TPromise } from 'vs/base/common/winjs.base';
+import { assign } from 'vs/base/common/objects';
+import { URI } from 'vs/base/common/uri';
+
+let experimentData = {
+	experiments: []
+};
+
+const local = aLocalExtension('installedExtension1', { version: '1.0.0' });
+
+function aLocalExtension(name: string = 'someext', manifest: any = {}, properties: any = {}): ILocalExtension {
+	const localExtension = <ILocalExtension>Object.create({ manifest: {} });
+	assign(localExtension, { type: LocalExtensionType.User, manifest: {}, location: URI.file(`pub.${name}`) }, properties);
+	assign(localExtension.manifest, { name, publisher: 'pub', version: '1.0.0' }, manifest);
+	localExtension.identifier = { id: getLocalExtensionIdFromManifest(localExtension.manifest) };
+	localExtension.metadata = { id: localExtension.identifier.id, publisherId: localExtension.manifest.publisher, publisherDisplayName: 'somename' };
+	return localExtension;
+}
+
+export class TestExperimentService extends ExperimentService {
+	public getExperiments(): TPromise<any[]> {
+		return TPromise.wrap(experimentData.experiments);
+	}
+}
+
+suite('Experiment Service', () => {
+	let instantiationService: TestInstantiationService;
+	let testConfigurationService: TestConfigurationService;
+	let testObject: ExperimentService;
+	let installEvent: Emitter<InstallExtensionEvent>,
+		didInstallEvent: Emitter<DidInstallExtensionEvent>,
+		uninstallEvent: Emitter<IExtensionIdentifier>,
+		didUninstallEvent: Emitter<DidUninstallExtensionEvent>;
+
+	suiteSetup(() => {
+		instantiationService = new TestInstantiationService();
+		installEvent = new Emitter<InstallExtensionEvent>();
+		didInstallEvent = new Emitter<DidInstallExtensionEvent>();
+		uninstallEvent = new Emitter<IExtensionIdentifier>();
+		didUninstallEvent = new Emitter<DidUninstallExtensionEvent>();
+
+		instantiationService.stub(IExtensionManagementService, ExtensionManagementService);
+		instantiationService.stub(IExtensionManagementService, 'onInstallExtension', installEvent.event);
+		instantiationService.stub(IExtensionManagementService, 'onDidInstallExtension', didInstallEvent.event);
+		instantiationService.stub(IExtensionManagementService, 'onUninstallExtension', uninstallEvent.event);
+		instantiationService.stub(IExtensionManagementService, 'onDidUninstallExtension', didUninstallEvent.event);
+		instantiationService.stub(IExtensionEnablementService, new TestExtensionEnablementService(instantiationService));
+		instantiationService.stub(ITelemetryService, NullTelemetryService);
+		instantiationService.stub(IURLService, URLService);
+		instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [local]);
+		testConfigurationService = new TestConfigurationService();
+		instantiationService.stub(IConfigurationService, testConfigurationService);
+		instantiationService.stub(ILifecycleService, new TestLifecycleService());
+		instantiationService.stub(IStorageService, { get: (a, b, c) => c, getBoolean: (a, b, c) => c, store: () => { } });
+
+		setup(() => {
+			instantiationService.stub(IEnvironmentService, {});
+			instantiationService.stub(IStorageService, { get: (a, b, c) => c, getBoolean: (a, b, c) => c, store: () => { } });
+		});
+
+		teardown(() => {
+			if (testObject) {
+				testObject.dispose();
+			}
+		});
+	});
+
+	test('Simple Experiment Test', () => {
+		experimentData = {
+			experiments: [
+				{
+					id: 'experiment1'
+				},
+				{
+					id: 'experiment2',
+					enabled: false
+				},
+				{
+					id: 'experiment3',
+					enabled: true
+				},
+				{
+					id: 'experiment4',
+					enabled: true,
+					condition: {
+
+					}
+				},
+				{
+					id: 'experiment5',
+					enabled: true,
+					condition: {
+						insidersOnly: true
+					}
+				}
+			]
+		};
+
+		testObject = instantiationService.createInstance(TestExperimentService);
+		const tests = [];
+		tests.push(testObject.getExperimentById('experiment1'));
+		tests.push(testObject.getExperimentById('experiment2'));
+		tests.push(testObject.getExperimentById('experiment3'));
+		tests.push(testObject.getExperimentById('experiment4'));
+		tests.push(testObject.getExperimentById('experiment5'));
+
+		return TPromise.join(tests).then(results => {
+			assert.equal(results[0].id, 'experiment1');
+			assert.equal(results[0].enabled, false);
+			assert.equal(results[0].state, ExperimentState.NoRun);
+
+			assert.equal(results[1].id, 'experiment2');
+			assert.equal(results[1].enabled, false);
+			assert.equal(results[1].state, ExperimentState.NoRun);
+
+			assert.equal(results[2].id, 'experiment3');
+			assert.equal(results[2].enabled, true);
+			assert.equal(results[2].state, ExperimentState.Run);
+
+			assert.equal(results[3].id, 'experiment4');
+			assert.equal(results[3].enabled, true);
+			assert.equal(results[3].state, ExperimentState.Run);
+
+			assert.equal(results[4].id, 'experiment5');
+			assert.equal(results[4].enabled, true);
+			assert.equal(results[4].state, ExperimentState.Run);
+		});
+	});
+
+	test('Insiders only experiment shouldnt be enabled in stable', () => {
+		experimentData = {
+			experiments: [
+				{
+					id: 'experiment1',
+					enabled: true,
+					condition: {
+						insidersOnly: true
+					}
+				}
+			]
+		};
+
+		instantiationService.stub(IEnvironmentService, { appQuality: 'stable' });
+		testObject = instantiationService.createInstance(TestExperimentService);
+		return testObject.getExperimentById('experiment1').then(result => {
+			assert.equal(result.enabled, true);
+			assert.equal(result.state, ExperimentState.NoRun);
+		});
+	});
+
+	test('Experiment with no matching display language should be disabled', () => {
+		experimentData = {
+			experiments: [
+				{
+					id: 'experiment1',
+					enabled: true,
+					condition: {
+						displayLanguage: 'somethingthat-nooneknows'
+					}
+				}
+			]
+		};
+
+		testObject = instantiationService.createInstance(TestExperimentService);
+		return testObject.getExperimentById('experiment1').then(result => {
+			assert.equal(result.enabled, true);
+			assert.equal(result.state, ExperimentState.NoRun);
+		});
+	});
+
+	test('Experiment with condition type InstalledExtensions is enabled when one of the expected extensions is installed', () => {
+		experimentData = {
+			experiments: [
+				{
+					id: 'experiment1',
+					enabled: true,
+					condition: {
+						installedExtensions: {
+							inlcudes: ['pub.installedExtension1', 'uninstalled-extention-id']
+						}
+					}
+				}
+			]
+		};
+
+		testObject = instantiationService.createInstance(TestExperimentService);
+		return testObject.getExperimentById('experiment1').then(result => {
+			assert.equal(result.enabled, true);
+			assert.equal(result.state, ExperimentState.Run);
+		});
+	});
+
+	test('Experiment with condition type InstalledExtensions is disabled when none of the expected extensions is installed', () => {
+		experimentData = {
+			experiments: [
+				{
+					id: 'experiment1',
+					enabled: true,
+					condition: {
+						installedExtensions: {
+							includes: ['uninstalled-extention-id1', 'uninstalled-extention-id2']
+						}
+					}
+				}
+			]
+		};
+
+		testObject = instantiationService.createInstance(TestExperimentService);
+		return testObject.getExperimentById('experiment1').then(result => {
+			assert.equal(result.enabled, true);
+			assert.equal(result.state, ExperimentState.NoRun);
+		});
+	});
+
+	test('Experiment with condition type InstalledExtensions is disabled when one of the exlcuded extensions is installed', () => {
+		experimentData = {
+			experiments: [
+				{
+					id: 'experiment1',
+					enabled: true,
+					condition: {
+						installedExtensions: {
+							excludes: ['pub.installedExtension1', 'uninstalled-extention-id2']
+						}
+					}
+				}
+			]
+		};
+
+		testObject = instantiationService.createInstance(TestExperimentService);
+		return testObject.getExperimentById('experiment1').then(result => {
+			assert.equal(result.enabled, true);
+			assert.equal(result.state, ExperimentState.NoRun);
+		});
+	});
+
+	test('Experiment that is marked as complete should be disabled regardless of the conditions', () => {
+		experimentData = {
+			experiments: [
+				{
+					id: 'experiment1',
+					enabled: true,
+					condition: {
+						installedExtensions: {
+							includes: ['pub.installedExtension1', 'uninstalled-extention-id2']
+						}
+					}
+				}
+			]
+		};
+
+		instantiationService.stub(IStorageService, {
+			get: (a, b, c) => a === 'experiments.experiment1' ? JSON.stringify({ state: ExperimentState.Complete }) : c,
+			store: (a, b, c) => { }
+		});
+
+		testObject = instantiationService.createInstance(TestExperimentService);
+		return testObject.getExperimentById('experiment1').then(result => {
+			assert.equal(result.enabled, true);
+			assert.equal(result.state, ExperimentState.Complete);
+		});
+	});
+
+	test('Experiment with evaluate only once should read enablement from storage service', () => {
+		experimentData = {
+			experiments: [
+				{
+					id: 'experiment1',
+					enabled: true,
+					condition: {
+						installedExtensions: {
+							excludes: ['pub.installedExtension1', 'uninstalled-extention-id2']
+						},
+						evaluateOnlyOnce: true
+					}
+				}
+			]
+		};
+
+		instantiationService.stub(IStorageService, {
+			get: (a, b, c) => a === 'experiments.experiment1' ? JSON.stringify({ enabled: true, state: ExperimentState.Run }) : c,
+			store: (a, b, c) => { }
+		});
+		testObject = instantiationService.createInstance(TestExperimentService);
+		return testObject.getExperimentById('experiment1').then(result => {
+			assert.equal(result.enabled, true);
+			assert.equal(result.state, ExperimentState.Run);
+		});
+	});
+
+	test('Curated list should be available if experiment is enabled.', () => {
+		const promptText = 'Hello there! Can you see this?';
+		const curatedExtensionsKey = 'AzureDeploy';
+		const curatedExtensionsList = ['uninstalled-extention-id1', 'uninstalled-extention-id2'];
+		experimentData = {
+			experiments: [
+				{
+					id: 'experiment1',
+					enabled: true,
+					action: {
+						type: 'Prompt',
+						properties: {
+							promptText,
+							commands: [
+								{
+									text: 'Search Marketplace',
+									dontShowAgain: true,
+									curatedExtensionsKey,
+									curatedExtensionsList
+								},
+								{
+									text: 'No'
+								}
+							]
+						}
+					}
+				}
+			]
+		};
+
+		testObject = instantiationService.createInstance(TestExperimentService);
+		return testObject.getExperimentById('experiment1').then(result => {
+			assert.equal(result.enabled, true);
+			assert.equal(result.state, ExperimentState.Run);
+			return testObject.getCuratedExtensionsList(curatedExtensionsKey).then(curatedList => {
+				assert.equal(curatedList, curatedExtensionsList);
+			});
+		});
+	});
+
+	test('Curated list shouldnt be available if experiment is disabled.', () => {
+		const promptText = 'Hello there! Can you see this?';
+		const curatedExtensionsKey = 'AzureDeploy';
+		const curatedExtensionsList = ['uninstalled-extention-id1', 'uninstalled-extention-id2'];
+		experimentData = {
+			experiments: [
+				{
+					id: 'experiment1',
+					enabled: false,
+					action: {
+						type: 'Prompt',
+						properties: {
+							promptText,
+							commands: [
+								{
+									text: 'Search Marketplace',
+									dontShowAgain: true,
+									curatedExtensionsKey,
+									curatedExtensionsList
+								},
+								{
+									text: 'No'
+								}
+							]
+						}
+					}
+				}
+			]
+		};
+
+		testObject = instantiationService.createInstance(TestExperimentService);
+		return testObject.getExperimentById('experiment1').then(result => {
+			assert.equal(result.enabled, false);
+			assert.equal(result.state, ExperimentState.NoRun);
+			return testObject.getCuratedExtensionsList(curatedExtensionsKey).then(curatedList => {
+				assert.equal(curatedList.length, 0);
+			});
+		});
+	});
+
+	test('Experiment that is disabled or deleted should be removed from storage', () => {
+		experimentData = {
+			experiments: [
+				{
+					id: 'experiment1',
+					enabled: false
+				},
+				{
+					id: 'experiment3',
+					enabled: true
+				}
+			]
+		};
+
+		let storageDataExperiment1 = { enabled: false };
+		let storageDataExperiment2 = { enabled: false };
+		let storageDataAllExperiments = ['experiment1', 'experiment2', 'experiment3'];
+		instantiationService.stub(IStorageService, {
+			get: (a, b, c) => {
+				switch (a) {
+					case 'experiments.experiment1':
+						return JSON.stringify(storageDataExperiment1);
+					case 'experiments.experiment2':
+						return JSON.stringify(storageDataExperiment2);
+					case 'allExperiments':
+						return JSON.stringify(storageDataAllExperiments);
+					default:
+						break;
+				}
+				return c;
+			},
+			store: (a, b, c) => {
+				switch (a) {
+					case 'experiments.experiment1':
+						storageDataExperiment1 = JSON.parse(b);
+						break;
+					case 'experiments.experiment2':
+						storageDataExperiment2 = JSON.parse(b);
+						break;
+					case 'allExperiments':
+						storageDataAllExperiments = JSON.parse(b);
+						break;
+					default:
+						break;
+				}
+			},
+			remove: a => {
+				switch (a) {
+					case 'experiments.experiment1':
+						storageDataExperiment1 = null;
+						break;
+					case 'experiments.experiment2':
+						storageDataExperiment2 = null;
+						break;
+					case 'allExperiments':
+						storageDataAllExperiments = null;
+						break;
+					default:
+						break;
+				}
+			}
+		});
+
+		testObject = instantiationService.createInstance(TestExperimentService);
+		const disabledExperiment = testObject.getExperimentById('experiment1').then(result => {
+			assert.equal(result.enabled, false);
+			assert.equal(!!storageDataExperiment1, false);
+		});
+		const deletedExperiment = testObject.getExperimentById('experiment2').then(result => {
+			assert.equal(!!result, false);
+			assert.equal(!!storageDataExperiment2, false);
+		});
+		return TPromise.join([disabledExperiment, deletedExperiment]).then(() => {
+			assert.equal(storageDataAllExperiments.length, 1);
+			assert.equal(storageDataAllExperiments[0], 'experiment3');
+		});
+
+	});
+
+	test('Offline mode', () => {
+		experimentData = {
+			experiments: null
+		};
+
+		let storageDataExperiment1 = { enabled: true, state: ExperimentState.Run };
+		let storageDataExperiment2 = { enabled: true, state: ExperimentState.NoRun };
+		let storageDataExperiment3 = { enabled: true, state: ExperimentState.Evaluating };
+		let storageDataExperiment4 = { enabled: true, state: ExperimentState.Complete };
+		let storageDataAllExperiments = ['experiment1', 'experiment2', 'experiment3', 'experiment4'];
+		instantiationService.stub(IStorageService, {
+			get: (a, b, c) => {
+				switch (a) {
+					case 'experiments.experiment1':
+						return JSON.stringify(storageDataExperiment1);
+					case 'experiments.experiment2':
+						return JSON.stringify(storageDataExperiment2);
+					case 'experiments.experiment3':
+						return JSON.stringify(storageDataExperiment3);
+					case 'experiments.experiment4':
+						return JSON.stringify(storageDataExperiment4);
+					case 'allExperiments':
+						return JSON.stringify(storageDataAllExperiments);
+					default:
+						break;
+				}
+				return c;
+			},
+			store: (a, b, c) => {
+				switch (a) {
+					case 'experiments.experiment1':
+						storageDataExperiment1 = JSON.parse(b);
+						break;
+					case 'experiments.experiment2':
+						storageDataExperiment2 = JSON.parse(b);
+						break;
+					case 'experiments.experiment3':
+						storageDataExperiment3 = JSON.parse(b);
+						break;
+					case 'experiments.experiment4':
+						storageDataExperiment4 = JSON.parse(b);
+						break;
+					case 'allExperiments':
+						storageDataAllExperiments = JSON.parse(b);
+						break;
+					default:
+						break;
+				}
+			},
+			remove: a => {
+				switch (a) {
+					case 'experiments.experiment1':
+						storageDataExperiment1 = null;
+						break;
+					case 'experiments.experiment2':
+						storageDataExperiment2 = null;
+						break;
+					case 'experiments.experiment3':
+						storageDataExperiment3 = null;
+						break;
+					case 'experiments.experiment4':
+						storageDataExperiment4 = null;
+						break;
+					case 'allExperiments':
+						storageDataAllExperiments = null;
+						break;
+					default:
+						break;
+				}
+			}
+		});
+
+		testObject = instantiationService.createInstance(TestExperimentService);
+
+		const tests = [];
+		tests.push(testObject.getExperimentById('experiment1'));
+		tests.push(testObject.getExperimentById('experiment2'));
+		tests.push(testObject.getExperimentById('experiment3'));
+		tests.push(testObject.getExperimentById('experiment4'));
+
+		return TPromise.join(tests).then(results => {
+			assert.equal(results[0].id, 'experiment1');
+			assert.equal(results[0].enabled, true);
+			assert.equal(results[0].state, ExperimentState.Run);
+
+			assert.equal(results[1].id, 'experiment2');
+			assert.equal(results[1].enabled, true);
+			assert.equal(results[1].state, ExperimentState.NoRun);
+
+			assert.equal(results[2].id, 'experiment3');
+			assert.equal(results[2].enabled, true);
+			assert.equal(results[2].state, ExperimentState.Evaluating);
+
+			assert.equal(results[3].id, 'experiment4');
+			assert.equal(results[3].enabled, true);
+			assert.equal(results[3].state, ExperimentState.Complete);
+		});
+
+	});
+
+	test('getExperimentByType', () => {
+		const customProperties = {
+			some: 'random-value'
+		};
+		experimentData = {
+			experiments: [
+				{
+					id: 'simple-experiment',
+					enabled: true
+				},
+				{
+					id: 'custom-experiment',
+					enabled: true,
+					action: {
+						type: 'Custom',
+						properties: customProperties
+					}
+				},
+				{
+					id: 'prompt-with-no-commands',
+					enabled: true,
+					action: {
+						type: 'Prompt',
+						properties: {
+							promptText: 'someText'
+						}
+					}
+				},
+				{
+					id: 'prompt-with-commands',
+					enabled: true,
+					action: {
+						type: 'Prompt',
+						properties: {
+							promptText: 'someText',
+							commands: [
+								{
+									text: 'Hello'
+								}
+							]
+						}
+					}
+				}
+			]
+		};
+
+		testObject = instantiationService.createInstance(TestExperimentService);
+		const custom = testObject.getExperimentsByType(ExperimentActionType.Custom).then(result => {
+			assert.equal(result.length, 2);
+			assert.equal(result[0].id, 'simple-experiment');
+			assert.equal(result[1].id, 'custom-experiment');
+		});
+		const prompt = testObject.getExperimentsByType(ExperimentActionType.Prompt).then(result => {
+			assert.equal(result.length, 2);
+			assert.equal(result[0].id, 'prompt-with-no-commands');
+			assert.equal(result[1].id, 'prompt-with-commands');
+		});
+		return TPromise.join([custom, prompt]);
+	});
+
+	test('experimentsPreviouslyRun includes, excludes check', () => {
+		experimentData = {
+			experiments: [
+				{
+					id: 'experiment3',
+					enabled: true,
+					condition: {
+						experimentsPreviouslyRun: {
+							includes: ['experiment1'],
+							excludes: ['experiment2']
+						}
+					}
+				},
+				{
+					id: 'experiment4',
+					enabled: true,
+					condition: {
+						experimentsPreviouslyRun: {
+							includes: ['experiment1'],
+							excludes: ['experiment200']
+						}
+					}
+				}
+			]
+		};
+
+		let storageDataExperiment3 = { enabled: true, state: ExperimentState.Evaluating };
+		let storageDataExperiment4 = { enabled: true, state: ExperimentState.Evaluating };
+		instantiationService.stub(IStorageService, {
+			get: (a, b, c) => {
+				switch (a) {
+					case 'currentOrPreviouslyRunExperiments':
+						return JSON.stringify(['experiment1', 'experiment2']);
+					default:
+						break;
+				}
+				return c;
+			},
+			store: (a, b, c) => {
+				switch (a) {
+					case 'experiments.experiment3':
+						storageDataExperiment3 = JSON.parse(b);
+						break;
+					case 'experiments.experiment4':
+						storageDataExperiment4 = JSON.parse(b);
+						break;
+					default:
+						break;
+				}
+			}
+		});
+
+		testObject = instantiationService.createInstance(TestExperimentService);
+		return testObject.getExperimentsByType(ExperimentActionType.Custom).then(result => {
+			assert.equal(result.length, 2);
+			assert.equal(result[0].id, 'experiment3');
+			assert.equal(result[0].state, ExperimentState.NoRun);
+			assert.equal(result[1].id, 'experiment4');
+			assert.equal(result[1].state, ExperimentState.Run);
+			assert.equal(storageDataExperiment3.state, ExperimentState.NoRun);
+			assert.equal(storageDataExperiment4.state, ExperimentState.Run);
+			return TPromise.as(null);
+		});
+	});
+	// test('Experiment with condition type FileEdit should increment editcount as appropriate', () => {
+
+	// });
+
+	// test('Experiment with condition type WorkspaceEdit should increment editcount as appropriate', () => {
+
+	// });
+
+
+
+});
+
+
diff --git a/src/vs/workbench/parts/extensions/browser/dependenciesViewer.ts b/src/vs/workbench/parts/extensions/browser/dependenciesViewer.ts
deleted file mode 100644
index 0e0c2715ee8..00000000000
--- a/src/vs/workbench/parts/extensions/browser/dependenciesViewer.ts
+++ /dev/null
@@ -1,216 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import * as dom from 'vs/base/browser/dom';
-import { localize } from 'vs/nls';
-import { IMouseEvent } from 'vs/base/browser/mouseEvent';
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
-import { TPromise, Promise } from 'vs/base/common/winjs.base';
-import { IDataSource, ITree, IRenderer } from 'vs/base/parts/tree/browser/tree';
-import { Action } from 'vs/base/common/actions';
-import { IExtensionDependencies, IExtensionsWorkbenchService } from 'vs/workbench/parts/extensions/common/extensions';
-import { once } from 'vs/base/common/event';
-import { domEvent } from 'vs/base/browser/event';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { KeyMod, KeyCode } from 'vs/base/common/keyCodes';
-import { WorkbenchTreeController } from 'vs/platform/list/browser/listService';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-
-export interface IExtensionTemplateData {
-	icon: HTMLImageElement;
-	name: HTMLElement;
-	identifier: HTMLElement;
-	author: HTMLElement;
-	extensionDisposables: IDisposable[];
-	extensionDependencies: IExtensionDependencies;
-}
-
-export interface IUnknownExtensionTemplateData {
-	identifier: HTMLElement;
-}
-
-export class DataSource implements IDataSource {
-
-	public getId(tree: ITree, element: IExtensionDependencies): string {
-		let id = element.identifier;
-		this.getParent(tree, element).then(parent => {
-			id = parent ? this.getId(tree, parent) + '/' + id : id;
-		});
-		return id;
-	}
-
-	public hasChildren(tree: ITree, element: IExtensionDependencies): boolean {
-		return element.hasDependencies;
-	}
-
-	public getChildren(tree: ITree, element: IExtensionDependencies): Promise {
-		return TPromise.as(element.dependencies);
-	}
-
-	public getParent(tree: ITree, element: IExtensionDependencies): Promise {
-		return TPromise.as(element.dependent);
-	}
-}
-
-export class Renderer implements IRenderer {
-
-	private static readonly EXTENSION_TEMPLATE_ID = 'extension-template';
-	private static readonly UNKNOWN_EXTENSION_TEMPLATE_ID = 'unknown-extension-template';
-
-	constructor(@IInstantiationService private instantiationService: IInstantiationService) {
-	}
-
-	public getHeight(tree: ITree, element: IExtensionDependencies): number {
-		return 62;
-	}
-
-	public getTemplateId(tree: ITree, element: IExtensionDependencies): string {
-		return element.extension ? Renderer.EXTENSION_TEMPLATE_ID : Renderer.UNKNOWN_EXTENSION_TEMPLATE_ID;
-	}
-
-	public renderTemplate(tree: ITree, templateId: string, container: HTMLElement): any {
-		if (Renderer.EXTENSION_TEMPLATE_ID === templateId) {
-			return this.renderExtensionTemplate(tree, container);
-		}
-		return this.renderUnknownExtensionTemplate(tree, container);
-	}
-
-	private renderExtensionTemplate(tree: ITree, container: HTMLElement): IExtensionTemplateData {
-		dom.addClass(container, 'dependency');
-
-		const icon = dom.append(container, dom.$<HTMLImageElement>('img.icon'));
-		const details = dom.append(container, dom.$('.details'));
-
-		const header = dom.append(details, dom.$('.header'));
-		const name = dom.append(header, dom.$('span.name'));
-		const openExtensionAction = this.instantiationService.createInstance(OpenExtensionAction);
-		const extensionDisposables = [dom.addDisposableListener(name, 'click', (e: MouseEvent) => {
-			tree.setFocus(openExtensionAction.extensionDependencies);
-			tree.setSelection([openExtensionAction.extensionDependencies]);
-			openExtensionAction.run(e.ctrlKey || e.metaKey);
-			e.stopPropagation();
-			e.preventDefault();
-		})];
-		const identifier = dom.append(header, dom.$('span.identifier'));
-
-		const footer = dom.append(details, dom.$('.footer'));
-		const author = dom.append(footer, dom.$('.author'));
-		return {
-			icon,
-			name,
-			identifier,
-			author,
-			extensionDisposables,
-			set extensionDependencies(e: IExtensionDependencies) {
-				openExtensionAction.extensionDependencies = e;
-			}
-		};
-	}
-
-	private renderUnknownExtensionTemplate(tree: ITree, container: HTMLElement): IUnknownExtensionTemplateData {
-		const messageContainer = dom.append(container, dom.$('div.unknown-dependency'));
-		dom.append(messageContainer, dom.$('span.error-marker')).textContent = localize('error', "Error");
-		dom.append(messageContainer, dom.$('span.message')).textContent = localize('Unknown Dependency', "Unknown Dependency:");
-
-		const identifier = dom.append(messageContainer, dom.$('span.message'));
-		return { identifier };
-	}
-
-	public renderElement(tree: ITree, element: IExtensionDependencies, templateId: string, templateData: any): void {
-		if (templateId === Renderer.EXTENSION_TEMPLATE_ID) {
-			this.renderExtension(tree, element, templateData);
-			return;
-		}
-		this.renderUnknownExtension(tree, element, templateData);
-	}
-
-	private renderExtension(tree: ITree, element: IExtensionDependencies, data: IExtensionTemplateData): void {
-		const extension = element.extension;
-
-		const onError = once(domEvent(data.icon, 'error'));
-		onError(() => data.icon.src = extension.iconUrlFallback, null, data.extensionDisposables);
-		data.icon.src = extension.iconUrl;
-
-		if (!data.icon.complete) {
-			data.icon.style.visibility = 'hidden';
-			data.icon.onload = () => data.icon.style.visibility = 'inherit';
-		} else {
-			data.icon.style.visibility = 'inherit';
-		}
-
-		data.name.textContent = extension.displayName;
-		data.identifier.textContent = extension.id;
-		data.author.textContent = extension.publisherDisplayName;
-		data.extensionDependencies = element;
-	}
-
-	private renderUnknownExtension(tree: ITree, element: IExtensionDependencies, data: IUnknownExtensionTemplateData): void {
-		data.identifier.textContent = element.identifier;
-	}
-
-	public disposeTemplate(tree: ITree, templateId: string, templateData: any): void {
-		if (templateId === Renderer.EXTENSION_TEMPLATE_ID) {
-			templateData.extensionDisposables = dispose((<IExtensionTemplateData>templateData).extensionDisposables);
-		}
-	}
-}
-
-export class Controller extends WorkbenchTreeController {
-
-	constructor(
-		@IExtensionsWorkbenchService private extensionsWorkdbenchService: IExtensionsWorkbenchService,
-		@IConfigurationService configurationService: IConfigurationService
-	) {
-		super({}, configurationService);
-
-		// TODO@Sandeep this should be a command
-		this.downKeyBindingDispatcher.set(KeyMod.CtrlCmd | KeyCode.Enter, (tree: ITree, event: any) => this.openExtension(tree, true));
-	}
-
-	protected onLeftClick(tree: ITree, element: IExtensionDependencies, event: IMouseEvent): boolean {
-		let currentFocused = tree.getFocus();
-		if (super.onLeftClick(tree, element, event)) {
-			if (element.dependent === null) {
-				if (currentFocused) {
-					tree.setFocus(currentFocused);
-				} else {
-					tree.focusFirst();
-				}
-				return true;
-			}
-		}
-		return false;
-	}
-
-	public openExtension(tree: ITree, sideByside: boolean): boolean {
-		const element: IExtensionDependencies = tree.getFocus();
-		if (element.extension) {
-			this.extensionsWorkdbenchService.open(element.extension, sideByside);
-			return true;
-		}
-		return false;
-	}
-}
-
-class OpenExtensionAction extends Action {
-
-	private _extensionDependencies: IExtensionDependencies;
-
-	constructor(@IExtensionsWorkbenchService private extensionsWorkdbenchService: IExtensionsWorkbenchService) {
-		super('extensions.action.openDependency', '');
-	}
-
-	public set extensionDependencies(extensionDependencies: IExtensionDependencies) {
-		this._extensionDependencies = extensionDependencies;
-	}
-
-	public get extensionDependencies(): IExtensionDependencies {
-		return this._extensionDependencies;
-	}
-
-	run(sideByside: boolean): TPromise<any> {
-		return this.extensionsWorkdbenchService.open(this._extensionDependencies.extension, sideByside);
-	}
-}
\ No newline at end of file
diff --git a/src/vs/workbench/parts/extensions/browser/extensionsActions.ts b/src/vs/workbench/parts/extensions/browser/extensionsActions.ts
deleted file mode 100644
index 6688b1125d7..00000000000
--- a/src/vs/workbench/parts/extensions/browser/extensionsActions.ts
+++ /dev/null
@@ -1,2053 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import 'vs/css!./media/extensionActions';
-import { localize } from 'vs/nls';
-import { TPromise } from 'vs/base/common/winjs.base';
-import { IAction, Action } from 'vs/base/common/actions';
-import { Throttler } from 'vs/base/common/async';
-import * as DOM from 'vs/base/browser/dom';
-import * as paths from 'vs/base/common/paths';
-import { Event } from 'vs/base/common/event';
-import * as json from 'vs/base/common/json';
-import { ActionItem, IActionItem, Separator } from 'vs/base/browser/ui/actionbar/actionbar';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { IDisposable, dispose, Disposable } from 'vs/base/common/lifecycle';
-import { IExtension, ExtensionState, IExtensionsWorkbenchService, VIEWLET_ID, IExtensionsViewlet, AutoUpdateConfigurationKey } from 'vs/workbench/parts/extensions/common/extensions';
-import { ExtensionsConfigurationInitialContent } from 'vs/workbench/parts/extensions/common/extensionsFileTemplate';
-import { LocalExtensionType, IExtensionEnablementService, IExtensionTipsService, EnablementState, ExtensionsLabel } from 'vs/platform/extensionManagement/common/extensionManagement';
-import { areSameExtensions } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
-import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { ToggleViewletAction } from 'vs/workbench/browser/viewlet';
-import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet';
-import { Query } from 'vs/workbench/parts/extensions/common/extensionQuery';
-import { IFileService, IContent } from 'vs/platform/files/common/files';
-import { IWorkspaceContextService, WorkbenchState, IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
-import { IWindowService, IWindowsService } from 'vs/platform/windows/common/windows';
-import { IExtensionService, IExtensionDescription } from 'vs/workbench/services/extensions/common/extensions';
-import URI from 'vs/base/common/uri';
-import { CommandsRegistry, ICommandService } from 'vs/platform/commands/common/commands';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { registerThemingParticipant, ITheme, ICssStyleCollector } from 'vs/platform/theme/common/themeService';
-import { buttonBackground, buttonForeground, buttonHoverBackground, contrastBorder, registerColor, foreground } from 'vs/platform/theme/common/colorRegistry';
-import { Color } from 'vs/base/common/color';
-import { IJSONEditingService } from 'vs/workbench/services/configuration/common/jsonEditing';
-import { ITextEditorSelection } from 'vs/platform/editor/common/editor';
-import { ITextModelService } from 'vs/editor/common/services/resolverService';
-import { PagedModel } from 'vs/base/common/paging';
-import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
-import { IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { MenuRegistry, MenuId } from 'vs/platform/actions/common/actions';
-import { PICK_WORKSPACE_FOLDER_COMMAND_ID } from 'vs/workbench/browser/actions/workspaceCommands';
-import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { mnemonicButtonLabel } from 'vs/base/common/labels';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { IQuickOpenService, IPickOpenEntry } from 'vs/platform/quickOpen/common/quickOpen';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { IEditorGroupsService } from 'vs/workbench/services/group/common/editorGroupsService';
-
-const promptDownloadManually = (extension: IExtension, message: string, instantiationService: IInstantiationService, notificationService: INotificationService, openerService: IOpenerService) => {
-	notificationService.prompt(Severity.Error, message, [{
-		label: localize('download', "Download Manually"),
-		run: () => openerService.open(URI.parse(extension.downloadUrl)).then(() => {
-			notificationService.prompt(
-				Severity.Info,
-				localize('install vsix', 'Once downloaded, please manually install the downloaded VSIX of \'{0}\'.', extension.id),
-				[{
-					label: InstallVSIXAction.LABEL,
-					run: () => {
-						const action = instantiationService.createInstance(InstallVSIXAction, InstallVSIXAction.ID, InstallVSIXAction.LABEL);
-						action.run();
-						action.dispose();
-					}
-				}]
-			);
-		})
-	}]);
-};
-
-export class InstallAction extends Action {
-
-	private static readonly InstallLabel = localize('installAction', "Install");
-	private static readonly InstallingLabel = localize('installing', "Installing");
-
-	private static readonly Class = 'extension-action prominent install';
-	private static readonly InstallingClass = 'extension-action install installing';
-
-	private disposables: IDisposable[] = [];
-	private _extension: IExtension;
-	get extension(): IExtension { return this._extension; }
-	set extension(extension: IExtension) { this._extension = extension; this.update(); }
-
-	constructor(
-		@IExtensionsWorkbenchService private extensionsWorkbenchService: IExtensionsWorkbenchService,
-		@IInstantiationService private instantiationService: IInstantiationService,
-		@INotificationService private notificationService: INotificationService,
-		@IOpenerService private openerService: IOpenerService
-	) {
-		super('extensions.install', InstallAction.InstallLabel, InstallAction.Class, false);
-
-		this.disposables.push(this.extensionsWorkbenchService.onChange(() => this.update()));
-		this.update();
-	}
-
-	private update(): void {
-		if (!this.extension || this.extension.type === LocalExtensionType.System) {
-			this.enabled = false;
-			this.class = InstallAction.Class;
-			this.label = InstallAction.InstallLabel;
-			return;
-		}
-
-		this.enabled = this.extensionsWorkbenchService.canInstall(this.extension) && this.extension.state === ExtensionState.Uninstalled;
-
-		if (this.extension.state === ExtensionState.Installing) {
-			this.label = InstallAction.InstallingLabel;
-			this.class = InstallAction.InstallingClass;
-			this.tooltip = InstallAction.InstallingLabel;
-		} else {
-			this.label = InstallAction.InstallLabel;
-			this.class = InstallAction.Class;
-			this.tooltip = InstallAction.InstallLabel;
-		}
-	}
-
-	run(): TPromise<any> {
-		this.extensionsWorkbenchService.open(this.extension);
-
-		return this.install(this.extension);
-	}
-
-	private install(extension: IExtension): TPromise<void> {
-		return this.extensionsWorkbenchService.install(extension).then(null, err => {
-			if (!extension.downloadUrl) {
-				return this.notificationService.error(err);
-			}
-
-			console.error(err);
-
-			promptDownloadManually(extension, localize('failedToInstall', "Failed to install \'{0}\'.", extension.id), this.instantiationService, this.notificationService, this.openerService);
-		});
-	}
-
-	dispose(): void {
-		super.dispose();
-		this.disposables = dispose(this.disposables);
-	}
-}
-
-export class UninstallAction extends Action {
-
-	private static readonly UninstallLabel = localize('uninstallAction', "Uninstall");
-	private static readonly UninstallingLabel = localize('Uninstalling', "Uninstalling");
-
-	private static readonly UninstallClass = 'extension-action uninstall';
-	private static readonly UnInstallingClass = 'extension-action uninstall uninstalling';
-
-	private disposables: IDisposable[] = [];
-	private _extension: IExtension;
-	get extension(): IExtension { return this._extension; }
-	set extension(extension: IExtension) { this._extension = extension; this.update(); }
-
-	constructor(
-		@IExtensionsWorkbenchService private extensionsWorkbenchService: IExtensionsWorkbenchService
-	) {
-		super('extensions.uninstall', UninstallAction.UninstallLabel, UninstallAction.UninstallClass, false);
-
-		this.disposables.push(this.extensionsWorkbenchService.onChange(() => this.update()));
-		this.update();
-	}
-
-	private update(): void {
-		if (!this.extension) {
-			this.enabled = false;
-			return;
-		}
-
-		const state = this.extension.state;
-
-		if (state === ExtensionState.Uninstalling) {
-			this.label = UninstallAction.UninstallingLabel;
-			this.class = UninstallAction.UnInstallingClass;
-			this.enabled = false;
-			return;
-		}
-
-		this.label = UninstallAction.UninstallLabel;
-		this.class = UninstallAction.UninstallClass;
-
-		const installedExtensions = this.extensionsWorkbenchService.local.filter(e => e.id === this.extension.id);
-
-		if (!installedExtensions.length) {
-			this.enabled = false;
-			return;
-		}
-
-		if (installedExtensions[0].type !== LocalExtensionType.User) {
-			this.enabled = false;
-			return;
-		}
-
-		this.enabled = true;
-	}
-
-	run(): TPromise<any> {
-		return this.extensionsWorkbenchService.uninstall(this.extension);
-	}
-
-	dispose(): void {
-		super.dispose();
-		this.disposables = dispose(this.disposables);
-	}
-}
-
-export class CombinedInstallAction extends Action {
-
-	private static readonly NoExtensionClass = 'extension-action prominent install no-extension';
-	private installAction: InstallAction;
-	private uninstallAction: UninstallAction;
-	private disposables: IDisposable[] = [];
-	private _extension: IExtension;
-	get extension(): IExtension { return this._extension; }
-	set extension(extension: IExtension) {
-		this._extension = extension;
-		this.installAction.extension = extension;
-		this.uninstallAction.extension = extension;
-	}
-
-	constructor(
-		@IInstantiationService instantiationService: IInstantiationService
-	) {
-		super('extensions.combinedInstall', '', '', false);
-
-		this.installAction = instantiationService.createInstance(InstallAction);
-		this.uninstallAction = instantiationService.createInstance(UninstallAction);
-		this.disposables.push(this.installAction, this.uninstallAction);
-
-		this.installAction.onDidChange(this.update, this, this.disposables);
-		this.uninstallAction.onDidChange(this.update, this, this.disposables);
-		this.update();
-	}
-
-	private update(): void {
-		if (!this.extension || this.extension.type === LocalExtensionType.System) {
-			this.enabled = false;
-			this.class = CombinedInstallAction.NoExtensionClass;
-		} else if (this.installAction.enabled) {
-			this.enabled = true;
-			this.label = this.installAction.label;
-			this.class = this.installAction.class;
-			this.tooltip = this.installAction.tooltip;
-		} else if (this.uninstallAction.enabled) {
-			this.enabled = true;
-			this.label = this.uninstallAction.label;
-			this.class = this.uninstallAction.class;
-			this.tooltip = this.uninstallAction.tooltip;
-		} else if (this.extension.state === ExtensionState.Installing) {
-			this.enabled = false;
-			this.label = this.installAction.label;
-			this.class = this.installAction.class;
-			this.tooltip = this.installAction.tooltip;
-		} else if (this.extension.state === ExtensionState.Uninstalling) {
-			this.enabled = false;
-			this.label = this.uninstallAction.label;
-			this.class = this.uninstallAction.class;
-			this.tooltip = this.uninstallAction.tooltip;
-		} else {
-			this.enabled = false;
-			this.label = this.installAction.label;
-			this.class = this.installAction.class;
-			this.tooltip = this.installAction.tooltip;
-		}
-	}
-
-	run(): TPromise<any> {
-		if (this.installAction.enabled) {
-			return this.installAction.run();
-		} else if (this.uninstallAction.enabled) {
-			return this.uninstallAction.run();
-		}
-
-		return TPromise.as(null);
-	}
-
-	dispose(): void {
-		super.dispose();
-		this.disposables = dispose(this.disposables);
-	}
-}
-
-export class UpdateAction extends Action {
-
-	private static readonly EnabledClass = 'extension-action prominent update';
-	private static readonly DisabledClass = `${UpdateAction.EnabledClass} disabled`;
-	private static readonly Label = localize('updateAction', "Update");
-
-	private disposables: IDisposable[] = [];
-	private _extension: IExtension;
-	get extension(): IExtension { return this._extension; }
-	set extension(extension: IExtension) { this._extension = extension; this.update(); }
-
-	constructor(
-		@IExtensionsWorkbenchService private extensionsWorkbenchService: IExtensionsWorkbenchService,
-		@IInstantiationService private instantiationService: IInstantiationService,
-		@INotificationService private notificationService: INotificationService,
-		@IOpenerService private openerService: IOpenerService
-	) {
-		super('extensions.update', UpdateAction.Label, UpdateAction.DisabledClass, false);
-
-		this.disposables.push(this.extensionsWorkbenchService.onChange(() => this.update()));
-		this.update();
-	}
-
-	private update(): void {
-		if (!this.extension) {
-			this.enabled = false;
-			this.class = UpdateAction.DisabledClass;
-			this.label = UpdateAction.Label;
-			return;
-		}
-
-		if (this.extension.type !== LocalExtensionType.User) {
-			this.enabled = false;
-			this.class = UpdateAction.DisabledClass;
-			this.label = UpdateAction.Label;
-			return;
-		}
-
-		const canInstall = this.extensionsWorkbenchService.canInstall(this.extension);
-		const isInstalled = this.extension.state === ExtensionState.Installed;
-
-		this.enabled = canInstall && isInstalled && this.extension.outdated;
-		this.class = this.enabled ? UpdateAction.EnabledClass : UpdateAction.DisabledClass;
-		this.label = localize('updateTo', "Update to {0}", this.extension.latestVersion);
-	}
-
-	run(): TPromise<any> {
-		return this.install(this.extension);
-	}
-
-	private install(extension: IExtension): TPromise<void> {
-		return this.extensionsWorkbenchService.install(extension).then(null, err => {
-			if (!extension.downloadUrl) {
-				return this.notificationService.error(err);
-			}
-
-			console.error(err);
-
-			promptDownloadManually(extension, localize('failedToUpdate', "Failed to update \'{0}\'.", extension.id), this.instantiationService, this.notificationService, this.openerService);
-		});
-	}
-
-	dispose(): void {
-		super.dispose();
-		this.disposables = dispose(this.disposables);
-	}
-}
-
-export interface IExtensionAction extends IAction {
-	extension: IExtension;
-}
-
-export class DropDownMenuActionItem extends ActionItem {
-
-	private disposables: IDisposable[] = [];
-	private _extension: IExtension;
-
-	constructor(action: IAction, private menuActionGroups: IExtensionAction[][],
-		@IContextMenuService private contextMenuService: IContextMenuService
-	) {
-		super(null, action, { icon: true, label: true });
-		for (const menuActions of menuActionGroups) {
-			this.disposables = [...this.disposables, ...menuActions];
-		}
-	}
-
-	get extension(): IExtension { return this._extension; }
-
-	set extension(extension: IExtension) {
-		this._extension = extension;
-		for (const menuActions of this.menuActionGroups) {
-			for (const menuAction of menuActions) {
-				menuAction.extension = extension;
-			}
-		}
-	}
-
-	public showMenu(): void {
-		const actions = this.getActions();
-		let elementPosition = DOM.getDomNodePagePosition(this.builder.getHTMLElement());
-		const anchor = { x: elementPosition.left, y: elementPosition.top + elementPosition.height + 10 };
-		this.contextMenuService.showContextMenu({
-			getAnchor: () => anchor,
-			getActions: () => TPromise.wrap(actions),
-			actionRunner: this.actionRunner
-		});
-	}
-
-	private getActions(): IAction[] {
-		let actions: IAction[] = [];
-		const menuActionGroups = this.menuActionGroups;
-		for (const menuActions of menuActionGroups) {
-			actions = [...actions, ...menuActions, new Separator()];
-		}
-		return actions.length ? actions.slice(0, actions.length - 1) : actions;
-	}
-
-	dispose(): void {
-		super.dispose();
-		this.disposables = dispose(this.disposables);
-	}
-}
-
-export class ManageExtensionAction extends Action {
-
-	static readonly ID = 'extensions.manage';
-
-	private static readonly Class = 'extension-action manage';
-	private static readonly HideManageExtensionClass = `${ManageExtensionAction.Class} hide`;
-
-	private _actionItem: DropDownMenuActionItem;
-	get actionItem(): IActionItem { return this._actionItem; }
-
-	private disposables: IDisposable[] = [];
-	private _extension: IExtension;
-	get extension(): IExtension { return this._extension; }
-	set extension(extension: IExtension) { this._extension = extension; this._actionItem.extension = extension; this.update(); }
-
-	constructor(
-		@IExtensionsWorkbenchService private extensionsWorkbenchService: IExtensionsWorkbenchService,
-		@IInstantiationService private instantiationService: IInstantiationService
-	) {
-		super(ManageExtensionAction.ID);
-
-		this._actionItem = this.instantiationService.createInstance(DropDownMenuActionItem, this, [
-			[
-				instantiationService.createInstance(EnableGloballyAction, EnableGloballyAction.LABEL),
-				instantiationService.createInstance(EnableForWorkspaceAction, EnableForWorkspaceAction.LABEL)
-			],
-			[
-				instantiationService.createInstance(DisableGloballyAction, DisableGloballyAction.LABEL),
-				instantiationService.createInstance(DisableForWorkspaceAction, DisableForWorkspaceAction.LABEL)
-			],
-			[
-				instantiationService.createInstance(UninstallAction)
-			]
-		]);
-		this.disposables.push(this._actionItem);
-
-		this.disposables.push(this.extensionsWorkbenchService.onChange(() => this.update()));
-		this.update();
-	}
-
-	private update(): void {
-		this.class = ManageExtensionAction.HideManageExtensionClass;
-		this.tooltip = '';
-		this.enabled = false;
-		if (this.extension) {
-			const state = this.extension.state;
-			this.enabled = state === ExtensionState.Installed;
-			this.class = this.enabled || state === ExtensionState.Uninstalling ? ManageExtensionAction.Class : ManageExtensionAction.HideManageExtensionClass;
-			this.tooltip = state === ExtensionState.Uninstalling ? localize('ManageExtensionAction.uninstallingTooltip', "Uninstalling") : '';
-		}
-	}
-
-	public run(): TPromise<any> {
-		this._actionItem.showMenu();
-		return TPromise.wrap(null);
-	}
-
-	dispose(): void {
-		super.dispose();
-		this.disposables = dispose(this.disposables);
-	}
-}
-
-export class EnableForWorkspaceAction extends Action implements IExtensionAction {
-
-	static readonly ID = 'extensions.enableForWorkspace';
-	static LABEL = localize('enableForWorkspaceAction', "Enable (Workspace)");
-
-	private disposables: IDisposable[] = [];
-
-	private _extension: IExtension;
-	get extension(): IExtension { return this._extension; }
-	set extension(extension: IExtension) { this._extension = extension; this.update(); }
-
-	constructor(label: string,
-		@IWorkspaceContextService private workspaceContextService: IWorkspaceContextService,
-		@IExtensionsWorkbenchService private extensionsWorkbenchService: IExtensionsWorkbenchService,
-		@IExtensionEnablementService private extensionEnablementService: IExtensionEnablementService
-	) {
-		super(EnableForWorkspaceAction.ID, label);
-
-		this.disposables.push(this.extensionsWorkbenchService.onChange(() => this.update()));
-		this.disposables.push(this.workspaceContextService.onDidChangeWorkbenchState(() => this.update()));
-		this.update();
-	}
-
-	private update(): void {
-		this.enabled = false;
-		if (this.extension) {
-			this.enabled = (this.extension.enablementState === EnablementState.Disabled || this.extension.enablementState === EnablementState.WorkspaceDisabled) && this.extension.local && this.extensionEnablementService.canChangeEnablement(this.extension.local);
-		}
-	}
-
-	run(): TPromise<any> {
-		return this.extensionsWorkbenchService.setEnablement(this.extension, EnablementState.WorkspaceEnabled);
-	}
-
-	dispose(): void {
-		super.dispose();
-		this.disposables = dispose(this.disposables);
-	}
-}
-
-export class EnableGloballyAction extends Action implements IExtensionAction {
-
-	static readonly ID = 'extensions.enableGlobally';
-	static LABEL = localize('enableGloballyAction', "Enable");
-
-	private disposables: IDisposable[] = [];
-
-	private _extension: IExtension;
-	get extension(): IExtension { return this._extension; }
-	set extension(extension: IExtension) { this._extension = extension; this.update(); }
-
-	constructor(label: string,
-		@IExtensionsWorkbenchService private extensionsWorkbenchService: IExtensionsWorkbenchService,
-		@IExtensionEnablementService private extensionEnablementService: IExtensionEnablementService
-	) {
-		super(EnableGloballyAction.ID, label);
-
-		this.disposables.push(this.extensionsWorkbenchService.onChange(() => this.update()));
-		this.update();
-	}
-
-	private update(): void {
-		this.enabled = false;
-		if (this.extension) {
-			this.enabled = (this.extension.enablementState === EnablementState.Disabled || this.extension.enablementState === EnablementState.WorkspaceDisabled) && this.extension.local && this.extensionEnablementService.canChangeEnablement(this.extension.local);
-		}
-	}
-
-	run(): TPromise<any> {
-		return this.extensionsWorkbenchService.setEnablement(this.extension, EnablementState.Enabled);
-	}
-
-	dispose(): void {
-		super.dispose();
-		this.disposables = dispose(this.disposables);
-	}
-}
-
-export class EnableAction extends Action {
-
-	static readonly ID = 'extensions.enable';
-	private static readonly EnabledClass = 'extension-action prominent enable';
-	private static readonly DisabledClass = `${EnableAction.EnabledClass} disabled`;
-
-	private disposables: IDisposable[] = [];
-
-	private _enableActions: IExtensionAction[];
-
-	private _actionItem: DropDownMenuActionItem;
-	get actionItem(): IActionItem { return this._actionItem; }
-
-	private _extension: IExtension;
-	get extension(): IExtension { return this._extension; }
-	set extension(extension: IExtension) { this._extension = extension; this._actionItem.extension = extension; this.update(); }
-
-
-	constructor(
-		@IInstantiationService private instantiationService: IInstantiationService,
-		@IExtensionsWorkbenchService private extensionsWorkbenchService: IExtensionsWorkbenchService
-	) {
-		super(EnableAction.ID, localize('enableAction', "Enable"), EnableAction.DisabledClass, false);
-
-		this._enableActions = [
-			instantiationService.createInstance(EnableGloballyAction, EnableGloballyAction.LABEL),
-			instantiationService.createInstance(EnableForWorkspaceAction, EnableForWorkspaceAction.LABEL)
-		];
-		this._actionItem = this.instantiationService.createInstance(DropDownMenuActionItem, this, [this._enableActions]);
-		this.disposables.push(this._actionItem);
-
-		this.disposables.push(this.extensionsWorkbenchService.onChange(() => this.update()));
-		this.update();
-	}
-
-	private update(): void {
-		if (!this.extension) {
-			this.enabled = false;
-			this.class = EnableAction.DisabledClass;
-			return;
-		}
-
-		this.enabled = this.extension.state === ExtensionState.Installed && this._enableActions.some(e => e.enabled);
-		this.class = this.enabled ? EnableAction.EnabledClass : EnableAction.DisabledClass;
-	}
-
-	public run(): TPromise<any> {
-		this._actionItem.showMenu();
-		return TPromise.wrap(null);
-	}
-
-	dispose(): void {
-		super.dispose();
-		this.disposables = dispose(this.disposables);
-	}
-
-}
-
-export class DisableForWorkspaceAction extends Action implements IExtensionAction {
-
-	static readonly ID = 'extensions.disableForWorkspace';
-	static LABEL = localize('disableForWorkspaceAction', "Disable (Workspace)");
-
-	private disposables: IDisposable[] = [];
-
-	private _extension: IExtension;
-	get extension(): IExtension { return this._extension; }
-	set extension(extension: IExtension) { this._extension = extension; this.update(); }
-
-	constructor(label: string,
-		@IWorkspaceContextService private workspaceContextService: IWorkspaceContextService,
-		@IExtensionsWorkbenchService private extensionsWorkbenchService: IExtensionsWorkbenchService,
-		@IExtensionEnablementService private extensionEnablementService: IExtensionEnablementService
-	) {
-		super(DisableForWorkspaceAction.ID, label);
-
-		this.disposables.push(this.extensionsWorkbenchService.onChange(() => this.update()));
-		this.update();
-		this.workspaceContextService.onDidChangeWorkbenchState(() => this.update(), this, this.disposables);
-	}
-
-	private update(): void {
-		this.enabled = false;
-		if (this.extension && this.workspaceContextService.getWorkbenchState() !== WorkbenchState.EMPTY) {
-			this.enabled = (this.extension.enablementState === EnablementState.Enabled || this.extension.enablementState === EnablementState.WorkspaceEnabled) && this.extension.local && this.extensionEnablementService.canChangeEnablement(this.extension.local);
-		}
-	}
-
-	run(): TPromise<any> {
-		return this.extensionsWorkbenchService.setEnablement(this.extension, EnablementState.WorkspaceDisabled);
-	}
-
-	dispose(): void {
-		super.dispose();
-		this.disposables = dispose(this.disposables);
-	}
-}
-
-export class DisableGloballyAction extends Action implements IExtensionAction {
-
-	static readonly ID = 'extensions.disableGlobally';
-	static LABEL = localize('disableGloballyAction', "Disable");
-
-	private disposables: IDisposable[] = [];
-
-	private _extension: IExtension;
-	get extension(): IExtension { return this._extension; }
-	set extension(extension: IExtension) { this._extension = extension; this.update(); }
-
-	constructor(label: string,
-		@IExtensionsWorkbenchService private extensionsWorkbenchService: IExtensionsWorkbenchService,
-		@IExtensionEnablementService private extensionEnablementService: IExtensionEnablementService
-	) {
-		super(DisableGloballyAction.ID, label);
-
-		this.disposables.push(this.extensionsWorkbenchService.onChange(() => this.update()));
-		this.update();
-	}
-
-	private update(): void {
-		this.enabled = false;
-		if (this.extension) {
-			this.enabled = (this.extension.enablementState === EnablementState.Enabled || this.extension.enablementState === EnablementState.WorkspaceEnabled) && this.extension.local && this.extensionEnablementService.canChangeEnablement(this.extension.local);
-		}
-	}
-
-	run(): TPromise<any> {
-		return this.extensionsWorkbenchService.setEnablement(this.extension, EnablementState.Disabled);
-	}
-
-	dispose(): void {
-		super.dispose();
-		this.disposables = dispose(this.disposables);
-	}
-}
-
-export class DisableAction extends Action {
-
-	static readonly ID = 'extensions.disable';
-
-	private static readonly EnabledClass = 'extension-action disable';
-	private static readonly DisabledClass = `${DisableAction.EnabledClass} disabled`;
-
-	private disposables: IDisposable[] = [];
-	private _disableActions: IExtensionAction[];
-	private _actionItem: DropDownMenuActionItem;
-	get actionItem(): IActionItem { return this._actionItem; }
-
-	private _extension: IExtension;
-	get extension(): IExtension { return this._extension; }
-	set extension(extension: IExtension) { this._extension = extension; this._actionItem.extension = extension; this.update(); }
-
-
-	constructor(
-		@IInstantiationService private instantiationService: IInstantiationService,
-		@IExtensionsWorkbenchService private extensionsWorkbenchService: IExtensionsWorkbenchService,
-	) {
-		super(DisableAction.ID, localize('disableAction', "Disable"), DisableAction.DisabledClass, false);
-		this._disableActions = [
-			instantiationService.createInstance(DisableGloballyAction, DisableGloballyAction.LABEL),
-			instantiationService.createInstance(DisableForWorkspaceAction, DisableForWorkspaceAction.LABEL)
-		];
-		this._actionItem = this.instantiationService.createInstance(DropDownMenuActionItem, this, [this._disableActions]);
-		this.disposables.push(this._actionItem);
-
-		this.disposables.push(this.extensionsWorkbenchService.onChange(() => this.update()));
-		this.update();
-	}
-
-	private update(): void {
-		if (!this.extension) {
-			this.enabled = false;
-			this.class = DisableAction.DisabledClass;
-			return;
-		}
-
-		this.enabled = this.extension.state === ExtensionState.Installed && this._disableActions.some(a => a.enabled);
-		this.class = this.enabled ? DisableAction.EnabledClass : DisableAction.DisabledClass;
-	}
-
-	public run(): TPromise<any> {
-		this._actionItem.showMenu();
-		return TPromise.wrap(null);
-	}
-
-	dispose(): void {
-		super.dispose();
-		this.disposables = dispose(this.disposables);
-	}
-}
-
-export class CheckForUpdatesAction extends Action {
-
-	static readonly ID = 'workbench.extensions.action.checkForUpdates';
-	static LABEL = localize('checkForUpdates', "Check for Updates");
-
-	constructor(
-		id = UpdateAllAction.ID,
-		label = UpdateAllAction.LABEL,
-		@IExtensionsWorkbenchService private extensionsWorkbenchService: IExtensionsWorkbenchService
-	) {
-		super(id, label, '', true);
-	}
-
-	run(): TPromise<any> {
-		return this.extensionsWorkbenchService.checkForUpdates();
-	}
-}
-
-export class ToggleAutoUpdateAction extends Action {
-
-	constructor(
-		id: string,
-		label: string,
-		private autoUpdateValue: boolean,
-		@IConfigurationService private configurationService: IConfigurationService
-	) {
-		super(id, label, '', true);
-		this.updateEnablement();
-		configurationService.onDidChangeConfiguration(() => this.updateEnablement());
-	}
-
-	private updateEnablement(): void {
-		this.enabled = this.configurationService.getValue(AutoUpdateConfigurationKey) !== this.autoUpdateValue;
-	}
-
-	run(): TPromise<any> {
-		return this.configurationService.updateValue(AutoUpdateConfigurationKey, this.autoUpdateValue);
-	}
-}
-
-export class EnableAutoUpdateAction extends ToggleAutoUpdateAction {
-
-	static readonly ID = 'workbench.extensions.action.enableAutoUpdate';
-	static LABEL = localize('enableAutoUpdate', "Enable Auto Updating Extensions");
-
-	constructor(
-		id = EnableAutoUpdateAction.ID,
-		label = EnableAutoUpdateAction.LABEL,
-		@IConfigurationService configurationService: IConfigurationService
-	) {
-		super(id, label, true, configurationService);
-	}
-}
-
-export class DisableAutoUpdateAction extends ToggleAutoUpdateAction {
-
-	static readonly ID = 'workbench.extensions.action.disableAutoUpdate';
-	static LABEL = localize('disableAutoUpdate', "Disable Auto Updating Extensions");
-
-	constructor(
-		id = EnableAutoUpdateAction.ID,
-		label = EnableAutoUpdateAction.LABEL,
-		@IConfigurationService configurationService: IConfigurationService
-	) {
-		super(id, label, false, configurationService);
-	}
-}
-
-export class UpdateAllAction extends Action {
-
-	static readonly ID = 'workbench.extensions.action.updateAllExtensions';
-	static LABEL = localize('updateAll', "Update All Extensions");
-
-	private disposables: IDisposable[] = [];
-
-	constructor(
-		id = UpdateAllAction.ID,
-		label = UpdateAllAction.LABEL,
-		@IExtensionsWorkbenchService private extensionsWorkbenchService: IExtensionsWorkbenchService,
-		@INotificationService private notificationService: INotificationService,
-		@IInstantiationService private instantiationService: IInstantiationService,
-		@IOpenerService private openerService: IOpenerService
-	) {
-		super(id, label, '', false);
-
-		this.disposables.push(this.extensionsWorkbenchService.onChange(() => this.update()));
-		this.update();
-	}
-
-	private get outdated(): IExtension[] {
-		return this.extensionsWorkbenchService.local.filter(e => e.outdated && e.state !== ExtensionState.Installing);
-	}
-
-	private update(): void {
-		this.enabled = this.outdated.length > 0;
-	}
-
-	run(): TPromise<any> {
-		return TPromise.join(this.outdated.map(e => this.install(e)));
-	}
-
-	private install(extension: IExtension): TPromise<void> {
-		return this.extensionsWorkbenchService.install(extension).then(null, err => {
-			if (!extension.downloadUrl) {
-				return this.notificationService.error(err);
-			}
-
-			console.error(err);
-
-			promptDownloadManually(extension, localize('failedToUpdate', "Failed to update \'{0}\'.", extension.id), this.instantiationService, this.notificationService, this.openerService);
-		});
-	}
-
-	dispose(): void {
-		super.dispose();
-		this.disposables = dispose(this.disposables);
-	}
-}
-
-export class ReloadAction extends Action {
-
-	private static readonly EnabledClass = 'extension-action reload';
-	private static readonly DisabledClass = `${ReloadAction.EnabledClass} disabled`;
-
-	private disposables: IDisposable[] = [];
-	private _extension: IExtension;
-	get extension(): IExtension { return this._extension; }
-	set extension(extension: IExtension) { this._extension = extension; this.update(); }
-
-	reloadMessage: string = '';
-	private throttler: Throttler;
-
-	constructor(
-		@IExtensionsWorkbenchService private extensionsWorkbenchService: IExtensionsWorkbenchService,
-		@IWindowService private windowService: IWindowService,
-		@IExtensionService private extensionService: IExtensionService,
-		@IExtensionEnablementService private extensionEnablementService: IExtensionEnablementService,
-	) {
-		super('extensions.reload', localize('reloadAction', "Reload"), ReloadAction.DisabledClass, false);
-		this.throttler = new Throttler();
-
-		this.disposables.push(this.extensionsWorkbenchService.onChange(() => this.update()));
-		this.update();
-	}
-
-	private update(): void {
-		this.throttler.queue(() => {
-			this.enabled = false;
-			this.tooltip = '';
-			this.reloadMessage = '';
-			if (!this.extension) {
-				return TPromise.wrap<void>(null);
-			}
-			const state = this.extension.state;
-			if (state === ExtensionState.Installing || state === ExtensionState.Uninstalling) {
-				return TPromise.wrap<void>(null);
-			}
-			return this.extensionService.getExtensions()
-				.then(runningExtensions => this.computeReloadState(runningExtensions));
-		}).done(() => {
-			this.class = this.enabled ? ReloadAction.EnabledClass : ReloadAction.DisabledClass;
-		});
-	}
-
-	private computeReloadState(runningExtensions: IExtensionDescription[]): void {
-		const isInstalled = this.extensionsWorkbenchService.local.some(e => e.id === this.extension.id);
-		const isUninstalled = this.extension.state === ExtensionState.Uninstalled;
-		const isDisabled = this.extension.local ? !this.extensionEnablementService.isEnabled(this.extension.local) : false;
-
-		const filteredExtensions = runningExtensions.filter(e => areSameExtensions(e, this.extension));
-		const isExtensionRunning = filteredExtensions.length > 0;
-		const isDifferentVersionRunning = filteredExtensions.length > 0 && this.extension.version !== filteredExtensions[0].version;
-
-		if (isInstalled) {
-			if (isDifferentVersionRunning && !isDisabled) {
-				// Requires reload to run the updated extension
-				this.enabled = true;
-				this.tooltip = localize('postUpdateTooltip', "Reload to update");
-				this.reloadMessage = localize('postUpdateMessage', "Reload this window to activate the updated extension '{0}'?", this.extension.displayName);
-				return;
-			}
-
-			if (!isExtensionRunning && !isDisabled) {
-				// Requires reload to enable the extension
-				this.enabled = true;
-				this.tooltip = localize('postEnableTooltip', "Reload to activate");
-				this.reloadMessage = localize('postEnableMessage', "Reload this window to activate the extension '{0}'?", this.extension.displayName);
-				return;
-			}
-
-			if (isExtensionRunning && isDisabled) {
-				// Requires reload to disable the extension
-				this.enabled = true;
-				this.tooltip = localize('postDisableTooltip', "Reload to deactivate");
-				this.reloadMessage = localize('postDisableMessage', "Reload this window to deactivate the extension '{0}'?", this.extension.displayName);
-				return;
-			}
-			return;
-		}
-
-		if (isUninstalled && isExtensionRunning) {
-			// Requires reload to deactivate the extension
-			this.enabled = true;
-			this.tooltip = localize('postUninstallTooltip', "Reload to deactivate");
-			this.reloadMessage = localize('postUninstallMessage', "Reload this window to deactivate the uninstalled extension '{0}'?", this.extension.displayName);
-			return;
-		}
-	}
-
-	run(): TPromise<any> {
-		return this.windowService.reloadWindow();
-	}
-}
-
-export class OpenExtensionsViewletAction extends ToggleViewletAction {
-
-	static ID = VIEWLET_ID;
-	static LABEL = localize('toggleExtensionsViewlet', "Show Extensions");
-
-	constructor(
-		id: string,
-		label: string,
-		@IViewletService viewletService: IViewletService,
-		@IEditorGroupsService editorGroupService: IEditorGroupsService
-	) {
-		super(id, label, VIEWLET_ID, viewletService, editorGroupService);
-	}
-}
-
-export class InstallExtensionsAction extends OpenExtensionsViewletAction {
-	static ID = 'workbench.extensions.action.installExtensions';
-	static LABEL = localize('installExtensions', "Install Extensions");
-}
-
-export class ShowEnabledExtensionsAction extends Action {
-
-	static readonly ID = 'workbench.extensions.action.showEnabledExtensions';
-	static LABEL = localize('showEnabledExtensions', 'Show Enabled Extensions');
-
-	constructor(
-		id: string,
-		label: string,
-		@IViewletService private viewletService: IViewletService
-	) {
-		super(id, label, 'clear-extensions', true);
-	}
-
-	run(): TPromise<void> {
-		return this.viewletService.openViewlet(VIEWLET_ID, true)
-			.then(viewlet => viewlet as IExtensionsViewlet)
-			.then(viewlet => {
-				viewlet.search('@enabled ');
-				viewlet.focus();
-			});
-	}
-}
-
-export class ShowInstalledExtensionsAction extends Action {
-
-	static readonly ID = 'workbench.extensions.action.showInstalledExtensions';
-	static LABEL = localize('showInstalledExtensions', "Show Installed Extensions");
-
-	constructor(
-		id: string,
-		label: string,
-		@IViewletService private viewletService: IViewletService
-	) {
-		super(id, label, 'clear-extensions', true);
-	}
-
-	run(): TPromise<void> {
-		return this.viewletService.openViewlet(VIEWLET_ID, true)
-			.then(viewlet => viewlet as IExtensionsViewlet)
-			.then(viewlet => {
-				viewlet.search('@installed ');
-				viewlet.focus();
-			});
-	}
-}
-
-export class ShowDisabledExtensionsAction extends Action {
-
-	static readonly ID = 'workbench.extensions.action.showDisabledExtensions';
-	static LABEL = localize('showDisabledExtensions', "Show Disabled Extensions");
-
-	constructor(
-		id: string,
-		label: string,
-		@IViewletService private viewletService: IViewletService
-	) {
-		super(id, label, 'null', true);
-	}
-
-	run(): TPromise<void> {
-		return this.viewletService.openViewlet(VIEWLET_ID, true)
-			.then(viewlet => viewlet as IExtensionsViewlet)
-			.then(viewlet => {
-				viewlet.search('@disabled ');
-				viewlet.focus();
-			});
-	}
-}
-
-export class ClearExtensionsInputAction extends Action {
-
-	static readonly ID = 'workbench.extensions.action.clearExtensionsInput';
-	static LABEL = localize('clearExtensionsInput', "Clear Extensions Input");
-
-	private disposables: IDisposable[] = [];
-
-	constructor(
-		id: string,
-		label: string,
-		onSearchChange: Event<string>,
-		@IViewletService private viewletService: IViewletService
-	) {
-		super(id, label, 'clear-extensions', true);
-		this.enabled = false;
-		onSearchChange(this.onSearchChange, this, this.disposables);
-	}
-
-	private onSearchChange(value: string): void {
-		this.enabled = !!value;
-	}
-
-	run(): TPromise<void> {
-		return this.viewletService.openViewlet(VIEWLET_ID, true)
-			.then(viewlet => viewlet as IExtensionsViewlet)
-			.then(viewlet => {
-				viewlet.search('');
-				viewlet.focus();
-			});
-	}
-
-	dispose(): void {
-		this.disposables = dispose(this.disposables);
-	}
-}
-
-export class ShowBuiltInExtensionsAction extends Action {
-
-	static readonly ID = 'workbench.extensions.action.listBuiltInExtensions';
-	static LABEL = localize('showBuiltInExtensions', "Show Built-in Extensions");
-
-	constructor(
-		id: string,
-		label: string,
-		@IViewletService private viewletService: IViewletService
-	) {
-		super(id, label, null, true);
-	}
-
-	run(): TPromise<void> {
-		return this.viewletService.openViewlet(VIEWLET_ID, true)
-			.then(viewlet => viewlet as IExtensionsViewlet)
-			.then(viewlet => {
-				viewlet.search('@builtin ');
-				viewlet.focus();
-			});
-	}
-}
-
-export class ShowOutdatedExtensionsAction extends Action {
-
-	static readonly ID = 'workbench.extensions.action.listOutdatedExtensions';
-	static LABEL = localize('showOutdatedExtensions', "Show Outdated Extensions");
-
-	constructor(
-		id: string,
-		label: string,
-		@IViewletService private viewletService: IViewletService
-	) {
-		super(id, label, null, true);
-	}
-
-	run(): TPromise<void> {
-		return this.viewletService.openViewlet(VIEWLET_ID, true)
-			.then(viewlet => viewlet as IExtensionsViewlet)
-			.then(viewlet => {
-				viewlet.search('@outdated ');
-				viewlet.focus();
-			});
-	}
-}
-
-export class ShowPopularExtensionsAction extends Action {
-
-	static readonly ID = 'workbench.extensions.action.showPopularExtensions';
-	static LABEL = localize('showPopularExtensions', "Show Popular Extensions");
-
-	constructor(
-		id: string,
-		label: string,
-		@IViewletService private viewletService: IViewletService
-	) {
-		super(id, label, null, true);
-	}
-
-	run(): TPromise<void> {
-		return this.viewletService.openViewlet(VIEWLET_ID, true)
-			.then(viewlet => viewlet as IExtensionsViewlet)
-			.then(viewlet => {
-				viewlet.search('@sort:installs ');
-				viewlet.focus();
-			});
-	}
-}
-
-export class ShowRecommendedExtensionsAction extends Action {
-
-	static readonly ID = 'workbench.extensions.action.showRecommendedExtensions';
-	static LABEL = localize('showRecommendedExtensions', "Show Recommended Extensions");
-
-	constructor(
-		id: string,
-		label: string,
-		@IViewletService private viewletService: IViewletService
-	) {
-		super(id, label, null, true);
-	}
-
-	run(): TPromise<void> {
-		return this.viewletService.openViewlet(VIEWLET_ID, true)
-			.then(viewlet => viewlet as IExtensionsViewlet)
-			.then(viewlet => {
-				viewlet.search('@recommended ');
-				viewlet.focus();
-			});
-	}
-}
-
-export class InstallWorkspaceRecommendedExtensionsAction extends Action {
-
-	static readonly ID = 'workbench.extensions.action.installWorkspaceRecommendedExtensions';
-	static LABEL = localize('installWorkspaceRecommendedExtensions', "Install All Workspace Recommended Extensions");
-
-	private disposables: IDisposable[] = [];
-
-	constructor(
-		id: string = InstallWorkspaceRecommendedExtensionsAction.ID,
-		label: string = InstallWorkspaceRecommendedExtensionsAction.LABEL,
-		@IWorkspaceContextService private contextService: IWorkspaceContextService,
-		@IViewletService private viewletService: IViewletService,
-		@IExtensionsWorkbenchService private extensionsWorkbenchService: IExtensionsWorkbenchService,
-		@IExtensionTipsService private extensionTipsService: IExtensionTipsService,
-		@INotificationService private notificationService: INotificationService,
-		@IInstantiationService private instantiationService: IInstantiationService,
-		@IOpenerService private openerService: IOpenerService
-	) {
-		super(id, label, 'extension-action');
-		this.extensionsWorkbenchService.onChange(() => this.update(), this, this.disposables);
-		this.contextService.onDidChangeWorkbenchState(() => this.update(), this, this.disposables);
-	}
-
-	private update(): void {
-		this.enabled = this.contextService.getWorkbenchState() !== WorkbenchState.EMPTY;
-		if (this.enabled) {
-			this.extensionTipsService.getWorkspaceRecommendations().then(names => {
-				const installed = this.extensionsWorkbenchService.local.map(x => x.id.toLowerCase());
-				this.enabled = names.some(x => installed.indexOf(x.toLowerCase()) === -1);
-			});
-		}
-	}
-
-	run(): TPromise<any> {
-		return this.extensionTipsService.getWorkspaceRecommendations().then(names => {
-			const installed = this.extensionsWorkbenchService.local.map(x => x.id.toLowerCase());
-			const toInstall = names.filter(x => installed.indexOf(x.toLowerCase()) === -1);
-
-			return this.viewletService.openViewlet(VIEWLET_ID, true)
-				.then(viewlet => viewlet as IExtensionsViewlet)
-				.then(viewlet => {
-					if (!toInstall.length) {
-						this.enabled = false;
-						this.notificationService.info(localize('allExtensionsInstalled', "All extensions recommended for this workspace have already been installed"));
-						viewlet.focus();
-						return TPromise.as(null);
-					}
-
-					viewlet.search('@recommended ');
-					viewlet.focus();
-
-					return this.extensionsWorkbenchService.queryGallery({ names: toInstall, source: 'install-all-workspace-recommendations' }).then(pager => {
-						let installPromises = [];
-						let model = new PagedModel(pager);
-						let extensionsWithDependencies = [];
-						for (let i = 0; i < pager.total; i++) {
-							installPromises.push(model.resolve(i).then(e => {
-								if (e.dependencies && e.dependencies.length > 0) {
-									extensionsWithDependencies.push(e);
-									return TPromise.as(null);
-								} else {
-									return this.install(e);
-								}
-							}));
-						}
-						return TPromise.join(installPromises).then(() => {
-							return TPromise.join(extensionsWithDependencies.map(e => this.install(e)));
-						});
-					});
-				});
-		});
-	}
-
-	private install(extension: IExtension): TPromise<void> {
-		return this.extensionsWorkbenchService.install(extension).then(null, err => {
-			if (!extension.downloadUrl) {
-				return this.notificationService.error(err);
-			}
-
-			console.error(err);
-
-			promptDownloadManually(extension, localize('failedToInstall', "Failed to install \'{0}\'.", extension.id), this.instantiationService, this.notificationService, this.openerService);
-		});
-	}
-
-	dispose(): void {
-		this.disposables = dispose(this.disposables);
-		super.dispose();
-	}
-}
-
-export class InstallRecommendedExtensionAction extends Action {
-
-	static readonly ID = 'workbench.extensions.action.installRecommendedExtension';
-	static LABEL = localize('installRecommendedExtension', "Install Recommended Extension");
-
-	private extensionId: string;
-	private disposables: IDisposable[] = [];
-
-	constructor(
-		extensionId: string,
-		@IViewletService private viewletService: IViewletService,
-		@IExtensionsWorkbenchService private extensionsWorkbenchService: IExtensionsWorkbenchService,
-		@INotificationService private notificationService: INotificationService,
-		@IInstantiationService private instantiationService: IInstantiationService,
-		@IOpenerService private openerService: IOpenerService
-	) {
-		super(InstallRecommendedExtensionAction.ID, InstallRecommendedExtensionAction.LABEL, null);
-		this.extensionId = extensionId;
-		this.extensionsWorkbenchService.onChange(() => this.update(), this, this.disposables);
-	}
-
-	private update(): void {
-		this.enabled = !this.extensionsWorkbenchService.local.some(x => x.id.toLowerCase() === this.extensionId.toLowerCase());
-	}
-
-	run(): TPromise<any> {
-		return this.viewletService.openViewlet(VIEWLET_ID, true)
-			.then(viewlet => viewlet as IExtensionsViewlet)
-			.then(viewlet => {
-				if (this.extensionsWorkbenchService.local.some(x => x.id.toLowerCase() === this.extensionId.toLowerCase())) {
-					this.enabled = false;
-					this.notificationService.info(localize('extensionInstalled', "The recommended extension has already been installed"));
-					viewlet.focus();
-					return TPromise.as(null);
-				}
-
-				viewlet.search('@recommended ');
-				viewlet.focus();
-
-				return this.extensionsWorkbenchService.queryGallery({ names: [this.extensionId], source: 'install-recommendation' }).then(pager => {
-					return (pager && pager.firstPage && pager.firstPage.length) ? this.install(pager.firstPage[0]) : TPromise.as(null);
-				});
-			});
-	}
-
-	private install(extension: IExtension): TPromise<void> {
-		return this.extensionsWorkbenchService.install(extension).then(null, err => {
-			if (!extension.downloadUrl) {
-				return this.notificationService.error(err);
-			}
-
-			console.error(err);
-
-			promptDownloadManually(extension, localize('failedToInstall', "Failed to install \'{0}\'.", extension.id), this.instantiationService, this.notificationService, this.openerService);
-		});
-	}
-
-	dispose(): void {
-		this.disposables = dispose(this.disposables);
-		super.dispose();
-	}
-}
-
-
-export class ShowRecommendedKeymapExtensionsAction extends Action {
-
-	static readonly ID = 'workbench.extensions.action.showRecommendedKeymapExtensions';
-	static SHORT_LABEL = localize('showRecommendedKeymapExtensionsShort', "Keymaps");
-
-	constructor(
-		id: string,
-		label: string,
-		@IViewletService private viewletService: IViewletService
-	) {
-		super(id, label, null, true);
-	}
-
-	run(): TPromise<void> {
-		return this.viewletService.openViewlet(VIEWLET_ID, true)
-			.then(viewlet => viewlet as IExtensionsViewlet)
-			.then(viewlet => {
-				viewlet.search('@recommended:keymaps ');
-				viewlet.focus();
-			});
-	}
-}
-
-export class ShowLanguageExtensionsAction extends Action {
-
-	static readonly ID = 'workbench.extensions.action.showLanguageExtensions';
-	static SHORT_LABEL = localize('showLanguageExtensionsShort', "Language Extensions");
-
-	constructor(
-		id: string,
-		label: string,
-		@IViewletService private viewletService: IViewletService
-	) {
-		super(id, label, null, true);
-	}
-
-	run(): TPromise<void> {
-		return this.viewletService.openViewlet(VIEWLET_ID, true)
-			.then(viewlet => viewlet as IExtensionsViewlet)
-			.then(viewlet => {
-				viewlet.search('@sort:installs category:languages ');
-				viewlet.focus();
-			});
-	}
-}
-
-export class ShowAzureExtensionsAction extends Action {
-
-	static readonly ID = 'workbench.extensions.action.showAzureExtensions';
-	static SHORT_LABEL = localize('showAzureExtensionsShort', "Azure Extensions");
-
-	constructor(
-		id: string,
-		label: string,
-		@IViewletService private viewletService: IViewletService
-	) {
-		super(id, label, null, true);
-	}
-
-	run(): TPromise<void> {
-		return this.viewletService.openViewlet(VIEWLET_ID, true)
-			.then(viewlet => viewlet as IExtensionsViewlet)
-			.then(viewlet => {
-				viewlet.search('@sort:installs azure ');
-				viewlet.focus();
-			});
-	}
-}
-
-export class ChangeSortAction extends Action {
-
-	private query: Query;
-	private disposables: IDisposable[] = [];
-
-	constructor(
-		id: string,
-		label: string,
-		onSearchChange: Event<string>,
-		private sortBy: string,
-		@IViewletService private viewletService: IViewletService
-	) {
-		super(id, label, null, true);
-
-		if (sortBy === undefined) {
-			throw new Error('bad arguments');
-		}
-
-		this.query = Query.parse('');
-		this.enabled = false;
-		onSearchChange(this.onSearchChange, this, this.disposables);
-	}
-
-	private onSearchChange(value: string): void {
-		const query = Query.parse(value);
-		this.query = new Query(query.value, this.sortBy || query.sortBy);
-		this.enabled = value && this.query.isValid() && !this.query.equals(query);
-	}
-
-	run(): TPromise<void> {
-		return this.viewletService.openViewlet(VIEWLET_ID, true)
-			.then(viewlet => viewlet as IExtensionsViewlet)
-			.then(viewlet => {
-				viewlet.search(this.query.toString());
-				viewlet.focus();
-			});
-	}
-}
-
-export class ConfigureRecommendedExtensionsCommandsContributor extends Disposable implements IWorkbenchContribution {
-
-	private workspaceContextKey = new RawContextKey<boolean>('workspaceRecommendations', true);
-	private workspaceFolderContextKey = new RawContextKey<boolean>('workspaceFolderRecommendations', true);
-
-	constructor(
-		@IContextKeyService contextKeyService: IContextKeyService,
-		@IWorkspaceContextService workspaceContextService: IWorkspaceContextService
-	) {
-		super();
-		const boundWorkspaceContextKey = this.workspaceContextKey.bindTo(contextKeyService);
-		boundWorkspaceContextKey.set(workspaceContextService.getWorkbenchState() === WorkbenchState.WORKSPACE);
-		this._register(workspaceContextService.onDidChangeWorkbenchState(() => boundWorkspaceContextKey.set(workspaceContextService.getWorkbenchState() === WorkbenchState.WORKSPACE)));
-
-
-		const boundWorkspaceFolderContextKey = this.workspaceFolderContextKey.bindTo(contextKeyService);
-		boundWorkspaceFolderContextKey.set(workspaceContextService.getWorkspace().folders.length > 0);
-		this._register(workspaceContextService.onDidChangeWorkspaceFolders(() => boundWorkspaceFolderContextKey.set(workspaceContextService.getWorkspace().folders.length > 0)));
-
-		this.registerCommands();
-	}
-
-	private registerCommands(): void {
-		CommandsRegistry.registerCommand(ConfigureWorkspaceRecommendedExtensionsAction.ID, serviceAccessor => {
-			serviceAccessor.get(IInstantiationService).createInstance(ConfigureWorkspaceRecommendedExtensionsAction, ConfigureWorkspaceRecommendedExtensionsAction.ID, ConfigureWorkspaceRecommendedExtensionsAction.LABEL).run();
-		});
-		MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
-			command: {
-				id: ConfigureWorkspaceRecommendedExtensionsAction.ID,
-				title: `${ExtensionsLabel}: ${ConfigureWorkspaceRecommendedExtensionsAction.LABEL}`,
-			},
-			when: this.workspaceContextKey
-		});
-
-		CommandsRegistry.registerCommand(ConfigureWorkspaceFolderRecommendedExtensionsAction.ID, serviceAccessor => {
-			serviceAccessor.get(IInstantiationService).createInstance(ConfigureWorkspaceFolderRecommendedExtensionsAction, ConfigureWorkspaceFolderRecommendedExtensionsAction.ID, ConfigureWorkspaceFolderRecommendedExtensionsAction.LABEL).run();
-		});
-		MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
-			command: {
-				id: ConfigureWorkspaceFolderRecommendedExtensionsAction.ID,
-				title: `${ExtensionsLabel}: ${ConfigureWorkspaceFolderRecommendedExtensionsAction.LABEL}`,
-			},
-			when: this.workspaceFolderContextKey
-		});
-	}
-}
-
-interface IExtensionsContent {
-	recommendations: string[];
-}
-
-export abstract class AbstractConfigureRecommendedExtensionsAction extends Action {
-
-	constructor(
-		id: string,
-		label: string,
-		@IWorkspaceContextService protected contextService: IWorkspaceContextService,
-		@IFileService private fileService: IFileService,
-		@IEditorService private editorService: IEditorService,
-		@IJSONEditingService private jsonEditingService: IJSONEditingService,
-		@ITextModelService private textModelResolverService: ITextModelService
-	) {
-		super(id, label, null);
-	}
-
-	protected openExtensionsFile(extensionsFileResource: URI): TPromise<any> {
-		return this.getOrCreateExtensionsFile(extensionsFileResource)
-			.then(({ created, content }) =>
-				this.getSelectionPosition(content, extensionsFileResource, ['recommendations'])
-					.then(selection => this.editorService.openEditor({
-						resource: extensionsFileResource,
-						options: {
-							forceOpen: true,
-							pinned: created,
-							selection
-						}
-					})),
-				error => TPromise.wrapError(new Error(localize('OpenExtensionsFile.failed', "Unable to create 'extensions.json' file inside the '.vscode' folder ({0}).", error))));
-	}
-
-	protected openWorkspaceConfigurationFile(workspaceConfigurationFile: URI): TPromise<any> {
-		return this.getOrUpdateWorkspaceConfigurationFile(workspaceConfigurationFile)
-			.then(content => this.getSelectionPosition(content.value, content.resource, ['extensions', 'recommendations']))
-			.then(selection => this.editorService.openEditor({
-				resource: workspaceConfigurationFile,
-				options: {
-					forceOpen: true,
-					selection
-				}
-			}));
-	}
-
-	private getOrUpdateWorkspaceConfigurationFile(workspaceConfigurationFile: URI): TPromise<IContent> {
-		return this.fileService.resolveContent(workspaceConfigurationFile)
-			.then(content => {
-				const workspaceRecommendations = <IExtensionsContent>json.parse(content.value)['extensions'];
-				if (!workspaceRecommendations || !workspaceRecommendations.recommendations) {
-					return this.jsonEditingService.write(workspaceConfigurationFile, { key: 'extensions', value: { recommendations: [] } }, true)
-						.then(() => this.fileService.resolveContent(workspaceConfigurationFile));
-				}
-				return content;
-			});
-	}
-
-	private getSelectionPosition(content: string, resource: URI, path: json.JSONPath): TPromise<ITextEditorSelection> {
-		const tree = json.parseTree(content);
-		const node = json.findNodeAtLocation(tree, path);
-		if (node && node.parent.children[1]) {
-			const recommendationsValueNode = node.parent.children[1];
-			const lastExtensionNode = recommendationsValueNode.children && recommendationsValueNode.children.length ? recommendationsValueNode.children[recommendationsValueNode.children.length - 1] : null;
-			const offset = lastExtensionNode ? lastExtensionNode.offset + lastExtensionNode.length : recommendationsValueNode.offset + 1;
-			return this.textModelResolverService.createModelReference(resource)
-				.then(reference => {
-					const position = reference.object.textEditorModel.getPositionAt(offset);
-					reference.dispose();
-					return <ITextEditorSelection>{
-						startLineNumber: position.lineNumber,
-						startColumn: position.column,
-						endLineNumber: position.lineNumber,
-						endColumn: position.column,
-					};
-				});
-		}
-		return TPromise.as(null);
-	}
-
-	private getOrCreateExtensionsFile(extensionsFileResource: URI): TPromise<{ created: boolean, extensionsFileResource: URI, content: string }> {
-		return this.fileService.resolveContent(extensionsFileResource).then(content => {
-			return { created: false, extensionsFileResource, content: content.value };
-		}, err => {
-			return this.fileService.updateContent(extensionsFileResource, ExtensionsConfigurationInitialContent).then(() => {
-				return { created: true, extensionsFileResource, content: ExtensionsConfigurationInitialContent };
-			});
-		});
-	}
-}
-
-export class ConfigureWorkspaceRecommendedExtensionsAction extends AbstractConfigureRecommendedExtensionsAction {
-
-	static readonly ID = 'workbench.extensions.action.configureWorkspaceRecommendedExtensions';
-	static LABEL = localize('configureWorkspaceRecommendedExtensions', "Configure Recommended Extensions (Workspace)");
-
-	private disposables: IDisposable[] = [];
-
-	constructor(
-		id: string,
-		label: string,
-		@IFileService fileService: IFileService,
-		@IWorkspaceContextService contextService: IWorkspaceContextService,
-		@IEditorService editorService: IEditorService,
-		@IJSONEditingService jsonEditingService: IJSONEditingService,
-		@ITextModelService textModelResolverService: ITextModelService
-	) {
-		super(id, label, contextService, fileService, editorService, jsonEditingService, textModelResolverService);
-		this.contextService.onDidChangeWorkbenchState(() => this.update(), this, this.disposables);
-		this.update();
-	}
-
-	private update(): void {
-		this.enabled = this.contextService.getWorkbenchState() !== WorkbenchState.EMPTY;
-	}
-
-	public run(): TPromise<any> {
-		switch (this.contextService.getWorkbenchState()) {
-			case WorkbenchState.FOLDER:
-				return this.openExtensionsFile(this.contextService.getWorkspace().folders[0].toResource(paths.join('.vscode', 'extensions.json')));
-			case WorkbenchState.WORKSPACE:
-				return this.openWorkspaceConfigurationFile(this.contextService.getWorkspace().configuration);
-		}
-		return TPromise.as(null);
-	}
-
-	dispose(): void {
-		this.disposables = dispose(this.disposables);
-		super.dispose();
-	}
-}
-
-export class ConfigureWorkspaceFolderRecommendedExtensionsAction extends AbstractConfigureRecommendedExtensionsAction {
-
-	static readonly ID = 'workbench.extensions.action.configureWorkspaceFolderRecommendedExtensions';
-	static LABEL = localize('configureWorkspaceFolderRecommendedExtensions', "Configure Recommended Extensions (Workspace Folder)");
-
-	private disposables: IDisposable[] = [];
-
-	constructor(
-		id: string,
-		label: string,
-		@IFileService fileService: IFileService,
-		@IWorkspaceContextService contextService: IWorkspaceContextService,
-		@IEditorService editorService: IEditorService,
-		@IJSONEditingService jsonEditingService: IJSONEditingService,
-		@ITextModelService textModelResolverService: ITextModelService,
-		@ICommandService private commandService: ICommandService
-	) {
-		super(id, label, contextService, fileService, editorService, jsonEditingService, textModelResolverService);
-		this.contextService.onDidChangeWorkspaceFolders(() => this.update(), this, this.disposables);
-		this.update();
-	}
-
-	private update(): void {
-		this.enabled = this.contextService.getWorkspace().folders.length > 0;
-	}
-
-	public run(): TPromise<any> {
-		const folderCount = this.contextService.getWorkspace().folders.length;
-		const pickFolderPromise = folderCount === 1 ? TPromise.as(this.contextService.getWorkspace().folders[0]) : this.commandService.executeCommand<IWorkspaceFolder>(PICK_WORKSPACE_FOLDER_COMMAND_ID);
-		return pickFolderPromise
-			.then(workspaceFolder => {
-				if (workspaceFolder) {
-					return this.openExtensionsFile(workspaceFolder.toResource(paths.join('.vscode', 'extensions.json')));
-				}
-				return null;
-			});
-	}
-
-	dispose(): void {
-		this.disposables = dispose(this.disposables);
-		super.dispose();
-	}
-}
-
-export class MaliciousStatusLabelAction extends Action {
-
-	private static readonly Class = 'malicious-status';
-
-	private _extension: IExtension;
-	get extension(): IExtension { return this._extension; }
-	set extension(extension: IExtension) { this._extension = extension; this.update(); }
-
-	constructor(long: boolean) {
-		const tooltip = localize('malicious tooltip', "This extension was reported to be problematic.");
-		const label = long ? tooltip : localize('malicious', "Malicious");
-		super('extensions.install', label, '', false);
-		this.tooltip = localize('malicious tooltip', "This extension was reported to be problematic.");
-	}
-
-	private update(): void {
-		if (this.extension && this.extension.isMalicious) {
-			this.class = `${MaliciousStatusLabelAction.Class} malicious`;
-		} else {
-			this.class = `${MaliciousStatusLabelAction.Class} not-malicious`;
-		}
-	}
-
-	run(): TPromise<any> {
-		return TPromise.as(null);
-	}
-}
-
-export class DisabledStatusLabelAction extends Action {
-
-	private static readonly Class = 'disable-status';
-
-	private _extension: IExtension;
-	get extension(): IExtension { return this._extension; }
-	set extension(extension: IExtension) { this._extension = extension; this.update(); }
-
-	private disposables: IDisposable[] = [];
-	private throttler: Throttler = new Throttler();
-
-	constructor(
-		@IExtensionsWorkbenchService private extensionsWorkbenchService: IExtensionsWorkbenchService,
-		@IExtensionService private extensionService: IExtensionService
-	) {
-		super('extensions.install', localize('disabled', "Disabled"), `${DisabledStatusLabelAction.Class} hide`, false);
-		this.disposables.push(this.extensionsWorkbenchService.onChange(() => this.update()));
-		this.update();
-	}
-
-	private update(): void {
-		this.throttler.queue(() => this.extensionService.getExtensions()
-			.then(runningExtensions => {
-				this.class = `${DisabledStatusLabelAction.Class} hide`;
-				this.tooltip = '';
-				if (this.extension && !this.extension.isMalicious && !runningExtensions.some(e => e.id === this.extension.id)) {
-					if (this.extension.enablementState === EnablementState.Disabled || this.extension.enablementState === EnablementState.WorkspaceDisabled) {
-						this.class = `${DisabledStatusLabelAction.Class}`;
-						this.tooltip = this.extension.enablementState === EnablementState.Disabled ? localize('disabled globally', "Disabled") : localize('disabled workspace', "Disabled for this Workspace");
-					}
-				}
-			}));
-	}
-
-	run(): TPromise<any> {
-		return TPromise.as(null);
-	}
-}
-
-export class DisableAllAction extends Action {
-
-	static readonly ID = 'workbench.extensions.action.disableAll';
-	static LABEL = localize('disableAll', "Disable All Installed Extensions");
-
-	private disposables: IDisposable[] = [];
-
-	constructor(
-		id: string = DisableAllAction.ID, label: string = DisableAllAction.LABEL,
-		@IExtensionsWorkbenchService private extensionsWorkbenchService: IExtensionsWorkbenchService
-	) {
-		super(id, label);
-		this.update();
-		this.disposables.push(this.extensionsWorkbenchService.onChange(() => this.update()));
-	}
-
-	private update(): void {
-		this.enabled = this.extensionsWorkbenchService.local.some(e => e.type === LocalExtensionType.User && (e.enablementState === EnablementState.Enabled || e.enablementState === EnablementState.WorkspaceEnabled));
-	}
-
-	run(): TPromise<any> {
-		return this.extensionsWorkbenchService.setEnablement(this.extensionsWorkbenchService.local.filter(e => e.type === LocalExtensionType.User), EnablementState.Disabled);
-	}
-
-	dispose(): void {
-		super.dispose();
-		this.disposables = dispose(this.disposables);
-	}
-}
-
-export class DisableAllWorkpsaceAction extends Action {
-
-	static readonly ID = 'workbench.extensions.action.disableAllWorkspace';
-	static LABEL = localize('disableAllWorkspace', "Disable All Installed Extensions for this Workspace");
-
-	private disposables: IDisposable[] = [];
-
-	constructor(
-		id: string = DisableAllWorkpsaceAction.ID, label: string = DisableAllWorkpsaceAction.LABEL,
-		@IWorkspaceContextService private workspaceContextService: IWorkspaceContextService,
-		@IExtensionsWorkbenchService private extensionsWorkbenchService: IExtensionsWorkbenchService
-	) {
-		super(id, label);
-		this.update();
-		this.workspaceContextService.onDidChangeWorkbenchState(() => this.update(), this, this.disposables);
-		this.extensionsWorkbenchService.onChange(() => this.update(), this, this.disposables);
-	}
-
-	private update(): void {
-		this.enabled = this.workspaceContextService.getWorkbenchState() !== WorkbenchState.EMPTY && this.extensionsWorkbenchService.local.some(e => e.type === LocalExtensionType.User && (e.enablementState === EnablementState.Enabled || e.enablementState === EnablementState.WorkspaceEnabled));
-	}
-
-	run(): TPromise<any> {
-		return this.extensionsWorkbenchService.setEnablement(this.extensionsWorkbenchService.local.filter(e => e.type === LocalExtensionType.User), EnablementState.WorkspaceDisabled);
-	}
-
-	dispose(): void {
-		super.dispose();
-		this.disposables = dispose(this.disposables);
-	}
-}
-
-export class EnableAllAction extends Action {
-
-	static readonly ID = 'workbench.extensions.action.enableAll';
-	static LABEL = localize('enableAll', "Enable All Extensions");
-
-	private disposables: IDisposable[] = [];
-
-	constructor(
-		id: string = EnableAllAction.ID, label: string = EnableAllAction.LABEL,
-		@IExtensionsWorkbenchService private extensionsWorkbenchService: IExtensionsWorkbenchService,
-		@IExtensionEnablementService private extensionEnablementService: IExtensionEnablementService
-	) {
-		super(id, label);
-		this.update();
-		this.disposables.push(this.extensionsWorkbenchService.onChange(() => this.update()));
-	}
-
-	private update(): void {
-		this.enabled = this.extensionsWorkbenchService.local.some(e => e.local && this.extensionEnablementService.canChangeEnablement(e.local) && (e.enablementState === EnablementState.Disabled || e.enablementState === EnablementState.WorkspaceDisabled));
-	}
-
-	run(): TPromise<any> {
-		return this.extensionsWorkbenchService.setEnablement(this.extensionsWorkbenchService.local, EnablementState.Enabled);
-	}
-
-	dispose(): void {
-		super.dispose();
-		this.disposables = dispose(this.disposables);
-	}
-}
-
-export class EnableAllWorkpsaceAction extends Action {
-
-	static readonly ID = 'workbench.extensions.action.enableAllWorkspace';
-	static LABEL = localize('enableAllWorkspace', "Enable All Extensions for this Workspace");
-
-	private disposables: IDisposable[] = [];
-
-	constructor(
-		id: string = EnableAllWorkpsaceAction.ID, label: string = EnableAllWorkpsaceAction.LABEL,
-		@IWorkspaceContextService private workspaceContextService: IWorkspaceContextService,
-		@IExtensionsWorkbenchService private extensionsWorkbenchService: IExtensionsWorkbenchService,
-		@IExtensionEnablementService private extensionEnablementService: IExtensionEnablementService
-	) {
-		super(id, label);
-		this.update();
-		this.extensionsWorkbenchService.onChange(() => this.update(), this, this.disposables);
-		this.workspaceContextService.onDidChangeWorkbenchState(() => this.update(), this, this.disposables);
-	}
-
-	private update(): void {
-		this.enabled = this.workspaceContextService.getWorkbenchState() !== WorkbenchState.EMPTY && this.extensionsWorkbenchService.local.some(e => e.local && this.extensionEnablementService.canChangeEnablement(e.local) && (e.enablementState === EnablementState.Disabled || e.enablementState === EnablementState.WorkspaceDisabled));
-	}
-
-	run(): TPromise<any> {
-		return this.extensionsWorkbenchService.setEnablement(this.extensionsWorkbenchService.local, EnablementState.WorkspaceEnabled);
-	}
-
-	dispose(): void {
-		super.dispose();
-		this.disposables = dispose(this.disposables);
-	}
-}
-
-export class OpenExtensionsFolderAction extends Action {
-
-	static readonly ID = 'workbench.extensions.action.openExtensionsFolder';
-	static LABEL = localize('openExtensionsFolder', "Open Extensions Folder");
-
-	constructor(
-		id: string,
-		label: string,
-		@IWindowsService private windowsService: IWindowsService,
-		@IFileService private fileService: IFileService,
-		@IEnvironmentService private environmentService: IEnvironmentService
-	) {
-		super(id, label, null, true);
-	}
-
-	run(): TPromise<void> {
-		const extensionsHome = this.environmentService.extensionsPath;
-
-		return this.fileService.resolveFile(URI.file(extensionsHome)).then(file => {
-			let itemToShow: string;
-			if (file.children && file.children.length > 0) {
-				itemToShow = file.children[0].resource.fsPath;
-			} else {
-				itemToShow = paths.normalize(extensionsHome, true);
-			}
-
-			return this.windowsService.showItemInFolder(itemToShow);
-		});
-	}
-}
-
-export class InstallVSIXAction extends Action {
-
-	static readonly ID = 'workbench.extensions.action.installVSIX';
-	static LABEL = localize('installVSIX', "Install from VSIX...");
-
-	constructor(
-		id = InstallVSIXAction.ID,
-		label = InstallVSIXAction.LABEL,
-		@IExtensionsWorkbenchService private extensionsWorkbenchService: IExtensionsWorkbenchService,
-		@INotificationService private notificationService: INotificationService,
-		@IWindowService private windowService: IWindowService
-	) {
-		super(id, label, 'extension-action install-vsix', true);
-	}
-
-	run(): TPromise<any> {
-		return this.windowService.showOpenDialog({
-			title: localize('installFromVSIX', "Install from VSIX"),
-			filters: [{ name: 'VSIX Extensions', extensions: ['vsix'] }],
-			properties: ['openFile'],
-			buttonLabel: mnemonicButtonLabel(localize({ key: 'installButton', comment: ['&& denotes a mnemonic'] }, "&&Install"))
-		}).then(result => {
-			if (!result) {
-				return TPromise.as(null);
-			}
-
-			return TPromise.join(result.map(vsix => this.extensionsWorkbenchService.install(vsix))).then(() => {
-				this.notificationService.prompt(
-					Severity.Info,
-					localize('InstallVSIXAction.success', "Successfully installed the extension. Reload to enable it."),
-					[{
-						label: localize('InstallVSIXAction.reloadNow', "Reload Now"),
-						run: () => this.windowService.reloadWindow()
-					}]
-				);
-			});
-		});
-	}
-}
-
-export class ReinstallAction extends Action {
-
-	static readonly ID = 'workbench.extensions.action.reinstall';
-	static LABEL = localize('reinstall', "Reinstall Extension...");
-
-	constructor(
-		id: string = ReinstallAction.ID, label: string = ReinstallAction.LABEL,
-		@IExtensionsWorkbenchService private extensionsWorkbenchService: IExtensionsWorkbenchService,
-		@IQuickOpenService private quickOpenService: IQuickOpenService,
-		@INotificationService private notificationService: INotificationService,
-		@IWindowService private windowService: IWindowService
-	) {
-		super(id, label);
-	}
-
-	get enabled(): boolean {
-		return this.extensionsWorkbenchService.local.filter(l => l.type === LocalExtensionType.User && l.local).length > 0;
-	}
-
-	run(): TPromise<any> {
-		return this.quickOpenService.pick(this.getEntries(), { placeHolder: localize('selectExtension', "Select Extension to Reinstall") });
-	}
-
-	private getEntries(): TPromise<IPickOpenEntry[]> {
-		return this.extensionsWorkbenchService.queryLocal()
-			.then(local => {
-				const entries: IPickOpenEntry[] = local
-					.filter(extension => extension.type === LocalExtensionType.User)
-					.map(extension => {
-						return <IPickOpenEntry>{
-							id: extension.id,
-							label: extension.displayName,
-							description: extension.id,
-							run: () => this.reinstallExtension(extension),
-						};
-					});
-				return entries;
-			});
-	}
-
-	private reinstallExtension(extension: IExtension): TPromise<void> {
-		return this.extensionsWorkbenchService.reinstall(extension)
-			.then(() => {
-				this.notificationService.prompt(
-					Severity.Info,
-					localize('ReinstallAction.success', "Successfully reinstalled the extension."),
-					[{
-						label: localize('ReinstallAction.reloadNow', "Reload Now"),
-						run: () => this.windowService.reloadWindow()
-					}]
-				);
-			}, error => this.notificationService.error(error));
-	}
-}
-
-CommandsRegistry.registerCommand('workbench.extensions.action.showExtensionsForLanguage', function (accessor: ServicesAccessor, fileExtension: string) {
-	const viewletService = accessor.get(IViewletService);
-
-	return viewletService.openViewlet(VIEWLET_ID, true)
-		.then(viewlet => viewlet as IExtensionsViewlet)
-		.then(viewlet => {
-			viewlet.search(`ext:${fileExtension.replace(/^\./, '')}`);
-			viewlet.focus();
-		});
-});
-
-CommandsRegistry.registerCommand('workbench.extensions.action.showExtensionsWithId', function (accessor: ServicesAccessor, extensionId: string) {
-	const viewletService = accessor.get(IViewletService);
-
-	return viewletService.openViewlet(VIEWLET_ID, true)
-		.then(viewlet => viewlet as IExtensionsViewlet)
-		.then(viewlet => {
-			viewlet.search(`@id:${extensionId}`);
-			viewlet.focus();
-		});
-});
-
-export const extensionButtonProminentBackground = registerColor('extensionButton.prominentBackground', {
-	dark: '#327e36',
-	light: '#327e36',
-	hc: null
-}, localize('extensionButtonProminentBackground', "Button background color for actions extension that stand out (e.g. install button)."));
-
-export const extensionButtonProminentForeground = registerColor('extensionButton.prominentForeground', {
-	dark: Color.white,
-	light: Color.white,
-	hc: null
-}, localize('extensionButtonProminentForeground', "Button foreground color for actions extension that stand out (e.g. install button)."));
-
-export const extensionButtonProminentHoverBackground = registerColor('extensionButton.prominentHoverBackground', {
-	dark: '#28632b',
-	light: '#28632b',
-	hc: null
-}, localize('extensionButtonProminentHoverBackground', "Button background hover color for actions extension that stand out (e.g. install button)."));
-
-registerThemingParticipant((theme: ITheme, collector: ICssStyleCollector) => {
-	const foregroundColor = theme.getColor(foreground);
-	if (foregroundColor) {
-		collector.addRule(`.monaco-action-bar .action-item .action-label.extension-action.built-in-status { border-color: ${foregroundColor}; }`);
-	}
-
-	const buttonBackgroundColor = theme.getColor(buttonBackground);
-	if (buttonBackgroundColor) {
-		collector.addRule(`.monaco-action-bar .action-item .action-label.extension-action { background-color: ${buttonBackgroundColor}; }`);
-	}
-
-	const buttonForegroundColor = theme.getColor(buttonForeground);
-	if (buttonForegroundColor) {
-		collector.addRule(`.monaco-action-bar .action-item .action-label.extension-action { color: ${buttonForegroundColor}; }`);
-	}
-
-	const buttonHoverBackgroundColor = theme.getColor(buttonHoverBackground);
-	if (buttonHoverBackgroundColor) {
-		collector.addRule(`.monaco-action-bar .action-item:hover .action-label.extension-action { background-color: ${buttonHoverBackgroundColor}; }`);
-	}
-
-	const contrastBorderColor = theme.getColor(contrastBorder);
-	if (contrastBorderColor) {
-		collector.addRule(`.monaco-action-bar .action-item .action-label.extension-action { border: 1px solid ${contrastBorderColor}; }`);
-	}
-
-	const extensionButtonProminentBackgroundColor = theme.getColor(extensionButtonProminentBackground);
-	if (extensionButtonProminentBackground) {
-		collector.addRule(`.monaco-action-bar .action-item .action-label.extension-action.prominent { background-color: ${extensionButtonProminentBackgroundColor}; }`);
-	}
-
-	const extensionButtonProminentForegroundColor = theme.getColor(extensionButtonProminentForeground);
-	if (extensionButtonProminentForeground) {
-		collector.addRule(`.monaco-action-bar .action-item .action-label.extension-action.prominent { color: ${extensionButtonProminentForegroundColor}; }`);
-	}
-
-	const extensionButtonProminentHoverBackgroundColor = theme.getColor(extensionButtonProminentHoverBackground);
-	if (extensionButtonProminentHoverBackground) {
-		collector.addRule(`.monaco-action-bar .action-item:hover .action-label.extension-action.prominent { background-color: ${extensionButtonProminentHoverBackgroundColor}; }`);
-	}
-});
diff --git a/src/vs/workbench/parts/extensions/browser/extensionsList.ts b/src/vs/workbench/parts/extensions/browser/extensionsList.ts
deleted file mode 100644
index 3cbee02d7bd..00000000000
--- a/src/vs/workbench/parts/extensions/browser/extensionsList.ts
+++ /dev/null
@@ -1,184 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-'use strict';
-
-import { append, $, addClass, removeClass, toggleClass } from 'vs/base/browser/dom';
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
-import { Action } from 'vs/base/common/actions';
-import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IDelegate } from 'vs/base/browser/ui/list/list';
-import { IPagedRenderer } from 'vs/base/browser/ui/list/listPaging';
-import { once } from 'vs/base/common/event';
-import { domEvent } from 'vs/base/browser/event';
-import { IExtension, IExtensionsWorkbenchService } from 'vs/workbench/parts/extensions/common/extensions';
-import { InstallAction, UpdateAction, ManageExtensionAction, ReloadAction, extensionButtonProminentBackground, extensionButtonProminentForeground, MaliciousStatusLabelAction, DisabledStatusLabelAction } from 'vs/workbench/parts/extensions/browser/extensionsActions';
-import { areSameExtensions } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
-import { Label, RatingsWidget, InstallCountWidget } from 'vs/workbench/parts/extensions/browser/extensionsWidgets';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { IExtensionTipsService } from 'vs/platform/extensionManagement/common/extensionManagement';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-
-export interface ITemplateData {
-	root: HTMLElement;
-	element: HTMLElement;
-	icon: HTMLImageElement;
-	name: HTMLElement;
-	installCount: HTMLElement;
-	ratings: HTMLElement;
-	author: HTMLElement;
-	description: HTMLElement;
-	extension: IExtension;
-	disposables: IDisposable[];
-	extensionDisposables: IDisposable[];
-}
-
-export class Delegate implements IDelegate<IExtension> {
-	getHeight() { return 62; }
-	getTemplateId() { return 'extension'; }
-}
-
-const actionOptions = { icon: true, label: true };
-
-export class Renderer implements IPagedRenderer<IExtension, ITemplateData> {
-
-	constructor(
-		@IInstantiationService private instantiationService: IInstantiationService,
-		@INotificationService private notificationService: INotificationService,
-		@IExtensionsWorkbenchService private extensionsWorkbenchService: IExtensionsWorkbenchService,
-		@IExtensionService private extensionService: IExtensionService,
-		@IExtensionTipsService private extensionTipsService: IExtensionTipsService,
-		@IThemeService private themeService: IThemeService
-	) { }
-
-	get templateId() { return 'extension'; }
-
-	renderTemplate(root: HTMLElement): ITemplateData {
-		const bookmark = append(root, $('span.bookmark'));
-		append(bookmark, $('span.octicon.octicon-star'));
-		const applyBookmarkStyle = (theme) => {
-			const bgColor = theme.getColor(extensionButtonProminentBackground);
-			const fgColor = theme.getColor(extensionButtonProminentForeground);
-			bookmark.style.borderTopColor = bgColor ? bgColor.toString() : 'transparent';
-			bookmark.style.color = fgColor ? fgColor.toString() : 'white';
-		};
-		applyBookmarkStyle(this.themeService.getTheme());
-		const bookmarkStyler = this.themeService.onThemeChange(applyBookmarkStyle.bind(this));
-
-		const element = append(root, $('.extension'));
-		const icon = append(element, $<HTMLImageElement>('img.icon'));
-		const details = append(element, $('.details'));
-		const headerContainer = append(details, $('.header-container'));
-		const header = append(headerContainer, $('.header'));
-		const name = append(header, $('span.name'));
-		const version = append(header, $('span.version'));
-		const installCount = append(header, $('span.install-count'));
-		const ratings = append(header, $('span.ratings'));
-		const description = append(details, $('.description.ellipsis'));
-		const footer = append(details, $('.footer'));
-		const author = append(footer, $('.author.ellipsis'));
-		const actionbar = new ActionBar(footer, {
-			animated: false,
-			actionItemProvider: (action: Action) => {
-				if (action.id === ManageExtensionAction.ID) {
-					return (<ManageExtensionAction>action).actionItem;
-				}
-				return null;
-			}
-		});
-		actionbar.onDidRun(({ error }) => error && this.notificationService.error(error));
-
-		const versionWidget = this.instantiationService.createInstance(Label, version, (e: IExtension) => e.version);
-		const installCountWidget = this.instantiationService.createInstance(InstallCountWidget, installCount, { small: true });
-		const ratingsWidget = this.instantiationService.createInstance(RatingsWidget, ratings, { small: true });
-
-		const maliciousStatusAction = this.instantiationService.createInstance(MaliciousStatusLabelAction, false);
-		const disabledStatusAction = this.instantiationService.createInstance(DisabledStatusLabelAction);
-		const installAction = this.instantiationService.createInstance(InstallAction);
-		const updateAction = this.instantiationService.createInstance(UpdateAction);
-		const reloadAction = this.instantiationService.createInstance(ReloadAction);
-		const manageAction = this.instantiationService.createInstance(ManageExtensionAction);
-
-		actionbar.push([updateAction, reloadAction, installAction, disabledStatusAction, maliciousStatusAction, manageAction], actionOptions);
-		const disposables = [versionWidget, installCountWidget, ratingsWidget, maliciousStatusAction, disabledStatusAction, updateAction, reloadAction, manageAction, actionbar, bookmarkStyler];
-
-		return {
-			root, element, icon, name, installCount, ratings, author, description, disposables,
-			extensionDisposables: [],
-			set extension(extension: IExtension) {
-				versionWidget.extension = extension;
-				installCountWidget.extension = extension;
-				ratingsWidget.extension = extension;
-				maliciousStatusAction.extension = extension;
-				disabledStatusAction.extension = extension;
-				installAction.extension = extension;
-				updateAction.extension = extension;
-				reloadAction.extension = extension;
-				manageAction.extension = extension;
-			}
-		};
-	}
-
-	renderPlaceholder(index: number, data: ITemplateData): void {
-		addClass(data.element, 'loading');
-
-		data.root.removeAttribute('aria-label');
-		data.extensionDisposables = dispose(data.extensionDisposables);
-		data.icon.src = '';
-		data.name.textContent = '';
-		data.author.textContent = '';
-		data.description.textContent = '';
-		data.installCount.style.display = 'none';
-		data.ratings.style.display = 'none';
-		data.extension = null;
-	}
-
-	renderElement(extension: IExtension, index: number, data: ITemplateData): void {
-		removeClass(data.element, 'loading');
-
-		data.extensionDisposables = dispose(data.extensionDisposables);
-		const isInstalled = this.extensionsWorkbenchService.local.some(e => e.id === extension.id);
-
-		this.extensionService.getExtensions().then(enabledExtensions => {
-			const isExtensionRunning = enabledExtensions.some(e => areSameExtensions(e, extension));
-
-			toggleClass(data.root, 'disabled', isInstalled && !isExtensionRunning);
-		});
-
-		const onError = once(domEvent(data.icon, 'error'));
-		onError(() => data.icon.src = extension.iconUrlFallback, null, data.extensionDisposables);
-		data.icon.src = extension.iconUrl;
-
-		if (!data.icon.complete) {
-			data.icon.style.visibility = 'hidden';
-			data.icon.onload = () => data.icon.style.visibility = 'inherit';
-		} else {
-			data.icon.style.visibility = 'inherit';
-		}
-
-		data.root.setAttribute('aria-label', extension.displayName);
-		removeClass(data.root, 'recommended');
-
-		const extRecommendations = this.extensionTipsService.getAllRecommendationsWithReason();
-		if (extRecommendations[extension.id.toLowerCase()]) {
-			data.root.setAttribute('aria-label', extension.displayName + '. ' + extRecommendations[extension.id]);
-			addClass(data.root, 'recommended');
-			data.root.title = extRecommendations[extension.id.toLowerCase()].reasonText;
-		}
-
-		data.name.textContent = extension.displayName;
-		data.author.textContent = extension.publisherDisplayName;
-		data.description.textContent = extension.description;
-		data.installCount.style.display = '';
-		data.ratings.style.display = '';
-		data.extension = extension;
-	}
-
-	disposeTemplate(data: ITemplateData): void {
-		data.disposables = dispose(data.disposables);
-	}
-}
diff --git a/src/vs/workbench/parts/extensions/browser/extensionsQuickOpen.ts b/src/vs/workbench/parts/extensions/browser/extensionsQuickOpen.ts
index 392a25bbd72..c1730158428 100644
--- a/src/vs/workbench/parts/extensions/browser/extensionsQuickOpen.ts
+++ b/src/vs/workbench/parts/extensions/browser/extensionsQuickOpen.ts
@@ -12,6 +12,7 @@ import { IExtensionsViewlet, VIEWLET_ID } from 'vs/workbench/parts/extensions/co
 import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet';
 import { IExtensionGalleryService, IExtensionManagementService } from 'vs/platform/extensionManagement/common/extensionManagement';
 import { INotificationService } from 'vs/platform/notification/common/notification';
+import { CancellationToken } from 'vs/base/common/cancellation';
 
 class SimpleEntry extends QuickOpenEntry {
 
@@ -46,12 +47,12 @@ export class ExtensionsHandler extends QuickOpenHandler {
 		super();
 	}
 
-	getResults(text: string): TPromise<IModel<any>> {
+	getResults(text: string, token: CancellationToken): TPromise<IModel<any>> {
 		const label = nls.localize('manage', "Press Enter to manage your extensions.");
 		const action = () => {
 			this.viewletService.openViewlet(VIEWLET_ID, true)
 				.then(viewlet => viewlet as IExtensionsViewlet)
-				.done(viewlet => {
+				.then(viewlet => {
 					viewlet.search('');
 					viewlet.focus();
 				});
@@ -82,7 +83,7 @@ export class GalleryExtensionsHandler extends QuickOpenHandler {
 		super();
 	}
 
-	getResults(text: string): TPromise<IModel<any>> {
+	getResults(text: string, token: CancellationToken): TPromise<IModel<any>> {
 		if (/\./.test(text)) {
 			return this.galleryService.query({ names: [text], pageSize: 1 })
 				.then(galleryResult => {
@@ -100,7 +101,7 @@ export class GalleryExtensionsHandler extends QuickOpenHandler {
 								.then(viewlet => viewlet as IExtensionsViewlet)
 								.then(viewlet => viewlet.search(`@id:${text}`))
 								.then(() => this.extensionsService.installFromGallery(galleryExtension))
-								.done(null, err => this.notificationService.error(err));
+								.then(null, err => this.notificationService.error(err));
 						};
 
 						entries.push(new SimpleEntry(label, action));
@@ -117,7 +118,7 @@ export class GalleryExtensionsHandler extends QuickOpenHandler {
 			const action = () => {
 				this.viewletService.openViewlet(VIEWLET_ID, true)
 					.then(viewlet => viewlet as IExtensionsViewlet)
-					.done(viewlet => {
+					.then(viewlet => {
 						viewlet.search(text);
 						viewlet.focus();
 					});
diff --git a/src/vs/workbench/parts/extensions/browser/extensionsViewer.ts b/src/vs/workbench/parts/extensions/browser/extensionsViewer.ts
new file mode 100644
index 00000000000..a2aede32774
--- /dev/null
+++ b/src/vs/workbench/parts/extensions/browser/extensionsViewer.ts
@@ -0,0 +1,257 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as dom from 'vs/base/browser/dom';
+import { localize } from 'vs/nls';
+import { IMouseEvent } from 'vs/base/browser/mouseEvent';
+import { IDisposable, dispose } from 'vs/base/common/lifecycle';
+import { TPromise, Promise } from 'vs/base/common/winjs.base';
+import { IDataSource, ITree, IRenderer } from 'vs/base/parts/tree/browser/tree';
+import { Action } from 'vs/base/common/actions';
+import { IExtensionsWorkbenchService, IExtension } from 'vs/workbench/parts/extensions/common/extensions';
+import { once } from 'vs/base/common/event';
+import { domEvent } from 'vs/base/browser/event';
+import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { KeyMod, KeyCode } from 'vs/base/common/keyCodes';
+import { WorkbenchTreeController, WorkbenchTree, IListService } from 'vs/platform/list/browser/listService';
+import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
+import { IThemeService } from 'vs/platform/theme/common/themeService';
+
+export interface IExtensionTemplateData {
+	icon: HTMLImageElement;
+	name: HTMLElement;
+	identifier: HTMLElement;
+	author: HTMLElement;
+	extensionDisposables: IDisposable[];
+	extensionData: IExtensionData;
+}
+
+export interface IUnknownExtensionTemplateData {
+	identifier: HTMLElement;
+}
+
+export interface IExtensionData {
+	extension: IExtension;
+	hasChildren: boolean;
+	getChildren: () => Promise<IExtensionData[]>;
+	parent: IExtensionData;
+}
+
+export class DataSource implements IDataSource {
+
+	public getId(tree: ITree, { extension, parent }: IExtensionData): string {
+		return parent ? this.getId(tree, parent) + '/' + extension.id : extension.id;
+	}
+
+	public hasChildren(tree: ITree, { hasChildren }: IExtensionData): boolean {
+		return hasChildren;
+	}
+
+	public getChildren(tree: ITree, extensionData: IExtensionData): Promise {
+		return extensionData.getChildren();
+	}
+
+	public getParent(tree: ITree, { parent }: IExtensionData): Promise {
+		return TPromise.as(parent);
+	}
+}
+
+export class Renderer implements IRenderer {
+
+	private static readonly EXTENSION_TEMPLATE_ID = 'extension-template';
+	private static readonly UNKNOWN_EXTENSION_TEMPLATE_ID = 'unknown-extension-template';
+
+	constructor(@IInstantiationService private instantiationService: IInstantiationService) {
+	}
+
+	public getHeight(tree: ITree, element: IExtensionData): number {
+		return 62;
+	}
+
+	public getTemplateId(tree: ITree, { extension }: IExtensionData): string {
+		return extension ? Renderer.EXTENSION_TEMPLATE_ID : Renderer.UNKNOWN_EXTENSION_TEMPLATE_ID;
+	}
+
+	public renderTemplate(tree: ITree, templateId: string, container: HTMLElement): any {
+		if (Renderer.EXTENSION_TEMPLATE_ID === templateId) {
+			return this.renderExtensionTemplate(tree, container);
+		}
+		return this.renderUnknownExtensionTemplate(tree, container);
+	}
+
+	private renderExtensionTemplate(tree: ITree, container: HTMLElement): IExtensionTemplateData {
+		dom.addClass(container, 'extension');
+
+		const icon = dom.append(container, dom.$<HTMLImageElement>('img.icon'));
+		const details = dom.append(container, dom.$('.details'));
+
+		const header = dom.append(details, dom.$('.header'));
+		const name = dom.append(header, dom.$('span.name'));
+		const openExtensionAction = this.instantiationService.createInstance(OpenExtensionAction);
+		const extensionDisposables = [dom.addDisposableListener(name, 'click', (e: MouseEvent) => {
+			tree.setFocus(openExtensionAction.extensionData);
+			tree.setSelection([openExtensionAction.extensionData]);
+			openExtensionAction.run(e.ctrlKey || e.metaKey);
+			e.stopPropagation();
+			e.preventDefault();
+		})];
+		const identifier = dom.append(header, dom.$('span.identifier'));
+
+		const footer = dom.append(details, dom.$('.footer'));
+		const author = dom.append(footer, dom.$('.author'));
+		return {
+			icon,
+			name,
+			identifier,
+			author,
+			extensionDisposables,
+			set extensionData(extensionData: IExtensionData) {
+				openExtensionAction.extensionData = extensionData;
+			}
+		};
+	}
+
+	private renderUnknownExtensionTemplate(tree: ITree, container: HTMLElement): IUnknownExtensionTemplateData {
+		const messageContainer = dom.append(container, dom.$('div.unknown-extension'));
+		dom.append(messageContainer, dom.$('span.error-marker')).textContent = localize('error', "Error");
+		dom.append(messageContainer, dom.$('span.message')).textContent = localize('Unknown Extension', "Unknown Extension:");
+
+		const identifier = dom.append(messageContainer, dom.$('span.message'));
+		return { identifier };
+	}
+
+	public renderElement(tree: ITree, element: IExtensionData, templateId: string, templateData: any): void {
+		if (templateId === Renderer.EXTENSION_TEMPLATE_ID) {
+			this.renderExtension(tree, element, templateData);
+			return;
+		}
+		this.renderUnknownExtension(tree, element, templateData);
+	}
+
+	private renderExtension(tree: ITree, extensionData: IExtensionData, data: IExtensionTemplateData): void {
+		const extension = extensionData.extension;
+		const onError = once(domEvent(data.icon, 'error'));
+		onError(() => data.icon.src = extension.iconUrlFallback, null, data.extensionDisposables);
+		data.icon.src = extension.iconUrl;
+
+		if (!data.icon.complete) {
+			data.icon.style.visibility = 'hidden';
+			data.icon.onload = () => data.icon.style.visibility = 'inherit';
+		} else {
+			data.icon.style.visibility = 'inherit';
+		}
+
+		data.name.textContent = extension.displayName;
+		data.identifier.textContent = extension.id;
+		data.author.textContent = extension.publisherDisplayName;
+		data.extensionData = extensionData;
+	}
+
+	private renderUnknownExtension(tree: ITree, { extension }: IExtensionData, data: IUnknownExtensionTemplateData): void {
+		data.identifier.textContent = extension.id;
+	}
+
+	public disposeTemplate(tree: ITree, templateId: string, templateData: any): void {
+		if (templateId === Renderer.EXTENSION_TEMPLATE_ID) {
+			templateData.extensionDisposables = dispose((<IExtensionTemplateData>templateData).extensionDisposables);
+		}
+	}
+}
+
+export class Controller extends WorkbenchTreeController {
+
+	constructor(
+		@IExtensionsWorkbenchService private extensionsWorkdbenchService: IExtensionsWorkbenchService,
+		@IConfigurationService configurationService: IConfigurationService
+	) {
+		super({}, configurationService);
+
+		// TODO@Sandeep this should be a command
+		this.downKeyBindingDispatcher.set(KeyMod.CtrlCmd | KeyCode.Enter, (tree: ITree, event: any) => this.openExtension(tree, true));
+	}
+
+	protected onLeftClick(tree: ITree, element: IExtensionData, event: IMouseEvent): boolean {
+		let currentFocused = tree.getFocus();
+		if (super.onLeftClick(tree, element, event)) {
+			if (element.parent === null) {
+				if (currentFocused) {
+					tree.setFocus(currentFocused);
+				} else {
+					tree.focusFirst();
+				}
+				return true;
+			}
+		}
+		return false;
+	}
+
+	public openExtension(tree: ITree, sideByside: boolean): boolean {
+		const element: IExtensionData = tree.getFocus();
+		if (element.extension) {
+			this.extensionsWorkdbenchService.open(element.extension, sideByside);
+			return true;
+		}
+		return false;
+	}
+}
+
+class OpenExtensionAction extends Action {
+
+	private _extensionData: IExtensionData;
+
+	constructor(@IExtensionsWorkbenchService private extensionsWorkdbenchService: IExtensionsWorkbenchService) {
+		super('extensions.action.openExtension', '');
+	}
+
+	public set extensionData(extension: IExtensionData) {
+		this._extensionData = extension;
+	}
+
+	public get extensionData(): IExtensionData {
+		return this._extensionData;
+	}
+
+	run(sideByside: boolean): TPromise<any> {
+		return this.extensionsWorkdbenchService.open(this.extensionData.extension, sideByside);
+	}
+}
+
+export class ExtensionsTree extends WorkbenchTree {
+
+	constructor(
+		input: IExtensionData,
+		container: HTMLElement,
+		@IContextKeyService contextKeyService: IContextKeyService,
+		@IListService listService: IListService,
+		@IThemeService themeService: IThemeService,
+		@IInstantiationService instantiationService: IInstantiationService,
+		@IConfigurationService configurationService: IConfigurationService
+	) {
+		const renderer = instantiationService.createInstance(Renderer);
+		const controller = instantiationService.createInstance(Controller);
+
+		super(
+			container,
+			{
+				dataSource: new DataSource(),
+				renderer,
+				controller
+			}, {
+				indentPixels: 40,
+				twistiePixels: 20
+			},
+			contextKeyService, listService, themeService, instantiationService, configurationService
+		);
+
+		this.setInput(input);
+
+		this.disposables.push(this.onDidChangeSelection(event => {
+			if (event && event.payload && event.payload.origin === 'keyboard') {
+				controller.openExtension(this, false);
+			}
+		}));
+	}
+}
\ No newline at end of file
diff --git a/src/vs/workbench/parts/extensions/browser/media/language-icon.png b/src/vs/workbench/parts/extensions/browser/media/language-icon.png
deleted file mode 100644
index 7f7e56c098e..00000000000
Binary files a/src/vs/workbench/parts/extensions/browser/media/language-icon.png and /dev/null differ
diff --git a/src/vs/workbench/parts/extensions/browser/media/loading.svg b/src/vs/workbench/parts/extensions/browser/media/loading.svg
deleted file mode 100644
index 0098fd9f264..00000000000
--- a/src/vs/workbench/parts/extensions/browser/media/loading.svg
+++ /dev/null
@@ -1,36 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="575" height="6px">
-  <style>
-    circle {
-      animation: ball 2.5s cubic-bezier(0.000, 1.000, 1.000, 0.000) infinite;
-      fill: #bbb;
-    }
-
-    #balls {
-      animation: balls 2.5s linear infinite;
-    }
-
-    #circle2 { animation-delay: 0.1s; }
-    #circle3 { animation-delay: 0.2s; }
-    #circle4 { animation-delay: 0.3s; }
-    #circle5 { animation-delay: 0.4s; }
-
-    @keyframes ball {
-      from { transform: none; }
-      20% { transform: none; }
-      80% { transform: translateX(864px); }
-      to { transform: translateX(864px); }
-    }
-
-    @keyframes balls {
-      from { transform: translateX(-40px); }
-      to { transform: translateX(30px); }
-    }
-  </style>
-  <g id="balls">
-    <circle class="circle" id="circle1" cx="-115" cy="3" r="3"/>
-    <circle class="circle" id="circle2" cx="-130" cy="3" r="3" />
-    <circle class="circle" id="circle3" cx="-145" cy="3" r="3" />
-    <circle class="circle" id="circle4" cx="-160" cy="3" r="3" />
-    <circle class="circle" id="circle5" cx="-175" cy="3" r="3" />
-  </g>
-</svg>
\ No newline at end of file
diff --git a/src/vs/workbench/parts/extensions/common/extensionQuery.ts b/src/vs/workbench/parts/extensions/common/extensionQuery.ts
index 5dd7153d2ae..5f85a0ee0e0 100644
--- a/src/vs/workbench/parts/extensions/common/extensionQuery.ts
+++ b/src/vs/workbench/parts/extensions/common/extensionQuery.ts
@@ -3,22 +3,59 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+
+import { flatten } from 'vs/base/common/arrays';
+
 export class Query {
 
-	constructor(public value: string, public sortBy: string) {
+	constructor(public value: string, public sortBy: string, public groupBy: string) {
 		this.value = value.trim();
 	}
 
+	static suggestions(query: string): string[] {
+		const commands = ['installed', 'outdated', 'enabled', 'disabled', 'builtin', 'recommended', 'sort', 'category', 'tag', 'ext'];
+		const subcommands = {
+			'sort': ['installs', 'rating', 'name'],
+			'category': ['"programming languages"', 'snippets', 'linters', 'themes', 'debuggers', 'formatters', 'keymaps', '"scm providers"', 'other', '"extension packs"', '"language packs"'],
+			'tag': [''],
+			'ext': ['']
+		};
+
+		let queryContains = (substr: string) => query.indexOf(substr) > -1;
+		let hasSort = subcommands.sort.some(subcommand => queryContains(`@sort:${subcommand}`));
+		let hasCategory = subcommands.category.some(subcommand => queryContains(`@category:${subcommand}`));
+
+		return flatten(
+			commands.map(command => {
+				if (hasSort && command === 'sort' || hasCategory && command === 'category') {
+					return [];
+				}
+				if (subcommands[command]) {
+					return subcommands[command].map(subcommand => `@${command}:${subcommand}${subcommand === '' ? '' : ' '}`);
+				}
+				else {
+					return [`@${command} `];
+				}
+			}));
+
+	}
+
 	static parse(value: string): Query {
 		let sortBy = '';
-
 		value = value.replace(/@sort:(\w+)(-\w*)?/g, (match, by: string, order: string) => {
 			sortBy = by;
 
 			return '';
 		});
 
-		return new Query(value, sortBy);
+		let groupBy = '';
+		value = value.replace(/@group:(\w+)(-\w*)?/g, (match, by: string, order: string) => {
+			groupBy = by;
+
+			return '';
+		});
+
+		return new Query(value, sortBy, groupBy);
 	}
 
 	toString(): string {
@@ -27,6 +64,9 @@ export class Query {
 		if (this.sortBy) {
 			result = `${result}${result ? ' ' : ''}@sort:${this.sortBy}`;
 		}
+		if (this.groupBy) {
+			result = `${result}${result ? ' ' : ''}@group:${this.groupBy}`;
+		}
 
 		return result;
 	}
diff --git a/src/vs/workbench/parts/extensions/common/extensions.ts b/src/vs/workbench/parts/extensions/common/extensions.ts
index 0a8636cb1ef..ca6f8e8204b 100644
--- a/src/vs/workbench/parts/extensions/common/extensions.ts
+++ b/src/vs/workbench/parts/extensions/common/extensions.ts
@@ -8,9 +8,10 @@ import { createDecorator } from 'vs/platform/instantiation/common/instantiation'
 import { Event } from 'vs/base/common/event';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { IPager } from 'vs/base/common/paging';
-import { IQueryOptions, IExtensionManifest, LocalExtensionType, EnablementState, ILocalExtension } from 'vs/platform/extensionManagement/common/extensionManagement';
+import { IQueryOptions, IExtensionManifest, LocalExtensionType, EnablementState, ILocalExtension, IGalleryExtension } from 'vs/platform/extensionManagement/common/extensionManagement';
 import { IViewContainersRegistry, ViewContainer, Extensions as ViewContainerExtensions } from 'vs/workbench/common/views';
 import { Registry } from 'vs/platform/registry/common/platform';
+import { CancellationToken } from 'vs/base/common/cancellation';
 
 export const VIEWLET_ID = 'workbench.view.extensions';
 export const VIEW_CONTAINER: ViewContainer = Registry.as<IViewContainersRegistry>(ViewContainerExtensions.ViewContainersRegistry).registerViewContainer(VIEWLET_ID);
@@ -19,7 +20,7 @@ export interface IExtensionsViewlet extends IViewlet {
 	search(text: string): void;
 }
 
-export enum ExtensionState {
+export const enum ExtensionState {
 	Installing,
 	Installed,
 	Uninstalling,
@@ -39,7 +40,6 @@ export interface IExtension {
 	latestVersion: string;
 	description: string;
 	url: string;
-	downloadUrl: string;
 	repository: string;
 	iconUrl: string;
 	iconUrlFallback: string;
@@ -50,12 +50,17 @@ export interface IExtension {
 	outdated: boolean;
 	enablementState: EnablementState;
 	dependencies: string[];
+	extensionPack: string[];
 	telemetryData: any;
 	preview: boolean;
-	getManifest(): TPromise<IExtensionManifest>;
-	getReadme(): TPromise<string>;
-	getChangelog(): TPromise<string>;
+	getManifest(token: CancellationToken): TPromise<IExtensionManifest | undefined>;
+	getReadme(token: CancellationToken): TPromise<string>;
+	hasReadme(): boolean;
+	getChangelog(token: CancellationToken): TPromise<string>;
+	hasChangelog(): boolean;
 	local?: ILocalExtension;
+	locals?: ILocalExtension[];
+	gallery?: IGalleryExtension;
 	isMalicious: boolean;
 }
 
@@ -73,7 +78,7 @@ export const IExtensionsWorkbenchService = createDecorator<IExtensionsWorkbenchS
 
 export interface IExtensionsWorkbenchService {
 	_serviceBrand: any;
-	onChange: Event<void>;
+	onChange: Event<IExtension | undefined>;
 	local: IExtension[];
 	queryLocal(): TPromise<IExtension[]>;
 	queryGallery(options?: IQueryOptions): TPromise<IPager<IExtension>>;
@@ -83,7 +88,7 @@ export interface IExtensionsWorkbenchService {
 	uninstall(extension: IExtension): TPromise<void>;
 	reinstall(extension: IExtension): TPromise<void>;
 	setEnablement(extensions: IExtension | IExtension[], enablementState: EnablementState): TPromise<void>;
-	loadDependencies(extension: IExtension): TPromise<IExtensionDependencies>;
+	loadDependencies(extension: IExtension, token: CancellationToken): TPromise<IExtensionDependencies>;
 	open(extension: IExtension, sideByside?: boolean): TPromise<any>;
 	checkForUpdates(): TPromise<void>;
 	allowedBadgeProviders: string[];
@@ -91,10 +96,14 @@ export interface IExtensionsWorkbenchService {
 
 export const ConfigurationKey = 'extensions';
 export const AutoUpdateConfigurationKey = 'extensions.autoUpdate';
+export const AutoCheckUpdatesConfigurationKey = 'extensions.autoCheckUpdates';
 export const ShowRecommendationsOnlyOnDemandKey = 'extensions.showRecommendationsOnlyOnDemand';
+export const CloseExtensionDetailsOnViewChangeKey = 'extensions.closeExtensionDetailsOnViewChange';
 
 export interface IExtensionsConfiguration {
 	autoUpdate: boolean;
+	autoCheckUpdates: boolean;
 	ignoreRecommendations: boolean;
 	showRecommendationsOnlyOnDemand: boolean;
+	closeExtensionDetailsOnViewChange: boolean;
 }
diff --git a/src/vs/workbench/parts/extensions/common/extensionsFileTemplate.ts b/src/vs/workbench/parts/extensions/common/extensionsFileTemplate.ts
index fc81cb063d1..7f719e46e5f 100644
--- a/src/vs/workbench/parts/extensions/common/extensionsFileTemplate.ts
+++ b/src/vs/workbench/parts/extensions/common/extensionsFileTemplate.ts
@@ -13,10 +13,20 @@ export const ExtensionsConfigurationSchema: IJSONSchema = {
 	allowComments: true,
 	type: 'object',
 	title: localize('app.extensions.json.title', "Extensions"),
+	additionalProperties: false,
 	properties: {
 		recommendations: {
 			type: 'array',
-			description: localize('app.extensions.json.recommendations', "List of extensions recommendations. The identifier of an extension is always '${publisher}.${name}'. For example: 'vscode.csharp'."),
+			description: localize('app.extensions.json.recommendations', "List of extensions which should be recommended for users of this workspace. The identifier of an extension is always '${publisher}.${name}'. For example: 'vscode.csharp'."),
+			items: {
+				type: 'string',
+				pattern: EXTENSION_IDENTIFIER_PATTERN,
+				errorMessage: localize('app.extension.identifier.errorMessage', "Expected format '${publisher}.${name}'. Example: 'vscode.csharp'.")
+			},
+		},
+		unwantedRecommendations: {
+			type: 'array',
+			description: localize('app.extensions.json.unwantedRecommendations', "List of extensions recommended by VS Code that should not be recommended for users of this workspace. The identifier of an extension is always '${publisher}.${name}'. For example: 'vscode.csharp'."),
 			items: {
 				type: 'string',
 				pattern: EXTENSION_IDENTIFIER_PATTERN,
@@ -28,10 +38,15 @@ export const ExtensionsConfigurationSchema: IJSONSchema = {
 
 export const ExtensionsConfigurationInitialContent: string = [
 	'{',
-	'\t// See http://go.microsoft.com/fwlink/?LinkId=827846',
-	'\t// for the documentation about the extensions.json format',
+	'\t// See http://go.microsoft.com/fwlink/?LinkId=827846 to learn about workspace recommendations.',
+	'\t// Extension identifier format: ${publisher}.${name}. Example: vscode.csharp',
+	'',
+	'\t// List of extensions which should be recommended for users of this workspace.',
 	'\t"recommendations": [',
-	'\t\t// Extension identifier format: ${publisher}.${name}. Example: vscode.csharp',
+	'\t\t',
+	'\t],',
+	'\t// List of extensions recommended by VS Code that should not be recommended for users of this workspace.',
+	'\t"unwantedRecommendations": [',
 	'\t\t',
 	'\t]',
 	'}'
diff --git a/src/vs/workbench/parts/extensions/common/extensionsInput.ts b/src/vs/workbench/parts/extensions/common/extensionsInput.ts
index 02f28094501..73557933c4b 100644
--- a/src/vs/workbench/parts/extensions/common/extensionsInput.ts
+++ b/src/vs/workbench/parts/extensions/common/extensionsInput.ts
@@ -9,14 +9,16 @@ import { localize } from 'vs/nls';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { EditorInput } from 'vs/workbench/common/editor';
 import { IExtension } from 'vs/workbench/parts/extensions/common/extensions';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 
 export class ExtensionsInput extends EditorInput {
 
 	static readonly ID = 'workbench.extensions.input2';
 	get extension(): IExtension { return this._extension; }
 
-	constructor(private _extension: IExtension) {
+	constructor(
+		private _extension: IExtension,
+	) {
 		super();
 	}
 
@@ -39,7 +41,7 @@ export class ExtensionsInput extends EditorInput {
 		return this.extension === otherExtensionInput.extension;
 	}
 
-	resolve(refresh?: boolean): TPromise<any> {
+	resolve(): TPromise<any> {
 		return TPromise.as(null);
 	}
 
diff --git a/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.ts b/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.ts
index f6120fd51f7..47220facb67 100644
--- a/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.ts
+++ b/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.ts
@@ -7,13 +7,13 @@
 
 import 'vs/css!./media/extensionEditor';
 import { localize } from 'vs/nls';
-import { TPromise } from 'vs/base/common/winjs.base';
+import { TPromise, Promise } from 'vs/base/common/winjs.base';
 import { marked } from 'vs/base/common/marked/marked';
-import { always } from 'vs/base/common/async';
+import { createCancelablePromise } from 'vs/base/common/async';
 import * as arrays from 'vs/base/common/arrays';
 import { OS } from 'vs/base/common/platform';
 import { Event, Emitter, once, chain } from 'vs/base/common/event';
-import Cache from 'vs/base/common/cache';
+import { Cache, CacheResult } from 'vs/base/common/cache';
 import { Action } from 'vs/base/common/actions';
 import { isPromiseCanceledError } from 'vs/base/common/errors';
 import { IDisposable, dispose, toDisposable } from 'vs/base/common/lifecycle';
@@ -27,13 +27,11 @@ import { IExtensionManifest, IKeyBinding, IView, IExtensionTipsService, LocalExt
 import { ResolvedKeybinding, KeyMod, KeyCode } from 'vs/base/common/keyCodes';
 import { ExtensionsInput } from 'vs/workbench/parts/extensions/common/extensionsInput';
 import { IExtensionsWorkbenchService, IExtensionsViewlet, VIEWLET_ID, IExtension, IExtensionDependencies } from 'vs/workbench/parts/extensions/common/extensions';
-import { Renderer, DataSource, Controller } from 'vs/workbench/parts/extensions/browser/dependenciesViewer';
 import { RatingsWidget, InstallCountWidget } from 'vs/workbench/parts/extensions/browser/extensionsWidgets';
 import { EditorOptions } from 'vs/workbench/common/editor';
 import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
-import { CombinedInstallAction, UpdateAction, EnableAction, DisableAction, ReloadAction, MaliciousStatusLabelAction, DisabledStatusLabelAction } from 'vs/workbench/parts/extensions/browser/extensionsActions';
+import { CombinedInstallAction, UpdateAction, EnableAction, DisableAction, ReloadAction, MaliciousStatusLabelAction, DisabledStatusLabelAction, IgnoreExtensionRecommendationAction, UndoIgnoreExtensionRecommendationAction } from 'vs/workbench/parts/extensions/electron-browser/extensionsActions';
 import { WebviewElement } from 'vs/workbench/parts/webview/electron-browser/webviewElement';
-import { KeybindingIO } from 'vs/workbench/services/keybinding/common/keybindingIO';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { DomScrollableElement } from 'vs/base/browser/ui/scrollbar/scrollableElement';
 import { IOpenerService } from 'vs/platform/opener/common/opener';
@@ -41,20 +39,17 @@ import { Tree } from 'vs/base/parts/tree/browser/treeImpl';
 import { IPartService, Parts } from 'vs/workbench/services/part/common/partService';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { KeybindingLabel } from 'vs/base/browser/ui/keybindingLabel/keybindingLabel';
-import { IContextKeyService, RawContextKey, IContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { Command, ICommandOptions } from 'vs/editor/browser/editorExtensions';
+import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
+import { Command } from 'vs/editor/browser/editorExtensions';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRegistry';
+import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
 import { Color } from 'vs/base/common/color';
-import { WorkbenchTree } from 'vs/platform/list/browser/listService';
 import { assign } from 'vs/base/common/objects';
 import { INotificationService } from 'vs/platform/notification/common/notification';
 import { CancellationToken } from 'vs/base/common/cancellation';
-
-/**  A context key that is set when an extension editor webview has focus. */
-export const KEYBINDING_CONTEXT_EXTENSIONEDITOR_WEBVIEW_FOCUS = new RawContextKey<boolean>('extensionEditorWebviewFocus', undefined);
-/**  A context key that is set when the find widget find input in extension editor webview is focused. */
-export const KEYBINDING_CONTEXT_EXTENSIONEDITOR_FIND_WIDGET_INPUT_FOCUSED = new RawContextKey<boolean>('extensionEditorFindWidgetInputFocused', false);
+import { ExtensionsTree, IExtensionData } from 'vs/workbench/parts/extensions/browser/extensionsViewer';
+import { ShowCurrentReleaseNotesAction } from 'vs/workbench/parts/update/electron-browser/update';
+import { KeybindingParser } from 'vs/base/common/keybindingParser';
 
 function renderBody(body: string): string {
 	const styleSheetPath = require.toUrl('./media/markdown.css').replace('file://', 'vscode-core-resource://');
@@ -138,7 +133,8 @@ const NavbarSection = {
 	Readme: 'readme',
 	Contributions: 'contributions',
 	Changelog: 'changelog',
-	Dependencies: 'dependencies'
+	Dependencies: 'dependencies',
+	ExtensionPack: 'extensionPack'
 };
 
 interface ILayoutParticipant {
@@ -164,6 +160,8 @@ export class ExtensionEditor extends BaseEditor {
 	private navbar: NavBar;
 	private content: HTMLElement;
 	private recommendation: HTMLElement;
+	private recommendationText: HTMLElement;
+	private ignoreActionbar: ActionBar;
 	private header: HTMLElement;
 
 	private extensionReadme: Cache<string>;
@@ -171,8 +169,6 @@ export class ExtensionEditor extends BaseEditor {
 	private extensionManifest: Cache<IExtensionManifest>;
 	private extensionDependencies: Cache<IExtensionDependencies>;
 
-	private contextKey: IContextKey<boolean>;
-	private findInputFocusContextKey: IContextKey<boolean>;
 	private layoutParticipants: ILayoutParticipant[] = [];
 	private contentDisposables: IDisposable[] = [];
 	private transientDisposables: IDisposable[] = [];
@@ -190,7 +186,6 @@ export class ExtensionEditor extends BaseEditor {
 		@INotificationService private readonly notificationService: INotificationService,
 		@IOpenerService private readonly openerService: IOpenerService,
 		@IPartService private readonly partService: IPartService,
-		@IContextKeyService private readonly contextKeyService: IContextKeyService,
 		@IExtensionTipsService private readonly extensionTipsService: IExtensionTipsService,
 	) {
 		super(ExtensionEditor.ID, telemetryService, themeService);
@@ -199,8 +194,6 @@ export class ExtensionEditor extends BaseEditor {
 		this.extensionChangelog = null;
 		this.extensionManifest = null;
 		this.extensionDependencies = null;
-		this.contextKey = KEYBINDING_CONTEXT_EXTENSIONEDITOR_WEBVIEW_FOCUS.bindTo(this.contextKeyService);
-		this.findInputFocusContextKey = KEYBINDING_CONTEXT_EXTENSIONEDITOR_FIND_WIDGET_INPUT_FOCUSED.bindTo(this.contextKeyService);
 	}
 
 	createEditor(parent: HTMLElement): void {
@@ -250,15 +243,24 @@ export class ExtensionEditor extends BaseEditor {
 				return null;
 			}
 		});
-		this.disposables.push(this.extensionActionBar);
 
 		this.recommendation = append(details, $('.recommendation'));
+		this.recommendationText = append(this.recommendation, $('.recommendation-text'));
+		this.ignoreActionbar = new ActionBar(this.recommendation, { animated: false });
+
+		this.disposables.push(this.extensionActionBar);
+		this.disposables.push(this.ignoreActionbar);
 
 		chain(this.extensionActionBar.onDidRun)
 			.map(({ error }) => error)
 			.filter(error => !!error)
 			.on(this.onError, this, this.disposables);
 
+		chain(this.ignoreActionbar.onDidRun)
+			.map(({ error }) => error)
+			.filter(error => !!error)
+			.on(this.onError, this, this.disposables);
+
 		const body = append(root, $('.body'));
 		this.navbar = new NavBar(body);
 
@@ -271,10 +273,10 @@ export class ExtensionEditor extends BaseEditor {
 
 		this.transientDisposables = dispose(this.transientDisposables);
 
-		this.extensionReadme = new Cache(() => extension.getReadme());
-		this.extensionChangelog = new Cache(() => extension.getChangelog());
-		this.extensionManifest = new Cache(() => extension.getManifest());
-		this.extensionDependencies = new Cache(() => this.extensionsWorkbenchService.loadDependencies(extension));
+		this.extensionReadme = new Cache(() => createCancelablePromise(token => extension.getReadme(token)));
+		this.extensionChangelog = new Cache(() => createCancelablePromise(token => extension.getChangelog(token)));
+		this.extensionManifest = new Cache(() => createCancelablePromise(token => extension.getManifest(token)));
+		this.extensionDependencies = new Cache(() => createCancelablePromise(token => this.extensionsWorkbenchService.loadDependencies(extension, token)));
 
 		const onError = once(domEvent(this.icon, 'error'));
 		onError(() => this.icon.src = extension.iconUrlFallback, null, this.transientDisposables);
@@ -288,24 +290,30 @@ export class ExtensionEditor extends BaseEditor {
 		this.publisher.textContent = extension.publisherDisplayName;
 		this.description.textContent = extension.description;
 
+		removeClass(this.header, 'recommendation-ignored');
+		removeClass(this.header, 'recommended');
+
 		const extRecommendations = this.extensionTipsService.getAllRecommendationsWithReason();
 		let recommendationsData = {};
 		if (extRecommendations[extension.id.toLowerCase()]) {
 			addClass(this.header, 'recommended');
-			this.recommendation.textContent = extRecommendations[extension.id.toLowerCase()].reasonText;
+			this.recommendationText.textContent = extRecommendations[extension.id.toLowerCase()].reasonText;
 			recommendationsData = { recommendationReason: extRecommendations[extension.id.toLowerCase()].reasonId };
-		} else {
-			removeClass(this.header, 'recommended');
-			this.recommendation.textContent = '';
+		} else if (this.extensionTipsService.getAllIgnoredRecommendations().global.indexOf(extension.id.toLowerCase()) !== -1) {
+			addClass(this.header, 'recommendation-ignored');
+			this.recommendationText.textContent = localize('recommendationHasBeenIgnored', "You have chosen not to receive recommendations for this extension.");
+		}
+		else {
+			this.recommendationText.textContent = '';
 		}
 
 		/* __GDPR__
-			"extensionGallery:openExtension" : {
-				"recommendationReason": { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
-				"${include}": [
-					"${GalleryExtensionTelemetryData}"
-				]
-			}
+		"extensionGallery:openExtension" : {
+			"recommendationReason": { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"${include}": [
+				"${GalleryExtensionTelemetryData}"
+			]
+		}
 		*/
 		this.telemetryService.publicLog('extensionGallery:openExtension', assign(extension.telemetryData, recommendationsData));
 
@@ -318,7 +326,7 @@ export class ExtensionEditor extends BaseEditor {
 			this.publisher.onclick = finalHandler(() => {
 				this.viewletService.openViewlet(VIEWLET_ID, true)
 					.then(viewlet => viewlet as IExtensionsViewlet)
-					.done(viewlet => viewlet.search(`publisher:"${extension.publisherDisplayName}"`));
+					.then(viewlet => viewlet.search(`publisher:"${extension.publisherDisplayName}"`));
 			});
 
 			if (extension.licenseUrl) {
@@ -332,6 +340,8 @@ export class ExtensionEditor extends BaseEditor {
 			this.name.onclick = null;
 			this.rating.onclick = null;
 			this.publisher.onclick = null;
+			this.license.onclick = null;
+			this.license.style.display = 'none';
 		}
 
 		if (extension.repository) {
@@ -369,16 +379,58 @@ export class ExtensionEditor extends BaseEditor {
 		this.extensionActionBar.push([disabledStatusAction, reloadAction, updateAction, enableAction, disableAction, installAction, maliciousStatusAction], { icon: true, label: true });
 		this.transientDisposables.push(enableAction, updateAction, reloadAction, disableAction, installAction, maliciousStatusAction, disabledStatusAction);
 
+		const ignoreAction = this.instantiationService.createInstance(IgnoreExtensionRecommendationAction);
+		const undoIgnoreAction = this.instantiationService.createInstance(UndoIgnoreExtensionRecommendationAction);
+		ignoreAction.extension = extension;
+		undoIgnoreAction.extension = extension;
+
+		this.extensionTipsService.onRecommendationChange(change => {
+			if (change.extensionId.toLowerCase() === extension.id.toLowerCase()) {
+				if (change.isRecommended) {
+					removeClass(this.header, 'recommendation-ignored');
+					const extRecommendations = this.extensionTipsService.getAllRecommendationsWithReason();
+					if (extRecommendations[extension.id.toLowerCase()]) {
+						addClass(this.header, 'recommended');
+						this.recommendationText.textContent = extRecommendations[extension.id.toLowerCase()].reasonText;
+					}
+				} else {
+					addClass(this.header, 'recommendation-ignored');
+					removeClass(this.header, 'recommended');
+					this.recommendationText.textContent = localize('recommendationHasBeenIgnored', "You have chosen not to receive recommendations for this extension.");
+				}
+			}
+		});
+
+		this.ignoreActionbar.clear();
+		this.ignoreActionbar.push([ignoreAction, undoIgnoreAction], { icon: true, label: true });
+		this.transientDisposables.push(ignoreAction, undoIgnoreAction);
+
 		this.content.innerHTML = ''; // Clear content before setting navbar actions.
 
 		this.navbar.clear();
 		this.navbar.onChange(this.onNavbarChange.bind(this, extension), this, this.transientDisposables);
-		this.navbar.push(NavbarSection.Readme, localize('details', "Details"), localize('detailstooltip', "Extension details, rendered from the extension's 'README.md' file"));
-		this.navbar.push(NavbarSection.Contributions, localize('contributions', "Contributions"), localize('contributionstooltip', "Lists contributions to VS Code by this extension"));
-		this.navbar.push(NavbarSection.Changelog, localize('changelog', "Changelog"), localize('changelogtooltip', "Extension update history, rendered from the extension's 'CHANGELOG.md' file"));
-		this.navbar.push(NavbarSection.Dependencies, localize('dependencies', "Dependencies"), localize('dependenciestooltip', "Lists extensions this extension depends on"));
 
-		this.editorLoadComplete = true;
+		if (extension.hasReadme()) {
+			this.navbar.push(NavbarSection.Readme, localize('details', "Details"), localize('detailstooltip', "Extension details, rendered from the extension's 'README.md' file"));
+		}
+		this.extensionManifest.get()
+			.promise
+			.then(manifest => {
+				if (extension.extensionPack.length) {
+					this.navbar.push(NavbarSection.ExtensionPack, localize('extensionPack', "Extension Pack"), localize('extensionsPack', "Set of extensions that can be installed together"));
+				}
+				if (manifest && manifest.contributes) {
+					this.navbar.push(NavbarSection.Contributions, localize('contributions', "Contributions"), localize('contributionstooltip', "Lists contributions to VS Code by this extension"));
+				}
+				if (extension.hasChangelog()) {
+					this.navbar.push(NavbarSection.Changelog, localize('changelog', "Changelog"), localize('changelogtooltip', "Extension update history, rendered from the extension's 'CHANGELOG.md' file"));
+				}
+				if (extension.dependencies.length) {
+					this.navbar.push(NavbarSection.Dependencies, localize('dependencies', "Dependencies"), localize('dependenciestooltip', "Lists extensions this extension depends on"));
+				}
+				this.editorLoadComplete = true;
+			});
+
 		return super.setInput(input, options, token);
 	}
 
@@ -388,18 +440,6 @@ export class ExtensionEditor extends BaseEditor {
 		}
 	}
 
-	public showNextFindTerm() {
-		if (this.activeWebview) {
-			this.activeWebview.showNextFindTerm();
-		}
-	}
-
-	public showPreviousFindTerm() {
-		if (this.activeWebview) {
-			this.activeWebview.showPreviousFindTerm();
-		}
-	}
-
 	private onNavbarChange(extension: IExtension, id: string): void {
 		if (this.editorLoadComplete) {
 			/* __GDPR__
@@ -421,49 +461,54 @@ export class ExtensionEditor extends BaseEditor {
 			case NavbarSection.Contributions: return this.openContributions();
 			case NavbarSection.Changelog: return this.openChangelog();
 			case NavbarSection.Dependencies: return this.openDependencies(extension);
+			case NavbarSection.ExtensionPack: return this.openExtensionPack(extension);
 		}
 	}
 
-	private openMarkdown(content: TPromise<string>, noContentCopy: string) {
-		return this.loadContents(() => content
+	private openMarkdown(cacheResult: CacheResult<string>, noContentCopy: string): void {
+		this.loadContents(() => cacheResult)
 			.then(marked.parse)
 			.then(renderBody)
 			.then(removeEmbeddedSVGs)
 			.then<void>(body => {
 				const allowedBadgeProviders = this.extensionsWorkbenchService.allowedBadgeProviders;
 				const webViewOptions = allowedBadgeProviders.length > 0 ? { allowScripts: false, allowSvgs: false, svgWhiteList: allowedBadgeProviders } : {};
-				this.activeWebview = this.instantiationService.createInstance(WebviewElement, this.partService.getContainer(Parts.EDITOR_PART), this.contextKey, this.findInputFocusContextKey, webViewOptions);
+				this.activeWebview = this.instantiationService.createInstance(WebviewElement, this.partService.getContainer(Parts.EDITOR_PART), webViewOptions);
 				this.activeWebview.mountTo(this.content);
 				const removeLayoutParticipant = arrays.insert(this.layoutParticipants, this.activeWebview);
 				this.contentDisposables.push(toDisposable(removeLayoutParticipant));
 				this.activeWebview.contents = body;
 
 				this.activeWebview.onDidClickLink(link => {
+					if (!link) {
+						return;
+					}
 					// Whitelist supported schemes for links
-					if (link && ['http', 'https', 'mailto'].indexOf(link.scheme) >= 0) {
+					if (['http', 'https', 'mailto'].indexOf(link.scheme) >= 0 || (link.scheme === 'command' && link.path === ShowCurrentReleaseNotesAction.ID)) {
 						this.openerService.open(link);
 					}
 				}, null, this.contentDisposables);
 				this.contentDisposables.push(this.activeWebview);
+				this.activeWebview.focus();
 			})
 			.then(null, () => {
 				const p = append(this.content, $('p.nocontent'));
 				p.textContent = noContentCopy;
-			}));
+			});
 	}
 
-	private openReadme() {
-		return this.openMarkdown(this.extensionReadme.get(), localize('noReadme', "No README available."));
+	private openReadme(): void {
+		this.openMarkdown(this.extensionReadme.get(), localize('noReadme', "No README available."));
 	}
 
-	private openChangelog() {
-		return this.openMarkdown(this.extensionChangelog.get(), localize('noChangelog', "No Changelog available."));
+	private openChangelog(): void {
+		this.openMarkdown(this.extensionChangelog.get(), localize('noChangelog', "No Changelog available."));
 	}
 
-	private openContributions() {
-		return this.loadContents(() => this.extensionManifest.get()
+	private openContributions(): void {
+		const content = $('div', { class: 'subcontent', tabindex: '0' });
+		this.loadContents(() => this.extensionManifest.get())
 			.then(manifest => {
-				const content = $('div', { class: 'subcontent' });
 				const scrollableContent = new DomScrollableElement(content, {});
 
 				const layout = () => scrollableContent.scanDomNode();
@@ -488,75 +533,140 @@ export class ExtensionEditor extends BaseEditor {
 				scrollableContent.scanDomNode();
 
 				if (isEmpty) {
-					append(this.content, $('p.nocontent')).textContent = localize('noContributions', "No Contributions");
-					return;
+					append(content, $('p.nocontent')).textContent = localize('noContributions', "No Contributions");
+					append(this.content, content);
 				} else {
 					append(this.content, scrollableContent.getDomNode());
 					this.contentDisposables.push(scrollableContent);
 				}
+				content.focus();
 			}, () => {
-				append(this.content, $('p.nocontent')).textContent = localize('noContributions', "No Contributions");
-			}));
+				append(content, $('p.nocontent')).textContent = localize('noContributions', "No Contributions");
+				append(this.content, content);
+				content.focus();
+			});
 	}
 
-	private openDependencies(extension: IExtension) {
+	private openDependencies(extension: IExtension): void {
 		if (extension.dependencies.length === 0) {
 			append(this.content, $('p.nocontent')).textContent = localize('noDependencies', "No Dependencies");
 			return;
 		}
 
-		return this.loadContents(() => {
-			return this.extensionDependencies.get().then(extensionDependencies => {
+		this.loadContents(() => this.extensionDependencies.get())
+			.then(extensionDependencies => {
 				const content = $('div', { class: 'subcontent' });
 				const scrollableContent = new DomScrollableElement(content, {});
 				append(this.content, scrollableContent.getDomNode());
 				this.contentDisposables.push(scrollableContent);
 
-				const tree = this.renderDependencies(content, extensionDependencies);
+				const dependenciesTree = this.renderDependencies(content, extensionDependencies);
 				const layout = () => {
 					scrollableContent.scanDomNode();
 					const scrollDimensions = scrollableContent.getScrollDimensions();
-					tree.layout(scrollDimensions.height);
+					dependenciesTree.layout(scrollDimensions.height);
 				};
 				const removeLayoutParticipant = arrays.insert(this.layoutParticipants, { layout });
 				this.contentDisposables.push(toDisposable(removeLayoutParticipant));
 
-				this.contentDisposables.push(tree);
+				this.contentDisposables.push(dependenciesTree);
 				scrollableContent.scanDomNode();
+				dependenciesTree.domFocus();
 			}, error => {
 				append(this.content, $('p.nocontent')).textContent = error;
 				this.notificationService.error(error);
 			});
-		});
 	}
 
 	private renderDependencies(container: HTMLElement, extensionDependencies: IExtensionDependencies): Tree {
-		const renderer = this.instantiationService.createInstance(Renderer);
-		const controller = this.instantiationService.createInstance(Controller);
-		const tree = this.instantiationService.createInstance(WorkbenchTree, container, {
-			dataSource: new DataSource(),
-			renderer,
-			controller
-		}, {
-				indentPixels: 40,
-				twistiePixels: 20
-			});
+		class ExtensionData implements IExtensionData {
 
-		tree.setInput(extensionDependencies);
+			private readonly extensionDependencies: IExtensionDependencies;
 
-		this.contentDisposables.push(tree.onDidChangeSelection(event => {
-			if (event && event.payload && event.payload.origin === 'keyboard') {
-				controller.openExtension(tree, false);
+			constructor(extensionDependencies: IExtensionDependencies) {
+				this.extensionDependencies = extensionDependencies;
 			}
-		}));
 
-		return tree;
+			get extension(): IExtension {
+				return this.extensionDependencies.extension;
+			}
+
+			get parent(): IExtensionData {
+				return this.extensionDependencies.dependent ? new ExtensionData(this.extensionDependencies.dependent) : null;
+			}
+
+			get hasChildren(): boolean {
+				return this.extensionDependencies.hasDependencies;
+			}
+
+			getChildren(): Promise<IExtensionData[]> {
+				return this.extensionDependencies.dependencies ? TPromise.as(this.extensionDependencies.dependencies.map(d => new ExtensionData(d))) : null;
+			}
+		}
+
+		return this.instantiationService.createInstance(ExtensionsTree, new ExtensionData(extensionDependencies), container);
+	}
+
+	private openExtensionPack(extension: IExtension): void {
+		const content = $('div', { class: 'subcontent' });
+		const scrollableContent = new DomScrollableElement(content, {});
+		append(this.content, scrollableContent.getDomNode());
+		this.contentDisposables.push(scrollableContent);
+
+		const extensionsPackTree = this.renderExtensionPack(content, extension);
+		const layout = () => {
+			scrollableContent.scanDomNode();
+			const scrollDimensions = scrollableContent.getScrollDimensions();
+			extensionsPackTree.layout(scrollDimensions.height);
+		};
+		const removeLayoutParticipant = arrays.insert(this.layoutParticipants, { layout });
+		this.contentDisposables.push(toDisposable(removeLayoutParticipant));
+
+		this.contentDisposables.push(extensionsPackTree);
+		scrollableContent.scanDomNode();
+		extensionsPackTree.domFocus();
+	}
+
+	private renderExtensionPack(container: HTMLElement, extension: IExtension): Tree {
+		const extensionsWorkbenchService = this.extensionsWorkbenchService;
+		class ExtensionData implements IExtensionData {
+
+			readonly extension: IExtension;
+			readonly parent: IExtensionData;
+
+			constructor(extension: IExtension, parent?: IExtensionData) {
+				this.extension = extension;
+				this.parent = parent;
+			}
+
+			get hasChildren(): boolean {
+				return this.extension.extensionPack.length > 0;
+			}
+
+			getChildren(): Promise<IExtensionData[]> {
+				if (this.hasChildren) {
+					const names = arrays.distinct(this.extension.extensionPack, e => e.toLowerCase());
+					return extensionsWorkbenchService.queryGallery({ names, pageSize: names.length })
+						.then(result => result.firstPage.map(extension => new ExtensionData(extension, this)));
+				}
+				return TPromise.as(null);
+			}
+		}
+
+		return this.instantiationService.createInstance(ExtensionsTree, new ExtensionData(extension), container);
 	}
 
 	private renderSettings(container: HTMLElement, manifest: IExtensionManifest, onDetailsToggle: Function): boolean {
 		const contributes = manifest.contributes;
 		const configuration = contributes && contributes.configuration;
-		const properties = configuration && configuration.properties;
+		let properties = {};
+		if (Array.isArray(configuration)) {
+			configuration.forEach(config => {
+				properties = { ...properties, ...config.properties };
+			});
+		} else if (configuration) {
+			properties = configuration.properties;
+		}
 		const contrib = properties ? Object.keys(properties) : [];
 
 		if (!contrib.length) {
@@ -583,8 +693,6 @@ export class ExtensionEditor extends BaseEditor {
 		return true;
 	}
 
-
-
 	private renderDebuggers(container: HTMLElement, manifest: IExtensionManifest, onDetailsToggle: Function): boolean {
 		const contributes = manifest.contributes;
 		const contrib = contributes && contributes.debuggers || [];
@@ -813,7 +921,7 @@ export class ExtensionEditor extends BaseEditor {
 			});
 		});
 
-		const rawKeybindings = contributes && contributes.keybindings || [];
+		const rawKeybindings = contributes && contributes.keybindings ? (Array.isArray(contributes.keybindings) ? contributes.keybindings : [contributes.keybindings]) : [];
 
 		rawKeybindings.forEach(rawKeybinding => {
 			const keybinding = this.resolveKeybinding(rawKeybinding);
@@ -943,7 +1051,7 @@ export class ExtensionEditor extends BaseEditor {
 			case 'darwin': key = rawKeyBinding.mac; break;
 		}
 
-		const keyBinding = KeybindingIO.readKeybinding(key || rawKeyBinding.key, OS);
+		const keyBinding = KeybindingParser.parseKeybinding(key || rawKeyBinding.key, OS);
 		if (!keyBinding) {
 			return null;
 		}
@@ -951,13 +1059,16 @@ export class ExtensionEditor extends BaseEditor {
 		return this.keybindingService.resolveKeybinding(keyBinding)[0];
 	}
 
-	private loadContents(loadingTask: () => TPromise<any>): void {
+	private loadContents<T>(loadingTask: () => CacheResult<T>): Thenable<T> {
 		addClass(this.content, 'loading');
 
-		let promise = loadingTask();
-		promise = always(promise, () => removeClass(this.content, 'loading'));
+		const result = loadingTask();
+		const onDone = () => removeClass(this.content, 'loading');
+		result.promise.then(onDone, onDone);
 
-		this.contentDisposables.push(toDisposable(() => promise.cancel()));
+		this.contentDisposables.push(toDisposable(() => result.dispose()));
+
+		return result.promise;
 	}
 
 	layout(): void {
@@ -997,52 +1108,10 @@ class ShowExtensionEditorFindCommand extends Command {
 }
 const showCommand = new ShowExtensionEditorFindCommand({
 	id: 'editor.action.extensioneditor.showfind',
-	precondition: KEYBINDING_CONTEXT_EXTENSIONEDITOR_WEBVIEW_FOCUS,
+	precondition: ContextKeyExpr.equals('activeEditor', ExtensionEditor.ID),
 	kbOpts: {
-		primary: KeyMod.CtrlCmd | KeyCode.KEY_F
+		primary: KeyMod.CtrlCmd | KeyCode.KEY_F,
+		weight: KeybindingWeight.EditorContrib
 	}
 });
-KeybindingsRegistry.registerCommandAndKeybindingRule(showCommand.toCommandAndKeybindingRule(KeybindingsRegistry.WEIGHT.editorContrib()));
-
-class ShowExtensionEditorFindTermCommand extends Command {
-	constructor(opts: ICommandOptions, private _next: boolean) {
-		super(opts);
-	}
-
-	public runCommand(accessor: ServicesAccessor, args: any): void {
-		const extensionEditor = this.getExtensionEditor(accessor);
-		if (extensionEditor) {
-			if (this._next) {
-				extensionEditor.showNextFindTerm();
-			} else {
-				extensionEditor.showPreviousFindTerm();
-			}
-		}
-	}
-
-	private getExtensionEditor(accessor: ServicesAccessor): ExtensionEditor {
-		const activeControl = accessor.get(IEditorService).activeControl as ExtensionEditor;
-		if (activeControl instanceof ExtensionEditor) {
-			return activeControl;
-		}
-		return null;
-	}
-}
-
-const showNextFindTermCommand = new ShowExtensionEditorFindTermCommand({
-	id: 'editor.action.extensioneditor.showNextFindTerm',
-	precondition: KEYBINDING_CONTEXT_EXTENSIONEDITOR_FIND_WIDGET_INPUT_FOCUSED,
-	kbOpts: {
-		primary: KeyMod.Alt | KeyCode.DownArrow
-	}
-}, true);
-KeybindingsRegistry.registerCommandAndKeybindingRule(showNextFindTermCommand.toCommandAndKeybindingRule(KeybindingsRegistry.WEIGHT.editorContrib()));
-
-const showPreviousFindTermCommand = new ShowExtensionEditorFindTermCommand({
-	id: 'editor.action.extensioneditor.showPreviousFindTerm',
-	precondition: KEYBINDING_CONTEXT_EXTENSIONEDITOR_FIND_WIDGET_INPUT_FOCUSED,
-	kbOpts: {
-		primary: KeyMod.Alt | KeyCode.UpArrow
-	}
-}, false);
-KeybindingsRegistry.registerCommandAndKeybindingRule(showPreviousFindTermCommand.toCommandAndKeybindingRule(KeybindingsRegistry.WEIGHT.editorContrib()));
+showCommand.register();
diff --git a/src/vs/workbench/parts/extensions/electron-browser/extensionProfileService.ts b/src/vs/workbench/parts/extensions/electron-browser/extensionProfileService.ts
index 7ecf2cae755..d16d30ed73d 100644
--- a/src/vs/workbench/parts/extensions/electron-browser/extensionProfileService.ts
+++ b/src/vs/workbench/parts/extensions/electron-browser/extensionProfileService.ts
@@ -12,7 +12,8 @@ import { IExtensionHostProfile, ProfileSession, IExtensionService } from 'vs/wor
 import { Disposable, IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { onUnexpectedError } from 'vs/base/common/errors';
 import { append, $, addDisposableListener } from 'vs/base/browser/dom';
-import { StatusbarAlignment, IStatusbarRegistry, StatusbarItemDescriptor, Extensions, IStatusbarItem } from 'vs/workbench/browser/parts/statusbar/statusbar';
+import { IStatusbarRegistry, StatusbarItemDescriptor, Extensions, IStatusbarItem } from 'vs/workbench/browser/parts/statusbar/statusbar';
+import { StatusbarAlignment } from 'vs/platform/statusbar/common/statusbar';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { IExtensionHostProfileService, ProfileSessionState, RuntimeExtensionsInput } from 'vs/workbench/parts/extensions/electron-browser/runtimeExtensionsEditor';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
diff --git a/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.ts b/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.ts
index aaf3489e160..89f50e43e36 100644
--- a/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.ts
+++ b/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.ts
@@ -10,23 +10,25 @@ import { forEach } from 'vs/base/common/collections';
 import { IDisposable, dispose, Disposable } from 'vs/base/common/lifecycle';
 import { match } from 'vs/base/common/glob';
 import * as json from 'vs/base/common/json';
-import { IExtensionManagementService, IExtensionGalleryService, IExtensionTipsService, ExtensionRecommendationReason, LocalExtensionType, EXTENSION_IDENTIFIER_PATTERN } from 'vs/platform/extensionManagement/common/extensionManagement';
+import {
+	IExtensionManagementService, IExtensionGalleryService, IExtensionTipsService, ExtensionRecommendationReason, LocalExtensionType, EXTENSION_IDENTIFIER_PATTERN,
+	IExtensionsConfigContent, RecommendationChangeNotification, IExtensionRecommendation, ExtensionRecommendationSource, InstallOperation
+} from 'vs/platform/extensionManagement/common/extensionManagement';
 import { IModelService } from 'vs/editor/common/services/modelService';
 import { ITextModel } from 'vs/editor/common/model';
 import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
 import product from 'vs/platform/node/product';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ShowRecommendedExtensionsAction, InstallWorkspaceRecommendedExtensionsAction, InstallRecommendedExtensionAction } from 'vs/workbench/parts/extensions/browser/extensionsActions';
+import { ShowRecommendedExtensionsAction, InstallWorkspaceRecommendedExtensionsAction, InstallRecommendedExtensionAction } from 'vs/workbench/parts/extensions/electron-browser/extensionsActions';
 import Severity from 'vs/base/common/severity';
 import { IWorkspaceContextService, IWorkspaceFolder, IWorkspace, IWorkspaceFoldersChangeEvent, WorkbenchState } from 'vs/platform/workspace/common/workspace';
-import { Schemas } from 'vs/base/common/network';
 import { IFileService } from 'vs/platform/files/common/files';
-import { IExtensionsConfiguration, ConfigurationKey, ShowRecommendationsOnlyOnDemandKey, IExtensionsViewlet } from 'vs/workbench/parts/extensions/common/extensions';
+import { IExtensionsConfiguration, ConfigurationKey, ShowRecommendationsOnlyOnDemandKey, IExtensionsViewlet, IExtensionsWorkbenchService } from 'vs/workbench/parts/extensions/common/extensions';
 import { IConfigurationService, ConfigurationTarget } from 'vs/platform/configuration/common/configuration';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import * as pfs from 'vs/base/node/pfs';
 import * as os from 'os';
-import { flatten, distinct, shuffle } from 'vs/base/common/arrays';
+import { flatten, distinct, shuffle, coalesce } from 'vs/base/common/arrays';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { guessMimeTypes, MIME_UNKNOWN } from 'vs/base/common/mime';
 import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
@@ -36,12 +38,13 @@ import { asJson } from 'vs/base/node/request';
 import { isNumber } from 'vs/base/common/types';
 import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet';
 import { INotificationService } from 'vs/platform/notification/common/notification';
+import { Emitter, Event } from 'vs/base/common/event';
+import { assign } from 'vs/base/common/objects';
+import { URI } from 'vs/base/common/uri';
+import { areSameExtensions, getGalleryExtensionIdFromLocal } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
+import { IExperimentService, ExperimentActionType, ExperimentState } from 'vs/workbench/parts/experiments/node/experimentService';
+import { CancellationToken } from 'vs/base/common/cancellation';
 
-interface IExtensionsContent {
-	recommendations: string[];
-}
-
-const empty: { [key: string]: any; } = Object.create(null);
 const milliSecondsInADay = 1000 * 60 * 60 * 24;
 const choiceNever = localize('neverShowAgain', "Don't Show Again");
 const searchMarketplace = localize('searchMarketplace', "Search Marketplace");
@@ -52,20 +55,40 @@ interface IDynamicWorkspaceRecommendations {
 	recommendations: string[];
 }
 
+function caseInsensitiveGet<T>(obj: { [key: string]: T }, key: string): T | undefined {
+	if (!obj) {
+		return undefined;
+	}
+	for (const _key in obj) {
+		if (Object.hasOwnProperty.call(obj, _key) && _key.toLowerCase() === key.toLowerCase()) {
+			return obj[_key];
+		}
+	}
+	return undefined;
+}
+
 export class ExtensionTipsService extends Disposable implements IExtensionTipsService {
 
 	_serviceBrand: any;
 
-	private _fileBasedRecommendations: { [id: string]: number; } = Object.create(null);
+	private _fileBasedRecommendations: { [id: string]: { recommendedTime: number, sources: ExtensionRecommendationSource[] }; } = Object.create(null);
 	private _exeBasedRecommendations: { [id: string]: string; } = Object.create(null);
 	private _availableRecommendations: { [pattern: string]: string[] } = Object.create(null);
-	private _allWorkspaceRecommendedExtensions: string[] = [];
+	private _allWorkspaceRecommendedExtensions: IExtensionRecommendation[] = [];
 	private _dynamicWorkspaceRecommendations: string[] = [];
+	private _experimentalRecommendations: { [id: string]: string } = Object.create(null);
+	private _allIgnoredRecommendations: string[] = [];
+	private _globallyIgnoredRecommendations: string[] = [];
+	private _workspaceIgnoredRecommendations: string[] = [];
 	private _extensionsRecommendationsUrl: string;
 	private _disposables: IDisposable[] = [];
-	public promptWorkspaceRecommendationsPromise: TPromise<any>;
+	public loadWorkspaceConfigPromise: TPromise<any>;
 	private proactiveRecommendationsFetched: boolean = false;
 
+	private readonly _onRecommendationChange: Emitter<RecommendationChangeNotification> = new Emitter<RecommendationChangeNotification>();
+	onRecommendationChange: Event<RecommendationChangeNotification> = this._onRecommendationChange.event;
+	private sessionSeed: number;
+
 	constructor(
 		@IExtensionGalleryService private readonly _galleryService: IExtensionGalleryService,
 		@IModelService private readonly _modelService: IModelService,
@@ -80,7 +103,10 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe
 		@IExtensionService private extensionService: IExtensionService,
 		@IRequestService private requestService: IRequestService,
 		@IViewletService private viewletService: IViewletService,
-		@INotificationService private notificationService: INotificationService
+		@INotificationService private notificationService: INotificationService,
+		@IExtensionManagementService private extensionManagementService: IExtensionManagementService,
+		@IExtensionsWorkbenchService private extensionWorkbenchService: IExtensionsWorkbenchService,
+		@IExperimentService private experimentService: IExperimentService,
 	) {
 		super();
 
@@ -92,20 +118,47 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe
 			this._extensionsRecommendationsUrl = product.extensionsGallery.recommendationsUrl;
 		}
 
-		this.getCachedDynamicWorkspaceRecommendations();
-		this._suggestFileBasedRecommendations();
-		this.promptWorkspaceRecommendationsPromise = this._suggestWorkspaceRecommendations();
+		this.sessionSeed = +new Date();
 
+		let globallyIgnored = <string[]>JSON.parse(this.storageService.get('extensionsAssistant/ignored_recommendations', StorageScope.GLOBAL, '[]'));
+		this._globallyIgnoredRecommendations = globallyIgnored.map(id => id.toLowerCase());
+
+		this.fetchCachedDynamicWorkspaceRecommendations();
+		this.fetchFileBasedRecommendations();
+		this.fetchExperimentalRecommendations();
 		if (!this.configurationService.getValue<boolean>(ShowRecommendationsOnlyOnDemandKey)) {
 			this.fetchProactiveRecommendations(true);
 		}
 
+		this.loadWorkspaceConfigPromise = this.getWorkspaceRecommendations().then(() => {
+			this.promptWorkspaceRecommendations();
+			this._modelService.onModelAdded(this.promptFiletypeBasedRecommendations, this, this._disposables);
+			this._modelService.getModels().forEach(model => this.promptFiletypeBasedRecommendations(model));
+		});
+
 		this._register(this.contextService.onDidChangeWorkspaceFolders(e => this.onWorkspaceFoldersChanged(e)));
 		this._register(this.configurationService.onDidChangeConfiguration(e => {
 			if (!this.proactiveRecommendationsFetched && !this.configurationService.getValue<boolean>(ShowRecommendationsOnlyOnDemandKey)) {
 				this.fetchProactiveRecommendations();
 			}
 		}));
+		this._register(this.extensionManagementService.onDidInstallExtension(e => {
+			if (e.gallery && e.operation === InstallOperation.Install) {
+				const extRecommendations = this.getAllRecommendationsWithReason() || {};
+				const recommendationReason = extRecommendations[e.gallery.identifier.id.toLowerCase()];
+				if (recommendationReason) {
+					/* __GDPR__
+						"extensionGallery:install:recommendations" : {
+							"recommendationReason": { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+							"${include}": [
+								"${GalleryExtensionTelemetryData}"
+							]
+						}
+					*/
+					this.telemetryService.publicLog('extensionGallery:install:recommendations', assign(e.gallery.telemetryData, { recommendationReason: recommendationReason.reasonId }));
+				}
+			}
+		}));
 	}
 
 	private fetchProactiveRecommendations(calledDuringStartup?: boolean): TPromise<void> {
@@ -118,7 +171,7 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe
 
 			fetchPromise = new TPromise((c, e) => {
 				setTimeout(() => {
-					TPromise.join([this._suggestBasedOnExecutables(), this.getDynamicWorkspaceRecommendations()]).then(() => c(null));
+					TPromise.join([this.fetchExecutableRecommendations(), this.fetchDynamicWorkspaceRecommendations()]).then(() => c(null));
 				}, calledDuringStartup ? 10000 : 0);
 			});
 
@@ -127,7 +180,7 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe
 	}
 
 	private isEnabled(): boolean {
-		return this._galleryService.isEnabled() && !this.environmentService.extensionDevelopmentPath;
+		return this._galleryService.isEnabled() && !this.environmentService.extensionDevelopmentLocationURI;
 	}
 
 	getAllRecommendationsWithReason(): { [id: string]: { reasonId: ExtensionRecommendationReason, reasonText: string }; } {
@@ -137,9 +190,15 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe
 			return output;
 		}
 
+		forEach(this._experimentalRecommendations, entry => output[entry.key.toLowerCase()] = {
+			reasonId: ExtensionRecommendationReason.Experimental,
+			reasonText: entry.value
+		});
+
 		if (this.contextService.getWorkspace().folders && this.contextService.getWorkspace().folders.length === 1) {
 			const currentRepo = this.contextService.getWorkspace().folders[0].name;
-			this._dynamicWorkspaceRecommendations.forEach(x => output[x.toLowerCase()] = {
+
+			this._dynamicWorkspaceRecommendations.forEach(id => output[id.toLowerCase()] = {
 				reasonId: ExtensionRecommendationReason.DynamicWorkspace,
 				reasonText: localize('dynamicWorkspaceRecommendation', "This extension may interest you because it's popular among users of the {0} repository.", currentRepo)
 			});
@@ -150,142 +209,232 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe
 			reasonText: localize('exeBasedRecommendation', "This extension is recommended because you have {0} installed.", entry.value)
 		});
 
-		Object.keys(this._fileBasedRecommendations).forEach(x => output[x.toLowerCase()] = {
+		forEach(this._fileBasedRecommendations, entry => output[entry.key.toLowerCase()] = {
 			reasonId: ExtensionRecommendationReason.File,
 			reasonText: localize('fileBasedRecommendation', "This extension is recommended based on the files you recently opened.")
 		});
 
-		this._allWorkspaceRecommendedExtensions.forEach(x => output[x.toLowerCase()] = {
+		this._allWorkspaceRecommendedExtensions.forEach(({ extensionId }) => output[extensionId.toLowerCase()] = {
 			reasonId: ExtensionRecommendationReason.Workspace,
 			reasonText: localize('workspaceRecommendation', "This extension is recommended by users of the current workspace.")
 		});
 
+		for (const id of this._allIgnoredRecommendations) {
+			delete output[id];
+		}
+
 		return output;
 	}
 
-	getWorkspaceRecommendations(): TPromise<string[]> {
-		if (!this.isEnabled()) {
-			return TPromise.as([]);
-		}
+	getAllIgnoredRecommendations(): { global: string[], workspace: string[] } {
+		return {
+			global: this._globallyIgnoredRecommendations,
+			workspace: this._workspaceIgnoredRecommendations
+		};
+	}
+
+	getWorkspaceRecommendations(): TPromise<IExtensionRecommendation[]> {
+		if (!this.isEnabled()) { return TPromise.as([]); }
+		return this.fetchWorkspaceRecommendations()
+			.then(() => this._allWorkspaceRecommendedExtensions.filter(rec => this.isExtensionAllowedToBeRecommended(rec.extensionId)));
+	}
+
+	private fetchWorkspaceRecommendations(): TPromise<void> {
+
+		if (!this.isEnabled) { return TPromise.as(null); }
+
+		return this.fetchExtensionRecommendationContents()
+			.then(result => this.validateExtensions(result.map(({ contents }) => contents))
+				.then(({ invalidExtensions, message }) => {
+
+					if (invalidExtensions.length > 0 && this.notificationService) {
+						this.notificationService.warn(`The below ${invalidExtensions.length} extension(s) in workspace recommendations have issues:\n${message}`);
+					}
+
+					const seenUnWantedRecommendations: { [id: string]: boolean } = {};
+
+					this._allWorkspaceRecommendedExtensions = [];
+					this._workspaceIgnoredRecommendations = [];
+
+					for (const contentsBySource of result) {
+						if (contentsBySource.contents.unwantedRecommendations) {
+							for (const r of contentsBySource.contents.unwantedRecommendations) {
+								const unwantedRecommendation = r.toLowerCase();
+								if (!seenUnWantedRecommendations[unwantedRecommendation] && invalidExtensions.indexOf(unwantedRecommendation) === -1) {
+									this._workspaceIgnoredRecommendations.push(unwantedRecommendation);
+									seenUnWantedRecommendations[unwantedRecommendation] = true;
+								}
+							}
+						}
+
+						if (contentsBySource.contents.recommendations) {
+							for (const r of contentsBySource.contents.recommendations) {
+								const extensionId = r.toLowerCase();
+								if (invalidExtensions.indexOf(extensionId) === -1) {
+									let recommendation = this._allWorkspaceRecommendedExtensions.filter(r => r.extensionId === extensionId)[0];
+									if (!recommendation) {
+										recommendation = { extensionId, sources: [] };
+										this._allWorkspaceRecommendedExtensions.push(recommendation);
+									}
+									if (recommendation.sources.indexOf(contentsBySource.source) === -1) {
+										recommendation.sources.push(contentsBySource.source);
+									}
+								}
+							}
+						}
+					}
+					this._allIgnoredRecommendations = distinct([...this._globallyIgnoredRecommendations, ...this._workspaceIgnoredRecommendations]);
+				}));
+	}
+
+	private fetchExtensionRecommendationContents(): TPromise<{ contents: IExtensionsConfigContent, source: ExtensionRecommendationSource }[]> {
 		const workspace = this.contextService.getWorkspace();
-		return TPromise.join([this.resolveWorkspaceRecommendations(workspace), ...workspace.folders.map(workspaceFolder => this.resolveWorkspaceFolderRecommendations(workspaceFolder))])
-			.then(recommendations => {
-				this._allWorkspaceRecommendedExtensions = distinct(flatten(recommendations));
-				return this._allWorkspaceRecommendedExtensions;
-			});
+		return TPromise.join<{ contents: IExtensionsConfigContent, source: ExtensionRecommendationSource }>([
+			this.resolveWorkspaceExtensionConfig(workspace).then(contents => contents ? { contents, source: workspace } : null),
+			...workspace.folders.map(workspaceFolder => this.resolveWorkspaceFolderExtensionConfig(workspaceFolder).then(contents => contents ? { contents, source: workspaceFolder } : null))
+		]).then(contents => coalesce(contents));
 	}
 
-	private resolveWorkspaceRecommendations(workspace: IWorkspace): TPromise<string[]> {
-		if (workspace.configuration) {
-			return this.fileService.resolveContent(workspace.configuration)
-				.then(content => this.processWorkspaceRecommendations(json.parse(content.value, [])['extensions']), err => []);
+	private resolveWorkspaceExtensionConfig(workspace: IWorkspace): TPromise<IExtensionsConfigContent | null> {
+		if (!workspace.configuration) {
+			return TPromise.as(null);
 		}
-		return TPromise.as([]);
+
+		return this.fileService.resolveContent(workspace.configuration)
+			.then(content => <IExtensionsConfigContent>(json.parse(content.value)['extensions']), err => null);
 	}
 
-	private resolveWorkspaceFolderRecommendations(workspaceFolder: IWorkspaceFolder): TPromise<string[]> {
+	private resolveWorkspaceFolderExtensionConfig(workspaceFolder: IWorkspaceFolder): TPromise<IExtensionsConfigContent | null> {
 		const extensionsJsonUri = workspaceFolder.toResource(paths.join('.vscode', 'extensions.json'));
-		return this.fileService.resolveFile(extensionsJsonUri).then(() => {
-			return this.fileService.resolveContent(extensionsJsonUri)
-				.then(content => this.processWorkspaceRecommendations(json.parse(content.value, [])), err => []);
-		}, err => []);
+
+		return this.fileService.resolveFile(extensionsJsonUri)
+			.then(() => this.fileService.resolveContent(extensionsJsonUri))
+			.then(content => <IExtensionsConfigContent>json.parse(content.value), err => null);
 	}
 
-	private processWorkspaceRecommendations(extensionsContent: IExtensionsContent): TPromise<string[]> {
+	private async validateExtensions(contents: IExtensionsConfigContent[]): TPromise<{ invalidExtensions: string[], message: string }> {
+		const extensionsContent: IExtensionsConfigContent = {
+			recommendations: distinct(flatten(contents.map(content => content.recommendations || []))),
+			unwantedRecommendations: distinct(flatten(contents.map(content => content.unwantedRecommendations || [])))
+		};
+
 		const regEx = new RegExp(EXTENSION_IDENTIFIER_PATTERN);
 
-		if (extensionsContent && extensionsContent.recommendations && extensionsContent.recommendations.length) {
-			let countBadRecommendations = 0;
-			let badRecommendationsString = '';
-			let filteredRecommendations = extensionsContent.recommendations.filter((element, position) => {
-				if (extensionsContent.recommendations.indexOf(element) !== position) {
+		const invalidExtensions = [];
+		let message = '';
+
+		const regexFilter = (ids: string[]) => {
+			return ids.filter((element, position) => {
+				if (ids.indexOf(element) !== position) {
 					// This is a duplicate entry, it doesn't hurt anybody
 					// but it shouldn't be sent in the gallery query
 					return false;
 				} else if (!regEx.test(element)) {
-					countBadRecommendations++;
-					badRecommendationsString += `${element} (bad format) Expected: <provider>.<name>\n`;
+					invalidExtensions.push(element.toLowerCase());
+					message += `${element} (bad format) Expected: <provider>.<name>\n`;
 					return false;
 				}
-
 				return true;
 			});
+		};
 
-			return this._galleryService.query({ names: filteredRecommendations }).then(pager => {
-				let page = pager.firstPage;
-				let validRecommendations = page.map(extension => {
-					return extension.identifier.id.toLowerCase();
-				});
+		const filteredWanted = regexFilter(extensionsContent.recommendations || []).map(x => x.toLowerCase());
 
-				if (validRecommendations.length !== filteredRecommendations.length) {
-					filteredRecommendations.forEach(element => {
+		if (filteredWanted.length) {
+			try {
+				let validRecommendations = (await this._galleryService.query({ names: filteredWanted })).firstPage
+					.map(extension => extension.identifier.id.toLowerCase());
+
+				if (validRecommendations.length !== filteredWanted.length) {
+					filteredWanted.forEach(element => {
 						if (validRecommendations.indexOf(element.toLowerCase()) === -1) {
-							countBadRecommendations++;
-							badRecommendationsString += `${element} (not found in marketplace)\n`;
+							invalidExtensions.push(element.toLowerCase());
+							message += `${element} (not found in marketplace)\n`;
 						}
 					});
 				}
-
-				if (countBadRecommendations > 0 && this.notificationService) {
-					this.notificationService.warn(
-						'The below ' +
-						countBadRecommendations +
-						' extension(s) in workspace recommendations have issues:\n' +
-						badRecommendationsString
-					);
-				}
-
-				return validRecommendations;
-			});
+			} catch (e) {
+				console.warn('Error querying extensions gallery', e);
+			}
 		}
+		return { invalidExtensions, message };
+	}
 
-		return TPromise.as([]);
-
+	private isExtensionAllowedToBeRecommended(id: string): boolean {
+		return this._allIgnoredRecommendations.indexOf(id.toLowerCase()) === -1;
 	}
 
 	private onWorkspaceFoldersChanged(event: IWorkspaceFoldersChangeEvent): void {
 		if (event.added.length) {
-			TPromise.join(event.added.map(workspaceFolder => this.resolveWorkspaceFolderRecommendations(workspaceFolder)))
-				.then(result => {
-					const newRecommendations = flatten(result);
-					// Suggest only if atleast one of the newly added recommendtations was not suggested before
-					if (newRecommendations.some(e => this._allWorkspaceRecommendedExtensions.indexOf(e) === -1)) {
-						this._suggestWorkspaceRecommendations();
+			const oldWorkspaceRecommended = this._allWorkspaceRecommendedExtensions;
+			this.getWorkspaceRecommendations()
+				.then(currentWorkspaceRecommended => {
+					// Suggest only if at least one of the newly added recommendations was not suggested before
+					if (currentWorkspaceRecommended.some(current => oldWorkspaceRecommended.every(old => current.extensionId !== old.extensionId))) {
+						this.promptWorkspaceRecommendations();
 					}
 				});
 		}
 		this._dynamicWorkspaceRecommendations = [];
 	}
 
-	getFileBasedRecommendations(): string[] {
-		const fileBased = Object.keys(this._fileBasedRecommendations)
+	getFileBasedRecommendations(): IExtensionRecommendation[] {
+		return Object.keys(this._fileBasedRecommendations)
 			.sort((a, b) => {
-				if (this._fileBasedRecommendations[a] === this._fileBasedRecommendations[b]) {
-					if (!product.extensionImportantTips || product.extensionImportantTips[a]) {
+				if (this._fileBasedRecommendations[a].recommendedTime === this._fileBasedRecommendations[b].recommendedTime) {
+					if (!product.extensionImportantTips || caseInsensitiveGet(product.extensionImportantTips, a)) {
 						return -1;
 					}
-					if (product.extensionImportantTips[b]) {
+					if (caseInsensitiveGet(product.extensionImportantTips, b)) {
 						return 1;
 					}
 				}
-				return this._fileBasedRecommendations[a] > this._fileBasedRecommendations[b] ? -1 : 1;
-			});
-		return fileBased;
+				return this._fileBasedRecommendations[a].recommendedTime > this._fileBasedRecommendations[b].recommendedTime ? -1 : 1;
+			})
+			.filter(extensionId => this.isExtensionAllowedToBeRecommended(extensionId))
+			.map(extensionId => (<IExtensionRecommendation>{ extensionId, sources: this._fileBasedRecommendations[extensionId].sources }));
 	}
 
-	getOtherRecommendations(): TPromise<string[]> {
+	getOtherRecommendations(): TPromise<IExtensionRecommendation[]> {
 		return this.fetchProactiveRecommendations().then(() => {
-			const others = distinct([...Object.keys(this._exeBasedRecommendations), ...this._dynamicWorkspaceRecommendations]);
-			shuffle(others);
-			return others;
+			const others = distinct([
+				...Object.keys(this._exeBasedRecommendations),
+				...this._dynamicWorkspaceRecommendations,
+				...Object.keys(this._experimentalRecommendations),
+			]).filter(extensionId => this.isExtensionAllowedToBeRecommended(extensionId));
+			shuffle(others, this.sessionSeed);
+			return others.map(extensionId => {
+				const sources: ExtensionRecommendationSource[] = [];
+				if (this._exeBasedRecommendations[extensionId]) {
+					sources.push('executable');
+				}
+				if (this._dynamicWorkspaceRecommendations.indexOf(extensionId) !== -1) {
+					sources.push('dynamic');
+				}
+				return (<IExtensionRecommendation>{ extensionId, sources });
+			});
 		});
 	}
 
-	getKeymapRecommendations(): string[] {
-		return product.keymapExtensionTips || [];
+	getKeymapRecommendations(): IExtensionRecommendation[] {
+		return (product.keymapExtensionTips || [])
+			.filter(extensionId => this.isExtensionAllowedToBeRecommended(extensionId))
+			.map(extensionId => (<IExtensionRecommendation>{ extensionId, sources: ['application'] }));
 	}
 
-	private _suggestFileBasedRecommendations() {
+	getAllRecommendations(): TPromise<IExtensionRecommendation[]> {
+		if (!this.proactiveRecommendationsFetched) {
+			return TPromise.as([]);
+		}
+		return TPromise.join([
+			this.getWorkspaceRecommendations(),
+			TPromise.as(this.getFileBasedRecommendations()),
+			this.getOtherRecommendations(),
+			TPromise.as(this.getKeymapRecommendations())
+		]).then(result => flatten(result).filter(e => this.isExtensionAllowedToBeRecommended(e.extensionId)));
+	}
+
+	private fetchFileBasedRecommendations() {
 		const extensionTips = product.extensionTips;
 		if (!extensionTips) {
 			return;
@@ -297,9 +446,9 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe
 			let { key: id, value: pattern } = entry;
 			let ids = this._availableRecommendations[pattern];
 			if (!ids) {
-				this._availableRecommendations[pattern] = [id];
+				this._availableRecommendations[pattern] = [id.toLowerCase()];
 			} else {
-				ids.push(id);
+				ids.push(id.toLowerCase());
 			}
 		});
 
@@ -308,16 +457,13 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe
 			const { pattern } = value;
 			let ids = this._availableRecommendations[pattern];
 			if (!ids) {
-				this._availableRecommendations[pattern] = [id];
+				this._availableRecommendations[pattern] = [id.toLowerCase()];
 			} else {
-				ids.push(id);
+				ids.push(id.toLowerCase());
 			}
 		});
 
-		const allRecommendations: string[] = [];
-		forEach(this._availableRecommendations, ({ value: ids }) => {
-			allRecommendations.push(...ids);
-		});
+		const allRecommendations: string[] = flatten((Object.keys(this._availableRecommendations).map(key => this._availableRecommendations[key])));
 
 		// retrieve ids of previous recommendations
 		const storedRecommendationsJson = JSON.parse(this.storageService.get('extensionsAssistant/recommendations', StorageScope.GLOBAL, '[]'));
@@ -325,7 +471,7 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe
 		if (Array.isArray<string>(storedRecommendationsJson)) {
 			for (let id of <string[]>storedRecommendationsJson) {
 				if (allRecommendations.indexOf(id) > -1) {
-					this._fileBasedRecommendations[id] = Date.now();
+					this._fileBasedRecommendations[id.toLowerCase()] = { recommendedTime: Date.now(), sources: ['cached'] };
 				}
 			}
 		} else {
@@ -334,14 +480,11 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe
 				if (typeof entry.value === 'number') {
 					const diff = (now - entry.value) / milliSecondsInADay;
 					if (diff <= 7 && allRecommendations.indexOf(entry.key) > -1) {
-						this._fileBasedRecommendations[entry.key] = entry.value;
+						this._fileBasedRecommendations[entry.key.toLowerCase()] = { recommendedTime: entry.value, sources: ['cached'] };
 					}
 				}
 			});
 		}
-
-		this._modelService.onModelAdded(this._suggest, this, this._disposables);
-		this._modelService.getModels().forEach(model => this._suggest(model));
 	}
 
 	private getMimeTypes(path: string): TPromise<string[]> {
@@ -350,15 +493,15 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe
 		});
 	}
 
-	private _suggest(model: ITextModel): void {
-		const uri = model.uri;
+	private promptFiletypeBasedRecommendations(model: ITextModel): void {
 		let hasSuggestion = false;
 
-		if (!uri || uri.scheme !== Schemas.file) {
+		const uri = model.uri;
+		if (!uri || !this.fileService.canHandleResource(uri)) {
 			return;
 		}
 
-		let fileExtension = paths.extname(uri.fsPath);
+		let fileExtension = paths.extname(uri.path);
 		if (fileExtension) {
 			if (processedFileExtensions.indexOf(fileExtension) > -1) {
 				return;
@@ -370,19 +513,28 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe
 		// the critical path - in case glob-match is slow
 		setImmediate(() => {
 
+			let recommendationsToSuggest: string[] = [];
 			const now = Date.now();
 			forEach(this._availableRecommendations, entry => {
 				let { key: pattern, value: ids } = entry;
-				if (match(pattern, uri.fsPath)) {
+				if (match(pattern, uri.path)) {
 					for (let id of ids) {
-						this._fileBasedRecommendations[id] = now;
+						if (caseInsensitiveGet(product.extensionImportantTips, id)) {
+							recommendationsToSuggest.push(id);
+						}
+						const filedBasedRecommendation = this._fileBasedRecommendations[id.toLowerCase()] || { recommendedTime: now, sources: [] };
+						filedBasedRecommendation.recommendedTime = now;
+						if (!filedBasedRecommendation.sources.some(s => s instanceof URI && s.toString() === uri.toString())) {
+							filedBasedRecommendation.sources.push(uri);
+						}
+						this._fileBasedRecommendations[id.toLowerCase()] = filedBasedRecommendation;
 					}
 				}
 			});
 
 			this.storageService.store(
 				'extensionsAssistant/recommendations',
-				JSON.stringify(this._fileBasedRecommendations),
+				JSON.stringify(Object.keys(this._fileBasedRecommendations).reduce((result, key) => { result[key] = this._fileBasedRecommendations[key].recommendedTime; return result; }, {})),
 				StorageScope.GLOBAL
 			);
 
@@ -392,16 +544,16 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe
 			}
 
 			const importantRecommendationsIgnoreList = <string[]>JSON.parse(this.storageService.get('extensionsAssistant/importantRecommendationsIgnore', StorageScope.GLOBAL, '[]'));
-			let recommendationsToSuggest = Object.keys(product.extensionImportantTips || [])
-				.filter(id => importantRecommendationsIgnoreList.indexOf(id) === -1 && match(product.extensionImportantTips[id]['pattern'], uri.fsPath));
+			recommendationsToSuggest = recommendationsToSuggest.filter(id => importantRecommendationsIgnoreList.indexOf(id) === -1 && this.isExtensionAllowedToBeRecommended(id));
 
-			const importantTipsPromise = recommendationsToSuggest.length === 0 ? TPromise.as(null) : this.extensionsService.getInstalled(LocalExtensionType.User).then(local => {
-				recommendationsToSuggest = recommendationsToSuggest.filter(id => local.every(local => `${local.manifest.publisher}.${local.manifest.name}` !== id));
+			const importantTipsPromise = recommendationsToSuggest.length === 0 ? TPromise.as(null) : this.extensionWorkbenchService.queryLocal().then(local => {
+				const localExtensions = local.map(e => e.id);
+				recommendationsToSuggest = recommendationsToSuggest.filter(id => localExtensions.every(local => local !== id.toLowerCase()));
 				if (!recommendationsToSuggest.length) {
 					return;
 				}
 				const id = recommendationsToSuggest[0];
-				const name = product.extensionImportantTips[id]['name'];
+				const name = caseInsensitiveGet(product.extensionImportantTips, id)['name'];
 
 				// Indicates we have a suggested extension via the whitelist
 				hasSuggestion = true;
@@ -423,10 +575,7 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe
 							}
 							*/
 							this.telemetryService.publicLog('extensionRecommendations:popup', { userReaction: 'install', extensionId: name });
-
-							const installAction = this.instantiationService.createInstance(InstallRecommendedExtensionAction, id);
-							installAction.run();
-							installAction.dispose();
+							this.instantiationService.createInstance(InstallRecommendedExtensionAction, id).run();
 						}
 					}, {
 						label: localize('showRecommendations', "Show Recommendations"),
@@ -460,7 +609,7 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe
 								}
 							*/
 							this.telemetryService.publicLog('extensionRecommendations:popup', { userReaction: 'neverShowAgain', extensionId: name });
-							this.ignoreExtensionRecommendations();
+							this.promptIgnoreExtensionRecommendations();
 						}
 					}],
 					() => {
@@ -522,8 +671,7 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe
 									});
 							}
 						}, {
-							label: choiceNever,
-							isSecondary: true,
+							label: localize('dontShowAgainExtension', "Don't Show Again for '.{0}' files", fileExtension),
 							run: () => {
 								fileExtensionSuggestionIgnoreList.push(fileExtension);
 								this.storageService.store(
@@ -555,91 +703,92 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe
 		});
 	}
 
-	private _suggestWorkspaceRecommendations(): TPromise<any> {
+	private promptWorkspaceRecommendations(): void {
 		const storageKey = 'extensionsAssistant/workspaceRecommendationsIgnore';
 		const config = this.configurationService.getValue<IExtensionsConfiguration>(ConfigurationKey);
+		const filteredRecs = this._allWorkspaceRecommendedExtensions.filter(rec => this.isExtensionAllowedToBeRecommended(rec.extensionId));
 
-		return this.getWorkspaceRecommendations().then(allRecommendations => {
-			if (!allRecommendations.length || config.ignoreRecommendations || config.showRecommendationsOnlyOnDemand || this.storageService.getBoolean(storageKey, StorageScope.WORKSPACE, false)) {
-				return;
+		if (filteredRecs.length === 0
+			|| config.ignoreRecommendations
+			|| config.showRecommendationsOnlyOnDemand
+			|| this.storageService.getBoolean(storageKey, StorageScope.WORKSPACE, false)) {
+			return;
+		}
+
+		this.extensionsService.getInstalled(LocalExtensionType.User).then(local => {
+			const recommendations = filteredRecs.filter(({ extensionId }) => local.every(local => !areSameExtensions({ id: extensionId }, { id: getGalleryExtensionIdFromLocal(local) })));
+
+			if (!recommendations.length) {
+				return TPromise.as(void 0);
 			}
 
-			return this.extensionsService.getInstalled(LocalExtensionType.User).done(local => {
-				const recommendations = allRecommendations
-					.filter(id => local.every(local => `${local.manifest.publisher.toLowerCase()}.${local.manifest.name.toLowerCase()}` !== id));
-
-				if (!recommendations.length) {
-					return TPromise.as(void 0);
-				}
-
-				return new TPromise<void>(c => {
-					this.notificationService.prompt(
-						Severity.Info,
-						localize('workspaceRecommended', "This workspace has extension recommendations."),
-						[{
-							label: localize('installAll', "Install All"),
-							run: () => {
-								/* __GDPR__
-								"extensionWorkspaceRecommendations:popup" : {
-									"userReaction" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-								}
-								*/
-								this.telemetryService.publicLog('extensionWorkspaceRecommendations:popup', { userReaction: 'install' });
-
-								const installAllAction = this.instantiationService.createInstance(InstallWorkspaceRecommendedExtensionsAction, InstallWorkspaceRecommendedExtensionsAction.ID, localize('installAll', "Install All"));
-								installAllAction.run();
-								installAllAction.dispose();
-
-								c(void 0);
+			return new TPromise<void>(c => {
+				this.notificationService.prompt(
+					Severity.Info,
+					localize('workspaceRecommended', "This workspace has extension recommendations."),
+					[{
+						label: localize('installAll', "Install All"),
+						run: () => {
+							/* __GDPR__
+							"extensionWorkspaceRecommendations:popup" : {
+								"userReaction" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
 							}
-						}, {
-							label: localize('showRecommendations', "Show Recommendations"),
-							run: () => {
-								/* __GDPR__
-									"extensionWorkspaceRecommendations:popup" : {
-										"userReaction" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-									}
-								*/
-								this.telemetryService.publicLog('extensionWorkspaceRecommendations:popup', { userReaction: 'show' });
+							*/
+							this.telemetryService.publicLog('extensionWorkspaceRecommendations:popup', { userReaction: 'install' });
 
-								const showAction = this.instantiationService.createInstance(ShowRecommendedExtensionsAction, ShowRecommendedExtensionsAction.ID, localize('showRecommendations', "Show Recommendations"));
-								showAction.run();
-								showAction.dispose();
+							const installAllAction = this.instantiationService.createInstance(InstallWorkspaceRecommendedExtensionsAction, InstallWorkspaceRecommendedExtensionsAction.ID, localize('installAll', "Install All"), recommendations);
+							installAllAction.run();
+							installAllAction.dispose();
 
-								c(void 0);
-							}
-						}, {
-							label: choiceNever,
-							isSecondary: true,
-							run: () => {
-								/* __GDPR__
-									"extensionWorkspaceRecommendations:popup" : {
-										"userReaction" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-									}
-								*/
-								this.telemetryService.publicLog('extensionWorkspaceRecommendations:popup', { userReaction: 'neverShowAgain' });
-								this.storageService.store(storageKey, true, StorageScope.WORKSPACE);
-
-								c(void 0);
-							}
-						}],
-						() => {
+							c(void 0);
+						}
+					}, {
+						label: localize('showRecommendations', "Show Recommendations"),
+						run: () => {
 							/* __GDPR__
 								"extensionWorkspaceRecommendations:popup" : {
 									"userReaction" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
 								}
 							*/
-							this.telemetryService.publicLog('extensionWorkspaceRecommendations:popup', { userReaction: 'cancelled' });
+							this.telemetryService.publicLog('extensionWorkspaceRecommendations:popup', { userReaction: 'show' });
+
+							const showAction = this.instantiationService.createInstance(ShowRecommendedExtensionsAction, ShowRecommendedExtensionsAction.ID, localize('showRecommendations', "Show Recommendations"));
+							showAction.run();
+							showAction.dispose();
 
 							c(void 0);
 						}
-					);
-				});
+					}, {
+						label: choiceNever,
+						isSecondary: true,
+						run: () => {
+							/* __GDPR__
+								"extensionWorkspaceRecommendations:popup" : {
+									"userReaction" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+								}
+							*/
+							this.telemetryService.publicLog('extensionWorkspaceRecommendations:popup', { userReaction: 'neverShowAgain' });
+							this.storageService.store(storageKey, true, StorageScope.WORKSPACE);
+
+							c(void 0);
+						}
+					}],
+					() => {
+						/* __GDPR__
+							"extensionWorkspaceRecommendations:popup" : {
+								"userReaction" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+							}
+						*/
+						this.telemetryService.publicLog('extensionWorkspaceRecommendations:popup', { userReaction: 'cancelled' });
+
+						c(void 0);
+					}
+				);
 			});
 		});
 	}
 
-	private ignoreExtensionRecommendations() {
+	private promptIgnoreExtensionRecommendations() {
 		this.notificationService.prompt(
 			Severity.Info,
 			localize('ignoreExtensionRecommendations', "Do you want to ignore all extension recommendations?"),
@@ -653,7 +802,7 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe
 		);
 	}
 
-	private _suggestBasedOnExecutables(): TPromise<any> {
+	private fetchExecutableRecommendations(): TPromise<any> {
 		const homeDir = os.homedir();
 		let foundExecutables: Set<string> = new Set<string>();
 
@@ -662,9 +811,9 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe
 				if (exists && !foundExecutables.has(exeName)) {
 					foundExecutables.add(exeName);
 					(product.exeBasedExtensionTips[exeName]['recommendations'] || [])
-						.forEach(x => {
+						.forEach(extensionId => {
 							if (product.exeBasedExtensionTips[exeName]['friendlyName']) {
-								this._exeBasedRecommendations[x] = product.exeBasedExtensionTips[exeName]['friendlyName'];
+								this._exeBasedRecommendations[extensionId.toLowerCase()] = product.exeBasedExtensionTips[exeName]['friendlyName'];
 							}
 						});
 				}
@@ -706,7 +855,7 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe
 		}
 	}
 
-	private getCachedDynamicWorkspaceRecommendations() {
+	private fetchCachedDynamicWorkspaceRecommendations() {
 		if (this.contextService.getWorkbenchState() !== WorkbenchState.FOLDER) {
 			return;
 		}
@@ -734,8 +883,9 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe
 		}
 	}
 
-	private getDynamicWorkspaceRecommendations(): TPromise<void> {
+	private fetchDynamicWorkspaceRecommendations(): TPromise<void> {
 		if (this.contextService.getWorkbenchState() !== WorkbenchState.FOLDER
+			|| !this.fileService.canHandleResource(this.contextService.getWorkspace().folders[0].uri)
 			|| this._dynamicWorkspaceRecommendations.length
 			|| !this._extensionsRecommendationsUrl) {
 			return TPromise.as(null);
@@ -749,7 +899,7 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe
 				return null;
 			}
 
-			return this.requestService.request({ type: 'GET', url: this._extensionsRecommendationsUrl }).then(context => {
+			return this.requestService.request({ type: 'GET', url: this._extensionsRecommendationsUrl }, CancellationToken.None).then(context => {
 				if (context.res.statusCode !== 200) {
 					return TPromise.as(null);
 				}
@@ -764,7 +914,7 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe
 						for (let j = 0; j < allRecommendations.length && !foundRemote; j++) {
 							if (Array.isArray(allRecommendations[j].remoteSet) && allRecommendations[j].remoteSet.indexOf(hashedRemotes[i]) > -1) {
 								foundRemote = true;
-								this._dynamicWorkspaceRecommendations = allRecommendations[j].recommendations || [];
+								this._dynamicWorkspaceRecommendations = allRecommendations[j].recommendations.filter(id => this.isExtensionAllowedToBeRecommended(id)) || [];
 								this.storageService.store(storageKey, JSON.stringify({
 									recommendations: this._dynamicWorkspaceRecommendations,
 									timestamp: Date.now()
@@ -784,32 +934,46 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe
 		});
 	}
 
+	private fetchExperimentalRecommendations() {
+		this.experimentService.getExperimentsByType(ExperimentActionType.AddToRecommendations).then(experiments => {
+			(experiments || []).forEach(experiment => {
+				if (experiment.state === ExperimentState.Run && experiment.action.properties && Array.isArray(experiment.action.properties.recommendations) && experiment.action.properties.recommendationReason) {
+					experiment.action.properties.recommendations.forEach(id => {
+						this._experimentalRecommendations[id] = experiment.action.properties.recommendationReason;
+					});
+				}
+			});
+		});
+	}
+
 	getKeywordsForExtension(extension: string): string[] {
 		const keywords = product.extensionKeywords || {};
 		return keywords[extension] || [];
 	}
 
-	getRecommendationsForExtension(extension: string): string[] {
-		const str = `.${extension}`;
-		const result = Object.create(null);
-
-		forEach(product.extensionTips || empty, entry => {
-			let { key: id, value: pattern } = entry;
-
-			if (match(pattern, str)) {
-				result[id] = true;
+	toggleIgnoredRecommendation(extensionId: string, shouldIgnore: boolean) {
+		const lowerId = extensionId.toLowerCase();
+		if (shouldIgnore) {
+			const reason = this.getAllRecommendationsWithReason()[lowerId];
+			if (reason && reason.reasonId) {
+				/* __GDPR__
+					"extensionsRecommendations:ignoreRecommendation" : {
+						"recommendationReason": { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+						"extensionId": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" }
+					}
+				*/
+				this.telemetryService.publicLog('extensionsRecommendations:ignoreRecommendation', { id: extensionId, recommendationReason: reason.reasonId });
 			}
-		});
+		}
 
-		forEach(product.extensionImportantTips || empty, entry => {
-			let { key: id, value } = entry;
+		this._globallyIgnoredRecommendations = shouldIgnore ?
+			distinct([...this._globallyIgnoredRecommendations, lowerId].map(id => id.toLowerCase())) :
+			this._globallyIgnoredRecommendations.filter(id => id !== lowerId);
 
-			if (match(value.pattern, str)) {
-				result[id] = true;
-			}
-		});
+		this.storageService.store('extensionsAssistant/ignored_recommendations', JSON.stringify(this._globallyIgnoredRecommendations), StorageScope.GLOBAL);
+		this._allIgnoredRecommendations = distinct([...this._globallyIgnoredRecommendations, ...this._workspaceIgnoredRecommendations]);
 
-		return Object.keys(result);
+		this._onRecommendationChange.fire({ extensionId: extensionId, isRecommended: !shouldIgnore });
 	}
 
 	dispose() {
diff --git a/src/vs/workbench/parts/extensions/electron-browser/extensions.contribution.ts b/src/vs/workbench/parts/extensions/electron-browser/extensions.contribution.ts
index 369e7f89b08..a942e6f13bb 100644
--- a/src/vs/workbench/parts/extensions/electron-browser/extensions.contribution.ts
+++ b/src/vs/workbench/parts/extensions/electron-browser/extensions.contribution.ts
@@ -5,13 +5,12 @@
 
 import 'vs/css!./media/extensions';
 import { localize } from 'vs/nls';
-import * as errors from 'vs/base/common/errors';
 import { KeyMod, KeyChord, KeyCode } from 'vs/base/common/keyCodes';
 import { Registry } from 'vs/platform/registry/common/platform';
-import { SyncActionDescriptor } from 'vs/platform/actions/common/actions';
+import { SyncActionDescriptor, MenuRegistry, MenuId } from 'vs/platform/actions/common/actions';
 import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { IExtensionGalleryService, IExtensionTipsService, ExtensionsLabel, ExtensionsChannelId, PreferencesLabel } from 'vs/platform/extensionManagement/common/extensionManagement';
-import { ExtensionGalleryService } from 'vs/platform/extensionManagement/node/extensionGalleryService';
+import { IExtensionTipsService, ExtensionsLabel, ExtensionsChannelId, PreferencesLabel } from 'vs/platform/extensionManagement/common/extensionManagement';
+
 import { IWorkbenchActionRegistry, Extensions as WorkbenchActionExtensions } from 'vs/workbench/common/actions';
 import { ExtensionTipsService } from 'vs/workbench/parts/extensions/electron-browser/extensionTipsService';
 import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions';
@@ -23,7 +22,7 @@ import {
 	OpenExtensionsViewletAction, InstallExtensionsAction, ShowOutdatedExtensionsAction, ShowRecommendedExtensionsAction, ShowRecommendedKeymapExtensionsAction, ShowPopularExtensionsAction,
 	ShowEnabledExtensionsAction, ShowInstalledExtensionsAction, ShowDisabledExtensionsAction, ShowBuiltInExtensionsAction, UpdateAllAction,
 	EnableAllAction, EnableAllWorkpsaceAction, DisableAllAction, DisableAllWorkpsaceAction, CheckForUpdatesAction, ShowLanguageExtensionsAction, ShowAzureExtensionsAction, EnableAutoUpdateAction, DisableAutoUpdateAction, ConfigureRecommendedExtensionsCommandsContributor, OpenExtensionsFolderAction, InstallVSIXAction, ReinstallAction
-} from 'vs/workbench/parts/extensions/browser/extensionsActions';
+} from 'vs/workbench/parts/extensions/electron-browser/extensionsActions';
 import { ExtensionsInput } from 'vs/workbench/parts/extensions/common/extensionsInput';
 import { ViewletRegistry, Extensions as ViewletExtensions, ViewletDescriptor } from 'vs/workbench/browser/viewlet';
 import { ExtensionEditor } from 'vs/workbench/parts/extensions/electron-browser/extensionEditor';
@@ -44,9 +43,8 @@ import { EditorInput, IEditorInputFactory, IEditorInputFactoryRegistry, Extensio
 import { ExtensionHostProfileService } from 'vs/workbench/parts/extensions/electron-browser/extensionProfileService';
 
 // Singletons
-registerSingleton(IExtensionGalleryService, ExtensionGalleryService);
-registerSingleton(IExtensionTipsService, ExtensionTipsService);
 registerSingleton(IExtensionsWorkbenchService, ExtensionsWorkbenchService);
+registerSingleton(IExtensionTipsService, ExtensionTipsService);
 registerSingleton(IExtensionHostProfileService, ExtensionHostProfileService);
 
 const workbenchRegistry = Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench);
@@ -57,7 +55,7 @@ workbenchRegistry.registerWorkbenchContribution(KeymapExtensions, LifecyclePhase
 workbenchRegistry.registerWorkbenchContribution(ExtensionsViewletViewsContribution, LifecyclePhase.Starting);
 
 Registry.as<IOutputChannelRegistry>(OutputExtensions.OutputChannels)
-	.registerChannel(ExtensionsChannelId, ExtensionsLabel);
+	.registerChannel({ id: ExtensionsChannelId, label: ExtensionsLabel, log: false });
 
 // Quickopen
 Registry.as<IQuickOpenRegistry>(Extensions.Quickopen).registerQuickOpenHandler(
@@ -204,18 +202,32 @@ Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration)
 		properties: {
 			'extensions.autoUpdate': {
 				type: 'boolean',
-				description: localize('extensionsAutoUpdate', "Automatically update extensions"),
+				description: localize('extensionsAutoUpdate', "When enabled, automatically installs updates for extensions. The updates are fetched from an online service."),
 				default: true,
-				scope: ConfigurationScope.APPLICATION
+				scope: ConfigurationScope.APPLICATION,
+				tags: ['usesOnlineServices']
+			},
+			'extensions.autoCheckUpdates': {
+				type: 'boolean',
+				description: localize('extensionsCheckUpdates', "When enabled, automatically checks extensions for updates. If an extension has an update, it is marked as outdated in the Extensions view. The updates are fetched from an online service."),
+				default: true,
+				scope: ConfigurationScope.APPLICATION,
+				tags: ['usesOnlineServices']
 			},
 			'extensions.ignoreRecommendations': {
 				type: 'boolean',
-				description: localize('extensionsIgnoreRecommendations', "If set to true, the notifications for extension recommendations will stop showing up."),
+				description: localize('extensionsIgnoreRecommendations', "When enabled, the notifications for extension recommendations will not be shown."),
 				default: false
 			},
 			'extensions.showRecommendationsOnlyOnDemand': {
 				type: 'boolean',
-				description: localize('extensionsShowRecommendationsOnlyOnDemand', "If set to true, recommendations will not be fetched or shown unless specifically requested by the user."),
+				description: localize('extensionsShowRecommendationsOnlyOnDemand', "When enabled, recommendations will not be fetched or shown unless specifically requested by the user. Some recommendations are fetched from an online service."),
+				default: false,
+				tags: ['usesOnlineServices']
+			},
+			'extensions.closeExtensionDetailsOnViewChange': {
+				type: 'boolean',
+				description: localize('extensionsCloseExtensionDetailsOnViewChange', "When enabled, editors with extension details will be automatically closed upon navigating away from the Extensions View."),
 				default: false
 			}
 		}
@@ -229,6 +241,37 @@ CommandsRegistry.registerCommand('_extensions.manage', (accessor: ServicesAccess
 	const extensionService = accessor.get(IExtensionsWorkbenchService);
 	const extension = extensionService.local.filter(e => areSameExtensions(e, { id: extensionId }));
 	if (extension.length === 1) {
-		extensionService.open(extension[0]).done(null, errors.onUnexpectedError);
+		extensionService.open(extension[0]);
 	}
-});
\ No newline at end of file
+});
+
+// File menu registration
+
+MenuRegistry.appendMenuItem(MenuId.MenubarPreferencesMenu, {
+	group: '2_keybindings',
+	command: {
+		id: ShowRecommendedKeymapExtensionsAction.ID,
+		title: localize({ key: 'miOpenKeymapExtensions', comment: ['&& denotes a mnemonic'] }, "&&Keymaps")
+	},
+	order: 2
+});
+
+MenuRegistry.appendMenuItem(MenuId.MenubarPreferencesMenu, {
+	group: '1_settings',
+	command: {
+		id: VIEWLET_ID,
+		title: localize({ key: 'miPreferencesExtensions', comment: ['&& denotes a mnemonic'] }, "&&Extensions")
+	},
+	order: 2
+});
+
+// View menu
+
+MenuRegistry.appendMenuItem(MenuId.MenubarViewMenu, {
+	group: '3_views',
+	command: {
+		id: VIEWLET_ID,
+		title: localize({ key: 'miViewExtensions', comment: ['&& denotes a mnemonic'] }, "E&&xtensions")
+	},
+	order: 5
+});
diff --git a/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.ts b/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.ts
index 06d3286942b..8a9c33a3e04 100644
--- a/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.ts
+++ b/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.ts
@@ -3,20 +3,2226 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import 'vs/css!./media/extensionActions';
 import { localize } from 'vs/nls';
 import { TPromise } from 'vs/base/common/winjs.base';
-import { Action } from 'vs/base/common/actions';
+import { IAction, Action } from 'vs/base/common/actions';
+import { Throttler } from 'vs/base/common/async';
+import severity from 'vs/base/common/severity';
+import * as DOM from 'vs/base/browser/dom';
 import * as paths from 'vs/base/common/paths';
-import { IExtensionsWorkbenchService, IExtension } from 'vs/workbench/parts/extensions/common/extensions';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { IWindowsService, IWindowService } from 'vs/platform/windows/common/windows';
-import { IFileService } from 'vs/platform/files/common/files';
-import URI from 'vs/base/common/uri';
-import Severity from 'vs/base/common/severity';
+import { Event } from 'vs/base/common/event';
+import * as json from 'vs/base/common/json';
+import { ActionItem, IActionItem, Separator } from 'vs/base/browser/ui/actionbar/actionbar';
+import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
+import { IDisposable, dispose, Disposable } from 'vs/base/common/lifecycle';
+import { IExtension, ExtensionState, IExtensionsWorkbenchService, VIEWLET_ID, IExtensionsViewlet, AutoUpdateConfigurationKey } from 'vs/workbench/parts/extensions/common/extensions';
+import { ExtensionsConfigurationInitialContent } from 'vs/workbench/parts/extensions/common/extensionsFileTemplate';
+import { LocalExtensionType, IExtensionEnablementService, IExtensionTipsService, EnablementState, ExtensionsLabel, IExtensionRecommendation, IGalleryExtension, IExtensionsConfigContent, IExtensionManagementServerService } from 'vs/platform/extensionManagement/common/extensionManagement';
+import { areSameExtensions } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
+import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
+import { ToggleViewletAction } from 'vs/workbench/browser/viewlet';
+import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet';
+import { Query } from 'vs/workbench/parts/extensions/common/extensionQuery';
+import { IFileService, IContent } from 'vs/platform/files/common/files';
+import { IWorkspaceContextService, WorkbenchState, IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
+import { IWindowService, IWindowsService } from 'vs/platform/windows/common/windows';
+import { IExtensionService, IExtensionDescription } from 'vs/workbench/services/extensions/common/extensions';
+import { URI } from 'vs/base/common/uri';
+import { CommandsRegistry, ICommandService } from 'vs/platform/commands/common/commands';
+import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { registerThemingParticipant, ITheme, ICssStyleCollector } from 'vs/platform/theme/common/themeService';
+import { buttonBackground, buttonForeground, buttonHoverBackground, contrastBorder, registerColor, foreground } from 'vs/platform/theme/common/colorRegistry';
+import { Color } from 'vs/base/common/color';
+import { IJSONEditingService } from 'vs/workbench/services/configuration/common/jsonEditing';
+import { ITextEditorSelection } from 'vs/platform/editor/common/editor';
+import { ITextModelService } from 'vs/editor/common/services/resolverService';
+import { PagedModel } from 'vs/base/common/paging';
+import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
+import { IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
+import { MenuRegistry, MenuId } from 'vs/platform/actions/common/actions';
+import { PICK_WORKSPACE_FOLDER_COMMAND_ID } from 'vs/workbench/browser/actions/workspaceCommands';
+import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
+import { IOpenerService } from 'vs/platform/opener/common/opener';
 import { mnemonicButtonLabel } from 'vs/base/common/labels';
-import { IQuickOpenService, IPickOpenEntry } from 'vs/platform/quickOpen/common/quickOpen';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { LocalExtensionType } from 'vs/platform/extensionManagement/common/extensionManagement';
+import { IEnvironmentService } from 'vs/platform/environment/common/environment';
+import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
+import { IEditorGroupsService } from 'vs/workbench/services/group/common/editorGroupsService';
+import { ExtensionsInput } from 'vs/workbench/parts/extensions/common/extensionsInput';
+import product from 'vs/platform/node/product';
+import { IQuickPickItem, IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
+import { CancellationToken } from 'vs/base/common/cancellation';
+
+const promptDownloadManually = (extension: IGalleryExtension, message: string, instantiationService: IInstantiationService, notificationService: INotificationService, openerService: IOpenerService) => {
+	const downloadUrl = `${product.extensionsGallery.serviceUrl}/publishers/${extension.publisher}/vsextensions/${extension.name}/${extension.version}/vspackage`;
+	notificationService.prompt(Severity.Error, message, [{
+		label: localize('download', "Download Manually"),
+		run: () => openerService.open(URI.parse(downloadUrl)).then(() => {
+			notificationService.prompt(
+				Severity.Info,
+				localize('install vsix', 'Once downloaded, please manually install the downloaded VSIX of \'{0}\'.', extension.identifier.id),
+				[{
+					label: InstallVSIXAction.LABEL,
+					run: () => {
+						const action = instantiationService.createInstance(InstallVSIXAction, InstallVSIXAction.ID, InstallVSIXAction.LABEL);
+						action.run();
+						action.dispose();
+					}
+				}]
+			);
+		})
+	}]);
+};
+
+export interface IExtensionAction extends IAction {
+	extension: IExtension;
+}
+
+export class InstallAction extends Action {
+
+	private static INSTALL_LABEL = localize('install', "Install");
+	private static INSTALLING_LABEL = localize('installing', "Installing");
+
+	private static readonly Class = 'extension-action prominent install';
+	private static readonly InstallingClass = 'extension-action install installing';
+
+	private disposables: IDisposable[] = [];
+
+	private _extension: IExtension;
+	get extension(): IExtension { return this._extension; }
+	set extension(extension: IExtension) { this._extension = extension; this.update(); }
+
+	constructor(
+		@IExtensionsWorkbenchService private extensionsWorkbenchService: IExtensionsWorkbenchService,
+		@IInstantiationService private instantiationService: IInstantiationService,
+		@INotificationService private notificationService: INotificationService,
+		@IOpenerService private openerService: IOpenerService
+	) {
+		super(`extensions.install`, InstallAction.INSTALL_LABEL, InstallAction.Class, false);
+
+		this.disposables.push(this.extensionsWorkbenchService.onChange(extension => this.update(extension)));
+		this.update();
+	}
+
+	private update(extension?: IExtension): void {
+		if (!this.extension || this.extension.type === LocalExtensionType.System) {
+			this.enabled = false;
+			this.class = InstallAction.Class;
+			this.label = InstallAction.INSTALL_LABEL;
+			return;
+		}
+
+		if (extension && !areSameExtensions(this.extension, extension)) {
+			return;
+		}
+
+		this.enabled = this.extensionsWorkbenchService.canInstall(this.extension) && this.extension.state === ExtensionState.Uninstalled;
+
+		if (this.extension.state === ExtensionState.Installing) {
+			this.label = InstallAction.INSTALLING_LABEL;
+			this.class = InstallAction.InstallingClass;
+			this.tooltip = InstallAction.INSTALLING_LABEL;
+		} else {
+			this.label = InstallAction.INSTALL_LABEL;
+			this.class = InstallAction.Class;
+			this.tooltip = InstallAction.INSTALL_LABEL;
+		}
+	}
+
+	run(): TPromise<any> {
+		this.extensionsWorkbenchService.open(this.extension);
+
+		return this.install(this.extension);
+	}
+
+	private install(extension: IExtension): TPromise<void> {
+		return this.extensionsWorkbenchService.install(extension).then(null, err => {
+			if (!extension.gallery) {
+				return this.notificationService.error(err);
+			}
+
+			console.error(err);
+
+			promptDownloadManually(extension.gallery, localize('failedToInstall', "Failed to install \'{0}\'.", extension.id), this.instantiationService, this.notificationService, this.openerService);
+		});
+	}
+
+	dispose(): void {
+		super.dispose();
+		this.disposables = dispose(this.disposables);
+	}
+}
+
+export class UninstallAction extends Action {
+
+	private static readonly UninstallLabel = localize('uninstallAction', "Uninstall");
+	private static readonly UninstallingLabel = localize('Uninstalling', "Uninstalling");
+
+	private static readonly UninstallClass = 'extension-action uninstall';
+	private static readonly UnInstallingClass = 'extension-action uninstall uninstalling';
+
+	private disposables: IDisposable[] = [];
+	private _extension: IExtension;
+	get extension(): IExtension { return this._extension; }
+	set extension(extension: IExtension) { this._extension = extension; this.update(); }
+
+	constructor(
+		@IExtensionsWorkbenchService private extensionsWorkbenchService: IExtensionsWorkbenchService
+	) {
+		super('extensions.uninstall', UninstallAction.UninstallLabel, UninstallAction.UninstallClass, false);
+
+		this.disposables.push(this.extensionsWorkbenchService.onChange(extension => this.update(extension)));
+		this.update();
+	}
+
+	private update(extension?: IExtension): void {
+		if (!this.extension) {
+			this.enabled = false;
+			return;
+		}
+
+		if (extension && !areSameExtensions(this.extension, extension)) {
+			return;
+		}
+
+		const state = this.extension.state;
+
+		if (state === ExtensionState.Uninstalling) {
+			this.label = UninstallAction.UninstallingLabel;
+			this.class = UninstallAction.UnInstallingClass;
+			this.enabled = false;
+			return;
+		}
+
+		this.label = UninstallAction.UninstallLabel;
+		this.class = UninstallAction.UninstallClass;
+
+		const installedExtensions = this.extensionsWorkbenchService.local.filter(e => e.id === this.extension.id);
+
+		if (!installedExtensions.length) {
+			this.enabled = false;
+			return;
+		}
+
+		if (installedExtensions[0].type !== LocalExtensionType.User) {
+			this.enabled = false;
+			return;
+		}
+
+		this.enabled = true;
+	}
+
+	run(): TPromise<any> {
+		return this.extensionsWorkbenchService.uninstall(this.extension);
+	}
+
+	dispose(): void {
+		super.dispose();
+		this.disposables = dispose(this.disposables);
+	}
+}
+
+export class CombinedInstallAction extends Action {
+
+	private static readonly NoExtensionClass = 'extension-action prominent install no-extension';
+	private installAction: InstallAction;
+	private uninstallAction: UninstallAction;
+	private disposables: IDisposable[] = [];
+	private _extension: IExtension;
+	get extension(): IExtension { return this._extension; }
+	set extension(extension: IExtension) {
+		this._extension = extension;
+		this.installAction.extension = extension;
+		this.uninstallAction.extension = extension;
+	}
+
+	constructor(
+		@IInstantiationService instantiationService: IInstantiationService
+	) {
+		super('extensions.combinedInstall', '', '', false);
+
+		this.installAction = instantiationService.createInstance(InstallAction);
+		this.uninstallAction = instantiationService.createInstance(UninstallAction);
+		this.disposables.push(this.installAction, this.uninstallAction);
+
+		this.installAction.onDidChange(this.update, this, this.disposables);
+		this.uninstallAction.onDidChange(this.update, this, this.disposables);
+		this.update();
+	}
+
+	private update(): void {
+		if (!this.extension || this.extension.type === LocalExtensionType.System) {
+			this.enabled = false;
+			this.class = CombinedInstallAction.NoExtensionClass;
+		} else if (this.installAction.enabled) {
+			this.enabled = true;
+			this.label = this.installAction.label;
+			this.class = this.installAction.class;
+			this.tooltip = this.installAction.tooltip;
+		} else if (this.uninstallAction.enabled) {
+			this.enabled = true;
+			this.label = this.uninstallAction.label;
+			this.class = this.uninstallAction.class;
+			this.tooltip = this.uninstallAction.tooltip;
+		} else if (this.extension.state === ExtensionState.Installing) {
+			this.enabled = false;
+			this.label = this.installAction.label;
+			this.class = this.installAction.class;
+			this.tooltip = this.installAction.tooltip;
+		} else if (this.extension.state === ExtensionState.Uninstalling) {
+			this.enabled = false;
+			this.label = this.uninstallAction.label;
+			this.class = this.uninstallAction.class;
+			this.tooltip = this.uninstallAction.tooltip;
+		} else {
+			this.enabled = false;
+			this.label = this.installAction.label;
+			this.class = this.installAction.class;
+			this.tooltip = this.installAction.tooltip;
+		}
+	}
+
+	run(): TPromise<any> {
+		if (this.installAction.enabled) {
+			return this.installAction.run();
+		} else if (this.uninstallAction.enabled) {
+			return this.uninstallAction.run();
+		}
+
+		return TPromise.as(null);
+	}
+
+	dispose(): void {
+		super.dispose();
+		this.disposables = dispose(this.disposables);
+	}
+}
+
+export class UpdateAction extends Action {
+
+	private static readonly EnabledClass = 'extension-action prominent update';
+	private static readonly DisabledClass = `${UpdateAction.EnabledClass} disabled`;
+
+	private disposables: IDisposable[] = [];
+	private _extension: IExtension;
+	get extension(): IExtension { return this._extension; }
+	set extension(extension: IExtension) { this._extension = extension; this.update(); }
+
+	constructor(
+		@IExtensionsWorkbenchService private extensionsWorkbenchService: IExtensionsWorkbenchService,
+		@IInstantiationService private instantiationService: IInstantiationService,
+		@INotificationService private notificationService: INotificationService,
+		@IOpenerService private openerService: IOpenerService
+	) {
+		super(`extensions.update`, '', UpdateAction.DisabledClass, false);
+		this.disposables.push(this.extensionsWorkbenchService.onChange(extension => this.update(extension)));
+		this.update();
+	}
+
+	private update(extension?: IExtension): void {
+		if (!this.extension) {
+			this.enabled = false;
+			this.class = UpdateAction.DisabledClass;
+			this.label = this.getUpdateLabel();
+			return;
+		}
+
+		if (extension && !areSameExtensions(this.extension, extension)) {
+			return;
+		}
+
+		if (this.extension.type !== LocalExtensionType.User) {
+			this.enabled = false;
+			this.class = UpdateAction.DisabledClass;
+			this.label = this.getUpdateLabel();
+			return;
+		}
+
+		const canInstall = this.extensionsWorkbenchService.canInstall(this.extension);
+		const isInstalled = this.extension.state === ExtensionState.Installed;
+
+		this.enabled = canInstall && isInstalled && this.extension.outdated;
+		this.class = this.enabled ? UpdateAction.EnabledClass : UpdateAction.DisabledClass;
+		this.label = this.extension.outdated ? this.getUpdateLabel(this.extension.latestVersion) : this.getUpdateLabel();
+	}
+
+	run(): TPromise<any> {
+		return this.install(this.extension);
+	}
+
+	private install(extension: IExtension): TPromise<void> {
+		return this.extensionsWorkbenchService.install(extension).then(null, err => {
+			if (!extension.gallery) {
+				return this.notificationService.error(err);
+			}
+
+			console.error(err);
+
+			promptDownloadManually(extension.gallery, localize('failedToUpdate', "Failed to update \'{0}\'.", extension.id), this.instantiationService, this.notificationService, this.openerService);
+		});
+	}
+
+	private getUpdateLabel(version?: string): string {
+		return version ? localize('updateTo', "Update to {0}", version) : localize('updateAction', "Update");
+	}
+
+	dispose(): void {
+		super.dispose();
+		this.disposables = dispose(this.disposables);
+	}
+}
+
+export class DropDownMenuActionItem extends ActionItem {
+
+	private disposables: IDisposable[] = [];
+
+	private _menuActionGroups: IAction[][];
+	get menuActionGroups(): IAction[][] { return this._menuActionGroups; }
+	set menuActionGroups(menuActionGroups: IAction[][]) { this._menuActionGroups = menuActionGroups; }
+
+	constructor(action: IAction, menuActionGroups: IAction[][],
+		@IContextMenuService private contextMenuService: IContextMenuService
+	) {
+		super(null, action, { icon: true, label: true });
+		this.menuActionGroups = menuActionGroups;
+	}
+
+	public showMenu(): void {
+		const actions = this.getActions();
+		let elementPosition = DOM.getDomNodePagePosition(this.element);
+		const anchor = { x: elementPosition.left, y: elementPosition.top + elementPosition.height + 10 };
+		this.contextMenuService.showContextMenu({
+			getAnchor: () => anchor,
+			getActions: () => TPromise.wrap(actions),
+			actionRunner: this.actionRunner
+		});
+	}
+
+	private getActions(): IAction[] {
+		let actions: IAction[] = [];
+		const menuActionGroups = this.menuActionGroups;
+		for (const menuActions of menuActionGroups) {
+			actions = [...actions, ...menuActions, new Separator()];
+		}
+		return actions.length ? actions.slice(0, actions.length - 1) : actions;
+	}
+
+	dispose(): void {
+		super.dispose();
+		this.disposables = dispose(this.disposables);
+	}
+}
+
+export class ManageExtensionAction extends Action {
+
+	static readonly ID = 'extensions.manage';
+
+	private static readonly Class = 'extension-action manage';
+	private static readonly HideManageExtensionClass = `${ManageExtensionAction.Class} hide`;
+
+	private _actionItem: DropDownMenuActionItem;
+	get actionItem(): IActionItem { return this._actionItem; }
+
+	private disposables: IDisposable[] = [];
+	private _extension: IExtension;
+	get extension(): IExtension { return this._extension; }
+	set extension(extension: IExtension) { this._extension = extension; this.update(); }
+
+	constructor(
+		@IExtensionsWorkbenchService private extensionsWorkbenchService: IExtensionsWorkbenchService,
+		@IInstantiationService private instantiationService: IInstantiationService
+	) {
+		super(ManageExtensionAction.ID);
+
+		this.tooltip = localize('manage', "Manage");
+		this._actionItem = this.instantiationService.createInstance(DropDownMenuActionItem, this, this.createMenuActionGroups());
+		this.disposables.push(this._actionItem);
+
+		this.disposables.push(this.extensionsWorkbenchService.onChange(() => this.update()));
+		this.update();
+	}
+
+	private createMenuActionGroups(): IAction[][] {
+		const groups: IAction[][] = [];
+		groups.push([
+			this.instantiationService.createInstance(EnableGloballyAction, EnableGloballyAction.LABEL),
+			this.instantiationService.createInstance(EnableForWorkspaceAction, EnableForWorkspaceAction.LABEL)
+		]);
+		groups.push([
+			this.instantiationService.createInstance(DisableGloballyAction, DisableGloballyAction.LABEL),
+			this.instantiationService.createInstance(DisableForWorkspaceAction, DisableForWorkspaceAction.LABEL)
+		]);
+		groups.push([this.instantiationService.createInstance(UninstallAction)]);
+		return groups;
+	}
+
+	private update(): void {
+		this.class = ManageExtensionAction.HideManageExtensionClass;
+		this.enabled = false;
+		if (this.extension) {
+			const state = this.extension.state;
+			this.enabled = state === ExtensionState.Installed;
+			this.class = this.enabled || state === ExtensionState.Uninstalling ? ManageExtensionAction.Class : ManageExtensionAction.HideManageExtensionClass;
+			this.tooltip = state === ExtensionState.Uninstalling ? localize('ManageExtensionAction.uninstallingTooltip', "Uninstalling") : '';
+		}
+		const menuActionGroups = this.createMenuActionGroups();
+		for (const actions of menuActionGroups) {
+			for (const action of actions) {
+				(<IExtensionAction>action).extension = this.extension;
+			}
+		}
+		this._actionItem.menuActionGroups = menuActionGroups;
+	}
+
+	public run(): TPromise<any> {
+		this._actionItem.showMenu();
+		return TPromise.wrap(null);
+	}
+
+	dispose(): void {
+		super.dispose();
+		this.disposables = dispose(this.disposables);
+	}
+}
+
+export class EnableForWorkspaceAction extends Action implements IExtensionAction {
+
+	static readonly ID = 'extensions.enableForWorkspace';
+	static LABEL = localize('enableForWorkspaceAction', "Enable (Workspace)");
+
+	private disposables: IDisposable[] = [];
+
+	private _extension: IExtension;
+	get extension(): IExtension { return this._extension; }
+	set extension(extension: IExtension) { this._extension = extension; this.update(); }
+
+	constructor(label: string,
+		@IWorkspaceContextService private workspaceContextService: IWorkspaceContextService,
+		@IExtensionsWorkbenchService private extensionsWorkbenchService: IExtensionsWorkbenchService,
+		@IExtensionEnablementService private extensionEnablementService: IExtensionEnablementService
+	) {
+		super(EnableForWorkspaceAction.ID, label);
+
+		this.disposables.push(this.extensionsWorkbenchService.onChange(() => this.update()));
+		this.disposables.push(this.workspaceContextService.onDidChangeWorkbenchState(() => this.update()));
+		this.update();
+	}
+
+	private update(): void {
+		this.enabled = false;
+		if (this.extension) {
+			this.enabled = (this.extension.enablementState === EnablementState.Disabled || this.extension.enablementState === EnablementState.WorkspaceDisabled) && this.extension.local && this.extensionEnablementService.canChangeEnablement(this.extension.local);
+		}
+	}
+
+	run(): TPromise<any> {
+		return this.extensionsWorkbenchService.setEnablement(this.extension, EnablementState.WorkspaceEnabled);
+	}
+
+	dispose(): void {
+		super.dispose();
+		this.disposables = dispose(this.disposables);
+	}
+}
+
+export class EnableGloballyAction extends Action implements IExtensionAction {
+
+	static readonly ID = 'extensions.enableGlobally';
+	static LABEL = localize('enableGloballyAction', "Enable");
+
+	private disposables: IDisposable[] = [];
+
+	private _extension: IExtension;
+	get extension(): IExtension { return this._extension; }
+	set extension(extension: IExtension) { this._extension = extension; this.update(); }
+
+	constructor(label: string,
+		@IExtensionsWorkbenchService private extensionsWorkbenchService: IExtensionsWorkbenchService,
+		@IExtensionEnablementService private extensionEnablementService: IExtensionEnablementService
+	) {
+		super(EnableGloballyAction.ID, label);
+
+		this.disposables.push(this.extensionsWorkbenchService.onChange(() => this.update()));
+		this.update();
+	}
+
+	private update(): void {
+		this.enabled = false;
+		if (this.extension) {
+			this.enabled = (this.extension.enablementState === EnablementState.Disabled || this.extension.enablementState === EnablementState.WorkspaceDisabled) && this.extension.local && this.extensionEnablementService.canChangeEnablement(this.extension.local);
+		}
+	}
+
+	run(): TPromise<any> {
+		return this.extensionsWorkbenchService.setEnablement(this.extension, EnablementState.Enabled);
+	}
+
+	dispose(): void {
+		super.dispose();
+		this.disposables = dispose(this.disposables);
+	}
+}
+
+export class EnableAction extends Action {
+
+	static readonly ID = 'extensions.enable';
+	private static readonly EnabledClass = 'extension-action prominent enable';
+	private static readonly DisabledClass = `${EnableAction.EnabledClass} disabled`;
+
+	private disposables: IDisposable[] = [];
+
+	private _enableActions: IExtensionAction[];
+
+	private _actionItem: DropDownMenuActionItem;
+	get actionItem(): IActionItem { return this._actionItem; }
+
+	private _extension: IExtension;
+	get extension(): IExtension { return this._extension; }
+	set extension(extension: IExtension) { this._extension = extension; this.update(); }
+
+
+	constructor(
+		@IInstantiationService private instantiationService: IInstantiationService,
+		@IExtensionsWorkbenchService private extensionsWorkbenchService: IExtensionsWorkbenchService
+	) {
+		super(EnableAction.ID, localize('enableAction', "Enable"), EnableAction.DisabledClass, false);
+
+		this._enableActions = [
+			instantiationService.createInstance(EnableGloballyAction, EnableGloballyAction.LABEL),
+			instantiationService.createInstance(EnableForWorkspaceAction, EnableForWorkspaceAction.LABEL)
+		];
+		this._actionItem = this.instantiationService.createInstance(DropDownMenuActionItem, this, [this._enableActions]);
+		this.disposables.push(this._actionItem);
+
+		this.disposables.push(this.extensionsWorkbenchService.onChange(() => this.update()));
+		this.update();
+	}
+
+	private update(): void {
+		for (const actions of this._actionItem.menuActionGroups) {
+			for (const action of actions) {
+				(<IExtensionAction>action).extension = this.extension;
+			}
+		}
+
+		if (!this.extension) {
+			this.enabled = false;
+			this.class = EnableAction.DisabledClass;
+			return;
+		}
+
+		this.enabled = this.extension.state === ExtensionState.Installed && this._enableActions.some(e => e.enabled);
+		this.class = this.enabled ? EnableAction.EnabledClass : EnableAction.DisabledClass;
+	}
+
+	public run(): TPromise<any> {
+		this._actionItem.showMenu();
+		return TPromise.wrap(null);
+	}
+
+	dispose(): void {
+		super.dispose();
+		this.disposables = dispose(this.disposables);
+	}
+
+}
+
+export class DisableForWorkspaceAction extends Action implements IExtensionAction {
+
+	static readonly ID = 'extensions.disableForWorkspace';
+	static LABEL = localize('disableForWorkspaceAction', "Disable (Workspace)");
+
+	private disposables: IDisposable[] = [];
+
+	private _extension: IExtension;
+	get extension(): IExtension { return this._extension; }
+	set extension(extension: IExtension) { this._extension = extension; this.update(); }
+
+	constructor(label: string,
+		@IWorkspaceContextService private workspaceContextService: IWorkspaceContextService,
+		@IExtensionsWorkbenchService private extensionsWorkbenchService: IExtensionsWorkbenchService,
+		@IExtensionEnablementService private extensionEnablementService: IExtensionEnablementService
+	) {
+		super(DisableForWorkspaceAction.ID, label);
+
+		this.disposables.push(this.extensionsWorkbenchService.onChange(() => this.update()));
+		this.update();
+		this.workspaceContextService.onDidChangeWorkbenchState(() => this.update(), this, this.disposables);
+	}
+
+	private update(): void {
+		this.enabled = false;
+		if (this.extension && this.workspaceContextService.getWorkbenchState() !== WorkbenchState.EMPTY) {
+			this.enabled = (this.extension.enablementState === EnablementState.Enabled || this.extension.enablementState === EnablementState.WorkspaceEnabled) && this.extension.local && this.extensionEnablementService.canChangeEnablement(this.extension.local);
+		}
+	}
+
+	run(): TPromise<any> {
+		return this.extensionsWorkbenchService.setEnablement(this.extension, EnablementState.WorkspaceDisabled);
+	}
+
+	dispose(): void {
+		super.dispose();
+		this.disposables = dispose(this.disposables);
+	}
+}
+
+export class DisableGloballyAction extends Action implements IExtensionAction {
+
+	static readonly ID = 'extensions.disableGlobally';
+	static LABEL = localize('disableGloballyAction', "Disable");
+
+	private disposables: IDisposable[] = [];
+
+	private _extension: IExtension;
+	get extension(): IExtension { return this._extension; }
+	set extension(extension: IExtension) { this._extension = extension; this.update(); }
+
+	constructor(label: string,
+		@IExtensionsWorkbenchService private extensionsWorkbenchService: IExtensionsWorkbenchService,
+		@IExtensionEnablementService private extensionEnablementService: IExtensionEnablementService
+	) {
+		super(DisableGloballyAction.ID, label);
+
+		this.disposables.push(this.extensionsWorkbenchService.onChange(() => this.update()));
+		this.update();
+	}
+
+	private update(): void {
+		this.enabled = false;
+		if (this.extension) {
+			this.enabled = (this.extension.enablementState === EnablementState.Enabled || this.extension.enablementState === EnablementState.WorkspaceEnabled) && this.extension.local && this.extensionEnablementService.canChangeEnablement(this.extension.local);
+		}
+	}
+
+	run(): TPromise<any> {
+		return this.extensionsWorkbenchService.setEnablement(this.extension, EnablementState.Disabled);
+	}
+
+	dispose(): void {
+		super.dispose();
+		this.disposables = dispose(this.disposables);
+	}
+}
+
+export class DisableAction extends Action {
+
+	static readonly ID = 'extensions.disable';
+
+	private static readonly EnabledClass = 'extension-action disable';
+	private static readonly DisabledClass = `${DisableAction.EnabledClass} disabled`;
+
+	private disposables: IDisposable[] = [];
+	private _disableActions: IExtensionAction[];
+	private _actionItem: DropDownMenuActionItem;
+	get actionItem(): IActionItem { return this._actionItem; }
+
+	private _extension: IExtension;
+	get extension(): IExtension { return this._extension; }
+	set extension(extension: IExtension) { this._extension = extension; this.update(); }
+
+
+	constructor(
+		@IInstantiationService private instantiationService: IInstantiationService,
+		@IExtensionsWorkbenchService private extensionsWorkbenchService: IExtensionsWorkbenchService,
+	) {
+		super(DisableAction.ID, localize('disableAction', "Disable"), DisableAction.DisabledClass, false);
+		this._disableActions = [
+			instantiationService.createInstance(DisableGloballyAction, DisableGloballyAction.LABEL),
+			instantiationService.createInstance(DisableForWorkspaceAction, DisableForWorkspaceAction.LABEL)
+		];
+		this._actionItem = this.instantiationService.createInstance(DropDownMenuActionItem, this, [this._disableActions]);
+		this.disposables.push(this._actionItem);
+
+		this.disposables.push(this.extensionsWorkbenchService.onChange(() => this.update()));
+		this.update();
+	}
+
+	private update(): void {
+		for (const actions of this._actionItem.menuActionGroups) {
+			for (const action of actions) {
+				(<IExtensionAction>action).extension = this.extension;
+			}
+		}
+
+		if (!this.extension) {
+			this.enabled = false;
+			this.class = DisableAction.DisabledClass;
+			return;
+		}
+
+		this.enabled = this.extension.state === ExtensionState.Installed && this._disableActions.some(a => a.enabled);
+		this.class = this.enabled ? DisableAction.EnabledClass : DisableAction.DisabledClass;
+	}
+
+	public run(): TPromise<any> {
+		this._actionItem.showMenu();
+		return TPromise.wrap(null);
+	}
+
+	dispose(): void {
+		super.dispose();
+		this.disposables = dispose(this.disposables);
+	}
+}
+
+export class CheckForUpdatesAction extends Action {
+
+	static readonly ID = 'workbench.extensions.action.checkForUpdates';
+	static LABEL = localize('checkForUpdates', "Check for Extension Updates");
+
+	constructor(
+		id = CheckForUpdatesAction.ID,
+		label = CheckForUpdatesAction.LABEL,
+		@IExtensionsWorkbenchService private extensionsWorkbenchService: IExtensionsWorkbenchService,
+		@IViewletService private viewletService: IViewletService,
+		@INotificationService private notificationService: INotificationService
+	) {
+		super(id, label, '', true);
+	}
+
+	private checkUpdatesAndNotify(): void {
+		this.extensionsWorkbenchService.queryLocal().then(
+			extensions => {
+				const outdatedCount = extensions.filter(ext => ext.outdated === true).length;
+				let msgAvailableExtensions = localize('noUpdatesAvailable', "All Extensions are up to date.");
+				if (outdatedCount > 0) {
+					msgAvailableExtensions = outdatedCount === 1 ? localize('updateAvailable', "An Extension update is available.")
+						: localize('updatesAvailable', "{0} extensions updates are available.", outdatedCount);
+					this.viewletService.openViewlet(VIEWLET_ID, true)
+						.then(viewlet => viewlet as IExtensionsViewlet)
+						.then(viewlet => viewlet.search(''));
+				}
+				this.notificationService.notify({ severity: severity.Info, message: msgAvailableExtensions });
+			}
+		);
+	}
+
+	run(): TPromise<any> {
+		return this.extensionsWorkbenchService.checkForUpdates().then(() => this.checkUpdatesAndNotify());
+	}
+}
+
+export class ToggleAutoUpdateAction extends Action {
+
+	constructor(
+		id: string,
+		label: string,
+		private autoUpdateValue: boolean,
+		@IConfigurationService private configurationService: IConfigurationService
+	) {
+		super(id, label, '', true);
+		this.updateEnablement();
+		configurationService.onDidChangeConfiguration(() => this.updateEnablement());
+	}
+
+	private updateEnablement(): void {
+		this.enabled = this.configurationService.getValue(AutoUpdateConfigurationKey) !== this.autoUpdateValue;
+	}
+
+	run(): TPromise<any> {
+		return this.configurationService.updateValue(AutoUpdateConfigurationKey, this.autoUpdateValue);
+	}
+}
+
+export class EnableAutoUpdateAction extends ToggleAutoUpdateAction {
+
+	static readonly ID = 'workbench.extensions.action.enableAutoUpdate';
+	static LABEL = localize('enableAutoUpdate', "Enable Auto Updating Extensions");
+
+	constructor(
+		id = EnableAutoUpdateAction.ID,
+		label = EnableAutoUpdateAction.LABEL,
+		@IConfigurationService configurationService: IConfigurationService
+	) {
+		super(id, label, true, configurationService);
+	}
+}
+
+export class DisableAutoUpdateAction extends ToggleAutoUpdateAction {
+
+	static readonly ID = 'workbench.extensions.action.disableAutoUpdate';
+	static LABEL = localize('disableAutoUpdate', "Disable Auto Updating Extensions");
+
+	constructor(
+		id = EnableAutoUpdateAction.ID,
+		label = EnableAutoUpdateAction.LABEL,
+		@IConfigurationService configurationService: IConfigurationService
+	) {
+		super(id, label, false, configurationService);
+	}
+}
+
+export class UpdateAllAction extends Action {
+
+	static readonly ID = 'workbench.extensions.action.updateAllExtensions';
+	static LABEL = localize('updateAll', "Update All Extensions");
+
+	private disposables: IDisposable[] = [];
+
+	constructor(
+		id = UpdateAllAction.ID,
+		label = UpdateAllAction.LABEL,
+		@IExtensionsWorkbenchService private extensionsWorkbenchService: IExtensionsWorkbenchService,
+		@INotificationService private notificationService: INotificationService,
+		@IInstantiationService private instantiationService: IInstantiationService,
+		@IOpenerService private openerService: IOpenerService
+	) {
+		super(id, label, '', false);
+
+		this.disposables.push(this.extensionsWorkbenchService.onChange(() => this.update()));
+		this.update();
+	}
+
+	private get outdated(): IExtension[] {
+		return this.extensionsWorkbenchService.local.filter(e => e.outdated && e.state !== ExtensionState.Installing);
+	}
+
+	private update(): void {
+		this.enabled = this.outdated.length > 0;
+	}
+
+	run(): TPromise<any> {
+		return TPromise.join(this.outdated.map(e => this.install(e)));
+	}
+
+	private install(extension: IExtension): TPromise<void> {
+		return this.extensionsWorkbenchService.install(extension).then(null, err => {
+			if (!extension.gallery) {
+				return this.notificationService.error(err);
+			}
+
+			console.error(err);
+
+			promptDownloadManually(extension.gallery, localize('failedToUpdate', "Failed to update \'{0}\'.", extension.id), this.instantiationService, this.notificationService, this.openerService);
+		});
+	}
+
+	dispose(): void {
+		super.dispose();
+		this.disposables = dispose(this.disposables);
+	}
+}
+
+export class ReloadAction extends Action {
+
+	private static readonly EnabledClass = 'extension-action reload';
+	private static readonly DisabledClass = `${ReloadAction.EnabledClass} disabled`;
+
+	private disposables: IDisposable[] = [];
+	private _extension: IExtension;
+	get extension(): IExtension { return this._extension; }
+	set extension(extension: IExtension) { this._extension = extension; this.update(); }
+
+	reloadMessage: string = '';
+	private throttler: Throttler;
+
+	constructor(
+		@IExtensionsWorkbenchService private extensionsWorkbenchService: IExtensionsWorkbenchService,
+		@IWindowService private windowService: IWindowService,
+		@IExtensionService private extensionService: IExtensionService,
+		@IExtensionManagementServerService private extensionManagementServerService: IExtensionManagementServerService,
+		@IExtensionEnablementService private extensionEnablementService: IExtensionEnablementService
+	) {
+		super('extensions.reload', localize('reloadAction', "Reload"), ReloadAction.DisabledClass, false);
+		this.throttler = new Throttler();
+
+		this.disposables.push(this.extensionsWorkbenchService.onChange(extension => this.update(extension)));
+		this.update();
+	}
+
+	private update(extension?: IExtension): void {
+		if (extension && this.extension && !areSameExtensions(this.extension, extension)) {
+			return;
+		}
+		this.throttler.queue(() => {
+			this.enabled = false;
+			this.tooltip = '';
+			this.reloadMessage = '';
+			if (!this.extension) {
+				return TPromise.wrap<void>(null);
+			}
+			const state = this.extension.state;
+			if (state === ExtensionState.Installing || state === ExtensionState.Uninstalling) {
+				return TPromise.wrap<void>(null);
+			}
+			return this.extensionService.getExtensions()
+				.then(runningExtensions => this.computeReloadState(runningExtensions));
+		}).then(() => {
+			this.class = this.enabled ? ReloadAction.EnabledClass : ReloadAction.DisabledClass;
+		});
+	}
+
+	private computeReloadState(runningExtensions: IExtensionDescription[]): void {
+		const installed = this.extensionsWorkbenchService.local.filter(e => e.id === this.extension.id)[0];
+		const isUninstalled = this.extension.state === ExtensionState.Uninstalled;
+		const isDisabled = this.extension.local ? !this.extensionEnablementService.isEnabled(this.extension.local) : false;
+		const runningExtension = runningExtensions.filter(e => areSameExtensions(e, this.extension))[0];
+
+		if (installed && installed.local) {
+			if (runningExtension) {
+				const isDifferentVersionRunning = this.extension.version !== runningExtension.version;
+				if (isDifferentVersionRunning && !isDisabled) {
+					// Requires reload to run the updated extension
+					this.enabled = true;
+					this.tooltip = localize('postUpdateTooltip', "Reload to update");
+					this.reloadMessage = localize('postUpdateMessage', "Reload this window to activate the updated extension '{0}'?", this.extension.displayName);
+					return;
+				}
+				if (isDisabled) {
+					// Requires reload to disable the extension
+					this.enabled = true;
+					this.tooltip = localize('postDisableTooltip', "Reload to deactivate");
+					this.reloadMessage = localize('postDisableMessage', "Reload this window to deactivate the extension '{0}'?", this.extension.displayName);
+					return;
+				}
+			} else {
+				const extensionServer = this.extensionManagementServerService.getExtensionManagementServer(installed.local.location);
+				const localServer = this.extensionManagementServerService.getLocalExtensionManagementServer();
+				// Only extension from local server requires reload if it is not running on the server
+				if (extensionServer && extensionServer.authority === localServer.authority && !isDisabled) {
+					// Requires reload to enable the extension
+					this.enabled = true;
+					this.tooltip = localize('postEnableTooltip', "Reload to activate");
+					this.reloadMessage = localize('postEnableMessage', "Reload this window to activate the extension '{0}'?", this.extension.displayName);
+					return;
+				}
+			}
+			return;
+		}
+
+		if (isUninstalled && runningExtension) {
+			// Requires reload to deactivate the extension
+			this.enabled = true;
+			this.tooltip = localize('postUninstallTooltip', "Reload to deactivate");
+			this.reloadMessage = localize('postUninstallMessage', "Reload this window to deactivate the uninstalled extension '{0}'?", this.extension.displayName);
+			return;
+		}
+	}
+
+	run(): TPromise<any> {
+		return this.windowService.reloadWindow();
+	}
+}
+
+export class OpenExtensionsViewletAction extends ToggleViewletAction {
+
+	static ID = VIEWLET_ID;
+	static LABEL = localize('toggleExtensionsViewlet', "Show Extensions");
+
+	constructor(
+		id: string,
+		label: string,
+		@IViewletService viewletService: IViewletService,
+		@IEditorGroupsService editorGroupService: IEditorGroupsService
+	) {
+		super(id, label, VIEWLET_ID, viewletService, editorGroupService);
+	}
+}
+
+export class InstallExtensionsAction extends OpenExtensionsViewletAction {
+	static ID = 'workbench.extensions.action.installExtensions';
+	static LABEL = localize('installExtensions', "Install Extensions");
+}
+
+export class ShowEnabledExtensionsAction extends Action {
+
+	static readonly ID = 'workbench.extensions.action.showEnabledExtensions';
+	static LABEL = localize('showEnabledExtensions', 'Show Enabled Extensions');
+
+	constructor(
+		id: string,
+		label: string,
+		@IViewletService private viewletService: IViewletService
+	) {
+		super(id, label, null, true);
+	}
+
+	run(): TPromise<void> {
+		return this.viewletService.openViewlet(VIEWLET_ID, true)
+			.then(viewlet => viewlet as IExtensionsViewlet)
+			.then(viewlet => {
+				viewlet.search('@enabled ');
+				viewlet.focus();
+			});
+	}
+}
+
+export class ShowInstalledExtensionsAction extends Action {
+
+	static readonly ID = 'workbench.extensions.action.showInstalledExtensions';
+	static LABEL = localize('showInstalledExtensions', "Show Installed Extensions");
+
+	constructor(
+		id: string,
+		label: string,
+		@IViewletService private viewletService: IViewletService
+	) {
+		super(id, label, null, true);
+	}
+
+	run(): TPromise<void> {
+		return this.viewletService.openViewlet(VIEWLET_ID, true)
+			.then(viewlet => viewlet as IExtensionsViewlet)
+			.then(viewlet => {
+				viewlet.search('@installed ');
+				viewlet.focus();
+			});
+	}
+}
+
+export class ShowDisabledExtensionsAction extends Action {
+
+	static readonly ID = 'workbench.extensions.action.showDisabledExtensions';
+	static LABEL = localize('showDisabledExtensions', "Show Disabled Extensions");
+
+	constructor(
+		id: string,
+		label: string,
+		@IViewletService private viewletService: IViewletService
+	) {
+		super(id, label, 'null', true);
+	}
+
+	run(): TPromise<void> {
+		return this.viewletService.openViewlet(VIEWLET_ID, true)
+			.then(viewlet => viewlet as IExtensionsViewlet)
+			.then(viewlet => {
+				viewlet.search('@disabled ');
+				viewlet.focus();
+			});
+	}
+}
+
+export class ClearExtensionsInputAction extends Action {
+
+	static readonly ID = 'workbench.extensions.action.clearExtensionsInput';
+	static LABEL = localize('clearExtensionsInput', "Clear Extensions Input");
+
+	private disposables: IDisposable[] = [];
+
+	constructor(
+		id: string,
+		label: string,
+		onSearchChange: Event<string>,
+		@IViewletService private viewletService: IViewletService
+	) {
+		super(id, label, 'clear-extensions', true);
+		this.enabled = false;
+		onSearchChange(this.onSearchChange, this, this.disposables);
+	}
+
+	private onSearchChange(value: string): void {
+		this.enabled = !!value;
+	}
+
+	run(): TPromise<void> {
+		return this.viewletService.openViewlet(VIEWLET_ID, true)
+			.then(viewlet => viewlet as IExtensionsViewlet)
+			.then(viewlet => {
+				viewlet.search('');
+				viewlet.focus();
+			});
+	}
+
+	dispose(): void {
+		this.disposables = dispose(this.disposables);
+	}
+}
+
+export class ShowBuiltInExtensionsAction extends Action {
+
+	static readonly ID = 'workbench.extensions.action.listBuiltInExtensions';
+	static LABEL = localize('showBuiltInExtensions', "Show Built-in Extensions");
+
+	constructor(
+		id: string,
+		label: string,
+		@IViewletService private viewletService: IViewletService
+	) {
+		super(id, label, null, true);
+	}
+
+	run(): TPromise<void> {
+		return this.viewletService.openViewlet(VIEWLET_ID, true)
+			.then(viewlet => viewlet as IExtensionsViewlet)
+			.then(viewlet => {
+				viewlet.search('@builtin ');
+				viewlet.focus();
+			});
+	}
+}
+
+export class ShowOutdatedExtensionsAction extends Action {
+
+	static readonly ID = 'workbench.extensions.action.listOutdatedExtensions';
+	static LABEL = localize('showOutdatedExtensions', "Show Outdated Extensions");
+
+	constructor(
+		id: string,
+		label: string,
+		@IViewletService private viewletService: IViewletService
+	) {
+		super(id, label, null, true);
+	}
+
+	run(): TPromise<void> {
+		return this.viewletService.openViewlet(VIEWLET_ID, true)
+			.then(viewlet => viewlet as IExtensionsViewlet)
+			.then(viewlet => {
+				viewlet.search('@outdated ');
+				viewlet.focus();
+			});
+	}
+}
+
+export class ShowPopularExtensionsAction extends Action {
+
+	static readonly ID = 'workbench.extensions.action.showPopularExtensions';
+	static LABEL = localize('showPopularExtensions', "Show Popular Extensions");
+
+	constructor(
+		id: string,
+		label: string,
+		@IViewletService private viewletService: IViewletService
+	) {
+		super(id, label, null, true);
+	}
+
+	run(): TPromise<void> {
+		return this.viewletService.openViewlet(VIEWLET_ID, true)
+			.then(viewlet => viewlet as IExtensionsViewlet)
+			.then(viewlet => {
+				viewlet.search('@sort:installs ');
+				viewlet.focus();
+			});
+	}
+}
+
+export class ShowRecommendedExtensionsAction extends Action {
+
+	static readonly ID = 'workbench.extensions.action.showRecommendedExtensions';
+	static LABEL = localize('showRecommendedExtensions', "Show Recommended Extensions");
+
+	constructor(
+		id: string,
+		label: string,
+		@IViewletService private viewletService: IViewletService
+	) {
+		super(id, label, null, true);
+	}
+
+	run(): TPromise<void> {
+		return this.viewletService.openViewlet(VIEWLET_ID, true)
+			.then(viewlet => viewlet as IExtensionsViewlet)
+			.then(viewlet => {
+				viewlet.search('@recommended ');
+				viewlet.focus();
+			});
+	}
+}
+
+export class InstallWorkspaceRecommendedExtensionsAction extends Action {
+
+	static readonly ID = 'workbench.extensions.action.installWorkspaceRecommendedExtensions';
+	static LABEL = localize('installWorkspaceRecommendedExtensions', "Install All Workspace Recommended Extensions");
+
+	private _recommendations: IExtensionRecommendation[] = [];
+	get recommendations(): IExtensionRecommendation[] { return this._recommendations; }
+	set recommendations(recommendations: IExtensionRecommendation[]) { this._recommendations = recommendations; this.enabled = this._recommendations.length > 0; }
+
+	constructor(
+		id: string = InstallWorkspaceRecommendedExtensionsAction.ID,
+		label: string = InstallWorkspaceRecommendedExtensionsAction.LABEL,
+		recommendations: IExtensionRecommendation[],
+		@IViewletService private viewletService: IViewletService,
+		@INotificationService private notificationService: INotificationService,
+		@IInstantiationService private instantiationService: IInstantiationService,
+		@IOpenerService private openerService: IOpenerService,
+		@IExtensionsWorkbenchService private extensionWorkbenchService: IExtensionsWorkbenchService
+	) {
+		super(id, label, 'extension-action');
+		this.recommendations = recommendations;
+	}
+
+	run(): TPromise<any> {
+		return this.viewletService.openViewlet(VIEWLET_ID, true)
+			.then(viewlet => viewlet as IExtensionsViewlet)
+			.then(viewlet => {
+				viewlet.search('@recommended ');
+				viewlet.focus();
+				const names = this.recommendations.map(({ extensionId }) => extensionId);
+				return this.extensionWorkbenchService.queryGallery({ names, source: 'install-all-workspace-recommendations' }).then(pager => {
+					let installPromises = [];
+					let model = new PagedModel(pager);
+					for (let i = 0; i < pager.total; i++) {
+						installPromises.push(model.resolve(i, CancellationToken.None).then(e => {
+							return this.extensionWorkbenchService.install(e).then(null, err => {
+								console.error(err);
+								promptDownloadManually(e.gallery, localize('failedToInstall', "Failed to install \'{0}\'.", e.id), this.instantiationService, this.notificationService, this.openerService);
+							});
+						}));
+					}
+					return TPromise.join(installPromises);
+				});
+			});
+	}
+}
+
+export class InstallRecommendedExtensionAction extends Action {
+
+	static readonly ID = 'workbench.extensions.action.installRecommendedExtension';
+	static LABEL = localize('installRecommendedExtension', "Install Recommended Extension");
+
+	private extensionId: string;
+
+	constructor(
+		extensionId: string,
+		@IViewletService private viewletService: IViewletService,
+		@INotificationService private notificationService: INotificationService,
+		@IInstantiationService private instantiationService: IInstantiationService,
+		@IOpenerService private openerService: IOpenerService,
+		@IExtensionsWorkbenchService private extensionWorkbenchService: IExtensionsWorkbenchService
+	) {
+		super(InstallRecommendedExtensionAction.ID, InstallRecommendedExtensionAction.LABEL, null, false);
+		this.extensionId = extensionId;
+	}
+
+	run(): TPromise<any> {
+		return this.viewletService.openViewlet(VIEWLET_ID, true)
+			.then(viewlet => viewlet as IExtensionsViewlet)
+			.then(viewlet => {
+				viewlet.search('@recommended ');
+				viewlet.focus();
+				return this.extensionWorkbenchService.queryGallery({ names: [this.extensionId], source: 'install-recommendation', pageSize: 1 })
+					.then(pager => {
+						if (pager && pager.firstPage && pager.firstPage.length) {
+							const extension = pager.firstPage[0];
+							return this.extensionWorkbenchService.install(extension)
+								.then(() => null, err => {
+									console.error(err);
+									promptDownloadManually(extension.gallery, localize('failedToInstall', "Failed to install \'{0}\'.", extension.id), this.instantiationService, this.notificationService, this.openerService);
+								});
+						}
+						return null;
+					});
+			});
+	}
+}
+
+export class IgnoreExtensionRecommendationAction extends Action {
+
+	static readonly ID = 'extensions.ignore';
+
+	private static readonly Class = 'extension-action ignore';
+
+	private disposables: IDisposable[] = [];
+	extension: IExtension;
+
+	constructor(
+		@IExtensionTipsService private extensionsTipsService: IExtensionTipsService,
+	) {
+		super(IgnoreExtensionRecommendationAction.ID, 'Ignore Recommendation');
+
+		this.class = IgnoreExtensionRecommendationAction.Class;
+		this.tooltip = localize('ignoreExtensionRecommendation', "Do not recommend this extension again");
+		this.enabled = true;
+	}
+
+	public run(): TPromise<any> {
+		this.extensionsTipsService.toggleIgnoredRecommendation(this.extension.id, true);
+		return TPromise.as(null);
+	}
+
+	dispose(): void {
+		super.dispose();
+		this.disposables = dispose(this.disposables);
+	}
+}
+
+export class UndoIgnoreExtensionRecommendationAction extends Action {
+
+	static readonly ID = 'extensions.ignore';
+
+	private static readonly Class = 'extension-action undo-ignore';
+
+	private disposables: IDisposable[] = [];
+	extension: IExtension;
+
+	constructor(
+		@IExtensionTipsService private extensionsTipsService: IExtensionTipsService,
+	) {
+		super(UndoIgnoreExtensionRecommendationAction.ID, 'Undo');
+
+		this.class = UndoIgnoreExtensionRecommendationAction.Class;
+		this.tooltip = localize('undo', "Undo");
+		this.enabled = true;
+	}
+
+	public run(): TPromise<any> {
+		this.extensionsTipsService.toggleIgnoredRecommendation(this.extension.id, false);
+		return TPromise.as(null);
+	}
+
+	dispose(): void {
+		super.dispose();
+		this.disposables = dispose(this.disposables);
+	}
+}
+
+
+export class ShowRecommendedKeymapExtensionsAction extends Action {
+
+	static readonly ID = 'workbench.extensions.action.showRecommendedKeymapExtensions';
+	static SHORT_LABEL = localize('showRecommendedKeymapExtensionsShort', "Keymaps");
+
+	constructor(
+		id: string,
+		label: string,
+		@IViewletService private viewletService: IViewletService
+	) {
+		super(id, label, null, true);
+	}
+
+	run(): TPromise<void> {
+		return this.viewletService.openViewlet(VIEWLET_ID, true)
+			.then(viewlet => viewlet as IExtensionsViewlet)
+			.then(viewlet => {
+				viewlet.search('@recommended:keymaps ');
+				viewlet.focus();
+			});
+	}
+}
+
+export class ShowLanguageExtensionsAction extends Action {
+
+	static readonly ID = 'workbench.extensions.action.showLanguageExtensions';
+	static SHORT_LABEL = localize('showLanguageExtensionsShort', "Language Extensions");
+
+	constructor(
+		id: string,
+		label: string,
+		@IViewletService private viewletService: IViewletService
+	) {
+		super(id, label, null, true);
+	}
+
+	run(): TPromise<void> {
+		return this.viewletService.openViewlet(VIEWLET_ID, true)
+			.then(viewlet => viewlet as IExtensionsViewlet)
+			.then(viewlet => {
+				viewlet.search('@category:"programming languages" @sort:installs ');
+				viewlet.focus();
+			});
+	}
+}
+
+export class ShowAzureExtensionsAction extends Action {
+
+	static readonly ID = 'workbench.extensions.action.showAzureExtensions';
+	static SHORT_LABEL = localize('showAzureExtensionsShort', "Azure Extensions");
+
+	constructor(
+		id: string,
+		label: string,
+		@IViewletService private viewletService: IViewletService
+	) {
+		super(id, label, null, true);
+	}
+
+	run(): TPromise<void> {
+		return this.viewletService.openViewlet(VIEWLET_ID, true)
+			.then(viewlet => viewlet as IExtensionsViewlet)
+			.then(viewlet => {
+				viewlet.search('@sort:installs azure ');
+				viewlet.focus();
+			});
+	}
+}
+
+export class ChangeSortAction extends Action {
+
+	private query: Query;
+	private disposables: IDisposable[] = [];
+
+	constructor(
+		id: string,
+		label: string,
+		onSearchChange: Event<string>,
+		private sortBy: string,
+		@IViewletService private viewletService: IViewletService
+	) {
+		super(id, label, null, true);
+
+		if (sortBy === undefined) {
+			throw new Error('bad arguments');
+		}
+
+		this.query = Query.parse('');
+		this.enabled = false;
+		onSearchChange(this.onSearchChange, this, this.disposables);
+	}
+
+	private onSearchChange(value: string): void {
+		const query = Query.parse(value);
+		this.query = new Query(query.value, this.sortBy || query.sortBy, query.groupBy);
+		this.enabled = value && this.query.isValid() && !this.query.equals(query);
+	}
+
+	run(): TPromise<void> {
+		return this.viewletService.openViewlet(VIEWLET_ID, true)
+			.then(viewlet => viewlet as IExtensionsViewlet)
+			.then(viewlet => {
+				viewlet.search(this.query.toString());
+				viewlet.focus();
+			});
+	}
+}
+
+export class ChangeGroupAction extends Action {
+
+	private query: Query;
+	private disposables: IDisposable[] = [];
+
+	constructor(
+		id: string,
+		label: string,
+		onSearchChange: Event<string>,
+		private groupBy: string,
+		@IViewletService private viewletService: IViewletService
+	) {
+		super(id, label, null, true);
+
+		if (groupBy === undefined) {
+			throw new Error('bad arguments');
+		}
+
+		this.query = Query.parse('');
+		onSearchChange(this.onSearchChange, this, this.disposables);
+		this.onSearchChange('');
+	}
+
+	private onSearchChange(value: string): void {
+		const query = Query.parse(value);
+		this.query = new Query(query.value, query.sortBy, this.groupBy || query.groupBy);
+	}
+
+	run(): TPromise<void> {
+		return this.viewletService.openViewlet(VIEWLET_ID, true)
+			.then(viewlet => viewlet as IExtensionsViewlet)
+			.then(viewlet => {
+				viewlet.search(this.query.toString());
+				viewlet.focus();
+			});
+	}
+}
+
+export class ConfigureRecommendedExtensionsCommandsContributor extends Disposable implements IWorkbenchContribution {
+
+	private workspaceContextKey = new RawContextKey<boolean>('workspaceRecommendations', true);
+	private workspaceFolderContextKey = new RawContextKey<boolean>('workspaceFolderRecommendations', true);
+	private addToWorkspaceRecommendationsContextKey = new RawContextKey<boolean>('addToWorkspaceRecommendations', false);
+	private addToWorkspaceFolderRecommendationsContextKey = new RawContextKey<boolean>('addToWorkspaceFolderRecommendations', false);
+
+	constructor(
+		@IContextKeyService contextKeyService: IContextKeyService,
+		@IWorkspaceContextService workspaceContextService: IWorkspaceContextService,
+		@IEditorService editorService: IEditorService
+	) {
+		super();
+		const boundWorkspaceContextKey = this.workspaceContextKey.bindTo(contextKeyService);
+		boundWorkspaceContextKey.set(workspaceContextService.getWorkbenchState() === WorkbenchState.WORKSPACE);
+		this._register(workspaceContextService.onDidChangeWorkbenchState(() => boundWorkspaceContextKey.set(workspaceContextService.getWorkbenchState() === WorkbenchState.WORKSPACE)));
+
+		const boundWorkspaceFolderContextKey = this.workspaceFolderContextKey.bindTo(contextKeyService);
+		boundWorkspaceFolderContextKey.set(workspaceContextService.getWorkspace().folders.length > 0);
+		this._register(workspaceContextService.onDidChangeWorkspaceFolders(() => boundWorkspaceFolderContextKey.set(workspaceContextService.getWorkspace().folders.length > 0)));
+
+		const boundAddToWorkspaceRecommendationsContextKey = this.addToWorkspaceRecommendationsContextKey.bindTo(contextKeyService);
+		boundAddToWorkspaceRecommendationsContextKey.set(editorService.activeEditor instanceof ExtensionsInput && workspaceContextService.getWorkbenchState() === WorkbenchState.WORKSPACE);
+		this._register(editorService.onDidActiveEditorChange(() => boundAddToWorkspaceRecommendationsContextKey.set(
+			editorService.activeEditor instanceof ExtensionsInput && workspaceContextService.getWorkbenchState() === WorkbenchState.WORKSPACE)));
+		this._register(workspaceContextService.onDidChangeWorkbenchState(() => boundAddToWorkspaceRecommendationsContextKey.set(
+			editorService.activeEditor instanceof ExtensionsInput && workspaceContextService.getWorkbenchState() === WorkbenchState.WORKSPACE)));
+
+		const boundAddToWorkspaceFolderRecommendationsContextKey = this.addToWorkspaceFolderRecommendationsContextKey.bindTo(contextKeyService);
+		boundAddToWorkspaceFolderRecommendationsContextKey.set(editorService.activeEditor instanceof ExtensionsInput);
+		this._register(editorService.onDidActiveEditorChange(() => boundAddToWorkspaceFolderRecommendationsContextKey.set(editorService.activeEditor instanceof ExtensionsInput)));
+
+		this.registerCommands();
+	}
+
+	private registerCommands(): void {
+		CommandsRegistry.registerCommand(ConfigureWorkspaceRecommendedExtensionsAction.ID, serviceAccessor => {
+			serviceAccessor.get(IInstantiationService).createInstance(ConfigureWorkspaceRecommendedExtensionsAction, ConfigureWorkspaceRecommendedExtensionsAction.ID, ConfigureWorkspaceRecommendedExtensionsAction.LABEL).run();
+		});
+		MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
+			command: {
+				id: ConfigureWorkspaceRecommendedExtensionsAction.ID,
+				title: `${ExtensionsLabel}: ${ConfigureWorkspaceRecommendedExtensionsAction.LABEL}`,
+			},
+			when: this.workspaceContextKey
+		});
+
+		CommandsRegistry.registerCommand(ConfigureWorkspaceFolderRecommendedExtensionsAction.ID, serviceAccessor => {
+			serviceAccessor.get(IInstantiationService).createInstance(ConfigureWorkspaceFolderRecommendedExtensionsAction, ConfigureWorkspaceFolderRecommendedExtensionsAction.ID, ConfigureWorkspaceFolderRecommendedExtensionsAction.LABEL).run();
+		});
+		MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
+			command: {
+				id: ConfigureWorkspaceFolderRecommendedExtensionsAction.ID,
+				title: `${ExtensionsLabel}: ${ConfigureWorkspaceFolderRecommendedExtensionsAction.LABEL}`,
+			},
+			when: this.workspaceFolderContextKey
+		});
+
+		CommandsRegistry.registerCommand(AddToWorkspaceRecommendationsAction.ADD_ID, serviceAccessor => {
+			serviceAccessor.get(IInstantiationService)
+				.createInstance(AddToWorkspaceRecommendationsAction, AddToWorkspaceRecommendationsAction.ADD_ID, AddToWorkspaceRecommendationsAction.ADD_LABEL)
+				.run(AddToWorkspaceRecommendationsAction.ADD);
+		});
+		MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
+			command: {
+				id: AddToWorkspaceRecommendationsAction.ADD_ID,
+				title: `${ExtensionsLabel}: ${AddToWorkspaceRecommendationsAction.ADD_LABEL}`
+			},
+			when: this.addToWorkspaceRecommendationsContextKey
+		});
+
+		CommandsRegistry.registerCommand(AddToWorkspaceFolderRecommendationsAction.ADD_ID, serviceAccessor => {
+			serviceAccessor.get(IInstantiationService)
+				.createInstance(AddToWorkspaceFolderRecommendationsAction, AddToWorkspaceFolderRecommendationsAction.ADD_ID, AddToWorkspaceFolderRecommendationsAction.ADD_LABEL)
+				.run(AddToWorkspaceRecommendationsAction.ADD);
+		});
+		MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
+			command: {
+				id: AddToWorkspaceFolderRecommendationsAction.ADD_ID,
+				title: `${ExtensionsLabel}: ${AddToWorkspaceFolderRecommendationsAction.ADD_LABEL}`
+			},
+			when: this.addToWorkspaceFolderRecommendationsContextKey
+		});
+
+		CommandsRegistry.registerCommand(AddToWorkspaceRecommendationsAction.IGNORE_ID, serviceAccessor => {
+			serviceAccessor.get(IInstantiationService)
+				.createInstance(AddToWorkspaceRecommendationsAction, AddToWorkspaceRecommendationsAction.IGNORE_ID, AddToWorkspaceRecommendationsAction.IGNORE_LABEL)
+				.run(AddToWorkspaceRecommendationsAction.IGNORE);
+		});
+		MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
+			command: {
+				id: AddToWorkspaceRecommendationsAction.IGNORE_ID,
+				title: `${ExtensionsLabel}: ${AddToWorkspaceRecommendationsAction.IGNORE_LABEL}`
+			},
+			when: this.addToWorkspaceRecommendationsContextKey
+		});
+
+		CommandsRegistry.registerCommand(AddToWorkspaceFolderRecommendationsAction.IGNORE_ID, serviceAccessor => {
+			serviceAccessor.get(IInstantiationService)
+				.createInstance(AddToWorkspaceFolderRecommendationsAction, AddToWorkspaceFolderRecommendationsAction.IGNORE_ID, AddToWorkspaceFolderRecommendationsAction.IGNORE_LABEL)
+				.run(AddToWorkspaceRecommendationsAction.IGNORE);
+		});
+		MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
+			command: {
+				id: AddToWorkspaceFolderRecommendationsAction.IGNORE_ID,
+				title: `${ExtensionsLabel}: ${AddToWorkspaceFolderRecommendationsAction.IGNORE_LABEL}`
+			},
+			when: this.addToWorkspaceFolderRecommendationsContextKey
+		});
+	}
+}
+
+export abstract class AbstractConfigureRecommendedExtensionsAction extends Action {
+
+	constructor(
+		id: string,
+		label: string,
+		@IWorkspaceContextService protected contextService: IWorkspaceContextService,
+		@IFileService private fileService: IFileService,
+		@IEditorService protected editorService: IEditorService,
+		@IJSONEditingService private jsonEditingService: IJSONEditingService,
+		@ITextModelService private textModelResolverService: ITextModelService
+	) {
+		super(id, label, null);
+	}
+
+	protected openExtensionsFile(extensionsFileResource: URI): TPromise<any> {
+		return this.getOrCreateExtensionsFile(extensionsFileResource)
+			.then(({ created, content }) =>
+				this.getSelectionPosition(content, extensionsFileResource, ['recommendations'])
+					.then(selection => this.editorService.openEditor({
+						resource: extensionsFileResource,
+						options: {
+							pinned: created,
+							selection
+						}
+					})),
+				error => TPromise.wrapError(new Error(localize('OpenExtensionsFile.failed', "Unable to create 'extensions.json' file inside the '.vscode' folder ({0}).", error))));
+	}
+
+	protected openWorkspaceConfigurationFile(workspaceConfigurationFile: URI): TPromise<any> {
+		return this.getOrUpdateWorkspaceConfigurationFile(workspaceConfigurationFile)
+			.then(content => this.getSelectionPosition(content.value, content.resource, ['extensions', 'recommendations']))
+			.then(selection => this.editorService.openEditor({
+				resource: workspaceConfigurationFile,
+				options: {
+					selection,
+					forceReload: true // because content has changed
+				}
+			}));
+	}
+
+	protected addExtensionToWorkspaceConfig(workspaceConfigurationFile: URI, extensionId: string, shouldRecommend: boolean) {
+		return this.getOrUpdateWorkspaceConfigurationFile(workspaceConfigurationFile)
+			.then(content => {
+				const extensionIdLowerCase = extensionId.toLowerCase();
+				const workspaceExtensionsConfigContent: IExtensionsConfigContent = (json.parse(content.value) || {})['extensions'] || {};
+				let insertInto = shouldRecommend ? workspaceExtensionsConfigContent.recommendations || [] : workspaceExtensionsConfigContent.unwantedRecommendations || [];
+				let removeFrom = shouldRecommend ? workspaceExtensionsConfigContent.unwantedRecommendations || [] : workspaceExtensionsConfigContent.recommendations || [];
+
+				if (insertInto.some(e => e.toLowerCase() === extensionIdLowerCase)) {
+					return TPromise.as(null);
+				}
+
+				insertInto.push(extensionId);
+				removeFrom = removeFrom.filter(x => x.toLowerCase() !== extensionIdLowerCase);
+
+				return this.jsonEditingService.write(workspaceConfigurationFile,
+					{
+						key: 'extensions',
+						value: {
+							recommendations: shouldRecommend ? insertInto : removeFrom,
+							unwantedRecommendations: shouldRecommend ? removeFrom : insertInto
+						}
+					},
+					true);
+			});
+	}
+
+	protected addExtensionToWorkspaceFolderConfig(extensionsFileResource: URI, extensionId: string, shouldRecommend: boolean): TPromise<any> {
+		return this.getOrCreateExtensionsFile(extensionsFileResource)
+			.then(({ content }) => {
+				const extensionIdLowerCase = extensionId.toLowerCase();
+				const extensionsConfigContent: IExtensionsConfigContent = json.parse(content) || {};
+				let insertInto = shouldRecommend ? extensionsConfigContent.recommendations || [] : extensionsConfigContent.unwantedRecommendations || [];
+				let removeFrom = shouldRecommend ? extensionsConfigContent.unwantedRecommendations || [] : extensionsConfigContent.recommendations || [];
+
+				if (insertInto.some(e => e.toLowerCase() === extensionIdLowerCase)) {
+					return TPromise.as(null);
+				}
+
+				insertInto.push(extensionId);
+
+				let removeFromPromise = TPromise.wrap(null);
+				if (removeFrom.some(e => e.toLowerCase() === extensionIdLowerCase)) {
+					removeFrom = removeFrom.filter(x => x.toLowerCase() !== extensionIdLowerCase);
+					removeFromPromise = this.jsonEditingService.write(extensionsFileResource,
+						{
+							key: shouldRecommend ? 'unwantedRecommendations' : 'recommendations',
+							value: removeFrom
+						},
+						true);
+				}
+
+				return removeFromPromise.then(() =>
+					this.jsonEditingService.write(extensionsFileResource,
+						{
+							key: shouldRecommend ? 'recommendations' : 'unwantedRecommendations',
+							value: insertInto
+						},
+						true)
+				);
+			});
+	}
+
+	protected getWorkspaceExtensionsConfigContent(extensionsFileResource: URI): TPromise<IExtensionsConfigContent> {
+		return this.fileService.resolveContent(extensionsFileResource)
+			.then(content => {
+				return (json.parse(content.value) || {})['extensions'] || {};
+			}, err => ({ recommendations: [], unwantedRecommendations: [] }));
+	}
+
+	protected getWorkspaceFolderExtensionsConfigContent(extensionsFileResource: URI): TPromise<IExtensionsConfigContent> {
+		return this.fileService.resolveContent(extensionsFileResource)
+			.then(content => {
+				return (<IExtensionsConfigContent>json.parse(content.value));
+			}, err => ({ recommendations: [], unwantedRecommendations: [] }));
+	}
+
+	private getOrUpdateWorkspaceConfigurationFile(workspaceConfigurationFile: URI): TPromise<IContent> {
+		return this.fileService.resolveContent(workspaceConfigurationFile)
+			.then(content => {
+				const workspaceRecommendations = <IExtensionsConfigContent>json.parse(content.value)['extensions'];
+				if (!workspaceRecommendations || !workspaceRecommendations.recommendations) {
+					return this.jsonEditingService.write(workspaceConfigurationFile, { key: 'extensions', value: { recommendations: [] } }, true)
+						.then(() => this.fileService.resolveContent(workspaceConfigurationFile));
+				}
+				return content;
+			});
+	}
+
+	private getSelectionPosition(content: string, resource: URI, path: json.JSONPath): TPromise<ITextEditorSelection> {
+		const tree = json.parseTree(content);
+		const node = json.findNodeAtLocation(tree, path);
+		if (node && node.parent.children[1]) {
+			const recommendationsValueNode = node.parent.children[1];
+			const lastExtensionNode = recommendationsValueNode.children && recommendationsValueNode.children.length ? recommendationsValueNode.children[recommendationsValueNode.children.length - 1] : null;
+			const offset = lastExtensionNode ? lastExtensionNode.offset + lastExtensionNode.length : recommendationsValueNode.offset + 1;
+			return this.textModelResolverService.createModelReference(resource)
+				.then(reference => {
+					const position = reference.object.textEditorModel.getPositionAt(offset);
+					reference.dispose();
+					return <ITextEditorSelection>{
+						startLineNumber: position.lineNumber,
+						startColumn: position.column,
+						endLineNumber: position.lineNumber,
+						endColumn: position.column,
+					};
+				});
+		}
+		return TPromise.as(null);
+	}
+
+	private getOrCreateExtensionsFile(extensionsFileResource: URI): TPromise<{ created: boolean, extensionsFileResource: URI, content: string }> {
+		return this.fileService.resolveContent(extensionsFileResource).then(content => {
+			return { created: false, extensionsFileResource, content: content.value };
+		}, err => {
+			return this.fileService.updateContent(extensionsFileResource, ExtensionsConfigurationInitialContent).then(() => {
+				return { created: true, extensionsFileResource, content: ExtensionsConfigurationInitialContent };
+			});
+		});
+	}
+}
+
+export class ConfigureWorkspaceRecommendedExtensionsAction extends AbstractConfigureRecommendedExtensionsAction {
+
+	static readonly ID = 'workbench.extensions.action.configureWorkspaceRecommendedExtensions';
+	static LABEL = localize('configureWorkspaceRecommendedExtensions', "Configure Recommended Extensions (Workspace)");
+
+	private disposables: IDisposable[] = [];
+
+	constructor(
+		id: string,
+		label: string,
+		@IFileService fileService: IFileService,
+		@IWorkspaceContextService contextService: IWorkspaceContextService,
+		@IEditorService editorService: IEditorService,
+		@IJSONEditingService jsonEditingService: IJSONEditingService,
+		@ITextModelService textModelResolverService: ITextModelService
+	) {
+		super(id, label, contextService, fileService, editorService, jsonEditingService, textModelResolverService);
+		this.contextService.onDidChangeWorkbenchState(() => this.update(), this, this.disposables);
+		this.update();
+	}
+
+	private update(): void {
+		this.enabled = this.contextService.getWorkbenchState() !== WorkbenchState.EMPTY;
+	}
+
+	public run(): TPromise<any> {
+		switch (this.contextService.getWorkbenchState()) {
+			case WorkbenchState.FOLDER:
+				return this.openExtensionsFile(this.contextService.getWorkspace().folders[0].toResource(paths.join('.vscode', 'extensions.json')));
+			case WorkbenchState.WORKSPACE:
+				return this.openWorkspaceConfigurationFile(this.contextService.getWorkspace().configuration);
+		}
+		return TPromise.as(null);
+	}
+
+	dispose(): void {
+		this.disposables = dispose(this.disposables);
+		super.dispose();
+	}
+}
+
+export class ConfigureWorkspaceFolderRecommendedExtensionsAction extends AbstractConfigureRecommendedExtensionsAction {
+
+	static readonly ID = 'workbench.extensions.action.configureWorkspaceFolderRecommendedExtensions';
+	static LABEL = localize('configureWorkspaceFolderRecommendedExtensions', "Configure Recommended Extensions (Workspace Folder)");
+
+	private disposables: IDisposable[] = [];
+
+	constructor(
+		id: string,
+		label: string,
+		@IFileService fileService: IFileService,
+		@IWorkspaceContextService contextService: IWorkspaceContextService,
+		@IEditorService editorService: IEditorService,
+		@IJSONEditingService jsonEditingService: IJSONEditingService,
+		@ITextModelService textModelResolverService: ITextModelService,
+		@ICommandService private commandService: ICommandService
+	) {
+		super(id, label, contextService, fileService, editorService, jsonEditingService, textModelResolverService);
+		this.contextService.onDidChangeWorkspaceFolders(() => this.update(), this, this.disposables);
+		this.update();
+	}
+
+	private update(): void {
+		this.enabled = this.contextService.getWorkspace().folders.length > 0;
+	}
+
+	public run(): TPromise<any> {
+		const folderCount = this.contextService.getWorkspace().folders.length;
+		const pickFolderPromise = folderCount === 1 ? TPromise.as(this.contextService.getWorkspace().folders[0]) : this.commandService.executeCommand<IWorkspaceFolder>(PICK_WORKSPACE_FOLDER_COMMAND_ID);
+		return pickFolderPromise
+			.then(workspaceFolder => {
+				if (workspaceFolder) {
+					return this.openExtensionsFile(workspaceFolder.toResource(paths.join('.vscode', 'extensions.json')));
+				}
+				return null;
+			});
+	}
+
+	dispose(): void {
+		this.disposables = dispose(this.disposables);
+		super.dispose();
+	}
+}
+
+export class AddToWorkspaceFolderRecommendationsAction extends AbstractConfigureRecommendedExtensionsAction {
+	static readonly ADD = true;
+	static readonly IGNORE = false;
+	static readonly ADD_ID = 'workbench.extensions.action.addToWorkspaceFolderRecommendations';
+	static readonly ADD_LABEL = localize('addToWorkspaceFolderRecommendations', "Add to Recommended Extensions (Workspace Folder)");
+	static readonly IGNORE_ID = 'workbench.extensions.action.addToWorkspaceFolderIgnoredRecommendations';
+	static readonly IGNORE_LABEL = localize('addToWorkspaceFolderIgnoredRecommendations', "Ignore Recommended Extension (Workspace Folder)");
+
+	constructor(
+		id: string,
+		label: string,
+		@IFileService fileService: IFileService,
+		@IWorkspaceContextService contextService: IWorkspaceContextService,
+		@IEditorService editorService: IEditorService,
+		@IJSONEditingService jsonEditingService: IJSONEditingService,
+		@ITextModelService textModelResolverService: ITextModelService,
+		@ICommandService private commandService: ICommandService,
+		@INotificationService private notificationService: INotificationService
+	) {
+		super(id, label, contextService, fileService, editorService, jsonEditingService, textModelResolverService);
+	}
+
+	run(shouldRecommend: boolean): TPromise<void> {
+		if (!(this.editorService.activeEditor instanceof ExtensionsInput) || !this.editorService.activeEditor.extension) {
+			return TPromise.as(null);
+		}
+		const folders = this.contextService.getWorkspace().folders;
+		if (!folders || !folders.length) {
+			this.notificationService.info(localize('AddToWorkspaceFolderRecommendations.noWorkspace', 'There are no workspace folders open to add recommendations.'));
+			return TPromise.as(null);
+		}
+
+		const extensionId = this.editorService.activeEditor.extension.id;
+		const pickFolderPromise = folders.length === 1
+			? TPromise.as(folders[0])
+			: this.commandService.executeCommand<IWorkspaceFolder>(PICK_WORKSPACE_FOLDER_COMMAND_ID);
+		return pickFolderPromise
+			.then(workspaceFolder => {
+				if (!workspaceFolder) {
+					return TPromise.as(null);
+				}
+				const configurationFile = workspaceFolder.toResource(paths.join('.vscode', 'extensions.json'));
+				return this.getWorkspaceFolderExtensionsConfigContent(configurationFile).then(content => {
+					const extensionIdLowerCase = extensionId.toLowerCase();
+					if (shouldRecommend) {
+						if ((content.recommendations || []).some(e => e.toLowerCase() === extensionIdLowerCase)) {
+							this.notificationService.info(localize('AddToWorkspaceFolderRecommendations.alreadyExists', 'This extension is already present in this workspace folder\'s recommendations.'));
+							return TPromise.as(null);
+						}
+
+						return this.addExtensionToWorkspaceFolderConfig(configurationFile, extensionId, shouldRecommend).then(() => {
+							this.notificationService.prompt(Severity.Info,
+								localize('AddToWorkspaceFolderRecommendations.success', 'The extension was successfully added to this workspace folder\'s recommendations.'),
+								[{
+									label: localize('viewChanges', "View Changes"),
+									run: () => this.openExtensionsFile(configurationFile)
+								}]);
+						}, err => {
+							this.notificationService.error(localize('AddToWorkspaceFolderRecommendations.failure', 'Failed to write to extensions.json. {0}', err));
+						});
+					}
+					else {
+						if ((content.unwantedRecommendations || []).some(e => e.toLowerCase() === extensionIdLowerCase)) {
+							this.notificationService.info(localize('AddToWorkspaceFolderIgnoredRecommendations.alreadyExists', 'This extension is already present in this workspace folder\'s unwanted recommendations.'));
+							return TPromise.as(null);
+						}
+
+						return this.addExtensionToWorkspaceFolderConfig(configurationFile, extensionId, shouldRecommend).then(() => {
+							this.notificationService.prompt(Severity.Info,
+								localize('AddToWorkspaceFolderIgnoredRecommendations.success', 'The extension was successfully added to this workspace folder\'s unwanted recommendations.'),
+								[{
+									label: localize('viewChanges', "View Changes"),
+									run: () => this.openExtensionsFile(configurationFile)
+								}]);
+						}, err => {
+							this.notificationService.error(localize('AddToWorkspaceFolderRecommendations.failure', 'Failed to write to extensions.json. {0}', err));
+						});
+					}
+				});
+			});
+	}
+}
+
+export class AddToWorkspaceRecommendationsAction extends AbstractConfigureRecommendedExtensionsAction {
+	static readonly ADD = true;
+	static readonly IGNORE = false;
+	static readonly ADD_ID = 'workbench.extensions.action.addToWorkspaceRecommendations';
+	static readonly ADD_LABEL = localize('addToWorkspaceRecommendations', "Add to Recommended Extensions (Workspace)");
+	static readonly IGNORE_ID = 'workbench.extensions.action.addToWorkspaceIgnoredRecommendations';
+	static readonly IGNORE_LABEL = localize('addToWorkspaceIgnoredRecommendations', "Ignore Recommended Extension (Workspace)");
+
+	constructor(
+		id: string,
+		label: string,
+		@IFileService fileService: IFileService,
+		@IWorkspaceContextService contextService: IWorkspaceContextService,
+		@IEditorService editorService: IEditorService,
+		@IJSONEditingService jsonEditingService: IJSONEditingService,
+		@ITextModelService textModelResolverService: ITextModelService,
+		@INotificationService private notificationService: INotificationService
+	) {
+		super(id, label, contextService, fileService, editorService, jsonEditingService, textModelResolverService);
+	}
+
+	run(shouldRecommend: boolean): TPromise<void> {
+		if (!(this.editorService.activeEditor instanceof ExtensionsInput) || !this.editorService.activeEditor.extension) {
+			return TPromise.as(null);
+		}
+		const workspaceConfig = this.contextService.getWorkspace().configuration;
+
+		const extensionId = this.editorService.activeEditor.extension.id;
+
+		return this.getWorkspaceExtensionsConfigContent(workspaceConfig).then(content => {
+			const extensionIdLowerCase = extensionId.toLowerCase();
+			if (shouldRecommend) {
+				if ((content.recommendations || []).some(e => e.toLowerCase() === extensionIdLowerCase)) {
+					this.notificationService.info(localize('AddToWorkspaceRecommendations.alreadyExists', 'This extension is already present in workspace recommendations.'));
+					return TPromise.as(null);
+				}
+
+				return this.addExtensionToWorkspaceConfig(workspaceConfig, extensionId, shouldRecommend).then(() => {
+					this.notificationService.prompt(Severity.Info,
+						localize('AddToWorkspaceRecommendations.success', 'The extension was successfully added to this workspace\'s recommendations.'),
+						[{
+							label: localize('viewChanges', "View Changes"),
+							run: () => this.openWorkspaceConfigurationFile(workspaceConfig)
+						}]);
+
+				}, err => {
+					this.notificationService.error(localize('AddToWorkspaceRecommendations.failure', 'Failed to write. {0}', err));
+				});
+			} else {
+				if ((content.unwantedRecommendations || []).some(e => e.toLowerCase() === extensionIdLowerCase)) {
+					this.notificationService.info(localize('AddToWorkspaceUnwantedRecommendations.alreadyExists', 'This extension is already present in workspace unwanted recommendations.'));
+					return TPromise.as(null);
+				}
+
+				return this.addExtensionToWorkspaceConfig(workspaceConfig, extensionId, shouldRecommend).then(() => {
+					this.notificationService.prompt(Severity.Info,
+						localize('AddToWorkspaceUnwantedRecommendations.success', 'The extension was successfully added to this workspace\'s unwanted recommendations.'),
+						[{
+							label: localize('viewChanges', "View Changes"),
+							run: () => this.openWorkspaceConfigurationFile(workspaceConfig)
+						}]);
+				}, err => {
+					this.notificationService.error(localize('AddToWorkspaceRecommendations.failure', 'Failed to write. {0}', err));
+				});
+			}
+		});
+	}
+}
+
+export class MaliciousStatusLabelAction extends Action {
+
+	private static readonly Class = 'malicious-status';
+
+	private _extension: IExtension;
+	get extension(): IExtension { return this._extension; }
+	set extension(extension: IExtension) { this._extension = extension; this.update(); }
+
+	constructor(long: boolean) {
+		const tooltip = localize('malicious tooltip', "This extension was reported to be problematic.");
+		const label = long ? tooltip : localize('malicious', "Malicious");
+		super('extensions.install', label, '', false);
+		this.tooltip = localize('malicious tooltip', "This extension was reported to be problematic.");
+	}
+
+	private update(): void {
+		if (this.extension && this.extension.isMalicious) {
+			this.class = `${MaliciousStatusLabelAction.Class} malicious`;
+		} else {
+			this.class = `${MaliciousStatusLabelAction.Class} not-malicious`;
+		}
+	}
+
+	run(): TPromise<any> {
+		return TPromise.as(null);
+	}
+}
+
+export class DisabledStatusLabelAction extends Action {
+
+	private static readonly Class = 'disable-status';
+
+	private _extension: IExtension;
+	get extension(): IExtension { return this._extension; }
+	set extension(extension: IExtension) { this._extension = extension; this.update(); }
+
+	private disposables: IDisposable[] = [];
+	private throttler: Throttler = new Throttler();
+
+	constructor(
+		@IExtensionsWorkbenchService private extensionsWorkbenchService: IExtensionsWorkbenchService,
+		@IExtensionService private extensionService: IExtensionService
+	) {
+		super('extensions.install', localize('disabled', "Disabled"), `${DisabledStatusLabelAction.Class} hide`, false);
+		this.disposables.push(this.extensionsWorkbenchService.onChange((extension) => this.update(extension)));
+		this.update();
+	}
+
+	private update(extension?: IExtension): void {
+		if (extension && this.extension && !areSameExtensions(this.extension, extension)) {
+			return;
+		}
+		this.throttler.queue(() => this.extensionService.getExtensions()
+			.then(runningExtensions => {
+				this.class = `${DisabledStatusLabelAction.Class} hide`;
+				this.tooltip = '';
+				if (this.extension && !this.extension.isMalicious && !runningExtensions.some(e => e.id === this.extension.id)) {
+					if (this.extension.enablementState === EnablementState.Disabled || this.extension.enablementState === EnablementState.WorkspaceDisabled) {
+						this.class = `${DisabledStatusLabelAction.Class}`;
+						this.tooltip = this.extension.enablementState === EnablementState.Disabled ? localize('disabled globally', "Disabled") : localize('disabled workspace', "Disabled for this Workspace");
+					}
+				}
+			}));
+	}
+
+	run(): TPromise<any> {
+		return TPromise.as(null);
+	}
+}
+
+export class DisableAllAction extends Action {
+
+	static readonly ID = 'workbench.extensions.action.disableAll';
+	static LABEL = localize('disableAll', "Disable All Installed Extensions");
+
+	private disposables: IDisposable[] = [];
+
+	constructor(
+		id: string = DisableAllAction.ID, label: string = DisableAllAction.LABEL,
+		@IExtensionsWorkbenchService private extensionsWorkbenchService: IExtensionsWorkbenchService
+	) {
+		super(id, label);
+		this.update();
+		this.disposables.push(this.extensionsWorkbenchService.onChange(() => this.update()));
+	}
+
+	private update(): void {
+		this.enabled = this.extensionsWorkbenchService.local.some(e => e.type === LocalExtensionType.User && (e.enablementState === EnablementState.Enabled || e.enablementState === EnablementState.WorkspaceEnabled));
+	}
+
+	run(): TPromise<any> {
+		return this.extensionsWorkbenchService.setEnablement(this.extensionsWorkbenchService.local.filter(e => e.type === LocalExtensionType.User), EnablementState.Disabled);
+	}
+
+	dispose(): void {
+		super.dispose();
+		this.disposables = dispose(this.disposables);
+	}
+}
+
+export class DisableAllWorkpsaceAction extends Action {
+
+	static readonly ID = 'workbench.extensions.action.disableAllWorkspace';
+	static LABEL = localize('disableAllWorkspace', "Disable All Installed Extensions for this Workspace");
+
+	private disposables: IDisposable[] = [];
+
+	constructor(
+		id: string = DisableAllWorkpsaceAction.ID, label: string = DisableAllWorkpsaceAction.LABEL,
+		@IWorkspaceContextService private workspaceContextService: IWorkspaceContextService,
+		@IExtensionsWorkbenchService private extensionsWorkbenchService: IExtensionsWorkbenchService
+	) {
+		super(id, label);
+		this.update();
+		this.workspaceContextService.onDidChangeWorkbenchState(() => this.update(), this, this.disposables);
+		this.extensionsWorkbenchService.onChange(() => this.update(), this, this.disposables);
+	}
+
+	private update(): void {
+		this.enabled = this.workspaceContextService.getWorkbenchState() !== WorkbenchState.EMPTY && this.extensionsWorkbenchService.local.some(e => e.type === LocalExtensionType.User && (e.enablementState === EnablementState.Enabled || e.enablementState === EnablementState.WorkspaceEnabled));
+	}
+
+	run(): TPromise<any> {
+		return this.extensionsWorkbenchService.setEnablement(this.extensionsWorkbenchService.local.filter(e => e.type === LocalExtensionType.User), EnablementState.WorkspaceDisabled);
+	}
+
+	dispose(): void {
+		super.dispose();
+		this.disposables = dispose(this.disposables);
+	}
+}
+
+export class EnableAllAction extends Action {
+
+	static readonly ID = 'workbench.extensions.action.enableAll';
+	static LABEL = localize('enableAll', "Enable All Extensions");
+
+	private disposables: IDisposable[] = [];
+
+	constructor(
+		id: string = EnableAllAction.ID, label: string = EnableAllAction.LABEL,
+		@IExtensionsWorkbenchService private extensionsWorkbenchService: IExtensionsWorkbenchService,
+		@IExtensionEnablementService private extensionEnablementService: IExtensionEnablementService
+	) {
+		super(id, label);
+		this.update();
+		this.disposables.push(this.extensionsWorkbenchService.onChange(() => this.update()));
+	}
+
+	private update(): void {
+		this.enabled = this.extensionsWorkbenchService.local.some(e => e.local && this.extensionEnablementService.canChangeEnablement(e.local) && (e.enablementState === EnablementState.Disabled || e.enablementState === EnablementState.WorkspaceDisabled));
+	}
+
+	run(): TPromise<any> {
+		return this.extensionsWorkbenchService.setEnablement(this.extensionsWorkbenchService.local, EnablementState.Enabled);
+	}
+
+	dispose(): void {
+		super.dispose();
+		this.disposables = dispose(this.disposables);
+	}
+}
+
+export class EnableAllWorkpsaceAction extends Action {
+
+	static readonly ID = 'workbench.extensions.action.enableAllWorkspace';
+	static LABEL = localize('enableAllWorkspace', "Enable All Extensions for this Workspace");
+
+	private disposables: IDisposable[] = [];
+
+	constructor(
+		id: string = EnableAllWorkpsaceAction.ID, label: string = EnableAllWorkpsaceAction.LABEL,
+		@IWorkspaceContextService private workspaceContextService: IWorkspaceContextService,
+		@IExtensionsWorkbenchService private extensionsWorkbenchService: IExtensionsWorkbenchService,
+		@IExtensionEnablementService private extensionEnablementService: IExtensionEnablementService
+	) {
+		super(id, label);
+		this.update();
+		this.extensionsWorkbenchService.onChange(() => this.update(), this, this.disposables);
+		this.workspaceContextService.onDidChangeWorkbenchState(() => this.update(), this, this.disposables);
+	}
+
+	private update(): void {
+		this.enabled = this.workspaceContextService.getWorkbenchState() !== WorkbenchState.EMPTY && this.extensionsWorkbenchService.local.some(e => e.local && this.extensionEnablementService.canChangeEnablement(e.local) && (e.enablementState === EnablementState.Disabled || e.enablementState === EnablementState.WorkspaceDisabled));
+	}
+
+	run(): TPromise<any> {
+		return this.extensionsWorkbenchService.setEnablement(this.extensionsWorkbenchService.local, EnablementState.WorkspaceEnabled);
+	}
+
+	dispose(): void {
+		super.dispose();
+		this.disposables = dispose(this.disposables);
+	}
+}
 
 export class OpenExtensionsFolderAction extends Action {
 
@@ -97,7 +2303,7 @@ export class ReinstallAction extends Action {
 	constructor(
 		id: string = ReinstallAction.ID, label: string = ReinstallAction.LABEL,
 		@IExtensionsWorkbenchService private extensionsWorkbenchService: IExtensionsWorkbenchService,
-		@IQuickOpenService private quickOpenService: IQuickOpenService,
+		@IQuickInputService private quickInputService: IQuickInputService,
 		@INotificationService private notificationService: INotificationService,
 		@IWindowService private windowService: IWindowService
 	) {
@@ -109,21 +2315,22 @@ export class ReinstallAction extends Action {
 	}
 
 	run(): TPromise<any> {
-		return this.quickOpenService.pick(this.getEntries(), { placeHolder: localize('selectExtension', "Select Extension to Reinstall") });
+		return this.quickInputService.pick(this.getEntries(), { placeHolder: localize('selectExtension', "Select Extension to Reinstall") })
+			.then(pick => pick && this.reinstallExtension(pick.extension));
 	}
 
-	private getEntries(): TPromise<IPickOpenEntry[]> {
+	private getEntries() {
 		return this.extensionsWorkbenchService.queryLocal()
 			.then(local => {
-				const entries: IPickOpenEntry[] = local
+				const entries = local
 					.filter(extension => extension.type === LocalExtensionType.User)
 					.map(extension => {
-						return <IPickOpenEntry>{
+						return {
 							id: extension.id,
 							label: extension.displayName,
 							description: extension.id,
-							run: () => this.reinstallExtension(extension),
-						};
+							extension,
+						} as (IQuickPickItem & { extension: IExtension });
 					});
 				return entries;
 			});
@@ -142,4 +2349,97 @@ export class ReinstallAction extends Action {
 				);
 			}, error => this.notificationService.error(error));
 	}
-}
\ No newline at end of file
+}
+
+CommandsRegistry.registerCommand('workbench.extensions.action.showExtensionsForLanguage', function (accessor: ServicesAccessor, fileExtension: string) {
+	const viewletService = accessor.get(IViewletService);
+
+	return viewletService.openViewlet(VIEWLET_ID, true)
+		.then(viewlet => viewlet as IExtensionsViewlet)
+		.then(viewlet => {
+			viewlet.search(`ext:${fileExtension.replace(/^\./, '')}`);
+			viewlet.focus();
+		});
+});
+
+CommandsRegistry.registerCommand('workbench.extensions.action.showExtensionsWithIds', function (accessor: ServicesAccessor, extensionIds: string[]) {
+	const viewletService = accessor.get(IViewletService);
+
+	return viewletService.openViewlet(VIEWLET_ID, true)
+		.then(viewlet => viewlet as IExtensionsViewlet)
+		.then(viewlet => {
+			const query = extensionIds
+				.map(id => `@id:${id}`)
+				.join(' ');
+			viewlet.search(query);
+			viewlet.focus();
+		});
+});
+
+export const extensionButtonProminentBackground = registerColor('extensionButton.prominentBackground', {
+	dark: '#327e36',
+	light: '#327e36',
+	hc: null
+}, localize('extensionButtonProminentBackground', "Button background color for actions extension that stand out (e.g. install button)."));
+
+export const extensionButtonProminentForeground = registerColor('extensionButton.prominentForeground', {
+	dark: Color.white,
+	light: Color.white,
+	hc: null
+}, localize('extensionButtonProminentForeground', "Button foreground color for actions extension that stand out (e.g. install button)."));
+
+export const extensionButtonProminentHoverBackground = registerColor('extensionButton.prominentHoverBackground', {
+	dark: '#28632b',
+	light: '#28632b',
+	hc: null
+}, localize('extensionButtonProminentHoverBackground', "Button background hover color for actions extension that stand out (e.g. install button)."));
+
+registerThemingParticipant((theme: ITheme, collector: ICssStyleCollector) => {
+	const foregroundColor = theme.getColor(foreground);
+	if (foregroundColor) {
+		collector.addRule(`.extension .monaco-action-bar .action-item .action-label.extension-action.built-in-status { border-color: ${foregroundColor}; }`);
+		collector.addRule(`.extension-editor .monaco-action-bar .action-item .action-label.extension-action.built-in-status { border-color: ${foregroundColor}; }`);
+	}
+
+	const buttonBackgroundColor = theme.getColor(buttonBackground);
+	if (buttonBackgroundColor) {
+		collector.addRule(`.extension .monaco-action-bar .action-item .action-label.extension-action { background-color: ${buttonBackgroundColor}; }`);
+		collector.addRule(`.extension-editor .monaco-action-bar .action-item .action-label.extension-action { background-color: ${buttonBackgroundColor}; }`);
+	}
+
+	const buttonForegroundColor = theme.getColor(buttonForeground);
+	if (buttonForegroundColor) {
+		collector.addRule(`.extension .monaco-action-bar .action-item .action-label.extension-action { color: ${buttonForegroundColor}; }`);
+		collector.addRule(`.extension-editor .monaco-action-bar .action-item .action-label.extension-action { color: ${buttonForegroundColor}; }`);
+	}
+
+	const buttonHoverBackgroundColor = theme.getColor(buttonHoverBackground);
+	if (buttonHoverBackgroundColor) {
+		collector.addRule(`.extension .monaco-action-bar .action-item:hover .action-label.extension-action { background-color: ${buttonHoverBackgroundColor}; }`);
+		collector.addRule(`.extension-editor .monaco-action-bar .action-item:hover .action-label.extension-action { background-color: ${buttonHoverBackgroundColor}; }`);
+	}
+
+	const contrastBorderColor = theme.getColor(contrastBorder);
+	if (contrastBorderColor) {
+		collector.addRule(`.extension .monaco-action-bar .action-item .action-label.extension-action { border: 1px solid ${contrastBorderColor}; }`);
+		collector.addRule(`.extension-editor .monaco-action-bar .action-item .action-label.extension-action { border: 1px solid ${contrastBorderColor}; }`);
+	}
+
+	const extensionButtonProminentBackgroundColor = theme.getColor(extensionButtonProminentBackground);
+	if (extensionButtonProminentBackground) {
+		collector.addRule(`.extension .monaco-action-bar .action-item .action-label.extension-action.prominent { background-color: ${extensionButtonProminentBackgroundColor}; }`);
+		collector.addRule(`.extension-editor .monaco-action-bar .action-item .action-label.extension-action.prominent { background-color: ${extensionButtonProminentBackgroundColor}; }`);
+	}
+
+	const extensionButtonProminentForegroundColor = theme.getColor(extensionButtonProminentForeground);
+	if (extensionButtonProminentForeground) {
+		collector.addRule(`.extension .monaco-action-bar .action-item .action-label.extension-action.prominent { color: ${extensionButtonProminentForegroundColor}; }`);
+		collector.addRule(`.extension-editor .monaco-action-bar .action-item .action-label.extension-action.prominent { color: ${extensionButtonProminentForegroundColor}; }`);
+	}
+
+	const extensionButtonProminentHoverBackgroundColor = theme.getColor(extensionButtonProminentHoverBackground);
+	if (extensionButtonProminentHoverBackground) {
+		collector.addRule(`.extension .monaco-action-bar .action-item:hover .action-label.extension-action.prominent { background-color: ${extensionButtonProminentHoverBackgroundColor}; }`);
+		collector.addRule(`.extension-editor .monaco-action-bar .action-item:hover .action-label.extension-action.prominent { background-color: ${extensionButtonProminentHoverBackgroundColor}; }`);
+	}
+});
diff --git a/src/vs/workbench/parts/extensions/electron-browser/extensionsList.ts b/src/vs/workbench/parts/extensions/electron-browser/extensionsList.ts
new file mode 100644
index 00000000000..b41009aea78
--- /dev/null
+++ b/src/vs/workbench/parts/extensions/electron-browser/extensionsList.ts
@@ -0,0 +1,218 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+import { localize } from 'vs/nls';
+import { append, $, addClass, removeClass, toggleClass } from 'vs/base/browser/dom';
+import { IDisposable, dispose, toDisposable } from 'vs/base/common/lifecycle';
+import { Action } from 'vs/base/common/actions';
+import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
+import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { IVirtualDelegate } from 'vs/base/browser/ui/list/list';
+import { IPagedRenderer } from 'vs/base/browser/ui/list/listPaging';
+import { once } from 'vs/base/common/event';
+import { domEvent } from 'vs/base/browser/event';
+import { IExtension, IExtensionsWorkbenchService } from 'vs/workbench/parts/extensions/common/extensions';
+import { InstallAction, UpdateAction, ManageExtensionAction, ReloadAction, extensionButtonProminentBackground, extensionButtonProminentForeground, MaliciousStatusLabelAction, DisabledStatusLabelAction } from 'vs/workbench/parts/extensions/electron-browser/extensionsActions';
+import { areSameExtensions } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
+import { Label, RatingsWidget, InstallCountWidget } from 'vs/workbench/parts/extensions/browser/extensionsWidgets';
+import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
+import { IExtensionTipsService, IExtensionManagementServerService } from 'vs/platform/extensionManagement/common/extensionManagement';
+import { IThemeService } from 'vs/platform/theme/common/themeService';
+import { INotificationService } from 'vs/platform/notification/common/notification';
+import { createCancelablePromise } from 'vs/base/common/async';
+
+export interface ITemplateData {
+	root: HTMLElement;
+	element: HTMLElement;
+	icon: HTMLImageElement;
+	name: HTMLElement;
+	installCount: HTMLElement;
+	ratings: HTMLElement;
+	author: HTMLElement;
+	description: HTMLElement;
+	extension: IExtension;
+	disposables: IDisposable[];
+	extensionDisposables: IDisposable[];
+}
+
+export class Delegate implements IVirtualDelegate<IExtension> {
+	getHeight() { return 62; }
+	getTemplateId() { return 'extension'; }
+}
+
+const actionOptions = { icon: true, label: true };
+
+export class Renderer implements IPagedRenderer<IExtension, ITemplateData> {
+
+	constructor(
+		@IInstantiationService private instantiationService: IInstantiationService,
+		@INotificationService private notificationService: INotificationService,
+		@IExtensionsWorkbenchService private extensionsWorkbenchService: IExtensionsWorkbenchService,
+		@IExtensionService private extensionService: IExtensionService,
+		@IExtensionTipsService private extensionTipsService: IExtensionTipsService,
+		@IThemeService private themeService: IThemeService,
+		@IExtensionManagementServerService private extensionManagementServerService: IExtensionManagementServerService
+	) { }
+
+	get templateId() { return 'extension'; }
+
+	renderTemplate(root: HTMLElement): ITemplateData {
+		const bookmark = append(root, $('span.bookmark'));
+		append(bookmark, $('span.octicon.octicon-star'));
+		const applyBookmarkStyle = (theme) => {
+			const bgColor = theme.getColor(extensionButtonProminentBackground);
+			const fgColor = theme.getColor(extensionButtonProminentForeground);
+			bookmark.style.borderTopColor = bgColor ? bgColor.toString() : 'transparent';
+			bookmark.style.color = fgColor ? fgColor.toString() : 'white';
+		};
+		applyBookmarkStyle(this.themeService.getTheme());
+		const bookmarkStyler = this.themeService.onThemeChange(applyBookmarkStyle.bind(this));
+
+		const element = append(root, $('.extension'));
+		const icon = append(element, $<HTMLImageElement>('img.icon'));
+		const details = append(element, $('.details'));
+		const headerContainer = append(details, $('.header-container'));
+		const header = append(headerContainer, $('.header'));
+		const name = append(header, $('span.name'));
+		const version = append(header, $('span.version'));
+		const installCount = append(header, $('span.install-count'));
+		const ratings = append(header, $('span.ratings'));
+		const description = append(details, $('.description.ellipsis'));
+		const footer = append(details, $('.footer'));
+		const author = append(footer, $('.author.ellipsis'));
+		const actionbar = new ActionBar(footer, {
+			animated: false,
+			actionItemProvider: (action: Action) => {
+				if (action.id === ManageExtensionAction.ID) {
+					return (<ManageExtensionAction>action).actionItem;
+				}
+				return null;
+			}
+		});
+		actionbar.onDidRun(({ error }) => error && this.notificationService.error(error));
+
+		const versionWidget = this.instantiationService.createInstance(Label, version, (e: IExtension) => e.version);
+		const installCountWidget = this.instantiationService.createInstance(InstallCountWidget, installCount, { small: true });
+		const ratingsWidget = this.instantiationService.createInstance(RatingsWidget, ratings, { small: true });
+
+		const maliciousStatusAction = this.instantiationService.createInstance(MaliciousStatusLabelAction, false);
+		const disabledStatusAction = this.instantiationService.createInstance(DisabledStatusLabelAction);
+		const installAction = this.instantiationService.createInstance(InstallAction);
+		const updateAction = this.instantiationService.createInstance(UpdateAction);
+		const reloadAction = this.instantiationService.createInstance(ReloadAction);
+		const manageAction = this.instantiationService.createInstance(ManageExtensionAction);
+
+		actionbar.push([updateAction, reloadAction, installAction, disabledStatusAction, maliciousStatusAction, manageAction], actionOptions);
+		const disposables = [versionWidget, installCountWidget, ratingsWidget, maliciousStatusAction, disabledStatusAction, updateAction, installAction, reloadAction, manageAction, actionbar, bookmarkStyler];
+
+		return {
+			root, element, icon, name, installCount, ratings, author, description, disposables,
+			extensionDisposables: [],
+			set extension(extension: IExtension) {
+				versionWidget.extension = extension;
+				installCountWidget.extension = extension;
+				ratingsWidget.extension = extension;
+				maliciousStatusAction.extension = extension;
+				disabledStatusAction.extension = extension;
+				installAction.extension = extension;
+				updateAction.extension = extension;
+				reloadAction.extension = extension;
+				manageAction.extension = extension;
+			}
+		};
+	}
+
+	renderPlaceholder(index: number, data: ITemplateData): void {
+		addClass(data.element, 'loading');
+
+		data.root.removeAttribute('aria-label');
+		data.extensionDisposables = dispose(data.extensionDisposables);
+		data.icon.src = '';
+		data.name.textContent = '';
+		data.author.textContent = '';
+		data.description.textContent = '';
+		data.installCount.style.display = 'none';
+		data.ratings.style.display = 'none';
+		data.extension = null;
+	}
+
+	renderElement(extension: IExtension, index: number, data: ITemplateData): void {
+		removeClass(data.element, 'loading');
+
+		data.extensionDisposables = dispose(data.extensionDisposables);
+		const installed = this.extensionsWorkbenchService.local.filter(e => e.id === extension.id)[0];
+
+		this.extensionService.getExtensions().then(runningExtensions => {
+			if (installed && installed.local) {
+				const installedExtensionServer = this.extensionManagementServerService.getExtensionManagementServer(installed.local.location);
+				const isSameExtensionRunning = runningExtensions.some(e => areSameExtensions(e, extension) && installedExtensionServer.authority === this.extensionManagementServerService.getExtensionManagementServer(e.extensionLocation).authority);
+				toggleClass(data.root, 'disabled', !isSameExtensionRunning);
+			} else {
+				removeClass(data.root, 'disabled');
+			}
+		});
+
+		const onError = once(domEvent(data.icon, 'error'));
+		onError(() => data.icon.src = extension.iconUrlFallback, null, data.extensionDisposables);
+		data.icon.src = extension.iconUrl;
+
+		if (!data.icon.complete) {
+			data.icon.style.visibility = 'hidden';
+			data.icon.onload = () => data.icon.style.visibility = 'inherit';
+		} else {
+			data.icon.style.visibility = 'inherit';
+		}
+
+		this.updateRecommendationStatus(extension, data);
+		data.extensionDisposables.push(this.extensionTipsService.onRecommendationChange(change => {
+			if (change.extensionId.toLowerCase() === extension.id.toLowerCase()) {
+				this.updateRecommendationStatus(extension, data);
+			}
+		}));
+
+		data.name.textContent = extension.displayName;
+		data.author.textContent = extension.publisherDisplayName;
+		data.description.textContent = extension.description;
+		data.installCount.style.display = '';
+		data.ratings.style.display = '';
+		data.extension = extension;
+
+		const manifestPromise = createCancelablePromise(token => extension.getManifest(token).then(manifest => {
+			if (manifest) {
+				const name = manifest && manifest.contributes && manifest.contributes.localizations && manifest.contributes.localizations.length > 0 && manifest.contributes.localizations[0].localizedLanguageName;
+				if (name) { data.description.textContent = name[0].toLocaleUpperCase() + name.slice(1); }
+			}
+		}));
+		data.disposables.push(toDisposable(() => manifestPromise.cancel()));
+	}
+
+	disposeElement(): void {
+		// noop
+	}
+
+	private updateRecommendationStatus(extension: IExtension, data: ITemplateData) {
+		const extRecommendations = this.extensionTipsService.getAllRecommendationsWithReason();
+		let ariaLabel = extension.displayName + '. ';
+
+		if (!extRecommendations[extension.id.toLowerCase()]) {
+			removeClass(data.root, 'recommended');
+			data.root.title = '';
+		} else {
+			addClass(data.root, 'recommended');
+			ariaLabel += extRecommendations[extension.id.toLowerCase()].reasonText + ' ';
+			data.root.title = extRecommendations[extension.id.toLowerCase()].reasonText;
+		}
+
+		ariaLabel += localize('viewExtensionDetailsAria', "Press enter for extension details.");
+		data.root.setAttribute('aria-label', ariaLabel);
+
+	}
+
+	disposeTemplate(data: ITemplateData): void {
+		data.disposables = dispose(data.disposables);
+	}
+}
diff --git a/src/vs/workbench/parts/extensions/electron-browser/extensionsUtils.ts b/src/vs/workbench/parts/extensions/electron-browser/extensionsUtils.ts
index 104644f1c7f..edb456d35f0 100644
--- a/src/vs/workbench/parts/extensions/electron-browser/extensionsUtils.ts
+++ b/src/vs/workbench/parts/extensions/electron-browser/extensionsUtils.ts
@@ -16,7 +16,7 @@ import { IExtensionManagementService, ILocalExtension, IExtensionEnablementServi
 import { ILifecycleService } from 'vs/platform/lifecycle/common/lifecycle';
 import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
 import { ServicesAccessor, IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { areSameExtensions, adoptToGalleryExtensionId } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
+import { areSameExtensions, adoptToGalleryExtensionId, getGalleryExtensionIdFromLocal } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
 import { getIdAndVersionFromLocalExtensionId } from 'vs/platform/extensionManagement/node/extensionManagementUtil';
 import { Severity, INotificationService } from 'vs/platform/notification/common/notification';
 
@@ -136,7 +136,7 @@ export function getInstalledExtensions(accessor: ServicesAccessor): TPromise<IEx
 
 export function isKeymapExtension(tipsService: IExtensionTipsService, extension: IExtensionStatus): boolean {
 	const cats = extension.local.manifest.categories;
-	return cats && cats.indexOf('Keymaps') !== -1 || tipsService.getKeymapRecommendations().indexOf(stripVersion(extension.identifier.id)) !== -1;
+	return cats && cats.indexOf('Keymaps') !== -1 || tipsService.getKeymapRecommendations().some(({ extensionId }) => areSameExtensions({ id: extensionId }, { id: getGalleryExtensionIdFromLocal(extension.local) }));
 }
 
 function stripVersion(id: string): string {
diff --git a/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.ts b/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.ts
index ab983addc7c..4a36c1bee2e 100644
--- a/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.ts
+++ b/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.ts
@@ -7,42 +7,38 @@
 
 import 'vs/css!./media/extensionsViewlet';
 import { localize } from 'vs/nls';
-import { ThrottledDelayer, always } from 'vs/base/common/async';
+import { ThrottledDelayer, always, timeout } from 'vs/base/common/async';
 import { TPromise } from 'vs/base/common/winjs.base';
-import { isPromiseCanceledError, onUnexpectedError, create as createError } from 'vs/base/common/errors';
+import { isPromiseCanceledError, create as createError } from 'vs/base/common/errors';
 import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
-import { Event as EventOf, mapEvent, chain } from 'vs/base/common/event';
+import { Event as EventOf, Emitter } from 'vs/base/common/event';
 import { IAction } from 'vs/base/common/actions';
-import { domEvent } from 'vs/base/browser/event';
 import { Separator } from 'vs/base/browser/ui/actionbar/actionbar';
-import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-import { KeyCode } from 'vs/base/common/keyCodes';
 import { IViewlet } from 'vs/workbench/common/viewlet';
 import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet';
-import { append, $, addStandardDisposableListener, EventType, addClass, removeClass, toggleClass, Dimension } from 'vs/base/browser/dom';
+import { append, $, addClass, toggleClass, Dimension } from 'vs/base/browser/dom';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { IExtensionsWorkbenchService, IExtensionsViewlet, VIEWLET_ID, ExtensionState, AutoUpdateConfigurationKey, ShowRecommendationsOnlyOnDemandKey, VIEW_CONTAINER } from '../common/extensions';
+import { IExtensionsWorkbenchService, IExtensionsViewlet, VIEWLET_ID, ExtensionState, AutoUpdateConfigurationKey, ShowRecommendationsOnlyOnDemandKey, CloseExtensionDetailsOnViewChangeKey, VIEW_CONTAINER } from '../common/extensions';
 import {
 	ShowEnabledExtensionsAction, ShowInstalledExtensionsAction, ShowRecommendedExtensionsAction, ShowPopularExtensionsAction, ShowDisabledExtensionsAction,
 	ShowOutdatedExtensionsAction, ClearExtensionsInputAction, ChangeSortAction, UpdateAllAction, CheckForUpdatesAction, DisableAllAction, EnableAllAction,
-	EnableAutoUpdateAction, DisableAutoUpdateAction, ShowBuiltInExtensionsAction, InstallVSIXAction
-} from 'vs/workbench/parts/extensions/browser/extensionsActions';
-import { LocalExtensionType, IExtensionManagementService } from 'vs/platform/extensionManagement/common/extensionManagement';
+	EnableAutoUpdateAction, DisableAutoUpdateAction, ShowBuiltInExtensionsAction, InstallVSIXAction, ChangeGroupAction
+} from 'vs/workbench/parts/extensions/electron-browser/extensionsActions';
+import { LocalExtensionType, IExtensionManagementService, IExtensionManagementServerService, IExtensionManagementServer } from 'vs/platform/extensionManagement/common/extensionManagement';
 import { ExtensionsInput } from 'vs/workbench/parts/extensions/common/extensionsInput';
-import { ExtensionsListView, InstalledExtensionsView, RecommendedExtensionsView, WorkspaceRecommendedExtensionsView, BuiltInExtensionsView, BuiltInThemesExtensionsView, BuiltInBasicsExtensionsView } from './extensionsViews';
+import { ExtensionsListView, EnabledExtensionsView, DisabledExtensionsView, RecommendedExtensionsView, WorkspaceRecommendedExtensionsView, BuiltInExtensionsView, BuiltInThemesExtensionsView, BuiltInBasicsExtensionsView, GroupByServerExtensionsView, DefaultRecommendedExtensionsView } from './extensionsViews';
 import { OpenGlobalSettingsAction } from 'vs/workbench/parts/preferences/browser/preferencesActions';
 import { IProgressService } from 'vs/platform/progress/common/progress';
 import { IEditorGroupsService } from 'vs/workbench/services/group/common/editorGroupsService';
 import Severity from 'vs/base/common/severity';
 import { IActivityService, ProgressBadge, NumberBadge } from 'vs/workbench/services/activity/common/activity';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { inputForeground, inputBackground, inputBorder } from 'vs/platform/theme/common/colorRegistry';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { ViewsRegistry, IViewDescriptor } from 'vs/workbench/common/views';
-import { ViewContainerViewlet } from 'vs/workbench/browser/parts/views/viewsViewlet';
+import { ViewContainerViewlet, IViewletViewOptions } from 'vs/workbench/browser/parts/views/viewsViewlet';
 import { IStorageService } from 'vs/platform/storage/common/storage';
 import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
 import { IContextKeyService, ContextKeyExpr, RawContextKey, IContextKey } from 'vs/platform/contextkey/common/contextkey';
@@ -54,6 +50,12 @@ import { IWindowService } from 'vs/platform/windows/common/windows';
 import { IPartService } from 'vs/workbench/services/part/common/partService';
 import { IAddedViewDescriptorRef } from 'vs/workbench/browser/parts/views/views';
 import { ViewletPanel } from 'vs/workbench/browser/parts/views/panelViewlet';
+import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
+import { ExtensionsWorkbenchService } from 'vs/workbench/parts/extensions/node/extensionsWorkbenchService';
+import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
+import { SingleServerExtensionManagementServerService } from 'vs/workbench/services/extensions/node/extensionManagementServerService';
+import { Query } from 'vs/workbench/parts/extensions/common/extensionQuery';
+import { SuggestEnabledInput, attachSuggestEnabledInputBoxStyler } from 'vs/workbench/parts/codeEditor/browser/suggestEnabledInput';
 
 interface SearchInputEvent extends Event {
 	target: HTMLInputElement;
@@ -62,14 +64,16 @@ interface SearchInputEvent extends Event {
 
 const NonEmptyWorkspaceContext = new RawContextKey<boolean>('nonEmptyWorkspace', false);
 const SearchExtensionsContext = new RawContextKey<boolean>('searchExtensions', false);
-const SearchInstalledExtensionsContext = new RawContextKey<boolean>('searchInstalledExtensions', false);
+const HasInstalledExtensionsContext = new RawContextKey<boolean>('hasInstalledExtensions', true);
 const SearchBuiltInExtensionsContext = new RawContextKey<boolean>('searchBuiltInExtensions', false);
 const RecommendedExtensionsContext = new RawContextKey<boolean>('recommendedExtensions', false);
 const DefaultRecommendedExtensionsContext = new RawContextKey<boolean>('defaultRecommendedExtensions', false);
+const GroupByServersContext = new RawContextKey<boolean>('groupByServersContext', false);
 
 export class ExtensionsViewletViewsContribution implements IWorkbenchContribution {
 
 	constructor(
+		@IExtensionManagementServerService private extensionManagementServerService: IExtensionManagementServerService
 	) {
 		this.registerViews();
 	}
@@ -77,14 +81,22 @@ export class ExtensionsViewletViewsContribution implements IWorkbenchContributio
 	private registerViews(): void {
 		let viewDescriptors = [];
 		viewDescriptors.push(this.createMarketPlaceExtensionsListViewDescriptor());
-		viewDescriptors.push(this.createInstalledExtensionsListViewDescriptor());
-		viewDescriptors.push(this.createSearchInstalledExtensionsListViewDescriptor());
-		viewDescriptors.push(this.createSearchBuiltInExtensionsListViewDescriptor());
-		viewDescriptors.push(this.createSearchBuiltInBasicsExtensionsListViewDescriptor());
-		viewDescriptors.push(this.createSearchBuiltInThemesExtensionsListViewDescriptor());
+		viewDescriptors.push(this.createEnabledExtensionsListViewDescriptor());
+		viewDescriptors.push(this.createDisabledExtensionsListViewDescriptor());
+		viewDescriptors.push(this.createPopularExtensionsListViewDescriptor());
+		viewDescriptors.push(this.createBuiltInExtensionsListViewDescriptor());
+		viewDescriptors.push(this.createBuiltInBasicsExtensionsListViewDescriptor());
+		viewDescriptors.push(this.createBuiltInThemesExtensionsListViewDescriptor());
 		viewDescriptors.push(this.createDefaultRecommendedExtensionsListViewDescriptor());
 		viewDescriptors.push(this.createOtherRecommendedExtensionsListViewDescriptor());
 		viewDescriptors.push(this.createWorkspaceRecommendedExtensionsListViewDescriptor());
+
+		if (this.extensionManagementServerService.extensionManagementServers.length > 1) {
+			for (const extensionManagementServer of this.extensionManagementServerService.extensionManagementServers) {
+				viewDescriptors.push(...this.createExtensionsViewDescriptorsForServer(extensionManagementServer));
+			}
+		}
+
 		ViewsRegistry.registerViews(viewDescriptors);
 	}
 
@@ -94,42 +106,69 @@ export class ExtensionsViewletViewsContribution implements IWorkbenchContributio
 			name: localize('marketPlace', "Marketplace"),
 			container: VIEW_CONTAINER,
 			ctor: ExtensionsListView,
-			when: ContextKeyExpr.and(ContextKeyExpr.not('donotshowExtensions'), ContextKeyExpr.has('searchExtensions'), ContextKeyExpr.not('searchInstalledExtensions'), ContextKeyExpr.not('searchBuiltInExtensions'), ContextKeyExpr.not('recommendedExtensions')),
+			when: ContextKeyExpr.and(ContextKeyExpr.has('searchExtensions'), ContextKeyExpr.not('searchInstalledExtensions'), ContextKeyExpr.not('searchBuiltInExtensions'), ContextKeyExpr.not('recommendedExtensions'), ContextKeyExpr.not('groupByServersContext')),
 			weight: 100
 		};
 	}
 
-	private createInstalledExtensionsListViewDescriptor(): IViewDescriptor {
+	private createEnabledExtensionsListViewDescriptor(): IViewDescriptor {
 		return {
-			id: 'extensions.installedList',
-			name: localize('installedExtensions', "Installed"),
+			id: 'extensions.enabledExtensionList',
+			name: localize('enabledExtensions', "Enabled"),
 			container: VIEW_CONTAINER,
-			ctor: InstalledExtensionsView,
-			when: ContextKeyExpr.and(ContextKeyExpr.not('donotshowExtensions'), ContextKeyExpr.not('searchExtensions')),
-			order: 1,
-			weight: 30
+			ctor: EnabledExtensionsView,
+			when: ContextKeyExpr.and(ContextKeyExpr.not('searchExtensions'), ContextKeyExpr.has('hasInstalledExtensions')),
+			weight: 40,
+			canToggleVisibility: true,
+			order: 1
 		};
 	}
 
-	private createSearchInstalledExtensionsListViewDescriptor(): IViewDescriptor {
+	private createDisabledExtensionsListViewDescriptor(): IViewDescriptor {
 		return {
-			id: 'extensions.searchInstalledList',
-			name: localize('searchInstalledExtensions', "Installed"),
+			id: 'extensions.disabledExtensionList',
+			name: localize('disabledExtensions', "Disabled"),
 			container: VIEW_CONTAINER,
-			ctor: InstalledExtensionsView,
-			when: ContextKeyExpr.and(ContextKeyExpr.not('donotshowExtensions'), ContextKeyExpr.has('searchInstalledExtensions')),
-			weight: 100
+			ctor: DisabledExtensionsView,
+			when: ContextKeyExpr.and(ContextKeyExpr.not('searchExtensions'), ContextKeyExpr.has('hasInstalledExtensions')),
+			weight: 10,
+			canToggleVisibility: true,
+			order: 3,
+			collapsed: true
 		};
 	}
 
+	private createPopularExtensionsListViewDescriptor(): IViewDescriptor {
+		return {
+			id: 'extensions.popularExtensionsList',
+			name: localize('popularExtensions', "Popular"),
+			container: VIEW_CONTAINER,
+			ctor: ExtensionsListView,
+			when: ContextKeyExpr.and(ContextKeyExpr.not('searchExtensions'), ContextKeyExpr.not('hasInstalledExtensions')),
+			weight: 60,
+			order: 1
+		};
+	}
+
+	private createExtensionsViewDescriptorsForServer(server: IExtensionManagementServer): IViewDescriptor[] {
+		return [{
+			id: `server.extensionsList.${server.authority}`,
+			name: server.label,
+			container: VIEW_CONTAINER,
+			ctor: GroupByServerExtensionsView,
+			when: ContextKeyExpr.has('groupByServersContext'),
+			weight: 100
+		}];
+	}
+
 	private createDefaultRecommendedExtensionsListViewDescriptor(): IViewDescriptor {
 		return {
 			id: 'extensions.recommendedList',
 			name: localize('recommendedExtensions', "Recommended"),
 			container: VIEW_CONTAINER,
-			ctor: RecommendedExtensionsView,
-			when: ContextKeyExpr.and(ContextKeyExpr.not('donotshowExtensions'), ContextKeyExpr.not('searchExtensions'), ContextKeyExpr.has('defaultRecommendedExtensions')),
-			weight: 70,
+			ctor: DefaultRecommendedExtensionsView,
+			when: ContextKeyExpr.and(ContextKeyExpr.not('searchExtensions'), ContextKeyExpr.has('defaultRecommendedExtensions')),
+			weight: 40,
 			order: 2,
 			canToggleVisibility: true
 		};
@@ -141,7 +180,7 @@ export class ExtensionsViewletViewsContribution implements IWorkbenchContributio
 			name: localize('otherRecommendedExtensions', "Other Recommendations"),
 			container: VIEW_CONTAINER,
 			ctor: RecommendedExtensionsView,
-			when: ContextKeyExpr.and(ContextKeyExpr.not('donotshowExtensions'), ContextKeyExpr.has('recommendedExtensions')),
+			when: ContextKeyExpr.has('recommendedExtensions'),
 			weight: 50,
 			canToggleVisibility: true,
 			order: 2
@@ -154,44 +193,44 @@ export class ExtensionsViewletViewsContribution implements IWorkbenchContributio
 			name: localize('workspaceRecommendedExtensions', "Workspace Recommendations"),
 			container: VIEW_CONTAINER,
 			ctor: WorkspaceRecommendedExtensionsView,
-			when: ContextKeyExpr.and(ContextKeyExpr.not('donotshowExtensions'), ContextKeyExpr.has('recommendedExtensions'), ContextKeyExpr.has('nonEmptyWorkspace')),
+			when: ContextKeyExpr.and(ContextKeyExpr.has('recommendedExtensions'), ContextKeyExpr.has('nonEmptyWorkspace')),
 			weight: 50,
 			canToggleVisibility: true,
 			order: 1
 		};
 	}
 
-	private createSearchBuiltInExtensionsListViewDescriptor(): IViewDescriptor {
+	private createBuiltInExtensionsListViewDescriptor(): IViewDescriptor {
 		return {
 			id: 'extensions.builtInExtensionsList',
 			name: localize('builtInExtensions', "Features"),
 			container: VIEW_CONTAINER,
 			ctor: BuiltInExtensionsView,
-			when: ContextKeyExpr.and(ContextKeyExpr.not('donotshowExtensions'), ContextKeyExpr.has('searchBuiltInExtensions')),
+			when: ContextKeyExpr.has('searchBuiltInExtensions'),
 			weight: 100,
 			canToggleVisibility: true
 		};
 	}
 
-	private createSearchBuiltInThemesExtensionsListViewDescriptor(): IViewDescriptor {
+	private createBuiltInThemesExtensionsListViewDescriptor(): IViewDescriptor {
 		return {
 			id: 'extensions.builtInThemesExtensionsList',
 			name: localize('builtInThemesExtensions', "Themes"),
 			container: VIEW_CONTAINER,
 			ctor: BuiltInThemesExtensionsView,
-			when: ContextKeyExpr.and(ContextKeyExpr.not('donotshowExtensions'), ContextKeyExpr.has('searchBuiltInExtensions')),
+			when: ContextKeyExpr.has('searchBuiltInExtensions'),
 			weight: 100,
 			canToggleVisibility: true
 		};
 	}
 
-	private createSearchBuiltInBasicsExtensionsListViewDescriptor(): IViewDescriptor {
+	private createBuiltInBasicsExtensionsListViewDescriptor(): IViewDescriptor {
 		return {
 			id: 'extensions.builtInBasicsExtensionsList',
 			name: localize('builtInBasicsExtensions', "Programming Languages"),
 			container: VIEW_CONTAINER,
 			ctor: BuiltInBasicsExtensionsView,
-			when: ContextKeyExpr.and(ContextKeyExpr.not('donotshowExtensions'), ContextKeyExpr.has('searchBuiltInExtensions')),
+			when: ContextKeyExpr.has('searchBuiltInExtensions'),
 			weight: 100,
 			canToggleVisibility: true
 		};
@@ -203,18 +242,20 @@ export class ExtensionsViewlet extends ViewContainerViewlet implements IExtensio
 	private onSearchChange: EventOf<string>;
 	private nonEmptyWorkspaceContextKey: IContextKey<boolean>;
 	private searchExtensionsContextKey: IContextKey<boolean>;
-	private searchInstalledExtensionsContextKey: IContextKey<boolean>;
+	private hasInstalledExtensionsContextKey: IContextKey<boolean>;
 	private searchBuiltInExtensionsContextKey: IContextKey<boolean>;
+	private groupByServersContextKey: IContextKey<boolean>;
 	private recommendedExtensionsContextKey: IContextKey<boolean>;
 	private defaultRecommendedExtensionsContextKey: IContextKey<boolean>;
 
 	private searchDelayer: ThrottledDelayer<any>;
 	private root: HTMLElement;
 
-	private searchBox: HTMLInputElement;
+	private searchBox: SuggestEnabledInput;
 	private extensionsBox: HTMLElement;
 	private primaryActions: IAction[];
 	private secondaryActions: IAction[];
+	private groupByServerAction: IAction;
 	private disposables: IDisposable[] = [];
 
 	constructor(
@@ -232,20 +273,26 @@ export class ExtensionsViewlet extends ViewContainerViewlet implements IExtensio
 		@IWorkspaceContextService contextService: IWorkspaceContextService,
 		@IContextKeyService contextKeyService: IContextKeyService,
 		@IContextMenuService contextMenuService: IContextMenuService,
-		@IExtensionService extensionService: IExtensionService
+		@IExtensionService extensionService: IExtensionService,
+		@IExtensionManagementServerService private extensionManagementServerService: IExtensionManagementServerService
 	) {
 		super(VIEWLET_ID, `${VIEWLET_ID}.state`, true, partService, telemetryService, storageService, instantiationService, themeService, contextMenuService, extensionService, contextService);
 
 		this.searchDelayer = new ThrottledDelayer(500);
 		this.nonEmptyWorkspaceContextKey = NonEmptyWorkspaceContext.bindTo(contextKeyService);
 		this.searchExtensionsContextKey = SearchExtensionsContext.bindTo(contextKeyService);
-		this.searchInstalledExtensionsContextKey = SearchInstalledExtensionsContext.bindTo(contextKeyService);
+		this.hasInstalledExtensionsContextKey = HasInstalledExtensionsContext.bindTo(contextKeyService);
 		this.searchBuiltInExtensionsContextKey = SearchBuiltInExtensionsContext.bindTo(contextKeyService);
 		this.recommendedExtensionsContextKey = RecommendedExtensionsContext.bindTo(contextKeyService);
+		this.groupByServersContextKey = GroupByServersContext.bindTo(contextKeyService);
 		this.defaultRecommendedExtensionsContextKey = DefaultRecommendedExtensionsContext.bindTo(contextKeyService);
 		this.defaultRecommendedExtensionsContextKey.set(!this.configurationService.getValue<boolean>(ShowRecommendationsOnlyOnDemandKey));
 		this.disposables.push(this.viewletService.onDidViewletOpen(this.onViewletOpen, this, this.disposables));
 
+		this.extensionManagementService.getInstalled(LocalExtensionType.User).then(result => {
+			this.hasInstalledExtensionsContextKey.set(result.length > 0);
+		});
+
 		this.configurationService.onDidChangeConfiguration(e => {
 			if (e.affectsConfiguration(AutoUpdateConfigurationKey)) {
 				this.secondaryActions = null;
@@ -257,51 +304,40 @@ export class ExtensionsViewlet extends ViewContainerViewlet implements IExtensio
 		}, this, this.disposables);
 	}
 
-	async create(parent: HTMLElement): TPromise<void> {
+	create(parent: HTMLElement): TPromise<void> {
 		addClass(parent, 'extensions-viewlet');
 		this.root = parent;
 
 		const header = append(this.root, $('.header'));
 
-		this.searchBox = append(header, $<HTMLInputElement>('input.search-box'));
-		this.searchBox.placeholder = localize('searchExtensions', "Search Extensions in Marketplace");
-		this.disposables.push(addStandardDisposableListener(this.searchBox, EventType.FOCUS, () => addClass(this.searchBox, 'synthetic-focus')));
-		this.disposables.push(addStandardDisposableListener(this.searchBox, EventType.BLUR, () => removeClass(this.searchBox, 'synthetic-focus')));
+		const placeholder = localize('searchExtensions', "Search Extensions in Marketplace");
+
+		this.searchBox = this.instantiationService.createInstance(SuggestEnabledInput, `${VIEWLET_ID}.searchbox`, header, {
+			triggerCharacters: ['@'],
+			sortKey: item => {
+				if (item.indexOf(':') === -1) { return 'a'; }
+				else if (/ext:/.test(item) || /tag:/.test(item)) { return 'b'; }
+				else if (/sort:/.test(item)) { return 'c'; }
+				else { return 'd'; }
+			},
+			provideResults: (query) => Query.suggestions(query)
+		}, placeholder, 'extensions:searchinput', { placeholderText: placeholder });
+
+		this.disposables.push(attachSuggestEnabledInputBoxStyler(this.searchBox, this.themeService));
+
+		this.disposables.push(this.searchBox);
+
+		const _searchChange = new Emitter<string>();
+		this.onSearchChange = _searchChange.event;
+		this.searchBox.onInputDidChange(() => {
+			this.triggerSearch();
+			_searchChange.fire(this.searchBox.getValue());
+		}, this, this.disposables);
+
+		this.searchBox.onShouldFocusResults(() => this.focusListView(), this, this.disposables);
 
 		this.extensionsBox = append(this.root, $('.extensions'));
-
-		const onKeyDown = chain(domEvent(this.searchBox, 'keydown'))
-			.map(e => new StandardKeyboardEvent(e));
-		onKeyDown.filter(e => e.keyCode === KeyCode.Escape).on(this.onEscape, this, this.disposables);
-
-		const onKeyDownForList = onKeyDown.filter(() => this.count() > 0);
-		onKeyDownForList.filter(e => e.keyCode === KeyCode.Enter).on(this.onEnter, this, this.disposables);
-
-		const onSearchInput = domEvent(this.searchBox, 'input') as EventOf<SearchInputEvent>;
-		onSearchInput(e => this.triggerSearch(e.immediate), null, this.disposables);
-
-		this.onSearchChange = mapEvent(onSearchInput, e => e.target.value);
-
-		await super.create(this.extensionsBox);
-
-		const installed = await this.extensionManagementService.getInstalled(LocalExtensionType.User);
-
-		if (installed.length === 0) {
-			this.searchBox.value = '@sort:installs';
-			this.searchExtensionsContextKey.set(true);
-		}
-	}
-
-	public updateStyles(): void {
-		super.updateStyles();
-
-		this.searchBox.style.backgroundColor = this.getColor(inputBackground);
-		this.searchBox.style.color = this.getColor(inputForeground);
-
-		const inputBorderColor = this.getColor(inputBorder);
-		this.searchBox.style.borderWidth = inputBorderColor ? '1px' : null;
-		this.searchBox.style.borderStyle = inputBorderColor ? 'solid' : null;
-		this.searchBox.style.borderColor = inputBorderColor;
+		return super.create(this.extensionsBox);
 	}
 
 	setVisible(visible: boolean): TPromise<void> {
@@ -310,7 +346,6 @@ export class ExtensionsViewlet extends ViewContainerViewlet implements IExtensio
 			if (isVisibilityChanged) {
 				if (visible) {
 					this.searchBox.focus();
-					this.searchBox.setSelectionRange(0, this.searchBox.value.length);
 				}
 			}
 		});
@@ -322,6 +357,7 @@ export class ExtensionsViewlet extends ViewContainerViewlet implements IExtensio
 
 	layout(dimension: Dimension): void {
 		toggleClass(this.root, 'narrow', dimension.width <= 300);
+		this.searchBox.layout({ height: 20, width: dimension.width - 34 });
 		super.layout(new Dimension(dimension.width, dimension.height - 38));
 	}
 
@@ -340,6 +376,12 @@ export class ExtensionsViewlet extends ViewContainerViewlet implements IExtensio
 
 	getSecondaryActions(): IAction[] {
 		if (!this.secondaryActions) {
+			if (!this.groupByServerAction) {
+				this.groupByServerAction = this.instantiationService.createInstance(ChangeGroupAction, 'extensions.group.servers', localize('group by servers', "Group By: Server"), this.onSearchChange, 'server');
+				this.disposables.push(this.onSearchChange(value => {
+					this.groupByServerAction.enabled = !value || ExtensionsListView.isInstalledExtensionsQuery(value) || ExtensionsListView.isBuiltInExtensionsQuery(value);
+				}));
+			}
 			this.secondaryActions = [
 				this.instantiationService.createInstance(ShowInstalledExtensionsAction, ShowInstalledExtensionsAction.ID, ShowInstalledExtensionsAction.LABEL),
 				this.instantiationService.createInstance(ShowOutdatedExtensionsAction, ShowOutdatedExtensionsAction.ID, ShowOutdatedExtensionsAction.LABEL),
@@ -353,6 +395,7 @@ export class ExtensionsViewlet extends ViewContainerViewlet implements IExtensio
 				this.instantiationService.createInstance(ChangeSortAction, 'extensions.sort.rating', localize('sort by rating', "Sort By: Rating"), this.onSearchChange, 'rating'),
 				this.instantiationService.createInstance(ChangeSortAction, 'extensions.sort.name', localize('sort by name', "Sort By: Name"), this.onSearchChange, 'name'),
 				new Separator(),
+				...(this.extensionManagementServerService.extensionManagementServers.length > 1 ? [this.groupByServerAction, new Separator()] : []),
 				this.instantiationService.createInstance(CheckForUpdatesAction, CheckForUpdatesAction.ID, CheckForUpdatesAction.LABEL),
 				...(this.configurationService.getValue(AutoUpdateConfigurationKey) ? [this.instantiationService.createInstance(DisableAutoUpdateAction, DisableAutoUpdateAction.ID, DisableAutoUpdateAction.LABEL)] : [this.instantiationService.createInstance(UpdateAllAction, UpdateAllAction.ID, UpdateAllAction.LABEL), this.instantiationService.createInstance(EnableAutoUpdateAction, EnableAutoUpdateAction.ID, EnableAutoUpdateAction.LABEL)]),
 				this.instantiationService.createInstance(InstallVSIXAction, InstallVSIXAction.ID, InstallVSIXAction.LABEL),
@@ -369,44 +412,59 @@ export class ExtensionsViewlet extends ViewContainerViewlet implements IExtensio
 		const event = new Event('input', { bubbles: true }) as SearchInputEvent;
 		event.immediate = true;
 
-		this.searchBox.value = value;
-		this.searchBox.dispatchEvent(event);
+		this.searchBox.setValue(value);
 	}
 
 	private triggerSearch(immediate = false): void {
-		this.searchDelayer.trigger(() => this.doSearch(), immediate || !this.searchBox.value ? 0 : 500)
-			.done(null, err => this.onError(err));
+		this.searchDelayer.trigger(() => this.doSearch(), immediate || !this.searchBox.getValue() ? 0 : 500).then(null, err => this.onError(err));
 	}
 
-	private async doSearch(): TPromise<any> {
-		const value = this.searchBox.value || '';
+	private normalizedQuery(): string {
+		return this.searchBox.getValue().replace(/@category/g, 'category').replace(/@tag:/g, 'tag:').replace(/@ext:/g, 'ext:');
+	}
+
+	private doSearch(): TPromise<any> {
+		const value = this.normalizedQuery();
 		this.searchExtensionsContextKey.set(!!value);
-		this.searchInstalledExtensionsContextKey.set(InstalledExtensionsView.isInstalledExtensionsQuery(value));
 		this.searchBuiltInExtensionsContextKey.set(ExtensionsListView.isBuiltInExtensionsQuery(value));
+		this.groupByServersContextKey.set(ExtensionsListView.isGroupByServersExtensionsQuery(value));
 		this.recommendedExtensionsContextKey.set(ExtensionsListView.isRecommendedExtensionsQuery(value));
 		this.nonEmptyWorkspaceContextKey.set(this.contextService.getWorkbenchState() !== WorkbenchState.EMPTY);
 
 		if (value) {
-			this.progress(TPromise.join(this.panels.map(view => (<ExtensionsListView>view).show(this.searchBox.value))));
+			return this.progress(TPromise.join(this.panels.map(view => (<ExtensionsListView>view).show(this.normalizedQuery()))));
 		}
+		return TPromise.as(null);
 	}
 
 	protected onDidAddViews(added: IAddedViewDescriptorRef[]): ViewletPanel[] {
 		const addedViews = super.onDidAddViews(added);
-		this.progress(TPromise.join(addedViews.map(addedView => (<ExtensionsListView>addedView).show(this.searchBox.value))));
+		this.progress(TPromise.join(addedViews.map(addedView => (<ExtensionsListView>addedView).show(this.normalizedQuery()))));
 		return addedViews;
 	}
 
+	protected createView(viewDescriptor: IViewDescriptor, options: IViewletViewOptions): ViewletPanel {
+		for (const extensionManagementServer of this.extensionManagementServerService.extensionManagementServers) {
+			if (viewDescriptor.id === `server.extensionsList.${extensionManagementServer.authority}`) {
+				const servicesCollection: ServiceCollection = new ServiceCollection();
+				servicesCollection.set(IExtensionManagementServerService, new SingleServerExtensionManagementServerService(extensionManagementServer));
+				servicesCollection.set(IExtensionManagementService, extensionManagementServer.extensionManagementService);
+				servicesCollection.set(IExtensionsWorkbenchService, new SyncDescriptor(ExtensionsWorkbenchService));
+				const instantiationService = this.instantiationService.createChild(servicesCollection);
+				return instantiationService.createInstance(viewDescriptor.ctor, options, [extensionManagementServer]) as ViewletPanel;
+			}
+		}
+		return this.instantiationService.createInstance(viewDescriptor.ctor, options) as ViewletPanel;
+	}
+
 	private count(): number {
 		return this.panels.reduce((count, view) => (<ExtensionsListView>view).count() + count, 0);
 	}
 
-	private onEscape(): void {
-		this.search('');
-	}
-
-	private onEnter(): void {
-		(<ExtensionsListView>this.panels[0]).select();
+	private focusListView(): void {
+		if (this.count() > 0) {
+			this.panels[0].focus();
+		}
 	}
 
 	private onViewletOpen(viewlet: IViewlet): void {
@@ -414,14 +472,16 @@ export class ExtensionsViewlet extends ViewContainerViewlet implements IExtensio
 			return;
 		}
 
-		const promises = this.editorGroupService.groups.map(group => {
-			const editors = group.editors.filter(input => input instanceof ExtensionsInput);
-			const promises = editors.map(editor => group.closeEditor(editor));
+		if (this.configurationService.getValue<boolean>(CloseExtensionDetailsOnViewChangeKey)) {
+			const promises = this.editorGroupService.groups.map(group => {
+				const editors = group.editors.filter(input => input instanceof ExtensionsInput);
+				const promises = editors.map(editor => group.closeEditor(editor));
 
-			return TPromise.join(promises);
-		});
+				return TPromise.join(promises);
+			});
 
-		TPromise.join(promises).done(null, onUnexpectedError);
+			TPromise.join(promises);
+		}
 	}
 
 	private progress<T>(promise: TPromise<T>): TPromise<T> {
@@ -505,7 +565,7 @@ export class MaliciousExtensionChecker implements IWorkbenchContribution {
 
 	private loopCheckForMaliciousExtensions(): void {
 		this.checkForMaliciousExtensions()
-			.then(() => TPromise.timeout(1000 * 60 * 5)) // every five minutes
+			.then(() => timeout(1000 * 60 * 5)) // every five minutes
 			.then(() => this.loopCheckForMaliciousExtensions());
 	}
 
diff --git a/src/vs/workbench/parts/extensions/electron-browser/extensionsViews.ts b/src/vs/workbench/parts/extensions/electron-browser/extensionsViews.ts
index 9e74a3c633c..4e4446bc143 100644
--- a/src/vs/workbench/parts/extensions/electron-browser/extensionsViews.ts
+++ b/src/vs/workbench/parts/extensions/electron-browser/extensionsViews.ts
@@ -5,20 +5,21 @@
 
 'use strict';
 
+
 import { localize } from 'vs/nls';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { dispose } from 'vs/base/common/lifecycle';
 import { assign } from 'vs/base/common/objects';
 import { chain } from 'vs/base/common/event';
 import { isPromiseCanceledError, create as createError } from 'vs/base/common/errors';
-import { PagedModel, IPagedModel, IPager } from 'vs/base/common/paging';
-import { SortBy, SortOrder, IQueryOptions, LocalExtensionType, IExtensionTipsService, EnablementState } from 'vs/platform/extensionManagement/common/extensionManagement';
+import { PagedModel, IPagedModel, IPager, DelayedPagedModel } from 'vs/base/common/paging';
+import { SortBy, SortOrder, IQueryOptions, LocalExtensionType, IExtensionTipsService, EnablementState, IExtensionRecommendation } from 'vs/platform/extensionManagement/common/extensionManagement';
 import { areSameExtensions } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
 import { append, $, toggleClass } from 'vs/base/browser/dom';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { Delegate, Renderer } from 'vs/workbench/parts/extensions/browser/extensionsList';
+import { Delegate, Renderer } from 'vs/workbench/parts/extensions/electron-browser/extensionsList';
 import { IExtension, IExtensionsWorkbenchService } from '../common/extensions';
 import { Query } from '../common/extensionQuery';
 import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
@@ -31,11 +32,14 @@ import { IModeService } from 'vs/editor/common/services/modeService';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { CountBadge } from 'vs/base/browser/ui/countBadge/countBadge';
 import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
-import { InstallWorkspaceRecommendedExtensionsAction, ConfigureWorkspaceFolderRecommendedExtensionsAction } from 'vs/workbench/parts/extensions/browser/extensionsActions';
+import { InstallWorkspaceRecommendedExtensionsAction, ConfigureWorkspaceFolderRecommendedExtensionsAction } from 'vs/workbench/parts/extensions/electron-browser/extensionsActions';
 import { WorkbenchPagedList } from 'vs/platform/list/browser/listService';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { INotificationService } from 'vs/platform/notification/common/notification';
 import { ViewletPanel, IViewletPanelOptions } from 'vs/workbench/browser/parts/views/panelViewlet';
+import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
+import { distinct } from 'vs/base/common/arrays';
+import { IExperimentService } from 'vs/workbench/parts/experiments/node/experimentService';
 
 export class ExtensionsListView extends ViewletPanel {
 
@@ -53,19 +57,24 @@ export class ExtensionsListView extends ViewletPanel {
 		@IInstantiationService protected instantiationService: IInstantiationService,
 		@IThemeService private themeService: IThemeService,
 		@IExtensionService private extensionService: IExtensionService,
-		@IExtensionsWorkbenchService private extensionsWorkbenchService: IExtensionsWorkbenchService,
+		@IExtensionsWorkbenchService protected extensionsWorkbenchService: IExtensionsWorkbenchService,
 		@IEditorService private editorService: IEditorService,
-		@IExtensionTipsService private tipsService: IExtensionTipsService,
+		@IExtensionTipsService protected tipsService: IExtensionTipsService,
 		@IModeService private modeService: IModeService,
 		@ITelemetryService private telemetryService: ITelemetryService,
-		@IConfigurationService configurationService: IConfigurationService
+		@IConfigurationService configurationService: IConfigurationService,
+		@IWorkspaceContextService protected contextService: IWorkspaceContextService,
+		@IExperimentService private experimentService: IExperimentService
 	) {
 		super({ ...(options as IViewletPanelOptions), ariaHeaderLabel: options.title }, keybindingService, contextMenuService, configurationService);
 	}
 
-	renderHeader(container: HTMLElement): void {
-		const titleDiv = append(container, $('div.title'));
-		append(titleDiv, $('span')).textContent = this.options.title;
+	protected renderHeader(container: HTMLElement): void {
+		this.renderHeaderTitle(container);
+	}
+
+	renderHeaderTitle(container: HTMLElement): void {
+		super.renderHeaderTitle(container, this.options.title);
 
 		this.badgeContainer = append(container, $('.count-badge-wrapper'));
 		this.badge = new CountBadge(this.badgeContainer);
@@ -78,8 +87,10 @@ export class ExtensionsListView extends ViewletPanel {
 		const delegate = new Delegate();
 		const renderer = this.instantiationService.createInstance(Renderer);
 		this.list = this.instantiationService.createInstance(WorkbenchPagedList, this.extensionsList, delegate, [renderer], {
-			ariaLabel: localize('extensions', "Extensions")
+			ariaLabel: localize('extensions', "Extensions"),
+			multipleSelectionSupport: false
 		}) as WorkbenchPagedList<IExtension>;
+		this.disposables.push(this.list);
 
 		chain(this.list.onOpen)
 			.map(e => e.elements[0])
@@ -97,10 +108,16 @@ export class ExtensionsListView extends ViewletPanel {
 		this.list.layout(size);
 	}
 
-	async show(query: string): TPromise<IPagedModel<IExtension>> {
-		const model = await this.query(query);
-		this.setModel(model);
-		return model;
+	async show(query: string): Promise<IPagedModel<IExtension>> {
+		return await this.query(query).then(model => {
+			this.setModel(model);
+			return model;
+		}).catch(e => {
+			console.warn('Error querying extensions gallery', e);
+			const model = new PagedModel([]);
+			this.setModel(model, true);
+			return model;
+		});
 	}
 
 	select(): void {
@@ -131,7 +148,13 @@ export class ExtensionsListView extends ViewletPanel {
 		return this.list.length;
 	}
 
-	private async query(value: string): TPromise<IPagedModel<IExtension>> {
+	protected showEmptyModel(): TPromise<IPagedModel<IExtension>> {
+		const emptyModel = new PagedModel([]);
+		this.setModel(emptyModel);
+		return TPromise.as(emptyModel);
+	}
+
+	private async query(value: string): Promise<IPagedModel<IExtension>> {
 		const query = Query.parse(value);
 
 		let options: IQueryOptions = {
@@ -143,6 +166,9 @@ export class ExtensionsListView extends ViewletPanel {
 			case 'rating': options = assign(options, { sortBy: SortBy.WeightedRating }); break;
 			case 'name': options = assign(options, { sortBy: SortBy.Title }); break;
 		}
+		if (!value || !value.trim()) {
+			options.sortBy = SortBy.InstallCount;
+		}
 
 		if (/@builtin/i.test(value)) {
 			const showThemesOnly = /@builtin:themes/i.test(value);
@@ -177,8 +203,8 @@ export class ExtensionsListView extends ViewletPanel {
 				const basics = result.filter(e => {
 					return e.local.manifest
 						&& e.local.manifest.contributes
-						&& Array.isArray(e.local.manifest.contributes.languages)
-						&& e.local.manifest.contributes.languages.length
+						&& Array.isArray(e.local.manifest.contributes.grammars)
+						&& e.local.manifest.contributes.grammars.length
 						&& e.local.identifier.id !== 'git';
 				});
 				return new PagedModel(this.sortExtensions(basics, options));
@@ -187,7 +213,7 @@ export class ExtensionsListView extends ViewletPanel {
 				const others = result.filter(e => {
 					return e.local.manifest
 						&& e.local.manifest.contributes
-						&& (!Array.isArray(e.local.manifest.contributes.languages) || e.local.identifier.id === 'git')
+						&& (!Array.isArray(e.local.manifest.contributes.grammars) || e.local.identifier.id === 'git')
 						&& !Array.isArray(e.local.manifest.contributes.themes);
 				});
 				return new PagedModel(this.sortExtensions(others, options));
@@ -196,9 +222,9 @@ export class ExtensionsListView extends ViewletPanel {
 			return new PagedModel(this.sortExtensions(result, options));
 		}
 
-		if (!value || ExtensionsListView.isInstalledExtensionsQuery(value)) {
+		if (/@installed/i.test(value)) {
 			// Show installed extensions
-			value = value ? value.replace(/@installed/g, '').replace(/@sort:(\w+)(-\w*)?/g, '').trim().toLowerCase() : '';
+			value = value.replace(/@installed/g, '').replace(/@sort:(\w+)(-\w*)?/g, '').trim().toLowerCase();
 
 			let result = await this.extensionsWorkbenchService.queryLocal();
 
@@ -208,12 +234,16 @@ export class ExtensionsListView extends ViewletPanel {
 			return new PagedModel(this.sortExtensions(result, options));
 		}
 
-		const idMatch = /@id:(([a-z0-9A-Z][a-z0-9\-A-Z]*)\.([a-z0-9A-Z][a-z0-9\-A-Z]*))/.exec(value);
-
-		if (idMatch) {
+		const idRegex = /@id:(([a-z0-9A-Z][a-z0-9\-A-Z]*)\.([a-z0-9A-Z][a-z0-9\-A-Z]*))/g;
+		let idMatch;
+		const names: string[] = [];
+		while ((idMatch = idRegex.exec(value)) !== null) {
 			const name = idMatch[1];
+			names.push(name);
+		}
 
-			return this.extensionsWorkbenchService.queryGallery({ names: [name], source: 'queryById' })
+		if (names.length) {
+			return this.extensionsWorkbenchService.queryGallery({ names, source: 'queryById' })
 				.then(pager => new PagedModel(pager));
 		}
 
@@ -266,6 +296,10 @@ export class ExtensionsListView extends ViewletPanel {
 			return this.getRecommendationsModel(query, options);
 		}
 
+		if (/\bcurated:([^\s]+)\b/.test(query.value)) {
+			return this.getCuratedModel(query, options);
+		}
+
 		let text = query.value;
 		const extensionRegex = /\bext:([^\s]+)\b/g;
 
@@ -286,8 +320,7 @@ export class ExtensionsListView extends ViewletPanel {
 
 			if (text !== query.value) {
 				options = assign(options, { text: text.substr(0, 350), source: 'file-extension-tags' });
-				const pager = await this.extensionsWorkbenchService.queryGallery(options);
-				return new PagedModel(pager);
+				return this.extensionsWorkbenchService.queryGallery(options).then(pager => new PagedModel(pager));
 			}
 		}
 
@@ -297,8 +330,7 @@ export class ExtensionsListView extends ViewletPanel {
 			options.source = 'viewlet';
 		}
 
-		const pager = await this.extensionsWorkbenchService.queryGallery(options);
-		return new PagedModel(pager);
+		return this.extensionsWorkbenchService.queryGallery(options).then(pager => new PagedModel(pager));
 	}
 
 	private sortExtensions(extensions: IExtension[], options: IQueryOptions): IExtension[] {
@@ -326,14 +358,13 @@ export class ExtensionsListView extends ViewletPanel {
 		return this.extensionsWorkbenchService.queryLocal()
 			.then(result => result.filter(e => e.type === LocalExtensionType.User))
 			.then(local => {
-				const installedExtensions = local.map(x => `${x.publisher}.${x.name}`);
-				let fileBasedRecommendations = this.tipsService.getFileBasedRecommendations();
+				const fileBasedRecommendations = this.tipsService.getFileBasedRecommendations();
 				const othersPromise = this.tipsService.getOtherRecommendations();
 				const workspacePromise = this.tipsService.getWorkspaceRecommendations();
 
 				return TPromise.join([othersPromise, workspacePromise])
 					.then(([others, workspaceRecommendations]) => {
-						const names = this.getTrimmedRecommendations(installedExtensions, value, fileBasedRecommendations, others, workspaceRecommendations);
+						const names = this.getTrimmedRecommendations(local, value, fileBasedRecommendations, others, workspaceRecommendations);
 						const recommendationsWithReason = this.tipsService.getAllRecommendationsWithReason();
 						/* __GDPR__
 							"extensionAllRecommendations:open" : {
@@ -363,24 +394,37 @@ export class ExtensionsListView extends ViewletPanel {
 			});
 	}
 
+	private getCuratedModel(query: Query, options: IQueryOptions): TPromise<IPagedModel<IExtension>> {
+		const value = query.value.replace(/curated:/g, '').trim();
+		return this.experimentService.getCuratedExtensionsList(value).then(names => {
+			if (Array.isArray(names) && names.length) {
+				options.source = `curated:${value}`;
+				return this.extensionsWorkbenchService.queryGallery(assign(options, { names, pageSize: names.length }))
+					.then(pager => {
+						this.sortFirstPage(pager, names);
+						return new PagedModel(pager || []);
+					});
+			}
+			return TPromise.as(new PagedModel([]));
+		});
+	}
+
 	private getRecommendationsModel(query: Query, options: IQueryOptions): TPromise<IPagedModel<IExtension>> {
 		const value = query.value.replace(/@recommended/g, '').trim().toLowerCase();
 
 		return this.extensionsWorkbenchService.queryLocal()
 			.then(result => result.filter(e => e.type === LocalExtensionType.User))
 			.then(local => {
-				const installedExtensions = local.map(x => `${x.publisher}.${x.name}`);
 				let fileBasedRecommendations = this.tipsService.getFileBasedRecommendations();
 				const othersPromise = this.tipsService.getOtherRecommendations();
 				const workspacePromise = this.tipsService.getWorkspaceRecommendations();
 
 				return TPromise.join([othersPromise, workspacePromise])
 					.then(([others, workspaceRecommendations]) => {
-						workspaceRecommendations = workspaceRecommendations.map(x => x.toLowerCase());
-						fileBasedRecommendations = fileBasedRecommendations.filter(x => workspaceRecommendations.indexOf(x.toLowerCase()) === -1);
-						others = others.filter(x => workspaceRecommendations.indexOf(x.toLowerCase()) === -1);
+						fileBasedRecommendations = fileBasedRecommendations.filter(x => workspaceRecommendations.every(({ extensionId }) => x.extensionId !== extensionId));
+						others = others.filter(x => x => workspaceRecommendations.every(({ extensionId }) => x.extensionId !== extensionId));
 
-						const names = this.getTrimmedRecommendations(installedExtensions, value, fileBasedRecommendations, others, []);
+						const names = this.getTrimmedRecommendations(local, value, fileBasedRecommendations, others, []);
 						const recommendationsWithReason = this.tipsService.getAllRecommendationsWithReason();
 
 						/* __GDPR__
@@ -413,44 +457,48 @@ export class ExtensionsListView extends ViewletPanel {
 	}
 
 	// Given all recommendations, trims and returns recommendations in the relevant order after filtering out installed extensions
-	private getTrimmedRecommendations(installedExtensions: string[], value: string, fileBasedRecommendations: string[], otherRecommendations: string[], workpsaceRecommendations: string[], ) {
+	private getTrimmedRecommendations(installedExtensions: IExtension[], value: string, fileBasedRecommendations: IExtensionRecommendation[], otherRecommendations: IExtensionRecommendation[], workpsaceRecommendations: IExtensionRecommendation[]): string[] {
 		const totalCount = 8;
 		workpsaceRecommendations = workpsaceRecommendations
-			.filter(name => {
-				return installedExtensions.indexOf(name) === -1
-					&& name.toLowerCase().indexOf(value) > -1;
+			.filter(recommendation => {
+				return !this.isRecommendationInstalled(recommendation, installedExtensions)
+					&& recommendation.extensionId.toLowerCase().indexOf(value) > -1;
 			});
-		fileBasedRecommendations = fileBasedRecommendations.filter(x => {
-			return installedExtensions.indexOf(x) === -1
-				&& workpsaceRecommendations.indexOf(x) === -1
-				&& x.toLowerCase().indexOf(value) > -1;
+		fileBasedRecommendations = fileBasedRecommendations.filter(recommendation => {
+			return !this.isRecommendationInstalled(recommendation, installedExtensions)
+				&& workpsaceRecommendations.every(workspaceRecommendation => workspaceRecommendation.extensionId !== recommendation.extensionId)
+				&& recommendation.extensionId.toLowerCase().indexOf(value) > -1;
 		});
-		otherRecommendations = otherRecommendations.filter(x => {
-			return installedExtensions.indexOf(x) === -1
-				&& fileBasedRecommendations.indexOf(x) === -1
-				&& workpsaceRecommendations.indexOf(x) === -1
-				&& x.toLowerCase().indexOf(value) > -1;
+		otherRecommendations = otherRecommendations.filter(recommendation => {
+			return !this.isRecommendationInstalled(recommendation, installedExtensions)
+				&& fileBasedRecommendations.every(fileBasedRecommendation => fileBasedRecommendation.extensionId !== recommendation.extensionId)
+				&& workpsaceRecommendations.every(workspaceRecommendation => workspaceRecommendation.extensionId !== recommendation.extensionId)
+				&& recommendation.extensionId.toLowerCase().indexOf(value) > -1;
 		});
 
-		let otherCount = Math.min(2, otherRecommendations.length);
-		let fileBasedCount = Math.min(fileBasedRecommendations.length, totalCount - workpsaceRecommendations.length - otherCount);
-		let names = workpsaceRecommendations;
-		names.push(...fileBasedRecommendations.splice(0, fileBasedCount));
-		names.push(...otherRecommendations.splice(0, otherCount));
+		const otherCount = Math.min(2, otherRecommendations.length);
+		const fileBasedCount = Math.min(fileBasedRecommendations.length, totalCount - workpsaceRecommendations.length - otherCount);
+		const recommendations = workpsaceRecommendations;
+		recommendations.push(...fileBasedRecommendations.splice(0, fileBasedCount));
+		recommendations.push(...otherRecommendations.splice(0, otherCount));
 
-		return names;
+		return distinct(recommendations.map(({ extensionId }) => extensionId));
+	}
+
+	private isRecommendationInstalled(recommendation: IExtensionRecommendation, installed: IExtension[]): boolean {
+		return installed.some(i => areSameExtensions({ id: i.id }, { id: recommendation.extensionId }));
 	}
 
 	private getWorkspaceRecommendationsModel(query: Query, options: IQueryOptions): TPromise<IPagedModel<IExtension>> {
 		const value = query.value.replace(/@recommended:workspace/g, '').trim().toLowerCase();
 		return this.tipsService.getWorkspaceRecommendations()
 			.then(recommendations => {
-				const names = recommendations.filter(name => name.toLowerCase().indexOf(value) > -1);
+				const names = recommendations.map(({ extensionId }) => extensionId).filter(name => name.toLowerCase().indexOf(value) > -1);
 				/* __GDPR__
-			"extensionWorkspaceRecommendations:open" : {
-				"count" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true }
-			}
-		*/
+					"extensionWorkspaceRecommendations:open" : {
+						"count" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true }
+					}
+				*/
 				this.telemetryService.publicLog('extensionWorkspaceRecommendations:open', { count: names.length });
 
 				if (!names.length) {
@@ -464,8 +512,8 @@ export class ExtensionsListView extends ViewletPanel {
 
 	private getKeymapRecommendationsModel(query: Query, options: IQueryOptions): TPromise<IPagedModel<IExtension>> {
 		const value = query.value.replace(/@recommended:keymaps/g, '').trim().toLowerCase();
-		const names = this.tipsService.getKeymapRecommendations()
-			.filter(name => name.toLowerCase().indexOf(value) > -1);
+		const names: string[] = this.tipsService.getKeymapRecommendations().map(({ extensionId }) => extensionId)
+			.filter(extensionId => extensionId.toLowerCase().indexOf(value) > -1);
 
 		if (!names.length) {
 			return TPromise.as(new PagedModel([]));
@@ -483,24 +531,26 @@ export class ExtensionsListView extends ViewletPanel {
 		});
 	}
 
-	private setModel(model: IPagedModel<IExtension>) {
-		this.list.model = model;
-		this.list.scrollTop = 0;
-		const count = this.count();
+	private setModel(model: IPagedModel<IExtension>, isGalleryError?: boolean) {
+		if (this.list) {
+			this.list.model = new DelayedPagedModel(model);
+			this.list.scrollTop = 0;
+			const count = this.count();
 
-		toggleClass(this.extensionsList, 'hidden', count === 0);
-		toggleClass(this.messageBox, 'hidden', count > 0);
-		this.badge.setCount(count);
+			toggleClass(this.extensionsList, 'hidden', count === 0);
+			toggleClass(this.messageBox, 'hidden', count > 0);
+			this.badge.setCount(count);
 
-		if (count === 0 && this.isVisible()) {
-			this.messageBox.textContent = localize('no extensions found', "No extensions found.");
-		} else {
-			this.messageBox.textContent = '';
+			if (count === 0 && this.isVisible()) {
+				this.messageBox.textContent = isGalleryError ? localize('galleryError', "We cannot connect to the Extensions Marketplace at this time, please try again later.") : localize('no extensions found', "No extensions found.");
+			} else {
+				this.messageBox.textContent = '';
+			}
 		}
 	}
 
 	private openExtension(extension: IExtension): void {
-		this.extensionsWorkbenchService.open(extension).done(null, err => this.onError(err));
+		this.extensionsWorkbenchService.open(extension).then(null, err => this.onError(err));
 	}
 
 	private pin(): void {
@@ -533,8 +583,9 @@ export class ExtensionsListView extends ViewletPanel {
 	}
 
 	dispose(): void {
-		this.disposables = dispose(this.disposables);
 		super.dispose();
+		this.disposables = dispose(this.disposables);
+		this.list = null;
 	}
 
 	static isBuiltInExtensionsQuery(query: string): boolean {
@@ -542,19 +593,11 @@ export class ExtensionsListView extends ViewletPanel {
 	}
 
 	static isInstalledExtensionsQuery(query: string): boolean {
-		return /@installed/i.test(query);
+		return /@installed|@outdated|@enabled|@disabled/i.test(query);
 	}
 
-	static isOutdatedExtensionsQuery(query: string): boolean {
-		return /@outdated/i.test(query);
-	}
-
-	static isDisabledExtensionsQuery(query: string): boolean {
-		return /@disabled/i.test(query);
-	}
-
-	static isEnabledExtensionsQuery(query: string): boolean {
-		return /@enabled/i.test(query);
+	static isGroupByServersExtensionsQuery(query: string): boolean {
+		return !!Query.parse(query).groupBy;
 	}
 
 	static isRecommendedExtensionsQuery(query: string): boolean {
@@ -572,57 +615,114 @@ export class ExtensionsListView extends ViewletPanel {
 	static isKeymapsRecommendedExtensionsQuery(query: string): boolean {
 		return /@recommended:keymaps/i.test(query);
 	}
+
+	focus(): void {
+		super.focus();
+		if (!(this.list.getFocus().length || this.list.getSelection().length)) {
+			this.list.focusNext();
+		}
+		this.list.domFocus();
+	}
 }
 
-export class InstalledExtensionsView extends ExtensionsListView {
+export class GroupByServerExtensionsView extends ExtensionsListView {
 
-	public static isInstalledExtensionsQuery(query: string): boolean {
-		return ExtensionsListView.isInstalledExtensionsQuery(query)
-			|| ExtensionsListView.isOutdatedExtensionsQuery(query)
-			|| ExtensionsListView.isDisabledExtensionsQuery(query)
-			|| ExtensionsListView.isEnabledExtensionsQuery(query);
-	}
-
-	async show(query: string): TPromise<IPagedModel<IExtension>> {
-		if (InstalledExtensionsView.isInstalledExtensionsQuery(query)) {
-			return super.show(query);
+	async show(query: string): Promise<IPagedModel<IExtension>> {
+		query = query.replace(/@group:server/g, '').trim();
+		query = query ? query : '@installed';
+		if (!ExtensionsListView.isInstalledExtensionsQuery(query) && !ExtensionsListView.isBuiltInExtensionsQuery(query)) {
+			query = query += ' @installed';
 		}
-		let searchInstalledQuery = '@installed';
-		searchInstalledQuery = query ? searchInstalledQuery + ' ' + query : searchInstalledQuery;
-		return super.show(searchInstalledQuery);
+		return super.show(query.trim());
+	}
+}
+
+export class EnabledExtensionsView extends ExtensionsListView {
+	private readonly enabledExtensionsQuery = '@enabled';
+
+	async show(query: string): Promise<IPagedModel<IExtension>> {
+		return (query && query.trim() !== this.enabledExtensionsQuery) ? this.showEmptyModel() : super.show(this.enabledExtensionsQuery);
+	}
+}
+
+export class DisabledExtensionsView extends ExtensionsListView {
+	private readonly disabledExtensionsQuery = '@disabled';
+
+	async show(query: string): Promise<IPagedModel<IExtension>> {
+		return (query && query.trim() !== this.disabledExtensionsQuery) ? this.showEmptyModel() : super.show(this.disabledExtensionsQuery);
 	}
 }
 
 export class BuiltInExtensionsView extends ExtensionsListView {
-
-	async show(query: string): TPromise<IPagedModel<IExtension>> {
-		return super.show(query.replace('@builtin', '@builtin:features'));
+	async show(query: string): Promise<IPagedModel<IExtension>> {
+		return (query && query.trim() !== '@builtin') ? this.showEmptyModel() : super.show('@builtin:features');
 	}
-
 }
 
 export class BuiltInThemesExtensionsView extends ExtensionsListView {
-
-	async show(query: string): TPromise<IPagedModel<IExtension>> {
-		return super.show(query.replace('@builtin', '@builtin:themes'));
+	async show(query: string): Promise<IPagedModel<IExtension>> {
+		return (query && query.trim() !== '@builtin') ? this.showEmptyModel() : super.show('@builtin:themes');
 	}
 }
 
 export class BuiltInBasicsExtensionsView extends ExtensionsListView {
-
-	async show(query: string): TPromise<IPagedModel<IExtension>> {
-		return super.show(query.replace('@builtin', '@builtin:basics'));
+	async show(query: string): Promise<IPagedModel<IExtension>> {
+		return (query && query.trim() !== '@builtin') ? this.showEmptyModel() : super.show('@builtin:basics');
 	}
 }
 
-export class RecommendedExtensionsView extends ExtensionsListView {
+export class DefaultRecommendedExtensionsView extends ExtensionsListView {
+	private readonly recommendedExtensionsQuery = '@recommended:all';
 
-	async show(query: string): TPromise<IPagedModel<IExtension>> {
-		return super.show(!query.trim() ? '@recommended:all' : '@recommended');
+	renderBody(container: HTMLElement): void {
+		super.renderBody(container);
+
+		this.disposables.push(this.tipsService.onRecommendationChange(() => {
+			this.show('');
+		}));
+	}
+
+	async show(query: string): Promise<IPagedModel<IExtension>> {
+		if (query && query.trim() !== this.recommendedExtensionsQuery) {
+			return this.showEmptyModel();
+		}
+		const model = await super.show(this.recommendedExtensionsQuery);
+		if (!this.extensionsWorkbenchService.local.some(e => e.type === LocalExtensionType.User)) {
+			// This is part of popular extensions view. Collapse if no installed extensions.
+			this.setExpanded(model.length > 0);
+		}
+		return model;
+	}
+
+}
+
+export class RecommendedExtensionsView extends ExtensionsListView {
+	private readonly recommendedExtensionsQuery = '@recommended';
+
+	renderBody(container: HTMLElement): void {
+		super.renderBody(container);
+
+		this.disposables.push(this.tipsService.onRecommendationChange(() => {
+			this.show('');
+		}));
+	}
+
+	async show(query: string): Promise<IPagedModel<IExtension>> {
+		return (query && query.trim() !== this.recommendedExtensionsQuery) ? this.showEmptyModel() : super.show(this.recommendedExtensionsQuery);
 	}
 }
 
 export class WorkspaceRecommendedExtensionsView extends ExtensionsListView {
+	private readonly recommendedExtensionsQuery = '@recommended:workspace';
+	private installAllAction: InstallWorkspaceRecommendedExtensionsAction;
+
+	renderBody(container: HTMLElement): void {
+		super.renderBody(container);
+
+		this.disposables.push(this.tipsService.onRecommendationChange(() => this.update()));
+		this.disposables.push(this.extensionsWorkbenchService.onChange(() => this.setRecommendationsToInstall()));
+		this.disposables.push(this.contextService.onDidChangeWorkbenchState(() => this.update()));
+	}
 
 	renderHeader(container: HTMLElement): void {
 		super.renderHeader(container);
@@ -634,22 +734,38 @@ export class WorkspaceRecommendedExtensionsView extends ExtensionsListView {
 			animated: false
 		});
 		actionbar.onDidRun(({ error }) => error && this.notificationService.error(error));
-		const installAllAction = this.instantiationService.createInstance(InstallWorkspaceRecommendedExtensionsAction, InstallWorkspaceRecommendedExtensionsAction.ID, InstallWorkspaceRecommendedExtensionsAction.LABEL);
+
+		this.installAllAction = this.instantiationService.createInstance(InstallWorkspaceRecommendedExtensionsAction, InstallWorkspaceRecommendedExtensionsAction.ID, InstallWorkspaceRecommendedExtensionsAction.LABEL, []);
 		const configureWorkspaceFolderAction = this.instantiationService.createInstance(ConfigureWorkspaceFolderRecommendedExtensionsAction, ConfigureWorkspaceFolderRecommendedExtensionsAction.ID, ConfigureWorkspaceFolderRecommendedExtensionsAction.LABEL);
 
-		installAllAction.class = 'octicon octicon-cloud-download';
+		this.installAllAction.class = 'octicon octicon-cloud-download';
 		configureWorkspaceFolderAction.class = 'octicon octicon-pencil';
 
-		actionbar.push([installAllAction], { icon: true, label: false });
+		actionbar.push([this.installAllAction], { icon: true, label: false });
 		actionbar.push([configureWorkspaceFolderAction], { icon: true, label: false });
 
-		this.disposables.push(actionbar);
+		this.disposables.push(...[this.installAllAction, configureWorkspaceFolderAction, actionbar]);
 	}
 
-	async show(query: string): TPromise<IPagedModel<IExtension>> {
-		let model = await super.show('@recommended:workspace');
+	async show(query: string): Promise<IPagedModel<IExtension>> {
+		let shouldShowEmptyView = query && query.trim() !== '@recommended' && query.trim() !== '@recommended:workspace';
+		let model = await (shouldShowEmptyView ? this.showEmptyModel() : super.show(this.recommendedExtensionsQuery));
 		this.setExpanded(model.length > 0);
 		return model;
 	}
 
+	private update(): void {
+		this.show(this.recommendedExtensionsQuery);
+		this.setRecommendationsToInstall();
+	}
+
+	private setRecommendationsToInstall(): TPromise<void> {
+		return this.getRecommendationsToInstall()
+			.then(recommendations => { this.installAllAction.recommendations = recommendations; });
+	}
+
+	private getRecommendationsToInstall(): TPromise<IExtensionRecommendation[]> {
+		return this.tipsService.getWorkspaceRecommendations()
+			.then(recommendations => recommendations.filter(({ extensionId }) => !this.extensionsWorkbenchService.local.some(i => areSameExtensions({ id: extensionId }, { id: i.id }))));
+	}
 }
\ No newline at end of file
diff --git a/src/vs/workbench/parts/extensions/browser/media/clear-inverse.svg b/src/vs/workbench/parts/extensions/electron-browser/media/clear-inverse.svg
similarity index 100%
rename from src/vs/workbench/parts/extensions/browser/media/clear-inverse.svg
rename to src/vs/workbench/parts/extensions/electron-browser/media/clear-inverse.svg
diff --git a/src/vs/workbench/parts/extensions/browser/media/clear.svg b/src/vs/workbench/parts/extensions/electron-browser/media/clear.svg
similarity index 100%
rename from src/vs/workbench/parts/extensions/browser/media/clear.svg
rename to src/vs/workbench/parts/extensions/electron-browser/media/clear.svg
diff --git a/src/vs/workbench/parts/extensions/browser/media/defaultIcon.png b/src/vs/workbench/parts/extensions/electron-browser/media/defaultIcon.png
similarity index 100%
rename from src/vs/workbench/parts/extensions/browser/media/defaultIcon.png
rename to src/vs/workbench/parts/extensions/electron-browser/media/defaultIcon.png
diff --git a/src/vs/workbench/parts/extensions/browser/media/extensionActions.css b/src/vs/workbench/parts/extensions/electron-browser/media/extensionActions.css
similarity index 90%
rename from src/vs/workbench/parts/extensions/browser/media/extensionActions.css
rename to src/vs/workbench/parts/extensions/electron-browser/media/extensionActions.css
index fcfd494ab70..43bcde8a007 100644
--- a/src/vs/workbench/parts/extensions/browser/media/extensionActions.css
+++ b/src/vs/workbench/parts/extensions/electron-browser/media/extensionActions.css
@@ -19,6 +19,8 @@
 	background: url('clear-inverse.svg') center center no-repeat;
 }
 
+.monaco-action-bar .action-item .action-label.extension-action.multiserver.install:after,
+.monaco-action-bar .action-item .action-label.extension-action.multiserver.update:after,
 .monaco-action-bar .action-item .action-label.extension-action.enable:after,
 .monaco-action-bar .action-item .action-label.extension-action.disable:after {
 	content: '▼';
@@ -69,4 +71,8 @@
 .hc-black .extensions-viewlet>.extensions .extension>.details>.footer>.monaco-action-bar .action-item .action-label.extension-action.manage,
 .vs-dark .extensions-viewlet>.extensions .extension>.details>.footer>.monaco-action-bar .action-item .action-label.extension-action.manage {
 	background: url('manage-inverse.svg') center center no-repeat;
-}
\ No newline at end of file
+}
+
+.extension-editor > .header.recommended > .details > .recommendation > .monaco-action-bar .actions-container {
+	justify-content: flex-start;
+}
diff --git a/src/vs/workbench/parts/extensions/electron-browser/media/extensionEditor.css b/src/vs/workbench/parts/extensions/electron-browser/media/extensionEditor.css
index 42e53acdd09..7a8a61811e5 100644
--- a/src/vs/workbench/parts/extensions/electron-browser/media/extensionEditor.css
+++ b/src/vs/workbench/parts/extensions/electron-browser/media/extensionEditor.css
@@ -14,16 +14,14 @@
 
 .extension-editor > .header {
 	display: flex;
-	height: 128px;
-	padding: 20px;
+	padding-top: 20px;
+	padding-bottom: 14px;
+	padding-left: 20px;
+	padding-right: 20px;
 	overflow: hidden;
 	font-size: 14px;
 }
 
-.extension-editor > .header.recommended {
-	height: 140px;
-}
-
 .extension-editor > .header > .icon {
 	height: 128px;
 	width: 128px;
@@ -31,7 +29,6 @@
 }
 
 .extension-editor > .header > .details {
-	flex: 1;
 	padding-left: 20px;
 	overflow: hidden;
 	user-select: text;
@@ -128,14 +125,52 @@
 	padding: 1px 6px;
 }
 
-.extension-editor > .header.recommended > .details > .recommendation {
+.extension-editor > .header > .details > .recommendation {
 	display: none;
 }
 
-.extension-editor > .header.recommended > .details > .recommendation {
+.extension-editor > .header.recommended > .details > .recommendation,
+.extension-editor > .header.recommendation-ignored > .details > .recommendation {
 	display: block;
-	margin-top: 2px;
+	float: left;
+	margin-top: 0;
 	font-size: 13px;
+	font-style: italic;
+}
+
+.extension-editor > .header.recommended > .details > .recommendation > .monaco-action-bar,
+.extension-editor > .header.recommendation-ignored > .details > .recommendation > .monaco-action-bar {
+	float: left;
+	margin-top: 2px;
+	font-style: normal;
+}
+
+.extension-editor > .header > .details > .recommendation > .recommendation-text {
+	float:left;
+	margin-top: 5px;
+	margin-right: 4px;
+}
+.extension-editor > .header > .details > .recommendation > .monaco-action-bar .action-label {
+	margin-top: 4px;
+	margin-left: 4px;
+	padding-top: 0;
+	padding-bottom: 2px;
+}
+
+.extension-editor > .header.recommendation-ignored > .details > .recommendation > .monaco-action-bar .ignore {
+	display: none;
+}
+
+.extension-editor > .header.recommendation-ignored > .details > .recommendation > .monaco-action-bar .undo-ignore {
+	display: block;
+}
+
+.extension-editor > .header.recommended > .details > .recommendation > .monaco-action-bar .ignore {
+	display: block;
+}
+
+.extension-editor > .header.recommended > .details > .recommendation > .monaco-action-bar .undo-ignore {
+	display: none;
 }
 
 .extension-editor > .body {
@@ -248,6 +283,7 @@
 
 .extension-editor > .body > .content table th {
 	text-align: left;
+	word-break: keep-all;
 }
 
 .extension-editor > .body > .content table code:not(:empty) {
@@ -275,11 +311,11 @@
 	border-color: rgb(238, 238, 238);
 }
 
-.extension-editor .subcontent .monaco-tree-row .content .unknown-dependency {
+.extension-editor .subcontent .monaco-tree-row .content .unknown-extension {
 	line-height: 62px;
 }
 
-.extension-editor .subcontent .monaco-tree-row .content .unknown-dependency > .error-marker {
+.extension-editor .subcontent .monaco-tree-row .content .unknown-extension > .error-marker {
 	background-color: #BE1100;
 	padding: 2px 4px;
 	font-weight: bold;
@@ -287,45 +323,46 @@
 	color: #CCC;
 }
 
-.extension-editor .subcontent .monaco-tree-row .unknown-dependency > .message {
+.extension-editor .subcontent .monaco-tree-row .unknown-extension > .message {
 	padding-left: 10px;
 	font-weight: bold;
 	font-size: 14px;
 }
 
-.extension-editor .subcontent .monaco-tree-row .dependency {
+.extension-editor .subcontent .monaco-tree-row .extension {
 	display: flex;
 	align-items: center;
 }
 
-.extension-editor .subcontent .monaco-tree-row .dependency > .details {
+.extension-editor .subcontent .monaco-tree-row .extension > .details {
 	flex: 1;
 	overflow: hidden;
 	padding-left: 10px;
 }
 
-.extension-editor .subcontent .monaco-tree-row .dependency > .details > .header {
+.extension-editor .subcontent .monaco-tree-row .extension > .details > .header {
 	display: flex;
 	align-items: center;
 	height: 19px;
 	overflow: hidden;
 }
 
-.extension-editor .subcontent .monaco-tree-row .dependency > .icon {
+.extension-editor .subcontent .monaco-tree-row .extension > .icon {
 	height: 40px;
 	width: 40px;
+	object-fit: contain;
 }
 
-.extension-editor .subcontent .monaco-tree-row .dependency > .details > .header > .name {
+.extension-editor .subcontent .monaco-tree-row .extension > .details > .header > .name {
 	font-weight: bold;
 	font-size: 16px;
 }
 
-.extension-editor .subcontent .monaco-tree-row .dependency > .details > .header > .name:hover {
+.extension-editor .subcontent .monaco-tree-row .extension > .details > .header > .name:hover {
 	text-decoration: underline;
 }
 
-.extension-editor .subcontent .monaco-tree-row .dependency > .details > .header > .identifier {
+.extension-editor .subcontent .monaco-tree-row .extension > .details > .header > .identifier {
 	font-size: 90%;
 	opacity: 0.6;
 	margin-left: 10px;
@@ -334,14 +371,14 @@
 	border-radius: 4px;
 }
 
-.extension-editor .subcontent .monaco-tree-row .dependency > .details > .footer {
+.extension-editor .subcontent .monaco-tree-row .extension > .details > .footer {
 	display: flex;
 	height: 19px;
 	overflow: hidden;
 	padding-top: 5px;
 }
 
-.extension-editor .subcontent .monaco-tree-row .dependency > .details > .footer > .author {
+.extension-editor .subcontent .monaco-tree-row .extension > .details > .footer > .author {
 	font-size: 90%;
 	font-weight: 600;
 	opacity: 0.6;
diff --git a/src/vs/workbench/parts/extensions/electron-browser/media/extensions.css b/src/vs/workbench/parts/extensions/electron-browser/media/extensions.css
index 848c0382f9a..a879a47e71a 100644
--- a/src/vs/workbench/parts/extensions/electron-browser/media/extensions.css
+++ b/src/vs/workbench/parts/extensions/electron-browser/media/extensions.css
@@ -6,4 +6,9 @@
 .monaco-workbench > .activitybar > .content .monaco-action-bar .action-label.extensions {
 	-webkit-mask: url('extensions-dark.svg') no-repeat 50% 50%;
 	-webkit-mask-size: 21px;
+}
+
+.extensions .split-view-view .panel-header .count-badge-wrapper {
+	position: absolute;
+	right: 12px;
 }
\ No newline at end of file
diff --git a/src/vs/workbench/parts/extensions/electron-browser/media/extensionsViewlet.css b/src/vs/workbench/parts/extensions/electron-browser/media/extensionsViewlet.css
index 34324005e71..e8e11338689 100644
--- a/src/vs/workbench/parts/extensions/electron-browser/media/extensionsViewlet.css
+++ b/src/vs/workbench/parts/extensions/electron-browser/media/extensionsViewlet.css
@@ -44,7 +44,7 @@
 }
 
 .extensions-viewlet > .extensions .panel-header {
-	padding-right: 12px;
+	padding-right: 28px;
 }
 
 .extensions-viewlet > .extensions .panel-header > .title {
@@ -80,7 +80,7 @@
 	box-sizing: border-box;
 	width: 100%;
 	height: 100%;
-	padding: 0 11px 0 16px;
+	padding: 0 0 0 16px;
 	overflow: hidden;
 	display: flex;
 	position: absolute;
@@ -117,6 +117,7 @@
 	height: 19px;
 	display: flex;
 	overflow: hidden;
+	padding-right: 11px;
 }
 
 .extensions-viewlet > .extensions .extension > .details > .header-container > .header {
@@ -162,9 +163,14 @@
 	display: none;
 }
 
+.extensions-viewlet > .extensions .extension > .details > .description {
+	padding-right: 11px;
+}
+
 .extensions-viewlet > .extensions .extension > .details > .footer {
 	display: flex;
 	justify-content: flex-end;
+	padding-right: 7px;
 	height: 24px;
 	overflow: hidden;
 }
@@ -173,16 +179,20 @@
 	flex: 1;
 	font-size: 90%;
 	padding-right: 6px;
-	opacity: 0.6;
+	opacity: 0.9;
 	font-weight: 600;
 }
 
+.extensions-viewlet > .extensions .selected .extension > .details > .footer > .author,
+.extensions-viewlet > .extensions .selected.focused .extension > .details > .footer > .author {
+	opacity: 1;
+}
+
 .extensions-viewlet > .extensions .extension > .details > .footer > .monaco-action-bar > .actions-container {
 	flex-wrap: wrap-reverse;
 }
 
 .extensions-viewlet > .extensions .extension > .details > .footer > .monaco-action-bar .action-label {
-	margin-right: 0;
 	margin-top: 0.3em;
 	margin-left: 0.3em;
 	line-height: 14px;
@@ -215,4 +225,4 @@
 	background-image: url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxNCIgaGVpZ2h0PSIxNCIgdmlld0JveD0iMiAyIDE0IDE0IiBlbmFibGUtYmFja2dyb3VuZD0ibmV3IDIgMiAxNCAxNCI+PHBhdGggZmlsbD0iI2ZmZiIgZD0iTTkgMTZjLTMuODYgMC03LTMuMTQtNy03czMuMTQtNyA3LTdjMy44NTkgMCA3IDMuMTQxIDcgN3MtMy4xNDEgNy03IDd6bTAtMTIuNmMtMy4wODggMC01LjYgMi41MTMtNS42IDUuNnMyLjUxMiA1LjYgNS42IDUuNiA1LjYtMi41MTIgNS42LTUuNi0yLjUxMi01LjYtNS42LTUuNnptMy44NiA3LjFsLTMuMTYtMS44OTZ2LTMuODA0aC0xLjR2NC41OTZsMy44NCAyLjMwNS43Mi0xLjIwMXoiLz48L3N2Zz4=");
 	background-position: center center;
 	background-repeat: no-repeat;
-}
\ No newline at end of file
+}
diff --git a/src/vs/workbench/parts/extensions/electron-browser/media/language-icon.svg b/src/vs/workbench/parts/extensions/electron-browser/media/language-icon.svg
new file mode 100755
index 00000000000..de095424278
--- /dev/null
+++ b/src/vs/workbench/parts/extensions/electron-browser/media/language-icon.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><title>Market_LanguageGeneric</title><path d="M14.315,11H1.685a6.912,6.912,0,0,1,0-6h12.63a6.912,6.912,0,0,1,0,6Z" fill="#fff"/><path d="M8,0a8,8,0,1,0,8,8A8.009,8.009,0,0,0,8,0ZM8,1a6.993,6.993,0,0,1,5.736,3H2.264A6.991,6.991,0,0,1,8,1ZM8,15a6.991,6.991,0,0,1-5.736-3H13.736A6.993,6.993,0,0,1,8,15Zm6.315-4H1.685a6.912,6.912,0,0,1,0-6h12.63a6.912,6.912,0,0,1,0,6Z" fill="#2b2b2b"/><path d="M8,1a6.993,6.993,0,0,1,5.736,3H2.264A6.991,6.991,0,0,1,8,1ZM8,15a6.991,6.991,0,0,1-5.736-3H13.736A6.993,6.993,0,0,1,8,15Z" fill="#ff8c00"/><path d="M8,0a8,8,0,1,0,8,8A8.009,8.009,0,0,0,8,0ZM8,1a6.993,6.993,0,0,1,5.736,3H2.264A6.991,6.991,0,0,1,8,1ZM8,15a6.991,6.991,0,0,1-5.736-3H13.736A6.993,6.993,0,0,1,8,15Zm6.315-4H1.685a6.912,6.912,0,0,1,0-6h12.63a6.912,6.912,0,0,1,0,6Z" fill="#2b2b2b"/><path d="M8,1a6.993,6.993,0,0,1,5.736,3H2.264A6.991,6.991,0,0,1,8,1ZM8,15a6.991,6.991,0,0,1-5.736-3H13.736A6.993,6.993,0,0,1,8,15Z" fill="#767676"/><path d="M5.783,6.783,4.565,8,5.783,9.217l-.566.566L3.435,8,5.217,6.217Zm5-.566-.566.566L11.435,8,10.217,9.217l.566.566L12.565,8Zm-4.14,3.6.714.358,2-4-.714-.358Z" fill="#2b2b2b"/></svg>
\ No newline at end of file
diff --git a/src/vs/workbench/parts/extensions/browser/media/manage-inverse.svg b/src/vs/workbench/parts/extensions/electron-browser/media/manage-inverse.svg
similarity index 100%
rename from src/vs/workbench/parts/extensions/browser/media/manage-inverse.svg
rename to src/vs/workbench/parts/extensions/electron-browser/media/manage-inverse.svg
diff --git a/src/vs/workbench/parts/extensions/browser/media/manage.svg b/src/vs/workbench/parts/extensions/electron-browser/media/manage.svg
similarity index 100%
rename from src/vs/workbench/parts/extensions/browser/media/manage.svg
rename to src/vs/workbench/parts/extensions/electron-browser/media/manage.svg
diff --git a/src/vs/workbench/parts/extensions/browser/media/theme-icon.png b/src/vs/workbench/parts/extensions/electron-browser/media/theme-icon.png
similarity index 100%
rename from src/vs/workbench/parts/extensions/browser/media/theme-icon.png
rename to src/vs/workbench/parts/extensions/electron-browser/media/theme-icon.png
diff --git a/src/vs/workbench/parts/extensions/electron-browser/runtimeExtensionsEditor.ts b/src/vs/workbench/parts/extensions/electron-browser/runtimeExtensionsEditor.ts
index 9ce9541ff34..470724893b1 100644
--- a/src/vs/workbench/parts/extensions/electron-browser/runtimeExtensionsEditor.ts
+++ b/src/vs/workbench/parts/extensions/electron-browser/runtimeExtensionsEditor.ts
@@ -9,7 +9,7 @@ import 'vs/css!./media/runtimeExtensionsEditor';
 import * as nls from 'vs/nls';
 import * as os from 'os';
 import product from 'vs/platform/node/product';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { EditorInput } from 'vs/workbench/common/editor';
 import pkg from 'vs/platform/node/package';
 import { TPromise } from 'vs/base/common/winjs.base';
@@ -21,7 +21,7 @@ import { IExtensionsWorkbenchService, IExtension } from 'vs/workbench/parts/exte
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { IExtensionService, IExtensionDescription, IExtensionsStatus, IExtensionHostProfile } from 'vs/workbench/services/extensions/common/extensions';
-import { IDelegate, IRenderer } from 'vs/base/browser/ui/list/list';
+import { IVirtualDelegate, IRenderer } from 'vs/base/browser/ui/list/list';
 import { WorkbenchList } from 'vs/platform/list/browser/listService';
 import { append, $, addClass, toggleClass, Dimension } from 'vs/base/browser/dom';
 import { ActionBar, Separator } from 'vs/base/browser/ui/actionbar/actionbar';
@@ -36,7 +36,7 @@ import { IEnvironmentService } from 'vs/platform/environment/common/environment'
 import { memoize } from 'vs/base/common/decorators';
 import { isFalsyOrEmpty } from 'vs/base/common/arrays';
 import { Event } from 'vs/base/common/event';
-import { DisableForWorkspaceAction, DisableGloballyAction } from 'vs/workbench/parts/extensions/browser/extensionsActions';
+import { DisableForWorkspaceAction, DisableGloballyAction } from 'vs/workbench/parts/extensions/electron-browser/extensionsActions';
 import { INotificationService } from 'vs/platform/notification/common/notification';
 
 export const IExtensionHostProfileService = createDecorator<IExtensionHostProfileService>('extensionHostProfileService');
@@ -216,7 +216,7 @@ export class RuntimeExtensionsEditor extends BaseEditor {
 
 		const TEMPLATE_ID = 'runtimeExtensionElementTemplate';
 
-		const delegate = new class implements IDelegate<IRuntimeExtension>{
+		const delegate = new class implements IVirtualDelegate<IRuntimeExtension>{
 			getHeight(element: IRuntimeExtension): number {
 				return 62;
 			}
@@ -318,6 +318,14 @@ export class RuntimeExtensionsEditor extends BaseEditor {
 							]
 						}, "Activated because file {0} exists in your workspace", fileNameOrGlob);
 					}
+				} else if (/^workspaceContainsTimeout:/.test(activationTimes.activationEvent)) {
+					const glob = activationTimes.activationEvent.substr('workspaceContainsTimeout:'.length);
+					title = nls.localize({
+						key: 'workspaceContainsTimeout',
+						comment: [
+							'{0} will be a glob pattern'
+						]
+					}, "Activated because searching for {0} took too long", glob);
 				} else if (/^onLanguage:/.test(activationTimes.activationEvent)) {
 					let language = activationTimes.activationEvent.substr('onLanguage:'.length);
 					title = nls.localize('languageActivation', "Activated because you opened a {0} file", language);
@@ -369,6 +377,8 @@ export class RuntimeExtensionsEditor extends BaseEditor {
 				}
 			},
 
+			disposeElement: () => null,
+
 			disposeTemplate: (data: IRuntimeExtensionTemplateData): void => {
 				data.disposables = dispose(data.disposables);
 			}
@@ -443,7 +453,7 @@ export class RuntimeExtensionsInput extends EditorInput {
 		return true;
 	}
 
-	resolve(refresh?: boolean): TPromise<any> {
+	resolve(): TPromise<any> {
 		return TPromise.as(null);
 	}
 
@@ -573,7 +583,11 @@ class SaveExtensionHostProfileAction extends Action {
 		});
 	}
 
-	async run(): TPromise<any> {
+	run(): TPromise<any> {
+		return TPromise.wrap(this._asyncRun());
+	}
+
+	private async _asyncRun(): Promise<any> {
 		let picked = await this._windowService.showSaveDialog({
 			title: 'Save Extension Host Profile',
 			buttonLabel: 'Save',
diff --git a/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.ts b/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.ts
index a33551eed19..28e53bddc82 100644
--- a/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.ts
+++ b/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.ts
@@ -8,10 +8,8 @@
 import * as nls from 'vs/nls';
 import { readFile } from 'vs/base/node/pfs';
 import * as semver from 'semver';
-import * as path from 'path';
 import { Event, Emitter } from 'vs/base/common/event';
 import { index } from 'vs/base/common/arrays';
-import { assign } from 'vs/base/common/objects';
 import { ThrottledDelayer } from 'vs/base/common/async';
 import { isPromiseCanceledError } from 'vs/base/common/errors';
 import { TPromise } from 'vs/base/common/winjs.base';
@@ -20,23 +18,27 @@ import { IPager, mapPager, singlePagePager } from 'vs/base/common/paging';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import {
 	IExtensionManagementService, IExtensionGalleryService, ILocalExtension, IGalleryExtension, IQueryOptions, IExtensionManifest,
-	InstallExtensionEvent, DidInstallExtensionEvent, LocalExtensionType, DidUninstallExtensionEvent, IExtensionEnablementService, IExtensionIdentifier, EnablementState, IExtensionTipsService, InstallOperation
+	InstallExtensionEvent, DidInstallExtensionEvent, LocalExtensionType, DidUninstallExtensionEvent, IExtensionEnablementService, IExtensionIdentifier, EnablementState, IExtensionManagementServerService
 } from 'vs/platform/extensionManagement/common/extensionManagement';
 import { getGalleryExtensionIdFromLocal, getGalleryExtensionTelemetryData, getLocalExtensionTelemetryData, areSameExtensions, getMaliciousExtensionsSet } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IWindowService } from 'vs/platform/windows/common/windows';
 import Severity from 'vs/base/common/severity';
-import URI from 'vs/base/common/uri';
-import { IExtension, IExtensionDependencies, ExtensionState, IExtensionsWorkbenchService, AutoUpdateConfigurationKey } from 'vs/workbench/parts/extensions/common/extensions';
+import { URI } from 'vs/base/common/uri';
+import { IExtension, IExtensionDependencies, ExtensionState, IExtensionsWorkbenchService, AutoUpdateConfigurationKey, AutoCheckUpdatesConfigurationKey } from 'vs/workbench/parts/extensions/common/extensions';
 import { IEditorService, SIDE_GROUP, ACTIVE_GROUP } from 'vs/workbench/services/editor/common/editorService';
 import { IURLService, IURLHandler } from 'vs/platform/url/common/url';
 import { ExtensionsInput } from 'vs/workbench/parts/extensions/common/extensionsInput';
 import product from 'vs/platform/node/product';
 import { ILogService } from 'vs/platform/log/common/log';
-import { IProgressService2, ProgressLocation } from 'vs/platform/progress/common/progress';
-import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
+import { IProgressService2, ProgressLocation } from 'vs/workbench/services/progress/common/progress';
 import { INotificationService } from 'vs/platform/notification/common/notification';
+import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
+import { groupBy } from 'vs/base/common/collections';
+import { Schemas } from 'vs/base/common/network';
+import * as resources from 'vs/base/common/resources';
+import { CancellationToken } from 'vs/base/common/cancellation';
 
 interface IExtensionStateProvider<T> {
 	(extension: Extension): T;
@@ -44,14 +46,16 @@ interface IExtensionStateProvider<T> {
 
 class Extension implements IExtension {
 
+	public get local(): ILocalExtension { return this.locals[0]; }
 	public enablementState: EnablementState = EnablementState.Enabled;
 
 	constructor(
 		private galleryService: IExtensionGalleryService,
 		private stateProvider: IExtensionStateProvider<ExtensionState>,
-		public local: ILocalExtension,
+		public locals: ILocalExtension[],
 		public gallery: IGalleryExtension,
-		private telemetryService: ITelemetryService
+		private telemetryService: ITelemetryService,
+		private logService: ILogService
 	) { }
 
 	get type(): LocalExtensionType {
@@ -117,14 +121,6 @@ class Extension implements IExtension {
 		return `${product.extensionsGallery.itemUrl}?itemName=${this.publisher}.${this.name}`;
 	}
 
-	get downloadUrl(): string {
-		if (!product.extensionsGallery) {
-			return null;
-		}
-
-		return `${product.extensionsGallery.serviceUrl}/publishers/${this.publisher}/vsextensions/${this.name}/${this.latestVersion}/vspackage`;
-	}
-
 	get iconUrl(): string {
 		return this.galleryIconUrl || this.localIconUrl || this.defaultIconUrl;
 	}
@@ -134,8 +130,10 @@ class Extension implements IExtension {
 	}
 
 	private get localIconUrl(): string {
-		return this.local && this.local.manifest.icon
-			&& URI.file(path.join(this.local.path, this.local.manifest.icon)).toString();
+		if (this.local && this.local.manifest.icon) {
+			return resources.joinPath(this.local.location, this.local.manifest.icon).toString();
+		}
+		return null;
 	}
 
 	private get galleryIconUrl(): string {
@@ -150,14 +148,14 @@ class Extension implements IExtension {
 		if (this.type === LocalExtensionType.System) {
 			if (this.local.manifest && this.local.manifest.contributes) {
 				if (Array.isArray(this.local.manifest.contributes.themes) && this.local.manifest.contributes.themes.length) {
-					return require.toUrl('../browser/media/theme-icon.png');
+					return require.toUrl('../electron-browser/media/theme-icon.png');
 				}
-				if (Array.isArray(this.local.manifest.contributes.languages) && this.local.manifest.contributes.languages.length) {
-					return require.toUrl('../browser/media/language-icon.png');
+				if (Array.isArray(this.local.manifest.contributes.grammars) && this.local.manifest.contributes.grammars.length) {
+					return require.toUrl('../electron-browser/media/language-icon.svg');
 				}
 			}
 		}
-		return require.toUrl('../browser/media/defaultIcon.png');
+		return require.toUrl('../electron-browser/media/defaultIcon.png');
 	}
 
 	get repository(): string {
@@ -208,22 +206,34 @@ class Extension implements IExtension {
 		return this.local && this.gallery && semver.gt(this.local.manifest.version, this.gallery.version);
 	}
 
-	getManifest(): TPromise<IExtensionManifest> {
+	getManifest(token: CancellationToken): TPromise<IExtensionManifest> {
 		if (this.gallery && !this.isGalleryOutdated()) {
 			if (this.gallery.assets.manifest) {
-				return this.galleryService.getManifest(this.gallery);
+				return this.galleryService.getManifest(this.gallery, token);
 			}
-			this.telemetryService.publicLog('extensions:NotFoundManifest', this.telemetryData);
-			return TPromise.wrapError<IExtensionManifest>(new Error('not available'));
+			this.logService.error(nls.localize('Manifest is not found', "Manifest is not found"), this.id);
+			return TPromise.as(undefined);
 		}
 
 		return TPromise.as(this.local.manifest);
 	}
 
-	getReadme(): TPromise<string> {
+	hasReadme(): boolean {
+		if (this.gallery && !this.isGalleryOutdated() && this.gallery.assets.readme) {
+			return true;
+		}
+
+		if (this.local && this.local.readmeUrl) {
+			return true;
+		}
+
+		return this.type === LocalExtensionType.System;
+	}
+
+	getReadme(token: CancellationToken): TPromise<string> {
 		if (this.gallery && !this.isGalleryOutdated()) {
 			if (this.gallery.assets.readme) {
-				return this.galleryService.getReadme(this.gallery);
+				return this.galleryService.getReadme(this.gallery, token);
 			}
 			this.telemetryService.publicLog('extensions:NotFoundReadMe', this.telemetryData);
 		}
@@ -235,8 +245,8 @@ class Extension implements IExtension {
 
 		if (this.type === LocalExtensionType.System) {
 			return TPromise.as(`# ${this.displayName || this.name}
-**Notice** This is a an extension that is bundled with Visual Studio Code.
-
+**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.
+## Features
 ${this.description}
 `);
 		}
@@ -244,14 +254,31 @@ ${this.description}
 		return TPromise.wrapError<string>(new Error('not available'));
 	}
 
-	getChangelog(): TPromise<string> {
+	hasChangelog(): boolean {
 		if (this.gallery && this.gallery.assets.changelog && !this.isGalleryOutdated()) {
-			return this.galleryService.getChangelog(this.gallery);
+			return true;
+		}
+
+		if (this.local && this.local.changelogUrl) {
+			const uri = URI.parse(this.local.changelogUrl);
+			return uri.scheme === 'file';
+		}
+
+		return this.type === LocalExtensionType.System;
+	}
+
+	getChangelog(token: CancellationToken): TPromise<string> {
+		if (this.gallery && this.gallery.assets.changelog && !this.isGalleryOutdated()) {
+			return this.galleryService.getChangelog(this.gallery, token);
 		}
 
 		const changelogUrl = this.local && this.local.changelogUrl;
 
 		if (!changelogUrl) {
+			if (this.type === LocalExtensionType.System) {
+				return TPromise.as('Please check the [VS Code Release Notes](command:update.showCurrentReleaseNotes) for changes to the built-in extensions.');
+			}
+
 			return TPromise.wrapError<string>(new Error('not available'));
 		}
 
@@ -267,13 +294,24 @@ ${this.description}
 	get dependencies(): string[] {
 		const { local, gallery } = this;
 		if (gallery && !this.isGalleryOutdated()) {
-			return gallery.properties.dependencies;
+			return gallery.properties.dependencies || [];
 		}
 		if (local && local.manifest.extensionDependencies) {
 			return local.manifest.extensionDependencies;
 		}
 		return [];
 	}
+
+	get extensionPack(): string[] {
+		const { local, gallery } = this;
+		if (gallery && !this.isGalleryOutdated()) {
+			return gallery.properties.extensionPack || [];
+		}
+		if (local && local.manifest.extensionPack) {
+			return local.manifest.extensionPack;
+		}
+		return [];
+	}
 }
 
 class ExtensionDependencies implements IExtensionDependencies {
@@ -305,7 +343,7 @@ class ExtensionDependencies implements IExtensionDependencies {
 		if (!this.hasDependencies) {
 			return [];
 		}
-		return this._extension.dependencies.map(d => new ExtensionDependencies(this._map.get(d), d, this._map, this));
+		return this._extension.dependencies.map(id => new ExtensionDependencies(this._map.get(id), id, this._map, this));
 	}
 
 	private computeHasDependencies(): boolean {
@@ -326,7 +364,6 @@ class ExtensionDependencies implements IExtensionDependencies {
 export class ExtensionsWorkbenchService implements IExtensionsWorkbenchService, IURLHandler {
 
 	private static readonly SyncPeriod = 1000 * 60 * 60 * 12; // 12 hours
-
 	_serviceBrand: any;
 	private stateProvider: IExtensionStateProvider<ExtensionState>;
 	private installing: Extension[] = [];
@@ -336,8 +373,8 @@ export class ExtensionsWorkbenchService implements IExtensionsWorkbenchService,
 	private autoUpdateDelayer: ThrottledDelayer<void>;
 	private disposables: IDisposable[] = [];
 
-	private readonly _onChange: Emitter<void> = new Emitter<void>();
-	get onChange(): Event<void> { return this._onChange.event; }
+	private readonly _onChange: Emitter<IExtension | undefined> = new Emitter<IExtension | undefined>();
+	get onChange(): Event<IExtension | undefined> { return this._onChange.event; }
 
 	private _extensionAllowedBadgeProviders: string[];
 
@@ -348,14 +385,14 @@ export class ExtensionsWorkbenchService implements IExtensionsWorkbenchService,
 		@IExtensionGalleryService private galleryService: IExtensionGalleryService,
 		@IConfigurationService private configurationService: IConfigurationService,
 		@ITelemetryService private telemetryService: ITelemetryService,
-		@IDialogService private dialogService: IDialogService,
 		@INotificationService private notificationService: INotificationService,
 		@IURLService urlService: IURLService,
 		@IExtensionEnablementService private extensionEnablementService: IExtensionEnablementService,
 		@IWindowService private windowService: IWindowService,
 		@ILogService private logService: ILogService,
 		@IProgressService2 private progressService: IProgressService2,
-		@IExtensionTipsService private extensionTipsService: IExtensionTipsService
+		@IExtensionService private runtimeExtensionService: IExtensionService,
+		@IExtensionManagementServerService private extensionManagementServerService: IExtensionManagementServerService
 	) {
 		this.stateProvider = ext => this.getExtensionState(ext);
 
@@ -376,9 +413,14 @@ export class ExtensionsWorkbenchService implements IExtensionsWorkbenchService,
 					this.checkForUpdates();
 				}
 			}
+			if (e.affectsConfiguration(AutoCheckUpdatesConfigurationKey)) {
+				if (this.isAutoCheckUpdatesEnabled()) {
+					this.checkForUpdates();
+				}
+			}
 		}, this, this.disposables);
 
-		this.queryLocal().done(() => this.eventuallySyncWithGallery(true));
+		this.queryLocal().then(() => this.eventuallySyncWithGallery(true));
 	}
 
 	get local(): IExtension[] {
@@ -390,61 +432,121 @@ export class ExtensionsWorkbenchService implements IExtensionsWorkbenchService,
 	}
 
 	queryLocal(): TPromise<IExtension[]> {
-		return this.extensionService.getInstalled().then(result => {
-			const installedById = index(this.installed, e => e.local.identifier.id);
-			this.installed = result.map(local => {
-				const extension = installedById[local.identifier.id] || new Extension(this.galleryService, this.stateProvider, local, null, this.telemetryService);
-				extension.local = local;
-				extension.enablementState = this.extensionEnablementService.getEnablementState(local);
-				return extension;
-			});
+		return this.extensionService.getInstalled()
+			.then(installed => this.getDistinctInstalledExtensions(installed)
+				.then(distinctInstalled => {
+					const installedById = index(this.installed, e => e.local.identifier.id);
+					const groupById = groupBy(installed, i => getGalleryExtensionIdFromLocal(i));
+					this.installed = distinctInstalled.map(local => {
+						const locals = groupById[getGalleryExtensionIdFromLocal(local)];
+						locals.splice(locals.indexOf(local), 1);
+						locals.splice(0, 0, local);
+						const extension = installedById[local.identifier.id] || new Extension(this.galleryService, this.stateProvider, locals, null, this.telemetryService, this.logService);
+						extension.locals = locals;
+						extension.enablementState = this.extensionEnablementService.getEnablementState(local);
+						return extension;
+					});
 
-			this._onChange.fire();
-			return this.local;
-		});
+					this._onChange.fire();
+					return this.local;
+				}));
 	}
 
 	queryGallery(options: IQueryOptions = {}): TPromise<IPager<IExtension>> {
-		return this.extensionService.getExtensionsReport().then(report => {
-			const maliciousSet = getMaliciousExtensionsSet(report);
+		return this.extensionService.getExtensionsReport()
+			.then(report => {
+				const maliciousSet = getMaliciousExtensionsSet(report);
 
-			return this.galleryService.query(options)
-				.then(result => mapPager(result, gallery => this.fromGallery(gallery, maliciousSet)))
-				.then(null, err => {
-					if (/No extension gallery service configured/.test(err.message)) {
-						return TPromise.as(singlePagePager([]));
-					}
+				return this.galleryService.query(options)
+					.then(result => mapPager(result, gallery => this.fromGallery(gallery, maliciousSet)))
+					.then(null, err => {
+						if (/No extension gallery service configured/.test(err.message)) {
+							return TPromise.as(singlePagePager([]));
+						}
 
-					return TPromise.wrapError<IPager<IExtension>>(err);
-				});
-		});
+						return TPromise.wrapError<IPager<IExtension>>(err);
+					});
+			});
 	}
 
-	loadDependencies(extension: IExtension): TPromise<IExtensionDependencies> {
+	loadDependencies(extension: IExtension, token: CancellationToken): TPromise<IExtensionDependencies> {
 		if (!extension.dependencies.length) {
 			return TPromise.wrap<IExtensionDependencies>(null);
 		}
 
-		return this.extensionService.getExtensionsReport().then(report => {
-			const maliciousSet = getMaliciousExtensionsSet(report);
+		return this.extensionService.getExtensionsReport()
+			.then(report => {
+				const maliciousSet = getMaliciousExtensionsSet(report);
 
-			return this.galleryService.loadAllDependencies((<Extension>extension).dependencies.map(id => <IExtensionIdentifier>{ id }))
-				.then(galleryExtensions => galleryExtensions.map(galleryExtension => this.fromGallery(galleryExtension, maliciousSet)))
-				.then(extensions => [...this.local, ...extensions])
-				.then(extensions => {
-					const map = new Map<string, IExtension>();
-					for (const extension of extensions) {
-						map.set(extension.id, extension);
-					}
-					return new ExtensionDependencies(extension, extension.id, map);
-				});
-		});
+				return this.galleryService.loadAllDependencies((<Extension>extension).dependencies.map(id => ({ id })), token)
+					.then(galleryExtensions => galleryExtensions.map(galleryExtension => this.fromGallery(galleryExtension, maliciousSet)))
+					.then(extensions => [...this.local, ...extensions])
+					.then(extensions => {
+						const map = new Map<string, IExtension>();
+						for (const extension of extensions) {
+							map.set(extension.id, extension);
+						}
+						return new ExtensionDependencies(extension, extension.id, map);
+					});
+			});
 	}
 
 	open(extension: IExtension, sideByside: boolean = false): TPromise<any> {
 		return this.editorService.openEditor(this.instantiationService.createInstance(ExtensionsInput, extension), null, sideByside ? SIDE_GROUP : ACTIVE_GROUP);
 	}
 
+	private getDistinctInstalledExtensions(allInstalled: ILocalExtension[]): TPromise<ILocalExtension[]> {
+		if (!this.hasDuplicates(allInstalled)) {
+			return TPromise.as(allInstalled);
+		}
+		return TPromise.join([this.runtimeExtensionService.getExtensions(), this.extensionEnablementService.getDisabledExtensions()])
+			.then(([runtimeExtensions, disabledExtensionIdentifiers]) => {
+				const groups = groupBy(allInstalled, (extension: ILocalExtension) => {
+					const isDisabled = disabledExtensionIdentifiers.some(identifier => areSameExtensions(identifier, { id: getGalleryExtensionIdFromLocal(extension), uuid: extension.identifier.uuid }));
+					if (isDisabled) {
+						return extension.location.scheme === Schemas.file ? 'disabled:primary' : 'disabled:secondary';
+					} else {
+						return 'enabled';
+					}
+				});
+				const enabled: ILocalExtension[] = [];
+				const notRunningExtensions: ILocalExtension[] = [];
+				const seenExtensions: { [id: string]: boolean } = Object.create({});
+				for (const extension of (groups['enabled'] || [])) {
+					if (runtimeExtensions.some(r => r.extensionLocation.toString() === extension.location.toString())) {
+						enabled.push(extension);
+						seenExtensions[getGalleryExtensionIdFromLocal(extension)] = true;
+					} else {
+						notRunningExtensions.push(extension);
+					}
+				}
+				for (const extension of notRunningExtensions) {
+					if (!seenExtensions[getGalleryExtensionIdFromLocal(extension)]) {
+						enabled.push(extension);
+						seenExtensions[getGalleryExtensionIdFromLocal(extension)] = true;
+					}
+				}
+				const primaryDisabled = groups['disabled:primary'] || [];
+				const secondaryDisabled = (groups['disabled:secondary'] || []).filter(disabled => {
+					const identifier: IExtensionIdentifier = { id: getGalleryExtensionIdFromLocal(disabled), uuid: disabled.identifier.uuid };
+					return primaryDisabled.every(p => !areSameExtensions({ id: getGalleryExtensionIdFromLocal(p), uuid: p.identifier.uuid }, identifier));
+				});
+				return [...enabled, ...primaryDisabled, ...secondaryDisabled];
+			});
+	}
+
+	private hasDuplicates(extensions: ILocalExtension[]): boolean {
+		const seen: { [key: string]: boolean; } = Object.create(null);
+		for (const i of extensions) {
+			const key = getGalleryExtensionIdFromLocal(i);
+			if (seen[key]) {
+				return true;
+			}
+			seen[key] = true;
+		}
+		return false;
+	}
+
 	private fromGallery(gallery: IGalleryExtension, maliciousExtensionSet: Set<string>): Extension {
 		let result = this.getInstalledExtensionMatchingGallery(gallery);
 
@@ -458,7 +560,7 @@ export class ExtensionsWorkbenchService implements IExtensionsWorkbenchService,
 				this.syncLocalWithGalleryExtension(result, gallery);
 			}
 		} else {
-			result = new Extension(this.galleryService, this.stateProvider, null, gallery, this.telemetryService);
+			result = new Extension(this.galleryService, this.stateProvider, [], gallery, this.telemetryService, this.logService);
 		}
 
 		if (maliciousExtensionSet.has(result.id)) {
@@ -483,13 +585,13 @@ export class ExtensionsWorkbenchService implements IExtensionsWorkbenchService,
 		return null;
 	}
 
-	private syncLocalWithGalleryExtension(local: Extension, gallery: IGalleryExtension) {
+	private syncLocalWithGalleryExtension(extension: Extension, gallery: IGalleryExtension) {
 		// Sync the local extension with gallery extension if local extension doesnot has metadata
-		(local.local.metadata ? TPromise.as(local.local) : this.extensionService.updateMetadata(local.local, { id: gallery.identifier.uuid, publisherDisplayName: gallery.publisherDisplayName, publisherId: gallery.publisherId }))
-			.then(localExtension => {
-				local.local = localExtension;
-				local.gallery = gallery;
-				this._onChange.fire();
+		TPromise.join(extension.locals.map(local => local.metadata ? TPromise.as(local) : this.extensionService.updateMetadata(local, { id: gallery.identifier.uuid, publisherDisplayName: gallery.publisherDisplayName, publisherId: gallery.publisherId })))
+			.then(locals => {
+				extension.locals = locals;
+				extension.gallery = gallery;
+				this._onChange.fire(extension);
 				this.eventuallyAutoUpdateExtensions();
 			});
 	}
@@ -502,12 +604,17 @@ export class ExtensionsWorkbenchService implements IExtensionsWorkbenchService,
 		return this.configurationService.getValue(AutoUpdateConfigurationKey);
 	}
 
+	private isAutoCheckUpdatesEnabled(): boolean {
+		return this.configurationService.getValue(AutoCheckUpdatesConfigurationKey);
+	}
+
 	private eventuallySyncWithGallery(immediate = false): void {
-		const loop = () => this.syncWithGallery().then(() => this.eventuallySyncWithGallery());
+		const shouldSync = this.isAutoUpdateEnabled() || this.isAutoCheckUpdatesEnabled();
+		const loop = () => (shouldSync ? this.syncWithGallery() : TPromise.as(null)).then(() => this.eventuallySyncWithGallery());
 		const delay = immediate ? 0 : ExtensionsWorkbenchService.SyncPeriod;
 
 		this.syncDelayer.trigger(loop, delay)
-			.done(null, err => null);
+			.then(null, err => null);
 	}
 
 	private syncWithGallery(): TPromise<void> {
@@ -535,7 +642,7 @@ export class ExtensionsWorkbenchService implements IExtensionsWorkbenchService,
 
 	private eventuallyAutoUpdateExtensions(): void {
 		this.autoUpdateDelayer.trigger(() => this.autoUpdateExtensions())
-			.done(null, err => null);
+			.then(null, err => null);
 	}
 
 	private autoUpdateExtensions(): TPromise<any> {
@@ -565,11 +672,11 @@ export class ExtensionsWorkbenchService implements IExtensionsWorkbenchService,
 				location: ProgressLocation.Extensions,
 				title: nls.localize('installingVSIXExtension', 'Installing extension from VSIX...'),
 				source: `${extension}`
-			}, () => this.extensionService.install(extension).then(() => null));
+			}, () => this.extensionService.install(URI.file(extension)).then(() => null));
 		}
 
 		if (!(extension instanceof Extension)) {
-			return undefined;
+			return TPromise.as(undefined);
 		}
 
 		if (extension.isMalicious) {
@@ -587,7 +694,7 @@ export class ExtensionsWorkbenchService implements IExtensionsWorkbenchService,
 			location: ProgressLocation.Extensions,
 			title: nls.localize('installingMarketPlaceExtension', 'Installing extension from Marketplace....'),
 			source: `${extension.id}`
-		}, () => this.extensionService.installFromGallery(gallery).then(() => null));
+		}, () => this.extensionService.installFromGallery(gallery));
 	}
 
 	setEnablement(extensions: IExtension | IExtension[], enablementState: EnablementState): TPromise<void> {
@@ -601,9 +708,9 @@ export class ExtensionsWorkbenchService implements IExtensionsWorkbenchService,
 		}
 
 		const ext = extension as Extension;
-		const local = ext.local || this.installed.filter(e => e.id === extension.id)[0].local;
+		const toUninstall: ILocalExtension[] = ext.locals.length ? ext.locals : this.installed.filter(e => e.id === extension.id)[0].locals;
 
-		if (!local) {
+		if (!toUninstall.length) {
 			return TPromise.wrapError<void>(new Error('Missing local'));
 		}
 
@@ -611,8 +718,8 @@ export class ExtensionsWorkbenchService implements IExtensionsWorkbenchService,
 		return this.progressService.withProgress({
 			location: ProgressLocation.Extensions,
 			title: nls.localize('uninstallingExtension', 'Uninstalling extension....'),
-			source: `${local.identifier.id}`
-		}, () => this.extensionService.uninstall(local));
+			source: `${toUninstall[0].identifier.id}`
+		}, () => TPromise.join(toUninstall.map(local => this.extensionService.uninstall(local))).then(() => null));
 	}
 
 	reinstall(extension: IExtension): TPromise<void> {
@@ -621,97 +728,71 @@ export class ExtensionsWorkbenchService implements IExtensionsWorkbenchService,
 		}
 
 		const ext = extension as Extension;
-		const local = ext.local || this.installed.filter(e => e.id === extension.id)[0].local;
+		const toReinstall: ILocalExtension[] = ext.locals.length ? ext.locals : this.installed.filter(e => e.id === extension.id)[0].locals;
 
-		if (!local) {
+		if (!toReinstall.length) {
 			return TPromise.wrapError<void>(new Error('Missing local'));
 		}
 
 		return this.progressService.withProgress({
 			location: ProgressLocation.Extensions,
-			source: `${local.identifier.id}`
-		}, () => this.extensionService.reinstallFromGallery(local).then(() => null));
+			source: `${toReinstall[0].identifier.id}`
+		}, () => TPromise.join(toReinstall.map(local => this.extensionService.reinstallFromGallery(local))).then(() => null));
 	}
 
 	private promptAndSetEnablement(extensions: IExtension[], enablementState: EnablementState): TPromise<any> {
-		const allDependencies = this.getDependenciesRecursively(extensions, this.local, enablementState, []);
-		if (allDependencies.length > 0) {
-			if (enablementState === EnablementState.Enabled || enablementState === EnablementState.WorkspaceEnabled) {
-				return this.promptForDependenciesAndEnable(extensions, allDependencies, enablementState);
-			} else {
-				return this.promptForDependenciesAndDisable(extensions, allDependencies, enablementState);
+		const enable = enablementState === EnablementState.Enabled || enablementState === EnablementState.WorkspaceEnabled;
+		if (enable) {
+			const allDependenciesAndPackedExtensions = this.getExtensionsRecursively(extensions, this.local, enablementState, { dependencies: true, pack: true });
+			return this.checkAndSetEnablement(extensions, allDependenciesAndPackedExtensions, enablementState);
+		} else {
+			const packedExtensions = this.getExtensionsRecursively(extensions, this.local, enablementState, { dependencies: false, pack: true });
+			if (packedExtensions.length) {
+				return this.checkAndSetEnablement(extensions, packedExtensions, enablementState);
 			}
+			return this.checkAndSetEnablement(extensions, [], enablementState);
 		}
-		return this.checkAndSetEnablement(extensions, [], enablementState);
 	}
 
-	private promptForDependenciesAndEnable(extensions: IExtension[], dependencies: IExtension[], enablementState: EnablementState): TPromise<any> {
-		const message = nls.localize('enableDependeciesConfirmation', "Enabling an extension also enables its dependencies. Would you like to continue?");
-		const buttons = [
-			nls.localize('enable', "Yes"),
-			nls.localize('doNotEnable', "No")
-		];
-		return this.dialogService.show(Severity.Info, message, buttons, { cancelId: 1 })
-			.then<void>(value => {
-				if (value === 0) {
-					return this.checkAndSetEnablement(extensions, dependencies, enablementState);
-				}
-				return TPromise.as(null);
-			});
-	}
-
-	private promptForDependenciesAndDisable(extensions: IExtension[], dependencies: IExtension[], enablementState: EnablementState): TPromise<void> {
-		const message = nls.localize('disableDependeciesConfirmation', "Would you like to disable the dependencies of the extensions also?");
-		const buttons = [
-			nls.localize('yes', "Yes"),
-			nls.localize('no', "No"),
-			nls.localize('cancel', "Cancel")
-		];
-		return this.dialogService.show(Severity.Info, message, buttons, { cancelId: 2 })
-			.then<void>(value => {
-				if (value === 0) {
-					return this.checkAndSetEnablement(extensions, dependencies, enablementState);
-				}
-				if (value === 1) {
-					return this.checkAndSetEnablement(extensions, [], enablementState);
-				}
-				return TPromise.as(null);
-			});
-	}
-
-	private checkAndSetEnablement(extensions: IExtension[], dependencies: IExtension[], enablementState: EnablementState): TPromise<any> {
-		const allExtensions = [...extensions, ...dependencies];
+	private checkAndSetEnablement(extensions: IExtension[], otherExtensions: IExtension[], enablementState: EnablementState): TPromise<any> {
+		const allExtensions = [...extensions, ...otherExtensions];
 		const enable = enablementState === EnablementState.Enabled || enablementState === EnablementState.WorkspaceEnabled;
 		if (!enable) {
 			for (const extension of extensions) {
 				let dependents = this.getDependentsAfterDisablement(extension, allExtensions, this.local, enablementState);
 				if (dependents.length) {
-					return TPromise.wrapError<void>(new Error(this.getDependentsErrorMessage(extension, dependents)));
+					return TPromise.wrapError<void>(new Error(this.getDependentsErrorMessage(extension, allExtensions, dependents)));
 				}
 			}
 		}
 		return TPromise.join(allExtensions.map(e => this.doSetEnablement(e, enablementState)));
 	}
 
-	private getDependenciesRecursively(extensions: IExtension[], installed: IExtension[], enablementState: EnablementState, checked: IExtension[]): IExtension[] {
+	private getExtensionsRecursively(extensions: IExtension[], installed: IExtension[], enablementState: EnablementState, options: { dependencies: boolean, pack: boolean }, checked: IExtension[] = []): IExtension[] {
 		const toCheck = extensions.filter(e => checked.indexOf(e) === -1);
 		if (toCheck.length) {
 			for (const extension of toCheck) {
 				checked.push(extension);
 			}
-			const dependenciesToDisable = installed.filter(i => {
+			const extensionsToDisable = installed.filter(i => {
 				if (checked.indexOf(i) !== -1) {
 					return false;
 				}
 				if (i.enablementState === enablementState) {
 					return false;
 				}
-				return i.type === LocalExtensionType.User && extensions.some(extension => extension.dependencies.indexOf(i.id) !== -1);
+				const enable = enablementState === EnablementState.Enabled || enablementState === EnablementState.WorkspaceEnabled;
+				return (enable || i.type === LocalExtensionType.User) // Include all Extensions for enablement and only user extensions for disablement
+					&& (options.dependencies || options.pack)
+					&& extensions.some(extension =>
+						(options.dependencies && extension.dependencies.some(id => areSameExtensions({ id }, i)))
+						|| (options.pack && extension.extensionPack.some(id => areSameExtensions({ id }, i)))
+					);
 			});
-			if (dependenciesToDisable.length) {
-				const depsOfDeps = this.getDependenciesRecursively(dependenciesToDisable, installed, enablementState, checked);
-				return [...dependenciesToDisable, ...depsOfDeps];
+			if (extensionsToDisable.length) {
+				extensionsToDisable.push(...this.getExtensionsRecursively(extensionsToDisable, installed, enablementState, options, checked));
 			}
+			return extensionsToDisable;
 		}
 		return [];
 	}
@@ -730,16 +811,21 @@ export class ExtensionsWorkbenchService implements IExtensionsWorkbenchService,
 			if (extensionsToDisable.indexOf(i) !== -1) {
 				return false;
 			}
-			return i.dependencies.some(dep => {
-				if (extension.id === dep) {
-					return true;
-				}
-				return extensionsToDisable.some(d => d.id === dep);
-			});
+			return i.dependencies.some(dep => [extension, ...extensionsToDisable].some(d => d.id === dep));
 		});
 	}
 
-	private getDependentsErrorMessage(extension: IExtension, dependents: IExtension[]): string {
+	private getDependentsErrorMessage(extension: IExtension, allDisabledExtensions: IExtension[], dependents: IExtension[]): string {
+		for (const e of [extension, ...allDisabledExtensions]) {
+			let dependentsOfTheExtension = dependents.filter(d => d.dependencies.some(id => areSameExtensions({ id }, e)));
+			if (dependentsOfTheExtension.length) {
+				return this.getErrorMessageForDisablingAnExtensionWithDependents(e, dependentsOfTheExtension);
+			}
+		}
+		return '';
+	}
+
+	private getErrorMessageForDisablingAnExtensionWithDependents(extension: IExtension, dependents: IExtension[]): string {
 		if (dependents.length === 1) {
 			return nls.localize('singleDependentError', "Cannot disable extension '{0}'. Extension '{1}' depends on this.", extension.displayName, dependents[0].displayName);
 		}
@@ -792,37 +878,42 @@ export class ExtensionsWorkbenchService implements IExtensionsWorkbenchService,
 		let extension = this.installed.filter(e => areSameExtensions(e, gallery.identifier))[0];
 
 		if (!extension) {
-			extension = new Extension(this.galleryService, this.stateProvider, null, gallery, this.telemetryService);
+			extension = new Extension(this.galleryService, this.stateProvider, [], gallery, this.telemetryService, this.logService);
 		}
 
 		extension.gallery = gallery;
 
 		this.installing.push(extension);
 
-		this._onChange.fire();
+		this._onChange.fire(extension);
 	}
 
 	private onDidInstallExtension(event: DidInstallExtensionEvent): void {
 		const { local, zipPath, error, gallery } = event;
 		const installingExtension = gallery ? this.installing.filter(e => areSameExtensions(e, gallery.identifier))[0] : null;
-		const extension: Extension = installingExtension ? installingExtension : zipPath ? new Extension(this.galleryService, this.stateProvider, local, null, this.telemetryService) : null;
+		let extension: Extension = installingExtension ? installingExtension : zipPath ? new Extension(this.galleryService, this.stateProvider, [local], null, this.telemetryService, this.logService) : null;
 		if (extension) {
 			this.installing = installingExtension ? this.installing.filter(e => e !== installingExtension) : this.installing;
 			if (!error) {
 				const installed = this.installed.filter(e => e.id === extension.id)[0];
-				extension.local = local;
 				if (installed) {
-					installed.local = local;
+					extension = installed;
+					const server = this.extensionManagementServerService.getExtensionManagementServer(local.location);
+					const existingLocal = installed.locals.filter(l => this.extensionManagementServerService.getExtensionManagementServer(l.location).authority === server.authority)[0];
+					if (existingLocal) {
+						const locals = [...installed.locals];
+						locals.splice(installed.locals.indexOf(existingLocal), 1, local);
+						installed.locals = locals;
+					} else {
+						installed.locals = [...installed.locals, local];
+					}
 				} else {
+					extension.locals = [local];
 					this.installed.push(extension);
 				}
 			}
-			if (extension.gallery && event.operation === InstallOperation.Install) {
-				// Report recommendation telemetry only for gallery extensions that are first time installs
-				this.reportExtensionRecommendationsTelemetry(installingExtension);
-			}
 		}
-		this._onChange.fire();
+		this._onChange.fire(extension);
 	}
 
 	private onUninstallExtension({ id }: IExtensionIdentifier): void {
@@ -861,7 +952,7 @@ export class ExtensionsWorkbenchService implements IExtensionsWorkbenchService,
 			const enablementState = this.extensionEnablementService.getEnablementState(extension.local);
 			if (enablementState !== extension.enablementState) {
 				extension.enablementState = enablementState;
-				this._onChange.fire();
+				this._onChange.fire(extension);
 			}
 		}
 	}
@@ -879,24 +970,6 @@ export class ExtensionsWorkbenchService implements IExtensionsWorkbenchService,
 		return local ? ExtensionState.Installed : ExtensionState.Uninstalled;
 	}
 
-	private reportExtensionRecommendationsTelemetry(extension: Extension): void {
-		const extRecommendations = this.extensionTipsService.getAllRecommendationsWithReason() || {};
-		const recommendationReason = extRecommendations[extension.id.toLowerCase()];
-		if (recommendationReason) {
-			const recommendationsData = { recommendationReason: recommendationReason.reasonId };
-			const data = extension.telemetryData;
-			/* __GDPR__
-				"extensionGallery:install:recommendations" : {
-					"recommendationReason": { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
-					"${include}": [
-						"${GalleryExtensionTelemetryData}"
-					]
-				}
-			*/
-			this.telemetryService.publicLog('extensionGallery:install:recommendations', assign(data, recommendationsData));
-		}
-	}
-
 	private onError(err: any): void {
 		if (isPromiseCanceledError(err)) {
 			return;
@@ -911,13 +984,13 @@ export class ExtensionsWorkbenchService implements IExtensionsWorkbenchService,
 		this.notificationService.error(err);
 	}
 
-	async handleURL(uri: URI): TPromise<boolean> {
+	handleURL(uri: URI): TPromise<boolean> {
 		if (!/^extension/.test(uri.path)) {
-			return false;
+			return TPromise.as(false);
 		}
 
 		this.onOpenExtensionUrl(uri);
-		return true;
+		return TPromise.as(true);
 	}
 
 	private onOpenExtensionUrl(uri: URI): void {
@@ -951,17 +1024,17 @@ export class ExtensionsWorkbenchService implements IExtensionsWorkbenchService,
 							nls.localize('installConfirmation', "Would you like to install the '{0}' extension?", extension.displayName, extension.publisher),
 							[{
 								label: nls.localize('install', "Install"),
-								run: () => this.install(extension).done(undefined, error => this.onError(error))
+								run: () => this.install(extension).then(undefined, error => this.onError(error))
 							}]
 						);
 					});
 				});
 			});
-		}).done(undefined, error => this.onError(error));
+		}).then(undefined, error => this.onError(error));
 	}
 
 	dispose(): void {
 		this.syncDelayer.cancel();
 		this.disposables = dispose(this.disposables);
 	}
-}
+}
\ No newline at end of file
diff --git a/src/vs/workbench/parts/extensions/test/common/extensionQuery.test.ts b/src/vs/workbench/parts/extensions/test/common/extensionQuery.test.ts
index 12d20be6399..f107018c53d 100644
--- a/src/vs/workbench/parts/extensions/test/common/extensionQuery.test.ts
+++ b/src/vs/workbench/parts/extensions/test/common/extensionQuery.test.ts
@@ -72,72 +72,80 @@ suite('Extension query', () => {
 	});
 
 	test('toString', () => {
-		let query = new Query('hello', '');
+		let query = new Query('hello', '', '');
 		assert.equal(query.toString(), 'hello');
 
-		query = new Query('hello world', '');
+		query = new Query('hello world', '', '');
 		assert.equal(query.toString(), 'hello world');
 
-		query = new Query('  hello    ', '');
+		query = new Query('  hello    ', '', '');
 		assert.equal(query.toString(), 'hello');
 
-		query = new Query('', 'installs');
+		query = new Query('', 'installs', '');
 		assert.equal(query.toString(), '@sort:installs');
 
-		query = new Query('', 'installs');
+		query = new Query('', 'installs', '');
 		assert.equal(query.toString(), '@sort:installs');
 
-		query = new Query('', 'installs');
+		query = new Query('', 'installs', '');
 		assert.equal(query.toString(), '@sort:installs');
 
-		query = new Query('hello', 'installs');
+		query = new Query('hello', 'installs', '');
 		assert.equal(query.toString(), 'hello @sort:installs');
 
-		query = new Query('  hello      ', 'installs');
+		query = new Query('  hello      ', 'installs', '');
 		assert.equal(query.toString(), 'hello @sort:installs');
 	});
 
 	test('isValid', () => {
-		let query = new Query('hello', '');
+		let query = new Query('hello', '', '');
 		assert(query.isValid());
 
-		query = new Query('hello world', '');
+		query = new Query('hello world', '', '');
 		assert(query.isValid());
 
-		query = new Query('  hello    ', '');
+		query = new Query('  hello    ', '', '');
 		assert(query.isValid());
 
-		query = new Query('', 'installs');
+		query = new Query('', 'installs', '');
 		assert(query.isValid());
 
-		query = new Query('', 'installs');
+		query = new Query('', 'installs', '');
 		assert(query.isValid());
 
-		query = new Query('', 'installs');
+		query = new Query('', 'installs', '');
 		assert(query.isValid());
 
-		query = new Query('', 'installs');
+		query = new Query('', 'installs', '');
 		assert(query.isValid());
 
-		query = new Query('hello', 'installs');
+		query = new Query('hello', 'installs', '');
 		assert(query.isValid());
 
-		query = new Query('  hello      ', 'installs');
+		query = new Query('  hello      ', 'installs', '');
 		assert(query.isValid());
 	});
 
 	test('equals', () => {
-		let query1 = new Query('hello', '');
-		let query2 = new Query('hello', '');
+		let query1 = new Query('hello', '', '');
+		let query2 = new Query('hello', '', '');
 		assert(query1.equals(query2));
 
-		query2 = new Query('hello world', '');
+		query2 = new Query('hello world', '', '');
 		assert(!query1.equals(query2));
 
-		query2 = new Query('hello', 'installs');
+		query2 = new Query('hello', 'installs', '');
 		assert(!query1.equals(query2));
 
-		query2 = new Query('hello', 'installs');
+		query2 = new Query('hello', 'installs', '');
 		assert(!query1.equals(query2));
 	});
+
+	test('autocomplete', () => {
+		Query.suggestions('@sort:in').some(x => x === '@sort:installs ');
+		Query.suggestions('@sort:installs').every(x => x !== '@sort:rating ');
+
+		Query.suggestions('@category:blah').some(x => x === '@category:"extension packs" ');
+		Query.suggestions('@category:"extension packs"').every(x => x !== '@category:formatters ');
+	});
 });
\ No newline at end of file
diff --git a/src/vs/workbench/parts/extensions/test/electron-browser/extensionsActions.test.ts b/src/vs/workbench/parts/extensions/test/electron-browser/extensionsActions.test.ts
index dbb1457fbdb..3bb3461aec4 100644
--- a/src/vs/workbench/parts/extensions/test/electron-browser/extensionsActions.test.ts
+++ b/src/vs/workbench/parts/extensions/test/electron-browser/extensionsActions.test.ts
@@ -10,13 +10,13 @@ import { assign } from 'vs/base/common/objects';
 import { generateUuid } from 'vs/base/common/uuid';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { IExtensionsWorkbenchService } from 'vs/workbench/parts/extensions/common/extensions';
-import * as ExtensionsActions from 'vs/workbench/parts/extensions/browser/extensionsActions';
+import * as ExtensionsActions from 'vs/workbench/parts/extensions/electron-browser/extensionsActions';
 import { ExtensionsWorkbenchService } from 'vs/workbench/parts/extensions/node/extensionsWorkbenchService';
 import {
 	IExtensionManagementService, IExtensionGalleryService, IExtensionEnablementService, IExtensionTipsService, ILocalExtension, LocalExtensionType, IGalleryExtension,
-	DidInstallExtensionEvent, DidUninstallExtensionEvent, InstallExtensionEvent, IExtensionIdentifier, EnablementState, InstallOperation
+	DidInstallExtensionEvent, DidUninstallExtensionEvent, InstallExtensionEvent, IExtensionIdentifier, EnablementState, InstallOperation, IExtensionManagementServerService, IExtensionManagementServer
 } from 'vs/platform/extensionManagement/common/extensionManagement';
-import { getGalleryExtensionId } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
+import { getGalleryExtensionId, getGalleryExtensionIdFromLocal } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
 import { ExtensionManagementService, getLocalExtensionIdFromGallery, getLocalExtensionIdFromManifest } from 'vs/platform/extensionManagement/node/extensionManagementService';
 import { ExtensionTipsService } from 'vs/workbench/parts/extensions/electron-browser/extensionTipsService';
 import { TestExtensionEnablementService } from 'vs/platform/extensionManagement/test/common/extensionEnablementService.test';
@@ -34,6 +34,9 @@ import { IConfigurationService } from 'vs/platform/configuration/common/configur
 import { ILogService, NullLogService } from 'vs/platform/log/common/log';
 import { IWindowService } from 'vs/platform/windows/common/windows';
 import { URLService } from 'vs/platform/url/common/urlService';
+import { URI } from 'vs/base/common/uri';
+import { SingleServerExtensionManagementServerService } from 'vs/workbench/services/extensions/node/extensionManagementServerService';
+import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
 
 suite('ExtensionsActions Test', () => {
 
@@ -57,29 +60,31 @@ suite('ExtensionsActions Test', () => {
 		instantiationService.stub(IWindowService, TestWindowService);
 
 		instantiationService.stub(IWorkspaceContextService, new TestContextService());
-		instantiationService.stub(IConfigurationService, { onDidUpdateConfiguration: () => { }, onDidChangeConfiguration: () => { }, getConfiguration: () => ({}) });
+		instantiationService.stub(IConfigurationService, new TestConfigurationService());
 
 		instantiationService.stub(IExtensionGalleryService, ExtensionGalleryService);
 
+
 		instantiationService.stub(IExtensionManagementService, ExtensionManagementService);
 		instantiationService.stub(IExtensionManagementService, 'onInstallExtension', installEvent.event);
 		instantiationService.stub(IExtensionManagementService, 'onDidInstallExtension', didInstallEvent.event);
 		instantiationService.stub(IExtensionManagementService, 'onUninstallExtension', uninstallEvent.event);
 		instantiationService.stub(IExtensionManagementService, 'onDidUninstallExtension', didUninstallEvent.event);
 
+		instantiationService.stub(IExtensionManagementServerService, instantiationService.createInstance(SingleServerExtensionManagementServerService, <IExtensionManagementServer>{ authority: 'vscode-local', extensionManagementService: instantiationService.get(IExtensionManagementService), label: 'local' }));
+
 		instantiationService.stub(IExtensionEnablementService, new TestExtensionEnablementService(instantiationService));
 
-		instantiationService.stub(IExtensionTipsService, ExtensionTipsService);
-		instantiationService.stub(IExtensionTipsService, 'getKeymapRecommendations', () => []);
+		instantiationService.set(IExtensionTipsService, instantiationService.createInstance(ExtensionTipsService));
 		instantiationService.stub(IURLService, URLService);
 	});
 
-	setup(() => {
+	setup(async () => {
 		instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', []);
 		instantiationService.stubPromise(IExtensionManagementService, 'getExtensionsReport', []);
 		instantiationService.stubPromise(IExtensionGalleryService, 'query', aPage());
 		instantiationService.stub(IExtensionService, { getExtensions: () => TPromise.wrap([]) });
-		(<TestExtensionEnablementService>instantiationService.get(IExtensionEnablementService)).reset();
+		await (<TestExtensionEnablementService>instantiationService.get(IExtensionEnablementService)).reset();
 
 		instantiationService.set(IExtensionsWorkbenchService, instantiationService.createInstance(ExtensionsWorkbenchService));
 	});
@@ -983,7 +988,7 @@ suite('ExtensionsActions Test', () => {
 	});
 
 	test('Test ReloadAction when extension is newly installed', () => {
-		instantiationService.stubPromise(IExtensionService, 'getExtensions', [{ id: 'pub.b' }]);
+		instantiationService.stubPromise(IExtensionService, 'getExtensions', [{ id: 'pub.b', extensionLocation: URI.file('pub.b') }]);
 		const testObject: ExtensionsActions.ReloadAction = instantiationService.createInstance(ExtensionsActions.ReloadAction);
 		const gallery = aGalleryExtension('a');
 		instantiationService.stubPromise(IExtensionGalleryService, 'query', aPage(gallery));
@@ -1000,7 +1005,7 @@ suite('ExtensionsActions Test', () => {
 	});
 
 	test('Test ReloadAction when extension is installed and uninstalled', () => {
-		instantiationService.stubPromise(IExtensionService, 'getExtensions', [{ id: 'pub.b' }]);
+		instantiationService.stubPromise(IExtensionService, 'getExtensions', [{ id: 'pub.b', extensionLocation: URI.file('pub.b') }]);
 		const testObject: ExtensionsActions.ReloadAction = instantiationService.createInstance(ExtensionsActions.ReloadAction);
 		const gallery = aGalleryExtension('a');
 		instantiationService.stubPromise(IExtensionGalleryService, 'query', aPage(gallery));
@@ -1018,7 +1023,7 @@ suite('ExtensionsActions Test', () => {
 	});
 
 	test('Test ReloadAction when extension is uninstalled', () => {
-		instantiationService.stubPromise(IExtensionService, 'getExtensions', [{ id: 'pub.a' }]);
+		instantiationService.stubPromise(IExtensionService, 'getExtensions', [{ id: 'pub.a', extensionLocation: URI.file('pub.a') }]);
 		const testObject: ExtensionsActions.ReloadAction = instantiationService.createInstance(ExtensionsActions.ReloadAction);
 		const local = aLocalExtension('a');
 		instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [local]);
@@ -1035,7 +1040,7 @@ suite('ExtensionsActions Test', () => {
 	});
 
 	test('Test ReloadAction when extension is uninstalled and installed', () => {
-		instantiationService.stubPromise(IExtensionService, 'getExtensions', [{ id: 'pub.a', version: '1.0.0' }]);
+		instantiationService.stubPromise(IExtensionService, 'getExtensions', [{ id: 'pub.a', version: '1.0.0', extensionLocation: URI.file('pub.a') }]);
 		const testObject: ExtensionsActions.ReloadAction = instantiationService.createInstance(ExtensionsActions.ReloadAction);
 		const local = aLocalExtension('a');
 		instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [local]);
@@ -1055,7 +1060,7 @@ suite('ExtensionsActions Test', () => {
 	});
 
 	test('Test ReloadAction when extension is updated while running', () => {
-		instantiationService.stubPromise(IExtensionService, 'getExtensions', [{ id: 'pub.a', version: '1.0.1' }]);
+		instantiationService.stubPromise(IExtensionService, 'getExtensions', [{ id: 'pub.a', version: '1.0.1', extensionLocation: URI.file('pub.a') }]);
 		const testObject: ExtensionsActions.ReloadAction = instantiationService.createInstance(ExtensionsActions.ReloadAction);
 		const local = aLocalExtension('a', { version: '1.0.1' });
 		const workbenchService = instantiationService.get(IExtensionsWorkbenchService);
@@ -1075,7 +1080,7 @@ suite('ExtensionsActions Test', () => {
 	});
 
 	test('Test ReloadAction when extension is updated when not running', () => {
-		instantiationService.stubPromise(IExtensionService, 'getExtensions', [{ id: 'pub.b' }]);
+		instantiationService.stubPromise(IExtensionService, 'getExtensions', [{ id: 'pub.b', extensionLocation: URI.file('pub.b') }]);
 		const local = aLocalExtension('a', { version: '1.0.1' });
 		return instantiationService.get(IExtensionEnablementService).setEnablement(local, EnablementState.Disabled)
 			.then(() => {
@@ -1096,7 +1101,7 @@ suite('ExtensionsActions Test', () => {
 	});
 
 	test('Test ReloadAction when extension is disabled when running', () => {
-		instantiationService.stubPromise(IExtensionService, 'getExtensions', [{ id: 'pub.a' }]);
+		instantiationService.stubPromise(IExtensionService, 'getExtensions', [{ id: 'pub.a', extensionLocation: URI.file('pub.a') }]);
 		const testObject: ExtensionsActions.ReloadAction = instantiationService.createInstance(ExtensionsActions.ReloadAction);
 		const local = aLocalExtension('a');
 		const workbenchService = instantiationService.get(IExtensionsWorkbenchService);
@@ -1113,7 +1118,7 @@ suite('ExtensionsActions Test', () => {
 	});
 
 	test('Test ReloadAction when extension enablement is toggled when running', () => {
-		instantiationService.stubPromise(IExtensionService, 'getExtensions', [{ id: 'pub.a', version: '1.0.0' }]);
+		instantiationService.stubPromise(IExtensionService, 'getExtensions', [{ id: 'pub.a', version: '1.0.0', extensionLocation: URI.file('pub.a') }]);
 		const testObject: ExtensionsActions.ReloadAction = instantiationService.createInstance(ExtensionsActions.ReloadAction);
 		const local = aLocalExtension('a');
 		const workbenchService = instantiationService.get(IExtensionsWorkbenchService);
@@ -1128,7 +1133,7 @@ suite('ExtensionsActions Test', () => {
 	});
 
 	test('Test ReloadAction when extension is enabled when not running', () => {
-		instantiationService.stubPromise(IExtensionService, 'getExtensions', [{ id: 'pub.b' }]);
+		instantiationService.stubPromise(IExtensionService, 'getExtensions', [{ id: 'pub.b', extensionLocation: URI.file('pub.b') }]);
 		const local = aLocalExtension('a');
 		return instantiationService.get(IExtensionEnablementService).setEnablement(local, EnablementState.Disabled)
 			.then(() => {
@@ -1149,7 +1154,7 @@ suite('ExtensionsActions Test', () => {
 	});
 
 	test('Test ReloadAction when extension enablement is toggled when not running', () => {
-		instantiationService.stubPromise(IExtensionService, 'getExtensions', [{ id: 'pub.b' }]);
+		instantiationService.stubPromise(IExtensionService, 'getExtensions', [{ id: 'pub.b', extensionLocation: URI.file('pub.b') }]);
 		const local = aLocalExtension('a');
 		return instantiationService.get(IExtensionEnablementService).setEnablement(local, EnablementState.Disabled)
 			.then(() => {
@@ -1167,7 +1172,7 @@ suite('ExtensionsActions Test', () => {
 	});
 
 	test('Test ReloadAction when extension is updated when not running and enabled', () => {
-		instantiationService.stubPromise(IExtensionService, 'getExtensions', [{ id: 'pub.b' }]);
+		instantiationService.stubPromise(IExtensionService, 'getExtensions', [{ id: 'pub.b', extensionLocation: URI.file('pub.b') }]);
 		const local = aLocalExtension('a', { version: '1.0.1' });
 		return instantiationService.get(IExtensionEnablementService).setEnablement(local, EnablementState.Disabled)
 			.then(() => {
@@ -1192,12 +1197,17 @@ suite('ExtensionsActions Test', () => {
 			});
 	});
 
+	test(`RecommendToFolderAction`, () => {
+		// TODO: Implement test
+	});
+
 	function aLocalExtension(name: string = 'someext', manifest: any = {}, properties: any = {}): ILocalExtension {
 		const localExtension = <ILocalExtension>Object.create({ manifest: {} });
-		assign(localExtension, { type: LocalExtensionType.User, manifest: {} }, properties);
+		assign(localExtension, { type: LocalExtensionType.User, manifest: {}, location: URI.file(`pub.${name}`) }, properties);
 		assign(localExtension.manifest, { name, publisher: 'pub', version: '1.0.0' }, manifest);
 		localExtension.identifier = { id: getLocalExtensionIdFromManifest(localExtension.manifest) };
 		localExtension.metadata = { id: localExtension.identifier.id, publisherId: localExtension.manifest.publisher, publisherDisplayName: 'somename' };
+		localExtension.galleryIdentifier = { id: getGalleryExtensionIdFromLocal(localExtension), uuid: void 0 };
 		return localExtension;
 	}
 
@@ -1214,4 +1224,4 @@ suite('ExtensionsActions Test', () => {
 		return { firstPage: objects, total: objects.length, pageSize: objects.length, getPage: () => null };
 	}
 
-});
\ No newline at end of file
+});
diff --git a/src/vs/workbench/parts/extensions/test/electron-browser/extensionsTipsService.test.ts b/src/vs/workbench/parts/extensions/test/electron-browser/extensionsTipsService.test.ts
index 3f7af9a154c..7bba8e405d0 100644
--- a/src/vs/workbench/parts/extensions/test/electron-browser/extensionsTipsService.test.ts
+++ b/src/vs/workbench/parts/extensions/test/electron-browser/extensionsTipsService.test.ts
@@ -5,6 +5,7 @@
 
 'use strict';
 
+import * as sinon from 'sinon';
 import * as assert from 'assert';
 import * as path from 'path';
 import * as fs from 'fs';
@@ -26,7 +27,7 @@ import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace
 import { TestTextResourceConfigurationService, TestContextService, TestLifecycleService, TestEnvironmentService, TestStorageService } from 'vs/workbench/test/workbenchTestServices';
 import { TestNotificationService } from 'vs/platform/notification/test/common/testNotificationService';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { testWorkspace } from 'vs/platform/workspace/test/common/testWorkspace';
 import { IFileService } from 'vs/platform/files/common/files';
 import { FileService } from 'vs/workbench/services/files/electron-browser/fileService';
@@ -36,10 +37,9 @@ import { IPager } from 'vs/base/common/paging';
 import { assign } from 'vs/base/common/objects';
 import { getGalleryExtensionId } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { IStorageService } from 'vs/platform/storage/common/storage';
-import { IExtensionsWorkbenchService, ConfigurationKey } from 'vs/workbench/parts/extensions/common/extensions';
+import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
+import { ConfigurationKey } from 'vs/workbench/parts/extensions/common/extensions';
 import { ExtensionManagementService } from 'vs/platform/extensionManagement/node/extensionManagementService';
-import { ExtensionsWorkbenchService } from 'vs/workbench/parts/extensions/node/extensionsWorkbenchService';
 import { TestExtensionEnablementService } from 'vs/platform/extensionManagement/test/common/extensionEnablementService.test';
 import { IURLService } from 'vs/platform/url/common/url';
 import product from 'vs/platform/node/product';
@@ -48,6 +48,8 @@ import { IModelService } from 'vs/editor/common/services/modelService';
 import { ILifecycleService } from 'vs/platform/lifecycle/common/lifecycle';
 import { INotificationService, Severity, IPromptChoice } from 'vs/platform/notification/common/notification';
 import { URLService } from 'vs/platform/url/common/urlService';
+import { IExperimentService } from 'vs/workbench/parts/experiments/node/experimentService';
+import { TestExperimentService } from 'vs/workbench/parts/experiments/test/node/experimentService.test';
 
 const mockExtensionGallery: IGalleryExtension[] = [
 	aGalleryExtension('MockExtension1', {
@@ -166,7 +168,6 @@ function aGalleryExtension(name: string, properties: any = {}, galleryExtensionP
 suite('ExtensionsTipsService Test', () => {
 	let workspaceService: IWorkspaceContextService;
 	let instantiationService: TestInstantiationService;
-	let extensionsWorkbenchService: IExtensionsWorkbenchService;
 	let testConfigurationService: TestConfigurationService;
 	let testObject: ExtensionTipsService;
 	let parentResource: string;
@@ -176,6 +177,7 @@ suite('ExtensionsTipsService Test', () => {
 		didUninstallEvent: Emitter<DidUninstallExtensionEvent>;
 	let prompted: boolean;
 	let onModelAddedEvent: Emitter<ITextModel>;
+	let experimentService: TestExperimentService;
 
 	suiteSetup(() => {
 		instantiationService = new TestInstantiationService();
@@ -197,6 +199,9 @@ suite('ExtensionsTipsService Test', () => {
 		instantiationService.stub(ITelemetryService, NullTelemetryService);
 		instantiationService.stub(IURLService, URLService);
 
+		experimentService = instantiationService.createInstance(TestExperimentService);
+		instantiationService.stub(IExperimentService, experimentService);
+
 		onModelAddedEvent = new Emitter<ITextModel>();
 
 		product.extensionTips = {
@@ -216,13 +221,17 @@ suite('ExtensionsTipsService Test', () => {
 		};
 	});
 
+	suiteTeardown(() => {
+		if (experimentService) {
+			experimentService.dispose();
+		}
+	});
+
 	setup(() => {
 		instantiationService.stub(IEnvironmentService, { extensionDevelopmentPath: false });
 		instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', []);
 		instantiationService.stub(IExtensionGalleryService, 'isEnabled', true);
 		instantiationService.stubPromise(IExtensionGalleryService, 'query', aPage<IGalleryExtension>(...mockExtensionGallery));
-		extensionsWorkbenchService = instantiationService.createInstance(ExtensionsWorkbenchService);
-		instantiationService.stub(IExtensionsWorkbenchService, extensionsWorkbenchService);
 
 		prompted = false;
 
@@ -243,27 +252,29 @@ suite('ExtensionsTipsService Test', () => {
 		});
 	});
 
-	teardown((done) => {
+	teardown(done => {
 		(<ExtensionTipsService>testObject).dispose();
-		(<ExtensionsWorkbenchService>extensionsWorkbenchService).dispose();
 		if (parentResource) {
 			extfs.del(parentResource, os.tmpdir(), () => { }, done);
+		} else {
+			done();
 		}
 	});
 
-	function setUpFolderWorkspace(folderName: string, recommendedExtensions: string[]): TPromise<void> {
+	function setUpFolderWorkspace(folderName: string, recommendedExtensions: string[], ignoredRecommendations: string[] = []): TPromise<void> {
 		const id = uuid.generateUuid();
 		parentResource = path.join(os.tmpdir(), 'vsctests', id);
-		return setUpFolder(folderName, parentResource, recommendedExtensions);
+		return setUpFolder(folderName, parentResource, recommendedExtensions, ignoredRecommendations);
 	}
 
-	function setUpFolder(folderName: string, parentDir: string, recommendedExtensions: string[]): TPromise<void> {
+	function setUpFolder(folderName: string, parentDir: string, recommendedExtensions: string[], ignoredRecommendations: string[] = []): TPromise<void> {
 		const folderDir = path.join(parentDir, folderName);
 		const workspaceSettingsDir = path.join(folderDir, '.vscode');
 		return mkdirp(workspaceSettingsDir, 493).then(() => {
 			const configPath = path.join(workspaceSettingsDir, 'extensions.json');
 			fs.writeFileSync(configPath, JSON.stringify({
-				'recommendations': recommendedExtensions
+				'recommendations': recommendedExtensions,
+				'unwantedRecommendations': ignoredRecommendations,
 			}, null, '\t'));
 
 			const myWorkspace = testWorkspace(URI.from({ scheme: 'file', path: folderDir }));
@@ -276,7 +287,7 @@ suite('ExtensionsTipsService Test', () => {
 	function testNoPromptForValidRecommendations(recommendations: string[]) {
 		return setUpFolderWorkspace('myFolder', recommendations).then(() => {
 			testObject = instantiationService.createInstance(ExtensionTipsService);
-			return testObject.promptWorkspaceRecommendationsPromise.then(() => {
+			return testObject.loadWorkspaceConfigPromise.then(() => {
 				assert.equal(Object.keys(testObject.getAllRecommendationsWithReason()).length, recommendations.length);
 				assert.ok(!prompted);
 			});
@@ -286,7 +297,7 @@ suite('ExtensionsTipsService Test', () => {
 	function testNoPromptOrRecommendationsForValidRecommendations(recommendations: string[]) {
 		return setUpFolderWorkspace('myFolder', mockTestData.validRecommendedExtensions).then(() => {
 			testObject = instantiationService.createInstance(ExtensionTipsService);
-			assert.equal(!testObject.promptWorkspaceRecommendationsPromise, true);
+			assert.equal(!testObject.loadWorkspaceConfigPromise, true);
 			assert.ok(!prompted);
 
 			return testObject.getWorkspaceRecommendations().then(() => {
@@ -297,12 +308,15 @@ suite('ExtensionsTipsService Test', () => {
 	}
 
 	test('ExtensionTipsService: No Prompt for valid workspace recommendations when galleryService is absent', () => {
-		instantiationService.stub(IExtensionGalleryService, 'isEnabled', false);
-		return testNoPromptOrRecommendationsForValidRecommendations(mockTestData.validRecommendedExtensions);
+		const galleryQuerySpy = sinon.spy();
+		instantiationService.stub(IExtensionGalleryService, { query: galleryQuerySpy, isEnabled: () => false });
+
+		return testNoPromptOrRecommendationsForValidRecommendations(mockTestData.validRecommendedExtensions)
+			.then(() => assert.ok(galleryQuerySpy.notCalled));
 	});
 
 	test('ExtensionTipsService: No Prompt for valid workspace recommendations during extension development', () => {
-		instantiationService.stub(IEnvironmentService, { extensionDevelopmentPath: true });
+		instantiationService.stub(IEnvironmentService, { extensionDevelopmentLocationURI: true });
 		return testNoPromptOrRecommendationsForValidRecommendations(mockTestData.validRecommendedExtensions);
 	});
 
@@ -313,7 +327,7 @@ suite('ExtensionsTipsService Test', () => {
 	test('ExtensionTipsService: Prompt for valid workspace recommendations', () => {
 		return setUpFolderWorkspace('myFolder', mockTestData.recommendedExtensions).then(() => {
 			testObject = instantiationService.createInstance(ExtensionTipsService);
-			return testObject.promptWorkspaceRecommendationsPromise.then(() => {
+			return testObject.loadWorkspaceConfigPromise.then(() => {
 				const recommendations = Object.keys(testObject.getAllRecommendationsWithReason());
 
 				assert.equal(recommendations.length, mockTestData.validRecommendedExtensions.length);
@@ -345,7 +359,7 @@ suite('ExtensionsTipsService Test', () => {
 		testConfigurationService.setUserConfiguration(ConfigurationKey, { showRecommendationsOnlyOnDemand: true });
 		return setUpFolderWorkspace('myFolder', mockTestData.validRecommendedExtensions).then(() => {
 			testObject = instantiationService.createInstance(ExtensionTipsService);
-			return testObject.promptWorkspaceRecommendationsPromise.then(() => {
+			return testObject.loadWorkspaceConfigPromise.then(() => {
 				assert.equal(Object.keys(testObject.getAllRecommendationsWithReason()).length, 0);
 				assert.ok(!prompted);
 			});
@@ -357,17 +371,158 @@ suite('ExtensionsTipsService Test', () => {
 		return testNoPromptForValidRecommendations(mockTestData.validRecommendedExtensions);
 	});
 
+	test('ExtensionTipsService: No Recommendations of globally ignored recommendations', () => {
+		const storageGetterStub = (a, _, c) => {
+			const storedRecommendations = '["ms-vscode.csharp", "ms-python.python", "eg2.tslint"]';
+			const ignoredRecommendations = '["ms-vscode.csharp", "mockpublisher2.mockextension2"]'; // ignore a stored recommendation and a workspace recommendation.
+			if (a === 'extensionsAssistant/recommendations') { return storedRecommendations; }
+			if (a === 'extensionsAssistant/ignored_recommendations') { return ignoredRecommendations; }
+			return c;
+		};
+
+		instantiationService.stub(IStorageService, {
+			get: storageGetterStub,
+			getBoolean: (a, _, c) => a === 'extensionsAssistant/workspaceRecommendationsIgnore' || c
+		});
+
+		return setUpFolderWorkspace('myFolder', mockTestData.validRecommendedExtensions).then(() => {
+			testObject = instantiationService.createInstance(ExtensionTipsService);
+			return testObject.loadWorkspaceConfigPromise.then(() => {
+				const recommendations = testObject.getAllRecommendationsWithReason();
+				assert.ok(!recommendations['ms-vscode.csharp']); // stored recommendation that has been globally ignored
+				assert.ok(recommendations['ms-python.python']); // stored recommendation
+				assert.ok(recommendations['mockpublisher1.mockextension1']); // workspace recommendation
+				assert.ok(!recommendations['mockpublisher2.mockextension2']); // workspace recommendation that has been globally ignored
+			});
+		});
+	});
+
+	test('ExtensionTipsService: No Recommendations of workspace ignored recommendations', () => {
+		const ignoredRecommendations = ['ms-vscode.csharp', 'mockpublisher2.mockextension2']; // ignore a stored recommendation and a workspace recommendation.
+		const storedRecommendations = '["ms-vscode.csharp", "ms-python.python"]';
+		instantiationService.stub(IStorageService, {
+			get: (a, b, c) => a === 'extensionsAssistant/recommendations' ? storedRecommendations : c,
+			getBoolean: (a, _, c) => a === 'extensionsAssistant/workspaceRecommendationsIgnore' || c
+		});
+
+		return setUpFolderWorkspace('myFolder', mockTestData.validRecommendedExtensions, ignoredRecommendations).then(() => {
+			testObject = instantiationService.createInstance(ExtensionTipsService);
+			return testObject.loadWorkspaceConfigPromise.then(() => {
+				const recommendations = testObject.getAllRecommendationsWithReason();
+				assert.ok(!recommendations['ms-vscode.csharp']); // stored recommendation that has been workspace ignored
+				assert.ok(recommendations['ms-python.python']); // stored recommendation
+				assert.ok(recommendations['mockpublisher1.mockextension1']); // workspace recommendation
+				assert.ok(!recommendations['mockpublisher2.mockextension2']); // workspace recommendation that has been workspace ignored
+			});
+		});
+	});
+
+	test('ExtensionTipsService: Able to retrieve collection of all ignored recommendations', () => {
+
+		const storageGetterStub = (a, _, c) => {
+			const storedRecommendations = '["ms-vscode.csharp", "ms-python.python"]';
+			const globallyIgnoredRecommendations = '["mockpublisher2.mockextension2"]'; // ignore a workspace recommendation.
+			if (a === 'extensionsAssistant/recommendations') { return storedRecommendations; }
+			if (a === 'extensionsAssistant/ignored_recommendations') { return globallyIgnoredRecommendations; }
+			return c;
+		};
+
+		const workspaceIgnoredRecommendations = ['ms-vscode.csharp']; // ignore a stored recommendation and a workspace recommendation.
+		instantiationService.stub(IStorageService, {
+			get: storageGetterStub,
+			getBoolean: (a, _, c) => a === 'extensionsAssistant/workspaceRecommendationsIgnore' || c
+		});
+
+		return setUpFolderWorkspace('myFolder', mockTestData.validRecommendedExtensions, workspaceIgnoredRecommendations).then(() => {
+			testObject = instantiationService.createInstance(ExtensionTipsService);
+			return testObject.loadWorkspaceConfigPromise.then(() => {
+				const recommendations = testObject.getAllRecommendationsWithReason();
+				assert.ok(recommendations['ms-python.python']);
+
+				assert.ok(!recommendations['mockpublisher2.mockextension2']);
+				assert.ok(!recommendations['ms-vscode.csharp']);
+			});
+		});
+	});
+
+	test('ExtensionTipsService: Able to dynamically ignore/unignore global recommendations', () => {
+		const storageGetterStub = (a, _, c) => {
+			const storedRecommendations = '["ms-vscode.csharp", "ms-python.python"]';
+			const globallyIgnoredRecommendations = '["mockpublisher2.mockextension2"]'; // ignore a workspace recommendation.
+			if (a === 'extensionsAssistant/recommendations') { return storedRecommendations; }
+			if (a === 'extensionsAssistant/ignored_recommendations') { return globallyIgnoredRecommendations; }
+			return c;
+		};
+
+		instantiationService.stub(IStorageService, {
+			get: storageGetterStub,
+			store: () => { },
+			getBoolean: (a, _, c) => a === 'extensionsAssistant/workspaceRecommendationsIgnore' || c
+		});
+
+		return setUpFolderWorkspace('myFolder', mockTestData.validRecommendedExtensions).then(() => {
+			testObject = instantiationService.createInstance(ExtensionTipsService);
+			return testObject.loadWorkspaceConfigPromise.then(() => {
+				const recommendations = testObject.getAllRecommendationsWithReason();
+				assert.ok(recommendations['ms-python.python']);
+				assert.ok(recommendations['mockpublisher1.mockextension1']);
+
+				assert.ok(!recommendations['mockpublisher2.mockextension2']);
+
+				return testObject.toggleIgnoredRecommendation('mockpublisher1.mockextension1', true);
+			}).then(() => {
+				const recommendations = testObject.getAllRecommendationsWithReason();
+				assert.ok(recommendations['ms-python.python']);
+
+				assert.ok(!recommendations['mockpublisher1.mockextension1']);
+				assert.ok(!recommendations['mockpublisher2.mockextension2']);
+
+				return testObject.toggleIgnoredRecommendation('mockpublisher1.mockextension1', false);
+			}).then(() => {
+				const recommendations = testObject.getAllRecommendationsWithReason();
+				assert.ok(recommendations['ms-python.python']);
+
+				assert.ok(recommendations['mockpublisher1.mockextension1']);
+				assert.ok(!recommendations['mockpublisher2.mockextension2']);
+			});
+		});
+	});
+
+	test('test global extensions are modified and recommendation change event is fired when an extension is ignored', () => {
+		const storageSetterTarget = sinon.spy();
+		const changeHandlerTarget = sinon.spy();
+		const ignoredExtensionId = 'Some.Extension';
+		instantiationService.stub(IStorageService, {
+			get: (a, b, c) => a === 'extensionsAssistant/ignored_recommendations' ? '["ms-vscode.vscode"]' : c,
+			store: (...args) => {
+				storageSetterTarget(...args);
+			}
+		});
+
+		return setUpFolderWorkspace('myFolder', []).then(() => {
+			testObject = instantiationService.createInstance(ExtensionTipsService);
+			testObject.onRecommendationChange(changeHandlerTarget);
+			testObject.toggleIgnoredRecommendation(ignoredExtensionId, true);
+
+			assert.ok(changeHandlerTarget.calledOnce);
+			assert.ok(changeHandlerTarget.getCall(0).calledWithMatch({ extensionId: 'Some.Extension', isRecommended: false }));
+			assert.ok(storageSetterTarget.calledWithExactly('extensionsAssistant/ignored_recommendations', `["ms-vscode.vscode","${ignoredExtensionId.toLowerCase()}"]`, StorageScope.GLOBAL));
+		});
+	});
+
 	test('ExtensionTipsService: Get file based recommendations from storage (old format)', () => {
 		const storedRecommendations = '["ms-vscode.csharp", "ms-python.python", "eg2.tslint"]';
 		instantiationService.stub(IStorageService, { get: (a, b, c) => a === 'extensionsAssistant/recommendations' ? storedRecommendations : c });
 
 		return setUpFolderWorkspace('myFolder', []).then(() => {
 			testObject = instantiationService.createInstance(ExtensionTipsService);
-			const recommendations = testObject.getFileBasedRecommendations();
-			assert.equal(recommendations.length, 2);
-			assert.ok(recommendations.indexOf('ms-vscode.csharp') > -1); // stored recommendation that exists in product.extensionTips
-			assert.ok(recommendations.indexOf('ms-python.python') > -1); // stored recommendation that exists in product.extensionImportantTips
-			assert.ok(recommendations.indexOf('eg2.tslint') === -1); // stored recommendation that is no longer in neither product.extensionTips nor product.extensionImportantTips
+			return testObject.loadWorkspaceConfigPromise.then(() => {
+				const recommendations = testObject.getFileBasedRecommendations();
+				assert.equal(recommendations.length, 2);
+				assert.ok(recommendations.some(({ extensionId }) => extensionId === 'ms-vscode.csharp')); // stored recommendation that exists in product.extensionTips
+				assert.ok(recommendations.some(({ extensionId }) => extensionId === 'ms-python.python')); // stored recommendation that exists in product.extensionImportantTips
+				assert.ok(recommendations.every(({ extensionId }) => extensionId !== 'eg2.tslint')); // stored recommendation that is no longer in neither product.extensionTips nor product.extensionImportantTips
+			});
 		});
 	});
 
@@ -380,12 +535,14 @@ suite('ExtensionsTipsService Test', () => {
 
 		return setUpFolderWorkspace('myFolder', []).then(() => {
 			testObject = instantiationService.createInstance(ExtensionTipsService);
-			const recommendations = testObject.getFileBasedRecommendations();
-			assert.equal(recommendations.length, 2);
-			assert.ok(recommendations.indexOf('ms-vscode.csharp') > -1); // stored recommendation that exists in product.extensionTips
-			assert.ok(recommendations.indexOf('ms-python.python') > -1); // stored recommendation that exists in product.extensionImportantTips
-			assert.ok(recommendations.indexOf('eg2.tslint') === -1); // stored recommendation that is no longer in neither product.extensionTips nor product.extensionImportantTips
-			assert.ok(recommendations.indexOf('lukehoban.Go') === -1); //stored recommendation that is older than a week
+			return testObject.loadWorkspaceConfigPromise.then(() => {
+				const recommendations = testObject.getFileBasedRecommendations();
+				assert.equal(recommendations.length, 2);
+				assert.ok(recommendations.some(({ extensionId }) => extensionId === 'ms-vscode.csharp')); // stored recommendation that exists in product.extensionTips
+				assert.ok(recommendations.some(({ extensionId }) => extensionId === 'ms-python.python')); // stored recommendation that exists in product.extensionImportantTips
+				assert.ok(recommendations.every(({ extensionId }) => extensionId !== 'eg2.tslint')); // stored recommendation that is no longer in neither product.extensionTips nor product.extensionImportantTips
+				assert.ok(recommendations.every(({ extensionId }) => extensionId !== 'lukehoban.Go')); //stored recommendation that is older than a week
+			});
 		});
 	});
 });
diff --git a/src/vs/workbench/parts/extensions/test/electron-browser/extensionsWorkbenchService.test.ts b/src/vs/workbench/parts/extensions/test/electron-browser/extensionsWorkbenchService.test.ts
index 40c885f86e0..3c2dbfeb066 100644
--- a/src/vs/workbench/parts/extensions/test/electron-browser/extensionsWorkbenchService.test.ts
+++ b/src/vs/workbench/parts/extensions/test/electron-browser/extensionsWorkbenchService.test.ts
@@ -11,13 +11,13 @@ import * as fs from 'fs';
 import { assign } from 'vs/base/common/objects';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { generateUuid } from 'vs/base/common/uuid';
-import { IExtensionsWorkbenchService, ExtensionState } from 'vs/workbench/parts/extensions/common/extensions';
+import { IExtensionsWorkbenchService, ExtensionState, AutoCheckUpdatesConfigurationKey, AutoUpdateConfigurationKey } from 'vs/workbench/parts/extensions/common/extensions';
 import { ExtensionsWorkbenchService } from 'vs/workbench/parts/extensions/node/extensionsWorkbenchService';
 import {
 	IExtensionManagementService, IExtensionGalleryService, IExtensionEnablementService, IExtensionTipsService, ILocalExtension, LocalExtensionType, IGalleryExtension,
 	DidInstallExtensionEvent, DidUninstallExtensionEvent, InstallExtensionEvent, IGalleryExtensionAssets, IExtensionIdentifier, EnablementState, InstallOperation
 } from 'vs/platform/extensionManagement/common/extensionManagement';
-import { getGalleryExtensionId } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
+import { getGalleryExtensionId, getGalleryExtensionIdFromLocal } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
 import { ExtensionManagementService, getLocalExtensionIdFromGallery, getLocalExtensionIdFromManifest } from 'vs/platform/extensionManagement/node/extensionManagementService';
 import { ExtensionTipsService } from 'vs/workbench/parts/extensions/electron-browser/extensionTipsService';
 import { TestExtensionEnablementService } from 'vs/platform/extensionManagement/test/common/extensionEnablementService.test';
@@ -33,13 +33,14 @@ import { TestContextService, TestWindowService } from 'vs/workbench/test/workben
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { ILogService, NullLogService } from 'vs/platform/log/common/log';
 import { IWindowService } from 'vs/platform/windows/common/windows';
-import { IProgressService2 } from 'vs/platform/progress/common/progress';
+import { IProgressService2 } from 'vs/workbench/services/progress/common/progress';
 import { ProgressService2 } from 'vs/workbench/services/progress/browser/progressService2';
-import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
 import { INotificationService } from 'vs/platform/notification/common/notification';
 import { URLService } from 'vs/platform/url/common/urlService';
+import { URI } from 'vs/base/common/uri';
+import { CancellationToken } from 'vs/base/common/cancellation';
 
-suite('ExtensionsWorkbenchService Test', () => {
+suite('ExtensionsWorkbenchServiceTest', () => {
 
 	let instantiationService: TestInstantiationService;
 	let testObject: IExtensionsWorkbenchService;
@@ -65,7 +66,14 @@ suite('ExtensionsWorkbenchService Test', () => {
 		instantiationService.stub(IURLService, URLService);
 
 		instantiationService.stub(IWorkspaceContextService, new TestContextService());
-		instantiationService.stub(IConfigurationService, { onDidUpdateConfiguration: () => { }, onDidChangeConfiguration: () => { }, getConfiguration: () => ({}) });
+		instantiationService.stub(IConfigurationService, {
+			onDidUpdateConfiguration: () => { },
+			onDidChangeConfiguration: () => { },
+			getConfiguration: () => ({}),
+			getValue: (key) => {
+				return (key === AutoCheckUpdatesConfigurationKey || key === AutoUpdateConfigurationKey) ? true : undefined;
+			}
+		});
 
 		instantiationService.stub(IExtensionManagementService, ExtensionManagementService);
 		instantiationService.stub(IExtensionManagementService, 'onInstallExtension', installEvent.event);
@@ -75,20 +83,17 @@ suite('ExtensionsWorkbenchService Test', () => {
 
 		instantiationService.stub(IExtensionEnablementService, new TestExtensionEnablementService(instantiationService));
 
-		instantiationService.stub(IExtensionTipsService, ExtensionTipsService);
-		instantiationService.stub(IExtensionTipsService, 'getKeymapRecommendations', () => []);
+		instantiationService.set(IExtensionTipsService, instantiationService.createInstance(ExtensionTipsService));
 
 		instantiationService.stub(INotificationService, { prompt: () => null });
-		instantiationService.stub(IDialogService, { show: () => TPromise.as(0) });
 	});
 
-	setup(() => {
+	setup(async () => {
 		instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', []);
 		instantiationService.stubPromise(IExtensionManagementService, 'getExtensionsReport', []);
 		instantiationService.stubPromise(IExtensionGalleryService, 'query', aPage());
-		instantiationService.stub(IDialogService, { show: () => TPromise.as(0) });
 		instantiationService.stubPromise(INotificationService, 'prompt', 0);
-		(<TestExtensionEnablementService>instantiationService.get(IExtensionEnablementService)).reset();
+		await (<TestExtensionEnablementService>instantiationService.get(IExtensionEnablementService)).reset();
 	});
 
 	teardown(() => {
@@ -165,7 +170,7 @@ suite('ExtensionsWorkbenchService Test', () => {
 				type: LocalExtensionType.User,
 				readmeUrl: 'localReadmeUrl1',
 				changelogUrl: 'localChangelogUrl1',
-				path: 'localPath1'
+				location: URI.file('localPath1')
 			});
 		const expected2 = aLocalExtension('local2', {
 			publisher: 'localPublisher2',
@@ -211,7 +216,7 @@ suite('ExtensionsWorkbenchService Test', () => {
 		assert.equal('1.2.0', actual.version);
 		assert.equal('1.2.0', actual.latestVersion);
 		assert.equal('localDescription2', actual.description);
-		assert.ok(fs.existsSync(actual.iconUrl));
+		assert.ok(fs.existsSync(URI.parse(actual.iconUrl).fsPath));
 		assert.equal(null, actual.licenseUrl);
 		assert.equal(ExtensionState.Installed, actual.state);
 		assert.equal(null, actual.installCount);
@@ -233,7 +238,7 @@ suite('ExtensionsWorkbenchService Test', () => {
 				type: LocalExtensionType.User,
 				readmeUrl: 'localReadmeUrl1',
 				changelogUrl: 'localChangelogUrl1',
-				path: 'localPath1'
+				location: URI.file('localPath1')
 			});
 		const local2 = aLocalExtension('local2', {
 			publisher: 'localPublisher2',
@@ -304,7 +309,7 @@ suite('ExtensionsWorkbenchService Test', () => {
 			assert.equal('1.2.0', actual.version);
 			assert.equal('1.2.0', actual.latestVersion);
 			assert.equal('localDescription2', actual.description);
-			assert.ok(fs.existsSync(actual.iconUrl));
+			assert.ok(fs.existsSync(URI.parse(actual.iconUrl).fsPath));
 			assert.equal(null, actual.licenseUrl);
 			assert.equal(ExtensionState.Installed, actual.state);
 			assert.equal(null, actual.installCount);
@@ -470,7 +475,7 @@ suite('ExtensionsWorkbenchService Test', () => {
 		instantiationService.stubPromise(IExtensionGalleryService, 'query', aPage(aGalleryExtension('a')));
 
 		return testObject.queryGallery().then(page => {
-			return testObject.loadDependencies(page.firstPage[0]).then(dependencies => {
+			return testObject.loadDependencies(page.firstPage[0], CancellationToken.None).then(dependencies => {
 				assert.equal(null, dependencies);
 			});
 		});
@@ -483,7 +488,7 @@ suite('ExtensionsWorkbenchService Test', () => {
 
 		return testObject.queryGallery().then(page => {
 			const extension = page.firstPage[0];
-			return testObject.loadDependencies(extension).then(actual => {
+			return testObject.loadDependencies(extension, CancellationToken.None).then(actual => {
 				assert.ok(actual.hasDependencies);
 				assert.equal(extension, actual.extension);
 				assert.equal(null, actual.dependent);
@@ -522,7 +527,7 @@ suite('ExtensionsWorkbenchService Test', () => {
 
 		return testObject.queryGallery().then(page => {
 			const extension = page.firstPage[0];
-			return testObject.loadDependencies(extension).then(actual => {
+			return testObject.loadDependencies(extension, CancellationToken.None).then(actual => {
 				assert.ok(actual.hasDependencies);
 				assert.equal(extension, actual.extension);
 				assert.equal(null, actual.dependent);
@@ -554,7 +559,7 @@ suite('ExtensionsWorkbenchService Test', () => {
 
 		return testObject.queryGallery().then(page => {
 			const extension = page.firstPage[0];
-			return testObject.loadDependencies(extension).then(actual => {
+			return testObject.loadDependencies(extension, CancellationToken.None).then(actual => {
 				assert.ok(actual.hasDependencies);
 				assert.equal(extension, actual.extension);
 				assert.equal(null, actual.dependent);
@@ -588,7 +593,7 @@ suite('ExtensionsWorkbenchService Test', () => {
 
 		return testObject.queryGallery().then(page => {
 			const extension = page.firstPage[0];
-			return testObject.loadDependencies(extension).then(actual => {
+			return testObject.loadDependencies(extension, CancellationToken.None).then(actual => {
 				assert.ok(actual.hasDependencies);
 				assert.equal(extension, actual.extension);
 				assert.equal(null, actual.dependent);
@@ -626,7 +631,7 @@ suite('ExtensionsWorkbenchService Test', () => {
 
 		return testObject.queryGallery().then(page => {
 			const extension = page.firstPage[0];
-			return testObject.loadDependencies(extension).then(a => {
+			return testObject.loadDependencies(extension, CancellationToken.None).then(a => {
 				assert.ok(a.hasDependencies);
 				assert.equal(extension, a.extension);
 				assert.equal(null, a.dependent);
@@ -840,7 +845,6 @@ suite('ExtensionsWorkbenchService Test', () => {
 			.then(() => instantiationService.get(IExtensionEnablementService).setEnablement(extensionC, EnablementState.Enabled))
 			.then(() => {
 				instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [extensionA, extensionB, extensionC]);
-				instantiationService.stubPromise(IDialogService, 'show', 1);
 				testObject = instantiationService.createInstance(ExtensionsWorkbenchService);
 
 				return testObject.setEnablement(testObject.local[0], EnablementState.Disabled)
@@ -851,8 +855,28 @@ suite('ExtensionsWorkbenchService Test', () => {
 			});
 	});
 
-	test('test disable extension with dependencies disable all', () => {
-		const extensionA = aLocalExtension('a', { extensionDependencies: ['pub.b'] });
+	test('test disable extension pack disables the pack', () => {
+		const extensionA = aLocalExtension('a', { extensionPack: ['pub.b'] });
+		const extensionB = aLocalExtension('b');
+		const extensionC = aLocalExtension('c');
+
+		return instantiationService.get(IExtensionEnablementService).setEnablement(extensionA, EnablementState.Enabled)
+			.then(() => instantiationService.get(IExtensionEnablementService).setEnablement(extensionB, EnablementState.Enabled))
+			.then(() => instantiationService.get(IExtensionEnablementService).setEnablement(extensionC, EnablementState.Enabled))
+			.then(() => {
+				instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [extensionA, extensionB, extensionC]);
+				testObject = instantiationService.createInstance(ExtensionsWorkbenchService);
+
+				return testObject.setEnablement(testObject.local[0], EnablementState.Disabled)
+					.then(() => {
+						assert.equal(testObject.local[0].enablementState, EnablementState.Disabled);
+						assert.equal(testObject.local[1].enablementState, EnablementState.Disabled);
+					});
+			});
+	});
+
+	test('test disable extension pack disable all', () => {
+		const extensionA = aLocalExtension('a', { extensionPack: ['pub.b'] });
 		const extensionB = aLocalExtension('b');
 		const extensionC = aLocalExtension('c');
 
@@ -861,7 +885,6 @@ suite('ExtensionsWorkbenchService Test', () => {
 			.then(() => instantiationService.get(IExtensionEnablementService).setEnablement(extensionC, EnablementState.Enabled))
 			.then(() => {
 				instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [extensionA, extensionB, extensionC]);
-				instantiationService.stubPromise(IDialogService, 'show', 0);
 				testObject = instantiationService.createInstance(ExtensionsWorkbenchService);
 
 				return testObject.setEnablement(testObject.local[0], EnablementState.Disabled)
@@ -887,6 +910,24 @@ suite('ExtensionsWorkbenchService Test', () => {
 			});
 	});
 
+	test('test disable extension when extension is part of a pack', () => {
+		const extensionA = aLocalExtension('a', { extensionPack: ['pub.b'] });
+		const extensionB = aLocalExtension('b');
+		const extensionC = aLocalExtension('c');
+
+		return instantiationService.get(IExtensionEnablementService).setEnablement(extensionA, EnablementState.Enabled)
+			.then(() => instantiationService.get(IExtensionEnablementService).setEnablement(extensionB, EnablementState.Enabled))
+			.then(() => instantiationService.get(IExtensionEnablementService).setEnablement(extensionC, EnablementState.Enabled))
+			.then(() => {
+				instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [extensionA, extensionB, extensionC]);
+				testObject = instantiationService.createInstance(ExtensionsWorkbenchService);
+				return testObject.setEnablement(testObject.local[1], EnablementState.Disabled)
+					.then(() => {
+						assert.equal(testObject.local[1].enablementState, EnablementState.Disabled);
+					});
+			});
+	});
+
 	test('test disable both dependency and dependent do not promot and do not fail', () => {
 		const extensionA = aLocalExtension('a', { extensionDependencies: ['pub.b'] });
 		const extensionB = aLocalExtension('b');
@@ -898,7 +939,6 @@ suite('ExtensionsWorkbenchService Test', () => {
 			.then(() => {
 				instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [extensionA, extensionB, extensionC]);
 				const target = sinon.spy();
-				instantiationService.stub(IDialogService, 'show', Promise.resolve().then(target));
 				testObject = instantiationService.createInstance(ExtensionsWorkbenchService);
 
 				return testObject.setEnablement([testObject.local[1], testObject.local[0]], EnablementState.Disabled)
@@ -921,7 +961,6 @@ suite('ExtensionsWorkbenchService Test', () => {
 			.then(() => {
 				instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [extensionA, extensionB, extensionC]);
 				const target = sinon.spy();
-				instantiationService.stub(IDialogService, 'show', Promise.resolve().then(target));
 				testObject = instantiationService.createInstance(ExtensionsWorkbenchService);
 
 				return testObject.setEnablement([testObject.local[1], testObject.local[0]], EnablementState.Enabled)
@@ -943,7 +982,6 @@ suite('ExtensionsWorkbenchService Test', () => {
 			.then(() => instantiationService.get(IExtensionEnablementService).setEnablement(extensionC, EnablementState.Enabled))
 			.then(() => {
 				instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [extensionA, extensionB, extensionC]);
-				instantiationService.stubPromise(IDialogService, 'show', 1);
 				testObject = instantiationService.createInstance(ExtensionsWorkbenchService);
 
 				return testObject.setEnablement(testObject.local[0], EnablementState.Disabled)
@@ -953,22 +991,6 @@ suite('ExtensionsWorkbenchService Test', () => {
 			});
 	});
 
-	test('test disable extension fails if its dependency is a dependent of other', () => {
-		const extensionA = aLocalExtension('a', { extensionDependencies: ['pub.b'] });
-		const extensionB = aLocalExtension('b');
-		const extensionC = aLocalExtension('c', { extensionDependencies: ['pub.b'] });
-
-		return instantiationService.get(IExtensionEnablementService).setEnablement(extensionA, EnablementState.Enabled)
-			.then(() => instantiationService.get(IExtensionEnablementService).setEnablement(extensionB, EnablementState.Enabled))
-			.then(() => instantiationService.get(IExtensionEnablementService).setEnablement(extensionC, EnablementState.Enabled))
-			.then(() => {
-				instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [extensionA, extensionB, extensionC]);
-				instantiationService.stubPromise(IDialogService, 'show', 0);
-				testObject = instantiationService.createInstance(ExtensionsWorkbenchService);
-				return testObject.setEnablement(testObject.local[0], EnablementState.Disabled).then(() => assert.fail('Should fail'), error => assert.ok(true));
-			});
-	});
-
 	test('test disable extension if its dependency is a dependent of other disabled extension', () => {
 		const extensionA = aLocalExtension('a', { extensionDependencies: ['pub.b'] });
 		const extensionB = aLocalExtension('b');
@@ -979,14 +1001,11 @@ suite('ExtensionsWorkbenchService Test', () => {
 			.then(() => instantiationService.get(IExtensionEnablementService).setEnablement(extensionC, EnablementState.Disabled))
 			.then(() => {
 				instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [extensionA, extensionB, extensionC]);
-				instantiationService.stubPromise(IDialogService, 'show', 0);
-
 				testObject = instantiationService.createInstance(ExtensionsWorkbenchService);
 
 				return testObject.setEnablement(testObject.local[0], EnablementState.Disabled)
 					.then(() => {
 						assert.equal(testObject.local[0].enablementState, EnablementState.Disabled);
-						assert.equal(testObject.local[1].enablementState, EnablementState.Disabled);
 					});
 			});
 	});
@@ -1001,15 +1020,10 @@ suite('ExtensionsWorkbenchService Test', () => {
 			.then(() => instantiationService.get(IExtensionEnablementService).setEnablement(extensionC, EnablementState.Enabled))
 			.then(() => {
 				instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [extensionA, extensionB, extensionC]);
-				instantiationService.stubPromise(IDialogService, 'show', 0);
-
 				testObject = instantiationService.createInstance(ExtensionsWorkbenchService);
 
 				return testObject.setEnablement(testObject.local[0], EnablementState.Disabled)
-					.then(() => {
-						assert.equal(testObject.local[0].enablementState, EnablementState.Disabled);
-						assert.equal(testObject.local[1].enablementState, EnablementState.Disabled);
-					});
+					.then(() => assert.fail('An extension with dependent should not be disabled'), () => null);
 			});
 	});
 
@@ -1023,7 +1037,6 @@ suite('ExtensionsWorkbenchService Test', () => {
 			.then(() => instantiationService.get(IExtensionEnablementService).setEnablement(extensionC, EnablementState.Enabled))
 			.then(() => {
 				instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [extensionA, extensionB, extensionC]);
-				instantiationService.stubPromise(IDialogService, 'show', 0);
 
 				testObject = instantiationService.createInstance(ExtensionsWorkbenchService);
 
@@ -1042,16 +1055,9 @@ suite('ExtensionsWorkbenchService Test', () => {
 			.then(() => instantiationService.get(IExtensionEnablementService).setEnablement(extensionC, EnablementState.Enabled))
 			.then(() => {
 				instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [extensionA, extensionB, extensionC]);
-				instantiationService.stubPromise(IDialogService, 'show', 0);
-
 				testObject = instantiationService.createInstance(ExtensionsWorkbenchService);
-
 				return testObject.setEnablement(testObject.local[0], EnablementState.Disabled)
-					.then(() => {
-						assert.equal(testObject.local[0].enablementState, EnablementState.Disabled);
-						assert.equal(testObject.local[1].enablementState, EnablementState.Disabled);
-						assert.equal(testObject.local[1].enablementState, EnablementState.Disabled);
-					});
+					.then(() => assert.fail('An extension with dependent should not be disabled'), () => null);
 			});
 	});
 
@@ -1065,7 +1071,6 @@ suite('ExtensionsWorkbenchService Test', () => {
 			.then(() => instantiationService.get(IExtensionEnablementService).setEnablement(extensionC, EnablementState.Disabled))
 			.then(() => {
 				instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [extensionA, extensionB, extensionC]);
-				instantiationService.stubPromise(IDialogService, 'show', 0);
 				testObject = instantiationService.createInstance(ExtensionsWorkbenchService);
 
 				return testObject.setEnablement(testObject.local[0], EnablementState.Enabled)
@@ -1076,27 +1081,6 @@ suite('ExtensionsWorkbenchService Test', () => {
 			});
 	});
 
-	test('test enable extension with dependencies does not enable if cancelled', () => {
-		const extensionA = aLocalExtension('a', { extensionDependencies: ['pub.b'] });
-		const extensionB = aLocalExtension('b');
-		const extensionC = aLocalExtension('c');
-
-		return instantiationService.get(IExtensionEnablementService).setEnablement(extensionA, EnablementState.Disabled)
-			.then(() => instantiationService.get(IExtensionEnablementService).setEnablement(extensionB, EnablementState.Disabled))
-			.then(() => instantiationService.get(IExtensionEnablementService).setEnablement(extensionC, EnablementState.Disabled))
-			.then(() => {
-				instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [extensionA, extensionB, extensionC]);
-				instantiationService.stubPromise(IDialogService, 'show', 1);
-				testObject = instantiationService.createInstance(ExtensionsWorkbenchService);
-
-				return testObject.setEnablement(testObject.local[0], EnablementState.Enabled)
-					.then(() => {
-						assert.equal(testObject.local[0].enablementState, EnablementState.Disabled);
-						assert.equal(testObject.local[1].enablementState, EnablementState.Disabled);
-					});
-			});
-	});
-
 	test('test enable extension with dependencies does not prompt if dependency is enabled already', () => {
 		const extensionA = aLocalExtension('a', { extensionDependencies: ['pub.b'] });
 		const extensionB = aLocalExtension('b');
@@ -1108,7 +1092,6 @@ suite('ExtensionsWorkbenchService Test', () => {
 			.then(() => {
 				instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [extensionA, extensionB, extensionC]);
 				const target = sinon.spy();
-				instantiationService.stubPromise(IDialogService, 'show', Promise.resolve().then(target));
 				testObject = instantiationService.createInstance(ExtensionsWorkbenchService);
 
 				return testObject.setEnablement(testObject.local[0], EnablementState.Enabled)
@@ -1130,7 +1113,6 @@ suite('ExtensionsWorkbenchService Test', () => {
 			.then(() => {
 				instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [extensionA, extensionB, extensionC]);
 				const target = sinon.spy();
-				instantiationService.stubPromise(IDialogService, 'show', Promise.resolve().then(target));
 				testObject = instantiationService.createInstance(ExtensionsWorkbenchService);
 
 				return testObject.setEnablement([testObject.local[1], testObject.local[0]], EnablementState.Enabled)
@@ -1199,6 +1181,7 @@ suite('ExtensionsWorkbenchService Test', () => {
 		assign(localExtension.manifest, { name, publisher: 'pub', version: '1.0.0' }, manifest);
 		localExtension.identifier = { id: getLocalExtensionIdFromManifest(localExtension.manifest) };
 		localExtension.metadata = { id: localExtension.identifier.id, publisherId: localExtension.manifest.publisher, publisherDisplayName: 'somename' };
+		localExtension.galleryIdentifier = { id: getGalleryExtensionIdFromLocal(localExtension), uuid: void 0 };
 		return localExtension;
 	}
 
@@ -1236,4 +1219,4 @@ suite('ExtensionsWorkbenchService Test', () => {
 			});
 		});
 	}
-});
\ No newline at end of file
+});
diff --git a/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.ts b/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.ts
index 9f8b1102649..98e0bb8bfa2 100644
--- a/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.ts
+++ b/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.ts
@@ -5,7 +5,8 @@
 'use strict';
 
 import { Registry } from 'vs/platform/registry/common/platform';
-import { StatusbarAlignment, IStatusbarRegistry, Extensions, StatusbarItemDescriptor } from 'vs/workbench/browser/parts/statusbar/statusbar';
+import { IStatusbarRegistry, Extensions, StatusbarItemDescriptor } from 'vs/workbench/browser/parts/statusbar/statusbar';
+import { StatusbarAlignment } from 'vs/platform/statusbar/common/statusbar';
 import { FeedbackStatusbarItem } from 'vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem';
 import { localize } from 'vs/nls';
 import { IConfigurationRegistry, Extensions as ConfigurationExtensions } from 'vs/platform/configuration/common/configurationRegistry';
diff --git a/src/vs/workbench/parts/feedback/electron-browser/feedback.ts b/src/vs/workbench/parts/feedback/electron-browser/feedback.ts
index eb1e969e4a8..41d9127b72b 100644
--- a/src/vs/workbench/parts/feedback/electron-browser/feedback.ts
+++ b/src/vs/workbench/parts/feedback/electron-browser/feedback.ts
@@ -7,14 +7,12 @@
 
 import 'vs/css!./media/feedback';
 import * as nls from 'vs/nls';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { Builder, $ } from 'vs/base/browser/builder';
+import { IDisposable, dispose, Disposable } from 'vs/base/common/lifecycle';
 import { Dropdown } from 'vs/base/browser/ui/dropdown/dropdown';
 import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
 import product from 'vs/platform/node/product';
 import * as dom from 'vs/base/browser/dom';
 import { ICommandService } from 'vs/platform/commands/common/commands';
-import * as errors from 'vs/base/common/errors';
 import { IIntegrityService } from 'vs/platform/integrity/common/integrity';
 import { IThemeService, registerThemingParticipant, ITheme, ICssStyleCollector } from 'vs/platform/theme/common/themeService';
 import { attachButtonStyler, attachStylerCallback } from 'vs/platform/theme/common/styler';
@@ -31,45 +29,37 @@ export interface IFeedback {
 	sentiment: number;
 }
 
-export interface IFeedbackService {
+export interface IFeedbackDelegate {
 	submitFeedback(feedback: IFeedback): void;
 	getCharacterLimit(sentiment: number): number;
 }
 
 export interface IFeedbackDropdownOptions {
 	contextViewProvider: IContextViewService;
-	feedbackService?: IFeedbackService;
+	feedbackService?: IFeedbackDelegate;
 	onFeedbackVisibilityChange?: (visible: boolean) => void;
 }
 
-enum FormEvent {
-	SENDING,
-	SENT,
-	SEND_ERROR
-}
-
 export class FeedbackDropdown extends Dropdown {
 	private maxFeedbackCharacters: number;
 
-	private feedback: string;
-	private sentiment: number;
-	private isSendingFeedback: boolean;
+	private feedback: string = '';
+	private sentiment: number = 1;
 	private autoHideTimeout: number;
 
-	private feedbackService: IFeedbackService;
+	private feedbackDelegate: IFeedbackDelegate;
 
 	private feedbackForm: HTMLFormElement;
 	private feedbackDescriptionInput: HTMLTextAreaElement;
-	private smileyInput: Builder;
-	private frownyInput: Builder;
+	private smileyInput: HTMLElement;
+	private frownyInput: HTMLElement;
 	private sendButton: Button;
-	private $sendButton: Builder;
 	private hideButton: HTMLInputElement;
-	private remainingCharacterCount: Builder;
+	private remainingCharacterCount: HTMLElement;
 
 	private requestFeatureLink: string;
 
-	private _isPure: boolean;
+	private isPure: boolean = true;
 
 	constructor(
 		container: HTMLElement,
@@ -83,64 +73,56 @@ export class FeedbackDropdown extends Dropdown {
 		super(container, {
 			contextViewProvider: options.contextViewProvider,
 			labelRenderer: (container: HTMLElement): IDisposable => {
-				$(container).addClass('send-feedback', 'mask-icon');
+				dom.addClasses(container, 'send-feedback', 'mask-icon');
 
-				return null;
+				return Disposable.None;
 			}
 		});
 
-		this._isPure = true;
+		this.feedbackDelegate = options.feedbackService;
+		this.maxFeedbackCharacters = this.feedbackDelegate.getCharacterLimit(this.sentiment);
+		this.requestFeatureLink = product.sendASmile.requestFeatureUrl;
+
 		this.integrityService.isPure().then(result => {
 			if (!result.isPure) {
-				this._isPure = false;
+				this.isPure = false;
 			}
 		});
 
 		dom.addClass(this.element, 'send-feedback');
 		this.element.title = nls.localize('sendFeedback', "Tweet Feedback");
-
-		this.feedbackService = options.feedbackService;
-
-		this.feedback = '';
-		this.sentiment = 1;
-		this.maxFeedbackCharacters = this.feedbackService.getCharacterLimit(this.sentiment);
-
-		this.feedbackForm = null;
-		this.feedbackDescriptionInput = null;
-
-		this.smileyInput = null;
-		this.frownyInput = null;
-
-		this.sendButton = null;
-		this.$sendButton = null;
-
-		this.requestFeatureLink = product.sendASmile.requestFeatureUrl;
 	}
 
 	protected getAnchor(): HTMLElement | IAnchor {
-		const res = dom.getDomNodePagePosition(this.element);
+		const position = dom.getDomNodePagePosition(this.element);
 
 		return {
-			x: res.left,
-			y: res.top - 9, /* above the status bar */
-			width: res.width,
-			height: res.height
+			x: position.left + position.width, // center above the container
+			y: position.top - 9, // above status bar
+			width: position.width,
+			height: position.height
 		} as IAnchor;
 	}
 
 	protected renderContents(container: HTMLElement): IDisposable {
-		const $form = $('form.feedback-form').attr({
-			action: 'javascript:void(0);'
-		}).appendTo(container);
+		const disposables: IDisposable[] = [];
 
-		$(container).addClass('monaco-menu-container');
+		dom.addClass(container, 'monaco-menu-container');
 
-		this.feedbackForm = <HTMLFormElement>$form.getHTMLElement();
+		// Form
+		this.feedbackForm = dom.append(container, dom.$('form.feedback-form'));
+		this.feedbackForm.setAttribute('action', 'javascript:void(0);');
 
-		$('h2.title').text(nls.localize("label.sendASmile", "Tweet us your feedback.")).appendTo($form);
+		// Title
+		dom.append(this.feedbackForm, dom.$('h2.title')).textContent = nls.localize("label.sendASmile", "Tweet us your feedback.");
 
-		const cancelBtn = $('div.cancel').attr('tabindex', '0');
-		cancelBtn.on(dom.EventType.MOUSE_OVER, () => {
+		// Close Button (top right)
+		const closeBtn = dom.append(this.feedbackForm, dom.$('div.cancel'));
+		closeBtn.tabIndex = 0;
+		closeBtn.setAttribute('role', 'button');
+		closeBtn.title = nls.localize('close', "Close");
+
+		disposables.push(dom.addDisposableListener(closeBtn, dom.EventType.MOUSE_OVER, () => {
 			const theme = this.themeService.getTheme();
 			let darkenFactor: number;
 			switch (theme.type) {
@@ -153,119 +135,153 @@ export class FeedbackDropdown extends Dropdown {
 			}
 
 			if (darkenFactor) {
-				cancelBtn.getHTMLElement().style.backgroundColor = darken(theme.getColor(editorWidgetBackground), darkenFactor)(theme).toString();
+				closeBtn.style.backgroundColor = darken(theme.getColor(editorWidgetBackground), darkenFactor)(theme).toString();
 			}
-		});
-		cancelBtn.on(dom.EventType.MOUSE_OUT, () => {
-			cancelBtn.getHTMLElement().style.backgroundColor = null;
-		});
-		this.invoke(cancelBtn, () => {
-			this.hide();
-		}).appendTo($form);
+		}));
 
-		const $content = $('div.content').appendTo($form);
+		disposables.push(dom.addDisposableListener(closeBtn, dom.EventType.MOUSE_OUT, () => {
+			closeBtn.style.backgroundColor = null;
+		}));
 
-		const $sentimentContainer = $('div').appendTo($content);
-		if (!this._isPure) {
-			$('span').text(nls.localize("patchedVersion1", "Your installation is corrupt.")).appendTo($sentimentContainer);
-			$('br').appendTo($sentimentContainer);
-			$('span').text(nls.localize("patchedVersion2", "Please specify this if you submit a bug.")).appendTo($sentimentContainer);
-			$('br').appendTo($sentimentContainer);
+		this.invoke(closeBtn, disposables, () => this.hide());
+
+		// Content
+		const content = dom.append(this.feedbackForm, dom.$('div.content'));
+
+		// Sentiment Buttons
+		const sentimentContainer = dom.append(content, dom.$('div'));
+
+		if (!this.isPure) {
+			dom.append(sentimentContainer, dom.$('span')).textContent = nls.localize("patchedVersion1", "Your installation is corrupt.");
+			sentimentContainer.appendChild(document.createElement('br'));
+			dom.append(sentimentContainer, dom.$('span')).textContent = nls.localize("patchedVersion2", "Please specify this if you submit a bug.");
+			sentimentContainer.appendChild(document.createElement('br'));
 		}
-		$('span').text(nls.localize("sentiment", "How was your experience?")).appendTo($sentimentContainer);
 
-		const $feedbackSentiment = $('div.feedback-sentiment').appendTo($sentimentContainer);
+		dom.append(sentimentContainer, dom.$('span')).textContent = nls.localize("sentiment", "How was your experience?");
 
-		this.smileyInput = $('div').addClass('sentiment smile').attr({
-			'aria-checked': 'false',
-			'aria-label': nls.localize('smileCaption', "Happy"),
-			'tabindex': 0,
-			'role': 'checkbox'
-		});
-		this.invoke(this.smileyInput, () => { this.setSentiment(true); }).appendTo($feedbackSentiment);
+		const feedbackSentiment = dom.append(sentimentContainer, dom.$('div.feedback-sentiment'));
 
-		this.frownyInput = $('div').addClass('sentiment frown').attr({
-			'aria-checked': 'false',
-			'aria-label': nls.localize('frownCaption', "Sad"),
-			'tabindex': 0,
-			'role': 'checkbox'
-		});
+		// Sentiment: Smiley
+		this.smileyInput = dom.append(feedbackSentiment, dom.$('div.sentiment'));
+		dom.addClass(this.smileyInput, 'smile');
+		this.smileyInput.setAttribute('aria-checked', 'false');
+		this.smileyInput.setAttribute('aria-label', nls.localize('smileCaption', "Happy Feedback Sentiment"));
+		this.smileyInput.setAttribute('role', 'checkbox');
+		this.smileyInput.title = nls.localize('smileCaption', "Happy Feedback Sentiment");
+		this.smileyInput.tabIndex = 0;
 
-		this.invoke(this.frownyInput, () => { this.setSentiment(false); }).appendTo($feedbackSentiment);
+		this.invoke(this.smileyInput, disposables, () => this.setSentiment(true));
+
+		// Sentiment: Frowny
+		this.frownyInput = dom.append(feedbackSentiment, dom.$('div.sentiment'));
+		dom.addClass(this.frownyInput, 'frown');
+		this.frownyInput.setAttribute('aria-checked', 'false');
+		this.frownyInput.setAttribute('aria-label', nls.localize('frownCaption', "Sad Feedback Sentiment"));
+		this.frownyInput.setAttribute('role', 'checkbox');
+		this.frownyInput.title = nls.localize('frownCaption', "Sad Feedback Sentiment");
+		this.frownyInput.tabIndex = 0;
+
+		this.invoke(this.frownyInput, disposables, () => this.setSentiment(false));
 
 		if (this.sentiment === 1) {
-			this.smileyInput.addClass('checked').attr('aria-checked', 'true');
+			dom.addClass(this.smileyInput, 'checked');
+			this.smileyInput.setAttribute('aria-checked', 'true');
 		} else {
-			this.frownyInput.addClass('checked').attr('aria-checked', 'true');
+			dom.addClass(this.frownyInput, 'checked');
+			this.frownyInput.setAttribute('aria-checked', 'true');
 		}
 
-		const $contactUs = $('div.contactus').appendTo($content);
+		// Contact Us Box
+		const contactUsContainer = dom.append(content, dom.$('div.contactus'));
 
-		$('span').text(nls.localize("other ways to contact us", "Other ways to contact us")).appendTo($contactUs);
+		dom.append(contactUsContainer, dom.$('span')).textContent = nls.localize("other ways to contact us", "Other ways to contact us");
 
-		const $contactUsContainer = $('div.channels').appendTo($contactUs);
+		const channelsContainer = dom.append(contactUsContainer, dom.$('div.channels'));
 
-		$('div').append($('a').attr('target', '_blank').attr('href', '#').text(nls.localize("submit a bug", "Submit a bug")).attr('tabindex', '0'))
-			.on('click', event => {
-				dom.EventHelper.stop(event);
-				const actionId = 'workbench.action.openIssueReporter';
-				this.commandService.executeCommand(actionId).done(null, errors.onUnexpectedError);
+		// Contact: Submit a Bug
+		const submitBugLinkContainer = dom.append(channelsContainer, dom.$('div'));
 
-				/* __GDPR__
-					"workbenchActionExecuted" : {
-						"id" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-						"from": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-					}
-				*/
-				this.telemetryService.publicLog('workbenchActionExecuted', { id: actionId, from: 'feedback' });
-			})
-			.appendTo($contactUsContainer);
+		const submitBugLink = dom.append(submitBugLinkContainer, dom.$('a'));
+		submitBugLink.setAttribute('target', '_blank');
+		submitBugLink.setAttribute('href', '#');
+		submitBugLink.textContent = nls.localize("submit a bug", "Submit a bug");
+		submitBugLink.tabIndex = 0;
 
-		$('div').append($('a').attr('target', '_blank').attr('href', this.requestFeatureLink).text(nls.localize("request a missing feature", "Request a missing feature")).attr('tabindex', '0'))
-			.appendTo($contactUsContainer);
+		disposables.push(dom.addDisposableListener(submitBugLink, 'click', e => {
+			dom.EventHelper.stop(event);
+			const actionId = 'workbench.action.openIssueReporter';
+			this.commandService.executeCommand(actionId);
+			this.hide();
 
-		this.remainingCharacterCount = $('span.char-counter').text(this.getCharCountText(0));
+			/* __GDPR__
+				"workbenchActionExecuted" : {
+					"id" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+					"from": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+				}
+			*/
+			this.telemetryService.publicLog('workbenchActionExecuted', { id: actionId, from: 'feedback' });
+		}));
 
-		$('h3').text(nls.localize("tell us why?", "Tell us why?"))
-			.append(this.remainingCharacterCount)
-			.appendTo($form);
+		// Contact: Request a Feature
+		if (!!this.requestFeatureLink) {
+			const requestFeatureLinkContainer = dom.append(channelsContainer, dom.$('div'));
 
-		this.feedbackDescriptionInput = <HTMLTextAreaElement>$('textarea.feedback-description').attr({
-			rows: 3,
-			maxlength: this.maxFeedbackCharacters,
-			'aria-label': nls.localize("commentsHeader", "Comments")
-		})
-			.text(this.feedback).attr('required', 'required')
-			.on('keyup', () => {
-				this.updateCharCountText();
-			})
-			.appendTo($form).domFocus().getHTMLElement();
+			const requestFeatureLink = dom.append(requestFeatureLinkContainer, dom.$('a'));
+			requestFeatureLink.setAttribute('target', '_blank');
+			requestFeatureLink.setAttribute('href', this.requestFeatureLink);
+			requestFeatureLink.textContent = nls.localize("request a missing feature", "Request a missing feature");
+			requestFeatureLink.tabIndex = 0;
 
-		const $buttons = $('div.form-buttons').appendTo($form);
+			disposables.push(dom.addDisposableListener(requestFeatureLink, 'click', e => this.hide()));
+		}
 
-		const $hideButtonContainer = $('div.hide-button-container').appendTo($buttons);
+		// Remaining Characters
+		const remainingCharacterCountContainer = dom.append(this.feedbackForm, dom.$('h3'));
+		remainingCharacterCountContainer.textContent = nls.localize("tell us why?", "Tell us why?");
 
-		this.hideButton = $('input.hide-button').type('checkbox').attr('checked', '').id('hide-button').appendTo($hideButtonContainer).getHTMLElement() as HTMLInputElement;
+		this.remainingCharacterCount = dom.append(remainingCharacterCountContainer, dom.$('span.char-counter'));
+		this.remainingCharacterCount.textContent = this.getCharCountText(0);
 
-		$('label').attr('for', 'hide-button').text(nls.localize('showFeedback', "Show Feedback Smiley in Status Bar")).appendTo($hideButtonContainer);
+		// Feedback Input Form
+		this.feedbackDescriptionInput = dom.append(this.feedbackForm, dom.$('textarea.feedback-description'));
+		this.feedbackDescriptionInput.rows = 3;
+		this.feedbackDescriptionInput.maxLength = this.maxFeedbackCharacters;
+		this.feedbackDescriptionInput.textContent = this.feedback;
+		this.feedbackDescriptionInput.required = true;
+		this.feedbackDescriptionInput.setAttribute('aria-label', nls.localize("feedbackTextInput", "Tell us your feedback"));
+		this.feedbackDescriptionInput.focus();
 
-		this.sendButton = new Button($buttons.getHTMLElement());
+		disposables.push(dom.addDisposableListener(this.feedbackDescriptionInput, 'keyup', () => this.updateCharCountText()));
+
+		// Feedback Input Form Buttons Container
+		const buttonsContainer = dom.append(this.feedbackForm, dom.$('div.form-buttons'));
+
+		// Checkbox: Hide Feedback Smiley
+		const hideButtonContainer = dom.append(buttonsContainer, dom.$('div.hide-button-container'));
+
+		this.hideButton = dom.append(hideButtonContainer, dom.$('input.hide-button'));
+		this.hideButton.type = 'checkbox';
+		this.hideButton.checked = true;
+		this.hideButton.id = 'hide-button';
+
+		const hideButtonLabel = dom.append(hideButtonContainer, dom.$('label'));
+		hideButtonLabel.setAttribute('for', 'hide-button');
+		hideButtonLabel.textContent = nls.localize('showFeedback', "Show Feedback Smiley in Status Bar");
+
+		// Button: Send Feedback
+		this.sendButton = new Button(buttonsContainer);
 		this.sendButton.enabled = false;
 		this.sendButton.label = nls.localize('tweet', "Tweet");
-		this.$sendButton = new Builder(this.sendButton.element);
-		this.$sendButton.addClass('send');
-		this.toDispose.push(attachButtonStyler(this.sendButton, this.themeService));
+		dom.addClass(this.sendButton.element, 'send');
+		this.sendButton.element.title = nls.localize('tweetFeedback', "Tweet Feedback");
+		disposables.push(attachButtonStyler(this.sendButton, this.themeService));
 
-		this.invoke(this.$sendButton, () => {
-			if (this.isSendingFeedback) {
-				return;
-			}
-			this.onSubmit();
-		});
+		this.sendButton.onDidClick(() => this.onSubmit());
 
-		this.toDispose.push(attachStylerCallback(this.themeService, { widgetShadow, editorWidgetBackground, inputBackground, inputForeground, inputBorder, editorBackground, contrastBorder }, colors => {
-			$form.style('background-color', colors.editorWidgetBackground ? colors.editorWidgetBackground.toString() : null);
-			$form.style('box-shadow', colors.widgetShadow ? `0 0 8px ${colors.widgetShadow}` : null);
+		disposables.push(attachStylerCallback(this.themeService, { widgetShadow, editorWidgetBackground, inputBackground, inputForeground, inputBorder, editorBackground, contrastBorder }, colors => {
+			this.feedbackForm.style.backgroundColor = colors.editorWidgetBackground ? colors.editorWidgetBackground.toString() : null;
+			this.feedbackForm.style.boxShadow = colors.widgetShadow ? `0 0 8px ${colors.widgetShadow}` : null;
 
 			if (this.feedbackDescriptionInput) {
 				this.feedbackDescriptionInput.style.backgroundColor = colors.inputBackground ? colors.inputBackground.toString() : null;
@@ -273,8 +289,8 @@ export class FeedbackDropdown extends Dropdown {
 				this.feedbackDescriptionInput.style.border = `1px solid ${colors.inputBorder || 'transparent'}`;
 			}
 
-			$contactUs.style('background-color', colors.editorBackground ? colors.editorBackground.toString() : null);
-			$contactUs.style('border', `1px solid ${colors.contrastBorder || 'transparent'}`);
+			contactUsContainer.style.backgroundColor = colors.editorBackground ? colors.editorBackground.toString() : null;
+			contactUsContainer.style.border = `1px solid ${colors.contrastBorder || 'transparent'}`;
 		}));
 
 		return {
@@ -283,6 +299,8 @@ export class FeedbackDropdown extends Dropdown {
 				this.feedbackDescriptionInput = null;
 				this.smileyInput = null;
 				this.frownyInput = null;
+
+				dispose(disposables);
 			}
 		};
 	}
@@ -293,49 +311,49 @@ export class FeedbackDropdown extends Dropdown {
 			? nls.localize("character left", "character left")
 			: nls.localize("characters left", "characters left");
 
-		return '(' + remaining + ' ' + text + ')';
+		return `(${remaining} ${text})`;
 	}
 
 	private updateCharCountText(): void {
-		this.remainingCharacterCount.text(this.getCharCountText(this.feedbackDescriptionInput.value.length));
+		this.remainingCharacterCount.innerText = this.getCharCountText(this.feedbackDescriptionInput.value.length);
 		this.sendButton.enabled = this.feedbackDescriptionInput.value.length > 0;
 	}
 
 	private setSentiment(smile: boolean): void {
 		if (smile) {
-			this.smileyInput.addClass('checked');
-			this.smileyInput.attr('aria-checked', 'true');
-			this.frownyInput.removeClass('checked');
-			this.frownyInput.attr('aria-checked', 'false');
+			dom.addClass(this.smileyInput, 'checked');
+			this.smileyInput.setAttribute('aria-checked', 'true');
+			dom.removeClass(this.frownyInput, 'checked');
+			this.frownyInput.setAttribute('aria-checked', 'false');
 		} else {
-			this.frownyInput.addClass('checked');
-			this.frownyInput.attr('aria-checked', 'true');
-			this.smileyInput.removeClass('checked');
-			this.smileyInput.attr('aria-checked', 'false');
+			dom.addClass(this.frownyInput, 'checked');
+			this.frownyInput.setAttribute('aria-checked', 'true');
+			dom.removeClass(this.smileyInput, 'checked');
+			this.smileyInput.setAttribute('aria-checked', 'false');
 		}
 
 		this.sentiment = smile ? 1 : 0;
-		this.maxFeedbackCharacters = this.feedbackService.getCharacterLimit(this.sentiment);
+		this.maxFeedbackCharacters = this.feedbackDelegate.getCharacterLimit(this.sentiment);
 		this.updateCharCountText();
-		$(this.feedbackDescriptionInput).attr({ maxlength: this.maxFeedbackCharacters });
+		this.feedbackDescriptionInput.maxLength = this.maxFeedbackCharacters;
 	}
 
-	private invoke(element: Builder, callback: () => void): Builder {
-		element.on('click', callback);
+	private invoke(element: HTMLElement, disposables: IDisposable[], callback: () => void): HTMLElement {
+		disposables.push(dom.addDisposableListener(element, 'click', callback));
 
-		element.on('keypress', (e) => {
+		disposables.push(dom.addDisposableListener(element, 'keypress', e => {
 			if (e instanceof KeyboardEvent) {
 				const keyboardEvent = <KeyboardEvent>e;
 				if (keyboardEvent.keyCode === 13 || keyboardEvent.keyCode === 32) { // Enter or Spacebar
 					callback();
 				}
 			}
-		});
+		}));
 
 		return element;
 	}
 
-	public show(): void {
+	show(): void {
 		super.show();
 
 		if (this.options.onFeedbackVisibilityChange) {
@@ -349,7 +367,7 @@ export class FeedbackDropdown extends Dropdown {
 		}
 	}
 
-	public hide(): void {
+	hide(): void {
 		if (this.feedbackDescriptionInput) {
 			this.feedback = this.feedbackDescriptionInput.value;
 		}
@@ -360,13 +378,13 @@ export class FeedbackDropdown extends Dropdown {
 		}
 
 		if (this.hideButton && !this.hideButton.checked) {
-			this.configurationService.updateValue(FEEDBACK_VISIBLE_CONFIG, false).done(null, errors.onUnexpectedError);
+			this.configurationService.updateValue(FEEDBACK_VISIBLE_CONFIG, false);
 		}
 
 		super.hide();
 	}
 
-	public onEvent(e: Event, activeElement: HTMLElement): void {
+	onEvent(e: Event, activeElement: HTMLElement): void {
 		if (e instanceof KeyboardEvent) {
 			const keyboardEvent = <KeyboardEvent>e;
 			if (keyboardEvent.keyCode === 27) { // Escape
@@ -380,54 +398,12 @@ export class FeedbackDropdown extends Dropdown {
 			return;
 		}
 
-		this.changeFormStatus(FormEvent.SENDING);
-
-		this.feedbackService.submitFeedback({
+		this.feedbackDelegate.submitFeedback({
 			feedback: this.feedbackDescriptionInput.value,
 			sentiment: this.sentiment
 		});
 
-		this.changeFormStatus(FormEvent.SENT);
-	}
-
-
-	private changeFormStatus(event: FormEvent): void {
-		switch (event) {
-			case FormEvent.SENDING:
-				this.isSendingFeedback = true;
-				this.sendButton.label = nls.localize('feedbackSending', "Sending");
-				this.$sendButton.addClass('in-progress');
-				break;
-			case FormEvent.SENT:
-				this.isSendingFeedback = false;
-				this.sendButton.label = nls.localize('feedbackSent', "Thanks");
-				this.$sendButton.addClass('success');
-				this.resetForm();
-				this.autoHideTimeout = setTimeout(() => {
-					this.hide();
-				}, 1000);
-				this.$sendButton.off(['click', 'keypress']);
-				this.invoke(this.$sendButton, () => {
-					this.hide();
-					this.$sendButton.off(['click', 'keypress']);
-					this.$sendButton.removeClass('in-progress');
-				});
-				break;
-			case FormEvent.SEND_ERROR:
-				this.isSendingFeedback = false;
-				this.$sendButton.addClass('error');
-				this.sendButton.label = nls.localize('feedbackSendingError', "Try again");
-				break;
-		}
-	}
-
-	private resetForm(): void {
-		if (this.feedbackDescriptionInput) {
-			this.feedbackDescriptionInput.value = '';
-		}
-
-		this.sentiment = 1;
-		this.maxFeedbackCharacters = this.feedbackService.getCharacterLimit(this.sentiment);
+		this.hide();
 	}
 }
 
diff --git a/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.ts b/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.ts
index 1a659b36d9a..fb2b6026426 100644
--- a/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.ts
+++ b/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.ts
@@ -7,7 +7,7 @@
 
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { IStatusbarItem } from 'vs/workbench/browser/parts/statusbar/statusbar';
-import { FeedbackDropdown, IFeedback, IFeedbackService, FEEDBACK_VISIBLE_CONFIG, IFeedbackDropdownOptions } from 'vs/workbench/parts/feedback/electron-browser/feedback';
+import { FeedbackDropdown, IFeedback, IFeedbackDelegate, FEEDBACK_VISIBLE_CONFIG, IFeedbackDropdownOptions } from 'vs/workbench/parts/feedback/electron-browser/feedback';
 import { IContextViewService, IContextMenuService } from 'vs/platform/contextview/browser/contextView';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import product from 'vs/platform/node/product';
@@ -16,13 +16,12 @@ import { IThemeService, registerThemingParticipant, ITheme, ICssStyleCollector }
 import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
 import { IWorkspaceConfigurationService } from 'vs/workbench/services/configuration/common/configuration';
 import { IConfigurationChangeEvent } from 'vs/platform/configuration/common/configuration';
-import { clearNode, EventHelper, addClass, removeClass } from 'vs/base/browser/dom';
-import { $ } from 'vs/base/browser/builder';
+import { clearNode, EventHelper, addClass, removeClass, addDisposableListener } from 'vs/base/browser/dom';
 import { localize } from 'vs/nls';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { Action } from 'vs/base/common/actions';
 
-class TwitterFeedbackService implements IFeedbackService {
+class TwitterFeedbackService implements IFeedbackDelegate {
 
 	private static TWITTER_URL: string = 'https://twitter.com/intent/tweet';
 	private static VIA_NAME: string = 'code';
@@ -32,14 +31,14 @@ class TwitterFeedbackService implements IFeedbackService {
 		return TwitterFeedbackService.HASHTAGS.join(',');
 	}
 
-	public submitFeedback(feedback: IFeedback): void {
+	submitFeedback(feedback: IFeedback): void {
 		const queryString = `?${feedback.sentiment === 1 ? `hashtags=${this.combineHashTagsAsString()}&` : null}ref_src=twsrc%5Etfw&related=twitterapi%2Ctwitter&text=${encodeURIComponent(feedback.feedback)}&tw_p=tweetbutton&via=${TwitterFeedbackService.VIA_NAME}`;
 		const url = TwitterFeedbackService.TWITTER_URL + queryString;
 
 		window.open(url);
 	}
 
-	public getCharacterLimit(sentiment: number): number {
+	getCharacterLimit(sentiment: number): number {
 		let length: number = 0;
 		if (sentiment === 1) {
 			TwitterFeedbackService.HASHTAGS.forEach(element => {
@@ -73,15 +72,14 @@ export class FeedbackStatusbarItem extends Themable implements IStatusbarItem {
 
 		this.enabled = this.configurationService.getValue(FEEDBACK_VISIBLE_CONFIG);
 
-		this.hideAction = this.instantiationService.createInstance(HideAction);
-		this.toUnbind.push(this.hideAction);
+		this.hideAction = this._register(this.instantiationService.createInstance(HideAction));
 
 		this.registerListeners();
 	}
 
 	private registerListeners(): void {
-		this.toUnbind.push(this.contextService.onDidChangeWorkbenchState(() => this.updateStyles()));
-		this.toUnbind.push(this.configurationService.onDidChangeConfiguration(e => this.onConfigurationUpdated(e)));
+		this._register(this.contextService.onDidChangeWorkbenchState(() => this.updateStyles()));
+		this._register(this.configurationService.onDidChangeConfiguration(e => this.onConfigurationUpdated(e)));
 	}
 
 	private onConfigurationUpdated(event: IConfigurationChangeEvent): void {
@@ -95,29 +93,29 @@ export class FeedbackStatusbarItem extends Themable implements IStatusbarItem {
 		super.updateStyles();
 
 		if (this.dropdown) {
-			$(this.dropdown.label).style('background-color', this.getColor(this.contextService.getWorkbenchState() !== WorkbenchState.EMPTY ? STATUS_BAR_FOREGROUND : STATUS_BAR_NO_FOLDER_FOREGROUND));
+			this.dropdown.label.style.backgroundColor = (this.getColor(this.contextService.getWorkbenchState() !== WorkbenchState.EMPTY ? STATUS_BAR_FOREGROUND : STATUS_BAR_NO_FOLDER_FOREGROUND));
 		}
 	}
 
-	public render(element: HTMLElement): IDisposable {
+	render(element: HTMLElement): IDisposable {
 		this.container = element;
 
 		// Prevent showing dropdown on anything but left click
-		$(this.container).on('mousedown', (e: MouseEvent) => {
+		this.toDispose.push(addDisposableListener(this.container, 'mousedown', (e: MouseEvent) => {
 			if (e.button !== 0) {
 				EventHelper.stop(e, true);
 			}
-		}, this.toUnbind, true);
+		}, true));
 
 		// Offer context menu to hide status bar entry
-		$(this.container).on('contextmenu', e => {
+		this.toDispose.push(addDisposableListener(this.container, 'contextmenu', e => {
 			EventHelper.stop(e, true);
 
 			this.contextMenuService.showContextMenu({
 				getAnchor: () => this.container,
 				getActions: () => TPromise.as([this.hideAction])
 			});
-		}, this.toUnbind);
+		}));
 
 		return this.update();
 	}
@@ -128,7 +126,7 @@ export class FeedbackStatusbarItem extends Themable implements IStatusbarItem {
 		// Create
 		if (enabled) {
 			if (!this.dropdown) {
-				this.dropdown = this.instantiationService.createInstance(FeedbackDropdown, this.container, {
+				this.dropdown = this._register(this.instantiationService.createInstance(FeedbackDropdown, this.container, {
 					contextViewProvider: this.contextViewService,
 					feedbackService: this.instantiationService.createInstance(TwitterFeedbackService),
 					onFeedbackVisibilityChange: visible => {
@@ -138,8 +136,7 @@ export class FeedbackStatusbarItem extends Themable implements IStatusbarItem {
 							removeClass(this.container, 'has-beak');
 						}
 					}
-				} as IFeedbackDropdownOptions);
-				this.toUnbind.push(this.dropdown);
+				} as IFeedbackDropdownOptions));
 
 				this.updateStyles();
 
@@ -166,7 +163,7 @@ class HideAction extends Action {
 		super('feedback.hide', localize('hide', "Hide"));
 	}
 
-	public run(extensionId: string): TPromise<any> {
+	run(extensionId: string): TPromise<any> {
 		return this.configurationService.updateValue(FEEDBACK_VISIBLE_CONFIG, false);
 	}
 }
diff --git a/src/vs/workbench/parts/feedback/electron-browser/media/feedback.css b/src/vs/workbench/parts/feedback/electron-browser/media/feedback.css
index 3a390da8f70..3c69f00d995 100644
--- a/src/vs/workbench/parts/feedback/electron-browser/media/feedback.css
+++ b/src/vs/workbench/parts/feedback/electron-browser/media/feedback.css
@@ -48,7 +48,6 @@
 	padding-left: 3px;
 }
 
-/* TODO @C5 review link color */
 .monaco-shell .feedback-form .content .channels a {
 	padding: 2px 0;
 }
diff --git a/src/vs/workbench/parts/files/browser/editors/binaryFileEditor.ts b/src/vs/workbench/parts/files/browser/editors/binaryFileEditor.ts
index de2b5da49ee..bd959156029 100644
--- a/src/vs/workbench/parts/files/browser/editors/binaryFileEditor.ts
+++ b/src/vs/workbench/parts/files/browser/editors/binaryFileEditor.ts
@@ -11,7 +11,7 @@ import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { IWindowsService } from 'vs/platform/windows/common/windows';
 import { EditorInput, EditorOptions } from 'vs/workbench/common/editor';
 import { FileEditorInput } from 'vs/workbench/parts/files/common/editors/fileEditorInput';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { BINARY_FILE_EDITOR_ID } from 'vs/workbench/parts/files/common/files';
 import { IFileService } from 'vs/platform/files/common/files';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
@@ -21,7 +21,7 @@ import { IEditorService } from 'vs/workbench/services/editor/common/editorServic
  */
 export class BinaryFileEditor extends BaseBinaryResourceEditor {
 
-	public static readonly ID = BINARY_FILE_EDITOR_ID;
+	static readonly ID = BINARY_FILE_EDITOR_ID;
 
 	constructor(
 		@ITelemetryService telemetryService: ITelemetryService,
@@ -59,7 +59,7 @@ export class BinaryFileEditor extends BaseBinaryResourceEditor {
 		});
 	}
 
-	public getTitle(): string {
+	getTitle(): string {
 		return this.input ? this.input.getName() : nls.localize('binaryFileEditor', "Binary File Viewer");
 	}
 }
diff --git a/src/vs/workbench/parts/files/browser/editors/fileEditorTracker.ts b/src/vs/workbench/parts/files/browser/editors/fileEditorTracker.ts
index 5169f040911..9261392d0bf 100644
--- a/src/vs/workbench/parts/files/browser/editors/fileEditorTracker.ts
+++ b/src/vs/workbench/parts/files/browser/editors/fileEditorTracker.ts
@@ -4,23 +4,20 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import { TPromise } from 'vs/base/common/winjs.base';
 import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
-import * as errors from 'vs/base/common/errors';
-import URI from 'vs/base/common/uri';
-import * as paths from 'vs/base/common/paths';
+import { URI } from 'vs/base/common/uri';
+import * as resources from 'vs/base/common/resources';
 import { IEditorViewState } from 'vs/editor/common/editorCommon';
 import { toResource, SideBySideEditorInput, IWorkbenchEditorConfiguration } from 'vs/workbench/common/editor';
 import { ITextFileService, ITextFileEditorModel } from 'vs/workbench/services/textfile/common/textfiles';
 import { FileOperationEvent, FileOperation, IFileService, FileChangeType, FileChangesEvent } from 'vs/platform/files/common/files';
 import { FileEditorInput } from 'vs/workbench/parts/files/common/editors/fileEditorInput';
 import { ILifecycleService } from 'vs/platform/lifecycle/common/lifecycle';
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
+import { Disposable } from 'vs/base/common/lifecycle';
 import { distinct } from 'vs/base/common/arrays';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { isLinux } from 'vs/base/common/platform';
-import { ResourceQueue } from 'vs/base/common/async';
 import { ResourceMap } from 'vs/base/common/map';
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
 import { isCodeEditor } from 'vs/editor/browser/editorBrowser';
@@ -29,12 +26,13 @@ import { IWindowService } from 'vs/platform/windows/common/windows';
 import { BINARY_FILE_EDITOR_ID } from 'vs/workbench/parts/files/common/files';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { IEditorGroupsService, IEditorGroup } from 'vs/workbench/services/group/common/editorGroupsService';
+import { ResourceQueue, timeout } from 'vs/base/common/async';
+import { onUnexpectedError } from 'vs/base/common/errors';
 
-export class FileEditorTracker implements IWorkbenchContribution {
+export class FileEditorTracker extends Disposable implements IWorkbenchContribution {
 
 	protected closeOnFileDelete: boolean;
 
-	private toUnbind: IDisposable[];
 	private modelLoadQueue: ResourceQueue;
 	private activeOutOfWorkspaceWatchers: ResourceMap<URI>;
 
@@ -49,7 +47,8 @@ export class FileEditorTracker implements IWorkbenchContribution {
 		@IWorkspaceContextService private contextService: IWorkspaceContextService,
 		@IWindowService private windowService: IWindowService
 	) {
-		this.toUnbind = [];
+		super();
+
 		this.modelLoadQueue = new ResourceQueue();
 		this.activeOutOfWorkspaceWatchers = new ResourceMap<URI>();
 
@@ -61,29 +60,29 @@ export class FileEditorTracker implements IWorkbenchContribution {
 	private registerListeners(): void {
 
 		// Update editors from operation changes
-		this.toUnbind.push(this.fileService.onAfterOperation(e => this.onFileOperation(e)));
+		this._register(this.fileService.onAfterOperation(e => this.onFileOperation(e)));
 
 		// Update editors from disk changes
-		this.toUnbind.push(this.fileService.onFileChanges(e => this.onFileChanges(e)));
+		this._register(this.fileService.onFileChanges(e => this.onFileChanges(e)));
 
 		// Editor changing
-		this.toUnbind.push(this.editorService.onDidVisibleEditorsChange(() => this.handleOutOfWorkspaceWatchers()));
+		this._register(this.editorService.onDidVisibleEditorsChange(() => this.handleOutOfWorkspaceWatchers()));
 
 		// Update visible editors when focus is gained
-		this.toUnbind.push(this.windowService.onDidChangeFocus(e => this.onWindowFocusChange(e)));
+		this._register(this.windowService.onDidChangeFocus(e => this.onWindowFocusChange(e)));
 
 		// Lifecycle
 		this.lifecycleService.onShutdown(this.dispose, this);
 
 		// Configuration
-		this.toUnbind.push(this.configurationService.onDidChangeConfiguration(e => this.onConfigurationUpdated(this.configurationService.getValue<IWorkbenchEditorConfiguration>())));
+		this._register(this.configurationService.onDidChangeConfiguration(e => this.onConfigurationUpdated(this.configurationService.getValue<IWorkbenchEditorConfiguration>())));
 	}
 
 	private onConfigurationUpdated(configuration: IWorkbenchEditorConfiguration): void {
 		if (configuration.workbench && configuration.workbench.editor && typeof configuration.workbench.editor.closeOnFileDelete === 'boolean') {
 			this.closeOnFileDelete = configuration.workbench.editor.closeOnFileDelete;
 		} else {
-			this.closeOnFileDelete = true; // default
+			this.closeOnFileDelete = false; // default
 		}
 	}
 
@@ -125,7 +124,9 @@ export class FileEditorTracker implements IWorkbenchContribution {
 	private onFileChanges(e: FileChangesEvent): void {
 
 		// Handle updates
-		this.handleUpdates(e);
+		if (e.gotAdded() || e.gotUpdated()) {
+			this.handleUpdates(e);
+		}
 
 		// Handle deletes
 		if (e.gotDeleted()) {
@@ -147,7 +148,7 @@ export class FileEditorTracker implements IWorkbenchContribution {
 				// Do NOT close any opened editor that matches the resource path (either equal or being parent) of the
 				// resource we move to (movedTo). Otherwise we would close a resource that has been renamed to the same
 				// path but different casing.
-				if (movedTo && paths.isEqualOrParent(resource.fsPath, movedTo.fsPath, !isLinux /* ignorecase */) && resource.fsPath.indexOf(movedTo.fsPath) === 0) {
+				if (movedTo && resources.isEqualOrParent(resource, movedTo)) {
 					return;
 				}
 
@@ -155,7 +156,7 @@ export class FileEditorTracker implements IWorkbenchContribution {
 				if (arg1 instanceof FileChangesEvent) {
 					matches = arg1.contains(resource, FileChangeType.DELETED);
 				} else {
-					matches = paths.isEqualOrParent(resource.fsPath, arg1.fsPath, !isLinux /* ignorecase */);
+					matches = resources.isEqualOrParent(resource, arg1);
 				}
 
 				if (!matches) {
@@ -168,14 +169,14 @@ export class FileEditorTracker implements IWorkbenchContribution {
 				// file is really gone and not just a faulty file event.
 				// This only applies to external file events, so we need to check for the isExternal
 				// flag.
-				let checkExists: TPromise<boolean>;
+				let checkExists: Thenable<boolean>;
 				if (isExternal) {
-					checkExists = TPromise.timeout(100).then(() => this.fileService.existsFile(resource));
+					checkExists = timeout(100).then(() => this.fileService.existsFile(resource));
 				} else {
-					checkExists = TPromise.as(false);
+					checkExists = Promise.resolve(false);
 				}
 
-				checkExists.done(exists => {
+				checkExists.then(exists => {
 					if (!exists && !editor.isDisposed()) {
 						editor.dispose();
 					} else if (this.environmentService.verbose) {
@@ -217,31 +218,33 @@ export class FileEditorTracker implements IWorkbenchContribution {
 
 	private handleMovedFileInOpenedEditors(oldResource: URI, newResource: URI): void {
 		this.editorGroupService.groups.forEach(group => {
-			group.editors.forEach(input => {
-				if (input instanceof FileEditorInput) {
-					const resource = input.getResource();
+			group.editors.forEach(editor => {
+				if (editor instanceof FileEditorInput) {
+					const resource = editor.getResource();
 
 					// Update Editor if file (or any parent of the input) got renamed or moved
-					if (paths.isEqualOrParent(resource.fsPath, oldResource.fsPath, !isLinux /* ignorecase */)) {
+					if (resources.isEqualOrParent(resource, oldResource)) {
 						let reopenFileResource: URI;
 						if (oldResource.toString() === resource.toString()) {
 							reopenFileResource = newResource; // file got moved
 						} else {
 							const index = this.getIndexOfPath(resource.path, oldResource.path);
-							reopenFileResource = newResource.with({ path: paths.join(newResource.path, resource.path.substr(index + oldResource.path.length + 1)) }); // parent folder got moved
+							reopenFileResource = resources.joinPath(newResource, resource.path.substr(index + oldResource.path.length + 1)); // parent folder got moved
 						}
 
-						// Reopen
-						this.editorService.openEditor({
-							resource: reopenFileResource,
-							options: {
-								preserveFocus: true,
-								pinned: group.isPinned(input),
-								index: group.getIndexOfEditor(input),
-								inactive: !group.isActive(input),
-								viewState: this.getViewStateFor(oldResource, group)
-							}
-						}, group);
+						this.editorService.replaceEditors([{
+							editor: { resource },
+							replacement: {
+								resource: reopenFileResource,
+								options: {
+									preserveFocus: true,
+									pinned: group.isPinned(editor),
+									index: group.getIndexOfEditor(editor),
+									inactive: !group.isActive(editor),
+									viewState: this.getViewStateFor(oldResource, group)
+								}
+							},
+						}], group);
 					}
 				}
 			});
@@ -286,31 +289,11 @@ export class FileEditorTracker implements IWorkbenchContribution {
 
 	private handleUpdates(e: FileChangesEvent): void {
 
-		// Handle updates to visible binary editors
-		this.handleUpdatesToVisibleBinaryEditors(e);
-
 		// Handle updates to text models
 		this.handleUpdatesToTextModels(e);
-	}
 
-	private handleUpdatesToVisibleBinaryEditors(e: FileChangesEvent): void {
-		const editors = this.editorService.visibleControls;
-		editors.forEach(editor => {
-			const resource = toResource(editor.input, { supportSideBySide: true });
-
-			// Support side-by-side binary editors too
-			let isBinaryEditor = false;
-			if (editor instanceof SideBySideEditor) {
-				isBinaryEditor = editor.getMasterEditor().getId() === BINARY_FILE_EDITOR_ID;
-			} else {
-				isBinaryEditor = editor.getId() === BINARY_FILE_EDITOR_ID;
-			}
-
-			// Binary editor that should reload from event
-			if (resource && isBinaryEditor && (e.contains(resource, FileChangeType.UPDATED) || e.contains(resource, FileChangeType.ADDED))) {
-				this.editorService.openEditor(editor.input, { forceOpen: true, preserveFocus: true }, editor.group);
-			}
-		});
+		// Handle updates to visible binary editors
+		this.handleUpdatesToVisibleBinaryEditors(e);
 	}
 
 	private handleUpdatesToTextModels(e: FileChangesEvent): void {
@@ -332,10 +315,30 @@ export class FileEditorTracker implements IWorkbenchContribution {
 		// to have a size of 2 (1 running load and 1 queued load).
 		const queue = this.modelLoadQueue.queueFor(model.getResource());
 		if (queue.size <= 1) {
-			queue.queue(() => model.load().then(null, errors.onUnexpectedError));
+			queue.queue(() => model.load().then(null, onUnexpectedError));
 		}
 	}
 
+	private handleUpdatesToVisibleBinaryEditors(e: FileChangesEvent): void {
+		const editors = this.editorService.visibleControls;
+		editors.forEach(editor => {
+			const resource = toResource(editor.input, { supportSideBySide: true });
+
+			// Support side-by-side binary editors too
+			let isBinaryEditor = false;
+			if (editor instanceof SideBySideEditor) {
+				isBinaryEditor = editor.getMasterEditor().getId() === BINARY_FILE_EDITOR_ID;
+			} else {
+				isBinaryEditor = editor.getId() === BINARY_FILE_EDITOR_ID;
+			}
+
+			// Binary editor that should reload from event
+			if (resource && isBinaryEditor && (e.contains(resource, FileChangeType.UPDATED) || e.contains(resource, FileChangeType.ADDED))) {
+				this.editorService.openEditor(editor.input, { forceReload: true, preserveFocus: true }, editor.group);
+			}
+		});
+	}
+
 	private handleOutOfWorkspaceWatchers(): void {
 		const visibleOutOfWorkspacePaths = new ResourceMap<URI>();
 		this.editorService.visibleEditors.map(editorInput => {
@@ -363,8 +366,8 @@ export class FileEditorTracker implements IWorkbenchContribution {
 		});
 	}
 
-	public dispose(): void {
-		this.toUnbind = dispose(this.toUnbind);
+	dispose(): void {
+		super.dispose();
 
 		// Dispose watchers if any
 		this.activeOutOfWorkspaceWatchers.forEach(resource => this.fileService.unwatchFileChanges(resource));
diff --git a/src/vs/workbench/parts/files/browser/editors/textFileEditor.ts b/src/vs/workbench/parts/files/browser/editors/textFileEditor.ts
index de33f2ffaeb..beec0c28fb2 100644
--- a/src/vs/workbench/parts/files/browser/editors/textFileEditor.ts
+++ b/src/vs/workbench/parts/files/browser/editors/textFileEditor.ts
@@ -25,10 +25,9 @@ import { IStorageService } from 'vs/platform/storage/common/storage';
 import { ITextResourceConfigurationService } from 'vs/editor/common/services/resourceConfiguration';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IPreferencesService } from 'vs/workbench/services/preferences/common/preferences';
-import { PreferencesEditor } from 'vs/workbench/parts/preferences/browser/preferencesEditor';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { ScrollType } from 'vs/editor/common/editorCommon';
-import { IWindowsService } from 'vs/platform/windows/common/windows';
+import { IWindowsService, IWindowService } from 'vs/platform/windows/common/windows';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { IEditorGroupsService, IEditorGroup } from 'vs/workbench/services/group/common/editorGroupsService';
 import { CancellationToken } from 'vs/base/common/cancellation';
@@ -39,7 +38,7 @@ import { IEditorGroupView } from 'vs/workbench/browser/parts/editor/editor';
  */
 export class TextFileEditor extends BaseTextEditor {
 
-	public static readonly ID = TEXT_FILE_EDITOR_ID;
+	static readonly ID = TEXT_FILE_EDITOR_ID;
 
 	constructor(
 		@ITelemetryService telemetryService: ITelemetryService,
@@ -54,12 +53,13 @@ export class TextFileEditor extends BaseTextEditor {
 		@IEditorGroupsService editorGroupService: IEditorGroupsService,
 		@ITextFileService textFileService: ITextFileService,
 		@IWindowsService private windowsService: IWindowsService,
-		@IPreferencesService private preferencesService: IPreferencesService
+		@IPreferencesService private preferencesService: IPreferencesService,
+		@IWindowService windowService: IWindowService
 	) {
-		super(TextFileEditor.ID, telemetryService, instantiationService, storageService, configurationService, themeService, textFileService, editorService, editorGroupService);
+		super(TextFileEditor.ID, telemetryService, instantiationService, storageService, configurationService, themeService, textFileService, editorService, editorGroupService, windowService);
 
 		// Clear view state for deleted files
-		this.toUnbind.push(this.fileService.onFileChanges(e => this.onFilesChanged(e)));
+		this._register(this.fileService.onFileChanges(e => this.onFilesChanged(e)));
 	}
 
 	private onFilesChanged(e: FileChangesEvent): void {
@@ -69,11 +69,11 @@ export class TextFileEditor extends BaseTextEditor {
 		}
 	}
 
-	public getTitle(): string {
+	getTitle(): string {
 		return this.input ? this.input.getName() : nls.localize('textFileEditor', "Text File Editor");
 	}
 
-	public get input(): FileEditorInput {
+	get input(): FileEditorInput {
 		return this._input as FileEditorInput;
 	}
 
@@ -83,28 +83,28 @@ export class TextFileEditor extends BaseTextEditor {
 		// React to editors closing to preserve view state. This needs to happen
 		// in the onWillCloseEditor because at that time the editor has not yet
 		// been disposed and we can safely persist the view state still.
-		this.toUnbind.push((group as IEditorGroupView).onWillCloseEditor(e => {
+		this._register((group as IEditorGroupView).onWillCloseEditor(e => {
 			if (e.editor === this.input) {
 				this.doSaveTextEditorViewState(this.input);
 			}
 		}));
 	}
 
-	public setOptions(options: EditorOptions): void {
+	setOptions(options: EditorOptions): void {
 		const textOptions = <TextEditorOptions>options;
 		if (textOptions && types.isFunction(textOptions.apply)) {
 			textOptions.apply(this.getControl(), ScrollType.Smooth);
 		}
 	}
 
-	public setInput(input: FileEditorInput, options: EditorOptions, token: CancellationToken): Thenable<void> {
+	setInput(input: FileEditorInput, options: EditorOptions, token: CancellationToken): Thenable<void> {
 
 		// Remember view settings if input changes
 		this.doSaveTextEditorViewState(this.input);
 
 		// Set input and resolve
 		return super.setInput(input, options, token).then(() => {
-			return input.resolve(true).then(resolvedModel => {
+			return input.resolve().then(resolvedModel => {
 
 				// Check for cancellation
 				if (token.isCancellationRequested) {
@@ -146,6 +146,9 @@ export class TextFileEditor extends BaseTextEditor {
 				if (options && types.isFunction((<TextEditorOptions>options).apply)) {
 					(<TextEditorOptions>options).apply(textEditor, ScrollType.Immediate);
 				}
+
+				// Readonly flag
+				textEditor.updateOptions({ readOnly: textFileModel.isReadonly() });
 			}, error => {
 
 				// In case we tried to open a file inside the text editor and the response
@@ -189,11 +192,7 @@ export class TextFileEditor extends BaseTextEditor {
 								});
 							}),
 							new Action('workbench.window.action.configureMemoryLimit', nls.localize('configureMemoryLimit', 'Configure Memory Limit'), null, true, () => {
-								return this.preferencesService.openGlobalSettings().then(editor => {
-									if (editor instanceof PreferencesEditor) {
-										editor.focusSearch('files.maxMemoryForLargeFilesMB');
-									}
-								});
+								return this.preferencesService.openGlobalSettings(undefined, { query: 'files.maxMemoryForLargeFilesMB' });
 							})
 						]
 					}));
@@ -217,9 +216,9 @@ export class TextFileEditor extends BaseTextEditor {
 
 			// Best we can do is to reveal the folder in the explorer
 			if (this.contextService.isInsideWorkspace(input.getResource())) {
-				this.viewletService.openViewlet(VIEWLET_ID, true).done(viewlet => {
+				this.viewletService.openViewlet(VIEWLET_ID, true).then(viewlet => {
 					return (viewlet as IExplorerViewlet).getExplorerView().select(input.getResource(), true);
-				}, errors.onUnexpectedError);
+				});
 			}
 		});
 
@@ -240,7 +239,7 @@ export class TextFileEditor extends BaseTextEditor {
 		return ariaLabel;
 	}
 
-	public clearInput(): void {
+	clearInput(): void {
 
 		// Keep editor view state in settings to restore when coming back
 		this.doSaveTextEditorViewState(this.input);
@@ -252,7 +251,7 @@ export class TextFileEditor extends BaseTextEditor {
 		super.clearInput();
 	}
 
-	public shutdown(): void {
+	shutdown(): void {
 
 		// Save View State
 		this.doSaveTextEditorViewState(this.input);
diff --git a/src/vs/workbench/parts/files/browser/files.ts b/src/vs/workbench/parts/files/browser/files.ts
index 5b1d88c8454..38b286a0f9b 100644
--- a/src/vs/workbench/parts/files/browser/files.ts
+++ b/src/vs/workbench/parts/files/browser/files.ts
@@ -5,7 +5,7 @@
 
 'use strict';
 
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { IListService } from 'vs/platform/list/browser/listService';
 import { ExplorerItem, OpenEditor } from 'vs/workbench/parts/files/common/explorerModel';
 import { toResource } from 'vs/workbench/common/editor';
@@ -52,7 +52,7 @@ export function getMultiSelectedResources(resource: URI | object, listService: I
 			const mainUriStr = URI.isUri(resource) ? resource.toString() : focus instanceof ExplorerItem ? focus.resource.toString() : undefined;
 			// If the resource is passed it has to be a part of the returned context.
 			// We only respect the selection if it contains the focused element.
-			if (selection.some(s => s.toString() === mainUriStr)) {
+			if (selection.some(s => URI.isUri(s) && s.toString() === mainUriStr)) {
 				return selection;
 			}
 		}
diff --git a/src/vs/workbench/parts/files/common/dirtyFilesTracker.ts b/src/vs/workbench/parts/files/common/dirtyFilesTracker.ts
index 34594b0301e..2fd4e654b07 100644
--- a/src/vs/workbench/parts/files/common/dirtyFilesTracker.ts
+++ b/src/vs/workbench/parts/files/common/dirtyFilesTracker.ts
@@ -12,16 +12,15 @@ import { TextFileModelChangeEvent, ITextFileService, AutoSaveMode, ModelState }
 import { platform, Platform } from 'vs/base/common/platform';
 import { IWindowService } from 'vs/platform/windows/common/windows';
 import { ILifecycleService } from 'vs/platform/lifecycle/common/lifecycle';
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
-import URI from 'vs/base/common/uri';
+import { IDisposable, dispose, Disposable } from 'vs/base/common/lifecycle';
+import { URI } from 'vs/base/common/uri';
 import { IActivityService, NumberBadge } from 'vs/workbench/services/activity/common/activity';
 import { IUntitledEditorService } from 'vs/workbench/services/untitled/common/untitledEditorService';
 import * as arrays from 'vs/base/common/arrays';
 import { IEditorService, ACTIVE_GROUP } from 'vs/workbench/services/editor/common/editorService';
 
-export class DirtyFilesTracker implements IWorkbenchContribution {
+export class DirtyFilesTracker extends Disposable implements IWorkbenchContribution {
 	private isDocumentedEdited: boolean;
-	private toUnbind: IDisposable[];
 	private lastDirtyCount: number;
 	private badgeHandle: IDisposable;
 
@@ -33,7 +32,8 @@ export class DirtyFilesTracker implements IWorkbenchContribution {
 		@IWindowService private windowService: IWindowService,
 		@IUntitledEditorService private untitledEditorService: IUntitledEditorService
 	) {
-		this.toUnbind = [];
+		super();
+
 		this.isDocumentedEdited = false;
 
 		this.registerListeners();
@@ -42,11 +42,11 @@ export class DirtyFilesTracker implements IWorkbenchContribution {
 	private registerListeners(): void {
 
 		// Local text file changes
-		this.toUnbind.push(this.untitledEditorService.onDidChangeDirty(e => this.onUntitledDidChangeDirty(e)));
-		this.toUnbind.push(this.textFileService.models.onModelsDirty(e => this.onTextFilesDirty(e)));
-		this.toUnbind.push(this.textFileService.models.onModelsSaved(e => this.onTextFilesSaved(e)));
-		this.toUnbind.push(this.textFileService.models.onModelsSaveError(e => this.onTextFilesSaveError(e)));
-		this.toUnbind.push(this.textFileService.models.onModelsReverted(e => this.onTextFilesReverted(e)));
+		this._register(this.untitledEditorService.onDidChangeDirty(e => this.onUntitledDidChangeDirty(e)));
+		this._register(this.textFileService.models.onModelsDirty(e => this.onTextFilesDirty(e)));
+		this._register(this.textFileService.models.onModelsSaved(e => this.onTextFilesSaved(e)));
+		this._register(this.textFileService.models.onModelsSaveError(e => this.onTextFilesSaveError(e)));
+		this._register(this.textFileService.models.onModelsReverted(e => this.onTextFilesReverted(e)));
 
 		// Lifecycle
 		this.lifecycleService.onShutdown(this.dispose, this);
@@ -142,8 +142,4 @@ export class DirtyFilesTracker implements IWorkbenchContribution {
 			this.windowService.setDocumentEdited(hasDirtyFiles);
 		}
 	}
-
-	public dispose(): void {
-		this.toUnbind = dispose(this.toUnbind);
-	}
 }
diff --git a/src/vs/workbench/parts/files/common/editors/fileEditorInput.ts b/src/vs/workbench/parts/files/common/editors/fileEditorInput.ts
index 6bf9d8ca94d..7b4e0c6d20f 100644
--- a/src/vs/workbench/parts/files/common/editors/fileEditorInput.ts
+++ b/src/vs/workbench/parts/files/common/editors/fileEditorInput.ts
@@ -9,21 +9,19 @@ import { TPromise } from 'vs/base/common/winjs.base';
 import { memoize } from 'vs/base/common/decorators';
 import * as paths from 'vs/base/common/paths';
 import * as resources from 'vs/base/common/resources';
-import * as labels from 'vs/base/common/labels';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { EncodingMode, ConfirmResult, EditorInput, IFileEditorInput, ITextEditorModel, Verbosity, IRevertOptions } from 'vs/workbench/common/editor';
 import { TextFileEditorModel } from 'vs/workbench/services/textfile/common/textFileEditorModel';
 import { BinaryEditorModel } from 'vs/workbench/common/editor/binaryEditorModel';
 import { FileOperationError, FileOperationResult } from 'vs/platform/files/common/files';
-import { ITextFileService, AutoSaveMode, ModelState, TextFileModelChangeEvent } from 'vs/workbench/services/textfile/common/textfiles';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
+import { ITextFileService, AutoSaveMode, ModelState, TextFileModelChangeEvent, LoadReason } from 'vs/workbench/services/textfile/common/textfiles';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IDisposable, dispose, IReference } from 'vs/base/common/lifecycle';
+import { IReference } from 'vs/base/common/lifecycle';
 import { telemetryURIDescriptor } from 'vs/platform/telemetry/common/telemetryUtils';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { ITextModelService } from 'vs/editor/common/services/resolverService';
 import { IHashService } from 'vs/workbench/services/hash/common/hashService';
 import { FILE_EDITOR_INPUT_ID, TEXT_FILE_EDITOR_ID, BINARY_FILE_EDITOR_ID } from 'vs/workbench/parts/files/common/files';
+import { ILabelService } from 'vs/platform/label/common/label';
 
 /**
  * A file editor input is the input type for the file editor of file system resources.
@@ -34,7 +32,6 @@ export class FileEditorInput extends EditorInput implements IFileEditorInput {
 	private forceOpenAsText: boolean;
 	private textModelReference: TPromise<IReference<ITextEditorModel>>;
 	private name: string;
-	private toUnbind: IDisposable[];
 
 	/**
 	 * An editor input who's contents are retrieved from file services.
@@ -43,16 +40,13 @@ export class FileEditorInput extends EditorInput implements IFileEditorInput {
 		private resource: URI,
 		preferredEncoding: string,
 		@IInstantiationService private instantiationService: IInstantiationService,
-		@IWorkspaceContextService private contextService: IWorkspaceContextService,
 		@ITextFileService private textFileService: ITextFileService,
-		@IEnvironmentService private environmentService: IEnvironmentService,
 		@ITextModelService private textModelResolverService: ITextModelService,
-		@IHashService private hashService: IHashService
+		@IHashService private hashService: IHashService,
+		@ILabelService private labelService: ILabelService
 	) {
 		super();
 
-		this.toUnbind = [];
-
 		this.setPreferredEncoding(preferredEncoding);
 
 		this.registerListeners();
@@ -61,11 +55,11 @@ export class FileEditorInput extends EditorInput implements IFileEditorInput {
 	private registerListeners(): void {
 
 		// Model changes
-		this.toUnbind.push(this.textFileService.models.onModelDirty(e => this.onDirtyStateChange(e)));
-		this.toUnbind.push(this.textFileService.models.onModelSaveError(e => this.onDirtyStateChange(e)));
-		this.toUnbind.push(this.textFileService.models.onModelSaved(e => this.onDirtyStateChange(e)));
-		this.toUnbind.push(this.textFileService.models.onModelReverted(e => this.onDirtyStateChange(e)));
-		this.toUnbind.push(this.textFileService.models.onModelOrphanedChanged(e => this.onModelOrphanedChanged(e)));
+		this._register(this.textFileService.models.onModelDirty(e => this.onDirtyStateChange(e)));
+		this._register(this.textFileService.models.onModelSaveError(e => this.onDirtyStateChange(e)));
+		this._register(this.textFileService.models.onModelSaved(e => this.onDirtyStateChange(e)));
+		this._register(this.textFileService.models.onModelReverted(e => this.onDirtyStateChange(e)));
+		this._register(this.textFileService.models.onModelOrphanedChanged(e => this.onModelOrphanedChanged(e)));
 	}
 
 	private onDirtyStateChange(e: TextFileModelChangeEvent): void {
@@ -80,11 +74,11 @@ export class FileEditorInput extends EditorInput implements IFileEditorInput {
 		}
 	}
 
-	public getResource(): URI {
+	getResource(): URI {
 		return this.resource;
 	}
 
-	public setPreferredEncoding(encoding: string): void {
+	setPreferredEncoding(encoding: string): void {
 		this.preferredEncoding = encoding;
 
 		if (encoding) {
@@ -92,7 +86,7 @@ export class FileEditorInput extends EditorInput implements IFileEditorInput {
 		}
 	}
 
-	public getEncoding(): string {
+	getEncoding(): string {
 		const textModel = this.textFileService.models.get(this.resource);
 		if (textModel) {
 			return textModel.getEncoding();
@@ -101,11 +95,11 @@ export class FileEditorInput extends EditorInput implements IFileEditorInput {
 		return this.preferredEncoding;
 	}
 
-	public getPreferredEncoding(): string {
+	getPreferredEncoding(): string {
 		return this.preferredEncoding;
 	}
 
-	public setEncoding(encoding: string, mode: EncodingMode): void {
+	setEncoding(encoding: string, mode: EncodingMode): void {
 		this.preferredEncoding = encoding;
 
 		const textModel = this.textFileService.models.get(this.resource);
@@ -114,44 +108,44 @@ export class FileEditorInput extends EditorInput implements IFileEditorInput {
 		}
 	}
 
-	public setForceOpenAsText(): void {
+	setForceOpenAsText(): void {
 		this.forceOpenAsText = true;
 		this.forceOpenAsBinary = false;
 	}
 
-	public setForceOpenAsBinary(): void {
+	setForceOpenAsBinary(): void {
 		this.forceOpenAsBinary = true;
 		this.forceOpenAsText = false;
 	}
 
-	public getTypeId(): string {
+	getTypeId(): string {
 		return FILE_EDITOR_INPUT_ID;
 	}
 
-	public getName(): string {
+	getName(): string {
 		if (!this.name) {
 			this.name = resources.basenameOrAuthority(this.resource);
 		}
 
-		return this.decorateOrphanedFiles(this.name);
+		return this.decorateLabel(this.name);
 	}
 
 	@memoize
 	private get shortDescription(): string {
-		return paths.basename(labels.getPathLabel(resources.dirname(this.resource), void 0, this.environmentService));
+		return paths.basename(this.labelService.getUriLabel(resources.dirname(this.resource)));
 	}
 
 	@memoize
 	private get mediumDescription(): string {
-		return labels.getPathLabel(resources.dirname(this.resource), this.contextService, this.environmentService);
+		return this.labelService.getUriLabel(resources.dirname(this.resource), true);
 	}
 
 	@memoize
 	private get longDescription(): string {
-		return labels.getPathLabel(resources.dirname(this.resource), void 0, this.environmentService);
+		return this.labelService.getUriLabel(resources.dirname(this.resource), true);
 	}
 
-	public getDescription(verbosity: Verbosity = Verbosity.MEDIUM): string {
+	getDescription(verbosity: Verbosity = Verbosity.MEDIUM): string {
 		let description: string;
 		switch (verbosity) {
 			case Verbosity.SHORT:
@@ -176,15 +170,15 @@ export class FileEditorInput extends EditorInput implements IFileEditorInput {
 
 	@memoize
 	private get mediumTitle(): string {
-		return labels.getPathLabel(this.resource, this.contextService, this.environmentService);
+		return this.labelService.getUriLabel(this.resource, true);
 	}
 
 	@memoize
 	private get longTitle(): string {
-		return labels.getPathLabel(this.resource, void 0, this.environmentService);
+		return this.labelService.getUriLabel(this.resource);
 	}
 
-	public getTitle(verbosity: Verbosity): string {
+	getTitle(verbosity: Verbosity): string {
 		let title: string;
 		switch (verbosity) {
 			case Verbosity.SHORT:
@@ -198,19 +192,22 @@ export class FileEditorInput extends EditorInput implements IFileEditorInput {
 				break;
 		}
 
-		return this.decorateOrphanedFiles(title);
+		return this.decorateLabel(title);
 	}
 
-	private decorateOrphanedFiles(label: string): string {
+	private decorateLabel(label: string): string {
 		const model = this.textFileService.models.get(this.resource);
 		if (model && model.hasState(ModelState.ORPHAN)) {
 			return localize('orphanedFile', "{0} (deleted from disk)", label);
 		}
+		if (model && model.isReadonly()) {
+			return localize('readonlyFile', "{0} (read-only)", label);
+		}
 
 		return label;
 	}
 
-	public isDirty(): boolean {
+	isDirty(): boolean {
 		const model = this.textFileService.models.get(this.resource);
 		if (!model) {
 			return false;
@@ -227,23 +224,23 @@ export class FileEditorInput extends EditorInput implements IFileEditorInput {
 		return model.isDirty();
 	}
 
-	public confirmSave(): TPromise<ConfirmResult> {
+	confirmSave(): TPromise<ConfirmResult> {
 		return this.textFileService.confirmSave([this.resource]);
 	}
 
-	public save(): TPromise<boolean> {
+	save(): TPromise<boolean> {
 		return this.textFileService.save(this.resource);
 	}
 
-	public revert(options?: IRevertOptions): TPromise<boolean> {
+	revert(options?: IRevertOptions): TPromise<boolean> {
 		return this.textFileService.revert(this.resource, options);
 	}
 
-	public getPreferredEditorId(candidates: string[]): string {
+	getPreferredEditorId(candidates: string[]): string {
 		return this.forceOpenAsBinary ? BINARY_FILE_EDITOR_ID : TEXT_FILE_EDITOR_ID;
 	}
 
-	public resolve(refresh?: boolean): TPromise<TextFileEditorModel | BinaryEditorModel> {
+	resolve(): TPromise<TextFileEditorModel | BinaryEditorModel> {
 
 		// Resolve as binary
 		if (this.forceOpenAsBinary) {
@@ -251,13 +248,18 @@ export class FileEditorInput extends EditorInput implements IFileEditorInput {
 		}
 
 		// Resolve as text
-		return this.doResolveAsText(refresh);
+		return this.doResolveAsText();
 	}
 
-	private doResolveAsText(reload?: boolean): TPromise<TextFileEditorModel | BinaryEditorModel> {
+	private doResolveAsText(): TPromise<TextFileEditorModel | BinaryEditorModel> {
 
 		// Resolve as text
-		return this.textFileService.models.loadOrCreate(this.resource, { encoding: this.preferredEncoding, reload, allowBinary: this.forceOpenAsText }).then(model => {
+		return this.textFileService.models.loadOrCreate(this.resource, {
+			encoding: this.preferredEncoding,
+			reload: { async: true }, // trigger a reload of the model if it exists already but do not wait to show the model
+			allowBinary: this.forceOpenAsText,
+			reason: LoadReason.EDITOR
+		}).then(model => {
 
 			// This is a bit ugly, because we first resolve the model and then resolve a model reference. the reason being that binary
 			// or very large files do not resolve to a text file model but should be opened as binary files without text. First calling into
@@ -284,11 +286,11 @@ export class FileEditorInput extends EditorInput implements IFileEditorInput {
 		return this.instantiationService.createInstance(BinaryEditorModel, this.resource, this.getName()).load().then(m => m as BinaryEditorModel);
 	}
 
-	public isResolved(): boolean {
+	isResolved(): boolean {
 		return !!this.textFileService.models.get(this.resource);
 	}
 
-	public getTelemetryDescriptor(): object {
+	getTelemetryDescriptor(): object {
 		const descriptor = super.getTelemetryDescriptor();
 		descriptor['resource'] = telemetryURIDescriptor(this.getResource(), path => this.hashService.createSHA1(path));
 
@@ -300,21 +302,18 @@ export class FileEditorInput extends EditorInput implements IFileEditorInput {
 		return descriptor;
 	}
 
-	public dispose(): void {
+	dispose(): void {
 
 		// Model reference
 		if (this.textModelReference) {
-			this.textModelReference.done(ref => ref.dispose());
+			this.textModelReference.then(ref => ref.dispose());
 			this.textModelReference = null;
 		}
 
-		// Listeners
-		this.toUnbind = dispose(this.toUnbind);
-
 		super.dispose();
 	}
 
-	public matches(otherInput: any): boolean {
+	matches(otherInput: any): boolean {
 		if (super.matches(otherInput) === true) {
 			return true;
 		}
diff --git a/src/vs/workbench/parts/files/common/explorerModel.ts b/src/vs/workbench/parts/files/common/explorerModel.ts
index 1f01ef9d124..3425f0b9971 100644
--- a/src/vs/workbench/parts/files/common/explorerModel.ts
+++ b/src/vs/workbench/parts/files/common/explorerModel.ts
@@ -5,7 +5,7 @@
 
 'use strict';
 
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import * as paths from 'vs/base/common/paths';
 import * as resources from 'vs/base/common/resources';
 import { ResourceMap } from 'vs/base/common/map';
@@ -14,9 +14,8 @@ import { IFileStat } from 'vs/platform/files/common/files';
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
 import { toResource, IEditorIdentifier, IEditorInput } from 'vs/workbench/common/editor';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
-import { getPathLabel } from 'vs/base/common/labels';
 import { Schemas } from 'vs/base/common/network';
-import { startsWith, startsWithIgnoreCase, rtrim } from 'vs/base/common/strings';
+import { rtrim, startsWithIgnoreCase, startsWith, equalsIgnoreCase } from 'vs/base/common/strings';
 import { IEditorGroup } from 'vs/workbench/services/group/common/editorGroupsService';
 
 export class Model {
@@ -26,7 +25,7 @@ export class Model {
 
 	constructor(@IWorkspaceContextService private contextService: IWorkspaceContextService) {
 		const setRoots = () => this._roots = this.contextService.getWorkspace().folders
-			.map(folder => new ExplorerItem(folder.uri, undefined, false, true, folder.name));
+			.map(folder => new ExplorerItem(folder.uri, undefined, false, false, true, folder.name));
 		this._listener = this.contextService.onDidChangeWorkspaceFolders(() => setRoots());
 		setRoots();
 	}
@@ -73,18 +72,22 @@ export class ExplorerItem {
 	public etag: string;
 	private _isDirectory: boolean;
 	private _isSymbolicLink: boolean;
+	private _isReadonly: boolean;
 	private children: Map<string, ExplorerItem>;
+	private _isError: boolean;
 	public parent: ExplorerItem;
 
 	public isDirectoryResolved: boolean;
 
-	constructor(resource: URI, public root: ExplorerItem, isSymbolicLink?: boolean, isDirectory?: boolean, name: string = getPathLabel(resource), mtime?: number, etag?: string) {
+	constructor(resource: URI, public root: ExplorerItem, isSymbolicLink?: boolean, isReadonly?: boolean, isDirectory?: boolean, name: string = resources.basenameOrAuthority(resource), mtime?: number, etag?: string, isError?: boolean) {
 		this.resource = resource;
 		this._name = name;
 		this.isDirectory = !!isDirectory;
 		this._isSymbolicLink = !!isSymbolicLink;
+		this._isReadonly = !!isReadonly;
 		this.etag = etag;
 		this.mtime = mtime;
+		this._isError = !!isError;
 
 		if (!this.root) {
 			this.root = this;
@@ -101,6 +104,14 @@ export class ExplorerItem {
 		return this._isDirectory;
 	}
 
+	public get isReadonly(): boolean {
+		return this._isReadonly;
+	}
+
+	public get isError(): boolean {
+		return this._isError;
+	}
+
 	public set isDirectory(value: boolean) {
 		if (value !== this._isDirectory) {
 			this._isDirectory = value;
@@ -113,10 +124,6 @@ export class ExplorerItem {
 
 	}
 
-	public get nonexistentRoot(): boolean {
-		return this.isRoot && !this.isDirectoryResolved && this.isDirectory;
-	}
-
 	public get name(): string {
 		return this._name;
 	}
@@ -140,8 +147,8 @@ export class ExplorerItem {
 		return this === this.root;
 	}
 
-	public static create(raw: IFileStat, root: ExplorerItem, resolveTo?: URI[]): ExplorerItem {
-		const stat = new ExplorerItem(raw.resource, root, raw.isSymbolicLink, raw.isDirectory, raw.name, raw.mtime, raw.etag);
+	public static create(raw: IFileStat, root: ExplorerItem, resolveTo?: URI[], isError = false): ExplorerItem {
+		const stat = new ExplorerItem(raw.resource, root, raw.isSymbolicLink, raw.isReadonly, raw.isDirectory, raw.name, raw.mtime, raw.etag, isError);
 
 		// Recursively add children if present
 		if (stat.isDirectory) {
@@ -150,7 +157,7 @@ export class ExplorerItem {
 			// the folder is fully resolved if either it has a list of children or the client requested this by using the resolveTo
 			// array of resource path to resolve.
 			stat.isDirectoryResolved = !!raw.children || (!!resolveTo && resolveTo.some((r) => {
-				return resources.isEqualOrParent(r, stat.resource, !isLinux /* ignorecase */);
+				return resources.isEqualOrParent(r, stat.resource);
 			}));
 
 			// Recurse into children
@@ -189,6 +196,8 @@ export class ExplorerItem {
 		local.mtime = disk.mtime;
 		local.isDirectoryResolved = disk.isDirectoryResolved;
 		local._isSymbolicLink = disk.isSymbolicLink;
+		local._isReadonly = disk.isReadonly;
+		local._isError = disk.isError;
 
 		// Merge Children if resolved
 		if (mergingDirectories && disk.isDirectoryResolved) {
@@ -270,19 +279,6 @@ export class ExplorerItem {
 		return this.children.size;
 	}
 
-	public getChildrenNames(): string[] {
-		if (!this.children) {
-			return [];
-		}
-
-		const names: string[] = [];
-		this.children.forEach(child => {
-			names.push(child.name);
-		});
-
-		return names;
-	}
-
 	/**
 	 * Removes a child element from this folder.
 	 */
@@ -315,7 +311,7 @@ export class ExplorerItem {
 	}
 
 	private updateResource(recursive: boolean): void {
-		this.resource = this.parent.resource.with({ path: paths.join(this.parent.resource.path, this.name) });
+		this.resource = resources.joinPath(this.parent.resource, this.name);
 
 		if (recursive) {
 			if (this.isDirectory && this.children) {
@@ -346,9 +342,9 @@ export class ExplorerItem {
 	 */
 	public find(resource: URI): ExplorerItem {
 		// Return if path found
-		if (resource && this.resource.scheme === resource.scheme && this.resource.authority === resource.authority &&
-			(isLinux ? startsWith(resource.path, this.resource.path) : startsWithIgnoreCase(resource.path, this.resource.path))
-		) {
+		// For performance reasons try to do the comparison as fast as possible
+		if (resource && this.resource.scheme === resource.scheme && equalsIgnoreCase(this.resource.authority, resource.authority) &&
+			(resources.hasToIgnoreCase(resource) ? startsWithIgnoreCase(resource.path, this.resource.path) : startsWith(resource.path, this.resource.path))) {
 			return this.findByPath(rtrim(resource.path, paths.sep), this.resource.path.length);
 		}
 
@@ -396,7 +392,7 @@ export class NewStatPlaceholder extends ExplorerItem {
 	private directoryPlaceholder: boolean;
 
 	constructor(isDirectory: boolean, root: ExplorerItem) {
-		super(URI.file(''), root, false, false, NewStatPlaceholder.NAME);
+		super(URI.file(''), root, false, false, false, NewStatPlaceholder.NAME);
 
 		this.id = NewStatPlaceholder.ID++;
 		this.isDirectoryResolved = isDirectory;
diff --git a/src/vs/workbench/parts/files/common/files.ts b/src/vs/workbench/parts/files/common/files.ts
index 26c9bd956ca..9db7cbedda6 100644
--- a/src/vs/workbench/parts/files/common/files.ts
+++ b/src/vs/workbench/parts/files/common/files.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { IEditorOptions } from 'vs/editor/common/config/editorOptions';
 import { IWorkbenchEditorConfiguration } from 'vs/workbench/common/editor';
 import { IFilesConfiguration, FileChangeType, IFileService } from 'vs/platform/files/common/files';
@@ -13,7 +13,6 @@ import { ContextKeyExpr, RawContextKey } from 'vs/platform/contextkey/common/con
 import { ITextModelContentProvider } from 'vs/editor/common/services/resolverService';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { TPromise } from 'vs/base/common/winjs.base';
-import { onUnexpectedError } from 'vs/base/common/errors';
 import { ITextModel } from 'vs/editor/common/model';
 import { IMode } from 'vs/editor/common/modes';
 import { IModelService } from 'vs/editor/common/services/modelService';
@@ -50,10 +49,13 @@ const openEditorsVisibleId = 'openEditorsVisible';
 const openEditorsFocusId = 'openEditorsFocus';
 const explorerViewletFocusId = 'explorerViewletFocus';
 const explorerResourceIsFolderId = 'explorerResourceIsFolder';
+const explorerResourceReadonly = 'explorerResourceReadonly';
 const explorerResourceIsRootId = 'explorerResourceIsRoot';
 
 export const ExplorerViewletVisibleContext = new RawContextKey<boolean>(explorerViewletVisibleId, true);
 export const ExplorerFolderContext = new RawContextKey<boolean>(explorerResourceIsFolderId, false);
+export const ExplorerResourceReadonlyContext = new RawContextKey<boolean>(explorerResourceReadonly, false);
+export const ExplorerResourceNotReadonlyContext = ExplorerResourceReadonlyContext.toNegated();
 export const ExplorerRootContext = new RawContextKey<boolean>(explorerResourceIsRootId, false);
 export const FilesExplorerFocusedContext = new RawContextKey<boolean>(filesExplorerFocusId, true);
 export const OpenEditorsVisibleContext = new RawContextKey<boolean>(openEditorsVisibleId, false);
@@ -154,7 +156,7 @@ export class FileOnDiskContentProvider implements ITextModelContentProvider {
 	) {
 	}
 
-	public provideTextContent(resource: URI): TPromise<ITextModel> {
+	provideTextContent(resource: URI): TPromise<ITextModel> {
 		const fileOnDiskResource = URI.file(resource.fsPath);
 
 		// Make sure our file from disk is resolved up to date
@@ -164,7 +166,7 @@ export class FileOnDiskContentProvider implements ITextModelContentProvider {
 			if (!this.fileWatcher) {
 				this.fileWatcher = this.fileService.onFileChanges(changes => {
 					if (changes.contains(fileOnDiskResource, FileChangeType.UPDATED)) {
-						this.resolveEditorModel(resource, false /* do not create if missing */).done(null, onUnexpectedError); // update model when resource changes
+						this.resolveEditorModel(resource, false /* do not create if missing */); // update model when resource changes
 					}
 				});
 
@@ -202,7 +204,7 @@ export class FileOnDiskContentProvider implements ITextModelContentProvider {
 		});
 	}
 
-	public dispose(): void {
+	dispose(): void {
 		this.fileWatcher = dispose(this.fileWatcher);
 	}
 }
diff --git a/src/vs/workbench/parts/files/electron-browser/explorerViewlet.ts b/src/vs/workbench/parts/files/electron-browser/explorerViewlet.ts
index 57326f16477..257e5d35082 100644
--- a/src/vs/workbench/parts/files/electron-browser/explorerViewlet.ts
+++ b/src/vs/workbench/parts/files/electron-browser/explorerViewlet.ts
@@ -173,10 +173,10 @@ export class ExplorerViewlet extends ViewContainerViewlet implements IExplorerVi
 		this._register(this.contextService.onDidChangeWorkspaceName(e => this.updateTitleArea()));
 	}
 
-	async create(parent: HTMLElement): TPromise<void> {
-		await super.create(parent);
-
-		DOM.addClass(parent, 'explorer-viewlet');
+	create(parent: HTMLElement): TPromise<void> {
+		return super.create(parent).then(() => {
+			DOM.addClass(parent, 'explorer-viewlet');
+		});
 	}
 
 	protected createView(viewDescriptor: IViewDescriptor, options: IViewletViewOptions): ViewletPanel {
diff --git a/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.ts b/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.ts
index bdc586291c7..3db81f99473 100644
--- a/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.ts
+++ b/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.ts
@@ -6,25 +6,26 @@
 
 import * as nls from 'vs/nls';
 import { Registry } from 'vs/platform/registry/common/platform';
-import { GlobalNewUntitledFileAction, ShowOpenedFileInNewWindow, CopyPathAction, FocusOpenEditorsView, FocusFilesExplorer, GlobalCompareResourcesAction, SaveAllAction, ShowActiveFileInExplorer, CollapseExplorerView, RefreshExplorerView, CompareWithClipboardAction, NEW_FILE_COMMAND_ID, NEW_FILE_LABEL, NEW_FOLDER_COMMAND_ID, NEW_FOLDER_LABEL, TRIGGER_RENAME_LABEL, MOVE_FILE_TO_TRASH_LABEL, COPY_FILE_LABEL, PASTE_FILE_LABEL, FileCopiedContext, renameHandler, moveFileToTrashHandler, copyFileHandler, pasteFileHandler, deleteFileHandler } from 'vs/workbench/parts/files/electron-browser/fileActions';
+import { ToggleAutoSaveAction, GlobalNewUntitledFileAction, ShowOpenedFileInNewWindow, FocusOpenEditorsView, FocusFilesExplorer, GlobalCompareResourcesAction, SaveAllAction, ShowActiveFileInExplorer, CollapseExplorerView, RefreshExplorerView, CompareWithClipboardAction, NEW_FILE_COMMAND_ID, NEW_FILE_LABEL, NEW_FOLDER_COMMAND_ID, NEW_FOLDER_LABEL, TRIGGER_RENAME_LABEL, MOVE_FILE_TO_TRASH_LABEL, COPY_FILE_LABEL, PASTE_FILE_LABEL, FileCopiedContext, renameHandler, moveFileToTrashHandler, copyFileHandler, pasteFileHandler, deleteFileHandler } from 'vs/workbench/parts/files/electron-browser/fileActions';
 import { revertLocalChangesCommand, acceptLocalChangesCommand, CONFLICT_RESOLUTION_CONTEXT } from 'vs/workbench/parts/files/electron-browser/saveErrorHandler';
 import { SyncActionDescriptor, MenuId, MenuRegistry } from 'vs/platform/actions/common/actions';
 import { IWorkbenchActionRegistry, Extensions as ActionExtensions } from 'vs/workbench/common/actions';
 import { KeyMod, KeyChord, KeyCode } from 'vs/base/common/keyCodes';
-import { openWindowCommand, REVEAL_IN_OS_COMMAND_ID, COPY_PATH_COMMAND_ID, REVEAL_IN_EXPLORER_COMMAND_ID, OPEN_TO_SIDE_COMMAND_ID, REVERT_FILE_COMMAND_ID, SAVE_FILE_COMMAND_ID, SAVE_FILE_LABEL, SAVE_FILE_AS_COMMAND_ID, SAVE_FILE_AS_LABEL, SAVE_ALL_IN_GROUP_COMMAND_ID, OpenEditorsGroupContext, COMPARE_WITH_SAVED_COMMAND_ID, COMPARE_RESOURCE_COMMAND_ID, SELECT_FOR_COMPARE_COMMAND_ID, ResourceSelectedForCompareContext, REVEAL_IN_OS_LABEL, DirtyEditorContext, COMPARE_SELECTED_COMMAND_ID, REMOVE_ROOT_FOLDER_COMMAND_ID, REMOVE_ROOT_FOLDER_LABEL, SAVE_FILES_COMMAND_ID } from 'vs/workbench/parts/files/electron-browser/fileCommands';
+import { openWindowCommand, REVEAL_IN_OS_COMMAND_ID, COPY_PATH_COMMAND_ID, REVEAL_IN_EXPLORER_COMMAND_ID, OPEN_TO_SIDE_COMMAND_ID, REVERT_FILE_COMMAND_ID, SAVE_FILE_COMMAND_ID, SAVE_FILE_LABEL, SAVE_FILE_AS_COMMAND_ID, SAVE_FILE_AS_LABEL, SAVE_ALL_IN_GROUP_COMMAND_ID, OpenEditorsGroupContext, COMPARE_WITH_SAVED_COMMAND_ID, COMPARE_RESOURCE_COMMAND_ID, SELECT_FOR_COMPARE_COMMAND_ID, ResourceSelectedForCompareContext, REVEAL_IN_OS_LABEL, DirtyEditorContext, COMPARE_SELECTED_COMMAND_ID, REMOVE_ROOT_FOLDER_COMMAND_ID, REMOVE_ROOT_FOLDER_LABEL, SAVE_FILES_COMMAND_ID, COPY_RELATIVE_PATH_COMMAND_ID } from 'vs/workbench/parts/files/electron-browser/fileCommands';
 import { CommandsRegistry, ICommandHandler } from 'vs/platform/commands/common/commands';
 import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRegistry';
+import { KeybindingsRegistry, KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
 import { isWindows, isMacintosh } from 'vs/base/common/platform';
-import { FilesExplorerFocusCondition, ExplorerRootContext, ExplorerFolderContext } from 'vs/workbench/parts/files/common/files';
+import { FilesExplorerFocusCondition, ExplorerRootContext, ExplorerFolderContext, ExplorerResourceNotReadonlyContext } from 'vs/workbench/parts/files/common/files';
 import { ADD_ROOT_FOLDER_COMMAND_ID, ADD_ROOT_FOLDER_LABEL } from 'vs/workbench/browser/actions/workspaceCommands';
 import { CLOSE_SAVED_EDITORS_COMMAND_ID, CLOSE_EDITORS_IN_GROUP_COMMAND_ID, CLOSE_EDITOR_COMMAND_ID, CLOSE_OTHER_EDITORS_IN_GROUP_COMMAND_ID } from 'vs/workbench/browser/parts/editor/editorCommands';
 import { OPEN_FOLDER_SETTINGS_COMMAND, OPEN_FOLDER_SETTINGS_LABEL } from 'vs/workbench/parts/preferences/browser/preferencesActions';
 import { AutoSaveContext } from 'vs/workbench/services/textfile/common/textfiles';
 import { ResourceContextKey } from 'vs/workbench/common/resources';
 import { WorkbenchListDoubleSelection } from 'vs/platform/list/browser/listService';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { Schemas } from 'vs/base/common/network';
+import { FileDialogContext } from 'vs/platform/workbench/common/contextkeys';
 
 // Contribute Global Actions
 const category = nls.localize('filesCategory', "File");
@@ -40,6 +41,7 @@ registry.registerWorkbenchAction(new SyncActionDescriptor(RefreshExplorerView, R
 registry.registerWorkbenchAction(new SyncActionDescriptor(GlobalNewUntitledFileAction, GlobalNewUntitledFileAction.ID, GlobalNewUntitledFileAction.LABEL, { primary: KeyMod.CtrlCmd | KeyCode.KEY_N }), 'File: New Untitled File', category);
 registry.registerWorkbenchAction(new SyncActionDescriptor(ShowOpenedFileInNewWindow, ShowOpenedFileInNewWindow.ID, ShowOpenedFileInNewWindow.LABEL, { primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_K, KeyCode.KEY_O) }), 'File: Open Active File in New Window', category);
 registry.registerWorkbenchAction(new SyncActionDescriptor(CompareWithClipboardAction, CompareWithClipboardAction.ID, CompareWithClipboardAction.LABEL, { primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_K, KeyCode.KEY_C) }), 'File: Compare Active File with Clipboard', category);
+registry.registerWorkbenchAction(new SyncActionDescriptor(ToggleAutoSaveAction, ToggleAutoSaveAction.ID, ToggleAutoSaveAction.LABEL), 'File: Toggle Auto Save', category);
 
 // Commands
 CommandsRegistry.registerCommand('_files.windowOpen', openWindowCommand);
@@ -49,8 +51,8 @@ const explorerCommandsWeightBonus = 10; // give our commands a little bit more w
 const RENAME_ID = 'renameFile';
 KeybindingsRegistry.registerCommandAndKeybindingRule({
 	id: RENAME_ID,
-	weight: KeybindingsRegistry.WEIGHT.workbenchContrib(explorerCommandsWeightBonus),
-	when: ContextKeyExpr.and(FilesExplorerFocusCondition, ExplorerRootContext.toNegated()),
+	weight: KeybindingWeight.WorkbenchContrib + explorerCommandsWeightBonus,
+	when: ContextKeyExpr.and(FilesExplorerFocusCondition, ExplorerRootContext.toNegated(), ExplorerResourceNotReadonlyContext),
 	primary: KeyCode.F2,
 	mac: {
 		primary: KeyCode.Enter
@@ -61,8 +63,8 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 const MOVE_FILE_TO_TRASH_ID = 'moveFileToTrash';
 KeybindingsRegistry.registerCommandAndKeybindingRule({
 	id: MOVE_FILE_TO_TRASH_ID,
-	weight: KeybindingsRegistry.WEIGHT.workbenchContrib(explorerCommandsWeightBonus),
-	when: ContextKeyExpr.and(FilesExplorerFocusCondition, ExplorerRootContext.toNegated()),
+	weight: KeybindingWeight.WorkbenchContrib + explorerCommandsWeightBonus,
+	when: ContextKeyExpr.and(FilesExplorerFocusCondition, ExplorerRootContext.toNegated(), ExplorerResourceNotReadonlyContext),
 	primary: KeyCode.Delete,
 	mac: {
 		primary: KeyMod.CtrlCmd | KeyCode.Backspace
@@ -73,8 +75,8 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 const DELETE_FILE_ID = 'deleteFile';
 KeybindingsRegistry.registerCommandAndKeybindingRule({
 	id: DELETE_FILE_ID,
-	weight: KeybindingsRegistry.WEIGHT.workbenchContrib(explorerCommandsWeightBonus),
-	when: ContextKeyExpr.and(FilesExplorerFocusCondition, ExplorerRootContext.toNegated()),
+	weight: KeybindingWeight.WorkbenchContrib + explorerCommandsWeightBonus,
+	when: ContextKeyExpr.and(FilesExplorerFocusCondition, ExplorerRootContext.toNegated(), ExplorerResourceNotReadonlyContext),
 	primary: KeyMod.Shift | KeyCode.Delete,
 	mac: {
 		primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.Backspace
@@ -85,7 +87,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 const COPY_FILE_ID = 'filesExplorer.copy';
 KeybindingsRegistry.registerCommandAndKeybindingRule({
 	id: COPY_FILE_ID,
-	weight: KeybindingsRegistry.WEIGHT.workbenchContrib(explorerCommandsWeightBonus),
+	weight: KeybindingWeight.WorkbenchContrib + explorerCommandsWeightBonus,
 	when: ContextKeyExpr.and(FilesExplorerFocusCondition, ExplorerRootContext.toNegated()),
 	primary: KeyMod.CtrlCmd | KeyCode.KEY_C,
 	handler: copyFileHandler,
@@ -95,45 +97,56 @@ const PASTE_FILE_ID = 'filesExplorer.paste';
 
 KeybindingsRegistry.registerCommandAndKeybindingRule({
 	id: PASTE_FILE_ID,
-	weight: KeybindingsRegistry.WEIGHT.workbenchContrib(explorerCommandsWeightBonus),
-	when: ContextKeyExpr.and(FilesExplorerFocusCondition),
+	weight: KeybindingWeight.WorkbenchContrib + explorerCommandsWeightBonus,
+	when: ContextKeyExpr.and(FilesExplorerFocusCondition, ExplorerResourceNotReadonlyContext),
 	primary: KeyMod.CtrlCmd | KeyCode.KEY_V,
 	handler: pasteFileHandler
 });
 
+const copyPathCommand = {
+	id: COPY_PATH_COMMAND_ID,
+	title: nls.localize('copyPath', "Copy Path")
+};
+
+const copyRelativePathCommand = {
+	id: COPY_RELATIVE_PATH_COMMAND_ID,
+	title: nls.localize('copyRelativePath', "Copy Relative Path")
+};
+
 // Editor Title Context Menu
 appendEditorTitleContextMenuItem(REVEAL_IN_OS_COMMAND_ID, REVEAL_IN_OS_LABEL, ResourceContextKey.Scheme.isEqualTo(Schemas.file));
-appendEditorTitleContextMenuItem(COPY_PATH_COMMAND_ID, CopyPathAction.LABEL, ResourceContextKey.IsFile);
-appendEditorTitleContextMenuItem(REVEAL_IN_EXPLORER_COMMAND_ID, nls.localize('revealInSideBar', "Reveal in Side Bar"), ResourceContextKey.IsFile);
+appendEditorTitleContextMenuItem(COPY_PATH_COMMAND_ID, copyPathCommand.title, ResourceContextKey.IsFileSystemResource, copyRelativePathCommand);
+appendEditorTitleContextMenuItem(REVEAL_IN_EXPLORER_COMMAND_ID, nls.localize('revealInSideBar', "Reveal in Side Bar"), ResourceContextKey.IsFileSystemResource);
 
-function appendEditorTitleContextMenuItem(id: string, title: string, when: ContextKeyExpr): void {
+function appendEditorTitleContextMenuItem(id: string, title: string, when: ContextKeyExpr, alt?: { id: string, title: string }): void {
 
 	// Menu
 	MenuRegistry.appendMenuItem(MenuId.EditorTitleContext, {
 		command: { id, title },
 		when,
-		group: '2_files'
+		group: '2_files',
+		alt
 	});
 }
 
 // Editor Title Menu for Conflict Resolution
 appendSaveConflictEditorTitleAction('workbench.files.action.acceptLocalChanges', nls.localize('acceptLocalChanges', "Use your changes and overwrite disk contents"), {
-	light: URI.parse(require.toUrl(`vs/workbench/parts/files/electron-browser/media/check.svg`)).fsPath,
-	dark: URI.parse(require.toUrl(`vs/workbench/parts/files/electron-browser/media/check-inverse.svg`)).fsPath
+	light: URI.parse(require.toUrl(`vs/workbench/parts/files/electron-browser/media/check.svg`)),
+	dark: URI.parse(require.toUrl(`vs/workbench/parts/files/electron-browser/media/check-inverse.svg`))
 }, -10, acceptLocalChangesCommand);
 appendSaveConflictEditorTitleAction('workbench.files.action.revertLocalChanges', nls.localize('revertLocalChanges', "Discard your changes and revert to content on disk"), {
-	light: URI.parse(require.toUrl(`vs/workbench/parts/files/electron-browser/media/undo.svg`)).fsPath,
-	dark: URI.parse(require.toUrl(`vs/workbench/parts/files/electron-browser/media/undo-inverse.svg`)).fsPath
+	light: URI.parse(require.toUrl(`vs/workbench/parts/files/electron-browser/media/undo.svg`)),
+	dark: URI.parse(require.toUrl(`vs/workbench/parts/files/electron-browser/media/undo-inverse.svg`))
 }, -9, revertLocalChangesCommand);
 
-function appendSaveConflictEditorTitleAction(id: string, title: string, iconPath: { dark: string; light?: string; }, order: number, command: ICommandHandler): void {
+function appendSaveConflictEditorTitleAction(id: string, title: string, iconLocation: { dark: URI; light?: URI; }, order: number, command: ICommandHandler): void {
 
 	// Command
 	CommandsRegistry.registerCommand(id, command);
 
 	// Action
 	MenuRegistry.appendMenuItem(MenuId.EditorTitle, {
-		command: { id, title, iconPath },
+		command: { id, title, iconLocation },
 		when: ContextKeyExpr.equals(CONFLICT_RESOLUTION_CONTEXT, true),
 		group: 'navigation',
 		order
@@ -142,29 +155,29 @@ function appendSaveConflictEditorTitleAction(id: string, title: string, iconPath
 
 // Menu registration - command palette
 
-function appendToCommandPalette(id: string, title: string, category: string): void {
+function appendToCommandPalette(id: string, title: string, category: string, when?: ContextKeyExpr): void {
 	MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
 		command: {
 			id,
 			title,
 			category
-		}
+		},
+		when
 	});
 }
 appendToCommandPalette(COPY_PATH_COMMAND_ID, nls.localize('copyPathOfActive', "Copy Path of Active File"), category);
+appendToCommandPalette(COPY_RELATIVE_PATH_COMMAND_ID, nls.localize('copyRelativePathOfActive', "Copy Relative Path of Active File"), category);
 appendToCommandPalette(SAVE_FILE_COMMAND_ID, SAVE_FILE_LABEL, category);
 appendToCommandPalette(SAVE_ALL_IN_GROUP_COMMAND_ID, nls.localize('saveAllInGroup', "Save All in Group"), category);
 appendToCommandPalette(SAVE_FILES_COMMAND_ID, nls.localize('saveFiles', "Save All Files"), category);
 appendToCommandPalette(REVERT_FILE_COMMAND_ID, nls.localize('revert', "Revert File"), category);
 appendToCommandPalette(COMPARE_WITH_SAVED_COMMAND_ID, nls.localize('compareActiveWithSaved', "Compare Active File with Saved"), category);
 appendToCommandPalette(REVEAL_IN_OS_COMMAND_ID, REVEAL_IN_OS_LABEL, category);
-appendToCommandPalette(SAVE_FILE_AS_COMMAND_ID, SAVE_FILE_AS_LABEL, category);
+appendToCommandPalette(SAVE_FILE_AS_COMMAND_ID, SAVE_FILE_AS_LABEL, category, FileDialogContext.isEqualTo('local'));
 appendToCommandPalette(CLOSE_EDITOR_COMMAND_ID, nls.localize('closeEditor', "Close Editor"), nls.localize('view', "View"));
 appendToCommandPalette(NEW_FILE_COMMAND_ID, NEW_FILE_LABEL, category);
 appendToCommandPalette(NEW_FOLDER_COMMAND_ID, NEW_FOLDER_LABEL, category);
 
-
-
 // Menu registration - open editors
 
 const openToSideCommand = {
@@ -175,7 +188,7 @@ MenuRegistry.appendMenuItem(MenuId.OpenEditorsContext, {
 	group: 'navigation',
 	order: 10,
 	command: openToSideCommand,
-	when: ResourceContextKey.IsFile
+	when: ResourceContextKey.IsFileSystemResource
 });
 
 const revealInOsCommand = {
@@ -186,18 +199,15 @@ MenuRegistry.appendMenuItem(MenuId.OpenEditorsContext, {
 	group: 'navigation',
 	order: 20,
 	command: revealInOsCommand,
-	when: ResourceContextKey.Scheme.isEqualTo(Schemas.file)
+	when: ResourceContextKey.IsFileSystemResource
 });
 
-const copyPathCommand = {
-	id: COPY_PATH_COMMAND_ID,
-	title: nls.localize('copyPath', "Copy Path")
-};
 MenuRegistry.appendMenuItem(MenuId.OpenEditorsContext, {
 	group: 'navigation',
 	order: 40,
 	command: copyPathCommand,
-	when: ResourceContextKey.IsFile
+	alt: copyRelativePathCommand,
+	when: ResourceContextKey.IsFileSystemResource
 });
 
 MenuRegistry.appendMenuItem(MenuId.OpenEditorsContext, {
@@ -208,7 +218,7 @@ MenuRegistry.appendMenuItem(MenuId.OpenEditorsContext, {
 		title: SAVE_FILE_LABEL,
 		precondition: DirtyEditorContext
 	},
-	when: ContextKeyExpr.and(ResourceContextKey.IsFile, AutoSaveContext.notEqualsTo('afterDelay') && AutoSaveContext.notEqualsTo(''))
+	when: ContextKeyExpr.and(ResourceContextKey.IsFileSystemResource, AutoSaveContext.notEqualsTo('afterDelay') && AutoSaveContext.notEqualsTo(''))
 });
 
 MenuRegistry.appendMenuItem(MenuId.OpenEditorsContext, {
@@ -219,7 +229,7 @@ MenuRegistry.appendMenuItem(MenuId.OpenEditorsContext, {
 		title: nls.localize('revert', "Revert File"),
 		precondition: DirtyEditorContext
 	},
-	when: ContextKeyExpr.and(ResourceContextKey.IsFile, AutoSaveContext.notEqualsTo('afterDelay') && AutoSaveContext.notEqualsTo(''))
+	when: ContextKeyExpr.and(ResourceContextKey.IsFileSystemResource, AutoSaveContext.notEqualsTo('afterDelay') && AutoSaveContext.notEqualsTo(''))
 });
 
 MenuRegistry.appendMenuItem(MenuId.OpenEditorsContext, {
@@ -248,7 +258,7 @@ MenuRegistry.appendMenuItem(MenuId.OpenEditorsContext, {
 		title: nls.localize('compareWithSaved', "Compare with Saved"),
 		precondition: DirtyEditorContext
 	},
-	when: ContextKeyExpr.and(ResourceContextKey.IsFile, AutoSaveContext.notEqualsTo('afterDelay') && AutoSaveContext.notEqualsTo(''), WorkbenchListDoubleSelection.toNegated())
+	when: ContextKeyExpr.and(ResourceContextKey.IsFileSystemResource, AutoSaveContext.notEqualsTo('afterDelay') && AutoSaveContext.notEqualsTo(''), WorkbenchListDoubleSelection.toNegated())
 });
 
 const compareResourceCommand = {
@@ -259,7 +269,7 @@ MenuRegistry.appendMenuItem(MenuId.OpenEditorsContext, {
 	group: '3_compare',
 	order: 20,
 	command: compareResourceCommand,
-	when: ContextKeyExpr.and(ResourceContextKey.HasResource, ResourceSelectedForCompareContext, WorkbenchListDoubleSelection.toNegated())
+	when: ContextKeyExpr.and(ResourceContextKey.IsFileSystemResourceOrUntitled, ResourceSelectedForCompareContext, WorkbenchListDoubleSelection.toNegated())
 });
 
 const selectForCompareCommand = {
@@ -270,7 +280,7 @@ MenuRegistry.appendMenuItem(MenuId.OpenEditorsContext, {
 	group: '3_compare',
 	order: 30,
 	command: selectForCompareCommand,
-	when: ContextKeyExpr.and(ResourceContextKey.HasResource, WorkbenchListDoubleSelection.toNegated())
+	when: ContextKeyExpr.and(ResourceContextKey.IsFileSystemResourceOrUntitled, WorkbenchListDoubleSelection.toNegated())
 });
 
 const compareSelectedCommand = {
@@ -281,7 +291,7 @@ MenuRegistry.appendMenuItem(MenuId.OpenEditorsContext, {
 	group: '3_compare',
 	order: 30,
 	command: compareSelectedCommand,
-	when: ContextKeyExpr.and(ResourceContextKey.HasResource, WorkbenchListDoubleSelection)
+	when: ContextKeyExpr.and(ResourceContextKey.IsFileSystemResourceOrUntitled, WorkbenchListDoubleSelection)
 });
 
 MenuRegistry.appendMenuItem(MenuId.OpenEditorsContext, {
@@ -329,7 +339,8 @@ MenuRegistry.appendMenuItem(MenuId.ExplorerContext, {
 	order: 4,
 	command: {
 		id: NEW_FILE_COMMAND_ID,
-		title: NEW_FILE_LABEL
+		title: NEW_FILE_LABEL,
+		precondition: ExplorerResourceNotReadonlyContext
 	},
 	when: ExplorerFolderContext
 });
@@ -339,7 +350,8 @@ MenuRegistry.appendMenuItem(MenuId.ExplorerContext, {
 	order: 6,
 	command: {
 		id: NEW_FOLDER_COMMAND_ID,
-		title: NEW_FOLDER_LABEL
+		title: NEW_FOLDER_LABEL,
+		precondition: ExplorerResourceNotReadonlyContext
 	},
 	when: ExplorerFolderContext
 });
@@ -362,21 +374,21 @@ MenuRegistry.appendMenuItem(MenuId.ExplorerContext, {
 	group: '3_compare',
 	order: 20,
 	command: compareResourceCommand,
-	when: ContextKeyExpr.and(ExplorerFolderContext.toNegated(), ResourceContextKey.IsFile, ResourceSelectedForCompareContext, WorkbenchListDoubleSelection.toNegated())
+	when: ContextKeyExpr.and(ExplorerFolderContext.toNegated(), ResourceContextKey.HasResource, ResourceSelectedForCompareContext, WorkbenchListDoubleSelection.toNegated())
 });
 
 MenuRegistry.appendMenuItem(MenuId.ExplorerContext, {
 	group: '3_compare',
 	order: 30,
 	command: selectForCompareCommand,
-	when: ContextKeyExpr.and(ExplorerFolderContext.toNegated(), ResourceContextKey.IsFile, WorkbenchListDoubleSelection.toNegated())
+	when: ContextKeyExpr.and(ExplorerFolderContext.toNegated(), ResourceContextKey.HasResource, WorkbenchListDoubleSelection.toNegated())
 });
 
 MenuRegistry.appendMenuItem(MenuId.ExplorerContext, {
 	group: '3_compare',
 	order: 30,
 	command: compareSelectedCommand,
-	when: ContextKeyExpr.and(ExplorerFolderContext.toNegated(), ResourceContextKey.IsFile, WorkbenchListDoubleSelection)
+	when: ContextKeyExpr.and(ExplorerFolderContext.toNegated(), ResourceContextKey.HasResource, WorkbenchListDoubleSelection)
 });
 
 MenuRegistry.appendMenuItem(MenuId.ExplorerContext, {
@@ -404,7 +416,8 @@ MenuRegistry.appendMenuItem(MenuId.ExplorerContext, {
 	group: '5_cutcopypaste',
 	order: 30,
 	command: copyPathCommand,
-	when: ResourceContextKey.IsFile
+	alt: copyRelativePathCommand,
+	when: ResourceContextKey.IsFileSystemResource
 });
 
 MenuRegistry.appendMenuItem(MenuId.ExplorerContext, {
@@ -414,7 +427,7 @@ MenuRegistry.appendMenuItem(MenuId.ExplorerContext, {
 		id: ADD_ROOT_FOLDER_COMMAND_ID,
 		title: ADD_ROOT_FOLDER_LABEL
 	},
-	when: ExplorerRootContext
+	when: ContextKeyExpr.and(ExplorerRootContext, FileDialogContext.isEqualTo('local'))
 });
 
 MenuRegistry.appendMenuItem(MenuId.ExplorerContext, {
@@ -442,7 +455,8 @@ MenuRegistry.appendMenuItem(MenuId.ExplorerContext, {
 	order: 10,
 	command: {
 		id: RENAME_ID,
-		title: TRIGGER_RENAME_LABEL
+		title: TRIGGER_RENAME_LABEL,
+		precondition: ExplorerResourceNotReadonlyContext
 	},
 	when: ExplorerRootContext.toNegated()
 });
@@ -452,15 +466,95 @@ MenuRegistry.appendMenuItem(MenuId.ExplorerContext, {
 	order: 20,
 	command: {
 		id: MOVE_FILE_TO_TRASH_ID,
-		title: MOVE_FILE_TO_TRASH_LABEL
+		title: MOVE_FILE_TO_TRASH_LABEL,
+		precondition: ExplorerResourceNotReadonlyContext
 	},
 	alt: {
 		id: DELETE_FILE_ID,
-		title: nls.localize('deleteFile', "Delete Permanently")
+		title: nls.localize('deleteFile', "Delete Permanently"),
+		precondition: ExplorerResourceNotReadonlyContext
 	},
 	when: ExplorerRootContext.toNegated()
 });
 
 // Empty Editor Group Context Menu
-MenuRegistry.appendMenuItem(MenuId.EmptyEditorGroupContext, { command: { id: 'workbench.action.files.newUntitledFile', title: nls.localize('newFile', "New File") }, group: '1_file', order: 10 });
-MenuRegistry.appendMenuItem(MenuId.EmptyEditorGroupContext, { command: { id: 'workbench.action.quickOpen', title: nls.localize('openFile', "Open File...") }, group: '1_file', order: 20 });
\ No newline at end of file
+MenuRegistry.appendMenuItem(MenuId.EmptyEditorGroupContext, { command: { id: GlobalNewUntitledFileAction.ID, title: nls.localize('newFile', "New File") }, group: '1_file', order: 10 });
+MenuRegistry.appendMenuItem(MenuId.EmptyEditorGroupContext, { command: { id: 'workbench.action.quickOpen', title: nls.localize('openFile', "Open File...") }, group: '1_file', order: 20 });
+
+// File menu
+
+MenuRegistry.appendMenuItem(MenuId.MenubarFileMenu, {
+	group: '1_new',
+	command: {
+		id: GlobalNewUntitledFileAction.ID,
+		title: nls.localize({ key: 'miNewFile', comment: ['&& denotes a mnemonic'] }, "&&New File")
+	},
+	order: 1
+});
+
+MenuRegistry.appendMenuItem(MenuId.MenubarFileMenu, {
+	group: '4_save',
+	command: {
+		id: SAVE_FILE_COMMAND_ID,
+		title: nls.localize({ key: 'miSave', comment: ['&& denotes a mnemonic'] }, "&&Save")
+	},
+	order: 1
+});
+
+MenuRegistry.appendMenuItem(MenuId.MenubarFileMenu, {
+	group: '4_save',
+	command: {
+		id: SAVE_FILE_AS_COMMAND_ID,
+		title: nls.localize({ key: 'miSaveAs', comment: ['&& denotes a mnemonic'] }, "Save &&As...")
+	},
+	order: 2,
+	when: FileDialogContext.isEqualTo('local')
+});
+
+MenuRegistry.appendMenuItem(MenuId.MenubarFileMenu, {
+	group: '4_save',
+	command: {
+		id: SaveAllAction.ID,
+		title: nls.localize({ key: 'miSaveAll', comment: ['&& denotes a mnemonic'] }, "Save A&&ll")
+	},
+	order: 3
+});
+
+MenuRegistry.appendMenuItem(MenuId.MenubarFileMenu, {
+	group: '5_autosave',
+	command: {
+		id: ToggleAutoSaveAction.ID,
+		title: nls.localize('miAutoSave', "Auto Save")
+	},
+	order: 1
+});
+
+MenuRegistry.appendMenuItem(MenuId.MenubarFileMenu, {
+	group: '6_close',
+	command: {
+		id: REVERT_FILE_COMMAND_ID,
+		title: nls.localize({ key: 'miRevert', comment: ['&& denotes a mnemonic'] }, "Re&&vert File"),
+		precondition: DirtyEditorContext
+	},
+	order: 1
+});
+
+MenuRegistry.appendMenuItem(MenuId.MenubarFileMenu, {
+	group: '6_close',
+	command: {
+		id: CLOSE_EDITOR_COMMAND_ID,
+		title: nls.localize({ key: 'miCloseEditor', comment: ['&& denotes a mnemonic'] }, "&&Close Editor")
+	},
+	order: 2
+});
+
+// Go to menu
+
+MenuRegistry.appendMenuItem(MenuId.MenubarGoMenu, {
+	group: 'z_go_to',
+	command: {
+		id: 'workbench.action.quickOpen',
+		title: nls.localize({ key: 'miGotoFile', comment: ['&& denotes a mnemonic'] }, "Go to &&File...")
+	},
+	order: 1
+});
diff --git a/src/vs/workbench/parts/files/electron-browser/fileActions.ts b/src/vs/workbench/parts/files/electron-browser/fileActions.ts
index 725875e9e81..46d4ba300f2 100644
--- a/src/vs/workbench/parts/files/electron-browser/fileActions.ts
+++ b/src/vs/workbench/parts/files/electron-browser/fileActions.ts
@@ -8,23 +8,21 @@
 import 'vs/css!./media/fileactions';
 import { TPromise } from 'vs/base/common/winjs.base';
 import * as nls from 'vs/nls';
+import * as types from 'vs/base/common/types';
 import { isWindows, isLinux } from 'vs/base/common/platform';
 import { sequence, ITask, always } from 'vs/base/common/async';
 import * as paths from 'vs/base/common/paths';
 import * as resources from 'vs/base/common/resources';
-import URI from 'vs/base/common/uri';
-import { posix } from 'path';
-import * as errors from 'vs/base/common/errors';
+import { URI } from 'vs/base/common/uri';
 import { toErrorMessage } from 'vs/base/common/errorMessage';
 import * as strings from 'vs/base/common/strings';
-import * as diagnostics from 'vs/base/common/diagnostics';
 import { Action, IAction } from 'vs/base/common/actions';
 import { MessageType, IInputValidator } from 'vs/base/browser/ui/inputbox/inputBox';
 import { ITree, IHighlightEvent } from 'vs/base/parts/tree/browser/tree';
 import { dispose, IDisposable } from 'vs/base/common/lifecycle';
 import { VIEWLET_ID } from 'vs/workbench/parts/files/common/files';
 import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
-import { IFileService, IFileStat } from 'vs/platform/files/common/files';
+import { IFileService, IFileStat, AutoSaveConfiguration } from 'vs/platform/files/common/files';
 import { toResource, IUntitledResourceInput } from 'vs/workbench/common/editor';
 import { ExplorerItem, Model, NewStatPlaceholder } from 'vs/workbench/parts/files/common/explorerModel';
 import { ExplorerView } from 'vs/workbench/parts/files/electron-browser/views/explorerView';
@@ -35,9 +33,8 @@ import { IQuickOpenService } from 'vs/platform/quickOpen/common/quickOpen';
 import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet';
 import { IInstantiationService, ServicesAccessor, IConstructorSignature2 } from 'vs/platform/instantiation/common/instantiation';
 import { ITextModel } from 'vs/editor/common/model';
-import { IBackupFileService } from 'vs/workbench/services/backup/common/backup';
 import { IWindowService } from 'vs/platform/windows/common/windows';
-import { COPY_PATH_COMMAND_ID, REVEAL_IN_EXPLORER_COMMAND_ID, SAVE_ALL_COMMAND_ID, SAVE_ALL_LABEL, SAVE_ALL_IN_GROUP_COMMAND_ID } from 'vs/workbench/parts/files/electron-browser/fileCommands';
+import { REVEAL_IN_EXPLORER_COMMAND_ID, SAVE_ALL_COMMAND_ID, SAVE_ALL_LABEL, SAVE_ALL_IN_GROUP_COMMAND_ID } from 'vs/workbench/parts/files/electron-browser/fileCommands';
 import { ITextModelService, ITextModelContentProvider } from 'vs/editor/common/services/resolverService';
 import { IConfigurationService, ConfigurationTarget } from 'vs/platform/configuration/common/configuration';
 import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
@@ -209,11 +206,11 @@ class TriggerRenameFileAction extends BaseFileAction {
 			const unbind = this.tree.onDidChangeHighlight((e: IHighlightEvent) => {
 				if (!e.highlight) {
 					viewletState.clearEditable(stat);
-					this.tree.refresh(stat).done(null, errors.onUnexpectedError);
+					this.tree.refresh(stat);
 					unbind.dispose();
 				}
 			});
-		}).done(null, errors.onUnexpectedError);
+		});
 
 		return void 0;
 	}
@@ -234,6 +231,10 @@ export abstract class BaseRenameAction extends BaseFileAction {
 		this.element = element;
 	}
 
+	_isEnabled(): boolean {
+		return super._isEnabled() && this.element && !this.element.isReadonly;
+	}
+
 	public run(context?: any): TPromise<any> {
 		if (!context) {
 			return TPromise.wrapError(new Error('No context provided to BaseRenameFileAction.'));
@@ -288,8 +289,7 @@ class RenameFileAction extends BaseRenameAction {
 		element: ExplorerItem,
 		@IFileService fileService: IFileService,
 		@INotificationService notificationService: INotificationService,
-		@ITextFileService textFileService: ITextFileService,
-		@IBackupFileService private backupFileService: IBackupFileService
+		@ITextFileService textFileService: ITextFileService
 	) {
 		super(RenameFileAction.ID, nls.localize('rename', "Rename"), element, fileService, notificationService, textFileService);
 
@@ -297,43 +297,10 @@ class RenameFileAction extends BaseRenameAction {
 	}
 
 	public runAction(newName: string): TPromise<any> {
-		const dirty = this.textFileService.getDirty().filter(d => resources.isEqualOrParent(d, this.element.resource, !isLinux /* ignorecase */));
-		const dirtyRenamed: URI[] = [];
-		return TPromise.join(dirty.map(d => {
-			let renamed: URI;
+		const parentResource = this.element.parent.resource;
+		const targetResource = resources.joinPath(parentResource, newName);
 
-			// If the dirty file itself got moved, just reparent it to the target folder
-			const targetPath = paths.join(this.element.parent.resource.path, newName);
-			if (this.element.resource.toString() === d.toString()) {
-				renamed = this.element.parent.resource.with({ path: targetPath });
-			}
-
-			// Otherwise, a parent of the dirty resource got moved, so we have to reparent more complicated. Example:
-			else {
-				renamed = this.element.parent.resource.with({ path: paths.join(targetPath, d.path.substr(this.element.resource.path.length + 1)) });
-			}
-
-			dirtyRenamed.push(renamed);
-
-			const model = this.textFileService.models.get(d);
-
-			return this.backupFileService.backupResource(renamed, model.createSnapshot(), model.getVersionId());
-		}))
-
-			// 2. soft revert all dirty since we have backed up their contents
-			.then(() => this.textFileService.revertAll(dirty, { soft: true /* do not attempt to load content from disk */ }))
-
-			// 3.) run the rename operation
-			.then(() => this.fileService.rename(this.element.resource, newName).then(null, (error: Error) => {
-				return TPromise.join(dirtyRenamed.map(d => this.backupFileService.discardResourceBackup(d))).then(() => {
-					this.onErrorWithRetry(error, () => this.runAction(newName));
-				});
-			}))
-
-			// 4.) resolve those that were dirty to load their previous dirty contents from disk
-			.then(() => {
-				return TPromise.join(dirtyRenamed.map(t => this.textFileService.models.loadOrCreate(t)));
-			});
+		return this.textFileService.move(this.element.resource, targetResource);
 	}
 }
 
@@ -390,6 +357,9 @@ export class BaseNewAction extends BaseFileAction {
 		if (!folder) {
 			return TPromise.wrapError(new Error('Invalid parent folder to create.'));
 		}
+		if (folder.isReadonly) {
+			return TPromise.wrapError(new Error('Parent folder is readonly.'));
+		}
 		if (!!folder.getChild(NewStatPlaceholder.NAME)) {
 			// Do not allow to creatae a new file/folder while in the process of creating a new file/folder #47606
 			return TPromise.as(new Error('Parent folder is already in the process of creating a file'));
@@ -426,7 +396,7 @@ export class BaseNewAction extends BaseFileAction {
 							const unbind = this.tree.onDidChangeHighlight((e: IHighlightEvent) => {
 								if (!e.highlight) {
 									stat.destroy();
-									this.tree.refresh(folder).done(null, errors.onUnexpectedError);
+									this.tree.refresh(folder);
 									unbind.dispose();
 								}
 							});
@@ -524,7 +494,7 @@ class CreateFileAction extends BaseCreateAction {
 
 	public runAction(fileName: string): TPromise<any> {
 		const resource = this.element.parent.resource;
-		return this.fileService.createFile(resource.with({ path: paths.join(resource.path, fileName) })).then(stat => {
+		return this.fileService.createFile(resources.joinPath(resource, fileName)).then(stat => {
 			return this.editorService.openEditor({ resource: stat.resource, options: { pinned: true } });
 		}, (error) => {
 			this.onErrorWithRetry(error, () => this.runAction(fileName));
@@ -551,7 +521,7 @@ class CreateFolderAction extends BaseCreateAction {
 
 	public runAction(fileName: string): TPromise<any> {
 		const resource = this.element.parent.resource;
-		return this.fileService.createFolder(resource.with({ path: paths.join(resource.path, fileName) })).then(null, (error) => {
+		return this.fileService.createFolder(resources.joinPath(resource, fileName)).then(null, (error) => {
 			this.onErrorWithRetry(error, () => this.runAction(fileName));
 		});
 	}
@@ -581,6 +551,10 @@ class BaseDeleteFileAction extends BaseFileAction {
 		this._updateEnablement();
 	}
 
+	_isEnabled(): boolean {
+		return super._isEnabled() && this.elements && this.elements.every(e => !e.isReadonly);
+	}
+
 	public run(): TPromise<any> {
 
 		// Remove highlight
@@ -684,7 +658,7 @@ class BaseDeleteFileAction extends BaseFileAction {
 					}
 
 					// Call function
-					const servicePromise = TPromise.join(distinctElements.map(e => this.fileService.del(e.resource, this.useTrash))).then(() => {
+					const servicePromise = TPromise.join(distinctElements.map(e => this.fileService.del(e.resource, { useTrash: this.useTrash, recursive: true }))).then(() => {
 						if (distinctElements[0].parent) {
 							this.tree.setFocus(distinctElements[0].parent); // move focus to parent
 						}
@@ -808,9 +782,9 @@ export class AddFilesAction extends BaseFileAction {
 		this._updateEnablement();
 	}
 
-	public run(resources: URI[]): TPromise<any> {
+	public run(resourcesToAdd: URI[]): TPromise<any> {
 		const addPromise = TPromise.as(null).then(() => {
-			if (resources && resources.length > 0) {
+			if (resourcesToAdd && resourcesToAdd.length > 0) {
 
 				// Find parent to add to
 				let targetElement: ExplorerItem;
@@ -835,8 +809,8 @@ export class AddFilesAction extends BaseFileAction {
 					});
 
 					let overwritePromise: TPromise<IConfirmationResult> = TPromise.as({ confirmed: true });
-					if (resources.some(resource => {
-						return targetNames.has(isLinux ? paths.basename(resource.fsPath) : paths.basename(resource.fsPath).toLowerCase());
+					if (resourcesToAdd.some(resource => {
+						return targetNames.has(!resources.hasToIgnoreCase(resource) ? resources.basename(resource) : resources.basename(resource).toLowerCase());
 					})) {
 						const confirm: IConfirmation = {
 							message: nls.localize('confirmOverwrite', "A file or folder with the same name already exists in the destination folder. Do you want to replace it?"),
@@ -855,10 +829,10 @@ export class AddFilesAction extends BaseFileAction {
 
 						// Run add in sequence
 						const addPromisesFactory: ITask<TPromise<void>>[] = [];
-						resources.forEach(resource => {
+						resourcesToAdd.forEach(resource => {
 							addPromisesFactory.push(() => {
 								const sourceFile = resource;
-								const targetFile = targetElement.resource.with({ path: paths.join(targetElement.resource.path, paths.basename(sourceFile.path)) });
+								const targetFile = resources.joinPath(targetElement.resource, resources.basename(sourceFile));
 
 								// if the target exists and is dirty, make sure to revert it. otherwise the dirty contents
 								// of the target file would replace the contents of the added file. since we already
@@ -869,11 +843,11 @@ export class AddFilesAction extends BaseFileAction {
 								}
 
 								return revertPromise.then(() => {
-									const target = targetElement.resource.with({ path: posix.join(targetElement.resource.path, posix.basename(sourceFile.path)) });
+									const target = resources.joinPath(targetElement.resource, resources.basename(sourceFile));
 									return this.fileService.copyFile(sourceFile, target, true).then(stat => {
 
 										// if we only add one file, just open it directly
-										if (resources.length === 1) {
+										if (resourcesToAdd.length === 1) {
 											this.editorService.openEditor({ resource: stat.resource, options: { pinned: true } });
 										}
 									}, error => this.onError(error));
@@ -1044,14 +1018,14 @@ export class DuplicateFileAction extends BaseFileAction {
 function findValidPasteFileTarget(targetFolder: ExplorerItem, fileToPaste: { resource: URI, isDirectory?: boolean }): URI {
 	let name = resources.basenameOrAuthority(fileToPaste.resource);
 
-	let candidate = targetFolder.resource.with({ path: paths.join(targetFolder.resource.path, name) });
+	let candidate = resources.joinPath(targetFolder.resource, name);
 	while (true) {
 		if (!targetFolder.root.find(candidate)) {
 			break;
 		}
 
 		name = incrementFileName(name, fileToPaste.isDirectory);
-		candidate = targetFolder.resource.with({ path: paths.join(targetFolder.resource.path, name) });
+		candidate = resources.joinPath(targetFolder.resource, name);
 	}
 
 	return candidate;
@@ -1185,6 +1159,36 @@ export class RefreshViewExplorerAction extends Action {
 	}
 }
 
+export class ToggleAutoSaveAction extends Action {
+	public static readonly ID = 'workbench.action.toggleAutoSave';
+	public static readonly LABEL = nls.localize('toggleAutoSave', "Toggle Auto Save");
+
+	constructor(
+		id: string,
+		label: string,
+		@IConfigurationService private configurationService: IConfigurationService
+	) {
+		super(id, label);
+	}
+
+	public run(): TPromise<any> {
+		const setting = this.configurationService.inspect('files.autoSave');
+		let userAutoSaveConfig = setting.user;
+		if (types.isUndefinedOrNull(userAutoSaveConfig)) {
+			userAutoSaveConfig = setting.default; // use default if setting not defined
+		}
+
+		let newAutoSaveValue: string;
+		if ([AutoSaveConfiguration.AFTER_DELAY, AutoSaveConfiguration.ON_FOCUS_CHANGE, AutoSaveConfiguration.ON_WINDOW_CHANGE].some(s => s === userAutoSaveConfig)) {
+			newAutoSaveValue = AutoSaveConfiguration.OFF;
+		} else {
+			newAutoSaveValue = AutoSaveConfiguration.AFTER_DELAY;
+		}
+
+		return this.configurationService.updateValue('files.autoSave', newAutoSaveValue, ConfigurationTarget.USER);
+	}
+}
+
 export abstract class BaseSaveAllAction extends BaseErrorReportingAction {
 	private toDispose: IDisposable[];
 	private lastIsDirty: boolean;
@@ -1388,7 +1392,7 @@ export class CollapseExplorerView extends Action {
 				const viewer = explorerView.getViewer();
 				if (viewer) {
 					const action = new CollapseAction(viewer, true, null);
-					action.run().done();
+					action.run();
 					action.dispose();
 				}
 			}
@@ -1437,7 +1441,7 @@ export class ShowOpenedFileInNewWindow extends Action {
 	public run(): TPromise<any> {
 		const fileResource = toResource(this.editorService.activeEditor, { supportSideBySide: true, filter: Schemas.file /* todo@remote */ });
 		if (fileResource) {
-			this.windowService.openWindow([fileResource.fsPath], { forceNewWindow: true, forceOpenWorkspaceAsFile: true });
+			this.windowService.openWindow([fileResource], { forceNewWindow: true, forceOpenWorkspaceAsFile: true });
 		} else {
 			this.notificationService.info(nls.localize('openFileToShowInNewWindow', "Open a file first to open in new window"));
 		}
@@ -1446,24 +1450,6 @@ export class ShowOpenedFileInNewWindow extends Action {
 	}
 }
 
-export class CopyPathAction extends Action {
-
-	public static readonly LABEL = nls.localize('copyPath', "Copy Path");
-
-	constructor(
-		private resource: URI,
-		@ICommandService private commandService: ICommandService
-	) {
-		super('copyFilePath', CopyPathAction.LABEL);
-
-		this.order = 140;
-	}
-
-	public run(): TPromise<any> {
-		return this.commandService.executeCommand(COPY_PATH_COMMAND_ID, this.resource);
-	}
-}
-
 export function validateFileName(parent: ExplorerItem, name: string): string {
 
 	// Produce a well formed file name
@@ -1557,14 +1543,14 @@ export class CompareWithClipboardAction extends Action {
 				this.registrationDisposal = this.textModelService.registerTextModelContentProvider(CompareWithClipboardAction.SCHEME, provider);
 			}
 
-			const name = paths.basename(resource.fsPath);
+			const name = resources.basename(resource);
 			const editorLabel = nls.localize('clipboardComparisonLabel', "Clipboard ↔ {0}", name);
 
 			const cleanUp = () => {
 				this.registrationDisposal = dispose(this.registrationDisposal);
 			};
 
-			return always(this.editorService.openEditor({ leftResource: URI.from({ scheme: CompareWithClipboardAction.SCHEME, path: resource.fsPath }), rightResource: resource, label: editorLabel }), cleanUp);
+			return always(this.editorService.openEditor({ leftResource: resource.with({ scheme: CompareWithClipboardAction.SCHEME }), rightResource: resource, label: editorLabel }), cleanUp);
 		}
 
 		return TPromise.as(true);
@@ -1591,14 +1577,6 @@ class ClipboardContentProvider implements ITextModelContentProvider {
 	}
 }
 
-// Diagnostics support
-let diag: (...args: any[]) => void;
-if (!diag) {
-	diag = diagnostics.register('FileActionsDiagnostics', function (...args: any[]) {
-		console.log(args[1] + ' - ' + args[0] + ' (time: ' + args[2].getTime() + ' [' + args[2].toUTCString() + '])');
-	});
-}
-
 interface IExplorerContext {
 	viewletState: IFileViewletState;
 	stat: ExplorerItem;
diff --git a/src/vs/workbench/parts/files/electron-browser/fileCommands.ts b/src/vs/workbench/parts/files/electron-browser/fileCommands.ts
index 199d769c59d..31078d8e8eb 100644
--- a/src/vs/workbench/parts/files/electron-browser/fileCommands.ts
+++ b/src/vs/workbench/parts/files/electron-browser/fileCommands.ts
@@ -8,8 +8,7 @@
 import * as nls from 'vs/nls';
 import * as paths from 'vs/base/common/paths';
 import { TPromise } from 'vs/base/common/winjs.base';
-import * as labels from 'vs/base/common/labels';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { toResource, IEditorCommandsContext } from 'vs/workbench/common/editor';
 import { IWindowsService, IWindowService } from 'vs/platform/windows/common/windows';
 import { ServicesAccessor, IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
@@ -29,7 +28,7 @@ import { IFileService } from 'vs/platform/files/common/files';
 import { IUntitledEditorService } from 'vs/workbench/services/untitled/common/untitledEditorService';
 import { IEditorViewState } from 'vs/editor/common/editorCommon';
 import { getCodeEditor } from 'vs/editor/browser/editorBrowser';
-import { KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRegistry';
+import { KeybindingsRegistry, KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
 import { KeyMod, KeyCode, KeyChord } from 'vs/base/common/keyCodes';
 import { isWindows, isMacintosh } from 'vs/base/common/platform';
 import { ITextModelService } from 'vs/editor/common/services/resolverService';
@@ -42,6 +41,7 @@ import { INotificationService } from 'vs/platform/notification/common/notificati
 import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
 import { IEditorService, SIDE_GROUP } from 'vs/workbench/services/editor/common/editorService';
 import { IEditorGroupsService } from 'vs/workbench/services/group/common/editorGroupsService';
+import { ILabelService } from 'vs/platform/label/common/label';
 
 // Commands
 
@@ -56,6 +56,7 @@ export const COMPARE_SELECTED_COMMAND_ID = 'compareSelected';
 export const COMPARE_RESOURCE_COMMAND_ID = 'compareFiles';
 export const COMPARE_WITH_SAVED_COMMAND_ID = 'workbench.files.action.compareWithSaved';
 export const COPY_PATH_COMMAND_ID = 'copyFilePath';
+export const COPY_RELATIVE_PATH_COMMAND_ID = 'copyRelativeFilePath';
 
 export const SAVE_FILE_AS_COMMAND_ID = 'workbench.action.files.saveAs';
 export const SAVE_FILE_AS_LABEL = nls.localize('saveAs', "Save As...");
@@ -76,14 +77,20 @@ export const ResourceSelectedForCompareContext = new RawContextKey<boolean>('res
 export const REMOVE_ROOT_FOLDER_COMMAND_ID = 'removeRootFolder';
 export const REMOVE_ROOT_FOLDER_LABEL = nls.localize('removeFolderFromWorkspace', "Remove Folder from Workspace");
 
-export const openWindowCommand = (accessor: ServicesAccessor, paths: string[], forceNewWindow: boolean) => {
+export const openWindowCommand = (accessor: ServicesAccessor, paths: (string | URI)[], forceNewWindow: boolean) => {
 	const windowService = accessor.get(IWindowService);
-
-	windowService.openWindow(paths, { forceNewWindow });
+	windowService.openWindow(paths.map(p => typeof p === 'string' ? URI.file(p) : p), { forceNewWindow });
 };
 
-function save(resource: URI, isSaveAs: boolean, editorService: IEditorService, fileService: IFileService, untitledEditorService: IUntitledEditorService,
-	textFileService: ITextFileService, editorGroupService: IEditorGroupsService): TPromise<any> {
+function save(
+	resource: URI,
+	isSaveAs: boolean,
+	editorService: IEditorService,
+	fileService: IFileService,
+	untitledEditorService: IUntitledEditorService,
+	textFileService: ITextFileService,
+	editorGroupService: IEditorGroupsService
+): TPromise<any> {
 
 	if (resource && (fileService.canHandleResource(resource) || resource.scheme === Schemas.untitled)) {
 
@@ -111,7 +118,7 @@ function save(resource: URI, isSaveAs: boolean, editorService: IEditorService, f
 			if (!isSaveAs && resource.scheme === Schemas.untitled && untitledEditorService.hasAssociatedFilePath(resource)) {
 				savePromise = textFileService.save(resource).then((result) => {
 					if (result) {
-						return URI.file(resource.fsPath);
+						return resource.with({ scheme: Schemas.file });
 					}
 
 					return null;
@@ -166,9 +173,10 @@ function saveAll(saveAllArguments: any, editorService: IEditorService, untitledE
 	const groupIdToUntitledResourceInput = new Map<number, IResourceInput[]>();
 
 	editorGroupService.groups.forEach(g => {
+		const activeEditorResource = g.activeEditor && g.activeEditor.getResource();
 		g.editors.forEach(e => {
 			const resource = e.getResource();
-			if (untitledEditorService.isDirty(resource)) {
+			if (resource && untitledEditorService.isDirty(resource)) {
 				if (!groupIdToUntitledResourceInput.has(g.id)) {
 					groupIdToUntitledResourceInput.set(g.id, []);
 				}
@@ -177,7 +185,7 @@ function saveAll(saveAllArguments: any, editorService: IEditorService, untitledE
 					encoding: untitledEditorService.getEncoding(resource),
 					resource,
 					options: {
-						inactive: g.activeEditor ? g.activeEditor.getResource().toString() !== resource.toString() : true,
+						inactive: activeEditorResource ? activeEditorResource.toString() !== resource.toString() : true,
 						pinned: true,
 						preserveFocus: true,
 						index: g.getIndexOfEditor(e)
@@ -224,7 +232,7 @@ CommandsRegistry.registerCommand({
 });
 
 KeybindingsRegistry.registerCommandAndKeybindingRule({
-	weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
+	weight: KeybindingWeight.WorkbenchContrib,
 	when: ExplorerFocusCondition,
 	primary: KeyMod.CtrlCmd | KeyCode.Enter,
 	mac: {
@@ -262,7 +270,7 @@ let provider: FileOnDiskContentProvider;
 KeybindingsRegistry.registerCommandAndKeybindingRule({
 	id: COMPARE_WITH_SAVED_COMMAND_ID,
 	when: undefined,
-	weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
+	weight: KeybindingWeight.WorkbenchContrib,
 	primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_K, KeyCode.KEY_D),
 	handler: (accessor, resource: URI | object) => {
 		if (!provider) {
@@ -279,7 +287,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 			const name = paths.basename(uri.fsPath);
 			const editorLabel = nls.localize('modifiedLabel', "{0} (on disk) ↔ {1}", name, name);
 
-			return editorService.openEditor({ leftResource: URI.from({ scheme: COMPARE_WITH_SAVED_SCHEMA, path: uri.fsPath }), rightResource: uri, label: editorLabel }).then(() => void 0);
+			return editorService.openEditor({ leftResource: uri.with({ scheme: COMPARE_WITH_SAVED_SCHEMA }), rightResource: uri, label: editorLabel }).then(() => void 0);
 		}
 
 		return TPromise.as(true);
@@ -352,9 +360,10 @@ function revealResourcesInOS(resources: URI[], windowsService: IWindowsService,
 		notificationService.info(nls.localize('openFileToReveal', "Open a file first to reveal"));
 	}
 }
+
 KeybindingsRegistry.registerCommandAndKeybindingRule({
 	id: REVEAL_IN_OS_COMMAND_ID,
-	weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
+	weight: KeybindingWeight.WorkbenchContrib,
 	when: EditorContextKeys.focus.toNegated(),
 	primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.KEY_R,
 	win: {
@@ -365,8 +374,9 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 		revealResourcesInOS(resources, accessor.get(IWindowsService), accessor.get(INotificationService), accessor.get(IWorkspaceContextService));
 	}
 });
+
 KeybindingsRegistry.registerCommandAndKeybindingRule({
-	weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
+	weight: KeybindingWeight.WorkbenchContrib,
 	when: undefined,
 	primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_K, KeyCode.KEY_R),
 	id: 'workbench.action.files.revealActiveFileInWindows',
@@ -378,17 +388,20 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 	}
 });
 
-function resourcesToClipboard(resources: URI[], clipboardService: IClipboardService, notificationService: INotificationService): void {
+function resourcesToClipboard(resources: URI[], relative: boolean, clipboardService: IClipboardService, notificationService: INotificationService, labelService: ILabelService): void {
 	if (resources.length) {
 		const lineDelimiter = isWindows ? '\r\n' : '\n';
-		const text = resources.map(r => r.scheme === Schemas.file ? labels.getPathLabel(r) : r.toString()).join(lineDelimiter);
+
+		const text = resources.map(resource => labelService.getUriLabel(resource, relative, true))
+			.join(lineDelimiter);
 		clipboardService.writeText(text);
 	} else {
 		notificationService.info(nls.localize('openFileToCopy', "Open a file first to copy its path"));
 	}
 }
+
 KeybindingsRegistry.registerCommandAndKeybindingRule({
-	weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
+	weight: KeybindingWeight.WorkbenchContrib,
 	when: EditorContextKeys.focus.toNegated(),
 	primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.KEY_C,
 	win: {
@@ -397,12 +410,26 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 	id: COPY_PATH_COMMAND_ID,
 	handler: (accessor, resource: URI | object) => {
 		const resources = getMultiSelectedResources(resource, accessor.get(IListService), accessor.get(IEditorService));
-		resourcesToClipboard(resources, accessor.get(IClipboardService), accessor.get(INotificationService));
+		resourcesToClipboard(resources, false, accessor.get(IClipboardService), accessor.get(INotificationService), accessor.get(ILabelService));
 	}
 });
 
 KeybindingsRegistry.registerCommandAndKeybindingRule({
-	weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
+	weight: KeybindingWeight.WorkbenchContrib,
+	when: EditorContextKeys.focus.toNegated(),
+	primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyMod.Alt | KeyCode.KEY_C,
+	win: {
+		primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_K, KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.KEY_C)
+	},
+	id: COPY_RELATIVE_PATH_COMMAND_ID,
+	handler: (accessor, resource: URI | object) => {
+		const resources = getMultiSelectedResources(resource, accessor.get(IListService), accessor.get(IEditorService));
+		resourcesToClipboard(resources, true, accessor.get(IClipboardService), accessor.get(INotificationService), accessor.get(ILabelService));
+	}
+});
+
+KeybindingsRegistry.registerCommandAndKeybindingRule({
+	weight: KeybindingWeight.WorkbenchContrib,
 	when: undefined,
 	primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_K, KeyCode.KEY_P),
 	id: 'workbench.action.files.copyPathOfActiveFile',
@@ -410,7 +437,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 		const editorService = accessor.get(IEditorService);
 		const activeInput = editorService.activeEditor;
 		const resources = activeInput && activeInput.getResource() ? [activeInput.getResource()] : [];
-		resourcesToClipboard(resources, accessor.get(IClipboardService), accessor.get(INotificationService));
+		resourcesToClipboard(resources, false, accessor.get(IClipboardService), accessor.get(INotificationService), accessor.get(ILabelService));
 	}
 });
 
@@ -441,7 +468,7 @@ CommandsRegistry.registerCommand({
 
 KeybindingsRegistry.registerCommandAndKeybindingRule({
 	id: SAVE_FILE_AS_COMMAND_ID,
-	weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
+	weight: KeybindingWeight.WorkbenchContrib,
 	when: undefined,
 	primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KEY_S,
 	handler: (accessor, resourceOrObject: URI | object | { from: string }) => {
@@ -459,7 +486,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 
 KeybindingsRegistry.registerCommandAndKeybindingRule({
 	when: undefined,
-	weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
+	weight: KeybindingWeight.WorkbenchContrib,
 	primary: KeyMod.CtrlCmd | KeyCode.KEY_S,
 	id: SAVE_FILE_COMMAND_ID,
 	handler: (accessor, resource: URI | object) => {
diff --git a/src/vs/workbench/parts/files/electron-browser/files.contribution.ts b/src/vs/workbench/parts/files/electron-browser/files.contribution.ts
index 71c741536a2..10ba8288bb7 100644
--- a/src/vs/workbench/parts/files/electron-browser/files.contribution.ts
+++ b/src/vs/workbench/parts/files/electron-browser/files.contribution.ts
@@ -5,14 +5,14 @@
 
 'use strict';
 
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { ViewletRegistry, Extensions as ViewletExtensions, ViewletDescriptor, ToggleViewletAction } from 'vs/workbench/browser/viewlet';
 import * as nls from 'vs/nls';
-import { SyncActionDescriptor } from 'vs/platform/actions/common/actions';
+import { SyncActionDescriptor, MenuId, MenuRegistry } from 'vs/platform/actions/common/actions';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { IConfigurationRegistry, Extensions as ConfigurationExtensions, ConfigurationScope } from 'vs/platform/configuration/common/configurationRegistry';
 import { IWorkbenchActionRegistry, Extensions as ActionExtensions } from 'vs/workbench/common/actions';
-import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions';
+import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions, IWorkbenchContribution } from 'vs/workbench/common/contributions';
 import { IEditorInputFactory, EditorInput, IFileEditorInput, IEditorInputFactoryRegistry, Extensions as EditorInputExtensions } from 'vs/workbench/common/editor';
 import { AutoSaveConfiguration, HotExitConfiguration, SUPPORTED_ENCODINGS } from 'vs/platform/files/common/files';
 import { VIEWLET_ID, SortOrderConfiguration, FILE_EDITOR_INPUT_ID } from 'vs/workbench/parts/files/common/files';
@@ -34,6 +34,9 @@ import { DataUriEditorInput } from 'vs/workbench/common/editor/dataUriEditorInpu
 import { LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { IEditorGroupsService } from 'vs/workbench/services/group/common/editorGroupsService';
+import { ILabelService } from 'vs/platform/label/common/label';
+import { Schemas } from 'vs/base/common/network';
+import { nativeSep } from 'vs/base/common/paths';
 
 // Viewlet Action
 export class OpenExplorerViewletAction extends ToggleViewletAction {
@@ -50,6 +53,23 @@ export class OpenExplorerViewletAction extends ToggleViewletAction {
 	}
 }
 
+class FileUriLabelContribution implements IWorkbenchContribution {
+
+	constructor(@ILabelService labelService: ILabelService) {
+		labelService.registerFormatter(Schemas.file, {
+			uri: {
+				label: '${path}',
+				separator: nativeSep,
+				tildify: !platform.isWindows,
+				normalizeDriveLetter: platform.isWindows
+			},
+			workspace: {
+				suffix: ''
+			}
+		});
+	}
+}
+
 // Register Viewlet
 Registry.as<ViewletRegistry>(ViewletExtensions.Viewlets).registerViewlet(new ViewletDescriptor(
 	ExplorerViewlet,
@@ -137,7 +157,7 @@ class FileEditorInputFactory implements IEditorInputFactory {
 			const resource = !!fileInput.resourceJSON ? URI.revive(fileInput.resourceJSON) : URI.parse(fileInput.resource);
 			const encoding = fileInput.encoding;
 
-			return accessor.get(IEditorService).createInput({ resource, encoding }) as FileEditorInput;
+			return accessor.get(IEditorService).createInput({ resource, encoding, forceFile: true }) as FileEditorInput;
 		});
 	}
 }
@@ -156,6 +176,10 @@ Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench).regi
 // Register Dirty Files Tracker
 Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench).registerWorkbenchContribution(DirtyFilesTracker, LifecyclePhase.Starting);
 
+// Register uri display for file uris
+Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench).registerWorkbenchContribution(FileUriLabelContribution, LifecyclePhase.Starting);
+
+
 // Configuration
 const configurationRegistry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration);
 
@@ -167,7 +191,7 @@ configurationRegistry.registerConfiguration({
 	'properties': {
 		'files.exclude': {
 			'type': 'object',
-			'description': nls.localize('exclude', "Configure glob patterns for excluding files and folders. For example, the files explorer decides which files and folders to show or hide based on this setting."),
+			'markdownDescription': nls.localize('exclude', "Configure glob patterns for excluding files and folders. For example, the files explorer decides which files and folders to show or hide based on this setting. Read more about glob patterns [here](https://code.visualstudio.com/docs/editor/codebasics#_advanced-search-options)."),
 			'default': { '**/.git': true, '**/.svn': true, '**/.hg': true, '**/CVS': true, '**/.DS_Store': true },
 			'scope': ConfigurationScope.RESOURCE,
 			'additionalProperties': {
@@ -192,14 +216,14 @@ configurationRegistry.registerConfiguration({
 		},
 		'files.associations': {
 			'type': 'object',
-			'description': nls.localize('associations', "Configure file associations to languages (e.g. \"*.extension\": \"html\"). These have precedence over the default associations of the languages installed."),
+			'markdownDescription': nls.localize('associations', "Configure file associations to languages (e.g. `\"*.extension\": \"html\"`). These have precedence over the default associations of the languages installed."),
 		},
 		'files.encoding': {
 			'type': 'string',
 			'overridable': true,
 			'enum': Object.keys(SUPPORTED_ENCODINGS),
 			'default': 'utf8',
-			'description': nls.localize('encoding', "The default character set encoding to use when reading and writing files. This setting can be configured per language too."),
+			'description': nls.localize('encoding', "The default character set encoding to use when reading and writing files. This setting can also be configured per language."),
 			'scope': ConfigurationScope.RESOURCE,
 			'enumDescriptions': Object.keys(SUPPORTED_ENCODINGS).map(key => SUPPORTED_ENCODINGS[key].labelLong)
 		},
@@ -207,7 +231,7 @@ configurationRegistry.registerConfiguration({
 			'type': 'boolean',
 			'overridable': true,
 			'default': false,
-			'description': nls.localize('autoGuessEncoding', "When enabled, will attempt to guess the character set encoding when opening files. This setting can be configured per language too."),
+			'description': nls.localize('autoGuessEncoding', "When enabled, the editor will attempt to guess the character set encoding when opening files. This setting can also be configured per language."),
 			'scope': ConfigurationScope.RESOURCE
 		},
 		'files.eol': {
@@ -216,8 +240,12 @@ configurationRegistry.registerConfiguration({
 				'\n',
 				'\r\n'
 			],
+			'enumDescriptions': [
+				nls.localize('eol.LF', "LF"),
+				nls.localize('eol.CRLF', "CRLF")
+			],
 			'default': (platform.isLinux || platform.isMacintosh) ? '\n' : '\r\n',
-			'description': nls.localize('eol', "The default end of line character. Use \\n for LF and \\r\\n for CRLF."),
+			'description': nls.localize('eol', "The default end of line character."),
 			'scope': ConfigurationScope.RESOURCE
 		},
 		'files.trimTrailingWhitespace': {
@@ -244,19 +272,19 @@ configurationRegistry.registerConfiguration({
 		'files.autoSave': {
 			'type': 'string',
 			'enum': [AutoSaveConfiguration.OFF, AutoSaveConfiguration.AFTER_DELAY, AutoSaveConfiguration.ON_FOCUS_CHANGE, AutoSaveConfiguration.ON_WINDOW_CHANGE],
-			'enumDescriptions': [
+			'markdownEnumDescriptions': [
 				nls.localize({ comment: ['This is the description for a setting. Values surrounded by single quotes are not to be translated.'], key: 'files.autoSave.off' }, "A dirty file is never automatically saved."),
-				nls.localize({ comment: ['This is the description for a setting. Values surrounded by single quotes are not to be translated.'], key: 'files.autoSave.afterDelay' }, "A dirty file is automatically saved after the configured 'files.autoSaveDelay'."),
+				nls.localize({ comment: ['This is the description for a setting. Values surrounded by single quotes are not to be translated.'], key: 'files.autoSave.afterDelay' }, "A dirty file is automatically saved after the configured `#files.autoSaveDelay#`."),
 				nls.localize({ comment: ['This is the description for a setting. Values surrounded by single quotes are not to be translated.'], key: 'files.autoSave.onFocusChange' }, "A dirty file is automatically saved when the editor loses focus."),
 				nls.localize({ comment: ['This is the description for a setting. Values surrounded by single quotes are not to be translated.'], key: 'files.autoSave.onWindowChange' }, "A dirty file is automatically saved when the window loses focus.")
 			],
 			'default': AutoSaveConfiguration.OFF,
-			'description': nls.localize({ comment: ['This is the description for a setting. Values surrounded by single quotes are not to be translated.'], key: 'autoSave' }, "Controls auto save of dirty files. Accepted values:  '{0}', '{1}', '{2}' (editor loses focus), '{3}' (window loses focus). If set to '{4}', you can configure the delay in 'files.autoSaveDelay'.", AutoSaveConfiguration.OFF, AutoSaveConfiguration.AFTER_DELAY, AutoSaveConfiguration.ON_FOCUS_CHANGE, AutoSaveConfiguration.ON_WINDOW_CHANGE, AutoSaveConfiguration.AFTER_DELAY)
+			'markdownDescription': nls.localize({ comment: ['This is the description for a setting. Values surrounded by single quotes are not to be translated.'], key: 'autoSave' }, "Controls auto save of dirty files. Read more about autosave [here](https://code.visualstudio.com/docs/editor/codebasics#_save-auto-save).", AutoSaveConfiguration.OFF, AutoSaveConfiguration.AFTER_DELAY, AutoSaveConfiguration.ON_FOCUS_CHANGE, AutoSaveConfiguration.ON_WINDOW_CHANGE, AutoSaveConfiguration.AFTER_DELAY)
 		},
 		'files.autoSaveDelay': {
 			'type': 'number',
 			'default': 1000,
-			'description': nls.localize({ comment: ['This is the description for a setting. Values surrounded by single quotes are not to be translated.'], key: 'autoSaveDelay' }, "Controls the delay in ms after which a dirty file is saved automatically. Only applies when 'files.autoSave' is set to '{0}'", AutoSaveConfiguration.AFTER_DELAY)
+			'markdownDescription': nls.localize({ comment: ['This is the description for a setting. Values surrounded by single quotes are not to be translated.'], key: 'autoSaveDelay' }, "Controls the delay in ms after which a dirty file is saved automatically. Only applies when `#files.autoSave#` is set to `{0}`.", AutoSaveConfiguration.AFTER_DELAY)
 		},
 		'files.watcherExclude': {
 			'type': 'object',
@@ -268,10 +296,10 @@ configurationRegistry.registerConfiguration({
 			'type': 'string',
 			'enum': [HotExitConfiguration.OFF, HotExitConfiguration.ON_EXIT, HotExitConfiguration.ON_EXIT_AND_WINDOW_CLOSE],
 			'default': HotExitConfiguration.ON_EXIT,
-			'enumDescriptions': [
+			'markdownEnumDescriptions': [
 				nls.localize('hotExit.off', 'Disable hot exit.'),
-				nls.localize('hotExit.onExit', 'Hot exit will be triggered when the application is closed, that is when the last window is closed on Windows/Linux or when the workbench.action.quit command is triggered (command palette, keybinding, menu). All windows with backups will be restored upon next launch.'),
-				nls.localize('hotExit.onExitAndWindowClose', 'Hot exit will be triggered when the application is closed, that is when the last window is closed on Windows/Linux or when the workbench.action.quit command is triggered (command palette, keybinding, menu), and also for any window with a folder opened regardless of whether it\'s the last window. All windows without folders opened will be restored upon next launch. To restore folder windows as they were before shutdown set "window.restoreWindows" to "all".')
+				nls.localize('hotExit.onExit', 'Hot exit will be triggered when the last window is closed on Windows/Linux or when the `workbench.action.quit` command is triggered (command palette, keybinding, menu). All windows with backups will be restored upon next launch.'),
+				nls.localize('hotExit.onExitAndWindowClose', 'Hot exit will be triggered when the last window is closed on Windows/Linux or when the `workbench.action.quit` command is triggered (command palette, keybinding, menu), and also for any window with a folder opened regardless of whether it\'s the last window. All windows without folders opened will be restored upon next launch. To restore folder windows as they were before shutdown set `#window.restoreWindows#` to `all`.')
 			],
 			'description': nls.localize('hotExit', "Controls whether unsaved files are remembered between sessions, allowing the save prompt when exiting the editor to be skipped.", HotExitConfiguration.ON_EXIT, HotExitConfiguration.ON_EXIT_AND_WINDOW_CLOSE)
 		},
@@ -287,7 +315,7 @@ configurationRegistry.registerConfiguration({
 		'files.maxMemoryForLargeFilesMB': {
 			'type': 'number',
 			'default': 4096,
-			'description': nls.localize('maxMemoryForLargeFilesMB', "Controls the memory available to VS Code after restart when trying to open large files. Same effect as specifying --max-memory=NEWSIZE on the command line.")
+			'markdownDescription': nls.localize('maxMemoryForLargeFilesMB', "Controls the memory available to VS Code after restart when trying to open large files. Same effect as specifying `--max-memory=NEWSIZE` on the command line.")
 		}
 	}
 });
@@ -308,7 +336,7 @@ configurationRegistry.registerConfiguration({
 		'editor.formatOnSaveTimeout': {
 			'type': 'number',
 			'default': 750,
-			'description': nls.localize('formatOnSaveTimeout', "Format on save timeout. Specifies a time limit in milliseconds for formatOnSave-commands. Commands taking longer than the specified timeout will be cancelled."),
+			'description': nls.localize('formatOnSaveTimeout', "Timeout in milliseconds after which the formatting that is run on file save is cancelled."),
 			'overridable': true,
 			'scope': ConfigurationScope.RESOURCE
 		}
@@ -328,22 +356,22 @@ configurationRegistry.registerConfiguration({
 		},
 		'explorer.autoReveal': {
 			'type': 'boolean',
-			'description': nls.localize('autoReveal', "Controls if the explorer should automatically reveal and select files when opening them."),
+			'description': nls.localize('autoReveal', "Controls whether the explorer should automatically reveal and select files when opening them."),
 			'default': true
 		},
 		'explorer.enableDragAndDrop': {
 			'type': 'boolean',
-			'description': nls.localize('enableDragAndDrop', "Controls if the explorer should allow to move files and folders via drag and drop."),
+			'description': nls.localize('enableDragAndDrop', "Controls whether the explorer should allow to move files and folders via drag and drop."),
 			'default': true
 		},
 		'explorer.confirmDragAndDrop': {
 			'type': 'boolean',
-			'description': nls.localize('confirmDragAndDrop', "Controls if the explorer should ask for confirmation to move files and folders via drag and drop."),
+			'description': nls.localize('confirmDragAndDrop', "Controls whether the explorer should ask for confirmation to move files and folders via drag and drop."),
 			'default': true
 		},
 		'explorer.confirmDelete': {
 			'type': 'boolean',
-			'description': nls.localize('confirmDelete', "Controls if the explorer should ask for confirmation when deleting a file via the trash."),
+			'description': nls.localize('confirmDelete', "Controls whether the explorer should ask for confirmation when deleting a file via the trash."),
 			'default': true
 		},
 		'explorer.sortOrder': {
@@ -357,17 +385,27 @@ configurationRegistry.registerConfiguration({
 				nls.localize('sortOrder.type', 'Files and folders are sorted by their extensions, in alphabetical order. Folders are displayed before files.'),
 				nls.localize('sortOrder.modified', 'Files and folders are sorted by last modified date, in descending order. Folders are displayed before files.')
 			],
-			'description': nls.localize({ key: 'sortOrder', comment: ['This is the description for a setting. Values surrounded by single quotes are not to be translated.'] }, "Controls sorting order of files and folders in the explorer. In addition to the default sorting, you can set the order to 'mixed' (files and folders sorted combined), 'type' (by file type), 'modified' (by last modified date) or 'filesFirst' (sort files before folders).")
+			'description': nls.localize('sortOrder', "Controls sorting order of files and folders in the explorer.")
 		},
 		'explorer.decorations.colors': {
 			type: 'boolean',
-			description: nls.localize('explorer.decorations.colors', "Controls if file decorations should use colors."),
+			description: nls.localize('explorer.decorations.colors', "Controls whether file decorations should use colors."),
 			default: true
 		},
 		'explorer.decorations.badges': {
 			type: 'boolean',
-			description: nls.localize('explorer.decorations.badges', "Controls if file decorations should use badges."),
+			description: nls.localize('explorer.decorations.badges', "Controls whether file decorations should use badges."),
 			default: true
 		},
 	}
 });
+
+// View menu
+MenuRegistry.appendMenuItem(MenuId.MenubarViewMenu, {
+	group: '3_views',
+	command: {
+		id: VIEWLET_ID,
+		title: nls.localize({ key: 'miViewExplorer', comment: ['&& denotes a mnemonic'] }, "&&Explorer")
+	},
+	order: 1
+});
diff --git a/src/vs/workbench/parts/files/electron-browser/media/explorerviewlet.css b/src/vs/workbench/parts/files/electron-browser/media/explorerviewlet.css
index eb657380a67..c3fc2504f70 100644
--- a/src/vs/workbench/parts/files/electron-browser/media/explorerviewlet.css
+++ b/src/vs/workbench/parts/files/electron-browser/media/explorerviewlet.css
@@ -59,7 +59,7 @@
 }
 
 .explorer-viewlet .explorer-open-editors .monaco-list .monaco-list-row:hover > .monaco-action-bar,
-.explorer-viewlet .explorer-open-editors .monaco-list.focused .monaco-list-row.focused > .monaco-action-bar,
+.explorer-viewlet .explorer-open-editors .monaco-list .monaco-list-row.focused > .monaco-action-bar,
 .explorer-viewlet .explorer-open-editors .monaco-list .monaco-list-row.dirty > .monaco-action-bar {
 	visibility: visible;
 }
diff --git a/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.ts b/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.ts
index ca120f667fc..27a3136bda3 100644
--- a/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.ts
+++ b/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.ts
@@ -6,15 +6,14 @@
 
 import { TPromise } from 'vs/base/common/winjs.base';
 import * as nls from 'vs/nls';
-import * as errors from 'vs/base/common/errors';
 import { toErrorMessage } from 'vs/base/common/errorMessage';
 import * as paths from 'vs/base/common/paths';
 import { Action } from 'vs/base/common/actions';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { FileOperationError, FileOperationResult } from 'vs/platform/files/common/files';
 import { ITextFileService, ISaveErrorHandler, ITextFileEditorModel } from 'vs/workbench/services/textfile/common/textfiles';
 import { ServicesAccessor, IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
+import { IDisposable, dispose, Disposable } from 'vs/base/common/lifecycle';
 import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
 import { TextFileEditorModel } from 'vs/workbench/services/textfile/common/textFileEditorModel';
 import { ITextModelService } from 'vs/editor/common/services/resolverService';
@@ -43,9 +42,8 @@ const LEARN_MORE_DIRTY_WRITE_IGNORE_KEY = 'learnMoreDirtyWriteError';
 const conflictEditorHelp = nls.localize('userGuide', "Use the actions in the editor tool bar to either undo your changes or overwrite the content on disk with your changes.");
 
 // A handler for save error happening with conflict resolution actions
-export class SaveErrorHandler implements ISaveErrorHandler, IWorkbenchContribution {
+export class SaveErrorHandler extends Disposable implements ISaveErrorHandler, IWorkbenchContribution {
 	private messages: ResourceMap<INotificationHandle>;
-	private toUnbind: IDisposable[];
 	private conflictResolutionContext: IContextKey<boolean>;
 	private activeConflictResolutionResource: URI;
 
@@ -58,15 +56,13 @@ export class SaveErrorHandler implements ISaveErrorHandler, IWorkbenchContributi
 		@IInstantiationService private instantiationService: IInstantiationService,
 		@IStorageService private storageService: IStorageService
 	) {
-		this.toUnbind = [];
+		super();
+
 		this.messages = new ResourceMap<INotificationHandle>();
 		this.conflictResolutionContext = new RawContextKey<boolean>(CONFLICT_RESOLUTION_CONTEXT, false).bindTo(contextKeyService);
 
-		const provider = instantiationService.createInstance(FileOnDiskContentProvider);
-		this.toUnbind.push(provider);
-
-		const registrationDisposal = textModelService.registerTextModelContentProvider(CONFLICT_RESOLUTION_SCHEME, provider);
-		this.toUnbind.push(registrationDisposal);
+		const provider = this._register(instantiationService.createInstance(FileOnDiskContentProvider));
+		this._register(textModelService.registerTextModelContentProvider(CONFLICT_RESOLUTION_SCHEME, provider));
 
 		// Hook into model
 		TextFileEditorModel.setSaveErrorHandler(this);
@@ -75,9 +71,9 @@ export class SaveErrorHandler implements ISaveErrorHandler, IWorkbenchContributi
 	}
 
 	private registerListeners(): void {
-		this.toUnbind.push(this.textFileService.models.onModelSaved(e => this.onFileSavedOrReverted(e.resource)));
-		this.toUnbind.push(this.textFileService.models.onModelReverted(e => this.onFileSavedOrReverted(e.resource)));
-		this.toUnbind.push(this.editorService.onDidActiveEditorChange(() => this.onActiveEditorChanged()));
+		this._register(this.textFileService.models.onModelSaved(e => this.onFileSavedOrReverted(e.resource)));
+		this._register(this.textFileService.models.onModelReverted(e => this.onFileSavedOrReverted(e.resource)));
+		this._register(this.editorService.onDidActiveEditorChange(() => this.onActiveEditorChanged()));
 	}
 
 	private onActiveEditorChanged(): void {
@@ -105,7 +101,7 @@ export class SaveErrorHandler implements ISaveErrorHandler, IWorkbenchContributi
 		}
 	}
 
-	public onSaveError(error: any, model: ITextFileEditorModel): void {
+	onSaveError(error: any, model: ITextFileEditorModel): void {
 		const fileOperationError = error as FileOperationError;
 		const resource = model.getResource();
 
@@ -181,8 +177,8 @@ export class SaveErrorHandler implements ISaveErrorHandler, IWorkbenchContributi
 		this.messages.set(model.getResource(), handle);
 	}
 
-	public dispose(): void {
-		this.toUnbind = dispose(this.toUnbind);
+	dispose(): void {
+		super.dispose();
 
 		this.messages.clear();
 	}
@@ -203,7 +199,7 @@ class ResolveConflictLearnMoreAction extends Action {
 		super('workbench.files.action.resolveConflictLearnMore', nls.localize('learnMore', "Learn More"));
 	}
 
-	public run(): TPromise<any> {
+	run(): TPromise<any> {
 		return this.openerService.open(URI.parse('https://go.microsoft.com/fwlink/?linkid=868264'));
 	}
 }
@@ -216,7 +212,7 @@ class DoNotShowResolveConflictLearnMoreAction extends Action {
 		super('workbench.files.action.resolveConflictLearnMoreDoNotShowAgain', nls.localize('dontShowAgain', "Don't Show Again"));
 	}
 
-	public run(notification: IDisposable): TPromise<any> {
+	run(notification: IDisposable): TPromise<any> {
 		this.storageService.store(LEARN_MORE_DIRTY_WRITE_IGNORE_KEY, true);
 
 		// Hide notification
@@ -239,7 +235,7 @@ class ResolveSaveConflictAction extends Action {
 		super('workbench.files.action.resolveConflict', nls.localize('compareChanges', "Compare"));
 	}
 
-	public run(): TPromise<any> {
+	run(): TPromise<any> {
 		if (!this.model.isDisposed()) {
 			const resource = this.model.getResource();
 			const name = paths.basename(resource.fsPath);
@@ -281,12 +277,12 @@ class SaveElevatedAction extends Action {
 		super('workbench.files.action.saveElevated', triedToMakeWriteable ? nls.localize('overwriteElevated', "Overwrite as Admin...") : nls.localize('saveElevated', "Retry as Admin..."));
 	}
 
-	public run(): TPromise<any> {
+	run(): TPromise<any> {
 		if (!this.model.isDisposed()) {
 			this.model.save({
 				writeElevated: true,
 				overwriteReadonly: this.triedToMakeWriteable
-			}).done(null, errors.onUnexpectedError);
+			});
 		}
 
 		return TPromise.as(true);
@@ -301,9 +297,9 @@ class OverwriteReadonlyAction extends Action {
 		super('workbench.files.action.overwrite', nls.localize('overwrite', "Overwrite"));
 	}
 
-	public run(): TPromise<any> {
+	run(): TPromise<any> {
 		if (!this.model.isDisposed()) {
-			this.model.save({ overwriteReadonly: true }).done(null, errors.onUnexpectedError);
+			this.model.save({ overwriteReadonly: true });
 		}
 
 		return TPromise.as(true);
diff --git a/src/vs/workbench/parts/files/electron-browser/views/emptyView.ts b/src/vs/workbench/parts/files/electron-browser/views/emptyView.ts
index acee79dc764..4622377d98b 100644
--- a/src/vs/workbench/parts/files/electron-browser/views/emptyView.ts
+++ b/src/vs/workbench/parts/files/electron-browser/views/emptyView.ts
@@ -11,7 +11,6 @@ import * as DOM from 'vs/base/browser/dom';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { IAction } from 'vs/base/common/actions';
 import { Button } from 'vs/base/browser/ui/button/button';
-import { $, Builder } from 'vs/base/browser/builder';
 import { IActionItem } from 'vs/base/browser/ui/actionbar/actionbar';
 import { IViewletViewOptions } from 'vs/workbench/browser/parts/views/viewsViewlet';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
@@ -23,7 +22,9 @@ import { IContextMenuService } from 'vs/platform/contextview/browser/contextView
 import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { ViewletPanel, IViewletPanelOptions } from 'vs/workbench/browser/parts/views/panelViewlet';
-import { ResourcesDropHandler } from 'vs/workbench/browser/dnd';
+import { ResourcesDropHandler, DragAndDropObserver } from 'vs/workbench/browser/dnd';
+import { listDropBackground } from 'vs/platform/theme/common/colorRegistry';
+import { SIDE_BAR_BACKGROUND } from 'vs/workbench/common/theme';
 
 export class EmptyView extends ViewletPanel {
 
@@ -31,8 +32,8 @@ export class EmptyView extends ViewletPanel {
 	public static readonly NAME = nls.localize('noWorkspace', "No Folder Opened");
 
 	private button: Button;
-	private messageDiv: Builder;
-	private titleDiv: Builder;
+	private messageElement: HTMLElement;
+	private titleElement: HTMLElement;
 
 	constructor(
 		options: IViewletViewOptions,
@@ -48,23 +49,32 @@ export class EmptyView extends ViewletPanel {
 	}
 
 	public renderHeader(container: HTMLElement): void {
-		this.titleDiv = $('span').text(name).appendTo($('div.title').appendTo(container));
+		const titleContainer = document.createElement('div');
+		DOM.addClass(titleContainer, 'title');
+		container.appendChild(titleContainer);
+
+		this.titleElement = document.createElement('span');
+		this.titleElement.textContent = name;
+		titleContainer.appendChild(this.titleElement);
 	}
 
 	protected renderBody(container: HTMLElement): void {
 		DOM.addClass(container, 'explorer-empty-view');
 
-		this.messageDiv = $('p').appendTo($('div.section').appendTo(container));
+		const messageContainer = document.createElement('div');
+		DOM.addClass(messageContainer, 'section');
+		container.appendChild(messageContainer);
 
-		let section = $('div.section').appendTo(container);
+		this.messageElement = document.createElement('p');
+		messageContainer.appendChild(this.messageElement);
 
-		this.button = new Button(section.getHTMLElement());
+		this.button = new Button(messageContainer);
 		attachButtonStyler(this.button, this.themeService);
 
 		this.disposables.push(this.button.onDidClick(() => {
 			const actionClass = this.contextService.getWorkbenchState() === WorkbenchState.WORKSPACE ? AddRootFolderAction : env.isMacintosh ? OpenFileFolderAction : OpenFolderAction;
 			const action = this.instantiationService.createInstance<string, string, IAction>(actionClass, actionClass.ID, actionClass.LABEL);
-			this.actionRunner.run(action).done(() => {
+			this.actionRunner.run(action).then(() => {
 				action.dispose();
 			}, err => {
 				action.dispose();
@@ -72,9 +82,24 @@ export class EmptyView extends ViewletPanel {
 			});
 		}));
 
-		this.disposables.push(DOM.addDisposableListener(container, DOM.EventType.DROP, (e: DragEvent) => {
-			const dropHandler = this.instantiationService.createInstance(ResourcesDropHandler, { allowWorkspaceOpen: true });
-			dropHandler.handleDrop(e, () => undefined, targetGroup => undefined);
+		this.disposables.push(new DragAndDropObserver(container, {
+			onDrop: e => {
+				container.style.backgroundColor = this.themeService.getTheme().getColor(SIDE_BAR_BACKGROUND).toString();
+				const dropHandler = this.instantiationService.createInstance(ResourcesDropHandler, { allowWorkspaceOpen: true });
+				dropHandler.handleDrop(e, () => undefined, targetGroup => undefined);
+			},
+			onDragEnter: (e) => {
+				container.style.backgroundColor = this.themeService.getTheme().getColor(listDropBackground).toString();
+			},
+			onDragEnd: () => {
+				container.style.backgroundColor = this.themeService.getTheme().getColor(SIDE_BAR_BACKGROUND).toString();
+			},
+			onDragLeave: () => {
+				container.style.backgroundColor = this.themeService.getTheme().getColor(SIDE_BAR_BACKGROUND).toString();
+			},
+			onDragOver: e => {
+				e.dataTransfer.dropEffect = 'copy';
+			}
 		}));
 
 		this.setLabels();
@@ -82,17 +107,17 @@ export class EmptyView extends ViewletPanel {
 
 	private setLabels(): void {
 		if (this.contextService.getWorkbenchState() === WorkbenchState.WORKSPACE) {
-			this.messageDiv.text(nls.localize('noWorkspaceHelp', "You have not yet added a folder to the workspace."));
+			this.messageElement.textContent = nls.localize('noWorkspaceHelp', "You have not yet added a folder to the workspace.");
 			if (this.button) {
 				this.button.label = nls.localize('addFolder', "Add Folder");
 			}
-			this.titleDiv.text(this.contextService.getWorkspace().name);
+			this.titleElement.textContent = EmptyView.NAME;
 		} else {
-			this.messageDiv.text(nls.localize('noFolderHelp', "You have not yet opened a folder."));
+			this.messageElement.textContent = nls.localize('noFolderHelp', "You have not yet opened a folder.");
 			if (this.button) {
 				this.button.label = nls.localize('openFolder', "Open Folder");
 			}
-			this.titleDiv.text(this.title);
+			this.titleElement.textContent = this.title;
 		}
 	}
 
diff --git a/src/vs/workbench/parts/files/electron-browser/views/explorerDecorationsProvider.ts b/src/vs/workbench/parts/files/electron-browser/views/explorerDecorationsProvider.ts
index dcbb387a155..cc7f93492aa 100644
--- a/src/vs/workbench/parts/files/electron-browser/views/explorerDecorationsProvider.ts
+++ b/src/vs/workbench/parts/files/electron-browser/views/explorerDecorationsProvider.ts
@@ -5,34 +5,42 @@
 
 'use strict';
 
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { Event, Emitter } from 'vs/base/common/event';
 import { localize } from 'vs/nls';
 import { Model } from 'vs/workbench/parts/files/common/explorerModel';
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
 import { IDecorationsProvider, IDecorationData } from 'vs/workbench/services/decorations/browser/decorations';
 import { listInvalidItemForeground } from 'vs/platform/theme/common/colorRegistry';
+import { IDisposable } from 'vscode-xterm';
+import { dispose } from 'vs/base/common/lifecycle';
 
 export class ExplorerDecorationsProvider implements IDecorationsProvider {
 	readonly label: string = localize('label', "Explorer");
 	private _onDidChange = new Emitter<URI[]>();
+	private toDispose: IDisposable[];
 
 	constructor(
 		private model: Model,
 		@IWorkspaceContextService contextService: IWorkspaceContextService
 	) {
-		contextService.onDidChangeWorkspaceFolders(e => {
+		this.toDispose = [];
+		this.toDispose.push(contextService.onDidChangeWorkspaceFolders(e => {
 			this._onDidChange.fire(e.changed.concat(e.added).map(wf => wf.uri));
-		});
+		}));
 	}
 
 	get onDidChange(): Event<URI[]> {
 		return this._onDidChange.event;
 	}
 
+	changed(uris: URI[]): void {
+		this._onDidChange.fire(uris);
+	}
+
 	provideDecorations(resource: URI): IDecorationData {
 		const fileStat = this.model.findClosest(resource);
-		if (fileStat && fileStat.nonexistentRoot) {
+		if (fileStat && fileStat.isRoot && fileStat.isError) {
 			return {
 				tooltip: localize('canNotResolve', "Can not resolve workspace folder"),
 				letter: '!',
@@ -48,4 +56,8 @@ export class ExplorerDecorationsProvider implements IDecorationsProvider {
 
 		return undefined;
 	}
+
+	dispose(): IDisposable[] {
+		return dispose(this.toDispose);
+	}
 }
diff --git a/src/vs/workbench/parts/files/electron-browser/views/explorerView.ts b/src/vs/workbench/parts/files/electron-browser/views/explorerView.ts
index d9507f86bec..5540ecb71a2 100644
--- a/src/vs/workbench/parts/files/electron-browser/views/explorerView.ts
+++ b/src/vs/workbench/parts/files/electron-browser/views/explorerView.ts
@@ -6,15 +6,14 @@
 
 import * as nls from 'vs/nls';
 import { TPromise } from 'vs/base/common/winjs.base';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { ThrottledDelayer, Delayer } from 'vs/base/common/async';
-import * as errors from 'vs/base/common/errors';
 import * as paths from 'vs/base/common/paths';
 import * as resources from 'vs/base/common/resources';
 import * as glob from 'vs/base/common/glob';
 import { Action, IAction } from 'vs/base/common/actions';
 import { memoize } from 'vs/base/common/decorators';
-import { IFilesConfiguration, ExplorerFolderContext, FilesExplorerFocusedContext, ExplorerFocusedContext, SortOrderConfiguration, SortOrder, IExplorerView, ExplorerRootContext } from 'vs/workbench/parts/files/common/files';
+import { IFilesConfiguration, ExplorerFolderContext, FilesExplorerFocusedContext, ExplorerFocusedContext, SortOrderConfiguration, SortOrder, IExplorerView, ExplorerRootContext, ExplorerResourceReadonlyContext } from 'vs/workbench/parts/files/common/files';
 import { FileOperation, FileOperationEvent, IResolveFileOptions, FileChangeType, FileChangesEvent, IFileService, FILES_EXCLUDE_CONFIG } from 'vs/platform/files/common/files';
 import { RefreshViewExplorerAction, NewFolderAction, NewFileAction } from 'vs/workbench/parts/files/electron-browser/fileActions';
 import { FileDragAndDrop, FileFilter, FileSorter, FileController, FileRenderer, FileDataSource, FileViewletState, FileAccessibilityProvider } from 'vs/workbench/parts/files/electron-browser/views/explorerViewer';
@@ -43,6 +42,7 @@ import { Schemas } from 'vs/base/common/network';
 import { INotificationService } from 'vs/platform/notification/common/notification';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { IViewletPanelOptions } from 'vs/workbench/browser/parts/views/panelViewlet';
+import { ILabelService } from 'vs/platform/label/common/label';
 
 export interface IExplorerViewOptions extends IViewletViewOptions {
 	viewletState: FileViewletState;
@@ -67,6 +67,7 @@ export class ExplorerView extends TreeViewsViewletPanel implements IExplorerView
 
 	private resourceContext: ResourceContextKey;
 	private folderContext: IContextKey<boolean>;
+	private readonlyContext: IContextKey<boolean>;
 	private rootContext: IContextKey<boolean>;
 
 	private fileEventsFilter: ResourceGlobMatcher;
@@ -77,6 +78,7 @@ export class ExplorerView extends TreeViewsViewletPanel implements IExplorerView
 	private settings: object;
 	private treeContainer: HTMLElement;
 	private dragHandler: DelayedDragHandler;
+	private decorationProvider: ExplorerDecorationsProvider;
 	private isDisposed: boolean;
 
 	constructor(
@@ -92,7 +94,8 @@ export class ExplorerView extends TreeViewsViewletPanel implements IExplorerView
 		@IKeybindingService keybindingService: IKeybindingService,
 		@IContextKeyService contextKeyService: IContextKeyService,
 		@IConfigurationService configurationService: IConfigurationService,
-		@IDecorationsService decorationService: IDecorationsService
+		@IDecorationsService decorationService: IDecorationsService,
+		@ILabelService private labelService: ILabelService
 	) {
 		super({ ...(options as IViewletPanelOptions), ariaHeaderLabel: nls.localize('explorerSection', "Files Explorer Section") }, keybindingService, contextMenuService, configurationService);
 
@@ -104,6 +107,7 @@ export class ExplorerView extends TreeViewsViewletPanel implements IExplorerView
 
 		this.resourceContext = instantiationService.createInstance(ResourceContextKey);
 		this.folderContext = ExplorerFolderContext.bindTo(contextKeyService);
+		this.readonlyContext = ExplorerResourceReadonlyContext.bindTo(contextKeyService);
 		this.rootContext = ExplorerRootContext.bindTo(contextKeyService);
 
 		this.fileEventsFilter = instantiationService.createInstance(
@@ -112,7 +116,10 @@ export class ExplorerView extends TreeViewsViewletPanel implements IExplorerView
 			(event: IConfigurationChangeEvent) => event.affectsConfiguration(FILES_EXCLUDE_CONFIG)
 		);
 
-		decorationService.registerDecorationsProvider(new ExplorerDecorationsProvider(this.model, contextService));
+		this.decorationProvider = new ExplorerDecorationsProvider(this.model, contextService);
+		decorationService.registerDecorationsProvider(this.decorationProvider);
+		this.disposables.push(this.decorationProvider);
+		this.disposables.push(this.resourceContext);
 	}
 
 	private getFileEventsExcludes(root?: URI): glob.IExpression {
@@ -137,11 +144,12 @@ export class ExplorerView extends TreeViewsViewletPanel implements IExplorerView
 		};
 
 		this.disposables.push(this.contextService.onDidChangeWorkspaceName(setHeader));
+		this.disposables.push(this.labelService.onDidRegisterFormatter(setHeader));
 		setHeader();
 	}
 
 	public get name(): string {
-		return this.contextService.getWorkspace().name;
+		return this.labelService.getWorkspaceLabel(this.contextService.getWorkspace());
 	}
 
 	public get title(): string {
@@ -191,6 +199,11 @@ export class ExplorerView extends TreeViewsViewletPanel implements IExplorerView
 
 		this.disposables.push(this.contextService.onDidChangeWorkspaceFolders(e => this.refreshFromEvent(e.added)));
 		this.disposables.push(this.contextService.onDidChangeWorkbenchState(e => this.refreshFromEvent()));
+		this.disposables.push(this.fileService.onDidChangeFileSystemProviderRegistrations(() => this.refreshFromEvent()));
+		this.disposables.push(this.labelService.onDidRegisterFormatter(() => {
+			this._onDidChangeTitleArea.fire();
+			this.refreshFromEvent();
+		}));
 	}
 
 	layoutBody(size: number): void {
@@ -230,7 +243,7 @@ export class ExplorerView extends TreeViewsViewletPanel implements IExplorerView
 			if (this.isVisible() && !this.isDisposed && this.contextService.isInsideWorkspace(activeFile)) {
 				const selection = this.hasSingleSelection(activeFile);
 				if (!selection) {
-					this.select(activeFile).done(null, errors.onUnexpectedError);
+					this.select(activeFile);
 				}
 
 				clearSelection = false;
@@ -280,7 +293,7 @@ export class ExplorerView extends TreeViewsViewletPanel implements IExplorerView
 
 		// Refresh viewer as needed if this originates from a config event
 		if (event && needsRefresh) {
-			this.doRefresh().done(null, errors.onUnexpectedError);
+			this.doRefresh();
 		}
 	}
 
@@ -294,7 +307,7 @@ export class ExplorerView extends TreeViewsViewletPanel implements IExplorerView
 			if (this.autoReveal) {
 				const selection = this.explorerViewer.getSelection();
 				if (selection.length > 0) {
-					this.reveal(selection[0], 0.5).done(null, errors.onUnexpectedError);
+					this.reveal(selection[0], 0.5);
 				}
 			}
 
@@ -433,6 +446,7 @@ export class ExplorerView extends TreeViewsViewletPanel implements IExplorerView
 			const resource = e.focus ? e.focus.resource : isSingleFolder ? this.contextService.getWorkspace().folders[0].uri : undefined;
 			this.resourceContext.set(resource);
 			this.folderContext.set((isSingleFolder && !e.focus) || e.focus && e.focus.isDirectory);
+			this.readonlyContext.set(e.focus && e.focus.isReadonly);
 			this.rootContext.set(!e.focus || (e.focus && e.focus.isRoot));
 		}));
 
@@ -497,7 +511,7 @@ export class ExplorerView extends TreeViewsViewletPanel implements IExplorerView
 								// Focus new element
 								this.explorerViewer.setFocus(childElement);
 							});
-						}).done(null, errors.onUnexpectedError);
+						});
 					});
 				});
 			}
@@ -529,7 +543,7 @@ export class ExplorerView extends TreeViewsViewletPanel implements IExplorerView
 					modelElement.rename(newElement);
 
 					// Update Parent (View)
-					this.explorerViewer.refresh(modelElement.parent).done(() => {
+					this.explorerViewer.refresh(modelElement.parent).then(() => {
 
 						// Select in Viewer if set
 						if (restoreFocus) {
@@ -539,7 +553,7 @@ export class ExplorerView extends TreeViewsViewletPanel implements IExplorerView
 						if (isExpanded) {
 							this.explorerViewer.expand(modelElement);
 						}
-					}, errors.onUnexpectedError);
+					});
 				});
 			}
 
@@ -555,10 +569,10 @@ export class ExplorerView extends TreeViewsViewletPanel implements IExplorerView
 						const oldParent = modelElement.parent;
 						modelElement.move(newParents[index], (callback: () => void) => {
 							// Update old parent
-							this.explorerViewer.refresh(oldParent).done(callback, errors.onUnexpectedError);
+							this.explorerViewer.refresh(oldParent).then(callback);
 						}, () => {
 							// Update new parent
-							this.explorerViewer.refresh(newParents[index], true).done(() => this.explorerViewer.expand(newParents[index]), errors.onUnexpectedError);
+							this.explorerViewer.refresh(newParents[index], true).then(() => this.explorerViewer.expand(newParents[index]));
 						});
 					});
 				}
@@ -576,13 +590,13 @@ export class ExplorerView extends TreeViewsViewletPanel implements IExplorerView
 
 					// Refresh Parent (View)
 					const restoreFocus = this.explorerViewer.isDOMFocused();
-					this.explorerViewer.refresh(parent).done(() => {
+					this.explorerViewer.refresh(parent).then(() => {
 
 						// Ensure viewer has keyboard focus if event originates from viewer
 						if (restoreFocus) {
 							this.explorerViewer.domFocus();
 						}
-					}, errors.onUnexpectedError);
+					});
 				}
 			});
 		}
@@ -711,7 +725,7 @@ export class ExplorerView extends TreeViewsViewletPanel implements IExplorerView
 				}
 
 				return TPromise.as(null);
-			}).done(null, errors.onUnexpectedError);
+			});
 		} else {
 			this.shouldRefresh = true;
 		}
@@ -779,8 +793,11 @@ export class ExplorerView extends TreeViewsViewletPanel implements IExplorerView
 			});
 		}
 
-		const promise = this.resolveRoots(targetsToResolve, targetsToExpand);
-		this.progressService.showWhile(promise, this.partService.isCreated() ? 800 : 3200 /* less ugly initial startup */);
+		const promise = this.resolveRoots(targetsToResolve, targetsToExpand).then(result => {
+			this.decorationProvider.changed(targetsToResolve.map(t => t.root.resource));
+			return result;
+		});
+		this.progressService.showWhile(promise, this.partService.isCreated() ? 800 : 1200 /* less ugly initial startup */);
 
 		return promise;
 	}
@@ -788,14 +805,21 @@ export class ExplorerView extends TreeViewsViewletPanel implements IExplorerView
 	private resolveRoots(targetsToResolve: { root: ExplorerItem, resource: URI, options: { resolveTo: any[] } }[], targetsToExpand: URI[]): TPromise<any> {
 
 		// Display roots only when multi folder workspace
-		const input = this.contextService.getWorkbenchState() === WorkbenchState.FOLDER ? this.model.roots[0] : this.model;
-		const errorFileStat = (resource: URI, root: ExplorerItem) => ExplorerItem.create({
-			resource: resource,
-			name: paths.basename(resource.fsPath),
-			mtime: 0,
-			etag: undefined,
-			isDirectory: true
-		}, root);
+		let input = this.contextService.getWorkbenchState() === WorkbenchState.FOLDER ? this.model.roots[0] : this.model;
+
+		const errorRoot = (resource: URI, root: ExplorerItem) => {
+			if (input === this.model.roots[0]) {
+				input = this.model;
+			}
+
+			return ExplorerItem.create({
+				resource: resource,
+				name: paths.basename(resource.fsPath),
+				mtime: 0,
+				etag: undefined,
+				isDirectory: true
+			}, root, undefined, true);
+		};
 
 		const setInputAndExpand = (input: ExplorerItem | Model, statsToExpand: ExplorerItem[]) => {
 			// Make sure to expand all folders that where expanded in the previous session
@@ -816,7 +840,7 @@ export class ExplorerView extends TreeViewsViewletPanel implements IExplorerView
 						return ExplorerItem.create(result.stat, targetsToResolve[index].root, targetsToResolve[index].options.resolveTo);
 					}
 
-					return errorFileStat(targetsToResolve[index].resource, targetsToResolve[index].root);
+					return errorRoot(targetsToResolve[index].resource, targetsToResolve[index].root);
 				});
 				// Subsequent refresh: Merge stat into our local model and refresh tree
 				modelStats.forEach((modelStat, index) => {
@@ -839,7 +863,7 @@ export class ExplorerView extends TreeViewsViewletPanel implements IExplorerView
 		let delayer = new Delayer(100);
 		let delayerPromise: TPromise;
 		return TPromise.join(targetsToResolve.map((target, index) => this.fileService.resolveFile(target.resource, target.options)
-			.then(result => result.isDirectory ? ExplorerItem.create(result, target.root, target.options.resolveTo) : errorFileStat(target.resource, target.root), err => errorFileStat(target.resource, target.root))
+			.then(result => result.isDirectory ? ExplorerItem.create(result, target.root, target.options.resolveTo) : errorRoot(target.resource, target.root), () => errorRoot(target.resource, target.root))
 			.then(modelStat => {
 				// Subsequent refresh: Merge stat into our local model and refresh tree
 				if (index < this.model.roots.length) {
diff --git a/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.ts b/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.ts
index 435acd5331e..7368ff7e693 100644
--- a/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.ts
+++ b/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.ts
@@ -9,7 +9,7 @@ import * as nls from 'vs/nls';
 import * as objects from 'vs/base/common/objects';
 import * as DOM from 'vs/base/browser/dom';
 import * as path from 'path';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { once } from 'vs/base/common/functional';
 import * as paths from 'vs/base/common/paths';
 import * as resources from 'vs/base/common/resources';
@@ -20,7 +20,7 @@ import { InputBox, MessageType } from 'vs/base/browser/ui/inputbox/inputBox';
 import { isMacintosh, isLinux } from 'vs/base/common/platform';
 import * as glob from 'vs/base/common/glob';
 import { FileLabel, IFileLabelOptions } from 'vs/workbench/browser/labels';
-import { IDisposable, dispose, empty as EmptyDisposable } from 'vs/base/common/lifecycle';
+import { IDisposable, dispose, Disposable } from 'vs/base/common/lifecycle';
 import { IFilesConfiguration, SortOrder } from 'vs/workbench/parts/files/common/files';
 import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
 import { FileOperationError, FileOperationResult, IFileService, FileKind } from 'vs/platform/files/common/files';
@@ -56,7 +56,7 @@ import { IDialogService, IConfirmationResult, IConfirmation, getConfirmMessage }
 import { INotificationService } from 'vs/platform/notification/common/notification';
 import { IEditorService, SIDE_GROUP, ACTIVE_GROUP } from 'vs/workbench/services/editor/common/editorService';
 import { fillInContextMenuActions } from 'vs/platform/actions/browser/menuItemActionItem';
-import { IBackupFileService } from 'vs/workbench/services/backup/common/backup';
+import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 
 export class FileDataSource implements IDataSource {
 	constructor(
@@ -233,7 +233,7 @@ export class FileRenderer implements IRenderer {
 	}
 
 	public renderTemplate(tree: ITree, templateId: string, container: HTMLElement): IFileTemplateData {
-		const elementDisposable = EmptyDisposable;
+		const elementDisposable = Disposable.None;
 		const label = this.instantiationService.createInstance(FileLabel, container, void 0);
 
 		return { elementDisposable, label, container };
@@ -264,7 +264,7 @@ export class FileRenderer implements IRenderer {
 		else {
 			templateData.label.element.style.display = 'none';
 			this.renderInputBox(templateData.container, tree, stat, editableData);
-			templateData.elementDisposable = EmptyDisposable;
+			templateData.elementDisposable = Disposable.None;
 		}
 	}
 
@@ -275,7 +275,11 @@ export class FileRenderer implements IRenderer {
 		const extraClasses = ['explorer-item', 'explorer-item-edited'];
 		const fileKind = stat.isRoot ? FileKind.ROOT_FOLDER : (stat.isDirectory || (stat instanceof NewStatPlaceholder && stat.isDirectoryPlaceholder())) ? FileKind.FOLDER : FileKind.FILE;
 		const labelOptions: IFileLabelOptions = { hidePath: true, hideLabel: true, fileKind, extraClasses };
-		label.setFile(stat.resource, labelOptions);
+
+		const parent = stat.name ? resources.dirname(stat.resource) : stat.resource;
+		const value = stat.name || '';
+
+		label.setFile(resources.joinPath(parent, value || ' '), labelOptions); // Use icon for ' ' if name is empty.
 
 		// Input field for name
 		const inputBox = new InputBox(label.element, this.contextViewService, {
@@ -286,12 +290,10 @@ export class FileRenderer implements IRenderer {
 		});
 		const styler = attachInputBoxStyler(inputBox, this.themeService);
 
-		const parent = resources.dirname(stat.resource);
 		inputBox.onDidChange(value => {
-			label.setFile(parent.with({ path: paths.join(parent.path, value) }), labelOptions); // update label icon while typing!
+			label.setFile(resources.joinPath(parent, value || ' '), labelOptions); // update label icon while typing!
 		});
 
-		const value = stat.name || '';
 		const lastDot = value.lastIndexOf('.');
 
 		inputBox.value = value;
@@ -332,7 +334,7 @@ export class FileRenderer implements IRenderer {
 				if (this.contextService.getWorkbenchState() === WorkbenchState.WORKSPACE) {
 					projectFolderName = paths.basename(stat.root.resource.path);	// show root folder name in multi-folder project
 				}
-				this.displayCurrentPath(inputBox, initialRelPath, projectFolderName, editableData.action.id);
+				this.showInputMessage(inputBox, initialRelPath, projectFolderName, editableData.action.id);
 			}),
 			DOM.addDisposableListener(inputBox.inputElement, DOM.EventType.BLUR, () => {
 				done(inputBox.isInputValid(), true);
@@ -342,7 +344,7 @@ export class FileRenderer implements IRenderer {
 		];
 	}
 
-	private displayCurrentPath(inputBox: InputBox, initialRelPath: string, projectFolderName: string = '', actionID: string) {
+	private showInputMessage(inputBox: InputBox, initialRelPath: string, projectFolderName: string = '', actionID: string) {
 		if (inputBox.validate()) {
 			const value = inputBox.value;
 			if (value && /.[\\/]./.test(value)) {	// only show if there's at least one slash enclosed in the string
@@ -371,8 +373,13 @@ export class FileRenderer implements IRenderer {
 					content: msg,
 					formatContent: true
 				});
-			}
-			else {	// fixes #46744: inputbox hides again if all slashes are removed
+			} else if (value && /^\s|\s$/.test(value)) {
+				inputBox.showMessage({
+					content: nls.localize('whitespace', "Leading or trailing whitespace detected"),
+					formatContent: true,
+					type: MessageType.WARNING
+				});
+			} else {	// fixes #46744: inputbox hides again if all slashes are removed
 				inputBox.hideMessage();
 			}
 		}
@@ -383,7 +390,7 @@ export class FileRenderer implements IRenderer {
 export class FileAccessibilityProvider implements IAccessibilityProvider {
 
 	public getAriaLabel(tree: ITree, stat: ExplorerItem): string {
-		return nls.localize('filesExplorerViewerAriaLabel', "{0}, Files Explorer", stat.name);
+		return stat.name;
 	}
 }
 
@@ -401,6 +408,7 @@ export class FileController extends WorkbenchTreeController implements IDisposab
 		@IMenuService private menuService: IMenuService,
 		@IContextKeyService contextKeyService: IContextKeyService,
 		@IClipboardService private clipboardService: IClipboardService,
+		@IKeybindingService private keybindingService: IKeybindingService,
 		@IConfigurationService configurationService: IConfigurationService
 	) {
 		super({ clickBehavior: ClickBehavior.ON_MOUSE_UP /* do not change to not break DND */ }, configurationService);
@@ -494,7 +502,7 @@ export class FileController extends WorkbenchTreeController implements IDisposab
 					sideBySide = tree.useAltAsMultipleSelectionModifier ? (event.ctrlKey || event.metaKey) : event.altKey;
 				}
 
-				this.openEditor(stat, { preserveFocus, sideBySide, pinned: isDoubleClick });
+				this.openEditor(stat, { preserveFocus, sideBySide, pinned: isDoubleClick || (event && event.middleButton) });
 			}
 		}
 
@@ -533,6 +541,9 @@ export class FileController extends WorkbenchTreeController implements IDisposab
 					tree.domFocus();
 				}
 			},
+			getKeyBinding: (action) => {
+				return this.keybindingService.lookupKeybinding(action.id);
+			},
 			getActionsContext: () => selection && selection.indexOf(stat) >= 0
 				? selection.map((fs: ExplorerItem) => fs.resource)
 				: stat instanceof ExplorerItem ? [stat.resource] : []
@@ -674,18 +685,21 @@ export class FileSorter implements ISorter {
 }
 
 // Explorer Filter
+interface CachedParsedExpression {
+	original: glob.IExpression;
+	parsed: glob.ParsedExpression;
+}
+
 export class FileFilter implements IFilter {
 
-	private static readonly MAX_SIBLINGS_FILTER_THRESHOLD = 2000;
-
-	private hiddenExpressionPerRoot: Map<string, glob.IExpression>;
+	private hiddenExpressionPerRoot: Map<string, CachedParsedExpression>;
 	private workspaceFolderChangeListener: IDisposable;
 
 	constructor(
 		@IWorkspaceContextService private contextService: IWorkspaceContextService,
 		@IConfigurationService private configurationService: IConfigurationService
 	) {
-		this.hiddenExpressionPerRoot = new Map<string, glob.IExpression>();
+		this.hiddenExpressionPerRoot = new Map<string, CachedParsedExpression>();
 
 		this.registerListeners();
 	}
@@ -698,9 +712,16 @@ export class FileFilter implements IFilter {
 		let needsRefresh = false;
 		this.contextService.getWorkspace().folders.forEach(folder => {
 			const configuration = this.configurationService.getValue<IFilesConfiguration>({ resource: folder.uri });
-			const excludesConfig = (configuration && configuration.files && configuration.files.exclude) || Object.create(null);
-			needsRefresh = needsRefresh || !objects.equals(this.hiddenExpressionPerRoot.get(folder.uri.toString()), excludesConfig);
-			this.hiddenExpressionPerRoot.set(folder.uri.toString(), objects.deepClone(excludesConfig)); // do not keep the config, as it gets mutated under our hoods
+			const excludesConfig: glob.IExpression = (configuration && configuration.files && configuration.files.exclude) || Object.create(null);
+
+			if (!needsRefresh) {
+				const cached = this.hiddenExpressionPerRoot.get(folder.uri.toString());
+				needsRefresh = !cached || !objects.equals(cached.original, excludesConfig);
+			}
+
+			const excludesConfigCopy = objects.deepClone(excludesConfig); // do not keep the config, as it gets mutated under our hoods
+
+			this.hiddenExpressionPerRoot.set(folder.uri.toString(), { original: excludesConfigCopy, parsed: glob.parse(excludesConfigCopy) } as CachedParsedExpression);
 		});
 
 		return needsRefresh;
@@ -715,18 +736,9 @@ export class FileFilter implements IFilter {
 			return true; // always visible
 		}
 
-		// Workaround for O(N^2) complexity (https://github.com/Microsoft/vscode/issues/9962)
-		let siblingsFn: () => string[];
-		let siblingCount = stat.parent && stat.parent.getChildrenCount();
-		if (siblingCount && siblingCount > FileFilter.MAX_SIBLINGS_FILTER_THRESHOLD) {
-			siblingsFn = () => void 0;
-		} else {
-			siblingsFn = () => stat.parent ? stat.parent.getChildrenNames() : void 0;
-		}
-
 		// Hide those that match Hidden Patterns
-		const expression = this.hiddenExpressionPerRoot.get(stat.root.resource.toString()) || Object.create(null);
-		if (glob.match(expression, paths.normalize(path.relative(stat.root.resource.path, stat.resource.path), true), siblingsFn)) {
+		const cached = this.hiddenExpressionPerRoot.get(stat.root.resource.toString());
+		if (cached && cached.parsed(paths.normalize(path.relative(stat.root.resource.path, stat.resource.path), true), stat.name, name => !!stat.parent.getChild(name))) {
 			return false; // hidden through pattern
 		}
 
@@ -754,7 +766,6 @@ export class FileDragAndDrop extends SimpleFileResourceDragAndDrop {
 		@IConfigurationService private configurationService: IConfigurationService,
 		@IInstantiationService instantiationService: IInstantiationService,
 		@ITextFileService private textFileService: ITextFileService,
-		@IBackupFileService private backupFileService: IBackupFileService,
 		@IWindowService private windowService: IWindowService,
 		@IWorkspaceEditingService private workspaceEditingService: IWorkspaceEditingService
 	) {
@@ -860,6 +871,11 @@ export class FileDragAndDrop extends SimpleFileResourceDragAndDrop {
 					return true; // Can not move anything onto itself
 				}
 
+				if (source.isRoot && target instanceof ExplorerItem && target.isRoot) {
+					// Disable moving workspace roots in one another
+					return false;
+				}
+
 				if (!isCopy && resources.dirname(source.resource).toString() === target.resource.toString()) {
 					return true; // Can not move a file to the same parent unless we copy
 				}
@@ -882,6 +898,9 @@ export class FileDragAndDrop extends SimpleFileResourceDragAndDrop {
 		// All (target = file/folder)
 		else {
 			if (target.isDirectory) {
+				if (target.isReadonly) {
+					return DRAG_OVER_REJECT;
+				}
 				return fromDesktop || isCopy ? DRAG_OVER_ACCEPT_BUBBLE_DOWN_COPY(true) : DRAG_OVER_ACCEPT_BUBBLE_DOWN(true);
 			}
 
@@ -894,19 +913,16 @@ export class FileDragAndDrop extends SimpleFileResourceDragAndDrop {
 	}
 
 	public drop(tree: ITree, data: IDragAndDropData, target: ExplorerItem | Model, originalEvent: DragMouseEvent): void {
-		let promise: TPromise<void> = TPromise.as(null);
 
 		// Desktop DND (Import file)
 		if (data instanceof DesktopDragAndDropData) {
-			promise = this.handleExternalDrop(tree, data, target, originalEvent);
+			this.handleExternalDrop(tree, data, target, originalEvent);
 		}
 
 		// In-Explorer DND (Move/Copy file)
 		else {
-			promise = this.handleExplorerDrop(tree, data, target, originalEvent);
+			this.handleExplorerDrop(tree, data, target, originalEvent);
 		}
-
-		promise.done(null, errors.onUnexpectedError);
 	}
 
 	private handleExternalDrop(tree: ITree, data: DesktopDragAndDropData, target: ExplorerItem | Model, originalEvent: DragMouseEvent): TPromise<void> {
@@ -942,7 +958,7 @@ export class FileDragAndDrop extends SimpleFileResourceDragAndDrop {
 			}
 
 			// Handle dropped files (only support FileStat as target)
-			else if (target instanceof ExplorerItem) {
+			else if (target instanceof ExplorerItem && !target.isReadonly) {
 				const addFilesAction = this.instantiationService.createInstance(AddFilesAction, tree, target, null);
 
 				return addFilesAction.run(droppedResources.map(res => res.resource));
@@ -1028,91 +1044,52 @@ export class FileDragAndDrop extends SimpleFileResourceDragAndDrop {
 	}
 
 	private doHandleExplorerDrop(tree: ITree, source: ExplorerItem, target: ExplorerItem | Model, isCopy: boolean): TPromise<void> {
+		if (!(target instanceof ExplorerItem)) {
+			return TPromise.as(void 0);
+		}
+
 		return tree.expand(target).then(() => {
+
+			if (target.isReadonly) {
+				return void 0;
+			}
+
 			// Reuse duplicate action if user copies
 			if (isCopy) {
 				return this.instantiationService.createInstance(DuplicateFileAction, tree, source, target).run();
 			}
 
-			const dirtyMoved: URI[] = [];
+			// Otherwise move
+			const targetResource = resources.joinPath(target.resource, source.name);
 
-			// Success: load all files that are dirty again to restore their dirty contents
-			// Error: discard any backups created during the process
-			const onSuccess = () => TPromise.join(dirtyMoved.map(t => this.textFileService.models.loadOrCreate(t)));
-			const onError = (error?: Error, showError?: boolean) => {
-				if (showError) {
+			return this.textFileService.move(source.resource, targetResource).then(null, error => {
+
+				// Conflict
+				if ((<FileOperationError>error).fileOperationResult === FileOperationResult.FILE_MOVE_CONFLICT) {
+					const confirm: IConfirmation = {
+						message: nls.localize('confirmOverwriteMessage', "'{0}' already exists in the destination folder. Do you want to replace it?", source.name),
+						detail: nls.localize('irreversible', "This action is irreversible!"),
+						primaryButton: nls.localize({ key: 'replaceButtonLabel', comment: ['&& denotes a mnemonic'] }, "&&Replace"),
+						type: 'warning'
+					};
+
+					// Move with overwrite if the user confirms
+					return this.dialogService.confirm(confirm).then(res => {
+						if (res.confirmed) {
+							return this.textFileService.move(source.resource, targetResource, true /* overwrite */).then(null, error => this.notificationService.error(error));
+						}
+
+						return void 0;
+					});
+				}
+
+				// Any other error
+				else {
 					this.notificationService.error(error);
 				}
 
-				return TPromise.join(dirtyMoved.map(d => this.backupFileService.discardResourceBackup(d)));
-			};
-			if (!(target instanceof ExplorerItem)) {
-				return TPromise.as(void 0);
-			}
-
-			// 1. check for dirty files that are being moved and backup to new target
-			const dirty = this.textFileService.getDirty().filter(d => resources.isEqualOrParent(d, source.resource, !isLinux /* ignorecase */));
-			return TPromise.join(dirty.map(d => {
-				let moved: URI;
-
-				// If the dirty file itself got moved, just reparent it to the target folder
-				if (source.resource.toString() === d.toString()) {
-					moved = target.resource.with({ path: paths.join(target.resource.path, source.name) });
-				}
-
-				// Otherwise, a parent of the dirty resource got moved, so we have to reparent more complicated. Example:
-				else {
-					moved = target.resource.with({ path: paths.join(target.resource.path, d.path.substr(source.parent.resource.path.length + 1)) });
-				}
-
-				dirtyMoved.push(moved);
-
-				const model = this.textFileService.models.get(d);
-
-				return this.backupFileService.backupResource(moved, model.createSnapshot(), model.getVersionId());
-			}))
-
-				// 2. soft revert all dirty since we have backed up their contents
-				.then(() => this.textFileService.revertAll(dirty, { soft: true /* do not attempt to load content from disk */ }))
-
-				// 3.) run the move operation
-				.then(() => {
-					const targetResource = target.resource.with({ path: paths.join(target.resource.path, source.name) });
-
-					return this.fileService.moveFile(source.resource, targetResource).then(null, error => {
-
-						// Conflict
-						if ((<FileOperationError>error).fileOperationResult === FileOperationResult.FILE_MOVE_CONFLICT) {
-							const confirm: IConfirmation = {
-								message: nls.localize('confirmOverwriteMessage', "'{0}' already exists in the destination folder. Do you want to replace it?", source.name),
-								detail: nls.localize('irreversible', "This action is irreversible!"),
-								primaryButton: nls.localize({ key: 'replaceButtonLabel', comment: ['&& denotes a mnemonic'] }, "&&Replace"),
-								type: 'warning'
-							};
-
-							// Move with overwrite if the user confirms
-							return this.dialogService.confirm(confirm).then(res => {
-								if (res.confirmed) {
-									const targetDirty = this.textFileService.getDirty().filter(d => resources.isEqualOrParent(d, targetResource, !isLinux /* ignorecase */));
-
-									// Make sure to revert all dirty in target first to be able to overwrite properly
-									return this.textFileService.revertAll(targetDirty, { soft: true /* do not attempt to load content from disk */ }).then(() => {
-
-										// Then continue to do the move operation
-										return this.fileService.moveFile(source.resource, targetResource, true).then(onSuccess, error => onError(error, true));
-									});
-								}
-
-								return onError();
-							});
-						}
-
-						return onError(error, true);
-					});
-				})
-
-				// 4.) resolve those that were dirty to load their previous dirty contents from disk
-				.then(onSuccess, onError);
+				return void 0;
+			});
 		}, errors.onUnexpectedError);
 	}
 }
diff --git a/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.ts b/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.ts
index aac21c37e05..454bb86bce6 100644
--- a/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.ts
+++ b/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.ts
@@ -4,13 +4,12 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as nls from 'vs/nls';
-import * as errors from 'vs/base/common/errors';
 import { RunOnceScheduler } from 'vs/base/common/async';
 import { IAction, ActionRunner } from 'vs/base/common/actions';
 import * as dom from 'vs/base/browser/dom';
 import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IEditorGroupsService, IEditorGroup, GroupChangeKind } from 'vs/workbench/services/group/common/editorGroupsService';
+import { IEditorGroupsService, IEditorGroup, GroupChangeKind, GroupsOrder } from 'vs/workbench/services/group/common/editorGroupsService';
 import { IConfigurationService, IConfigurationChangeEvent } from 'vs/platform/configuration/common/configuration';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { IEditorInput } from 'vs/workbench/common/editor';
@@ -26,7 +25,7 @@ import { attachStylerCallback } from 'vs/platform/theme/common/styler';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { badgeBackground, badgeForeground, contrastBorder } from 'vs/platform/theme/common/colorRegistry';
 import { WorkbenchList } from 'vs/platform/list/browser/listService';
-import { IDelegate, IRenderer, IListContextMenuEvent } from 'vs/base/browser/ui/list/list';
+import { IVirtualDelegate, IRenderer, IListContextMenuEvent } from 'vs/base/browser/ui/list/list';
 import { EditorLabel } from 'vs/workbench/browser/labels';
 import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
 import { TPromise } from 'vs/base/common/winjs.base';
@@ -37,7 +36,7 @@ import { fillInContextMenuActions } from 'vs/platform/actions/browser/menuItemAc
 import { IMenuService, MenuId, IMenu } from 'vs/platform/actions/common/actions';
 import { DirtyEditorContext, OpenEditorsGroupContext } from 'vs/workbench/parts/files/electron-browser/fileCommands';
 import { ResourceContextKey } from 'vs/workbench/common/resources';
-import { fillResourceDataTransfers, ResourcesDropHandler, LocalSelectionTransfer } from 'vs/workbench/browser/dnd';
+import { fillResourceDataTransfers, ResourcesDropHandler, LocalSelectionTransfer, CodeDataTransfers } from 'vs/workbench/browser/dnd';
 import { ViewletPanel, IViewletPanelOptions } from 'vs/workbench/browser/parts/views/panelViewlet';
 import { IViewletViewOptions } from 'vs/workbench/browser/parts/views/viewsViewlet';
 
@@ -160,6 +159,7 @@ export class OpenEditorsView extends ViewletPanel {
 					}
 				}
 			}));
+			this.disposables.push(groupDisposables.get(group.id));
 		};
 
 		this.editorGroupService.groups.forEach(g => addGroupListener(g));
@@ -175,8 +175,7 @@ export class OpenEditorsView extends ViewletPanel {
 	}
 
 	protected renderHeaderTitle(container: HTMLElement): void {
-		const title = dom.append(container, $('.title'));
-		dom.append(title, $('span', null, this.title));
+		super.renderHeaderTitle(container, this.title);
 
 		const count = dom.append(container, $('.count'));
 		this.dirtyCountElement = dom.append(count, $('.monaco-count-badge'));
@@ -211,6 +210,10 @@ export class OpenEditorsView extends ViewletPanel {
 
 			return focused;
 		};
+
+		if (this.list) {
+			this.list.dispose();
+		}
 		this.list = this.instantiationService.createInstance(WorkbenchList, container, delegate, [
 			new EditorGroupRenderer(this.keybindingService, this.instantiationService, this.editorGroupService),
 			new OpenEditorRenderer(getSelectedElements, this.instantiationService, this.keybindingService, this.configurationService, this.editorGroupService)
@@ -218,6 +221,7 @@ export class OpenEditorsView extends ViewletPanel {
 				identityProvider: (element: OpenEditor | IEditorGroup) => element instanceof OpenEditor ? element.getId() : element.id.toString(),
 				selectOnMouseDown: false /* disabled to better support DND */
 			}) as WorkbenchList<OpenEditor | IEditorGroup>;
+		this.disposables.push(this.list);
 
 		this.contributedContextMenu = this.menuService.createMenu(MenuId.OpenEditorsContext, this.list.contextKeyService);
 		this.disposables.push(this.contributedContextMenu);
@@ -229,6 +233,7 @@ export class OpenEditorsView extends ViewletPanel {
 		ExplorerFocusedContext.bindTo(this.list.contextKeyService);
 
 		this.resourceContext = this.instantiationService.createInstance(ResourceContextKey);
+		this.disposables.push(this.resourceContext);
 		this.groupFocusedContext = OpenEditorsGroupContext.bindTo(this.contextKeyService);
 		this.dirtyEditorFocusedContext = DirtyEditorContext.bindTo(this.contextKeyService);
 
@@ -265,7 +270,7 @@ export class OpenEditorsView extends ViewletPanel {
 			const element = focused.length ? focused[0] : undefined;
 			if (element instanceof OpenEditor) {
 				if (isMiddleClick) {
-					element.group.closeEditor(element.editor).done(null, errors.onUnexpectedError);
+					element.group.closeEditor(element.editor);
 				} else {
 					this.openEditor(element, { preserveFocus: isSingleClick, pinned: isDoubleClick, sideBySide: openToSide });
 				}
@@ -287,6 +292,7 @@ export class OpenEditorsView extends ViewletPanel {
 
 	public setExpanded(expanded: boolean): void {
 		super.setExpanded(expanded);
+		this.updateListVisibility(expanded);
 		if (expanded && this.needsRefresh) {
 			this.listRefreshScheduler.schedule(0);
 		}
@@ -294,6 +300,7 @@ export class OpenEditorsView extends ViewletPanel {
 
 	public setVisible(visible: boolean): TPromise<void> {
 		return super.setVisible(visible).then(() => {
+			this.updateListVisibility(visible && this.isExpanded());
 			if (visible && this.needsRefresh) {
 				this.listRefreshScheduler.schedule(0);
 			}
@@ -315,13 +322,23 @@ export class OpenEditorsView extends ViewletPanel {
 		}
 	}
 
+	private updateListVisibility(isVisible: boolean): void {
+		if (this.list) {
+			if (isVisible) {
+				dom.show(this.list.getHTMLElement());
+			} else {
+				dom.hide(this.list.getHTMLElement()); // make sure the list goes out of the tabindex world by hiding it
+			}
+		}
+	}
+
 	private get showGroups(): boolean {
 		return this.editorGroupService.groups.length > 1;
 	}
 
 	private get elements(): (IEditorGroup | OpenEditor)[] {
 		const result: (IEditorGroup | OpenEditor)[] = [];
-		this.editorGroupService.groups.forEach(g => {
+		this.editorGroupService.getGroups(GroupsOrder.GRID_APPEARANCE).forEach(g => {
 			if (this.showGroups) {
 				result.push(g);
 			}
@@ -337,7 +354,7 @@ export class OpenEditorsView extends ViewletPanel {
 			return index;
 		}
 
-		for (let g of this.editorGroupService.groups) {
+		for (let g of this.editorGroupService.getGroups(GroupsOrder.GRID_APPEARANCE)) {
 			if (g.id === group.id) {
 				return index + (!!editor ? 1 : 0);
 			} else {
@@ -362,11 +379,11 @@ export class OpenEditorsView extends ViewletPanel {
 			if (!preserveActivateGroup) {
 				this.editorGroupService.activateGroup(element.groupId); // needed for https://github.com/Microsoft/vscode/issues/6672
 			}
-			this.editorService.openEditor(element.editor, options, options.sideBySide ? SIDE_GROUP : ACTIVE_GROUP).done(editor => {
+			this.editorService.openEditor(element.editor, options, options.sideBySide ? SIDE_GROUP : ACTIVE_GROUP).then(editor => {
 				if (!preserveActivateGroup) {
 					this.editorGroupService.activateGroup(editor.group);
 				}
-			}, errors.onUnexpectedError);
+			});
 		}
 	}
 
@@ -384,7 +401,7 @@ export class OpenEditorsView extends ViewletPanel {
 	}
 
 	private focusActiveEditor(): void {
-		if (this.editorGroupService.activeGroup && this.editorGroupService.activeGroup.activeEditor /* could be empty */) {
+		if (this.list.length && this.editorGroupService.activeGroup) {
 			const index = this.getIndex(this.editorGroupService.activeGroup, this.editorGroupService.activeGroup.activeEditor);
 			this.list.setFocus([index]);
 			this.list.setSelection([index]);
@@ -483,7 +500,7 @@ class OpenEditorActionRunner extends ActionRunner {
 	}
 }
 
-class OpenEditorsDelegate implements IDelegate<OpenEditor | IEditorGroup> {
+class OpenEditorsDelegate implements IVirtualDelegate<OpenEditor | IEditorGroup> {
 
 	public static readonly ITEM_HEIGHT = 22;
 
@@ -500,6 +517,32 @@ class OpenEditorsDelegate implements IDelegate<OpenEditor | IEditorGroup> {
 	}
 }
 
+/**
+ * Check if the item being dragged is one of the supported types that can be dropped on an
+ * open editor or editor group. Fixes https://github.com/Microsoft/vscode/issues/52344.
+ * @param e
+ * @returns true if dropping is supported.
+ */
+function dropOnEditorSupported(e: DragEvent): boolean {
+	// DataTransfer types are automatically converted to lower case, except Files.
+	const supportedTransferTypes = {
+		openEditor: CodeDataTransfers.EDITORS.toLowerCase(),
+		externalFile: 'Files',
+		codeFile: CodeDataTransfers.FILES.toLowerCase()
+	};
+
+	if (
+		e.dataTransfer.types.indexOf(supportedTransferTypes.openEditor) !== -1 ||
+		e.dataTransfer.types.indexOf(supportedTransferTypes.externalFile) !== -1 ||
+		// All Code files should already register as normal files, but just to be safe:
+		e.dataTransfer.types.indexOf(supportedTransferTypes.codeFile) !== -1
+	) {
+		return true;
+	} else {
+		return false;
+	}
+}
+
 class EditorGroupRenderer implements IRenderer<IEditorGroup, IEditorGroupTemplateData> {
 	static readonly ID = 'editorgroup';
 
@@ -532,8 +575,10 @@ class EditorGroupRenderer implements IRenderer<IEditorGroup, IEditorGroupTemplat
 		editorGroupTemplate.actionBar.push(closeGroupAction, { icon: true, label: false, keybinding: closeGroupActionKey ? closeGroupActionKey.getLabel() : void 0 });
 
 		editorGroupTemplate.toDispose = [];
-		editorGroupTemplate.toDispose.push(dom.addDisposableListener(container, dom.EventType.DRAG_OVER, () => {
-			dom.addClass(container, 'focused');
+		editorGroupTemplate.toDispose.push(dom.addDisposableListener(container, dom.EventType.DRAG_OVER, (e: DragEvent) => {
+			if (dropOnEditorSupported(e)) {
+				dom.addClass(container, 'focused');
+			}
 		}));
 		editorGroupTemplate.toDispose.push(dom.addDisposableListener(container, dom.EventType.DRAG_LEAVE, () => {
 			dom.removeClass(container, 'focused');
@@ -561,6 +606,10 @@ class EditorGroupRenderer implements IRenderer<IEditorGroup, IEditorGroupTemplat
 		templateData.actionBar.context = { groupId: editorGroup.id };
 	}
 
+	disposeElement(): void {
+		// noop
+	}
+
 	disposeTemplate(templateData: IEditorGroupTemplateData): void {
 		templateData.actionBar.dispose();
 		dispose(templateData.toDispose);
@@ -618,8 +667,10 @@ class OpenEditorRenderer implements IRenderer<OpenEditor, IOpenEditorTemplateDat
 				this.instantiationService.invokeFunction(fillResourceDataTransfers, dragged.map(d => d.getResource()), e);
 			}
 		}));
-		editorTemplate.toDispose.push(dom.addDisposableListener(container, dom.EventType.DRAG_OVER, () => {
-			dom.addClass(container, 'focused');
+		editorTemplate.toDispose.push(dom.addDisposableListener(container, dom.EventType.DRAG_OVER, (e: DragEvent) => {
+			if (dropOnEditorSupported(e)) {
+				dom.addClass(container, 'focused');
+			}
 		}));
 		editorTemplate.toDispose.push(dom.addDisposableListener(container, dom.EventType.DRAG_LEAVE, () => {
 			dom.removeClass(container, 'focused');
@@ -655,6 +706,10 @@ class OpenEditorRenderer implements IRenderer<OpenEditor, IOpenEditorTemplateDat
 		});
 	}
 
+	disposeElement(): void {
+		// noop
+	}
+
 	disposeTemplate(templateData: IOpenEditorTemplateData): void {
 		templateData.actionBar.dispose();
 		templateData.root.dispose();
diff --git a/src/vs/workbench/parts/files/test/browser/fileEditorInput.test.ts b/src/vs/workbench/parts/files/test/browser/fileEditorInput.test.ts
index e56adb04c42..7f54028fa0b 100644
--- a/src/vs/workbench/parts/files/test/browser/fileEditorInput.test.ts
+++ b/src/vs/workbench/parts/files/test/browser/fileEditorInput.test.ts
@@ -5,7 +5,7 @@
 'use strict';
 
 import * as assert from 'assert';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { join } from 'vs/base/common/paths';
 import { FileEditorInput } from 'vs/workbench/parts/files/common/editors/fileEditorInput';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
@@ -63,19 +63,19 @@ suite('Files - FileEditorInput', () => {
 		const inputToResolve: FileEditorInput = instantiationService.createInstance(FileEditorInput, toResource(this, '/foo/bar/file.js'), void 0);
 		const sameOtherInput: FileEditorInput = instantiationService.createInstance(FileEditorInput, toResource(this, '/foo/bar/file.js'), void 0);
 
-		return inputToResolve.resolve(true).then(resolved => {
+		return inputToResolve.resolve().then(resolved => {
 			assert.ok(inputToResolve.isResolved());
 
 			const resolvedModelA = resolved;
-			return inputToResolve.resolve(true).then(resolved => {
+			return inputToResolve.resolve().then(resolved => {
 				assert(resolvedModelA === resolved); // OK: Resolved Model cached globally per input
 
-				return sameOtherInput.resolve(true).then(otherResolved => {
+				return sameOtherInput.resolve().then(otherResolved => {
 					assert(otherResolved === resolvedModelA); // OK: Resolved Model cached globally per input
 
 					inputToResolve.dispose();
 
-					return inputToResolve.resolve(true).then(resolved => {
+					return inputToResolve.resolve().then(resolved => {
 						assert(resolvedModelA === resolved); // Model is still the same because we had 2 clients
 
 						inputToResolve.dispose();
@@ -83,17 +83,12 @@ suite('Files - FileEditorInput', () => {
 
 						resolvedModelA.dispose();
 
-						return inputToResolve.resolve(true).then(resolved => {
+						return inputToResolve.resolve().then(resolved => {
 							assert(resolvedModelA !== resolved); // Different instance, because input got disposed
 
 							let stat = (resolved as TextFileEditorModel).getStat();
-							return inputToResolve.resolve(true).then(resolved => {
+							return inputToResolve.resolve().then(resolved => {
 								assert(stat !== (resolved as TextFileEditorModel).getStat()); // Different stat, because resolve always goes to the server for refresh
-
-								stat = (resolved as TextFileEditorModel).getStat();
-								return inputToResolve.resolve(false).then(resolved => {
-									assert(stat === (resolved as TextFileEditorModel).getStat()); // Same stat, because not refreshed
-								});
 							});
 						});
 					});
@@ -122,7 +117,7 @@ suite('Files - FileEditorInput', () => {
 		input.setEncoding('utf16', EncodingMode.Encode);
 		assert.equal(input.getEncoding(), 'utf16');
 
-		return input.resolve(true).then((resolved: TextFileEditorModel) => {
+		return input.resolve().then((resolved: TextFileEditorModel) => {
 			assert.equal(input.getEncoding(), resolved.getEncoding());
 
 			resolved.dispose();
@@ -132,7 +127,7 @@ suite('Files - FileEditorInput', () => {
 	test('save', function () {
 		const input = instantiationService.createInstance(FileEditorInput, toResource(this, '/foo/bar/updatefile.js'), void 0);
 
-		return input.resolve(true).then((resolved: TextFileEditorModel) => {
+		return input.resolve().then((resolved: TextFileEditorModel) => {
 			resolved.textEditorModel.setValue('changed');
 			assert.ok(input.isDirty());
 
@@ -147,7 +142,7 @@ suite('Files - FileEditorInput', () => {
 	test('revert', function () {
 		const input = instantiationService.createInstance(FileEditorInput, toResource(this, '/foo/bar/updatefile.js'), void 0);
 
-		return input.resolve(true).then((resolved: TextFileEditorModel) => {
+		return input.resolve().then((resolved: TextFileEditorModel) => {
 			resolved.textEditorModel.setValue('changed');
 			assert.ok(input.isDirty());
 
@@ -164,7 +159,7 @@ suite('Files - FileEditorInput', () => {
 
 		accessor.textFileService.setResolveTextContentErrorOnce(new FileOperationError('error', FileOperationResult.FILE_IS_BINARY));
 
-		return input.resolve(true).then(resolved => {
+		return input.resolve().then(resolved => {
 			assert.ok(resolved);
 
 			resolved.dispose();
@@ -176,7 +171,7 @@ suite('Files - FileEditorInput', () => {
 
 		accessor.textFileService.setResolveTextContentErrorOnce(new FileOperationError('error', FileOperationResult.FILE_TOO_LARGE));
 
-		return input.resolve(true).then(resolved => {
+		return input.resolve().then(resolved => {
 			assert.ok(resolved);
 
 			resolved.dispose();
diff --git a/src/vs/workbench/parts/files/test/browser/fileEditorTracker.test.ts b/src/vs/workbench/parts/files/test/browser/fileEditorTracker.test.ts
index b3443b8850b..d9142f4d9f0 100644
--- a/src/vs/workbench/parts/files/test/browser/fileEditorTracker.test.ts
+++ b/src/vs/workbench/parts/files/test/browser/fileEditorTracker.test.ts
@@ -7,7 +7,7 @@
 
 import * as assert from 'assert';
 import { FileEditorTracker } from 'vs/workbench/parts/files/browser/editors/fileEditorTracker';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { join } from 'vs/base/common/paths';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { workbenchInstantiationService, TestTextFileService, TestFileService } from 'vs/workbench/test/workbenchTestServices';
diff --git a/src/vs/workbench/parts/files/test/electron-browser/explorerModel.test.ts b/src/vs/workbench/parts/files/test/electron-browser/explorerModel.test.ts
index 515ad42c580..a7f2a269eb2 100644
--- a/src/vs/workbench/parts/files/test/electron-browser/explorerModel.test.ts
+++ b/src/vs/workbench/parts/files/test/electron-browser/explorerModel.test.ts
@@ -8,17 +8,22 @@
 import * as assert from 'assert';
 import { isUndefinedOrNull } from 'vs/base/common/types';
 import { isLinux, isWindows } from 'vs/base/common/platform';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { join } from 'vs/base/common/paths';
 import { validateFileName } from 'vs/workbench/parts/files/electron-browser/fileActions';
 import { ExplorerItem } from 'vs/workbench/parts/files/common/explorerModel';
 
 function createStat(path: string, name: string, isFolder: boolean, hasChildren: boolean, size: number, mtime: number): ExplorerItem {
-	return new ExplorerItem(toResource(path), undefined, false, isFolder, name, mtime);
+	return new ExplorerItem(toResource(path), undefined, false, false, isFolder, name, mtime);
 }
 
 function toResource(path) {
-	return URI.file(join('C:\\', path));
+	if (isWindows) {
+		return URI.file(join('C:\\', path));
+	} else {
+		return URI.file(join('/home/john', path));
+	}
+
 }
 
 suite('Files - View Model', () => {
@@ -264,20 +269,20 @@ suite('Files - View Model', () => {
 	test('Merge Local with Disk', function () {
 		const d = new Date().toUTCString();
 
-		const merge1 = new ExplorerItem(URI.file(join('C:\\', '/path/to')), undefined, false, true, 'to', Date.now(), d);
-		const merge2 = new ExplorerItem(URI.file(join('C:\\', '/path/to')), undefined, false, true, 'to', Date.now(), new Date(0).toUTCString());
+		const merge1 = new ExplorerItem(URI.file(join('C:\\', '/path/to')), undefined, false, false, true, 'to', Date.now(), d);
+		const merge2 = new ExplorerItem(URI.file(join('C:\\', '/path/to')), undefined, false, false, true, 'to', Date.now(), new Date(0).toUTCString());
 
 		// Merge Properties
 		ExplorerItem.mergeLocalWithDisk(merge2, merge1);
 		assert.strictEqual(merge1.mtime, merge2.mtime);
 
 		// Merge Child when isDirectoryResolved=false is a no-op
-		merge2.addChild(new ExplorerItem(URI.file(join('C:\\', '/path/to/foo.html')), undefined, false, true, 'foo.html', Date.now(), d));
+		merge2.addChild(new ExplorerItem(URI.file(join('C:\\', '/path/to/foo.html')), undefined, false, false, true, 'foo.html', Date.now(), d));
 		ExplorerItem.mergeLocalWithDisk(merge2, merge1);
 		assert.strictEqual(merge1.getChildrenArray().length, 0);
 
 		// Merge Child with isDirectoryResolved=true
-		const child = new ExplorerItem(URI.file(join('C:\\', '/path/to/foo.html')), undefined, false, true, 'foo.html', Date.now(), d);
+		const child = new ExplorerItem(URI.file(join('C:\\', '/path/to/foo.html')), undefined, false, false, true, 'foo.html', Date.now(), d);
 		merge2.removeChild(child);
 		merge2.addChild(child);
 		merge2.isDirectoryResolved = true;
diff --git a/src/vs/workbench/parts/html/common/htmlInput.ts b/src/vs/workbench/parts/html/common/htmlInput.ts
index 7f20aa1588e..e70b08d999a 100644
--- a/src/vs/workbench/parts/html/common/htmlInput.ts
+++ b/src/vs/workbench/parts/html/common/htmlInput.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { ResourceEditorInput } from 'vs/workbench/common/editor/resourceEditorInput';
 import { ITextModelService } from 'vs/editor/common/services/resolverService';
 import { IHashService } from 'vs/workbench/services/hash/common/hashService';
diff --git a/src/vs/workbench/parts/html/electron-browser/html.contribution.ts b/src/vs/workbench/parts/html/electron-browser/html.contribution.ts
index 1ccfdc46891..cc53effa58f 100644
--- a/src/vs/workbench/parts/html/electron-browser/html.contribution.ts
+++ b/src/vs/workbench/parts/html/electron-browser/html.contribution.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { localize } from 'vs/nls';
 import { CommandsRegistry } from 'vs/platform/commands/common/commands';
 import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
@@ -17,6 +17,7 @@ import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
 import { IEditorGroupsService, IEditorGroup } from 'vs/workbench/services/group/common/editorGroupsService';
 import { IExtensionsWorkbenchService } from 'vs/workbench/parts/extensions/common/extensions';
 import { IEditorRegistry, EditorDescriptor, Extensions as EditorExtensions } from 'vs/workbench/browser/editor';
+import { registerWebViewCommands } from 'vs/workbench/parts/webview/electron-browser/webview.contribution';
 
 function getActivePreviewsForResource(accessor: ServicesAccessor, resource: URI | string) {
 	const uri = resource instanceof URI ? resource : URI.parse(resource);
@@ -98,3 +99,5 @@ CommandsRegistry.registerCommand('_workbench.htmlPreview.postMessage', function
 	}
 	return activePreviews.length > 0;
 });
+
+registerWebViewCommands(HtmlPreviewPart.ID);
\ No newline at end of file
diff --git a/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.ts b/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.ts
index cd17142a8d0..d61e2042a1a 100644
--- a/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.ts
+++ b/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.ts
@@ -8,8 +8,8 @@
 import { localize } from 'vs/nls';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { ITextModel } from 'vs/editor/common/model';
-import { empty as EmptyDisposable, IDisposable, dispose, IReference } from 'vs/base/common/lifecycle';
-import { EditorOptions, EditorInput, EditorViewStateMemento } from 'vs/workbench/common/editor';
+import { Disposable, IDisposable, dispose, IReference } from 'vs/base/common/lifecycle';
+import { EditorOptions, EditorInput, IEditorMemento } from 'vs/workbench/common/editor';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { BaseTextEditorModel } from 'vs/workbench/common/editor/textEditorModel';
 import { HtmlInput, HtmlInputOptions, areHtmlInputOptionsEqual } from 'vs/workbench/parts/html/common/htmlInput';
@@ -19,7 +19,6 @@ import { ITextModelService, ITextEditorModel } from 'vs/editor/common/services/r
 import { Parts, IPartService } from 'vs/workbench/services/part/common/partService';
 import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { IStorageService } from 'vs/platform/storage/common/storage';
-import { Scope } from 'vs/workbench/common/memento';
 import { Dimension } from 'vs/base/browser/dom';
 import { BaseWebviewEditor } from 'vs/workbench/parts/webview/electron-browser/baseWebviewEditor';
 import { WebviewElement, WebviewOptions } from 'vs/workbench/parts/webview/electron-browser/webviewElement';
@@ -43,13 +42,13 @@ export class HtmlPreviewPart extends BaseWebviewEditor {
 
 	private _modelRef: IReference<ITextEditorModel>;
 	public get model(): ITextModel { return this._modelRef && this._modelRef.object.textEditorModel; }
-	private _modelChangeSubscription = EmptyDisposable;
-	private _themeChangeSubscription = EmptyDisposable;
+	private _modelChangeSubscription = Disposable.None;
+	private _themeChangeSubscription = Disposable.None;
 
 	private _content: HTMLElement;
 	private _scrollYPercentage: number = 0;
 
-	private editorViewStateMemento: EditorViewStateMemento<HtmlPreviewEditorViewState>;
+	private editorMemento: IEditorMemento<HtmlPreviewEditorViewState>;
 
 	constructor(
 		@ITelemetryService telemetryService: ITelemetryService,
@@ -60,11 +59,11 @@ export class HtmlPreviewPart extends BaseWebviewEditor {
 		@IStorageService readonly _storageService: IStorageService,
 		@ITextModelService private readonly _textModelResolverService: ITextModelService,
 		@IInstantiationService private readonly _instantiationService: IInstantiationService,
-		@IEditorGroupsService editorGroupService: IEditorGroupsService
+		@IEditorGroupsService readonly editorGroupService: IEditorGroupsService
 	) {
 		super(HtmlPreviewPart.ID, telemetryService, themeService, contextKeyService);
 
-		this.editorViewStateMemento = new EditorViewStateMemento<HtmlPreviewEditorViewState>(editorGroupService, this.getMemento(_storageService, Scope.WORKSPACE), this.viewStateStorageKey);
+		this.editorMemento = this.getEditorMemento<HtmlPreviewEditorViewState>(_storageService, editorGroupService, this.viewStateStorageKey);
 	}
 
 	dispose(): void {
@@ -96,8 +95,6 @@ export class HtmlPreviewPart extends BaseWebviewEditor {
 
 			this._webview = this._instantiationService.createInstance(WebviewElement,
 				this._partService.getContainer(Parts.EDITOR_PART),
-				this.contextKey,
-				this.findInputFocusContextKey,
 				{
 					...webviewOptions,
 					useSameOriginForRoot: true
@@ -247,18 +244,10 @@ export class HtmlPreviewPart extends BaseWebviewEditor {
 	}
 
 	private saveHTMLPreviewViewState(input: HtmlInput, editorViewState: HtmlPreviewEditorViewState): void {
-		this.editorViewStateMemento.saveState(this.group, input, editorViewState);
+		this.editorMemento.saveState(this.group, input, editorViewState);
 	}
 
 	private loadHTMLPreviewViewState(input: HtmlInput): HtmlPreviewEditorViewState {
-		return this.editorViewStateMemento.loadState(this.group, input);
-	}
-
-	protected saveMemento(): void {
-
-		// ensure to first save our view state memento
-		this.editorViewStateMemento.save();
-
-		super.saveMemento();
+		return this.editorMemento.loadState(this.group, input);
 	}
 }
diff --git a/src/vs/workbench/parts/localizations/electron-browser/localizations.contribution.ts b/src/vs/workbench/parts/localizations/electron-browser/localizations.contribution.ts
index dbb24061980..f477e490598 100644
--- a/src/vs/workbench/parts/localizations/electron-browser/localizations.contribution.ts
+++ b/src/vs/workbench/parts/localizations/electron-browser/localizations.contribution.ts
@@ -12,7 +12,7 @@ import { SyncActionDescriptor } from 'vs/platform/actions/common/actions';
 import { Disposable } from 'vs/base/common/lifecycle';
 import { ConfigureLocaleAction } from 'vs/workbench/parts/localizations/electron-browser/localizationsActions';
 import { ExtensionsRegistry } from 'vs/workbench/services/extensions/common/extensionsRegistry';
-import { ILocalizationsService, LanguageType } from 'vs/platform/localizations/common/localizations';
+import { ILocalizationsService } from 'vs/platform/localizations/common/localizations';
 import { LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
 import * as platform from 'vs/base/common/platform';
 import { IExtensionManagementService, DidInstallExtensionEvent, LocalExtensionType, IExtensionGalleryService, IGalleryExtension, InstallOperation } from 'vs/platform/extensionManagement/common/extensionManagement';
@@ -20,7 +20,7 @@ import { INotificationService } from 'vs/platform/notification/common/notificati
 import Severity from 'vs/base/common/severity';
 import { IJSONEditingService } from 'vs/workbench/services/configuration/common/jsonEditing';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { join } from 'vs/base/common/paths';
 import { IWindowsService } from 'vs/platform/windows/common/windows';
 import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
@@ -29,6 +29,7 @@ import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet';
 import { VIEWLET_ID as EXTENSIONS_VIEWLET_ID, IExtensionsViewlet } from 'vs/workbench/parts/extensions/common/extensions';
 import { minimumTranslatedStrings } from 'vs/platform/node/minimalTranslations';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
+import { CancellationToken } from 'vs/base/common/cancellation';
 
 // Register action to configure locale and related settings
 const registry = Registry.as<IWorkbenchActionRegistry>(Extensions.WorkbenchActions);
@@ -98,24 +99,6 @@ export class LocalizationWorkbenchContribution extends Disposable implements IWo
 		}
 	}
 
-	private migrateToMarketplaceLanguagePack(language: string): void {
-		this.isLanguageInstalled(language)
-			.then(installed => {
-				if (!installed) {
-					this.getLanguagePackExtension(language)
-						.then(extension => {
-							if (extension) {
-								this.notificationService.prompt(Severity.Warning, localize('install language pack', "In the near future, VS Code will only support language packs in the form of Marketplace extensions. Please install the '{0}' extension in order to continue to use the currently configured language. ", extension.displayName || extension.displayName),
-									[
-										{ label: localize('install', "Install"), run: () => this.installExtension(extension) },
-										{ label: localize('more information', "More Information..."), run: () => window.open('https://go.microsoft.com/fwlink/?linkid=872941') }
-									]);
-							}
-						});
-				}
-			});
-	}
-
 	private checkAndInstall(): void {
 		const language = platform.language;
 		const locale = platform.locale;
@@ -124,11 +107,7 @@ export class LocalizationWorkbenchContribution extends Disposable implements IWo
 		if (!this.galleryService.isEnabled()) {
 			return;
 		}
-		if (language !== 'en' && language !== 'en_us') {
-			this.migrateToMarketplaceLanguagePack(language);
-			return;
-		}
-		if (locale === 'en' || locale === 'en_us') {
+		if (language === 'en' || language.indexOf('en-') === 0) {
 			return;
 		}
 		if (language === locale || languagePackSuggestionIgnoreList.indexOf(language) > -1) {
@@ -141,29 +120,36 @@ export class LocalizationWorkbenchContribution extends Disposable implements IWo
 					return;
 				}
 
-				const ceintlExtensionSearch = this.galleryService.query({ names: [`MS-CEINTL.vscode-language-pack-${locale}`], pageSize: 1 });
-				const tagSearch = this.galleryService.query({ text: `tag:lp-${locale}`, pageSize: 1 });
-
-				TPromise.join([ceintlExtensionSearch, tagSearch]).then(([ceintlResult, tagResult]) => {
-					if (ceintlResult.total === 0 && tagResult.total === 0) {
+				this.galleryService.query({ text: `tag:lp-${locale}` }).then(tagResult => {
+					if (tagResult.total === 0) {
 						return;
 					}
 
-					const extensionToInstall = ceintlResult.total === 1 ? ceintlResult.firstPage[0] : tagResult.total === 1 ? tagResult.firstPage[0] : null;
-					const extensionToFetchTranslationsFrom = extensionToInstall || tagResult.total > 0 ? tagResult.firstPage[0] : null;
+					const extensionToInstall = tagResult.total === 1 ? tagResult.firstPage[0] : tagResult.firstPage.filter(e => e.publisher === 'MS-CEINTL' && e.name.indexOf('vscode-language-pack') === 0)[0];
+					const extensionToFetchTranslationsFrom = extensionToInstall || tagResult.firstPage[0];
 
-					if (!extensionToFetchTranslationsFrom || !extensionToFetchTranslationsFrom.assets.manifest) {
+					if (!extensionToFetchTranslationsFrom.assets.manifest) {
 						return;
 					}
 
-					TPromise.join([this.galleryService.getManifest(extensionToFetchTranslationsFrom), this.galleryService.getCoreTranslation(extensionToFetchTranslationsFrom, locale)])
+					TPromise.join([this.galleryService.getManifest(extensionToFetchTranslationsFrom, CancellationToken.None), this.galleryService.getCoreTranslation(extensionToFetchTranslationsFrom, locale)])
 						.then(([manifest, translation]) => {
 							const loc = manifest && manifest.contributes && manifest.contributes.localizations && manifest.contributes.localizations.filter(x => x.languageId.toLowerCase() === locale)[0];
+							const languageName = loc ? (loc.languageName || locale) : locale;
 							const languageDisplayName = loc ? (loc.localizedLanguageName || loc.languageName || locale) : locale;
-							const translations = {
-								...minimumTranslatedStrings,
-								...(translation && translation.contents ? translation.contents['vs/platform/node/minimalTranslations'] : {})
-							};
+							const translationsFromPack = translation && translation.contents ? translation.contents['vs/platform/node/minimalTranslations'] : {};
+							const promptMessageKey = extensionToInstall ? 'installAndRestartMessage' : 'showLanguagePackExtensions';
+							const useEnglish = !translationsFromPack[promptMessageKey];
+
+							const translations = {};
+							Object.keys(minimumTranslatedStrings).forEach(key => {
+								if (!translationsFromPack[key] || useEnglish) {
+									translations[key] = minimumTranslatedStrings[key].replace('{0}', languageName);
+								} else {
+									translations[key] = `${translationsFromPack[key].replace('{0}', languageDisplayName)} (${minimumTranslatedStrings[key].replace('{0}', languageName)})`;
+								}
+							});
+
 							const logUserReaction = (userReaction: string) => {
 								/* __GDPR__
 									"languagePackSuggestion:popup" : {
@@ -195,8 +181,7 @@ export class LocalizationWorkbenchContribution extends Disposable implements IWo
 								}
 							};
 
-							const promptMessage = translations[extensionToInstall ? 'installAndRestartMessage' : 'showLanguagePackExtensions']
-								.replace('{0}', languageDisplayName);
+							const promptMessage = translations[promptMessageKey];
 
 							this.notificationService.prompt(
 								Severity.Info,
@@ -226,19 +211,6 @@ export class LocalizationWorkbenchContribution extends Disposable implements IWo
 
 	}
 
-	private getLanguagePackExtension(language: string): TPromise<IGalleryExtension> {
-		return this.localizationService.getLanguageIds(LanguageType.Core)
-			.then(coreLanguages => {
-				if (coreLanguages.some(c => c.toLowerCase() === language)) {
-					const extensionIdPrefix = language === 'zh-cn' ? 'zh-hans' : language === 'zh-tw' ? 'zh-hant' : language;
-					const extensionId = `MS-CEINTL.vscode-language-pack-${extensionIdPrefix}`;
-					return this.galleryService.query({ names: [extensionId], pageSize: 1 })
-						.then(result => result.total === 1 ? result.firstPage[0] : null);
-				}
-				return null;
-			});
-	}
-
 	private isLanguageInstalled(language: string): TPromise<boolean> {
 		return this.extensionManagementService.getInstalled(LocalExtensionType.User)
 			.then(installed => installed.some(i => i.manifest && i.manifest.contributes && i.manifest.contributes.localizations && i.manifest.contributes.localizations.length && i.manifest.contributes.localizations.some(l => l.languageId.toLowerCase() === language)));
diff --git a/src/vs/workbench/parts/localizations/electron-browser/localizationsActions.ts b/src/vs/workbench/parts/localizations/electron-browser/localizationsActions.ts
index 77fa7330109..7f1c8f27444 100644
--- a/src/vs/workbench/parts/localizations/electron-browser/localizationsActions.ts
+++ b/src/vs/workbench/parts/localizations/electron-browser/localizationsActions.ts
@@ -6,15 +6,14 @@
 import { localize } from 'vs/nls';
 import { Action } from 'vs/base/common/actions';
 import { IFileService } from 'vs/platform/files/common/files';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { IEditor } from 'vs/workbench/common/editor';
 import { join } from 'vs/base/common/paths';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { getPathLabel } from 'vs/base/common/labels';
 import { language } from 'vs/base/common/platform';
+import { ILabelService } from 'vs/platform/label/common/label';
 
 export class ConfigureLocaleAction extends Action {
 	public static readonly ID = 'workbench.action.configureLocale';
@@ -22,18 +21,18 @@ export class ConfigureLocaleAction extends Action {
 
 	private static DEFAULT_CONTENT: string = [
 		'{',
-		`\t// ${localize('displayLanguage', 'Defines VSCode\'s display language.')}`,
+		`\t// ${localize('displayLanguage', 'Defines VS Code\'s display language.')}`,
 		`\t// ${localize('doc', 'See {0} for a list of supported languages.', 'https://go.microsoft.com/fwlink/?LinkId=761051')}`,
 		`\t`,
-		`\t"locale":"${language}" // ${localize('restart', 'Changes will not take effect until VSCode has been restarted.')}`,
+		`\t"locale":"${language}" // ${localize('restart', 'Changes will not take effect until VS Code has been restarted.')}`,
 		'}'
 	].join('\n');
 
 	constructor(id: string, label: string,
 		@IFileService private fileService: IFileService,
-		@IWorkspaceContextService private contextService: IWorkspaceContextService,
 		@IEnvironmentService private environmentService: IEnvironmentService,
-		@IEditorService private editorService: IEditorService
+		@IEditorService private editorService: IEditorService,
+		@ILabelService private labelService: ILabelService
 	) {
 		super(id, label);
 	}
@@ -47,13 +46,10 @@ export class ConfigureLocaleAction extends Action {
 				return undefined;
 			}
 			return this.editorService.openEditor({
-				resource: stat.resource,
-				options: {
-					forceOpen: true
-				}
+				resource: stat.resource
 			});
 		}, (error) => {
-			throw new Error(localize('fail.createSettings', "Unable to create '{0}' ({1}).", getPathLabel(file, this.contextService), error));
+			throw new Error(localize('fail.createSettings', "Unable to create '{0}' ({1}).", this.labelService.getUriLabel(file, true), error));
 		});
 	}
-}
\ No newline at end of file
+}
diff --git a/src/vs/workbench/parts/logs/electron-browser/logs.contribution.ts b/src/vs/workbench/parts/logs/electron-browser/logs.contribution.ts
index 78e0289be53..b0df3ba7f16 100644
--- a/src/vs/workbench/parts/logs/electron-browser/logs.contribution.ts
+++ b/src/vs/workbench/parts/logs/electron-browser/logs.contribution.ts
@@ -12,35 +12,29 @@ import { LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { IWindowService } from 'vs/platform/windows/common/windows';
 import { Disposable } from 'vs/base/common/lifecycle';
-import URI from 'vs/base/common/uri';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { URI } from 'vs/base/common/uri';
 import * as Constants from 'vs/workbench/parts/logs/common/logConstants';
 import { IWorkbenchActionRegistry, Extensions as WorkbenchActionExtensions } from 'vs/workbench/common/actions';
 import { SyncActionDescriptor } from 'vs/platform/actions/common/actions';
-import { ShowLogsAction, OpenLogsFolderAction, SetLogLevelAction, OpenLogFileAction } from 'vs/workbench/parts/logs/electron-browser/logsActions';
-
+import { OpenLogsFolderAction, SetLogLevelAction } from 'vs/workbench/parts/logs/electron-browser/logsActions';
 
 class LogOutputChannels extends Disposable implements IWorkbenchContribution {
 
 	constructor(
-		@IWindowService private windowService: IWindowService,
-		@IEnvironmentService private environmentService: IEnvironmentService,
-		@IInstantiationService instantiationService: IInstantiationService
+		@IWindowService windowService: IWindowService,
+		@IEnvironmentService environmentService: IEnvironmentService,
 	) {
 		super();
 		let outputChannelRegistry = Registry.as<IOutputChannelRegistry>(OutputExt.OutputChannels);
-		outputChannelRegistry.registerChannel(Constants.mainLogChannelId, nls.localize('mainLog', "Log (Main)"), URI.file(join(this.environmentService.logsPath, `main.log`)));
-		outputChannelRegistry.registerChannel(Constants.sharedLogChannelId, nls.localize('sharedLog', "Log (Shared)"), URI.file(join(this.environmentService.logsPath, `sharedprocess.log`)));
-		outputChannelRegistry.registerChannel(Constants.rendererLogChannelId, nls.localize('rendererLog', "Log (Window)"), URI.file(join(this.environmentService.logsPath, `renderer${this.windowService.getCurrentWindowId()}.log`)));
-		outputChannelRegistry.registerChannel(Constants.extHostLogChannelId, nls.localize('extensionsLog', "Log (Extension Host)"), URI.file(join(this.environmentService.logsPath, `exthost${this.windowService.getCurrentWindowId()}.log`)));
+		outputChannelRegistry.registerChannel({ id: Constants.mainLogChannelId, label: nls.localize('mainLog', "Main"), file: URI.file(join(environmentService.logsPath, `main.log`)), log: true });
+		outputChannelRegistry.registerChannel({ id: Constants.sharedLogChannelId, label: nls.localize('sharedLog', "Shared"), file: URI.file(join(environmentService.logsPath, `sharedprocess.log`)), log: true });
+		outputChannelRegistry.registerChannel({ id: Constants.rendererLogChannelId, label: nls.localize('rendererLog', "Window"), file: URI.file(join(environmentService.logsPath, `renderer${windowService.getCurrentWindowId()}.log`)), log: true });
 
 		const workbenchActionsRegistry = Registry.as<IWorkbenchActionRegistry>(WorkbenchActionExtensions.WorkbenchActions);
 		const devCategory = nls.localize('developer', "Developer");
 		workbenchActionsRegistry.registerWorkbenchAction(new SyncActionDescriptor(OpenLogsFolderAction, OpenLogsFolderAction.ID, OpenLogsFolderAction.LABEL), 'Developer: Open Log Folder', devCategory);
 		workbenchActionsRegistry.registerWorkbenchAction(new SyncActionDescriptor(SetLogLevelAction, SetLogLevelAction.ID, SetLogLevelAction.LABEL), 'Developer: Set Log Level', devCategory);
-		workbenchActionsRegistry.registerWorkbenchAction(new SyncActionDescriptor(ShowLogsAction, ShowLogsAction.ID, ShowLogsAction.LABEL), 'Developer: Show Logs...', devCategory);
-		workbenchActionsRegistry.registerWorkbenchAction(new SyncActionDescriptor(OpenLogFileAction, OpenLogFileAction.ID, OpenLogFileAction.LABEL), 'Developer: Open Log File...', devCategory);
 	}
 }
 
-Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench).registerWorkbenchContribution(LogOutputChannels, LifecyclePhase.Eventually);
\ No newline at end of file
+Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench).registerWorkbenchContribution(LogOutputChannels, LifecyclePhase.Starting);
\ No newline at end of file
diff --git a/src/vs/workbench/parts/logs/electron-browser/logsActions.ts b/src/vs/workbench/parts/logs/electron-browser/logsActions.ts
index 4ebfb3a4e56..bfaf241b326 100644
--- a/src/vs/workbench/parts/logs/electron-browser/logsActions.ts
+++ b/src/vs/workbench/parts/logs/electron-browser/logsActions.ts
@@ -7,15 +7,10 @@ import * as nls from 'vs/nls';
 import { Action } from 'vs/base/common/actions';
 import * as paths from 'vs/base/common/paths';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { IWindowsService, IWindowService } from 'vs/platform/windows/common/windows';
+import { IWindowsService } from 'vs/platform/windows/common/windows';
 import { TPromise } from 'vs/base/common/winjs.base';
-import { IQuickOpenService, IPickOpenEntry } from 'vs/platform/quickOpen/common/quickOpen';
 import { ILogService, LogLevel, DEFAULT_LOG_LEVEL } from 'vs/platform/log/common/log';
-import { IOutputService, COMMAND_OPEN_LOG_VIEWER } from 'vs/workbench/parts/output/common/output';
-import * as Constants from 'vs/workbench/parts/logs/common/logConstants';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import URI from 'vs/base/common/uri';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
+import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
 
 export class OpenLogsFolderAction extends Action {
 
@@ -34,77 +29,13 @@ export class OpenLogsFolderAction extends Action {
 	}
 }
 
-export class ShowLogsAction extends Action {
-
-	static ID = 'workbench.action.showLogs';
-	static LABEL = nls.localize('showLogs', "Show Logs...");
-
-	constructor(id: string, label: string,
-		@IQuickOpenService private quickOpenService: IQuickOpenService,
-		@IOutputService private outputService: IOutputService,
-		@IWorkspaceContextService private contextService: IWorkspaceContextService
-	) {
-		super(id, label);
-	}
-
-	run(): TPromise<void> {
-		const entries: IPickOpenEntry[] = [
-			{ id: Constants.rendererLogChannelId, label: this.contextService.getWorkspace().name ? nls.localize('rendererProcess', "Window ({0})", this.contextService.getWorkspace().name) : nls.localize('emptyWindow', "Window") },
-			{ id: Constants.extHostLogChannelId, label: nls.localize('extensionHost', "Extension Host") },
-			{ id: Constants.sharedLogChannelId, label: nls.localize('sharedProcess', "Shared") },
-			{ id: Constants.mainLogChannelId, label: nls.localize('mainProcess', "Main") }
-		];
-
-		return this.quickOpenService.pick(entries, { placeHolder: nls.localize('selectProcess', "Select Log for Process") })
-			.then(entry => {
-				if (entry) {
-					return this.outputService.showChannel(entry.id);
-				}
-				return null;
-			});
-	}
-}
-
-export class OpenLogFileAction extends Action {
-
-	static ID = 'workbench.action.openLogFile';
-	static LABEL = nls.localize('openLogFile', "Open Log File...");
-
-	constructor(id: string, label: string,
-		@IQuickOpenService private quickOpenService: IQuickOpenService,
-		@IEnvironmentService private environmentService: IEnvironmentService,
-		@ICommandService private commandService: ICommandService,
-		@IWindowService private windowService: IWindowService,
-		@IWorkspaceContextService private contextService: IWorkspaceContextService
-	) {
-		super(id, label);
-	}
-
-	run(): TPromise<void> {
-		const entries: IPickOpenEntry[] = [
-			{ id: URI.file(paths.join(this.environmentService.logsPath, `renderer${this.windowService.getCurrentWindowId()}.log`)).fsPath, label: this.contextService.getWorkspace().name ? nls.localize('rendererProcess', "Window ({0})", this.contextService.getWorkspace().name) : nls.localize('emptyWindow', "Window") },
-			{ id: URI.file(paths.join(this.environmentService.logsPath, `exthost${this.windowService.getCurrentWindowId()}.log`)).fsPath, label: nls.localize('extensionHost', "Extension Host") },
-			{ id: URI.file(paths.join(this.environmentService.logsPath, `sharedprocess.log`)).fsPath, label: nls.localize('sharedProcess', "Shared") },
-			{ id: URI.file(paths.join(this.environmentService.logsPath, `main.log`)).fsPath, label: nls.localize('mainProcess', "Main") }
-		];
-
-		return this.quickOpenService.pick(entries, { placeHolder: nls.localize('selectProcess', "Select Log for Process") })
-			.then(entry => {
-				if (entry) {
-					return this.commandService.executeCommand(COMMAND_OPEN_LOG_VIEWER, URI.file(entry.id));
-				}
-				return null;
-			});
-	}
-}
-
 export class SetLogLevelAction extends Action {
 
 	static ID = 'workbench.action.setLogLevel';
 	static LABEL = nls.localize('setLogLevel', "Set Log Level...");
 
 	constructor(id: string, label: string,
-		@IQuickOpenService private quickOpenService: IQuickOpenService,
+		@IQuickInputService private quickInputService: IQuickInputService,
 		@ILogService private logService: ILogService
 	) {
 		super(id, label);
@@ -122,7 +53,7 @@ export class SetLogLevelAction extends Action {
 			{ label: nls.localize('off', "Off"), level: LogLevel.Off, description: this.getDescription(LogLevel.Off, current) },
 		];
 
-		return this.quickOpenService.pick(entries, { placeHolder: nls.localize('selectLogLevel', "Select log level"), autoFocus: { autoFocusIndex: this.logService.getLevel() } }).then(entry => {
+		return this.quickInputService.pick(entries, { placeHolder: nls.localize('selectLogLevel', "Select log level"), activeItem: entries[this.logService.getLevel()] }).then(entry => {
 			if (entry) {
 				this.logService.setLevel(entry.level);
 			}
@@ -141,4 +72,4 @@ export class SetLogLevelAction extends Action {
 		}
 		return void 0;
 	}
-}
\ No newline at end of file
+}
diff --git a/src/vs/workbench/parts/markers/electron-browser/markers.contribution.ts b/src/vs/workbench/parts/markers/electron-browser/markers.contribution.ts
index 789c79ff77b..8ed5e8f4b35 100644
--- a/src/vs/workbench/parts/markers/electron-browser/markers.contribution.ts
+++ b/src/vs/workbench/parts/markers/electron-browser/markers.contribution.ts
@@ -10,7 +10,7 @@ import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
 import { Extensions, IConfigurationRegistry } from 'vs/platform/configuration/common/configurationRegistry';
 import { IPanelService } from 'vs/workbench/services/panel/common/panelService';
 import { IWorkbenchActionRegistry, Extensions as ActionExtensions } from 'vs/workbench/common/actions';
-import { KeybindingsRegistry, IKeybindings } from 'vs/platform/keybinding/common/keybindingsRegistry';
+import { KeybindingsRegistry, KeybindingWeight, IKeybindings } from 'vs/platform/keybinding/common/keybindingsRegistry';
 import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
 import { localize } from 'vs/nls';
 import { Marker, RelatedInformation } from 'vs/workbench/parts/markers/electron-browser/markersModel';
@@ -27,7 +27,7 @@ import './markersFileDecorations';
 
 KeybindingsRegistry.registerCommandAndKeybindingRule({
 	id: Constants.MARKER_OPEN_SIDE_ACTION_ID,
-	weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
+	weight: KeybindingWeight.WorkbenchContrib,
 	when: ContextKeyExpr.and(Constants.MarkerFocusContextKey),
 	primary: KeyMod.CtrlCmd | KeyCode.Enter,
 	mac: {
@@ -41,7 +41,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 
 KeybindingsRegistry.registerCommandAndKeybindingRule({
 	id: Constants.MARKER_SHOW_PANEL_ID,
-	weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
+	weight: KeybindingWeight.WorkbenchContrib,
 	when: undefined,
 	primary: undefined,
 	handler: (accessor, args: any) => {
@@ -212,3 +212,12 @@ function registerAction(desc: IActionDescriptor) {
 		});
 	}
 }
+
+MenuRegistry.appendMenuItem(MenuId.MenubarViewMenu, {
+	group: '4_panels',
+	command: {
+		id: ToggleMarkersPanelAction.ID,
+		title: localize({ key: 'miMarker', comment: ['&& denotes a mnemonic'] }, "&&Problems")
+	},
+	order: 4
+});
diff --git a/src/vs/workbench/parts/markers/electron-browser/markers.ts b/src/vs/workbench/parts/markers/electron-browser/markers.ts
index 2c104743afd..12ea873cd7c 100644
--- a/src/vs/workbench/parts/markers/electron-browser/markers.ts
+++ b/src/vs/workbench/parts/markers/electron-browser/markers.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
+import { createDecorator, IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { MarkersModel, FilterOptions } from './markersModel';
 import { Disposable } from 'vs/base/common/lifecycle';
 import { IMarkerService, MarkerSeverity, IMarker } from 'vs/platform/markers/common/markers';
 import { IActivityService, NumberBadge } from 'vs/workbench/services/activity/common/activity';
 import { localize } from 'vs/nls';
 import Constants from './constants';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { Event, Emitter } from 'vs/base/common/event';
 import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
@@ -49,10 +49,11 @@ export class MarkersWorkbenchService extends Disposable implements IMarkersWorkb
 		@IMarkerService private markerService: IMarkerService,
 		@IConfigurationService private configurationService: IConfigurationService,
 		@IWorkspaceContextService private workspaceContextService: IWorkspaceContextService,
-		@IActivityService private activityService: IActivityService
+		@IActivityService private activityService: IActivityService,
+		@IInstantiationService instantiationService: IInstantiationService
 	) {
 		super();
-		this.markersModel = this._register(new MarkersModel(this.readMarkers()));
+		this.markersModel = this._register(instantiationService.createInstance(MarkersModel, this.readMarkers()));
 		this._register(markerService.onMarkerChanged(resources => this.onMarkerChanged(resources)));
 		this._register(configurationService.onDidChangeConfiguration(e => {
 			if (this.useFilesExclude && e.affectsConfiguration('files.exclude')) {
diff --git a/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.ts b/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.ts
index 5f5b3ba56df..08d9f89fec3 100644
--- a/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.ts
+++ b/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.ts
@@ -9,7 +9,7 @@ import { IWorkbenchContribution, IWorkbenchContributionsRegistry, Extensions as
 import { IMarkerService, IMarker, MarkerSeverity } from 'vs/platform/markers/common/markers';
 import { IDecorationsService, IDecorationsProvider, IDecorationData } from 'vs/workbench/services/decorations/browser/decorations';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { Event } from 'vs/base/common/event';
 import { localize } from 'vs/nls';
 import { Registry } from 'vs/platform/registry/common/platform';
@@ -49,7 +49,7 @@ class MarkersDecorationsProvider implements IDecorationsProvider {
 			weight: 100 * first.severity,
 			bubble: true,
 			tooltip: markers.length === 1 ? localize('tooltip.1', "1 problem in this file") : localize('tooltip.N', "{0} problems in this file", markers.length),
-			letter: markers.length < 10 ? markers.length.toString() : '+9',
+			letter: markers.length < 10 ? markers.length.toString() : '9+',
 			color: first.severity === MarkerSeverity.Error ? listErrorForeground : listWarningForeground,
 		};
 	}
diff --git a/src/vs/workbench/parts/markers/electron-browser/markersModel.ts b/src/vs/workbench/parts/markers/electron-browser/markersModel.ts
index 2345616c2bb..8a8b3499a33 100644
--- a/src/vs/workbench/parts/markers/electron-browser/markersModel.ts
+++ b/src/vs/workbench/parts/markers/electron-browser/markersModel.ts
@@ -5,9 +5,9 @@
 'use strict';
 
 import * as paths from 'vs/base/common/paths';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { Range, IRange } from 'vs/editor/common/core/range';
-import { IMarker, MarkerSeverity, IRelatedInformation } from 'vs/platform/markers/common/markers';
+import { IMarker, MarkerSeverity, IRelatedInformation, IMarkerData } from 'vs/platform/markers/common/markers';
 import { IFilter, IMatch, or, matchesContiguousSubString, matchesPrefix, matchesFuzzy } from 'vs/base/common/filters';
 import Messages from 'vs/workbench/parts/markers/electron-browser/messages';
 import { Schemas } from 'vs/base/common/network';
@@ -15,6 +15,10 @@ import { groupBy, isFalsyOrEmpty, flatten } from 'vs/base/common/arrays';
 import { values } from 'vs/base/common/map';
 import * as glob from 'vs/base/common/glob';
 import * as strings from 'vs/base/common/strings';
+import { CodeAction } from 'vs/editor/common/modes';
+import { getCodeActions } from 'vs/editor/contrib/codeAction/codeAction';
+import { CodeActionKind } from 'vs/editor/contrib/codeAction/codeActionTrigger';
+import { IModelService } from 'vs/editor/common/services/modelService';
 
 function compareUris(a: URI, b: URI) {
 	if (a.toString() < b.toString()) {
@@ -34,6 +38,7 @@ export class ResourceMarkers extends NodeWithId {
 
 	private _name: string = null;
 	private _path: string = null;
+	private _allFixesPromise: Promise<CodeAction[]>;
 
 	markers: Marker[] = [];
 	isExcluded: boolean = false;
@@ -42,7 +47,8 @@ export class ResourceMarkers extends NodeWithId {
 	uriMatches: IMatch[] = [];
 
 	constructor(
-		readonly uri: URI
+		readonly uri: URI,
+		private modelService: IModelService
 	) {
 		super(uri.toString());
 	}
@@ -61,6 +67,39 @@ export class ResourceMarkers extends NodeWithId {
 		return this._name;
 	}
 
+	public getFixes(marker: Marker): Promise<CodeAction[]> {
+		return this._getFixes(new Range(marker.range.startLineNumber, marker.range.startColumn, marker.range.endLineNumber, marker.range.endColumn));
+	}
+
+	public async hasFixes(marker: Marker): Promise<boolean> {
+		if (!this.modelService.getModel(this.uri)) {
+			// Return early, If the model is not yet created
+			return false;
+		}
+		if (!this._allFixesPromise) {
+			this._allFixesPromise = this._getFixes();
+		}
+		const allFixes = await this._allFixesPromise;
+		if (allFixes.length) {
+			const markerKey = IMarkerData.makeKey(marker.raw);
+			for (const fix of allFixes) {
+				if (fix.diagnostics && fix.diagnostics.some(d => IMarkerData.makeKey(d) === markerKey)) {
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+
+	private async _getFixes(range?: Range): Promise<CodeAction[]> {
+		const model = this.modelService.getModel(this.uri);
+		if (model) {
+			const codeActions = await getCodeActions(model, range ? range : model.getFullModelRange(), { type: 'manual', filter: { kind: CodeActionKind.QuickFix } });
+			return codeActions;
+		}
+		return [];
+	}
+
 	static compare(a: ResourceMarkers, b: ResourceMarkers): number {
 		let [firstMarkerOfA] = a.markers;
 		let [firstMarkerOfB] = b.markers;
@@ -85,6 +124,7 @@ export class Marker extends NodeWithId {
 	constructor(
 		id: string,
 		readonly raw: IMarker,
+		readonly resourceMarkers: ResourceMarkers
 	) {
 		super(id);
 	}
@@ -185,7 +225,10 @@ export class MarkersModel {
 	private _markersByResource: Map<string, ResourceMarkers>;
 	private _filterOptions: FilterOptions;
 
-	constructor(markers: IMarker[] = []) {
+	constructor(
+		markers: IMarker[] = [],
+		@IModelService private modelService: IModelService
+	) {
 		this._markersByResource = new Map<string, ResourceMarkers>();
 		this._filterOptions = new FilterOptions();
 
@@ -270,11 +313,11 @@ export class MarkersModel {
 	private createResource(uri: URI, rawMarkers: IMarker[]): ResourceMarkers {
 
 		const markers: Marker[] = [];
-		const resource = new ResourceMarkers(uri);
+		const resource = new ResourceMarkers(uri, this.modelService);
 		this.updateResource(resource);
 
 		rawMarkers.forEach((rawMarker, index) => {
-			const marker = new Marker(uri.toString() + index, rawMarker);
+			const marker = new Marker(uri.toString() + index, rawMarker, resource);
 			if (rawMarker.relatedInformation) {
 				const groupedByResource = groupBy(rawMarker.relatedInformation, MarkersModel._compareMarkersByUri);
 				groupedByResource.sort((a, b) => compareUris(a[0].resource, b[0].resource));
diff --git a/src/vs/workbench/parts/markers/electron-browser/markersPanel.ts b/src/vs/workbench/parts/markers/electron-browser/markersPanel.ts
index 22654994ff3..da84a55a5ba 100644
--- a/src/vs/workbench/parts/markers/electron-browser/markersPanel.ts
+++ b/src/vs/workbench/parts/markers/electron-browser/markersPanel.ts
@@ -5,8 +5,7 @@
 
 import 'vs/css!./media/markers';
 
-import * as errors from 'vs/base/common/errors';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { Delayer } from 'vs/base/common/async';
 import * as dom from 'vs/base/browser/dom';
@@ -19,7 +18,7 @@ import { Marker, ResourceMarkers, RelatedInformation } from 'vs/workbench/parts/
 import { Controller } from 'vs/workbench/parts/markers/electron-browser/markersTreeController';
 import * as Viewer from 'vs/workbench/parts/markers/electron-browser/markersTreeViewer';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { CollapseAllAction, MarkersFilterActionItem, MarkersFilterAction } from 'vs/workbench/parts/markers/electron-browser/markersPanelActions';
+import { CollapseAllAction, MarkersFilterActionItem, MarkersFilterAction, QuickFixAction, QuickFixActionItem, IMarkersFilterActionChangeEvent } from 'vs/workbench/parts/markers/electron-browser/markersPanelActions';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import Messages from 'vs/workbench/parts/markers/electron-browser/messages';
 import { RangeHighlightDecorations } from 'vs/workbench/browser/parts/editor/rangeDecorations';
@@ -32,6 +31,8 @@ import { SimpleFileResourceDragAndDrop } from 'vs/workbench/browser/dnd';
 import { IStorageService } from 'vs/platform/storage/common/storage';
 import { Scope } from 'vs/workbench/common/memento';
 import { localize } from 'vs/nls';
+import { IKeyboardEvent } from 'vs/base/browser/keyboardEvent';
+import { KeyCode } from 'vs/base/common/keyCodes';
 
 export class MarkersPanel extends Panel {
 
@@ -46,10 +47,12 @@ export class MarkersPanel extends Panel {
 
 	private actions: IAction[];
 	private collapseAllAction: IAction;
+	private filterAction: MarkersFilterAction;
 	private filterInputActionItem: MarkersFilterActionItem;
 
 	private treeContainer: HTMLElement;
 	private messageBoxContainer: HTMLElement;
+	private ariaLabelElement: HTMLElement;
 	private panelSettings: any;
 
 	private currentResourceGotAddedToMarkersData: boolean = false;
@@ -67,18 +70,19 @@ export class MarkersPanel extends Panel {
 		this.delayedRefresh = new Delayer<void>(500);
 		this.autoExpanded = new Set<string>();
 		this.panelSettings = this.getMemento(storageService, Scope.WORKSPACE);
+		this.setCurrentActiveEditor();
 	}
 
 	public create(parent: HTMLElement): TPromise<void> {
 		super.create(parent);
 
-		this.rangeHighlightDecorations = this.instantiationService.createInstance(RangeHighlightDecorations);
-		this.toUnbind.push(this.rangeHighlightDecorations);
+		this.rangeHighlightDecorations = this._register(this.instantiationService.createInstance(RangeHighlightDecorations));
 
 		dom.addClass(parent, 'markers-panel');
 
-		let container = dom.append(parent, dom.$('.markers-panel-container'));
+		const container = dom.append(parent, dom.$('.markers-panel-container'));
 
+		this.createArialLabelElement(container);
 		this.createMessageBox(container);
 		this.createTree(container);
 		this.createActions();
@@ -96,7 +100,9 @@ export class MarkersPanel extends Panel {
 	public layout(dimension: dom.Dimension): void {
 		this.treeContainer.style.height = `${dimension.height}px`;
 		this.tree.layout(dimension.height, dimension.width);
-		this.filterInputActionItem.toggleLayout(dimension.width < 1200);
+		if (this.filterInputActionItem) {
+			this.filterInputActionItem.toggleLayout(dimension.width < 1200);
+		}
 	}
 
 	public focus(): void {
@@ -149,13 +155,13 @@ export class MarkersPanel extends Panel {
 					pinned,
 					revealIfVisible: true
 				},
-			}, sideByside ? SIDE_GROUP : ACTIVE_GROUP).done(editor => {
+			}, sideByside ? SIDE_GROUP : ACTIVE_GROUP).then(editor => {
 				if (editor && preserveFocus) {
 					this.rangeHighlightDecorations.highlightRange({ resource, range: selection }, <ICodeEditor>editor.getControl());
 				} else {
 					this.rangeHighlightDecorations.removeHighlightRange();
 				}
-			}, errors.onUnexpectedError);
+			});
 			return true;
 		} else {
 			this.rangeHighlightDecorations.removeHighlightRange();
@@ -179,17 +185,23 @@ export class MarkersPanel extends Panel {
 
 	private updateFilter() {
 		this.autoExpanded = new Set<string>();
-		this.markersWorkbenchService.filter({ filterText: this.filterInputActionItem.getFilterText(), useFilesExclude: this.filterInputActionItem.useFilesExclude });
+		this.markersWorkbenchService.filter({ filterText: this.filterAction.filterText, useFilesExclude: this.filterAction.useFilesExclude });
 	}
 
 	private createMessageBox(parent: HTMLElement): void {
 		this.messageBoxContainer = dom.append(parent, dom.$('.message-box-container'));
+		this.messageBoxContainer.setAttribute('aria-labelledby', 'markers-panel-arialabel');
+	}
+
+	private createArialLabelElement(parent: HTMLElement): void {
+		this.ariaLabelElement = dom.append(parent, dom.$(''));
+		this.ariaLabelElement.setAttribute('id', 'markers-panel-arialabel');
+		this.ariaLabelElement.setAttribute('aria-live', 'polite');
 	}
 
 	private createTree(parent: HTMLElement): void {
-		this.treeContainer = dom.append(parent, dom.$('.tree-container'));
-		dom.addClass(this.treeContainer, 'show-file-icons');
-		const renderer = this.instantiationService.createInstance(Viewer.Renderer);
+		this.treeContainer = dom.append(parent, dom.$('.tree-container.show-file-icons'));
+		const renderer = this.instantiationService.createInstance(Viewer.Renderer, (action) => this.getActionItem(action));
 		const dnd = this.instantiationService.createInstance(SimpleFileResourceDragAndDrop, obj => obj instanceof ResourceMarkers ? obj.uri : void 0);
 		const controller = this.instantiationService.createInstance(Controller);
 		this.tree = this.instantiationService.createInstance(WorkbenchTree, this.treeContainer, {
@@ -197,7 +209,7 @@ export class MarkersPanel extends Panel {
 			filter: new Viewer.DataFilter(),
 			renderer,
 			controller,
-			accessibilityProvider: new Viewer.MarkersTreeAccessibilityProvider(),
+			accessibilityProvider: this.instantiationService.createInstance(Viewer.MarkersTreeAccessibilityProvider),
 			dnd
 		}, {
 				twistiePixels: 20,
@@ -224,17 +236,20 @@ export class MarkersPanel extends Panel {
 
 	private createActions(): void {
 		this.collapseAllAction = this.instantiationService.createInstance(CollapseAllAction, this.tree, true);
-		const filterAction = this.instantiationService.createInstance(MarkersFilterAction);
-		this.filterInputActionItem = this.instantiationService.createInstance(MarkersFilterActionItem, { filterText: this.panelSettings['filter'] || '', filterHistory: this.panelSettings['filterHistory'] || [], useFilesExclude: !!this.panelSettings['useFilesExclude'] }, filterAction);
-		this.actions = [filterAction, this.collapseAllAction];
+		this.filterAction = this.instantiationService.createInstance(MarkersFilterAction, { filterText: this.panelSettings['filter'] || '', filterHistory: this.panelSettings['filterHistory'] || [], useFilesExclude: !!this.panelSettings['useFilesExclude'] });
+		this.actions = [this.filterAction, this.collapseAllAction];
 	}
 
 	private createListeners(): void {
-		this.toUnbind.push(this.markersWorkbenchService.onDidChange(resources => this.onDidChange(resources)));
-		this.toUnbind.push(this.editorService.onDidActiveEditorChange(this.onActiveEditorChanged, this));
-		this.toUnbind.push(this.tree.onDidChangeSelection(() => this.onSelected()));
-		this.toUnbind.push(this.filterInputActionItem.onDidChange(() => this.updateFilter()));
-		this.actions.forEach(a => this.toUnbind.push(a));
+		this._register(this.markersWorkbenchService.onDidChange(resources => this.onDidChange(resources)));
+		this._register(this.editorService.onDidActiveEditorChange(this.onActiveEditorChanged, this));
+		this._register(this.tree.onDidChangeSelection(() => this.onSelected()));
+		this._register(this.filterAction.onDidChange((event: IMarkersFilterActionChangeEvent) => {
+			if (event.filterText || event.useFilesExclude) {
+				this.updateFilter();
+			}
+		}));
+		this.actions.forEach(a => this._register(a));
 	}
 
 	private onDidChange(resources: URI[]) {
@@ -262,9 +277,13 @@ export class MarkersPanel extends Panel {
 	}
 
 	private onActiveEditorChanged(): void {
+		this.setCurrentActiveEditor();
+		this.autoReveal();
+	}
+
+	private setCurrentActiveEditor(): void {
 		const activeEditor = this.editorService.activeEditor;
 		this.currentActiveResource = activeEditor ? activeEditor.getResource() : void 0;
-		this.autoReveal();
 	}
 
 	private onSelected(): void {
@@ -292,11 +311,20 @@ export class MarkersPanel extends Panel {
 	}
 
 	private renderMessage(): void {
-		const markersModel = this.markersWorkbenchService.markersModel;
-		const hasFilteredResources = markersModel.hasFilteredResources();
 		dom.clearNode(this.messageBoxContainer);
-		dom.toggleClass(this.messageBoxContainer, 'hidden', hasFilteredResources);
-		if (!hasFilteredResources) {
+		const markersModel = this.markersWorkbenchService.markersModel;
+		if (markersModel.hasFilteredResources()) {
+			this.messageBoxContainer.style.display = 'none';
+			const { total, filtered } = markersModel.stats();
+			if (filtered === total) {
+				this.ariaLabelElement.setAttribute('aria-label', localize('No problems filtered', "Showing {0} problems", total));
+			} else {
+				this.ariaLabelElement.setAttribute('aria-label', localize('problems filtered', "Showing {0} of {1} problems", filtered, total));
+			}
+			this.messageBoxContainer.removeAttribute('tabIndex');
+		} else {
+			this.messageBoxContainer.style.display = 'block';
+			this.messageBoxContainer.setAttribute('tabIndex', '0');
 			if (markersModel.hasResources()) {
 				if (markersModel.filterOptions.filter) {
 					this.renderFilteredByFilterMessage(this.messageBoxContainer);
@@ -315,7 +343,14 @@ export class MarkersPanel extends Panel {
 		const link = dom.append(container, dom.$('a.messageAction'));
 		link.textContent = localize('disableFilesExclude', "Disable Files Exclude Filter.");
 		link.setAttribute('tabIndex', '0');
-		dom.addDisposableListener(link, dom.EventType.CLICK, () => this.filterInputActionItem.useFilesExclude = false);
+		dom.addStandardDisposableListener(link, dom.EventType.CLICK, () => this.filterAction.useFilesExclude = false);
+		dom.addStandardDisposableListener(link, dom.EventType.KEY_DOWN, (e: IKeyboardEvent) => {
+			if (e.equals(KeyCode.Enter) || e.equals(KeyCode.Space)) {
+				this.filterAction.useFilesExclude = false;
+				e.stopPropagation();
+			}
+		});
+		this.ariaLabelElement.setAttribute('aria-label', Messages.MARKERS_PANEL_NO_PROBLEMS_FILE_EXCLUSIONS_FILTER);
 	}
 
 	private renderFilteredByFilterMessage(container: HTMLElement) {
@@ -324,18 +359,26 @@ export class MarkersPanel extends Panel {
 		const link = dom.append(container, dom.$('a.messageAction'));
 		link.textContent = localize('clearFilter', "Clear Filter.");
 		link.setAttribute('tabIndex', '0');
-		dom.addDisposableListener(link, dom.EventType.CLICK, () => this.filterInputActionItem.clear());
+		dom.addStandardDisposableListener(link, dom.EventType.CLICK, () => this.filterAction.filterText = '');
+		dom.addStandardDisposableListener(link, dom.EventType.KEY_DOWN, (e: IKeyboardEvent) => {
+			if (e.equals(KeyCode.Enter) || e.equals(KeyCode.Space)) {
+				this.filterAction.filterText = '';
+				e.stopPropagation();
+			}
+		});
+		this.ariaLabelElement.setAttribute('aria-label', Messages.MARKERS_PANEL_NO_PROBLEMS_FILTERS);
 	}
 
 	private renderNoProblemsMessage(container: HTMLElement) {
 		const span = dom.append(container, dom.$('span'));
 		span.textContent = Messages.MARKERS_PANEL_NO_PROBLEMS_BUILT;
+		this.ariaLabelElement.setAttribute('aria-label', Messages.MARKERS_PANEL_NO_PROBLEMS_BUILT);
 	}
 
 	private autoExpand(): void {
 		this.markersWorkbenchService.markersModel.forEachFilteredResource(resource => {
 			if (!this.autoExpanded.has(resource.uri.toString())) {
-				this.tree.expand(resource).done(null, errors.onUnexpectedError);
+				this.tree.expand(resource);
 				this.autoExpanded.add(resource.uri.toString());
 			}
 		});
@@ -414,16 +457,20 @@ export class MarkersPanel extends Panel {
 
 	public getActionItem(action: IAction): IActionItem {
 		if (action.id === MarkersFilterAction.ID) {
+			this.filterInputActionItem = this.instantiationService.createInstance(MarkersFilterActionItem, this.filterAction);
 			return this.filterInputActionItem;
 		}
+		if (action.id === QuickFixAction.ID) {
+			return this.instantiationService.createInstance(QuickFixActionItem, action);
+		}
 		return super.getActionItem(action);
 	}
 
 	public shutdown(): void {
 		// store memento
-		this.panelSettings['filter'] = this.filterInputActionItem.getFilterText();
-		this.panelSettings['filterHistory'] = this.filterInputActionItem.getFilterHistory();
-		this.panelSettings['useFilesExclude'] = this.filterInputActionItem.useFilesExclude;
+		this.panelSettings['filter'] = this.filterAction.filterText;
+		this.panelSettings['filterHistory'] = this.filterAction.filterHistory;
+		this.panelSettings['useFilesExclude'] = this.filterAction.useFilesExclude;
 
 		super.shutdown();
 	}
diff --git a/src/vs/workbench/parts/markers/electron-browser/markersPanelActions.ts b/src/vs/workbench/parts/markers/electron-browser/markersPanelActions.ts
index eecafd66e38..744c78de4e2 100644
--- a/src/vs/workbench/parts/markers/electron-browser/markersPanelActions.ts
+++ b/src/vs/workbench/parts/markers/electron-browser/markersPanelActions.ts
@@ -6,11 +6,11 @@
 import { Delayer } from 'vs/base/common/async';
 import * as DOM from 'vs/base/browser/dom';
 import { TPromise } from 'vs/base/common/winjs.base';
-import { Action, IAction } from 'vs/base/common/actions';
+import { Action, IAction, IActionChangeEvent } from 'vs/base/common/actions';
 import { HistoryInputBox } from 'vs/base/browser/ui/inputbox/inputBox';
 import { KeyCode } from 'vs/base/common/keyCodes';
 import { IKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
+import { IContextViewService, IContextMenuService } from 'vs/platform/contextview/browser/contextView';
 import { TogglePanelAction } from 'vs/workbench/browser/panel';
 import Messages from 'vs/workbench/parts/markers/electron-browser/messages';
 import Constants from 'vs/workbench/parts/markers/electron-browser/constants';
@@ -22,14 +22,20 @@ import * as Tree from 'vs/base/parts/tree/browser/tree';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { attachInputBoxStyler, attachStylerCallback, attachCheckboxStyler } from 'vs/platform/theme/common/styler';
 import { IMarkersWorkbenchService } from 'vs/workbench/parts/markers/electron-browser/markers';
-import { Event, Emitter } from 'vs/base/common/event';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { BaseActionItem } from 'vs/base/browser/ui/actionbar/actionbar';
+import { IDisposable, dispose, toDisposable } from 'vs/base/common/lifecycle';
+import { BaseActionItem, ActionItem } from 'vs/base/browser/ui/actionbar/actionbar';
 import { badgeBackground, contrastBorder } from 'vs/platform/theme/common/colorRegistry';
 import { localize } from 'vs/nls';
 import { Checkbox } from 'vs/base/browser/ui/checkbox/checkbox';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ContextScopedHistoryInputBox } from 'vs/platform/widget/browser/input';
+import { ContextScopedHistoryInputBox } from 'vs/platform/widget/browser/contextScopedHistoryWidget';
+import { Marker } from 'vs/workbench/parts/markers/electron-browser/markersModel';
+import { applyCodeAction } from 'vs/editor/contrib/codeAction/codeActionCommands';
+import { IBulkEditService } from 'vs/editor/browser/services/bulkEditService';
+import { ICommandService } from 'vs/platform/commands/common/commands';
+import { IEditorService, ACTIVE_GROUP } from 'vs/workbench/services/editor/common/editorService';
+import { IModelService } from 'vs/editor/common/services/modelService';
+import { isEqual } from 'vs/base/common/resources';
 
 export class ToggleMarkersPanelAction extends TogglePanelAction {
 
@@ -68,39 +74,63 @@ export class CollapseAllAction extends TreeCollapseAction {
 	}
 }
 
-export class MarkersFilterAction extends Action {
-
-	public static readonly ID: string = 'workbench.actions.problems.filter';
-
-	constructor() {
-		super(MarkersFilterAction.ID, Messages.MARKERS_PANEL_ACTION_TOOLTIP_FILTER, 'markers-panel-action-filter', true);
-	}
-
+export interface IMarkersFilterActionChangeEvent extends IActionChangeEvent {
+	filterText?: boolean;
+	useFilesExclude?: boolean;
 }
 
-export interface IMarkersFilterActionItemOptions {
+export interface IMarkersFilterActionOptions {
 	filterText: string;
 	filterHistory: string[];
 	useFilesExclude: boolean;
 }
 
+export class MarkersFilterAction extends Action {
+
+	public static readonly ID: string = 'workbench.actions.problems.filter';
+
+	constructor(options: IMarkersFilterActionOptions) {
+		super(MarkersFilterAction.ID, Messages.MARKERS_PANEL_ACTION_TOOLTIP_FILTER, 'markers-panel-action-filter', true);
+		this._filterText = options.filterText;
+		this._useFilesExclude = options.useFilesExclude;
+		this.filterHistory = options.filterHistory;
+	}
+
+	private _filterText: string;
+	get filterText(): string {
+		return this._filterText;
+	}
+	set filterText(filterText: string) {
+		if (this._filterText !== filterText) {
+			this._filterText = filterText;
+			this._onDidChange.fire(<IMarkersFilterActionChangeEvent>{ filterText: true });
+		}
+	}
+
+	filterHistory: string[];
+
+	private _useFilesExclude: boolean;
+	get useFilesExclude(): boolean {
+		return this._useFilesExclude;
+	}
+	set useFilesExclude(filesExclude: boolean) {
+		if (this._useFilesExclude !== filesExclude) {
+			this._useFilesExclude = filesExclude;
+			this._onDidChange.fire(<IMarkersFilterActionChangeEvent>{ useFilesExclude: true });
+		}
+	}
+}
+
 export class MarkersFilterActionItem extends BaseActionItem {
 
-	private _toDispose: IDisposable[] = [];
-
-	private readonly _onDidChange: Emitter<void> = this._register(new Emitter<void>());
-	readonly onDidChange: Event<void> = this._onDidChange.event;
-
 	private delayedFilterUpdate: Delayer<void>;
 	private container: HTMLElement;
 	private filterInputBox: HistoryInputBox;
 	private controlsContainer: HTMLInputElement;
 	private filterBadge: HTMLInputElement;
-	private filesExcludeFilter: Checkbox;
 
 	constructor(
-		private itemOptions: IMarkersFilterActionItemOptions,
-		action: IAction,
+		readonly action: MarkersFilterAction,
 		@IInstantiationService private instantiationService: IInstantiationService,
 		@IContextViewService private contextViewService: IContextViewService,
 		@IThemeService private themeService: IThemeService,
@@ -109,45 +139,23 @@ export class MarkersFilterActionItem extends BaseActionItem {
 	) {
 		super(null, action);
 		this.delayedFilterUpdate = new Delayer<void>(500);
+		this._register(toDisposable(() => this.delayedFilterUpdate.cancel()));
 	}
 
 	render(container: HTMLElement): void {
 		this.container = container;
-		DOM.addClass(this.container, 'markers-panel-action-filter');
-		this.createInput(this.container);
-		this.createControls(this.container);
+		DOM.addClass(this.container, 'markers-panel-action-filter-container');
+
+		const filterContainer = DOM.append(this.container, DOM.$('.markers-panel-action-filter'));
+		this.createInput(filterContainer);
+		this.createControls(filterContainer);
+
 		this.adjustInputBox();
 	}
 
-	clear(): void {
-		this.filterInputBox.value = '';
-	}
-
-	getFilterText(): string {
-		return this.filterInputBox ? this.filterInputBox.value : this.itemOptions.filterText;
-	}
-
-	getFilterHistory(): string[] {
-		return this.filterInputBox.getHistory();
-	}
-
-	get useFilesExclude(): boolean {
-		return this.filesExcludeFilter ? this.filesExcludeFilter.checked : this.itemOptions.useFilesExclude;
-	}
-
-	set useFilesExclude(useFilesExclude: boolean) {
-		if (this.filesExcludeFilter) {
-			if (this.filesExcludeFilter.checked !== useFilesExclude) {
-				this.filesExcludeFilter.checked = useFilesExclude;
-				this._onDidChange.fire();
-			}
-		}
-	}
-
 	toggleLayout(small: boolean) {
 		if (this.container) {
 			DOM.toggleClass(this.container, 'small', small);
-			DOM.toggleClass(this.filterBadge, 'small', small);
 		}
 	}
 
@@ -155,11 +163,17 @@ export class MarkersFilterActionItem extends BaseActionItem {
 		this.filterInputBox = this._register(this.instantiationService.createInstance(ContextScopedHistoryInputBox, container, this.contextViewService, {
 			placeholder: Messages.MARKERS_PANEL_FILTER_PLACEHOLDER,
 			ariaLabel: Messages.MARKERS_PANEL_FILTER_ARIA_LABEL,
-			history: this.itemOptions.filterHistory
+			history: this.action.filterHistory
 		}));
+		this.filterInputBox.inputElement.setAttribute('aria-labelledby', 'markers-panel-arialabel');
 		this._register(attachInputBoxStyler(this.filterInputBox, this.themeService));
-		this.filterInputBox.value = this.itemOptions.filterText;
-		this._register(this.filterInputBox.onDidChange(filter => this.delayedFilterUpdate.trigger(() => this.onDidInputChange())));
+		this.filterInputBox.value = this.action.filterText;
+		this._register(this.filterInputBox.onDidChange(filter => this.delayedFilterUpdate.trigger(() => this.onDidInputChange(this.filterInputBox))));
+		this._register(this.action.onDidChange((event: IMarkersFilterActionChangeEvent) => {
+			if (event.filterText) {
+				this.filterInputBox.value = this.action.filterText;
+			}
+		}));
 		this._register(DOM.addStandardDisposableListener(this.filterInputBox.inputElement, 'keydown', (keyboardEvent) => this.onInputKeyDown(keyboardEvent, this.filterInputBox)));
 		this._register(DOM.addStandardDisposableListener(container, 'keydown', this.handleKeyboardEvent));
 		this._register(DOM.addStandardDisposableListener(container, 'keyup', this.handleKeyboardEvent));
@@ -188,25 +202,29 @@ export class MarkersFilterActionItem extends BaseActionItem {
 	}
 
 	private createFilesExcludeCheckbox(container: HTMLElement): void {
-		this.filesExcludeFilter = new Checkbox({
+		const filesExcludeFilter = this._register(new Checkbox({
 			actionClassName: 'markers-panel-filter-filesExclude',
-			title: this.itemOptions.useFilesExclude ? Messages.MARKERS_PANEL_ACTION_TOOLTIP_DO_NOT_USE_FILES_EXCLUDE : Messages.MARKERS_PANEL_ACTION_TOOLTIP_USE_FILES_EXCLUDE,
-			isChecked: this.itemOptions.useFilesExclude,
-			onChange: () => {
-				this.filesExcludeFilter.domNode.title = this.filesExcludeFilter.checked ? Messages.MARKERS_PANEL_ACTION_TOOLTIP_DO_NOT_USE_FILES_EXCLUDE : Messages.MARKERS_PANEL_ACTION_TOOLTIP_USE_FILES_EXCLUDE;
-				this._onDidChange.fire();
+			title: this.action.useFilesExclude ? Messages.MARKERS_PANEL_ACTION_TOOLTIP_DO_NOT_USE_FILES_EXCLUDE : Messages.MARKERS_PANEL_ACTION_TOOLTIP_USE_FILES_EXCLUDE,
+			isChecked: this.action.useFilesExclude
+		}));
+		this._register(filesExcludeFilter.onChange(() => {
+			filesExcludeFilter.domNode.title = filesExcludeFilter.checked ? Messages.MARKERS_PANEL_ACTION_TOOLTIP_DO_NOT_USE_FILES_EXCLUDE : Messages.MARKERS_PANEL_ACTION_TOOLTIP_USE_FILES_EXCLUDE;
+			this.action.useFilesExclude = filesExcludeFilter.checked;
+		}));
+		this._register(this.action.onDidChange((event: IMarkersFilterActionChangeEvent) => {
+			if (event.useFilesExclude) {
+				filesExcludeFilter.checked = this.action.useFilesExclude;
 			}
-		});
-		this._register(attachCheckboxStyler(this.filesExcludeFilter, this.themeService));
-		container.appendChild(this.filesExcludeFilter.domNode);
+		}));
+
+		this._register(attachCheckboxStyler(filesExcludeFilter, this.themeService));
+		container.appendChild(filesExcludeFilter.domNode);
 	}
 
-	private onDidInputChange() {
-		const filterText = this.filterInputBox.value;
-		if (filterText) {
-			this.filterInputBox.addToHistory(filterText);
-		}
-		this._onDidChange.fire();
+	private onDidInputChange(inputbox: HistoryInputBox) {
+		inputbox.addToHistory();
+		this.action.filterText = inputbox.value;
+		this.action.filterHistory = inputbox.getHistory();
 		this.reportFilteringUsed();
 	}
 
@@ -261,9 +279,89 @@ export class MarkersFilterActionItem extends BaseActionItem {
 		*/
 		this.telemetryService.publicLog('problems.filter', data);
 	}
+}
+
+export class QuickFixAction extends Action {
+
+	public static readonly ID: string = 'workbench.actions.problems.quickfix';
+
+	private updated: boolean = false;
+	private disposables: IDisposable[] = [];
+
+	constructor(
+		readonly marker: Marker,
+		@IBulkEditService private bulkEditService: IBulkEditService,
+		@ICommandService private commandService: ICommandService,
+		@IEditorService private editorService: IEditorService,
+		@IModelService modelService: IModelService
+	) {
+		super(QuickFixAction.ID, Messages.MARKERS_PANEL_ACTION_TOOLTIP_QUICKFIX, 'markers-panel-action-quickfix', false);
+		if (modelService.getModel(this.marker.resourceMarkers.uri)) {
+			this.update();
+		} else {
+			modelService.onModelAdded(model => {
+				if (isEqual(model.uri, marker.resource)) {
+					this.update();
+				}
+			}, this, this.disposables);
+		}
 
-	private _register<T extends IDisposable>(t: T): T {
-		this._toDispose.push(t);
-		return t;
 	}
+
+	private update(): void {
+		if (!this.updated) {
+			this.marker.resourceMarkers.hasFixes(this.marker).then(hasFixes => this.enabled = hasFixes);
+			this.updated = true;
+		}
+	}
+
+	async getQuickFixActions(): Promise<IAction[]> {
+		const codeActions = await this.marker.resourceMarkers.getFixes(this.marker);
+		return codeActions.map(codeAction => new Action(
+			codeAction.command ? codeAction.command.id : codeAction.title,
+			codeAction.title,
+			void 0,
+			true,
+			() => {
+				return this.openFileAtMarker(this.marker)
+					.then(() => applyCodeAction(codeAction, this.bulkEditService, this.commandService));
+			}));
+	}
+
+	public openFileAtMarker(element: Marker): TPromise<void> {
+		const { resource, selection } = { resource: element.resource, selection: element.range };
+		return this.editorService.openEditor({
+			resource,
+			options: {
+				selection,
+				preserveFocus: true,
+				pinned: false,
+				revealIfVisible: true
+			},
+		}, ACTIVE_GROUP).then(() => null);
+	}
+
+	dispose(): void {
+		dispose(this.disposables);
+		super.dispose();
+	}
+}
+
+export class QuickFixActionItem extends ActionItem {
+
+	constructor(action: QuickFixAction,
+		@IContextMenuService private contextMenuService: IContextMenuService
+	) {
+		super(null, action, { icon: true, label: false });
+	}
+
+	public onClick(event: DOM.EventLike): void {
+		DOM.EventHelper.stop(event, true);
+		const elementPosition = DOM.getDomNodePagePosition(this.element);
+		this.contextMenuService.showContextMenu({
+			getAnchor: () => ({ x: elementPosition.left + 10, y: elementPosition.top + elementPosition.height }),
+			getActions: () => TPromise.wrap((<QuickFixAction>this.getAction()).getQuickFixActions()),
+		});
+	}
+
 }
\ No newline at end of file
diff --git a/src/vs/workbench/parts/markers/electron-browser/markersTreeController.ts b/src/vs/workbench/parts/markers/electron-browser/markersTreeController.ts
index 930f8c9ee45..e936b16e3f1 100644
--- a/src/vs/workbench/parts/markers/electron-browser/markersTreeController.ts
+++ b/src/vs/workbench/parts/markers/electron-browser/markersTreeController.ts
@@ -7,7 +7,7 @@
 import { TPromise } from 'vs/base/common/winjs.base';
 import * as mouse from 'vs/base/browser/mouseEvent';
 import * as tree from 'vs/base/parts/tree/browser/tree';
-import { MarkersModel } from 'vs/workbench/parts/markers/electron-browser/markersModel';
+import { MarkersModel, Marker } from 'vs/workbench/parts/markers/electron-browser/markersModel';
 import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
 import { IMenuService, MenuId } from 'vs/platform/actions/common/actions';
 import { IAction } from 'vs/base/common/actions';
@@ -15,6 +15,8 @@ import { ActionItem, Separator } from 'vs/base/browser/ui/actionbar/actionbar';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { WorkbenchTree, WorkbenchTreeController } from 'vs/platform/list/browser/listService';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { QuickFixAction } from 'vs/workbench/parts/markers/electron-browser/markersPanelActions';
 
 export class Controller extends WorkbenchTreeController {
 
@@ -22,7 +24,8 @@ export class Controller extends WorkbenchTreeController {
 		@IContextMenuService private contextMenuService: IContextMenuService,
 		@IMenuService private menuService: IMenuService,
 		@IKeybindingService private readonly _keybindingService: IKeybindingService,
-		@IConfigurationService configurationService: IConfigurationService
+		@IConfigurationService configurationService: IConfigurationService,
+		@IInstantiationService private instantiationService: IInstantiationService
 	) {
 		super({}, configurationService);
 	}
@@ -45,17 +48,11 @@ export class Controller extends WorkbenchTreeController {
 	public onContextMenu(tree: WorkbenchTree, element: any, event: tree.ContextMenuEvent): boolean {
 		tree.setFocus(element, { preventOpenOnFocus: true });
 
-		const actions = this._getMenuActions(tree);
-		if (!actions.length) {
-			return true;
-		}
 		const anchor = { x: event.posx, y: event.posy };
 		this.contextMenuService.showContextMenu({
 			getAnchor: () => anchor,
 
-			getActions: () => {
-				return TPromise.as(actions);
-			},
+			getActions: () => TPromise.wrap(this._getMenuActions(tree, element)),
 
 			getActionItem: (action) => {
 				const keybinding = this._keybindingService.lookupKeybinding(action.id);
@@ -75,8 +72,18 @@ export class Controller extends WorkbenchTreeController {
 		return true;
 	}
 
-	private _getMenuActions(tree: WorkbenchTree): IAction[] {
+	private async _getMenuActions(tree: WorkbenchTree, element: any): Promise<IAction[]> {
 		const result: IAction[] = [];
+
+		if (element instanceof Marker) {
+			const quickFixAction = this.instantiationService.createInstance(QuickFixAction, element);
+			const quickFixActions = await quickFixAction.getQuickFixActions();
+			if (quickFixActions.length) {
+				result.push(...quickFixActions);
+				result.push(new Separator());
+			}
+		}
+
 		const menu = this.menuService.createMenu(MenuId.ProblemsPanelContext, tree.contextKeyService);
 		const groups = menu.getActions();
 		menu.dispose();
@@ -86,6 +93,7 @@ export class Controller extends WorkbenchTreeController {
 			result.push(...actions);
 			result.push(new Separator());
 		}
+
 		result.pop(); // remove last separator
 		return result;
 	}
diff --git a/src/vs/workbench/parts/markers/electron-browser/markersTreeViewer.ts b/src/vs/workbench/parts/markers/electron-browser/markersTreeViewer.ts
index 55577952d80..4e35e7e3ccb 100644
--- a/src/vs/workbench/parts/markers/electron-browser/markersTreeViewer.ts
+++ b/src/vs/workbench/parts/markers/electron-browser/markersTreeViewer.ts
@@ -19,6 +19,10 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti
 import { attachBadgeStyler } from 'vs/platform/theme/common/styler';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { IDisposable } from 'vs/base/common/lifecycle';
+import { ActionBar, IActionItemProvider } from 'vs/base/browser/ui/actionbar/actionbar';
+import { QuickFixAction } from 'vs/workbench/parts/markers/electron-browser/markersPanelActions';
+import { ILabelService } from 'vs/platform/label/common/label';
+import { dirname } from 'vs/base/common/resources';
 
 interface IResourceMarkersTemplateData {
 	resourceLabel: ResourceLabel;
@@ -28,6 +32,7 @@ interface IResourceMarkersTemplateData {
 
 interface IMarkerTemplateData {
 	icon: HTMLElement;
+	actionBar: ActionBar;
 	source: HighlightedLabel;
 	description: HighlightedLabel;
 	lnCol: HTMLElement;
@@ -92,8 +97,10 @@ export class Renderer implements IRenderer {
 	private static readonly RELATED_INFO_TEMPLATE_ID = 'related-info-template';
 
 	constructor(
+		private actionItemProvider: IActionItemProvider,
 		@IInstantiationService private instantiationService: IInstantiationService,
-		@IThemeService private themeService: IThemeService
+		@IThemeService private themeService: IThemeService,
+		@ILabelService private labelService: ILabelService
 	) {
 	}
 
@@ -161,6 +168,9 @@ export class Renderer implements IRenderer {
 	private renderRelatedInfoTemplate(container: HTMLElement): IRelatedInformationTemplateData {
 		const data: IRelatedInformationTemplateData = Object.create(null);
 
+		dom.append(container, dom.$('.actions'));
+		dom.append(container, dom.$('.icon'));
+
 		data.resourceLabel = new HighlightedLabel(dom.append(container, dom.$('.related-info-resource')));
 		data.lnCol = dom.append(container, dom.$('span.marker-line'));
 
@@ -174,7 +184,9 @@ export class Renderer implements IRenderer {
 
 	private renderMarkerTemplate(container: HTMLElement): IMarkerTemplateData {
 		const data: IMarkerTemplateData = Object.create(null);
-		data.icon = dom.append(container, dom.$('.marker-icon'));
+		const actionsContainer = dom.append(container, dom.$('.actions'));
+		data.actionBar = new ActionBar(actionsContainer, { actionItemProvider: this.actionItemProvider });
+		data.icon = dom.append(container, dom.$('.icon'));
 		data.source = new HighlightedLabel(dom.append(container, dom.$('')));
 		data.description = new HighlightedLabel(dom.append(container, dom.$('.marker-description')));
 		data.lnCol = dom.append(container, dom.$('span.marker-line'));
@@ -197,27 +209,33 @@ export class Renderer implements IRenderer {
 		if (templateData.resourceLabel instanceof FileLabel) {
 			templateData.resourceLabel.setFile(element.uri, { matches: element.uriMatches });
 		} else {
-			templateData.resourceLabel.setLabel({ name: element.name, description: element.uri.toString(), resource: element.uri }, { matches: element.uriMatches });
+			templateData.resourceLabel.setLabel({ name: element.name, description: this.labelService.getUriLabel(dirname(element.uri), true), resource: element.uri }, { matches: element.uriMatches });
 		}
 		(<IResourceMarkersTemplateData>templateData).count.setCount(element.filteredCount);
 	}
 
 	private renderMarkerElement(tree: ITree, element: Marker, templateData: IMarkerTemplateData) {
 		let marker = element.raw;
+
 		templateData.icon.className = 'icon ' + Renderer.iconClassNameFor(marker);
 
 		templateData.source.set(marker.source, element.sourceMatches);
 		dom.toggleClass(templateData.source.element, 'marker-source', !!marker.source);
 
+		templateData.actionBar.clear();
+		const quickFixAction = this.instantiationService.createInstance(QuickFixAction, element);
+		templateData.actionBar.push([quickFixAction], { icon: true, label: false });
+
 		templateData.description.set(marker.message, element.messageMatches);
 		templateData.description.element.title = marker.message;
 
 		templateData.lnCol.textContent = Messages.MARKERS_PANEL_AT_LINE_COL_NUMBER(marker.startLineNumber, marker.startColumn);
+
 	}
 
 	private renderRelatedInfoElement(tree: ITree, element: RelatedInformation, templateData: IRelatedInformationTemplateData) {
 		templateData.resourceLabel.set(paths.basename(element.raw.resource.fsPath), element.uriMatches);
-		templateData.resourceLabel.element.title = element.raw.resource.toString();
+		templateData.resourceLabel.element.title = this.labelService.getUriLabel(element.raw.resource, true);
 		templateData.lnCol.textContent = Messages.MARKERS_PANEL_AT_LINE_COL_NUMBER(element.raw.startLineNumber, element.raw.startColumn);
 		templateData.description.set(element.raw.message, element.messageMatches);
 		templateData.description.element.title = element.raw.message;
@@ -244,6 +262,7 @@ export class Renderer implements IRenderer {
 		} else if (templateId === Renderer.MARKER_TEMPLATE_ID) {
 			(<IMarkerTemplateData>templateData).description.dispose();
 			(<IMarkerTemplateData>templateData).source.dispose();
+			(<IMarkerTemplateData>templateData).actionBar.dispose();
 		} else if (templateId === Renderer.RELATED_INFO_TEMPLATE_ID) {
 			(<IRelatedInformationTemplateData>templateData).description.dispose();
 			(<IRelatedInformationTemplateData>templateData).resourceLabel.dispose();
@@ -253,9 +272,15 @@ export class Renderer implements IRenderer {
 
 export class MarkersTreeAccessibilityProvider implements IAccessibilityProvider {
 
+	constructor(
+		@ILabelService private labelServie: ILabelService
+	) {
+	}
+
 	public getAriaLabel(tree: ITree, element: any): string {
 		if (element instanceof ResourceMarkers) {
-			return Messages.MARKERS_TREE_ARIA_LABEL_RESOURCE(element.name, element.filteredCount);
+			const path = this.labelServie.getUriLabel(element.uri, true) || element.uri.fsPath;
+			return Messages.MARKERS_TREE_ARIA_LABEL_RESOURCE(element.filteredCount, element.name, paths.dirname(path));
 		}
 		if (element instanceof Marker) {
 			return Messages.MARKERS_TREE_ARIA_LABEL_MARKER(element);
@@ -266,4 +291,3 @@ export class MarkersTreeAccessibilityProvider implements IAccessibilityProvider
 		return null;
 	}
 }
-
diff --git a/src/vs/workbench/parts/markers/electron-browser/media/lightbulb-dark.svg b/src/vs/workbench/parts/markers/electron-browser/media/lightbulb-dark.svg
new file mode 100644
index 00000000000..520f78f3e55
--- /dev/null
+++ b/src/vs/workbench/parts/markers/electron-browser/media/lightbulb-dark.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" enable-background="new 0 0 16 16" height="16" width="16"><path fill="#1E1E1E" d="M13.5 4.2C13.1 2.1 10.8 0 9.3 0H6.7c-.4 0-.6.2-.6.2C4 .8 2.5 2.7 2.5 4.9c0 .5-.1 2.3 1.7 3.8.5.5 1.2 2 1.3 2.4v3.3L7.1 16h2l1.5-1.6V11c.1-.4.8-1.9 1.3-2.3 1.1-.9 1.5-1.9 1.6-2.7V4.2z"/><g><g fill="#C5C5C5"><path d="M6.5 12h3v1h-3zM7.5 15h1.1l.9-1h-3z"/></g><path fill="#DDB204" d="M12.6 5c0-2.3-1.8-4.1-4.1-4.1-.1 0-1.4.1-1.4.1-2.1.3-3.7 2-3.7 4 0 .1-.2 1.6 1.4 3 .7.7 1.5 2.4 1.6 2.9l.1.1h3l.1-.2c.1-.5.9-2.2 1.6-2.9 1.6-1.3 1.4-2.8 1.4-2.9zm-3 1l-.5 3h-.6V6c1.1 0 .9-1 .9-1H6.5v.1c0 .2.1.9 1 .9v3H7l-.2-.7L6.5 6c-.7 0-.9-.4-1-.7v-.4c0-.8.9-.9.9-.9h3.1s1 .1 1 1c0 0 .1 1-.9 1z"/></g><path fill="#252526" d="M10.5 5c0-.9-1-1-1-1H6.4s-.9.1-.9.9v.4c0 .3.3.7.9.7l.4 2.3.2.7h.5V6c-1 0-1-.7-1-.9V5h3s.1 1-.9 1v3h.6l.5-3c.9 0 .8-1 .8-1z"/></svg>
\ No newline at end of file
diff --git a/src/vs/workbench/parts/markers/electron-browser/media/lightbulb.svg b/src/vs/workbench/parts/markers/electron-browser/media/lightbulb.svg
new file mode 100644
index 00000000000..b3596046616
--- /dev/null
+++ b/src/vs/workbench/parts/markers/electron-browser/media/lightbulb.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" enable-background="new 0 0 16 16" height="16" width="16"><path fill="#F6F6F6" d="M13.5 4.2C13.1 2.1 10.8 0 9.3 0H6.7c-.4 0-.6.2-.6.2C4 .8 2.5 2.7 2.5 4.9c0 .5-.1 2.3 1.7 3.8.5.5 1.2 2 1.3 2.4v3.3L7.1 16h2l1.5-1.6V11c.1-.4.8-1.9 1.3-2.3 1.1-.9 1.5-1.9 1.6-2.7V4.2z"/><g><g fill="#848484"><path d="M6.5 12h3v1h-3zM7.5 15h1.1l.9-1h-3z"/></g><path fill="#fc0" d="M12.6 5c0-2.3-1.8-4.1-4.1-4.1-.1 0-1.4.1-1.4.1-2.1.3-3.7 2-3.7 4 0 .1-.2 1.6 1.4 3 .7.7 1.5 2.4 1.6 2.9l.1.1h3l.1-.2c.1-.5.9-2.2 1.6-2.9 1.6-1.3 1.4-2.8 1.4-2.9zm-3 1l-.5 3h-.6V6c1.1 0 .9-1 .9-1H6.5v.1c0 .2.1.9 1 .9v3H7l-.2-.7L6.5 6c-.7 0-.9-.4-1-.7v-.4c0-.8.9-.9.9-.9h3.1s1 .1 1 1c0 0 .1 1-.9 1z"/></g><path fill="#F0EFF1" d="M10.5 5c0-.9-1-1-1-1H6.4s-.9.1-.9.9v.4c0 .3.3.7.9.7l.4 2.3.2.7h.5V6c-1 0-1-.7-1-.9V5h3s.1 1-.9 1v3h.6l.5-3c.9 0 .8-1 .8-1z"/></svg>
\ No newline at end of file
diff --git a/src/vs/workbench/parts/markers/electron-browser/media/markers.css b/src/vs/workbench/parts/markers/electron-browser/media/markers.css
index 1aa1fecffe9..635af71f10c 100644
--- a/src/vs/workbench/parts/markers/electron-browser/media/markers.css
+++ b/src/vs/workbench/parts/markers/electron-browser/media/markers.css
@@ -3,30 +3,35 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-.monaco-action-bar .action-item.markers-panel-action-filter {
+.monaco-action-bar .markers-panel-action-filter-container {
 	cursor: default;
 	margin-right: 10px;
 	min-width: 150px;
 	max-width: 500px;
 	display: flex;
-	align-items: center;
 }
 
-.monaco-action-bar .action-item.markers-panel-action-filter {
+.monaco-action-bar .markers-panel-action-filter-container {
 	flex: 0.7;
 }
 
-.monaco-action-bar .action-item.markers-panel-action-filter.small {
+.monaco-action-bar .markers-panel-action-filter-container.small {
 	flex: 0.5;
 }
 
-.monaco-action-bar .action-item.markers-panel-action-filter .monaco-inputbox {
+.monaco-action-bar .markers-panel-action-filter {
+	display: flex;
+	align-items: center;
+	flex: 1;
+}
+
+.monaco-action-bar .markers-panel-action-filter .monaco-inputbox {
 	height: 24px;
 	font-size: 12px;
 	flex: 1;
 }
 
-.vs .monaco-action-bar .action-item.markers-panel-action-filter .monaco-inputbox {
+.vs .monaco-action-bar .markers-panel-action-filter .monaco-inputbox {
 	height: 25px;
 	border: 1px solid #ddd;
 }
@@ -47,7 +52,7 @@
 }
 
 .markers-panel-action-filter > .markers-panel-filter-controls > .markers-panel-filter-badge.hidden,
-.markers-panel-action-filter > .markers-panel-filter-controls > .markers-panel-filter-badge.small {
+.markers-panel-action-filter-container.small .markers-panel-action-filter > .markers-panel-filter-controls > .markers-panel-filter-badge {
 	display: none;
 }
 
@@ -67,6 +72,7 @@
 .markers-panel .markers-panel-container .message-box-container {
 	line-height: 22px;
 	padding-left: 20px;
+	height: 100%;
 }
 
 .markers-panel .markers-panel-container .message-box-container .messageAction {
@@ -79,8 +85,7 @@
 	display: none;
 }
 
-.markers-panel .markers-panel-container .tree-container.hidden,
-.markers-panel .markers-panel-container .message-box-container.hidden {
+.markers-panel .markers-panel-container .tree-container.hidden {
 	display: none;
 	visibility: hidden;
 }
@@ -132,7 +137,7 @@
 	font-weight: bold;
 }
 
-.markers-panel .icon {
+.markers-panel .monaco-tree .markers-panel-tree-entry > .icon {
 	height: 22px;
 	margin-right: 6px;
 	flex: 0 0 16px;
@@ -160,4 +165,38 @@
 
 .vs-dark .markers-panel .icon.info {
 	background: url('status-info-inverse.svg') center center no-repeat;
+}
+
+.markers-panel .monaco-tree .markers-panel-tree-entry .actions .action-label.icon.markers-panel-action-quickfix {
+	background: url('lightbulb.svg') center/80% no-repeat;
+	margin-right: 0px;
+}
+
+.vs-dark .markers-panel .monaco-tree .markers-panel-tree-entry .actions .action-label.icon.markers-panel-action-quickfix {
+	background: url('lightbulb-dark.svg') center/80% no-repeat;
+}
+
+.markers-panel .monaco-tree .monaco-tree-row .markers-panel-tree-entry > .actions {
+	width: 16px;
+}
+
+.markers-panel .monaco-tree .monaco-tree-row .markers-panel-tree-entry > .actions .monaco-action-bar {
+	display: none;
+}
+
+.markers-panel .monaco-tree .monaco-tree-row:hover .markers-panel-tree-entry > .actions .monaco-action-bar,
+.markers-panel .monaco-tree .monaco-tree-row.selected .markers-panel-tree-entry > .actions .monaco-action-bar,
+.markers-panel .monaco-tree .monaco-tree-row.focused .markers-panel-tree-entry > .actions .monaco-action-bar {
+	display: block;
+}
+
+.markers-panel .monaco-tree .markers-panel-tree-entry .actions .action-label {
+	width: 16px;
+	height: 100%;
+	background-position: 50% 50%;
+	background-repeat: no-repeat;
+}
+
+.markers-panel .monaco-tree .markers-panel-tree-entry .actions .action-item.disabled {
+	display: none;
 }
\ No newline at end of file
diff --git a/src/vs/workbench/parts/markers/electron-browser/messages.ts b/src/vs/workbench/parts/markers/electron-browser/messages.ts
index 7368df79ae4..09e3eddbb5d 100644
--- a/src/vs/workbench/parts/markers/electron-browser/messages.ts
+++ b/src/vs/workbench/parts/markers/electron-browser/messages.ts
@@ -16,7 +16,7 @@ export default class Messages {
 	public static MARKERS_PANEL_SHOW_LABEL: string = nls.localize('problems.view.focus.label', "Focus Problems (Errors, Warnings, Infos)");
 
 	public static PROBLEMS_PANEL_CONFIGURATION_TITLE: string = nls.localize('problems.panel.configuration.title', "Problems View");
-	public static PROBLEMS_PANEL_CONFIGURATION_AUTO_REVEAL: string = nls.localize('problems.panel.configuration.autoreveal', "Controls if Problems view should automatically reveal files when opening them");
+	public static PROBLEMS_PANEL_CONFIGURATION_AUTO_REVEAL: string = nls.localize('problems.panel.configuration.autoreveal', "Controls whether Problems view should automatically reveal files when opening them.");
 
 	public static MARKERS_PANEL_TITLE_PROBLEMS: string = nls.localize('markers.panel.title.problems', "Problems");
 	public static MARKERS_PANEL_ARIA_LABEL_PROBLEMS_TREE: string = nls.localize('markers.panel.aria.label.problems.tree', "Problems grouped by files");
@@ -28,6 +28,7 @@ export default class Messages {
 	public static MARKERS_PANEL_ACTION_TOOLTIP_USE_FILES_EXCLUDE: string = nls.localize('markers.panel.action.useFilesExclude', "Filter using Files Exclude Setting");
 	public static MARKERS_PANEL_ACTION_TOOLTIP_DO_NOT_USE_FILES_EXCLUDE: string = nls.localize('markers.panel.action.donotUseFilesExclude', "Do not use Files Exclude Setting");
 	public static MARKERS_PANEL_ACTION_TOOLTIP_FILTER: string = nls.localize('markers.panel.action.filter', "Filter Problems");
+	public static MARKERS_PANEL_ACTION_TOOLTIP_QUICKFIX: string = nls.localize('markers.panel.action.quickfix', "Show fixes");
 	public static MARKERS_PANEL_FILTER_ARIA_LABEL: string = nls.localize('markers.panel.filter.ariaLabel', "Filter Problems");
 	public static MARKERS_PANEL_FILTER_PLACEHOLDER: string = nls.localize('markers.panel.filter.placeholder', "Filter. Eg: text, **/*.ts, !**/node_modules/**");
 	public static MARKERS_PANEL_FILTER_ERRORS: string = nls.localize('markers.panel.filter.errors', "errors");
@@ -45,7 +46,7 @@ export default class Messages {
 
 	public static readonly MARKERS_PANEL_AT_LINE_COL_NUMBER = (ln: number, col: number): string => { return nls.localize('markers.panel.at.ln.col.number', "({0}, {1})", '' + ln, '' + col); };
 
-	public static readonly MARKERS_TREE_ARIA_LABEL_RESOURCE = (fileName: string, noOfProblems: number): string => { return nls.localize('problems.tree.aria.label.resource', "{0} with {1} problems", fileName, noOfProblems); };
+	public static readonly MARKERS_TREE_ARIA_LABEL_RESOURCE = (noOfProblems: number, fileName: string, folder: string): string => { return nls.localize('problems.tree.aria.label.resource', "{0} problems in file {1} of folder {2}", noOfProblems, fileName, folder); };
 	public static readonly MARKERS_TREE_ARIA_LABEL_MARKER = (marker: Marker): string => {
 		const relatedInformationMessage = marker.resourceRelatedInformation.length ? nls.localize('problems.tree.aria.label.marker.relatedInformation', " This problem has references to {0} locations.", marker.resourceRelatedInformation.length) : '';
 		switch (marker.raw.severity) {
diff --git a/src/vs/workbench/parts/markers/test/electron-browser/markersModel.test.ts b/src/vs/workbench/parts/markers/test/electron-browser/markersModel.test.ts
index 7ed878b7ed2..687d1e183a7 100644
--- a/src/vs/workbench/parts/markers/test/electron-browser/markersModel.test.ts
+++ b/src/vs/workbench/parts/markers/test/electron-browser/markersModel.test.ts
@@ -6,9 +6,11 @@
 'use strict';
 
 import * as assert from 'assert';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { IMarker, MarkerSeverity, IRelatedInformation } from 'vs/platform/markers/common/markers';
 import { MarkersModel, Marker, ResourceMarkers, RelatedInformation } from 'vs/workbench/parts/markers/electron-browser/markersModel';
+import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { workbenchInstantiationService } from 'vs/workbench/test/workbenchTestServices';
 
 class TestMarkersModel extends MarkersModel {
 
@@ -22,6 +24,12 @@ class TestMarkersModel extends MarkersModel {
 
 suite('MarkersModel Test', () => {
 
+	let instantiationService: IInstantiationService;
+
+	setup(() => {
+		instantiationService = workbenchInstantiationService();
+	});
+
 	test('getFilteredResource return markers grouped by resource', function () {
 		const marker1 = aMarker('res1');
 		const marker2 = aMarker('res2');
@@ -29,7 +37,7 @@ suite('MarkersModel Test', () => {
 		const marker4 = aMarker('res3');
 		const marker5 = aMarker('res4');
 		const marker6 = aMarker('res2');
-		const testObject = new TestMarkersModel([marker1, marker2, marker3, marker4, marker5, marker6]);
+		const testObject = instantiationService.createInstance(TestMarkersModel, [marker1, marker2, marker3, marker4, marker5, marker6]);
 
 		const actuals = testObject.filteredResources;
 
@@ -61,7 +69,7 @@ suite('MarkersModel Test', () => {
 		const marker4 = aMarker('b/res3');
 		const marker5 = aMarker('res4');
 		const marker6 = aMarker('c/res2', MarkerSeverity.Info);
-		const testObject = new TestMarkersModel([marker1, marker2, marker3, marker4, marker5, marker6]);
+		const testObject = instantiationService.createInstance(TestMarkersModel, [marker1, marker2, marker3, marker4, marker5, marker6]);
 
 		const actuals = testObject.resources;
 
@@ -80,7 +88,7 @@ suite('MarkersModel Test', () => {
 		const marker4 = aMarker('b/res3');
 		const marker5 = aMarker('res4');
 		const marker6 = aMarker('c/res2');
-		const testObject = new TestMarkersModel([marker1, marker2, marker3, marker4, marker5, marker6]);
+		const testObject = instantiationService.createInstance(TestMarkersModel, [marker1, marker2, marker3, marker4, marker5, marker6]);
 
 		const actuals = testObject.resources;
 
@@ -108,7 +116,7 @@ suite('MarkersModel Test', () => {
 		const marker13 = aWarningWithRange(5);
 		const marker14 = anErrorWithRange(4);
 		const marker15 = anErrorWithRange(8, 2, 8, 4);
-		const testObject = new TestMarkersModel([marker1, marker2, marker3, marker4, marker5, marker6, marker7, marker8, marker9, marker10, marker11, marker12, marker13, marker14, marker15]);
+		const testObject = instantiationService.createInstance(TestMarkersModel, [marker1, marker2, marker3, marker4, marker5, marker6, marker7, marker8, marker9, marker10, marker11, marker12, marker13, marker14, marker15]);
 
 		const actuals = testObject.resources[0].markers;
 
@@ -132,19 +140,19 @@ suite('MarkersModel Test', () => {
 	test('toString()', function () {
 		let marker = aMarker('a/res1');
 		marker.code = '1234';
-		assert.equal(JSON.stringify({ ...marker, resource: marker.resource.path }, null, '\t'), new Marker('', marker).toString());
+		assert.equal(JSON.stringify({ ...marker, resource: marker.resource.path }, null, '\t'), instantiationService.createInstance(Marker, '', marker, null).toString());
 
 		marker = aMarker('a/res2', MarkerSeverity.Warning);
-		assert.equal(JSON.stringify({ ...marker, resource: marker.resource.path }, null, '\t'), new Marker('', marker).toString());
+		assert.equal(JSON.stringify({ ...marker, resource: marker.resource.path }, null, '\t'), instantiationService.createInstance(Marker, '', marker, null).toString());
 
 		marker = aMarker('a/res2', MarkerSeverity.Info, 1, 2, 1, 8, 'Info', '');
-		assert.equal(JSON.stringify({ ...marker, resource: marker.resource.path }, null, '\t'), new Marker('', marker).toString());
+		assert.equal(JSON.stringify({ ...marker, resource: marker.resource.path }, null, '\t'), instantiationService.createInstance(Marker, '', marker, null).toString());
 
 		marker = aMarker('a/res2', MarkerSeverity.Hint, 1, 2, 1, 8, 'Ignore message', 'Ignore');
-		assert.equal(JSON.stringify({ ...marker, resource: marker.resource.path }, null, '\t'), new Marker('', marker).toString());
+		assert.equal(JSON.stringify({ ...marker, resource: marker.resource.path }, null, '\t'), instantiationService.createInstance(Marker, '', marker, null).toString());
 
 		marker = aMarker('a/res2', MarkerSeverity.Warning, 1, 2, 1, 8, 'Warning message', '', [{ startLineNumber: 2, startColumn: 5, endLineNumber: 2, endColumn: 10, message: 'some info', resource: URI.file('a/res3') }]);
-		const testObject = new Marker('', marker);
+		const testObject = instantiationService.createInstance(Marker, '', marker, null);
 		testObject.resourceRelatedInformation = marker.relatedInformation.map(r => new RelatedInformation('', r));
 		assert.equal(JSON.stringify({ ...marker, resource: marker.resource.path, relatedInformation: marker.relatedInformation.map(r => ({ ...r, resource: r.resource.path })) }, null, '\t'), testObject.toString());
 	});
diff --git a/src/vs/workbench/parts/navigation/common/navigation.contribution.ts b/src/vs/workbench/parts/navigation/common/navigation.contribution.ts
new file mode 100644
index 00000000000..87699346f17
--- /dev/null
+++ b/src/vs/workbench/parts/navigation/common/navigation.contribution.ts
@@ -0,0 +1,13 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+import { Registry } from 'vs/platform/registry/common/platform';
+import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions';
+import { LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
+import { HistoryNavigationKeybindingsChangedContribution } from 'vs/workbench/parts/navigation/common/removedKeybindingsContribution';
+
+Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench).registerWorkbenchContribution(HistoryNavigationKeybindingsChangedContribution, LifecyclePhase.Eventually);
\ No newline at end of file
diff --git a/src/vs/workbench/parts/navigation/common/removedKeybindingsContribution.ts b/src/vs/workbench/parts/navigation/common/removedKeybindingsContribution.ts
new file mode 100644
index 00000000000..625bd33cf6c
--- /dev/null
+++ b/src/vs/workbench/parts/navigation/common/removedKeybindingsContribution.ts
@@ -0,0 +1,78 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
+import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
+import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
+import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
+import { localize } from 'vs/nls';
+import { IPreferencesService } from 'vs/workbench/services/preferences/common/preferences';
+
+// TODO@Sandeep remove me after a while
+export class HistoryNavigationKeybindingsChangedContribution implements IWorkbenchContribution {
+
+	private previousCommands: string[] = [
+
+		'search.history.showNextIncludePattern',
+		'search.history.showPreviousIncludePattern',
+		'search.history.showNextExcludePattern',
+		'search.history.showPreviousExcludePattern',
+		'search.history.showNext',
+		'search.history.showPrevious',
+		'search.replaceHistory.showNext',
+		'search.replaceHistory.showPrevious',
+
+		'find.history.showPrevious',
+		'find.history.showNext',
+
+		'workbench.action.terminal.findWidget.history.showNext',
+		'workbench.action.terminal.findWidget.history.showPrevious',
+
+		'editor.action.extensioneditor.showNextFindTerm',
+		'editor.action.extensioneditor.showPreviousFindTerm',
+
+		'editor.action.webvieweditor.showNextFindTerm',
+		'editor.action.webvieweditor.showPreviousFindTerm',
+
+		'repl.action.historyNext',
+		'repl.action.historyPrevious'
+	];
+
+	constructor(
+		@INotificationService private readonly notificationService: INotificationService,
+		@IKeybindingService private readonly keybindingService: IKeybindingService,
+		@IPreferencesService private readonly preferencesService: IPreferencesService,
+		@IStorageService private readonly storageService: IStorageService
+	) {
+		this.showRemovedWarning();
+	}
+
+	private showRemovedWarning(): void {
+		const key = 'donotshow.historyNavigation.warning';
+		if (!this.storageService.getBoolean(key, StorageScope.GLOBAL, false)) {
+			const keybindingsToRemove = this.keybindingService.getKeybindings().filter(keybinding => !keybinding.isDefault && this.previousCommands.indexOf(keybinding.command) !== -1);
+			if (keybindingsToRemove.length) {
+				const message = localize('showDeprecatedWarningMessage', "History navigation commands have changed. Please update your keybindings to use following new commands: 'history.showPrevious' and 'history.showNext'");
+				this.notificationService.prompt(Severity.Warning, message, [
+					{
+						label: localize('Open Keybindings', "Open Keybindings File"),
+						run: () => this.preferencesService.openGlobalKeybindingSettings(true)
+					},
+					{
+						label: localize('more information', "More Information..."),
+						run: () => null
+					},
+					{
+						label: localize('Do not show again', "Don't show again"),
+						isSecondary: true,
+						run: () => this.storageService.store(key, true, StorageScope.GLOBAL)
+					}
+				]);
+			}
+		}
+	}
+}
diff --git a/src/vs/workbench/parts/outline/electron-browser/media/symbol-icons.css b/src/vs/workbench/parts/outline/electron-browser/media/symbol-icons.css
deleted file mode 100644
index 2369d98e0ed..00000000000
--- a/src/vs/workbench/parts/outline/electron-browser/media/symbol-icons.css
+++ /dev/null
@@ -1,181 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-.monaco-workbench .symbol-icon {
-	display: inline-block;
-	height: 14px;
-	width: 16px;
-	min-height: 14px;
-	min-width: 16px;
-}
-
-.monaco-workbench .symbol-icon.constant {
-	background-image: url('Constant_16x.svg');
-	background-repeat: no-repeat;
-	background-position: 0 -2px;
-}
-
-.vs-dark .monaco-workbench .symbol-icon.constant, .hc-black .monaco-workbench .symbol-icon.constant {
-	background-image: url('Constant_16x_inverse.svg');
-}
-
-.monaco-workbench .symbol-icon.enum-member {
-	background-image: url('EnumItem_16x.svg');
-	background-repeat: no-repeat;
-	background-position: 0 -2px;
-}
-
-.vs-dark .monaco-workbench .symbol-icon.enum-member, .hc-black .monaco-workbench .symbol-icon.enum-member {
-	background-image: url('EnumItem_inverse_16x.svg');
-}
-
-.monaco-workbench .symbol-icon.struct {
-	background-image: url('Structure_16x_vscode.svg');
-	background-repeat: no-repeat;
-	background-position: 0 -2px;
-}
-
-.vs-dark .monaco-workbench .symbol-icon.struct, .hc-black .monaco-workbench .symbol-icon.struct {
-	background-image: url('Structure_16x_vscode_inverse.svg');
-}
-
-.monaco-workbench .symbol-icon.event {
-	background-image: url('Event_16x_vscode.svg');
-	background-repeat: no-repeat;
-	background-position: 0 -2px;
-}
-
-.vs-dark .monaco-workbench .symbol-icon.event, .hc-black .monaco-workbench .symbol-icon.event {
-	background-image: url('Event_16x_vscode_inverse.svg');
-}
-
-.monaco-workbench .symbol-icon.operator {
-	background-image: url('Operator_16x_vscode.svg');
-	background-repeat: no-repeat;
-	background-position: 0 -2px;
-}
-
-.vs-dark .monaco-workbench .symbol-icon.operator, .hc-black .monaco-workbench .symbol-icon.operator {
-	background-image: url('Operator_16x_vscode_inverse.svg');
-}
-
-.monaco-workbench .symbol-icon.type-parameter {
-	background-image: url('Template_16x_vscode.svg');
-	background-repeat: no-repeat;
-	background-position: 0 -2px;
-}
-
-.vs-dark .monaco-workbench .symbol-icon.type-parameter, .hc-black .monaco-workbench .symbol-icon.type-parameter {
-	background-image: url('Template_16x_vscode_inverse.svg');
-}
-
-.monaco-workbench .symbol-icon.method, .monaco-workbench .symbol-icon.function, .monaco-workbench .symbol-icon.constructor, .monaco-workbench .symbol-icon.field, .monaco-workbench .symbol-icon.variable, .monaco-workbench .symbol-icon.class, .monaco-workbench .symbol-icon.interface, .monaco-workbench .symbol-icon.object, .monaco-workbench .symbol-icon.namespace, .monaco-workbench .symbol-icon.package, .monaco-workbench .symbol-icon.module, .monaco-workbench .symbol-icon.property, .monaco-workbench .symbol-icon.enum, .monaco-workbench .symbol-icon.key, .monaco-workbench .symbol-icon.string, .monaco-workbench .symbol-icon.rule, .monaco-workbench .symbol-icon.file, .monaco-workbench .symbol-icon.array, .monaco-workbench .symbol-icon.number, .monaco-workbench .symbol-icon.null, .monaco-workbench .symbol-icon.boolean {
-	background-image: url('symbol-sprite.svg');
-	background-repeat: no-repeat;
-}
-
-.vs .monaco-workbench .symbol-icon.method, .vs .monaco-workbench .symbol-icon.function, .vs .monaco-workbench .symbol-icon.constructor {
-	background-position: 0 -4px;
-}
-
-.vs .monaco-workbench .symbol-icon.field, .vs .monaco-workbench .symbol-icon.variable {
-	background-position: -22px -4px;
-}
-
-.vs .monaco-workbench .symbol-icon.class {
-	background-position: -43px -3px;
-}
-
-.vs .monaco-workbench .symbol-icon.interface {
-	background-position: -63px -4px;
-}
-
-.vs .monaco-workbench .symbol-icon.object, .vs .monaco-workbench .symbol-icon.namespace, .vs .monaco-workbench .symbol-icon.package, .vs .monaco-workbench .symbol-icon.module {
-	background-position: -82px -4px;
-}
-
-.vs .monaco-workbench .symbol-icon.property {
-	background-position: -102px -3px;
-}
-
-.vs .monaco-workbench .symbol-icon.enum {
-	background-position: -122px -3px;
-}
-
-.vs .monaco-workbench .symbol-icon.key, .vs .monaco-workbench .symbol-icon.string {
-	background-position: -202px -3px;
-}
-
-.vs .monaco-workbench .symbol-icon.rule {
-	background-position: -242px -4px;
-}
-
-.vs .monaco-workbench .symbol-icon.file {
-	background-position: -262px -4px;
-}
-
-.vs .monaco-workbench .symbol-icon.array {
-	background-position: -302px -4px;
-}
-
-.vs .monaco-workbench .symbol-icon.number {
-	background-position: -322px -4px;
-}
-
-.vs .monaco-workbench .symbol-icon.null, .vs .monaco-workbench .symbol-icon.boolean {
-	background-position: -343px -4px;
-}
-
-.vs-dark .monaco-workbench .symbol-icon.method, .vs-dark .monaco-workbench .symbol-icon.function, .vs-dark .monaco-workbench .symbol-icon.constructor, .hc-black .monaco-workbench .symbol-icon.method, .hc-black .monaco-workbench .symbol-icon.function, .hc-black .monaco-workbench .symbol-icon.constructor {
-	background-position: 0 -24px;
-}
-
-.vs-dark .monaco-workbench .symbol-icon.field, .hc-black .monaco-workbench .symbol-icon.field, .vs-dark .monaco-workbench .symbol-icon.variable, .hc-black .monaco-workbench .symbol-icon.variable {
-	background-position: -22px -24px;
-}
-
-.vs-dark .monaco-workbench .symbol-icon.class, .hc-black .monaco-workbench .symbol-icon.class {
-	background-position: -43px -23px;
-}
-
-.vs-dark .monaco-workbench .symbol-icon.interface, .hc-black .monaco-workbench .symbol-icon.interface {
-	background-position: -63px -24px;
-}
-
-.vs-dark .monaco-workbench .symbol-icon.object, .vs-dark .monaco-workbench .symbol-icon.namespace, .vs-dark .monaco-workbench .symbol-icon.package, .vs-dark .monaco-workbench .symbol-icon.module, .hc-black .monaco-workbench .symbol-icon.object, .hc-black .monaco-workbench .symbol-icon.namespace, .hc-black .monaco-workbench .symbol-icon.package, .hc-black .monaco-workbench .symbol-icon.module {
-	background-position: -82px -24px;
-}
-
-.vs-dark .monaco-workbench .symbol-icon.property, .hc-black .monaco-workbench .symbol-icon.property {
-	background-position: -102px -23px;
-}
-
-.vs-dark .monaco-workbench .symbol-icon.key, .vs-dark .monaco-workbench .symbol-icon.string, .hc-black .monaco-workbench .symbol-icon.key, .hc-black .monaco-workbench .symbol-icon.string {
-	background-position: -202px -23px;
-}
-
-.vs-dark .monaco-workbench .symbol-icon.enum, .hc-black .monaco-workbench .symbol-icon.enum {
-	background-position: -122px -23px;
-}
-
-.vs-dark .monaco-workbench .symbol-icon.rule, .hc-black .monaco-workbench .symbol-icon.rule {
-	background-position: -242px -24px;
-}
-
-.vs-dark .monaco-workbench .symbol-icon.file, .hc-black .monaco-workbench .symbol-icon.file {
-	background-position: -262px -24px;
-}
-
-.vs-dark .monaco-workbench .symbol-icon.array, .hc-black .monaco-workbench .symbol-icon.array {
-	background-position: -302px -24px;
-}
-
-.vs-dark .monaco-workbench .symbol-icon.number, .hc-black .monaco-workbench .symbol-icon.number {
-	background-position: -322px -24px;
-}
-
-.vs-dark .monaco-workbench .symbol-icon.null, .vs-dark .monaco-workbench .symbol-icon.boolean, .hc-black .monaco-workbench .symbol-icon.null, .hc-black .monaco-workbench .symbol-icon.boolean {
-	background-position: -342px -24px;
-}
diff --git a/src/vs/workbench/parts/outline/electron-browser/media/symbol-sprite.svg b/src/vs/workbench/parts/outline/electron-browser/media/symbol-sprite.svg
deleted file mode 100644
index ee9a63dcf6f..00000000000
--- a/src/vs/workbench/parts/outline/electron-browser/media/symbol-sprite.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="360" height="40"><rect x="342" y="24" fill="#2D2D30" width="16" height="12"/><polygon fill="#C5C5C5" points="353,27 356,30 353,33 351,33 353,31 350,31 350,29 353,29 351,27"/><rect x="343" y="25" fill="#C5C5C5" width="14" height="10"/><polygon fill="#C5C5C5" points="356,26 350,26 350,29 349.999,29 347,29 349,27 347,27 344,30 347,33 349,33 347,31 349.999,31 350,31 350,34 356,34 356,30"/><polygon fill="#2B282E" points="350,31 347,31 349,33 347,33 344,30 347,27 349,27 347,29 350,29"/><polygon fill="#2B282E" points="351,33 353,31 350,31 350,34 356,34 356,30 353,33"/><polygon fill="#2B282E" points="356,26 356,30 353,27 351,27 353,29 350,29 350,26"/><rect x="349.999" y="29" fill="#2B282E" width=".001" height="2"/><path fill="#F6F6F6" d="M358 16h-16v-12h16v12z"/><path fill="#424242" d="M353 7l3 3-3 3h-2l2-2h-3v-2h3l-2-2h2zm4-2v10h-14v-10h14zm-1 1h-6v3h-3l2-2h-2l-3 3 3 3h2l-2-2h3v3h6v-8z"/><path fill="#F0EFF1" d="M350 11h-3l2 2h-2l-3-3 3-3h2l-2 2h3v2zm1 2l2-2h-3v3h6v-4l-3 3h-2zm5-7v4l-3-3h-2l2 2h-3v-3h6zm-6 3v2h-.001l.001-2z"/><polygon fill="#2D2D30" points="333,27 333,25 330,25 327,25 327,27 325,27 325,33 327,33 327,35 333,35 333,33 335,33 335,30 335,27"/><polygon fill="#F6F6F6" points="333,7 333,5 330,5 327,5 327,7 325,7 325,13 327,13 327,15 333,15 333,13 335,13 335,10 335,7"/><path fill="#424242" d="M334 9v-1h-2v-2h-1v2h-2v-2h-1v2h-2v1h2v2h-2v1h2v2h1v-2h2v2h1v-2h2v-1h-2v-2h2zm-3 2h-2v-2h2v2z"/><g fill="#C5C5C5"><polygon points="304,26 304,34.016 306,34.016 306,35.006 303,35.006 303,35 303,34.016 303,26 303,25 304,25 304,25 306,25 306,26"/><polygon points="312,26 312,34.016 310,34.016 310,35.006 313,35.006 313,35 313,34.016 313,26 313,25 312,25 312,25 310,25 310,26"/></g><path fill="#424242" d="M304 6v8.016h2v.99h-3v-10.006h3v1h-2zm8 0v8.016h-2v.99h3v-10.006h-3v1h2z"/><polygon fill="#2D2D30" points="292.414,24 287.586,24 286,25.586 286,28 283.586,28 282,29.586 282,33.414 283.586,35 288.414,35 290,33.414 290,31 292.414,31 294,29.414 294,25.586"/><polygon fill="#E8AB53" points="288,29 284,29 283,30 283,33 284,34 288,34 289,33 289,30"/><rect x="284" y="32" fill="#E8AB53" width="4" height="1"/><rect x="284" y="30" fill="#E8AB53" width="4" height="1"/><polygon fill="#E8AB53" points="292,25 288,25 287,26 287,28 292,28 292,29 289.414,29 290,29.586 290,30 292,30 293,29 293,26"/><rect x="288" y="26" fill="#E8AB53" width="4" height="1"/><polygon fill="#2B282E" points="292,28 292,29 289.414,29 288.414,28"/><rect x="288" y="26" fill="#2B282E" width="4" height="1"/><rect x="284" y="32" fill="#2B282E" width="4" height="1"/><rect x="284" y="30" fill="#2B282E" width="4" height="1"/><polygon fill="#F6F6F6" points="292.414,4 287.586,4 286,5.586 286,8 283.586,8 282,9.586 282,13.414 283.586,15 288.414,15 290,13.414 290,11 292.414,11 294,9.414 294,5.586"/><path fill="#C27D1A" d="M288 9h-4l-1 1v3l1 1h4l1-1v-3l-1-1zm0 4h-4v-1h4v1zm0-2h-4v-1h4v1z"/><path fill="#C27D1A" d="M292 5h-4l-1 1v2h5v1h-2.586l.586.586v.414h2l1-1v-3l-1-1zm0 2h-4v-1h4v1z"/><path fill="#F0EFF1" d="M292 8v1h-2.586l-1-1h3.586zm0-2h-4v1h4v-1zm-4 6h-4v1h4v-1zm0-2h-4v1h4v-1z"/><polygon fill="#2D2D30" points="265,35 265,24 271.414,24 275,27.586 275,35"/><polygon fill="#C5C5C5" points="271,25 266,25 266,34 274,34 274,28"/><polygon fill="#C5C5C5" points="273,29 273,33 267,33 267,26 270,26 271,26 271,28 273,28"/><polygon fill="#2B282E" points="273,29 273,33 267,33 267,26 270,26 271,26 271,28 273,28"/><path fill="#F6F6F6" d="M265 15v-11h6.414l3.586 3.586v7.414h-10z"/><path fill="#424242" d="M271 5h-5v9h8v-6l-3-3zm2 4v4h-6v-7h4v2h2v1z"/><polygon fill="#F0EFF1" points="273,9 273,13 267,13 267,6 270,6 271,6 271,8 273,8"/><polygon fill="#2D2D30" points="247,34 247,30 245,30 245,26 255,26 255,34"/><rect x="246" y="27" fill="#C5C5C5" width="8" height="2"/><rect x="248" y="30" fill="#C5C5C5" width="6" height="1"/><rect x="248" y="32" fill="#C5C5C5" width="6" height="1"/><polygon fill="#F6F6F6" points="247,14 247,10 245,10 245,6 255,6 255,14"/><path fill="#424242" d="M254 9h-8v-2h8v2zm0 1h-6v1h6v-1zm0 2h-6v1h6v-1z"/><path fill="#2D2D30" d="M230.701 35.992c-3.336 0-6.701-1.703-6.701-5.51 0-4.174 4.968-6.482 8.402-6.482 1.07 0 1.867.244 2.369.725.658.631.791 1.299.785 1.746-.013 1.176-.904 2.146-1.822 3.008 1.408.194 2.088 1.144 2.254 2.037.297 1.604-.805 3.371-2.508 4.021-.761.293-1.75.455-2.779.455z"/><path fill="#C5C5C5" d="M232.646 30.482s-1.91.459-.478-.916c1.217-1.166 3.345-2.746 1.91-4.119-1.435-1.375-9.079.455-9.079 5.035s5.734 5.037 8.124 4.121c2.391-.914 2.867-4.578-.477-4.121z"/><circle fill="#C5C5C5" cx="227.375" cy="31.343" r="1.042"/><circle fill="#C5C5C5" cx="228.416" cy="28.343" r="1.041"/><circle fill="#C5C5C5" cx="231.402" cy="27.135" r="1.041"/><circle fill="#2B282E" cx="231.402" cy="27.135" r="1.041"/><circle fill="#2B282E" cx="228.416" cy="28.343" r="1.041"/><circle fill="#2B282E" cx="227.375" cy="31.344" r="1.041"/><path fill="#F6F6F6" d="M230.701 15.992c-3.336 0-6.701-1.703-6.701-5.509 0-4.174 4.968-6.483 8.402-6.483 1.07 0 1.867.244 2.369.725.658.631.791 1.298.785 1.746-.013 1.174-.904 2.146-1.822 3.008 1.408.194 2.088 1.142 2.254 2.036.297 1.604-.805 3.371-2.508 4.022-.761.294-1.75.455-2.779.455z"/><path fill="#424242" d="M232.646 10.482s-1.91.458-.478-.916c1.217-1.167 3.345-2.747 1.91-4.12-1.433-1.375-9.078.456-9.078 5.036 0 4.581 5.734 5.038 8.124 4.122 2.39-.915 2.866-4.578-.478-4.122zm-5.271 1.902c-.574 0-1.041-.467-1.041-1.041 0-.575.467-1.042 1.041-1.042s1.041.466 1.041 1.042c0 .574-.467 1.041-1.041 1.041zm1.041-3c-.574 0-1.041-.466-1.041-1.041s.467-1.041 1.041-1.041 1.041.466 1.041 1.041-.467 1.041-1.041 1.041zm1.945-2.25c0-.575.467-1.041 1.041-1.041s1.041.466 1.041 1.041-.467 1.041-1.041 1.041-1.041-.466-1.041-1.041z"/><g fill="#F0EFF1"><circle cx="231.402" cy="7.134" r="1.041"/><circle cx="228.416" cy="8.343" r="1.041"/><circle cx="227.375" cy="11.343" r="1.041"/></g><rect x="202" y="23" fill="#2D2D30" width="16" height="14"/><rect x="203" y="24" fill="#C5C5C5" width="14" height="12"/><rect x="210" y="29" fill="#C5C5C5" width="1" height="2"/><rect x="204" y="25" fill="#2B282E" width="12" height="10"/><polygon fill="#C5C5C5" points="210,28 210,27 209,27 209,32 212,32 212,28"/><rect x="210" y="29" fill="#2B282E" width="1" height="2"/><polygon fill="#C5C5C5" points="214,29 214,31 215,31 215,32 213,32 213,28 215,28 215,29"/><polygon fill="#C5C5C5" points="208,28 208,32 205,32 205,30 206,30 206,31 207,31 207,30 206,30 206,29 205,29 205,28"/><rect x="202" y="3" fill="#F6F6F6" width="16" height="14"/><path fill="#424242" d="M203 4v12h14v-12h-14zm13 11h-12v-10h12v10zm-6-7v-1h-1v5h3v-4h-2zm1 3h-1v-2h1v2zm3-2v2h1v1h-2v-4h2v1h-1zm-6-1v4h-3v-2h1v1h1v-1h-1v-1h-1v-1h3z"/><path fill="#F0EFF1" d="M210 9h1v2h-1v-2zm-3 2v-1h-1v1h1zm9-6v10h-12v-10h12zm-8 3h-3v1h1v1h-1v2h3v-4zm4 0h-2v-1h-1v5h3v-4zm3 0h-2v4h2v-1h-1v-2h1v-1z"/><rect x="185" y="24" fill="#2D2D30" width="11" height="12"/><polygon fill="#C5C5C5" points="194,33 194,26 187,26 187,33 186,33 186,25 195,25 195,33"/><rect x="186" y="34" fill="#C5C5C5" width="1" height="1"/><rect x="188" y="34" fill="#C5C5C5" width="1" height="1"/><rect x="190" y="34" fill="#C5C5C5" width="1" height="1"/><rect x="192" y="34" fill="#C5C5C5" width="1" height="1"/><rect x="194" y="34" fill="#C5C5C5" width="1" height="1"/><rect x="187" y="26" fill="#2B282E" width="7" height="7"/><rect x="185" y="4" fill="#F6F6F6" width="11" height="12"/><path fill="#424242" d="M194 13v-7h-7v7h-1v-8h9v8h-1zm-7 2h-1v-1h1v1zm2-1h-1v1h1v-1zm2 0h-1v1h1v-1zm2 1h-1v-1h1v1zm2-1h-1v1h1v-1z"/><path fill="#F0EFF1" d="M187 13v-7h7v7h-7z"/><polygon fill="#2D2D30" points="164,35 164,24 171,24 171,25 176,25 176,28 171,28 171,29 176,29 176,35"/><rect x="171" y="26" fill="#C5C5C5" width="4" height="1"/><rect x="173" y="30" fill="#C5C5C5" width="2" height="1"/><rect x="165" y="30" fill="#C5C5C5" width="6" height="1"/><rect x="165" y="33" fill="#C5C5C5" width="4" height="1"/><rect x="171" y="33" fill="#C5C5C5" width="4" height="1"/><rect x="165" y="25" fill="#C5C5C5" width="5" height="3"/><rect x="166" y="26" fill="#C5C5C5" width="3" height="1"/><rect x="166" y="26" fill="#2B282E" width="3" height="1"/><polygon fill="#F6F6F6" points="164,15 164,4 171,4 171,5 176,5 176,8 171,8 171,9 176,9 176,15"/><path fill="#424242" d="M175 7h-4v-1h4v1zm0 3h-2v1h2v-1zm-4 0h-6v1h6v-1zm-2 3h-4v1h4v-1zm6 0h-4v1h4v-1zm-5-8v3h-5v-3h5zm-1 1h-3v1h3v-1z"/><rect x="166" y="6" fill="#F0EFF1" width="3" height="1"/><polygon fill="#2D2D30" points="154.414,24 149.586,24 148,25.586 148,28 144,28 144,35 152,35 152,31 154.414,31 156,29.414 156,25.586"/><polygon fill="#75BEFF" points="154,25 150,25 149,26 149,28 154,28 154,29 152,29 152,30 154,30 155,29 155,26"/><rect x="150" y="26" fill="#00539C" width="4" height="1"/><rect x="145" y="29" fill="#75BEFF" width="6" height="5"/><rect x="146" y="31" fill="#00539C" width="4" height="1"/><rect x="146" y="31" fill="#2B282E" width="4" height="1"/><rect x="150" y="26" fill="#2B282E" width="4" height="1"/><rect x="152" y="28" fill="#2B282E" width="2" height="1"/><polygon fill="#F6F6F6" points="154.414,4 149.586,4 148,5.586 148,8 144,8 144,15 152,15 152,11 154.414,11 156,9.414 156,5.586"/><path fill="#00539C" d="M154 5h-4l-1 1v2h5v1h-2v1h2l1-1v-3l-1-1zm0 2h-4v-1h4v1zm-9 7h6v-5h-6v5zm1-3h4v1h-4v-1z"/><g fill="#F0EFF1"><rect x="146" y="11" width="4" height="1"/><rect x="150" y="6" width="4" height="1"/><rect x="152" y="8" width="2" height="1"/></g><rect x="125" y="27" fill="#2D2D30" width="11" height="6"/><rect x="126" y="28" fill="#C5C5C5" width="9" height="4"/><rect x="127" y="30" fill="#2B282E" width="1" height="1"/><rect x="129" y="30" fill="#2B282E" width="1" height="1"/><rect x="131" y="30" fill="#2B282E" width="1" height="1"/><rect x="133" y="30" fill="#2B282E" width="1" height="1"/><rect x="127" y="29" fill="#2B282E" width="3" height="1"/><rect x="131" y="29" fill="#2B282E" width="3" height="1"/><rect x="125" y="7" fill="#F6F6F6" width="11" height="6"/><rect x="126" y="8" fill="#424242" width="9" height="4"/><rect x="127" y="10" fill="#F0EFF1" width="1" height="1"/><rect x="129" y="10" fill="#F0EFF1" width="1" height="1"/><rect x="131" y="10" fill="#F0EFF1" width="1" height="1"/><rect x="133" y="10" fill="#F0EFF1" width="1" height="1"/><rect x="127" y="9" fill="#F0EFF1" width="3" height="1"/><rect x="131" y="9" fill="#F0EFF1" width="3" height="1"/><path fill="#2D2D30" d="M110.449 23c-1.637 0-3.075.797-3.987 2.012l.001.002c-.628.836-1.014 1.863-1.014 2.986 0 .469.067.934.2 1.385l-2.907 2.908c-.687.686-1.253 2.161 0 3.414.609.609 1.244.736 1.67.736.958 0 1.621-.613 1.744-.736l2.907-2.908c.453.133.917.201 1.386.201 1.123 0 2.149-.387 2.985-1.014h.002c1.216-.911 2.013-2.352 2.013-3.986 0-2.762-2.238-5-5-5z"/><path fill="#C5C5C5" d="M114.09 26.359l-2.641 2.641-2-2 2.641-2.641c-.502-.228-1.055-.359-1.641-.359-2.209 0-4 1.791-4 4 0 .586.133 1.139.359 1.641l-3.359 3.359s-1 1 0 2h2l3.359-3.359c.502.227 1.055.359 1.641.359 2.209 0 4-1.791 4-4 0-.586-.133-1.139-.359-1.641z"/><path fill="#F6F6F6" d="M110.449 3c-1.637 0-3.075.797-3.987 2.012l.001.002c-.628.836-1.014 1.863-1.014 2.986 0 .469.067.933.2 1.385l-2.907 2.908c-.687.686-1.253 2.161 0 3.414.609.609 1.244.736 1.67.736.958 0 1.621-.613 1.744-.736l2.907-2.908c.453.133.917.201 1.386.201 1.123 0 2.149-.387 2.985-1.014l.002.001c1.216-.912 2.013-2.352 2.013-3.987 0-2.762-2.238-5-5-5z"/><path fill="#424242" d="M114.09 6.359l-2.641 2.641-2-2 2.641-2.641c-.502-.226-1.055-.359-1.641-.359-2.209 0-4 1.791-4 4 0 .586.133 1.139.359 1.64l-3.359 3.36s-1 1 0 2h2l3.359-3.36c.502.227 1.055.36 1.641.36 2.209 0 4-1.791 4-4 0-.586-.133-1.139-.359-1.641z"/><path fill="#2D2D30" d="M89 33h1v-1c0-.537.741-1.613 1-2-.259-.389-1-1.467-1-2v-1h-1v-3h1c1.969.021 3 1.277 3 3v1l1 1v2l-1 1v1c0 1.709-1.031 2.979-3 3h-1v-3z"/><path fill="#2D2D30" d="M87 33h-1v-1c0-.537-.741-1.613-1-2 .259-.389 1-1.467 1-2v-1h1v-3h-1c-1.969.021-3 1.277-3 3v1l-1 1v2l1 1v1c0 1.709 1.317 2.979 3.286 3h.714v-3z"/><path fill="#C5C5C5" d="M91 33v-1c0-.834.496-1.738 1-2-.504-.27-1-1.168-1-2v-1c0-.84-.584-1-1-1v-1c2.083 0 2 1.166 2 2v1c0 .969.703.98 1 1v2c-.322.02-1 .053-1 1v1c0 .834.083 2-2 2v-1c.833 0 1-1 1-1z"/><path fill="#C5C5C5" d="M85 33v-1c0-.834-.496-1.738-1-2 .504-.27 1-1.168 1-2v-1c0-.84.584-1 1-1v-1c-2.083 0-2 1.166-2 2v1c0 .969-.703.98-1 1v2c.322.02 1 .053 1 1v1c0 .834-.083 2 2 2v-1c-.833 0-1-1-1-1z"/><path fill="#F6F6F6" d="M89 13h1v-1c0-.537.741-1.613 1-2-.259-.389-1-1.467-1-2v-1h-1v-3h1c1.969.021 3 1.277 3 3v1l1 1v2l-1 1v1c0 1.709-1.031 2.979-3 3h-1v-3zm-2 0h-1v-1c0-.537-.741-1.613-1-2 .259-.389 1-1.467 1-2v-1h1v-3h-1c-1.969.021-3 1.277-3 3v1l-1 1v2l1 1v1c0 1.709 1.317 2.979 3.286 3h.714v-3z"/><path fill="#424242" d="M91 13v-1c0-.834.496-1.738 1-2-.504-.27-1-1.168-1-2v-1c0-.84-.584-1-1-1v-1c2.083 0 2 1.166 2 2v1c0 .969.703.98 1 1v2c-.322.02-1 .053-1 1v1c0 .834.083 2-2 2v-1c.833 0 1-1 1-1zm-6 0v-1c0-.834-.496-1.738-1-2 .504-.27 1-1.168 1-2v-1c0-.84.584-1 1-1v-1c-2.083 0-2 1.166-2 2v1c0 .969-.703.98-1 1v2c.322.02 1 .053 1 1v1c0 .834-.083 2 2 2v-1c-.833 0-1-1-1-1z"/><path fill="#2D2D30" d="M73.5 34c-1.914 0-3.601-1.242-4.227-3h-1.683c-.524.91-1.503 1.5-2.591 1.5-1.654 0-3-1.346-3-3s1.346-3 3-3c1.088 0 2.066.588 2.591 1.5h1.683c.626-1.76 2.313-3 4.227-3 2.481 0 4.5 2.018 4.5 4.5 0 2.48-2.019 4.5-4.5 4.5z"/><path fill="#75BEFF" d="M73.5 26c-1.759 0-3.204 1.309-3.449 3h-3.122c-.223-.861-.998-1.5-1.929-1.5-1.104 0-2 .895-2 2 0 1.104.896 2 2 2 .931 0 1.706-.639 1.929-1.5h3.122c.245 1.691 1.69 3 3.449 3 1.93 0 3.5-1.57 3.5-3.5 0-1.932-1.57-3.5-3.5-3.5z"/><circle fill="#75BEFF" cx="73.5" cy="29.5" r="1.5"/><circle fill="#2B282E" cx="73.5" cy="29.5" r="1.5"/><path fill="#F6F6F6" d="M73.5 14c-1.914 0-3.601-1.242-4.227-3h-1.683c-.524.91-1.503 1.5-2.591 1.5-1.654 0-3-1.346-3-3s1.346-3 3-3c1.088 0 2.066.588 2.591 1.5h1.683c.626-1.76 2.313-3 4.227-3 2.481 0 4.5 2.018 4.5 4.5 0 2.48-2.019 4.5-4.5 4.5z"/><path fill="#00539C" d="M73.5 6c-1.759 0-3.204 1.308-3.449 3h-3.122c-.223-.861-.998-1.5-1.929-1.5-1.104 0-2 .895-2 2 0 1.104.896 2 2 2 .931 0 1.706-.639 1.929-1.5h3.122c.245 1.691 1.69 3 3.449 3 1.93 0 3.5-1.57 3.5-3.5 0-1.931-1.57-3.5-3.5-3.5zm0 5c-.827 0-1.5-.674-1.5-1.5 0-.828.673-1.5 1.5-1.5s1.5.672 1.5 1.5c0 .826-.673 1.5-1.5 1.5z"/><circle fill="#F0EFF1" cx="73.5" cy="9.5" r="1.5"/><polygon fill="#2D2D30" points="58,28.586 55,25.586 53.586,27 51.414,27 52.414,26 48.414,22 47.586,22 42,27.586 42,28.414 46,32.414 48.414,30 49,30 49,35 50.586,35 53.586,38 54.414,38 58,34.414 58,33.586 55.914,31.5 58,29.414"/><polygon fill="#E8AB53" points="53.998,33.002 51,33 51,29 53,29 52,30 54,32 57,29 55,27 54,28 49,28 51,26 48,23 43,28 46,31 48,29 50,29 50,34 53,34 52,35 54,37 57,34 55,32"/><path fill="#F6F6F6" d="M58 8.586l-3-3-1.414 1.414h-2.172l1-1-4-4h-.828l-5.586 5.586v.828l4 4 2.414-2.414h.586v5h1.586l3 3h.828l3.586-3.586v-.828l-2.086-2.086 2.086-2.086v-.828z"/><polygon fill="#C27D1A" points="53.998,13.002 51,13 51,9 53,9 52,10 54,12 57,9 55,7 54,8 49,8 51,6 48,3 43,8 46,11 48,9 50,9 50,14 53,14 52,15 54,17 57,14 55,12"/><polygon fill="#2D2D30" points="29.263,24 34,26.369 34,31.605 27.209,35 26.789,35 22,32.605 22,27.369 28.739,24"/><polygon fill="#75BEFF" points="23,28 23,32 27,34 33,31 33,27 29,25"/><polygon fill="#75BEFF" points="27,29 25,28 29,26 31,27"/><polygon fill="#2B282E" points="29,26 31,27 27,29 25,28"/><path fill="#F6F6F6" d="M29.263 4l4.737 2.369v5.236l-6.791 3.395h-.42l-4.789-2.395v-5.236l6.739-3.369h.524z"/><path fill="#00539C" d="M23 8v4l4 2 6-3v-4l-4-2-6 3zm4 1l-2-1 4-2 2 1-4 2z"/><path fill="#F0EFF1" d="M29 6l2 1-4 2-2-1 4-2z"/><polygon fill="#2D2D30" points="2,27.309 2,32.691 7.209,36 7.791,36 13,32.691 13,27.309 7.791,24 7.209,24"/><polygon fill="#B180D7" points="7.5,25 3,27.857 3,32.143 7.5,35 12,32.143 12,27.857"/><polygon fill="#B180D7" points="7,33.498 4,31.593 4,28.777 7,30.684"/><polygon fill="#B180D7" points="4.642,28 7.5,26.186 10.358,28 7.5,29.814"/><polygon fill="#B180D7" points="11,31.593 8,33.498 8,30.684 11,28.777"/><polygon fill="#2B282E" points="10.358,28 7.5,29.814 4.642,28 7.5,26.186"/><polygon fill="#2B282E" points="4,28.777 7,30.684 7,33.498 4,31.593"/><polygon fill="#2B282E" points="8,33.498 8,30.684 11,28.777 11,31.593"/><polygon fill="#F6F6F6" points="2,7.308 2,12.692 7.209,16 7.791,16 13,12.692 13,7.308 7.791,4 7.209,4"/><path fill="#652D90" d="M7.5 5l-4.5 2.857v4.285l4.5 2.858 4.5-2.857v-4.286l-4.5-2.857zm-.5 8.498l-3-1.905v-2.816l3 1.905v2.816zm-2.358-5.498l2.858-1.815 2.858 1.815-2.858 1.815-2.858-1.815zm6.358 3.593l-3 1.905v-2.815l3-1.905v2.815z"/><polygon fill="#F0EFF1" points="10.358,8 7.5,9.815 4.642,8 7.5,6.185"/><polygon fill="#F0EFF1" points="4,8.777 7,10.683 7,13.498 4,11.593"/><polygon fill="#F0EFF1" points="8,13.498 8,10.683 11,8.777 11,11.593"/><path fill="#C5C5C5" d="M334 29v-1h-2v-2h-1v2h-2v-2h-1v2h-2v1h2v2h-2v1h2v2h1v-2h2v2h1v-2h2v-1h-2v-2h2zm-3 2h-2v-2h2v2z"/></svg>
\ No newline at end of file
diff --git a/src/vs/workbench/parts/outline/electron-browser/outline.contribution.ts b/src/vs/workbench/parts/outline/electron-browser/outline.contribution.ts
index b19d7aecf51..f55c83c680d 100644
--- a/src/vs/workbench/parts/outline/electron-browser/outline.contribution.ts
+++ b/src/vs/workbench/parts/outline/electron-browser/outline.contribution.ts
@@ -12,10 +12,10 @@ import { MenuRegistry } from 'vs/platform/actions/common/actions';
 import { VIEW_CONTAINER } from 'vs/workbench/parts/files/common/files';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { IConfigurationRegistry, Extensions as ConfigurationExtensions } from 'vs/platform/configuration/common/configurationRegistry';
-import { OutlineConfigKeys } from 'vs/workbench/parts/outline/electron-browser/outline';
+import { OutlineConfigKeys, OutlineViewId } from 'vs/workbench/parts/outline/electron-browser/outline';
 
 const _outlineDesc = <IViewDescriptor>{
-	id: 'code.outline',
+	id: OutlineViewId,
 	name: localize('name', "Outline"),
 	ctor: OutlinePanel,
 	container: VIEW_CONTAINER,
@@ -30,7 +30,7 @@ ViewsRegistry.registerViews([_outlineDesc]);
 
 CommandsRegistry.registerCommand('outline.focus', accessor => {
 	let viewsService = accessor.get(IViewsService);
-	return viewsService.openView(_outlineDesc.id, true);
+	return viewsService.openView(OutlineViewId, true);
 });
 
 MenuRegistry.addCommand({
@@ -42,34 +42,29 @@ MenuRegistry.addCommand({
 Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration).registerConfiguration({
 	'id': 'outline',
 	'order': 117,
+	'title': localize('outlineConfigurationTitle', "Outline"),
 	'type': 'object',
 	'properties': {
+		[OutlineConfigKeys.icons]: {
+			'description': localize('outline.showIcons', "Render Outline Elements with Icons."),
+			'type': 'boolean',
+			'default': true
+		},
 		[OutlineConfigKeys.problemsEnabled]: {
 			'description': localize('outline.showProblem', "Show Errors & Warnings on Outline Elements."),
 			'type': 'boolean',
 			'default': true
-		}
-	}
-});
-
-Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration).registerConfiguration({
-	'id': 'outline',
-	'order': 117,
-	'type': 'object',
-	'properties': {
+		},
+		[OutlineConfigKeys.problemsEnabled]: {
+			'description': localize('outline.showProblem', "Show Errors & Warnings on Outline Elements."),
+			'type': 'boolean',
+			'default': true
+		},
 		[OutlineConfigKeys.problemsColors]: {
 			'description': localize('outline.problem.colors', "Use colors for Errors & Warnings."),
 			'type': 'boolean',
 			'default': true
-		}
-	}
-});
-
-Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration).registerConfiguration({
-	'id': 'outline',
-	'order': 117,
-	'type': 'object',
-	'properties': {
+		},
 		[OutlineConfigKeys.problemsBadges]: {
 			'description': localize('outline.problems.badges', "Use badges for Errors & Warnings."),
 			'type': 'boolean',
diff --git a/src/vs/workbench/parts/outline/electron-browser/outline.ts b/src/vs/workbench/parts/outline/electron-browser/outline.ts
index d68cfaf67b9..1c48fb2e103 100644
--- a/src/vs/workbench/parts/outline/electron-browser/outline.ts
+++ b/src/vs/workbench/parts/outline/electron-browser/outline.ts
@@ -2,11 +2,17 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-
 'use strict';
 
+import { RawContextKey } from 'vs/platform/contextkey/common/contextkey';
 
-export enum OutlineConfigKeys {
+export const OutlineViewId = 'outline';
+
+export const OutlineViewFiltered = new RawContextKey('outlineFiltered', false);
+export const OutlineViewFocused = new RawContextKey('outlineFocused', false);
+
+export const enum OutlineConfigKeys {
+	'icons' = 'outline.icons',
 	'problemsEnabled' = 'outline.problems.enabled',
 	'problemsColors' = 'outline.problems.colors',
 	'problemsBadges' = 'outline.problems.badges'
diff --git a/src/vs/workbench/parts/outline/electron-browser/outlineModel.ts b/src/vs/workbench/parts/outline/electron-browser/outlineModel.ts
deleted file mode 100644
index 9497ac83d85..00000000000
--- a/src/vs/workbench/parts/outline/electron-browser/outlineModel.ts
+++ /dev/null
@@ -1,316 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-'use strict';
-
-import { DocumentSymbolProviderRegistry, SymbolInformation, DocumentSymbolProvider } from 'vs/editor/common/modes';
-import { ITextModel } from 'vs/editor/common/model';
-import { asWinJsPromise } from 'vs/base/common/async';
-import { TPromise } from 'vs/base/common/winjs.base';
-import { fuzzyScore, FuzzyScore } from 'vs/base/common/filters';
-import { IPosition } from 'vs/editor/common/core/position';
-import { Range, IRange } from 'vs/editor/common/core/range';
-import { first, size } from 'vs/base/common/collections';
-import { isFalsyOrEmpty, binarySearch } from 'vs/base/common/arrays';
-import { commonPrefixLength } from 'vs/base/common/strings';
-import { IMarker, MarkerSeverity } from 'vs/platform/markers/common/markers';
-
-export abstract class TreeElement {
-	abstract id: string;
-	abstract children: { [id: string]: TreeElement };
-	abstract parent: TreeElement | any;
-
-	static findId(candidate: SymbolInformation | string, container: TreeElement): string {
-		// complex id-computation which contains the origin/extension,
-		// the parent path, and some dedupe logic when names collide
-		let candidateId: string;
-		if (typeof candidate === 'string') {
-			candidateId = `${container.id}/${candidate}`;
-		} else {
-			candidateId = `${container.id}/${candidate.name}`;
-			if (container.children[candidateId] !== void 0) {
-				candidateId = `${container.id}/${candidate.name}_${candidate.definingRange.startLineNumber}_${candidate.definingRange.startColumn}`;
-			}
-		}
-
-		let id = candidateId;
-		for (let i = 0; container.children[id] !== void 0; i++) {
-			id = `${candidateId}_${i}`;
-		}
-
-		return id;
-	}
-
-	static getElementById(id: string, element: TreeElement): TreeElement {
-		if (!id) {
-			return undefined;
-		}
-		let len = commonPrefixLength(id, element.id);
-		if (len === id.length) {
-			return element;
-		}
-		if (len < element.id.length) {
-			return undefined;
-		}
-		for (const key in element.children) {
-			let candidate = TreeElement.getElementById(id, element.children[key]);
-			if (candidate) {
-				return candidate;
-			}
-		}
-		return undefined;
-	}
-
-	static size(element: TreeElement): number {
-		let res = 1;
-		for (const key in element.children) {
-			res += TreeElement.size(element.children[key]);
-		}
-		return res;
-	}
-}
-
-export class OutlineElement extends TreeElement {
-
-	children: { [id: string]: OutlineElement; } = Object.create(null);
-	score: FuzzyScore = [0, []];
-	marker: { count: number, topSev: MarkerSeverity };
-
-	constructor(
-		readonly id: string,
-		public parent: OutlineModel | OutlineGroup | OutlineElement,
-		readonly symbol: SymbolInformation
-	) {
-		super();
-	}
-}
-
-export class OutlineGroup extends TreeElement {
-
-	children: { [id: string]: OutlineElement; } = Object.create(null);
-
-	constructor(
-		readonly id: string,
-		public parent: OutlineModel,
-		readonly provider: DocumentSymbolProvider,
-		readonly providerIndex: number,
-	) {
-		super();
-	}
-
-	updateMatches(pattern: string, topMatch: OutlineElement): OutlineElement {
-		for (const key in this.children) {
-			topMatch = this._updateMatches(pattern, this.children[key], topMatch);
-		}
-		return topMatch;
-	}
-
-	private _updateMatches(pattern: string, item: OutlineElement, topMatch: OutlineElement): OutlineElement {
-		item.score = fuzzyScore(pattern, item.symbol.name, undefined, true);
-		if (item.score && (!topMatch || item.score[0] > topMatch.score[0])) {
-			topMatch = item;
-		}
-		for (const key in item.children) {
-			let child = item.children[key];
-			topMatch = this._updateMatches(pattern, child, topMatch);
-			if (!item.score && child.score) {
-				// don't filter parents with unfiltered children
-				item.score = [0, []];
-			}
-		}
-		return topMatch;
-	}
-
-	getItemEnclosingPosition(position: IPosition): OutlineElement {
-		return this._getItemEnclosingPosition(position, this.children);
-	}
-
-	private _getItemEnclosingPosition(position: IPosition, children: { [id: string]: OutlineElement }): OutlineElement {
-		for (let key in children) {
-			let item = children[key];
-			if (!Range.containsPosition(item.symbol.definingRange || item.symbol.location.range, position)) {
-				continue;
-			}
-			return this._getItemEnclosingPosition(position, item.children) || item;
-		}
-		return undefined;
-	}
-
-	updateMarker(marker: IMarker[]): void {
-		for (const key in this.children) {
-			this._updateMarker(marker, this.children[key]);
-		}
-	}
-
-	private _updateMarker(marker: IMarker[], item: OutlineElement): void {
-		let idx = binarySearch<IRange>(marker, item.symbol.definingRange, Range.compareRangesUsingStarts);
-		let start: number;
-		if (idx < 0) {
-			// ~idx is the index at which the symbol should be... start search from there
-			start = ~idx;
-			if (start > 0 && Range.areIntersecting(marker[start - 1], item.symbol.definingRange)) {
-				start -= 1;
-			}
-		} else {
-			start = idx;
-		}
-
-		let myMarkers: IMarker[] = [];
-		let myTopSev: MarkerSeverity;
-
-		while (start < marker.length) {
-			if (!Range.areIntersecting(marker[start], item.symbol.definingRange)) {
-				break;
-			}
-			// this marker belongs to this element and it takes it away.
-			// children of this marker might take it away again tho...
-			let myMarker = marker.splice(start, 1)[0];
-			myMarkers.push(myMarker);
-			if (!myTopSev || myMarker.severity > myTopSev) {
-				myTopSev = myMarker.severity;
-			}
-		}
-
-		// recursivion into children. this might cause myMarkers to become empty
-		// and because of that we store the top marker to which tell me what the
-		// most severe marker of my children is
-		for (const key in item.children) {
-			this._updateMarker(myMarkers, item.children[key]);
-		}
-
-		if (!myTopSev) {
-			item.marker = undefined;
-		} else {
-			item.marker = {
-				count: myMarkers.length,
-				topSev: myTopSev
-			};
-		}
-
-	}
-}
-
-export class OutlineModel extends TreeElement {
-
-	static create(textModel: ITextModel): TPromise<OutlineModel> {
-		let result = new OutlineModel(textModel);
-		let promises = DocumentSymbolProviderRegistry.ordered(textModel).map((provider, index) => {
-
-			let id = TreeElement.findId(`provider_${index}`, result);
-			let group = new OutlineGroup(id, result, provider, index);
-
-			return asWinJsPromise(token => provider.provideDocumentSymbols(result.textModel, token)).then(result => {
-				if (!isFalsyOrEmpty(result)) {
-					for (const info of result) {
-						OutlineModel._makeOutlineElement(info, group);
-					}
-				}
-				return group;
-			}, err => {
-				//todo@joh capture error in group
-				return group;
-			}).then(group => {
-				result._groups[id] = group;
-			});
-		});
-
-		return TPromise.join(promises).then(() => {
-
-			let count = 0;
-			for (const key in result._groups) {
-				let group = result._groups[key];
-				if (first(group.children) === undefined) { // empty
-					delete result._groups[key];
-				} else {
-					count += 1;
-				}
-			}
-
-			if (count !== 1) {
-				//
-				result.children = result._groups;
-
-			} else {
-				// adopt all elements of the first group
-				let group = first(result._groups);
-				for (let key in group.children) {
-					let child = group.children[key];
-					child.parent = result;
-					result.children[child.id] = child;
-				}
-			}
-
-			return result;
-		});
-	}
-
-	private static _makeOutlineElement(info: SymbolInformation, container: OutlineGroup | OutlineElement): void {
-		let id = TreeElement.findId(info, container);
-		let res = new OutlineElement(id, container, info);
-		if (info.children) {
-			for (const childInfo of info.children) {
-				OutlineModel._makeOutlineElement(childInfo, res);
-			}
-		}
-		container.children[res.id] = res;
-	}
-
-	readonly id = 'root';
-	readonly parent = undefined;
-
-	private _groups: { [id: string]: OutlineGroup; } = Object.create(null);
-	children: { [id: string]: OutlineGroup | OutlineElement; } = Object.create(null);
-
-	private constructor(readonly textModel: ITextModel) {
-		super();
-	}
-
-	dispose(): void {
-
-	}
-
-	adopt(other: OutlineModel): boolean {
-		if (this.textModel.uri.toString() !== other.textModel.uri.toString()) {
-			return false;
-		}
-		if (size(this._groups) !== size(other._groups)) {
-			return false;
-		}
-		this._groups = other._groups;
-		this.children = other.children;
-		return true;
-	}
-
-	updateMatches(pattern: string): OutlineElement {
-		let topMatch: OutlineElement;
-		for (const key in this._groups) {
-			topMatch = this._groups[key].updateMatches(pattern, topMatch);
-		}
-		return topMatch;
-	}
-
-	getItemEnclosingPosition(position: IPosition): OutlineElement {
-		for (const key in this._groups) {
-			let result = this._groups[key].getItemEnclosingPosition(position);
-			if (result) {
-				return result;
-			}
-		}
-		return undefined;
-	}
-
-	getItemById(id: string): TreeElement {
-		return TreeElement.getElementById(id, this);
-	}
-
-	updateMarker(marker: IMarker[]): void {
-		// sort markers by start range so that we can use
-		// outline element starts for quicker look up
-		marker.sort(Range.compareRangesUsingStarts);
-
-		for (const key in this._groups) {
-			this._groups[key].updateMarker(marker);
-		}
-	}
-}
diff --git a/src/vs/workbench/parts/outline/electron-browser/outlinePanel.css b/src/vs/workbench/parts/outline/electron-browser/outlinePanel.css
index c90e9218bf5..23afd397253 100644
--- a/src/vs/workbench/parts/outline/electron-browser/outlinePanel.css
+++ b/src/vs/workbench/parts/outline/electron-browser/outlinePanel.css
@@ -8,19 +8,10 @@
 	flex-direction: column;
 }
 
-.monaco-workbench .outline-panel .outline-input {
-	box-sizing: border-box;
-	padding: 5px 9px 2px 9px;
-}
-
-.monaco-workbench .outline-panel .outline-input .monaco-inputbox {
-	width: 100%;
-}
-
 .monaco-workbench .outline-panel .outline-progress {
 	width: 100%;
 	height: 2px;
-	padding-bottom: 5px;
+	padding-bottom: 3px;
 }
 
 .monaco-workbench .outline-panel .outline-progress .monaco-progress-container {
@@ -31,6 +22,29 @@
 	height: 2px;
 }
 
+.monaco-workbench .outline-panel .outline-input {
+	box-sizing: border-box;
+	padding: 2px 9px 5px 9px;
+	position: relative;
+}
+
+.monaco-workbench .outline-panel .outline-input .monaco-inputbox {
+	width: 100%;
+}
+
+.monaco-workbench .outline-panel .outline-input .monaco-inputbox .input {
+	padding-right: 22px;
+}
+
+.monaco-workbench .outline-panel .outline-input .monaco-custom-checkbox {
+	position: absolute;
+	top: 5px;
+	right: 13px;
+	bottom: 0;
+	display: flex;
+	align-items: center;
+}
+
 .monaco-workbench .outline-panel .outline-tree {
 	height: 100%;
 }
@@ -57,44 +71,17 @@
 	display: none;
 }
 
-.monaco-tree.focused .selected .outline-element-label, .monaco-tree.focused .selected .outline-element-decoration {
+.monaco-tree.focused .selected .outline-element-label, .monaco-tree.focused .selected .outline-element-decoration{
 	/* make sure selection color wins when a label is being selected */
 	color: inherit !important;
 }
 
-.monaco-workbench .outline-panel .outline-element {
-	display: flex;
-	flex: 1;
-	flex-flow: row nowrap;
-	align-items: center;
+.monaco-tree.focused .selected .outline-element-label .monaco-highlighted-label .highlight,
+.monaco-tree.focused .selected .monaco-icon-label .monaco-highlighted-label .highlight{
+	/* allows text color to use the default when selected  */
+	color: inherit !important;
 }
 
-.monaco-workbench .outline-panel .outline-element .outline-element-icon {
-	padding-right: 3px;
-}
-
-.monaco-workbench .outline-panel .outline-element .outline-element-label {
-	text-overflow: ellipsis;
-	overflow: hidden;
-	color: var(--outline-element-color);
-}
-
-.monaco-workbench .outline-panel .outline-element .outline-element-label .monaco-highlighted-label .highlight {
-	font-weight: bold;
-}
-
-.monaco-workbench .outline-panel .outline-element .outline-element-decoration {
-	opacity: 0.75;
-	font-size: 90%;
-	font-weight: 600;
-	padding: 0 12px 0 5px;
-	margin-left: auto;
-	text-align: center;
-	color: var(--outline-element-color);
-}
-
-.monaco-workbench .outline-panel .outline-element .outline-element-decoration.bubble {
-	font-family: octicons;
-	font-size: 14px;
-	opacity: 0.4;
+.monaco-workbench .outline-panel.no-icons .outline-element .outline-element-icon {
+	display: none;
 }
diff --git a/src/vs/workbench/parts/outline/electron-browser/outlinePanel.ts b/src/vs/workbench/parts/outline/electron-browser/outlinePanel.ts
index 5573d1a1c09..00b7b5a9bcd 100644
--- a/src/vs/workbench/parts/outline/electron-browser/outlinePanel.ts
+++ b/src/vs/workbench/parts/outline/electron-browser/outlinePanel.ts
@@ -4,51 +4,56 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
+import { posix } from 'path';
 import * as dom from 'vs/base/browser/dom';
 import { IKeyboardEvent } from 'vs/base/browser/keyboardEvent';
+import { StandardMouseEvent } from 'vs/base/browser/mouseEvent';
 import { Separator } from 'vs/base/browser/ui/actionbar/actionbar';
 import { InputBox } from 'vs/base/browser/ui/inputbox/inputBox';
+import { ProgressBar } from 'vs/base/browser/ui/progressbar/progressbar';
 import { Action, IAction, RadioGroup } from 'vs/base/common/actions';
+import { firstIndex } from 'vs/base/common/arrays';
+import { createCancelablePromise, TimeoutTimer } from 'vs/base/common/async';
+import { isPromiseCanceledError, onUnexpectedError } from 'vs/base/common/errors';
 import { Emitter } from 'vs/base/common/event';
 import { defaultGenerator } from 'vs/base/common/idGenerator';
 import { KeyCode } from 'vs/base/common/keyCodes';
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
+import { dispose, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
 import { LRUCache } from 'vs/base/common/map';
 import { escape } from 'vs/base/common/strings';
+import { URI } from 'vs/base/common/uri';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { ITree } from 'vs/base/parts/tree/browser/tree';
 import 'vs/css!./outlinePanel';
 import { ICodeEditor, isCodeEditor, isDiffEditor } from 'vs/editor/browser/editorBrowser';
-import { CursorChangeReason } from 'vs/editor/common/controller/cursorEvents';
+import { ServicesAccessor } from 'vs/editor/browser/editorExtensions';
 import { Range } from 'vs/editor/common/core/range';
 import { Selection } from 'vs/editor/common/core/selection';
+import { ITextModel } from 'vs/editor/common/model';
+import { IModelContentChangedEvent } from 'vs/editor/common/model/textModelEvents';
 import { DocumentSymbolProviderRegistry } from 'vs/editor/common/modes';
 import LanguageFeatureRegistry from 'vs/editor/common/modes/languageFeatureRegistry';
+import { OutlineElement, OutlineModel, TreeElement } from 'vs/editor/contrib/documentSymbols/outlineModel';
 import { localize } from 'vs/nls';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { ContextKeyExpr, IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
+import { IResourceInput } from 'vs/platform/editor/common/editor';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
+import { KeybindingsRegistry, KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
 import { WorkbenchTree } from 'vs/platform/list/browser/listService';
+import { IMarkerService, MarkerSeverity } from 'vs/platform/markers/common/markers';
 import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
 import { attachInputBoxStyler, attachProgressBarStyler } from 'vs/platform/theme/common/styler';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { CollapseAction } from 'vs/workbench/browser/viewlet';
-import { IEditorService, SIDE_GROUP, ACTIVE_GROUP } from 'vs/workbench/services/editor/common/editorService';
-import { OutlineElement, OutlineModel, TreeElement } from './outlineModel';
-import { OutlineController, OutlineDataSource, OutlineItemComparator, OutlineItemCompareType, OutlineItemFilter, OutlineRenderer, OutlineTreeState } from './outlineTree';
-import { StandardMouseEvent } from 'vs/base/browser/mouseEvent';
-import { KeyboardMapperFactory } from 'vs/workbench/services/keybinding/electron-browser/keybindingService';
-import { onUnexpectedError } from 'vs/base/common/errors';
-import { IModelContentChangedEvent } from 'vs/editor/common/model/textModelEvents';
-import { asDisposablePromise } from 'vs/base/common/async';
-import { ProgressBar } from 'vs/base/browser/ui/progressbar/progressbar';
 import { ViewletPanel } from 'vs/workbench/browser/parts/views/panelViewlet';
 import { IViewletViewOptions } from 'vs/workbench/browser/parts/views/viewsViewlet';
-import { IMarkerService, MarkerSeverity } from 'vs/platform/markers/common/markers';
-import { firstIndex } from 'vs/base/common/arrays';
-import URI from 'vs/base/common/uri';
-import { OutlineConfigKeys } from './outline';
+import { CollapseAction } from 'vs/workbench/browser/viewlet';
+import { IViewsService } from 'vs/workbench/common/views';
+import { ACTIVE_GROUP, IEditorService, SIDE_GROUP } from 'vs/workbench/services/editor/common/editorService';
+import { OutlineController, OutlineDataSource, OutlineItemComparator, OutlineItemCompareType, OutlineItemFilter, OutlineRenderer, OutlineTreeState } from '../../../../editor/contrib/documentSymbols/outlineTree';
+import { OutlineConfigKeys, OutlineViewFiltered, OutlineViewFocused, OutlineViewId } from './outline';
 
 class RequestState {
 
@@ -130,11 +135,15 @@ class RequestOracle {
 		let modeListener = codeEditor.onDidChangeModelLanguage(_ => {
 			this._callback(codeEditor, undefined);
 		});
+		let disposeListener = codeEditor.onDidDispose(() => {
+			this._callback(undefined, undefined);
+		});
 		this._sessionDisposable = {
 			dispose() {
 				contentListener.dispose();
 				clearTimeout(handle);
 				modeListener.dispose();
+				disposeListener.dispose();
 			}
 		};
 	}
@@ -142,8 +151,8 @@ class RequestOracle {
 
 class SimpleToggleAction extends Action {
 
-	constructor(label: string, checked: boolean, callback: (action: SimpleToggleAction) => any) {
-		super(`simple` + defaultGenerator.nextId(), label, undefined, true, _ => {
+	constructor(label: string, checked: boolean, callback: (action: SimpleToggleAction) => any, className?: string) {
+		super(`simple` + defaultGenerator.nextId(), label, className, true, _ => {
 			this.checked = !this.checked;
 			callback(this);
 			return undefined;
@@ -152,12 +161,14 @@ class SimpleToggleAction extends Action {
 	}
 }
 
-class OutlineState {
+
+class OutlineViewState {
 
 	private _followCursor = false;
+	private _filterOnType = true;
 	private _sortBy = OutlineItemCompareType.ByKind;
 
-	private _onDidChange = new Emitter<{ followCursor?: boolean, sortBy?: boolean }>();
+	private _onDidChange = new Emitter<{ followCursor?: boolean, sortBy?: boolean, filterOnType?: boolean }>();
 	readonly onDidChange = this._onDidChange.event;
 
 	set followCursor(value: boolean) {
@@ -171,6 +182,17 @@ class OutlineState {
 		return this._followCursor;
 	}
 
+	get filterOnType() {
+		return this._filterOnType;
+	}
+
+	set filterOnType(value) {
+		if (value !== this._filterOnType) {
+			this._filterOnType = value;
+			this._onDidChange.fire({ filterOnType: true });
+		}
+	}
+
 	set sortBy(value: OutlineItemCompareType) {
 		if (value !== this._sortBy) {
 			this._sortBy = value;
@@ -207,7 +229,7 @@ export class OutlinePanel extends ViewletPanel {
 	private _disposables = new Array<IDisposable>();
 
 	private _editorDisposables = new Array<IDisposable>();
-	private _outlineViewState = new OutlineState();
+	private _outlineViewState = new OutlineViewState();
 	private _requestOracle: RequestOracle;
 	private _cachedHeight: number;
 	private _domNode: HTMLElement;
@@ -216,10 +238,15 @@ export class OutlinePanel extends ViewletPanel {
 	private _input: InputBox;
 	private _progressBar: ProgressBar;
 	private _tree: WorkbenchTree;
+	private _treeDataSource: OutlineDataSource;
+	private _treeRenderer: OutlineRenderer;
 	private _treeFilter: OutlineItemFilter;
 	private _treeComparator: OutlineItemComparator;
 	private _treeStates = new LRUCache<string, OutlineTreeState>(10);
 
+	private readonly _contextKeyFocused: IContextKey<boolean>;
+	private readonly _contextKeyFiltered: IContextKey<boolean>;
+
 	constructor(
 		options: IViewletViewOptions,
 		@IInstantiationService private readonly _instantiationService: IInstantiationService,
@@ -228,50 +255,63 @@ export class OutlinePanel extends ViewletPanel {
 		@IEditorService private readonly _editorService: IEditorService,
 		@IMarkerService private readonly _markerService: IMarkerService,
 		@IConfigurationService private readonly _configurationService: IConfigurationService,
+		@IKeybindingService private readonly _keybindingService: IKeybindingService,
 		@IConfigurationService configurationService: IConfigurationService,
-		@IKeybindingService keybindingService: IKeybindingService,
+		@IContextKeyService contextKeyService: IContextKeyService,
 		@IContextMenuService contextMenuService: IContextMenuService,
 	) {
-		super(options, keybindingService, contextMenuService, configurationService);
-
+		super(options, _keybindingService, contextMenuService, configurationService);
 		this._outlineViewState.restore(this._storageService);
+		this._contextKeyFocused = OutlineViewFocused.bindTo(contextKeyService);
+		this._contextKeyFiltered = OutlineViewFiltered.bindTo(contextKeyService);
+		this._disposables.push(this.onDidFocus(_ => this._contextKeyFocused.set(true)));
+		this._disposables.push(this.onDidBlur(_ => this._contextKeyFocused.set(false)));
 	}
 
 	dispose(): void {
 		dispose(this._disposables);
 		dispose(this._requestOracle);
+		dispose(this._editorDisposables);
 		super.dispose();
 	}
 
 	focus(): void {
 		if (this._tree) {
+			// focus on tree and fallback to root
+			// dom node when the tree cannot take focus,
+			// e.g. when hidden
 			this._tree.domFocus();
+			if (!this._tree.isDOMFocused()) {
+				this._domNode.focus();
+			}
 		}
 	}
 
 	protected renderBody(container: HTMLElement): void {
 		this._domNode = container;
+		this._domNode.tabIndex = 0;
 		dom.addClass(container, 'outline-panel');
 
+		let progressContainer = dom.$('.outline-progress');
 		this._message = dom.$('.outline-message');
 		this._inputContainer = dom.$('.outline-input');
 
-		let progressContainer = dom.$('.outline-progress');
 		this._progressBar = new ProgressBar(progressContainer);
 		this.disposables.push(attachProgressBarStyler(this._progressBar, this._themeService));
 
 		let treeContainer = dom.$('.outline-tree');
 		dom.append(
 			container,
-			this._message, this._inputContainer, progressContainer, treeContainer
+			progressContainer, this._message, this._inputContainer, treeContainer
 		);
 
-		this._input = new InputBox(this._inputContainer, null, { placeholder: localize('filter', "Filter") });
+		this._input = new InputBox(this._inputContainer, null, {
+			placeholder: this._outlineViewState.filterOnType ? localize('filter.placeholder', "Filter") : localize('find.placeholder', "Find")
+		});
 		this._input.disable();
 
 		this.disposables.push(attachInputBoxStyler(this._input, this._themeService));
 		this.disposables.push(dom.addStandardDisposableListener(this._input.inputElement, 'keyup', event => {
-			// todo@joh make those keybindings configurable?
 			if (event.keyCode === KeyCode.DownArrow) {
 				this._tree.focusNext();
 				this._tree.domFocus();
@@ -280,7 +320,9 @@ export class OutlinePanel extends ViewletPanel {
 				this._tree.domFocus();
 			} else if (event.keyCode === KeyCode.Enter) {
 				let element = this._tree.getFocus();
-				this._revealTreeSelection(element, true, false);
+				if (element instanceof OutlineElement) {
+					this._revealTreeSelection(OutlineModel.get(element), element, true, false);
+				}
 			} else if (event.keyCode === KeyCode.Escape) {
 				this._input.value = '';
 				this._tree.domFocus();
@@ -290,8 +332,6 @@ export class OutlinePanel extends ViewletPanel {
 		const $this = this;
 		const controller = new class extends OutlineController {
 
-			private readonly _mapper = KeyboardMapperFactory.INSTANCE;
-
 			constructor() {
 				super({}, $this.configurationService);
 			}
@@ -307,32 +347,39 @@ export class OutlinePanel extends ViewletPanel {
 				// crazy -> during keydown focus moves to the input box
 				// and because of that the keyup event is handled by the
 				// input field
-				const mapping = this._mapper.getRawKeyboardMapping();
-				if (!mapping) {
-					return false;
-				}
-				const keyInfo = mapping[event.code];
-				if (keyInfo.value) {
+				if ($this._keybindingService.mightProducePrintableCharacter(event)) {
 					$this._input.focus();
 					return true;
 				}
 				return false;
 			}
 		};
-		const dataSource = new OutlineDataSource();
-		const renderer = this._instantiationService.createInstance(OutlineRenderer);
+
+		this._treeRenderer = this._instantiationService.createInstance(OutlineRenderer);
+		this._treeDataSource = new OutlineDataSource();
 		this._treeComparator = new OutlineItemComparator(this._outlineViewState.sortBy);
 		this._treeFilter = new OutlineItemFilter();
-		this._tree = this._instantiationService.createInstance(WorkbenchTree, treeContainer, { controller, dataSource, renderer, sorter: this._treeComparator, filter: this._treeFilter }, {});
+		this._tree = this._instantiationService.createInstance(WorkbenchTree, treeContainer, { controller, renderer: this._treeRenderer, dataSource: this._treeDataSource, sorter: this._treeComparator, filter: this._treeFilter }, {});
+
+		this._treeRenderer.renderProblemColors = this._configurationService.getValue(OutlineConfigKeys.problemsColors);
+		this._treeRenderer.renderProblemBadges = this._configurationService.getValue(OutlineConfigKeys.problemsBadges);
 
 		this._disposables.push(this._tree, this._input);
 		this._disposables.push(this._outlineViewState.onDidChange(this._onDidChangeUserState, this));
+
+		// feature: toggle icons
+		dom.toggleClass(this._domNode, 'no-icons', !this._configurationService.getValue(OutlineConfigKeys.icons));
+		this.disposables.push(this._configurationService.onDidChangeConfiguration(e => {
+			if (e.affectsConfiguration(OutlineConfigKeys.icons)) {
+				dom.toggleClass(this._domNode, 'no-icons', !this._configurationService.getValue(OutlineConfigKeys.icons));
+			}
+		}));
 	}
 
 	protected layoutBody(height: number = this._cachedHeight): void {
 		this._cachedHeight = height;
 		this._input.layout();
-		this._tree.layout(height - (dom.getTotalHeight(this._inputContainer) + 7 /*progressbar height, defined in outlinePanel.css*/));
+		this._tree.layout(height - (dom.getTotalHeight(this._inputContainer) + 5 /*progressbar height, defined in outlinePanel.css*/));
 	}
 
 	setVisible(visible: boolean): TPromise<void> {
@@ -361,7 +408,8 @@ export class OutlinePanel extends ViewletPanel {
 			new SimpleToggleAction(localize('sortByKind', "Sort By: Type"), this._outlineViewState.sortBy === OutlineItemCompareType.ByKind, _ => this._outlineViewState.sortBy = OutlineItemCompareType.ByKind),
 		]);
 		let result = [
-			new SimpleToggleAction(localize('live', "Follow Cursor"), this._outlineViewState.followCursor, action => this._outlineViewState.followCursor = action.checked),
+			new SimpleToggleAction(localize('followCur', "Follow Cursor"), this._outlineViewState.followCursor, action => this._outlineViewState.followCursor = action.checked),
+			new SimpleToggleAction(localize('filterOnType', "Filter on Type"), this._outlineViewState.filterOnType, action => this._outlineViewState.filterOnType = action.checked),
 			new Separator(),
 			...group.actions,
 		];
@@ -371,7 +419,7 @@ export class OutlinePanel extends ViewletPanel {
 		return result;
 	}
 
-	private _onDidChangeUserState(e: { followCursor?: boolean, sortBy?: boolean }) {
+	private _onDidChangeUserState(e: { followCursor?: boolean, sortBy?: boolean, filterOnType?: boolean }) {
 		this._outlineViewState.persist(this._storageService);
 		if (e.followCursor) {
 			// todo@joh update immediately
@@ -380,41 +428,70 @@ export class OutlinePanel extends ViewletPanel {
 			this._treeComparator.type = this._outlineViewState.sortBy;
 			this._tree.refresh(undefined, true);
 		}
+		if (e.filterOnType) {
+			this._applyTypeToFilter();
+		}
 	}
 
 	private _showMessage(message: string) {
 		dom.addClass(this._domNode, 'message');
+		this._tree.setInput(undefined);
 		this._progressBar.stop().hide();
 		this._message.innerText = escape(message);
 	}
 
-	private async _doUpdate(editor: ICodeEditor, event: IModelContentChangedEvent): TPromise<void> {
+	private static _createOutlineModel(model: ITextModel, disposables: IDisposable[]): Promise<OutlineModel> {
+		let promise = createCancelablePromise(token => OutlineModel.create(model, token));
+		disposables.push({ dispose() { promise.cancel(); } });
+		return promise.catch(err => {
+			if (!isPromiseCanceledError(err)) {
+				throw err;
+			}
+			return undefined;
+		});
+	}
+
+	private async _doUpdate(editor: ICodeEditor, event: IModelContentChangedEvent): Promise<void> {
 		dispose(this._editorDisposables);
 
 		this._editorDisposables = new Array();
-		this._input.disable();
-		this._input.value = '';
 		this._progressBar.infinite().show(150);
+		this._input.disable();
+		if (!event) {
+			this._input.value = '';
+		}
 
 		if (!editor || !DocumentSymbolProviderRegistry.has(editor.getModel())) {
 			return this._showMessage(localize('no-editor', "There are no editors open that can provide outline information."));
 		}
 
 		let textModel = editor.getModel();
-		let model = await asDisposablePromise(OutlineModel.create(textModel), undefined, this._editorDisposables).promise;
+		let loadingMessage: IDisposable;
+		let oldModel = <OutlineModel>this._tree.getInput();
+		if (!oldModel) {
+			loadingMessage = new TimeoutTimer(
+				() => this._showMessage(localize('loading', "Loading document symbols for '{0}'...", posix.basename(textModel.uri.path))),
+				100
+			);
+		}
+
+		let model = await OutlinePanel._createOutlineModel(textModel, this._editorDisposables);
+		dispose(loadingMessage);
 		if (!model) {
 			return;
 		}
 
+		if (TreeElement.empty(model)) {
+			return this._showMessage(localize('no-symbols', "No symbols found in document '{0}'", posix.basename(textModel.uri.path)));
+		}
+
 		let newSize = TreeElement.size(model);
 		if (newSize > 7500) {
 			// this is a workaround for performance issues with the tree: https://github.com/Microsoft/vscode/issues/18180
 			return this._showMessage(localize('too-many-symbols', "We are sorry, but this file is too large for showing an outline."));
 		}
 
-		this._progressBar.stop().hide();
 		dom.removeClass(this._domNode, 'message');
-		let oldModel = <OutlineModel>this._tree.getInput();
 
 		if (event && oldModel && textModel.getLineCount() >= 25) {
 			// heuristic: when the symbols-to-lines ratio changes by 50% between edits
@@ -425,17 +502,29 @@ export class OutlinePanel extends ViewletPanel {
 			let oldLength = newLength - event.changes.reduce((prev, value) => prev + value.rangeLength, 0);
 			let oldRatio = oldSize / oldLength;
 			if (newRatio <= oldRatio * 0.5 || newRatio >= oldRatio * 1.5) {
-				if (!await asDisposablePromise(
-					TPromise.timeout(2000).then(_ => true),
-					false,
-					this._editorDisposables).promise
-				) {
+
+				let waitPromise = new Promise<boolean>(resolve => {
+					let handle = setTimeout(() => {
+						handle = undefined;
+						resolve(true);
+					}, 2000);
+					this._disposables.push({
+						dispose() {
+							clearTimeout(handle);
+							resolve(false);
+						}
+					});
+				});
+
+				if (!await waitPromise) {
 					return;
 				}
 			}
 		}
 
-		if (oldModel && oldModel.adopt(model)) {
+		this._progressBar.stop().hide();
+
+		if (oldModel && oldModel.merge(model)) {
 			this._tree.refresh(undefined, true);
 			model = oldModel;
 
@@ -447,19 +536,27 @@ export class OutlinePanel extends ViewletPanel {
 			}
 			await this._tree.setInput(model);
 			let state = this._treeStates.get(model.textModel.uri.toString());
-			OutlineTreeState.restore(this._tree, state);
+			await OutlineTreeState.restore(this._tree, state, this);
 		}
 
 		this._input.enable();
 		this.layoutBody();
 
+		// transfer focus from domNode to the tree
+		if (this._domNode === document.activeElement) {
+			this._tree.domFocus();
+		}
+
 		// feature: filter on type
 		// on type -> update filters
 		// on first type -> capture tree state
 		// on erase -> restore captured tree state
 		let beforePatternState: OutlineTreeState;
-		this._editorDisposables.push(this._input.onDidChange(async pattern => {
-			if (!beforePatternState) {
+		let onInputValueChanged = async pattern => {
+
+			this._contextKeyFiltered.set(pattern.length > 0);
+
+			if (pattern && !beforePatternState) {
 				beforePatternState = OutlineTreeState.capture(this._tree);
 			}
 			let item = model.updateMatches(pattern);
@@ -472,15 +569,21 @@ export class OutlinePanel extends ViewletPanel {
 			}
 
 			if (!pattern && beforePatternState) {
-				await OutlineTreeState.restore(this._tree, beforePatternState);
+				await OutlineTreeState.restore(this._tree, beforePatternState, this);
 				beforePatternState = undefined;
 			}
-		}));
+		};
+		if (this._input.value) {
+			onInputValueChanged(this._input.value);
+		}
+		this._editorDisposables.push(this._input.onDidChange(onInputValueChanged));
+
+		this._editorDisposables.push(toDisposable(() => this._contextKeyFiltered.reset()));
 
 		// feature: reveal outline selection in editor
 		// on change -> reveal/select defining range
 		this._editorDisposables.push(this._tree.onDidChangeSelection(e => {
-			if (e.payload === this) {
+			if (e.payload === this || e.payload && e.payload.didClickOnTwistie) {
 				return;
 			}
 			let [first] = e.selection;
@@ -500,12 +603,20 @@ export class OutlinePanel extends ViewletPanel {
 					aside = !this._tree.useAltAsMultipleSelectionModifier && event.altKey || this._tree.useAltAsMultipleSelectionModifier && (event.ctrlKey || event.metaKey);
 				}
 			}
-			this._revealTreeSelection(first, focus, aside);
+			this._revealTreeSelection(model, first, focus, aside);
 		}));
 
 		// feature: reveal editor selection in outline
-		this._editorDisposables.push(editor.onDidChangeCursorSelection(e => e.reason === CursorChangeReason.Explicit && this._revealEditorSelection(model, e.selection)));
 		this._revealEditorSelection(model, editor.getSelection());
+		const versionIdThen = model.textModel.getVersionId();
+		this._editorDisposables.push(editor.onDidChangeCursorSelection(e => {
+			// first check if the document has changed and stop revealing the
+			// cursor position iff it has -> we will update/recompute the
+			// outline view then anyways
+			if (!model.textModel.isDisposed() && model.textModel.getVersionId() === versionIdThen) {
+				this._revealEditorSelection(model, e.selection);
+			}
+		}));
 
 		// feature: show markers in outline
 		const updateMarker = (e: URI[], ignoreEmpty?: boolean) => {
@@ -526,6 +637,8 @@ export class OutlinePanel extends ViewletPanel {
 
 		this._editorDisposables.push(this.configurationService.onDidChangeConfiguration(e => {
 			if (e.affectsConfiguration(OutlineConfigKeys.problemsBadges) || e.affectsConfiguration(OutlineConfigKeys.problemsColors)) {
+				this._treeRenderer.renderProblemColors = this._configurationService.getValue(OutlineConfigKeys.problemsColors);
+				this._treeRenderer.renderProblemBadges = this._configurationService.getValue(OutlineConfigKeys.problemsBadges);
 				this._tree.refresh(undefined, true);
 				return;
 			}
@@ -541,27 +654,90 @@ export class OutlinePanel extends ViewletPanel {
 		}));
 	}
 
-	private async _revealTreeSelection(element: OutlineElement, focus: boolean, aside: boolean): TPromise<void> {
-		let { range, uri } = element.symbol.location;
-		let input = this._editorService.createInput({ resource: uri });
-		await this._editorService.openEditor(input, { preserveFocus: !focus, selection: Range.collapseToStart(range), revealInCenterIfOutsideViewport: true, forceOpen: true }, aside ? SIDE_GROUP : ACTIVE_GROUP);
+	private _applyTypeToFilter(): void {
+		// depending on the user setting we filter or find elements
+		if (this._outlineViewState.filterOnType) {
+			this._treeFilter.enabled = true;
+			this._treeDataSource.filterOnScore = true;
+			this._input.setPlaceHolder(localize('filter', "Filter"));
+		} else {
+			this._treeFilter.enabled = false;
+			this._treeDataSource.filterOnScore = false;
+			this._input.setPlaceHolder(localize('find', "Find"));
+		}
+		if (this._tree.getInput()) {
+			this._tree.refresh(undefined, true);
+		}
 	}
 
-	private async _revealEditorSelection(model: OutlineModel, selection: Selection): TPromise<void> {
-		if (!this._outlineViewState.followCursor) {
+	private async _revealTreeSelection(model: OutlineModel, element: OutlineElement, focus: boolean, aside: boolean): Promise<void> {
+
+		await this._editorService.openEditor({
+			resource: model.textModel.uri,
+			options: {
+				preserveFocus: !focus,
+				selection: Range.collapseToStart(element.symbol.selectionRange),
+				revealInCenterIfOutsideViewport: true
+			}
+		} as IResourceInput, aside ? SIDE_GROUP : ACTIVE_GROUP);
+	}
+
+	private async _revealEditorSelection(model: OutlineModel, selection: Selection): Promise<void> {
+		if (!this._outlineViewState.followCursor || !this._tree.getInput() || !selection) {
 			return;
 		}
+		let [first] = this._tree.getSelection();
 		let item = model.getItemEnclosingPosition({
 			lineNumber: selection.selectionStartLineNumber,
 			column: selection.selectionStartColumn
-		});
+		}, first instanceof OutlineElement ? first : undefined);
 		if (item) {
 			await this._tree.reveal(item, .5);
 			this._tree.setFocus(item, this);
 			this._tree.setSelection([item], this);
-		} else {
-			this._tree.setSelection([], this);
+		}
+	}
+
+	focusHighlightedElement(up: boolean): void {
+		if (!this._tree.getInput()) {
+			return;
+		}
+		if (!this._tree.isDOMFocused()) {
+			this._tree.domFocus();
+			return;
+		}
+		let navi = this._tree.getNavigator(this._tree.getFocus(), false);
+		let candidate: any;
+		while (candidate = up ? navi.previous() : navi.next()) {
+			if (candidate instanceof OutlineElement && candidate.score && candidate.score[1].length > 0) {
+				this._tree.setFocus(candidate, this);
+				this._tree.reveal(candidate).then(undefined, onUnexpectedError);
+				break;
+			}
 		}
 	}
 }
 
+async function goUpOrDownToHighligthedElement(accessor: ServicesAccessor, prev: boolean) {
+	const viewsService = accessor.get(IViewsService);
+	const view = await viewsService.openView(OutlineViewId);
+	if (view instanceof OutlinePanel) {
+		view.focusHighlightedElement(prev);
+	}
+}
+
+KeybindingsRegistry.registerCommandAndKeybindingRule({
+	id: 'outline.focusDownHighlighted',
+	weight: KeybindingWeight.WorkbenchContrib,
+	primary: KeyCode.DownArrow,
+	when: ContextKeyExpr.and(OutlineViewFiltered, OutlineViewFocused),
+	handler: accessor => goUpOrDownToHighligthedElement(accessor, false)
+});
+
+KeybindingsRegistry.registerCommandAndKeybindingRule({
+	id: 'outline.focusUpHighlighted',
+	weight: KeybindingWeight.WorkbenchContrib,
+	primary: KeyCode.UpArrow,
+	when: ContextKeyExpr.and(OutlineViewFiltered, OutlineViewFocused),
+	handler: accessor => goUpOrDownToHighligthedElement(accessor, true)
+});
diff --git a/src/vs/workbench/parts/outline/electron-browser/outlineTree.ts b/src/vs/workbench/parts/outline/electron-browser/outlineTree.ts
deleted file mode 100644
index b0f473c4feb..00000000000
--- a/src/vs/workbench/parts/outline/electron-browser/outlineTree.ts
+++ /dev/null
@@ -1,313 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-'use strict';
-
-import * as dom from 'vs/base/browser/dom';
-import { IMouseEvent } from 'vs/base/browser/mouseEvent';
-import { HighlightedLabel } from 'vs/base/browser/ui/highlightedlabel/highlightedLabel';
-import { values } from 'vs/base/common/collections';
-import { onUnexpectedError } from 'vs/base/common/errors';
-import { createMatches } from 'vs/base/common/filters';
-import { TPromise } from 'vs/base/common/winjs.base';
-import { IDataSource, IFilter, IRenderer, ISorter, ITree } from 'vs/base/parts/tree/browser/tree';
-import 'vs/css!./media/symbol-icons';
-import { Range } from 'vs/editor/common/core/range';
-import { symbolKindToCssClass } from 'vs/editor/common/modes';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { OutlineElement, OutlineGroup, OutlineModel, TreeElement } from './outlineModel';
-import { getPathLabel } from 'vs/base/common/labels';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { localize } from 'vs/nls';
-import { WorkbenchTreeController } from 'vs/platform/list/browser/listService';
-import { MarkerSeverity } from 'vs/platform/markers/common/markers';
-import { listErrorForeground, listWarningForeground } from 'vs/platform/theme/common/colorRegistry';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { OutlineConfigKeys } from 'vs/workbench/parts/outline/electron-browser/outline';
-
-export enum OutlineItemCompareType {
-	ByPosition,
-	ByName,
-	ByKind
-}
-
-export class OutlineItemComparator implements ISorter {
-
-	constructor(
-		public type: OutlineItemCompareType = OutlineItemCompareType.ByPosition
-	) { }
-
-	compare(tree: ITree, a: OutlineGroup | OutlineElement, b: OutlineGroup | OutlineElement): number {
-
-		if (a instanceof OutlineGroup && b instanceof OutlineGroup) {
-			return a.providerIndex - b.providerIndex;
-		}
-
-		if (a instanceof OutlineElement && b instanceof OutlineElement) {
-			switch (this.type) {
-				case OutlineItemCompareType.ByKind:
-					return a.symbol.kind - b.symbol.kind;
-				case OutlineItemCompareType.ByName:
-					return a.symbol.name.localeCompare(b.symbol.name);
-				case OutlineItemCompareType.ByPosition:
-				default:
-					return Range.compareRangesUsingStarts(a.symbol.location.range, b.symbol.location.range);
-			}
-		}
-
-		return 0;
-	}
-}
-
-export class OutlineItemFilter implements IFilter {
-
-	isVisible(tree: ITree, element: OutlineElement | any): boolean {
-		return !(element instanceof OutlineElement) || Boolean(element.score);
-	}
-}
-
-export class OutlineDataSource implements IDataSource {
-
-	getId(tree: ITree, element: TreeElement): string {
-		return element.id;
-	}
-
-	hasChildren(tree: ITree, element: OutlineModel | OutlineGroup | OutlineElement): boolean {
-		if (element instanceof OutlineModel) {
-			return true;
-		}
-		if (element instanceof OutlineElement && !element.score) {
-			return false;
-		}
-		for (const id in element.children) {
-			if (element.children[id].score) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	async getChildren(tree: ITree, element: TreeElement): TPromise<TreeElement[]> {
-		let res = values(element.children);
-		// console.log(element.id + ' with children ' + res.length);
-		return res;
-	}
-
-	async getParent(tree: ITree, element: TreeElement | any): TPromise<TreeElement> {
-		return element.parent;
-	}
-
-	shouldAutoexpand(tree: ITree, element: TreeElement): boolean {
-		return element instanceof OutlineModel || element.parent instanceof OutlineModel || element instanceof OutlineGroup || element.parent instanceof OutlineGroup;
-	}
-}
-
-export interface OutlineTemplate {
-	labelContainer: HTMLElement;
-	label: HighlightedLabel;
-	icon?: HTMLElement;
-	decoration?: HTMLElement;
-}
-
-export class OutlineRenderer implements IRenderer {
-
-	constructor(
-		@IExtensionService readonly _extensionService: IExtensionService,
-		@IEnvironmentService readonly _environmentService: IEnvironmentService,
-		@IWorkspaceContextService readonly _contextService: IWorkspaceContextService,
-		@IThemeService readonly _themeService: IThemeService,
-		@IConfigurationService readonly _configurationService: IConfigurationService
-	) {
-		//
-	}
-
-	getHeight(tree: ITree, element: any): number {
-		return 22;
-	}
-
-	getTemplateId(tree: ITree, element: OutlineGroup | OutlineElement): string {
-		return element instanceof OutlineGroup ? 'outline-group' : 'outline-element';
-	}
-
-	renderTemplate(tree: ITree, templateId: string, container: HTMLElement): OutlineTemplate {
-		if (templateId === 'outline-element') {
-			const icon = dom.$('.outline-element-icon symbol-icon');
-			const labelContainer = dom.$('.outline-element-label');
-			const decoration = dom.$('.outline-element-decoration');
-			dom.addClass(container, 'outline-element');
-			dom.append(container, icon, labelContainer, decoration);
-			return { icon, labelContainer, label: new HighlightedLabel(labelContainer), decoration };
-		}
-		if (templateId === 'outline-group') {
-			const labelContainer = dom.$('.outline-element-label');
-			dom.addClass(container, 'outline-element');
-			dom.append(container, labelContainer);
-			return { labelContainer, label: new HighlightedLabel(labelContainer) };
-		}
-
-		throw new Error(templateId);
-	}
-
-	renderElement(tree: ITree, element: OutlineGroup | OutlineElement, templateId: string, template: OutlineTemplate): void {
-		if (element instanceof OutlineElement) {
-			template.icon.className = `outline-element-icon symbol-icon ${symbolKindToCssClass(element.symbol.kind)}`;
-			template.label.set(element.symbol.name, element.score ? createMatches(element.score[1]) : undefined, localize('outline.title', "line {0} in {1}", element.symbol.location.range.startLineNumber, getPathLabel(element.symbol.location.uri, this._contextService, this._environmentService)));
-			this._renderMarkerInfo(element, template);
-
-		}
-		if (element instanceof OutlineGroup) {
-			this._extensionService.getExtensions().then(all => {
-				let found = false;
-				for (let i = 0; !found && i < all.length; i++) {
-					const extension = all[i];
-					if (extension.id === element.provider.extensionId) {
-						template.label.set(extension.displayName);
-						break;
-					}
-				}
-			}, _err => {
-				template.label.set(element.provider.extensionId);
-			});
-		}
-	}
-
-	private _renderMarkerInfo(element: OutlineElement, template: OutlineTemplate): void {
-
-		if (!element.marker) {
-			dom.hide(template.decoration);
-			template.labelContainer.style.removeProperty('--outline-element-color');
-			return;
-		}
-
-		const { count, topSev } = element.marker;
-		const color = this._themeService.getTheme().getColor(topSev === MarkerSeverity.Error ? listErrorForeground : listWarningForeground).toString();
-
-		// color of the label
-		if (this._configurationService.getValue(OutlineConfigKeys.problemsColors)) {
-			template.labelContainer.style.setProperty('--outline-element-color', color);
-		} else {
-			template.labelContainer.style.removeProperty('--outline-element-color');
-		}
-
-		// badge with color/rollup
-		if (!this._configurationService.getValue(OutlineConfigKeys.problemsBadges)) {
-			dom.hide(template.decoration);
-
-		} else if (count > 0) {
-			dom.show(template.decoration);
-			dom.removeClass(template.decoration, 'bubble');
-			template.decoration.innerText = count < 10 ? count.toString() : '+9';
-			template.decoration.title = count === 1 ? localize('1.problem', "1 problem in this element") : localize('N.problem', "{0} problems in this element", count);
-			template.decoration.style.setProperty('--outline-element-color', color);
-
-		} else {
-			dom.show(template.decoration);
-			dom.addClass(template.decoration, 'bubble');
-			template.decoration.innerText = '\uf052';
-			template.decoration.title = localize('deep.problem', "Contains elements with problems");
-			template.decoration.style.setProperty('--outline-element-color', color);
-		}
-	}
-
-	disposeTemplate(tree: ITree, templateId: string, template: OutlineTemplate): void {
-		template.label.dispose();
-	}
-
-}
-
-export class OutlineTreeState {
-
-	readonly selected: string;
-	readonly focused: string;
-	readonly expanded: string[];
-
-	static capture(tree: ITree): OutlineTreeState {
-		// selection
-		let selected: string;
-		let element = tree.getSelection()[0];
-		if (element instanceof TreeElement) {
-			selected = element.id;
-		}
-
-		// focus
-		let focused: string;
-		element = tree.getFocus(true);
-		if (element instanceof TreeElement) {
-			focused = element.id;
-		}
-
-		// expansion
-		let expanded = new Array<string>();
-		let nav = tree.getNavigator();
-		while (nav.next()) {
-			let element = nav.current();
-			if (element instanceof TreeElement) {
-				if (tree.isExpanded(element)) {
-					expanded.push(element.id);
-				}
-			}
-		}
-		return { selected, focused, expanded };
-	}
-
-	static async restore(tree: ITree, state: OutlineTreeState): TPromise<void> {
-		let model = <OutlineModel>tree.getInput();
-		if (!state || !(model instanceof OutlineModel)) {
-			return TPromise.as(undefined);
-		}
-
-		// expansion
-		let items: TreeElement[] = [];
-		for (const id of state.expanded) {
-			let item = model.getItemById(id);
-			if (item) {
-				items.push(item);
-			}
-		}
-		await tree.collapseAll(undefined);
-		await tree.expandAll(items);
-
-		// selection & focus
-		let selected = model.getItemById(state.selected);
-		let focused = model.getItemById(state.focused);
-		tree.setSelection([selected]);
-		tree.setFocus(focused);
-	}
-}
-
-export class OutlineController extends WorkbenchTreeController {
-
-	protected onLeftClick(tree: ITree, element: any, event: IMouseEvent, origin: string = 'mouse'): boolean {
-
-		const payload = { origin: origin, originalEvent: event };
-
-		if (tree.getInput() === element) {
-			tree.clearFocus(payload);
-			tree.clearSelection(payload);
-		} else {
-			const isMouseDown = event && event.browserEvent && event.browserEvent.type === 'mousedown';
-			if (!isMouseDown) {
-				event.preventDefault(); // we cannot preventDefault onMouseDown because this would break DND otherwise
-			}
-			event.stopPropagation();
-
-			tree.domFocus();
-			tree.setSelection([element], payload);
-			tree.setFocus(element, payload);
-
-			const didClickElement = element instanceof OutlineElement && !this.isClickOnTwistie(event);
-
-			if (!didClickElement) {
-				if (tree.isExpanded(element)) {
-					tree.collapse(element).then(null, onUnexpectedError);
-				} else {
-					tree.expand(element).then(null, onUnexpectedError);
-				}
-			}
-		}
-		return true;
-	}
-}
diff --git a/src/vs/workbench/parts/outline/test/electron-browser/outlineModel.test.ts b/src/vs/workbench/parts/outline/test/electron-browser/outlineModel.test.ts
deleted file mode 100644
index fa61b3523eb..00000000000
--- a/src/vs/workbench/parts/outline/test/electron-browser/outlineModel.test.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-'use strict';
-
-import * as assert from 'assert';
-import { OutlineElement, OutlineGroup } from 'vs/workbench/parts/outline/electron-browser/outlineModel';
-import { SymbolKind, SymbolInformation } from 'vs/editor/common/modes';
-import { Range } from 'vs/editor/common/core/range';
-import URI from 'vs/base/common/uri';
-import { IMarker } from 'vs/platform/markers/common/markers';
-
-suite('OutlineModel', function () {
-
-
-	function fakeSymbolInformation(range: Range, name: string = 'foo'): SymbolInformation {
-		return {
-			name,
-			kind: SymbolKind.Boolean,
-			location: { uri: URI.parse('some:uri'), range },
-			definingRange: range
-		};
-	}
-
-	function fakeMarker(range: Range): IMarker {
-		return { ...range, owner: 'ffff', message: 'test', severity: 0, resource: null };
-	}
-
-	test.skip('OutlineElement - updateMarker', function () {
-
-		let e0 = new OutlineElement('foo1', null, fakeSymbolInformation(new Range(1, 1, 1, 10)));
-		let e1 = new OutlineElement('foo2', null, fakeSymbolInformation(new Range(2, 1, 5, 1)));
-		let e2 = new OutlineElement('foo3', null, fakeSymbolInformation(new Range(6, 1, 10, 10)));
-
-		let group = new OutlineGroup('group', null, null, 1);
-		group.children[e0.id] = e0;
-		group.children[e1.id] = e1;
-		group.children[e2.id] = e2;
-
-		const data = [fakeMarker(new Range(6, 1, 6, 7)), fakeMarker(new Range(1, 1, 1, 4)), fakeMarker(new Range(10, 2, 14, 1))];
-		data.sort(Range.compareRangesUsingStarts); // model does this
-
-		group.updateMarker(data);
-		assert.equal(e0.marker.count, 1);
-		assert.equal(e1.marker.count, 0);
-		assert.equal(e2.marker.count, 2);
-
-		group.updateMarker([]);
-		assert.equal(e0.marker.count, 0);
-		assert.equal(e1.marker.count, 0);
-		assert.equal(e2.marker.count, 0);
-	});
-
-});
diff --git a/src/vs/workbench/parts/output/browser/logViewer.ts b/src/vs/workbench/parts/output/browser/logViewer.ts
index 69588a3fd24..12786761194 100644
--- a/src/vs/workbench/parts/output/browser/logViewer.ts
+++ b/src/vs/workbench/parts/output/browser/logViewer.ts
@@ -14,22 +14,23 @@ import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { ResourceEditorInput } from 'vs/workbench/common/editor/resourceEditorInput';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { ITextModelService } from 'vs/editor/common/services/resolverService';
 import { IHashService } from 'vs/workbench/services/hash/common/hashService';
-import { LOG_SCHEME } from 'vs/workbench/parts/output/common/output';
+import { LOG_SCHEME, IOutputChannelDescriptor } from 'vs/workbench/parts/output/common/output';
 import { IEditorGroupsService } from 'vs/workbench/services/group/common/editorGroupsService';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
+import { IWindowService } from 'vs/platform/windows/common/windows';
 
 export class LogViewerInput extends ResourceEditorInput {
 
 	public static readonly ID = 'workbench.editorinputs.output';
 
-	constructor(private file: URI,
+	constructor(private outputChannelDescriptor: IOutputChannelDescriptor,
 		@ITextModelService textModelResolverService: ITextModelService,
 		@IHashService hashService: IHashService
 	) {
-		super(paths.basename(file.fsPath), paths.dirname(file.fsPath), file.with({ scheme: LOG_SCHEME }), textModelResolverService, hashService);
+		super(paths.basename(outputChannelDescriptor.file.path), paths.dirname(outputChannelDescriptor.file.path), URI.from({ scheme: LOG_SCHEME, path: outputChannelDescriptor.id }), textModelResolverService, hashService);
 	}
 
 	public getTypeId(): string {
@@ -37,7 +38,7 @@ export class LogViewerInput extends ResourceEditorInput {
 	}
 
 	public getResource(): URI {
-		return this.file;
+		return this.outputChannelDescriptor.file;
 	}
 }
 
@@ -54,9 +55,10 @@ export class LogViewer extends AbstractTextResourceEditor {
 		@IThemeService themeService: IThemeService,
 		@IEditorGroupsService editorGroupService: IEditorGroupsService,
 		@ITextFileService textFileService: ITextFileService,
-		@IEditorService editorService: IEditorService
+		@IEditorService editorService: IEditorService,
+		@IWindowService windowService: IWindowService
 	) {
-		super(LogViewer.LOG_VIEWER_EDITOR_ID, telemetryService, instantiationService, storageService, textResourceConfigurationService, themeService, editorGroupService, textFileService, editorService);
+		super(LogViewer.LOG_VIEWER_EDITOR_ID, telemetryService, instantiationService, storageService, textResourceConfigurationService, themeService, editorGroupService, textFileService, editorService, windowService);
 	}
 
 	protected getConfigurationOverrides(): IEditorOptions {
diff --git a/src/vs/workbench/parts/output/browser/outputActions.ts b/src/vs/workbench/parts/output/browser/outputActions.ts
index c73e611e656..8d4a20084d7 100644
--- a/src/vs/workbench/parts/output/browser/outputActions.ts
+++ b/src/vs/workbench/parts/output/browser/outputActions.ts
@@ -6,8 +6,9 @@
 
 import { TPromise } from 'vs/base/common/winjs.base';
 import * as nls from 'vs/nls';
+import * as aria from 'vs/base/browser/ui/aria/aria';
 import { IAction, Action } from 'vs/base/common/actions';
-import { IOutputService, OUTPUT_PANEL_ID, IOutputChannelRegistry, Extensions as OutputExt, IOutputChannelIdentifier, COMMAND_OPEN_LOG_VIEWER } from 'vs/workbench/parts/output/common/output';
+import { IOutputService, OUTPUT_PANEL_ID, IOutputChannelRegistry, Extensions as OutputExt, IOutputChannelDescriptor } from 'vs/workbench/parts/output/common/output';
 import { SelectActionItem } from 'vs/base/browser/ui/actionbar/actionbar';
 import { IPartService } from 'vs/workbench/services/part/common/partService';
 import { IPanelService } from 'vs/workbench/services/panel/common/panelService';
@@ -18,8 +19,10 @@ import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { groupBy } from 'vs/base/common/arrays';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import URI from 'vs/base/common/uri';
+import { IQuickInputService, IQuickPickItem } from 'vs/platform/quickinput/common/quickInput';
+import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
+import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { LogViewerInput } from 'vs/workbench/parts/output/browser/logViewer';
 
 export class ToggleOutputAction extends TogglePanelAction {
 
@@ -49,6 +52,7 @@ export class ClearOutputAction extends Action {
 
 	public run(): TPromise<boolean> {
 		this.outputService.getActiveChannel().clear();
+		aria.status(nls.localize('outputCleared', "Output was cleared"));
 
 		return TPromise.as(true);
 	}
@@ -110,13 +114,16 @@ export class SwitchOutputActionItem extends SelectActionItem {
 
 	private static readonly SEPARATOR = '─────────';
 
+	private outputChannels: IOutputChannelDescriptor[];
+	private logChannels: IOutputChannelDescriptor[];
+
 	constructor(
 		action: IAction,
 		@IOutputService private outputService: IOutputService,
 		@IThemeService themeService: IThemeService,
 		@IContextViewService contextViewService: IContextViewService
 	) {
-		super(null, action, [], 0, contextViewService);
+		super(null, action, [], 0, contextViewService, { ariaLabel: nls.localize('outputs', 'Outputs') });
 
 		let outputChannelRegistry = Registry.as<IOutputChannelRegistry>(OutputExt.OutputChannels);
 		this.toDispose.push(outputChannelRegistry.onDidRegisterChannel(() => this.updateOtions(this.outputService.getActiveChannel().id)));
@@ -127,31 +134,31 @@ export class SwitchOutputActionItem extends SelectActionItem {
 		this.updateOtions(this.outputService.getActiveChannel().id);
 	}
 
-	protected getActionContext(option: string): string {
-		const channel = this.outputService.getChannels().filter(channelData => channelData.label === option).pop();
+	protected getActionContext(option: string, index: number): string {
+		const channel = index < this.outputChannels.length ? this.outputChannels[index] : this.logChannels[index - this.outputChannels.length - 1];
 		return channel ? channel.id : option;
 	}
 
 	private updateOtions(selectedChannel: string): void {
-		const groups = groupBy(this.outputService.getChannels(), (c1: IOutputChannelIdentifier, c2: IOutputChannelIdentifier) => {
-			if (!c1.file && c2.file) {
+		const groups = groupBy(this.outputService.getChannelDescriptors(), (c1: IOutputChannelDescriptor, c2: IOutputChannelDescriptor) => {
+			if (!c1.log && c2.log) {
 				return -1;
 			}
-			if (c1.file && !c2.file) {
+			if (c1.log && !c2.log) {
 				return 1;
 			}
 			return 0;
 		});
-		const channels = groups[0] || [];
-		const fileChannels = groups[1] || [];
-		const showSeparator = channels.length && fileChannels.length;
-		const separatorIndex = showSeparator ? channels.length : -1;
-		const options: string[] = [...channels.map(c => c.label), ...(showSeparator ? [SwitchOutputActionItem.SEPARATOR] : []), ...fileChannels.map(c => c.label)];
+		this.outputChannels = groups[0] || [];
+		this.logChannels = groups[1] || [];
+		const showSeparator = this.outputChannels.length && this.logChannels.length;
+		const separatorIndex = showSeparator ? this.outputChannels.length : -1;
+		const options: string[] = [...this.outputChannels.map(c => c.label), ...(showSeparator ? [SwitchOutputActionItem.SEPARATOR] : []), ...this.logChannels.map(c => nls.localize('logChannel', "Log ({0})", c.label))];
 		let selected = 0;
 		if (selectedChannel) {
-			selected = channels.map(c => c.id).indexOf(selectedChannel);
+			selected = this.outputChannels.map(c => c.id).indexOf(selectedChannel);
 			if (selected === -1) {
-				selected = separatorIndex + 1 + fileChannels.map(c => c.id).indexOf(selectedChannel);
+				selected = separatorIndex + 1 + this.logChannels.map(c => c.id).indexOf(selectedChannel);
 			}
 		}
 		this.setOptions(options, Math.max(0, selected), separatorIndex !== -1 ? separatorIndex : void 0);
@@ -166,8 +173,9 @@ export class OpenLogOutputFile extends Action {
 	private disposables: IDisposable[] = [];
 
 	constructor(
-		@ICommandService private commandService: ICommandService,
-		@IOutputService private outputService: IOutputService
+		@IOutputService private outputService: IOutputService,
+		@IEditorService private editorService: IEditorService,
+		@IInstantiationService private instantiationService: IInstantiationService
 	) {
 		super(OpenLogOutputFile.ID, OpenLogOutputFile.LABEL, 'output-action open-log-file');
 		this.outputService.onActiveOutputChannel(this.update, this, this.disposables);
@@ -175,17 +183,74 @@ export class OpenLogOutputFile extends Action {
 	}
 
 	private update(): void {
-		const logFile = this.getActiveLogChannelFile();
-		this.enabled = !!logFile;
+		const outputChannelDescriptor = this.getOutputChannelDescriptor();
+		this.enabled = outputChannelDescriptor && outputChannelDescriptor.file && outputChannelDescriptor.log;
 	}
 
 	public run(): TPromise<any> {
-		return this.commandService.executeCommand(COMMAND_OPEN_LOG_VIEWER, this.getActiveLogChannelFile());
+		return this.enabled ? this.editorService.openEditor(this.instantiationService.createInstance(LogViewerInput, this.getOutputChannelDescriptor())).then(() => null) : TPromise.as(null);
 	}
 
-	private getActiveLogChannelFile(): URI {
+	private getOutputChannelDescriptor(): IOutputChannelDescriptor {
 		const channel = this.outputService.getActiveChannel();
-		const identifier = channel ? this.outputService.getChannels().filter(c => c.id === channel.id)[0] : null;
-		return identifier ? identifier.file : null;
+		return channel ? this.outputService.getChannelDescriptors().filter(c => c.id === channel.id)[0] : null;
 	}
 }
+
+export class ShowLogsOutputChannelAction extends Action {
+
+	static ID = 'workbench.action.showLogs';
+	static LABEL = nls.localize('showLogs', "Show Logs...");
+
+	constructor(id: string, label: string,
+		@IQuickInputService private quickInputService: IQuickInputService,
+		@IOutputService private outputService: IOutputService
+	) {
+		super(id, label);
+	}
+
+	run(): TPromise<void> {
+		const entries: IQuickPickItem[] = this.outputService.getChannelDescriptors().filter(c => c.file && c.log)
+			.map(({ id, label }) => (<IQuickPickItem>{ id, label }));
+
+		return this.quickInputService.pick(entries, { placeHolder: nls.localize('selectlog', "Select Log") })
+			.then(entry => {
+				if (entry) {
+					return this.outputService.showChannel(entry.id);
+				}
+				return null;
+			});
+	}
+}
+
+interface IOutputChannelQuickPickItem extends IQuickPickItem {
+	channel: IOutputChannelDescriptor;
+}
+
+export class OpenOutputLogFileAction extends Action {
+
+	static ID = 'workbench.action.openLogFile';
+	static LABEL = nls.localize('openLogFile', "Open Log File...");
+
+	constructor(id: string, label: string,
+		@IQuickInputService private quickInputService: IQuickInputService,
+		@IOutputService private outputService: IOutputService,
+		@IEditorService private editorService: IEditorService,
+		@IInstantiationService private instantiationService: IInstantiationService
+	) {
+		super(id, label);
+	}
+
+	run(): TPromise<void> {
+		const entries: IOutputChannelQuickPickItem[] = this.outputService.getChannelDescriptors().filter(c => c.file && c.log)
+			.map(channel => (<IOutputChannelQuickPickItem>{ id: channel.id, label: channel.label, channel }));
+
+		return this.quickInputService.pick(entries, { placeHolder: nls.localize('selectlogFile', "Select Log file") })
+			.then(entry => {
+				if (entry) {
+					return this.editorService.openEditor(this.instantiationService.createInstance(LogViewerInput, entry.channel)).then(() => null);
+				}
+				return null;
+			});
+	}
+}
\ No newline at end of file
diff --git a/src/vs/workbench/parts/output/browser/outputPanel.ts b/src/vs/workbench/parts/output/browser/outputPanel.ts
index a9151ee685c..4753c5b88f0 100644
--- a/src/vs/workbench/parts/output/browser/outputPanel.ts
+++ b/src/vs/workbench/parts/output/browser/outputPanel.ts
@@ -25,6 +25,7 @@ import { IConfigurationService } from 'vs/platform/configuration/common/configur
 import { IEditorGroupsService } from 'vs/workbench/services/group/common/editorGroupsService';
 import { CancellationToken } from 'vs/base/common/cancellation';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
+import { IWindowService } from 'vs/platform/windows/common/windows';
 
 export class OutputPanel extends AbstractTextResourceEditor {
 	private actions: IAction[];
@@ -41,9 +42,10 @@ export class OutputPanel extends AbstractTextResourceEditor {
 		@IContextKeyService private contextKeyService: IContextKeyService,
 		@IEditorGroupsService editorGroupService: IEditorGroupsService,
 		@ITextFileService textFileService: ITextFileService,
-		@IEditorService editorService: IEditorService
+		@IEditorService editorService: IEditorService,
+		@IWindowService windowService: IWindowService
 	) {
-		super(OUTPUT_PANEL_ID, telemetryService, instantiationService, storageService, textResourceConfigurationService, themeService, editorGroupService, textFileService, editorService);
+		super(OUTPUT_PANEL_ID, telemetryService, instantiationService, storageService, textResourceConfigurationService, themeService, editorGroupService, textFileService, editorService, windowService);
 
 		this.scopedInstantiationService = instantiationService;
 	}
@@ -65,9 +67,7 @@ export class OutputPanel extends AbstractTextResourceEditor {
 				this.instantiationService.createInstance(OpenLogOutputFile)
 			];
 
-			this.actions.forEach(a => {
-				this.toUnbind.push(a);
-			});
+			this.actions.forEach(a => this._register(a));
 		}
 
 		return this.actions;
@@ -134,8 +134,7 @@ export class OutputPanel extends AbstractTextResourceEditor {
 
 	protected createEditor(parent: HTMLElement): void {
 		// First create the scoped instantation service and only then construct the editor using the scoped service
-		const scopedContextKeyService = this.contextKeyService.createScoped(parent);
-		this.toUnbind.push(scopedContextKeyService);
+		const scopedContextKeyService = this._register(this.contextKeyService.createScoped(parent));
 		this.scopedInstantiationService = this.instantiationService.createChild(new ServiceCollection([IContextKeyService, scopedContextKeyService]));
 		super.createEditor(parent);
 
diff --git a/src/vs/workbench/parts/output/common/output.ts b/src/vs/workbench/parts/output/common/output.ts
index e28182005cf..b4f12cb355c 100644
--- a/src/vs/workbench/parts/output/common/output.ts
+++ b/src/vs/workbench/parts/output/common/output.ts
@@ -9,7 +9,7 @@ import { Event, Emitter } from 'vs/base/common/event';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
 import { RawContextKey } from 'vs/platform/contextkey/common/contextkey';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 
 /**
  * Mime type used by the output editor.
@@ -46,11 +46,6 @@ export const LOG_MODE_ID = 'log';
  */
 export const OUTPUT_PANEL_ID = 'workbench.panel.output';
 
-/**
- * Open log viewer command id
- */
-export const COMMAND_OPEN_LOG_VIEWER = 'workbench.action.openLogViewer';
-
 export const Extensions = {
 	OutputChannels: 'workbench.contributions.outputChannels'
 };
@@ -78,9 +73,9 @@ export interface IOutputService {
 	getChannel(id: string): IOutputChannel;
 
 	/**
-	 * Returns an array of all known output channels as identifiers.
+	 * Returns an array of all known output channels descriptors.
 	 */
-	getChannels(): IOutputChannelIdentifier[];
+	getChannelDescriptors(): IOutputChannelDescriptor[];
 
 	/**
 	 * Returns the currently active channel.
@@ -132,9 +127,10 @@ export interface IOutputChannel {
 	dispose(): void;
 }
 
-export interface IOutputChannelIdentifier {
+export interface IOutputChannelDescriptor {
 	id: string;
 	label: string;
+	log: boolean;
 	file?: URI;
 }
 
@@ -146,17 +142,17 @@ export interface IOutputChannelRegistry {
 	/**
 	 * Make an output channel known to the output world.
 	 */
-	registerChannel(id: string, name: string, file?: URI): void;
+	registerChannel(descriptor: IOutputChannelDescriptor): void;
 
 	/**
 	 * Returns the list of channels known to the output world.
 	 */
-	getChannels(): IOutputChannelIdentifier[];
+	getChannels(): IOutputChannelDescriptor[];
 
 	/**
 	 * Returns the channel with the passed id.
 	 */
-	getChannel(id: string): IOutputChannelIdentifier;
+	getChannel(id: string): IOutputChannelDescriptor;
 
 	/**
 	 * Remove the output channel with the passed id.
@@ -165,7 +161,7 @@ export interface IOutputChannelRegistry {
 }
 
 class OutputChannelRegistry implements IOutputChannelRegistry {
-	private channels = new Map<string, IOutputChannelIdentifier>();
+	private channels = new Map<string, IOutputChannelDescriptor>();
 
 	private readonly _onDidRegisterChannel: Emitter<string> = new Emitter<string>();
 	readonly onDidRegisterChannel: Event<string> = this._onDidRegisterChannel.event;
@@ -173,20 +169,20 @@ class OutputChannelRegistry implements IOutputChannelRegistry {
 	private readonly _onDidRemoveChannel: Emitter<string> = new Emitter<string>();
 	readonly onDidRemoveChannel: Event<string> = this._onDidRemoveChannel.event;
 
-	public registerChannel(id: string, label: string, file?: URI): void {
-		if (!this.channels.has(id)) {
-			this.channels.set(id, { id, label, file });
-			this._onDidRegisterChannel.fire(id);
+	public registerChannel(descriptor: IOutputChannelDescriptor): void {
+		if (!this.channels.has(descriptor.id)) {
+			this.channels.set(descriptor.id, descriptor);
+			this._onDidRegisterChannel.fire(descriptor.id);
 		}
 	}
 
-	public getChannels(): IOutputChannelIdentifier[] {
-		const result: IOutputChannelIdentifier[] = [];
+	public getChannels(): IOutputChannelDescriptor[] {
+		const result: IOutputChannelDescriptor[] = [];
 		this.channels.forEach(value => result.push(value));
 		return result;
 	}
 
-	public getChannel(id: string): IOutputChannelIdentifier {
+	public getChannel(id: string): IOutputChannelDescriptor {
 		return this.channels.get(id);
 	}
 
diff --git a/src/vs/workbench/parts/output/common/outputLinkComputer.ts b/src/vs/workbench/parts/output/common/outputLinkComputer.ts
index 54334478c76..b6f7c700a8b 100644
--- a/src/vs/workbench/parts/output/common/outputLinkComputer.ts
+++ b/src/vs/workbench/parts/output/common/outputLinkComputer.ts
@@ -6,9 +6,9 @@
 
 import { IMirrorModel, IWorkerContext } from 'vs/editor/common/services/editorSimpleWorker';
 import { ILink } from 'vs/editor/common/modes';
-import { TPromise } from 'vs/base/common/winjs.base';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import * as paths from 'vs/base/common/paths';
+import * as resources from 'vs/base/common/resources';
 import * as strings from 'vs/base/common/strings';
 import * as arrays from 'vs/base/common/arrays';
 import { Range } from 'vs/editor/common/core/range';
@@ -56,7 +56,7 @@ export class OutputLinkComputer {
 		return null;
 	}
 
-	public computeLinks(uri: string): TPromise<ILink[]> {
+	public computeLinks(uri: string): ILink[] {
 		const model = this.getModel(uri);
 		if (!model) {
 			return void 0;
@@ -70,7 +70,7 @@ export class OutputLinkComputer {
 			const resourceCreator: IResourceCreator = {
 				toResource: (folderRelativePath: string): URI => {
 					if (typeof folderRelativePath === 'string') {
-						return folderUri.with({ path: paths.join(folderUri.path, folderRelativePath) });
+						return resources.joinPath(folderUri, folderRelativePath);
 					}
 
 					return null;
@@ -82,7 +82,7 @@ export class OutputLinkComputer {
 			}
 		});
 
-		return TPromise.as(links);
+		return links;
 	}
 
 	public static createPatterns(workspaceFolder: URI): RegExp[] {
diff --git a/src/vs/workbench/parts/output/common/outputLinkProvider.ts b/src/vs/workbench/parts/output/common/outputLinkProvider.ts
index 8014d8bd950..54d7402f8ac 100644
--- a/src/vs/workbench/parts/output/common/outputLinkProvider.ts
+++ b/src/vs/workbench/parts/output/common/outputLinkProvider.ts
@@ -6,8 +6,8 @@
 'use strict';
 
 import { TPromise } from 'vs/base/common/winjs.base';
-import URI from 'vs/base/common/uri';
-import { RunOnceScheduler, wireCancellationToken } from 'vs/base/common/async';
+import { URI } from 'vs/base/common/uri';
+import { RunOnceScheduler } from 'vs/base/common/async';
 import { IModelService } from 'vs/editor/common/services/modelService';
 import { LinkProviderRegistry, ILink } from 'vs/editor/common/modes';
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
@@ -46,7 +46,7 @@ export class OutputLinkProvider {
 			if (!this.linkProviderRegistration) {
 				this.linkProviderRegistration = LinkProviderRegistry.register([{ language: OUTPUT_MODE_ID, scheme: '*' }, { language: LOG_MODE_ID, scheme: '*' }], {
 					provideLinks: (model, token): Thenable<ILink[]> => {
-						return wireCancellationToken(token, this.provideLinks(model.uri));
+						return this.provideLinks(model.uri);
 					}
 				});
 			}
diff --git a/src/vs/workbench/parts/output/electron-browser/output.contribution.ts b/src/vs/workbench/parts/output/electron-browser/output.contribution.ts
index 63be0b0f1c2..2b873f3b1c1 100644
--- a/src/vs/workbench/parts/output/electron-browser/output.contribution.ts
+++ b/src/vs/workbench/parts/output/electron-browser/output.contribution.ts
@@ -12,8 +12,8 @@ import { KeybindingsRegistry, IKeybindings } from 'vs/platform/keybinding/common
 import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
 import { IWorkbenchActionRegistry, Extensions as ActionExtensions } from 'vs/workbench/common/actions';
 import { OutputService, LogContentProvider } from 'vs/workbench/parts/output/electron-browser/outputServices';
-import { ToggleOutputAction, ClearOutputAction, OpenLogOutputFile } from 'vs/workbench/parts/output/browser/outputActions';
-import { OUTPUT_MODE_ID, OUTPUT_MIME, OUTPUT_PANEL_ID, IOutputService, CONTEXT_IN_OUTPUT, LOG_SCHEME, COMMAND_OPEN_LOG_VIEWER, LOG_MODE_ID, LOG_MIME, CONTEXT_ACTIVE_LOG_OUTPUT } from 'vs/workbench/parts/output/common/output';
+import { ToggleOutputAction, ClearOutputAction, OpenLogOutputFile, ShowLogsOutputChannelAction, OpenOutputLogFileAction } from 'vs/workbench/parts/output/browser/outputActions';
+import { OUTPUT_MODE_ID, OUTPUT_MIME, OUTPUT_PANEL_ID, IOutputService, CONTEXT_IN_OUTPUT, LOG_SCHEME, LOG_MODE_ID, LOG_MIME, CONTEXT_ACTIVE_LOG_OUTPUT } from 'vs/workbench/parts/output/common/output';
 import { PanelRegistry, Extensions, PanelDescriptor } from 'vs/workbench/browser/panel';
 import { CommandsRegistry, ICommandHandler } from 'vs/platform/commands/common/commands';
 import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
@@ -23,10 +23,8 @@ import { LogViewer, LogViewerInput } from 'vs/workbench/parts/output/browser/log
 import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
 import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions, IWorkbenchContribution } from 'vs/workbench/common/contributions';
 import { LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
-import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
+import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { ITextModelService } from 'vs/editor/common/services/resolverService';
-import URI from 'vs/base/common/uri';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 
 // Register Service
 registerSingleton(IOutputService, OutputService);
@@ -91,6 +89,9 @@ actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(ToggleOutputActi
 actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(ClearOutputAction, ClearOutputAction.ID, ClearOutputAction.LABEL),
 	'View: Clear Output', nls.localize('viewCategory', "View"));
 
+const devCategory = nls.localize('developer', "Developer");
+actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(ShowLogsOutputChannelAction, ShowLogsOutputChannelAction.ID, ShowLogsOutputChannelAction.LABEL), 'Developer: Show Logs...', devCategory);
+actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(OpenOutputLogFileAction, OpenOutputLogFileAction.ID, OpenOutputLogFileAction.LABEL), 'Developer: Open Log File...', devCategory);
 
 interface IActionDescriptor {
 	id: string;
@@ -180,10 +181,11 @@ registerAction({
 	}
 });
 
-CommandsRegistry.registerCommand(COMMAND_OPEN_LOG_VIEWER, function (accessor: ServicesAccessor, file: URI) {
-	if (file) {
-		const editorService = accessor.get(IEditorService);
-		return editorService.openEditor(accessor.get(IInstantiationService).createInstance(LogViewerInput, file));
-	}
-	return null;
+MenuRegistry.appendMenuItem(MenuId.MenubarViewMenu, {
+	group: '4_panels',
+	command: {
+		id: ToggleOutputAction.ID,
+		title: nls.localize({ key: 'miToggleOutput', comment: ['&& denotes a mnemonic'] }, "&&Output")
+	},
+	order: 1
 });
diff --git a/src/vs/workbench/parts/output/electron-browser/outputServices.ts b/src/vs/workbench/parts/output/electron-browser/outputServices.ts
index 32fc13e7979..4cc69a0e442 100644
--- a/src/vs/workbench/parts/output/electron-browser/outputServices.ts
+++ b/src/vs/workbench/parts/output/electron-browser/outputServices.ts
@@ -7,17 +7,16 @@ import * as nls from 'vs/nls';
 import * as paths from 'vs/base/common/paths';
 import * as strings from 'vs/base/common/strings';
 import * as extfs from 'vs/base/node/extfs';
-import * as fs from 'fs';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { Event, Emitter } from 'vs/base/common/event';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { IDisposable, dispose, Disposable, toDisposable } from 'vs/base/common/lifecycle';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { EditorOptions } from 'vs/workbench/common/editor';
-import { IOutputChannelIdentifier, IOutputChannel, IOutputService, Extensions, OUTPUT_PANEL_ID, IOutputChannelRegistry, OUTPUT_SCHEME, OUTPUT_MIME, MAX_OUTPUT_LENGTH, LOG_SCHEME, LOG_MIME, CONTEXT_ACTIVE_LOG_OUTPUT } from 'vs/workbench/parts/output/common/output';
+import { IOutputChannelDescriptor, IOutputChannel, IOutputService, Extensions, OUTPUT_PANEL_ID, IOutputChannelRegistry, OUTPUT_SCHEME, OUTPUT_MIME, LOG_SCHEME, LOG_MIME, CONTEXT_ACTIVE_LOG_OUTPUT, MAX_OUTPUT_LENGTH } from 'vs/workbench/parts/output/common/output';
 import { OutputPanel } from 'vs/workbench/parts/output/browser/outputPanel';
 import { IPanelService } from 'vs/workbench/services/panel/common/panelService';
 import { IModelService } from 'vs/editor/common/services/modelService';
@@ -33,15 +32,15 @@ import { IFileService } from 'vs/platform/files/common/files';
 import { IPanel } from 'vs/workbench/common/panel';
 import { ResourceEditorInput } from 'vs/workbench/common/editor/resourceEditorInput';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { RotatingLogger } from 'spdlog';
 import { toLocalISOString } from 'vs/base/common/date';
 import { IWindowService } from 'vs/platform/windows/common/windows';
 import { ILogService } from 'vs/platform/log/common/log';
 import { binarySearch } from 'vs/base/common/arrays';
-import { Schemas } from 'vs/base/common/network';
 import { ILifecycleService } from 'vs/platform/lifecycle/common/lifecycle';
 import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { CancellationToken } from 'vs/base/common/cancellation';
+import { OutputAppender } from 'vs/platform/output/node/outputAppender';
+import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 
 const OUTPUT_ACTIVE_CHANNEL_KEY = 'output.activechannel';
 
@@ -50,7 +49,7 @@ let callbacks: ((eventType: string, fileName: string) => void)[] = [];
 function watchOutputDirectory(outputDir: string, logService: ILogService, onChange: (eventType: string, fileName: string) => void): IDisposable {
 	callbacks.push(onChange);
 	if (!watchingOutputDir) {
-		const watcher = extfs.watch(outputDir, (eventType, fileName) => {
+		const watcherDisposable = extfs.watch(outputDir, (eventType, fileName) => {
 			for (const callback of callbacks) {
 				callback(eventType, fileName);
 			}
@@ -60,55 +59,12 @@ function watchOutputDirectory(outputDir: string, logService: ILogService, onChan
 		watchingOutputDir = true;
 		return toDisposable(() => {
 			callbacks = [];
-			if (watcher) {
-				watcher.removeAllListeners();
-				watcher.close();
-			}
+			watcherDisposable.dispose();
 		});
 	}
 	return toDisposable(() => { });
 }
 
-const fileWatchers: Map<string, any[]> = new Map<string, any[]>();
-function watchFile(file: string, callback: () => void): IDisposable {
-
-	const onFileChange = (file: string) => {
-		for (const callback of fileWatchers.get(file)) {
-			callback();
-		}
-	};
-
-	let callbacks = fileWatchers.get(file);
-	if (!callbacks) {
-		callbacks = [];
-		fileWatchers.set(file, callbacks);
-		fs.watchFile(file, { interval: 1000 }, (current, previous) => {
-			if ((previous && !current) || (!previous && !current)) {
-				onFileChange(file);
-				return;
-			}
-			if (previous && current && previous.mtime !== current.mtime) {
-				onFileChange(file);
-				return;
-			}
-		});
-	}
-	callbacks.push(callback);
-	return toDisposable(() => {
-		let allCallbacks = fileWatchers.get(file);
-		allCallbacks.splice(allCallbacks.indexOf(callback), 1);
-		if (!allCallbacks.length) {
-			fs.unwatchFile(file);
-			fileWatchers.delete(file);
-		}
-	});
-}
-
-function unWatchAllFiles(): void {
-	fileWatchers.forEach((value, file) => fs.unwatchFile(file));
-	fileWatchers.clear();
-}
-
 interface OutputChannel extends IOutputChannel {
 	readonly file: URI;
 	readonly onDidAppendedContent: Event<void>;
@@ -126,6 +82,7 @@ abstract class AbstractFileOutputChannel extends Disposable {
 	protected _onDispose: Emitter<void> = new Emitter<void>();
 	readonly onDispose: Event<void> = this._onDispose.event;
 
+	private readonly mimeType: string;
 	protected modelUpdater: RunOnceScheduler;
 	protected model: ITextModel;
 	readonly file: URI;
@@ -134,30 +91,31 @@ abstract class AbstractFileOutputChannel extends Disposable {
 	protected endOffset: number = 0;
 
 	constructor(
-		protected readonly outputChannelIdentifier: IOutputChannelIdentifier,
+		readonly outputChannelDescriptor: IOutputChannelDescriptor,
 		private readonly modelUri: URI,
-		private mimeType: string,
 		protected fileService: IFileService,
 		protected modelService: IModelService,
 		protected modeService: IModeService,
 	) {
 		super();
-		this.file = this.outputChannelIdentifier.file;
+		this.mimeType = outputChannelDescriptor.log ? LOG_MIME : OUTPUT_MIME;
+		this.file = this.outputChannelDescriptor.file;
 		this.modelUpdater = new RunOnceScheduler(() => this.updateModel(), 300);
 		this._register(toDisposable(() => this.modelUpdater.cancel()));
 	}
 
 	get id(): string {
-		return this.outputChannelIdentifier.id;
+		return this.outputChannelDescriptor.id;
 	}
 
 	get label(): string {
-		return this.outputChannelIdentifier.label;
+		return this.outputChannelDescriptor.label;
 	}
 
 	clear(): void {
 		if (this.modelUpdater.isScheduled()) {
 			this.modelUpdater.cancel();
+			this.onUpdateModelCancelled();
 		}
 		if (this.model) {
 			this.model.setValue('');
@@ -192,6 +150,7 @@ abstract class AbstractFileOutputChannel extends Disposable {
 
 	protected onModelCreated(model: ITextModel) { }
 	protected onModelWillDispose(model: ITextModel) { }
+	protected onUpdateModelCancelled() { }
 	protected updateModel() { }
 
 	dispose(): void {
@@ -205,14 +164,14 @@ abstract class AbstractFileOutputChannel extends Disposable {
  */
 class OutputChannelBackedByFile extends AbstractFileOutputChannel implements OutputChannel {
 
-	private outputWriter: RotatingLogger;
+	private appender: OutputAppender;
 	private appendedMessage = '';
 	private loadingFromFileInProgress: boolean = false;
 	private resettingDelayer: ThrottledDelayer<void>;
 	private readonly rotatingFilePath: string;
 
 	constructor(
-		outputChannelIdentifier: IOutputChannelIdentifier,
+		outputChannelDescriptor: IOutputChannelDescriptor,
 		outputDir: string,
 		modelUri: URI,
 		@IFileService fileService: IFileService,
@@ -220,12 +179,11 @@ class OutputChannelBackedByFile extends AbstractFileOutputChannel implements Out
 		@IModeService modeService: IModeService,
 		@ILogService logService: ILogService
 	) {
-		super({ ...outputChannelIdentifier, file: URI.file(paths.join(outputDir, `${outputChannelIdentifier.id}.log`)) }, modelUri, OUTPUT_MIME, fileService, modelService, modeService);
+		super({ ...outputChannelDescriptor, file: URI.file(paths.join(outputDir, `${outputChannelDescriptor.id}.log`)) }, modelUri, fileService, modelService, modeService);
 
 		// Use one rotating file to check for main file reset
-		this.outputWriter = new RotatingLogger(this.id, this.file.fsPath, 1024 * 1024 * 30, 1);
-		this.outputWriter.clearFormatters();
-		this.rotatingFilePath = `${outputChannelIdentifier.id}.1.log`;
+		this.appender = new OutputAppender(this.id, this.file.fsPath);
+		this.rotatingFilePath = `${outputChannelDescriptor.id}.1.log`;
 		this._register(watchOutputDirectory(paths.dirname(this.file.fsPath), logService, (eventType, file) => this.onFileChangedInOutputDirector(eventType, file)));
 
 		this.resettingDelayer = new ThrottledDelayer<void>(50);
@@ -288,7 +246,7 @@ class OutputChannelBackedByFile extends AbstractFileOutputChannel implements Out
 	}
 
 	private loadFile(): TPromise<string> {
-		return this.fileService.resolveContent(this.file, { position: this.startOffset })
+		return this.fileService.resolveContent(this.file, { position: this.startOffset, encoding: 'utf8' })
 			.then(content => this.appendedMessage ? content.value + this.appendedMessage : content.value);
 	}
 
@@ -307,38 +265,57 @@ class OutputChannelBackedByFile extends AbstractFileOutputChannel implements Out
 	}
 
 	private write(content: string): void {
-		this.outputWriter.critical(content);
+		this.appender.append(content);
 	}
 
 	private flush(): void {
-		this.outputWriter.flush();
+		this.appender.flush();
 	}
 }
 
 class OutputFileListener extends Disposable {
 
-	private readonly _onDidChange: Emitter<void> = new Emitter<void>();
-	readonly onDidContentChange: Event<void> = this._onDidChange.event;
+	private readonly _onDidContentChange: Emitter<number> = new Emitter<number>();
+	readonly onDidContentChange: Event<number> = this._onDidContentChange.event;
 
 	private watching: boolean = false;
-	private disposables: IDisposable[] = [];
+	private syncDelayer: ThrottledDelayer<void>;
+	private etag: string;
 
 	constructor(
 		private readonly file: URI,
+		private readonly fileService: IFileService
 	) {
 		super();
+		this.syncDelayer = new ThrottledDelayer<void>(500);
 	}
 
-	watch(): void {
+	watch(eTag: string): void {
 		if (!this.watching) {
-			this.disposables.push(watchFile(this.file.fsPath, () => this._onDidChange.fire()));
+			this.etag = eTag;
+			this.poll();
 			this.watching = true;
 		}
 	}
 
+	private poll(): void {
+		const loop = () => this.doWatch().then(() => this.poll());
+		this.syncDelayer.trigger(loop);
+	}
+
+	private doWatch(): TPromise<void> {
+		return this.fileService.resolveFile(this.file)
+			.then(stat => {
+				if (stat.etag !== this.etag) {
+					this.etag = stat.etag;
+					this._onDidContentChange.fire(stat.size);
+				}
+			});
+	}
+
 	unwatch(): void {
 		if (this.watching) {
-			this.disposables = dispose(this.disposables);
+			this.syncDelayer.cancel();
 			this.watching = false;
 		}
 	}
@@ -357,26 +334,27 @@ class FileOutputChannel extends AbstractFileOutputChannel implements OutputChann
 	private readonly fileHandler: OutputFileListener;
 
 	private updateInProgress: boolean = false;
+	private etag: string = '';
 
 	constructor(
-		outputChannelIdentifier: IOutputChannelIdentifier,
+		outputChannelDescriptor: IOutputChannelDescriptor,
 		modelUri: URI,
 		@IFileService fileService: IFileService,
 		@IModelService modelService: IModelService,
-		@IModeService modeService: IModeService,
-		@ILogService logService: ILogService,
+		@IModeService modeService: IModeService
 	) {
-		super(outputChannelIdentifier, modelUri, LOG_MIME, fileService, modelService, modeService);
+		super(outputChannelDescriptor, modelUri, fileService, modelService, modeService);
 
-		this.fileHandler = this._register(new OutputFileListener(this.file));
-		this._register(this.fileHandler.onDidContentChange(() => this.onDidContentChange()));
+		this.fileHandler = this._register(new OutputFileListener(this.file, this.fileService));
+		this._register(this.fileHandler.onDidContentChange(size => this.onDidContentChange(size)));
 		this._register(toDisposable(() => this.fileHandler.unwatch()));
 	}
 
 	loadModel(): TPromise<ITextModel> {
-		return this.fileService.resolveContent(this.file, { position: this.startOffset })
+		return this.fileService.resolveContent(this.file, { position: this.startOffset, encoding: 'utf8' })
 			.then(content => {
 				this.endOffset = this.startOffset + Buffer.from(content.value).byteLength;
+				this.etag = content.etag;
 				return this.createModel(content.value);
 			});
 	}
@@ -387,8 +365,9 @@ class FileOutputChannel extends AbstractFileOutputChannel implements OutputChann
 
 	protected updateModel(): void {
 		if (this.model) {
-			this.fileService.resolveContent(this.file, { position: this.endOffset })
+			this.fileService.resolveContent(this.file, { position: this.endOffset, encoding: 'utf8' })
 				.then(content => {
+					this.etag = content.etag;
 					if (content.value) {
 						this.endOffset = this.endOffset + Buffer.from(content.value).byteLength;
 						this.appendToModel(content.value);
@@ -401,16 +380,24 @@ class FileOutputChannel extends AbstractFileOutputChannel implements OutputChann
 	}
 
 	protected onModelCreated(model: ITextModel): void {
-		this.fileHandler.watch();
+		this.fileHandler.watch(this.etag);
 	}
 
 	protected onModelWillDispose(model: ITextModel): void {
 		this.fileHandler.unwatch();
 	}
 
-	private onDidContentChange(): void {
+	protected onUpdateModelCancelled(): void {
+		this.updateInProgress = false;
+	}
+
+	private onDidContentChange(size: number): void {
 		if (!this.updateInProgress) {
 			this.updateInProgress = true;
+			if (this.endOffset > size) { // Reset - Content is removed
+				this.startOffset = this.endOffset = 0;
+				this.model.setValue('');
+			}
 			this.modelUpdater.schedule();
 		}
 	}
@@ -439,6 +426,7 @@ export class OutputService extends Disposable implements IOutputService, ITextMo
 		@IEnvironmentService environmentService: IEnvironmentService,
 		@IWindowService windowService: IWindowService,
 		@ILogService private logService: ILogService,
+		@ITelemetryService private telemetryService: ITelemetryService,
 		@ILifecycleService private lifecycleService: ILifecycleService,
 		@IContextKeyService private contextKeyService: IContextKeyService,
 	) {
@@ -460,11 +448,9 @@ export class OutputService extends Disposable implements IOutputService, ITextMo
 		panelService.onDidPanelOpen(this.onDidPanelOpen, this);
 		panelService.onDidPanelClose(this.onDidPanelClose, this);
 
-		this._register(toDisposable(() => unWatchAllFiles()));
-
 		// Set active channel to first channel if not set
 		if (!this.activeChannel) {
-			const channels = this.getChannels();
+			const channels = this.getChannelDescriptors();
 			this.activeChannel = channels && channels.length > 0 ? this.getChannel(channels[0].id) : null;
 		}
 
@@ -499,7 +485,7 @@ export class OutputService extends Disposable implements IOutputService, ITextMo
 		return this.channels.get(id);
 	}
 
-	getChannels(): IOutputChannelIdentifier[] {
+	getChannelDescriptors(): IOutputChannelDescriptor[] {
 		return Registry.as<IOutputChannelRegistry>(Extensions.OutputChannels).getChannels();
 	}
 
@@ -559,7 +545,7 @@ export class OutputService extends Disposable implements IOutputService, ITextMo
 		channel.onDispose(() => {
 			Registry.as<IOutputChannelRegistry>(Extensions.OutputChannels).removeChannel(id);
 			if (this.activeChannel === channel) {
-				const channels = this.getChannels();
+				const channels = this.getChannelDescriptors();
 				if (this.isPanelShown() && channels.length) {
 					this.doShowChannel(this.getChannel(channels[0].id), true);
 					this._onActiveOutputChannel.fire(channels[0].id);
@@ -589,13 +575,17 @@ export class OutputService extends Disposable implements IOutputService, ITextMo
 		} catch (e) {
 			// Do not crash if spdlog rotating logger cannot be loaded (workaround for https://github.com/Microsoft/vscode/issues/47883)
 			this.logService.error(e);
+			/* __GDPR__
+				"output.channel.creation.error" : {}
+			*/
+			this.telemetryService.publicLog('output.channel.creation.error');
 			return this.instantiationService.createInstance(BufferredOutputChannel, { id, label: channelData ? channelData.label : '' });
 		}
 	}
 
 	private doShowChannel(channel: IOutputChannel, preserveFocus: boolean): Thenable<void> {
 		if (this._outputPanel) {
-			CONTEXT_ACTIVE_LOG_OUTPUT.bindTo(this.contextKeyService).set(channel instanceof FileOutputChannel);
+			CONTEXT_ACTIVE_LOG_OUTPUT.bindTo(this.contextKeyService).set(channel instanceof FileOutputChannel && channel.outputChannelDescriptor.log);
 			return this._outputPanel.setInput(this.createInput(channel), EditorOptions.create({ preserveFocus: preserveFocus }), CancellationToken.None)
 				.then(() => {
 					if (!preserveFocus) {
@@ -635,6 +625,7 @@ export class LogContentProvider {
 	private channels: Map<string, OutputChannel> = new Map<string, OutputChannel>();
 
 	constructor(
+		@IOutputService private outputService: IOutputService,
 		@IInstantiationService private instantiationService: IInstantiationService
 	) {
 	}
@@ -650,13 +641,16 @@ export class LogContentProvider {
 	}
 
 	private getChannel(resource: URI): OutputChannel {
-		const id = resource.path;
-		let channel = this.channels.get(id);
+		const channelId = resource.path;
+		let channel = this.channels.get(channelId);
 		if (!channel) {
 			const channelDisposables: IDisposable[] = [];
-			channel = this.instantiationService.createInstance(FileOutputChannel, { id, label: '', file: resource.with({ scheme: Schemas.file }) }, resource);
-			channel.onDispose(() => dispose(channelDisposables), channelDisposables);
-			this.channels.set(id, channel);
+			const outputChannelDescriptor = this.outputService.getChannelDescriptors().filter(({ id }) => id === channelId)[0];
+			if (outputChannelDescriptor && outputChannelDescriptor.file) {
+				channel = this.instantiationService.createInstance(FileOutputChannel, outputChannelDescriptor, resource);
+				channel.onDispose(() => dispose(channelDisposables), channelDisposables);
+				this.channels.set(channelId, channel);
+			}
 		}
 		return channel;
 	}
@@ -681,7 +675,7 @@ class BufferredOutputChannel extends Disposable implements OutputChannel {
 	private lastReadId: number = void 0;
 
 	constructor(
-		protected readonly outputChannelIdentifier: IOutputChannelIdentifier,
+		protected readonly outputChannelIdentifier: IOutputChannelDescriptor,
 		@IModelService private modelService: IModelService,
 		@IModeService private modeService: IModeService
 	) {
diff --git a/src/vs/workbench/parts/output/test/outputLinkProvider.test.ts b/src/vs/workbench/parts/output/test/outputLinkProvider.test.ts
index 7e7f988fbf9..40a8f72192f 100644
--- a/src/vs/workbench/parts/output/test/outputLinkProvider.test.ts
+++ b/src/vs/workbench/parts/output/test/outputLinkProvider.test.ts
@@ -6,7 +6,7 @@
 'use strict';
 
 import * as assert from 'assert';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { isMacintosh, isLinux } from 'vs/base/common/platform';
 import { OutputLinkComputer } from 'vs/workbench/parts/output/common/outputLinkComputer';
 import { TestContextService } from 'vs/workbench/test/workbenchTestServices';
diff --git a/src/vs/workbench/parts/performance/electron-browser/actions.ts b/src/vs/workbench/parts/performance/electron-browser/actions.ts
new file mode 100644
index 00000000000..00ca60d5e6d
--- /dev/null
+++ b/src/vs/workbench/parts/performance/electron-browser/actions.ts
@@ -0,0 +1,307 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+import { Action } from 'vs/base/common/actions';
+import { IWindowService } from 'vs/platform/windows/common/windows';
+import * as nls from 'vs/nls';
+import product from 'vs/platform/node/product';
+import pkg from 'vs/platform/node/package';
+import { IEnvironmentService } from 'vs/platform/environment/common/environment';
+import { IIntegrityService } from 'vs/platform/integrity/common/integrity';
+import { ITimerService, IStartupMetrics } from 'vs/workbench/services/timer/electron-browser/timerService';
+import * as os from 'os';
+import { IExtensionService, ActivationTimes } from 'vs/workbench/services/extensions/common/extensions';
+import { getEntries } from 'vs/base/common/performance';
+import { timeout } from 'vs/base/common/async';
+import { StartupKindToString } from 'vs/platform/lifecycle/common/lifecycle';
+import { Registry } from 'vs/platform/registry/common/platform';
+import { IWorkbenchActionRegistry, Extensions } from 'vs/workbench/common/actions';
+import { SyncActionDescriptor } from 'vs/platform/actions/common/actions';
+import { forEach } from 'vs/base/common/collections';
+import { mergeSort } from 'vs/base/common/arrays';
+
+class Info {
+
+	static getTimerInfo(metrics: IStartupMetrics, nodeModuleLoadTime?: number): { [name: string]: Info } {
+		const table: { [name: string]: Info } = Object.create(null);
+		table['start => app.isReady'] = new Info(metrics.timers.ellapsedAppReady, '[main]', metrics.initialStartup);
+		table['nls:start => nls:end'] = new Info(metrics.timers.ellapsedNlsGeneration, '[main]', metrics.initialStartup);
+		table['app.isReady => window.loadUrl()'] = new Info(metrics.timers.ellapsedWindowLoad, '[main]', metrics.initialStartup);
+
+		table['window.loadUrl() => begin to require(workbench.main.js)'] = new Info(metrics.timers.ellapsedWindowLoadToRequire, '[main->renderer]', StartupKindToString(metrics.windowKind));
+		table['require(workbench.main.js)'] = new Info(metrics.timers.ellapsedRequire, '[renderer]', `cached data: ${(metrics.didUseCachedData ? 'YES' : 'NO')}${nodeModuleLoadTime ? `, node_modules took ${nodeModuleLoadTime}ms` : ''}`);
+
+		table['register extensions & spawn extension host'] = new Info(metrics.timers.ellapsedExtensions, '[renderer]');
+		table['restore viewlet'] = new Info(metrics.timers.ellapsedViewletRestore, '[renderer]', metrics.viewletId);
+		table['restore panel'] = new Info(metrics.timers.ellapsedPanelRestore, '[renderer]', metrics.panelId);
+		table['restore editors'] = new Info(metrics.timers.ellapsedEditorRestore, '[renderer]', `${metrics.editorIds.length}: ${metrics.editorIds.join(', ')}`);
+		table['overall workbench load'] = new Info(metrics.timers.ellapsedWorkbench, '[renderer]');
+
+		table['workbench ready'] = new Info(metrics.ellapsed, '[main->renderer]');
+		table['extensions registered'] = new Info(metrics.timers.ellapsedExtensionsReady, '[renderer]');
+
+		return table;
+	}
+
+	private constructor(readonly duration: number, readonly process: string, readonly info: string | boolean = '') { }
+}
+
+class LoaderStat {
+
+	static getLoaderStats() {
+
+		let seq = 1;
+		const amdLoad = new Map<string, LoaderStat>();
+		const amdInvoke = new Map<string, LoaderStat>();
+		const nodeRequire = new Map<string, LoaderStat>();
+		const nodeEval = new Map<string, LoaderStat>();
+
+		function mark(map: Map<string, LoaderStat>, stat: LoaderEvent) {
+			if (map.has(stat.detail)) {
+				// console.warn('BAD events, DOUBLE start', stat);
+				// map.delete(stat.detail);
+				return;
+			}
+			map.set(stat.detail, new LoaderStat(-stat.timestamp, seq++));
+		}
+
+		function diff(map: Map<string, LoaderStat>, stat: LoaderEvent) {
+			let obj = map.get(stat.detail);
+			if (!obj) {
+				// console.warn('BAD events, end WITHOUT start', stat);
+				// map.delete(stat.detail);
+				return;
+			}
+			if (obj.duration >= 0) {
+				// console.warn('BAD events, DOUBLE end', stat);
+				// map.delete(stat.detail);
+				return;
+			}
+			obj.duration = (obj.duration + stat.timestamp);
+		}
+
+		const stats = mergeSort(require.getStats().slice(0), (a, b) => a.timestamp - b.timestamp);
+
+		for (const stat of stats) {
+			switch (stat.type) {
+				case LoaderEventType.BeginLoadingScript:
+					mark(amdLoad, stat);
+					break;
+				case LoaderEventType.EndLoadingScriptOK:
+				case LoaderEventType.EndLoadingScriptError:
+					diff(amdLoad, stat);
+					break;
+
+				case LoaderEventType.BeginInvokeFactory:
+					mark(amdInvoke, stat);
+					break;
+				case LoaderEventType.EndInvokeFactory:
+					diff(amdInvoke, stat);
+					break;
+
+				case LoaderEventType.NodeBeginNativeRequire:
+					mark(nodeRequire, stat);
+					break;
+				case LoaderEventType.NodeEndNativeRequire:
+					diff(nodeRequire, stat);
+					break;
+
+				case LoaderEventType.NodeBeginEvaluatingScript:
+					mark(nodeEval, stat);
+					break;
+				case LoaderEventType.NodeEndEvaluatingScript:
+					diff(nodeEval, stat);
+					break;
+			}
+		}
+
+		function toObject(map: Map<string, any>): { [name: string]: any } {
+			const result = Object.create(null);
+			map.forEach((value, index) => result[index] = value);
+			return result;
+		}
+
+		let nodeRequireTotal = 0;
+		nodeRequire.forEach(value => nodeRequireTotal += value.duration);
+
+		return {
+			amdLoad: toObject(amdLoad),
+			amdInvoke: toObject(amdInvoke),
+			nodeRequire: toObject(nodeRequire),
+			nodeEval: toObject(nodeEval),
+			nodeRequireTotal
+		};
+	}
+
+	constructor(public duration: number, public seq: number) { }
+}
+
+export class ShowStartupPerformance extends Action {
+
+	static readonly ID = 'workbench.action.appPerf';
+	static readonly LABEL = nls.localize('appPerf', "Startup Performance");
+
+	constructor(
+		id: string,
+		label: string,
+		@IWindowService private windowService: IWindowService,
+		@ITimerService private timerService: ITimerService,
+		@IEnvironmentService private environmentService: IEnvironmentService,
+		@IExtensionService private extensionService: IExtensionService
+	) {
+		super(id, label);
+	}
+
+	run(): Promise<boolean> {
+
+		// Show dev tools
+		this.windowService.openDevTools();
+
+		Promise.all([
+			timeout(1000), // needed to print a table
+			this.timerService.startupMetrics
+		]).then(([, metrics]) => {
+
+			console.group('Startup Performance Measurement');
+			console.log(`OS: ${metrics.platform}(${metrics.release})`);
+			console.log(`CPUs: ${metrics.cpus.model}(${metrics.cpus.count} x ${metrics.cpus.speed})`);
+			console.log(`Memory(System): ${(metrics.totalmem / (1024 * 1024 * 1024)).toFixed(2)} GB(${(metrics.freemem / (1024 * 1024 * 1024)).toFixed(2)}GB free)`);
+			console.log(`Memory(Process): ${(metrics.meminfo.workingSetSize / 1024).toFixed(2)} MB working set(${(metrics.meminfo.peakWorkingSetSize / 1024).toFixed(2)}MB peak, ${(metrics.meminfo.privateBytes / 1024).toFixed(2)}MB private, ${(metrics.meminfo.sharedBytes / 1024).toFixed(2)}MB shared)`);
+			console.log(`VM(likelyhood): ${metrics.isVMLikelyhood}% `);
+
+			console.log(`Initial Startup: ${metrics.initialStartup} `);
+			console.log(`Has ${metrics.windowCount - 1} other windows`);
+			console.log(`Screen Reader Active: ${metrics.hasAccessibilitySupport} `);
+			console.log(`Empty Workspace: ${metrics.emptyWorkbench} `);
+
+
+			const loaderStats = this.environmentService.performance && LoaderStat.getLoaderStats();
+
+			console.table(Info.getTimerInfo(metrics, loaderStats && loaderStats.nodeRequireTotal));
+
+			if (loaderStats) {
+				for (const key in loaderStats) {
+					console.groupCollapsed(`Loader: ${key} `);
+					console.table(loaderStats[key]);
+					console.groupEnd();
+				}
+			}
+
+			console.groupEnd();
+
+			console.group('Extension Activation Stats');
+			let extensionsActivationTimes: { [id: string]: ActivationTimes; } = {};
+			let extensionsStatus = this.extensionService.getExtensionsStatus();
+			for (let id in extensionsStatus) {
+				const status = extensionsStatus[id];
+				if (status.activationTimes) {
+					extensionsActivationTimes[id] = status.activationTimes;
+				}
+			}
+			console.table(extensionsActivationTimes);
+			console.groupEnd();
+
+			console.group('Raw Startup Timers (CSV)');
+			let value = `Name\tStart\n`;
+			let entries = getEntries('mark');
+			for (const entry of entries) {
+				value += `${entry.name} \t${entry.startTime} \n`;
+			}
+			console.log(value);
+			console.groupEnd();
+		});
+
+		return Promise.resolve(true);
+	}
+}
+
+
+// NOTE: This is still used when running --prof-startup, which already opens a dialog, so the reporter is not used.
+export class ReportPerformanceIssueAction extends Action {
+
+	static readonly ID = 'workbench.action.reportPerformanceIssue';
+	static readonly LABEL = nls.localize('reportPerformanceIssue', "Report Performance Issue");
+
+	constructor(
+		id: string,
+		label: string,
+		@IIntegrityService private integrityService: IIntegrityService,
+		@IEnvironmentService private environmentService: IEnvironmentService,
+		@ITimerService private timerService: ITimerService
+	) {
+		super(id, label);
+	}
+
+	run(appendix?: string): Promise<boolean> {
+		Promise.all([
+			this.timerService.startupMetrics,
+			this.integrityService.isPure()
+		]).then(([metrics, integrity]) => {
+			const issueUrl = this.generatePerformanceIssueUrl(metrics, product.reportIssueUrl, pkg.name, pkg.version, product.commit, product.date, integrity.isPure, appendix);
+
+			window.open(issueUrl);
+		});
+
+		return Promise.resolve(true);
+	}
+
+	private generatePerformanceIssueUrl(metrics: IStartupMetrics, baseUrl: string, name: string, version: string, _commit: string, _date: string, isPure: boolean, appendix?: string): string {
+
+		if (!appendix) {
+			appendix = `Additional Steps to Reproduce(if any):
+
+	1.
+2.`;
+		}
+
+		let nodeModuleLoadTime: number;
+		if (this.environmentService.performance) {
+			nodeModuleLoadTime = LoaderStat.getLoaderStats().nodeRequireTotal;
+		}
+
+
+		const osVersion = `${os.type()} ${os.arch()} ${os.release()} `;
+		const queryStringPrefix = baseUrl.indexOf('?') === -1 ? '?' : '&';
+		const body = encodeURIComponent(
+			`- VSCode Version: <code>${name} ${version} ${isPure ? '' : ' **[Unsupported]**'} (${product.commit || 'Commit unknown'}, ${product.date || 'Date unknown'})</code>
+	- OS Version: <code>${ osVersion} </code>
+		- CPUs: <code>${ metrics.cpus.model} (${metrics.cpus.count} x ${metrics.cpus.speed})</code>
+			- Memory(System): <code>${ (metrics.totalmem / (1024 * 1024 * 1024)).toFixed(2)} GB(${(metrics.freemem / (1024 * 1024 * 1024)).toFixed(2)}GB free) < /code>
+				- Memory(Process): <code>${ (metrics.meminfo.workingSetSize / 1024).toFixed(2)} MB working set(${(metrics.meminfo.peakWorkingSetSize / 1024).toFixed(2)}MB peak, ${(metrics.meminfo.privateBytes / 1024).toFixed(2)}MB private, ${(metrics.meminfo.sharedBytes / 1024).toFixed(2)}MB shared) < /code>
+					- Load(avg): <code>${ metrics.loadavg.map(l => Math.round(l)).join(', ')} </code>
+						- VM: <code>${ metrics.isVMLikelyhood}% </code>
+							- Initial Startup: <code>${ metrics.initialStartup ? 'yes' : 'no'} </code>
+								- Screen Reader: <code>${ metrics.hasAccessibilitySupport ? 'yes' : 'no'} </code>
+									- Empty Workspace: <code>${ metrics.emptyWorkbench ? 'yes' : 'no'} </code>
+										- Timings:
+
+${ this.generatePerformanceTable(metrics, nodeModuleLoadTime)}
+
+---
+
+	${ appendix} `
+		);
+
+		return `${baseUrl} ${queryStringPrefix} body = ${body} `;
+	}
+
+	private generatePerformanceTable(metrics: IStartupMetrics, nodeModuleLoadTime?: number): string {
+		let tableHeader = `| Component | Task | Duration(ms) | Info |
+| ---| ---| ---| ---| `;
+
+		let table = '';
+		forEach(Info.getTimerInfo(metrics, nodeModuleLoadTime), e => {
+			table += `| ${e.value.process}| ${e.key}| ${e.value.duration}| ${e.value.info}|\n`;
+		});
+
+		return `${tableHeader} \n${table} `;
+	}
+}
+
+Registry
+	.as<IWorkbenchActionRegistry>(Extensions.WorkbenchActions)
+	.registerWorkbenchAction(new SyncActionDescriptor(ShowStartupPerformance, ShowStartupPerformance.ID, ShowStartupPerformance.LABEL), 'Developer: Startup Performance', nls.localize('developer', "Developer"));
diff --git a/src/vs/workbench/parts/performance/electron-browser/performance.contribution.ts b/src/vs/workbench/parts/performance/electron-browser/performance.contribution.ts
index 771485b80f1..8c55379ff49 100644
--- a/src/vs/workbench/parts/performance/electron-browser/performance.contribution.ts
+++ b/src/vs/workbench/parts/performance/electron-browser/performance.contribution.ts
@@ -7,4 +7,5 @@
 
 import './startupProfiler';
 import './startupTimings';
+import './startupTimingsAppender';
 import './stats';
diff --git a/src/vs/workbench/parts/performance/electron-browser/startupProfiler.ts b/src/vs/workbench/parts/performance/electron-browser/startupProfiler.ts
index 1b8c90733cd..52e522d7cb1 100644
--- a/src/vs/workbench/parts/performance/electron-browser/startupProfiler.ts
+++ b/src/vs/workbench/parts/performance/electron-browser/startupProfiler.ts
@@ -5,20 +5,19 @@
 
 'use strict';
 
+import { dirname, join } from 'path';
+import { basename } from 'vs/base/common/paths';
+import { del, exists, readdir, readFile } from 'vs/base/node/pfs';
+import { localize } from 'vs/nls';
+import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { ILifecycleService, LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
-import { IWindowsService } from 'vs/platform/windows/common/windows';
-import { IWorkbenchContributionsRegistry, IWorkbenchContribution, Extensions } from 'vs/workbench/common/contributions';
 import { Registry } from 'vs/platform/registry/common/platform';
-import { ReportPerformanceIssueAction } from 'vs/workbench/electron-browser/actions';
-import { TPromise } from 'vs/base/common/winjs.base';
-import { join, dirname } from 'path';
-import { localize } from 'vs/nls';
-import { readdir, del, readFile } from 'vs/base/node/pfs';
-import { basename } from 'vs/base/common/paths';
-import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
+import { IWindowsService } from 'vs/platform/windows/common/windows';
+import { Extensions, IWorkbenchContribution, IWorkbenchContributionsRegistry } from 'vs/workbench/common/contributions';
+import { ReportPerformanceIssueAction } from 'vs/workbench/parts/performance/electron-browser/actions';
+import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
 
 class StartupProfiler implements IWorkbenchContribution {
 
@@ -51,8 +50,20 @@ class StartupProfiler implements IWorkbenchContribution {
 
 		const removeArgs: string[] = ['--prof-startup'];
 		const markerFile = readFile(profileFilenamePrefix).then(value => removeArgs.push(...value.toString().split('|')))
-			.then(() => del(profileFilenamePrefix))
-			.then(() => TPromise.timeout(1000));
+			.then(() => del(profileFilenamePrefix)) // (1) delete the file to tell the main process to stop profiling
+			.then(() => new Promise(resolve => { // (2) wait for main that recreates the fail to signal profiling has stopped
+				const check = () => {
+					exists(profileFilenamePrefix).then(exists => {
+						if (exists) {
+							resolve();
+						} else {
+							setTimeout(check, 500);
+						}
+					});
+				};
+				check();
+			}))
+			.then(() => del(profileFilenamePrefix)); // (3) finally delete the file again
 
 		markerFile.then(() => {
 			return readdir(dir).then(files => files.filter(value => value.indexOf(prefix) === 0));
@@ -68,7 +79,7 @@ class StartupProfiler implements IWorkbenchContribution {
 			}).then(res => {
 				if (res.confirmed) {
 					const action = this._instantiationService.createInstance(ReportPerformanceIssueAction, ReportPerformanceIssueAction.ID, ReportPerformanceIssueAction.LABEL);
-					TPromise.join<any>([
+					Promise.all<any>([
 						this._windowsService.showItemInFolder(join(dir, files[0])),
 						action.run(`:warning: Make sure to **attach** these files from your *home*-directory: :warning:\n${files.map(file => `-\`${file}\``).join('\n')}`)
 					]).then(() => {
diff --git a/src/vs/workbench/parts/performance/electron-browser/startupTimings.ts b/src/vs/workbench/parts/performance/electron-browser/startupTimings.ts
index 74eb0b8e04c..d4a974c0c38 100644
--- a/src/vs/workbench/parts/performance/electron-browser/startupTimings.ts
+++ b/src/vs/workbench/parts/performance/electron-browser/startupTimings.ts
@@ -5,22 +5,20 @@
 
 'use strict';
 
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { ILifecycleService, LifecyclePhase, StartupKind } from 'vs/platform/lifecycle/common/lifecycle';
-import { IWindowsService } from 'vs/platform/windows/common/windows';
-import { IWorkbenchContributionsRegistry, IWorkbenchContribution, Extensions } from 'vs/workbench/common/contributions';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { TPromise } from 'vs/base/common/winjs.base';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { ITimerService } from 'vs/workbench/services/timer/common/timerService';
 import { onUnexpectedError } from 'vs/base/common/errors';
-import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet';
+import { isCodeEditor } from 'vs/editor/browser/editorBrowser';
+import { ILifecycleService, LifecyclePhase, StartupKind } from 'vs/platform/lifecycle/common/lifecycle';
+import { ILogService } from 'vs/platform/log/common/log';
+import { Registry } from 'vs/platform/registry/common/platform';
+import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
+import { IUpdateService } from 'vs/platform/update/common/update';
+import { IWindowsService } from 'vs/platform/windows/common/windows';
+import { Extensions, IWorkbenchContribution, IWorkbenchContributionsRegistry } from 'vs/workbench/common/contributions';
 import * as files from 'vs/workbench/parts/files/common/files';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { isCodeEditor } from 'vs/editor/browser/editorBrowser';
-import { isFalsyOrEmpty } from 'vs/base/common/arrays';
-import { ILogService } from 'vs/platform/log/common/log';
 import { IPanelService } from 'vs/workbench/services/panel/common/panelService';
+import { ITimerService, didUseCachedData } from 'vs/workbench/services/timer/electron-browser/timerService';
+import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet';
 
 class StartupTimings implements IWorkbenchContribution {
 
@@ -33,18 +31,14 @@ class StartupTimings implements IWorkbenchContribution {
 		@IPanelService private readonly _panelService: IPanelService,
 		@ITelemetryService private readonly _telemetryService: ITelemetryService,
 		@ILifecycleService private readonly _lifecycleService: ILifecycleService,
-		@IExtensionService private readonly _extensionService: IExtensionService,
+		@IUpdateService private readonly _updateService: IUpdateService,
 	) {
 
 		this._reportVariedStartupTimes().then(undefined, onUnexpectedError);
 		this._reportStandardStartupTimes().then(undefined, onUnexpectedError);
 	}
 
-	private async _reportVariedStartupTimes(): TPromise<void> {
-		await TPromise.join([
-			this._extensionService.whenInstalledExtensionsRegistered(),
-			this._lifecycleService.when(LifecyclePhase.Eventually)
-		]);
+	private async _reportVariedStartupTimes(): Promise<void> {
 		/* __GDPR__
 			"startupTimeVaried" : {
 				"${include}": [
@@ -52,10 +46,10 @@ class StartupTimings implements IWorkbenchContribution {
 				]
 			}
 		*/
-		this._telemetryService.publicLog('startupTimeVaried', this._timerService.startupMetrics);
+		this._telemetryService.publicLog('startupTimeVaried', await this._timerService.startupMetrics);
 	}
 
-	private async _reportStandardStartupTimes(): TPromise<void> {
+	private async _reportStandardStartupTimes(): Promise<void> {
 		// check for standard startup:
 		// * new window (no reload)
 		// * just one window
@@ -83,16 +77,14 @@ class StartupTimings implements IWorkbenchContribution {
 			this._logService.info('no standard startup: panel is active');
 			return;
 		}
-		if (!this._didUseCachedData()) {
+		if (!didUseCachedData()) {
 			this._logService.info('no standard startup: not using cached data');
 			return;
 		}
-
-		// wait only know so that can check the restored state as soon as possible
-		await TPromise.join([
-			this._extensionService.whenInstalledExtensionsRegistered(),
-			this._lifecycleService.when(LifecyclePhase.Eventually)
-		]);
+		if (!await this._updateService.isLatestVersion()) {
+			this._logService.info('no standard startup: not running latest version');
+			return;
+		}
 
 		/* __GDPR__
 		"startupTime" : {
@@ -101,27 +93,11 @@ class StartupTimings implements IWorkbenchContribution {
 			]
 		}
 		*/
-		this._telemetryService.publicLog('startupTime', this._timerService.startupMetrics);
-		this._logService.info('standard startup', this._timerService.startupMetrics);
-	}
-
-	private _didUseCachedData(): boolean {
-		// We surely don't use cached data when we don't tell the loader to do so
-		if (!Boolean((<any>global).require.getConfig().nodeCachedDataDir)) {
-			return false;
-		}
-		// whenever cached data is produced or rejected a onNodeCachedData-callback is invoked. That callback
-		// stores data in the `MonacoEnvironment.onNodeCachedData` global. See:
-		// https://github.com/Microsoft/vscode/blob/master/src/vs/workbench/electron-browser/bootstrap/index.js#L219
-		if (!isFalsyOrEmpty(MonacoEnvironment.onNodeCachedData)) {
-			return false;
-		}
-		return true;
+		const metrics = await this._timerService.startupMetrics;
+		this._telemetryService.publicLog('startupTime', metrics);
+		this._logService.info('standard startup', metrics);
 	}
 }
 
-declare type OnNodeCachedDataArgs = [{ errorCode: string, path: string, detail?: string }, { path: string, length: number }];
-declare const MonacoEnvironment: { onNodeCachedData: OnNodeCachedDataArgs[] };
-
 const registry = Registry.as<IWorkbenchContributionsRegistry>(Extensions.Workbench);
 registry.registerWorkbenchContribution(StartupTimings, LifecyclePhase.Running);
diff --git a/src/vs/workbench/parts/performance/electron-browser/startupTimingsAppender.ts b/src/vs/workbench/parts/performance/electron-browser/startupTimingsAppender.ts
new file mode 100644
index 00000000000..676b7c3e4f3
--- /dev/null
+++ b/src/vs/workbench/parts/performance/electron-browser/startupTimingsAppender.ts
@@ -0,0 +1,55 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+import { ILifecycleService, LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
+import { IWindowsService } from 'vs/platform/windows/common/windows';
+import { IWorkbenchContributionsRegistry, IWorkbenchContribution, Extensions } from 'vs/workbench/common/contributions';
+import { Registry } from 'vs/platform/registry/common/platform';
+import { ITimerService, didUseCachedData } from 'vs/workbench/services/timer/electron-browser/timerService';
+import { IEnvironmentService } from 'vs/platform/environment/common/environment';
+import { nfcall, timeout } from 'vs/base/common/async';
+import { appendFile, } from 'fs';
+import product from 'vs/platform/node/product';
+
+class StartupTimingsAppender implements IWorkbenchContribution {
+
+	constructor(
+		@ITimerService timerService: ITimerService,
+		@IWindowsService windowsService: IWindowsService,
+		@ILifecycleService lifecycleService: ILifecycleService,
+		@IEnvironmentService environmentService: IEnvironmentService,
+	) {
+
+		let appendTo = environmentService.args['prof-append-timers'];
+		if (!appendTo) {
+			// nothing to do
+			return;
+		}
+
+		Promise.all([
+			timerService.startupMetrics,
+			this._waitWhenNoCachedData(),
+		]).then(([startupMetrics]) => {
+			return nfcall(appendFile, appendTo, `${startupMetrics.ellapsed}\t${product.nameLong}\t${product.commit || '0000000'}\n`);
+		}).then(() => {
+			windowsService.quit();
+		}).catch(err => {
+			console.error(err);
+			windowsService.quit();
+		});
+	}
+
+	private _waitWhenNoCachedData(): Promise<void> {
+		// wait 15s for cached data to be produced
+		return !didUseCachedData()
+			? timeout(15000)
+			: Promise.resolve();
+	}
+}
+
+const registry = Registry.as<IWorkbenchContributionsRegistry>(Extensions.Workbench);
+registry.registerWorkbenchContribution(StartupTimingsAppender, LifecyclePhase.Eventually);
diff --git a/src/vs/workbench/parts/preferences/browser/keybindingWidgets.ts b/src/vs/workbench/parts/preferences/browser/keybindingWidgets.ts
index ab0cfe703ed..9398a8c5046 100644
--- a/src/vs/workbench/parts/preferences/browser/keybindingWidgets.ts
+++ b/src/vs/workbench/parts/preferences/browser/keybindingWidgets.ts
@@ -214,7 +214,9 @@ export class DefineKeybindingWidget extends Widget {
 		this._domNode.setClassName('defineKeybindingWidget');
 		this._domNode.setWidth(DefineKeybindingWidget.WIDTH);
 		this._domNode.setHeight(DefineKeybindingWidget.HEIGHT);
-		dom.append(this._domNode.domNode, dom.$('.message', null, nls.localize('defineKeybinding.initial', "Press desired key combination and then press ENTER.")));
+
+		const message = nls.localize('defineKeybinding.initial', "Press desired key combination and then press ENTER.");
+		dom.append(this._domNode.domNode, dom.$('.message', null, message));
 
 		this._register(attachStylerCallback(this.themeService, { editorWidgetBackground, widgetShadow }, colors => {
 			if (colors.editorWidgetBackground) {
@@ -230,7 +232,7 @@ export class DefineKeybindingWidget extends Widget {
 			}
 		}));
 
-		this._keybindingInputWidget = this._register(this.instantiationService.createInstance(KeybindingInputWidget, this._domNode.domNode, {}));
+		this._keybindingInputWidget = this._register(this.instantiationService.createInstance(KeybindingInputWidget, this._domNode.domNode, { ariaLabel: message }));
 		this._register(this._keybindingInputWidget.onKeybinding(keybinding => this.onKeybinding(keybinding)));
 		this._register(this._keybindingInputWidget.onEnter(() => this.hide()));
 		this._register(this._keybindingInputWidget.onEscape(() => this.onCancel()));
diff --git a/src/vs/workbench/parts/preferences/browser/keybindingsEditor.ts b/src/vs/workbench/parts/preferences/browser/keybindingsEditor.ts
index 6dc7fdc34fa..0f25d0a34a6 100644
--- a/src/vs/workbench/parts/preferences/browser/keybindingsEditor.ts
+++ b/src/vs/workbench/parts/preferences/browser/keybindingsEditor.ts
@@ -32,7 +32,7 @@ import {
 import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
 import { IKeybindingEditingService } from 'vs/workbench/services/keybinding/common/keybindingEditing';
 import { List } from 'vs/base/browser/ui/list/listWidget';
-import { IDelegate, IRenderer, IListContextMenuEvent, IListEvent } from 'vs/base/browser/ui/list/list';
+import { IVirtualDelegate, IRenderer, IListContextMenuEvent, IListEvent } from 'vs/base/browser/ui/list/list';
 import { IThemeService, registerThemingParticipant, ITheme, ICssStyleCollector } from 'vs/platform/theme/common/themeService';
 import { IContextKeyService, IContextKey } from 'vs/platform/contextkey/common/contextkey';
 import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
@@ -74,6 +74,8 @@ export class KeybindingsEditor extends BaseEditor implements IKeybindingsEditor
 	private searchFocusContextKey: IContextKey<boolean>;
 	private sortByPrecedence: Checkbox;
 
+	private ariaLabelElement: HTMLElement;
+
 	constructor(
 		@ITelemetryService telemetryService: ITelemetryService,
 		@IThemeService themeService: IThemeService,
@@ -100,6 +102,7 @@ export class KeybindingsEditor extends BaseEditor implements IKeybindingsEditor
 	createEditor(parent: HTMLElement): void {
 		const keybindingsEditorElement = DOM.append(parent, $('div', { class: 'keybindings-editor' }));
 
+		this.createAriaLabelElement(keybindingsEditorElement);
 		this.createOverlayContainer(keybindingsEditorElement);
 		this.createHeader(keybindingsEditorElement);
 		this.createBody(keybindingsEditorElement);
@@ -111,9 +114,7 @@ export class KeybindingsEditor extends BaseEditor implements IKeybindingsEditor
 
 	setInput(input: KeybindingsEditorInput, options: EditorOptions, token: CancellationToken): Thenable<void> {
 		return super.setInput(input, options, token)
-			.then(() => {
-				this.render(options && options.preserveFocus, token);
-			});
+			.then(() => this.render(options && options.preserveFocus, token));
 	}
 
 	clearInput(): void {
@@ -249,8 +250,12 @@ export class KeybindingsEditor extends BaseEditor implements IKeybindingsEditor
 		return TPromise.as(null);
 	}
 
-	search(filter: string): void {
+	focusSearch(): void {
 		this.searchWidget.focus();
+	}
+
+	search(filter: string): void {
+		this.focusSearch();
 		this.searchWidget.setValue(filter);
 	}
 
@@ -266,6 +271,12 @@ export class KeybindingsEditor extends BaseEditor implements IKeybindingsEditor
 		return TPromise.as(null);
 	}
 
+	private createAriaLabelElement(parent: HTMLElement): void {
+		this.ariaLabelElement = DOM.append(parent, DOM.$(''));
+		this.ariaLabelElement.setAttribute('id', 'keybindings-editor-aria-label-element');
+		this.ariaLabelElement.setAttribute('aria-live', 'assertive');
+	}
+
 	private createOverlayContainer(parent: HTMLElement): void {
 		this.overlayContainer = DOM.append(parent, $('.overlay-container'));
 		this.overlayContainer.style.position = 'absolute';
@@ -291,16 +302,17 @@ export class KeybindingsEditor extends BaseEditor implements IKeybindingsEditor
 		this.searchWidget = this._register(this.instantiationService.createInstance(SearchWidget, searchContainer, {
 			ariaLabel: localize('SearchKeybindings.AriaLabel', "Search keybindings"),
 			placeholder: localize('SearchKeybindings.Placeholder', "Search keybindings"),
-			focusKey: this.searchFocusContextKey
+			focusKey: this.searchFocusContextKey,
+			ariaLabelledBy: 'keybindings-editor-aria-label-element'
 		}));
 		this._register(this.searchWidget.onDidChange(searchValue => this.delayedFiltering.trigger(() => this.filterKeybindings())));
 
 		this.sortByPrecedence = this._register(new Checkbox({
 			actionClassName: 'sort-by-precedence',
 			isChecked: false,
-			onChange: () => this.renderKeybindingsEntries(false),
 			title: localize('sortByPrecedene', "Sort by Precedence")
 		}));
+		this._register(this.sortByPrecedence.onChange(() => this.renderKeybindingsEntries(false)));
 		searchContainer.appendChild(this.sortByPrecedence.domNode);
 
 		this.createOpenKeybindingsElement(this.headerContainer);
@@ -394,6 +406,9 @@ export class KeybindingsEditor extends BaseEditor implements IKeybindingsEditor
 		if (this.keybindingsEditorModel) {
 			const filter = this.searchWidget.getValue();
 			const keybindingsEntries: IKeybindingItemEntry[] = this.keybindingsEditorModel.fetch(filter, this.sortByPrecedence.checked);
+
+			this.ariaLabelElement.setAttribute('aria-label', this.getAriaLabel(keybindingsEntries));
+
 			if (keybindingsEntries.length === 0) {
 				this.latestEmptyFilters.push(filter);
 			}
@@ -422,6 +437,14 @@ export class KeybindingsEditor extends BaseEditor implements IKeybindingsEditor
 		}
 	}
 
+	private getAriaLabel(keybindingsEntries: IKeybindingItemEntry[]): string {
+		if (this.sortByPrecedence.checked) {
+			return localize('show sorted keybindings', "Showing {0} Keybindings in precedence order", keybindingsEntries.length);
+		} else {
+			return localize('show keybindings', "Showing {0} Keybindings in alphabetical order", keybindingsEntries.length);
+		}
+	}
+
 	private layoutKebindingsList(): void {
 		const listHeight = this.dimension.height - (DOM.getDomNodePagePosition(this.headerContainer).height + 12 /*padding*/);
 		this.keybindingsListContainer.style.height = `${listHeight}px`;
@@ -591,7 +614,7 @@ export class KeybindingsEditor extends BaseEditor implements IKeybindingsEditor
 	}
 }
 
-class Delegate implements IDelegate<IListEntry> {
+class Delegate implements IVirtualDelegate<IListEntry> {
 
 	getHeight(element: IListEntry) {
 		if (element.templateId === KEYBINDING_ENTRY_TEMPLATE_ID) {
@@ -644,6 +667,9 @@ class KeybindingHeaderRenderer implements IRenderer<IListEntry, any> {
 	renderElement(entry: IListEntry, index: number, template: any): void {
 	}
 
+	disposeElement(): void {
+	}
+
 	disposeTemplate(template: any): void {
 	}
 }
@@ -681,6 +707,8 @@ class KeybindingItemRenderer implements IRenderer<IKeybindingItemEntry, Keybindi
 		template.when.render(keybindingEntry);
 	}
 
+	disposeElement(): void { }
+
 	disposeTemplate(template: KeybindingItemTemplate): void {
 		template.actions.dispose();
 	}
diff --git a/src/vs/workbench/parts/preferences/browser/keybindingsEditorContribution.ts b/src/vs/workbench/parts/preferences/browser/keybindingsEditorContribution.ts
index 2a3fab73b51..69e1486610b 100644
--- a/src/vs/workbench/parts/preferences/browser/keybindingsEditorContribution.ts
+++ b/src/vs/workbench/parts/preferences/browser/keybindingsEditorContribution.ts
@@ -22,13 +22,14 @@ import { SmartSnippetInserter } from 'vs/workbench/parts/preferences/common/smar
 import { DefineKeybindingOverlayWidget } from 'vs/workbench/parts/preferences/browser/keybindingWidgets';
 import { FloatingClickWidget } from 'vs/workbench/parts/preferences/browser/preferencesWidgets';
 import { parseTree, Node } from 'vs/base/common/json';
-import { KeybindingIO } from 'vs/workbench/services/keybinding/common/keybindingIO';
-import { ScanCodeBinding } from 'vs/workbench/services/keybinding/common/scanCode';
+import { ScanCodeBinding } from 'vs/base/common/scanCode';
 import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
 import { WindowsNativeResolvedKeybinding } from 'vs/workbench/services/keybinding/common/windowsKeyboardMapper';
 import { themeColorFromId, ThemeColor } from 'vs/platform/theme/common/themeService';
 import { overviewRulerInfo, overviewRulerError } from 'vs/editor/common/view/editorColorRegistry';
 import { IModelDeltaDecoration, ITextModel, TrackedRangeStickiness, OverviewRulerLane } from 'vs/editor/common/model';
+import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
+import { KeybindingParser } from 'vs/base/common/keybindingParser';
 
 const NLS_LAUNCH_MESSAGE = nls.localize('defineKeybinding.start', "Define Keybinding");
 const NLS_KB_LAYOUT_ERROR_MESSAGE = nls.localize('defineKeybinding.kbLayoutErrorMessage', "You won't be able to produce this key combination under your current keyboard layout.");
@@ -239,6 +240,11 @@ export class KeybindingEditorDecorationsRenderer extends Disposable {
 				usLabel = resolvedKeybinding.getUSLabel();
 			}
 			if (!resolvedKeybinding.isWYSIWYG()) {
+				const uiLabel = resolvedKeybinding.getLabel();
+				if (value.value.toLowerCase() === uiLabel.toLowerCase()) {
+					// coincidentally, this is actually WYSIWYG
+					return null;
+				}
 				return this._createDecoration(false, resolvedKeybinding.getLabel(), usLabel, model, value);
 			}
 			if (/abnt_|oem_/.test(value.value)) {
@@ -261,8 +267,8 @@ export class KeybindingEditorDecorationsRenderer extends Disposable {
 			return true;
 		}
 
-		const [parsedA1, parsedA2] = KeybindingIO._readUserBinding(a);
-		const [parsedB1, parsedB2] = KeybindingIO._readUserBinding(b);
+		const [parsedA1, parsedA2] = KeybindingParser.parseUserBinding(a);
+		const [parsedB1, parsedB2] = KeybindingParser.parseUserBinding(b);
 
 		return (
 			this._userBindingEquals(parsedA1, parsedB1)
@@ -365,7 +371,8 @@ class DefineKeybindingCommand extends EditorCommand {
 			precondition: ContextKeyExpr.and(EditorContextKeys.writable, EditorContextKeys.languageId.isEqualTo('jsonc')),
 			kbOpts: {
 				kbExpr: EditorContextKeys.editorTextFocus,
-				primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_K, KeyMod.CtrlCmd | KeyCode.KEY_K)
+				primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_K, KeyMod.CtrlCmd | KeyCode.KEY_K),
+				weight: KeybindingWeight.EditorContrib
 			}
 		});
 	}
diff --git a/src/vs/workbench/parts/preferences/browser/media/action-remove-dark.svg b/src/vs/workbench/parts/preferences/browser/media/action-remove-dark.svg
new file mode 100644
index 00000000000..751e89b3b02
--- /dev/null
+++ b/src/vs/workbench/parts/preferences/browser/media/action-remove-dark.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="3 3 16 16" enable-background="new 3 3 16 16"><polygon fill="#e8e8e8" points="12.597,11.042 15.4,13.845 13.844,15.4 11.042,12.598 8.239,15.4 6.683,13.845 9.485,11.042 6.683,8.239 8.238,6.683 11.042,9.486 13.845,6.683 15.4,8.239"/></svg>
\ No newline at end of file
diff --git a/src/vs/workbench/parts/preferences/browser/media/action-remove.svg b/src/vs/workbench/parts/preferences/browser/media/action-remove.svg
new file mode 100644
index 00000000000..fde34404d4e
--- /dev/null
+++ b/src/vs/workbench/parts/preferences/browser/media/action-remove.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="3 3 16 16" enable-background="new 3 3 16 16"><polygon fill="#424242" points="12.597,11.042 15.4,13.845 13.844,15.4 11.042,12.598 8.239,15.4 6.683,13.845 9.485,11.042 6.683,8.239 8.238,6.683 11.042,9.486 13.845,6.683 15.4,8.239"/></svg>
\ No newline at end of file
diff --git a/src/vs/workbench/parts/preferences/browser/media/check-inverse.svg b/src/vs/workbench/parts/preferences/browser/media/check-inverse.svg
new file mode 100644
index 00000000000..c225b2f597f
--- /dev/null
+++ b/src/vs/workbench/parts/preferences/browser/media/check-inverse.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="-2 -2 16 16" enable-background="new -2 -2 16 16"><polygon fill="#C5C5C5" points="9,0 4.5,9 3,6 0,6 3,12 6,12 12,0"/></svg>
\ No newline at end of file
diff --git a/src/vs/workbench/parts/preferences/browser/media/check.svg b/src/vs/workbench/parts/preferences/browser/media/check.svg
new file mode 100644
index 00000000000..3f365c4800e
--- /dev/null
+++ b/src/vs/workbench/parts/preferences/browser/media/check.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="-2 -2 16 16" enable-background="new -2 -2 16 16"><polygon fill="#424242" points="9,0 4.5,9 3,6 0,6 3,12 6,12 12,0"/></svg>
\ No newline at end of file
diff --git a/src/vs/workbench/parts/preferences/browser/media/configure-inverse.svg b/src/vs/workbench/parts/preferences/browser/media/configure-inverse.svg
new file mode 100644
index 00000000000..bbfbd366eb9
--- /dev/null
+++ b/src/vs/workbench/parts/preferences/browser/media/configure-inverse.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.icon-canvas-transparent,.icon-vs-out{fill:#252526;}.icon-canvas-transparent{opacity:0;}.icon-vs-bg{fill:#c5c5c5;}</style></defs><title>configure</title><g id="canvas"><path class="icon-canvas-transparent" d="M16,0V16H0V0Z"/></g><g id="outline" style="display: none;"><path class="icon-vs-out" d="M16,10.015l-2.238.372,1.318,1.847L12.233,15.08l-1.847-1.318L10.013,16H5.986l-.373-2.237L3.767,15.08.919,12.233l1.319-1.847L0,10.013V5.986l2.238-.373L.919,3.767,3.768.919,5.613,2.238,5.986,0h4.028l.372,2.238L12.233.919,15.08,3.768,13.762,5.613,16,5.986Z"/></g><g id="iconBg"><path class="icon-vs-bg" d="M12.876,9.521,15,9.167V6.834L12.879,6.48a5.12,5.12,0,0,0-.354-.854l1.25-1.75-1.65-1.65L10.373,3.477c-.137-.072-.262-.159-.408-.219s-.3-.087-.444-.133L9.167,1H6.834L6.48,3.121a5.118,5.118,0,0,0-.854.354l-1.75-1.25-1.65,1.65L3.477,5.627c-.072.137-.159.262-.219.408s-.087.3-.133.444L1,6.833V9.166l2.121.354a5.122,5.122,0,0,0,.354.854l-1.25,1.75,1.65,1.65,1.752-1.252c.137.072.262.159.408.22s.3.087.444.133L6.833,15H9.166l.354-2.121a5.121,5.121,0,0,0,.854-.354l1.75,1.25,1.65-1.65-1.252-1.752c.072-.137.159-.263.219-.409S12.83,9.669,12.876,9.521ZM8,10.212A2.212,2.212,0,1,1,10.212,8,2.212,2.212,0,0,1,8,10.212Z"/></g></svg>
\ No newline at end of file
diff --git a/src/vs/workbench/parts/preferences/browser/media/configure.svg b/src/vs/workbench/parts/preferences/browser/media/configure.svg
new file mode 100644
index 00000000000..c97bb48bdcc
--- /dev/null
+++ b/src/vs/workbench/parts/preferences/browser/media/configure.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.icon-canvas-transparent,.icon-vs-out{fill:#f6f6f6;}.icon-canvas-transparent{opacity:0;}.icon-vs-bg{fill:#424242;}</style></defs><title>configure</title><g id="canvas"><path class="icon-canvas-transparent" d="M16,0V16H0V0Z"/></g><g id="outline" style="display: none;"><path class="icon-vs-out" d="M16,10.015l-2.238.372,1.318,1.847L12.233,15.08l-1.847-1.318L10.013,16H5.986l-.373-2.237L3.767,15.08.919,12.233l1.319-1.847L0,10.013V5.986l2.238-.373L.919,3.767,3.768.919,5.613,2.238,5.986,0h4.028l.372,2.238L12.233.919,15.08,3.768,13.762,5.613,16,5.986Z"/></g><g id="iconBg"><path class="icon-vs-bg" d="M12.876,9.521,15,9.167V6.834L12.879,6.48a5.12,5.12,0,0,0-.354-.854l1.25-1.75-1.65-1.65L10.373,3.477c-.137-.072-.262-.159-.408-.219s-.3-.087-.444-.133L9.167,1H6.834L6.48,3.121a5.118,5.118,0,0,0-.854.354l-1.75-1.25-1.65,1.65L3.477,5.627c-.072.137-.159.262-.219.408s-.087.3-.133.444L1,6.833V9.166l2.121.354a5.122,5.122,0,0,0,.354.854l-1.25,1.75,1.65,1.65,1.752-1.252c.137.072.262.159.408.22s.3.087.444.133L6.833,15H9.166l.354-2.121a5.121,5.121,0,0,0,.854-.354l1.75,1.25,1.65-1.65-1.252-1.752c.072-.137.159-.263.219-.409S12.83,9.669,12.876,9.521ZM8,10.212A2.212,2.212,0,1,1,10.212,8,2.212,2.212,0,0,1,8,10.212Z"/></g></svg>
\ No newline at end of file
diff --git a/src/vs/workbench/parts/preferences/browser/media/ellipsis-inverse.svg b/src/vs/workbench/parts/preferences/browser/media/ellipsis-inverse.svg
new file mode 100644
index 00000000000..e3337557a23
--- /dev/null
+++ b/src/vs/workbench/parts/preferences/browser/media/ellipsis-inverse.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.icon-canvas-transparent,.icon-vs-out{fill:#252526;}.icon-canvas-transparent{opacity:0;}.icon-vs-bg{fill:#c5c5c5;}</style></defs><title>Ellipsis_bold_16x</title><g id="canvas"><path class="icon-canvas-transparent" d="M16,0V16H0V0Z"/></g><g id="outline" style="display: none;"><path class="icon-vs-out" d="M6,7.5A2.5,2.5,0,1,1,3.5,5,2.5,2.5,0,0,1,6,7.5ZM8.5,5A2.5,2.5,0,1,0,11,7.5,2.5,2.5,0,0,0,8.5,5Zm5,0A2.5,2.5,0,1,0,16,7.5,2.5,2.5,0,0,0,13.5,5Z" style="display: none;"/></g><g id="iconBg"><path class="icon-vs-bg" d="M5,7.5A1.5,1.5,0,1,1,3.5,6,1.5,1.5,0,0,1,5,7.5ZM8.5,6A1.5,1.5,0,1,0,10,7.5,1.5,1.5,0,0,0,8.5,6Zm5,0A1.5,1.5,0,1,0,15,7.5,1.5,1.5,0,0,0,13.5,6Z"/></g></svg>
\ No newline at end of file
diff --git a/src/vs/workbench/parts/preferences/browser/media/ellipsis.svg b/src/vs/workbench/parts/preferences/browser/media/ellipsis.svg
new file mode 100644
index 00000000000..e3f85623356
--- /dev/null
+++ b/src/vs/workbench/parts/preferences/browser/media/ellipsis.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.icon-canvas-transparent,.icon-vs-out{fill:#f6f6f6;}.icon-canvas-transparent{opacity:0;}.icon-vs-bg{fill:#424242;}</style></defs><title>Ellipsis_bold_16x</title><g id="canvas"><path class="icon-canvas-transparent" d="M16,0V16H0V0Z"/></g><g id="outline" style="display: none;"><path class="icon-vs-out" d="M6,7.5A2.5,2.5,0,1,1,3.5,5,2.5,2.5,0,0,1,6,7.5ZM8.5,5A2.5,2.5,0,1,0,11,7.5,2.5,2.5,0,0,0,8.5,5Zm5,0A2.5,2.5,0,1,0,16,7.5,2.5,2.5,0,0,0,13.5,5Z" style="display: none;"/></g><g id="iconBg"><path class="icon-vs-bg" d="M5,7.5A1.5,1.5,0,1,1,3.5,6,1.5,1.5,0,0,1,5,7.5ZM8.5,6A1.5,1.5,0,1,0,10,7.5,1.5,1.5,0,0,0,8.5,6Zm5,0A1.5,1.5,0,1,0,15,7.5,1.5,1.5,0,0,0,13.5,6Z"/></g></svg>
\ No newline at end of file
diff --git a/src/vs/workbench/parts/preferences/browser/media/keybindingsEditor.css b/src/vs/workbench/parts/preferences/browser/media/keybindingsEditor.css
index da0b304cca7..5fc8abaf148 100644
--- a/src/vs/workbench/parts/preferences/browser/media/keybindingsEditor.css
+++ b/src/vs/workbench/parts/preferences/browser/media/keybindingsEditor.css
@@ -45,16 +45,23 @@
 
 .keybindings-editor > .keybindings-header .open-keybindings-container {
 	margin-top: 10px;
-	opacity: 0.7;
 	display: flex;
 }
 
+.keybindings-editor > .keybindings-header .open-keybindings-container > div {
+	opacity: 0.7;
+}
+
 .keybindings-editor > .keybindings-header .open-keybindings-container > .file-name {
 	text-decoration: underline;
 	cursor: pointer;
 	margin-left: 4px;
 }
 
+.keybindings-editor > .keybindings-header .open-keybindings-container > .file-name:focus {
+	opacity: 1;
+}
+
 /** List based styling **/
 
 .keybindings-editor > .keybindings-body .keybindings-list-container {
@@ -152,6 +159,11 @@
 	font-weight: bold;
 }
 
+.keybindings-editor > .keybindings-body > .keybindings-list-container .monaco-list:focus .monaco-list-row.selected > .column .highlight,
+.keybindings-editor > .keybindings-body > .keybindings-list-container .monaco-list:focus .monaco-list-row.selected.focused > .column .highlight {
+	color: inherit;
+}
+
 .keybindings-editor > .keybindings-body > .keybindings-list-container .monaco-list-row > .column .monaco-action-bar {
 	display: none;
 	flex: 1;
diff --git a/src/vs/workbench/parts/preferences/browser/media/preferences.css b/src/vs/workbench/parts/preferences/browser/media/preferences.css
index ca03fe1df2b..caaa044e182 100644
--- a/src/vs/workbench/parts/preferences/browser/media/preferences.css
+++ b/src/vs/workbench/parts/preferences/browser/media/preferences.css
@@ -10,20 +10,6 @@
 	padding-top: 11px;
 }
 
-.preferences-editor > .preferences-header > .new-settings-ad {
-	color: #6f6f6f;
-	margin-bottom: 4px;
-	font-size: 12px;
-}
-
-.vs-dark .preferences-editor > .preferences-header > .new-settings-ad {
-	color: #bbbbbb;
-}
-
-.hc-black .preferences-editor > .preferences-header > .new-settings-ad {
-	color: white;
-}
-
 .preferences-editor > .preferences-header > .new-settings-ad > .open-settings2-button {
 	padding: 0;
 	text-decoration: underline;
diff --git a/src/vs/workbench/parts/preferences/browser/media/settingsEditor2.css b/src/vs/workbench/parts/preferences/browser/media/settingsEditor2.css
index 688fc6a36d9..ab6fff2fa21 100644
--- a/src/vs/workbench/parts/preferences/browser/media/settingsEditor2.css
+++ b/src/vs/workbench/parts/preferences/browser/media/settingsEditor2.css
@@ -3,77 +3,71 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+.editor-instance#workbench\.editor\.settings2:focus {
+	outline: none;
+}
+
 .settings-editor {
-	padding-top: 11px;
+	padding: 11px 24px 0px;
+	max-width: 1000px;
 	margin: auto;
 }
 
 /* header styling */
 .settings-editor > .settings-header {
-	padding-left: 15px;
-	padding-right: 5px;
-	max-width: 800px;
 	box-sizing: border-box;
 	margin: auto;
-}
-
-.settings-editor > .settings-header > .settings-preview-header {
-	margin-bottom: 5px;
-}
-
-.settings-editor > .settings-header > .settings-preview-header .settings-preview-label {
-	opacity: .7;
-}
-
-.settings-editor > .settings-header > .settings-advanced-customization .open-settings-button,
-.settings-editor > .settings-header > .settings-advanced-customization .open-settings-button:hover,
-.settings-editor > .settings-header > .settings-advanced-customization .open-settings-button:active {
-	padding: 0;
-	text-decoration: underline;
-	display: inline;
-}
-
-.settings-editor > .settings-header > .settings-advanced-customization {
-	opacity: .7;
-	margin-top: 10px;
-}
-
-.settings-editor > .settings-header > .settings-preview-header > .settings-preview-warning {
-	text-align: right;
-	text-transform: uppercase;
-	background: rgba(136, 136, 136, 0.3);
-	border-radius: 2px;
-	font-size: 0.8em;
-	padding: 0 3px;
-	margin-right: 7px;
+	overflow: hidden;
+	padding-top: 3px;
 }
 
 .settings-editor > .settings-header > .search-container {
 	position: relative;
 }
 
-.settings-editor > .settings-header .search-container > .settings-search-input {
-	vertical-align: middle;
+.vs .settings-editor > .settings-header > .search-container > .suggest-input-container {
+	border: 1px solid #ddd;
 }
 
-.settings-editor > .settings-header .search-container > .settings-search-input > .monaco-inputbox {
-	height: 30px;
-	width: 100%;
-}
-
-.settings-editor > .settings-header .search-container > .settings-search-input > .monaco-inputbox .input {
-	font-size: 14px;
-	padding-left: 10px;
+.settings-editor > .settings-header > .search-container > .settings-count-widget {
+	margin: 6px 0px;
+	padding: 0px 8px;
+	border-radius: 2px;
+	position: absolute;
+	right: 10px;
+	top: 0;
 }
 
 .settings-editor > .settings-header > .settings-header-controls {
-	margin-top: 2px;
-	height: 30px;
+	height: 32px;
 	display: flex;
+	border-bottom: solid 1px;
+	margin-top: 10px;
 }
 
-.settings-editor > .settings-header .settings-tabs-widget > .monaco-action-bar .action-item:not(:first-child) .action-label {
-	margin-left: 14px;
+.settings-editor > .settings-header > .settings-header-controls .settings-tabs-widget .action-label {
+	opacity: 0.9;
+}
+
+.settings-editor > .settings-header > .settings-header-controls .settings-tabs-widget .action-label:hover {
+	opacity: 1;
+}
+
+.settings-editor > .settings-header > .settings-header-controls .settings-tabs-widget .action-label.checked {
+	font-weight: 500;
+	opacity: 1;
+}
+
+.vs .settings-editor > .settings-header > .settings-header-controls {
+	border-color: #cccccc;
+}
+
+.vs-dark .settings-editor > .settings-header > .settings-header-controls {
+	border-color: #3c3c3c;
+}
+
+.settings-editor > .settings-header .settings-tabs-widget > .monaco-action-bar .action-item .action-label {
+	margin-right: 0px;
 }
 
 .settings-editor > .settings-header .settings-tabs-widget .monaco-action-bar .action-item .dropdown-icon {
@@ -83,79 +77,220 @@
 
 .settings-editor > .settings-header > .settings-header-controls .settings-header-controls-right {
 	margin-left: auto;
-	padding-top: 3px;
+	padding-top: 4px;
 	display: flex;
 }
 
-.settings-editor > .settings-header > .settings-header-controls .settings-header-controls-right #configured-only-checkbox {
-	flex-shrink: 0;
+.settings-editor > .settings-header > .settings-header-controls .settings-header-controls-right .toolbar-toggle-more {
+	display: block;
+	width: 22px;
+	height: 22px;
+	background-position: center;
+	background-repeat: no-repeat;
+	background-size: 16px;
 }
 
-.settings-editor > .settings-header > .settings-header-controls .settings-header-controls-right .configured-only-label {
-	white-space: nowrap;
-	margin-right: 10px;
-	margin-left: 2px;
-	opacity: 0.7;
+.settings-editor > .settings-header > .settings-header-controls .settings-tabs-widget > .monaco-action-bar .action-item {
+	padding: 0px; /* padding must be on action-label because it has the bottom-border, because that's where the .checked class is */
 }
 
-.settings-editor > .settings-body .settings-tree-container .monaco-tree-wrapper {
-	max-width: 800px;
+.settings-editor > .settings-header > .settings-header-controls .settings-tabs-widget > .monaco-action-bar .action-item .action-label {
+	text-transform: none;
+	font-size: 13px;
+
+	padding-bottom: 7px;
+	padding-top: 7px;
+	padding-left: 8px;
+	padding-right: 8px;
+}
+
+.settings-editor > .settings-body {
+	display: flex;
 	margin: auto;
+	max-width: 1000px;
 }
 
-.settings-editor > .settings-body .settings-tree-container .monaco-scrollable-element .shadow.top-left-corner {
-	left: calc((100% - 800px)/2);
+.settings-editor > .settings-body > .no-results {
+	margin-top: 20px;
+	display: none;
 }
 
-.settings-editor > .settings-body .settings-tree-container .monaco-scrollable-element .shadow {
-	left: calc((100% - 794px)/2);
-	width: 800px;
+.settings-editor.no-toc-search > .settings-body .settings-tree-container .monaco-tree-wrapper,
+.settings-editor.narrow > .settings-body .settings-tree-container .monaco-tree-wrapper {
+	width: calc(100% - 11px);
+	margin-left: 0px;
 }
 
-.settings-editor > .settings-body .settings-tree-container .monaco-tree::before {
-	outline: none !important;
+.settings-editor.no-toc-search > .settings-body > .settings-tree-container .setting-measure-container,
+.settings-editor.narrow > .settings-body > .settings-tree-container .setting-measure-container {
+	width: calc(100% - 33px);
+	margin-left: 0px;
+}
+
+.settings-editor > .settings-body .settings-tree-container .monaco-tree-wrapper,
+.settings-editor > .settings-body > .settings-tree-container .setting-measure-container {
+	/** 11px for scrollbar + 208px for TOC margin */
+	width: calc(100% - 219px);
+	margin-left: 188px;
+	padding-left: 20px;
+}
+
+.settings-editor > .settings-body > .settings-tree-container .setting-measure-container {
+	/* 20 from monaco-tree-wrapper + 20 from monaco-tree-row */
+	padding-left: 40px;
+	width: calc(100% - 241px);
+	border: 1px solid transparent;
+}
+
+.settings-editor > .settings-body .settings-tree-container .monaco-tree-rows {
+	width: calc(100% - 20px);
+}
+
+.settings-editor > .settings-body .settings-tree-container .monaco-tree-row > .content::before {
+	/* Hide twisties */
+	display: none !important;
+}
+
+.settings-editor > .settings-body .settings-tree-container .setting-toolbar-container {
+	position: absolute;
+	left: -23px;
+	top: 11px;
+	bottom: 0px;
+	width: 26px;
+}
+
+.settings-editor > .settings-body .settings-tree-container .setting-toolbar-container > .monaco-toolbar {
+	display: none;
+}
+
+.settings-editor > .settings-body .settings-tree-container .monaco-tree-row .setting-toolbar-container:hover > .monaco-toolbar {
+	display: flex;
+}
+
+.settings-editor > .settings-body .settings-tree-container .monaco-tree-row .setting-item.focused .setting-toolbar-container > .monaco-toolbar {
+	display: flex;
+}
+
+.settings-editor > .settings-body .settings-tree-container .setting-toolbar-container > .monaco-toolbar .toolbar-toggle-more {
+	display: block;
+	width: 22px;
+	height: 22px;
+	background-position: center;
+	background-repeat: no-repeat;
+	background-size: 16px;
+}
+
+.vs .settings-editor > .settings-body .settings-tree-container .monaco-toolbar .toolbar-toggle-more {
+	background-image: url('configure.svg');
+}
+
+.vs-dark .settings-editor > .settings-body .settings-tree-container .monaco-toolbar .toolbar-toggle-more {
+	background-image: url('configure-inverse.svg');
+}
+
+.settings-editor > .settings-body .settings-toc-container {
+	position: absolute;
+	width: 160px;
+	margin-top: 16px;
+	padding-left: 5px;
+}
+
+.settings-editor.no-toc-search > .settings-body .settings-toc-container,
+.settings-editor.narrow > .settings-body .settings-toc-container {
+	display: none;
+}
+
+.settings-editor > .settings-body .settings-toc-container .monaco-scrollable-element > .shadow {
+	display: none;
+}
+
+.settings-editor > .settings-body .settings-toc-container .monaco-tree-row .content {
+	display: flex;
+}
+
+.settings-editor > .settings-body .settings-toc-container .monaco-tree-row .settings-toc-entry {
+	overflow: hidden;
+	text-overflow: ellipsis;
+	line-height: 22px;
+	opacity: 0.9;
+	flex-shrink: 1;
+}
+
+.settings-editor > .settings-body .settings-toc-container .monaco-tree-row .settings-toc-count {
+	display: none;
+	line-height: 22px;
+	opacity: 0.7;
+	margin-left: 3px;
+}
+
+.settings-editor.search-mode > .settings-body .settings-toc-container .monaco-tree-row .settings-toc-count {
+	display: block;
+}
+
+.settings-editor > .settings-body .settings-toc-container .monaco-tree-row.has-children > .content::before {
+	opacity: 0.9;
+}
+
+.settings-editor > .settings-body .settings-toc-container .monaco-tree-row.has-children.selected > .content::before {
+	opacity: 1;
+}
+
+.settings-editor > .settings-body .settings-toc-container .monaco-tree-row .settings-toc-entry.no-results {
+	opacity: 0.5;
+}
+
+.settings-editor > .settings-body .settings-toc-container .monaco-tree-row.selected .settings-toc-entry {
+	font-weight: bold;
+	opacity: 1;
 }
 
 .settings-editor > .settings-body .settings-tree-container {
 	flex: 1;
+	margin-right: 1px; /* So the item doesn't blend into the edge of the view container  */
+	margin-top: 14px;
 	border-spacing: 0;
 	border-collapse: separate;
 	position: relative;
 }
 
-.settings-editor > .settings-body > .settings-tree-container .setting-item {
+.settings-editor > .settings-body > .settings-tree-container .monaco-tree-row {
+	overflow: visible; /* so validation messages dont get clipped */
 	cursor: default;
+}
+
+.settings-editor > .settings-body > .settings-tree-container .setting-item {
+	padding-top: 12px;
+	padding-bottom: 18px;
+	box-sizing: border-box;
 	white-space: normal;
-	display: flex;
 	height: 100%;
-	min-height: 75px;
-}
-
-.settings-editor > .settings-body > .settings-tree-container .setting-item.odd:not(.focused):not(.selected):not(:hover),
-.settings-editor > .settings-body > .settings-tree-container .monaco-tree:not(:focus) .setting-item.focused.odd:not(.selected):not(:hover),
-.settings-editor > .settings-body > .settings-tree-container .monaco-tree:not(.focused) .setting-item.focused.odd:not(.selected):not(:hover) {
-	background-color: rgba(130, 130, 130, 0.04);
-}
-
-.settings-editor > .settings-body > .settings-tree-container .setting-item > .setting-item-left {
-	flex: 1;
-	padding-top: 3px;
-	padding-bottom: 12px;
-}
-
-.settings-editor > .settings-body > .settings-tree-container .setting-item > .setting-item-right {
-	min-width: 180px;
-	margin: 21px 10px 0px 5px;
 }
 
 .settings-editor > .settings-body > .settings-tree-container .setting-item .setting-item-title {
-	line-height: initial;
+	white-space: nowrap;
+	overflow: hidden;
+	text-overflow: ellipsis;
 }
 
-.settings-editor > .settings-body > .settings-tree-container .setting-item .setting-item-title .setting-item-is-configured-label {
-	font-style: italic;
-	opacity: 0.8;
-	margin-right: 7px;
+
+.settings-editor > .settings-body > .settings-tree-container .setting-item > .setting-item-modified-indicator {
+	display: none;
+}
+
+.settings-editor > .settings-body > .settings-tree-container .setting-item.is-configured > .setting-item-modified-indicator {
+	display: block;
+	content: ' ';
+	position: absolute;
+	width: 6px;
+	border-left-width: 2px;
+	border-left-style: solid;
+	left: 0px;
+	top: 15px;
+	bottom: 16px;
+}
+
+.settings-editor > .settings-body > .settings-tree-container .setting-item-bool.is-configured > .setting-item-modified-indicator {
+	bottom: 23px;
 }
 
 .settings-editor > .settings-body > .settings-tree-container .setting-item .setting-item-title .setting-item-overrides {
@@ -167,106 +302,193 @@
 	margin-right: 7px;
 }
 
+.settings-editor > .settings-body > .settings-tree-container .setting-item .setting-item-cat-label-container {
+	float: left;
+}
+
 .settings-editor > .settings-body > .settings-tree-container .setting-item .setting-item-label,
 .settings-editor > .settings-body > .settings-tree-container .setting-item .setting-item-category {
-	font-weight: bold;
+	font-weight: 600;
+	user-select: text;
 }
 
 .settings-editor > .settings-body > .settings-tree-container .setting-item .setting-item-category {
-	opacity: 0.7;
+	opacity: 0.9;
 }
 
+.settings-editor > .settings-body > .settings-tree-container .setting-item .setting-item-deprecation-message,
 .settings-editor > .settings-body > .settings-tree-container .setting-item .setting-item-description {
-	opacity: 0.7;
 	margin-top: 3px;
-	height: 36px;
-	overflow: hidden;
-	white-space: pre-wrap;
+	user-select: text;
 }
 
-.settings-editor > .settings-body > .settings-tree-container .setting-measure-container.monaco-tree-row {
-	padding-left: 15px;
-	opacity: 0;
-	max-width: 800px;
+.settings-editor > .settings-body > .settings-tree-container .setting-item .setting-item-deprecation-message {
+	position: absolute;
 }
 
-.settings-editor > .settings-body > .settings-tree-container .setting-item.is-expanded .setting-item-description,
-.settings-editor > .settings-body > .settings-tree-container .setting-item.setting-measure-helper .setting-item-description {
-	height: initial;
-}
-
-.settings-editor > .settings-body > .settings-tree-container .setting-item .setting-item-value > .edit-in-settings-button,
-.settings-editor > .settings-body > .settings-tree-container .setting-item .setting-item-value > .edit-in-settings-button:hover,
-.settings-editor > .settings-body > .settings-tree-container .setting-item .setting-item-value > .edit-in-settings-button:active {
-	margin: auto;
-	text-align: left;
-	text-decoration: underline;
-}
-
-.settings-editor > .settings-body > .settings-tree-container .setting-item .setting-item-value > .edit-in-settings-button + .setting-reset-button.monaco-button {
+.settings-editor > .settings-body > .settings-tree-container .setting-item .setting-item-validation-message {
 	display: none;
 }
 
+.settings-editor > .settings-body > .settings-tree-container .setting-item.invalid-input .setting-item-validation-message {
+	display: block;
+	position: absolute;
+	padding: 5px;
+	box-sizing: border-box;
+	margin-top: -1px;
+	z-index: 1;
+}
+
+.settings-editor > .settings-body > .settings-tree-container .setting-item.setting-item-text .setting-item-validation-message {
+	width: 500px;
+}
+
+.settings-editor > .settings-body > .settings-tree-container .setting-item.setting-item-number .setting-item-validation-message {
+	width: 200px;
+}
+
+.settings-editor > .settings-body > .settings-tree-container .setting-item.setting-item-number input[type=number]::-webkit-inner-spin-button {
+	/* Hide arrow button that shows in type=number fields */
+	-webkit-appearance: none !important;
+}
+
+.settings-editor > .settings-body > .settings-tree-container .setting-item .setting-item-description-markdown * {
+	margin: 0px;
+}
+
+.settings-editor > .settings-body > .settings-tree-container .setting-item .setting-item-description-markdown a:focus {
+	outline: 1px solid -webkit-focus-ring-color;
+	outline-offset: -1px;
+	text-decoration: underline;
+}
+
+.settings-editor > .settings-body > .settings-tree-container .setting-item .setting-item-description-markdown a:hover {
+	text-decoration: underline;
+}
+
+.settings-editor > .settings-body > .settings-tree-container .setting-item .setting-item-description-markdown code {
+	line-height: 15px; /** For some reason, this is needed, otherwise <code> will take up 20px height */
+	font-family: Menlo, Monaco, Consolas, "Droid Sans Mono", "Courier New", monospace, "Droid Sans Fallback";
+}
+
+.settings-editor > .settings-body > .settings-tree-container .setting-measure-container.monaco-tree-row {
+	position: absolute;
+	visibility: hidden;
+}
+
+.settings-editor > .settings-body > .settings-tree-container .setting-measure-container .setting-item-description.measure-bool-description {
+	/* Allocate space for the checkbox control */
+	margin-left: 27px;
+}
+
+.settings-editor > .settings-body > .settings-tree-container .setting-item .setting-item-enumDescription {
+	display: none;
+}
+
+.settings-editor > .settings-body > .settings-tree-container .setting-item .setting-item-enumDescription,
+.settings-editor > .settings-body > .settings-tree-container .setting-item.setting-measure-helper .setting-item-enumDescription {
+	display: block;
+}
+
+.settings-editor > .settings-body > .settings-tree-container .setting-item-bool .setting-item-value-description {
+	display: flex;
+	cursor: pointer;
+}
+
+.settings-editor > .settings-body > .settings-tree-container .setting-item-bool .setting-value-checkbox {
+	height: 18px;
+	width: 18px;
+	border: 1px solid transparent;
+	border-radius: 3px;
+	margin-right: 9px;
+	margin-left: 0px;
+	margin-top: 4px;
+	padding: 0px;
+	background-size: 16px !important;
+}
+
+.vs .settings-editor > .settings-body > .settings-tree-container .setting-item-bool .setting-value-checkbox.checked {
+	background: url('check.svg') center center no-repeat;
+}
+
+.vs-dark .settings-editor > .settings-body > .settings-tree-container .setting-item-bool .setting-value-checkbox.checked,
+.hc-black .settings-editor > .settings-body > .settings-tree-container .setting-item-bool .setting-value-checkbox.checked {
+	background: url('check-inverse.svg') center center no-repeat;
+}
+
+.settings-editor > .settings-body > .settings-tree-container .setting-item .setting-item-value {
+	margin-top: 9px;
+	display: flex;
+}
+
+.settings-editor > .settings-body > .settings-tree-container .setting-item.setting-item-number .setting-item-value > .setting-item-control {
+	min-width: 200px;
+}
+
+.settings-editor > .settings-body > .settings-tree-container .setting-item.setting-item-text .setting-item-control {
+	width: 500px;
+}
+
+.settings-editor > .settings-body > .settings-tree-container .setting-item.setting-item-enum .setting-item-value > .setting-item-control,
+.settings-editor > .settings-body > .settings-tree-container .setting-item.setting-item-text .setting-item-value > .setting-item-control {
+	min-width: initial;
+}
+
+.settings-editor > .settings-body > .settings-tree-container .setting-item.setting-item-enum .setting-item-value > .setting-item-control > select {
+	width: 320px;
+}
+
+.settings-editor > .settings-body > .settings-tree-container .setting-item .setting-item-value .edit-in-settings-button,
+.settings-editor > .settings-body > .settings-tree-container .setting-item .setting-item-value .edit-in-settings-button:hover,
+.settings-editor > .settings-body > .settings-tree-container .setting-item .setting-item-value .edit-in-settings-button:active {
+	text-align: left;
+	text-decoration: underline;
+	padding-left: 0px;
+}
+
 .settings-editor > .settings-body > .settings-tree-container .setting-item .monaco-select-box {
-	width: 100%;
+	width: initial;
 	font: inherit;
 	height: 26px;
 }
 
-.settings-editor > .settings-body > .settings-tree-container .setting-item .setting-item-value > .setting-reset-button.monaco-button {
-	text-align: left;
-	display: block;
-	visibility: hidden;
-
-	padding-top: 0px; /* So focus outline doesn't overlap the control above */
-}
-
-.settings-editor > .settings-body > .settings-tree-container .setting-item.is-configured .setting-item-value > .setting-reset-button.monaco-button {
-	visibility: visible;
-}
-
-.settings-editor > .settings-body > .settings-tree-container .setting-item .expand-indicator {
-	visibility: hidden;
-	position: absolute;
-	bottom: -2px;
-	width: calc(100% - 190px);
-	text-align: center;
-	opacity: .5;
-}
-
-.settings-editor > .settings-body > .settings-tree-container .setting-item.is-expandable .expand-indicator {
-	visibility: visible;
-}
-
-.settings-editor > .settings-body > .settings-tree-container .all-settings {
+.settings-editor > .settings-body > .settings-tree-container .setting-item-new-extensions {
 	display: flex;
 }
 
-.settings-editor > .settings-body > .settings-tree-container .all-settings .all-settings-button {
+.settings-editor > .settings-body > .settings-tree-container .setting-item-new-extensions .settings-new-extensions-button {
 	margin: auto;
+	width: initial;
+	padding: 4px 10px;
 }
 
-.settings-editor > .settings-body > .settings-tree-container .all-settings .all-settings-button .monaco-button {
-	padding-left: 10px;
-	padding-right: 10px;
+.settings-editor > .settings-body > .settings-tree-container .group-title,
+.settings-editor > .settings-body > .settings-tree-container .setting-item {
+	padding-left: 9px;
+	padding-right: 9px;
 }
 
-/*
-	Ensure the is-configured indicators can appear outside of the list items themselves:
-	- Disable overflow: hidden on the listrow
-	- Allocate some space with a margin on the list-row
-	- Make up for that space with a negative margin on the settings-body
-
-	This is risky, consider a different approach
-*/
-.settings-editor .settings-tree-container .setting-item {
-	overflow: visible;
+.settings-editor > .settings-body > .settings-tree-container .group-title {
+	cursor: default;
 }
 
 .settings-editor > .settings-body > .settings-tree-container .settings-group-title-label {
 	margin: 0px;
-	padding: 5px 0px;
-	font-size: 13px;
+	font-weight: 600;
+}
+
+.settings-editor > .settings-body > .settings-tree-container .settings-group-level-1 {
+	padding-top: 23px;
+	font-size: 24px;
+}
+
+.settings-editor > .settings-body > .settings-tree-container .settings-group-level-2 {
+	padding-top: 32px;
+	font-size: 20px;
+}
+
+.settings-editor > .settings-body > .settings-tree-container .settings-group-level-1.settings-group-first {
+	padding-top: 7px;
 }
 
 .settings-editor > .settings-body .settings-feedback-button {
diff --git a/src/vs/workbench/parts/preferences/browser/media/settingsWidgets.css b/src/vs/workbench/parts/preferences/browser/media/settingsWidgets.css
new file mode 100644
index 00000000000..deb7ff3d83c
--- /dev/null
+++ b/src/vs/workbench/parts/preferences/browser/media/settingsWidgets.css
@@ -0,0 +1,103 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+.settings-editor > .settings-body > .settings-tree-container .setting-item.setting-item-exclude .setting-item-value > .setting-item-control {
+	width: 100%;
+}
+
+.settings-editor > .settings-body > .settings-tree-container .setting-item.setting-item-exclude .setting-exclude-pattern {
+	margin-right: 3px;
+	margin-left: 2px;
+}
+
+.settings-editor > .settings-body > .settings-tree-container .setting-item.setting-item-exclude .setting-exclude-pattern,
+.settings-editor > .settings-body > .settings-tree-container .setting-item.setting-item-exclude .setting-exclude-sibling {
+	display: inline-block;
+	line-height: 22px;
+	font-family: Menlo, Monaco, Consolas, "Droid Sans Mono", "Courier New", monospace, "Droid Sans Fallback";
+}
+
+.settings-editor > .settings-body > .settings-tree-container .setting-item.setting-item-exclude .setting-exclude-sibling {
+	opacity: 0.7;
+	margin-left: 0.5em;
+	font-size: 0.9em;
+	white-space: pre;
+}
+
+.settings-editor > .settings-body > .settings-tree-container .setting-item.setting-item-exclude .setting-exclude-row .monaco-action-bar {
+	display: none;
+	position: absolute;
+	right: 0px;
+	margin-top: 1px;
+}
+
+.settings-editor > .settings-body > .settings-tree-container .setting-item.setting-item-exclude .setting-exclude-row {
+	position: relative;
+}
+
+.settings-editor > .settings-body > .settings-tree-container .setting-item.setting-item-exclude .setting-exclude-row:focus {
+	outline: none;
+}
+
+.settings-editor > .settings-body > .settings-tree-container .setting-item.setting-item-exclude .setting-exclude-row:hover .monaco-action-bar,
+.settings-editor > .settings-body > .settings-tree-container .setting-item.setting-item-exclude .setting-exclude-row.selected .monaco-action-bar {
+	display: block;
+}
+
+.settings-editor > .settings-body > .settings-tree-container .setting-item.setting-item-exclude .setting-exclude-row .monaco-action-bar .action-label {
+	width: 16px;
+	height: 16px;
+	padding: 2px;
+	margin-right: 2px;
+}
+
+.settings-editor > .settings-body > .settings-tree-container .setting-item.setting-item-exclude .setting-exclude-row .monaco-action-bar .setting-excludeAction-edit {
+	margin-right: 4px;
+}
+
+.vs .settings-editor > .settings-body > .settings-tree-container .setting-item.setting-item-exclude .setting-exclude-row .monaco-action-bar .setting-excludeAction-edit {
+	background: url(edit.svg) center center no-repeat;
+}
+
+.vs-dark .settings-editor > .settings-body > .settings-tree-container .setting-item.setting-item-exclude .setting-exclude-row .monaco-action-bar .setting-excludeAction-edit {
+	background: url(edit_inverse.svg) center center no-repeat;
+}
+
+.vs .settings-editor > .settings-body > .settings-tree-container .setting-item.setting-item-exclude .setting-exclude-row .monaco-action-bar .setting-excludeAction-remove {
+	background: url(action-remove.svg) center center no-repeat;
+}
+
+.vs-dark .settings-editor > .settings-body > .settings-tree-container .setting-item.setting-item-exclude .setting-exclude-row .monaco-action-bar .setting-excludeAction-remove {
+	background: url(action-remove-dark.svg) center center no-repeat;
+}
+
+.settings-editor > .settings-body > .settings-tree-container .setting-item.setting-item-exclude .monaco-text-button {
+	width: initial;
+	padding: 2px 14px;
+}
+
+.settings-editor > .settings-body > .settings-tree-container .setting-item.setting-item-exclude .setting-item-control.setting-exclude-new-mode .setting-exclude-new-row {
+	display: none;
+}
+
+.settings-editor > .settings-body > .settings-tree-container .setting-item.setting-item-exclude .monaco-text-button.setting-exclude-addButton {
+	margin-right: 10px;
+}
+
+.settings-editor > .settings-body > .settings-tree-container .setting-item.setting-item-exclude .setting-exclude-patternInput,
+.settings-editor > .settings-body > .settings-tree-container .setting-item.setting-item-exclude .setting-exclude-siblingInput {
+	height: 22px;
+	max-width: 300px;
+	display: inline-block;
+	margin-right: 10px;
+}
+
+.settings-editor > .settings-body > .settings-tree-container .setting-item.setting-item-exclude .setting-exclude-okButton {
+	margin-right: 10px;
+}
+
+.settings-editor > .settings-body > .settings-tree-container .setting-item.setting-item-exclude .setting-exclude-widget {
+	margin-bottom: 1px;
+}
diff --git a/src/vs/workbench/parts/preferences/browser/media/sort_precedence.svg b/src/vs/workbench/parts/preferences/browser/media/sort_precedence.svg
index 25b013f5c32..07e6d6b84ba 100644
--- a/src/vs/workbench/parts/preferences/browser/media/sort_precedence.svg
+++ b/src/vs/workbench/parts/preferences/browser/media/sort_precedence.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><style>.st0{opacity:0}.st0,.st1{fill:#f6f6f6}.st2{fill:#424242}.st3{fill:#f0eff1}</style><g id="outline"><path class="st0" d="M0 0h16v16H0z"/><path class="st1" d="M5 1v5H0v9h11v-2.586l1 1 4-4V1H5zm5 3v2L8 4.586V4h2zm-2 8H3V9h5v3z"/></g><g id="icon_x5F_bg"><path class="st2" d="M3 9h2v2H3zM6 10h2v2H6zM14 3v3h.586L15 5.586V2H6v4h1V3z"/><path class="st2" d="M9 10.414V13H2V8h6V7H1v7h9V11.414zM9.414 6H10V4H8v.586z"/><path class="st2" d="M13 5h-2v4L9 7v2l3 3 3-3V7l-2 2z"/></g><g id="icon_x5F_fg"><path class="st3" d="M8 9.414V8H2v5h7v-2.586l-1-1zM5 11H3V9h2v2zm3 1H6v-2h2v2zM8 4.586V4h6V3H7v3h1z"/></g></svg>
\ No newline at end of file
+<svg fill="none" height="16" viewBox="0 0 16 16" width="16" xmlns="http://www.w3.org/2000/svg"><path d="m5 1v5h-5v9h11v-2.586l1 1 4-4v-8.414zm5 3v2l-2-1.414v-.586zm-2 8h-5v-3h5z" fill="#f6f6f6"/><g fill="#424242"><path d="m3 9h2v2h-2zm3 1h2v2h-2zm8-7v3h.586l.414-.414v-3.586h-9v4h1v-3z"/><path d="m9 10.414v2.586h-7v-5h6v-1h-7v7h9v-2.586zm.414-4.414h.586v-2h-2v.586z"/><path d="m13 5h-2v4l-2-2v2l3 3 3-3v-2l-2 2z"/></g><path d="m8 9.414v-1.414h-6v5h7v-2.586zm-3 1.586h-2v-2h2zm3 1h-2v-2h2zm0-7.414v-.586h6v-1h-7v3h1z" fill="#f0eff1"/></svg>
\ No newline at end of file
diff --git a/src/vs/workbench/parts/preferences/browser/media/sort_precedence_inverse.svg b/src/vs/workbench/parts/preferences/browser/media/sort_precedence_inverse.svg
index 1b4301884a6..92c9a64dbc4 100644
--- a/src/vs/workbench/parts/preferences/browser/media/sort_precedence_inverse.svg
+++ b/src/vs/workbench/parts/preferences/browser/media/sort_precedence_inverse.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><style>.st0{opacity:0}.st0,.st1{fill:#2d2d30}.st2{fill:#c5c5c5}.st3{fill:#2b282e}</style><g id="outline"><path class="st0" d="M0 0h16v16H0z"/><path class="st1" d="M5 1v5H0v9h11v-2.586l1 1 4-4V1H5zm5 3v2L8 4.586V4h2zm-2 8H3V9h5v3z"/></g><g id="icon_x5F_bg"><path class="st2" d="M3 9h2v2H3zM6 10h2v2H6zM14 3v3h.586L15 5.586V2H6v4h1V3z"/><path class="st2" d="M9 10.414V13H2V8h6V7H1v7h9V11.414zM9.414 6H10V4H8v.586z"/><path class="st2" d="M13 5h-2v4L9 7v2l3 3 3-3V7l-2 2z"/></g><g id="icon_x5F_fg"><path class="st3" d="M8 9.414V8H2v5h7v-2.586l-1-1zM5 11H3V9h2v2zm3 1H6v-2h2v2zM8 4.586V4h6V3H7v3h1z"/></g></svg>
\ No newline at end of file
+<svg fill="none" height="16" viewBox="0 0 16 16" width="16" xmlns="http://www.w3.org/2000/svg"><path d="m5 1v5h-5v9h11v-2.586l1 1 4-4v-8.414zm5 3v2l-2-1.414v-.586zm-2 8h-5v-3h5z" fill="#2d2d30"/><g fill="#c5c5c5"><path d="m3 9h2v2h-2zm3 1h2v2h-2zm8-7v3h.586l.414-.414v-3.586h-9v4h1v-3z"/><path d="m9 10.414v2.586h-7v-5h6v-1h-7v7h9v-2.586zm.414-4.414h.586v-2h-2v.586z"/><path d="m13 5h-2v4l-2-2v2l3 3 3-3v-2l-2 2z"/></g><path d="m8 9.414v-1.414h-6v5h7v-2.586zm-3 1.586h-2v-2h2zm3 1h-2v-2h2zm0-7.414v-.586h6v-1h-7v3h1z" fill="#2b282e"/></svg>
\ No newline at end of file
diff --git a/src/vs/workbench/parts/preferences/browser/preferencesActions.ts b/src/vs/workbench/parts/preferences/browser/preferencesActions.ts
index 4c19890f0f3..87b1efc0616 100644
--- a/src/vs/workbench/parts/preferences/browser/preferencesActions.ts
+++ b/src/vs/workbench/parts/preferences/browser/preferencesActions.ts
@@ -4,17 +4,19 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import { TPromise } from 'vs/base/common/winjs.base';
-import * as nls from 'vs/nls';
-import URI from 'vs/base/common/uri';
 import { Action } from 'vs/base/common/actions';
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
+import { dispose, IDisposable } from 'vs/base/common/lifecycle';
+import { URI } from 'vs/base/common/uri';
+import { TPromise } from 'vs/base/common/winjs.base';
+import { IModelService } from 'vs/editor/common/services/modelService';
 import { IModeService } from 'vs/editor/common/services/modeService';
-import { IQuickOpenService, IPickOpenEntry, IFilePickOpenEntry } from 'vs/platform/quickOpen/common/quickOpen';
-import { IPreferencesService } from 'vs/workbench/services/preferences/common/preferences';
-import { IWorkspaceContextService, WorkbenchState, IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
+import * as nls from 'vs/nls';
 import { ICommandService } from 'vs/platform/commands/common/commands';
+import { IQuickInputService, IQuickPickItem } from 'vs/platform/quickinput/common/quickInput';
+import { IWorkspaceContextService, IWorkspaceFolder, WorkbenchState } from 'vs/platform/workspace/common/workspace';
 import { PICK_WORKSPACE_FOLDER_COMMAND_ID } from 'vs/workbench/browser/actions/workspaceCommands';
+import { getIconClasses } from 'vs/workbench/browser/labels';
+import { IPreferencesService } from 'vs/workbench/services/preferences/common/preferences';
 
 export class OpenRawDefaultSettingsAction extends Action {
 
@@ -37,22 +39,21 @@ export class OpenRawDefaultSettingsAction extends Action {
 export class OpenSettings2Action extends Action {
 
 	public static readonly ID = 'workbench.action.openSettings2';
-	public static readonly LABEL = nls.localize('openSettings2', "Open Settings (Preview)");
+	public static readonly LABEL = nls.localize('openSettings2', "Open Settings (UI)");
 
 	constructor(
 		id: string,
 		label: string,
-		@IPreferencesService private preferencesService2: IPreferencesService
+		@IPreferencesService private preferencesService: IPreferencesService
 	) {
 		super(id, label);
 	}
 
 	public run(event?: any): TPromise<any> {
-		return this.preferencesService2.openSettings2();
+		return this.preferencesService.openSettings(false);
 	}
 }
 
-
 export class OpenSettingsAction extends Action {
 
 	public static readonly ID = 'workbench.action.openSettings';
@@ -71,6 +72,24 @@ export class OpenSettingsAction extends Action {
 	}
 }
 
+export class OpenSettingsJsonAction extends Action {
+
+	public static readonly ID = 'workbench.action.openSettingsJson';
+	public static readonly LABEL = nls.localize('openSettingsJson', "Open Settings (JSON)");
+
+	constructor(
+		id: string,
+		label: string,
+		@IPreferencesService private preferencesService: IPreferencesService
+	) {
+		super(id, label);
+	}
+
+	public run(event?: any): TPromise<any> {
+		return this.preferencesService.openSettings(true);
+	}
+}
+
 export class OpenGlobalSettingsAction extends Action {
 
 	public static readonly ID = 'workbench.action.openGlobalSettings';
@@ -79,7 +98,7 @@ export class OpenGlobalSettingsAction extends Action {
 	constructor(
 		id: string,
 		label: string,
-		@IPreferencesService private preferencesService: IPreferencesService
+		@IPreferencesService private preferencesService: IPreferencesService,
 	) {
 		super(id, label);
 	}
@@ -125,6 +144,24 @@ export class OpenGlobalKeybindingsFileAction extends Action {
 	}
 }
 
+export class OpenDefaultKeybindingsFileAction extends Action {
+
+	public static readonly ID = 'workbench.action.openDefaultKeybindingsFile';
+	public static readonly LABEL = nls.localize('openDefaultKeybindingsFile', "Open Default Keyboard Shortcuts File");
+
+	constructor(
+		id: string,
+		label: string,
+		@IPreferencesService private preferencesService: IPreferencesService
+	) {
+		super(id, label);
+	}
+
+	public run(event?: any): TPromise<any> {
+		return this.preferencesService.openDefaultKeybindingsFile();
+	}
+}
+
 export class OpenWorkspaceSettingsAction extends Action {
 
 	public static readonly ID = 'workbench.action.openWorkspaceSettings';
@@ -136,7 +173,7 @@ export class OpenWorkspaceSettingsAction extends Action {
 		id: string,
 		label: string,
 		@IPreferencesService private preferencesService: IPreferencesService,
-		@IWorkspaceContextService private workspaceContextService: IWorkspaceContextService
+		@IWorkspaceContextService private workspaceContextService: IWorkspaceContextService,
 	) {
 		super(id, label);
 		this.update();
@@ -171,7 +208,8 @@ export class OpenFolderSettingsAction extends Action {
 		id: string,
 		label: string,
 		@IWorkspaceContextService private workspaceContextService: IWorkspaceContextService,
-		@ICommandService private commandService: ICommandService
+		@IPreferencesService private preferencesService: IPreferencesService,
+		@ICommandService private commandService: ICommandService,
 	) {
 		super(id, label);
 		this.update();
@@ -187,8 +225,9 @@ export class OpenFolderSettingsAction extends Action {
 		return this.commandService.executeCommand<IWorkspaceFolder>(PICK_WORKSPACE_FOLDER_COMMAND_ID)
 			.then(workspaceFolder => {
 				if (workspaceFolder) {
-					return this.commandService.executeCommand(OPEN_FOLDER_SETTINGS_COMMAND, workspaceFolder.uri);
+					return this.preferencesService.openFolderSettings(workspaceFolder.uri);
 				}
+
 				return null;
 			});
 	}
@@ -207,8 +246,9 @@ export class ConfigureLanguageBasedSettingsAction extends Action {
 	constructor(
 		id: string,
 		label: string,
+		@IModelService private modelService: IModelService,
 		@IModeService private modeService: IModeService,
-		@IQuickOpenService private quickOpenService: IQuickOpenService,
+		@IQuickInputService private quickInputService: IQuickInputService,
 		@IPreferencesService private preferencesService: IPreferencesService
 	) {
 		super(id, label);
@@ -216,7 +256,7 @@ export class ConfigureLanguageBasedSettingsAction extends Action {
 
 	public run(): TPromise<any> {
 		const languages = this.modeService.getRegisteredLanguageNames();
-		const picks: IPickOpenEntry[] = languages.sort().map((lang, index) => {
+		const picks: IQuickPickItem[] = languages.sort().map((lang, index) => {
 			let description: string = nls.localize('languageDescriptionConfigured', "({0})", this.modeService.getModeIdForLanguageName(lang.toLowerCase()));
 			// construct a fake resource to be able to show nice icons if any
 			let fakeResource: URI;
@@ -229,14 +269,14 @@ export class ConfigureLanguageBasedSettingsAction extends Action {
 					fakeResource = URI.file(filenames[0]);
 				}
 			}
-			return <IFilePickOpenEntry>{
+			return {
 				label: lang,
-				resource: fakeResource,
+				iconClasses: getIconClasses(this.modelService, this.modeService, fakeResource),
 				description
-			};
+			} as IQuickPickItem;
 		});
 
-		return this.quickOpenService.pick(picks, { placeHolder: nls.localize('pickLanguage', "Select Language") })
+		return this.quickInputService.pick(picks, { placeHolder: nls.localize('pickLanguage', "Select Language") })
 			.then(pick => {
 				if (pick) {
 					return this.modeService.getOrCreateModeByLanguageName(pick.label)
diff --git a/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts b/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts
index 49289f5eae3..bad8ffc25ad 100644
--- a/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts
+++ b/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts
@@ -4,22 +4,21 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as DOM from 'vs/base/browser/dom';
-import { Button } from 'vs/base/browser/ui/button/button';
-import { VSash } from 'vs/base/browser/ui/sash/sash';
+import { Orientation, Sizing, SplitView } from 'vs/base/browser/ui/splitview/splitview';
 import { Widget } from 'vs/base/browser/ui/widget';
 import * as arrays from 'vs/base/common/arrays';
 import { Delayer, ThrottledDelayer } from 'vs/base/common/async';
+import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
 import { IStringDictionary } from 'vs/base/common/collections';
 import { getErrorMessage, isPromiseCanceledError, onUnexpectedError } from 'vs/base/common/errors';
 import { Emitter, Event } from 'vs/base/common/event';
 import { ArrayNavigator } from 'vs/base/common/iterator';
-import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
 import { Disposable, dispose, IDisposable } from 'vs/base/common/lifecycle';
 import * as strings from 'vs/base/common/strings';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { Command, EditorExtensionsRegistry, IEditorContributionCtor, registerEditorContribution } from 'vs/editor/browser/editorExtensions';
+import { EditorExtensionsRegistry, IEditorContributionCtor, registerEditorContribution } from 'vs/editor/browser/editorExtensions';
 import { CodeEditorWidget } from 'vs/editor/browser/widget/codeEditorWidget';
 import { IEditorOptions } from 'vs/editor/common/config/editorOptions';
 import * as editorCommon from 'vs/editor/common/editorCommon';
@@ -30,9 +29,8 @@ import { MessageController } from 'vs/editor/contrib/message/messageController';
 import { SelectionHighlighter } from 'vs/editor/contrib/multicursor/multicursor';
 import * as nls from 'vs/nls';
 import { ConfigurationTarget } from 'vs/platform/configuration/common/configuration';
-import { ContextKeyExpr, IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRegistry';
+import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
+import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { ILogService } from 'vs/platform/log/common/log';
 import { IProgressService } from 'vs/platform/progress/common/progress';
 import { Registry } from 'vs/platform/registry/common/platform';
@@ -50,21 +48,21 @@ import { ResourceEditorModel } from 'vs/workbench/common/editor/resourceEditorMo
 import { PREFERENCES_EDITOR_ID } from 'vs/workbench/parts/files/common/files';
 import { DefaultSettingsRenderer, FolderSettingsRenderer, IPreferencesRenderer, UserSettingsRenderer, WorkspaceSettingsRenderer } from 'vs/workbench/parts/preferences/browser/preferencesRenderers';
 import { SearchWidget, SettingsTarget, SettingsTargetsWidget } from 'vs/workbench/parts/preferences/browser/preferencesWidgets';
-import { CONTEXT_SETTINGS_EDITOR, CONTEXT_SETTINGS_SEARCH_FOCUS, IPreferencesSearchService, ISearchProvider, SETTINGS_EDITOR_COMMAND_CLEAR_SEARCH_RESULTS, SETTINGS_EDITOR_COMMAND_EDIT_FOCUSED_SETTING, SETTINGS_EDITOR_COMMAND_FOCUS_FILE, SETTINGS_EDITOR_COMMAND_FOCUS_NEXT_SETTING, SETTINGS_EDITOR_COMMAND_FOCUS_PREVIOUS_SETTING, SETTINGS_EDITOR_COMMAND_SEARCH } from 'vs/workbench/parts/preferences/common/preferences';
-import { IFilterResult, IPreferencesService, ISearchResult, ISetting, ISettingsEditorModel, ISettingsGroup } from 'vs/workbench/services/preferences/common/preferences';
+import { CONTEXT_SETTINGS_EDITOR, CONTEXT_SETTINGS_SEARCH_FOCUS, IPreferencesSearchService, ISearchProvider } from 'vs/workbench/parts/preferences/common/preferences';
+import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
+import { IEditorGroup, IEditorGroupsService } from 'vs/workbench/services/group/common/editorGroupsService';
+import { IFilterResult, IPreferencesService, ISearchResult, ISetting, ISettingsEditorModel, ISettingsGroup, SettingsEditorOptions } from 'vs/workbench/services/preferences/common/preferences';
 import { DefaultPreferencesEditorInput, PreferencesEditorInput } from 'vs/workbench/services/preferences/common/preferencesEditorInput';
 import { DefaultSettingsEditorModel, SettingsEditorModel } from 'vs/workbench/services/preferences/common/preferencesModels';
 import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { IEditorGroup, IEditorGroupsService } from 'vs/workbench/services/group/common/editorGroupsService';
+import { IWindowService } from 'vs/platform/windows/common/windows';
 
 export class PreferencesEditor extends BaseEditor {
 
 	public static readonly ID: string = PREFERENCES_EDITOR_ID;
 
 	private defaultSettingsEditorContextKey: IContextKey<boolean>;
-	private focusSettingsContextKey: IContextKey<boolean>;
+	private searchFocusContextKey: IContextKey<boolean>;
 	private headerContainer: HTMLElement;
 	private searchWidget: SearchWidget;
 	private sideBySidePreferencesWidget: SideBySidePreferencesWidget;
@@ -77,6 +75,18 @@ export class PreferencesEditor extends BaseEditor {
 
 	private lastFocusedWidget: SearchWidget | SideBySidePreferencesWidget = null;
 
+	get minimumWidth(): number { return this.sideBySidePreferencesWidget ? this.sideBySidePreferencesWidget.minimumWidth : 0; }
+	get maximumWidth(): number { return this.sideBySidePreferencesWidget ? this.sideBySidePreferencesWidget.maximumWidth : Number.POSITIVE_INFINITY; }
+
+	// these setters need to exist because this extends from BaseEditor
+	set minimumWidth(value: number) { /*noop*/ }
+	set maximumWidth(value: number) { /*noop*/ }
+
+	readonly minimumHeight = 260;
+
+	private _onDidCreateWidget = new Emitter<{ width: number; height: number; }>();
+	readonly onDidSizeConstraintsChange: Event<{ width: number; height: number; }> = this._onDidCreateWidget.event;
+
 	constructor(
 		@IPreferencesService private preferencesService: IPreferencesService,
 		@ITelemetryService telemetryService: ITelemetryService,
@@ -88,7 +98,7 @@ export class PreferencesEditor extends BaseEditor {
 	) {
 		super(PreferencesEditor.ID, telemetryService, themeService);
 		this.defaultSettingsEditorContextKey = CONTEXT_SETTINGS_EDITOR.bindTo(this.contextKeyService);
-		this.focusSettingsContextKey = CONTEXT_SETTINGS_SEARCH_FOCUS.bindTo(this.contextKeyService);
+		this.searchFocusContextKey = CONTEXT_SETTINGS_SEARCH_FOCUS.bindTo(this.contextKeyService);
 		this.delayedFilterLogging = new Delayer<void>(1000);
 		this.localSearchDelayer = new Delayer(100);
 		this.remoteSearchThrottle = new ThrottledDelayer(200);
@@ -98,25 +108,12 @@ export class PreferencesEditor extends BaseEditor {
 		DOM.addClass(parent, 'preferences-editor');
 
 		this.headerContainer = DOM.append(parent, DOM.$('.preferences-header'));
-		const advertisement = DOM.append(this.headerContainer, DOM.$('.new-settings-ad'));
-		const advertisementLabel = DOM.append(advertisement, DOM.$('span.new-settings-ad-label'));
-		advertisementLabel.textContent = nls.localize('advertisementLabel', "Try a preview of our ") + ' ';
-		const openSettings2Button = this._register(new Button(advertisement, { title: true, buttonBackground: null, buttonHoverBackground: null }));
-		openSettings2Button.style({
-			buttonBackground: null,
-			buttonForeground: null,
-			buttonBorder: null,
-			buttonHoverBackground: null
-		});
-		openSettings2Button.label = nls.localize('openSettings2Label', "new settings editor");
-		openSettings2Button.element.classList.add('open-settings2-button');
-		this._register(openSettings2Button.onDidClick(() => this.preferencesService.openSettings2()));
-
 		this.searchWidget = this._register(this.instantiationService.createInstance(SearchWidget, this.headerContainer, {
 			ariaLabel: nls.localize('SearchSettingsWidget.AriaLabel', "Search settings"),
 			placeholder: nls.localize('SearchSettingsWidget.Placeholder', "Search Settings"),
-			focusKey: this.focusSettingsContextKey,
-			showResultCount: true
+			focusKey: this.searchFocusContextKey,
+			showResultCount: true,
+			ariaLive: 'assertive'
 		}));
 		this._register(this.searchWidget.onDidChange(value => this.onInputChanged()));
 		this._register(this.searchWidget.onFocus(() => this.lastFocusedWidget = this.searchWidget));
@@ -124,6 +121,7 @@ export class PreferencesEditor extends BaseEditor {
 
 		const editorsContainer = DOM.append(parent, DOM.$('.preferences-editors-container'));
 		this.sideBySidePreferencesWidget = this._register(this.instantiationService.createInstance(SideBySidePreferencesWidget, editorsContainer));
+		this._onDidCreateWidget.fire();
 		this._register(this.sideBySidePreferencesWidget.onFocus(() => this.lastFocusedWidget = this.sideBySidePreferencesWidget));
 		this._register(this.sideBySidePreferencesWidget.onDidSettingsTargetChange(target => this.switchSettings(target)));
 
@@ -154,8 +152,12 @@ export class PreferencesEditor extends BaseEditor {
 		this.preferencesRenderers.editFocusedPreference();
 	}
 
-	public setInput(newInput: PreferencesEditorInput, options: EditorOptions, token: CancellationToken): Thenable<void> {
+	public setInput(newInput: PreferencesEditorInput, options: SettingsEditorOptions, token: CancellationToken): Thenable<void> {
 		this.defaultSettingsEditorContextKey.set(true);
+		if (options && options.query) {
+			this.focusSearch(options.query);
+		}
+
 		return super.setInput(newInput, options, token).then(() => this.updateInput(newInput, options, token));
 	}
 
@@ -196,10 +198,6 @@ export class PreferencesEditor extends BaseEditor {
 		super.clearInput();
 	}
 
-	public supportsCenteredLayout(): boolean {
-		return false;
-	}
-
 	protected setEditorVisible(visible: boolean, group: IEditorGroup): void {
 		this.sideBySidePreferencesWidget.setEditorVisible(visible, group);
 		super.setEditorVisible(visible, group);
@@ -234,8 +232,8 @@ export class PreferencesEditor extends BaseEditor {
 	private triggerSearch(query: string): TPromise<void> {
 		if (query) {
 			return TPromise.join([
-				this.localSearchDelayer.trigger(() => this.preferencesRenderers.localFilterPreferences(query)),
-				this.remoteSearchThrottle.trigger(() => this.progressService.showWhile(this.preferencesRenderers.remoteSearchPreferences(query), 500))
+				this.localSearchDelayer.trigger(() => this.preferencesRenderers.localFilterPreferences(query).then(() => { })),
+				this.remoteSearchThrottle.trigger(() => TPromise.wrap(this.progressService.showWhile(this.preferencesRenderers.remoteSearchPreferences(query), 500)))
 			]) as TPromise;
 		} else {
 			// When clearing the input, update immediately to clear it
@@ -253,13 +251,13 @@ export class PreferencesEditor extends BaseEditor {
 			this.focus();
 		}
 		const promise = this.input && this.input.isDirty() ? this.input.save() : TPromise.as(true);
-		promise.done(value => {
+		promise.then(value => {
 			if (target === ConfigurationTarget.USER) {
-				this.preferencesService.switchSettings(ConfigurationTarget.USER, this.preferencesService.userSettingsResource);
+				this.preferencesService.switchSettings(ConfigurationTarget.USER, this.preferencesService.userSettingsResource, true);
 			} else if (target === ConfigurationTarget.WORKSPACE) {
-				this.preferencesService.switchSettings(ConfigurationTarget.WORKSPACE, this.preferencesService.workspaceSettingsResource);
+				this.preferencesService.switchSettings(ConfigurationTarget.WORKSPACE, this.preferencesService.workspaceSettingsResource, true);
 			} else if (target instanceof URI) {
-				this.preferencesService.switchSettings(ConfigurationTarget.WORKSPACE_FOLDER, target);
+				this.preferencesService.switchSettings(ConfigurationTarget.WORKSPACE_FOLDER, target, true);
 			}
 		});
 	}
@@ -328,6 +326,11 @@ export class PreferencesEditor extends BaseEditor {
 			this._lastReportedFilter = filter;
 		}
 	}
+
+	dispose(): void {
+		this._onDidCreateWidget.dispose();
+		super.dispose();
+	}
 }
 
 class SettingsNavigator extends ArrayNavigator<ISetting> {
@@ -359,7 +362,7 @@ class PreferencesRenderersController extends Disposable {
 	private _editablePreferencesRendererDisposables: IDisposable[] = [];
 
 	private _settingsNavigator: SettingsNavigator;
-	private _remoteFilterInProgress: TPromise<any>;
+	private _remoteFilterCancelToken: CancellationTokenSource;
 	private _prefsModelsForSearch = new Map<string, ISettingsEditorModel>();
 
 	private _currentLocalSearchProvider: ISearchProvider;
@@ -422,9 +425,11 @@ class PreferencesRenderersController extends Disposable {
 		}
 	}
 
-	private async _onEditableContentDidChange(): TPromise<void> {
-		await this.localFilterPreferences(this._lastQuery, true);
-		await this.remoteSearchPreferences(this._lastQuery, true);
+	private async _onEditableContentDidChange(): Promise<void> {
+		const foundExactMatch = await this.localFilterPreferences(this._lastQuery, true);
+		if (!foundExactMatch) {
+			await this.remoteSearchPreferences(this._lastQuery, true);
+		}
 	}
 
 	onHidden(): void {
@@ -433,17 +438,25 @@ class PreferencesRenderersController extends Disposable {
 	}
 
 	remoteSearchPreferences(query: string, updateCurrentResults?: boolean): TPromise<void> {
-		if (this._remoteFilterInProgress && this._remoteFilterInProgress.cancel) {
-			// Resolved/rejected promises have no .cancel()
-			this._remoteFilterInProgress.cancel();
+		if (this.lastFilterResult && this.lastFilterResult.exactMatch) {
+			// Skip and clear remote search
+			query = '';
+		}
+
+		if (this._remoteFilterCancelToken) {
+			this._remoteFilterCancelToken.cancel();
+			this._remoteFilterCancelToken.dispose();
+			this._remoteFilterCancelToken = null;
 		}
 
 		this._currentRemoteSearchProvider = (updateCurrentResults && this._currentRemoteSearchProvider) || this.preferencesSearchService.getRemoteSearchProvider(query);
 
-		this._remoteFilterInProgress = this.filterOrSearchPreferences(query, this._currentRemoteSearchProvider, 'nlpResult', nls.localize('nlpResult', "Natural Language Results"), 1, updateCurrentResults);
-
-		return this._remoteFilterInProgress.then(() => {
-			this._remoteFilterInProgress = null;
+		this._remoteFilterCancelToken = new CancellationTokenSource();
+		return this.filterOrSearchPreferences(query, this._currentRemoteSearchProvider, 'nlpResult', nls.localize('nlpResult', "Natural Language Results"), 1, this._remoteFilterCancelToken.token, updateCurrentResults).then(() => {
+			if (this._remoteFilterCancelToken) {
+				this._remoteFilterCancelToken.dispose();
+				this._remoteFilterCancelToken = null;
+			}
 		}, err => {
 			if (isPromiseCanceledError(err)) {
 				return null;
@@ -453,26 +466,26 @@ class PreferencesRenderersController extends Disposable {
 		});
 	}
 
-	localFilterPreferences(query: string, updateCurrentResults?: boolean): TPromise<void> {
+	localFilterPreferences(query: string, updateCurrentResults?: boolean): TPromise<boolean> {
 		if (this._settingsNavigator) {
 			this._settingsNavigator.reset();
 		}
 
 		this._currentLocalSearchProvider = (updateCurrentResults && this._currentLocalSearchProvider) || this.preferencesSearchService.getLocalSearchProvider(query);
-		return this.filterOrSearchPreferences(query, this._currentLocalSearchProvider, 'filterResult', nls.localize('filterResult', "Filtered Results"), 0, updateCurrentResults);
+		return this.filterOrSearchPreferences(query, this._currentLocalSearchProvider, 'filterResult', nls.localize('filterResult', "Filtered Results"), 0, undefined, updateCurrentResults);
 	}
 
-	private filterOrSearchPreferences(query: string, searchProvider: ISearchProvider, groupId: string, groupLabel: string, groupOrder: number, editableContentOnly?: boolean): TPromise<void> {
+	private filterOrSearchPreferences(query: string, searchProvider: ISearchProvider, groupId: string, groupLabel: string, groupOrder: number, token?: CancellationToken, editableContentOnly?: boolean): TPromise<boolean> {
 		this._lastQuery = query;
 
-		const filterPs: TPromise<any>[] = [this._filterOrSearchPreferences(query, this.editablePreferencesRenderer, searchProvider, groupId, groupLabel, groupOrder)];
+		const filterPs: TPromise<IFilterResult>[] = [this._filterOrSearchPreferences(query, this.editablePreferencesRenderer, searchProvider, groupId, groupLabel, groupOrder, token)];
 		if (!editableContentOnly) {
 			filterPs.push(
-				this._filterOrSearchPreferences(query, this.defaultPreferencesRenderer, searchProvider, groupId, groupLabel, groupOrder));
+				this._filterOrSearchPreferences(query, this.defaultPreferencesRenderer, searchProvider, groupId, groupLabel, groupOrder, token));
+			filterPs.push(
+				this.searchAllSettingsTargets(query, searchProvider, groupId, groupLabel, groupOrder, token).then(() => null));
 		}
 
-		filterPs.push(this.searchAllSettingsTargets(query, searchProvider, groupId, groupLabel, groupOrder));
-
 		return TPromise.join(filterPs).then(results => {
 			let [editableFilterResult, defaultFilterResult] = results;
 
@@ -481,36 +494,36 @@ class PreferencesRenderersController extends Disposable {
 			}
 
 			this.consolidateAndUpdate(defaultFilterResult, editableFilterResult);
-			if (defaultFilterResult) {
-				this._lastFilterResult = defaultFilterResult;
-			}
+			this._lastFilterResult = defaultFilterResult;
+
+			return defaultFilterResult && defaultFilterResult.exactMatch;
 		});
 	}
 
-	private searchAllSettingsTargets(query: string, searchProvider: ISearchProvider, groupId: string, groupLabel: string, groupOrder: number): TPromise<void> {
+	private searchAllSettingsTargets(query: string, searchProvider: ISearchProvider, groupId: string, groupLabel: string, groupOrder: number, token?: CancellationToken): TPromise<void> {
 		const searchPs = [
-			this.searchSettingsTarget(query, searchProvider, ConfigurationTarget.WORKSPACE, groupId, groupLabel, groupOrder),
-			this.searchSettingsTarget(query, searchProvider, ConfigurationTarget.USER, groupId, groupLabel, groupOrder)
+			this.searchSettingsTarget(query, searchProvider, ConfigurationTarget.WORKSPACE, groupId, groupLabel, groupOrder, token),
+			this.searchSettingsTarget(query, searchProvider, ConfigurationTarget.USER, groupId, groupLabel, groupOrder, token)
 		];
 
 		for (const folder of this.workspaceContextService.getWorkspace().folders) {
 			const folderSettingsResource = this.preferencesService.getFolderSettingsResource(folder.uri);
-			searchPs.push(this.searchSettingsTarget(query, searchProvider, folderSettingsResource, groupId, groupLabel, groupOrder));
+			searchPs.push(this.searchSettingsTarget(query, searchProvider, folderSettingsResource, groupId, groupLabel, groupOrder, token));
 		}
 
 
 		return TPromise.join(searchPs).then(() => { });
 	}
 
-	private searchSettingsTarget(query: string, provider: ISearchProvider, target: SettingsTarget, groupId: string, groupLabel: string, groupOrder: number): TPromise<void> {
+	private searchSettingsTarget(query: string, provider: ISearchProvider, target: SettingsTarget, groupId: string, groupLabel: string, groupOrder: number, token?: CancellationToken): Promise<void> {
 		if (!query) {
 			// Don't open the other settings targets when query is empty
 			this._onDidFilterResultsCountChange.fire({ target, count: 0 });
-			return TPromise.wrap(null);
+			return Promise.resolve(null);
 		}
 
 		return this.getPreferencesEditorModel(target).then(model => {
-			return model && this._filterOrSearchPreferencesModel('', <ISettingsEditorModel>model, provider, groupId, groupLabel, groupOrder);
+			return model && this._filterOrSearchPreferencesModel('', <ISettingsEditorModel>model, provider, groupId, groupLabel, groupOrder, token);
 		}).then(result => {
 			const count = result ? this._flatten(result.filteredGroups).length : 0;
 			this._onDidFilterResultsCountChange.fire({ target, count });
@@ -523,7 +536,7 @@ class PreferencesRenderersController extends Disposable {
 		});
 	}
 
-	private async getPreferencesEditorModel(target: SettingsTarget): TPromise<ISettingsEditorModel | null> {
+	private async getPreferencesEditorModel(target: SettingsTarget): Promise<ISettingsEditorModel | null> {
 		const resource = target === ConfigurationTarget.USER ? this.preferencesService.userSettingsResource :
 			target === ConfigurationTarget.WORKSPACE ? this.preferencesService.workspaceSettingsResource :
 				target;
@@ -568,20 +581,20 @@ class PreferencesRenderersController extends Disposable {
 		}
 	}
 
-	private _filterOrSearchPreferences(filter: string, preferencesRenderer: IPreferencesRenderer<ISetting>, provider: ISearchProvider, groupId: string, groupLabel: string, groupOrder: number): TPromise<IFilterResult> {
+	private _filterOrSearchPreferences(filter: string, preferencesRenderer: IPreferencesRenderer<ISetting>, provider: ISearchProvider, groupId: string, groupLabel: string, groupOrder: number, token?: CancellationToken): TPromise<IFilterResult> {
 		if (!preferencesRenderer) {
 			return TPromise.wrap(null);
 		}
 
 		const model = <ISettingsEditorModel>preferencesRenderer.preferencesModel;
-		return this._filterOrSearchPreferencesModel(filter, model, provider, groupId, groupLabel, groupOrder).then(filterResult => {
+		return this._filterOrSearchPreferencesModel(filter, model, provider, groupId, groupLabel, groupOrder, token).then(filterResult => {
 			preferencesRenderer.filterPreferences(filterResult);
 			return filterResult;
 		});
 	}
 
-	private _filterOrSearchPreferencesModel(filter: string, model: ISettingsEditorModel, provider: ISearchProvider, groupId: string, groupLabel: string, groupOrder: number): TPromise<IFilterResult> {
-		const searchP = provider ? provider.searchModel(model) : TPromise.wrap(null);
+	private _filterOrSearchPreferencesModel(filter: string, model: ISettingsEditorModel, provider: ISearchProvider, groupId: string, groupLabel: string, groupOrder: number, token?: CancellationToken): TPromise<IFilterResult> {
+		const searchP = provider ? provider.searchModel(model, token) : TPromise.wrap(null);
 		return searchP
 			.then<ISearchResult>(null, err => {
 				if (isPromiseCanceledError(err)) {
@@ -603,6 +616,10 @@ class PreferencesRenderersController extends Disposable {
 				}
 			})
 			.then(searchResult => {
+				if (token && token.isCancellationRequested) {
+					searchResult = null;
+				}
+
 				const filterResult = searchResult ?
 					model.updateResultGroup(groupId, {
 						id: groupId,
@@ -614,6 +631,7 @@ class PreferencesRenderersController extends Disposable {
 
 				if (filterResult) {
 					filterResult.query = filter;
+					filterResult.exactMatch = searchResult && searchResult.exactMatch;
 				}
 
 				return filterResult;
@@ -741,7 +759,7 @@ class PreferencesRenderersController extends Disposable {
 
 class SideBySidePreferencesWidget extends Widget {
 
-	private dimension: DOM.Dimension;
+	private dimension: DOM.Dimension = new DOM.Dimension(0, 0);
 
 	private defaultPreferencesHeader: HTMLElement;
 	private defaultPreferencesEditor: DefaultPreferencesEditor;
@@ -758,30 +776,29 @@ class SideBySidePreferencesWidget extends Widget {
 	readonly onDidSettingsTargetChange: Event<SettingsTarget> = this._onDidSettingsTargetChange.event;
 
 	private lastFocusedEditor: BaseEditor;
+	private splitview: SplitView;
 
-	private sash: VSash;
+	get minimumWidth(): number { return this.splitview.minimumSize; }
+	get maximumWidth(): number { return this.splitview.maximumSize; }
 
 	constructor(
-		parent: HTMLElement,
+		parentElement: HTMLElement,
 		@IInstantiationService private instantiationService: IInstantiationService,
 		@IThemeService private themeService: IThemeService,
 		@IWorkspaceContextService private workspaceContextService: IWorkspaceContextService,
 		@IPreferencesService private preferencesService: IPreferencesService,
 	) {
 		super();
-		this.create(parent);
-	}
 
-	private create(parentElement: HTMLElement): void {
 		DOM.addClass(parentElement, 'side-by-side-preferences-editor');
-		this.createSash(parentElement);
 
-		this.defaultPreferencesEditorContainer = DOM.append(parentElement, DOM.$('.default-preferences-editor-container'));
-		this.defaultPreferencesEditorContainer.style.position = 'absolute';
+		this.splitview = new SplitView(parentElement, { orientation: Orientation.HORIZONTAL });
+		this._register(this.splitview);
+		this._register(this.splitview.onDidSashReset(() => this.splitview.distributeViewSizes()));
+
+		this.defaultPreferencesEditorContainer = DOM.$('.default-preferences-editor-container');
 
 		const defaultPreferencesHeaderContainer = DOM.append(this.defaultPreferencesEditorContainer, DOM.$('.preferences-header-container'));
-		defaultPreferencesHeaderContainer.style.height = '30px';
-		defaultPreferencesHeaderContainer.style.marginBottom = '4px';
 		this.defaultPreferencesHeader = DOM.append(defaultPreferencesHeaderContainer, DOM.$('div.default-preferences-header'));
 		this.defaultPreferencesHeader.textContent = nls.localize('defaultSettings', "Default Settings");
 
@@ -789,11 +806,16 @@ class SideBySidePreferencesWidget extends Widget {
 		this.defaultPreferencesEditor.create(this.defaultPreferencesEditorContainer);
 		(<CodeEditorWidget>this.defaultPreferencesEditor.getControl()).onDidFocusEditorWidget(() => this.lastFocusedEditor = this.defaultPreferencesEditor);
 
-		this.editablePreferencesEditorContainer = DOM.append(parentElement, DOM.$('.editable-preferences-editor-container'));
-		this.editablePreferencesEditorContainer.style.position = 'absolute';
+		this.splitview.addView({
+			element: this.defaultPreferencesEditorContainer,
+			layout: size => this.defaultPreferencesEditor.layout(new DOM.Dimension(size, this.dimension.height - 34 /* height of header container */)),
+			minimumSize: 220,
+			maximumSize: Number.POSITIVE_INFINITY,
+			onDidChange: Event.None
+		}, Sizing.Distribute);
+
+		this.editablePreferencesEditorContainer = DOM.$('.editable-preferences-editor-container');
 		const editablePreferencesHeaderContainer = DOM.append(this.editablePreferencesEditorContainer, DOM.$('.preferences-header-container'));
-		editablePreferencesHeaderContainer.style.height = '30px';
-		editablePreferencesHeaderContainer.style.marginBottom = '4px';
 		this.settingsTargetsWidget = this._register(this.instantiationService.createInstance(SettingsTargetsWidget, editablePreferencesHeaderContainer));
 		this._register(this.settingsTargetsWidget.onDidTargetChange(target => this._onDidSettingsTargetChange.fire(target)));
 
@@ -807,21 +829,28 @@ class SideBySidePreferencesWidget extends Widget {
 			}
 		}));
 
+		this.splitview.addView({
+			element: this.editablePreferencesEditorContainer,
+			layout: size => this.editablePreferencesEditor && this.editablePreferencesEditor.layout(new DOM.Dimension(size, this.dimension.height - 34 /* height of header container */)),
+			minimumSize: 220,
+			maximumSize: Number.POSITIVE_INFINITY,
+			onDidChange: Event.None
+		}, Sizing.Distribute);
+
 		const focusTracker = this._register(DOM.trackFocus(parentElement));
 		this._register(focusTracker.onDidFocus(() => this._onFocus.fire()));
 	}
 
-	public setInput(defaultPreferencesEditorInput: DefaultPreferencesEditorInput, editablePreferencesEditorInput: EditorInput, options: EditorOptions, token: CancellationToken): TPromise<{ defaultPreferencesRenderer: IPreferencesRenderer<ISetting>, editablePreferencesRenderer: IPreferencesRenderer<ISetting> }> {
+	public setInput(defaultPreferencesEditorInput: DefaultPreferencesEditorInput, editablePreferencesEditorInput: EditorInput, options: EditorOptions, token: CancellationToken): TPromise<{ defaultPreferencesRenderer?: IPreferencesRenderer<ISetting>, editablePreferencesRenderer?: IPreferencesRenderer<ISetting> }> {
 		this.getOrCreateEditablePreferencesEditor(editablePreferencesEditorInput);
 		this.settingsTargetsWidget.settingsTarget = this.getSettingsTarget(editablePreferencesEditorInput.getResource());
-		this.dolayout(this.sash.getVerticalSashLeft());
 		return TPromise.join([
 			this.updateInput(this.defaultPreferencesEditor, defaultPreferencesEditorInput, DefaultSettingsEditorContribution.ID, editablePreferencesEditorInput.getResource(), options, token),
 			this.updateInput(this.editablePreferencesEditor, editablePreferencesEditorInput, SettingsEditorContribution.ID, defaultPreferencesEditorInput.getResource(), options, token)
 		])
 			.then(([defaultPreferencesRenderer, editablePreferencesRenderer]) => {
 				if (token.isCancellationRequested) {
-					return void 0;
+					return {};
 				}
 
 				this.defaultPreferencesHeader.textContent = defaultPreferencesRenderer && this.getDefaultPreferencesHeaderText((<DefaultSettingsEditorModel>defaultPreferencesRenderer.preferencesModel).target);
@@ -845,9 +874,9 @@ class SideBySidePreferencesWidget extends Widget {
 		this.settingsTargetsWidget.setResultCount(settingsTarget, count);
 	}
 
-	public layout(dimension: DOM.Dimension): void {
+	public layout(dimension: DOM.Dimension = this.dimension): void {
 		this.dimension = dimension;
-		this.sash.setDimenesion(this.dimension);
+		this.splitview.layout(dimension.width);
 	}
 
 	public focus(): void {
@@ -888,6 +917,7 @@ class SideBySidePreferencesWidget extends Widget {
 		this.editablePreferencesEditor.create(this.editablePreferencesEditorContainer);
 		(<CodeEditorWidget>this.editablePreferencesEditor.getControl()).onDidFocusEditorWidget(() => this.lastFocusedEditor = this.editablePreferencesEditor);
 		this.lastFocusedEditor = this.editablePreferencesEditor;
+		this.layout();
 
 		return editor;
 	}
@@ -903,30 +933,6 @@ class SideBySidePreferencesWidget extends Widget {
 			});
 	}
 
-	private createSash(parentElement: HTMLElement): void {
-		this.sash = this._register(new VSash(parentElement, 220));
-		this._register(this.sash.onPositionChange(position => this.dolayout(position)));
-	}
-
-	private dolayout(splitPoint: number): void {
-		if (!this.editablePreferencesEditor || !this.dimension) {
-			return;
-		}
-		const masterEditorWidth = this.dimension.width - splitPoint;
-		const detailsEditorWidth = this.dimension.width - masterEditorWidth;
-
-		this.defaultPreferencesEditorContainer.style.width = `${detailsEditorWidth}px`;
-		this.defaultPreferencesEditorContainer.style.height = `${this.dimension.height}px`;
-		this.defaultPreferencesEditorContainer.style.left = '0px';
-
-		this.editablePreferencesEditorContainer.style.width = `${masterEditorWidth}px`;
-		this.editablePreferencesEditorContainer.style.height = `${this.dimension.height}px`;
-		this.editablePreferencesEditorContainer.style.left = `${splitPoint}px`;
-
-		this.defaultPreferencesEditor.layout(new DOM.Dimension(detailsEditorWidth, this.dimension.height - 34 /* height of header container */));
-		this.editablePreferencesEditor.layout(new DOM.Dimension(masterEditorWidth, this.dimension.height - 34 /* height of header container */));
-	}
-
 	private getSettingsTarget(resource: URI): SettingsTarget {
 		if (this.preferencesService.userSettingsResource.toString() === resource.toString()) {
 			return ConfigurationTarget.USER;
@@ -974,9 +980,10 @@ export class DefaultPreferencesEditor extends BaseTextEditor {
 		@IThemeService themeService: IThemeService,
 		@ITextFileService textFileService: ITextFileService,
 		@IEditorGroupsService editorGroupService: IEditorGroupsService,
-		@IEditorService editorService: IEditorService
+		@IEditorService editorService: IEditorService,
+		@IWindowService windowService: IWindowService
 	) {
-		super(DefaultPreferencesEditor.ID, telemetryService, instantiationService, storageService, configurationService, themeService, textFileService, editorService, editorGroupService);
+		super(DefaultPreferencesEditor.ID, telemetryService, instantiationService, storageService, configurationService, themeService, textFileService, editorService, editorGroupService, windowService);
 	}
 
 	private static _getContributions(): IEditorContributionCtor[] {
@@ -990,8 +997,8 @@ export class DefaultPreferencesEditor extends BaseTextEditor {
 		const editor = this.instantiationService.createInstance(CodeEditorWidget, parent, configuration, { contributions: DefaultPreferencesEditor._getContributions() });
 
 		// Inform user about editor being readonly if user starts type
-		this.toUnbind.push(editor.onDidType(() => this.showReadonlyHint(editor)));
-		this.toUnbind.push(editor.onDidPaste(() => this.showReadonlyHint(editor)));
+		this._register(editor.onDidType(() => this.showReadonlyHint(editor)));
+		this._register(editor.onDidPaste(() => this.showReadonlyHint(editor)));
 
 		return editor;
 	}
@@ -1054,10 +1061,6 @@ export class DefaultPreferencesEditor extends BaseTextEditor {
 		this.getControl().layout(dimension);
 	}
 
-	public supportsCenteredLayout(): boolean {
-		return false;
-	}
-
 	protected getAriaLabel(): string {
 		return nls.localize('preferencesAriaLabel', "Default preferences. Readonly text editor.");
 	}
@@ -1241,117 +1244,3 @@ class SettingsEditorContribution extends AbstractSettingsEditorContribution impl
 }
 
 registerEditorContribution(SettingsEditorContribution);
-
-abstract class SettingsCommand extends Command {
-
-	protected getPreferencesEditor(accessor: ServicesAccessor): PreferencesEditor {
-		const activeControl = accessor.get(IEditorService).activeControl;
-		if (activeControl instanceof PreferencesEditor) {
-			return activeControl;
-		}
-		return null;
-
-	}
-
-}
-class StartSearchDefaultSettingsCommand extends SettingsCommand {
-
-	public runCommand(accessor: ServicesAccessor, args: any): void {
-		const preferencesEditor = this.getPreferencesEditor(accessor);
-		if (preferencesEditor) {
-			preferencesEditor.focusSearch();
-		}
-	}
-
-}
-const command = new StartSearchDefaultSettingsCommand({
-	id: SETTINGS_EDITOR_COMMAND_SEARCH,
-	precondition: ContextKeyExpr.and(CONTEXT_SETTINGS_EDITOR),
-	kbOpts: { primary: KeyMod.CtrlCmd | KeyCode.KEY_F }
-});
-KeybindingsRegistry.registerCommandAndKeybindingRule(command.toCommandAndKeybindingRule(KeybindingsRegistry.WEIGHT.editorContrib()));
-
-class FocusSettingsFileEditorCommand extends SettingsCommand {
-
-	public runCommand(accessor: ServicesAccessor, args: any): void {
-		const preferencesEditor = this.getPreferencesEditor(accessor);
-		if (preferencesEditor) {
-			preferencesEditor.focusSettingsFileEditor();
-		}
-	}
-
-}
-const focusSettingsFileEditorCommand = new FocusSettingsFileEditorCommand({
-	id: SETTINGS_EDITOR_COMMAND_FOCUS_FILE,
-	precondition: CONTEXT_SETTINGS_SEARCH_FOCUS,
-	kbOpts: { primary: KeyCode.DownArrow }
-});
-KeybindingsRegistry.registerCommandAndKeybindingRule(focusSettingsFileEditorCommand.toCommandAndKeybindingRule(KeybindingsRegistry.WEIGHT.editorContrib()));
-
-class ClearSearchResultsCommand extends SettingsCommand {
-
-	public runCommand(accessor: ServicesAccessor, args: any): void {
-		const preferencesEditor = this.getPreferencesEditor(accessor);
-		if (preferencesEditor) {
-			preferencesEditor.clearSearchResults();
-		}
-	}
-
-}
-const clearSearchResultsCommand = new ClearSearchResultsCommand({
-	id: SETTINGS_EDITOR_COMMAND_CLEAR_SEARCH_RESULTS,
-	precondition: CONTEXT_SETTINGS_SEARCH_FOCUS,
-	kbOpts: { primary: KeyCode.Escape }
-});
-KeybindingsRegistry.registerCommandAndKeybindingRule(clearSearchResultsCommand.toCommandAndKeybindingRule(KeybindingsRegistry.WEIGHT.editorContrib()));
-
-class FocusNextSearchResultCommand extends SettingsCommand {
-
-	public runCommand(accessor: ServicesAccessor, args: any): void {
-		const preferencesEditor = this.getPreferencesEditor(accessor);
-		if (preferencesEditor) {
-			preferencesEditor.focusNextResult();
-		}
-	}
-
-}
-const focusNextSearchResultCommand = new FocusNextSearchResultCommand({
-	id: SETTINGS_EDITOR_COMMAND_FOCUS_NEXT_SETTING,
-	precondition: CONTEXT_SETTINGS_SEARCH_FOCUS,
-	kbOpts: { primary: KeyCode.Enter }
-});
-KeybindingsRegistry.registerCommandAndKeybindingRule(focusNextSearchResultCommand.toCommandAndKeybindingRule(KeybindingsRegistry.WEIGHT.editorContrib()));
-
-class FocusPreviousSearchResultCommand extends SettingsCommand {
-
-	public runCommand(accessor: ServicesAccessor, args: any): void {
-		const preferencesEditor = this.getPreferencesEditor(accessor);
-		if (preferencesEditor) {
-			preferencesEditor.focusPreviousResult();
-		}
-	}
-
-}
-const focusPreviousSearchResultCommand = new FocusPreviousSearchResultCommand({
-	id: SETTINGS_EDITOR_COMMAND_FOCUS_PREVIOUS_SETTING,
-	precondition: CONTEXT_SETTINGS_SEARCH_FOCUS,
-	kbOpts: { primary: KeyMod.Shift | KeyCode.Enter }
-});
-KeybindingsRegistry.registerCommandAndKeybindingRule(focusPreviousSearchResultCommand.toCommandAndKeybindingRule(KeybindingsRegistry.WEIGHT.editorContrib()));
-
-class EditFocusedSettingCommand extends SettingsCommand {
-
-	public runCommand(accessor: ServicesAccessor, args: any): void {
-		const preferencesEditor = this.getPreferencesEditor(accessor);
-		if (preferencesEditor) {
-			preferencesEditor.editFocusedPreference();
-		}
-	}
-
-}
-const editFocusedSettingCommand = new EditFocusedSettingCommand({
-	id: SETTINGS_EDITOR_COMMAND_EDIT_FOCUSED_SETTING,
-	precondition: CONTEXT_SETTINGS_SEARCH_FOCUS,
-	kbOpts: { primary: KeyMod.CtrlCmd | KeyCode.US_DOT }
-});
-KeybindingsRegistry.registerCommandAndKeybindingRule(editFocusedSettingCommand.toCommandAndKeybindingRule(KeybindingsRegistry.WEIGHT.editorContrib()));
diff --git a/src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts b/src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts
index 395c614d1d2..da17ebae57b 100644
--- a/src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts
+++ b/src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts
@@ -3,43 +3,37 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { TPromise } from 'vs/base/common/winjs.base';
-import * as nls from 'vs/nls';
-import { Delayer } from 'vs/base/common/async';
-import * as arrays from 'vs/base/common/arrays';
-import { Disposable, IDisposable, dispose } from 'vs/base/common/lifecycle';
-import { Position } from 'vs/editor/common/core/position';
-import { IAction } from 'vs/base/common/actions';
-import { IJSONSchema } from 'vs/base/common/jsonSchema';
-import { Event, Emitter } from 'vs/base/common/event';
-import { Registry } from 'vs/platform/registry/common/platform';
-import * as editorCommon from 'vs/editor/common/editorCommon';
-import { Range, IRange } from 'vs/editor/common/core/range';
-import { IConfigurationRegistry, Extensions as ConfigurationExtensions, ConfigurationScope, IConfigurationPropertySchema } from 'vs/platform/configuration/common/configurationRegistry';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IPreferencesService, ISettingsGroup, ISetting, IPreferencesEditorModel, IFilterResult, ISettingsEditorModel, IExtensionSetting, IScoredResults } from 'vs/workbench/services/preferences/common/preferences';
-import { SettingsEditorModel, DefaultSettingsEditorModel, WorkspaceConfigurationEditorModel } from 'vs/workbench/services/preferences/common/preferencesModels';
-import { ICodeEditor, IEditorMouseEvent, MouseTargetType } from 'vs/editor/browser/editorBrowser';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { SettingsGroupTitleWidget, EditPreferenceWidget, SettingsHeaderWidget, DefaultSettingsHeaderWidget, FloatingClickWidget } from 'vs/workbench/parts/preferences/browser/preferencesWidgets';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { RangeHighlightDecorations } from 'vs/workbench/browser/parts/editor/rangeDecorations';
-import { ICursorPositionChangedEvent } from 'vs/editor/common/controller/cursorEvents';
-import { ModelDecorationOptions } from 'vs/editor/common/model/textModel';
-import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
-import { overrideIdentifierFromKey, IConfigurationService, ConfigurationTarget } from 'vs/platform/configuration/common/configuration';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { ITextModel, IModelDeltaDecoration, TrackedRangeStickiness } from 'vs/editor/common/model';
-import { CodeLensProviderRegistry, CodeLensProvider, ICodeLensSymbol } from 'vs/editor/common/modes';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { getDomNodePagePosition } from 'vs/base/browser/dom';
-import { IssueType, ISettingsSearchIssueReporterData, ISettingSearchResult } from 'vs/platform/issue/common/issue';
-import { ILocalExtension } from 'vs/platform/extensionManagement/common/extensionManagement';
-import { IWorkbenchIssueService } from 'vs/workbench/services/issue/common/issue';
-import { IEditorService, SIDE_GROUP } from 'vs/workbench/services/editor/common/editorService';
-import { INotificationService } from 'vs/platform/notification/common/notification';
 import { ContextSubMenu } from 'vs/base/browser/contextmenu';
+import { getDomNodePagePosition } from 'vs/base/browser/dom';
+import { IAction } from 'vs/base/common/actions';
+import { Delayer } from 'vs/base/common/async';
+import { Emitter, Event } from 'vs/base/common/event';
+import { IJSONSchema } from 'vs/base/common/jsonSchema';
+import { Disposable, dispose, IDisposable } from 'vs/base/common/lifecycle';
+import { TPromise } from 'vs/base/common/winjs.base';
+import { ICodeEditor, IEditorMouseEvent, MouseTargetType } from 'vs/editor/browser/editorBrowser';
+import { ICursorPositionChangedEvent } from 'vs/editor/common/controller/cursorEvents';
+import { Position } from 'vs/editor/common/core/position';
+import { IRange, Range } from 'vs/editor/common/core/range';
+import * as editorCommon from 'vs/editor/common/editorCommon';
+import { IModelDeltaDecoration, ITextModel, TrackedRangeStickiness } from 'vs/editor/common/model';
+import { ModelDecorationOptions } from 'vs/editor/common/model/textModel';
+import * as nls from 'vs/nls';
+import { ConfigurationTarget, IConfigurationService, overrideIdentifierFromKey } from 'vs/platform/configuration/common/configuration';
+import { ConfigurationScope, Extensions as ConfigurationExtensions, IConfigurationPropertySchema, IConfigurationRegistry } from 'vs/platform/configuration/common/configurationRegistry';
+import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
+import { IEnvironmentService } from 'vs/platform/environment/common/environment';
+import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { INotificationService } from 'vs/platform/notification/common/notification';
+import { Registry } from 'vs/platform/registry/common/platform';
+import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
+import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
+import { RangeHighlightDecorations } from 'vs/workbench/browser/parts/editor/rangeDecorations';
+import { DefaultSettingsHeaderWidget, EditPreferenceWidget, FloatingClickWidget, SettingsGroupTitleWidget, SettingsHeaderWidget } from 'vs/workbench/parts/preferences/browser/preferencesWidgets';
 import { IWorkbenchSettingsConfiguration } from 'vs/workbench/parts/preferences/common/preferences';
+import { IEditorService, SIDE_GROUP } from 'vs/workbench/services/editor/common/editorService';
+import { IFilterResult, IPreferencesEditorModel, IPreferencesService, IScoredResults, ISetting, ISettingsEditorModel, ISettingsGroup } from 'vs/workbench/services/preferences/common/preferences';
+import { DefaultSettingsEditorModel, SettingsEditorModel, WorkspaceConfigurationEditorModel } from 'vs/workbench/services/preferences/common/preferencesModels';
 
 export interface IPreferencesRenderer<T> extends IDisposable {
 	readonly preferencesModel: IPreferencesEditorModel<T>;
@@ -90,7 +84,6 @@ export class UserSettingsRenderer extends Disposable implements IPreferencesRend
 		this._register(this.editSettingActionRenderer.onUpdateSetting(({ key, value, source }) => this._updatePreference(key, value, source)));
 		this._register(this.editor.getModel().onDidChangeContent(() => this.modelChangeDelayer.trigger(() => this.onModelChanged())));
 
-		this.createHeader();
 	}
 
 	public getAssociatedPreferencesModel(): IPreferencesEditorModel<ISetting> {
@@ -100,6 +93,9 @@ export class UserSettingsRenderer extends Disposable implements IPreferencesRend
 	public setAssociatedPreferencesModel(associatedPreferencesModel: IPreferencesEditorModel<ISetting>): void {
 		this.associatedPreferencesModel = associatedPreferencesModel;
 		this.editSettingActionRenderer.associatedPreferencesModel = associatedPreferencesModel;
+
+		// Create header only in Settings editor mode
+		this.createHeader();
 	}
 
 	protected createHeader(): void {
@@ -239,10 +235,8 @@ export class DefaultSettingsRenderer extends Disposable implements IPreferencesR
 	private filteredMatchesRenderer: FilteredMatchesRenderer;
 	private hiddenAreasRenderer: HiddenAreasRenderer;
 	private editSettingActionRenderer: EditSettingRenderer;
-	private issueWidgetRenderer: IssueWidgetRenderer;
 	private feedbackWidgetRenderer: FeedbackWidgetRenderer;
 	private bracesHidingRenderer: BracesHidingRenderer;
-	private extensionCodelensRenderer: ExtensionCodelensRenderer;
 	private filterResult: IFilterResult;
 
 	private readonly _onUpdatePreference: Emitter<{ key: string, value: any, source: IIndexedSetting }> = new Emitter<{ key: string, value: any, source: IIndexedSetting }>();
@@ -265,11 +259,9 @@ export class DefaultSettingsRenderer extends Disposable implements IPreferencesR
 		this.settingsGroupTitleRenderer = this._register(instantiationService.createInstance(SettingsGroupTitleRenderer, editor));
 		this.filteredMatchesRenderer = this._register(instantiationService.createInstance(FilteredMatchesRenderer, editor));
 		this.editSettingActionRenderer = this._register(instantiationService.createInstance(EditSettingRenderer, editor, preferencesModel, this.settingHighlighter));
-		this.issueWidgetRenderer = this._register(instantiationService.createInstance(IssueWidgetRenderer, editor));
 		this.feedbackWidgetRenderer = this._register(instantiationService.createInstance(FeedbackWidgetRenderer, editor));
 		this.bracesHidingRenderer = this._register(instantiationService.createInstance(BracesHidingRenderer, editor, preferencesModel));
 		this.hiddenAreasRenderer = this._register(instantiationService.createInstance(HiddenAreasRenderer, editor, [this.settingsGroupTitleRenderer, this.filteredMatchesRenderer, this.bracesHidingRenderer]));
-		this.extensionCodelensRenderer = this._register(instantiationService.createInstance(ExtensionCodelensRenderer, editor));
 
 		this._register(this.editSettingActionRenderer.onUpdateSetting(e => this._onUpdatePreference.fire(e)));
 		this._register(this.settingsGroupTitleRenderer.onHiddenAreasChanged(() => this.hiddenAreasRenderer.render()));
@@ -288,7 +280,6 @@ export class DefaultSettingsRenderer extends Disposable implements IPreferencesR
 	public render() {
 		this.settingsGroupTitleRenderer.render(this.preferencesModel.settingsGroups);
 		this.editSettingActionRenderer.render(this.preferencesModel.settingsGroups, this._associatedPreferencesModel);
-		this.issueWidgetRenderer.render(null);
 		this.feedbackWidgetRenderer.render(null);
 		this.settingHighlighter.clear(true);
 		this.bracesHidingRenderer.render(null, this.preferencesModel.settingsGroups);
@@ -307,7 +298,6 @@ export class DefaultSettingsRenderer extends Disposable implements IPreferencesR
 			this.settingHighlighter.clear(true);
 			this.bracesHidingRenderer.render(filterResult, this.preferencesModel.settingsGroups);
 			this.editSettingActionRenderer.render(filterResult.filteredGroups, this._associatedPreferencesModel);
-			this.extensionCodelensRenderer.render(filterResult);
 		} else {
 			this.settingHighlighter.clear(true);
 			this.filteredMatchesRenderer.render(null, this.preferencesModel.settingsGroups);
@@ -317,7 +307,6 @@ export class DefaultSettingsRenderer extends Disposable implements IPreferencesR
 			this.settingsGroupTitleRenderer.showGroup(0);
 			this.bracesHidingRenderer.render(null, this.preferencesModel.settingsGroups);
 			this.editSettingActionRenderer.render(this.preferencesModel.settingsGroups, this._associatedPreferencesModel);
-			this.extensionCodelensRenderer.render(null);
 		}
 
 		this.hiddenAreasRenderer.render();
@@ -326,11 +315,9 @@ export class DefaultSettingsRenderer extends Disposable implements IPreferencesR
 	private renderIssueWidget(filterResult: IFilterResult): void {
 		const workbenchSettings = this.configurationService.getValue<IWorkbenchSettingsConfiguration>().workbench.settings;
 		if (workbenchSettings.enableNaturalLanguageSearchFeedback) {
-			this.issueWidgetRenderer.render(null);
 			this.feedbackWidgetRenderer.render(filterResult);
 		} else {
 			this.feedbackWidgetRenderer.render(null);
-			this.issueWidgetRenderer.render(filterResult);
 		}
 	}
 
@@ -775,88 +762,6 @@ export class FeedbackWidgetRenderer extends Disposable {
 	}
 }
 
-export class IssueWidgetRenderer extends Disposable {
-	private _issueWidget: FloatingClickWidget;
-	private _currentResult: IFilterResult;
-
-	constructor(private editor: ICodeEditor,
-		@IInstantiationService private instantiationService: IInstantiationService,
-		@IWorkbenchIssueService private issueService: IWorkbenchIssueService,
-		@IEnvironmentService private environmentService: IEnvironmentService
-	) {
-		super();
-	}
-
-	public render(result: IFilterResult): void {
-		this._currentResult = result;
-		if (result && result.metadata && this.environmentService.appQuality !== 'stable') {
-			this.showWidget();
-		} else if (this._issueWidget) {
-			this.disposeWidget();
-		}
-	}
-
-	private showWidget(): void {
-		if (!this._issueWidget) {
-			this._issueWidget = this._register(this.instantiationService.createInstance(FloatingClickWidget, this.editor, nls.localize('reportSettingsSearchIssue', "Report Issue"), null));
-			this._register(this._issueWidget.onClick(() => this.showIssueReporter()));
-			this._issueWidget.render();
-		}
-	}
-
-	private showIssueReporter(): TPromise<void> {
-		const nlpMetadata = this._currentResult.metadata['nlpResult'];
-		const results = nlpMetadata.scoredResults;
-
-		const enabledExtensions = nlpMetadata.extensions;
-		const issueResults = Object.keys(results)
-			.map(key => (<ISettingSearchResult>{
-				key: key.split('##')[1],
-				extensionId: results[key].packageId === 'core' ?
-					'core' :
-					this.getExtensionIdByGuid(enabledExtensions, results[key].packageId),
-				score: results[key].score
-			}))
-			.slice(0, 20);
-
-		const issueReporterData: Partial<ISettingsSearchIssueReporterData> = {
-			enabledExtensions,
-			issueType: IssueType.SettingsSearchIssue,
-			actualSearchResults: issueResults,
-			filterResultCount: this.getFilterResultCount(),
-			query: this._currentResult.query
-		};
-
-		return this.issueService.openReporter(issueReporterData);
-	}
-
-	private getFilterResultCount(): number {
-		const filterResultGroup = arrays.first(this._currentResult.filteredGroups, group => group.id === 'filterResult');
-		return filterResultGroup ?
-			filterResultGroup.sections[0].settings.length :
-			0;
-	}
-
-	private getExtensionIdByGuid(extensions: ILocalExtension[], guid: string): string {
-		const match = arrays.first(extensions, ext => ext.identifier.uuid === guid);
-
-		// identifier.id includes the version, not needed here
-		return match && `${match.manifest.publisher}.${match.manifest.name}`;
-	}
-
-	private disposeWidget(): void {
-		if (this._issueWidget) {
-			this._issueWidget.dispose();
-			this._issueWidget = null;
-		}
-	}
-
-	public dispose() {
-		this.disposeWidget();
-		super.dispose();
-	}
-}
-
 export class FilteredMatchesRenderer extends Disposable implements HiddenAreasProvider {
 
 	private decorationIds: string[] = [];
@@ -946,51 +851,6 @@ export class HighlightMatchesRenderer extends Disposable {
 	}
 }
 
-export class ExtensionCodelensRenderer extends Disposable implements CodeLensProvider {
-	private filterResult: IFilterResult;
-
-	constructor() {
-		super();
-		this._register(CodeLensProviderRegistry.register({ pattern: '**/settings.json' }, this));
-	}
-
-	public render(filterResult: IFilterResult): void {
-		this.filterResult = filterResult;
-	}
-
-	public provideCodeLenses(model: ITextModel, token: CancellationToken): ICodeLensSymbol[] {
-		if (!this.filterResult || !this.filterResult.filteredGroups) {
-			return [];
-		}
-
-		const newExtensionGroup = arrays.first(this.filterResult.filteredGroups, g => g.id === 'newExtensionsResult');
-		if (!newExtensionGroup) {
-			return [];
-		}
-
-		return newExtensionGroup.sections[0].settings
-			.filter((s: IExtensionSetting) => {
-				// Skip any non IExtensionSettings that somehow got in here
-				return s.extensionName && s.extensionPublisher;
-			})
-			.map((s: IExtensionSetting) => {
-				const extId = s.extensionPublisher + '.' + s.extensionName;
-				return <ICodeLensSymbol>{
-					command: {
-						title: nls.localize('newExtensionLabel', "Show Extension \"{0}\"", extId),
-						id: 'workbench.extensions.action.showExtensionsWithId',
-						arguments: [extId.toLowerCase()]
-					},
-					range: new Range(s.keyRange.startLineNumber, 1, s.keyRange.startLineNumber, 1)
-				};
-			});
-	}
-
-	public resolveCodeLens(model: ITextModel, codeLens: ICodeLensSymbol, token: CancellationToken): ICodeLensSymbol {
-		return codeLens;
-	}
-}
-
 export interface IIndexedSetting extends ISetting {
 	index: number;
 	groupId: string;
diff --git a/src/vs/workbench/parts/preferences/browser/preferencesWidgets.ts b/src/vs/workbench/parts/preferences/browser/preferencesWidgets.ts
index 69dc294f532..0f889e700b9 100644
--- a/src/vs/workbench/parts/preferences/browser/preferencesWidgets.ts
+++ b/src/vs/workbench/parts/preferences/browser/preferencesWidgets.ts
@@ -4,8 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { localize } from 'vs/nls';
-import URI from 'vs/base/common/uri';
-import { $ } from 'vs/base/browser/builder';
+import { URI } from 'vs/base/common/uri';
 import * as DOM from 'vs/base/browser/dom';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { Disposable, IDisposable, dispose } from 'vs/base/common/lifecycle';
@@ -318,7 +317,7 @@ export class FolderSettingsActionItem extends BaseActionItem {
 	}
 
 	public render(container: HTMLElement): void {
-		this.builder = $(container);
+		this.element = container;
 
 		this.container = container;
 		this.labelElement = DOM.$('.action-title');
@@ -356,11 +355,11 @@ export class FolderSettingsActionItem extends BaseActionItem {
 		}
 	}
 
-	protected _updateEnabled(): void {
+	protected updateEnabled(): void {
 		this.update();
 	}
 
-	protected _updateChecked(): void {
+	protected updateChecked(): void {
 		this.update();
 	}
 
@@ -561,6 +560,8 @@ export class SettingsTargetsWidget extends Widget {
 export interface SearchOptions extends IInputOptions {
 	focusKey?: IContextKey<boolean>;
 	showResultCount?: boolean;
+	ariaLive?: string;
+	ariaLabelledBy?: string;
 }
 
 export class SearchWidget extends Widget {
@@ -608,7 +609,10 @@ export class SearchWidget extends Widget {
 			}));
 		}
 
-		this.inputBox.inputElement.setAttribute('aria-live', 'assertive');
+		this.inputBox.inputElement.setAttribute('aria-live', this.options.ariaLive || 'off');
+		if (this.options.ariaLabelledBy) {
+			this.inputBox.inputElement.setAttribute('aria-labelledBy', this.options.ariaLabelledBy);
+		}
 		const focusTracker = this._register(DOM.trackFocus(this.inputBox.inputElement));
 		this._register(focusTracker.onDidFocus(() => this._onFocus.fire()));
 
@@ -633,7 +637,8 @@ export class SearchWidget extends Widget {
 	}
 
 	public showMessage(message: string, count: number): void {
-		if (this.countElement) {
+		// Avoid setting the aria-label unnecessarily, the screenreader will read the count every time it's set, since it's aria-live:assertive. #50968
+		if (this.countElement && message !== this.countElement.textContent) {
 			this.countElement.textContent = message;
 			this.inputBox.inputElement.setAttribute('aria-label', message);
 			DOM.toggleClass(this.countElement, 'no-results', count === 0);
diff --git a/src/vs/workbench/parts/preferences/browser/settingsEditor2.ts b/src/vs/workbench/parts/preferences/browser/settingsEditor2.ts
index 48b58b481a0..c0a71caad96 100644
--- a/src/vs/workbench/parts/preferences/browser/settingsEditor2.ts
+++ b/src/vs/workbench/parts/preferences/browser/settingsEditor2.ts
@@ -4,67 +4,101 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as DOM from 'vs/base/browser/dom';
-import { Button } from 'vs/base/browser/ui/button/button';
+import { Separator } from 'vs/base/browser/ui/actionbar/actionbar';
+import { ToolBar } from 'vs/base/browser/ui/toolbar/toolbar';
+import { Action } from 'vs/base/common/actions';
 import * as arrays from 'vs/base/common/arrays';
 import { Delayer, ThrottledDelayer } from 'vs/base/common/async';
-import { Color } from 'vs/base/common/color';
+import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
+import * as collections from 'vs/base/common/collections';
 import { getErrorMessage, isPromiseCanceledError } from 'vs/base/common/errors';
-import { KeyCode } from 'vs/base/common/keyCodes';
+import { URI } from 'vs/base/common/uri';
 import { TPromise } from 'vs/base/common/winjs.base';
-import { ITreeConfiguration } from 'vs/base/parts/tree/browser/tree';
-import { DefaultTreestyler } from 'vs/base/parts/tree/browser/treeDefaults';
+import { Tree } from 'vs/base/parts/tree/browser/treeImpl';
+import { collapseAll, expandAll } from 'vs/base/parts/tree/browser/treeUtils';
 import 'vs/css!./media/settingsEditor2';
 import { localize } from 'vs/nls';
-import { ConfigurationTarget, IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { ConfigurationTarget, IConfigurationOverrides, IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
+import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
+import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { WorkbenchTree } from 'vs/platform/list/browser/listService';
 import { ILogService } from 'vs/platform/log/common/log';
+import { INotificationService } from 'vs/platform/notification/common/notification';
+import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { editorBackground, foreground, listActiveSelectionBackground, listInactiveSelectionBackground } from 'vs/platform/theme/common/colorRegistry';
-import { attachButtonStyler, attachStyler } from 'vs/platform/theme/common/styler';
-import { ICssStyleCollector, ITheme, IThemeService, registerThemingParticipant } from 'vs/platform/theme/common/themeService';
+import { badgeBackground, badgeForeground, contrastBorder, editorForeground } from 'vs/platform/theme/common/colorRegistry';
+import { attachStylerCallback } from 'vs/platform/theme/common/styler';
+import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { BaseEditor } from 'vs/workbench/browser/parts/editor/baseEditor';
-import { EditorOptions, IEditor } from 'vs/workbench/common/editor';
-import { SearchWidget, SettingsTarget, SettingsTargetsWidget } from 'vs/workbench/parts/preferences/browser/preferencesWidgets';
-import { ISettingsEditorViewState, SearchResultIdx, SearchResultModel, SettingsAccessibilityProvider, SettingsDataSource, SettingsRenderer, SettingsTreeController, SettingsTreeFilter, TreeElement } from 'vs/workbench/parts/preferences/browser/settingsTree';
-import { IPreferencesSearchService, ISearchProvider } from 'vs/workbench/parts/preferences/common/preferences';
-import { IPreferencesService, ISearchResult, ISettingsEditorModel } from 'vs/workbench/services/preferences/common/preferences';
+import { IEditor } from 'vs/workbench/common/editor';
+import { attachSuggestEnabledInputBoxStyler, SuggestEnabledInput } from 'vs/workbench/parts/codeEditor/browser/suggestEnabledInput';
+import { PreferencesEditor } from 'vs/workbench/parts/preferences/browser/preferencesEditor';
+import { SettingsTarget, SettingsTargetsWidget } from 'vs/workbench/parts/preferences/browser/preferencesWidgets';
+import { commonlyUsedData, tocData } from 'vs/workbench/parts/preferences/browser/settingsLayout';
+import { ISettingLinkClickEvent, resolveExtensionsSettings, resolveSettingsTree, SettingsDataSource, SettingsRenderer, SettingsTree, SimplePagedDataSource } from 'vs/workbench/parts/preferences/browser/settingsTree';
+import { ISettingsEditorViewState, MODIFIED_SETTING_TAG, ONLINE_SERVICES_SETTING_TAG, parseQuery, SearchResultIdx, SearchResultModel, SettingsTreeGroupElement, SettingsTreeModel, SettingsTreeSettingElement } from 'vs/workbench/parts/preferences/browser/settingsTreeModels';
+import { settingsTextInputBorder } from 'vs/workbench/parts/preferences/browser/settingsWidgets';
+import { TOCRenderer, TOCTree, TOCTreeModel } from 'vs/workbench/parts/preferences/browser/tocTree';
+import { CONTEXT_SETTINGS_EDITOR, CONTEXT_SETTINGS_SEARCH_FOCUS, CONTEXT_TOC_ROW_FOCUS, IPreferencesSearchService, ISearchProvider } from 'vs/workbench/parts/preferences/common/preferences';
+import { IPreferencesService, ISearchResult, ISettingsEditorModel, SettingsEditorOptions, ISettingsEditorOptions } from 'vs/workbench/services/preferences/common/preferences';
 import { SettingsEditor2Input } from 'vs/workbench/services/preferences/common/preferencesEditorInput';
-import { DefaultSettingsEditorModel } from 'vs/workbench/services/preferences/common/preferencesModels';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
+import { Settings2EditorModel } from 'vs/workbench/services/preferences/common/preferencesModels';
 
 const $ = DOM.$;
 
 export class SettingsEditor2 extends BaseEditor {
 
 	public static readonly ID: string = 'workbench.editor.settings2';
+	private static NUM_INSTANCES: number = 0;
 
-	private defaultSettingsEditorModel: DefaultSettingsEditorModel;
+	private static readonly SUGGESTIONS: string[] = [
+		'@modified', '@tag:usesOnlineServices'
+	];
 
+	private defaultSettingsEditorModel: Settings2EditorModel;
+
+	private rootElement: HTMLElement;
 	private headerContainer: HTMLElement;
-	private searchWidget: SearchWidget;
+	private searchWidget: SuggestEnabledInput;
+	private countElement: HTMLElement;
 	private settingsTargetsWidget: SettingsTargetsWidget;
-
-	private showConfiguredSettingsOnlyCheckbox: HTMLInputElement;
-	private savedExpandedGroups: any[];
+	private toolbar: ToolBar;
 
 	private settingsTreeContainer: HTMLElement;
-	private settingsTree: WorkbenchTree;
-	private treeDataSource: SettingsDataSource;
+	private settingsTree: Tree;
+	private settingsTreeRenderer: SettingsRenderer;
+	private settingsTreeDataSource: SimplePagedDataSource;
+	private tocTreeModel: TOCTreeModel;
+	private settingsTreeModel: SettingsTreeModel;
+	private noResultsMessage: HTMLElement;
+
+	private tocTreeContainer: HTMLElement;
+	private tocTree: WorkbenchTree;
 
-	private delayedModifyLogging: Delayer<void>;
 	private delayedFilterLogging: Delayer<void>;
 	private localSearchDelayer: Delayer<void>;
 	private remoteSearchThrottle: ThrottledDelayer<void>;
-	private searchInProgress: TPromise<void>;
+	private searchInProgress: CancellationTokenSource;
 
-	private pendingSettingModifiedReport: { key: string, value: any };
+	private delayRefreshOnLayout: Delayer<void>;
+	private lastLayedoutWidth: number;
 
-	private selectedElement: TreeElement;
+	private settingUpdateDelayer: Delayer<void>;
+	private pendingSettingUpdate: { key: string, value: any };
 
 	private viewState: ISettingsEditorViewState;
-	private searchResultModel: SearchResultModel;
+	private _searchResultModel: SearchResultModel;
+
+	private tocRowFocused: IContextKey<boolean>;
+	private inSettingsEditorContextKey: IContextKey<boolean>;
+	private searchFocusContextKey: IContextKey<boolean>;
+
+	private scheduledRefreshes: Map<string, DOM.IFocusTracker>;
+
+	/** Don't spam warnings */
+	private hasWarnedMissingSettings: boolean;
 
 	constructor(
 		@ITelemetryService telemetryService: ITelemetryService,
@@ -74,255 +108,526 @@ export class SettingsEditor2 extends BaseEditor {
 		@IInstantiationService private instantiationService: IInstantiationService,
 		@IPreferencesSearchService private preferencesSearchService: IPreferencesSearchService,
 		@ILogService private logService: ILogService,
-		@IEnvironmentService private environmentService: IEnvironmentService
+		@IEnvironmentService private environmentService: IEnvironmentService,
+		@IContextKeyService contextKeyService: IContextKeyService,
+		@IContextMenuService private contextMenuService: IContextMenuService,
+		@IStorageService private storageService: IStorageService,
+		@INotificationService private notificationService: INotificationService
 	) {
 		super(SettingsEditor2.ID, telemetryService, themeService);
-		this.delayedModifyLogging = new Delayer<void>(1000);
 		this.delayedFilterLogging = new Delayer<void>(1000);
-		this.localSearchDelayer = new Delayer(100);
+		this.localSearchDelayer = new Delayer(300);
 		this.remoteSearchThrottle = new ThrottledDelayer(200);
 		this.viewState = { settingsTarget: ConfigurationTarget.USER };
+		this.delayRefreshOnLayout = new Delayer(100);
 
-		this._register(configurationService.onDidChangeConfiguration(() => this.refreshTreeAndMaintainFocus()));
+		this.settingUpdateDelayer = new Delayer<void>(200);
+
+		this.inSettingsEditorContextKey = CONTEXT_SETTINGS_EDITOR.bindTo(contextKeyService);
+		this.searchFocusContextKey = CONTEXT_SETTINGS_SEARCH_FOCUS.bindTo(contextKeyService);
+		this.tocRowFocused = CONTEXT_TOC_ROW_FOCUS.bindTo(contextKeyService);
+
+		this.scheduledRefreshes = new Map<string, DOM.IFocusTracker>();
+
+		this._register(configurationService.onDidChangeConfiguration(e => {
+			if (e.source !== ConfigurationTarget.DEFAULT) {
+				this.onConfigUpdate(e.affectedKeys);
+			}
+		}));
+	}
+
+	private get currentSettingsModel() {
+		return this.searchResultModel || this.settingsTreeModel;
+	}
+
+	private get searchResultModel(): SearchResultModel {
+		return this._searchResultModel;
+	}
+
+	private set searchResultModel(value: SearchResultModel) {
+		this._searchResultModel = value;
+
+		DOM.toggleClass(this.rootElement, 'search-mode', !!this._searchResultModel);
 	}
 
 	createEditor(parent: HTMLElement): void {
-		const prefsEditorElement = DOM.append(parent, $('div', { class: 'settings-editor' }));
+		parent.setAttribute('tabindex', '-1');
+		this.rootElement = DOM.append(parent, $('.settings-editor'));
 
-		this.createHeader(prefsEditorElement);
-		this.createBody(prefsEditorElement);
+		this.createHeader(this.rootElement);
+		this.createBody(this.rootElement);
+		this.updateStyles();
 	}
 
-	setInput(input: SettingsEditor2Input, options: EditorOptions, token: CancellationToken): Thenable<void> {
+	setInput(input: SettingsEditor2Input, options: SettingsEditorOptions, token: CancellationToken): Thenable<void> {
+		this.inSettingsEditorContextKey.set(true);
 		return super.setInput(input, options, token)
+			.then(() => new Promise(process.nextTick)) // Force setInput to be async
 			.then(() => {
+				if (!options) {
+					if (!this.viewState.settingsTarget) {
+						// Persist?
+						options = SettingsEditorOptions.create({ target: ConfigurationTarget.USER });
+					}
+				} else if (!options.target) {
+					options.target = ConfigurationTarget.USER;
+				}
+
+				this._setOptions(options);
+
 				this.render(token);
+			})
+			.then(() => {
+				// Init TOC selection
+				this.updateTreeScrollSync();
 			});
 	}
 
+	setOptions(options: SettingsEditorOptions): void {
+		super.setOptions(options);
+
+		this._setOptions(options);
+	}
+
+	private _setOptions(options: SettingsEditorOptions): void {
+		if (!options) {
+			return;
+		}
+
+		if (options.query) {
+			this.searchWidget.setValue(options.query);
+		}
+
+		const target: SettingsTarget = options.folderUri || <SettingsTarget>options.target;
+		this.settingsTargetsWidget.settingsTarget = target;
+		this.viewState.settingsTarget = target;
+	}
+
+	clearInput(): void {
+		this.inSettingsEditorContextKey.set(false);
+		super.clearInput();
+	}
+
 	layout(dimension: DOM.Dimension): void {
-		this.searchWidget.layout(dimension);
-		this.layoutSettingsList(dimension);
+		const firstEl = this.settingsTree.getFirstVisibleElement();
+		const firstElTop = this.settingsTree.getRelativeTop(firstEl);
+
+		this.layoutTrees(dimension);
+
+		let innerWidth = dimension.width - 24 * 2; // 24px padding on left and right
+		let monacoWidth = (innerWidth > 1000 ? 1000 : innerWidth) - 10;
+		this.searchWidget.layout({ height: 20, width: monacoWidth });
+
+		DOM.toggleClass(this.rootElement, 'narrow', dimension.width < 600);
+
+		// #56185
+		if (dimension.width !== this.lastLayedoutWidth) {
+			this.lastLayedoutWidth = dimension.width;
+			this.delayRefreshOnLayout.trigger(() => {
+				this.renderTree(undefined, true).then(() => {
+					this.settingsTree.reveal(firstEl, firstElTop);
+				});
+			});
+		}
 	}
 
 	focus(): void {
-		this.searchWidget.focus();
+		this.focusSearch();
+	}
+
+	focusSettings(): void {
+		const firstFocusable = this.settingsTree.getHTMLElement().querySelector(SettingsRenderer.CONTROL_SELECTOR);
+		if (firstFocusable) {
+			(<HTMLElement>firstFocusable).focus();
+		}
+	}
+
+	showContextMenu(): void {
+		const settingDOMElement = this.settingsTreeRenderer.getSettingDOMElementForDOMElement(this.getActiveElementInSettingsTree());
+		if (!settingDOMElement) {
+			return;
+		}
+
+		const focusedKey = this.settingsTreeRenderer.getKeyForDOMElementInSetting(settingDOMElement);
+		if (!focusedKey) {
+			return;
+		}
+
+		const elements = this.currentSettingsModel.getElementsByName(focusedKey);
+		if (elements && elements[0]) {
+			this.settingsTreeRenderer.showContextMenu(elements[0], settingDOMElement);
+		}
+	}
+
+	focusSearch(filter?: string, selectAll = true): void {
+		if (filter && this.searchWidget) {
+			this.searchWidget.setValue(filter);
+		}
+
+		this.searchWidget.focus(selectAll);
+	}
+
+	clearSearchResults(): void {
+		this.searchWidget.setValue('');
 	}
 
 	private createHeader(parent: HTMLElement): void {
 		this.headerContainer = DOM.append(parent, $('.settings-header'));
 
-		const previewHeader = DOM.append(this.headerContainer, $('.settings-preview-header'));
-
-		const previewAlert = DOM.append(previewHeader, $('span.settings-preview-warning'));
-		previewAlert.textContent = localize('previewWarning', "Preview");
-
-		const previewTextLabel = DOM.append(previewHeader, $('span.settings-preview-label'));
-		previewTextLabel.textContent = localize('previewLabel', "This is a preview of our new settings editor");
-
 		const searchContainer = DOM.append(this.headerContainer, $('.search-container'));
-		this.searchWidget = this._register(this.instantiationService.createInstance(SearchWidget, searchContainer, {
-			ariaLabel: localize('SearchSettings.AriaLabel', "Search settings"),
-			placeholder: localize('SearchSettings.Placeholder', "Search settings")
-		}));
-		this._register(this.searchWidget.onDidChange(() => this.onSearchInputChanged()));
-		this._register(DOM.addStandardDisposableListener(this.searchWidget.domNode, 'keydown', e => {
-			if (e.keyCode === KeyCode.DownArrow) {
-				this.settingsTree.focusFirst();
-				this.settingsTree.domFocus();
+
+		let searchBoxLabel = localize('SearchSettings.AriaLabel', "Search settings");
+		this.searchWidget = this._register(this.instantiationService.createInstance(SuggestEnabledInput, `${SettingsEditor2.ID}.searchbox`, searchContainer, {
+			triggerCharacters: ['@'],
+			provideResults: (query: string) => {
+				return SettingsEditor2.SUGGESTIONS.filter(tag => query.indexOf(tag) === -1).map(tag => tag + ' ');
 			}
+		}, searchBoxLabel, 'settingseditor:searchinput' + SettingsEditor2.NUM_INSTANCES++, {
+				placeholderText: searchBoxLabel,
+				focusContextKey: this.searchFocusContextKey,
+				// TODO: Aria-live
+			}));
+
+		this._register(attachSuggestEnabledInputBoxStyler(this.searchWidget, this.themeService, {
+			inputBorder: settingsTextInputBorder
 		}));
 
-		const advancedCustomization = DOM.append(this.headerContainer, $('.settings-advanced-customization'));
-		const advancedCustomizationLabel = DOM.append(advancedCustomization, $('span.settings-advanced-customization-label'));
-		advancedCustomizationLabel.textContent = localize('advancedCustomizationLabel', "For advanced customizations open and edit") + ' ';
-		const openSettingsButton = this._register(new Button(advancedCustomization, { title: true, buttonBackground: null, buttonHoverBackground: null }));
-		this._register(attachButtonStyler(openSettingsButton, this.themeService, {
-			buttonBackground: Color.transparent.toString(),
-			buttonHoverBackground: Color.transparent.toString(),
-			buttonForeground: foreground
-		}));
-		openSettingsButton.label = localize('openSettingsLabel', "settings.json");
-		openSettingsButton.element.classList.add('open-settings-button');
+		this.countElement = DOM.append(searchContainer, DOM.$('.settings-count-widget'));
+		this._register(attachStylerCallback(this.themeService, { badgeBackground, contrastBorder, badgeForeground }, colors => {
+			const background = colors.badgeBackground ? colors.badgeBackground.toString() : null;
+			const border = colors.contrastBorder ? colors.contrastBorder.toString() : null;
 
-		this._register(openSettingsButton.onDidClick(() => this.openSettingsFile()));
+			this.countElement.style.backgroundColor = background;
+			this.countElement.style.color = colors.badgeForeground.toString();
+
+			this.countElement.style.borderWidth = border ? '1px' : null;
+			this.countElement.style.borderStyle = border ? 'solid' : null;
+			this.countElement.style.borderColor = border;
+		}));
+
+		this._register(this.searchWidget.onInputDidChange(() => this.onSearchInputChanged()));
 
 		const headerControlsContainer = DOM.append(this.headerContainer, $('.settings-header-controls'));
 		const targetWidgetContainer = DOM.append(headerControlsContainer, $('.settings-target-container'));
 		this.settingsTargetsWidget = this._register(this.instantiationService.createInstance(SettingsTargetsWidget, targetWidgetContainer));
 		this.settingsTargetsWidget.settingsTarget = ConfigurationTarget.USER;
-		this.settingsTargetsWidget.onDidTargetChange(() => {
-			this.viewState.settingsTarget = this.settingsTargetsWidget.settingsTarget;
-			this.settingsTree.refresh();
-		});
+		this.settingsTargetsWidget.onDidTargetChange(target => this.onDidSettingsTargetChange(target));
 
 		this.createHeaderControls(headerControlsContainer);
 	}
 
+	private onDidSettingsTargetChange(target: SettingsTarget): void {
+		this.viewState.settingsTarget = target;
+
+		// TODO Instead of rebuilding the whole model, refresh and uncache the inspected setting value
+		this.onConfigUpdate(undefined, true);
+	}
+
 	private createHeaderControls(parent: HTMLElement): void {
 		const headerControlsContainerRight = DOM.append(parent, $('.settings-header-controls-right'));
 
-		this.showConfiguredSettingsOnlyCheckbox = DOM.append(headerControlsContainerRight, $('input#configured-only-checkbox'));
-		this.showConfiguredSettingsOnlyCheckbox.type = 'checkbox';
-		const showConfiguredSettingsOnlyLabel = <HTMLLabelElement>DOM.append(headerControlsContainerRight, $('label.configured-only-label'));
-		showConfiguredSettingsOnlyLabel.textContent = localize('showOverriddenOnly', "Show modified only");
-		showConfiguredSettingsOnlyLabel.htmlFor = 'configured-only-checkbox';
+		this.toolbar = this._register(new ToolBar(headerControlsContainerRight, this.contextMenuService, {
+			ariaLabel: localize('settingsToolbarLabel', "Settings Editor Actions"),
+			actionRunner: this.actionRunner
+		}));
 
-		this._register(DOM.addDisposableListener(this.showConfiguredSettingsOnlyCheckbox, 'change', e => this.onShowConfiguredOnlyClicked()));
+		const actions: Action[] = [
+			this.instantiationService.createInstance(FilterByTagAction,
+				localize('filterModifiedLabel', "Show modified settings"),
+				MODIFIED_SETTING_TAG,
+				this)
+		];
+		if (this.environmentService.appQuality !== 'stable') {
+			actions.push(
+				this.instantiationService.createInstance(
+					FilterByTagAction,
+					localize('filterOnlineServicesLabel', "Show settings for online services"),
+					ONLINE_SERVICES_SETTING_TAG,
+					this));
+			actions.push(new Separator());
+		}
+		actions.push(new Action('settings.openSettingsJson', localize('openSettingsJsonLabel', "Open settings.json"), undefined, undefined, () => {
+			return this.openSettingsFile().then(editor => {
+				const currentQuery = parseQuery(this.searchWidget.getValue());
+				if (editor instanceof PreferencesEditor && currentQuery) {
+					editor.focusSearch(currentQuery.query);
+				}
+			});
+		}));
+
+		this.toolbar.setActions([], actions)();
+		this.toolbar.context = <ISettingsToolbarContext>{ target: this.settingsTargetsWidget.settingsTarget };
 	}
 
-	private openSettingsFile(): TPromise<IEditor> {
+	private onDidClickSetting(evt: ISettingLinkClickEvent, recursed?: boolean): void {
+		const elements = this.currentSettingsModel.getElementsByName(evt.targetKey);
+		if (elements && elements[0]) {
+			let sourceTop = this.settingsTree.getRelativeTop(evt.source);
+			if (sourceTop < 0) {
+				// e.g. clicked a searched element, now the search has been cleared
+				sourceTop = .5;
+			}
+
+			this.settingsTree.reveal(elements[0], sourceTop);
+
+			const domElements = this.settingsTreeRenderer.getDOMElementsForSettingKey(this.settingsTree.getHTMLElement(), evt.targetKey);
+			if (domElements && domElements[0]) {
+				const control = domElements[0].querySelector(SettingsRenderer.CONTROL_SELECTOR);
+				if (control) {
+					(<HTMLElement>control).focus();
+				}
+			}
+		} else if (!recursed) {
+			const p = this.triggerSearch('');
+			p.then(() => {
+				this.searchWidget.setValue('');
+				this.onDidClickSetting(evt, true);
+			});
+		}
+	}
+
+	private openSettingsFile(query?: string): TPromise<IEditor> {
 		const currentSettingsTarget = this.settingsTargetsWidget.settingsTarget;
 
+		const options: ISettingsEditorOptions = { query };
 		if (currentSettingsTarget === ConfigurationTarget.USER) {
-			return this.preferencesService.openGlobalSettings();
+			return this.preferencesService.openGlobalSettings(true, options);
 		} else if (currentSettingsTarget === ConfigurationTarget.WORKSPACE) {
-			return this.preferencesService.openWorkspaceSettings();
+			return this.preferencesService.openWorkspaceSettings(true, options);
 		} else {
-			return this.preferencesService.openFolderSettings(currentSettingsTarget);
+			return this.preferencesService.openFolderSettings(currentSettingsTarget, true, options);
 		}
 	}
 
 	private createBody(parent: HTMLElement): void {
 		const bodyContainer = DOM.append(parent, $('.settings-body'));
 
-		this.createList(bodyContainer);
+		this.noResultsMessage = DOM.append(bodyContainer, $('.no-results'));
+		this.noResultsMessage.innerText = localize('noResults', "No Settings Found");
+		this._register(attachStylerCallback(this.themeService, { editorForeground }, colors => {
+			this.noResultsMessage.style.color = colors.editorForeground ? colors.editorForeground.toString() : null;
+		}));
 
-		if (this.environmentService.appQuality !== 'stable') {
-			this.createFeedbackButton(bodyContainer);
-		}
+		this.createFocusSink(
+			bodyContainer,
+			e => {
+				if (DOM.findParentWithClass(e.relatedTarget, 'settings-editor-tree')) {
+					if (this.settingsTree.getScrollPosition() > 0) {
+						const firstElement = this.settingsTree.getFirstVisibleElement();
+						this.settingsTree.reveal(firstElement, 0.1);
+						return true;
+					}
+				} else {
+					const firstControl = this.settingsTree.getHTMLElement().querySelector(SettingsRenderer.CONTROL_SELECTOR);
+					if (firstControl) {
+						(<HTMLElement>firstControl).focus();
+					}
+				}
+
+				return false;
+			},
+			'settings list focus helper');
+
+		this.createSettingsTree(bodyContainer);
+
+		this.createFocusSink(
+			bodyContainer,
+			e => {
+				if (DOM.findParentWithClass(e.relatedTarget, 'settings-editor-tree')) {
+					if (this.settingsTree.getScrollPosition() < 1) {
+						const lastElement = this.settingsTree.getLastVisibleElement();
+						this.settingsTree.reveal(lastElement, 0.9);
+						return true;
+					}
+				}
+
+				return false;
+			},
+			'settings list focus helper'
+		);
+
+		this.createTOC(bodyContainer);
 	}
 
-	private createList(parent: HTMLElement): void {
+	private createFocusSink(container: HTMLElement, callback: (e: any) => boolean, label: string): HTMLElement {
+		const listFocusSink = DOM.append(container, $('.settings-tree-focus-sink'));
+		listFocusSink.setAttribute('aria-label', label);
+		listFocusSink.tabIndex = 0;
+		this._register(DOM.addDisposableListener(listFocusSink, 'focus', (e: any) => {
+			if (e.relatedTarget && callback(e)) {
+				e.relatedTarget.focus();
+			}
+		}));
+
+		return listFocusSink;
+	}
+
+	private createTOC(parent: HTMLElement): void {
+		this.tocTreeModel = new TOCTreeModel(this.viewState);
+		this.tocTreeContainer = DOM.append(parent, $('.settings-toc-container'));
+
+		const tocRenderer = this.instantiationService.createInstance(TOCRenderer);
+
+		this.tocTree = this._register(this.instantiationService.createInstance(TOCTree, this.tocTreeContainer,
+			this.viewState,
+			{
+				renderer: tocRenderer
+			}));
+
+		this._register(this.tocTree.onDidChangeFocus(e => {
+			const element: SettingsTreeGroupElement = e.focus;
+			if (this.searchResultModel) {
+				this.viewState.filterToCategory = element;
+				this.renderTree();
+			}
+
+			if (element && (!e.payload || !e.payload.fromScroll)) {
+				let refreshP = TPromise.wrap(null);
+				if (this.settingsTreeDataSource.pageTo(element.index, true)) {
+					refreshP = this.renderTree();
+				}
+
+				refreshP.then(() => this.settingsTree.reveal(element, 0));
+			}
+		}));
+
+		this._register(this.tocTree.onDidFocus(() => {
+			this.tocRowFocused.set(true);
+		}));
+
+		this._register(this.tocTree.onDidBlur(() => {
+			this.tocRowFocused.set(false);
+		}));
+	}
+
+	private createSettingsTree(parent: HTMLElement): void {
 		this.settingsTreeContainer = DOM.append(parent, $('.settings-tree-container'));
 
-		this.treeDataSource = this.instantiationService.createInstance(SettingsDataSource, this.viewState);
-		const renderer = this.instantiationService.createInstance(SettingsRenderer, this.settingsTreeContainer);
-		this._register(renderer.onDidChangeSetting(e => this.onDidChangeSetting(e.key, e.value)));
-		this._register(renderer.onDidOpenSettings(() => this.openSettingsFile()));
+		this.settingsTreeRenderer = this.instantiationService.createInstance(SettingsRenderer, this.settingsTreeContainer);
+		this._register(this.settingsTreeRenderer.onDidChangeSetting(e => this.onDidChangeSetting(e.key, e.value)));
+		this._register(this.settingsTreeRenderer.onDidOpenSettings(settingKey => {
+			this.openSettingsFile(settingKey);
+		}));
+		this._register(this.settingsTreeRenderer.onDidClickSettingLink(settingName => this.onDidClickSetting(settingName)));
+		this._register(this.settingsTreeRenderer.onDidFocusSetting(element => {
+			this.settingsTree.reveal(element);
+		}));
 
-		const treeClass = 'settings-editor-tree';
-		this.settingsTree = this.instantiationService.createInstance(WorkbenchTree, this.settingsTreeContainer,
-			<ITreeConfiguration>{
-				dataSource: this.treeDataSource,
-				renderer: renderer,
-				controller: this.instantiationService.createInstance(SettingsTreeController),
-				accessibilityProvider: this.instantiationService.createInstance(SettingsAccessibilityProvider),
-				filter: this.instantiationService.createInstance(SettingsTreeFilter, this.viewState),
-				styler: new DefaultTreestyler(DOM.createStyleSheet(), treeClass)
-			},
+		this.settingsTreeDataSource = this.instantiationService.createInstance(SimplePagedDataSource,
+			this.instantiationService.createInstance(SettingsDataSource, this.viewState));
+
+		this.settingsTree = this._register(this.instantiationService.createInstance(SettingsTree,
+			this.settingsTreeContainer,
+			this.viewState,
 			{
-				ariaLabel: localize('treeAriaLabel', "Settings"),
-				showLoading: false,
-				indentPixels: 0,
-				twistiePixels: 15,
-			});
+				renderer: this.settingsTreeRenderer,
+				dataSource: this.settingsTreeDataSource
+			}));
+		this.settingsTree.getHTMLElement().attributes.removeNamedItem('tabindex');
 
-		this._register(registerThemingParticipant((theme: ITheme, collector: ICssStyleCollector) => {
-			const activeBorderColor = theme.getColor(listActiveSelectionBackground);
-			if (activeBorderColor) {
-				collector.addRule(`.settings-editor > .settings-body > .settings-tree-container .monaco-tree:focus .monaco-tree-row.focused {outline: solid 1px ${activeBorderColor}; outline-offset: -1px; }`);
-			}
+		// Have to redefine role of the tree widget to form for input elements
+		// TODO:CDL make this an option for tree
+		this.settingsTree.getHTMLElement().setAttribute('role', 'form');
 
-			const inactiveBorderColor = theme.getColor(listInactiveSelectionBackground);
-			if (inactiveBorderColor) {
-				collector.addRule(`.settings-editor > .settings-body > .settings-tree-container .monaco-tree .monaco-tree-row.focused {outline: solid 1px ${inactiveBorderColor}; outline-offset: -1px; }`);
-			}
-		}));
-
-		this.settingsTree.getHTMLElement().classList.add(treeClass);
-
-		attachStyler(this.themeService, {
-			listActiveSelectionBackground: editorBackground,
-			listActiveSelectionForeground: foreground,
-			listFocusAndSelectionBackground: editorBackground,
-			listFocusAndSelectionForeground: foreground,
-			listFocusBackground: editorBackground,
-			listFocusForeground: foreground,
-			listHoverForeground: foreground,
-			listHoverBackground: editorBackground,
-			listInactiveSelectionBackground: editorBackground,
-			listInactiveSelectionForeground: foreground
-		}, colors => {
-			this.settingsTree.style(colors);
-		});
-
-		this.settingsTree.onDidChangeFocus(e => {
-			this.settingsTree.setSelection([e.focus]);
-			if (this.selectedElement) {
-				this.settingsTree.refresh(this.selectedElement);
-			}
-
-			if (e.focus) {
-				this.settingsTree.refresh(e.focus);
-			}
-
-			this.selectedElement = e.focus;
-		});
-	}
-
-	private createFeedbackButton(parent: HTMLElement): void {
-		const feedbackButton = this._register(new Button(parent));
-		feedbackButton.label = localize('feedbackButtonLabel', "Provide Feedback");
-		feedbackButton.element.classList.add('settings-feedback-button');
-
-		this._register(attachButtonStyler(feedbackButton, this.themeService));
-		this._register(feedbackButton.onDidClick(() => {
-			// Github master issue
-			window.open('https://go.microsoft.com/fwlink/?linkid=2000807');
+		this._register(this.settingsTree.onDidScroll(() => {
+			this.updateTreeScrollSync();
 		}));
 	}
 
-	private onShowConfiguredOnlyClicked(): void {
-		this.viewState.showConfiguredOnly = this.showConfiguredSettingsOnlyCheckbox.checked;
-		this.refreshTreeAndMaintainFocus();
-
-		// TODO@roblou - This is slow
-		if (this.viewState.showConfiguredOnly) {
-			this.savedExpandedGroups = this.settingsTree.getExpandedElements();
-			const nav = this.settingsTree.getNavigator();
-			let element;
-			while (element = nav.next()) {
-				this.settingsTree.expand(element);
-			}
-		} else if (this.savedExpandedGroups) {
-			const nav = this.settingsTree.getNavigator();
-			let element;
-			while (element = nav.next()) {
-				this.settingsTree.collapse(element);
-			}
-
-			this.settingsTree.expandAll(this.savedExpandedGroups);
-			this.savedExpandedGroups = null;
+	public notifyNoSaveNeeded(force: boolean = true) {
+		if (force || !this.storageService.getBoolean('hasNotifiedOfSettingsAutosave', StorageScope.GLOBAL, false)) {
+			this.storageService.store('hasNotifiedOfSettingsAutosave', true, StorageScope.GLOBAL);
+			this.notificationService.info(localize('settingsNoSaveNeeded', "Your changes are automatically saved as you edit."));
 		}
 	}
 
 	private onDidChangeSetting(key: string, value: any): void {
-		// ConfigurationService displays the error if this fails.
-		// Force a render afterwards because onDidConfigurationUpdate doesn't fire if the update doesn't result in an effective setting value change
-		this.configurationService.updateValue(key, value, <ConfigurationTarget>this.settingsTargetsWidget.settingsTarget)
-			.then(() => this.refreshTreeAndMaintainFocus());
+		this.notifyNoSaveNeeded(false);
 
-		const reportModifiedProps = {
-			key,
-			query: this.searchWidget.getValue(),
-			searchResults: this.searchResultModel && this.searchResultModel.getUniqueResults(),
-			rawResults: this.searchResultModel && this.searchResultModel.getRawResults(),
-			showConfiguredOnly: this.viewState.showConfiguredOnly,
-			isReset: typeof value === 'undefined',
-			settingsTarget: this.settingsTargetsWidget.settingsTarget as SettingsTarget
-		};
-
-		if (this.pendingSettingModifiedReport && key !== this.pendingSettingModifiedReport.key) {
-			this.reportModifiedSetting(reportModifiedProps);
+		if (this.pendingSettingUpdate && this.pendingSettingUpdate.key !== key) {
+			this.updateChangedSetting(key, value);
 		}
 
-		this.pendingSettingModifiedReport = { key, value };
-		this.delayedModifyLogging.trigger(() => this.reportModifiedSetting(reportModifiedProps));
+		this.pendingSettingUpdate = { key, value };
+		this.settingUpdateDelayer.trigger(() => this.updateChangedSetting(key, value));
+	}
+
+	private updateTreeScrollSync(): void {
+		this.settingsTreeRenderer.cancelSuggesters();
+		if (this.searchResultModel) {
+			return;
+		}
+
+		if (!this.tocTree.getInput()) {
+			return;
+		}
+
+		this.updateTreePagingByScroll();
+
+		const elementToSync = this.settingsTree.getFirstVisibleElement();
+		const element = elementToSync instanceof SettingsTreeSettingElement ? elementToSync.parent :
+			elementToSync instanceof SettingsTreeGroupElement ? elementToSync :
+				null;
+
+		if (element && this.tocTree.getSelection()[0] !== element) {
+			this.tocTree.reveal(element);
+			const elementTop = this.tocTree.getRelativeTop(element);
+			collapseAll(this.tocTree, element);
+			if (elementTop < 0 || elementTop > 1) {
+				this.tocTree.reveal(element);
+			} else {
+				this.tocTree.reveal(element, elementTop);
+			}
+
+			this.tocTree.expand(element);
+
+			this.tocTree.setSelection([element]);
+			this.tocTree.setFocus(element, { fromScroll: true });
+		}
+	}
+
+	private updateTreePagingByScroll(): void {
+		const lastVisibleElement = this.settingsTree.getLastVisibleElement();
+		if (lastVisibleElement && this.settingsTreeDataSource.pageTo(lastVisibleElement.index)) {
+			this.renderTree();
+		}
+	}
+
+	private updateChangedSetting(key: string, value: any): TPromise<void> {
+		// ConfigurationService displays the error if this fails.
+		// Force a render afterwards because onDidConfigurationUpdate doesn't fire if the update doesn't result in an effective setting value change
+		const settingsTarget = this.settingsTargetsWidget.settingsTarget;
+		const resource = URI.isUri(settingsTarget) ? settingsTarget : undefined;
+		const configurationTarget = <ConfigurationTarget>(resource ? ConfigurationTarget.WORKSPACE_FOLDER : settingsTarget);
+		const overrides: IConfigurationOverrides = { resource };
+
+		const isManualReset = value === undefined;
+
+		// If the user is changing the value back to the default, do a 'reset' instead
+		const inspected = this.configurationService.inspect(key, overrides);
+		if (inspected.default === value) {
+			value = undefined;
+		}
+
+		return this.configurationService.updateValue(key, value, overrides, configurationTarget)
+			.then(() => this.renderTree(key, isManualReset))
+			.then(() => {
+				const reportModifiedProps = {
+					key,
+					query: this.searchWidget.getValue(),
+					searchResults: this.searchResultModel && this.searchResultModel.getUniqueResults(),
+					rawResults: this.searchResultModel && this.searchResultModel.getRawResults(),
+					showConfiguredOnly: this.viewState.tagFilters && this.viewState.tagFilters.has(MODIFIED_SETTING_TAG),
+					isReset: typeof value === 'undefined',
+					settingsTarget: this.settingsTargetsWidget.settingsTarget as SettingsTarget
+				};
+
+				return this.reportModifiedSetting(reportModifiedProps);
+			});
 	}
 
 	private reportModifiedSetting(props: { key: string, query: string, searchResults: ISearchResult[], rawResults: ISearchResult[], showConfiguredOnly: boolean, isReset: boolean, settingsTarget: SettingsTarget }): void {
-		this.pendingSettingModifiedReport = null;
+		this.pendingSettingUpdate = null;
 
 		const remoteResult = props.searchResults && props.searchResults[SearchResultIdx.Remote];
 		const localResult = props.searchResults && props.searchResults[SearchResultIdx.Local];
@@ -377,84 +682,295 @@ export class SettingsEditor2 extends BaseEditor {
 			}
 		*/
 		this.telemetryService.publicLog('settingsEditor.settingModified', data);
+
+		const data2 = {
+			key: props.key,
+			groupId,
+			nlpIndex,
+			displayIndex,
+			showConfiguredOnly: props.showConfiguredOnly,
+			isReset: props.isReset,
+			target: reportedTarget
+		};
+
+		/* __GDPR__
+			"settingsEditor.settingModified2" : {
+				"key" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+				"groupId" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+				"nlpIndex" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+				"displayIndex" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+				"showConfiguredOnly" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+				"isReset" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+				"target" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+			}
+		*/
+		this.telemetryService.publicLog('settingsEditor.settingModified2', data2);
 	}
 
 	private render(token: CancellationToken): TPromise<any> {
 		if (this.input) {
 			return this.input.resolve()
-				.then((model: DefaultSettingsEditorModel) => {
+				.then((model: Settings2EditorModel) => {
 					if (token.isCancellationRequested) {
 						return void 0;
 					}
 
+					this._register(model.onDidChangeGroups(() => this.onConfigUpdate()));
 					this.defaultSettingsEditorModel = model;
-					if (!this.settingsTree.getInput()) {
-						this.settingsTree.setInput(this.defaultSettingsEditorModel);
-						this.expandCommonlyUsedSettings();
-					}
+					return this.onConfigUpdate();
 				});
 		}
 		return TPromise.as(null);
 	}
 
-	private refreshTreeAndMaintainFocus(): TPromise<any> {
-		// Sort of a hack to maintain focus on the focused control across a refresh
-		const focusedRowItem = DOM.findParentWithClass(<HTMLElement>document.activeElement, 'setting-item');
-		const focusedRowId = focusedRowItem && focusedRowItem.id;
-		const selection = focusedRowId && document.activeElement.tagName.toLowerCase() === 'input' ?
-			(<HTMLInputElement>document.activeElement).selectionStart :
-			null;
+	private onSearchModeToggled(): void {
+		DOM.removeClass(this.rootElement, 'no-toc-search');
+		if (this.configurationService.getValue('workbench.settings.settingsSearchTocBehavior') === 'hide') {
+			DOM.toggleClass(this.rootElement, 'no-toc-search', !!this.searchResultModel);
+		}
 
-		return this.settingsTree.refresh().then(() => {
-			if (focusedRowId) {
-				const rowSelector = `.setting-item#${focusedRowId}`;
-				const inputElementToFocus: HTMLElement = this.settingsTreeContainer.querySelector(`${rowSelector} input, ${rowSelector} select, ${rowSelector} a`);
-				if (inputElementToFocus) {
-					inputElementToFocus.focus();
-					if (typeof selection === 'number') {
-						(<HTMLInputElement>inputElementToFocus).setSelectionRange(selection, selection);
-					}
-				}
-			}
+		if (this.searchResultModel) {
+			this.settingsTreeDataSource.pageTo(Number.MAX_VALUE);
+		} else {
+			this.settingsTreeDataSource.reset();
+		}
+	}
+
+	private scheduleRefresh(element: HTMLElement, key = ''): void {
+		if (key && this.scheduledRefreshes.has(key)) {
+			return;
+		}
+
+		if (!key) {
+			this.scheduledRefreshes.forEach(r => r.dispose());
+			this.scheduledRefreshes.clear();
+		}
+
+		const scheduledRefreshTracker = DOM.trackFocus(element);
+		this.scheduledRefreshes.set(key, scheduledRefreshTracker);
+		scheduledRefreshTracker.onDidBlur(() => {
+			scheduledRefreshTracker.dispose();
+			this.scheduledRefreshes.delete(key);
+			this.onConfigUpdate([key]);
 		});
 	}
 
+	private onConfigUpdate(keys?: string[], forceRefresh = false): TPromise<void> {
+		if (keys) {
+			return this.updateElementsByKey(keys);
+		}
+
+		const groups = this.defaultSettingsEditorModel.settingsGroups.slice(1); // Without commonlyUsed
+		const dividedGroups = collections.groupBy(groups, g => g.contributedByExtension ? 'extension' : 'core');
+		const settingsResult = resolveSettingsTree(tocData, dividedGroups.core);
+		const resolvedSettingsRoot = settingsResult.tree;
+
+		// Warn for settings not included in layout
+		if (settingsResult.leftoverSettings.size && !this.hasWarnedMissingSettings) {
+			let settingKeyList = [];
+			settingsResult.leftoverSettings.forEach(s => {
+				settingKeyList.push(s.key);
+			});
+
+			this.logService.warn(`SettingsEditor2: Settings not included in settingsLayout.ts: ${settingKeyList.join(', ')}`);
+			this.hasWarnedMissingSettings = true;
+		}
+
+		const commonlyUsed = resolveSettingsTree(commonlyUsedData, dividedGroups.core);
+		resolvedSettingsRoot.children.unshift(commonlyUsed.tree);
+
+		resolvedSettingsRoot.children.push(resolveExtensionsSettings(dividedGroups.extension || []));
+
+		if (this.searchResultModel) {
+			this.searchResultModel.updateChildren();
+		}
+
+		if (this.settingsTreeModel) {
+			this.settingsTreeModel.update(resolvedSettingsRoot);
+
+			return this.renderTree(undefined, forceRefresh);
+		} else {
+			this.settingsTreeModel = this.instantiationService.createInstance(SettingsTreeModel, this.viewState);
+			this.settingsTreeModel.update(resolvedSettingsRoot);
+			this.settingsTree.setInput(this.settingsTreeModel.root);
+
+			this.tocTreeModel.settingsTreeRoot = this.settingsTreeModel.root as SettingsTreeGroupElement;
+			if (this.tocTree.getInput()) {
+				this.tocTree.refresh();
+			} else {
+				this.tocTree.setInput(this.tocTreeModel);
+			}
+		}
+
+		return TPromise.wrap(null);
+	}
+
+	private updateElementsByKey(keys: string[]): TPromise<void> {
+		if (keys.length) {
+			if (this.searchResultModel) {
+				keys.forEach(key => this.searchResultModel.updateElementsByName(key));
+			}
+
+			if (this.settingsTreeModel) {
+				keys.forEach(key => this.settingsTreeModel.updateElementsByName(key));
+			}
+
+			return TPromise.join(
+				keys.map(key => this.renderTree(key)))
+				.then(() => { });
+		} else {
+			return this.renderTree();
+		}
+	}
+
+	private getActiveElementInSettingsTree(): HTMLElement | null {
+		return (document.activeElement && DOM.isAncestor(document.activeElement, this.settingsTree.getHTMLElement())) ?
+			<HTMLElement>document.activeElement :
+			null;
+	}
+
+	private renderTree(key?: string, force = false): TPromise<void> {
+		if (!force && key && this.scheduledRefreshes.has(key)) {
+			this.updateModifiedLabelForKey(key);
+			return TPromise.wrap(null);
+		}
+
+		// If a setting control is currently focused, schedule a refresh for later
+		const focusedSetting = this.settingsTreeRenderer.getSettingDOMElementForDOMElement(this.getActiveElementInSettingsTree());
+		if (focusedSetting && !force) {
+			// If a single setting is being refreshed, it's ok to refresh now if that is not the focused setting
+			if (key) {
+				const focusedKey = focusedSetting.getAttribute(SettingsRenderer.SETTING_KEY_ATTR);
+				if (focusedKey === key &&
+					!DOM.hasClass(focusedSetting, 'setting-item-exclude')) { // update `exclude`s live, as they have a separate "submit edit" step built in before this
+
+					this.updateModifiedLabelForKey(key);
+					this.scheduleRefresh(focusedSetting, key);
+					return TPromise.wrap(null);
+				}
+			} else {
+				this.scheduleRefresh(focusedSetting);
+				return TPromise.wrap(null);
+			}
+		}
+
+		let refreshP: TPromise<any>;
+		if (key) {
+			const elements = this.currentSettingsModel.getElementsByName(key);
+			if (elements && elements.length) {
+				// TODO https://github.com/Microsoft/vscode/issues/57360
+				// refreshP = TPromise.join(elements.map(e => this.settingsTree.refresh(e)));
+				refreshP = this.settingsTree.refresh();
+			} else {
+				// Refresh requested for a key that we don't know about
+				return TPromise.wrap(null);
+			}
+		} else {
+			refreshP = this.settingsTree.refresh();
+		}
+
+		return refreshP.then(() => {
+			this.tocTreeModel.update();
+			this.renderResultCountMessages();
+
+			// if (this.searchResultModel) {
+			// 	expandAll(this.tocTree);
+			// }
+
+			return this.tocTree.refresh();
+		}).then(() => { });
+	}
+
+	private updateModifiedLabelForKey(key: string): void {
+		const dataElements = this.currentSettingsModel.getElementsByName(key);
+		const isModified = dataElements && dataElements[0] && dataElements[0].isConfigured; // all elements are either configured or not
+		const elements = this.settingsTreeRenderer.getDOMElementsForSettingKey(this.settingsTree.getHTMLElement(), key);
+		if (elements && elements[0]) {
+			DOM.toggleClass(elements[0], 'is-configured', isModified);
+		}
+	}
+
 	private onSearchInputChanged(): void {
 		const query = this.searchWidget.getValue().trim();
 		this.delayedFilterLogging.cancel();
-		this.triggerSearch(query).then(() => {
+		this.triggerSearch(query.replace(/›/g, ' ')).then(() => {
 			if (query && this.searchResultModel) {
 				this.delayedFilterLogging.trigger(() => this.reportFilteringUsed(query, this.searchResultModel.getUniqueResults()));
 			}
 		});
 	}
 
+	private parseSettingFromJSON(query: string): string {
+		const match = query.match(/"([a-zA-Z.]+)": /);
+		return match && match[1];
+	}
+
 	private triggerSearch(query: string): TPromise<void> {
+		this.viewState.tagFilters = new Set<string>();
 		if (query) {
-			return this.searchInProgress = TPromise.join([
-				this.localSearchDelayer.trigger(() => this.localFilterPreferences(query)),
-				this.remoteSearchThrottle.trigger(() => this.remoteSearchPreferences(query), 500)
-			]).then(() => {
-				this.searchInProgress = null;
-			});
+			const parsedQuery = parseQuery(query);
+			query = parsedQuery.query;
+			parsedQuery.tags.forEach(tag => this.viewState.tagFilters.add(tag));
+		}
+
+		if (query && query !== '@') {
+			query = this.parseSettingFromJSON(query) || query;
+			return this.triggerFilterPreferences(query);
 		} else {
-			this.localSearchDelayer.cancel();
-			this.remoteSearchThrottle.cancel();
-			if (this.searchInProgress && this.searchInProgress.cancel) {
-				this.searchInProgress.cancel();
+			if (this.viewState.tagFilters && this.viewState.tagFilters.size) {
+				this.searchResultModel = this.createFilterModel();
+			} else {
+				this.searchResultModel = null;
 			}
 
-			this.searchResultModel = null;
-			this.settingsTree.setInput(this.defaultSettingsEditorModel);
-			this.expandCommonlyUsedSettings();
+			this.localSearchDelayer.cancel();
+			this.remoteSearchThrottle.cancel();
+			if (this.searchInProgress) {
+				this.searchInProgress.cancel();
+				this.searchInProgress.dispose();
+				this.searchInProgress = null;
+			}
 
-			return TPromise.wrap(null);
+			this.viewState.filterToCategory = null;
+			this.tocTreeModel.currentSearchModel = this.searchResultModel;
+			this.tocTree.refresh();
+			this.onSearchModeToggled();
+
+			if (this.searchResultModel) {
+				// Added a filter model
+				this.tocTree.setSelection([]);
+				expandAll(this.tocTree);
+				return this.settingsTree.setInput(this.searchResultModel.root).then(() => {
+					this.renderResultCountMessages();
+				});
+			} else {
+				// Leaving search mode
+				collapseAll(this.tocTree);
+				return this.settingsTree.setInput(this.settingsTreeModel.root).then(() => this.renderResultCountMessages());
+			}
 		}
 	}
 
-	private expandCommonlyUsedSettings(): void {
-		const commonlyUsedGroup = this.defaultSettingsEditorModel.settingsGroups[0];
-		this.settingsTree.expand(this.treeDataSource.getGroupElement(commonlyUsedGroup, 0));
+	/**
+	 * Return a fake SearchResultModel which can hold a flat list of all settings, to be filtered (@modified etc)
+	 */
+	private createFilterModel(): SearchResultModel {
+		const filterModel = this.instantiationService.createInstance(SearchResultModel, this.viewState);
+
+		const fullResult: ISearchResult = {
+			filterMatches: []
+		};
+		for (let g of this.defaultSettingsEditorModel.settingsGroups.slice(1)) {
+			for (let sect of g.sections) {
+				for (let setting of sect.settings) {
+					fullResult.filterMatches.push({ setting, matches: [], score: 0 });
+				}
+			}
+		}
+
+		filterModel.setResult(0, fullResult);
+
+		return filterModel;
 	}
 
 	private reportFilteringUsed(query: string, results: ISearchResult[]): void {
@@ -467,7 +983,10 @@ export class SettingsEditor2 extends BaseEditor {
 		// Count unique results
 		const counts = {};
 		const filterResult = results[SearchResultIdx.Local];
-		counts['filterResult'] = filterResult.filterMatches.length;
+		if (filterResult) {
+			counts['filterResult'] = filterResult.filterMatches.length;
+		}
+
 		if (nlpResult) {
 			counts['nlpResult'] = nlpResult.filterMatches.length;
 		}
@@ -491,45 +1010,112 @@ export class SettingsEditor2 extends BaseEditor {
 			}
 		*/
 		this.telemetryService.publicLog('settingsEditor.filter', data);
+
+		const data2 = {
+			durations,
+			counts,
+			requestCount
+		};
+
+		/* __GDPR__
+			"settingsEditor.filter2" : {
+				"durations.nlpResult" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+				"counts.nlpResult" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+				"counts.filterResult" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+				"requestCount" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true }
+			}
+		*/
+		this.telemetryService.publicLog('settingsEditor.filter2', data2);
 	}
 
-	private localFilterPreferences(query: string): TPromise<void> {
-		const localSearchProvider = this.preferencesSearchService.getLocalSearchProvider(query);
-		return this.filterOrSearchPreferences(query, SearchResultIdx.Local, localSearchProvider);
-	}
+	private triggerFilterPreferences(query: string): TPromise<void> {
+		if (this.searchInProgress) {
+			this.searchInProgress.cancel();
+			this.searchInProgress = null;
+		}
 
-	private remoteSearchPreferences(query: string): TPromise<void> {
-		const remoteSearchProvider = this.preferencesSearchService.getRemoteSearchProvider(query);
-		return this.filterOrSearchPreferences(query, SearchResultIdx.Remote, remoteSearchProvider);
-	}
-
-	private filterOrSearchPreferences(query: string, type: SearchResultIdx, searchProvider: ISearchProvider): TPromise<void> {
-		const filterPs: TPromise<ISearchResult>[] = [this._filterOrSearchPreferencesModel(query, this.defaultSettingsEditorModel, searchProvider)];
-
-		let isCanceled = false;
-		return new TPromise(resolve => {
-			return TPromise.join(filterPs).then(results => {
-				if (isCanceled) {
-					// Handle cancellation like this because cancellation is lost inside the search provider due to async/await
-					return null;
-				}
-
-				const [result] = results;
-				if (!this.searchResultModel) {
-					this.searchResultModel = new SearchResultModel();
-					this.settingsTree.setInput(this.searchResultModel);
-				}
-
-				this.searchResultModel.setResult(type, result);
-				resolve(this.refreshTreeAndMaintainFocus());
-			});
-		}, () => {
-			isCanceled = true;
+		// Trigger the local search. If it didn't find an exact match, trigger the remote search.
+		const searchInProgress = this.searchInProgress = new CancellationTokenSource();
+		return this.localSearchDelayer.trigger(() => {
+			if (searchInProgress && !searchInProgress.token.isCancellationRequested) {
+				return this.localFilterPreferences(query).then(result => {
+					if (!result.exactMatch) {
+						this.remoteSearchThrottle.trigger(() => {
+							return searchInProgress && !searchInProgress.token.isCancellationRequested ?
+								this.remoteSearchPreferences(query, this.searchInProgress.token) :
+								TPromise.wrap(null);
+						});
+					}
+				});
+			} else {
+				return TPromise.wrap(null);
+			}
 		});
 	}
 
-	private _filterOrSearchPreferencesModel(filter: string, model: ISettingsEditorModel, provider: ISearchProvider): TPromise<ISearchResult> {
-		const searchP = provider ? provider.searchModel(model) : TPromise.wrap(null);
+	private localFilterPreferences(query: string, token?: CancellationToken): TPromise<ISearchResult> {
+		const localSearchProvider = this.preferencesSearchService.getLocalSearchProvider(query);
+		return this.filterOrSearchPreferences(query, SearchResultIdx.Local, localSearchProvider, token);
+	}
+
+	private remoteSearchPreferences(query: string, token?: CancellationToken): TPromise<void> {
+		const remoteSearchProvider = this.preferencesSearchService.getRemoteSearchProvider(query);
+		const newExtSearchProvider = this.preferencesSearchService.getRemoteSearchProvider(query, true);
+
+		return TPromise.join([
+			this.filterOrSearchPreferences(query, SearchResultIdx.Remote, remoteSearchProvider, token),
+			this.filterOrSearchPreferences(query, SearchResultIdx.NewExtensions, newExtSearchProvider, token)
+		]).then(() => {
+			this.renderResultCountMessages();
+		});
+	}
+
+	private filterOrSearchPreferences(query: string, type: SearchResultIdx, searchProvider: ISearchProvider, token?: CancellationToken): TPromise<ISearchResult> {
+		return this._filterOrSearchPreferencesModel(query, this.defaultSettingsEditorModel, searchProvider, token).then(result => {
+			if (token && token.isCancellationRequested) {
+				// Handle cancellation like this because cancellation is lost inside the search provider due to async/await
+				return null;
+			}
+
+			if (!this.searchResultModel) {
+				this.searchResultModel = this.instantiationService.createInstance(SearchResultModel, this.viewState);
+				this.searchResultModel.setResult(type, result);
+				this.tocTreeModel.currentSearchModel = this.searchResultModel;
+				this.onSearchModeToggled();
+				this.settingsTree.setInput(this.searchResultModel.root);
+			} else {
+				this.searchResultModel.setResult(type, result);
+				this.tocTreeModel.update();
+			}
+
+			this.tocTree.setSelection([]);
+			this.viewState.filterToCategory = null;
+			expandAll(this.tocTree);
+
+			return this.renderTree().then(() => result);
+		});
+	}
+
+	private renderResultCountMessages() {
+		if (!this.settingsTree.getInput()) {
+			return;
+		}
+
+		if (this.tocTreeModel && this.tocTreeModel.settingsTreeRoot) {
+			const count = this.tocTreeModel.settingsTreeRoot.count;
+			switch (count) {
+				case 0: this.countElement.innerText = localize('noResults', "No Settings Found"); break;
+				case 1: this.countElement.innerText = localize('oneResult', "1 Setting Found"); break;
+				default: this.countElement.innerText = localize('moreThanOneResult', "{0} Settings Found", count);
+			}
+
+			this.countElement.style.display = 'block';
+			this.noResultsMessage.style.display = count === 0 ? 'block' : 'none';
+		}
+	}
+
+	private _filterOrSearchPreferencesModel(filter: string, model: ISettingsEditorModel, provider: ISearchProvider, token?: CancellationToken): TPromise<ISearchResult> {
+		const searchP = provider ? provider.searchModel(model, token) : TPromise.wrap(null);
 		return searchP
 			.then<ISearchResult>(null, err => {
 				if (isPromiseCanceledError(err)) {
@@ -552,9 +1138,37 @@ export class SettingsEditor2 extends BaseEditor {
 			});
 	}
 
-	private layoutSettingsList(dimension: DOM.Dimension): void {
-		const listHeight = dimension.height - (DOM.getDomNodePagePosition(this.headerContainer).height + 12 /*padding*/);
-		this.settingsTreeContainer.style.height = `${listHeight}px`;
-		this.settingsTree.layout(listHeight, 800);
+	private layoutTrees(dimension: DOM.Dimension): void {
+		const listHeight = dimension.height - (76 + 11 /* header height + padding*/);
+		const settingsTreeHeight = listHeight - 14;
+		this.settingsTreeContainer.style.height = `${settingsTreeHeight}px`;
+		this.settingsTree.layout(settingsTreeHeight, 800);
+
+		const tocTreeHeight = listHeight - 16;
+		this.tocTreeContainer.style.height = `${tocTreeHeight}px`;
+		this.tocTree.layout(tocTreeHeight, 175);
+
+		this.settingsTreeRenderer.updateWidth(dimension.width);
 	}
-}
\ No newline at end of file
+}
+
+interface ISettingsToolbarContext {
+	target: SettingsTarget;
+}
+
+class FilterByTagAction extends Action {
+	static readonly ID = 'settings.filterByTag';
+
+	constructor(
+		label: string,
+		private tag: string,
+		private settingsEditor: SettingsEditor2
+	) {
+		super(FilterByTagAction.ID, label, 'toggle-filter-tag');
+	}
+
+	run(): TPromise<void> {
+		this.settingsEditor.focusSearch(this.tag === MODIFIED_SETTING_TAG ? `@${this.tag} ` : `@tag:${this.tag} `, false);
+		return TPromise.as(null);
+	}
+}
diff --git a/src/vs/workbench/parts/preferences/browser/settingsLayout.ts b/src/vs/workbench/parts/preferences/browser/settingsLayout.ts
new file mode 100644
index 00000000000..e98adfcb7bb
--- /dev/null
+++ b/src/vs/workbench/parts/preferences/browser/settingsLayout.ts
@@ -0,0 +1,201 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { localize } from 'vs/nls';
+import { ISetting } from 'vs/workbench/services/preferences/common/preferences';
+
+export interface ITOCEntry {
+	id: string;
+	label: string;
+
+	children?: ITOCEntry[];
+	settings?: (string | ISetting)[];
+}
+
+export const commonlyUsedData: ITOCEntry = {
+	id: 'commonlyUsed',
+	label: localize('commonlyUsed', "Commonly Used"),
+	settings: ['files.autoSave', 'editor.fontSize', 'editor.fontFamily', 'editor.tabSize', 'editor.renderWhitespace', 'editor.cursorStyle', 'editor.multiCursorModifier', 'editor.insertSpaces', 'editor.wordWrap', 'files.exclude', 'files.associations']
+};
+
+export const tocData: ITOCEntry = {
+	id: 'root',
+	label: 'root',
+	children: [
+		{
+			id: 'editor',
+			label: localize('textEditor', "Text Editor"),
+			settings: ['editor.*'],
+			children: [
+				{
+					id: 'editor/cursor',
+					label: localize('cursor', "Cursor"),
+					settings: ['editor.cursor*']
+				},
+				{
+					id: 'editor/find',
+					label: localize('find', "Find"),
+					settings: ['editor.find.*']
+				},
+				{
+					id: 'editor/font',
+					label: localize('font', "Font"),
+					settings: ['editor.font*']
+				},
+				{
+					id: 'editor/format',
+					label: localize('formatting', "Formatting"),
+					settings: ['editor.format*']
+				},
+				{
+					id: 'editor/diffEditor',
+					label: localize('diffEditor', "Diff Editor"),
+					settings: ['diffEditor.*']
+				},
+				{
+					id: 'editor/minimap',
+					label: localize('minimap', "Minimap"),
+					settings: ['editor.minimap.*']
+				},
+				{
+					id: 'editor/suggestions',
+					label: localize('suggestions', "Suggestions"),
+					settings: ['editor.*suggest*']
+				},
+				{
+					id: 'editor/files',
+					label: localize('files', "Files"),
+					settings: ['files.*']
+				}
+			]
+		},
+		{
+			id: 'workbench',
+			label: localize('workbench', "Workbench"),
+			settings: ['workbench.*'],
+			children: [
+				{
+					id: 'workbench/appearance',
+					label: localize('appearance', "Appearance"),
+					settings: ['workbench.activityBar.*', 'workbench.*color*', 'workbench.fontAliasing', 'workbench.iconTheme', 'workbench.sidebar.location', 'workbench.*.visible', 'workbench.tips.enabled', 'workbench.tree.*', 'workbench.view.*']
+				},
+				{
+					id: 'workbench/breadcrumbs',
+					label: localize('breadcrumbs', "Breadcrumbs"),
+					settings: ['breadcrumbs.*']
+				},
+				{
+					id: 'workbench/editor',
+					label: localize('editorManagement', "Editor Management"),
+					settings: ['workbench.editor.*']
+				},
+				{
+					id: 'workbench/settings',
+					label: localize('settings', "Settings Editor"),
+					settings: ['workbench.settings.*']
+				},
+				{
+					id: 'workbench/zenmode',
+					label: localize('zenMode', "Zen Mode"),
+					settings: ['zenmode.*']
+				}
+			]
+		},
+		{
+			id: 'window',
+			label: localize('window', "Window"),
+			settings: ['window.*'],
+			children: [
+				{
+					id: 'window/newWindow',
+					label: localize('newWindow', "New Window"),
+					settings: ['window.*newwindow*']
+				}
+			]
+		},
+		{
+			id: 'features',
+			label: localize('features', "Features"),
+			children: [
+				{
+					id: 'features/explorer',
+					label: localize('fileExplorer', "Explorer"),
+					settings: ['explorer.*', 'outline.*']
+				},
+				{
+					id: 'features/search',
+					label: localize('search', "Search"),
+					settings: ['search.*']
+				}
+				,
+				{
+					id: 'features/debug',
+					label: localize('debug', "Debug"),
+					settings: ['debug.*', 'launch']
+				},
+				{
+					id: 'features/scm',
+					label: localize('scm', "SCM"),
+					settings: ['scm.*']
+				},
+				{
+					id: 'features/extensions',
+					label: localize('extensionViewlet', "Extension Viewlet"),
+					settings: ['extensions.*']
+				},
+				{
+					id: 'features/terminal',
+					label: localize('terminal', "Terminal"),
+					settings: ['terminal.*']
+				},
+				{
+					id: 'features/problems',
+					label: localize('problems', "Problems"),
+					settings: ['problems.*']
+				}
+			]
+		},
+		{
+			id: 'application',
+			label: localize('application', "Application"),
+			children: [
+				{
+					id: 'application/http',
+					label: localize('proxy', "Proxy"),
+					settings: ['http.*']
+				},
+				{
+					id: 'application/keyboard',
+					label: localize('keyboard', "Keyboard"),
+					settings: ['keyboard.*']
+				},
+				{
+					id: 'application/update',
+					label: localize('update', "Update"),
+					settings: ['update.*']
+				},
+				{
+					id: 'application/telemetry',
+					label: localize('telemetry', "Telemetry"),
+					settings: ['telemetry.*']
+				}
+			]
+		}
+	]
+};
+
+export const knownAcronyms = new Set();
+[
+	'css',
+	'html',
+	'scss',
+	'less',
+	'json',
+	'js',
+	'ts',
+	'ie',
+	'id',
+	'php',
+].forEach(str => knownAcronyms.add(str));
diff --git a/src/vs/workbench/parts/preferences/browser/settingsTree.ts b/src/vs/workbench/parts/preferences/browser/settingsTree.ts
index ae7b0790c4a..c9031217e2b 100644
--- a/src/vs/workbench/parts/preferences/browser/settingsTree.ts
+++ b/src/vs/workbench/parts/preferences/browser/settingsTree.ts
@@ -4,251 +4,328 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as DOM from 'vs/base/browser/dom';
+import { renderMarkdown } from 'vs/base/browser/htmlContentRenderer';
 import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
 import { IMouseEvent } from 'vs/base/browser/mouseEvent';
+import { Separator } from 'vs/base/browser/ui/actionbar/actionbar';
+import { alert as ariaAlert } from 'vs/base/browser/ui/aria/aria';
 import { Button } from 'vs/base/browser/ui/button/button';
+import { Checkbox } from 'vs/base/browser/ui/checkbox/checkbox';
 import { InputBox } from 'vs/base/browser/ui/inputbox/inputBox';
-import { renderOcticons } from 'vs/base/browser/ui/octiconLabel/octiconLabel';
 import { SelectBox } from 'vs/base/browser/ui/selectBox/selectBox';
-import { Color } from 'vs/base/common/color';
+import { ToolBar } from 'vs/base/browser/ui/toolbar/toolbar';
+import { Action, IAction } from 'vs/base/common/actions';
+import * as arrays from 'vs/base/common/arrays';
+import { Color, RGBA } from 'vs/base/common/color';
+import { onUnexpectedError } from 'vs/base/common/errors';
 import { Emitter, Event } from 'vs/base/common/event';
 import { KeyCode } from 'vs/base/common/keyCodes';
 import { dispose, IDisposable } from 'vs/base/common/lifecycle';
-import * as objects from 'vs/base/common/objects';
-import URI from 'vs/base/common/uri';
+import { escapeRegExpCharacters, startsWith } from 'vs/base/common/strings';
+import { URI } from 'vs/base/common/uri';
 import { TPromise } from 'vs/base/common/winjs.base';
-import { IAccessibilityProvider, IDataSource, IFilter, IRenderer, ITree } from 'vs/base/parts/tree/browser/tree';
+import { IAccessibilityProvider, IDataSource, IFilter, IRenderer as ITreeRenderer, ITree, ITreeConfiguration } from 'vs/base/parts/tree/browser/tree';
+import { DefaultTreestyler } from 'vs/base/parts/tree/browser/treeDefaults';
+import { Tree } from 'vs/base/parts/tree/browser/treeImpl';
 import { localize } from 'vs/nls';
-import { ConfigurationTarget, IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
+import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
+import { ICommandService } from 'vs/platform/commands/common/commands';
+import { IConfigurationService, ConfigurationTarget } from 'vs/platform/configuration/common/configuration';
+import { IContextMenuService, IContextViewService } from 'vs/platform/contextview/browser/contextView';
+import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { WorkbenchTreeController } from 'vs/platform/list/browser/listService';
-import { editorActiveLinkForeground, registerColor } from 'vs/platform/theme/common/colorRegistry';
-import { attachButtonStyler, attachInputBoxStyler, attachSelectBoxStyler } from 'vs/platform/theme/common/styler';
+import { IOpenerService } from 'vs/platform/opener/common/opener';
+import { editorBackground, errorForeground, focusBorder, foreground, inputValidationErrorBackground, inputValidationErrorForeground, inputValidationErrorBorder } from 'vs/platform/theme/common/colorRegistry';
+import { attachButtonStyler, attachInputBoxStyler, attachSelectBoxStyler, attachStyler } from 'vs/platform/theme/common/styler';
 import { ICssStyleCollector, ITheme, IThemeService, registerThemingParticipant } from 'vs/platform/theme/common/themeService';
-import { SettingsTarget } from 'vs/workbench/parts/preferences/browser/preferencesWidgets';
-import { ISearchResult, ISetting, ISettingsGroup } from 'vs/workbench/services/preferences/common/preferences';
-import { DefaultSettingsEditorModel } from 'vs/workbench/services/preferences/common/preferencesModels';
+import { ITOCEntry } from 'vs/workbench/parts/preferences/browser/settingsLayout';
+import { ISettingsEditorViewState, isExcludeSetting, settingKeyToDisplayFormat, SettingsTreeElement, SettingsTreeGroupElement, SettingsTreeNewExtensionsElement, SettingsTreeSettingElement } from 'vs/workbench/parts/preferences/browser/settingsTreeModels';
+import { ExcludeSettingWidget, IExcludeDataItem, settingsHeaderForeground, settingsNumberInputBackground, settingsNumberInputBorder, settingsNumberInputForeground, settingsSelectBackground, settingsSelectBorder, settingsSelectForeground, settingsSelectListBorder, settingsTextInputBackground, settingsTextInputBorder, settingsTextInputForeground } from 'vs/workbench/parts/preferences/browser/settingsWidgets';
+import { SETTINGS_EDITOR_COMMAND_SHOW_CONTEXT_MENU } from 'vs/workbench/parts/preferences/common/preferences';
+import { ISetting, ISettingsGroup } from 'vs/workbench/services/preferences/common/preferences';
 
 const $ = DOM.$;
 
-export const modifiedItemForeground = registerColor('settings.modifiedItemForeground', {
-	light: '#019001',
-	dark: '#73C991',
-	hc: '#73C991'
-}, localize('modifiedItemForeground', "(For settings editor preview) The foreground color for a modified setting."));
+function getExcludeDisplayValue(element: SettingsTreeSettingElement): IExcludeDataItem[] {
+	const data = element.isConfigured ?
+		{ ...element.defaultValue, ...element.scopeValue } :
+		element.defaultValue;
 
-registerThemingParticipant((theme: ITheme, collector: ICssStyleCollector) => {
-	const modifiedItemForegroundColor = theme.getColor(modifiedItemForeground);
-	if (modifiedItemForegroundColor) {
-		collector.addRule(`.settings-editor > .settings-body > .settings-tree-container .setting-item.is-configured .setting-item-is-configured-label { color: ${modifiedItemForegroundColor}; }`);
+	return Object.keys(data)
+		.filter(key => !!data[key])
+		.map(key => {
+			const value = data[key];
+			const sibling = typeof value === 'boolean' ? undefined : value.when;
+
+			return {
+				id: key,
+				pattern: key,
+				sibling
+			};
+		});
+}
+
+export function resolveSettingsTree(tocData: ITOCEntry, coreSettingsGroups: ISettingsGroup[]): { tree: ITOCEntry, leftoverSettings: Set<ISetting> } {
+	const allSettings = getFlatSettings(coreSettingsGroups);
+	return {
+		tree: _resolveSettingsTree(tocData, allSettings),
+		leftoverSettings: allSettings
+	};
+}
+
+export function resolveExtensionsSettings(groups: ISettingsGroup[]): ITOCEntry {
+	const settingsGroupToEntry = (group: ISettingsGroup) => {
+		const flatSettings = arrays.flatten(
+			group.sections.map(section => section.settings));
+
+		return {
+			id: group.id,
+			label: group.title,
+			settings: flatSettings
+		};
+	};
+
+	const extGroups = groups
+		.sort((a, b) => a.title.localeCompare(b.title))
+		.map(g => settingsGroupToEntry(g));
+
+	return {
+		id: 'extensions',
+		label: localize('extensions', "Extensions"),
+		children: extGroups
+	};
+}
+
+function _resolveSettingsTree(tocData: ITOCEntry, allSettings: Set<ISetting>): ITOCEntry {
+	let children: ITOCEntry[];
+	if (tocData.children) {
+		children = tocData.children
+			.map(child => _resolveSettingsTree(child, allSettings))
+			.filter(child => (child.children && child.children.length) || (child.settings && child.settings.length));
 	}
-});
 
-export interface ITreeItem {
-	id: string;
+	let settings: ISetting[];
+	if (tocData.settings) {
+		settings = arrays.flatten(tocData.settings.map(pattern => getMatchingSettings(allSettings, <string>pattern)));
+	}
+
+	if (!children && !settings) {
+		return null;
+	}
+
+	return {
+		id: tocData.id,
+		label: tocData.label,
+		children,
+		settings
+	};
 }
 
-export enum TreeItemType {
-	setting,
-	groupTitle
+function getMatchingSettings(allSettings: Set<ISetting>, pattern: string): ISetting[] {
+	const result: ISetting[] = [];
+
+	allSettings.forEach(s => {
+		if (settingMatches(s, pattern)) {
+			result.push(s);
+			allSettings.delete(s);
+		}
+	});
+
+
+	return result.sort((a, b) => a.key.localeCompare(b.key));
 }
 
-export interface ISettingElement extends ITreeItem {
-	type: TreeItemType.setting;
-	parent: ISettingsGroup;
-	setting: ISetting;
+const settingPatternCache = new Map<string, RegExp>();
 
-	displayCategory: string;
-	displayLabel: string;
-	value: any;
-	isConfigured: boolean;
-	overriddenScopeList: string[];
-	description: string;
-	valueType?: string | string[];
-	enum?: string[];
+function createSettingMatchRegExp(pattern: string): RegExp {
+	pattern = escapeRegExpCharacters(pattern)
+		.replace(/\\\*/g, '.*');
+
+	return new RegExp(`^${pattern}`, 'i');
 }
 
-export interface IGroupElement extends ITreeItem {
-	type: TreeItemType.groupTitle;
-	parent: DefaultSettingsEditorModel;
-	group: ISettingsGroup;
-	index: number;
+function settingMatches(s: ISetting, pattern: string): boolean {
+	let regExp = settingPatternCache.get(pattern);
+	if (!regExp) {
+		regExp = createSettingMatchRegExp(pattern);
+		settingPatternCache.set(pattern, regExp);
+	}
+
+	return regExp.test(s.key);
 }
 
-export type TreeElement = ISettingElement | IGroupElement;
-export type TreeElementOrRoot = TreeElement | DefaultSettingsEditorModel | SearchResultModel;
+function getFlatSettings(settingsGroups: ISettingsGroup[]) {
+	const result: Set<ISetting> = new Set();
 
-function inspectSetting(key: string, target: SettingsTarget, configurationService: IConfigurationService): { isConfigured: boolean, inspected: any, targetSelector: string } {
-	const inspectOverrides = URI.isUri(target) ? { resource: target } : undefined;
-	const inspected = configurationService.inspect(key, inspectOverrides);
-	const targetSelector = target === ConfigurationTarget.USER ? 'user' :
-		target === ConfigurationTarget.WORKSPACE ? 'workspace' :
-			'workspaceFolder';
-	const isConfigured = typeof inspected[targetSelector] !== 'undefined';
+	for (let group of settingsGroups) {
+		for (let section of group.sections) {
+			for (let s of section.settings) {
+				if (!s.overrides || !s.overrides.length) {
+					result.add(s);
+				}
+			}
+		}
+	}
 
-	return { isConfigured, inspected, targetSelector };
+	return result;
 }
 
+
 export class SettingsDataSource implements IDataSource {
-	constructor(
-		private viewState: ISettingsEditorViewState,
-		@IConfigurationService private configurationService: IConfigurationService
-	) { }
 
-	getGroupElement(group: ISettingsGroup, index: number): IGroupElement {
-		return <IGroupElement>{
-			type: TreeItemType.groupTitle,
-			group,
-			id: `${group.title}_${group.id}`,
-			index
-		};
+	getId(tree: ITree, element: SettingsTreeElement): string {
+		return element.id;
 	}
 
-	getSettingElement(setting: ISetting, group: ISettingsGroup): ISettingElement {
-		const { isConfigured, inspected, targetSelector } = inspectSetting(setting.key, this.viewState.settingsTarget, this.configurationService);
-
-		const displayValue = isConfigured ? inspected[targetSelector] : inspected.default;
-		const overriddenScopeList = [];
-		if (targetSelector === 'user' && typeof inspected.workspace !== 'undefined') {
-			overriddenScopeList.push(localize('workspace', "Workspace"));
-		}
-
-		if (targetSelector === 'workspace' && typeof inspected.user !== 'undefined') {
-			overriddenScopeList.push(localize('user', "User"));
-		}
-
-		const displayKeyFormat = settingKeyToDisplayFormat(setting.key);
-		return <ISettingElement>{
-			type: TreeItemType.setting,
-			parent: group,
-			id: `${group.id}_${setting.key.replace(/\./g, '_')}`,
-			setting,
-
-			displayLabel: displayKeyFormat.label,
-			displayCategory: displayKeyFormat.category,
-			isExpanded: false,
-
-			value: displayValue,
-			isConfigured,
-			overriddenScopeList,
-			description: setting.description.join('\n'),
-			enum: setting.enum,
-			valueType: setting.type
-		};
-	}
-
-	getId(tree: ITree, element: TreeElementOrRoot): string {
-		return element instanceof DefaultSettingsEditorModel ? 'root' : element.id;
-	}
-
-	hasChildren(tree: ITree, element: TreeElementOrRoot): boolean {
-		if (element instanceof DefaultSettingsEditorModel) {
-			return true;
-		}
-
-		if (element instanceof SearchResultModel) {
-			return true;
-		}
-
-		if (element.type === TreeItemType.groupTitle) {
+	hasChildren(tree: ITree, element: SettingsTreeElement): boolean {
+		if (element instanceof SettingsTreeGroupElement) {
 			return true;
 		}
 
 		return false;
 	}
 
-	_getChildren(element: TreeElementOrRoot): TreeElement[] {
-		if (element instanceof DefaultSettingsEditorModel) {
-			return this.getRootChildren(element);
-		} else if (element instanceof SearchResultModel) {
-			return this.getGroupChildren(element.resultsAsGroup());
-		} else if (element.type === TreeItemType.groupTitle) {
-			return this.getGroupChildren(element.group);
+	getChildren(tree: ITree, element: SettingsTreeElement): TPromise<any> {
+		return TPromise.as(this._getChildren(element));
+	}
+
+	private _getChildren(element: SettingsTreeElement): SettingsTreeElement[] {
+		if (element instanceof SettingsTreeGroupElement) {
+			return element.children;
 		} else {
 			// No children...
 			return null;
 		}
 	}
 
-	getChildren(tree: ITree, element: TreeElementOrRoot): TPromise<any, any> {
-		return TPromise.as(this._getChildren(element));
+	getParent(tree: ITree, element: SettingsTreeElement): TPromise<any> {
+		return TPromise.wrap(element && element.parent);
 	}
 
-	private getRootChildren(root: DefaultSettingsEditorModel): TreeElement[] {
-		return root.settingsGroups
-			.map((g, i) => this.getGroupElement(g, i));
-	}
-
-	private getGroupChildren(group: ISettingsGroup): ISettingElement[] {
-		const entries: ISettingElement[] = [];
-		for (const section of group.sections) {
-			for (const setting of section.settings) {
-				entries.push(this.getSettingElement(setting, group));
-			}
-		}
-
-		return entries;
-	}
-
-	getParent(tree: ITree, element: TreeElement): TPromise<any, any> {
-		if (!element) {
-			return null;
-		}
-
-		if (!(element instanceof DefaultSettingsEditorModel)) {
-			return TPromise.wrap(element.parent);
-		}
-
-		return TPromise.wrap(null);
+	shouldAutoexpand(): boolean {
+		return true;
 	}
 }
 
-export function settingKeyToDisplayFormat(key: string): { category: string, label: string } {
-	let label = key
-		.replace(/\.([a-z])/g, (match, p1) => `.${p1.toUpperCase()}`)
-		.replace(/([a-z])([A-Z])/g, '$1 $2') // fooBar => foo Bar
-		.replace(/^[a-z]/g, match => match.toUpperCase()); // foo => Foo
+export class SimplePagedDataSource implements IDataSource {
+	private static readonly SETTINGS_PER_PAGE = 30;
+	private static readonly BUFFER = 5;
 
-	const lastDotIdx = label.lastIndexOf('.');
-	let category = '';
-	if (lastDotIdx >= 0) {
-		category = label.substr(0, lastDotIdx);
-		label = label.substr(lastDotIdx + 1);
+	private loadedToIndex: number;
+
+	constructor(private realDataSource: IDataSource) {
+		this.reset();
 	}
 
-	return { category, label };
+	reset(): void {
+		this.loadedToIndex = SimplePagedDataSource.SETTINGS_PER_PAGE;
+	}
+
+	pageTo(index: number, top = false): boolean {
+		const buffer = top ? SimplePagedDataSource.SETTINGS_PER_PAGE : SimplePagedDataSource.BUFFER;
+
+		if (index > this.loadedToIndex - buffer) {
+			this.loadedToIndex = (Math.ceil(index / SimplePagedDataSource.SETTINGS_PER_PAGE) + 1) * SimplePagedDataSource.SETTINGS_PER_PAGE;
+			return true;
+		} else {
+			return false;
+		}
+	}
+
+	getId(tree: ITree, element: any): string {
+		return this.realDataSource.getId(tree, element);
+	}
+
+	hasChildren(tree: ITree, element: any): boolean {
+		return this.realDataSource.hasChildren(tree, element);
+	}
+
+	getChildren(tree: ITree, element: SettingsTreeGroupElement): TPromise<any> {
+		return this.realDataSource.getChildren(tree, element).then(realChildren => {
+			return this._getChildren(realChildren);
+		});
+	}
+
+	_getChildren(realChildren: SettingsTreeElement[]): any[] {
+		const lastChild = realChildren[realChildren.length - 1];
+		if (lastChild && lastChild.index > this.loadedToIndex) {
+			return realChildren.filter(child => {
+				return child.index < this.loadedToIndex;
+			});
+		} else {
+			return realChildren;
+		}
+	}
+
+	getParent(tree: ITree, element: any): TPromise<any> {
+		return this.realDataSource.getParent(tree, element);
+	}
+
+	shouldAutoexpand(tree: ITree, element: any): boolean {
+		return this.realDataSource.shouldAutoexpand(tree, element);
+	}
 }
 
-export interface ISettingsEditorViewState {
-	settingsTarget: SettingsTarget;
-	showConfiguredOnly?: boolean;
-}
-
-export interface IDisposableTemplate {
+interface IDisposableTemplate {
 	toDispose: IDisposable[];
 }
 
-export interface ISettingItemTemplate extends IDisposableTemplate {
-	parent: HTMLElement;
+interface ISettingItemTemplate<T = any> extends IDisposableTemplate {
+	onChange?: (value: T) => void;
 
-	context?: ISettingElement;
+	context?: SettingsTreeSettingElement;
 	containerElement: HTMLElement;
 	categoryElement: HTMLElement;
 	labelElement: HTMLElement;
 	descriptionElement: HTMLElement;
-	expandIndicatorElement: HTMLElement;
-	valueElement: HTMLElement;
-	isConfiguredElement: HTMLElement;
+	controlElement: HTMLElement;
+	deprecationWarningElement: HTMLElement;
 	otherOverridesElement: HTMLElement;
+	toolbar: ToolBar;
 }
 
-export interface IGroupTitleTemplate extends IDisposableTemplate {
-	context?: IGroupElement;
+interface ISettingBoolItemTemplate extends ISettingItemTemplate<boolean> {
+	checkbox: Checkbox;
+}
+
+interface ISettingTextItemTemplate extends ISettingItemTemplate<string> {
+	inputBox: InputBox;
+	validationErrorMessageElement: HTMLElement;
+}
+
+type ISettingNumberItemTemplate = ISettingTextItemTemplate;
+
+interface ISettingEnumItemTemplate extends ISettingItemTemplate<number> {
+	selectBox: SelectBox;
+	enumDescriptionElement: HTMLElement;
+}
+
+interface ISettingComplexItemTemplate extends ISettingItemTemplate<void> {
+	button: Button;
+}
+
+interface ISettingExcludeItemTemplate extends ISettingItemTemplate<void> {
+	excludeWidget: ExcludeSettingWidget;
+}
+
+interface ISettingNewExtensionsTemplate extends IDisposableTemplate {
+	button: Button;
+	context?: SettingsTreeNewExtensionsElement;
+}
+
+interface IGroupTitleTemplate extends IDisposableTemplate {
+	context?: SettingsTreeGroupElement;
 	parent: HTMLElement;
-	labelElement: HTMLElement;
 }
 
-const SETTINGS_ELEMENT_TEMPLATE_ID = 'settings.entry.template';
+const SETTINGS_TEXT_TEMPLATE_ID = 'settings.text.template';
+const SETTINGS_NUMBER_TEMPLATE_ID = 'settings.number.template';
+const SETTINGS_ENUM_TEMPLATE_ID = 'settings.enum.template';
+const SETTINGS_BOOL_TEMPLATE_ID = 'settings.bool.template';
+const SETTINGS_EXCLUDE_TEMPLATE_ID = 'settings.exclude.template';
+const SETTINGS_COMPLEX_TEMPLATE_ID = 'settings.complex.template';
+const SETTINGS_NEW_EXTENSIONS_TEMPLATE_ID = 'settings.newExtensions.template';
 const SETTINGS_GROUP_ELEMENT_TEMPLATE_ID = 'settings.group.template';
 
 export interface ISettingChangeEvent {
@@ -256,61 +333,213 @@ export interface ISettingChangeEvent {
 	value: any; // undefined => reset/unconfigure
 }
 
-export class SettingsRenderer implements IRenderer {
+export interface ISettingLinkClickEvent {
+	source: SettingsTreeSettingElement;
+	targetKey: string;
+}
 
-	private static readonly SETTING_ROW_HEIGHT = 75;
+export class SettingsRenderer implements ITreeRenderer {
+
+	public static readonly CONTROL_CLASS = 'setting-control-focus-target';
+	public static readonly CONTROL_SELECTOR = '.' + SettingsRenderer.CONTROL_CLASS;
+
+	public static readonly SETTING_KEY_ATTR = 'data-key';
 
 	private readonly _onDidChangeSetting: Emitter<ISettingChangeEvent> = new Emitter<ISettingChangeEvent>();
 	public readonly onDidChangeSetting: Event<ISettingChangeEvent> = this._onDidChangeSetting.event;
 
-	private readonly _onDidOpenSettings: Emitter<void> = new Emitter<void>();
-	public readonly onDidOpenSettings: Event<void> = this._onDidOpenSettings.event;
+	private readonly _onDidOpenSettings: Emitter<string> = new Emitter<string>();
+	public readonly onDidOpenSettings: Event<string> = this._onDidOpenSettings.event;
 
-	private measureContainer: HTMLElement;
+	private readonly _onDidClickSettingLink: Emitter<ISettingLinkClickEvent> = new Emitter<ISettingLinkClickEvent>();
+	public readonly onDidClickSettingLink: Event<ISettingLinkClickEvent> = this._onDidClickSettingLink.event;
+
+	private readonly _onDidFocusSetting: Emitter<SettingsTreeSettingElement> = new Emitter<SettingsTreeSettingElement>();
+	public readonly onDidFocusSetting: Event<SettingsTreeSettingElement> = this._onDidFocusSetting.event;
+
+	private descriptionMeasureContainer: HTMLElement;
+	private longestSingleLineDescription = 0;
+
+	private rowHeightCache = new Map<string, number>();
+	private lastRenderedWidth: number;
+
+	private settingActions: IAction[];
 
 	constructor(
 		_measureContainer: HTMLElement,
 		@IThemeService private themeService: IThemeService,
-		@IContextViewService private contextViewService: IContextViewService
+		@IContextViewService private contextViewService: IContextViewService,
+		@IOpenerService private readonly openerService: IOpenerService,
+		@IInstantiationService private readonly instantiationService: IInstantiationService,
+		@ICommandService private readonly commandService: ICommandService,
+		@IContextMenuService private contextMenuService: IContextMenuService,
+		@IKeybindingService private keybindingService: IKeybindingService,
 	) {
-		this.measureContainer = DOM.append(_measureContainer, $('.setting-measure-container.monaco-tree-row'));
+		this.descriptionMeasureContainer = $('.setting-item-description');
+		DOM.append(_measureContainer,
+			$('.setting-measure-container.monaco-tree-row', undefined,
+				$('.setting-item', undefined,
+					this.descriptionMeasureContainer)));
+
+		this.settingActions = [
+			new Action('settings.resetSetting', localize('resetSettingLabel', "Reset Setting"), undefined, undefined, (context: SettingsTreeSettingElement) => {
+				if (context) {
+					this._onDidChangeSetting.fire({ key: context.setting.key, value: undefined });
+				}
+
+				return TPromise.wrap(null);
+			}),
+			new Separator(),
+			this.instantiationService.createInstance(CopySettingIdAction),
+			this.instantiationService.createInstance(CopySettingAsJSONAction),
+		];
 	}
 
-	getHeight(tree: ITree, element: TreeElement): number {
-		if (element.type === TreeItemType.groupTitle) {
-			return 30;
+	showContextMenu(element: SettingsTreeSettingElement, settingDOMElement: HTMLElement): void {
+		const toolbarElement: HTMLElement = settingDOMElement.querySelector('.toolbar-toggle-more');
+		if (toolbarElement) {
+			this.contextMenuService.showContextMenu({
+				getActions: () => TPromise.wrap(this.settingActions),
+				getAnchor: () => toolbarElement,
+				getActionsContext: () => element
+			});
+		}
+	}
+
+	updateWidth(width: number): void {
+		if (this.lastRenderedWidth !== width) {
+			this.rowHeightCache = new Map<string, number>();
+		}
+		this.longestSingleLineDescription = 0;
+
+		this.lastRenderedWidth = width;
+	}
+
+	getHeight(tree: ITree, element: SettingsTreeElement): number {
+		if (this.rowHeightCache.has(element.id) && !(element instanceof SettingsTreeSettingElement && isExcludeSetting(element.setting))) {
+			return this.rowHeightCache.get(element.id);
 		}
 
-		if (element.type === TreeItemType.setting) {
-			const isSelected = this.elementIsSelected(tree, element);
-			if (isSelected) {
-				return this.measureSettingElementHeight(tree, element);
-			} else {
-				return SettingsRenderer.SETTING_ROW_HEIGHT;
+		const h = this._getHeight(tree, element);
+		this.rowHeightCache.set(element.id, h);
+		return h;
+	}
+
+	_getHeight(tree: ITree, element: SettingsTreeElement): number {
+		if (element instanceof SettingsTreeGroupElement) {
+			if (element.isFirstGroup) {
+				return 31;
 			}
+
+			return 40 + (7 * element.level);
+		}
+
+		if (element instanceof SettingsTreeSettingElement) {
+			if (isExcludeSetting(element.setting)) {
+				return this._getExcludeSettingHeight(element);
+			} else {
+				return this.measureSettingElementHeight(tree, element);
+			}
+		}
+
+		if (element instanceof SettingsTreeNewExtensionsElement) {
+			return 40;
 		}
 
 		return 0;
 	}
 
-	private measureSettingElementHeight(tree: ITree, element: ISettingElement): number {
-		const measureHelper = DOM.append(this.measureContainer, $('.setting-measure-helper'));
-
-		const template = this.renderSettingTemplate(tree, measureHelper);
-		this.renderSettingElement(tree, element, template, true);
-
-		const height = measureHelper.offsetHeight;
-		this.measureContainer.removeChild(measureHelper);
-		return height;
+	_getExcludeSettingHeight(element: SettingsTreeSettingElement): number {
+		const displayValue = getExcludeDisplayValue(element);
+		return (displayValue.length + 1) * 22 + 66 + this.measureSettingDescription(element);
 	}
 
-	getTemplateId(tree: ITree, element: TreeElement): string {
-		if (element.type === TreeItemType.groupTitle) {
+	private measureSettingElementHeight(tree: ITree, element: SettingsTreeSettingElement): number {
+		let heightExcludingDescription = 86;
+
+		if (element.valueType === 'boolean') {
+			heightExcludingDescription = 60;
+		}
+
+		return heightExcludingDescription + this.measureSettingDescription(element);
+	}
+
+	private measureSettingDescription(element: SettingsTreeSettingElement): number {
+		if (element.description.length < this.longestSingleLineDescription * .8) {
+			// Most setting descriptions are one short line, so try to avoid measuring them.
+			// If the description is less than 80% of the longest single line description, assume this will also render to be one line.
+			return 18;
+		}
+
+		const boolMeasureClass = 'measure-bool-description';
+		if (element.valueType === 'boolean') {
+			this.descriptionMeasureContainer.classList.add(boolMeasureClass);
+		} else if (this.descriptionMeasureContainer.classList.contains(boolMeasureClass)) {
+			this.descriptionMeasureContainer.classList.remove(boolMeasureClass);
+		}
+
+		const shouldRenderMarkdown = element.setting.descriptionIsMarkdown && element.description.indexOf('\n- ') >= 0;
+
+		while (this.descriptionMeasureContainer.firstChild) {
+			this.descriptionMeasureContainer.removeChild(this.descriptionMeasureContainer.firstChild);
+		}
+
+		if (shouldRenderMarkdown) {
+			const text = fixSettingLinks(element.description);
+			const rendered = renderMarkdown({ value: text });
+			rendered.classList.add('setting-item-description-markdown');
+			this.descriptionMeasureContainer.appendChild(rendered);
+
+			return this.descriptionMeasureContainer.offsetHeight;
+		} else {
+			// Remove markdown links, setting links, backticks
+			const measureText = element.setting.descriptionIsMarkdown ?
+				fixSettingLinks(element.description)
+					.replace(/\[(.*)\]\(.*\)/g, '$1')
+					.replace(/`([^`]*)`/g, '$1') :
+				element.description;
+
+			this.descriptionMeasureContainer.innerText = measureText;
+			const h = this.descriptionMeasureContainer.offsetHeight;
+			if (h < 20 && measureText.length > this.longestSingleLineDescription) {
+				this.longestSingleLineDescription = measureText.length;
+			}
+
+			return h;
+		}
+	}
+
+	getTemplateId(tree: ITree, element: SettingsTreeElement): string {
+		if (element instanceof SettingsTreeGroupElement) {
 			return SETTINGS_GROUP_ELEMENT_TEMPLATE_ID;
 		}
 
-		if (element.type === TreeItemType.setting) {
-			return SETTINGS_ELEMENT_TEMPLATE_ID;
+		if (element instanceof SettingsTreeSettingElement) {
+			if (element.valueType === 'boolean') {
+				return SETTINGS_BOOL_TEMPLATE_ID;
+			}
+
+			if (element.valueType === 'integer' || element.valueType === 'number' || element.valueType === 'nullable-integer' || element.valueType === 'nullable-number') {
+				return SETTINGS_NUMBER_TEMPLATE_ID;
+			}
+
+			if (element.valueType === 'string') {
+				return SETTINGS_TEXT_TEMPLATE_ID;
+			}
+
+			if (element.valueType === 'enum') {
+				return SETTINGS_ENUM_TEMPLATE_ID;
+			}
+
+			if (element.valueType === 'exclude') {
+				return SETTINGS_EXCLUDE_TEMPLATE_ID;
+			}
+
+			return SETTINGS_COMPLEX_TEMPLATE_ID;
+		}
+
+		if (element instanceof SettingsTreeNewExtensionsElement) {
+			return SETTINGS_NEW_EXTENSIONS_TEMPLATE_ID;
 		}
 
 		return '';
@@ -321,8 +550,32 @@ export class SettingsRenderer implements IRenderer {
 			return this.renderGroupTitleTemplate(container);
 		}
 
-		if (templateId === SETTINGS_ELEMENT_TEMPLATE_ID) {
-			return this.renderSettingTemplate(tree, container);
+		if (templateId === SETTINGS_TEXT_TEMPLATE_ID) {
+			return this.renderSettingTextTemplate(tree, container);
+		}
+
+		if (templateId === SETTINGS_NUMBER_TEMPLATE_ID) {
+			return this.renderSettingNumberTemplate(tree, container);
+		}
+
+		if (templateId === SETTINGS_BOOL_TEMPLATE_ID) {
+			return this.renderSettingBoolTemplate(tree, container);
+		}
+
+		if (templateId === SETTINGS_ENUM_TEMPLATE_ID) {
+			return this.renderSettingEnumTemplate(tree, container);
+		}
+
+		if (templateId === SETTINGS_EXCLUDE_TEMPLATE_ID) {
+			return this.renderSettingExcludeTemplate(tree, container);
+		}
+
+		if (templateId === SETTINGS_COMPLEX_TEMPLATE_ID) {
+			return this.renderSettingComplexTemplate(tree, container);
+		}
+
+		if (templateId === SETTINGS_NEW_EXTENSIONS_TEMPLATE_ID) {
+			return this.renderNewExtensionsTemplate(container);
 		}
 
 		return null;
@@ -331,51 +584,52 @@ export class SettingsRenderer implements IRenderer {
 	private renderGroupTitleTemplate(container: HTMLElement): IGroupTitleTemplate {
 		DOM.addClass(container, 'group-title');
 
-		const labelElement = DOM.append(container, $('h3.settings-group-title-label'));
-
 		const toDispose = [];
 		const template: IGroupTitleTemplate = {
 			parent: container,
-			labelElement,
 			toDispose
 		};
 
 		return template;
 	}
 
-	private renderSettingTemplate(tree: ITree, container: HTMLElement): ISettingItemTemplate {
+	private renderCommonTemplate(tree: ITree, container: HTMLElement, typeClass: string): ISettingItemTemplate {
 		DOM.addClass(container, 'setting-item');
-
-		const leftElement = DOM.append(container, $('.setting-item-left'));
-		const rightElement = DOM.append(container, $('.setting-item-right'));
-
-		const titleElement = DOM.append(leftElement, $('.setting-item-title'));
-		const categoryElement = DOM.append(titleElement, $('span.setting-item-category'));
-		const labelElement = DOM.append(titleElement, $('span.setting-item-label'));
-		const isConfiguredElement = DOM.append(titleElement, $('span.setting-item-is-configured-label'));
+		DOM.addClass(container, 'setting-item-' + typeClass);
+		const titleElement = DOM.append(container, $('.setting-item-title'));
+		const labelCategoryContainer = DOM.append(titleElement, $('.setting-item-cat-label-container'));
+		const categoryElement = DOM.append(labelCategoryContainer, $('span.setting-item-category'));
+		const labelElement = DOM.append(labelCategoryContainer, $('span.setting-item-label'));
 		const otherOverridesElement = DOM.append(titleElement, $('span.setting-item-overrides'));
-		const descriptionElement = DOM.append(leftElement, $('.setting-item-description'));
-		const expandIndicatorElement = DOM.append(leftElement, $('.expand-indicator'));
+		const descriptionElement = DOM.append(container, $('.setting-item-description'));
+		const modifiedIndicatorElement = DOM.append(container, $('.setting-item-modified-indicator'));
+		modifiedIndicatorElement.title = localize('modified', "Modified");
 
-		const valueElement = DOM.append(rightElement, $('.setting-item-value'));
+		const valueElement = DOM.append(container, $('.setting-item-value'));
+		const controlElement = DOM.append(valueElement, $('div.setting-item-control'));
+
+		const deprecationWarningElement = DOM.append(container, $('.setting-item-deprecation-message'));
 
 		const toDispose = [];
+
+		const toolbarContainer = DOM.append(container, $('.setting-toolbar-container'));
+		const toolbar = this.renderSettingToolbar(toolbarContainer);
+
 		const template: ISettingItemTemplate = {
-			parent: container,
 			toDispose,
 
 			containerElement: container,
 			categoryElement,
 			labelElement,
 			descriptionElement,
-			expandIndicatorElement,
-			valueElement,
-			isConfiguredElement,
-			otherOverridesElement
+			controlElement,
+			deprecationWarningElement,
+			otherOverridesElement,
+			toolbar
 		};
 
 		// Prevent clicks from being handled by list
-		toDispose.push(DOM.addDisposableListener(valueElement, 'mousedown', (e: IMouseEvent) => e.stopPropagation()));
+		toDispose.push(DOM.addDisposableListener(controlElement, 'mousedown', (e: IMouseEvent) => e.stopPropagation()));
 
 		toDispose.push(DOM.addStandardDisposableListener(valueElement, 'keydown', (e: StandardKeyboardEvent) => {
 			if (e.keyCode === KeyCode.Escape) {
@@ -387,75 +641,414 @@ export class SettingsRenderer implements IRenderer {
 		return template;
 	}
 
-	renderElement(tree: ITree, element: TreeElement, templateId: string, template: any): void {
-		if (templateId === SETTINGS_ELEMENT_TEMPLATE_ID) {
-			return this.renderSettingElement(tree, <ISettingElement>element, template);
+	private addSettingElementFocusHandler(template: ISettingItemTemplate): void {
+		const focusTracker = DOM.trackFocus(template.containerElement);
+		template.toDispose.push(focusTracker);
+		focusTracker.onDidBlur(() => {
+			if (template.containerElement.classList.contains('focused')) {
+				template.containerElement.classList.remove('focused');
+			}
+		});
+
+		focusTracker.onDidFocus(() => {
+			template.containerElement.classList.add('focused');
+
+			if (template.context) {
+				this._onDidFocusSetting.fire(template.context);
+			}
+		});
+	}
+
+	private renderSettingTextTemplate(tree: ITree, container: HTMLElement, type = 'text'): ISettingTextItemTemplate {
+		const common = this.renderCommonTemplate(tree, container, 'text');
+		const validationErrorMessageElement = DOM.append(container, $('.setting-item-validation-message'));
+
+		const inputBox = new InputBox(common.controlElement, this.contextViewService);
+		common.toDispose.push(inputBox);
+		common.toDispose.push(attachInputBoxStyler(inputBox, this.themeService, {
+			inputBackground: settingsTextInputBackground,
+			inputForeground: settingsTextInputForeground,
+			inputBorder: settingsTextInputBorder
+		}));
+		common.toDispose.push(
+			inputBox.onDidChange(e => {
+				if (template.onChange) {
+					template.onChange(e);
+				}
+			}));
+		common.toDispose.push(inputBox);
+		inputBox.inputElement.classList.add(SettingsRenderer.CONTROL_CLASS);
+
+		const template: ISettingTextItemTemplate = {
+			...common,
+			inputBox,
+			validationErrorMessageElement
+		};
+
+		this.addSettingElementFocusHandler(template);
+
+		return template;
+	}
+
+	private renderSettingNumberTemplate(tree: ITree, container: HTMLElement): ISettingNumberItemTemplate {
+		const common = this.renderCommonTemplate(tree, container, 'number');
+		const validationErrorMessageElement = DOM.append(container, $('.setting-item-validation-message'));
+
+		const inputBox = new InputBox(common.controlElement, this.contextViewService, { type: 'number' });
+		common.toDispose.push(inputBox);
+		common.toDispose.push(attachInputBoxStyler(inputBox, this.themeService, {
+			inputBackground: settingsNumberInputBackground,
+			inputForeground: settingsNumberInputForeground,
+			inputBorder: settingsNumberInputBorder
+		}));
+		common.toDispose.push(
+			inputBox.onDidChange(e => {
+				if (template.onChange) {
+					template.onChange(e);
+				}
+			}));
+		common.toDispose.push(inputBox);
+		inputBox.inputElement.classList.add(SettingsRenderer.CONTROL_CLASS);
+
+		const template: ISettingNumberItemTemplate = {
+			...common,
+			inputBox,
+			validationErrorMessageElement
+		};
+
+		this.addSettingElementFocusHandler(template);
+
+		return template;
+	}
+
+	private renderSettingToolbar(container: HTMLElement): ToolBar {
+		const toggleMenuKeybinding = this.keybindingService.lookupKeybinding(SETTINGS_EDITOR_COMMAND_SHOW_CONTEXT_MENU);
+		let toggleMenuTitle = localize('settingsContextMenuTitle', "More Actions... ");
+		if (toggleMenuKeybinding) {
+			toggleMenuTitle += ` (${toggleMenuKeybinding && toggleMenuKeybinding.getLabel()})`;
 		}
 
+		const toolbar = new ToolBar(container, this.contextMenuService, {
+			toggleMenuTitle
+		});
+		toolbar.setActions([], this.settingActions)();
+		const button = container.querySelector('.toolbar-toggle-more');
+		if (button) {
+			(<HTMLElement>button).tabIndex = -1;
+		}
+
+		return toolbar;
+	}
+
+	private renderSettingBoolTemplate(tree: ITree, container: HTMLElement): ISettingBoolItemTemplate {
+		DOM.addClass(container, 'setting-item');
+		DOM.addClass(container, 'setting-item-bool');
+
+		const titleElement = DOM.append(container, $('.setting-item-title'));
+		const categoryElement = DOM.append(titleElement, $('span.setting-item-category'));
+		const labelElement = DOM.append(titleElement, $('span.setting-item-label'));
+		const otherOverridesElement = DOM.append(titleElement, $('span.setting-item-overrides'));
+
+		const descriptionAndValueElement = DOM.append(container, $('.setting-item-value-description'));
+		const controlElement = DOM.append(descriptionAndValueElement, $('.setting-item-bool-control'));
+		const descriptionElement = DOM.append(descriptionAndValueElement, $('.setting-item-description'));
+		const modifiedIndicatorElement = DOM.append(container, $('.setting-item-modified-indicator'));
+		modifiedIndicatorElement.title = localize('modified', "Modified");
+
+
+		const deprecationWarningElement = DOM.append(container, $('.setting-item-deprecation-message'));
+
+		const toDispose = [];
+		const checkbox = new Checkbox({ actionClassName: 'setting-value-checkbox', isChecked: true, title: '', inputActiveOptionBorder: null });
+		controlElement.appendChild(checkbox.domNode);
+		toDispose.push(checkbox);
+		toDispose.push(checkbox.onChange(() => {
+			if (template.onChange) {
+				template.onChange(checkbox.checked);
+			}
+		}));
+
+		// Need to listen for mouse clicks on description and toggle checkbox - use target ID for safety
+		// Also have to ignore embedded links - too buried to stop propagation
+		toDispose.push(DOM.addDisposableListener(descriptionElement, DOM.EventType.MOUSE_DOWN, (e) => {
+			const targetElement = <HTMLElement>e.toElement;
+			const targetId = descriptionElement.getAttribute('checkbox_label_target_id');
+
+			// Make sure we are not a link and the target ID matches
+			// Toggle target checkbox
+			if (targetElement.tagName.toLowerCase() !== 'a' && targetId === template.checkbox.domNode.id) {
+				template.checkbox.checked = template.checkbox.checked ? false : true;
+				template.onChange(checkbox.checked);
+			}
+			DOM.EventHelper.stop(e);
+		}));
+
+		checkbox.domNode.classList.add(SettingsRenderer.CONTROL_CLASS);
+		const toolbar = this.renderSettingToolbar(container);
+		toDispose.push(toolbar);
+
+		const template: ISettingBoolItemTemplate = {
+			toDispose,
+
+			containerElement: container,
+			categoryElement,
+			labelElement,
+			controlElement,
+			checkbox,
+			descriptionElement,
+			deprecationWarningElement,
+			otherOverridesElement,
+			toolbar
+		};
+
+		this.addSettingElementFocusHandler(template);
+
+		// Prevent clicks from being handled by list
+		toDispose.push(DOM.addDisposableListener(controlElement, 'mousedown', (e: IMouseEvent) => e.stopPropagation()));
+
+		toDispose.push(DOM.addStandardDisposableListener(controlElement, 'keydown', (e: StandardKeyboardEvent) => {
+			if (e.keyCode === KeyCode.Escape) {
+				tree.domFocus();
+				e.browserEvent.stopPropagation();
+			}
+		}));
+
+		return template;
+	}
+
+	public cancelSuggesters() {
+		this.contextViewService.hideContextView();
+	}
+
+	private renderSettingEnumTemplate(tree: ITree, container: HTMLElement): ISettingEnumItemTemplate {
+		const common = this.renderCommonTemplate(tree, container, 'enum');
+
+		const selectBox = new SelectBox([], undefined, this.contextViewService, undefined, {
+			hasDetails: true
+		});
+
+		common.toDispose.push(selectBox);
+		common.toDispose.push(attachSelectBoxStyler(selectBox, this.themeService, {
+			selectBackground: settingsSelectBackground,
+			selectForeground: settingsSelectForeground,
+			selectBorder: settingsSelectBorder,
+			selectListBorder: settingsSelectListBorder
+		}));
+		selectBox.render(common.controlElement);
+		const selectElement = common.controlElement.querySelector('select');
+		if (selectElement) {
+			selectElement.classList.add(SettingsRenderer.CONTROL_CLASS);
+		}
+
+		common.toDispose.push(
+			selectBox.onDidSelect(e => {
+				if (template.onChange) {
+					template.onChange(e.index);
+				}
+			}));
+
+		const enumDescriptionElement = common.containerElement.insertBefore($('.setting-item-enumDescription'), common.descriptionElement.nextSibling);
+
+		const template: ISettingEnumItemTemplate = {
+			...common,
+			selectBox,
+			enumDescriptionElement
+		};
+
+		this.addSettingElementFocusHandler(template);
+
+		return template;
+	}
+
+	private renderSettingExcludeTemplate(tree: ITree, container: HTMLElement): ISettingExcludeItemTemplate {
+		const common = this.renderCommonTemplate(tree, container, 'exclude');
+
+		const excludeWidget = this.instantiationService.createInstance(ExcludeSettingWidget, common.controlElement);
+		excludeWidget.domNode.classList.add(SettingsRenderer.CONTROL_CLASS);
+		common.toDispose.push(excludeWidget);
+
+		const template: ISettingExcludeItemTemplate = {
+			...common,
+			excludeWidget
+		};
+
+		this.addSettingElementFocusHandler(template);
+
+		common.toDispose.push(excludeWidget.onDidChangeExclude(e => {
+			if (template.context) {
+				let newValue = { ...template.context.scopeValue };
+
+				// first delete the existing entry, if present
+				if (e.originalPattern) {
+					if (e.originalPattern in template.context.defaultValue) {
+						// delete a default by overriding it
+						newValue[e.originalPattern] = false;
+					} else {
+						delete newValue[e.originalPattern];
+					}
+				}
+
+				// then add the new or updated entry, if present
+				if (e.pattern) {
+					if (e.pattern in template.context.defaultValue && !e.sibling) {
+						// add a default by deleting its override
+						delete newValue[e.pattern];
+					} else {
+						newValue[e.pattern] = e.sibling ? { when: e.sibling } : true;
+					}
+				}
+
+				const sortKeys = (obj) => {
+					const keyArray = Object.keys(obj)
+						.map(key => ({ key, val: obj[key] }))
+						.sort((a, b) => a.key.localeCompare(b.key));
+
+					const retVal = {};
+					keyArray.forEach(pair => {
+						retVal[pair.key] = pair.val;
+					});
+					return retVal;
+				};
+
+				this._onDidChangeSetting.fire({
+					key: template.context.setting.key,
+					value: Object.keys(newValue).length === 0 ? undefined : sortKeys(newValue)
+				});
+			}
+		}));
+
+		return template;
+	}
+
+	private renderSettingComplexTemplate(tree: ITree, container: HTMLElement): ISettingComplexItemTemplate {
+		const common = this.renderCommonTemplate(tree, container, 'complex');
+
+		const openSettingsButton = new Button(common.controlElement, { title: true, buttonBackground: null, buttonHoverBackground: null });
+		common.toDispose.push(openSettingsButton);
+		common.toDispose.push(openSettingsButton.onDidClick(() => template.onChange(null)));
+		openSettingsButton.label = localize('editInSettingsJson', "Edit in settings.json");
+		openSettingsButton.element.classList.add('edit-in-settings-button');
+
+		common.toDispose.push(attachButtonStyler(openSettingsButton, this.themeService, {
+			buttonBackground: Color.transparent.toString(),
+			buttonHoverBackground: Color.transparent.toString(),
+			buttonForeground: 'foreground'
+		}));
+
+		const template: ISettingComplexItemTemplate = {
+			...common,
+			button: openSettingsButton
+		};
+
+		this.addSettingElementFocusHandler(template);
+
+		return template;
+	}
+
+	private renderNewExtensionsTemplate(container: HTMLElement): ISettingNewExtensionsTemplate {
+		const toDispose = [];
+
+		container.classList.add('setting-item-new-extensions');
+
+		const button = new Button(container, { title: true, buttonBackground: null, buttonHoverBackground: null });
+		toDispose.push(button);
+		toDispose.push(button.onDidClick(() => {
+			if (template.context) {
+				this.commandService.executeCommand('workbench.extensions.action.showExtensionsWithIds', template.context.extensionIds);
+			}
+		}));
+		button.label = localize('newExtensionsButtonLabel', "Show matching extensions");
+		button.element.classList.add('settings-new-extensions-button');
+		toDispose.push(attachButtonStyler(button, this.themeService));
+
+		const template: ISettingNewExtensionsTemplate = {
+			button,
+			toDispose
+		};
+
+		// this.addSettingElementFocusHandler(template);
+
+		return template;
+	}
+
+	renderElement(tree: ITree, element: SettingsTreeElement, templateId: string, template: any): void {
 		if (templateId === SETTINGS_GROUP_ELEMENT_TEMPLATE_ID) {
-			(<IGroupTitleTemplate>template).labelElement.textContent = (<IGroupElement>element).group.title;
-			return;
+			return this.renderGroupElement(<SettingsTreeGroupElement>element, template);
+		}
+
+		if (templateId === SETTINGS_NEW_EXTENSIONS_TEMPLATE_ID) {
+			return this.renderNewExtensionsElement(<SettingsTreeNewExtensionsElement>element, template);
+		}
+
+		return this.renderSettingElement(tree, <SettingsTreeSettingElement>element, templateId, template);
+	}
+
+	private renderGroupElement(element: SettingsTreeGroupElement, template: IGroupTitleTemplate): void {
+		template.parent.innerHTML = '';
+		const labelElement = DOM.append(template.parent, $('div.settings-group-title-label'));
+		labelElement.classList.add(`settings-group-level-${element.level}`);
+		labelElement.textContent = (<SettingsTreeGroupElement>element).label;
+
+		if (element.isFirstGroup) {
+			labelElement.classList.add('settings-group-first');
 		}
 	}
 
-	private elementIsSelected(tree: ITree, element: TreeElement): boolean {
-		const selection = tree.getSelection();
-		const selectedElement: TreeElement = selection && selection[0];
-		return selectedElement && selectedElement.id === element.id;
+	private renderNewExtensionsElement(element: SettingsTreeNewExtensionsElement, template: ISettingNewExtensionsTemplate): void {
+		template.context = element;
 	}
 
-	private renderSettingElement(tree: ITree, element: ISettingElement, template: ISettingItemTemplate, measuring?: boolean): void {
-		const isSelected = !!this.elementIsSelected(tree, element);
+	public getSettingDOMElementForDOMElement(domElement: HTMLElement): HTMLElement {
+		const parent = DOM.findParentWithClass(domElement, 'setting-item');
+		if (parent) {
+			return parent;
+		}
+
+		return null;
+	}
+
+	public getDOMElementsForSettingKey(treeContainer: HTMLElement, key: string): NodeListOf<HTMLElement> {
+		return treeContainer.querySelectorAll(`[${SettingsRenderer.SETTING_KEY_ATTR}="${key}"]`);
+	}
+
+	public getKeyForDOMElementInSetting(element: HTMLElement): string {
+		const settingElement = this.getSettingDOMElementForDOMElement(element);
+		return settingElement && settingElement.getAttribute(SettingsRenderer.SETTING_KEY_ATTR);
+	}
+
+	private renderSettingElement(tree: ITree, element: SettingsTreeSettingElement, templateId: string, template: ISettingItemTemplate | ISettingBoolItemTemplate): void {
+		template.context = element;
+		template.toolbar.context = element;
+
 		const setting = element.setting;
 
-		template.context = element;
-		DOM.toggleClass(template.parent, 'is-configured', element.isConfigured);
-		DOM.toggleClass(template.parent, 'is-expanded', isSelected);
-		template.containerElement.id = element.id;
+		DOM.toggleClass(template.containerElement, 'is-configured', element.isConfigured);
+		DOM.toggleClass(template.containerElement, 'is-expanded', true);
+		template.containerElement.setAttribute(SettingsRenderer.SETTING_KEY_ATTR, element.setting.key);
 
-		const titleTooltip = setting.key;
-		template.categoryElement.textContent = element.displayCategory + ': ';
+		const titleTooltip = setting.key + (element.isConfigured ? ' - Modified' : '');
+		template.categoryElement.textContent = element.displayCategory && (element.displayCategory + ': ');
 		template.categoryElement.title = titleTooltip;
 
 		template.labelElement.textContent = element.displayLabel;
 		template.labelElement.title = titleTooltip;
-		template.descriptionElement.textContent = element.description;
 
-		if (!measuring) {
-			const expandedHeight = this.measureSettingElementHeight(tree, element);
-			const isExpandable = expandedHeight > SettingsRenderer.SETTING_ROW_HEIGHT;
-			DOM.toggleClass(template.parent, 'is-expandable', isExpandable);
-
-			if (isSelected) {
-				template.expandIndicatorElement.innerHTML = renderOcticons('$(chevron-up)');
-			} else if (isExpandable) {
-				template.expandIndicatorElement.innerHTML = renderOcticons('$(chevron-down)');
-			} else {
-				template.expandIndicatorElement.innerHTML = '';
-			}
+		this.renderValue(element, templateId, <ISettingItemTemplate>template);
+		template.descriptionElement.innerHTML = '';
+		if (element.setting.descriptionIsMarkdown) {
+			const renderedDescription = this.renderDescriptionMarkdown(element, element.description, template.toDispose);
+			template.descriptionElement.appendChild(renderedDescription);
+		} else {
+			template.descriptionElement.innerText = element.description;
 		}
 
-		this.renderValue(element, isSelected, template);
+		const baseId = (element.displayCategory + '_' + element.displayLabel).replace(/ /g, '_').toLowerCase();
+		template.descriptionElement.id = baseId + '_setting_description';
 
-		const resetButton = new Button(template.valueElement);
-		const resetText = localize('resetButtonTitle', "reset");
-		resetButton.label = resetText;
-		resetButton.element.title = resetText;
-		resetButton.element.classList.add('setting-reset-button');
-		resetButton.element.tabIndex = isSelected ? 0 : -1;
-
-		attachButtonStyler(resetButton, this.themeService, {
-			buttonBackground: Color.transparent.toString(),
-			buttonHoverBackground: Color.transparent.toString(),
-			buttonForeground: editorActiveLinkForeground
-		});
-
-		template.toDispose.push(resetButton.onDidClick(e => {
-			this._onDidChangeSetting.fire({ key: element.setting.key, value: undefined });
-		}));
-		template.toDispose.push(resetButton);
-
-		template.isConfiguredElement.textContent = element.isConfigured ? localize('configured', "Modified") : '';
+		if (templateId === SETTINGS_BOOL_TEMPLATE_ID) {
+			// Add checkbox target to description clickable and able to toggle checkbox
+			template.descriptionElement.setAttribute('checkbox_label_target_id', baseId + '_setting_item');
+		}
 
 		if (element.overriddenScopeList.length) {
 			let otherOverridesLabel = element.isConfigured ?
@@ -463,73 +1056,186 @@ export class SettingsRenderer implements IRenderer {
 				localize('configuredIn', "Modified in");
 
 			template.otherOverridesElement.textContent = `(${otherOverridesLabel}: ${element.overriddenScopeList.join(', ')})`;
-		}
-	}
-
-	private renderValue(element: ISettingElement, isSelected: boolean, template: ISettingItemTemplate): void {
-		const onChange = value => this._onDidChangeSetting.fire({ key: element.setting.key, value });
-		template.valueElement.innerHTML = '';
-		if (element.valueType === 'string' && element.enum) {
-			this.renderEnum(element, isSelected, template, onChange);
-		} else if (element.valueType === 'boolean') {
-			this.renderBool(element, isSelected, template, onChange);
-		} else if (element.valueType === 'string') {
-			this.renderText(element, isSelected, template, onChange);
-		} else if (element.valueType === 'number' || element.valueType === 'integer') {
-			this.renderText(element, isSelected, template, value => onChange(parseInt(value)));
 		} else {
-			this.renderEditInSettingsJson(element, isSelected, template);
+			template.otherOverridesElement.textContent = '';
+		}
+
+		// Remove tree attributes - sometimes overridden by tree - should be managed there
+		template.containerElement.parentElement.removeAttribute('role');
+		template.containerElement.parentElement.removeAttribute('aria-level');
+		template.containerElement.parentElement.removeAttribute('aria-posinset');
+		template.containerElement.parentElement.removeAttribute('aria-setsize');
+	}
+
+	private renderDescriptionMarkdown(element: SettingsTreeSettingElement, text: string, disposeables: IDisposable[]): HTMLElement {
+		// Rewrite `#editor.fontSize#` to link format
+		text = fixSettingLinks(text);
+
+		const renderedMarkdown = renderMarkdown({ value: text }, {
+			actionHandler: {
+				callback: (content: string) => {
+					if (startsWith(content, '#')) {
+						const e: ISettingLinkClickEvent = {
+							source: element,
+							targetKey: content.substr(1)
+						};
+						this._onDidClickSettingLink.fire(e);
+					} else {
+						this.openerService.open(URI.parse(content)).then(void 0, onUnexpectedError);
+					}
+				},
+				disposeables
+			}
+		});
+
+		renderedMarkdown.classList.add('setting-item-description-markdown');
+		cleanRenderedMarkdown(renderedMarkdown);
+		return renderedMarkdown;
+	}
+
+	private renderValue(element: SettingsTreeSettingElement, templateId: string, template: ISettingItemTemplate | ISettingBoolItemTemplate): void {
+		const onChange = value => this._onDidChangeSetting.fire({ key: element.setting.key, value });
+		template.deprecationWarningElement.innerText = element.setting.deprecationMessage || '';
+
+		if (templateId === SETTINGS_ENUM_TEMPLATE_ID) {
+			this.renderEnum(element, <ISettingEnumItemTemplate>template, onChange);
+		} else if (templateId === SETTINGS_TEXT_TEMPLATE_ID) {
+			this.renderText(element, <ISettingTextItemTemplate>template, onChange);
+		} else if (templateId === SETTINGS_NUMBER_TEMPLATE_ID) {
+			this.renderNumber(element, <ISettingTextItemTemplate>template, onChange);
+		} else if (templateId === SETTINGS_BOOL_TEMPLATE_ID) {
+			this.renderBool(element, <ISettingBoolItemTemplate>template, onChange);
+		} else if (templateId === SETTINGS_EXCLUDE_TEMPLATE_ID) {
+			this.renderExcludeSetting(element, <ISettingExcludeItemTemplate>template);
+		} else if (templateId === SETTINGS_COMPLEX_TEMPLATE_ID) {
+			this.renderComplexSetting(element, <ISettingComplexItemTemplate>template);
 		}
 	}
 
-	private renderBool(element: ISettingElement, isSelected: boolean, template: ISettingItemTemplate, onChange: (value: boolean) => void): void {
-		const checkboxElement = <HTMLInputElement>DOM.append(template.valueElement, $('input.setting-value-checkbox.setting-value-input'));
-		checkboxElement.type = 'checkbox';
-		checkboxElement.checked = element.value;
-		checkboxElement.tabIndex = isSelected ? 0 : -1;
+	private renderBool(dataElement: SettingsTreeSettingElement, template: ISettingBoolItemTemplate, onChange: (value: boolean) => void): void {
+		template.onChange = null;
+		template.checkbox.checked = dataElement.value;
+		template.onChange = onChange;
+
+		// Setup and add ARIA attributes
+		// Create id and label for control/input element - parent is wrapper div
+		const baseId = (dataElement.displayCategory + '_' + dataElement.displayLabel).replace(/ /g, '_').toLowerCase();
+		const modifiedText = dataElement.isConfigured ? 'Modified' : '';
+		const label = dataElement.displayCategory + ' ' + dataElement.displayLabel + ' ' + modifiedText;
+
+		// We use the parent control div for the aria-labelledby target
+		// Does not appear you can use the direct label on the element itself within a tree
+		template.checkbox.domNode.parentElement.id = baseId + '_setting_label';
+		template.checkbox.domNode.parentElement.setAttribute('aria-label', label);
+
+		// Labels will not be read on descendent input elements of the parent treeitem
+		// unless defined as role=treeitem and indirect aria-labelledby approach
+		template.checkbox.domNode.id = baseId + '_setting_item';
+		template.checkbox.domNode.setAttribute('role', 'checkbox');
+		template.checkbox.domNode.setAttribute('aria-labelledby', baseId + '_setting_label');
+		template.checkbox.domNode.setAttribute('aria-describedby', baseId + '_setting_description');
 
-		template.toDispose.push(DOM.addDisposableListener(checkboxElement, 'change', e => onChange(checkboxElement.checked)));
 	}
 
-	private renderEnum(element: ISettingElement, isSelected: boolean, template: ISettingItemTemplate, onChange: (value: string) => void): void {
-		const idx = element.enum.indexOf(element.value);
-		const displayOptions = element.enum.map(escapeInvisibleChars);
-		const selectBox = new SelectBox(displayOptions, idx, this.contextViewService);
-		template.toDispose.push(selectBox);
-		template.toDispose.push(attachSelectBoxStyler(selectBox, this.themeService));
-		selectBox.render(template.valueElement);
-		if (template.valueElement.firstElementChild) {
-			template.valueElement.firstElementChild.setAttribute('tabindex', isSelected ? '0' : '-1');
+	private renderEnum(dataElement: SettingsTreeSettingElement, template: ISettingEnumItemTemplate, onChange: (value: string) => void): void {
+		const displayOptions = dataElement.setting.enum
+			.map(String)
+			.map(escapeInvisibleChars);
+
+		template.selectBox.setOptions(displayOptions);
+		const enumDescriptions = dataElement.setting.enumDescriptions;
+		const enumDescriptionsAreMarkdown = dataElement.setting.enumDescriptionsAreMarkdown;
+		template.selectBox.setDetailsProvider(index =>
+			({
+				details: enumDescriptions && enumDescriptions[index] && (enumDescriptionsAreMarkdown ? fixSettingLinks(enumDescriptions[index], false) : enumDescriptions[index]),
+				isMarkdown: enumDescriptionsAreMarkdown
+			}));
+
+		const modifiedText = dataElement.isConfigured ? 'Modified' : '';
+		const label = dataElement.displayCategory + ' ' + dataElement.displayLabel + ' ' + modifiedText;
+		const baseId = (dataElement.displayCategory + '_' + dataElement.displayLabel).replace(/ /g, '_').toLowerCase();
+
+		template.selectBox.setAriaLabel(label);
+
+		const idx = dataElement.setting.enum.indexOf(dataElement.value);
+		template.onChange = null;
+		template.selectBox.select(idx);
+		template.onChange = idx => onChange(dataElement.setting.enum[idx]);
+
+		if (template.controlElement.firstElementChild) {
+			// SelectBox needs to have treeitem changed to combobox to read correctly within tree
+			template.controlElement.firstElementChild.setAttribute('role', 'combobox');
+			template.controlElement.firstElementChild.setAttribute('aria-describedby', baseId + '_setting_description');
 		}
 
-		template.toDispose.push(
-			selectBox.onDidSelect(e => onChange(element.enum[e.index])));
+		template.enumDescriptionElement.innerHTML = '';
 	}
 
-	private renderText(element: ISettingElement, isSelected: boolean, template: ISettingItemTemplate, onChange: (value: string) => void): void {
-		const inputBox = new InputBox(template.valueElement, this.contextViewService);
-		template.toDispose.push(attachInputBoxStyler(inputBox, this.themeService));
-		template.toDispose.push(inputBox);
-		inputBox.value = element.value;
-		inputBox.inputElement.tabIndex = isSelected ? 0 : -1;
+	private renderText(dataElement: SettingsTreeSettingElement, template: ISettingTextItemTemplate, onChange: (value: string) => void): void {
+		const modifiedText = dataElement.isConfigured ? 'Modified' : '';
+		const label = dataElement.displayCategory + ' ' + dataElement.displayLabel + ' ' + modifiedText; template.onChange = null;
+		template.inputBox.value = dataElement.value;
+		template.onChange = value => { renderValidations(dataElement, template, false, label); onChange(value); };
 
-		template.toDispose.push(
-			inputBox.onDidChange(e => onChange(e)));
+		// Setup and add ARIA attributes
+		// Create id and label for control/input element - parent is wrapper div
+		const baseId = (dataElement.displayCategory + '_' + dataElement.displayLabel).replace(/ /g, '_').toLowerCase();
+
+		// We use the parent control div for the aria-labelledby target
+		// Does not appear you can use the direct label on the element itself within a tree
+		template.inputBox.inputElement.parentElement.id = baseId + '_setting_label';
+		template.inputBox.inputElement.parentElement.setAttribute('aria-label', label);
+
+		// Labels will not be read on descendent input elements of the parent treeitem
+		// unless defined as role=treeitem and indirect aria-labelledby approach
+		template.inputBox.inputElement.id = baseId + '_setting_item';
+		template.inputBox.inputElement.setAttribute('role', 'textbox');
+		template.inputBox.inputElement.setAttribute('aria-labelledby', baseId + '_setting_label');
+		template.inputBox.inputElement.setAttribute('aria-describedby', baseId + '_setting_description');
+
+		renderValidations(dataElement, template, true, label);
 	}
 
-	private renderEditInSettingsJson(element: ISettingElement, isSelected: boolean, template: ISettingItemTemplate): void {
-		const openSettingsButton = new Button(template.valueElement, { title: true, buttonBackground: null, buttonHoverBackground: null });
-		openSettingsButton.onDidClick(() => this._onDidOpenSettings.fire());
-		openSettingsButton.label = localize('editInSettingsJson', "Edit in settings.json");
-		openSettingsButton.element.classList.add('edit-in-settings-button');
-		openSettingsButton.element.tabIndex = isSelected ? 0 : -1;
 
-		template.toDispose.push(openSettingsButton);
-		template.toDispose.push(attachButtonStyler(openSettingsButton, this.themeService, {
-			buttonBackground: Color.transparent.toString(),
-			buttonHoverBackground: Color.transparent.toString(),
-			buttonForeground: 'foreground'
-		}));
+	private renderNumber(dataElement: SettingsTreeSettingElement, template: ISettingTextItemTemplate, onChange: (value: number) => void): void {
+		const modifiedText = dataElement.isConfigured ? 'Modified' : '';
+		const label = dataElement.displayCategory + ' ' + dataElement.displayLabel + ' number ' + modifiedText; const numParseFn = (dataElement.valueType === 'integer' || dataElement.valueType === 'nullable-integer')
+			? parseInt : parseFloat;
+
+		const nullNumParseFn = (dataElement.valueType === 'nullable-integer' || dataElement.valueType === 'nullable-number')
+			? (v => v === '' ? null : numParseFn(v)) : numParseFn;
+
+		template.onChange = null;
+		template.inputBox.value = dataElement.value;
+		template.onChange = value => { renderValidations(dataElement, template, false, label); onChange(nullNumParseFn(value)); };
+
+		// Setup and add ARIA attributes
+		// Create id and label for control/input element - parent is wrapper div
+		const baseId = (dataElement.displayCategory + '_' + dataElement.displayLabel).replace(/ /g, '_').toLowerCase();
+
+		// We use the parent control div for the aria-labelledby target
+		// Does not appear you can use the direct label on the element itself within a tree
+		template.inputBox.inputElement.parentElement.id = baseId + '_setting_label';
+		template.inputBox.inputElement.parentElement.setAttribute('aria-label', label);
+
+		// Labels will not be read on descendent input elements of the parent treeitem
+		// unless defined as role=treeitem and indirect aria-labelledby approach
+		template.inputBox.inputElement.id = baseId + '_setting_item';
+		template.inputBox.inputElement.setAttribute('role', 'textbox');
+		template.inputBox.inputElement.setAttribute('aria-labelledby', baseId + '_setting_label');
+		template.inputBox.inputElement.setAttribute('aria-describedby', baseId + '_setting_description');
+
+		renderValidations(dataElement, template, true, label);
+	}
+
+	private renderExcludeSetting(dataElement: SettingsTreeSettingElement, template: ISettingExcludeItemTemplate): void {
+		const value = getExcludeDisplayValue(dataElement);
+		template.excludeWidget.setValue(value);
+		template.context = dataElement;
+	}
+
+	private renderComplexSetting(dataElement: SettingsTreeSettingElement, template: ISettingComplexItemTemplate): void {
+		template.onChange = () => this._onDidOpenSettings.fire(dataElement.setting.key);
 	}
 
 	disposeTemplate(tree: ITree, templateId: string, template: IDisposableTemplate): void {
@@ -537,8 +1243,48 @@ export class SettingsRenderer implements IRenderer {
 	}
 }
 
+function renderValidations(dataElement: SettingsTreeSettingElement, template: ISettingTextItemTemplate, calledOnStartup: boolean, originalAriaLabel: string) {
+	if (dataElement.setting.validator) {
+		let errMsg = dataElement.setting.validator(template.inputBox.value);
+		if (errMsg) {
+			DOM.addClass(template.containerElement, 'invalid-input');
+			template.validationErrorMessageElement.innerText = errMsg;
+			let validationError = localize('validationError', "Validation Error.");
+			template.inputBox.inputElement.parentElement.setAttribute('aria-label', [originalAriaLabel, validationError, errMsg].join(' '));
+			if (!calledOnStartup) { ariaAlert(validationError + ' ' + errMsg); }
+			return;
+		} else {
+			template.inputBox.inputElement.parentElement.setAttribute('aria-label', originalAriaLabel);
+		}
+	}
+	DOM.removeClass(template.containerElement, 'invalid-input');
+}
+
+function cleanRenderedMarkdown(element: Node): void {
+	for (let i = 0; i < element.childNodes.length; i++) {
+		const child = element.childNodes.item(i);
+
+		const tagName = (<Element>child).tagName && (<Element>child).tagName.toLowerCase();
+		if (tagName === 'img') {
+			element.removeChild(child);
+		} else {
+			cleanRenderedMarkdown(child);
+		}
+	}
+}
+
+function fixSettingLinks(text: string, linkify = true): string {
+	return text.replace(/`#([^#]*)#`/g, (match, settingKey) => {
+		const targetDisplayFormat = settingKeyToDisplayFormat(settingKey);
+		const targetName = `${targetDisplayFormat.category}: ${targetDisplayFormat.label}`;
+		return linkify ?
+			`[${targetName}](#${settingKey})` :
+			`"${targetName}"`;
+	});
+}
+
 function escapeInvisibleChars(enumValue: string): string {
-	return enumValue
+	return enumValue && enumValue
 		.replace(/\n/g, '\\n')
 		.replace(/\r/g, '\\r');
 }
@@ -546,32 +1292,59 @@ function escapeInvisibleChars(enumValue: string): string {
 export class SettingsTreeFilter implements IFilter {
 	constructor(
 		private viewState: ISettingsEditorViewState,
-		@IConfigurationService private configurationService: IConfigurationService
 	) { }
 
-	isVisible(tree: ITree, element: TreeElement): boolean {
-		if (this.viewState.showConfiguredOnly && element.type === TreeItemType.setting) {
-			return element.isConfigured;
+	isVisible(tree: ITree, element: SettingsTreeElement): boolean {
+		// Filter during search
+		if (this.viewState.filterToCategory && element instanceof SettingsTreeSettingElement) {
+			if (!this.settingContainedInGroup(element.setting, this.viewState.filterToCategory)) {
+				return false;
+			}
 		}
 
-		if (element.type === TreeItemType.groupTitle && this.viewState.showConfiguredOnly) {
-			return this.groupHasConfiguredSetting(element.group);
+		// Non-user scope selected
+		if (element instanceof SettingsTreeSettingElement && this.viewState.settingsTarget !== ConfigurationTarget.USER) {
+			if (!element.matchesScope(this.viewState.settingsTarget)) {
+				return false;
+			}
+		}
+
+		// @modified or tag
+		if (element instanceof SettingsTreeSettingElement && this.viewState.tagFilters) {
+			if (!element.matchesAllTags(this.viewState.tagFilters)) {
+				return false;
+			}
+		}
+
+		// Group with no visible children
+		if (element instanceof SettingsTreeGroupElement) {
+			if (typeof element.count === 'number') {
+				return element.count > 0;
+			}
+
+			return element.children.some(child => this.isVisible(tree, child));
+		}
+
+		// Filtered "new extensions" button
+		if (element instanceof SettingsTreeNewExtensionsElement) {
+			if ((this.viewState.tagFilters && this.viewState.tagFilters.size) || this.viewState.filterToCategory) {
+				return false;
+			}
 		}
 
 		return true;
 	}
 
-	private groupHasConfiguredSetting(group: ISettingsGroup): boolean {
-		for (let section of group.sections) {
-			for (let setting of section.settings) {
-				const { isConfigured } = inspectSetting(setting.key, this.viewState.settingsTarget, this.configurationService);
-				if (isConfigured) {
-					return true;
-				}
+	private settingContainedInGroup(setting: ISetting, group: SettingsTreeGroupElement): boolean {
+		return group.children.some(child => {
+			if (child instanceof SettingsTreeGroupElement) {
+				return this.settingContainedInGroup(setting, child);
+			} else if (child instanceof SettingsTreeSettingElement) {
+				return child.setting.key === setting.key;
+			} else {
+				return false;
 			}
-		}
-
-		return false;
+		});
 	}
 }
 
@@ -581,88 +1354,247 @@ export class SettingsTreeController extends WorkbenchTreeController {
 	) {
 		super({}, configurationService);
 	}
+
+	protected onLeftClick(tree: ITree, element: any, eventish: IMouseEvent, origin?: string): boolean {
+		const isLink = eventish.target.tagName.toLowerCase() === 'a' ||
+			eventish.target.parentElement.tagName.toLowerCase() === 'a'; // <code> inside <a>
+
+		if (isLink && (DOM.findParentWithClass(eventish.target, 'setting-item-description-markdown', tree.getHTMLElement()) || DOM.findParentWithClass(eventish.target, 'select-box-description-markdown'))) {
+			return true;
+		}
+
+		return false;
+	}
 }
 
 export class SettingsAccessibilityProvider implements IAccessibilityProvider {
-	getAriaLabel(tree: ITree, element: TreeElement): string {
+	getAriaLabel(tree: ITree, element: SettingsTreeElement): string {
 		if (!element) {
 			return '';
 		}
 
-		if (element.type === TreeItemType.setting) {
+		if (element instanceof SettingsTreeSettingElement) {
 			return localize('settingRowAriaLabel', "{0} {1}, Setting", element.displayCategory, element.displayLabel);
 		}
 
-		if (element.type === TreeItemType.groupTitle) {
-			return localize('groupRowAriaLabel', "{0}, group", element.group.title);
+		if (element instanceof SettingsTreeGroupElement) {
+			return localize('groupRowAriaLabel', "{0}, group", element.label);
 		}
 
 		return '';
 	}
 }
 
-export enum SearchResultIdx {
-	Local = 0,
-	Remote = 1
+class NonExpandableOrSelectableTree extends Tree {
+	expand(): TPromise<any> {
+		return TPromise.wrap(null);
+	}
+
+	collapse(): TPromise<any> {
+		return TPromise.wrap(null);
+	}
+
+	public setFocus(element?: any, eventPayload?: any): void {
+		return;
+	}
+
+	public focusNext(count?: number, eventPayload?: any): void {
+		return;
+	}
+
+	public focusPrevious(count?: number, eventPayload?: any): void {
+		return;
+	}
+
+	public focusParent(eventPayload?: any): void {
+		return;
+	}
+
+	public focusFirstChild(eventPayload?: any): void {
+		return;
+	}
+
+	public focusFirst(eventPayload?: any, from?: any): void {
+		return;
+	}
+
+	public focusNth(index: number, eventPayload?: any): void {
+		return;
+	}
+
+	public focusLast(eventPayload?: any, from?: any): void {
+		return;
+	}
+
+	public focusNextPage(eventPayload?: any): void {
+		return;
+	}
+
+	public focusPreviousPage(eventPayload?: any): void {
+		return;
+	}
+
+	public select(element: any, eventPayload?: any): void {
+		return;
+	}
+
+	public selectRange(fromElement: any, toElement: any, eventPayload?: any): void {
+		return;
+	}
+
+	public selectAll(elements: any[], eventPayload?: any): void {
+		return;
+	}
+
+	public setSelection(elements: any[], eventPayload?: any): void {
+		return;
+	}
+
+	public toggleSelection(element: any, eventPayload?: any): void {
+		return;
+	}
 }
 
-export class SearchResultModel {
-	private rawSearchResults: ISearchResult[];
-	private cachedUniqueSearchResults: ISearchResult[];
+export class SettingsTree extends NonExpandableOrSelectableTree {
+	protected disposables: IDisposable[];
 
-	readonly id = 'searchResultModel';
+	constructor(
+		container: HTMLElement,
+		viewState: ISettingsEditorViewState,
+		configuration: Partial<ITreeConfiguration>,
+		@IThemeService themeService: IThemeService,
+		@IInstantiationService instantiationService: IInstantiationService
+	) {
+		const treeClass = 'settings-editor-tree';
 
-	getUniqueResults(): ISearchResult[] {
-		if (this.cachedUniqueSearchResults) {
-			return this.cachedUniqueSearchResults;
-		}
+		const controller = instantiationService.createInstance(SettingsTreeController);
+		const fullConfiguration = <ITreeConfiguration>{
+			controller,
+			accessibilityProvider: instantiationService.createInstance(SettingsAccessibilityProvider),
+			filter: instantiationService.createInstance(SettingsTreeFilter, viewState),
+			styler: new DefaultTreestyler(DOM.createStyleSheet(container), treeClass),
 
-		if (!this.rawSearchResults) {
-			return [];
-		}
-
-		const localMatchKeys = new Set();
-		const localResult = objects.deepClone(this.rawSearchResults[SearchResultIdx.Local]);
-		if (localResult) {
-			localResult.filterMatches.forEach(m => localMatchKeys.add(m.setting.key));
-		}
-
-		const remoteResult = objects.deepClone(this.rawSearchResults[SearchResultIdx.Remote]);
-		if (remoteResult) {
-			remoteResult.filterMatches = remoteResult.filterMatches.filter(m => !localMatchKeys.has(m.setting.key));
-		}
-
-		this.cachedUniqueSearchResults = [localResult, remoteResult];
-		return this.cachedUniqueSearchResults;
-	}
-
-	getRawResults(): ISearchResult[] {
-		return this.rawSearchResults;
-	}
-
-	setResult(type: SearchResultIdx, result: ISearchResult): void {
-		this.cachedUniqueSearchResults = null;
-		this.rawSearchResults = this.rawSearchResults || [];
-		this.rawSearchResults[type] = result;
-	}
-
-	resultsAsGroup(): ISettingsGroup {
-		const flatSettings: ISetting[] = [];
-		this.getUniqueResults()
-			.filter(r => !!r)
-			.forEach(r => {
-				flatSettings.push(
-					...r.filterMatches.map(m => m.setting));
-			});
-
-		return <ISettingsGroup>{
-			id: 'settingsSearchResultGroup',
-			range: null,
-			sections: [
-				{ settings: flatSettings }
-			],
-			title: 'searchResults',
-			titleRange: null
+			...configuration
 		};
+
+		const options = {
+			ariaLabel: localize('treeAriaLabel', "Settings"),
+			showLoading: false,
+			indentPixels: 0,
+			twistiePixels: 20, // Actually for gear button
+		};
+
+		super(container,
+			fullConfiguration,
+			options);
+
+		this.disposables = [];
+		this.disposables.push(controller);
+
+		this.disposables.push(registerThemingParticipant((theme: ITheme, collector: ICssStyleCollector) => {
+			const activeBorderColor = theme.getColor(focusBorder);
+			if (activeBorderColor) {
+				// TODO@rob - why isn't this applied when added to the stylesheet from tocTree.ts? Seems like a chromium glitch.
+				collector.addRule(`.settings-editor > .settings-body > .settings-toc-container .monaco-tree:focus .monaco-tree-row.focused {outline: solid 1px ${activeBorderColor}; outline-offset: -1px;  }`);
+			}
+
+			const foregroundColor = theme.getColor(foreground);
+			if (foregroundColor) {
+				// Links appear inside other elements in markdown. CSS opacity acts like a mask. So we have to dynamically compute the description color to avoid
+				// applying an opacity to the link color.
+				const fgWithOpacity = new Color(new RGBA(foregroundColor.rgba.r, foregroundColor.rgba.g, foregroundColor.rgba.b, .9));
+				collector.addRule(`.settings-editor > .settings-body > .settings-tree-container .setting-item .setting-item-description { color: ${fgWithOpacity}; }`);
+			}
+
+			const errorColor = theme.getColor(errorForeground);
+			if (errorColor) {
+				collector.addRule(`.settings-editor > .settings-body > .settings-tree-container .setting-item .setting-item-deprecation-message { color: ${errorColor}; }`);
+			}
+
+			const invalidInputBackground = theme.getColor(inputValidationErrorBackground);
+			if (invalidInputBackground) {
+				collector.addRule(`.settings-editor > .settings-body > .settings-tree-container .setting-item .setting-item-validation-message { background-color: ${invalidInputBackground}; }`);
+			}
+
+			const invalidInputForeground = theme.getColor(inputValidationErrorForeground);
+			if (invalidInputForeground) {
+				collector.addRule(`.settings-editor > .settings-body > .settings-tree-container .setting-item .setting-item-validation-message { color: ${invalidInputForeground}; }`);
+			}
+
+			const invalidInputBorder = theme.getColor(inputValidationErrorBorder);
+			if (invalidInputBorder) {
+				collector.addRule(`.settings-editor > .settings-body > .settings-tree-container .setting-item .setting-item-validation-message { border-style:solid; border-width: 1px; border-color: ${invalidInputBorder}; }`);
+				collector.addRule(`.settings-editor > .settings-body > .settings-tree-container .setting-item.invalid-input .setting-item-control .monaco-inputbox.idle { outline-width: 0; border-style:solid; border-width: 1px; border-color: ${invalidInputBorder}; }`);
+			}
+
+			const headerForegroundColor = theme.getColor(settingsHeaderForeground);
+			if (headerForegroundColor) {
+				collector.addRule(`.settings-editor > .settings-body > .settings-tree-container .settings-group-title-label { color: ${headerForegroundColor}; }`);
+				collector.addRule(`.settings-editor > .settings-body > .settings-tree-container .setting-item-label { color: ${headerForegroundColor}; }`);
+			}
+
+			const focusBorderColor = theme.getColor(focusBorder);
+			if (focusBorderColor) {
+				collector.addRule(`.settings-editor > .settings-body > .settings-tree-container .setting-item .setting-item-description-markdown a:focus { outline-color: ${focusBorderColor} }`);
+			}
+		}));
+
+		this.getHTMLElement().classList.add(treeClass);
+
+		this.disposables.push(attachStyler(themeService, {
+			listActiveSelectionBackground: editorBackground,
+			listActiveSelectionForeground: foreground,
+			listFocusAndSelectionBackground: editorBackground,
+			listFocusAndSelectionForeground: foreground,
+			listFocusBackground: editorBackground,
+			listFocusForeground: foreground,
+			listHoverForeground: foreground,
+			listHoverBackground: editorBackground,
+			listHoverOutline: editorBackground,
+			listFocusOutline: editorBackground,
+			listInactiveSelectionBackground: editorBackground,
+			listInactiveSelectionForeground: foreground
+		}, colors => {
+			this.style(colors);
+		}));
 	}
 }
+
+class CopySettingIdAction extends Action {
+	static readonly ID = 'settings.copySettingId';
+	static readonly LABEL = localize('copySettingIdLabel', "Copy Setting ID");
+
+	constructor(
+		@IClipboardService private clipboardService: IClipboardService
+	) {
+		super(CopySettingIdAction.ID, CopySettingIdAction.LABEL);
+	}
+
+	run(context: SettingsTreeSettingElement): TPromise<void> {
+		if (context) {
+			this.clipboardService.writeText(context.setting.key);
+		}
+
+		return TPromise.as(null);
+	}
+}
+
+class CopySettingAsJSONAction extends Action {
+	static readonly ID = 'settings.copySettingAsJSON';
+	static readonly LABEL = localize('copySettingAsJSONLabel', "Copy Setting as JSON");
+
+	constructor(
+		@IClipboardService private clipboardService: IClipboardService
+	) {
+		super(CopySettingAsJSONAction.ID, CopySettingAsJSONAction.LABEL);
+	}
+
+	run(context: SettingsTreeSettingElement): TPromise<void> {
+		if (context) {
+			const jsonResult = `"${context.setting.key}": ${JSON.stringify(context.value, undefined, '  ')}`;
+			this.clipboardService.writeText(jsonResult);
+		}
+
+		return TPromise.as(null);
+	}
+}
\ No newline at end of file
diff --git a/src/vs/workbench/parts/preferences/browser/settingsTreeModels.ts b/src/vs/workbench/parts/preferences/browser/settingsTreeModels.ts
new file mode 100644
index 00000000000..898f92865c8
--- /dev/null
+++ b/src/vs/workbench/parts/preferences/browser/settingsTreeModels.ts
@@ -0,0 +1,544 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as arrays from 'vs/base/common/arrays';
+import { isArray } from 'vs/base/common/types';
+import { URI } from 'vs/base/common/uri';
+import { localize } from 'vs/nls';
+import { ConfigurationTarget, IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { ConfigurationScope } from 'vs/platform/configuration/common/configurationRegistry';
+import { SettingsTarget } from 'vs/workbench/parts/preferences/browser/preferencesWidgets';
+import { ITOCEntry, knownAcronyms } from 'vs/workbench/parts/preferences/browser/settingsLayout';
+import { IExtensionSetting, ISearchResult, ISetting } from 'vs/workbench/services/preferences/common/preferences';
+
+export const MODIFIED_SETTING_TAG = 'modified';
+export const ONLINE_SERVICES_SETTING_TAG = 'usesOnlineServices';
+
+export interface ISettingsEditorViewState {
+	settingsTarget: SettingsTarget;
+	tagFilters?: Set<string>;
+	filterToCategory?: SettingsTreeGroupElement;
+}
+
+export abstract class SettingsTreeElement {
+	id: string;
+	parent: SettingsTreeGroupElement;
+
+	/**
+	 * Index assigned in display order, used for paging.
+	 */
+	index: number;
+}
+
+export type SettingsTreeGroupChild = (SettingsTreeGroupElement | SettingsTreeSettingElement | SettingsTreeNewExtensionsElement);
+
+export class SettingsTreeGroupElement extends SettingsTreeElement {
+	count?: number;
+	label: string;
+	level: number;
+	isFirstGroup: boolean;
+
+	private _childSettingKeys: Set<string>;
+	private _children: SettingsTreeGroupChild[];
+
+	get children(): SettingsTreeGroupChild[] {
+		return this._children;
+	}
+
+	set children(newChildren: SettingsTreeGroupChild[]) {
+		this._children = newChildren;
+
+		this._childSettingKeys = new Set();
+		this._children.forEach(child => {
+			if (child instanceof SettingsTreeSettingElement) {
+				this._childSettingKeys.add(child.setting.key);
+			}
+		});
+	}
+
+	/**
+	 * Returns whether this group contains the given child key (to a depth of 1 only)
+	 */
+	containsSetting(key: string): boolean {
+		return this._childSettingKeys.has(key);
+	}
+}
+
+export class SettingsTreeNewExtensionsElement extends SettingsTreeElement {
+	extensionIds: string[];
+}
+
+export class SettingsTreeSettingElement extends SettingsTreeElement {
+	setting: ISetting;
+
+	private _displayCategory: string;
+	private _displayLabel: string;
+
+	/**
+	 * scopeValue || defaultValue, for rendering convenience.
+	 */
+	value: any;
+
+	/**
+	 * The value in the current settings scope.
+	 */
+	scopeValue: any;
+
+	/**
+	 * The default value
+	 */
+	defaultValue?: any;
+
+	/**
+	 * Whether the setting is configured in the selected scope.
+	 */
+	isConfigured: boolean;
+
+	tags?: Set<string>;
+	overriddenScopeList: string[];
+	description: string;
+	valueType: 'enum' | 'string' | 'integer' | 'number' | 'boolean' | 'exclude' | 'complex' | 'nullable-integer' | 'nullable-number';
+
+	constructor(setting: ISetting, parent: SettingsTreeGroupElement, index: number, inspectResult: IInspectResult) {
+		super();
+		this.index = index;
+		this.setting = setting;
+		this.parent = parent;
+		this.id = sanitizeId(parent.id + '_' + setting.key);
+
+		this.update(inspectResult);
+	}
+
+	get displayCategory(): string {
+		if (!this._displayCategory) {
+			this.initLabel();
+		}
+
+		return this._displayCategory;
+	}
+
+	get displayLabel(): string {
+		if (!this._displayLabel) {
+			this.initLabel();
+		}
+
+		return this._displayLabel;
+	}
+
+	private initLabel(): void {
+		const displayKeyFormat = settingKeyToDisplayFormat(this.setting.key, this.parent.id);
+		this._displayLabel = displayKeyFormat.label;
+		this._displayCategory = displayKeyFormat.category;
+	}
+
+	update(inspectResult: IInspectResult): void {
+		const { isConfigured, inspected, targetSelector } = inspectResult;
+
+		const displayValue = isConfigured ? inspected[targetSelector] : inspected.default;
+		const overriddenScopeList = [];
+		if (targetSelector === 'user' && typeof inspected.workspace !== 'undefined') {
+			overriddenScopeList.push(localize('workspace', "Workspace"));
+		}
+
+		if (targetSelector === 'workspace' && typeof inspected.user !== 'undefined') {
+			overriddenScopeList.push(localize('user', "User"));
+		}
+
+		this.value = displayValue;
+		this.scopeValue = isConfigured && inspected[targetSelector];
+		this.defaultValue = inspected.default;
+
+		this.isConfigured = isConfigured;
+		if (isConfigured || this.setting.tags || this.tags) {
+			// Don't create an empty Set for all 1000 settings, only if needed
+			this.tags = new Set<string>();
+			if (isConfigured) {
+				this.tags.add(MODIFIED_SETTING_TAG);
+			}
+
+			if (this.setting.tags) {
+				this.setting.tags.forEach(tag => this.tags.add(tag));
+			}
+		}
+
+		this.overriddenScopeList = overriddenScopeList;
+		this.description = this.setting.description.join('\n');
+
+		if (this.setting.enum && (!this.setting.type || settingTypeEnumRenderable(this.setting.type))) {
+			this.valueType = 'enum';
+		} else if (this.setting.type === 'string') {
+			this.valueType = 'string';
+		} else if (isExcludeSetting(this.setting)) {
+			this.valueType = 'exclude';
+		} else if (this.setting.type === 'integer') {
+			this.valueType = 'integer';
+		} else if (this.setting.type === 'number') {
+			this.valueType = 'number';
+		} else if (this.setting.type === 'boolean') {
+			this.valueType = 'boolean';
+		} else if (isArray(this.setting.type) && this.setting.type.indexOf('null') > -1 && this.setting.type.length === 2) {
+			if (this.setting.type.indexOf('integer') > -1) {
+				this.valueType = 'nullable-integer';
+			} else if (this.setting.type.indexOf('number') > -1) {
+				this.valueType = 'nullable-number';
+			} else {
+				this.valueType = 'complex';
+			}
+		} else {
+			this.valueType = 'complex';
+		}
+	}
+
+	matchesAllTags(tagFilters?: Set<string>): boolean {
+		if (!tagFilters || !tagFilters.size) {
+			return true;
+		}
+
+		if (this.tags) {
+			let hasFilteredTag = true;
+			tagFilters.forEach(tag => {
+				hasFilteredTag = hasFilteredTag && this.tags.has(tag);
+			});
+			return hasFilteredTag;
+		} else {
+			return false;
+		}
+	}
+
+	matchesScope(scope: SettingsTarget): boolean {
+		const configTarget = URI.isUri(scope) ? ConfigurationTarget.WORKSPACE_FOLDER : scope;
+
+		if (configTarget === ConfigurationTarget.WORKSPACE_FOLDER) {
+			return this.setting.scope === ConfigurationScope.RESOURCE;
+		}
+
+		if (configTarget === ConfigurationTarget.WORKSPACE) {
+			return this.setting.scope === ConfigurationScope.WINDOW || this.setting.scope === ConfigurationScope.RESOURCE;
+		}
+
+		return true;
+	}
+}
+
+export class SettingsTreeModel {
+	protected _root: SettingsTreeGroupElement;
+	protected _treeElementsById = new Map<string, SettingsTreeElement>();
+	private _treeElementsBySettingName = new Map<string, SettingsTreeSettingElement[]>();
+	private _tocRoot: ITOCEntry;
+
+	constructor(
+		protected _viewState: ISettingsEditorViewState,
+		@IConfigurationService private _configurationService: IConfigurationService
+	) { }
+
+	get root(): SettingsTreeGroupElement {
+		return this._root;
+	}
+
+	update(newTocRoot = this._tocRoot): void {
+		this._treeElementsById.clear();
+		this._treeElementsBySettingName.clear();
+
+		const newRoot = this.createSettingsTreeGroupElement(newTocRoot);
+		if (newRoot.children[0] instanceof SettingsTreeGroupElement) {
+			(<SettingsTreeGroupElement>newRoot.children[0]).isFirstGroup = true; // TODO
+		}
+
+		if (this._root) {
+			this._root.children = newRoot.children;
+		} else {
+			this._root = newRoot;
+		}
+	}
+
+	getElementById(id: string): SettingsTreeElement {
+		return this._treeElementsById.get(id);
+	}
+
+	getElementsByName(name: string): SettingsTreeSettingElement[] {
+		return this._treeElementsBySettingName.get(name);
+	}
+
+	updateElementsByName(name: string): void {
+		if (!this._treeElementsBySettingName.has(name)) {
+			return;
+		}
+
+		this._treeElementsBySettingName.get(name).forEach(element => {
+			const inspectResult = inspectSetting(element.setting.key, this._viewState.settingsTarget, this._configurationService);
+			element.update(inspectResult);
+		});
+	}
+
+	private createSettingsTreeGroupElement(tocEntry: ITOCEntry, parent?: SettingsTreeGroupElement): SettingsTreeGroupElement {
+		const element = new SettingsTreeGroupElement();
+		const index = this._treeElementsById.size;
+		element.index = index;
+		element.id = tocEntry.id;
+		element.label = tocEntry.label;
+		element.parent = parent;
+		element.level = this.getDepth(element);
+
+		const children = [];
+		if (tocEntry.settings) {
+			const settingChildren = tocEntry.settings.map(s => this.createSettingsTreeSettingElement(<ISetting>s, element))
+				.filter(el => el.setting.deprecationMessage ? el.isConfigured : true);
+			children.push(...settingChildren);
+		}
+
+		if (tocEntry.children) {
+			const groupChildren = tocEntry.children.map(child => this.createSettingsTreeGroupElement(child, element));
+			children.push(...groupChildren);
+		}
+
+		element.children = children;
+
+		this._treeElementsById.set(element.id, element);
+		return element;
+	}
+
+	private getDepth(element: SettingsTreeElement): number {
+		if (element.parent) {
+			return 1 + this.getDepth(element.parent);
+		} else {
+			return 0;
+		}
+	}
+
+	private createSettingsTreeSettingElement(setting: ISetting, parent: SettingsTreeGroupElement): SettingsTreeSettingElement {
+		const index = this._treeElementsById.size;
+		const inspectResult = inspectSetting(setting.key, this._viewState.settingsTarget, this._configurationService);
+		const element = new SettingsTreeSettingElement(setting, parent, index, inspectResult);
+		this._treeElementsById.set(element.id, element);
+
+		const nameElements = this._treeElementsBySettingName.get(setting.key) || [];
+		nameElements.push(element);
+		this._treeElementsBySettingName.set(setting.key, nameElements);
+		return element;
+	}
+}
+
+interface IInspectResult {
+	isConfigured: boolean;
+	inspected: any;
+	targetSelector: string;
+}
+
+function inspectSetting(key: string, target: SettingsTarget, configurationService: IConfigurationService): IInspectResult {
+	const inspectOverrides = URI.isUri(target) ? { resource: target } : undefined;
+	const inspected = configurationService.inspect(key, inspectOverrides);
+	const targetSelector = target === ConfigurationTarget.USER ? 'user' :
+		target === ConfigurationTarget.WORKSPACE ? 'workspace' :
+			'workspaceFolder';
+	const isConfigured = typeof inspected[targetSelector] !== 'undefined';
+
+	return { isConfigured, inspected, targetSelector };
+}
+
+function sanitizeId(id: string): string {
+	return id.replace(/[\.\/]/, '_');
+}
+
+export function settingKeyToDisplayFormat(key: string, groupId = ''): { category: string, label: string } {
+	const lastDotIdx = key.lastIndexOf('.');
+	let category = '';
+	if (lastDotIdx >= 0) {
+		category = key.substr(0, lastDotIdx);
+		key = key.substr(lastDotIdx + 1);
+	}
+
+	groupId = groupId.replace(/\//g, '.');
+	category = trimCategoryForGroup(category, groupId);
+	category = wordifyKey(category);
+
+	const label = wordifyKey(key);
+	return { category, label };
+}
+
+function wordifyKey(key: string): string {
+	return key
+		.replace(/\.([a-z])/g, (match, p1) => ` › ${p1.toUpperCase()}`)
+		.replace(/([a-z])([A-Z])/g, '$1 $2') // fooBar => foo Bar
+		.replace(/^[a-z]/g, match => match.toUpperCase()) // foo => Foo
+		.replace(/\b\w+\b/g, match => {
+			return knownAcronyms.has(match.toLowerCase()) ?
+				match.toUpperCase() :
+				match;
+		});
+}
+
+function trimCategoryForGroup(category: string, groupId: string): string {
+	const doTrim = forward => {
+		const parts = groupId.split('.');
+		while (parts.length) {
+			const reg = new RegExp(`^${parts.join('\\.')}(\\.|$)`, 'i');
+			if (reg.test(category)) {
+				return category.replace(reg, '');
+			}
+
+			if (forward) {
+				parts.pop();
+			} else {
+				parts.shift();
+			}
+		}
+
+		return null;
+	};
+
+	let trimmed = doTrim(true);
+	if (trimmed === null) {
+		trimmed = doTrim(false);
+	}
+
+	if (trimmed === null) {
+		trimmed = category;
+	}
+
+	return trimmed;
+}
+
+export function isExcludeSetting(setting: ISetting): boolean {
+	return setting.key === 'files.exclude' ||
+		setting.key === 'search.exclude' ||
+		setting.key === 'files.watcherExclude';
+}
+
+function settingTypeEnumRenderable(_type: string | string[]) {
+	const enumRenderableSettingTypes = ['string', 'boolean', 'null', 'integer', 'number'];
+	let type = isArray(_type) ? _type : [_type];
+	return type.every(type => enumRenderableSettingTypes.indexOf(type) > -1);
+}
+
+export const enum SearchResultIdx {
+	Local = 0,
+	Remote = 1,
+	NewExtensions = 2
+}
+
+export class SearchResultModel extends SettingsTreeModel {
+	private rawSearchResults: ISearchResult[];
+	private cachedUniqueSearchResults: ISearchResult[];
+	private newExtensionSearchResults: ISearchResult;
+
+	readonly id = 'searchResultModel';
+
+	constructor(
+		viewState: ISettingsEditorViewState,
+		@IConfigurationService configurationService: IConfigurationService
+	) {
+		super(viewState, configurationService);
+		this.update({ id: 'searchResultModel', label: '' });
+	}
+
+	getUniqueResults(): ISearchResult[] {
+		if (this.cachedUniqueSearchResults) {
+			return this.cachedUniqueSearchResults;
+		}
+
+		if (!this.rawSearchResults) {
+			return [];
+		}
+
+		const localMatchKeys = new Set();
+		const localResult = this.rawSearchResults[SearchResultIdx.Local];
+		if (localResult) {
+			localResult.filterMatches.forEach(m => localMatchKeys.add(m.setting.key));
+		}
+
+		const remoteResult = this.rawSearchResults[SearchResultIdx.Remote];
+		if (remoteResult) {
+			remoteResult.filterMatches = remoteResult.filterMatches.filter(m => !localMatchKeys.has(m.setting.key));
+		}
+
+		if (remoteResult) {
+			this.newExtensionSearchResults = this.rawSearchResults[SearchResultIdx.NewExtensions];
+		}
+
+		this.cachedUniqueSearchResults = [localResult, remoteResult];
+		return this.cachedUniqueSearchResults;
+	}
+
+	getRawResults(): ISearchResult[] {
+		return this.rawSearchResults;
+	}
+
+	setResult(order: SearchResultIdx, result: ISearchResult): void {
+		this.cachedUniqueSearchResults = null;
+		this.rawSearchResults = this.rawSearchResults || [];
+		if (!result) {
+			delete this.rawSearchResults[order];
+			return;
+		}
+
+		this.rawSearchResults[order] = result;
+		this.updateChildren();
+	}
+
+	updateChildren(): void {
+		this.update({
+			id: 'searchResultModel',
+			label: 'searchResultModel',
+			settings: this.getFlatSettings()
+		});
+
+		// Save time, filter children in the search model instead of relying on the tree filter, which still requires heights to be calculated.
+		this.root.children = this.root.children
+			.filter(child => child instanceof SettingsTreeSettingElement && child.matchesAllTags(this._viewState.tagFilters) && child.matchesScope(this._viewState.settingsTarget));
+
+		if (this.newExtensionSearchResults && this.newExtensionSearchResults.filterMatches.length) {
+			const newExtElement = new SettingsTreeNewExtensionsElement();
+			newExtElement.index = this._treeElementsById.size;
+			newExtElement.parent = this._root;
+			newExtElement.id = 'newExtensions';
+			this._treeElementsById.set(newExtElement.id, newExtElement);
+
+			const resultExtensionIds = this.newExtensionSearchResults.filterMatches
+				.map(result => (<IExtensionSetting>result.setting))
+				.filter(setting => setting.extensionName && setting.extensionPublisher)
+				.map(setting => `${setting.extensionPublisher}.${setting.extensionName}`);
+			newExtElement.extensionIds = arrays.distinct(resultExtensionIds);
+			this._root.children.push(newExtElement);
+		}
+	}
+
+	private getFlatSettings(): ISetting[] {
+		const flatSettings: ISetting[] = [];
+		this.getUniqueResults()
+			.filter(r => !!r)
+			.forEach(r => {
+				flatSettings.push(
+					...r.filterMatches.map(m => m.setting));
+			});
+
+		return flatSettings;
+	}
+}
+
+export interface IParsedQuery {
+	tags: string[];
+	query: string;
+}
+
+const tagRegex = /(^|\s)@tag:("([^"]*)"|[^"]\S*)/g;
+export function parseQuery(query: string): IParsedQuery {
+	const tags: string[] = [];
+	query = query.replace(tagRegex, (_, __, quotedTag, tag) => {
+		tags.push(tag || quotedTag);
+		return '';
+	});
+
+	query = query.replace(`@${MODIFIED_SETTING_TAG}`, () => {
+		tags.push(MODIFIED_SETTING_TAG);
+		return '';
+	});
+
+	query = query.trim();
+
+	return {
+		tags,
+		query
+	};
+}
diff --git a/src/vs/workbench/parts/preferences/browser/settingsWidgets.ts b/src/vs/workbench/parts/preferences/browser/settingsWidgets.ts
new file mode 100644
index 00000000000..ae0ad8a2d15
--- /dev/null
+++ b/src/vs/workbench/parts/preferences/browser/settingsWidgets.ts
@@ -0,0 +1,482 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as DOM from 'vs/base/browser/dom';
+import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
+import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
+import { Button } from 'vs/base/browser/ui/button/button';
+import { InputBox } from 'vs/base/browser/ui/inputbox/inputBox';
+import { IAction } from 'vs/base/common/actions';
+import { Color, RGBA } from 'vs/base/common/color';
+import { Emitter, Event } from 'vs/base/common/event';
+import { KeyCode } from 'vs/base/common/keyCodes';
+import { Disposable, dispose, IDisposable } from 'vs/base/common/lifecycle';
+import 'vs/css!./media/settingsWidgets';
+import { localize } from 'vs/nls';
+import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
+import { foreground, inputBackground, inputBorder, inputForeground, listActiveSelectionBackground, listActiveSelectionForeground, listHoverBackground, listHoverForeground, listInactiveSelectionBackground, listInactiveSelectionForeground, registerColor, selectBackground, selectBorder, selectForeground, textLinkForeground, textPreformatForeground, editorWidgetBorder } from 'vs/platform/theme/common/colorRegistry';
+import { attachButtonStyler, attachInputBoxStyler } from 'vs/platform/theme/common/styler';
+import { ICssStyleCollector, ITheme, IThemeService, registerThemingParticipant } from 'vs/platform/theme/common/themeService';
+
+const $ = DOM.$;
+export const settingsHeaderForeground = registerColor('settings.headerForeground', { light: '#444444', dark: '#e7e7e7', hc: '#ffffff' }, localize('headerForeground', "(For settings editor preview) The foreground color for a section header or active title."));
+export const modifiedItemIndicator = registerColor('settings.modifiedItemIndicator', {
+	light: new Color(new RGBA(102, 175, 224)),
+	dark: new Color(new RGBA(12, 125, 157)),
+	hc: new Color(new RGBA(0, 73, 122))
+}, localize('modifiedItemForeground', "(For settings editor preview) The color of the modified setting indicator."));
+
+// Enum control colors
+export const settingsSelectBackground = registerColor('settings.dropdownBackground', { dark: selectBackground, light: selectBackground, hc: selectBackground }, localize('settingsDropdownBackground', "(For settings editor preview) Settings editor dropdown background."));
+export const settingsSelectForeground = registerColor('settings.dropdownForeground', { dark: selectForeground, light: selectForeground, hc: selectForeground }, localize('settingsDropdownForeground', "(For settings editor preview) Settings editor dropdown foreground."));
+export const settingsSelectBorder = registerColor('settings.dropdownBorder', { dark: selectBorder, light: selectBorder, hc: selectBorder }, localize('settingsDropdownBorder', "(For settings editor preview) Settings editor dropdown border."));
+export const settingsSelectListBorder = registerColor('settings.dropdownListBorder', { dark: editorWidgetBorder, light: editorWidgetBorder, hc: editorWidgetBorder }, localize('settingsDropdownListBorder', "(For settings editor preview) Settings editor dropdown list border. This surrounds the options and separates the options from the description."));
+
+// Bool control colors
+export const settingsCheckboxBackground = registerColor('settings.checkboxBackground', { dark: selectBackground, light: selectBackground, hc: selectBackground }, localize('settingsCheckboxBackground', "(For settings editor preview) Settings editor checkbox background."));
+export const settingsCheckboxForeground = registerColor('settings.checkboxForeground', { dark: selectForeground, light: selectForeground, hc: selectForeground }, localize('settingsCheckboxForeground', "(For settings editor preview) Settings editor checkbox foreground."));
+export const settingsCheckboxBorder = registerColor('settings.checkboxBorder', { dark: selectBorder, light: selectBorder, hc: selectBorder }, localize('settingsCheckboxBorder', "(For settings editor preview) Settings editor checkbox border."));
+
+// Text control colors
+export const settingsTextInputBackground = registerColor('settings.textInputBackground', { dark: inputBackground, light: inputBackground, hc: inputBackground }, localize('textInputBoxBackground', "(For settings editor preview) Settings editor text input box background."));
+export const settingsTextInputForeground = registerColor('settings.textInputForeground', { dark: inputForeground, light: inputForeground, hc: inputForeground }, localize('textInputBoxForeground', "(For settings editor preview) Settings editor text input box foreground."));
+export const settingsTextInputBorder = registerColor('settings.textInputBorder', { dark: inputBorder, light: inputBorder, hc: inputBorder }, localize('textInputBoxBorder', "(For settings editor preview) Settings editor text input box border."));
+
+// Number control colors
+export const settingsNumberInputBackground = registerColor('settings.numberInputBackground', { dark: inputBackground, light: inputBackground, hc: inputBackground }, localize('numberInputBoxBackground', "(For settings editor preview) Settings editor number input box background."));
+export const settingsNumberInputForeground = registerColor('settings.numberInputForeground', { dark: inputForeground, light: inputForeground, hc: inputForeground }, localize('numberInputBoxForeground', "(For settings editor preview) Settings editor number input box foreground."));
+export const settingsNumberInputBorder = registerColor('settings.numberInputBorder', { dark: inputBorder, light: inputBorder, hc: inputBorder }, localize('numberInputBoxBorder', "(For settings editor preview) Settings editor number input box border."));
+
+registerThemingParticipant((theme: ITheme, collector: ICssStyleCollector) => {
+	const checkboxBackgroundColor = theme.getColor(settingsCheckboxBackground);
+	if (checkboxBackgroundColor) {
+		collector.addRule(`.settings-editor > .settings-body > .settings-tree-container .setting-item-bool .setting-value-checkbox { background-color: ${checkboxBackgroundColor} !important; }`);
+	}
+
+	const checkboxBorderColor = theme.getColor(settingsCheckboxBorder);
+	if (checkboxBorderColor) {
+		collector.addRule(`.settings-editor > .settings-body > .settings-tree-container .setting-item-bool .setting-value-checkbox { border-color: ${checkboxBorderColor} !important; }`);
+	}
+
+	const link = theme.getColor(textLinkForeground);
+	if (link) {
+		collector.addRule(`.settings-editor > .settings-body > .settings-tree-container .setting-item .setting-item-description-markdown a { color: ${link}; }`);
+		collector.addRule(`.settings-editor > .settings-body > .settings-tree-container .setting-item .setting-item-description-markdown a > code { color: ${link}; }`);
+		collector.addRule(`.monaco-select-box-dropdown-container > .select-box-details-pane > .select-box-description-markdown a { color: ${link}; }`);
+		collector.addRule(`.monaco-select-box-dropdown-container > .select-box-details-pane > .select-box-description-markdown a > code { color: ${link}; }`);
+	}
+
+	const headerForegroundColor = theme.getColor(settingsHeaderForeground);
+	if (headerForegroundColor) {
+		collector.addRule(`.settings-editor > .settings-header > .settings-header-controls .settings-tabs-widget .action-label.checked { color: ${headerForegroundColor}; border-bottom-color: ${headerForegroundColor}; }`);
+	}
+
+	const foregroundColor = theme.getColor(foreground);
+	if (foregroundColor) {
+		collector.addRule(`.settings-editor > .settings-header > .settings-header-controls .settings-tabs-widget .action-label { color: ${foregroundColor}; }`);
+	}
+
+	// Exclude control
+	const listHoverBackgroundColor = theme.getColor(listHoverBackground);
+	if (listHoverBackgroundColor) {
+		collector.addRule(`.settings-editor > .settings-body > .settings-tree-container .setting-item.setting-item-exclude .setting-exclude-row:hover { background-color: ${listHoverBackgroundColor}; }`);
+	}
+
+	const listHoverForegroundColor = theme.getColor(listHoverForeground);
+	if (listHoverForegroundColor) {
+		collector.addRule(`.settings-editor > .settings-body > .settings-tree-container .setting-item.setting-item-exclude .setting-exclude-row:hover { color: ${listHoverForegroundColor}; }`);
+	}
+
+	const listSelectBackgroundColor = theme.getColor(listActiveSelectionBackground);
+	if (listSelectBackgroundColor) {
+		collector.addRule(`.settings-editor > .settings-body > .settings-tree-container .setting-item.setting-item-exclude .setting-exclude-row.selected:focus { background-color: ${listSelectBackgroundColor}; }`);
+	}
+
+	const listInactiveSelectionBackgroundColor = theme.getColor(listInactiveSelectionBackground);
+	if (listInactiveSelectionBackgroundColor) {
+		collector.addRule(`.settings-editor > .settings-body > .settings-tree-container .setting-item.setting-item-exclude .setting-exclude-row.selected:not(:focus) { background-color: ${listInactiveSelectionBackgroundColor}; }`);
+	}
+
+	const listInactiveSelectionForegroundColor = theme.getColor(listInactiveSelectionForeground);
+	if (listInactiveSelectionForegroundColor) {
+		collector.addRule(`.settings-editor > .settings-body > .settings-tree-container .setting-item.setting-item-exclude .setting-exclude-row.selected:not(:focus) { color: ${listInactiveSelectionForegroundColor}; }`);
+	}
+
+	const listSelectForegroundColor = theme.getColor(listActiveSelectionForeground);
+	if (listSelectForegroundColor) {
+		collector.addRule(`.settings-editor > .settings-body > .settings-tree-container .setting-item.setting-item-exclude .setting-exclude-row.selected:focus { color: ${listSelectForegroundColor}; }`);
+	}
+
+	const codeTextForegroundColor = theme.getColor(textPreformatForeground);
+	if (codeTextForegroundColor) {
+		collector.addRule(`.settings-editor > .settings-body > .settings-tree-container .setting-item .setting-item-description-markdown code { color: ${codeTextForegroundColor} }`);
+		collector.addRule(`.monaco-select-box-dropdown-container > .select-box-details-pane > .select-box-description-markdown code { color: ${codeTextForegroundColor} }`);
+
+	}
+
+	const modifiedItemIndicatorColor = theme.getColor(modifiedItemIndicator);
+	if (modifiedItemIndicatorColor) {
+		collector.addRule(`.settings-editor > .settings-body > .settings-tree-container .setting-item > .setting-item-modified-indicator { border-color: ${modifiedItemIndicatorColor}; }`);
+	}
+});
+
+export class ExcludeSettingListModel {
+	private _dataItems: IExcludeDataItem[] = [];
+	private _editKey: string | null;
+	private _selectedIdx: number | null;
+
+	get items(): IExcludeViewItem[] {
+		const items = this._dataItems.map((item, i) => {
+			const editing = item.pattern === this._editKey;
+			return <IExcludeViewItem>{
+				...item,
+				editing,
+				selected: i === this._selectedIdx || editing
+			};
+		});
+
+		if (this._editKey === '') {
+			items.push({
+				editing: true,
+				selected: true,
+				pattern: '',
+				sibling: ''
+			});
+		}
+
+		return items;
+	}
+
+	setEditKey(key: string): void {
+		this._editKey = key;
+	}
+
+	setValue(excludeData: IExcludeDataItem[]): void {
+		this._dataItems = excludeData;
+	}
+
+	select(idx: number): void {
+		this._selectedIdx = idx;
+	}
+
+	getSelected(): number {
+		return this._selectedIdx;
+	}
+
+	selectNext(): void {
+		if (typeof this._selectedIdx === 'number') {
+			this._selectedIdx = Math.min(this._selectedIdx + 1, this._dataItems.length - 1);
+		} else {
+			this._selectedIdx = 0;
+		}
+	}
+
+	selectPrevious(): void {
+		if (typeof this._selectedIdx === 'number') {
+			this._selectedIdx = Math.max(this._selectedIdx - 1, 0);
+		} else {
+			this._selectedIdx = 0;
+		}
+	}
+}
+
+interface IExcludeChangeEvent {
+	originalPattern: string;
+	pattern: string;
+	sibling?: string;
+}
+
+export class ExcludeSettingWidget extends Disposable {
+	private listElement: HTMLElement;
+	private listDisposables: IDisposable[] = [];
+
+	private model = new ExcludeSettingListModel();
+
+	private readonly _onDidChangeExclude: Emitter<IExcludeChangeEvent> = new Emitter<IExcludeChangeEvent>();
+	public readonly onDidChangeExclude: Event<IExcludeChangeEvent> = this._onDidChangeExclude.event;
+
+	get domNode(): HTMLElement {
+		return this.listElement;
+	}
+
+	constructor(
+		private container: HTMLElement,
+		@IThemeService private themeService: IThemeService,
+		@IContextViewService private contextViewService: IContextViewService
+	) {
+		super();
+
+		this.listElement = DOM.append(container, $('.setting-exclude-widget'));
+		this.listElement.setAttribute('tabindex', '0');
+		DOM.append(container, this.renderAddButton());
+		this.renderList();
+
+		this._register(DOM.addDisposableListener(this.listElement, DOM.EventType.CLICK, e => this.onListClick(e)));
+		this._register(DOM.addDisposableListener(this.listElement, DOM.EventType.DBLCLICK, e => this.onListDoubleClick(e)));
+
+		this._register(DOM.addStandardDisposableListener(this.listElement, 'keydown', (e: KeyboardEvent) => {
+			if (e.keyCode === KeyCode.UpArrow) {
+				this.model.selectPrevious();
+				this.renderList();
+				e.preventDefault();
+				e.stopPropagation();
+			} else if (e.keyCode === KeyCode.DownArrow) {
+				this.model.selectNext();
+				this.renderList();
+				e.preventDefault();
+				e.stopPropagation();
+			}
+		}));
+	}
+
+	setValue(excludeData: IExcludeDataItem[]): void {
+		this.model.setValue(excludeData);
+		this.renderList();
+	}
+
+	private onListClick(e: MouseEvent): void {
+		const targetIdx = this.getClickedItemIndex(e);
+		if (targetIdx < 0) {
+			return;
+		}
+
+		if (this.model.getSelected() === targetIdx) {
+			return;
+		}
+
+		this.model.select(targetIdx);
+		this.renderList();
+		e.preventDefault();
+		e.stopPropagation();
+	}
+
+	private onListDoubleClick(e: MouseEvent): void {
+		const targetIdx = this.getClickedItemIndex(e);
+		if (targetIdx < 0) {
+			return;
+		}
+
+		const item = this.model.items[targetIdx];
+		if (item) {
+			this.editSetting(item.pattern);
+			e.preventDefault();
+			e.stopPropagation();
+		}
+	}
+
+	private getClickedItemIndex(e: MouseEvent): number {
+		if (!e.target) {
+			return -1;
+		}
+
+		const actionbar = DOM.findParentWithClass(<any>e.target, 'monaco-action-bar');
+		if (actionbar) {
+			// Don't handle doubleclicks inside the action bar
+			return -1;
+		}
+
+		const element = DOM.findParentWithClass((<any>e.target), 'setting-exclude-row');
+		if (!element) {
+			return -1;
+		}
+
+		const targetIdxStr = element.getAttribute('data-index');
+		if (!targetIdxStr) {
+			return -1;
+		}
+
+		const targetIdx = parseInt(targetIdxStr);
+		return targetIdx;
+	}
+
+	private renderList(): void {
+		const focused = DOM.isAncestor(document.activeElement, this.listElement);
+
+		DOM.clearNode(this.listElement);
+		this.listDisposables = dispose(this.listDisposables);
+
+		const newMode = this.model.items.some(item => item.editing && !item.pattern);
+		DOM.toggleClass(this.container, 'setting-exclude-new-mode', newMode);
+
+		this.model.items
+			.map((item, i) => this.renderItem(item, i, focused))
+			.forEach(itemElement => this.listElement.appendChild(itemElement));
+
+		const listHeight = 22 * this.model.items.length;
+		this.listElement.style.height = listHeight + 'px';
+	}
+
+	private createDeleteAction(key: string): IAction {
+		return <IAction>{
+			class: 'setting-excludeAction-remove',
+			enabled: true,
+			id: 'workbench.action.removeExcludeItem',
+			tooltip: localize('removeExcludeItem', "Remove Exclude Item"),
+			run: () => this._onDidChangeExclude.fire({ originalPattern: key, pattern: undefined })
+		};
+	}
+
+	private createEditAction(key: string): IAction {
+		return <IAction>{
+			class: 'setting-excludeAction-edit',
+			enabled: true,
+			id: 'workbench.action.editExcludeItem',
+			tooltip: localize('editExcludeItem', "Edit Exclude Item"),
+			run: () => {
+				this.editSetting(key);
+			}
+		};
+	}
+
+	private editSetting(key: string): void {
+		this.model.setEditKey(key);
+		this.renderList();
+	}
+
+	private renderItem(item: IExcludeViewItem, idx: number, listFocused: boolean): HTMLElement {
+		return item.editing ?
+			this.renderEditItem(item) :
+			this.renderDataItem(item, idx, listFocused);
+	}
+
+	private renderDataItem(item: IExcludeViewItem, idx: number, listFocused: boolean): HTMLElement {
+		const rowElement = $('.setting-exclude-row');
+		rowElement.setAttribute('data-index', idx + '');
+		rowElement.setAttribute('tabindex', item.selected ? '0' : '-1');
+		DOM.toggleClass(rowElement, 'selected', item.selected);
+
+		const actionBar = new ActionBar(rowElement);
+		this.listDisposables.push(actionBar);
+
+		const patternElement = DOM.append(rowElement, $('.setting-exclude-pattern'));
+		const siblingElement = DOM.append(rowElement, $('.setting-exclude-sibling'));
+		patternElement.textContent = item.pattern;
+		siblingElement.textContent = item.sibling && ('when: ' + item.sibling);
+
+		actionBar.push([
+			this.createEditAction(item.pattern),
+			this.createDeleteAction(item.pattern)
+		], { icon: true, label: false });
+
+		rowElement.title = item.sibling ?
+			localize('excludeSiblingHintLabel', "Exclude files matching `{0}`, only when a file matching `{1}` is present", item.pattern, item.sibling) :
+			localize('excludePatternHintLabel', "Exclude files matching `{0}`", item.pattern);
+
+		if (item.selected) {
+			if (listFocused) {
+				setTimeout(() => {
+					rowElement.focus();
+				}, 10);
+			}
+		}
+
+		return rowElement;
+	}
+
+	private renderAddButton(): HTMLElement {
+		const rowElement = $('.setting-exclude-new-row');
+
+		const startAddButton = this._register(new Button(rowElement));
+		startAddButton.label = localize('addPattern', "Add Pattern");
+		startAddButton.element.classList.add('setting-exclude-addButton');
+		this._register(attachButtonStyler(startAddButton, this.themeService));
+
+		this._register(startAddButton.onDidClick(() => {
+			this.model.setEditKey('');
+			this.renderList();
+		}));
+
+		return rowElement;
+	}
+
+	private renderEditItem(item: IExcludeViewItem): HTMLElement {
+		const rowElement = $('.setting-exclude-edit-row');
+
+		const onSubmit = edited => {
+			this.model.setEditKey(null);
+			const pattern = patternInput.value.trim();
+			if (edited && pattern) {
+				this._onDidChangeExclude.fire({
+					originalPattern: item.pattern,
+					pattern,
+					sibling: siblingInput && siblingInput.value.trim()
+				});
+			}
+			this.renderList();
+		};
+
+		const onKeydown = (e: StandardKeyboardEvent) => {
+			if (e.equals(KeyCode.Enter)) {
+				onSubmit(true);
+			} else if (e.equals(KeyCode.Escape)) {
+				onSubmit(false);
+				e.preventDefault();
+			}
+		};
+
+		const patternInput = new InputBox(rowElement, this.contextViewService, {
+			placeholder: localize('excludePatternInputPlaceholder', "Exclude Pattern...")
+		});
+		patternInput.element.classList.add('setting-exclude-patternInput');
+		this.listDisposables.push(attachInputBoxStyler(patternInput, this.themeService, {
+			inputBackground: settingsTextInputBackground,
+			inputForeground: settingsTextInputForeground,
+			inputBorder: settingsTextInputBorder
+		}));
+		this.listDisposables.push(patternInput);
+		patternInput.value = item.pattern;
+		this.listDisposables.push(DOM.addStandardDisposableListener(patternInput.inputElement, DOM.EventType.KEY_DOWN, onKeydown));
+
+		let siblingInput: InputBox;
+		if (item.sibling) {
+			siblingInput = new InputBox(rowElement, this.contextViewService, {
+				placeholder: localize('excludeSiblingInputPlaceholder', "When Pattern Is Present...")
+			});
+			siblingInput.element.classList.add('setting-exclude-siblingInput');
+			this.listDisposables.push(siblingInput);
+			this.listDisposables.push(attachInputBoxStyler(siblingInput, this.themeService, {
+				inputBackground: settingsTextInputBackground,
+				inputForeground: settingsTextInputForeground,
+				inputBorder: settingsTextInputBorder
+			}));
+			siblingInput.value = item.sibling;
+			this.listDisposables.push(DOM.addStandardDisposableListener(siblingInput.inputElement, DOM.EventType.KEY_DOWN, onKeydown));
+		}
+
+		const okButton = this._register(new Button(rowElement));
+		okButton.label = localize('okButton', "OK");
+		okButton.element.classList.add('setting-exclude-okButton');
+		this.listDisposables.push(attachButtonStyler(okButton, this.themeService));
+		this.listDisposables.push(okButton.onDidClick(() => onSubmit(true)));
+
+		const cancelButton = this._register(new Button(rowElement));
+		cancelButton.label = localize('cancelButton', "Cancel");
+		cancelButton.element.classList.add('setting-exclude-cancelButton');
+		this.listDisposables.push(attachButtonStyler(cancelButton, this.themeService));
+		this.listDisposables.push(cancelButton.onDidClick(() => onSubmit(false)));
+
+		setTimeout(() => {
+			patternInput.focus();
+			patternInput.select();
+		}, 0);
+
+		return rowElement;
+	}
+
+	dispose() {
+		super.dispose();
+		this.listDisposables = dispose(this.listDisposables);
+	}
+}
+
+export interface IExcludeDataItem {
+	pattern: string;
+	sibling?: string;
+}
+
+interface IExcludeViewItem extends IExcludeDataItem {
+	editing?: boolean;
+	selected?: boolean;
+}
diff --git a/src/vs/workbench/parts/preferences/browser/tocTree.ts b/src/vs/workbench/parts/preferences/browser/tocTree.ts
new file mode 100644
index 00000000000..b015b5af6fd
--- /dev/null
+++ b/src/vs/workbench/parts/preferences/browser/tocTree.ts
@@ -0,0 +1,218 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as DOM from 'vs/base/browser/dom';
+import { ScrollbarVisibility } from 'vs/base/common/scrollable';
+import { TPromise } from 'vs/base/common/winjs.base';
+import { IDataSource, IRenderer, ITree, ITreeConfiguration, ITreeOptions } from 'vs/base/parts/tree/browser/tree';
+import { DefaultTreestyler } from 'vs/base/parts/tree/browser/treeDefaults';
+import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
+import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { IListService, WorkbenchTree, WorkbenchTreeController } from 'vs/platform/list/browser/listService';
+import { editorBackground } from 'vs/platform/theme/common/colorRegistry';
+import { attachStyler } from 'vs/platform/theme/common/styler';
+import { IThemeService } from 'vs/platform/theme/common/themeService';
+import { SettingsAccessibilityProvider, SettingsTreeFilter } from 'vs/workbench/parts/preferences/browser/settingsTree';
+import { ISettingsEditorViewState, SearchResultModel, SettingsTreeElement, SettingsTreeGroupElement, SettingsTreeSettingElement } from 'vs/workbench/parts/preferences/browser/settingsTreeModels';
+import { settingsHeaderForeground } from 'vs/workbench/parts/preferences/browser/settingsWidgets';
+
+const $ = DOM.$;
+
+export class TOCTreeModel {
+
+	private _currentSearchModel: SearchResultModel;
+	private _settingsTreeRoot: SettingsTreeGroupElement;
+
+	constructor(private _viewState: ISettingsEditorViewState) {
+	}
+
+	public get settingsTreeRoot(): SettingsTreeGroupElement {
+		return this._settingsTreeRoot;
+	}
+
+	public set settingsTreeRoot(value: SettingsTreeGroupElement) {
+		this._settingsTreeRoot = value;
+		this.update();
+	}
+
+	public set currentSearchModel(model: SearchResultModel) {
+		this._currentSearchModel = model;
+		this.update();
+	}
+
+	public get children(): SettingsTreeElement[] {
+		return this._settingsTreeRoot.children;
+	}
+
+	public update(): void {
+		this.updateGroupCount(this._settingsTreeRoot);
+	}
+
+	private updateGroupCount(group: SettingsTreeGroupElement): void {
+		group.children.forEach(child => {
+			if (child instanceof SettingsTreeGroupElement) {
+				this.updateGroupCount(child);
+			}
+		});
+
+		const childCount = group.children
+			.filter(child => child instanceof SettingsTreeGroupElement)
+			.reduce((acc, cur) => acc + (<SettingsTreeGroupElement>cur).count, 0);
+
+		group.count = childCount + this.getGroupCount(group);
+	}
+
+	private getGroupCount(group: SettingsTreeGroupElement): number {
+		return group.children.filter(child => {
+			if (!(child instanceof SettingsTreeSettingElement)) {
+				return false;
+			}
+
+			if (this._currentSearchModel && !this._currentSearchModel.root.containsSetting(child.setting.key)) {
+				return false;
+			}
+
+			// Check everything that the SettingsFilter checks except whether it's filtered by a category
+			return child.matchesScope(this._viewState.settingsTarget) && child.matchesAllTags(this._viewState.tagFilters);
+		}).length;
+	}
+}
+
+export type TOCTreeElement = SettingsTreeGroupElement | TOCTreeModel;
+
+export class TOCDataSource implements IDataSource {
+	constructor(private _treeFilter: SettingsTreeFilter) {
+	}
+
+	getId(tree: ITree, element: SettingsTreeGroupElement): string {
+		return element.id;
+	}
+
+	hasChildren(tree: ITree, element: TOCTreeElement): boolean {
+		if (element instanceof TOCTreeModel) {
+			return true;
+		}
+
+		if (element instanceof SettingsTreeGroupElement) {
+			// Should have child which won't be filtered out
+			return element.children && element.children.some(child => child instanceof SettingsTreeGroupElement && this._treeFilter.isVisible(tree, child));
+		}
+
+		return false;
+	}
+
+	getChildren(tree: ITree, element: TOCTreeElement): TPromise<SettingsTreeElement[]> {
+		return TPromise.as(this._getChildren(element));
+	}
+
+	private _getChildren(element: TOCTreeElement): SettingsTreeElement[] {
+		return (<SettingsTreeElement[]>element.children)
+			.filter(child => child instanceof SettingsTreeGroupElement);
+	}
+
+	getParent(tree: ITree, element: TOCTreeElement): TPromise<any> {
+		return TPromise.wrap(element instanceof SettingsTreeGroupElement && element.parent);
+	}
+}
+
+const TOC_ENTRY_TEMPLATE_ID = 'settings.toc.entry';
+
+interface ITOCEntryTemplate {
+	labelElement: HTMLElement;
+	countElement: HTMLElement;
+}
+
+export class TOCRenderer implements IRenderer {
+	getHeight(tree: ITree, element: SettingsTreeElement): number {
+		return 22;
+	}
+
+	getTemplateId(tree: ITree, element: SettingsTreeElement): string {
+		return TOC_ENTRY_TEMPLATE_ID;
+	}
+
+	renderTemplate(tree: ITree, templateId: string, container: HTMLElement): ITOCEntryTemplate {
+		return {
+			labelElement: DOM.append(container, $('.settings-toc-entry')),
+			countElement: DOM.append(container, $('.settings-toc-count'))
+		};
+	}
+
+	renderElement(tree: ITree, element: SettingsTreeGroupElement, templateId: string, template: ITOCEntryTemplate): void {
+		const count = element.count;
+		const label = element.label;
+
+		DOM.toggleClass(template.labelElement, 'no-results', count === 0);
+		template.labelElement.textContent = label;
+
+		if (count) {
+			template.countElement.textContent = ` (${count})`;
+		} else {
+			template.countElement.textContent = '';
+		}
+	}
+
+	disposeTemplate(tree: ITree, templateId: string, templateData: any): void {
+	}
+}
+
+export class TOCTree extends WorkbenchTree {
+	constructor(
+		container: HTMLElement,
+		viewState: ISettingsEditorViewState,
+		configuration: Partial<ITreeConfiguration>,
+		@IContextKeyService contextKeyService: IContextKeyService,
+		@IListService listService: IListService,
+		@IThemeService themeService: IThemeService,
+		@IInstantiationService instantiationService: IInstantiationService,
+		@IConfigurationService configurationService: IConfigurationService
+	) {
+		const treeClass = 'settings-toc-tree';
+
+		const filter = instantiationService.createInstance(SettingsTreeFilter, viewState);
+		const fullConfiguration = <ITreeConfiguration>{
+			controller: instantiationService.createInstance(WorkbenchTreeController, {}),
+			filter,
+			styler: new DefaultTreestyler(DOM.createStyleSheet(container), treeClass),
+			dataSource: instantiationService.createInstance(TOCDataSource, filter),
+			accessibilityProvider: instantiationService.createInstance(SettingsAccessibilityProvider),
+
+			...configuration
+		};
+
+		const options: ITreeOptions = {
+			showLoading: false,
+			twistiePixels: 15,
+			horizontalScrollMode: ScrollbarVisibility.Hidden
+		};
+
+		super(container,
+			fullConfiguration,
+			options,
+			contextKeyService,
+			listService,
+			themeService,
+			instantiationService,
+			configurationService);
+
+		this.getHTMLElement().classList.add(treeClass);
+
+		this.disposables.push(attachStyler(themeService, {
+			listActiveSelectionBackground: editorBackground,
+			listActiveSelectionForeground: settingsHeaderForeground,
+			listFocusAndSelectionBackground: editorBackground,
+			listFocusAndSelectionForeground: settingsHeaderForeground,
+			listFocusBackground: editorBackground,
+			listFocusForeground: settingsHeaderForeground,
+			listHoverForeground: settingsHeaderForeground,
+			listHoverBackground: editorBackground,
+			listInactiveSelectionBackground: editorBackground,
+			listInactiveSelectionForeground: settingsHeaderForeground,
+		}, colors => {
+			this.style(colors);
+		}));
+	}
+}
diff --git a/src/vs/workbench/parts/preferences/common/preferences.ts b/src/vs/workbench/parts/preferences/common/preferences.ts
index fdf684a9d5a..8d084c1559a 100644
--- a/src/vs/workbench/parts/preferences/common/preferences.ts
+++ b/src/vs/workbench/parts/preferences/common/preferences.ts
@@ -10,6 +10,7 @@ import { join } from 'vs/base/common/paths';
 import { ISettingsEditorModel, ISearchResult } from 'vs/workbench/services/preferences/common/preferences';
 import { IEditor } from 'vs/workbench/common/editor';
 import { IKeybindingItemEntry } from 'vs/workbench/services/preferences/common/keybindingsEditorModel';
+import { CancellationToken } from 'vs/base/common/cancellation';
 
 export interface IWorkbenchSettingsConfiguration {
 	workbench: {
@@ -40,7 +41,7 @@ export interface IPreferencesSearchService {
 }
 
 export interface ISearchProvider {
-	searchModel(preferencesModel: ISettingsEditorModel): TPromise<ISearchResult>;
+	searchModel(preferencesModel: ISettingsEditorModel, token?: CancellationToken): TPromise<ISearchResult>;
 }
 
 export interface IKeybindingsEditor extends IEditor {
@@ -48,6 +49,7 @@ export interface IKeybindingsEditor extends IEditor {
 	activeKeybindingEntry: IKeybindingItemEntry;
 
 	search(filter: string): void;
+	focusSearch(): void;
 	clearSearchResults(): void;
 	focusKeybindings(): void;
 	defineKeybinding(keybindingEntry: IKeybindingItemEntry): TPromise<any>;
@@ -60,6 +62,7 @@ export interface IKeybindingsEditor extends IEditor {
 
 export const CONTEXT_SETTINGS_EDITOR = new RawContextKey<boolean>('inSettingsEditor', false);
 export const CONTEXT_SETTINGS_SEARCH_FOCUS = new RawContextKey<boolean>('inSettingsSearch', false);
+export const CONTEXT_TOC_ROW_FOCUS = new RawContextKey<boolean>('settingsTocRowFocus', false);
 export const CONTEXT_KEYBINDINGS_EDITOR = new RawContextKey<boolean>('inKeybindings', false);
 export const CONTEXT_KEYBINDINGS_SEARCH_FOCUS = new RawContextKey<boolean>('inKeybindingsSearch', false);
 export const CONTEXT_KEYBINDING_FOCUS = new RawContextKey<boolean>('keybindingFocus', false);
@@ -70,6 +73,10 @@ export const SETTINGS_EDITOR_COMMAND_FOCUS_NEXT_SETTING = 'settings.action.focus
 export const SETTINGS_EDITOR_COMMAND_FOCUS_PREVIOUS_SETTING = 'settings.action.focusPreviousSetting';
 export const SETTINGS_EDITOR_COMMAND_FOCUS_FILE = 'settings.action.focusSettingsFile';
 export const SETTINGS_EDITOR_COMMAND_EDIT_FOCUSED_SETTING = 'settings.action.editFocusedSetting';
+export const SETTINGS_EDITOR_COMMAND_FOCUS_SETTINGS_FROM_SEARCH = 'settings.action.focusSettingsFromSearch';
+export const SETTINGS_EDITOR_COMMAND_FOCUS_SETTINGS_LIST = 'settings.action.focusSettingsList';
+export const SETTINGS_EDITOR_COMMAND_SHOW_CONTEXT_MENU = 'settings.action.showContextMenu';
+
 export const KEYBINDINGS_EDITOR_COMMAND_SEARCH = 'keybindings.editor.searchKeybindings';
 export const KEYBINDINGS_EDITOR_COMMAND_CLEAR_SEARCH_RESULTS = 'keybindings.editor.clearSearchResults';
 export const KEYBINDINGS_EDITOR_COMMAND_DEFINE = 'keybindings.editor.defineKeybinding';
diff --git a/src/vs/workbench/parts/preferences/common/preferencesContribution.ts b/src/vs/workbench/parts/preferences/common/preferencesContribution.ts
index a5adc6ab4b7..98a861c6bbb 100644
--- a/src/vs/workbench/parts/preferences/common/preferencesContribution.ts
+++ b/src/vs/workbench/parts/preferences/common/preferencesContribution.ts
@@ -6,7 +6,7 @@
 
 import { IModelService } from 'vs/editor/common/services/modelService';
 import { IModeService } from 'vs/editor/common/services/modeService';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { ITextModel } from 'vs/editor/common/model';
 import * as JSONContributionRegistry from 'vs/platform/jsonschemas/common/jsonContributionRegistry';
@@ -23,8 +23,8 @@ import { IEnvironmentService } from 'vs/platform/environment/common/environment'
 import { IEditorInput } from 'vs/workbench/common/editor';
 import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { isEqual } from 'vs/base/common/paths';
 import { isLinux } from 'vs/base/common/platform';
+import { isEqual } from 'vs/base/common/resources';
 
 const schemaRegistry = Registry.as<JSONContributionRegistry.IJSONContributionRegistry>(JSONContributionRegistry.Extensions.JSONContribution);
 
@@ -66,14 +66,14 @@ export class PreferencesContribution implements IWorkbenchContribution {
 	private onEditorOpening(editor: IEditorInput, options: IEditorOptions | ITextEditorOptions, group: IEditorGroup): IOpenEditorOverride {
 		const resource = editor.getResource();
 		if (
-			!resource || resource.scheme !== 'file' ||									// require a file path opening
-			!endsWith(resource.fsPath, 'settings.json') ||								// file must end in settings.json
+			!resource ||
+			!endsWith(resource.path, 'settings.json') ||								// resource must end in settings.json
 			!this.configurationService.getValue(DEFAULT_SETTINGS_EDITOR_SETTING)	// user has not disabled default settings editor
 		) {
 			return void 0;
 		}
 
-		// If the file resource was already opened before in the group, do not prevent
+		// If the resource was already opened before in the group, do not prevent
 		// the opening of that resource. Otherwise we would have the same settings
 		// opened twice (https://github.com/Microsoft/vscode/issues/36447)
 		if (group.isOpened(editor)) {
@@ -81,16 +81,16 @@ export class PreferencesContribution implements IWorkbenchContribution {
 		}
 
 		// Global User Settings File
-		if (isEqual(resource.fsPath, this.environmentService.appSettingsPath, !isLinux)) {
-			return { override: this.preferencesService.openGlobalSettings(options, group) };
+		if (isEqual(resource, URI.file(this.environmentService.appSettingsPath), !isLinux)) {
+			return { override: this.preferencesService.openGlobalSettings(true, options, group) };
 		}
 
 		// Single Folder Workspace Settings File
 		const state = this.workspaceService.getWorkbenchState();
 		if (state === WorkbenchState.FOLDER) {
 			const folders = this.workspaceService.getWorkspace().folders;
-			if (resource.fsPath === folders[0].toResource(FOLDER_SETTINGS_PATH).fsPath) {
-				return { override: this.preferencesService.openWorkspaceSettings(options, group) };
+			if (isEqual(resource, folders[0].toResource(FOLDER_SETTINGS_PATH))) {
+				return { override: this.preferencesService.openWorkspaceSettings(true, options, group) };
 			}
 		}
 
@@ -98,8 +98,8 @@ export class PreferencesContribution implements IWorkbenchContribution {
 		else if (state === WorkbenchState.WORKSPACE) {
 			const folders = this.workspaceService.getWorkspace().folders;
 			for (let i = 0; i < folders.length; i++) {
-				if (resource.fsPath === folders[i].toResource(FOLDER_SETTINGS_PATH).fsPath) {
-					return { override: this.preferencesService.openFolderSettings(folders[i].uri, options, group) };
+				if (isEqual(resource, folders[i].toResource(FOLDER_SETTINGS_PATH))) {
+					return { override: this.preferencesService.openFolderSettings(folders[i].uri, true, options, group) };
 				}
 			}
 		}
diff --git a/src/vs/workbench/parts/preferences/electron-browser/preferences.contribution.ts b/src/vs/workbench/parts/preferences/electron-browser/preferences.contribution.ts
index a9eaebd6a4c..06187cde93f 100644
--- a/src/vs/workbench/parts/preferences/electron-browser/preferences.contribution.ts
+++ b/src/vs/workbench/parts/preferences/electron-browser/preferences.contribution.ts
@@ -6,9 +6,9 @@
 
 import 'vs/css!../browser/media/preferences';
 import * as nls from 'vs/nls';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { Registry } from 'vs/platform/registry/common/platform';
-import { KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRegistry';
+import { KeybindingsRegistry, KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
 import { IWorkbenchActionRegistry, Extensions } from 'vs/workbench/common/actions';
 import { EditorInput, IEditorInputFactory, IEditorInputFactoryRegistry, Extensions as EditorInputExtensions } from 'vs/workbench/common/editor';
 import { SyncActionDescriptor, MenuRegistry, MenuId } from 'vs/platform/actions/common/actions';
@@ -19,10 +19,10 @@ import { PreferencesEditor } from 'vs/workbench/parts/preferences/browser/prefer
 import { SettingsEditor2 } from 'vs/workbench/parts/preferences/browser/settingsEditor2';
 import { DefaultPreferencesEditorInput, PreferencesEditorInput, KeybindingsEditorInput, SettingsEditor2Input } from 'vs/workbench/services/preferences/common/preferencesEditorInput';
 import { KeybindingsEditor } from 'vs/workbench/parts/preferences/browser/keybindingsEditor';
-import { OpenRawDefaultSettingsAction, OpenSettingsAction, OpenGlobalSettingsAction, OpenGlobalKeybindingsFileAction, OpenWorkspaceSettingsAction, OpenFolderSettingsAction, ConfigureLanguageBasedSettingsAction, OPEN_FOLDER_SETTINGS_COMMAND, OpenGlobalKeybindingsAction, OpenSettings2Action } from 'vs/workbench/parts/preferences/browser/preferencesActions';
+import { OpenDefaultKeybindingsFileAction, OpenRawDefaultSettingsAction, OpenSettingsAction, OpenGlobalSettingsAction, OpenGlobalKeybindingsFileAction, OpenWorkspaceSettingsAction, OpenFolderSettingsAction, ConfigureLanguageBasedSettingsAction, OPEN_FOLDER_SETTINGS_COMMAND, OpenGlobalKeybindingsAction, OpenSettings2Action, OpenSettingsJsonAction } from 'vs/workbench/parts/preferences/browser/preferencesActions';
 import {
 	IKeybindingsEditor, IPreferencesSearchService, CONTEXT_KEYBINDING_FOCUS, CONTEXT_KEYBINDINGS_EDITOR, CONTEXT_KEYBINDINGS_SEARCH_FOCUS, KEYBINDINGS_EDITOR_COMMAND_DEFINE, KEYBINDINGS_EDITOR_COMMAND_REMOVE, KEYBINDINGS_EDITOR_COMMAND_SEARCH,
-	KEYBINDINGS_EDITOR_COMMAND_COPY, KEYBINDINGS_EDITOR_COMMAND_RESET, KEYBINDINGS_EDITOR_COMMAND_COPY_COMMAND, KEYBINDINGS_EDITOR_COMMAND_SHOW_SIMILAR, KEYBINDINGS_EDITOR_COMMAND_FOCUS_KEYBINDINGS, KEYBINDINGS_EDITOR_COMMAND_CLEAR_SEARCH_RESULTS
+	KEYBINDINGS_EDITOR_COMMAND_COPY, KEYBINDINGS_EDITOR_COMMAND_RESET, KEYBINDINGS_EDITOR_COMMAND_COPY_COMMAND, KEYBINDINGS_EDITOR_COMMAND_SHOW_SIMILAR, KEYBINDINGS_EDITOR_COMMAND_FOCUS_KEYBINDINGS, KEYBINDINGS_EDITOR_COMMAND_CLEAR_SEARCH_RESULTS, SETTINGS_EDITOR_COMMAND_SEARCH, CONTEXT_SETTINGS_EDITOR, SETTINGS_EDITOR_COMMAND_FOCUS_FILE, CONTEXT_SETTINGS_SEARCH_FOCUS, SETTINGS_EDITOR_COMMAND_CLEAR_SEARCH_RESULTS, SETTINGS_EDITOR_COMMAND_FOCUS_NEXT_SETTING, SETTINGS_EDITOR_COMMAND_FOCUS_PREVIOUS_SETTING, SETTINGS_EDITOR_COMMAND_EDIT_FOCUSED_SETTING, SETTINGS_EDITOR_COMMAND_FOCUS_SETTINGS_FROM_SEARCH, CONTEXT_TOC_ROW_FOCUS, SETTINGS_EDITOR_COMMAND_FOCUS_SETTINGS_LIST, SETTINGS_EDITOR_COMMAND_SHOW_CONTEXT_MENU
 } from 'vs/workbench/parts/preferences/common/preferences';
 import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
 import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions';
@@ -34,6 +34,8 @@ import { IEditorRegistry, EditorDescriptor, Extensions as EditorExtensions } fro
 import { LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
 import { PreferencesSearchService } from 'vs/workbench/parts/preferences/electron-browser/preferencesSearch';
 import { IPreferencesService } from 'vs/workbench/services/preferences/common/preferences';
+import { Command } from 'vs/editor/browser/editorExtensions';
+import { Context as SuggestContext } from 'vs/editor/contrib/suggest/suggest';
 
 registerSingleton(IPreferencesSearchService, PreferencesSearchService);
 
@@ -147,17 +149,23 @@ class KeybindingsEditorInputFactory implements IEditorInputFactory {
 	}
 }
 
-class SettingsEditor2InputFactory implements IEditorInputFactory {
-
-	public serialize(editorInput: SettingsEditor2Input): string {
-		return JSON.stringify({});
-	}
-
-	public deserialize(instantiationService: IInstantiationService, serializedEditorInput: string): EditorInput {
-		return instantiationService.createInstance(SettingsEditor2Input);
-	}
+interface ISerializedSettingsEditor2EditorInput {
 }
 
+class SettingsEditor2InputFactory implements IEditorInputFactory {
+
+	public serialize(input: SettingsEditor2Input): string {
+		const serialized: ISerializedSettingsEditor2EditorInput = {
+		};
+
+		return JSON.stringify(serialized);
+	}
+
+	public deserialize(instantiationService: IInstantiationService, serializedEditorInput: string): SettingsEditor2Input {
+		return instantiationService.createInstance(
+			SettingsEditor2Input);
+	}
+}
 
 interface ISerializedDefaultPreferencesEditorInput {
 	resource: string;
@@ -191,15 +199,18 @@ const category = nls.localize('preferences', "Preferences");
 const registry = Registry.as<IWorkbenchActionRegistry>(Extensions.WorkbenchActions);
 registry.registerWorkbenchAction(new SyncActionDescriptor(OpenRawDefaultSettingsAction, OpenRawDefaultSettingsAction.ID, OpenRawDefaultSettingsAction.LABEL), 'Preferences: Open Raw Default Settings', category);
 registry.registerWorkbenchAction(new SyncActionDescriptor(OpenSettingsAction, OpenSettingsAction.ID, OpenSettingsAction.LABEL, { primary: KeyMod.CtrlCmd | KeyCode.US_COMMA }), 'Preferences: Open Settings', category);
-registry.registerWorkbenchAction(new SyncActionDescriptor(OpenSettings2Action, OpenSettings2Action.ID, OpenSettings2Action.LABEL), 'Preferences: Open Settings (Preview)', category);
+registry.registerWorkbenchAction(new SyncActionDescriptor(OpenSettingsJsonAction, OpenSettingsJsonAction.ID, OpenSettingsJsonAction.LABEL), 'Preferences: Open Settings (JSON)', category);
+registry.registerWorkbenchAction(new SyncActionDescriptor(OpenSettings2Action, OpenSettings2Action.ID, OpenSettings2Action.LABEL), 'Preferences: Open Settings (UI)', category);
 registry.registerWorkbenchAction(new SyncActionDescriptor(OpenGlobalSettingsAction, OpenGlobalSettingsAction.ID, OpenGlobalSettingsAction.LABEL), 'Preferences: Open User Settings', category);
+
 registry.registerWorkbenchAction(new SyncActionDescriptor(OpenGlobalKeybindingsAction, OpenGlobalKeybindingsAction.ID, OpenGlobalKeybindingsAction.LABEL, { primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_K, KeyMod.CtrlCmd | KeyCode.KEY_S) }), 'Preferences: Open Keyboard Shortcuts', category);
+registry.registerWorkbenchAction(new SyncActionDescriptor(OpenDefaultKeybindingsFileAction, OpenDefaultKeybindingsFileAction.ID, OpenDefaultKeybindingsFileAction.LABEL), 'Preferences: Open Default Keyboard Shortcuts File', category);
 registry.registerWorkbenchAction(new SyncActionDescriptor(OpenGlobalKeybindingsFileAction, OpenGlobalKeybindingsFileAction.ID, OpenGlobalKeybindingsFileAction.LABEL, { primary: null }), 'Preferences: Open Keyboard Shortcuts File', category);
 registry.registerWorkbenchAction(new SyncActionDescriptor(ConfigureLanguageBasedSettingsAction, ConfigureLanguageBasedSettingsAction.ID, ConfigureLanguageBasedSettingsAction.LABEL), 'Preferences: Configure Language Specific Settings...', category);
 
 KeybindingsRegistry.registerCommandAndKeybindingRule({
 	id: KEYBINDINGS_EDITOR_COMMAND_DEFINE,
-	weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
+	weight: KeybindingWeight.WorkbenchContrib,
 	when: ContextKeyExpr.and(CONTEXT_KEYBINDINGS_EDITOR, CONTEXT_KEYBINDING_FOCUS),
 	primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_K, KeyMod.CtrlCmd | KeyCode.KEY_K),
 	handler: (accessor, args: any) => {
@@ -210,7 +221,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 
 KeybindingsRegistry.registerCommandAndKeybindingRule({
 	id: KEYBINDINGS_EDITOR_COMMAND_REMOVE,
-	weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
+	weight: KeybindingWeight.WorkbenchContrib,
 	when: ContextKeyExpr.and(CONTEXT_KEYBINDINGS_EDITOR, CONTEXT_KEYBINDING_FOCUS),
 	primary: KeyCode.Delete,
 	mac: {
@@ -224,7 +235,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 
 KeybindingsRegistry.registerCommandAndKeybindingRule({
 	id: KEYBINDINGS_EDITOR_COMMAND_RESET,
-	weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
+	weight: KeybindingWeight.WorkbenchContrib,
 	when: ContextKeyExpr.and(CONTEXT_KEYBINDINGS_EDITOR, CONTEXT_KEYBINDING_FOCUS),
 	primary: null,
 	handler: (accessor, args: any) => {
@@ -235,15 +246,15 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 
 KeybindingsRegistry.registerCommandAndKeybindingRule({
 	id: KEYBINDINGS_EDITOR_COMMAND_SEARCH,
-	weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
+	weight: KeybindingWeight.WorkbenchContrib,
 	when: ContextKeyExpr.and(CONTEXT_KEYBINDINGS_EDITOR, CONTEXT_KEYBINDING_FOCUS),
 	primary: KeyMod.CtrlCmd | KeyCode.KEY_F,
-	handler: (accessor, args: any) => (accessor.get(IEditorService).activeControl as IKeybindingsEditor).search('')
+	handler: (accessor, args: any) => (accessor.get(IEditorService).activeControl as IKeybindingsEditor).focusSearch()
 });
 
 KeybindingsRegistry.registerCommandAndKeybindingRule({
 	id: KEYBINDINGS_EDITOR_COMMAND_SHOW_SIMILAR,
-	weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
+	weight: KeybindingWeight.WorkbenchContrib,
 	when: ContextKeyExpr.and(CONTEXT_KEYBINDINGS_EDITOR, CONTEXT_KEYBINDING_FOCUS),
 	primary: null,
 	handler: (accessor, args: any) => {
@@ -254,7 +265,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 
 KeybindingsRegistry.registerCommandAndKeybindingRule({
 	id: KEYBINDINGS_EDITOR_COMMAND_COPY,
-	weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
+	weight: KeybindingWeight.WorkbenchContrib,
 	when: ContextKeyExpr.and(CONTEXT_KEYBINDINGS_EDITOR, CONTEXT_KEYBINDING_FOCUS),
 	primary: KeyMod.CtrlCmd | KeyCode.KEY_C,
 	handler: (accessor, args: any) => {
@@ -265,7 +276,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 
 KeybindingsRegistry.registerCommandAndKeybindingRule({
 	id: KEYBINDINGS_EDITOR_COMMAND_COPY_COMMAND,
-	weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
+	weight: KeybindingWeight.WorkbenchContrib,
 	when: ContextKeyExpr.and(CONTEXT_KEYBINDINGS_EDITOR, CONTEXT_KEYBINDING_FOCUS),
 	primary: null,
 	handler: (accessor, args: any) => {
@@ -276,7 +287,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 
 KeybindingsRegistry.registerCommandAndKeybindingRule({
 	id: KEYBINDINGS_EDITOR_COMMAND_FOCUS_KEYBINDINGS,
-	weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
+	weight: KeybindingWeight.WorkbenchContrib,
 	when: ContextKeyExpr.and(CONTEXT_KEYBINDINGS_EDITOR, CONTEXT_KEYBINDINGS_SEARCH_FOCUS),
 	primary: KeyCode.DownArrow,
 	handler: (accessor, args: any) => {
@@ -287,7 +298,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 
 KeybindingsRegistry.registerCommandAndKeybindingRule({
 	id: KEYBINDINGS_EDITOR_COMMAND_CLEAR_SEARCH_RESULTS,
-	weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
+	weight: KeybindingWeight.WorkbenchContrib,
 	when: ContextKeyExpr.and(CONTEXT_KEYBINDINGS_EDITOR, CONTEXT_KEYBINDINGS_SEARCH_FOCUS),
 	primary: KeyCode.Escape,
 	handler: (accessor, args: any) => {
@@ -323,4 +334,174 @@ MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
 		title: `${category}: ${OpenWorkspaceSettingsAction.LABEL}`,
 	},
 	when: new RawContextKey<string>('workbenchState', '').notEqualsTo('empty')
-});
\ No newline at end of file
+});
+
+abstract class SettingsCommand extends Command {
+
+	protected getPreferencesEditor(accessor: ServicesAccessor): PreferencesEditor | SettingsEditor2 {
+		const activeControl = accessor.get(IEditorService).activeControl;
+		if (activeControl instanceof PreferencesEditor || activeControl instanceof SettingsEditor2) {
+			return activeControl;
+		}
+
+		return null;
+	}
+
+}
+class StartSearchDefaultSettingsCommand extends SettingsCommand {
+
+	public runCommand(accessor: ServicesAccessor, args: any): void {
+		const preferencesEditor = this.getPreferencesEditor(accessor);
+		if (preferencesEditor) {
+			preferencesEditor.focusSearch();
+		}
+	}
+}
+const startSearchCommand = new StartSearchDefaultSettingsCommand({
+	id: SETTINGS_EDITOR_COMMAND_SEARCH,
+	precondition: ContextKeyExpr.and(CONTEXT_SETTINGS_EDITOR),
+	kbOpts: { primary: KeyMod.CtrlCmd | KeyCode.KEY_F, weight: KeybindingWeight.EditorContrib }
+});
+startSearchCommand.register();
+
+class ClearSearchResultsCommand extends SettingsCommand {
+
+	public runCommand(accessor: ServicesAccessor, args: any): void {
+		const preferencesEditor = this.getPreferencesEditor(accessor);
+		if (preferencesEditor) {
+			preferencesEditor.clearSearchResults();
+		}
+	}
+}
+const clearSearchResultsCommand = new ClearSearchResultsCommand({
+	id: SETTINGS_EDITOR_COMMAND_CLEAR_SEARCH_RESULTS,
+	precondition: CONTEXT_SETTINGS_SEARCH_FOCUS,
+	kbOpts: { primary: KeyCode.Escape, weight: KeybindingWeight.EditorContrib }
+});
+clearSearchResultsCommand.register();
+
+class FocusSettingsFileEditorCommand extends SettingsCommand {
+
+	public runCommand(accessor: ServicesAccessor, args: any): void {
+		const preferencesEditor = this.getPreferencesEditor(accessor);
+		if (preferencesEditor instanceof PreferencesEditor) {
+			preferencesEditor.focusSettingsFileEditor();
+		} else {
+			preferencesEditor.focusSettings();
+		}
+	}
+}
+const focusSettingsFileEditorCommand = new FocusSettingsFileEditorCommand({
+	id: SETTINGS_EDITOR_COMMAND_FOCUS_FILE,
+	precondition: ContextKeyExpr.and(CONTEXT_SETTINGS_SEARCH_FOCUS, SuggestContext.Visible.toNegated()),
+	kbOpts: { primary: KeyCode.DownArrow, weight: KeybindingWeight.EditorContrib }
+});
+focusSettingsFileEditorCommand.register();
+
+const focusSettingsFromSearchCommand = new FocusSettingsFileEditorCommand({
+	id: SETTINGS_EDITOR_COMMAND_FOCUS_SETTINGS_FROM_SEARCH,
+	precondition: ContextKeyExpr.and(CONTEXT_SETTINGS_SEARCH_FOCUS, SuggestContext.Visible.toNegated()),
+	kbOpts: { primary: KeyCode.DownArrow, weight: KeybindingWeight.WorkbenchContrib }
+});
+focusSettingsFromSearchCommand.register();
+
+class FocusNextSearchResultCommand extends SettingsCommand {
+
+	public runCommand(accessor: ServicesAccessor, args: any): void {
+		const preferencesEditor = this.getPreferencesEditor(accessor);
+		if (preferencesEditor instanceof PreferencesEditor) {
+			preferencesEditor.focusNextResult();
+		}
+	}
+}
+const focusNextSearchResultCommand = new FocusNextSearchResultCommand({
+	id: SETTINGS_EDITOR_COMMAND_FOCUS_NEXT_SETTING,
+	precondition: CONTEXT_SETTINGS_SEARCH_FOCUS,
+	kbOpts: { primary: KeyCode.Enter, weight: KeybindingWeight.EditorContrib }
+});
+focusNextSearchResultCommand.register();
+
+class FocusPreviousSearchResultCommand extends SettingsCommand {
+
+	public runCommand(accessor: ServicesAccessor, args: any): void {
+		const preferencesEditor = this.getPreferencesEditor(accessor);
+		if (preferencesEditor instanceof PreferencesEditor) {
+			preferencesEditor.focusPreviousResult();
+		}
+	}
+}
+const focusPreviousSearchResultCommand = new FocusPreviousSearchResultCommand({
+	id: SETTINGS_EDITOR_COMMAND_FOCUS_PREVIOUS_SETTING,
+	precondition: CONTEXT_SETTINGS_SEARCH_FOCUS,
+	kbOpts: { primary: KeyMod.Shift | KeyCode.Enter, weight: KeybindingWeight.EditorContrib }
+});
+focusPreviousSearchResultCommand.register();
+
+class EditFocusedSettingCommand extends SettingsCommand {
+
+	public runCommand(accessor: ServicesAccessor, args: any): void {
+		const preferencesEditor = this.getPreferencesEditor(accessor);
+		if (preferencesEditor instanceof PreferencesEditor) {
+			preferencesEditor.editFocusedPreference();
+		}
+	}
+}
+const editFocusedSettingCommand = new EditFocusedSettingCommand({
+	id: SETTINGS_EDITOR_COMMAND_EDIT_FOCUSED_SETTING,
+	precondition: CONTEXT_SETTINGS_SEARCH_FOCUS,
+	kbOpts: { primary: KeyMod.CtrlCmd | KeyCode.US_DOT, weight: KeybindingWeight.EditorContrib }
+});
+editFocusedSettingCommand.register();
+
+class FocusSettingsListCommand extends SettingsCommand {
+
+	public runCommand(accessor: ServicesAccessor, args: any): void {
+		const preferencesEditor = this.getPreferencesEditor(accessor);
+		if (preferencesEditor instanceof SettingsEditor2) {
+			preferencesEditor.focusSettings();
+		}
+	}
+}
+
+const focusSettingsListCommand = new FocusSettingsListCommand({
+	id: SETTINGS_EDITOR_COMMAND_FOCUS_SETTINGS_LIST,
+	precondition: ContextKeyExpr.and(CONTEXT_SETTINGS_EDITOR, CONTEXT_TOC_ROW_FOCUS),
+	kbOpts: { primary: KeyCode.Enter, weight: KeybindingWeight.WorkbenchContrib }
+});
+focusSettingsListCommand.register();
+
+class ShowContextMenuCommand extends SettingsCommand {
+	public runCommand(accessor: ServicesAccessor, args: any): void {
+		const preferencesEditor = this.getPreferencesEditor(accessor);
+		if (preferencesEditor instanceof SettingsEditor2) {
+			preferencesEditor.showContextMenu();
+		}
+	}
+}
+
+const showContextMenuCommand = new ShowContextMenuCommand({
+	id: SETTINGS_EDITOR_COMMAND_SHOW_CONTEXT_MENU,
+	precondition: ContextKeyExpr.and(CONTEXT_SETTINGS_EDITOR),
+	kbOpts: { primary: KeyMod.Shift | KeyCode.F9, weight: KeybindingWeight.WorkbenchContrib }
+});
+showContextMenuCommand.register();
+
+// Preferences menu
+
+MenuRegistry.appendMenuItem(MenuId.MenubarPreferencesMenu, {
+	group: '1_settings',
+	command: {
+		id: OpenSettingsAction.ID,
+		title: nls.localize({ key: 'miOpenSettings', comment: ['&& denotes a mnemonic'] }, "&&Settings")
+	},
+	order: 1
+});
+
+MenuRegistry.appendMenuItem(MenuId.MenubarPreferencesMenu, {
+	group: '2_keybindings',
+	command: {
+		id: OpenGlobalKeybindingsAction.ID,
+		title: nls.localize({ key: 'miOpenKeymap', comment: ['&& denotes a mnemonic'] }, "&&Keyboard Shortcuts")
+	},
+	order: 1
+});
diff --git a/src/vs/workbench/parts/preferences/electron-browser/preferencesSearch.ts b/src/vs/workbench/parts/preferences/electron-browser/preferencesSearch.ts
index 3b40c62f656..9ff55ccdc9c 100644
--- a/src/vs/workbench/parts/preferences/electron-browser/preferencesSearch.ts
+++ b/src/vs/workbench/parts/preferences/electron-browser/preferencesSearch.ts
@@ -21,6 +21,8 @@ import { Disposable } from 'vs/base/common/lifecycle';
 import { IExtensionManagementService, LocalExtensionType, ILocalExtension, IExtensionEnablementService } from 'vs/platform/extensionManagement/common/extensionManagement';
 import { ILogService } from 'vs/platform/log/common/log';
 import { IPreferencesSearchService, ISearchProvider, IWorkbenchSettingsConfiguration } from 'vs/workbench/parts/preferences/common/preferences';
+import { CancellationToken } from 'vs/base/common/cancellation';
+import { canceled } from 'vs/base/common/errors';
 
 export interface IEndpointDetails {
 	urlBase: string;
@@ -90,6 +92,9 @@ export class PreferencesSearchService extends Disposable implements IPreferences
 }
 
 export class LocalSearchProvider implements ISearchProvider {
+	static readonly EXACT_MATCH_SCORE = 10000;
+	static readonly START_SCORE = 1000;
+
 	constructor(private _filter: string) {
 		// Remove " and : which are likely to be copypasted as part of a setting name.
 		// Leave other special characters which the user might want to search for.
@@ -99,30 +104,41 @@ export class LocalSearchProvider implements ISearchProvider {
 			.trim();
 	}
 
-	searchModel(preferencesModel: ISettingsEditorModel): TPromise<ISearchResult> {
+	searchModel(preferencesModel: ISettingsEditorModel, token?: CancellationToken): TPromise<ISearchResult> {
 		if (!this._filter) {
 			return TPromise.wrap(null);
 		}
 
-		let score = 1000; // Sort is not stable
+		let orderedScore = LocalSearchProvider.START_SCORE; // Sort is not stable
 		const settingMatcher = (setting: ISetting) => {
 			const matches = new SettingMatches(this._filter, setting, true, true, (filter, setting) => preferencesModel.findValueMatches(filter, setting)).matches;
+			const score = this._filter === setting.key ?
+				LocalSearchProvider.EXACT_MATCH_SCORE :
+				orderedScore--;
+
 			return matches && matches.length ?
 				{
 					matches,
-					score: score--
+					score
 				} :
 				null;
 		};
 
 		const filterMatches = preferencesModel.filterSettings(this._filter, this.getGroupFilter(this._filter), settingMatcher);
-		return TPromise.wrap({
-			filterMatches
-		});
+		if (filterMatches[0] && filterMatches[0].score === LocalSearchProvider.EXACT_MATCH_SCORE) {
+			return TPromise.wrap({
+				filterMatches: filterMatches.slice(0, 1),
+				exactMatch: true
+			});
+		} else {
+			return TPromise.wrap({
+				filterMatches
+			});
+		}
 	}
 
 	private getGroupFilter(filter: string): IGroupFilter {
-		const regex = strings.createRegExp(this._filter, false, { global: true });
+		const regex = strings.createRegExp(filter, false, { global: true });
 		return (group: ISettingsGroup) => {
 			return regex.test(group.title);
 		};
@@ -144,8 +160,9 @@ interface IBingRequestDetails {
 
 class RemoteSearchProvider implements ISearchProvider {
 	// Must keep extension filter size under 8kb. 42 filters puts us there.
-	private static MAX_REQUEST_FILTERS = 42;
-	private static MAX_REQUESTS = 10;
+	private static readonly MAX_REQUEST_FILTERS = 42;
+	private static readonly MAX_REQUESTS = 10;
+	private static readonly NEW_EXTENSIONS_MIN_SCORE = 1;
 
 	private _remoteSearchP: TPromise<IFilterMetadata>;
 
@@ -155,36 +172,50 @@ class RemoteSearchProvider implements ISearchProvider {
 		@ILogService private logService: ILogService
 	) {
 		this._remoteSearchP = this.options.filter ?
-			this.getSettingsForFilter(this.options.filter) :
+			TPromise.wrap(this.getSettingsForFilter(this.options.filter)) :
 			TPromise.wrap(null);
 	}
 
-	searchModel(preferencesModel: ISettingsEditorModel): TPromise<ISearchResult> {
+	searchModel(preferencesModel: ISettingsEditorModel, token?: CancellationToken): TPromise<ISearchResult> {
 		return this._remoteSearchP.then(remoteResult => {
 			if (!remoteResult) {
 				return null;
 			}
 
+			if (token && token.isCancellationRequested) {
+				throw canceled();
+			}
+
 			const resultKeys = Object.keys(remoteResult.scoredResults);
 			const highScoreKey = top(resultKeys, (a, b) => remoteResult.scoredResults[b].score - remoteResult.scoredResults[a].score, 1)[0];
 			const highScore = highScoreKey ? remoteResult.scoredResults[highScoreKey].score : 0;
 			const minScore = highScore / 5;
 			if (this.options.newExtensionsOnly) {
-				const passingScoreKeys = resultKeys.filter(k => remoteResult.scoredResults[k].score >= minScore);
-				const filterMatches: ISettingMatch[] = passingScoreKeys.map(k => {
-					const remoteSetting = remoteResult.scoredResults[k];
-					const setting = remoteSettingToISetting(remoteSetting);
-					return <ISettingMatch>{
-						setting,
-						score: remoteSetting.score,
-						matches: [] // TODO
+				return this.installedExtensions.then(installedExtensions => {
+					const newExtsMinScore = Math.max(RemoteSearchProvider.NEW_EXTENSIONS_MIN_SCORE, minScore);
+					const passingScoreKeys = resultKeys
+						.filter(k => {
+							const result = remoteResult.scoredResults[k];
+							const resultExtId = (result.extensionPublisher + '.' + result.extensionName).toLowerCase();
+							return !installedExtensions.some(ext => ext.galleryIdentifier.id.toLowerCase() === resultExtId);
+						})
+						.filter(k => remoteResult.scoredResults[k].score >= newExtsMinScore);
+
+					const filterMatches: ISettingMatch[] = passingScoreKeys.map(k => {
+						const remoteSetting = remoteResult.scoredResults[k];
+						const setting = remoteSettingToISetting(remoteSetting);
+						return <ISettingMatch>{
+							setting,
+							score: remoteSetting.score,
+							matches: [] // TODO
+						};
+					});
+
+					return <ISearchResult>{
+						filterMatches,
+						metadata: remoteResult
 					};
 				});
-
-				return <ISearchResult>{
-					filterMatches,
-					metadata: remoteResult
-				};
 			} else {
 				const settingMatcher = this.getRemoteSettingMatcher(remoteResult.scoredResults, minScore, preferencesModel);
 				const filterMatches = preferencesModel.filterSettings(this.options.filter, group => null, settingMatcher);
@@ -196,7 +227,7 @@ class RemoteSearchProvider implements ISearchProvider {
 		});
 	}
 
-	private async getSettingsForFilter(filter: string): TPromise<IFilterMetadata> {
+	private async getSettingsForFilter(filter: string): Promise<IFilterMetadata> {
 		const allRequestDetails: IBingRequestDetails[] = [];
 
 		// Only send MAX_REQUESTS requests in total just to keep it sane
@@ -240,7 +271,7 @@ class RemoteSearchProvider implements ISearchProvider {
 				'api-key': this.options.endpoint.key
 			},
 			timeout: 5000
-		}).then(context => {
+		}, CancellationToken.None).then(context => {
 			if (context.res.statusCode >= 300) {
 				throw new Error(`${details} returned status code: ${context.res.statusCode}`);
 			}
@@ -308,7 +339,7 @@ class RemoteSearchProvider implements ISearchProvider {
 		};
 	}
 
-	private async prepareRequest(query: string, filterPage = 0): TPromise<IBingRequestDetails> {
+	private async prepareRequest(query: string, filterPage = 0): Promise<IBingRequestDetails> {
 		const verbatimQuery = query;
 		query = escapeSpecialChars(query);
 		const boost = 10;
@@ -391,6 +422,7 @@ function escapeSpecialChars(query: string): string {
 function remoteSettingToISetting(remoteSetting: IRemoteSetting): IExtensionSetting {
 	return {
 		description: remoteSetting.description.split('\n'),
+		descriptionIsMarkdown: false,
 		descriptionRanges: null,
 		key: remoteSetting.key,
 		keyRange: null,
@@ -501,6 +533,16 @@ class SettingMatches {
 	}
 
 	private toKeyRange(setting: ISetting, match: IMatch): IRange {
+		if (!setting.keyRange) {
+			// No source range? Return fake range, don't care
+			return {
+				startLineNumber: 0,
+				startColumn: 0,
+				endLineNumber: 0,
+				endColumn: 0,
+			};
+		}
+
 		return {
 			startLineNumber: setting.keyRange.startLineNumber,
 			startColumn: setting.keyRange.startColumn + match.start,
@@ -510,6 +552,16 @@ class SettingMatches {
 	}
 
 	private toDescriptionRange(setting: ISetting, match: IMatch, lineIndex: number): IRange {
+		if (!setting.keyRange) {
+			// No source range? Return fake range, don't care
+			return {
+				startLineNumber: 0,
+				startColumn: 0,
+				endLineNumber: 0,
+				endColumn: 0,
+			};
+		}
+
 		return {
 			startLineNumber: setting.descriptionRanges[lineIndex].startLineNumber,
 			startColumn: setting.descriptionRanges[lineIndex].startColumn + match.start,
@@ -519,6 +571,16 @@ class SettingMatches {
 	}
 
 	private toValueRange(setting: ISetting, match: IMatch): IRange {
+		if (!setting.keyRange) {
+			// No source range? Return fake range, don't care
+			return {
+				startLineNumber: 0,
+				startColumn: 0,
+				endLineNumber: 0,
+				endColumn: 0,
+			};
+		}
+
 		return {
 			startLineNumber: setting.valueRange.startLineNumber,
 			startColumn: setting.valueRange.startColumn + match.start + 1,
@@ -526,4 +588,4 @@ class SettingMatches {
 			endColumn: setting.valueRange.startColumn + match.end + 1
 		};
 	}
-}
\ No newline at end of file
+}
diff --git a/src/vs/workbench/parts/preferences/test/browser/settingsTree.test.ts b/src/vs/workbench/parts/preferences/test/browser/settingsTree.test.ts
deleted file mode 100644
index a81ed4ab187..00000000000
--- a/src/vs/workbench/parts/preferences/test/browser/settingsTree.test.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-'use strict';
-
-import * as assert from 'assert';
-import { settingKeyToDisplayFormat } from 'vs/workbench/parts/preferences/browser/settingsTree';
-
-suite('SettingsTree', () => {
-	test('settingKeyToDisplayFormat', () => {
-		assert.deepEqual(
-			settingKeyToDisplayFormat('foo.bar'),
-			{
-				category: 'Foo',
-				label: 'Bar'
-			});
-
-		assert.deepEqual(
-			settingKeyToDisplayFormat('foo.bar.etc'),
-			{
-				category: 'Foo.Bar',
-				label: 'Etc'
-			});
-
-		assert.deepEqual(
-			settingKeyToDisplayFormat('fooBar.etcSomething'),
-			{
-				category: 'Foo Bar',
-				label: 'Etc Something'
-			});
-
-		assert.deepEqual(
-			settingKeyToDisplayFormat('foo'),
-			{
-				category: '',
-				label: 'Foo'
-			});
-	});
-});
\ No newline at end of file
diff --git a/src/vs/workbench/parts/preferences/test/browser/settingsTreeModels.test.ts b/src/vs/workbench/parts/preferences/test/browser/settingsTreeModels.test.ts
new file mode 100644
index 00000000000..122f23a970f
--- /dev/null
+++ b/src/vs/workbench/parts/preferences/test/browser/settingsTreeModels.test.ts
@@ -0,0 +1,180 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+import * as assert from 'assert';
+import { settingKeyToDisplayFormat, parseQuery, IParsedQuery } from 'vs/workbench/parts/preferences/browser/settingsTreeModels';
+
+suite('SettingsTree', () => {
+	test('settingKeyToDisplayFormat', () => {
+		assert.deepEqual(
+			settingKeyToDisplayFormat('foo.bar'),
+			{
+				category: 'Foo',
+				label: 'Bar'
+			});
+
+		assert.deepEqual(
+			settingKeyToDisplayFormat('foo.bar.etc'),
+			{
+				category: 'Foo › Bar',
+				label: 'Etc'
+			});
+
+		assert.deepEqual(
+			settingKeyToDisplayFormat('fooBar.etcSomething'),
+			{
+				category: 'Foo Bar',
+				label: 'Etc Something'
+			});
+
+		assert.deepEqual(
+			settingKeyToDisplayFormat('foo'),
+			{
+				category: '',
+				label: 'Foo'
+			});
+	});
+
+	test('settingKeyToDisplayFormat - with category', () => {
+		assert.deepEqual(
+			settingKeyToDisplayFormat('foo.bar', 'foo'),
+			{
+				category: '',
+				label: 'Bar'
+			});
+
+		assert.deepEqual(
+			settingKeyToDisplayFormat('disableligatures.ligatures', 'disableligatures'),
+			{
+				category: '',
+				label: 'Ligatures'
+			});
+
+		assert.deepEqual(
+			settingKeyToDisplayFormat('foo.bar.etc', 'foo'),
+			{
+				category: 'Bar',
+				label: 'Etc'
+			});
+
+		assert.deepEqual(
+			settingKeyToDisplayFormat('fooBar.etcSomething', 'foo'),
+			{
+				category: 'Foo Bar',
+				label: 'Etc Something'
+			});
+
+		assert.deepEqual(
+			settingKeyToDisplayFormat('foo.bar.etc', 'foo/bar'),
+			{
+				category: '',
+				label: 'Etc'
+			});
+
+		assert.deepEqual(
+			settingKeyToDisplayFormat('foo.bar.etc', 'something/foo'),
+			{
+				category: 'Bar',
+				label: 'Etc'
+			});
+
+		assert.deepEqual(
+			settingKeyToDisplayFormat('bar.etc', 'something.bar'),
+			{
+				category: '',
+				label: 'Etc'
+			});
+
+		assert.deepEqual(
+			settingKeyToDisplayFormat('fooBar.etc', 'fooBar'),
+			{
+				category: '',
+				label: 'Etc'
+			});
+
+
+		assert.deepEqual(
+			settingKeyToDisplayFormat('fooBar.somethingElse.etc', 'fooBar'),
+			{
+				category: 'Something Else',
+				label: 'Etc'
+			});
+	});
+
+	test('parseQuery', () => {
+		function testParseQuery(input: string, expected: IParsedQuery) {
+			assert.deepEqual(
+				parseQuery(input),
+				expected,
+				input
+			);
+		}
+
+		testParseQuery(
+			'',
+			<IParsedQuery>{
+				tags: [],
+				query: ''
+			});
+
+		testParseQuery(
+			'@modified',
+			<IParsedQuery>{
+				tags: ['modified'],
+				query: ''
+			});
+
+		testParseQuery(
+			'@tag:foo',
+			<IParsedQuery>{
+				tags: ['foo'],
+				query: ''
+			});
+
+		testParseQuery(
+			'@modified foo',
+			<IParsedQuery>{
+				tags: ['modified'],
+				query: 'foo'
+			});
+
+		testParseQuery(
+			'@tag:foo @modified',
+			<IParsedQuery>{
+				tags: ['foo', 'modified'],
+				query: ''
+			});
+
+		testParseQuery(
+			'@tag:foo @modified my query',
+			<IParsedQuery>{
+				tags: ['foo', 'modified'],
+				query: 'my query'
+			});
+
+		testParseQuery(
+			'test @modified query',
+			<IParsedQuery>{
+				tags: ['modified'],
+				query: 'test  query'
+			});
+
+		testParseQuery(
+			'test @modified',
+			<IParsedQuery>{
+				tags: ['modified'],
+				query: 'test'
+			});
+
+		testParseQuery(
+			'query has @ for some reason',
+			<IParsedQuery>{
+				tags: [],
+				query: 'query has @ for some reason'
+			});
+	});
+});
\ No newline at end of file
diff --git a/src/vs/workbench/parts/quickopen/browser/commandsHandler.ts b/src/vs/workbench/parts/quickopen/browser/commandsHandler.ts
index 0e1dd8af193..f3a7c6974e6 100644
--- a/src/vs/workbench/parts/quickopen/browser/commandsHandler.ts
+++ b/src/vs/workbench/parts/quickopen/browser/commandsHandler.ts
@@ -33,6 +33,8 @@ import { IEditorService } from 'vs/workbench/services/editor/common/editorServic
 import { isPromiseCanceledError } from 'vs/base/common/errors';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
 import { INotificationService } from 'vs/platform/notification/common/notification';
+import { CancellationToken } from 'vs/base/common/cancellation';
+import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
 
 export const ALL_COMMANDS_PREFIX = '>';
 
@@ -58,7 +60,7 @@ function resolveCommandHistory(configurationService: IConfigurationService): num
 
 class CommandsHistory {
 
-	public static readonly DEFAULT_COMMANDS_HISTORY_LENGTH = 50;
+	static readonly DEFAULT_COMMANDS_HISTORY_LENGTH = 50;
 
 	private static readonly PREF_KEY_CACHE = 'commandPalette.mru.cache';
 	private static readonly PREF_KEY_COUNTER = 'commandPalette.mru.counter';
@@ -105,6 +107,7 @@ class CommandsHistory {
 			}
 			entries.forEach(entry => commandHistory.set(entry.key, entry.value));
 		}
+
 		commandCounter = this.storageService.getInteger(CommandsHistory.PREF_KEY_COUNTER, void 0, commandCounter);
 	}
 
@@ -114,26 +117,26 @@ class CommandsHistory {
 	}
 
 	private save(): void {
-		let serializedCache: ISerializedCommandHistory = { usesLRU: true, entries: [] };
+		const serializedCache: ISerializedCommandHistory = { usesLRU: true, entries: [] };
 		commandHistory.forEach((value, key) => serializedCache.entries.push({ key, value }));
+
 		this.storageService.store(CommandsHistory.PREF_KEY_CACHE, JSON.stringify(serializedCache));
 		this.storageService.store(CommandsHistory.PREF_KEY_COUNTER, commandCounter);
 	}
 
-	public push(commandId: string): void {
-		// set counter to command
-		commandHistory.set(commandId, commandCounter++);
+	push(commandId: string): void {
+		commandHistory.set(commandId, commandCounter++); // set counter to command
 	}
 
-	public peek(commandId: string): number {
+	peek(commandId: string): number {
 		return commandHistory.peek(commandId);
 	}
 }
 
 export class ShowAllCommandsAction extends Action {
 
-	public static readonly ID = 'workbench.action.showCommands';
-	public static readonly LABEL = nls.localize('showTriggerActions', "Show All Commands");
+	static readonly ID = 'workbench.action.showCommands';
+	static readonly LABEL = nls.localize('showTriggerActions', "Show All Commands");
 
 	constructor(
 		id: string,
@@ -144,7 +147,7 @@ export class ShowAllCommandsAction extends Action {
 		super(id, label);
 	}
 
-	public run(context?: any): TPromise<void> {
+	run(context?: any): TPromise<void> {
 		const config = <IWorkbenchQuickOpenConfiguration>this.configurationService.getValue();
 		const restoreInput = config.workbench && config.workbench.commandPalette && config.workbench.commandPalette.preserveInput === true;
 
@@ -162,8 +165,8 @@ export class ShowAllCommandsAction extends Action {
 
 export class ClearCommandHistoryAction extends Action {
 
-	public static readonly ID = 'workbench.action.clearCommandHistory';
-	public static readonly LABEL = nls.localize('clearCommandHistory', "Clear Command History");
+	static readonly ID = 'workbench.action.clearCommandHistory';
+	static readonly LABEL = nls.localize('clearCommandHistory', "Clear Command History");
 
 	constructor(
 		id: string,
@@ -173,7 +176,7 @@ export class ClearCommandHistoryAction extends Action {
 		super(id, label);
 	}
 
-	public run(context?: any): TPromise<void> {
+	run(context?: any): TPromise<void> {
 		const commandHistoryLength = resolveCommandHistory(this.configurationService);
 		if (commandHistoryLength > 0) {
 			commandHistory = new LRUCache<string, number>(commandHistoryLength);
@@ -199,7 +202,7 @@ class CommandPaletteEditorAction extends EditorAction {
 		});
 	}
 
-	public run(accessor: ServicesAccessor, editor: ICodeEditor): TPromise<void> {
+	run(accessor: ServicesAccessor, editor: ICodeEditor): TPromise<void> {
 		const quickOpenService = accessor.get(IQuickOpenService);
 
 		// Show with prefix
@@ -239,35 +242,35 @@ abstract class BaseCommandEntry extends QuickOpenEntryGroup {
 		this.setHighlights(highlights.label, null, highlights.alias);
 	}
 
-	public getCommandId(): string {
+	getCommandId(): string {
 		return this.commandId;
 	}
 
-	public getLabel(): string {
+	getLabel(): string {
 		return this.label;
 	}
 
-	public getSortLabel(): string {
+	getSortLabel(): string {
 		return this.labelLowercase;
 	}
 
-	public getDescription(): string {
+	getDescription(): string {
 		return this.description;
 	}
 
-	public setDescription(description: string): void {
+	setDescription(description: string): void {
 		this.description = description;
 	}
 
-	public getKeybinding(): ResolvedKeybinding {
+	getKeybinding(): ResolvedKeybinding {
 		return this.keybinding;
 	}
 
-	public getDetail(): string {
+	getDetail(): string {
 		return this.alias;
 	}
 
-	public getAriaLabel(): string {
+	getAriaLabel(): string {
 		if (this.keybindingAriaLabel) {
 			return nls.localize('entryAriaLabelWithKey', "{0}, {1}, commands", this.getLabel(), this.keybindingAriaLabel);
 		}
@@ -275,7 +278,7 @@ abstract class BaseCommandEntry extends QuickOpenEntryGroup {
 		return nls.localize('entryAriaLabel', "{0}, commands", this.getLabel());
 	}
 
-	public run(mode: Mode, context: IEntryRunContext): boolean {
+	run(mode: Mode, context: IEntryRunContext): boolean {
 		if (mode === Mode.OPEN) {
 			this.runAction(this.getAction());
 
@@ -293,7 +296,7 @@ abstract class BaseCommandEntry extends QuickOpenEntryGroup {
 		this.onBeforeRun(this.commandId);
 
 		// Use a timeout to give the quick open widget a chance to close itself first
-		TPromise.timeout(50).done(() => {
+		setTimeout(() => {
 			if (action && (!(action instanceof Action) || action.enabled)) {
 				try {
 					/* __GDPR__
@@ -303,7 +306,7 @@ abstract class BaseCommandEntry extends QuickOpenEntryGroup {
 						}
 					*/
 					this.telemetryService.publicLog('workbenchActionExecuted', { id: action.id, from: 'quick open' });
-					(action.run() || TPromise.as(null)).done(() => {
+					(action.run() || TPromise.as(null)).then(() => {
 						if (action instanceof Action) {
 							action.dispose();
 						}
@@ -314,7 +317,7 @@ abstract class BaseCommandEntry extends QuickOpenEntryGroup {
 			} else {
 				this.notificationService.info(nls.localize('actionNotEnabled', "Command '{0}' is not enabled in the current context.", this.getLabel()));
 			}
-		}, err => this.onError(err));
+		}, 50);
 	}
 
 	private onError(error?: Error): void {
@@ -372,7 +375,7 @@ const wordFilter = or(matchesPrefix, matchesWords, matchesContiguousSubString);
 
 export class CommandsHandler extends QuickOpenHandler {
 
-	public static readonly ID = 'workbench.picker.commands';
+	static readonly ID = 'workbench.picker.commands';
 
 	private lastSearchValue: string;
 	private commandHistoryEnabled: boolean;
@@ -383,7 +386,8 @@ export class CommandsHandler extends QuickOpenHandler {
 		@IInstantiationService private instantiationService: IInstantiationService,
 		@IKeybindingService private keybindingService: IKeybindingService,
 		@IMenuService private menuService: IMenuService,
-		@IConfigurationService private configurationService: IConfigurationService
+		@IConfigurationService private configurationService: IConfigurationService,
+		@IExtensionService private extensionService: IExtensionService
 	) {
 		super();
 
@@ -397,78 +401,87 @@ export class CommandsHandler extends QuickOpenHandler {
 		this.commandHistoryEnabled = resolveCommandHistory(this.configurationService) > 0;
 	}
 
-	public getResults(searchValue: string): TPromise<QuickOpenModel> {
-		searchValue = searchValue.trim();
-		this.lastSearchValue = searchValue;
+	getResults(searchValue: string, token: CancellationToken): TPromise<QuickOpenModel> {
 
-		// Editor Actions
-		const activeTextEditorWidget = this.editorService.activeTextEditorWidget;
-		let editorActions: IEditorAction[] = [];
-		if (activeTextEditorWidget && types.isFunction(activeTextEditorWidget.getSupportedActions)) {
-			editorActions = activeTextEditorWidget.getSupportedActions();
-		}
-
-		const editorEntries = this.editorActionsToEntries(editorActions, searchValue);
-
-		// Other Actions
-		const menu = this.editorService.invokeWithinEditorContext(accessor => this.menuService.createMenu(MenuId.CommandPalette, accessor.get(IContextKeyService)));
-		const menuActions = menu.getActions().reduce((r, [, actions]) => [...r, ...actions], <MenuItemAction[]>[]);
-		const commandEntries = this.menuItemActionsToEntries(menuActions, searchValue);
-
-		// Concat
-		let entries = [...editorEntries, ...commandEntries];
-
-		// Remove duplicates
-		entries = arrays.distinct(entries, entry => `${entry.getLabel()}${entry.getGroupLabel()}${entry.getCommandId()}`);
-
-		// Handle label clashes
-		const commandLabels = new Set<string>();
-		entries.forEach(entry => {
-			const commandLabel = `${entry.getLabel()}${entry.getGroupLabel()}`;
-			if (commandLabels.has(commandLabel)) {
-				entry.setDescription(entry.getCommandId());
-			} else {
-				commandLabels.add(commandLabel);
-			}
-		});
-
-		// Sort by MRU order and fallback to name otherwie
-		entries = entries.sort((elementA, elementB) => {
-			const counterA = this.commandsHistory.peek(elementA.getCommandId());
-			const counterB = this.commandsHistory.peek(elementB.getCommandId());
-
-			if (counterA && counterB) {
-				return counterA > counterB ? -1 : 1; // use more recently used command before older
+		// wait for extensions being registered to cover all commands
+		// also from extensions
+		return this.extensionService.whenInstalledExtensionsRegistered().then(() => {
+			if (token.isCancellationRequested) {
+				return new QuickOpenModel([]);
 			}
 
-			if (counterA) {
-				return -1; // first command was used, so it wins over the non used one
+			searchValue = searchValue.trim();
+			this.lastSearchValue = searchValue;
+
+			// Editor Actions
+			const activeTextEditorWidget = this.editorService.activeTextEditorWidget;
+			let editorActions: IEditorAction[] = [];
+			if (activeTextEditorWidget && types.isFunction(activeTextEditorWidget.getSupportedActions)) {
+				editorActions = activeTextEditorWidget.getSupportedActions();
 			}
 
-			if (counterB) {
-				return 1; // other command was used so it wins over the command
-			}
+			const editorEntries = this.editorActionsToEntries(editorActions, searchValue);
 
-			// both commands were never used, so we sort by name
-			return elementA.getSortLabel().localeCompare(elementB.getSortLabel());
-		});
+			// Other Actions
+			const menu = this.editorService.invokeWithinEditorContext(accessor => this.menuService.createMenu(MenuId.CommandPalette, accessor.get(IContextKeyService)));
+			const menuActions = menu.getActions().reduce((r, [, actions]) => [...r, ...actions], <MenuItemAction[]>[]).filter(action => action instanceof MenuItemAction) as MenuItemAction[];
+			const commandEntries = this.menuItemActionsToEntries(menuActions, searchValue);
 
-		// Introduce group marker border between recently used and others
-		// only if we have recently used commands in the result set
-		const firstEntry = entries[0];
-		if (firstEntry && this.commandsHistory.peek(firstEntry.getCommandId())) {
-			firstEntry.setGroupLabel(nls.localize('recentlyUsed', "recently used"));
-			for (let i = 1; i < entries.length; i++) {
-				const entry = entries[i];
-				if (!this.commandsHistory.peek(entry.getCommandId())) {
-					entry.setShowBorder(true);
-					entry.setGroupLabel(nls.localize('morecCommands', "other commands"));
-					break;
+			// Concat
+			let entries = [...editorEntries, ...commandEntries];
+
+			// Remove duplicates
+			entries = arrays.distinct(entries, entry => `${entry.getLabel()}${entry.getGroupLabel()}${entry.getCommandId()}`);
+
+			// Handle label clashes
+			const commandLabels = new Set<string>();
+			entries.forEach(entry => {
+				const commandLabel = `${entry.getLabel()}${entry.getGroupLabel()}`;
+				if (commandLabels.has(commandLabel)) {
+					entry.setDescription(entry.getCommandId());
+				} else {
+					commandLabels.add(commandLabel);
+				}
+			});
+
+			// Sort by MRU order and fallback to name otherwie
+			entries = entries.sort((elementA, elementB) => {
+				const counterA = this.commandsHistory.peek(elementA.getCommandId());
+				const counterB = this.commandsHistory.peek(elementB.getCommandId());
+
+				if (counterA && counterB) {
+					return counterA > counterB ? -1 : 1; // use more recently used command before older
+				}
+
+				if (counterA) {
+					return -1; // first command was used, so it wins over the non used one
+				}
+
+				if (counterB) {
+					return 1; // other command was used so it wins over the command
+				}
+
+				// both commands were never used, so we sort by name
+				return elementA.getSortLabel().localeCompare(elementB.getSortLabel());
+			});
+
+			// Introduce group marker border between recently used and others
+			// only if we have recently used commands in the result set
+			const firstEntry = entries[0];
+			if (firstEntry && this.commandsHistory.peek(firstEntry.getCommandId())) {
+				firstEntry.setGroupLabel(nls.localize('recentlyUsed', "recently used"));
+				for (let i = 1; i < entries.length; i++) {
+					const entry = entries[i];
+					if (!this.commandsHistory.peek(entry.getCommandId())) {
+						entry.setShowBorder(true);
+						entry.setGroupLabel(nls.localize('morecCommands', "other commands"));
+						break;
+					}
 				}
 			}
-		}
 
-		return TPromise.as(new QuickOpenModel(entries));
+			return new QuickOpenModel(entries);
+		});
 	}
 
 	private editorActionsToEntries(actions: IEditorAction[], searchValue: string): EditorActionCommandEntry[] {
@@ -540,7 +553,7 @@ export class CommandsHandler extends QuickOpenHandler {
 		return entries;
 	}
 
-	public getAutoFocus(searchValue: string, context: { model: IModel<QuickOpenEntry>, quickNavigateConfiguration?: IQuickNavigateConfiguration }): IAutoFocus {
+	getAutoFocus(searchValue: string, context: { model: IModel<QuickOpenEntry>, quickNavigateConfiguration?: IQuickNavigateConfiguration }): IAutoFocus {
 		let autoFocusPrefixMatch = searchValue.trim();
 
 		if (autoFocusPrefixMatch && this.commandHistoryEnabled) {
@@ -556,11 +569,11 @@ export class CommandsHandler extends QuickOpenHandler {
 		};
 	}
 
-	public getEmptyLabel(searchString: string): string {
+	getEmptyLabel(searchString: string): string {
 		return nls.localize('noCommandsMatching', "No commands matching");
 	}
 
-	public onClose(canceled: boolean): void {
+	onClose(canceled: boolean): void {
 		if (canceled) {
 			lastCommandPaletteInput = void 0; // clear last input when user canceled quick open
 		}
diff --git a/src/vs/workbench/parts/quickopen/browser/gotoLineHandler.ts b/src/vs/workbench/parts/quickopen/browser/gotoLineHandler.ts
index d858f369bd9..dc35c9b2a9b 100644
--- a/src/vs/workbench/parts/quickopen/browser/gotoLineHandler.ts
+++ b/src/vs/workbench/parts/quickopen/browser/gotoLineHandler.ts
@@ -22,13 +22,15 @@ import { IEditorOptions, RenderLineNumbersType } from 'vs/editor/common/config/e
 import { IEditorService, SIDE_GROUP } from 'vs/workbench/services/editor/common/editorService';
 import { isCodeEditor, isDiffEditor } from 'vs/editor/browser/editorBrowser';
 import { IEditorGroup } from 'vs/workbench/services/group/common/editorGroupsService';
+import { once } from 'vs/base/common/event';
+import { CancellationToken } from 'vs/base/common/cancellation';
 
 export const GOTO_LINE_PREFIX = ':';
 
 export class GotoLineAction extends QuickOpenAction {
 
-	public static readonly ID = 'workbench.action.gotoLine';
-	public static readonly LABEL = nls.localize('gotoLine', "Go to Line...");
+	static readonly ID = 'workbench.action.gotoLine';
+	static readonly LABEL = nls.localize('gotoLine', "Go to Line...");
 
 	constructor(actionId: string, actionLabel: string,
 		@IQuickOpenService private readonly _quickOpenService: IQuickOpenService,
@@ -37,7 +39,7 @@ export class GotoLineAction extends QuickOpenAction {
 		super(actionId, actionLabel, GOTO_LINE_PREFIX, _quickOpenService);
 	}
 
-	public run(): TPromise<void> {
+	run(): TPromise<void> {
 
 		let activeTextEditorWidget = this.editorService.activeTextEditorWidget;
 		if (isDiffEditor(activeTextEditorWidget)) {
@@ -60,12 +62,7 @@ export class GotoLineAction extends QuickOpenAction {
 		const result = super.run();
 
 		if (restoreOptions) {
-			let toDispose = this._quickOpenService.onHide(() => {
-				if (!toDispose) {
-					return;
-				}
-				toDispose.dispose();
-				toDispose = null;
+			once(this._quickOpenService.onHide)(() => {
 				activeTextEditorWidget.updateOptions(restoreOptions);
 			});
 		}
@@ -92,7 +89,7 @@ class GotoLineEntry extends EditorQuickOpenEntry {
 		this.column = numbers[1];
 	}
 
-	public getLabel(): string {
+	getLabel(): string {
 
 		// Inform user about valid range if input is invalid
 		const maxLineNumber = this.getMaxLineNumber();
@@ -123,7 +120,7 @@ class GotoLineEntry extends EditorQuickOpenEntry {
 		return model && types.isFunction((<ITextModel>model).getLineCount) ? (<ITextModel>model).getLineCount() : -1;
 	}
 
-	public run(mode: Mode, context: IEntryRunContext): boolean {
+	run(mode: Mode, context: IEntryRunContext): boolean {
 		if (mode === Mode.OPEN) {
 			return this.runOpen(context);
 		}
@@ -131,18 +128,18 @@ class GotoLineEntry extends EditorQuickOpenEntry {
 		return this.runPreview();
 	}
 
-	public getInput(): IEditorInput {
+	getInput(): IEditorInput {
 		return this.editorService.activeEditor;
 	}
 
-	public getOptions(pinned?: boolean): ITextEditorOptions {
+	getOptions(pinned?: boolean): ITextEditorOptions {
 		return {
 			selection: this.toSelection(),
 			pinned
 		};
 	}
 
-	public runOpen(context: IEntryRunContext): boolean {
+	runOpen(context: IEntryRunContext): boolean {
 
 		// No-op if range is not valid
 		if (this.invalidRange()) {
@@ -166,7 +163,7 @@ class GotoLineEntry extends EditorQuickOpenEntry {
 		return true;
 	}
 
-	public runPreview(): boolean {
+	runPreview(): boolean {
 
 		// No-op if range is not valid
 		if (this.invalidRange()) {
@@ -208,7 +205,7 @@ interface IEditorLineDecoration {
 
 export class GotoLineHandler extends QuickOpenHandler {
 
-	public static readonly ID = 'workbench.picker.line';
+	static readonly ID = 'workbench.picker.line';
 
 	private rangeHighlightDecorationId: IEditorLineDecoration;
 	private lastKnownEditorViewState: IEditorViewState;
@@ -217,11 +214,11 @@ export class GotoLineHandler extends QuickOpenHandler {
 		super();
 	}
 
-	public getAriaLabel(): string {
+	getAriaLabel(): string {
 		return nls.localize('gotoLineHandlerAriaLabel', "Type a line number to navigate to.");
 	}
 
-	public getResults(searchValue: string): TPromise<QuickOpenModel> {
+	getResults(searchValue: string, token: CancellationToken): TPromise<QuickOpenModel> {
 		searchValue = searchValue.trim();
 
 		// Remember view state to be able to restore on cancel
@@ -233,13 +230,13 @@ export class GotoLineHandler extends QuickOpenHandler {
 		return TPromise.as(new QuickOpenModel([new GotoLineEntry(searchValue, this.editorService, this)]));
 	}
 
-	public canRun(): boolean | string {
+	canRun(): boolean | string {
 		const canRun = !!this.editorService.activeTextEditorWidget;
 
 		return canRun ? true : nls.localize('cannotRunGotoLine', "Open a text file first to go to a line");
 	}
 
-	public decorateOutline(range: IRange, editor: IEditor, group: IEditorGroup): void {
+	decorateOutline(range: IRange, editor: IEditor, group: IEditorGroup): void {
 		editor.changeDecorations(changeAccessor => {
 			const deleteDecorations: string[] = [];
 
@@ -284,7 +281,7 @@ export class GotoLineHandler extends QuickOpenHandler {
 		});
 	}
 
-	public clearDecorations(): void {
+	clearDecorations(): void {
 		if (this.rangeHighlightDecorationId) {
 			this.editorService.visibleControls.forEach(editor => {
 				if (editor.group.id === this.rangeHighlightDecorationId.groupId) {
@@ -302,7 +299,7 @@ export class GotoLineHandler extends QuickOpenHandler {
 		}
 	}
 
-	public onClose(canceled: boolean): void {
+	onClose(canceled: boolean): void {
 
 		// Clear Highlight Decorations if present
 		this.clearDecorations();
@@ -318,7 +315,7 @@ export class GotoLineHandler extends QuickOpenHandler {
 		this.lastKnownEditorViewState = null;
 	}
 
-	public getAutoFocus(searchValue: string): IAutoFocus {
+	getAutoFocus(searchValue: string): IAutoFocus {
 		return {
 			autoFocusFirstEntry: searchValue.trim().length > 0
 		};
diff --git a/src/vs/workbench/parts/quickopen/browser/gotoSymbolHandler.ts b/src/vs/workbench/parts/quickopen/browser/gotoSymbolHandler.ts
index 5c9f7406346..1befbcbc0e7 100644
--- a/src/vs/workbench/parts/quickopen/browser/gotoSymbolHandler.ts
+++ b/src/vs/workbench/parts/quickopen/browser/gotoSymbolHandler.ts
@@ -5,7 +5,7 @@
 
 'use strict';
 
-import 'vs/css!./media/gotoSymbolHandler';
+import 'vs/css!vs/editor/contrib/documentSymbols/media/symbol-icons';
 import { TPromise } from 'vs/base/common/winjs.base';
 import * as nls from 'vs/nls';
 import * as types from 'vs/base/common/types';
@@ -19,21 +19,45 @@ import { IModelDecorationsChangeAccessor, OverviewRulerLane, IModelDeltaDecorati
 import { IQuickOpenService } from 'vs/platform/quickOpen/common/quickOpen';
 import { ITextEditorOptions } from 'vs/platform/editor/common/editor';
 import { getDocumentSymbols } from 'vs/editor/contrib/quickOpen/quickOpen';
-import { DocumentSymbolProviderRegistry, SymbolInformation, symbolKindToCssClass } from 'vs/editor/common/modes';
+import { DocumentSymbolProviderRegistry, DocumentSymbol, symbolKindToCssClass } from 'vs/editor/common/modes';
 import { IRange } from 'vs/editor/common/core/range';
 import { themeColorFromId } from 'vs/platform/theme/common/themeService';
 import { overviewRulerRangeHighlight } from 'vs/editor/common/view/editorColorRegistry';
 import { GroupIdentifier, IEditorInput } from 'vs/workbench/common/editor';
 import { IEditorService, SIDE_GROUP } from 'vs/workbench/services/editor/common/editorService';
 import { IEditorGroup } from 'vs/workbench/services/group/common/editorGroupsService';
+import { asThenable } from 'vs/base/common/async';
+import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
 
 export const GOTO_SYMBOL_PREFIX = '@';
 export const SCOPE_PREFIX = ':';
 
+const NLS_SYMBOL_CACHE: { [type: string]: string } = {
+	'method': nls.localize('method', "methods ({0})"),
+	'function': nls.localize('function', "functions ({0})"),
+	'constructor': nls.localize('_constructor', "constructors ({0})"),
+	'variable': nls.localize('variable', "variables ({0})"),
+	'class': nls.localize('class', "classes ({0})"),
+	'interface': nls.localize('interface', "interfaces ({0})"),
+	'namespace': nls.localize('namespace', "namespaces ({0})"),
+	'package': nls.localize('package', "packages ({0})"),
+	'module': nls.localize('modules', "modules ({0})"),
+	'property': nls.localize('property', "properties ({0})"),
+	'enum': nls.localize('enum', "enumerations ({0})"),
+	'string': nls.localize('string', "strings ({0})"),
+	'rule': nls.localize('rule', "rules ({0})"),
+	'file': nls.localize('file', "files ({0})"),
+	'array': nls.localize('array', "arrays ({0})"),
+	'number': nls.localize('number', "numbers ({0})"),
+	'boolean': nls.localize('boolean', "booleans ({0})"),
+	'object': nls.localize('object', "objects ({0})"),
+	'key': nls.localize('key', "keys ({0})")
+};
+
 export class GotoSymbolAction extends QuickOpenAction {
 
-	public static readonly ID = 'workbench.action.gotoSymbol';
-	public static readonly LABEL = nls.localize('gotoSymbol', "Go to Symbol in File...");
+	static readonly ID = 'workbench.action.gotoSymbol';
+	static readonly LABEL = nls.localize('gotoSymbol', "Go to Symbol in File...");
 
 	constructor(actionId: string, actionLabel: string, @IQuickOpenService quickOpenService: IQuickOpenService) {
 		super(actionId, actionLabel, GOTO_SYMBOL_PREFIX, quickOpenService);
@@ -41,15 +65,8 @@ export class GotoSymbolAction extends QuickOpenAction {
 }
 
 class OutlineModel extends QuickOpenModel {
-	private outline: Outline;
 
-	constructor(outline: Outline, entries: SymbolEntry[]) {
-		super(entries);
-
-		this.outline = outline;
-	}
-
-	public applyFilter(searchValue: string): void {
+	applyFilter(searchValue: string): void {
 
 		// Normalize search
 		let normalizedSearchValue = searchValue;
@@ -107,7 +124,7 @@ class OutlineModel extends QuickOpenModel {
 
 					// Update previous result with count
 					if (currentResult) {
-						currentResult.setGroupLabel(this.renderGroupLabel(currentType, typeCounter, this.outline));
+						currentResult.setGroupLabel(this.renderGroupLabel(currentType, typeCounter));
 					}
 
 					currentType = result.getType();
@@ -125,7 +142,7 @@ class OutlineModel extends QuickOpenModel {
 
 			// Update previous result with count
 			if (currentResult) {
-				currentResult.setGroupLabel(this.renderGroupLabel(currentType, typeCounter, this.outline));
+				currentResult.setGroupLabel(this.renderGroupLabel(currentType, typeCounter));
 			}
 		}
 
@@ -203,39 +220,14 @@ class OutlineModel extends QuickOpenModel {
 		return elementARange.startLineNumber - elementBRange.startLineNumber;
 	}
 
-	private renderGroupLabel(type: string, count: number, outline: Outline): string {
-
-		const pattern = OutlineModel.getDefaultGroupLabelPatterns()[type];
+	private renderGroupLabel(type: string, count: number): string {
+		const pattern = NLS_SYMBOL_CACHE[type];
 		if (pattern) {
 			return strings.format(pattern, count);
 		}
 
 		return type;
 	}
-
-	private static getDefaultGroupLabelPatterns(): { [type: string]: string } {
-		const result: { [type: string]: string } = Object.create(null);
-		result['method'] = nls.localize('method', "methods ({0})");
-		result['function'] = nls.localize('function', "functions ({0})");
-		result['constructor'] = <any>nls.localize('_constructor', "constructors ({0})");
-		result['variable'] = nls.localize('variable', "variables ({0})");
-		result['class'] = nls.localize('class', "classes ({0})");
-		result['interface'] = nls.localize('interface', "interfaces ({0})");
-		result['namespace'] = nls.localize('namespace', "namespaces ({0})");
-		result['package'] = nls.localize('package', "packages ({0})");
-		result['module'] = nls.localize('modules', "modules ({0})");
-		result['property'] = nls.localize('property', "properties ({0})");
-		result['enum'] = nls.localize('enum', "enumerations ({0})");
-		result['string'] = nls.localize('string', "strings ({0})");
-		result['rule'] = nls.localize('rule', "rules ({0})");
-		result['file'] = nls.localize('file', "files ({0})");
-		result['array'] = nls.localize('array', "arrays ({0})");
-		result['number'] = nls.localize('number', "numbers ({0})");
-		result['boolean'] = nls.localize('boolean', "booleans ({0})");
-		result['object'] = nls.localize('object', "objects ({0})");
-		result['key'] = nls.localize('key', "keys ({0})");
-		return result;
-	}
 }
 
 class SymbolEntry extends EditorQuickOpenEntryGroup {
@@ -246,9 +238,10 @@ class SymbolEntry extends EditorQuickOpenEntryGroup {
 	private icon: string;
 	private description: string;
 	private range: IRange;
+	private revealRange: IRange;
 	private handler: GotoSymbolHandler;
 
-	constructor(index: number, name: string, type: string, description: string, icon: string, range: IRange, highlights: IHighlight[], editorService: IEditorService, handler: GotoSymbolHandler) {
+	constructor(index: number, name: string, type: string, description: string, icon: string, range: IRange, revealRange: IRange, highlights: IHighlight[], editorService: IEditorService, handler: GotoSymbolHandler) {
 		super();
 
 		this.index = index;
@@ -257,51 +250,52 @@ class SymbolEntry extends EditorQuickOpenEntryGroup {
 		this.icon = icon;
 		this.description = description;
 		this.range = range;
+		this.revealRange = revealRange || range;
 		this.setHighlights(highlights);
 		this.editorService = editorService;
 		this.handler = handler;
 	}
 
-	public getIndex(): number {
+	getIndex(): number {
 		return this.index;
 	}
 
-	public getLabel(): string {
+	getLabel(): string {
 		return this.name;
 	}
 
-	public getAriaLabel(): string {
+	getAriaLabel(): string {
 		return nls.localize('entryAriaLabel', "{0}, symbols", this.getLabel());
 	}
 
-	public getIcon(): string {
+	getIcon(): string {
 		return this.icon;
 	}
 
-	public getDescription(): string {
+	getDescription(): string {
 		return this.description;
 	}
 
-	public getType(): string {
+	getType(): string {
 		return this.type;
 	}
 
-	public getRange(): IRange {
+	getRange(): IRange {
 		return this.range;
 	}
 
-	public getInput(): IEditorInput {
+	getInput(): IEditorInput {
 		return this.editorService.activeEditor;
 	}
 
-	public getOptions(pinned?: boolean): ITextEditorOptions {
+	getOptions(pinned?: boolean): ITextEditorOptions {
 		return {
 			selection: this.toSelection(),
 			pinned
 		};
 	}
 
-	public run(mode: Mode, context: IEntryRunContext): boolean {
+	run(mode: Mode, context: IEntryRunContext): boolean {
 		if (mode === Mode.OPEN) {
 			return this.runOpen(context);
 		}
@@ -349,18 +343,14 @@ class SymbolEntry extends EditorQuickOpenEntryGroup {
 
 	private toSelection(): IRange {
 		return {
-			startLineNumber: this.range.startLineNumber,
-			startColumn: this.range.startColumn || 1,
-			endLineNumber: this.range.startLineNumber,
-			endColumn: this.range.startColumn || 1
+			startLineNumber: this.revealRange.startLineNumber,
+			startColumn: this.revealRange.startColumn || 1,
+			endLineNumber: this.revealRange.startLineNumber,
+			endColumn: this.revealRange.startColumn || 1
 		};
 	}
 }
 
-interface Outline {
-	entries: SymbolInformation[];
-}
-
 interface IEditorLineDecoration {
 	groupId: GroupIdentifier;
 	rangeHighlightId: string;
@@ -369,24 +359,41 @@ interface IEditorLineDecoration {
 
 export class GotoSymbolHandler extends QuickOpenHandler {
 
-	public static readonly ID = 'workbench.picker.filesymbols';
+	static readonly ID = 'workbench.picker.filesymbols';
 
-	private outlineToModelCache: { [modelId: string]: OutlineModel; };
 	private rangeHighlightDecorationId: IEditorLineDecoration;
 	private lastKnownEditorViewState: IEditorViewState;
-	private activeOutlineRequest: TPromise<OutlineModel>;
+
+	private cachedOutlineRequest: TPromise<OutlineModel>;
+	private pendingOutlineRequest: CancellationTokenSource;
 
 	constructor(
 		@IEditorService private editorService: IEditorService
 	) {
 		super();
 
-		this.outlineToModelCache = {};
+		this.registerListeners();
 	}
 
-	public getResults(searchValue: string): TPromise<QuickOpenModel> {
+	private registerListeners(): void {
+		this.editorService.onDidActiveEditorChange(() => this.onDidActiveEditorChange());
+	}
+
+	private onDidActiveEditorChange(): void {
+		this.clearOutlineRequest();
+
+		this.lastKnownEditorViewState = void 0;
+		this.rangeHighlightDecorationId = void 0;
+	}
+
+	getResults(searchValue: string, token: CancellationToken): TPromise<QuickOpenModel> {
 		searchValue = searchValue.trim();
 
+		// Support to cancel pending outline requests
+		if (!this.pendingOutlineRequest) {
+			this.pendingOutlineRequest = new CancellationTokenSource();
+		}
+
 		// Remember view state to be able to restore on cancel
 		if (!this.lastKnownEditorViewState) {
 			const activeTextEditorWidget = this.editorService.activeTextEditorWidget;
@@ -394,7 +401,10 @@ export class GotoSymbolHandler extends QuickOpenHandler {
 		}
 
 		// Resolve Outline Model
-		return this.getActiveOutline().then(outline => {
+		return this.getOutline().then(outline => {
+			if (token.isCancellationRequested) {
+				return outline;
+			}
 
 			// Filter by search
 			outline.applyFilter(searchValue);
@@ -403,7 +413,7 @@ export class GotoSymbolHandler extends QuickOpenHandler {
 		});
 	}
 
-	public getEmptyLabel(searchString: string): string {
+	getEmptyLabel(searchString: string): string {
 		if (searchString.length > 0) {
 			return nls.localize('noSymbolsMatching', "No symbols matching");
 		}
@@ -411,11 +421,11 @@ export class GotoSymbolHandler extends QuickOpenHandler {
 		return nls.localize('noSymbolsFound', "No symbols found");
 	}
 
-	public getAriaLabel(): string {
+	getAriaLabel(): string {
 		return nls.localize('gotoSymbolHandlerAriaLabel', "Type to narrow down symbols of the currently active editor.");
 	}
 
-	public canRun(): boolean | string {
+	canRun(): boolean | string {
 		let canRun = false;
 
 		const activeTextEditorWidget = this.editorService.activeTextEditorWidget;
@@ -433,7 +443,7 @@ export class GotoSymbolHandler extends QuickOpenHandler {
 		return canRun ? true : activeTextEditorWidget !== null ? nls.localize('cannotRunGotoSymbolInFile', "No symbol information for the file") : nls.localize('cannotRunGotoSymbol', "Open a text file first to go to a symbol");
 	}
 
-	public getAutoFocus(searchValue: string): IAutoFocus {
+	getAutoFocus(searchValue: string): IAutoFocus {
 		searchValue = searchValue.trim();
 
 		// Remove any type pattern (:) from search value as needed
@@ -447,7 +457,7 @@ export class GotoSymbolHandler extends QuickOpenHandler {
 		};
 	}
 
-	private toQuickOpenEntries(flattened: SymbolInformation[]): SymbolEntry[] {
+	private toQuickOpenEntries(flattened: DocumentSymbol[]): SymbolEntry[] {
 		const results: SymbolEntry[] = [];
 
 		for (let i = 0; i < flattened.length; i++) {
@@ -460,20 +470,20 @@ export class GotoSymbolHandler extends QuickOpenHandler {
 
 			// Add
 			results.push(new SymbolEntry(i,
-				label, icon, description, icon,
-				element.location.range, null, this.editorService, this
+				label, icon, description, `symbol-icon ${icon}`,
+				element.range, element.selectionRange, null, this.editorService, this
 			));
 		}
 
 		return results;
 	}
 
-	private getActiveOutline(): TPromise<OutlineModel> {
-		if (!this.activeOutlineRequest) {
-			this.activeOutlineRequest = this.doGetActiveOutline();
+	private getOutline(): TPromise<OutlineModel> {
+		if (!this.cachedOutlineRequest) {
+			this.cachedOutlineRequest = this.doGetActiveOutline();
 		}
 
-		return this.activeOutlineRequest;
+		return this.cachedOutlineRequest;
 	}
 
 	private doGetActiveOutline(): TPromise<OutlineModel> {
@@ -485,29 +495,16 @@ export class GotoSymbolHandler extends QuickOpenHandler {
 			}
 
 			if (model && types.isFunction((<ITextModel>model).getLanguageIdentifier)) {
-
-				// Ask cache first
-				const modelId = (<ITextModel>model).id;
-				if (this.outlineToModelCache[modelId]) {
-					return TPromise.as(this.outlineToModelCache[modelId]);
-				}
-
-				return getDocumentSymbols(<ITextModel>model).then(outline => {
-
-					const model = new OutlineModel(outline, this.toQuickOpenEntries(outline.entries));
-
-					this.outlineToModelCache = {}; // Clear cache, only keep 1 outline
-					this.outlineToModelCache[modelId] = model;
-
-					return model;
-				});
+				return TPromise.wrap(asThenable(() => getDocumentSymbols(<ITextModel>model, true, this.pendingOutlineRequest.token)).then(entries => {
+					return new OutlineModel(this.toQuickOpenEntries(entries));
+				}));
 			}
 		}
 
 		return TPromise.wrap<OutlineModel>(null);
 	}
 
-	public decorateOutline(fullRange: IRange, startRange: IRange, editor: IEditor, group: IEditorGroup): void {
+	decorateOutline(fullRange: IRange, startRange: IRange, editor: IEditor, group: IEditorGroup): void {
 		editor.changeDecorations((changeAccessor: IModelDecorationsChangeAccessor) => {
 			const deleteDecorations: string[] = [];
 
@@ -554,7 +551,7 @@ export class GotoSymbolHandler extends QuickOpenHandler {
 		});
 	}
 
-	public clearDecorations(): void {
+	private clearDecorations(): void {
 		if (this.rangeHighlightDecorationId) {
 			this.editorService.visibleControls.forEach(editor => {
 				if (editor.group.id === this.rangeHighlightDecorationId.groupId) {
@@ -572,10 +569,10 @@ export class GotoSymbolHandler extends QuickOpenHandler {
 		}
 	}
 
-	public onClose(canceled: boolean): void {
+	onClose(canceled: boolean): void {
 
-		// Clear Cache
-		this.outlineToModelCache = {};
+		// Cancel any pending/cached outline request now
+		this.clearOutlineRequest();
 
 		// Clear Highlight Decorations if present
 		this.clearDecorations();
@@ -586,9 +583,18 @@ export class GotoSymbolHandler extends QuickOpenHandler {
 			if (activeTextEditorWidget) {
 				activeTextEditorWidget.restoreViewState(this.lastKnownEditorViewState);
 			}
+
+			this.lastKnownEditorViewState = null;
+		}
+	}
+
+	private clearOutlineRequest(): void {
+		if (this.pendingOutlineRequest) {
+			this.pendingOutlineRequest.cancel();
+			this.pendingOutlineRequest.dispose();
+			this.pendingOutlineRequest = void 0;
 		}
 
-		this.lastKnownEditorViewState = null;
-		this.activeOutlineRequest = null;
+		this.cachedOutlineRequest = null;
 	}
 }
diff --git a/src/vs/workbench/parts/quickopen/browser/helpHandler.ts b/src/vs/workbench/parts/quickopen/browser/helpHandler.ts
index 51881cef7dd..dbe3f74b4f7 100644
--- a/src/vs/workbench/parts/quickopen/browser/helpHandler.ts
+++ b/src/vs/workbench/parts/quickopen/browser/helpHandler.ts
@@ -10,8 +10,9 @@ import * as types from 'vs/base/common/types';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { Mode, IEntryRunContext, IAutoFocus } from 'vs/base/parts/quickopen/common/quickOpen';
 import { QuickOpenModel, QuickOpenEntryGroup } from 'vs/base/parts/quickopen/browser/quickOpenModel';
-import { IQuickOpenRegistry, Extensions, QuickOpenHandler } from 'vs/workbench/browser/quickopen';
+import { IQuickOpenRegistry, Extensions, QuickOpenHandler, QuickOpenHandlerDescriptor, QuickOpenHandlerHelpEntry } from 'vs/workbench/browser/quickopen';
 import { IQuickOpenService } from 'vs/platform/quickOpen/common/quickOpen';
+import { CancellationToken } from 'vs/base/common/cancellation';
 
 export const HELP_PREFIX = '?';
 
@@ -37,19 +38,19 @@ class HelpEntry extends QuickOpenEntryGroup {
 		this.openOnPreview = openOnPreview;
 	}
 
-	public getLabel(): string {
+	getLabel(): string {
 		return this.prefixLabel;
 	}
 
-	public getAriaLabel(): string {
+	getAriaLabel(): string {
 		return nls.localize('entryAriaLabel', "{0}, picker help", this.getLabel());
 	}
 
-	public getDescription(): string {
+	getDescription(): string {
 		return this.description;
 	}
 
-	public run(mode: Mode, context: IEntryRunContext): boolean {
+	run(mode: Mode, context: IEntryRunContext): boolean {
 		if (mode === Mode.OPEN || this.openOnPreview) {
 			this.quickOpenService.show(this.prefix);
 		}
@@ -60,13 +61,13 @@ class HelpEntry extends QuickOpenEntryGroup {
 
 export class HelpHandler extends QuickOpenHandler {
 
-	public static readonly ID = 'workbench.picker.help';
+	static readonly ID = 'workbench.picker.help';
 
 	constructor(@IQuickOpenService private quickOpenService: IQuickOpenService) {
 		super();
 	}
 
-	public getResults(searchValue: string): TPromise<QuickOpenModel> {
+	getResults(searchValue: string, token: CancellationToken): TPromise<QuickOpenModel> {
 		searchValue = searchValue.trim();
 
 		const registry = (Registry.as<IQuickOpenRegistry>(Extensions.Quickopen));
@@ -79,9 +80,9 @@ export class HelpHandler extends QuickOpenHandler {
 
 		const workbenchScoped: HelpEntry[] = [];
 		const editorScoped: HelpEntry[] = [];
-		let entry: HelpEntry;
 
-		handlerDescriptors.sort((h1, h2) => h1.prefix.localeCompare(h2.prefix)).forEach((handlerDescriptor) => {
+		const matchingHandlers: (QuickOpenHandlerHelpEntry | QuickOpenHandlerDescriptor)[] = [];
+		handlerDescriptors.sort((h1, h2) => h1.prefix.localeCompare(h2.prefix)).forEach(handlerDescriptor => {
 			if (handlerDescriptor.prefix !== HELP_PREFIX) {
 
 				// Descriptor has multiple help entries
@@ -90,19 +91,26 @@ export class HelpHandler extends QuickOpenHandler {
 						const helpEntry = handlerDescriptor.helpEntries[j];
 
 						if (helpEntry.prefix.indexOf(searchValue) === 0) {
-							entry = new HelpEntry(helpEntry.prefix, helpEntry.description, this.quickOpenService, searchValue.length > 0);
-							if (helpEntry.needsEditor) {
-								editorScoped.push(entry);
-							} else {
-								workbenchScoped.push(entry);
-							}
+							matchingHandlers.push(helpEntry);
 						}
 					}
 				}
 
 				// Single Help entry for descriptor
 				else if (handlerDescriptor.prefix.indexOf(searchValue) === 0) {
-					entry = new HelpEntry(handlerDescriptor.prefix, handlerDescriptor.description, this.quickOpenService, searchValue.length > 0);
+					matchingHandlers.push(handlerDescriptor);
+				}
+			}
+		});
+
+		matchingHandlers.forEach(handler => {
+			if (handler instanceof QuickOpenHandlerDescriptor) {
+				workbenchScoped.push(new HelpEntry(handler.prefix, handler.description, this.quickOpenService, matchingHandlers.length === 1));
+			} else {
+				const entry = new HelpEntry(handler.prefix, handler.description, this.quickOpenService, matchingHandlers.length === 1);
+				if (handler.needsEditor) {
+					editorScoped.push(entry);
+				} else {
 					workbenchScoped.push(entry);
 				}
 			}
@@ -124,7 +132,7 @@ export class HelpHandler extends QuickOpenHandler {
 		return TPromise.as(new QuickOpenModel([...workbenchScoped, ...editorScoped]));
 	}
 
-	public getAutoFocus(searchValue: string): IAutoFocus {
+	getAutoFocus(searchValue: string): IAutoFocus {
 		searchValue = searchValue.trim();
 		return {
 			autoFocusFirstEntry: searchValue.length > 0,
diff --git a/src/vs/workbench/parts/quickopen/browser/media/Constant_16x.svg b/src/vs/workbench/parts/quickopen/browser/media/Constant_16x.svg
deleted file mode 100644
index ed2a1751005..00000000000
--- a/src/vs/workbench/parts/quickopen/browser/media/Constant_16x.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><style>.icon-canvas-transparent{opacity:0;fill:#f6f6f6}.icon-vs-out{fill:#f6f6f6}.icon-vs-bg{fill:#424242}.icon-vs-fg{fill:#f0eff1}.icon-vs-action-blue{fill:#00539c}</style><path class="icon-canvas-transparent" d="M16 16H0V0h16v16z" id="canvas"/><path class="icon-vs-out" d="M2.879 14L1 12.121V3.879L2.879 2h10.242L15 3.879v8.242L13.121 14H2.879z" id="outline"/><path class="icon-vs-fg" d="M12.293 4H3.707L3 4.707v6.586l.707.707h8.586l.707-.707V4.707L12.293 4zM11 10H5V9h6v1zm0-3H5V6h6v1z" id="iconFg"/><g id="iconBg"><path class="icon-vs-bg" d="M12.707 13H3.293L2 11.707V4.293L3.293 3h9.414L14 4.293v7.414L12.707 13zm-9-1h8.586l.707-.707V4.707L12.293 4H3.707L3 4.707v6.586l.707.707z"/><path class="icon-vs-action-blue" d="M11 7H5V6h6v1zm0 2H5v1h6V9z"/></g></svg>
\ No newline at end of file
diff --git a/src/vs/workbench/parts/quickopen/browser/media/Constant_16x_inverse.svg b/src/vs/workbench/parts/quickopen/browser/media/Constant_16x_inverse.svg
deleted file mode 100644
index 173e427f964..00000000000
--- a/src/vs/workbench/parts/quickopen/browser/media/Constant_16x_inverse.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><style>.icon-canvas-transparent{opacity:0;fill:#252526}.icon-vs-out{fill:#252526}.icon-vs-bg{fill:#c5c5c5}.icon-vs-fg{fill:#2b282e}.icon-vs-action-blue{fill:#75beff}</style><path class="icon-canvas-transparent" d="M16 16H0V0h16v16z" id="canvas"/><path class="icon-vs-out" d="M2.879 14L1 12.121V3.879L2.879 2h10.242L15 3.879v8.242L13.121 14H2.879z" id="outline"/><path class="icon-vs-fg" d="M12.293 4H3.707L3 4.707v6.586l.707.707h8.586l.707-.707V4.707L12.293 4zM11 10H5V9h6v1zm0-3H5V6h6v1z" id="iconFg"/><g id="iconBg"><path class="icon-vs-bg" d="M12.707 13H3.293L2 11.707V4.293L3.293 3h9.414L14 4.293v7.414L12.707 13zm-9-1h8.586l.707-.707V4.707L12.293 4H3.707L3 4.707v6.586l.707.707z"/><path class="icon-vs-action-blue" d="M11 7H5V6h6v1zm0 2H5v1h6V9z"/></g></svg>
\ No newline at end of file
diff --git a/src/vs/workbench/parts/quickopen/browser/media/EnumItem_16x.svg b/src/vs/workbench/parts/quickopen/browser/media/EnumItem_16x.svg
deleted file mode 100755
index aa901ec1934..00000000000
--- a/src/vs/workbench/parts/quickopen/browser/media/EnumItem_16x.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><style>.icon-canvas-transparent{opacity:0;fill:#f6f6f6}.icon-vs-out{fill:#f6f6f6}.icon-vs-fg{fill:#f0eff1}.icon-vs-action-blue{fill:#00539c}</style><path class="icon-canvas-transparent" d="M16 16H0V0h16v16z" id="canvas"/><path class="icon-vs-out" d="M0 15V6h6V2.586L7.585 1h6.829L16 2.586v5.829L14.414 10H10v5H0zm3-6z" id="outline"/><path class="icon-vs-fg" d="M8 3v3h5v1h-3v1h4V3H8zm5 2H9V4h4v1zM2 8v5h6V8H2zm5 3H3v-1h4v1z" id="iconFg"/><path class="icon-vs-action-blue" d="M10 6h3v1h-3V6zM9 4v1h4V4H9zm5-2H8L7 3v3h1V3h6v5h-4v1h4l1-1V3l-1-1zm-7 8H3v1h4v-1zm2-3v7H1V7h8zM8 8H2v5h6V8z" id="iconBg"/></svg>
\ No newline at end of file
diff --git a/src/vs/workbench/parts/quickopen/browser/media/EnumItem_inverse_16x.svg b/src/vs/workbench/parts/quickopen/browser/media/EnumItem_inverse_16x.svg
deleted file mode 100755
index 791759092fc..00000000000
--- a/src/vs/workbench/parts/quickopen/browser/media/EnumItem_inverse_16x.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><style>.icon-canvas-transparent{opacity:0;fill:#2d2d30}.icon-vs-out{fill:#2d2d30}.icon-vs-fg{fill:#2b282e}.icon-vs-action-blue{fill:#75beff}</style><path class="icon-canvas-transparent" d="M16 16H0V0h16v16z" id="canvas"/><path class="icon-vs-out" d="M0 15V6h6V2.586L7.585 1h6.829L16 2.586v5.829L14.414 10H10v5H0zm3-6z" id="outline"/><path class="icon-vs-fg" d="M8 3v3h5v1h-3v1h4V3H8zm5 2H9V4h4v1zM2 8v5h6V8H2zm5 3H3v-1h4v1z" id="iconFg"/><path class="icon-vs-action-blue" d="M10 6h3v1h-3V6zM9 4v1h4V4H9zm5-2H8L7 3v3h1V3h6v5h-4v1h4l1-1V3l-1-1zm-7 8H3v1h4v-1zm2-3v7H1V7h8zM8 8H2v5h6V8z" id="iconBg"/></svg>
\ No newline at end of file
diff --git a/src/vs/workbench/parts/quickopen/browser/media/Event_16x_vscode.svg b/src/vs/workbench/parts/quickopen/browser/media/Event_16x_vscode.svg
deleted file mode 100644
index 0e202ec10be..00000000000
--- a/src/vs/workbench/parts/quickopen/browser/media/Event_16x_vscode.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><style>.icon-canvas-transparent{opacity:0;fill:#f6f6f6}.icon-vs-out{fill:#f6f6f6}.icon-vs-action-orange{fill:#c27d1a}</style><path class="icon-canvas-transparent" d="M16 16H0V0h16v16z" id="canvas"/><path class="icon-vs-out" d="M14 1.414L9.414 6H14v1.414L5.414 16H3v-1.234L5.371 10H2V8.764L6.382 0H14v1.414z" id="outline" style="display: none;"/><path class="icon-vs-action-orange" d="M7 7h6l-8 8H4l2.985-6H3l4-8h6L7 7z" id="iconBg"/></svg>
\ No newline at end of file
diff --git a/src/vs/workbench/parts/quickopen/browser/media/Event_16x_vscode_inverse.svg b/src/vs/workbench/parts/quickopen/browser/media/Event_16x_vscode_inverse.svg
deleted file mode 100644
index a508edcd3d6..00000000000
--- a/src/vs/workbench/parts/quickopen/browser/media/Event_16x_vscode_inverse.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><style>.icon-canvas-transparent{opacity:0;fill:#2d2d30}.icon-vs-out{fill:#2d2d30}.icon-vs-action-orange{fill:#e8ab53}</style><path class="icon-canvas-transparent" d="M16 16H0V0h16v16z" id="canvas"/><path class="icon-vs-out" d="M14 1.414L9.414 6H14v1.414L5.414 16H3v-1.234L5.371 10H2V8.764L6.382 0H14v1.414z" id="outline" style="display: none;"/><path class="icon-vs-action-orange" d="M7 7h6l-8 8H4l2.985-6H3l4-8h6L7 7z" id="iconBg"/></svg>
\ No newline at end of file
diff --git a/src/vs/workbench/parts/quickopen/browser/media/Operator_16x_vscode.svg b/src/vs/workbench/parts/quickopen/browser/media/Operator_16x_vscode.svg
deleted file mode 100644
index ba2f2d091cf..00000000000
--- a/src/vs/workbench/parts/quickopen/browser/media/Operator_16x_vscode.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><style>.icon-canvas-transparent{opacity:0;fill:#f6f6f6}.icon-vs-out{fill:#f6f6f6}.icon-vs-fg{fill:#f0eff1}.icon-vs-action-blue{fill:#00539c}</style><path class="icon-canvas-transparent" d="M16 16H0V0h16v16z" id="canvas"/><path class="icon-vs-out" d="M16 16H0V0h16v16z" id="outline" style="display: none;"/><path class="icon-vs-action-blue" d="M1 1v14h14V1H1zm6 12H3v-1h4v1zm0-3H3V9h4v1zm0-5H5v2H4V5H2V4h2V2h1v2h2v1zm3.281 8H8.719l3-4h1.563l-3.001 4zM14 5H9V4h5v1z" id="iconBg"/><path class="icon-vs-fg" d="M7 5H5v2H4V5H2V4h2V2h1v2h2v1zm7-1H9v1h5V4zM7 9H3v1h4V9zm0 3H3v1h4v-1zm3.281 1l3-4h-1.563l-3 4h1.563z" id="iconFg" style="display: none;"/></svg>
\ No newline at end of file
diff --git a/src/vs/workbench/parts/quickopen/browser/media/Operator_16x_vscode_inverse.svg b/src/vs/workbench/parts/quickopen/browser/media/Operator_16x_vscode_inverse.svg
deleted file mode 100644
index 21e1e814b2e..00000000000
--- a/src/vs/workbench/parts/quickopen/browser/media/Operator_16x_vscode_inverse.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><style>.icon-canvas-transparent{opacity:0;fill:#2d2d30}.icon-vs-out{fill:#2d2d30}.icon-vs-fg{fill:#2b282e}.icon-vs-action-blue{fill:#75beff}</style><path class="icon-canvas-transparent" d="M16 16H0V0h16v16z" id="canvas"/><path class="icon-vs-out" d="M16 16H0V0h16v16z" id="outline" style="display: none;"/><path class="icon-vs-action-blue" d="M1 1v14h14V1H1zm6 12H3v-1h4v1zm0-3H3V9h4v1zm0-5H5v2H4V5H2V4h2V2h1v2h2v1zm3.281 8H8.719l3-4h1.563l-3.001 4zM14 5H9V4h5v1z" id="iconBg"/><path class="icon-vs-fg" d="M7 5H5v2H4V5H2V4h2V2h1v2h2v1zm7-1H9v1h5V4zM7 9H3v1h4V9zm0 3H3v1h4v-1zm3.281 1l3-4h-1.563l-3 4h1.563z" id="iconFg" style="display: none;"/></svg>
\ No newline at end of file
diff --git a/src/vs/workbench/parts/quickopen/browser/media/Structure_16x_vscode.svg b/src/vs/workbench/parts/quickopen/browser/media/Structure_16x_vscode.svg
deleted file mode 100644
index e776cbc5651..00000000000
--- a/src/vs/workbench/parts/quickopen/browser/media/Structure_16x_vscode.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><style>.icon-canvas-transparent{opacity:0;fill:#f6f6f6}.icon-vs-out{fill:#f6f6f6}.icon-vs-action-blue{fill:#00539c}</style><path class="icon-canvas-transparent" d="M16 16H0V0h16v16z" id="canvas"/><path class="icon-vs-out" d="M9 14V8H7v6H1V2h14v12H9z" id="outline" style="display: none;"/><path class="icon-vs-action-blue" d="M10 9h4v4h-4V9zm-8 4h4V9H2v4zM2 3v4h12V3H2z" id="iconBg"/></svg>
\ No newline at end of file
diff --git a/src/vs/workbench/parts/quickopen/browser/media/Structure_16x_vscode_inverse.svg b/src/vs/workbench/parts/quickopen/browser/media/Structure_16x_vscode_inverse.svg
deleted file mode 100644
index 1b76b62be9a..00000000000
--- a/src/vs/workbench/parts/quickopen/browser/media/Structure_16x_vscode_inverse.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><style>.icon-canvas-transparent{opacity:0;fill:#2d2d30}.icon-vs-out{fill:#2d2d30}.icon-vs-action-blue{fill:#75beff}</style><path class="icon-canvas-transparent" d="M16 16H0V0h16v16z" id="canvas"/><path class="icon-vs-out" d="M9 14V8H7v6H1V2h14v12H9z" id="outline" style="display: none;"/><path class="icon-vs-action-blue" d="M10 9h4v4h-4V9zm-8 4h4V9H2v4zM2 3v4h12V3H2z" id="iconBg"/></svg>
\ No newline at end of file
diff --git a/src/vs/workbench/parts/quickopen/browser/media/Template_16x_vscode.svg b/src/vs/workbench/parts/quickopen/browser/media/Template_16x_vscode.svg
deleted file mode 100644
index 788cc8d6450..00000000000
--- a/src/vs/workbench/parts/quickopen/browser/media/Template_16x_vscode.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><style>.icon-canvas-transparent{opacity:0;fill:#f6f6f6}.icon-vs-out{fill:#f6f6f6}.icon-vs-bg{fill:#424242}</style><path class="icon-canvas-transparent" d="M16 16H0V0h16v16z" id="canvas"/><path class="icon-vs-out" d="M10.702 10.5l2-2-2-2 .5-.5H10v5h1v3H5v-3h1V6H4.798l.5.5-2 2 2 2L3 12.797l-3-3V7.201l3-3V2h10v2.201l3 3v2.596l-3 3-2.298-2.297z" id="outline" style="display: none;"/><path class="icon-vs-bg" d="M4 3h8v2h-1v-.5c0-.277-.224-.5-.5-.5H9v7.5c0 .275.224.5.5.5h.5v1H6v-1h.5a.5.5 0 0 0 .5-.5V4H5.5a.5.5 0 0 0-.5.5V5H4V3zM3 5.615L.116 8.5 3 11.383l.884-.883-2-2 2-2L3 5.615zm10 0l-.884.885 2 2-2 2 .884.883L15.884 8.5 13 5.615z" id="iconBg"/></svg>
\ No newline at end of file
diff --git a/src/vs/workbench/parts/quickopen/browser/media/Template_16x_vscode_inverse.svg b/src/vs/workbench/parts/quickopen/browser/media/Template_16x_vscode_inverse.svg
deleted file mode 100644
index 6cec71cb033..00000000000
--- a/src/vs/workbench/parts/quickopen/browser/media/Template_16x_vscode_inverse.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><style>.icon-canvas-transparent{opacity:0;fill:#2d2d30}.icon-vs-out{fill:#2d2d30}.icon-vs-bg{fill:#c5c5c5}</style><path class="icon-canvas-transparent" d="M16 16H0V0h16v16z" id="canvas"/><path class="icon-vs-out" d="M10.702 10.5l2-2-2-2 .5-.5H10v5h1v3H5v-3h1V6H4.798l.5.5-2 2 2 2L3 12.797l-3-3V7.201l3-3V2h10v2.201l3 3v2.596l-3 3-2.298-2.297z" id="outline" style="display: none;"/><path class="icon-vs-bg" d="M4 3h8v2h-1v-.5c0-.277-.224-.5-.5-.5H9v7.5c0 .275.224.5.5.5h.5v1H6v-1h.5a.5.5 0 0 0 .5-.5V4H5.5a.5.5 0 0 0-.5.5V5H4V3zM3 5.615L.116 8.5 3 11.383l.884-.883-2-2 2-2L3 5.615zm10 0l-.884.885 2 2-2 2 .884.883L15.884 8.5 13 5.615z" id="iconBg"/></svg>
\ No newline at end of file
diff --git a/src/vs/workbench/parts/quickopen/browser/media/gotoSymbolHandler.css b/src/vs/workbench/parts/quickopen/browser/media/gotoSymbolHandler.css
deleted file mode 100644
index 4d99facd57b..00000000000
--- a/src/vs/workbench/parts/quickopen/browser/media/gotoSymbolHandler.css
+++ /dev/null
@@ -1,154 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-.monaco-workbench .monaco-quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.constant {
-	background-image: url('Constant_16x.svg');
-	background-repeat: no-repeat;
-	background-position: 0 -2px;
-}
-.vs-dark .monaco-workbench .monaco-quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.constant,
-.hc-black .monaco-workbench .monaco-quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.constant {
-	background-image: url('Constant_16x_inverse.svg');
-}
-
-.monaco-workbench .monaco-quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.enum-member {
-	background-image: url('EnumItem_16x.svg');
-	background-repeat: no-repeat;
-	background-position: 0 -2px;
-}
-.vs-dark .monaco-workbench .monaco-quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.enum-member,
-.hc-black .monaco-workbench .monaco-quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.enum-member {
-	background-image: url('EnumItem_inverse_16x.svg');
-}
-
-.monaco-workbench .monaco-quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.struct {
-	background-image: url('Structure_16x_vscode.svg');
-	background-repeat: no-repeat;
-	background-position: 0 -2px;
-}
-.vs-dark .monaco-workbench .monaco-quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.struct,
-.hc-black .monaco-workbench .monaco-quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.struct {
-	background-image: url('Structure_16x_vscode_inverse.svg');
-}
-
-.monaco-workbench .monaco-quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.event {
-	background-image: url('Event_16x_vscode.svg');
-	background-repeat: no-repeat;
-	background-position: 0 -2px;
-}
-.vs-dark .monaco-workbench .monaco-quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.event,
-.hc-black .monaco-workbench .monaco-quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.event {
-	background-image: url('Event_16x_vscode_inverse.svg');
-}
-
-.monaco-workbench .monaco-quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.operator {
-	background-image: url('Operator_16x_vscode.svg');
-	background-repeat: no-repeat;
-	background-position: 0 -2px;
-}
-.vs-dark .monaco-workbench .monaco-quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.operator,
-.hc-black .monaco-workbench .monaco-quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.operator {
-	background-image: url('Operator_16x_vscode_inverse.svg');
-}
-
-.monaco-workbench .monaco-quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.type-parameter {
-	background-image: url('Template_16x_vscode.svg');
-	background-repeat: no-repeat;
-	background-position: 0 -2px;
-}
-.vs-dark .monaco-workbench .monaco-quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.type-parameter,
-.hc-black .monaco-workbench .monaco-quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.type-parameter {
-	background-image: url('Template_16x_vscode_inverse.svg');
-}
-
-.monaco-workbench .monaco-quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.method,
-.monaco-workbench .monaco-quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.function,
-.monaco-workbench .monaco-quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.constructor,
-.monaco-workbench .monaco-quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.field,
-.monaco-workbench .monaco-quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.variable,
-.monaco-workbench .monaco-quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.class,
-.monaco-workbench .monaco-quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.interface,
-.monaco-workbench .monaco-quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.object,
-.monaco-workbench .monaco-quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.namespace,
-.monaco-workbench .monaco-quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.package,
-.monaco-workbench .monaco-quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.module,
-.monaco-workbench .monaco-quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.property,
-.monaco-workbench .monaco-quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.enum,
-.monaco-workbench .monaco-quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.key,
-.monaco-workbench .monaco-quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.string,
-.monaco-workbench .monaco-quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.rule,
-.monaco-workbench .monaco-quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.file,
-.monaco-workbench .monaco-quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.array,
-.monaco-workbench .monaco-quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.number,
-.monaco-workbench .monaco-quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.null,
-.monaco-workbench .monaco-quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.boolean {
-	background-image: url('symbol-sprite.svg');
-	background-repeat: no-repeat;
-}
-
-.vs .monaco-workbench .monaco-quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.method,
-.vs .monaco-workbench .monaco-quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.function,
-.vs .monaco-workbench .monaco-quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.constructor		{ background-position: 0 -4px; }
-.vs .monaco-workbench .monaco-quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.field,
-.vs .monaco-workbench .monaco-quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.variable 		{ background-position: -22px -4px; }
-.vs .monaco-workbench .monaco-quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.class 			{ background-position: -43px -3px; }
-.vs .monaco-workbench .monaco-quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.interface 		{ background-position: -63px -4px; }
-.vs .monaco-workbench .monaco-quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.object,
-.vs .monaco-workbench .monaco-quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.namespace,
-.vs .monaco-workbench .monaco-quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.package,
-.vs .monaco-workbench .monaco-quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.module 			{ background-position: -82px -4px; }
-.vs .monaco-workbench .monaco-quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.property 		{ background-position: -102px -3px; }
-.vs .monaco-workbench .monaco-quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.enum		 		{ background-position: -122px -3px; }
-.vs .monaco-workbench .monaco-quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.key,
-.vs .monaco-workbench .monaco-quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.string		 	{ background-position: -202px -3px; }
-.vs .monaco-workbench .monaco-quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.rule		 		{ background-position: -242px -4px; }
-.vs .monaco-workbench .monaco-quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.file		 		{ background-position: -262px -4px; }
-.vs .monaco-workbench .monaco-quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.array		 	{ background-position: -302px -4px; }
-.vs .monaco-workbench .monaco-quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.number		 	{ background-position: -322px -4px; }
-.vs .monaco-workbench .monaco-quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.null,
-.vs .monaco-workbench .monaco-quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.boolean		 	{ background-position: -343px -4px; }
-
-.vs-dark .monaco-workbench .monaco-quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.method,
-.vs-dark .monaco-workbench .monaco-quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.function,
-.vs-dark .monaco-workbench .monaco-quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.constructor,
-.hc-black .monaco-workbench .monaco-quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.method,
-.hc-black .monaco-workbench .monaco-quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.function,
-.hc-black .monaco-workbench .monaco-quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.constructor 	{ background-position: 0 -24px; }
-.vs-dark .monaco-workbench .monaco-quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.field,
-.hc-black .monaco-workbench .monaco-quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.field,
-.vs-dark .monaco-workbench .monaco-quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.variable,
-.hc-black .monaco-workbench .monaco-quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.variable 		{ background-position: -22px -24px; }
-.vs-dark .monaco-workbench .monaco-quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.class,
-.hc-black .monaco-workbench .monaco-quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.class 			{ background-position: -43px -23px; }
-.vs-dark .monaco-workbench .monaco-quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.interface,
-.hc-black .monaco-workbench .monaco-quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.interface 		{ background-position: -63px -24px; }
-.vs-dark .monaco-workbench .monaco-quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.object,
-.vs-dark .monaco-workbench .monaco-quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.namespace,
-.vs-dark .monaco-workbench .monaco-quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.package,
-.vs-dark .monaco-workbench .monaco-quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.module,
-.hc-black .monaco-workbench .monaco-quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.object,
-.hc-black .monaco-workbench .monaco-quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.namespace,
-.hc-black .monaco-workbench .monaco-quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.package,
-.hc-black .monaco-workbench .monaco-quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.module 		{ background-position: -82px -24px; }
-.vs-dark .monaco-workbench .monaco-quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.property,
-.hc-black .monaco-workbench .monaco-quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.property 		{ background-position: -102px -23px; }
-.vs-dark .monaco-workbench .monaco-quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.key,
-.vs-dark .monaco-workbench .monaco-quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.string,
-.hc-black .monaco-workbench .monaco-quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.key,
-.hc-black .monaco-workbench .monaco-quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.string			{ background-position: -202px -23px; }
-.vs-dark .monaco-workbench .monaco-quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.enum,
-.hc-black .monaco-workbench .monaco-quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.enum			{ background-position: -122px -23px; }
-.vs-dark .monaco-workbench .monaco-quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.rule,
-.hc-black .monaco-workbench .monaco-quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.rule			{ background-position: -242px -24px; }
-.vs-dark .monaco-workbench .monaco-quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.file,
-.hc-black .monaco-workbench .monaco-quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.file			{ background-position: -262px -24px; }
-.vs-dark .monaco-workbench .monaco-quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.array,
-.hc-black .monaco-workbench .monaco-quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.array			{ background-position: -302px -24px; }
-.vs-dark .monaco-workbench .monaco-quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.number,
-.hc-black .monaco-workbench .monaco-quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.number			{ background-position: -322px -24px; }
-.vs-dark .monaco-workbench .monaco-quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.null,
-.vs-dark .monaco-workbench .monaco-quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.boolean,
-.hc-black .monaco-workbench .monaco-quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.null,
-.hc-black .monaco-workbench .monaco-quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.boolean			{ background-position: -342px -24px; }
diff --git a/src/vs/workbench/parts/quickopen/browser/media/symbol-sprite.svg b/src/vs/workbench/parts/quickopen/browser/media/symbol-sprite.svg
deleted file mode 100644
index ee9a63dcf6f..00000000000
--- a/src/vs/workbench/parts/quickopen/browser/media/symbol-sprite.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="360" height="40"><rect x="342" y="24" fill="#2D2D30" width="16" height="12"/><polygon fill="#C5C5C5" points="353,27 356,30 353,33 351,33 353,31 350,31 350,29 353,29 351,27"/><rect x="343" y="25" fill="#C5C5C5" width="14" height="10"/><polygon fill="#C5C5C5" points="356,26 350,26 350,29 349.999,29 347,29 349,27 347,27 344,30 347,33 349,33 347,31 349.999,31 350,31 350,34 356,34 356,30"/><polygon fill="#2B282E" points="350,31 347,31 349,33 347,33 344,30 347,27 349,27 347,29 350,29"/><polygon fill="#2B282E" points="351,33 353,31 350,31 350,34 356,34 356,30 353,33"/><polygon fill="#2B282E" points="356,26 356,30 353,27 351,27 353,29 350,29 350,26"/><rect x="349.999" y="29" fill="#2B282E" width=".001" height="2"/><path fill="#F6F6F6" d="M358 16h-16v-12h16v12z"/><path fill="#424242" d="M353 7l3 3-3 3h-2l2-2h-3v-2h3l-2-2h2zm4-2v10h-14v-10h14zm-1 1h-6v3h-3l2-2h-2l-3 3 3 3h2l-2-2h3v3h6v-8z"/><path fill="#F0EFF1" d="M350 11h-3l2 2h-2l-3-3 3-3h2l-2 2h3v2zm1 2l2-2h-3v3h6v-4l-3 3h-2zm5-7v4l-3-3h-2l2 2h-3v-3h6zm-6 3v2h-.001l.001-2z"/><polygon fill="#2D2D30" points="333,27 333,25 330,25 327,25 327,27 325,27 325,33 327,33 327,35 333,35 333,33 335,33 335,30 335,27"/><polygon fill="#F6F6F6" points="333,7 333,5 330,5 327,5 327,7 325,7 325,13 327,13 327,15 333,15 333,13 335,13 335,10 335,7"/><path fill="#424242" d="M334 9v-1h-2v-2h-1v2h-2v-2h-1v2h-2v1h2v2h-2v1h2v2h1v-2h2v2h1v-2h2v-1h-2v-2h2zm-3 2h-2v-2h2v2z"/><g fill="#C5C5C5"><polygon points="304,26 304,34.016 306,34.016 306,35.006 303,35.006 303,35 303,34.016 303,26 303,25 304,25 304,25 306,25 306,26"/><polygon points="312,26 312,34.016 310,34.016 310,35.006 313,35.006 313,35 313,34.016 313,26 313,25 312,25 312,25 310,25 310,26"/></g><path fill="#424242" d="M304 6v8.016h2v.99h-3v-10.006h3v1h-2zm8 0v8.016h-2v.99h3v-10.006h-3v1h2z"/><polygon fill="#2D2D30" points="292.414,24 287.586,24 286,25.586 286,28 283.586,28 282,29.586 282,33.414 283.586,35 288.414,35 290,33.414 290,31 292.414,31 294,29.414 294,25.586"/><polygon fill="#E8AB53" points="288,29 284,29 283,30 283,33 284,34 288,34 289,33 289,30"/><rect x="284" y="32" fill="#E8AB53" width="4" height="1"/><rect x="284" y="30" fill="#E8AB53" width="4" height="1"/><polygon fill="#E8AB53" points="292,25 288,25 287,26 287,28 292,28 292,29 289.414,29 290,29.586 290,30 292,30 293,29 293,26"/><rect x="288" y="26" fill="#E8AB53" width="4" height="1"/><polygon fill="#2B282E" points="292,28 292,29 289.414,29 288.414,28"/><rect x="288" y="26" fill="#2B282E" width="4" height="1"/><rect x="284" y="32" fill="#2B282E" width="4" height="1"/><rect x="284" y="30" fill="#2B282E" width="4" height="1"/><polygon fill="#F6F6F6" points="292.414,4 287.586,4 286,5.586 286,8 283.586,8 282,9.586 282,13.414 283.586,15 288.414,15 290,13.414 290,11 292.414,11 294,9.414 294,5.586"/><path fill="#C27D1A" d="M288 9h-4l-1 1v3l1 1h4l1-1v-3l-1-1zm0 4h-4v-1h4v1zm0-2h-4v-1h4v1z"/><path fill="#C27D1A" d="M292 5h-4l-1 1v2h5v1h-2.586l.586.586v.414h2l1-1v-3l-1-1zm0 2h-4v-1h4v1z"/><path fill="#F0EFF1" d="M292 8v1h-2.586l-1-1h3.586zm0-2h-4v1h4v-1zm-4 6h-4v1h4v-1zm0-2h-4v1h4v-1z"/><polygon fill="#2D2D30" points="265,35 265,24 271.414,24 275,27.586 275,35"/><polygon fill="#C5C5C5" points="271,25 266,25 266,34 274,34 274,28"/><polygon fill="#C5C5C5" points="273,29 273,33 267,33 267,26 270,26 271,26 271,28 273,28"/><polygon fill="#2B282E" points="273,29 273,33 267,33 267,26 270,26 271,26 271,28 273,28"/><path fill="#F6F6F6" d="M265 15v-11h6.414l3.586 3.586v7.414h-10z"/><path fill="#424242" d="M271 5h-5v9h8v-6l-3-3zm2 4v4h-6v-7h4v2h2v1z"/><polygon fill="#F0EFF1" points="273,9 273,13 267,13 267,6 270,6 271,6 271,8 273,8"/><polygon fill="#2D2D30" points="247,34 247,30 245,30 245,26 255,26 255,34"/><rect x="246" y="27" fill="#C5C5C5" width="8" height="2"/><rect x="248" y="30" fill="#C5C5C5" width="6" height="1"/><rect x="248" y="32" fill="#C5C5C5" width="6" height="1"/><polygon fill="#F6F6F6" points="247,14 247,10 245,10 245,6 255,6 255,14"/><path fill="#424242" d="M254 9h-8v-2h8v2zm0 1h-6v1h6v-1zm0 2h-6v1h6v-1z"/><path fill="#2D2D30" d="M230.701 35.992c-3.336 0-6.701-1.703-6.701-5.51 0-4.174 4.968-6.482 8.402-6.482 1.07 0 1.867.244 2.369.725.658.631.791 1.299.785 1.746-.013 1.176-.904 2.146-1.822 3.008 1.408.194 2.088 1.144 2.254 2.037.297 1.604-.805 3.371-2.508 4.021-.761.293-1.75.455-2.779.455z"/><path fill="#C5C5C5" d="M232.646 30.482s-1.91.459-.478-.916c1.217-1.166 3.345-2.746 1.91-4.119-1.435-1.375-9.079.455-9.079 5.035s5.734 5.037 8.124 4.121c2.391-.914 2.867-4.578-.477-4.121z"/><circle fill="#C5C5C5" cx="227.375" cy="31.343" r="1.042"/><circle fill="#C5C5C5" cx="228.416" cy="28.343" r="1.041"/><circle fill="#C5C5C5" cx="231.402" cy="27.135" r="1.041"/><circle fill="#2B282E" cx="231.402" cy="27.135" r="1.041"/><circle fill="#2B282E" cx="228.416" cy="28.343" r="1.041"/><circle fill="#2B282E" cx="227.375" cy="31.344" r="1.041"/><path fill="#F6F6F6" d="M230.701 15.992c-3.336 0-6.701-1.703-6.701-5.509 0-4.174 4.968-6.483 8.402-6.483 1.07 0 1.867.244 2.369.725.658.631.791 1.298.785 1.746-.013 1.174-.904 2.146-1.822 3.008 1.408.194 2.088 1.142 2.254 2.036.297 1.604-.805 3.371-2.508 4.022-.761.294-1.75.455-2.779.455z"/><path fill="#424242" d="M232.646 10.482s-1.91.458-.478-.916c1.217-1.167 3.345-2.747 1.91-4.12-1.433-1.375-9.078.456-9.078 5.036 0 4.581 5.734 5.038 8.124 4.122 2.39-.915 2.866-4.578-.478-4.122zm-5.271 1.902c-.574 0-1.041-.467-1.041-1.041 0-.575.467-1.042 1.041-1.042s1.041.466 1.041 1.042c0 .574-.467 1.041-1.041 1.041zm1.041-3c-.574 0-1.041-.466-1.041-1.041s.467-1.041 1.041-1.041 1.041.466 1.041 1.041-.467 1.041-1.041 1.041zm1.945-2.25c0-.575.467-1.041 1.041-1.041s1.041.466 1.041 1.041-.467 1.041-1.041 1.041-1.041-.466-1.041-1.041z"/><g fill="#F0EFF1"><circle cx="231.402" cy="7.134" r="1.041"/><circle cx="228.416" cy="8.343" r="1.041"/><circle cx="227.375" cy="11.343" r="1.041"/></g><rect x="202" y="23" fill="#2D2D30" width="16" height="14"/><rect x="203" y="24" fill="#C5C5C5" width="14" height="12"/><rect x="210" y="29" fill="#C5C5C5" width="1" height="2"/><rect x="204" y="25" fill="#2B282E" width="12" height="10"/><polygon fill="#C5C5C5" points="210,28 210,27 209,27 209,32 212,32 212,28"/><rect x="210" y="29" fill="#2B282E" width="1" height="2"/><polygon fill="#C5C5C5" points="214,29 214,31 215,31 215,32 213,32 213,28 215,28 215,29"/><polygon fill="#C5C5C5" points="208,28 208,32 205,32 205,30 206,30 206,31 207,31 207,30 206,30 206,29 205,29 205,28"/><rect x="202" y="3" fill="#F6F6F6" width="16" height="14"/><path fill="#424242" d="M203 4v12h14v-12h-14zm13 11h-12v-10h12v10zm-6-7v-1h-1v5h3v-4h-2zm1 3h-1v-2h1v2zm3-2v2h1v1h-2v-4h2v1h-1zm-6-1v4h-3v-2h1v1h1v-1h-1v-1h-1v-1h3z"/><path fill="#F0EFF1" d="M210 9h1v2h-1v-2zm-3 2v-1h-1v1h1zm9-6v10h-12v-10h12zm-8 3h-3v1h1v1h-1v2h3v-4zm4 0h-2v-1h-1v5h3v-4zm3 0h-2v4h2v-1h-1v-2h1v-1z"/><rect x="185" y="24" fill="#2D2D30" width="11" height="12"/><polygon fill="#C5C5C5" points="194,33 194,26 187,26 187,33 186,33 186,25 195,25 195,33"/><rect x="186" y="34" fill="#C5C5C5" width="1" height="1"/><rect x="188" y="34" fill="#C5C5C5" width="1" height="1"/><rect x="190" y="34" fill="#C5C5C5" width="1" height="1"/><rect x="192" y="34" fill="#C5C5C5" width="1" height="1"/><rect x="194" y="34" fill="#C5C5C5" width="1" height="1"/><rect x="187" y="26" fill="#2B282E" width="7" height="7"/><rect x="185" y="4" fill="#F6F6F6" width="11" height="12"/><path fill="#424242" d="M194 13v-7h-7v7h-1v-8h9v8h-1zm-7 2h-1v-1h1v1zm2-1h-1v1h1v-1zm2 0h-1v1h1v-1zm2 1h-1v-1h1v1zm2-1h-1v1h1v-1z"/><path fill="#F0EFF1" d="M187 13v-7h7v7h-7z"/><polygon fill="#2D2D30" points="164,35 164,24 171,24 171,25 176,25 176,28 171,28 171,29 176,29 176,35"/><rect x="171" y="26" fill="#C5C5C5" width="4" height="1"/><rect x="173" y="30" fill="#C5C5C5" width="2" height="1"/><rect x="165" y="30" fill="#C5C5C5" width="6" height="1"/><rect x="165" y="33" fill="#C5C5C5" width="4" height="1"/><rect x="171" y="33" fill="#C5C5C5" width="4" height="1"/><rect x="165" y="25" fill="#C5C5C5" width="5" height="3"/><rect x="166" y="26" fill="#C5C5C5" width="3" height="1"/><rect x="166" y="26" fill="#2B282E" width="3" height="1"/><polygon fill="#F6F6F6" points="164,15 164,4 171,4 171,5 176,5 176,8 171,8 171,9 176,9 176,15"/><path fill="#424242" d="M175 7h-4v-1h4v1zm0 3h-2v1h2v-1zm-4 0h-6v1h6v-1zm-2 3h-4v1h4v-1zm6 0h-4v1h4v-1zm-5-8v3h-5v-3h5zm-1 1h-3v1h3v-1z"/><rect x="166" y="6" fill="#F0EFF1" width="3" height="1"/><polygon fill="#2D2D30" points="154.414,24 149.586,24 148,25.586 148,28 144,28 144,35 152,35 152,31 154.414,31 156,29.414 156,25.586"/><polygon fill="#75BEFF" points="154,25 150,25 149,26 149,28 154,28 154,29 152,29 152,30 154,30 155,29 155,26"/><rect x="150" y="26" fill="#00539C" width="4" height="1"/><rect x="145" y="29" fill="#75BEFF" width="6" height="5"/><rect x="146" y="31" fill="#00539C" width="4" height="1"/><rect x="146" y="31" fill="#2B282E" width="4" height="1"/><rect x="150" y="26" fill="#2B282E" width="4" height="1"/><rect x="152" y="28" fill="#2B282E" width="2" height="1"/><polygon fill="#F6F6F6" points="154.414,4 149.586,4 148,5.586 148,8 144,8 144,15 152,15 152,11 154.414,11 156,9.414 156,5.586"/><path fill="#00539C" d="M154 5h-4l-1 1v2h5v1h-2v1h2l1-1v-3l-1-1zm0 2h-4v-1h4v1zm-9 7h6v-5h-6v5zm1-3h4v1h-4v-1z"/><g fill="#F0EFF1"><rect x="146" y="11" width="4" height="1"/><rect x="150" y="6" width="4" height="1"/><rect x="152" y="8" width="2" height="1"/></g><rect x="125" y="27" fill="#2D2D30" width="11" height="6"/><rect x="126" y="28" fill="#C5C5C5" width="9" height="4"/><rect x="127" y="30" fill="#2B282E" width="1" height="1"/><rect x="129" y="30" fill="#2B282E" width="1" height="1"/><rect x="131" y="30" fill="#2B282E" width="1" height="1"/><rect x="133" y="30" fill="#2B282E" width="1" height="1"/><rect x="127" y="29" fill="#2B282E" width="3" height="1"/><rect x="131" y="29" fill="#2B282E" width="3" height="1"/><rect x="125" y="7" fill="#F6F6F6" width="11" height="6"/><rect x="126" y="8" fill="#424242" width="9" height="4"/><rect x="127" y="10" fill="#F0EFF1" width="1" height="1"/><rect x="129" y="10" fill="#F0EFF1" width="1" height="1"/><rect x="131" y="10" fill="#F0EFF1" width="1" height="1"/><rect x="133" y="10" fill="#F0EFF1" width="1" height="1"/><rect x="127" y="9" fill="#F0EFF1" width="3" height="1"/><rect x="131" y="9" fill="#F0EFF1" width="3" height="1"/><path fill="#2D2D30" d="M110.449 23c-1.637 0-3.075.797-3.987 2.012l.001.002c-.628.836-1.014 1.863-1.014 2.986 0 .469.067.934.2 1.385l-2.907 2.908c-.687.686-1.253 2.161 0 3.414.609.609 1.244.736 1.67.736.958 0 1.621-.613 1.744-.736l2.907-2.908c.453.133.917.201 1.386.201 1.123 0 2.149-.387 2.985-1.014h.002c1.216-.911 2.013-2.352 2.013-3.986 0-2.762-2.238-5-5-5z"/><path fill="#C5C5C5" d="M114.09 26.359l-2.641 2.641-2-2 2.641-2.641c-.502-.228-1.055-.359-1.641-.359-2.209 0-4 1.791-4 4 0 .586.133 1.139.359 1.641l-3.359 3.359s-1 1 0 2h2l3.359-3.359c.502.227 1.055.359 1.641.359 2.209 0 4-1.791 4-4 0-.586-.133-1.139-.359-1.641z"/><path fill="#F6F6F6" d="M110.449 3c-1.637 0-3.075.797-3.987 2.012l.001.002c-.628.836-1.014 1.863-1.014 2.986 0 .469.067.933.2 1.385l-2.907 2.908c-.687.686-1.253 2.161 0 3.414.609.609 1.244.736 1.67.736.958 0 1.621-.613 1.744-.736l2.907-2.908c.453.133.917.201 1.386.201 1.123 0 2.149-.387 2.985-1.014l.002.001c1.216-.912 2.013-2.352 2.013-3.987 0-2.762-2.238-5-5-5z"/><path fill="#424242" d="M114.09 6.359l-2.641 2.641-2-2 2.641-2.641c-.502-.226-1.055-.359-1.641-.359-2.209 0-4 1.791-4 4 0 .586.133 1.139.359 1.64l-3.359 3.36s-1 1 0 2h2l3.359-3.36c.502.227 1.055.36 1.641.36 2.209 0 4-1.791 4-4 0-.586-.133-1.139-.359-1.641z"/><path fill="#2D2D30" d="M89 33h1v-1c0-.537.741-1.613 1-2-.259-.389-1-1.467-1-2v-1h-1v-3h1c1.969.021 3 1.277 3 3v1l1 1v2l-1 1v1c0 1.709-1.031 2.979-3 3h-1v-3z"/><path fill="#2D2D30" d="M87 33h-1v-1c0-.537-.741-1.613-1-2 .259-.389 1-1.467 1-2v-1h1v-3h-1c-1.969.021-3 1.277-3 3v1l-1 1v2l1 1v1c0 1.709 1.317 2.979 3.286 3h.714v-3z"/><path fill="#C5C5C5" d="M91 33v-1c0-.834.496-1.738 1-2-.504-.27-1-1.168-1-2v-1c0-.84-.584-1-1-1v-1c2.083 0 2 1.166 2 2v1c0 .969.703.98 1 1v2c-.322.02-1 .053-1 1v1c0 .834.083 2-2 2v-1c.833 0 1-1 1-1z"/><path fill="#C5C5C5" d="M85 33v-1c0-.834-.496-1.738-1-2 .504-.27 1-1.168 1-2v-1c0-.84.584-1 1-1v-1c-2.083 0-2 1.166-2 2v1c0 .969-.703.98-1 1v2c.322.02 1 .053 1 1v1c0 .834-.083 2 2 2v-1c-.833 0-1-1-1-1z"/><path fill="#F6F6F6" d="M89 13h1v-1c0-.537.741-1.613 1-2-.259-.389-1-1.467-1-2v-1h-1v-3h1c1.969.021 3 1.277 3 3v1l1 1v2l-1 1v1c0 1.709-1.031 2.979-3 3h-1v-3zm-2 0h-1v-1c0-.537-.741-1.613-1-2 .259-.389 1-1.467 1-2v-1h1v-3h-1c-1.969.021-3 1.277-3 3v1l-1 1v2l1 1v1c0 1.709 1.317 2.979 3.286 3h.714v-3z"/><path fill="#424242" d="M91 13v-1c0-.834.496-1.738 1-2-.504-.27-1-1.168-1-2v-1c0-.84-.584-1-1-1v-1c2.083 0 2 1.166 2 2v1c0 .969.703.98 1 1v2c-.322.02-1 .053-1 1v1c0 .834.083 2-2 2v-1c.833 0 1-1 1-1zm-6 0v-1c0-.834-.496-1.738-1-2 .504-.27 1-1.168 1-2v-1c0-.84.584-1 1-1v-1c-2.083 0-2 1.166-2 2v1c0 .969-.703.98-1 1v2c.322.02 1 .053 1 1v1c0 .834-.083 2 2 2v-1c-.833 0-1-1-1-1z"/><path fill="#2D2D30" d="M73.5 34c-1.914 0-3.601-1.242-4.227-3h-1.683c-.524.91-1.503 1.5-2.591 1.5-1.654 0-3-1.346-3-3s1.346-3 3-3c1.088 0 2.066.588 2.591 1.5h1.683c.626-1.76 2.313-3 4.227-3 2.481 0 4.5 2.018 4.5 4.5 0 2.48-2.019 4.5-4.5 4.5z"/><path fill="#75BEFF" d="M73.5 26c-1.759 0-3.204 1.309-3.449 3h-3.122c-.223-.861-.998-1.5-1.929-1.5-1.104 0-2 .895-2 2 0 1.104.896 2 2 2 .931 0 1.706-.639 1.929-1.5h3.122c.245 1.691 1.69 3 3.449 3 1.93 0 3.5-1.57 3.5-3.5 0-1.932-1.57-3.5-3.5-3.5z"/><circle fill="#75BEFF" cx="73.5" cy="29.5" r="1.5"/><circle fill="#2B282E" cx="73.5" cy="29.5" r="1.5"/><path fill="#F6F6F6" d="M73.5 14c-1.914 0-3.601-1.242-4.227-3h-1.683c-.524.91-1.503 1.5-2.591 1.5-1.654 0-3-1.346-3-3s1.346-3 3-3c1.088 0 2.066.588 2.591 1.5h1.683c.626-1.76 2.313-3 4.227-3 2.481 0 4.5 2.018 4.5 4.5 0 2.48-2.019 4.5-4.5 4.5z"/><path fill="#00539C" d="M73.5 6c-1.759 0-3.204 1.308-3.449 3h-3.122c-.223-.861-.998-1.5-1.929-1.5-1.104 0-2 .895-2 2 0 1.104.896 2 2 2 .931 0 1.706-.639 1.929-1.5h3.122c.245 1.691 1.69 3 3.449 3 1.93 0 3.5-1.57 3.5-3.5 0-1.931-1.57-3.5-3.5-3.5zm0 5c-.827 0-1.5-.674-1.5-1.5 0-.828.673-1.5 1.5-1.5s1.5.672 1.5 1.5c0 .826-.673 1.5-1.5 1.5z"/><circle fill="#F0EFF1" cx="73.5" cy="9.5" r="1.5"/><polygon fill="#2D2D30" points="58,28.586 55,25.586 53.586,27 51.414,27 52.414,26 48.414,22 47.586,22 42,27.586 42,28.414 46,32.414 48.414,30 49,30 49,35 50.586,35 53.586,38 54.414,38 58,34.414 58,33.586 55.914,31.5 58,29.414"/><polygon fill="#E8AB53" points="53.998,33.002 51,33 51,29 53,29 52,30 54,32 57,29 55,27 54,28 49,28 51,26 48,23 43,28 46,31 48,29 50,29 50,34 53,34 52,35 54,37 57,34 55,32"/><path fill="#F6F6F6" d="M58 8.586l-3-3-1.414 1.414h-2.172l1-1-4-4h-.828l-5.586 5.586v.828l4 4 2.414-2.414h.586v5h1.586l3 3h.828l3.586-3.586v-.828l-2.086-2.086 2.086-2.086v-.828z"/><polygon fill="#C27D1A" points="53.998,13.002 51,13 51,9 53,9 52,10 54,12 57,9 55,7 54,8 49,8 51,6 48,3 43,8 46,11 48,9 50,9 50,14 53,14 52,15 54,17 57,14 55,12"/><polygon fill="#2D2D30" points="29.263,24 34,26.369 34,31.605 27.209,35 26.789,35 22,32.605 22,27.369 28.739,24"/><polygon fill="#75BEFF" points="23,28 23,32 27,34 33,31 33,27 29,25"/><polygon fill="#75BEFF" points="27,29 25,28 29,26 31,27"/><polygon fill="#2B282E" points="29,26 31,27 27,29 25,28"/><path fill="#F6F6F6" d="M29.263 4l4.737 2.369v5.236l-6.791 3.395h-.42l-4.789-2.395v-5.236l6.739-3.369h.524z"/><path fill="#00539C" d="M23 8v4l4 2 6-3v-4l-4-2-6 3zm4 1l-2-1 4-2 2 1-4 2z"/><path fill="#F0EFF1" d="M29 6l2 1-4 2-2-1 4-2z"/><polygon fill="#2D2D30" points="2,27.309 2,32.691 7.209,36 7.791,36 13,32.691 13,27.309 7.791,24 7.209,24"/><polygon fill="#B180D7" points="7.5,25 3,27.857 3,32.143 7.5,35 12,32.143 12,27.857"/><polygon fill="#B180D7" points="7,33.498 4,31.593 4,28.777 7,30.684"/><polygon fill="#B180D7" points="4.642,28 7.5,26.186 10.358,28 7.5,29.814"/><polygon fill="#B180D7" points="11,31.593 8,33.498 8,30.684 11,28.777"/><polygon fill="#2B282E" points="10.358,28 7.5,29.814 4.642,28 7.5,26.186"/><polygon fill="#2B282E" points="4,28.777 7,30.684 7,33.498 4,31.593"/><polygon fill="#2B282E" points="8,33.498 8,30.684 11,28.777 11,31.593"/><polygon fill="#F6F6F6" points="2,7.308 2,12.692 7.209,16 7.791,16 13,12.692 13,7.308 7.791,4 7.209,4"/><path fill="#652D90" d="M7.5 5l-4.5 2.857v4.285l4.5 2.858 4.5-2.857v-4.286l-4.5-2.857zm-.5 8.498l-3-1.905v-2.816l3 1.905v2.816zm-2.358-5.498l2.858-1.815 2.858 1.815-2.858 1.815-2.858-1.815zm6.358 3.593l-3 1.905v-2.815l3-1.905v2.815z"/><polygon fill="#F0EFF1" points="10.358,8 7.5,9.815 4.642,8 7.5,6.185"/><polygon fill="#F0EFF1" points="4,8.777 7,10.683 7,13.498 4,11.593"/><polygon fill="#F0EFF1" points="8,13.498 8,10.683 11,8.777 11,11.593"/><path fill="#C5C5C5" d="M334 29v-1h-2v-2h-1v2h-2v-2h-1v2h-2v1h2v2h-2v1h2v2h1v-2h2v2h1v-2h2v-1h-2v-2h2zm-3 2h-2v-2h2v2z"/></svg>
\ No newline at end of file
diff --git a/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.ts b/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.ts
index be4d6379082..638f3f36c58 100644
--- a/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.ts
+++ b/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.ts
@@ -9,7 +9,7 @@ import * as env from 'vs/base/common/platform';
 import * as nls from 'vs/nls';
 import { QuickOpenHandlerDescriptor, IQuickOpenRegistry, Extensions as QuickOpenExtensions } from 'vs/workbench/browser/quickopen';
 import { Registry } from 'vs/platform/registry/common/platform';
-import { SyncActionDescriptor } from 'vs/platform/actions/common/actions';
+import { SyncActionDescriptor, MenuId, MenuRegistry } from 'vs/platform/actions/common/actions';
 import { IWorkbenchActionRegistry, Extensions as ActionExtensions } from 'vs/workbench/common/actions';
 import { KeyMod, KeyCode } from 'vs/base/common/keyCodes';
 import { GotoSymbolAction, GOTO_SYMBOL_PREFIX, SCOPE_PREFIX, GotoSymbolHandler } from 'vs/workbench/parts/quickopen/browser/gotoSymbolHandler';
@@ -19,7 +19,7 @@ import { HELP_PREFIX, HelpHandler } from 'vs/workbench/parts/quickopen/browser/h
 import { VIEW_PICKER_PREFIX, OpenViewPickerAction, QuickOpenViewPickerAction, ViewPickerHandler } from 'vs/workbench/parts/quickopen/browser/viewPickerHandler';
 import { inQuickOpenContext, getQuickNavigateHandler } from 'vs/workbench/browser/parts/quickopen/quickopen';
 import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRegistry';
+import { KeybindingsRegistry, KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
 
 // Register Actions
 const registry = Registry.as<IWorkbenchActionRegistry>(ActionExtensions.WorkbenchActions);
@@ -50,7 +50,7 @@ registry.registerWorkbenchAction(new SyncActionDescriptor(QuickOpenViewPickerAct
 const quickOpenNavigateNextInViewPickerId = 'workbench.action.quickOpenNavigateNextInViewPicker';
 KeybindingsRegistry.registerCommandAndKeybindingRule({
 	id: quickOpenNavigateNextInViewPickerId,
-	weight: KeybindingsRegistry.WEIGHT.workbenchContrib(50),
+	weight: KeybindingWeight.WorkbenchContrib + 50,
 	handler: getQuickNavigateHandler(quickOpenNavigateNextInViewPickerId, true),
 	when: inViewsPickerContext,
 	primary: viewPickerKeybinding.primary,
@@ -61,7 +61,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 const quickOpenNavigatePreviousInViewPickerId = 'workbench.action.quickOpenNavigatePreviousInViewPicker';
 KeybindingsRegistry.registerCommandAndKeybindingRule({
 	id: quickOpenNavigatePreviousInViewPickerId,
-	weight: KeybindingsRegistry.WEIGHT.workbenchContrib(50),
+	weight: KeybindingWeight.WorkbenchContrib + 50,
 	handler: getQuickNavigateHandler(quickOpenNavigatePreviousInViewPickerId, false),
 	when: inViewsPickerContext,
 	primary: viewPickerKeybinding.primary | KeyMod.Shift,
@@ -144,4 +144,44 @@ Registry.as<IQuickOpenRegistry>(QuickOpenExtensions.Quickopen).registerQuickOpen
 			}
 		]
 	)
-);
\ No newline at end of file
+);
+
+// View menu
+
+MenuRegistry.appendMenuItem(MenuId.MenubarViewMenu, {
+	group: '1_open',
+	command: {
+		id: ShowAllCommandsAction.ID,
+		title: nls.localize({ key: 'miCommandPalette', comment: ['&& denotes a mnemonic'] }, "&&Command Palette...")
+	},
+	order: 1
+});
+
+MenuRegistry.appendMenuItem(MenuId.MenubarViewMenu, {
+	group: '1_open',
+	command: {
+		id: OpenViewPickerAction.ID,
+		title: nls.localize({ key: 'miOpenView', comment: ['&& denotes a mnemonic'] }, "&&Open View...")
+	},
+	order: 2
+});
+
+// Go to menu
+
+MenuRegistry.appendMenuItem(MenuId.MenubarGoMenu, {
+	group: 'z_go_to',
+	command: {
+		id: 'workbench.action.gotoSymbol',
+		title: nls.localize({ key: 'miGotoSymbolInFile', comment: ['&& denotes a mnemonic'] }, "Go to &&Symbol in File...")
+	},
+	order: 2
+});
+
+MenuRegistry.appendMenuItem(MenuId.MenubarGoMenu, {
+	group: 'z_go_to',
+	command: {
+		id: 'workbench.action.gotoLine',
+		title: nls.localize({ key: 'miGotoLine', comment: ['&& denotes a mnemonic'] }, "Go to &&Line...")
+	},
+	order: 7
+});
\ No newline at end of file
diff --git a/src/vs/workbench/parts/quickopen/browser/viewPickerHandler.ts b/src/vs/workbench/parts/quickopen/browser/viewPickerHandler.ts
index 711590c7b4a..f1e0a0a8ba2 100644
--- a/src/vs/workbench/parts/quickopen/browser/viewPickerHandler.ts
+++ b/src/vs/workbench/parts/quickopen/browser/viewPickerHandler.ts
@@ -6,7 +6,6 @@
 
 import { TPromise } from 'vs/base/common/winjs.base';
 import * as nls from 'vs/nls';
-import * as errors from 'vs/base/common/errors';
 import { Mode, IEntryRunContext, IAutoFocus, IQuickNavigateConfiguration, IModel } from 'vs/base/parts/quickopen/common/quickOpen';
 import { QuickOpenModel, QuickOpenEntryGroup, QuickOpenEntry } from 'vs/base/parts/quickopen/browser/quickOpenModel';
 import { QuickOpenHandler, QuickOpenAction } from 'vs/workbench/browser/quickopen';
@@ -23,6 +22,7 @@ import { ViewsRegistry, ViewContainer, IViewsService, IViewContainersRegistry, E
 import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { ViewletDescriptor } from 'vs/workbench/browser/viewlet';
 import { Registry } from 'vs/platform/registry/common/platform';
+import { CancellationToken } from 'vs/base/common/cancellation';
 
 export const VIEW_PICKER_PREFIX = 'view ';
 
@@ -36,19 +36,19 @@ export class ViewEntry extends QuickOpenEntryGroup {
 		super();
 	}
 
-	public getLabel(): string {
+	getLabel(): string {
 		return this.label;
 	}
 
-	public getCategory(): string {
+	getCategory(): string {
 		return this.category;
 	}
 
-	public getAriaLabel(): string {
+	getAriaLabel(): string {
 		return nls.localize('entryAriaLabel', "{0}, view picker", this.getLabel());
 	}
 
-	public run(mode: Mode, context: IEntryRunContext): boolean {
+	run(mode: Mode, context: IEntryRunContext): boolean {
 		if (mode === Mode.OPEN) {
 			return this.runOpen(context);
 		}
@@ -67,7 +67,7 @@ export class ViewEntry extends QuickOpenEntryGroup {
 
 export class ViewPickerHandler extends QuickOpenHandler {
 
-	public static readonly ID = 'workbench.picker.views';
+	static readonly ID = 'workbench.picker.views';
 
 	constructor(
 		@IViewletService private viewletService: IViewletService,
@@ -80,7 +80,7 @@ export class ViewPickerHandler extends QuickOpenHandler {
 		super();
 	}
 
-	public getResults(searchValue: string): TPromise<QuickOpenModel> {
+	getResults(searchValue: string, token: CancellationToken): TPromise<QuickOpenModel> {
 		searchValue = searchValue.trim();
 		const normalizedSearchValueLowercase = stripWildcards(searchValue).toLowerCase();
 
@@ -137,11 +137,11 @@ export class ViewPickerHandler extends QuickOpenHandler {
 
 		// Viewlets
 		const viewlets = this.viewletService.getViewlets();
-		viewlets.forEach((viewlet, index) => viewEntries.push(new ViewEntry(viewlet.name, nls.localize('views', "Views"), () => this.viewletService.openViewlet(viewlet.id, true).done(null, errors.onUnexpectedError))));
+		viewlets.forEach((viewlet, index) => viewEntries.push(new ViewEntry(viewlet.name, nls.localize('views', "Views"), () => this.viewletService.openViewlet(viewlet.id, true))));
 
 		// Panels
 		const panels = this.panelService.getPanels();
-		panels.forEach((panel, index) => viewEntries.push(new ViewEntry(panel.name, nls.localize('panels', "Panels"), () => this.panelService.openPanel(panel.id, true).done(null, errors.onUnexpectedError))));
+		panels.forEach((panel, index) => viewEntries.push(new ViewEntry(panel.name, nls.localize('panels', "Panels"), () => this.panelService.openPanel(panel.id, true))));
 
 		// Viewlet Views
 		viewlets.forEach((viewlet, index) => {
@@ -158,9 +158,9 @@ export class ViewPickerHandler extends QuickOpenHandler {
 			tab.terminalInstances.forEach((terminal, terminalIndex) => {
 				const index = `${tabIndex + 1}.${terminalIndex + 1}`;
 				const entry = new ViewEntry(nls.localize('terminalTitle', "{0}: {1}", index, terminal.title), terminalsCategory, () => {
-					this.terminalService.showPanel(true).done(() => {
+					this.terminalService.showPanel(true).then(() => {
 						this.terminalService.setActiveInstance(terminal);
-					}, errors.onUnexpectedError);
+					});
 				});
 
 				viewEntries.push(entry);
@@ -168,10 +168,10 @@ export class ViewPickerHandler extends QuickOpenHandler {
 		});
 
 		// Output Channels
-		const channels = this.outputService.getChannels();
+		const channels = this.outputService.getChannelDescriptors();
 		channels.forEach((channel, index) => {
 			const outputCategory = nls.localize('channels', "Output");
-			const entry = new ViewEntry(channel.label, outputCategory, () => this.outputService.showChannel(channel.id).done(null, errors.onUnexpectedError));
+			const entry = new ViewEntry(channel.label, outputCategory, () => this.outputService.showChannel(channel.id));
 
 			viewEntries.push(entry);
 		});
@@ -179,7 +179,7 @@ export class ViewPickerHandler extends QuickOpenHandler {
 		return viewEntries;
 	}
 
-	public getAutoFocus(searchValue: string, context: { model: IModel<QuickOpenEntry>, quickNavigateConfiguration?: IQuickNavigateConfiguration }): IAutoFocus {
+	getAutoFocus(searchValue: string, context: { model: IModel<QuickOpenEntry>, quickNavigateConfiguration?: IQuickNavigateConfiguration }): IAutoFocus {
 		return {
 			autoFocusFirstEntry: !!searchValue || !!context.quickNavigateConfiguration
 		};
@@ -188,8 +188,8 @@ export class ViewPickerHandler extends QuickOpenHandler {
 
 export class OpenViewPickerAction extends QuickOpenAction {
 
-	public static readonly ID = 'workbench.action.openView';
-	public static readonly LABEL = nls.localize('openView', "Open View");
+	static readonly ID = 'workbench.action.openView';
+	static readonly LABEL = nls.localize('openView', "Open View");
 
 	constructor(
 		id: string,
@@ -202,8 +202,8 @@ export class OpenViewPickerAction extends QuickOpenAction {
 
 export class QuickOpenViewPickerAction extends Action {
 
-	public static readonly ID = 'workbench.action.quickOpenView';
-	public static readonly LABEL = nls.localize('quickOpenView', "Quick Open View");
+	static readonly ID = 'workbench.action.quickOpenView';
+	static readonly LABEL = nls.localize('quickOpenView', "Quick Open View");
 
 	constructor(
 		id: string,
@@ -214,7 +214,7 @@ export class QuickOpenViewPickerAction extends Action {
 		super(id, label);
 	}
 
-	public run(): TPromise<boolean> {
+	run(): TPromise<boolean> {
 		const keys = this.keybindingService.lookupKeybindings(this.id);
 
 		this.quickOpenService.show(VIEW_PICKER_PREFIX, { quickNavigateConfiguration: { keybindings: keys } });
diff --git a/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.ts b/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.ts
index 9981d15cb98..31f03d38792 100644
--- a/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.ts
+++ b/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.ts
@@ -5,7 +5,7 @@
 
 'use strict';
 
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
+import { IDisposable, dispose, Disposable } from 'vs/base/common/lifecycle';
 import { IWorkbenchContributionsRegistry, IWorkbenchContribution, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { IWindowsService, IWindowService, IWindowsConfiguration } from 'vs/platform/windows/common/windows';
@@ -15,7 +15,7 @@ import { IEnvironmentService } from 'vs/platform/environment/common/environment'
 import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
 import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
 import { RunOnceScheduler } from 'vs/base/common/async';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { isEqual } from 'vs/base/common/resources';
 import { isLinux, isMacintosh, isWindows } from 'vs/base/common/platform';
 import { LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
@@ -30,9 +30,7 @@ interface IConfiguration extends IWindowsConfiguration {
 	files: { useExperimentalFileWatcher: boolean, watcherExclude: object };
 }
 
-export class SettingsChangeRelauncher implements IWorkbenchContribution {
-
-	private toDispose: IDisposable[] = [];
+export class SettingsChangeRelauncher extends Disposable implements IWorkbenchContribution {
 
 	private titleBarStyle: 'native' | 'custom';
 	private nativeTabs: boolean;
@@ -59,6 +57,8 @@ export class SettingsChangeRelauncher implements IWorkbenchContribution {
 		@IWorkspaceContextService private contextService: IWorkspaceContextService,
 		@IExtensionService private extensionService: IExtensionService
 	) {
+		super();
+
 		const workspace = this.contextService.getWorkspace();
 		this.firstFolderResource = workspace.folders.length > 0 ? workspace.folders[0].uri : void 0;
 		this.extensionHostRestarter = new RunOnceScheduler(() => this.extensionService.restartExtensionHost(), 10);
@@ -70,15 +70,15 @@ export class SettingsChangeRelauncher implements IWorkbenchContribution {
 	}
 
 	private registerListeners(): void {
-		this.toDispose.push(this.configurationService.onDidChangeConfiguration(e => this.onConfigurationChange(this.configurationService.getValue<IConfiguration>(), true)));
-		this.toDispose.push(this.contextService.onDidChangeWorkbenchState(() => setTimeout(() => this.handleWorkbenchState())));
+		this._register(this.configurationService.onDidChangeConfiguration(e => this.onConfigurationChange(this.configurationService.getValue<IConfiguration>(), true)));
+		this._register(this.contextService.onDidChangeWorkbenchState(() => setTimeout(() => this.handleWorkbenchState())));
 	}
 
 	private onConfigurationChange(config: IConfiguration, notify: boolean): void {
 		let changed = false;
 
-		// macOS: Titlebar style
-		if (isMacintosh && config.window && config.window.titleBarStyle !== this.titleBarStyle && (config.window.titleBarStyle === 'native' || config.window.titleBarStyle === 'custom')) {
+		// Titlebar style
+		if (config.window && config.window.titleBarStyle !== this.titleBarStyle && (config.window.titleBarStyle === 'native' || config.window.titleBarStyle === 'custom')) {
 			this.titleBarStyle = config.window.titleBarStyle;
 			changed = true;
 		}
@@ -201,10 +201,6 @@ export class SettingsChangeRelauncher implements IWorkbenchContribution {
 			return void 0;
 		});
 	}
-
-	public dispose(): void {
-		this.toDispose = dispose(this.toDispose);
-	}
 }
 
 const workbenchRegistry = Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench);
diff --git a/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.ts b/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.ts
index 973f975cb0e..e54d6529b45 100644
--- a/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.ts
+++ b/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.ts
@@ -8,8 +8,8 @@
 import * as nls from 'vs/nls';
 
 import 'vs/css!./media/dirtydiffDecorator';
-import { ThrottledDelayer, always } from 'vs/base/common/async';
-import { IDisposable, dispose, toDisposable, empty as EmptyDisposable, combinedDisposable } from 'vs/base/common/lifecycle';
+import { ThrottledDelayer, always, first } from 'vs/base/common/async';
+import { IDisposable, dispose, toDisposable, Disposable, combinedDisposable } from 'vs/base/common/lifecycle';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { Event, Emitter, anyEvent as anyEvent, filterEvent, once } from 'vs/base/common/event';
 import * as ext from 'vs/workbench/common/contributions';
@@ -19,7 +19,7 @@ import { ITextModelService } from 'vs/editor/common/services/resolverService';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { IEditorWorkerService } from 'vs/editor/common/services/editorWorkerService';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { ISCMService, ISCMRepository } from 'vs/workbench/services/scm/common/scm';
 import { ModelDecorationOptions } from 'vs/editor/common/model/textModel';
 import { registerThemingParticipant, ITheme, ICssStyleCollector, themeColorFromId, IThemeService } from 'vs/platform/theme/common/themeService';
@@ -33,7 +33,7 @@ import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
 import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
 import { Position } from 'vs/editor/common/core/position';
 import { rot } from 'vs/base/common/numbers';
-import { KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRegistry';
+import { KeybindingsRegistry, KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
 import { peekViewBorder, peekViewTitleBackground, peekViewTitleForeground, peekViewTitleInfoForeground } from 'vs/editor/contrib/referenceSearch/referencesWidget';
 import { EmbeddedDiffEditorWidget } from 'vs/editor/browser/widget/embeddedCodeEditorWidget';
 import { IDiffEditorOptions } from 'vs/editor/common/config/editorOptions';
@@ -64,7 +64,7 @@ class DiffMenuItemActionItem extends MenuItemActionItem {
 		event.stopPropagation();
 
 		this.actionRunner.run(this._commandAction, this._context)
-			.done(undefined, err => this._notificationService.error(err));
+			.then(undefined, err => this._notificationService.error(err));
 	}
 }
 
@@ -372,7 +372,7 @@ export class ShowPreviousChangeAction extends EditorAction {
 			label: nls.localize('show previous change', "Show Previous Change"),
 			alias: 'Show Previous Change',
 			precondition: null,
-			kbOpts: { kbExpr: EditorContextKeys.editorTextFocus, primary: KeyMod.Shift | KeyMod.Alt | KeyCode.F3 }
+			kbOpts: { kbExpr: EditorContextKeys.editorTextFocus, primary: KeyMod.Shift | KeyMod.Alt | KeyCode.F3, weight: KeybindingWeight.EditorContrib }
 		});
 	}
 
@@ -406,7 +406,7 @@ export class ShowNextChangeAction extends EditorAction {
 			label: nls.localize('show next change', "Show Next Change"),
 			alias: 'Show Next Change',
 			precondition: null,
-			kbOpts: { kbExpr: EditorContextKeys.editorTextFocus, primary: KeyMod.Alt | KeyCode.F3 }
+			kbOpts: { kbExpr: EditorContextKeys.editorTextFocus, primary: KeyMod.Alt | KeyCode.F3, weight: KeybindingWeight.EditorContrib }
 		});
 	}
 
@@ -440,7 +440,7 @@ export class MoveToPreviousChangeAction extends EditorAction {
 			label: nls.localize('move to previous change', "Move to Previous Change"),
 			alias: 'Move to Previous Change',
 			precondition: null,
-			kbOpts: { kbExpr: EditorContextKeys.editorTextFocus, primary: KeyMod.Shift | KeyMod.Alt | KeyCode.F5 }
+			kbOpts: { kbExpr: EditorContextKeys.editorTextFocus, primary: KeyMod.Shift | KeyMod.Alt | KeyCode.F5, weight: KeybindingWeight.EditorContrib }
 		});
 	}
 
@@ -482,7 +482,7 @@ export class MoveToNextChangeAction extends EditorAction {
 			label: nls.localize('move to next change', "Move to Next Change"),
 			alias: 'Move to Next Change',
 			precondition: null,
-			kbOpts: { kbExpr: EditorContextKeys.editorTextFocus, primary: KeyMod.Alt | KeyCode.F5 }
+			kbOpts: { kbExpr: EditorContextKeys.editorTextFocus, primary: KeyMod.Alt | KeyCode.F5, weight: KeybindingWeight.EditorContrib }
 		});
 	}
 
@@ -518,7 +518,7 @@ registerEditorAction(MoveToNextChangeAction);
 
 KeybindingsRegistry.registerCommandAndKeybindingRule({
 	id: 'closeDirtyDiff',
-	weight: KeybindingsRegistry.WEIGHT.editorContrib(50),
+	weight: KeybindingWeight.EditorContrib + 50,
 	primary: KeyCode.Escape,
 	secondary: [KeyMod.Shift | KeyCode.Escape],
 	when: ContextKeyExpr.and(isDirtyDiffVisible),
@@ -553,7 +553,7 @@ export class DirtyDiffController implements IEditorContribution {
 	private widget: DirtyDiffWidget | null = null;
 	private currentIndex: number = -1;
 	private readonly isDirtyDiffVisible: IContextKey<boolean>;
-	private session: IDisposable = EmptyDisposable;
+	private session: IDisposable = Disposable.None;
 	private mouseDownInfo: { lineNumber: number } | null = null;
 	private enabled = false;
 	private disposables: IDisposable[] = [];
@@ -611,7 +611,7 @@ export class DirtyDiffController implements IEditorContribution {
 
 	close(): void {
 		this.session.dispose();
-		this.session = EmptyDisposable;
+		this.session = Disposable.None;
 	}
 
 	private assertWidget(): boolean {
@@ -703,11 +703,16 @@ export class DirtyDiffController implements IEditorContribution {
 			return;
 		}
 
+		if (e.target.element.className.indexOf('dirty-diff-glyph') < 0) {
+			return;
+		}
+
 		const data = e.target.detail as IMarginData;
-		const gutterOffsetX = data.offsetX - data.glyphMarginWidth - data.lineNumbersWidth - data.glyphMarginLeft;
+		const offsetLeftInGutter = (e.target.element as HTMLElement).offsetLeft;
+		const gutterOffsetX = data.offsetX - offsetLeftInGutter;
 
 		// TODO@joao TODO@alex TODO@martin this is such that we don't collide with folding
-		if (gutterOffsetX > 10) {
+		if (gutterOffsetX < -3 || gutterOffsetX > 6) { // dirty diff decoration on hover is 9px wide
 			return;
 		}
 
@@ -1032,20 +1037,13 @@ export class DirtyDiffModel {
 		});
 	}
 
-	private async getOriginalResource(): TPromise<URI> {
+	private getOriginalResource(): TPromise<URI> {
 		if (!this._editorModel) {
-			return null;
+			return TPromise.as(null);
 		}
 
-		for (const repository of this.scmService.repositories) {
-			const result = repository.provider.getOriginalResource(this._editorModel.uri);
-
-			if (result) {
-				return result;
-			}
-		}
-
-		return null;
+		const uri = this._editorModel.uri;
+		return first(this.scmService.repositories.map(r => () => r.provider.getOriginalResource(uri)));
 	}
 
 	findNextClosestChange(lineNumber: number, inclusive = true): number {
diff --git a/src/vs/workbench/parts/scm/electron-browser/media/dirtydiffDecorator.css b/src/vs/workbench/parts/scm/electron-browser/media/dirtydiffDecorator.css
index e55cb63c612..8a884647c66 100644
--- a/src/vs/workbench/parts/scm/electron-browser/media/dirtydiffDecorator.css
+++ b/src/vs/workbench/parts/scm/electron-browser/media/dirtydiffDecorator.css
@@ -6,6 +6,7 @@
 .monaco-editor .dirty-diff-glyph {
 	margin-left: 5px;
 	cursor: pointer;
+	z-index: 5;
 }
 
 .monaco-editor .dirty-diff-deleted:after {
@@ -19,6 +20,7 @@
 	border-top: 4px solid transparent;
 	border-bottom: 4px solid transparent;
 	transition: border-top-width 80ms linear, border-bottom-width 80ms linear, bottom 80ms linear;
+	pointer-events: none;
 }
 
 .monaco-editor .dirty-diff-glyph:before {
diff --git a/src/vs/workbench/parts/scm/electron-browser/media/scmViewlet.css b/src/vs/workbench/parts/scm/electron-browser/media/scmViewlet.css
index f6e3ec0c18a..108bf404719 100644
--- a/src/vs/workbench/parts/scm/electron-browser/media/scmViewlet.css
+++ b/src/vs/workbench/parts/scm/electron-browser/media/scmViewlet.css
@@ -15,7 +15,6 @@
 
 .scm-viewlet .empty-message {
 	padding: 10px 22px 0 22px;
-	opacity: 0.5;
 }
 
 .scm-viewlet:not(.empty) .empty-message,
@@ -51,6 +50,7 @@
 	display: none;
 }
 
+.scm-viewlet .scm-provider > .type,
 .scm-viewlet .scm-provider > .name > .type {
 	opacity: 0.7;
 	margin-left: 0.5em;
diff --git a/src/vs/workbench/parts/scm/electron-browser/scm.contribution.ts b/src/vs/workbench/parts/scm/electron-browser/scm.contribution.ts
index 56943a892a0..453a5aa6da3 100644
--- a/src/vs/workbench/parts/scm/electron-browser/scm.contribution.ts
+++ b/src/vs/workbench/parts/scm/electron-browser/scm.contribution.ts
@@ -13,7 +13,7 @@ import { ViewletRegistry, Extensions as ViewletExtensions, ViewletDescriptor, To
 import { VIEWLET_ID } from 'vs/workbench/parts/scm/common/scm';
 import { IWorkbenchActionRegistry, Extensions as WorkbenchActionExtensions } from 'vs/workbench/common/actions';
 import { KeyMod, KeyCode } from 'vs/base/common/keyCodes';
-import { SyncActionDescriptor } from 'vs/platform/actions/common/actions';
+import { SyncActionDescriptor, MenuRegistry, MenuId } from 'vs/platform/actions/common/actions';
 import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet';
 import { StatusUpdater, StatusBarController } from './scmActivity';
 import { SCMViewlet } from 'vs/workbench/parts/scm/electron-browser/scmViewlet';
@@ -71,7 +71,7 @@ Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration).regis
 	properties: {
 		'scm.alwaysShowProviders': {
 			type: 'boolean',
-			description: localize('alwaysShowProviders', "Whether to always show the Source Control Provider section."),
+			description: localize('alwaysShowProviders', "Controls whether to always show the Source Control Provider section."),
 			default: false
 		},
 		'scm.diffDecorations': {
@@ -88,3 +88,14 @@ Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration).regis
 		}
 	}
 });
+
+// View menu
+
+MenuRegistry.appendMenuItem(MenuId.MenubarViewMenu, {
+	group: '3_views',
+	command: {
+		id: VIEWLET_ID,
+		title: localize({ key: 'miViewSCM', comment: ['&& denotes a mnemonic'] }, "S&&CM")
+	},
+	order: 3
+});
diff --git a/src/vs/workbench/parts/scm/electron-browser/scmActivity.ts b/src/vs/workbench/parts/scm/electron-browser/scmActivity.ts
index 9464225a74d..c0c4f11d15e 100644
--- a/src/vs/workbench/parts/scm/electron-browser/scmActivity.ts
+++ b/src/vs/workbench/parts/scm/electron-browser/scmActivity.ts
@@ -7,7 +7,7 @@
 
 import { localize } from 'vs/nls';
 import { basename } from 'vs/base/common/paths';
-import { IDisposable, dispose, empty as EmptyDisposable, combinedDisposable } from 'vs/base/common/lifecycle';
+import { IDisposable, dispose, Disposable, combinedDisposable } from 'vs/base/common/lifecycle';
 import { filterEvent, anyEvent as anyEvent } from 'vs/base/common/event';
 import { VIEWLET_ID } from 'vs/workbench/parts/scm/common/scm';
 import { ISCMService, ISCMRepository } from 'vs/workbench/services/scm/common/scm';
@@ -18,7 +18,7 @@ import { IStatusbarService, StatusbarAlignment as MainThreadStatusBarAlignment }
 
 export class StatusUpdater implements IWorkbenchContribution {
 
-	private badgeDisposable: IDisposable = EmptyDisposable;
+	private badgeDisposable: IDisposable = Disposable.None;
 	private disposables: IDisposable[] = [];
 
 	constructor(
@@ -60,7 +60,7 @@ export class StatusUpdater implements IWorkbenchContribution {
 			const badge = new NumberBadge(count, num => localize('scmPendingChangesBadge', '{0} pending changes', num));
 			this.badgeDisposable = this.activityService.showActivity(VIEWLET_ID, badge, 'scm-viewlet-label');
 		} else {
-			this.badgeDisposable = EmptyDisposable;
+			this.badgeDisposable = Disposable.None;
 		}
 	}
 
@@ -72,8 +72,8 @@ export class StatusUpdater implements IWorkbenchContribution {
 
 export class StatusBarController implements IWorkbenchContribution {
 
-	private statusBarDisposable: IDisposable = EmptyDisposable;
-	private focusDisposable: IDisposable = EmptyDisposable;
+	private statusBarDisposable: IDisposable = Disposable.None;
+	private focusDisposable: IDisposable = Disposable.None;
 	private focusedRepository: ISCMRepository | undefined = undefined;
 	private focusedProviderContextKey: IContextKey<string | undefined>;
 	private disposables: IDisposable[] = [];
diff --git a/src/vs/workbench/parts/scm/electron-browser/scmViewlet.ts b/src/vs/workbench/parts/scm/electron-browser/scmViewlet.ts
index 4bc49cd2892..0c9f3c9b0b6 100644
--- a/src/vs/workbench/parts/scm/electron-browser/scmViewlet.ts
+++ b/src/vs/workbench/parts/scm/electron-browser/scmViewlet.ts
@@ -11,13 +11,12 @@ import { TPromise } from 'vs/base/common/winjs.base';
 import { Event, Emitter, chain, mapEvent, anyEvent, filterEvent, latch } from 'vs/base/common/event';
 import { domEvent, stop } from 'vs/base/browser/event';
 import { basename } from 'vs/base/common/paths';
-import { onUnexpectedError } from 'vs/base/common/errors';
-import { IDisposable, dispose, combinedDisposable, empty as EmptyDisposable, toDisposable } from 'vs/base/common/lifecycle';
+import { IDisposable, dispose, combinedDisposable, Disposable, toDisposable } from 'vs/base/common/lifecycle';
 import { PanelViewlet, ViewletPanel, IViewletPanelOptions } from 'vs/workbench/browser/parts/views/panelViewlet';
 import { append, $, addClass, toggleClass, trackFocus, Dimension, addDisposableListener } from 'vs/base/browser/dom';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { List } from 'vs/base/browser/ui/list/listWidget';
-import { IDelegate, IRenderer, IListContextMenuEvent, IListEvent } from 'vs/base/browser/ui/list/list';
+import { IVirtualDelegate, IRenderer, IListContextMenuEvent, IListEvent } from 'vs/base/browser/ui/list/list';
 import { VIEWLET_ID, VIEW_CONTAINER } from 'vs/workbench/parts/scm/common/scm';
 import { FileLabel } from 'vs/workbench/browser/labels';
 import { CountBadge } from 'vs/base/browser/ui/countBadge/countBadge';
@@ -39,8 +38,6 @@ import { attachBadgeStyler, attachInputBoxStyler } from 'vs/platform/theme/commo
 import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
 import { IStorageService } from 'vs/platform/storage/common/storage';
-import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet';
-import { IExtensionsViewlet, VIEWLET_ID as EXTENSIONS_VIEWLET_ID } from 'vs/workbench/parts/extensions/common/extensions';
 import { InputBox, MessageType } from 'vs/base/browser/ui/inputbox/inputBox';
 import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
 import { KeyMod, KeyCode } from 'vs/base/common/keyCodes';
@@ -57,7 +54,7 @@ import { ThrottledDelayer } from 'vs/base/common/async';
 import { INotificationService } from 'vs/platform/notification/common/notification';
 import { IPartService } from 'vs/workbench/services/part/common/partService';
 import { IViewDescriptorRef, PersistentContributableViewsModel, IAddedViewDescriptorRef } from 'vs/workbench/browser/parts/views/views';
-import { IViewDescriptor, IViewsViewlet } from 'vs/workbench/common/views';
+import { IViewDescriptor, IViewsViewlet, IView } from 'vs/workbench/common/views';
 import { IPanelDndController, Panel } from 'vs/base/browser/ui/splitview/panelview';
 
 export interface ISpliceEvent<T> {
@@ -77,7 +74,7 @@ export interface IViewModel {
 	hide(repository: ISCMRepository): void;
 }
 
-class ProvidersListDelegate implements IDelegate<ISCMRepository> {
+class ProvidersListDelegate implements IVirtualDelegate<ISCMRepository> {
 
 	getHeight(element: ISCMRepository): number {
 		return 22;
@@ -109,9 +106,9 @@ class StatusBarActionItem extends ActionItem {
 		super(null, action, {});
 	}
 
-	_updateLabel(): void {
+	updateLabel(): void {
 		if (this.options.label) {
-			this.$e.innerHtml(renderOcticons(this.getAction().label));
+			this.label.innerHTML = renderOcticons(this.getAction().label);
 		}
 	}
 }
@@ -144,7 +141,7 @@ class ProviderRenderer implements IRenderer<ISCMRepository, RepositoryTemplateDa
 		const count = new CountBadge(countContainer);
 		const badgeStyler = attachBadgeStyler(count, this.themeService);
 		const actionBar = new ActionBar(provider, { actionItemProvider: a => new StatusBarActionItem(a as StatusBarAction) });
-		const disposable = EmptyDisposable;
+		const disposable = Disposable.None;
 		const templateDisposable = combinedDisposable([actionBar, badgeStyler]);
 
 		return { title, type, countContainer, count, actionBar, disposable, templateDisposable };
@@ -192,6 +189,10 @@ class ProviderRenderer implements IRenderer<ISCMRepository, RepositoryTemplateDa
 		templateData.disposable = combinedDisposable(disposables);
 	}
 
+	disposeElement(): void {
+		// noop
+	}
+
 	disposeTemplate(templateData: RepositoryTemplateData): void {
 		templateData.disposable.dispose();
 		templateData.templateDisposable.dispose();
@@ -391,7 +392,7 @@ class ResourceGroupRenderer implements IRenderer<ISCMResourceGroup, ResourceGrou
 		const countContainer = append(element, $('.count'));
 		const count = new CountBadge(countContainer);
 		const styler = attachBadgeStyler(count, this.themeService);
-		const elementDisposable = EmptyDisposable;
+		const elementDisposable = Disposable.None;
 
 		return {
 			name, count, actionBar, elementDisposable, dispose: () => {
@@ -439,6 +440,10 @@ class ResourceGroupRenderer implements IRenderer<ISCMResourceGroup, ResourceGrou
 		template.elementDisposable = combinedDisposable(disposables);
 	}
 
+	disposeElement(): void {
+		// noop
+	}
+
 	disposeTemplate(template: ResourceGroupTemplate): void {
 		template.dispose();
 	}
@@ -503,7 +508,7 @@ class ResourceRenderer implements IRenderer<ISCMResource, ResourceTemplate> {
 		const decorationIcon = append(element, $('.decoration-icon'));
 
 		return {
-			element, name, fileLabel, decorationIcon, actionBar, elementDisposable: EmptyDisposable, dispose: () => {
+			element, name, fileLabel, decorationIcon, actionBar, elementDisposable: Disposable.None, dispose: () => {
 				actionBar.dispose();
 				fileLabel.dispose();
 			}
@@ -559,13 +564,17 @@ class ResourceRenderer implements IRenderer<ISCMResource, ResourceTemplate> {
 		template.elementDisposable = combinedDisposable(disposables);
 	}
 
+	disposeElement(): void {
+		// noop
+	}
+
 	disposeTemplate(template: ResourceTemplate): void {
 		template.elementDisposable.dispose();
 		template.dispose();
 	}
 }
 
-class ProviderListDelegate implements IDelegate<ISCMResourceGroup | ISCMResource> {
+class ProviderListDelegate implements IVirtualDelegate<ISCMResourceGroup | ISCMResource> {
 
 	getHeight() { return 22; }
 
@@ -740,10 +749,6 @@ export class RepositoryPanel extends ViewletPanel {
 	private menus: SCMMenus;
 	private visibilityDisposables: IDisposable[] = [];
 
-	get onDidChangeTitle(): Event<void> {
-		return this.menus.onDidChangeTitle;
-	}
-
 	constructor(
 		id: string,
 		readonly repository: ISCMRepository,
@@ -762,6 +767,7 @@ export class RepositoryPanel extends ViewletPanel {
 	) {
 		super({ id, title: repository.provider.label }, keybindingService, contextMenuService, configurationService);
 		this.menus = instantiationService.createInstance(SCMMenus, repository.provider);
+		this.menus.onDidChangeTitle(this._onDidChangeTitleArea.fire, this._onDidChangeTitleArea, this.disposables);
 	}
 
 	render(): void {
@@ -770,19 +776,20 @@ export class RepositoryPanel extends ViewletPanel {
 	}
 
 	protected renderHeaderTitle(container: HTMLElement): void {
-		const header = append(container, $('.title.scm-provider'));
-		const name = append(header, $('.name'));
-		const title = append(name, $('span.title'));
-		const type = append(name, $('span.type'));
+		let title: string;
+		let type: string;
 
 		if (this.repository.provider.rootUri) {
-			title.textContent = basename(this.repository.provider.rootUri.fsPath);
-			type.textContent = this.repository.provider.label;
+			title = basename(this.repository.provider.rootUri.fsPath);
+			type = this.repository.provider.label;
 		} else {
-			title.textContent = this.repository.provider.label;
-			type.textContent = '';
+			title = this.repository.provider.label;
+			type = '';
 		}
 
+		super.renderHeaderTitle(container, title);
+		addClass(container, 'scm-provider');
+		append(container, $('span.type', null, type));
 		const onContextMenu = mapEvent(stop(domEvent(container, 'contextmenu')), e => new StandardMouseEvent(e));
 		onContextMenu(this.onContextMenu, this, this.disposables);
 	}
@@ -816,12 +823,9 @@ export class RepositoryPanel extends ViewletPanel {
 			this.inputBox.setPlaceHolder(placeholder);
 		};
 
-		const validationDelayer = new ThrottledDelayer(200);
-
+		const validationDelayer = new ThrottledDelayer<any>(200);
 		const validate = () => {
-			validationDelayer.trigger(async (): TPromise<any> => {
-				const result = await this.repository.input.validateInput(this.inputBox.value, this.inputBox.inputElement.selectionStart);
-
+			return this.repository.input.validateInput(this.inputBox.value, this.inputBox.inputElement.selectionStart).then(result => {
 				if (!result) {
 					this.inputBox.inputElement.removeAttribute('aria-invalid');
 					this.inputBox.hideMessage();
@@ -832,15 +836,17 @@ export class RepositoryPanel extends ViewletPanel {
 			});
 		};
 
+		const triggerValidation = () => validationDelayer.trigger(validate);
+
 		this.inputBox = new InputBox(this.inputBoxContainer, this.contextViewService, { flexibleHeight: true });
 		this.disposables.push(attachInputBoxStyler(this.inputBox, this.themeService));
 		this.disposables.push(this.inputBox);
 
-		this.inputBox.onDidChange(validate, null, this.disposables);
+		this.inputBox.onDidChange(triggerValidation, null, this.disposables);
 
 		const onKeyUp = domEvent(this.inputBox.inputElement, 'keyup');
 		const onMouseUp = domEvent(this.inputBox.inputElement, 'mouseup');
-		anyEvent<any>(onKeyUp, onMouseUp)(() => validate(), null, this.disposables);
+		anyEvent<any>(onKeyUp, onMouseUp)(triggerValidation, null, this.disposables);
 
 		this.inputBox.value = this.repository.input.value;
 		this.inputBox.onDidChange(value => this.repository.input.value = value, null, this.disposables);
@@ -949,7 +955,7 @@ export class RepositoryPanel extends ViewletPanel {
 	}
 
 	private open(e: ISCMResource): void {
-		e.open().done(undefined, onUnexpectedError);
+		e.open();
 	}
 
 	private pin(): void {
@@ -998,8 +1004,7 @@ export class RepositoryPanel extends ViewletPanel {
 		const id = this.repository.provider.acceptInputCommand.id;
 		const args = this.repository.provider.acceptInputCommand.arguments;
 
-		this.commandService.executeCommand(id, ...args)
-			.done(undefined, onUnexpectedError);
+		this.commandService.executeCommand(id, ...args);
 	}
 
 	dispose(): void {
@@ -1008,21 +1013,6 @@ export class RepositoryPanel extends ViewletPanel {
 	}
 }
 
-class InstallAdditionalSCMProvidersAction extends Action {
-
-	constructor(@IViewletService private viewletService: IViewletService) {
-		super('scm.installAdditionalSCMProviders', localize('installAdditionalSCMProviders', "Install Additional SCM Providers..."), '', true);
-	}
-
-	run(): TPromise<void> {
-		return this.viewletService.openViewlet(EXTENSIONS_VIEWLET_ID, true).then(viewlet => viewlet as IExtensionsViewlet)
-			.then(viewlet => {
-				viewlet.search('category:"SCM Providers" @sort:installs');
-				viewlet.focus();
-			});
-	}
-}
-
 class SCMPanelDndController implements IPanelDndController {
 
 	canDrag(panel: Panel): boolean {
@@ -1040,10 +1030,10 @@ export class SCMViewlet extends PanelViewlet implements IViewModel, IViewsViewle
 	private menus: SCMMenus;
 	private mainPanel: MainPanel | null = null;
 	private cachedMainPanelHeight: number | undefined;
-	private mainPanelDisposable: IDisposable = EmptyDisposable;
+	private mainPanelDisposable: IDisposable = Disposable.None;
 	private _repositories: ISCMRepository[] = [];
 	private repositoryPanels: RepositoryPanel[] = [];
-	private singleRepositoryPanelTitleActionsDisposable: IDisposable = EmptyDisposable;
+	private singlePanelTitleActionsDisposable: IDisposable = Disposable.None;
 	private disposables: IDisposable[] = [];
 	private lastFocusedRepository: ISCMRepository | undefined;
 
@@ -1088,37 +1078,37 @@ export class SCMViewlet extends PanelViewlet implements IViewModel, IViewsViewle
 		this.disposables.push(this.contributedViews);
 	}
 
-	async create(parent: HTMLElement): TPromise<void> {
-		await super.create(parent);
+	create(parent: HTMLElement): TPromise<void> {
+		return super.create(parent).then(() => {
+			this.el = parent;
+			addClass(this.el, 'scm-viewlet');
+			addClass(this.el, 'empty');
+			append(parent, $('div.empty-message', null, localize('no open repo', "No source control providers registered.")));
 
-		this.el = parent;
-		addClass(this.el, 'scm-viewlet');
-		addClass(this.el, 'empty');
-		append(parent, $('div.empty-message', null, localize('no open repo', "There are no active source control providers.")));
+			this.scmService.onDidAddRepository(this.onDidAddRepository, this, this.disposables);
+			this.scmService.onDidRemoveRepository(this.onDidRemoveRepository, this, this.disposables);
+			this.scmService.repositories.forEach(r => this.onDidAddRepository(r));
 
-		this.scmService.onDidAddRepository(this.onDidAddRepository, this, this.disposables);
-		this.scmService.onDidRemoveRepository(this.onDidRemoveRepository, this, this.disposables);
-		this.scmService.repositories.forEach(r => this.onDidAddRepository(r));
+			const onDidUpdateConfiguration = filterEvent(this.configurationService.onDidChangeConfiguration, e => e.affectsConfiguration('scm.alwaysShowProviders'));
+			onDidUpdateConfiguration(this.onDidChangeRepositories, this, this.disposables);
 
-		const onDidUpdateConfiguration = filterEvent(this.configurationService.onDidChangeConfiguration, e => e.affectsConfiguration('scm.alwaysShowProviders'));
-		onDidUpdateConfiguration(this.onDidChangeRepositories, this, this.disposables);
+			this.onDidChangeRepositories();
 
-		this.onDidChangeRepositories();
+			this.contributedViews.onDidAdd(this.onDidAddContributedViews, this, this.disposables);
+			this.contributedViews.onDidRemove(this.onDidRemoveContributedViews, this, this.disposables);
 
-		this.contributedViews.onDidAdd(this.onDidAddContributedViews, this, this.disposables);
-		this.contributedViews.onDidRemove(this.onDidRemoveContributedViews, this, this.disposables);
+			let index = this.getContributedViewsStartIndex();
+			const contributedViews: IAddedViewDescriptorRef[] = this.contributedViews.visibleViewDescriptors.map(viewDescriptor => {
+				const size = this.contributedViews.getSize(viewDescriptor.id);
+				const collapsed = this.contributedViews.isCollapsed(viewDescriptor.id);
+				return { viewDescriptor, index: index++, size, collapsed };
+			});
+			if (contributedViews.length) {
+				this.onDidAddContributedViews(contributedViews);
+			}
 
-		let index = this.getContributedViewsStartIndex();
-		const contributedViews: IAddedViewDescriptorRef[] = this.contributedViews.visibleViewDescriptors.map(viewDescriptor => {
-			const size = this.contributedViews.getSize(viewDescriptor.id);
-			const collapsed = this.contributedViews.isCollapsed(viewDescriptor.id);
-			return { viewDescriptor, index: index++, size, collapsed };
+			this.onDidSashChange(this.saveContributedViewSizes, this, this.disposables);
 		});
-		if (contributedViews.length) {
-			this.onDidAddContributedViews(contributedViews);
-		}
-
-		this.onDidSashChange(this.saveContributedViewSizes, this, this.disposables);
 	}
 
 	private onDidAddRepository(repository: ISCMRepository): void {
@@ -1173,7 +1163,7 @@ export class SCMViewlet extends PanelViewlet implements IViewModel, IViewsViewle
 			});
 		} else {
 			this.mainPanelDisposable.dispose();
-			this.mainPanelDisposable = EmptyDisposable;
+			this.mainPanelDisposable = Disposable.None;
 			this.mainPanel = null;
 		}
 	}
@@ -1226,26 +1216,11 @@ export class SCMViewlet extends PanelViewlet implements IViewModel, IViewsViewle
 	}
 
 	getSecondaryActions(): IAction[] {
-		let result: IAction[];
-
 		if (this.isSingleView()) {
-			const [panel] = this.panels;
-
-			result = [
-				...panel.getSecondaryActions(),
-				new Separator()
-			];
+			return this.panels[0].getSecondaryActions();
 		} else {
-			result = [...this.menus.getTitleSecondaryActions()];
-
-			if (result.length > 0) {
-				result.push(new Separator());
-			}
+			return this.menus.getTitleSecondaryActions();
 		}
-
-		result.push(this.instantiationService.createInstance(InstallAdditionalSCMProvidersAction));
-
-		return result;
 	}
 
 	getActionItem(action: IAction): IActionItem {
@@ -1308,7 +1283,8 @@ export class SCMViewlet extends PanelViewlet implements IViewModel, IViewsViewle
 			this.addPanels([{ panel, size: panel.minimumSize, index: index++ }]);
 			panel.repository.focus();
 			panel.onDidFocus(() => this.lastFocusedRepository = panel.repository);
-			if (newRepositoryPanels.length === 1 || this.lastFocusedRepository === panel.repository) {
+
+			if (this.lastFocusedRepository === panel.repository) {
 				panel.focus();
 			}
 		});
@@ -1335,14 +1311,19 @@ export class SCMViewlet extends PanelViewlet implements IViewModel, IViewsViewle
 
 		// React to menu changes for single view mode
 		if (wasSingleView !== this.isSingleView()) {
-			this.singleRepositoryPanelTitleActionsDisposable.dispose();
+			this.singlePanelTitleActionsDisposable.dispose();
 
 			if (this.isSingleView()) {
-				this.singleRepositoryPanelTitleActionsDisposable = this.repositoryPanels[0].onDidChangeTitle(this.updateTitleArea, this);
+				this.singlePanelTitleActionsDisposable = this.panels[0].onDidChangeTitleArea(this.updateTitleArea, this);
 			}
 
 			this.updateTitleArea();
 		}
+
+		if (this.isVisible()) {
+			panelsToRemove.forEach(p => p.repository.setSelected(false));
+			newRepositoryPanels.forEach(p => p.repository.setSelected(true));
+		}
 	}
 
 	private getContributableViewsSize(): number {
@@ -1473,14 +1454,18 @@ export class SCMViewlet extends PanelViewlet implements IViewModel, IViewsViewle
 		return super.isSingleView() && this.repositoryPanels.length + this.contributedViews.visibleViewDescriptors.length === 1;
 	}
 
-	openView(id: string, focus?: boolean): TPromise<void> {
-		this.contributedViews.setVisible(id, true);
-		const panel = this.panels.filter(panel => panel instanceof ViewletPanel && panel.id === id)[0];
-		if (panel) {
-			panel.setExpanded(true);
-			panel.focus();
+	openView(id: string, focus?: boolean): TPromise<IView> {
+		if (focus) {
+			this.focus();
 		}
-		return TPromise.as(null);
+		let panel = this.panels.filter(panel => panel instanceof ViewletPanel && panel.id === id)[0];
+		if (!panel) {
+			this.contributedViews.setVisible(id, true);
+		}
+		panel = this.panels.filter(panel => panel instanceof ViewletPanel && panel.id === id)[0];
+		panel.setExpanded(true);
+		panel.focus();
+		return TPromise.as(panel);
 	}
 
 	hide(repository: ISCMRepository): void {
diff --git a/src/vs/workbench/parts/search/browser/media/stop-inverse.svg b/src/vs/workbench/parts/search/browser/media/stop-inverse.svg
index ef79528e9c8..3740e50c8c0 100644
--- a/src/vs/workbench/parts/search/browser/media/stop-inverse.svg
+++ b/src/vs/workbench/parts/search/browser/media/stop-inverse.svg
@@ -1 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" enable-background="new 0 0 16 16" height="16" width="16"><path fill="#F6F6F6" d="M13 13h-10v-10h10v10z"/><path fill="#C5C5C5" d="M12 12h-8v-8h8v8z"/></svg>
\ No newline at end of file
+<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M11 11H3V3H11V11Z" fill="#C5C5C5"/>
+</svg>
\ No newline at end of file
diff --git a/src/vs/workbench/parts/search/browser/media/stop.svg b/src/vs/workbench/parts/search/browser/media/stop.svg
index 0b36e84ac92..9a036f2e620 100644
--- a/src/vs/workbench/parts/search/browser/media/stop.svg
+++ b/src/vs/workbench/parts/search/browser/media/stop.svg
@@ -1 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" enable-background="new 0 0 16 16" height="16" width="16"><path fill="#F6F6F6" d="M13 13h-10v-10h10v10z"/><path fill="#424242" d="M12 12h-8v-8h8v8z"/></svg>
\ No newline at end of file
+<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M11 11H3V3H11V11Z" fill="#424242"/>
+</svg>
\ No newline at end of file
diff --git a/src/vs/workbench/parts/search/browser/openAnythingHandler.ts b/src/vs/workbench/parts/search/browser/openAnythingHandler.ts
index 3f0669240a6..2a9b5e67ae4 100644
--- a/src/vs/workbench/parts/search/browser/openAnythingHandler.ts
+++ b/src/vs/workbench/parts/search/browser/openAnythingHandler.ts
@@ -20,10 +20,11 @@ import { IConfigurationService } from 'vs/platform/configuration/common/configur
 import { IWorkbenchSearchConfiguration } from 'vs/workbench/parts/search/common/search';
 import { IRange } from 'vs/editor/common/core/range';
 import { compareItemsByScore, scoreItem, ScorerCache, prepareQuery } from 'vs/base/parts/quickopen/common/quickOpenScorer';
-
-export import OpenSymbolHandler = openSymbolHandler.OpenSymbolHandler; // OpenSymbolHandler is used from an extension and must be in the main bundle file so it can load
 import { INotificationService } from 'vs/platform/notification/common/notification';
 import { isPromiseCanceledError } from 'vs/base/common/errors';
+import { CancellationToken } from 'vs/base/common/cancellation';
+
+export import OpenSymbolHandler = openSymbolHandler.OpenSymbolHandler; // OpenSymbolHandler is used from an extension and must be in the main bundle file so it can load
 
 interface ISearchWithRange {
 	search: string;
@@ -32,19 +33,17 @@ interface ISearchWithRange {
 
 export class OpenAnythingHandler extends QuickOpenHandler {
 
-	public static readonly ID = 'workbench.picker.anything';
+	static readonly ID = 'workbench.picker.anything';
 
 	private static readonly LINE_COLON_PATTERN = /[#|:|\(](\d*)([#|:|,](\d*))?\)?$/;
 
-	private static readonly FILE_SEARCH_DELAY = 300;
-	private static readonly SYMBOL_SEARCH_DELAY = 500; // go easier on those symbols!
+	private static readonly TYPING_SEARCH_DELAY = 200; // This delay accommodates for the user typing a word and then stops typing to start searching
 
 	private static readonly MAX_DISPLAYED_RESULTS = 512;
 
 	private openSymbolHandler: OpenSymbolHandler;
 	private openFileHandler: OpenFileHandler;
 	private searchDelayer: ThrottledDelayer<QuickOpenModel>;
-	private pendingSearch: TPromise<QuickOpenModel>;
 	private isClosed: boolean;
 	private scorerCache: ScorerCache;
 	private includeSymbols: boolean;
@@ -57,7 +56,7 @@ export class OpenAnythingHandler extends QuickOpenHandler {
 		super();
 
 		this.scorerCache = Object.create(null);
-		this.searchDelayer = new ThrottledDelayer<QuickOpenModel>(OpenAnythingHandler.FILE_SEARCH_DELAY);
+		this.searchDelayer = new ThrottledDelayer<QuickOpenModel>(OpenAnythingHandler.TYPING_SEARCH_DELAY);
 
 		this.openSymbolHandler = instantiationService.createInstance(OpenSymbolHandler);
 		this.openFileHandler = instantiationService.createInstance(OpenFileHandler);
@@ -87,8 +86,7 @@ export class OpenAnythingHandler extends QuickOpenHandler {
 		});
 	}
 
-	public getResults(searchValue: string): TPromise<QuickOpenModel> {
-		this.cancelPendingSearch();
+	getResults(searchValue: string, token: CancellationToken): TPromise<QuickOpenModel> {
 		this.isClosed = false; // Treat this call as the handler being in use
 
 		// Find a suitable range from the pattern looking for ":" and "#"
@@ -104,24 +102,23 @@ export class OpenAnythingHandler extends QuickOpenHandler {
 		}
 
 		// The throttler needs a factory for its promises
-		const promiseFactory = () => {
+		const resultsPromise = () => {
 			const resultPromises: TPromise<QuickOpenModel | FileQuickOpenModel>[] = [];
 
 			// File Results
-			const filePromise = this.openFileHandler.getResults(query.value, OpenAnythingHandler.MAX_DISPLAYED_RESULTS);
+			const filePromise = this.openFileHandler.getResults(query.original, token, OpenAnythingHandler.MAX_DISPLAYED_RESULTS);
 			resultPromises.push(filePromise);
 
 			// Symbol Results (unless disabled or a range or absolute path is specified)
 			if (this.includeSymbols && !searchWithRange) {
-				resultPromises.push(this.openSymbolHandler.getResults(query.value));
+				resultPromises.push(this.openSymbolHandler.getResults(query.original, token));
 			}
 
 			// Join and sort unified
-			this.pendingSearch = TPromise.join(resultPromises).then(results => {
-				this.pendingSearch = null;
+			return TPromise.join(resultPromises).then(results => {
 
 				// If the quick open widget has been closed meanwhile, ignore the result
-				if (this.isClosed) {
+				if (this.isClosed || token.isCancellationRequested) {
 					return TPromise.as<QuickOpenModel>(new QuickOpenModel());
 				}
 
@@ -144,8 +141,6 @@ export class OpenAnythingHandler extends QuickOpenHandler {
 
 				return TPromise.as<QuickOpenModel>(new QuickOpenModel(viewResults));
 			}, error => {
-				this.pendingSearch = null;
-
 				if (!isPromiseCanceledError(error)) {
 					if (error && error[0] && error[0].message) {
 						this.notificationService.error(error[0].message.replace(/[\*_\[\]]/g, '\\$&'));
@@ -156,15 +151,13 @@ export class OpenAnythingHandler extends QuickOpenHandler {
 
 				return null;
 			});
-
-			return this.pendingSearch;
 		};
 
 		// Trigger through delayer to prevent accumulation while the user is typing (except when expecting results to come from cache)
-		return this.hasShortResponseTime() ? promiseFactory() : this.searchDelayer.trigger(promiseFactory, this.includeSymbols ? OpenAnythingHandler.SYMBOL_SEARCH_DELAY : OpenAnythingHandler.FILE_SEARCH_DELAY);
+		return this.hasShortResponseTime() ? resultsPromise() : this.searchDelayer.trigger(resultsPromise, OpenAnythingHandler.TYPING_SEARCH_DELAY);
 	}
 
-	public hasShortResponseTime(): boolean {
+	hasShortResponseTime(): boolean {
 		if (!this.includeSymbols) {
 			return this.openFileHandler.hasShortResponseTime();
 		}
@@ -228,27 +221,24 @@ export class OpenAnythingHandler extends QuickOpenHandler {
 		return null;
 	}
 
-	public getGroupLabel(): string {
+	getGroupLabel(): string {
 		return this.includeSymbols ? nls.localize('fileAndTypeResults', "file and symbol results") : nls.localize('fileResults', "file results");
 	}
 
-	public getAutoFocus(searchValue: string): IAutoFocus {
+	getAutoFocus(searchValue: string): IAutoFocus {
 		return {
 			autoFocusFirstEntry: true
 		};
 	}
 
-	public onOpen(): void {
+	onOpen(): void {
 		this.openSymbolHandler.onOpen();
 		this.openFileHandler.onOpen();
 	}
 
-	public onClose(canceled: boolean): void {
+	onClose(canceled: boolean): void {
 		this.isClosed = true;
 
-		// Cancel any pending search
-		this.cancelPendingSearch();
-
 		// Clear Cache
 		this.scorerCache = Object.create(null);
 
@@ -256,11 +246,4 @@ export class OpenAnythingHandler extends QuickOpenHandler {
 		this.openSymbolHandler.onClose(canceled);
 		this.openFileHandler.onClose(canceled);
 	}
-
-	private cancelPendingSearch(): void {
-		if (this.pendingSearch) {
-			this.pendingSearch.cancel();
-			this.pendingSearch = null;
-		}
-	}
-}
\ No newline at end of file
+}
diff --git a/src/vs/workbench/parts/search/browser/openFileHandler.ts b/src/vs/workbench/parts/search/browser/openFileHandler.ts
index 2a08068c698..27043a280bc 100644
--- a/src/vs/workbench/parts/search/browser/openFileHandler.ts
+++ b/src/vs/workbench/parts/search/browser/openFileHandler.ts
@@ -8,10 +8,9 @@ import { TPromise } from 'vs/base/common/winjs.base';
 import * as errors from 'vs/base/common/errors';
 import * as nls from 'vs/nls';
 import * as paths from 'vs/base/common/paths';
-import * as labels from 'vs/base/common/labels';
 import * as objects from 'vs/base/common/objects';
 import { defaultGenerator } from 'vs/base/common/idGenerator';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import * as resources from 'vs/base/common/resources';
 import { IIconLabelValueOptions } from 'vs/base/browser/ui/iconLabel/iconLabel';
 import { IModeService } from 'vs/editor/common/services/modeService';
@@ -26,16 +25,21 @@ import { EditorInput, IWorkbenchEditorConfiguration } from 'vs/workbench/common/
 import { IResourceInput } from 'vs/platform/editor/common/editor';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IQueryOptions, ISearchService, ISearchStats, ISearchQuery } from 'vs/platform/search/common/search';
+import { IQueryOptions, ISearchService, IFileSearchStats, ISearchQuery, ISearchComplete } from 'vs/platform/search/common/search';
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { IRange } from 'vs/editor/common/core/range';
 import { getOutOfWorkspaceEditorResources } from 'vs/workbench/parts/search/common/search';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
+import { prepareQuery, IPreparedQuery } from 'vs/base/parts/quickopen/common/quickOpenScorer';
+import { IFileService } from 'vs/platform/files/common/files';
+import { ILabelService } from 'vs/platform/label/common/label';
+import { untildify } from 'vs/base/common/labels';
+import { CancellationToken } from 'vs/base/common/cancellation';
 
 export class FileQuickOpenModel extends QuickOpenModel {
 
-	constructor(entries: QuickOpenEntry[], public stats?: ISearchStats) {
+	constructor(entries: QuickOpenEntry[], stats?: IFileSearchStats) {
 		super(entries);
 	}
 }
@@ -57,41 +61,41 @@ export class FileEntry extends EditorQuickOpenEntry {
 		super(editorService);
 	}
 
-	public getLabel(): string {
+	getLabel(): string {
 		return this.name;
 	}
 
-	public getLabelOptions(): IIconLabelValueOptions {
+	getLabelOptions(): IIconLabelValueOptions {
 		return {
 			extraClasses: getIconClasses(this.modelService, this.modeService, this.resource)
 		};
 	}
 
-	public getAriaLabel(): string {
+	getAriaLabel(): string {
 		return nls.localize('entryAriaLabel', "{0}, file picker", this.getLabel());
 	}
 
-	public getDescription(): string {
+	getDescription(): string {
 		return this.description;
 	}
 
-	public getIcon(): string {
+	getIcon(): string {
 		return this.icon;
 	}
 
-	public getResource(): URI {
+	getResource(): URI {
 		return this.resource;
 	}
 
-	public setRange(range: IRange): void {
+	setRange(range: IRange): void {
 		this.range = range;
 	}
 
-	public mergeWithEditorHistory(): boolean {
+	mergeWithEditorHistory(): boolean {
 		return true;
 	}
 
-	public getInput(): IResourceInput | EditorInput {
+	getInput(): IResourceInput | EditorInput {
 		const input: IResourceInput = {
 			resource: this.resource,
 			options: {
@@ -122,70 +126,101 @@ export class OpenFileHandler extends QuickOpenHandler {
 		@IWorkbenchThemeService private themeService: IWorkbenchThemeService,
 		@IWorkspaceContextService private contextService: IWorkspaceContextService,
 		@ISearchService private searchService: ISearchService,
-		@IEnvironmentService private environmentService: IEnvironmentService
+		@IEnvironmentService private environmentService: IEnvironmentService,
+		@IFileService private fileService: IFileService,
+		@ILabelService private labelService: ILabelService
 	) {
 		super();
 
 		this.queryBuilder = this.instantiationService.createInstance(QueryBuilder);
 	}
 
-	public setOptions(options: IOpenFileOptions) {
+	setOptions(options: IOpenFileOptions) {
 		this.options = options;
 	}
 
-	public getResults(searchValue: string, maxSortedResults?: number): TPromise<FileQuickOpenModel> {
-		searchValue = searchValue.trim();
+	getResults(searchValue: string, token: CancellationToken, maxSortedResults?: number): TPromise<FileQuickOpenModel> {
+		const query = prepareQuery(searchValue);
 
 		// Respond directly to empty search
-		if (!searchValue) {
+		if (!query.value) {
 			return TPromise.as(new FileQuickOpenModel([]));
 		}
 
 		// Untildify file pattern
-		searchValue = labels.untildify(searchValue, this.environmentService.userHome);
+		query.value = untildify(query.value, this.environmentService.userHome);
 
 		// Do find results
-		return this.doFindResults(searchValue, this.cacheState.cacheKey, maxSortedResults);
+		return this.doFindResults(query, token, this.cacheState.cacheKey, maxSortedResults);
 	}
 
-	private doFindResults(searchValue: string, cacheKey?: string, maxSortedResults?: number): TPromise<FileQuickOpenModel> {
-		const query: IQueryOptions = {
-			extraFileResources: getOutOfWorkspaceEditorResources(this.editorService, this.contextService),
-			filePattern: searchValue,
-			cacheKey: cacheKey
-		};
-
-		if (typeof maxSortedResults === 'number') {
-			query.maxResults = maxSortedResults;
-			query.sortByScore = true;
-		}
+	private doFindResults(query: IPreparedQuery, token: CancellationToken, cacheKey?: string, maxSortedResults?: number): TPromise<FileQuickOpenModel> {
+		const queryOptions = this.doResolveQueryOptions(query, cacheKey, maxSortedResults);
 
 		let iconClass: string;
 		if (this.options && this.options.forceUseIcons && !this.themeService.getFileIconTheme()) {
 			iconClass = 'file'; // only use a generic file icon if we are forced to use an icon and have no icon theme set otherwise
 		}
 
-		const folderResources = this.contextService.getWorkspace().folders.map(folder => folder.uri);
-		return this.searchService.search(this.queryBuilder.file(folderResources, query)).then((complete) => {
-			const results: QuickOpenEntry[] = [];
-			for (let i = 0; i < complete.results.length; i++) {
-				const fileMatch = complete.results[i];
-
-				const label = paths.basename(fileMatch.resource.fsPath);
-				const description = labels.getPathLabel(resources.dirname(fileMatch.resource), this.contextService, this.environmentService);
-
-				results.push(this.instantiationService.createInstance(FileEntry, fileMatch.resource, label, description, iconClass));
+		return this.getAbsolutePathResult(query).then(result => {
+			if (token.isCancellationRequested) {
+				return TPromise.wrap(<ISearchComplete>{ results: [] });
 			}
 
-			return new FileQuickOpenModel(results, complete.stats);
+			// If the original search value is an existing file on disk, return it immediately and bypass the search service
+			if (result) {
+				return TPromise.wrap(<ISearchComplete>{ results: [{ resource: result }] });
+			}
+
+			return this.searchService.search(this.queryBuilder.file(this.contextService.getWorkspace().folders.map(folder => folder.uri), queryOptions), token);
+		}).then(complete => {
+			const results: QuickOpenEntry[] = [];
+
+			if (!token.isCancellationRequested) {
+				for (let i = 0; i < complete.results.length; i++) {
+					const fileMatch = complete.results[i];
+
+					const label = paths.basename(fileMatch.resource.fsPath);
+					const description = this.labelService.getUriLabel(resources.dirname(fileMatch.resource), true);
+
+					results.push(this.instantiationService.createInstance(FileEntry, fileMatch.resource, label, description, iconClass));
+				}
+			}
+
+			return new FileQuickOpenModel(results, <IFileSearchStats>complete.stats);
 		});
 	}
 
-	public hasShortResponseTime(): boolean {
+	private getAbsolutePathResult(query: IPreparedQuery): TPromise<URI> {
+		if (paths.isAbsolute(query.original)) {
+			const resource = URI.file(query.original);
+
+			return this.fileService.resolveFile(resource).then(stat => stat.isDirectory ? void 0 : resource, error => void 0);
+		}
+
+		return TPromise.as(null);
+	}
+
+	private doResolveQueryOptions(query: IPreparedQuery, cacheKey?: string, maxSortedResults?: number): IQueryOptions {
+		const queryOptions: IQueryOptions = {
+			extraFileResources: getOutOfWorkspaceEditorResources(this.editorService, this.contextService),
+			filePattern: query.value,
+			cacheKey
+		};
+
+		if (typeof maxSortedResults === 'number') {
+			queryOptions.maxResults = maxSortedResults;
+			queryOptions.sortByScore = true;
+		}
+
+		return queryOptions;
+	}
+
+	hasShortResponseTime(): boolean {
 		return this.isCacheLoaded;
 	}
 
-	public onOpen(): void {
+	onOpen(): void {
 		this.cacheState = new CacheState(cacheKey => this.cacheQuery(cacheKey), query => this.searchService.search(query), cacheKey => this.searchService.clearCache(cacheKey), this.cacheState);
 		this.cacheState.load();
 	}
@@ -205,15 +240,15 @@ export class OpenFileHandler extends QuickOpenHandler {
 		return query;
 	}
 
-	public get isCacheLoaded(): boolean {
+	get isCacheLoaded(): boolean {
 		return this.cacheState && this.cacheState.isLoaded;
 	}
 
-	public getGroupLabel(): string {
+	getGroupLabel(): string {
 		return nls.localize('searchResults', "search results");
 	}
 
-	public getAutoFocus(searchValue: string): IAutoFocus {
+	getAutoFocus(searchValue: string): IAutoFocus {
 		return {
 			autoFocusFirstEntry: true
 		};
@@ -251,21 +286,21 @@ export class CacheState {
 		}
 	}
 
-	public get cacheKey(): string {
+	get cacheKey(): string {
 		return this.loadingPhase === LoadingPhase.Loaded || !this.previous ? this._cacheKey : this.previous.cacheKey;
 	}
 
-	public get isLoaded(): boolean {
+	get isLoaded(): boolean {
 		const isLoaded = this.loadingPhase === LoadingPhase.Loaded;
 		return isLoaded || !this.previous ? isLoaded : this.previous.isLoaded;
 	}
 
-	public get isUpdating(): boolean {
+	get isUpdating(): boolean {
 		const isUpdating = this.loadingPhase === LoadingPhase.Loading;
 		return isUpdating || !this.previous ? isUpdating : this.previous.isUpdating;
 	}
 
-	public load(): void {
+	load(): void {
 		if (this.isUpdating) {
 			return;
 		}
@@ -283,7 +318,7 @@ export class CacheState {
 			});
 	}
 
-	public dispose(): void {
+	dispose(): void {
 		if (this.promise) {
 			this.promise.then(null, () => { })
 				.then(() => {
diff --git a/src/vs/workbench/parts/search/browser/openSymbolHandler.ts b/src/vs/workbench/parts/search/browser/openSymbolHandler.ts
index c3a855cb222..b44f07d6bab 100644
--- a/src/vs/workbench/parts/search/browser/openSymbolHandler.ts
+++ b/src/vs/workbench/parts/search/browser/openSymbolHandler.ts
@@ -5,7 +5,7 @@
 'use strict';
 
 import * as nls from 'vs/nls';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { onUnexpectedError } from 'vs/base/common/errors';
 import { ThrottledDelayer } from 'vs/base/common/async';
@@ -15,106 +15,101 @@ import { IAutoFocus, Mode, IEntryRunContext } from 'vs/base/parts/quickopen/comm
 import * as filters from 'vs/base/common/filters';
 import * as strings from 'vs/base/common/strings';
 import { Range } from 'vs/editor/common/core/range';
-import { EditorInput, IWorkbenchEditorConfiguration } from 'vs/workbench/common/editor';
-import * as labels from 'vs/base/common/labels';
-import { SymbolInformation, symbolKindToCssClass } from 'vs/editor/common/modes';
+import { IWorkbenchEditorConfiguration } from 'vs/workbench/common/editor';
+import { symbolKindToCssClass } from 'vs/editor/common/modes';
 import { IResourceInput } from 'vs/platform/editor/common/editor';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IWorkspaceSymbolProvider, getWorkspaceSymbols } from 'vs/workbench/parts/search/common/search';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
+import { IWorkspaceSymbolProvider, getWorkspaceSymbols, IWorkspaceSymbol } from 'vs/workbench/parts/search/common/search';
 import { basename } from 'vs/base/common/paths';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
+import { ILabelService } from 'vs/platform/label/common/label';
+import { CancellationToken } from 'vs/base/common/cancellation';
 
 class SymbolEntry extends EditorQuickOpenEntry {
-
-	private _bearingResolve: TPromise<this>;
+	private bearingResolve: Thenable<this>;
 
 	constructor(
-		private _bearing: SymbolInformation,
-		private _provider: IWorkspaceSymbolProvider,
-		@IConfigurationService private readonly _configurationService: IConfigurationService,
-		@IWorkspaceContextService private readonly _contextService: IWorkspaceContextService,
+		private bearing: IWorkspaceSymbol,
+		private provider: IWorkspaceSymbolProvider,
+		@IConfigurationService private readonly configurationService: IConfigurationService,
 		@IEditorService editorService: IEditorService,
-		@IEnvironmentService private readonly _environmentService: IEnvironmentService
+		@ILabelService private labelService: ILabelService
 	) {
 		super(editorService);
 	}
 
-	public getLabel(): string {
-		return this._bearing.name;
+	getLabel(): string {
+		return this.bearing.name;
 	}
 
-	public getAriaLabel(): string {
+	getAriaLabel(): string {
 		return nls.localize('entryAriaLabel', "{0}, symbols picker", this.getLabel());
 	}
 
-	public getDescription(): string {
-		const containerName = this._bearing.containerName;
-		if (this._bearing.location.uri) {
+	getDescription(): string {
+		const containerName = this.bearing.containerName;
+		if (this.bearing.location.uri) {
 			if (containerName) {
-				return `${containerName} — ${basename(this._bearing.location.uri.fsPath)}`;
-			} else {
-				return labels.getPathLabel(this._bearing.location.uri, this._contextService, this._environmentService);
+				return `${containerName} — ${basename(this.bearing.location.uri.fsPath)}`;
 			}
+
+			return this.labelService.getUriLabel(this.bearing.location.uri, true);
 		}
+
 		return containerName;
 	}
 
-	public getIcon(): string {
-		return symbolKindToCssClass(this._bearing.kind);
+	getIcon(): string {
+		return symbolKindToCssClass(this.bearing.kind);
 	}
 
-	public getResource(): URI {
-		return this._bearing.location.uri;
+	getResource(): URI {
+		return this.bearing.location.uri;
 	}
 
-	public run(mode: Mode, context: IEntryRunContext): boolean {
+	run(mode: Mode, context: IEntryRunContext): boolean {
 
 		// resolve this type bearing if neccessary
-		if (!this._bearingResolve
-			&& typeof this._provider.resolveWorkspaceSymbol === 'function'
-			&& !this._bearing.location.range
-		) {
+		if (!this.bearingResolve && typeof this.provider.resolveWorkspaceSymbol === 'function' && !this.bearing.location.range) {
+			this.bearingResolve = Promise.resolve(this.provider.resolveWorkspaceSymbol(this.bearing, CancellationToken.None)).then(result => {
+				this.bearing = result || this.bearing;
 
-			this._bearingResolve = this._provider.resolveWorkspaceSymbol(this._bearing).then(result => {
-				this._bearing = result || this._bearing;
 				return this;
 			}, onUnexpectedError);
 		}
 
-		TPromise.as(this._bearingResolve)
-			.then(_ => super.run(mode, context))
-			.then(undefined, onUnexpectedError);
+		TPromise.as(this.bearingResolve)
+			.then(() => super.run(mode, context))
+			.then(void 0, onUnexpectedError);
 
 		// hide if OPEN
 		return mode === Mode.OPEN;
 	}
 
-	public getInput(): IResourceInput | EditorInput {
-		let input: IResourceInput = {
-			resource: this._bearing.location.uri,
+	getInput(): IResourceInput {
+		const input: IResourceInput = {
+			resource: this.bearing.location.uri,
 			options: {
-				pinned: !this._configurationService.getValue<IWorkbenchEditorConfiguration>().workbench.editor.enablePreviewFromQuickOpen
+				pinned: !this.configurationService.getValue<IWorkbenchEditorConfiguration>().workbench.editor.enablePreviewFromQuickOpen
 			}
 		};
 
-		if (this._bearing.location.range) {
-			input.options.selection = Range.collapseToStart(this._bearing.location.range);
+		if (this.bearing.location.range) {
+			input.options.selection = Range.collapseToStart(this.bearing.location.range);
 		}
 
 		return input;
 	}
 
-	public static compare(elementA: SymbolEntry, elementB: SymbolEntry, searchValue: string): number {
+	static compare(elementA: SymbolEntry, elementB: SymbolEntry, searchValue: string): number {
 
 		// Sort by Type if name is identical
 		const elementAName = elementA.getLabel().toLowerCase();
 		const elementBName = elementB.getLabel().toLowerCase();
 		if (elementAName === elementBName) {
-			let elementAType = symbolKindToCssClass(elementA._bearing.kind);
-			let elementBType = symbolKindToCssClass(elementB._bearing.kind);
+			let elementAType = symbolKindToCssClass(elementA.bearing.kind);
+			let elementBType = symbolKindToCssClass(elementB.bearing.kind);
 			return elementAType.localeCompare(elementBType);
 		}
 
@@ -130,9 +125,9 @@ export interface IOpenSymbolOptions {
 
 export class OpenSymbolHandler extends QuickOpenHandler {
 
-	public static readonly ID = 'workbench.picker.symbols';
+	static readonly ID = 'workbench.picker.symbols';
 
-	private static readonly SEARCH_DELAY = 500; // This delay accommodates for the user typing a word and then stops typing to start searching
+	private static readonly TYPING_SEARCH_DELAY = 200; // This delay accommodates for the user typing a word and then stops typing to start searching
 
 	private delayer: ThrottledDelayer<QuickOpenEntry[]>;
 	private options: IOpenSymbolOptions;
@@ -140,33 +135,43 @@ export class OpenSymbolHandler extends QuickOpenHandler {
 	constructor(@IInstantiationService private instantiationService: IInstantiationService) {
 		super();
 
-		this.delayer = new ThrottledDelayer<QuickOpenEntry[]>(OpenSymbolHandler.SEARCH_DELAY);
+		this.delayer = new ThrottledDelayer<QuickOpenEntry[]>(OpenSymbolHandler.TYPING_SEARCH_DELAY);
 		this.options = Object.create(null);
 	}
 
-	public setOptions(options: IOpenSymbolOptions) {
+	setOptions(options: IOpenSymbolOptions) {
 		this.options = options;
 	}
 
-	public canRun(): boolean | string {
+	canRun(): boolean | string {
 		return true;
 	}
 
-	public getResults(searchValue: string): TPromise<QuickOpenModel> {
+	getResults(searchValue: string, token: CancellationToken): TPromise<QuickOpenModel> {
 		searchValue = searchValue.trim();
 
 		let promise: TPromise<QuickOpenEntry[]>;
 		if (!this.options.skipDelay) {
-			promise = this.delayer.trigger(() => this.doGetResults(searchValue)); // Run search with delay as needed
+			promise = this.delayer.trigger(() => {
+				if (token.isCancellationRequested) {
+					return TPromise.wrap([]);
+				}
+
+				return this.doGetResults(searchValue, token);
+			});
 		} else {
-			promise = this.doGetResults(searchValue);
+			promise = this.doGetResults(searchValue, token);
 		}
 
 		return promise.then(e => new QuickOpenModel(e));
 	}
 
-	private doGetResults(searchValue: string): TPromise<SymbolEntry[]> {
-		return getWorkspaceSymbols(searchValue).then(tuples => {
+	private doGetResults(searchValue: string, token: CancellationToken): TPromise<SymbolEntry[]> {
+		return getWorkspaceSymbols(searchValue, token).then(tuples => {
+			if (token.isCancellationRequested) {
+				return [];
+			}
+
 			const result: SymbolEntry[] = [];
 			for (let tuple of tuples) {
 				const [provider, bearings] = tuple;
@@ -177,13 +182,13 @@ export class OpenSymbolHandler extends QuickOpenHandler {
 			if (!this.options.skipSorting) {
 				searchValue = searchValue ? strings.stripWildcards(searchValue.toLowerCase()) : searchValue;
 				return result.sort((a, b) => SymbolEntry.compare(a, b, searchValue));
-			} else {
-				return result;
 			}
+
+			return result;
 		});
 	}
 
-	private fillInSymbolEntries(bucket: SymbolEntry[], provider: IWorkspaceSymbolProvider, types: SymbolInformation[], searchValue: string): void {
+	private fillInSymbolEntries(bucket: SymbolEntry[], provider: IWorkspaceSymbolProvider, types: IWorkspaceSymbol[], searchValue: string): void {
 
 		// Convert to Entries
 		for (let element of types) {
@@ -197,18 +202,18 @@ export class OpenSymbolHandler extends QuickOpenHandler {
 		}
 	}
 
-	public getGroupLabel(): string {
+	getGroupLabel(): string {
 		return nls.localize('symbols', "symbol results");
 	}
 
-	public getEmptyLabel(searchString: string): string {
+	getEmptyLabel(searchString: string): string {
 		if (searchString.length > 0) {
 			return nls.localize('noSymbolsMatching', "No symbols matching");
 		}
 		return nls.localize('noSymbolsWithoutInput', "Type to search for symbols");
 	}
 
-	public getAutoFocus(searchValue: string): IAutoFocus {
+	getAutoFocus(searchValue: string): IAutoFocus {
 		return {
 			autoFocusFirstEntry: true,
 			autoFocusPrefixMatch: searchValue.trim()
diff --git a/src/vs/workbench/parts/search/browser/patternInputWidget.ts b/src/vs/workbench/parts/search/browser/patternInputWidget.ts
index 522be3a0723..ced2a9bbba2 100644
--- a/src/vs/workbench/parts/search/browser/patternInputWidget.ts
+++ b/src/vs/workbench/parts/search/browser/patternInputWidget.ts
@@ -14,7 +14,7 @@ import { KeyCode } from 'vs/base/common/keyCodes';
 import { Event as CommonEvent, Emitter } from 'vs/base/common/event';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { attachInputBoxStyler, attachCheckboxStyler } from 'vs/platform/theme/common/styler';
-import { ContextScopedHistoryInputBox } from 'vs/platform/widget/browser/input';
+import { ContextScopedHistoryInputBox } from 'vs/platform/widget/browser/contextScopedHistoryWidget';
 import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 
 export interface IOptions {
@@ -130,10 +130,7 @@ export class PatternInputWidget extends Widget {
 	}
 
 	public onSearchSubmit(): void {
-		const value = this.getValue();
-		if (value) {
-			this.inputBox.addToHistory(value);
-		}
+		this.inputBox.addToHistory();
 	}
 
 	public showNextTerm() {
@@ -215,17 +212,17 @@ export class ExcludePatternInputWidget extends PatternInputWidget {
 	}
 
 	protected renderSubcontrols(controlsDiv: HTMLDivElement): void {
-		this.useExcludesAndIgnoreFilesBox = new Checkbox({
+		this.useExcludesAndIgnoreFilesBox = this._register(new Checkbox({
 			actionClassName: 'useExcludesAndIgnoreFiles',
 			title: nls.localize('useExcludesAndIgnoreFilesDescription', "Use Exclude Settings and Ignore Files"),
 			isChecked: true,
-			onChange: (viaKeyboard) => {
-				this.onOptionChange(null);
-				if (!viaKeyboard) {
-					this.inputBox.focus();
-				}
+		}));
+		this._register(this.useExcludesAndIgnoreFilesBox.onChange(viaKeyboard => {
+			this.onOptionChange(null);
+			if (!viaKeyboard) {
+				this.inputBox.focus();
 			}
-		});
+		}));
 		this._register(attachCheckboxStyler(this.useExcludesAndIgnoreFilesBox, this.themeService));
 
 		controlsDiv.appendChild(this.useExcludesAndIgnoreFilesBox.domNode);
diff --git a/src/vs/workbench/parts/search/browser/replaceService.ts b/src/vs/workbench/parts/search/browser/replaceService.ts
index 73fe8903f8a..975d8f3f1e1 100644
--- a/src/vs/workbench/parts/search/browser/replaceService.ts
+++ b/src/vs/workbench/parts/search/browser/replaceService.ts
@@ -6,7 +6,7 @@
 import * as nls from 'vs/nls';
 import * as errors from 'vs/base/common/errors';
 import { TPromise } from 'vs/base/common/winjs.base';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import * as network from 'vs/base/common/network';
 import { Disposable } from 'vs/base/common/lifecycle';
 import { IReplaceService } from 'vs/workbench/parts/search/common/replace';
@@ -24,6 +24,9 @@ import { ResourceTextEdit } from 'vs/editor/common/modes';
 import { createTextBufferFactoryFromSnapshot } from 'vs/editor/common/model/textModel';
 import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
 import { IBulkEditService } from 'vs/editor/browser/services/bulkEditService';
+import { Range } from 'vs/editor/common/core/range';
+import { EditOperation } from 'vs/editor/common/core/editOperation';
+import { mergeSort } from 'vs/base/common/arrays';
 
 const REPLACE_PREVIEW = 'replacePreview';
 
@@ -103,26 +106,7 @@ export class ReplaceService implements IReplaceService {
 	public replace(match: FileMatchOrMatch, progress?: IProgressRunner, resource?: URI): TPromise<any>;
 	public replace(arg: any, progress: IProgressRunner = null, resource: URI = null): TPromise<any> {
 
-		const edits: ResourceTextEdit[] = [];
-
-		if (arg instanceof Match) {
-			let match = <Match>arg;
-			edits.push(this.createEdit(match, match.replaceString, resource));
-		}
-
-		if (arg instanceof FileMatch) {
-			arg = [arg];
-		}
-
-		if (arg instanceof Array) {
-			arg.forEach(element => {
-				let fileMatch = <FileMatch>element;
-				if (fileMatch.count() > 0) {
-					edits.push(...fileMatch.matches().map(match => this.createEdit(match, match.replaceString, resource)));
-				}
-			});
-		}
-
+		const edits: ResourceTextEdit[] = this.createEdits(arg, resource);
 		return this.bulkEditorService.apply({ edits }, { progress }).then(() => this.textFileService.saveAll(edits.map(e => e.resource)));
 
 	}
@@ -140,6 +124,12 @@ export class ReplaceService implements IReplaceService {
 				revealIfVisible: true
 			}
 		}).then(editor => {
+			const disposable = fileMatch.onDispose(() => {
+				if (editor && editor.input) {
+					editor.input.dispose();
+				}
+				disposable.dispose();
+			});
 			this.updateReplacePreview(fileMatch).then(() => {
 				let editorControl = editor.getControl();
 				if (element instanceof Match) {
@@ -163,7 +153,7 @@ export class ReplaceService implements IReplaceService {
 					} else {
 						replaceModel.undo();
 					}
-					returnValue = this.replace(fileMatch, null, replacePreviewUri);
+					this.applyEditsToPreview(fileMatch, replaceModel);
 				}
 				return returnValue.then(() => {
 					sourceModelRef.dispose();
@@ -172,6 +162,42 @@ export class ReplaceService implements IReplaceService {
 			});
 	}
 
+	private applyEditsToPreview(fileMatch: FileMatch, replaceModel: ITextModel): void {
+		const resourceEdits = this.createEdits(fileMatch, replaceModel.uri);
+		const modelEdits = [];
+		for (const resourceEdit of resourceEdits) {
+			for (const edit of resourceEdit.edits) {
+				const range = Range.lift(edit.range);
+				modelEdits.push(EditOperation.replaceMove(range, edit.text));
+			}
+		}
+		replaceModel.pushEditOperations([], mergeSort(modelEdits, (a, b) => Range.compareRangesUsingStarts(a.range, b.range)), () => []);
+	}
+
+	private createEdits(arg: FileMatchOrMatch | FileMatch[], resource: URI = null): ResourceTextEdit[] {
+		const edits: ResourceTextEdit[] = [];
+
+		if (arg instanceof Match) {
+			let match = <Match>arg;
+			edits.push(this.createEdit(match, match.replaceString, resource));
+		}
+
+		if (arg instanceof FileMatch) {
+			arg = [arg];
+		}
+
+		if (arg instanceof Array) {
+			arg.forEach(element => {
+				let fileMatch = <FileMatch>element;
+				if (fileMatch.count() > 0) {
+					edits.push(...fileMatch.matches().map(match => this.createEdit(match, match.replaceString, resource)));
+				}
+			});
+		}
+
+		return edits;
+	}
+
 	private createEdit(match: Match, text: string, resource: URI = null): ResourceTextEdit {
 		let fileMatch: FileMatch = match.parent();
 		let resourceEdit: ResourceTextEdit = {
diff --git a/src/vs/workbench/parts/search/browser/searchActions.ts b/src/vs/workbench/parts/search/browser/searchActions.ts
index c9d05ffe457..24a3c06a999 100644
--- a/src/vs/workbench/parts/search/browser/searchActions.ts
+++ b/src/vs/workbench/parts/search/browser/searchActions.ts
@@ -7,16 +7,15 @@ import * as DOM from 'vs/base/browser/dom';
 import { Action } from 'vs/base/common/actions';
 import { INavigator } from 'vs/base/common/iterator';
 import { createKeybinding, ResolvedKeybinding } from 'vs/base/common/keyCodes';
-import { getPathLabel } from 'vs/base/common/labels';
+import { normalizeDriveLetter } from 'vs/base/common/labels';
 import { Schemas } from 'vs/base/common/network';
 import { isWindows, OS } from 'vs/base/common/platform';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { ITree } from 'vs/base/parts/tree/browser/tree';
 import * as nls from 'vs/nls';
 import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
 import { ICommandHandler } from 'vs/platform/commands/common/commands';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { ISearchHistoryService, VIEW_ID } from 'vs/platform/search/common/search';
@@ -27,9 +26,7 @@ import { FileMatch, FileMatchOrMatch, FolderMatch, Match, RenderableMatch, searc
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { IPanelService } from 'vs/workbench/services/panel/common/panelService';
 import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { IStorageService } from 'vs/platform/storage/common/storage';
-import { showDeprecatedWarning } from 'vs/platform/widget/browser/input';
+import { normalize } from 'vs/base/common/paths';
 
 export function isSearchViewFocused(viewletService: IViewletService, panelService: IPanelService): boolean {
 	let searchView = getSearchView(viewletService, panelService);
@@ -87,228 +84,57 @@ export const toggleRegexCommand = (accessor: ServicesAccessor) => {
 	searchView.toggleRegex();
 };
 
-export class ShowNextSearchIncludeAction extends Action {
+export class FocusNextInputAction extends Action {
 
-	public static readonly ID = 'search.history.showNextIncludePattern';
-	public static readonly LABEL = nls.localize('nextSearchIncludePattern', "Show Next Search Include Pattern");
+	public static readonly ID = 'search.focus.nextInputBox';
 
 	constructor(id: string, label: string,
 		@IViewletService private viewletService: IViewletService,
-		@IPanelService private panelService: IPanelService,
-		@IContextKeyService private contextKeyService: IContextKeyService,
-		@IKeybindingService private keybindingService: IKeybindingService,
-		@INotificationService private notificationService: INotificationService,
-		@IStorageService private storageService: IStorageService
+		@IPanelService private panelService: IPanelService
 	) {
 		super(id, label);
-		this.enabled = this.contextKeyService.contextMatchesRules(Constants.SearchViewVisibleKey);
 	}
 
 	public run(): TPromise<any> {
-		showDeprecatedWarning(this.notificationService, this.keybindingService, this.storageService);
 		const searchView = getSearchView(this.viewletService, this.panelService);
-		searchView.searchIncludePattern.showNextTerm();
+		searchView.focusNextInputBox();
 		return TPromise.as(null);
 	}
 }
 
-export class ShowPreviousSearchIncludeAction extends Action {
+export class FocusPreviousInputAction extends Action {
 
-	public static readonly ID = 'search.history.showPreviousIncludePattern';
-	public static readonly LABEL = nls.localize('previousSearchIncludePattern', "Show Previous Search Include Pattern");
+	public static readonly ID = 'search.focus.previousInputBox';
 
 	constructor(id: string, label: string,
 		@IViewletService private viewletService: IViewletService,
-		@IPanelService private panelService: IPanelService,
-		@IContextKeyService private contextKeyService: IContextKeyService,
-		@INotificationService private notificationService: INotificationService,
-		@IKeybindingService private keybindingService: IKeybindingService,
-		@IStorageService private storageService: IStorageService
+		@IPanelService private panelService: IPanelService
 	) {
 		super(id, label);
-		this.enabled = this.contextKeyService.contextMatchesRules(Constants.SearchViewVisibleKey);
 	}
 
 	public run(): TPromise<any> {
-		showDeprecatedWarning(this.notificationService, this.keybindingService, this.storageService);
 		const searchView = getSearchView(this.viewletService, this.panelService);
-		searchView.searchIncludePattern.showPreviousTerm();
+		searchView.focusPreviousInputBox();
 		return TPromise.as(null);
 	}
 }
 
-export class ShowNextSearchExcludeAction extends Action {
-
-	public static readonly ID = 'search.history.showNextExcludePattern';
-	public static readonly LABEL = nls.localize('nextSearchExcludePattern', "Show Next Search Exclude Pattern");
-
-	constructor(id: string, label: string,
-		@IViewletService private viewletService: IViewletService,
-		@IPanelService private panelService: IPanelService,
-		@IContextKeyService private contextKeyService: IContextKeyService,
-		@INotificationService private notificationService: INotificationService,
-		@IKeybindingService private keybindingService: IKeybindingService,
-		@IStorageService private storageService: IStorageService
-	) {
-		super(id, label);
-		this.enabled = this.contextKeyService.contextMatchesRules(Constants.SearchViewVisibleKey);
-	}
-
-	public run(): TPromise<any> {
-		showDeprecatedWarning(this.notificationService, this.keybindingService, this.storageService);
-		const searchView = getSearchView(this.viewletService, this.panelService);
-		searchView.searchExcludePattern.showNextTerm();
-		return TPromise.as(null);
-	}
-}
-
-export class ShowPreviousSearchExcludeAction extends Action {
-
-	public static readonly ID = 'search.history.showPreviousExcludePattern';
-	public static readonly LABEL = nls.localize('previousSearchExcludePattern', "Show Previous Search Exclude Pattern");
-
-	constructor(id: string, label: string,
-		@IViewletService private viewletService: IViewletService,
-		@IContextKeyService private contextKeyService: IContextKeyService,
-		@IPanelService private panelService: IPanelService,
-		@INotificationService private notificationService: INotificationService,
-		@IKeybindingService private keybindingService: IKeybindingService,
-		@IStorageService private storageService: IStorageService
-	) {
-		super(id, label);
-		this.enabled = this.contextKeyService.contextMatchesRules(Constants.SearchViewVisibleKey);
-	}
-
-	public run(): TPromise<any> {
-		showDeprecatedWarning(this.notificationService, this.keybindingService, this.storageService);
-		const searchView = getSearchView(this.viewletService, this.panelService);
-		searchView.searchExcludePattern.showPreviousTerm();
-		return TPromise.as(null);
-	}
-}
-
-export class ShowNextSearchTermAction extends Action {
-
-	public static readonly ID = 'search.history.showNext';
-	public static readonly LABEL = nls.localize('nextSearchTerm', "Show Next Search Term");
-
-	constructor(id: string, label: string,
-		@IViewletService private viewletService: IViewletService,
-		@IContextKeyService private contextKeyService: IContextKeyService,
-		@IPanelService private panelService: IPanelService,
-		@INotificationService private notificationService: INotificationService,
-		@IKeybindingService private keybindingService: IKeybindingService,
-		@IStorageService private storageService: IStorageService
-	) {
-		super(id, label);
-		this.enabled = this.contextKeyService.contextMatchesRules(Constants.SearchViewVisibleKey);
-	}
-
-	public run(): TPromise<any> {
-		showDeprecatedWarning(this.notificationService, this.keybindingService, this.storageService);
-		const searchView = getSearchView(this.viewletService, this.panelService);
-		searchView.searchAndReplaceWidget.showNextSearchTerm();
-		return TPromise.as(null);
-	}
-}
-
-export class ShowPreviousSearchTermAction extends Action {
-
-	public static readonly ID = 'search.history.showPrevious';
-	public static readonly LABEL = nls.localize('previousSearchTerm', "Show Previous Search Term");
-
-	constructor(id: string, label: string,
-		@IViewletService private viewletService: IViewletService,
-		@IContextKeyService private contextKeyService: IContextKeyService,
-		@IPanelService private panelService: IPanelService,
-		@INotificationService private notificationService: INotificationService,
-		@IKeybindingService private keybindingService: IKeybindingService,
-		@IStorageService private storageService: IStorageService
-	) {
-		super(id, label);
-		this.enabled = this.contextKeyService.contextMatchesRules(Constants.SearchViewVisibleKey);
-	}
-
-	public run(): TPromise<any> {
-		showDeprecatedWarning(this.notificationService, this.keybindingService, this.storageService);
-		const searchView = getSearchView(this.viewletService, this.panelService);
-		searchView.searchAndReplaceWidget.showPreviousSearchTerm();
-		return TPromise.as(null);
-	}
-}
-export class ShowNextReplaceTermAction extends Action {
-
-	public static readonly ID = 'search.replaceHistory.showNext';
-	public static readonly LABEL = nls.localize('nextReplaceTerm', "Show Next Search Replace Term");
-
-	constructor(id: string, label: string,
-		@IViewletService private viewletService: IViewletService,
-		@IContextKeyService private contextKeyService: IContextKeyService,
-		@IPanelService private panelService: IPanelService,
-		@INotificationService private notificationService: INotificationService,
-		@IKeybindingService private keybindingService: IKeybindingService,
-		@IStorageService private storageService: IStorageService
-	) {
-		super(id, label);
-		this.enabled = this.contextKeyService.contextMatchesRules(Constants.SearchViewVisibleKey);
-	}
-
-	public run(): TPromise<any> {
-		showDeprecatedWarning(this.notificationService, this.keybindingService, this.storageService);
-		const searchView = getSearchView(this.viewletService, this.panelService);
-		searchView.searchAndReplaceWidget.showNextReplaceTerm();
-		return TPromise.as(null);
-	}
-}
-
-export class ShowPreviousReplaceTermAction extends Action {
-
-	public static readonly ID = 'search.replaceHistory.showPrevious';
-	public static readonly LABEL = nls.localize('previousReplaceTerm', "Show Previous Search Replace Term");
-
-	constructor(id: string, label: string,
-		@IViewletService private viewletService: IViewletService,
-		@IContextKeyService private contextKeyService: IContextKeyService,
-		@IPanelService private panelService: IPanelService,
-		@INotificationService private notificationService: INotificationService,
-		@IKeybindingService private keybindingService: IKeybindingService,
-		@IStorageService private storageService: IStorageService
-	) {
-		super(id, label);
-		this.enabled = this.contextKeyService.contextMatchesRules(Constants.SearchViewVisibleKey);
-	}
-
-	public run(): TPromise<any> {
-		showDeprecatedWarning(this.notificationService, this.keybindingService, this.storageService);
-		const searchView = getSearchView(this.viewletService, this.panelService);
-		searchView.searchAndReplaceWidget.showPreviousReplaceTerm();
-		return TPromise.as(null);
-	}
-}
-
-export const FocusActiveEditorCommand = (accessor: ServicesAccessor) => {
-	const editorService = accessor.get(IEditorService);
-	const activeControl = editorService.activeControl;
-	if (activeControl) {
-		activeControl.focus();
-	}
-	return TPromise.as(true);
-};
-
 export abstract class FindOrReplaceInFilesAction extends Action {
 
 	constructor(id: string, label: string, private viewletService: IViewletService, private panelService: IPanelService,
-		private expandSearchReplaceWidget: boolean, private selectWidgetText: boolean, private focusReplace: boolean) {
+		private expandSearchReplaceWidget: boolean
+	) {
 		super(id, label);
 	}
 
 	public run(): TPromise<any> {
-		return openSearchView(this.viewletService, this.panelService, true).then(openedView => {
+		return openSearchView(this.viewletService, this.panelService, false).then(openedView => {
 			const searchAndReplaceWidget = openedView.searchAndReplaceWidget;
 			searchAndReplaceWidget.toggleReplace(this.expandSearchReplaceWidget);
-			// Focus replace only when there is text in the searchInput box
-			const focusReplace = this.focusReplace && searchAndReplaceWidget.searchInput.getValue();
-			searchAndReplaceWidget.focus(this.selectWidgetText, !!focusReplace);
+
+			const updatedText = openedView.updateTextFromSelection(!this.expandSearchReplaceWidget);
+			openedView.searchAndReplaceWidget.focus(undefined, updatedText, updatedText);
 		});
 	}
 }
@@ -321,7 +147,7 @@ export class FindInFilesAction extends FindOrReplaceInFilesAction {
 		@IViewletService viewletService: IViewletService,
 		@IPanelService panelService: IPanelService
 	) {
-		super(id, label, viewletService, panelService, /*expandSearchReplaceWidget=*/false, /*selectWidgetText=*/true, /*focusReplace=*/false);
+		super(id, label, viewletService, panelService, /*expandSearchReplaceWidget=*/false);
 	}
 }
 
@@ -334,7 +160,7 @@ export class ReplaceInFilesAction extends FindOrReplaceInFilesAction {
 		@IViewletService viewletService: IViewletService,
 		@IPanelService panelService: IPanelService
 	) {
-		super(id, label, viewletService, panelService, /*expandSearchReplaceWidget=*/true, /*selectWidgetText=*/false, /*focusReplace=*/true);
+		super(id, label, viewletService, panelService, /*expandSearchReplaceWidget=*/true);
 	}
 }
 
@@ -408,7 +234,34 @@ export class CollapseDeepestExpandedLevelAction extends Action {
 				return TPromise.as(null); // Global action disabled if user is in edit mode from another action
 			}
 
-			viewer.collapseDeepestExpandedLevel();
+			/**
+			 * The hierarchy is FolderMatch, FileMatch, Match. If the top level is FileMatches, then there is only
+			 * one level to collapse so collapse everything. If FolderMatch, check if there are visible grandchildren,
+			 * i.e. if Matches are returned by the navigator, and if so, collapse to them, otherwise collapse all levels.
+			 */
+			const navigator = viewer.getNavigator();
+			let node = navigator.first();
+			let collapseFileMatchLevel = false;
+			if (node instanceof FolderMatch) {
+				while (node = navigator.next()) {
+					if (node instanceof Match) {
+						collapseFileMatchLevel = true;
+						break;
+					}
+				}
+			}
+
+			if (collapseFileMatchLevel) {
+				node = navigator.first();
+				do {
+					if (node instanceof FileMatch) {
+						viewer.collapse(node);
+					}
+				} while (node = navigator.next());
+			} else {
+				viewer.collapseAll();
+			}
+
 			viewer.clearSelection();
 			viewer.clearFocus();
 			viewer.domFocus();
@@ -421,7 +274,7 @@ export class CollapseDeepestExpandedLevelAction extends Action {
 export class ClearSearchResultsAction extends Action {
 
 	static readonly ID: string = 'search.action.clearSearchResults';
-	static LABEL: string = nls.localize('ClearSearchResultsAction.label', "Clear");
+	static LABEL: string = nls.localize('ClearSearchResultsAction.label', "Clear Search Results");
 
 	constructor(id: string, label: string,
 		@IViewletService private viewletService: IViewletService,
@@ -658,14 +511,15 @@ export class ReplaceAllInFolderAction extends AbstractSearchAndReplaceAction {
 		super(Constants.ReplaceAllInFolderActionId, appendKeyBindingLabel(ReplaceAllInFolderAction.LABEL, keyBindingService.lookupKeybinding(Constants.ReplaceAllInFolderActionId), keyBindingService), 'action-replace-all');
 	}
 
-	public async run(): TPromise<any> {
+	public run(): TPromise<any> {
 		let nextFocusElement = this.getElementToFocusAfterRemoved(this.viewer, this.folderMatch);
-		await this.folderMatch.replaceAll();
-
-		if (nextFocusElement) {
-			this.viewer.setFocus(nextFocusElement);
-		}
-		this.viewer.domFocus();
+		return this.folderMatch.replaceAll()
+			.then(() => {
+				if (nextFocusElement) {
+					this.viewer.setFocus(nextFocusElement);
+				}
+				this.viewer.domFocus();
+			});
 	}
 }
 
@@ -751,7 +605,7 @@ export class ReplaceAction extends AbstractSearchAndReplaceAction {
 }
 
 function uriToClipboardString(resource: URI): string {
-	return resource.scheme === Schemas.file ? getPathLabel(resource) : resource.toString();
+	return resource.scheme === Schemas.file ? normalize(normalizeDriveLetter(resource.fsPath), true) : resource.toString();
 }
 
 export const copyPathCommand: ICommandHandler = (accessor, fileMatch: FileMatch | FolderMatch) => {
@@ -845,3 +699,11 @@ export const clearHistoryCommand: ICommandHandler = accessor => {
 	const searchHistoryService = accessor.get(ISearchHistoryService);
 	searchHistoryService.clearHistory();
 };
+
+export const focusSearchListCommand: ICommandHandler = accessor => {
+	const viewletService = accessor.get(IViewletService);
+	const panelService = accessor.get(IPanelService);
+	openSearchView(viewletService, panelService).then(searchView => {
+		searchView.moveFocusToResults();
+	});
+};
diff --git a/src/vs/workbench/parts/search/browser/searchResultsView.ts b/src/vs/workbench/parts/search/browser/searchResultsView.ts
index f4fffc73e4a..88e4943184b 100644
--- a/src/vs/workbench/parts/search/browser/searchResultsView.ts
+++ b/src/vs/workbench/parts/search/browser/searchResultsView.ts
@@ -21,13 +21,13 @@ import { RemoveAction, ReplaceAllAction, ReplaceAction, ReplaceAllInFolderAction
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { attachBadgeStyler } from 'vs/platform/theme/common/styler';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { getPathLabel } from 'vs/base/common/labels';
 import { FileKind } from 'vs/platform/files/common/files';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
 import { IMenuService, MenuId, IMenu } from 'vs/platform/actions/common/actions';
 import { WorkbenchTreeController, WorkbenchTree } from 'vs/platform/list/browser/listService';
 import { fillInContextMenuActions } from 'vs/platform/actions/browser/menuItemActionItem';
+import { ILabelService } from 'vs/platform/label/common/label';
 
 export class SearchDataSource implements IDataSource {
 
@@ -36,7 +36,10 @@ export class SearchDataSource implements IDataSource {
 	private includeFolderMatch: boolean;
 	private listener: IDisposable;
 
-	constructor(@IWorkspaceContextService private contextService: IWorkspaceContextService) {
+	constructor(
+		@IWorkspaceContextService private contextService: IWorkspaceContextService,
+		@IConfigurationService private configurationService: IConfigurationService,
+	) {
 		this.updateIncludeFolderMatch();
 		this.listener = this.contextService.onDidChangeWorkbenchState(() => this.updateIncludeFolderMatch());
 	}
@@ -103,6 +106,14 @@ export class SearchDataSource implements IDataSource {
 		if (numChildren <= 0) {
 			return false;
 		}
+
+		const collapseOption = this.configurationService.getValue('search.collapseResults');
+		if (collapseOption === 'alwaysCollapse') {
+			return false;
+		} else if (collapseOption === 'alwaysExpand') {
+			return true;
+		}
+
 		return numChildren < SearchDataSource.AUTOEXPAND_CHILD_LIMIT || element instanceof FolderMatch;
 	}
 
@@ -235,12 +246,13 @@ export class SearchRenderer extends Disposable implements IRenderer {
 	}
 
 	private renderFolderMatch(tree: ITree, folderMatch: FolderMatch, templateData: IFolderMatchTemplate): void {
-		if (folderMatch.hasRoot()) {
-			const fileKind = resources.isEqual(this.contextService.getWorkspaceFolder(folderMatch.resource()).uri, folderMatch.resource()) ?
-				FileKind.ROOT_FOLDER :
-				FileKind.FOLDER;
-
-			templateData.label.setFile(folderMatch.resource(), { fileKind });
+		if (folderMatch.hasResource()) {
+			const workspaceFolder = this.contextService.getWorkspaceFolder(folderMatch.resource());
+			if (workspaceFolder && resources.isEqual(workspaceFolder.uri, folderMatch.resource())) {
+				templateData.label.setFile(folderMatch.resource(), { fileKind: FileKind.ROOT_FOLDER, hidePath: true });
+			} else {
+				templateData.label.setFile(folderMatch.resource(), { fileKind: FileKind.FOLDER });
+			}
 		} else {
 			templateData.label.setValue(nls.localize('searchFolderMatch.other.label', "Other files"));
 		}
@@ -261,10 +273,8 @@ export class SearchRenderer extends Disposable implements IRenderer {
 	}
 
 	private renderFileMatch(tree: ITree, fileMatch: FileMatch, templateData: IFileMatchTemplate): void {
-		const folderMatch = fileMatch.parent();
-		const root = folderMatch.hasRoot() ? folderMatch.resource() : undefined;
 		templateData.el.setAttribute('data-resource', fileMatch.resource().toString());
-		templateData.label.setFile(fileMatch.resource(), { root });
+		templateData.label.setFile(fileMatch.resource(), { hideIcon: false });
 		let count = fileMatch.count();
 		templateData.badge.setCount(count);
 		templateData.badge.setTitleFormat(count > 1 ? nls.localize('searchMatches', "{0} matches found", count) : nls.localize('searchMatch', "{0} match found", count));
@@ -318,16 +328,20 @@ export class SearchRenderer extends Disposable implements IRenderer {
 
 export class SearchAccessibilityProvider implements IAccessibilityProvider {
 
-	constructor(@IWorkspaceContextService private contextService: IWorkspaceContextService) {
+	constructor(
+		@ILabelService private labelService: ILabelService
+	) {
 	}
 
 	public getAriaLabel(tree: ITree, element: FileMatchOrMatch): string {
 		if (element instanceof FolderMatch) {
-			return nls.localize('folderMatchAriaLabel', "{0} matches in folder root {1}, Search result", element.count(), element.name());
+			return element.hasResource() ?
+				nls.localize('folderMatchAriaLabel', "{0} matches in folder root {1}, Search result", element.count(), element.name()) :
+				nls.localize('otherFilesAriaLabel', "{0} matches outside of the workspace, Search result", element.count());
 		}
 
 		if (element instanceof FileMatch) {
-			const path = getPathLabel(element.resource(), this.contextService) || element.resource().fsPath;
+			const path = this.labelService.getUriLabel(element.resource(), true) || element.resource().fsPath;
 
 			return nls.localize('fileMatchAriaLabel', "{0} matches in file {1} of folder {2}, Search result", element.count(), element.name(), paths.dirname(path));
 		}
diff --git a/src/vs/workbench/parts/search/browser/searchView.ts b/src/vs/workbench/parts/search/browser/searchView.ts
index 3782699ea9a..f65be147777 100644
--- a/src/vs/workbench/parts/search/browser/searchView.ts
+++ b/src/vs/workbench/parts/search/browser/searchView.ts
@@ -5,7 +5,6 @@
 
 'use strict';
 
-import { $, Builder } from 'vs/base/browser/builder';
 import * as dom from 'vs/base/browser/dom';
 import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
 import * as aria from 'vs/base/browser/ui/aria/aria';
@@ -14,14 +13,15 @@ import { MessageType } from 'vs/base/browser/ui/inputbox/inputBox';
 import { IAction } from 'vs/base/common/actions';
 import { Delayer } from 'vs/base/common/async';
 import * as errors from 'vs/base/common/errors';
-import { debounceEvent, Emitter } from 'vs/base/common/event';
+import { anyEvent, debounceEvent, Emitter } from 'vs/base/common/event';
 import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
+import { dispose, IDisposable } from 'vs/base/common/lifecycle';
 import * as paths from 'vs/base/common/paths';
 import * as env from 'vs/base/common/platform';
 import * as strings from 'vs/base/common/strings';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { TPromise } from 'vs/base/common/winjs.base';
-import { IFocusEvent, ITree } from 'vs/base/parts/tree/browser/tree';
+import { ITree } from 'vs/base/parts/tree/browser/tree';
 import 'vs/css!./media/searchview';
 import { ICodeEditor, isCodeEditor, isDiffEditor } from 'vs/editor/browser/editorBrowser';
 import { IEditorOptions } from 'vs/editor/common/config/editorOptions';
@@ -47,7 +47,6 @@ import { Viewlet } from 'vs/workbench/browser/viewlet';
 import { Scope } from 'vs/workbench/common/memento';
 import { IPanel } from 'vs/workbench/common/panel';
 import { IViewlet } from 'vs/workbench/common/viewlet';
-import { PreferencesEditor } from 'vs/workbench/parts/preferences/browser/preferencesEditor';
 import { ExcludePatternInputWidget, PatternInputWidget } from 'vs/workbench/parts/search/browser/patternInputWidget';
 import { CancelSearchAction, ClearSearchResultsAction, CollapseDeepestExpandedLevelAction, RefreshAction } from 'vs/workbench/parts/search/browser/searchActions';
 import { SearchAccessibilityProvider, SearchDataSource, SearchFilter, SearchRenderer, SearchSorter, SearchTreeController } from 'vs/workbench/parts/search/browser/searchResultsView';
@@ -59,9 +58,11 @@ import { getOutOfWorkspaceEditorResources } from 'vs/workbench/parts/search/comm
 import { FileMatch, FileMatchOrMatch, FolderMatch, IChangeEvent, ISearchWorkbenchService, Match, SearchModel } from 'vs/workbench/parts/search/common/searchModel';
 import { ACTIVE_GROUP, IEditorService, SIDE_GROUP } from 'vs/workbench/services/editor/common/editorService';
 import { IPartService } from 'vs/workbench/services/part/common/partService';
-import { IPreferencesService } from 'vs/workbench/services/preferences/common/preferences';
+import { IPreferencesService, ISettingsEditorOptions } from 'vs/workbench/services/preferences/common/preferences';
 import { IUntitledEditorService } from 'vs/workbench/services/untitled/common/untitledEditorService';
 
+const $ = dom.$;
+
 export class SearchView extends Viewlet implements IViewlet, IPanel {
 
 	private static readonly MAX_TEXT_RESULTS = 10000;
@@ -93,23 +94,25 @@ export class SearchView extends Viewlet implements IViewlet, IPanel {
 	private actions: (RefreshAction | CollapseDeepestExpandedLevelAction | ClearSearchResultsAction | CancelSearchAction)[] = [];
 	private tree: WorkbenchTree;
 	private viewletSettings: any;
-	private messages: Builder;
-	private searchWidgetsContainer: Builder;
+	private messagesElement: HTMLElement;
+	private messageDisposables: IDisposable[] = [];
+	private searchWidgetsContainerElement: HTMLElement;
 	private searchWidget: SearchWidget;
 	private size: dom.Dimension;
 	private queryDetails: HTMLElement;
 	private toggleQueryDetailsButton: HTMLElement;
 	private inputPatternExcludes: ExcludePatternInputWidget;
 	private inputPatternIncludes: PatternInputWidget;
-	private results: Builder;
+	private resultsElement: HTMLElement;
 
 	private currentSelectedFileMatch: FileMatch;
 
 	private readonly selectCurrentMatchEmitter: Emitter<string>;
 	private delayedRefresh: Delayer<void>;
 	private changedWhileHidden: boolean;
+	private isWide: boolean;
 
-	private searchWithoutFolderMessageBuilder: Builder;
+	private searchWithoutFolderMessageElement: HTMLElement;
 
 	constructor(
 		@IPartService partService: IPartService,
@@ -149,9 +152,9 @@ export class SearchView extends Viewlet implements IViewlet, IPanel {
 		this.queryBuilder = this.instantiationService.createInstance(QueryBuilder);
 		this.viewletSettings = this.getMemento(storageService, Scope.WORKSPACE);
 
-		this.toUnbind.push(this.fileService.onFileChanges(e => this.onFilesChanged(e)));
-		this.toUnbind.push(this.untitledEditorService.onDidChangeDirty(e => this.onUntitledDidChangeDirty(e)));
-		this.toUnbind.push(this.contextService.onDidChangeWorkbenchState(() => this.onDidChangeWorkbenchState()));
+		this._register(this.fileService.onFileChanges(e => this.onFilesChanged(e)));
+		this._register(this.untitledEditorService.onDidChangeDirty(e => this.onUntitledDidChangeDirty(e)));
+		this._register(this.contextService.onDidChangeWorkbenchState(() => this.onDidChangeWorkbenchState()));
 		this._register(this.searchHistoryService.onDidClearHistory(() => this.clearHistory()));
 
 		this.selectCurrentMatchEmitter = new Emitter<string>();
@@ -162,33 +165,26 @@ export class SearchView extends Viewlet implements IViewlet, IPanel {
 	}
 
 	private onDidChangeWorkbenchState(): void {
-		if (this.contextService.getWorkbenchState() !== WorkbenchState.EMPTY && this.searchWithoutFolderMessageBuilder) {
-			this.searchWithoutFolderMessageBuilder.hide();
+		if (this.contextService.getWorkbenchState() !== WorkbenchState.EMPTY && this.searchWithoutFolderMessageElement) {
+			dom.hide(this.searchWithoutFolderMessageElement);
 		}
 	}
 
 	public create(parent: HTMLElement): TPromise<void> {
 		super.create(parent);
 
-		this.viewModel = this.searchWorkbenchService.searchModel;
-		let builder: Builder;
-		$(parent).div({
-			'class': 'search-view'
-		}, (div) => {
-			builder = div;
-		});
+		this.viewModel = this._register(this.searchWorkbenchService.searchModel);
+		const containerElement = dom.append(parent, $('.search-view'));
 
-		builder.div({ 'class': ['search-widgets-container'] }, (div) => {
-			this.searchWidgetsContainer = div;
-		});
-		this.createSearchWidget(this.searchWidgetsContainer);
+		this.searchWidgetsContainerElement = dom.append(containerElement, $('.search-widgets-container'));
+		this.createSearchWidget(this.searchWidgetsContainerElement);
 
 		const history = this.searchHistoryService.load();
 		const filePatterns = this.viewletSettings['query.filePatterns'] || '';
 		let patternExclusions = this.viewletSettings['query.folderExclusions'] || '';
-		const patternExclusionsHistory: string[] = history.exclude || [];
+		const patternExclusionsHistory: string[] = history.exclude || this.viewletSettings['query.folderExclusionsHistory'] || [];
 		let patternIncludes = this.viewletSettings['query.folderIncludes'] || '';
-		let patternIncludesHistory: string[] = history.include || [];
+		let patternIncludesHistory: string[] = history.include || this.viewletSettings['query.folderIncludesHistory'] || [];
 		const queryDetailsExpanded = this.viewletSettings['query.queryDetailsExpanded'] || '';
 		const useExcludesAndIgnoreFiles = typeof this.viewletSettings['query.useExcludesAndIgnoreFiles'] === 'boolean' ?
 			this.viewletSettings['query.useExcludesAndIgnoreFiles'] : true;
@@ -222,84 +218,86 @@ export class SearchView extends Viewlet implements IViewlet, IPanel {
 			}
 		}
 
-		this.queryDetails = this.searchWidgetsContainer.div({ 'class': ['query-details'] }, (builder) => {
-			this.toggleQueryDetailsButton = builder.div({ 'class': 'more', 'tabindex': 0, 'role': 'button', 'title': nls.localize('moreSearch', "Toggle Search Details") })
-				.on(dom.EventType.CLICK, (e) => {
-					dom.EventHelper.stop(e);
-					this.toggleQueryDetails();
-				}).on(dom.EventType.KEY_UP, (e: KeyboardEvent) => {
-					let event = new StandardKeyboardEvent(e);
+		this.queryDetails = dom.append(this.searchWidgetsContainerElement, $('.query-details'));
 
-					if (event.equals(KeyCode.Enter) || event.equals(KeyCode.Space)) {
-						dom.EventHelper.stop(e);
-						this.toggleQueryDetails(false);
-					}
-				}).on(dom.EventType.KEY_DOWN, (e: KeyboardEvent) => {
-					let event = new StandardKeyboardEvent(e);
+		// Toggle query details button
+		this.toggleQueryDetailsButton = dom.append(this.queryDetails,
+			$('.more', { tabindex: 0, role: 'button', title: nls.localize('moreSearch', "Toggle Search Details") }));
 
-					if (event.equals(KeyMod.Shift | KeyCode.Tab)) {
-						if (this.searchWidget.isReplaceActive()) {
-							this.searchWidget.focusReplaceAllAction();
-						} else {
-							this.searchWidget.focusRegexAction();
-						}
-						dom.EventHelper.stop(e);
-					}
-				}).getHTMLElement();
+		this._register(dom.addDisposableListener(this.toggleQueryDetailsButton, dom.EventType.CLICK, e => {
+			dom.EventHelper.stop(e);
+			this.toggleQueryDetails();
+		}));
+		this._register(dom.addDisposableListener(this.toggleQueryDetailsButton, dom.EventType.KEY_UP, (e: KeyboardEvent) => {
+			const event = new StandardKeyboardEvent(e);
 
-			//folder includes list
-			builder.div({ 'class': 'file-types includes' }, (builder) => {
-				let title = nls.localize('searchScope.includes', "files to include");
-				builder.element('h4', { text: title });
+			if (event.equals(KeyCode.Enter) || event.equals(KeyCode.Space)) {
+				dom.EventHelper.stop(e);
+				this.toggleQueryDetails(false);
+			}
+		}));
+		this._register(dom.addDisposableListener(this.toggleQueryDetailsButton, dom.EventType.KEY_DOWN, (e: KeyboardEvent) => {
+			const event = new StandardKeyboardEvent(e);
 
-				this.inputPatternIncludes = this.instantiationService.createInstance(PatternInputWidget, builder.getContainer(), this.contextViewService, {
-					ariaLabel: nls.localize('label.includes', 'Search Include Patterns'),
-					history: patternIncludesHistory,
-				});
+			if (event.equals(KeyMod.Shift | KeyCode.Tab)) {
+				if (this.searchWidget.isReplaceActive()) {
+					this.searchWidget.focusReplaceAllAction();
+				} else {
+					this.searchWidget.focusRegexAction();
+				}
+				dom.EventHelper.stop(e);
+			}
+		}));
 
-				this.inputPatternIncludes.setValue(patternIncludes);
+		// folder includes list
+		const folderIncludesList = dom.append(this.queryDetails,
+			$('.file-types.includes'));
+		const filesToIncludeTitle = nls.localize('searchScope.includes', "files to include");
+		dom.append(folderIncludesList, $('h4', undefined, filesToIncludeTitle));
 
-				this.inputPatternIncludes
-					.on(FindInput.OPTION_CHANGE, (e) => {
-						this.onQueryChanged(false);
-					});
+		this.inputPatternIncludes = this._register(this.instantiationService.createInstance(PatternInputWidget, folderIncludesList, this.contextViewService, {
+			ariaLabel: nls.localize('label.includes', 'Search Include Patterns'),
+			history: patternIncludesHistory,
+		}));
 
-				this.inputPatternIncludes.onSubmit(() => this.onQueryChanged(true, true));
-				this.inputPatternIncludes.onCancel(() => this.viewModel.cancelSearch()); // Cancel search without focusing the search widget
-				this.trackInputBox(this.inputPatternIncludes.inputFocusTracker, this.inputPatternIncludesFocused);
+		this.inputPatternIncludes.setValue(patternIncludes);
+
+		this.inputPatternIncludes.on(FindInput.OPTION_CHANGE, (e) => {
+			this.onQueryChanged(false);
+		});
+
+		this.inputPatternIncludes.onSubmit(() => this.onQueryChanged(true, true));
+		this.inputPatternIncludes.onCancel(() => this.viewModel.cancelSearch()); // Cancel search without focusing the search widget
+		this.trackInputBox(this.inputPatternIncludes.inputFocusTracker, this.inputPatternIncludesFocused);
+
+		// excludes list
+		const excludesList = dom.append(this.queryDetails, $('.file-types.excludes'));
+		const excludesTitle = nls.localize('searchScope.excludes', "files to exclude");
+		dom.append(excludesList, $('h4', undefined, excludesTitle));
+		this.inputPatternExcludes = this._register(this.instantiationService.createInstance(ExcludePatternInputWidget, excludesList, this.contextViewService, {
+			ariaLabel: nls.localize('label.excludes', 'Search Exclude Patterns'),
+			history: patternExclusionsHistory,
+		}));
+
+		this.inputPatternExcludes.setValue(patternExclusions);
+		this.inputPatternExcludes.setUseExcludesAndIgnoreFiles(useExcludesAndIgnoreFiles);
+
+		this.inputPatternExcludes
+			.on(FindInput.OPTION_CHANGE, (e) => {
+				this.onQueryChanged(false);
 			});
 
-			//pattern exclusion list
-			builder.div({ 'class': 'file-types excludes' }, (builder) => {
-				let title = nls.localize('searchScope.excludes', "files to exclude");
-				builder.element('h4', { text: title });
+		this.inputPatternExcludes.onSubmit(() => this.onQueryChanged(true, true));
+		this.inputPatternExcludes.onSubmit(() => this.onQueryChanged(true, true));
+		this.inputPatternExcludes.onCancel(() => this.viewModel.cancelSearch()); // Cancel search without focusing the search widget
+		this.trackInputBox(this.inputPatternExcludes.inputFocusTracker, this.inputPatternExclusionsFocused);
 
-				this.inputPatternExcludes = this.instantiationService.createInstance(ExcludePatternInputWidget, builder.getContainer(), this.contextViewService, {
-					ariaLabel: nls.localize('label.excludes', 'Search Exclude Patterns'),
-					history: patternExclusionsHistory,
-				});
-
-				this.inputPatternExcludes.setValue(patternExclusions);
-				this.inputPatternExcludes.setUseExcludesAndIgnoreFiles(useExcludesAndIgnoreFiles);
-
-				this.inputPatternExcludes
-					.on(FindInput.OPTION_CHANGE, (e) => {
-						this.onQueryChanged(false);
-					});
-
-				this.inputPatternExcludes.onSubmit(() => this.onQueryChanged(true, true));
-				this.inputPatternExcludes.onSubmit(() => this.onQueryChanged(true, true));
-				this.inputPatternExcludes.onCancel(() => this.viewModel.cancelSearch()); // Cancel search without focusing the search widget
-				this.trackInputBox(this.inputPatternExcludes.inputFocusTracker, this.inputPatternExclusionsFocused);
-			});
-		}).getHTMLElement();
-
-		this.messages = builder.div({ 'class': 'messages' }).hide().clone();
+		this.messagesElement = dom.append(containerElement, $('.messages'));
 		if (this.contextService.getWorkbenchState() === WorkbenchState.EMPTY) {
-			this.searchWithoutFolderMessage(this.clearMessage());
+			this.showSearchWithoutFolderMessage();
 		}
 
-		this.createSearchResultsView(builder);
+		this.createSearchResultsView(containerElement);
 
 		this.actions = [
 			this.instantiationService.createInstance(RefreshAction, RefreshAction.ID, RefreshAction.LABEL),
@@ -311,7 +309,7 @@ export class SearchView extends Viewlet implements IViewlet, IPanel {
 			this.toggleQueryDetails(true, true, true);
 		}
 
-		this.toUnbind.push(this.viewModel.searchResult.onChange((event) => this.onSearchResultsChanged(event)));
+		this._register(this.viewModel.searchResult.onChange((event) => this.onSearchResultsChanged(event)));
 
 		return TPromise.as(null);
 	}
@@ -334,61 +332,59 @@ export class SearchView extends Viewlet implements IViewlet, IPanel {
 		}
 	}
 
-	private createSearchWidget(builder: Builder): void {
+	private createSearchWidget(container: HTMLElement): void {
 		let contentPattern = this.viewletSettings['query.contentPattern'] || '';
 		let isRegex = this.viewletSettings['query.regex'] === true;
 		let isWholeWords = this.viewletSettings['query.wholeWords'] === true;
 		let isCaseSensitive = this.viewletSettings['query.caseSensitive'] === true;
 		const history = this.searchHistoryService.load();
-		let searchHistory = history.search || [];
-		let replaceHistory = history.replace || [];
+		let searchHistory = history.search || this.viewletSettings['query.searchHistory'] || [];
+		let replaceHistory = history.replace || this.viewletSettings['query.replaceHistory'] || [];
 
-		this.searchWidget = this.instantiationService.createInstance(SearchWidget, builder, <ISearchWidgetOptions>{
+		this.searchWidget = this._register(this.instantiationService.createInstance(SearchWidget, container, <ISearchWidgetOptions>{
 			value: contentPattern,
 			isRegex: isRegex,
 			isCaseSensitive: isCaseSensitive,
 			isWholeWords: isWholeWords,
 			searchHistory: searchHistory,
 			replaceHistory: replaceHistory
-		});
+		}));
 
 		if (this.storageService.getBoolean(SearchView.SHOW_REPLACE_STORAGE_KEY, StorageScope.WORKSPACE, true)) {
 			this.searchWidget.toggleReplace(true);
 		}
 
-		this.toUnbind.push(this.searchWidget);
+		this._register(this.searchWidget.onSearchSubmit((refresh) => this.onQueryChanged(refresh)));
+		this._register(this.searchWidget.onSearchCancel(() => this.cancelSearch()));
+		this._register(this.searchWidget.searchInput.onDidOptionChange((viaKeyboard) => this.onQueryChanged(true, viaKeyboard)));
 
-		this.toUnbind.push(this.searchWidget.onSearchSubmit((refresh) => this.onQueryChanged(refresh)));
-		this.toUnbind.push(this.searchWidget.onSearchCancel(() => this.cancelSearch()));
-		this.toUnbind.push(this.searchWidget.searchInput.onDidOptionChange((viaKeyboard) => this.onQueryChanged(true, viaKeyboard)));
-
-		this.toUnbind.push(this.searchWidget.onReplaceToggled(() => this.onReplaceToggled()));
-		this.toUnbind.push(this.searchWidget.onReplaceStateChange((state) => {
+		this._register(this.searchWidget.onReplaceToggled(() => this.onReplaceToggled()));
+		this._register(this.searchWidget.onReplaceStateChange((state) => {
 			this.viewModel.replaceActive = state;
 			this.tree.refresh();
 		}));
-		this.toUnbind.push(this.searchWidget.onReplaceValueChanged((value) => {
+		this._register(this.searchWidget.onReplaceValueChanged((value) => {
 			this.viewModel.replaceString = this.searchWidget.getReplaceValue();
 			this.delayedRefresh.trigger(() => this.tree.refresh());
 		}));
 
-		this.toUnbind.push(this.searchWidget.onBlur(() => {
+		this._register(this.searchWidget.onBlur(() => {
 			this.toggleQueryDetailsButton.focus();
 		}));
 
-		this.toUnbind.push(this.searchWidget.onReplaceAll(() => this.replaceAll()));
+		this._register(this.searchWidget.onReplaceAll(() => this.replaceAll()));
 		this.trackInputBox(this.searchWidget.searchInputFocusTracker);
 		this.trackInputBox(this.searchWidget.replaceInputFocusTracker);
 	}
 
 	private trackInputBox(inputFocusTracker: dom.IFocusTracker, contextKey?: IContextKey<boolean>): void {
-		this.toUnbind.push(inputFocusTracker.onDidFocus(() => {
+		this._register(inputFocusTracker.onDidFocus(() => {
 			this.inputBoxFocused.set(true);
 			if (contextKey) {
 				contextKey.set(true);
 			}
 		}));
-		this.toUnbind.push(inputFocusTracker.onDidBlur(() => {
+		this._register(inputFocusTracker.onDidBlur(() => {
 			this.inputBoxFocused.set(this.searchWidget.searchInputHasFocus()
 				|| this.searchWidget.replaceInputHasFocus()
 				|| this.inputPatternIncludes.inputHasFocus()
@@ -406,7 +402,7 @@ export class SearchView extends Viewlet implements IViewlet, IPanel {
 		if (!isReplaceShown) {
 			this.storageService.store(SearchView.SHOW_REPLACE_STORAGE_KEY, false, StorageScope.WORKSPACE);
 		} else {
-			this.storageService.remove(SearchView.SHOW_REPLACE_STORAGE_KEY);
+			this.storageService.remove(SearchView.SHOW_REPLACE_STORAGE_KEY, StorageScope.WORKSPACE);
 		}
 	}
 
@@ -462,8 +458,8 @@ export class SearchView extends Viewlet implements IViewlet, IPanel {
 				this.searchWidget.setReplaceAllActionState(false);
 				this.viewModel.searchResult.replaceAll(progressRunner).then(() => {
 					progressRunner.done();
-					this.clearMessage()
-						.p({ text: afterReplaceAllMessage });
+					const messageEl = this.clearMessage();
+					dom.append(messageEl, $('p', undefined, afterReplaceAllMessage));
 				}, (error) => {
 					progressRunner.done();
 					errors.isPromiseCanceledError(error);
@@ -537,85 +533,73 @@ export class SearchView extends Viewlet implements IViewlet, IPanel {
 		return nls.localize('replaceAll.occurrences.files.confirmation.message', "Replace {0} occurrences across {1} files?", occurrences, fileCount);
 	}
 
-	private clearMessage(): Builder {
-		this.searchWithoutFolderMessageBuilder = void 0;
+	private clearMessage(): HTMLElement {
+		this.searchWithoutFolderMessageElement = void 0;
 
-		return this.messages.empty().show()
-			.asContainer().div({ 'class': 'message' })
-			.asContainer();
+		dom.clearNode(this.messagesElement);
+		dom.show(this.messagesElement);
+		dispose(this.messageDisposables);
+		this.messageDisposables = [];
+
+		return dom.append(this.messagesElement, $('.message'));
 	}
 
-	private createSearchResultsView(builder: Builder): void {
-		builder.div({ 'class': 'results' }, (div) => {
-			this.results = div;
-			this.results.addClass('show-file-icons');
+	private createSearchResultsView(container: HTMLElement): void {
+		this.resultsElement = dom.append(container, $('.results.show-file-icons'));
+		const dataSource = this._register(this.instantiationService.createInstance(SearchDataSource));
+		const renderer = this._register(this.instantiationService.createInstance(SearchRenderer, this.getActionRunner(), this));
+		const dnd = this.instantiationService.createInstance(SimpleFileResourceDragAndDrop, (obj: any) => obj instanceof FileMatch ? obj.resource() : void 0);
 
-			let dataSource = this.instantiationService.createInstance(SearchDataSource);
-			this.toUnbind.push(dataSource);
+		this.tree = this._register(this.instantiationService.createInstance(WorkbenchTree, this.resultsElement, {
+			dataSource: dataSource,
+			renderer: renderer,
+			sorter: new SearchSorter(),
+			filter: new SearchFilter(),
+			controller: this.instantiationService.createInstance(SearchTreeController),
+			accessibilityProvider: this.instantiationService.createInstance(SearchAccessibilityProvider),
+			dnd
+		}, {
+				ariaLabel: nls.localize('treeAriaLabel', "Search Results"),
+				showLoading: false
+			}));
 
-			let renderer = this.instantiationService.createInstance(SearchRenderer, this.getActionRunner(), this);
-			this.toUnbind.push(renderer);
+		this.tree.setInput(this.viewModel.searchResult);
 
-			let dnd = this.instantiationService.createInstance(SimpleFileResourceDragAndDrop, (obj: any) => obj instanceof FileMatch ? obj.resource() : void 0);
-
-			this.tree = this.instantiationService.createInstance(WorkbenchTree, div.getHTMLElement(), {
-				dataSource: dataSource,
-				renderer: renderer,
-				sorter: new SearchSorter(),
-				filter: new SearchFilter(),
-				controller: this.instantiationService.createInstance(SearchTreeController),
-				accessibilityProvider: this.instantiationService.createInstance(SearchAccessibilityProvider),
-				dnd
-			}, {
-					ariaLabel: nls.localize('treeAriaLabel', "Search Results"),
-					showLoading: false
-				});
-
-			this.tree.setInput(this.viewModel.searchResult);
-			this.toUnbind.push(renderer);
-
-			const searchResultsNavigator = this._register(new TreeResourceNavigator(this.tree, { openOnFocus: true }));
-			this._register(debounceEvent(searchResultsNavigator.openResource, (last, event) => event, 75, true)(options => {
-				if (options.element instanceof Match) {
-					let selectedMatch: Match = options.element;
-					if (this.currentSelectedFileMatch) {
-						this.currentSelectedFileMatch.setSelectedMatch(null);
-					}
-					this.currentSelectedFileMatch = selectedMatch.parent();
-					this.currentSelectedFileMatch.setSelectedMatch(selectedMatch);
-					if (!(options.payload && options.payload.preventEditorOpen)) {
-						this.onFocus(selectedMatch, options.editorOptions.preserveFocus, options.sideBySide, options.editorOptions.pinned);
-					}
+		const searchResultsNavigator = this._register(new TreeResourceNavigator(this.tree, { openOnFocus: true }));
+		this._register(debounceEvent(searchResultsNavigator.openResource, (last, event) => event, 75, true)(options => {
+			if (options.element instanceof Match) {
+				let selectedMatch: Match = options.element;
+				if (this.currentSelectedFileMatch) {
+					this.currentSelectedFileMatch.setSelectedMatch(null);
 				}
-			}));
-
-			let treeHasFocus = false;
-			this.tree.onDidFocus(() => {
-				treeHasFocus = true;
-			});
-
-			this.toUnbind.push(this.tree.onDidChangeFocus((e: IFocusEvent) => {
-				if (treeHasFocus) {
-					const focus = e.focus;
-					this.firstMatchFocused.set(this.tree.getNavigator().first() === focus);
-					this.fileMatchOrMatchFocused.set(!!focus);
-					this.fileMatchFocused.set(focus instanceof FileMatch);
-					this.folderMatchFocused.set(focus instanceof FolderMatch);
-					this.matchFocused.set(focus instanceof Match);
-					this.fileMatchOrFolderMatchFocus.set(focus instanceof FileMatch || focus instanceof FolderMatch);
+				this.currentSelectedFileMatch = selectedMatch.parent();
+				this.currentSelectedFileMatch.setSelectedMatch(selectedMatch);
+				if (!(options.payload && options.payload.preventEditorOpen)) {
+					this.onFocus(selectedMatch, options.editorOptions.preserveFocus, options.sideBySide, options.editorOptions.pinned);
 				}
-			}));
+			}
+		}));
 
-			this.toUnbind.push(this.tree.onDidBlur(e => {
-				treeHasFocus = false;
-				this.firstMatchFocused.reset();
-				this.fileMatchOrMatchFocused.reset();
-				this.fileMatchFocused.reset();
-				this.folderMatchFocused.reset();
-				this.matchFocused.reset();
-				this.fileMatchOrFolderMatchFocus.reset();
-			}));
-		});
+		this._register(anyEvent<any>(this.tree.onDidFocus, this.tree.onDidChangeFocus)(() => {
+			if (this.tree.isDOMFocused()) {
+				const focus = this.tree.getFocus();
+				this.firstMatchFocused.set(this.tree.getNavigator().first() === focus);
+				this.fileMatchOrMatchFocused.set(!!focus);
+				this.fileMatchFocused.set(focus instanceof FileMatch);
+				this.folderMatchFocused.set(focus instanceof FolderMatch);
+				this.matchFocused.set(focus instanceof Match);
+				this.fileMatchOrFolderMatchFocus.set(focus instanceof FileMatch || focus instanceof FolderMatch);
+			}
+		}));
+
+		this._register(this.tree.onDidBlur(e => {
+			this.firstMatchFocused.reset();
+			this.fileMatchOrMatchFocused.reset();
+			this.fileMatchFocused.reset();
+			this.folderMatchFocused.reset();
+			this.matchFocused.reset();
+			this.fileMatchOrFolderMatchFocus.reset();
+		}));
 	}
 
 	public selectCurrentMatch(): void {
@@ -739,13 +723,22 @@ export class SearchView extends Viewlet implements IViewlet, IPanel {
 		return promise;
 	}
 
+	public moveFocusToResults(): void {
+		this.tree.domFocus();
+	}
+
 	public focus(): void {
 		super.focus();
 
+		const updatedText = this.updateTextFromSelection();
+		this.searchWidget.focus(undefined, undefined, updatedText);
+	}
+
+	public updateTextFromSelection(allowUnselectedWord = true): boolean {
 		let updatedText = false;
 		const seedSearchStringFromSelection = this.configurationService.getValue<IEditorOptions>('editor').find.seedSearchStringFromSelection;
 		if (seedSearchStringFromSelection) {
-			let selectedText = this.getSearchTextFromEditor();
+			let selectedText = this.getSearchTextFromEditor(allowUnselectedWord);
 			if (selectedText) {
 				if (this.searchWidget.searchInput.getRegex()) {
 					selectedText = strings.escapeRegExpCharacters(selectedText);
@@ -756,7 +749,7 @@ export class SearchView extends Viewlet implements IViewlet, IPanel {
 			}
 		}
 
-		this.searchWidget.focus(undefined, undefined, updatedText);
+		return updatedText;
 	}
 
 	public focusNextInputBox(): void {
@@ -835,8 +828,10 @@ export class SearchView extends Viewlet implements IViewlet, IPanel {
 		}
 
 		if (this.size.width >= SearchView.WIDE_VIEW_SIZE) {
+			this.isWide = true;
 			dom.addClass(this.getContainer(), SearchView.WIDE_CLASS_NAME);
 		} else {
+			this.isWide = false;
 			dom.removeClass(this.getContainer(), SearchView.WIDE_CLASS_NAME);
 		}
 
@@ -845,12 +840,15 @@ export class SearchView extends Viewlet implements IViewlet, IPanel {
 		this.inputPatternExcludes.setWidth(this.size.width - 28 /* container margin */);
 		this.inputPatternIncludes.setWidth(this.size.width - 28 /* container margin */);
 
-		const messagesSize = this.messages.isHidden() ? 0 : dom.getTotalHeight(this.messages.getHTMLElement());
+		const messagesSize = this.messagesElement.style.display === 'none' ?
+			0 :
+			dom.getTotalHeight(this.messagesElement);
+
 		const searchResultContainerSize = this.size.height -
 			messagesSize -
-			dom.getTotalHeight(this.searchWidgetsContainer.getContainer());
+			dom.getTotalHeight(this.searchWidgetsContainerElement);
 
-		this.results.style({ height: searchResultContainerSize + 'px' });
+		this.resultsElement.style.height = searchResultContainerSize + 'px';
 
 		this.tree.layout(searchResultContainerSize);
 	}
@@ -880,7 +878,7 @@ export class SearchView extends Viewlet implements IViewlet, IPanel {
 		this.viewModel.searchResult.clear();
 		this.showEmptyStage();
 		if (this.contextService.getWorkbenchState() === WorkbenchState.EMPTY) {
-			this.searchWithoutFolderMessage(this.clearMessage());
+			this.showSearchWithoutFolderMessage();
 		}
 		this.searchWidget.clear();
 		this.viewModel.cancelSearch();
@@ -904,7 +902,7 @@ export class SearchView extends Viewlet implements IViewlet, IPanel {
 		}
 	}
 
-	private getSearchTextFromEditor(): string {
+	private getSearchTextFromEditor(allowUnselectedWord: boolean): string {
 		if (!this.editorService.activeEditor) {
 			return null;
 		}
@@ -927,7 +925,7 @@ export class SearchView extends Viewlet implements IViewlet, IPanel {
 			return null;
 		}
 
-		if (range.isEmpty() && !this.searchWidget.searchInput.getValue()) {
+		if (range.isEmpty() && !this.searchWidget.searchInput.getValue() && allowUnselectedWord) {
 			const wordAtPosition = activeTextEditorWidget.getModel().getWordAtPosition(range.getStartPosition());
 			if (wordAtPosition) {
 				return wordAtPosition.word;
@@ -969,6 +967,7 @@ export class SearchView extends Viewlet implements IViewlet, IPanel {
 		skipLayout = Boolean(skipLayout);
 
 		if (show) {
+			this.toggleQueryDetailsButton.setAttribute('aria-expanded', 'true');
 			dom.addClass(this.queryDetails, cls);
 			if (moveFocus) {
 				if (reverse) {
@@ -980,6 +979,7 @@ export class SearchView extends Viewlet implements IViewlet, IPanel {
 				}
 			}
 		} else {
+			this.toggleQueryDetailsButton.setAttribute('aria-expanded', 'false');
 			dom.removeClass(this.queryDetails, cls);
 			if (moveFocus) {
 				this.searchWidget.focus();
@@ -1076,7 +1076,6 @@ export class SearchView extends Viewlet implements IViewlet, IPanel {
 			isRegExp: isRegex,
 			isCaseSensitive: isCaseSensitive,
 			isWordMatch: isWholeWords,
-			wordSeparators: this.configurationService.getValue<ISearchConfiguration>().editor.wordSeparators,
 			isSmartCase: this.configurationService.getValue<ISearchConfiguration>().search.smartCase
 		};
 
@@ -1089,7 +1088,12 @@ export class SearchView extends Viewlet implements IViewlet, IPanel {
 			disregardIgnoreFiles: !useExcludesAndIgnoreFiles,
 			disregardExcludeSettings: !useExcludesAndIgnoreFiles,
 			excludePattern,
-			includePattern
+			includePattern,
+			previewOptions: {
+				leadingChars: 20,
+				maxLines: 1,
+				totalChars: this.isWide ? 250 : 75
+			}
 		};
 		const folderResources = this.contextService.getWorkspace().folders;
 
@@ -1182,7 +1186,7 @@ export class SearchView extends Viewlet implements IViewlet, IPanel {
 				}
 
 				return null;
-			}).done(null, errors.onUnexpectedError);
+			});
 
 			this.viewModel.replaceString = this.searchWidget.getReplaceValue();
 
@@ -1219,67 +1223,52 @@ export class SearchView extends Viewlet implements IViewlet, IPanel {
 				aria.status(message);
 
 				this.tree.onHidden();
-				this.results.hide();
-				const div = this.clearMessage();
-				const p = $(div).p({ text: message });
+				dom.hide(this.resultsElement);
+
+				const messageEl = this.clearMessage();
+				const p = dom.append(messageEl, $('p', undefined, message));
 
 				if (!completed) {
-					$(p).a({
-						'class': ['pointer', 'prominent'],
-						text: nls.localize('rerunSearch.message', "Search again")
-					}).on(dom.EventType.CLICK, (e: MouseEvent) => {
+					const searchAgainLink = dom.append(p, $('a.pointer.prominent', undefined, nls.localize('rerunSearch.message', "Search again")));
+					this.messageDisposables.push(dom.addDisposableListener(searchAgainLink, dom.EventType.CLICK, (e: MouseEvent) => {
 						dom.EventHelper.stop(e, false);
-
 						this.onQueryChanged(true);
-					});
+					}));
 				} else if (hasIncludes || hasExcludes) {
-					$(p).a({
-						'class': ['pointer', 'prominent'],
-						'tabindex': '0',
-						text: nls.localize('rerunSearchInAll.message', "Search again in all files")
-					}).on(dom.EventType.CLICK, (e: MouseEvent) => {
+					const searchAgainLink = dom.append(p, $('a.pointer.prominent', { tabindex: 0 }, nls.localize('rerunSearchInAll.message', "Search again in all files")));
+					this.messageDisposables.push(dom.addDisposableListener(searchAgainLink, dom.EventType.CLICK, (e: MouseEvent) => {
 						dom.EventHelper.stop(e, false);
 
 						this.inputPatternExcludes.setValue('');
 						this.inputPatternIncludes.setValue('');
 
 						this.onQueryChanged(true);
-					});
+					}));
 				} else {
-					$(p).a({
-						'class': ['pointer', 'prominent'],
-						'tabindex': '0',
-						text: nls.localize('openSettings.message', "Open Settings")
-					}).on(dom.EventType.CLICK, (e: MouseEvent) => {
+					const openSettingsLink = dom.append(p, $('a.pointer.prominent', { tabindex: 0 }, nls.localize('openSettings.message', "Open Settings")));
+					this.messageDisposables.push(dom.addDisposableListener(openSettingsLink, dom.EventType.CLICK, (e: MouseEvent) => {
 						dom.EventHelper.stop(e, false);
 
-						let editorPromise = this.contextService.getWorkbenchState() !== WorkbenchState.EMPTY ? this.preferencesService.openWorkspaceSettings() : this.preferencesService.openGlobalSettings();
-						editorPromise.done(editor => {
-							if (editor instanceof PreferencesEditor) {
-								editor.focusSearch('.exclude');
-							}
-						}, errors.onUnexpectedError);
-					});
+						const options: ISettingsEditorOptions = { query: '.exclude' };
+						this.contextService.getWorkbenchState() !== WorkbenchState.EMPTY ?
+							this.preferencesService.openWorkspaceSettings(undefined, options) :
+							this.preferencesService.openGlobalSettings(undefined, options);
+					}));
 				}
 
 				if (completed) {
-					$(p).span({
-						text: ' - '
-					});
+					dom.append(p, $('span', undefined, ' - '));
 
-					$(p).a({
-						'class': ['pointer', 'prominent'],
-						'tabindex': '0',
-						text: nls.localize('openSettings.learnMore', "Learn More")
-					}).on(dom.EventType.CLICK, (e: MouseEvent) => {
+					const learnMoreLink = dom.append(p, $('a.pointer.prominent', { tabindex: 0 }, nls.localize('openSettings.learnMore', "Learn More")));
+					this.messageDisposables.push(dom.addDisposableListener(learnMoreLink, dom.EventType.CLICK, (e: MouseEvent) => {
 						dom.EventHelper.stop(e, false);
 
 						window.open('https://go.microsoft.com/fwlink/?linkid=853977');
-					});
+					}));
 				}
 
 				if (this.contextService.getWorkbenchState() === WorkbenchState.EMPTY) {
-					this.searchWithoutFolderMessage(div);
+					this.showSearchWithoutFolderMessage();
 				}
 			} else {
 				this.viewModel.searchResult.toggleHighlights(true); // show highlights
@@ -1349,7 +1338,7 @@ export class SearchView extends Viewlet implements IViewlet, IPanel {
 			const fileCount = this.viewModel.searchResult.fileCount();
 			if (visibleMatches !== fileCount) {
 				visibleMatches = fileCount;
-				this.tree.refresh().done(null, errors.onUnexpectedError);
+				this.tree.refresh();
 
 				this.updateSearchResultCount();
 			}
@@ -1360,22 +1349,22 @@ export class SearchView extends Viewlet implements IViewlet, IPanel {
 
 		this.searchWidget.setReplaceAllActionState(false);
 
-		this.viewModel.search(query).done(onComplete, onError, onProgress);
+		this.viewModel.search(query, onProgress).then(onComplete, onError);
 	}
 
 	private updateSearchResultCount(): void {
 		const fileCount = this.viewModel.searchResult.fileCount();
 		this.hasSearchResultsKey.set(fileCount > 0);
 
-		const msgWasHidden = this.messages.isHidden();
+		const msgWasHidden = this.messagesElement.style.display === 'none';
 		if (fileCount > 0) {
-			const div = this.clearMessage();
-			$(div).p({ text: this.buildResultCountMessage(this.viewModel.searchResult.count(), fileCount) });
+			const messageEl = this.clearMessage();
+			dom.append(messageEl, $('p', undefined, this.buildResultCountMessage(this.viewModel.searchResult.count(), fileCount)));
 			if (msgWasHidden) {
 				this.reLayout();
 			}
 		} else if (!msgWasHidden) {
-			this.messages.hide();
+			dom.hide(this.messagesElement);
 		}
 	}
 
@@ -1391,26 +1380,27 @@ export class SearchView extends Viewlet implements IViewlet, IPanel {
 		}
 	}
 
-	private searchWithoutFolderMessage(div: Builder): void {
-		this.searchWithoutFolderMessageBuilder = $(div);
+	private showSearchWithoutFolderMessage(): void {
+		this.searchWithoutFolderMessageElement = this.clearMessage();
 
-		this.searchWithoutFolderMessageBuilder.p({ text: nls.localize('searchWithoutFolder', "You have not yet opened a folder. Only open files are currently searched - ") })
-			.asContainer().a({
-				'class': ['pointer', 'prominent'],
-				'tabindex': '0',
-				text: nls.localize('openFolder', "Open Folder")
-			}).on(dom.EventType.CLICK, (e: MouseEvent) => {
-				dom.EventHelper.stop(e, false);
+		const textEl = dom.append(this.searchWithoutFolderMessageElement,
+			$('p', undefined, nls.localize('searchWithoutFolder', "You have not yet opened a folder. Only open files are currently searched - ")));
 
-				const actionClass = env.isMacintosh ? OpenFileFolderAction : OpenFolderAction;
-				const action = this.instantiationService.createInstance<string, string, IAction>(actionClass, actionClass.ID, actionClass.LABEL);
-				this.actionRunner.run(action).done(() => {
-					action.dispose();
-				}, err => {
-					action.dispose();
-					errors.onUnexpectedError(err);
-				});
+		const openFolderLink = dom.append(textEl,
+			$('a.pointer.prominent', { tabindex: 0 }, nls.localize('openFolder', "Open Folder")));
+
+		this.messageDisposables.push(dom.addDisposableListener(openFolderLink, dom.EventType.CLICK, (e: MouseEvent) => {
+			dom.EventHelper.stop(e, false);
+
+			const actionClass = env.isMacintosh ? OpenFileFolderAction : OpenFolderAction;
+			const action = this.instantiationService.createInstance<string, string, IAction>(actionClass, actionClass.ID, actionClass.LABEL);
+			this.actionRunner.run(action).then(() => {
+				action.dispose();
+			}, err => {
+				action.dispose();
+				errors.onUnexpectedError(err);
 			});
+		}));
 	}
 
 	private showEmptyStage(): void {
@@ -1421,8 +1411,8 @@ export class SearchView extends Viewlet implements IViewlet, IPanel {
 
 		// clean up ui
 		// this.replaceService.disposeAllReplacePreviews();
-		this.messages.hide();
-		this.results.show();
+		dom.hide(this.messagesElement);
+		dom.show(this.resultsElement);
 		this.tree.onVisible();
 		this.currentSelectedFileMatch = null;
 	}
@@ -1548,11 +1538,21 @@ export class SearchView extends Viewlet implements IViewlet, IPanel {
 		this.viewletSettings['query.folderIncludes'] = patternIncludes;
 		this.viewletSettings['query.useExcludesAndIgnoreFiles'] = useExcludesAndIgnoreFiles;
 
+		// Deprecated, remove these memento props a couple releases after 1.25
+		const searchHistory = this.searchWidget.getSearchHistory();
+		const replaceHistory = this.searchWidget.getReplaceHistory();
+		const patternExcludesHistory = this.inputPatternExcludes.getHistory();
+		const patternIncludesHistory = this.inputPatternIncludes.getHistory();
+		this.viewletSettings['query.searchHistory'] = searchHistory;
+		this.viewletSettings['query.replaceHistory'] = replaceHistory;
+		this.viewletSettings['query.folderExclusionsHistory'] = patternExcludesHistory;
+		this.viewletSettings['query.folderIncludesHistory'] = patternIncludesHistory;
+
 		this.searchHistoryService.save({
-			search: this.searchWidget.getSearchHistory(),
-			replace: this.searchWidget.getReplaceHistory(),
-			exclude: this.inputPatternExcludes.getHistory(),
-			include: this.inputPatternIncludes.getHistory()
+			search: searchHistory,
+			replace: replaceHistory,
+			exclude: patternExcludesHistory,
+			include: patternIncludesHistory
 		});
 
 		super.shutdown();
@@ -1561,16 +1561,6 @@ export class SearchView extends Viewlet implements IViewlet, IPanel {
 	public dispose(): void {
 		this.isDisposed = true;
 
-		if (this.tree) {
-			this.tree.dispose();
-		}
-
-		this.searchWidget.dispose();
-		this.inputPatternIncludes.dispose();
-		this.inputPatternExcludes.dispose();
-
-		this.viewModel.dispose();
-
 		super.dispose();
 	}
 }
diff --git a/src/vs/workbench/parts/search/browser/searchWidget.ts b/src/vs/workbench/parts/search/browser/searchWidget.ts
index f9fe8deed65..fbcafe78b72 100644
--- a/src/vs/workbench/parts/search/browser/searchWidget.ts
+++ b/src/vs/workbench/parts/search/browser/searchWidget.ts
@@ -14,13 +14,12 @@ import { FindInput, IFindInputOptions } from 'vs/base/browser/ui/findinput/findI
 import { IMessage, HistoryInputBox } from 'vs/base/browser/ui/inputbox/inputBox';
 import { Button, IButtonOptions } from 'vs/base/browser/ui/button/button';
 import { IKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-import { KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRegistry';
+import { KeybindingsRegistry, KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { ContextKeyExpr, IContextKeyService, IContextKey } from 'vs/platform/contextkey/common/contextkey';
 import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
 import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
 import { Event, Emitter } from 'vs/base/common/event';
-import { Builder } from 'vs/base/browser/builder';
 import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet';
 import { isSearchViewFocused, appendKeyBindingLabel } from 'vs/workbench/parts/search/browser/searchActions';
 import * as Constants from 'vs/workbench/parts/search/common/constants';
@@ -31,7 +30,8 @@ import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IPanelService } from 'vs/workbench/services/panel/common/panelService';
 import { ISearchConfigurationProperties } from 'vs/platform/search/common/search';
-import { ContextScopedFindInput, ContextScopedHistoryInputBox } from 'vs/platform/widget/browser/input';
+import { ContextScopedFindInput, ContextScopedHistoryInputBox } from 'vs/platform/widget/browser/contextScopedHistoryWidget';
+import { Delayer } from 'vs/base/common/async';
 
 export interface ISearchWidgetOptions {
 	value?: string;
@@ -94,6 +94,7 @@ export class SearchWidget extends Widget {
 	private replaceActionBar: ActionBar;
 	public replaceInputFocusTracker: dom.IFocusTracker;
 	private replaceInputBoxFocused: IContextKey<boolean>;
+	private _replaceHistoryDelayer: Delayer<void>;
 
 	private ignoreGlobalFindBufferOnNextFocus = false;
 	private previousGlobalFindBufferValue: string;
@@ -120,7 +121,7 @@ export class SearchWidget extends Widget {
 	public readonly onBlur: Event<void> = this._onBlur.event;
 
 	constructor(
-		container: Builder,
+		container: HTMLElement,
 		options: ISearchWidgetOptions,
 		@IContextViewService private contextViewService: IContextViewService,
 		@IThemeService private themeService: IThemeService,
@@ -133,6 +134,7 @@ export class SearchWidget extends Widget {
 		this.replaceActive = Constants.ReplaceActiveKey.bindTo(this.contextKeyService);
 		this.searchInputBoxFocused = Constants.SearchInputBoxFocusedKey.bindTo(this.contextKeyService);
 		this.replaceInputBoxFocused = Constants.ReplaceInputBoxFocusedKey.bindTo(this.contextKeyService);
+		this._replaceHistoryDelayer = new Delayer<void>(500);
 		this.render(container, options);
 	}
 
@@ -225,8 +227,10 @@ export class SearchWidget extends Widget {
 		this.searchInput.focusOnRegex();
 	}
 
-	private render(container: Builder, options: ISearchWidgetOptions): void {
-		this.domNode = container.div({ 'class': 'search-widget' }).style({ position: 'relative' }).getHTMLElement();
+	private render(container: HTMLElement, options: ISearchWidgetOptions): void {
+		this.domNode = dom.append(container, dom.$('.search-widget'));
+		this.domNode.style.position = 'relative';
+
 		this.renderToggleReplaceButton(this.domNode);
 
 		this.renderSearchInput(this.domNode, options);
@@ -241,7 +245,9 @@ export class SearchWidget extends Widget {
 			buttonHoverBackground: null
 		};
 		this.toggleReplaceButton = this._register(new Button(parent, opts));
-		this.toggleReplaceButton.icon = 'toggle-replace-button collapse';
+		this.toggleReplaceButton.element.setAttribute('aria-expanded', 'false');
+		this.toggleReplaceButton.element.classList.add('collapse');
+		this.toggleReplaceButton.icon = 'toggle-replace-button';
 		// TODO@joh need to dispose this listener eventually
 		this.toggleReplaceButton.onDidClick(() => this.onToggleReplaceButton());
 		this.toggleReplaceButton.element.title = nls.localize('search.replace.toggle.button.title', "Toggle Replace");
@@ -267,13 +273,13 @@ export class SearchWidget extends Widget {
 		this.searchInput.setCaseSensitive(!!options.isCaseSensitive);
 		this.searchInput.setWholeWords(!!options.isWholeWords);
 		this._register(this.onSearchSubmit(() => {
-			this.searchInput.inputBox.addToHistory(this.searchInput.getValue());
+			this.searchInput.inputBox.addToHistory();
 		}));
 		this.searchInput.onCaseSensitiveKeyDown((keyboardEvent: IKeyboardEvent) => this.onCaseSensitiveKeyDown(keyboardEvent));
 		this.searchInput.onRegexKeyDown((keyboardEvent: IKeyboardEvent) => this.onRegexKeyDown(keyboardEvent));
 
 		this._register(this.onReplaceValueChanged(() => {
-			this.replaceInput.addToHistory(this.replaceInput.value);
+			this._replaceHistoryDelayer.trigger(() => this.replaceInput.addToHistory());
 		}));
 
 		this.searchInputFocusTracker = this._register(dom.trackFocus(this.searchInput.inputBox.inputElement));
@@ -284,7 +290,7 @@ export class SearchWidget extends Widget {
 			if (!this.ignoreGlobalFindBufferOnNextFocus && useGlobalFindBuffer) {
 				const globalBufferText = this.clipboardServce.readFindText();
 				if (this.previousGlobalFindBufferValue !== globalBufferText) {
-					this.searchInput.inputBox.addToHistory(this.searchInput.getValue());
+					this.searchInput.inputBox.addToHistory();
 					this.searchInput.setValue(globalBufferText);
 					this.searchInput.select();
 				}
@@ -315,6 +321,7 @@ export class SearchWidget extends Widget {
 		this.replaceAllAction.label = SearchWidget.REPLACE_ALL_DISABLED_LABEL;
 		this.replaceActionBar = this._register(new ActionBar(this.replaceContainer));
 		this.replaceActionBar.push([this.replaceAllAction], { icon: true, label: false });
+		this.onkeydown(this.replaceActionBar.domNode, (keyboardEvent) => this.onReplaceActionbarKeyDown(keyboardEvent));
 
 		this.replaceInputFocusTracker = this._register(dom.trackFocus(this.replaceInput.inputElement));
 		this._register(this.replaceInputFocusTracker.onDidFocus(() => this.replaceInputBoxFocused.set(true)));
@@ -330,6 +337,7 @@ export class SearchWidget extends Widget {
 		dom.toggleClass(this.replaceContainer, 'disabled');
 		dom.toggleClass(this.toggleReplaceButton.element, 'collapse');
 		dom.toggleClass(this.toggleReplaceButton.element, 'expand');
+		this.toggleReplaceButton.element.setAttribute('aria-expanded', this.isReplaceShown() ? 'true' : 'false');
 		this.updateReplaceActiveState();
 		this._onReplaceToggled.fire();
 	}
@@ -376,6 +384,7 @@ export class SearchWidget extends Widget {
 	}
 
 	private onSearchInputChanged(): void {
+		this.searchInput.clearMessage();
 		this.setReplaceAllActionState(false);
 	}
 
@@ -437,6 +446,13 @@ export class SearchWidget extends Widget {
 		}
 	}
 
+	private onReplaceActionbarKeyDown(keyboardEvent: IKeyboardEvent) {
+		if (keyboardEvent.equals(KeyMod.Shift | KeyCode.Tab)) {
+			this.focusRegexAction();
+			keyboardEvent.preventDefault();
+		}
+	}
+
 	private submitSearch(refresh: boolean = true): void {
 		const value = this.searchInput.getValue();
 		const useGlobalFindBuffer = this.configurationService.getValue<ISearchConfigurationProperties>('search').globalFindClipboard;
@@ -460,7 +476,7 @@ export class SearchWidget extends Widget {
 export function registerContributions() {
 	KeybindingsRegistry.registerCommandAndKeybindingRule({
 		id: ReplaceAllAction.ID,
-		weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
+		weight: KeybindingWeight.WorkbenchContrib,
 		when: ContextKeyExpr.and(Constants.SearchViewVisibleKey, Constants.ReplaceActiveKey, CONTEXT_FIND_WIDGET_NOT_VISIBLE),
 		primary: KeyMod.Alt | KeyMod.CtrlCmd | KeyCode.Enter,
 		handler: accessor => {
diff --git a/src/vs/workbench/parts/search/common/constants.ts b/src/vs/workbench/parts/search/common/constants.ts
index 39abb302748..1f15c344c0e 100644
--- a/src/vs/workbench/parts/search/common/constants.ts
+++ b/src/vs/workbench/parts/search/common/constants.ts
@@ -16,6 +16,7 @@ export const CopyPathCommandId = 'search.action.copyPath';
 export const CopyMatchCommandId = 'search.action.copyMatch';
 export const CopyAllCommandId = 'search.action.copyAll';
 export const ClearSearchHistoryCommandId = 'search.action.clearHistory';
+export const FocusSearchListCommandID = 'search.action.focusSearchList';
 export const ReplaceActionId = 'search.action.replace';
 export const ReplaceAllInFileActionId = 'search.action.replaceAllInFile';
 export const ReplaceAllInFolderActionId = 'search.action.replaceAllInFolder';
diff --git a/src/vs/workbench/parts/search/common/queryBuilder.ts b/src/vs/workbench/parts/search/common/queryBuilder.ts
index 52392ff3903..861ad5bcd12 100644
--- a/src/vs/workbench/parts/search/common/queryBuilder.ts
+++ b/src/vs/workbench/parts/search/common/queryBuilder.ts
@@ -11,7 +11,8 @@ import * as collections from 'vs/base/common/collections';
 import * as strings from 'vs/base/common/strings';
 import * as glob from 'vs/base/common/glob';
 import * as paths from 'vs/base/common/paths';
-import uri from 'vs/base/common/uri';
+import * as resources from 'vs/base/common/resources';
+import { URI as uri } from 'vs/base/common/uri';
 import { untildify } from 'vs/base/common/labels';
 import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
 import { IPatternInfo, IQueryOptions, IFolderQuery, ISearchQuery, QueryType, ISearchConfiguration, getExcludes, pathIncludedInQuery } from 'vs/platform/search/common/search';
@@ -73,24 +74,30 @@ export class QueryBuilder {
 
 		if (contentPattern) {
 			this.resolveSmartCaseToCaseSensitive(contentPattern);
+
+			contentPattern.wordSeparators = this.configurationService.getValue<ISearchConfiguration>().editor.wordSeparators;
 		}
 
-		const query = <ISearchQuery>{
+		const query: ISearchQuery = {
 			type,
 			folderQueries,
 			usingSearchPaths: !!(searchPaths && searchPaths.length),
 			extraFileResources: options.extraFileResources,
-			filePattern: options.filePattern,
+			filePattern: options.filePattern
+				? options.filePattern.trim()
+				: options.filePattern,
 			excludePattern,
 			includePattern,
 			maxResults: options.maxResults,
 			sortByScore: options.sortByScore,
 			cacheKey: options.cacheKey,
-			contentPattern: contentPattern,
+			contentPattern,
 			useRipgrep,
 			disregardIgnoreFiles: options.disregardIgnoreFiles || !useIgnoreFiles,
 			disregardExcludeSettings: options.disregardExcludeSettings,
-			ignoreSymlinks
+			ignoreSymlinks,
+			previewOptions: options.previewOptions,
+			exists: options.exists
 		};
 
 		// Filter extraFileResources against global include/exclude patterns - they are already expected to not belong to a workspace
@@ -270,18 +277,18 @@ export class QueryBuilder {
 
 		if (this.workspaceContextService.getWorkbenchState() === WorkbenchState.FOLDER) { // TODO: @Sandy Try checking workspace folders length instead.
 			const workspaceUri = this.workspaceContextService.getWorkspace().folders[0].uri;
-			return [workspaceUri.with({ path: paths.normalize(paths.join(workspaceUri.path, searchPath)) })];
+			return [resources.joinPath(workspaceUri, searchPath)];
 		} else if (searchPath === './') {
 			return []; // ./ or ./**/foo makes sense for single-folder but not multi-folder workspaces
 		} else {
 			const relativeSearchPathMatch = searchPath.match(/\.[\/\\]([^\/\\]+)([\/\\].+)?/);
 			if (relativeSearchPathMatch) {
 				const searchPathRoot = relativeSearchPathMatch[1];
-				const matchingRoots = this.workspaceContextService.getWorkspace().folders.filter(folder => paths.basename(folder.uri.fsPath) === searchPathRoot || folder.name === searchPathRoot);
+				const matchingRoots = this.workspaceContextService.getWorkspace().folders.filter(folder => resources.basename(folder.uri) === searchPathRoot || folder.name === searchPathRoot);
 				if (matchingRoots.length) {
 					return matchingRoots.map(root => {
 						return relativeSearchPathMatch[2] ?
-							root.uri.with({ path: paths.normalize(paths.join(root.uri.path, relativeSearchPathMatch[2])) }) :
+							resources.joinPath(root.uri, relativeSearchPathMatch[2]) :
 							root.uri;
 					});
 				} else {
diff --git a/src/vs/workbench/parts/search/common/search.ts b/src/vs/workbench/parts/search/common/search.ts
index c7eb5fd5b87..2a6b2d6142e 100644
--- a/src/vs/workbench/parts/search/common/search.ts
+++ b/src/vs/workbench/parts/search/common/search.ts
@@ -9,15 +9,23 @@ import { TPromise } from 'vs/base/common/winjs.base';
 import { onUnexpectedError } from 'vs/base/common/errors';
 import { IDisposable } from 'vs/base/common/lifecycle';
 import { ISearchConfiguration, ISearchConfigurationProperties } from 'vs/platform/search/common/search';
-import { SymbolInformation } from 'vs/editor/common/modes';
+import { SymbolKind, Location, ProviderResult } from 'vs/editor/common/modes';
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { toResource } from 'vs/workbench/common/editor';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
+import { CancellationToken } from 'vs/base/common/cancellation';
+
+export interface IWorkspaceSymbol {
+	name: string;
+	containerName?: string;
+	kind: SymbolKind;
+	location: Location;
+}
 
 export interface IWorkspaceSymbolProvider {
-	provideWorkspaceSymbols(search: string): TPromise<SymbolInformation[]>;
-	resolveWorkspaceSymbol?: (item: SymbolInformation) => TPromise<SymbolInformation>;
+	provideWorkspaceSymbols(search: string, token: CancellationToken): ProviderResult<IWorkspaceSymbol[]>;
+	resolveWorkspaceSymbol?(item: IWorkspaceSymbol, token: CancellationToken): ProviderResult<IWorkspaceSymbol>;
 }
 
 export namespace WorkspaceSymbolProviderRegistry {
@@ -48,12 +56,12 @@ export namespace WorkspaceSymbolProviderRegistry {
 	}
 }
 
-export function getWorkspaceSymbols(query: string): TPromise<[IWorkspaceSymbolProvider, SymbolInformation[]][]> {
+export function getWorkspaceSymbols(query: string, token: CancellationToken = CancellationToken.None): TPromise<[IWorkspaceSymbolProvider, IWorkspaceSymbol[]][]> {
 
-	const result: [IWorkspaceSymbolProvider, SymbolInformation[]][] = [];
+	const result: [IWorkspaceSymbolProvider, IWorkspaceSymbol[]][] = [];
 
 	const promises = WorkspaceSymbolProviderRegistry.all().map(support => {
-		return support.provideWorkspaceSymbols(query).then(value => {
+		return Promise.resolve(support.provideWorkspaceSymbols(query, token)).then(value => {
 			if (Array.isArray(value)) {
 				result.push([support, value]);
 			}
diff --git a/src/vs/workbench/parts/search/common/searchModel.ts b/src/vs/workbench/parts/search/common/searchModel.ts
index 186d45a23a6..f43b94187fd 100644
--- a/src/vs/workbench/parts/search/common/searchModel.ts
+++ b/src/vs/workbench/parts/search/common/searchModel.ts
@@ -3,39 +3,51 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as objects from 'vs/base/common/objects';
-import * as strings from 'vs/base/common/strings';
-import * as errors from 'vs/base/common/errors';
 import { RunOnceScheduler } from 'vs/base/common/async';
-import { IDisposable, Disposable } from 'vs/base/common/lifecycle';
-import { TPromise, PPromise } from 'vs/base/common/winjs.base';
-import URI from 'vs/base/common/uri';
-import { values, ResourceMap, TernarySearchTree } from 'vs/base/common/map';
-import { Event, Emitter, fromPromise, stopwatch, anyEvent } from 'vs/base/common/event';
-import { ISearchService, ISearchProgressItem, ISearchComplete, ISearchQuery, IPatternInfo, IFileMatch } from 'vs/platform/search/common/search';
-import { ReplacePattern } from 'vs/platform/search/common/replace';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
+import * as errors from 'vs/base/common/errors';
+import { anyEvent, Emitter, Event, fromPromise, stopwatch } from 'vs/base/common/event';
+import { getBaseLabel } from 'vs/base/common/labels';
+import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
+import { ResourceMap, TernarySearchTree, values } from 'vs/base/common/map';
+import * as objects from 'vs/base/common/objects';
+import { URI } from 'vs/base/common/uri';
+import { TPromise } from 'vs/base/common/winjs.base';
 import { Range } from 'vs/editor/common/core/range';
-import { ITextModel, IModelDeltaDecoration, OverviewRulerLane, TrackedRangeStickiness, FindMatch } from 'vs/editor/common/model';
-import { IInstantiationService, createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { IModelService } from 'vs/editor/common/services/modelService';
-import { IReplaceService } from 'vs/workbench/parts/search/common/replace';
-import { IProgressRunner } from 'vs/platform/progress/common/progress';
+import { FindMatch, IModelDeltaDecoration, ITextModel, OverviewRulerLane, TrackedRangeStickiness } from 'vs/editor/common/model';
 import { ModelDecorationOptions } from 'vs/editor/common/model/textModel';
+import { IModelService } from 'vs/editor/common/services/modelService';
+import { createDecorator, IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { IProgressRunner } from 'vs/platform/progress/common/progress';
+import { ReplacePattern } from 'vs/platform/search/common/replace';
+import { IFileMatch, IPatternInfo, ISearchComplete, ISearchProgressItem, ISearchQuery, ISearchService, ITextSearchPreviewOptions, ITextSearchResult, ITextSearchStats, TextSearchResult } from 'vs/platform/search/common/search';
+import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { overviewRulerFindMatchForeground } from 'vs/platform/theme/common/colorRegistry';
 import { themeColorFromId } from 'vs/platform/theme/common/themeService';
-import { getBaseLabel } from 'vs/base/common/labels';
+import { IReplaceService } from 'vs/workbench/parts/search/common/replace';
+import { CancellationTokenSource } from 'vs/base/common/cancellation';
 
 export class Match {
 
-	private _lineText: string;
 	private _id: string;
 	private _range: Range;
+	private _previewText: string;
+	private _rangeInPreviewText: Range;
 
-	constructor(private _parent: FileMatch, text: string, lineNumber: number, offset: number, length: number) {
-		this._lineText = text;
-		this._range = new Range(1 + lineNumber, 1 + offset, 1 + lineNumber, 1 + offset + length);
-		this._id = this._parent.id() + '>' + lineNumber + '>' + offset + this.getMatchString();
+	constructor(private _parent: FileMatch, _result: ITextSearchResult) {
+		this._range = new Range(
+			_result.range.startLineNumber + 1,
+			_result.range.startColumn + 1,
+			_result.range.endLineNumber + 1,
+			_result.range.endColumn + 1);
+
+		this._rangeInPreviewText = new Range(
+			_result.preview.match.startLineNumber + 1,
+			_result.preview.match.startColumn + 1,
+			_result.preview.match.endLineNumber + 1,
+			_result.preview.match.endColumn + 1);
+		this._previewText = _result.preview.text;
+
+		this._id = this._parent.id() + '>' + this._range + this.getMatchString();
 	}
 
 	public id(): string {
@@ -47,7 +59,7 @@ export class Match {
 	}
 
 	public text(): string {
-		return this._lineText;
+		return this._previewText;
 	}
 
 	public range(): Range {
@@ -55,11 +67,9 @@ export class Match {
 	}
 
 	public preview(): { before: string; inside: string; after: string; } {
-		let before = this._lineText.substring(0, this._range.startColumn - 1),
+		const before = this._previewText.substring(0, this._rangeInPreviewText.startColumn - 1),
 			inside = this.getMatchString(),
-			after = this._lineText.substring(this._range.endColumn - 1, Math.min(this._range.endColumn + 150, this._lineText.length));
-
-		before = strings.lcut(before, 26);
+			after = this._previewText.substring(this._rangeInPreviewText.endColumn - 1);
 
 		return {
 			before,
@@ -75,7 +85,7 @@ export class Match {
 
 		// If match string is not matching then regex pattern has a lookahead expression
 		if (replaceString === null) {
-			replaceString = searchModel.replacePattern.getReplaceString(matchString + this._lineText.substring(this._range.endColumn - 1));
+			replaceString = searchModel.replacePattern.getReplaceString(matchString + this._previewText.substring(this._rangeInPreviewText.endColumn - 1));
 		}
 
 		// Match string is still not matching. Could be unsupported matches (multi-line).
@@ -87,7 +97,7 @@ export class Match {
 	}
 
 	public getMatchString(): string {
-		return this._lineText.substring(this._range.startColumn - 1, this._range.endColumn - 1);
+		return this._previewText.substring(this._rangeInPreviewText.startColumn - 1, this._rangeInPreviewText.endColumn - 1);
 	}
 }
 
@@ -134,7 +144,7 @@ export class FileMatch extends Disposable {
 	private _updateScheduler: RunOnceScheduler;
 	private _modelDecorations: string[] = [];
 
-	constructor(private _query: IPatternInfo, private _maxResults: number, private _parent: FolderMatch, private rawMatch: IFileMatch,
+	constructor(private _query: IPatternInfo, private _previewOptions: ITextSearchPreviewOptions, private _maxResults: number, private _parent: FolderMatch, private rawMatch: IFileMatch,
 		@IModelService private modelService: IModelService, @IReplaceService private replaceService: IReplaceService) {
 		super();
 		this._resource = this.rawMatch.resource;
@@ -152,11 +162,9 @@ export class FileMatch extends Disposable {
 			this.bindModel(model);
 			this.updateMatchesForModel();
 		} else {
-			this.rawMatch.lineMatches.forEach((rawLineMatch) => {
-				rawLineMatch.offsetAndLengths.forEach(offsetAndLength => {
-					let match = new Match(this, rawLineMatch.preview, rawLineMatch.lineNumber, offsetAndLength[0], offsetAndLength[1]);
-					this.add(match);
-				});
+			this.rawMatch.matches.forEach((rawLineMatch) => {
+				let match = new Match(this, rawLineMatch);
+				this.add(match);
 			});
 		}
 	}
@@ -222,7 +230,9 @@ export class FileMatch extends Disposable {
 
 	private updateMatches(matches: FindMatch[], modelChange: boolean) {
 		matches.forEach(m => {
-			let match = new Match(this, this._model.getLineContent(m.range.startLineNumber), m.range.startLineNumber - 1, m.range.startColumn - 1, m.range.endColumn - m.range.startColumn);
+			const textSearchResult = editorMatchToTextSearchResult(m, this._model, this._previewOptions);
+			const match = new Match(this, textSearchResult);
+
 			if (!this._removedMatches.has(match.id())) {
 				this.add(match);
 				if (this.isMatchSelected(match)) {
@@ -348,7 +358,7 @@ export class FolderMatch extends Disposable {
 	private _unDisposedFileMatches: ResourceMap<FileMatch>;
 	private _replacingAll: boolean = false;
 
-	constructor(private _resource: URI, private _id: string, private _index: number, private _query: ISearchQuery, private _parent: SearchResult, private _searchModel: SearchModel, @IReplaceService private replaceService: IReplaceService,
+	constructor(private _resource: URI | null, private _id: string, private _index: number, private _query: ISearchQuery, private _parent: SearchResult, private _searchModel: SearchModel, @IReplaceService private replaceService: IReplaceService,
 		@IInstantiationService private instantiationService: IInstantiationService) {
 		super();
 		this._fileMatches = new ResourceMap<FileMatch>();
@@ -371,7 +381,7 @@ export class FolderMatch extends Disposable {
 		return this._id;
 	}
 
-	public resource(): URI {
+	public resource(): URI | null {
 		return this._resource;
 	}
 
@@ -387,21 +397,21 @@ export class FolderMatch extends Disposable {
 		return this._parent;
 	}
 
-	public hasRoot(): boolean {
-		return this._resource.fsPath !== '';
+	public hasResource(): boolean {
+		return !!this._resource;
 	}
 
 	public add(raw: IFileMatch[], silent: boolean): void {
-		let changed: FileMatch[] = [];
+		const changed: FileMatch[] = [];
 		raw.forEach((rawFileMatch) => {
 			if (this._fileMatches.has(rawFileMatch.resource)) {
 				this._fileMatches.get(rawFileMatch.resource).dispose();
 			}
 
-			let fileMatch = this.instantiationService.createInstance(FileMatch, this._query.contentPattern, this._query.maxResults, this, rawFileMatch);
+			const fileMatch = this.instantiationService.createInstance(FileMatch, this._query.contentPattern, this._query.previewOptions, this._query.maxResults, this, rawFileMatch);
 			this.doAdd(fileMatch);
 			changed.push(fileMatch);
-			let disposable = fileMatch.onChange(() => this.onFileChange(fileMatch));
+			const disposable = fileMatch.onChange(() => this.onFileChange(fileMatch));
 			fileMatch.onDispose(() => disposable.dispose());
 		});
 		if (!silent && changed.length) {
@@ -525,6 +535,7 @@ export class SearchResult extends Disposable {
 	public readonly onChange: Event<IChangeEvent> = this._onChange.event;
 
 	private _folderMatches: FolderMatch[] = [];
+	private _otherFilesMatch: FolderMatch;
 	private _folderMatchesMap: TernarySearchTree<FolderMatch> = TernarySearchTree.forPaths<FolderMatch>();
 	private _showHighlights: boolean;
 
@@ -539,17 +550,19 @@ export class SearchResult extends Disposable {
 	public set query(query: ISearchQuery) {
 		// When updating the query we could change the roots, so ensure we clean up the old roots first.
 		this.clear();
-		const otherFiles = URI.parse('');
-		this._folderMatches = (query.folderQueries || []).map((fq) => fq.folder).concat([otherFiles]).map((resource, index) => {
-			const id = resource.toString() || 'otherFiles';
-			const folderMatch = this.instantiationService.createInstance(FolderMatch, resource, id, index, query, this, this._searchModel);
-			const disposable = folderMatch.onChange((event) => this._onChange.fire(event));
-			folderMatch.onDispose(() => disposable.dispose());
-			return folderMatch;
-		});
-		// otherFiles is the fallback for missing values in the TrieMap. So we do not insert it.
-		this._folderMatches.slice(0, this.folderMatches.length - 1)
-			.forEach(fm => this._folderMatchesMap.set(fm.resource().fsPath, fm));
+		this._folderMatches = (query.folderQueries || [])
+			.map(fq => fq.folder)
+			.map((resource, index) => this.createFolderMatch(resource, resource.toString(), index, query));
+		this._folderMatches.forEach(fm => this._folderMatchesMap.set(fm.resource().fsPath, fm));
+
+		this._otherFilesMatch = this.createFolderMatch(null, 'otherFiles', this._folderMatches.length + 1, query);
+	}
+
+	private createFolderMatch(resource: URI | null, id: string, index: number, query: ISearchQuery): FolderMatch {
+		const folderMatch = this.instantiationService.createInstance(FolderMatch, resource, id, index, query, this, this._searchModel);
+		const disposable = folderMatch.onChange((event) => this._onChange.fire(event));
+		folderMatch.onDispose(() => disposable.dispose());
+		return folderMatch;
 	}
 
 	public get searchModel(): SearchModel {
@@ -558,27 +571,34 @@ export class SearchResult extends Disposable {
 
 	public add(allRaw: IFileMatch[], silent: boolean = false): void {
 		// Split up raw into a list per folder so we can do a batch add per folder.
-		let rawPerFolder = new ResourceMap<IFileMatch[]>();
+		const rawPerFolder = new ResourceMap<IFileMatch[]>();
+		const otherFileMatches: IFileMatch[] = [];
 		this._folderMatches.forEach((folderMatch) => rawPerFolder.set(folderMatch.resource(), []));
 		allRaw.forEach(rawFileMatch => {
 			let folderMatch = this.getFolderMatch(rawFileMatch.resource);
-			if (folderMatch) {
+			if (folderMatch.resource()) {
 				rawPerFolder.get(folderMatch.resource()).push(rawFileMatch);
+			} else {
+				otherFileMatches.push(rawFileMatch);
 			}
 		});
+
 		rawPerFolder.forEach((raw) => {
 			if (!raw.length) {
 				return;
 			}
-			let folderMatch = this.getFolderMatch(raw[0].resource);
+
+			const folderMatch = this.getFolderMatch(raw[0].resource);
 			if (folderMatch) {
 				folderMatch.add(raw, silent);
 			}
 		});
+
+		this.otherFiles.add(otherFileMatches, silent);
 	}
 
 	public clear(): void {
-		this._folderMatches.forEach((folderMatch) => folderMatch.clear());
+		this.folderMatches().forEach((folderMatch) => folderMatch.clear());
 		this.disposeMatches();
 	}
 
@@ -615,19 +635,21 @@ export class SearchResult extends Disposable {
 	}
 
 	public folderMatches(): FolderMatch[] {
-		return this._folderMatches.concat();
+		return this._otherFilesMatch ?
+			this._folderMatches.concat(this._otherFilesMatch) :
+			this._folderMatches.concat();
 	}
 
 	public matches(): FileMatch[] {
 		let matches: FileMatch[][] = [];
-		this._folderMatches.forEach((folderMatch) => {
+		this.folderMatches().forEach((folderMatch) => {
 			matches.push(folderMatch.matches());
 		});
 		return [].concat(...matches);
 	}
 
 	public isEmpty(): boolean {
-		return this._folderMatches.every((folderMatch) => folderMatch.isEmpty());
+		return this.folderMatches().every((folderMatch) => folderMatch.isEmpty());
 	}
 
 	public fileCount(): number {
@@ -674,18 +696,19 @@ export class SearchResult extends Disposable {
 	}
 
 	private get otherFiles(): FolderMatch {
-		return this._folderMatches[this._folderMatches.length - 1];
+		return this._otherFilesMatch;
 	}
 
 	private set replacingAll(running: boolean) {
-		this._folderMatches.forEach((folderMatch) => {
+		this.folderMatches().forEach((folderMatch) => {
 			folderMatch.replacingAll = running;
 		});
 	}
 
 	private disposeMatches(): void {
-		this._folderMatches.forEach(folderMatch => folderMatch.dispose());
+		this.folderMatches().forEach(folderMatch => folderMatch.dispose());
 		this._folderMatches = [];
+		this._otherFilesMatch = null;
 		this._folderMatchesMap = TernarySearchTree.forPaths<FolderMatch>();
 		this._rangeHighlightDecorations.removeHighlightRange();
 	}
@@ -708,7 +731,7 @@ export class SearchModel extends Disposable {
 	private readonly _onReplaceTermChanged: Emitter<void> = this._register(new Emitter<void>());
 	public readonly onReplaceTermChanged: Event<void> = this._onReplaceTermChanged.event;
 
-	private currentRequest: PPromise<ISearchComplete, ISearchProgressItem>;
+	private currentCancelTokenSource: CancellationTokenSource;
 
 	constructor(@ISearchService private searchService: ISearchService, @ITelemetryService private telemetryService: ITelemetryService, @IInstantiationService private instantiationService: IInstantiationService) {
 		super();
@@ -743,18 +766,30 @@ export class SearchModel extends Disposable {
 		return this._searchResult;
 	}
 
-	public search(query: ISearchQuery): PPromise<ISearchComplete, ISearchProgressItem> {
+	public search(query: ISearchQuery, onProgress?: (result: ISearchProgressItem) => void): TPromise<ISearchComplete> {
 		this.cancelSearch();
+
 		this._searchQuery = query;
-		this.currentRequest = this.searchService.search(this._searchQuery);
-
 		this.searchResult.clear();
-
 		this._searchResult.query = this._searchQuery;
+
+		const progressEmitter = new Emitter<void>();
 		this._replacePattern = new ReplacePattern(this._replaceString, this._searchQuery.contentPattern);
 
-		const onDone = fromPromise(this.currentRequest);
-		const progressEmitter = new Emitter<void>();
+		const tokenSource = this.currentCancelTokenSource = new CancellationTokenSource();
+		const currentRequest = this.searchService.search(this._searchQuery, this.currentCancelTokenSource.token, p => {
+			progressEmitter.fire();
+			this.onSearchProgress(p);
+
+			if (onProgress) {
+				onProgress(p);
+			}
+		});
+
+		const dispose = () => tokenSource.dispose();
+		currentRequest.then(dispose, dispose);
+
+		const onDone = fromPromise(currentRequest);
 		const onFirstRender = anyEvent<any>(onDone, progressEmitter.event);
 		const onFirstRenderStopwatch = stopwatch(onFirstRender);
 		/* __GDPR__
@@ -774,32 +809,34 @@ export class SearchModel extends Disposable {
 		*/
 		onDoneStopwatch(duration => this.telemetryService.publicLog('searchResultsFinished', { duration }));
 
-		const currentRequest = this.currentRequest;
-		this.currentRequest.then(
+		currentRequest.then(
 			value => this.onSearchCompleted(value, Date.now() - start),
-			e => this.onSearchError(e, Date.now() - start),
-			p => {
-				progressEmitter.fire();
-				this.onSearchProgress(p);
-			}
-		);
+			e => this.onSearchError(e, Date.now() - start));
 
-		// this.currentRequest may be completed (and nulled) immediately
 		return currentRequest;
 	}
 
 	private onSearchCompleted(completed: ISearchComplete, duration: number): ISearchComplete {
-		this.currentRequest = null;
-
 		const options: IPatternInfo = objects.assign({}, this._searchQuery.contentPattern);
 		delete options.pattern;
+
+		const stats = completed && completed.stats as ITextSearchStats;
+
+		const fileSchemeOnly = this._searchQuery.folderQueries.every(fq => fq.folder.scheme === 'file');
+		const otherSchemeOnly = this._searchQuery.folderQueries.every(fq => fq.folder.scheme !== 'file');
+		const scheme = fileSchemeOnly ? 'file' :
+			otherSchemeOnly ? 'other' :
+				'mixed';
+
 		/* __GDPR__
 			"searchResultsShown" : {
 				"count" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
 				"fileCount": { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
 				"options": { "${inline}": [ "${IPatternInfo}" ] },
 				"duration": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true },
-				"useRipgrep": { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true }
+				"useRipgrep": { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+				"type" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+				"scheme" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" }
 			}
 		*/
 		this.telemetryService.publicLog('searchResultsShown', {
@@ -807,7 +844,9 @@ export class SearchModel extends Disposable {
 			fileCount: this._searchResult.fileCount(),
 			options,
 			duration,
-			useRipgrep: this._searchQuery.useRipgrep
+			useRipgrep: this._searchQuery.useRipgrep,
+			type: stats && stats.type,
+			scheme
 		});
 		return completed;
 	}
@@ -825,9 +864,8 @@ export class SearchModel extends Disposable {
 	}
 
 	public cancelSearch(): boolean {
-		if (this.currentRequest) {
-			this.currentRequest.cancel();
-			this.currentRequest = null;
+		if (this.currentCancelTokenSource) {
+			this.currentCancelTokenSource.cancel();
 			return true;
 		}
 		return false;
@@ -945,3 +983,20 @@ export class RangeHighlightDecorations implements IDisposable {
 		isWholeLine: true
 	});
 }
+
+/**
+ * While search doesn't support multiline matches, collapse editor matches to a single line
+ */
+export function editorMatchToTextSearchResult(match: FindMatch, model: ITextModel, previewOptions: ITextSearchPreviewOptions): TextSearchResult {
+	let endLineNumber = match.range.endLineNumber - 1;
+	let endCol = match.range.endColumn - 1;
+	if (match.range.endLineNumber !== match.range.startLineNumber) {
+		endLineNumber = match.range.startLineNumber - 1;
+		endCol = model.getLineLength(match.range.startLineNumber);
+	}
+
+	return new TextSearchResult(
+		model.getLineContent(match.range.startLineNumber),
+		new Range(match.range.startLineNumber - 1, match.range.startColumn - 1, endLineNumber, endCol),
+		previewOptions);
+}
diff --git a/src/vs/workbench/parts/search/electron-browser/search.contribution.ts b/src/vs/workbench/parts/search/electron-browser/search.contribution.ts
index e36535783fb..1b50a6691ce 100644
--- a/src/vs/workbench/parts/search/electron-browser/search.contribution.ts
+++ b/src/vs/workbench/parts/search/electron-browser/search.contribution.ts
@@ -19,7 +19,7 @@ import { ExplorerFolderContext, ExplorerRootContext } from 'vs/workbench/parts/f
 import { SyncActionDescriptor, MenuRegistry, MenuId, ICommandAction } from 'vs/platform/actions/common/actions';
 import { IWorkbenchActionRegistry, Extensions as ActionExtensions } from 'vs/workbench/common/actions';
 import { QuickOpenHandlerDescriptor, IQuickOpenRegistry, Extensions as QuickOpenExtensions } from 'vs/workbench/browser/quickopen';
-import { KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRegistry';
+import { KeybindingsRegistry, KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IQuickOpenService } from 'vs/platform/quickOpen/common/quickOpen';
 import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
@@ -31,7 +31,7 @@ import * as Constants from 'vs/workbench/parts/search/common/constants';
 import { registerContributions as replaceContributions } from 'vs/workbench/parts/search/browser/replaceContributions';
 import { registerContributions as searchWidgetContributions } from 'vs/workbench/parts/search/browser/searchWidget';
 import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { ToggleCaseSensitiveKeybinding, ToggleRegexKeybinding, ToggleWholeWordKeybinding, ShowPreviousFindTermKeybinding, ShowNextFindTermKeybinding } from 'vs/editor/contrib/find/findModel';
+import { ToggleCaseSensitiveKeybinding, ToggleRegexKeybinding, ToggleWholeWordKeybinding } from 'vs/editor/contrib/find/findModel';
 import { ISearchWorkbenchService, SearchWorkbenchService } from 'vs/workbench/parts/search/common/searchModel';
 import { CommandsRegistry } from 'vs/platform/commands/common/commands';
 import { SearchView } from 'vs/workbench/parts/search/browser/searchView';
@@ -42,7 +42,7 @@ import { registerLanguageCommand } from 'vs/editor/browser/editorExtensions';
 import { getWorkspaceSymbols } from 'vs/workbench/parts/search/common/search';
 import { illegalArgument } from 'vs/base/common/errors';
 import { WorkbenchListFocusContextKey, IListService } from 'vs/platform/list/browser/listService';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { relative } from 'path';
 import { dirname } from 'vs/base/common/resources';
 import { ResourceContextKey } from 'vs/workbench/common/resources';
@@ -52,7 +52,7 @@ import { getMultiSelectedResources } from 'vs/workbench/parts/files/browser/file
 import { Schemas } from 'vs/base/common/network';
 import { PanelRegistry, Extensions as PanelExtensions, PanelDescriptor } from 'vs/workbench/browser/panel';
 import { IPanelService } from 'vs/workbench/services/panel/common/panelService';
-import { openSearchView, getSearchView, ReplaceAllInFolderAction, ReplaceAllAction, CloseReplaceAction, FocusNextSearchResultAction, FocusPreviousSearchResultAction, ReplaceInFilesAction, FindInFilesAction, FocusActiveEditorCommand, toggleCaseSensitiveCommand, ShowNextSearchTermAction, ShowPreviousSearchTermAction, toggleRegexCommand, ShowPreviousSearchIncludeAction, ShowNextSearchIncludeAction, CollapseDeepestExpandedLevelAction, toggleWholeWordCommand, RemoveAction, ReplaceAction, ClearSearchResultsAction, copyPathCommand, copyMatchCommand, copyAllCommand, ShowNextSearchExcludeAction, ShowPreviousSearchExcludeAction, clearHistoryCommand, ShowNextReplaceTermAction, ShowPreviousReplaceTermAction } from 'vs/workbench/parts/search/browser/searchActions';
+import { openSearchView, getSearchView, ReplaceAllInFolderAction, ReplaceAllAction, CloseReplaceAction, FocusNextSearchResultAction, FocusPreviousSearchResultAction, ReplaceInFilesAction, FindInFilesAction, toggleCaseSensitiveCommand, toggleRegexCommand, CollapseDeepestExpandedLevelAction, toggleWholeWordCommand, RemoveAction, ReplaceAction, ClearSearchResultsAction, copyPathCommand, copyMatchCommand, copyAllCommand, clearHistoryCommand, FocusNextInputAction, FocusPreviousInputAction, RefreshAction, focusSearchListCommand } from 'vs/workbench/parts/search/browser/searchActions';
 import { VIEW_ID, ISearchConfigurationProperties } from 'vs/platform/search/common/search';
 import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions';
 import { LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
@@ -68,7 +68,7 @@ const category = nls.localize('search', "Search");
 
 KeybindingsRegistry.registerCommandAndKeybindingRule({
 	id: 'workbench.action.search.toggleQueryDetails',
-	weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
+	weight: KeybindingWeight.WorkbenchContrib,
 	when: Constants.SearchViewVisibleKey,
 	primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KEY_J,
 	handler: accessor => {
@@ -81,9 +81,9 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 
 KeybindingsRegistry.registerCommandAndKeybindingRule({
 	id: Constants.FocusSearchFromResults,
-	weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
+	weight: KeybindingWeight.WorkbenchContrib,
 	when: ContextKeyExpr.and(Constants.SearchViewVisibleKey, Constants.FirstMatchFocusKey),
-	primary: KeyCode.UpArrow,
+	primary: KeyMod.CtrlCmd | KeyCode.UpArrow,
 	handler: (accessor, args: any) => {
 		const searchView = getSearchView(accessor.get(IViewletService), accessor.get(IPanelService));
 		searchView.focusPreviousInputBox();
@@ -92,7 +92,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 
 KeybindingsRegistry.registerCommandAndKeybindingRule({
 	id: Constants.OpenMatchToSide,
-	weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
+	weight: KeybindingWeight.WorkbenchContrib,
 	when: ContextKeyExpr.and(Constants.SearchViewVisibleKey, Constants.FileMatchOrMatchFocusKey),
 	primary: KeyMod.CtrlCmd | KeyCode.Enter,
 	mac: {
@@ -107,7 +107,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 
 KeybindingsRegistry.registerCommandAndKeybindingRule({
 	id: Constants.CancelActionId,
-	weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
+	weight: KeybindingWeight.WorkbenchContrib,
 	when: ContextKeyExpr.and(Constants.SearchViewVisibleKey, WorkbenchListFocusContextKey),
 	primary: KeyCode.Escape,
 	handler: (accessor, args: any) => {
@@ -118,7 +118,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 
 KeybindingsRegistry.registerCommandAndKeybindingRule({
 	id: Constants.RemoveActionId,
-	weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
+	weight: KeybindingWeight.WorkbenchContrib,
 	when: ContextKeyExpr.and(Constants.SearchViewVisibleKey, Constants.FileMatchOrMatchFocusKey),
 	primary: KeyCode.Delete,
 	mac: {
@@ -133,7 +133,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 
 KeybindingsRegistry.registerCommandAndKeybindingRule({
 	id: Constants.ReplaceActionId,
-	weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
+	weight: KeybindingWeight.WorkbenchContrib,
 	when: ContextKeyExpr.and(Constants.SearchViewVisibleKey, Constants.ReplaceActiveKey, Constants.MatchFocusKey),
 	primary: KeyMod.Shift | KeyMod.CtrlCmd | KeyCode.KEY_1,
 	handler: (accessor, args: any) => {
@@ -145,7 +145,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 
 KeybindingsRegistry.registerCommandAndKeybindingRule({
 	id: Constants.ReplaceAllInFileActionId,
-	weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
+	weight: KeybindingWeight.WorkbenchContrib,
 	when: ContextKeyExpr.and(Constants.SearchViewVisibleKey, Constants.ReplaceActiveKey, Constants.FileFocusKey),
 	primary: KeyMod.Shift | KeyMod.CtrlCmd | KeyCode.KEY_1,
 	secondary: [KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.Enter],
@@ -158,7 +158,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 
 KeybindingsRegistry.registerCommandAndKeybindingRule({
 	id: Constants.ReplaceAllInFolderActionId,
-	weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
+	weight: KeybindingWeight.WorkbenchContrib,
 	when: ContextKeyExpr.and(Constants.SearchViewVisibleKey, Constants.ReplaceActiveKey, Constants.FolderFocusKey),
 	primary: KeyMod.Shift | KeyMod.CtrlCmd | KeyCode.KEY_1,
 	secondary: [KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.Enter],
@@ -171,7 +171,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 
 KeybindingsRegistry.registerCommandAndKeybindingRule({
 	id: Constants.CloseReplaceWidgetActionId,
-	weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
+	weight: KeybindingWeight.WorkbenchContrib,
 	when: ContextKeyExpr.and(Constants.SearchViewVisibleKey, Constants.ReplaceInputBoxFocusedKey),
 	primary: KeyCode.Escape,
 	handler: (accessor, args: any) => {
@@ -179,6 +179,26 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 	}
 });
 
+KeybindingsRegistry.registerCommandAndKeybindingRule({
+	id: FocusNextInputAction.ID,
+	weight: KeybindingWeight.WorkbenchContrib,
+	when: ContextKeyExpr.and(Constants.SearchViewVisibleKey, Constants.InputBoxFocusedKey),
+	primary: KeyMod.CtrlCmd | KeyCode.DownArrow,
+	handler: (accessor, args: any) => {
+		accessor.get(IInstantiationService).createInstance(FocusNextInputAction, FocusNextInputAction.ID, '').run();
+	}
+});
+
+KeybindingsRegistry.registerCommandAndKeybindingRule({
+	id: FocusPreviousInputAction.ID,
+	weight: KeybindingWeight.WorkbenchContrib,
+	when: ContextKeyExpr.and(Constants.SearchViewVisibleKey, Constants.InputBoxFocusedKey, Constants.SearchInputBoxFocusedKey.toNegated()),
+	primary: KeyMod.CtrlCmd | KeyCode.UpArrow,
+	handler: (accessor, args: any) => {
+		accessor.get(IInstantiationService).createInstance(FocusPreviousInputAction, FocusPreviousInputAction.ID, '').run();
+	}
+});
+
 MenuRegistry.appendMenuItem(MenuId.SearchContext, {
 	command: {
 		id: Constants.ReplaceActionId,
@@ -221,7 +241,7 @@ MenuRegistry.appendMenuItem(MenuId.SearchContext, {
 
 KeybindingsRegistry.registerCommandAndKeybindingRule({
 	id: Constants.CopyMatchCommandId,
-	weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
+	weight: KeybindingWeight.WorkbenchContrib,
 	when: Constants.FileMatchOrMatchFocusKey,
 	primary: KeyMod.CtrlCmd | KeyCode.KEY_C,
 	handler: copyMatchCommand
@@ -239,7 +259,7 @@ MenuRegistry.appendMenuItem(MenuId.SearchContext, {
 
 KeybindingsRegistry.registerCommandAndKeybindingRule({
 	id: Constants.CopyPathCommandId,
-	weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
+	weight: KeybindingWeight.WorkbenchContrib,
 	when: Constants.FileMatchOrFolderMatchFocusKey,
 	primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.KEY_C,
 	win: {
@@ -311,6 +331,19 @@ MenuRegistry.appendMenuItem(MenuId.SearchContext, {
 	order: 1
 });
 
+CommandsRegistry.registerCommand({
+	id: Constants.FocusSearchListCommandID,
+	handler: focusSearchListCommand
+});
+
+const focusSearchListCommandLabel = nls.localize('focusSearchListCommandLabel', "Focus List");
+const FocusSearchListCommand: ICommandAction = {
+	id: Constants.FocusSearchListCommandID,
+	title: focusSearchListCommandLabel,
+	category
+};
+MenuRegistry.addCommand(FocusSearchListCommand);
+
 const FIND_IN_FOLDER_ID = 'filesExplorer.findInFolder';
 CommandsRegistry.registerCommand({
 	id: FIND_IN_FOLDER_ID,
@@ -348,6 +381,13 @@ CommandsRegistry.registerCommand({
 	}
 });
 
+CommandsRegistry.registerCommand({
+	id: RefreshAction.ID,
+	handler: (accessor, args: any) => {
+		accessor.get(IInstantiationService).createInstance(RefreshAction, RefreshAction.ID, '').run();
+	}
+});
+
 const FIND_IN_WORKSPACE_ID = 'filesExplorer.findInWorkspace';
 CommandsRegistry.registerCommand({
 	id: FIND_IN_WORKSPACE_ID,
@@ -432,62 +472,59 @@ Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench).regi
 // Actions
 const registry = Registry.as<IWorkbenchActionRegistry>(ActionExtensions.WorkbenchActions);
 
-registry.registerWorkbenchAction(new SyncActionDescriptor(FindInFilesAction, VIEW_ID, nls.localize('showSearchViewl', "Show Search"), { primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KEY_F },
-	Constants.SearchViewVisibleKey.toNegated()), 'View: Show Search', nls.localize('view', "View"));
-registry.registerWorkbenchAction(new SyncActionDescriptor(FindInFilesAction, Constants.FindInFilesActionId, nls.localize('findInFiles', "Find in Files"), { primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KEY_F },
-	Constants.SearchInputBoxFocusedKey.toNegated()), 'Find in Files', category);
-
-KeybindingsRegistry.registerCommandAndKeybindingRule({
-	id: Constants.FocusActiveEditorCommandId,
-	weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
-	when: ContextKeyExpr.and(Constants.SearchViewVisibleKey, Constants.SearchInputBoxFocusedKey),
-	handler: FocusActiveEditorCommand,
-	primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KEY_F
+// Show Search and Find in Files are redundant, but we can't break keybindings by removing one. So it's the same action, same keybinding, registered to different IDs.
+// Show Search 'when' is redundant but if the two conflict with exactly the same keybinding and 'when' clause, then they can show up as "unbound" - #51780
+registry.registerWorkbenchAction(new SyncActionDescriptor(FindInFilesAction, VIEW_ID, nls.localize('showSearchViewl', "Show Search"), { primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KEY_F }, Constants.SearchViewVisibleKey.toNegated()), 'View: Show Search', nls.localize('view', "View"));
+registry.registerWorkbenchAction(new SyncActionDescriptor(FindInFilesAction, Constants.FindInFilesActionId, nls.localize('findInFiles', "Find in Files"), { primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KEY_F }), 'Find in Files', category);
+MenuRegistry.appendMenuItem(MenuId.MenubarEditMenu, {
+	group: '4_find_global',
+	command: {
+		id: Constants.FindInFilesActionId,
+		title: nls.localize({ key: 'miFindInFiles', comment: ['&& denotes a mnemonic'] }, "Find &&in Files")
+	},
+	order: 1
 });
 
 registry.registerWorkbenchAction(new SyncActionDescriptor(FocusNextSearchResultAction, FocusNextSearchResultAction.ID, FocusNextSearchResultAction.LABEL, { primary: KeyCode.F4 }, ContextKeyExpr.and(Constants.HasSearchResults)), 'Focus Next Search Result', category);
 registry.registerWorkbenchAction(new SyncActionDescriptor(FocusPreviousSearchResultAction, FocusPreviousSearchResultAction.ID, FocusPreviousSearchResultAction.LABEL, { primary: KeyMod.Shift | KeyCode.F4 }, ContextKeyExpr.and(Constants.HasSearchResults)), 'Focus Previous Search Result', category);
 
 registry.registerWorkbenchAction(new SyncActionDescriptor(ReplaceInFilesAction, ReplaceInFilesAction.ID, ReplaceInFilesAction.LABEL, { primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KEY_H }), 'Replace in Files', category);
+MenuRegistry.appendMenuItem(MenuId.MenubarEditMenu, {
+	group: '4_find_global',
+	command: {
+		id: ReplaceInFilesAction.ID,
+		title: nls.localize({ key: 'miReplaceInFiles', comment: ['&& denotes a mnemonic'] }, "Replace &&in Files")
+	},
+	order: 2
+});
 
 KeybindingsRegistry.registerCommandAndKeybindingRule(objects.assign({
 	id: Constants.ToggleCaseSensitiveCommandId,
-	weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
+	weight: KeybindingWeight.WorkbenchContrib,
 	when: ContextKeyExpr.and(Constants.SearchViewVisibleKey, Constants.SearchInputBoxFocusedKey),
 	handler: toggleCaseSensitiveCommand
 }, ToggleCaseSensitiveKeybinding));
 
 KeybindingsRegistry.registerCommandAndKeybindingRule(objects.assign({
 	id: Constants.ToggleWholeWordCommandId,
-	weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
+	weight: KeybindingWeight.WorkbenchContrib,
 	when: ContextKeyExpr.and(Constants.SearchViewVisibleKey, Constants.SearchInputBoxFocusedKey),
 	handler: toggleWholeWordCommand
 }, ToggleWholeWordKeybinding));
 
 KeybindingsRegistry.registerCommandAndKeybindingRule(objects.assign({
 	id: Constants.ToggleRegexCommandId,
-	weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
+	weight: KeybindingWeight.WorkbenchContrib,
 	when: ContextKeyExpr.and(Constants.SearchViewVisibleKey, Constants.SearchInputBoxFocusedKey),
 	handler: toggleRegexCommand
 }, ToggleRegexKeybinding));
 
-// Terms navigation actions
-registry.registerWorkbenchAction(new SyncActionDescriptor(ShowNextSearchTermAction, ShowNextSearchTermAction.ID, ShowNextSearchTermAction.LABEL, ShowNextFindTermKeybinding, ContextKeyExpr.and(Constants.SearchViewVisibleKey, Constants.SearchInputBoxFocusedKey)), 'Search: Show Next Search Term', category);
-registry.registerWorkbenchAction(new SyncActionDescriptor(ShowPreviousSearchTermAction, ShowPreviousSearchTermAction.ID, ShowPreviousSearchTermAction.LABEL, ShowPreviousFindTermKeybinding, ContextKeyExpr.and(Constants.SearchViewVisibleKey, Constants.SearchInputBoxFocusedKey)), 'Search: Show Previous Search Term', category);
-
-registry.registerWorkbenchAction(new SyncActionDescriptor(ShowNextReplaceTermAction, ShowNextReplaceTermAction.ID, ShowNextReplaceTermAction.LABEL, ShowNextFindTermKeybinding, ContextKeyExpr.and(Constants.SearchViewVisibleKey, Constants.ReplaceInputBoxFocusedKey)), 'Search: Show Next Search Replace Term', category);
-registry.registerWorkbenchAction(new SyncActionDescriptor(ShowPreviousReplaceTermAction, ShowPreviousReplaceTermAction.ID, ShowPreviousReplaceTermAction.LABEL, ShowPreviousFindTermKeybinding, ContextKeyExpr.and(Constants.SearchViewVisibleKey, Constants.ReplaceInputBoxFocusedKey)), 'Search: Show Previous Search Replace Term', category);
-
-registry.registerWorkbenchAction(new SyncActionDescriptor(ShowNextSearchIncludeAction, ShowNextSearchIncludeAction.ID, ShowNextSearchIncludeAction.LABEL, ShowNextFindTermKeybinding, ContextKeyExpr.and(Constants.SearchViewVisibleKey, Constants.PatternIncludesFocusedKey)), 'Search: Show Next Search Include Pattern', category);
-registry.registerWorkbenchAction(new SyncActionDescriptor(ShowPreviousSearchIncludeAction, ShowPreviousSearchIncludeAction.ID, ShowPreviousSearchIncludeAction.LABEL, ShowPreviousFindTermKeybinding, ContextKeyExpr.and(Constants.SearchViewVisibleKey, Constants.PatternIncludesFocusedKey)), 'Search: Show Previous Search Include Pattern', category);
-
-registry.registerWorkbenchAction(new SyncActionDescriptor(ShowNextSearchExcludeAction, ShowNextSearchExcludeAction.ID, ShowNextSearchExcludeAction.LABEL, ShowNextFindTermKeybinding, ContextKeyExpr.and(Constants.SearchViewVisibleKey, Constants.PatternExcludesFocusedKey)), 'Search: Show Next Search Exclude Pattern', category);
-registry.registerWorkbenchAction(new SyncActionDescriptor(ShowPreviousSearchExcludeAction, ShowPreviousSearchExcludeAction.ID, ShowPreviousSearchExcludeAction.LABEL, ShowPreviousFindTermKeybinding, ContextKeyExpr.and(Constants.SearchViewVisibleKey, Constants.PatternExcludesFocusedKey)), 'Search: Show Previous Search Exclude Pattern', category);
-
 registry.registerWorkbenchAction(new SyncActionDescriptor(CollapseDeepestExpandedLevelAction, CollapseDeepestExpandedLevelAction.ID, CollapseDeepestExpandedLevelAction.LABEL), 'Search: Collapse All', category);
-
 registry.registerWorkbenchAction(new SyncActionDescriptor(ShowAllSymbolsAction, ShowAllSymbolsAction.ID, ShowAllSymbolsAction.LABEL, { primary: KeyMod.CtrlCmd | KeyCode.KEY_T }), 'Go to Symbol in Workspace...');
 
+registry.registerWorkbenchAction(new SyncActionDescriptor(RefreshAction, RefreshAction.ID, RefreshAction.LABEL), 'Search: Refresh', category);
+registry.registerWorkbenchAction(new SyncActionDescriptor(ClearSearchResultsAction, ClearSearchResultsAction.ID, ClearSearchResultsAction.LABEL), 'Search: Clear', category);
+
 
 // Register Quick Open Handler
 Registry.as<IQuickOpenRegistry>(QuickOpenExtensions.Quickopen).registerDefaultQuickOpenHandler(
@@ -526,7 +563,7 @@ configurationRegistry.registerConfiguration({
 	properties: {
 		'search.exclude': {
 			type: 'object',
-			description: nls.localize('exclude', "Configure glob patterns for excluding files and folders in searches. Inherits all glob patterns from the files.exclude setting."),
+			markdownDescription: nls.localize('exclude', "Configure glob patterns for excluding files and folders in searches. Inherits all glob patterns from the `#files.exclude#` setting. Read more about glob patterns [here](https://code.visualstudio.com/docs/editor/codebasics#_advanced-search-options)."),
 			default: { '**/node_modules': true, '**/bower_components': true },
 			additionalProperties: {
 				anyOf: [
@@ -551,18 +588,18 @@ configurationRegistry.registerConfiguration({
 		},
 		'search.useRipgrep': {
 			type: 'boolean',
-			description: nls.localize('useRipgrep', "Controls whether to use ripgrep in text and file search"),
+			description: nls.localize('useRipgrep', "Controls whether to use ripgrep in text and file search."),
 			default: true
 		},
 		'search.useIgnoreFiles': {
 			type: 'boolean',
-			description: nls.localize('useIgnoreFiles', "Controls whether to use .gitignore and .ignore files when searching for files."),
+			markdownDescription: nls.localize('useIgnoreFiles', "Controls whether to use `.gitignore` and `.ignore` files when searching for files."),
 			default: true,
 			scope: ConfigurationScope.RESOURCE
 		},
 		'search.quickOpen.includeSymbols': {
 			type: 'boolean',
-			description: nls.localize('search.quickOpen.includeSymbols', "Configure to include results from a global symbol search in the file results for Quick Open."),
+			description: nls.localize('search.quickOpen.includeSymbols', "Whether to include results from a global symbol search in the file results for Quick Open."),
 			default: false
 		},
 		'search.followSymlinks': {
@@ -572,20 +609,31 @@ configurationRegistry.registerConfiguration({
 		},
 		'search.smartCase': {
 			type: 'boolean',
-			description: nls.localize('search.smartCase', "Searches case-insensitively if the pattern is all lowercase, otherwise, searches case-sensitively"),
+			description: nls.localize('search.smartCase', "Search case-insensitively if the pattern is all lowercase, otherwise, search case-sensitively."),
 			default: false
 		},
 		'search.globalFindClipboard': {
 			type: 'boolean',
 			default: false,
-			description: nls.localize('search.globalFindClipboard', "Controls if the search view should read or modify the shared find clipboard on macOS"),
+			description: nls.localize('search.globalFindClipboard', "Controls whether the search view should read or modify the shared find clipboard on macOS."),
 			included: platform.isMacintosh
 		},
 		'search.location': {
 			type: 'string',
 			enum: ['sidebar', 'panel'],
 			default: 'sidebar',
-			description: nls.localize('search.location', "Controls if the search will be shown as a view in the sidebar or as a panel in the panel area for more horizontal space."),
+			description: nls.localize('search.location', "Controls whether the search will be shown as a view in the sidebar or as a panel in the panel area for more horizontal space."),
+		},
+		'search.collapseResults': {
+			type: 'string',
+			enum: ['auto', 'alwaysCollapse', 'alwaysExpand'],
+			enumDescriptions: [
+				'Files with less than 10 results are expanded. Others are collapsed.',
+				'',
+				''
+			],
+			default: 'auto',
+			description: nls.localize('search.collapseAllResults', "Controls whether the search results will be collapsed or expanded."),
 		}
 	}
 });
@@ -597,3 +645,25 @@ registerLanguageCommand('_executeWorkspaceSymbolProvider', function (accessor, a
 	}
 	return getWorkspaceSymbols(query);
 });
+
+// View menu
+
+MenuRegistry.appendMenuItem(MenuId.MenubarViewMenu, {
+	group: '3_views',
+	command: {
+		id: VIEW_ID,
+		title: nls.localize({ key: 'miViewSearch', comment: ['&& denotes a mnemonic'] }, "&&Search")
+	},
+	order: 2
+});
+
+// Go to menu
+
+MenuRegistry.appendMenuItem(MenuId.MenubarGoMenu, {
+	group: 'z_go_to',
+	command: {
+		id: 'workbench.action.showAllSymbols',
+		title: nls.localize({ key: 'miGotoSymbolInWorkspace', comment: ['&& denotes a mnemonic'] }, "Go to Symbol in &&Workspace...")
+	},
+	order: 3
+});
\ No newline at end of file
diff --git a/src/vs/workbench/parts/search/test/browser/searchActions.test.ts b/src/vs/workbench/parts/search/test/browser/searchActions.test.ts
index 47f5db6be49..c71828c4b40 100644
--- a/src/vs/workbench/parts/search/test/browser/searchActions.test.ts
+++ b/src/vs/workbench/parts/search/test/browser/searchActions.test.ts
@@ -5,7 +5,7 @@
 'use strict';
 
 import * as assert from 'assert';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { TestInstantiationService, stubFunction } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
 import { Match, FileMatch, FileMatchOrMatch } from 'vs/workbench/parts/search/common/searchModel';
 import { ReplaceAction } from 'vs/workbench/parts/search/browser/searchActions';
@@ -129,13 +129,26 @@ suite('Search Actions', () => {
 	function aFileMatch(): FileMatch {
 		let rawMatch: IFileMatch = {
 			resource: URI.file('somepath' + ++counter),
-			lineMatches: []
+			matches: []
 		};
-		return instantiationService.createInstance(FileMatch, null, null, null, rawMatch);
+		return instantiationService.createInstance(FileMatch, null, null, null, null, rawMatch);
 	}
 
 	function aMatch(fileMatch: FileMatch): Match {
-		let match = new Match(fileMatch, 'some match', ++counter, 0, 2);
+		const line = ++counter;
+		const range = {
+			startLineNumber: line,
+			startColumn: 0,
+			endLineNumber: line,
+			endColumn: 2
+		};
+		let match = new Match(fileMatch, {
+			preview: {
+				text: 'some match',
+				match: range
+			},
+			range
+		});
 		fileMatch.add(match);
 		return match;
 	}
diff --git a/src/vs/workbench/parts/search/test/browser/searchViewlet.test.ts b/src/vs/workbench/parts/search/test/browser/searchViewlet.test.ts
index 2c273d2744a..798d4fb6c92 100644
--- a/src/vs/workbench/parts/search/test/browser/searchViewlet.test.ts
+++ b/src/vs/workbench/parts/search/test/browser/searchViewlet.test.ts
@@ -5,11 +5,11 @@
 'use strict';
 
 import * as assert from 'assert';
-import uri from 'vs/base/common/uri';
+import { URI as uri } from 'vs/base/common/uri';
 import { Match, FileMatch, SearchResult } from 'vs/workbench/parts/search/common/searchModel';
 import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
 import { SearchDataSource, SearchSorter } from 'vs/workbench/parts/search/browser/searchResultsView';
-import { IFileMatch, ILineMatch } from 'vs/platform/search/common/search';
+import { IFileMatch, TextSearchResult, OneLineRange, ITextSearchResult } from 'vs/platform/search/common/search';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
 import { ModelServiceImpl } from 'vs/editor/common/services/modelServiceImpl';
@@ -31,9 +31,22 @@ suite('Search - Viewlet', () => {
 		let ds = instantiation.createInstance(SearchDataSource);
 		let result: SearchResult = instantiation.createInstance(SearchResult, null);
 		result.query = { type: 1, folderQueries: [{ folder: uri.parse('file://c:/') }] };
+
+		const range = {
+			startLineNumber: 1,
+			startColumn: 0,
+			endLineNumber: 1,
+			endColumn: 1
+		};
 		result.add([{
 			resource: uri.parse('file:///c:/foo'),
-			lineMatches: [{ lineNumber: 1, preview: 'bar', offsetAndLengths: [[0, 1]] }]
+			matches: [{
+				preview: {
+					text: 'bar',
+					match: range
+				},
+				range
+			}]
 		}]);
 
 		let fileMatch = result.matches()[0];
@@ -41,7 +54,7 @@ suite('Search - Viewlet', () => {
 
 		assert.equal(ds.getId(null, result), 'root');
 		assert.equal(ds.getId(null, fileMatch), 'file:///c%3A/foo');
-		assert.equal(ds.getId(null, lineMatch), 'file:///c%3A/foo>1>0b');
+		assert.equal(ds.getId(null, lineMatch), 'file:///c%3A/foo>[2,1 -> 2,2]b');
 
 		assert(!ds.hasChildren(null, 'foo'));
 		assert(ds.hasChildren(null, result));
@@ -53,9 +66,9 @@ suite('Search - Viewlet', () => {
 		let fileMatch1 = aFileMatch('C:\\foo');
 		let fileMatch2 = aFileMatch('C:\\with\\path');
 		let fileMatch3 = aFileMatch('C:\\with\\path\\foo');
-		let lineMatch1 = new Match(fileMatch1, 'bar', 1, 1, 1);
-		let lineMatch2 = new Match(fileMatch1, 'bar', 2, 1, 1);
-		let lineMatch3 = new Match(fileMatch1, 'bar', 2, 1, 1);
+		let lineMatch1 = new Match(fileMatch1, new TextSearchResult('bar', new OneLineRange(0, 1, 1)));
+		let lineMatch2 = new Match(fileMatch1, new TextSearchResult('bar', new OneLineRange(2, 1, 1)));
+		let lineMatch3 = new Match(fileMatch1, new TextSearchResult('bar', new OneLineRange(2, 1, 1)));
 
 		let s = new SearchSorter();
 
@@ -69,16 +82,16 @@ suite('Search - Viewlet', () => {
 		assert(s.compare(null, lineMatch2, lineMatch3) === 0);
 	});
 
-	function aFileMatch(path: string, searchResult?: SearchResult, ...lineMatches: ILineMatch[]): FileMatch {
+	function aFileMatch(path: string, searchResult?: SearchResult, ...lineMatches: ITextSearchResult[]): FileMatch {
 		let rawMatch: IFileMatch = {
 			resource: uri.file('C:\\' + path),
-			lineMatches: lineMatches
+			matches: lineMatches
 		};
-		return instantiation.createInstance(FileMatch, null, null, searchResult, rawMatch);
+		return instantiation.createInstance(FileMatch, null, null, null, searchResult, rawMatch);
 	}
 
 	function stubModelService(instantiationService: TestInstantiationService): IModelService {
 		instantiationService.stub(IConfigurationService, new TestConfigurationService());
 		return instantiationService.createInstance(ModelServiceImpl);
 	}
-});
\ No newline at end of file
+});
diff --git a/src/vs/workbench/parts/search/test/common/queryBuilder.test.ts b/src/vs/workbench/parts/search/test/common/queryBuilder.test.ts
index c11c6994b96..efdacfc6d06 100644
--- a/src/vs/workbench/parts/search/test/common/queryBuilder.test.ts
+++ b/src/vs/workbench/parts/search/test/common/queryBuilder.test.ts
@@ -7,7 +7,7 @@
 import * as assert from 'assert';
 import { IExpression } from 'vs/base/common/glob';
 import * as paths from 'vs/base/common/paths';
-import uri from 'vs/base/common/uri';
+import { URI as uri } from 'vs/base/common/uri';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
@@ -17,6 +17,7 @@ import { IWorkspaceContextService, toWorkspaceFolders, Workspace } from 'vs/plat
 import { ISearchPathsResult, QueryBuilder } from 'vs/workbench/parts/search/common/queryBuilder';
 import { TestContextService, TestEnvironmentService } from 'vs/workbench/test/workbenchTestServices';
 
+const DEFAULT_EDITOR_CONFIG = {};
 const DEFAULT_USER_CONFIG = { useRipgrep: true, useIgnoreFiles: true };
 const DEFAULT_QUERY_PROPS = { useRipgrep: true, disregardIgnoreFiles: false };
 
@@ -36,10 +37,11 @@ suite('QueryBuilder', () => {
 
 		mockConfigService = new TestConfigurationService();
 		mockConfigService.setUserConfiguration('search', DEFAULT_USER_CONFIG);
+		mockConfigService.setUserConfiguration('editor', DEFAULT_EDITOR_CONFIG);
 		instantiationService.stub(IConfigurationService, mockConfigService);
 
 		mockContextService = new TestContextService();
-		mockWorkspace = new Workspace('workspace', 'workspace', toWorkspaceFolders([{ path: ROOT_1_URI.fsPath }]));
+		mockWorkspace = new Workspace('workspace', toWorkspaceFolders([{ path: ROOT_1_URI.fsPath }]));
 		mockContextService.setWorkspace(mockWorkspace);
 
 		instantiationService.stub(IWorkspaceContextService, mockContextService);
@@ -233,6 +235,21 @@ suite('QueryBuilder', () => {
 			});
 	});
 
+	test('file pattern trimming', () => {
+		const content = 'content';
+		assertEqualQueries(
+			queryBuilder.text(
+				PATTERN_INFO,
+				undefined,
+				{ filePattern: ` ${content} ` }
+			),
+			<ISearchQuery>{
+				contentPattern: PATTERN_INFO,
+				filePattern: content,
+				type: QueryType.Text
+			});
+	});
+
 	test('exclude ./ syntax', () => {
 		assertEqualQueries(
 			queryBuilder.text(
diff --git a/src/vs/workbench/parts/search/test/common/searchModel.test.ts b/src/vs/workbench/parts/search/test/common/searchModel.test.ts
index ae9d4349c90..3e7e4f5ca12 100644
--- a/src/vs/workbench/parts/search/test/common/searchModel.test.ts
+++ b/src/vs/workbench/parts/search/test/common/searchModel.test.ts
@@ -6,20 +6,21 @@
 
 import * as assert from 'assert';
 import * as sinon from 'sinon';
-import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import { DeferredPPromise } from 'vs/base/test/common/utils';
-import { PPromise } from 'vs/base/common/winjs.base';
-import { SearchModel } from 'vs/workbench/parts/search/common/searchModel';
-import URI from 'vs/base/common/uri';
-import { IFileMatch, IFolderQuery, ILineMatch, ISearchService, ISearchComplete, ISearchProgressItem, IUncachedSearchStats } from 'vs/platform/search/common/search';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { NullTelemetryService } from 'vs/platform/telemetry/common/telemetryUtils';
+import { timeout } from 'vs/base/common/async';
+import { URI } from 'vs/base/common/uri';
+import { TPromise } from 'vs/base/common/winjs.base';
+import { DeferredTPromise } from 'vs/base/test/common/utils';
 import { Range } from 'vs/editor/common/core/range';
 import { IModelService } from 'vs/editor/common/services/modelService';
+import { ModelServiceImpl } from 'vs/editor/common/services/modelServiceImpl';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
-import { ModelServiceImpl } from 'vs/editor/common/services/modelServiceImpl';
-import { timeout } from 'vs/base/common/async';
+import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
+import { IFileMatch, IFileSearchStats, IFolderQuery, ISearchComplete, ISearchProgressItem, ISearchQuery, ISearchService, ITextSearchResult, TextSearchResult, OneLineRange } from 'vs/platform/search/common/search';
+import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
+import { NullTelemetryService } from 'vs/platform/telemetry/common/telemetryUtils';
+import { SearchModel } from 'vs/workbench/parts/search/common/searchModel';
+import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
 
 const nullEvent = new class {
 
@@ -41,21 +42,25 @@ const nullEvent = new class {
 	}
 };
 
+const lineOneRange = new OneLineRange(1, 0, 1);
 
 suite('SearchModel', () => {
 
 	let instantiationService: TestInstantiationService;
 	let restoreStubs: sinon.SinonStub[];
 
-	const testSearchStats: IUncachedSearchStats = {
+	const testSearchStats: IFileSearchStats = {
 		fromCache: false,
-		resultCount: 4,
-		traversal: 'node',
-		errors: [],
-		fileWalkStartTime: 0,
-		fileWalkResultTime: 1,
-		directoriesWalked: 2,
-		filesWalked: 3
+		resultCount: 1,
+		type: 'searchProcess',
+		detailStats: {
+			traversal: 'node',
+			fileWalkTime: 0,
+			cmdTime: 0,
+			cmdResultCount: 0,
+			directoriesWalked: 2,
+			filesWalked: 3
+		}
 	};
 
 	const folderQueries: IFolderQuery[] = [
@@ -68,7 +73,7 @@ suite('SearchModel', () => {
 		instantiationService.stub(ITelemetryService, NullTelemetryService);
 		instantiationService.stub(IModelService, stubModelService(instantiationService));
 		instantiationService.stub(ISearchService, {});
-		instantiationService.stub(ISearchService, 'search', PPromise.as({ results: [] }));
+		instantiationService.stub(ISearchService, 'search', TPromise.as({ results: [] }));
 	});
 
 	teardown(() => {
@@ -77,18 +82,52 @@ suite('SearchModel', () => {
 		});
 	});
 
-	function ppromiseWithProgress(results: IFileMatch[]): () => PPromise<any, IFileMatch> {
-		return () => new PPromise((resolve, reject, progress) => {
-			process.nextTick(() => {
-				results.forEach(progress);
-				resolve(null);
-			});
-		});
+	function searchServiceWithResults(results: IFileMatch[], complete: ISearchComplete = null): ISearchService {
+		return <ISearchService>{
+			search(query: ISearchQuery, token?: CancellationToken, onProgress?: (result: ISearchProgressItem) => void): TPromise<ISearchComplete> {
+				return new TPromise(resolve => {
+					process.nextTick(() => {
+						results.forEach(onProgress);
+						resolve(complete);
+					});
+				});
+			}
+		};
+	}
+
+	function searchServiceWithError(error: Error): ISearchService {
+		return <ISearchService>{
+			search(query: ISearchQuery, token?: CancellationToken, onProgress?: (result: ISearchProgressItem) => void): TPromise<ISearchComplete> {
+				return new TPromise((resolve, reject) => {
+					reject(error);
+				});
+			}
+		};
+	}
+
+	function canceleableSearchService(tokenSource: CancellationTokenSource): ISearchService {
+		return <ISearchService>{
+			search(query: ISearchQuery, token?: CancellationToken, onProgress?: (result: ISearchProgressItem) => void): TPromise<ISearchComplete> {
+				if (token) {
+					token.onCancellationRequested(() => tokenSource.cancel());
+				}
+
+				return new TPromise(resolve => {
+					process.nextTick(() => {
+						resolve(<any>{});
+					});
+				});
+			}
+		};
 	}
 
 	test('Search Model: Search adds to results', async () => {
-		let results = [aRawMatch('file://c:/1', aLineMatch('preview 1', 1, [[1, 3], [4, 7]])), aRawMatch('file://c:/2', aLineMatch('preview 2'))];
-		instantiationService.stub(ISearchService, 'search', ppromiseWithProgress(results));
+		let results = [
+			aRawMatch('file://c:/1',
+				new TextSearchResult('preview 1', new OneLineRange(1, 1, 4)),
+				new TextSearchResult('preview 1', new OneLineRange(1, 4, 11))),
+			aRawMatch('file://c:/2', new TextSearchResult('preview 2', lineOneRange))];
+		instantiationService.stub(ISearchService, searchServiceWithResults(results));
 
 		let testObject: SearchModel = instantiationService.createInstance(SearchModel);
 		await testObject.search({ contentPattern: { pattern: 'somestring' }, type: 1, folderQueries });
@@ -113,10 +152,15 @@ suite('SearchModel', () => {
 
 	test('Search Model: Search reports telemetry on search completed', async () => {
 		let target = instantiationService.spy(ITelemetryService, 'publicLog');
-		let results = [aRawMatch('file://c:/1', aLineMatch('preview 1', 1, [[1, 3], [4, 7]])), aRawMatch('file://c:/2', aLineMatch('preview 2'))];
-		instantiationService.stub(ISearchService, 'search', ppromiseWithProgress(results));
+		let results = [
+			aRawMatch('file://c:/1',
+				new TextSearchResult('preview 1', new OneLineRange(1, 1, 4)),
+				new TextSearchResult('preview 1', new OneLineRange(1, 4, 11))),
+			aRawMatch('file://c:/2',
+				new TextSearchResult('preview 2', lineOneRange))];
+		instantiationService.stub(ISearchService, searchServiceWithResults(results));
 
-		let testObject = instantiationService.createInstance(SearchModel);
+		let testObject: SearchModel = instantiationService.createInstance(SearchModel);
 		await testObject.search({ contentPattern: { pattern: 'somestring' }, type: 1, folderQueries });
 
 		assert.ok(target.calledThrice);
@@ -131,7 +175,7 @@ suite('SearchModel', () => {
 		let target1 = sinon.stub().returns(nullEvent);
 		instantiationService.stub(ITelemetryService, 'publicLog', target1);
 
-		instantiationService.stub(ISearchService, 'search', ppromiseWithProgress([]));
+		instantiationService.stub(ISearchService, searchServiceWithResults([]));
 
 		let testObject = instantiationService.createInstance(SearchModel);
 		const result = testObject.search({ contentPattern: { pattern: 'somestring' }, type: 1, folderQueries });
@@ -150,17 +194,17 @@ suite('SearchModel', () => {
 		let target1 = sinon.stub().returns(nullEvent);
 		instantiationService.stub(ITelemetryService, 'publicLog', target1);
 
-		let promise = new DeferredPPromise<ISearchComplete, ISearchProgressItem>();
-		instantiationService.stub(ISearchService, 'search', promise);
+		instantiationService.stub(ISearchService, searchServiceWithResults(
+			[aRawMatch('file://c:/1', new TextSearchResult('some preview', lineOneRange))],
+			{ results: [], stats: testSearchStats }));
 
 		let testObject = instantiationService.createInstance(SearchModel);
 		let result = testObject.search({ contentPattern: { pattern: 'somestring' }, type: 1, folderQueries });
 
-		promise.progress(aRawMatch('file://c:/1', aLineMatch('some preview')));
-		promise.complete({ results: [], stats: testSearchStats });
-
-		return timeout(1).then(() => {
-			return result.then(() => {
+		return result.then(() => {
+			return timeout(1).then(() => {
+				// timeout because promise handlers may run in a different order. We only care that these
+				// are fired at some point.
 				assert.ok(target1.calledWith('searchResultsFirstRender'));
 				assert.ok(target1.calledWith('searchResultsFinished'));
 				// assert.equal(1, target2.callCount);
@@ -174,14 +218,11 @@ suite('SearchModel', () => {
 		let target1 = sinon.stub().returns(nullEvent);
 		instantiationService.stub(ITelemetryService, 'publicLog', target1);
 
-		let promise = new DeferredPPromise<ISearchComplete, ISearchProgressItem>();
-		instantiationService.stub(ISearchService, 'search', promise);
+		instantiationService.stub(ISearchService, searchServiceWithError(new Error('error')));
 
 		let testObject = instantiationService.createInstance(SearchModel);
 		let result = testObject.search({ contentPattern: { pattern: 'somestring' }, type: 1, folderQueries });
 
-		promise.error('error');
-
 		return timeout(1).then(() => {
 			return result.then(() => { }, () => {
 				assert.ok(target1.calledWith('searchResultsFirstRender'));
@@ -197,7 +238,7 @@ suite('SearchModel', () => {
 		let target1 = sinon.stub().returns(nullEvent);
 		instantiationService.stub(ITelemetryService, 'publicLog', target1);
 
-		let promise = new DeferredPPromise<ISearchComplete, ISearchProgressItem>();
+		let promise = new DeferredTPromise<ISearchComplete>();
 		instantiationService.stub(ISearchService, 'search', promise);
 
 		let testObject = instantiationService.createInstance(SearchModel);
@@ -215,33 +256,41 @@ suite('SearchModel', () => {
 	});
 
 	test('Search Model: Search results are cleared during search', async () => {
-		let results = [aRawMatch('file://c:/1', aLineMatch('preview 1', 1, [[1, 3], [4, 7]])), aRawMatch('file://c:/2', aLineMatch('preview 2'))];
-		instantiationService.stub(ISearchService, 'search', ppromiseWithProgress(results));
+		let results = [
+			aRawMatch('file://c:/1',
+				new TextSearchResult('preview 1', new OneLineRange(1, 1, 4)),
+				new TextSearchResult('preview 1', new OneLineRange(1, 4, 11))),
+			aRawMatch('file://c:/2',
+				new TextSearchResult('preview 2', lineOneRange))];
+		instantiationService.stub(ISearchService, searchServiceWithResults(results));
 		let testObject: SearchModel = instantiationService.createInstance(SearchModel);
 		await testObject.search({ contentPattern: { pattern: 'somestring' }, type: 1, folderQueries });
 		assert.ok(!testObject.searchResult.isEmpty());
 
-		instantiationService.stub(ISearchService, 'search', new DeferredPPromise<ISearchComplete, ISearchProgressItem>());
+		instantiationService.stub(ISearchService, searchServiceWithResults([]));
 
 		testObject.search({ contentPattern: { pattern: 'somestring' }, type: 1, folderQueries });
 		assert.ok(testObject.searchResult.isEmpty());
 	});
 
 	test('Search Model: Previous search is cancelled when new search is called', async () => {
-		let target = sinon.spy();
-		instantiationService.stub(ISearchService, 'search', new DeferredPPromise((c, e, p) => { }, target));
-		let testObject: SearchModel = instantiationService.createInstance(SearchModel);
+		const tokenSource = new CancellationTokenSource();
+		instantiationService.stub(ISearchService, canceleableSearchService(tokenSource));
+		const testObject: SearchModel = instantiationService.createInstance(SearchModel);
 
 		testObject.search({ contentPattern: { pattern: 'somestring' }, type: 1, folderQueries });
-		instantiationService.stub(ISearchService, 'search', new DeferredPPromise<ISearchComplete, ISearchProgressItem>());
+		instantiationService.stub(ISearchService, searchServiceWithResults([]));
 		testObject.search({ contentPattern: { pattern: 'somestring' }, type: 1, folderQueries });
 
-		assert.ok(target.calledOnce);
+		assert.ok(tokenSource.token.isCancellationRequested);
 	});
 
 	test('getReplaceString returns proper replace string for regExpressions', async () => {
-		let results = [aRawMatch('file://c:/1', aLineMatch('preview 1', 1, [[1, 3], [4, 7]]))];
-		instantiationService.stub(ISearchService, 'search', ppromiseWithProgress(results));
+		let results = [
+			aRawMatch('file://c:/1',
+				new TextSearchResult('preview 1', new OneLineRange(1, 1, 4)),
+				new TextSearchResult('preview 1', new OneLineRange(1, 4, 11)))];
+		instantiationService.stub(ISearchService, searchServiceWithResults(results));
 
 		let testObject: SearchModel = instantiationService.createInstance(SearchModel);
 		await testObject.search({ contentPattern: { pattern: 're' }, type: 1, folderQueries });
@@ -267,12 +316,8 @@ suite('SearchModel', () => {
 		assert.equal('helloe', match.replaceString);
 	});
 
-	function aRawMatch(resource: string, ...lineMatches: ILineMatch[]): IFileMatch {
-		return { resource: URI.parse(resource), lineMatches };
-	}
-
-	function aLineMatch(preview: string, lineNumber: number = 1, offsetAndLengths: number[][] = [[0, 1]]): ILineMatch {
-		return { preview, lineNumber, offsetAndLengths };
+	function aRawMatch(resource: string, ...matches: ITextSearchResult[]): IFileMatch {
+		return { resource: URI.parse(resource), matches };
 	}
 
 	function stub(arg1: any, arg2: any, arg3: any): sinon.SinonStub {
diff --git a/src/vs/workbench/parts/search/test/common/searchResult.test.ts b/src/vs/workbench/parts/search/test/common/searchResult.test.ts
index e9f486bc193..a001b34e061 100644
--- a/src/vs/workbench/parts/search/test/common/searchResult.test.ts
+++ b/src/vs/workbench/parts/search/test/common/searchResult.test.ts
@@ -8,8 +8,8 @@ import * as assert from 'assert';
 import * as sinon from 'sinon';
 import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
 import { Match, FileMatch, SearchResult, SearchModel } from 'vs/workbench/parts/search/common/searchModel';
-import URI from 'vs/base/common/uri';
-import { IFileMatch, ILineMatch } from 'vs/platform/search/common/search';
+import { URI } from 'vs/base/common/uri';
+import { IFileMatch, TextSearchResult, OneLineRange, ITextSearchResult } from 'vs/platform/search/common/search';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { NullTelemetryService } from 'vs/platform/telemetry/common/telemetryUtils';
 import { Range } from 'vs/editor/common/core/range';
@@ -19,6 +19,8 @@ import { ModelServiceImpl } from 'vs/editor/common/services/modelServiceImpl';
 import { IModelService } from 'vs/editor/common/services/modelService';
 import { IReplaceService } from 'vs/workbench/parts/search/common/replace';
 
+const lineOneRange = new OneLineRange(1, 0, 1);
+
 suite('SearchResult', () => {
 
 	let instantiationService: TestInstantiationService;
@@ -33,21 +35,17 @@ suite('SearchResult', () => {
 
 	test('Line Match', function () {
 		let fileMatch = aFileMatch('folder/file.txt', null);
-		let lineMatch = new Match(fileMatch, 'foo bar', 1, 0, 3);
+		let lineMatch = new Match(fileMatch, new TextSearchResult('foo bar', new OneLineRange(1, 0, 3)));
 		assert.equal(lineMatch.text(), 'foo bar');
 		assert.equal(lineMatch.range().startLineNumber, 2);
 		assert.equal(lineMatch.range().endLineNumber, 2);
 		assert.equal(lineMatch.range().startColumn, 1);
 		assert.equal(lineMatch.range().endColumn, 4);
-		assert.equal('file:///folder/file.txt>1>0foo', lineMatch.id());
+		assert.equal('file:///folder/file.txt>[2,1 -> 2,4]foo', lineMatch.id());
 	});
 
 	test('Line Match - Remove', function () {
-		let fileMatch = aFileMatch('folder/file.txt', aSearchResult(), ...[{
-			preview: 'foo bar',
-			lineNumber: 1,
-			offsetAndLengths: [[0, 3]]
-		}]);
+		let fileMatch = aFileMatch('folder/file.txt', aSearchResult(), new TextSearchResult('foo bar', new OneLineRange(1, 0, 3)));
 		let lineMatch = fileMatch.matches()[0];
 		fileMatch.remove(lineMatch);
 		assert.equal(fileMatch.matches().length, 0);
@@ -66,15 +64,11 @@ suite('SearchResult', () => {
 	});
 
 	test('File Match: Select an existing match', function () {
-		let testObject = aFileMatch('folder/file.txt', aSearchResult(), ...[{
-			preview: 'foo',
-			lineNumber: 1,
-			offsetAndLengths: [[0, 3]]
-		}, {
-			preview: 'bar',
-			lineNumber: 1,
-			offsetAndLengths: [[5, 3]]
-		}]);
+		let testObject = aFileMatch(
+			'folder/file.txt',
+			aSearchResult(),
+			new TextSearchResult('foo', new OneLineRange(1, 0, 3)),
+			new TextSearchResult('bar', new OneLineRange(1, 5, 3)));
 
 		testObject.setSelectedMatch(testObject.matches()[0]);
 
@@ -82,15 +76,11 @@ suite('SearchResult', () => {
 	});
 
 	test('File Match: Select non existing match', function () {
-		let testObject = aFileMatch('folder/file.txt', aSearchResult(), ...[{
-			preview: 'foo',
-			lineNumber: 1,
-			offsetAndLengths: [[0, 3]]
-		}, {
-			preview: 'bar',
-			lineNumber: 1,
-			offsetAndLengths: [[5, 3]]
-		}]);
+		let testObject = aFileMatch(
+			'folder/file.txt',
+			aSearchResult(),
+			new TextSearchResult('foo', new OneLineRange(1, 0, 3)),
+			new TextSearchResult('bar', new OneLineRange(1, 5, 3)));
 		let target = testObject.matches()[0];
 		testObject.remove(target);
 
@@ -100,15 +90,11 @@ suite('SearchResult', () => {
 	});
 
 	test('File Match: isSelected return true for selected match', function () {
-		let testObject = aFileMatch('folder/file.txt', aSearchResult(), ...[{
-			preview: 'foo',
-			lineNumber: 1,
-			offsetAndLengths: [[0, 3]]
-		}, {
-			preview: 'bar',
-			lineNumber: 1,
-			offsetAndLengths: [[5, 3]]
-		}]);
+		let testObject = aFileMatch(
+			'folder/file.txt',
+			aSearchResult(),
+			new TextSearchResult('foo', new OneLineRange(1, 0, 3)),
+			new TextSearchResult('bar', new OneLineRange(1, 5, 3)));
 		let target = testObject.matches()[0];
 		testObject.setSelectedMatch(target);
 
@@ -116,32 +102,20 @@ suite('SearchResult', () => {
 	});
 
 	test('File Match: isSelected return false for un-selected match', function () {
-		let testObject = aFileMatch('folder/file.txt', aSearchResult(), ...[{
-			preview: 'foo',
-			lineNumber: 1,
-			offsetAndLengths: [[0, 3]]
-		}, {
-			preview: 'bar',
-			lineNumber: 1,
-			offsetAndLengths: [[5, 3]]
-		}]);
-
+		let testObject = aFileMatch('folder/file.txt',
+			aSearchResult(),
+			new TextSearchResult('foo', new OneLineRange(1, 0, 3)),
+			new TextSearchResult('bar', new OneLineRange(1, 5, 3)));
 		testObject.setSelectedMatch(testObject.matches()[0]);
-
 		assert.ok(!testObject.isMatchSelected(testObject.matches()[1]));
 	});
 
 	test('File Match: unselect', function () {
-		let testObject = aFileMatch('folder/file.txt', aSearchResult(), ...[{
-			preview: 'foo',
-			lineNumber: 1,
-			offsetAndLengths: [[0, 3]]
-		}, {
-			preview: 'bar',
-			lineNumber: 1,
-			offsetAndLengths: [[5, 3]]
-		}]);
-
+		let testObject = aFileMatch(
+			'folder/file.txt',
+			aSearchResult(),
+			new TextSearchResult('foo', new OneLineRange(1, 0, 3)),
+			new TextSearchResult('bar', new OneLineRange(1, 5, 3)));
 		testObject.setSelectedMatch(testObject.matches()[0]);
 		testObject.setSelectedMatch(null);
 
@@ -149,16 +123,11 @@ suite('SearchResult', () => {
 	});
 
 	test('File Match: unselect when not selected', function () {
-		let testObject = aFileMatch('folder/file.txt', aSearchResult(), ...[{
-			preview: 'foo',
-			lineNumber: 1,
-			offsetAndLengths: [[0, 3]]
-		}, {
-			preview: 'bar',
-			lineNumber: 1,
-			offsetAndLengths: [[5, 3]]
-		}]);
-
+		let testObject = aFileMatch(
+			'folder/file.txt',
+			aSearchResult(),
+			new TextSearchResult('foo', new OneLineRange(1, 0, 3)),
+			new TextSearchResult('bar', new OneLineRange(1, 5, 3)));
 		testObject.setSelectedMatch(null);
 
 		assert.equal(null, testObject.getSelectedMatch());
@@ -167,7 +136,7 @@ suite('SearchResult', () => {
 	test('Alle Drei Zusammen', function () {
 		let searchResult = instantiationService.createInstance(SearchResult, null);
 		let fileMatch = aFileMatch('far/boo', searchResult);
-		let lineMatch = new Match(fileMatch, 'foo bar', 1, 0, 3);
+		let lineMatch = new Match(fileMatch, new TextSearchResult('foo bar', new OneLineRange(1, 0, 3)));
 
 		assert(lineMatch.parent() === fileMatch);
 		assert(fileMatch.parent() === searchResult);
@@ -175,7 +144,10 @@ suite('SearchResult', () => {
 
 	test('Adding a raw match will add a file match with line matches', function () {
 		let testObject = aSearchResult();
-		let target = [aRawMatch('file://c:/', aLineMatch('preview 1', 1, [[1, 3], [4, 7]]), aLineMatch('preview 2'))];
+		let target = [aRawMatch('file://c:/',
+			new TextSearchResult('preview 1', new OneLineRange(1, 1, 4)),
+			new TextSearchResult('preview 1', new OneLineRange(1, 4, 11)),
+			new TextSearchResult('preview 2', lineOneRange))];
 
 		testObject.add(target);
 
@@ -200,7 +172,12 @@ suite('SearchResult', () => {
 
 	test('Adding multiple raw matches', function () {
 		let testObject = aSearchResult();
-		let target = [aRawMatch('file://c:/1', aLineMatch('preview 1', 1, [[1, 3], [4, 7]])), aRawMatch('file://c:/2', aLineMatch('preview 2'))];
+		let target = [
+			aRawMatch('file://c:/1',
+				new TextSearchResult('preview 1', new OneLineRange(1, 1, 4)),
+				new TextSearchResult('preview 1', new OneLineRange(1, 4, 11))),
+			aRawMatch('file://c:/2',
+				new TextSearchResult('preview 2', lineOneRange))];
 
 		testObject.add(target);
 
@@ -228,7 +205,11 @@ suite('SearchResult', () => {
 		let target2 = sinon.spy();
 
 		let testObject = aSearchResult();
-		testObject.add([aRawMatch('file://c:/1', aLineMatch('preview 1')), aRawMatch('file://c:/2', aLineMatch('preview 2'))]);
+		testObject.add([
+			aRawMatch('file://c:/1',
+				new TextSearchResult('preview 1', lineOneRange)),
+			aRawMatch('file://c:/2',
+				new TextSearchResult('preview 2', lineOneRange))]);
 
 		testObject.matches()[0].onDispose(target1);
 		testObject.matches()[1].onDispose(target2);
@@ -243,7 +224,9 @@ suite('SearchResult', () => {
 	test('remove triggers change event', function () {
 		let target = sinon.spy();
 		let testObject = aSearchResult();
-		testObject.add([aRawMatch('file://c:/1', aLineMatch('preview 1'))]);
+		testObject.add([
+			aRawMatch('file://c:/1',
+				new TextSearchResult('preview 1', lineOneRange))]);
 		let objectRoRemove = testObject.matches()[0];
 		testObject.onChange(target);
 
@@ -256,7 +239,9 @@ suite('SearchResult', () => {
 	test('remove triggers change event', function () {
 		let target = sinon.spy();
 		let testObject = aSearchResult();
-		testObject.add([aRawMatch('file://c:/1', aLineMatch('preview 1'))]);
+		testObject.add([
+			aRawMatch('file://c:/1',
+				new TextSearchResult('preview 1', lineOneRange))]);
 		let objectRoRemove = testObject.matches()[0];
 		testObject.onChange(target);
 
@@ -268,7 +253,9 @@ suite('SearchResult', () => {
 
 	test('Removing all line matches and adding back will add file back to result', function () {
 		let testObject = aSearchResult();
-		testObject.add([aRawMatch('file://c:/1', aLineMatch('preview 1'))]);
+		testObject.add([
+			aRawMatch('file://c:/1',
+				new TextSearchResult('preview 1', lineOneRange))]);
 		let target = testObject.matches()[0];
 		let matchToRemove = target.matches()[0];
 		target.remove(matchToRemove);
@@ -283,7 +270,9 @@ suite('SearchResult', () => {
 	test('replace should remove the file match', function () {
 		instantiationService.stubPromise(IReplaceService, 'replace', null);
 		let testObject = aSearchResult();
-		testObject.add([aRawMatch('file://c:/1', aLineMatch('preview 1'))]);
+		testObject.add([
+			aRawMatch('file://c:/1',
+				new TextSearchResult('preview 1', lineOneRange))]);
 
 		testObject.replace(testObject.matches()[0]);
 
@@ -294,7 +283,9 @@ suite('SearchResult', () => {
 		let target = sinon.spy();
 		instantiationService.stubPromise(IReplaceService, 'replace', null);
 		let testObject = aSearchResult();
-		testObject.add([aRawMatch('file://c:/1', aLineMatch('preview 1'))]);
+		testObject.add([
+			aRawMatch('file://c:/1',
+				new TextSearchResult('preview 1', lineOneRange))]);
 		testObject.onChange(target);
 		let objectRoRemove = testObject.matches()[0];
 
@@ -307,7 +298,11 @@ suite('SearchResult', () => {
 	test('replaceAll should remove all file matches', function () {
 		instantiationService.stubPromise(IReplaceService, 'replace', null);
 		let testObject = aSearchResult();
-		testObject.add([aRawMatch('file://c:/1', aLineMatch('preview 1')), aRawMatch('file://c:/2', aLineMatch('preview 2'))]);
+		testObject.add([
+			aRawMatch('file://c:/1',
+				new TextSearchResult('preview 1', lineOneRange)),
+			aRawMatch('file://c:/2',
+				new TextSearchResult('preview 2', lineOneRange))]);
 
 		testObject.replaceAll(null);
 
@@ -358,12 +353,12 @@ suite('SearchResult', () => {
 	//    lineHasNoDecoration(oneModel, 2);
 	//});
 
-	function aFileMatch(path: string, searchResult?: SearchResult, ...lineMatches: ILineMatch[]): FileMatch {
+	function aFileMatch(path: string, searchResult?: SearchResult, ...lineMatches: ITextSearchResult[]): FileMatch {
 		let rawMatch: IFileMatch = {
 			resource: URI.file('/' + path),
-			lineMatches: lineMatches
+			matches: lineMatches
 		};
-		return instantiationService.createInstance(FileMatch, null, null, searchResult, rawMatch);
+		return instantiationService.createInstance(FileMatch, null, null, null, searchResult, rawMatch);
 	}
 
 	function aSearchResult(): SearchResult {
@@ -372,12 +367,8 @@ suite('SearchResult', () => {
 		return searchModel.searchResult;
 	}
 
-	function aRawMatch(resource: string, ...lineMatches: ILineMatch[]): IFileMatch {
-		return { resource: URI.parse(resource), lineMatches };
-	}
-
-	function aLineMatch(preview: string, lineNumber: number = 1, offsetAndLengths: number[][] = [[0, 1]]): ILineMatch {
-		return { preview, lineNumber, offsetAndLengths };
+	function aRawMatch(resource: string, ...matches: ITextSearchResult[]): IFileMatch {
+		return { resource: URI.parse(resource), matches };
 	}
 
 	function stubModelService(instantiationService: TestInstantiationService): IModelService {
diff --git a/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.ts b/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.ts
index 46cacc7d9aa..61dcf49479a 100644
--- a/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.ts
+++ b/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.ts
@@ -9,15 +9,15 @@ import { CommandsRegistry } from 'vs/platform/commands/common/commands';
 import { writeFile, exists } from 'vs/base/node/pfs';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { IModeService } from 'vs/editor/common/services/modeService';
-import { IQuickOpenService, IPickOpenEntry } from 'vs/platform/quickOpen/common/quickOpen';
 import { IWindowService } from 'vs/platform/windows/common/windows';
 import { join, basename, dirname, extname } from 'path';
 import { MenuRegistry, MenuId } from 'vs/platform/actions/common/actions';
 import { timeout } from 'vs/base/common/async';
 import { IOpenerService } from 'vs/platform/opener/common/opener';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { ISnippetsService } from 'vs/workbench/parts/snippets/electron-browser/snippets.contribution';
 import { values } from 'vs/base/common/map';
+import { IQuickPickItem, IQuickInputService, QuickPickInput } from 'vs/platform/quickinput/common/quickInput';
 
 const id = 'workbench.action.openSnippets';
 
@@ -27,7 +27,7 @@ namespace ISnippetPick {
 	}
 }
 
-interface ISnippetPick extends IPickOpenEntry {
+interface ISnippetPick extends IQuickPickItem {
 	filepath: string;
 	hint?: true;
 }
@@ -65,8 +65,8 @@ async function computePicks(snippetService: ISnippetsService, envService: IEnvir
 			}
 
 			existing.push({
-				label: basename(file.filepath),
-				filepath: file.filepath,
+				label: basename(file.location.fsPath),
+				filepath: file.location.fsPath,
 				description: names.size === 0
 					? nls.localize('global.scope', "(global)")
 					: nls.localize('global.1', "({0})", values(names).join(', '))
@@ -74,11 +74,11 @@ async function computePicks(snippetService: ISnippetsService, envService: IEnvir
 
 		} else {
 			// language snippet
-			const mode = basename(file.filepath, '.json');
+			const mode = basename(file.location.fsPath, '.json');
 			existing.push({
-				label: basename(file.filepath),
+				label: basename(file.location.fsPath),
 				description: `(${modeService.getLanguageName(mode)})`,
-				filepath: file.filepath
+				filepath: file.location.fsPath
 			});
 			seen.add(mode);
 		}
@@ -179,22 +179,23 @@ async function createLanguageSnippetFile(pick: ISnippetPick) {
 CommandsRegistry.registerCommand(id, async accessor => {
 
 	const snippetService = accessor.get(ISnippetsService);
-	const quickOpenService = accessor.get(IQuickOpenService);
+	const quickInputService = accessor.get(IQuickInputService);
 	const opener = accessor.get(IOpenerService);
 	const windowService = accessor.get(IWindowService);
 	const modeService = accessor.get(IModeService);
 	const envService = accessor.get(IEnvironmentService);
 
-	const { existing, future } = await computePicks(snippetService, envService, modeService);
-	const newGlobalPick = <IPickOpenEntry>{ label: nls.localize('new.global', "New Global Snippets file...") };
+	const picks = await computePicks(snippetService, envService, modeService);
+	const existing: QuickPickInput[] = picks.existing;
+	const newGlobalPick = <IQuickPickItem>{ label: nls.localize('new.global', "New Global Snippets file...") };
 	if (existing.length > 0) {
-		existing[0].separator = { label: nls.localize('group.global', "Existing Snippets") };
-		newGlobalPick.separator = { border: true, label: nls.localize('new.global.sep', "New Snippets") };
+		existing.unshift({ type: 'separator', label: nls.localize('group.global', "Existing Snippets") });
+		existing.push({ type: 'separator', label: nls.localize('new.global.sep', "New Snippets") });
 	} else {
-		newGlobalPick.separator = { label: nls.localize('new.global.sep', "New Snippets") };
+		existing.push({ type: 'separator', label: nls.localize('new.global.sep', "New Snippets") });
 	}
 
-	const pick = await quickOpenService.pick(<(IPickOpenEntry | ISnippetPick)[]>[].concat(existing, newGlobalPick, future), {
+	const pick = await quickInputService.pick(<(IQuickPickItem | ISnippetPick)[]>[].concat(existing, newGlobalPick, picks.future), {
 		placeHolder: nls.localize('openSnippet.pickLanguage', "Select Snippets File or Create Snippets"),
 		matchOnDescription: true
 	});
@@ -217,3 +218,12 @@ MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
 		category: nls.localize('preferences', "Preferences")
 	}
 });
+
+MenuRegistry.appendMenuItem(MenuId.MenubarPreferencesMenu, {
+	group: '3_snippets',
+	command: {
+		id,
+		title: nls.localize({ key: 'miOpenSnippets', comment: ['&& denotes a mnemonic'] }, "User &&Snippets")
+	},
+	order: 1
+});
diff --git a/src/vs/workbench/parts/snippets/electron-browser/insertSnippet.ts b/src/vs/workbench/parts/snippets/electron-browser/insertSnippet.ts
index 581e4854c2f..57b29e05e18 100644
--- a/src/vs/workbench/parts/snippets/electron-browser/insertSnippet.ts
+++ b/src/vs/workbench/parts/snippets/electron-browser/insertSnippet.ts
@@ -5,9 +5,7 @@
 'use strict';
 
 import * as nls from 'vs/nls';
-import { TPromise } from 'vs/base/common/winjs.base';
 import { registerEditorAction, ServicesAccessor, EditorAction } from 'vs/editor/browser/editorExtensions';
-import { IQuickOpenService, IPickOpenEntry } from 'vs/platform/quickOpen/common/quickOpen';
 import { IModeService } from 'vs/editor/common/services/modeService';
 import { LanguageId } from 'vs/editor/common/modes';
 import { ICommandService, CommandsRegistry } from 'vs/platform/commands/common/commands';
@@ -16,8 +14,9 @@ import { SnippetController2 } from 'vs/editor/contrib/snippet/snippetController2
 import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
 import { Snippet } from 'vs/workbench/parts/snippets/electron-browser/snippetsFile';
+import { IQuickPickItem, IQuickInputService, QuickPickInput } from 'vs/platform/quickinput/common/quickInput';
 
-interface ISnippetPick extends IPickOpenEntry {
+interface ISnippetPick extends IQuickPickItem {
 	snippet: Snippet;
 }
 
@@ -63,7 +62,7 @@ class InsertSnippetAction extends EditorAction {
 		});
 	}
 
-	public run(accessor: ServicesAccessor, editor: ICodeEditor, arg: any): TPromise<void> {
+	public run(accessor: ServicesAccessor, editor: ICodeEditor, arg: any): Promise<void> {
 		const modeService = accessor.get(IModeService);
 		const snippetService = accessor.get(ISnippetsService);
 
@@ -71,11 +70,11 @@ class InsertSnippetAction extends EditorAction {
 			return undefined;
 		}
 
-		const quickOpenService = accessor.get(IQuickOpenService);
+		const quickInputService = accessor.get(IQuickInputService);
 		const { lineNumber, column } = editor.getPosition();
 		let { snippet, name, langId } = Args.fromUser(arg);
 
-		return new TPromise<Snippet>(async (resolve, reject) => {
+		return new Promise<Snippet>(async (resolve, reject) => {
 
 			if (snippet) {
 				return resolve(new Snippet(
@@ -116,7 +115,7 @@ class InsertSnippetAction extends EditorAction {
 			} else {
 				// let user pick a snippet
 				const snippets = (await snippetService.getSnippets(languageId)).sort(Snippet.compare);
-				const picks: ISnippetPick[] = [];
+				const picks: QuickPickInput<ISnippetPick>[] = [];
 				let prevSnippet: Snippet;
 				for (const snippet of snippets) {
 					const pick: ISnippetPick = {
@@ -125,14 +124,14 @@ class InsertSnippetAction extends EditorAction {
 						snippet
 					};
 					if (!snippet.isFromExtension && !prevSnippet) {
-						pick.separator = { label: nls.localize('sep.userSnippet', "User Snippets") };
+						picks.push({ type: 'separator', label: nls.localize('sep.userSnippet', "User Snippets") });
 					} else if (snippet.isFromExtension && (!prevSnippet || !prevSnippet.isFromExtension)) {
-						pick.separator = { label: nls.localize('sep.extSnippet', "Extension Snippets") };
+						picks.push({ type: 'separator', label: nls.localize('sep.extSnippet', "Extension Snippets") });
 					}
 					picks.push(pick);
 					prevSnippet = snippet;
 				}
-				return quickOpenService.pick(picks, { matchOnDetail: true }).then(pick => resolve(pick && pick.snippet), reject);
+				return quickInputService.pick(picks, { matchOnDetail: true }).then(pick => resolve(pick && pick.snippet), reject);
 			}
 		}).then(snippet => {
 			if (snippet) {
diff --git a/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.ts b/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.ts
index ad5dd186af1..a22a19668a2 100644
--- a/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.ts
+++ b/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.ts
@@ -9,17 +9,20 @@ import { parse as jsonParse } from 'vs/base/common/json';
 import { forEach } from 'vs/base/common/collections';
 import { IExtensionDescription } from 'vs/workbench/services/extensions/common/extensions';
 import { localize } from 'vs/nls';
-import { readFile } from 'vs/base/node/pfs';
 import { basename, extname } from 'path';
 import { SnippetParser, Variable, Placeholder, Text } from 'vs/editor/contrib/snippet/snippetParser';
 import { KnownSnippetVariableNames } from 'vs/editor/contrib/snippet/snippetVariables';
 import { isFalsyOrWhitespace } from 'vs/base/common/strings';
+import { URI } from 'vs/base/common/uri';
+import { IFileService } from 'vs/platform/files/common/files';
 
 export class Snippet {
 
 	private _codeSnippet: string;
 	private _isBogous: boolean;
 
+	readonly prefixLow: string;
+
 	constructor(
 		readonly scopes: string[],
 		readonly name: string,
@@ -30,6 +33,7 @@ export class Snippet {
 		readonly isFromExtension?: boolean,
 	) {
 		//
+		this.prefixLow = prefix ? prefix.toLowerCase() : prefix;
 	}
 
 	get codeSnippet(): string {
@@ -140,11 +144,12 @@ export class SnippetFile {
 	private _loadPromise: Promise<this>;
 
 	constructor(
-		readonly filepath: string,
+		readonly location: URI,
 		readonly defaultScopes: string[],
-		private readonly _extension: IExtensionDescription
+		private readonly _extension: IExtensionDescription,
+		private readonly _fileService: IFileService
 	) {
-		this.isGlobalSnippets = extname(filepath) === '.code-snippets';
+		this.isGlobalSnippets = extname(location.path) === '.code-snippets';
 		this.isUserSnippets = !this._extension;
 	}
 
@@ -158,7 +163,7 @@ export class SnippetFile {
 
 	private _filepathSelect(selector: string, bucket: Snippet[]): void {
 		// for `fooLang.json` files all snippets are accepted
-		if (selector === basename(this.filepath, '.json')) {
+		if (selector === basename(this.location.path, '.json')) {
 			bucket.push(...this.data);
 		}
 	}
@@ -190,8 +195,8 @@ export class SnippetFile {
 
 	load(): Promise<this> {
 		if (!this._loadPromise) {
-			this._loadPromise = Promise.resolve(readFile(this.filepath)).then(value => {
-				const data = <JsonSerializedSnippets>jsonParse(value.toString());
+			this._loadPromise = Promise.resolve(this._fileService.resolveContent(this.location, { encoding: 'utf8' })).then(content => {
+				const data = <JsonSerializedSnippets>jsonParse(content.value.toString());
 				if (typeof data === 'object') {
 					forEach(data, entry => {
 						const { key: name, value: scopeOrTemplate } = entry;
diff --git a/src/vs/workbench/parts/snippets/electron-browser/snippetsService.ts b/src/vs/workbench/parts/snippets/electron-browser/snippetsService.ts
index 7222ae708a2..d7e52f8df9b 100644
--- a/src/vs/workbench/parts/snippets/electron-browser/snippetsService.ts
+++ b/src/vs/workbench/parts/snippets/electron-browser/snippetsService.ts
@@ -4,30 +4,33 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import { localize } from 'vs/nls';
-import { ITextModel } from 'vs/editor/common/model';
-import { ISuggestSupport, ISuggestResult, ISuggestion, LanguageId, SuggestionType, SnippetType } from 'vs/editor/common/modes';
-import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { setSnippetSuggestSupport } from 'vs/editor/contrib/suggest/suggest';
-import { IModeService } from 'vs/editor/common/services/modeService';
-import { Position } from 'vs/editor/common/core/position';
-import { overlap, compare, startsWith, isFalsyOrWhitespace, endsWith } from 'vs/base/common/strings';
-import { SnippetParser } from 'vs/editor/contrib/snippet/snippetParser';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
-import { join, basename, extname } from 'path';
-import { mkdirp, readdir, exists } from 'vs/base/node/pfs';
-import { watch } from 'vs/base/node/extfs';
-import { SnippetFile, Snippet } from 'vs/workbench/parts/snippets/electron-browser/snippetsFile';
-import { ISnippetsService } from 'vs/workbench/parts/snippets/electron-browser/snippets.contribution';
-import { IJSONSchema } from 'vs/base/common/jsonSchema';
-import { ExtensionsRegistry, IExtensionPointUser } from 'vs/workbench/services/extensions/common/extensionsRegistry';
-import { languagesExtPoint } from 'vs/workbench/services/mode/common/workbenchModeService';
+import { basename, extname, join } from 'path';
 import { MarkdownString } from 'vs/base/common/htmlContent';
+import { IJSONSchema } from 'vs/base/common/jsonSchema';
+import { dispose, IDisposable } from 'vs/base/common/lifecycle';
+import { values } from 'vs/base/common/map';
+import * as resources from 'vs/base/common/resources';
+import { compare, endsWith, isFalsyOrWhitespace } from 'vs/base/common/strings';
+import { URI } from 'vs/base/common/uri';
+import { watch } from 'vs/base/node/extfs';
+import { exists, mkdirp, readdir } from 'vs/base/node/pfs';
+import { Position } from 'vs/editor/common/core/position';
+import { ITextModel } from 'vs/editor/common/model';
+import { ISuggestion, ISuggestResult, ISuggestSupport, LanguageId, SnippetType, SuggestContext, SuggestionType } from 'vs/editor/common/modes';
+import { IModeService } from 'vs/editor/common/services/modeService';
+import { SnippetParser } from 'vs/editor/contrib/snippet/snippetParser';
+import { setSnippetSuggestSupport } from 'vs/editor/contrib/suggest/suggest';
+import { localize } from 'vs/nls';
+import { IEnvironmentService } from 'vs/platform/environment/common/environment';
+import { IFileService } from 'vs/platform/files/common/files';
+import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
 import { ILifecycleService, LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
 import { ILogService } from 'vs/platform/log/common/log';
-import { values } from 'vs/base/common/map';
+import { ISnippetsService } from 'vs/workbench/parts/snippets/electron-browser/snippets.contribution';
+import { Snippet, SnippetFile } from 'vs/workbench/parts/snippets/electron-browser/snippetsFile';
+import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
+import { ExtensionsRegistry, IExtensionPointUser } from 'vs/workbench/services/extensions/common/extensionsRegistry';
+import { languagesExtPoint } from 'vs/workbench/services/mode/common/workbenchModeService';
 
 namespace schema {
 
@@ -36,7 +39,12 @@ namespace schema {
 		path: string;
 	}
 
-	export function isValidSnippet(extension: IExtensionPointUser<ISnippetsExtensionPoint[]>, snippet: ISnippetsExtensionPoint, modeService: IModeService): boolean {
+	export interface IValidSnippetsExtensionPoint {
+		language: string;
+		location: URI;
+	}
+
+	export function toValidSnippet(extension: IExtensionPointUser<ISnippetsExtensionPoint[]>, snippet: ISnippetsExtensionPoint, modeService: IModeService): IValidSnippetsExtensionPoint {
 
 		if (isFalsyOrWhitespace(snippet.path)) {
 			extension.collector.error(localize(
@@ -44,37 +52,43 @@ namespace schema {
 				"Expected string in `contributes.{0}.path`. Provided value: {1}",
 				extension.description.name, String(snippet.path)
 			));
-			return false;
-		} else if (isFalsyOrWhitespace(snippet.language) && !endsWith(snippet.path, '.code-snippets')) {
+			return null;
+		}
+
+		if (isFalsyOrWhitespace(snippet.language) && !endsWith(snippet.path, '.code-snippets')) {
 			extension.collector.error(localize(
 				'invalid.language.0',
 				"When omitting the language, the value of `contributes.{0}.path` must be a `.code-snippets`-file. Provided value: {1}",
 				extension.description.name, String(snippet.path)
 			));
-			return false;
-		} else if (!isFalsyOrWhitespace(snippet.language) && !modeService.isRegisteredMode(snippet.language)) {
+			return null;
+		}
+
+		if (!isFalsyOrWhitespace(snippet.language) && !modeService.isRegisteredMode(snippet.language)) {
 			extension.collector.error(localize(
 				'invalid.language',
 				"Unknown language in `contributes.{0}.language`. Provided value: {1}",
 				extension.description.name, String(snippet.language)
 			));
-			return false;
+			return null;
 
-		} else {
-			// TODO@extensionLocation
-			const normalizedAbsolutePath = join(extension.description.extensionLocation.fsPath, snippet.path);
-			if (normalizedAbsolutePath.indexOf(extension.description.extensionLocation.fsPath) !== 0) {
-				extension.collector.error(localize(
-					'invalid.path.1',
-					"Expected `contributes.{0}.path` ({1}) to be included inside extension's folder ({2}). This might make the extension non-portable.",
-					extension.description.name, normalizedAbsolutePath, extension.description.extensionLocation.fsPath
-				));
-				return false;
-			}
-
-			snippet.path = normalizedAbsolutePath;
-			return true;
 		}
+
+		const extensionLocation = extension.description.extensionLocation;
+		const snippetLocation = resources.joinPath(extensionLocation, snippet.path);
+		if (!resources.isEqualOrParent(snippetLocation, extensionLocation)) {
+			extension.collector.error(localize(
+				'invalid.path.1',
+				"Expected `contributes.{0}.path` ({1}) to be included inside extension's folder ({2}). This might make the extension non-portable.",
+				extension.description.name, snippetLocation.path, extensionLocation.path
+			));
+			return null;
+		}
+
+		return {
+			language: snippet.language,
+			location: snippetLocation
+		};
 	}
 
 	export const snippetsContribution: IJSONSchema = {
@@ -111,7 +125,8 @@ class SnippetsService implements ISnippetsService {
 		@IModeService private readonly _modeService: IModeService,
 		@ILogService private readonly _logService: ILogService,
 		@IExtensionService extensionService: IExtensionService,
-		@ILifecycleService lifecycleService: ILifecycleService
+		@ILifecycleService lifecycleService: ILifecycleService,
+		@IFileService private readonly _fileService: IFileService,
 	) {
 		this._initExtensionSnippets();
 		this._initPromise = Promise.resolve(lifecycleService.when(LifecyclePhase.Running).then(() => this._initUserSnippets()));
@@ -135,7 +150,7 @@ class SnippetsService implements ISnippetsService {
 			this._files.forEach(file => {
 				promises.push(file.load()
 					.then(file => file.select(langName, result))
-					.catch(err => this._logService.error(err, file.filepath))
+					.catch(err => this._logService.error(err, file.location.toString()))
 				);
 			});
 			return Promise.all(promises).then(() => result);
@@ -160,16 +175,17 @@ class SnippetsService implements ISnippetsService {
 		ExtensionsRegistry.registerExtensionPoint<schema.ISnippetsExtensionPoint[]>('snippets', [languagesExtPoint], schema.snippetsContribution).setHandler(extensions => {
 			for (const extension of extensions) {
 				for (const contribution of extension.value) {
-					if (!schema.isValidSnippet(extension, contribution, this._modeService)) {
+					const validContribution = schema.toValidSnippet(extension, contribution, this._modeService);
+					if (!validContribution) {
 						continue;
 					}
 
-					if (this._files.has(contribution.path)) {
-						this._files.get(contribution.path).defaultScopes.push(contribution.language);
+					if (this._files.has(validContribution.location.toString())) {
+						this._files.get(validContribution.location.toString()).defaultScopes.push(validContribution.language);
 
 					} else {
-						const file = new SnippetFile(contribution.path, contribution.language ? [contribution.language] : undefined, extension.description);
-						this._files.set(file.filepath, file);
+						const file = new SnippetFile(validContribution.location, validContribution.language ? [validContribution.language] : undefined, extension.description, this._fileService);
+						this._files.set(file.location.toString(), file);
 
 						if (this._environmentService.isExtensionDevelopment) {
 							file.load().then(file => {
@@ -186,7 +202,7 @@ class SnippetsService implements ISnippetsService {
 								extension.collector.warn(localize(
 									'badFile',
 									"The snippet file \"{0}\" could not be read.",
-									file.filepath
+									file.location.toString()
 								));
 							});
 						}
@@ -202,10 +218,10 @@ class SnippetsService implements ISnippetsService {
 			const ext = extname(filepath);
 			if (ext === '.json') {
 				const langName = basename(filepath, '.json');
-				this._files.set(filepath, new SnippetFile(filepath, [langName], undefined));
+				this._files.set(filepath, new SnippetFile(URI.file(filepath), [langName], undefined, this._fileService));
 
 			} else if (ext === '.code-snippets') {
-				this._files.set(filepath, new SnippetFile(filepath, undefined, undefined));
+				this._files.set(filepath, new SnippetFile(URI.file(filepath), undefined, undefined, this._fileService));
 			}
 		};
 
@@ -218,7 +234,7 @@ class SnippetsService implements ISnippetsService {
 			}
 		}).then(() => {
 			// watch
-			const watcher = watch(userSnippetsFolder, (type, filename) => {
+			this._disposables.push(watch(userSnippetsFolder, (type, filename) => {
 				if (typeof filename !== 'string') {
 					return;
 				}
@@ -236,15 +252,7 @@ class SnippetsService implements ISnippetsService {
 						this._files.delete(filepath);
 					}
 				});
-			}, (error: string) => this._logService.error(error));
-			this._disposables.push({
-				dispose: () => {
-					if (watcher) {
-						watcher.removeAllListeners();
-						watcher.close();
-					}
-				}
-			});
+			}, (error: string) => this._logService.error(error)));
 
 		}).then(undefined, err => {
 			this._logService.error('Failed to load user snippets', err);
@@ -305,35 +313,51 @@ export class SnippetSuggestProvider implements ISuggestSupport {
 		//
 	}
 
-	provideCompletionItems(model: ITextModel, position: Position): Promise<ISuggestResult> {
+	provideCompletionItems(model: ITextModel, position: Position, context: SuggestContext): Promise<ISuggestResult> {
 
 		const languageId = this._getLanguageIdAtPosition(model, position);
 		return this._snippets.getSnippets(languageId).then(snippets => {
 
-			const suggestions: SnippetSuggestion[] = [];
+			let suggestions: SnippetSuggestion[];
+			let pos = { lineNumber: position.lineNumber, column: Math.max(1, position.column - 100) };
+			let lineOffsets: number[] = [];
+			let linePrefixLow = model.getLineContent(position.lineNumber).substr(Math.max(0, position.column - 100), position.column - 1).toLowerCase();
 
-			const lowWordUntil = model.getWordUntilPosition(position).word.toLowerCase();
-			const lowLineUntil = model.getLineContent(position.lineNumber).substr(Math.max(0, position.column - 100), position.column - 1).toLowerCase();
+			while (pos.column < position.column) {
+				let word = model.getWordAtPosition(pos);
+				if (word) {
+					// at a word
+					lineOffsets.push(word.startColumn - 1);
+					pos.column = word.endColumn + 1;
 
-			for (const snippet of snippets) {
+					if (word.endColumn - 1 < linePrefixLow.length && !/\s/.test(linePrefixLow[word.endColumn - 1])) {
+						lineOffsets.push(word.endColumn - 1);
+					}
 
-				const lowPrefix = snippet.prefix.toLowerCase();
-				let overwriteBefore = 0;
-				let accetSnippet = true;
-
-				if (lowWordUntil.length > 0 && startsWith(lowPrefix, lowWordUntil)) {
-					// cheap match on the (none-empty) current word
-					overwriteBefore = lowWordUntil.length;
-					accetSnippet = true;
-
-				} else if (lowLineUntil.length > 0 && lowLineUntil.match(/[^\s]$/)) {
-					// compute overlap between snippet and (none-empty) line on text
-					overwriteBefore = overlap(lowLineUntil, snippet.prefix.toLowerCase());
-					accetSnippet = overwriteBefore > 0 && !model.getWordAtPosition(new Position(position.lineNumber, position.column - overwriteBefore));
+				} else if (!/\s/.test(linePrefixLow[pos.column - 1])) {
+					// at a none-whitespace character
+					lineOffsets.push(pos.column - 1);
+					pos.column += 1;
+				} else {
+					// always advance!
+					pos.column += 1;
 				}
+			}
 
-				if (accetSnippet) {
-					suggestions.push(new SnippetSuggestion(snippet, overwriteBefore));
+			if (lineOffsets.length === 0) {
+				// no interesting spans found -> pick all snippets
+				suggestions = snippets.map(snippet => new SnippetSuggestion(snippet, 0));
+
+			} else {
+				let consumed = new Set<Snippet>();
+				suggestions = [];
+				for (const start of lineOffsets) {
+					for (const snippet of snippets) {
+						if (!consumed.has(snippet) && matches(linePrefixLow, start, snippet.prefixLow, 0)) {
+							suggestions.push(new SnippetSuggestion(snippet, linePrefixLow.length - start));
+							consumed.add(snippet);
+						}
+					}
 				}
 			}
 
@@ -373,6 +397,16 @@ export class SnippetSuggestProvider implements ISuggestSupport {
 	}
 }
 
+function matches(pattern: string, patternStart: number, word: string, wordStart: number): boolean {
+	while (patternStart < pattern.length && wordStart < word.length) {
+		if (pattern[patternStart] === word[wordStart]) {
+			patternStart += 1;
+		}
+		wordStart += 1;
+	}
+	return patternStart === pattern.length;
+}
+
 export function getNonWhitespacePrefix(model: ISimpleModel, position: Position): string {
 	/**
 	 * Do not analyze more characters
diff --git a/src/vs/workbench/parts/snippets/electron-browser/tabCompletion.ts b/src/vs/workbench/parts/snippets/electron-browser/tabCompletion.ts
index 9b2b047160c..93c0e82a043 100644
--- a/src/vs/workbench/parts/snippets/electron-browser/tabCompletion.ts
+++ b/src/vs/workbench/parts/snippets/electron-browser/tabCompletion.ts
@@ -8,7 +8,7 @@
 import { localize } from 'vs/nls';
 import { KeyCode } from 'vs/base/common/keyCodes';
 import { RawContextKey, IContextKeyService, ContextKeyExpr, IContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRegistry';
+import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
 import { ISnippetsService } from 'vs/workbench/parts/snippets/electron-browser/snippets.contribution';
 import { getNonWhitespacePrefix, SnippetSuggestion } from 'vs/workbench/parts/snippets/electron-browser/snippetsService';
 import { Registry } from 'vs/platform/registry/common/platform';
@@ -142,7 +142,7 @@ registerEditorCommand(new TabCompletionCommand({
 	precondition: TabCompletionController.ContextKey,
 	handler: x => x.performSnippetCompletions(),
 	kbOpts: {
-		weight: KeybindingsRegistry.WEIGHT.editorContrib(),
+		weight: KeybindingWeight.EditorContrib,
 		kbExpr: ContextKeyExpr.and(
 			EditorContextKeys.editorTextFocus,
 			EditorContextKeys.tabDoesNotMoveFocus,
diff --git a/src/vs/workbench/parts/snippets/test/electron-browser/snippetFile.test.ts b/src/vs/workbench/parts/snippets/test/electron-browser/snippetFile.test.ts
index 00b8b9adbe6..5f31b802ae8 100644
--- a/src/vs/workbench/parts/snippets/test/electron-browser/snippetFile.test.ts
+++ b/src/vs/workbench/parts/snippets/test/electron-browser/snippetFile.test.ts
@@ -7,23 +7,24 @@
 
 import * as assert from 'assert';
 import { SnippetFile, Snippet } from 'vs/workbench/parts/snippets/electron-browser/snippetsFile';
+import { URI } from 'vs/base/common/uri';
 
 suite('Snippets', function () {
 
 	class TestSnippetFile extends SnippetFile {
-		constructor(filepath: string, snippets: Snippet[]) {
-			super(filepath, undefined, undefined);
+		constructor(filepath: URI, snippets: Snippet[]) {
+			super(filepath, undefined, undefined, null);
 			this.data.push(...snippets);
 		}
 	}
 
 	test('SnippetFile#select', function () {
-		let file = new TestSnippetFile('somepath/foo.code-snippets', []);
+		let file = new TestSnippetFile(URI.file('somepath/foo.code-snippets'), []);
 		let bucket: Snippet[] = [];
 		file.select('', bucket);
 		assert.equal(bucket.length, 0);
 
-		file = new TestSnippetFile('somepath/foo.code-snippets', [
+		file = new TestSnippetFile(URI.file('somepath/foo.code-snippets'), [
 			new Snippet(['foo'], 'FooSnippet1', 'foo', '', 'snippet', 'test'),
 			new Snippet(['foo'], 'FooSnippet2', 'foo', '', 'snippet', 'test'),
 			new Snippet(['bar'], 'BarSnippet1', 'foo', '', 'snippet', 'test'),
@@ -55,7 +56,7 @@ suite('Snippets', function () {
 
 	test('SnippetFile#select - any scope', function () {
 
-		let file = new TestSnippetFile('somepath/foo.code-snippets', [
+		let file = new TestSnippetFile(URI.file('somepath/foo.code-snippets'), [
 			new Snippet([], 'AnySnippet1', 'foo', '', 'snippet', 'test'),
 			new Snippet(['foo'], 'FooSnippet1', 'foo', '', 'snippet', 'test'),
 		]);
diff --git a/src/vs/workbench/parts/snippets/test/electron-browser/snippetsService.test.ts b/src/vs/workbench/parts/snippets/test/electron-browser/snippetsService.test.ts
index cd3123b3b6a..70f0ab60b99 100644
--- a/src/vs/workbench/parts/snippets/test/electron-browser/snippetsService.test.ts
+++ b/src/vs/workbench/parts/snippets/test/electron-browser/snippetsService.test.ts
@@ -13,6 +13,7 @@ import { ModeServiceImpl } from 'vs/editor/common/services/modeServiceImpl';
 import { TextModel } from 'vs/editor/common/model/textModel';
 import { ISnippetsService } from 'vs/workbench/parts/snippets/electron-browser/snippets.contribution';
 import { Snippet } from 'vs/workbench/parts/snippets/electron-browser/snippetsFile';
+import { SuggestContext, SuggestTriggerKind } from 'vs/editor/common/modes';
 
 class SimpleSnippetService implements ISnippetsService {
 	_serviceBrand: any;
@@ -40,6 +41,7 @@ suite('SnippetsService', function () {
 
 	let modeService: ModeServiceImpl;
 	let snippetService: ISnippetsService;
+	let suggestContext: SuggestContext = { triggerKind: SuggestTriggerKind.Invoke };
 
 	setup(function () {
 		modeService = new ModeServiceImpl();
@@ -66,7 +68,7 @@ suite('SnippetsService', function () {
 		const provider = new SnippetSuggestProvider(modeService, snippetService);
 		const model = TextModel.createFromString('', undefined, modeService.getLanguageIdentifier('fooLang'));
 
-		return provider.provideCompletionItems(model, new Position(1, 1)).then(result => {
+		return provider.provideCompletionItems(model, new Position(1, 1), suggestContext).then(result => {
 			assert.equal(result.incomplete, undefined);
 			assert.equal(result.suggestions.length, 2);
 		});
@@ -77,14 +79,67 @@ suite('SnippetsService', function () {
 		const provider = new SnippetSuggestProvider(modeService, snippetService);
 		const model = TextModel.createFromString('bar', undefined, modeService.getLanguageIdentifier('fooLang'));
 
-		return provider.provideCompletionItems(model, new Position(1, 4)).then(result => {
+		return provider.provideCompletionItems(model, new Position(1, 4), suggestContext).then(result => {
 			assert.equal(result.incomplete, undefined);
 			assert.equal(result.suggestions.length, 1);
 			assert.equal(result.suggestions[0].label, 'bar');
+			assert.equal(result.suggestions[0].overwriteBefore, 3);
 			assert.equal(result.suggestions[0].insertText, 'barCodeSnippet');
 		});
 	});
 
+	test('snippet completions - with different prefixes', async function () {
+
+		snippetService = new SimpleSnippetService([new Snippet(
+			['fooLang'],
+			'barTest',
+			'bar',
+			'',
+			's1',
+			''
+		), new Snippet(
+			['fooLang'],
+			'name',
+			'bar-bar',
+			'',
+			's2',
+			''
+		)]);
+
+		const provider = new SnippetSuggestProvider(modeService, snippetService);
+		const model = TextModel.createFromString('bar-bar', undefined, modeService.getLanguageIdentifier('fooLang'));
+
+		await provider.provideCompletionItems(model, new Position(1, 3), suggestContext).then(result => {
+			assert.equal(result.incomplete, undefined);
+			assert.equal(result.suggestions.length, 2);
+			assert.equal(result.suggestions[0].label, 'bar');
+			assert.equal(result.suggestions[0].insertText, 's1');
+			assert.equal(result.suggestions[0].overwriteBefore, 2);
+			assert.equal(result.suggestions[1].label, 'bar-bar');
+			assert.equal(result.suggestions[1].insertText, 's2');
+			assert.equal(result.suggestions[1].overwriteBefore, 2);
+		});
+
+		await provider.provideCompletionItems(model, new Position(1, 5), suggestContext).then(result => {
+			assert.equal(result.incomplete, undefined);
+			assert.equal(result.suggestions.length, 1);
+			assert.equal(result.suggestions[0].label, 'bar-bar');
+			assert.equal(result.suggestions[0].insertText, 's2');
+			assert.equal(result.suggestions[0].overwriteBefore, 4);
+		});
+
+		await provider.provideCompletionItems(model, new Position(1, 6), suggestContext).then(result => {
+			assert.equal(result.incomplete, undefined);
+			assert.equal(result.suggestions.length, 2);
+			assert.equal(result.suggestions[0].label, 'bar');
+			assert.equal(result.suggestions[0].insertText, 's1');
+			assert.equal(result.suggestions[0].overwriteBefore, 1);
+			assert.equal(result.suggestions[1].label, 'bar-bar');
+			assert.equal(result.suggestions[1].insertText, 's2');
+			assert.equal(result.suggestions[1].overwriteBefore, 5);
+		});
+	});
+
 	test('Cannot use "<?php" as user snippet prefix anymore, #26275', function () {
 		snippetService = new SimpleSnippetService([new Snippet(
 			['fooLang'],
@@ -98,21 +153,22 @@ suite('SnippetsService', function () {
 		const provider = new SnippetSuggestProvider(modeService, snippetService);
 
 		let model = TextModel.createFromString('\t<?php', undefined, modeService.getLanguageIdentifier('fooLang'));
-		return provider.provideCompletionItems(model, new Position(1, 7)).then(result => {
+		return provider.provideCompletionItems(model, new Position(1, 7), suggestContext).then(result => {
 			assert.equal(result.suggestions.length, 1);
 			model.dispose();
 
 			model = TextModel.createFromString('\t<?', undefined, modeService.getLanguageIdentifier('fooLang'));
-			return provider.provideCompletionItems(model, new Position(1, 4));
+			return provider.provideCompletionItems(model, new Position(1, 4), suggestContext);
 		}).then(result => {
 			assert.equal(result.suggestions.length, 1);
+			assert.equal(result.suggestions[0].overwriteBefore, 2);
 			model.dispose();
 
 			model = TextModel.createFromString('a<?', undefined, modeService.getLanguageIdentifier('fooLang'));
-			return provider.provideCompletionItems(model, new Position(1, 4));
+			return provider.provideCompletionItems(model, new Position(1, 4), suggestContext);
 		}).then(result => {
-
-			assert.equal(result.suggestions.length, 0);
+			assert.equal(result.suggestions.length, 1);
+			assert.equal(result.suggestions[0].overwriteBefore, 2);
 			model.dispose();
 		});
 	});
@@ -131,9 +187,9 @@ suite('SnippetsService', function () {
 		const provider = new SnippetSuggestProvider(modeService, snippetService);
 
 		let model = TextModel.createFromString('<head>\n\t\n>/head>', undefined, modeService.getLanguageIdentifier('fooLang'));
-		return provider.provideCompletionItems(model, new Position(1, 1)).then(result => {
+		return provider.provideCompletionItems(model, new Position(1, 1), suggestContext).then(result => {
 			assert.equal(result.suggestions.length, 1);
-			return provider.provideCompletionItems(model, new Position(2, 2));
+			return provider.provideCompletionItems(model, new Position(2, 2), suggestContext);
 		}).then(result => {
 			assert.equal(result.suggestions.length, 1);
 		});
@@ -161,11 +217,34 @@ suite('SnippetsService', function () {
 		const provider = new SnippetSuggestProvider(modeService, snippetService);
 
 		let model = TextModel.createFromString('', undefined, modeService.getLanguageIdentifier('fooLang'));
-		return provider.provideCompletionItems(model, new Position(1, 1)).then(result => {
+		return provider.provideCompletionItems(model, new Position(1, 1), suggestContext).then(result => {
 			assert.equal(result.suggestions.length, 2);
 			let [first, second] = result.suggestions;
 			assert.equal(first.label, 'first');
 			assert.equal(second.label, 'second');
 		});
 	});
+
+	test('Dash in snippets prefix broken #53945', async function () {
+		snippetService = new SimpleSnippetService([new Snippet(
+			['fooLang'],
+			'p-a',
+			'p-a',
+			'',
+			'second',
+			''
+		)]);
+		const provider = new SnippetSuggestProvider(modeService, snippetService);
+
+		let model = TextModel.createFromString('p-', undefined, modeService.getLanguageIdentifier('fooLang'));
+
+		let result = await provider.provideCompletionItems(model, new Position(1, 2), suggestContext);
+		assert.equal(result.suggestions.length, 1);
+
+		result = await provider.provideCompletionItems(model, new Position(1, 3), suggestContext);
+		assert.equal(result.suggestions.length, 1);
+
+		result = await provider.provideCompletionItems(model, new Position(1, 3), { triggerCharacter: '-', triggerKind: SuggestTriggerKind.TriggerCharacter });
+		assert.equal(result.suggestions.length, 1);
+	});
 });
diff --git a/src/vs/workbench/parts/splash/electron-browser/partsSplash.contribution.ts b/src/vs/workbench/parts/splash/electron-browser/partsSplash.contribution.ts
new file mode 100644
index 00000000000..5f76b802ea5
--- /dev/null
+++ b/src/vs/workbench/parts/splash/electron-browser/partsSplash.contribution.ts
@@ -0,0 +1,93 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+import { getTotalHeight, getTotalWidth } from 'vs/base/browser/dom';
+import { ILifecycleService, LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
+import { Registry } from 'vs/platform/registry/common/platform';
+import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
+import { IThemeService, getThemeTypeSelector } from 'vs/platform/theme/common/themeService';
+import { IBroadcastService } from 'vs/platform/broadcast/electron-browser/broadcastService';
+import { Extensions, IWorkbenchContributionsRegistry } from 'vs/workbench/common/contributions';
+import * as themes from 'vs/workbench/common/theme';
+import { IPartService, Parts, Position } from 'vs/workbench/services/part/common/partService';
+import { IDisposable, dispose } from 'vs/base/common/lifecycle';
+import { debounceEvent } from 'vs/base/common/event';
+import { DEFAULT_EDITOR_MIN_DIMENSIONS } from 'vs/workbench/browser/parts/editor/editor';
+import { ColorIdentifier, editorBackground, foreground } from 'vs/platform/theme/common/colorRegistry';
+import { Color } from 'vs/base/common/color';
+
+class PartsSplash {
+
+	private static readonly _splashElementId = 'monaco-parts-splash';
+
+	private readonly _disposables: IDisposable[] = [];
+
+	private lastBaseTheme: string;
+	private lastBackground: string;
+
+	constructor(
+		@IThemeService private readonly _themeService: IThemeService,
+		@IPartService private readonly _partService: IPartService,
+		@IStorageService private readonly _storageService: IStorageService,
+		@ILifecycleService lifecycleService: ILifecycleService,
+		@IBroadcastService private broadcastService: IBroadcastService
+	) {
+		lifecycleService.when(LifecyclePhase.Running).then(_ => this._removePartsSplash());
+		debounceEvent(_partService.onEditorLayout, () => { }, 50)(this._savePartsSplash, this, this._disposables);
+	}
+
+	dispose(): void {
+		dispose(this._disposables);
+	}
+
+	private _savePartsSplash() {
+		const baseTheme = getThemeTypeSelector(this._themeService.getTheme().type);
+		const colorInfo = {
+			foreground: this._getThemeColor(foreground),
+			editorBackground: this._getThemeColor(editorBackground),
+			titleBarBackground: this._getThemeColor(themes.TITLE_BAR_ACTIVE_BACKGROUND),
+			activityBarBackground: this._getThemeColor(themes.ACTIVITY_BAR_BACKGROUND),
+			sideBarBackground: this._getThemeColor(themes.SIDE_BAR_BACKGROUND),
+			statusBarBackground: this._getThemeColor(themes.STATUS_BAR_BACKGROUND),
+			statusBarNoFolderBackground: this._getThemeColor(themes.STATUS_BAR_NO_FOLDER_BACKGROUND),
+		};
+		const layoutInfo = {
+			sideBarSide: this._partService.getSideBarPosition() === Position.RIGHT ? 'right' : 'left',
+			editorPartMinWidth: DEFAULT_EDITOR_MIN_DIMENSIONS.width,
+			titleBarHeight: getTotalHeight(this._partService.getContainer(Parts.TITLEBAR_PART)),
+			activityBarWidth: getTotalWidth(this._partService.getContainer(Parts.ACTIVITYBAR_PART)),
+			sideBarWidth: getTotalWidth(this._partService.getContainer(Parts.SIDEBAR_PART)),
+			statusBarHeight: getTotalHeight(this._partService.getContainer(Parts.STATUSBAR_PART)),
+		};
+		this._storageService.store('parts-splash-data', JSON.stringify({ id: PartsSplash._splashElementId, colorInfo, layoutInfo, baseTheme }), StorageScope.GLOBAL);
+
+		if (baseTheme !== this.lastBaseTheme || colorInfo.editorBackground !== this.lastBackground) {
+			// notify the main window on background color changes: the main window sets the background color to new windows
+			this.lastBaseTheme = baseTheme;
+			this.lastBackground = colorInfo.editorBackground;
+
+			// the color needs to be in hex
+			const backgroundColor = this._themeService.getTheme().getColor(editorBackground) || themes.WORKBENCH_BACKGROUND(this._themeService.getTheme());
+			this.broadcastService.broadcast({ channel: 'vscode:changeColorTheme', payload: JSON.stringify({ baseTheme, background: Color.Format.CSS.formatHex(backgroundColor) }) });
+		}
+	}
+
+	private _getThemeColor(id: ColorIdentifier): string {
+		const theme = this._themeService.getTheme();
+		const color = theme.getColor(id);
+		return color ? color.toString() : undefined;
+	}
+
+	private _removePartsSplash(): void {
+		let element = document.getElementById(PartsSplash._splashElementId);
+		if (element) {
+			element.remove();
+		}
+	}
+}
+
+Registry.as<IWorkbenchContributionsRegistry>(Extensions.Workbench).registerWorkbenchContribution(PartsSplash, LifecyclePhase.Starting);
diff --git a/src/vs/workbench/parts/stats/node/workspaceStats.ts b/src/vs/workbench/parts/stats/node/workspaceStats.ts
index 3eec8a04f22..ac0c3d9451a 100644
--- a/src/vs/workbench/parts/stats/node/workspaceStats.ts
+++ b/src/vs/workbench/parts/stats/node/workspaceStats.ts
@@ -8,7 +8,7 @@
 import * as crypto from 'crypto';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { onUnexpectedError } from 'vs/base/common/errors';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { IFileService, IFileStat, IResolveFileResult } from 'vs/platform/files/common/files';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
@@ -16,6 +16,7 @@ import { IEnvironmentService } from 'vs/platform/environment/common/environment'
 import { IWindowConfiguration, IWindowService } from 'vs/platform/windows/common/windows';
 import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
 import { endsWith } from 'vs/base/common/strings';
+import { Schemas } from 'vs/base/common/network';
 
 const SshProtocolMatcher = /^([^@:]+@)?([^:]+):/;
 const SshUrlMatcher = /^([^@:]+@)?([^:]+):(.+)$/;
@@ -179,6 +180,8 @@ export class WorkspaceStats implements IWorkbenchContribution {
 		this.reportCloudStats();
 	}
 
+	public static tags: Tags;
+
 	private searchArray(arr: string[], regEx: RegExp): boolean {
 		return arr.some(v => v.search(regEx) > -1) || undefined;
 	}
@@ -226,7 +229,7 @@ export class WorkspaceStats implements IWorkbenchContribution {
 			"workspace.reactNative" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true }
 		}
 	*/
-	private async getWorkspaceTags(configuration: IWindowConfiguration): TPromise<Tags> {
+	private getWorkspaceTags(configuration: IWindowConfiguration): TPromise<Tags> {
 		const tags: Tags = Object.create(null);
 
 		const state = this.contextService.getWorkbenchState();
@@ -238,7 +241,8 @@ export class WorkspaceStats implements IWorkbenchContribution {
 				workspaceId = void 0;
 				break;
 			case WorkbenchState.FOLDER:
-				workspaceId = crypto.createHash('sha1').update(workspace.folders[0].uri.fsPath).digest('hex');
+				// TODO: #54483 @Ben
+				workspaceId = crypto.createHash('sha1').update(workspace.folders[0].uri.scheme === Schemas.file ? workspace.folders[0].uri.fsPath : workspace.folders[0].uri.toString()).digest('hex');
 				break;
 			case WorkbenchState.WORKSPACE:
 				workspaceId = crypto.createHash('sha1').update(workspace.configuration.fsPath).digest('hex');
@@ -256,9 +260,11 @@ export class WorkspaceStats implements IWorkbenchContribution {
 		tags['workspace.empty'] = isEmpty;
 
 		const folders = !isEmpty ? workspace.folders.map(folder => folder.uri) : this.environmentService.appQuality !== 'stable' && this.findFolders(configuration);
-		if (folders && folders.length && this.fileService) {
-			//return
-			const files: IResolveFileResult[] = await this.fileService.resolveFiles(folders.map(resource => ({ resource })));
+		if (!folders || !folders.length || !this.fileService) {
+			return TPromise.as(tags);
+		}
+
+		return this.fileService.resolveFiles(folders.map(resource => ({ resource }))).then((files: IResolveFileResult[]) => {
 			const names = (<IFileStat[]>[]).concat(...files.map(result => result.success ? (result.stat.children || []) : [])).map(c => c.name);
 			const nameSet = names.reduce((s, n) => s.add(n.toLowerCase()), new Set());
 
@@ -311,33 +317,36 @@ export class WorkspaceStats implements IWorkbenchContribution {
 				tags['workspace.android.cpp'] = true;
 			}
 
-			if (nameSet.has('package.json')) {
-				await TPromise.join(folders.map(async workspaceUri => {
-					const uri = workspaceUri.with({ path: `${workspaceUri.path !== '/' ? workspaceUri.path : ''}/package.json` });
-					try {
-						const content = await this.fileService.resolveContent(uri, { acceptTextOnly: true });
-						const packageJsonContents = JSON.parse(content.value);
-						if (packageJsonContents['dependencies']) {
-							for (let module of ModulesToLookFor) {
-								if ('react-native' === module) {
-									if (packageJsonContents['dependencies'][module]) {
-										tags['workspace.reactNative'] = true;
-									}
-								} else {
-									if (packageJsonContents['dependencies'][module]) {
-										tags['workspace.npm.' + module] = true;
+			const packageJsonPromises = !nameSet.has('package.json') ? [] : folders.map(workspaceUri => {
+				const uri = workspaceUri.with({ path: `${workspaceUri.path !== '/' ? workspaceUri.path : ''}/package.json` });
+				return this.fileService.resolveFile(uri).then(() => {
+					return this.fileService.resolveContent(uri, { acceptTextOnly: true }).then(content => {
+						try {
+							const packageJsonContents = JSON.parse(content.value);
+							if (packageJsonContents['dependencies']) {
+								for (let module of ModulesToLookFor) {
+									if ('react-native' === module) {
+										if (packageJsonContents['dependencies'][module]) {
+											tags['workspace.reactNative'] = true;
+										}
+									} else {
+										if (packageJsonContents['dependencies'][module]) {
+											tags['workspace.npm.' + module] = true;
+										}
 									}
 								}
 							}
 						}
-					}
-					catch (e) {
-						// Ignore errors when resolving file or parsing file contents
-					}
-				}));
-			}
-		}
-		return TPromise.as(tags);
+						catch (e) {
+							// Ignore errors when resolving file or parsing file contents
+						}
+					});
+				}, err => {
+					// Ignore missing file
+				});
+			});
+			return TPromise.join(packageJsonPromises).then(() => tags);
+		});
 	}
 
 	private findFolders(configuration: IWindowConfiguration): URI[] {
@@ -347,11 +356,11 @@ export class WorkspaceStats implements IWorkbenchContribution {
 
 	private findFolder({ filesToOpen, filesToCreate, filesToDiff }: IWindowConfiguration): URI {
 		if (filesToOpen && filesToOpen.length) {
-			return this.parentURI(URI.file(filesToOpen[0].filePath));
+			return this.parentURI(filesToOpen[0].fileUri);
 		} else if (filesToCreate && filesToCreate.length) {
-			return this.parentURI(URI.file(filesToCreate[0].filePath));
+			return this.parentURI(filesToCreate[0].fileUri);
 		} else if (filesToDiff && filesToDiff.length) {
-			return this.parentURI(URI.file(filesToDiff[0].filePath));
+			return this.parentURI(filesToDiff[0].fileUri);
 		}
 		return undefined;
 	}
@@ -372,6 +381,7 @@ export class WorkspaceStats implements IWorkbenchContribution {
 				}
 			*/
 			this.telemetryService.publicLog('workspce.tags', tags);
+			WorkspaceStats.tags = tags;
 		}, error => onUnexpectedError(error));
 	}
 
diff --git a/src/vs/workbench/parts/tasks/browser/quickOpen.ts b/src/vs/workbench/parts/tasks/browser/quickOpen.ts
index 18c84f752e2..b9502e6d967 100644
--- a/src/vs/workbench/parts/tasks/browser/quickOpen.ts
+++ b/src/vs/workbench/parts/tasks/browser/quickOpen.ts
@@ -18,6 +18,7 @@ import { IQuickOpenService } from 'vs/platform/quickOpen/common/quickOpen';
 import { Task, CustomTask, ContributedTask } from 'vs/workbench/parts/tasks/common/tasks';
 import { ITaskService, RunOptions } from 'vs/workbench/parts/tasks/common/taskService';
 import { ActionBarContributor, ContributableActionProvider } from 'vs/workbench/browser/actions';
+import { CancellationToken } from 'vs/base/common/cancellation';
 
 export class TaskEntry extends Model.QuickOpenEntry {
 
@@ -68,7 +69,6 @@ export abstract class QuickOpenHandler extends Quickopen.QuickOpenHandler {
 
 	private tasks: TPromise<(CustomTask | ContributedTask)[]>;
 
-
 	constructor(
 		protected quickOpenService: IQuickOpenService,
 		protected taskService: ITaskService
@@ -87,10 +87,10 @@ export abstract class QuickOpenHandler extends Quickopen.QuickOpenHandler {
 		this.tasks = undefined;
 	}
 
-	public getResults(input: string): TPromise<Model.QuickOpenModel> {
+	public getResults(input: string, token: CancellationToken): TPromise<Model.QuickOpenModel> {
 		return this.tasks.then((tasks) => {
 			let entries: Model.QuickOpenEntry[] = [];
-			if (tasks.length === 0) {
+			if (tasks.length === 0 || token.isCancellationRequested) {
 				return new Model.QuickOpenModel(entries);
 			}
 			let recentlyUsedTasks = this.taskService.getRecentlyUsedTasks();
diff --git a/src/vs/workbench/parts/tasks/common/problemCollectors.ts b/src/vs/workbench/parts/tasks/common/problemCollectors.ts
index bcc398f8d40..ea3c90be3c5 100644
--- a/src/vs/workbench/parts/tasks/common/problemCollectors.ts
+++ b/src/vs/workbench/parts/tasks/common/problemCollectors.ts
@@ -5,7 +5,7 @@
 'use strict';
 
 import { IStringDictionary, INumberDictionary } from 'vs/base/common/collections';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { Event, Emitter } from 'vs/base/common/event';
 import { IDisposable } from 'vs/base/common/lifecycle';
 
@@ -15,7 +15,7 @@ import { ILineMatcher, createLineMatcher, ProblemMatcher, ProblemMatch, ApplyToK
 import { IMarkerService, IMarkerData, MarkerSeverity } from 'vs/platform/markers/common/markers';
 import { generateUuid } from 'vs/base/common/uuid';
 
-export enum ProblemCollectorEventKind {
+export const enum ProblemCollectorEventKind {
 	BackgroundProcessingBegins = 'backgroundProcessingBegins',
 	BackgroundProcessingEnds = 'backgroundProcessingEnds'
 }
@@ -325,7 +325,7 @@ export class AbstractProblemCollector implements IDisposable {
 	}
 }
 
-export enum ProblemHandlingStrategy {
+export const enum ProblemHandlingStrategy {
 	Clean
 }
 
diff --git a/src/vs/workbench/parts/tasks/common/problemMatcher.ts b/src/vs/workbench/parts/tasks/common/problemMatcher.ts
index b2b792cfe02..c253081e8ad 100644
--- a/src/vs/workbench/parts/tasks/common/problemMatcher.ts
+++ b/src/vs/workbench/parts/tasks/common/problemMatcher.ts
@@ -14,7 +14,7 @@ import * as Types from 'vs/base/common/types';
 import * as UUID from 'vs/base/common/uuid';
 import * as Platform from 'vs/base/common/platform';
 import Severity from 'vs/base/common/severity';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { IJSONSchema } from 'vs/base/common/jsonSchema';
 import { ValidationStatus, ValidationState, IProblemReporter, Parser } from 'vs/base/common/parsers';
@@ -134,7 +134,7 @@ export interface ProblemMatcher {
 	pattern: ProblemPattern | ProblemPattern[];
 	severity?: Severity;
 	watching?: WatchingMatcher;
-	fileSystemScheme?: string;
+	uriProvider?: (path: string) => URI;
 }
 
 export interface NamedProblemMatcher extends ProblemMatcher {
@@ -196,8 +196,8 @@ export function getResource(filename: string, matcher: ProblemMatcher): URI {
 	if (fullPath[0] !== '/') {
 		fullPath = '/' + fullPath;
 	}
-	if (matcher.fileSystemScheme !== void 0) {
-		return URI.parse(`${matcher.fileSystemScheme}://${fullPath}`);
+	if (matcher.uriProvider !== void 0) {
+		return matcher.uriProvider(fullPath);
 	} else {
 		return URI.file(fullPath);
 	}
@@ -1088,7 +1088,7 @@ class ProblemPatternRegistryImpl implements IProblemPatternRegistry {
 				}
 				resolve(undefined);
 			});
-		}, () => { });
+		});
 	}
 
 	public onReady(): TPromise<void> {
@@ -1642,7 +1642,7 @@ class ProblemMatcherRegistryImpl implements IProblemMatcherRegistry {
 				}
 				resolve(undefined);
 			});
-		}, () => { });
+		});
 	}
 
 	public onReady(): TPromise<void> {
diff --git a/src/vs/workbench/parts/tasks/common/taskDefinitionRegistry.ts b/src/vs/workbench/parts/tasks/common/taskDefinitionRegistry.ts
index 7a2bab4ba3a..0fdf9cb5134 100644
--- a/src/vs/workbench/parts/tasks/common/taskDefinitionRegistry.ts
+++ b/src/vs/workbench/parts/tasks/common/taskDefinitionRegistry.ts
@@ -64,7 +64,7 @@ namespace Configuration {
 				}
 			}
 		}
-		return { extensionId, taskType, required: required.length >= 0 ? required : undefined, properties: value.properties ? Objects.deepClone(value.properties) : undefined };
+		return { extensionId, taskType, required: required, properties: value.properties ? Objects.deepClone(value.properties) : {} };
 	}
 }
 
@@ -80,12 +80,14 @@ export interface ITaskDefinitionRegistry {
 
 	get(key: string): Tasks.TaskDefinition;
 	all(): Tasks.TaskDefinition[];
+	getJsonSchema(): IJSONSchema;
 }
 
 class TaskDefinitionRegistryImpl implements ITaskDefinitionRegistry {
 
 	private taskTypes: IStringDictionary<Tasks.TaskDefinition>;
 	private readyPromise: TPromise<void>;
+	private _schema: IJSONSchema;
 
 	constructor() {
 		this.taskTypes = Object.create(null);
@@ -105,7 +107,7 @@ class TaskDefinitionRegistryImpl implements ITaskDefinitionRegistry {
 				}
 				resolve(undefined);
 			});
-		}, () => { });
+		});
 	}
 
 	public onReady(): TPromise<void> {
@@ -119,6 +121,33 @@ class TaskDefinitionRegistryImpl implements ITaskDefinitionRegistry {
 	public all(): Tasks.TaskDefinition[] {
 		return Object.keys(this.taskTypes).map(key => this.taskTypes[key]);
 	}
+
+	public getJsonSchema(): IJSONSchema {
+		if (this._schema === void 0) {
+			let schemas: IJSONSchema[] = [];
+			for (let definition of this.all()) {
+				let schema: IJSONSchema = {
+					type: 'object',
+					additionalProperties: false
+				};
+				if (definition.required.length > 0) {
+					schema.required = definition.required.slice(0);
+				}
+				if (definition.properties !== void 0) {
+					schema.properties = Objects.deepClone(definition.properties);
+				} else {
+					schema.properties = Object.create(null);
+				}
+				schema.properties.type = {
+					type: 'string',
+					enum: [definition.taskType]
+				};
+				schemas.push(schema);
+			}
+			this._schema = { oneOf: schemas };
+		}
+		return this._schema;
+	}
 }
 
 export const TaskDefinitionRegistry: ITaskDefinitionRegistry = new TaskDefinitionRegistryImpl();
diff --git a/src/vs/workbench/parts/tasks/common/taskService.ts b/src/vs/workbench/parts/tasks/common/taskService.ts
index b148fa0f5e7..50e7dadcfe5 100644
--- a/src/vs/workbench/parts/tasks/common/taskService.ts
+++ b/src/vs/workbench/parts/tasks/common/taskService.ts
@@ -11,15 +11,16 @@ import { LinkedMap } from 'vs/base/common/map';
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
 
 import { IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
-import { Task, ContributedTask, CustomTask, TaskSet, TaskSorter, TaskEvent } from 'vs/workbench/parts/tasks/common/tasks';
+import { Task, ContributedTask, CustomTask, TaskSet, TaskSorter, TaskEvent, TaskIdentifier } from 'vs/workbench/parts/tasks/common/tasks';
 import { ITaskSummary, TaskTerminateResponse, TaskSystemInfo } from 'vs/workbench/parts/tasks/common/taskSystem';
+import { IStringDictionary } from 'vs/base/common/collections';
 
 export { ITaskSummary, Task, TaskTerminateResponse };
 
 export const ITaskService = createDecorator<ITaskService>('taskService');
 
 export interface ITaskProvider {
-	provideTasks(): TPromise<TaskSet>;
+	provideTasks(validTypes: IStringDictionary<boolean>): TPromise<TaskSet>;
 }
 
 export interface RunOptions {
@@ -56,7 +57,7 @@ export interface ITaskService {
 	/**
 	 * @param alias The task's name, label or defined identifier.
 	 */
-	getTask(workspaceFolder: IWorkspaceFolder | string, alias: string, compareId?: boolean): TPromise<Task>;
+	getTask(workspaceFolder: IWorkspaceFolder | string, alias: string | TaskIdentifier, compareId?: boolean): TPromise<Task>;
 	getTasksForGroup(group: string): TPromise<Task[]>;
 	getRecentlyUsedTasks(): LinkedMap<string, string>;
 	createSorter(): TaskSorter;
@@ -70,4 +71,4 @@ export interface ITaskService {
 	unregisterTaskProvider(handle: number): boolean;
 
 	registerTaskSystem(scheme: string, taskSystemInfo: TaskSystemInfo): void;
-}
\ No newline at end of file
+}
diff --git a/src/vs/workbench/parts/tasks/common/taskSystem.ts b/src/vs/workbench/parts/tasks/common/taskSystem.ts
index 38407b78949..0194024af55 100644
--- a/src/vs/workbench/parts/tasks/common/taskSystem.ts
+++ b/src/vs/workbench/parts/tasks/common/taskSystem.ts
@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
+import { URI } from 'vs/base/common/uri';
 import Severity from 'vs/base/common/severity';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { TerminateResponse } from 'vs/base/common/processes';
@@ -14,7 +15,7 @@ import { IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
 
 import { Task, TaskEvent, KeyedTaskIdentifier } from './tasks';
 
-export enum TaskErrors {
+export const enum TaskErrors {
 	NotConfigured,
 	RunningTask,
 	NoBuildTask,
@@ -77,7 +78,7 @@ export interface ITaskSummary {
 	exitCode?: number;
 }
 
-export enum TaskExecuteKind {
+export const enum TaskExecuteKind {
 	Started = 1,
 	Active = 2
 }
@@ -103,9 +104,9 @@ export interface TaskTerminateResponse extends TerminateResponse {
 }
 
 export interface TaskSystemInfo {
-	fileSystemScheme: string;
 	platform: Platform;
 	context: any;
+	uriProvider: (this: void, path: string) => URI;
 	resolveVariables(workspaceFolder: IWorkspaceFolder, variables: Set<string>): TPromise<Map<string, string>>;
 }
 
diff --git a/src/vs/workbench/parts/tasks/common/taskTemplates.ts b/src/vs/workbench/parts/tasks/common/taskTemplates.ts
index e19cfd42648..77998b88ac6 100644
--- a/src/vs/workbench/parts/tasks/common/taskTemplates.ts
+++ b/src/vs/workbench/parts/tasks/common/taskTemplates.ts
@@ -6,9 +6,9 @@
 
 import * as nls from 'vs/nls';
 
-import { IPickOpenEntry } from 'vs/platform/quickOpen/common/quickOpen';
+import { IQuickPickItem } from 'vs/platform/quickinput/common/quickInput';
 
-export interface TaskEntry extends IPickOpenEntry {
+export interface TaskEntry extends IQuickPickItem {
 	sort?: string;
 	autoDetect: boolean;
 	content: string;
diff --git a/src/vs/workbench/parts/tasks/common/tasks.ts b/src/vs/workbench/parts/tasks/common/tasks.ts
index f7157c77f53..5818ba2b4bc 100644
--- a/src/vs/workbench/parts/tasks/common/tasks.ts
+++ b/src/vs/workbench/parts/tasks/common/tasks.ts
@@ -12,6 +12,9 @@ import { UriComponents } from 'vs/base/common/uri';
 import { IExtensionDescription } from 'vs/workbench/services/extensions/common/extensions';
 import { ProblemMatcher } from 'vs/workbench/parts/tasks/common/problemMatcher';
 import { IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
+import { RawContextKey } from 'vs/platform/contextkey/common/contextkey';
+
+export const TASK_RUNNING_STATE = new RawContextKey<boolean>('taskRunning', false);
 
 export enum ShellQuoting {
 	/**
@@ -72,7 +75,7 @@ export interface ShellConfiguration {
 	/**
 	 * The shell executable.
 	 */
-	executable: string;
+	executable?: string;
 
 	/**
 	 * The arguments to be passed to the shell executable.
@@ -294,7 +297,7 @@ export namespace TaskGroup {
 export type TaskGroup = 'clean' | 'build' | 'rebuild' | 'test';
 
 
-export enum TaskScope {
+export const enum TaskScope {
 	Global = 1,
 	Workspace = 2,
 	Folder = 3
@@ -354,7 +357,7 @@ export interface TaskDependency {
 	task: string | KeyedTaskIdentifier;
 }
 
-export enum GroupType {
+export const enum GroupType {
 	default = 'default',
 	user = 'user'
 }
@@ -671,7 +674,7 @@ export namespace ExecutionEngine {
 	export const _default: ExecutionEngine = ExecutionEngine.Terminal;
 }
 
-export enum JsonSchemaVersion {
+export const enum JsonSchemaVersion {
 	V0_1_0 = 1,
 	V2_0_0 = 2
 }
@@ -721,7 +724,7 @@ export class TaskSorter {
 	}
 }
 
-export enum TaskEventKind {
+export const enum TaskEventKind {
 	Start = 'start',
 	ProcessStarted = 'processStarted',
 	Active = 'active',
@@ -733,7 +736,7 @@ export enum TaskEventKind {
 }
 
 
-export enum TaskRunType {
+export const enum TaskRunType {
 	SingleRun = 'singleRun',
 	Background = 'background'
 }
diff --git a/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v1.ts b/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v1.ts
index 4ba603fe91e..8fc1c97a78e 100644
--- a/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v1.ts
+++ b/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v1.ts
@@ -23,6 +23,7 @@ const schema: IJSONSchema = {
 						version: {
 							type: 'string',
 							enum: ['0.1.0'],
+							deprecationMessage: nls.localize('JsonSchema.version.deprecated', 'Task version 0.1.0 is deprecated. Please use 2.0.0'),
 							description: nls.localize('JsonSchema.version', 'The config\'s version number')
 						},
 						_runner: {
diff --git a/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.ts b/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.ts
index b365e527b6e..210e94870ec 100644
--- a/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.ts
+++ b/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.ts
@@ -271,7 +271,8 @@ const version: IJSONSchema = {
 
 const identifier: IJSONSchema = {
 	type: 'string',
-	description: nls.localize('JsonSchema.tasks.identifier', 'A user defined identifier to reference the task in launch.json or a dependsOn clause.')
+	description: nls.localize('JsonSchema.tasks.identifier', 'A user defined identifier to reference the task in launch.json or a dependsOn clause.'),
+	deprecationMessage: nls.localize('JsonSchema.tasks.identifier.deprecated', 'User defined identifiers are deprecated. For custom task used the name as a reference and for tasks provided by extensions use their defined task identifier.')
 };
 
 const options: IJSONSchema = Objects.deepClone(commonSchema.definitions.options);
@@ -324,9 +325,11 @@ TaskDefinitionRegistry.onReady().then(() => {
 		if (taskType.required) {
 			schema.required = taskType.required.slice();
 		}
-		for (let key of Object.keys(taskType.properties)) {
-			let property = taskType.properties[key];
-			schema.properties[key] = Objects.deepClone(property);
+		if (taskType.properties) {
+			for (let key of Object.keys(taskType.properties)) {
+				let property = taskType.properties[key];
+				schema.properties[key] = Objects.deepClone(property);
+			}
 		}
 		fixReferences(schema);
 		taskDefinitions.push(schema);
diff --git a/src/vs/workbench/parts/tasks/electron-browser/task.contribution.ts b/src/vs/workbench/parts/tasks/electron-browser/task.contribution.ts
index 7c92b359d10..e3599fccc70 100644
--- a/src/vs/workbench/parts/tasks/electron-browser/task.contribution.ts
+++ b/src/vs/workbench/parts/tasks/electron-browser/task.contribution.ts
@@ -13,11 +13,11 @@ import { QuickOpenHandler } from 'vs/workbench/parts/tasks/browser/taskQuickOpen
 import { TPromise } from 'vs/base/common/winjs.base';
 import Severity from 'vs/base/common/severity';
 import * as Objects from 'vs/base/common/objects';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { IStringDictionary } from 'vs/base/common/collections';
 import { Action } from 'vs/base/common/actions';
 import * as Dom from 'vs/base/browser/dom';
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
+import { IDisposable, dispose, toDisposable } from 'vs/base/common/lifecycle';
 import { Event, Emitter } from 'vs/base/common/event';
 import * as Types from 'vs/base/common/types';
 import { KeyMod, KeyCode } from 'vs/base/common/keyCodes';
@@ -31,7 +31,7 @@ import { OcticonLabel } from 'vs/base/browser/ui/octiconLabel/octiconLabel';
 
 import { Registry } from 'vs/platform/registry/common/platform';
 import { ILifecycleService } from 'vs/platform/lifecycle/common/lifecycle';
-import { MenuRegistry } from 'vs/platform/actions/common/actions';
+import { MenuRegistry, MenuId } from 'vs/platform/actions/common/actions';
 import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
 import { IMarkerService, MarkerStatistics } from 'vs/platform/markers/common/markers';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
@@ -39,10 +39,11 @@ import { IConfigurationService, ConfigurationTarget } from 'vs/platform/configur
 import { IFileService, IFileStat } from 'vs/platform/files/common/files';
 import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
 import { CommandsRegistry } from 'vs/platform/commands/common/commands';
-import { KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRegistry';
+import { KeybindingsRegistry, KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
 import { ProblemMatcherRegistry, NamedProblemMatcher } from 'vs/workbench/parts/tasks/common/problemMatcher';
 import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
-import { IProgressService2, IProgressOptions, ProgressLocation } from 'vs/platform/progress/common/progress';
+import { IProgressService2, IProgressOptions, ProgressLocation } from 'vs/workbench/services/progress/common/progress';
+
 import { IOpenerService } from 'vs/platform/opener/common/opener';
 import { IWindowService } from 'vs/platform/windows/common/windows';
 import { INotificationService } from 'vs/platform/notification/common/notification';
@@ -53,10 +54,10 @@ import { IModelService } from 'vs/editor/common/services/modelService';
 import * as jsonContributionRegistry from 'vs/platform/jsonschemas/common/jsonContributionRegistry';
 import { IJSONSchema } from 'vs/base/common/jsonSchema';
 
-import { IStatusbarItem, IStatusbarRegistry, Extensions as StatusbarExtensions, StatusbarItemDescriptor, StatusbarAlignment } from 'vs/workbench/browser/parts/statusbar/statusbar';
+import { IStatusbarItem, IStatusbarRegistry, Extensions as StatusbarExtensions, StatusbarItemDescriptor } from 'vs/workbench/browser/parts/statusbar/statusbar';
+import { StatusbarAlignment } from 'vs/platform/statusbar/common/statusbar';
 import { IQuickOpenRegistry, Extensions as QuickOpenExtensions, QuickOpenHandlerDescriptor } from 'vs/workbench/browser/quickopen';
 
-import { IQuickOpenService, IPickOpenEntry, IPickOpenAction, IPickOpenItem } from 'vs/platform/quickOpen/common/quickOpen';
 import { IPanelService } from 'vs/workbench/services/panel/common/panelService';
 import Constants from 'vs/workbench/parts/markers/electron-browser/constants';
 import { IPartService } from 'vs/workbench/services/part/common/partService';
@@ -74,7 +75,7 @@ import { ITaskSystem, ITaskResolver, ITaskSummary, TaskExecuteKind, TaskError, T
 import {
 	Task, CustomTask, ConfiguringTask, ContributedTask, InMemoryTask, TaskEvent,
 	TaskEventKind, TaskSet, TaskGroup, GroupType, ExecutionEngine, JsonSchemaVersion, TaskSourceKind,
-	TaskSorter, TaskIdentifier, KeyedTaskIdentifier
+	TaskSorter, TaskIdentifier, KeyedTaskIdentifier, TASK_RUNNING_STATE
 } from 'vs/workbench/parts/tasks/common/tasks';
 import { ITaskService, ITaskProvider, RunOptions, CustomizationProperties, TaskFilter } from 'vs/workbench/parts/tasks/common/taskService';
 import { getTemplates as getTaskTemplates } from 'vs/workbench/parts/tasks/common/taskTemplates';
@@ -89,6 +90,7 @@ import { QuickOpenActionContributor } from '../browser/quickOpen';
 
 import { Themable, STATUS_BAR_FOREGROUND, STATUS_BAR_NO_FOLDER_FOREGROUND } from 'vs/workbench/common/theme';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
+import { IQuickInputService, IQuickPickItem, QuickPickInput } from 'vs/platform/quickinput/common/quickInput';
 
 let tasksCategory = nls.localize('tasksCategory', "Tasks");
 
@@ -118,7 +120,7 @@ class BuildStatusBarItem extends Themable implements IStatusbarItem {
 	}
 
 	private registerListeners(): void {
-		this.toUnbind.push(this.contextService.onDidChangeWorkbenchState(() => this.updateStyles()));
+		this._register(this.contextService.onDidChangeWorkbenchState(() => this.updateStyles()));
 	}
 
 	protected updateStyles(): void {
@@ -252,11 +254,9 @@ class BuildStatusBarItem extends Themable implements IStatusbarItem {
 
 		this.updateStyles();
 
-		return {
-			dispose: () => {
-				callOnDispose = dispose(callOnDispose);
-			}
-		};
+		return toDisposable(() => {
+			callOnDispose = dispose(callOnDispose);
+		});
 	}
 
 	private ignoreEvent(event: TaskEvent): boolean {
@@ -425,7 +425,7 @@ class TaskMap {
 	}
 }
 
-interface TaskQuickPickEntry extends IPickOpenEntry {
+interface TaskQuickPickEntry extends IQuickPickItem {
 	task: Task;
 }
 
@@ -458,6 +458,8 @@ class TaskService implements ITaskService {
 	private _taskSystemListener: IDisposable;
 	private _recentlyUsedTasks: LinkedMap<string, string>;
 
+	private _taskRunningState: IContextKey<boolean>;
+
 	private _outputChannel: IOutputChannel;
 	private readonly _onDidStateChange: Emitter<TaskEvent>;
 
@@ -473,7 +475,7 @@ class TaskService implements ITaskService {
 		@ILifecycleService lifecycleService: ILifecycleService,
 		@IModelService private modelService: IModelService,
 		@IExtensionService private extensionService: IExtensionService,
-		@IQuickOpenService private quickOpenService: IQuickOpenService,
+		@IQuickInputService private quickInputService: IQuickInputService,
 		@IConfigurationResolverService private configurationResolverService: IConfigurationResolverService,
 		@ITerminalService private terminalService: ITerminalService,
 		@IStorageService private storageService: IStorageService,
@@ -481,7 +483,9 @@ class TaskService implements ITaskService {
 		@IOpenerService private openerService: IOpenerService,
 		@IWindowService private readonly _windowService: IWindowService,
 		@IDialogService private dialogService: IDialogService,
-		@INotificationService private notificationService: INotificationService
+		@INotificationService private notificationService: INotificationService,
+		@IContextKeyService contextKeyService: IContextKeyService,
+
 	) {
 		this._configHasErrors = false;
 		this._workspaceTasksPromise = undefined;
@@ -520,6 +524,7 @@ class TaskService implements ITaskService {
 			this.updateSetup(folderSetup);
 			this.updateWorkspaceTasks();
 		});
+		this._taskRunningState = TASK_RUNNING_STATE.bindTo(contextKeyService);
 		lifecycleService.onWillShutdown(event => event.veto(this.beforeShutdown()));
 		this._onDidStateChange = new Emitter();
 		this.registerCommands();
@@ -562,7 +567,7 @@ class TaskService implements ITaskService {
 
 		KeybindingsRegistry.registerKeybindingRule({
 			id: 'workbench.action.tasks.build',
-			weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
+			weight: KeybindingWeight.WorkbenchContrib,
 			when: undefined,
 			primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KEY_B
 		});
@@ -867,12 +872,12 @@ class TaskService implements ITaskService {
 	}
 
 	private attachProblemMatcher(task: ContributedTask | CustomTask): TPromise<Task> {
-		interface ProblemMatcherPickEntry extends IPickOpenEntry {
+		interface ProblemMatcherPickEntry extends IQuickPickItem {
 			matcher: NamedProblemMatcher;
 			never?: boolean;
 			learnMore?: boolean;
 		}
-		let entries: ProblemMatcherPickEntry[] = [];
+		let entries: QuickPickInput<ProblemMatcherPickEntry>[] = [];
 		for (let key of ProblemMatcherRegistry.keys()) {
 			let matcher = ProblemMatcherRegistry.get(key);
 			if (matcher.deprecated) {
@@ -890,15 +895,14 @@ class TaskService implements ITaskService {
 		}
 		if (entries.length > 0) {
 			entries = entries.sort((a, b) => a.label.localeCompare(b.label));
-			entries[0].separator = { border: true, label: nls.localize('TaskService.associate', 'associate') };
+			entries.unshift({ type: 'separator', label: nls.localize('TaskService.associate', 'associate') });
 			entries.unshift(
 				{ label: nls.localize('TaskService.attachProblemMatcher.continueWithout', 'Continue without scanning the task output'), matcher: undefined },
 				{ label: nls.localize('TaskService.attachProblemMatcher.never', 'Never scan the task output'), matcher: undefined, never: true },
 				{ label: nls.localize('TaskService.attachProblemMatcher.learnMoreAbout', 'Learn more about scanning the task output'), matcher: undefined, learnMore: true }
 			);
-			return this.quickOpenService.pick(entries, {
+			return this.quickInputService.pick(entries, {
 				placeHolder: nls.localize('selectProblemMatcher', 'Select for which kind of errors and warnings to scan the task output'),
-				autoFocus: { autoFocusFirstEntry: true }
 			}).then((selected) => {
 				if (selected) {
 					if (selected.learnMore) {
@@ -1061,15 +1065,15 @@ class TaskService implements ITaskService {
 				this.editorService.openEditor({
 					resource,
 					options: {
-						forceOpen: true,
-						pinned: false
+						pinned: false,
+						forceReload: true // because content might have changed
 					}
 				});
 			}
 		});
 	}
 
-	private writeConfiguration(workspaceFolder: IWorkspaceFolder, key: string, value: any): TPromise<void, any> {
+	private writeConfiguration(workspaceFolder: IWorkspaceFolder, key: string, value: any): TPromise<void> {
 		if (this.contextService.getWorkbenchState() === WorkbenchState.FOLDER) {
 			return this.configurationService.updateValue(key, value, { resource: workspaceFolder.uri }, ConfigurationTarget.WORKSPACE);
 		} else if (this.contextService.getWorkbenchState() === WorkbenchState.WORKSPACE) {
@@ -1084,7 +1088,6 @@ class TaskService implements ITaskService {
 		return this.editorService.openEditor({
 			resource,
 			options: {
-				forceOpen: true,
 				pinned: false
 			}
 		}).then(() => undefined);
@@ -1292,13 +1295,18 @@ class TaskService implements ITaskService {
 			this._taskSystem = system;
 		}
 		this._taskSystemListener = this._taskSystem.onDidStateChange((event) => {
+			if (this._taskSystem) {
+				this._taskRunningState.set(this._taskSystem.isActiveSync());
+			}
 			this._onDidStateChange.fire(event);
 		});
 		return this._taskSystem;
 	}
 
 	private getGroupedTasks(): TPromise<TaskMap> {
-		return this.extensionService.activateByEvent('onCommand:workbench.action.tasks.runTask').then(() => {
+		return TPromise.join([this.extensionService.activateByEvent('onCommand:workbench.action.tasks.runTask'), TaskDefinitionRegistry.onReady()]).then(() => {
+			let validTypes: IStringDictionary<boolean> = Object.create(null);
+			TaskDefinitionRegistry.all().forEach(definition => validTypes[definition.taskType] = true);
 			return new TPromise<TaskSet[]>((resolve, reject) => {
 				let result: TaskSet[] = [];
 				let counter: number = 0;
@@ -1327,7 +1335,7 @@ class TaskService implements ITaskService {
 				if (this.schemaVersion === JsonSchemaVersion.V2_0_0 && this._providers.size > 0) {
 					this._providers.forEach((provider) => {
 						counter++;
-						provider.provideTasks().done(done, error);
+						provider.provideTasks(validTypes).then(done, error);
 					});
 				} else {
 					resolve(result);
@@ -1797,32 +1805,13 @@ class TaskService implements ITaskService {
 			}
 			return { label: task._label, description, task };
 		};
-		let taskService = this;
-		let action = new class extends Action implements IPickOpenAction {
-			constructor() {
-				super('configureAction', 'Configure Task', 'quick-open-task-configure', true);
+		function fillEntries(entries: QuickPickInput<TaskQuickPickEntry>[], tasks: Task[], groupLabel: string): void {
+			if (tasks.length) {
+				entries.push({ type: 'separator', label: groupLabel });
 			}
-			public run(item: IPickOpenItem): TPromise<boolean> {
-				let task: Task = item.getPayload();
-				taskService.quickOpenService.close();
-				if (ContributedTask.is(task)) {
-					taskService.customize(task, undefined, true);
-				} else if (CustomTask.is(task)) {
-					taskService.openConfig(task);
-				}
-				return TPromise.as(false);
-			}
-		};
-		function fillEntries(entries: TaskQuickPickEntry[], tasks: Task[], groupLabel: string, withBorder: boolean = false): void {
-			let first = true;
 			for (let task of tasks) {
 				let entry: TaskQuickPickEntry = TaskQuickPickEntry(task);
-				if (first) {
-					first = false;
-					entry.separator = { label: groupLabel, border: withBorder };
-				}
-				entry.action = action;
-				entry.payload = task;
+				entry.buttons = [{ iconClass: 'quick-open-task-configure', tooltip: nls.localize('configureTask', "Configure Task") }];
 				entries.push(entry);
 			}
 		}
@@ -1860,13 +1849,11 @@ class TaskService implements ITaskService {
 					}
 				}
 				const sorter = this.createSorter();
-				let hasRecentlyUsed: boolean = recent.length > 0;
 				fillEntries(entries, recent, nls.localize('recentlyUsed', 'recently used tasks'));
 				configured = configured.sort((a, b) => sorter.compare(a, b));
-				let hasConfigured = configured.length > 0;
-				fillEntries(entries, configured, nls.localize('configured', 'configured tasks'), hasRecentlyUsed);
+				fillEntries(entries, configured, nls.localize('configured', 'configured tasks'));
 				detected = detected.sort((a, b) => sorter.compare(a, b));
-				fillEntries(entries, detected, nls.localize('detected', 'detected tasks'), hasRecentlyUsed || hasConfigured);
+				fillEntries(entries, detected, nls.localize('detected', 'detected tasks'));
 			}
 		} else {
 			if (sort) {
@@ -1886,12 +1873,24 @@ class TaskService implements ITaskService {
 				return tasks.then((tasks) => this.createTaskQuickPickEntries(tasks, group, sort));
 			}
 		};
-		return this.quickOpenService.pick(_createEntries().then((entries) => {
+		return this.quickInputService.pick(_createEntries().then((entries) => {
 			if (entries.length === 0 && defaultEntry) {
 				entries.push(defaultEntry);
 			}
 			return entries;
-		}), { placeHolder, autoFocus: { autoFocusFirstEntry: true }, matchOnDescription: true }).then(entry => entry ? entry.task : undefined);
+		}), {
+				placeHolder,
+				matchOnDescription: true,
+				onDidTriggerItemButton: context => {
+					let task = context.item.task;
+					this.quickInputService.cancel();
+					if (ContributedTask.is(task)) {
+						this.customize(task, undefined, true);
+					} else if (CustomTask.is(task)) {
+						this.openConfig(task);
+					}
+				}
+			}).then(entry => entry ? entry.task : undefined);
 	}
 
 	private showIgnoredFoldersMessage(): TPromise<void> {
@@ -2197,7 +2196,7 @@ class TaskService implements ITaskService {
 				if (stat) {
 					return stat.resource;
 				}
-				return this.quickOpenService.pick(getTaskTemplates(), { placeHolder: nls.localize('TaskService.template', 'Select a Task Template') }).then((selection) => {
+				return this.quickInputService.pick(getTaskTemplates(), { placeHolder: nls.localize('TaskService.template', 'Select a Task Template') }).then((selection) => {
 					if (!selection) {
 						return undefined;
 					}
@@ -2228,7 +2227,6 @@ class TaskService implements ITaskService {
 				this.editorService.openEditor({
 					resource,
 					options: {
-						forceOpen: true,
 						pinned: configFileCreated // pin only if config file is created #8727
 					}
 				});
@@ -2245,8 +2243,8 @@ class TaskService implements ITaskService {
 			}
 		};
 
-		function isTaskEntry(value: IPickOpenEntry): value is IPickOpenEntry & { task: Task } {
-			let candidate: IPickOpenEntry & { task: Task } = value as any;
+		function isTaskEntry(value: IQuickPickItem): value is IQuickPickItem & { task: Task } {
+			let candidate: IQuickPickItem & { task: Task } = value as any;
 			return candidate && !!candidate.task;
 		}
 
@@ -2258,8 +2256,8 @@ class TaskService implements ITaskService {
 		let openLabel = nls.localize('TaskService.openJsonFile', 'Open tasks.json file');
 		let entries = TPromise.join(stats).then((stats) => {
 			return taskPromise.then((taskMap) => {
-				type EntryType = (IPickOpenEntry & { task: Task; }) | (IPickOpenEntry & { folder: IWorkspaceFolder; });
-				let entries: EntryType[] = [];
+				type EntryType = (IQuickPickItem & { task: Task; }) | (IQuickPickItem & { folder: IWorkspaceFolder; });
+				let entries: QuickPickInput<EntryType>[] = [];
 				if (this.contextService.getWorkbenchState() === WorkbenchState.FOLDER) {
 					let tasks = taskMap.all();
 					let needsCreateOrOpen: boolean = true;
@@ -2274,7 +2272,10 @@ class TaskService implements ITaskService {
 					}
 					if (needsCreateOrOpen) {
 						let label = stats[0] !== void 0 ? openLabel : createLabel;
-						entries.push({ label, folder: this.contextService.getWorkspace().folders[0], separator: entries.length > 0 ? { border: true } : undefined });
+						if (entries.length) {
+							entries.push({ type: 'separator' });
+						}
+						entries.push({ label, folder: this.contextService.getWorkspace().folders[0] });
 					}
 				} else {
 					let folders = this.contextService.getWorkspace().folders;
@@ -2286,14 +2287,14 @@ class TaskService implements ITaskService {
 							for (let i = 0; i < tasks.length; i++) {
 								let entry: EntryType = { label: tasks[i]._label, task: tasks[i], description: folder.name };
 								if (i === 0) {
-									entry.separator = { label: folder.name, border: index > 0 };
+									entries.push({ type: 'separator', label: folder.name });
 								}
 								entries.push(entry);
 							}
 						} else {
 							let label = stats[index] !== void 0 ? openLabel : createLabel;
 							let entry: EntryType = { label, folder: folder };
-							entry.separator = { label: folder.name, border: index > 0 };
+							entries.push({ type: 'separator', label: folder.name });
 							entries.push(entry);
 						}
 						index++;
@@ -2303,8 +2304,8 @@ class TaskService implements ITaskService {
 			});
 		});
 
-		this.quickOpenService.pick(entries,
-			{ placeHolder: nls.localize('TaskService.pickTask', 'Select a task to configure'), autoFocus: { autoFocusFirstEntry: true } }).
+		this.quickInputService.pick(entries,
+			{ placeHolder: nls.localize('TaskService.pickTask', 'Select a task to configure') }).
 			then((selection) => {
 				if (!selection) {
 					return;
@@ -2419,6 +2420,75 @@ class TaskService implements ITaskService {
 	}
 }
 
+MenuRegistry.appendMenuItem(MenuId.MenubarTerminalMenu, {
+	group: '2_run',
+	command: {
+		id: 'workbench.action.tasks.runTask',
+		title: nls.localize({ key: 'miRunTask', comment: ['&& denotes a mnemonic'] }, "&&Run Task...")
+	},
+	order: 1
+});
+
+MenuRegistry.appendMenuItem(MenuId.MenubarTerminalMenu, {
+	group: '2_run',
+	command: {
+		id: 'workbench.action.tasks.build',
+		title: nls.localize({ key: 'miBuildTask', comment: ['&& denotes a mnemonic'] }, "Run &&Build Task...")
+	},
+	order: 2
+});
+
+// Manage Tasks
+MenuRegistry.appendMenuItem(MenuId.MenubarTerminalMenu, {
+	group: '3_manage',
+	command: {
+		precondition: TASK_RUNNING_STATE,
+		id: 'workbench.action.tasks.showTasks',
+		title: nls.localize({ key: 'miRunningTask', comment: ['&& denotes a mnemonic'] }, "Show Runnin&&g Tasks...")
+	},
+	order: 1
+});
+
+MenuRegistry.appendMenuItem(MenuId.MenubarTerminalMenu, {
+	group: '3_manage',
+	command: {
+		precondition: TASK_RUNNING_STATE,
+		id: 'workbench.action.tasks.restartTask',
+		title: nls.localize({ key: 'miRestartTask', comment: ['&& denotes a mnemonic'] }, "R&&estart Running Task...")
+	},
+	order: 2
+});
+
+MenuRegistry.appendMenuItem(MenuId.MenubarTerminalMenu, {
+	group: '3_manage',
+	command: {
+		precondition: TASK_RUNNING_STATE,
+		id: 'workbench.action.tasks.terminate',
+		title: nls.localize({ key: 'miTerminateTask', comment: ['&& denotes a mnemonic'] }, "&&Terminate Task...")
+	},
+	order: 3
+});
+
+// Configure Tasks
+MenuRegistry.appendMenuItem(MenuId.MenubarTerminalMenu, {
+	group: '4_configure',
+	command: {
+		id: 'workbench.action.tasks.configureTaskRunner',
+		title: nls.localize({ key: 'miConfigureTask', comment: ['&& denotes a mnemonic'] }, "&&Configure Tasks...")
+	},
+	order: 1
+});
+
+MenuRegistry.appendMenuItem(MenuId.MenubarTerminalMenu, {
+	group: '4_configure',
+	command: {
+		id: 'workbench.action.tasks.configureDefaultBuildTask',
+		title: nls.localize({ key: 'miConfigureBuildTask', comment: ['&& denotes a mnemonic'] }, "Configure De&&fault Build Task...")
+	},
+	order: 2
+});
+
+
 MenuRegistry.addCommand({ id: ConfigureTaskAction.ID, title: { value: ConfigureTaskAction.TEXT, original: 'Configure Task' }, category: { value: tasksCategory, original: 'Tasks' } });
 MenuRegistry.addCommand({ id: 'workbench.action.tasks.showLog', title: { value: nls.localize('ShowLogAction.label', "Show Task Log"), original: 'Show Task Log' }, category: { value: tasksCategory, original: 'Tasks' } });
 MenuRegistry.addCommand({ id: 'workbench.action.tasks.runTask', title: { value: nls.localize('RunTaskAction.label', "Run Task"), original: 'Run Task' }, category: { value: tasksCategory, original: 'Tasks' } });
@@ -2434,7 +2504,7 @@ MenuRegistry.addCommand({ id: 'workbench.action.tasks.configureDefaultTestTask',
 
 // Tasks Output channel. Register it before using it in Task Service.
 let outputChannelRegistry = Registry.as<IOutputChannelRegistry>(OutputExt.OutputChannels);
-outputChannelRegistry.registerChannel(TaskService.OutputChannelId, TaskService.OutputChannelLabel);
+outputChannelRegistry.registerChannel({ id: TaskService.OutputChannelId, label: TaskService.OutputChannelLabel, log: false });
 
 // Task Service
 registerSingleton(ITaskService, TaskService);
@@ -2486,6 +2556,8 @@ let schema: IJSONSchema = {
 
 import schemaVersion1 from './jsonSchema_v1';
 import schemaVersion2 from './jsonSchema_v2';
+import { TaskDefinitionRegistry } from 'vs/workbench/parts/tasks/common/taskDefinitionRegistry';
+import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 schema.definitions = {
 	...schemaVersion1.definitions,
 	...schemaVersion2.definitions,
diff --git a/src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.ts b/src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.ts
index b60cd559cb7..cc5ca579552 100644
--- a/src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.ts
+++ b/src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.ts
@@ -316,7 +316,7 @@ export class TerminalTaskSystem implements ITaskSystem {
 			resolvedVariables = TPromise.as(result);
 		}
 		return resolvedVariables.then((variables) => {
-			return this.executeInTerminal(task, trigger, new VariableResolver(workspaceFolder, undefined, variables, this.configurationResolverService));
+			return this.executeInTerminal(task, trigger, new VariableResolver(workspaceFolder, taskSystemInfo, variables, this.configurationResolverService));
 		});
 	}
 
@@ -329,9 +329,9 @@ export class TerminalTaskSystem implements ITaskSystem {
 			promise = new TPromise<ITaskSummary>((resolve, reject) => {
 				const problemMatchers = this.resolveMatchers(resolver, task.problemMatchers);
 				let watchingProblemMatcher = new WatchingProblemCollector(problemMatchers, this.markerService, this.modelService);
-				let toUnbind: IDisposable[] = [];
+				let toDispose: IDisposable[] = [];
 				let eventCounter: number = 0;
-				toUnbind.push(watchingProblemMatcher.onDidStateChange((event) => {
+				toDispose.push(watchingProblemMatcher.onDidStateChange((event) => {
 					if (event.kind === ProblemCollectorEventKind.BackgroundProcessingBegins) {
 						eventCounter++;
 						this._onDidStateChange.fire(TaskEvent.create(TaskEventKind.Active, task));
@@ -354,7 +354,7 @@ export class TerminalTaskSystem implements ITaskSystem {
 					return;
 				}
 				let processStartedSignaled: boolean = false;
-				terminal.processReady.done(() => {
+				terminal.processReady.then(() => {
 					processStartedSignaled = true;
 					this._onDidStateChange.fire(TaskEvent.create(TaskEventKind.ProcessStarted, task, terminal.processId));
 				}, (_error) => {
@@ -397,8 +397,8 @@ export class TerminalTaskSystem implements ITaskSystem {
 					if (processStartedSignaled) {
 						this._onDidStateChange.fire(TaskEvent.create(TaskEventKind.ProcessEnded, task, exitCode));
 					}
-					toUnbind = dispose(toUnbind);
-					toUnbind = null;
+					toDispose = dispose(toDispose);
+					toDispose = null;
 					for (let i = 0; i < eventCounter; i++) {
 						let event = TaskEvent.create(TaskEventKind.Inactive, task);
 						this._onDidStateChange.fire(event);
@@ -415,7 +415,7 @@ export class TerminalTaskSystem implements ITaskSystem {
 					return;
 				}
 				let processStartedSignaled: boolean = false;
-				terminal.processReady.done(() => {
+				terminal.processReady.then(() => {
 					processStartedSignaled = true;
 					this._onDidStateChange.fire(TaskEvent.create(TaskEventKind.ProcessStarted, task, terminal.processId));
 				}, (_error) => {
@@ -517,6 +517,7 @@ export class TerminalTaskSystem implements ITaskSystem {
 	}
 
 	private createTerminal(task: CustomTask | ContributedTask, resolver: VariableResolver): [ITerminalInstance, string, TaskError | undefined] {
+		let platform = resolver.taskSystemInfo ? resolver.taskSystemInfo.platform : Platform.platform;
 		let options = this.resolveOptions(resolver, task.command.options);
 		let { command, args } = this.resolveCommandAndArgs(resolver, task.command);
 		let commandExecutable = CommandString.value(command);
@@ -537,24 +538,25 @@ export class TerminalTaskSystem implements ITaskSystem {
 		let isShellCommand = task.command.runtime === RuntimeType.Shell;
 		if (isShellCommand) {
 			shellLaunchConfig = { name: terminalName, executable: null, args: null, waitOnExit };
+			this.terminalService.configHelper.mergeDefaultShellPathAndArgs(shellLaunchConfig, platform);
 			let shellSpecified: boolean = false;
 			let shellOptions: ShellConfiguration = task.command.options && task.command.options.shell;
-			if (shellOptions && shellOptions.executable) {
-				shellLaunchConfig.executable = this.resolveVariable(resolver, shellOptions.executable);
-				shellSpecified = true;
+			if (shellOptions) {
+				if (shellOptions.executable) {
+					shellLaunchConfig.executable = this.resolveVariable(resolver, shellOptions.executable);
+					shellSpecified = true;
+				}
 				if (shellOptions.args) {
 					shellLaunchConfig.args = this.resolveVariables(resolver, shellOptions.args.slice());
 				} else {
 					shellLaunchConfig.args = [];
 				}
-			} else {
-				this.terminalService.configHelper.mergeDefaultShellPathAndArgs(shellLaunchConfig);
 			}
 			let shellArgs = <string[]>shellLaunchConfig.args.slice(0);
 			let toAdd: string[] = [];
 			let commandLine = this.buildShellCommandLine(shellLaunchConfig.executable, shellOptions, command, args);
 			let windowsShellArgs: boolean = false;
-			if (Platform.isWindows) {
+			if (platform === Platform.Platform.Windows) {
 				// Change Sysnative to System32 if the OS is Windows but NOT WoW64. It's
 				// safe to assume that this was used by accident as Sysnative does not
 				// exist and will break the terminal in non-WoW64 environments.
@@ -641,14 +643,23 @@ export class TerminalTaskSystem implements ITaskSystem {
 		}
 		if (options.cwd) {
 			let cwd = options.cwd;
-			if (!path.isAbsolute(cwd)) {
+			let p: typeof path;
+			// This must be normalized to the OS
+			if (platform === Platform.Platform.Windows) {
+				p = path.win32 as any;
+			} else if (platform === Platform.Platform.Linux || platform === Platform.Platform.Mac) {
+				p = path.posix as any;
+			} else {
+				p = path;
+			}
+			if (!p.isAbsolute(cwd)) {
 				let workspaceFolder = Task.getWorkspaceFolder(task);
 				if (workspaceFolder.uri.scheme === 'file') {
-					cwd = path.join(workspaceFolder.uri.fsPath, cwd);
+					cwd = p.join(workspaceFolder.uri.fsPath, cwd);
 				}
 			}
 			// This must be normalized to the OS
-			shellLaunchConfig.cwd = path.normalize(cwd);
+			shellLaunchConfig.cwd = p.normalize(cwd);
 		}
 		if (options.env) {
 			shellLaunchConfig.env = options.env;
@@ -959,13 +970,13 @@ export class TerminalTaskSystem implements ITaskSystem {
 			}
 			let taskSystemInfo: TaskSystemInfo = resolver.taskSystemInfo;
 			let hasFilePrefix = matcher.filePrefix !== void 0;
-			let hasScheme = taskSystemInfo !== void 0 && taskSystemInfo.fileSystemScheme !== void 0 && taskSystemInfo.fileSystemScheme !== 'file';
-			if (!hasFilePrefix && !hasScheme) {
+			let hasUriProvider = taskSystemInfo !== void 0 && taskSystemInfo.uriProvider !== void 0;
+			if (!hasFilePrefix && !hasUriProvider) {
 				result.push(matcher);
 			} else {
 				let copy = Objects.deepClone(matcher);
-				if (hasScheme) {
-					copy.fileSystemScheme = taskSystemInfo.fileSystemScheme;
+				if (hasUriProvider) {
+					copy.uriProvider = taskSystemInfo.uriProvider;
 				}
 				if (hasFilePrefix) {
 					copy.filePrefix = this.resolveVariable(resolver, copy.filePrefix);
diff --git a/src/vs/workbench/parts/tasks/node/processRunnerDetector.ts b/src/vs/workbench/parts/tasks/node/processRunnerDetector.ts
index 8169d1f3c8c..601a2db9a36 100644
--- a/src/vs/workbench/parts/tasks/node/processRunnerDetector.ts
+++ b/src/vs/workbench/parts/tasks/node/processRunnerDetector.ts
@@ -12,7 +12,7 @@ import * as Strings from 'vs/base/common/strings';
 import * as Collections from 'vs/base/common/collections';
 
 import { CommandOptions, Source, ErrorData } from 'vs/base/common/processes';
-import { LineProcess } from 'vs/base/node/processes';
+import { LineProcess, LineData } from 'vs/base/node/processes';
 
 import { IFileService } from 'vs/platform/files/common/files';
 
@@ -39,7 +39,7 @@ interface TaskInfos {
 
 interface TaskDetectorMatcher {
 	init(): void;
-	match(tasks: string[], line: string);
+	match(tasks: string[], line: string): void;
 }
 
 interface DetectorConfig {
@@ -57,7 +57,7 @@ class RegexpTaskMatcher implements TaskDetectorMatcher {
 	init() {
 	}
 
-	match(tasks: string[], line: string) {
+	match(tasks: string[], line: string): void {
 		let matches = this.regexp.exec(line);
 		if (matches && matches.length > 0) {
 			tasks.push(matches[1]);
@@ -76,7 +76,7 @@ class GruntTaskMatcher implements TaskDetectorMatcher {
 		this.descriptionOffset = null;
 	}
 
-	match(tasks: string[], line: string) {
+	match(tasks: string[], line: string): void {
 		// grunt lists tasks as follows (description is wrapped into a new line if too long):
 		// ...
 		// Available tasks
@@ -269,7 +269,17 @@ export class ProcessRunnerDetector {
 	private runDetection(process: LineProcess, command: string, isShellCommand: boolean, matcher: TaskDetectorMatcher, problemMatchers: string[], list: boolean): TPromise<DetectorResult> {
 		let tasks: string[] = [];
 		matcher.init();
-		return process.start().then((success) => {
+
+		const onProgress = (progress: LineData) => {
+			if (progress.source === Source.stderr) {
+				this._stderr.push(progress.line);
+				return;
+			}
+			let line = Strings.removeAnsiEscapeCodes(progress.line);
+			matcher.match(tasks, line);
+		};
+
+		return process.start(onProgress).then((success) => {
 			if (tasks.length === 0) {
 				if (success.cmdCode !== 0) {
 					if (command === 'gulp') {
@@ -305,16 +315,6 @@ export class ProcessRunnerDetector {
 				this._stderr.push(nls.localize('TaskSystemDetector.noProgram', 'Program {0} was not found. Message is {1}', command, error.message));
 			}
 			return { config: null, stdout: this._stdout, stderr: this._stderr };
-		}, (progress) => {
-			if (progress.source === Source.stderr) {
-				this._stderr.push(progress.line);
-				return;
-			}
-			let line = Strings.removeAnsiEscapeCodes(progress.line);
-			let matches = matcher.match(tasks, line);
-			if (matches && matches.length > 0) {
-				tasks.push(matches[1]);
-			}
 		});
 	}
 
diff --git a/src/vs/workbench/parts/tasks/node/processTaskSystem.ts b/src/vs/workbench/parts/tasks/node/processTaskSystem.ts
index 27a7ca1e08b..8380beb70b3 100644
--- a/src/vs/workbench/parts/tasks/node/processTaskSystem.ts
+++ b/src/vs/workbench/parts/tasks/node/processTaskSystem.ts
@@ -233,9 +233,9 @@ export class ProcessTaskSystem implements ITaskSystem {
 		}
 		if (task.isBackground) {
 			let watchingProblemMatcher = new WatchingProblemCollector(this.resolveMatchers(task, task.problemMatchers), this.markerService, this.modelService);
-			let toUnbind: IDisposable[] = [];
+			let toDispose: IDisposable[] = [];
 			let eventCounter: number = 0;
-			toUnbind.push(watchingProblemMatcher.onDidStateChange((event) => {
+			toDispose.push(watchingProblemMatcher.onDidStateChange((event) => {
 				if (event.kind === ProblemCollectorEventKind.BackgroundProcessingBegins) {
 					eventCounter++;
 					this._onDidStateChange.fire(TaskEvent.create(TaskEventKind.Active, task));
@@ -249,7 +249,21 @@ export class ProcessTaskSystem implements ITaskSystem {
 			this.activeTask = task;
 			const inactiveEvent = TaskEvent.create(TaskEventKind.Inactive, task);
 			let processStartedSignaled: boolean = false;
-			const startPromise = this.childProcess.start();
+			const onProgress = (progress: LineData) => {
+				let line = Strings.removeAnsiEscapeCodes(progress.line);
+				this.outputChannel.append(line + '\n');
+				watchingProblemMatcher.processLine(line);
+				if (delayer === null) {
+					delayer = new Async.Delayer(3000);
+				}
+				delayer.trigger(() => {
+					watchingProblemMatcher.forceDelivery();
+					return null;
+				}).then(() => {
+					delayer = null;
+				});
+			};
+			const startPromise = this.childProcess.start(onProgress);
 			this.childProcess.pid.then(pid => {
 				if (pid !== -1) {
 					processStartedSignaled = true;
@@ -263,8 +277,8 @@ export class ProcessTaskSystem implements ITaskSystem {
 				if (processStartedSignaled) {
 					this._onDidStateChange.fire(TaskEvent.create(TaskEventKind.ProcessEnded, task, success.cmdCode));
 				}
-				toUnbind = dispose(toUnbind);
-				toUnbind = null;
+				toDispose = dispose(toDispose);
+				toDispose = null;
 				for (let i = 0; i < eventCounter; i++) {
 					this._onDidStateChange.fire(inactiveEvent);
 				}
@@ -280,26 +294,13 @@ export class ProcessTaskSystem implements ITaskSystem {
 			}, (error: ErrorData) => {
 				this.childProcessEnded();
 				watchingProblemMatcher.dispose();
-				toUnbind = dispose(toUnbind);
-				toUnbind = null;
+				toDispose = dispose(toDispose);
+				toDispose = null;
 				for (let i = 0; i < eventCounter; i++) {
 					this._onDidStateChange.fire(inactiveEvent);
 				}
 				eventCounter = 0;
 				return this.handleError(task, error);
-			}, (progress: LineData) => {
-				let line = Strings.removeAnsiEscapeCodes(progress.line);
-				this.outputChannel.append(line + '\n');
-				watchingProblemMatcher.processLine(line);
-				if (delayer === null) {
-					delayer = new Async.Delayer(3000);
-				}
-				delayer.trigger(() => {
-					watchingProblemMatcher.forceDelivery();
-					return null;
-				}).then(() => {
-					delayer = null;
-				});
 			});
 			let result: ITaskExecuteResult = (<any>task).tscWatch
 				? { kind: TaskExecuteKind.Started, started: { restartOnFileChanges: '**/*.ts' }, promise: this.activeTaskPromise }
@@ -312,7 +313,12 @@ export class ProcessTaskSystem implements ITaskSystem {
 			this.activeTask = task;
 			const inactiveEvent = TaskEvent.create(TaskEventKind.Inactive, task);
 			let processStartedSignaled: boolean = false;
-			const startPromise = this.childProcess.start();
+			const onProgress = (progress) => {
+				let line = Strings.removeAnsiEscapeCodes(progress.line);
+				this.outputChannel.append(line + '\n');
+				startStopProblemMatcher.processLine(line);
+			};
+			const startPromise = this.childProcess.start(onProgress);
 			this.childProcess.pid.then(pid => {
 				if (pid !== -1) {
 					processStartedSignaled = true;
@@ -340,10 +346,6 @@ export class ProcessTaskSystem implements ITaskSystem {
 				this._onDidStateChange.fire(inactiveEvent);
 				this._onDidStateChange.fire(TaskEvent.create(TaskEventKind.End, task));
 				return this.handleError(task, error);
-			}, (progress) => {
-				let line = Strings.removeAnsiEscapeCodes(progress.line);
-				this.outputChannel.append(line + '\n');
-				startStopProblemMatcher.processLine(line);
 			});
 			return { kind: TaskExecuteKind.Started, started: {}, promise: this.activeTaskPromise };
 		}
@@ -359,7 +361,7 @@ export class ProcessTaskSystem implements ITaskSystem {
 		let makeVisible = false;
 		if (errorData.error && !errorData.terminated) {
 			let args: string = task.command.args ? task.command.args.join(' ') : '';
-			this.log(nls.localize('TaskRunnerSystem.childProcessError', 'Failed to launch external program {0} {1}.', task.command.name, args));
+			this.log(nls.localize('TaskRunnerSystem.childProcessError', 'Failed to launch external program {0} {1}.', JSON.stringify(task.command.name), args));
 			this.outputChannel.append(errorData.error.message);
 			makeVisible = true;
 		}
diff --git a/src/vs/workbench/parts/tasks/node/taskConfiguration.ts b/src/vs/workbench/parts/tasks/node/taskConfiguration.ts
index 21a503e8059..4cbe7cc1bf3 100644
--- a/src/vs/workbench/parts/tasks/node/taskConfiguration.ts
+++ b/src/vs/workbench/parts/tasks/node/taskConfiguration.ts
@@ -25,7 +25,7 @@ import { TaskDefinitionRegistry } from '../common/taskDefinitionRegistry';
 
 import { TaskDefinition } from 'vs/workbench/parts/tasks/node/tasks';
 
-export enum ShellQuoting {
+export const enum ShellQuoting {
 	/**
 	 * Default is character escaping.
 	 */
@@ -63,7 +63,7 @@ export interface ShellQuotingOptions {
 }
 
 export interface ShellConfiguration {
-	executable: string;
+	executable?: string;
 	args?: string[];
 	quoting?: ShellQuotingOptions;
 }
@@ -637,14 +637,17 @@ namespace ShellConfiguration {
 
 	export function is(value: any): value is ShellConfiguration {
 		let candidate: ShellConfiguration = value;
-		return candidate && Types.isString(candidate.executable) && (candidate.args === void 0 || Types.isStringArray(candidate.args));
+		return candidate && (Types.isString(candidate.executable) || Types.isStringArray(candidate.args));
 	}
 
 	export function from(this: void, config: ShellConfiguration, context: ParseContext): Tasks.ShellConfiguration {
 		if (!is(config)) {
 			return undefined;
 		}
-		let result: ShellConfiguration = { executable: config.executable };
+		let result: ShellConfiguration = {};
+		if (config.executable !== void 0) {
+			result.executable = config.executable;
+		}
 		if (config.args !== void 0) {
 			result.args = config.args.slice();
 		}
@@ -887,7 +890,12 @@ namespace CommandConfiguration {
 				if (converted !== void 0) {
 					result.args.push(converted);
 				} else {
-					context.problemReporter.error(nls.localize('ConfigurationParser.inValidArg', 'Error: command argument must either be a string or a quoted string. Provided value is:\n{0}', context.problemReporter.error(nls.localize('ConfigurationParser.noargs', 'Error: command arguments must be an array of strings. Provided value is:\n{0}', arg ? JSON.stringify(arg, undefined, 4) : 'undefined'))));
+					context.problemReporter.error(
+						nls.localize(
+							'ConfigurationParser.inValidArg',
+							'Error: command argument must either be a string or a quoted string. Provided value is:\n{0}',
+							arg ? JSON.stringify(arg, undefined, 4) : 'undefined'
+						));
 				}
 			}
 		}
@@ -1177,7 +1185,7 @@ namespace ConfigurationProperties {
 			if (Types.isArray(external.dependsOn)) {
 				result.dependsOn = external.dependsOn.map(item => TaskDependency.from(item, context));
 			} else {
-				result.dependsOn = [TaskDependency.from(external, context)];
+				result.dependsOn = [TaskDependency.from(external.dependsOn, context)];
 			}
 		}
 		if (includeCommandOptions && (external.presentation !== void 0 || (external as LegacyCommandProperties).terminal !== void 0)) {
@@ -1254,7 +1262,7 @@ namespace ConfiguringTask {
 		if (taskIdentifier === void 0) {
 			context.problemReporter.error(nls.localize(
 				'ConfigurationParser.incorrectType',
-				'Error: the task configuration \'{0}\' is using and unknown type. The task configuration will be ignored.', JSON.stringify(external, undefined, 0)
+				'Error: the task configuration \'{0}\' is using an unknown type. The task configuration will be ignored.', JSON.stringify(external, undefined, 0)
 			));
 			return undefined;
 		}
diff --git a/src/vs/workbench/parts/tasks/node/tasks.ts b/src/vs/workbench/parts/tasks/node/tasks.ts
index c0cd15ad06d..a24e94c013a 100644
--- a/src/vs/workbench/parts/tasks/node/tasks.ts
+++ b/src/vs/workbench/parts/tasks/node/tasks.ts
@@ -27,7 +27,10 @@ namespace TaskDefinition {
 	export function createTaskIdentifier(external: TaskIdentifier, reporter: { error(message: string): void; }): KeyedTaskIdentifier | undefined {
 		let definition = TaskDefinitionRegistry.get(external.type);
 		if (definition === void 0) {
-			return undefined;
+			// We have no task definition so we can't sanitize the literal. Take it as is
+			let copy = Objects.deepClone(external);
+			delete copy._key;
+			return KeyedTaskIdentifier.create(copy);
 		}
 
 		let literal: { type: string;[name: string]: any } = Object.create(null);
diff --git a/src/vs/workbench/parts/tasks/test/electron-browser/configuration.test.ts b/src/vs/workbench/parts/tasks/test/electron-browser/configuration.test.ts
index 5a20b10de7d..8100e22fb60 100644
--- a/src/vs/workbench/parts/tasks/test/electron-browser/configuration.test.ts
+++ b/src/vs/workbench/parts/tasks/test/electron-browser/configuration.test.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import * as assert from 'assert';
 import Severity from 'vs/base/common/severity';
 import * as UUID from 'vs/base/common/uuid';
diff --git a/src/vs/workbench/parts/terminal/browser/terminalFindWidget.ts b/src/vs/workbench/parts/terminal/browser/terminalFindWidget.ts
index 7558aa6baef..4369e7c078b 100644
--- a/src/vs/workbench/parts/terminal/browser/terminalFindWidget.ts
+++ b/src/vs/workbench/parts/terminal/browser/terminalFindWidget.ts
@@ -7,9 +7,6 @@ import { SimpleFindWidget } from 'vs/editor/contrib/find/simpleFindWidget';
 import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
 import { ITerminalService, KEYBINDING_CONTEXT_TERMINAL_FIND_WIDGET_INPUT_FOCUSED } from 'vs/workbench/parts/terminal/common/terminal';
 import { IContextKeyService, IContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { IStorageService } from 'vs/platform/storage/common/storage';
 
 export class TerminalFindWidget extends SimpleFindWidget {
 	protected _findInputFocused: IContextKey<boolean>;
@@ -17,23 +14,19 @@ export class TerminalFindWidget extends SimpleFindWidget {
 	constructor(
 		@IContextViewService _contextViewService: IContextViewService,
 		@IContextKeyService private readonly _contextKeyService: IContextKeyService,
-		@ITerminalService private readonly _terminalService: ITerminalService,
-		@IKeybindingService keybindingService: IKeybindingService,
-		@INotificationService notificationService: INotificationService,
-		@IStorageService storageService: IStorageService
+		@ITerminalService private readonly _terminalService: ITerminalService
 	) {
-		super(_contextViewService, _contextKeyService, keybindingService, notificationService, storageService);
+		super(_contextViewService, _contextKeyService);
 		this._findInputFocused = KEYBINDING_CONTEXT_TERMINAL_FIND_WIDGET_INPUT_FOCUSED.bindTo(this._contextKeyService);
 	}
 
 	public find(previous: boolean) {
-		let val = this.inputValue;
-		let instance = this._terminalService.getActiveInstance();
+		const instance = this._terminalService.getActiveInstance();
 		if (instance !== null) {
 			if (previous) {
-				instance.findPrevious(val);
+				instance.findPrevious(this.inputValue);
 			} else {
-				instance.findNext(val);
+				instance.findNext(this.inputValue);
 			}
 		}
 	}
diff --git a/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.ts b/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.ts
index f08c16eb73f..fa2f6e78e84 100644
--- a/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.ts
+++ b/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.ts
@@ -13,6 +13,7 @@ import { ContributableActionProvider } from 'vs/workbench/browser/actions';
 import { stripWildcards } from 'vs/base/common/strings';
 import { matchesFuzzy } from 'vs/base/common/filters';
 import { ICommandService } from 'vs/platform/commands/common/commands';
+import { CancellationToken } from 'vs/base/common/cancellation';
 
 export class TerminalEntry extends QuickOpenEntry {
 
@@ -83,7 +84,7 @@ export class TerminalPickerHandler extends QuickOpenHandler {
 		super();
 	}
 
-	public getResults(searchValue: string): TPromise<QuickOpenModel> {
+	public getResults(searchValue: string, token: CancellationToken): TPromise<QuickOpenModel> {
 		searchValue = searchValue.trim();
 		const normalizedSearchValueLowercase = stripWildcards(searchValue).toLowerCase();
 
diff --git a/src/vs/workbench/parts/terminal/browser/terminalTab.ts b/src/vs/workbench/parts/terminal/browser/terminalTab.ts
index c14c3d449d7..651f27fb815 100644
--- a/src/vs/workbench/parts/terminal/browser/terminalTab.ts
+++ b/src/vs/workbench/parts/terminal/browser/terminalTab.ts
@@ -7,7 +7,7 @@ import { ITerminalInstance, IShellLaunchConfig, ITerminalTab, Direction, ITermin
 import { IContextKey } from 'vs/platform/contextkey/common/contextkey';
 import { Event, Emitter, anyEvent } from 'vs/base/common/event';
 import { IDisposable, Disposable } from 'vs/base/common/lifecycle';
-import { SplitView, Orientation, IView } from 'vs/base/browser/ui/splitview/splitview';
+import { SplitView, Orientation, IView, Sizing } from 'vs/base/browser/ui/splitview/splitview';
 import { IPartService, Position } from 'vs/workbench/services/part/common/partService';
 
 const SPLIT_PANE_MIN_SIZE = 120;
@@ -19,10 +19,6 @@ class SplitPaneContainer {
 	private _splitViewDisposables: IDisposable[];
 	private _children: SplitPane[] = [];
 
-	// If the user sizes the panes manually, the proportional resizing will not be applied.
-	// Proportional resizing will come back when: a sash is reset, an instance is added/removed or
-	// the panel position moves.
-	private _isManuallySized: boolean = false;
 
 	private _onDidChange: Event<number | undefined> = Event.None;
 	public get onDidChange(): Event<number | undefined> { return this._onDidChange; }
@@ -40,28 +36,11 @@ class SplitPaneContainer {
 	private _createSplitView(): void {
 		this._splitView = new SplitView(this._container, { orientation: this.orientation });
 		this._splitViewDisposables = [];
-		this._splitViewDisposables.push(this._splitView.onDidSashReset(() => this.resetSize()));
-		this._splitViewDisposables.push(this._splitView.onDidSashChange(() => {
-			this._isManuallySized = true;
-		}));
+		this._splitViewDisposables.push(this._splitView.onDidSashReset(() => this._splitView.distributeViewSizes()));
 	}
 
 	public split(instance: ITerminalInstance, index: number = this._children.length): void {
-		const size = this.orientation === Orientation.HORIZONTAL ? this._width : this._height;
-		this._addChild(size / (this._children.length + 1), instance, index);
-	}
-
-	public resetSize(): void {
-		// TODO: Optimize temrinal instance layout
-		let totalSize = 0;
-		for (let i = 0; i < this._splitView.length; i++) {
-			totalSize += this._splitView.getViewSize(i);
-		}
-		const newSize = Math.floor(totalSize / this._splitView.length);
-		for (let i = 0; i < this._splitView.length - 1; i++) {
-			this._splitView.resizeView(i, newSize);
-		}
-		this._isManuallySized = false;
+		this._addChild(instance, index);
 	}
 
 	public resizePane(index: number, direction: Direction, amount: number): void {
@@ -111,10 +90,9 @@ class SplitPaneContainer {
 		for (let i = 0; i < this._splitView.length - 1; i++) {
 			this._splitView.resizeView(i, sizes[i]);
 		}
-		this._isManuallySized = true;
 	}
 
-	private _addChild(size: number, instance: ITerminalInstance, index: number): void {
+	private _addChild(instance: ITerminalInstance, index: number): void {
 		const child = new SplitPane(instance, this.orientation === Orientation.HORIZONTAL ? this._height : this._width);
 		child.orientation = this.orientation;
 		if (typeof index === 'number') {
@@ -123,9 +101,7 @@ class SplitPaneContainer {
 			this._children.push(child);
 		}
 
-		this._withDisabledLayout(() => this._splitView.addView(child, size, index));
-
-		this.resetSize();
+		this._withDisabledLayout(() => this._splitView.addView(child, Sizing.Distribute, index));
 
 		this._onDidChange = anyEvent(...this._children.map(c => c.onDidChange));
 	}
@@ -139,8 +115,7 @@ class SplitPaneContainer {
 		}
 		if (index !== null) {
 			this._children.splice(index, 1);
-			this._splitView.removeView(index);
-			this.resetSize();
+			this._splitView.removeView(index, Sizing.Distribute);
 		}
 	}
 
@@ -154,9 +129,6 @@ class SplitPaneContainer {
 			this._children.forEach(c => c.orthogonalLayout(width));
 			this._splitView.layout(height);
 		}
-		if (!this._isManuallySized) {
-			this.resetSize();
-		}
 	}
 
 	public setOrientation(orientation: Orientation): void {
@@ -306,7 +278,7 @@ export class TerminalTab extends Disposable implements ITerminalTab {
 
 		// Adjust focus if the instance was active
 		if (wasActiveInstance && this._terminalInstances.length > 0) {
-			let newIndex = index < this._terminalInstances.length ? index : this._terminalInstances.length - 1;
+			const newIndex = index < this._terminalInstances.length ? index : this._terminalInstances.length - 1;
 			this.setActiveInstanceByIndex(newIndex);
 			// TODO: Only focus the new instance if the tab had focus?
 			this.activeInstance.focus(true);
@@ -422,10 +394,6 @@ export class TerminalTab extends Disposable implements ITerminalTab {
 			}
 
 			this._splitPaneContainer.layout(width, height);
-
-			if (panelPositionChanged) {
-				this._splitPaneContainer.resetSize();
-			}
 		}
 	}
 
diff --git a/src/vs/workbench/parts/terminal/browser/terminalWidgetManager.ts b/src/vs/workbench/parts/terminal/browser/terminalWidgetManager.ts
index e8d18df087e..26db47bc76e 100644
--- a/src/vs/workbench/parts/terminal/browser/terminalWidgetManager.ts
+++ b/src/vs/workbench/parts/terminal/browser/terminalWidgetManager.ts
@@ -7,7 +7,7 @@ import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 
 const WIDGET_HEIGHT = 29;
 
-export class TerminalWidgetManager {
+export class TerminalWidgetManager implements IDisposable {
 	private _container: HTMLElement;
 	private _xtermViewport: HTMLElement;
 
@@ -24,6 +24,14 @@ export class TerminalWidgetManager {
 		this._initTerminalHeightWatcher(terminalWrapper);
 	}
 
+	public dispose(): void {
+		if (this._container) {
+			this._container.parentElement.removeChild(this._container);
+			this._container = null;
+		}
+		this._xtermViewport = null;
+	}
+
 	private _initTerminalHeightWatcher(terminalWrapper: HTMLElement) {
 		// Watch the xterm.js viewport for style changes and do a layout if it changes
 		this._xtermViewport = <HTMLElement>terminalWrapper.querySelector('.xterm-viewport');
diff --git a/src/vs/workbench/parts/terminal/common/terminal.ts b/src/vs/workbench/parts/terminal/common/terminal.ts
index 4ca2847cbf8..07945f54cd2 100644
--- a/src/vs/workbench/parts/terminal/common/terminal.ts
+++ b/src/vs/workbench/parts/terminal/common/terminal.ts
@@ -5,6 +5,7 @@
 
 import { Event } from 'vs/base/common/event';
 import { IDisposable } from 'vs/base/common/lifecycle';
+import * as platform from 'vs/base/common/platform';
 import { RawContextKey, ContextKeyExpr, IContextKey } from 'vs/platform/contextkey/common/contextkey';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
@@ -13,9 +14,11 @@ export const TERMINAL_PANEL_ID = 'workbench.panel.terminal';
 
 export const TERMINAL_SERVICE_ID = 'terminalService';
 
-/**  A context key that is set when the integrated terminal has focus. */
+/** A context key that is set when there is at least one opened integrated terminal. */
+export const KEYBINDING_CONTEXT_TERMINAL_IS_OPEN = new RawContextKey<boolean>('terminalIsOpen', false);
+/** A context key that is set when the integrated terminal has focus. */
 export const KEYBINDING_CONTEXT_TERMINAL_FOCUS = new RawContextKey<boolean>('terminalFocus', undefined);
-/**  A context key that is set when the integrated terminal does not have focus. */
+/** A context key that is set when the integrated terminal does not have focus. */
 export const KEYBINDING_CONTEXT_TERMINAL_NOT_FOCUSED: ContextKeyExpr = KEYBINDING_CONTEXT_TERMINAL_FOCUS.toNegated();
 
 /** A keybinding context key that is set when the integrated terminal has text selected. */
@@ -36,6 +39,11 @@ export const IS_WORKSPACE_SHELL_ALLOWED_STORAGE_KEY = 'terminal.integrated.isWor
 export const NEVER_SUGGEST_SELECT_WINDOWS_SHELL_STORAGE_KEY = 'terminal.integrated.neverSuggestSelectWindowsShell';
 export const NEVER_MEASURE_RENDER_TIME_STORAGE_KEY = 'terminal.integrated.neverMeasureRenderTime';
 
+// The creation of extension host terminals is delayed by this value (milliseconds). The purpose of
+// this delay is to allow the terminal instance to initialize correctly and have its ID set before
+// trying to create the corressponding object on the ext host.
+export const EXT_HOST_CREATION_DELAY = 100;
+
 export const ITerminalService = createDecorator<ITerminalService>(TERMINAL_SERVICE_ID);
 
 export const TerminalCursorStyle = {
@@ -64,10 +72,12 @@ export interface ITerminalConfiguration {
 		windows: string[];
 	};
 	macOptionIsMeta: boolean;
+	macOptionClickForcesSelection: boolean;
 	rendererType: 'auto' | 'canvas' | 'dom';
 	rightClickBehavior: 'default' | 'copyPaste' | 'selectWord';
 	cursorBlinking: boolean;
 	cursorStyle: string;
+	drawBoldTextInBrightColors: boolean;
 	fontFamily: string;
 	fontWeight: FontWeight;
 	fontWeightBold: FontWeight;
@@ -87,7 +97,6 @@ export interface ITerminalConfiguration {
 		windows: { [key: string]: string };
 	};
 	showExitAlert: boolean;
-	experimentalRestore: boolean;
 }
 
 export interface ITerminalConfigHelper {
@@ -96,7 +105,7 @@ export interface ITerminalConfigHelper {
 	/**
 	 * Merges the default shell path and args into the provided launch configuration
 	 */
-	mergeDefaultShellPathAndArgs(shell: IShellLaunchConfig): void;
+	mergeDefaultShellPathAndArgs(shell: IShellLaunchConfig, platformOverride?: platform.Platform): void;
 	/** Sets whether a workspace shell configuration is allowed or not */
 	setWorkspaceShellAllowed(isAllowed: boolean): void;
 }
@@ -156,6 +165,12 @@ export interface IShellLaunchConfig {
 	 * of the terminal. Use \x1b over \033 or \e for the escape control character.
 	 */
 	initialText?: string;
+
+	/**
+	 * When true the terminal will be created with no process. This is primarily used to give
+	 * extensions full control over the terminal.
+	 */
+	isRendererOnly?: boolean;
 }
 
 export interface ITerminalService {
@@ -168,9 +183,11 @@ export interface ITerminalService {
 	onInstanceCreated: Event<ITerminalInstance>;
 	onInstanceDisposed: Event<ITerminalInstance>;
 	onInstanceProcessIdReady: Event<ITerminalInstance>;
+	onInstanceDimensionsChanged: Event<ITerminalInstance>;
 	onInstanceRequestExtHostProcess: Event<ITerminalProcessExtHostRequest>;
 	onInstancesChanged: Event<void>;
 	onInstanceTitleChanged: Event<string>;
+	onActiveInstanceChanged: Event<ITerminalInstance>;
 	terminalInstances: ITerminalInstance[];
 	terminalTabs: ITerminalTab[];
 
@@ -181,6 +198,12 @@ export interface ITerminalService {
 	 * default shell selection dialog may display.
 	 */
 	createTerminal(shell?: IShellLaunchConfig, wasNewTerminalAction?: boolean): ITerminalInstance;
+
+	/**
+	 * Creates a terminal renderer.
+	 * @param name The name of the terminal.
+	 */
+	createTerminalRenderer(name: string): ITerminalInstance;
 	/**
 	 * Creates a raw terminal instance, this should not be used outside of the terminal part.
 	 */
@@ -203,8 +226,6 @@ export interface ITerminalService {
 	hidePanel(): void;
 	focusFindWidget(): TPromise<void>;
 	hideFindWidget(): void;
-	showNextFindTermFindWidget(): void;
-	showPreviousFindTermFindWidget(): void;
 
 	setContainers(panelContainer: HTMLElement, terminalContainer: HTMLElement): void;
 	selectDefaultWindowsShell(): TPromise<string>;
@@ -238,12 +259,27 @@ export interface ITerminalTab {
 	split(terminalFocusContextKey: IContextKey<boolean>, configHelper: ITerminalConfigHelper, shellLaunchConfig: IShellLaunchConfig): ITerminalInstance;
 }
 
+export interface ITerminalDimensions {
+	/**
+	 * The columns of the terminal.
+	 */
+	readonly cols: number;
+
+	/**
+	 * The rows of the terminal.
+	 */
+	readonly rows: number;
+}
+
 export interface ITerminalInstance {
 	/**
 	 * The ID of the terminal instance, this is an arbitrary number only used to identify the
 	 * terminal instance.
 	 */
-	id: number;
+	readonly id: number;
+
+	readonly cols: number;
+	readonly rows: number;
 
 	/**
 	 * The process ID of the shell process, this is undefined when there is no process associated
@@ -267,6 +303,42 @@ export interface ITerminalInstance {
 
 	onRequestExtHostProcess: Event<ITerminalInstance>;
 
+	onDimensionsChanged: Event<void>;
+
+	onFocus: Event<ITerminalInstance>;
+
+	/**
+	 * Attach a listener to the raw data stream coming from the pty, including ANSI escape
+	 * sequences.
+	 */
+	onData: Event<string>;
+
+	/**
+	 * Attach a listener to the "renderer" input event, this event fires for terminal renderers on
+	 * keystrokes and when the Terminal.sendText extension API is used.
+	 * @param listener The listener function.
+	 */
+	onRendererInput: Event<string>;
+
+	/**
+	 * Attach a listener to listen for new lines added to this terminal instance.
+	 *
+	 * @param listener The listener function which takes new line strings added to the terminal,
+	 * excluding ANSI escape sequences. The line event will fire when an LF character is added to
+	 * the terminal (ie. the line is not wrapped). Note that this means that the line data will
+	 * not fire for the last line, until either the line is ended with a LF character of the process
+	 * is exited. The lineData string will contain the fully wrapped line, not containing any LF/CR
+	 * characters.
+	 */
+	onLineData: Event<string>;
+
+	/**
+	 * Attach a listener that fires when the terminal's pty process exits. The number in the event
+	 * is the processes' exit code, an exit code of null means the process was killed as a result of
+	 * the ITerminalInstance being disposed.
+	 */
+	onExit: Event<number>;
+
 	processReady: TPromise<void>;
 
 	/**
@@ -293,7 +365,7 @@ export interface ITerminalInstance {
 	/**
 	 * The shell launch config used to launch the shell.
 	 */
-	shellLaunchConfig: IShellLaunchConfig;
+	readonly shellLaunchConfig: IShellLaunchConfig;
 
 	/**
 	 * Whether to disable layout for the terminal. This is useful when the size of the terminal is
@@ -310,8 +382,11 @@ export interface ITerminalInstance {
 
 	/**
 	 * Dispose the terminal instance, removing it from the panel/service and freeing up resources.
+	 *
+	 * @param isShuttingDown Whether VS Code is shutting down, if so kill any terminal processes
+	 * immediately.
 	 */
-	dispose(): void;
+	dispose(isShuttingDown?: boolean): void;
 
 	/**
 	 * Registers a link matcher, allowing custom link patterns to be matched and handled.
@@ -374,12 +449,20 @@ export interface ITerminalInstance {
 	notifyFindWidgetFocusChanged(isFocused: boolean): void;
 
 	/**
-	 * Focuses the terminal instance.
+	 * Focuses the terminal instance if it's able to (xterm.js instance exists).
 	 *
 	 * @param focus Force focus even if there is a selection.
 	 */
 	focus(force?: boolean): void;
 
+	/**
+	 * Focuses the terminal instance when it's ready (the xterm.js instance is created). Use this
+	 * when the terminal is being shown.
+	 *
+	 * @param focus Force focus even if there is a selection.
+	 */
+	focusWhenReady(force?: boolean): Promise<void>;
+
 	/**
 	 * Focuses and pastes the contents of the clipboard into the terminal instance.
 	 */
@@ -396,6 +479,12 @@ export interface ITerminalInstance {
 	 */
 	sendText(text: string, addNewLine: boolean): void;
 
+	/**
+	 * Write text directly to the terminal, skipping the process if it exists.
+	 * @param text The text to write.
+	 */
+	write(text: string): void;
+
 	/** Scroll the terminal buffer down 1 line. */
 	scrollDownLine(): void;
 	/** Scroll the terminal buffer down 1 page. */
@@ -447,33 +536,6 @@ export interface ITerminalInstance {
 	 */
 	setVisible(visible: boolean): void;
 
-	/**
-	 * Attach a listener to the raw data stream coming from the pty, including ANSI escape
-	 * sequecnes.
-	 * @param listener  The listener function.
-	 */
-	onData(listener: (data: string) => void): IDisposable;
-
-	/**
-	 * Attach a listener to listen for new lines added to this terminal instance.
-	 *
-	 * @param listener The listener function which takes new line strings added to the terminal,
-	 * excluding ANSI escape sequences. The line event will fire when an LF character is added to
-	 * the terminal (ie. the line is not wrapped). Note that this means that the line data will
-	 * not fire for the last line, until either the line is ended with a LF character of the process
-	 * is exited. The lineData string will contain the fully wrapped line, not containing any LF/CR
-	 * characters.
-	 */
-	onLineData(listener: (lineData: string) => void): IDisposable;
-
-	/**
-	 * Attach a listener that fires when the terminal's pty process exits.
-	 *
-	 * @param listener The listener function which takes the processes' exit code, an exit code of
-	 * null means the process was killed as a result of the ITerminalInstance being disposed.
-	 */
-	onExit(listener: (exitCode: number) => void): IDisposable;
-
 	/**
 	 * Immediately kills the terminal's current pty process and launches a new one to replace it.
 	 *
@@ -486,7 +548,11 @@ export interface ITerminalInstance {
 	 */
 	setTitle(title: string, eventFromProcess: boolean): void;
 
+	setDimensions(dimensions: ITerminalDimensions): void;
+
 	addDisposable(disposable: IDisposable): void;
+
+	toggleEscapeSequenceLogging(): void;
 }
 
 export interface ITerminalCommandTracker {
@@ -510,12 +576,13 @@ export interface ITerminalProcessManager extends IDisposable {
 	readonly onProcessExit: Event<number>;
 
 	addDisposable(disposable: IDisposable);
+	dispose(immediate?: boolean);
 	createProcess(shellLaunchConfig: IShellLaunchConfig, cols: number, rows: number);
 	write(data: string): void;
 	setDimensions(cols: number, rows: number): void;
 }
 
-export enum ProcessState {
+export const enum ProcessState {
 	// The process has not been initialized yet.
 	UNINITIALIZED,
 	// The process is currently launching, the process is marked as launching
@@ -543,9 +610,9 @@ export interface ITerminalProcessExtHostProxy extends IDisposable {
 	emitPid(pid: number): void;
 	emitExit(exitCode: number): void;
 
-	onInput(listener: (data: string) => void): void;
-	onResize(listener: (cols: number, rows: number) => void): void;
-	onShutdown(listener: () => void): void;
+	onInput: Event<string>;
+	onResize: Event<{ cols: number, rows: number }>;
+	onShutdown: Event<boolean>;
 }
 
 export interface ITerminalProcessExtHostRequest {
diff --git a/src/vs/workbench/parts/terminal/common/terminalColorRegistry.ts b/src/vs/workbench/parts/terminal/common/terminalColorRegistry.ts
index 0d5fb389afa..f002de9397b 100644
--- a/src/vs/workbench/parts/terminal/common/terminalColorRegistry.ts
+++ b/src/vs/workbench/parts/terminal/common/terminalColorRegistry.ts
@@ -160,9 +160,9 @@ const ansiColorMap = {
 };
 
 export function registerColors(): void {
-	for (let id in ansiColorMap) {
-		let entry = ansiColorMap[id];
-		let colorName = id.substring(13);
+	for (const id in ansiColorMap) {
+		const entry = ansiColorMap[id];
+		const colorName = id.substring(13);
 		ansiColorIdentifiers[entry.index] = registerColor(id, entry.defaults, nls.localize('terminal.ansiColor', '\'{0}\' ANSI color in the terminal.', colorName));
 	}
 }
diff --git a/src/vs/workbench/parts/terminal/common/terminalCommands.ts b/src/vs/workbench/parts/terminal/common/terminalCommands.ts
index 828588d03b1..89781821f83 100644
--- a/src/vs/workbench/parts/terminal/common/terminalCommands.ts
+++ b/src/vs/workbench/parts/terminal/common/terminalCommands.ts
@@ -3,10 +3,63 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRegistry';
+import { KeybindingsRegistry, KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
 import { ITerminalService } from 'vs/workbench/parts/terminal/common/terminal';
 
-export function setup(): void {
+export const enum TERMINAL_COMMAND_ID {
+	TOGGLE = 'workbench.action.terminal.toggleTerminal',
+	KILL = 'workbench.action.terminal.kill',
+	QUICK_KILL = 'workbench.action.terminal.quickKill',
+	COPY_SELECTION = 'workbench.action.terminal.copySelection',
+	SELECT_ALL = 'workbench.action.terminal.selectAll',
+	DELETE_WORD_LEFT = 'workbench.action.terminal.deleteWordLeft',
+	DELETE_WORD_RIGHT = 'workbench.action.terminal.deleteWordRight',
+	MOVE_TO_LINE_START = 'workbench.action.terminal.moveToLineStart',
+	MOVE_TO_LINE_END = 'workbench.action.terminal.moveToLineEnd',
+	NEW = 'workbench.action.terminal.new',
+	NEW_IN_ACTIVE_WORKSPACE = 'workbench.action.terminal.newInActiveWorkspace',
+	SPLIT = 'workbench.action.terminal.split',
+	SPLIT_IN_ACTIVE_WORKSPACE = 'workbench.action.terminal.splitInActiveWorkspace',
+	FOCUS_PREVIOUS_PANE = 'workbench.action.terminal.focusPreviousPane',
+	FOCUS_NEXT_PANE = 'workbench.action.terminal.focusNextPane',
+	RESIZE_PANE_LEFT = 'workbench.action.terminal.resizePaneLeft',
+	RESIZE_PANE_RIGHT = 'workbench.action.terminal.resizePaneRight',
+	RESIZE_PANE_UP = 'workbench.action.terminal.resizePaneUp',
+	RESIZE_PANE_DOWN = 'workbench.action.terminal.resizePaneDown',
+	FOCUS = 'workbench.action.terminal.focus',
+	FOCUS_NEXT = 'workbench.action.terminal.focusNext',
+	FOCUS_PREVIOUS = 'workbench.action.terminal.focusPrevious',
+	PASTE = 'workbench.action.terminal.paste',
+	SELECT_DEFAULT_SHELL = 'workbench.action.terminal.selectDefaultShell',
+	RUN_SELECTED_TEXT = 'workbench.action.terminal.runSelectedText',
+	RUN_ACTIVE_FILE = 'workbench.action.terminal.runActiveFile',
+	SWITCH_TERMINAL = 'workbench.action.terminal.switchTerminal',
+	SCROLL_DOWN_LINE = 'workbench.action.terminal.scrollDown',
+	SCROLL_DOWN_PAGE = 'workbench.action.terminal.scrollDownPage',
+	SCROLL_TO_BOTTOM = 'workbench.action.terminal.scrollToBottom',
+	SCROLL_UP_LINE = 'workbench.action.terminal.scrollUp',
+	SCROLL_UP_PAGE = 'workbench.action.terminal.scrollUpPage',
+	SCROLL_TO_TOP = 'workbench.action.terminal.scrollToTop',
+	CLEAR = 'workbench.action.terminal.clear',
+	CLEAR_SELECTION = 'workbench.action.terminal.clearSelection',
+	WORKSPACE_SHELL_ALLOW = 'workbench.action.terminal.allowWorkspaceShell',
+	WORKSPACE_SHELL_DISALLOW = 'workbench.action.terminal.disallowWorkspaceShell',
+	RENAME = 'workbench.action.terminal.rename',
+	FIND_WIDGET_FOCUS = 'workbench.action.terminal.focusFindWidget',
+	FIND_WIDGET_HIDE = 'workbench.action.terminal.hideFindWidget',
+	QUICK_OPEN_TERM = 'workbench.action.quickOpenTerm',
+	SCROLL_TO_PREVIOUS_COMMAND = 'workbench.action.terminal.scrollToPreviousCommand',
+	SCROLL_TO_NEXT_COMMAND = 'workbench.action.terminal.scrollToNextCommand',
+	SELECT_TO_PREVIOUS_COMMAND = 'workbench.action.terminal.selectToPreviousCommand',
+	SELECT_TO_NEXT_COMMAND = 'workbench.action.terminal.selectToNextCommand',
+	SELECT_TO_PREVIOUS_LINE = 'workbench.action.terminal.selectToPreviousLine',
+	SELECT_TO_NEXT_LINE = 'workbench.action.terminal.selectToNextLine',
+	TOGGLE_ESCAPE_SEQUENCE_LOGGING = 'toggleEscapeSequenceLogging',
+	SEND_SEQUENCE = 'workbench.action.terminal.sendSequence'
+}
+
+
+export function setupTerminalCommands(): void {
 	registerOpenTerminalAtIndexCommands();
 }
 
@@ -17,7 +70,7 @@ function registerOpenTerminalAtIndexCommands(): void {
 
 		KeybindingsRegistry.registerCommandAndKeybindingRule({
 			id: `workbench.action.terminal.focusAtIndex${visibleIndex}`,
-			weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
+			weight: KeybindingWeight.WorkbenchContrib,
 			when: void 0,
 			primary: null,
 			handler: accessor => {
@@ -27,4 +80,4 @@ function registerOpenTerminalAtIndexCommands(): void {
 			}
 		});
 	}
-}
\ No newline at end of file
+}
diff --git a/src/vs/workbench/parts/terminal/common/terminalMenu.ts b/src/vs/workbench/parts/terminal/common/terminalMenu.ts
new file mode 100644
index 00000000000..873c8c688a5
--- /dev/null
+++ b/src/vs/workbench/parts/terminal/common/terminalMenu.ts
@@ -0,0 +1,62 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as nls from 'vs/nls';
+import { MenuRegistry, MenuId } from 'vs/platform/actions/common/actions';
+import { TERMINAL_COMMAND_ID } from 'vs/workbench/parts/terminal/common/terminalCommands';
+import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
+
+export function setupTerminalMenu() {
+
+	// View menu
+
+	MenuRegistry.appendMenuItem(MenuId.MenubarViewMenu, {
+		group: '4_panels',
+		command: {
+			id: TERMINAL_COMMAND_ID.TOGGLE,
+			title: nls.localize({ key: 'miToggleIntegratedTerminal', comment: ['&& denotes a mnemonic'] }, "&&Terminal")
+		},
+		order: 3
+	});
+
+	// Manage
+	const createGroup = '1_create';
+	MenuRegistry.appendMenuItem(MenuId.MenubarTerminalMenu, {
+		group: createGroup,
+		command: {
+			id: TERMINAL_COMMAND_ID.NEW,
+			title: nls.localize({ key: 'miNewTerminal', comment: ['&& denotes a mnemonic'] }, "&&New Terminal")
+		},
+		order: 1
+	});
+	MenuRegistry.appendMenuItem(MenuId.MenubarTerminalMenu, {
+		group: createGroup,
+		command: {
+			id: TERMINAL_COMMAND_ID.SPLIT,
+			title: nls.localize({ key: 'miSplitTerminal', comment: ['&& denotes a mnemonic'] }, "&&Split Terminal"),
+			precondition: ContextKeyExpr.has('terminalIsOpen')
+		},
+		order: 2
+	});
+
+	// Run
+	const runGroup = '2_run';
+	MenuRegistry.appendMenuItem(MenuId.MenubarTerminalMenu, {
+		group: runGroup,
+		command: {
+			id: TERMINAL_COMMAND_ID.RUN_ACTIVE_FILE,
+			title: nls.localize({ key: 'miRunActiveFile', comment: ['&& denotes a mnemonic'] }, "Run &&Active File")
+		},
+		order: 3
+	});
+	MenuRegistry.appendMenuItem(MenuId.MenubarTerminalMenu, {
+		group: runGroup,
+		command: {
+			id: TERMINAL_COMMAND_ID.RUN_SELECTED_TEXT,
+			title: nls.localize({ key: 'miRunSelectedText', comment: ['&& denotes a mnemonic'] }, "Run &&Selected Text")
+		},
+		order: 4
+	});
+}
diff --git a/src/vs/workbench/parts/terminal/common/terminalService.ts b/src/vs/workbench/parts/terminal/common/terminalService.ts
index e294388516b..d0c505f4eda 100644
--- a/src/vs/workbench/parts/terminal/common/terminalService.ts
+++ b/src/vs/workbench/parts/terminal/common/terminalService.ts
@@ -3,17 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as errors from 'vs/base/common/errors';
 import { Event, Emitter } from 'vs/base/common/event';
 import { IContextKeyService, IContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { ILifecycleService, LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
+import { ILifecycleService } from 'vs/platform/lifecycle/common/lifecycle';
 import { IPanelService } from 'vs/workbench/services/panel/common/panelService';
 import { IPartService } from 'vs/workbench/services/part/common/partService';
-import { ITerminalService, ITerminalInstance, IShellLaunchConfig, ITerminalConfigHelper, KEYBINDING_CONTEXT_TERMINAL_FOCUS, KEYBINDING_CONTEXT_TERMINAL_FIND_WIDGET_VISIBLE, TERMINAL_PANEL_ID, ITerminalTab, ITerminalProcessExtHostProxy, ITerminalProcessExtHostRequest } from 'vs/workbench/parts/terminal/common/terminal';
+import { ITerminalService, ITerminalInstance, IShellLaunchConfig, ITerminalConfigHelper, KEYBINDING_CONTEXT_TERMINAL_FOCUS, KEYBINDING_CONTEXT_TERMINAL_FIND_WIDGET_VISIBLE, TERMINAL_PANEL_ID, ITerminalTab, ITerminalProcessExtHostProxy, ITerminalProcessExtHostRequest, KEYBINDING_CONTEXT_TERMINAL_IS_OPEN } from 'vs/workbench/parts/terminal/common/terminal';
 import { TPromise } from 'vs/base/common/winjs.base';
-import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
-
-const TERMINAL_STATE_STORAGE_KEY = 'terminal.state';
+import { IStorageService } from 'vs/platform/storage/common/storage';
 
 export abstract class TerminalService implements ITerminalService {
 	public _serviceBrand: any;
@@ -41,10 +38,14 @@ export abstract class TerminalService implements ITerminalService {
 	public get onInstanceProcessIdReady(): Event<ITerminalInstance> { return this._onInstanceProcessIdReady.event; }
 	protected readonly _onInstanceRequestExtHostProcess: Emitter<ITerminalProcessExtHostRequest> = new Emitter<ITerminalProcessExtHostRequest>();
 	public get onInstanceRequestExtHostProcess(): Event<ITerminalProcessExtHostRequest> { return this._onInstanceRequestExtHostProcess.event; }
+	protected readonly _onInstanceDimensionsChanged: Emitter<ITerminalInstance> = new Emitter<ITerminalInstance>();
+	public get onInstanceDimensionsChanged(): Event<ITerminalInstance> { return this._onInstanceDimensionsChanged.event; }
 	protected readonly _onInstancesChanged: Emitter<void> = new Emitter<void>();
 	public get onInstancesChanged(): Event<void> { return this._onInstancesChanged.event; }
 	protected readonly _onInstanceTitleChanged: Emitter<string> = new Emitter<string>();
 	public get onInstanceTitleChanged(): Event<string> { return this._onInstanceTitleChanged.event; }
+	protected readonly _onActiveInstanceChanged: Emitter<ITerminalInstance> = new Emitter<ITerminalInstance>();
+	public get onActiveInstanceChanged(): Event<ITerminalInstance> { return this._onActiveInstanceChanged.event; }
 	protected readonly _onTabDisposed: Emitter<ITerminalTab> = new Emitter<ITerminalTab>();
 	public get onTabDisposed(): Event<ITerminalTab> { return this._onTabDisposed.event; }
 
@@ -66,40 +67,28 @@ export abstract class TerminalService implements ITerminalService {
 		this._findWidgetVisible = KEYBINDING_CONTEXT_TERMINAL_FIND_WIDGET_VISIBLE.bindTo(this._contextKeyService);
 		this.onTabDisposed(tab => this._removeTab(tab));
 
-		lifecycleService.when(LifecyclePhase.Restoring).then(() => this._restoreTabs());
+		this._handleContextKeys();
+	}
+
+	private _handleContextKeys(): void {
+		const terminalIsOpenContext = KEYBINDING_CONTEXT_TERMINAL_IS_OPEN.bindTo(this._contextKeyService);
+
+		const updateTerminalContextKeys = () => {
+			terminalIsOpenContext.set(this.terminalInstances.length > 0);
+		};
+
+		this.onInstancesChanged(() => updateTerminalContextKeys());
 	}
 
 	protected abstract _showTerminalCloseConfirmation(): TPromise<boolean>;
 	public abstract createTerminal(shell?: IShellLaunchConfig, wasNewTerminalAction?: boolean): ITerminalInstance;
+	public abstract createTerminalRenderer(name: string): ITerminalInstance;
 	public abstract createInstance(terminalFocusContextKey: IContextKey<boolean>, configHelper: ITerminalConfigHelper, container: HTMLElement, shellLaunchConfig: IShellLaunchConfig, doCreateProcess: boolean): ITerminalInstance;
 	public abstract getActiveOrCreateInstance(wasNewTerminalAction?: boolean): ITerminalInstance;
 	public abstract selectDefaultWindowsShell(): TPromise<string>;
 	public abstract setContainers(panelContainer: HTMLElement, terminalContainer: HTMLElement): void;
 	public abstract requestExtHostProcess(proxy: ITerminalProcessExtHostProxy, shellLaunchConfig: IShellLaunchConfig, cols: number, rows: number): void;
 
-	private _restoreTabs(): void {
-		if (!this.configHelper.config.experimentalRestore) {
-			return;
-		}
-
-		const tabConfigsJson = this._storageService.get(TERMINAL_STATE_STORAGE_KEY, StorageScope.WORKSPACE);
-		if (!tabConfigsJson) {
-			return;
-		}
-
-		const tabConfigs = <{ instances: IShellLaunchConfig[] }[]>JSON.parse(tabConfigsJson);
-		if (!Array.isArray(tabConfigs)) {
-			return;
-		}
-
-		tabConfigs.forEach(tabConfig => {
-			const instance = this.createTerminal(tabConfig.instances[0]);
-			for (let i = 1; i < tabConfig.instances.length; i++) {
-				this.splitInstance(instance, tabConfig.instances[i]);
-			}
-		});
-	}
-
 	private _onWillShutdown(): boolean | TPromise<boolean> {
 		if (this.terminalInstances.length === 0) {
 			// No terminal instances, don't veto
@@ -122,22 +111,12 @@ export abstract class TerminalService implements ITerminalService {
 	}
 
 	private _onShutdown(): void {
-		// Store terminal tab layout
-		if (this.configHelper.config.experimentalRestore) {
-			const configs = this.terminalTabs.map(tab => {
-				return {
-					instances: tab.terminalInstances.map(instance => instance.shellLaunchConfig)
-				};
-			});
-			this._storageService.store(TERMINAL_STATE_STORAGE_KEY, JSON.stringify(configs), StorageScope.WORKSPACE);
-		}
-
 		// Dispose of all instances
-		this.terminalInstances.forEach(instance => instance.dispose());
+		this.terminalInstances.forEach(instance => instance.dispose(true));
 	}
 
 	public getTabLabels(): string[] {
-		return this._terminalTabs.filter(tab => tab.terminalInstances.length > 0).map((tab, index) => `${index + 1}: ${tab.title}`);
+		return this._terminalTabs.filter(tab => tab.terminalInstances.length > 0).map((tab, index) => `${index + 1}: ${tab.title ? tab.title : ''}`);
 	}
 
 	private _removeTab(tab: ITerminalTab): void {
@@ -152,7 +131,7 @@ export abstract class TerminalService implements ITerminalService {
 		if (wasActiveTab && this._terminalTabs.length > 0) {
 			// TODO: Only focus the new tab if the removed tab had focus?
 			// const hasFocusOnExit = tab.activeInstance.hadFocusOnExit;
-			let newIndex = index < this._terminalTabs.length ? index : this._terminalTabs.length - 1;
+			const newIndex = index < this._terminalTabs.length ? index : this._terminalTabs.length - 1;
 			this.setActiveTabByIndex(newIndex);
 			this.getActiveInstance().focus(true);
 		}
@@ -162,6 +141,7 @@ export abstract class TerminalService implements ITerminalService {
 		// launch.
 		if (this._terminalTabs.length === 0 && !this._isShuttingDown) {
 			this.hidePanel();
+			this._onActiveInstanceChanged.fire(undefined);
 		}
 
 		// Fire events
@@ -287,6 +267,8 @@ export abstract class TerminalService implements ITerminalService {
 		instance.addDisposable(instance.onDisposed(this._onInstanceDisposed.fire, this._onInstanceDisposed));
 		instance.addDisposable(instance.onTitleChanged(this._onInstanceTitleChanged.fire, this._onInstanceTitleChanged));
 		instance.addDisposable(instance.onProcessIdReady(this._onInstanceProcessIdReady.fire, this._onInstanceProcessIdReady));
+		instance.addDisposable(instance.onDimensionsChanged(() => this._onInstanceDimensionsChanged.fire(instance)));
+		instance.addDisposable(instance.onFocus(this._onActiveInstanceChanged.fire, this._onActiveInstanceChanged));
 	}
 
 	private _getTabForInstance(instance: ITerminalInstance): ITerminalTab {
@@ -301,7 +283,7 @@ export abstract class TerminalService implements ITerminalService {
 
 	public showPanel(focus?: boolean): TPromise<void> {
 		return new TPromise<void>((complete) => {
-			let panel = this._panelService.getActivePanel();
+			const panel = this._panelService.getActivePanel();
 			if (!panel || panel.getId() !== TERMINAL_PANEL_ID) {
 				return this._panelService.openPanel(TERMINAL_PANEL_ID, focus).then(() => {
 					if (focus) {
@@ -310,11 +292,14 @@ export abstract class TerminalService implements ITerminalService {
 						setTimeout(() => {
 							const instance = this.getActiveInstance();
 							if (instance) {
-								instance.focus(true);
+								instance.focusWhenReady(true).then(() => complete(void 0));
+							} else {
+								complete(void 0);
 							}
 						}, 0);
+					} else {
+						complete(void 0);
 					}
-					complete(void 0);
 				});
 			} else {
 				if (focus) {
@@ -323,11 +308,14 @@ export abstract class TerminalService implements ITerminalService {
 					setTimeout(() => {
 						const instance = this.getActiveInstance();
 						if (instance) {
-							instance.focus(true);
+							instance.focusWhenReady(true).then(() => complete(void 0));
+						} else {
+							complete(void 0);
 						}
 					}, 0);
+				} else {
+					complete(void 0);
 				}
-				complete(void 0);
 			}
 			return undefined;
 		});
@@ -336,14 +324,12 @@ export abstract class TerminalService implements ITerminalService {
 	public hidePanel(): void {
 		const panel = this._panelService.getActivePanel();
 		if (panel && panel.getId() === TERMINAL_PANEL_ID) {
-			this._partService.setPanelHidden(true).done(undefined, errors.onUnexpectedError);
+			this._partService.setPanelHidden(true);
 		}
 	}
 
 	public abstract focusFindWidget(): TPromise<void>;
 	public abstract hideFindWidget(): void;
-	public abstract showNextFindTermFindWidget(): void;
-	public abstract showPreviousFindTermFindWidget(): void;
 
 	private _getIndexFromId(terminalId: number): number {
 		let terminalIndex = -1;
diff --git a/src/vs/workbench/parts/terminal/electron-browser/media/scrollbar.css b/src/vs/workbench/parts/terminal/electron-browser/media/scrollbar.css
index 55ccd4c3e6c..0d28e3564d1 100644
--- a/src/vs/workbench/parts/terminal/electron-browser/media/scrollbar.css
+++ b/src/vs/workbench/parts/terminal/electron-browser/media/scrollbar.css
@@ -24,6 +24,7 @@
 	background-color: inherit;
 }
 
+.monaco-workbench .panel.integrated-terminal .find-focused .xterm .xterm-viewport,
 .monaco-workbench .panel.integrated-terminal .xterm.focus .xterm-viewport,
 .monaco-workbench .panel.integrated-terminal .xterm:focus .xterm-viewport,
 .monaco-workbench .panel.integrated-terminal .xterm:hover .xterm-viewport {
diff --git a/src/vs/workbench/parts/terminal/electron-browser/media/terminal.css b/src/vs/workbench/parts/terminal/electron-browser/media/terminal.css
index 42d4a6496db..c5da665535e 100644
--- a/src/vs/workbench/parts/terminal/electron-browser/media/terminal.css
+++ b/src/vs/workbench/parts/terminal/electron-browser/media/terminal.css
@@ -17,6 +17,7 @@
 	height: 100%;
 	width: 100%;
 	box-sizing: border-box;
+	overflow: hidden;
 }
 
 .monaco-workbench .panel.integrated-terminal .terminal-tab {
diff --git a/src/vs/workbench/parts/terminal/electron-browser/media/xterm.css b/src/vs/workbench/parts/terminal/electron-browser/media/xterm.css
index 95d45b4670b..be7a3c7a177 100644
--- a/src/vs/workbench/parts/terminal/electron-browser/media/xterm.css
+++ b/src/vs/workbench/parts/terminal/electron-browser/media/xterm.css
@@ -162,4 +162,9 @@
 
 .xterm-cursor-pointer {
 	cursor: pointer !important;
-}
\ No newline at end of file
+}
+
+.xterm.xterm-cursor-crosshair {
+	/* Column selection mode */
+	cursor: crosshair !important;
+}
diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.ts b/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.ts
index ba97ea5f903..3c5ed98fa83 100644
--- a/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.ts
+++ b/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.ts
@@ -11,21 +11,20 @@ import * as debugActions from 'vs/workbench/parts/debug/browser/debugActions';
 import * as nls from 'vs/nls';
 import * as panel from 'vs/workbench/browser/panel';
 import * as platform from 'vs/base/common/platform';
-import * as terminalCommands from 'vs/workbench/parts/terminal/common/terminalCommands';
 import { Extensions, IConfigurationRegistry } from 'vs/platform/configuration/common/configurationRegistry';
-import { ITerminalService, KEYBINDING_CONTEXT_TERMINAL_FOCUS, KEYBINDING_CONTEXT_TERMINAL_FIND_WIDGET_INPUT_FOCUSED, KEYBINDING_CONTEXT_TERMINAL_TEXT_SELECTED, TERMINAL_PANEL_ID, KEYBINDING_CONTEXT_TERMINAL_FIND_WIDGET_VISIBLE, TerminalCursorStyle, KEYBINDING_CONTEXT_TERMINAL_FIND_WIDGET_NOT_VISIBLE, DEFAULT_LINE_HEIGHT, DEFAULT_LETTER_SPACING } from 'vs/workbench/parts/terminal/common/terminal';
+import { ITerminalService, KEYBINDING_CONTEXT_TERMINAL_FOCUS, KEYBINDING_CONTEXT_TERMINAL_TEXT_SELECTED, TERMINAL_PANEL_ID, KEYBINDING_CONTEXT_TERMINAL_FIND_WIDGET_VISIBLE, TerminalCursorStyle, KEYBINDING_CONTEXT_TERMINAL_FIND_WIDGET_NOT_VISIBLE, DEFAULT_LINE_HEIGHT, DEFAULT_LETTER_SPACING } from 'vs/workbench/parts/terminal/common/terminal';
 import { getTerminalDefaultShellUnixLike, getTerminalDefaultShellWindows } from 'vs/workbench/parts/terminal/node/terminal';
 import { IWorkbenchActionRegistry, Extensions as ActionExtensions } from 'vs/workbench/common/actions';
 import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
 import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { KillTerminalAction, ClearSelectionTerminalAction, CopyTerminalSelectionAction, CreateNewTerminalAction, CreateNewInActiveWorkspaceTerminalAction, FocusActiveTerminalAction, FocusNextTerminalAction, FocusPreviousTerminalAction, SelectDefaultShellWindowsTerminalAction, RunSelectedTextInTerminalAction, RunActiveFileInTerminalAction, ScrollDownTerminalAction, ScrollDownPageTerminalAction, ScrollToBottomTerminalAction, ScrollUpTerminalAction, ScrollUpPageTerminalAction, ScrollToTopTerminalAction, TerminalPasteAction, ToggleTerminalAction, ClearTerminalAction, AllowWorkspaceShellTerminalCommand, DisallowWorkspaceShellTerminalCommand, RenameTerminalAction, SelectAllTerminalAction, FocusTerminalFindWidgetAction, HideTerminalFindWidgetAction, ShowNextFindTermTerminalFindWidgetAction, ShowPreviousFindTermTerminalFindWidgetAction, DeleteWordLeftTerminalAction, DeleteWordRightTerminalAction, QuickOpenActionTermContributor, QuickOpenTermAction, TERMINAL_PICKER_PREFIX, MoveToLineStartTerminalAction, MoveToLineEndTerminalAction, SplitTerminalAction, SplitInActiveWorkspaceTerminalAction, FocusPreviousPaneTerminalAction, FocusNextPaneTerminalAction, ResizePaneLeftTerminalAction, ResizePaneRightTerminalAction, ResizePaneUpTerminalAction, ResizePaneDownTerminalAction, ScrollToPreviousCommandAction, ScrollToNextCommandAction, SelectToPreviousCommandAction, SelectToNextCommandAction, SelectToPreviousLineAction, SelectToNextLineAction } from 'vs/workbench/parts/terminal/electron-browser/terminalActions';
+import { KillTerminalAction, ClearSelectionTerminalAction, CopyTerminalSelectionAction, CreateNewTerminalAction, CreateNewInActiveWorkspaceTerminalAction, FocusActiveTerminalAction, FocusNextTerminalAction, FocusPreviousTerminalAction, SelectDefaultShellWindowsTerminalAction, RunSelectedTextInTerminalAction, RunActiveFileInTerminalAction, ScrollDownTerminalAction, ScrollDownPageTerminalAction, ScrollToBottomTerminalAction, ScrollUpTerminalAction, ScrollUpPageTerminalAction, ScrollToTopTerminalAction, TerminalPasteAction, ToggleTerminalAction, ClearTerminalAction, AllowWorkspaceShellTerminalCommand, DisallowWorkspaceShellTerminalCommand, RenameTerminalAction, SelectAllTerminalAction, FocusTerminalFindWidgetAction, HideTerminalFindWidgetAction, DeleteWordLeftTerminalAction, DeleteWordRightTerminalAction, QuickOpenActionTermContributor, QuickOpenTermAction, TERMINAL_PICKER_PREFIX, MoveToLineStartTerminalAction, MoveToLineEndTerminalAction, SplitTerminalAction, SplitInActiveWorkspaceTerminalAction, FocusPreviousPaneTerminalAction, FocusNextPaneTerminalAction, ResizePaneLeftTerminalAction, ResizePaneRightTerminalAction, ResizePaneUpTerminalAction, ResizePaneDownTerminalAction, ScrollToPreviousCommandAction, ScrollToNextCommandAction, SelectToPreviousCommandAction, SelectToNextCommandAction, SelectToPreviousLineAction, SelectToNextLineAction, ToggleEscapeSequenceLoggingAction, SendSequenceTerminalCommand } from 'vs/workbench/parts/terminal/electron-browser/terminalActions';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { ShowAllCommandsAction } from 'vs/workbench/parts/quickopen/browser/commandsHandler';
 import { SyncActionDescriptor } from 'vs/platform/actions/common/actions';
 import { TerminalService } from 'vs/workbench/parts/terminal/electron-browser/terminalService';
 import { ToggleTabFocusModeAction } from 'vs/editor/contrib/toggleTabFocusMode/toggleTabFocusMode';
 import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRegistry';
+import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
 import { OpenNextRecentlyUsedEditorInGroupAction, OpenPreviousRecentlyUsedEditorInGroupAction, FocusActiveGroupAction, FocusFirstGroupAction, FocusLastGroupAction, OpenFirstEditorInGroup, OpenLastEditorInGroup } from 'vs/workbench/browser/parts/editor/editorActions';
 import { EDITOR_FONT_DEFAULTS } from 'vs/editor/common/config/editorOptions';
 import { registerColors } from 'vs/workbench/parts/terminal/common/terminalColorRegistry';
@@ -37,6 +36,8 @@ import { CommandsRegistry } from 'vs/platform/commands/common/commands';
 import { TogglePanelAction } from 'vs/workbench/browser/parts/panel/panelActions';
 import { TerminalPanel } from 'vs/workbench/parts/terminal/electron-browser/terminalPanel';
 import { TerminalPickerHandler } from 'vs/workbench/parts/terminal/browser/terminalQuickOpen';
+import { setupTerminalCommands, TERMINAL_COMMAND_ID } from 'vs/workbench/parts/terminal/common/terminalCommands';
+import { setupTerminalMenu } from 'vs/workbench/parts/terminal/common/terminalMenu';
 
 const quickOpenRegistry = (Registry.as<IQuickOpenRegistry>(QuickOpenExtensions.Quickopen));
 
@@ -66,68 +67,87 @@ registry.registerWorkbenchAction(new SyncActionDescriptor(QuickOpenTermAction, Q
 const actionBarRegistry = Registry.as<IActionBarRegistry>(ActionBarExtensions.Actionbar);
 actionBarRegistry.registerActionBarContributor(Scope.VIEWER, QuickOpenActionTermContributor);
 
-let configurationRegistry = Registry.as<IConfigurationRegistry>(Extensions.Configuration);
+const configurationRegistry = Registry.as<IConfigurationRegistry>(Extensions.Configuration);
 configurationRegistry.registerConfiguration({
-	'id': 'terminal',
-	'order': 100,
-	'title': nls.localize('terminalIntegratedConfigurationTitle', "Integrated Terminal"),
-	'type': 'object',
-	'properties': {
+	id: 'terminal',
+	order: 100,
+	title: nls.localize('terminalIntegratedConfigurationTitle', "Integrated Terminal"),
+	type: 'object',
+	properties: {
 		'terminal.integrated.shell.linux': {
-			'description': nls.localize('terminal.integrated.shell.linux', "The path of the shell that the terminal uses on Linux."),
-			'type': 'string',
-			'default': getTerminalDefaultShellUnixLike()
+			markdownDescription: nls.localize('terminal.integrated.shell.linux', "The path of the shell that the terminal uses on Linux. [Read more about configuring the shell](https://code.visualstudio.com/docs/editor/integrated-terminal#_configuration)."),
+			type: 'string',
+			default: getTerminalDefaultShellUnixLike()
 		},
 		'terminal.integrated.shellArgs.linux': {
-			'description': nls.localize('terminal.integrated.shellArgs.linux', "The command line arguments to use when on the Linux terminal."),
-			'type': 'array',
-			'items': {
-				'type': 'string'
+			markdownDescription: nls.localize('terminal.integrated.shellArgs.linux', "The command line arguments to use when on the Linux terminal. [Read more about configuring the shell](https://code.visualstudio.com/docs/editor/integrated-terminal#_configuration)."),
+			type: 'array',
+			items: {
+				type: 'string'
 			},
-			'default': []
+			default: []
 		},
 		'terminal.integrated.shell.osx': {
-			'description': nls.localize('terminal.integrated.shell.osx', "The path of the shell that the terminal uses on OS X."),
-			'type': 'string',
-			'default': getTerminalDefaultShellUnixLike()
+			markdownDescription: nls.localize('terminal.integrated.shell.osx', "The path of the shell that the terminal uses on macOS. [Read more about configuring the shell](https://code.visualstudio.com/docs/editor/integrated-terminal#_configuration)."),
+			type: 'string',
+			default: getTerminalDefaultShellUnixLike()
 		},
 		'terminal.integrated.shellArgs.osx': {
-			'description': nls.localize('terminal.integrated.shellArgs.osx', "The command line arguments to use when on the OS X terminal."),
-			'type': 'array',
-			'items': {
-				'type': 'string'
+			markdownDescription: nls.localize('terminal.integrated.shellArgs.osx', "The command line arguments to use when on the macOS terminal. [Read more about configuring the shell](https://code.visualstudio.com/docs/editor/integrated-terminal#_configuration)."),
+			type: 'array',
+			items: {
+				type: 'string'
 			},
 			// Unlike on Linux, ~/.profile is not sourced when logging into a macOS session. This
 			// is the reason terminals on macOS typically run login shells by default which set up
 			// the environment. See http://unix.stackexchange.com/a/119675/115410
-			'default': ['-l']
+			default: ['-l']
 		},
 		'terminal.integrated.shell.windows': {
-			'description': nls.localize('terminal.integrated.shell.windows', "The path of the shell that the terminal uses on Windows. When using shells shipped with Windows (cmd, PowerShell or Bash on Ubuntu)."),
-			'type': 'string',
-			'default': getTerminalDefaultShellWindows()
+			markdownDescription: nls.localize('terminal.integrated.shell.windows', "The path of the shell that the terminal uses on Windows. [Read more about configuring the shell](https://code.visualstudio.com/docs/editor/integrated-terminal#_configuration)."),
+			type: 'string',
+			default: getTerminalDefaultShellWindows()
 		},
 		'terminal.integrated.shellArgs.windows': {
-			'description': nls.localize('terminal.integrated.shellArgs.windows', "The command line arguments to use when on the Windows terminal."),
-			'type': 'array',
-			'items': {
-				'type': 'string'
-			},
-			'default': []
+			markdownDescription: nls.localize('terminal.integrated.shellArgs.windows', "The command line arguments to use when on the Windows terminal. [Read more about configuring the shell](https://code.visualstudio.com/docs/editor/integrated-terminal#_configuration)."),
+			'anyOf': [
+				{
+					type: 'array',
+					items: {
+						type: 'string',
+						markdownDescription: nls.localize('terminal.integrated.shellArgs.windows', "The command line arguments to use when on the Windows terminal. [Read more about configuring the shell](https://code.visualstudio.com/docs/editor/integrated-terminal#_configuration).")
+					},
+				},
+				{
+					type: 'string',
+					markdownDescription: nls.localize('terminal.integrated.shellArgs.windows.string', "The command line arguments in [command-line format](https://msdn.microsoft.com/en-au/08dfcab2-eb6e-49a4-80eb-87d4076c98c6) to use when on the Windows terminal. [Read more about configuring the shell](https://code.visualstudio.com/docs/editor/integrated-terminal#_configuration).")
+				}
+			],
+			default: []
 		},
 		'terminal.integrated.macOptionIsMeta': {
-			'description': nls.localize('terminal.integrated.macOptionIsMeta', "Treat the option key as the meta key in the terminal on macOS."),
-			'type': 'boolean',
-			'default': false
+			description: nls.localize('terminal.integrated.macOptionIsMeta', "Controls whether to treat the option key as the meta key in the terminal on macOS."),
+			type: 'boolean',
+			default: false
+		},
+		'terminal.integrated.macOptionClickForcesSelection': {
+			description: nls.localize('terminal.integrated.macOptionClickForcesSelection', "Controls whether to force selection when using Option+click on macOS. This will force a regular (line) selection and disallow the use of column selection mode. This enables copying and pasting using the regular terminal selection, for example, when mouse mode is enabled in tmux."),
+			type: 'boolean',
+			default: false
 		},
 		'terminal.integrated.copyOnSelection': {
-			'description': nls.localize('terminal.integrated.copyOnSelection', "When set, text selected in the terminal will be copied to the clipboard."),
-			'type': 'boolean',
-			'default': false
+			description: nls.localize('terminal.integrated.copyOnSelection', "Controls whether text selected in the terminal will be copied to the clipboard."),
+			type: 'boolean',
+			default: false
+		},
+		'terminal.integrated.drawBoldTextInBrightColors': {
+			description: nls.localize('terminal.integrated.drawBoldTextInBrightColors', "Controls whether bold text in the terminal will always use the \"bright\" ANSI color variant."),
+			type: 'boolean',
+			default: true
 		},
 		'terminal.integrated.fontFamily': {
-			'description': nls.localize('terminal.integrated.fontFamily', "Controls the font family of the terminal, this defaults to editor.fontFamily's value."),
-			'type': 'string'
+			markdownDescription: nls.localize('terminal.integrated.fontFamily', "Controls the font family of the terminal, this defaults to `#editor.fontFamily#`'s value."),
+			type: 'string'
 		},
 		// TODO: Support font ligatures
 		// 'terminal.integrated.fontLigatures': {
@@ -136,97 +156,140 @@ configurationRegistry.registerConfiguration({
 		// 	'default': false
 		// },
 		'terminal.integrated.fontSize': {
-			'description': nls.localize('terminal.integrated.fontSize', "Controls the font size in pixels of the terminal."),
-			'type': 'number',
-			'default': EDITOR_FONT_DEFAULTS.fontSize
+			description: nls.localize('terminal.integrated.fontSize', "Controls the font size in pixels of the terminal."),
+			type: 'number',
+			default: EDITOR_FONT_DEFAULTS.fontSize
 		},
 		'terminal.integrated.letterSpacing': {
-			'description': nls.localize('terminal.integrated.letterSpacing', "Controls the letter spacing of the terminal, this is an integer value which represents the amount of additional pixels to add between characters."),
-			'type': 'number',
-			'default': DEFAULT_LETTER_SPACING
+			description: nls.localize('terminal.integrated.letterSpacing', "Controls the letter spacing of the terminal, this is an integer value which represents the amount of additional pixels to add between characters."),
+			type: 'number',
+			default: DEFAULT_LETTER_SPACING
 		},
 		'terminal.integrated.lineHeight': {
-			'description': nls.localize('terminal.integrated.lineHeight', "Controls the line height of the terminal, this number is multiplied by the terminal font size to get the actual line-height in pixels."),
-			'type': 'number',
-			'default': DEFAULT_LINE_HEIGHT
+			description: nls.localize('terminal.integrated.lineHeight', "Controls the line height of the terminal, this number is multiplied by the terminal font size to get the actual line-height in pixels."),
+			type: 'number',
+			default: DEFAULT_LINE_HEIGHT
 		},
 		'terminal.integrated.fontWeight': {
-			'type': 'string',
-			'enum': ['normal', 'bold', '100', '200', '300', '400', '500', '600', '700', '800', '900'],
-			'description': nls.localize('terminal.integrated.fontWeight', "The font weight to use within the terminal for non-bold text."),
-			'default': 'normal'
+			type: 'string',
+			enum: ['normal', 'bold', '100', '200', '300', '400', '500', '600', '700', '800', '900'],
+			description: nls.localize('terminal.integrated.fontWeight', "The font weight to use within the terminal for non-bold text."),
+			default: 'normal'
 		},
 		'terminal.integrated.fontWeightBold': {
-			'type': 'string',
-			'enum': ['normal', 'bold', '100', '200', '300', '400', '500', '600', '700', '800', '900'],
-			'description': nls.localize('terminal.integrated.fontWeightBold', "The font weight to use within the terminal for bold text."),
-			'default': 'bold'
+			type: 'string',
+			enum: ['normal', 'bold', '100', '200', '300', '400', '500', '600', '700', '800', '900'],
+			description: nls.localize('terminal.integrated.fontWeightBold', "The font weight to use within the terminal for bold text."),
+			default: 'bold'
 		},
 		'terminal.integrated.cursorBlinking': {
-			'description': nls.localize('terminal.integrated.cursorBlinking', "Controls whether the terminal cursor blinks."),
-			'type': 'boolean',
-			'default': false
+			description: nls.localize('terminal.integrated.cursorBlinking', "Controls whether the terminal cursor blinks."),
+			type: 'boolean',
+			default: false
 		},
 		'terminal.integrated.cursorStyle': {
-			'description': nls.localize('terminal.integrated.cursorStyle', "Controls the style of terminal cursor."),
-			'enum': [TerminalCursorStyle.BLOCK, TerminalCursorStyle.LINE, TerminalCursorStyle.UNDERLINE],
-			'default': TerminalCursorStyle.BLOCK
+			description: nls.localize('terminal.integrated.cursorStyle', "Controls the style of terminal cursor."),
+			enum: [TerminalCursorStyle.BLOCK, TerminalCursorStyle.LINE, TerminalCursorStyle.UNDERLINE],
+			default: TerminalCursorStyle.BLOCK
 		},
 		'terminal.integrated.scrollback': {
-			'description': nls.localize('terminal.integrated.scrollback', "Controls the maximum amount of lines the terminal keeps in its buffer."),
-			'type': 'number',
-			'default': 1000
+			description: nls.localize('terminal.integrated.scrollback', "Controls the maximum amount of lines the terminal keeps in its buffer."),
+			type: 'number',
+			default: 1000
 		},
 		'terminal.integrated.setLocaleVariables': {
-			'description': nls.localize('terminal.integrated.setLocaleVariables', "Controls whether locale variables are set at startup of the terminal, this defaults to true on OS X, false on other platforms."),
-			'type': 'boolean',
-			'default': platform.isMacintosh
+			markdownDescription: nls.localize('terminal.integrated.setLocaleVariables', "Controls whether locale variables are set at startup of the terminal, this defaults to `true` on macOS, `false` on other platforms."),
+			type: 'boolean',
+			default: platform.isMacintosh
 		},
 		'terminal.integrated.rendererType': {
-			'type': 'string',
-			'enum': ['auto', 'canvas', 'dom'],
+			type: 'string',
+			enum: ['auto', 'canvas', 'dom'],
+			enumDescriptions: [
+				nls.localize('terminal.integrated.rendererType.auto', "Let VS Code guess which renderer to use."),
+				nls.localize('terminal.integrated.rendererType.canvas', "Use the standard GPU/canvas-based renderer"),
+				nls.localize('terminal.integrated.rendererType.dom', "Use the fallback DOM-based renderer.")
+			],
 			default: 'auto',
-			description: nls.localize('terminal.integrated.rendererType', "Controls how the terminal is rendered, the options are \"canvas\" for the standard (fast) canvas renderer, \"dom\" for the fallback DOM-based renderer or \"auto\" which lets VS Code guess which will be best. This setting needs VS Code to reload in order to take effect.")
+			description: nls.localize('terminal.integrated.rendererType', "Controls how the terminal is rendered.")
 		},
 		'terminal.integrated.rightClickBehavior': {
-			'type': 'string',
-			'enum': ['default', 'copyPaste', 'selectWord'],
+			type: 'string',
+			enum: ['default', 'copyPaste', 'selectWord'],
+			enumDescriptions: [
+				nls.localize('terminal.integrated.rightClickBehavior.default', "Show the context menu."),
+				nls.localize('terminal.integrated.rightClickBehavior.copyPaste', "Copy when there is a selection, otherwise paste."),
+				nls.localize('terminal.integrated.rightClickBehavior.selectWord', "Select the word under the cursor and show the context menu.")
+			],
 			default: platform.isMacintosh ? 'selectWord' : platform.isWindows ? 'copyPaste' : 'default',
-			description: nls.localize('terminal.integrated.rightClickBehavior', "Controls how terminal reacts to right click, possibilities are \"default\", \"copyPaste\", and \"selectWord\". \"default\" will show the context menu, \"copyPaste\" will copy when there is a selection otherwise paste, \"selectWord\" will select the word under the cursor and show the context menu.")
+			description: nls.localize('terminal.integrated.rightClickBehavior', "Controls how terminal reacts to right click.")
 		},
 		'terminal.integrated.cwd': {
-			'description': nls.localize('terminal.integrated.cwd', "An explicit start path where the terminal will be launched, this is used as the current working directory (cwd) for the shell process. This may be particularly useful in workspace settings if the root directory is not a convenient cwd."),
-			'type': 'string',
-			'default': undefined
+			description: nls.localize('terminal.integrated.cwd', "An explicit start path where the terminal will be launched, this is used as the current working directory (cwd) for the shell process. This may be particularly useful in workspace settings if the root directory is not a convenient cwd."),
+			type: 'string',
+			default: undefined
 		},
 		'terminal.integrated.confirmOnExit': {
-			'description': nls.localize('terminal.integrated.confirmOnExit', "Whether to confirm on exit if there are active terminal sessions."),
-			'type': 'boolean',
-			'default': false
+			description: nls.localize('terminal.integrated.confirmOnExit', "Controls whether to confirm on exit if there are active terminal sessions."),
+			type: 'boolean',
+			default: false
 		},
 		'terminal.integrated.enableBell': {
-			'description': nls.localize('terminal.integrated.enableBell', "Whether the terminal bell is enabled or not."),
-			'type': 'boolean',
-			'default': false
+			description: nls.localize('terminal.integrated.enableBell', "Controls whether the terminal bell is enabled."),
+			type: 'boolean',
+			default: false
 		},
 		'terminal.integrated.commandsToSkipShell': {
-			'description': nls.localize('terminal.integrated.commandsToSkipShell', "A set of command IDs whose keybindings will not be sent to the shell and instead always be handled by Code. This allows the use of keybindings that would normally be consumed by the shell to act the same as when the terminal is not focused, for example ctrl+p to launch Quick Open."),
-			'type': 'array',
-			'items': {
-				'type': 'string'
+			description: nls.localize('terminal.integrated.commandsToSkipShell', "A set of command IDs whose keybindings will not be sent to the shell and instead always be handled by Code. This allows the use of keybindings that would normally be consumed by the shell to act the same as when the terminal is not focused, for example ctrl+p to launch Quick Open."),
+			type: 'array',
+			items: {
+				type: 'string'
 			},
-			'default': [
+			default: [
+				TERMINAL_COMMAND_ID.CLEAR_SELECTION,
+				TERMINAL_COMMAND_ID.CLEAR,
+				TERMINAL_COMMAND_ID.COPY_SELECTION,
+				TERMINAL_COMMAND_ID.DELETE_WORD_LEFT,
+				TERMINAL_COMMAND_ID.DELETE_WORD_RIGHT,
+				TERMINAL_COMMAND_ID.FIND_WIDGET_FOCUS,
+				TERMINAL_COMMAND_ID.FIND_WIDGET_HIDE,
+				TERMINAL_COMMAND_ID.FOCUS_NEXT_PANE,
+				TERMINAL_COMMAND_ID.FOCUS_NEXT,
+				TERMINAL_COMMAND_ID.FOCUS_PREVIOUS_PANE,
+				TERMINAL_COMMAND_ID.FOCUS_PREVIOUS,
+				TERMINAL_COMMAND_ID.FOCUS,
+				TERMINAL_COMMAND_ID.KILL,
+				TERMINAL_COMMAND_ID.MOVE_TO_LINE_END,
+				TERMINAL_COMMAND_ID.MOVE_TO_LINE_START,
+				TERMINAL_COMMAND_ID.NEW_IN_ACTIVE_WORKSPACE,
+				TERMINAL_COMMAND_ID.NEW,
+				TERMINAL_COMMAND_ID.PASTE,
+				TERMINAL_COMMAND_ID.RESIZE_PANE_DOWN,
+				TERMINAL_COMMAND_ID.RESIZE_PANE_LEFT,
+				TERMINAL_COMMAND_ID.RESIZE_PANE_RIGHT,
+				TERMINAL_COMMAND_ID.RESIZE_PANE_UP,
+				TERMINAL_COMMAND_ID.RUN_ACTIVE_FILE,
+				TERMINAL_COMMAND_ID.RUN_SELECTED_TEXT,
+				TERMINAL_COMMAND_ID.SCROLL_DOWN_LINE,
+				TERMINAL_COMMAND_ID.SCROLL_DOWN_PAGE,
+				TERMINAL_COMMAND_ID.SCROLL_TO_BOTTOM,
+				TERMINAL_COMMAND_ID.SCROLL_TO_NEXT_COMMAND,
+				TERMINAL_COMMAND_ID.SCROLL_TO_PREVIOUS_COMMAND,
+				TERMINAL_COMMAND_ID.SCROLL_TO_TOP,
+				TERMINAL_COMMAND_ID.SCROLL_UP_LINE,
+				TERMINAL_COMMAND_ID.SCROLL_UP_PAGE,
+				TERMINAL_COMMAND_ID.SELECT_ALL,
+				TERMINAL_COMMAND_ID.SELECT_TO_NEXT_COMMAND,
+				TERMINAL_COMMAND_ID.SELECT_TO_NEXT_LINE,
+				TERMINAL_COMMAND_ID.SELECT_TO_PREVIOUS_COMMAND,
+				TERMINAL_COMMAND_ID.SELECT_TO_PREVIOUS_LINE,
+				TERMINAL_COMMAND_ID.SPLIT_IN_ACTIVE_WORKSPACE,
+				TERMINAL_COMMAND_ID.SPLIT,
+				TERMINAL_COMMAND_ID.TOGGLE,
 				ToggleTabFocusModeAction.ID,
 				QUICKOPEN_ACTION_ID,
 				QUICKOPEN_FOCUS_SECONDARY_ACTION_ID,
 				ShowAllCommandsAction.ID,
-				CreateNewTerminalAction.ID,
-				CreateNewInActiveWorkspaceTerminalAction.ID,
-				CopyTerminalSelectionAction.ID,
-				KillTerminalAction.ID,
-				FocusActiveTerminalAction.ID,
-				FocusPreviousTerminalAction.ID,
-				FocusNextTerminalAction.ID,
 				'workbench.action.tasks.build',
 				'workbench.action.tasks.restartTask',
 				'workbench.action.tasks.runTask',
@@ -250,18 +313,6 @@ configurationRegistry.registerConfiguration({
 				'workbench.action.focusSixthEditorGroup',
 				'workbench.action.focusSeventhEditorGroup',
 				'workbench.action.focusEighthEditorGroup',
-				TerminalPasteAction.ID,
-				RunSelectedTextInTerminalAction.ID,
-				RunActiveFileInTerminalAction.ID,
-				ToggleTerminalAction.ID,
-				ScrollDownTerminalAction.ID,
-				ScrollDownPageTerminalAction.ID,
-				ScrollToBottomTerminalAction.ID,
-				ScrollUpTerminalAction.ID,
-				ScrollUpPageTerminalAction.ID,
-				ScrollToTopTerminalAction.ID,
-				ClearTerminalAction.ID,
-				ClearSelectionTerminalAction.ID,
 				debugActions.StartAction.ID,
 				debugActions.StopAction.ID,
 				debugActions.RunAction.ID,
@@ -278,71 +329,43 @@ configurationRegistry.registerConfiguration({
 				FocusLastGroupAction.ID,
 				OpenFirstEditorInGroup.ID,
 				OpenLastEditorInGroup.ID,
-				SelectAllTerminalAction.ID,
-				FocusTerminalFindWidgetAction.ID,
-				HideTerminalFindWidgetAction.ID,
-				ShowPreviousFindTermTerminalFindWidgetAction.ID,
-				ShowNextFindTermTerminalFindWidgetAction.ID,
 				NavigateUpAction.ID,
 				NavigateDownAction.ID,
 				NavigateRightAction.ID,
 				NavigateLeftAction.ID,
-				DeleteWordLeftTerminalAction.ID,
-				DeleteWordRightTerminalAction.ID,
-				MoveToLineStartTerminalAction.ID,
-				MoveToLineEndTerminalAction.ID,
 				TogglePanelAction.ID,
-				'workbench.action.quickOpenView',
-				SplitTerminalAction.ID,
-				SplitInActiveWorkspaceTerminalAction.ID,
-				FocusPreviousPaneTerminalAction.ID,
-				FocusNextPaneTerminalAction.ID,
-				ResizePaneLeftTerminalAction.ID,
-				ResizePaneRightTerminalAction.ID,
-				ResizePaneUpTerminalAction.ID,
-				ResizePaneDownTerminalAction.ID,
-				ScrollToPreviousCommandAction.ID,
-				ScrollToNextCommandAction.ID,
-				SelectToPreviousCommandAction.ID,
-				SelectToNextCommandAction.ID,
-				SelectToPreviousLineAction.ID,
-				SelectToNextLineAction.ID
+				'workbench.action.quickOpenView'
 			].sort()
 		},
 		'terminal.integrated.env.osx': {
-			'description': nls.localize('terminal.integrated.env.osx', "Object with environment variables that will be added to the VS Code process to be used by the terminal on OS X"),
-			'type': 'object',
-			'additionalProperties': {
-				'type': ['string', 'null']
+			markdownDescription: nls.localize('terminal.integrated.env.osx', "Object with environment variables that will be added to the VS Code process to be used by the terminal on macOS. Set to `null` to delete the environment variable."),
+			type: 'object',
+			additionalProperties: {
+				type: ['string', 'null']
 			},
-			'default': {}
+			default: {}
 		},
 		'terminal.integrated.env.linux': {
-			'description': nls.localize('terminal.integrated.env.linux', "Object with environment variables that will be added to the VS Code process to be used by the terminal on Linux"),
-			'type': 'object',
-			'additionalProperties': {
-				'type': ['string', 'null']
+			markdownDescription: nls.localize('terminal.integrated.env.linux', "Object with environment variables that will be added to the VS Code process to be used by the terminal on Linux. Set to `null` to delete the environment variable."),
+			type: 'object',
+			additionalProperties: {
+				type: ['string', 'null']
 			},
-			'default': {}
+			default: {}
 		},
 		'terminal.integrated.env.windows': {
-			'description': nls.localize('terminal.integrated.env.windows', "Object with environment variables that will be added to the VS Code process to be used by the terminal on Windows"),
-			'type': 'object',
-			'additionalProperties': {
-				'type': ['string', 'null']
+			markdownDescription: nls.localize('terminal.integrated.env.windows', "Object with environment variables that will be added to the VS Code process to be used by the terminal on Windows. Set to `null` to delete the environment variable."),
+			type: 'object',
+			additionalProperties: {
+				type: ['string', 'null']
 			},
-			'default': {}
+			default: {}
 		},
 		'terminal.integrated.showExitAlert': {
-			'description': nls.localize('terminal.integrated.showExitAlert', "Show alert `The terminal process terminated with exit code` when exit code is non-zero."),
-			'type': 'boolean',
-			'default': true
-		},
-		'terminal.integrated.experimentalRestore': {
-			'description': nls.localize('terminal.integrated.experimentalRestore', "Whether to restore terminal sessions for the workspace automatically when launching VS Code. This is an experimental setting; it may be buggy and could change in the future."),
-			'type': 'boolean',
-			'default': false
-		},
+			description: nls.localize('terminal.integrated.showExitAlert', "Controls whether to show the alert \"The terminal process terminated with exit code\" when exit code is non-zero."),
+			type: 'boolean',
+			default: true
+		}
 	}
 });
 
@@ -354,12 +377,12 @@ registerSingleton(ITerminalService, TerminalService);
 	nls.localize('terminal', "Terminal"),
 	'terminal',
 	40,
-	ToggleTerminalAction.ID
+	TERMINAL_COMMAND_ID.TOGGLE
 ));
 
 // On mac cmd+` is reserved to cycle between windows, that's why the keybindings use WinCtrl
 const category = nls.localize('terminalCategory', "Terminal");
-let actionRegistry = Registry.as<IWorkbenchActionRegistry>(ActionExtensions.WorkbenchActions);
+const actionRegistry = Registry.as<IWorkbenchActionRegistry>(ActionExtensions.WorkbenchActions);
 actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(KillTerminalAction, KillTerminalAction.ID, KillTerminalAction.LABEL), 'Terminal: Kill the Active Terminal Instance', category);
 actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(CopyTerminalSelectionAction, CopyTerminalSelectionAction.ID, CopyTerminalSelectionAction.LABEL, {
 	primary: KeyMod.CtrlCmd | KeyCode.KEY_C,
@@ -372,7 +395,7 @@ actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(CreateNewTermina
 actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(ClearSelectionTerminalAction, ClearSelectionTerminalAction.ID, ClearSelectionTerminalAction.LABEL, {
 	primary: KeyCode.Escape,
 	linux: { primary: KeyCode.Escape }
-}, ContextKeyExpr.and(KEYBINDING_CONTEXT_TERMINAL_TEXT_SELECTED, KEYBINDING_CONTEXT_TERMINAL_FIND_WIDGET_NOT_VISIBLE)), 'Terminal: Escape selection', category);
+}, ContextKeyExpr.and(KEYBINDING_CONTEXT_TERMINAL_FOCUS, KEYBINDING_CONTEXT_TERMINAL_TEXT_SELECTED, KEYBINDING_CONTEXT_TERMINAL_FIND_WIDGET_NOT_VISIBLE)), 'Terminal: Escape selection', category);
 actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(CreateNewInActiveWorkspaceTerminalAction, CreateNewInActiveWorkspaceTerminalAction.ID, CreateNewInActiveWorkspaceTerminalAction.LABEL), 'Terminal: Create New Integrated Terminal (In Active Workspace)', category);
 actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(FocusActiveTerminalAction, FocusActiveTerminalAction.ID, FocusActiveTerminalAction.LABEL), 'Terminal: Focus Terminal', category);
 actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(FocusNextTerminalAction, FocusNextTerminalAction.ID, FocusNextTerminalAction.LABEL), 'Terminal: Focus Next Terminal', category);
@@ -425,7 +448,7 @@ actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(ScrollToTopTermi
 actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(ClearTerminalAction, ClearTerminalAction.ID, ClearTerminalAction.LABEL, {
 	primary: KeyMod.CtrlCmd | KeyCode.KEY_K,
 	linux: { primary: null }
-}, KEYBINDING_CONTEXT_TERMINAL_FOCUS, KeybindingsRegistry.WEIGHT.workbenchContrib(1)), 'Terminal: Clear', category);
+}, KEYBINDING_CONTEXT_TERMINAL_FOCUS, KeybindingWeight.WorkbenchContrib + 1), 'Terminal: Clear', category);
 if (platform.isWindows) {
 	actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(SelectDefaultShellWindowsTerminalAction, SelectDefaultShellWindowsTerminalAction.ID, SelectDefaultShellWindowsTerminalAction.LABEL), 'Terminal: Select Default Shell', category);
 }
@@ -439,12 +462,6 @@ actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(HideTerminalFind
 	primary: KeyCode.Escape,
 	secondary: [KeyMod.Shift | KeyCode.Escape]
 }, ContextKeyExpr.and(KEYBINDING_CONTEXT_TERMINAL_FOCUS, KEYBINDING_CONTEXT_TERMINAL_FIND_WIDGET_VISIBLE)), 'Terminal: Hide Find Widget', category);
-actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(ShowNextFindTermTerminalFindWidgetAction, ShowNextFindTermTerminalFindWidgetAction.ID, ShowNextFindTermTerminalFindWidgetAction.LABEL, {
-	primary: KeyMod.Alt | KeyCode.DownArrow
-}, ContextKeyExpr.and(KEYBINDING_CONTEXT_TERMINAL_FIND_WIDGET_INPUT_FOCUSED, KEYBINDING_CONTEXT_TERMINAL_FIND_WIDGET_VISIBLE)), 'Terminal: Show Next Find Term', category);
-actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(ShowPreviousFindTermTerminalFindWidgetAction, ShowPreviousFindTermTerminalFindWidgetAction.ID, ShowPreviousFindTermTerminalFindWidgetAction.LABEL, {
-	primary: KeyMod.Alt | KeyCode.UpArrow
-}, ContextKeyExpr.and(KEYBINDING_CONTEXT_TERMINAL_FIND_WIDGET_INPUT_FOCUSED, KEYBINDING_CONTEXT_TERMINAL_FIND_WIDGET_VISIBLE)), 'Terminal: Show Previous Find Term', category);
 actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(DeleteWordLeftTerminalAction, DeleteWordLeftTerminalAction.ID, DeleteWordLeftTerminalAction.LABEL, {
 	primary: KeyMod.CtrlCmd | KeyCode.Backspace,
 	mac: { primary: KeyMod.Alt | KeyCode.Backspace }
@@ -524,7 +541,15 @@ actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(SelectToNextComm
 }, KEYBINDING_CONTEXT_TERMINAL_FOCUS), 'Terminal: Select To Next Command', category);
 actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(SelectToPreviousLineAction, SelectToPreviousLineAction.ID, SelectToPreviousLineAction.LABEL), 'Terminal: Select To Previous Line', category);
 actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(SelectToNextLineAction, SelectToNextLineAction.ID, SelectToNextLineAction.LABEL), 'Terminal: Select To Next Line', category);
+actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(ToggleEscapeSequenceLoggingAction, ToggleEscapeSequenceLoggingAction.ID, ToggleEscapeSequenceLoggingAction.LABEL), 'Terminal: Toggle Escape Sequence Logging', category);
 
-terminalCommands.setup();
+const sendSequenceTerminalCommand = new SendSequenceTerminalCommand({
+	id: SendSequenceTerminalCommand.ID,
+	precondition: null
+});
+sendSequenceTerminalCommand.register();
+
+setupTerminalCommands();
+setupTerminalMenu();
 
 registerColors();
diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminalActions.ts b/src/vs/workbench/parts/terminal/electron-browser/terminalActions.ts
index 66c7c67b786..c313c0dd02a 100644
--- a/src/vs/workbench/parts/terminal/electron-browser/terminalActions.ts
+++ b/src/vs/workbench/parts/terminal/electron-browser/terminalActions.ts
@@ -16,22 +16,25 @@ import { IPartService } from 'vs/workbench/services/part/common/partService';
 import { IPanelService } from 'vs/workbench/services/panel/common/panelService';
 import { attachSelectBoxStyler } from 'vs/platform/theme/common/styler';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { IQuickOpenService, IPickOptions } from 'vs/platform/quickOpen/common/quickOpen';
-import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
+import { IQuickOpenService } from 'vs/platform/quickOpen/common/quickOpen';
+import { IQuickInputService, IPickOptions, IQuickPickItem } from 'vs/platform/quickinput/common/quickInput';
 import { ActionBarContributor } from 'vs/workbench/browser/actions';
 import { TerminalEntry } from 'vs/workbench/parts/terminal/browser/terminalQuickOpen';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
 import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
 import { ICommandService } from 'vs/platform/commands/common/commands';
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
 import { PICK_WORKSPACE_FOLDER_COMMAND_ID } from 'vs/workbench/browser/actions/workspaceCommands';
 import { INotificationService } from 'vs/platform/notification/common/notification';
+import { TERMINAL_COMMAND_ID } from 'vs/workbench/parts/terminal/common/terminalCommands';
+import { Command } from 'vs/editor/browser/editorExtensions';
+import { timeout } from 'vs/base/common/async';
 
 export const TERMINAL_PICKER_PREFIX = 'term ';
 
 export class ToggleTerminalAction extends TogglePanelAction {
 
-	public static readonly ID = 'workbench.action.terminal.toggleTerminal';
+	public static readonly ID = TERMINAL_COMMAND_ID.TOGGLE;
 	public static readonly LABEL = nls.localize('workbench.action.terminal.toggleTerminal', "Toggle Integrated Terminal");
 
 	constructor(
@@ -59,7 +62,7 @@ export class ToggleTerminalAction extends TogglePanelAction {
 
 export class KillTerminalAction extends Action {
 
-	public static readonly ID = 'workbench.action.terminal.kill';
+	public static readonly ID = TERMINAL_COMMAND_ID.KILL;
 	public static readonly LABEL = nls.localize('workbench.action.terminal.kill', "Kill the Active Terminal Instance");
 	public static readonly PANEL_LABEL = nls.localize('workbench.action.terminal.kill.short', "Kill Terminal");
 
@@ -71,9 +74,9 @@ export class KillTerminalAction extends Action {
 	}
 
 	public run(event?: any): TPromise<any> {
-		let terminalInstance = this.terminalService.getActiveInstance();
-		if (terminalInstance) {
-			this.terminalService.getActiveInstance().dispose();
+		const instance = this.terminalService.getActiveInstance();
+		if (instance) {
+			instance.dispose();
 			if (this.terminalService.terminalInstances.length > 0) {
 				this.terminalService.showPanel(true);
 			}
@@ -84,7 +87,7 @@ export class KillTerminalAction extends Action {
 
 export class QuickKillTerminalAction extends Action {
 
-	public static readonly ID = 'workbench.action.terminal.quickKill';
+	public static readonly ID = TERMINAL_COMMAND_ID.QUICK_KILL;
 	public static readonly LABEL = nls.localize('workbench.action.terminal.quickKill', "Kill Terminal Instance");
 
 	constructor(
@@ -100,7 +103,7 @@ export class QuickKillTerminalAction extends Action {
 		if (instance) {
 			instance.dispose();
 		}
-		return TPromise.timeout(50).then(result => this.quickOpenService.show(TERMINAL_PICKER_PREFIX, null));
+		return TPromise.wrap(timeout(50)).then(result => this.quickOpenService.show(TERMINAL_PICKER_PREFIX, null));
 	}
 }
 
@@ -110,8 +113,9 @@ export class QuickKillTerminalAction extends Action {
  */
 export class CopyTerminalSelectionAction extends Action {
 
-	public static readonly ID = 'workbench.action.terminal.copySelection';
+	public static readonly ID = TERMINAL_COMMAND_ID.COPY_SELECTION;
 	public static readonly LABEL = nls.localize('workbench.action.terminal.copySelection', "Copy Selection");
+	public static readonly SHORT_LABEL = nls.localize('workbench.action.terminal.copySelection.short', "Copy");
 
 	constructor(
 		id: string, label: string,
@@ -121,7 +125,7 @@ export class CopyTerminalSelectionAction extends Action {
 	}
 
 	public run(event?: any): TPromise<any> {
-		let terminalInstance = this.terminalService.getActiveInstance();
+		const terminalInstance = this.terminalService.getActiveInstance();
 		if (terminalInstance) {
 			terminalInstance.copySelection();
 		}
@@ -131,7 +135,7 @@ export class CopyTerminalSelectionAction extends Action {
 
 export class SelectAllTerminalAction extends Action {
 
-	public static readonly ID = 'workbench.action.terminal.selectAll';
+	public static readonly ID = TERMINAL_COMMAND_ID.SELECT_ALL;
 	public static readonly LABEL = nls.localize('workbench.action.terminal.selectAll', "Select All");
 
 	constructor(
@@ -142,7 +146,7 @@ export class SelectAllTerminalAction extends Action {
 	}
 
 	public run(event?: any): TPromise<any> {
-		let terminalInstance = this.terminalService.getActiveInstance();
+		const terminalInstance = this.terminalService.getActiveInstance();
 		if (terminalInstance) {
 			terminalInstance.selectAll();
 		}
@@ -161,7 +165,7 @@ export abstract class BaseSendTextTerminalAction extends Action {
 	}
 
 	public run(event?: any): TPromise<any> {
-		let terminalInstance = this._terminalService.getActiveInstance();
+		const terminalInstance = this._terminalService.getActiveInstance();
 		if (terminalInstance) {
 			terminalInstance.sendText(this._text, false);
 		}
@@ -170,7 +174,7 @@ export abstract class BaseSendTextTerminalAction extends Action {
 }
 
 export class DeleteWordLeftTerminalAction extends BaseSendTextTerminalAction {
-	public static readonly ID = 'workbench.action.terminal.deleteWordLeft';
+	public static readonly ID = TERMINAL_COMMAND_ID.DELETE_WORD_LEFT;
 	public static readonly LABEL = nls.localize('workbench.action.terminal.deleteWordLeft', "Delete Word Left");
 
 	constructor(
@@ -184,7 +188,7 @@ export class DeleteWordLeftTerminalAction extends BaseSendTextTerminalAction {
 }
 
 export class DeleteWordRightTerminalAction extends BaseSendTextTerminalAction {
-	public static readonly ID = 'workbench.action.terminal.deleteWordRight';
+	public static readonly ID = TERMINAL_COMMAND_ID.DELETE_WORD_RIGHT;
 	public static readonly LABEL = nls.localize('workbench.action.terminal.deleteWordRight', "Delete Word Right");
 
 	constructor(
@@ -198,7 +202,7 @@ export class DeleteWordRightTerminalAction extends BaseSendTextTerminalAction {
 }
 
 export class MoveToLineStartTerminalAction extends BaseSendTextTerminalAction {
-	public static readonly ID = 'workbench.action.terminal.moveToLineStart';
+	public static readonly ID = TERMINAL_COMMAND_ID.MOVE_TO_LINE_START;
 	public static readonly LABEL = nls.localize('workbench.action.terminal.moveToLineStart', "Move To Line Start");
 
 	constructor(
@@ -212,7 +216,7 @@ export class MoveToLineStartTerminalAction extends BaseSendTextTerminalAction {
 }
 
 export class MoveToLineEndTerminalAction extends BaseSendTextTerminalAction {
-	public static readonly ID = 'workbench.action.terminal.moveToLineEnd';
+	public static readonly ID = TERMINAL_COMMAND_ID.MOVE_TO_LINE_END;
 	public static readonly LABEL = nls.localize('workbench.action.terminal.moveToLineEnd', "Move To Line End");
 
 	constructor(
@@ -225,11 +229,24 @@ export class MoveToLineEndTerminalAction extends BaseSendTextTerminalAction {
 	}
 }
 
+export class SendSequenceTerminalCommand extends Command {
+	public static readonly ID = TERMINAL_COMMAND_ID.SEND_SEQUENCE;
+	public static readonly LABEL = nls.localize('workbench.action.terminal.sendSequence', "Send Custom Sequence To Terminal");
+
+	public runCommand(accessor: ServicesAccessor, args: any): void {
+		const terminalInstance = accessor.get(ITerminalService).getActiveInstance();
+		if (!terminalInstance) {
+			return;
+		}
+		terminalInstance.sendText(args.text, false);
+	}
+}
+
 export class CreateNewTerminalAction extends Action {
 
-	public static readonly ID = 'workbench.action.terminal.new';
+	public static readonly ID = TERMINAL_COMMAND_ID.NEW;
 	public static readonly LABEL = nls.localize('workbench.action.terminal.new', "Create New Integrated Terminal");
-	public static readonly PANEL_LABEL = nls.localize('workbench.action.terminal.new.short', "New Terminal");
+	public static readonly SHORT_LABEL = nls.localize('workbench.action.terminal.new.short', "New Terminal");
 
 	constructor(
 		id: string, label: string,
@@ -256,7 +273,7 @@ export class CreateNewTerminalAction extends Action {
 			// single root
 			instancePromise = TPromise.as(this.terminalService.createTerminal(undefined, true));
 		} else {
-			const options: IPickOptions = {
+			const options: IPickOptions<IQuickPickItem> = {
 				placeHolder: nls.localize('workbench.action.terminal.newWorkspacePlaceholder', "Select current working directory for new terminal")
 			};
 			instancePromise = this.commandService.executeCommand(PICK_WORKSPACE_FOLDER_COMMAND_ID, [options]).then(workspace => {
@@ -280,7 +297,7 @@ export class CreateNewTerminalAction extends Action {
 
 export class CreateNewInActiveWorkspaceTerminalAction extends Action {
 
-	public static readonly ID = 'workbench.action.terminal.newInActiveWorkspace';
+	public static readonly ID = TERMINAL_COMMAND_ID.NEW_IN_ACTIVE_WORKSPACE;
 	public static readonly LABEL = nls.localize('workbench.action.terminal.newInActiveWorkspace', "Create New Integrated Terminal (In Active Workspace)");
 
 	constructor(
@@ -301,8 +318,9 @@ export class CreateNewInActiveWorkspaceTerminalAction extends Action {
 }
 
 export class SplitTerminalAction extends Action {
-	public static readonly ID = 'workbench.action.terminal.split';
+	public static readonly ID = TERMINAL_COMMAND_ID.SPLIT;
 	public static readonly LABEL = nls.localize('workbench.action.terminal.split', "Split Terminal");
+	public static readonly SHORT_LABEL = nls.localize('workbench.action.terminal.split.short', "Split");
 
 	constructor(
 		id: string, label: string,
@@ -324,7 +342,7 @@ export class SplitTerminalAction extends Action {
 		let pathPromise: TPromise<any> = TPromise.as({});
 		if (folders.length > 1) {
 			// Only choose a path when there's more than 1 folder
-			const options: IPickOptions = {
+			const options: IPickOptions<IQuickPickItem> = {
 				placeHolder: nls.localize('workbench.action.terminal.newWorkspacePlaceholder', "Select current working directory for new terminal")
 			};
 			pathPromise = this.commandService.executeCommand(PICK_WORKSPACE_FOLDER_COMMAND_ID, [options]).then(workspace => {
@@ -347,7 +365,7 @@ export class SplitTerminalAction extends Action {
 }
 
 export class SplitInActiveWorkspaceTerminalAction extends Action {
-	public static readonly ID = 'workbench.action.terminal.splitInActiveWorkspace';
+	public static readonly ID = TERMINAL_COMMAND_ID.SPLIT_IN_ACTIVE_WORKSPACE;
 	public static readonly LABEL = nls.localize('workbench.action.terminal.splitInActiveWorkspace', "Split Terminal (In Active Workspace)");
 
 	constructor(
@@ -368,7 +386,7 @@ export class SplitInActiveWorkspaceTerminalAction extends Action {
 }
 
 export class FocusPreviousPaneTerminalAction extends Action {
-	public static readonly ID = 'workbench.action.terminal.focusPreviousPane';
+	public static readonly ID = TERMINAL_COMMAND_ID.FOCUS_PREVIOUS_PANE;
 	public static readonly LABEL = nls.localize('workbench.action.terminal.focusPreviousPane', "Focus Previous Pane");
 
 	constructor(
@@ -389,7 +407,7 @@ export class FocusPreviousPaneTerminalAction extends Action {
 }
 
 export class FocusNextPaneTerminalAction extends Action {
-	public static readonly ID = 'workbench.action.terminal.focusNextPane';
+	public static readonly ID = TERMINAL_COMMAND_ID.FOCUS_NEXT_PANE;
 	public static readonly LABEL = nls.localize('workbench.action.terminal.focusNextPane', "Focus Next Pane");
 
 	constructor(
@@ -428,7 +446,7 @@ export abstract class BaseFocusDirectionTerminalAction extends Action {
 }
 
 export class ResizePaneLeftTerminalAction extends BaseFocusDirectionTerminalAction {
-	public static readonly ID = 'workbench.action.terminal.resizePaneLeft';
+	public static readonly ID = TERMINAL_COMMAND_ID.RESIZE_PANE_LEFT;
 	public static readonly LABEL = nls.localize('workbench.action.terminal.resizePaneLeft', "Resize Pane Left");
 
 	constructor(
@@ -440,7 +458,7 @@ export class ResizePaneLeftTerminalAction extends BaseFocusDirectionTerminalActi
 }
 
 export class ResizePaneRightTerminalAction extends BaseFocusDirectionTerminalAction {
-	public static readonly ID = 'workbench.action.terminal.resizePaneRight';
+	public static readonly ID = TERMINAL_COMMAND_ID.RESIZE_PANE_RIGHT;
 	public static readonly LABEL = nls.localize('workbench.action.terminal.resizePaneRight', "Resize Pane Right");
 
 	constructor(
@@ -452,7 +470,7 @@ export class ResizePaneRightTerminalAction extends BaseFocusDirectionTerminalAct
 }
 
 export class ResizePaneUpTerminalAction extends BaseFocusDirectionTerminalAction {
-	public static readonly ID = 'workbench.action.terminal.resizePaneUp';
+	public static readonly ID = TERMINAL_COMMAND_ID.RESIZE_PANE_UP;
 	public static readonly LABEL = nls.localize('workbench.action.terminal.resizePaneUp', "Resize Pane Up");
 
 	constructor(
@@ -464,7 +482,7 @@ export class ResizePaneUpTerminalAction extends BaseFocusDirectionTerminalAction
 }
 
 export class ResizePaneDownTerminalAction extends BaseFocusDirectionTerminalAction {
-	public static readonly ID = 'workbench.action.terminal.resizePaneDown';
+	public static readonly ID = TERMINAL_COMMAND_ID.RESIZE_PANE_DOWN;
 	public static readonly LABEL = nls.localize('workbench.action.terminal.resizePaneDown', "Resize Pane Down");
 
 	constructor(
@@ -477,7 +495,7 @@ export class ResizePaneDownTerminalAction extends BaseFocusDirectionTerminalActi
 
 export class FocusActiveTerminalAction extends Action {
 
-	public static readonly ID = 'workbench.action.terminal.focus';
+	public static readonly ID = TERMINAL_COMMAND_ID.FOCUS;
 	public static readonly LABEL = nls.localize('workbench.action.terminal.focus', "Focus Terminal");
 
 	constructor(
@@ -499,7 +517,7 @@ export class FocusActiveTerminalAction extends Action {
 
 export class FocusNextTerminalAction extends Action {
 
-	public static readonly ID = 'workbench.action.terminal.focusNext';
+	public static readonly ID = TERMINAL_COMMAND_ID.FOCUS_NEXT;
 	public static readonly LABEL = nls.localize('workbench.action.terminal.focusNext', "Focus Next Terminal");
 
 	constructor(
@@ -517,7 +535,7 @@ export class FocusNextTerminalAction extends Action {
 
 export class FocusPreviousTerminalAction extends Action {
 
-	public static readonly ID = 'workbench.action.terminal.focusPrevious';
+	public static readonly ID = TERMINAL_COMMAND_ID.FOCUS_PREVIOUS;
 	public static readonly LABEL = nls.localize('workbench.action.terminal.focusPrevious', "Focus Previous Terminal");
 
 	constructor(
@@ -535,8 +553,9 @@ export class FocusPreviousTerminalAction extends Action {
 
 export class TerminalPasteAction extends Action {
 
-	public static readonly ID = 'workbench.action.terminal.paste';
+	public static readonly ID = TERMINAL_COMMAND_ID.PASTE;
 	public static readonly LABEL = nls.localize('workbench.action.terminal.paste', "Paste into Active Terminal");
+	public static readonly SHORT_LABEL = nls.localize('workbench.action.terminal.paste.short', "Paste");
 
 	constructor(
 		id: string, label: string,
@@ -556,8 +575,8 @@ export class TerminalPasteAction extends Action {
 
 export class SelectDefaultShellWindowsTerminalAction extends Action {
 
-	public static readonly ID = 'workbench.action.terminal.selectDefaultShell';
-	public static readonly LABEL = nls.localize('workbench.action.terminal.DefaultShell', "Select Default Shell");
+	public static readonly ID = TERMINAL_COMMAND_ID.SELECT_DEFAULT_SHELL;
+	public static readonly LABEL = nls.localize('workbench.action.terminal.selectDefaultShell', "Select Default Shell");
 
 	constructor(
 		id: string, label: string,
@@ -573,7 +592,7 @@ export class SelectDefaultShellWindowsTerminalAction extends Action {
 
 export class RunSelectedTextInTerminalAction extends Action {
 
-	public static readonly ID = 'workbench.action.terminal.runSelectedText';
+	public static readonly ID = TERMINAL_COMMAND_ID.RUN_SELECTED_TEXT;
 	public static readonly LABEL = nls.localize('workbench.action.terminal.runSelectedText', "Run Selected Text In Active Terminal");
 
 	constructor(
@@ -598,7 +617,7 @@ export class RunSelectedTextInTerminalAction extends Action {
 		if (selection.isEmpty()) {
 			text = editor.getModel().getLineContent(selection.selectionStartLineNumber).trim();
 		} else {
-			let endOfLinePreference = os.EOL === '\n' ? EndOfLinePreference.LF : EndOfLinePreference.CRLF;
+			const endOfLinePreference = os.EOL === '\n' ? EndOfLinePreference.LF : EndOfLinePreference.CRLF;
 			text = editor.getModel().getValueInRange(selection, endOfLinePreference);
 		}
 		instance.sendText(text, true);
@@ -608,7 +627,7 @@ export class RunSelectedTextInTerminalAction extends Action {
 
 export class RunActiveFileInTerminalAction extends Action {
 
-	public static readonly ID = 'workbench.action.terminal.runActiveFile';
+	public static readonly ID = TERMINAL_COMMAND_ID.RUN_ACTIVE_FILE;
 	public static readonly LABEL = nls.localize('workbench.action.terminal.runActiveFile', "Run Active File In Active Terminal");
 
 	constructor(
@@ -625,7 +644,7 @@ export class RunActiveFileInTerminalAction extends Action {
 		if (!instance) {
 			return TPromise.as(void 0);
 		}
-		const editor = this.codeEditorService.getFocusedCodeEditor();
+		const editor = this.codeEditorService.getActiveCodeEditor();
 		if (!editor) {
 			return TPromise.as(void 0);
 		}
@@ -641,14 +660,14 @@ export class RunActiveFileInTerminalAction extends Action {
 
 export class SwitchTerminalAction extends Action {
 
-	public static readonly ID = 'workbench.action.terminal.switchTerminal';
+	public static readonly ID = TERMINAL_COMMAND_ID.SWITCH_TERMINAL;
 	public static readonly LABEL = nls.localize('workbench.action.terminal.switchTerminal', "Switch Terminal");
 
 	constructor(
 		id: string, label: string,
 		@ITerminalService private terminalService: ITerminalService
 	) {
-		super(SwitchTerminalAction.ID, SwitchTerminalAction.LABEL, 'terminal-action switch-terminal');
+		super(id, label, 'terminal-action switch-terminal');
 	}
 
 	public run(item?: string): TPromise<any> {
@@ -669,7 +688,7 @@ export class SwitchTerminalActionItem extends SelectActionItem {
 		@IThemeService themeService: IThemeService,
 		@IContextViewService contextViewService: IContextViewService
 	) {
-		super(null, action, terminalService.getTabLabels(), terminalService.activeTabIndex, contextViewService);
+		super(null, action, terminalService.getTabLabels(), terminalService.activeTabIndex, contextViewService, { ariaLabel: nls.localize('terminals', 'Terminals') });
 
 		this.toDispose.push(terminalService.onInstancesChanged(this._updateItems, this));
 		this.toDispose.push(terminalService.onActiveTabChanged(this._updateItems, this));
@@ -684,7 +703,7 @@ export class SwitchTerminalActionItem extends SelectActionItem {
 
 export class ScrollDownTerminalAction extends Action {
 
-	public static readonly ID = 'workbench.action.terminal.scrollDown';
+	public static readonly ID = TERMINAL_COMMAND_ID.SCROLL_DOWN_LINE;
 	public static readonly LABEL = nls.localize('workbench.action.terminal.scrollDown', "Scroll Down (Line)");
 
 	constructor(
@@ -695,7 +714,7 @@ export class ScrollDownTerminalAction extends Action {
 	}
 
 	public run(event?: any): TPromise<any> {
-		let terminalInstance = this.terminalService.getActiveInstance();
+		const terminalInstance = this.terminalService.getActiveInstance();
 		if (terminalInstance) {
 			terminalInstance.scrollDownLine();
 		}
@@ -705,7 +724,7 @@ export class ScrollDownTerminalAction extends Action {
 
 export class ScrollDownPageTerminalAction extends Action {
 
-	public static readonly ID = 'workbench.action.terminal.scrollDownPage';
+	public static readonly ID = TERMINAL_COMMAND_ID.SCROLL_DOWN_PAGE;
 	public static readonly LABEL = nls.localize('workbench.action.terminal.scrollDownPage', "Scroll Down (Page)");
 
 	constructor(
@@ -716,7 +735,7 @@ export class ScrollDownPageTerminalAction extends Action {
 	}
 
 	public run(event?: any): TPromise<any> {
-		let terminalInstance = this.terminalService.getActiveInstance();
+		const terminalInstance = this.terminalService.getActiveInstance();
 		if (terminalInstance) {
 			terminalInstance.scrollDownPage();
 		}
@@ -726,7 +745,7 @@ export class ScrollDownPageTerminalAction extends Action {
 
 export class ScrollToBottomTerminalAction extends Action {
 
-	public static readonly ID = 'workbench.action.terminal.scrollToBottom';
+	public static readonly ID = TERMINAL_COMMAND_ID.SCROLL_TO_BOTTOM;
 	public static readonly LABEL = nls.localize('workbench.action.terminal.scrollToBottom', "Scroll to Bottom");
 
 	constructor(
@@ -737,7 +756,7 @@ export class ScrollToBottomTerminalAction extends Action {
 	}
 
 	public run(event?: any): TPromise<any> {
-		let terminalInstance = this.terminalService.getActiveInstance();
+		const terminalInstance = this.terminalService.getActiveInstance();
 		if (terminalInstance) {
 			terminalInstance.scrollToBottom();
 		}
@@ -747,7 +766,7 @@ export class ScrollToBottomTerminalAction extends Action {
 
 export class ScrollUpTerminalAction extends Action {
 
-	public static readonly ID = 'workbench.action.terminal.scrollUp';
+	public static readonly ID = TERMINAL_COMMAND_ID.SCROLL_UP_LINE;
 	public static readonly LABEL = nls.localize('workbench.action.terminal.scrollUp', "Scroll Up (Line)");
 
 	constructor(
@@ -758,7 +777,7 @@ export class ScrollUpTerminalAction extends Action {
 	}
 
 	public run(event?: any): TPromise<any> {
-		let terminalInstance = this.terminalService.getActiveInstance();
+		const terminalInstance = this.terminalService.getActiveInstance();
 		if (terminalInstance) {
 			terminalInstance.scrollUpLine();
 		}
@@ -768,7 +787,7 @@ export class ScrollUpTerminalAction extends Action {
 
 export class ScrollUpPageTerminalAction extends Action {
 
-	public static readonly ID = 'workbench.action.terminal.scrollUpPage';
+	public static readonly ID = TERMINAL_COMMAND_ID.SCROLL_UP_PAGE;
 	public static readonly LABEL = nls.localize('workbench.action.terminal.scrollUpPage', "Scroll Up (Page)");
 
 	constructor(
@@ -779,7 +798,7 @@ export class ScrollUpPageTerminalAction extends Action {
 	}
 
 	public run(event?: any): TPromise<any> {
-		let terminalInstance = this.terminalService.getActiveInstance();
+		const terminalInstance = this.terminalService.getActiveInstance();
 		if (terminalInstance) {
 			terminalInstance.scrollUpPage();
 		}
@@ -789,7 +808,7 @@ export class ScrollUpPageTerminalAction extends Action {
 
 export class ScrollToTopTerminalAction extends Action {
 
-	public static readonly ID = 'workbench.action.terminal.scrollToTop';
+	public static readonly ID = TERMINAL_COMMAND_ID.SCROLL_TO_TOP;
 	public static readonly LABEL = nls.localize('workbench.action.terminal.scrollToTop', "Scroll to Top");
 
 	constructor(
@@ -800,7 +819,7 @@ export class ScrollToTopTerminalAction extends Action {
 	}
 
 	public run(event?: any): TPromise<any> {
-		let terminalInstance = this.terminalService.getActiveInstance();
+		const terminalInstance = this.terminalService.getActiveInstance();
 		if (terminalInstance) {
 			terminalInstance.scrollToTop();
 		}
@@ -810,7 +829,7 @@ export class ScrollToTopTerminalAction extends Action {
 
 export class ClearTerminalAction extends Action {
 
-	public static readonly ID = 'workbench.action.terminal.clear';
+	public static readonly ID = TERMINAL_COMMAND_ID.CLEAR;
 	public static readonly LABEL = nls.localize('workbench.action.terminal.clear', "Clear");
 
 	constructor(
@@ -821,7 +840,7 @@ export class ClearTerminalAction extends Action {
 	}
 
 	public run(event?: any): TPromise<any> {
-		let terminalInstance = this.terminalService.getActiveInstance();
+		const terminalInstance = this.terminalService.getActiveInstance();
 		if (terminalInstance) {
 			terminalInstance.clear();
 		}
@@ -831,7 +850,7 @@ export class ClearTerminalAction extends Action {
 
 export class ClearSelectionTerminalAction extends Action {
 
-	public static readonly ID = 'workbench.action.terminal.clearSelection';
+	public static readonly ID = TERMINAL_COMMAND_ID.CLEAR_SELECTION;
 	public static readonly LABEL = nls.localize('workbench.action.terminal.clearSelection', "Clear Selection");
 
 	constructor(
@@ -842,7 +861,7 @@ export class ClearSelectionTerminalAction extends Action {
 	}
 
 	public run(event?: any): TPromise<any> {
-		let terminalInstance = this.terminalService.getActiveInstance();
+		const terminalInstance = this.terminalService.getActiveInstance();
 		if (terminalInstance && terminalInstance.hasSelection()) {
 			terminalInstance.clearSelection();
 		}
@@ -852,7 +871,7 @@ export class ClearSelectionTerminalAction extends Action {
 
 export class AllowWorkspaceShellTerminalCommand extends Action {
 
-	public static readonly ID = 'workbench.action.terminal.allowWorkspaceShell';
+	public static readonly ID = TERMINAL_COMMAND_ID.WORKSPACE_SHELL_ALLOW;
 	public static readonly LABEL = nls.localize('workbench.action.terminal.allowWorkspaceShell', "Allow Workspace Shell Configuration");
 
 	constructor(
@@ -870,7 +889,7 @@ export class AllowWorkspaceShellTerminalCommand extends Action {
 
 export class DisallowWorkspaceShellTerminalCommand extends Action {
 
-	public static readonly ID = 'workbench.action.terminal.disallowWorkspaceShell';
+	public static readonly ID = TERMINAL_COMMAND_ID.WORKSPACE_SHELL_DISALLOW;
 	public static readonly LABEL = nls.localize('workbench.action.terminal.disallowWorkspaceShell', "Disallow Workspace Shell Configuration");
 
 	constructor(
@@ -888,7 +907,7 @@ export class DisallowWorkspaceShellTerminalCommand extends Action {
 
 export class RenameTerminalAction extends Action {
 
-	public static readonly ID = 'workbench.action.terminal.rename';
+	public static readonly ID = TERMINAL_COMMAND_ID.RENAME;
 	public static readonly LABEL = nls.localize('workbench.action.terminal.rename', "Rename");
 
 	constructor(
@@ -918,7 +937,7 @@ export class RenameTerminalAction extends Action {
 
 export class FocusTerminalFindWidgetAction extends Action {
 
-	public static readonly ID = 'workbench.action.terminal.focusFindWidget';
+	public static readonly ID = TERMINAL_COMMAND_ID.FIND_WIDGET_FOCUS;
 	public static readonly LABEL = nls.localize('workbench.action.terminal.focusFindWidget', "Focus Find Widget");
 
 	constructor(
@@ -935,7 +954,7 @@ export class FocusTerminalFindWidgetAction extends Action {
 
 export class HideTerminalFindWidgetAction extends Action {
 
-	public static readonly ID = 'workbench.action.terminal.hideFindWidget';
+	public static readonly ID = TERMINAL_COMMAND_ID.FIND_WIDGET_HIDE;
 	public static readonly LABEL = nls.localize('workbench.action.terminal.hideFindWidget', "Hide Find Widget");
 
 	constructor(
@@ -950,41 +969,6 @@ export class HideTerminalFindWidgetAction extends Action {
 	}
 }
 
-export class ShowNextFindTermTerminalFindWidgetAction extends Action {
-
-	public static readonly ID = 'workbench.action.terminal.findWidget.history.showNext';
-	public static readonly LABEL = nls.localize('nextTerminalFindTerm', "Show Next Find Term");
-
-	constructor(
-		id: string, label: string,
-		@ITerminalService private terminalService: ITerminalService
-	) {
-		super(id, label);
-	}
-
-	public run(): TPromise<any> {
-		return TPromise.as(this.terminalService.showNextFindTermFindWidget());
-	}
-}
-
-export class ShowPreviousFindTermTerminalFindWidgetAction extends Action {
-
-	public static readonly ID = 'workbench.action.terminal.findWidget.history.showPrevious';
-	public static readonly LABEL = nls.localize('previousTerminalFindTerm', "Show Previous Find Term");
-
-	constructor(
-		id: string, label: string,
-		@ITerminalService private terminalService: ITerminalService
-	) {
-		super(id, label);
-	}
-
-	public run(): TPromise<any> {
-		return TPromise.as(this.terminalService.showPreviousFindTermFindWidget());
-	}
-}
-
-
 export class QuickOpenActionTermContributor extends ActionBarContributor {
 
 	constructor(
@@ -994,7 +978,7 @@ export class QuickOpenActionTermContributor extends ActionBarContributor {
 	}
 
 	public getActions(context: any): IAction[] {
-		let actions: Action[] = [];
+		const actions: Action[] = [];
 		if (context.element instanceof TerminalEntry) {
 			actions.push(this.instantiationService.createInstance(RenameTerminalQuickOpenAction, RenameTerminalQuickOpenAction.ID, RenameTerminalQuickOpenAction.LABEL, context.element));
 			actions.push(this.instantiationService.createInstance(QuickKillTerminalAction, QuickKillTerminalAction.ID, QuickKillTerminalAction.LABEL, context.element));
@@ -1009,7 +993,7 @@ export class QuickOpenActionTermContributor extends ActionBarContributor {
 
 export class QuickOpenTermAction extends Action {
 
-	public static readonly ID = 'workbench.action.quickOpenTerm';
+	public static readonly ID = TERMINAL_COMMAND_ID.QUICK_OPEN_TERM;
 	public static readonly LABEL = nls.localize('quickOpenTerm', "Switch Active Terminal");
 
 	constructor(
@@ -1041,14 +1025,14 @@ export class RenameTerminalQuickOpenAction extends RenameTerminalAction {
 	public run(): TPromise<any> {
 		super.run(this.terminal)
 			// This timeout is needed to make sure the previous quickOpen has time to close before we show the next one
-			.then(() => TPromise.timeout(50))
+			.then(() => timeout(50))
 			.then(result => this.quickOpenService.show(TERMINAL_PICKER_PREFIX, null));
 		return TPromise.as(null);
 	}
 }
 
 export class ScrollToPreviousCommandAction extends Action {
-	public static readonly ID = 'workbench.action.terminal.scrollToPreviousCommand';
+	public static readonly ID = TERMINAL_COMMAND_ID.SCROLL_TO_PREVIOUS_COMMAND;
 	public static readonly LABEL = nls.localize('workbench.action.terminal.scrollToPreviousCommand', "Scroll To Previous Command");
 
 	constructor(
@@ -1069,7 +1053,7 @@ export class ScrollToPreviousCommandAction extends Action {
 }
 
 export class ScrollToNextCommandAction extends Action {
-	public static readonly ID = 'workbench.action.terminal.scrollToNextCommand';
+	public static readonly ID = TERMINAL_COMMAND_ID.SCROLL_TO_NEXT_COMMAND;
 	public static readonly LABEL = nls.localize('workbench.action.terminal.scrollToNextCommand', "Scroll To Next Command");
 
 	constructor(
@@ -1090,7 +1074,7 @@ export class ScrollToNextCommandAction extends Action {
 }
 
 export class SelectToPreviousCommandAction extends Action {
-	public static readonly ID = 'workbench.action.terminal.selectToPreviousCommand';
+	public static readonly ID = TERMINAL_COMMAND_ID.SELECT_TO_PREVIOUS_COMMAND;
 	public static readonly LABEL = nls.localize('workbench.action.terminal.selectToPreviousCommand', "Select To Previous Command");
 
 	constructor(
@@ -1111,7 +1095,7 @@ export class SelectToPreviousCommandAction extends Action {
 }
 
 export class SelectToNextCommandAction extends Action {
-	public static readonly ID = 'workbench.action.terminal.selectToNextCommand';
+	public static readonly ID = TERMINAL_COMMAND_ID.SELECT_TO_NEXT_COMMAND;
 	public static readonly LABEL = nls.localize('workbench.action.terminal.selectToNextCommand', "Select To Next Command");
 
 	constructor(
@@ -1132,7 +1116,7 @@ export class SelectToNextCommandAction extends Action {
 }
 
 export class SelectToPreviousLineAction extends Action {
-	public static readonly ID = 'workbench.action.terminal.selectToPreviousLine';
+	public static readonly ID = TERMINAL_COMMAND_ID.SELECT_TO_PREVIOUS_LINE;
 	public static readonly LABEL = nls.localize('workbench.action.terminal.selectToPreviousLine', "Select To Previous Line");
 
 	constructor(
@@ -1153,7 +1137,7 @@ export class SelectToPreviousLineAction extends Action {
 }
 
 export class SelectToNextLineAction extends Action {
-	public static readonly ID = 'workbench.action.terminal.selectToNextLine';
+	public static readonly ID = TERMINAL_COMMAND_ID.SELECT_TO_NEXT_LINE;
 	public static readonly LABEL = nls.localize('workbench.action.terminal.selectToNextLine', "Select To Next Line");
 
 	constructor(
@@ -1171,4 +1155,25 @@ export class SelectToNextLineAction extends Action {
 		}
 		return TPromise.as(void 0);
 	}
-}
\ No newline at end of file
+}
+
+
+export class ToggleEscapeSequenceLoggingAction extends Action {
+	public static readonly ID = TERMINAL_COMMAND_ID.TOGGLE_ESCAPE_SEQUENCE_LOGGING;
+	public static readonly LABEL = nls.localize('workbench.action.terminal.toggleEscapeSequenceLogging', "Toggle Escape Sequence Logging");
+
+	constructor(
+		id: string, label: string,
+		@ITerminalService private terminalService: ITerminalService
+	) {
+		super(id, label);
+	}
+
+	public run(): TPromise<any> {
+		const instance = this.terminalService.getActiveInstance();
+		if (instance) {
+			instance.toggleEscapeSequenceLogging();
+		}
+		return TPromise.as(void 0);
+	}
+}
diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminalConfigHelper.ts b/src/vs/workbench/parts/terminal/electron-browser/terminalConfigHelper.ts
index efbdc7e94fe..4d4f6645ad0 100644
--- a/src/vs/workbench/parts/terminal/electron-browser/terminalConfigHelper.ts
+++ b/src/vs/workbench/parts/terminal/electron-browser/terminalConfigHelper.ts
@@ -50,12 +50,12 @@ export class TerminalConfigHelper implements ITerminalConfigHelper {
 
 	public configFontIsMonospace(): boolean {
 		this._createCharMeasureElementIfNecessary();
-		let fontSize = 15;
-		let fontFamily = this.config.fontFamily || this._configurationService.getValue<IEditorOptions>('editor').fontFamily;
-		let i_rect = this._getBoundingRectFor('i', fontFamily, fontSize);
-		let w_rect = this._getBoundingRectFor('w', fontFamily, fontSize);
+		const fontSize = 15;
+		const fontFamily = this.config.fontFamily || this._configurationService.getValue<IEditorOptions>('editor').fontFamily;
+		const i_rect = this._getBoundingRectFor('i', fontFamily, fontSize);
+		const w_rect = this._getBoundingRectFor('w', fontFamily, fontSize);
 
-		let invalidBounds = !i_rect.width || !w_rect.width;
+		const invalidBounds = !i_rect.width || !w_rect.width;
 		if (invalidBounds) {
 			// There is no reason to believe the font is not Monospace.
 			return true;
@@ -88,7 +88,7 @@ export class TerminalConfigHelper implements ITerminalConfigHelper {
 	private _measureFont(fontFamily: string, fontSize: number, letterSpacing: number, lineHeight: number): ITerminalFont {
 		this._createCharMeasureElementIfNecessary();
 
-		let rect = this._getBoundingRectFor('X', fontFamily, fontSize);
+		const rect = this._getBoundingRectFor('X', fontFamily, fontSize);
 
 		// Bounding client rect was invalid, use last font measurement if available.
 		if (this._lastFontMeasurement && !rect.width && !rect.height) {
@@ -122,7 +122,7 @@ export class TerminalConfigHelper implements ITerminalConfigHelper {
 			}
 		}
 
-		let fontSize = this._toInteger(this.config.fontSize, MINIMUM_FONT_SIZE, MAXIMUM_FONT_SIZE, EDITOR_FONT_DEFAULTS.fontSize);
+		const fontSize = this._toInteger(this.config.fontSize, MINIMUM_FONT_SIZE, MAXIMUM_FONT_SIZE, EDITOR_FONT_DEFAULTS.fontSize);
 		const letterSpacing = this.config.letterSpacing ? Math.max(Math.floor(this.config.letterSpacing), MINIMUM_LETTER_SPACING) : DEFAULT_LETTER_SPACING;
 		const lineHeight = this.config.lineHeight ? Math.max(this.config.lineHeight, 1) : DEFAULT_LINE_HEIGHT;
 
@@ -137,14 +137,14 @@ export class TerminalConfigHelper implements ITerminalConfigHelper {
 
 		// Get the character dimensions from xterm if it's available
 		if (xterm) {
-			if (xterm.charMeasure && xterm.charMeasure.width && xterm.charMeasure.height) {
+			if (xterm._core.charMeasure && xterm._core.charMeasure.width && xterm._core.charMeasure.height) {
 				return {
 					fontFamily,
 					fontSize,
 					letterSpacing,
 					lineHeight,
-					charHeight: xterm.charMeasure.height,
-					charWidth: xterm.charMeasure.width
+					charHeight: xterm._core.charMeasure.height,
+					charWidth: xterm._core.charMeasure.width
 				};
 			}
 		}
@@ -157,9 +157,9 @@ export class TerminalConfigHelper implements ITerminalConfigHelper {
 		this._storageService.store(IS_WORKSPACE_SHELL_ALLOWED_STORAGE_KEY, isAllowed, StorageScope.WORKSPACE);
 	}
 
-	public mergeDefaultShellPathAndArgs(shell: IShellLaunchConfig): void {
+	public mergeDefaultShellPathAndArgs(shell: IShellLaunchConfig, platformOverride: platform.Platform = platform.platform): void {
 		// Check whether there is a workspace setting
-		const platformKey = platform.isWindows ? 'windows' : platform.isMacintosh ? 'osx' : 'linux';
+		const platformKey = platformOverride === platform.Platform.Windows ? 'windows' : platformOverride === platform.Platform.Mac ? 'osx' : 'linux';
 		const shellConfigValue = this._workspaceConfigurationService.inspect<string>(`terminal.integrated.shell.${platformKey}`);
 		const shellArgsConfigValue = this._workspaceConfigurationService.inspect<string[]>(`terminal.integrated.shellArgs.${platformKey}`);
 
@@ -169,6 +169,11 @@ export class TerminalConfigHelper implements ITerminalConfigHelper {
 			isWorkspaceShellAllowed = this._storageService.getBoolean(IS_WORKSPACE_SHELL_ALLOWED_STORAGE_KEY, StorageScope.WORKSPACE, undefined);
 		}
 
+		// Always allow [] args as it would lead to an odd error message and should not be dangerous
+		if (shellConfigValue.workspace === undefined && shellArgsConfigValue.workspace && shellArgsConfigValue.workspace.length === 0) {
+			isWorkspaceShellAllowed = true;
+		}
+
 		// Check if the value is neither blacklisted (false) or whitelisted (true) and ask for
 		// permission
 		if (isWorkspaceShellAllowed === undefined) {
diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts b/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts
index a0ffa0e0c21..0caa75aa89a 100644
--- a/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts
+++ b/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts
@@ -14,7 +14,7 @@ import { Terminal as XTermTerminal } from 'vscode-xterm';
 import { IContextKeyService, IContextKey } from 'vs/platform/contextkey/common/contextkey';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { IPanelService } from 'vs/workbench/services/panel/common/panelService';
-import { ITerminalInstance, KEYBINDING_CONTEXT_TERMINAL_TEXT_SELECTED, TERMINAL_PANEL_ID, IShellLaunchConfig, ITerminalProcessManager, ProcessState, NEVER_MEASURE_RENDER_TIME_STORAGE_KEY } from 'vs/workbench/parts/terminal/common/terminal';
+import { ITerminalInstance, KEYBINDING_CONTEXT_TERMINAL_TEXT_SELECTED, TERMINAL_PANEL_ID, IShellLaunchConfig, ITerminalProcessManager, ProcessState, NEVER_MEASURE_RENDER_TIME_STORAGE_KEY, ITerminalDimensions } from 'vs/workbench/parts/terminal/common/terminal';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
 import { TabFocus } from 'vs/editor/common/config/commonEditorConfig';
@@ -63,10 +63,9 @@ export class TerminalInstance implements ITerminalInstance {
 	private _terminalHasTextContextKey: IContextKey<boolean>;
 	private _cols: number;
 	private _rows: number;
+	private _dimensionsOverride: ITerminalDimensions;
 	private _windowsShellHelper: WindowsShellHelper;
-	private _onLineDataListeners: ((lineData: string) => void)[];
-	private _onDataListeners: ((data: string) => void)[];
-	private _xtermReadyPromise: TPromise<void>;
+	private _xtermReadyPromise: Promise<void>;
 
 	private _disposables: lifecycle.IDisposable[];
 	private _messageTitleDisposable: lifecycle.IDisposable;
@@ -77,6 +76,8 @@ export class TerminalInstance implements ITerminalInstance {
 
 	public disableLayout: boolean;
 	public get id(): number { return this._id; }
+	public get cols(): number { return this._cols; }
+	public get rows(): number { return this._rows; }
 	// TODO: Ideally processId would be merged into processReady
 	public get processId(): number | undefined { return this._processManager ? this._processManager.shellProcessId : undefined; }
 	// TODO: How does this work with detached processes?
@@ -85,10 +86,11 @@ export class TerminalInstance implements ITerminalInstance {
 	public get title(): string { return this._title; }
 	public get hadFocusOnExit(): boolean { return this._hadFocusOnExit; }
 	public get isTitleSetByProcess(): boolean { return !!this._messageTitleDisposable; }
-	public get shellLaunchConfig(): IShellLaunchConfig { return Object.freeze(this._shellLaunchConfig); }
+	public get shellLaunchConfig(): IShellLaunchConfig { return this._shellLaunchConfig; }
 	public get commandTracker(): TerminalCommandTracker { return this._commandTracker; }
 
-
+	private readonly _onExit: Emitter<number> = new Emitter<number>();
+	public get onExit(): Event<number> { return this._onExit.event; }
 	private readonly _onDisposed: Emitter<ITerminalInstance> = new Emitter<ITerminalInstance>();
 	public get onDisposed(): Event<ITerminalInstance> { return this._onDisposed.event; }
 	private readonly _onFocused: Emitter<ITerminalInstance> = new Emitter<ITerminalInstance>();
@@ -97,15 +99,24 @@ export class TerminalInstance implements ITerminalInstance {
 	public get onProcessIdReady(): Event<ITerminalInstance> { return this._onProcessIdReady.event; }
 	private readonly _onTitleChanged: Emitter<string> = new Emitter<string>();
 	public get onTitleChanged(): Event<string> { return this._onTitleChanged.event; }
+	private readonly _onData: Emitter<string> = new Emitter<string>();
+	public get onData(): Event<string> { return this._onData.event; }
+	private readonly _onLineData: Emitter<string> = new Emitter<string>();
+	public get onLineData(): Event<string> { return this._onLineData.event; }
+	private readonly _onRendererInput: Emitter<string> = new Emitter<string>();
+	public get onRendererInput(): Event<string> { return this._onRendererInput.event; }
 	private readonly _onRequestExtHostProcess: Emitter<ITerminalInstance> = new Emitter<ITerminalInstance>();
 	public get onRequestExtHostProcess(): Event<ITerminalInstance> { return this._onRequestExtHostProcess.event; }
+	private readonly _onDimensionsChanged: Emitter<void> = new Emitter<void>();
+	public get onDimensionsChanged(): Event<void> { return this._onDimensionsChanged.event; }
+	private readonly _onFocus: Emitter<ITerminalInstance> = new Emitter<ITerminalInstance>();
+	public get onFocus(): Event<ITerminalInstance> { return this._onFocus.event; }
 
 	public constructor(
-		private _terminalFocusContextKey: IContextKey<boolean>,
-		private _configHelper: TerminalConfigHelper,
+		private readonly _terminalFocusContextKey: IContextKey<boolean>,
+		private readonly _configHelper: TerminalConfigHelper,
 		private _container: HTMLElement,
 		private _shellLaunchConfig: IShellLaunchConfig,
-		doCreateProcess: boolean,
 		@IContextKeyService private readonly _contextKeyService: IContextKeyService,
 		@IKeybindingService private readonly _keybindingService: IKeybindingService,
 		@INotificationService private readonly _notificationService: INotificationService,
@@ -115,12 +126,10 @@ export class TerminalInstance implements ITerminalInstance {
 		@IThemeService private readonly _themeService: IThemeService,
 		@IConfigurationService private readonly _configurationService: IConfigurationService,
 		@ILogService private _logService: ILogService,
-		@IStorageService private readonly _storageService: IStorageService,
+		@IStorageService private readonly _storageService: IStorageService
 	) {
 		this._disposables = [];
 		this._skipTerminalCommands = [];
-		this._onLineDataListeners = [];
-		this._onDataListeners = [];
 		this._isExiting = false;
 		this._hadFocusOnExit = false;
 		this._isVisible = false;
@@ -132,8 +141,10 @@ export class TerminalInstance implements ITerminalInstance {
 		this._logService.trace(`terminalInstance#ctor (id: ${this.id})`, this._shellLaunchConfig);
 
 		this._initDimensions();
-		if (doCreateProcess) {
+		if (!this.shellLaunchConfig.isRendererOnly) {
 			this._createProcess();
+		} else {
+			this.setTitle(this._shellLaunchConfig.name, false);
 		}
 
 		this._xtermReadyPromise = this._createXterm();
@@ -144,14 +155,14 @@ export class TerminalInstance implements ITerminalInstance {
 			}
 		});
 
-		this._configurationService.onDidChangeConfiguration(e => {
+		this.addDisposable(this._configurationService.onDidChangeConfiguration(e => {
 			if (e.affectsConfiguration('terminal.integrated')) {
 				this.updateConfig();
 			}
 			if (e.affectsConfiguration('editor.accessibilitySupport')) {
 				this.updateAccessibilitySupport();
 			}
-		});
+		}));
 	}
 
 	public addDisposable(disposable: lifecycle.IDisposable): void {
@@ -194,7 +205,13 @@ export class TerminalInstance implements ITerminalInstance {
 		// order to be precise. font.charWidth/charHeight alone as insufficient
 		// when window.devicePixelRatio changes.
 		const scaledWidthAvailable = dimension.width * window.devicePixelRatio;
-		const scaledCharWidth = Math.floor(font.charWidth * window.devicePixelRatio) + font.letterSpacing;
+
+		let scaledCharWidth: number;
+		if (this._configHelper.config.rendererType === 'dom') {
+			scaledCharWidth = font.charWidth * window.devicePixelRatio;
+		} else {
+			scaledCharWidth = Math.floor(font.charWidth * window.devicePixelRatio) + font.letterSpacing;
+		}
 		this._cols = Math.max(Math.floor(scaledWidthAvailable / scaledCharWidth), 1);
 
 		const scaledHeightAvailable = dimension.height * window.devicePixelRatio;
@@ -221,7 +238,7 @@ export class TerminalInstance implements ITerminalInstance {
 			// it gets removed and then added back to the DOM (resetting scrollTop to 0).
 			// Upstream issue: https://github.com/sourcelair/xterm.js/issues/291
 			if (this._xterm) {
-				this._xterm.emit('scroll', this._xterm.buffer.ydisp);
+				this._xterm.emit('scroll', this._xterm._core.buffer.ydisp);
 			}
 		}
 
@@ -244,7 +261,7 @@ export class TerminalInstance implements ITerminalInstance {
 	/**
 	 * Create xterm.js instance and attach data listeners.
 	 */
-	protected async _createXterm(): TPromise<void> {
+	protected async _createXterm(): Promise<void> {
 		if (!Terminal) {
 			Terminal = (await import('vscode-xterm')).Terminal;
 			// Enable xterm.js addons
@@ -262,6 +279,7 @@ export class TerminalInstance implements ITerminalInstance {
 		this._xterm = new Terminal({
 			scrollback: config.scrollback,
 			theme: this._getXtermTheme(),
+			drawBoldTextInBrightColors: config.drawBoldTextInBrightColors,
 			fontFamily: font.fontFamily,
 			fontWeight: config.fontWeight,
 			fontWeightBold: config.fontWeightBold,
@@ -271,9 +289,12 @@ export class TerminalInstance implements ITerminalInstance {
 			bellStyle: config.enableBell ? 'sound' : 'none',
 			screenReaderMode: accessibilitySupport === 'on',
 			macOptionIsMeta: config.macOptionIsMeta,
+			macOptionClickForcesSelection: config.macOptionClickForcesSelection,
 			rightClickSelectsWord: config.rightClickBehavior === 'selectWord',
 			// TODO: Guess whether to use canvas or dom better
-			rendererType: config.rendererType === 'auto' ? 'canvas' : config.rendererType
+			rendererType: config.rendererType === 'auto' ? 'canvas' : config.rendererType,
+			// TODO: Remove this once the setting is removed upstream
+			experimentalCharAtlas: 'dynamic'
 		});
 		if (this._shellLaunchConfig.initialText) {
 			this._xterm.writeln(this._shellLaunchConfig.initialText);
@@ -284,8 +305,18 @@ export class TerminalInstance implements ITerminalInstance {
 			this._processManager.onProcessData(data => this._onProcessData(data));
 			this._xterm.on('data', data => this._processManager.write(data));
 			// TODO: How does the cwd work on detached processes?
-			this._linkHandler = this._instantiationService.createInstance(TerminalLinkHandler, this._xterm, platform.platform, this._processManager.initialCwd);
+			this._linkHandler = this._instantiationService.createInstance(TerminalLinkHandler, this._xterm, platform.platform);
+			this.processReady.then(() => {
+				this._linkHandler.initialCwd = this._processManager.initialCwd;
+			});
 		}
+		this._xterm.on('focus', () => this._onFocus.fire(this));
+
+		// Register listener to trigger the onInput ext API if the terminal is a renderer only
+		if (this._shellLaunchConfig.isRendererOnly) {
+			this._xterm.on('data', (data) => this._sendRendererInput(data));
+		}
+
 		this._commandTracker = new TerminalCommandTracker(this._xterm);
 		this._disposables.push(this._themeService.onThemeChange(theme => this._updateTheme(theme)));
 	}
@@ -439,8 +470,8 @@ export class TerminalInstance implements ITerminalInstance {
 	}
 
 	private _measureRenderTime(): void {
-		let frameTimes: number[] = [];
-		const textRenderLayer = (<any>this._xterm).renderer._renderLayers[0];
+		const frameTimes: number[] = [];
+		const textRenderLayer = this._xterm._core.renderer._renderLayers[0];
 		const originalOnGridChanged = textRenderLayer.onGridChanged;
 
 		const evaluateCanvasRenderer = () => {
@@ -454,7 +485,7 @@ export class TerminalInstance implements ITerminalInstance {
 						label: nls.localize('yes', "Yes"),
 						run: () => {
 							this._configurationService.updateValue('terminal.integrated.rendererType', 'dom', ConfigurationTarget.USER).then(() => {
-								this._notificationService.info(nls.localize('terminal.rendererInAllNewTerminals', "All newly created terminals will use the non-GPU renderer."));
+								this._notificationService.info(nls.localize('terminal.rendererInAllNewTerminals', "The terminal is now using the fallback renderer."));
 							});
 						}
 					} as IPromptChoice,
@@ -535,30 +566,33 @@ export class TerminalInstance implements ITerminalInstance {
 		this._terminalFocusContextKey.set(terminalFocused);
 	}
 
-	public dispose(): void {
+	public dispose(isShuttingDown?: boolean): void {
 		this._logService.trace(`terminalInstance#dispose (id: ${this.id})`);
 
-		if (this._windowsShellHelper) {
-			this._windowsShellHelper.dispose();
-		}
-		if (this._linkHandler) {
-			this._linkHandler.dispose();
-		}
+		this._windowsShellHelper = lifecycle.dispose(this._windowsShellHelper);
+		this._linkHandler = lifecycle.dispose(this._linkHandler);
+		this._commandTracker = lifecycle.dispose(this._commandTracker);
+		this._widgetManager = lifecycle.dispose(this._widgetManager);
+
 		if (this._xterm && this._xterm.element) {
 			this._hadFocusOnExit = dom.hasClass(this._xterm.element, 'focus');
 		}
 		if (this._wrapperElement) {
+			if ((<any>this._wrapperElement).xterm) {
+				(<any>this._wrapperElement).xterm = null;
+			}
 			this._container.removeChild(this._wrapperElement);
 			this._wrapperElement = null;
+			this._xtermElement = null;
 		}
 		if (this._xterm) {
-			const buffer = (<any>this._xterm.buffer);
+			const buffer = (<any>this._xterm._core.buffer);
 			this._sendLineData(buffer, buffer.ybase + buffer.y);
 			this._xterm.dispose();
 			this._xterm = null;
 		}
 		if (this._processManager) {
-			this._processManager.dispose();
+			this._processManager.dispose(isShuttingDown);
 		}
 		if (!this._isDisposed) {
 			this._isDisposed = true;
@@ -577,22 +611,48 @@ export class TerminalInstance implements ITerminalInstance {
 		}
 	}
 
+	public focusWhenReady(force?: boolean): Promise<void> {
+		return this._xtermReadyPromise.then(() => this.focus(force));
+	}
+
 	public paste(): void {
 		this.focus();
 		document.execCommand('paste');
 	}
 
-	public sendText(text: string, addNewLine: boolean): void {
-		this._processManager.ptyProcessReady.then(() => {
-			// Normalize line endings to 'enter' press.
-			text = text.replace(TerminalInstance.EOL_REGEX, '\r');
-			if (addNewLine && text.substr(text.length - 1) !== '\r') {
-				text += '\r';
+	public write(text: string): void {
+		this._xtermReadyPromise.then(() => {
+			if (!this._xterm) {
+				return;
+			}
+			this._xterm.write(text);
+			if (this._shellLaunchConfig.isRendererOnly) {
+				// Fire onData API in the extension host
+				this._onData.fire(text);
 			}
-			this._processManager.write(text);
 		});
 	}
 
+	public sendText(text: string, addNewLine: boolean): void {
+		// Normalize line endings to 'enter' press.
+		text = text.replace(TerminalInstance.EOL_REGEX, '\r');
+		if (addNewLine && text.substr(text.length - 1) !== '\r') {
+			text += '\r';
+		}
+
+		if (this._shellLaunchConfig.isRendererOnly) {
+			// If the terminal is a renderer only, fire the onInput ext API
+			this._sendRendererInput(text);
+		} else {
+			// If the terminal has a process, send it to the process
+			if (this._processManager) {
+				this._processManager.ptyProcessReady.then(() => {
+					this._processManager.write(text);
+				});
+			}
+		}
+	}
+
 	public setVisible(visible: boolean): void {
 		this._isVisible = visible;
 		if (this._wrapperElement) {
@@ -603,7 +663,7 @@ export class TerminalInstance implements ITerminalInstance {
 			// necessary if the number of rows in the terminal has decreased while it was in the
 			// background since scrollTop changes take no effect but the terminal's position does
 			// change since the number of visible rows decreases.
-			this._xterm.emit('scroll', this._xterm.buffer.ydisp);
+			this._xterm.emit('scroll', this._xterm._core.buffer.ydisp);
 			if (this._container && this._container.parentElement) {
 				// Force a layout when the instance becomes invisible. This is particularly important
 				// for ensuring that terminals that are created in the background by an extension will
@@ -613,6 +673,10 @@ export class TerminalInstance implements ITerminalInstance {
 				const width = parseInt(computedStyle.getPropertyValue('width').replace('px', ''), 10);
 				const height = parseInt(computedStyle.getPropertyValue('height').replace('px', ''), 10);
 				this.layout(new dom.Dimension(width, height));
+				// HACK: Trigger another async layout to ensure xterm's CharMeasure is ready to use,
+				// this hack can be removed when https://github.com/xtermjs/xterm.js/issues/702 is
+				// supported.
+				setTimeout(() => this.layout(new dom.Dimension(width, height)), 0);
 			}
 		}
 	}
@@ -656,7 +720,7 @@ export class TerminalInstance implements ITerminalInstance {
 		this._processManager = this._instantiationService.createInstance(TerminalProcessManager, this._id, this._configHelper);
 		this._processManager.onProcessReady(() => this._onProcessIdReady.fire(this));
 		this._processManager.onProcessExit(exitCode => this._onProcessExit(exitCode));
-		this._processManager.createProcess(this._shellLaunchConfig, this._cols, this._rows);
+		this._processManager.onProcessData(data => this._onData.fire(data));
 
 		if (this._shellLaunchConfig.name) {
 			this.setTitle(this._shellLaunchConfig.name, false);
@@ -675,6 +739,12 @@ export class TerminalInstance implements ITerminalInstance {
 				});
 			});
 		}
+
+		// Create the process asynchronously to allow the terminal's container
+		// to be created so dimensions are accurate
+		setTimeout(() => {
+			this._processManager.createProcess(this._shellLaunchConfig, this._cols, this._rows);
+		}, 0);
 	}
 
 	private _onProcessData(data: string): void {
@@ -684,13 +754,6 @@ export class TerminalInstance implements ITerminalInstance {
 		if (this._xterm) {
 			this._xterm.write(data);
 		}
-		this._onDataListeners.forEach(listener => {
-			try {
-				listener(data);
-			} catch (err) {
-				console.error(`onData listener threw`, err);
-			}
-		});
 	}
 
 	private _onProcessExit(exitCode: number): void {
@@ -756,6 +819,8 @@ export class TerminalInstance implements ITerminalInstance {
 				}
 			}
 		}
+
+		this._onExit.fire(exitCode);
 	}
 
 	private _attachPressAnyKeyToCloseListener() {
@@ -796,35 +861,17 @@ export class TerminalInstance implements ITerminalInstance {
 		this._shellLaunchConfig = shell;
 	}
 
-	public onData(listener: (data: string) => void): lifecycle.IDisposable {
-		this._onDataListeners.push(listener);
-		return {
-			dispose: () => {
-				const i = this._onDataListeners.indexOf(listener);
-				if (i >= 0) {
-					this._onDataListeners.splice(i, 1);
-				}
-			}
-		};
-	}
+	private _sendRendererInput(input: string): void {
+		if (this._processManager) {
+			throw new Error('onRendererInput attempted to be used on a regular terminal');
+		}
 
-	public onLineData(listener: (lineData: string) => void): lifecycle.IDisposable {
-		this._onLineDataListeners.push(listener);
-		return {
-			dispose: () => {
-				const i = this._onLineDataListeners.indexOf(listener);
-				if (i >= 0) {
-					this._onLineDataListeners.splice(i, 1);
-				}
-			}
-		};
+		// For terminal renderers onData fires on keystrokes and when sendText is called.
+		this._onRendererInput.fire(input);
 	}
 
 	private _onLineFeed(): void {
-		if (this._onLineDataListeners.length === 0) {
-			return;
-		}
-		const buffer = (<any>this._xterm.buffer);
+		const buffer = (<any>this._xterm._core.buffer);
 		const newLine = buffer.lines.get(buffer.ybase + buffer.y);
 		if (!newLine.isWrapped) {
 			this._sendLineData(buffer, buffer.ybase + buffer.y - 1);
@@ -836,27 +883,20 @@ export class TerminalInstance implements ITerminalInstance {
 		while (lineIndex >= 0 && buffer.lines.get(lineIndex--).isWrapped) {
 			lineData = buffer.translateBufferLineToString(lineIndex, false) + lineData;
 		}
-		this._onLineDataListeners.forEach(listener => {
-			try {
-				listener(lineData);
-			} catch (err) {
-				console.error(`onLineData listener threw`, err);
-			}
-		});
-	}
-
-	public onExit(listener: (exitCode: number) => void): lifecycle.IDisposable {
-		return this._processManager.onProcessExit(listener);
+		this._onLineData.fire(lineData);
 	}
 
 	public updateConfig(): void {
-		this._setCursorBlink(this._configHelper.config.cursorBlinking);
-		this._setCursorStyle(this._configHelper.config.cursorStyle);
-		this._setCommandsToSkipShell(this._configHelper.config.commandsToSkipShell);
-		this._setScrollback(this._configHelper.config.scrollback);
-		this._setEnableBell(this._configHelper.config.enableBell);
-		this._setMacOptionIsMeta(this._configHelper.config.macOptionIsMeta);
-		this._setRightClickSelectsWord(this._configHelper.config.rightClickBehavior === 'selectWord');
+		const config = this._configHelper.config;
+		this._setCursorBlink(config.cursorBlinking);
+		this._setCursorStyle(config.cursorStyle);
+		this._setCommandsToSkipShell(config.commandsToSkipShell);
+		this._setEnableBell(config.enableBell);
+		this._safeSetOption('scrollback', config.scrollback);
+		this._safeSetOption('macOptionIsMeta', config.macOptionIsMeta);
+		this._safeSetOption('macOptionClickForcesSelection', config.macOptionClickForcesSelection);
+		this._safeSetOption('rightClickSelectsWord', config.rightClickBehavior === 'selectWord');
+		this._safeSetOption('rendererType', config.rendererType === 'auto' ? 'canvas' : config.rendererType);
 	}
 
 	public updateAccessibilitySupport(): void {
@@ -883,24 +923,6 @@ export class TerminalInstance implements ITerminalInstance {
 		this._skipTerminalCommands = commands;
 	}
 
-	private _setScrollback(lineCount: number): void {
-		if (this._xterm && this._xterm.getOption('scrollback') !== lineCount) {
-			this._xterm.setOption('scrollback', lineCount);
-		}
-	}
-
-	private _setMacOptionIsMeta(value: boolean): void {
-		if (this._xterm && this._xterm.getOption('macOptionIsMeta') !== value) {
-			this._xterm.setOption('macOptionIsMeta', value);
-		}
-	}
-
-	private _setRightClickSelectsWord(value: boolean): void {
-		if (this._xterm && this._xterm.getOption('rightClickSelectsWord') !== value) {
-			this._xterm.setOption('rightClickSelectsWord', value);
-		}
-	}
-
 	private _setEnableBell(isEnabled: boolean): void {
 		if (this._xterm) {
 			if (this._xterm.getOption('bellStyle') === 'sound') {
@@ -915,6 +937,16 @@ export class TerminalInstance implements ITerminalInstance {
 		}
 	}
 
+	private _safeSetOption(key: string, value: any): void {
+		if (!this._xterm) {
+			return;
+		}
+
+		if (this._xterm.getOption(key) !== value) {
+			this._xterm.setOption(key, value);
+		}
+	}
+
 	public layout(dimension: dom.Dimension): void {
 		if (this.disableLayout) {
 			return;
@@ -925,47 +957,58 @@ export class TerminalInstance implements ITerminalInstance {
 			return;
 		}
 
+		if (this._xterm) {
+			this._xterm.element.style.width = terminalWidth + 'px';
+		}
+
+		this._resize();
+	}
+
+	private _resize(): void {
+		let cols = this._cols;
+		let rows = this._rows;
+		if (this._dimensionsOverride && this._dimensionsOverride.cols && this._dimensionsOverride.rows) {
+			cols = Math.min(Math.max(this._dimensionsOverride.cols, 2), this._cols);
+			rows = Math.min(Math.max(this._dimensionsOverride.rows, 2), this._rows);
+		}
+
 		if (this._xterm) {
 			const font = this._configHelper.getFont(this._xterm);
 
 			// Only apply these settings when the terminal is visible so that
 			// the characters are measured correctly.
 			if (this._isVisible) {
-				if (this._xterm.getOption('letterSpacing') !== font.letterSpacing) {
-					this._xterm.setOption('letterSpacing', font.letterSpacing);
-				}
-				if (this._xterm.getOption('lineHeight') !== font.lineHeight) {
-					this._xterm.setOption('lineHeight', font.lineHeight);
-				}
-				if (this._xterm.getOption('fontSize') !== font.fontSize) {
-					this._xterm.setOption('fontSize', font.fontSize);
-				}
-				if (this._xterm.getOption('fontFamily') !== font.fontFamily) {
-					this._xterm.setOption('fontFamily', font.fontFamily);
-				}
-				if (this._xterm.getOption('fontWeight') !== this._configHelper.config.fontWeight) {
-					this._xterm.setOption('fontWeight', this._configHelper.config.fontWeight);
-				}
-				if (this._xterm.getOption('fontWeightBold') !== this._configHelper.config.fontWeightBold) {
-					this._xterm.setOption('fontWeightBold', this._configHelper.config.fontWeightBold);
-				}
+				const config = this._configHelper.config;
+				this._safeSetOption('letterSpacing', font.letterSpacing);
+				this._safeSetOption('lineHeight', font.lineHeight);
+				this._safeSetOption('fontSize', font.fontSize);
+				this._safeSetOption('fontFamily', font.fontFamily);
+				this._safeSetOption('fontWeight', config.fontWeight);
+				this._safeSetOption('fontWeightBold', config.fontWeightBold);
+				this._safeSetOption('drawBoldTextInBrightColors', config.drawBoldTextInBrightColors);
 			}
 
-			this._xterm.resize(this._cols, this._rows);
-			this._xterm.element.style.width = terminalWidth + 'px';
+			if (cols !== this._xterm.cols || rows !== this._xterm.rows) {
+				this._onDimensionsChanged.fire();
+			}
+
+			this._xterm.resize(cols, rows);
 			if (this._isVisible) {
-				// Force the renderer to unpause by simulating an IntersectionObserver event. This
-				// is to fix an issue where dragging the window to the top of the screen to maximize
-				// on Winodws/Linux would fire an event saying that the terminal was not visible.
-				// This should only force a refresh if one is needed.
+				// HACK: Force the renderer to unpause by simulating an IntersectionObserver event.
+				// This is to fix an issue where dragging the window to the top of the screen to
+				// maximize on Windows/Linux would fire an event saying that the terminal was not
+				// visible.
 				if (this._xterm.getOption('rendererType') === 'canvas') {
-					(<any>this._xterm).renderer.onIntersectionChange({ intersectionRatio: 1 });
+					this._xterm._core.renderer.onIntersectionChange({ intersectionRatio: 1 });
+					// HACK: Force a refresh of the screen to ensure links are refresh corrected.
+					// This can probably be removed when the above hack is fixed in Chromium.
+					this._xterm.refresh(0, this._xterm.rows - 1);
 				}
 			}
 		}
 
 		if (this._processManager) {
-			this._processManager.ptyProcessReady.then(() => this._processManager.setDimensions(this._cols, this._rows));
+			this._processManager.ptyProcessReady.then(() => this._processManager.setDimensions(cols, rows));
 		}
 	}
 
@@ -994,6 +1037,11 @@ export class TerminalInstance implements ITerminalInstance {
 		}
 	}
 
+	public setDimensions(dimensions: ITerminalDimensions): void {
+		this._dimensionsOverride = dimensions;
+		this._resize();
+	}
+
 	private _getXtermTheme(theme?: ITheme): any {
 		if (!theme) {
 			theme = this._themeService.getTheme();
@@ -1033,6 +1081,11 @@ export class TerminalInstance implements ITerminalInstance {
 	private _updateTheme(theme?: ITheme): void {
 		this._xterm.setOption('theme', this._getXtermTheme(theme));
 	}
+
+	public toggleEscapeSequenceLogging(): void {
+		this._xterm._core.debug = !this._xterm._core.debug;
+		this._xterm.setOption('debug', this._xterm._core.debug);
+	}
 }
 
 registerThemingParticipant((theme: ITheme, collector: ICssStyleCollector) => {
@@ -1049,6 +1102,7 @@ registerThemingParticipant((theme: ITheme, collector: ICssStyleCollector) => {
 	const scrollbarSliderBackgroundColor = theme.getColor(scrollbarSliderBackground);
 	if (scrollbarSliderBackgroundColor) {
 		collector.addRule(`
+			.monaco-workbench .panel.integrated-terminal .find-focused .xterm .xterm-viewport,
 			.monaco-workbench .panel.integrated-terminal .xterm.focus .xterm-viewport,
 			.monaco-workbench .panel.integrated-terminal .xterm:focus .xterm-viewport,
 			.monaco-workbench .panel.integrated-terminal .xterm:hover .xterm-viewport { background-color: ${scrollbarSliderBackgroundColor} !important; }`
diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminalLinkHandler.ts b/src/vs/workbench/parts/terminal/electron-browser/terminalLinkHandler.ts
index d19528a9e31..9186939137f 100644
--- a/src/vs/workbench/parts/terminal/electron-browser/terminalLinkHandler.ts
+++ b/src/vs/workbench/parts/terminal/electron-browser/terminalLinkHandler.ts
@@ -7,7 +7,7 @@ import * as nls from 'vs/nls';
 import * as path from 'path';
 import * as platform from 'vs/base/common/platform';
 import * as pfs from 'vs/base/node/pfs';
-import Uri from 'vs/base/common/uri';
+import { URI as Uri } from 'vs/base/common/uri';
 import { dispose, IDisposable } from 'vs/base/common/lifecycle';
 import { IOpenerService } from 'vs/platform/opener/common/opener';
 import { TerminalWidgetManager } from 'vs/workbench/parts/terminal/browser/terminalWidgetManager';
@@ -61,13 +61,13 @@ export class TerminalLinkHandler {
 	private _hoverDisposables: IDisposable[] = [];
 	private _mouseMoveDisposable: IDisposable;
 	private _widgetManager: TerminalWidgetManager;
+	private _initialCwd: string;
 
 	private _localLinkPattern: RegExp;
 
 	constructor(
 		private _xterm: any,
 		private _platform: platform.Platform,
-		private _initialCwd: string,
 		@IOpenerService private readonly _openerService: IOpenerService,
 		@IEditorService private readonly _editorService: IEditorService,
 		@IConfigurationService private readonly _configurationService: IConfigurationService,
@@ -84,6 +84,10 @@ export class TerminalLinkHandler {
 		this._widgetManager = widgetManager;
 	}
 
+	public set initialCwd(initialCwd: string) {
+		this._initialCwd = initialCwd;
+	}
+
 	public registerCustomLinkHandler(regex: RegExp, handler: (uri: string) => void, matchIndex?: number, validationCallback?: XtermLinkMatcherValidationCallback): number {
 		return this._xterm.registerLinkMatcher(regex, this._wrapLinkHandler(handler), {
 			matchIndex,
@@ -121,6 +125,7 @@ export class TerminalLinkHandler {
 	}
 
 	public dispose(): void {
+		this._xterm = null;
 		this._hoverDisposables = dispose(this._hoverDisposables);
 		this._mouseMoveDisposable = dispose(this._mouseMoveDisposable);
 	}
@@ -146,10 +151,6 @@ export class TerminalLinkHandler {
 
 	private _handleLocalLink(link: string): TPromise<any> {
 		return this._resolvePath(link).then(resolvedLink => {
-			if (!resolvedLink) {
-				return void 0;
-			}
-
 			const normalizedPath = path.normalize(path.resolve(resolvedLink));
 			const normalizedUrl = this.extractLinkUrl(normalizedPath);
 			const resource = Uri.file(normalizedUrl);
@@ -172,7 +173,7 @@ export class TerminalLinkHandler {
 	}
 
 	private _handleHypertextLink(url: string): void {
-		let uri = Uri.parse(url);
+		const uri = Uri.parse(url);
 		this._openerService.open(uri);
 	}
 
diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.ts b/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.ts
index 09e090d2b5c..11e11fb473d 100644
--- a/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.ts
+++ b/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.ts
@@ -21,14 +21,15 @@ import { KillTerminalAction, SwitchTerminalAction, SwitchTerminalActionItem, Cop
 import { Panel } from 'vs/workbench/browser/panel';
 import { StandardMouseEvent } from 'vs/base/browser/mouseEvent';
 import { TPromise } from 'vs/base/common/winjs.base';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { PANEL_BACKGROUND, PANEL_BORDER } from 'vs/workbench/common/theme';
 import { TERMINAL_BACKGROUND_COLOR, TERMINAL_BORDER_COLOR } from 'vs/workbench/parts/terminal/common/terminalColorRegistry';
 import { DataTransfers } from 'vs/base/browser/dnd';
-import { ILifecycleService, LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
 import { INotificationService, IPromptChoice, Severity } from 'vs/platform/notification/common/notification';
 import { TerminalConfigHelper } from 'vs/workbench/parts/terminal/electron-browser/terminalConfigHelper';
 
+const FIND_FOCUS_CLASS = 'find-focused';
+
 export class TerminalPanel extends Panel {
 
 	private _actions: IAction[];
@@ -45,7 +46,6 @@ export class TerminalPanel extends Panel {
 		@IContextMenuService private readonly _contextMenuService: IContextMenuService,
 		@IInstantiationService private readonly _instantiationService: IInstantiationService,
 		@ITerminalService private readonly _terminalService: ITerminalService,
-		@ILifecycleService private readonly _lifecycleService: ILifecycleService,
 		@IThemeService protected themeService: IThemeService,
 		@ITelemetryService telemetryService: ITelemetryService,
 		@INotificationService private readonly _notificationService: INotificationService
@@ -63,6 +63,8 @@ export class TerminalPanel extends Panel {
 		dom.addClass(this._terminalContainer, 'terminal-outer-container');
 
 		this._findWidget = this._instantiationService.createInstance(TerminalFindWidget);
+		this._findWidget.focusTracker.onDidFocus(() => this._terminalContainer.classList.add(FIND_FOCUS_CLASS));
+		this._findWidget.focusTracker.onDidBlur(() => this._terminalContainer.classList.remove(FIND_FOCUS_CLASS));
 
 		this._parentDomElement.appendChild(this._fontStyleElement);
 		this._parentDomElement.appendChild(this._terminalContainer);
@@ -79,7 +81,7 @@ export class TerminalPanel extends Panel {
 			}
 
 			if (e.affectsConfiguration('terminal.integrated.fontFamily') || e.affectsConfiguration('editor.fontFamily')) {
-				let configHelper = this._terminalService.configHelper;
+				const configHelper = this._terminalService.configHelper;
 				if (configHelper instanceof TerminalConfigHelper) {
 					if (!configHelper.configFontIsMonospace()) {
 						const choices: IPromptChoice[] = [{
@@ -113,27 +115,14 @@ export class TerminalPanel extends Panel {
 				this._updateTheme();
 			} else {
 				return super.setVisible(visible).then(() => {
-					// Ensure the "Running" lifecycle face has been reached before creating the
-					// first terminal.
-					this._lifecycleService.when(LifecyclePhase.Running).then(() => {
-						// Allow time for the panel to display if it is being shown
-						// for the first time. If there is not wait here the initial
-						// dimensions of the pty could be wrong.
-						setTimeout(() => {
-							// Check if instances were already restored as part of workbench restore
-							if (this._terminalService.terminalInstances.length > 0) {
-								this._updateFont();
-								this._updateTheme();
-								return;
-							}
-
-							const instance = this._terminalService.createTerminal();
-							if (instance) {
-								this._updateFont();
-								this._updateTheme();
-							}
-						}, 0);
-					});
+					// Check if instances were already restored as part of workbench restore
+					if (this._terminalService.terminalInstances.length === 0) {
+						this._terminalService.createTerminal();
+					}
+					if (this._terminalService.terminalInstances.length > 0) {
+						this._updateFont();
+						this._updateTheme();
+					}
 					return TPromise.as(void 0);
 				});
 			}
@@ -145,7 +134,7 @@ export class TerminalPanel extends Panel {
 		if (!this._actions) {
 			this._actions = [
 				this._instantiationService.createInstance(SwitchTerminalAction, SwitchTerminalAction.ID, SwitchTerminalAction.LABEL),
-				this._instantiationService.createInstance(CreateNewTerminalAction, CreateNewTerminalAction.ID, CreateNewTerminalAction.PANEL_LABEL),
+				this._instantiationService.createInstance(CreateNewTerminalAction, CreateNewTerminalAction.ID, CreateNewTerminalAction.SHORT_LABEL),
 				this._instantiationService.createInstance(SplitTerminalAction, SplitTerminalAction.ID, SplitTerminalAction.LABEL),
 				this._instantiationService.createInstance(KillTerminalAction, KillTerminalAction.ID, KillTerminalAction.PANEL_LABEL)
 			];
@@ -158,16 +147,16 @@ export class TerminalPanel extends Panel {
 
 	private _getContextMenuActions(): IAction[] {
 		if (!this._contextMenuActions) {
-			this._copyContextMenuAction = this._instantiationService.createInstance(CopyTerminalSelectionAction, CopyTerminalSelectionAction.ID, nls.localize('copy', "Copy"));
+			this._copyContextMenuAction = this._instantiationService.createInstance(CopyTerminalSelectionAction, CopyTerminalSelectionAction.ID, CopyTerminalSelectionAction.SHORT_LABEL);
 			this._contextMenuActions = [
-				this._instantiationService.createInstance(CreateNewTerminalAction, CreateNewTerminalAction.ID, CreateNewTerminalAction.PANEL_LABEL),
-				this._instantiationService.createInstance(SplitTerminalAction, SplitTerminalAction.ID, nls.localize('split', "Split")),
+				this._instantiationService.createInstance(CreateNewTerminalAction, CreateNewTerminalAction.ID, CreateNewTerminalAction.SHORT_LABEL),
+				this._instantiationService.createInstance(SplitTerminalAction, SplitTerminalAction.ID, SplitTerminalAction.SHORT_LABEL),
 				new Separator(),
 				this._copyContextMenuAction,
-				this._instantiationService.createInstance(TerminalPasteAction, TerminalPasteAction.ID, nls.localize('paste', "Paste")),
-				this._instantiationService.createInstance(SelectAllTerminalAction, SelectAllTerminalAction.ID, nls.localize('selectAll', "Select All")),
+				this._instantiationService.createInstance(TerminalPasteAction, TerminalPasteAction.ID, TerminalPasteAction.SHORT_LABEL),
+				this._instantiationService.createInstance(SelectAllTerminalAction, SelectAllTerminalAction.ID, SelectAllTerminalAction.LABEL),
 				new Separator(),
-				this._instantiationService.createInstance(ClearTerminalAction, ClearTerminalAction.ID, nls.localize('clear', "Clear"))
+				this._instantiationService.createInstance(ClearTerminalAction, ClearTerminalAction.ID, ClearTerminalAction.LABEL)
 			];
 			this._contextMenuActions.forEach(a => {
 				this._register(a);
@@ -189,7 +178,7 @@ export class TerminalPanel extends Panel {
 	public focus(): void {
 		const activeInstance = this._terminalService.getActiveInstance();
 		if (activeInstance) {
-			activeInstance.focus(true);
+			activeInstance.focusWhenReady(true);
 		}
 	}
 
@@ -206,14 +195,6 @@ export class TerminalPanel extends Panel {
 		this._findWidget.hide();
 	}
 
-	public showNextFindTermFindWidget(): void {
-		this._findWidget.showNextFindTerm();
-	}
-
-	public showPreviousFindTermFindWidget(): void {
-		this._findWidget.showPreviousFindTerm();
-	}
-
 	private _attachEventListeners(): void {
 		this._register(dom.addDisposableListener(this._parentDomElement, 'mousedown', (event: MouseEvent) => {
 			if (this._terminalService.terminalInstances.length === 0) {
@@ -226,7 +207,7 @@ export class TerminalPanel extends Panel {
 				this._terminalService.getActiveInstance().focus();
 			} else if (event.which === 3) {
 				if (this._terminalService.configHelper.config.rightClickBehavior === 'copyPaste') {
-					let terminal = this._terminalService.getActiveInstance();
+					const terminal = this._terminalService.getActiveInstance();
 					if (terminal.hasSelection()) {
 						terminal.copySelection();
 						terminal.clearSelection();
@@ -253,7 +234,7 @@ export class TerminalPanel extends Panel {
 				}
 
 				if (event.which === 1) {
-					let terminal = this._terminalService.getActiveInstance();
+					const terminal = this._terminalService.getActiveInstance();
 					if (terminal.hasSelection()) {
 						terminal.copySelection();
 					}
@@ -263,7 +244,7 @@ export class TerminalPanel extends Panel {
 		this._register(dom.addDisposableListener(this._parentDomElement, 'contextmenu', (event: MouseEvent) => {
 			if (!this._cancelContextMenu) {
 				const standardEvent = new StandardMouseEvent(event);
-				let anchor: { x: number, y: number } = { x: standardEvent.posx, y: standardEvent.posy };
+				const anchor: { x: number, y: number } = { x: standardEvent.posx, y: standardEvent.posy };
 				this._contextMenuService.showContextMenu({
 					getAnchor: () => anchor,
 					getActions: () => TPromise.as(this._getContextMenuActions()),
@@ -292,7 +273,7 @@ export class TerminalPanel extends Panel {
 
 				// Check if files were dragged from the tree explorer
 				let path: string;
-				let resources = e.dataTransfer.getData(DataTransfers.RESOURCES);
+				const resources = e.dataTransfer.getData(DataTransfers.RESOURCES);
 				if (resources) {
 					path = URI.parse(JSON.parse(resources)[0]).path;
 				} else if (e.dataTransfer.files.length > 0) {
@@ -338,15 +319,15 @@ registerThemingParticipant((theme: ITheme, collector: ICssStyleCollector) => {
 	}
 
 	// Borrow the editor's hover background for now
-	let hoverBackground = theme.getColor(editorHoverBackground);
+	const hoverBackground = theme.getColor(editorHoverBackground);
 	if (hoverBackground) {
 		collector.addRule(`.monaco-workbench .panel.integrated-terminal .terminal-message-widget { background-color: ${hoverBackground}; }`);
 	}
-	let hoverBorder = theme.getColor(editorHoverBorder);
+	const hoverBorder = theme.getColor(editorHoverBorder);
 	if (hoverBorder) {
 		collector.addRule(`.monaco-workbench .panel.integrated-terminal .terminal-message-widget { border: 1px solid ${hoverBorder}; }`);
 	}
-	let hoverForeground = theme.getColor(editorForeground);
+	const hoverForeground = theme.getColor(editorForeground);
 	if (hoverForeground) {
 		collector.addRule(`.monaco-workbench .panel.integrated-terminal .terminal-message-widget { color: ${hoverForeground}; }`);
 	}
diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminalProcessManager.ts b/src/vs/workbench/parts/terminal/electron-browser/terminalProcessManager.ts
index 1670b248a0b..818b359ea99 100644
--- a/src/vs/workbench/parts/terminal/electron-browser/terminalProcessManager.ts
+++ b/src/vs/workbench/parts/terminal/electron-browser/terminalProcessManager.ts
@@ -3,21 +3,21 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as cp from 'child_process';
 import * as platform from 'vs/base/common/platform';
 import * as terminalEnvironment from 'vs/workbench/parts/terminal/node/terminalEnvironment';
-import Uri from 'vs/base/common/uri';
 import { IDisposable } from 'vs/base/common/lifecycle';
 import { ProcessState, ITerminalProcessManager, IShellLaunchConfig, ITerminalConfigHelper } from 'vs/workbench/parts/terminal/common/terminal';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { ILogService } from 'vs/platform/log/common/log';
 import { Emitter, Event } from 'vs/base/common/event';
-import { IConfigurationResolverService } from 'vs/workbench/services/configurationResolver/common/configurationResolver';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
 import { IHistoryService } from 'vs/workbench/services/history/common/history';
-import { ITerminalChildProcess, IMessageFromTerminalProcess } from 'vs/workbench/parts/terminal/node/terminal';
+import { ITerminalChildProcess } from 'vs/workbench/parts/terminal/node/terminal';
 import { TerminalProcessExtHostProxy } from 'vs/workbench/parts/terminal/node/terminalProcessExtHostProxy';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { TerminalProcess } from 'vs/workbench/parts/terminal/node/terminalProcess';
+import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
+import { IConfigurationResolverService } from 'vs/workbench/services/configurationResolver/common/configurationResolver';
+import { Schemas } from 'vs/base/common/network';
 
 /** The amount of time to consider terminal errors to be related to the launch */
 const LAUNCHING_DURATION = 500;
@@ -50,13 +50,13 @@ export class TerminalProcessManager implements ITerminalProcessManager {
 	public get onProcessExit(): Event<number> { return this._onProcessExit.event; }
 
 	constructor(
-		private _terminalId: number,
-		private _configHelper: ITerminalConfigHelper,
-		@IWorkspaceContextService private readonly _workspaceContextService: IWorkspaceContextService,
+		private readonly _terminalId: number,
+		private readonly _configHelper: ITerminalConfigHelper,
 		@IHistoryService private readonly _historyService: IHistoryService,
-		@IConfigurationResolverService private readonly _configurationResolverService: IConfigurationResolverService,
 		@IInstantiationService private readonly _instantiationService: IInstantiationService,
-		@ILogService private _logService: ILogService
+		@ILogService private readonly _logService: ILogService,
+		@IWorkspaceContextService private readonly _workspaceContextService: IWorkspaceContextService,
+		@IConfigurationResolverService private readonly _configurationResolverService: IConfigurationResolverService
 	) {
 		this.ptyProcessReady = new TPromise<void>(c => {
 			this.onProcessReady(() => {
@@ -66,15 +66,13 @@ export class TerminalProcessManager implements ITerminalProcessManager {
 		});
 	}
 
-	public dispose(): void {
+	public dispose(immediate?: boolean): void {
 		if (this._process) {
-			if (this._process.connected) {
-				// If the process was still connected this dispose came from
-				// within VS Code, not the process, so mark the process as
-				// killed by the user.
-				this.processState = ProcessState.KILLED_BY_USER;
-				this._process.send({ event: 'shutdown' });
-			}
+			// If the process was still connected this dispose came from
+			// within VS Code, not the process, so mark the process as
+			// killed by the user.
+			this.processState = ProcessState.KILLED_BY_USER;
+			this._process.shutdown(immediate);
 			this._process = null;
 		}
 		this._disposables.forEach(d => d.dispose());
@@ -94,12 +92,11 @@ export class TerminalProcessManager implements ITerminalProcessManager {
 		if (extensionHostOwned) {
 			this._process = this._instantiationService.createInstance(TerminalProcessExtHostProxy, this._terminalId, shellLaunchConfig, cols, rows);
 		} else {
-			const locale = this._configHelper.config.setLocaleVariables ? platform.locale : undefined;
 			if (!shellLaunchConfig.executable) {
 				this._configHelper.mergeDefaultShellPathAndArgs(shellLaunchConfig);
 			}
 
-			const lastActiveWorkspaceRootUri = this._historyService.getLastActiveWorkspaceRoot('file');
+			const lastActiveWorkspaceRootUri = this._historyService.getLastActiveWorkspaceRoot(Schemas.file);
 			this.initialCwd = terminalEnvironment.getCwd(shellLaunchConfig, lastActiveWorkspaceRootUri, this._configHelper);
 
 			// Resolve env vars from config and shell
@@ -109,23 +106,41 @@ export class TerminalProcessManager implements ITerminalProcessManager {
 			const envFromShell = terminalEnvironment.resolveConfigurationVariables(this._configurationResolverService, { ...shellLaunchConfig.env }, lastActiveWorkspaceRoot);
 			shellLaunchConfig.env = envFromShell;
 
-			// Merge process env with the env from config
-			const parentEnv = { ...process.env };
-			terminalEnvironment.mergeEnvironments(parentEnv, envFromConfig);
+			// Merge process env with the env from config and from shellLaunchConfig
+			const env = { ...process.env };
+			terminalEnvironment.mergeEnvironments(env, envFromConfig);
+			terminalEnvironment.mergeEnvironments(env, shellLaunchConfig.env);
 
-			// Continue env initialization, merging in the env from the launch
-			// config and adding keys that are needed to create the process
-			const env = terminalEnvironment.createTerminalEnv(parentEnv, shellLaunchConfig, this.initialCwd, locale, cols, rows);
-			const cwd = Uri.parse(require.toUrl('../node')).fsPath;
-			const options = { env, cwd };
-			this._logService.debug(`Terminal process launching`, options);
+			// Sanitize the environment, removing any undesirable VS Code and Electron environment
+			// variables
+			terminalEnvironment.sanitizeEnvironment(env);
 
-			this._process = cp.fork(Uri.parse(require.toUrl('bootstrap')).fsPath, ['--type=terminal'], options);
+			// Adding other env keys necessary to create the process
+			const locale = this._configHelper.config.setLocaleVariables ? platform.locale : undefined;
+			terminalEnvironment.addTerminalEnvironmentKeys(env, locale);
+
+			this._logService.debug(`Terminal process launching`, shellLaunchConfig, this.initialCwd, cols, rows, env);
+			this._process = new TerminalProcess(shellLaunchConfig, this.initialCwd, cols, rows, env);
 		}
 		this.processState = ProcessState.LAUNCHING;
 
-		this._process.on('message', message => this._onMessage(message));
-		this._process.on('exit', exitCode => this._onExit(exitCode));
+		this._process.onProcessData(data => {
+			this._onProcessData.fire(data);
+		});
+
+		this._process.onProcessIdReady(pid => {
+			this.shellProcessId = pid;
+			this._onProcessReady.fire();
+
+			// Send any queued data that's waiting
+			if (this._preLaunchInputQueue.length > 0) {
+				this._process.input(this._preLaunchInputQueue.join(''));
+				this._preLaunchInputQueue.length = 0;
+			}
+		});
+
+		this._process.onProcessTitleChanged(title => this._onProcessTitle.fire(title));
+		this._process.onProcessExit(exitCode => this._onExit(exitCode));
 
 		setTimeout(() => {
 			if (this.processState === ProcessState.LAUNCHING) {
@@ -135,57 +150,33 @@ export class TerminalProcessManager implements ITerminalProcessManager {
 	}
 
 	public setDimensions(cols: number, rows: number): void {
-		if (this._process && this._process.connected) {
-			// The child process could aready be terminated
-			try {
-				this._process.send({ event: 'resize', cols, rows });
-			} catch (error) {
-				// We tried to write to a closed pipe / channel.
-				if (error.code !== 'EPIPE' && error.code !== 'ERR_IPC_CHANNEL_CLOSED') {
-					throw (error);
-				}
+		if (!this._process) {
+			return;
+		}
+
+		// The child process could already be terminated
+		try {
+			this._process.resize(cols, rows);
+		} catch (error) {
+			// We tried to write to a closed pipe / channel.
+			if (error.code !== 'EPIPE' && error.code !== 'ERR_IPC_CHANNEL_CLOSED') {
+				throw (error);
 			}
 		}
 	}
 
 	public write(data: string): void {
 		if (this.shellProcessId) {
-			// Send data if the pty is ready
-			this._process.send({
-				event: 'input',
-				data
-			});
+			if (this._process) {
+				// Send data if the pty is ready
+				this._process.input(data);
+			}
 		} else {
 			// If the pty is not ready, queue the data received to send later
 			this._preLaunchInputQueue.push(data);
 		}
 	}
 
-	private _onMessage(message: IMessageFromTerminalProcess): void {
-		this._logService.trace(`terminalProcessManager#_onMessage (shellProcessId: ${this.shellProcessId}`, message);
-		switch (message.type) {
-			case 'data':
-				this._onProcessData.fire(<string>message.content);
-				break;
-			case 'pid':
-				this.shellProcessId = <number>message.content;
-				this._onProcessReady.fire();
-
-				// Send any queued data that's waiting
-				if (this._preLaunchInputQueue.length > 0) {
-					this._process.send({
-						event: 'input',
-						data: this._preLaunchInputQueue.join('')
-					});
-					this._preLaunchInputQueue.length = 0;
-				}
-				break;
-			case 'title':
-				this._onProcessTitle.fire(<string>message.content);
-				break;
-		}
-	}
-
 	private _onExit(exitCode: number): void {
 		this._process = null;
 
diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminalService.ts b/src/vs/workbench/parts/terminal/electron-browser/terminalService.ts
index 370cb709b9b..fb61123763f 100644
--- a/src/vs/workbench/parts/terminal/electron-browser/terminalService.ts
+++ b/src/vs/workbench/parts/terminal/electron-browser/terminalService.ts
@@ -13,7 +13,6 @@ import { ILifecycleService } from 'vs/platform/lifecycle/common/lifecycle';
 import { IPanelService } from 'vs/workbench/services/panel/common/panelService';
 import { IPartService } from 'vs/workbench/services/part/common/partService';
 import { IConfigurationService, ConfigurationTarget } from 'vs/platform/configuration/common/configuration';
-import { IQuickOpenService, IPickOpenEntry, IPickOptions } from 'vs/platform/quickOpen/common/quickOpen';
 import { ITerminalInstance, ITerminalService, IShellLaunchConfig, ITerminalConfigHelper, NEVER_SUGGEST_SELECT_WINDOWS_SHELL_STORAGE_KEY, TERMINAL_PANEL_ID, ITerminalProcessExtHostProxy } from 'vs/workbench/parts/terminal/common/terminal';
 import { TerminalService as AbstractTerminalService } from 'vs/workbench/parts/terminal/common/terminalService';
 import { TerminalConfigHelper } from 'vs/workbench/parts/terminal/electron-browser/terminalConfigHelper';
@@ -29,6 +28,7 @@ import { ipcRenderer as ipc } from 'electron';
 import { IOpenFileRequest } from 'vs/platform/windows/common/windows';
 import { TerminalInstance } from 'vs/workbench/parts/terminal/electron-browser/terminalInstance';
 import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
+import { IQuickInputService, IQuickPickItem, IPickOptions } from 'vs/platform/quickinput/common/quickInput';
 
 export class TerminalService extends AbstractTerminalService implements ITerminalService {
 	private _configHelper: TerminalConfigHelper;
@@ -47,7 +47,7 @@ export class TerminalService extends AbstractTerminalService implements ITermina
 		@ILifecycleService lifecycleService: ILifecycleService,
 		@IConfigurationService private readonly _configurationService: IConfigurationService,
 		@IInstantiationService private readonly _instantiationService: IInstantiationService,
-		@IQuickOpenService private readonly _quickOpenService: IQuickOpenService,
+		@IQuickInputService private readonly _quickInputService: IQuickInputService,
 		@INotificationService private readonly _notificationService: INotificationService,
 		@IDialogService private readonly _dialogService: IDialogService,
 		@IExtensionService private readonly _extensionService: IExtensionService
@@ -91,8 +91,12 @@ export class TerminalService extends AbstractTerminalService implements ITermina
 		return instance;
 	}
 
+	public createTerminalRenderer(name: string): ITerminalInstance {
+		return this.createTerminal({ name, isRendererOnly: true });
+	}
+
 	public createInstance(terminalFocusContextKey: IContextKey<boolean>, configHelper: ITerminalConfigHelper, container: HTMLElement, shellLaunchConfig: IShellLaunchConfig, doCreateProcess: boolean): ITerminalInstance {
-		const instance = this._instantiationService.createInstance(TerminalInstance, terminalFocusContextKey, configHelper, container, shellLaunchConfig, true);
+		const instance = this._instantiationService.createInstance(TerminalInstance, terminalFocusContextKey, configHelper, container, shellLaunchConfig);
 		this._onInstanceCreated.fire(instance);
 		return instance;
 	}
@@ -109,7 +113,7 @@ export class TerminalService extends AbstractTerminalService implements ITermina
 
 	public focusFindWidget(): TPromise<void> {
 		return this.showPanel(false).then(() => {
-			let panel = this._panelService.getActivePanel() as TerminalPanel;
+			const panel = this._panelService.getActivePanel() as TerminalPanel;
 			panel.focusFindWidget();
 			this._findWidgetVisible.set(true);
 		});
@@ -124,20 +128,6 @@ export class TerminalService extends AbstractTerminalService implements ITermina
 		}
 	}
 
-	public showNextFindTermFindWidget(): void {
-		const panel = this._panelService.getActivePanel() as TerminalPanel;
-		if (panel && panel.getId() === TERMINAL_PANEL_ID) {
-			panel.showNextFindTermFindWidget();
-		}
-	}
-
-	public showPreviousFindTermFindWidget(): void {
-		const panel = this._panelService.getActivePanel() as TerminalPanel;
-		if (panel && panel.getId() === TERMINAL_PANEL_ID) {
-			panel.showPreviousFindTermFindWidget();
-		}
-	}
-
 	private _suggestShellChange(wasNewTerminalAction?: boolean): void {
 		// Only suggest on Windows since $SHELL works great for macOS/Linux
 		if (!platform.isWindows) {
@@ -194,10 +184,10 @@ export class TerminalService extends AbstractTerminalService implements ITermina
 
 	public selectDefaultWindowsShell(): TPromise<string> {
 		return this._detectWindowsShells().then(shells => {
-			const options: IPickOptions = {
+			const options: IPickOptions<IQuickPickItem> = {
 				placeHolder: nls.localize('terminal.integrated.chooseWindowsShell', "Select your preferred terminal shell, you can change this later in your settings")
 			};
-			return this._quickOpenService.pick(shells, options).then(value => {
+			return this._quickInputService.pick(shells, options).then(value => {
 				if (!value) {
 					return null;
 				}
@@ -207,7 +197,7 @@ export class TerminalService extends AbstractTerminalService implements ITermina
 		});
 	}
 
-	private _detectWindowsShells(): TPromise<IPickOpenEntry[]> {
+	private _detectWindowsShells(): TPromise<IQuickPickItem[]> {
 		// Determine the correct System32 path. We want to point to Sysnative
 		// when the 32-bit version of VS Code is running on a 64-bit machine.
 		// The reason for this is because PowerShell's important PSReadline
@@ -218,7 +208,7 @@ export class TerminalService extends AbstractTerminalService implements ITermina
 		const osVersion = (/(\d+)\.(\d+)\.(\d+)/g).exec(os.release());
 		let useWSLexe = false;
 
-		if (osVersion.length === 4) {
+		if (osVersion && osVersion.length === 4) {
 			const buildNumber = parseInt(osVersion[3]);
 			if (buildNumber >= 16299) {
 				useWSLexe = true;
@@ -241,7 +231,7 @@ export class TerminalService extends AbstractTerminalService implements ITermina
 		Object.keys(expectedLocations).forEach(key => promises.push(this._validateShellPaths(key, expectedLocations[key])));
 		return TPromise.join(promises).then(results => {
 			return results.filter(result => !!result).map(result => {
-				return <IPickOpenEntry>{
+				return <IQuickPickItem>{
 					label: result[0],
 					description: result[1]
 				};
diff --git a/src/vs/workbench/parts/terminal/node/terminal.ts b/src/vs/workbench/parts/terminal/node/terminal.ts
index 8cb9bc9dddd..7eaadc133aa 100644
--- a/src/vs/workbench/parts/terminal/node/terminal.ts
+++ b/src/vs/workbench/parts/terminal/node/terminal.ts
@@ -7,30 +7,27 @@ import * as os from 'os';
 import * as platform from 'vs/base/common/platform';
 import * as processes from 'vs/base/node/processes';
 import { readFile, fileExists } from 'vs/base/node/pfs';
-
-export interface IMessageFromTerminalProcess {
-	type: 'pid' | 'data' | 'title';
-	content: number | string;
-}
-
-export interface IMessageToTerminalProcess {
-	event: 'resize' | 'input' | 'shutdown';
-	data?: string;
-	cols?: number;
-	rows?: number;
-}
+import { Event } from 'vs/base/common/event';
 
 /**
  * An interface representing a raw terminal child process, this is a subset of the
  * child_process.ChildProcess node.js interface.
  */
 export interface ITerminalChildProcess {
-	readonly connected: boolean;
+	onProcessData: Event<string>;
+	onProcessExit: Event<number>;
+	onProcessIdReady: Event<number>;
+	onProcessTitleChanged: Event<string>;
 
-	send(message: IMessageToTerminalProcess): boolean;
-
-	on(event: 'exit', listener: (code: number) => void): this;
-	on(event: 'message', listener: (message: IMessageFromTerminalProcess) => void): this;
+	/**
+	 * Shutdown the terminal process.
+	 *
+	 * @param immediate When true the process will be killed immediately, otherwise the process will
+	 * be given some time to make sure no additional data comes through.
+	 */
+	shutdown(immediate: boolean): void;
+	input(data: string): void;
+	resize(cols: number, rows: number): void;
 }
 
 let _TERMINAL_DEFAULT_SHELL_UNIX_LIKE: string = null;
diff --git a/src/vs/workbench/parts/terminal/node/terminalCommandTracker.ts b/src/vs/workbench/parts/terminal/node/terminalCommandTracker.ts
index d11af07bd79..a6f1dfed010 100644
--- a/src/vs/workbench/parts/terminal/node/terminalCommandTracker.ts
+++ b/src/vs/workbench/parts/terminal/node/terminalCommandTracker.ts
@@ -5,6 +5,7 @@
 
 import { Terminal, IMarker } from 'vscode-xterm';
 import { ITerminalCommandTracker } from 'vs/workbench/parts/terminal/common/terminal';
+import { IDisposable } from 'vs/base/common/lifecycle';
 
 /**
  * The minimize size of the prompt in which to assume the line is a command.
@@ -16,12 +17,12 @@ enum Boundary {
 	Bottom
 }
 
-export enum ScrollPosition {
+export const enum ScrollPosition {
 	Top,
 	Middle
 }
 
-export class TerminalCommandTracker implements ITerminalCommandTracker {
+export class TerminalCommandTracker implements ITerminalCommandTracker, IDisposable {
 	private _currentMarker: IMarker | Boundary = Boundary.Bottom;
 	private _selectionStart: IMarker | Boundary | null = null;
 	private _isDisposable: boolean = false;
@@ -32,6 +33,10 @@ export class TerminalCommandTracker implements ITerminalCommandTracker {
 		this._xterm.on('key', key => this._onKey(key));
 	}
 
+	public dispose(): void {
+		this._xterm = null;
+	}
+
 	private _onKey(key: string): void {
 		if (key === '\x0d') {
 			this._onEnter();
@@ -44,7 +49,7 @@ export class TerminalCommandTracker implements ITerminalCommandTracker {
 	}
 
 	private _onEnter(): void {
-		if (this._xterm.buffer.x >= MINIMUM_PROMPT_LENGTH) {
+		if (this._xterm._core.buffer.x >= MINIMUM_PROMPT_LENGTH) {
 			this._xterm.addMarker(0);
 		}
 	}
@@ -171,7 +176,7 @@ export class TerminalCommandTracker implements ITerminalCommandTracker {
 	private _getLine(marker: IMarker | Boundary): number {
 		// Use the _second last_ row as the last row is likely the prompt
 		if (marker === Boundary.Bottom) {
-			return this._xterm.buffer.ybase + this._xterm.rows - 1;
+			return this._xterm._core.buffer.ybase + this._xterm.rows - 1;
 		}
 
 		if (marker === Boundary.Top) {
@@ -194,7 +199,7 @@ export class TerminalCommandTracker implements ITerminalCommandTracker {
 		if (this._currentMarker === Boundary.Bottom) {
 			this._currentMarker = this._xterm.addMarker(this._getOffset() - 1);
 		} else {
-			let offset = this._getOffset();
+			const offset = this._getOffset();
 			if (this._isDisposable) {
 				this._currentMarker.dispose();
 			}
@@ -217,7 +222,7 @@ export class TerminalCommandTracker implements ITerminalCommandTracker {
 		if (this._currentMarker === Boundary.Top) {
 			this._currentMarker = this._xterm.addMarker(this._getOffset() + 1);
 		} else {
-			let offset = this._getOffset();
+			const offset = this._getOffset();
 			if (this._isDisposable) {
 				this._currentMarker.dispose();
 			}
@@ -231,10 +236,10 @@ export class TerminalCommandTracker implements ITerminalCommandTracker {
 		if (this._currentMarker === Boundary.Bottom) {
 			return 0;
 		} else if (this._currentMarker === Boundary.Top) {
-			return 0 - (this._xterm.buffer.ybase + this._xterm.buffer.y);
+			return 0 - (this._xterm._core.buffer.ybase + this._xterm._core.buffer.y);
 		} else {
 			let offset = this._getLine(this._currentMarker);
-			offset -= this._xterm.buffer.ybase + this._xterm.buffer.y;
+			offset -= this._xterm._core.buffer.ybase + this._xterm._core.buffer.y;
 			return offset;
 		}
 	}
diff --git a/src/vs/workbench/parts/terminal/node/terminalEnvironment.ts b/src/vs/workbench/parts/terminal/node/terminalEnvironment.ts
index 2c60754603d..bf59acc1023 100644
--- a/src/vs/workbench/parts/terminal/node/terminalEnvironment.ts
+++ b/src/vs/workbench/parts/terminal/node/terminalEnvironment.ts
@@ -7,8 +7,7 @@ import * as os from 'os';
 import * as paths from 'vs/base/common/paths';
 import * as platform from 'vs/base/common/platform';
 import pkg from 'vs/platform/node/package';
-import Uri from 'vs/base/common/uri';
-import { IStringDictionary } from 'vs/base/common/collections';
+import { URI as Uri } from 'vs/base/common/uri';
 import { IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
 import { IShellLaunchConfig, ITerminalConfigHelper } from 'vs/workbench/parts/terminal/common/terminal';
 import { IConfigurationResolverService } from 'vs/workbench/services/configurationResolver/common/configurationResolver';
@@ -17,7 +16,7 @@ import { IConfigurationResolverService } from 'vs/workbench/services/configurati
  * This module contains utility functions related to the environment, cwd and paths.
  */
 
-export function mergeEnvironments(parent: IStringDictionary<string>, other: IStringDictionary<string>) {
+export function mergeEnvironments(parent: platform.IProcessEnvironment, other: platform.IProcessEnvironment): void {
 	if (!other) {
 		return;
 	}
@@ -25,9 +24,9 @@ export function mergeEnvironments(parent: IStringDictionary<string>, other: IStr
 	// On Windows apply the new values ignoring case, while still retaining
 	// the case of the original key.
 	if (platform.isWindows) {
-		for (let configKey in other) {
+		for (const configKey in other) {
 			let actualKey = configKey;
-			for (let envKey in parent) {
+			for (const envKey in parent) {
 				if (configKey.toLowerCase() === envKey.toLowerCase()) {
 					actualKey = envKey;
 					break;
@@ -44,7 +43,7 @@ export function mergeEnvironments(parent: IStringDictionary<string>, other: IStr
 	}
 }
 
-function _mergeEnvironmentValue(env: IStringDictionary<string>, key: string, value: string | null) {
+function _mergeEnvironmentValue(env: platform.IProcessEnvironment, key: string, value: string | null): void {
 	if (typeof value === 'string') {
 		env[key] = value;
 	} else {
@@ -52,34 +51,44 @@ function _mergeEnvironmentValue(env: IStringDictionary<string>, key: string, val
 	}
 }
 
-export function createTerminalEnv(parentEnv: IStringDictionary<string>, shell: IShellLaunchConfig, cwd: string, locale: string, cols?: number, rows?: number): IStringDictionary<string> {
-	const env = { ...parentEnv };
-	if (shell.env) {
-		mergeEnvironments(env, shell.env);
-	}
-
-	env['PTYPID'] = process.pid.toString();
-	env['PTYSHELL'] = shell.executable;
-	env['TERM_PROGRAM'] = 'vscode';
-	env['TERM_PROGRAM_VERSION'] = pkg.version;
-	if (shell.args) {
-		if (typeof shell.args === 'string') {
-			env[`PTYSHELLCMDLINE`] = shell.args;
-		} else {
-			shell.args.forEach((arg, i) => env[`PTYSHELLARG${i}`] = arg);
+export function sanitizeEnvironment(env: platform.IProcessEnvironment): void {
+	// Remove keys based on strings
+	const keysToRemove = [
+		'ELECTRON_ENABLE_STACK_DUMPING',
+		'ELECTRON_ENABLE_LOGGING',
+		'ELECTRON_NO_ASAR',
+		'ELECTRON_NO_ATTACH_CONSOLE',
+		'ELECTRON_RUN_AS_NODE',
+		'GOOGLE_API_KEY',
+		'VSCODE_CLI',
+		'VSCODE_DEV',
+		'VSCODE_IPC_HOOK',
+		'VSCODE_LOGS',
+		'VSCODE_NLS_CONFIG',
+		'VSCODE_PORTABLE',
+		'VSCODE_PID',
+	];
+	keysToRemove.forEach((key) => {
+		if (env[key]) {
+			delete env[key];
 		}
-	}
-	env['PTYCWD'] = cwd;
-	env['LANG'] = _getLangEnvVariable(locale);
-	if (cols && rows) {
-		env['PTYCOLS'] = cols.toString();
-		env['PTYROWS'] = rows.toString();
-	}
-	env['AMD_ENTRYPOINT'] = 'vs/workbench/parts/terminal/node/terminalProcess';
-	return env;
+	});
+
+	// Remove keys based on regexp
+	Object.keys(env).forEach(key => {
+		if (key.search(/^VSCODE_NODE_CACHED_DATA_DIR_\d+$/) === 0) {
+			delete env[key];
+		}
+	});
 }
 
-export function resolveConfigurationVariables(configurationResolverService: IConfigurationResolverService, env: IStringDictionary<string>, lastActiveWorkspaceRoot: IWorkspaceFolder): IStringDictionary<string> {
+export function addTerminalEnvironmentKeys(env: platform.IProcessEnvironment, locale: string | undefined): void {
+	env['TERM_PROGRAM'] = 'vscode';
+	env['TERM_PROGRAM_VERSION'] = pkg.version;
+	env['LANG'] = _getLangEnvVariable(locale);
+}
+
+export function resolveConfigurationVariables(configurationResolverService: IConfigurationResolverService, env: platform.IProcessEnvironment, lastActiveWorkspaceRoot: IWorkspaceFolder): platform.IProcessEnvironment {
 	Object.keys(env).forEach((key) => {
 		if (typeof env[key] === 'string') {
 			env[key] = configurationResolverService.resolve(lastActiveWorkspaceRoot, env[key]);
diff --git a/src/vs/workbench/parts/terminal/node/terminalProcess.ts b/src/vs/workbench/parts/terminal/node/terminalProcess.ts
index e3a73831538..03beafef97b 100644
--- a/src/vs/workbench/parts/terminal/node/terminalProcess.ts
+++ b/src/vs/workbench/parts/terminal/node/terminalProcess.ts
@@ -5,161 +5,137 @@
 
 import * as os from 'os';
 import * as path from 'path';
+import * as platform from 'vs/base/common/platform';
 import * as pty from 'node-pty';
+import { Event, Emitter } from 'vs/base/common/event';
+import { ITerminalChildProcess } from 'vs/workbench/parts/terminal/node/terminal';
+import { IDisposable } from 'vs/base/common/lifecycle';
+import { IShellLaunchConfig } from 'vs/workbench/parts/terminal/common/terminal';
 
-// The pty process needs to be run in its own child process to get around maxing out CPU on Mac,
-// see https://github.com/electron/electron/issues/38
-var shellName: string;
-if (os.platform() === 'win32') {
-	shellName = path.basename(process.env.PTYSHELL);
-} else {
-	// Using 'xterm-256color' here helps ensure that the majority of Linux distributions will use a
-	// color prompt as defined in the default ~/.bashrc file.
-	shellName = 'xterm-256color';
-}
-var shell = process.env.PTYSHELL;
-var args = getArgs();
-var cwd = process.env.PTYCWD;
-var cols = process.env.PTYCOLS;
-var rows = process.env.PTYROWS;
-var currentTitle = '';
+export class TerminalProcess implements ITerminalChildProcess, IDisposable {
+	private _exitCode: number;
+	private _closeTimeout: number;
+	private _ptyProcess: pty.IPty;
+	private _currentTitle: string = '';
 
-setupPlanB(Number(process.env.PTYPID));
-cleanEnv();
+	private readonly _onProcessData: Emitter<string> = new Emitter<string>();
+	public get onProcessData(): Event<string> { return this._onProcessData.event; }
+	private readonly _onProcessExit: Emitter<number> = new Emitter<number>();
+	public get onProcessExit(): Event<number> { return this._onProcessExit.event; }
+	private readonly _onProcessIdReady: Emitter<number> = new Emitter<number>();
+	public get onProcessIdReady(): Event<number> { return this._onProcessIdReady.event; }
+	private readonly _onProcessTitleChanged: Emitter<string> = new Emitter<string>();
+	public get onProcessTitleChanged(): Event<string> { return this._onProcessTitleChanged.event; }
 
-interface IOptions {
-	name: string;
-	cwd: string;
-	cols?: number;
-	rows?: number;
-}
+	constructor(
+		shellLaunchConfig: IShellLaunchConfig,
+		cwd: string,
+		cols: number,
+		rows: number,
+		env: platform.IProcessEnvironment
+	) {
+		let shellName: string;
+		if (os.platform() === 'win32') {
+			shellName = path.basename(shellLaunchConfig.executable);
+		} else {
+			// Using 'xterm-256color' here helps ensure that the majority of Linux distributions will use a
+			// color prompt as defined in the default ~/.bashrc file.
+			shellName = 'xterm-256color';
+		}
 
-var options: IOptions = {
-	name: shellName,
-	cwd
-};
-if (cols && rows) {
-	options.cols = parseInt(cols, 10);
-	options.rows = parseInt(rows, 10);
-}
+		const options: pty.IPtyForkOptions = {
+			name: shellName,
+			cwd,
+			env,
+			cols,
+			rows
+		};
 
-var ptyProcess = pty.spawn(shell, args, options);
+		this._ptyProcess = pty.spawn(shellLaunchConfig.executable, shellLaunchConfig.args, options);
+		this._ptyProcess.on('data', (data) => {
+			this._onProcessData.fire(data);
+			if (this._closeTimeout) {
+				clearTimeout(this._closeTimeout);
+				this._queueProcessExit();
+			}
+		});
+		this._ptyProcess.on('exit', (code) => {
+			this._exitCode = code;
+			this._queueProcessExit();
+		});
 
-var closeTimeout: number;
-var exitCode: number;
-
-// Allow any trailing data events to be sent before the exit event is sent.
-// See https://github.com/Tyriar/node-pty/issues/72
-function queueProcessExit() {
-	if (closeTimeout) {
-		clearTimeout(closeTimeout);
+		// TODO: We should no longer need to delay this since pty.spawn is sync
+		setTimeout(() => {
+			this._sendProcessId();
+		}, 500);
+		this._setupTitlePolling();
 	}
-	closeTimeout = setTimeout(function () {
-		ptyProcess.kill();
-		process.exit(exitCode);
-	}, 250);
-}
 
-ptyProcess.on('data', function (data) {
-	process.send({
-		type: 'data',
-		content: data
-	});
-	if (closeTimeout) {
-		clearTimeout(closeTimeout);
-		queueProcessExit();
+	public dispose(): void {
+		this._onProcessData.dispose();
+		this._onProcessExit.dispose();
+		this._onProcessIdReady.dispose();
+		this._onProcessTitleChanged.dispose();
 	}
-});
 
-ptyProcess.on('exit', function (code) {
-	exitCode = code;
-	queueProcessExit();
-});
+	private _setupTitlePolling() {
+		// Send initial timeout async to give event listeners a chance to init
+		setTimeout(() => {
+			this._sendProcessTitle();
+		}, 0);
+		// Setup polling
+		setInterval(() => {
+			if (this._currentTitle !== this._ptyProcess.process) {
+				this._sendProcessTitle();
+			}
+		}, 200);
+	}
 
-process.on('message', function (message) {
-	if (message.event === 'input') {
-		ptyProcess.write(message.data);
-	} else if (message.event === 'resize') {
+	// Allow any trailing data events to be sent before the exit event is sent.
+	// See https://github.com/Tyriar/node-pty/issues/72
+	private _queueProcessExit() {
+		if (this._closeTimeout) {
+			clearTimeout(this._closeTimeout);
+		}
+		this._closeTimeout = setTimeout(() => this._kill(), 250);
+	}
+
+	private _kill(): void {
+		// Attempt to kill the pty, it may have already been killed at this
+		// point but we want to make sure
+		try {
+			this._ptyProcess.kill();
+		} catch (ex) {
+			// Swallow, the pty has already been killed
+		}
+		this._onProcessExit.fire(this._exitCode);
+		this.dispose();
+	}
+
+	private _sendProcessId() {
+		this._onProcessIdReady.fire(this._ptyProcess.pid);
+	}
+
+	private _sendProcessTitle(): void {
+		this._currentTitle = this._ptyProcess.process;
+		this._onProcessTitleChanged.fire(this._currentTitle);
+	}
+
+	public shutdown(immediate: boolean): void {
+		if (immediate) {
+			this._kill();
+		} else {
+			this._queueProcessExit();
+		}
+	}
+
+	public input(data: string): void {
+		this._ptyProcess.write(data);
+	}
+
+	public resize(cols: number, rows: number): void {
 		// Ensure that cols and rows are always >= 1, this prevents a native
 		// exception in winpty.
-		ptyProcess.resize(Math.max(message.cols, 1), Math.max(message.rows, 1));
-	} else if (message.event === 'shutdown') {
-		queueProcessExit();
-	}
-});
-
-sendProcessId();
-setupTitlePolling();
-
-function getArgs(): string | string[] {
-	if (process.env['PTYSHELLCMDLINE']) {
-		return process.env['PTYSHELLCMDLINE'];
-	}
-	var args = [];
-	var i = 0;
-	while (process.env['PTYSHELLARG' + i]) {
-		args.push(process.env['PTYSHELLARG' + i]);
-		i++;
-	}
-	return args;
-}
-
-function cleanEnv() {
-	var keys = [
-		'AMD_ENTRYPOINT',
-		'ELECTRON_NO_ASAR',
-		'ELECTRON_RUN_AS_NODE',
-		'GOOGLE_API_KEY',
-		'PTYCWD',
-		'PTYPID',
-		'PTYSHELL',
-		'PTYCOLS',
-		'PTYROWS',
-		'PTYSHELLCMDLINE',
-		'VSCODE_LOGS'
-	];
-	keys.forEach(function (key) {
-		if (process.env[key]) {
-			delete process.env[key];
-		}
-	});
-	var i = 0;
-	while (process.env['PTYSHELLARG' + i]) {
-		delete process.env['PTYSHELLARG' + i];
-		i++;
+		this._ptyProcess.resize(Math.max(cols, 1), Math.max(rows, 1));
 	}
 }
-
-function setupPlanB(parentPid: number) {
-	setInterval(function () {
-		try {
-			process.kill(parentPid, 0); // throws an exception if the main process doesn't exist anymore.
-		} catch (e) {
-			process.exit();
-		}
-	}, 5000);
-}
-
-function sendProcessId() {
-	process.send({
-		type: 'pid',
-		content: ptyProcess.pid
-	});
-}
-
-function setupTitlePolling() {
-	sendProcessTitle();
-	setInterval(function () {
-		if (currentTitle !== ptyProcess.process) {
-			sendProcessTitle();
-		}
-	}, 200);
-}
-
-function sendProcessTitle() {
-	process.send({
-		type: 'title',
-		content: ptyProcess.process
-	});
-	currentTitle = ptyProcess.process;
-}
diff --git a/src/vs/workbench/parts/terminal/node/terminalProcessExtHostProxy.ts b/src/vs/workbench/parts/terminal/node/terminalProcessExtHostProxy.ts
index 9c842fbbfa8..08e3144893c 100644
--- a/src/vs/workbench/parts/terminal/node/terminalProcessExtHostProxy.ts
+++ b/src/vs/workbench/parts/terminal/node/terminalProcessExtHostProxy.ts
@@ -3,28 +3,45 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ITerminalChildProcess, IMessageToTerminalProcess, IMessageFromTerminalProcess } from 'vs/workbench/parts/terminal/node/terminal';
-import { EventEmitter } from 'events';
+import { ITerminalChildProcess } from 'vs/workbench/parts/terminal/node/terminal';
+import { Event, Emitter } from 'vs/base/common/event';
 import { ITerminalService, ITerminalProcessExtHostProxy, IShellLaunchConfig } from 'vs/workbench/parts/terminal/common/terminal';
-import { IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-
-export class TerminalProcessExtHostProxy extends EventEmitter implements ITerminalChildProcess, ITerminalProcessExtHostProxy {
-	// For ext host processes connected checks happen on the ext host
-	public connected: boolean = true;
+import { IDisposable } from 'vs/base/common/lifecycle';
+import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
 
+export class TerminalProcessExtHostProxy implements ITerminalChildProcess, ITerminalProcessExtHostProxy {
 	private _disposables: IDisposable[] = [];
 
+	private readonly _onProcessData: Emitter<string> = new Emitter<string>();
+	public get onProcessData(): Event<string> { return this._onProcessData.event; }
+	private readonly _onProcessExit: Emitter<number> = new Emitter<number>();
+	public get onProcessExit(): Event<number> { return this._onProcessExit.event; }
+	private readonly _onProcessIdReady: Emitter<number> = new Emitter<number>();
+	public get onProcessIdReady(): Event<number> { return this._onProcessIdReady.event; }
+	private readonly _onProcessTitleChanged: Emitter<string> = new Emitter<string>();
+	public get onProcessTitleChanged(): Event<string> { return this._onProcessTitleChanged.event; }
+
+	private readonly _onInput: Emitter<string> = new Emitter<string>();
+	public get onInput(): Event<string> { return this._onInput.event; }
+	private readonly _onResize: Emitter<{ cols: number, rows: number }> = new Emitter<{ cols: number, rows: number }>();
+	public get onResize(): Event<{ cols: number, rows: number }> { return this._onResize.event; }
+	private readonly _onShutdown: Emitter<boolean> = new Emitter<boolean>();
+	public get onShutdown(): Event<boolean> { return this._onShutdown.event; }
+
 	constructor(
 		public terminalId: number,
 		shellLaunchConfig: IShellLaunchConfig,
 		cols: number,
 		rows: number,
-		@ITerminalService private _terminalService: ITerminalService
+		@ITerminalService private _terminalService: ITerminalService,
+		@IExtensionService private readonly _extensionService: IExtensionService
 	) {
-		super();
-
-		// TODO: Return TPromise<boolean> indicating success? Teardown if failure?
-		this._terminalService.requestExtHostProcess(this, shellLaunchConfig, cols, rows);
+		this._extensionService.whenInstalledExtensionsRegistered().then(() => {
+			// TODO: MainThreadTerminalService is not ready at this point, fix this
+			setTimeout(() => {
+				this._terminalService.requestExtHostProcess(this, shellLaunchConfig, cols, rows);
+			}, 0);
+		});
 	}
 
 	public dispose(): void {
@@ -33,46 +50,31 @@ export class TerminalProcessExtHostProxy extends EventEmitter implements ITermin
 	}
 
 	public emitData(data: string): void {
-		this.emit('message', { type: 'data', content: data } as IMessageFromTerminalProcess);
+		this._onProcessData.fire(data);
 	}
 
 	public emitTitle(title: string): void {
-		this.emit('message', { type: 'title', content: title } as IMessageFromTerminalProcess);
+		this._onProcessTitleChanged.fire(title);
 	}
 
 	public emitPid(pid: number): void {
-		this.emit('message', { type: 'pid', content: pid } as IMessageFromTerminalProcess);
+		this._onProcessIdReady.fire(pid);
 	}
 
 	public emitExit(exitCode: number): void {
-		this.emit('exit', exitCode);
+		this._onProcessExit.fire(exitCode);
 		this.dispose();
 	}
 
-	public send(message: IMessageToTerminalProcess): boolean {
-		switch (message.event) {
-			case 'input': this.emit('input', message.data); break;
-			case 'resize': this.emit('resize', message.cols, message.rows); break;
-			case 'shutdown': this.emit('shutdown'); break;
-		}
-		return true;
+	public shutdown(immediate: boolean): void {
+		this._onShutdown.fire(immediate);
 	}
 
-	public onInput(listener: (data: string) => void): void {
-		const outerListener = (data) => listener(data);
-		this.on('input', outerListener);
-		this._disposables.push(toDisposable(() => this.removeListener('input', outerListener)));
+	public input(data: string): void {
+		this._onInput.fire(data);
 	}
 
-	public onResize(listener: (cols: number, rows: number) => void): void {
-		const outerListener = (cols, rows) => listener(cols, rows);
-		this.on('resize', outerListener);
-		this._disposables.push(toDisposable(() => this.removeListener('resize', outerListener)));
-	}
-
-	public onShutdown(listener: () => void): void {
-		const outerListener = () => listener();
-		this.on('shutdown', outerListener);
-		this._disposables.push(toDisposable(() => this.removeListener('shutdown', outerListener)));
+	public resize(cols: number, rows: number): void {
+		this._onResize.fire({ cols, rows });
 	}
 }
\ No newline at end of file
diff --git a/src/vs/workbench/parts/terminal/test/electron-browser/terminalLinkHandler.test.ts b/src/vs/workbench/parts/terminal/test/electron-browser/terminalLinkHandler.test.ts
index 55e629b6feb..c26031468be 100644
--- a/src/vs/workbench/parts/terminal/test/electron-browser/terminalLinkHandler.test.ts
+++ b/src/vs/workbench/parts/terminal/test/electron-browser/terminalLinkHandler.test.ts
@@ -33,7 +33,7 @@ interface LinkFormatInfo {
 suite('Workbench - TerminalLinkHandler', () => {
 	suite('localLinkRegex', () => {
 		test('Windows', () => {
-			const terminalLinkHandler = new TestTerminalLinkHandler(new TestXterm(), Platform.Windows, null, null, null, null, null);
+			const terminalLinkHandler = new TestTerminalLinkHandler(new TestXterm(), Platform.Windows, null, null, null, null);
 			function testLink(link: string, linkUrl: string, lineNo?: string, columnNo?: string) {
 				assert.equal(terminalLinkHandler.extractLinkUrl(link), linkUrl);
 				assert.equal(terminalLinkHandler.extractLinkUrl(`:${link}:`), linkUrl);
@@ -103,7 +103,7 @@ suite('Workbench - TerminalLinkHandler', () => {
 		});
 
 		test('Linux', () => {
-			const terminalLinkHandler = new TestTerminalLinkHandler(new TestXterm(), Platform.Linux, null, null, null, null, null);
+			const terminalLinkHandler = new TestTerminalLinkHandler(new TestXterm(), Platform.Linux, null, null, null, null);
 			function testLink(link: string, linkUrl: string, lineNo?: string, columnNo?: string) {
 				assert.equal(terminalLinkHandler.extractLinkUrl(link), linkUrl);
 				assert.equal(terminalLinkHandler.extractLinkUrl(`:${link}:`), linkUrl);
@@ -167,7 +167,8 @@ suite('Workbench - TerminalLinkHandler', () => {
 
 	suite('preprocessPath', () => {
 		test('Windows', () => {
-			const linkHandler = new TestTerminalLinkHandler(new TestXterm(), Platform.Windows, 'C:\\base', null, null, null, null);
+			const linkHandler = new TestTerminalLinkHandler(new TestXterm(), Platform.Windows, null, null, null, null);
+			linkHandler.initialCwd = 'C:\\base';
 
 			let stub = sinon.stub(path, 'join', function (arg1: string, arg2: string) {
 				return arg1 + '\\' + arg2;
@@ -180,7 +181,8 @@ suite('Workbench - TerminalLinkHandler', () => {
 		});
 
 		test('Linux', () => {
-			const linkHandler = new TestTerminalLinkHandler(new TestXterm(), Platform.Linux, '/base', null, null, null, null);
+			const linkHandler = new TestTerminalLinkHandler(new TestXterm(), Platform.Linux, null, null, null, null);
+			linkHandler.initialCwd = '/base';
 
 			let stub = sinon.stub(path, 'join', function (arg1: string, arg2: string) {
 				return arg1 + '/' + arg2;
@@ -193,7 +195,7 @@ suite('Workbench - TerminalLinkHandler', () => {
 		});
 
 		test('No Workspace', () => {
-			const linkHandler = new TestTerminalLinkHandler(new TestXterm(), Platform.Linux, null, null, null, null, null);
+			const linkHandler = new TestTerminalLinkHandler(new TestXterm(), Platform.Linux, null, null, null, null);
 
 			assert.equal(linkHandler.preprocessPath('./src/file1'), null);
 			assert.equal(linkHandler.preprocessPath('src/file2'), null);
diff --git a/src/vs/workbench/parts/terminal/test/node/terminalCommandTracker.test.ts b/src/vs/workbench/parts/terminal/test/node/terminalCommandTracker.test.ts
index 003f76b383b..495ffc45da2 100644
--- a/src/vs/workbench/parts/terminal/test/node/terminalCommandTracker.test.ts
+++ b/src/vs/workbench/parts/terminal/test/node/terminalCommandTracker.test.ts
@@ -4,19 +4,23 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as assert from 'assert';
-import { Terminal } from 'vscode-xterm';
+import { Terminal, TerminalCore } from 'vscode-xterm';
 import { TerminalCommandTracker } from 'vs/workbench/parts/terminal/node/terminalCommandTracker';
 import { isWindows } from 'vs/base/common/platform';
 
-interface TestTerminal extends Terminal {
+interface TestTerminalCore extends TerminalCore {
 	writeBuffer: string[];
 	_innerWrite(): void;
 }
 
+interface TestTerminal extends Terminal {
+	_core: TestTerminalCore;
+}
+
 function syncWrite(term: TestTerminal, data: string): void {
 	// Terminal.write is asynchronous
-	term.writeBuffer.push(data);
-	term._innerWrite();
+	term._core.writeBuffer.push(data);
+	term._core._innerWrite();
 }
 
 const ROWS = 10;
@@ -62,24 +66,24 @@ suite('Workbench - TerminalCommandTracker', () => {
 			for (let i = 0; i < 20; i++) {
 				syncWrite(xterm, `\r\n`);
 			}
-			assert.equal(xterm.buffer.ybase, 20);
-			assert.equal(xterm.buffer.ydisp, 20);
+			assert.equal(xterm._core.buffer.ybase, 20);
+			assert.equal(xterm._core.buffer.ydisp, 20);
 
 			// Scroll to marker
 			commandTracker.scrollToPreviousCommand();
-			assert.equal(xterm.buffer.ydisp, 9);
+			assert.equal(xterm._core.buffer.ydisp, 9);
 
 			// Scroll to top boundary
 			commandTracker.scrollToPreviousCommand();
-			assert.equal(xterm.buffer.ydisp, 0);
+			assert.equal(xterm._core.buffer.ydisp, 0);
 
 			// Scroll to marker
 			commandTracker.scrollToNextCommand();
-			assert.equal(xterm.buffer.ydisp, 9);
+			assert.equal(xterm._core.buffer.ydisp, 9);
 
 			// Scroll to bottom boundary
 			commandTracker.scrollToNextCommand();
-			assert.equal(xterm.buffer.ydisp, 20);
+			assert.equal(xterm._core.buffer.ydisp, 20);
 		});
 		test('should select to the next and previous commands', () => {
 			(<any>window).matchMedia = () => {
@@ -98,8 +102,8 @@ suite('Workbench - TerminalCommandTracker', () => {
 			assert.equal(xterm.markers[1].line, 11);
 			syncWrite(xterm, '\n\r3');
 
-			assert.equal(xterm.buffer.ybase, 3);
-			assert.equal(xterm.buffer.ydisp, 3);
+			assert.equal(xterm._core.buffer.ybase, 3);
+			assert.equal(xterm._core.buffer.ydisp, 3);
 
 			assert.equal(xterm.getSelection(), '');
 			commandTracker.selectToPreviousCommand();
@@ -128,8 +132,8 @@ suite('Workbench - TerminalCommandTracker', () => {
 			assert.equal(xterm.markers[1].line, 11);
 			syncWrite(xterm, '\n\r3');
 
-			assert.equal(xterm.buffer.ybase, 3);
-			assert.equal(xterm.buffer.ydisp, 3);
+			assert.equal(xterm._core.buffer.ybase, 3);
+			assert.equal(xterm._core.buffer.ydisp, 3);
 
 			assert.equal(xterm.getSelection(), '');
 			commandTracker.selectToPreviousLine();
diff --git a/src/vs/workbench/parts/terminal/test/node/terminalEnvironment.test.ts b/src/vs/workbench/parts/terminal/test/node/terminalEnvironment.test.ts
index 5fae93b3d01..fbb6acbfb40 100644
--- a/src/vs/workbench/parts/terminal/test/node/terminalEnvironment.test.ts
+++ b/src/vs/workbench/parts/terminal/test/node/terminalEnvironment.test.ts
@@ -7,47 +7,49 @@ import * as assert from 'assert';
 import * as os from 'os';
 import * as platform from 'vs/base/common/platform';
 import * as terminalEnvironment from 'vs/workbench/parts/terminal/node/terminalEnvironment';
-import Uri from 'vs/base/common/uri';
+import { URI as Uri } from 'vs/base/common/uri';
 import { IStringDictionary } from 'vs/base/common/collections';
-import { IShellLaunchConfig, ITerminalConfigHelper } from 'vs/workbench/parts/terminal/common/terminal';
+import { ITerminalConfigHelper } from 'vs/workbench/parts/terminal/common/terminal';
 
 suite('Workbench - TerminalEnvironment', () => {
-	test('createTerminalEnv', function () {
-		const shell1 = {
-			executable: '/bin/foosh',
-			args: ['-bar', 'baz']
-		};
-		const parentEnv1: IStringDictionary<string> = {
-			ok: true
-		} as any;
-		const env1 = terminalEnvironment.createTerminalEnv(parentEnv1, shell1, '/foo', 'en-au');
-		assert.ok(env1['ok'], 'Parent environment is copied');
-		assert.deepStrictEqual(parentEnv1, { ok: true }, 'Parent environment is unchanged');
-		assert.equal(env1['PTYPID'], process.pid.toString(), 'PTYPID is equal to the current PID');
-		assert.equal(env1['PTYSHELL'], '/bin/foosh', 'PTYSHELL is equal to the provided shell');
-		assert.equal(env1['PTYSHELLARG0'], '-bar', 'PTYSHELLARG0 is equal to the first shell argument');
-		assert.equal(env1['PTYSHELLARG1'], 'baz', 'PTYSHELLARG1 is equal to the first shell argument');
-		assert.ok(!('PTYSHELLARG2' in env1), 'PTYSHELLARG2 is unset');
-		assert.equal(env1['PTYCWD'], '/foo', 'PTYCWD is equal to requested cwd');
-		assert.equal(env1['LANG'], 'en_AU.UTF-8', 'LANG is equal to the requested locale with UTF-8');
+	test('addTerminalEnvironmentKeys', () => {
+		const env = { FOO: 'bar' };
+		const locale = 'en-au';
+		terminalEnvironment.addTerminalEnvironmentKeys(env, locale);
+		assert.equal(env['TERM_PROGRAM'], 'vscode');
+		assert.equal(env['TERM_PROGRAM_VERSION'].search(/^\d+\.\d+\.\d+$/), 0);
+		assert.equal(env['LANG'], 'en_AU.UTF-8', 'LANG is equal to the requested locale with UTF-8');
 
-		const shell2: IShellLaunchConfig = {
-			executable: '/bin/foosh',
-			args: []
-		};
-		const parentEnv2: IStringDictionary<string> = {
-			LANG: 'en_US.UTF-8'
-		};
-		const env2 = terminalEnvironment.createTerminalEnv(parentEnv2, shell2, '/foo', 'en-au');
-		assert.ok(!('PTYSHELLARG0' in env2), 'PTYSHELLARG0 is unset');
-		assert.equal(env2['PTYCWD'], '/foo', 'PTYCWD is equal to /foo');
-		assert.equal(env2['LANG'], 'en_AU.UTF-8', 'LANG is equal to the requested locale with UTF-8');
+		const env2 = { FOO: 'bar' };
+		terminalEnvironment.addTerminalEnvironmentKeys(env2, null);
+		assert.equal(env2['LANG'], 'en_US.UTF-8', 'LANG is equal to en_US.UTF-8 as fallback.'); // More info on issue #14586
 
-		const env3 = terminalEnvironment.createTerminalEnv(parentEnv1, shell1, '/', null);
-		assert.equal(env3['LANG'], 'en_US.UTF-8', 'LANG is equal to en_US.UTF-8 as fallback.'); // More info on issue #14586
+		const env3 = { LANG: 'en_US.UTF-8' };
+		terminalEnvironment.addTerminalEnvironmentKeys(env3, null);
+		assert.equal(env3['LANG'], 'en_US.UTF-8', 'LANG is equal to the parent environment\'s LANG');
+	});
 
-		const env4 = terminalEnvironment.createTerminalEnv(parentEnv2, shell1, '/', null);
-		assert.equal(env4['LANG'], 'en_US.UTF-8', 'LANG is equal to the parent environment\'s LANG');
+	test('sanitizeEnvironment', () => {
+		let env = {
+			FOO: 'bar',
+			ELECTRON_ENABLE_STACK_DUMPING: 'x',
+			ELECTRON_ENABLE_LOGGING: 'x',
+			ELECTRON_NO_ASAR: 'x',
+			ELECTRON_NO_ATTACH_CONSOLE: 'x',
+			ELECTRON_RUN_AS_NODE: 'x',
+			GOOGLE_API_KEY: 'x',
+			VSCODE_CLI: 'x',
+			VSCODE_DEV: 'x',
+			VSCODE_IPC_HOOK: 'x',
+			VSCODE_LOGS: 'x',
+			VSCODE_NLS_CONFIG: 'x',
+			VSCODE_PORTABLE: 'x',
+			VSCODE_PID: 'x',
+			VSCODE_NODE_CACHED_DATA_DIR_12345: 'x'
+		};
+		terminalEnvironment.sanitizeEnvironment(env);
+		assert.equal(env['FOO'], 'bar');
+		assert.equal(Object.keys(env).length, 1);
 	});
 
 	suite('mergeEnvironments', () => {
diff --git a/src/vs/workbench/parts/themes/electron-browser/themes.contribution.ts b/src/vs/workbench/parts/themes/electron-browser/themes.contribution.ts
index cc04c06a371..700deadc2cb 100644
--- a/src/vs/workbench/parts/themes/electron-browser/themes.contribution.ts
+++ b/src/vs/workbench/parts/themes/electron-browser/themes.contribution.ts
@@ -10,10 +10,9 @@ import { TPromise } from 'vs/base/common/winjs.base';
 import { Action } from 'vs/base/common/actions';
 import { firstIndex } from 'vs/base/common/arrays';
 import { KeyMod, KeyChord, KeyCode } from 'vs/base/common/keyCodes';
-import { SyncActionDescriptor } from 'vs/platform/actions/common/actions';
+import { SyncActionDescriptor, MenuRegistry, MenuId } from 'vs/platform/actions/common/actions';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { IWorkbenchActionRegistry, Extensions } from 'vs/workbench/common/actions';
-import { IQuickOpenService, IPickOpenEntry } from 'vs/platform/quickOpen/common/quickOpen';
 import { IWorkbenchThemeService, COLOR_THEME_SETTING, ICON_THEME_SETTING, IColorTheme, IFileIconTheme } from 'vs/workbench/services/themes/common/workbenchThemeService';
 import { VIEWLET_ID, IExtensionsViewlet } from 'vs/workbench/parts/extensions/common/extensions';
 import { IExtensionGalleryService } from 'vs/platform/extensionManagement/common/extensionManagement';
@@ -26,6 +25,8 @@ import { Color } from 'vs/base/common/color';
 import { ConfigurationTarget } from 'vs/platform/configuration/common/configuration';
 import { LIGHT, DARK, HIGH_CONTRAST } from 'vs/platform/theme/common/themeService';
 import { schemaId } from 'vs/workbench/services/themes/common/colorThemeSchema';
+import { onUnexpectedError } from 'vs/base/common/errors';
+import { IQuickInputService, IQuickPickItem, QuickPickInput } from 'vs/platform/quickinput/common/quickInput';
 
 export class SelectColorThemeAction extends Action {
 
@@ -35,7 +36,7 @@ export class SelectColorThemeAction extends Action {
 	constructor(
 		id: string,
 		label: string,
-		@IQuickOpenService private quickOpenService: IQuickOpenService,
+		@IQuickInputService private quickInputService: IQuickInputService,
 		@IWorkbenchThemeService private themeService: IWorkbenchThemeService,
 		@IExtensionGalleryService private extensionGalleryService: IExtensionGalleryService,
 		@IViewletService private viewletService: IViewletService,
@@ -48,15 +49,18 @@ export class SelectColorThemeAction extends Action {
 		return this.themeService.getColorThemes().then(themes => {
 			const currentTheme = this.themeService.getColorTheme();
 
-			const picks: IPickOpenEntry[] = [].concat(
+			const picks: QuickPickInput[] = [].concat(
 				toEntries(themes.filter(t => t.type === LIGHT), localize('themes.category.light', "light themes")),
-				toEntries(themes.filter(t => t.type === DARK), localize('themes.category.dark', "dark themes"), true),
-				toEntries(themes.filter(t => t.type === HIGH_CONTRAST), localize('themes.category.hc', "high contrast themes"), true),
-				configurationEntries(this.extensionGalleryService, this.viewletService, 'category:themes', localize('installColorThemes', "Install Additional Color Themes..."))
+				toEntries(themes.filter(t => t.type === DARK), localize('themes.category.dark', "dark themes")),
+				toEntries(themes.filter(t => t.type === HIGH_CONTRAST), localize('themes.category.hc', "high contrast themes")),
+				configurationEntries(this.extensionGalleryService, localize('installColorThemes', "Install Additional Color Themes..."))
 			);
 
 			const selectTheme = (theme, applyTheme: boolean) => {
 				if (typeof theme.id === 'undefined') { // 'pick in marketplace' entry
+					if (applyTheme) {
+						openExtensionViewlet(this.viewletService, 'category:themes');
+					}
 					theme = currentTheme;
 				}
 				let target = null;
@@ -65,23 +69,22 @@ export class SelectColorThemeAction extends Action {
 					target = typeof confValue.workspace !== 'undefined' ? ConfigurationTarget.WORKSPACE : ConfigurationTarget.USER;
 				}
 
-				this.themeService.setColorTheme(theme.id, target).done(null,
+				this.themeService.setColorTheme(theme.id, target).then(null,
 					err => {
+						onUnexpectedError(err);
 						this.themeService.setColorTheme(currentTheme.id, null);
 					}
 				);
 			};
 
 			const placeHolder = localize('themes.selectTheme', "Select Color Theme (Up/Down Keys to Preview)");
-			const autoFocusIndex = firstIndex(picks, p => p.id === currentTheme.id);
+			const autoFocusIndex = firstIndex(picks, p => p.type !== 'separator' && p.id === currentTheme.id);
 			const delayer = new Delayer<void>(100);
+			const chooseTheme = theme => delayer.trigger(() => selectTheme(theme || currentTheme, true), 0);
+			const tryTheme = theme => delayer.trigger(() => selectTheme(theme, false));
 
-			return this.quickOpenService.pick(picks, { placeHolder, autoFocus: { autoFocusIndex } })
-				.then(
-					theme => delayer.trigger(() => selectTheme(theme || currentTheme, true), 0),
-					null,
-					theme => delayer.trigger(() => selectTheme(theme, false))
-				);
+			return this.quickInputService.pick(picks, { placeHolder, activeItem: picks[autoFocusIndex], onDidFocus: tryTheme })
+				.then(chooseTheme);
 		});
 	}
 }
@@ -94,7 +97,7 @@ class SelectIconThemeAction extends Action {
 	constructor(
 		id: string,
 		label: string,
-		@IQuickOpenService private quickOpenService: IQuickOpenService,
+		@IQuickInputService private quickInputService: IQuickInputService,
 		@IWorkbenchThemeService private themeService: IWorkbenchThemeService,
 		@IExtensionGalleryService private extensionGalleryService: IExtensionGalleryService,
 		@IViewletService private viewletService: IViewletService,
@@ -108,14 +111,17 @@ class SelectIconThemeAction extends Action {
 		return this.themeService.getFileIconThemes().then(themes => {
 			const currentTheme = this.themeService.getFileIconTheme();
 
-			let picks: IPickOpenEntry[] = [{ id: '', label: localize('noIconThemeLabel', 'None'), description: localize('noIconThemeDesc', 'Disable file icons') }];
+			let picks: QuickPickInput[] = [{ id: '', label: localize('noIconThemeLabel', 'None'), description: localize('noIconThemeDesc', 'Disable file icons') }];
 			picks = picks.concat(
 				toEntries(themes),
-				configurationEntries(this.extensionGalleryService, this.viewletService, 'tag:icon-theme', localize('installIconThemes', "Install Additional File Icon Themes..."))
+				configurationEntries(this.extensionGalleryService, localize('installIconThemes', "Install Additional File Icon Themes..."))
 			);
 
 			const selectTheme = (theme, applyTheme: boolean) => {
 				if (typeof theme.id === 'undefined') { // 'pick in marketplace' entry
+					if (applyTheme) {
+						openExtensionViewlet(this.viewletService, 'tag:icon-theme');
+					}
 					theme = currentTheme;
 				}
 				let target = null;
@@ -123,49 +129,55 @@ class SelectIconThemeAction extends Action {
 					let confValue = this.configurationService.inspect(ICON_THEME_SETTING);
 					target = typeof confValue.workspace !== 'undefined' ? ConfigurationTarget.WORKSPACE : ConfigurationTarget.USER;
 				}
-				this.themeService.setFileIconTheme(theme && theme.id, target).done(null,
+				this.themeService.setFileIconTheme(theme && theme.id, target).then(null,
 					err => {
+						onUnexpectedError(err);
 						this.themeService.setFileIconTheme(currentTheme.id, null);
 					}
 				);
 			};
 
 			const placeHolder = localize('themes.selectIconTheme', "Select File Icon Theme");
-			const autoFocusIndex = firstIndex(picks, p => p.id === currentTheme.id);
+			const autoFocusIndex = firstIndex(picks, p => p.type !== 'separator' && p.id === currentTheme.id);
 			const delayer = new Delayer<void>(100);
+			const chooseTheme = theme => delayer.trigger(() => selectTheme(theme || currentTheme, true), 0);
+			const tryTheme = theme => delayer.trigger(() => selectTheme(theme, false));
 
-			return this.quickOpenService.pick(picks, { placeHolder, autoFocus: { autoFocusIndex } })
-				.then(
-					theme => delayer.trigger(() => selectTheme(theme || currentTheme, true), 0),
-					null,
-					theme => delayer.trigger(() => selectTheme(theme, false))
-				);
+			return this.quickInputService.pick(picks, { placeHolder, activeItem: picks[autoFocusIndex], onDidFocus: tryTheme })
+				.then(chooseTheme);
 		});
 	}
 }
 
-function configurationEntries(extensionGalleryService: IExtensionGalleryService, viewletService: IViewletService, query: string, label: string): IPickOpenEntry[] {
+function configurationEntries(extensionGalleryService: IExtensionGalleryService, label: string): QuickPickInput[] {
 	if (extensionGalleryService.isEnabled()) {
-		return [{
-			id: void 0,
-			label: label,
-			separator: { border: true },
-			alwaysShow: true,
-			run: () => viewletService.openViewlet(VIEWLET_ID, true).then(viewlet => {
-				(<IExtensionsViewlet>viewlet).search(query);
-				viewlet.focus();
-			})
-		}];
+		return [
+			{
+				type: 'separator'
+			},
+			{
+				id: void 0,
+				label: label,
+				alwaysShow: true,
+			}
+		];
 	}
 	return [];
 }
 
-function toEntries(themes: (IColorTheme | IFileIconTheme)[], label?: string, border = false) {
-	const toEntry = theme => <IPickOpenEntry>{ id: theme.id, label: theme.label, description: theme.description };
-	const sorter = (t1: IColorTheme, t2: IColorTheme) => t1.label.localeCompare(t2.label);
-	let entries = themes.map(toEntry).sort(sorter);
-	if (entries.length > 0 && (label || border)) {
-		entries[0].separator = { label, border };
+function openExtensionViewlet(viewletService: IViewletService, query: string) {
+	return viewletService.openViewlet(VIEWLET_ID, true).then(viewlet => {
+		(<IExtensionsViewlet>viewlet).search(query);
+		viewlet.focus();
+	});
+}
+
+function toEntries(themes: (IColorTheme | IFileIconTheme)[], label?: string) {
+	const toEntry = theme => <IQuickPickItem>{ id: theme.id, label: theme.label, description: theme.description };
+	const sorter = (t1: IQuickPickItem, t2: IQuickPickItem) => t1.label.localeCompare(t2.label);
+	let entries: QuickPickInput[] = themes.map(toEntry).sort(sorter);
+	if (entries.length > 0 && label) {
+		entries.unshift({ type: 'separator', label });
 	}
 	return entries;
 }
@@ -229,3 +241,21 @@ const developerCategory = localize('developer', "Developer");
 
 const generateColorThemeDescriptor = new SyncActionDescriptor(GenerateColorThemeAction, GenerateColorThemeAction.ID, GenerateColorThemeAction.LABEL);
 Registry.as<IWorkbenchActionRegistry>(Extensions.WorkbenchActions).registerWorkbenchAction(generateColorThemeDescriptor, 'Developer: Generate Color Theme From Current Settings', developerCategory);
+
+MenuRegistry.appendMenuItem(MenuId.MenubarPreferencesMenu, {
+	group: '4_themes',
+	command: {
+		id: SelectColorThemeAction.ID,
+		title: localize({ key: 'miSelectColorTheme', comment: ['&& denotes a mnemonic'] }, "&&Color Theme")
+	},
+	order: 1
+});
+
+MenuRegistry.appendMenuItem(MenuId.MenubarPreferencesMenu, {
+	group: '4_themes',
+	command: {
+		id: SelectIconThemeAction.ID,
+		title: localize({ key: 'miSelectIconTheme', comment: ['&& denotes a mnemonic'] }, "File &&Icon Theme")
+	},
+	order: 2
+});
diff --git a/src/vs/workbench/parts/themes/test/electron-browser/themes.test.contribution.ts b/src/vs/workbench/parts/themes/test/electron-browser/themes.test.contribution.ts
index 871bbc06dce..5ed96250e86 100644
--- a/src/vs/workbench/parts/themes/test/electron-browser/themes.test.contribution.ts
+++ b/src/vs/workbench/parts/themes/test/electron-browser/themes.test.contribution.ts
@@ -7,7 +7,7 @@
 
 import { TPromise } from 'vs/base/common/winjs.base';
 import * as paths from 'vs/base/common/paths';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { IModeService } from 'vs/editor/common/services/modeService';
 import * as pfs from 'vs/base/node/pfs';
 import { CommandsRegistry } from 'vs/platform/commands/common/commands';
diff --git a/src/vs/workbench/parts/update/electron-browser/media/update.contribution.css b/src/vs/workbench/parts/update/electron-browser/media/update.contribution.css
index 4e602f932a2..54537cdcfa7 100644
--- a/src/vs/workbench/parts/update/electron-browser/media/update.contribution.css
+++ b/src/vs/workbench/parts/update/electron-browser/media/update.contribution.css
@@ -7,9 +7,3 @@
 	-webkit-mask: url('update.svg') no-repeat 50% 50%;
 	-webkit-mask-size: 22px;
 }
-
-/* TODO@Ben this is a hack to overwrite the icon for release notes eitor */
-.file-icons-enabled .show-file-icons .release-notes-ext-file-icon.file-icon::before {
-	content: ' ';
-	background-image: url('code-icon.svg');
-}
\ No newline at end of file
diff --git a/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.ts b/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.ts
index f1dcc32c086..88110f40e35 100644
--- a/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.ts
+++ b/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.ts
@@ -8,7 +8,7 @@
 import { onUnexpectedError } from 'vs/base/common/errors';
 import { marked } from 'vs/base/common/marked/marked';
 import { OS } from 'vs/base/common/platform';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { asText } from 'vs/base/node/request';
 import { IMode, TokenizationRegistry } from 'vs/editor/common/modes';
@@ -25,8 +25,9 @@ import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { addGAParameters } from 'vs/platform/telemetry/node/telemetryNodeUtils';
 import { IWebviewEditorService } from 'vs/workbench/parts/webview/electron-browser/webviewEditorService';
 import { IEditorService, ACTIVE_GROUP } from 'vs/workbench/services/editor/common/editorService';
-import { KeybindingIO } from 'vs/workbench/services/keybinding/common/keybindingIO';
 import { WebviewEditorInput } from 'vs/workbench/parts/webview/electron-browser/webviewEditorInput';
+import { KeybindingParser } from 'vs/base/common/keybindingParser';
+import { CancellationToken } from 'vs/base/common/cancellation';
 
 function renderBody(
 	body: string,
@@ -51,6 +52,7 @@ export class ReleaseNotesManager {
 	private _releaseNotesCache: { [version: string]: TPromise<string>; } = Object.create(null);
 
 	private _currentReleaseNotes: WebviewEditorInput | undefined = undefined;
+	private _lastText: string;
 
 	public constructor(
 		@IEnvironmentService private readonly _environmentService: IEnvironmentService,
@@ -60,14 +62,25 @@ export class ReleaseNotesManager {
 		@IRequestService private readonly _requestService: IRequestService,
 		@ITelemetryService private readonly _telemetryService: ITelemetryService,
 		@IEditorService private readonly _editorService: IEditorService,
-		@IWebviewEditorService private readonly _webviewEditorService: IWebviewEditorService,
-	) { }
+		@IWebviewEditorService private readonly _webviewEditorService: IWebviewEditorService
+	) {
+		TokenizationRegistry.onDidChange(async () => {
+			if (!this._currentReleaseNotes || !this._lastText) {
+				return;
+			}
+			const html = await this.renderBody(this._lastText);
+			if (this._currentReleaseNotes) {
+				this._currentReleaseNotes.html = html;
+			}
+		});
+	}
 
 	public async show(
 		accessor: ServicesAccessor,
 		version: string
-	): TPromise<boolean> {
+	): Promise<boolean> {
 		const releaseNoteText = await this.loadReleaseNotes(version);
+		this._lastText = releaseNoteText;
 		const html = await this.renderBody(releaseNoteText);
 		const title = nls.localize('releaseNotesInputName', "Release Notes: {0}", version);
 
@@ -87,6 +100,11 @@ export class ReleaseNotesManager {
 					onDispose: () => { this._currentReleaseNotes = undefined; }
 				});
 
+			const iconPath = URI.parse(require.toUrl('./media/code-icon.svg'));
+			this._currentReleaseNotes.iconPath = {
+				light: iconPath,
+				dark: iconPath
+			};
 			this._currentReleaseNotes.html = html;
 		}
 
@@ -118,7 +136,7 @@ export class ReleaseNotesManager {
 			};
 
 			const kbstyle = (match: string, kb: string) => {
-				const keybinding = KeybindingIO.readKeybinding(kb, OS);
+				const keybinding = KeybindingParser.parseKeybinding(kb, OS);
 
 				if (!keybinding) {
 					return unassigned;
@@ -139,8 +157,15 @@ export class ReleaseNotesManager {
 		};
 
 		if (!this._releaseNotesCache[version]) {
-			this._releaseNotesCache[version] = this._requestService.request({ url })
+			this._releaseNotesCache[version] = this._requestService.request({ url }, CancellationToken.None)
 				.then(asText)
+				.then(text => {
+					if (!/^#\s/.test(text)) { // release notes always starts with `#` followed by whitespace
+						return TPromise.wrapError<string>(new Error('Invalid release notes'));
+					}
+
+					return TPromise.wrap(text);
+				})
 				.then(text => patchKeybindings(text));
 		}
 
@@ -154,13 +179,14 @@ export class ReleaseNotesManager {
 	}
 
 	private async renderBody(text: string) {
+		const content = await this.renderContent(text);
 		const colorMap = TokenizationRegistry.getColorMap();
 		const css = generateTokensCSSForColorMap(colorMap);
-		const body = renderBody(await this.renderContent(text), css);
+		const body = renderBody(content, css);
 		return body;
 	}
 
-	private async renderContent(text: string): TPromise<string> {
+	private async renderContent(text: string): Promise<string> {
 		const renderer = await this.getRenderer(text);
 		return marked(text, { renderer });
 	}
diff --git a/src/vs/workbench/parts/update/electron-browser/update.contribution.ts b/src/vs/workbench/parts/update/electron-browser/update.contribution.ts
index 1a2d956f296..4e791267124 100644
--- a/src/vs/workbench/parts/update/electron-browser/update.contribution.ts
+++ b/src/vs/workbench/parts/update/electron-browser/update.contribution.ts
@@ -16,12 +16,14 @@ import { SyncActionDescriptor } from 'vs/platform/actions/common/actions';
 import { ShowCurrentReleaseNotesAction, ProductContribution, UpdateContribution, Win3264BitContribution } from './update';
 import { LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
 
-Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench)
-	.registerWorkbenchContribution(ProductContribution, LifecyclePhase.Running);
+const workbench = Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench);
 
-if (platform.isWindows && process.arch === 'ia32') {
-	Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench)
-		.registerWorkbenchContribution(Win3264BitContribution, LifecyclePhase.Running);
+workbench.registerWorkbenchContribution(ProductContribution, LifecyclePhase.Running);
+
+if (platform.isWindows) {
+	if (process.arch === 'ia32') {
+		workbench.registerWorkbenchContribution(Win3264BitContribution, LifecyclePhase.Running);
+	}
 }
 
 Registry.as<IGlobalActivityRegistry>(GlobalActivityExtensions)
diff --git a/src/vs/workbench/parts/update/electron-browser/update.ts b/src/vs/workbench/parts/update/electron-browser/update.ts
index 4f8ed441d1e..53ba1b49137 100644
--- a/src/vs/workbench/parts/update/electron-browser/update.ts
+++ b/src/vs/workbench/parts/update/electron-browser/update.ts
@@ -9,11 +9,11 @@ import * as nls from 'vs/nls';
 import severity from 'vs/base/common/severity';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { IAction, Action } from 'vs/base/common/actions';
-import { IDisposable, dispose, empty as EmptyDisposable } from 'vs/base/common/lifecycle';
+import { IDisposable, dispose, Disposable } from 'vs/base/common/lifecycle';
 import { Separator } from 'vs/base/browser/ui/actionbar/actionbar';
 import pkg from 'vs/platform/node/package';
 import product from 'vs/platform/node/product';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { IActivityService, NumberBadge, IBadge, ProgressBadge } from 'vs/workbench/services/activity/common/activity';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IGlobalActivity } from 'vs/workbench/common/activity';
@@ -73,11 +73,11 @@ export abstract class AbstractShowReleaseNotesAction extends Action {
 
 		this.enabled = false;
 
-		return showReleaseNotes(this.instantiationService, this.version)
+		return TPromise.wrap(showReleaseNotes(this.instantiationService, this.version)
 			.then(null, () => {
 				const action = this.instantiationService.createInstance(OpenLatestReleaseNotesInBrowserAction);
 				return action.run().then(() => false);
-			});
+			}));
 	}
 }
 
@@ -235,7 +235,7 @@ export class UpdateContribution implements IGlobalActivity {
 	get cssClass() { return 'update-activity'; }
 
 	private state: UpdateState;
-	private badgeDisposable: IDisposable = EmptyDisposable;
+	private badgeDisposable: IDisposable = Disposable.None;
 	private disposables: IDisposable[] = [];
 
 	constructor(
@@ -349,7 +349,7 @@ export class UpdateContribution implements IGlobalActivity {
 		);
 	}
 
-	// windows fast updates
+	// windows fast updates (target === system)
 	private onUpdateDownloaded(update: IUpdate): void {
 		if (!this.shouldShowNotification()) {
 			return;
@@ -377,6 +377,11 @@ export class UpdateContribution implements IGlobalActivity {
 
 	// windows fast updates
 	private onUpdateUpdating(update: IUpdate): void {
+		if (isWindows && product.target === 'user') {
+			return;
+		}
+
+		// windows fast updates (target === system)
 		const neverShowAgain = new NeverShowAgain('update/win32-fast-updates', this.storageService);
 
 		if (!neverShowAgain.shouldShow()) {
@@ -399,10 +404,11 @@ export class UpdateContribution implements IGlobalActivity {
 
 	// windows and mac
 	private onUpdateReady(update: IUpdate): void {
-		if (!isWindows && !this.shouldShowNotification()) {
+		if (!(isWindows && product.target !== 'user') && !this.shouldShowNotification()) {
 			return;
 		}
 
+		// windows user fast updates and mac
 		this.notificationService.prompt(
 			severity.Info,
 			nls.localize('updateAvailableAfterRestart', "Restart {0} to apply the latest update.", product.nameLong),
@@ -445,8 +451,8 @@ export class UpdateContribution implements IGlobalActivity {
 			new CommandAction(UpdateContribution.showCommandsId, nls.localize('commandPalette', "Command Palette..."), this.commandService),
 			new Separator(),
 			new CommandAction(UpdateContribution.openSettingsId, nls.localize('settings', "Settings"), this.commandService),
+			new CommandAction(UpdateContribution.showExtensionsId, nls.localize('showExtensions', "Extensions"), this.commandService),
 			new CommandAction(UpdateContribution.openKeybindingsId, nls.localize('keyboardShortcuts', "Keyboard Shortcuts"), this.commandService),
-			new CommandAction(UpdateContribution.showExtensionsId, nls.localize('showExtensions', "Manage Extensions"), this.commandService),
 			new Separator(),
 			new CommandAction(UpdateContribution.openUserSnippets, nls.localize('userSnippets', "User Snippets"), this.commandService),
 			new Separator(),
@@ -501,4 +507,4 @@ export class UpdateContribution implements IGlobalActivity {
 	dispose(): void {
 		this.disposables = dispose(this.disposables);
 	}
-}
\ No newline at end of file
+}
diff --git a/src/vs/workbench/parts/url/electron-browser/url.contribution.ts b/src/vs/workbench/parts/url/electron-browser/url.contribution.ts
index bc6c1f8faa3..a8f0ee32940 100644
--- a/src/vs/workbench/parts/url/electron-browser/url.contribution.ts
+++ b/src/vs/workbench/parts/url/electron-browser/url.contribution.ts
@@ -9,7 +9,7 @@ import { Registry } from 'vs/platform/registry/common/platform';
 import { Extensions as ActionExtensions, IWorkbenchActionRegistry } from 'vs/workbench/common/actions';
 import { IURLService } from 'vs/platform/url/common/url';
 import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { Action } from 'vs/base/common/actions';
 
@@ -27,11 +27,11 @@ export class OpenUrlAction extends Action {
 		super(id, label);
 	}
 
-	async run(): TPromise<any> {
-		const input = await this.quickInputService.input({ prompt: 'URL to open' });
-		const uri = URI.parse(input);
-
-		this.urlService.open(uri);
+	run(): TPromise<any> {
+		return this.quickInputService.input({ prompt: 'URL to open' }).then(input => {
+			const uri = URI.parse(input);
+			this.urlService.open(uri);
+		});
 	}
 }
 
diff --git a/src/vs/workbench/parts/watermark/electron-browser/watermark.ts b/src/vs/workbench/parts/watermark/electron-browser/watermark.ts
index 44449b32df2..61e9c768aa6 100644
--- a/src/vs/workbench/parts/watermark/electron-browser/watermark.ts
+++ b/src/vs/workbench/parts/watermark/electron-browser/watermark.ts
@@ -5,7 +5,6 @@
 'use strict';
 
 import 'vs/css!./watermark';
-import { $, Builder } from 'vs/base/browser/builder';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { assign } from 'vs/base/common/objects';
 import { isMacintosh } from 'vs/base/common/platform';
@@ -24,9 +23,12 @@ import { ShowAllCommandsAction } from 'vs/workbench/parts/quickopen/browser/comm
 import { Parts, IPartService, IDimension } from 'vs/workbench/services/part/common/partService';
 import { StartAction } from 'vs/workbench/parts/debug/browser/debugActions';
 import { FindInFilesActionId } from 'vs/workbench/parts/search/common/constants';
-import { ToggleTerminalAction } from 'vs/workbench/parts/terminal/electron-browser/terminalActions';
 import { escape } from 'vs/base/common/strings';
 import { QUICKOPEN_ACTION_ID } from 'vs/workbench/browser/parts/quickopen/quickopen';
+import { TERMINAL_COMMAND_ID } from 'vs/workbench/parts/terminal/common/terminalCommands';
+import * as dom from 'vs/base/browser/dom';
+
+const $ = dom.$;
 
 interface WatermarkEntry {
 	text: string;
@@ -68,7 +70,7 @@ const newUntitledFile: WatermarkEntry = {
 const newUntitledFileMacOnly: WatermarkEntry = assign({ mac: true }, newUntitledFile);
 const toggleTerminal: WatermarkEntry = {
 	text: nls.localize({ key: 'watermark.toggleTerminal', comment: ['toggle is a verb here'] }, "Toggle Terminal"),
-	ids: [ToggleTerminalAction.ID]
+	ids: [TERMINAL_COMMAND_ID.TOGGLE]
 };
 
 const findInFiles: WatermarkEntry = {
@@ -104,7 +106,7 @@ const WORKBENCH_TIPS_ENABLED_KEY = 'workbench.tips.enabled';
 export class WatermarkContribution implements IWorkbenchContribution {
 
 	private toDispose: IDisposable[] = [];
-	private watermark: Builder;
+	private watermark: HTMLElement;
 	private enabled: boolean;
 	private workbenchState: WorkbenchState;
 
@@ -149,35 +151,31 @@ export class WatermarkContribution implements IWorkbenchContribution {
 		const container = this.partService.getContainer(Parts.EDITOR_PART);
 		container.classList.add('has-watermark');
 
-		this.watermark = $()
-			.div({ 'class': 'watermark' });
-		const box = $(this.watermark)
-			.div({ 'class': 'watermark-box' });
+		this.watermark = $('.watermark');
+		const box = dom.append(this.watermark, $('.watermark-box'));
 		const folder = this.workbenchState !== WorkbenchState.EMPTY;
 		const selected = folder ? folderEntries : noFolderEntries
 			.filter(entry => !('mac' in entry) || entry.mac === isMacintosh);
 		const update = () => {
-			const builder = $(box);
-			builder.clearChildren();
+			dom.clearNode(box);
 			selected.map(entry => {
-				builder.element('dl', {}, dl => {
-					dl.element('dt', {}, dt => dt.text(entry.text));
-					dl.element('dd', {}, dd => dd.innerHtml(
-						entry.ids
-							.map(id => {
-								let k = this.keybindingService.lookupKeybinding(id);
-								if (k) {
-									return `<span class="shortcuts">${escape(k.getLabel())}</span>`;
-								}
-								return `<span class="unbound">${escape(UNBOUND)}</span>`;
-							})
-							.join(' / ')
-					));
-				});
+				const dl = dom.append(box, $('dl'));
+				const dt = dom.append(dl, $('dt'));
+				dt.textContent = entry.text;
+				const dd = dom.append(dl, $('dd'));
+				dd.innerHTML = entry.ids
+					.map(id => {
+						let k = this.keybindingService.lookupKeybinding(id);
+						if (k) {
+							return `<span class="shortcuts">${escape(k.getLabel())}</span>`;
+						}
+						return `<span class="unbound">${escape(UNBOUND)}</span>`;
+					})
+					.join(' / ');
 			});
 		};
 		update();
-		this.watermark.build(container.firstElementChild as HTMLElement, 0);
+		dom.prepend(container.firstElementChild as HTMLElement, this.watermark);
 		this.toDispose.push(this.keybindingService.onDidUpdateKeybindings(update));
 		this.toDispose.push(this.partService.onEditorLayout(({ height }: IDimension) => {
 			container.classList[height <= 478 ? 'add' : 'remove']('max-height-478px');
@@ -186,7 +184,7 @@ export class WatermarkContribution implements IWorkbenchContribution {
 
 	private destroy(): void {
 		if (this.watermark) {
-			this.watermark.destroy();
+			this.watermark.remove();
 			this.partService.getContainer(Parts.EDITOR_PART).classList.remove('has-watermark');
 			this.dispose();
 		}
diff --git a/src/vs/workbench/parts/webview/electron-browser/baseWebviewEditor.ts b/src/vs/workbench/parts/webview/electron-browser/baseWebviewEditor.ts
index 8436046783d..66bc0a66e90 100644
--- a/src/vs/workbench/parts/webview/electron-browser/baseWebviewEditor.ts
+++ b/src/vs/workbench/parts/webview/electron-browser/baseWebviewEditor.ts
@@ -10,10 +10,6 @@ import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { BaseEditor } from 'vs/workbench/browser/parts/editor/baseEditor';
 import { WebviewElement } from './webviewElement';
 
-/**  A context key that is set when a webview editor has focus. */
-export const KEYBINDING_CONTEXT_WEBVIEWEDITOR_FOCUS = new RawContextKey<boolean>('webviewEditorFocus', false);
-/**  A context key that is set when the find widget find input in webview editor webview is focused. */
-export const KEYBINDING_CONTEXT_WEBVIEWEDITOR_FIND_WIDGET_INPUT_FOCUSED = new RawContextKey<boolean>('webviewEditorFindWidgetInputFocused', false);
 /**  A context key that is set when the find widget in a webview is visible. */
 export const KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_VISIBLE = new RawContextKey<boolean>('webviewFindWidgetVisible', false);
 
@@ -24,9 +20,7 @@ export const KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_VISIBLE = new RawContextKey<
 export abstract class BaseWebviewEditor extends BaseEditor {
 
 	protected _webview: WebviewElement | undefined;
-	protected contextKey: IContextKey<boolean>;
 	protected findWidgetVisible: IContextKey<boolean>;
-	protected findInputFocusContextKey: IContextKey<boolean>;
 
 	constructor(
 		id: string,
@@ -36,8 +30,6 @@ export abstract class BaseWebviewEditor extends BaseEditor {
 	) {
 		super(id, telemetryService, themeService);
 		if (contextKeyService) {
-			this.contextKey = KEYBINDING_CONTEXT_WEBVIEWEDITOR_FOCUS.bindTo(contextKeyService);
-			this.findInputFocusContextKey = KEYBINDING_CONTEXT_WEBVIEWEDITOR_FIND_WIDGET_INPUT_FOCUSED.bindTo(contextKeyService);
 			this.findWidgetVisible = KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_VISIBLE.bindTo(contextKeyService);
 		}
 	}
@@ -56,18 +48,6 @@ export abstract class BaseWebviewEditor extends BaseEditor {
 		}
 	}
 
-	public showNextFindTerm() {
-		if (this._webview) {
-			this._webview.showNextFindTerm();
-		}
-	}
-
-	public showPreviousFindTerm() {
-		if (this._webview) {
-			this._webview.showPreviousFindTerm();
-		}
-	}
-
 	public get isWebviewEditor() {
 		return true;
 	}
@@ -89,4 +69,10 @@ export abstract class BaseWebviewEditor extends BaseEditor {
 			this._webview.focus();
 		}
 	}
+
+	public selectAll(): void {
+		if (this._webview) {
+			this._webview.selectAll();
+		}
+	}
 }
diff --git a/src/vs/workbench/parts/webview/electron-browser/webview-pre.js b/src/vs/workbench/parts/webview/electron-browser/webview-pre.js
index 51a9d42aa32..17e1b20b3f4 100644
--- a/src/vs/workbench/parts/webview/electron-browser/webview-pre.js
+++ b/src/vs/workbench/parts/webview/electron-browser/webview-pre.js
@@ -99,7 +99,7 @@
 			return;
 		}
 
-		const progress = event.target.body.scrollTop / event.target.body.clientHeight;
+		const progress = event.currentTarget.scrollY / event.target.body.clientHeight;
 		if (isNaN(progress)) {
 			return;
 		}
@@ -172,7 +172,7 @@
 			}
 
 			// apply default script
-			if (enableWrappedPostMessage) {
+			if (enableWrappedPostMessage && options.allowScripts) {
 				const defaultScript = newDocument.createElement('script');
 				defaultScript.textContent = `
 					const acquireVsCodeApi = (function() {
@@ -312,18 +312,18 @@
 			var setInitialScrollPosition;
 			if (firstLoad) {
 				firstLoad = false;
-				setInitialScrollPosition = (body) => {
+				setInitialScrollPosition = (body, window) => {
 					if (!isNaN(initData.initialScrollProgress)) {
 						if (body.scrollTop === 0) {
-							body.scrollTop = body.clientHeight * initData.initialScrollProgress;
+							window.scroll(0, body.clientHeight * initData.initialScrollProgress);
 						}
 					}
 				};
 			} else {
 				const scrollY = frame && frame.contentDocument && frame.contentDocument.body ? frame.contentDocument.body.scrollTop : 0;
-				setInitialScrollPosition = (body) => {
+				setInitialScrollPosition = (body, window) => {
 					if (body.scrollTop === 0) {
-						body.scrollTop = scrollY;
+						window.scroll(0, scrollY);
 					}
 				};
 			}
@@ -360,7 +360,7 @@
 				if (contentDocument.body) {
 					// Workaround for https://github.com/Microsoft/vscode/issues/12865
 					// check new scrollTop and reset if neccessary
-					setInitialScrollPosition(contentDocument.body);
+					setInitialScrollPosition(contentDocument.body, contentWindow);
 
 					// Bubble out link clicks
 					contentDocument.body.addEventListener('click', handleInnerClick);
diff --git a/src/vs/workbench/parts/webview/electron-browser/webview.contribution.ts b/src/vs/workbench/parts/webview/electron-browser/webview.contribution.ts
index c455d333963..cfea3a0851c 100644
--- a/src/vs/workbench/parts/webview/electron-browser/webview.contribution.ts
+++ b/src/vs/workbench/parts/webview/electron-browser/webview.contribution.ts
@@ -9,14 +9,14 @@ import { SyncActionDescriptor } from 'vs/platform/actions/common/actions';
 import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
 import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
 import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRegistry';
+import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { EditorDescriptor, Extensions as EditorExtensions, IEditorRegistry } from 'vs/workbench/browser/editor';
 import { Extensions as ActionExtensions, IWorkbenchActionRegistry } from 'vs/workbench/common/actions';
 import { Extensions as EditorInputExtensions, IEditorInputFactoryRegistry } from 'vs/workbench/common/editor';
 import { WebviewEditorInputFactory } from 'vs/workbench/parts/webview/electron-browser/webviewEditorInputFactory';
-import { KEYBINDING_CONTEXT_WEBVIEWEDITOR_FIND_WIDGET_INPUT_FOCUSED, KEYBINDING_CONTEXT_WEBVIEWEDITOR_FOCUS, KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_VISIBLE } from './baseWebviewEditor';
-import { HideWebViewEditorFindCommand, OpenWebviewDeveloperToolsAction, ReloadWebviewAction, ShowWebViewEditorFindTermCommand, ShowWebViewEditorFindWidgetCommand } from './webviewCommands';
+import { KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_VISIBLE } from './baseWebviewEditor';
+import { HideWebViewEditorFindCommand, OpenWebviewDeveloperToolsAction, ReloadWebviewAction, ShowWebViewEditorFindWidgetCommand, SelectAllWebviewEditorCommand } from './webviewCommands';
 import { WebviewEditor } from './webviewEditor';
 import { WebviewEditorInput } from './webviewEditorInput';
 import { IWebviewEditorService, WebviewEditorService } from './webviewEditorService';
@@ -38,46 +38,43 @@ const webviewDeveloperCategory = localize('developer', "Developer");
 
 const actionRegistry = Registry.as<IWorkbenchActionRegistry>(ActionExtensions.WorkbenchActions);
 
-const showNextFindWdigetCommand = new ShowWebViewEditorFindWidgetCommand({
-	id: ShowWebViewEditorFindWidgetCommand.ID,
-	precondition: KEYBINDING_CONTEXT_WEBVIEWEDITOR_FOCUS,
-	kbOpts: {
-		primary: KeyMod.CtrlCmd | KeyCode.KEY_F
-	}
-});
-KeybindingsRegistry.registerCommandAndKeybindingRule(showNextFindWdigetCommand.toCommandAndKeybindingRule(KeybindingsRegistry.WEIGHT.editorContrib()));
+export function registerWebViewCommands(editorId: string): void {
+	const contextKeyExpr = ContextKeyExpr.equals('activeEditor', editorId);
 
+	const showNextFindWidgetCommand = new ShowWebViewEditorFindWidgetCommand({
+		id: ShowWebViewEditorFindWidgetCommand.ID,
+		precondition: contextKeyExpr,
+		kbOpts: {
+			primary: KeyMod.CtrlCmd | KeyCode.KEY_F,
+			weight: KeybindingWeight.EditorContrib
+		}
+	});
+	showNextFindWidgetCommand.register();
 
-const showNextFindTermCommand = new ShowWebViewEditorFindTermCommand({
-	id: 'editor.action.webvieweditor.showNextFindTerm',
-	precondition: KEYBINDING_CONTEXT_WEBVIEWEDITOR_FIND_WIDGET_INPUT_FOCUSED,
-	kbOpts: {
-		primary: KeyMod.Alt | KeyCode.DownArrow
-	}
-}, true);
-KeybindingsRegistry.registerCommandAndKeybindingRule(showNextFindTermCommand.toCommandAndKeybindingRule(KeybindingsRegistry.WEIGHT.editorContrib()));
+	const hideCommand = new HideWebViewEditorFindCommand({
+		id: HideWebViewEditorFindCommand.ID,
+		precondition: ContextKeyExpr.and(
+			contextKeyExpr,
+			KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_VISIBLE),
+		kbOpts: {
+			primary: KeyCode.Escape,
+			weight: KeybindingWeight.EditorContrib
+		}
+	});
+	hideCommand.register();
 
-const showPreviousFindTermCommand = new ShowWebViewEditorFindTermCommand({
-	id: 'editor.action.webvieweditor.showPreviousFindTerm',
-	precondition: KEYBINDING_CONTEXT_WEBVIEWEDITOR_FIND_WIDGET_INPUT_FOCUSED,
-	kbOpts: {
-		primary: KeyMod.Alt | KeyCode.UpArrow
-	}
-}, false);
-KeybindingsRegistry.registerCommandAndKeybindingRule(showPreviousFindTermCommand.toCommandAndKeybindingRule(KeybindingsRegistry.WEIGHT.editorContrib()));
-
-
-const hideCommand = new HideWebViewEditorFindCommand({
-	id: HideWebViewEditorFindCommand.ID,
-	precondition: ContextKeyExpr.and(
-		KEYBINDING_CONTEXT_WEBVIEWEDITOR_FOCUS,
-		KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_VISIBLE),
-	kbOpts: {
-		primary: KeyCode.Escape
-	}
-});
-KeybindingsRegistry.registerCommandAndKeybindingRule(hideCommand.toCommandAndKeybindingRule(KeybindingsRegistry.WEIGHT.editorContrib()));
+	const selectAllCommand = new SelectAllWebviewEditorCommand({
+		id: SelectAllWebviewEditorCommand.ID,
+		precondition: contextKeyExpr,
+		kbOpts: {
+			primary: KeyMod.CtrlCmd | KeyCode.KEY_A,
+			weight: KeybindingWeight.EditorContrib
+		}
+	});
+	selectAllCommand.register();
+}
 
+registerWebViewCommands(WebviewEditor.ID);
 
 actionRegistry.registerWorkbenchAction(
 	new SyncActionDescriptor(OpenWebviewDeveloperToolsAction, OpenWebviewDeveloperToolsAction.ID, OpenWebviewDeveloperToolsAction.LABEL),
diff --git a/src/vs/workbench/parts/webview/electron-browser/webviewCommands.ts b/src/vs/workbench/parts/webview/electron-browser/webviewCommands.ts
index 8655aa91f32..5866fcdbec6 100644
--- a/src/vs/workbench/parts/webview/electron-browser/webviewCommands.ts
+++ b/src/vs/workbench/parts/webview/electron-browser/webviewCommands.ts
@@ -5,7 +5,7 @@
 
 import { Action } from 'vs/base/common/actions';
 import { TPromise } from 'vs/base/common/winjs.base';
-import { Command, ICommandOptions } from 'vs/editor/browser/editorExtensions';
+import { Command } from 'vs/editor/browser/editorExtensions';
 import * as nls from 'vs/nls';
 import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
@@ -33,21 +33,13 @@ export class HideWebViewEditorFindCommand extends Command {
 	}
 }
 
-export class ShowWebViewEditorFindTermCommand extends Command {
-	public static readonly Id = 'editor.action.webvieweditor.showPreviousFindTerm';
-
-	constructor(opts: ICommandOptions, private _next: boolean) {
-		super(opts);
-	}
+export class SelectAllWebviewEditorCommand extends Command {
+	public static readonly ID = 'editor.action.webvieweditor.selectAll';
 
 	public runCommand(accessor: ServicesAccessor, args: any): void {
 		const webViewEditor = getActiveWebviewEditor(accessor);
 		if (webViewEditor) {
-			if (this._next) {
-				webViewEditor.showNextFindTerm();
-			} else {
-				webViewEditor.showPreviousFindTerm();
-			}
+			webViewEditor.selectAll();
 		}
 	}
 }
diff --git a/src/vs/workbench/parts/webview/electron-browser/webviewEditor.ts b/src/vs/workbench/parts/webview/electron-browser/webviewEditor.ts
index 66bf601c159..95ca32be767 100644
--- a/src/vs/workbench/parts/webview/electron-browser/webviewEditor.ts
+++ b/src/vs/workbench/parts/webview/electron-browser/webviewEditor.ts
@@ -4,24 +4,23 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as DOM from 'vs/base/browser/dom';
-import { domEvent } from 'vs/base/browser/event';
+import { CancellationToken } from 'vs/base/common/cancellation';
 import { Emitter, Event } from 'vs/base/common/event';
 import { IDisposable } from 'vs/base/common/lifecycle';
-import URI from 'vs/base/common/uri';
-import { TPromise } from 'vs/base/common/winjs.base';
+import { URI } from 'vs/base/common/uri';
 import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
 import { EditorOptions } from 'vs/workbench/common/editor';
-import { IEditorGroup } from 'vs/workbench/services/group/common/editorGroupsService';
 import { WebviewEditorInput } from 'vs/workbench/parts/webview/electron-browser/webviewEditorInput';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
+import { IEditorGroup } from 'vs/workbench/services/group/common/editorGroupsService';
 import { IPartService, Parts } from 'vs/workbench/services/part/common/partService';
-import { BaseWebviewEditor, KEYBINDING_CONTEXT_WEBVIEWEDITOR_FIND_WIDGET_INPUT_FOCUSED, KEYBINDING_CONTEXT_WEBVIEWEDITOR_FOCUS, KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_VISIBLE } from './baseWebviewEditor';
+import { BaseWebviewEditor, KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_VISIBLE } from './baseWebviewEditor';
 import { WebviewElement } from './webviewElement';
-import { CancellationToken } from 'vs/base/common/cancellation';
+import { IWindowService } from 'vs/platform/windows/common/windows';
 
 export class WebviewEditor extends BaseWebviewEditor {
 
@@ -44,7 +43,8 @@ export class WebviewEditor extends BaseWebviewEditor {
 		@IPartService private readonly _partService: IPartService,
 		@IWorkspaceContextService private readonly _contextService: IWorkspaceContextService,
 		@IInstantiationService private readonly _instantiationService: IInstantiationService,
-		@IEditorService private readonly _editorService: IEditorService
+		@IEditorService private readonly _editorService: IEditorService,
+		@IWindowService private readonly _windowService: IWindowService
 	) {
 		super(WebviewEditor.ID, telemetryService, themeService, _contextKeyService);
 	}
@@ -83,8 +83,8 @@ export class WebviewEditor extends BaseWebviewEditor {
 		}
 
 		// Make sure we restore focus when switching back to a VS Code window
-		this._onFocusWindowHandler = domEvent(window, 'focus')(() => {
-			if (this._editorService.activeControl === this) {
+		this._onFocusWindowHandler = this._windowService.onDidChangeFocus(focused => {
+			if (focused && this._editorService.activeControl === this) {
 				this.focus();
 			}
 		});
@@ -95,14 +95,21 @@ export class WebviewEditor extends BaseWebviewEditor {
 		this._webview = undefined;
 		this._webviewContent = undefined;
 
+		if (this._content && this._content.parentElement) {
+			this._content.parentElement.removeChild(this._content);
+			this._content = undefined;
+		}
+
 		this._onDidFocusWebview.dispose();
 
 		if (this._webviewFocusTracker) {
 			this._webviewFocusTracker.dispose();
+			this._webviewFocusTracker = undefined;
 		}
 
 		if (this._webviewFocusListenerDisposable) {
 			this._webviewFocusListenerDisposable.dispose();
+			this._webviewFocusListenerDisposable = undefined;
 		}
 
 		if (this._onFocusWindowHandler) {
@@ -156,35 +163,34 @@ export class WebviewEditor extends BaseWebviewEditor {
 		super.clearInput();
 	}
 
-	async setInput(input: WebviewEditorInput, options: EditorOptions, token: CancellationToken): TPromise<void> {
+	setInput(input: WebviewEditorInput, options: EditorOptions, token: CancellationToken): Thenable<void> {
 		if (this.input) {
 			(this.input as WebviewEditorInput).releaseWebview(this);
 			this._webview = undefined;
 			this._webviewContent = undefined;
 		}
-		await super.setInput(input, options, token);
+		return super.setInput(input, options, token)
+			.then(() => input.resolve())
+			.then(() => {
+				if (token.isCancellationRequested) {
+					return;
+				}
 
-		await input.resolve();
-
-		if (token.isCancellationRequested) {
-			return;
-		}
-
-		input.updateGroup(this.group.id);
-		this.updateWebview(input);
+				input.updateGroup(this.group.id);
+				this.updateWebview(input);
+			});
 	}
 
 	private updateWebview(input: WebviewEditorInput) {
 		const webview = this.getWebview(input);
 		input.claimWebview(this);
-		webview.options = {
+		webview.update(input.html, {
 			allowScripts: input.options.enableScripts,
 			allowSvgs: true,
 			enableWrappedPostMessage: true,
 			useSameOriginForRoot: false,
 			localResourceRoots: input.options.localResourceRoots || this.getDefaultLocalResourceRoots()
-		};
-		input.html = input.html;
+		});
 
 		if (this._webviewContent) {
 			this._webviewContent.style.visibility = 'visible';
@@ -217,16 +223,12 @@ export class WebviewEditor extends BaseWebviewEditor {
 		}
 
 		if (input.options.enableFindWidget) {
-			this._contextKeyService = this._contextKeyService.createScoped(this._webviewContent);
-			this.contextKey = KEYBINDING_CONTEXT_WEBVIEWEDITOR_FOCUS.bindTo(this._contextKeyService);
-			this.findInputFocusContextKey = KEYBINDING_CONTEXT_WEBVIEWEDITOR_FIND_WIDGET_INPUT_FOCUSED.bindTo(this._contextKeyService);
+			this._contextKeyService = this._register(this._contextKeyService.createScoped(this._webviewContent));
 			this.findWidgetVisible = KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_VISIBLE.bindTo(this._contextKeyService);
 		}
 
 		this._webview = this._instantiationService.createInstance(WebviewElement,
 			this._partService.getContainer(Parts.EDITOR_PART),
-			this.contextKey,
-			this.findInputFocusContextKey,
 			{
 				enableWrappedPostMessage: true,
 				useSameOriginForRoot: false
diff --git a/src/vs/workbench/parts/webview/electron-browser/webviewEditorInput.ts b/src/vs/workbench/parts/webview/electron-browser/webviewEditorInput.ts
index 5959e91831a..7a6532cff51 100644
--- a/src/vs/workbench/parts/webview/electron-browser/webviewEditorInput.ts
+++ b/src/vs/workbench/parts/webview/electron-browser/webviewEditorInput.ts
@@ -2,13 +2,15 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
-import URI from 'vs/base/common/uri';
+import * as dom from 'vs/base/browser/dom';
+import { Emitter } from 'vs/base/common/event';
+import { dispose, IDisposable } from 'vs/base/common/lifecycle';
+import { URI } from 'vs/base/common/uri';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { IEditorModel } from 'vs/platform/editor/common/editor';
-import { EditorInput, EditorModel, IEditorInput, GroupIdentifier } from 'vs/workbench/common/editor';
+import { EditorInput, EditorModel, GroupIdentifier, IEditorInput } from 'vs/workbench/common/editor';
 import { IPartService, Parts } from 'vs/workbench/services/part/common/partService';
+import * as vscode from 'vscode';
 import { WebviewEvents, WebviewInputOptions, WebviewReviver } from './webviewEditorService';
 import { WebviewElement } from './webviewElement';
 
@@ -16,9 +18,42 @@ import { WebviewElement } from './webviewElement';
 export class WebviewEditorInput extends EditorInput {
 	private static handlePool = 0;
 
+	private static _styleElement?: HTMLStyleElement;
+
+	private static _icons = new Map<number, { light: URI, dark: URI }>();
+
+	private static updateStyleElement(
+		id: number,
+		iconPath: { light: URI, dark: URI } | undefined
+	) {
+		if (!this._styleElement) {
+			this._styleElement = dom.createStyleSheet();
+			this._styleElement.className = 'webview-icons';
+		}
+
+		if (!iconPath) {
+			this._icons.delete(id);
+		} else {
+			this._icons.set(id, iconPath);
+		}
+
+		const cssRules: string[] = [];
+		this._icons.forEach((value, key) => {
+			const webviewSelector = `.show-file-icons .webview-${key}-name-file-icon::before`;
+			if (URI.isUri(value)) {
+				cssRules.push(`${webviewSelector} { content: ""; background-image: url(${value.toString()}); }`);
+			} else {
+				cssRules.push(`${webviewSelector} { content: ""; background-image: url(${value.light.toString()}); }`);
+				cssRules.push(`.vs-dark ${webviewSelector} { content: ""; background-image: url(${value.dark.toString()}); }`);
+			}
+		});
+		this._styleElement.innerHTML = cssRules.join('\n');
+	}
+
 	public static readonly typeId = 'workbench.editors.webviewInput';
 
 	private _name: string;
+	private _iconPath?: { light: URI, dark: URI };
 	private _options: WebviewInputOptions;
 	private _html: string = '';
 	private _currentWebviewHtml: string = '';
@@ -30,14 +65,15 @@ export class WebviewEditorInput extends EditorInput {
 	private _group?: GroupIdentifier;
 	private _scrollYPercentage: number = 0;
 	private _state: any;
-	private _webviewState: string | undefined;
 
 	private _revived: boolean = false;
 
 	public readonly extensionLocation: URI | undefined;
+	private readonly _id: number;
 
 	constructor(
 		public readonly viewType: string,
+		id: number | undefined,
 		name: string,
 		options: WebviewInputOptions,
 		state: any,
@@ -47,6 +83,14 @@ export class WebviewEditorInput extends EditorInput {
 		@IPartService private readonly _partService: IPartService,
 	) {
 		super();
+
+		if (typeof id === 'number') {
+			this._id = id;
+			WebviewEditorInput.handlePool = Math.max(id, WebviewEditorInput.handlePool) + 1;
+		} else {
+			this._id = WebviewEditorInput.handlePool++;
+		}
+
 		this._name = name;
 		this._options = options;
 		this._events = events;
@@ -58,6 +102,13 @@ export class WebviewEditorInput extends EditorInput {
 		return WebviewEditorInput.typeId;
 	}
 
+	public getId(): number {
+		return this._id;
+	}
+
+	private readonly _onDidChangeIcon = this._register(new Emitter<void>());
+	public readonly onDidChangeIcon = this._onDidChangeIcon.event;
+
 	public dispose() {
 		this.disposeWebview();
 
@@ -71,11 +122,15 @@ export class WebviewEditorInput extends EditorInput {
 		}
 		this._events = undefined;
 
+		this._webview = undefined;
 		super.dispose();
 	}
 
 	public getResource(): URI {
-		return null;
+		return URI.from({
+			scheme: 'webview-panel',
+			path: `webview-panel/webview-${this._id}`
+		});
 	}
 
 	public getName(): string {
@@ -95,8 +150,17 @@ export class WebviewEditorInput extends EditorInput {
 		this._onDidChangeLabel.fire();
 	}
 
-	matches(other: IEditorInput): boolean {
-		return other && other === this;
+	public get iconPath() {
+		return this._iconPath;
+	}
+
+	public set iconPath(value: { light: URI, dark: URI } | undefined) {
+		this._iconPath = value;
+		WebviewEditorInput.updateStyleElement(this._id, value);
+	}
+
+	public matches(other: IEditorInput): boolean {
+		return other === this || (other instanceof WebviewEditorInput && other._id === this._id);
 	}
 
 	public get group(): GroupIdentifier | undefined {
@@ -129,18 +193,31 @@ export class WebviewEditorInput extends EditorInput {
 	}
 
 	public get webviewState() {
-		return this._webviewState;
+		return this._state.state;
 	}
 
 	public get options(): WebviewInputOptions {
 		return this._options;
 	}
 
-	public set options(value: WebviewInputOptions) {
-		this._options = value;
+	public setOptions(value: vscode.WebviewOptions) {
+		this._options = {
+			...this._options,
+			...value
+		};
+
+		if (this._webview) {
+			this._webview.options = {
+				allowScripts: this._options.enableScripts,
+				allowSvgs: true,
+				enableWrappedPostMessage: true,
+				useSameOriginForRoot: false,
+				localResourceRoots: this._options.localResourceRoots
+			};
+		}
 	}
 
-	public resolve(refresh?: boolean): TPromise<IEditorModel, any> {
+	public resolve(): TPromise<IEditorModel> {
 		if (this.reviver && !this._revived) {
 			this._revived = true;
 			return this.reviver.reviveWebview(this).then(() => new EditorModel());
@@ -155,9 +232,8 @@ export class WebviewEditorInput extends EditorInput {
 
 	public get container(): HTMLElement {
 		if (!this._container) {
-			const id = WebviewEditorInput.handlePool++;
 			this._container = document.createElement('div');
-			this._container.id = `webview-${id}`;
+			this._container.id = `webview-${this._id}`;
 			this._partService.getContainer(Parts.EDITOR_PART).appendChild(this._container);
 		}
 		return this._container;
@@ -189,7 +265,7 @@ export class WebviewEditorInput extends EditorInput {
 		}, null, this._webviewDisposables);
 
 		this._webview.onDidUpdateState(newState => {
-			this._webviewState = newState;
+			this._state.state = newState;
 		}, null, this._webviewDisposables);
 	}
 
diff --git a/src/vs/workbench/parts/webview/electron-browser/webviewEditorInputFactory.ts b/src/vs/workbench/parts/webview/electron-browser/webviewEditorInputFactory.ts
index 094c71d62a2..8cc701c66d8 100644
--- a/src/vs/workbench/parts/webview/electron-browser/webviewEditorInputFactory.ts
+++ b/src/vs/workbench/parts/webview/electron-browser/webviewEditorInputFactory.ts
@@ -7,18 +7,16 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti
 import { IEditorInputFactory } from 'vs/workbench/common/editor';
 import { WebviewEditorInput } from './webviewEditorInput';
 import { IWebviewEditorService, WebviewInputOptions } from './webviewEditorService';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 
 interface SerializedWebview {
 	readonly viewType: string;
+	readonly id: number;
 	readonly title: string;
 	readonly options: WebviewInputOptions;
-	/**
-	 * compatibility with previous versions
-	 */
-	readonly extensionFolderPath?: string;
 	readonly extensionLocation: string;
 	readonly state: any;
+	readonly iconPath: { light: string, dark: string } | undefined;
 }
 
 export class WebviewEditorInputFactory implements IEditorInputFactory {
@@ -44,27 +42,23 @@ export class WebviewEditorInputFactory implements IEditorInputFactory {
 
 		const data: SerializedWebview = {
 			viewType: input.viewType,
+			id: input.getId(),
 			title: input.getName(),
 			options: input.options,
 			extensionLocation: input.extensionLocation.toString(),
-			state: input.state
+			state: input.state,
+			iconPath: input.iconPath ? { light: input.iconPath.light.toString(), dark: input.iconPath.dark.toString(), } : undefined,
 		};
 		return JSON.stringify(data);
 	}
 
 	public deserialize(
-		instantiationService: IInstantiationService,
+		_instantiationService: IInstantiationService,
 		serializedEditorInput: string
 	): WebviewEditorInput {
 		const data: SerializedWebview = JSON.parse(serializedEditorInput);
-		let extensionLocation: URI;
-		if (typeof data.extensionLocation === 'string') {
-			extensionLocation = URI.parse(data.extensionLocation);
-		}
-		if (typeof data.extensionFolderPath === 'string') {
-			// compatibility with previous versions
-			extensionLocation = URI.file(data.extensionFolderPath);
-		}
-		return this._webviewService.reviveWebview(data.viewType, data.title, data.state, data.options, extensionLocation);
+		const extensionLocation = URI.parse(data.extensionLocation);
+		const iconPath = data.iconPath ? { light: URI.parse(data.iconPath.light), dark: URI.parse(data.iconPath.dark) } : undefined;
+		return this._webviewService.reviveWebview(data.viewType, data.id, data.title, iconPath, data.state, data.options, extensionLocation);
 	}
 }
diff --git a/src/vs/workbench/parts/webview/electron-browser/webviewEditorService.ts b/src/vs/workbench/parts/webview/electron-browser/webviewEditorService.ts
index 15796fb1219..5824d631de6 100644
--- a/src/vs/workbench/parts/webview/electron-browser/webviewEditorService.ts
+++ b/src/vs/workbench/parts/webview/electron-browser/webviewEditorService.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { IInstantiationService, createDecorator } from 'vs/platform/instantiation/common/instantiation';
 import { IEditorService, ACTIVE_GROUP_TYPE, SIDE_GROUP_TYPE } from 'vs/workbench/services/editor/common/editorService';
@@ -12,6 +12,7 @@ import { IEditorGroupsService, IEditorGroup } from 'vs/workbench/services/group/
 import * as vscode from 'vscode';
 import { WebviewEditorInput } from './webviewEditorInput';
 import { GroupIdentifier } from 'vs/workbench/common/editor';
+import { equals } from 'vs/base/common/arrays';
 
 export const IWebviewEditorService = createDecorator<IWebviewEditorService>('webviewEditorService');
 
@@ -34,7 +35,9 @@ export interface IWebviewEditorService {
 
 	reviveWebview(
 		viewType: string,
+		id: number,
 		title: string,
+		iconPath: { light: URI, dark: URI } | undefined,
 		state: any,
 		options: WebviewInputOptions,
 		extensionLocation: URI
@@ -76,6 +79,15 @@ export interface WebviewInputOptions extends vscode.WebviewOptions, vscode.Webvi
 	tryRestoreScrollPosition?: boolean;
 }
 
+export function areWebviewInputOptionsEqual(a: WebviewInputOptions, b: WebviewInputOptions): boolean {
+	return a.enableCommandUris === b.enableCommandUris
+		&& a.enableFindWidget === b.enableFindWidget
+		&& a.enableScripts === b.enableScripts
+		&& a.retainContextWhenHidden === b.retainContextWhenHidden
+		&& a.tryRestoreScrollPosition === b.tryRestoreScrollPosition
+		&& (a.localResourceRoots === b.localResourceRoots || (Array.isArray(a.localResourceRoots) && Array.isArray(b.localResourceRoots) && equals(a.localResourceRoots, b.localResourceRoots, (a, b) => a.toString() === b.toString())));
+}
+
 export class WebviewEditorService implements IWebviewEditorService {
 	_serviceBrand: any;
 
@@ -96,7 +108,7 @@ export class WebviewEditorService implements IWebviewEditorService {
 		extensionLocation: URI,
 		events: WebviewEvents
 	): WebviewEditorInput {
-		const webviewInput = this._instantiationService.createInstance(WebviewEditorInput, viewType, title, options, {}, events, extensionLocation, undefined);
+		const webviewInput = this._instantiationService.createInstance(WebviewEditorInput, viewType, undefined, title, options, {}, events, extensionLocation, undefined);
 		this._editorService.openEditor(webviewInput, { pinned: true, preserveFocus: showOptions.preserveFocus }, showOptions.group);
 		return webviewInput;
 	}
@@ -115,28 +127,32 @@ export class WebviewEditorService implements IWebviewEditorService {
 
 	reviveWebview(
 		viewType: string,
+		id: number,
 		title: string,
+		iconPath: { light: URI, dark: URI } | undefined,
 		state: any,
 		options: WebviewInputOptions,
 		extensionLocation: URI
 	): WebviewEditorInput {
-		const webviewInput = this._instantiationService.createInstance(WebviewEditorInput, viewType, title, options, state, {}, extensionLocation, {
+		const webviewInput = this._instantiationService.createInstance(WebviewEditorInput, viewType, id, title, options, state, {}, extensionLocation, {
 			canRevive: (_webview) => {
 				return true;
 			},
-			reviveWebview: async (webview: WebviewEditorInput): TPromise<void> => {
-				const didRevive = await this.tryRevive(webview);
-				if (didRevive) {
-					return;
-				}
-				// A reviver may not be registered yet. Put into queue and resolve promise when we can revive
-				let resolve: (value: void) => void;
-				const promise = new TPromise<void>(r => { resolve = r; });
-				this._awaitingRevival.push({ input: webview, resolve });
-				return promise;
+			reviveWebview: (webview: WebviewEditorInput): TPromise<void> => {
+				return TPromise.wrap(this.tryRevive(webview)).then(didRevive => {
+					if (didRevive) {
+						return TPromise.as(void 0);
+					}
+
+					// A reviver may not be registered yet. Put into queue and resolve promise when we can revive
+					let resolve: (value: void) => void;
+					const promise = new TPromise<void>(r => { resolve = r; });
+					this._awaitingRevival.push({ input: webview, resolve });
+					return promise;
+				});
 			}
 		});
-
+		webviewInput.iconPath = iconPath;
 		return webviewInput;
 	}
 
@@ -173,7 +189,7 @@ export class WebviewEditorService implements IWebviewEditorService {
 
 	private async tryRevive(
 		webview: WebviewEditorInput
-	): TPromise<boolean> {
+	): Promise<boolean> {
 		const revivers = this._revivers.get(webview.viewType);
 		if (!revivers) {
 			return false;
@@ -187,4 +203,4 @@ export class WebviewEditorService implements IWebviewEditorService {
 		}
 		return false;
 	}
-}
\ No newline at end of file
+}
diff --git a/src/vs/workbench/parts/webview/electron-browser/webviewElement.ts b/src/vs/workbench/parts/webview/electron-browser/webviewElement.ts
index 4cc5af9bf5b..898a782901f 100644
--- a/src/vs/workbench/parts/webview/electron-browser/webviewElement.ts
+++ b/src/vs/workbench/parts/webview/electron-browser/webviewElement.ts
@@ -4,19 +4,17 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { addClass, addDisposableListener } from 'vs/base/browser/dom';
-import { Emitter, Event } from 'vs/base/common/event';
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
-import { getMediaMime, guessMimeTypes } from 'vs/base/common/mime';
-import { nativeSep, extname } from 'vs/base/common/paths';
-import { startsWith } from 'vs/base/common/strings';
-import URI from 'vs/base/common/uri';
-import { IContextKey } from 'vs/platform/contextkey/common/contextkey';
+import { Emitter } from 'vs/base/common/event';
+import { Disposable } from 'vs/base/common/lifecycle';
+import { URI } from 'vs/base/common/uri';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { IFileService } from 'vs/platform/files/common/files';
+import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import * as colorRegistry from 'vs/platform/theme/common/colorRegistry';
 import { DARK, ITheme, IThemeService, LIGHT } from 'vs/platform/theme/common/themeService';
+import { registerFileProtocol, WebviewProtocol } from 'vs/workbench/parts/webview/electron-browser/webviewProtocols';
+import { areWebviewInputOptionsEqual } from './webviewEditorService';
 import { WebviewFindWidget } from './webviewFindWidget';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 
 export interface WebviewOptions {
 	readonly allowScripts?: boolean;
@@ -27,10 +25,9 @@ export interface WebviewOptions {
 	readonly localResourceRoots?: ReadonlyArray<URI>;
 }
 
-export class WebviewElement {
-	private readonly _webview: Electron.WebviewTag;
+export class WebviewElement extends Disposable {
+	private _webview: Electron.WebviewTag;
 	private _ready: Promise<this>;
-	private _disposables: IDisposable[] = [];
 
 	private _webviewFindWidget: WebviewFindWidget;
 	private _findStarted: boolean = false;
@@ -39,20 +36,16 @@ export class WebviewElement {
 
 	constructor(
 		private readonly _styleElement: Element,
-		private readonly _contextKey: IContextKey<boolean>,
-		private readonly _findInputContextKey: IContextKey<boolean>,
 		private _options: WebviewOptions,
+		@IInstantiationService instantiationService: IInstantiationService,
 		@IThemeService private readonly _themeService: IThemeService,
 		@IEnvironmentService private readonly _environmentService: IEnvironmentService,
 		@IFileService private readonly _fileService: IFileService,
-		@IInstantiationService private readonly _instantiationService: IInstantiationService,
 	) {
+		super();
 		this._webview = document.createElement('webview');
 		this._webview.setAttribute('partition', this._options.allowSvgs ? 'webview' : `webview${Date.now()}`);
 
-		// disable auxclick events (see https://developers.google.com/web/updates/2016/10/auxclick)
-		this._webview.setAttribute('disableblinkfeatures', 'Auxclick');
-
 		this._webview.setAttribute('disableguestresize', '');
 		this._webview.setAttribute('webpreferences', 'contextIsolation=yes');
 
@@ -65,7 +58,7 @@ export class WebviewElement {
 		this._webview.src = this._options.useSameOriginForRoot ? require.toUrl('./webview.html') : 'data:text/html;charset=utf-8,%3C%21DOCTYPE%20html%3E%0D%0A%3Chtml%20lang%3D%22en%22%20style%3D%22width%3A%20100%25%3B%20height%3A%20100%25%22%3E%0D%0A%3Chead%3E%0D%0A%09%3Ctitle%3EVirtual%20Document%3C%2Ftitle%3E%0D%0A%3C%2Fhead%3E%0D%0A%3Cbody%20style%3D%22margin%3A%200%3B%20overflow%3A%20hidden%3B%20width%3A%20100%25%3B%20height%3A%20100%25%22%3E%0D%0A%3C%2Fbody%3E%0D%0A%3C%2Fhtml%3E';
 
 		this._ready = new Promise<this>(resolve => {
-			const subscription = addDisposableListener(this._webview, 'ipc-message', (event) => {
+			const subscription = this._register(addDisposableListener(this._webview, 'ipc-message', (event) => {
 				if (event.channel === 'webview-ready') {
 					// console.info('[PID Webview] ' event.args[0]);
 					addClass(this._webview, 'ready'); // can be found by debug command
@@ -73,12 +66,12 @@ export class WebviewElement {
 					subscription.dispose();
 					resolve(this);
 				}
-			});
+			}));
 		});
 
 		if (!this._options.useSameOriginForRoot) {
 			let loaded = false;
-			this._disposables.push(addDisposableListener(this._webview, 'did-start-loading', () => {
+			this._register(addDisposableListener(this._webview, 'did-start-loading', () => {
 				if (loaded) {
 					return;
 				}
@@ -91,7 +84,7 @@ export class WebviewElement {
 
 		if (!this._options.allowSvgs) {
 			let loaded = false;
-			this._disposables.push(addDisposableListener(this._webview, 'did-start-loading', () => {
+			this._register(addDisposableListener(this._webview, 'did-start-loading', () => {
 				if (loaded) {
 					return;
 				}
@@ -127,72 +120,59 @@ export class WebviewElement {
 			}));
 		}
 
-		this._disposables.push(
-			addDisposableListener(this._webview, 'console-message', function (e: { level: number; message: string; line: number; sourceId: string; }) {
-				console.log(`[Embedded Page] ${e.message}`);
-			}),
-			addDisposableListener(this._webview, 'dom-ready', () => {
-				this.layout();
-			}),
-			addDisposableListener(this._webview, 'crashed', () => {
-				console.error('embedded page crashed');
-			}),
-			addDisposableListener(this._webview, 'ipc-message', (event) => {
-				switch (event.channel) {
-					case 'onmessage':
-						if (this._options.enableWrappedPostMessage && event.args && event.args.length) {
-							this._onMessage.fire(event.args[0]);
-						}
-						return;
+		this._register(addDisposableListener(this._webview, 'console-message', function (e: { level: number; message: string; line: number; sourceId: string; }) {
+			console.log(`[Embedded Page] ${e.message}`);
+		}));
+		this._register(addDisposableListener(this._webview, 'dom-ready', () => {
+			this.layout();
+		}));
+		this._register(addDisposableListener(this._webview, 'crashed', () => {
+			console.error('embedded page crashed');
+		}));
+		this._register(addDisposableListener(this._webview, 'ipc-message', (event) => {
+			switch (event.channel) {
+				case 'onmessage':
+					if (this._options.enableWrappedPostMessage && event.args && event.args.length) {
+						this._onMessage.fire(event.args[0]);
+					}
+					return;
 
-					case 'did-click-link':
-						let [uri] = event.args;
-						this._onDidClickLink.fire(URI.parse(uri));
-						return;
+				case 'did-click-link':
+					let [uri] = event.args;
+					this._onDidClickLink.fire(URI.parse(uri));
+					return;
 
-					case 'did-set-content':
-						this._webview.style.flex = '';
-						this._webview.style.width = '100%';
-						this._webview.style.height = '100%';
-						this.layout();
-						return;
+				case 'did-set-content':
+					this._webview.style.flex = '';
+					this._webview.style.width = '100%';
+					this._webview.style.height = '100%';
+					this.layout();
+					return;
 
-					case 'did-scroll':
-						if (event.args && typeof event.args[0] === 'number') {
-							this._onDidScroll.fire({ scrollYPercentage: event.args[0] });
-						}
-						return;
+				case 'did-scroll':
+					if (event.args && typeof event.args[0] === 'number') {
+						this._onDidScroll.fire({ scrollYPercentage: event.args[0] });
+					}
+					return;
 
-					case 'do-reload':
-						this.reload();
-						return;
+				case 'do-reload':
+					this.reload();
+					return;
 
-					case 'do-update-state':
-						this._state = event.args[0];
-						this._onDidUpdateState.fire(this._state);
-						return;
-				}
-			}),
-			addDisposableListener(this._webview, 'focus', () => {
-				if (this._contextKey) {
-					this._contextKey.set(true);
-				}
-			}),
-			addDisposableListener(this._webview, 'blur', () => {
-				if (this._contextKey) {
-					this._contextKey.reset();
-				}
-			}),
-			addDisposableListener(this._webview, 'devtools-opened', () => {
-				this._send('devtools-opened');
-			}),
-		);
+				case 'do-update-state':
+					this._state = event.args[0];
+					this._onDidUpdateState.fire(this._state);
+					return;
+			}
+		}));
+		this._register(addDisposableListener(this._webview, 'devtools-opened', () => {
+			this._send('devtools-opened');
+		}));
 
-		this._webviewFindWidget = this._instantiationService.createInstance(WebviewFindWidget, this);
-		this._disposables.push(this._webviewFindWidget);
+		this._webviewFindWidget = this._register(instantiationService.createInstance(WebviewFindWidget, this));
 
 		this.style(this._themeService.getTheme());
-		this._themeService.onThemeChange(this.style, this, this._disposables);
+		this._register(this._themeService.onThemeChange(this.style, this));
 	}
 
 	public mountTo(parent: HTMLElement) {
@@ -200,40 +180,31 @@ export class WebviewElement {
 		parent.appendChild(this._webview);
 	}
 
-	public notifyFindWidgetFocusChanged(isFocused: boolean) {
-		this._contextKey.set(isFocused || document.activeElement === this._webview);
-	}
-
-	public notifyFindWidgetInputFocusChanged(isFocused: boolean) {
-		this._findInputContextKey.set(isFocused);
-	}
-
 	dispose(): void {
-		this._onDidClickLink.dispose();
-		this._disposables = dispose(this._disposables);
+		if (this._webview) {
+			this._webview.guestinstance = 'none';
 
-		if (this._contextKey) {
-			this._contextKey.reset();
+			if (this._webview.parentElement) {
+				this._webview.parentElement.removeChild(this._webview);
+			}
 		}
 
-		if (this._webview.parentElement) {
-			this._webview.parentElement.removeChild(this._webview);
-		}
-
-		this._webviewFindWidget.dispose();
+		this._webview = undefined;
+		this._webviewFindWidget = undefined;
+		super.dispose();
 	}
 
-	private readonly _onDidClickLink = new Emitter<URI>();
-	public readonly onDidClickLink: Event<URI> = this._onDidClickLink.event;
+	private readonly _onDidClickLink = this._register(new Emitter<URI>());
+	public readonly onDidClickLink = this._onDidClickLink.event;
 
-	private readonly _onDidScroll = new Emitter<{ scrollYPercentage: number }>();
-	public readonly onDidScroll: Event<{ scrollYPercentage: number }> = this._onDidScroll.event;
+	private readonly _onDidScroll = this._register(new Emitter<{ scrollYPercentage: number }>());
+	public readonly onDidScroll = this._onDidScroll.event;
 
-	private readonly _onDidUpdateState = new Emitter<string | undefined>();
-	public readonly onDidUpdateState: Event<string | undefined> = this._onDidUpdateState.event;
+	private readonly _onDidUpdateState = this._register(new Emitter<string | undefined>());
+	public readonly onDidUpdateState = this._onDidUpdateState.event;
 
-	private readonly _onMessage = new Emitter<any>();
-	public readonly onMessage: Event<any> = this._onMessage.event;
+	private readonly _onMessage = this._register(new Emitter<any>());
+	public readonly onMessage = this._onMessage.event;
 
 	private _send(channel: string, ...args: any[]): void {
 		this._ready
@@ -250,7 +221,16 @@ export class WebviewElement {
 	}
 
 	public set options(value: WebviewOptions) {
+		if (this._options && areWebviewInputOptionsEqual(value, this._options)) {
+			return;
+		}
+
 		this._options = value;
+		this._send('content', {
+			contents: this._contents,
+			options: this._options,
+			state: this._state
+		});
 	}
 
 	public set contents(value: string) {
@@ -262,6 +242,16 @@ export class WebviewElement {
 		});
 	}
 
+	public update(value: string, options: WebviewOptions) {
+		this._contents = value;
+		this._options = options;
+		this._send('content', {
+			contents: this._contents,
+			options: this._options,
+			state: this._state
+		});
+	}
+
 	public set baseUrl(value: string) {
 		this._send('baseUrl', value);
 	}
@@ -363,11 +353,11 @@ export class WebviewElement {
 
 		const appRootUri = URI.file(this._environmentService.appRoot);
 
-		registerFileProtocol(contents, 'vscode-core-resource', this._fileService, () => [
+		registerFileProtocol(contents, WebviewProtocol.CoreResource, this._fileService, () => [
 			appRootUri
 		]);
 
-		registerFileProtocol(contents, 'vscode-resource', this._fileService, () =>
+		registerFileProtocol(contents, WebviewProtocol.VsCodeResource, this._fileService, () =>
 			(this._options.localResourceRoots || [])
 		);
 	}
@@ -427,17 +417,13 @@ export class WebviewElement {
 		this._webviewFindWidget.hide();
 	}
 
-	public showNextFindTerm() {
-		this._webviewFindWidget.showNextFindTerm();
-	}
-
-	public showPreviousFindTerm() {
-		this._webviewFindWidget.showPreviousFindTerm();
-	}
-
 	public reload() {
 		this.contents = this._contents;
 	}
+
+	public selectAll() {
+		this._webview.selectAll();
+	}
 }
 
 
@@ -458,44 +444,3 @@ namespace ApiThemeClassName {
 		}
 	}
 }
-
-function registerFileProtocol(
-	contents: Electron.WebContents,
-	protocol: string,
-	fileService: IFileService,
-	getRoots: () => ReadonlyArray<URI>
-) {
-	contents.session.protocol.registerBufferProtocol(protocol, (request, callback: any) => {
-		const requestPath = URI.parse(request.url).path;
-		const normalizedPath = URI.file(requestPath);
-		for (const root of getRoots()) {
-			if (startsWith(normalizedPath.fsPath, root.fsPath + nativeSep)) {
-				fileService.resolveContent(normalizedPath, { encoding: 'binary' }).then(contents => {
-					const mime = getMimeType(normalizedPath);
-					callback({
-						data: Buffer.from(contents.value, contents.encoding),
-						mimeType: mime
-					});
-				}, () => {
-					callback({ error: -2 /* FAILED: https://cs.chromium.org/chromium/src/net/base/net_error_list.h */ });
-				});
-				return;
-			}
-		}
-		console.error('Webview: Cannot load resource outside of protocol root');
-		callback({ error: -10 /* ACCESS_DENIED: https://cs.chromium.org/chromium/src/net/base/net_error_list.h */ });
-	}, (error) => {
-		if (error) {
-			console.error('Failed to register protocol ' + protocol);
-		}
-	});
-}
-
-const webviewMimeTypes = {
-	'.svg': 'image/svg+xml'
-};
-
-function getMimeType(normalizedPath: URI) {
-	const ext = extname(normalizedPath.fsPath).toLowerCase();
-	return webviewMimeTypes[ext] || getMediaMime(normalizedPath.fsPath) || guessMimeTypes(normalizedPath.fsPath)[0];
-}
diff --git a/src/vs/workbench/parts/webview/electron-browser/webviewFindWidget.ts b/src/vs/workbench/parts/webview/electron-browser/webviewFindWidget.ts
index 53ac36126e8..3c881b1ba09 100644
--- a/src/vs/workbench/parts/webview/electron-browser/webviewFindWidget.ts
+++ b/src/vs/workbench/parts/webview/electron-browser/webviewFindWidget.ts
@@ -7,58 +7,49 @@ import { SimpleFindWidget } from 'vs/editor/contrib/find/simpleFindWidget';
 import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
 import { WebviewElement } from './webviewElement';
 import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { IStorageService } from 'vs/platform/storage/common/storage';
 
 export class WebviewFindWidget extends SimpleFindWidget {
 
 	constructor(
-		private readonly webview: WebviewElement,
+		private _webview: WebviewElement,
 		@IContextViewService contextViewService: IContextViewService,
-		@IContextKeyService contextKeyService: IContextKeyService,
-		@IKeybindingService keybindingService: IKeybindingService,
-		@INotificationService notificationService: INotificationService,
-		@IStorageService storageService: IStorageService
+		@IContextKeyService contextKeyService: IContextKeyService
 	) {
-		super(contextViewService, contextKeyService, keybindingService, notificationService, storageService);
+		super(contextViewService, contextKeyService);
+	}
+
+	dispose() {
+		this._webview = undefined;
+		super.dispose();
 	}
 
 	public find(previous: boolean) {
 		const val = this.inputValue;
 		if (val) {
-			this.webview.find(val, { findNext: true, forward: !previous });
+			this._webview.find(val, { findNext: true, forward: !previous });
 		}
 	}
 
 	public hide() {
 		super.hide();
-		this.webview.stopFind(true);
-		this.webview.focus();
+		this._webview.stopFind(true);
+		this._webview.focus();
 	}
 
 	public onInputChanged() {
 		const val = this.inputValue;
 		if (val) {
-			this.webview.startFind(val);
+			this._webview.startFind(val);
 		} else {
-			this.webview.stopFind(false);
+			this._webview.stopFind(false);
 		}
 	}
 
-	protected onFocusTrackerFocus() {
-		this.webview.notifyFindWidgetFocusChanged(true);
-	}
+	protected onFocusTrackerFocus() { }
 
-	protected onFocusTrackerBlur() {
-		this.webview.notifyFindWidgetFocusChanged(false);
-	}
+	protected onFocusTrackerBlur() { }
 
-	protected onFindInputFocusTrackerFocus() {
-		this.webview.notifyFindWidgetInputFocusChanged(true);
-	}
+	protected onFindInputFocusTrackerFocus() { }
 
-	protected onFindInputFocusTrackerBlur() {
-		this.webview.notifyFindWidgetInputFocusChanged(false);
-	}
+	protected onFindInputFocusTrackerBlur() { }
 }
\ No newline at end of file
diff --git a/src/vs/workbench/parts/webview/electron-browser/webviewProtocols.ts b/src/vs/workbench/parts/webview/electron-browser/webviewProtocols.ts
new file mode 100644
index 00000000000..5b2fadb82f9
--- /dev/null
+++ b/src/vs/workbench/parts/webview/electron-browser/webviewProtocols.ts
@@ -0,0 +1,56 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+import { extname } from 'path';
+import { getMediaMime, guessMimeTypes } from 'vs/base/common/mime';
+import { nativeSep } from 'vs/base/common/paths';
+import { startsWith } from 'vs/base/common/strings';
+import { URI } from 'vs/base/common/uri';
+import { IFileService } from 'vs/platform/files/common/files';
+
+export const enum WebviewProtocol {
+	CoreResource = 'vscode-core-resource',
+	VsCodeResource = 'vscode-resource'
+}
+
+export function registerFileProtocol(
+	contents: Electron.WebContents,
+	protocol: WebviewProtocol,
+	fileService: IFileService,
+	getRoots: () => ReadonlyArray<URI>
+) {
+	contents.session.protocol.registerBufferProtocol(protocol, (request, callback: any) => {
+		const requestPath = URI.parse(request.url).path;
+		const normalizedPath = URI.file(requestPath);
+		for (const root of getRoots()) {
+			if (startsWith(normalizedPath.fsPath, root.fsPath + nativeSep)) {
+				fileService.resolveContent(normalizedPath, { encoding: 'binary' }).then(contents => {
+					const mime = getMimeType(normalizedPath);
+					callback({
+						data: Buffer.from(contents.value, contents.encoding),
+						mimeType: mime
+					});
+				}, () => {
+					callback({ error: -2 /* FAILED: https://cs.chromium.org/chromium/src/net/base/net_error_list.h */ });
+				});
+				return;
+			}
+		}
+		console.error('Webview: Cannot load resource outside of protocol root');
+		callback({ error: -10 /* ACCESS_DENIED: https://cs.chromium.org/chromium/src/net/base/net_error_list.h */ });
+	}, (error) => {
+		if (error) {
+			console.error('Failed to register protocol ' + protocol);
+		}
+	});
+}
+
+const webviewMimeTypes = {
+	'.svg': 'image/svg+xml'
+};
+
+function getMimeType(normalizedPath: URI) {
+	const ext = extname(normalizedPath.fsPath).toLowerCase();
+	return webviewMimeTypes[ext] || getMediaMime(normalizedPath.fsPath) || guessMimeTypes(normalizedPath.fsPath)[0];
+}
diff --git a/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.ts b/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.ts
index 49a9d309bbf..40f1d056f1e 100644
--- a/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.ts
+++ b/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.ts
@@ -10,49 +10,136 @@ import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import product from 'vs/platform/node/product';
 import { IOpenerService } from 'vs/platform/opener/common/opener';
 import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { localize } from 'vs/nls';
 import { onUnexpectedError } from 'vs/base/common/errors';
 import { IWindowService, IWindowsService } from 'vs/platform/windows/common/windows';
+import { IExperimentService, ExperimentState } from 'vs/workbench/parts/experiments/node/experimentService';
+import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { language, locale } from 'vs/base/common/platform';
+import { TPromise } from 'vs/base/common/winjs.base';
+import { IExtensionGalleryService } from 'vs/platform/extensionManagement/common/extensionManagement';
 
 export class TelemetryOptOut implements IWorkbenchContribution {
 
 	private static TELEMETRY_OPT_OUT_SHOWN = 'workbench.telemetryOptOutShown';
+	private privacyUrl: string;
+	private optOutUrl: string;
 
 	constructor(
 		@IStorageService storageService: IStorageService,
 		@IOpenerService openerService: IOpenerService,
-		@INotificationService notificationService: INotificationService,
+		@INotificationService private notificationService: INotificationService,
 		@IWindowService windowService: IWindowService,
 		@IWindowsService windowsService: IWindowsService,
-		@ITelemetryService telemetryService: ITelemetryService
+		@ITelemetryService private telemetryService: ITelemetryService,
+		@IExperimentService private experimentService: IExperimentService,
+		@IConfigurationService private configurationService: IConfigurationService,
+		@IExtensionGalleryService private galleryService: IExtensionGalleryService
 	) {
 		if (!product.telemetryOptOutUrl || storageService.get(TelemetryOptOut.TELEMETRY_OPT_OUT_SHOWN)) {
 			return;
 		}
+		const experimentId = 'telemetryOptOut';
 		Promise.all([
 			windowService.isFocused(),
-			windowsService.getWindowCount()
-		]).then(([focused, count]) => {
+			windowsService.getWindowCount(),
+			experimentService.getExperimentById(experimentId)
+		]).then(([focused, count, experimentState]) => {
 			if (!focused && count > 1) {
 				return null;
 			}
 			storageService.store(TelemetryOptOut.TELEMETRY_OPT_OUT_SHOWN, true);
 
-			const optOutUrl = product.telemetryOptOutUrl;
-			const privacyUrl = product.privacyStatementUrl || product.telemetryOptOutUrl;
-			const optOutNotice = localize('telemetryOptOut.optOutNotice', "Help improve VS Code by allowing Microsoft to collect usage data. Read our [privacy statement]({0}) and learn how to [opt out]({1}).", privacyUrl, optOutUrl);
-			const optInNotice = localize('telemetryOptOut.optInNotice', "Help improve VS Code by allowing Microsoft to collect usage data. Read our [privacy statement]({0}) and learn how to [opt in]({1}).", privacyUrl, optOutUrl);
+			this.optOutUrl = product.telemetryOptOutUrl;
+			this.privacyUrl = product.privacyStatementUrl || product.telemetryOptOutUrl;
+
+			if (experimentState && experimentState.state === ExperimentState.Run && telemetryService.isOptedIn) {
+				this.runExperiment(experimentId);
+				return;
+			}
+
+			const optOutNotice = localize('telemetryOptOut.optOutNotice', "Help improve VS Code by allowing Microsoft to collect usage data. Read our [privacy statement]({0}) and learn how to [opt out]({1}).", this.privacyUrl, this.optOutUrl);
+			const optInNotice = localize('telemetryOptOut.optInNotice', "Help improve VS Code by allowing Microsoft to collect usage data. Read our [privacy statement]({0}) and learn how to [opt in]({1}).", this.privacyUrl, this.optOutUrl);
 
 			notificationService.prompt(
 				Severity.Info,
 				telemetryService.isOptedIn ? optOutNotice : optInNotice,
 				[{
 					label: localize('telemetryOptOut.readMore', "Read More"),
-					run: () => openerService.open(URI.parse(optOutUrl))
+					run: () => openerService.open(URI.parse(this.optOutUrl))
 				}]
 			);
 		})
 			.then(null, onUnexpectedError);
 	}
+
+	private runExperiment(experimentId: string) {
+		const promptMessageKey = 'telemetryOptOut.optOutOption';
+		const yesLabelKey = 'telemetryOptOut.OptIn';
+		const noLabelKey = 'telemetryOptOut.OptOut';
+
+		let promptMessage = localize('telemetryOptOut.optOutOption', "Please help Microsoft improve Visual Studio Code by allowing the collection of usage data. Read our [privacy statement]({0}) for more details.", this.privacyUrl);
+		let yesLabel = localize('telemetryOptOut.OptIn', "Yes, glad to help");
+		let noLabel = localize('telemetryOptOut.OptOut', "No, thanks");
+
+		let queryPromise = TPromise.as(undefined);
+		if ((locale !== language && locale !== 'en' && locale.indexOf('en-') === -1)) {
+			queryPromise = this.galleryService.query({ text: `tag:lp-${locale}` }).then(tagResult => {
+				if (!tagResult || !tagResult.total) {
+					return undefined;
+				}
+				const extensionToFetchTranslationsFrom = tagResult.firstPage.filter(e => e.publisher === 'MS-CEINTL' && e.name.indexOf('vscode-language-pack') === 0)[0] || tagResult.firstPage[0];
+				if (!extensionToFetchTranslationsFrom.assets || !extensionToFetchTranslationsFrom.assets.coreTranslations) {
+					return undefined;
+				}
+
+				return this.galleryService.getCoreTranslation(extensionToFetchTranslationsFrom, locale)
+					.then(translation => {
+						const translationsFromPack = translation && translation.contents ? translation.contents['vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut'] : {};
+						if (!!translationsFromPack[promptMessageKey] && !!translationsFromPack[yesLabelKey] && !!translationsFromPack[noLabelKey]) {
+							promptMessage = translationsFromPack[promptMessageKey].replace('{0}', this.privacyUrl) + ' (Please help Microsoft improve Visual Studio Code by allowing the collection of usage data.)';
+							yesLabel = translationsFromPack[yesLabelKey] + ' (Yes)';
+							noLabel = translationsFromPack[noLabelKey] + ' (No)';
+						}
+						return undefined;
+					});
+
+			});
+		}
+
+		const logTelemetry = (optout?: boolean) => {
+			/* __GDPR__
+				"experiments:optout" : {
+					"optOut": { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true }
+				}
+			*/
+			this.telemetryService.publicLog('experiments:optout', typeof optout === 'boolean' ? { optout } : {});
+		};
+
+		queryPromise.then(() => {
+			this.notificationService.prompt(
+				Severity.Info,
+				promptMessage,
+				[
+					{
+						label: yesLabel,
+						run: () => {
+							logTelemetry(false);
+						}
+					},
+					{
+						label: noLabel,
+						run: () => {
+							logTelemetry(true);
+							this.configurationService.updateValue('telemetry.enableTelemetry', false);
+							this.configurationService.updateValue('telemetry.enableCrashReporter', false);
+						}
+					}
+				],
+				logTelemetry
+			);
+			this.experimentService.markAsCompleted(experimentId);
+		});
+	}
 }
diff --git a/src/vs/workbench/parts/welcome/overlay/browser/media/commandpalette.svg b/src/vs/workbench/parts/welcome/overlay/browser/media/commandpalette.svg
index 56e91eb8410..5d4d668d107 100644
--- a/src/vs/workbench/parts/welcome/overlay/browser/media/commandpalette.svg
+++ b/src/vs/workbench/parts/welcome/overlay/browser/media/commandpalette.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 386 197"><defs><style>.cls-1{fill:#f6f6f6;}.cls-2,.cls-6{fill:#fff;}.cls-2{stroke:#94c5e6;}.cls-2,.cls-4{stroke-miterlimit:10;}.cls-3{fill:#6c6c6c;}.cls-4{fill:none;stroke:#6c6c6c;}.cls-5{fill:#dcebfc;}.cls-6{opacity:0.52;}</style></defs><title>Asset 9</title><g id="Layer_2" data-name="Layer 2"><g id="Layer_1-2" data-name="Layer 1"><rect class="cls-1" width="386" height="197"/><rect class="cls-2" x="5.25" y="8" width="374" height="23"/><path class="cls-3" d="M17.22,21.27l-7.14,3.59V23.62L15.42,21v0l-5.35-3V16.78l7.14,4Z"/><line class="cls-4" x1="18.75" y1="12" x2="18.75" y2="28"/><rect class="cls-5" y="38.5" width="385.75" height="20.5"/><path class="cls-3" d="M17.65,53.69a5.34,5.34,0,0,1-2.51.53A4.06,4.06,0,0,1,12,53a4.61,4.61,0,0,1-1.17-3.28,4.83,4.83,0,0,1,1.31-3.53,4.46,4.46,0,0,1,3.33-1.35,5.36,5.36,0,0,1,2.15.37v1.14a4.35,4.35,0,0,0-2.16-.55,3.31,3.31,0,0,0-2.54,1,3.94,3.94,0,0,0-1,2.8,3.76,3.76,0,0,0,.91,2.65,3.1,3.1,0,0,0,2.39,1,4.48,4.48,0,0,0,2.37-.61Z"/><path class="cls-3" d="M24.76,54.07h-1V50.33q0-2-1.51-2a1.65,1.65,0,0,0-1.28.59,2.19,2.19,0,0,0-.52,1.51v3.68h-1V44.45h1v4.2h0a2.36,2.36,0,0,1,2.13-1.23q2.2,0,2.2,2.65Z"/><path class="cls-3" d="M31.37,54.07h-1v-1h0a2.18,2.18,0,0,1-2,1.17,2.14,2.14,0,0,1-1.52-.51,1.78,1.78,0,0,1-.55-1.37q0-1.82,2.14-2.12L30.33,50q0-1.66-1.34-1.66a3.2,3.2,0,0,0-2.12.8V48a4,4,0,0,1,2.21-.61q2.29,0,2.29,2.42Zm-1-3.29L28.76,51a2.55,2.55,0,0,0-1.09.36,1,1,0,0,0-.37.91,1,1,0,0,0,.34.78,1.31,1.31,0,0,0,.9.3,1.67,1.67,0,0,0,1.28-.54,1.94,1.94,0,0,0,.5-1.37Z"/><path class="cls-3" d="M38.73,54.07h-1V50.37q0-2.07-1.51-2.07a1.64,1.64,0,0,0-1.29.59,2.18,2.18,0,0,0-.51,1.48v3.71h-1v-6.5h1v1.08h0a2.35,2.35,0,0,1,2.13-1.23,2,2,0,0,1,1.63.69,3.07,3.07,0,0,1,.57,2Z"/><path class="cls-3" d="M46.24,53.55q0,3.58-3.43,3.58a4.6,4.6,0,0,1-2.11-.46v-1a4.33,4.33,0,0,0,2.09.61q2.4,0,2.4-2.55V53h0a2.63,2.63,0,0,1-4.19.38A3.47,3.47,0,0,1,40.25,51,4,4,0,0,1,41,48.4a2.66,2.66,0,0,1,2.18-1,2.12,2.12,0,0,1,1.95,1.05h0v-.9h1Zm-1-2.42v-1a1.86,1.86,0,0,0-.52-1.33,1.73,1.73,0,0,0-1.3-.55,1.81,1.81,0,0,0-1.51.7,3.14,3.14,0,0,0-.55,2,2.69,2.69,0,0,0,.52,1.74,1.69,1.69,0,0,0,1.39.65,1.81,1.81,0,0,0,1.42-.62A2.32,2.32,0,0,0,45.2,51.13Z"/><path class="cls-3" d="M53.57,51.08H49a2.43,2.43,0,0,0,.58,1.68,2,2,0,0,0,1.54.59,3.19,3.19,0,0,0,2-.72v1a3.77,3.77,0,0,1-2.27.62,2.75,2.75,0,0,1-2.16-.89,3.62,3.62,0,0,1-.79-2.49,3.55,3.55,0,0,1,.86-2.47,2.76,2.76,0,0,1,2.14-1,2.45,2.45,0,0,1,2,.83,3.44,3.44,0,0,1,.7,2.29ZM52.5,50.2a2.12,2.12,0,0,0-.43-1.4,1.48,1.48,0,0,0-1.19-.5,1.68,1.68,0,0,0-1.25.53A2.39,2.39,0,0,0,49,50.2Z"/><path class="cls-3" d="M63.67,54.07H58.84V45h4.62v1H59.91v3H63.2v1H59.91v3.19h3.76Z"/><path class="cls-3" d="M70.68,54.07h-1V50.37q0-2.07-1.51-2.07a1.64,1.64,0,0,0-1.29.59,2.18,2.18,0,0,0-.51,1.48v3.71h-1v-6.5h1v1.08h0a2.35,2.35,0,0,1,2.13-1.23,2,2,0,0,1,1.63.69,3.07,3.07,0,0,1,.56,2Z"/><path class="cls-3" d="M78.19,54.07h-1V53h0a2.62,2.62,0,0,1-4.19.38A3.58,3.58,0,0,1,72.19,51,3.9,3.9,0,0,1,73,48.39a2.68,2.68,0,0,1,2.16-1,2.09,2.09,0,0,1,1.95,1.05h0v-4h1Zm-1-2.94v-1a1.86,1.86,0,0,0-.52-1.33,1.74,1.74,0,0,0-1.32-.55,1.8,1.8,0,0,0-1.5.7,3.06,3.06,0,0,0-.54,1.93,2.75,2.75,0,0,0,.52,1.77,1.71,1.71,0,0,0,1.41.65,1.78,1.78,0,0,0,1.41-.63A2.35,2.35,0,0,0,77.14,51.13Z"/><path class="cls-3" d="M86.57,54.23a3,3,0,0,1-2.3-.91,3.37,3.37,0,0,1-.86-2.42,3.51,3.51,0,0,1,.9-2.56,3.22,3.22,0,0,1,2.42-.92,2.92,2.92,0,0,1,2.27.89,3.56,3.56,0,0,1,.82,2.48,3.49,3.49,0,0,1-.88,2.49A3.08,3.08,0,0,1,86.57,54.23Zm.08-5.93a2,2,0,0,0-1.59.68,2.8,2.8,0,0,0-.58,1.88,2.64,2.64,0,0,0,.59,1.82,2,2,0,0,0,1.58.67,1.9,1.9,0,0,0,1.55-.65,2.84,2.84,0,0,0,.54-1.86A2.88,2.88,0,0,0,88.2,49,1.89,1.89,0,0,0,86.65,48.3Z"/><path class="cls-3" d="M94.45,45.37a1.39,1.39,0,0,0-.69-.17q-1.09,0-1.09,1.38v1h1.52v.89H92.66v5.61h-1V48.46H90.52v-.89h1.11V46.52a2.19,2.19,0,0,1,.59-1.62,2,2,0,0,1,1.47-.59,2,2,0,0,1,.75.11Z"/><path class="cls-3" d="M103.73,54.07H99V45h1.07v8.14h3.66Z"/><path class="cls-3" d="M105.52,45.92a.66.66,0,0,1-.48-.19.64.64,0,0,1-.2-.48.67.67,0,0,1,.67-.68.67.67,0,0,1,.49.19.68.68,0,0,1,0,1A.66.66,0,0,1,105.52,45.92Zm.51,8.15h-1v-6.5h1Z"/><path class="cls-3" d="M113.53,54.07h-1V50.37q0-2.07-1.51-2.07a1.64,1.64,0,0,0-1.29.59,2.18,2.18,0,0,0-.51,1.48v3.71h-1v-6.5h1v1.08h0a2.35,2.35,0,0,1,2.13-1.23,2,2,0,0,1,1.63.69,3.07,3.07,0,0,1,.57,2Z"/><path class="cls-3" d="M120.71,51.08h-4.59a2.43,2.43,0,0,0,.58,1.68,2,2,0,0,0,1.54.59,3.19,3.19,0,0,0,2-.72v1a3.77,3.77,0,0,1-2.27.62,2.75,2.75,0,0,1-2.17-.89,3.63,3.63,0,0,1-.79-2.49,3.55,3.55,0,0,1,.86-2.47,2.76,2.76,0,0,1,2.14-1,2.44,2.44,0,0,1,2,.83,3.44,3.44,0,0,1,.7,2.29Zm-1.07-.88a2.12,2.12,0,0,0-.44-1.4,1.48,1.48,0,0,0-1.19-.5,1.68,1.68,0,0,0-1.25.53,2.4,2.4,0,0,0-.63,1.38Z"/><path class="cls-3" d="M125.56,53.71V52.45a2.45,2.45,0,0,0,.52.34,4.17,4.17,0,0,0,.63.26,5,5,0,0,0,.67.16,3.72,3.72,0,0,0,.62.06,2.44,2.44,0,0,0,1.47-.36,1.37,1.37,0,0,0,.32-1.69,1.82,1.82,0,0,0-.45-.5,4.46,4.46,0,0,0-.68-.43l-.84-.43c-.32-.16-.61-.32-.89-.49a3.85,3.85,0,0,1-.72-.54,2.28,2.28,0,0,1-.48-.68,2.3,2.3,0,0,1,.1-2,2.33,2.33,0,0,1,.72-.76,3.27,3.27,0,0,1,1-.45,4.67,4.67,0,0,1,1.16-.15,4.45,4.45,0,0,1,2,.32v1.2a3.56,3.56,0,0,0-2.07-.56,3.39,3.39,0,0,0-.7.07,2,2,0,0,0-.62.24,1.36,1.36,0,0,0-.44.42,1.13,1.13,0,0,0-.17.63,1.3,1.3,0,0,0,.13.6,1.46,1.46,0,0,0,.38.46,3.8,3.8,0,0,0,.62.41l.84.43q.49.24.93.51a4.22,4.22,0,0,1,.77.59,2.6,2.6,0,0,1,.52.72,2,2,0,0,1,.19.9,2.29,2.29,0,0,1-.26,1.14,2.16,2.16,0,0,1-.71.76,3.1,3.1,0,0,1-1,.42,5.63,5.63,0,0,1-1.23.13l-.53,0c-.21,0-.43-.06-.65-.1a5.16,5.16,0,0,1-.62-.17A1.94,1.94,0,0,1,125.56,53.71Z"/><path class="cls-3" d="M138,51.08h-4.59a2.43,2.43,0,0,0,.58,1.68,2,2,0,0,0,1.54.59,3.19,3.19,0,0,0,2-.72v1a3.77,3.77,0,0,1-2.27.62,2.75,2.75,0,0,1-2.17-.89,3.63,3.63,0,0,1-.79-2.49,3.55,3.55,0,0,1,.86-2.47,2.76,2.76,0,0,1,2.14-1,2.44,2.44,0,0,1,2,.83,3.44,3.44,0,0,1,.7,2.29Zm-1.07-.88a2.12,2.12,0,0,0-.44-1.4,1.48,1.48,0,0,0-1.19-.5,1.68,1.68,0,0,0-1.25.53,2.4,2.4,0,0,0-.63,1.38Z"/><path class="cls-3" d="M145.1,57.06h-1V53h0a2.33,2.33,0,0,1-2.22,1.27,2.44,2.44,0,0,1-2-.87,3.56,3.56,0,0,1-.74-2.38,3.9,3.9,0,0,1,.81-2.59,2.7,2.7,0,0,1,2.18-1A2,2,0,0,1,144,48.48h0v-.9h1Zm-1-5.92V50.2a1.89,1.89,0,0,0-.52-1.35,1.76,1.76,0,0,0-1.33-.55,1.78,1.78,0,0,0-1.48.7,3.1,3.1,0,0,0-.55,2,2.69,2.69,0,0,0,.53,1.76,1.68,1.68,0,0,0,1.36.64,1.83,1.83,0,0,0,1.46-.62A2.31,2.31,0,0,0,144.06,51.15Z"/><path class="cls-3" d="M152.46,54.07h-1V53h0a2.14,2.14,0,0,1-2,1.18q-2.32,0-2.32-2.77V47.57h1v3.72q0,2.06,1.57,2.06a1.59,1.59,0,0,0,1.25-.56,2.15,2.15,0,0,0,.49-1.47V47.57h1Z"/><path class="cls-3" d="M159.79,51.08H155.2a2.43,2.43,0,0,0,.58,1.68,2,2,0,0,0,1.54.59,3.19,3.19,0,0,0,2-.72v1a3.77,3.77,0,0,1-2.27.62,2.75,2.75,0,0,1-2.17-.89,3.63,3.63,0,0,1-.79-2.49,3.55,3.55,0,0,1,.86-2.47,2.76,2.76,0,0,1,2.14-1,2.44,2.44,0,0,1,2,.83,3.44,3.44,0,0,1,.7,2.29Zm-1.07-.88a2.12,2.12,0,0,0-.44-1.4,1.48,1.48,0,0,0-1.19-.5,1.68,1.68,0,0,0-1.25.53,2.4,2.4,0,0,0-.63,1.38Z"/><path class="cls-3" d="M166.76,54.07h-1V50.37q0-2.07-1.51-2.07a1.64,1.64,0,0,0-1.29.59,2.18,2.18,0,0,0-.51,1.48v3.71h-1v-6.5h1v1.08h0a2.34,2.34,0,0,1,2.13-1.23,2,2,0,0,1,1.63.69,3.07,3.07,0,0,1,.56,2Z"/><path class="cls-3" d="M173.15,53.78a3.38,3.38,0,0,1-1.78.45,2.94,2.94,0,0,1-2.24-.9,3.28,3.28,0,0,1-.85-2.35,3.6,3.6,0,0,1,.92-2.58,3.22,3.22,0,0,1,2.46-1,3.42,3.42,0,0,1,1.51.32v1.07a2.65,2.65,0,0,0-1.55-.51A2.09,2.09,0,0,0,170,49a2.71,2.71,0,0,0-.64,1.88,2.58,2.58,0,0,0,.6,1.8,2.07,2.07,0,0,0,1.61.66,2.61,2.61,0,0,0,1.6-.57Z"/><path class="cls-3" d="M180,51.08h-4.59a2.43,2.43,0,0,0,.58,1.68,2,2,0,0,0,1.54.59,3.19,3.19,0,0,0,2-.72v1a3.77,3.77,0,0,1-2.27.62,2.75,2.75,0,0,1-2.17-.89,3.63,3.63,0,0,1-.79-2.49,3.55,3.55,0,0,1,.86-2.47,2.76,2.76,0,0,1,2.14-1,2.44,2.44,0,0,1,2,.83,3.44,3.44,0,0,1,.7,2.29Zm-1.07-.88a2.12,2.12,0,0,0-.44-1.4,1.48,1.48,0,0,0-1.19-.5,1.68,1.68,0,0,0-1.25.53,2.4,2.4,0,0,0-.63,1.38Z"/><path class="cls-3" d="M17.65,75.69a5.34,5.34,0,0,1-2.51.53A4.06,4.06,0,0,1,12,75a4.61,4.61,0,0,1-1.17-3.28,4.83,4.83,0,0,1,1.31-3.53,4.46,4.46,0,0,1,3.33-1.35,5.36,5.36,0,0,1,2.15.37v1.14a4.35,4.35,0,0,0-2.16-.55,3.31,3.31,0,0,0-2.54,1,3.94,3.94,0,0,0-1,2.8,3.76,3.76,0,0,0,.91,2.65,3.1,3.1,0,0,0,2.39,1,4.48,4.48,0,0,0,2.37-.61Z"/><path class="cls-3" d="M24.76,76.07h-1V72.33q0-2-1.51-2a1.65,1.65,0,0,0-1.28.59,2.19,2.19,0,0,0-.52,1.51v3.68h-1V66.45h1v4.2h0a2.36,2.36,0,0,1,2.13-1.23q2.2,0,2.2,2.65Z"/><path class="cls-3" d="M31.37,76.07h-1v-1h0a2.18,2.18,0,0,1-2,1.17,2.14,2.14,0,0,1-1.52-.51,1.78,1.78,0,0,1-.55-1.37q0-1.82,2.14-2.12L30.33,72q0-1.66-1.34-1.66a3.2,3.2,0,0,0-2.12.8V70a4,4,0,0,1,2.21-.61q2.29,0,2.29,2.42Zm-1-3.29L28.76,73a2.55,2.55,0,0,0-1.09.36,1,1,0,0,0-.37.91,1,1,0,0,0,.34.78,1.31,1.31,0,0,0,.9.3,1.67,1.67,0,0,0,1.28-.54,1.94,1.94,0,0,0,.5-1.37Z"/><path class="cls-3" d="M38.73,76.07h-1V72.37q0-2.07-1.51-2.07a1.64,1.64,0,0,0-1.29.59,2.18,2.18,0,0,0-.51,1.48v3.71h-1v-6.5h1v1.08h0a2.35,2.35,0,0,1,2.13-1.23,2,2,0,0,1,1.63.69,3.07,3.07,0,0,1,.57,2Z"/><path class="cls-3" d="M46.24,75.55q0,3.58-3.43,3.58a4.6,4.6,0,0,1-2.11-.46v-1a4.33,4.33,0,0,0,2.09.61q2.4,0,2.4-2.55V75h0a2.63,2.63,0,0,1-4.19.38A3.47,3.47,0,0,1,40.25,73,4,4,0,0,1,41,70.4a2.66,2.66,0,0,1,2.18-1,2.12,2.12,0,0,1,1.95,1.05h0v-.9h1Zm-1-2.42v-1a1.86,1.86,0,0,0-.52-1.33,1.73,1.73,0,0,0-1.3-.55,1.81,1.81,0,0,0-1.51.7,3.14,3.14,0,0,0-.55,2,2.69,2.69,0,0,0,.52,1.74,1.69,1.69,0,0,0,1.39.65,1.81,1.81,0,0,0,1.42-.62A2.32,2.32,0,0,0,45.2,73.13Z"/><path class="cls-3" d="M53.57,73.08H49a2.43,2.43,0,0,0,.58,1.68,2,2,0,0,0,1.54.59,3.19,3.19,0,0,0,2-.72v1a3.77,3.77,0,0,1-2.27.62,2.75,2.75,0,0,1-2.16-.89,3.62,3.62,0,0,1-.79-2.49,3.55,3.55,0,0,1,.86-2.47,2.76,2.76,0,0,1,2.14-1,2.45,2.45,0,0,1,2,.83,3.44,3.44,0,0,1,.7,2.29ZM52.5,72.2a2.12,2.12,0,0,0-.43-1.4,1.48,1.48,0,0,0-1.19-.5,1.68,1.68,0,0,0-1.25.53A2.39,2.39,0,0,0,49,72.2Z"/><path class="cls-3" d="M63.46,67.94H59.91v3.15H63.2v1H59.91v4H58.84V67h4.62Z"/><path class="cls-3" d="M65.58,67.92a.66.66,0,0,1-.48-.19.64.64,0,0,1-.2-.48.67.67,0,0,1,.67-.68.67.67,0,0,1,.49.19.68.68,0,0,1,0,1A.66.66,0,0,1,65.58,67.92Zm.51,8.15h-1v-6.5h1Z"/><path class="cls-3" d="M69.24,76.07h-1V66.45h1Z"/><path class="cls-3" d="M76.57,73.08H72a2.43,2.43,0,0,0,.58,1.68,2,2,0,0,0,1.54.59,3.19,3.19,0,0,0,2-.72v1a3.77,3.77,0,0,1-2.27.62,2.75,2.75,0,0,1-2.16-.89,3.62,3.62,0,0,1-.79-2.49,3.55,3.55,0,0,1,.86-2.47,2.76,2.76,0,0,1,2.14-1,2.45,2.45,0,0,1,2,.83,3.44,3.44,0,0,1,.7,2.29Zm-1.07-.88a2.12,2.12,0,0,0-.43-1.4,1.48,1.48,0,0,0-1.19-.5,1.68,1.68,0,0,0-1.25.53A2.39,2.39,0,0,0,72,72.2Z"/><path class="cls-3" d="M86.67,76.07H81.85V67h4.62v1H82.91v3H86.2v1H82.91v3.19h3.76Z"/><path class="cls-3" d="M93.68,76.07h-1V72.37q0-2.07-1.51-2.07a1.64,1.64,0,0,0-1.29.59,2.18,2.18,0,0,0-.51,1.48v3.71h-1v-6.5h1v1.08h0a2.35,2.35,0,0,1,2.13-1.23,2,2,0,0,1,1.63.69,3.07,3.07,0,0,1,.56,2Z"/><path class="cls-3" d="M100.07,75.78a3.38,3.38,0,0,1-1.78.45,2.94,2.94,0,0,1-2.24-.9A3.28,3.28,0,0,1,95.2,73a3.6,3.6,0,0,1,.92-2.58,3.22,3.22,0,0,1,2.46-1,3.41,3.41,0,0,1,1.51.32v1.07a2.64,2.64,0,0,0-1.55-.51A2.1,2.1,0,0,0,96.9,71a2.72,2.72,0,0,0-.64,1.88,2.58,2.58,0,0,0,.6,1.8,2.07,2.07,0,0,0,1.61.66,2.61,2.61,0,0,0,1.6-.57Z"/><path class="cls-3" d="M104.36,76.23a3,3,0,0,1-2.3-.91,3.37,3.37,0,0,1-.86-2.42,3.52,3.52,0,0,1,.9-2.56,3.22,3.22,0,0,1,2.42-.92,2.92,2.92,0,0,1,2.27.89,3.56,3.56,0,0,1,.81,2.48,3.49,3.49,0,0,1-.88,2.49A3.08,3.08,0,0,1,104.36,76.23Zm.08-5.93a2,2,0,0,0-1.59.68,2.81,2.81,0,0,0-.58,1.88,2.65,2.65,0,0,0,.59,1.82,2,2,0,0,0,1.58.67A1.9,1.9,0,0,0,106,74.7a2.83,2.83,0,0,0,.54-1.86A2.88,2.88,0,0,0,106,71,1.89,1.89,0,0,0,104.44,70.3Z"/><path class="cls-3" d="M114.81,76.07h-1V75h0a2.62,2.62,0,0,1-4.19.38,3.57,3.57,0,0,1-.73-2.38,3.9,3.9,0,0,1,.81-2.58,2.68,2.68,0,0,1,2.17-1,2.08,2.08,0,0,1,1.95,1.05h0v-4h1Zm-1-2.94v-1a1.86,1.86,0,0,0-.52-1.33,1.75,1.75,0,0,0-1.32-.55,1.8,1.8,0,0,0-1.5.7,3.06,3.06,0,0,0-.55,1.93,2.76,2.76,0,0,0,.52,1.77,1.71,1.71,0,0,0,1.41.65,1.78,1.78,0,0,0,1.41-.63A2.34,2.34,0,0,0,113.77,73.13Z"/><path class="cls-3" d="M117.45,67.92a.66.66,0,0,1-.48-.19.64.64,0,0,1-.2-.48.67.67,0,0,1,.67-.68.67.67,0,0,1,.49.19.68.68,0,0,1,0,1A.66.66,0,0,1,117.45,67.92Zm.51,8.15h-1v-6.5h1Z"/><path class="cls-3" d="M125.46,76.07h-1V72.37q0-2.07-1.51-2.07a1.64,1.64,0,0,0-1.29.59,2.18,2.18,0,0,0-.51,1.48v3.71h-1v-6.5h1v1.08h0a2.35,2.35,0,0,1,2.13-1.23,2,2,0,0,1,1.63.69,3.07,3.07,0,0,1,.57,2Z"/><path class="cls-3" d="M133,75.55q0,3.58-3.43,3.58a4.6,4.6,0,0,1-2.11-.46v-1a4.33,4.33,0,0,0,2.09.61q2.4,0,2.4-2.55V75h0a2.63,2.63,0,0,1-4.19.38A3.47,3.47,0,0,1,127,73a4,4,0,0,1,.8-2.63,2.66,2.66,0,0,1,2.18-1,2.12,2.12,0,0,1,1.95,1.05h0v-.9h1Zm-1-2.42v-1a1.86,1.86,0,0,0-.52-1.33,1.73,1.73,0,0,0-1.3-.55,1.81,1.81,0,0,0-1.51.7,3.14,3.14,0,0,0-.55,2,2.69,2.69,0,0,0,.52,1.74,1.69,1.69,0,0,0,1.39.65,1.81,1.81,0,0,0,1.42-.62A2.32,2.32,0,0,0,131.93,73.13Z"/><path class="cls-3" d="M17.65,97.69a5.34,5.34,0,0,1-2.51.53A4.06,4.06,0,0,1,12,97a4.61,4.61,0,0,1-1.17-3.28,4.83,4.83,0,0,1,1.31-3.53,4.46,4.46,0,0,1,3.33-1.35,5.36,5.36,0,0,1,2.15.37v1.14a4.35,4.35,0,0,0-2.16-.55,3.31,3.31,0,0,0-2.54,1,3.94,3.94,0,0,0-1,2.8,3.76,3.76,0,0,0,.91,2.65,3.1,3.1,0,0,0,2.39,1,4.48,4.48,0,0,0,2.37-.61Z"/><path class="cls-3" d="M24.76,98.07h-1V94.33q0-2-1.51-2a1.65,1.65,0,0,0-1.28.59,2.19,2.19,0,0,0-.52,1.51v3.68h-1V88.45h1v4.2h0a2.36,2.36,0,0,1,2.13-1.23q2.2,0,2.2,2.65Z"/><path class="cls-3" d="M31.37,98.07h-1v-1h0a2.18,2.18,0,0,1-2,1.17,2.14,2.14,0,0,1-1.52-.51,1.78,1.78,0,0,1-.55-1.37q0-1.82,2.14-2.12L30.33,94q0-1.66-1.34-1.66a3.2,3.2,0,0,0-2.12.8V92a4,4,0,0,1,2.21-.61q2.29,0,2.29,2.42Zm-1-3.29L28.76,95a2.55,2.55,0,0,0-1.09.36,1,1,0,0,0-.37.91,1,1,0,0,0,.34.78,1.31,1.31,0,0,0,.9.3,1.67,1.67,0,0,0,1.28-.54,1.94,1.94,0,0,0,.5-1.37Z"/><path class="cls-3" d="M38.73,98.07h-1V94.37q0-2.07-1.51-2.07a1.64,1.64,0,0,0-1.29.59,2.18,2.18,0,0,0-.51,1.48v3.71h-1v-6.5h1v1.08h0a2.35,2.35,0,0,1,2.13-1.23,2,2,0,0,1,1.63.69,3.07,3.07,0,0,1,.57,2Z"/><path class="cls-3" d="M46.24,97.55q0,3.58-3.43,3.58a4.6,4.6,0,0,1-2.11-.46v-1a4.33,4.33,0,0,0,2.09.61q2.4,0,2.4-2.55V97h0a2.63,2.63,0,0,1-4.19.38A3.47,3.47,0,0,1,40.25,95,4,4,0,0,1,41,92.4a2.66,2.66,0,0,1,2.18-1,2.12,2.12,0,0,1,1.95,1.05h0v-.9h1Zm-1-2.42v-1a1.86,1.86,0,0,0-.52-1.33,1.73,1.73,0,0,0-1.3-.55,1.81,1.81,0,0,0-1.51.7,3.14,3.14,0,0,0-.55,2,2.69,2.69,0,0,0,.52,1.74,1.69,1.69,0,0,0,1.39.65,1.81,1.81,0,0,0,1.42-.62A2.32,2.32,0,0,0,45.2,95.13Z"/><path class="cls-3" d="M53.57,95.08H49a2.43,2.43,0,0,0,.58,1.68,2,2,0,0,0,1.54.59,3.19,3.19,0,0,0,2-.72v1a3.77,3.77,0,0,1-2.27.62,2.75,2.75,0,0,1-2.16-.89,3.62,3.62,0,0,1-.79-2.49,3.55,3.55,0,0,1,.86-2.47,2.76,2.76,0,0,1,2.14-1,2.45,2.45,0,0,1,2,.83,3.44,3.44,0,0,1,.7,2.29ZM52.5,94.2a2.12,2.12,0,0,0-.43-1.4,1.48,1.48,0,0,0-1.19-.5,1.68,1.68,0,0,0-1.25.53A2.39,2.39,0,0,0,49,94.2Z"/><path class="cls-3" d="M63.57,98.07H58.84V89h1.07v8.14h3.66Z"/><path class="cls-3" d="M69.48,98.07h-1v-1h0a2.18,2.18,0,0,1-2,1.17,2.14,2.14,0,0,1-1.52-.51,1.78,1.78,0,0,1-.55-1.37q0-1.82,2.15-2.12L68.44,94q0-1.66-1.34-1.66a3.2,3.2,0,0,0-2.12.8V92a4,4,0,0,1,2.21-.61q2.29,0,2.29,2.42Zm-1-3.29L66.87,95a2.55,2.55,0,0,0-1.09.36,1,1,0,0,0-.37.91,1,1,0,0,0,.34.78,1.31,1.31,0,0,0,.9.3,1.67,1.67,0,0,0,1.28-.54,1.94,1.94,0,0,0,.5-1.37Z"/><path class="cls-3" d="M76.83,98.07h-1V94.37q0-2.07-1.51-2.07a1.64,1.64,0,0,0-1.29.59,2.18,2.18,0,0,0-.51,1.48v3.71h-1v-6.5h1v1.08h0a2.34,2.34,0,0,1,2.13-1.23,2,2,0,0,1,1.63.69,3.07,3.07,0,0,1,.57,2Z"/><path class="cls-3" d="M84.34,97.55q0,3.58-3.43,3.58a4.61,4.61,0,0,1-2.11-.46v-1a4.33,4.33,0,0,0,2.1.61q2.4,0,2.4-2.55V97h0a2.63,2.63,0,0,1-4.19.38A3.47,3.47,0,0,1,78.35,95a4,4,0,0,1,.8-2.63,2.66,2.66,0,0,1,2.18-1,2.12,2.12,0,0,1,1.95,1.05h0v-.9h1Zm-1-2.42v-1a1.86,1.86,0,0,0-.52-1.33,1.73,1.73,0,0,0-1.3-.55A1.81,1.81,0,0,0,80,93a3.13,3.13,0,0,0-.55,2,2.7,2.7,0,0,0,.52,1.74,1.69,1.69,0,0,0,1.39.65,1.81,1.81,0,0,0,1.42-.62A2.32,2.32,0,0,0,83.3,95.13Z"/><path class="cls-3" d="M91.71,98.07h-1V97h0a2.14,2.14,0,0,1-2,1.18q-2.32,0-2.32-2.77V91.57h1v3.72q0,2.06,1.57,2.06a1.59,1.59,0,0,0,1.25-.56,2.15,2.15,0,0,0,.49-1.47V91.57h1Z"/><path class="cls-3" d="M98.46,98.07h-1v-1h0a2.18,2.18,0,0,1-2,1.17,2.14,2.14,0,0,1-1.52-.51,1.79,1.79,0,0,1-.55-1.37q0-1.82,2.15-2.12L97.42,94q0-1.66-1.34-1.66a3.2,3.2,0,0,0-2.12.8V92a4,4,0,0,1,2.21-.61q2.29,0,2.29,2.42Zm-1-3.29L95.85,95a2.55,2.55,0,0,0-1.09.36,1,1,0,0,0-.37.91,1,1,0,0,0,.34.78,1.31,1.31,0,0,0,.9.3,1.67,1.67,0,0,0,1.28-.54,1.94,1.94,0,0,0,.5-1.37Z"/><path class="cls-3" d="M106,97.55q0,3.58-3.43,3.58a4.6,4.6,0,0,1-2.11-.46v-1a4.33,4.33,0,0,0,2.09.61q2.4,0,2.4-2.55V97h0a2.63,2.63,0,0,1-4.19.38A3.46,3.46,0,0,1,100,95a4,4,0,0,1,.8-2.63,2.66,2.66,0,0,1,2.18-1,2.12,2.12,0,0,1,1.95,1.05h0v-.9h1Zm-1-2.42v-1a1.86,1.86,0,0,0-.52-1.33,1.73,1.73,0,0,0-1.3-.55,1.81,1.81,0,0,0-1.51.7,3.13,3.13,0,0,0-.55,2,2.69,2.69,0,0,0,.52,1.74,1.69,1.69,0,0,0,1.39.65,1.81,1.81,0,0,0,1.43-.62A2.32,2.32,0,0,0,104.93,95.13Z"/><path class="cls-3" d="M113.3,95.08h-4.59a2.43,2.43,0,0,0,.58,1.68,2,2,0,0,0,1.54.59,3.19,3.19,0,0,0,2-.72v1a3.77,3.77,0,0,1-2.27.62,2.75,2.75,0,0,1-2.17-.89,3.63,3.63,0,0,1-.79-2.49,3.55,3.55,0,0,1,.86-2.47,2.76,2.76,0,0,1,2.14-1,2.44,2.44,0,0,1,2,.83,3.44,3.44,0,0,1,.7,2.29Zm-1.07-.88a2.12,2.12,0,0,0-.44-1.4,1.48,1.48,0,0,0-1.19-.5,1.68,1.68,0,0,0-1.25.53,2.4,2.4,0,0,0-.63,1.38Z"/><path class="cls-3" d="M127.86,98.07h-1.06V92q0-.72.09-1.77h0a5.69,5.69,0,0,1-.27.88l-3.11,7H123l-3.1-6.94a5.42,5.42,0,0,1-.27-.93h0q0,.54.05,1.78v6.09h-1V89H120l2.79,6.35a8.11,8.11,0,0,1,.42,1.09h0q.27-.75.44-1.12L126.52,89h1.33Z"/><path class="cls-3" d="M132.83,98.23a3,3,0,0,1-2.3-.91,3.37,3.37,0,0,1-.86-2.42,3.52,3.52,0,0,1,.9-2.56,3.22,3.22,0,0,1,2.42-.92,2.92,2.92,0,0,1,2.27.89,3.56,3.56,0,0,1,.81,2.48,3.49,3.49,0,0,1-.88,2.49A3.08,3.08,0,0,1,132.83,98.23Zm.08-5.93a2,2,0,0,0-1.59.68,2.81,2.81,0,0,0-.58,1.88,2.65,2.65,0,0,0,.59,1.82,2,2,0,0,0,1.58.67,1.9,1.9,0,0,0,1.55-.65,2.83,2.83,0,0,0,.54-1.86,2.88,2.88,0,0,0-.54-1.88A1.89,1.89,0,0,0,132.9,92.3Z"/><path class="cls-3" d="M143.27,98.07h-1V97h0a2.62,2.62,0,0,1-4.19.38,3.57,3.57,0,0,1-.73-2.38,3.9,3.9,0,0,1,.81-2.58,2.68,2.68,0,0,1,2.17-1,2.08,2.08,0,0,1,1.95,1.05h0v-4h1Zm-1-2.94v-1a1.86,1.86,0,0,0-.52-1.33,1.75,1.75,0,0,0-1.32-.55,1.8,1.8,0,0,0-1.5.7,3.06,3.06,0,0,0-.55,1.93,2.76,2.76,0,0,0,.52,1.77,1.71,1.71,0,0,0,1.41.65,1.78,1.78,0,0,0,1.41-.63A2.34,2.34,0,0,0,142.23,95.13Z"/><path class="cls-3" d="M150.61,95.08H146a2.43,2.43,0,0,0,.58,1.68,2,2,0,0,0,1.54.59,3.19,3.19,0,0,0,2-.72v1a3.77,3.77,0,0,1-2.27.62,2.74,2.74,0,0,1-2.16-.89,3.62,3.62,0,0,1-.79-2.49,3.55,3.55,0,0,1,.86-2.47,2.76,2.76,0,0,1,2.14-1,2.45,2.45,0,0,1,2,.83,3.44,3.44,0,0,1,.7,2.29Zm-1.07-.88a2.11,2.11,0,0,0-.44-1.4,1.48,1.48,0,0,0-1.19-.5,1.68,1.68,0,0,0-1.25.53A2.38,2.38,0,0,0,146,94.2Z"/><path class="cls-3" d="M17.65,119.69a5.34,5.34,0,0,1-2.51.53A4.06,4.06,0,0,1,12,119a4.61,4.61,0,0,1-1.17-3.28,4.83,4.83,0,0,1,1.31-3.53,4.46,4.46,0,0,1,3.33-1.35,5.36,5.36,0,0,1,2.15.37v1.14a4.35,4.35,0,0,0-2.16-.55,3.31,3.31,0,0,0-2.54,1,3.94,3.94,0,0,0-1,2.8,3.76,3.76,0,0,0,.91,2.65,3.1,3.1,0,0,0,2.39,1,4.48,4.48,0,0,0,2.37-.61Z"/><path class="cls-3" d="M20.4,120.07h-1v-9.62h1Z"/><path class="cls-3" d="M27.73,117.08H23.14a2.43,2.43,0,0,0,.58,1.68,2,2,0,0,0,1.54.59,3.19,3.19,0,0,0,2-.72v1a3.77,3.77,0,0,1-2.27.62,2.75,2.75,0,0,1-2.17-.89,3.63,3.63,0,0,1-.79-2.49,3.55,3.55,0,0,1,.86-2.47,2.76,2.76,0,0,1,2.14-1,2.44,2.44,0,0,1,2,.83,3.44,3.44,0,0,1,.7,2.29Zm-1.07-.88a2.12,2.12,0,0,0-.44-1.4,1.48,1.48,0,0,0-1.19-.5,1.68,1.68,0,0,0-1.25.53,2.4,2.4,0,0,0-.63,1.38Z"/><path class="cls-3" d="M34,120.07h-1v-1h0a2.18,2.18,0,0,1-2,1.17,2.14,2.14,0,0,1-1.52-.51,1.78,1.78,0,0,1-.55-1.37q0-1.82,2.14-2.12l1.95-.27q0-1.66-1.34-1.66a3.2,3.2,0,0,0-2.12.8V114a4,4,0,0,1,2.21-.61q2.29,0,2.29,2.42Zm-1-3.29-1.57.22a2.55,2.55,0,0,0-1.09.36,1,1,0,0,0-.37.91,1,1,0,0,0,.34.78,1.31,1.31,0,0,0,.9.3,1.67,1.67,0,0,0,1.28-.54,1.94,1.94,0,0,0,.5-1.37Z"/><path class="cls-3" d="M39.31,114.63a1.28,1.28,0,0,0-.79-.21,1.33,1.33,0,0,0-1.12.63,2.92,2.92,0,0,0-.45,1.71v3.31h-1v-6.5h1v1.34h0a2.27,2.27,0,0,1,.68-1.07,1.55,1.55,0,0,1,1-.38,1.7,1.7,0,0,1,.62.09Z"/><path class="cls-3" d="M49,120.07H44.14V111h4.62v1H45.21v3H48.5v1H45.21v3.19H49Z"/><path class="cls-3" d="M56.13,120.07h-1V119h0a2.4,2.4,0,0,1-2.23,1.26,2.43,2.43,0,0,1-2-.87,3.58,3.58,0,0,1-.73-2.38,3.9,3.9,0,0,1,.81-2.58,2.68,2.68,0,0,1,2.16-1,2.08,2.08,0,0,1,1.95,1.05h0v-4h1Zm-1-2.94v-1a1.86,1.86,0,0,0-.52-1.33,1.74,1.74,0,0,0-1.32-.55,1.8,1.8,0,0,0-1.5.7,3.06,3.06,0,0,0-.55,1.93,2.76,2.76,0,0,0,.52,1.77,1.71,1.71,0,0,0,1.41.65,1.78,1.78,0,0,0,1.41-.63A2.34,2.34,0,0,0,55.09,117.13Z"/><path class="cls-3" d="M58.77,111.92a.66.66,0,0,1-.48-.19.64.64,0,0,1-.2-.48.67.67,0,0,1,.67-.68.67.67,0,0,1,.49.19.68.68,0,0,1,0,1A.66.66,0,0,1,58.77,111.92Zm.51,8.15h-1v-6.5h1Z"/><path class="cls-3" d="M64.4,120a2,2,0,0,1-1,.2q-1.71,0-1.71-1.9v-3.85H60.6v-.89h1.12V112l1-.34v1.92H64.4v.89H62.76v3.66a1.52,1.52,0,0,0,.22.93.89.89,0,0,0,.74.28,1.1,1.1,0,0,0,.68-.22Z"/><path class="cls-3" d="M68.4,120.23a3,3,0,0,1-2.3-.91,3.37,3.37,0,0,1-.86-2.42,3.52,3.52,0,0,1,.89-2.56,3.22,3.22,0,0,1,2.42-.92,2.92,2.92,0,0,1,2.27.89,3.55,3.55,0,0,1,.82,2.48,3.49,3.49,0,0,1-.88,2.49A3.08,3.08,0,0,1,68.4,120.23Zm.08-5.93a2,2,0,0,0-1.59.68,2.81,2.81,0,0,0-.58,1.88,2.65,2.65,0,0,0,.59,1.82,2,2,0,0,0,1.58.67A1.9,1.9,0,0,0,70,118.7a2.84,2.84,0,0,0,.54-1.86A2.88,2.88,0,0,0,70,115,1.89,1.89,0,0,0,68.48,114.3Z"/><path class="cls-3" d="M76.69,114.63a1.27,1.27,0,0,0-.79-.21,1.33,1.33,0,0,0-1.11.63,2.91,2.91,0,0,0-.45,1.71v3.31h-1v-6.5h1v1.34h0a2.27,2.27,0,0,1,.68-1.07,1.55,1.55,0,0,1,1-.38,1.7,1.7,0,0,1,.62.09Z"/><path class="cls-3" d="M88.37,120.07H87.3v-4.15H82.59v4.15H81.52V111h1.07v4H87.3v-4h1.07Z"/><path class="cls-3" d="M91.15,111.92a.66.66,0,0,1-.48-.19.64.64,0,0,1-.2-.48.67.67,0,0,1,.67-.68.67.67,0,0,1,.49.19.68.68,0,0,1,0,1A.66.66,0,0,1,91.15,111.92Zm.51,8.15h-1v-6.5h1Z"/><path class="cls-3" d="M93.37,119.84v-1.12a3.09,3.09,0,0,0,1.87.63q1.37,0,1.37-.91a.79.79,0,0,0-.12-.44,1.17,1.17,0,0,0-.32-.32,2.44,2.44,0,0,0-.47-.25l-.58-.23a7.45,7.45,0,0,1-.76-.35,2.3,2.3,0,0,1-.55-.39,1.47,1.47,0,0,1-.33-.5,1.76,1.76,0,0,1-.11-.65,1.56,1.56,0,0,1,.21-.81,1.85,1.85,0,0,1,.56-.59,2.6,2.6,0,0,1,.8-.36,3.52,3.52,0,0,1,.92-.12,3.74,3.74,0,0,1,1.51.29v1.05a2.94,2.94,0,0,0-1.65-.47,2,2,0,0,0-.53.07,1.3,1.3,0,0,0-.4.19.87.87,0,0,0-.26.29.77.77,0,0,0-.09.37.9.9,0,0,0,.09.42.94.94,0,0,0,.27.3,2,2,0,0,0,.43.24l.58.23a8.15,8.15,0,0,1,.78.34,2.64,2.64,0,0,1,.58.39,1.53,1.53,0,0,1,.37.5,1.63,1.63,0,0,1,.13.68,1.61,1.61,0,0,1-.21.84,1.84,1.84,0,0,1-.57.59,2.61,2.61,0,0,1-.82.35,4,4,0,0,1-1,.11A3.69,3.69,0,0,1,93.37,119.84Z"/><path class="cls-3" d="M102.29,120a2,2,0,0,1-1,.2q-1.71,0-1.71-1.9v-3.85H98.5v-.89h1.12V112l1-.34v1.92h1.64v.89h-1.64v3.66a1.52,1.52,0,0,0,.22.93.88.88,0,0,0,.74.28,1.09,1.09,0,0,0,.68-.22Z"/><path class="cls-3" d="M106.3,120.23a3,3,0,0,1-2.3-.91,3.37,3.37,0,0,1-.86-2.42,3.51,3.51,0,0,1,.9-2.56,3.22,3.22,0,0,1,2.42-.92,2.92,2.92,0,0,1,2.27.89,3.56,3.56,0,0,1,.82,2.48,3.49,3.49,0,0,1-.88,2.49A3.08,3.08,0,0,1,106.3,120.23Zm.08-5.93a2,2,0,0,0-1.59.68,2.8,2.8,0,0,0-.58,1.88,2.64,2.64,0,0,0,.59,1.82,2,2,0,0,0,1.58.67,1.9,1.9,0,0,0,1.55-.65,2.84,2.84,0,0,0,.54-1.86,2.88,2.88,0,0,0-.54-1.88A1.89,1.89,0,0,0,106.38,114.3Z"/><path class="cls-3" d="M114.59,114.63a1.27,1.27,0,0,0-.79-.21,1.33,1.33,0,0,0-1.11.63,2.91,2.91,0,0,0-.45,1.71v3.31h-1v-6.5h1v1.34h0a2.27,2.27,0,0,1,.68-1.07,1.55,1.55,0,0,1,1-.38,1.69,1.69,0,0,1,.62.09Z"/><path class="cls-3" d="M121.41,113.57l-3,7.54q-.8,2-2.25,2a2.36,2.36,0,0,1-.68-.08v-.93a1.93,1.93,0,0,0,.62.11,1.28,1.28,0,0,0,1.18-.94l.52-1.23-2.54-6.49h1.16l1.76,5q0,.1.13.5h0q0-.15.13-.48l1.85-5Z"/><path class="cls-3" d="M17.65,141.69a5.34,5.34,0,0,1-2.51.53A4.06,4.06,0,0,1,12,141a4.61,4.61,0,0,1-1.17-3.28,4.83,4.83,0,0,1,1.31-3.53,4.46,4.46,0,0,1,3.33-1.35,5.36,5.36,0,0,1,2.15.37v1.14a4.35,4.35,0,0,0-2.16-.55,3.31,3.31,0,0,0-2.54,1,3.94,3.94,0,0,0-1,2.8,3.76,3.76,0,0,0,.91,2.65,3.1,3.1,0,0,0,2.39,1,4.48,4.48,0,0,0,2.37-.61Z"/><path class="cls-3" d="M20.4,142.07h-1v-9.62h1Z"/><path class="cls-3" d="M25.23,142.23a3,3,0,0,1-2.3-.91,3.37,3.37,0,0,1-.86-2.42,3.51,3.51,0,0,1,.9-2.56,3.22,3.22,0,0,1,2.42-.92,2.92,2.92,0,0,1,2.27.89,3.56,3.56,0,0,1,.82,2.48,3.49,3.49,0,0,1-.88,2.49A3.08,3.08,0,0,1,25.23,142.23Zm.08-5.93a2,2,0,0,0-1.59.68,2.8,2.8,0,0,0-.58,1.88,2.64,2.64,0,0,0,.59,1.82,2,2,0,0,0,1.58.67,1.9,1.9,0,0,0,1.55-.65,2.84,2.84,0,0,0,.54-1.86,2.88,2.88,0,0,0-.54-1.88A1.89,1.89,0,0,0,25.3,136.3Z"/><path class="cls-3" d="M29.73,141.84v-1.12a3.09,3.09,0,0,0,1.87.63q1.37,0,1.37-.91a.8.8,0,0,0-.12-.44,1.16,1.16,0,0,0-.32-.32,2.46,2.46,0,0,0-.47-.25l-.58-.23a7.47,7.47,0,0,1-.76-.35,2.29,2.29,0,0,1-.55-.39,1.47,1.47,0,0,1-.33-.5,1.76,1.76,0,0,1-.11-.65,1.56,1.56,0,0,1,.21-.81,1.87,1.87,0,0,1,.56-.59,2.6,2.6,0,0,1,.8-.36,3.51,3.51,0,0,1,.92-.12,3.74,3.74,0,0,1,1.51.29v1.05a2.94,2.94,0,0,0-1.65-.47,1.94,1.94,0,0,0-.53.07,1.3,1.3,0,0,0-.4.19.86.86,0,0,0-.26.29.77.77,0,0,0-.09.37.9.9,0,0,0,.09.42.92.92,0,0,0,.27.3,2.06,2.06,0,0,0,.43.24l.58.23a8.23,8.23,0,0,1,.77.34,2.64,2.64,0,0,1,.58.39,1.52,1.52,0,0,1,.37.5,1.8,1.8,0,0,1-.08,1.52,1.82,1.82,0,0,1-.57.59,2.61,2.61,0,0,1-.82.35,4,4,0,0,1-1,.11A3.69,3.69,0,0,1,29.73,141.84Z"/><path class="cls-3" d="M40.87,139.08H36.28a2.43,2.43,0,0,0,.58,1.68,2,2,0,0,0,1.54.59,3.19,3.19,0,0,0,2-.72v1a3.77,3.77,0,0,1-2.27.62,2.74,2.74,0,0,1-2.16-.89,3.62,3.62,0,0,1-.79-2.49,3.55,3.55,0,0,1,.86-2.47,2.76,2.76,0,0,1,2.14-1,2.45,2.45,0,0,1,2,.83,3.44,3.44,0,0,1,.7,2.29Zm-1.07-.88a2.11,2.11,0,0,0-.44-1.4,1.48,1.48,0,0,0-1.19-.5,1.68,1.68,0,0,0-1.25.53,2.38,2.38,0,0,0-.63,1.38Z"/><path class="cls-3" d="M53.48,142.07H52.17l-4.68-7.26a3,3,0,0,1-.29-.57h0a9.48,9.48,0,0,1,.05,1.25v6.58H46.14V133h1.38l4.56,7.14c.19.3.31.5.37.61h0a9.73,9.73,0,0,1-.06-1.34V133h1.07Z"/><path class="cls-3" d="M58.44,142.23a3,3,0,0,1-2.3-.91,3.37,3.37,0,0,1-.86-2.42,3.52,3.52,0,0,1,.89-2.56,3.22,3.22,0,0,1,2.42-.92,2.92,2.92,0,0,1,2.27.89,3.55,3.55,0,0,1,.82,2.48,3.49,3.49,0,0,1-.88,2.49A3.08,3.08,0,0,1,58.44,142.23Zm.08-5.93a2,2,0,0,0-1.59.68,2.8,2.8,0,0,0-.58,1.88,2.65,2.65,0,0,0,.59,1.82,2,2,0,0,0,1.58.67,1.9,1.9,0,0,0,1.55-.65,2.84,2.84,0,0,0,.54-1.86,2.89,2.89,0,0,0-.54-1.88A1.89,1.89,0,0,0,58.52,136.3Z"/><path class="cls-3" d="M66.36,142a2,2,0,0,1-1,.2q-1.71,0-1.71-1.9v-3.85H62.56v-.89h1.12V134l1-.34v1.92h1.64v.89H64.72v3.66a1.52,1.52,0,0,0,.22.93.89.89,0,0,0,.74.28,1.1,1.1,0,0,0,.68-.22Z"/><path class="cls-3" d="M68.28,133.92a.66.66,0,0,1-.48-.19.64.64,0,0,1-.2-.48.67.67,0,0,1,.67-.68.67.67,0,0,1,.48.19.67.67,0,0,1,0,1A.66.66,0,0,1,68.28,133.92Zm.51,8.15h-1v-6.5h1Z"/><path class="cls-3" d="M74.11,133.37a1.39,1.39,0,0,0-.69-.17q-1.09,0-1.09,1.38v1h1.52v.89H72.33v5.61h-1v-5.61H70.18v-.89h1.11v-1.05a2.19,2.19,0,0,1,.59-1.62,2,2,0,0,1,1.47-.59,2,2,0,0,1,.75.11Z"/><path class="cls-3" d="M75.5,133.92a.66.66,0,0,1-.48-.19.64.64,0,0,1-.2-.48.67.67,0,0,1,.67-.68.67.67,0,0,1,.49.19.68.68,0,0,1,0,1A.66.66,0,0,1,75.5,133.92Zm.51,8.15H75v-6.5h1Z"/><path class="cls-3" d="M82.55,141.78a3.38,3.38,0,0,1-1.78.45,2.94,2.94,0,0,1-2.24-.9,3.28,3.28,0,0,1-.85-2.35,3.6,3.6,0,0,1,.92-2.58,3.22,3.22,0,0,1,2.46-1,3.41,3.41,0,0,1,1.51.32v1.07A2.64,2.64,0,0,0,81,136.3a2.1,2.1,0,0,0-1.63.71,2.71,2.71,0,0,0-.64,1.88,2.58,2.58,0,0,0,.6,1.8,2.07,2.07,0,0,0,1.61.66,2.61,2.61,0,0,0,1.6-.57Z"/><path class="cls-3" d="M88.77,142.07h-1v-1h0a2.18,2.18,0,0,1-2,1.17,2.14,2.14,0,0,1-1.52-.51,1.78,1.78,0,0,1-.55-1.37q0-1.82,2.15-2.12l1.95-.27q0-1.66-1.34-1.66a3.2,3.2,0,0,0-2.12.8V136a4,4,0,0,1,2.21-.61q2.29,0,2.29,2.42Zm-1-3.29-1.57.22a2.55,2.55,0,0,0-1.09.36,1,1,0,0,0-.37.91A1,1,0,0,0,85,141a1.31,1.31,0,0,0,.9.3,1.67,1.67,0,0,0,1.28-.54,1.94,1.94,0,0,0,.5-1.37Z"/><path class="cls-3" d="M93.75,142a2,2,0,0,1-1,.2q-1.71,0-1.71-1.9v-3.85H90v-.89h1.12V134l1-.34v1.92h1.64v.89H92.11v3.66a1.52,1.52,0,0,0,.22.93.89.89,0,0,0,.74.28,1.1,1.1,0,0,0,.68-.22Z"/><path class="cls-3" d="M95.67,133.92a.66.66,0,0,1-.48-.19.64.64,0,0,1-.2-.48.67.67,0,0,1,.67-.68.67.67,0,0,1,.49.19.68.68,0,0,1,0,1A.66.66,0,0,1,95.67,133.92Zm.51,8.15h-1v-6.5h1Z"/><path class="cls-3" d="M101,142.23a3,3,0,0,1-2.3-.91,3.37,3.37,0,0,1-.86-2.42,3.52,3.52,0,0,1,.89-2.56,3.22,3.22,0,0,1,2.42-.92,2.92,2.92,0,0,1,2.27.89,3.55,3.55,0,0,1,.82,2.48,3.49,3.49,0,0,1-.88,2.49A3.08,3.08,0,0,1,101,142.23Zm.08-5.93a2,2,0,0,0-1.59.68,2.81,2.81,0,0,0-.58,1.88,2.65,2.65,0,0,0,.59,1.82,2,2,0,0,0,1.58.67,1.9,1.9,0,0,0,1.55-.65,2.84,2.84,0,0,0,.54-1.86,2.88,2.88,0,0,0-.54-1.88A1.89,1.89,0,0,0,101.08,136.3Z"/><path class="cls-3" d="M111.3,142.07h-1v-3.71q0-2.07-1.51-2.07a1.64,1.64,0,0,0-1.29.59,2.18,2.18,0,0,0-.51,1.48v3.71h-1v-6.5h1v1.08h0a2.35,2.35,0,0,1,2.13-1.23,2,2,0,0,1,1.63.69,3.07,3.07,0,0,1,.56,2Z"/><path class="cls-3" d="M126.24,142.07h-1.06V136q0-.72.09-1.77h0a5.6,5.6,0,0,1-.27.88l-3.11,7h-.52l-3.1-6.94a5.53,5.53,0,0,1-.27-.93h0q.05.54.05,1.78v6.09h-1V133h1.41l2.79,6.35a8.11,8.11,0,0,1,.42,1.09h0q.27-.75.44-1.12l2.85-6.32h1.33Z"/><path class="cls-3" d="M133.72,139.08h-4.59a2.43,2.43,0,0,0,.58,1.68,2,2,0,0,0,1.54.59,3.19,3.19,0,0,0,2-.72v1a3.77,3.77,0,0,1-2.27.62,2.74,2.74,0,0,1-2.16-.89,3.62,3.62,0,0,1-.79-2.49,3.55,3.55,0,0,1,.86-2.47,2.76,2.76,0,0,1,2.14-1,2.45,2.45,0,0,1,2,.83,3.44,3.44,0,0,1,.7,2.29Zm-1.07-.88a2.11,2.11,0,0,0-.44-1.4,1.48,1.48,0,0,0-1.19-.5,1.68,1.68,0,0,0-1.25.53,2.38,2.38,0,0,0-.63,1.38Z"/><path class="cls-3" d="M134.9,141.84v-1.12a3.09,3.09,0,0,0,1.87.63q1.37,0,1.37-.91A.8.8,0,0,0,138,140a1.16,1.16,0,0,0-.32-.32,2.46,2.46,0,0,0-.47-.25l-.58-.23a7.47,7.47,0,0,1-.76-.35,2.29,2.29,0,0,1-.55-.39,1.47,1.47,0,0,1-.33-.5,1.76,1.76,0,0,1-.11-.65,1.56,1.56,0,0,1,.21-.81,1.87,1.87,0,0,1,.56-.59,2.6,2.6,0,0,1,.8-.36,3.51,3.51,0,0,1,.92-.12,3.74,3.74,0,0,1,1.51.29v1.05a2.94,2.94,0,0,0-1.65-.47,1.94,1.94,0,0,0-.53.07,1.3,1.3,0,0,0-.4.19.86.86,0,0,0-.26.29.77.77,0,0,0-.09.37.9.9,0,0,0,.09.42.92.92,0,0,0,.27.3,2.06,2.06,0,0,0,.43.24l.58.23a8.23,8.23,0,0,1,.77.34,2.64,2.64,0,0,1,.58.39,1.52,1.52,0,0,1,.37.5,1.8,1.8,0,0,1-.08,1.52,1.82,1.82,0,0,1-.57.59,2.61,2.61,0,0,1-.82.35,4,4,0,0,1-1,.11A3.69,3.69,0,0,1,134.9,141.84Z"/><path class="cls-3" d="M140.42,141.84v-1.12a3.09,3.09,0,0,0,1.87.63q1.37,0,1.37-.91a.79.79,0,0,0-.12-.44,1.17,1.17,0,0,0-.32-.32,2.44,2.44,0,0,0-.47-.25l-.58-.23a7.45,7.45,0,0,1-.76-.35,2.3,2.3,0,0,1-.55-.39,1.47,1.47,0,0,1-.33-.5,1.76,1.76,0,0,1-.11-.65,1.56,1.56,0,0,1,.21-.81,1.85,1.85,0,0,1,.56-.59,2.6,2.6,0,0,1,.8-.36,3.52,3.52,0,0,1,.92-.12,3.74,3.74,0,0,1,1.51.29v1.05a2.94,2.94,0,0,0-1.65-.47,2,2,0,0,0-.53.07,1.3,1.3,0,0,0-.4.19.87.87,0,0,0-.26.29.77.77,0,0,0-.09.37.9.9,0,0,0,.09.42.94.94,0,0,0,.27.3,2,2,0,0,0,.43.24l.58.23a8.15,8.15,0,0,1,.78.34,2.64,2.64,0,0,1,.58.39,1.53,1.53,0,0,1,.37.5,1.63,1.63,0,0,1,.13.68,1.61,1.61,0,0,1-.21.84,1.84,1.84,0,0,1-.57.59,2.61,2.61,0,0,1-.82.35,4,4,0,0,1-1,.11A3.69,3.69,0,0,1,140.42,141.84Z"/><path class="cls-3" d="M151,142.07h-1v-1h0a2.18,2.18,0,0,1-2,1.17,2.14,2.14,0,0,1-1.52-.51,1.78,1.78,0,0,1-.55-1.37q0-1.82,2.15-2.12l1.95-.27q0-1.66-1.34-1.66a3.2,3.2,0,0,0-2.12.8V136a4,4,0,0,1,2.21-.61q2.29,0,2.29,2.42Zm-1-3.29-1.57.22a2.55,2.55,0,0,0-1.09.36,1,1,0,0,0-.37.91,1,1,0,0,0,.34.78,1.31,1.31,0,0,0,.9.3,1.67,1.67,0,0,0,1.28-.54,1.94,1.94,0,0,0,.5-1.37Z"/><path class="cls-3" d="M158.49,141.55q0,3.58-3.43,3.58a4.6,4.6,0,0,1-2.11-.46v-1a4.33,4.33,0,0,0,2.09.61q2.4,0,2.4-2.55V141h0a2.63,2.63,0,0,1-4.19.38,3.47,3.47,0,0,1-.74-2.33,4,4,0,0,1,.8-2.63,2.66,2.66,0,0,1,2.18-1,2.12,2.12,0,0,1,1.95,1.05h0v-.9h1Zm-1-2.42v-1a1.86,1.86,0,0,0-.52-1.33,1.73,1.73,0,0,0-1.3-.55,1.81,1.81,0,0,0-1.51.7,3.14,3.14,0,0,0-.55,2,2.69,2.69,0,0,0,.52,1.74,1.69,1.69,0,0,0,1.39.65,1.81,1.81,0,0,0,1.42-.62A2.32,2.32,0,0,0,157.45,139.13Z"/><path class="cls-3" d="M165.82,139.08h-4.59a2.43,2.43,0,0,0,.58,1.68,2,2,0,0,0,1.54.59,3.19,3.19,0,0,0,2-.72v1a3.77,3.77,0,0,1-2.27.62,2.75,2.75,0,0,1-2.16-.89,3.62,3.62,0,0,1-.79-2.49,3.55,3.55,0,0,1,.86-2.47,2.76,2.76,0,0,1,2.14-1,2.45,2.45,0,0,1,2,.83,3.44,3.44,0,0,1,.7,2.29Zm-1.07-.88a2.12,2.12,0,0,0-.43-1.4,1.48,1.48,0,0,0-1.19-.5,1.68,1.68,0,0,0-1.25.53,2.39,2.39,0,0,0-.63,1.38Z"/><path class="cls-3" d="M167,141.84v-1.12a3.09,3.09,0,0,0,1.87.63q1.37,0,1.37-.91a.79.79,0,0,0-.12-.44,1.17,1.17,0,0,0-.32-.32,2.44,2.44,0,0,0-.47-.25l-.58-.23a7.45,7.45,0,0,1-.76-.35,2.3,2.3,0,0,1-.55-.39,1.47,1.47,0,0,1-.33-.5,1.76,1.76,0,0,1-.11-.65,1.56,1.56,0,0,1,.21-.81,1.85,1.85,0,0,1,.56-.59,2.6,2.6,0,0,1,.8-.36,3.52,3.52,0,0,1,.92-.12,3.74,3.74,0,0,1,1.51.29v1.05a2.94,2.94,0,0,0-1.65-.47,2,2,0,0,0-.53.07,1.3,1.3,0,0,0-.4.19.87.87,0,0,0-.26.29.77.77,0,0,0-.09.37.9.9,0,0,0,.09.42.94.94,0,0,0,.27.3,2,2,0,0,0,.43.24l.58.23a8.15,8.15,0,0,1,.78.34,2.64,2.64,0,0,1,.58.39,1.53,1.53,0,0,1,.37.5,1.63,1.63,0,0,1,.13.68,1.61,1.61,0,0,1-.21.84,1.84,1.84,0,0,1-.57.59,2.61,2.61,0,0,1-.82.35,4,4,0,0,1-1,.11A3.69,3.69,0,0,1,167,141.84Z"/><path class="cls-3" d="M17.65,163.69a5.34,5.34,0,0,1-2.51.53A4.06,4.06,0,0,1,12,163a4.61,4.61,0,0,1-1.17-3.28,4.83,4.83,0,0,1,1.31-3.53,4.46,4.46,0,0,1,3.33-1.35,5.36,5.36,0,0,1,2.15.37v1.14a4.35,4.35,0,0,0-2.16-.55,3.31,3.31,0,0,0-2.54,1,3.94,3.94,0,0,0-1,2.8,3.76,3.76,0,0,0,.91,2.65,3.1,3.1,0,0,0,2.39,1,4.48,4.48,0,0,0,2.37-.61Z"/><path class="cls-3" d="M20.4,164.07h-1v-9.62h1Z"/><path class="cls-3" d="M25.23,164.23a3,3,0,0,1-2.3-.91,3.37,3.37,0,0,1-.86-2.42,3.51,3.51,0,0,1,.9-2.56,3.22,3.22,0,0,1,2.42-.92,2.92,2.92,0,0,1,2.27.89,3.56,3.56,0,0,1,.82,2.48,3.49,3.49,0,0,1-.88,2.49A3.08,3.08,0,0,1,25.23,164.23Zm.08-5.93a2,2,0,0,0-1.59.68,2.8,2.8,0,0,0-.58,1.88,2.64,2.64,0,0,0,.59,1.82,2,2,0,0,0,1.58.67,1.9,1.9,0,0,0,1.55-.65,2.84,2.84,0,0,0,.54-1.86,2.88,2.88,0,0,0-.54-1.88A1.89,1.89,0,0,0,25.3,158.3Z"/><path class="cls-3" d="M29.73,163.84v-1.12a3.09,3.09,0,0,0,1.87.63q1.37,0,1.37-.91a.8.8,0,0,0-.12-.44,1.16,1.16,0,0,0-.32-.32,2.46,2.46,0,0,0-.47-.25l-.58-.23a7.47,7.47,0,0,1-.76-.35,2.29,2.29,0,0,1-.55-.39,1.47,1.47,0,0,1-.33-.5,1.76,1.76,0,0,1-.11-.65,1.56,1.56,0,0,1,.21-.81,1.87,1.87,0,0,1,.56-.59,2.6,2.6,0,0,1,.8-.36,3.51,3.51,0,0,1,.92-.12,3.74,3.74,0,0,1,1.51.29v1.05a2.94,2.94,0,0,0-1.65-.47,1.94,1.94,0,0,0-.53.07,1.3,1.3,0,0,0-.4.19.86.86,0,0,0-.26.29.77.77,0,0,0-.09.37.9.9,0,0,0,.09.42.92.92,0,0,0,.27.3,2.06,2.06,0,0,0,.43.24l.58.23a8.23,8.23,0,0,1,.77.34,2.64,2.64,0,0,1,.58.39,1.52,1.52,0,0,1,.37.5,1.8,1.8,0,0,1-.08,1.52,1.82,1.82,0,0,1-.57.59,2.61,2.61,0,0,1-.82.35,4,4,0,0,1-1,.11A3.69,3.69,0,0,1,29.73,163.84Z"/><path class="cls-3" d="M40.87,161.08H36.28a2.43,2.43,0,0,0,.58,1.68,2,2,0,0,0,1.54.59,3.19,3.19,0,0,0,2-.72v1a3.77,3.77,0,0,1-2.27.62,2.74,2.74,0,0,1-2.16-.89,3.62,3.62,0,0,1-.79-2.49,3.55,3.55,0,0,1,.86-2.47,2.76,2.76,0,0,1,2.14-1,2.45,2.45,0,0,1,2,.83,3.44,3.44,0,0,1,.7,2.29Zm-1.07-.88a2.11,2.11,0,0,0-.44-1.4,1.48,1.48,0,0,0-1.19-.5,1.68,1.68,0,0,0-1.25.53,2.38,2.38,0,0,0-.63,1.38Z"/><path class="cls-3" d="M56.93,155l-2.57,9.1H53.11l-1.87-6.65a4.11,4.11,0,0,1-.15-.93h0a4.67,4.67,0,0,1-.17.91L49,164.07H47.78L45.11,155h1.17l1.94,7a4.63,4.63,0,0,1,.15.91h0a5.39,5.39,0,0,1,.2-.91l2-7h1l1.93,7a5,5,0,0,1,.15.85h0a5.15,5.15,0,0,1,.17-.88l1.86-7Z"/><path class="cls-3" d="M58.68,155.92a.66.66,0,0,1-.48-.19.64.64,0,0,1-.2-.48.67.67,0,0,1,.67-.68.67.67,0,0,1,.49.19.68.68,0,0,1,0,1A.66.66,0,0,1,58.68,155.92Zm.51,8.15h-1v-6.5h1Z"/><path class="cls-3" d="M66.69,164.07h-1v-3.71q0-2.07-1.51-2.07a1.64,1.64,0,0,0-1.29.59,2.18,2.18,0,0,0-.51,1.48v3.71h-1v-6.5h1v1.08h0a2.35,2.35,0,0,1,2.13-1.23,2,2,0,0,1,1.63.69,3.07,3.07,0,0,1,.56,2Z"/><path class="cls-3" d="M74.2,164.07h-1V163h0a2.62,2.62,0,0,1-4.19.38,3.58,3.58,0,0,1-.73-2.38,3.9,3.9,0,0,1,.81-2.58,2.68,2.68,0,0,1,2.16-1,2.09,2.09,0,0,1,1.95,1.05h0v-4h1Zm-1-2.94v-1a1.86,1.86,0,0,0-.52-1.33,1.74,1.74,0,0,0-1.32-.55,1.8,1.8,0,0,0-1.5.7,3.06,3.06,0,0,0-.54,1.93,2.75,2.75,0,0,0,.52,1.77,1.71,1.71,0,0,0,1.41.65,1.78,1.78,0,0,0,1.41-.63A2.35,2.35,0,0,0,73.16,161.13Z"/><path class="cls-3" d="M79,164.23a3,3,0,0,1-2.3-.91,3.37,3.37,0,0,1-.86-2.42,3.52,3.52,0,0,1,.9-2.56,3.22,3.22,0,0,1,2.42-.92,2.92,2.92,0,0,1,2.27.89,3.56,3.56,0,0,1,.81,2.48,3.49,3.49,0,0,1-.88,2.49A3.08,3.08,0,0,1,79,164.23Zm.08-5.93a2,2,0,0,0-1.59.68,2.81,2.81,0,0,0-.58,1.88,2.65,2.65,0,0,0,.59,1.82,2,2,0,0,0,1.58.67,1.9,1.9,0,0,0,1.55-.65,2.83,2.83,0,0,0,.54-1.86,2.88,2.88,0,0,0-.54-1.88A1.89,1.89,0,0,0,79.1,158.3Z"/><path class="cls-3" d="M92.11,157.57l-1.95,6.5H89.08l-1.34-4.65a3.08,3.08,0,0,1-.1-.6h0a2.76,2.76,0,0,1-.13.59L86,164.07H85l-2-6.5h1.09l1.35,4.89a2.94,2.94,0,0,1,.09.58h.05a2.73,2.73,0,0,1,.11-.6l1.5-4.87h1l1.35,4.9a3.47,3.47,0,0,1,.09.58h.05a2.67,2.67,0,0,1,.11-.58l1.32-4.9Z"/><path class="cls-3" d="M17.65,185.69a5.34,5.34,0,0,1-2.51.53A4.06,4.06,0,0,1,12,185a4.61,4.61,0,0,1-1.17-3.28,4.83,4.83,0,0,1,1.31-3.53,4.46,4.46,0,0,1,3.33-1.35,5.36,5.36,0,0,1,2.15.37v1.14a4.35,4.35,0,0,0-2.16-.55,3.31,3.31,0,0,0-2.54,1,3.94,3.94,0,0,0-1,2.8,3.76,3.76,0,0,0,.91,2.65,3.1,3.1,0,0,0,2.39,1,4.48,4.48,0,0,0,2.37-.61Z"/><path class="cls-3" d="M22.08,186.23a3,3,0,0,1-2.3-.91,3.37,3.37,0,0,1-.86-2.42,3.51,3.51,0,0,1,.9-2.56,3.22,3.22,0,0,1,2.42-.92,2.92,2.92,0,0,1,2.27.89,3.56,3.56,0,0,1,.82,2.48,3.49,3.49,0,0,1-.88,2.49A3.08,3.08,0,0,1,22.08,186.23Zm.08-5.93a2,2,0,0,0-1.59.68,2.8,2.8,0,0,0-.58,1.88,2.64,2.64,0,0,0,.59,1.82,2,2,0,0,0,1.58.67,1.9,1.9,0,0,0,1.55-.65,2.84,2.84,0,0,0,.54-1.86,2.88,2.88,0,0,0-.54-1.88A1.89,1.89,0,0,0,22.15,180.3Z"/><path class="cls-3" d="M32.37,186.07h-1v-3.71q0-2.07-1.51-2.07a1.64,1.64,0,0,0-1.29.59,2.18,2.18,0,0,0-.51,1.48v3.71H27v-6.5h1v1.08h0a2.34,2.34,0,0,1,2.13-1.23,2,2,0,0,1,1.63.69,3.07,3.07,0,0,1,.57,2Z"/><path class="cls-3" d="M37.55,177.37a1.39,1.39,0,0,0-.69-.17q-1.09,0-1.09,1.38v1h1.52v.89H35.76v5.61h-1v-5.61H33.62v-.89h1.11v-1.05a2.19,2.19,0,0,1,.59-1.62,2,2,0,0,1,1.47-.59,2,2,0,0,1,.75.11Z"/><path class="cls-3" d="M38.94,177.92a.66.66,0,0,1-.48-.19.64.64,0,0,1-.2-.48.67.67,0,0,1,.67-.68.67.67,0,0,1,.49.19.68.68,0,0,1,0,1A.66.66,0,0,1,38.94,177.92Zm.51,8.15h-1v-6.5h1Z"/><path class="cls-3" d="M47.1,185.55q0,3.58-3.43,3.58a4.6,4.6,0,0,1-2.11-.46v-1a4.33,4.33,0,0,0,2.09.61q2.4,0,2.4-2.55V185h0a2.63,2.63,0,0,1-4.19.38,3.47,3.47,0,0,1-.74-2.33,4,4,0,0,1,.8-2.63,2.66,2.66,0,0,1,2.18-1A2.12,2.12,0,0,1,46,180.48h0v-.9h1Zm-1-2.42v-1a1.86,1.86,0,0,0-.52-1.33,1.73,1.73,0,0,0-1.3-.55,1.81,1.81,0,0,0-1.51.7,3.14,3.14,0,0,0-.55,2,2.69,2.69,0,0,0,.52,1.74,1.69,1.69,0,0,0,1.39.65,1.81,1.81,0,0,0,1.42-.62A2.32,2.32,0,0,0,46.06,183.13Z"/><path class="cls-3" d="M54.46,186.07h-1v-1h0a2.14,2.14,0,0,1-2,1.18q-2.32,0-2.32-2.77v-3.88h1v3.72q0,2.06,1.57,2.06a1.59,1.59,0,0,0,1.25-.56,2.15,2.15,0,0,0,.49-1.47v-3.75h1Z"/><path class="cls-3" d="M60,180.63a1.28,1.28,0,0,0-.79-.21,1.33,1.33,0,0,0-1.12.63,2.92,2.92,0,0,0-.45,1.71v3.31h-1v-6.5h1v1.34h0a2.27,2.27,0,0,1,.68-1.07,1.55,1.55,0,0,1,1-.38,1.7,1.7,0,0,1,.62.09Z"/><path class="cls-3" d="M66.14,183.08H61.55a2.43,2.43,0,0,0,.58,1.68,2,2,0,0,0,1.54.59,3.19,3.19,0,0,0,2-.72v1a3.77,3.77,0,0,1-2.27.62,2.75,2.75,0,0,1-2.16-.89,3.62,3.62,0,0,1-.79-2.49,3.55,3.55,0,0,1,.86-2.47,2.76,2.76,0,0,1,2.14-1,2.45,2.45,0,0,1,2,.83,3.44,3.44,0,0,1,.7,2.29Zm-1.07-.88a2.12,2.12,0,0,0-.43-1.4,1.48,1.48,0,0,0-1.19-.5,1.68,1.68,0,0,0-1.25.53,2.39,2.39,0,0,0-.63,1.38Z"/><path class="cls-3" d="M76.13,186.07H71.41V177h1.07v8.14h3.66Z"/><path class="cls-3" d="M82,186.07H81v-1h0a2.18,2.18,0,0,1-2,1.17,2.14,2.14,0,0,1-1.52-.51,1.78,1.78,0,0,1-.55-1.37q0-1.82,2.15-2.12L81,182q0-1.66-1.34-1.66a3.2,3.2,0,0,0-2.12.8V180a4,4,0,0,1,2.21-.61q2.29,0,2.29,2.42Zm-1-3.29-1.57.22a2.55,2.55,0,0,0-1.09.36,1,1,0,0,0-.37.91,1,1,0,0,0,.34.78,1.31,1.31,0,0,0,.9.3,1.67,1.67,0,0,0,1.28-.54,1.94,1.94,0,0,0,.5-1.37Z"/><path class="cls-3" d="M89.4,186.07h-1v-3.71q0-2.07-1.51-2.07a1.64,1.64,0,0,0-1.29.59,2.18,2.18,0,0,0-.51,1.48v3.71H84v-6.5h1v1.08h0a2.34,2.34,0,0,1,2.13-1.23,2,2,0,0,1,1.63.69,3.07,3.07,0,0,1,.57,2Z"/><path class="cls-3" d="M96.91,185.55q0,3.58-3.43,3.58a4.61,4.61,0,0,1-2.11-.46v-1a4.33,4.33,0,0,0,2.1.61q2.4,0,2.4-2.55V185h0a2.63,2.63,0,0,1-4.19.38,3.47,3.47,0,0,1-.74-2.33,4,4,0,0,1,.8-2.63,2.66,2.66,0,0,1,2.18-1,2.12,2.12,0,0,1,1.95,1.05h0v-.9h1Zm-1-2.42v-1a1.86,1.86,0,0,0-.52-1.33,1.73,1.73,0,0,0-1.3-.55,1.81,1.81,0,0,0-1.51.7,3.13,3.13,0,0,0-.55,2,2.7,2.7,0,0,0,.52,1.74,1.69,1.69,0,0,0,1.39.65,1.81,1.81,0,0,0,1.42-.62A2.32,2.32,0,0,0,95.87,183.13Z"/><path class="cls-3" d="M104.27,186.07h-1v-1h0a2.14,2.14,0,0,1-2,1.18q-2.32,0-2.32-2.77v-3.88h1v3.72q0,2.06,1.57,2.06a1.59,1.59,0,0,0,1.25-.56,2.15,2.15,0,0,0,.49-1.47v-3.75h1Z"/><path class="cls-3" d="M111,186.07h-1v-1h0a2.18,2.18,0,0,1-2,1.17,2.14,2.14,0,0,1-1.52-.51,1.79,1.79,0,0,1-.55-1.37q0-1.82,2.15-2.12L110,182q0-1.66-1.34-1.66a3.2,3.2,0,0,0-2.12.8V180a4,4,0,0,1,2.21-.61q2.29,0,2.29,2.42Zm-1-3.29-1.57.22a2.55,2.55,0,0,0-1.09.36,1,1,0,0,0-.37.91,1,1,0,0,0,.34.78,1.31,1.31,0,0,0,.9.3,1.67,1.67,0,0,0,1.28-.54,1.94,1.94,0,0,0,.5-1.37Z"/><path class="cls-3" d="M118.54,185.55q0,3.58-3.43,3.58a4.6,4.6,0,0,1-2.11-.46v-1a4.33,4.33,0,0,0,2.09.61q2.4,0,2.4-2.55V185h0a2.63,2.63,0,0,1-4.19.38,3.46,3.46,0,0,1-.74-2.33,4,4,0,0,1,.8-2.63,2.66,2.66,0,0,1,2.18-1,2.12,2.12,0,0,1,1.95,1.05h0v-.9h1Zm-1-2.42v-1a1.86,1.86,0,0,0-.52-1.33,1.73,1.73,0,0,0-1.3-.55,1.81,1.81,0,0,0-1.51.7,3.13,3.13,0,0,0-.55,2,2.69,2.69,0,0,0,.52,1.74,1.69,1.69,0,0,0,1.39.65,1.81,1.81,0,0,0,1.43-.62A2.32,2.32,0,0,0,117.5,183.13Z"/><path class="cls-3" d="M125.87,183.08h-4.59a2.43,2.43,0,0,0,.58,1.68,2,2,0,0,0,1.54.59,3.19,3.19,0,0,0,2-.72v1a3.77,3.77,0,0,1-2.27.62,2.75,2.75,0,0,1-2.17-.89,3.63,3.63,0,0,1-.79-2.49,3.55,3.55,0,0,1,.86-2.47,2.76,2.76,0,0,1,2.14-1,2.44,2.44,0,0,1,2,.83,3.44,3.44,0,0,1,.7,2.29Zm-1.07-.88a2.12,2.12,0,0,0-.44-1.4,1.48,1.48,0,0,0-1.19-.5,1.68,1.68,0,0,0-1.25.53,2.4,2.4,0,0,0-.63,1.38Z"/><rect class="cls-6" width="386" height="197"/></g></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 386 197"><defs><style>.cls-1{fill:#f6f6f6;}.cls-2,.cls-6{fill:#fff;}.cls-2{stroke:#94c5e6;}.cls-2,.cls-4{stroke-miterlimit:10;}.cls-3{fill:#6c6c6c;}.cls-4{fill:none;stroke:#6c6c6c;}.cls-5{fill:#DFF0FF;}.cls-6{opacity:0.52;}</style></defs><title>Asset 9</title><g id="Layer_2" data-name="Layer 2"><g id="Layer_1-2" data-name="Layer 1"><rect class="cls-1" width="386" height="197"/><rect class="cls-2" x="5.25" y="8" width="374" height="23"/><path class="cls-3" d="M17.22,21.27l-7.14,3.59V23.62L15.42,21v0l-5.35-3V16.78l7.14,4Z"/><line class="cls-4" x1="18.75" y1="12" x2="18.75" y2="28"/><rect class="cls-5" y="38.5" width="385.75" height="20.5"/><path class="cls-3" d="M17.65,53.69a5.34,5.34,0,0,1-2.51.53A4.06,4.06,0,0,1,12,53a4.61,4.61,0,0,1-1.17-3.28,4.83,4.83,0,0,1,1.31-3.53,4.46,4.46,0,0,1,3.33-1.35,5.36,5.36,0,0,1,2.15.37v1.14a4.35,4.35,0,0,0-2.16-.55,3.31,3.31,0,0,0-2.54,1,3.94,3.94,0,0,0-1,2.8,3.76,3.76,0,0,0,.91,2.65,3.1,3.1,0,0,0,2.39,1,4.48,4.48,0,0,0,2.37-.61Z"/><path class="cls-3" d="M24.76,54.07h-1V50.33q0-2-1.51-2a1.65,1.65,0,0,0-1.28.59,2.19,2.19,0,0,0-.52,1.51v3.68h-1V44.45h1v4.2h0a2.36,2.36,0,0,1,2.13-1.23q2.2,0,2.2,2.65Z"/><path class="cls-3" d="M31.37,54.07h-1v-1h0a2.18,2.18,0,0,1-2,1.17,2.14,2.14,0,0,1-1.52-.51,1.78,1.78,0,0,1-.55-1.37q0-1.82,2.14-2.12L30.33,50q0-1.66-1.34-1.66a3.2,3.2,0,0,0-2.12.8V48a4,4,0,0,1,2.21-.61q2.29,0,2.29,2.42Zm-1-3.29L28.76,51a2.55,2.55,0,0,0-1.09.36,1,1,0,0,0-.37.91,1,1,0,0,0,.34.78,1.31,1.31,0,0,0,.9.3,1.67,1.67,0,0,0,1.28-.54,1.94,1.94,0,0,0,.5-1.37Z"/><path class="cls-3" d="M38.73,54.07h-1V50.37q0-2.07-1.51-2.07a1.64,1.64,0,0,0-1.29.59,2.18,2.18,0,0,0-.51,1.48v3.71h-1v-6.5h1v1.08h0a2.35,2.35,0,0,1,2.13-1.23,2,2,0,0,1,1.63.69,3.07,3.07,0,0,1,.57,2Z"/><path class="cls-3" d="M46.24,53.55q0,3.58-3.43,3.58a4.6,4.6,0,0,1-2.11-.46v-1a4.33,4.33,0,0,0,2.09.61q2.4,0,2.4-2.55V53h0a2.63,2.63,0,0,1-4.19.38A3.47,3.47,0,0,1,40.25,51,4,4,0,0,1,41,48.4a2.66,2.66,0,0,1,2.18-1,2.12,2.12,0,0,1,1.95,1.05h0v-.9h1Zm-1-2.42v-1a1.86,1.86,0,0,0-.52-1.33,1.73,1.73,0,0,0-1.3-.55,1.81,1.81,0,0,0-1.51.7,3.14,3.14,0,0,0-.55,2,2.69,2.69,0,0,0,.52,1.74,1.69,1.69,0,0,0,1.39.65,1.81,1.81,0,0,0,1.42-.62A2.32,2.32,0,0,0,45.2,51.13Z"/><path class="cls-3" d="M53.57,51.08H49a2.43,2.43,0,0,0,.58,1.68,2,2,0,0,0,1.54.59,3.19,3.19,0,0,0,2-.72v1a3.77,3.77,0,0,1-2.27.62,2.75,2.75,0,0,1-2.16-.89,3.62,3.62,0,0,1-.79-2.49,3.55,3.55,0,0,1,.86-2.47,2.76,2.76,0,0,1,2.14-1,2.45,2.45,0,0,1,2,.83,3.44,3.44,0,0,1,.7,2.29ZM52.5,50.2a2.12,2.12,0,0,0-.43-1.4,1.48,1.48,0,0,0-1.19-.5,1.68,1.68,0,0,0-1.25.53A2.39,2.39,0,0,0,49,50.2Z"/><path class="cls-3" d="M63.67,54.07H58.84V45h4.62v1H59.91v3H63.2v1H59.91v3.19h3.76Z"/><path class="cls-3" d="M70.68,54.07h-1V50.37q0-2.07-1.51-2.07a1.64,1.64,0,0,0-1.29.59,2.18,2.18,0,0,0-.51,1.48v3.71h-1v-6.5h1v1.08h0a2.35,2.35,0,0,1,2.13-1.23,2,2,0,0,1,1.63.69,3.07,3.07,0,0,1,.56,2Z"/><path class="cls-3" d="M78.19,54.07h-1V53h0a2.62,2.62,0,0,1-4.19.38A3.58,3.58,0,0,1,72.19,51,3.9,3.9,0,0,1,73,48.39a2.68,2.68,0,0,1,2.16-1,2.09,2.09,0,0,1,1.95,1.05h0v-4h1Zm-1-2.94v-1a1.86,1.86,0,0,0-.52-1.33,1.74,1.74,0,0,0-1.32-.55,1.8,1.8,0,0,0-1.5.7,3.06,3.06,0,0,0-.54,1.93,2.75,2.75,0,0,0,.52,1.77,1.71,1.71,0,0,0,1.41.65,1.78,1.78,0,0,0,1.41-.63A2.35,2.35,0,0,0,77.14,51.13Z"/><path class="cls-3" d="M86.57,54.23a3,3,0,0,1-2.3-.91,3.37,3.37,0,0,1-.86-2.42,3.51,3.51,0,0,1,.9-2.56,3.22,3.22,0,0,1,2.42-.92,2.92,2.92,0,0,1,2.27.89,3.56,3.56,0,0,1,.82,2.48,3.49,3.49,0,0,1-.88,2.49A3.08,3.08,0,0,1,86.57,54.23Zm.08-5.93a2,2,0,0,0-1.59.68,2.8,2.8,0,0,0-.58,1.88,2.64,2.64,0,0,0,.59,1.82,2,2,0,0,0,1.58.67,1.9,1.9,0,0,0,1.55-.65,2.84,2.84,0,0,0,.54-1.86A2.88,2.88,0,0,0,88.2,49,1.89,1.89,0,0,0,86.65,48.3Z"/><path class="cls-3" d="M94.45,45.37a1.39,1.39,0,0,0-.69-.17q-1.09,0-1.09,1.38v1h1.52v.89H92.66v5.61h-1V48.46H90.52v-.89h1.11V46.52a2.19,2.19,0,0,1,.59-1.62,2,2,0,0,1,1.47-.59,2,2,0,0,1,.75.11Z"/><path class="cls-3" d="M103.73,54.07H99V45h1.07v8.14h3.66Z"/><path class="cls-3" d="M105.52,45.92a.66.66,0,0,1-.48-.19.64.64,0,0,1-.2-.48.67.67,0,0,1,.67-.68.67.67,0,0,1,.49.19.68.68,0,0,1,0,1A.66.66,0,0,1,105.52,45.92Zm.51,8.15h-1v-6.5h1Z"/><path class="cls-3" d="M113.53,54.07h-1V50.37q0-2.07-1.51-2.07a1.64,1.64,0,0,0-1.29.59,2.18,2.18,0,0,0-.51,1.48v3.71h-1v-6.5h1v1.08h0a2.35,2.35,0,0,1,2.13-1.23,2,2,0,0,1,1.63.69,3.07,3.07,0,0,1,.57,2Z"/><path class="cls-3" d="M120.71,51.08h-4.59a2.43,2.43,0,0,0,.58,1.68,2,2,0,0,0,1.54.59,3.19,3.19,0,0,0,2-.72v1a3.77,3.77,0,0,1-2.27.62,2.75,2.75,0,0,1-2.17-.89,3.63,3.63,0,0,1-.79-2.49,3.55,3.55,0,0,1,.86-2.47,2.76,2.76,0,0,1,2.14-1,2.44,2.44,0,0,1,2,.83,3.44,3.44,0,0,1,.7,2.29Zm-1.07-.88a2.12,2.12,0,0,0-.44-1.4,1.48,1.48,0,0,0-1.19-.5,1.68,1.68,0,0,0-1.25.53,2.4,2.4,0,0,0-.63,1.38Z"/><path class="cls-3" d="M125.56,53.71V52.45a2.45,2.45,0,0,0,.52.34,4.17,4.17,0,0,0,.63.26,5,5,0,0,0,.67.16,3.72,3.72,0,0,0,.62.06,2.44,2.44,0,0,0,1.47-.36,1.37,1.37,0,0,0,.32-1.69,1.82,1.82,0,0,0-.45-.5,4.46,4.46,0,0,0-.68-.43l-.84-.43c-.32-.16-.61-.32-.89-.49a3.85,3.85,0,0,1-.72-.54,2.28,2.28,0,0,1-.48-.68,2.3,2.3,0,0,1,.1-2,2.33,2.33,0,0,1,.72-.76,3.27,3.27,0,0,1,1-.45,4.67,4.67,0,0,1,1.16-.15,4.45,4.45,0,0,1,2,.32v1.2a3.56,3.56,0,0,0-2.07-.56,3.39,3.39,0,0,0-.7.07,2,2,0,0,0-.62.24,1.36,1.36,0,0,0-.44.42,1.13,1.13,0,0,0-.17.63,1.3,1.3,0,0,0,.13.6,1.46,1.46,0,0,0,.38.46,3.8,3.8,0,0,0,.62.41l.84.43q.49.24.93.51a4.22,4.22,0,0,1,.77.59,2.6,2.6,0,0,1,.52.72,2,2,0,0,1,.19.9,2.29,2.29,0,0,1-.26,1.14,2.16,2.16,0,0,1-.71.76,3.1,3.1,0,0,1-1,.42,5.63,5.63,0,0,1-1.23.13l-.53,0c-.21,0-.43-.06-.65-.1a5.16,5.16,0,0,1-.62-.17A1.94,1.94,0,0,1,125.56,53.71Z"/><path class="cls-3" d="M138,51.08h-4.59a2.43,2.43,0,0,0,.58,1.68,2,2,0,0,0,1.54.59,3.19,3.19,0,0,0,2-.72v1a3.77,3.77,0,0,1-2.27.62,2.75,2.75,0,0,1-2.17-.89,3.63,3.63,0,0,1-.79-2.49,3.55,3.55,0,0,1,.86-2.47,2.76,2.76,0,0,1,2.14-1,2.44,2.44,0,0,1,2,.83,3.44,3.44,0,0,1,.7,2.29Zm-1.07-.88a2.12,2.12,0,0,0-.44-1.4,1.48,1.48,0,0,0-1.19-.5,1.68,1.68,0,0,0-1.25.53,2.4,2.4,0,0,0-.63,1.38Z"/><path class="cls-3" d="M145.1,57.06h-1V53h0a2.33,2.33,0,0,1-2.22,1.27,2.44,2.44,0,0,1-2-.87,3.56,3.56,0,0,1-.74-2.38,3.9,3.9,0,0,1,.81-2.59,2.7,2.7,0,0,1,2.18-1A2,2,0,0,1,144,48.48h0v-.9h1Zm-1-5.92V50.2a1.89,1.89,0,0,0-.52-1.35,1.76,1.76,0,0,0-1.33-.55,1.78,1.78,0,0,0-1.48.7,3.1,3.1,0,0,0-.55,2,2.69,2.69,0,0,0,.53,1.76,1.68,1.68,0,0,0,1.36.64,1.83,1.83,0,0,0,1.46-.62A2.31,2.31,0,0,0,144.06,51.15Z"/><path class="cls-3" d="M152.46,54.07h-1V53h0a2.14,2.14,0,0,1-2,1.18q-2.32,0-2.32-2.77V47.57h1v3.72q0,2.06,1.57,2.06a1.59,1.59,0,0,0,1.25-.56,2.15,2.15,0,0,0,.49-1.47V47.57h1Z"/><path class="cls-3" d="M159.79,51.08H155.2a2.43,2.43,0,0,0,.58,1.68,2,2,0,0,0,1.54.59,3.19,3.19,0,0,0,2-.72v1a3.77,3.77,0,0,1-2.27.62,2.75,2.75,0,0,1-2.17-.89,3.63,3.63,0,0,1-.79-2.49,3.55,3.55,0,0,1,.86-2.47,2.76,2.76,0,0,1,2.14-1,2.44,2.44,0,0,1,2,.83,3.44,3.44,0,0,1,.7,2.29Zm-1.07-.88a2.12,2.12,0,0,0-.44-1.4,1.48,1.48,0,0,0-1.19-.5,1.68,1.68,0,0,0-1.25.53,2.4,2.4,0,0,0-.63,1.38Z"/><path class="cls-3" d="M166.76,54.07h-1V50.37q0-2.07-1.51-2.07a1.64,1.64,0,0,0-1.29.59,2.18,2.18,0,0,0-.51,1.48v3.71h-1v-6.5h1v1.08h0a2.34,2.34,0,0,1,2.13-1.23,2,2,0,0,1,1.63.69,3.07,3.07,0,0,1,.56,2Z"/><path class="cls-3" d="M173.15,53.78a3.38,3.38,0,0,1-1.78.45,2.94,2.94,0,0,1-2.24-.9,3.28,3.28,0,0,1-.85-2.35,3.6,3.6,0,0,1,.92-2.58,3.22,3.22,0,0,1,2.46-1,3.42,3.42,0,0,1,1.51.32v1.07a2.65,2.65,0,0,0-1.55-.51A2.09,2.09,0,0,0,170,49a2.71,2.71,0,0,0-.64,1.88,2.58,2.58,0,0,0,.6,1.8,2.07,2.07,0,0,0,1.61.66,2.61,2.61,0,0,0,1.6-.57Z"/><path class="cls-3" d="M180,51.08h-4.59a2.43,2.43,0,0,0,.58,1.68,2,2,0,0,0,1.54.59,3.19,3.19,0,0,0,2-.72v1a3.77,3.77,0,0,1-2.27.62,2.75,2.75,0,0,1-2.17-.89,3.63,3.63,0,0,1-.79-2.49,3.55,3.55,0,0,1,.86-2.47,2.76,2.76,0,0,1,2.14-1,2.44,2.44,0,0,1,2,.83,3.44,3.44,0,0,1,.7,2.29Zm-1.07-.88a2.12,2.12,0,0,0-.44-1.4,1.48,1.48,0,0,0-1.19-.5,1.68,1.68,0,0,0-1.25.53,2.4,2.4,0,0,0-.63,1.38Z"/><path class="cls-3" d="M17.65,75.69a5.34,5.34,0,0,1-2.51.53A4.06,4.06,0,0,1,12,75a4.61,4.61,0,0,1-1.17-3.28,4.83,4.83,0,0,1,1.31-3.53,4.46,4.46,0,0,1,3.33-1.35,5.36,5.36,0,0,1,2.15.37v1.14a4.35,4.35,0,0,0-2.16-.55,3.31,3.31,0,0,0-2.54,1,3.94,3.94,0,0,0-1,2.8,3.76,3.76,0,0,0,.91,2.65,3.1,3.1,0,0,0,2.39,1,4.48,4.48,0,0,0,2.37-.61Z"/><path class="cls-3" d="M24.76,76.07h-1V72.33q0-2-1.51-2a1.65,1.65,0,0,0-1.28.59,2.19,2.19,0,0,0-.52,1.51v3.68h-1V66.45h1v4.2h0a2.36,2.36,0,0,1,2.13-1.23q2.2,0,2.2,2.65Z"/><path class="cls-3" d="M31.37,76.07h-1v-1h0a2.18,2.18,0,0,1-2,1.17,2.14,2.14,0,0,1-1.52-.51,1.78,1.78,0,0,1-.55-1.37q0-1.82,2.14-2.12L30.33,72q0-1.66-1.34-1.66a3.2,3.2,0,0,0-2.12.8V70a4,4,0,0,1,2.21-.61q2.29,0,2.29,2.42Zm-1-3.29L28.76,73a2.55,2.55,0,0,0-1.09.36,1,1,0,0,0-.37.91,1,1,0,0,0,.34.78,1.31,1.31,0,0,0,.9.3,1.67,1.67,0,0,0,1.28-.54,1.94,1.94,0,0,0,.5-1.37Z"/><path class="cls-3" d="M38.73,76.07h-1V72.37q0-2.07-1.51-2.07a1.64,1.64,0,0,0-1.29.59,2.18,2.18,0,0,0-.51,1.48v3.71h-1v-6.5h1v1.08h0a2.35,2.35,0,0,1,2.13-1.23,2,2,0,0,1,1.63.69,3.07,3.07,0,0,1,.57,2Z"/><path class="cls-3" d="M46.24,75.55q0,3.58-3.43,3.58a4.6,4.6,0,0,1-2.11-.46v-1a4.33,4.33,0,0,0,2.09.61q2.4,0,2.4-2.55V75h0a2.63,2.63,0,0,1-4.19.38A3.47,3.47,0,0,1,40.25,73,4,4,0,0,1,41,70.4a2.66,2.66,0,0,1,2.18-1,2.12,2.12,0,0,1,1.95,1.05h0v-.9h1Zm-1-2.42v-1a1.86,1.86,0,0,0-.52-1.33,1.73,1.73,0,0,0-1.3-.55,1.81,1.81,0,0,0-1.51.7,3.14,3.14,0,0,0-.55,2,2.69,2.69,0,0,0,.52,1.74,1.69,1.69,0,0,0,1.39.65,1.81,1.81,0,0,0,1.42-.62A2.32,2.32,0,0,0,45.2,73.13Z"/><path class="cls-3" d="M53.57,73.08H49a2.43,2.43,0,0,0,.58,1.68,2,2,0,0,0,1.54.59,3.19,3.19,0,0,0,2-.72v1a3.77,3.77,0,0,1-2.27.62,2.75,2.75,0,0,1-2.16-.89,3.62,3.62,0,0,1-.79-2.49,3.55,3.55,0,0,1,.86-2.47,2.76,2.76,0,0,1,2.14-1,2.45,2.45,0,0,1,2,.83,3.44,3.44,0,0,1,.7,2.29ZM52.5,72.2a2.12,2.12,0,0,0-.43-1.4,1.48,1.48,0,0,0-1.19-.5,1.68,1.68,0,0,0-1.25.53A2.39,2.39,0,0,0,49,72.2Z"/><path class="cls-3" d="M63.46,67.94H59.91v3.15H63.2v1H59.91v4H58.84V67h4.62Z"/><path class="cls-3" d="M65.58,67.92a.66.66,0,0,1-.48-.19.64.64,0,0,1-.2-.48.67.67,0,0,1,.67-.68.67.67,0,0,1,.49.19.68.68,0,0,1,0,1A.66.66,0,0,1,65.58,67.92Zm.51,8.15h-1v-6.5h1Z"/><path class="cls-3" d="M69.24,76.07h-1V66.45h1Z"/><path class="cls-3" d="M76.57,73.08H72a2.43,2.43,0,0,0,.58,1.68,2,2,0,0,0,1.54.59,3.19,3.19,0,0,0,2-.72v1a3.77,3.77,0,0,1-2.27.62,2.75,2.75,0,0,1-2.16-.89,3.62,3.62,0,0,1-.79-2.49,3.55,3.55,0,0,1,.86-2.47,2.76,2.76,0,0,1,2.14-1,2.45,2.45,0,0,1,2,.83,3.44,3.44,0,0,1,.7,2.29Zm-1.07-.88a2.12,2.12,0,0,0-.43-1.4,1.48,1.48,0,0,0-1.19-.5,1.68,1.68,0,0,0-1.25.53A2.39,2.39,0,0,0,72,72.2Z"/><path class="cls-3" d="M86.67,76.07H81.85V67h4.62v1H82.91v3H86.2v1H82.91v3.19h3.76Z"/><path class="cls-3" d="M93.68,76.07h-1V72.37q0-2.07-1.51-2.07a1.64,1.64,0,0,0-1.29.59,2.18,2.18,0,0,0-.51,1.48v3.71h-1v-6.5h1v1.08h0a2.35,2.35,0,0,1,2.13-1.23,2,2,0,0,1,1.63.69,3.07,3.07,0,0,1,.56,2Z"/><path class="cls-3" d="M100.07,75.78a3.38,3.38,0,0,1-1.78.45,2.94,2.94,0,0,1-2.24-.9A3.28,3.28,0,0,1,95.2,73a3.6,3.6,0,0,1,.92-2.58,3.22,3.22,0,0,1,2.46-1,3.41,3.41,0,0,1,1.51.32v1.07a2.64,2.64,0,0,0-1.55-.51A2.1,2.1,0,0,0,96.9,71a2.72,2.72,0,0,0-.64,1.88,2.58,2.58,0,0,0,.6,1.8,2.07,2.07,0,0,0,1.61.66,2.61,2.61,0,0,0,1.6-.57Z"/><path class="cls-3" d="M104.36,76.23a3,3,0,0,1-2.3-.91,3.37,3.37,0,0,1-.86-2.42,3.52,3.52,0,0,1,.9-2.56,3.22,3.22,0,0,1,2.42-.92,2.92,2.92,0,0,1,2.27.89,3.56,3.56,0,0,1,.81,2.48,3.49,3.49,0,0,1-.88,2.49A3.08,3.08,0,0,1,104.36,76.23Zm.08-5.93a2,2,0,0,0-1.59.68,2.81,2.81,0,0,0-.58,1.88,2.65,2.65,0,0,0,.59,1.82,2,2,0,0,0,1.58.67A1.9,1.9,0,0,0,106,74.7a2.83,2.83,0,0,0,.54-1.86A2.88,2.88,0,0,0,106,71,1.89,1.89,0,0,0,104.44,70.3Z"/><path class="cls-3" d="M114.81,76.07h-1V75h0a2.62,2.62,0,0,1-4.19.38,3.57,3.57,0,0,1-.73-2.38,3.9,3.9,0,0,1,.81-2.58,2.68,2.68,0,0,1,2.17-1,2.08,2.08,0,0,1,1.95,1.05h0v-4h1Zm-1-2.94v-1a1.86,1.86,0,0,0-.52-1.33,1.75,1.75,0,0,0-1.32-.55,1.8,1.8,0,0,0-1.5.7,3.06,3.06,0,0,0-.55,1.93,2.76,2.76,0,0,0,.52,1.77,1.71,1.71,0,0,0,1.41.65,1.78,1.78,0,0,0,1.41-.63A2.34,2.34,0,0,0,113.77,73.13Z"/><path class="cls-3" d="M117.45,67.92a.66.66,0,0,1-.48-.19.64.64,0,0,1-.2-.48.67.67,0,0,1,.67-.68.67.67,0,0,1,.49.19.68.68,0,0,1,0,1A.66.66,0,0,1,117.45,67.92Zm.51,8.15h-1v-6.5h1Z"/><path class="cls-3" d="M125.46,76.07h-1V72.37q0-2.07-1.51-2.07a1.64,1.64,0,0,0-1.29.59,2.18,2.18,0,0,0-.51,1.48v3.71h-1v-6.5h1v1.08h0a2.35,2.35,0,0,1,2.13-1.23,2,2,0,0,1,1.63.69,3.07,3.07,0,0,1,.57,2Z"/><path class="cls-3" d="M133,75.55q0,3.58-3.43,3.58a4.6,4.6,0,0,1-2.11-.46v-1a4.33,4.33,0,0,0,2.09.61q2.4,0,2.4-2.55V75h0a2.63,2.63,0,0,1-4.19.38A3.47,3.47,0,0,1,127,73a4,4,0,0,1,.8-2.63,2.66,2.66,0,0,1,2.18-1,2.12,2.12,0,0,1,1.95,1.05h0v-.9h1Zm-1-2.42v-1a1.86,1.86,0,0,0-.52-1.33,1.73,1.73,0,0,0-1.3-.55,1.81,1.81,0,0,0-1.51.7,3.14,3.14,0,0,0-.55,2,2.69,2.69,0,0,0,.52,1.74,1.69,1.69,0,0,0,1.39.65,1.81,1.81,0,0,0,1.42-.62A2.32,2.32,0,0,0,131.93,73.13Z"/><path class="cls-3" d="M17.65,97.69a5.34,5.34,0,0,1-2.51.53A4.06,4.06,0,0,1,12,97a4.61,4.61,0,0,1-1.17-3.28,4.83,4.83,0,0,1,1.31-3.53,4.46,4.46,0,0,1,3.33-1.35,5.36,5.36,0,0,1,2.15.37v1.14a4.35,4.35,0,0,0-2.16-.55,3.31,3.31,0,0,0-2.54,1,3.94,3.94,0,0,0-1,2.8,3.76,3.76,0,0,0,.91,2.65,3.1,3.1,0,0,0,2.39,1,4.48,4.48,0,0,0,2.37-.61Z"/><path class="cls-3" d="M24.76,98.07h-1V94.33q0-2-1.51-2a1.65,1.65,0,0,0-1.28.59,2.19,2.19,0,0,0-.52,1.51v3.68h-1V88.45h1v4.2h0a2.36,2.36,0,0,1,2.13-1.23q2.2,0,2.2,2.65Z"/><path class="cls-3" d="M31.37,98.07h-1v-1h0a2.18,2.18,0,0,1-2,1.17,2.14,2.14,0,0,1-1.52-.51,1.78,1.78,0,0,1-.55-1.37q0-1.82,2.14-2.12L30.33,94q0-1.66-1.34-1.66a3.2,3.2,0,0,0-2.12.8V92a4,4,0,0,1,2.21-.61q2.29,0,2.29,2.42Zm-1-3.29L28.76,95a2.55,2.55,0,0,0-1.09.36,1,1,0,0,0-.37.91,1,1,0,0,0,.34.78,1.31,1.31,0,0,0,.9.3,1.67,1.67,0,0,0,1.28-.54,1.94,1.94,0,0,0,.5-1.37Z"/><path class="cls-3" d="M38.73,98.07h-1V94.37q0-2.07-1.51-2.07a1.64,1.64,0,0,0-1.29.59,2.18,2.18,0,0,0-.51,1.48v3.71h-1v-6.5h1v1.08h0a2.35,2.35,0,0,1,2.13-1.23,2,2,0,0,1,1.63.69,3.07,3.07,0,0,1,.57,2Z"/><path class="cls-3" d="M46.24,97.55q0,3.58-3.43,3.58a4.6,4.6,0,0,1-2.11-.46v-1a4.33,4.33,0,0,0,2.09.61q2.4,0,2.4-2.55V97h0a2.63,2.63,0,0,1-4.19.38A3.47,3.47,0,0,1,40.25,95,4,4,0,0,1,41,92.4a2.66,2.66,0,0,1,2.18-1,2.12,2.12,0,0,1,1.95,1.05h0v-.9h1Zm-1-2.42v-1a1.86,1.86,0,0,0-.52-1.33,1.73,1.73,0,0,0-1.3-.55,1.81,1.81,0,0,0-1.51.7,3.14,3.14,0,0,0-.55,2,2.69,2.69,0,0,0,.52,1.74,1.69,1.69,0,0,0,1.39.65,1.81,1.81,0,0,0,1.42-.62A2.32,2.32,0,0,0,45.2,95.13Z"/><path class="cls-3" d="M53.57,95.08H49a2.43,2.43,0,0,0,.58,1.68,2,2,0,0,0,1.54.59,3.19,3.19,0,0,0,2-.72v1a3.77,3.77,0,0,1-2.27.62,2.75,2.75,0,0,1-2.16-.89,3.62,3.62,0,0,1-.79-2.49,3.55,3.55,0,0,1,.86-2.47,2.76,2.76,0,0,1,2.14-1,2.45,2.45,0,0,1,2,.83,3.44,3.44,0,0,1,.7,2.29ZM52.5,94.2a2.12,2.12,0,0,0-.43-1.4,1.48,1.48,0,0,0-1.19-.5,1.68,1.68,0,0,0-1.25.53A2.39,2.39,0,0,0,49,94.2Z"/><path class="cls-3" d="M63.57,98.07H58.84V89h1.07v8.14h3.66Z"/><path class="cls-3" d="M69.48,98.07h-1v-1h0a2.18,2.18,0,0,1-2,1.17,2.14,2.14,0,0,1-1.52-.51,1.78,1.78,0,0,1-.55-1.37q0-1.82,2.15-2.12L68.44,94q0-1.66-1.34-1.66a3.2,3.2,0,0,0-2.12.8V92a4,4,0,0,1,2.21-.61q2.29,0,2.29,2.42Zm-1-3.29L66.87,95a2.55,2.55,0,0,0-1.09.36,1,1,0,0,0-.37.91,1,1,0,0,0,.34.78,1.31,1.31,0,0,0,.9.3,1.67,1.67,0,0,0,1.28-.54,1.94,1.94,0,0,0,.5-1.37Z"/><path class="cls-3" d="M76.83,98.07h-1V94.37q0-2.07-1.51-2.07a1.64,1.64,0,0,0-1.29.59,2.18,2.18,0,0,0-.51,1.48v3.71h-1v-6.5h1v1.08h0a2.34,2.34,0,0,1,2.13-1.23,2,2,0,0,1,1.63.69,3.07,3.07,0,0,1,.57,2Z"/><path class="cls-3" d="M84.34,97.55q0,3.58-3.43,3.58a4.61,4.61,0,0,1-2.11-.46v-1a4.33,4.33,0,0,0,2.1.61q2.4,0,2.4-2.55V97h0a2.63,2.63,0,0,1-4.19.38A3.47,3.47,0,0,1,78.35,95a4,4,0,0,1,.8-2.63,2.66,2.66,0,0,1,2.18-1,2.12,2.12,0,0,1,1.95,1.05h0v-.9h1Zm-1-2.42v-1a1.86,1.86,0,0,0-.52-1.33,1.73,1.73,0,0,0-1.3-.55A1.81,1.81,0,0,0,80,93a3.13,3.13,0,0,0-.55,2,2.7,2.7,0,0,0,.52,1.74,1.69,1.69,0,0,0,1.39.65,1.81,1.81,0,0,0,1.42-.62A2.32,2.32,0,0,0,83.3,95.13Z"/><path class="cls-3" d="M91.71,98.07h-1V97h0a2.14,2.14,0,0,1-2,1.18q-2.32,0-2.32-2.77V91.57h1v3.72q0,2.06,1.57,2.06a1.59,1.59,0,0,0,1.25-.56,2.15,2.15,0,0,0,.49-1.47V91.57h1Z"/><path class="cls-3" d="M98.46,98.07h-1v-1h0a2.18,2.18,0,0,1-2,1.17,2.14,2.14,0,0,1-1.52-.51,1.79,1.79,0,0,1-.55-1.37q0-1.82,2.15-2.12L97.42,94q0-1.66-1.34-1.66a3.2,3.2,0,0,0-2.12.8V92a4,4,0,0,1,2.21-.61q2.29,0,2.29,2.42Zm-1-3.29L95.85,95a2.55,2.55,0,0,0-1.09.36,1,1,0,0,0-.37.91,1,1,0,0,0,.34.78,1.31,1.31,0,0,0,.9.3,1.67,1.67,0,0,0,1.28-.54,1.94,1.94,0,0,0,.5-1.37Z"/><path class="cls-3" d="M106,97.55q0,3.58-3.43,3.58a4.6,4.6,0,0,1-2.11-.46v-1a4.33,4.33,0,0,0,2.09.61q2.4,0,2.4-2.55V97h0a2.63,2.63,0,0,1-4.19.38A3.46,3.46,0,0,1,100,95a4,4,0,0,1,.8-2.63,2.66,2.66,0,0,1,2.18-1,2.12,2.12,0,0,1,1.95,1.05h0v-.9h1Zm-1-2.42v-1a1.86,1.86,0,0,0-.52-1.33,1.73,1.73,0,0,0-1.3-.55,1.81,1.81,0,0,0-1.51.7,3.13,3.13,0,0,0-.55,2,2.69,2.69,0,0,0,.52,1.74,1.69,1.69,0,0,0,1.39.65,1.81,1.81,0,0,0,1.43-.62A2.32,2.32,0,0,0,104.93,95.13Z"/><path class="cls-3" d="M113.3,95.08h-4.59a2.43,2.43,0,0,0,.58,1.68,2,2,0,0,0,1.54.59,3.19,3.19,0,0,0,2-.72v1a3.77,3.77,0,0,1-2.27.62,2.75,2.75,0,0,1-2.17-.89,3.63,3.63,0,0,1-.79-2.49,3.55,3.55,0,0,1,.86-2.47,2.76,2.76,0,0,1,2.14-1,2.44,2.44,0,0,1,2,.83,3.44,3.44,0,0,1,.7,2.29Zm-1.07-.88a2.12,2.12,0,0,0-.44-1.4,1.48,1.48,0,0,0-1.19-.5,1.68,1.68,0,0,0-1.25.53,2.4,2.4,0,0,0-.63,1.38Z"/><path class="cls-3" d="M127.86,98.07h-1.06V92q0-.72.09-1.77h0a5.69,5.69,0,0,1-.27.88l-3.11,7H123l-3.1-6.94a5.42,5.42,0,0,1-.27-.93h0q0,.54.05,1.78v6.09h-1V89H120l2.79,6.35a8.11,8.11,0,0,1,.42,1.09h0q.27-.75.44-1.12L126.52,89h1.33Z"/><path class="cls-3" d="M132.83,98.23a3,3,0,0,1-2.3-.91,3.37,3.37,0,0,1-.86-2.42,3.52,3.52,0,0,1,.9-2.56,3.22,3.22,0,0,1,2.42-.92,2.92,2.92,0,0,1,2.27.89,3.56,3.56,0,0,1,.81,2.48,3.49,3.49,0,0,1-.88,2.49A3.08,3.08,0,0,1,132.83,98.23Zm.08-5.93a2,2,0,0,0-1.59.68,2.81,2.81,0,0,0-.58,1.88,2.65,2.65,0,0,0,.59,1.82,2,2,0,0,0,1.58.67,1.9,1.9,0,0,0,1.55-.65,2.83,2.83,0,0,0,.54-1.86,2.88,2.88,0,0,0-.54-1.88A1.89,1.89,0,0,0,132.9,92.3Z"/><path class="cls-3" d="M143.27,98.07h-1V97h0a2.62,2.62,0,0,1-4.19.38,3.57,3.57,0,0,1-.73-2.38,3.9,3.9,0,0,1,.81-2.58,2.68,2.68,0,0,1,2.17-1,2.08,2.08,0,0,1,1.95,1.05h0v-4h1Zm-1-2.94v-1a1.86,1.86,0,0,0-.52-1.33,1.75,1.75,0,0,0-1.32-.55,1.8,1.8,0,0,0-1.5.7,3.06,3.06,0,0,0-.55,1.93,2.76,2.76,0,0,0,.52,1.77,1.71,1.71,0,0,0,1.41.65,1.78,1.78,0,0,0,1.41-.63A2.34,2.34,0,0,0,142.23,95.13Z"/><path class="cls-3" d="M150.61,95.08H146a2.43,2.43,0,0,0,.58,1.68,2,2,0,0,0,1.54.59,3.19,3.19,0,0,0,2-.72v1a3.77,3.77,0,0,1-2.27.62,2.74,2.74,0,0,1-2.16-.89,3.62,3.62,0,0,1-.79-2.49,3.55,3.55,0,0,1,.86-2.47,2.76,2.76,0,0,1,2.14-1,2.45,2.45,0,0,1,2,.83,3.44,3.44,0,0,1,.7,2.29Zm-1.07-.88a2.11,2.11,0,0,0-.44-1.4,1.48,1.48,0,0,0-1.19-.5,1.68,1.68,0,0,0-1.25.53A2.38,2.38,0,0,0,146,94.2Z"/><path class="cls-3" d="M17.65,119.69a5.34,5.34,0,0,1-2.51.53A4.06,4.06,0,0,1,12,119a4.61,4.61,0,0,1-1.17-3.28,4.83,4.83,0,0,1,1.31-3.53,4.46,4.46,0,0,1,3.33-1.35,5.36,5.36,0,0,1,2.15.37v1.14a4.35,4.35,0,0,0-2.16-.55,3.31,3.31,0,0,0-2.54,1,3.94,3.94,0,0,0-1,2.8,3.76,3.76,0,0,0,.91,2.65,3.1,3.1,0,0,0,2.39,1,4.48,4.48,0,0,0,2.37-.61Z"/><path class="cls-3" d="M20.4,120.07h-1v-9.62h1Z"/><path class="cls-3" d="M27.73,117.08H23.14a2.43,2.43,0,0,0,.58,1.68,2,2,0,0,0,1.54.59,3.19,3.19,0,0,0,2-.72v1a3.77,3.77,0,0,1-2.27.62,2.75,2.75,0,0,1-2.17-.89,3.63,3.63,0,0,1-.79-2.49,3.55,3.55,0,0,1,.86-2.47,2.76,2.76,0,0,1,2.14-1,2.44,2.44,0,0,1,2,.83,3.44,3.44,0,0,1,.7,2.29Zm-1.07-.88a2.12,2.12,0,0,0-.44-1.4,1.48,1.48,0,0,0-1.19-.5,1.68,1.68,0,0,0-1.25.53,2.4,2.4,0,0,0-.63,1.38Z"/><path class="cls-3" d="M34,120.07h-1v-1h0a2.18,2.18,0,0,1-2,1.17,2.14,2.14,0,0,1-1.52-.51,1.78,1.78,0,0,1-.55-1.37q0-1.82,2.14-2.12l1.95-.27q0-1.66-1.34-1.66a3.2,3.2,0,0,0-2.12.8V114a4,4,0,0,1,2.21-.61q2.29,0,2.29,2.42Zm-1-3.29-1.57.22a2.55,2.55,0,0,0-1.09.36,1,1,0,0,0-.37.91,1,1,0,0,0,.34.78,1.31,1.31,0,0,0,.9.3,1.67,1.67,0,0,0,1.28-.54,1.94,1.94,0,0,0,.5-1.37Z"/><path class="cls-3" d="M39.31,114.63a1.28,1.28,0,0,0-.79-.21,1.33,1.33,0,0,0-1.12.63,2.92,2.92,0,0,0-.45,1.71v3.31h-1v-6.5h1v1.34h0a2.27,2.27,0,0,1,.68-1.07,1.55,1.55,0,0,1,1-.38,1.7,1.7,0,0,1,.62.09Z"/><path class="cls-3" d="M49,120.07H44.14V111h4.62v1H45.21v3H48.5v1H45.21v3.19H49Z"/><path class="cls-3" d="M56.13,120.07h-1V119h0a2.4,2.4,0,0,1-2.23,1.26,2.43,2.43,0,0,1-2-.87,3.58,3.58,0,0,1-.73-2.38,3.9,3.9,0,0,1,.81-2.58,2.68,2.68,0,0,1,2.16-1,2.08,2.08,0,0,1,1.95,1.05h0v-4h1Zm-1-2.94v-1a1.86,1.86,0,0,0-.52-1.33,1.74,1.74,0,0,0-1.32-.55,1.8,1.8,0,0,0-1.5.7,3.06,3.06,0,0,0-.55,1.93,2.76,2.76,0,0,0,.52,1.77,1.71,1.71,0,0,0,1.41.65,1.78,1.78,0,0,0,1.41-.63A2.34,2.34,0,0,0,55.09,117.13Z"/><path class="cls-3" d="M58.77,111.92a.66.66,0,0,1-.48-.19.64.64,0,0,1-.2-.48.67.67,0,0,1,.67-.68.67.67,0,0,1,.49.19.68.68,0,0,1,0,1A.66.66,0,0,1,58.77,111.92Zm.51,8.15h-1v-6.5h1Z"/><path class="cls-3" d="M64.4,120a2,2,0,0,1-1,.2q-1.71,0-1.71-1.9v-3.85H60.6v-.89h1.12V112l1-.34v1.92H64.4v.89H62.76v3.66a1.52,1.52,0,0,0,.22.93.89.89,0,0,0,.74.28,1.1,1.1,0,0,0,.68-.22Z"/><path class="cls-3" d="M68.4,120.23a3,3,0,0,1-2.3-.91,3.37,3.37,0,0,1-.86-2.42,3.52,3.52,0,0,1,.89-2.56,3.22,3.22,0,0,1,2.42-.92,2.92,2.92,0,0,1,2.27.89,3.55,3.55,0,0,1,.82,2.48,3.49,3.49,0,0,1-.88,2.49A3.08,3.08,0,0,1,68.4,120.23Zm.08-5.93a2,2,0,0,0-1.59.68,2.81,2.81,0,0,0-.58,1.88,2.65,2.65,0,0,0,.59,1.82,2,2,0,0,0,1.58.67A1.9,1.9,0,0,0,70,118.7a2.84,2.84,0,0,0,.54-1.86A2.88,2.88,0,0,0,70,115,1.89,1.89,0,0,0,68.48,114.3Z"/><path class="cls-3" d="M76.69,114.63a1.27,1.27,0,0,0-.79-.21,1.33,1.33,0,0,0-1.11.63,2.91,2.91,0,0,0-.45,1.71v3.31h-1v-6.5h1v1.34h0a2.27,2.27,0,0,1,.68-1.07,1.55,1.55,0,0,1,1-.38,1.7,1.7,0,0,1,.62.09Z"/><path class="cls-3" d="M88.37,120.07H87.3v-4.15H82.59v4.15H81.52V111h1.07v4H87.3v-4h1.07Z"/><path class="cls-3" d="M91.15,111.92a.66.66,0,0,1-.48-.19.64.64,0,0,1-.2-.48.67.67,0,0,1,.67-.68.67.67,0,0,1,.49.19.68.68,0,0,1,0,1A.66.66,0,0,1,91.15,111.92Zm.51,8.15h-1v-6.5h1Z"/><path class="cls-3" d="M93.37,119.84v-1.12a3.09,3.09,0,0,0,1.87.63q1.37,0,1.37-.91a.79.79,0,0,0-.12-.44,1.17,1.17,0,0,0-.32-.32,2.44,2.44,0,0,0-.47-.25l-.58-.23a7.45,7.45,0,0,1-.76-.35,2.3,2.3,0,0,1-.55-.39,1.47,1.47,0,0,1-.33-.5,1.76,1.76,0,0,1-.11-.65,1.56,1.56,0,0,1,.21-.81,1.85,1.85,0,0,1,.56-.59,2.6,2.6,0,0,1,.8-.36,3.52,3.52,0,0,1,.92-.12,3.74,3.74,0,0,1,1.51.29v1.05a2.94,2.94,0,0,0-1.65-.47,2,2,0,0,0-.53.07,1.3,1.3,0,0,0-.4.19.87.87,0,0,0-.26.29.77.77,0,0,0-.09.37.9.9,0,0,0,.09.42.94.94,0,0,0,.27.3,2,2,0,0,0,.43.24l.58.23a8.15,8.15,0,0,1,.78.34,2.64,2.64,0,0,1,.58.39,1.53,1.53,0,0,1,.37.5,1.63,1.63,0,0,1,.13.68,1.61,1.61,0,0,1-.21.84,1.84,1.84,0,0,1-.57.59,2.61,2.61,0,0,1-.82.35,4,4,0,0,1-1,.11A3.69,3.69,0,0,1,93.37,119.84Z"/><path class="cls-3" d="M102.29,120a2,2,0,0,1-1,.2q-1.71,0-1.71-1.9v-3.85H98.5v-.89h1.12V112l1-.34v1.92h1.64v.89h-1.64v3.66a1.52,1.52,0,0,0,.22.93.88.88,0,0,0,.74.28,1.09,1.09,0,0,0,.68-.22Z"/><path class="cls-3" d="M106.3,120.23a3,3,0,0,1-2.3-.91,3.37,3.37,0,0,1-.86-2.42,3.51,3.51,0,0,1,.9-2.56,3.22,3.22,0,0,1,2.42-.92,2.92,2.92,0,0,1,2.27.89,3.56,3.56,0,0,1,.82,2.48,3.49,3.49,0,0,1-.88,2.49A3.08,3.08,0,0,1,106.3,120.23Zm.08-5.93a2,2,0,0,0-1.59.68,2.8,2.8,0,0,0-.58,1.88,2.64,2.64,0,0,0,.59,1.82,2,2,0,0,0,1.58.67,1.9,1.9,0,0,0,1.55-.65,2.84,2.84,0,0,0,.54-1.86,2.88,2.88,0,0,0-.54-1.88A1.89,1.89,0,0,0,106.38,114.3Z"/><path class="cls-3" d="M114.59,114.63a1.27,1.27,0,0,0-.79-.21,1.33,1.33,0,0,0-1.11.63,2.91,2.91,0,0,0-.45,1.71v3.31h-1v-6.5h1v1.34h0a2.27,2.27,0,0,1,.68-1.07,1.55,1.55,0,0,1,1-.38,1.69,1.69,0,0,1,.62.09Z"/><path class="cls-3" d="M121.41,113.57l-3,7.54q-.8,2-2.25,2a2.36,2.36,0,0,1-.68-.08v-.93a1.93,1.93,0,0,0,.62.11,1.28,1.28,0,0,0,1.18-.94l.52-1.23-2.54-6.49h1.16l1.76,5q0,.1.13.5h0q0-.15.13-.48l1.85-5Z"/><path class="cls-3" d="M17.65,141.69a5.34,5.34,0,0,1-2.51.53A4.06,4.06,0,0,1,12,141a4.61,4.61,0,0,1-1.17-3.28,4.83,4.83,0,0,1,1.31-3.53,4.46,4.46,0,0,1,3.33-1.35,5.36,5.36,0,0,1,2.15.37v1.14a4.35,4.35,0,0,0-2.16-.55,3.31,3.31,0,0,0-2.54,1,3.94,3.94,0,0,0-1,2.8,3.76,3.76,0,0,0,.91,2.65,3.1,3.1,0,0,0,2.39,1,4.48,4.48,0,0,0,2.37-.61Z"/><path class="cls-3" d="M20.4,142.07h-1v-9.62h1Z"/><path class="cls-3" d="M25.23,142.23a3,3,0,0,1-2.3-.91,3.37,3.37,0,0,1-.86-2.42,3.51,3.51,0,0,1,.9-2.56,3.22,3.22,0,0,1,2.42-.92,2.92,2.92,0,0,1,2.27.89,3.56,3.56,0,0,1,.82,2.48,3.49,3.49,0,0,1-.88,2.49A3.08,3.08,0,0,1,25.23,142.23Zm.08-5.93a2,2,0,0,0-1.59.68,2.8,2.8,0,0,0-.58,1.88,2.64,2.64,0,0,0,.59,1.82,2,2,0,0,0,1.58.67,1.9,1.9,0,0,0,1.55-.65,2.84,2.84,0,0,0,.54-1.86,2.88,2.88,0,0,0-.54-1.88A1.89,1.89,0,0,0,25.3,136.3Z"/><path class="cls-3" d="M29.73,141.84v-1.12a3.09,3.09,0,0,0,1.87.63q1.37,0,1.37-.91a.8.8,0,0,0-.12-.44,1.16,1.16,0,0,0-.32-.32,2.46,2.46,0,0,0-.47-.25l-.58-.23a7.47,7.47,0,0,1-.76-.35,2.29,2.29,0,0,1-.55-.39,1.47,1.47,0,0,1-.33-.5,1.76,1.76,0,0,1-.11-.65,1.56,1.56,0,0,1,.21-.81,1.87,1.87,0,0,1,.56-.59,2.6,2.6,0,0,1,.8-.36,3.51,3.51,0,0,1,.92-.12,3.74,3.74,0,0,1,1.51.29v1.05a2.94,2.94,0,0,0-1.65-.47,1.94,1.94,0,0,0-.53.07,1.3,1.3,0,0,0-.4.19.86.86,0,0,0-.26.29.77.77,0,0,0-.09.37.9.9,0,0,0,.09.42.92.92,0,0,0,.27.3,2.06,2.06,0,0,0,.43.24l.58.23a8.23,8.23,0,0,1,.77.34,2.64,2.64,0,0,1,.58.39,1.52,1.52,0,0,1,.37.5,1.8,1.8,0,0,1-.08,1.52,1.82,1.82,0,0,1-.57.59,2.61,2.61,0,0,1-.82.35,4,4,0,0,1-1,.11A3.69,3.69,0,0,1,29.73,141.84Z"/><path class="cls-3" d="M40.87,139.08H36.28a2.43,2.43,0,0,0,.58,1.68,2,2,0,0,0,1.54.59,3.19,3.19,0,0,0,2-.72v1a3.77,3.77,0,0,1-2.27.62,2.74,2.74,0,0,1-2.16-.89,3.62,3.62,0,0,1-.79-2.49,3.55,3.55,0,0,1,.86-2.47,2.76,2.76,0,0,1,2.14-1,2.45,2.45,0,0,1,2,.83,3.44,3.44,0,0,1,.7,2.29Zm-1.07-.88a2.11,2.11,0,0,0-.44-1.4,1.48,1.48,0,0,0-1.19-.5,1.68,1.68,0,0,0-1.25.53,2.38,2.38,0,0,0-.63,1.38Z"/><path class="cls-3" d="M53.48,142.07H52.17l-4.68-7.26a3,3,0,0,1-.29-.57h0a9.48,9.48,0,0,1,.05,1.25v6.58H46.14V133h1.38l4.56,7.14c.19.3.31.5.37.61h0a9.73,9.73,0,0,1-.06-1.34V133h1.07Z"/><path class="cls-3" d="M58.44,142.23a3,3,0,0,1-2.3-.91,3.37,3.37,0,0,1-.86-2.42,3.52,3.52,0,0,1,.89-2.56,3.22,3.22,0,0,1,2.42-.92,2.92,2.92,0,0,1,2.27.89,3.55,3.55,0,0,1,.82,2.48,3.49,3.49,0,0,1-.88,2.49A3.08,3.08,0,0,1,58.44,142.23Zm.08-5.93a2,2,0,0,0-1.59.68,2.8,2.8,0,0,0-.58,1.88,2.65,2.65,0,0,0,.59,1.82,2,2,0,0,0,1.58.67,1.9,1.9,0,0,0,1.55-.65,2.84,2.84,0,0,0,.54-1.86,2.89,2.89,0,0,0-.54-1.88A1.89,1.89,0,0,0,58.52,136.3Z"/><path class="cls-3" d="M66.36,142a2,2,0,0,1-1,.2q-1.71,0-1.71-1.9v-3.85H62.56v-.89h1.12V134l1-.34v1.92h1.64v.89H64.72v3.66a1.52,1.52,0,0,0,.22.93.89.89,0,0,0,.74.28,1.1,1.1,0,0,0,.68-.22Z"/><path class="cls-3" d="M68.28,133.92a.66.66,0,0,1-.48-.19.64.64,0,0,1-.2-.48.67.67,0,0,1,.67-.68.67.67,0,0,1,.48.19.67.67,0,0,1,0,1A.66.66,0,0,1,68.28,133.92Zm.51,8.15h-1v-6.5h1Z"/><path class="cls-3" d="M74.11,133.37a1.39,1.39,0,0,0-.69-.17q-1.09,0-1.09,1.38v1h1.52v.89H72.33v5.61h-1v-5.61H70.18v-.89h1.11v-1.05a2.19,2.19,0,0,1,.59-1.62,2,2,0,0,1,1.47-.59,2,2,0,0,1,.75.11Z"/><path class="cls-3" d="M75.5,133.92a.66.66,0,0,1-.48-.19.64.64,0,0,1-.2-.48.67.67,0,0,1,.67-.68.67.67,0,0,1,.49.19.68.68,0,0,1,0,1A.66.66,0,0,1,75.5,133.92Zm.51,8.15H75v-6.5h1Z"/><path class="cls-3" d="M82.55,141.78a3.38,3.38,0,0,1-1.78.45,2.94,2.94,0,0,1-2.24-.9,3.28,3.28,0,0,1-.85-2.35,3.6,3.6,0,0,1,.92-2.58,3.22,3.22,0,0,1,2.46-1,3.41,3.41,0,0,1,1.51.32v1.07A2.64,2.64,0,0,0,81,136.3a2.1,2.1,0,0,0-1.63.71,2.71,2.71,0,0,0-.64,1.88,2.58,2.58,0,0,0,.6,1.8,2.07,2.07,0,0,0,1.61.66,2.61,2.61,0,0,0,1.6-.57Z"/><path class="cls-3" d="M88.77,142.07h-1v-1h0a2.18,2.18,0,0,1-2,1.17,2.14,2.14,0,0,1-1.52-.51,1.78,1.78,0,0,1-.55-1.37q0-1.82,2.15-2.12l1.95-.27q0-1.66-1.34-1.66a3.2,3.2,0,0,0-2.12.8V136a4,4,0,0,1,2.21-.61q2.29,0,2.29,2.42Zm-1-3.29-1.57.22a2.55,2.55,0,0,0-1.09.36,1,1,0,0,0-.37.91A1,1,0,0,0,85,141a1.31,1.31,0,0,0,.9.3,1.67,1.67,0,0,0,1.28-.54,1.94,1.94,0,0,0,.5-1.37Z"/><path class="cls-3" d="M93.75,142a2,2,0,0,1-1,.2q-1.71,0-1.71-1.9v-3.85H90v-.89h1.12V134l1-.34v1.92h1.64v.89H92.11v3.66a1.52,1.52,0,0,0,.22.93.89.89,0,0,0,.74.28,1.1,1.1,0,0,0,.68-.22Z"/><path class="cls-3" d="M95.67,133.92a.66.66,0,0,1-.48-.19.64.64,0,0,1-.2-.48.67.67,0,0,1,.67-.68.67.67,0,0,1,.49.19.68.68,0,0,1,0,1A.66.66,0,0,1,95.67,133.92Zm.51,8.15h-1v-6.5h1Z"/><path class="cls-3" d="M101,142.23a3,3,0,0,1-2.3-.91,3.37,3.37,0,0,1-.86-2.42,3.52,3.52,0,0,1,.89-2.56,3.22,3.22,0,0,1,2.42-.92,2.92,2.92,0,0,1,2.27.89,3.55,3.55,0,0,1,.82,2.48,3.49,3.49,0,0,1-.88,2.49A3.08,3.08,0,0,1,101,142.23Zm.08-5.93a2,2,0,0,0-1.59.68,2.81,2.81,0,0,0-.58,1.88,2.65,2.65,0,0,0,.59,1.82,2,2,0,0,0,1.58.67,1.9,1.9,0,0,0,1.55-.65,2.84,2.84,0,0,0,.54-1.86,2.88,2.88,0,0,0-.54-1.88A1.89,1.89,0,0,0,101.08,136.3Z"/><path class="cls-3" d="M111.3,142.07h-1v-3.71q0-2.07-1.51-2.07a1.64,1.64,0,0,0-1.29.59,2.18,2.18,0,0,0-.51,1.48v3.71h-1v-6.5h1v1.08h0a2.35,2.35,0,0,1,2.13-1.23,2,2,0,0,1,1.63.69,3.07,3.07,0,0,1,.56,2Z"/><path class="cls-3" d="M126.24,142.07h-1.06V136q0-.72.09-1.77h0a5.6,5.6,0,0,1-.27.88l-3.11,7h-.52l-3.1-6.94a5.53,5.53,0,0,1-.27-.93h0q.05.54.05,1.78v6.09h-1V133h1.41l2.79,6.35a8.11,8.11,0,0,1,.42,1.09h0q.27-.75.44-1.12l2.85-6.32h1.33Z"/><path class="cls-3" d="M133.72,139.08h-4.59a2.43,2.43,0,0,0,.58,1.68,2,2,0,0,0,1.54.59,3.19,3.19,0,0,0,2-.72v1a3.77,3.77,0,0,1-2.27.62,2.74,2.74,0,0,1-2.16-.89,3.62,3.62,0,0,1-.79-2.49,3.55,3.55,0,0,1,.86-2.47,2.76,2.76,0,0,1,2.14-1,2.45,2.45,0,0,1,2,.83,3.44,3.44,0,0,1,.7,2.29Zm-1.07-.88a2.11,2.11,0,0,0-.44-1.4,1.48,1.48,0,0,0-1.19-.5,1.68,1.68,0,0,0-1.25.53,2.38,2.38,0,0,0-.63,1.38Z"/><path class="cls-3" d="M134.9,141.84v-1.12a3.09,3.09,0,0,0,1.87.63q1.37,0,1.37-.91A.8.8,0,0,0,138,140a1.16,1.16,0,0,0-.32-.32,2.46,2.46,0,0,0-.47-.25l-.58-.23a7.47,7.47,0,0,1-.76-.35,2.29,2.29,0,0,1-.55-.39,1.47,1.47,0,0,1-.33-.5,1.76,1.76,0,0,1-.11-.65,1.56,1.56,0,0,1,.21-.81,1.87,1.87,0,0,1,.56-.59,2.6,2.6,0,0,1,.8-.36,3.51,3.51,0,0,1,.92-.12,3.74,3.74,0,0,1,1.51.29v1.05a2.94,2.94,0,0,0-1.65-.47,1.94,1.94,0,0,0-.53.07,1.3,1.3,0,0,0-.4.19.86.86,0,0,0-.26.29.77.77,0,0,0-.09.37.9.9,0,0,0,.09.42.92.92,0,0,0,.27.3,2.06,2.06,0,0,0,.43.24l.58.23a8.23,8.23,0,0,1,.77.34,2.64,2.64,0,0,1,.58.39,1.52,1.52,0,0,1,.37.5,1.8,1.8,0,0,1-.08,1.52,1.82,1.82,0,0,1-.57.59,2.61,2.61,0,0,1-.82.35,4,4,0,0,1-1,.11A3.69,3.69,0,0,1,134.9,141.84Z"/><path class="cls-3" d="M140.42,141.84v-1.12a3.09,3.09,0,0,0,1.87.63q1.37,0,1.37-.91a.79.79,0,0,0-.12-.44,1.17,1.17,0,0,0-.32-.32,2.44,2.44,0,0,0-.47-.25l-.58-.23a7.45,7.45,0,0,1-.76-.35,2.3,2.3,0,0,1-.55-.39,1.47,1.47,0,0,1-.33-.5,1.76,1.76,0,0,1-.11-.65,1.56,1.56,0,0,1,.21-.81,1.85,1.85,0,0,1,.56-.59,2.6,2.6,0,0,1,.8-.36,3.52,3.52,0,0,1,.92-.12,3.74,3.74,0,0,1,1.51.29v1.05a2.94,2.94,0,0,0-1.65-.47,2,2,0,0,0-.53.07,1.3,1.3,0,0,0-.4.19.87.87,0,0,0-.26.29.77.77,0,0,0-.09.37.9.9,0,0,0,.09.42.94.94,0,0,0,.27.3,2,2,0,0,0,.43.24l.58.23a8.15,8.15,0,0,1,.78.34,2.64,2.64,0,0,1,.58.39,1.53,1.53,0,0,1,.37.5,1.63,1.63,0,0,1,.13.68,1.61,1.61,0,0,1-.21.84,1.84,1.84,0,0,1-.57.59,2.61,2.61,0,0,1-.82.35,4,4,0,0,1-1,.11A3.69,3.69,0,0,1,140.42,141.84Z"/><path class="cls-3" d="M151,142.07h-1v-1h0a2.18,2.18,0,0,1-2,1.17,2.14,2.14,0,0,1-1.52-.51,1.78,1.78,0,0,1-.55-1.37q0-1.82,2.15-2.12l1.95-.27q0-1.66-1.34-1.66a3.2,3.2,0,0,0-2.12.8V136a4,4,0,0,1,2.21-.61q2.29,0,2.29,2.42Zm-1-3.29-1.57.22a2.55,2.55,0,0,0-1.09.36,1,1,0,0,0-.37.91,1,1,0,0,0,.34.78,1.31,1.31,0,0,0,.9.3,1.67,1.67,0,0,0,1.28-.54,1.94,1.94,0,0,0,.5-1.37Z"/><path class="cls-3" d="M158.49,141.55q0,3.58-3.43,3.58a4.6,4.6,0,0,1-2.11-.46v-1a4.33,4.33,0,0,0,2.09.61q2.4,0,2.4-2.55V141h0a2.63,2.63,0,0,1-4.19.38,3.47,3.47,0,0,1-.74-2.33,4,4,0,0,1,.8-2.63,2.66,2.66,0,0,1,2.18-1,2.12,2.12,0,0,1,1.95,1.05h0v-.9h1Zm-1-2.42v-1a1.86,1.86,0,0,0-.52-1.33,1.73,1.73,0,0,0-1.3-.55,1.81,1.81,0,0,0-1.51.7,3.14,3.14,0,0,0-.55,2,2.69,2.69,0,0,0,.52,1.74,1.69,1.69,0,0,0,1.39.65,1.81,1.81,0,0,0,1.42-.62A2.32,2.32,0,0,0,157.45,139.13Z"/><path class="cls-3" d="M165.82,139.08h-4.59a2.43,2.43,0,0,0,.58,1.68,2,2,0,0,0,1.54.59,3.19,3.19,0,0,0,2-.72v1a3.77,3.77,0,0,1-2.27.62,2.75,2.75,0,0,1-2.16-.89,3.62,3.62,0,0,1-.79-2.49,3.55,3.55,0,0,1,.86-2.47,2.76,2.76,0,0,1,2.14-1,2.45,2.45,0,0,1,2,.83,3.44,3.44,0,0,1,.7,2.29Zm-1.07-.88a2.12,2.12,0,0,0-.43-1.4,1.48,1.48,0,0,0-1.19-.5,1.68,1.68,0,0,0-1.25.53,2.39,2.39,0,0,0-.63,1.38Z"/><path class="cls-3" d="M167,141.84v-1.12a3.09,3.09,0,0,0,1.87.63q1.37,0,1.37-.91a.79.79,0,0,0-.12-.44,1.17,1.17,0,0,0-.32-.32,2.44,2.44,0,0,0-.47-.25l-.58-.23a7.45,7.45,0,0,1-.76-.35,2.3,2.3,0,0,1-.55-.39,1.47,1.47,0,0,1-.33-.5,1.76,1.76,0,0,1-.11-.65,1.56,1.56,0,0,1,.21-.81,1.85,1.85,0,0,1,.56-.59,2.6,2.6,0,0,1,.8-.36,3.52,3.52,0,0,1,.92-.12,3.74,3.74,0,0,1,1.51.29v1.05a2.94,2.94,0,0,0-1.65-.47,2,2,0,0,0-.53.07,1.3,1.3,0,0,0-.4.19.87.87,0,0,0-.26.29.77.77,0,0,0-.09.37.9.9,0,0,0,.09.42.94.94,0,0,0,.27.3,2,2,0,0,0,.43.24l.58.23a8.15,8.15,0,0,1,.78.34,2.64,2.64,0,0,1,.58.39,1.53,1.53,0,0,1,.37.5,1.63,1.63,0,0,1,.13.68,1.61,1.61,0,0,1-.21.84,1.84,1.84,0,0,1-.57.59,2.61,2.61,0,0,1-.82.35,4,4,0,0,1-1,.11A3.69,3.69,0,0,1,167,141.84Z"/><path class="cls-3" d="M17.65,163.69a5.34,5.34,0,0,1-2.51.53A4.06,4.06,0,0,1,12,163a4.61,4.61,0,0,1-1.17-3.28,4.83,4.83,0,0,1,1.31-3.53,4.46,4.46,0,0,1,3.33-1.35,5.36,5.36,0,0,1,2.15.37v1.14a4.35,4.35,0,0,0-2.16-.55,3.31,3.31,0,0,0-2.54,1,3.94,3.94,0,0,0-1,2.8,3.76,3.76,0,0,0,.91,2.65,3.1,3.1,0,0,0,2.39,1,4.48,4.48,0,0,0,2.37-.61Z"/><path class="cls-3" d="M20.4,164.07h-1v-9.62h1Z"/><path class="cls-3" d="M25.23,164.23a3,3,0,0,1-2.3-.91,3.37,3.37,0,0,1-.86-2.42,3.51,3.51,0,0,1,.9-2.56,3.22,3.22,0,0,1,2.42-.92,2.92,2.92,0,0,1,2.27.89,3.56,3.56,0,0,1,.82,2.48,3.49,3.49,0,0,1-.88,2.49A3.08,3.08,0,0,1,25.23,164.23Zm.08-5.93a2,2,0,0,0-1.59.68,2.8,2.8,0,0,0-.58,1.88,2.64,2.64,0,0,0,.59,1.82,2,2,0,0,0,1.58.67,1.9,1.9,0,0,0,1.55-.65,2.84,2.84,0,0,0,.54-1.86,2.88,2.88,0,0,0-.54-1.88A1.89,1.89,0,0,0,25.3,158.3Z"/><path class="cls-3" d="M29.73,163.84v-1.12a3.09,3.09,0,0,0,1.87.63q1.37,0,1.37-.91a.8.8,0,0,0-.12-.44,1.16,1.16,0,0,0-.32-.32,2.46,2.46,0,0,0-.47-.25l-.58-.23a7.47,7.47,0,0,1-.76-.35,2.29,2.29,0,0,1-.55-.39,1.47,1.47,0,0,1-.33-.5,1.76,1.76,0,0,1-.11-.65,1.56,1.56,0,0,1,.21-.81,1.87,1.87,0,0,1,.56-.59,2.6,2.6,0,0,1,.8-.36,3.51,3.51,0,0,1,.92-.12,3.74,3.74,0,0,1,1.51.29v1.05a2.94,2.94,0,0,0-1.65-.47,1.94,1.94,0,0,0-.53.07,1.3,1.3,0,0,0-.4.19.86.86,0,0,0-.26.29.77.77,0,0,0-.09.37.9.9,0,0,0,.09.42.92.92,0,0,0,.27.3,2.06,2.06,0,0,0,.43.24l.58.23a8.23,8.23,0,0,1,.77.34,2.64,2.64,0,0,1,.58.39,1.52,1.52,0,0,1,.37.5,1.8,1.8,0,0,1-.08,1.52,1.82,1.82,0,0,1-.57.59,2.61,2.61,0,0,1-.82.35,4,4,0,0,1-1,.11A3.69,3.69,0,0,1,29.73,163.84Z"/><path class="cls-3" d="M40.87,161.08H36.28a2.43,2.43,0,0,0,.58,1.68,2,2,0,0,0,1.54.59,3.19,3.19,0,0,0,2-.72v1a3.77,3.77,0,0,1-2.27.62,2.74,2.74,0,0,1-2.16-.89,3.62,3.62,0,0,1-.79-2.49,3.55,3.55,0,0,1,.86-2.47,2.76,2.76,0,0,1,2.14-1,2.45,2.45,0,0,1,2,.83,3.44,3.44,0,0,1,.7,2.29Zm-1.07-.88a2.11,2.11,0,0,0-.44-1.4,1.48,1.48,0,0,0-1.19-.5,1.68,1.68,0,0,0-1.25.53,2.38,2.38,0,0,0-.63,1.38Z"/><path class="cls-3" d="M56.93,155l-2.57,9.1H53.11l-1.87-6.65a4.11,4.11,0,0,1-.15-.93h0a4.67,4.67,0,0,1-.17.91L49,164.07H47.78L45.11,155h1.17l1.94,7a4.63,4.63,0,0,1,.15.91h0a5.39,5.39,0,0,1,.2-.91l2-7h1l1.93,7a5,5,0,0,1,.15.85h0a5.15,5.15,0,0,1,.17-.88l1.86-7Z"/><path class="cls-3" d="M58.68,155.92a.66.66,0,0,1-.48-.19.64.64,0,0,1-.2-.48.67.67,0,0,1,.67-.68.67.67,0,0,1,.49.19.68.68,0,0,1,0,1A.66.66,0,0,1,58.68,155.92Zm.51,8.15h-1v-6.5h1Z"/><path class="cls-3" d="M66.69,164.07h-1v-3.71q0-2.07-1.51-2.07a1.64,1.64,0,0,0-1.29.59,2.18,2.18,0,0,0-.51,1.48v3.71h-1v-6.5h1v1.08h0a2.35,2.35,0,0,1,2.13-1.23,2,2,0,0,1,1.63.69,3.07,3.07,0,0,1,.56,2Z"/><path class="cls-3" d="M74.2,164.07h-1V163h0a2.62,2.62,0,0,1-4.19.38,3.58,3.58,0,0,1-.73-2.38,3.9,3.9,0,0,1,.81-2.58,2.68,2.68,0,0,1,2.16-1,2.09,2.09,0,0,1,1.95,1.05h0v-4h1Zm-1-2.94v-1a1.86,1.86,0,0,0-.52-1.33,1.74,1.74,0,0,0-1.32-.55,1.8,1.8,0,0,0-1.5.7,3.06,3.06,0,0,0-.54,1.93,2.75,2.75,0,0,0,.52,1.77,1.71,1.71,0,0,0,1.41.65,1.78,1.78,0,0,0,1.41-.63A2.35,2.35,0,0,0,73.16,161.13Z"/><path class="cls-3" d="M79,164.23a3,3,0,0,1-2.3-.91,3.37,3.37,0,0,1-.86-2.42,3.52,3.52,0,0,1,.9-2.56,3.22,3.22,0,0,1,2.42-.92,2.92,2.92,0,0,1,2.27.89,3.56,3.56,0,0,1,.81,2.48,3.49,3.49,0,0,1-.88,2.49A3.08,3.08,0,0,1,79,164.23Zm.08-5.93a2,2,0,0,0-1.59.68,2.81,2.81,0,0,0-.58,1.88,2.65,2.65,0,0,0,.59,1.82,2,2,0,0,0,1.58.67,1.9,1.9,0,0,0,1.55-.65,2.83,2.83,0,0,0,.54-1.86,2.88,2.88,0,0,0-.54-1.88A1.89,1.89,0,0,0,79.1,158.3Z"/><path class="cls-3" d="M92.11,157.57l-1.95,6.5H89.08l-1.34-4.65a3.08,3.08,0,0,1-.1-.6h0a2.76,2.76,0,0,1-.13.59L86,164.07H85l-2-6.5h1.09l1.35,4.89a2.94,2.94,0,0,1,.09.58h.05a2.73,2.73,0,0,1,.11-.6l1.5-4.87h1l1.35,4.9a3.47,3.47,0,0,1,.09.58h.05a2.67,2.67,0,0,1,.11-.58l1.32-4.9Z"/><path class="cls-3" d="M17.65,185.69a5.34,5.34,0,0,1-2.51.53A4.06,4.06,0,0,1,12,185a4.61,4.61,0,0,1-1.17-3.28,4.83,4.83,0,0,1,1.31-3.53,4.46,4.46,0,0,1,3.33-1.35,5.36,5.36,0,0,1,2.15.37v1.14a4.35,4.35,0,0,0-2.16-.55,3.31,3.31,0,0,0-2.54,1,3.94,3.94,0,0,0-1,2.8,3.76,3.76,0,0,0,.91,2.65,3.1,3.1,0,0,0,2.39,1,4.48,4.48,0,0,0,2.37-.61Z"/><path class="cls-3" d="M22.08,186.23a3,3,0,0,1-2.3-.91,3.37,3.37,0,0,1-.86-2.42,3.51,3.51,0,0,1,.9-2.56,3.22,3.22,0,0,1,2.42-.92,2.92,2.92,0,0,1,2.27.89,3.56,3.56,0,0,1,.82,2.48,3.49,3.49,0,0,1-.88,2.49A3.08,3.08,0,0,1,22.08,186.23Zm.08-5.93a2,2,0,0,0-1.59.68,2.8,2.8,0,0,0-.58,1.88,2.64,2.64,0,0,0,.59,1.82,2,2,0,0,0,1.58.67,1.9,1.9,0,0,0,1.55-.65,2.84,2.84,0,0,0,.54-1.86,2.88,2.88,0,0,0-.54-1.88A1.89,1.89,0,0,0,22.15,180.3Z"/><path class="cls-3" d="M32.37,186.07h-1v-3.71q0-2.07-1.51-2.07a1.64,1.64,0,0,0-1.29.59,2.18,2.18,0,0,0-.51,1.48v3.71H27v-6.5h1v1.08h0a2.34,2.34,0,0,1,2.13-1.23,2,2,0,0,1,1.63.69,3.07,3.07,0,0,1,.57,2Z"/><path class="cls-3" d="M37.55,177.37a1.39,1.39,0,0,0-.69-.17q-1.09,0-1.09,1.38v1h1.52v.89H35.76v5.61h-1v-5.61H33.62v-.89h1.11v-1.05a2.19,2.19,0,0,1,.59-1.62,2,2,0,0,1,1.47-.59,2,2,0,0,1,.75.11Z"/><path class="cls-3" d="M38.94,177.92a.66.66,0,0,1-.48-.19.64.64,0,0,1-.2-.48.67.67,0,0,1,.67-.68.67.67,0,0,1,.49.19.68.68,0,0,1,0,1A.66.66,0,0,1,38.94,177.92Zm.51,8.15h-1v-6.5h1Z"/><path class="cls-3" d="M47.1,185.55q0,3.58-3.43,3.58a4.6,4.6,0,0,1-2.11-.46v-1a4.33,4.33,0,0,0,2.09.61q2.4,0,2.4-2.55V185h0a2.63,2.63,0,0,1-4.19.38,3.47,3.47,0,0,1-.74-2.33,4,4,0,0,1,.8-2.63,2.66,2.66,0,0,1,2.18-1A2.12,2.12,0,0,1,46,180.48h0v-.9h1Zm-1-2.42v-1a1.86,1.86,0,0,0-.52-1.33,1.73,1.73,0,0,0-1.3-.55,1.81,1.81,0,0,0-1.51.7,3.14,3.14,0,0,0-.55,2,2.69,2.69,0,0,0,.52,1.74,1.69,1.69,0,0,0,1.39.65,1.81,1.81,0,0,0,1.42-.62A2.32,2.32,0,0,0,46.06,183.13Z"/><path class="cls-3" d="M54.46,186.07h-1v-1h0a2.14,2.14,0,0,1-2,1.18q-2.32,0-2.32-2.77v-3.88h1v3.72q0,2.06,1.57,2.06a1.59,1.59,0,0,0,1.25-.56,2.15,2.15,0,0,0,.49-1.47v-3.75h1Z"/><path class="cls-3" d="M60,180.63a1.28,1.28,0,0,0-.79-.21,1.33,1.33,0,0,0-1.12.63,2.92,2.92,0,0,0-.45,1.71v3.31h-1v-6.5h1v1.34h0a2.27,2.27,0,0,1,.68-1.07,1.55,1.55,0,0,1,1-.38,1.7,1.7,0,0,1,.62.09Z"/><path class="cls-3" d="M66.14,183.08H61.55a2.43,2.43,0,0,0,.58,1.68,2,2,0,0,0,1.54.59,3.19,3.19,0,0,0,2-.72v1a3.77,3.77,0,0,1-2.27.62,2.75,2.75,0,0,1-2.16-.89,3.62,3.62,0,0,1-.79-2.49,3.55,3.55,0,0,1,.86-2.47,2.76,2.76,0,0,1,2.14-1,2.45,2.45,0,0,1,2,.83,3.44,3.44,0,0,1,.7,2.29Zm-1.07-.88a2.12,2.12,0,0,0-.43-1.4,1.48,1.48,0,0,0-1.19-.5,1.68,1.68,0,0,0-1.25.53,2.39,2.39,0,0,0-.63,1.38Z"/><path class="cls-3" d="M76.13,186.07H71.41V177h1.07v8.14h3.66Z"/><path class="cls-3" d="M82,186.07H81v-1h0a2.18,2.18,0,0,1-2,1.17,2.14,2.14,0,0,1-1.52-.51,1.78,1.78,0,0,1-.55-1.37q0-1.82,2.15-2.12L81,182q0-1.66-1.34-1.66a3.2,3.2,0,0,0-2.12.8V180a4,4,0,0,1,2.21-.61q2.29,0,2.29,2.42Zm-1-3.29-1.57.22a2.55,2.55,0,0,0-1.09.36,1,1,0,0,0-.37.91,1,1,0,0,0,.34.78,1.31,1.31,0,0,0,.9.3,1.67,1.67,0,0,0,1.28-.54,1.94,1.94,0,0,0,.5-1.37Z"/><path class="cls-3" d="M89.4,186.07h-1v-3.71q0-2.07-1.51-2.07a1.64,1.64,0,0,0-1.29.59,2.18,2.18,0,0,0-.51,1.48v3.71H84v-6.5h1v1.08h0a2.34,2.34,0,0,1,2.13-1.23,2,2,0,0,1,1.63.69,3.07,3.07,0,0,1,.57,2Z"/><path class="cls-3" d="M96.91,185.55q0,3.58-3.43,3.58a4.61,4.61,0,0,1-2.11-.46v-1a4.33,4.33,0,0,0,2.1.61q2.4,0,2.4-2.55V185h0a2.63,2.63,0,0,1-4.19.38,3.47,3.47,0,0,1-.74-2.33,4,4,0,0,1,.8-2.63,2.66,2.66,0,0,1,2.18-1,2.12,2.12,0,0,1,1.95,1.05h0v-.9h1Zm-1-2.42v-1a1.86,1.86,0,0,0-.52-1.33,1.73,1.73,0,0,0-1.3-.55,1.81,1.81,0,0,0-1.51.7,3.13,3.13,0,0,0-.55,2,2.7,2.7,0,0,0,.52,1.74,1.69,1.69,0,0,0,1.39.65,1.81,1.81,0,0,0,1.42-.62A2.32,2.32,0,0,0,95.87,183.13Z"/><path class="cls-3" d="M104.27,186.07h-1v-1h0a2.14,2.14,0,0,1-2,1.18q-2.32,0-2.32-2.77v-3.88h1v3.72q0,2.06,1.57,2.06a1.59,1.59,0,0,0,1.25-.56,2.15,2.15,0,0,0,.49-1.47v-3.75h1Z"/><path class="cls-3" d="M111,186.07h-1v-1h0a2.18,2.18,0,0,1-2,1.17,2.14,2.14,0,0,1-1.52-.51,1.79,1.79,0,0,1-.55-1.37q0-1.82,2.15-2.12L110,182q0-1.66-1.34-1.66a3.2,3.2,0,0,0-2.12.8V180a4,4,0,0,1,2.21-.61q2.29,0,2.29,2.42Zm-1-3.29-1.57.22a2.55,2.55,0,0,0-1.09.36,1,1,0,0,0-.37.91,1,1,0,0,0,.34.78,1.31,1.31,0,0,0,.9.3,1.67,1.67,0,0,0,1.28-.54,1.94,1.94,0,0,0,.5-1.37Z"/><path class="cls-3" d="M118.54,185.55q0,3.58-3.43,3.58a4.6,4.6,0,0,1-2.11-.46v-1a4.33,4.33,0,0,0,2.09.61q2.4,0,2.4-2.55V185h0a2.63,2.63,0,0,1-4.19.38,3.46,3.46,0,0,1-.74-2.33,4,4,0,0,1,.8-2.63,2.66,2.66,0,0,1,2.18-1,2.12,2.12,0,0,1,1.95,1.05h0v-.9h1Zm-1-2.42v-1a1.86,1.86,0,0,0-.52-1.33,1.73,1.73,0,0,0-1.3-.55,1.81,1.81,0,0,0-1.51.7,3.13,3.13,0,0,0-.55,2,2.69,2.69,0,0,0,.52,1.74,1.69,1.69,0,0,0,1.39.65,1.81,1.81,0,0,0,1.43-.62A2.32,2.32,0,0,0,117.5,183.13Z"/><path class="cls-3" d="M125.87,183.08h-4.59a2.43,2.43,0,0,0,.58,1.68,2,2,0,0,0,1.54.59,3.19,3.19,0,0,0,2-.72v1a3.77,3.77,0,0,1-2.27.62,2.75,2.75,0,0,1-2.17-.89,3.63,3.63,0,0,1-.79-2.49,3.55,3.55,0,0,1,.86-2.47,2.76,2.76,0,0,1,2.14-1,2.44,2.44,0,0,1,2,.83,3.44,3.44,0,0,1,.7,2.29Zm-1.07-.88a2.12,2.12,0,0,0-.44-1.4,1.48,1.48,0,0,0-1.19-.5,1.68,1.68,0,0,0-1.25.53,2.4,2.4,0,0,0-.63,1.38Z"/><rect class="cls-6" width="386" height="197"/></g></g></svg>
\ No newline at end of file
diff --git a/src/vs/workbench/parts/welcome/overlay/browser/welcomeOverlay.css b/src/vs/workbench/parts/welcome/overlay/browser/welcomeOverlay.css
index bc843e58ab3..e76b3e08093 100644
--- a/src/vs/workbench/parts/welcome/overlay/browser/welcomeOverlay.css
+++ b/src/vs/workbench/parts/welcome/overlay/browser/welcomeOverlay.css
@@ -97,6 +97,12 @@
 	left: 45px;
 }
 
+.monaco-workbench > .welcomeOverlay > .key.terminal {
+	position: absolute;
+	bottom: 25px;
+	left: 50%;
+}
+
 .monaco-workbench > .welcomeOverlay > .key.notifications {
 	position: absolute;
 	bottom: 25px;
diff --git a/src/vs/workbench/parts/welcome/overlay/browser/welcomeOverlay.ts b/src/vs/workbench/parts/welcome/overlay/browser/welcomeOverlay.ts
index 8bff80b2110..3f3b889a802 100644
--- a/src/vs/workbench/parts/welcome/overlay/browser/welcomeOverlay.ts
+++ b/src/vs/workbench/parts/welcome/overlay/browser/welcomeOverlay.ts
@@ -5,7 +5,6 @@
 'use strict';
 
 import 'vs/css!./welcomeOverlay';
-import { $, Builder } from 'vs/base/browser/builder';
 import * as dom from 'vs/base/browser/dom';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
@@ -26,9 +25,11 @@ import { registerThemingParticipant } from 'vs/platform/theme/common/themeServic
 import { textPreformatForeground, foreground } from 'vs/platform/theme/common/colorRegistry';
 import { Color } from 'vs/base/common/color';
 
+const $ = dom.$;
+
 interface Key {
 	id: string;
-	arrow: string;
+	arrow?: string;
 	label: string;
 	command?: string;
 	arrowLast?: boolean;
@@ -78,6 +79,11 @@ const keys: Key[] = [
 		label: localize('welcomeOverlay.problems', "View errors and warnings"),
 		command: 'workbench.actions.view.problems'
 	},
+	{
+		id: 'terminal',
+		label: localize('welcomeOverlay.terminal', "Toggle integrated terminal"),
+		command: 'workbench.action.terminal.toggleTerminal'
+	},
 	// {
 	// 	id: 'openfile',
 	// 	arrow: '&cudarrl;',
@@ -150,7 +156,7 @@ class WelcomeOverlay {
 
 	private _toDispose: IDisposable[] = [];
 	private _overlayVisible: IContextKey<boolean>;
-	private _overlay: Builder;
+	private _overlay: HTMLElement;
 
 	constructor(
 		@IPartService private partService: IPartService,
@@ -167,40 +173,39 @@ class WelcomeOverlay {
 		const container = this.partService.getContainer(Parts.EDITOR_PART);
 
 		const offset = this.partService.getTitleBarOffset();
-		this._overlay = $(container.parentElement)
-			.div({ 'class': 'welcomeOverlay' })
-			.style({ top: `${offset}px` })
-			.style({ height: `calc(100% - ${offset}px)` })
-			.display('none');
+		this._overlay = dom.append(container.parentElement, $('.welcomeOverlay'));
+		this._overlay.style.top = `${offset}px`;
+		this._overlay.style.height = `calc(100% - ${offset}px)`;
+		this._overlay.style.display = 'none';
 
-		this._overlay.on('click', () => this.hide(), this._toDispose);
+		this._toDispose.push(dom.addStandardDisposableListener(this._overlay, 'click', () => this.hide()));
 		this.commandService.onWillExecuteCommand(() => this.hide());
 
-		$(this._overlay).div({ 'class': 'commandPalettePlaceholder' });
+		dom.append(this._overlay, $('.commandPalettePlaceholder'));
 
 		const editorOpen = !!this.editorService.visibleEditors.length;
 		keys.filter(key => !('withEditor' in key) || key.withEditor === editorOpen)
 			.forEach(({ id, arrow, label, command, arrowLast }) => {
-				const div = $(this._overlay).div({ 'class': ['key', id] });
-				if (!arrowLast) {
-					$(div).span({ 'class': 'arrow' }).innerHtml(arrow);
+				const div = dom.append(this._overlay, $(`.key.${id}`));
+				if (arrow && !arrowLast) {
+					dom.append(div, $('span.arrow')).innerHTML = arrow;
 				}
-				$(div).span({ 'class': 'label' }).text(label);
+				dom.append(div, $('span.label')).textContent = label;
 				if (command) {
 					const shortcut = this.keybindingService.lookupKeybinding(command);
 					if (shortcut) {
-						$(div).span({ 'class': 'shortcut' }).text(shortcut.getLabel());
+						dom.append(div, $('span.shortcut')).textContent = shortcut.getLabel();
 					}
 				}
-				if (arrowLast) {
-					$(div).span({ 'class': 'arrow' }).innerHtml(arrow);
+				if (arrow && arrowLast) {
+					dom.append(div, $('span.arrow')).innerHTML = arrow;
 				}
 			});
 	}
 
 	public show() {
-		if (this._overlay.style('display') !== 'block') {
-			this._overlay.display('block');
+		if (this._overlay.style.display !== 'block') {
+			this._overlay.style.display = 'block';
 			const workbench = document.querySelector('.monaco-workbench') as HTMLElement;
 			dom.addClass(workbench, 'blur-background');
 			this._overlayVisible.set(true);
@@ -210,10 +215,10 @@ class WelcomeOverlay {
 
 	private updateProblemsKey() {
 		const problems = document.querySelector('.task-statusbar-item');
-		const key = this._overlay.getHTMLElement().querySelector('.key.problems') as HTMLElement;
+		const key = this._overlay.querySelector('.key.problems') as HTMLElement;
 		if (problems instanceof HTMLElement) {
 			const target = problems.getBoundingClientRect();
-			const bounds = this._overlay.getHTMLElement().getBoundingClientRect();
+			const bounds = this._overlay.getBoundingClientRect();
 			const bottom = bounds.bottom - target.top + 3;
 			const left = (target.left + target.right) / 2 - bounds.left;
 			key.style.bottom = bottom + 'px';
@@ -225,8 +230,8 @@ class WelcomeOverlay {
 	}
 
 	public hide() {
-		if (this._overlay.style('display') !== 'none') {
-			this._overlay.display('none');
+		if (this._overlay.style.display !== 'none') {
+			this._overlay.style.display = 'none';
 			const workbench = document.querySelector('.monaco-workbench') as HTMLElement;
 			dom.removeClass(workbench, 'blur-background');
 			this._overlayVisible.reset();
diff --git a/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.ts b/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.ts
index 27e73025e43..56ffc97bcb6 100644
--- a/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.ts
+++ b/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.ts
@@ -55,11 +55,11 @@ export default () => `
 					<ul>
 						<li class="showLanguageExtensions"><button role="group" data-href="command:workbench.extensions.action.showLanguageExtensions"><h3 class="caption">${escape(localize('welcomePage.installExtensionPacks', "Tools and languages"))}</h3> <span class="detail">${escape(localize('welcomePage.installExtensionPacksDescription', "Install support for {0} and {1}"))
 		.replace('{0}', `<span class="extensionPackList"></span>`)
-		.replace('{1}', `<a href="command:workbench.extensions.action.showLanguageExtensions">${escape(localize('welcomePage.moreExtensions', "more"))}</a>`)}
+		.replace('{1}', `<a href="command:workbench.extensions.action.showLanguageExtensions" title="${localize('welcomePage.showLanguageExtensions', "Show more language extensions")}">${escape(localize('welcomePage.moreExtensions', "more"))}</a>`)}
 						</span></button></li>
 						<li class="showRecommendedKeymapExtensions"><button role="group" data-href="command:workbench.extensions.action.showRecommendedKeymapExtensions"><h3 class="caption">${escape(localize('welcomePage.installKeymapDescription', "Settings and keybindings"))}</h3> <span class="detail">${escape(localize('welcomePage.installKeymapExtension', "Install the settings and keyboard shortcuts of {0} and {1}"))
 		.replace('{0}', `<span class="keymapList"></span>`)
-		.replace('{1}', `<a href="command:workbench.extensions.action.showRecommendedKeymapExtensions">${escape(localize('welcomePage.others', "others"))}</a>`)}
+		.replace('{1}', `<a href="command:workbench.extensions.action.showRecommendedKeymapExtensions" title="${localize('welcomePage.showKeymapExtensions', "Show other keymap extensions")}">${escape(localize('welcomePage.others', "others"))}</a>`)}
 						</span></button></li>
 						<li class="selectTheme"><button data-href="command:workbench.action.selectTheme"><h3 class="caption">${escape(localize('welcomePage.colorTheme', "Color theme"))}</h3> <span class="detail">${escape(localize('welcomePage.colorThemeDescription', "Make the editor and your code look the way you love"))}</span></button></li>
 					</ul>
diff --git a/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.contribution.ts b/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.contribution.ts
index 2e5f8844e43..99341e7cabe 100644
--- a/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.contribution.ts
+++ b/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.contribution.ts
@@ -9,7 +9,7 @@ import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } fr
 import { Registry } from 'vs/platform/registry/common/platform';
 import { WelcomePageContribution, WelcomePageAction, WelcomeInputFactory } from 'vs/workbench/parts/welcome/page/electron-browser/welcomePage';
 import { IWorkbenchActionRegistry, Extensions as ActionExtensions } from 'vs/workbench/common/actions';
-import { SyncActionDescriptor } from 'vs/platform/actions/common/actions';
+import { SyncActionDescriptor, MenuRegistry, MenuId } from 'vs/platform/actions/common/actions';
 import { IConfigurationRegistry, Extensions as ConfigurationExtensions } from 'vs/platform/configuration/common/configurationRegistry';
 import { IEditorInputFactoryRegistry, Extensions as EditorExtensions } from 'vs/workbench/common/editor';
 import { LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
@@ -26,10 +26,10 @@ Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration)
 				'enumDescriptions': [
 					localize({ comment: ['This is the description for a setting. Values surrounded by single quotes are not to be translated.'], key: 'workbench.startupEditor.none' }, "Start without an editor."),
 					localize({ comment: ['This is the description for a setting. Values surrounded by single quotes are not to be translated.'], key: 'workbench.startupEditor.welcomePage' }, "Open the Welcome page (default)."),
-					localize({ comment: ['This is the description for a setting. Values surrounded by single quotes are not to be translated.'], key: 'workbench.startupEditor.newUntitledFile' }, "Open a new untitled file."),
+					localize({ comment: ['This is the description for a setting. Values surrounded by single quotes are not to be translated.'], key: 'workbench.startupEditor.newUntitledFile' }, "Open a new untitled file (only applies when opening an empty workspace)."),
 				],
 				'default': 'welcomePage',
-				'description': localize('workbench.startupEditor', "Controls which editor is shown at startup, if none is restored from the previous session. Select 'none' to start without an editor, 'welcomePage' to open the Welcome page (default), 'newUntitledFile' to open a new untitled file (only opening an empty workspace).")
+				'description': localize('workbench.startupEditor', "Controls which editor is shown at startup, if none are restored from the previous session.")
 			},
 		}
 	});
@@ -41,3 +41,12 @@ Registry.as<IWorkbenchActionRegistry>(ActionExtensions.WorkbenchActions)
 	.registerWorkbenchAction(new SyncActionDescriptor(WelcomePageAction, WelcomePageAction.ID, WelcomePageAction.LABEL), 'Help: Welcome', localize('help', "Help"));
 
 Registry.as<IEditorInputFactoryRegistry>(EditorExtensions.EditorInputFactories).registerEditorInputFactory(WelcomeInputFactory.ID, WelcomeInputFactory);
+
+MenuRegistry.appendMenuItem(MenuId.MenubarHelpMenu, {
+	group: '1_welcome',
+	command: {
+		id: 'workbench.action.showWelcomePage',
+		title: localize({ key: 'miWelcome', comment: ['&& denotes a mnemonic'] }, "&&Welcome")
+	},
+	order: 1
+});
diff --git a/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.ts b/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.ts
index 67102680756..f078908a91c 100644
--- a/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.ts
+++ b/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.ts
@@ -5,7 +5,7 @@
 'use strict';
 
 import 'vs/css!./welcomePage';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import * as path from 'path';
 import * as arrays from 'vs/base/common/arrays';
 import { WalkThroughInput } from 'vs/workbench/parts/welcome/walkThrough/node/walkThroughInput';
@@ -24,7 +24,7 @@ import { IEnvironmentService } from 'vs/platform/environment/common/environment'
 import { Schemas } from 'vs/base/common/network';
 import { IBackupFileService } from 'vs/workbench/services/backup/common/backup';
 import { getInstalledExtensions, IExtensionStatus, onExtensionChanged, isKeymapExtension } from 'vs/workbench/parts/extensions/electron-browser/extensionsUtils';
-import { IExtensionEnablementService, IExtensionManagementService, IExtensionGalleryService, IExtensionTipsService, EnablementState } from 'vs/platform/extensionManagement/common/extensionManagement';
+import { IExtensionEnablementService, IExtensionManagementService, IExtensionGalleryService, IExtensionTipsService, EnablementState, LocalExtensionType } from 'vs/platform/extensionManagement/common/extensionManagement';
 import { used } from 'vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page';
 import { ILifecycleService, StartupKind } from 'vs/platform/lifecycle/common/lifecycle';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
@@ -33,11 +33,13 @@ import { registerThemingParticipant } from 'vs/platform/theme/common/themeServic
 import { registerColor, focusBorder, textLinkForeground, textLinkActiveForeground, foreground, descriptionForeground, contrastBorder, activeContrastBorder } from 'vs/platform/theme/common/colorRegistry';
 import { getExtraColor } from 'vs/workbench/parts/welcome/walkThrough/node/walkThroughUtils';
 import { IExtensionsWorkbenchService } from 'vs/workbench/parts/extensions/common/extensions';
-import { IStorageService } from 'vs/platform/storage/common/storage';
-import { IWorkspaceIdentifier, getWorkspaceLabel, ISingleFolderWorkspaceIdentifier, isSingleFolderWorkspaceIdentifier } from 'vs/platform/workspaces/common/workspaces';
+import { IWorkspaceIdentifier, ISingleFolderWorkspaceIdentifier, isSingleFolderWorkspaceIdentifier, isWorkspaceIdentifier } from 'vs/platform/workspaces/common/workspaces';
 import { IEditorInputFactory, EditorInput } from 'vs/workbench/common/editor';
 import { getIdAndVersionFromLocalExtensionId } from 'vs/platform/extensionManagement/node/extensionManagementUtil';
 import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
+import { TimeoutTimer } from 'vs/base/common/async';
+import { areSameExtensions } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
+import { ILabelService } from 'vs/platform/label/common/label';
 
 used();
 
@@ -52,9 +54,7 @@ export class WelcomePageContribution implements IWorkbenchContribution {
 		@IConfigurationService configurationService: IConfigurationService,
 		@IEditorService editorService: IEditorService,
 		@IBackupFileService backupFileService: IBackupFileService,
-		@ITelemetryService telemetryService: ITelemetryService,
 		@ILifecycleService lifecycleService: ILifecycleService,
-		@IStorageService storageService: IStorageService
 	) {
 		const enabled = isWelcomePageEnabled(configurationService);
 		if (enabled && lifecycleService.startupKind !== StartupKind.ReloadedWindow) {
@@ -223,6 +223,7 @@ class WelcomePage {
 		@IWorkspaceContextService private contextService: IWorkspaceContextService,
 		@IConfigurationService private configurationService: IConfigurationService,
 		@IEnvironmentService private environmentService: IEnvironmentService,
+		@ILabelService private labelService: ILabelService,
 		@INotificationService private notificationService: INotificationService,
 		@IExtensionEnablementService private extensionEnablementService: IExtensionEnablementService,
 		@IExtensionGalleryService private extensionGalleryService: IExtensionGalleryService,
@@ -254,7 +255,7 @@ class WelcomePage {
 		return this.editorService.openEditor(this.editorInput, { pinned: false });
 	}
 
-	private onReady(container: HTMLElement, recentlyOpened: TPromise<{ files: string[]; workspaces: (IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier)[]; }>, installedExtensions: TPromise<IExtensionStatus[]>): void {
+	private onReady(container: HTMLElement, recentlyOpened: TPromise<{ files: URI[]; workspaces: (IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier)[]; }>, installedExtensions: TPromise<IExtensionStatus[]>): void {
 		const enabled = isWelcomePageEnabled(this.configurationService);
 		const showOnStartup = <HTMLInputElement>container.querySelector('#showOnStartup');
 		if (enabled) {
@@ -276,33 +277,40 @@ class WelcomePage {
 			const before = ul.firstElementChild;
 			workspaces.slice(0, 5).forEach(workspace => {
 				let label: string;
-				let parent: string;
-				let wsPath: string;
+				let resource: URI;
 				if (isSingleFolderWorkspaceIdentifier(workspace)) {
-					label = getBaseLabel(workspace);
-					parent = path.dirname(workspace);
-					wsPath = workspace;
+					resource = workspace;
+					label = this.labelService.getWorkspaceLabel(workspace);
+				} else if (isWorkspaceIdentifier(workspace)) {
+					label = this.labelService.getWorkspaceLabel(workspace);
+					resource = URI.file(workspace.configPath);
 				} else {
-					label = getWorkspaceLabel(workspace, this.environmentService);
-					parent = path.dirname(workspace.configPath);
-					wsPath = workspace.configPath;
+					label = getBaseLabel(workspace);
+					resource = URI.file(workspace);
 				}
 
 				const li = document.createElement('li');
 
 				const a = document.createElement('a');
 				let name = label;
-				let parentFolder = parent;
-				if (!name && parentFolder) {
-					const tmp = name;
-					name = parentFolder;
-					parentFolder = tmp;
+				let parentFolderPath: string;
+
+				if (resource.scheme === Schemas.file) {
+					let parentFolder = path.dirname(resource.fsPath);
+					if (!name && parentFolder) {
+						const tmp = name;
+						name = parentFolder;
+						parentFolder = tmp;
+					}
+					parentFolderPath = tildify(parentFolder, this.environmentService.userHome);
+				} else {
+					parentFolderPath = this.labelService.getUriLabel(resource);
 				}
-				const tildifiedParentFolder = tildify(parentFolder, this.environmentService.userHome);
+
 
 				a.innerText = name;
 				a.title = label;
-				a.setAttribute('aria-label', localize('welcomePage.openFolderWithPath', "Open folder {0} with path {1}", name, tildifiedParentFolder));
+				a.setAttribute('aria-label', localize('welcomePage.openFolderWithPath', "Open folder {0} with path {1}", name, parentFolderPath));
 				a.href = 'javascript:void(0)';
 				a.addEventListener('click', e => {
 					/* __GDPR__
@@ -315,7 +323,7 @@ class WelcomePage {
 						id: 'openRecentFolder',
 						from: telemetryFrom
 					});
-					this.windowService.openWindow([wsPath], { forceNewWindow: e.ctrlKey || e.metaKey });
+					this.windowService.openWindow([resource], { forceNewWindow: e.ctrlKey || e.metaKey });
 					e.preventDefault();
 					e.stopPropagation();
 				});
@@ -324,7 +332,7 @@ class WelcomePage {
 				const span = document.createElement('span');
 				span.classList.add('path');
 				span.classList.add('detail');
-				span.innerText = tildifiedParentFolder;
+				span.innerText = parentFolderPath;
 				span.title = label;
 				li.appendChild(span);
 
@@ -419,7 +427,9 @@ class WelcomePage {
 						return null;
 					}
 					return this.extensionManagementService.installFromGallery(extension)
-						.then(local => {
+						.then(() => this.extensionManagementService.getInstalled(LocalExtensionType.User))
+						.then(installed => {
+							const local = installed.filter(i => areSameExtensions(extension.identifier, i.galleryIdentifier))[0];
 							// TODO: Do this as part of the install to avoid multiple events.
 							return this.extensionEnablementService.setEnablement(local, EnablementState.Disabled).then(() => local);
 						});
@@ -431,10 +441,10 @@ class WelcomePage {
 				[{
 					label: localize('ok', "OK"),
 					run: () => {
-						const messageDelay = TPromise.timeout(300);
-						messageDelay.then(() => {
+						const messageDelay = new TimeoutTimer();
+						messageDelay.cancelAndSet(() => {
 							this.notificationService.info(strings.installing.replace('{0}', extensionSuggestion.name));
-						});
+						}, 300);
 						TPromise.join(extensionSuggestion.isKeymap ? extensions.filter(extension => isKeymapExtension(this.tipsService, extension) && extension.globallyEnabled)
 							.map(extension => {
 								return this.extensionEnablementService.setEnablement(extension.local, EnablementState.Disabled);
diff --git a/src/vs/workbench/parts/welcome/walkThrough/electron-browser/editor/editorWalkThrough.ts b/src/vs/workbench/parts/welcome/walkThrough/electron-browser/editor/editorWalkThrough.ts
index 71316038c95..5599f8459e1 100644
--- a/src/vs/workbench/parts/welcome/walkThrough/electron-browser/editor/editorWalkThrough.ts
+++ b/src/vs/workbench/parts/welcome/walkThrough/electron-browser/editor/editorWalkThrough.ts
@@ -9,7 +9,7 @@ import { IEditorService } from 'vs/workbench/services/editor/common/editorServic
 import { Action } from 'vs/base/common/actions';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { TPromise } from 'vs/base/common/winjs.base';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { WalkThroughInput, WalkThroughInputOptions } from 'vs/workbench/parts/welcome/walkThrough/node/walkThroughInput';
 import { Schemas } from 'vs/base/common/network';
 import { IEditorInputFactory, EditorInput } from 'vs/workbench/common/editor';
diff --git a/src/vs/workbench/parts/welcome/walkThrough/electron-browser/editor/vs_code_editor_walkthrough.md b/src/vs/workbench/parts/welcome/walkThrough/electron-browser/editor/vs_code_editor_walkthrough.md
index 9f5fcd08827..43e8bc83a89 100644
--- a/src/vs/workbench/parts/welcome/walkThrough/electron-browser/editor/vs_code_editor_walkthrough.md
+++ b/src/vs/workbench/parts/welcome/walkThrough/electron-browser/editor/vs_code_editor_walkthrough.md
@@ -17,16 +17,16 @@ The core editor in VS Code is packed with features.  This page highlights a numb
 
 ### Multi-Cursor Editing
 Using multiple cursors allows you to edit multiple parts of the document at once, greatly improving your productivity.  Try the following actions in the code block below:
-1. Box Selection - press <span class="mac-only windows-only">any combination of kb(cursorColumnSelectDown), kb(cursorColumnSelectRight), kb(cursorColumnSelectUp), kb(cursorColumnSelectLeft) to select a block of text. You can also press</span> <span class="shortcut mac-only">`⇧⌥`</span><span class="shortcut windows-only linux-only">`Shift+Alt`</span> while selecting text with the mouse.
+1. Box Selection - press <span class="mac-only windows-only">any combination of kb(cursorColumnSelectDown), kb(cursorColumnSelectRight), kb(cursorColumnSelectUp), kb(cursorColumnSelectLeft) to select a block of text. You can also press</span> <span class="shortcut mac-only">`⇧⌥`</span><span class="shortcut windows-only linux-only">`Shift+Alt`</span> while selecting text with the mouse or drag-select using the middle mouse button.
 2. Add a cursor - press kb(editor.action.insertCursorAbove) to add a new cursor above, or kb(editor.action.insertCursorBelow) to add a new cursor below. You can also use your mouse with <span class="shortcut"><span class="multi-cursor-modifier"></span>+Click</span> to add a cursor anywhere.
 3. Create cursors on all occurrences of a string - select one instance of a string e.g. `background-color` and press kb(editor.action.selectHighlights).  Now you can replace all instances by simply typing.
 
 That is the tip of the iceberg for multi-cursor editing. Have a look at the selection menu and our handy [keyboard reference guide](command:workbench.action.keybindingsReference) for additional actions.
 
 ```css
-#p1 {background-color: #ff0000;}   /* red */
-#p2 {background-color: #00ff00;}   /* green */
-#p3 {background-color: #0000ff;}   /* blue */
+#p1 {background-color: #ff0000;}                /* red in HEX format */
+#p2 {background-color: hsl(120, 100%, 50%);}    /* green in HSL format */
+#p3 {background-color: rgba(0, 4, 255, 0.733);} /* blue with alpha channel in RGBA format */
 ```
 
 > **CSS Tip:** you may have noticed in the example above we also provide color swatches inline for CSS, additionally if you hover over an element such as `#p1` we will show how this is represented in HTML.  These swatches also act as color pickers that allow you to easily change a color value.  A simple example of some language-specific editor features.
@@ -36,10 +36,10 @@ That is the tip of the iceberg for multi-cursor editing. Have a look at the sele
 Visual Studio Code comes with the powerful IntelliSense for JavaScript and TypeScript pre-installed. In the below example, position the text cursor in front of the error underline, right after the dot and press kb(editor.action.triggerSuggest) to invoke IntelliSense.  Notice how the suggestion comes from the Request API.
 
 ```js
-var express = require('express');
-var app = express();
+const express = require('express');
+const app = express();
 
-app.get('/', function (req, res) {
+app.get('/',  (req, res) => {
     res.send(`Hello ${req.}`);
 });
 
@@ -92,9 +92,9 @@ Sometimes you want to refactor already written code into a separate function or
 
 ```js
 function findFirstEvenNumber(arr) {
-    for (let i = 0; i < arr.length; i++) {
-        if (typeof arr[i] === 'number' && arr[i] % 2 === 0) {
-            return arr[i];
+    for (const el of arr) {
+        if (typeof el === 'number' && el % 2 === 0) {
+            return el;
         }
     }
     return null;
@@ -103,15 +103,15 @@ function findFirstEvenNumber(arr) {
 
 
 ### Formatting
-Keeping your code looking great is hard without a good formatter.  Luckily it's easy to format content either the entire document with kb(editor.action.formatDocument). Formatting can be applied to the current selection with kb(editor.action.formatSelection).  Both of these options are also available through the right-click context menu.
+Keeping your code looking great is hard without a good formatter.  Luckily it's easy to format content, either for the entire document with kb(editor.action.formatDocument) or for the current selection with kb(editor.action.formatSelection).  Both of these options are also available through the right-click context menu.
 
 ```js
-var cars = ["Saab", "Volvo", "BMW"];
+const cars = ["🚗", "🚙", "🚕"];
 
-for (var i=0; i < cars.length; i++) {
-// Drive the car
-console.log(`This is the manufacturer [${cars[i]}])`);
-    }
+for (const car of cars){
+    // Drive the car
+    console.log(`This is the car ${car}`);
+}
 ```
 
 >**Tip:** Additional formatters are available in the [extension gallery](command:workbench.extensions.action.showPopularExtensions).  Formatting support can also be configured via [settings](command:workbench.action.openGlobalSettings) e.g. enabling `editor.formatOnSave`.
@@ -137,7 +137,7 @@ In a large file it can often be useful to collapse sections of code to increase
 >**Tip:** Folding is based on indentation and as a result can apply to all languages.  Simply indent your code to create a foldable section you can fold a certain number of levels with shortcuts like kb(editor.foldLevel1) through to kb(editor.foldLevel5).
 
 ### Errors and Warnings
-Errors and warnings are highlighted as you edit your code with squiggles.  In the sample below you can see a number of syntax errors.  By pressing kb(editor.action.marker.next) you can navigate across them in sequence and see the detailed error message.  As you correct them the squiggles and scrollbar indicators will update.
+Errors and warnings are highlighted as you edit your code with squiggles.  In the sample below you can see a number of syntax errors.  By pressing kb(editor.action.marker.nextInFiles) you can navigate across them in sequence and see the detailed error message.  As you correct them the squiggles and scrollbar indicators will update.
 
 ```js
 // This code has a few syntax errors
@@ -192,4 +192,4 @@ Well if you have got this far then you will have touched on some of the editing
 
 That's all for now,
 
-Happy Coding!
\ No newline at end of file
+Happy Coding! 🎉
diff --git a/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThrough.contribution.ts b/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThrough.contribution.ts
index 335ba65618e..f0397cfb446 100644
--- a/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThrough.contribution.ts
+++ b/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThrough.contribution.ts
@@ -14,7 +14,7 @@ import { Registry } from 'vs/platform/registry/common/platform';
 import { Extensions as EditorInputExtensions, IEditorInputFactoryRegistry } from 'vs/workbench/common/editor';
 import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
 import { IWorkbenchActionRegistry, Extensions } from 'vs/workbench/common/actions';
-import { SyncActionDescriptor } from 'vs/platform/actions/common/actions';
+import { SyncActionDescriptor, MenuRegistry, MenuId } from 'vs/platform/actions/common/actions';
 import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions';
 import { IEditorRegistry, Extensions as EditorExtensions, EditorDescriptor } from 'vs/workbench/browser/editor';
 import { LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
@@ -48,3 +48,12 @@ KeybindingsRegistry.registerCommandAndKeybindingRule(WalkThroughArrowDown);
 KeybindingsRegistry.registerCommandAndKeybindingRule(WalkThroughPageUp);
 
 KeybindingsRegistry.registerCommandAndKeybindingRule(WalkThroughPageDown);
+
+MenuRegistry.appendMenuItem(MenuId.MenubarHelpMenu, {
+	group: '1_welcome',
+	command: {
+		id: 'workbench.action.showInteractivePlayground',
+		title: localize({ key: 'miInteractivePlayground', comment: ['&& denotes a mnemonic'] }, "&&Interactive Playground")
+	},
+	order: 2
+});
\ No newline at end of file
diff --git a/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughActions.ts b/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughActions.ts
index 5a838046aa8..6fc211d61f6 100644
--- a/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughActions.ts
+++ b/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughActions.ts
@@ -6,14 +6,14 @@
 
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { WalkThroughPart, WALK_THROUGH_FOCUS } from 'vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughPart';
-import { ICommandAndKeybindingRule, KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRegistry';
+import { ICommandAndKeybindingRule, KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
 import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
 import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
 import { KeyCode } from 'vs/base/common/keyCodes';
 
 export const WalkThroughArrowUp: ICommandAndKeybindingRule = {
 	id: 'workbench.action.interactivePlayground.arrowUp',
-	weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
+	weight: KeybindingWeight.WorkbenchContrib,
 	when: ContextKeyExpr.and(WALK_THROUGH_FOCUS, EditorContextKeys.editorTextFocus.toNegated()),
 	primary: KeyCode.UpArrow,
 	handler: accessor => {
@@ -27,7 +27,7 @@ export const WalkThroughArrowUp: ICommandAndKeybindingRule = {
 
 export const WalkThroughArrowDown: ICommandAndKeybindingRule = {
 	id: 'workbench.action.interactivePlayground.arrowDown',
-	weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
+	weight: KeybindingWeight.WorkbenchContrib,
 	when: ContextKeyExpr.and(WALK_THROUGH_FOCUS, EditorContextKeys.editorTextFocus.toNegated()),
 	primary: KeyCode.DownArrow,
 	handler: accessor => {
@@ -41,7 +41,7 @@ export const WalkThroughArrowDown: ICommandAndKeybindingRule = {
 
 export const WalkThroughPageUp: ICommandAndKeybindingRule = {
 	id: 'workbench.action.interactivePlayground.pageUp',
-	weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
+	weight: KeybindingWeight.WorkbenchContrib,
 	when: ContextKeyExpr.and(WALK_THROUGH_FOCUS, EditorContextKeys.editorTextFocus.toNegated()),
 	primary: KeyCode.PageUp,
 	handler: accessor => {
@@ -55,7 +55,7 @@ export const WalkThroughPageUp: ICommandAndKeybindingRule = {
 
 export const WalkThroughPageDown: ICommandAndKeybindingRule = {
 	id: 'workbench.action.interactivePlayground.pageDown',
-	weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
+	weight: KeybindingWeight.WorkbenchContrib,
 	when: ContextKeyExpr.and(WALK_THROUGH_FOCUS, EditorContextKeys.editorTextFocus.toNegated()),
 	primary: KeyCode.PageDown,
 	handler: accessor => {
diff --git a/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughPart.ts b/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughPart.ts
index d6438940e37..54372b51861 100644
--- a/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughPart.ts
+++ b/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughPart.ts
@@ -9,9 +9,9 @@ import 'vs/css!./walkThroughPart';
 import { DomScrollableElement } from 'vs/base/browser/ui/scrollbar/scrollableElement';
 import { ScrollbarVisibility } from 'vs/base/common/scrollable';
 import * as strings from 'vs/base/common/strings';
-import URI from 'vs/base/common/uri';
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
-import { EditorOptions, EditorViewStateMemento } from 'vs/workbench/common/editor';
+import { URI } from 'vs/base/common/uri';
+import { IDisposable, dispose, toDisposable } from 'vs/base/common/lifecycle';
+import { EditorOptions, IEditorMemento } from 'vs/workbench/common/editor';
 import { BaseEditor } from 'vs/workbench/browser/parts/editor/baseEditor';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { WalkThroughInput } from 'vs/workbench/parts/welcome/walkThrough/node/walkThroughInput';
@@ -23,7 +23,6 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { localize } from 'vs/nls';
 import { IStorageService } from 'vs/platform/storage/common/storage';
-import { Scope } from 'vs/workbench/common/memento';
 import { RawContextKey, IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { once } from 'vs/base/common/event';
@@ -65,7 +64,7 @@ export class WalkThroughPart extends BaseEditor {
 	private scrollbar: DomScrollableElement;
 	private editorFocus: IContextKey<boolean>;
 	private size: Dimension;
-	private editorViewStateMemento: EditorViewStateMemento<IWalkThroughEditorViewState>;
+	private editorMemento: IEditorMemento<IWalkThroughEditorViewState>;
 
 	constructor(
 		@ITelemetryService telemetryService: ITelemetryService,
@@ -82,7 +81,7 @@ export class WalkThroughPart extends BaseEditor {
 	) {
 		super(WalkThroughPart.ID, telemetryService, themeService);
 		this.editorFocus = WALK_THROUGH_FOCUS.bindTo(this.contextKeyService);
-		this.editorViewStateMemento = new EditorViewStateMemento<IWalkThroughEditorViewState>(editorGroupService, this.getMemento(storageService, Scope.WORKSPACE), WALK_THROUGH_EDITOR_VIEW_STATE_PREFERENCE_KEY);
+		this.editorMemento = this.getEditorMemento<IWalkThroughEditorViewState>(storageService, editorGroupService, WALK_THROUGH_EDITOR_VIEW_STATE_PREFERENCE_KEY);
 	}
 
 	createEditor(container: HTMLElement): void {
@@ -118,7 +117,7 @@ export class WalkThroughPart extends BaseEditor {
 	private addEventListener<E extends HTMLElement>(element: E, type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): IDisposable;
 	private addEventListener<E extends HTMLElement>(element: E, type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): IDisposable {
 		element.addEventListener(type, listener, useCapture);
-		return { dispose: () => { element.removeEventListener(type, listener, useCapture); } };
+		return toDisposable(() => { element.removeEventListener(type, listener, useCapture); });
 	}
 
 	private registerFocusHandlers() {
@@ -260,7 +259,7 @@ export class WalkThroughPart extends BaseEditor {
 
 		return super.setInput(input, options, token)
 			.then(() => {
-				return input.resolve(true);
+				return input.resolve();
 			})
 			.then(model => {
 				if (token.isCancellationRequested) {
@@ -476,7 +475,7 @@ export class WalkThroughPart extends BaseEditor {
 	private saveTextEditorViewState(input: WalkThroughInput): void {
 		const scrollPosition = this.scrollbar.getScrollPosition();
 
-		this.editorViewStateMemento.saveState(this.group, input, {
+		this.editorMemento.saveState(this.group, input, {
 			viewState: {
 				scrollTop: scrollPosition.scrollTop,
 				scrollLeft: scrollPosition.scrollLeft
@@ -485,7 +484,7 @@ export class WalkThroughPart extends BaseEditor {
 	}
 
 	private loadTextEditorViewState(input: WalkThroughInput) {
-		const state = this.editorViewStateMemento.loadState(this.group, input);
+		const state = this.editorMemento.loadState(this.group, input);
 		if (state) {
 			this.scrollbar.setScrollPosition(state.viewState);
 		}
@@ -505,14 +504,6 @@ export class WalkThroughPart extends BaseEditor {
 		super.shutdown();
 	}
 
-	protected saveMemento(): void {
-
-		// ensure to first save our view state memento
-		this.editorViewStateMemento.save();
-
-		super.saveMemento();
-	}
-
 	dispose(): void {
 		this.editorFocus.reset();
 		this.contentDisposables = dispose(this.contentDisposables);
@@ -526,7 +517,7 @@ export class WalkThroughPart extends BaseEditor {
 export const embeddedEditorBackground = registerColor('walkThrough.embeddedEditorBackground', { dark: null, light: null, hc: null }, localize('walkThrough.embeddedEditorBackground', 'Background color for the embedded editors on the Interactive Playground.'));
 
 registerThemingParticipant((theme, collector) => {
-	const color = getExtraColor(theme, embeddedEditorBackground, { dark: 'rgba(0, 0, 0, .4)', extra_dark: 'rgba(200, 235, 255, .064)', light: 'rgba(0,0,0,.08)', hc: null });
+	const color = getExtraColor(theme, embeddedEditorBackground, { dark: 'rgba(0, 0, 0, .4)', extra_dark: 'rgba(200, 235, 255, .064)', light: '#f4f4f4', hc: null });
 	if (color) {
 		collector.addRule(`.monaco-workbench > .part.editor > .content .walkThroughContent .monaco-editor-background,
 			.monaco-workbench > .part.editor > .content .walkThroughContent .margin-view-overlays { background: ${color}; }`);
diff --git a/src/vs/workbench/parts/welcome/walkThrough/node/walkThroughContentProvider.ts b/src/vs/workbench/parts/welcome/walkThrough/node/walkThroughContentProvider.ts
index ea02659a15a..04ed9af895e 100644
--- a/src/vs/workbench/parts/welcome/walkThrough/node/walkThroughContentProvider.ts
+++ b/src/vs/workbench/parts/welcome/walkThrough/node/walkThroughContentProvider.ts
@@ -6,7 +6,7 @@
 'use strict';
 
 import { TPromise } from 'vs/base/common/winjs.base';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { ITextModelService, ITextModelContentProvider } from 'vs/editor/common/services/resolverService';
 import { IModelService } from 'vs/editor/common/services/modelService';
 import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
diff --git a/src/vs/workbench/parts/welcome/walkThrough/node/walkThroughInput.ts b/src/vs/workbench/parts/welcome/walkThrough/node/walkThroughInput.ts
index 81b269fa5e6..12027989976 100644
--- a/src/vs/workbench/parts/welcome/walkThrough/node/walkThroughInput.ts
+++ b/src/vs/workbench/parts/welcome/walkThrough/node/walkThroughInput.ts
@@ -7,7 +7,7 @@
 import * as strings from 'vs/base/common/strings';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { EditorInput, EditorModel, ITextEditorModel } from 'vs/workbench/common/editor';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { IReference, IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { telemetryURIDescriptor } from 'vs/platform/telemetry/common/telemetryUtils';
 import { ITextModelService } from 'vs/editor/common/services/resolverService';
@@ -102,7 +102,7 @@ export class WalkThroughInput extends EditorInput {
 		return this.options.onReady;
 	}
 
-	resolve(refresh?: boolean): TPromise<WalkThroughModel> {
+	resolve(): TPromise<WalkThroughModel> {
 		if (!this.promise) {
 			this.promise = this.textModelResolverService.createModelReference(this.options.resource)
 				.then(ref => {
diff --git a/src/vs/workbench/services/actions/electron-browser/menusExtensionPoint.ts b/src/vs/workbench/services/actions/electron-browser/menusExtensionPoint.ts
index ee1edcccdb9..df677f6fb3f 100644
--- a/src/vs/workbench/services/actions/electron-browser/menusExtensionPoint.ts
+++ b/src/vs/workbench/services/actions/electron-browser/menusExtensionPoint.ts
@@ -6,12 +6,13 @@
 
 import { localize } from 'vs/nls';
 import { isFalsyOrWhitespace } from 'vs/base/common/strings';
-import { join } from 'path';
+import * as resources from 'vs/base/common/resources';
 import { IJSONSchema } from 'vs/base/common/jsonSchema';
 import { forEach } from 'vs/base/common/collections';
 import { IExtensionPointUser, ExtensionMessageCollector, ExtensionsRegistry } from 'vs/workbench/services/extensions/common/extensionsRegistry';
 import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
 import { MenuId, MenuRegistry, ILocalizedString } from 'vs/platform/actions/common/actions';
+import { URI } from 'vs/base/common/uri';
 
 namespace schema {
 
@@ -286,20 +287,19 @@ ExtensionsRegistry.registerExtensionPoint<schema.IUserFriendlyCommand | schema.I
 
 		const { icon, category, title, command } = userFriendlyCommand;
 
-		let absoluteIcon: { dark: string; light?: string; };
+		let absoluteIcon: { dark: URI; light?: URI; };
 		if (icon) {
-			//TODO@extensionLocation
 			if (typeof icon === 'string') {
-				absoluteIcon = { dark: join(extension.description.extensionLocation.fsPath, icon) };
+				absoluteIcon = { dark: resources.joinPath(extension.description.extensionLocation, icon) };
 			} else {
 				absoluteIcon = {
-					dark: join(extension.description.extensionLocation.fsPath, icon.dark),
-					light: join(extension.description.extensionLocation.fsPath, icon.light)
+					dark: resources.joinPath(extension.description.extensionLocation, icon.dark),
+					light: resources.joinPath(extension.description.extensionLocation, icon.light)
 				};
 			}
 		}
 
-		if (MenuRegistry.addCommand({ id: command, title, category, iconPath: absoluteIcon })) {
+		if (MenuRegistry.addCommand({ id: command, title, category, iconLocation: absoluteIcon })) {
 			extension.collector.info(localize('dup', "Command `{0}` appears multiple times in the `commands` section.", userFriendlyCommand.command));
 		}
 	}
diff --git a/src/vs/workbench/services/actions/test/common/menuService.test.ts b/src/vs/workbench/services/actions/test/common/menuService.test.ts
index 61937dd287f..c986b7bdfac 100644
--- a/src/vs/workbench/services/actions/test/common/menuService.test.ts
+++ b/src/vs/workbench/services/actions/test/common/menuService.test.ts
@@ -5,7 +5,7 @@
 'use strict';
 
 import * as assert from 'assert';
-import { MenuRegistry, MenuId } from 'vs/platform/actions/common/actions';
+import { MenuRegistry, MenuId, isIMenuItem } from 'vs/platform/actions/common/actions';
 import { MenuService } from 'vs/workbench/services/actions/common/menuService';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { NullCommandService } from 'vs/platform/commands/common/commands';
@@ -190,13 +190,15 @@ suite('MenuService', function () {
 		let foundA = false;
 		let foundB = false;
 		for (const item of MenuRegistry.getMenuItems(MenuId.CommandPalette)) {
-			if (item.command.id === 'a') {
-				assert.equal(item.command.title, 'Explicit');
-				foundA = true;
-			}
-			if (item.command.id === 'b') {
-				assert.equal(item.command.title, 'Implicit');
-				foundB = true;
+			if (isIMenuItem(item)) {
+				if (item.command.id === 'a') {
+					assert.equal(item.command.title, 'Explicit');
+					foundA = true;
+				}
+				if (item.command.id === 'b') {
+					assert.equal(item.command.title, 'Implicit');
+					foundB = true;
+				}
 			}
 		}
 		assert.equal(foundA, true);
diff --git a/src/vs/workbench/services/activity/browser/activityService.ts b/src/vs/workbench/services/activity/browser/activityService.ts
index c45b8556c40..27bbe40af63 100644
--- a/src/vs/workbench/services/activity/browser/activityService.ts
+++ b/src/vs/workbench/services/activity/browser/activityService.ts
@@ -21,7 +21,7 @@ export class ActivityService implements IActivityService {
 		@IPanelService private panelService: IPanelService
 	) { }
 
-	public showActivity(compositeOrActionId: string, badge: IBadge, clazz?: string, priority?: number): IDisposable {
+	showActivity(compositeOrActionId: string, badge: IBadge, clazz?: string, priority?: number): IDisposable {
 		if (this.panelService.getPanels().filter(p => p.id === compositeOrActionId).length) {
 			return this.panelPart.showActivity(compositeOrActionId, badge, clazz);
 		}
diff --git a/src/vs/workbench/services/activity/common/activity.ts b/src/vs/workbench/services/activity/common/activity.ts
index 6167a730512..27513b65417 100644
--- a/src/vs/workbench/services/activity/common/activity.ts
+++ b/src/vs/workbench/services/activity/common/activity.ts
@@ -13,19 +13,19 @@ export interface IBadge {
 }
 
 export class BaseBadge implements IBadge {
-	public descriptorFn: (args: any) => string;
+	descriptorFn: (args: any) => string;
 
 	constructor(descriptorFn: (args: any) => string) {
 		this.descriptorFn = descriptorFn;
 	}
 
-	public getDescription(): string {
+	getDescription(): string {
 		return this.descriptorFn(null);
 	}
 }
 
 export class NumberBadge extends BaseBadge {
-	public number: number;
+	number: number;
 
 	constructor(number: number, descriptorFn: (args: any) => string) {
 		super(descriptorFn);
@@ -33,13 +33,13 @@ export class NumberBadge extends BaseBadge {
 		this.number = number;
 	}
 
-	public getDescription(): string {
+	getDescription(): string {
 		return this.descriptorFn(this.number);
 	}
 }
 
 export class TextBadge extends BaseBadge {
-	public text: string;
+	text: string;
 
 	constructor(text: string, descriptorFn: (args: any) => string) {
 		super(descriptorFn);
diff --git a/src/vs/workbench/services/backup/common/backup.ts b/src/vs/workbench/services/backup/common/backup.ts
index 86d5326107e..9c56b9d9fe1 100644
--- a/src/vs/workbench/services/backup/common/backup.ts
+++ b/src/vs/workbench/services/backup/common/backup.ts
@@ -5,7 +5,7 @@
 
 'use strict';
 
-import Uri from 'vs/base/common/uri';
+import { URI as Uri } from 'vs/base/common/uri';
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { IResolveContentOptions, IUpdateContentOptions, ITextSnapshot } from 'vs/platform/files/common/files';
@@ -22,11 +22,6 @@ export const BACKUP_FILE_UPDATE_OPTIONS: IUpdateContentOptions = { encoding: 'ut
 export interface IBackupFileService {
 	_serviceBrand: any;
 
-	/**
-	 * If backups are enabled.
-	 */
-	backupEnabled: boolean;
-
 	/**
 	 * Finds out if there are any backups stored.
 	 */
diff --git a/src/vs/workbench/services/backup/node/backupFileService.ts b/src/vs/workbench/services/backup/node/backupFileService.ts
index fdeea689752..cd66beb4d76 100644
--- a/src/vs/workbench/services/backup/node/backupFileService.ts
+++ b/src/vs/workbench/services/backup/node/backupFileService.ts
@@ -8,14 +8,15 @@
 import * as path from 'path';
 import * as crypto from 'crypto';
 import * as pfs from 'vs/base/node/pfs';
-import Uri from 'vs/base/common/uri';
+import { URI as Uri } from 'vs/base/common/uri';
 import { ResourceQueue } from 'vs/base/common/async';
 import { IBackupFileService, BACKUP_FILE_UPDATE_OPTIONS, BACKUP_FILE_RESOLVE_OPTIONS } from 'vs/workbench/services/backup/common/backup';
 import { IFileService, ITextSnapshot } from 'vs/platform/files/common/files';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { readToMatchingString } from 'vs/base/node/stream';
 import { ITextBufferFactory } from 'vs/editor/common/model';
-import { createTextBufferFactoryFromStream } from 'vs/editor/common/model/textModel';
+import { createTextBufferFactoryFromStream, createTextBufferFactoryFromSnapshot } from 'vs/editor/common/model/textModel';
+import { keys } from 'vs/base/common/map';
 
 export interface IBackupFilesModel {
 	resolve(backupRoot: string): TPromise<IBackupFilesModel>;
@@ -31,10 +32,9 @@ export interface IBackupFilesModel {
 export class BackupSnapshot implements ITextSnapshot {
 	private preambleHandled: boolean;
 
-	constructor(private snapshot: ITextSnapshot, private preamble: string) {
-	}
+	constructor(private snapshot: ITextSnapshot, private preamble: string) { }
 
-	public read(): string {
+	read(): string {
 		let value = this.snapshot.read();
 		if (!this.preambleHandled) {
 			this.preambleHandled = true;
@@ -53,7 +53,7 @@ export class BackupSnapshot implements ITextSnapshot {
 export class BackupFilesModel implements IBackupFilesModel {
 	private cache: { [resource: string]: number /* version ID */ } = Object.create(null);
 
-	public resolve(backupRoot: string): TPromise<IBackupFilesModel> {
+	resolve(backupRoot: string): TPromise<IBackupFilesModel> {
 		return pfs.readDirsInDir(backupRoot).then(backupSchemas => {
 
 			// For all supported schemas
@@ -73,15 +73,15 @@ export class BackupFilesModel implements IBackupFilesModel {
 		}).then(() => this, error => this);
 	}
 
-	public add(resource: Uri, versionId = 0): void {
+	add(resource: Uri, versionId = 0): void {
 		this.cache[resource.toString()] = versionId;
 	}
 
-	public count(): number {
+	count(): number {
 		return Object.keys(this.cache).length;
 	}
 
-	public has(resource: Uri, versionId?: number): boolean {
+	has(resource: Uri, versionId?: number): boolean {
 		const cachedVersionId = this.cache[resource.toString()];
 		if (typeof cachedVersionId !== 'number') {
 			return false; // unknown resource
@@ -94,15 +94,15 @@ export class BackupFilesModel implements IBackupFilesModel {
 		return true;
 	}
 
-	public get(): Uri[] {
+	get(): Uri[] {
 		return Object.keys(this.cache).map(k => Uri.parse(k));
 	}
 
-	public remove(resource: Uri): void {
+	remove(resource: Uri): void {
 		delete this.cache[resource.toString()];
 	}
 
-	public clear(): void {
+	clear(): void {
 		this.cache = Object.create(null);
 	}
 }
@@ -111,7 +111,7 @@ export class BackupFileService implements IBackupFileService {
 
 	private static readonly META_MARKER = '\n';
 
-	public _serviceBrand: any;
+	_serviceBrand: any;
 
 	private backupWorkspacePath: string;
 
@@ -129,40 +129,29 @@ export class BackupFileService implements IBackupFileService {
 		this.initialize(backupWorkspacePath);
 	}
 
-	public initialize(backupWorkspacePath: string): void {
+	initialize(backupWorkspacePath: string): void {
 		this.backupWorkspacePath = backupWorkspacePath;
 
 		this.ready = this.init();
 	}
 
-	public get backupEnabled(): boolean {
-		return !!this.backupWorkspacePath; // Hot exit requires a backup path
-	}
-
 	private init(): TPromise<IBackupFilesModel> {
 		const model = new BackupFilesModel();
 
-		if (!this.backupEnabled) {
-			return TPromise.as(model);
-		}
-
 		return model.resolve(this.backupWorkspacePath);
 	}
 
-	public hasBackups(): TPromise<boolean> {
+	hasBackups(): TPromise<boolean> {
 		return this.ready.then(model => {
 			return model.count() > 0;
 		});
 	}
 
-	public loadBackupResource(resource: Uri): TPromise<Uri> {
+	loadBackupResource(resource: Uri): TPromise<Uri> {
 		return this.ready.then(model => {
-			const backupResource = this.toBackupResource(resource);
-			if (!backupResource) {
-				return void 0;
-			}
 
 			// Return directly if we have a known backup with that resource
+			const backupResource = this.toBackupResource(resource);
 			if (model.has(backupResource)) {
 				return backupResource;
 			}
@@ -171,17 +160,13 @@ export class BackupFileService implements IBackupFileService {
 		});
 	}
 
-	public backupResource(resource: Uri, content: ITextSnapshot, versionId?: number): TPromise<void> {
+	backupResource(resource: Uri, content: ITextSnapshot, versionId?: number): TPromise<void> {
 		if (this.isShuttingDown) {
 			return TPromise.as(void 0);
 		}
 
 		return this.ready.then(model => {
 			const backupResource = this.toBackupResource(resource);
-			if (!backupResource) {
-				return void 0;
-			}
-
 			if (model.has(backupResource, versionId)) {
 				return void 0; // return early if backup version id matches requested one
 			}
@@ -195,12 +180,9 @@ export class BackupFileService implements IBackupFileService {
 		});
 	}
 
-	public discardResourceBackup(resource: Uri): TPromise<void> {
+	discardResourceBackup(resource: Uri): TPromise<void> {
 		return this.ready.then(model => {
 			const backupResource = this.toBackupResource(resource);
-			if (!backupResource) {
-				return void 0;
-			}
 
 			return this.ioOperationQueues.queueFor(backupResource).queue(() => {
 				return pfs.del(backupResource.fsPath).then(() => model.remove(backupResource));
@@ -208,26 +190,21 @@ export class BackupFileService implements IBackupFileService {
 		});
 	}
 
-	public discardAllWorkspaceBackups(): TPromise<void> {
+	discardAllWorkspaceBackups(): TPromise<void> {
 		this.isShuttingDown = true;
 
 		return this.ready.then(model => {
-			if (!this.backupEnabled) {
-				return void 0;
-			}
-
 			return pfs.del(this.backupWorkspacePath).then(() => model.clear());
 		});
 	}
 
-	public getWorkspaceFileBackups(): TPromise<Uri[]> {
+	getWorkspaceFileBackups(): TPromise<Uri[]> {
 		return this.ready.then(model => {
 			const readPromises: TPromise<Uri>[] = [];
 
 			model.get().forEach(fileBackup => {
 				readPromises.push(
-					readToMatchingString(fileBackup.fsPath, BackupFileService.META_MARKER, 2000, 10000)
-						.then(Uri.parse)
+					readToMatchingString(fileBackup.fsPath, BackupFileService.META_MARKER, 2000, 10000).then(Uri.parse)
 				);
 			});
 
@@ -235,7 +212,7 @@ export class BackupFileService implements IBackupFileService {
 		});
 	}
 
-	public resolveBackupContent(backup: Uri): TPromise<ITextBufferFactory> {
+	resolveBackupContent(backup: Uri): TPromise<ITextBufferFactory> {
 		return this.fileService.resolveStreamContent(backup, BACKUP_FILE_RESOLVE_OPTIONS).then(content => {
 
 			// Add a filter method to filter out everything until the meta marker
@@ -258,11 +235,7 @@ export class BackupFileService implements IBackupFileService {
 		});
 	}
 
-	public toBackupResource(resource: Uri): Uri {
-		if (!this.backupEnabled) {
-			return null;
-		}
-
+	toBackupResource(resource: Uri): Uri {
 		return Uri.file(path.join(this.backupWorkspacePath, resource.scheme, this.hashPath(resource)));
 	}
 
@@ -270,3 +243,63 @@ export class BackupFileService implements IBackupFileService {
 		return crypto.createHash('md5').update(resource.fsPath).digest('hex');
 	}
 }
+
+export class InMemoryBackupFileService implements IBackupFileService {
+
+	_serviceBrand: any;
+
+	private backups: Map<string, ITextSnapshot> = new Map();
+
+	hasBackups(): TPromise<boolean> {
+		return TPromise.as(this.backups.size > 0);
+	}
+
+	loadBackupResource(resource: Uri): TPromise<Uri> {
+		const backupResource = this.toBackupResource(resource);
+		if (this.backups.has(backupResource.toString())) {
+			return TPromise.as(backupResource);
+		}
+
+		return TPromise.as(void 0);
+	}
+
+	backupResource(resource: Uri, content: ITextSnapshot, versionId?: number): TPromise<void> {
+		const backupResource = this.toBackupResource(resource);
+		this.backups.set(backupResource.toString(), content);
+
+		return TPromise.as(void 0);
+	}
+
+	resolveBackupContent(backupResource: Uri): TPromise<ITextBufferFactory> {
+		const snapshot = this.backups.get(backupResource.toString());
+		if (snapshot) {
+			return TPromise.as(createTextBufferFactoryFromSnapshot(snapshot));
+		}
+
+		return TPromise.as(void 0);
+	}
+
+	getWorkspaceFileBackups(): TPromise<Uri[]> {
+		return TPromise.as(keys(this.backups).map(key => Uri.parse(key)));
+	}
+
+	discardResourceBackup(resource: Uri): TPromise<void> {
+		this.backups.delete(this.toBackupResource(resource).toString());
+
+		return TPromise.as(void 0);
+	}
+
+	discardAllWorkspaceBackups(): TPromise<void> {
+		this.backups.clear();
+
+		return TPromise.as(void 0);
+	}
+
+	toBackupResource(resource: Uri): Uri {
+		return Uri.file(path.join(resource.scheme, this.hashPath(resource)));
+	}
+
+	private hashPath(resource: Uri): string {
+		return crypto.createHash('md5').update(resource.fsPath).digest('hex');
+	}
+}
\ No newline at end of file
diff --git a/src/vs/workbench/services/backup/test/electron-browser/backupFileService.test.ts b/src/vs/workbench/services/backup/test/electron-browser/backupFileService.test.ts
index 3af98297733..0dcce603c79 100644
--- a/src/vs/workbench/services/backup/test/electron-browser/backupFileService.test.ts
+++ b/src/vs/workbench/services/backup/test/electron-browser/backupFileService.test.ts
@@ -12,7 +12,7 @@ import * as os from 'os';
 import * as fs from 'fs';
 import * as path from 'path';
 import * as pfs from 'vs/base/node/pfs';
-import Uri from 'vs/base/common/uri';
+import { URI as Uri } from 'vs/base/common/uri';
 import { BackupFileService, BackupFilesModel } from 'vs/workbench/services/backup/node/backupFileService';
 import { FileService } from 'vs/workbench/services/files/electron-browser/fileService';
 import { TextModel, createTextBufferFactory } from 'vs/editor/common/model/textModel';
@@ -39,7 +39,7 @@ const untitledBackupPath = path.join(workspaceBackupPath, 'untitled', crypto.cre
 
 class TestBackupFileService extends BackupFileService {
 	constructor(workspace: Uri, backupHome: string, workspacesJsonPath: string) {
-		const fileService = new FileService(new TestContextService(new Workspace(workspace.fsPath, workspace.fsPath, toWorkspaceFolders([{ path: workspace.fsPath }]))), TestEnvironmentService, new TestTextResourceConfigurationService(), new TestConfigurationService(), new TestLifecycleService(), new TestStorageService(), new TestNotificationService(), { disableWatcher: true });
+		const fileService = new FileService(new TestContextService(new Workspace(workspace.fsPath, toWorkspaceFolders([{ path: workspace.fsPath }]))), TestEnvironmentService, new TestTextResourceConfigurationService(), new TestConfigurationService(), new TestLifecycleService(), new TestStorageService(), new TestNotificationService(), { disableWatcher: true });
 
 		super(workspaceBackupPath, fileService);
 	}
diff --git a/src/vs/workbench/services/bulkEdit/electron-browser/bulkEditService.ts b/src/vs/workbench/services/bulkEdit/electron-browser/bulkEditService.ts
index fcb3ae878be..d9382085f1b 100644
--- a/src/vs/workbench/services/bulkEdit/electron-browser/bulkEditService.ts
+++ b/src/vs/workbench/services/bulkEdit/electron-browser/bulkEditService.ts
@@ -5,42 +5,38 @@
 'use strict';
 
 
-import { getPathLabel } from 'vs/base/common/labels';
-import { IDisposable, IReference, dispose } from 'vs/base/common/lifecycle';
-import URI from 'vs/base/common/uri';
+import { mergeSort } from 'vs/base/common/arrays';
+import { dispose, IDisposable, IReference } from 'vs/base/common/lifecycle';
+import { URI } from 'vs/base/common/uri';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { ICodeEditor, isCodeEditor } from 'vs/editor/browser/editorBrowser';
 import { IBulkEditOptions, IBulkEditResult, IBulkEditService } from 'vs/editor/browser/services/bulkEditService';
 import { EditOperation } from 'vs/editor/common/core/editOperation';
 import { Range } from 'vs/editor/common/core/range';
-import { Selection } from 'vs/editor/common/core/selection';
 import { EndOfLineSequence, IIdentifiedSingleEditOperation, ITextModel } from 'vs/editor/common/model';
-import { ResourceFileEdit, ResourceTextEdit, WorkspaceEdit, isResourceFileEdit, isResourceTextEdit } from 'vs/editor/common/modes';
+import { isResourceFileEdit, isResourceTextEdit, ResourceFileEdit, ResourceTextEdit, WorkspaceEdit } from 'vs/editor/common/modes';
 import { IModelService } from 'vs/editor/common/services/modelService';
 import { ITextEditorModel, ITextModelService } from 'vs/editor/common/services/resolverService';
 import { localize } from 'vs/nls';
-import { FileChangeType, IFileService } from 'vs/platform/files/common/files';
+import { IFileService } from 'vs/platform/files/common/files';
 import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { IProgress, IProgressRunner, emptyProgressRunner } from 'vs/platform/progress/common/progress';
+import { ILogService } from 'vs/platform/log/common/log';
+import { emptyProgressRunner, IProgress, IProgressRunner } from 'vs/platform/progress/common/progress';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
+import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
+import { ILabelService } from 'vs/platform/label/common/label';
 
 abstract class Recording {
 
 	static start(fileService: IFileService): Recording {
 
 		let _changes = new Set<string>();
-		let stop: IDisposable;
-
-		stop = fileService.onFileChanges(event => {
-			for (const change of event.changes) {
-				if (change.type === FileChangeType.UPDATED) {
-					_changes.add(change.resource.toString());
-				}
-			}
+		let subscription = fileService.onAfterOperation(e => {
+			_changes.add(e.resource.toString());
 		});
 
 		return {
-			stop() { return dispose(stop); },
+			stop() { return subscription.dispose(); },
 			hasChanged(resource) { return _changes.has(resource.toString()); }
 		};
 	}
@@ -49,30 +45,27 @@ abstract class Recording {
 	abstract hasChanged(resource: URI): boolean;
 }
 
-class EditTask implements IDisposable {
+type ValidationResult = { canApply: true } | { canApply: false, reason: URI };
 
-	private _initialSelections: Selection[];
-	private _endCursorSelection: Selection;
-	private get _model(): ITextModel { return this._modelReference.object.textEditorModel; }
-	private _modelReference: IReference<ITextEditorModel>;
-	private _edits: IIdentifiedSingleEditOperation[];
-	private _newEol: EndOfLineSequence;
+class ModelEditTask implements IDisposable {
 
-	constructor(modelReference: IReference<ITextEditorModel>) {
-		this._endCursorSelection = null;
-		this._modelReference = modelReference;
+	private readonly _model: ITextModel;
+
+	protected _edits: IIdentifiedSingleEditOperation[];
+	private _expectedModelVersionId: number | undefined;
+	protected _newEol: EndOfLineSequence;
+
+	constructor(private readonly _modelReference: IReference<ITextEditorModel>) {
+		this._model = this._modelReference.object.textEditorModel;
 		this._edits = [];
 	}
 
 	dispose() {
-		if (this._model) {
-			this._modelReference.dispose();
-			this._modelReference = null;
-		}
+		dispose(this._modelReference);
 	}
 
 	addEdit(resourceEdit: ResourceTextEdit): void {
-
+		this._expectedModelVersionId = resourceEdit.modelVersionId;
 		for (const edit of resourceEdit.edits) {
 			if (typeof edit.eol === 'number') {
 				// honor eol-change
@@ -91,20 +84,18 @@ class EditTask implements IDisposable {
 		}
 	}
 
+	validate(): ValidationResult {
+		if (typeof this._expectedModelVersionId === 'undefined' || this._model.getVersionId() === this._expectedModelVersionId) {
+			return { canApply: true };
+		}
+		return { canApply: false, reason: this._model.uri };
+	}
+
 	apply(): void {
 		if (this._edits.length > 0) {
-
-			this._edits = this._edits.map((value, index) => ({ value, index })).sort((a, b) => {
-				let ret = Range.compareRangesUsingStarts(a.value.range, b.value.range);
-				if (ret === 0) {
-					ret = a.index - b.index;
-				}
-				return ret;
-			}).map(element => element.value);
-
-			this._initialSelections = this._getInitialSelections();
+			this._edits = mergeSort(this._edits, (a, b) => Range.compareRangesUsingStarts(a.range, b.range));
 			this._model.pushStackElement();
-			this._model.pushEditOperations(this._initialSelections, this._edits, (edits) => this._getEndCursorSelections(edits));
+			this._model.pushEditOperations([], this._edits, () => []);
 			this._model.pushStackElement();
 		}
 		if (this._newEol !== undefined) {
@@ -113,58 +104,29 @@ class EditTask implements IDisposable {
 			this._model.pushStackElement();
 		}
 	}
-
-	protected _getInitialSelections(): Selection[] {
-		const firstRange = this._edits[0].range;
-		const initialSelection = new Selection(
-			firstRange.startLineNumber,
-			firstRange.startColumn,
-			firstRange.endLineNumber,
-			firstRange.endColumn
-		);
-		return [initialSelection];
-	}
-
-	private _getEndCursorSelections(inverseEditOperations: IIdentifiedSingleEditOperation[]): Selection[] {
-		let relevantEditIndex = 0;
-		for (let i = 0; i < inverseEditOperations.length; i++) {
-			const editRange = inverseEditOperations[i].range;
-			for (let j = 0; j < this._initialSelections.length; j++) {
-				const selectionRange = this._initialSelections[j];
-				if (Range.areIntersectingOrTouching(editRange, selectionRange)) {
-					relevantEditIndex = i;
-					break;
-				}
-			}
-		}
-
-		const srcRange = inverseEditOperations[relevantEditIndex].range;
-		this._endCursorSelection = new Selection(
-			srcRange.endLineNumber,
-			srcRange.endColumn,
-			srcRange.endLineNumber,
-			srcRange.endColumn
-		);
-		return [this._endCursorSelection];
-	}
-
-	getEndCursorSelection(): Selection {
-		return this._endCursorSelection;
-	}
-
 }
 
-class SourceModelEditTask extends EditTask {
+class EditorEditTask extends ModelEditTask {
 
-	private _knownInitialSelections: Selection[];
+	private _editor: ICodeEditor;
 
-	constructor(modelReference: IReference<ITextEditorModel>, initialSelections: Selection[]) {
+	constructor(modelReference: IReference<ITextEditorModel>, editor: ICodeEditor) {
 		super(modelReference);
-		this._knownInitialSelections = initialSelections;
+		this._editor = editor;
 	}
 
-	protected _getInitialSelections(): Selection[] {
-		return this._knownInitialSelections;
+	apply(): void {
+		if (this._edits.length > 0) {
+			this._edits = mergeSort(this._edits, (a, b) => Range.compareRangesUsingStarts(a.range, b.range));
+			this._editor.pushUndoStop();
+			this._editor.executeEdits('', this._edits);
+			this._editor.pushUndoStop();
+		}
+		if (this._newEol !== undefined) {
+			this._editor.pushUndoStop();
+			this._editor.getModel().pushEOL(this._newEol);
+			this._editor.pushUndoStop();
+		}
 	}
 }
 
@@ -172,10 +134,8 @@ class BulkEditModel implements IDisposable {
 
 	private _textModelResolverService: ITextModelService;
 	private _edits = new Map<string, ResourceTextEdit[]>();
-	private _tasks: EditTask[];
-	private _sourceModel: URI;
-	private _sourceSelections: Selection[];
-	private _sourceModelTask: SourceModelEditTask;
+	private _editor: ICodeEditor;
+	private _tasks: ModelEditTask[];
 	private _progress: IProgress<void>;
 
 	constructor(
@@ -185,9 +145,7 @@ class BulkEditModel implements IDisposable {
 		progress: IProgress<void>
 	) {
 		this._textModelResolverService = textModelResolverService;
-		this._sourceModel = editor ? editor.getModel().uri : undefined;
-		this._sourceSelections = editor ? editor.getSelections() : undefined;
-		this._sourceModelTask = undefined;
+		this._editor = editor;
 		this._progress = progress;
 
 		edits.forEach(this.addEdit, this);
@@ -206,7 +164,7 @@ class BulkEditModel implements IDisposable {
 		array.push(edit);
 	}
 
-	async prepare(): TPromise<BulkEditModel> {
+	async prepare(): Promise<BulkEditModel> {
 
 		if (this._tasks) {
 			throw new Error('illegal state - already prepared');
@@ -223,12 +181,11 @@ class BulkEditModel implements IDisposable {
 					throw new Error(`Cannot load file ${key}`);
 				}
 
-				let task: EditTask;
-				if (this._sourceModel && model.textEditorModel.uri.toString() === this._sourceModel.toString()) {
-					this._sourceModelTask = new SourceModelEditTask(ref, this._sourceSelections);
-					task = this._sourceModelTask;
+				let task: ModelEditTask;
+				if (this._editor && this._editor.getModel().uri.toString() === model.textEditorModel.uri.toString()) {
+					task = new EditorEditTask(ref, this._editor);
 				} else {
-					task = new EditTask(ref);
+					task = new ModelEditTask(ref);
 				}
 
 				value.forEach(edit => task.addEdit(edit));
@@ -243,14 +200,21 @@ class BulkEditModel implements IDisposable {
 		return this;
 	}
 
-	apply(): Selection {
+	validate(): ValidationResult {
+		for (const task of this._tasks) {
+			const result = task.validate();
+			if (!result.canApply) {
+				return result;
+			}
+		}
+		return { canApply: true };
+	}
+
+	apply(): void {
 		for (const task of this._tasks) {
 			task.apply();
 			this._progress.report(undefined);
 		}
-		return this._sourceModelTask
-			? this._sourceModelTask.getEndCursorSelection()
-			: undefined;
 	}
 }
 
@@ -265,8 +229,11 @@ export class BulkEdit {
 	constructor(
 		editor: ICodeEditor,
 		progress: IProgressRunner,
+		@ILogService private readonly _logService: ILogService,
 		@ITextModelService private readonly _textModelService: ITextModelService,
-		@IFileService private readonly _fileService: IFileService
+		@IFileService private readonly _fileService: IFileService,
+		@ITextFileService private readonly _textFileService: ITextFileService,
+		@ILabelService private readonly _uriLabelServie: ILabelService
 	) {
 		this._editor = editor;
 		this._progress = progress || emptyProgressRunner;
@@ -292,7 +259,7 @@ export class BulkEdit {
 		}
 	}
 
-	async perform(): TPromise<Selection> {
+	async perform(): Promise<void> {
 
 		let seen = new Set<string>();
 		let total = 0;
@@ -322,35 +289,48 @@ export class BulkEdit {
 		this._progress.total(total);
 		let progress: IProgress<void> = { report: _ => this._progress.worked(1) };
 
-		// do it. return the last selection computed
-		// by a text change (can be undefined then)
-		let res: Selection = undefined;
+		// do it.
 		for (const group of groups) {
 			if (isResourceFileEdit(group[0])) {
 				await this._performFileEdits(<ResourceFileEdit[]>group, progress);
 			} else {
-				res = await this._performTextEdits(<ResourceTextEdit[]>group, progress) || res;
+				await this._performTextEdits(<ResourceTextEdit[]>group, progress);
 			}
 		}
-		return res;
 	}
 
 	private async _performFileEdits(edits: ResourceFileEdit[], progress: IProgress<void>) {
+		this._logService.debug('_performFileEdits', JSON.stringify(edits));
 		for (const edit of edits) {
-
 			progress.report(undefined);
 
+			let options = edit.options || {};
+
 			if (edit.newUri && edit.oldUri) {
-				await this._fileService.moveFile(edit.oldUri, edit.newUri, false);
+				// rename
+				if (options.overwrite === undefined && options.ignoreIfExists && await this._fileService.existsFile(edit.newUri)) {
+					continue; // not overwriting, but ignoring, and the target file exists
+				}
+				await this._textFileService.move(edit.oldUri, edit.newUri, options.overwrite);
+
 			} else if (!edit.newUri && edit.oldUri) {
-				await this._fileService.del(edit.oldUri, true);
+				// delete file
+				if (!options.ignoreIfNotExists || await this._fileService.existsFile(edit.oldUri)) {
+					await this._textFileService.delete(edit.oldUri, { useTrash: true, recursive: options.recursive });
+				}
+
 			} else if (edit.newUri && !edit.oldUri) {
-				await this._fileService.createFile(edit.newUri, undefined, { overwrite: false });
+				// create file
+				if (options.overwrite === undefined && options.ignoreIfExists && await this._fileService.existsFile(edit.newUri)) {
+					continue; // not overwriting, but ignoring, and the target file exists
+				}
+				await this._textFileService.create(edit.newUri, undefined, { overwrite: options.overwrite });
 			}
 		}
 	}
 
-	private async _performTextEdits(edits: ResourceTextEdit[], progress: IProgress<void>): TPromise<Selection> {
+	private async _performTextEdits(edits: ResourceTextEdit[], progress: IProgress<void>): Promise<void> {
+		this._logService.debug('_performTextEdits', JSON.stringify(edits));
 
 		const recording = Recording.start(this._fileService);
 		const model = new BulkEditModel(this._textModelService, this._editor, edits, progress);
@@ -359,7 +339,7 @@ export class BulkEdit {
 
 		const conflicts = edits
 			.filter(edit => recording.hasChanged(edit.resource))
-			.map(edit => getPathLabel(edit.resource));
+			.map(edit => this._uriLabelServie.getUriLabel(edit.resource, true));
 
 		recording.stop();
 
@@ -368,9 +348,13 @@ export class BulkEdit {
 			throw new Error(localize('conflict', "These files have changed in the meantime: {0}", conflicts.join(', ')));
 		}
 
-		const selection = await model.apply();
+		const validationResult = model.validate();
+		if (validationResult.canApply === false) {
+			throw new Error(`${validationResult.reason.toString()} has changed in the meantime`);
+		}
+
+		await model.apply();
 		model.dispose();
-		return selection;
 	}
 }
 
@@ -379,10 +363,13 @@ export class BulkEditService implements IBulkEditService {
 	_serviceBrand: any;
 
 	constructor(
+		@ILogService private readonly _logService: ILogService,
 		@IModelService private readonly _modelService: IModelService,
 		@IEditorService private readonly _editorService: IEditorService,
 		@ITextModelService private readonly _textModelService: ITextModelService,
-		@IFileService private readonly _fileService: IFileService
+		@IFileService private readonly _fileService: IFileService,
+		@ITextFileService private readonly _textFileService: ITextFileService,
+		@ILabelService private readonly _labelService: ILabelService
 	) {
 
 	}
@@ -413,14 +400,17 @@ export class BulkEditService implements IBulkEditService {
 			}
 		}
 
-		const bulkEdit = new BulkEdit(options.editor, options.progress, this._textModelService, this._fileService);
+		const bulkEdit = new BulkEdit(options.editor, options.progress, this._logService, this._textModelService, this._fileService, this._textFileService, this._labelService);
 		bulkEdit.add(edits);
-		return bulkEdit.perform().then(selection => {
-			return {
-				selection,
-				ariaSummary: bulkEdit.ariaMessage()
-			};
-		});
+
+		return TPromise.wrap(bulkEdit.perform().then(() => {
+			return { ariaSummary: bulkEdit.ariaMessage() };
+		}, err => {
+			// console.log('apply FAILED');
+			// console.log(err);
+			this._logService.error(err);
+			throw err;
+		}));
 	}
 }
 
diff --git a/src/vs/workbench/services/codeEditor/browser/codeEditorService.ts b/src/vs/workbench/services/codeEditor/browser/codeEditorService.ts
index 455bb51553b..0a65846ead6 100644
--- a/src/vs/workbench/services/codeEditor/browser/codeEditorService.ts
+++ b/src/vs/workbench/services/codeEditor/browser/codeEditorService.ts
@@ -11,7 +11,7 @@ import { IResourceInput } from 'vs/platform/editor/common/editor';
 import { IEditorService, SIDE_GROUP, ACTIVE_GROUP } from 'vs/workbench/services/editor/common/editorService';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { TPromise } from 'vs/base/common/winjs.base';
-import { TextEditorOptions } from '../../../common/editor';
+import { TextEditorOptions } from 'vs/workbench/common/editor';
 import { ScrollType } from 'vs/editor/common/editorCommon';
 
 export class CodeEditorService extends CodeEditorServiceImpl {
diff --git a/src/vs/workbench/services/configuration/common/configurationExtensionPoint.ts b/src/vs/workbench/services/configuration/common/configurationExtensionPoint.ts
index 5bb46155fc9..33e539305f4 100644
--- a/src/vs/workbench/services/configuration/common/configurationExtensionPoint.ts
+++ b/src/vs/workbench/services/configuration/common/configurationExtensionPoint.ts
@@ -28,7 +28,7 @@ const configurationEntrySchema: IJSONSchema = {
 			type: 'object',
 			additionalProperties: {
 				anyOf: [
-					{ $ref: 'http://json-schema.org/draft-04/schema#' },
+					{ $ref: 'http://json-schema.org/draft-07/schema#' },
 					{
 						type: 'object',
 						properties: {
@@ -46,6 +46,28 @@ const configurationEntrySchema: IJSONSchema = {
 									nls.localize('scope.resource.description', "Resource specific configuration, which can be configured in the User, Workspace or Folder settings.")
 								],
 								description: nls.localize('scope.description', "Scope in which the configuration is applicable. Available scopes are `window` and `resource`.")
+							},
+							enumDescriptions: {
+								type: 'array',
+								items: {
+									type: 'string',
+								},
+								description: nls.localize('scope.enumDescriptions', 'Descriptions for enum values')
+							},
+							markdownEnumDescription: {
+								type: 'array',
+								items: {
+									type: 'string',
+								},
+								description: nls.localize('scope.markdownEnumDescription', 'Descriptions for enum values in the markdown format.')
+							},
+							markdownDescription: {
+								type: 'string',
+								description: nls.localize('scope.markdownDescription', 'The description in the markdown format.')
+							},
+							deprecationMessage: {
+								type: 'string',
+								description: nls.localize('scope.deprecationMessage', 'If set, the property is marked as deprecated and the given message is shown as as explanation.')
 							}
 						}
 					}
@@ -106,7 +128,8 @@ configurationExtPoint.setHandler(extensions => {
 
 		validateProperties(configuration, extension);
 
-		configuration.id = extension.description.uuid || extension.description.id;
+		configuration.id = node.id || extension.description.id || extension.description.uuid;
+		configuration.contributedByExtension = true;
 		configuration.title = configuration.title || extension.description.displayName || extension.description.id;
 		configurations.push(configuration);
 	}
@@ -154,7 +177,6 @@ function validateProperties(configuration: IConfigurationNode, extension: IExten
 			} else {
 				propertyConfiguration.scope = ConfigurationScope.WINDOW;
 			}
-			propertyConfiguration.notMultiRootAdopted = !(extension.description.isBuiltin || (Array.isArray(extension.description.keywords) && extension.description.keywords.indexOf('multi-root ready') !== -1));
 		}
 	}
 	let subNodes = configuration.allOf;
diff --git a/src/vs/workbench/services/configuration/common/configurationModels.ts b/src/vs/workbench/services/configuration/common/configurationModels.ts
index 0d0fda5d2c1..cb2eef4404d 100644
--- a/src/vs/workbench/services/configuration/common/configurationModels.ts
+++ b/src/vs/workbench/services/configuration/common/configurationModels.ts
@@ -8,11 +8,11 @@ import { equals } from 'vs/base/common/objects';
 import { compare, toValuesTree, IConfigurationChangeEvent, ConfigurationTarget, IConfigurationModel, IConfigurationOverrides } from 'vs/platform/configuration/common/configuration';
 import { Configuration as BaseConfiguration, ConfigurationModelParser, ConfigurationChangeEvent, ConfigurationModel, AbstractConfigurationChangeEvent } from 'vs/platform/configuration/common/configurationModels';
 import { Registry } from 'vs/platform/registry/common/platform';
-import { IConfigurationRegistry, IConfigurationPropertySchema, Extensions, ConfigurationScope } from 'vs/platform/configuration/common/configurationRegistry';
+import { IConfigurationRegistry, IConfigurationPropertySchema, Extensions, ConfigurationScope, OVERRIDE_PROPERTY_PATTERN } from 'vs/platform/configuration/common/configurationRegistry';
 import { IStoredWorkspaceFolder } from 'vs/platform/workspaces/common/workspaces';
 import { Workspace } from 'vs/platform/workspace/common/workspace';
 import { ResourceMap } from 'vs/base/common/map';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 
 export class WorkspaceConfigurationModelParser extends ConfigurationModelParser {
 
@@ -101,18 +101,27 @@ export class FolderSettingsModelParser extends ConfigurationModelParser {
 	}
 
 	private parseWorkspaceSettings(rawSettings: any): void {
-		const rawWorkspaceSettings = {};
 		const configurationProperties = Registry.as<IConfigurationRegistry>(Extensions.Configuration).getConfigurationProperties();
-		for (let key in rawSettings) {
-			const scope = this.getScope(key, configurationProperties);
-			if (this.scopes.indexOf(scope) !== -1) {
-				rawWorkspaceSettings[key] = rawSettings[key];
-			}
-		}
+		const rawWorkspaceSettings = this.filterByScope(rawSettings, configurationProperties, true);
 		const configurationModel = this.parseRaw(rawWorkspaceSettings);
 		this._settingsModel = new ConfigurationModel(configurationModel.contents, configurationModel.keys, configurationModel.overrides);
 	}
 
+	private filterByScope(properties: {}, configurationProperties: { [qualifiedKey: string]: IConfigurationPropertySchema }, filterOverriddenProperties: boolean): {} {
+		const result = {};
+		for (let key in properties) {
+			if (OVERRIDE_PROPERTY_PATTERN.test(key) && filterOverriddenProperties) {
+				result[key] = this.filterByScope(properties[key], configurationProperties, false);
+			} else {
+				const scope = this.getScope(key, configurationProperties);
+				if (this.scopes.indexOf(scope) !== -1) {
+					result[key] = properties[key];
+				}
+			}
+		}
+		return result;
+	}
+
 	private getScope(key: string, configurationProperties: { [qualifiedKey: string]: IConfigurationPropertySchema }): ConfigurationScope {
 		const propertySchema = configurationProperties[key];
 		return propertySchema ? propertySchema.scope : ConfigurationScope.WINDOW;
diff --git a/src/vs/workbench/services/configuration/common/jsonEditing.ts b/src/vs/workbench/services/configuration/common/jsonEditing.ts
index d7e3ba6d347..6d7987d324a 100644
--- a/src/vs/workbench/services/configuration/common/jsonEditing.ts
+++ b/src/vs/workbench/services/configuration/common/jsonEditing.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { createDecorator, ServiceIdentifier } from 'vs/platform/instantiation/common/instantiation';
 
 export const IJSONEditingService = createDecorator<IJSONEditingService>('jsonEditingService');
 
-export enum JSONEditingErrorCode {
+export const enum JSONEditingErrorCode {
 
 	/**
 	 * Error when trying to write and save to the file while it is dirty in the editor.
diff --git a/src/vs/workbench/services/configuration/node/configuration.ts b/src/vs/workbench/services/configuration/node/configuration.ts
index a47582c4722..f5eb365ece7 100644
--- a/src/vs/workbench/services/configuration/node/configuration.ts
+++ b/src/vs/workbench/services/configuration/node/configuration.ts
@@ -3,9 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { createHash } from 'crypto';
 import * as paths from 'vs/base/common/paths';
+import * as resources from 'vs/base/common/resources';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { Event, Emitter } from 'vs/base/common/event';
 import * as pfs from 'vs/base/node/pfs';
@@ -124,7 +125,7 @@ export class WorkspaceConfiguration extends Disposable {
 }
 
 function isFolderConfigurationFile(resource: URI): boolean {
-	const name = paths.basename(resource.path);
+	const name = resources.basename(resource);
 	return [`${FOLDER_SETTINGS_NAME}.json`, `${TASKS_CONFIGURATION_KEY}.json`, `${LAUNCH_CONFIGURATION_KEY}.json`].some(p => p === name);// only workspace config files
 }
 
@@ -192,7 +193,7 @@ export abstract class AbstractFolderConfiguration extends Disposable implements
 
 	private parseContents(contents: { resource: URI, value: string }[]): void {
 		for (const content of contents) {
-			const name = paths.basename(content.resource.path);
+			const name = resources.basename(content.resource);
 			if (name === `${FOLDER_SETTINGS_NAME}.json`) {
 				this._folderSettingsModelParser.parse(content.value);
 			} else {
@@ -215,7 +216,7 @@ export class NodeBasedFolderConfiguration extends AbstractFolderConfiguration {
 
 	constructor(folder: URI, configFolderRelativePath: string, workbenchState: WorkbenchState) {
 		super(folder, workbenchState);
-		this.folderConfigurationPath = URI.file(paths.join(this.folder.fsPath, configFolderRelativePath));
+		this.folderConfigurationPath = resources.joinPath(folder, configFolderRelativePath);
 	}
 
 	protected loadFolderConfigurationContents(): TPromise<{ resource: URI, value: string }[]> {
@@ -248,7 +249,7 @@ export class NodeBasedFolderConfiguration extends AbstractFolderConfiguration {
 					c({
 						resource,
 						isDirectory: true,
-						children: children.map(child => { return { resource: URI.file(paths.join(resource.fsPath, child)) }; })
+						children: children.map(child => { return { resource: resources.joinPath(resource, child) }; })
 					});
 				}
 			});
@@ -264,7 +265,7 @@ export class FileServiceBasedFolderConfiguration extends AbstractFolderConfigura
 
 	constructor(folder: URI, private configFolderRelativePath: string, workbenchState: WorkbenchState, private fileService: IFileService, from?: AbstractFolderConfiguration) {
 		super(folder, workbenchState, from);
-		this.folderConfigurationPath = folder.with({ path: paths.join(this.folder.path, configFolderRelativePath) });
+		this.folderConfigurationPath = resources.joinPath(folder, configFolderRelativePath);
 		this.reloadConfigurationScheduler = this._register(new RunOnceScheduler(() => this._onDidChange.fire(), 50));
 		this._register(fileService.onFileChanges(e => this.handleWorkspaceFileEvents(e)));
 	}
@@ -284,7 +285,7 @@ export class FileServiceBasedFolderConfiguration extends AbstractFolderConfigura
 				}
 			}).then(null, err => [] /* never fail this call */);
 
-		return bulkContentFetchromise.then(() => TPromise.join(workspaceFilePathToConfiguration).then(result => collections.values(result)));
+		return bulkContentFetchromise.then(() => TPromise.join(collections.values(workspaceFilePathToConfiguration)));
 	}
 
 	private handleWorkspaceFileEvents(event: FileChangesEvent): void {
@@ -295,7 +296,7 @@ export class FileServiceBasedFolderConfiguration extends AbstractFolderConfigura
 		for (let i = 0, len = events.length; i < len; i++) {
 
 			const resource = events[i].resource;
-			const basename = paths.basename(resource.path);
+			const basename = resources.basename(resource);
 			const isJson = paths.extname(basename) === '.json';
 			const isDeletedSettingsFolder = (events[i].type === FileChangeType.DELETED && basename === this.configFolderRelativePath);
 
@@ -337,7 +338,7 @@ export class FileServiceBasedFolderConfiguration extends AbstractFolderConfigura
 				return paths.normalize(relative(this.folderConfigurationPath.fsPath, resource.fsPath));
 			}
 		} else {
-			if (paths.isEqualOrParent(resource.path, this.folderConfigurationPath.path, true /* ignorecase */)) {
+			if (resources.isEqualOrParent(resource, this.folderConfigurationPath)) {
 				return paths.normalize(relative(this.folderConfigurationPath.path, resource.path));
 			}
 		}
@@ -489,4 +490,4 @@ export class FolderConfiguration extends Disposable implements IFolderConfigurat
 		}
 		return TPromise.as(null);
 	}
-}
\ No newline at end of file
+}
diff --git a/src/vs/workbench/services/configuration/node/configurationEditingService.ts b/src/vs/workbench/services/configuration/node/configurationEditingService.ts
index ffea6529bbf..3124d92e563 100644
--- a/src/vs/workbench/services/configuration/node/configurationEditingService.ts
+++ b/src/vs/workbench/services/configuration/node/configurationEditingService.ts
@@ -7,7 +7,7 @@
 
 import * as nls from 'vs/nls';
 import { TPromise } from 'vs/base/common/winjs.base';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import * as json from 'vs/base/common/json';
 import * as encoding from 'vs/base/node/encoding';
 import * as strings from 'vs/base/common/strings';
@@ -27,12 +27,12 @@ import { FOLDER_SETTINGS_PATH, WORKSPACE_STANDALONE_CONFIGURATIONS, TASKS_CONFIG
 import { IFileService } from 'vs/platform/files/common/files';
 import { ITextModelService, ITextEditorModel } from 'vs/editor/common/services/resolverService';
 import { OVERRIDE_PROPERTY_PATTERN, IConfigurationRegistry, Extensions as ConfigurationExtensions, ConfigurationScope } from 'vs/platform/configuration/common/configurationRegistry';
-import { ICommandService } from 'vs/platform/commands/common/commands';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { ITextModel } from 'vs/editor/common/model';
 import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
+import { IPreferencesService } from 'vs/workbench/services/preferences/common/preferences';
 
-export enum ConfigurationEditingErrorCode {
+export const enum ConfigurationEditingErrorCode {
 
 	/**
 	 * Error when trying to write a configuration key that is not registered.
@@ -132,7 +132,7 @@ export class ConfigurationEditingService {
 		@ITextModelService private textModelResolverService: ITextModelService,
 		@ITextFileService private textFileService: ITextFileService,
 		@INotificationService private notificationService: INotificationService,
-		@ICommandService private commandService: ICommandService,
+		@IPreferencesService private preferencesService: IPreferencesService,
 		@IEditorService private editorService: IEditorService
 	) {
 		this.queue = new Queue<void>();
@@ -248,16 +248,16 @@ export class ConfigurationEditingService {
 	private openSettings(operation: IConfigurationEditOperation): void {
 		switch (operation.target) {
 			case ConfigurationTarget.USER:
-				this.commandService.executeCommand('workbench.action.openGlobalSettings');
+				this.preferencesService.openGlobalSettings(true);
 				break;
 			case ConfigurationTarget.WORKSPACE:
-				this.commandService.executeCommand('workbench.action.openWorkspaceSettings');
+				this.preferencesService.openWorkspaceSettings(true);
 				break;
 			case ConfigurationTarget.WORKSPACE_FOLDER:
 				if (operation.resource) {
 					const workspaceFolder = this.contextService.getWorkspaceFolder(operation.resource);
 					if (workspaceFolder) {
-						this.commandService.executeCommand('_workbench.action.openFolderSettings', workspaceFolder);
+						this.preferencesService.openFolderSettings(workspaceFolder.uri, true);
 					}
 				}
 				break;
@@ -371,7 +371,7 @@ export class ConfigurationEditingService {
 			return false;
 		}
 		const parseErrors: json.ParseError[] = [];
-		json.parse(model.getValue(), parseErrors, { allowTrailingComma: true });
+		json.parse(model.getValue(), parseErrors);
 		return parseErrors.length > 0;
 	}
 
diff --git a/src/vs/workbench/services/configuration/node/configurationService.ts b/src/vs/workbench/services/configuration/node/configurationService.ts
index f304dc4c546..782c8d13dc9 100644
--- a/src/vs/workbench/services/configuration/node/configurationService.ts
+++ b/src/vs/workbench/services/configuration/node/configurationService.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { dirname, basename } from 'path';
 import * as assert from 'vs/base/common/assert';
@@ -16,8 +16,8 @@ import { Queue } from 'vs/base/common/async';
 import { stat, writeFile } from 'vs/base/node/pfs';
 import { IJSONContributionRegistry, Extensions as JSONExtensions } from 'vs/platform/jsonschemas/common/jsonContributionRegistry';
 import { IWorkspaceContextService, Workspace, WorkbenchState, IWorkspaceFolder, toWorkspaceFolders, IWorkspaceFoldersChangeEvent, WorkspaceFolder } from 'vs/platform/workspace/common/workspace';
+import { isLinux, isWindows, isMacintosh } from 'vs/base/common/platform';
 import { IFileService } from 'vs/platform/files/common/files';
-import { isLinux } from 'vs/base/common/platform';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { ConfigurationChangeEvent, ConfigurationModel, DefaultConfigurationModel } from 'vs/platform/configuration/common/configurationModels';
 import { IConfigurationChangeEvent, ConfigurationTarget, IConfigurationOverrides, keyFromOverrideIdentifier, isConfigurationOverrides, IConfigurationData } from 'vs/platform/configuration/common/configuration';
@@ -26,7 +26,7 @@ import { IWorkspaceConfigurationService, FOLDER_CONFIG_FOLDER_NAME, defaultSetti
 import { Registry } from 'vs/platform/registry/common/platform';
 import { IConfigurationNode, IConfigurationRegistry, Extensions, IConfigurationPropertySchema, allSettings, windowSettings, resourceSettings, applicationSettings } from 'vs/platform/configuration/common/configurationRegistry';
 import { createHash } from 'crypto';
-import { getWorkspaceLabel, IWorkspaceIdentifier, ISingleFolderWorkspaceIdentifier, isSingleFolderWorkspaceIdentifier, isWorkspaceIdentifier, IStoredWorkspaceFolder, isStoredWorkspaceFolder, IWorkspaceFolderCreationData } from 'vs/platform/workspaces/common/workspaces';
+import { IWorkspaceIdentifier, isWorkspaceIdentifier, IStoredWorkspaceFolder, isStoredWorkspaceFolder, IWorkspaceFolderCreationData, ISingleFolderWorkspaceIdentifier, isSingleFolderWorkspaceIdentifier } from 'vs/platform/workspaces/common/workspaces';
 import { IWindowConfiguration } from 'vs/platform/windows/common/windows';
 import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
 import { ICommandService } from 'vs/platform/commands/common/commands';
@@ -38,9 +38,9 @@ import { JSONEditingService } from 'vs/workbench/services/configuration/node/jso
 import { Schemas } from 'vs/base/common/network';
 import { massageFolderPathForWorkspace } from 'vs/platform/workspaces/node/workspaces';
 import { UserConfiguration } from 'vs/platform/configuration/node/configuration';
-import { getBaseLabel } from 'vs/base/common/labels';
 import { IJSONSchema, IJSONSchemaMap } from 'vs/base/common/jsonSchema';
 import { localize } from 'vs/nls';
+import { isEqual } from 'vs/base/common/resources';
 
 export class WorkspaceService extends Disposable implements IWorkspaceConfigurationService, IWorkspaceContextService {
 
@@ -80,7 +80,7 @@ export class WorkspaceService extends Disposable implements IWorkspaceConfigurat
 		this._register(this.userConfiguration.onDidChangeConfiguration(() => this.onUserConfigurationChanged()));
 		this._register(this.workspaceConfiguration.onDidUpdateConfiguration(() => this.onWorkspaceConfigurationChanged()));
 
-		this._register(Registry.as<IConfigurationRegistry>(Extensions.Configuration).onDidRegisterConfiguration(e => this.registerConfigurationSchemas()));
+		this._register(Registry.as<IConfigurationRegistry>(Extensions.Configuration).onDidSchemaChange(e => this.registerConfigurationSchemas()));
 		this._register(Registry.as<IConfigurationRegistry>(Extensions.Configuration).onDidRegisterConfiguration(configurationProperties => this.onDefaultConfigurationChanged(configurationProperties)));
 
 		this.workspaceEditingQueue = new Queue<void>();
@@ -131,7 +131,7 @@ export class WorkspaceService extends Disposable implements IWorkspaceConfigurat
 	public isCurrentWorkspace(workspaceIdentifier: ISingleFolderWorkspaceIdentifier | IWorkspaceIdentifier): boolean {
 		switch (this.getWorkbenchState()) {
 			case WorkbenchState.FOLDER:
-				return isSingleFolderWorkspaceIdentifier(workspaceIdentifier) && this.pathEquals(this.workspace.folders[0].uri.fsPath, workspaceIdentifier);
+				return isSingleFolderWorkspaceIdentifier(workspaceIdentifier) && isEqual(workspaceIdentifier, this.workspace.folders[0].uri);
 			case WorkbenchState.WORKSPACE:
 				return isWorkspaceIdentifier(workspaceIdentifier) && this.workspace.id === workspaceIdentifier.id;
 		}
@@ -295,9 +295,9 @@ export class WorkspaceService extends Disposable implements IWorkspaceConfigurat
 		return this._configuration.keys();
 	}
 
-	initialize(arg: IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier | IWindowConfiguration): TPromise<any> {
+	initialize(arg: IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier | IWindowConfiguration, postInitialisationTask: () => void = () => null): TPromise<any> {
 		return this.createWorkspace(arg)
-			.then(workspace => this.updateWorkspaceAndInitializeConfiguration(workspace));
+			.then(workspace => this.updateWorkspaceAndInitializeConfiguration(workspace, postInitialisationTask));
 	}
 
 	acquireFileService(fileService: IFileService): void {
@@ -322,7 +322,7 @@ export class WorkspaceService extends Disposable implements IWorkspaceConfigurat
 		this.jsonEditingService = instantiationService.createInstance(JSONEditingService);
 	}
 
-	private createWorkspace(arg: IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier | IWindowConfiguration): TPromise<Workspace> {
+	private createWorkspace(arg: IWorkspaceIdentifier | URI | IWindowConfiguration): TPromise<Workspace> {
 		if (isWorkspaceIdentifier(arg)) {
 			return this.createMulitFolderWorkspace(arg);
 		}
@@ -340,20 +340,34 @@ export class WorkspaceService extends Disposable implements IWorkspaceConfigurat
 			.then(() => {
 				const workspaceFolders = toWorkspaceFolders(this.workspaceConfiguration.getFolders(), URI.file(dirname(workspaceConfigPath.fsPath)));
 				const workspaceId = workspaceIdentifier.id;
-				const workspaceName = getWorkspaceLabel({ id: workspaceId, configPath: workspaceConfigPath.fsPath }, this.environmentService);
-				return new Workspace(workspaceId, workspaceName, workspaceFolders, workspaceConfigPath);
+				return new Workspace(workspaceId, workspaceFolders, workspaceConfigPath);
 			});
 	}
 
-	private createSingleFolderWorkspace(singleFolderWorkspaceIdentifier: ISingleFolderWorkspaceIdentifier): TPromise<Workspace> {
-		const folderPath = URI.file(singleFolderWorkspaceIdentifier);
-		return stat(folderPath.fsPath)
-			.then(workspaceStat => {
-				const ctime = isLinux ? workspaceStat.ino : workspaceStat.birthtime.getTime(); // On Linux, birthtime is ctime, so we cannot use it! We use the ino instead!
-				const id = createHash('md5').update(folderPath.fsPath).update(ctime ? String(ctime) : '').digest('hex');
-				const folder = URI.file(folderPath.fsPath);
-				return new Workspace(id, getBaseLabel(folder), toWorkspaceFolders([{ path: folder.fsPath }]), null, ctime);
-			});
+	private createSingleFolderWorkspace(folder: URI): TPromise<Workspace> {
+		if (folder.scheme === Schemas.file) {
+			return stat(folder.fsPath)
+				.then(workspaceStat => {
+					let ctime: number;
+					if (isLinux) {
+						ctime = workspaceStat.ino; // Linux: birthtime is ctime, so we cannot use it! We use the ino instead!
+					} else if (isMacintosh) {
+						ctime = workspaceStat.birthtime.getTime(); // macOS: birthtime is fine to use as is
+					} else if (isWindows) {
+						if (typeof workspaceStat.birthtimeMs === 'number') {
+							ctime = Math.floor(workspaceStat.birthtimeMs); // Windows: fix precision issue in node.js 8.x to get 7.x results (see https://github.com/nodejs/node/issues/19897)
+						} else {
+							ctime = workspaceStat.birthtime.getTime();
+						}
+					}
+
+					const id = createHash('md5').update(folder.fsPath).update(ctime ? String(ctime) : '').digest('hex');
+					return new Workspace(id, toWorkspaceFolders([{ path: folder.fsPath }]), null, ctime);
+				});
+		} else {
+			const id = createHash('md5').update(folder.toString()).digest('hex');
+			return TPromise.as(new Workspace(id, toWorkspaceFolders([{ uri: folder.toString() }]), null));
+		}
 	}
 
 	private createEmptyWorkspace(configuration: IWindowConfiguration): TPromise<Workspace> {
@@ -361,7 +375,7 @@ export class WorkspaceService extends Disposable implements IWorkspaceConfigurat
 		return TPromise.as(new Workspace(id));
 	}
 
-	private updateWorkspaceAndInitializeConfiguration(workspace: Workspace): TPromise<void> {
+	private updateWorkspaceAndInitializeConfiguration(workspace: Workspace, postInitialisationTask: () => void): TPromise<void> {
 		const hasWorkspaceBefore = !!this.workspace;
 		let previousState: WorkbenchState;
 		let previousWorkspacePath: string;
@@ -377,6 +391,9 @@ export class WorkspaceService extends Disposable implements IWorkspaceConfigurat
 		}
 
 		return this.initializeConfiguration().then(() => {
+
+			postInitialisationTask(); // Post initialisation task should be run before triggering events.
+
 			// Trigger changes after configuration initialization so that configuration is up to date.
 			if (hasWorkspaceBefore) {
 				const newState = this.getWorkbenchState();
@@ -667,15 +684,6 @@ export class WorkspaceService extends Disposable implements IWorkspaceConfigurat
 		}
 		return {};
 	}
-
-	private pathEquals(path1: string, path2: string): boolean {
-		if (!isLinux) {
-			path1 = path1.toLowerCase();
-			path2 = path2.toLowerCase();
-		}
-
-		return path1 === path2;
-	}
 }
 
 interface IExportedConfigurationNode {
@@ -727,7 +735,7 @@ export class DefaultConfigurationExportHelper {
 		const processProperty = (name: string, prop: IConfigurationPropertySchema) => {
 			const propDetails: IExportedConfigurationNode = {
 				name,
-				description: prop.description,
+				description: prop.description || prop.markdownDescription || '',
 				default: prop.default,
 				type: prop.type
 			};
@@ -736,8 +744,8 @@ export class DefaultConfigurationExportHelper {
 				propDetails.enum = prop.enum;
 			}
 
-			if (prop.enumDescriptions) {
-				propDetails.enumDescriptions = prop.enumDescriptions;
+			if (prop.enumDescriptions || prop.markdownEnumDescriptions) {
+				propDetails.enumDescriptions = prop.enumDescriptions || prop.markdownEnumDescriptions;
 			}
 
 			settings.push(propDetails);
diff --git a/src/vs/workbench/services/configuration/node/jsonEditingService.ts b/src/vs/workbench/services/configuration/node/jsonEditingService.ts
index 2c47d99e7c6..8bbb81dd700 100644
--- a/src/vs/workbench/services/configuration/node/jsonEditingService.ts
+++ b/src/vs/workbench/services/configuration/node/jsonEditingService.ts
@@ -5,7 +5,7 @@
 
 import * as nls from 'vs/nls';
 import { TPromise } from 'vs/base/common/winjs.base';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import * as json from 'vs/base/common/json';
 import * as encoding from 'vs/base/node/encoding';
 import * as strings from 'vs/base/common/strings';
@@ -95,7 +95,7 @@ export class JSONEditingService implements IJSONEditingService {
 
 	private hasParseErrors(model: ITextModel): boolean {
 		const parseErrors: json.ParseError[] = [];
-		json.parse(model.getValue(), parseErrors, { allowTrailingComma: true });
+		json.parse(model.getValue(), parseErrors);
 		return parseErrors.length > 0;
 	}
 
diff --git a/src/vs/workbench/services/configuration/test/common/configurationModels.test.ts b/src/vs/workbench/services/configuration/test/common/configurationModels.test.ts
index 2a397b9df49..c998789df2f 100644
--- a/src/vs/workbench/services/configuration/test/common/configurationModels.test.ts
+++ b/src/vs/workbench/services/configuration/test/common/configurationModels.test.ts
@@ -9,7 +9,7 @@ import { join } from 'vs/base/common/paths';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { FolderSettingsModelParser, WorkspaceConfigurationChangeEvent, StandaloneConfigurationModelParser, AllKeysConfigurationChangeEvent, Configuration } from 'vs/workbench/services/configuration/common/configurationModels';
 import { Workspace, WorkspaceFolder } from 'vs/platform/workspace/common/workspace';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { ConfigurationChangeEvent, ConfigurationModel } from 'vs/platform/configuration/common/configurationModels';
 import { ConfigurationTarget } from 'vs/platform/configuration/common/configuration';
 import { IConfigurationRegistry, Extensions as ConfigurationExtensions, ConfigurationScope } from 'vs/platform/configuration/common/configurationRegistry';
@@ -30,7 +30,8 @@ suite('FolderSettingsModelParser', () => {
 				'FolderSettingsModelParser.resource': {
 					'type': 'string',
 					'default': 'isSet',
-					scope: ConfigurationScope.RESOURCE
+					scope: ConfigurationScope.RESOURCE,
+					overridable: true
 				},
 				'FolderSettingsModelParser.application': {
 					'type': 'string',
@@ -57,6 +58,14 @@ suite('FolderSettingsModelParser', () => {
 		assert.deepEqual(testObject.configurationModel.contents, { 'FolderSettingsModelParser': { 'resource': 'resource' } });
 	});
 
+	test('parse overridable resource settings', () => {
+		const testObject = new FolderSettingsModelParser('settings', [ConfigurationScope.RESOURCE]);
+
+		testObject.parse(JSON.stringify({ '[json]': { 'FolderSettingsModelParser.window': 'window', 'FolderSettingsModelParser.resource': 'resource', 'FolderSettingsModelParser.application': 'executable' } }));
+
+		assert.deepEqual(testObject.configurationModel.overrides, [{ 'contents': { 'FolderSettingsModelParser': { 'resource': 'resource' } }, 'identifiers': ['json'] }]);
+	});
+
 	test('reprocess folder settings excludes application setting', () => {
 		const testObject = new FolderSettingsModelParser('settings', [ConfigurationScope.RESOURCE, ConfigurationScope.WINDOW]);
 
@@ -106,7 +115,7 @@ suite('WorkspaceConfigurationChangeEvent', () => {
 		configurationChangeEvent.change(['window.restoreWindows'], URI.file('folder2'));
 		configurationChangeEvent.telemetryData(ConfigurationTarget.WORKSPACE, {});
 
-		let testObject = new WorkspaceConfigurationChangeEvent(configurationChangeEvent, new Workspace('id', 'name',
+		let testObject = new WorkspaceConfigurationChangeEvent(configurationChangeEvent, new Workspace('id',
 			[new WorkspaceFolder({ index: 0, name: '1', uri: URI.file('folder1') }),
 			new WorkspaceFolder({ index: 1, name: '2', uri: URI.file('folder2') }),
 			new WorkspaceFolder({ index: 2, name: '3', uri: URI.file('folder3') })]));
diff --git a/src/vs/workbench/services/configuration/test/electron-browser/configurationEditingService.test.ts b/src/vs/workbench/services/configuration/test/electron-browser/configurationEditingService.test.ts
index 0e42aaccf0c..40fb45b9674 100644
--- a/src/vs/workbench/services/configuration/test/electron-browser/configurationEditingService.test.ts
+++ b/src/vs/workbench/services/configuration/test/electron-browser/configurationEditingService.test.ts
@@ -38,6 +38,7 @@ import { mkdirp } from 'vs/base/node/pfs';
 import { INotificationService } from 'vs/platform/notification/common/notification';
 import { ICommandService } from 'vs/platform/commands/common/commands';
 import { CommandService } from 'vs/workbench/services/commands/common/commandService';
+import { URI } from 'vs/base/common/uri';
 
 class SettingsTestEnvironmentService extends EnvironmentService {
 
@@ -103,7 +104,7 @@ suite('ConfigurationEditingService', () => {
 		instantiationService.stub(IEnvironmentService, environmentService);
 		const workspaceService = new WorkspaceService(environmentService);
 		instantiationService.stub(IWorkspaceContextService, workspaceService);
-		return workspaceService.initialize(noWorkspace ? {} as IWindowConfiguration : workspaceDir).then(() => {
+		return workspaceService.initialize(noWorkspace ? {} as IWindowConfiguration : URI.file(workspaceDir)).then(() => {
 			instantiationService.stub(IConfigurationService, workspaceService);
 			instantiationService.stub(IFileService, new FileService(workspaceService, TestEnvironmentService, new TestTextResourceConfigurationService(), new TestConfigurationService(), new TestLifecycleService(), new TestStorageService(), new TestNotificationService(), { disableWatcher: true }));
 			instantiationService.stub(ITextFileService, instantiationService.createInstance(TestTextFileService));
diff --git a/src/vs/workbench/services/configuration/test/electron-browser/configurationService.test.ts b/src/vs/workbench/services/configuration/test/electron-browser/configurationService.test.ts
index a38560e14b4..00d78fef9fe 100644
--- a/src/vs/workbench/services/configuration/test/electron-browser/configurationService.test.ts
+++ b/src/vs/workbench/services/configuration/test/electron-browser/configurationService.test.ts
@@ -10,7 +10,7 @@ import * as sinon from 'sinon';
 import * as fs from 'fs';
 import * as path from 'path';
 import * as os from 'os';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { ParsedArgs, IEnvironmentService } from 'vs/platform/environment/common/environment';
@@ -87,7 +87,7 @@ suite('WorkspaceContextService - Folder', () => {
 				const globalSettingsFile = path.join(parentDir, 'settings.json');
 				const environmentService = new SettingsTestEnvironmentService(parseArgs(process.argv), process.execPath, globalSettingsFile);
 				workspaceContextService = new WorkspaceService(environmentService);
-				return (<WorkspaceService>workspaceContextService).initialize(folderDir);
+				return (<WorkspaceService>workspaceContextService).initialize(URI.file(folderDir));
 			});
 	});
 
@@ -124,11 +124,11 @@ suite('WorkspaceContextService - Folder', () => {
 	});
 
 	test('isCurrentWorkspace() => true', () => {
-		assert.ok(workspaceContextService.isCurrentWorkspace(workspaceResource));
+		assert.ok(workspaceContextService.isCurrentWorkspace(URI.file(workspaceResource)));
 	});
 
 	test('isCurrentWorkspace() => false', () => {
-		assert.ok(!workspaceContextService.isCurrentWorkspace(workspaceResource + 'abc'));
+		assert.ok(!workspaceContextService.isCurrentWorkspace(URI.file(workspaceResource + 'abc')));
 	});
 });
 
@@ -247,7 +247,7 @@ suite('WorkspaceContextService - Workspace', () => {
 		const addedFolders = [{ uri: URI.file(path.join(workspaceDir, 'd')) }, { uri: URI.file(path.join(workspaceDir, 'c')) }];
 		return testObject.addFolders(addedFolders)
 			.then(() => {
-				assert.ok(target.calledOnce);
+				assert.equal(target.callCount, 1, `Should be called only once but called ${target.callCount} times`);
 				const actual = <IWorkspaceFoldersChangeEvent>target.args[0][0];
 				assert.deepEqual(actual.added.map(r => r.uri.toString()), addedFolders.map(a => a.uri.toString()));
 				assert.deepEqual(actual.removed, []);
@@ -445,7 +445,7 @@ suite('WorkspaceService - Initialization', () => {
 				testObject.onDidChangeWorkspaceFolders(target);
 				testObject.onDidChangeConfiguration(target);
 
-				return testObject.initialize(path.join(parentResource, '1'))
+				return testObject.initialize(URI.file(path.join(parentResource, '1')))
 					.then(() => {
 						assert.equal(testObject.getValue('initialization.testSetting1'), 'userValue');
 						assert.equal(target.callCount, 3);
@@ -474,7 +474,7 @@ suite('WorkspaceService - Initialization', () => {
 
 				fs.writeFileSync(path.join(parentResource, '1', '.vscode', 'settings.json'), '{ "initialization.testSetting1": "workspaceValue" }');
 
-				return testObject.initialize(path.join(parentResource, '1'))
+				return testObject.initialize(URI.file(path.join(parentResource, '1')))
 					.then(() => {
 						assert.equal(testObject.getValue('initialization.testSetting1'), 'workspaceValue');
 						assert.equal(target.callCount, 4);
@@ -548,7 +548,7 @@ suite('WorkspaceService - Initialization', () => {
 
 	test('initialize a folder workspace from a folder workspace with no configuration changes', () => {
 
-		return testObject.initialize(path.join(parentResource, '1'))
+		return testObject.initialize(URI.file(path.join(parentResource, '1')))
 			.then(() => {
 				fs.writeFileSync(globalSettingsFile, '{ "initialization.testSetting1": "userValue" }');
 
@@ -560,7 +560,7 @@ suite('WorkspaceService - Initialization', () => {
 						testObject.onDidChangeWorkspaceFolders(target);
 						testObject.onDidChangeConfiguration(target);
 
-						return testObject.initialize(path.join(parentResource, '2'))
+						return testObject.initialize(URI.file(path.join(parentResource, '2')))
 							.then(() => {
 								assert.equal(testObject.getValue('initialization.testSetting1'), 'userValue');
 								assert.equal(target.callCount, 1);
@@ -576,7 +576,7 @@ suite('WorkspaceService - Initialization', () => {
 
 	test('initialize a folder workspace from a folder workspace with configuration changes', () => {
 
-		return testObject.initialize(path.join(parentResource, '1'))
+		return testObject.initialize(URI.file(path.join(parentResource, '1')))
 			.then(() => {
 
 				const target = sinon.spy();
@@ -586,7 +586,7 @@ suite('WorkspaceService - Initialization', () => {
 				testObject.onDidChangeConfiguration(target);
 
 				fs.writeFileSync(path.join(parentResource, '2', '.vscode', 'settings.json'), '{ "initialization.testSetting1": "workspaceValue2" }');
-				return testObject.initialize(path.join(parentResource, '2'))
+				return testObject.initialize(URI.file(path.join(parentResource, '2')))
 					.then(() => {
 						assert.equal(testObject.getValue('initialization.testSetting1'), 'workspaceValue2');
 						assert.equal(target.callCount, 2);
@@ -601,7 +601,7 @@ suite('WorkspaceService - Initialization', () => {
 
 	test('initialize a multi folder workspace from a folder workspacce triggers change events in the right order', () => {
 		const folderDir = path.join(parentResource, '1');
-		return testObject.initialize(folderDir)
+		return testObject.initialize(URI.file(folderDir))
 			.then(() => {
 
 				const target = sinon.spy();
@@ -666,7 +666,7 @@ suite('WorkspaceConfigurationService - Folder', () => {
 				instantiationService.stub(IConfigurationService, workspaceService);
 				instantiationService.stub(IEnvironmentService, environmentService);
 
-				return workspaceService.initialize(folderDir).then(() => {
+				return workspaceService.initialize(URI.file(folderDir)).then(() => {
 					const fileService = new FileService(<IWorkspaceContextService>workspaceService, TestEnvironmentService, new TestTextResourceConfigurationService(), workspaceService, new TestLifecycleService(), new TestStorageService(), new TestNotificationService(), { disableWatcher: true });
 					instantiationService.stub(IFileService, fileService);
 					instantiationService.stub(ITextFileService, instantiationService.createInstance(TestTextFileService));
diff --git a/src/vs/workbench/services/configurationResolver/common/configurationResolver.ts b/src/vs/workbench/services/configurationResolver/common/configurationResolver.ts
index ec8a9eab100..e6ae183d5ec 100644
--- a/src/vs/workbench/services/configurationResolver/common/configurationResolver.ts
+++ b/src/vs/workbench/services/configurationResolver/common/configurationResolver.ts
@@ -13,9 +13,20 @@ export const IConfigurationResolverService = createDecorator<IConfigurationResol
 export interface IConfigurationResolverService {
 	_serviceBrand: any;
 
-	resolve(root: IWorkspaceFolder, value: string): string;
-	resolve(root: IWorkspaceFolder, value: string[]): string[];
-	resolve(root: IWorkspaceFolder, value: IStringDictionary<string>): IStringDictionary<string>;
-	resolveAny<T>(root: IWorkspaceFolder, value: T, commandMapping?: IStringDictionary<string>): T;
-	executeCommandVariables(value: any, variables: IStringDictionary<string>): TPromise<IStringDictionary<string>>;
+	resolve(folder: IWorkspaceFolder, value: string): string;
+	resolve(folder: IWorkspaceFolder, value: string[]): string[];
+	resolve(folder: IWorkspaceFolder, value: IStringDictionary<string>): IStringDictionary<string>;
+
+	/**
+	 * Recursively resolves all variables in the given config and returns a copy of it with substituted values.
+	 * Command variables are only substituted if a "commandValueMapping" dictionary is given and if it contains an entry for the command.
+	 */
+	resolveAny(folder: IWorkspaceFolder, config: any, commandValueMapping?: IStringDictionary<string>): any;
+
+	/**
+	 * Recursively resolves all variables (including commands) in the given config and returns a copy of it with substituted values.
+	 * If a "variables" dictionary (with names -> command ids) is given,
+	 * command variables are first mapped through it before being resolved.
+	 */
+	resolveWithCommands(folder: IWorkspaceFolder, config: any, variables?: IStringDictionary<string>): TPromise<any>;
 }
diff --git a/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.ts b/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.ts
index a0ca4baff20..9d6cce04087 100644
--- a/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.ts
+++ b/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.ts
@@ -3,39 +3,36 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import uri from 'vs/base/common/uri';
+import { URI as uri } from 'vs/base/common/uri';
+import * as nls from 'vs/nls';
 import * as paths from 'vs/base/common/paths';
+import * as platform from 'vs/base/common/platform';
 import { Schemas } from 'vs/base/common/network';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { sequence } from 'vs/base/common/async';
 import { toResource } from 'vs/workbench/common/editor';
-import { IStringDictionary } from 'vs/base/common/collections';
-import { IConfigurationResolverService } from 'vs/workbench/services/configurationResolver/common/configurationResolver';
+import { IStringDictionary, size } from 'vs/base/common/collections';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { ICommandService } from 'vs/platform/commands/common/commands';
 import { IWorkspaceFolder, IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { IProcessEnvironment } from 'vs/base/common/platform';
-import { VariableResolver } from 'vs/workbench/services/configurationResolver/node/variableResolver';
+import { AbstractVariableResolverService } from 'vs/workbench/services/configurationResolver/node/variableResolver';
 import { isCodeEditor } from 'vs/editor/browser/editorBrowser';
 import { DiffEditorInput } from 'vs/workbench/common/editor/diffEditorInput';
 import { isUndefinedOrNull } from 'vs/base/common/types';
-import { localize } from 'vs/nls';
 
-export class ConfigurationResolverService implements IConfigurationResolverService {
-	_serviceBrand: any;
-	private resolver: VariableResolver;
+export class ConfigurationResolverService extends AbstractVariableResolverService {
 
 	constructor(
-		envVariables: IProcessEnvironment,
+		envVariables: platform.IProcessEnvironment,
 		@IEditorService editorService: IEditorService,
 		@IEnvironmentService environmentService: IEnvironmentService,
 		@IConfigurationService configurationService: IConfigurationService,
 		@ICommandService private commandService: ICommandService,
 		@IWorkspaceContextService workspaceContextService: IWorkspaceContextService
 	) {
-		this.resolver = new VariableResolver({
+		super({
 			getFolderUri: (folderName: string): uri => {
 				const folder = workspaceContextService.getWorkspace().folders.filter(f => f.name === folderName).pop();
 				return folder ? folder.uri : undefined;
@@ -82,21 +79,34 @@ export class ConfigurationResolverService implements IConfigurationResolverServi
 		}, envVariables);
 	}
 
-	public resolve(root: IWorkspaceFolder, value: string): string;
-	public resolve(root: IWorkspaceFolder, value: string[]): string[];
-	public resolve(root: IWorkspaceFolder, value: IStringDictionary<string>): IStringDictionary<string>;
-	public resolve(root: IWorkspaceFolder, value: any): any {
-		return this.resolver.resolveAny(root ? root.uri : undefined, value);
-	}
+	public resolveWithCommands(folder: IWorkspaceFolder, config: any, variables?: IStringDictionary<string>): TPromise<any> {
 
-	public resolveAny(root: IWorkspaceFolder, value: any, commandValueMapping?: IStringDictionary<string>): any {
-		return this.resolver.resolveAny(root ? root.uri : undefined, value, commandValueMapping);
+		// then substitute remaining variables in VS Code core
+		config = this.resolveAny(folder, config);
+
+		// now evaluate command variables (which might have a UI)
+		return this.executeCommandVariables(config, variables).then(commandValueMapping => {
+
+			if (!commandValueMapping) { // cancelled by user
+				return null;
+			}
+
+			// finally substitute evaluated command variables (if there are any)
+			if (size<string>(commandValueMapping) > 0) {
+				return this.resolveAny(folder, config, commandValueMapping);
+			} else {
+				return config;
+			}
+		});
 	}
 
 	/**
-	 * Finds and executes all command variables (see #6569)
+	 * Finds and executes all command variables in the given configuration and returns their values as a dictionary.
+	 * Please note: this method does not substitute the command variables (so the configuration is not modified).
+	 * The returned dictionary can be passed to "resolvePlatform" for the substitution.
+	 * See #6569.
 	 */
-	public executeCommandVariables(configuration: any, variableToCommandMap: IStringDictionary<string>): TPromise<IStringDictionary<string>> {
+	private executeCommandVariables(configuration: any, variableToCommandMap: IStringDictionary<string>): TPromise<IStringDictionary<string>> {
 
 		if (!configuration) {
 			return TPromise.as(null);
@@ -131,22 +141,22 @@ export class ConfigurationResolverService implements IConfigurationResolverServi
 		let cancelled = false;
 		const commandValueMapping: IStringDictionary<string> = Object.create(null);
 
-		const factory: { (): TPromise<any> }[] = commands.map(interactiveVariable => {
+		const factory: { (): TPromise<any> }[] = commands.map(commandVariable => {
 			return () => {
 
-				let commandId = variableToCommandMap ? variableToCommandMap[interactiveVariable] : null;
+				let commandId = variableToCommandMap ? variableToCommandMap[commandVariable] : null;
 				if (!commandId) {
 					// Just launch any command if the interactive variable is not contributed by the adapter #12735
-					commandId = interactiveVariable;
+					commandId = commandVariable;
 				}
 
 				return this.commandService.executeCommand<string>(commandId, configuration).then(result => {
 					if (typeof result === 'string') {
-						commandValueMapping[interactiveVariable] = result;
+						commandValueMapping[commandVariable] = result;
 					} else if (isUndefinedOrNull(result)) {
 						cancelled = true;
 					} else {
-						throw new Error(localize('stringsOnlySupported', "Command {0} did not return a string result. Only strings are supported as results for commands used for variable substitution.", commandId));
+						throw new Error(nls.localize('stringsOnlySupported', "Command '{0}' did not return a string result. Only strings are supported as results for commands used for variable substitution.", commandVariable));
 					}
 				});
 			};
diff --git a/src/vs/workbench/services/configurationResolver/node/variableResolver.ts b/src/vs/workbench/services/configurationResolver/node/variableResolver.ts
index 9c118dc6be8..b91edb96392 100644
--- a/src/vs/workbench/services/configurationResolver/node/variableResolver.ts
+++ b/src/vs/workbench/services/configurationResolver/node/variableResolver.ts
@@ -5,14 +5,18 @@
 
 import * as paths from 'vs/base/common/paths';
 import * as types from 'vs/base/common/types';
+import * as objects from 'vs/base/common/objects';
 import { IStringDictionary } from 'vs/base/common/collections';
 import { relative } from 'path';
-import { IProcessEnvironment, isWindows } from 'vs/base/common/platform';
+import { IProcessEnvironment, isWindows, isMacintosh, isLinux } from 'vs/base/common/platform';
 import { normalizeDriveLetter } from 'vs/base/common/labels';
 import { localize } from 'vs/nls';
-import uri from 'vs/base/common/uri';
+import { URI as uri } from 'vs/base/common/uri';
+import { IConfigurationResolverService } from 'vs/workbench/services/configurationResolver/common/configurationResolver';
+import { IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
+import { TPromise } from 'vs/base/common/winjs.base';
 
-export interface IVariableAccessor {
+export interface IVariableResolveContext {
 	getFolderUri(folderName: string): uri | undefined;
 	getWorkspaceFolderCount(): number;
 	getConfigurationValue(folderUri: uri, section: string): string | undefined;
@@ -22,47 +26,78 @@ export interface IVariableAccessor {
 	getLineNumber(): string;
 }
 
-export class VariableResolver {
+export class AbstractVariableResolverService implements IConfigurationResolverService {
 
 	static VARIABLE_REGEXP = /\$\{(.*?)\}/g;
 
-	private envVariables: IProcessEnvironment;
+	_serviceBrand: any;
 
 	constructor(
-		private accessor: IVariableAccessor,
-		envVariables: IProcessEnvironment
+		private _context: IVariableResolveContext,
+		private _envVariables: IProcessEnvironment = process.env
 	) {
 		if (isWindows) {
-			this.envVariables = Object.create(null);
-			Object.keys(envVariables).forEach(key => {
-				this.envVariables[key.toLowerCase()] = envVariables[key];
+			this._envVariables = Object.create(null);
+			Object.keys(_envVariables).forEach(key => {
+				this._envVariables[key.toLowerCase()] = _envVariables[key];
 			});
-		} else {
-			this.envVariables = envVariables;
 		}
 	}
 
-	resolveAny(folderUri: uri, value: any, commandValueMapping?: IStringDictionary<string>): any {
+	public resolve(root: IWorkspaceFolder, value: string): string;
+	public resolve(root: IWorkspaceFolder, value: string[]): string[];
+	public resolve(root: IWorkspaceFolder, value: IStringDictionary<string>): IStringDictionary<string>;
+	public resolve(root: IWorkspaceFolder, value: any): any {
+		return this.recursiveResolve(root ? root.uri : undefined, value);
+	}
+
+	public resolveAny(workspaceFolder: IWorkspaceFolder, config: any, commandValueMapping?: IStringDictionary<string>): any {
+
+		const result = objects.deepClone(config) as any;
+
+		// hoist platform specific attributes to top level
+		if (isWindows && result.windows) {
+			Object.keys(result.windows).forEach(key => result[key] = result.windows[key]);
+		} else if (isMacintosh && result.osx) {
+			Object.keys(result.osx).forEach(key => result[key] = result.osx[key]);
+		} else if (isLinux && result.linux) {
+			Object.keys(result.linux).forEach(key => result[key] = result.linux[key]);
+		}
+
+		// delete all platform specific sections
+		delete result.windows;
+		delete result.osx;
+		delete result.linux;
+
+		// substitute all variables recursively in string values
+		return this.recursiveResolve(workspaceFolder ? workspaceFolder.uri : undefined, result, commandValueMapping);
+	}
+
+	public resolveWithCommands(folder: IWorkspaceFolder, config: any): TPromise<any> {
+		throw new Error('resolveWithCommands not implemented.');
+	}
+
+	private recursiveResolve(folderUri: uri, value: any, commandValueMapping?: IStringDictionary<string>): any {
 		if (types.isString(value)) {
-			return this.resolve(folderUri, value, commandValueMapping);
+			return this.resolveString(folderUri, value, commandValueMapping);
 		} else if (types.isArray(value)) {
-			return value.map(s => this.resolveAny(folderUri, s, commandValueMapping));
+			return value.map(s => this.recursiveResolve(folderUri, s, commandValueMapping));
 		} else if (types.isObject(value)) {
 			let result: IStringDictionary<string | IStringDictionary<string> | string[]> = Object.create(null);
 			Object.keys(value).forEach(key => {
-				const resolvedKey = this.resolve(folderUri, key, commandValueMapping);
-				result[resolvedKey] = this.resolveAny(folderUri, value[key], commandValueMapping);
+				const resolvedKey = this.resolveString(folderUri, key, commandValueMapping);
+				result[resolvedKey] = this.recursiveResolve(folderUri, value[key], commandValueMapping);
 			});
 			return result;
 		}
 		return value;
 	}
 
-	resolve(folderUri: uri, value: string, commandValueMapping: IStringDictionary<string>): string {
+	private resolveString(folderUri: uri, value: string, commandValueMapping: IStringDictionary<string>): string {
 
-		const filePath = this.accessor.getFilePath();
+		const filePath = this._context.getFilePath();
 
-		return value.replace(VariableResolver.VARIABLE_REGEXP, (match: string, variable: string) => {
+		return value.replace(AbstractVariableResolverService.VARIABLE_REGEXP, (match: string, variable: string) => {
 
 			let argument: string;
 			const parts = variable.split(':');
@@ -78,7 +113,7 @@ export class VariableResolver {
 						if (isWindows) {
 							argument = argument.toLowerCase();
 						}
-						const env = this.envVariables[argument];
+						const env = this._envVariables[argument];
 						if (types.isString(env)) {
 							return env;
 						}
@@ -89,7 +124,7 @@ export class VariableResolver {
 
 				case 'config':
 					if (argument) {
-						const config = this.accessor.getConfigurationValue(folderUri, argument);
+						const config = this._context.getConfigurationValue(folderUri, argument);
 						if (types.isUndefinedOrNull(config)) {
 							throw new Error(localize('configNotFound', "'{0}' can not be resolved because setting '{1}' not found.", match, argument));
 						}
@@ -120,7 +155,7 @@ export class VariableResolver {
 						case 'workspaceFolderBasename':
 						case 'relativeFile':
 							if (argument) {
-								const folder = this.accessor.getFolderUri(argument);
+								const folder = this._context.getFolderUri(argument);
 								if (folder) {
 									folderUri = folder;
 								} else {
@@ -128,7 +163,7 @@ export class VariableResolver {
 								}
 							}
 							if (!folderUri) {
-								if (this.accessor.getWorkspaceFolderCount() > 1) {
+								if (this._context.getWorkspaceFolderCount() > 1) {
 									throw new Error(localize('canNotResolveWorkspaceFolderMultiRoot', "'{0}' can not be resolved in a multi folder workspace. Scope this variable using ':' and a workspace folder name.", match));
 								}
 								throw new Error(localize('canNotResolveWorkspaceFolder', "'{0}' can not be resolved. Please open a folder.", match));
@@ -167,14 +202,14 @@ export class VariableResolver {
 							return paths.basename(folderUri.fsPath);
 
 						case 'lineNumber':
-							const lineNumber = this.accessor.getLineNumber();
+							const lineNumber = this._context.getLineNumber();
 							if (lineNumber) {
 								return lineNumber;
 							}
 							throw new Error(localize('canNotResolveLineNumber', "'{0}' can not be resolved. Make sure to have a line selected in the active editor.", match));
 
 						case 'selectedText':
-							const selectedText = this.accessor.getSelectedText();
+							const selectedText = this._context.getSelectedText();
 							if (selectedText) {
 								return selectedText;
 							}
@@ -203,7 +238,7 @@ export class VariableResolver {
 							return basename.slice(0, basename.length - paths.extname(basename).length);
 
 						case 'execPath':
-							const ep = this.accessor.getExecPath();
+							const ep = this._context.getExecPath();
 							if (ep) {
 								return ep;
 							}
diff --git a/src/vs/workbench/services/configurationResolver/test/electron-browser/configurationResolverService.test.ts b/src/vs/workbench/services/configurationResolver/test/electron-browser/configurationResolverService.test.ts
index 57ba15ae14c..ed2493dfdd6 100644
--- a/src/vs/workbench/services/configurationResolver/test/electron-browser/configurationResolverService.test.ts
+++ b/src/vs/workbench/services/configurationResolver/test/electron-browser/configurationResolverService.test.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as assert from 'assert';
-import uri from 'vs/base/common/uri';
+import { URI as uri } from 'vs/base/common/uri';
 import * as platform from 'vs/base/common/platform';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { IConfigurationService, getConfigurationValue, IConfigurationOverrides } from 'vs/platform/configuration/common/configuration';
@@ -14,6 +14,7 @@ import { ConfigurationResolverService } from 'vs/workbench/services/configuratio
 import { IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
 import { TestEnvironmentService, TestEditorService, TestContextService } from 'vs/workbench/test/workbenchTestServices';
 import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
+import { Disposable } from 'vs/base/common/lifecycle';
 
 suite('Configuration Resolver Service', () => {
 	let configurationResolverService: IConfigurationResolverService;
@@ -239,29 +240,25 @@ suite('Configuration Resolver Service', () => {
 		assert.throws(() => service.resolve(workspace, 'abc ${config:editor.none.none2} xyz'));
 	});
 
-	test('interactive variable simple', () => {
+	test('a single command variable', () => {
+
 		const configuration = {
 			'name': 'Attach to Process',
 			'type': 'node',
 			'request': 'attach',
-			'processId': '${command:interactiveVariable1}',
+			'processId': '${command:command1}',
 			'port': 5858,
 			'sourceMaps': false,
 			'outDir': null
 		};
-		const interactiveVariables = Object.create(null);
-		interactiveVariables['interactiveVariable1'] = 'command1';
-		interactiveVariables['interactiveVariable2'] = 'command2';
 
-		configurationResolverService.executeCommandVariables(configuration, interactiveVariables).then(mapping => {
-
-			const result = configurationResolverService.resolveAny(undefined, configuration, mapping);
+		return configurationResolverService.resolveWithCommands(undefined, configuration).then(result => {
 
 			assert.deepEqual(result, {
 				'name': 'Attach to Process',
 				'type': 'node',
 				'request': 'attach',
-				'processId': 'command1',
+				'processId': 'command1-result',
 				'port': 5858,
 				'sourceMaps': false,
 				'outDir': null
@@ -271,43 +268,96 @@ suite('Configuration Resolver Service', () => {
 		});
 	});
 
-	test('interactive variable complex', () => {
+	test('an old style command variable', () => {
 		const configuration = {
 			'name': 'Attach to Process',
 			'type': 'node',
 			'request': 'attach',
-			'processId': '${command:interactiveVariable1}',
-			'port': '${command:interactiveVariable2}',
+			'processId': '${command:commandVariable1}',
+			'port': 5858,
 			'sourceMaps': false,
-			'outDir': 'src/${command:interactiveVariable2}',
-			'env': {
-				'processId': '__${command:interactiveVariable2}__',
-			}
+			'outDir': null
 		};
-		const interactiveVariables = Object.create(null);
-		interactiveVariables['interactiveVariable1'] = 'command1';
-		interactiveVariables['interactiveVariable2'] = 'command2';
+		const commandVariables = Object.create(null);
+		commandVariables['commandVariable1'] = 'command1';
 
-		configurationResolverService.executeCommandVariables(configuration, interactiveVariables).then(mapping => {
-
-			const result = configurationResolverService.resolveAny(undefined, configuration, mapping);
+		return configurationResolverService.resolveWithCommands(undefined, configuration, commandVariables).then(result => {
 
 			assert.deepEqual(result, {
 				'name': 'Attach to Process',
 				'type': 'node',
 				'request': 'attach',
-				'processId': 'command1',
-				'port': 'command2',
+				'processId': 'command1-result',
+				'port': 5858,
 				'sourceMaps': false,
-				'outDir': 'src/command2',
+				'outDir': null
+			});
+
+			assert.equal(1, mockCommandService.callCount);
+		});
+	});
+
+	test('multiple new and old-style command variables', () => {
+
+		const configuration = {
+			'name': 'Attach to Process',
+			'type': 'node',
+			'request': 'attach',
+			'processId': '${command:commandVariable1}',
+			'pid': '${command:command2}',
+			'sourceMaps': false,
+			'outDir': 'src/${command:command2}',
+			'env': {
+				'processId': '__${command:command2}__',
+			}
+		};
+		const commandVariables = Object.create(null);
+		commandVariables['commandVariable1'] = 'command1';
+
+		return configurationResolverService.resolveWithCommands(undefined, configuration, commandVariables).then(result => {
+
+			assert.deepEqual(result, {
+				'name': 'Attach to Process',
+				'type': 'node',
+				'request': 'attach',
+				'processId': 'command1-result',
+				'pid': 'command2-result',
+				'sourceMaps': false,
+				'outDir': 'src/command2-result',
 				'env': {
-					'processId': '__command2__',
+					'processId': '__command2-result__',
 				}
 			});
 
 			assert.equal(2, mockCommandService.callCount);
 		});
 	});
+
+	test('a command variable that relies on resolved env vars', () => {
+
+		const configuration = {
+			'name': 'Attach to Process',
+			'type': 'node',
+			'request': 'attach',
+			'processId': '${command:commandVariable1}',
+			'value': '${env:key1}'
+		};
+		const commandVariables = Object.create(null);
+		commandVariables['commandVariable1'] = 'command1';
+
+		return configurationResolverService.resolveWithCommands(undefined, configuration, commandVariables).then(result => {
+
+			assert.deepEqual(result, {
+				'name': 'Attach to Process',
+				'type': 'node',
+				'request': 'attach',
+				'processId': 'Value for key1',
+				'value': 'Value for key1'
+			});
+
+			assert.equal(1, mockCommandService.callCount);
+		});
+	});
 });
 
 
@@ -342,9 +392,17 @@ class MockCommandService implements ICommandService {
 	public _serviceBrand: any;
 	public callCount = 0;
 
-	onWillExecuteCommand = () => ({ dispose: () => { } });
+	onWillExecuteCommand = () => Disposable.None;
 	public executeCommand(commandId: string, ...args: any[]): TPromise<any> {
 		this.callCount++;
-		return TPromise.as(commandId);
+
+		let result = `${commandId}-result`;
+		if (args.length >= 1) {
+			if (args[0] && args[0].value) {
+				result = args[0].value;
+			}
+		}
+
+		return TPromise.as(result);
 	}
 }
diff --git a/src/vs/workbench/services/contextview/electron-browser/contextmenuService.ts b/src/vs/workbench/services/contextview/electron-browser/contextmenuService.ts
index 5c323ca2409..160513801ef 100644
--- a/src/vs/workbench/services/contextview/electron-browser/contextmenuService.ts
+++ b/src/vs/workbench/services/contextview/electron-browser/contextmenuService.ts
@@ -12,37 +12,43 @@ import * as dom from 'vs/base/browser/dom';
 import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-
-import { remote, webFrame } from 'electron';
+import { webFrame } from 'electron';
 import { unmnemonicLabel } from 'vs/base/common/labels';
 import { Event, Emitter } from 'vs/base/common/event';
 import { INotificationService } from 'vs/platform/notification/common/notification';
-import { IContextMenuDelegate, ContextSubMenu, IEvent } from 'vs/base/browser/contextmenu';
+import { IContextMenuDelegate, ContextSubMenu, IContextMenuEvent } from 'vs/base/browser/contextmenu';
+import { once } from 'vs/base/common/functional';
+import { Disposable } from 'vs/base/common/lifecycle';
+import { IContextMenuItem } from 'vs/base/parts/contextmenu/common/contextmenu';
+import { popup } from 'vs/base/parts/contextmenu/electron-browser/contextmenu';
 
-export class ContextMenuService implements IContextMenuService {
+export class ContextMenuService extends Disposable implements IContextMenuService {
 
-	public _serviceBrand: any;
-	private _onDidContextMenu = new Emitter<void>();
+	_serviceBrand: any;
+
+	private _onDidContextMenu = this._register(new Emitter<void>());
+	get onDidContextMenu(): Event<void> { return this._onDidContextMenu.event; }
 
 	constructor(
 		@INotificationService private notificationService: INotificationService,
 		@ITelemetryService private telemetryService: ITelemetryService,
 		@IKeybindingService private keybindingService: IKeybindingService
 	) {
+		super();
 	}
 
-	public get onDidContextMenu(): Event<void> {
-		return this._onDidContextMenu.event;
-	}
-
-	public showContextMenu(delegate: IContextMenuDelegate): void {
+	showContextMenu(delegate: IContextMenuDelegate): void {
 		delegate.getActions().then(actions => {
-			if (!actions.length) {
-				return TPromise.as(null);
-			}
+			if (actions.length) {
+				const onHide = once(() => {
+					if (delegate.onHide) {
+						delegate.onHide(undefined);
+					}
 
-			return TPromise.timeout(0).then(() => { // https://github.com/Microsoft/vscode/issues/3638
-				const menu = this.createMenu(delegate, actions);
+					this._onDidContextMenu.fire();
+				});
+
+				const menu = this.createMenu(delegate, actions, onHide);
 				const anchor = delegate.getAnchor();
 				let x: number, y: number;
 
@@ -61,63 +67,74 @@ export class ContextMenuService implements IContextMenuService {
 				x *= zoom;
 				y *= zoom;
 
-				menu.popup(remote.getCurrentWindow(), { x: Math.floor(x), y: Math.floor(y), positioningItem: delegate.autoSelectFirstItem ? 0 : void 0 });
-				this._onDidContextMenu.fire();
-				if (delegate.onHide) {
-					delegate.onHide(undefined);
-				}
-			});
-		});
-	}
-
-	private createMenu(delegate: IContextMenuDelegate, entries: (IAction | ContextSubMenu)[]): Electron.Menu {
-		const menu = new remote.Menu();
-		const actionRunner = delegate.actionRunner || new ActionRunner();
-
-		entries.forEach(e => {
-			if (e instanceof Separator) {
-				menu.append(new remote.MenuItem({ type: 'separator' }));
-			} else if (e instanceof ContextSubMenu) {
-				const submenu = new remote.MenuItem({
-					submenu: this.createMenu(delegate, e.entries),
-					label: unmnemonicLabel(e.label)
+				popup(menu, {
+					x: Math.floor(x),
+					y: Math.floor(y),
+					positioningItem: delegate.autoSelectFirstItem ? 0 : void 0,
+					onHide: () => onHide()
 				});
-
-				menu.append(submenu);
-			} else {
-				const options: Electron.MenuItemConstructorOptions = {
-					label: unmnemonicLabel(e.label),
-					checked: !!e.checked || !!e.radio,
-					type: !!e.checked ? 'checkbox' : !!e.radio ? 'radio' : void 0,
-					enabled: !!e.enabled,
-					click: (menuItem, win, event) => {
-						this.runAction(actionRunner, e, delegate, event);
-					}
-				};
-
-				const keybinding = !!delegate.getKeyBinding ? delegate.getKeyBinding(e) : this.keybindingService.lookupKeybinding(e.id);
-				if (keybinding) {
-					const electronAccelerator = keybinding.getElectronAccelerator();
-					if (electronAccelerator) {
-						options.accelerator = electronAccelerator;
-					} else {
-						const label = keybinding.getLabel();
-						if (label) {
-							options.label = `${options.label} [${label}]`;
-						}
-					}
-				}
-
-				const item = new remote.MenuItem(options);
-
-				menu.append(item);
 			}
 		});
-
-		return menu;
 	}
 
-	private runAction(actionRunner: IActionRunner, actionToRun: IAction, delegate: IContextMenuDelegate, event: IEvent): void {
+	private createMenu(delegate: IContextMenuDelegate, entries: (IAction | ContextSubMenu)[], onHide: () => void): IContextMenuItem[] {
+		const actionRunner = delegate.actionRunner || new ActionRunner();
+
+		return entries.map(entry => this.createMenuItem(delegate, entry, actionRunner, onHide));
+	}
+
+	private createMenuItem(delegate: IContextMenuDelegate, entry: IAction | ContextSubMenu, actionRunner: IActionRunner, onHide: () => void): IContextMenuItem {
+
+		// Separator
+		if (entry instanceof Separator) {
+			return { type: 'separator' } as IContextMenuItem;
+		}
+
+		// Submenu
+		if (entry instanceof ContextSubMenu) {
+			return {
+				label: unmnemonicLabel(entry.label),
+				submenu: this.createMenu(delegate, entry.entries, onHide)
+			} as IContextMenuItem;
+		}
+
+		// Normal Menu Item
+		else {
+			const item: IContextMenuItem = {
+				label: unmnemonicLabel(entry.label),
+				checked: !!entry.checked || !!entry.radio,
+				type: !!entry.checked ? 'checkbox' : !!entry.radio ? 'radio' : void 0,
+				enabled: !!entry.enabled,
+				click: event => {
+
+					// To preserve pre-electron-2.x behaviour, we first trigger
+					// the onHide callback and then the action.
+					// Fixes https://github.com/Microsoft/vscode/issues/45601
+					onHide();
+
+					// Run action which will close the menu
+					this.runAction(actionRunner, entry, delegate, event);
+				}
+			};
+
+			const keybinding = !!delegate.getKeyBinding ? delegate.getKeyBinding(entry) : this.keybindingService.lookupKeybinding(entry.id);
+			if (keybinding) {
+				const electronAccelerator = keybinding.getElectronAccelerator();
+				if (electronAccelerator) {
+					item.accelerator = electronAccelerator;
+				} else {
+					const label = keybinding.getLabel();
+					if (label) {
+						item.label = `${item.label} [${label}]`;
+					}
+				}
+			}
+
+			return item;
+		}
+	}
+
+	private runAction(actionRunner: IActionRunner, actionToRun: IAction, delegate: IContextMenuDelegate, event: IContextMenuEvent): void {
 		/* __GDPR__
 			"workbenchActionExecuted" : {
 				"id" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
@@ -129,6 +146,6 @@ export class ContextMenuService implements IContextMenuService {
 		const context = delegate.getActionsContext ? delegate.getActionsContext(event) : event;
 		const res = actionRunner.run(actionToRun, context) || TPromise.as(null);
 
-		res.done(null, e => this.notificationService.error(e));
+		res.then(null, e => this.notificationService.error(e));
 	}
 }
diff --git a/src/vs/workbench/services/crashReporter/electron-browser/crashReporterService.ts b/src/vs/workbench/services/crashReporter/electron-browser/crashReporterService.ts
index 627c221fa6c..71239496dad 100644
--- a/src/vs/workbench/services/crashReporter/electron-browser/crashReporterService.ts
+++ b/src/vs/workbench/services/crashReporter/electron-browser/crashReporterService.ts
@@ -5,7 +5,6 @@
 'use strict';
 
 import * as nls from 'vs/nls';
-import { onUnexpectedError } from 'vs/base/common/errors';
 import { assign, deepClone } from 'vs/base/common/objects';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IWindowsService } from 'vs/platform/windows/common/windows';
@@ -36,8 +35,9 @@ configurationRegistry.registerConfiguration({
 	'properties': {
 		'telemetry.enableCrashReporter': {
 			'type': 'boolean',
-			'description': nls.localize('telemetry.enableCrashReporting', "Enable crash reports to be sent to Microsoft.\nThis option requires restart to take effect."),
-			'default': true
+			'description': nls.localize('telemetry.enableCrashReporting', "Enable crash reports to be sent to a Microsoft online service. \nThis option requires restart to take effect."),
+			'default': true,
+			'tags': ['usesOnlineServices']
 		}
 	}
 });
@@ -54,7 +54,7 @@ export const NullCrashReporterService: ICrashReporterService = {
 
 export class CrashReporterService implements ICrashReporterService {
 
-	public _serviceBrand: any;
+	_serviceBrand: any;
 
 	private options: Electron.CrashReporterStartOptions;
 	private isEnabled: boolean;
@@ -97,8 +97,7 @@ export class CrashReporterService implements ICrashReporterService {
 
 				// start crash reporter in the main process
 				return this.windowsService.startCrashReporter(this.options);
-			})
-			.done(null, onUnexpectedError);
+			});
 	}
 
 	private getSubmitURL(): string {
@@ -114,7 +113,7 @@ export class CrashReporterService implements ICrashReporterService {
 		return submitURL;
 	}
 
-	public getChildProcessStartOptions(name: string): Electron.CrashReporterStartOptions {
+	getChildProcessStartOptions(name: string): Electron.CrashReporterStartOptions {
 
 		// Experimental crash reporting support for child processes on Mac only for now
 		if (this.isEnabled && isMacintosh) {
diff --git a/src/vs/workbench/services/decorations/browser/decorations.ts b/src/vs/workbench/services/decorations/browser/decorations.ts
index e777db83119..3b5e58e2189 100644
--- a/src/vs/workbench/services/decorations/browser/decorations.ts
+++ b/src/vs/workbench/services/decorations/browser/decorations.ts
@@ -5,11 +5,11 @@
 'use strict';
 
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { Event } from 'vs/base/common/event';
 import { ColorIdentifier } from 'vs/platform/theme/common/colorRegistry';
 import { IDisposable } from 'vs/base/common/lifecycle';
-import { TPromise } from 'vs/base/common/winjs.base';
+import { CancellationToken } from 'vs/base/common/cancellation';
 
 export const IDecorationsService = createDecorator<IDecorationsService>('IFileDecorationsService');
 
@@ -26,13 +26,13 @@ export interface IDecoration {
 	readonly tooltip: string;
 	readonly labelClassName: string;
 	readonly badgeClassName: string;
-	update(source?: string, data?: IDecorationData): IDecoration;
+	update(data: IDecorationData): IDecoration;
 }
 
 export interface IDecorationsProvider {
 	readonly label: string;
 	readonly onDidChange: Event<URI[]>;
-	provideDecorations(uri: URI): IDecorationData | TPromise<IDecorationData>;
+	provideDecorations(uri: URI, token: CancellationToken): IDecorationData | Thenable<IDecorationData>;
 }
 
 export interface IResourceDecorationChangeEvent {
diff --git a/src/vs/workbench/services/decorations/browser/decorationsService.ts b/src/vs/workbench/services/decorations/browser/decorationsService.ts
index 513955a5b04..b2f151ec7bb 100644
--- a/src/vs/workbench/services/decorations/browser/decorationsService.ts
+++ b/src/vs/workbench/services/decorations/browser/decorationsService.ts
@@ -4,21 +4,21 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { Event, Emitter, debounceEvent, anyEvent } from 'vs/base/common/event';
 import { IDecorationsService, IDecoration, IResourceDecorationChangeEvent, IDecorationsProvider, IDecorationData } from './decorations';
 import { TernarySearchTree } from 'vs/base/common/map';
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
+import { IDisposable, dispose, toDisposable } from 'vs/base/common/lifecycle';
 import { isThenable } from 'vs/base/common/async';
 import { LinkedList } from 'vs/base/common/linkedList';
 import { createStyleSheet, createCSSRule, removeCSSRulesContainingSelector } from 'vs/base/browser/dom';
 import { IThemeService, ITheme } from 'vs/platform/theme/common/themeService';
 import { IdGenerator } from 'vs/base/common/idGenerator';
-import { IIterator } from 'vs/base/common/iterator';
+import { Iterator } from 'vs/base/common/iterator';
 import { isFalsyOrWhitespace } from 'vs/base/common/strings';
 import { localize } from 'vs/nls';
-import { TPromise } from 'vs/base/common/winjs.base';
 import { isPromiseCanceledError } from 'vs/base/common/errors';
+import { CancellationTokenSource } from 'vs/base/common/cancellation';
 
 class DecorationRule {
 
@@ -141,25 +141,12 @@ class DecorationStyles {
 			labelClassName,
 			badgeClassName,
 			tooltip,
-			update: (source, insert) => {
+			update: (replace) => {
 				let newData = data.slice();
-				if (!source) {
-					// add -> just append
-					newData.push(insert);
-
-				} else {
-					// remove/replace -> require a walk
-					for (let i = 0; i < newData.length; i++) {
-						if (newData[i].source === source) {
-							if (!insert) {
-								// remove
-								newData.splice(i, 1);
-								i--;
-							} else {
-								// replace
-								newData[i] = insert;
-							}
-						}
+				for (let i = 0; i < newData.length; i++) {
+					if (newData[i].source === replace.source) {
+						// replace
+						newData[i] = replace;
 					}
 				}
 				return this.asDecoration(newData, onlyChildren);
@@ -174,13 +161,13 @@ class DecorationStyles {
 		});
 	}
 
-	cleanUp(iter: IIterator<DecorationProviderWrapper>): void {
+	cleanUp(iter: Iterator<DecorationProviderWrapper>): void {
 		// remove every rule for which no more
 		// decoration (data) is kept. this isn't cheap
 		let usedDecorations = new Set<string>();
 		for (let e = iter.next(); !e.done; e = iter.next()) {
 			e.value.data.forEach((value, key) => {
-				if (!isThenable<any>(value) && value) {
+				if (value && !(value instanceof DecorationDataRequest)) {
 					usedDecorations.add(DecorationRule.keyOf(value));
 				}
 			});
@@ -229,9 +216,16 @@ class FileDecorationChangeEvent implements IResourceDecorationChangeEvent {
 	}
 }
 
+class DecorationDataRequest {
+	constructor(
+		readonly source: CancellationTokenSource,
+		readonly thenable: Thenable<void>,
+	) { }
+}
+
 class DecorationProviderWrapper {
 
-	readonly data = TernarySearchTree.forPaths<TPromise<void> | IDecorationData>();
+	readonly data = TernarySearchTree.forPaths<DecorationDataRequest | IDecorationData>();
 	private readonly _dispoable: IDisposable;
 
 	constructor(
@@ -275,7 +269,7 @@ class DecorationProviderWrapper {
 			item = this._fetchData(uri);
 		}
 
-		if (item && !isThenable<void>(item)) {
+		if (item && !(item instanceof DecorationDataRequest)) {
 			// found something (which isn't pending anymore)
 			callback(item, false);
 		}
@@ -285,7 +279,7 @@ class DecorationProviderWrapper {
 			const iter = this.data.findSuperstr(key);
 			if (iter) {
 				for (let item = iter.next(); !item.done; item = iter.next()) {
-					if (item.value && !isThenable<void>(item.value)) {
+					if (item.value && !(item.value instanceof DecorationDataRequest)) {
 						callback(item.value, true);
 					}
 				}
@@ -297,27 +291,28 @@ class DecorationProviderWrapper {
 
 		// check for pending request and cancel it
 		const pendingRequest = this.data.get(uri.toString());
-		if (TPromise.is(pendingRequest)) {
-			pendingRequest.cancel();
+		if (pendingRequest instanceof DecorationDataRequest) {
+			pendingRequest.source.cancel();
 			this.data.delete(uri.toString());
 		}
 
-		const dataOrThenable = this._provider.provideDecorations(uri);
+		const source = new CancellationTokenSource();
+		const dataOrThenable = this._provider.provideDecorations(uri, source.token);
 		if (!isThenable(dataOrThenable)) {
 			// sync -> we have a result now
 			return this._keepItem(uri, dataOrThenable);
 
 		} else {
 			// async -> we have a result soon
-			const request = TPromise.wrap(dataOrThenable).then(data => {
+			const request = new DecorationDataRequest(source, Promise.resolve(dataOrThenable).then(data => {
 				if (this.data.get(uri.toString()) === request) {
 					this._keepItem(uri, data);
 				}
-			}, err => {
+			}).catch(err => {
 				if (!isPromiseCanceledError(err) && this.data.get(uri.toString()) === request) {
 					this.data.delete(uri.toString());
 				}
-			});
+			}));
 
 			this.data.set(uri.toString(), request);
 			return undefined;
@@ -394,15 +389,13 @@ export class FileDecorationsService implements IDecorationsService {
 			affectsResource() { return true; }
 		});
 
-		return {
-			dispose: () => {
-				// fire event that says 'yes' for any resource
-				// known to this provider. then dispose and remove it.
-				remove();
-				this._onDidChangeDecorations.fire({ affectsResource: uri => wrapper.knowsAbout(uri) });
-				wrapper.dispose();
-			}
-		};
+		return toDisposable(() => {
+			// fire event that says 'yes' for any resource
+			// known to this provider. then dispose and remove it.
+			remove();
+			this._onDidChangeDecorations.fire({ affectsResource: uri => wrapper.knowsAbout(uri) });
+			wrapper.dispose();
+		});
 	}
 
 	getDecoration(uri: URI, includeChildren: boolean, overwrite?: IDecorationData): IDecoration {
@@ -428,7 +421,7 @@ export class FileDecorationsService implements IDecorationsService {
 			// result, maybe overwrite
 			let result = this._decorationStyles.asDecoration(data, containsChildren);
 			if (overwrite) {
-				return result.update(overwrite.source, overwrite);
+				return result.update(overwrite);
 			} else {
 				return result;
 			}
diff --git a/src/vs/workbench/services/decorations/test/browser/decorationsService.test.ts b/src/vs/workbench/services/decorations/test/browser/decorationsService.test.ts
index f8469b69e23..0dd4f463a56 100644
--- a/src/vs/workbench/services/decorations/test/browser/decorationsService.test.ts
+++ b/src/vs/workbench/services/decorations/test/browser/decorationsService.test.ts
@@ -8,10 +8,10 @@
 import * as assert from 'assert';
 import { FileDecorationsService } from 'vs/workbench/services/decorations/browser/decorationsService';
 import { IDecorationsProvider, IDecorationData } from 'vs/workbench/services/decorations/browser/decorations';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { Event, toPromise, Emitter } from 'vs/base/common/event';
 import { TestThemeService } from 'vs/platform/theme/test/common/testThemeService';
-import { TPromise } from 'vs/base/common/winjs.base';
+import { CancellationToken } from 'vs/base/common/cancellation';
 
 suite('DecorationsService', function () {
 
@@ -34,7 +34,7 @@ suite('DecorationsService', function () {
 			readonly onDidChange: Event<URI[]> = Event.None;
 			provideDecorations(uri: URI) {
 				callCounter += 1;
-				return new TPromise<IDecorationData>(resolve => {
+				return new Promise<IDecorationData>(resolve => {
 					setTimeout(() => resolve({
 						color: 'someBlue',
 						tooltip: 'T'
@@ -174,6 +174,7 @@ suite('DecorationsService', function () {
 	test('Decorations not showing up for second root folder #48502', async function () {
 
 		let cancelCount = 0;
+		let winjsCancelCount = 0;
 		let callCount = 0;
 
 		let provider = new class implements IDecorationsProvider {
@@ -183,14 +184,17 @@ suite('DecorationsService', function () {
 
 			label: string = 'foo';
 
-			provideDecorations(uri: URI): TPromise<IDecorationData> {
-				return new TPromise(resolve => {
+			provideDecorations(uri: URI, token: CancellationToken): Promise<IDecorationData> {
+
+				token.onCancellationRequested(() => {
+					cancelCount += 1;
+				});
+
+				return new Promise(resolve => {
 					callCount += 1;
 					setTimeout(() => {
 						resolve({ letter: 'foo' });
 					}, 10);
-				}, () => {
-					cancelCount += 1;
 				});
 			}
 		};
@@ -204,6 +208,7 @@ suite('DecorationsService', function () {
 		service.getDecoration(uri, false);
 
 		assert.equal(cancelCount, 1);
+		assert.equal(winjsCancelCount, 0);
 		assert.equal(callCount, 2);
 
 		reg.dispose();
@@ -219,7 +224,7 @@ suite('DecorationsService', function () {
 				if (uri.path.match(/hello$/)) {
 					return { tooltip: 'FOO', weight: 17, bubble: true };
 				} else {
-					return new TPromise<IDecorationData>(_resolve => resolve = _resolve);
+					return new Promise<IDecorationData>(_resolve => resolve = _resolve);
 				}
 			}
 		});
diff --git a/src/vs/workbench/services/dialogs/electron-browser/dialogService.ts b/src/vs/workbench/services/dialogs/electron-browser/dialogService.ts
index df621fb08e1..c2c1ee52f58 100644
--- a/src/vs/workbench/services/dialogs/electron-browser/dialogService.ts
+++ b/src/vs/workbench/services/dialogs/electron-browser/dialogService.ts
@@ -13,6 +13,7 @@ import { isLinux, isWindows } from 'vs/base/common/platform';
 import { IWindowService } from 'vs/platform/windows/common/windows';
 import { mnemonicButtonLabel } from 'vs/base/common/labels';
 import { IDialogService, IConfirmation, IConfirmationResult, IDialogOptions } from 'vs/platform/dialogs/common/dialogs';
+import { ILogService } from 'vs/platform/log/common/log';
 
 interface IMassagedMessageBoxOptions {
 
@@ -31,14 +32,16 @@ interface IMassagedMessageBoxOptions {
 
 export class DialogService implements IDialogService {
 
-	public _serviceBrand: any;
+	_serviceBrand: any;
 
 	constructor(
-		@IWindowService private windowService: IWindowService
-	) {
-	}
+		@IWindowService private windowService: IWindowService,
+		@ILogService private logService: ILogService
+	) { }
+
+	confirm(confirmation: IConfirmation): TPromise<IConfirmationResult> {
+		this.logService.trace('DialogService#confirm', confirmation.message);
 
-	public confirm(confirmation: IConfirmation): TPromise<IConfirmationResult> {
 		const { options, buttonIndexMap } = this.massageMessageBoxOptions(this.getConfirmOptions(confirmation));
 
 		return this.windowService.showMessageBox(options).then(result => {
@@ -86,7 +89,9 @@ export class DialogService implements IDialogService {
 		return opts;
 	}
 
-	public show(severity: Severity, message: string, buttons: string[], dialogOptions?: IDialogOptions): TPromise<number> {
+	show(severity: Severity, message: string, buttons: string[], dialogOptions?: IDialogOptions): TPromise<number> {
+		this.logService.trace('DialogService#show', message);
+
 		const { options, buttonIndexMap } = this.massageMessageBoxOptions({
 			message,
 			buttons,
diff --git a/src/vs/workbench/services/editor/browser/editorService.ts b/src/vs/workbench/services/editor/browser/editorService.ts
index d5ba813c5c7..1766a4066d0 100644
--- a/src/vs/workbench/services/editor/browser/editorService.ts
+++ b/src/vs/workbench/services/editor/browser/editorService.ts
@@ -13,24 +13,22 @@ import { DataUriEditorInput } from 'vs/workbench/common/editor/dataUriEditorInpu
 import { Registry } from 'vs/platform/registry/common/platform';
 import { ResourceMap } from 'vs/base/common/map';
 import { IUntitledEditorService } from 'vs/workbench/services/untitled/common/untitledEditorService';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { IFileService } from 'vs/platform/files/common/files';
 import { Schemas } from 'vs/base/common/network';
-import { getPathLabel } from 'vs/base/common/labels';
 import { Event, once, Emitter } from 'vs/base/common/event';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { basename } from 'vs/base/common/paths';
 import { DiffEditorInput } from 'vs/workbench/common/editor/diffEditorInput';
 import { localize } from 'vs/nls';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { IEditorGroupsService, IEditorGroup, GroupsOrder, IEditorReplacement, GroupChangeKind, preferredSideBySideGroupDirection } from 'vs/workbench/services/group/common/editorGroupsService';
-import { IResourceEditor, ACTIVE_GROUP_TYPE, SIDE_GROUP_TYPE, SIDE_GROUP, ACTIVE_GROUP, IResourceEditorReplacement, IOpenEditorOverrideHandler } from 'vs/workbench/services/editor/common/editorService';
+import { IResourceEditor, ACTIVE_GROUP_TYPE, SIDE_GROUP_TYPE, SIDE_GROUP, IResourceEditorReplacement, IOpenEditorOverrideHandler } from 'vs/workbench/services/editor/common/editorService';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { Disposable, IDisposable, dispose, toDisposable } from 'vs/base/common/lifecycle';
 import { coalesce } from 'vs/base/common/arrays';
 import { isCodeEditor, isDiffEditor, ICodeEditor, IDiffEditor } from 'vs/editor/browser/editorBrowser';
 import { IEditorGroupView, IEditorOpeningEvent, EditorGroupsServiceImpl, EditorServiceImpl } from 'vs/workbench/browser/parts/editor/editor';
+import { ILabelService } from 'vs/platform/label/common/label';
 
 type ICachedEditorInput = ResourceEditorInput | IFileEditorInput | DataUriEditorInput;
 
@@ -65,9 +63,8 @@ export class EditorService extends Disposable implements EditorServiceImpl {
 	constructor(
 		@IEditorGroupsService private editorGroupService: EditorGroupsServiceImpl,
 		@IUntitledEditorService private untitledEditorService: IUntitledEditorService,
-		@IWorkspaceContextService private workspaceContextService: IWorkspaceContextService,
 		@IInstantiationService private instantiationService: IInstantiationService,
-		@IEnvironmentService private environmentService: IEnvironmentService,
+		@ILabelService private labelService: ILabelService,
 		@IFileService private fileService: IFileService,
 		@IConfigurationService private configurationService: IConfigurationService
 	) {
@@ -235,15 +232,6 @@ export class EditorService extends Disposable implements EditorServiceImpl {
 			return this.doOpenEditor(targetGroup, editor, editorOptions);
 		}
 
-		// Throw error for well known foreign resources (such as a http link) (TODO@ben remove me after this has been adopted)
-		const resourceInput = <IResourceInput>editor;
-		if (resourceInput.resource instanceof URI) {
-			const schema = resourceInput.resource.scheme;
-			if (schema === Schemas.http || schema === Schemas.https) {
-				return TPromise.wrapError(new Error('Invalid scheme http/https to open resource as editor. Use IOpenerService instead.'));
-			}
-		}
-
 		// Untyped Text Editor Support
 		const textInput = <IResourceEditor>editor;
 		const typedInput = this.createInput(textInput);
@@ -269,18 +257,13 @@ export class EditorService extends Disposable implements EditorServiceImpl {
 			return group;
 		}
 
-		// Group: Active Group
-		if (group === ACTIVE_GROUP) {
-			targetGroup = this.editorGroupService.activeGroup;
-		}
-
 		// Group: Side by Side
-		else if (group === SIDE_GROUP) {
+		if (group === SIDE_GROUP) {
 			targetGroup = this.findSideBySideGroup();
 		}
 
 		// Group: Specific Group
-		else if (typeof group === 'number') {
+		else if (typeof group === 'number' && group >= 0) {
 			targetGroup = this.editorGroupService.getGroup(group);
 		}
 
@@ -487,8 +470,8 @@ export class EditorService extends Disposable implements EditorServiceImpl {
 		// Side by Side Support
 		const resourceSideBySideInput = <IResourceSideBySideInput>input;
 		if (resourceSideBySideInput.masterResource && resourceSideBySideInput.detailResource) {
-			const masterInput = this.createInput({ resource: resourceSideBySideInput.masterResource });
-			const detailInput = this.createInput({ resource: resourceSideBySideInput.detailResource });
+			const masterInput = this.createInput({ resource: resourceSideBySideInput.masterResource, forceFile: resourceSideBySideInput.forceFile });
+			const detailInput = this.createInput({ resource: resourceSideBySideInput.detailResource, forceFile: resourceSideBySideInput.forceFile });
 
 			return new SideBySideEditorInput(
 				resourceSideBySideInput.label || masterInput.getName(),
@@ -501,9 +484,9 @@ export class EditorService extends Disposable implements EditorServiceImpl {
 		// Diff Editor Support
 		const resourceDiffInput = <IResourceDiffInput>input;
 		if (resourceDiffInput.leftResource && resourceDiffInput.rightResource) {
-			const leftInput = this.createInput({ resource: resourceDiffInput.leftResource });
-			const rightInput = this.createInput({ resource: resourceDiffInput.rightResource });
-			const label = resourceDiffInput.label || localize('compareLabels', "{0} ↔ {1}", this.toDiffLabel(leftInput, this.workspaceContextService, this.environmentService), this.toDiffLabel(rightInput, this.workspaceContextService, this.environmentService));
+			const leftInput = this.createInput({ resource: resourceDiffInput.leftResource, forceFile: resourceDiffInput.forceFile });
+			const rightInput = this.createInput({ resource: resourceDiffInput.rightResource, forceFile: resourceDiffInput.forceFile });
+			const label = resourceDiffInput.label || localize('compareLabels', "{0} ↔ {1}", this.toDiffLabel(leftInput), this.toDiffLabel(rightInput));
 
 			return new DiffEditorInput(label, resourceDiffInput.description, leftInput, rightInput);
 		}
@@ -527,13 +510,13 @@ export class EditorService extends Disposable implements EditorServiceImpl {
 				label = basename(resourceInput.resource.fsPath); // derive the label from the path (but not for data URIs)
 			}
 
-			return this.createOrGet(resourceInput.resource, this.instantiationService, label, resourceInput.description, resourceInput.encoding) as EditorInput;
+			return this.createOrGet(resourceInput.resource, this.instantiationService, label, resourceInput.description, resourceInput.encoding, resourceInput.forceFile) as EditorInput;
 		}
 
 		return null;
 	}
 
-	private createOrGet(resource: URI, instantiationService: IInstantiationService, label: string, description: string, encoding?: string): ICachedEditorInput {
+	private createOrGet(resource: URI, instantiationService: IInstantiationService, label: string, description: string, encoding?: string, forceFile?: boolean): ICachedEditorInput {
 		if (EditorService.CACHE.has(resource)) {
 			const input = EditorService.CACHE.get(resource);
 			if (input instanceof ResourceEditorInput) {
@@ -549,7 +532,7 @@ export class EditorService extends Disposable implements EditorServiceImpl {
 		let input: ICachedEditorInput;
 
 		// File
-		if (this.fileService.canHandleResource(resource)) {
+		if (forceFile /* fix for https://github.com/Microsoft/vscode/issues/48275 */ || this.fileService.canHandleResource(resource)) {
 			input = this.fileInputFactory.createFileInput(resource, encoding, instantiationService);
 		}
 
@@ -571,7 +554,7 @@ export class EditorService extends Disposable implements EditorServiceImpl {
 		return input;
 	}
 
-	private toDiffLabel(input: EditorInput, context: IWorkspaceContextService, environment: IEnvironmentService): string {
+	private toDiffLabel(input: EditorInput): string {
 		const res = input.getResource();
 
 		// Do not try to extract any paths from simple untitled editors
@@ -580,7 +563,7 @@ export class EditorService extends Disposable implements EditorServiceImpl {
 		}
 
 		// Otherwise: for diff labels prefer to see the path as part of the label
-		return getPathLabel(res.fsPath, context, environment);
+		return this.labelService.getUriLabel(res, true);
 	}
 
 	//#endregion
@@ -600,18 +583,16 @@ export class DelegatingEditorService extends EditorService {
 	constructor(
 		@IEditorGroupsService editorGroupService: EditorGroupsServiceImpl,
 		@IUntitledEditorService untitledEditorService: IUntitledEditorService,
-		@IWorkspaceContextService workspaceContextService: IWorkspaceContextService,
 		@IInstantiationService instantiationService: IInstantiationService,
-		@IEnvironmentService environmentService: IEnvironmentService,
+		@ILabelService labelService: ILabelService,
 		@IFileService fileService: IFileService,
 		@IConfigurationService configurationService: IConfigurationService
 	) {
 		super(
 			editorGroupService,
 			untitledEditorService,
-			workspaceContextService,
 			instantiationService,
-			environmentService,
+			labelService,
 			fileService,
 			configurationService
 		);
diff --git a/src/vs/workbench/services/editor/test/browser/editorService.test.ts b/src/vs/workbench/services/editor/test/browser/editorService.test.ts
index f5c38e6dd49..b5c0d429999 100644
--- a/src/vs/workbench/services/editor/test/browser/editorService.test.ts
+++ b/src/vs/workbench/services/editor/test/browser/editorService.test.ts
@@ -9,7 +9,7 @@ import * as assert from 'assert';
 import { TPromise } from 'vs/base/common/winjs.base';
 import * as paths from 'vs/base/common/paths';
 import { IEditorModel } from 'vs/platform/editor/common/editor';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { BaseEditor } from 'vs/workbench/browser/parts/editor/baseEditor';
 import { EditorInput, EditorOptions, IFileEditorInput, IEditorInput } from 'vs/workbench/common/editor';
 import { workbenchInstantiationService } from 'vs/workbench/test/workbenchTestServices';
@@ -28,7 +28,6 @@ import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { FileEditorInput } from 'vs/workbench/parts/files/common/editors/fileEditorInput';
 import { UntitledEditorInput } from 'vs/workbench/common/editor/untitledEditorInput';
-import { DiffEditorInput } from 'vs/workbench/common/editor/diffEditorInput';
 import { EditorServiceImpl } from 'vs/workbench/browser/parts/editor/editor';
 
 export class TestEditorControl extends BaseEditor {
@@ -77,8 +76,8 @@ suite('Editor service', () => {
 
 		const service: EditorServiceImpl = testInstantiationService.createInstance(EditorService);
 
-		const input = testInstantiationService.createInstance(TestEditorInput, URI.parse('my://resource'));
-		const otherInput = testInstantiationService.createInstance(TestEditorInput, URI.parse('my://resource2'));
+		const input = testInstantiationService.createInstance(TestEditorInput, URI.parse('my://resource-basics'));
+		const otherInput = testInstantiationService.createInstance(TestEditorInput, URI.parse('my://resource2-basics'));
 
 		let activeEditorChangeEventCounter = 0;
 		const activeEditorChangeListener = service.onDidActiveEditorChange(() => {
@@ -145,9 +144,9 @@ suite('Editor service', () => {
 
 		const service: IEditorService = testInstantiationService.createInstance(EditorService);
 
-		const input = testInstantiationService.createInstance(TestEditorInput, URI.parse('my://resource'));
-		const otherInput = testInstantiationService.createInstance(TestEditorInput, URI.parse('my://resource2'));
-		const replaceInput = testInstantiationService.createInstance(TestEditorInput, URI.parse('my://resource3'));
+		const input = testInstantiationService.createInstance(TestEditorInput, URI.parse('my://resource-openEditors'));
+		const otherInput = testInstantiationService.createInstance(TestEditorInput, URI.parse('my://resource2-openEditors'));
+		const replaceInput = testInstantiationService.createInstance(TestEditorInput, URI.parse('my://resource3-openEditors'));
 
 		// Open editors
 		return service.openEditors([{ editor: input }, { editor: otherInput }]).then(() => {
@@ -259,7 +258,7 @@ suite('Editor service', () => {
 
 		const ed = instantiationService.createInstance(MyEditor, 'my.editor');
 
-		const inp = instantiationService.createInstance(ResourceEditorInput, 'name', 'description', URI.parse('my://resource'));
+		const inp = instantiationService.createInstance(ResourceEditorInput, 'name', 'description', URI.parse('my://resource-delegate'));
 		const delegate = instantiationService.createInstance(DelegatingEditorService);
 		delegate.setEditorOpenHandler((group: IEditorGroup, input: IEditorInput, options?: EditorOptions) => {
 			assert.strictEqual(input, inp);
@@ -283,7 +282,7 @@ suite('Editor service', () => {
 
 		const service: IEditorService = testInstantiationService.createInstance(EditorService);
 
-		const input = testInstantiationService.createInstance(TestEditorInput, URI.parse('my://resource'));
+		const input = testInstantiationService.createInstance(TestEditorInput, URI.parse('my://resource-close1'));
 
 		const rootGroup = part.activeGroup;
 		const rightGroup = part.addGroup(rootGroup, GroupDirection.RIGHT);
@@ -308,100 +307,6 @@ suite('Editor service', () => {
 		});
 	});
 
-	test('close editor does not dispose when editor opened in other group (diff input)', function () {
-		const partInstantiator = workbenchInstantiationService();
-
-		const part = partInstantiator.createInstance(EditorPart, 'id', false);
-		part.create(document.createElement('div'));
-		part.layout(new Dimension(400, 300));
-
-		const testInstantiationService = partInstantiator.createChild(new ServiceCollection([IEditorGroupsService, part]));
-
-		const service: IEditorService = testInstantiationService.createInstance(EditorService);
-
-		const input = testInstantiationService.createInstance(TestEditorInput, URI.parse('my://resource'));
-		const otherInput = testInstantiationService.createInstance(TestEditorInput, URI.parse('my://resource2'));
-		const diffInput = new DiffEditorInput('name', 'description', input, otherInput);
-
-		const rootGroup = part.activeGroup;
-		const rightGroup = part.addGroup(rootGroup, GroupDirection.RIGHT);
-
-		// Open input
-		return service.openEditor(diffInput, { pinned: true }).then(editor => {
-			return service.openEditor(diffInput, { pinned: true }, rightGroup).then(editor => {
-
-				// Close input
-				return rootGroup.closeEditor(diffInput).then(() => {
-					assert.equal(diffInput.isDisposed(), false);
-					assert.equal(input.isDisposed(), false);
-					assert.equal(otherInput.isDisposed(), false);
-
-					return rightGroup.closeEditor(diffInput).then(() => {
-						assert.equal(diffInput.isDisposed(), true);
-						assert.equal(input.isDisposed(), true);
-						assert.equal(otherInput.isDisposed(), true);
-					});
-				});
-			});
-		});
-	});
-
-	test('close editor disposes properly (diff input)', function () {
-		const partInstantiator = workbenchInstantiationService();
-
-		const part = partInstantiator.createInstance(EditorPart, 'id', false);
-		part.create(document.createElement('div'));
-		part.layout(new Dimension(400, 300));
-
-		const testInstantiationService = partInstantiator.createChild(new ServiceCollection([IEditorGroupsService, part]));
-
-		const service: IEditorService = testInstantiationService.createInstance(EditorService);
-
-		const input = testInstantiationService.createInstance(TestEditorInput, URI.parse('my://resource'));
-		const otherInput = testInstantiationService.createInstance(TestEditorInput, URI.parse('my://resource2'));
-		const diffInput = new DiffEditorInput('name', 'description', input, otherInput);
-
-		// Open input
-		return service.openEditor(diffInput, { pinned: true }).then(editor => {
-
-			// Close input
-			return editor.group.closeEditor(diffInput).then(() => {
-				assert.equal(diffInput.isDisposed(), true);
-				assert.equal(otherInput.isDisposed(), true);
-				assert.equal(input.isDisposed(), true);
-			});
-		});
-	});
-
-	test('close editor disposes properly (diff input, left side still opened)', function () {
-		const partInstantiator = workbenchInstantiationService();
-
-		const part = partInstantiator.createInstance(EditorPart, 'id', false);
-		part.create(document.createElement('div'));
-		part.layout(new Dimension(400, 300));
-
-		const testInstantiationService = partInstantiator.createChild(new ServiceCollection([IEditorGroupsService, part]));
-
-		const service: IEditorService = testInstantiationService.createInstance(EditorService);
-
-		const input = testInstantiationService.createInstance(TestEditorInput, URI.parse('my://resource'));
-		const otherInput = testInstantiationService.createInstance(TestEditorInput, URI.parse('my://resource2'));
-		const diffInput = new DiffEditorInput('name', 'description', input, otherInput);
-
-		// Open input
-		return service.openEditor(diffInput, { pinned: true }).then(editor => {
-			return service.openEditor(input, { pinned: true }).then(editor => {
-
-				// Close input
-				return editor.group.closeEditor(diffInput).then(() => {
-					assert.equal(diffInput.isDisposed(), true);
-					assert.equal(otherInput.isDisposed(), true);
-					assert.equal(input.isDisposed(), false);
-				});
-			});
-		});
-	});
-
 	test('open to the side', function () {
 		const partInstantiator = workbenchInstantiationService();
 
@@ -413,8 +318,8 @@ suite('Editor service', () => {
 
 		const service: IEditorService = testInstantiationService.createInstance(EditorService);
 
-		const input1 = testInstantiationService.createInstance(TestEditorInput, URI.parse('my://resource1'));
-		const input2 = testInstantiationService.createInstance(TestEditorInput, URI.parse('my://resource2'));
+		const input1 = testInstantiationService.createInstance(TestEditorInput, URI.parse('my://resource1-openside'));
+		const input2 = testInstantiationService.createInstance(TestEditorInput, URI.parse('my://resource2-openside'));
 
 		const rootGroup = part.activeGroup;
 
@@ -445,8 +350,8 @@ suite('Editor service', () => {
 
 		const service: EditorServiceImpl = testInstantiationService.createInstance(EditorService);
 
-		const input = testInstantiationService.createInstance(TestEditorInput, URI.parse('my://resource'));
-		const otherInput = testInstantiationService.createInstance(TestEditorInput, URI.parse('my://resource2'));
+		const input = testInstantiationService.createInstance(TestEditorInput, URI.parse('my://resource-active'));
+		const otherInput = testInstantiationService.createInstance(TestEditorInput, URI.parse('my://resource2-active'));
 
 		let activeEditorChangeEventFired = false;
 		const activeEditorChangeListener = service.onDidActiveEditorChange(() => {
@@ -494,7 +399,7 @@ suite('Editor service', () => {
 		assertActiveEditorChangedEvent(true);
 		assertVisibleEditorsChangedEvent(true);
 
-		editor = await service.openEditor(input, { forceOpen: true });
+		editor = await service.openEditor(input, { forceReload: true });
 		assertActiveEditorChangedEvent(false);
 		assertVisibleEditorsChangedEvent(false);
 
diff --git a/src/vs/workbench/services/extensions/common/extensions.ts b/src/vs/workbench/services/extensions/common/extensions.ts
index d8bfa847f36..10cdd8756a0 100644
--- a/src/vs/workbench/services/extensions/common/extensions.ts
+++ b/src/vs/workbench/services/extensions/common/extensions.ts
@@ -9,7 +9,7 @@ import { TPromise } from 'vs/base/common/winjs.base';
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
 import { IExtensionPoint } from 'vs/workbench/services/extensions/common/extensionsRegistry';
 import { Event } from 'vs/base/common/event';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 
 export interface IExtensionDescription {
 	readonly id: string;
@@ -116,6 +116,8 @@ export class ExtensionPointContribution<T> {
 	}
 }
 
+export const ExtensionHostLogFileName = 'exthost';
+
 export interface IExtensionService {
 	_serviceBrand: any;
 
diff --git a/src/vs/workbench/services/extensions/common/extensionsRegistry.ts b/src/vs/workbench/services/extensions/common/extensionsRegistry.ts
index c21f0dd7858..4299179a2cd 100644
--- a/src/vs/workbench/services/extensions/common/extensionsRegistry.ts
+++ b/src/vs/workbench/services/extensions/common/extensionsRegistry.ts
@@ -120,7 +120,7 @@ export class ExtensionPoint<T> implements IExtensionPoint<T> {
 }
 
 const schemaId = 'vscode://schemas/vscode-extensions';
-const schema: IJSONSchema = {
+export const schema = {
 	properties: {
 		engines: {
 			type: 'object',
@@ -220,6 +220,16 @@ const schema: IJSONSchema = {
 						description: nls.localize('vscode.extension.activationEvents.workspaceContains', 'An activation event emitted whenever a folder is opened that contains at least a file matching the specified glob pattern.'),
 						body: 'workspaceContains:${4:filePattern}'
 					},
+					{
+						label: 'onFileSystem',
+						description: nls.localize('vscode.extension.activationEvents.onFileSystem', 'An activation event emitted whenever a file or folder is accessed with the given scheme.'),
+						body: 'onFileSystem:${1:scheme}'
+					},
+					{
+						label: 'onSearch',
+						description: nls.localize('vscode.extension.activationEvents.onSearch', 'An activation event emitted whenever a search is started in the folder with the given scheme.'),
+						body: 'onSearch:${7:scheme}'
+					},
 					{
 						label: 'onView',
 						body: 'onView:${5:viewId}',
@@ -288,6 +298,15 @@ const schema: IJSONSchema = {
 				pattern: EXTENSION_IDENTIFIER_PATTERN
 			}
 		},
+		extensionPack: {
+			description: nls.localize('vscode.extension.contributes.extensionPack', "A set of extensions that can be installed together. The identifier of an extension is always ${publisher}.${name}. For example: vscode.csharp."),
+			type: 'array',
+			uniqueItems: true,
+			items: {
+				type: 'string',
+				pattern: EXTENSION_IDENTIFIER_PATTERN
+			}
+		},
 		scripts: {
 			type: 'object',
 			properties: {
diff --git a/src/vs/workbench/services/extensions/electron-browser/extensionHost.ts b/src/vs/workbench/services/extensions/electron-browser/extensionHost.ts
index dad9839b58b..5de1b8a967d 100644
--- a/src/vs/workbench/services/extensions/electron-browser/extensionHost.ts
+++ b/src/vs/workbench/services/extensions/electron-browser/extensionHost.ts
@@ -8,9 +8,8 @@
 import * as nls from 'vs/nls';
 import { toErrorMessage } from 'vs/base/common/errorMessage';
 import * as objects from 'vs/base/common/objects';
-import URI from 'vs/base/common/uri';
 import { TPromise } from 'vs/base/common/winjs.base';
-import { isWindows, isLinux } from 'vs/base/common/platform';
+import { isWindows } from 'vs/base/common/platform';
 import { findFreePort } from 'vs/base/node/ports';
 import { ILifecycleService, ShutdownEvent } from 'vs/platform/lifecycle/common/lifecycle';
 import { IWindowsService, IWindowService } from 'vs/platform/windows/common/windows';
@@ -20,24 +19,38 @@ import { ChildProcess, fork } from 'child_process';
 import { ipcRenderer as ipc } from 'electron';
 import product from 'vs/platform/node/product';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { IMessagePassingProtocol } from 'vs/base/parts/ipc/common/ipc';
+import { IMessagePassingProtocol } from 'vs/base/parts/ipc/node/ipc';
 import { generateRandomPipeName, Protocol } from 'vs/base/parts/ipc/node/ipc.net';
 import { createServer, Server, Socket } from 'net';
 import { Event, Emitter, debounceEvent, mapEvent, anyEvent, fromNodeEventEmitter } from 'vs/base/common/event';
-import { IInitData, IWorkspaceData, IConfigurationInitData } from 'vs/workbench/api/node/extHost.protocol';
+import { IInitData, IConfigurationInitData } from 'vs/workbench/api/node/extHost.protocol';
 import { IExtensionDescription } from 'vs/workbench/services/extensions/common/extensions';
 import { IWorkspaceConfigurationService } from 'vs/workbench/services/configuration/common/configuration';
 import { ICrashReporterService } from 'vs/workbench/services/crashReporter/electron-browser/crashReporterService';
 import { IBroadcastService, IBroadcast } from 'vs/platform/broadcast/electron-browser/broadcastService';
-import { isEqual } from 'vs/base/common/paths';
+import { isEqual } from 'vs/base/common/resources';
 import { EXTENSION_CLOSE_EXTHOST_BROADCAST_CHANNEL, EXTENSION_RELOAD_BROADCAST_CHANNEL, EXTENSION_ATTACH_BROADCAST_CHANNEL, EXTENSION_LOG_BROADCAST_CHANNEL, EXTENSION_TERMINATE_BROADCAST_CHANNEL } from 'vs/platform/extensions/common/extensionHost';
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
+import { IDisposable, dispose, toDisposable } from 'vs/base/common/lifecycle';
 import { IRemoteConsoleLog, log, parse } from 'vs/base/node/console';
 import { getScopes } from 'vs/platform/configuration/common/configurationRegistry';
 import { ILogService } from 'vs/platform/log/common/log';
 import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
+import { getPathFromAmdModule } from 'vs/base/common/amd';
+import { timeout } from 'vs/base/common/async';
+import { isMessageOfType, MessageType, createMessageOfType } from 'vs/workbench/common/extensionHostProtocol';
+import { ILabelService } from 'vs/platform/label/common/label';
+import { URI } from 'vs/base/common/uri';
+import { Schemas } from 'vs/base/common/network';
+import { onUnexpectedError } from 'vs/base/common/errors';
 
-export class ExtensionHostProcessWorker {
+export interface IExtensionHostStarter {
+	readonly onCrashed: Event<[number, string]>;
+	start(): TPromise<IMessagePassingProtocol>;
+	getInspectPort(): number;
+	dispose(): void;
+}
+
+export class ExtensionHostProcessWorker implements IExtensionHostStarter {
 
 	private readonly _onCrashed: Emitter<[number, string]> = new Emitter<[number, string]>();
 	public readonly onCrashed: Event<[number, string]> = this._onCrashed.event;
@@ -62,6 +75,7 @@ export class ExtensionHostProcessWorker {
 
 	constructor(
 		private readonly _extensions: TPromise<IExtensionDescription[]>,
+		private readonly _extensionHostLogsLocation: URI,
 		@IWorkspaceContextService private readonly _contextService: IWorkspaceContextService,
 		@INotificationService private readonly _notificationService: INotificationService,
 		@IWindowsService private readonly _windowsService: IWindowsService,
@@ -72,12 +86,15 @@ export class ExtensionHostProcessWorker {
 		@IWorkspaceConfigurationService private readonly _configurationService: IWorkspaceConfigurationService,
 		@ITelemetryService private readonly _telemetryService: ITelemetryService,
 		@ICrashReporterService private readonly _crashReporterService: ICrashReporterService,
-		@ILogService private readonly _logService: ILogService
+		@ILogService private readonly _logService: ILogService,
+		@ILabelService private readonly _labelService: ILabelService
 	) {
 		// handle extension host lifecycle a bit special when we know we are developing an extension that runs inside
 		this._isExtensionDevHost = this._environmentService.isExtensionDevelopment;
-		this._isExtensionDevDebug = (typeof this._environmentService.debugExtensionHost.port === 'number');
-		this._isExtensionDevDebugBrk = !!this._environmentService.debugExtensionHost.break;
+		const extDevLoc = this._environmentService.extensionDevelopmentLocationURI;
+		const debugOk = extDevLoc && extDevLoc.scheme === Schemas.file;
+		this._isExtensionDevDebug = debugOk && typeof this._environmentService.debugExtensionHost.port === 'number';
+		this._isExtensionDevDebugBrk = debugOk && !!this._environmentService.debugExtensionHost.break;
 		this._isExtensionDevTestFromCli = this._isExtensionDevHost && !!this._environmentService.extensionTestsPath && !this._environmentService.debugExtensionHost.break;
 
 		this._lastExtensionHostError = null;
@@ -96,11 +113,9 @@ export class ExtensionHostProcessWorker {
 
 		const globalExitListener = () => this.terminate();
 		process.once('exit', globalExitListener);
-		this._toDispose.push({
-			dispose: () => {
-				process.removeListener('exit', globalExitListener);
-			}
-		});
+		this._toDispose.push(toDisposable(() => {
+			process.removeListener('exit', globalExitListener);
+		}));
 	}
 
 	public dispose(): void {
@@ -111,15 +126,15 @@ export class ExtensionHostProcessWorker {
 
 		// Close Ext Host Window Request
 		if (broadcast.channel === EXTENSION_CLOSE_EXTHOST_BROADCAST_CHANNEL && this._isExtensionDevHost) {
-			const extensionPaths = broadcast.payload as string[];
-			if (Array.isArray(extensionPaths) && extensionPaths.some(path => isEqual(this._environmentService.extensionDevelopmentPath, path, !isLinux))) {
+			const extensionLocations = broadcast.payload as string[];
+			if (Array.isArray(extensionLocations) && extensionLocations.some(uriString => isEqual(this._environmentService.extensionDevelopmentLocationURI, URI.parse(uriString)))) {
 				this._windowService.closeWindow();
 			}
 		}
 
 		if (broadcast.channel === EXTENSION_RELOAD_BROADCAST_CHANNEL && this._isExtensionDevHost) {
 			const extensionPaths = broadcast.payload as string[];
-			if (Array.isArray(extensionPaths) && extensionPaths.some(path => isEqual(this._environmentService.extensionDevelopmentPath, path, !isLinux))) {
+			if (Array.isArray(extensionPaths) && extensionPaths.some(uriString => isEqual(this._environmentService.extensionDevelopmentLocationURI, URI.parse(uriString)))) {
 				this._windowService.reloadWindow();
 			}
 		}
@@ -143,7 +158,8 @@ export class ExtensionHostProcessWorker {
 						VERBOSE_LOGGING: true,
 						VSCODE_IPC_HOOK_EXTHOST: pipeName,
 						VSCODE_HANDLES_UNCAUGHT_ERRORS: true,
-						VSCODE_LOG_STACK: !this._isExtensionDevTestFromCli && (this._isExtensionDevHost || !this._environmentService.isBuilt || product.quality !== 'stable' || this._environmentService.verbose)
+						VSCODE_LOG_STACK: !this._isExtensionDevTestFromCli && (this._isExtensionDevHost || !this._environmentService.isBuilt || product.quality !== 'stable' || this._environmentService.verbose),
+						VSCODE_LOG_LEVEL: this._environmentService.verbose ? 'trace' : this._environmentService.log
 					}),
 					// We only detach the extension host on windows. Linux and Mac orphan by default
 					// and detach under Linux and Mac create another process group.
@@ -172,7 +188,7 @@ export class ExtensionHostProcessWorker {
 				}
 
 				// Run Extension Host as fork of current process
-				this._extensionHostProcess = fork(URI.parse(require.toUrl('bootstrap')).fsPath, ['--type=extensionHost'], opts);
+				this._extensionHostProcess = fork(getPathFromAmdModule(require, 'bootstrap-fork'), ['--type=extensionHost'], opts);
 
 				// Catch all output coming from the extension host process
 				type Output = { data: string, format: string[] };
@@ -193,13 +209,13 @@ export class ExtensionHostProcessWorker {
 				}, 100);
 
 				// Print out extension host output
-				onDebouncedOutput(data => {
-					const inspectorUrlIndex = !this._environmentService.isBuilt && data.data && data.data.indexOf('chrome-devtools://');
-					if (inspectorUrlIndex >= 0) {
-						console.log(`%c[Extension Host] %cdebugger inspector at ${data.data.substr(inspectorUrlIndex)}`, 'color: blue', 'color: black');
+				onDebouncedOutput(output => {
+					const inspectorUrlMatch = !this._environmentService.isBuilt && output.data && output.data.match(/ws:\/\/([^\s]+)/);
+					if (inspectorUrlMatch) {
+						console.log(`%c[Extension Host] %cdebugger inspector at chrome-devtools://devtools/bundled/inspector.html?experiments=true&v8only=true&ws=${inspectorUrlMatch[1]}`, 'color: blue', 'color: black');
 					} else {
 						console.group('Extension Host');
-						console.log(data.data, ...data.format);
+						console.log(output.data, ...output.format);
 						console.groupEnd();
 					}
 				});
@@ -216,7 +232,7 @@ export class ExtensionHostProcessWorker {
 				this._extensionHostProcess.on('exit', (code: number, signal: string) => this._onExtHostProcessExit(code, signal));
 
 				// Notify debugger that we are ready to attach to the process if we run a development extension
-				if (this._isExtensionDevHost && portData.actual) {
+				if (this._isExtensionDevHost && portData.actual && this._isExtensionDevDebug) {
 					this._broadcastService.broadcast({
 						channel: EXTENSION_ATTACH_BROADCAST_CHANNEL,
 						payload: {
@@ -258,8 +274,8 @@ export class ExtensionHostProcessWorker {
 	/**
 	 * Start a server (`this._namedPipeServer`) that listens on a named pipe and return the named pipe name.
 	 */
-	private _tryListenOnPipe(): TPromise<string> {
-		return new TPromise<string>((resolve, reject) => {
+	private _tryListenOnPipe(): Promise<string> {
+		return new Promise<string>((resolve, reject) => {
 			const pipeName = generateRandomPipeName();
 
 			this._namedPipeServer = createServer();
@@ -274,15 +290,15 @@ export class ExtensionHostProcessWorker {
 	/**
 	 * Find a free port if extension host debugging is enabled.
 	 */
-	private _tryFindDebugPort(): TPromise<{ expected: number; actual: number }> {
+	private _tryFindDebugPort(): Promise<{ expected: number; actual: number }> {
 		let expected: number;
 		let startPort = 9333;
 		if (typeof this._environmentService.debugExtensionHost.port === 'number') {
 			startPort = expected = this._environmentService.debugExtensionHost.port;
 		} else {
-			return TPromise.as({ expected: undefined, actual: 0 });
+			return Promise.resolve({ expected: undefined, actual: 0 });
 		}
-		return new TPromise((c, e) => {
+		return new Promise(resolve => {
 			return findFreePort(startPort, 10 /* try 10 ports */, 5000 /* try up to 5 seconds */).then(port => {
 				if (!port) {
 					console.warn('%c[Extension Host] %cCould not find a free port for debugging', 'color: blue', 'color: black');
@@ -296,14 +312,14 @@ export class ExtensionHostProcessWorker {
 						console.info(`%c[Extension Host] %cdebugger listening on port ${port}`, 'color: blue', 'color: black');
 					}
 				}
-				return c({ expected, actual: port });
+				return resolve({ expected, actual: port });
 			});
 		});
 	}
 
-	private _tryExtHostHandshake(): TPromise<IMessagePassingProtocol> {
+	private _tryExtHostHandshake(): Promise<IMessagePassingProtocol> {
 
-		return new TPromise<IMessagePassingProtocol>((resolve, reject) => {
+		return new Promise<IMessagePassingProtocol>((resolve, reject) => {
 
 			// Wait for the extension host to connect to our named pipe
 			// and wrap the socket in the message passing protocol
@@ -325,7 +341,7 @@ export class ExtensionHostProcessWorker {
 
 			// 1) wait for the incoming `ready` event and send the initialization data.
 			// 2) wait for the incoming `initialized` event.
-			return new TPromise<IMessagePassingProtocol>((resolve, reject) => {
+			return new Promise<IMessagePassingProtocol>((resolve, reject) => {
 
 				let handle = setTimeout(() => {
 					reject('timeout');
@@ -333,13 +349,13 @@ export class ExtensionHostProcessWorker {
 
 				const disposable = protocol.onMessage(msg => {
 
-					if (msg === 'ready') {
+					if (isMessageOfType(msg, MessageType.Ready)) {
 						// 1) Extension Host is ready to receive messages, initialize it
-						this._createExtHostInitData().then(data => protocol.send(JSON.stringify(data)));
+						this._createExtHostInitData().then(data => protocol.send(Buffer.from(JSON.stringify(data))));
 						return;
 					}
 
-					if (msg === 'initialized') {
+					if (isMessageOfType(msg, MessageType.Initialized)) {
 						// 2) Extension Host is initialized
 
 						clearTimeout(handle);
@@ -348,7 +364,10 @@ export class ExtensionHostProcessWorker {
 						disposable.dispose();
 
 						// release this promise
-						resolve(protocol);
+						// using a buffered message protocol here because between now
+						// and the first time a `then` executes some messages might be lost
+						// unless we immediately register a listener for `onMessage`.
+						resolve(new BufferedMessagePassingProtocol(protocol));
 						return;
 					}
 
@@ -361,29 +380,34 @@ export class ExtensionHostProcessWorker {
 	}
 
 	private _createExtHostInitData(): TPromise<IInitData> {
-		return TPromise.join<any>([this._telemetryService.getTelemetryInfo(), this._extensions]).then(([telemetryInfo, extensionDescriptions]) => {
-			const configurationData: IConfigurationInitData = { ...this._configurationService.getConfigurationData(), configurationScopes: {} };
-			const r: IInitData = {
-				parentPid: process.pid,
-				environment: {
-					isExtensionDevelopmentDebug: this._isExtensionDevDebug,
-					appRoot: this._environmentService.appRoot,
-					appSettingsHome: this._environmentService.appSettingsHome,
-					disableExtensions: this._environmentService.disableExtensions,
-					extensionDevelopmentPath: this._environmentService.extensionDevelopmentPath,
-					extensionTestsPath: this._environmentService.extensionTestsPath
-				},
-				workspace: this._contextService.getWorkbenchState() === WorkbenchState.EMPTY ? null : <IWorkspaceData>this._contextService.getWorkspace(),
-				extensions: extensionDescriptions,
-				// Send configurations scopes only in development mode.
-				configuration: !this._environmentService.isBuilt || this._environmentService.isExtensionDevelopment ? { ...configurationData, configurationScopes: getScopes() } : configurationData,
-				telemetryInfo,
-				windowId: this._windowService.getCurrentWindowId(),
-				logLevel: this._logService.getLevel(),
-				logsPath: this._environmentService.logsPath
-			};
-			return r;
-		});
+		return TPromise.join([this._telemetryService.getTelemetryInfo(), this._extensions])
+			.then(([telemetryInfo, extensionDescriptions]) => {
+				const configurationData: IConfigurationInitData = { ...this._configurationService.getConfigurationData(), configurationScopes: {} };
+				const workspace = this._contextService.getWorkspace();
+				const r: IInitData = {
+					parentPid: process.pid,
+					environment: {
+						isExtensionDevelopmentDebug: this._isExtensionDevDebug,
+						appRoot: this._environmentService.appRoot ? URI.file(this._environmentService.appRoot) : void 0,
+						appSettingsHome: this._environmentService.appSettingsHome ? URI.file(this._environmentService.appSettingsHome) : void 0,
+						extensionDevelopmentLocationURI: this._environmentService.extensionDevelopmentLocationURI,
+						extensionTestsPath: this._environmentService.extensionTestsPath
+					},
+					workspace: this._contextService.getWorkbenchState() === WorkbenchState.EMPTY ? null : {
+						configuration: workspace.configuration,
+						folders: workspace.folders,
+						id: workspace.id,
+						name: this._labelService.getWorkspaceLabel(workspace)
+					},
+					extensions: extensionDescriptions,
+					// Send configurations scopes only in development mode.
+					configuration: !this._environmentService.isBuilt || this._environmentService.isExtensionDevelopment ? { ...configurationData, configurationScopes: getScopes() } : configurationData,
+					telemetryInfo,
+					logLevel: this._logService.getLevel(),
+					logsLocation: this._extensionHostLogsLocation
+				};
+				return r;
+			});
 	}
 
 	private _logExtensionHostMessage(entry: IRemoteConsoleLog) {
@@ -464,9 +488,7 @@ export class ExtensionHostProcessWorker {
 
 			// Send the extension host a request to terminate itself
 			// (graceful termination)
-			protocol.send({
-				type: '__$terminate'
-			});
+			protocol.send(createMessageOfType(MessageType.Terminate));
 
 			// Give the extension host 60s, after which we will
 			// try to kill the process and release any resources
@@ -507,7 +529,61 @@ export class ExtensionHostProcessWorker {
 				}
 			});
 
-			event.veto(TPromise.timeout(100 /* wait a bit for IPC to get delivered */).then(() => false));
+			event.veto(timeout(100 /* wait a bit for IPC to get delivered */).then(() => false));
 		}
 	}
 }
+
+/**
+ * Will ensure no messages are lost from creation time until the first user of onMessage comes in.
+ */
+class BufferedMessagePassingProtocol implements IMessagePassingProtocol {
+
+	private readonly _actual: IMessagePassingProtocol;
+	private _bufferedMessagesListener: IDisposable;
+	private _bufferedMessages: Buffer[];
+
+	constructor(actual: IMessagePassingProtocol) {
+		this._actual = actual;
+		this._bufferedMessages = [];
+		this._bufferedMessagesListener = this._actual.onMessage((buff) => this._bufferedMessages.push(buff));
+	}
+
+	public send(buffer: Buffer): void {
+		this._actual.send(buffer);
+	}
+
+	public onMessage(listener: (e: Buffer) => any, thisArgs?: any, disposables?: IDisposable[]): IDisposable {
+		if (!this._bufferedMessages) {
+			// second caller gets nothing
+			return this._actual.onMessage(listener, thisArgs, disposables);
+		}
+
+		// prepare result
+		const result = this._actual.onMessage(listener, thisArgs, disposables);
+
+		// stop listening to buffered messages
+		this._bufferedMessagesListener.dispose();
+
+		// capture buffered messages
+		const bufferedMessages = this._bufferedMessages;
+		this._bufferedMessages = null;
+
+		// it is important to deliver these messages after this call, but before
+		// other messages have a chance to be received (to guarantee in order delivery)
+		// that's why we're using here nextTick and not other types of timeouts
+		process.nextTick(() => {
+			// deliver buffered messages
+			while (bufferedMessages.length > 0) {
+				const msg = bufferedMessages.shift();
+				try {
+					listener.call(thisArgs, msg);
+				} catch (e) {
+					onUnexpectedError(e);
+				}
+			}
+		});
+
+		return result;
+	}
+}
diff --git a/src/vs/workbench/services/extensions/electron-browser/extensionService.ts b/src/vs/workbench/services/extensions/electron-browser/extensionService.ts
index 78e9ab2545e..67953d609ca 100644
--- a/src/vs/workbench/services/extensions/electron-browser/extensionService.ts
+++ b/src/vs/workbench/services/extensions/electron-browser/extensionService.ts
@@ -12,14 +12,14 @@ import pkg from 'vs/platform/node/package';
 import * as path from 'path';
 import * as os from 'os';
 import * as pfs from 'vs/base/node/pfs';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import * as platform from 'vs/base/common/platform';
 import { ExtensionDescriptionRegistry } from 'vs/workbench/services/extensions/node/extensionDescriptionRegistry';
 import { IMessage, IExtensionDescription, IExtensionsStatus, IExtensionService, ExtensionPointContribution, ActivationTimes, ProfileSession } from 'vs/workbench/services/extensions/common/extensions';
 import { USER_MANIFEST_CACHE_FILE, BUILTIN_MANIFEST_CACHE_FILE, MANIFEST_CACHE_FOLDER } from 'vs/platform/extensions/common/extensions';
 import { IExtensionEnablementService, IExtensionIdentifier, EnablementState, IExtensionManagementService, LocalExtensionType } from 'vs/platform/extensionManagement/common/extensionManagement';
 import { areSameExtensions, BetterMergeId, BetterMergeDisabledNowKey, getGalleryExtensionIdFromLocal } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
-import { ExtensionsRegistry, ExtensionPoint, IExtensionPointUser, ExtensionMessageCollector, IExtensionPoint } from 'vs/workbench/services/extensions/common/extensionsRegistry';
+import { ExtensionsRegistry, ExtensionPoint, IExtensionPointUser, ExtensionMessageCollector, IExtensionPoint, schema } from 'vs/workbench/services/extensions/common/extensionsRegistry';
 import { ExtensionScanner, ILog, ExtensionScannerInput, IExtensionResolver, IExtensionReference, Translations, IRelaxedExtensionDescription } from 'vs/workbench/services/extensions/node/extensionPoints';
 import { ProxyIdentifier } from 'vs/workbench/services/extensions/node/proxyIdentifier';
 import { ExtHostContext, ExtHostExtensionServiceShape, IExtHostContext, MainContext } from 'vs/workbench/api/node/extHost.protocol';
@@ -27,8 +27,8 @@ import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { IStorageService } from 'vs/platform/storage/common/storage';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ExtensionHostProcessWorker } from 'vs/workbench/services/extensions/electron-browser/extensionHost';
-import { IMessagePassingProtocol } from 'vs/base/parts/ipc/common/ipc';
+import { ExtensionHostProcessWorker, IExtensionHostStarter } from 'vs/workbench/services/extensions/electron-browser/extensionHost';
+import { IMessagePassingProtocol } from 'vs/base/parts/ipc/node/ipc';
 import { ExtHostCustomersRegistry } from 'vs/workbench/api/electron-browser/extHostCustomers';
 import { IWindowService } from 'vs/platform/windows/common/windows';
 import { IDisposable, Disposable } from 'vs/base/common/lifecycle';
@@ -39,21 +39,28 @@ import { Event, Emitter } from 'vs/base/common/event';
 import { ExtensionHostProfiler } from 'vs/workbench/services/extensions/electron-browser/extensionHostProfiler';
 import product from 'vs/platform/node/product';
 import * as strings from 'vs/base/common/strings';
-import { RPCProtocol } from 'vs/workbench/services/extensions/node/rpcProtocol';
+import { RPCProtocol, IRPCProtocolLogger, RequestInitiator } from 'vs/workbench/services/extensions/node/rpcProtocol';
 import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
 import { isFalsyOrEmpty } from 'vs/base/common/arrays';
+import { Schemas } from 'vs/base/common/network';
+import { getPathFromAmdModule } from 'vs/base/common/amd';
+import { isEqualOrParent } from 'vs/base/common/resources';
+
+// Enable to see detailed message communication between window and extension host
+const LOG_EXTENSION_HOST_COMMUNICATION = false;
+const LOG_USE_COLORS = true;
 
 let _SystemExtensionsRoot: string = null;
 function getSystemExtensionsRoot(): string {
 	if (!_SystemExtensionsRoot) {
-		_SystemExtensionsRoot = path.normalize(path.join(URI.parse(require.toUrl('')).fsPath, '..', 'extensions'));
+		_SystemExtensionsRoot = path.normalize(path.join(getPathFromAmdModule(require, ''), '..', 'extensions'));
 	}
 	return _SystemExtensionsRoot;
 }
 let _ExtraDevSystemExtensionsRoot: string = null;
 function getExtraDevSystemExtensionsRoot(): string {
 	if (!_ExtraDevSystemExtensionsRoot) {
-		_ExtraDevSystemExtensionsRoot = path.normalize(path.join(URI.parse(require.toUrl('')).fsPath, '..', '.build', 'builtInExtensions'));
+		_ExtraDevSystemExtensionsRoot = path.normalize(path.join(getPathFromAmdModule(require, ''), '..', '.build', 'builtInExtensions'));
 	}
 	return _ExtraDevSystemExtensionsRoot;
 }
@@ -94,9 +101,6 @@ class ExtraBuiltInExtensionResolver implements IExtensionResolver {
 	}
 }
 
-// Enable to see detailed message communication between window and extension host
-const logExtensionHostCommunication = false;
-
 function messageWithSource(source: string, message: string): string {
 	if (source) {
 		return `[${source}]: ${message}`;
@@ -117,14 +121,14 @@ export class ExtensionHostProcessManager extends Disposable {
 	private readonly _extensionHostProcessFinishedActivateEvents: { [activationEvent: string]: boolean; };
 	private _extensionHostProcessRPCProtocol: RPCProtocol;
 	private readonly _extensionHostProcessCustomers: IDisposable[];
-	private readonly _extensionHostProcessWorker: ExtensionHostProcessWorker;
+	private readonly _extensionHostProcessWorker: IExtensionHostStarter;
 	/**
 	 * winjs believes a proxy is a promise because it has a `then` method, so wrap the result in an object.
 	 */
-	private readonly _extensionHostProcessProxy: TPromise<{ value: ExtHostExtensionServiceShape; }>;
+	private _extensionHostProcessProxy: TPromise<{ value: ExtHostExtensionServiceShape; }>;
 
 	constructor(
-		extensionHostProcessWorker: ExtensionHostProcessWorker,
+		extensionHostProcessWorker: IExtensionHostStarter,
 		initialActivationEvents: string[],
 		@IInstantiationService private readonly _instantiationService: IInstantiationService,
 		@IEnvironmentService private readonly _environmentService: IEnvironmentService,
@@ -133,7 +137,6 @@ export class ExtensionHostProcessManager extends Disposable {
 		this._extensionHostProcessFinishedActivateEvents = Object.create(null);
 		this._extensionHostProcessRPCProtocol = null;
 		this._extensionHostProcessCustomers = [];
-		this._extensionHostProcessProxy = null;
 
 		this._extensionHostProcessWorker = extensionHostProcessWorker;
 		this.onDidCrash = this._extensionHostProcessWorker.onCrashed;
@@ -167,6 +170,7 @@ export class ExtensionHostProcessManager extends Disposable {
 				errors.onUnexpectedError(err);
 			}
 		}
+		this._extensionHostProcessProxy = null;
 
 		super.dispose();
 	}
@@ -177,12 +181,17 @@ export class ExtensionHostProcessManager extends Disposable {
 
 	private _createExtensionHostCustomers(protocol: IMessagePassingProtocol): ExtHostExtensionServiceShape {
 
-		if (logExtensionHostCommunication || this._environmentService.logExtensionHostCommunication) {
-			protocol = asLoggingProtocol(protocol);
+		let logger: IRPCProtocolLogger = null;
+		if (LOG_EXTENSION_HOST_COMMUNICATION || this._environmentService.logExtensionHostCommunication) {
+			logger = new RPCLogger();
 		}
 
-		this._extensionHostProcessRPCProtocol = new RPCProtocol(protocol);
-		const extHostContext: IExtHostContext = this._extensionHostProcessRPCProtocol;
+		this._extensionHostProcessRPCProtocol = new RPCProtocol(protocol, logger);
+		const extHostContext: IExtHostContext = {
+			getProxy: <T>(identifier: ProxyIdentifier<T>): T => this._extensionHostProcessRPCProtocol.getProxy(identifier),
+			set: <T, R extends T>(identifier: ProxyIdentifier<T>, instance: R): R => this._extensionHostProcessRPCProtocol.set(identifier, instance),
+			assertRegistered: (identifiers: ProxyIdentifier<any>[]): void => this._extensionHostProcessRPCProtocol.assertRegistered(identifiers),
+		};
 
 		// Named customers
 		const namedCustomers = ExtHostCustomersRegistry.getNamedCustomers();
@@ -213,6 +222,11 @@ export class ExtensionHostProcessManager extends Disposable {
 			return NO_OP_VOID_PROMISE;
 		}
 		return this._extensionHostProcessProxy.then((proxy) => {
+			if (!proxy) {
+				// this case is already covered above and logged.
+				// i.e. the extension host could not be started
+				return NO_OP_VOID_PROMISE;
+			}
 			return proxy.value.$activateByEvent(activationEvent);
 		}).then(() => {
 			this._extensionHostProcessFinishedActivateEvents[activationEvent] = true;
@@ -230,11 +244,15 @@ export class ExtensionHostProcessManager extends Disposable {
 	}
 }
 
+schema.properties.engines.properties.vscode.default = `^${pkg.version}`;
+
 export class ExtensionService extends Disposable implements IExtensionService {
+
 	public _serviceBrand: any;
 
 	private readonly _onDidRegisterExtensions: Emitter<void>;
 
+	private readonly _extensionHostLogsLocation: URI;
 	private _registry: ExtensionDescriptionRegistry;
 	private readonly _installedExtensionsReady: Barrier;
 	private readonly _isDev: boolean;
@@ -261,6 +279,7 @@ export class ExtensionService extends Disposable implements IExtensionService {
 		@IExtensionManagementService private extensionManagementService: IExtensionManagementService
 	) {
 		super();
+		this._extensionHostLogsLocation = URI.file(path.posix.join(this._environmentService.logsPath, `exthost${this._windowService.getCurrentWindowId()}`));
 		this._registry = null;
 		this._installedExtensionsReady = new Barrier();
 		this._isDev = !this._environmentService.isBuilt || this._environmentService.isExtensionDevelopment;
@@ -275,8 +294,8 @@ export class ExtensionService extends Disposable implements IExtensionService {
 
 		this.startDelayed(lifecycleService);
 
-		if (this._environmentService.disableExtensions) {
-			this._notificationService.prompt(Severity.Info, nls.localize('extensionsDisabled', "All extensions are temporarily disabled. Reload the window to return to the previous state."), [{
+		if (this._extensionEnablementService.allUserExtensionsDisabled) {
+			this._notificationService.prompt(Severity.Info, nls.localize('extensionsDisabled', "All installed extensions are temporarily disabled. Reload the window to return to the previous state."), [{
 				label: nls.localize('Reload', "Reload"),
 				run: () => {
 					this._windowService.reloadWindow();
@@ -353,7 +372,7 @@ export class ExtensionService extends Disposable implements IExtensionService {
 	private _startExtensionHostProcess(initialActivationEvents: string[]): void {
 		this._stopExtensionHostProcess();
 
-		const extHostProcessWorker = this._instantiationService.createInstance(ExtensionHostProcessWorker, this.getExtensions());
+		const extHostProcessWorker = this._instantiationService.createInstance(ExtensionHostProcessWorker, this.getExtensions(), this._extensionHostLogsLocation);
 		const extHostProcessManager = this._instantiationService.createInstance(ExtensionHostProcessManager, extHostProcessWorker, initialActivationEvents);
 		extHostProcessManager.onDidCrash(([code, signal]) => this._onExtensionHostCrashed(code, signal));
 		this._extensionHostProcessManagers.push(extHostProcessManager);
@@ -481,9 +500,10 @@ export class ExtensionService extends Disposable implements IExtensionService {
 
 	private _scanAndHandleExtensions(): void {
 
-		this._getRuntimeExtensions()
-			.then(runtimeExtensons => {
-				this._registry = new ExtensionDescriptionRegistry(runtimeExtensons);
+		this._scanExtensions()
+			.then(allExtensions => this._getRuntimeExtensions(allExtensions))
+			.then(allExtensions => {
+				this._registry = new ExtensionDescriptionRegistry(allExtensions);
 
 				let availableExtensions = this._registry.getAllExtensionDescriptions();
 				let extensionPoints = ExtensionsRegistry.getExtensionPoints();
@@ -501,100 +521,124 @@ export class ExtensionService extends Disposable implements IExtensionService {
 			});
 	}
 
-	private _getRuntimeExtensions(): TPromise<IExtensionDescription[]> {
+	private _scanExtensions(): TPromise<IExtensionDescription[]> {
 		const log = new Logger((severity, source, message) => {
 			this._logOrShowMessage(severity, this._isDev ? messageWithSource(source, message) : message);
 		});
 
-		return ExtensionService._scanInstalledExtensions(this._windowService, this._notificationService, this._environmentService, log)
+		return ExtensionService._scanInstalledExtensions(this._windowService, this._notificationService, this._environmentService, this._extensionEnablementService, log)
 			.then(({ system, user, development }) => {
-				return this._extensionEnablementService.getDisabledExtensions()
-					.then(disabledExtensions => {
-						let result: { [extensionId: string]: IExtensionDescription; } = {};
-						let extensionsToDisable: IExtensionIdentifier[] = [];
-						let userMigratedSystemExtensions: IExtensionIdentifier[] = [{ id: BetterMergeId }];
-
-						system.forEach((systemExtension) => {
-							if (disabledExtensions.every(disabled => !areSameExtensions(disabled, systemExtension))) {
-								result[systemExtension.id] = systemExtension;
-							}
-						});
-
-						user.forEach((userExtension) => {
-							if (result.hasOwnProperty(userExtension.id)) {
-								log.warn(userExtension.extensionLocation.fsPath, nls.localize('overwritingExtension', "Overwriting extension {0} with {1}.", result[userExtension.id].extensionLocation.fsPath, userExtension.extensionLocation.fsPath));
-							}
-							if (disabledExtensions.every(disabled => !areSameExtensions(disabled, userExtension))) {
-								// Check if the extension is changed to system extension
-								let userMigratedSystemExtension = userMigratedSystemExtensions.filter(userMigratedSystemExtension => areSameExtensions(userMigratedSystemExtension, { id: userExtension.id }))[0];
-								if (userMigratedSystemExtension) {
-									extensionsToDisable.push(userMigratedSystemExtension);
-								} else {
-									result[userExtension.id] = userExtension;
-								}
-							}
-						});
-
-						development.forEach(developedExtension => {
-							log.info('', nls.localize('extensionUnderDevelopment', "Loading development extension at {0}", developedExtension.extensionLocation.fsPath));
-							if (result.hasOwnProperty(developedExtension.id)) {
-								log.warn(developedExtension.extensionLocation.fsPath, nls.localize('overwritingExtension', "Overwriting extension {0} with {1}.", result[developedExtension.id].extensionLocation.fsPath, developedExtension.extensionLocation.fsPath));
-							}
-							// Do not disable extensions under development
-							result[developedExtension.id] = developedExtension;
-						});
-
-						const runtimeExtensions = Object.keys(result).map(name => result[name]);
-
-						this._telemetryService.publicLog('extensionsScanned', {
-							totalCount: runtimeExtensions.length,
-							disabledCount: disabledExtensions.length
-						});
-
-						if (extensionsToDisable.length) {
-							return this.extensionManagementService.getInstalled(LocalExtensionType.User)
-								.then(installed => {
-									const toDisable = installed.filter(i => extensionsToDisable.some(e => areSameExtensions({ id: getGalleryExtensionIdFromLocal(i) }, e)));
-									return TPromise.join(toDisable.map(e => this._extensionEnablementService.setEnablement(e, EnablementState.Disabled)));
-								})
-								.then(() => {
-									this._storageService.store(BetterMergeDisabledNowKey, true);
-									return runtimeExtensions;
-								});
-						} else {
-							return runtimeExtensions;
-						}
-					});
-			}).then(extensions => this._updateEnableProposedApi(extensions));
+				let result: { [extensionId: string]: IExtensionDescription; } = {};
+				system.forEach((systemExtension) => {
+					result[systemExtension.id] = systemExtension;
+				});
+				user.forEach((userExtension) => {
+					if (result.hasOwnProperty(userExtension.id)) {
+						log.warn(userExtension.extensionLocation.fsPath, nls.localize('overwritingExtension', "Overwriting extension {0} with {1}.", result[userExtension.id].extensionLocation.fsPath, userExtension.extensionLocation.fsPath));
+					}
+					result[userExtension.id] = userExtension;
+				});
+				development.forEach(developedExtension => {
+					log.info('', nls.localize('extensionUnderDevelopment', "Loading development extension at {0}", developedExtension.extensionLocation.fsPath));
+					if (result.hasOwnProperty(developedExtension.id)) {
+						log.warn(developedExtension.extensionLocation.fsPath, nls.localize('overwritingExtension', "Overwriting extension {0} with {1}.", result[developedExtension.id].extensionLocation.fsPath, developedExtension.extensionLocation.fsPath));
+					}
+					result[developedExtension.id] = developedExtension;
+				});
+				return Object.keys(result).map(name => result[name]);
+			});
 	}
 
-	private _updateEnableProposedApi(extensions: IExtensionDescription[]): IExtensionDescription[] {
-		const enableProposedApiForAll = !this._environmentService.isBuilt || (!!this._environmentService.extensionDevelopmentPath && product.nameLong.indexOf('Insiders') >= 0);
-		const enableProposedApiFor = this._environmentService.args['enable-proposed-api'] || [];
-		for (const extension of extensions) {
-			if (!isFalsyOrEmpty(product.extensionAllowedProposedApi)
-				&& product.extensionAllowedProposedApi.indexOf(extension.id) >= 0
-			) {
-				// fast lane -> proposed api is available to all extensions
-				// that are listed in product.json-files
-				extension.enableProposedApi = true;
+	private _getRuntimeExtensions(allExtensions: IExtensionDescription[]): Promise<IExtensionDescription[]> {
+		return this._extensionEnablementService.getDisabledExtensions()
+			.then(disabledExtensions => {
 
-			} else if (extension.enableProposedApi && !extension.isBuiltin) {
-				if (
-					!enableProposedApiForAll &&
-					enableProposedApiFor.indexOf(extension.id) < 0
-				) {
-					extension.enableProposedApi = false;
-					console.error(`Extension '${extension.id} cannot use PROPOSED API (must started out of dev or enabled via --enable-proposed-api)`);
+				const result: { [extensionId: string]: IExtensionDescription; } = {};
+				const extensionsToDisable: IExtensionIdentifier[] = [];
+				const userMigratedSystemExtensions: IExtensionIdentifier[] = [{ id: BetterMergeId }];
 
-				} else {
-					// proposed api is available when developing or when an extension was explicitly
-					// spelled out via a command line argument
-					console.warn(`Extension '${extension.id}' uses PROPOSED API which is subject to change and removal without notice.`);
+				const enableProposedApiFor: string | string[] = this._environmentService.args['enable-proposed-api'] || [];
+
+				const notFound = (id: string) => nls.localize('notFound', "Extension \`{0}\` cannot use PROPOSED API as it cannot be found", id);
+
+				if (enableProposedApiFor.length) {
+					let allProposed = (enableProposedApiFor instanceof Array ? enableProposedApiFor : [enableProposedApiFor]);
+					allProposed.forEach(id => {
+						if (!allExtensions.some(description => description.id === id)) {
+							console.error(notFound(id));
+						}
+					});
 				}
+
+				const enableProposedApiForAll = !this._environmentService.isBuilt ||
+					(!!this._environmentService.extensionDevelopmentLocationURI && product.nameLong.indexOf('Insiders') >= 0) ||
+					(enableProposedApiFor.length === 0 && 'enable-proposed-api' in this._environmentService.args);
+
+				for (const extension of allExtensions) {
+					const isExtensionUnderDevelopment = this._environmentService.isExtensionDevelopment && isEqualOrParent(extension.extensionLocation, this._environmentService.extensionDevelopmentLocationURI);
+					// Do not disable extensions under development
+					if (!isExtensionUnderDevelopment) {
+						if (disabledExtensions.some(disabled => areSameExtensions(disabled, extension))) {
+							continue;
+						}
+					}
+
+					if (!extension.isBuiltin) {
+						// Check if the extension is changed to system extension
+						const userMigratedSystemExtension = userMigratedSystemExtensions.filter(userMigratedSystemExtension => areSameExtensions(userMigratedSystemExtension, { id: extension.id }))[0];
+						if (userMigratedSystemExtension) {
+							extensionsToDisable.push(userMigratedSystemExtension);
+							continue;
+						}
+					}
+					result[extension.id] = this._updateEnableProposedApi(extension, enableProposedApiForAll, enableProposedApiFor);
+				}
+				const runtimeExtensions = Object.keys(result).map(name => result[name]);
+
+				this._telemetryService.publicLog('extensionsScanned', {
+					totalCount: runtimeExtensions.length,
+					disabledCount: disabledExtensions.length
+				});
+
+				if (extensionsToDisable.length) {
+					return this.extensionManagementService.getInstalled(LocalExtensionType.User)
+						.then(installed => {
+							const toDisable = installed.filter(i => extensionsToDisable.some(e => areSameExtensions({ id: getGalleryExtensionIdFromLocal(i) }, e)));
+							return TPromise.join(toDisable.map(e => this._extensionEnablementService.setEnablement(e, EnablementState.Disabled)));
+						})
+						.then(() => {
+							this._storageService.store(BetterMergeDisabledNowKey, true);
+							return runtimeExtensions;
+						});
+				} else {
+					return runtimeExtensions;
+				}
+			});
+	}
+
+	private _updateEnableProposedApi(extension: IExtensionDescription, enableProposedApiForAll: boolean, enableProposedApiFor: string | string[]): IExtensionDescription {
+		if (!isFalsyOrEmpty(product.extensionAllowedProposedApi)
+			&& product.extensionAllowedProposedApi.indexOf(extension.id) >= 0
+		) {
+			// fast lane -> proposed api is available to all extensions
+			// that are listed in product.json-files
+			extension.enableProposedApi = true;
+
+		} else if (extension.enableProposedApi && !extension.isBuiltin) {
+			if (
+				!enableProposedApiForAll &&
+				enableProposedApiFor.indexOf(extension.id) < 0
+			) {
+				extension.enableProposedApi = false;
+				console.error(`Extension '${extension.id} cannot use PROPOSED API (must started out of dev or enabled via --enable-proposed-api)`);
+
+			} else {
+				// proposed api is available when developing or when an extension was explicitly
+				// spelled out via a command line argument
+				console.warn(`Extension '${extension.id}' uses PROPOSED API which is subject to change and removal without notice.`);
 			}
 		}
-		return extensions;
+		return extension;
 	}
 
 	private _handleExtensionPointMessage(msg: IMessage) {
@@ -629,7 +673,7 @@ export class ExtensionService extends Disposable implements IExtensionService {
 		}
 	}
 
-	private static async _validateExtensionsCache(windowService: IWindowService, notificationService: INotificationService, environmentService: IEnvironmentService, cacheKey: string, input: ExtensionScannerInput): TPromise<void> {
+	private static async _validateExtensionsCache(windowService: IWindowService, notificationService: INotificationService, environmentService: IEnvironmentService, cacheKey: string, input: ExtensionScannerInput): Promise<void> {
 		const cacheFolder = path.join(environmentService.userDataPath, MANIFEST_CACHE_FOLDER);
 		const cacheFile = path.join(cacheFolder, cacheKey);
 
@@ -664,7 +708,7 @@ export class ExtensionService extends Disposable implements IExtensionService {
 		);
 	}
 
-	private static async _readExtensionCache(environmentService: IEnvironmentService, cacheKey: string): TPromise<IExtensionCacheData> {
+	private static async _readExtensionCache(environmentService: IEnvironmentService, cacheKey: string): Promise<IExtensionCacheData> {
 		const cacheFolder = path.join(environmentService.userDataPath, MANIFEST_CACHE_FOLDER);
 		const cacheFile = path.join(cacheFolder, cacheKey);
 
@@ -678,7 +722,7 @@ export class ExtensionService extends Disposable implements IExtensionService {
 		return null;
 	}
 
-	private static async _writeExtensionCache(environmentService: IEnvironmentService, cacheKey: string, cacheContents: IExtensionCacheData): TPromise<void> {
+	private static async _writeExtensionCache(environmentService: IEnvironmentService, cacheKey: string, cacheContents: IExtensionCacheData): Promise<void> {
 		const cacheFolder = path.join(environmentService.userDataPath, MANIFEST_CACHE_FOLDER);
 		const cacheFile = path.join(cacheFolder, cacheKey);
 
@@ -695,7 +739,7 @@ export class ExtensionService extends Disposable implements IExtensionService {
 		}
 	}
 
-	private static async _scanExtensionsWithCache(windowService: IWindowService, notificationService: INotificationService, environmentService: IEnvironmentService, cacheKey: string, input: ExtensionScannerInput, log: ILog): TPromise<IExtensionDescription[]> {
+	private static async _scanExtensionsWithCache(windowService: IWindowService, notificationService: INotificationService, environmentService: IEnvironmentService, cacheKey: string, input: ExtensionScannerInput, log: ILog): Promise<IExtensionDescription[]> {
 		if (input.devMode) {
 			// Do not cache when running out of sources...
 			return ExtensionScanner.scanExtensions(input, log);
@@ -739,7 +783,7 @@ export class ExtensionService extends Disposable implements IExtensionService {
 		return result;
 	}
 
-	private static _scanInstalledExtensions(windowService: IWindowService, notificationService: INotificationService, environmentService: IEnvironmentService, log: ILog): TPromise<{ system: IExtensionDescription[], user: IExtensionDescription[], development: IExtensionDescription[] }> {
+	private static _scanInstalledExtensions(windowService: IWindowService, notificationService: INotificationService, environmentService: IEnvironmentService, extensionEnablementService: IExtensionEnablementService, log: ILog): TPromise<{ system: IExtensionDescription[], user: IExtensionDescription[], development: IExtensionDescription[] }> {
 
 		const translationConfig: TPromise<Translations> = platform.translationsConfigFile
 			? pfs.readFile(platform.translationsConfigFile, 'utf8').then((content) => {
@@ -768,10 +812,10 @@ export class ExtensionService extends Disposable implements IExtensionService {
 				log
 			);
 
-			let finalBuiltinExtensions: TPromise<IExtensionDescription[]> = builtinExtensions;
+			let finalBuiltinExtensions: TPromise<IExtensionDescription[]> = TPromise.wrap(builtinExtensions);
 
 			if (devMode) {
-				const builtInExtensionsFilePath = path.normalize(path.join(URI.parse(require.toUrl('')).fsPath, '..', 'build', 'builtInExtensions.json'));
+				const builtInExtensionsFilePath = path.normalize(path.join(getPathFromAmdModule(require, ''), '..', 'build', 'builtInExtensions.json'));
 				const builtInExtensions = pfs.readFile(builtInExtensionsFilePath, 'utf8')
 					.then<IBuiltInExtension[]>(raw => JSON.parse(raw));
 
@@ -811,7 +855,7 @@ export class ExtensionService extends Disposable implements IExtensionService {
 			}
 
 			const userExtensions = (
-				environmentService.disableExtensions || !environmentService.extensionsPath
+				extensionEnablementService.allUserExtensionsDisabled || !environmentService.extensionsPath
 					? TPromise.as([])
 					: this._scanExtensionsWithCache(
 						windowService,
@@ -824,13 +868,12 @@ export class ExtensionService extends Disposable implements IExtensionService {
 			);
 
 			// Always load developed extensions while extensions development
-			const developedExtensions = (
-				environmentService.isExtensionDevelopment
-					? ExtensionScanner.scanOneOrMultipleExtensions(
-						new ExtensionScannerInput(version, commit, locale, devMode, environmentService.extensionDevelopmentPath, false, true, translations), log
-					)
-					: TPromise.as([])
-			);
+			let developedExtensions = TPromise.as([]);
+			if (environmentService.isExtensionDevelopment && environmentService.extensionDevelopmentLocationURI.scheme === Schemas.file) {
+				developedExtensions = ExtensionScanner.scanOneOrMultipleExtensions(
+					new ExtensionScannerInput(version, commit, locale, devMode, environmentService.extensionDevelopmentLocationURI.fsPath, false, true, translations), log
+				);
+			}
 
 			return TPromise.join([finalBuiltinExtensions, userExtensions, developedExtensions]).then((extensionDescriptions: IExtensionDescription[][]) => {
 				const system = extensionDescriptions[0];
@@ -917,20 +960,60 @@ export class ExtensionService extends Disposable implements IExtensionService {
 	}
 }
 
-function asLoggingProtocol(protocol: IMessagePassingProtocol): IMessagePassingProtocol {
+const colorTables = [
+	['#2977B1', '#FC802D', '#34A13A', '#D3282F', '#9366BA'],
+	['#8B564C', '#E177C0', '#7F7F7F', '#BBBE3D', '#2EBECD']
+];
 
-	protocol.onMessage(msg => {
-		console.log('%c[Extension \u2192 Window]%c[len: ' + strings.pad(msg.length, 5, ' ') + ']', 'color: darkgreen', 'color: grey', msg);
-	});
-
-	return {
-		onMessage: protocol.onMessage,
-
-		send(msg: any) {
-			protocol.send(msg);
-			console.log('%c[Window \u2192 Extension]%c[len: ' + strings.pad(msg.length, 5, ' ') + ']', 'color: darkgreen', 'color: grey', msg);
+function prettyWithoutArrays(data: any): any {
+	if (Array.isArray(data)) {
+		return data;
+	}
+	if (data && typeof data === 'object' && typeof data.toString === 'function') {
+		let result = data.toString();
+		if (result !== '[object Object]') {
+			return result;
 		}
-	};
+	}
+	return data;
+}
+
+function pretty(data: any): any {
+	if (Array.isArray(data)) {
+		return data.map(prettyWithoutArrays);
+	}
+	return prettyWithoutArrays(data);
+}
+
+class RPCLogger implements IRPCProtocolLogger {
+
+	private _totalIncoming = 0;
+	private _totalOutgoing = 0;
+
+	private _log(direction: string, totalLength, msgLength: number, req: number, initiator: RequestInitiator, str: string, data: any): void {
+		data = pretty(data);
+
+		const colorTable = colorTables[initiator];
+		const color = LOG_USE_COLORS ? colorTable[req % colorTable.length] : '#000000';
+		let args = [`%c[${direction}]%c[${strings.pad(totalLength, 7, ' ')}]%c[len: ${strings.pad(msgLength, 5, ' ')}]%c${strings.pad(req, 5, ' ')} - ${str}`, 'color: darkgreen', 'color: grey', 'color: grey', `color: ${color}`];
+		if (/\($/.test(str)) {
+			args = args.concat(data);
+			args.push(')');
+		} else {
+			args.push(data);
+		}
+		console.log.apply(console, args);
+	}
+
+	logIncoming(msgLength: number, req: number, initiator: RequestInitiator, str: string, data?: any): void {
+		this._totalIncoming += msgLength;
+		this._log('Ext \u2192 Win', this._totalIncoming, msgLength, req, initiator, str, data);
+	}
+
+	logOutgoing(msgLength: number, req: number, initiator: RequestInitiator, str: string, data?: any): void {
+		this._totalOutgoing += msgLength;
+		this._log('Win \u2192 Ext', this._totalOutgoing, msgLength, req, initiator, str, data);
+	}
 }
 
 interface IExtensionCacheData {
diff --git a/src/vs/workbench/services/extensions/electron-browser/inactiveExtensionUrlHandler.ts b/src/vs/workbench/services/extensions/electron-browser/inactiveExtensionUrlHandler.ts
new file mode 100644
index 00000000000..ebe6207a9ee
--- /dev/null
+++ b/src/vs/workbench/services/extensions/electron-browser/inactiveExtensionUrlHandler.ts
@@ -0,0 +1,150 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { IURLService, IURLHandler } from 'vs/platform/url/common/url';
+import { URI } from 'vs/base/common/uri';
+import { TPromise } from 'vs/base/common/winjs.base';
+import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
+import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
+import { IDisposable, toDisposable, combinedDisposable } from 'vs/base/common/lifecycle';
+import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
+import { localize } from 'vs/nls';
+
+const FIVE_MINUTES = 5 * 60 * 1000;
+const THIRTY_SECONDS = 30 * 1000;
+
+function isExtensionId(value: string): boolean {
+	return /^[a-z0-9][a-z0-9\-]*\.[a-z0-9][a-z0-9\-]*$/i.test(value);
+}
+
+export const IExtensionUrlHandler = createDecorator<IExtensionUrlHandler>('inactiveExtensionUrlHandler');
+
+export interface IExtensionUrlHandler {
+	readonly _serviceBrand: any;
+	registerExtensionHandler(extensionId: string, handler: IURLHandler): void;
+	unregisterExtensionHandler(extensionId: string): void;
+}
+
+/**
+ * This class handles URLs which are directed towards inactive extensions.
+ * If a URL is directed towards an inactive extension, it buffers it,
+ * activates the extension and re-opens the URL once the extension registers
+ * a URL handler. If the extension never registers a URL handler, the urls
+ * will eventually be garbage collected.
+ *
+ * It also makes sure the user confirms opening URLs directed towards extensions.
+ */
+export class ExtensionUrlHandler implements IExtensionUrlHandler, IURLHandler {
+
+	readonly _serviceBrand: any;
+
+	private extensionHandlers = new Map<string, IURLHandler>();
+	private uriBuffer = new Map<string, { timestamp: number, uri: URI }[]>();
+	private disposable: IDisposable;
+
+	constructor(
+		@IURLService urlService: IURLService,
+		@IExtensionService private extensionService: IExtensionService,
+		@IDialogService private dialogService: IDialogService
+	) {
+		const interval = setInterval(() => this.garbageCollect(), THIRTY_SECONDS);
+
+		this.disposable = combinedDisposable([
+			urlService.registerHandler(this),
+			toDisposable(() => clearInterval(interval))
+		]);
+	}
+
+	handleURL(uri: URI): TPromise<boolean> {
+		if (!isExtensionId(uri.authority)) {
+			return TPromise.as(false);
+		}
+
+		const extensionId = uri.authority;
+		const wasHandlerAvailable = this.extensionHandlers.has(extensionId);
+
+		return this.extensionService.getExtensions().then(extensions => {
+			const extension = extensions.filter(e => e.id === extensionId)[0];
+
+			if (!extension) {
+				return TPromise.as(false);
+			}
+
+			return this.dialogService.confirm({
+				message: localize('confirmUrl', "Allow an extension to open this URL?", extensionId),
+				detail: `${extension.displayName || extension.name} (${extensionId}) wants to open a URL:\n\n${uri.toString()}`
+			}).then(result => {
+
+				if (!result.confirmed) {
+					return TPromise.as(true);
+				}
+
+				const handler = this.extensionHandlers.get(extensionId);
+				if (handler) {
+					if (!wasHandlerAvailable) {
+						// forward it directly
+						return handler.handleURL(uri);
+					}
+
+					// let the ExtensionUrlHandler instance handle this
+					return TPromise.as(false);
+				}
+
+				// collect URI for eventual extension activation
+				const timestamp = new Date().getTime();
+				let uris = this.uriBuffer.get(extensionId);
+
+				if (!uris) {
+					uris = [];
+					this.uriBuffer.set(extensionId, uris);
+				}
+
+				uris.push({ timestamp, uri });
+
+				// activate the extension
+				return this.extensionService.activateByEvent(`onUri:${extensionId}`)
+					.then(() => true);
+			});
+		});
+	}
+
+	registerExtensionHandler(extensionId: string, handler: IURLHandler): void {
+		this.extensionHandlers.set(extensionId, handler);
+
+		const uris = this.uriBuffer.get(extensionId) || [];
+
+		for (const { uri } of uris) {
+			handler.handleURL(uri);
+		}
+
+		this.uriBuffer.delete(extensionId);
+	}
+
+	unregisterExtensionHandler(extensionId: string): void {
+		this.extensionHandlers.delete(extensionId);
+	}
+
+	// forget about all uris buffered more than 5 minutes ago
+	private garbageCollect(): void {
+		const now = new Date().getTime();
+		const uriBuffer = new Map<string, { timestamp: number, uri: URI }[]>();
+
+		this.uriBuffer.forEach((uris, extensionId) => {
+			uris = uris.filter(({ timestamp }) => now - timestamp < FIVE_MINUTES);
+
+			if (uris.length > 0) {
+				uriBuffer.set(extensionId, uris);
+			}
+		});
+
+		this.uriBuffer = uriBuffer;
+	}
+
+	dispose(): void {
+		this.disposable.dispose();
+		this.extensionHandlers.clear();
+		this.uriBuffer.clear();
+	}
+}
\ No newline at end of file
diff --git a/src/vs/workbench/services/extensions/node/extensionManagementServerService.ts b/src/vs/workbench/services/extensions/node/extensionManagementServerService.ts
new file mode 100644
index 00000000000..87bfffa3579
--- /dev/null
+++ b/src/vs/workbench/services/extensions/node/extensionManagementServerService.ts
@@ -0,0 +1,54 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { IExtensionManagementService, IExtensionManagementServerService, IExtensionManagementServer } from 'vs/platform/extensionManagement/common/extensionManagement';
+import { URI } from 'vs/base/common/uri';
+import { Schemas } from 'vs/base/common/network';
+import { localize } from 'vs/nls';
+
+const localExtensionManagementServerAuthority: string = 'vscode-local';
+
+export class ExtensionManagementServerService implements IExtensionManagementServerService {
+
+	_serviceBrand: any;
+
+	readonly extensionManagementServers: IExtensionManagementServer[];
+
+	constructor(
+		localExtensionManagementService: IExtensionManagementService
+	) {
+		this.extensionManagementServers = [{ extensionManagementService: localExtensionManagementService, authority: localExtensionManagementServerAuthority, label: localize('local', "Local") }];
+	}
+
+	getExtensionManagementServer(location: URI): IExtensionManagementServer {
+		return this.extensionManagementServers[0];
+	}
+
+	getLocalExtensionManagementServer(): IExtensionManagementServer {
+		return this.extensionManagementServers[0];
+	}
+}
+
+export class SingleServerExtensionManagementServerService implements IExtensionManagementServerService {
+
+	_serviceBrand: any;
+
+	readonly extensionManagementServers: IExtensionManagementServer[];
+
+	constructor(
+		extensionManagementServer: IExtensionManagementServer
+	) {
+		this.extensionManagementServers = [extensionManagementServer];
+	}
+
+	getExtensionManagementServer(location: URI): IExtensionManagementServer {
+		const authority = location.scheme === Schemas.file ? localExtensionManagementServerAuthority : location.authority;
+		return this.extensionManagementServers.filter(server => authority === server.authority)[0];
+	}
+
+	getLocalExtensionManagementServer(): IExtensionManagementServer {
+		return this.extensionManagementServers[0];
+	}
+}
\ No newline at end of file
diff --git a/src/vs/workbench/services/extensions/node/extensionPoints.ts b/src/vs/workbench/services/extensions/node/extensionPoints.ts
index 8de75c2f9a6..4dba0393dcb 100644
--- a/src/vs/workbench/services/extensions/node/extensionPoints.ts
+++ b/src/vs/workbench/services/extensions/node/extensionPoints.ts
@@ -17,7 +17,7 @@ import * as semver from 'semver';
 import { getIdAndVersionFromLocalExtensionId } from 'vs/platform/extensionManagement/node/extensionManagementUtil';
 import { getParseErrorMessage } from 'vs/base/common/jsonErrorMessages';
 import { groupByExtension, getGalleryExtensionId, getLocalExtensionId } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 
 const MANIFEST_FILE = 'package.json';
 
@@ -208,7 +208,7 @@ class ExtensionManifestNLSReplacer extends ExtensionManifestHandler {
 	 * Parses original message bundle, returns null if the original message bundle is null.
 	 */
 	private static resolveOriginalMessageBundle(originalMessageBundle: string, errors: json.ParseError[]) {
-		return new TPromise<{ [key: string]: string; }>((c, e, p) => {
+		return new TPromise<{ [key: string]: string; }>((c, e) => {
 			if (originalMessageBundle) {
 				pfs.readFile(originalMessageBundle).then(originalBundleContent => {
 					c(json.parse(originalBundleContent.toString(), errors));
@@ -226,7 +226,7 @@ class ExtensionManifestNLSReplacer extends ExtensionManifestHandler {
 	 * If the localized file is not present, returns null for the original and marks original as localized.
 	 */
 	private static findMessageBundles(nlsConfig: NlsConfiguration, basename: string): TPromise<{ localized: string, original: string }> {
-		return new TPromise<{ localized: string, original: string }>((c, e, p) => {
+		return new TPromise<{ localized: string, original: string }>((c, e) => {
 			function loop(basename: string, locale: string): void {
 				let toCheck = `${basename}.nls.${locale}.json`;
 				pfs.fileExists(toCheck).then(exists => {
@@ -524,7 +524,7 @@ export class ExtensionScanner {
 	/**
 	 * Scan a list of extensions defined in `absoluteFolderPath`
 	 */
-	public static async scanExtensions(input: ExtensionScannerInput, log: ILog, resolver: IExtensionResolver = null): TPromise<IExtensionDescription[]> {
+	public static async scanExtensions(input: ExtensionScannerInput, log: ILog, resolver: IExtensionResolver = null): Promise<IExtensionDescription[]> {
 		const absoluteFolderPath = input.absoluteFolderPath;
 		const isBuiltin = input.isBuiltin;
 		const isUnderDevelopment = input.isUnderDevelopment;
@@ -615,4 +615,4 @@ export class ExtensionScanner {
 			return [];
 		});
 	}
-}
+}
\ No newline at end of file
diff --git a/src/vs/workbench/services/extensions/node/lazyPromise.ts b/src/vs/workbench/services/extensions/node/lazyPromise.ts
index 2b096574133..da83c8f4964 100644
--- a/src/vs/workbench/services/extensions/node/lazyPromise.ts
+++ b/src/vs/workbench/services/extensions/node/lazyPromise.ts
@@ -7,9 +7,7 @@
 import { TPromise, ValueCallback, ErrorCallback } from 'vs/base/common/winjs.base';
 import { onUnexpectedError } from 'vs/base/common/errors';
 
-export class LazyPromise implements TPromise<any> {
-
-	private _onCancel: () => void;
+export class LazyPromise implements Thenable<any> {
 
 	private _actual: TPromise<any>;
 	private _actualOk: ValueCallback;
@@ -21,10 +19,7 @@ export class LazyPromise implements TPromise<any> {
 	private _hasErr: boolean;
 	private _err: any;
 
-	private _isCanceled: boolean;
-
-	constructor(onCancel: () => void) {
-		this._onCancel = onCancel;
+	constructor() {
 		this._actual = null;
 		this._actualOk = null;
 		this._actualErr = null;
@@ -32,7 +27,6 @@ export class LazyPromise implements TPromise<any> {
 		this._value = null;
 		this._hasErr = false;
 		this._err = null;
-		this._isCanceled = false;
 	}
 
 	private _ensureActual(): TPromise<any> {
@@ -40,7 +34,7 @@ export class LazyPromise implements TPromise<any> {
 			this._actual = new TPromise<any>((c, e) => {
 				this._actualOk = c;
 				this._actualErr = e;
-			}, this._onCancel);
+			});
 
 			if (this._hasValue) {
 				this._actualOk(this._value);
@@ -54,7 +48,7 @@ export class LazyPromise implements TPromise<any> {
 	}
 
 	public resolveOk(value: any): void {
-		if (this._isCanceled || this._hasErr) {
+		if (this._hasValue || this._hasErr) {
 			return;
 		}
 
@@ -67,7 +61,7 @@ export class LazyPromise implements TPromise<any> {
 	}
 
 	public resolveErr(err: any): void {
-		if (this._isCanceled || this._hasValue) {
+		if (this._hasValue || this._hasErr) {
 			return;
 		}
 
@@ -84,32 +78,6 @@ export class LazyPromise implements TPromise<any> {
 	}
 
 	public then(success: any, error: any): any {
-		if (this._isCanceled) {
-			return;
-		}
-
 		return this._ensureActual().then(success, error);
 	}
-
-	public done(success: any, error: any): void {
-		if (this._isCanceled) {
-			return;
-		}
-
-		this._ensureActual().done(success, error);
-	}
-
-	public cancel(): void {
-		if (this._hasValue || this._hasErr) {
-			return;
-		}
-
-		this._isCanceled = true;
-
-		if (this._actual) {
-			this._actual.cancel();
-		} else {
-			this._onCancel();
-		}
-	}
 }
diff --git a/src/vs/workbench/services/extensions/node/proxyIdentifier.ts b/src/vs/workbench/services/extensions/node/proxyIdentifier.ts
index 3447bd4255f..f088c3b1f06 100644
--- a/src/vs/workbench/services/extensions/node/proxyIdentifier.ts
+++ b/src/vs/workbench/services/extensions/node/proxyIdentifier.ts
@@ -22,27 +22,35 @@ export interface IRPCProtocol {
 }
 
 export class ProxyIdentifier<T> {
+	public static count = 0;
 	_proxyIdentifierBrand: void;
 	_suppressCompilerUnusedWarning: T;
 
 	public readonly isMain: boolean;
-	public readonly id: string;
+	public readonly sid: string;
+	public readonly nid: number;
 
-	constructor(isMain: boolean, id: string) {
+	constructor(isMain: boolean, sid: string) {
 		this.isMain = isMain;
-		this.id = id;
+		this.sid = sid;
+		this.nid = (++ProxyIdentifier.count);
 	}
 }
 
-/**
- * Using `isFancy` indicates that arguments or results of type `URI` or `RegExp`
- * will be serialized/deserialized automatically, but this has a performance cost,
- * as each argument/result must be visited.
- */
+const identifiers: ProxyIdentifier<any>[] = [];
+
 export function createMainContextProxyIdentifier<T>(identifier: string): ProxyIdentifier<T> {
-	return new ProxyIdentifier(true, 'm' + identifier);
+	const result = new ProxyIdentifier<T>(true, identifier);
+	identifiers[result.nid] = result;
+	return result;
 }
 
 export function createExtHostContextProxyIdentifier<T>(identifier: string): ProxyIdentifier<T> {
-	return new ProxyIdentifier(false, 'e' + identifier);
+	const result = new ProxyIdentifier<T>(false, identifier);
+	identifiers[result.nid] = result;
+	return result;
+}
+
+export function getStringIdentifierForProxy(nid: number): string {
+	return identifiers[nid].sid;
 }
diff --git a/src/vs/workbench/services/extensions/node/rpcProtocol.ts b/src/vs/workbench/services/extensions/node/rpcProtocol.ts
index f3878f3cac8..4ad109079ba 100644
--- a/src/vs/workbench/services/extensions/node/rpcProtocol.ts
+++ b/src/vs/workbench/services/extensions/node/rpcProtocol.ts
@@ -6,20 +6,17 @@
 
 import { TPromise } from 'vs/base/common/winjs.base';
 import * as errors from 'vs/base/common/errors';
-import { IMessagePassingProtocol } from 'vs/base/parts/ipc/common/ipc';
+import { IMessagePassingProtocol } from 'vs/base/parts/ipc/node/ipc';
 import { LazyPromise } from 'vs/workbench/services/extensions/node/lazyPromise';
-import { ProxyIdentifier, IRPCProtocol } from 'vs/workbench/services/extensions/node/proxyIdentifier';
+import { ProxyIdentifier, IRPCProtocol, getStringIdentifierForProxy } from 'vs/workbench/services/extensions/node/proxyIdentifier';
 import { CharCode } from 'vs/base/common/charCode';
-import URI, { UriComponents } from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { MarshalledObject } from 'vs/base/common/marshalling';
+import { IURITransformer } from 'vs/base/common/uriIpc';
+import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
 
 declare var Proxy: any; // TODO@TypeScript
 
-export interface IURITransformer {
-	transformIncoming(uri: UriComponents): UriComponents;
-	transformOutgoing(uri: URI): URI;
-}
-
 function _transformOutgoingURIs(obj: any, transformer: IURITransformer, depth: number): any {
 
 	if (!obj || depth > 200) {
@@ -45,7 +42,7 @@ function _transformOutgoingURIs(obj: any, transformer: IURITransformer, depth: n
 	return null;
 }
 
-function transformOutgoingURIs(obj: any, transformer: IURITransformer): any {
+export function transformOutgoingURIs(obj: any, transformer: IURITransformer): any {
 	const result = _transformOutgoingURIs(obj, transformer, 0);
 	if (result === null) {
 		// no change
@@ -89,26 +86,45 @@ function transformIncomingURIs(obj: any, transformer: IURITransformer): any {
 	return result;
 }
 
+export const enum RequestInitiator {
+	LocalSide = 0,
+	OtherSide = 1
+}
+
+export interface IRPCProtocolLogger {
+	logIncoming(msgLength: number, req: number, initiator: RequestInitiator, str: string, data?: any): void;
+	logOutgoing(msgLength: number, req: number, initiator: RequestInitiator, str: string, data?: any): void;
+}
+
+const noop = () => { };
+
 export class RPCProtocol implements IRPCProtocol {
 
+	private readonly _protocol: IMessagePassingProtocol;
+	private readonly _logger: IRPCProtocolLogger;
 	private readonly _uriTransformer: IURITransformer;
 	private _isDisposed: boolean;
-	private readonly _locals: { [id: string]: any; };
-	private readonly _proxies: { [id: string]: any; };
+	private readonly _locals: any[];
+	private readonly _proxies: any[];
 	private _lastMessageId: number;
-	private readonly _invokedHandlers: { [req: string]: TPromise<any>; };
+	private readonly _cancelInvokedHandlers: { [req: string]: () => void; };
 	private readonly _pendingRPCReplies: { [msgId: string]: LazyPromise; };
-	private readonly _multiplexor: RPCMultiplexer;
 
-	constructor(protocol: IMessagePassingProtocol, transformer: IURITransformer = null) {
+	constructor(protocol: IMessagePassingProtocol, logger: IRPCProtocolLogger = null, transformer: IURITransformer = null) {
+		this._protocol = protocol;
+		this._logger = logger;
 		this._uriTransformer = transformer;
 		this._isDisposed = false;
-		this._locals = Object.create(null);
-		this._proxies = Object.create(null);
+		this._locals = [];
+		this._proxies = [];
+		for (let i = 0, len = ProxyIdentifier.count; i < len; i++) {
+			this._locals[i] = null;
+			this._proxies[i] = null;
+		}
 		this._lastMessageId = 0;
-		this._invokedHandlers = Object.create(null);
+		this._cancelInvokedHandlers = Object.create(null);
 		this._pendingRPCReplies = {};
-		this._multiplexor = new RPCMultiplexer(protocol, (msg) => this._receiveOneMessage(msg));
+		this._protocol.onMessage((msg) => this._receiveOneMessage(msg));
 	}
 
 	public dispose(): void {
@@ -129,18 +145,19 @@ export class RPCProtocol implements IRPCProtocol {
 	}
 
 	public getProxy<T>(identifier: ProxyIdentifier<T>): T {
-		if (!this._proxies[identifier.id]) {
-			this._proxies[identifier.id] = this._createProxy(identifier.id);
+		const rpcId = identifier.nid;
+		if (!this._proxies[rpcId]) {
+			this._proxies[rpcId] = this._createProxy(rpcId);
 		}
-		return this._proxies[identifier.id];
+		return this._proxies[rpcId];
 	}
 
-	private _createProxy<T>(proxyId: string): T {
+	private _createProxy<T>(rpcId: number): T {
 		let handler = {
 			get: (target: any, name: string) => {
 				if (!target[name] && name.charCodeAt(0) === CharCode.DollarSign) {
 					target[name] = (...myArgs: any[]) => {
-						return this._remoteCall(proxyId, name, myArgs);
+						return this._remoteCall(rpcId, name, myArgs);
 					};
 				}
 				return target[name];
@@ -150,72 +167,140 @@ export class RPCProtocol implements IRPCProtocol {
 	}
 
 	public set<T, R extends T>(identifier: ProxyIdentifier<T>, value: R): R {
-		this._locals[identifier.id] = value;
+		this._locals[identifier.nid] = value;
 		return value;
 	}
 
 	public assertRegistered(identifiers: ProxyIdentifier<any>[]): void {
 		for (let i = 0, len = identifiers.length; i < len; i++) {
 			const identifier = identifiers[i];
-			if (!this._locals[identifier.id]) {
-				throw new Error(`Missing actor ${identifier.id} (isMain: ${identifier.isMain})`);
+			if (!this._locals[identifier.nid]) {
+				throw new Error(`Missing actor ${identifier.sid} (isMain: ${identifier.isMain})`);
 			}
 		}
 	}
 
-	private _receiveOneMessage(rawmsg: string): void {
+	private _receiveOneMessage(rawmsg: Buffer): void {
 		if (this._isDisposed) {
 			return;
 		}
 
-		let msg = <RPCMessage>JSON.parse(rawmsg);
-		if (this._uriTransformer) {
-			msg = transformIncomingURIs(msg, this._uriTransformer);
-		}
+		const msgLength = rawmsg.length;
+		const buff = MessageBuffer.read(rawmsg, 0);
+		const messageType = <MessageType>buff.readUInt8();
+		const req = buff.readUInt32();
 
-		switch (msg.type) {
-			case MessageType.Request:
-				this._receiveRequest(msg);
+		switch (messageType) {
+			case MessageType.RequestJSONArgs:
+			case MessageType.RequestJSONArgsWithCancellation: {
+				let { rpcId, method, args } = MessageIO.deserializeRequestJSONArgs(buff);
+				if (this._uriTransformer) {
+					args = transformIncomingURIs(args, this._uriTransformer);
+				}
+				this._receiveRequest(msgLength, req, rpcId, method, args, (messageType === MessageType.RequestJSONArgsWithCancellation));
 				break;
-			case MessageType.Cancel:
-				this._receiveCancel(msg);
+			}
+			case MessageType.RequestMixedArgs:
+			case MessageType.RequestMixedArgsWithCancellation: {
+				let { rpcId, method, args } = MessageIO.deserializeRequestMixedArgs(buff);
+				if (this._uriTransformer) {
+					args = transformIncomingURIs(args, this._uriTransformer);
+				}
+				this._receiveRequest(msgLength, req, rpcId, method, args, (messageType === MessageType.RequestMixedArgsWithCancellation));
 				break;
-			case MessageType.Reply:
-				this._receiveReply(msg);
+			}
+			case MessageType.Cancel: {
+				this._receiveCancel(msgLength, req);
 				break;
-			case MessageType.ReplyErr:
-				this._receiveReplyErr(msg);
+			}
+			case MessageType.ReplyOKEmpty: {
+				this._receiveReply(msgLength, req, undefined);
 				break;
+			}
+			case MessageType.ReplyOKJSON: {
+				let value = MessageIO.deserializeReplyOKJSON(buff);
+				if (this._uriTransformer) {
+					value = transformIncomingURIs(value, this._uriTransformer);
+				}
+				this._receiveReply(msgLength, req, value);
+				break;
+			}
+			case MessageType.ReplyOKBuffer: {
+				let value = MessageIO.deserializeReplyOKBuffer(buff);
+				this._receiveReply(msgLength, req, value);
+				break;
+			}
+			case MessageType.ReplyErrError: {
+				let err = MessageIO.deserializeReplyErrError(buff);
+				if (this._uriTransformer) {
+					err = transformIncomingURIs(err, this._uriTransformer);
+				}
+				this._receiveReplyErr(msgLength, req, err);
+				break;
+			}
+			case MessageType.ReplyErrEmpty: {
+				this._receiveReplyErr(msgLength, req, undefined);
+				break;
+			}
 		}
 	}
 
-	private _receiveRequest(msg: RequestMessage): void {
-		const callId = msg.id;
-		const proxyId = msg.proxyId;
+	private _receiveRequest(msgLength: number, req: number, rpcId: number, method: string, args: any[], usesCancellationToken: boolean): void {
+		if (this._logger) {
+			this._logger.logIncoming(msgLength, req, RequestInitiator.OtherSide, `receiveRequest ${getStringIdentifierForProxy(rpcId)}.${method}(`, args);
+		}
+		const callId = String(req);
 
-		this._invokedHandlers[callId] = this._invokeHandler(proxyId, msg.method, msg.args);
+		let promise: Thenable<any>;
+		let cancel: () => void;
+		if (usesCancellationToken) {
+			const cancellationTokenSource = new CancellationTokenSource();
+			args.push(cancellationTokenSource.token);
+			promise = this._invokeHandler(rpcId, method, args);
+			cancel = () => cancellationTokenSource.cancel();
+		} else {
+			// cannot be cancelled
+			promise = this._invokeHandler(rpcId, method, args);
+			cancel = noop;
+		}
 
-		this._invokedHandlers[callId].then((r) => {
-			delete this._invokedHandlers[callId];
+		this._cancelInvokedHandlers[callId] = cancel;
+
+		promise.then((r) => {
+			delete this._cancelInvokedHandlers[callId];
 			if (this._uriTransformer) {
 				r = transformOutgoingURIs(r, this._uriTransformer);
 			}
-			this._multiplexor.send(MessageFactory.replyOK(callId, r));
+			const msg = MessageIO.serializeReplyOK(req, r);
+			if (this._logger) {
+				this._logger.logOutgoing(msg.byteLength, req, RequestInitiator.OtherSide, `reply:`, r);
+			}
+			this._protocol.send(msg);
 		}, (err) => {
-			delete this._invokedHandlers[callId];
-			this._multiplexor.send(MessageFactory.replyErr(callId, err));
+			delete this._cancelInvokedHandlers[callId];
+			const msg = MessageIO.serializeReplyErr(req, err);
+			if (this._logger) {
+				this._logger.logOutgoing(msg.byteLength, req, RequestInitiator.OtherSide, `replyErr:`, err);
+			}
+			this._protocol.send(msg);
 		});
 	}
 
-	private _receiveCancel(msg: CancelMessage): void {
-		const callId = msg.id;
-		if (this._invokedHandlers[callId]) {
-			this._invokedHandlers[callId].cancel();
+	private _receiveCancel(msgLength: number, req: number): void {
+		if (this._logger) {
+			this._logger.logIncoming(msgLength, req, RequestInitiator.OtherSide, `receiveCancel`);
+		}
+		const callId = String(req);
+		if (this._cancelInvokedHandlers[callId]) {
+			this._cancelInvokedHandlers[callId]();
 		}
 	}
 
-	private _receiveReply(msg: ReplyMessage): void {
-		const callId = msg.id;
+	private _receiveReply(msgLength: number, req: number, value: any): void {
+		if (this._logger) {
+			this._logger.logIncoming(msgLength, req, RequestInitiator.LocalSide, `receiveReply:`, value);
+		}
+		const callId = String(req);
 		if (!this._pendingRPCReplies.hasOwnProperty(callId)) {
 			return;
 		}
@@ -223,11 +308,15 @@ export class RPCProtocol implements IRPCProtocol {
 		const pendingReply = this._pendingRPCReplies[callId];
 		delete this._pendingRPCReplies[callId];
 
-		pendingReply.resolveOk(msg.res);
+		pendingReply.resolveOk(value);
 	}
 
-	private _receiveReplyErr(msg: ReplyErrMessage): void {
-		const callId = msg.id;
+	private _receiveReplyErr(msgLength: number, req: number, value: any): void {
+		if (this._logger) {
+			this._logger.logIncoming(msgLength, req, RequestInitiator.LocalSide, `receiveReplyErr:`, value);
+		}
+
+		const callId = String(req);
 		if (!this._pendingRPCReplies.hasOwnProperty(callId)) {
 			return;
 		}
@@ -236,144 +325,398 @@ export class RPCProtocol implements IRPCProtocol {
 		delete this._pendingRPCReplies[callId];
 
 		let err: Error = null;
-		if (msg.err && msg.err.$isError) {
+		if (value && value.$isError) {
 			err = new Error();
-			err.name = msg.err.name;
-			err.message = msg.err.message;
-			err.stack = msg.err.stack;
+			err.name = value.name;
+			err.message = value.message;
+			err.stack = value.stack;
 		}
 		pendingReply.resolveErr(err);
 	}
 
-	private _invokeHandler(proxyId: string, methodName: string, args: any[]): TPromise<any> {
+	private _invokeHandler(rpcId: number, methodName: string, args: any[]): Thenable<any> {
 		try {
-			return TPromise.as(this._doInvokeHandler(proxyId, methodName, args));
+			return TPromise.as(this._doInvokeHandler(rpcId, methodName, args));
 		} catch (err) {
 			return TPromise.wrapError(err);
 		}
 	}
 
-	private _doInvokeHandler(proxyId: string, methodName: string, args: any[]): any {
-		if (!this._locals[proxyId]) {
-			throw new Error('Unknown actor ' + proxyId);
+	private _doInvokeHandler(rpcId: number, methodName: string, args: any[]): any {
+		const actor = this._locals[rpcId];
+		if (!actor) {
+			throw new Error('Unknown actor ' + getStringIdentifierForProxy(rpcId));
 		}
-		let actor = this._locals[proxyId];
 		let method = actor[methodName];
 		if (typeof method !== 'function') {
-			throw new Error('Unknown method ' + methodName + ' on actor ' + proxyId);
+			throw new Error('Unknown method ' + methodName + ' on actor ' + getStringIdentifierForProxy(rpcId));
 		}
 		return method.apply(actor, args);
 	}
 
-	private _remoteCall(proxyId: string, methodName: string, args: any[]): TPromise<any> {
+	private _remoteCall(rpcId: number, methodName: string, args: any[]): Thenable<any> {
 		if (this._isDisposed) {
 			return TPromise.wrapError<any>(errors.canceled());
 		}
+		let cancellationToken: CancellationToken = null;
+		if (args.length > 0 && CancellationToken.isCancellationToken(args[args.length - 1])) {
+			cancellationToken = args.pop();
+		}
 
-		const callId = String(++this._lastMessageId);
-		const result = new LazyPromise(() => {
-			this._multiplexor.send(MessageFactory.cancel(callId));
-		});
+		if (cancellationToken && cancellationToken.isCancellationRequested) {
+			// No need to do anything...
+			return TPromise.wrapError<any>(errors.canceled());
+		}
+
+		const req = ++this._lastMessageId;
+		const callId = String(req);
+		const result = new LazyPromise();
+
+		if (cancellationToken) {
+			cancellationToken.onCancellationRequested(() => {
+				const msg = MessageIO.serializeCancel(req);
+				if (this._logger) {
+					this._logger.logOutgoing(msg.byteLength, req, RequestInitiator.LocalSide, `cancel`);
+				}
+				this._protocol.send(MessageIO.serializeCancel(req));
+			});
+		}
 
 		this._pendingRPCReplies[callId] = result;
 		if (this._uriTransformer) {
 			args = transformOutgoingURIs(args, this._uriTransformer);
 		}
-		this._multiplexor.send(MessageFactory.request(callId, proxyId, methodName, args));
+		const msg = MessageIO.serializeRequest(req, rpcId, methodName, args, !!cancellationToken);
+		if (this._logger) {
+			this._logger.logOutgoing(msg.byteLength, req, RequestInitiator.LocalSide, `request: ${getStringIdentifierForProxy(rpcId)}.${methodName}(`, args);
+		}
+		this._protocol.send(msg);
 		return result;
 	}
 }
 
-/**
- * Sends/Receives multiple messages in one go:
- *  - multiple messages to be sent from one stack get sent in bulk at `process.nextTick`.
- *  - each incoming message is handled in a separate `process.nextTick`.
- */
-class RPCMultiplexer {
+class MessageBuffer {
 
-	private readonly _protocol: IMessagePassingProtocol;
-	private readonly _sendAccumulatedBound: () => void;
+	public static alloc(type: MessageType, req: number, messageSize: number): MessageBuffer {
+		let result = new MessageBuffer(Buffer.allocUnsafe(messageSize + 1 /* type */ + 4 /* req */), 0);
+		result.writeUInt8(type);
+		result.writeUInt32(req);
+		return result;
+	}
 
-	private _messagesToSend: string[];
+	public static read(buff: Buffer, offset: number): MessageBuffer {
+		return new MessageBuffer(buff, offset);
+	}
 
-	constructor(protocol: IMessagePassingProtocol, onMessage: (msg: string) => void) {
-		this._protocol = protocol;
-		this._sendAccumulatedBound = this._sendAccumulated.bind(this);
+	private _buff: Buffer;
+	private _offset: number;
 
-		this._messagesToSend = [];
+	public get buffer(): Buffer {
+		return this._buff;
+	}
 
-		this._protocol.onMessage(data => {
-			for (let i = 0, len = data.length; i < len; i++) {
-				onMessage(data[i]);
+	private constructor(buff: Buffer, offset: number) {
+		this._buff = buff;
+		this._offset = offset;
+	}
+
+	public static sizeUInt8(): number {
+		return 1;
+	}
+
+	public writeUInt8(n: number): void {
+		this._buff.writeUInt8(n, this._offset, true); this._offset += 1;
+	}
+
+	public readUInt8(): number {
+		const n = this._buff.readUInt8(this._offset, true); this._offset += 1;
+		return n;
+	}
+
+	public writeUInt32(n: number): void {
+		this._buff.writeUInt32BE(n, this._offset, true); this._offset += 4;
+	}
+
+	public readUInt32(): number {
+		const n = this._buff.readUInt32BE(this._offset, true); this._offset += 4;
+		return n;
+	}
+
+	public static sizeShortString(str: string, strByteLength: number): number {
+		return 1 /* string length */ + strByteLength /* actual string */;
+	}
+
+	public writeShortString(str: string, strByteLength: number): void {
+		this._buff.writeUInt8(strByteLength, this._offset, true); this._offset += 1;
+		this._buff.write(str, this._offset, strByteLength, 'utf8'); this._offset += strByteLength;
+	}
+
+	public readShortString(): string {
+		const strLength = this._buff.readUInt8(this._offset, true); this._offset += 1;
+		const str = this._buff.toString('utf8', this._offset, this._offset + strLength); this._offset += strLength;
+		return str;
+	}
+
+	public static sizeLongString(str: string, strByteLength: number): number {
+		return 4 /* string length */ + strByteLength /* actual string */;
+	}
+
+	public writeLongString(str: string, strByteLength: number): void {
+		this._buff.writeUInt32LE(strByteLength, this._offset, true); this._offset += 4;
+		this._buff.write(str, this._offset, strByteLength, 'utf8'); this._offset += strByteLength;
+	}
+
+	public readLongString(): string {
+		const strLength = this._buff.readUInt32LE(this._offset, true); this._offset += 4;
+		const str = this._buff.toString('utf8', this._offset, this._offset + strLength); this._offset += strLength;
+		return str;
+	}
+
+	public static sizeBuffer(buff: Buffer, buffByteLength: number): number {
+		return 4 /* buffer length */ + buffByteLength /* actual buffer */;
+	}
+
+	public writeBuffer(buff: Buffer, buffByteLength: number): void {
+		this._buff.writeUInt32LE(buffByteLength, this._offset, true); this._offset += 4;
+		buff.copy(this._buff, this._offset); this._offset += buffByteLength;
+	}
+
+	public readBuffer(): Buffer {
+		const buffLength = this._buff.readUInt32LE(this._offset, true); this._offset += 4;
+		const buff = this._buff.slice(this._offset, this._offset + buffLength); this._offset += buffLength;
+		return buff;
+	}
+
+	public static sizeMixedArray(arr: (string | Buffer)[], arrLengths: number[]): number {
+		let size = 0;
+		size += 1; // arr length
+		for (let i = 0, len = arr.length; i < len; i++) {
+			const el = arr[i];
+			const elLength = arrLengths[i];
+			size += 1; // arg type
+			if (typeof el === 'string') {
+				size += this.sizeLongString(el, elLength);
+			} else {
+				size += this.sizeBuffer(el, elLength);
 			}
-		});
-	}
-
-	private _sendAccumulated(): void {
-		const tmp = this._messagesToSend;
-		this._messagesToSend = [];
-		this._protocol.send(tmp);
-	}
-
-	public send(msg: string): void {
-		if (this._messagesToSend.length === 0) {
-			process.nextTick(this._sendAccumulatedBound);
 		}
-		this._messagesToSend.push(msg);
+		return size;
+	}
+
+	public writeMixedArray(arr: (string | Buffer)[], arrLengths: number[]): void {
+		this._buff.writeUInt8(arr.length, this._offset, true); this._offset += 1;
+		for (let i = 0, len = arr.length; i < len; i++) {
+			const el = arr[i];
+			const elLength = arrLengths[i];
+			if (typeof el === 'string') {
+				this.writeUInt8(ArgType.String);
+				this.writeLongString(el, elLength);
+			} else {
+				this.writeUInt8(ArgType.Buffer);
+				this.writeBuffer(el, elLength);
+			}
+		}
+	}
+
+	public readMixedArray(): (string | Buffer)[] {
+		const arrLen = this._buff.readUInt8(this._offset, true); this._offset += 1;
+		let arr: (string | Buffer)[] = new Array(arrLen);
+		for (let i = 0; i < arrLen; i++) {
+			const argType = <ArgType>this.readUInt8();
+			if (argType === ArgType.String) {
+				arr[i] = this.readLongString();
+			} else {
+				arr[i] = this.readBuffer();
+			}
+		}
+		return arr;
 	}
 }
 
-class MessageFactory {
-	public static cancel(req: string): string {
-		return `{"type":${MessageType.Cancel},"id":"${req}"}`;
+class MessageIO {
+
+	private static _arrayContainsBuffer(arr: any[]): boolean {
+		for (let i = 0, len = arr.length; i < len; i++) {
+			if (Buffer.isBuffer(arr[i])) {
+				return true;
+			}
+		}
+		return false;
 	}
 
-	public static request(req: string, rpcId: string, method: string, args: any[]): string {
-		return `{"type":${MessageType.Request},"id":"${req}","proxyId":"${rpcId}","method":"${method}","args":${JSON.stringify(args)}}`;
+	public static serializeRequest(req: number, rpcId: number, method: string, args: any[], usesCancellationToken: boolean): Buffer {
+		if (this._arrayContainsBuffer(args)) {
+			let massagedArgs: (string | Buffer)[] = new Array(args.length);
+			let argsLengths: number[] = new Array(args.length);
+			for (let i = 0, len = args.length; i < len; i++) {
+				const arg = args[i];
+				if (Buffer.isBuffer(arg)) {
+					massagedArgs[i] = arg;
+					argsLengths[i] = arg.byteLength;
+				} else {
+					massagedArgs[i] = JSON.stringify(arg);
+					argsLengths[i] = Buffer.byteLength(massagedArgs[i], 'utf8');
+				}
+			}
+			return this._requestMixedArgs(req, rpcId, method, massagedArgs, argsLengths, usesCancellationToken);
+		}
+		return this._requestJSONArgs(req, rpcId, method, JSON.stringify(args), usesCancellationToken);
 	}
 
-	public static replyOK(req: string, res: any): string {
+	private static _requestJSONArgs(req: number, rpcId: number, method: string, args: string, usesCancellationToken: boolean): Buffer {
+		const methodByteLength = Buffer.byteLength(method, 'utf8');
+		const argsByteLength = Buffer.byteLength(args, 'utf8');
+
+		let len = 0;
+		len += MessageBuffer.sizeUInt8();
+		len += MessageBuffer.sizeShortString(method, methodByteLength);
+		len += MessageBuffer.sizeLongString(args, argsByteLength);
+
+		let result = MessageBuffer.alloc(usesCancellationToken ? MessageType.RequestJSONArgsWithCancellation : MessageType.RequestJSONArgs, req, len);
+		result.writeUInt8(rpcId);
+		result.writeShortString(method, methodByteLength);
+		result.writeLongString(args, argsByteLength);
+		return result.buffer;
+	}
+
+	public static deserializeRequestJSONArgs(buff: MessageBuffer): { rpcId: number; method: string; args: any[]; } {
+		const rpcId = buff.readUInt8();
+		const method = buff.readShortString();
+		const args = buff.readLongString();
+		return {
+			rpcId: rpcId,
+			method: method,
+			args: JSON.parse(args)
+		};
+	}
+
+	private static _requestMixedArgs(req: number, rpcId: number, method: string, args: (string | Buffer)[], argsLengths: number[], usesCancellationToken: boolean): Buffer {
+		const methodByteLength = Buffer.byteLength(method, 'utf8');
+
+		let len = 0;
+		len += MessageBuffer.sizeUInt8();
+		len += MessageBuffer.sizeShortString(method, methodByteLength);
+		len += MessageBuffer.sizeMixedArray(args, argsLengths);
+
+		let result = MessageBuffer.alloc(usesCancellationToken ? MessageType.RequestMixedArgsWithCancellation : MessageType.RequestMixedArgs, req, len);
+		result.writeUInt8(rpcId);
+		result.writeShortString(method, methodByteLength);
+		result.writeMixedArray(args, argsLengths);
+		return result.buffer;
+	}
+
+	public static deserializeRequestMixedArgs(buff: MessageBuffer): { rpcId: number; method: string; args: any[]; } {
+		const rpcId = buff.readUInt8();
+		const method = buff.readShortString();
+		const rawargs = buff.readMixedArray();
+		const args: any[] = new Array(rawargs.length);
+		for (let i = 0, len = rawargs.length; i < len; i++) {
+			const rawarg = rawargs[i];
+			if (typeof rawarg === 'string') {
+				args[i] = JSON.parse(rawarg);
+			} else {
+				args[i] = rawarg;
+			}
+		}
+		return {
+			rpcId: rpcId,
+			method: method,
+			args: args
+		};
+	}
+
+	public static serializeCancel(req: number): Buffer {
+		return MessageBuffer.alloc(MessageType.Cancel, req, 0).buffer;
+	}
+
+	public static serializeReplyOK(req: number, res: any): Buffer {
 		if (typeof res === 'undefined') {
-			return `{"type":${MessageType.Reply},"id":"${req}"}`;
+			return this._serializeReplyOKEmpty(req);
 		}
-		return `{"type":${MessageType.Reply},"id":"${req}","res":${JSON.stringify(res)}}`;
+		if (Buffer.isBuffer(res)) {
+			return this._serializeReplyOKBuffer(req, res);
+		}
+		return this._serializeReplyOKJSON(req, JSON.stringify(res));
 	}
 
-	public static replyErr(req: string, err: any): string {
+	private static _serializeReplyOKEmpty(req: number): Buffer {
+		return MessageBuffer.alloc(MessageType.ReplyOKEmpty, req, 0).buffer;
+	}
+
+	private static _serializeReplyOKBuffer(req: number, res: Buffer): Buffer {
+		const resByteLength = res.byteLength;
+
+		let len = 0;
+		len += MessageBuffer.sizeBuffer(res, resByteLength);
+
+		let result = MessageBuffer.alloc(MessageType.ReplyOKBuffer, req, len);
+		result.writeBuffer(res, resByteLength);
+		return result.buffer;
+	}
+
+	public static deserializeReplyOKBuffer(buff: MessageBuffer): Buffer {
+		return buff.readBuffer();
+	}
+
+	private static _serializeReplyOKJSON(req: number, res: string): Buffer {
+		const resByteLength = Buffer.byteLength(res, 'utf8');
+
+		let len = 0;
+		len += MessageBuffer.sizeLongString(res, resByteLength);
+
+		let result = MessageBuffer.alloc(MessageType.ReplyOKJSON, req, len);
+		result.writeLongString(res, resByteLength);
+		return result.buffer;
+	}
+
+	public static deserializeReplyOKJSON(buff: MessageBuffer): any {
+		const res = buff.readLongString();
+		return JSON.parse(res);
+	}
+
+	public static serializeReplyErr(req: number, err: any): Buffer {
 		if (err instanceof Error) {
-			return `{"type":${MessageType.ReplyErr},"id":"${req}","err":${JSON.stringify(errors.transformErrorForSerialization(err))}}`;
+			return this._serializeReplyErrEror(req, err);
 		}
-		return `{"type":${MessageType.ReplyErr},"id":"${req}","err":null}`;
+		return this._serializeReplyErrEmpty(req);
+	}
+
+	private static _serializeReplyErrEror(req: number, _err: Error): Buffer {
+		const err = JSON.stringify(errors.transformErrorForSerialization(_err));
+		const errByteLength = Buffer.byteLength(err, 'utf8');
+
+		let len = 0;
+		len += MessageBuffer.sizeLongString(err, errByteLength);
+
+		let result = MessageBuffer.alloc(MessageType.ReplyErrError, req, len);
+		result.writeLongString(err, errByteLength);
+		return result.buffer;
+	}
+
+	public static deserializeReplyErrError(buff: MessageBuffer): Error {
+		const err = buff.readLongString();
+		return JSON.parse(err);
+	}
+
+	private static _serializeReplyErrEmpty(req: number): Buffer {
+		return MessageBuffer.alloc(MessageType.ReplyErrEmpty, req, 0).buffer;
 	}
 }
 
 const enum MessageType {
-	Request = 1,
-	Cancel = 2,
-	Reply = 3,
-	ReplyErr = 4
+	RequestJSONArgs = 1,
+	RequestJSONArgsWithCancellation = 2,
+	RequestMixedArgs = 3,
+	RequestMixedArgsWithCancellation = 4,
+	Cancel = 5,
+	ReplyOKEmpty = 6,
+	ReplyOKBuffer = 7,
+	ReplyOKJSON = 8,
+	ReplyErrError = 9,
+	ReplyErrEmpty = 10,
 }
 
-class RequestMessage {
-	type: MessageType.Request;
-	id: string;
-	proxyId: string;
-	method: string;
-	args: any[];
+const enum ArgType {
+	String = 1,
+	Buffer = 2
 }
-class CancelMessage {
-	type: MessageType.Cancel;
-	id: string;
-}
-class ReplyMessage {
-	type: MessageType.Reply;
-	id: string;
-	res: any;
-}
-class ReplyErrMessage {
-	type: MessageType.ReplyErr;
-	id: string;
-	err: errors.SerializedError;
-}
-
-type RPCMessage = RequestMessage | CancelMessage | ReplyMessage | ReplyErrMessage;
diff --git a/src/vs/workbench/services/extensions/test/node/rpcProtocol.test.ts b/src/vs/workbench/services/extensions/test/node/rpcProtocol.test.ts
new file mode 100644
index 00000000000..e6156147f3c
--- /dev/null
+++ b/src/vs/workbench/services/extensions/test/node/rpcProtocol.test.ts
@@ -0,0 +1,179 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+import * as assert from 'assert';
+import { RPCProtocol } from 'vs/workbench/services/extensions/node/rpcProtocol';
+import { IMessagePassingProtocol } from 'vs/base/parts/ipc/node/ipc';
+import { Event, Emitter } from 'vs/base/common/event';
+import { ProxyIdentifier } from 'vs/workbench/services/extensions/node/proxyIdentifier';
+import { TPromise } from 'vs/base/common/winjs.base';
+import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
+
+suite('RPCProtocol', () => {
+
+	class MessagePassingProtocol implements IMessagePassingProtocol {
+		private _pair: MessagePassingProtocol;
+
+		private readonly _onMessage: Emitter<Buffer> = new Emitter<Buffer>();
+		public readonly onMessage: Event<Buffer> = this._onMessage.event;
+
+		public setPair(other: MessagePassingProtocol) {
+			this._pair = other;
+		}
+
+		public send(buffer: Buffer): void {
+			process.nextTick(() => {
+				this._pair._onMessage.fire(buffer);
+			});
+		}
+	}
+
+	let delegate: (a1: any, a2: any) => any;
+	let bProxy: BClass;
+	class BClass {
+		$m(a1: any, a2: any): Thenable<any> {
+			return TPromise.as(delegate.call(null, a1, a2));
+		}
+	}
+
+	setup(() => {
+		let a_protocol = new MessagePassingProtocol();
+		let b_protocol = new MessagePassingProtocol();
+		a_protocol.setPair(b_protocol);
+		b_protocol.setPair(a_protocol);
+
+		let A = new RPCProtocol(a_protocol);
+		let B = new RPCProtocol(b_protocol);
+
+		delegate = null;
+
+		const bIdentifier = new ProxyIdentifier<BClass>(false, 'bb');
+		const bInstance = new BClass();
+		B.set(bIdentifier, bInstance);
+		bProxy = A.getProxy(bIdentifier);
+	});
+
+	test('simple call', function (done) {
+		delegate = (a1: number, a2: number) => a1 + a2;
+		bProxy.$m(4, 1).then((res: number) => {
+			assert.equal(res, 5);
+			done(null);
+		}, done);
+	});
+
+	test('simple call without result', function (done) {
+		delegate = (a1: number, a2: number) => { };
+		bProxy.$m(4, 1).then((res: number) => {
+			assert.equal(res, undefined);
+			done(null);
+		}, done);
+	});
+
+	test('passing buffer as argument', function (done) {
+		delegate = (a1: Buffer, a2: number) => {
+			assert.ok(Buffer.isBuffer(a1));
+			return a1[a2];
+		};
+		let b = Buffer.allocUnsafe(4);
+		b[0] = 1;
+		b[1] = 2;
+		b[2] = 3;
+		b[3] = 4;
+		bProxy.$m(b, 2).then((res: number) => {
+			assert.equal(res, 3);
+			done(null);
+		}, done);
+	});
+
+	test('returning a buffer', function (done) {
+		delegate = (a1: number, a2: number) => {
+			let b = Buffer.allocUnsafe(4);
+			b[0] = 1;
+			b[1] = 2;
+			b[2] = 3;
+			b[3] = 4;
+			return b;
+		};
+		bProxy.$m(4, 1).then((res: Buffer) => {
+			assert.ok(Buffer.isBuffer(res));
+			assert.equal(res[0], 1);
+			assert.equal(res[1], 2);
+			assert.equal(res[2], 3);
+			assert.equal(res[3], 4);
+			done(null);
+		}, done);
+	});
+
+	test('cancelling a call via CancellationToken before', function (done) {
+		delegate = (a1: number, a2: number) => a1 + a2;
+		let p = bProxy.$m(4, CancellationToken.Cancelled);
+		p.then((res: number) => {
+			assert.fail('should not receive result');
+		}, (err) => {
+			assert.ok(true);
+			done(null);
+		});
+	});
+
+	test('passing CancellationToken.None', function (done) {
+		delegate = (a1: number, token: CancellationToken) => {
+			assert.ok(!!token);
+			return a1 + 1;
+		};
+		bProxy.$m(4, CancellationToken.None).then((res: number) => {
+			assert.equal(res, 5);
+			done(null);
+		}, done);
+	});
+
+	test('cancelling a call via CancellationToken quickly', function (done) {
+		// this is an implementation which, when cancellation is triggered, will return 7
+		delegate = (a1: number, token: CancellationToken) => {
+			return new TPromise((resolve, reject) => {
+				token.onCancellationRequested((e) => {
+					resolve(7);
+				});
+			});
+		};
+		let tokenSource = new CancellationTokenSource();
+		let p = bProxy.$m(4, tokenSource.token);
+		p.then((res: number) => {
+			assert.equal(res, 7);
+			done(null);
+		}, (err) => {
+			assert.fail('should not receive error');
+			done();
+		});
+		tokenSource.cancel();
+	});
+
+	test('throwing an error', function (done) {
+		delegate = (a1: number, a2: number) => {
+			throw new Error(`nope`);
+		};
+		bProxy.$m(4, 1).then((res) => {
+			assert.fail('unexpected');
+			done(null);
+		}, (err) => {
+			assert.equal(err.message, 'nope');
+			done(null);
+		});
+	});
+
+	test('error promise', function (done) {
+		delegate = (a1: number, a2: number) => {
+			return TPromise.wrapError(undefined);
+		};
+		bProxy.$m(4, 1).then((res) => {
+			assert.fail('unexpected');
+			done(null);
+		}, (err) => {
+			assert.equal(err, undefined);
+			done(null);
+		});
+	});
+});
diff --git a/src/vs/workbench/services/files/electron-browser/encoding.ts b/src/vs/workbench/services/files/electron-browser/encoding.ts
index c1b99f40985..b85375e7665 100644
--- a/src/vs/workbench/services/files/electron-browser/encoding.ts
+++ b/src/vs/workbench/services/files/electron-browser/encoding.ts
@@ -7,14 +7,14 @@
 
 import { WORKSPACE_EXTENSION } from 'vs/platform/workspaces/common/workspaces';
 import * as encoding from 'vs/base/node/encoding';
-import uri from 'vs/base/common/uri';
+import { URI as uri } from 'vs/base/common/uri';
 import { IResolveContentOptions, isParent, IResourceEncodings } from 'vs/platform/files/common/files';
 import { isLinux } from 'vs/base/common/platform';
 import { join, extname } from 'path';
 import { ITextResourceConfigurationService } from 'vs/editor/common/services/resourceConfiguration';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
+import { Disposable } from 'vs/base/common/lifecycle';
 
 export interface IEncodingOverride {
 	parent?: uri;
@@ -26,9 +26,8 @@ export interface IEncodingOverride {
 // service and then ideally be passed in as option to the file service
 // the file service should talk about string | Buffer for reading and writing and only convert
 // to strings if a encoding is provided
-export class ResourceEncodings implements IResourceEncodings {
+export class ResourceEncodings extends Disposable implements IResourceEncodings {
 	private encodingOverride: IEncodingOverride[];
-	private toDispose: IDisposable[];
 
 	constructor(
 		private textResourceConfigurationService: ITextResourceConfigurationService,
@@ -36,8 +35,9 @@ export class ResourceEncodings implements IResourceEncodings {
 		private contextService: IWorkspaceContextService,
 		encodingOverride?: IEncodingOverride[]
 	) {
+		super();
+
 		this.encodingOverride = encodingOverride || this.getEncodingOverrides();
-		this.toDispose = [];
 
 		this.registerListeners();
 	}
@@ -45,12 +45,12 @@ export class ResourceEncodings implements IResourceEncodings {
 	private registerListeners(): void {
 
 		// Workspace Folder Change
-		this.toDispose.push(this.contextService.onDidChangeWorkspaceFolders(() => {
+		this._register(this.contextService.onDidChangeWorkspaceFolders(() => {
 			this.encodingOverride = this.getEncodingOverrides();
 		}));
 	}
 
-	public getReadEncoding(resource: uri, options: IResolveContentOptions, detected: encoding.IDetectedEncodingResult): string {
+	getReadEncoding(resource: uri, options: IResolveContentOptions, detected: encoding.IDetectedEncodingResult): string {
 		let preferredEncoding: string;
 
 		// Encoding passed in as option
@@ -79,7 +79,7 @@ export class ResourceEncodings implements IResourceEncodings {
 		return this.getEncodingForResource(resource, preferredEncoding);
 	}
 
-	public getWriteEncoding(resource: uri, preferredEncoding?: string): string {
+	getWriteEncoding(resource: uri, preferredEncoding?: string): string {
 		return this.getEncodingForResource(resource, preferredEncoding);
 	}
 
@@ -138,8 +138,4 @@ export class ResourceEncodings implements IResourceEncodings {
 
 		return null;
 	}
-
-	public dispose(): void {
-		this.toDispose = dispose(this.toDispose);
-	}
-}
\ No newline at end of file
+}
diff --git a/src/vs/workbench/services/files/electron-browser/fileService.ts b/src/vs/workbench/services/files/electron-browser/fileService.ts
index cacc1dc7a68..2c834e3e1ac 100644
--- a/src/vs/workbench/services/files/electron-browser/fileService.ts
+++ b/src/vs/workbench/services/files/electron-browser/fileService.ts
@@ -18,11 +18,11 @@ import * as arrays from 'vs/base/common/arrays';
 import { TPromise } from 'vs/base/common/winjs.base';
 import * as objects from 'vs/base/common/objects';
 import * as extfs from 'vs/base/node/extfs';
-import { nfcall, ThrottledDelayer, asWinJSImport } from 'vs/base/common/async';
-import uri from 'vs/base/common/uri';
+import { nfcall, ThrottledDelayer } from 'vs/base/common/async';
+import { URI as uri } from 'vs/base/common/uri';
 import * as nls from 'vs/nls';
 import { isWindows, isLinux, isMacintosh } from 'vs/base/common/platform';
-import { dispose, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
+import { IDisposable, toDisposable, Disposable } from 'vs/base/common/lifecycle';
 import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
 import * as pfs from 'vs/base/node/pfs';
 import * as encoding from 'vs/base/node/encoding';
@@ -76,9 +76,9 @@ export interface IFileServiceTestOptions {
 	encodingOverride?: IEncodingOverride[];
 }
 
-export class FileService implements IFileService {
+export class FileService extends Disposable implements IFileService {
 
-	public _serviceBrand: any;
+	_serviceBrand: any;
 
 	private static readonly FS_EVENT_DELAY = 50; // aggregate and only emit events when changes have stopped for this duration (in ms)
 	private static readonly FS_REWATCH_DELAY = 300; // delay to rewatch a file that was renamed or deleted (in ms)
@@ -89,14 +89,17 @@ export class FileService implements IFileService {
 	private static readonly ENOSPC_ERROR = 'ENOSPC';
 	private static readonly ENOSPC_ERROR_IGNORE_KEY = 'ignoreEnospcError';
 
-	protected readonly _onFileChanges: Emitter<FileChangesEvent>;
-	protected readonly _onAfterOperation: Emitter<FileOperationEvent>;
-	protected readonly _onDidChangeFileSystemProviderRegistrations = new Emitter<IFileSystemProviderRegistrationEvent>();
+	protected readonly _onFileChanges: Emitter<FileChangesEvent> = this._register(new Emitter<FileChangesEvent>());
+	get onFileChanges(): Event<FileChangesEvent> { return this._onFileChanges.event; }
 
-	protected toDispose: IDisposable[];
+	protected readonly _onAfterOperation: Emitter<FileOperationEvent> = this._register(new Emitter<FileOperationEvent>());
+	get onAfterOperation(): Event<FileOperationEvent> { return this._onAfterOperation.event; }
+
+	protected readonly _onDidChangeFileSystemProviderRegistrations = this._register(new Emitter<IFileSystemProviderRegistrationEvent>());
+	get onDidChangeFileSystemProviderRegistrations(): Event<IFileSystemProviderRegistrationEvent> { return this._onDidChangeFileSystemProviderRegistrations.event; }
 
 	private activeWorkspaceFileChangeWatcher: IDisposable;
-	private activeFileChangesWatchers: ResourceMap<fs.FSWatcher>;
+	private activeFileChangesWatchers: ResourceMap<{ unwatch: Function, count: number }>;
 	private fileChangesWatchDelayer: ThrottledDelayer<void>;
 	private undeliveredRawFileChangesEvents: IRawFileChange[];
 
@@ -112,15 +115,9 @@ export class FileService implements IFileService {
 		private notificationService: INotificationService,
 		private options: IFileServiceTestOptions = Object.create(null)
 	) {
-		this.toDispose = [];
+		super();
 
-		this._onFileChanges = new Emitter<FileChangesEvent>();
-		this.toDispose.push(this._onFileChanges);
-
-		this._onAfterOperation = new Emitter<FileOperationEvent>();
-		this.toDispose.push(this._onAfterOperation);
-
-		this.activeFileChangesWatchers = new ResourceMap<fs.FSWatcher>();
+		this.activeFileChangesWatchers = new ResourceMap<{ unwatch: Function, count: number }>();
 		this.fileChangesWatchDelayer = new ThrottledDelayer<void>(FileService.FS_EVENT_DELAY);
 		this.undeliveredRawFileChangesEvents = [];
 
@@ -129,7 +126,7 @@ export class FileService implements IFileService {
 		this.registerListeners();
 	}
 
-	public get encoding(): ResourceEncodings {
+	get encoding(): ResourceEncodings {
 		return this._encoding;
 	}
 
@@ -141,7 +138,7 @@ export class FileService implements IFileService {
 		});
 
 		// Workbench State Change
-		this.toDispose.push(this.contextService.onDidChangeWorkbenchState(() => {
+		this._register(this.contextService.onDidChangeWorkbenchState(() => {
 			if (this.lifecycleService.phase >= LifecyclePhase.Running) {
 				this.setupFileWatching();
 			}
@@ -195,14 +192,6 @@ export class FileService implements IFileService {
 		}
 	}
 
-	public get onFileChanges(): Event<FileChangesEvent> {
-		return this._onFileChanges.event;
-	}
-
-	public get onAfterOperation(): Event<FileOperationEvent> {
-		return this._onAfterOperation.event;
-	}
-
 	private setupFileWatching(): void {
 
 		// dispose old if any
@@ -240,30 +229,28 @@ export class FileService implements IFileService {
 		}
 	}
 
-	public readonly onDidChangeFileSystemProviderRegistrations: Event<IFileSystemProviderRegistrationEvent> = this._onDidChangeFileSystemProviderRegistrations.event;
-
-	public registerProvider(scheme: string, provider: IFileSystemProvider): IDisposable {
+	registerProvider(scheme: string, provider: IFileSystemProvider): IDisposable {
 		throw new Error('not implemented');
 	}
 
-	public canHandleResource(resource: uri): boolean {
+	canHandleResource(resource: uri): boolean {
 		return resource.scheme === Schemas.file;
 	}
 
-	public resolveFile(resource: uri, options?: IResolveFileOptions): TPromise<IFileStat> {
+	resolveFile(resource: uri, options?: IResolveFileOptions): TPromise<IFileStat> {
 		return this.resolve(resource, options);
 	}
 
-	public resolveFiles(toResolve: { resource: uri, options?: IResolveFileOptions }[]): TPromise<IResolveFileResult[]> {
+	resolveFiles(toResolve: { resource: uri, options?: IResolveFileOptions }[]): TPromise<IResolveFileResult[]> {
 		return TPromise.join(toResolve.map(resourceAndOptions => this.resolve(resourceAndOptions.resource, resourceAndOptions.options)
 			.then(stat => ({ stat, success: true }), error => ({ stat: void 0, success: false }))));
 	}
 
-	public existsFile(resource: uri): TPromise<boolean> {
+	existsFile(resource: uri): TPromise<boolean> {
 		return this.resolveFile(resource).then(() => true, () => false);
 	}
 
-	public resolveContent(resource: uri, options?: IResolveContentOptions): TPromise<IContent> {
+	resolveContent(resource: uri, options?: IResolveContentOptions): TPromise<IContent> {
 		return this.resolveStreamContent(resource, options).then(streamContent => {
 			return new TPromise<IContent>((resolve, reject) => {
 
@@ -273,6 +260,7 @@ export class FileService implements IFileService {
 					mtime: streamContent.mtime,
 					etag: streamContent.etag,
 					encoding: streamContent.encoding,
+					isReadonly: streamContent.isReadonly,
 					value: ''
 				};
 
@@ -285,7 +273,7 @@ export class FileService implements IFileService {
 		});
 	}
 
-	public resolveStreamContent(resource: uri, options?: IResolveContentOptions): TPromise<IStreamContent> {
+	resolveStreamContent(resource: uri, options?: IResolveContentOptions): TPromise<IStreamContent> {
 
 		// Guard early against attempts to resolve an invalid file path
 		if (resource.scheme !== Schemas.file || !resource.fsPath) {
@@ -302,6 +290,7 @@ export class FileService implements IFileService {
 			mtime: void 0,
 			etag: void 0,
 			encoding: void 0,
+			isReadonly: false,
 			value: void 0
 		};
 
@@ -575,7 +564,7 @@ export class FileService implements IFileService {
 		});
 	}
 
-	public updateContent(resource: uri, value: string | ITextSnapshot, options: IUpdateContentOptions = Object.create(null)): TPromise<IFileStat> {
+	updateContent(resource: uri, value: string | ITextSnapshot, options: IUpdateContentOptions = Object.create(null)): TPromise<IFileStat> {
 		if (options.writeElevated) {
 			return this.doUpdateContentElevated(resource, value, options);
 		}
@@ -618,22 +607,23 @@ export class FileService implements IFileService {
 				return addBomPromise.then(addBom => {
 
 					// 4.) set contents and resolve
-					return this.doSetContentsAndResolve(resource, absolutePath, value, addBom, encodingToWrite).then(void 0, error => {
-						if (!exists || error.code !== 'EPERM' || !isWindows) {
-							return TPromise.wrapError(error);
-						}
+					if (!exists || !isWindows) {
+						return this.doSetContentsAndResolve(resource, absolutePath, value, addBom, encodingToWrite);
+					}
 
-						// On Windows and if the file exists with an EPERM error, we try a different strategy of saving the file
-						// by first truncating the file and then writing with r+ mode. This helps to save hidden files on Windows
-						// (see https://github.com/Microsoft/vscode/issues/931)
+					// On Windows and if the file exists, we use a different strategy of saving the file
+					// by first truncating the file and then writing with r+ mode. This helps to save hidden files on Windows
+					// (see https://github.com/Microsoft/vscode/issues/931) and prevent removing alternate data streams
+					// (see https://github.com/Microsoft/vscode/issues/6363)
+					else {
 
-						// 5.) truncate
+						// 4.) truncate
 						return pfs.truncate(absolutePath, 0).then(() => {
 
-							// 6.) set contents (this time with r+ mode) and resolve again
+							// 5.) set contents (with r+ mode) and resolve
 							return this.doSetContentsAndResolve(resource, absolutePath, value, addBom, encodingToWrite, { flag: 'r+' });
 						});
-					});
+					}
 				});
 			});
 		}).then(null, error => {
@@ -689,7 +679,7 @@ export class FileService implements IFileService {
 			return this.updateContent(uri.file(tmpPath), value, writeOptions).then(() => {
 
 				// 3.) invoke our CLI as super user
-				return asWinJSImport(import('sudo-prompt')).then(sudoPrompt => {
+				return TPromise.wrap(import('sudo-prompt')).then(sudoPrompt => {
 					return new TPromise<void>((c, e) => {
 						const promptOptions = {
 							name: this.environmentService.appNameLong.replace('-', ''),
@@ -737,7 +727,7 @@ export class FileService implements IFileService {
 		});
 	}
 
-	public createFile(resource: uri, content: string = '', options: ICreateFileOptions = Object.create(null)): TPromise<IFileStat> {
+	createFile(resource: uri, content: string = '', options: ICreateFileOptions = Object.create(null)): TPromise<IFileStat> {
 		const absolutePath = this.toAbsolutePath(resource);
 
 		let checkFilePromise: TPromise<boolean>;
@@ -768,7 +758,7 @@ export class FileService implements IFileService {
 		});
 	}
 
-	public createFolder(resource: uri): TPromise<IFileStat> {
+	createFolder(resource: uri): TPromise<IFileStat> {
 
 		// 1.) Create folder
 		const absolutePath = this.toAbsolutePath(resource);
@@ -847,17 +837,11 @@ export class FileService implements IFileService {
 		));
 	}
 
-	public rename(resource: uri, newName: string): TPromise<IFileStat> {
-		const newPath = paths.join(paths.dirname(resource.fsPath), newName);
-
-		return this.moveFile(resource, uri.file(newPath));
-	}
-
-	public moveFile(source: uri, target: uri, overwrite?: boolean): TPromise<IFileStat> {
+	moveFile(source: uri, target: uri, overwrite?: boolean): TPromise<IFileStat> {
 		return this.moveOrCopyFile(source, target, false, overwrite);
 	}
 
-	public copyFile(source: uri, target: uri, overwrite?: boolean): TPromise<IFileStat> {
+	copyFile(source: uri, target: uri, overwrite?: boolean): TPromise<IFileStat> {
 		return this.moveOrCopyFile(source, target, true, overwrite);
 	}
 
@@ -903,7 +887,7 @@ export class FileService implements IFileService {
 					return TPromise.wrapError<boolean>(new Error(nls.localize('unableToMoveCopyError', "Unable to move/copy. File would replace folder it is contained in."))); // catch this corner case!
 				}
 
-				deleteTargetPromise = this.del(uri.file(targetPath));
+				deleteTargetPromise = this.del(uri.file(targetPath), { recursive: true });
 			}
 
 			return deleteTargetPromise.then(() => {
@@ -924,36 +908,56 @@ export class FileService implements IFileService {
 		});
 	}
 
-	public del(resource: uri, useTrash?: boolean): TPromise<void> {
-		if (useTrash) {
+	del(resource: uri, options?: { useTrash?: boolean, recursive?: boolean }): TPromise<void> {
+		if (options && options.useTrash) {
 			return this.doMoveItemToTrash(resource);
 		}
 
-		return this.doDelete(resource);
+		return this.doDelete(resource, options && options.recursive);
 	}
 
 	private doMoveItemToTrash(resource: uri): TPromise<void> {
 		const absolutePath = resource.fsPath;
 
-		return asWinJSImport(import('electron')).then(electron => {
-			const result = electron.shell.moveItemToTrash(absolutePath);
-			if (!result) {
-				return TPromise.wrapError(new Error(isWindows ? nls.localize('binFailed', "Failed to move '{0}' to the recycle bin", paths.basename(absolutePath)) : nls.localize('trashFailed', "Failed to move '{0}' to the trash", paths.basename(absolutePath))));
-			}
+		const shell = (require('electron') as Electron.RendererInterface).shell; // workaround for being able to run tests out of VSCode debugger
+		const result = shell.moveItemToTrash(absolutePath);
+		if (!result) {
+			return TPromise.wrapError(new Error(isWindows ? nls.localize('binFailed', "Failed to move '{0}' to the recycle bin", paths.basename(absolutePath)) : nls.localize('trashFailed', "Failed to move '{0}' to the trash", paths.basename(absolutePath))));
+		}
 
-			this._onAfterOperation.fire(new FileOperationEvent(resource, FileOperation.DELETE));
+		this._onAfterOperation.fire(new FileOperationEvent(resource, FileOperation.DELETE));
 
-			return void 0;
-		});
+		return TPromise.as(void 0);
 	}
 
-	private doDelete(resource: uri): TPromise<void> {
+	private doDelete(resource: uri, recursive: boolean): TPromise<void> {
 		const absolutePath = this.toAbsolutePath(resource);
 
-		return pfs.del(absolutePath, os.tmpdir()).then(() => {
+		let assertNonRecursiveDelete: TPromise<void>;
+		if (!recursive) {
+			assertNonRecursiveDelete = pfs.stat(absolutePath).then(stat => {
+				if (!stat.isDirectory()) {
+					return TPromise.as(void 0);
+				}
 
-			// Events
-			this._onAfterOperation.fire(new FileOperationEvent(resource, FileOperation.DELETE));
+				return pfs.readdir(absolutePath).then(children => {
+					if (children.length === 0) {
+						return TPromise.as(void 0);
+					}
+
+					return TPromise.wrapError(new Error(nls.localize('deleteFailed', "Failed to delete non-empty folder '{0}'.", paths.basename(absolutePath))));
+				});
+			}, error => TPromise.as(void 0) /* ignore errors */);
+		} else {
+			assertNonRecursiveDelete = TPromise.as(void 0);
+		}
+
+		return assertNonRecursiveDelete.then(() => {
+			return pfs.del(absolutePath, os.tmpdir()).then(() => {
+
+				// Events
+				this._onAfterOperation.fire(new FileOperationEvent(resource, FileOperation.DELETE));
+			});
 		});
 	}
 
@@ -984,62 +988,70 @@ export class FileService implements IFileService {
 		});
 	}
 
-	public watchFileChanges(resource: uri): void {
+	watchFileChanges(resource: uri): void {
 		assert.ok(resource && resource.scheme === Schemas.file, `Invalid resource for watching: ${resource}`);
 
-		// Create or get watcher for provided path
-		let watcher = this.activeFileChangesWatchers.get(resource);
-		if (!watcher) {
-			const fsPath = resource.fsPath;
-			const fsName = paths.basename(resource.fsPath);
+		// Check for existing watcher first
+		const entry = this.activeFileChangesWatchers.get(resource);
+		if (entry) {
+			entry.count += 1;
 
-			watcher = extfs.watch(fsPath, (eventType: string, filename: string) => {
-				const renamedOrDeleted = ((filename && filename !== fsName) || eventType === 'rename');
-
-				// The file was either deleted or renamed. Many tools apply changes to files in an
-				// atomic way ("Atomic Save") by first renaming the file to a temporary name and then
-				// renaming it back to the original name. Our watcher will detect this as a rename
-				// and then stops to work on Mac and Linux because the watcher is applied to the
-				// inode and not the name. The fix is to detect this case and trying to watch the file
-				// again after a certain delay.
-				// In addition, we send out a delete event if after a timeout we detect that the file
-				// does indeed not exist anymore.
-				if (renamedOrDeleted) {
-
-					// Very important to dispose the watcher which now points to a stale inode
-					this.unwatchFileChanges(resource);
-
-					// Wait a bit and try to install watcher again, assuming that the file was renamed quickly ("Atomic Save")
-					setTimeout(() => {
-						this.existsFile(resource).done(exists => {
-
-							// File still exists, so reapply the watcher
-							if (exists) {
-								this.watchFileChanges(resource);
-							}
-
-							// File seems to be really gone, so emit a deleted event
-							else {
-								this.onRawFileChange({
-									type: FileChangeType.DELETED,
-									path: fsPath
-								});
-							}
-						});
-					}, FileService.FS_REWATCH_DELAY);
-				}
-
-				// Handle raw file change
-				this.onRawFileChange({
-					type: FileChangeType.UPDATED,
-					path: fsPath
-				});
-			}, (error: string) => this.handleError(error));
-
-			if (watcher) {
-				this.activeFileChangesWatchers.set(resource, watcher);
-			}
+			return;
 		}
+
+		// Create or get watcher for provided path
+		const fsPath = resource.fsPath;
+		const fsName = paths.basename(resource.fsPath);
+
+		const watcherDisposable = extfs.watch(fsPath, (eventType: string, filename: string) => {
+			const renamedOrDeleted = ((filename && filename !== fsName) || eventType === 'rename');
+
+			// The file was either deleted or renamed. Many tools apply changes to files in an
+			// atomic way ("Atomic Save") by first renaming the file to a temporary name and then
+			// renaming it back to the original name. Our watcher will detect this as a rename
+			// and then stops to work on Mac and Linux because the watcher is applied to the
+			// inode and not the name. The fix is to detect this case and trying to watch the file
+			// again after a certain delay.
+			// In addition, we send out a delete event if after a timeout we detect that the file
+			// does indeed not exist anymore.
+			if (renamedOrDeleted) {
+
+				// Very important to dispose the watcher which now points to a stale inode
+				watcherDisposable.dispose();
+				this.activeFileChangesWatchers.delete(resource);
+
+				// Wait a bit and try to install watcher again, assuming that the file was renamed quickly ("Atomic Save")
+				setTimeout(() => {
+					this.existsFile(resource).then(exists => {
+
+						// File still exists, so reapply the watcher
+						if (exists) {
+							this.watchFileChanges(resource);
+						}
+
+						// File seems to be really gone, so emit a deleted event
+						else {
+							this.onRawFileChange({
+								type: FileChangeType.DELETED,
+								path: fsPath
+							});
+						}
+					});
+				}, FileService.FS_REWATCH_DELAY);
+			}
+
+			// Handle raw file change
+			this.onRawFileChange({
+				type: FileChangeType.UPDATED,
+				path: fsPath
+			});
+		}, (error: string) => this.handleError(error));
+
+		// Remember in map
+		this.activeFileChangesWatchers.set(resource, {
+			count: 1,
+			unwatch: () => watcherDisposable.dispose()
+		});
 	}
 
 	private onRawFileChange(event: IRawFileChange): void {
@@ -1048,7 +1060,7 @@ export class FileService implements IFileService {
 		this.undeliveredRawFileChangesEvents.push(event);
 
 		if (this.environmentService.verbose) {
-			console.log('%c[node.js Watcher]%c', 'color: green', 'color: black', event.type === FileChangeType.ADDED ? '[ADDED]' : event.type === FileChangeType.DELETED ? '[DELETED]' : '[CHANGED]', event.path);
+			console.log('%c[File Watcher (node.js)]%c', 'color: blue', 'color: black', `${event.type === FileChangeType.ADDED ? '[ADDED]' : event.type === FileChangeType.DELETED ? '[DELETED]' : '[CHANGED]'} ${event.path}`);
 		}
 
 		// handle emit through delayer to accommodate for bulk changes
@@ -1062,7 +1074,7 @@ export class FileService implements IFileService {
 			// Logging
 			if (this.environmentService.verbose) {
 				normalizedEvents.forEach(r => {
-					console.log('%c[node.js Watcher]%c >> normalized', 'color: green', 'color: black', r.type === FileChangeType.ADDED ? '[ADDED]' : r.type === FileChangeType.DELETED ? '[DELETED]' : '[CHANGED]', r.path);
+					console.log('%c[File Watcher (node.js)]%c >> normalized', 'color: blue', 'color: black', `${r.type === FileChangeType.ADDED ? '[ADDED]' : r.type === FileChangeType.DELETED ? '[DELETED]' : '[CHANGED]'} ${r.path}`);
 				});
 			}
 
@@ -1073,23 +1085,23 @@ export class FileService implements IFileService {
 		});
 	}
 
-	public unwatchFileChanges(resource: uri): void {
+	unwatchFileChanges(resource: uri): void {
 		const watcher = this.activeFileChangesWatchers.get(resource);
-		if (watcher) {
-			watcher.close();
+		if (watcher && --watcher.count === 0) {
+			watcher.unwatch();
 			this.activeFileChangesWatchers.delete(resource);
 		}
 	}
 
-	public dispose(): void {
-		this.toDispose = dispose(this.toDispose);
+	dispose(): void {
+		super.dispose();
 
 		if (this.activeWorkspaceFileChangeWatcher) {
 			this.activeWorkspaceFileChangeWatcher.dispose();
 			this.activeWorkspaceFileChangeWatcher = null;
 		}
 
-		this.activeFileChangesWatchers.forEach(watcher => watcher.close());
+		this.activeFileChangesWatchers.forEach(watcher => watcher.unwatch());
 		this.activeFileChangesWatchers.clear();
 	}
 }
@@ -1128,13 +1140,14 @@ export class StatResolver {
 		this.etag = etag(size, mtime);
 	}
 
-	public resolve(options: IResolveFileOptions): TPromise<IFileStat> {
+	resolve(options: IResolveFileOptions): TPromise<IFileStat> {
 
 		// General Data
 		const fileStat: IFileStat = {
 			resource: this.resource,
 			isDirectory: this.isDirectory,
 			isSymbolicLink: this.isSymbolicLink,
+			isReadonly: false,
 			name: this.name,
 			etag: this.etag,
 			size: this.size,
@@ -1219,6 +1232,7 @@ export class StatResolver {
 							resource: fileResource,
 							isDirectory: fileStat.isDirectory(),
 							isSymbolicLink,
+							isReadonly: false,
 							name: file,
 							mtime: fileStat.mtime.getTime(),
 							etag: etag(fileStat),
diff --git a/src/vs/workbench/services/files/electron-browser/remoteFileService.ts b/src/vs/workbench/services/files/electron-browser/remoteFileService.ts
index a79a41a04f9..99a00594348 100644
--- a/src/vs/workbench/services/files/electron-browser/remoteFileService.ts
+++ b/src/vs/workbench/services/files/electron-browser/remoteFileService.ts
@@ -4,12 +4,12 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import { posix } from 'path';
 import { flatten, isFalsyOrEmpty } from 'vs/base/common/arrays';
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
-import { TernarySearchTree, keys } from 'vs/base/common/map';
+import { IDisposable, dispose, Disposable } from 'vs/base/common/lifecycle';
+import { TernarySearchTree } from 'vs/base/common/map';
 import { Schemas } from 'vs/base/common/network';
-import URI from 'vs/base/common/uri';
+import * as resources from 'vs/base/common/resources';
+import { URI } from 'vs/base/common/uri';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { IDecodeStreamOptions, toDecodeStream, encodeStream } from 'vs/base/node/encoding';
 import { ITextResourceConfigurationService } from 'vs/editor/common/services/resourceConfiguration';
@@ -38,13 +38,14 @@ class TypeOnlyStat implements IStat {
 	size: number = 0;
 }
 
-function toIFileStat(provider: IFileSystemProvider, tuple: [URI, IStat], recurse?: (tuple: [URI, IStat]) => boolean): TPromise<IFileStat> {
+function toIFileStat(provider: IFileSystemProvider, tuple: [URI, IStat], recurse?: (tuple: [URI, IStat]) => boolean): Thenable<IFileStat> {
 	const [resource, stat] = tuple;
 	const fileStat: IFileStat = {
 		resource,
-		name: posix.basename(resource.path),
+		name: resources.basename(resource),
 		isDirectory: (stat.type & FileType.Directory) !== 0,
 		isSymbolicLink: (stat.type & FileType.SymbolicLink) !== 0,
+		isReadonly: !!(provider.capabilities & FileSystemProviderCapabilities.Readonly),
 		mtime: stat.mtime,
 		size: stat.size,
 		etag: stat.mtime.toString(29) + stat.size.toString(31),
@@ -57,7 +58,7 @@ function toIFileStat(provider: IFileSystemProvider, tuple: [URI, IStat], recurse
 				// resolve children if requested
 				return TPromise.join(entries.map(tuple => {
 					const [name, type] = tuple;
-					const childResource = resource.with({ path: posix.join(resource.path, name) });
+					const childResource = resources.joinPath(resource, name);
 					return toIFileStat(provider, [childResource, new TypeOnlyStat(type)], recurse);
 				})).then(children => {
 					fileStat.children = children;
@@ -71,7 +72,7 @@ function toIFileStat(provider: IFileSystemProvider, tuple: [URI, IStat], recurse
 	return TPromise.as(fileStat);
 }
 
-export function toDeepIFileStat(provider: IFileSystemProvider, tuple: [URI, IStat], to: URI[]): TPromise<IFileStat> {
+export function toDeepIFileStat(provider: IFileSystemProvider, tuple: [URI, IStat], to: URI[]): Thenable<IFileStat> {
 
 	const trie = TernarySearchTree.forPaths<true>();
 	trie.set(tuple[0].toString(), true);
@@ -85,9 +86,8 @@ export function toDeepIFileStat(provider: IFileSystemProvider, tuple: [URI, ISta
 	});
 }
 
-class WorkspaceWatchLogic {
+class WorkspaceWatchLogic extends Disposable {
 
-	private _disposables: IDisposable[] = [];
 	private _watches = new Map<string, URI>();
 
 	constructor(
@@ -95,9 +95,11 @@ class WorkspaceWatchLogic {
 		@IConfigurationService private _configurationService: IConfigurationService,
 		@IWorkspaceContextService private _contextService: IWorkspaceContextService,
 	) {
+		super();
+
 		this._refresh();
 
-		this._disposables.push(this._contextService.onDidChangeWorkspaceFolders(e => {
+		this._register(this._contextService.onDidChangeWorkspaceFolders(e => {
 			for (const removed of e.removed) {
 				this._unwatchWorkspace(removed.uri);
 			}
@@ -105,10 +107,10 @@ class WorkspaceWatchLogic {
 				this._watchWorkspace(added.uri);
 			}
 		}));
-		this._disposables.push(this._contextService.onDidChangeWorkbenchState(e => {
+		this._register(this._contextService.onDidChangeWorkbenchState(e => {
 			this._refresh();
 		}));
-		this._disposables.push(this._configurationService.onDidChangeConfiguration(e => {
+		this._register(this._configurationService.onDidChangeConfiguration(e => {
 			if (e.affectsConfiguration('files.watcherExclude')) {
 				this._refresh();
 			}
@@ -117,7 +119,7 @@ class WorkspaceWatchLogic {
 
 	dispose(): void {
 		this._unwatchWorkspaces();
-		this._disposables = dispose(this._disposables);
+		super.dispose();
 	}
 
 	private _refresh(): void {
@@ -159,12 +161,11 @@ class WorkspaceWatchLogic {
 export class RemoteFileService extends FileService {
 
 	private readonly _provider: Map<string, IFileSystemProvider>;
-	private readonly _lastKnownSchemes: string[];
 
 	constructor(
 		@IExtensionService private readonly _extensionService: IExtensionService,
-		@IStorageService private readonly _storageService: IStorageService,
-		@IEnvironmentService private readonly _environmentService: IEnvironmentService,
+		@IStorageService storageService: IStorageService,
+		@IEnvironmentService environmentService: IEnvironmentService,
 		@IConfigurationService configurationService: IConfigurationService,
 		@IWorkspaceContextService contextService: IWorkspaceContextService,
 		@ILifecycleService lifecycleService: ILifecycleService,
@@ -173,17 +174,16 @@ export class RemoteFileService extends FileService {
 	) {
 		super(
 			contextService,
-			_environmentService,
+			environmentService,
 			textResourceConfigurationService,
 			configurationService,
 			lifecycleService,
-			_storageService,
+			storageService,
 			notificationService
 		);
 
 		this._provider = new Map<string, IFileSystemProvider>();
-		this._lastKnownSchemes = JSON.parse(this._storageService.get('remote_schemes', undefined, '[]'));
-		this.toDispose.push(new WorkspaceWatchLogic(this, configurationService, contextService));
+		this._register(new WorkspaceWatchLogic(this, configurationService, contextService));
 	}
 
 	registerProvider(scheme: string, provider: IFileSystemProvider): IDisposable {
@@ -193,7 +193,6 @@ export class RemoteFileService extends FileService {
 
 		this._provider.set(scheme, provider);
 		this._onDidChangeFileSystemProviderRegistrations.fire({ added: true, scheme, provider });
-		this._storageService.store('remote_schemes', JSON.stringify(keys(this._provider)));
 
 		const reg = provider.onDidChangeFile(changes => {
 			// forward change events
@@ -209,19 +208,7 @@ export class RemoteFileService extends FileService {
 	}
 
 	canHandleResource(resource: URI): boolean {
-		if (resource.scheme === Schemas.file || this._provider.has(resource.scheme)) {
-			return true;
-		}
-		// TODO@remote
-		// this needs to go, but this already went viral
-		// https://github.com/Microsoft/vscode/issues/48275
-		if (this._lastKnownSchemes.indexOf(resource.scheme) < 0) {
-			return false;
-		}
-		if (!this._environmentService.isBuilt) {
-			console.warn('[remote] cache information required for ' + resource.toString());
-		}
-		return true;
+		return resource.scheme === Schemas.file || this._provider.has(resource.scheme);
 	}
 
 	private _tryParseFileOperationResult(err: any): FileOperationResult {
@@ -259,7 +246,7 @@ export class RemoteFileService extends FileService {
 
 	private _withProvider(resource: URI): TPromise<IFileSystemProvider> {
 
-		if (!posix.isAbsolute(resource.path)) {
+		if (!resources.isAbsolutePath(resource)) {
 			throw new FileOperationError(
 				localize('invalidPath', "The path of resource '{0}' must be absolute", resource.toString(true)),
 				FileOperationResult.FILE_INVALID_PATH
@@ -280,7 +267,7 @@ export class RemoteFileService extends FileService {
 		});
 	}
 
-	existsFile(resource: URI): TPromise<boolean, any> {
+	existsFile(resource: URI): TPromise<boolean> {
 		if (resource.scheme === Schemas.file) {
 			return super.existsFile(resource);
 		} else {
@@ -288,7 +275,7 @@ export class RemoteFileService extends FileService {
 		}
 	}
 
-	resolveFile(resource: URI, options?: IResolveFileOptions): TPromise<IFileStat, any> {
+	resolveFile(resource: URI, options?: IResolveFileOptions): TPromise<IFileStat> {
 		if (resource.scheme === Schemas.file) {
 			return super.resolveFile(resource, options);
 		} else {
@@ -305,7 +292,7 @@ export class RemoteFileService extends FileService {
 		}
 	}
 
-	resolveFiles(toResolve: { resource: URI; options?: IResolveFileOptions; }[]): TPromise<IResolveFileResult[], any> {
+	resolveFiles(toResolve: { resource: URI; options?: IResolveFileOptions; }[]): TPromise<IResolveFileResult[]> {
 
 		// soft-groupBy, keep order, don't rearrange/merge groups
 		let groups: (typeof toResolve)[] = [];
@@ -318,7 +305,7 @@ export class RemoteFileService extends FileService {
 			group.push(request);
 		}
 
-		const promises: TPromise<IResolveFileResult[], any>[] = [];
+		const promises: TPromise<IResolveFileResult[]>[] = [];
 		for (const group of groups) {
 			if (group[0].resource.scheme === Schemas.file) {
 				promises.push(super.resolveFiles(group));
@@ -329,7 +316,7 @@ export class RemoteFileService extends FileService {
 		return TPromise.join(promises).then(data => flatten(data));
 	}
 
-	private _doResolveFiles(toResolve: { resource: URI; options?: IResolveFileOptions; }[]): TPromise<IResolveFileResult[], any> {
+	private _doResolveFiles(toResolve: { resource: URI; options?: IResolveFileOptions; }[]): TPromise<IResolveFileResult[]> {
 		return this._withProvider(toResolve[0].resource).then(provider => {
 			let result: IResolveFileResult[] = [];
 			let promises = toResolve.map((item, idx) => {
@@ -411,6 +398,7 @@ export class RemoteFileService extends FileService {
 						name: fileStat.name,
 						etag: fileStat.etag,
 						mtime: fileStat.mtime,
+						isReadonly: fileStat.isReadonly
 					};
 				});
 			});
@@ -431,23 +419,31 @@ export class RemoteFileService extends FileService {
 				break; // we have hit a directory -> good
 			} catch (e) {
 				// ENOENT
-				basenames.push(posix.basename(directory.path));
-				directory = directory.with({ path: posix.dirname(directory.path) });
+				basenames.push(resources.basename(directory));
+				directory = resources.dirname(directory);
 			}
 		}
 		for (let i = basenames.length - 1; i >= 0; i--) {
-			directory = directory.with({ path: posix.join(directory.path, basenames[i]) });
+			directory = resources.joinPath(directory, basenames[i]);
 			await provider.mkdir(directory);
 		}
 	}
 
+	private static _throwIfFileSystemIsReadonly(provider: IFileSystemProvider): IFileSystemProvider {
+		if (provider.capabilities & FileSystemProviderCapabilities.Readonly) {
+			throw new FileOperationError(localize('err.readonly', "Resource can not be modified."), FileOperationResult.FILE_PERMISSION_DENIED);
+		}
+		return provider;
+	}
+
 	createFile(resource: URI, content?: string, options?: ICreateFileOptions): TPromise<IFileStat> {
 		if (resource.scheme === Schemas.file) {
 			return super.createFile(resource, content, options);
 		} else {
 
-			return this._withProvider(resource).then(provider => {
-				return RemoteFileService._mkdirp(provider, resource.with({ path: posix.dirname(resource.path) })).then(() => {
+			return this._withProvider(resource).then(RemoteFileService._throwIfFileSystemIsReadonly).then(provider => {
+
+				return RemoteFileService._mkdirp(provider, resources.dirname(resource)).then(() => {
 					const encoding = this.encoding.getWriteEncoding(resource);
 					return this._writeFile(provider, resource, new StringSnapshot(content), encoding, { create: true, overwrite: Boolean(options && options.overwrite) });
 				});
@@ -467,8 +463,8 @@ export class RemoteFileService extends FileService {
 		if (resource.scheme === Schemas.file) {
 			return super.updateContent(resource, value, options);
 		} else {
-			return this._withProvider(resource).then(provider => {
-				return RemoteFileService._mkdirp(provider, resource.with({ path: posix.dirname(resource.path) })).then(() => {
+			return this._withProvider(resource).then(RemoteFileService._throwIfFileSystemIsReadonly).then(provider => {
+				return RemoteFileService._mkdirp(provider, resources.dirname(resource)).then(() => {
 					const snapshot = typeof value === 'string' ? new StringSnapshot(value) : value;
 					return this._writeFile(provider, resource, snapshot, options && options.encoding, { create: true, overwrite: true });
 				});
@@ -476,12 +472,12 @@ export class RemoteFileService extends FileService {
 		}
 	}
 
-	private _writeFile(provider: IFileSystemProvider, resource: URI, snapshot: ITextSnapshot, preferredEncoding: string, options: FileWriteOptions): TPromise<IFileStat> {
+	private _writeFile(provider: IFileSystemProvider, resource: URI, snapshot: ITextSnapshot, preferredEncoding: string, options: FileWriteOptions): Promise<IFileStat> {
 		const readable = createReadableOfSnapshot(snapshot);
 		const encoding = this.encoding.getWriteEncoding(resource, preferredEncoding);
 		const encoder = encodeStream(encoding);
 		const target = createWritableOfProvider(provider, resource, options);
-		return new TPromise<IFileStat>((resolve, reject) => {
+		return new Promise<IFileStat>((resolve, reject) => {
 			readable.pipe(encoder).pipe(target);
 			target.once('error', err => reject(err));
 			target.once('finish', _ => resolve(void 0));
@@ -490,15 +486,16 @@ export class RemoteFileService extends FileService {
 		});
 	}
 
-	private static _asContent(content: IStreamContent): TPromise<IContent> {
-		return new TPromise<IContent>((resolve, reject) => {
+	private static _asContent(content: IStreamContent): Promise<IContent> {
+		return new Promise<IContent>((resolve, reject) => {
 			let result: IContent = {
 				value: '',
 				encoding: content.encoding,
 				etag: content.etag,
 				mtime: content.mtime,
 				name: content.name,
-				resource: content.resource
+				resource: content.resource,
+				isReadonly: content.isReadonly
 			};
 			content.value.on('data', chunk => result.value += chunk);
 			content.value.on('error', reject);
@@ -508,24 +505,24 @@ export class RemoteFileService extends FileService {
 
 	// --- delete
 
-	del(resource: URI, useTrash?: boolean): TPromise<void> {
+	del(resource: URI, options?: { useTrash?: boolean, recursive?: boolean }): TPromise<void> {
 		if (resource.scheme === Schemas.file) {
-			return super.del(resource, useTrash);
+			return super.del(resource, options);
 		} else {
-			return this._withProvider(resource).then(provider => {
-				return provider.delete(resource).then(() => {
+			return this._withProvider(resource).then(RemoteFileService._throwIfFileSystemIsReadonly).then(provider => {
+				return provider.delete(resource, { recursive: options && options.recursive }).then(() => {
 					this._onAfterOperation.fire(new FileOperationEvent(resource, FileOperation.DELETE));
 				});
 			});
 		}
 	}
 
-	createFolder(resource: URI): TPromise<IFileStat, any> {
+	createFolder(resource: URI): TPromise<IFileStat> {
 		if (resource.scheme === Schemas.file) {
 			return super.createFolder(resource);
 		} else {
-			return this._withProvider(resource).then(provider => {
-				return RemoteFileService._mkdirp(provider, resource.with({ path: posix.dirname(resource.path) })).then(() => {
+			return this._withProvider(resource).then(RemoteFileService._throwIfFileSystemIsReadonly).then(provider => {
+				return RemoteFileService._mkdirp(provider, resources.dirname(resource)).then(() => {
 					return provider.mkdir(resource).then(() => {
 						return this.resolveFile(resource);
 					});
@@ -537,15 +534,6 @@ export class RemoteFileService extends FileService {
 		}
 	}
 
-	rename(resource: URI, newName: string): TPromise<IFileStat, any> {
-		if (resource.scheme === Schemas.file) {
-			return super.rename(resource, newName);
-		} else {
-			const target = resource.with({ path: posix.join(resource.path, '..', newName) });
-			return this._doMoveWithInScheme(resource, target, false);
-		}
-	}
-
 	moveFile(source: URI, target: URI, overwrite?: boolean): TPromise<IFileStat> {
 		if (source.scheme !== target.scheme) {
 			return this._doMoveAcrossScheme(source, target);
@@ -559,10 +547,10 @@ export class RemoteFileService extends FileService {
 	private _doMoveWithInScheme(source: URI, target: URI, overwrite?: boolean): TPromise<IFileStat> {
 
 		const prepare = overwrite
-			? this.del(target).then(undefined, err => { /*ignore*/ })
+			? this.del(target, { recursive: true }).then(undefined, err => { /*ignore*/ })
 			: TPromise.as(null);
 
-		return prepare.then(() => this._withProvider(source)).then(provider => {
+		return prepare.then(() => this._withProvider(source)).then(RemoteFileService._throwIfFileSystemIsReadonly).then(provider => {
 			return provider.rename(source, target, { overwrite }).then(() => {
 				return this.resolveFile(target);
 			}).then(fileStat => {
@@ -580,7 +568,7 @@ export class RemoteFileService extends FileService {
 
 	private _doMoveAcrossScheme(source: URI, target: URI, overwrite?: boolean): TPromise<IFileStat> {
 		return this.copyFile(source, target, overwrite).then(() => {
-			return this.del(source);
+			return this.del(source, { recursive: true });
 		}).then(() => {
 			return this.resolveFile(target);
 		}).then(fileStat => {
@@ -594,7 +582,7 @@ export class RemoteFileService extends FileService {
 			return super.copyFile(source, target, overwrite);
 		}
 
-		return this._withProvider(target).then(provider => {
+		return this._withProvider(target).then(RemoteFileService._throwIfFileSystemIsReadonly).then(provider => {
 
 			if (source.scheme === target.scheme && (provider.capabilities & FileSystemProviderCapabilities.FileFolderCopy)) {
 				// good: provider supports copy withing scheme
@@ -613,7 +601,7 @@ export class RemoteFileService extends FileService {
 			}
 
 			const prepare = overwrite
-				? this.del(target).then(undefined, err => { /*ignore*/ })
+				? this.del(target, { recursive: true }).then(undefined, err => { /*ignore*/ })
 				: TPromise.as(null);
 
 			return prepare.then(() => {
@@ -648,7 +636,7 @@ export class RemoteFileService extends FileService {
 
 	private _activeWatches = new Map<string, { unwatch: Thenable<IDisposable>, count: number }>();
 
-	public watchFileChanges(resource: URI, opts?: IWatchOptions): void {
+	watchFileChanges(resource: URI, opts?: IWatchOptions): void {
 		if (resource.scheme === Schemas.file) {
 			return super.watchFileChanges(resource);
 		}
@@ -674,7 +662,7 @@ export class RemoteFileService extends FileService {
 		});
 	}
 
-	public unwatchFileChanges(resource: URI): void {
+	unwatchFileChanges(resource: URI): void {
 		if (resource.scheme === Schemas.file) {
 			return super.unwatchFileChanges(resource);
 		}
diff --git a/src/vs/workbench/services/files/electron-browser/streams.ts b/src/vs/workbench/services/files/electron-browser/streams.ts
index 8e56b7da30e..d28b16bab56 100644
--- a/src/vs/workbench/services/files/electron-browser/streams.ts
+++ b/src/vs/workbench/services/files/electron-browser/streams.ts
@@ -6,7 +6,7 @@
 
 import { Readable, Writable } from 'stream';
 import { UTF8 } from 'vs/base/node/encoding';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { IFileSystemProvider, ITextSnapshot, FileSystemProviderCapabilities, FileWriteOptions } from 'vs/platform/files/common/files';
 import { illegalArgument } from 'vs/base/common/errors';
 
diff --git a/src/vs/workbench/services/files/node/watcher/common.ts b/src/vs/workbench/services/files/node/watcher/common.ts
index d191df60178..a9671c647c0 100644
--- a/src/vs/workbench/services/files/node/watcher/common.ts
+++ b/src/vs/workbench/services/files/node/watcher/common.ts
@@ -5,7 +5,7 @@
 
 'use strict';
 
-import uri from 'vs/base/common/uri';
+import { URI as uri } from 'vs/base/common/uri';
 import { FileChangeType, FileChangesEvent, isParent } from 'vs/platform/files/common/files';
 import { isLinux } from 'vs/base/common/platform';
 
diff --git a/src/vs/workbench/services/files/node/watcher/nsfw/nsfwWatcherService.ts b/src/vs/workbench/services/files/node/watcher/nsfw/nsfwWatcherService.ts
index b11e518b965..d3ef72006c8 100644
--- a/src/vs/workbench/services/files/node/watcher/nsfw/nsfwWatcherService.ts
+++ b/src/vs/workbench/services/files/node/watcher/nsfw/nsfwWatcherService.ts
@@ -9,11 +9,13 @@ import * as path from 'path';
 import * as platform from 'vs/base/common/platform';
 import * as watcher from 'vs/workbench/services/files/node/watcher/common';
 import * as nsfw from 'vscode-nsfw';
-import { IWatcherService, IWatcherRequest } from 'vs/workbench/services/files/node/watcher/nsfw/watcher';
-import { TPromise, ProgressCallback, TValueCallback, ErrorCallback } from 'vs/base/common/winjs.base';
+import { IWatcherService, IWatcherRequest, IWatcherOptions, IWatchError } from 'vs/workbench/services/files/node/watcher/nsfw/watcher';
+import { TPromise, TValueCallback } from 'vs/base/common/winjs.base';
 import { ThrottledDelayer } from 'vs/base/common/async';
 import { FileChangeType } from 'vs/platform/files/common/files';
 import { normalizeNFC } from 'vs/base/common/normalization';
+import { Event, Emitter } from 'vs/base/common/event';
+import { realcaseSync, realpathSync } from 'vs/base/node/extfs';
 
 const nsfwActionToRawChangeType: { [key: number]: number } = [];
 nsfwActionToRawChangeType[nsfw.actions.CREATED] = FileChangeType.ADDED;
@@ -28,27 +30,22 @@ interface IWatcherObjet {
 interface IPathWatcher {
 	ready: TPromise<IWatcherObjet>;
 	watcher?: IWatcherObjet;
-	ignored: string[];
+	ignored: glob.ParsedPattern[];
 }
 
 export class NsfwWatcherService implements IWatcherService {
 	private static readonly FS_EVENT_DELAY = 50; // aggregate and only emit events when changes have stopped for this duration (in ms)
 
 	private _pathWatchers: { [watchPath: string]: IPathWatcher } = {};
-	private _watcherPromise: TPromise<void>;
-	private _progressCallback: ProgressCallback;
-	private _errorCallback: ErrorCallback;
 	private _verboseLogging: boolean;
 	private enospcErrorLogged: boolean;
 
-	public initialize(verboseLogging: boolean): TPromise<void> {
-		this._verboseLogging = true;
-		this._watcherPromise = new TPromise<void>((c, e, p) => {
-			this._errorCallback = e;
-			this._progressCallback = p;
+	private _onWatchEvent = new Emitter<watcher.IRawFileChange[] | IWatchError>();
+	readonly onWatchEvent = this._onWatchEvent.event;
 
-		});
-		return this._watcherPromise;
+	watch(options: IWatcherOptions): Event<watcher.IRawFileChange[] | IWatchError> {
+		this._verboseLogging = options.verboseLogging;
+		return this.onWatchEvent;
 	}
 
 	private _watch(request: IWatcherRequest): void {
@@ -58,7 +55,7 @@ export class NsfwWatcherService implements IWatcherService {
 		let readyPromiseCallback: TValueCallback<IWatcherObjet>;
 		this._pathWatchers[request.basePath] = {
 			ready: new TPromise<IWatcherObjet>(c => readyPromiseCallback = c),
-			ignored: request.ignored
+			ignored: Array.isArray(request.ignored) ? request.ignored.map(ignored => glob.parse(ignored)) : []
 		};
 
 		process.on('uncaughtException', (e: Error | string) => {
@@ -70,10 +67,38 @@ export class NsfwWatcherService implements IWatcherService {
 			// See https://github.com/Microsoft/vscode/issues/7950
 			if (e === 'Inotify limit reached' && !this.enospcErrorLogged) {
 				this.enospcErrorLogged = true;
-				this._errorCallback(new Error('Inotify limit reached (ENOSPC)'));
+				this._onWatchEvent.fire({ message: 'Inotify limit reached (ENOSPC)' });
 			}
 		});
 
+		// NSFW does not report file changes in the path provided on macOS if
+		// - the path uses wrong casing
+		// - the path is a symbolic link
+		// We have to detect this case and massage the events to correct this.
+		let realBasePathDiffers = false;
+		let realBasePathLength = request.basePath.length;
+		if (platform.isMacintosh) {
+			try {
+
+				// First check for symbolic link
+				let realBasePath = realpathSync(request.basePath);
+
+				// Second check for casing difference
+				if (request.basePath === realBasePath) {
+					realBasePath = (realcaseSync(request.basePath) || request.basePath);
+				}
+
+				if (request.basePath !== realBasePath) {
+					realBasePathLength = realBasePath.length;
+					realBasePathDiffers = true;
+
+					console.warn(`Watcher basePath does not match version on disk and will be corrected (original: ${request.basePath}, real: ${realBasePath})`);
+				}
+			} catch (error) {
+				// ignore
+			}
+		}
+
 		nsfw(request.basePath, events => {
 			for (let i = 0; i < events.length; i++) {
 				const e = events[i];
@@ -81,7 +106,7 @@ export class NsfwWatcherService implements IWatcherService {
 				// Logging
 				if (this._verboseLogging) {
 					const logPath = e.action === nsfw.actions.RENAMED ? path.join(e.directory, e.oldFile) + ' -> ' + e.newFile : path.join(e.directory, e.file);
-					console.log(e.action === nsfw.actions.CREATED ? '[CREATED]' : e.action === nsfw.actions.DELETED ? '[DELETED]' : e.action === nsfw.actions.MODIFIED ? '[CHANGED]' : '[RENAMED]', logPath);
+					console.log(`${e.action === nsfw.actions.CREATED ? '[CREATED]' : e.action === nsfw.actions.DELETED ? '[DELETED]' : e.action === nsfw.actions.MODIFIED ? '[CHANGED]' : '[RENAMED]'} ${logPath}`);
 				}
 
 				// Convert nsfw event to IRawFileChange and add to queue
@@ -91,10 +116,14 @@ export class NsfwWatcherService implements IWatcherService {
 					absolutePath = path.join(e.directory, e.oldFile);
 					if (!this._isPathIgnored(absolutePath, this._pathWatchers[request.basePath].ignored)) {
 						undeliveredFileEvents.push({ type: FileChangeType.DELETED, path: absolutePath });
+					} else if (this._verboseLogging) {
+						console.log(' >> ignored', absolutePath);
 					}
 					absolutePath = path.join(e.directory, e.newFile);
 					if (!this._isPathIgnored(absolutePath, this._pathWatchers[request.basePath].ignored)) {
 						undeliveredFileEvents.push({ type: FileChangeType.ADDED, path: absolutePath });
+					} else if (this._verboseLogging) {
+						console.log(' >> ignored', absolutePath);
 					}
 				} else {
 					absolutePath = path.join(e.directory, e.file);
@@ -103,6 +132,8 @@ export class NsfwWatcherService implements IWatcherService {
 							type: nsfwActionToRawChangeType[e.action],
 							path: absolutePath
 						});
+					} else if (this._verboseLogging) {
+						console.log(' >> ignored', absolutePath);
 					}
 				}
 			}
@@ -112,19 +143,27 @@ export class NsfwWatcherService implements IWatcherService {
 				const events = undeliveredFileEvents;
 				undeliveredFileEvents = [];
 
-				// Mac uses NFD unicode form on disk, but we want NFC
 				if (platform.isMacintosh) {
-					events.forEach(e => e.path = normalizeNFC(e.path));
+					events.forEach(e => {
+
+						// Mac uses NFD unicode form on disk, but we want NFC
+						e.path = normalizeNFC(e.path);
+
+						// Convert paths back to original form in case it differs
+						if (realBasePathDiffers) {
+							e.path = request.basePath + e.path.substr(realBasePathLength);
+						}
+					});
 				}
 
 				// Broadcast to clients normalized
 				const res = watcher.normalize(events);
-				this._progressCallback(res);
+				this._onWatchEvent.fire(res);
 
 				// Logging
 				if (this._verboseLogging) {
 					res.forEach(r => {
-						console.log(' >> normalized', r.type === FileChangeType.ADDED ? '[ADDED]' : r.type === FileChangeType.DELETED ? '[DELETED]' : '[CHANGED]', r.path);
+						console.log(` >> normalized ${r.type === FileChangeType.ADDED ? '[ADDED]' : r.type === FileChangeType.DELETED ? '[DELETED]' : '[CHANGED]'} ${r.path}`);
 					});
 				}
 
@@ -169,7 +208,7 @@ export class NsfwWatcherService implements IWatcherService {
 		// Refresh ignored arrays in case they changed
 		roots.forEach(root => {
 			if (root.basePath in this._pathWatchers) {
-				this._pathWatchers[root.basePath].ignored = root.ignored;
+				this._pathWatchers[root.basePath].ignored = Array.isArray(root.ignored) ? root.ignored.map(ignored => glob.parse(ignored)) : [];
 			}
 		});
 
@@ -186,7 +225,7 @@ export class NsfwWatcherService implements IWatcherService {
 		}));
 	}
 
-	private _isPathIgnored(absolutePath: string, ignored: string[]): boolean {
-		return ignored && ignored.some(ignore => glob.match(ignore, absolutePath));
+	private _isPathIgnored(absolutePath: string, ignored: glob.ParsedPattern[]): boolean {
+		return ignored && ignored.some(i => i(absolutePath));
 	}
 }
diff --git a/src/vs/workbench/services/files/node/watcher/nsfw/watcher.ts b/src/vs/workbench/services/files/node/watcher/nsfw/watcher.ts
index 7e571c74ea4..771933f3559 100644
--- a/src/vs/workbench/services/files/node/watcher/nsfw/watcher.ts
+++ b/src/vs/workbench/services/files/node/watcher/nsfw/watcher.ts
@@ -6,13 +6,23 @@
 'use strict';
 
 import { TPromise } from 'vs/base/common/winjs.base';
+import { Event } from 'vs/base/common/event';
+import { IRawFileChange } from 'vs/workbench/services/files/node/watcher/common';
 
 export interface IWatcherRequest {
 	basePath: string;
 	ignored: string[];
 }
 
+export interface IWatcherOptions {
+	verboseLogging: boolean;
+}
+
+export interface IWatchError {
+	message: string;
+}
+
 export interface IWatcherService {
-	initialize(verboseLogging: boolean): TPromise<void>;
+	watch(options: IWatcherOptions): Event<IRawFileChange[] | IWatchError>;
 	setRoots(roots: IWatcherRequest[]): TPromise<void>;
 }
\ No newline at end of file
diff --git a/src/vs/workbench/services/files/node/watcher/nsfw/watcherIpc.ts b/src/vs/workbench/services/files/node/watcher/nsfw/watcherIpc.ts
index 88ebc3d19da..e90d6db72e0 100644
--- a/src/vs/workbench/services/files/node/watcher/nsfw/watcherIpc.ts
+++ b/src/vs/workbench/services/files/node/watcher/nsfw/watcherIpc.ts
@@ -6,22 +6,32 @@
 'use strict';
 
 import { TPromise } from 'vs/base/common/winjs.base';
-import { IChannel } from 'vs/base/parts/ipc/common/ipc';
-import { IWatcherRequest, IWatcherService } from './watcher';
+import { IChannel } from 'vs/base/parts/ipc/node/ipc';
+import { IWatcherRequest, IWatcherService, IWatcherOptions, IWatchError } from './watcher';
+import { Event } from 'vs/base/common/event';
+import { IRawFileChange } from 'vs/workbench/services/files/node/watcher/common';
 
 export interface IWatcherChannel extends IChannel {
-	call(command: 'initialize', verboseLogging: boolean): TPromise<void>;
+	listen(event: 'watch', verboseLogging: boolean): Event<IRawFileChange[] | Error>;
+	listen<T>(event: string, arg?: any): Event<T>;
+
 	call(command: 'setRoots', request: IWatcherRequest[]): TPromise<void>;
-	call(command: string, arg: any): TPromise<any>;
+	call<T>(command: string, arg?: any): TPromise<T>;
 }
 
 export class WatcherChannel implements IWatcherChannel {
 
 	constructor(private service: IWatcherService) { }
 
+	listen(event: string, arg?: any): Event<any> {
+		switch (event) {
+			case 'watch': return this.service.watch(arg);
+		}
+		throw new Error('No events');
+	}
+
 	call(command: string, arg: any): TPromise<any> {
 		switch (command) {
-			case 'initialize': return this.service.initialize(arg);
 			case 'setRoots': return this.service.setRoots(arg);
 		}
 		return undefined;
@@ -32,8 +42,8 @@ export class WatcherChannelClient implements IWatcherService {
 
 	constructor(private channel: IWatcherChannel) { }
 
-	initialize(verboseLogging: boolean): TPromise<void> {
-		return this.channel.call('initialize', verboseLogging);
+	watch(options: IWatcherOptions): Event<IRawFileChange[] | IWatchError> {
+		return this.channel.listen('watch', options);
 	}
 
 	setRoots(roots: IWatcherRequest[]): TPromise<void> {
diff --git a/src/vs/workbench/services/files/node/watcher/nsfw/watcherService.ts b/src/vs/workbench/services/files/node/watcher/nsfw/watcherService.ts
index e5403578de2..43c2324c8a4 100644
--- a/src/vs/workbench/services/files/node/watcher/nsfw/watcherService.ts
+++ b/src/vs/workbench/services/files/node/watcher/nsfw/watcherService.ts
@@ -5,10 +5,8 @@
 
 'use strict';
 
-import { TPromise } from 'vs/base/common/winjs.base';
-import { getNextTickChannel } from 'vs/base/parts/ipc/common/ipc';
+import { getNextTickChannel } from 'vs/base/parts/ipc/node/ipc';
 import { Client } from 'vs/base/parts/ipc/node/ipc.cp';
-import uri from 'vs/base/common/uri';
 import { toFileChangesEvent, IRawFileChange } from 'vs/workbench/services/files/node/watcher/common';
 import { IWatcherChannel, WatcherChannelClient } from 'vs/workbench/services/files/node/watcher/nsfw/watcherIpc';
 import { FileChangesEvent, IFilesConfiguration } from 'vs/platform/files/common/files';
@@ -16,7 +14,9 @@ import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { Schemas } from 'vs/base/common/network';
-import { isPromiseCanceledError } from 'vs/base/common/errors';
+import { filterEvent } from 'vs/base/common/event';
+import { IWatchError } from 'vs/workbench/services/files/node/watcher/nsfw/watcher';
+import { getPathFromAmdModule } from 'vs/base/common/amd';
 
 export class FileWatcher {
 	private static readonly MAX_RESTARTS = 5;
@@ -24,7 +24,7 @@ export class FileWatcher {
 	private service: WatcherChannelClient;
 	private isDisposed: boolean;
 	private restartCounter: number;
-	private toDispose: IDisposable[];
+	private toDispose: IDisposable[] = [];
 
 	constructor(
 		private contextService: IWorkspaceContextService,
@@ -35,17 +35,14 @@ export class FileWatcher {
 	) {
 		this.isDisposed = false;
 		this.restartCounter = 0;
-		this.toDispose = [];
 	}
 
 	public startWatching(): () => void {
-		const args = ['--type=watcherService'];
-
 		const client = new Client(
-			uri.parse(require.toUrl('bootstrap')).fsPath,
+			getPathFromAmdModule(require, 'bootstrap-fork'),
 			{
-				serverName: 'Watcher',
-				args,
+				serverName: 'File Watcher (nsfw)',
+				args: ['--type=watcherService'],
 				env: {
 					AMD_ENTRYPOINT: 'vs/workbench/services/files/node/watcher/nsfw/watcherApp',
 					PIPE_LOGGING: 'true',
@@ -55,16 +52,7 @@ export class FileWatcher {
 		);
 		this.toDispose.push(client);
 
-		// Initialize watcher
-		const channel = getNextTickChannel(client.getChannel<IWatcherChannel>('watcher'));
-		this.service = new WatcherChannelClient(channel);
-		this.service.initialize(this.verboseLogging).then(null, err => {
-			if (!this.isDisposed && !isPromiseCanceledError(err)) {
-				return TPromise.wrapError(err); // the service lib uses the promise cancel error to indicate the process died, we do not want to bubble this up
-			}
-			return void 0;
-		}, (events: IRawFileChange[]) => this.onRawFileEvents(events)).done(() => {
-
+		client.onDidProcessExit(() => {
 			// our watcher app should never be completed because it keeps on watching. being in here indicates
 			// that the watcher process died and we want to restart it here. we only do it a max number of times
 			if (!this.isDisposed) {
@@ -76,11 +64,20 @@ export class FileWatcher {
 					this.errorLogger('[FileWatcher] failed to start after retrying for some time, giving up. Please report this as a bug report!');
 				}
 			}
-		}, error => {
-			if (!this.isDisposed) {
-				this.errorLogger(error);
-			}
-		});
+		}, null, this.toDispose);
+
+		// Initialize watcher
+		const channel = getNextTickChannel(client.getChannel<IWatcherChannel>('watcher'));
+		this.service = new WatcherChannelClient(channel);
+
+		const options = { verboseLogging: this.verboseLogging };
+		const onWatchEvent = filterEvent(this.service.watch(options), () => !this.isDisposed);
+
+		const onError = filterEvent<any, IWatchError>(onWatchEvent, (e): e is IWatchError => typeof e.message === 'string');
+		onError(err => this.errorLogger(err.message), null, this.toDispose);
+
+		const onFileChanges = filterEvent<any, IRawFileChange[]>(onWatchEvent, (e): e is IRawFileChange[] => Array.isArray(e) && e.length > 0);
+		onFileChanges(e => this.onFileChanges(toFileChangesEvent(e)), null, this.toDispose);
 
 		// Start watching
 		this.updateFolders();
@@ -118,17 +115,6 @@ export class FileWatcher {
 		}));
 	}
 
-	private onRawFileEvents(events: IRawFileChange[]): void {
-		if (this.isDisposed) {
-			return;
-		}
-
-		// Emit through event emitter
-		if (events.length > 0) {
-			this.onFileChanges(toFileChangesEvent(events));
-		}
-	}
-
 	private dispose(): void {
 		this.isDisposed = true;
 		this.toDispose = dispose(this.toDispose);
diff --git a/src/vs/workbench/services/files/node/watcher/unix/chokidarWatcherService.ts b/src/vs/workbench/services/files/node/watcher/unix/chokidarWatcherService.ts
index 550297d06f0..090f688ef85 100644
--- a/src/vs/workbench/services/files/node/watcher/unix/chokidarWatcherService.ts
+++ b/src/vs/workbench/services/files/node/watcher/unix/chokidarWatcherService.ts
@@ -21,7 +21,8 @@ import { normalizeNFC } from 'vs/base/common/normalization';
 import { realcaseSync } from 'vs/base/node/extfs';
 import { isMacintosh } from 'vs/base/common/platform';
 import * as watcherCommon from 'vs/workbench/services/files/node/watcher/common';
-import { IWatcherRequest, IWatcherService, IWatcherOptions } from 'vs/workbench/services/files/node/watcher/unix/watcher';
+import { IWatcherRequest, IWatcherService, IWatcherOptions, IWatchError } from 'vs/workbench/services/files/node/watcher/unix/watcher';
+import { Emitter, Event } from 'vs/base/common/event';
 
 interface IWatcher {
 	requests: ExtendedWatcherRequest[];
@@ -44,29 +45,20 @@ export class ChokidarWatcherService implements IWatcherService {
 	private _watchers: { [watchPath: string]: IWatcher };
 	private _watcherCount: number;
 
-	private _watcherPromise: TPromise<void>;
 	private _options: IWatcherOptions & IChockidarWatcherOptions;
 
 	private spamCheckStartTime: number;
 	private spamWarningLogged: boolean;
 	private enospcErrorLogged: boolean;
-	private _errorCallback: (error: Error) => void;
-	private _fileChangeCallback: (changes: watcherCommon.IRawFileChange[]) => void;
 
-	public initialize(options: IWatcherOptions & IChockidarWatcherOptions): TPromise<void> {
+	private _onWatchEvent = new Emitter<watcherCommon.IRawFileChange[] | IWatchError>();
+	readonly onWatchEvent = this._onWatchEvent.event;
+
+	watch(options: IWatcherOptions & IChockidarWatcherOptions): Event<watcherCommon.IRawFileChange[] | IWatchError> {
 		this._options = options;
 		this._watchers = Object.create(null);
 		this._watcherCount = 0;
-		this._watcherPromise = new TPromise<void>((c, e, p) => {
-			this._errorCallback = (error) => {
-				this.stop();
-				e(error);
-			};
-			this._fileChangeCallback = p;
-		}, () => {
-			this.stop();
-		});
-		return this._watcherPromise;
+		return this.onWatchEvent;
 	}
 
 	public setRoots(requests: IWatcherRequest[]): TPromise<void> {
@@ -121,7 +113,8 @@ export class ChokidarWatcherService implements IWatcherService {
 		};
 
 		// if there's only one request, use the built-in ignore-filterering
-		if (requests.length === 1) {
+		const isSingleFolder = requests.length === 1;
+		if (isSingleFolder) {
 			watcherOpts.ignored = requests[0].ignored;
 		}
 
@@ -202,15 +195,19 @@ export class ChokidarWatcherService implements IWatcherService {
 					return;
 			}
 
-			if (isIgnored(path, watcher.requests)) {
-				return;
+			// if there's more than one request we need to do
+			// extra filtering due to potentially overlapping roots
+			if (!isSingleFolder) {
+				if (isIgnored(path, watcher.requests)) {
+					return;
+				}
 			}
 
 			let event = { type: eventType, path };
 
 			// Logging
 			if (this._options.verboseLogging) {
-				console.log(eventType === FileChangeType.ADDED ? '[ADDED]' : eventType === FileChangeType.DELETED ? '[DELETED]' : '[CHANGED]', path);
+				console.log(`${eventType === FileChangeType.ADDED ? '[ADDED]' : eventType === FileChangeType.DELETED ? '[DELETED]' : '[CHANGED]'} ${path}`);
 			}
 
 			// Check for spam
@@ -233,12 +230,12 @@ export class ChokidarWatcherService implements IWatcherService {
 
 				// Broadcast to clients normalized
 				const res = watcherCommon.normalize(events);
-				this._fileChangeCallback(res);
+				this._onWatchEvent.fire(res);
 
 				// Logging
 				if (this._options.verboseLogging) {
 					res.forEach(r => {
-						console.log(' >> normalized', r.type === FileChangeType.ADDED ? '[ADDED]' : r.type === FileChangeType.DELETED ? '[DELETED]' : '[CHANGED]', r.path);
+						console.log(` >> normalized  ${r.type === FileChangeType.ADDED ? '[ADDED]' : r.type === FileChangeType.DELETED ? '[DELETED]' : '[CHANGED]'} ${r.path}`);
 					});
 				}
 
@@ -257,7 +254,8 @@ export class ChokidarWatcherService implements IWatcherService {
 				if ((<any>error).code === 'ENOSPC') {
 					if (!this.enospcErrorLogged) {
 						this.enospcErrorLogged = true;
-						this._errorCallback(new Error('Inotify limit reached (ENOSPC)'));
+						this.stop();
+						this._onWatchEvent.fire({ message: 'Inotify limit reached (ENOSPC)' });
 					}
 				} else {
 					console.error(error.toString());
diff --git a/src/vs/workbench/services/files/node/watcher/unix/test/chockidarWatcherService.test.ts b/src/vs/workbench/services/files/node/watcher/unix/test/chockidarWatcherService.test.ts
index 9f9ce6309c7..ef26ad06b85 100644
--- a/src/vs/workbench/services/files/node/watcher/unix/test/chockidarWatcherService.test.ts
+++ b/src/vs/workbench/services/files/node/watcher/unix/test/chockidarWatcherService.test.ts
@@ -137,19 +137,15 @@ suite.skip('Chockidar watching', () => {
 		await pfs.mkdirp(bFolder);
 		await pfs.mkdirp(b2Folder);
 
-		const promise = service.initialize({ verboseLogging: false, pollingInterval: 200 });
-		promise.then(null,
-			e => {
-				console.log('set error', e);
-				error = e;
-			},
-			p => {
-				if (Array.isArray(p)) {
-					result.push(...p);
-				}
+		const opts = { verboseLogging: false, pollingInterval: 200 };
+		service.watch(opts)(e => {
+			if (Array.isArray(e)) {
+				result.push(...e);
+			} else {
+				console.log('set error', e.message);
+				error = e.message;
 			}
-		);
-
+		});
 	});
 
 	suiteTeardown(async () => {
diff --git a/src/vs/workbench/services/files/node/watcher/unix/watcher.ts b/src/vs/workbench/services/files/node/watcher/unix/watcher.ts
index 8ed35e6c792..771933f3559 100644
--- a/src/vs/workbench/services/files/node/watcher/unix/watcher.ts
+++ b/src/vs/workbench/services/files/node/watcher/unix/watcher.ts
@@ -6,6 +6,8 @@
 'use strict';
 
 import { TPromise } from 'vs/base/common/winjs.base';
+import { Event } from 'vs/base/common/event';
+import { IRawFileChange } from 'vs/workbench/services/files/node/watcher/common';
 
 export interface IWatcherRequest {
 	basePath: string;
@@ -16,7 +18,11 @@ export interface IWatcherOptions {
 	verboseLogging: boolean;
 }
 
-export interface IWatcherService {
-	initialize(options: IWatcherOptions): TPromise<void>;
-	setRoots(roots: IWatcherRequest[]): TPromise<void>;
+export interface IWatchError {
+	message: string;
 }
+
+export interface IWatcherService {
+	watch(options: IWatcherOptions): Event<IRawFileChange[] | IWatchError>;
+	setRoots(roots: IWatcherRequest[]): TPromise<void>;
+}
\ No newline at end of file
diff --git a/src/vs/workbench/services/files/node/watcher/unix/watcherIpc.ts b/src/vs/workbench/services/files/node/watcher/unix/watcherIpc.ts
index bf2fba4664b..e90d6db72e0 100644
--- a/src/vs/workbench/services/files/node/watcher/unix/watcherIpc.ts
+++ b/src/vs/workbench/services/files/node/watcher/unix/watcherIpc.ts
@@ -6,22 +6,32 @@
 'use strict';
 
 import { TPromise } from 'vs/base/common/winjs.base';
-import { IChannel } from 'vs/base/parts/ipc/common/ipc';
-import { IWatcherRequest, IWatcherService, IWatcherOptions } from 'vs/workbench/services/files/node/watcher/unix/watcher';
+import { IChannel } from 'vs/base/parts/ipc/node/ipc';
+import { IWatcherRequest, IWatcherService, IWatcherOptions, IWatchError } from './watcher';
+import { Event } from 'vs/base/common/event';
+import { IRawFileChange } from 'vs/workbench/services/files/node/watcher/common';
 
 export interface IWatcherChannel extends IChannel {
-	call(command: 'initialize', options: IWatcherOptions): TPromise<void>;
+	listen(event: 'watch', verboseLogging: boolean): Event<IRawFileChange[] | Error>;
+	listen<T>(event: string, arg?: any): Event<T>;
+
 	call(command: 'setRoots', request: IWatcherRequest[]): TPromise<void>;
-	call(command: string, arg: any): TPromise<any>;
+	call<T>(command: string, arg?: any): TPromise<T>;
 }
 
 export class WatcherChannel implements IWatcherChannel {
 
 	constructor(private service: IWatcherService) { }
 
+	listen(event: string, arg?: any): Event<any> {
+		switch (event) {
+			case 'watch': return this.service.watch(arg);
+		}
+		throw new Error('No events');
+	}
+
 	call(command: string, arg: any): TPromise<any> {
 		switch (command) {
-			case 'initialize': return this.service.initialize(arg);
 			case 'setRoots': return this.service.setRoots(arg);
 		}
 		return undefined;
@@ -32,8 +42,8 @@ export class WatcherChannelClient implements IWatcherService {
 
 	constructor(private channel: IWatcherChannel) { }
 
-	initialize(options: IWatcherOptions): TPromise<void> {
-		return this.channel.call('initialize', options);
+	watch(options: IWatcherOptions): Event<IRawFileChange[] | IWatchError> {
+		return this.channel.listen('watch', options);
 	}
 
 	setRoots(roots: IWatcherRequest[]): TPromise<void> {
diff --git a/src/vs/workbench/services/files/node/watcher/unix/watcherService.ts b/src/vs/workbench/services/files/node/watcher/unix/watcherService.ts
index e51c287854f..1c9aff61c65 100644
--- a/src/vs/workbench/services/files/node/watcher/unix/watcherService.ts
+++ b/src/vs/workbench/services/files/node/watcher/unix/watcherService.ts
@@ -5,18 +5,18 @@
 
 'use strict';
 
-import { TPromise } from 'vs/base/common/winjs.base';
-import { getNextTickChannel } from 'vs/base/parts/ipc/common/ipc';
+import { getNextTickChannel } from 'vs/base/parts/ipc/node/ipc';
 import { Client } from 'vs/base/parts/ipc/node/ipc.cp';
-import uri from 'vs/base/common/uri';
 import { toFileChangesEvent, IRawFileChange } from 'vs/workbench/services/files/node/watcher/common';
 import { IWatcherChannel, WatcherChannelClient } from 'vs/workbench/services/files/node/watcher/unix/watcherIpc';
 import { FileChangesEvent, IFilesConfiguration } from 'vs/platform/files/common/files';
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { isPromiseCanceledError } from 'vs/base/common/errors';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { Schemas } from 'vs/base/common/network';
+import { filterEvent } from 'vs/base/common/event';
+import { IWatchError } from 'vs/workbench/services/files/node/watcher/unix/watcher';
+import { getPathFromAmdModule } from 'vs/base/common/amd';
 
 export class FileWatcher {
 	private static readonly MAX_RESTARTS = 5;
@@ -42,9 +42,9 @@ export class FileWatcher {
 		const args = ['--type=watcherService'];
 
 		const client = new Client(
-			uri.parse(require.toUrl('bootstrap')).fsPath,
+			getPathFromAmdModule(require, 'bootstrap-fork'),
 			{
-				serverName: 'Watcher',
+				serverName: 'File Watcher (chokidar)',
 				args,
 				env: {
 					AMD_ENTRYPOINT: 'vs/workbench/services/files/node/watcher/unix/watcherApp',
@@ -55,20 +55,7 @@ export class FileWatcher {
 		);
 		this.toDispose.push(client);
 
-		const channel = getNextTickChannel(client.getChannel<IWatcherChannel>('watcher'));
-		this.service = new WatcherChannelClient(channel);
-
-		const options = {
-			verboseLogging: this.verboseLogging
-		};
-
-		this.service.initialize(options).then(null, err => {
-			if (!this.isDisposed && !isPromiseCanceledError(err)) {
-				return TPromise.wrapError(err); // the service lib uses the promise cancel error to indicate the process died, we do not want to bubble this up
-			}
-			return void 0;
-		}, (events: IRawFileChange[]) => this.onRawFileEvents(events)).done(() => {
-
+		client.onDidProcessExit(() => {
 			// our watcher app should never be completed because it keeps on watching. being in here indicates
 			// that the watcher process died and we want to restart it here. we only do it a max number of times
 			if (!this.isDisposed) {
@@ -80,11 +67,19 @@ export class FileWatcher {
 					this.errorLogger('[FileWatcher] failed to start after retrying for some time, giving up. Please report this as a bug report!');
 				}
 			}
-		}, error => {
-			if (!this.isDisposed) {
-				this.errorLogger(error);
-			}
-		});
+		}, null, this.toDispose);
+
+		const channel = getNextTickChannel(client.getChannel<IWatcherChannel>('watcher'));
+		this.service = new WatcherChannelClient(channel);
+
+		const options = { verboseLogging: this.verboseLogging };
+		const onWatchEvent = filterEvent(this.service.watch(options), () => !this.isDisposed);
+
+		const onError = filterEvent<any, IWatchError>(onWatchEvent, (e): e is IWatchError => typeof e.message === 'string');
+		onError(err => this.errorLogger(err.message), null, this.toDispose);
+
+		const onFileChanges = filterEvent<any, IRawFileChange[]>(onWatchEvent, (e): e is IRawFileChange[] => Array.isArray(e) && e.length > 0);
+		onFileChanges(e => this.onFileChanges(toFileChangesEvent(e)), null, this.toDispose);
 
 		// Start watching
 		this.updateFolders();
@@ -123,19 +118,8 @@ export class FileWatcher {
 		}));
 	}
 
-	private onRawFileEvents(events: IRawFileChange[]): void {
-		if (this.isDisposed) {
-			return;
-		}
-
-		// Emit through event emitter
-		if (events.length > 0) {
-			this.onFileChanges(toFileChangesEvent(events));
-		}
-	}
-
 	private dispose(): void {
 		this.isDisposed = true;
 		this.toDispose = dispose(this.toDispose);
 	}
-}
\ No newline at end of file
+}
diff --git a/src/vs/workbench/services/files/node/watcher/win32/csharpWatcherService.ts b/src/vs/workbench/services/files/node/watcher/win32/csharpWatcherService.ts
index 949c3d1b36f..044fd96d817 100644
--- a/src/vs/workbench/services/files/node/watcher/win32/csharpWatcherService.ts
+++ b/src/vs/workbench/services/files/node/watcher/win32/csharpWatcherService.ts
@@ -10,9 +10,9 @@ import * as cp from 'child_process';
 import { FileChangeType } from 'vs/platform/files/common/files';
 import * as decoder from 'vs/base/node/decoder';
 import * as glob from 'vs/base/common/glob';
-import uri from 'vs/base/common/uri';
 
 import { IRawFileChange } from 'vs/workbench/services/files/node/watcher/common';
+import { getPathFromAmdModule } from 'vs/base/common/amd';
 
 export class OutOfProcessWin32FolderWatcher {
 
@@ -20,18 +20,26 @@ export class OutOfProcessWin32FolderWatcher {
 
 	private static changeTypeMap: FileChangeType[] = [FileChangeType.UPDATED, FileChangeType.ADDED, FileChangeType.DELETED];
 
+	private ignored: glob.ParsedPattern[];
+
 	private handle: cp.ChildProcess;
 	private restartCounter: number;
 
 	constructor(
 		private watchedFolder: string,
-		private ignored: string[],
+		ignored: string[],
 		private eventCallback: (events: IRawFileChange[]) => void,
 		private errorCallback: (error: string) => void,
 		private verboseLogging: boolean
 	) {
 		this.restartCounter = 0;
 
+		if (Array.isArray(ignored)) {
+			this.ignored = ignored.map(i => glob.parse(i));
+		} else {
+			this.ignored = [];
+		}
+
 		this.startWatcher();
 	}
 
@@ -41,12 +49,12 @@ export class OutOfProcessWin32FolderWatcher {
 			args.push('-verbose');
 		}
 
-		this.handle = cp.spawn(uri.parse(require.toUrl('vs/workbench/services/files/node/watcher/win32/CodeHelper.exe')).fsPath, args);
+		this.handle = cp.spawn(getPathFromAmdModule(require, 'vs/workbench/services/files/node/watcher/win32/CodeHelper.exe'), args);
 
 		const stdoutLineDecoder = new decoder.LineDecoder();
 
 		// Events over stdout
-		this.handle.stdout.on('data', (data: NodeBuffer) => {
+		this.handle.stdout.on('data', (data: Buffer) => {
 
 			// Collect raw events from output
 			const rawEvents: IRawFileChange[] = [];
@@ -60,7 +68,11 @@ export class OutOfProcessWin32FolderWatcher {
 					if (changeType >= 0 && changeType < 3) {
 
 						// Support ignores
-						if (this.ignored && this.ignored.some(ignore => glob.match(ignore, absolutePath))) {
+						if (this.ignored && this.ignored.some(ignore => ignore(absolutePath))) {
+							if (this.verboseLogging) {
+								console.log('%c[File Watcher (C#)]', 'color: blue', ' >> ignored', absolutePath);
+							}
+
 							return;
 						}
 
@@ -73,7 +85,7 @@ export class OutOfProcessWin32FolderWatcher {
 
 					// 3 Logging
 					else {
-						console.log('%c[File Watcher]', 'color: darkgreen', eventParts[1]);
+						console.log('%c[File Watcher (C#)]', 'color: blue', eventParts[1]);
 					}
 				}
 			});
@@ -86,26 +98,26 @@ export class OutOfProcessWin32FolderWatcher {
 
 		// Errors
 		this.handle.on('error', (error: Error) => this.onError(error));
-		this.handle.stderr.on('data', (data: NodeBuffer) => this.onError(data));
+		this.handle.stderr.on('data', (data: Buffer) => this.onError(data));
 
 		// Exit
 		this.handle.on('exit', (code: number, signal: string) => this.onExit(code, signal));
 	}
 
-	private onError(error: Error | NodeBuffer): void {
-		this.errorCallback('[FileWatcher] process error: ' + error.toString());
+	private onError(error: Error | Buffer): void {
+		this.errorCallback('[File Watcher (C#)] process error: ' + error.toString());
 	}
 
 	private onExit(code: number, signal: string): void {
 		if (this.handle) { // exit while not yet being disposed is unexpected!
-			this.errorCallback(`[FileWatcher] terminated unexpectedly (code: ${code}, signal: ${signal})`);
+			this.errorCallback(`[File Watcher (C#)] terminated unexpectedly (code: ${code}, signal: ${signal})`);
 
 			if (this.restartCounter <= OutOfProcessWin32FolderWatcher.MAX_RESTARTS) {
-				this.errorCallback('[FileWatcher] is restarted again...');
+				this.errorCallback('[File Watcher (C#)] is restarted again...');
 				this.restartCounter++;
 				this.startWatcher(); // restart
 			} else {
-				this.errorCallback('[FileWatcher] Watcher failed to start after retrying for some time, giving up. Please report this as a bug report!');
+				this.errorCallback('[File Watcher (C#)] Watcher failed to start after retrying for some time, giving up. Please report this as a bug report!');
 			}
 		}
 	}
@@ -116,4 +128,4 @@ export class OutOfProcessWin32FolderWatcher {
 			this.handle = null;
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/vs/workbench/services/files/node/watcher/win32/watcherService.ts b/src/vs/workbench/services/files/node/watcher/win32/watcherService.ts
index 26295cbc4a9..3672cdd0775 100644
--- a/src/vs/workbench/services/files/node/watcher/win32/watcherService.ts
+++ b/src/vs/workbench/services/files/node/watcher/win32/watcherService.ts
@@ -12,6 +12,7 @@ import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace
 import { normalize } from 'path';
 import { rtrim, endsWith } from 'vs/base/common/strings';
 import { sep } from 'vs/base/common/paths';
+import { Schemas } from 'vs/base/common/network';
 
 export class FileWatcher {
 	private isDisposed: boolean;
@@ -26,6 +27,9 @@ export class FileWatcher {
 	}
 
 	public startWatching(): () => void {
+		if (this.contextService.getWorkspace().folders[0].uri.scheme !== Schemas.file) {
+			return () => { };
+		}
 		let basePath: string = normalize(this.contextService.getWorkspace().folders[0].uri.fsPath);
 
 		if (basePath && basePath.indexOf('\\\\') === 0 && endsWith(basePath, sep)) {
diff --git a/src/vs/workbench/services/files/test/electron-browser/fileService.test.ts b/src/vs/workbench/services/files/test/electron-browser/fileService.test.ts
index 822b9dc356d..9aa87fbfdde 100644
--- a/src/vs/workbench/services/files/test/electron-browser/fileService.test.ts
+++ b/src/vs/workbench/services/files/test/electron-browser/fileService.test.ts
@@ -13,7 +13,7 @@ import * as assert from 'assert';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { FileService } from 'vs/workbench/services/files/electron-browser/fileService';
 import { FileOperation, FileOperationEvent, FileChangesEvent, FileOperationResult, FileOperationError } from 'vs/platform/files/common/files';
-import uri from 'vs/base/common/uri';
+import { URI as uri } from 'vs/base/common/uri';
 import * as uuid from 'vs/base/common/uuid';
 import * as pfs from 'vs/base/node/pfs';
 import * as encodingLib from 'vs/base/node/encoding';
@@ -24,6 +24,7 @@ import { Workspace, toWorkspaceFolders } from 'vs/platform/workspace/common/work
 import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
 import { TextModel } from 'vs/editor/common/model/textModel';
 import { IEncodingOverride } from 'vs/workbench/services/files/electron-browser/encoding';
+import { getPathFromAmdModule } from 'vs/base/common/amd';
 
 suite('FileService', () => {
 	let service: FileService;
@@ -33,10 +34,10 @@ suite('FileService', () => {
 	setup(function () {
 		const id = uuid.generateUuid();
 		testDir = path.join(parentDir, id);
-		const sourceDir = require.toUrl('./fixtures/service');
+		const sourceDir = getPathFromAmdModule(require, './fixtures/service');
 
 		return pfs.copy(sourceDir, testDir).then(() => {
-			service = new FileService(new TestContextService(new Workspace(testDir, testDir, toWorkspaceFolders([{ path: testDir }]))), TestEnvironmentService, new TestTextResourceConfigurationService(), new TestConfigurationService(), new TestLifecycleService(), new TestStorageService(), new TestNotificationService(), { disableWatcher: true });
+			service = new FileService(new TestContextService(new Workspace(testDir, toWorkspaceFolders([{ path: testDir }]))), TestEnvironmentService, new TestTextResourceConfigurationService(), new TestConfigurationService(), new TestLifecycleService(), new TestStorageService(), new TestNotificationService(), { disableWatcher: true });
 		});
 	});
 
@@ -157,7 +158,7 @@ suite('FileService', () => {
 
 		const resource = uri.file(path.join(testDir, 'index.html'));
 		return service.resolveFile(resource).then(source => {
-			return service.rename(source.resource, 'other.html').then(renamed => {
+			return service.moveFile(source.resource, uri.file(path.join(path.dirname(source.resource.fsPath), 'other.html'))).then(renamed => {
 				assert.equal(fs.existsSync(renamed.resource.fsPath), true);
 				assert.equal(fs.existsSync(source.resource.fsPath), false);
 
@@ -181,7 +182,7 @@ suite('FileService', () => {
 
 		const resource = uri.file(path.join(testDir, 'index.html'));
 		return service.resolveFile(resource).then(source => {
-			return service.rename(source.resource, renameToPath).then(renamed => {
+			return service.moveFile(source.resource, uri.file(path.join(path.dirname(source.resource.fsPath), renameToPath))).then(renamed => {
 				assert.equal(fs.existsSync(renamed.resource.fsPath), true);
 				assert.equal(fs.existsSync(source.resource.fsPath), false);
 
@@ -202,7 +203,7 @@ suite('FileService', () => {
 
 		const resource = uri.file(path.join(testDir, 'deep'));
 		return service.resolveFile(resource).then(source => {
-			return service.rename(source.resource, 'deeper').then(renamed => {
+			return service.moveFile(source.resource, uri.file(path.join(path.dirname(source.resource.fsPath), 'deeper'))).then(renamed => {
 				assert.equal(fs.existsSync(renamed.resource.fsPath), true);
 				assert.equal(fs.existsSync(source.resource.fsPath), false);
 
@@ -226,7 +227,7 @@ suite('FileService', () => {
 
 		const resource = uri.file(path.join(testDir, 'deep'));
 		return service.resolveFile(resource).then(source => {
-			return service.rename(source.resource, renameToPath).then(renamed => {
+			return service.moveFile(source.resource, uri.file(path.join(path.dirname(source.resource.fsPath), renameToPath))).then(renamed => {
 				assert.equal(fs.existsSync(renamed.resource.fsPath), true);
 				assert.equal(fs.existsSync(source.resource.fsPath), false);
 
@@ -246,7 +247,7 @@ suite('FileService', () => {
 
 		const resource = uri.file(path.join(testDir, 'index.html'));
 		return service.resolveFile(resource).then(source => {
-			return service.rename(source.resource, 'INDEX.html').then(renamed => {
+			return service.moveFile(source.resource, uri.file(path.join(path.dirname(source.resource.fsPath), 'INDEX.html'))).then(renamed => {
 				assert.equal(fs.existsSync(renamed.resource.fsPath), true);
 				assert.equal(path.basename(renamed.resource.fsPath), 'INDEX.html');
 
@@ -430,7 +431,7 @@ suite('FileService', () => {
 
 	test('copyFile - MIX CASE', function () {
 		return service.resolveFile(uri.file(path.join(testDir, 'index.html'))).then(source => {
-			return service.rename(source.resource, 'CONWAY.js').then(renamed => { // index.html => CONWAY.js
+			return service.moveFile(source.resource, uri.file(path.join(path.dirname(source.resource.fsPath), 'CONWAY.js'))).then(renamed => {
 				assert.equal(fs.existsSync(renamed.resource.fsPath), true);
 				assert.ok(fs.readdirSync(testDir).some(f => f === 'CONWAY.js'));
 
@@ -476,7 +477,7 @@ suite('FileService', () => {
 		});
 	});
 
-	test('deleteFolder', function () {
+	test('deleteFolder (recursive)', function () {
 		let event: FileOperationEvent;
 		const toDispose = service.onAfterOperation(e => {
 			event = e;
@@ -484,7 +485,7 @@ suite('FileService', () => {
 
 		const resource = uri.file(path.join(testDir, 'deep'));
 		return service.resolveFile(resource).then(source => {
-			return service.del(source.resource).then(() => {
+			return service.del(source.resource, { recursive: true }).then(() => {
 				assert.equal(fs.existsSync(source.resource.fsPath), false);
 
 				assert.ok(event);
@@ -495,6 +496,17 @@ suite('FileService', () => {
 		});
 	});
 
+	test('deleteFolder (non recursive)', function () {
+		const resource = uri.file(path.join(testDir, 'deep'));
+		return service.resolveFile(resource).then(source => {
+			return service.del(source.resource).then(() => {
+				return TPromise.wrapError(new Error('Unexpected'));
+			}, error => {
+				return TPromise.as(true);
+			});
+		});
+	});
+
 	test('resolveFile', function () {
 		return service.resolveFile(uri.file(testDir), { resolveTo: [uri.file(path.join(testDir, 'deep'))] }).then(r => {
 			assert.equal(r.children.length, 8);
@@ -826,7 +838,7 @@ suite('FileService', () => {
 		// setup
 		const _id = uuid.generateUuid();
 		const _testDir = path.join(parentDir, _id);
-		const _sourceDir = require.toUrl('./fixtures/service');
+		const _sourceDir = getPathFromAmdModule(require, './fixtures/service');
 
 		return pfs.copy(_sourceDir, _testDir).then(() => {
 			const encodingOverride: IEncodingOverride[] = [];
@@ -841,7 +853,7 @@ suite('FileService', () => {
 			const textResourceConfigurationService = new TestTextResourceConfigurationService(configurationService);
 
 			const _service = new FileService(
-				new TestContextService(new Workspace(_testDir, _testDir, toWorkspaceFolders([{ path: _testDir }]))),
+				new TestContextService(new Workspace(_testDir, toWorkspaceFolders([{ path: _testDir }]))),
 				TestEnvironmentService,
 				textResourceConfigurationService,
 				configurationService,
@@ -871,7 +883,7 @@ suite('FileService', () => {
 		// setup
 		const _id = uuid.generateUuid();
 		const _testDir = path.join(parentDir, _id);
-		const _sourceDir = require.toUrl('./fixtures/service');
+		const _sourceDir = getPathFromAmdModule(require, './fixtures/service');
 
 		return pfs.copy(_sourceDir, _testDir).then(() => {
 			const encodingOverride: IEncodingOverride[] = [];
@@ -886,7 +898,7 @@ suite('FileService', () => {
 			const textResourceConfigurationService = new TestTextResourceConfigurationService(configurationService);
 
 			const _service = new FileService(
-				new TestContextService(new Workspace(_testDir, _testDir, toWorkspaceFolders([{ path: _testDir }]))),
+				new TestContextService(new Workspace(_testDir, toWorkspaceFolders([{ path: _testDir }]))),
 				TestEnvironmentService,
 				textResourceConfigurationService,
 				configurationService,
@@ -916,11 +928,11 @@ suite('FileService', () => {
 		// setup
 		const _id = uuid.generateUuid();
 		const _testDir = path.join(parentDir, _id);
-		const _sourceDir = require.toUrl('./fixtures/service');
+		const _sourceDir = getPathFromAmdModule(require, './fixtures/service');
 		const resource = uri.file(path.join(testDir, 'index.html'));
 
 		const _service = new FileService(
-			new TestContextService(new Workspace(_testDir, _testDir, toWorkspaceFolders([{ path: _testDir }]))),
+			new TestContextService(new Workspace(_testDir, toWorkspaceFolders([{ path: _testDir }]))),
 			TestEnvironmentService,
 			new TestTextResourceConfigurationService(),
 			new TestConfigurationService(),
diff --git a/src/vs/workbench/services/files/test/electron-browser/resolver.test.ts b/src/vs/workbench/services/files/test/electron-browser/resolver.test.ts
index 3a9c19ad869..df78a28b30b 100644
--- a/src/vs/workbench/services/files/test/electron-browser/resolver.test.ts
+++ b/src/vs/workbench/services/files/test/electron-browser/resolver.test.ts
@@ -10,12 +10,13 @@ import * as path from 'path';
 import * as assert from 'assert';
 
 import { StatResolver } from 'vs/workbench/services/files/electron-browser/fileService';
-import uri from 'vs/base/common/uri';
+import { URI as uri } from 'vs/base/common/uri';
 import { isLinux } from 'vs/base/common/platform';
 import * as utils from 'vs/workbench/services/files/test/electron-browser/utils';
+import { getPathFromAmdModule } from 'vs/base/common/amd';
 
 function create(relativePath: string): StatResolver {
-	let basePath = require.toUrl('./fixtures/resolver');
+	let basePath = getPathFromAmdModule(require, './fixtures/resolver');
 	let absolutePath = relativePath ? path.join(basePath, relativePath) : basePath;
 	let fsStat = fs.statSync(absolutePath);
 
@@ -23,7 +24,7 @@ function create(relativePath: string): StatResolver {
 }
 
 function toResource(relativePath: string): uri {
-	let basePath = require.toUrl('./fixtures/resolver');
+	let basePath = getPathFromAmdModule(require, './fixtures/resolver');
 	let absolutePath = relativePath ? path.join(basePath, relativePath) : basePath;
 
 	return uri.file(absolutePath);
diff --git a/src/vs/workbench/services/files/test/electron-browser/watcher.test.ts b/src/vs/workbench/services/files/test/electron-browser/watcher.test.ts
index 175a45b4f40..186e9c33e0b 100644
--- a/src/vs/workbench/services/files/test/electron-browser/watcher.test.ts
+++ b/src/vs/workbench/services/files/test/electron-browser/watcher.test.ts
@@ -9,7 +9,7 @@ import * as assert from 'assert';
 
 import * as platform from 'vs/base/common/platform';
 import { FileChangeType, FileChangesEvent } from 'vs/platform/files/common/files';
-import uri from 'vs/base/common/uri';
+import { URI as uri } from 'vs/base/common/uri';
 import { IRawFileChange, toFileChangesEvent, normalize } from 'vs/workbench/services/files/node/watcher/common';
 import { Event, Emitter } from 'vs/base/common/event';
 
@@ -223,4 +223,4 @@ suite('Watcher', () => {
 
 		watch.report(raw);
 	});
-});
\ No newline at end of file
+});
diff --git a/src/vs/workbench/services/group/common/editorGroupsService.ts b/src/vs/workbench/services/group/common/editorGroupsService.ts
index 138849ffa8e..2efb09b9e63 100644
--- a/src/vs/workbench/services/group/common/editorGroupsService.ts
+++ b/src/vs/workbench/services/group/common/editorGroupsService.ts
@@ -14,7 +14,7 @@ import { IConfigurationService } from 'vs/platform/configuration/common/configur
 
 export const IEditorGroupsService = createDecorator<IEditorGroupsService>('editorGroupsService');
 
-export enum GroupDirection {
+export const enum GroupDirection {
 	UP,
 	DOWN,
 	LEFT,
@@ -31,12 +31,12 @@ export function preferredSideBySideGroupDirection(configurationService: IConfigu
 	return GroupDirection.RIGHT;
 }
 
-export enum GroupOrientation {
+export const enum GroupOrientation {
 	HORIZONTAL,
 	VERTICAL
 }
 
-export enum GroupLocation {
+export const enum GroupLocation {
 	FIRST,
 	LAST,
 	NEXT,
@@ -48,7 +48,7 @@ export interface IFindGroupScope {
 	location?: GroupLocation;
 }
 
-export enum GroupsArrangement {
+export const enum GroupsArrangement {
 
 	/**
 	 * Make the current active group consume the maximum
@@ -64,7 +64,7 @@ export enum GroupsArrangement {
 
 export interface GroupLayoutArgument {
 	size?: number;
-	groups?: Array<GroupLayoutArgument>;
+	groups?: GroupLayoutArgument[];
 }
 
 export interface EditorGroupLayout {
@@ -84,7 +84,7 @@ export interface IAddGroupOptions {
 	activate?: boolean;
 }
 
-export enum MergeGroupMode {
+export const enum MergeGroupMode {
 	COPY_EDITORS,
 	MOVE_EDITORS
 }
@@ -106,7 +106,7 @@ export interface IEditorReplacement {
 	options?: IEditorOptions | ITextEditorOptions;
 }
 
-export enum GroupsOrder {
+export const enum GroupsOrder {
 
 	/**
 	 * Groups sorted by creation order (oldest one first)
@@ -124,7 +124,7 @@ export enum GroupsOrder {
 	GRID_APPEARANCE
 }
 
-export enum EditorsOrder {
+export const enum EditorsOrder {
 
 	/**
 	 * Editors sorted by most recent activity (most recent active first)
@@ -290,7 +290,7 @@ export interface IEditorGroupsService {
 	copyGroup(group: IEditorGroup | GroupIdentifier, location: IEditorGroup | GroupIdentifier, direction: GroupDirection): IEditorGroup;
 }
 
-export enum GroupChangeKind {
+export const enum GroupChangeKind {
 
 	/* Group Changes */
 	GROUP_ACTIVE,
@@ -476,4 +476,4 @@ export interface IEditorGroup {
 	 * Invoke a function in the context of the services of this group.
 	 */
 	invokeWithinContext<T>(fn: (accessor: ServicesAccessor) => T): T;
-}
\ No newline at end of file
+}
diff --git a/src/vs/workbench/services/group/test/browser/editorGroupsService.test.ts b/src/vs/workbench/services/group/test/browser/editorGroupsService.test.ts
index b20b30603a9..6fec3144911 100644
--- a/src/vs/workbench/services/group/test/browser/editorGroupsService.test.ts
+++ b/src/vs/workbench/services/group/test/browser/editorGroupsService.test.ts
@@ -15,7 +15,7 @@ import { IEditorPartOptions } from 'vs/workbench/browser/parts/editor/editor';
 import { EditorInput, IFileEditorInput, IEditorInputFactory, IEditorInputFactoryRegistry, Extensions as EditorExtensions, EditorOptions, CloseDirection } from 'vs/workbench/common/editor';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { IEditorModel } from 'vs/platform/editor/common/editor';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { IEditorRegistry, Extensions, EditorDescriptor } from 'vs/workbench/browser/editor';
 import { BaseEditor } from 'vs/workbench/browser/parts/editor/baseEditor';
diff --git a/src/vs/workbench/services/history/common/history.ts b/src/vs/workbench/services/history/common/history.ts
index 9822fecb596..0497fc99f37 100644
--- a/src/vs/workbench/services/history/common/history.ts
+++ b/src/vs/workbench/services/history/common/history.ts
@@ -7,7 +7,7 @@
 import { createDecorator, ServiceIdentifier } from 'vs/platform/instantiation/common/instantiation';
 import { IResourceInput } from 'vs/platform/editor/common/editor';
 import { IEditorInput } from 'vs/workbench/common/editor';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 
 export const IHistoryService = createDecorator<IHistoryService>('historyService');
 
@@ -60,12 +60,14 @@ export interface IHistoryService {
 	 * Looking at the editor history, returns the workspace root of the last file that was
 	 * inside the workspace and part of the editor history.
 	 *
-	 * @param schemeFilter optional filter to restrict roots by scheme.
+	 * @param schemeFilter filter to restrict roots by scheme.
 	 */
-	getLastActiveWorkspaceRoot(schemeFilter?: string): URI;
+	getLastActiveWorkspaceRoot(schemeFilter: string): URI;
 
 	/**
-	 * Looking at the editor history, returns the resource of the last file tht was opened.
+	 * Looking at the editor history, returns the resource of the last file that was opened.
+	 *
+	 * @param schemeFilter filter to restrict roots by scheme.
 	 */
-	getLastActiveFile(): URI;
+	getLastActiveFile(schemeFilter: string): URI;
 }
\ No newline at end of file
diff --git a/src/vs/workbench/services/history/electron-browser/history.ts b/src/vs/workbench/services/history/electron-browser/history.ts
index 10b941f25af..9991163267b 100644
--- a/src/vs/workbench/services/history/electron-browser/history.ts
+++ b/src/vs/workbench/services/history/electron-browser/history.ts
@@ -7,7 +7,7 @@
 
 import { TPromise } from 'vs/base/common/winjs.base';
 import * as errors from 'vs/base/common/errors';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { IEditor } from 'vs/editor/common/editorCommon';
 import { ITextEditorOptions, IResourceInput, ITextEditorSelection } from 'vs/platform/editor/common/editor';
 import { IEditorInput, IEditor as IBaseEditor, Extensions as EditorExtensions, EditorInput, IEditorCloseEvent, IEditorInputFactoryRegistry, toResource, Extensions as EditorInputExtensions, IFileInputFactory, IEditorIdentifier } from 'vs/workbench/common/editor';
@@ -16,7 +16,7 @@ import { IHistoryService } from 'vs/workbench/services/history/common/history';
 import { FileChangesEvent, IFileService, FileChangeType, FILES_EXCLUDE_CONFIG } from 'vs/platform/files/common/files';
 import { Selection } from 'vs/editor/common/core/selection';
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
+import { IDisposable, dispose, Disposable } from 'vs/base/common/lifecycle';
 import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
 import { ILifecycleService } from 'vs/platform/lifecycle/common/lifecycle';
 import { Registry } from 'vs/platform/registry/common/platform';
@@ -30,8 +30,9 @@ import { IExpression } from 'vs/base/common/glob';
 import { ICursorPositionChangedEvent } from 'vs/editor/common/controller/cursorEvents';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { ResourceGlobMatcher } from 'vs/workbench/electron-browser/resources';
-import { Schemas } from 'vs/base/common/network';
 import { EditorServiceImpl } from 'vs/workbench/browser/parts/editor/editor';
+import { IPartService } from 'vs/workbench/services/part/common/partService';
+import { IContextKeyService, RawContextKey, IContextKey } from 'vs/platform/contextkey/common/contextkey';
 
 /**
  * Stores the selection & view state of an editor and allows to compare it to other selection states.
@@ -49,15 +50,15 @@ export class TextEditorState {
 		} : void 0;
 	}
 
-	public get editorInput(): IEditorInput {
+	get editorInput(): IEditorInput {
 		return this._editorInput;
 	}
 
-	public get selection(): ITextEditorSelection {
+	get selection(): ITextEditorSelection {
 		return this.textEditorSelection;
 	}
 
-	public justifiesNewPushState(other: TextEditorState, event?: ICursorPositionChangedEvent): boolean {
+	justifiesNewPushState(other: TextEditorState, event?: ICursorPositionChangedEvent): boolean {
 		if (event && event.source === 'api') {
 			return true; // always let API source win (e.g. "Go to definition" should add a history entry)
 		}
@@ -97,17 +98,15 @@ interface IRecentlyClosedFile {
 	index: number;
 }
 
-export class HistoryService implements IHistoryService {
+export class HistoryService extends Disposable implements IHistoryService {
 
-	public _serviceBrand: any;
+	_serviceBrand: any;
 
 	private static readonly STORAGE_KEY = 'history.entries';
 	private static readonly MAX_HISTORY_ITEMS = 200;
 	private static readonly MAX_STACK_ITEMS = 20;
 	private static readonly MAX_RECENTLY_CLOSED_EDITORS = 20;
 
-	private toUnbind: IDisposable[];
-
 	private activeEditorListeners: IDisposable[];
 	private lastActiveEditor: IEditorIdentifier;
 
@@ -124,6 +123,9 @@ export class HistoryService implements IHistoryService {
 
 	private fileInputFactory: IFileInputFactory;
 
+	private canNavigateBackContextKey: IContextKey<boolean>;
+	private canNavigateForwardContextKey: IContextKey<boolean>;
+
 	constructor(
 		@IEditorService private editorService: EditorServiceImpl,
 		@IEditorGroupsService private editorGroupService: IEditorGroupsService,
@@ -134,10 +136,16 @@ export class HistoryService implements IHistoryService {
 		@IFileService private fileService: IFileService,
 		@IWindowsService private windowService: IWindowsService,
 		@IInstantiationService private instantiationService: IInstantiationService,
+		@IPartService private partService: IPartService,
+		@IContextKeyService private contextKeyService: IContextKeyService
 	) {
-		this.toUnbind = [];
+		super();
+
 		this.activeEditorListeners = [];
 
+		this.canNavigateBackContextKey = (new RawContextKey<boolean>('canNavigateBack', false)).bindTo(this.contextKeyService);
+		this.canNavigateForwardContextKey = (new RawContextKey<boolean>('canNavigateForward', false)).bindTo(this.contextKeyService);
+
 		this.fileInputFactory = Registry.as<IEditorInputFactoryRegistry>(EditorInputExtensions.EditorInputFactories).getFileInputFactory();
 
 		this.index = -1;
@@ -145,11 +153,11 @@ export class HistoryService implements IHistoryService {
 		this.stack = [];
 		this.recentlyClosedFiles = [];
 		this.loaded = false;
-		this.resourceFilter = instantiationService.createInstance(
+		this.resourceFilter = this._register(instantiationService.createInstance(
 			ResourceGlobMatcher,
 			(root: URI) => this.getExcludes(root),
 			(event: IConfigurationChangeEvent) => event.affectsConfiguration(FILES_EXCLUDE_CONFIG) || event.affectsConfiguration('search.exclude')
-		);
+		));
 
 		this.registerListeners();
 	}
@@ -161,12 +169,12 @@ export class HistoryService implements IHistoryService {
 	}
 
 	private registerListeners(): void {
-		this.toUnbind.push(this.editorService.onDidActiveEditorChange(() => this.onActiveEditorChanged()));
-		this.toUnbind.push(this.editorService.onDidOpenEditorFail(event => this.remove(event.editor)));
-		this.toUnbind.push(this.editorService.onDidCloseEditor(event => this.onEditorClosed(event)));
-		this.toUnbind.push(this.lifecycleService.onShutdown(reason => this.saveHistory()));
-		this.toUnbind.push(this.fileService.onFileChanges(event => this.onFileChanges(event)));
-		this.toUnbind.push(this.resourceFilter.onExpressionChange(() => this.handleExcludesChange()));
+		this._register(this.editorService.onDidActiveEditorChange(() => this.onActiveEditorChanged()));
+		this._register(this.editorService.onDidOpenEditorFail(event => this.remove(event.editor)));
+		this._register(this.editorService.onDidCloseEditor(event => this.onEditorClosed(event)));
+		this._register(this.lifecycleService.onShutdown(reason => this.saveHistory()));
+		this._register(this.fileService.onFileChanges(event => this.onFileChanges(event)));
+		this._register(this.resourceFilter.onExpressionChange(() => this.handleExcludesChange()));
 	}
 
 	private onActiveEditorChanged(): void {
@@ -236,7 +244,7 @@ export class HistoryService implements IHistoryService {
 		}
 	}
 
-	public reopenLastClosedEditor(): void {
+	reopenLastClosedEditor(): void {
 		this.ensureHistoryLoaded();
 
 		let lastClosedFile = this.recentlyClosedFiles.pop();
@@ -249,7 +257,7 @@ export class HistoryService implements IHistoryService {
 		}
 	}
 
-	public forward(acrossEditors?: boolean): void {
+	forward(acrossEditors?: boolean): void {
 		if (this.stack.length > this.index + 1) {
 			if (acrossEditors) {
 				this.doForwardAcrossEditors();
@@ -267,6 +275,8 @@ export class HistoryService implements IHistoryService {
 	private setIndex(value: number): void {
 		this.lastIndex = this.index;
 		this.index = value;
+
+		this.updateContextKeys();
 	}
 
 	private doForwardAcrossEditors(): void {
@@ -287,7 +297,7 @@ export class HistoryService implements IHistoryService {
 		}
 	}
 
-	public back(acrossEditors?: boolean): void {
+	back(acrossEditors?: boolean): void {
 		if (this.index > 0) {
 			if (acrossEditors) {
 				this.doBackAcrossEditors();
@@ -297,7 +307,7 @@ export class HistoryService implements IHistoryService {
 		}
 	}
 
-	public last(): void {
+	last(): void {
 		if (this.lastIndex === -1) {
 			this.back();
 		} else {
@@ -329,7 +339,7 @@ export class HistoryService implements IHistoryService {
 		}
 	}
 
-	public clear(): void {
+	clear(): void {
 		this.ensureHistoryLoaded();
 
 		this.index = -1;
@@ -337,6 +347,13 @@ export class HistoryService implements IHistoryService {
 		this.stack.splice(0);
 		this.history = [];
 		this.recentlyClosedFiles = [];
+
+		this.updateContextKeys();
+	}
+
+	private updateContextKeys(): void {
+		this.canNavigateBackContextKey.set(this.stack.length > 0 && this.index > 0);
+		this.canNavigateForwardContextKey.set(this.stack.length > 0 && this.index < this.stack.length - 1);
 	}
 
 	private navigate(acrossEditors?: boolean): void {
@@ -362,7 +379,7 @@ export class HistoryService implements IHistoryService {
 			openEditorPromise = this.editorService.openEditor({ resource: (entry.input as IResourceInput).resource, options });
 		}
 
-		openEditorPromise.done(() => {
+		openEditorPromise.then(() => {
 			this.navigatingInStack = false;
 		}, error => {
 			this.navigatingInStack = false;
@@ -421,9 +438,9 @@ export class HistoryService implements IHistoryService {
 		this.removeExcludedFromHistory();
 	}
 
-	public remove(input: IEditorInput | IResourceInput): void;
-	public remove(input: FileChangesEvent): void;
-	public remove(arg1: IEditorInput | IResourceInput | FileChangesEvent): void {
+	remove(input: IEditorInput | IResourceInput): void;
+	remove(input: FileChangesEvent): void;
+	remove(arg1: IEditorInput | IResourceInput | FileChangesEvent): void {
 		this.removeFromHistory(arg1);
 		this.removeFromStack(arg1);
 		this.removeFromRecentlyClosedFiles(arg1);
@@ -502,7 +519,7 @@ export class HistoryService implements IHistoryService {
 		this.add(editor.input);
 	}
 
-	public add(input: IEditorInput, selection?: ITextEditorSelection): void {
+	add(input: IEditorInput, selection?: ITextEditorSelection): void {
 		if (!this.navigatingInStack) {
 			this.addOrReplaceInStack(input, selection);
 		}
@@ -568,6 +585,9 @@ export class HistoryService implements IHistoryService {
 		if (stackInput instanceof EditorInput) {
 			once(stackInput.onDispose)(() => this.removeFromStack(input));
 		}
+
+		// Context
+		this.updateContextKeys();
 	}
 
 	private preferResourceInput(input: IEditorInput): IEditorInput | IResourceInput {
@@ -594,6 +614,8 @@ export class HistoryService implements IHistoryService {
 		this.stack = this.stack.filter(e => !this.matches(arg1, e.input));
 		this.index = this.stack.length - 1; // reset index
 		this.lastIndex = -1;
+
+		this.updateContextKeys();
 	}
 
 	private removeFromRecentlyClosedFiles(arg1: IEditorInput | IResourceInput | FileChangesEvent): void {
@@ -607,7 +629,7 @@ export class HistoryService implements IHistoryService {
 
 		const input = arg1 as IResourceInput;
 
-		this.windowService.removeFromRecentlyOpened([input.resource.fsPath]);
+		this.windowService.removeFromRecentlyOpened([input.resource]);
 	}
 
 	private isFileOpened(resource: URI, group: IEditorGroup): boolean {
@@ -658,8 +680,15 @@ export class HistoryService implements IHistoryService {
 
 		if (arg2 instanceof EditorInput) {
 			const inputResource = arg2.getResource();
+			if (!inputResource) {
+				return false;
+			}
 
-			return inputResource && this.fileService.canHandleResource(inputResource) && inputResource.toString() === resource.toString();
+			if (this.partService.isCreated() && !this.fileService.canHandleResource(inputResource)) {
+				return false; // make sure to only check this when workbench has started (for https://github.com/Microsoft/vscode/issues/48275)
+			}
+
+			return inputResource.toString() === resource.toString();
 		}
 
 		const resourceInput = arg2 as IResourceInput;
@@ -667,7 +696,7 @@ export class HistoryService implements IHistoryService {
 		return resourceInput && resourceInput.resource.toString() === resource.toString();
 	}
 
-	public getHistory(): (IEditorInput | IResourceInput)[] {
+	getHistory(): (IEditorInput | IResourceInput)[] {
 		this.ensureHistoryLoaded();
 
 		return this.history.slice(0);
@@ -748,7 +777,7 @@ export class HistoryService implements IHistoryService {
 		}).filter(input => !!input);
 	}
 
-	public getLastActiveWorkspaceRoot(schemeFilter?: string): URI {
+	getLastActiveWorkspaceRoot(schemeFilter: string): URI {
 
 		// No Folder: return early
 		const folders = this.contextService.getWorkspace().folders;
@@ -796,27 +825,23 @@ export class HistoryService implements IHistoryService {
 		return void 0;
 	}
 
-	public getLastActiveFile(): URI {
+	getLastActiveFile(schemeFilter: string): URI {
 		const history = this.getHistory();
 		for (let i = 0; i < history.length; i++) {
 			let resource: URI;
 
 			const input = history[i];
 			if (input instanceof EditorInput) {
-				resource = toResource(input, { filter: Schemas.file });
+				resource = toResource(input, { filter: schemeFilter });
 			} else {
 				resource = (input as IResourceInput).resource;
 			}
 
-			if (resource && resource.scheme === Schemas.file) {
+			if (resource && resource.scheme === schemeFilter) {
 				return resource;
 			}
 		}
 
 		return void 0;
 	}
-
-	public dispose(): void {
-		this.toUnbind = dispose(this.toUnbind);
-	}
 }
diff --git a/src/vs/workbench/services/issue/electron-browser/workbenchIssueService.ts b/src/vs/workbench/services/issue/electron-browser/workbenchIssueService.ts
index a3e9e3727bd..3ef280db960 100644
--- a/src/vs/workbench/services/issue/electron-browser/workbenchIssueService.ts
+++ b/src/vs/workbench/services/issue/electron-browser/workbenchIssueService.ts
@@ -5,7 +5,7 @@
 
 'use strict';
 
-import { IssueReporterStyles, IIssueService, IssueReporterData } from 'vs/platform/issue/common/issue';
+import { IssueReporterStyles, IIssueService, IssueReporterData, ProcessExplorerData } from 'vs/platform/issue/common/issue';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { ITheme, IThemeService } from 'vs/platform/theme/common/themeService';
 import { textLinkForeground, inputBackground, inputBorder, inputForeground, buttonBackground, buttonHoverBackground, buttonForeground, inputValidationErrorBorder, foreground, inputActiveOptionBorder, scrollbarSliderActiveBackground, scrollbarSliderBackground, scrollbarSliderHoverBackground, editorBackground, editorForeground, listHoverBackground, listHoverForeground, listHighlightForeground, textLinkActiveForeground } from 'vs/platform/theme/common/colorRegistry';
@@ -14,6 +14,7 @@ import { IExtensionManagementService, IExtensionEnablementService, LocalExtensio
 import { webFrame } from 'electron';
 import { assign } from 'vs/base/common/objects';
 import { IWorkbenchIssueService } from 'vs/workbench/services/issue/common/issue';
+import { IWindowService } from 'vs/platform/windows/common/windows';
 
 export class WorkbenchIssueService implements IWorkbenchIssueService {
 	_serviceBrand: any;
@@ -22,7 +23,8 @@ export class WorkbenchIssueService implements IWorkbenchIssueService {
 		@IIssueService private issueService: IIssueService,
 		@IThemeService private themeService: IThemeService,
 		@IExtensionManagementService private extensionManagementService: IExtensionManagementService,
-		@IExtensionEnablementService private extensionEnablementService: IExtensionEnablementService
+		@IExtensionEnablementService private extensionEnablementService: IExtensionEnablementService,
+		@IWindowService private windowService: IWindowService
 	) {
 	}
 
@@ -44,7 +46,8 @@ export class WorkbenchIssueService implements IWorkbenchIssueService {
 
 	openProcessExplorer(): TPromise<void> {
 		const theme = this.themeService.getTheme();
-		const data = {
+		const data: ProcessExplorerData = {
+			pid: this.windowService.getConfiguration().mainPid,
 			zoomLevel: webFrame.getZoomLevel(),
 			styles: {
 				backgroundColor: theme.getColor(editorBackground) && theme.getColor(editorBackground).toString(),
diff --git a/src/vs/workbench/services/jsonschemas/common/jsonValidationExtensionPoint.ts b/src/vs/workbench/services/jsonschemas/common/jsonValidationExtensionPoint.ts
index 38e859052ba..4169ec2f48c 100644
--- a/src/vs/workbench/services/jsonschemas/common/jsonValidationExtensionPoint.ts
+++ b/src/vs/workbench/services/jsonschemas/common/jsonValidationExtensionPoint.ts
@@ -6,9 +6,8 @@
 
 import * as nls from 'vs/nls';
 import { ExtensionsRegistry } from 'vs/workbench/services/extensions/common/extensionsRegistry';
-import URI from 'vs/base/common/uri';
 import * as strings from 'vs/base/common/strings';
-import * as paths from 'vs/base/common/paths';
+import * as resources from 'vs/base/common/resources';
 
 interface IJSONValidationExtensionPoint {
 	fileMatch: string;
@@ -60,8 +59,10 @@ export class JSONValidationExtensionPoint {
 					}
 					if (strings.startsWith(uri, './')) {
 						try {
-							//TODO@extensionLocation
-							uri = URI.file(paths.normalize(paths.join(extensionLocation.fsPath, uri))).toString();
+							const colorThemeLocation = resources.joinPath(extensionLocation, uri);
+							if (!resources.isEqualOrParent(colorThemeLocation, extensionLocation)) {
+								collector.warn(nls.localize('invalid.path.1', "Expected `contributes.{0}.url` ({1}) to be included inside extension's folder ({2}). This might make the extension non-portable.", configurationExtPoint.name, colorThemeLocation.toString(), extensionLocation.path));
+							}
 						} catch (e) {
 							collector.error(nls.localize('invalid.url.fileschema', "'configuration.jsonValidation.url' is an invalid relative URL: {0}", e.message));
 						}
diff --git a/src/vs/workbench/services/keybinding/common/keybindingEditing.ts b/src/vs/workbench/services/keybinding/common/keybindingEditing.ts
index 98b80945993..374c8b468f5 100644
--- a/src/vs/workbench/services/keybinding/common/keybindingEditing.ts
+++ b/src/vs/workbench/services/keybinding/common/keybindingEditing.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { localize } from 'vs/nls';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { isArray } from 'vs/base/common/types';
 import { Queue } from 'vs/base/common/async';
@@ -74,10 +74,11 @@ export class KeybindingsEditingService extends Disposable implements IKeybinding
 		return this.resolveAndValidate()
 			.then(reference => {
 				const model = reference.object.textEditorModel;
-				if (keybindingItem.isDefault) {
-					this.updateDefaultKeybinding(key, keybindingItem, model);
-				} else {
-					this.updateUserKeybinding(key, keybindingItem, model);
+				const userKeybindingEntries = <IUserFriendlyKeybinding[]>json.parse(model.getValue());
+				const userKeybindingEntryIndex = this.findUserKeybindingEntryIndex(keybindingItem, userKeybindingEntries);
+				this.updateKeybinding(key, keybindingItem, model, userKeybindingEntryIndex);
+				if (keybindingItem.isDefault && keybindingItem.resolvedKeybinding) {
+					this.removeDefaultKeybinding(keybindingItem, model);
 				}
 				return this.save().then(() => reference.dispose());
 			});
@@ -112,32 +113,16 @@ export class KeybindingsEditingService extends Disposable implements IKeybinding
 		return this.textFileService.save(this.resource);
 	}
 
-	private updateUserKeybinding(newKey: string, keybindingItem: ResolvedKeybindingItem, model: ITextModel): void {
+	private updateKeybinding(newKey: string, keybindingItem: ResolvedKeybindingItem, model: ITextModel, userKeybindingEntryIndex: number): void {
 		const { tabSize, insertSpaces } = model.getOptions();
 		const eol = model.getEOL();
-		const userKeybindingEntries = <IUserFriendlyKeybinding[]>json.parse(model.getValue());
-		const userKeybindingEntryIndex = this.findUserKeybindingEntryIndex(keybindingItem, userKeybindingEntries);
-		if (userKeybindingEntryIndex !== -1) {
-			this.applyEditsToBuffer(setProperty(model.getValue(), [userKeybindingEntryIndex, 'key'], newKey, { tabSize, insertSpaces, eol })[0], model);
-		}
-	}
-
-	private updateDefaultKeybinding(newKey: string, keybindingItem: ResolvedKeybindingItem, model: ITextModel): void {
-		const { tabSize, insertSpaces } = model.getOptions();
-		const eol = model.getEOL();
-		const userKeybindingEntries = <IUserFriendlyKeybinding[]>json.parse(model.getValue());
-		const userKeybindingEntryIndex = this.findUserKeybindingEntryIndex(keybindingItem, userKeybindingEntries);
 		if (userKeybindingEntryIndex !== -1) {
 			// Update the keybinding with new key
 			this.applyEditsToBuffer(setProperty(model.getValue(), [userKeybindingEntryIndex, 'key'], newKey, { tabSize, insertSpaces, eol })[0], model);
 		} else {
-			// Add the new keybinidng with new key
+			// Add the new keybinding with new key
 			this.applyEditsToBuffer(setProperty(model.getValue(), [-1], this.asObject(newKey, keybindingItem.command, keybindingItem.when, false), { tabSize, insertSpaces, eol })[0], model);
 		}
-		if (keybindingItem.resolvedKeybinding) {
-			// Unassign the default keybinding
-			this.applyEditsToBuffer(setProperty(model.getValue(), [-1], this.asObject(keybindingItem.resolvedKeybinding.getUserSettingsLabel(), keybindingItem.command, keybindingItem.when, true), { tabSize, insertSpaces, eol })[0], model);
-		}
 	}
 
 	private removeUserKeybinding(keybindingItem: ResolvedKeybindingItem, model: ITextModel): void {
@@ -160,8 +145,8 @@ export class KeybindingsEditingService extends Disposable implements IKeybinding
 		const { tabSize, insertSpaces } = model.getOptions();
 		const eol = model.getEOL();
 		const userKeybindingEntries = <IUserFriendlyKeybinding[]>json.parse(model.getValue());
-		const index = this.findUnassignedDefaultKeybindingEntryIndex(keybindingItem, userKeybindingEntries);
-		if (index !== -1) {
+		const indices = this.findUnassignedDefaultKeybindingEntryIndex(keybindingItem, userKeybindingEntries).reverse();
+		for (const index of indices) {
 			this.applyEditsToBuffer(setProperty(model.getValue(), [index], void 0, { tabSize, insertSpaces, eol })[0], model);
 		}
 	}
@@ -183,13 +168,14 @@ export class KeybindingsEditingService extends Disposable implements IKeybinding
 		return -1;
 	}
 
-	private findUnassignedDefaultKeybindingEntryIndex(keybindingItem: ResolvedKeybindingItem, userKeybindingEntries: IUserFriendlyKeybinding[]): number {
+	private findUnassignedDefaultKeybindingEntryIndex(keybindingItem: ResolvedKeybindingItem, userKeybindingEntries: IUserFriendlyKeybinding[]): number[] {
+		const indices = [];
 		for (let index = 0; index < userKeybindingEntries.length; index++) {
 			if (userKeybindingEntries[index].command === `-${keybindingItem.command}`) {
-				return index;
+				indices.push(index);
 			}
 		}
-		return -1;
+		return indices;
 	}
 
 	private asObject(key: string, command: string, when: ContextKeyExpr, negate: boolean): any {
@@ -255,7 +241,7 @@ export class KeybindingsEditingService extends Disposable implements IKeybinding
 
 	private parse(model: ITextModel): { result: IUserFriendlyKeybinding[], parseErrors: json.ParseError[] } {
 		const parseErrors: json.ParseError[] = [];
-		const result = json.parse(model.getValue(), parseErrors, { allowTrailingComma: true });
+		const result = json.parse(model.getValue(), parseErrors);
 		return { result, parseErrors };
 	}
 
diff --git a/src/vs/workbench/services/keybinding/common/keybindingIO.ts b/src/vs/workbench/services/keybinding/common/keybindingIO.ts
index 13f82fbc817..562266b0926 100644
--- a/src/vs/workbench/services/keybinding/common/keybindingIO.ts
+++ b/src/vs/workbench/services/keybinding/common/keybindingIO.ts
@@ -4,12 +4,13 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import { Keybinding, SimpleKeybinding, ChordKeybinding, KeyCodeUtils } from 'vs/base/common/keyCodes';
+import { SimpleKeybinding } from 'vs/base/common/keyCodes';
 import { OperatingSystem } from 'vs/base/common/platform';
 import { IUserFriendlyKeybinding } from 'vs/platform/keybinding/common/keybinding';
 import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
 import { ResolvedKeybindingItem } from 'vs/platform/keybinding/common/resolvedKeybindingItem';
-import { ScanCodeBinding, ScanCodeUtils } from 'vs/workbench/services/keybinding/common/scanCode';
+import { ScanCodeBinding } from 'vs/base/common/scanCode';
+import { KeybindingParser } from 'vs/base/common/keybindingParser';
 
 export interface IUserKeybindingItem {
 	firstPart: SimpleKeybinding | ScanCodeBinding;
@@ -25,12 +26,12 @@ export class KeybindingIO {
 		let quotedSerializedKeybinding = JSON.stringify(item.resolvedKeybinding.getUserSettingsLabel());
 		out.write(`{ "key": ${rightPaddedString(quotedSerializedKeybinding + ',', 25)} "command": `);
 
-		let serializedWhen = item.when ? item.when.serialize() : '';
+		let quotedSerializedWhen = item.when ? JSON.stringify(item.when.serialize()) : '';
 		let quotedSerializeCommand = JSON.stringify(item.command);
-		if (serializedWhen.length > 0) {
+		if (quotedSerializedWhen.length > 0) {
 			out.write(`${quotedSerializeCommand},`);
 			out.writeLine();
-			out.write(`                                     "when": "${serializedWhen}" `);
+			out.write(`                                     "when": ${quotedSerializedWhen} `);
 		} else {
 			out.write(`${quotedSerializeCommand} `);
 		}
@@ -39,7 +40,7 @@ export class KeybindingIO {
 	}
 
 	public static readUserKeybindingItem(input: IUserFriendlyKeybinding, OS: OperatingSystem): IUserKeybindingItem {
-		const [firstPart, chordPart] = (typeof input.key === 'string' ? this._readUserBinding(input.key) : [null, null]);
+		const [firstPart, chordPart] = (typeof input.key === 'string' ? KeybindingParser.parseUserBinding(input.key) : [null, null]);
 		const when = (typeof input.when === 'string' ? ContextKeyExpr.deserialize(input.when) : null);
 		const command = (typeof input.command === 'string' ? input.command : null);
 		const commandArgs = (typeof input.args !== 'undefined' ? input.args : undefined);
@@ -51,119 +52,6 @@ export class KeybindingIO {
 			when: when
 		};
 	}
-
-	private static _readModifiers(input: string) {
-		input = input.toLowerCase().trim();
-
-		let ctrl = false;
-		let shift = false;
-		let alt = false;
-		let meta = false;
-
-		let matchedModifier: boolean;
-
-		do {
-			matchedModifier = false;
-			if (/^ctrl(\+|\-)/.test(input)) {
-				ctrl = true;
-				input = input.substr('ctrl-'.length);
-				matchedModifier = true;
-			}
-			if (/^shift(\+|\-)/.test(input)) {
-				shift = true;
-				input = input.substr('shift-'.length);
-				matchedModifier = true;
-			}
-			if (/^alt(\+|\-)/.test(input)) {
-				alt = true;
-				input = input.substr('alt-'.length);
-				matchedModifier = true;
-			}
-			if (/^meta(\+|\-)/.test(input)) {
-				meta = true;
-				input = input.substr('meta-'.length);
-				matchedModifier = true;
-			}
-			if (/^win(\+|\-)/.test(input)) {
-				meta = true;
-				input = input.substr('win-'.length);
-				matchedModifier = true;
-			}
-			if (/^cmd(\+|\-)/.test(input)) {
-				meta = true;
-				input = input.substr('cmd-'.length);
-				matchedModifier = true;
-			}
-		} while (matchedModifier);
-
-		let key: string;
-
-		const firstSpaceIdx = input.indexOf(' ');
-		if (firstSpaceIdx > 0) {
-			key = input.substring(0, firstSpaceIdx);
-			input = input.substring(firstSpaceIdx);
-		} else {
-			key = input;
-			input = '';
-		}
-
-		return {
-			remains: input,
-			ctrl,
-			shift,
-			alt,
-			meta,
-			key
-		};
-	}
-
-	private static _readSimpleKeybinding(input: string): [SimpleKeybinding, string] {
-		const mods = this._readModifiers(input);
-		const keyCode = KeyCodeUtils.fromUserSettings(mods.key);
-		return [new SimpleKeybinding(mods.ctrl, mods.shift, mods.alt, mods.meta, keyCode), mods.remains];
-	}
-
-	public static readKeybinding(input: string, OS: OperatingSystem): Keybinding {
-		if (!input) {
-			return null;
-		}
-
-		let [firstPart, remains] = this._readSimpleKeybinding(input);
-		let chordPart: SimpleKeybinding = null;
-		if (remains.length > 0) {
-			[chordPart] = this._readSimpleKeybinding(remains);
-		}
-
-		if (chordPart) {
-			return new ChordKeybinding(firstPart, chordPart);
-		}
-		return firstPart;
-	}
-
-	private static _readSimpleUserBinding(input: string): [SimpleKeybinding | ScanCodeBinding, string] {
-		const mods = this._readModifiers(input);
-		const scanCodeMatch = mods.key.match(/^\[([^\]]+)\]$/);
-		if (scanCodeMatch) {
-			const strScanCode = scanCodeMatch[1];
-			const scanCode = ScanCodeUtils.lowerCaseToEnum(strScanCode);
-			return [new ScanCodeBinding(mods.ctrl, mods.shift, mods.alt, mods.meta, scanCode), mods.remains];
-		}
-		const keyCode = KeyCodeUtils.fromUserSettings(mods.key);
-		return [new SimpleKeybinding(mods.ctrl, mods.shift, mods.alt, mods.meta, keyCode), mods.remains];
-	}
-
-	static _readUserBinding(input: string): [SimpleKeybinding | ScanCodeBinding, SimpleKeybinding | ScanCodeBinding] {
-		if (!input) {
-			return [null, null];
-		}
-
-		let [firstPart, remains] = this._readSimpleUserBinding(input);
-		let chordPart: SimpleKeybinding | ScanCodeBinding = null;
-		if (remains.length > 0) {
-			[chordPart] = this._readSimpleUserBinding(remains);
-		}
-		return [firstPart, chordPart];
-	}
 }
 
 function rightPaddedString(str: string, minChars: number): string {
diff --git a/src/vs/workbench/services/keybinding/common/keyboardMapper.ts b/src/vs/workbench/services/keybinding/common/keyboardMapper.ts
index 0edb5de46fa..ec4e48c6ea1 100644
--- a/src/vs/workbench/services/keybinding/common/keyboardMapper.ts
+++ b/src/vs/workbench/services/keybinding/common/keyboardMapper.ts
@@ -7,7 +7,7 @@
 
 import { Keybinding, ResolvedKeybinding, SimpleKeybinding } from 'vs/base/common/keyCodes';
 import { IKeyboardEvent } from 'vs/platform/keybinding/common/keybinding';
-import { ScanCodeBinding } from 'vs/workbench/services/keybinding/common/scanCode';
+import { ScanCodeBinding } from 'vs/base/common/scanCode';
 
 export interface IKeyboardMapper {
 	dumpDebugInfo(): string;
diff --git a/src/vs/workbench/services/keybinding/common/macLinuxFallbackKeyboardMapper.ts b/src/vs/workbench/services/keybinding/common/macLinuxFallbackKeyboardMapper.ts
index f932f7caeec..69720566555 100644
--- a/src/vs/workbench/services/keybinding/common/macLinuxFallbackKeyboardMapper.ts
+++ b/src/vs/workbench/services/keybinding/common/macLinuxFallbackKeyboardMapper.ts
@@ -10,7 +10,7 @@ import { ResolvedKeybinding, SimpleKeybinding, Keybinding, KeyCode, ChordKeybind
 import { IKeyboardMapper } from 'vs/workbench/services/keybinding/common/keyboardMapper';
 import { IKeyboardEvent } from 'vs/platform/keybinding/common/keybinding';
 import { USLayoutResolvedKeybinding } from 'vs/platform/keybinding/common/usLayoutResolvedKeybinding';
-import { ScanCodeBinding, ScanCode, IMMUTABLE_CODE_TO_KEY_CODE } from 'vs/workbench/services/keybinding/common/scanCode';
+import { ScanCodeBinding, ScanCode, IMMUTABLE_CODE_TO_KEY_CODE } from 'vs/base/common/scanCode';
 
 /**
  * A keyboard mapper to be used when reading the keymap from the OS fails.
diff --git a/src/vs/workbench/services/keybinding/common/macLinuxKeyboardMapper.ts b/src/vs/workbench/services/keybinding/common/macLinuxKeyboardMapper.ts
index 1c56f4f0dde..a077433cb67 100644
--- a/src/vs/workbench/services/keybinding/common/macLinuxKeyboardMapper.ts
+++ b/src/vs/workbench/services/keybinding/common/macLinuxKeyboardMapper.ts
@@ -7,7 +7,7 @@
 
 import { OperatingSystem } from 'vs/base/common/platform';
 import { KeyCode, ResolvedKeybinding, KeyCodeUtils, SimpleKeybinding, Keybinding, KeybindingType, ResolvedKeybindingPart } from 'vs/base/common/keyCodes';
-import { ScanCode, ScanCodeUtils, IMMUTABLE_CODE_TO_KEY_CODE, IMMUTABLE_KEY_CODE_TO_CODE, ScanCodeBinding } from 'vs/workbench/services/keybinding/common/scanCode';
+import { ScanCode, ScanCodeUtils, IMMUTABLE_CODE_TO_KEY_CODE, IMMUTABLE_KEY_CODE_TO_CODE, ScanCodeBinding } from 'vs/base/common/scanCode';
 import { CharCode } from 'vs/base/common/charCode';
 import { UILabelProvider, AriaLabelProvider, UserSettingsLabelProvider, ElectronAcceleratorLabelProvider } from 'vs/base/common/keybindingLabels';
 import { IKeyboardMapper } from 'vs/workbench/services/keybinding/common/keyboardMapper';
diff --git a/src/vs/workbench/services/keybinding/common/windowsKeyboardMapper.ts b/src/vs/workbench/services/keybinding/common/windowsKeyboardMapper.ts
index 869932b1b18..9e856dfd8d2 100644
--- a/src/vs/workbench/services/keybinding/common/windowsKeyboardMapper.ts
+++ b/src/vs/workbench/services/keybinding/common/windowsKeyboardMapper.ts
@@ -6,7 +6,7 @@
 'use strict';
 
 import { KeyCode, KeyCodeUtils, ResolvedKeybinding, Keybinding, SimpleKeybinding, KeybindingType, ResolvedKeybindingPart } from 'vs/base/common/keyCodes';
-import { ScanCode, ScanCodeUtils, IMMUTABLE_CODE_TO_KEY_CODE, ScanCodeBinding } from 'vs/workbench/services/keybinding/common/scanCode';
+import { ScanCode, ScanCodeUtils, IMMUTABLE_CODE_TO_KEY_CODE, ScanCodeBinding } from 'vs/base/common/scanCode';
 import { CharCode } from 'vs/base/common/charCode';
 import { UILabelProvider, AriaLabelProvider, ElectronAcceleratorLabelProvider, UserSettingsLabelProvider } from 'vs/base/common/keybindingLabels';
 import { OperatingSystem } from 'vs/base/common/platform';
diff --git a/src/vs/workbench/services/keybinding/electron-browser/keybindingService.ts b/src/vs/workbench/services/keybinding/electron-browser/keybindingService.ts
index e7f59e3cd19..8be3cc25d07 100644
--- a/src/vs/workbench/services/keybinding/electron-browser/keybindingService.ts
+++ b/src/vs/workbench/services/keybinding/electron-browser/keybindingService.ts
@@ -16,7 +16,7 @@ import { KeybindingResolver } from 'vs/platform/keybinding/common/keybindingReso
 import { ICommandService } from 'vs/platform/commands/common/commands';
 import { IKeybindingEvent, IUserFriendlyKeybinding, KeybindingSource, IKeyboardEvent } from 'vs/platform/keybinding/common/keybinding';
 import { ContextKeyExpr, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IKeybindingItem, KeybindingsRegistry, IKeybindingRule2, KeybindingRuleSource } from 'vs/platform/keybinding/common/keybindingsRegistry';
+import { IKeybindingItem, KeybindingsRegistry, IKeybindingRule2, KeybindingRuleSource, KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { keybindingsTelemetry } from 'vs/platform/telemetry/common/telemetryUtils';
@@ -37,6 +37,7 @@ import { IConfigurationService } from 'vs/platform/configuration/common/configur
 import { onUnexpectedError } from 'vs/base/common/errors';
 import { release } from 'os';
 import { INotificationService } from 'vs/platform/notification/common/notification';
+import { KeybindingParser } from 'vs/base/common/keybindingParser';
 
 export class KeyboardMapperFactory {
 	public static readonly INSTANCE = new KeyboardMapperFactory();
@@ -438,7 +439,7 @@ export class WorkbenchKeybindingService extends AbstractKeybindingService {
 	}
 
 	public resolveUserBinding(userBinding: string): ResolvedKeybinding[] {
-		const [firstPart, chordPart] = KeybindingIO._readUserBinding(userBinding);
+		const [firstPart, chordPart] = KeybindingParser.parseUserBinding(userBinding);
 		return this._keyboardMapper.resolveUserBinding(firstPart, chordPart);
 	}
 
@@ -485,19 +486,19 @@ export class WorkbenchKeybindingService extends AbstractKeybindingService {
 
 		let weight: number;
 		if (isBuiltin) {
-			weight = KeybindingsRegistry.WEIGHT.builtinExtension(idx);
+			weight = KeybindingWeight.BuiltinExtension + idx;
 		} else {
-			weight = KeybindingsRegistry.WEIGHT.externalExtension(idx);
+			weight = KeybindingWeight.ExternalExtension + idx;
 		}
 
 		let desc = {
 			id: command,
 			when: ContextKeyExpr.deserialize(when),
 			weight: weight,
-			primary: KeybindingIO.readKeybinding(key, OS),
-			mac: mac && { primary: KeybindingIO.readKeybinding(mac, OS) },
-			linux: linux && { primary: KeybindingIO.readKeybinding(linux, OS) },
-			win: win && { primary: KeybindingIO.readKeybinding(win, OS) }
+			primary: KeybindingParser.parseKeybinding(key, OS),
+			mac: mac && { primary: KeybindingParser.parseKeybinding(mac, OS) },
+			linux: linux && { primary: KeybindingParser.parseKeybinding(linux, OS) },
+			win: win && { primary: KeybindingParser.parseKeybinding(win, OS) }
 		};
 
 		if (!desc.primary && !desc.mac && !desc.linux && !desc.win) {
@@ -540,6 +541,27 @@ export class WorkbenchKeybindingService extends AbstractKeybindingService {
 		let pretty = unboundCommands.sort().join('\n// - ');
 		return '// ' + nls.localize('unboundCommands', "Here are other available commands: ") + '\n// - ' + pretty;
 	}
+
+	mightProducePrintableCharacter(event: IKeyboardEvent): boolean {
+		if (event.ctrlKey || event.metaKey) {
+			// ignore ctrl/cmd-combination but not shift/alt-combinatios
+			return false;
+		}
+		// consult the KeyboardMapperFactory to check the given event for
+		// a printable value.
+		const mapping = KeyboardMapperFactory.INSTANCE.getRawKeyboardMapping();
+		if (!mapping) {
+			return false;
+		}
+		const keyInfo = mapping[event.code];
+		if (!keyInfo) {
+			return false;
+		}
+		if (!keyInfo.value || /\s/.test(keyInfo.value)) {
+			return false;
+		}
+		return true;
+	}
 }
 
 let schemaId = 'vscode://schemas/keybindings';
@@ -585,7 +607,7 @@ const keyboardConfiguration: IConfigurationNode = {
 			'type': 'string',
 			'enum': ['code', 'keyCode'],
 			'default': 'code',
-			'description': nls.localize('dispatch', "Controls the dispatching logic for key presses to use either `code` (recommended) or `keyCode`."),
+			'markdownDescription': nls.localize('dispatch', "Controls the dispatching logic for key presses to use either `code` (recommended) or `keyCode`."),
 			'included': OS === OperatingSystem.Macintosh || OS === OperatingSystem.Linux
 		},
 		'keyboard.touchbar.enabled': {
diff --git a/src/vs/workbench/services/keybinding/test/electron-browser/keybindingEditing.test.ts b/src/vs/workbench/services/keybinding/test/electron-browser/keybindingEditing.test.ts
index 2fe4c81b71f..cb922f849d5 100644
--- a/src/vs/workbench/services/keybinding/test/electron-browser/keybindingEditing.test.ts
+++ b/src/vs/workbench/services/keybinding/test/electron-browser/keybindingEditing.test.ts
@@ -16,7 +16,7 @@ import { TPromise } from 'vs/base/common/winjs.base';
 import { KeyCode, SimpleKeybinding, ChordKeybinding } from 'vs/base/common/keyCodes';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import * as extfs from 'vs/base/node/extfs';
-import { TestTextFileService, TestLifecycleService, TestBackupFileService, TestContextService, TestTextResourceConfigurationService, TestHashService, TestEnvironmentService, TestStorageService, TestEditorGroupsService, TestEditorService } from 'vs/workbench/test/workbenchTestServices';
+import { TestTextFileService, TestLifecycleService, TestBackupFileService, TestContextService, TestTextResourceConfigurationService, TestHashService, TestEnvironmentService, TestStorageService, TestEditorGroupsService, TestEditorService, TestLogService } from 'vs/workbench/test/workbenchTestServices';
 import { IEditorGroupsService } from 'vs/workbench/services/group/common/editorGroupsService';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { TestNotificationService } from 'vs/platform/notification/test/common/testNotificationService';
@@ -47,6 +47,7 @@ import { TestConfigurationService } from 'vs/platform/configuration/test/common/
 import { IHashService } from 'vs/workbench/services/hash/common/hashService';
 import { mkdirp } from 'vs/base/node/pfs';
 import { MockContextKeyService } from 'vs/platform/keybinding/test/common/mockKeybindingService';
+import { ILogService } from 'vs/platform/log/common/log';
 
 interface Modifiers {
 	metaKey?: boolean;
@@ -55,7 +56,7 @@ interface Modifiers {
 	shiftKey?: boolean;
 }
 
-suite('Keybindings Editing', () => {
+suite('KeybindingsEditing', () => {
 
 	let instantiationService: TestInstantiationService;
 	let testObject: KeybindingsEditingService;
@@ -68,7 +69,7 @@ suite('Keybindings Editing', () => {
 
 			instantiationService = new TestInstantiationService();
 
-			instantiationService.stub(IEnvironmentService, { appKeybindingsPath: keybindingsFile });
+			instantiationService.stub(IEnvironmentService, <IEnvironmentService>{ appKeybindingsPath: keybindingsFile, appSettingsPath: path.join(testDir, 'settings.json') });
 			instantiationService.stub(IConfigurationService, ConfigurationService);
 			instantiationService.stub(IConfigurationService, 'getValue', { 'eol': '\n' });
 			instantiationService.stub(IConfigurationService, 'onDidUpdateConfiguration', () => { });
@@ -82,9 +83,10 @@ suite('Keybindings Editing', () => {
 			instantiationService.stub(IEditorService, new TestEditorService());
 			instantiationService.stub(ITelemetryService, NullTelemetryService);
 			instantiationService.stub(IModeService, ModeServiceImpl);
+			instantiationService.stub(ILogService, new TestLogService());
 			instantiationService.stub(IModelService, instantiationService.createInstance(ModelServiceImpl));
 			instantiationService.stub(IFileService, new FileService(
-				new TestContextService(new Workspace(testDir, testDir, toWorkspaceFolders([{ path: testDir }]))),
+				new TestContextService(new Workspace(testDir, toWorkspaceFolders([{ path: testDir }]))),
 				TestEnvironmentService,
 				new TestTextResourceConfigurationService(),
 				new TestConfigurationService(),
@@ -220,6 +222,21 @@ suite('Keybindings Editing', () => {
 			.then(() => assert.deepEqual(getUserKeybindings(), []));
 	});
 
+	test('reset mulitple removed keybindings', () => {
+		writeToKeybindingsFile({ key: 'alt+c', command: '-b' });
+		writeToKeybindingsFile({ key: 'alt+shift+c', command: '-b' });
+		writeToKeybindingsFile({ key: 'escape', command: '-b' });
+		return testObject.resetKeybinding(aResolvedKeybindingItem({ command: 'b', isDefault: false }))
+			.then(() => assert.deepEqual(getUserKeybindings(), []));
+	});
+
+	test('add a new keybinding to unassigned keybinding', () => {
+		writeToKeybindingsFile({ key: 'alt+c', command: '-a' });
+		const expected: IUserFriendlyKeybinding[] = [{ key: 'alt+c', command: '-a' }, { key: 'shift+alt+c', command: 'a' }];
+		return testObject.editKeybinding('shift+alt+c', aResolvedKeybindingItem({ command: 'a', isDefault: false }))
+			.then(() => assert.deepEqual(getUserKeybindings(), expected));
+	});
+
 	function writeToKeybindingsFile(...keybindings: IUserFriendlyKeybinding[]) {
 		fs.writeFileSync(keybindingsFile, JSON.stringify(keybindings || []));
 	}
diff --git a/src/vs/workbench/services/keybinding/test/keybindingIO.test.ts b/src/vs/workbench/services/keybinding/test/keybindingIO.test.ts
index c3fd1c5d78d..bc0bc9bf481 100644
--- a/src/vs/workbench/services/keybinding/test/keybindingIO.test.ts
+++ b/src/vs/workbench/services/keybinding/test/keybindingIO.test.ts
@@ -10,7 +10,8 @@ import { KeybindingIO } from 'vs/workbench/services/keybinding/common/keybinding
 import { OS, OperatingSystem } from 'vs/base/common/platform';
 import { IUserFriendlyKeybinding } from 'vs/platform/keybinding/common/keybinding';
 import { USLayoutResolvedKeybinding } from 'vs/platform/keybinding/common/usLayoutResolvedKeybinding';
-import { ScanCodeBinding, ScanCode } from 'vs/workbench/services/keybinding/common/scanCode';
+import { ScanCodeBinding, ScanCode } from 'vs/base/common/scanCode';
+import { KeybindingParser } from 'vs/base/common/keybindingParser';
 
 suite('keybindingIO', () => {
 
@@ -28,7 +29,7 @@ suite('keybindingIO', () => {
 		}
 
 		function testOneDeserialization(keybinding: string, _expected: number, msg: string, OS: OperatingSystem): void {
-			let actualDeserialized = KeybindingIO.readKeybinding(keybinding, OS);
+			let actualDeserialized = KeybindingParser.parseKeybinding(keybinding, OS);
 			let expected = createKeybinding(_expected, OS);
 			assert.deepEqual(actualDeserialized, expected, keybinding + ' - ' + msg);
 		}
@@ -119,7 +120,7 @@ suite('keybindingIO', () => {
 
 	test('deserialize scan codes', () => {
 		assert.deepEqual(
-			KeybindingIO._readUserBinding('ctrl+shift+[comma] ctrl+/'),
+			KeybindingParser.parseUserBinding('ctrl+shift+[comma] ctrl+/'),
 			[new ScanCodeBinding(true, true, false, false, ScanCode.Comma), new SimpleKeybinding(true, false, false, false, KeyCode.US_SLASH)]
 		);
 	});
diff --git a/src/vs/workbench/services/keybinding/test/keyboardMapperTestUtils.ts b/src/vs/workbench/services/keybinding/test/keyboardMapperTestUtils.ts
index 6cf36eab48f..637f8a9b9b1 100644
--- a/src/vs/workbench/services/keybinding/test/keyboardMapperTestUtils.ts
+++ b/src/vs/workbench/services/keybinding/test/keyboardMapperTestUtils.ts
@@ -11,7 +11,8 @@ import { Keybinding, ResolvedKeybinding, SimpleKeybinding } from 'vs/base/common
 import { TPromise } from 'vs/base/common/winjs.base';
 import { readFile, writeFile } from 'vs/base/node/pfs';
 import { IKeyboardEvent } from 'vs/platform/keybinding/common/keybinding';
-import { ScanCodeBinding } from 'vs/workbench/services/keybinding/common/scanCode';
+import { ScanCodeBinding } from 'vs/base/common/scanCode';
+import { getPathFromAmdModule } from 'vs/base/common/amd';
 
 export interface IResolvedKeybinding {
 	label: string;
@@ -51,7 +52,7 @@ export function assertResolveUserBinding(mapper: IKeyboardMapper, firstPart: Sim
 }
 
 export function readRawMapping<T>(file: string): TPromise<T> {
-	return readFile(require.toUrl(`vs/workbench/services/keybinding/test/${file}.js`)).then((buff) => {
+	return readFile(getPathFromAmdModule(require, `vs/workbench/services/keybinding/test/${file}.js`)).then((buff) => {
 		let contents = buff.toString();
 		let func = new Function('define', contents);
 		let rawMappings: T = null;
@@ -63,7 +64,7 @@ export function readRawMapping<T>(file: string): TPromise<T> {
 }
 
 export function assertMapping(writeFileIfDifferent: boolean, mapper: IKeyboardMapper, file: string): TPromise<void> {
-	const filePath = require.toUrl(`vs/workbench/services/keybinding/test/${file}`);
+	const filePath = getPathFromAmdModule(require, `vs/workbench/services/keybinding/test/${file}`);
 
 	return readFile(filePath).then((buff) => {
 		let expected = buff.toString();
diff --git a/src/vs/workbench/services/keybinding/test/macLinuxFallbackKeyboardMapper.test.ts b/src/vs/workbench/services/keybinding/test/macLinuxFallbackKeyboardMapper.test.ts
index 73ff188981b..a3b9c94140f 100644
--- a/src/vs/workbench/services/keybinding/test/macLinuxFallbackKeyboardMapper.test.ts
+++ b/src/vs/workbench/services/keybinding/test/macLinuxFallbackKeyboardMapper.test.ts
@@ -9,7 +9,7 @@ import { KeyMod, KeyCode, createKeybinding, KeyChord, SimpleKeybinding } from 'v
 import { OperatingSystem } from 'vs/base/common/platform';
 import { IResolvedKeybinding, assertResolveKeybinding, assertResolveKeyboardEvent, assertResolveUserBinding } from 'vs/workbench/services/keybinding/test/keyboardMapperTestUtils';
 import { MacLinuxFallbackKeyboardMapper } from 'vs/workbench/services/keybinding/common/macLinuxFallbackKeyboardMapper';
-import { ScanCodeBinding, ScanCode } from 'vs/workbench/services/keybinding/common/scanCode';
+import { ScanCodeBinding, ScanCode } from 'vs/base/common/scanCode';
 
 suite('keyboardMapper - MAC fallback', () => {
 
diff --git a/src/vs/workbench/services/keybinding/test/macLinuxKeyboardMapper.test.ts b/src/vs/workbench/services/keybinding/test/macLinuxKeyboardMapper.test.ts
index 6f414ca6387..63760373f4f 100644
--- a/src/vs/workbench/services/keybinding/test/macLinuxKeyboardMapper.test.ts
+++ b/src/vs/workbench/services/keybinding/test/macLinuxKeyboardMapper.test.ts
@@ -11,7 +11,7 @@ import { MacLinuxKeyboardMapper, IMacLinuxKeyboardMapping } from 'vs/workbench/s
 import { OperatingSystem } from 'vs/base/common/platform';
 import { UserSettingsLabelProvider } from 'vs/base/common/keybindingLabels';
 import { USLayoutResolvedKeybinding } from 'vs/platform/keybinding/common/usLayoutResolvedKeybinding';
-import { ScanCodeUtils, ScanCodeBinding, ScanCode } from 'vs/workbench/services/keybinding/common/scanCode';
+import { ScanCodeUtils, ScanCodeBinding, ScanCode } from 'vs/base/common/scanCode';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { readRawMapping, assertMapping, IResolvedKeybinding, assertResolveKeybinding, assertResolveKeyboardEvent, assertResolveUserBinding } from 'vs/workbench/services/keybinding/test/keyboardMapperTestUtils';
 
diff --git a/src/vs/workbench/services/keybinding/test/windowsKeyboardMapper.test.ts b/src/vs/workbench/services/keybinding/test/windowsKeyboardMapper.test.ts
index 85bae2537ac..d5ff4d23d26 100644
--- a/src/vs/workbench/services/keybinding/test/windowsKeyboardMapper.test.ts
+++ b/src/vs/workbench/services/keybinding/test/windowsKeyboardMapper.test.ts
@@ -10,7 +10,7 @@ import { TPromise } from 'vs/base/common/winjs.base';
 import { WindowsKeyboardMapper, IWindowsKeyboardMapping } from 'vs/workbench/services/keybinding/common/windowsKeyboardMapper';
 import { createKeybinding, KeyMod, KeyCode, KeyChord, SimpleKeybinding } from 'vs/base/common/keyCodes';
 import { IResolvedKeybinding, assertResolveKeybinding, readRawMapping, assertMapping, assertResolveKeyboardEvent, assertResolveUserBinding } from 'vs/workbench/services/keybinding/test/keyboardMapperTestUtils';
-import { ScanCodeBinding, ScanCode } from 'vs/workbench/services/keybinding/common/scanCode';
+import { ScanCodeBinding, ScanCode } from 'vs/base/common/scanCode';
 
 const WRITE_FILE_IF_DIFFERENT = false;
 
diff --git a/src/vs/workbench/services/mode/common/workbenchModeService.ts b/src/vs/workbench/services/mode/common/workbenchModeService.ts
index 9b2fa23f592..5272f83c9e6 100644
--- a/src/vs/workbench/services/mode/common/workbenchModeService.ts
+++ b/src/vs/workbench/services/mode/common/workbenchModeService.ts
@@ -5,20 +5,31 @@
 'use strict';
 
 import * as nls from 'vs/nls';
-import { onUnexpectedError } from 'vs/base/common/errors';
-import * as paths from 'vs/base/common/paths';
+import * as resources from 'vs/base/common/resources';
 import { TPromise } from 'vs/base/common/winjs.base';
 import * as mime from 'vs/base/common/mime';
 import { IFilesConfiguration, FILES_ASSOCIATIONS_CONFIG } from 'vs/platform/files/common/files';
 import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
 import { IExtensionPointUser, ExtensionMessageCollector, IExtensionPoint, ExtensionsRegistry } from 'vs/workbench/services/extensions/common/extensionsRegistry';
 import { ModesRegistry } from 'vs/editor/common/modes/modesRegistry';
-import { ILanguageExtensionPoint, IValidLanguageExtensionPoint } from 'vs/editor/common/services/modeService';
+import { ILanguageExtensionPoint } from 'vs/editor/common/services/modeService';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { ModeServiceImpl } from 'vs/editor/common/services/modeServiceImpl';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
+import { URI } from 'vs/base/common/uri';
 
-export const languagesExtPoint: IExtensionPoint<ILanguageExtensionPoint[]> = ExtensionsRegistry.registerExtensionPoint<ILanguageExtensionPoint[]>('languages', [], {
+export interface IRawLanguageExtensionPoint {
+	id: string;
+	extensions: string[];
+	filenames: string[];
+	filenamePatterns: string[];
+	firstLine: string;
+	aliases: string[];
+	mimetypes: string[];
+	configuration: string;
+}
+
+export const languagesExtPoint: IExtensionPoint<IRawLanguageExtensionPoint[]> = ExtensionsRegistry.registerExtensionPoint<IRawLanguageExtensionPoint[]>('languages', [], {
 	description: nls.localize('vscode.extension.contributes.languages', 'Contributes language declarations.'),
 	type: 'array',
 	items: {
@@ -92,8 +103,8 @@ export class WorkbenchModeServiceImpl extends ModeServiceImpl {
 		this._configurationService = configurationService;
 		this._extensionService = extensionService;
 
-		languagesExtPoint.setHandler((extensions: IExtensionPointUser<ILanguageExtensionPoint[]>[]) => {
-			let allValidLanguages: IValidLanguageExtensionPoint[] = [];
+		languagesExtPoint.setHandler((extensions: IExtensionPointUser<IRawLanguageExtensionPoint[]>[]) => {
+			let allValidLanguages: ILanguageExtensionPoint[] = [];
 
 			for (let i = 0, len = extensions.length; i < len; i++) {
 				let extension = extensions[i];
@@ -106,8 +117,10 @@ export class WorkbenchModeServiceImpl extends ModeServiceImpl {
 				for (let j = 0, lenJ = extension.value.length; j < lenJ; j++) {
 					let ext = extension.value[j];
 					if (isValidLanguageExtensionPoint(ext, extension.collector)) {
-						// TODO@extensionLocation
-						let configuration = (ext.configuration ? paths.join(extension.description.extensionLocation.fsPath, ext.configuration) : ext.configuration);
+						let configuration: URI;
+						if (ext.configuration) {
+							configuration = resources.joinPath(extension.description.extensionLocation, ext.configuration);
+						}
 						allValidLanguages.push({
 							id: ext.id,
 							extensions: ext.extensions,
@@ -133,7 +146,7 @@ export class WorkbenchModeServiceImpl extends ModeServiceImpl {
 		});
 
 		this.onDidCreateMode((mode) => {
-			this._extensionService.activateByEvent(`onLanguage:${mode.getId()}`).done(null, onUnexpectedError);
+			this._extensionService.activateByEvent(`onLanguage:${mode.getId()}`);
 		});
 	}
 
@@ -176,7 +189,7 @@ function isUndefinedOrStringArray(value: string[]): boolean {
 	return value.every(item => typeof item === 'string');
 }
 
-function isValidLanguageExtensionPoint(value: ILanguageExtensionPoint, collector: ExtensionMessageCollector): boolean {
+function isValidLanguageExtensionPoint(value: IRawLanguageExtensionPoint, collector: ExtensionMessageCollector): boolean {
 	if (!value) {
 		collector.error(nls.localize('invalid.empty', "Empty value for `contributes.{0}`", languagesExtPoint.name));
 		return false;
diff --git a/src/vs/workbench/services/notification/common/notificationService.ts b/src/vs/workbench/services/notification/common/notificationService.ts
index 52fbfe0638c..bd0daafa022 100644
--- a/src/vs/workbench/services/notification/common/notificationService.ts
+++ b/src/vs/workbench/services/notification/common/notificationService.ts
@@ -7,31 +7,22 @@
 
 import { INotificationService, INotification, INotificationHandle, Severity, NotificationMessage, INotificationActions, IPromptChoice } from 'vs/platform/notification/common/notification';
 import { INotificationsModel, NotificationsModel } from 'vs/workbench/common/notifications';
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
+import { dispose, Disposable } from 'vs/base/common/lifecycle';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { Action } from 'vs/base/common/actions';
 import { once } from 'vs/base/common/event';
 
-export class NotificationService implements INotificationService {
+export class NotificationService extends Disposable implements INotificationService {
 
-	public _serviceBrand: any;
+	_serviceBrand: any;
 
-	private _model: INotificationsModel;
-	private toDispose: IDisposable[];
+	private _model: INotificationsModel = this._register(new NotificationsModel());
 
-	constructor() {
-		this.toDispose = [];
-
-		const model = new NotificationsModel();
-		this.toDispose.push(model);
-		this._model = model;
-	}
-
-	public get model(): INotificationsModel {
+	get model(): INotificationsModel {
 		return this._model;
 	}
 
-	public info(message: NotificationMessage | NotificationMessage[]): void {
+	info(message: NotificationMessage | NotificationMessage[]): void {
 		if (Array.isArray(message)) {
 			message.forEach(m => this.info(m));
 
@@ -41,7 +32,7 @@ export class NotificationService implements INotificationService {
 		this.model.notify({ severity: Severity.Info, message });
 	}
 
-	public warn(message: NotificationMessage | NotificationMessage[]): void {
+	warn(message: NotificationMessage | NotificationMessage[]): void {
 		if (Array.isArray(message)) {
 			message.forEach(m => this.warn(m));
 
@@ -51,7 +42,7 @@ export class NotificationService implements INotificationService {
 		this.model.notify({ severity: Severity.Warning, message });
 	}
 
-	public error(message: NotificationMessage | NotificationMessage[]): void {
+	error(message: NotificationMessage | NotificationMessage[]): void {
 		if (Array.isArray(message)) {
 			message.forEach(m => this.error(m));
 
@@ -61,11 +52,11 @@ export class NotificationService implements INotificationService {
 		this.model.notify({ severity: Severity.Error, message });
 	}
 
-	public notify(notification: INotification): INotificationHandle {
+	notify(notification: INotification): INotificationHandle {
 		return this.model.notify(notification);
 	}
 
-	public prompt(severity: Severity, message: string, choices: IPromptChoice[], onCancel?: () => void): INotificationHandle {
+	prompt(severity: Severity, message: string, choices: IPromptChoice[], onCancel?: () => void): INotificationHandle {
 		let handle: INotificationHandle;
 		let choiceClicked = false;
 
@@ -109,8 +100,4 @@ export class NotificationService implements INotificationService {
 
 		return handle;
 	}
-
-	public dispose(): void {
-		this.toDispose = dispose(this.toDispose);
-	}
 }
\ No newline at end of file
diff --git a/src/vs/workbench/services/part/common/partService.ts b/src/vs/workbench/services/part/common/partService.ts
index c96d2e0ed70..a768e4c160a 100644
--- a/src/vs/workbench/services/part/common/partService.ts
+++ b/src/vs/workbench/services/part/common/partService.ts
@@ -7,21 +7,30 @@
 import { TPromise } from 'vs/base/common/winjs.base';
 import { createDecorator, ServiceIdentifier } from 'vs/platform/instantiation/common/instantiation';
 import { Event } from 'vs/base/common/event';
+import { MenuBarVisibility } from 'vs/platform/windows/common/windows';
 
-export enum Parts {
+export const enum Parts {
 	ACTIVITYBAR_PART,
 	SIDEBAR_PART,
 	PANEL_PART,
 	EDITOR_PART,
 	STATUSBAR_PART,
-	TITLEBAR_PART
+	TITLEBAR_PART,
+	MENUBAR_PART
 }
 
-export enum Position {
+export const enum Position {
 	LEFT,
 	RIGHT,
 	BOTTOM
 }
+export function PositionToString(position: Position): string {
+	switch (position) {
+		case Position.LEFT: return 'LEFT';
+		case Position.RIGHT: return 'RIGHT';
+		case Position.BOTTOM: return 'BOTTOM';
+	}
+}
 
 export interface ILayoutOptions {
 	toggleMaximizedPanel?: boolean;
@@ -48,11 +57,6 @@ export interface IPartService {
 	 */
 	onEditorLayout: Event<IDimension>;
 
-	/**
-	 * Asks the part service to layout all parts.
-	 */
-	layout(options?: ILayoutOptions): void;
-
 	/**
 	 * Asks the part service to if all parts have been created.
 	 */
@@ -109,6 +113,11 @@ export interface IPartService {
 	 */
 	getSideBarPosition(): Position;
 
+	/**
+	 * Gets the current menubar visibility.
+	 */
+	getMenubarVisibility(): MenuBarVisibility;
+
 	/**
 	 * Gets the current panel position. Note that the panel can be hidden too.
 	 */
@@ -120,9 +129,9 @@ export interface IPartService {
 	setPanelPosition(position: Position): TPromise<void>;
 
 	/**
-	 * Returns the identifier of the element that contains the workbench.
+	 * Returns the element that contains the workbench.
 	 */
-	getWorkbenchElementId(): string;
+	getWorkbenchElement(): HTMLElement;
 
 	/**
 	 * Toggles the workbench in and out of zen mode - parts get hidden and window goes fullscreen.
diff --git a/src/vs/workbench/services/preferences/browser/preferencesService.ts b/src/vs/workbench/services/preferences/browser/preferencesService.ts
index c9d36e8cbf7..5de3ae783e9 100644
--- a/src/vs/workbench/services/preferences/browser/preferencesService.ts
+++ b/src/vs/workbench/services/preferences/browser/preferencesService.ts
@@ -3,40 +3,40 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as network from 'vs/base/common/network';
-import { TPromise } from 'vs/base/common/winjs.base';
-import * as nls from 'vs/nls';
-import URI from 'vs/base/common/uri';
-import * as labels from 'vs/base/common/labels';
-import * as strings from 'vs/base/common/strings';
-import { Disposable } from 'vs/base/common/lifecycle';
 import { Emitter } from 'vs/base/common/event';
-import { EditorInput, IEditor } from 'vs/workbench/common/editor';
-import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
-import { IWorkspaceConfigurationService } from 'vs/workbench/services/configuration/common/configuration';
-import { IEditorOptions } from 'vs/platform/editor/common/editor';
-import { ITextModel } from 'vs/editor/common/model';
-import { IFileService, FileOperationError, FileOperationResult } from 'vs/platform/files/common/files';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { IPreferencesService, IPreferencesEditorModel, ISetting, getSettingsTargetName, FOLDER_SETTINGS_PATH, DEFAULT_SETTINGS_EDITOR_SETTING } from 'vs/workbench/services/preferences/common/preferences';
-import { SettingsEditorModel, DefaultSettingsEditorModel, DefaultKeybindingsEditorModel, defaultKeybindingsContents, DefaultSettings, WorkspaceConfigurationEditorModel } from 'vs/workbench/services/preferences/common/preferencesModels';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { DefaultPreferencesEditorInput, PreferencesEditorInput, KeybindingsEditorInput, SettingsEditor2Input } from 'vs/workbench/services/preferences/common/preferencesEditorInput';
-import { ITextModelService } from 'vs/editor/common/services/resolverService';
-import { EditOperation } from 'vs/editor/common/core/editOperation';
-import { Position, IPosition } from 'vs/editor/common/core/position';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { IModelService } from 'vs/editor/common/services/modelService';
-import { IJSONEditingService } from 'vs/workbench/services/configuration/common/jsonEditing';
-import { ConfigurationTarget } from 'vs/platform/configuration/common/configuration';
-import { IModeService } from 'vs/editor/common/services/modeService';
 import { parse } from 'vs/base/common/json';
-import { ICodeEditor, getCodeEditor } from 'vs/editor/browser/editorBrowser';
-import { INotificationService } from 'vs/platform/notification/common/notification';
+import { Disposable } from 'vs/base/common/lifecycle';
+import * as network from 'vs/base/common/network';
 import { assign } from 'vs/base/common/objects';
+import * as strings from 'vs/base/common/strings';
+import { URI } from 'vs/base/common/uri';
+import { TPromise } from 'vs/base/common/winjs.base';
+import { getCodeEditor, ICodeEditor } from 'vs/editor/browser/editorBrowser';
+import { EditOperation } from 'vs/editor/common/core/editOperation';
+import { IPosition, Position } from 'vs/editor/common/core/position';
+import { ITextModel } from 'vs/editor/common/model';
+import { IModelService } from 'vs/editor/common/services/modelService';
+import { IModeService } from 'vs/editor/common/services/modeService';
+import { ITextModelService } from 'vs/editor/common/services/resolverService';
+import * as nls from 'vs/nls';
+import { ConfigurationTarget } from 'vs/platform/configuration/common/configuration';
+import { IEditorOptions } from 'vs/platform/editor/common/editor';
+import { IEnvironmentService } from 'vs/platform/environment/common/environment';
+import { FileOperationError, FileOperationResult, IFileService } from 'vs/platform/files/common/files';
+import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
+import { ILabelService } from 'vs/platform/label/common/label';
+import { INotificationService } from 'vs/platform/notification/common/notification';
+import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
+import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
+import { EditorInput, IEditor } from 'vs/workbench/common/editor';
+import { IWorkspaceConfigurationService } from 'vs/workbench/services/configuration/common/configuration';
+import { IJSONEditingService } from 'vs/workbench/services/configuration/common/jsonEditing';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { IEditorGroup, IEditorGroupsService, GroupDirection } from 'vs/workbench/services/group/common/editorGroupsService';
+import { GroupDirection, IEditorGroup, IEditorGroupsService } from 'vs/workbench/services/group/common/editorGroupsService';
+import { DEFAULT_SETTINGS_EDITOR_SETTING, FOLDER_SETTINGS_PATH, getSettingsTargetName, IPreferencesEditorModel, IPreferencesService, ISetting, ISettingsEditorOptions, SettingsEditorOptions } from 'vs/workbench/services/preferences/common/preferences';
+import { DefaultPreferencesEditorInput, KeybindingsEditorInput, PreferencesEditorInput, SettingsEditor2Input } from 'vs/workbench/services/preferences/common/preferencesEditorInput';
+import { defaultKeybindingsContents, DefaultKeybindingsEditorModel, DefaultSettings, DefaultSettingsEditorModel, Settings2EditorModel, SettingsEditorModel, WorkspaceConfigurationEditorModel } from 'vs/workbench/services/preferences/common/preferencesModels';
 
 const emptyEditableSettingsContent = '{\n}';
 
@@ -69,7 +69,8 @@ export class PreferencesService extends Disposable implements IPreferencesServic
 		@IKeybindingService keybindingService: IKeybindingService,
 		@IModelService private modelService: IModelService,
 		@IJSONEditingService private jsonEditingService: IJSONEditingService,
-		@IModeService private modeService: IModeService
+		@IModeService private modeService: IModeService,
+		@ILabelService private labelService: ILabelService
 	) {
 		super();
 		// The default keybindings.json updates based on keyboard layouts, so here we make sure
@@ -95,6 +96,10 @@ export class PreferencesService extends Disposable implements IPreferencesServic
 		return this.getEditableSettingsURI(ConfigurationTarget.WORKSPACE);
 	}
 
+	get settingsEditor2Input(): SettingsEditor2Input {
+		return this.instantiationService.createInstance(SettingsEditor2Input);
+	}
+
 	getFolderSettingsResource(resource: URI): URI {
 		return this.getEditableSettingsURI(ConfigurationTarget.WORKSPACE_FOLDER, resource);
 	}
@@ -115,7 +120,7 @@ export class PreferencesService extends Disposable implements IPreferencesServic
 						return;
 					}
 					defaultSettings = this.getDefaultSettings(target);
-					this.modelService.updateModel(model, defaultSettings.parse());
+					this.modelService.updateModel(model, defaultSettings.getContent(true));
 					defaultSettings._onDidChange.fire();
 				}
 			});
@@ -123,7 +128,7 @@ export class PreferencesService extends Disposable implements IPreferencesServic
 			// Check if Default settings is already created and updated in above promise
 			if (!defaultSettings) {
 				defaultSettings = this.getDefaultSettings(target);
-				this.modelService.updateModel(model, defaultSettings.parse());
+				this.modelService.updateModel(model, defaultSettings.getContent(true));
 			}
 
 			return TPromise.as(model);
@@ -175,34 +180,67 @@ export class PreferencesService extends Disposable implements IPreferencesServic
 		return this.editorService.openEditor({ resource: this.userSettingsResource });
 	}
 
-	openSettings(): TPromise<IEditor> {
+	openSettings(jsonEditor?: boolean): TPromise<IEditor> {
+		jsonEditor = typeof jsonEditor === 'undefined' ?
+			this.configurationService.getValue('workbench.settings.editor') === 'json' :
+			jsonEditor;
+
+		if (!jsonEditor) {
+			return this.openSettings2();
+		}
+
 		const editorInput = this.getActiveSettingsEditorInput() || this.lastOpenedSettingsInput;
 		const resource = editorInput ? editorInput.master.getResource() : this.userSettingsResource;
 		const target = this.getConfigurationTargetFromSettingsResource(resource);
 		return this.openOrSwitchSettings(target, resource);
 	}
 
-	openGlobalSettings(options?: IEditorOptions, group?: IEditorGroup): TPromise<IEditor> {
-		return this.openOrSwitchSettings(ConfigurationTarget.USER, this.userSettingsResource, options, group);
+	private openSettings2(): TPromise<IEditor> {
+		const input = this.settingsEditor2Input;
+		return this.editorGroupService.activeGroup.openEditor(input)
+			.then(() => this.editorGroupService.activeGroup.activeControl);
 	}
 
-	openSettings2(): TPromise<IEditor> {
-		return this.editorService.openEditor(this.instantiationService.createInstance(SettingsEditor2Input), { pinned: true }).then(() => null);
+	openGlobalSettings(jsonEditor?: boolean, options?: ISettingsEditorOptions, group?: IEditorGroup): TPromise<IEditor> {
+		jsonEditor = typeof jsonEditor === 'undefined' ?
+			this.configurationService.getValue('workbench.settings.editor') === 'json' :
+			jsonEditor;
+
+		return jsonEditor ?
+			this.openOrSwitchSettings(ConfigurationTarget.USER, this.userSettingsResource, options, group) :
+			this.openOrSwitchSettings2(ConfigurationTarget.USER, undefined, options, group);
 	}
 
-	openWorkspaceSettings(options?: IEditorOptions, group?: IEditorGroup): TPromise<IEditor> {
+	openWorkspaceSettings(jsonEditor?: boolean, options?: ISettingsEditorOptions, group?: IEditorGroup): TPromise<IEditor> {
+		jsonEditor = typeof jsonEditor === 'undefined' ?
+			this.configurationService.getValue('workbench.settings.editor') === 'json' :
+			jsonEditor;
+
 		if (this.contextService.getWorkbenchState() === WorkbenchState.EMPTY) {
 			this.notificationService.info(nls.localize('openFolderFirst', "Open a folder first to create workspace settings"));
 			return TPromise.as(null);
 		}
-		return this.openOrSwitchSettings(ConfigurationTarget.WORKSPACE, this.workspaceSettingsResource, options, group);
+
+		return jsonEditor ?
+			this.openOrSwitchSettings(ConfigurationTarget.WORKSPACE, this.workspaceSettingsResource, options, group) :
+			this.openOrSwitchSettings2(ConfigurationTarget.WORKSPACE, undefined, options, group);
 	}
 
-	openFolderSettings(folder: URI, options?: IEditorOptions, group?: IEditorGroup): TPromise<IEditor> {
-		return this.openOrSwitchSettings(ConfigurationTarget.WORKSPACE_FOLDER, this.getEditableSettingsURI(ConfigurationTarget.WORKSPACE_FOLDER, folder), options, group);
+	openFolderSettings(folder: URI, jsonEditor?: boolean, options?: ISettingsEditorOptions, group?: IEditorGroup): TPromise<IEditor> {
+		jsonEditor = typeof jsonEditor === 'undefined' ?
+			this.configurationService.getValue('workbench.settings.editor') === 'json' :
+			jsonEditor;
+
+		return jsonEditor ?
+			this.openOrSwitchSettings(ConfigurationTarget.WORKSPACE_FOLDER, this.getEditableSettingsURI(ConfigurationTarget.WORKSPACE_FOLDER, folder), options, group) :
+			this.openOrSwitchSettings2(ConfigurationTarget.WORKSPACE_FOLDER, folder, options, group);
 	}
 
-	switchSettings(target: ConfigurationTarget, resource: URI): TPromise<void> {
+	switchSettings(target: ConfigurationTarget, resource: URI, jsonEditor?: boolean): TPromise<void> {
+		if (!jsonEditor) {
+			return this.doOpenSettings2(target, resource).then(() => null);
+		}
+
 		const activeControl = this.editorService.activeControl;
 		if (activeControl && activeControl.input instanceof PreferencesEditorInput) {
 			return this.doSwitchSettings(target, resource, activeControl.input, activeControl.group).then(() => null);
@@ -221,44 +259,60 @@ export class PreferencesService extends Disposable implements IPreferencesServic
 		if (textual) {
 			const emptyContents = '// ' + nls.localize('emptyKeybindingsHeader', "Place your key bindings in this file to overwrite the defaults") + '\n[\n]';
 			const editableKeybindings = URI.file(this.environmentService.appKeybindingsPath);
+			const openDefaultKeybindings = !!this.configurationService.getValue('workbench.settings.openDefaultKeybindings');
 
 			// Create as needed and open in editor
 			return this.createIfNotExists(editableKeybindings, emptyContents).then(() => {
-				const activeEditorGroup = this.editorGroupService.activeGroup;
-				const sideEditorGroup = this.editorGroupService.addGroup(activeEditorGroup.id, GroupDirection.RIGHT);
-
-				return TPromise.join([
-					this.editorService.openEditor({ resource: this.defaultKeybindingsResource, options: { pinned: true, preserveFocus: true }, label: nls.localize('defaultKeybindings', "Default Keybindings"), description: '' }),
-					this.editorService.openEditor({ resource: editableKeybindings, options: { pinned: true } }, sideEditorGroup.id)
-				]).then(editors => void 0);
+				if (openDefaultKeybindings) {
+					const activeEditorGroup = this.editorGroupService.activeGroup;
+					const sideEditorGroup = this.editorGroupService.addGroup(activeEditorGroup.id, GroupDirection.RIGHT);
+					return TPromise.join([
+						this.editorService.openEditor({ resource: this.defaultKeybindingsResource, options: { pinned: true, preserveFocus: true }, label: nls.localize('defaultKeybindings', "Default Keybindings"), description: '' }),
+						this.editorService.openEditor({ resource: editableKeybindings, options: { pinned: true } }, sideEditorGroup.id)
+					]).then(editors => void 0);
+				} else {
+					return this.editorService.openEditor({ resource: editableKeybindings, options: { pinned: true } }).then(() => void 0);
+				}
 			});
 		}
+
 		return this.editorService.openEditor(this.instantiationService.createInstance(KeybindingsEditorInput), { pinned: true }).then(() => null);
 	}
 
+	openDefaultKeybindingsFile(): TPromise<IEditor> {
+		return this.editorService.openEditor({ resource: this.defaultKeybindingsResource });
+	}
+
 	configureSettingsForLanguage(language: string): void {
 		this.openGlobalSettings()
-			.then(editor => {
-				const codeEditor = getCodeEditor(editor.getControl());
-				if (codeEditor) {
-					this.getPosition(language, codeEditor)
-						.then(position => {
-							codeEditor.setPosition(position);
-							codeEditor.focus();
-						});
-				}
-			});
+			.then(editor => this.createPreferencesEditorModel(this.userSettingsResource)
+				.then((settingsModel: IPreferencesEditorModel<ISetting>) => {
+					const codeEditor = getCodeEditor(editor.getControl());
+					if (codeEditor) {
+						this.getPosition(language, settingsModel, codeEditor)
+							.then(position => {
+								if (codeEditor) {
+									codeEditor.setPosition(position);
+									codeEditor.focus();
+								}
+							});
+					}
+				}));
 	}
 
-	private openOrSwitchSettings(configurationTarget: ConfigurationTarget, resource: URI, options?: IEditorOptions, group: IEditorGroup = this.editorGroupService.activeGroup): TPromise<IEditor> {
+	private openOrSwitchSettings(configurationTarget: ConfigurationTarget, resource: URI, options?: ISettingsEditorOptions, group: IEditorGroup = this.editorGroupService.activeGroup): TPromise<IEditor> {
 		const editorInput = this.getActiveSettingsEditorInput(group);
 		if (editorInput && editorInput.master.getResource().fsPath !== resource.fsPath) {
-			return this.doSwitchSettings(configurationTarget, resource, editorInput, group);
+			return this.doSwitchSettings(configurationTarget, resource, editorInput, group, options);
 		}
 		return this.doOpenSettings(configurationTarget, resource, options, group);
 	}
 
-	private doOpenSettings(configurationTarget: ConfigurationTarget, resource: URI, options?: IEditorOptions, group?: IEditorGroup): TPromise<IEditor> {
+	private openOrSwitchSettings2(configurationTarget: ConfigurationTarget, folderUri?: URI, options?: ISettingsEditorOptions, group: IEditorGroup = this.editorGroupService.activeGroup): TPromise<IEditor> {
+		return this.doOpenSettings2(configurationTarget, folderUri, options, group);
+	}
+
+	private doOpenSettings(configurationTarget: ConfigurationTarget, resource: URI, options?: ISettingsEditorOptions, group?: IEditorGroup): TPromise<IEditor> {
 		const openDefaultSettings = !!this.configurationService.getValue(DEFAULT_SETTINGS_EDITOR_SETTING);
 		return this.getOrCreateEditableSettingsEditorInput(configurationTarget, resource)
 			.then(editableSettingsEditorInput => {
@@ -272,23 +326,41 @@ export class PreferencesService extends Disposable implements IPreferencesServic
 					const defaultPreferencesEditorInput = this.instantiationService.createInstance(DefaultPreferencesEditorInput, this.getDefaultSettingsResource(configurationTarget));
 					const preferencesEditorInput = new PreferencesEditorInput(this.getPreferencesEditorInputName(configurationTarget, resource), editableSettingsEditorInput.getDescription(), defaultPreferencesEditorInput, <EditorInput>editableSettingsEditorInput);
 					this.lastOpenedSettingsInput = preferencesEditorInput;
-					return this.editorService.openEditor(preferencesEditorInput, options, group);
+					return this.editorService.openEditor(preferencesEditorInput, SettingsEditorOptions.create(options), group);
 				}
-				return this.editorService.openEditor(editableSettingsEditorInput, options, group);
+				return this.editorService.openEditor(editableSettingsEditorInput, SettingsEditorOptions.create(options), group);
 			});
 	}
 
-	private doSwitchSettings(target: ConfigurationTarget, resource: URI, input: PreferencesEditorInput, group: IEditorGroup): TPromise<IEditor> {
+	public createSettings2EditorModel(): Settings2EditorModel {
+		return this.instantiationService.createInstance(Settings2EditorModel, this.getDefaultSettings(ConfigurationTarget.USER));
+	}
+
+	private doOpenSettings2(target: ConfigurationTarget, folderUri: URI | undefined, options?: IEditorOptions, group?: IEditorGroup): TPromise<IEditor> {
+		const input = this.settingsEditor2Input;
+		const settingsOptions: ISettingsEditorOptions = {
+			...options,
+			target,
+			folderUri
+		};
+
+		return this.editorService.openEditor(input, SettingsEditorOptions.create(settingsOptions), group);
+	}
+
+	private doSwitchSettings(target: ConfigurationTarget, resource: URI, input: PreferencesEditorInput, group: IEditorGroup, options?: ISettingsEditorOptions): TPromise<IEditor> {
 		return this.getOrCreateEditableSettingsEditorInput(target, this.getEditableSettingsURI(target, resource))
 			.then(toInput => {
-				const replaceWith = new PreferencesEditorInput(this.getPreferencesEditorInputName(target, resource), toInput.getDescription(), this.instantiationService.createInstance(DefaultPreferencesEditorInput, this.getDefaultSettingsResource(target)), toInput);
+				return group.openEditor(input).then(() => {
+					const replaceWith = new PreferencesEditorInput(this.getPreferencesEditorInputName(target, resource), toInput.getDescription(), this.instantiationService.createInstance(DefaultPreferencesEditorInput, this.getDefaultSettingsResource(target)), toInput);
 
-				return group.replaceEditors([{
-					editor: input,
-					replacement: replaceWith
-				}]).then(() => {
-					this.lastOpenedSettingsInput = replaceWith;
-					return group.activeControl;
+					return group.replaceEditors([{
+						editor: input,
+						replacement: replaceWith,
+						options: SettingsEditorOptions.create(options)
+					}]).then(() => {
+						this.lastOpenedSettingsInput = replaceWith;
+						return group.activeControl;
+					});
 				});
 			});
 	}
@@ -430,7 +502,7 @@ export class PreferencesService extends Disposable implements IPreferencesServic
 		return this.fileService.resolveContent(resource, { acceptTextOnly: true }).then(null, error => {
 			if ((<FileOperationError>error).fileOperationResult === FileOperationResult.FILE_NOT_FOUND) {
 				return this.fileService.updateContent(resource, contents).then(null, error => {
-					return TPromise.wrapError(new Error(nls.localize('fail.createSettings', "Unable to create '{0}' ({1}).", labels.getPathLabel(resource, this.contextService, this.environmentService), error)));
+					return TPromise.wrapError(new Error(nls.localize('fail.createSettings', "Unable to create '{0}' ({1}).", this.labelService.getUriLabel(resource, true), error)));
 				});
 			}
 
@@ -454,39 +526,36 @@ export class PreferencesService extends Disposable implements IPreferencesServic
 		];
 	}
 
-	private getPosition(language: string, codeEditor: ICodeEditor): TPromise<IPosition> {
-		return this.createPreferencesEditorModel(this.userSettingsResource)
-			.then((settingsModel: IPreferencesEditorModel<ISetting>) => {
-				const languageKey = `[${language}]`;
-				let setting = settingsModel.getPreference(languageKey);
-				const model = codeEditor.getModel();
-				const configuration = this.configurationService.getValue<{ editor: { tabSize: number; insertSpaces: boolean }, files: { eol: string } }>();
-				const eol = configuration.files && configuration.files.eol;
-				if (setting) {
-					if (setting.overrides.length) {
-						const lastSetting = setting.overrides[setting.overrides.length - 1];
-						let content;
-						if (lastSetting.valueRange.endLineNumber === setting.range.endLineNumber) {
-							content = ',' + eol + this.spaces(2, configuration.editor) + eol + this.spaces(1, configuration.editor);
-						} else {
-							content = ',' + eol + this.spaces(2, configuration.editor);
-						}
-						const editOperation = EditOperation.insert(new Position(lastSetting.valueRange.endLineNumber, lastSetting.valueRange.endColumn), content);
-						model.pushEditOperations([], [editOperation], () => []);
-						return { lineNumber: lastSetting.valueRange.endLineNumber + 1, column: model.getLineMaxColumn(lastSetting.valueRange.endLineNumber + 1) };
-					}
-					return { lineNumber: setting.valueRange.startLineNumber, column: setting.valueRange.startColumn + 1 };
+	private getPosition(language: string, settingsModel: IPreferencesEditorModel<ISetting>, codeEditor: ICodeEditor): TPromise<IPosition> {
+		const languageKey = `[${language}]`;
+		let setting = settingsModel.getPreference(languageKey);
+		const model = codeEditor.getModel();
+		const configuration = this.configurationService.getValue<{ editor: { tabSize: number; insertSpaces: boolean }, files: { eol: string } }>();
+		const eol = configuration.files && configuration.files.eol;
+		if (setting) {
+			if (setting.overrides.length) {
+				const lastSetting = setting.overrides[setting.overrides.length - 1];
+				let content;
+				if (lastSetting.valueRange.endLineNumber === setting.range.endLineNumber) {
+					content = ',' + eol + this.spaces(2, configuration.editor) + eol + this.spaces(1, configuration.editor);
+				} else {
+					content = ',' + eol + this.spaces(2, configuration.editor);
 				}
-				return this.configurationService.updateValue(languageKey, {}, ConfigurationTarget.USER)
-					.then(() => {
-						setting = settingsModel.getPreference(languageKey);
-						let content = eol + this.spaces(2, configuration.editor) + eol + this.spaces(1, configuration.editor);
-						let editOperation = EditOperation.insert(new Position(setting.valueRange.endLineNumber, setting.valueRange.endColumn - 1), content);
-						model.pushEditOperations([], [editOperation], () => []);
-						let lineNumber = setting.valueRange.endLineNumber + 1;
-						settingsModel.dispose();
-						return { lineNumber, column: model.getLineMaxColumn(lineNumber) };
-					});
+				const editOperation = EditOperation.insert(new Position(lastSetting.valueRange.endLineNumber, lastSetting.valueRange.endColumn), content);
+				model.pushEditOperations([], [editOperation], () => []);
+				return TPromise.as({ lineNumber: lastSetting.valueRange.endLineNumber + 1, column: model.getLineMaxColumn(lastSetting.valueRange.endLineNumber + 1) });
+			}
+			return TPromise.as({ lineNumber: setting.valueRange.startLineNumber, column: setting.valueRange.startColumn + 1 });
+		}
+		return this.configurationService.updateValue(languageKey, {}, ConfigurationTarget.USER)
+			.then(() => {
+				setting = settingsModel.getPreference(languageKey);
+				let content = eol + this.spaces(2, configuration.editor) + eol + this.spaces(1, configuration.editor);
+				let editOperation = EditOperation.insert(new Position(setting.valueRange.endLineNumber, setting.valueRange.endColumn - 1), content);
+				model.pushEditOperations([], [editOperation], () => []);
+				let lineNumber = setting.valueRange.endLineNumber + 1;
+				settingsModel.dispose();
+				return { lineNumber, column: model.getLineMaxColumn(lineNumber) };
 			});
 	}
 
diff --git a/src/vs/workbench/services/preferences/common/preferences.ts b/src/vs/workbench/services/preferences/common/preferences.ts
index 82028544ee6..baa3489c3f7 100644
--- a/src/vs/workbench/services/preferences/common/preferences.ts
+++ b/src/vs/workbench/services/preferences/common/preferences.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
 import { IEditorOptions } from 'vs/platform/editor/common/editor';
-import { IEditor } from 'vs/workbench/common/editor';
+import { IEditor, EditorOptions } from 'vs/workbench/common/editor';
 import { ITextModel } from 'vs/editor/common/model';
 import { IRange } from 'vs/editor/common/core/range';
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
@@ -18,6 +18,8 @@ import { IStringDictionary } from 'vs/base/common/collections';
 import { ILocalExtension } from 'vs/platform/extensionManagement/common/extensionManagement';
 import { localize } from 'vs/nls';
 import { IEditorGroup } from 'vs/workbench/services/group/common/editorGroupsService';
+import { Settings2EditorModel } from 'vs/workbench/services/preferences/common/preferencesModels';
+import { ConfigurationScope } from 'vs/platform/configuration/common/configurationRegistry';
 
 export interface ISettingsGroup {
 	id: string;
@@ -25,6 +27,7 @@ export interface ISettingsGroup {
 	title: string;
 	titleRange: IRange;
 	sections: ISettingsSection[];
+	contributedByExtension: boolean;
 }
 
 export interface ISettingsSection {
@@ -40,13 +43,19 @@ export interface ISetting {
 	value: any;
 	valueRange: IRange;
 	description: string[];
+	descriptionIsMarkdown: boolean;
 	descriptionRanges: IRange[];
 	overrides?: ISetting[];
 	overrideOf?: ISetting;
+	deprecationMessage?: string;
 
-	// TODO@roblou maybe need new type and new EditorModel for GUI editor instead of ISetting which is used for text settings editor
+	scope?: ConfigurationScope;
 	type?: string | string[];
 	enum?: string[];
+	enumDescriptions?: string[];
+	enumDescriptionsAreMarkdown?: boolean;
+	tags?: string[];
+	validator?: (value: any) => string;
 }
 
 export interface IExtensionSetting extends ISetting {
@@ -56,6 +65,7 @@ export interface IExtensionSetting extends ISetting {
 
 export interface ISearchResult {
 	filterMatches: ISettingMatch[];
+	exactMatch?: boolean;
 	metadata?: IFilterMetadata;
 }
 
@@ -72,6 +82,7 @@ export interface IFilterResult {
 	allGroups: ISettingsGroup[];
 	matches: IRange[];
 	metadata?: IStringDictionary<IFilterMetadata>;
+	exactMatch?: boolean;
 }
 
 export interface ISettingMatch {
@@ -111,7 +122,7 @@ export interface IFilterMetadata {
 }
 
 export interface IPreferencesEditorModel<T> {
-	uri: URI;
+	uri?: URI;
 	getPreference(key: string): T;
 	dispose(): void;
 }
@@ -127,6 +138,45 @@ export interface ISettingsEditorModel extends IPreferencesEditorModel<ISetting>
 	updateResultGroup(id: string, resultGroup: ISearchResultGroup): IFilterResult;
 }
 
+export interface ISettingsEditorOptions extends IEditorOptions {
+	target?: ConfigurationTarget;
+	folderUri?: URI;
+	query?: string;
+}
+
+/**
+ * TODO Why do we need this class?
+ */
+export class SettingsEditorOptions extends EditorOptions implements ISettingsEditorOptions {
+
+	target?: ConfigurationTarget;
+	folderUri?: URI;
+	query?: string;
+
+	static create(settings: ISettingsEditorOptions): SettingsEditorOptions {
+		if (!settings) {
+			return null;
+		}
+
+		const options = new SettingsEditorOptions();
+
+		options.target = settings.target;
+		options.folderUri = settings.folderUri;
+		options.query = settings.query;
+
+		// IEditorOptions
+		options.preserveFocus = settings.preserveFocus;
+		options.forceReload = settings.forceReload;
+		options.revealIfVisible = settings.revealIfVisible;
+		options.revealIfOpened = settings.revealIfOpened;
+		options.pinned = settings.pinned;
+		options.index = settings.index;
+		options.inactive = settings.inactive;
+
+		return options;
+	}
+}
+
 export interface IKeybindingsEditorModel<T> extends IPreferencesEditorModel<T> {
 }
 
@@ -141,15 +191,16 @@ export interface IPreferencesService {
 
 	resolveModel(uri: URI): TPromise<ITextModel>;
 	createPreferencesEditorModel<T>(uri: URI): TPromise<IPreferencesEditorModel<T>>;
+	createSettings2EditorModel(): Settings2EditorModel; // TODO
 
 	openRawDefaultSettings(): TPromise<IEditor>;
-	openSettings(): TPromise<IEditor>;
-	openSettings2(): TPromise<IEditor>;
-	openGlobalSettings(options?: IEditorOptions, group?: IEditorGroup): TPromise<IEditor>;
-	openWorkspaceSettings(options?: IEditorOptions, group?: IEditorGroup): TPromise<IEditor>;
-	openFolderSettings(folder: URI, options?: IEditorOptions, group?: IEditorGroup): TPromise<IEditor>;
-	switchSettings(target: ConfigurationTarget, resource: URI): TPromise<void>;
+	openSettings(jsonEditor?: boolean): TPromise<IEditor>;
+	openGlobalSettings(jsonEditor?: boolean, options?: ISettingsEditorOptions, group?: IEditorGroup): TPromise<IEditor>;
+	openWorkspaceSettings(jsonEditor?: boolean, options?: ISettingsEditorOptions, group?: IEditorGroup): TPromise<IEditor>;
+	openFolderSettings(folder: URI, jsonEditor?: boolean, options?: ISettingsEditorOptions, group?: IEditorGroup): TPromise<IEditor>;
+	switchSettings(target: ConfigurationTarget, resource: URI, jsonEditor?: boolean): TPromise<void>;
 	openGlobalKeybindingSettings(textual: boolean): TPromise<void>;
+	openDefaultKeybindingsFile(): TPromise<IEditor>;
 
 	configureSettingsForLanguage(language: string): void;
 }
diff --git a/src/vs/workbench/services/preferences/common/preferencesEditorInput.ts b/src/vs/workbench/services/preferences/common/preferencesEditorInput.ts
index 6fb507a0656..4bd8f3110af 100644
--- a/src/vs/workbench/services/preferences/common/preferencesEditorInput.ts
+++ b/src/vs/workbench/services/preferences/common/preferencesEditorInput.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { OS } from 'vs/base/common/platform';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { ITextModelService } from 'vs/editor/common/services/resolverService';
 import * as nls from 'vs/nls';
@@ -13,8 +13,8 @@ import { EditorInput, SideBySideEditorInput, Verbosity } from 'vs/workbench/comm
 import { ResourceEditorInput } from 'vs/workbench/common/editor/resourceEditorInput';
 import { IHashService } from 'vs/workbench/services/hash/common/hashService';
 import { KeybindingsEditorModel } from 'vs/workbench/services/preferences/common/keybindingsEditorModel';
-import { IPreferencesService } from './preferences';
-import { DefaultSettingsEditorModel } from './preferencesModels';
+import { IPreferencesService } from 'vs/workbench/services/preferences/common/preferences';
+import { Settings2EditorModel } from 'vs/workbench/services/preferences/common/preferencesModels';
 
 export class PreferencesEditorInput extends SideBySideEditorInput {
 	public static readonly ID: string = 'workbench.editorinputs.preferencesEditorInput';
@@ -23,10 +23,6 @@ export class PreferencesEditorInput extends SideBySideEditorInput {
 		return PreferencesEditorInput.ID;
 	}
 
-	public supportsSplitEditor(): boolean {
-		return true;
-	}
-
 	public getTitle(verbosity: Verbosity): string {
 		return this.master.getTitle(verbosity);
 	}
@@ -74,7 +70,7 @@ export class KeybindingsEditorInput extends EditorInput {
 		return nls.localize('keybindingsInputName', "Keyboard Shortcuts");
 	}
 
-	resolve(refresh?: boolean): TPromise<KeybindingsEditorModel> {
+	resolve(): TPromise<KeybindingsEditorModel> {
 		return TPromise.as(this.keybindingsModel);
 	}
 
@@ -86,11 +82,18 @@ export class KeybindingsEditorInput extends EditorInput {
 export class SettingsEditor2Input extends EditorInput {
 
 	public static readonly ID: string = 'workbench.input.settings2';
+	private readonly _settingsModel: Settings2EditorModel;
 
 	constructor(
-		@IPreferencesService private preferencesService: IPreferencesService
+		@IPreferencesService _preferencesService: IPreferencesService,
 	) {
 		super();
+
+		this._settingsModel = _preferencesService.createSettings2EditorModel();
+	}
+
+	matches(otherInput: any): boolean {
+		return otherInput instanceof SettingsEditor2Input;
 	}
 
 	getTypeId(): string {
@@ -98,14 +101,17 @@ export class SettingsEditor2Input extends EditorInput {
 	}
 
 	getName(): string {
-		return nls.localize('settingsEditor2InputName', "Settings (Preview)");
+		return nls.localize('settingsEditor2InputName', "Settings");
 	}
 
-	resolve(refresh?: boolean): TPromise<DefaultSettingsEditorModel> {
-		return <TPromise<DefaultSettingsEditorModel>>this.preferencesService.createPreferencesEditorModel(URI.parse('vscode://defaultsettings/0/settings.json'));
+	resolve(): TPromise<Settings2EditorModel> {
+		return TPromise.as(this._settingsModel);
 	}
 
-	matches(otherInput: any): boolean {
-		return otherInput instanceof SettingsEditor2Input;
+	public getResource(): URI {
+		return URI.from({
+			scheme: 'vscode-settings',
+			path: `settingseditor`
+		});
 	}
 }
diff --git a/src/vs/workbench/services/preferences/common/preferencesModels.ts b/src/vs/workbench/services/preferences/common/preferencesModels.ts
index a20abf46e45..5ebf357c101 100644
--- a/src/vs/workbench/services/preferences/common/preferencesModels.ts
+++ b/src/vs/workbench/services/preferences/common/preferencesModels.ts
@@ -3,20 +3,20 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { flatten, tail } from 'vs/base/common/arrays';
+import { flatten, tail, find } from 'vs/base/common/arrays';
 import { IStringDictionary } from 'vs/base/common/collections';
 import { Emitter, Event } from 'vs/base/common/event';
 import { JSONVisitor, visit } from 'vs/base/common/json';
 import { Disposable, IReference } from 'vs/base/common/lifecycle';
 import * as map from 'vs/base/common/map';
 import { assign } from 'vs/base/common/objects';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { IRange, Range } from 'vs/editor/common/core/range';
 import { Selection } from 'vs/editor/common/core/selection';
 import { IIdentifiedSingleEditOperation, ITextModel } from 'vs/editor/common/model';
 import { ITextEditorModel } from 'vs/editor/common/services/resolverService';
 import * as nls from 'vs/nls';
-import { ConfigurationTarget } from 'vs/platform/configuration/common/configuration';
+import { ConfigurationTarget, IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { ConfigurationScope, Extensions, IConfigurationNode, IConfigurationPropertySchema, IConfigurationRegistry, OVERRIDE_PROPERTY_PATTERN } from 'vs/platform/configuration/common/configurationRegistry';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { Registry } from 'vs/platform/registry/common/platform';
@@ -189,7 +189,8 @@ export class SettingsEditorModel extends AbstractSettingsModel implements ISetti
 					settings: filteredSettings
 				}],
 				title: modelGroup.title,
-				titleRange: modelGroup.titleRange
+				titleRange: modelGroup.titleRange,
+				contributedByExtension: !!modelGroup.contributedByExtension
 			};
 		}
 
@@ -203,6 +204,47 @@ export class SettingsEditorModel extends AbstractSettingsModel implements ISetti
 	}
 }
 
+export class Settings2EditorModel extends AbstractSettingsModel implements ISettingsEditorModel {
+	private readonly _onDidChangeGroups: Emitter<void> = this._register(new Emitter<void>());
+	readonly onDidChangeGroups: Event<void> = this._onDidChangeGroups.event;
+
+	private dirty = false;
+
+	constructor(
+		private _defaultSettings: DefaultSettings,
+		@IConfigurationService configurationService: IConfigurationService,
+	) {
+		super();
+
+		configurationService.onDidChangeConfiguration(e => {
+			if (e.source === ConfigurationTarget.DEFAULT) {
+				this.dirty = true;
+				this._onDidChangeGroups.fire();
+			}
+		});
+	}
+
+	protected get filterGroups(): ISettingsGroup[] {
+		// Don't filter "commonly used"
+		return this.settingsGroups.slice(1);
+	}
+
+	public get settingsGroups(): ISettingsGroup[] {
+		const groups = this._defaultSettings.getSettingsGroups(this.dirty);
+		this.dirty = false;
+		return groups;
+	}
+
+	public findValueMatches(filter: string, setting: ISetting): IRange[] {
+		// TODO @roblou
+		return [];
+	}
+
+	protected update(): IFilterResult {
+		throw new Error('Not supported');
+	}
+}
+
 function parse(model: ITextModel, isSettingsProperty: (currentProperty: string, previousParents: string[]) => boolean): ISettingsGroup[] {
 	const settings: ISetting[] = [];
 	let overrideSetting: ISetting = null;
@@ -266,6 +308,7 @@ function parse(model: ITextModel, isSettingsProperty: (currentProperty: string,
 				let settingStartPosition = model.getPositionAt(offset);
 				const setting: ISetting = {
 					description: [],
+					descriptionIsMarkdown: false,
 					key: name,
 					keyRange: {
 						startLineNumber: settingStartPosition.lineNumber,
@@ -408,45 +451,53 @@ export class DefaultSettings extends Disposable {
 		super();
 	}
 
-	get content(): string {
-		if (!this._content) {
-			this.parse();
+	getContent(forceUpdate = false): string {
+		if (!this._content || forceUpdate) {
+			this._content = this.toContent(true, this.getSettingsGroups(forceUpdate));
 		}
+
 		return this._content;
 	}
 
-	get settingsGroups(): ISettingsGroup[] {
-		if (!this._allSettingsGroups) {
-			this.parse();
+	getSettingsGroups(forceUpdate = false): ISettingsGroup[] {
+		if (!this._allSettingsGroups || forceUpdate) {
+			this._allSettingsGroups = this.parse();
 		}
 
 		return this._allSettingsGroups;
 	}
 
-	parse(): string {
+	private parse(): ISettingsGroup[] {
 		const settingsGroups = this.getRegisteredGroups();
 		this.initAllSettingsMap(settingsGroups);
 		const mostCommonlyUsed = this.getMostCommonlyUsedSettings(settingsGroups);
-		this._allSettingsGroups = [mostCommonlyUsed, ...settingsGroups];
-		this._content = this.toContent(true, this._allSettingsGroups);
-		return this._content;
+		return [mostCommonlyUsed, ...settingsGroups];
 	}
 
 	get raw(): string {
 		if (!DefaultSettings._RAW) {
 			DefaultSettings._RAW = this.toContent(false, this.getRegisteredGroups());
 		}
-		return DefaultSettings._RAW;
-	}
 
-	getSettingByName(name: string): ISetting {
-		return this._settingsByName && this._settingsByName.get(name);
+		return DefaultSettings._RAW;
 	}
 
 	private getRegisteredGroups(): ISettingsGroup[] {
 		const configurations = Registry.as<IConfigurationRegistry>(Extensions.Configuration).getConfigurations().slice();
-		return this.removeEmptySettingsGroups(configurations.sort(this.compareConfigurationNodes)
+		const groups = this.removeEmptySettingsGroups(configurations.sort(this.compareConfigurationNodes)
 			.reduce((result, config, index, array) => this.parseConfig(config, result, array), []));
+
+		return this.sortGroups(groups);
+	}
+
+	private sortGroups(groups: ISettingsGroup[]): ISettingsGroup[] {
+		groups.forEach(group => {
+			group.sections.forEach(section => {
+				section.settings.sort((a, b) => a.key.localeCompare(b.key));
+			});
+		});
+
+		return groups;
 	}
 
 	private initAllSettingsMap(allSettingsGroups: ISettingsGroup[]): void {
@@ -471,8 +522,10 @@ export class DefaultSettings extends Disposable {
 					range: null,
 					valueRange: null,
 					overrides: [],
+					scope: ConfigurationScope.RESOURCE,
 					type: setting.type,
-					enum: setting.enum
+					enum: setting.enum,
+					enumDescriptions: setting.enumDescriptions
 				};
 			}
 			return null;
@@ -491,19 +544,20 @@ export class DefaultSettings extends Disposable {
 		};
 	}
 
-	private parseConfig(config: IConfigurationNode, result: ISettingsGroup[], configurations: IConfigurationNode[], settingsGroup?: ISettingsGroup): ISettingsGroup[] {
+	private parseConfig(config: IConfigurationNode, result: ISettingsGroup[], configurations: IConfigurationNode[], settingsGroup?: ISettingsGroup, seenSettings?: { [key: string]: boolean }): ISettingsGroup[] {
+		seenSettings = seenSettings ? seenSettings : {};
 		let title = config.title;
 		if (!title) {
-			const configWithTitleAndSameId = configurations.filter(c => c.id === config.id && c.title)[0];
+			const configWithTitleAndSameId = find(configurations, c => (c.id === config.id) && c.title);
 			if (configWithTitleAndSameId) {
 				title = configWithTitleAndSameId.title;
 			}
 		}
 		if (title) {
 			if (!settingsGroup) {
-				settingsGroup = result.filter(g => g.title === title)[0];
+				settingsGroup = find(result, g => g.title === title);
 				if (!settingsGroup) {
-					settingsGroup = { sections: [{ settings: [] }], id: config.id, title: title, titleRange: null, range: null };
+					settingsGroup = { sections: [{ settings: [] }], id: config.id, title: title, titleRange: null, range: null, contributedByExtension: !!config.contributedByExtension };
 					result.push(settingsGroup);
 				}
 			} else {
@@ -512,17 +566,22 @@ export class DefaultSettings extends Disposable {
 		}
 		if (config.properties) {
 			if (!settingsGroup) {
-				settingsGroup = { sections: [{ settings: [] }], id: config.id, title: config.id, titleRange: null, range: null };
+				settingsGroup = { sections: [{ settings: [] }], id: config.id, title: config.id, titleRange: null, range: null, contributedByExtension: !!config.contributedByExtension };
 				result.push(settingsGroup);
 			}
-			const configurationSettings: ISetting[] = [...settingsGroup.sections[settingsGroup.sections.length - 1].settings, ...this.parseSettings(config.properties)];
+			const configurationSettings: ISetting[] = [];
+			for (const setting of [...settingsGroup.sections[settingsGroup.sections.length - 1].settings, ...this.parseSettings(config.properties)]) {
+				if (!seenSettings[setting.key]) {
+					configurationSettings.push(setting);
+					seenSettings[setting.key] = true;
+				}
+			}
 			if (configurationSettings.length) {
-				configurationSettings.sort((a, b) => a.key.localeCompare(b.key));
 				settingsGroup.sections[settingsGroup.sections.length - 1].settings = configurationSettings;
 			}
 		}
 		if (config.allOf) {
-			config.allOf.forEach(c => this.parseConfig(c, result, configurations, settingsGroup));
+			config.allOf.forEach(c => this.parseConfig(c, result, configurations, settingsGroup, seenSettings));
 		}
 		return result;
 	}
@@ -542,18 +601,46 @@ export class DefaultSettings extends Disposable {
 		let result: ISetting[] = [];
 		for (let key in settingsObject) {
 			const prop = settingsObject[key];
-			if (!prop.deprecationMessage && this.matchesScope(prop)) {
+			if (this.matchesScope(prop)) {
 				const value = prop.default;
-				const description = (prop.description || '').split('\n');
+				const description = (prop.description || prop.markdownDescription || '').split('\n');
 				const overrides = OVERRIDE_PROPERTY_PATTERN.test(key) ? this.parseOverrideSettings(prop.default) : [];
-				result.push({ key, value, description, range: null, keyRange: null, valueRange: null, descriptionRanges: [], overrides, type: prop.type, enum: prop.enum });
+				result.push({
+					key,
+					value,
+					description,
+					descriptionIsMarkdown: !prop.description,
+					range: null,
+					keyRange: null,
+					valueRange: null,
+					descriptionRanges: [],
+					overrides,
+					scope: prop.scope,
+					type: prop.type,
+					enum: prop.enum,
+					enumDescriptions: prop.enumDescriptions || prop.markdownEnumDescriptions,
+					enumDescriptionsAreMarkdown: !prop.enumDescriptions,
+					tags: prop.tags,
+					deprecationMessage: prop.deprecationMessage,
+					validator: createValidator(prop)
+				});
 			}
 		}
 		return result;
 	}
 
 	private parseOverrideSettings(overrideSettings: any): ISetting[] {
-		return Object.keys(overrideSettings).map((key) => ({ key, value: overrideSettings[key], description: [], range: null, keyRange: null, valueRange: null, descriptionRanges: [], overrides: [] }));
+		return Object.keys(overrideSettings).map((key) => ({
+			key,
+			value: overrideSettings[key],
+			description: [],
+			descriptionIsMarkdown: false,
+			range: null,
+			keyRange: null,
+			valueRange: null,
+			descriptionRanges: [],
+			overrides: []
+		}));
 	}
 
 	private matchesScope(property: IConfigurationNode): boolean {
@@ -626,7 +713,7 @@ export class DefaultSettingsEditorModel extends AbstractSettingsModel implements
 	}
 
 	public get settingsGroups(): ISettingsGroup[] {
-		return this.defaultSettings.settingsGroups;
+		return this.defaultSettings.getSettingsGroups();
 	}
 
 	protected get filterGroups(): ISettingsGroup[] {
@@ -730,13 +817,23 @@ export class DefaultSettingsEditorModel extends AbstractSettingsModel implements
 	}
 
 	private copySetting(setting: ISetting): ISetting {
-		return <ISetting>{
+		return {
 			description: setting.description,
+			scope: setting.scope,
+			type: setting.type,
+			enum: setting.enum,
+			enumDescriptions: setting.enumDescriptions,
 			key: setting.key,
 			value: setting.value,
 			range: setting.range,
 			overrides: [],
-			overrideOf: setting.overrideOf
+			overrideOf: setting.overrideOf,
+			tags: setting.tags,
+			deprecationMessage: setting.deprecationMessage,
+			keyRange: undefined,
+			valueRange: undefined,
+			descriptionIsMarkdown: undefined,
+			descriptionRanges: undefined
 		};
 	}
 
@@ -840,26 +937,48 @@ class SettingsContentBuilder {
 
 	private pushSetting(setting: ISetting, indent: string): void {
 		const settingStart = this.lineCountWithOffset + 1;
+
+		this.pushSettingDescription(setting, indent);
+
+		let preValueContent = indent;
+		const keyString = JSON.stringify(setting.key);
+		preValueContent += keyString;
+		setting.keyRange = { startLineNumber: this.lineCountWithOffset + 1, startColumn: preValueContent.indexOf(setting.key) + 1, endLineNumber: this.lineCountWithOffset + 1, endColumn: setting.key.length };
+
+		preValueContent += ': ';
+		const valueStart = this.lineCountWithOffset + 1;
+		this.pushValue(setting, preValueContent, indent);
+
+		setting.valueRange = { startLineNumber: valueStart, startColumn: preValueContent.length + 1, endLineNumber: this.lineCountWithOffset, endColumn: this.lastLine.length + 1 };
+		this._contentByLines[this._contentByLines.length - 1] += ',';
+		this._contentByLines.push('');
+		setting.range = { startLineNumber: settingStart, startColumn: 1, endLineNumber: this.lineCountWithOffset, endColumn: this.lastLine.length };
+	}
+
+	private pushSettingDescription(setting: ISetting, indent: string): void {
+		const fixSettingLink = line => line.replace(/`#(.*)#`/g, (match, settingName) => `\`${settingName}\``);
+
 		setting.descriptionRanges = [];
 		const descriptionPreValue = indent + '// ';
-		for (const line of setting.description) {
+		for (let line of (setting.deprecationMessage ? [setting.deprecationMessage, ...setting.description] : setting.description)) {
+			line = fixSettingLink(line);
+
 			this._contentByLines.push(descriptionPreValue + line);
 			setting.descriptionRanges.push({ startLineNumber: this.lineCountWithOffset, startColumn: this.lastLine.indexOf(line) + 1, endLineNumber: this.lineCountWithOffset, endColumn: this.lastLine.length });
 		}
 
-		let preValueConent = indent;
-		const keyString = JSON.stringify(setting.key);
-		preValueConent += keyString;
-		setting.keyRange = { startLineNumber: this.lineCountWithOffset + 1, startColumn: preValueConent.indexOf(setting.key) + 1, endLineNumber: this.lineCountWithOffset + 1, endColumn: setting.key.length };
+		if (setting.enumDescriptions && setting.enumDescriptions.some(desc => !!desc)) {
+			setting.enumDescriptions.forEach((desc, i) => {
+				const displayEnum = escapeInvisibleChars(String(setting.enum[i]));
+				const line = desc ?
+					`${displayEnum}: ${fixSettingLink(desc)}` :
+					displayEnum;
 
-		preValueConent += ': ';
-		const valueStart = this.lineCountWithOffset + 1;
-		this.pushValue(setting, preValueConent, indent);
+				this._contentByLines.push(`  //  - ${line}`);
 
-		setting.valueRange = { startLineNumber: valueStart, startColumn: preValueConent.length + 1, endLineNumber: this.lineCountWithOffset, endColumn: this.lastLine.length + 1 };
-		this._contentByLines[this._contentByLines.length - 1] += ',';
-		this._contentByLines.push('');
-		setting.range = { startLineNumber: settingStart, startColumn: 1, endLineNumber: this.lineCountWithOffset, endColumn: this.lastLine.length };
+				setting.descriptionRanges.push({ startLineNumber: this.lineCountWithOffset, startColumn: this.lastLine.indexOf(line) + 1, endLineNumber: this.lineCountWithOffset, endColumn: this.lastLine.length });
+			});
+		}
 	}
 
 	private pushValue(setting: ISetting, preValueConent: string, indent: string): void {
@@ -894,6 +1013,118 @@ class SettingsContentBuilder {
 	}
 }
 
+export function createValidator(prop: IConfigurationPropertySchema): ((value: any) => string) | null {
+	return value => {
+		let exclusiveMax: number | undefined;
+		let exclusiveMin: number | undefined;
+
+		if (typeof prop.exclusiveMaximum === 'boolean') {
+			exclusiveMax = prop.exclusiveMaximum ? prop.maximum : undefined;
+		} else {
+			exclusiveMax = prop.exclusiveMaximum;
+		}
+
+		if (typeof prop.exclusiveMinimum === 'boolean') {
+			exclusiveMin = prop.exclusiveMinimum ? prop.minimum : undefined;
+		} else {
+			exclusiveMin = prop.exclusiveMinimum;
+		}
+
+		let patternRegex: RegExp | undefined;
+		if (typeof prop.pattern === 'string') {
+			patternRegex = new RegExp(prop.pattern);
+		}
+
+		const type = Array.isArray(prop.type) ? prop.type : [prop.type];
+		const canBeType = (t: string) => type.indexOf(t) > -1;
+
+		const isNullable = canBeType('null');
+		const isNumeric = (canBeType('number') || canBeType('integer')) && (type.length === 1 || type.length === 2 && isNullable);
+		const isIntegral = (canBeType('integer')) && (type.length === 1 || type.length === 2 && isNullable);
+
+		type Validator<T> = { enabled: boolean, isValid: (value: T) => boolean; message: string };
+
+		let numericValidations: Validator<number>[] = isNumeric ? [
+			{
+				enabled: exclusiveMax !== undefined && (prop.maximum === undefined || exclusiveMax <= prop.maximum),
+				isValid: (value => value < exclusiveMax),
+				message: nls.localize('validations.exclusiveMax', "Value must be strictly less than {0}.", exclusiveMax)
+			},
+			{
+				enabled: exclusiveMin !== undefined && (prop.minimum === undefined || exclusiveMin >= prop.minimum),
+				isValid: (value => value > exclusiveMin),
+				message: nls.localize('validations.exclusiveMin', "Value must be strictly greater than {0}.", exclusiveMin)
+			},
+
+			{
+				enabled: prop.maximum !== undefined && (exclusiveMax === undefined || exclusiveMax > prop.maximum),
+				isValid: (value => value <= prop.maximum),
+				message: nls.localize('validations.max', "Value must be less than or equal to {0}.", prop.maximum)
+			},
+			{
+				enabled: prop.minimum !== undefined && (exclusiveMin === undefined || exclusiveMin < prop.minimum),
+				isValid: (value => value >= prop.minimum),
+				message: nls.localize('validations.min', "Value must be greater than or equal to {0}.", prop.minimum)
+			},
+			{
+				enabled: prop.multipleOf !== undefined,
+				isValid: (value => value % prop.multipleOf === 0),
+				message: nls.localize('validations.multipleOf', "Value must be a multiple of {0}.", prop.multipleOf)
+			},
+			{
+				enabled: isIntegral,
+				isValid: (value => value % 1 === 0),
+				message: nls.localize('validations.expectedInteger', "Value must be an integer.")
+			},
+		].filter(validation => validation.enabled) : [];
+
+		let stringValidations: Validator<string>[] = [
+			{
+				enabled: prop.maxLength !== undefined,
+				isValid: (value => value.length <= prop.maxLength),
+				message: nls.localize('validations.maxLength', "Value must be fewer than {0} characters long.", prop.maxLength)
+			},
+			{
+				enabled: prop.minLength !== undefined,
+				isValid: (value => value.length >= prop.minLength),
+				message: nls.localize('validations.minLength', "Value must be more than {0} characters long.", prop.minLength)
+			},
+			{
+				enabled: patternRegex !== undefined,
+				isValid: (value => patternRegex.test(value)),
+				message: prop.patternErrorMessage || nls.localize('validations.regex', "Value must match regex `{0}`.", prop.pattern)
+			},
+		].filter(validation => validation.enabled);
+
+		if (prop.type === 'string' && stringValidations.length === 0) { return null; }
+		if (isNullable && value === '') { return ''; }
+
+		let errors = [];
+
+		if (isNumeric) {
+			if (value === '' || isNaN(+value)) {
+				errors.push(nls.localize('validations.expectedNumeric', "Value must be a number."));
+			} else {
+				errors.push(...numericValidations.filter(validator => !validator.isValid(+value)).map(validator => validator.message));
+			}
+		}
+
+		if (prop.type === 'string') {
+			errors.push(...stringValidations.filter(validator => !validator.isValid('' + value)).map(validator => validator.message));
+		}
+		if (errors.length) {
+			return prop.errorMessage ? [prop.errorMessage, ...errors].join(' ') : errors.join(' ');
+		}
+		return '';
+	};
+}
+
+function escapeInvisibleChars(enumValue: string): string {
+	return enumValue && enumValue
+		.replace(/\n/g, '\\n')
+		.replace(/\r/g, '\\r');
+}
+
 export function defaultKeybindingsContents(keybindingService: IKeybindingService): string {
 	const defaultsHeader = '// ' + nls.localize('defaultKeybindingsHeader', "Overwrite key bindings by placing them into your key bindings file.");
 	return defaultsHeader + '\n' + keybindingService.getDefaultKeybindingsContent();
diff --git a/src/vs/workbench/services/preferences/test/common/preferencesModel.test.ts b/src/vs/workbench/services/preferences/test/common/preferencesModel.test.ts
new file mode 100644
index 00000000000..8550a177cf4
--- /dev/null
+++ b/src/vs/workbench/services/preferences/test/common/preferencesModel.test.ts
@@ -0,0 +1,249 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as assert from 'assert';
+import { createValidator } from 'vs/workbench/services/preferences/common/preferencesModels';
+import { IConfigurationPropertySchema } from 'vs/platform/configuration/common/configurationRegistry';
+
+
+suite('Preferences Model test', () => {
+	class Tester {
+		private validator: (value: any) => string;
+
+		constructor(private settings: IConfigurationPropertySchema) {
+			this.validator = createValidator(settings);
+		}
+
+		public accepts(input) {
+			assert.equal(this.validator(input), '', `Expected ${JSON.stringify(this.settings)} to accept \`${input}\`. Got ${this.validator(input)}.`);
+		}
+
+		public rejects(input) {
+			assert.notEqual(this.validator(input), '', `Expected ${JSON.stringify(this.settings)} to reject \`${input}\`.`);
+			return {
+				withMessage:
+					(message) => assert(this.validator(input).indexOf(message) > -1,
+						`Expected error of ${JSON.stringify(this.settings)} on \`${input}\` to contain ${message}. Got ${this.validator(input)}.`)
+			};
+		}
+
+
+		public validatesNumeric() {
+			this.accepts('3');
+			this.accepts('3.');
+			this.accepts('.0');
+			this.accepts('3.0');
+			this.accepts(' 3.0');
+			this.accepts(' 3.0  ');
+			this.rejects('3f');
+		}
+
+		public validatesNullableNumeric() {
+			this.validatesNumeric();
+			this.accepts('');
+		}
+
+		public validatesNonNullableNumeric() {
+			this.validatesNumeric();
+			this.rejects('');
+		}
+
+		public validatesString() {
+			this.accepts('3');
+			this.accepts('3.');
+			this.accepts('.0');
+			this.accepts('3.0');
+			this.accepts(' 3.0');
+			this.accepts(' 3.0  ');
+			this.accepts('');
+			this.accepts('3f');
+			this.accepts('hello');
+		}
+	}
+
+
+	test('exclusive max and max work together properly', () => {
+		{
+			const justMax = new Tester({ maximum: 5, type: 'number' });
+			justMax.validatesNonNullableNumeric();
+			justMax.rejects('5.1');
+			justMax.accepts('5.0');
+		}
+		{
+			const justEMax = new Tester({ exclusiveMaximum: 5, type: 'number' });
+			justEMax.validatesNonNullableNumeric();
+			justEMax.rejects('5.1');
+			justEMax.rejects('5.0');
+			justEMax.accepts('4.999');
+		}
+		{
+			const bothNumeric = new Tester({ exclusiveMaximum: 5, maximum: 4, type: 'number' });
+			bothNumeric.validatesNonNullableNumeric();
+			bothNumeric.rejects('5.1');
+			bothNumeric.rejects('5.0');
+			bothNumeric.rejects('4.999');
+			bothNumeric.accepts('4');
+		}
+		{
+			const bothNumeric = new Tester({ exclusiveMaximum: 5, maximum: 6, type: 'number' });
+			bothNumeric.validatesNonNullableNumeric();
+			bothNumeric.rejects('5.1');
+			bothNumeric.rejects('5.0');
+			bothNumeric.accepts('4.999');
+		}
+	});
+
+	test('exclusive min and min work together properly', () => {
+		{
+			const justMin = new Tester({ minimum: -5, type: 'number' });
+			justMin.validatesNonNullableNumeric();
+			justMin.rejects('-5.1');
+			justMin.accepts('-5.0');
+		}
+		{
+			const justEMin = new Tester({ exclusiveMinimum: -5, type: 'number' });
+			justEMin.validatesNonNullableNumeric();
+			justEMin.rejects('-5.1');
+			justEMin.rejects('-5.0');
+			justEMin.accepts('-4.999');
+		}
+		{
+			const bothNumeric = new Tester({ exclusiveMinimum: -5, minimum: -4, type: 'number' });
+			bothNumeric.validatesNonNullableNumeric();
+			bothNumeric.rejects('-5.1');
+			bothNumeric.rejects('-5.0');
+			bothNumeric.rejects('-4.999');
+			bothNumeric.accepts('-4');
+		}
+		{
+			const bothNumeric = new Tester({ exclusiveMinimum: -5, minimum: -6, type: 'number' });
+			bothNumeric.validatesNonNullableNumeric();
+			bothNumeric.rejects('-5.1');
+			bothNumeric.rejects('-5.0');
+			bothNumeric.accepts('-4.999');
+		}
+	});
+
+	test('multiple of works for both integers and fractions', () => {
+		{
+			const onlyEvens = new Tester({ multipleOf: 2, type: 'number' });
+			onlyEvens.accepts('2.0');
+			onlyEvens.accepts('2');
+			onlyEvens.accepts('-4');
+			onlyEvens.accepts('0');
+			onlyEvens.accepts('100');
+			onlyEvens.rejects('100.1');
+			onlyEvens.rejects('');
+			onlyEvens.rejects('we');
+		}
+		{
+			const hackyIntegers = new Tester({ multipleOf: 1, type: 'number' });
+			hackyIntegers.accepts('2.0');
+			hackyIntegers.rejects('.5');
+		}
+		{
+			const halfIntegers = new Tester({ multipleOf: 0.5, type: 'number' });
+			halfIntegers.accepts('0.5');
+			halfIntegers.accepts('1.5');
+			halfIntegers.rejects('1.51');
+		}
+	});
+
+	test('integer type correctly adds a validation', () => {
+		{
+			const integers = new Tester({ multipleOf: 1, type: 'integer' });
+			integers.accepts('02');
+			integers.accepts('2');
+			integers.accepts('20');
+			integers.rejects('.5');
+			integers.rejects('2j');
+			integers.rejects('');
+		}
+	});
+
+	test('null is allowed only when expected', () => {
+		{
+			const nullableIntegers = new Tester({ type: ['integer', 'null'] });
+			nullableIntegers.accepts('2');
+			nullableIntegers.rejects('.5');
+			nullableIntegers.accepts('2.0');
+			nullableIntegers.rejects('2j');
+			nullableIntegers.accepts('');
+		}
+		{
+			const nonnullableIntegers = new Tester({ type: ['integer'] });
+			nonnullableIntegers.accepts('2');
+			nonnullableIntegers.rejects('.5');
+			nonnullableIntegers.accepts('2.0');
+			nonnullableIntegers.rejects('2j');
+			nonnullableIntegers.rejects('');
+		}
+		{
+			const nullableNumbers = new Tester({ type: ['number', 'null'] });
+			nullableNumbers.accepts('2');
+			nullableNumbers.accepts('.5');
+			nullableNumbers.accepts('2.0');
+			nullableNumbers.rejects('2j');
+			nullableNumbers.accepts('');
+		}
+		{
+			const nonnullableNumbers = new Tester({ type: ['number'] });
+			nonnullableNumbers.accepts('2');
+			nonnullableNumbers.accepts('.5');
+			nonnullableNumbers.accepts('2.0');
+			nonnullableNumbers.rejects('2j');
+			nonnullableNumbers.rejects('');
+		}
+	});
+
+	test('string max min length work', () => {
+		{
+			const min = new Tester({ minLength: 4, type: 'string' });
+			min.rejects('123');
+			min.accepts('1234');
+			min.accepts('12345');
+		}
+		{
+			const max = new Tester({ maxLength: 6, type: 'string' });
+			max.accepts('12345');
+			max.accepts('123456');
+			max.rejects('1234567');
+		}
+		{
+			const minMax = new Tester({ minLength: 4, maxLength: 6, type: 'string' });
+			minMax.rejects('123');
+			minMax.accepts('1234');
+			minMax.accepts('12345');
+			minMax.accepts('123456');
+			minMax.rejects('1234567');
+		}
+	});
+
+	test('patterns work', () => {
+		{
+			const urls = new Tester({ pattern: '^(hello)*$', type: 'string' });
+			urls.accepts('');
+			urls.rejects('hel');
+			urls.accepts('hello');
+			urls.rejects('hellohel');
+			urls.accepts('hellohello');
+		}
+		{
+			const urls = new Tester({ pattern: '^(hello)*$', type: 'string', patternErrorMessage: 'err: must be friendly' });
+			urls.accepts('');
+			urls.rejects('hel').withMessage('err: must be friendly');
+			urls.accepts('hello');
+			urls.rejects('hellohel').withMessage('err: must be friendly');
+			urls.accepts('hellohello');
+		}
+	});
+
+	test('custom error messages are shown', () => {
+		const withMessage = new Tester({ minLength: 1, maxLength: 0, type: 'string', errorMessage: 'always error!' });
+		withMessage.rejects('').withMessage('always error!');
+		withMessage.rejects(' ').withMessage('always error!');
+		withMessage.rejects('1').withMessage('always error!');
+	});
+});
\ No newline at end of file
diff --git a/src/vs/workbench/services/progress/browser/progressService.ts b/src/vs/workbench/services/progress/browser/progressService.ts
index 6f6e6b5da76..b68cb4c8b77 100644
--- a/src/vs/workbench/services/progress/browser/progressService.ts
+++ b/src/vs/workbench/services/progress/browser/progressService.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as lifecycle from 'vs/base/common/lifecycle';
+import { Disposable } from 'vs/base/common/lifecycle';
 import { TPromise } from 'vs/base/common/winjs.base';
 import * as types from 'vs/base/common/types';
 import { ProgressBar } from 'vs/base/browser/ui/progressbar/progressbar';
@@ -21,21 +21,20 @@ interface ProgressState {
 	whileDelay?: number;
 }
 
-export abstract class ScopedService {
-
-	protected toDispose: lifecycle.IDisposable[];
+export abstract class ScopedService extends Disposable {
 
 	constructor(private viewletService: IViewletService, private panelService: IPanelService, private scopeId: string) {
-		this.toDispose = [];
+		super();
+
 		this.registerListeners();
 	}
 
-	public registerListeners(): void {
-		this.toDispose.push(this.viewletService.onDidViewletOpen(viewlet => this.onScopeOpened(viewlet.getId())));
-		this.toDispose.push(this.panelService.onDidPanelOpen(panel => this.onScopeOpened(panel.getId())));
+	registerListeners(): void {
+		this._register(this.viewletService.onDidViewletOpen(viewlet => this.onScopeOpened(viewlet.getId())));
+		this._register(this.panelService.onDidPanelOpen(panel => this.onScopeOpened(panel.getId())));
 
-		this.toDispose.push(this.viewletService.onDidViewletClose(viewlet => this.onScopeClosed(viewlet.getId())));
-		this.toDispose.push(this.panelService.onDidPanelClose(panel => this.onScopeClosed(panel.getId())));
+		this._register(this.viewletService.onDidViewletClose(viewlet => this.onScopeClosed(viewlet.getId())));
+		this._register(this.panelService.onDidPanelClose(panel => this.onScopeClosed(panel.getId())));
 	}
 
 	private onScopeClosed(scopeId: string) {
@@ -50,13 +49,13 @@ export abstract class ScopedService {
 		}
 	}
 
-	public abstract onScopeActivated(): void;
+	abstract onScopeActivated(): void;
 
-	public abstract onScopeDeactivated(): void;
+	abstract onScopeDeactivated(): void;
 }
 
 export class ScopedProgressService extends ScopedService implements IProgressService {
-	public _serviceBrand: any;
+	_serviceBrand: any;
 	private isActive: boolean;
 	private progressbar: ProgressBar;
 	private progressState: ProgressState;
@@ -75,11 +74,11 @@ export class ScopedProgressService extends ScopedService implements IProgressSer
 		this.progressState = Object.create(null);
 	}
 
-	public onScopeDeactivated(): void {
+	onScopeDeactivated(): void {
 		this.isActive = false;
 	}
 
-	public onScopeActivated(): void {
+	onScopeActivated(): void {
 		this.isActive = true;
 
 		// Return early if progress state indicates that progress is done
@@ -127,9 +126,9 @@ export class ScopedProgressService extends ScopedService implements IProgressSer
 		this.progressState.whileDelay = void 0;
 	}
 
-	public show(infinite: boolean, delay?: number): IProgressRunner;
-	public show(total: number, delay?: number): IProgressRunner;
-	public show(infiniteOrTotal: boolean | number, delay?: number): IProgressRunner {
+	show(infinite: boolean, delay?: number): IProgressRunner;
+	show(total: number, delay?: number): IProgressRunner;
+	show(infiniteOrTotal: boolean | number, delay?: number): IProgressRunner {
 		let infinite: boolean;
 		let total: number;
 
@@ -207,7 +206,7 @@ export class ScopedProgressService extends ScopedService implements IProgressSer
 		};
 	}
 
-	public showWhile(promise: TPromise<any>, delay?: number): TPromise<void> {
+	showWhile(promise: TPromise<any>, delay?: number): TPromise<void> {
 		let stack: boolean = !!this.progressState.whilePromise;
 
 		// Reset State
@@ -252,21 +251,17 @@ export class ScopedProgressService extends ScopedService implements IProgressSer
 			this.progressbar.infinite().show(delay);
 		}
 	}
-
-	public dispose(): void {
-		this.toDispose = lifecycle.dispose(this.toDispose);
-	}
 }
 
 export class ProgressService implements IProgressService {
 
-	public _serviceBrand: any;
+	_serviceBrand: any;
 
 	constructor(private progressbar: ProgressBar) { }
 
-	public show(infinite: boolean, delay?: number): IProgressRunner;
-	public show(total: number, delay?: number): IProgressRunner;
-	public show(infiniteOrTotal: boolean | number, delay?: number): IProgressRunner {
+	show(infinite: boolean, delay?: number): IProgressRunner;
+	show(total: number, delay?: number): IProgressRunner;
+	show(infiniteOrTotal: boolean | number, delay?: number): IProgressRunner {
 		if (typeof infiniteOrTotal === 'boolean') {
 			this.progressbar.infinite().show(delay);
 		} else {
@@ -292,7 +287,7 @@ export class ProgressService implements IProgressService {
 		};
 	}
 
-	public showWhile(promise: TPromise<any>, delay?: number): TPromise<void> {
+	showWhile(promise: TPromise<any>, delay?: number): TPromise<void> {
 		const stop = () => {
 			this.progressbar.stop().hide();
 		};
diff --git a/src/vs/workbench/services/progress/browser/progressService2.ts b/src/vs/workbench/services/progress/browser/progressService2.ts
index 5a090430915..0720a1e14f2 100644
--- a/src/vs/workbench/services/progress/browser/progressService2.ts
+++ b/src/vs/workbench/services/progress/browser/progressService2.ts
@@ -8,17 +8,20 @@ import 'vs/css!./media/progressService2';
 import * as dom from 'vs/base/browser/dom';
 import { localize } from 'vs/nls';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
-import { IProgressService2, IProgressOptions, ProgressLocation, IProgress, IProgressStep, Progress, emptyProgress } from 'vs/platform/progress/common/progress';
+import { IProgressService2, IProgressOptions, IProgressStep, ProgressLocation } from 'vs/workbench/services/progress/common/progress';
+import { IProgress, emptyProgress, Progress } from 'vs/platform/progress/common/progress';
 import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet';
 import { OcticonLabel } from 'vs/base/browser/ui/octiconLabel/octiconLabel';
 import { Registry } from 'vs/platform/registry/common/platform';
-import { StatusbarAlignment, IStatusbarRegistry, StatusbarItemDescriptor, Extensions, IStatusbarItem } from 'vs/workbench/browser/parts/statusbar/statusbar';
+import { IStatusbarRegistry, StatusbarItemDescriptor, Extensions, IStatusbarItem } from 'vs/workbench/browser/parts/statusbar/statusbar';
+import { StatusbarAlignment } from 'vs/platform/statusbar/common/statusbar';
 import { TPromise } from 'vs/base/common/winjs.base';
-import { always } from 'vs/base/common/async';
+import { always, timeout } from 'vs/base/common/async';
 import { ProgressBadge, IActivityService } from 'vs/workbench/services/activity/common/activity';
 import { INotificationService, Severity, INotificationHandle, INotificationActions } from 'vs/platform/notification/common/notification';
 import { Action } from 'vs/base/common/actions';
 import { once } from 'vs/base/common/event';
+import { ViewContainer } from 'vs/workbench/common/views';
 
 class WindowProgressItem implements IStatusbarItem {
 
@@ -90,6 +93,15 @@ export class ProgressService2 implements IProgressService2 {
 	withProgress<P extends Thenable<R>, R=any>(options: IProgressOptions, task: (progress: IProgress<IProgressStep>) => P, onDidCancel?: () => void): P {
 
 		const { location } = options;
+		if (location instanceof ViewContainer) {
+			const viewlet = this._viewletService.getViewlet(location.id);
+			if (viewlet) {
+				return this._withViewletProgress(location.id, task);
+			}
+			console.warn(`Bad progress location: ${location.id}`);
+			return undefined;
+		}
+
 		switch (location) {
 			case ProgressLocation.Notification:
 				return this._withNotificationProgress(options, task, onDidCancel);
@@ -119,8 +131,8 @@ export class ProgressService2 implements IProgressService2 {
 			this._updateWindowProgress();
 
 			// show progress for at least 150ms
-			always(TPromise.join([
-				TPromise.timeout(150),
+			always(Promise.all([
+				timeout(150),
 				promise
 			]), () => {
 				const idx = this._stack.indexOf(task);
@@ -131,7 +143,7 @@ export class ProgressService2 implements IProgressService2 {
 		}, 150);
 
 		// cancel delay if promise finishes below 150ms
-		always(TPromise.wrap(promise), () => clearTimeout(delayHandle));
+		always(promise, () => clearTimeout(delayHandle));
 		return promise;
 	}
 
@@ -259,7 +271,7 @@ export class ProgressService2 implements IProgressService2 {
 		});
 
 		// Show progress for at least 800ms and then hide once done or canceled
-		always(TPromise.join([TPromise.timeout(800), p]), () => {
+		always(Promise.all([timeout(800), p]), () => {
 			if (handle) {
 				handle.close();
 			}
diff --git a/src/vs/workbench/services/progress/common/progress.ts b/src/vs/workbench/services/progress/common/progress.ts
new file mode 100644
index 00000000000..bf9d2a53725
--- /dev/null
+++ b/src/vs/workbench/services/progress/common/progress.ts
@@ -0,0 +1,39 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+'use strict';
+
+import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
+import { IProgress } from 'vs/platform/progress/common/progress';
+import { ViewContainer } from 'vs/workbench/common/views';
+
+export const enum ProgressLocation {
+	Explorer = 1,
+	Scm = 3,
+	Extensions = 5,
+	Window = 10,
+	Notification = 15
+}
+
+export interface IProgressOptions {
+	location: ProgressLocation | ViewContainer;
+	title?: string;
+	source?: string;
+	total?: number;
+	cancellable?: boolean;
+}
+
+export interface IProgressStep {
+	message?: string;
+	increment?: number;
+}
+
+export const IProgressService2 = createDecorator<IProgressService2>('progressService2');
+
+export interface IProgressService2 {
+
+	_serviceBrand: any;
+
+	withProgress<P extends Thenable<R>, R=any>(options: IProgressOptions, task: (progress: IProgress<IProgressStep>) => P, onDidCancel?: () => void): P;
+}
\ No newline at end of file
diff --git a/src/vs/workbench/services/progress/test/progressService.test.ts b/src/vs/workbench/services/progress/test/progressService.test.ts
index f1f23e0cea1..67dd539396e 100644
--- a/src/vs/workbench/services/progress/test/progressService.test.ts
+++ b/src/vs/workbench/services/progress/test/progressService.test.ts
@@ -40,6 +40,10 @@ class TestViewletService implements IViewletService {
 		return [];
 	}
 
+	public getAllViewlets(): ViewletDescriptor[] {
+		return [];
+	}
+
 	public getActiveViewlet(): IViewlet {
 		return activeViewlet;
 	}
diff --git a/src/vs/workbench/services/scm/common/scm.ts b/src/vs/workbench/services/scm/common/scm.ts
index 6a01974b0ee..f5597892346 100644
--- a/src/vs/workbench/services/scm/common/scm.ts
+++ b/src/vs/workbench/services/scm/common/scm.ts
@@ -6,7 +6,7 @@
 'use strict';
 
 import { TPromise } from 'vs/base/common/winjs.base';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
 import { Event } from 'vs/base/common/event';
 import { IDisposable } from 'vs/base/common/lifecycle';
@@ -36,7 +36,7 @@ export interface ISCMResource {
 	readonly resourceGroup: ISCMResourceGroup;
 	readonly sourceUri: URI;
 	readonly decorations: ISCMResourceDecorations;
-	open(): TPromise<void>;
+	open(): Thenable<void>;
 }
 
 export interface ISCMResourceGroup extends ISequence<ISCMResource> {
@@ -68,7 +68,7 @@ export interface ISCMProvider extends IDisposable {
 	getOriginalResource(uri: URI): TPromise<URI>;
 }
 
-export enum InputValidationType {
+export const enum InputValidationType {
 	Error = 0,
 	Warning = 1,
 	Information = 2
@@ -96,9 +96,12 @@ export interface ISCMInput {
 
 export interface ISCMRepository extends IDisposable {
 	readonly onDidFocus: Event<void>;
+	readonly selected: boolean;
+	readonly onDidChangeSelection: Event<boolean>;
 	readonly provider: ISCMProvider;
 	readonly input: ISCMInput;
 	focus(): void;
+	setSelected(selected: boolean): void;
 }
 
 export interface ISCMService {
@@ -108,6 +111,8 @@ export interface ISCMService {
 	readonly onDidRemoveRepository: Event<ISCMRepository>;
 
 	readonly repositories: ISCMRepository[];
+	readonly selectedRepositories: ISCMRepository[];
+	readonly onDidChangeSelectedRepositories: Event<ISCMRepository[]>;
 
 	registerSCMProvider(provider: ISCMProvider): ISCMRepository;
 }
diff --git a/src/vs/workbench/services/scm/common/scmService.ts b/src/vs/workbench/services/scm/common/scmService.ts
index d062ae05633..83b3e88e06d 100644
--- a/src/vs/workbench/services/scm/common/scmService.ts
+++ b/src/vs/workbench/services/scm/common/scmService.ts
@@ -10,6 +10,7 @@ import { Event, Emitter } from 'vs/base/common/event';
 import { ISCMService, ISCMProvider, ISCMInput, ISCMRepository, IInputValidator } from './scm';
 import { ILogService } from 'vs/platform/log/common/log';
 import { TPromise } from 'vs/base/common/winjs.base';
+import { equals } from 'vs/base/common/arrays';
 
 class SCMInput implements ISCMInput {
 
@@ -61,6 +62,14 @@ class SCMRepository implements ISCMRepository {
 	private _onDidFocus = new Emitter<void>();
 	readonly onDidFocus: Event<void> = this._onDidFocus.event;
 
+	private _selected = false;
+	get selected(): boolean {
+		return this._selected;
+	}
+
+	private _onDidChangeSelection = new Emitter<boolean>();
+	readonly onDidChangeSelection: Event<boolean> = this._onDidChangeSelection.event;
+
 	readonly input: ISCMInput = new SCMInput();
 
 	constructor(
@@ -72,6 +81,11 @@ class SCMRepository implements ISCMRepository {
 		this._onDidFocus.fire();
 	}
 
+	setSelected(selected: boolean): void {
+		this._selected = selected;
+		this._onDidChangeSelection.fire(selected);
+	}
+
 	dispose(): void {
 		this.disposable.dispose();
 		this.provider.dispose();
@@ -86,6 +100,12 @@ export class SCMService implements ISCMService {
 	private _repositories: ISCMRepository[] = [];
 	get repositories(): ISCMRepository[] { return [...this._repositories]; }
 
+	private _selectedRepositories: ISCMRepository[] = [];
+	get selectedRepositories(): ISCMRepository[] { return [...this._selectedRepositories]; }
+
+	private _onDidChangeSelectedRepositories = new Emitter<ISCMRepository[]>();
+	readonly onDidChangeSelectedRepositories: Event<ISCMRepository[]> = this._onDidChangeSelectedRepositories.event;
+
 	private _onDidAddProvider = new Emitter<ISCMRepository>();
 	get onDidAddRepository(): Event<ISCMRepository> { return this._onDidAddProvider.event; }
 
@@ -110,15 +130,35 @@ export class SCMService implements ISCMService {
 				return;
 			}
 
+			selectedDisposable.dispose();
 			this._providerIds.delete(provider.id);
 			this._repositories.splice(index, 1);
 			this._onDidRemoveProvider.fire(repository);
+			this.onDidChangeSelection();
 		});
 
 		const repository = new SCMRepository(provider, disposable);
+		const selectedDisposable = repository.onDidChangeSelection(this.onDidChangeSelection, this);
+
 		this._repositories.push(repository);
 		this._onDidAddProvider.fire(repository);
 
+		// automatically select the first repository
+		if (this._repositories.length === 1) {
+			repository.setSelected(true);
+		}
+
 		return repository;
 	}
+
+	private onDidChangeSelection(): void {
+		const selectedRepositories = this._repositories.filter(r => r.selected);
+
+		if (equals(this._selectedRepositories, selectedRepositories)) {
+			return;
+		}
+
+		this._selectedRepositories = this._repositories.filter(r => r.selected);
+		this._onDidChangeSelectedRepositories.fire(this.selectedRepositories);
+	}
 }
diff --git a/src/vs/workbench/services/search/node/fileSearch.ts b/src/vs/workbench/services/search/node/fileSearch.ts
index 6e5b4a853ce..d86cbb9b37f 100644
--- a/src/vs/workbench/services/search/node/fileSearch.ts
+++ b/src/vs/workbench/services/search/node/fileSearch.ts
@@ -6,28 +6,27 @@
 'use strict';
 
 import * as childProcess from 'child_process';
-import { StringDecoder, NodeStringDecoder } from 'string_decoder';
-import { toErrorMessage } from 'vs/base/common/errorMessage';
 import * as fs from 'fs';
 import * as path from 'path';
-import { isEqualOrParent } from 'vs/base/common/paths';
 import { Readable } from 'stream';
-import { TPromise } from 'vs/base/common/winjs.base';
-
-import * as objects from 'vs/base/common/objects';
+import { NodeStringDecoder, StringDecoder } from 'string_decoder';
 import * as arrays from 'vs/base/common/arrays';
+import { toErrorMessage } from 'vs/base/common/errorMessage';
+import * as glob from 'vs/base/common/glob';
+import * as normalization from 'vs/base/common/normalization';
+import * as objects from 'vs/base/common/objects';
+import { isEqualOrParent } from 'vs/base/common/paths';
 import * as platform from 'vs/base/common/platform';
 import * as strings from 'vs/base/common/strings';
-import * as normalization from 'vs/base/common/normalization';
 import * as types from 'vs/base/common/types';
-import * as glob from 'vs/base/common/glob';
-import { IProgress, IUncachedSearchStats } from 'vs/platform/search/common/search';
-
+import { TPromise } from 'vs/base/common/winjs.base';
 import * as extfs from 'vs/base/node/extfs';
 import * as flow from 'vs/base/node/flow';
-import { IRawFileMatch, ISerializedSearchComplete, IRawSearch, ISearchEngine, IFolderSearch } from './search';
+import { IProgress, ISearchEngineStats } from 'vs/platform/search/common/search';
 import { spawnRipgrepCmd } from './ripgrepFileSearch';
 import { rgErrorMsgForDisplay } from './ripgrepTextSearch';
+import { IFolderSearch, IRawFileMatch, IRawSearch, ISearchEngine, ISearchEngineSuccess } from './search';
+import { StopWatch } from 'vs/base/common/stopwatch';
 
 enum Traversal {
 	Node = 1,
@@ -60,13 +59,12 @@ export class FileWalker {
 	private isLimitHit: boolean;
 	private resultCount: number;
 	private isCanceled: boolean;
-	private fileWalkStartTime: number;
+	private fileWalkSW: StopWatch;
 	private directoriesWalked: number;
 	private filesWalked: number;
 	private traversal: Traversal;
 	private errors: string[];
-	private cmdForkStartTime: number;
-	private cmdForkResultTime: number;
+	private cmdSW: StopWatch;
 	private cmdResultCount: number;
 
 	private folderExcludePatterns: Map<string, AbsoluteAndRelativeParsedExpression>;
@@ -120,81 +118,65 @@ export class FileWalker {
 	}
 
 	public walk(folderQueries: IFolderSearch[], extraFiles: string[], onResult: (result: IRawFileMatch) => void, onMessage: (message: IProgress) => void, done: (error: Error, isLimitHit: boolean) => void): void {
-		this.fileWalkStartTime = Date.now();
+		this.fileWalkSW = StopWatch.create(false);
 
 		// Support that the file pattern is a full path to a file that exists
-		this.checkFilePatternAbsoluteMatch((exists, size) => {
-			if (this.isCanceled) {
-				return done(null, this.isLimitHit);
-			}
+		if (this.isCanceled) {
+			return done(null, this.isLimitHit);
+		}
 
-			// Report result from file pattern if matching
-			if (exists) {
-				this.resultCount++;
-				onResult({
-					relativePath: this.filePattern,
-					basename: path.basename(this.filePattern),
-					size
-				});
-
-				// Optimization: a match on an absolute path is a good result and we do not
-				// continue walking the entire root paths array for other matches because
-				// it is very unlikely that another file would match on the full absolute path
-				return done(null, this.isLimitHit);
-			}
-
-			// For each extra file
-			if (extraFiles) {
-				extraFiles.forEach(extraFilePath => {
-					const basename = path.basename(extraFilePath);
-					if (this.globalExcludePattern && this.globalExcludePattern(extraFilePath, basename)) {
-						return; // excluded
-					}
-
-					// File: Check for match on file pattern and include pattern
-					this.matchFile(onResult, { relativePath: extraFilePath /* no workspace relative path */, basename });
-				});
-			}
-
-			let traverse = this.nodeJSTraversal;
-			if (!this.maxFilesize) {
-				if (this.useRipgrep) {
-					this.traversal = Traversal.Ripgrep;
-					traverse = this.cmdTraversal;
-				} else if (platform.isMacintosh) {
-					this.traversal = Traversal.MacFind;
-					traverse = this.cmdTraversal;
-					// Disable 'dir' for now (#11181, #11179, #11183, #11182).
-				} /* else if (platform.isWindows) {
-					this.traversal = Traversal.WindowsDir;
-					traverse = this.windowsDirTraversal;
-				} */ else if (platform.isLinux) {
-					this.traversal = Traversal.LinuxFind;
-					traverse = this.cmdTraversal;
+		// For each extra file
+		if (extraFiles) {
+			extraFiles.forEach(extraFilePath => {
+				const basename = path.basename(extraFilePath);
+				if (this.globalExcludePattern && this.globalExcludePattern(extraFilePath, basename)) {
+					return; // excluded
 				}
-			}
 
-			const isNodeTraversal = traverse === this.nodeJSTraversal;
-			if (!isNodeTraversal) {
-				this.cmdForkStartTime = Date.now();
-			}
-
-			// For each root folder
-			flow.parallel<IFolderSearch, void>(folderQueries, (folderQuery: IFolderSearch, rootFolderDone: (err: Error, result: void) => void) => {
-				this.call(traverse, this, folderQuery, onResult, onMessage, (err?: Error) => {
-					if (err) {
-						const errorMessage = toErrorMessage(err);
-						console.error(errorMessage);
-						this.errors.push(errorMessage);
-						rootFolderDone(err, undefined);
-					} else {
-						rootFolderDone(undefined, undefined);
-					}
-				});
-			}, (errors, result) => {
-				const err = errors ? errors.filter(e => !!e)[0] : null;
-				done(err, this.isLimitHit);
+				// File: Check for match on file pattern and include pattern
+				this.matchFile(onResult, { relativePath: extraFilePath /* no workspace relative path */, basename });
 			});
+		}
+
+		let traverse = this.nodeJSTraversal;
+		if (!this.maxFilesize) {
+			if (this.useRipgrep) {
+				this.traversal = Traversal.Ripgrep;
+				traverse = this.cmdTraversal;
+			} else if (platform.isMacintosh) {
+				this.traversal = Traversal.MacFind;
+				traverse = this.cmdTraversal;
+				// Disable 'dir' for now (#11181, #11179, #11183, #11182).
+			} /* else if (platform.isWindows) {
+				this.traversal = Traversal.WindowsDir;
+				traverse = this.windowsDirTraversal;
+			} */ else if (platform.isLinux) {
+				this.traversal = Traversal.LinuxFind;
+				traverse = this.cmdTraversal;
+			}
+		}
+
+		const isNodeTraversal = traverse === this.nodeJSTraversal;
+		if (!isNodeTraversal) {
+			this.cmdSW = StopWatch.create(false);
+		}
+
+		// For each root folder
+		flow.parallel<IFolderSearch, void>(folderQueries, (folderQuery: IFolderSearch, rootFolderDone: (err: Error, result: void) => void) => {
+			this.call(traverse, this, folderQuery, onResult, onMessage, (err?: Error) => {
+				if (err) {
+					const errorMessage = toErrorMessage(err);
+					console.error(errorMessage);
+					this.errors.push(errorMessage);
+					rootFolderDone(err, undefined);
+				} else {
+					rootFolderDone(undefined, undefined);
+				}
+			});
+		}, (errors, result) => {
+			this.fileWalkSW.stop();
+			const err = errors ? errors.filter(e => !!e)[0] : null;
+			done(err, this.isLimitHit);
 		});
 	}
 
@@ -223,29 +205,27 @@ export class FileWalker {
 
 		const useRipgrep = this.useRipgrep;
 		let noSiblingsClauses: boolean;
-		let filePatternSeen = false;
 		if (useRipgrep) {
 			const ripgrep = spawnRipgrepCmd(this.config, folderQuery, this.config.includePattern, this.folderExcludePatterns.get(folderQuery.folder).expression);
 			cmd = ripgrep.cmd;
 			noSiblingsClauses = !Object.keys(ripgrep.siblingClauses).length;
 
-			process.nextTick(() => {
-				const escapedArgs = ripgrep.rgArgs.args
-					.map(arg => arg.match(/^-/) ? arg : `'${arg}'`)
-					.join(' ');
+			const escapedArgs = ripgrep.rgArgs.args
+				.map(arg => arg.match(/^-/) ? arg : `'${arg}'`)
+				.join(' ');
 
-				let rgCmd = `rg ${escapedArgs}\n - cwd: ${ripgrep.cwd}`;
-				if (ripgrep.rgArgs.siblingClauses) {
-					rgCmd += `\n - Sibling clauses: ${JSON.stringify(ripgrep.rgArgs.siblingClauses)}`;
-				}
-				onMessage({ message: rgCmd });
-			});
+			let rgCmd = `rg ${escapedArgs}\n - cwd: ${ripgrep.cwd}`;
+			if (ripgrep.rgArgs.siblingClauses) {
+				rgCmd += `\n - Sibling clauses: ${JSON.stringify(ripgrep.rgArgs.siblingClauses)}`;
+			}
+			onMessage({ message: rgCmd });
 		} else {
 			cmd = this.spawnFindCmd(folderQuery);
 		}
 
 		process.on('exit', killCmd);
-		this.collectStdout(cmd, 'utf8', useRipgrep, (err: Error, stdout?: string, last?: boolean) => {
+		this.cmdResultCount = 0;
+		this.collectStdout(cmd, 'utf8', useRipgrep, onMessage, (err: Error, stdout?: string, last?: boolean) => {
 			if (err) {
 				done(err);
 				return;
@@ -282,9 +262,6 @@ export class FileWalker {
 
 			if (useRipgrep && noSiblingsClauses) {
 				for (const relativePath of relativeFiles) {
-					if (relativePath === this.filePattern) {
-						filePatternSeen = true;
-					}
 					const basename = path.basename(relativePath);
 					this.matchFile(onResult, { base: rootFolder, relativePath, basename });
 					if (this.isLimitHit) {
@@ -293,22 +270,9 @@ export class FileWalker {
 					}
 				}
 				if (last || this.isLimitHit) {
-					if (!filePatternSeen) {
-						this.checkFilePatternRelativeMatch(folderQuery.folder, (match, size) => {
-							if (match) {
-								this.resultCount++;
-								onResult({
-									base: folderQuery.folder,
-									relativePath: this.filePattern,
-									basename: path.basename(this.filePattern),
-								});
-							}
-							done();
-						});
-					} else {
-						done();
-					}
+					done();
 				}
+
 				return;
 			}
 
@@ -379,7 +343,7 @@ export class FileWalker {
 	 */
 	public readStdout(cmd: childProcess.ChildProcess, encoding: string, isRipgrep: boolean, cb: (err: Error, stdout?: string) => void): void {
 		let all = '';
-		this.collectStdout(cmd, encoding, isRipgrep, (err: Error, stdout?: string, last?: boolean) => {
+		this.collectStdout(cmd, encoding, isRipgrep, () => { }, (err: Error, stdout?: string, last?: boolean) => {
 			if (err) {
 				cb(err);
 				return;
@@ -392,35 +356,49 @@ export class FileWalker {
 		});
 	}
 
-	private collectStdout(cmd: childProcess.ChildProcess, encoding: string, isRipgrep: boolean, cb: (err: Error, stdout?: string, last?: boolean) => void): void {
-		let done = (err: Error, stdout?: string, last?: boolean) => {
+	private collectStdout(cmd: childProcess.ChildProcess, encoding: string, isRipgrep: boolean, onMessage: (message: IProgress) => void, cb: (err: Error, stdout?: string, last?: boolean) => void): void {
+		let onData = (err: Error, stdout?: string, last?: boolean) => {
 			if (err || last) {
-				done = () => { };
-				this.cmdForkResultTime = Date.now();
+				onData = () => { };
+
+				if (this.cmdSW) {
+					this.cmdSW.stop();
+				}
 			}
 			cb(err, stdout, last);
 		};
 
-		this.forwardData(cmd.stdout, encoding, done);
-		const stderr = this.collectData(cmd.stderr);
-
 		let gotData = false;
-		cmd.stdout.once('data', () => gotData = true);
+		if (cmd.stdout) {
+			// Should be non-null, but #38195
+			this.forwardData(cmd.stdout, encoding, onData);
+			cmd.stdout.once('data', () => gotData = true);
+		} else {
+			onMessage({ message: 'stdout is null' });
+		}
+
+		let stderr: Buffer[];
+		if (cmd.stderr) {
+			// Should be non-null, but #38195
+			stderr = this.collectData(cmd.stderr);
+		} else {
+			onMessage({ message: 'stderr is null' });
+		}
 
 		cmd.on('error', (err: Error) => {
-			done(err);
+			onData(err);
 		});
 
 		cmd.on('close', (code: number) => {
 			// ripgrep returns code=1 when no results are found
 			let stderrText, displayMsg: string;
 			if (isRipgrep ? (!gotData && (stderrText = this.decodeData(stderr, encoding)) && (displayMsg = rgErrorMsgForDisplay(stderrText))) : code !== 0) {
-				done(new Error(`command failed with error code ${code}: ${this.decodeData(stderr, encoding)}`));
+				onData(new Error(`command failed with error code ${code}: ${this.decodeData(stderr, encoding)}`));
 			} else {
 				if (isRipgrep && this.exists && code === 0) {
 					this.isLimitHit = true;
 				}
-				done(null, '', true);
+				onData(null, '', true);
 			}
 		});
 	}
@@ -485,6 +463,7 @@ export class FileWalker {
 		const filePattern = this.filePattern;
 		function matchDirectory(entries: IDirectoryEntry[]) {
 			self.directoriesWalked++;
+			const hasSibling = glob.hasSiblingFn(() => entries.map(entry => entry.basename));
 			for (let i = 0, n = entries.length; i < n; i++) {
 				const entry = entries[i];
 				const { relativePath, basename } = entry;
@@ -493,7 +472,7 @@ export class FileWalker {
 				// If the user searches for the exact file name, we adjust the glob matching
 				// to ignore filtering by siblings because the user seems to know what she
 				// is searching for and we want to include the result in that case anyway
-				if (excludePattern.test(relativePath, basename, () => filePattern !== basename ? entries.map(entry => entry.basename) : [])) {
+				if (excludePattern.test(relativePath, basename, filePattern !== basename ? hasSibling : undefined)) {
 					continue;
 				}
 
@@ -524,70 +503,30 @@ export class FileWalker {
 				return done();
 			}
 
-			// Support relative paths to files from a root resource (ignores excludes)
-			return this.checkFilePatternRelativeMatch(folderQuery.folder, (match, size) => {
-				if (this.isCanceled || this.isLimitHit) {
-					return done();
-				}
+			if (this.isCanceled || this.isLimitHit) {
+				return done();
+			}
 
-				// Report result from file pattern if matching
-				if (match) {
-					this.resultCount++;
-					onResult({
-						base: folderQuery.folder,
-						relativePath: this.filePattern,
-						basename: path.basename(this.filePattern),
-						size
-					});
-				}
-
-				return this.doWalk(folderQuery, '', files, onResult, done);
-			});
+			return this.doWalk(folderQuery, '', files, onResult, done);
 		});
 	}
 
-	public getStats(): IUncachedSearchStats {
+	public getStats(): ISearchEngineStats {
 		return {
-			fromCache: false,
+			cmdTime: this.cmdSW && this.cmdSW.elapsed(),
+			fileWalkTime: this.fileWalkSW.elapsed(),
 			traversal: Traversal[this.traversal],
-			errors: this.errors,
-			fileWalkStartTime: this.fileWalkStartTime,
-			fileWalkResultTime: Date.now(),
 			directoriesWalked: this.directoriesWalked,
 			filesWalked: this.filesWalked,
-			resultCount: this.resultCount,
-			cmdForkStartTime: this.cmdForkStartTime,
-			cmdForkResultTime: this.cmdForkResultTime,
 			cmdResultCount: this.cmdResultCount
 		};
 	}
 
-	private checkFilePatternAbsoluteMatch(clb: (exists: boolean, size?: number) => void): void {
-		if (!this.filePattern || !path.isAbsolute(this.filePattern)) {
-			return clb(false);
-		}
-
-		return fs.stat(this.filePattern, (error, stat) => {
-			return clb(!error && !stat.isDirectory(), stat && stat.size); // only existing files
-		});
-	}
-
-	private checkFilePatternRelativeMatch(basePath: string, clb: (matchPath: string, size?: number) => void): void {
-		if (!this.filePattern || path.isAbsolute(this.filePattern)) {
-			return clb(null);
-		}
-
-		const absolutePath = path.join(basePath, this.filePattern);
-
-		return fs.stat(absolutePath, (error, stat) => {
-			return clb(!error && !stat.isDirectory() ? absolutePath : null, stat && stat.size); // only existing files
-		});
-	}
-
 	private doWalk(folderQuery: IFolderSearch, relativeParentPath: string, files: string[], onResult: (result: IRawFileMatch) => void, done: (error: Error) => void): void {
 		const rootFolder = folderQuery.folder;
 
 		// Execute tasks on each file in parallel to optimize throughput
+		const hasSibling = glob.hasSiblingFn(() => files);
 		flow.parallel(files, (file: string, clb: (error: Error, result: {}) => void): void => {
 
 			// Check canceled
@@ -595,17 +534,12 @@ export class FileWalker {
 				return clb(null, undefined);
 			}
 
+			// Check exclude pattern
 			// If the user searches for the exact file name, we adjust the glob matching
 			// to ignore filtering by siblings because the user seems to know what she
 			// is searching for and we want to include the result in that case anyway
-			let siblings = files;
-			if (this.config.filePattern === file) {
-				siblings = [];
-			}
-
-			// Check exclude pattern
 			let currentRelativePath = relativeParentPath ? [relativeParentPath, file].join(path.sep) : file;
-			if (this.folderExcludePatterns.get(folderQuery.folder).test(currentRelativePath, file, () => siblings)) {
+			if (this.folderExcludePatterns.get(folderQuery.folder).test(currentRelativePath, file, this.config.filePattern !== file ? hasSibling : undefined)) {
 				return clb(null, undefined);
 			}
 
@@ -742,7 +676,7 @@ export class Engine implements ISearchEngine<IRawFileMatch> {
 		this.walker = new FileWalker(config);
 	}
 
-	public search(onResult: (result: IRawFileMatch) => void, onProgress: (progress: IProgress) => void, done: (error: Error, complete: ISerializedSearchComplete) => void): void {
+	public search(onResult: (result: IRawFileMatch) => void, onProgress: (progress: IProgress) => void, done: (error: Error, complete: ISearchEngineSuccess) => void): void {
 		this.walker.walk(this.folderQueries, this.extraFiles, onResult, onProgress, (err: Error, isLimitHit: boolean) => {
 			done(err, {
 				limitHit: isLimitHit,
@@ -791,9 +725,9 @@ class AbsoluteAndRelativeParsedExpression {
 		this.relativeParsedExpr = relativeGlobExpr && glob.parse(relativeGlobExpr, { trimForExclusions: true });
 	}
 
-	public test(_path: string, basename?: string, siblingsFn?: () => string[] | TPromise<string[]>): string | TPromise<string> {
-		return (this.relativeParsedExpr && this.relativeParsedExpr(_path, basename, siblingsFn)) ||
-			(this.absoluteParsedExpr && this.absoluteParsedExpr(path.join(this.root, _path), basename, siblingsFn));
+	public test(_path: string, basename?: string, hasSibling?: (name: string) => boolean | TPromise<boolean>): string | TPromise<string> {
+		return (this.relativeParsedExpr && this.relativeParsedExpr(_path, basename, hasSibling)) ||
+			(this.absoluteParsedExpr && this.absoluteParsedExpr(path.join(this.root, _path), basename, hasSibling));
 	}
 
 	public getBasenameTerms(): string[] {
diff --git a/src/vs/workbench/services/search/node/rawSearchService.ts b/src/vs/workbench/services/search/node/rawSearchService.ts
index 7f8387e9d29..0e3f6d5c068 100644
--- a/src/vs/workbench/services/search/node/rawSearchService.ts
+++ b/src/vs/workbench/services/search/node/rawSearchService.ts
@@ -6,23 +6,30 @@
 'use strict';
 
 import * as fs from 'fs';
-import { isAbsolute, sep, join } from 'path';
-
 import * as gracefulFs from 'graceful-fs';
-gracefulFs.gracefulify(fs);
-
+import { join, sep } from 'path';
 import * as arrays from 'vs/base/common/arrays';
+import { CancelablePromise, createCancelablePromise } from 'vs/base/common/async';
+import { CancellationToken } from 'vs/base/common/cancellation';
+import { canceled } from 'vs/base/common/errors';
+import { Emitter, Event } from 'vs/base/common/event';
 import * as objects from 'vs/base/common/objects';
+import { StopWatch } from 'vs/base/common/stopwatch';
 import * as strings from 'vs/base/common/strings';
-import { PPromise, TPromise } from 'vs/base/common/winjs.base';
-import { FileWalker, Engine as FileSearchEngine } from 'vs/workbench/services/search/node/fileSearch';
+import { TPromise } from 'vs/base/common/winjs.base';
+import { compareItemsByScore, IItemAccessor, prepareQuery, ScorerCache } from 'vs/base/parts/quickopen/common/quickOpenScorer';
 import { MAX_FILE_SIZE } from 'vs/platform/files/node/files';
+import { ICachedSearchStats, IFileSearchStats, IProgress } from 'vs/platform/search/common/search';
+import { Engine as FileSearchEngine, FileWalker } from 'vs/workbench/services/search/node/fileSearch';
 import { RipgrepEngine } from 'vs/workbench/services/search/node/ripgrepTextSearch';
 import { Engine as TextSearchEngine } from 'vs/workbench/services/search/node/textSearch';
 import { TextSearchWorkerProvider } from 'vs/workbench/services/search/node/textSearchWorkerProvider';
-import { IRawSearchService, IRawSearch, IRawFileMatch, ISerializedFileMatch, ISerializedSearchProgressItem, ISerializedSearchComplete, ISearchEngine, IFileSearchProgressItem, ITelemetryEvent } from './search';
-import { ICachedSearchStats, IProgress } from 'vs/platform/search/common/search';
-import { compareItemsByScore, IItemAccessor, ScorerCache, prepareQuery } from 'vs/base/parts/quickopen/common/quickOpenScorer';
+import { IFileSearchProgressItem, IRawFileMatch, IRawSearch, IRawSearchService, ISearchEngine, ISearchEngineSuccess, ISerializedFileMatch, ISerializedSearchComplete, ISerializedSearchProgressItem, ISerializedSearchSuccess } from './search';
+
+gracefulFs.gracefulify(fs);
+
+type IProgressCallback = (p: ISerializedSearchProgressItem) => void;
+type IFileProgressCallback = (p: IFileSearchProgressItem) => void;
 
 export class SearchService implements IRawSearchService {
 
@@ -32,29 +39,61 @@ export class SearchService implements IRawSearchService {
 
 	private textSearchWorkerProvider: TextSearchWorkerProvider;
 
-	private telemetryPipe: (event: ITelemetryEvent) => void;
+	public fileSearch(config: IRawSearch, batchSize = SearchService.BATCH_SIZE): Event<ISerializedSearchProgressItem | ISerializedSearchComplete> {
+		let promise: CancelablePromise<ISerializedSearchSuccess>;
 
-	public fileSearch(config: IRawSearch): PPromise<ISerializedSearchComplete, ISerializedSearchProgressItem> {
-		return this.doFileSearch(FileSearchEngine, config, SearchService.BATCH_SIZE);
+		const emitter = new Emitter<ISerializedSearchProgressItem | ISerializedSearchComplete>({
+			onFirstListenerDidAdd: () => {
+				promise = createCancelablePromise(token => {
+					return this.doFileSearch(FileSearchEngine, config, p => emitter.fire(p), token, batchSize);
+				});
+
+				promise.then(
+					c => emitter.fire(c),
+					err => emitter.fire({ type: 'error', error: { message: err.message, stack: err.stack } }));
+			},
+			onLastListenerRemove: () => {
+				promise.cancel();
+			}
+		});
+
+		return emitter.event;
 	}
 
-	public textSearch(config: IRawSearch): PPromise<ISerializedSearchComplete, ISerializedSearchProgressItem> {
-		return config.useRipgrep ?
-			this.ripgrepTextSearch(config) :
-			this.legacyTextSearch(config);
+	public textSearch(config: IRawSearch): Event<ISerializedSearchProgressItem | ISerializedSearchComplete> {
+		let promise: CancelablePromise<ISerializedSearchComplete>;
+
+		const emitter = new Emitter<ISerializedSearchProgressItem | ISerializedSearchComplete>({
+			onFirstListenerDidAdd: () => {
+				promise = createCancelablePromise(token => {
+					return (config.useRipgrep ? this.ripgrepTextSearch(config, p => emitter.fire(p), token) : this.legacyTextSearch(config, p => emitter.fire(p), token));
+				});
+
+				promise.then(
+					c => emitter.fire(c),
+					err => emitter.fire({ type: 'error', error: { message: err.message, stack: err.stack } }));
+			},
+			onLastListenerRemove: () => {
+				promise.cancel();
+			}
+		});
+
+		return emitter.event;
 	}
 
-	public ripgrepTextSearch(config: IRawSearch): PPromise<ISerializedSearchComplete, ISerializedSearchProgressItem> {
+	private ripgrepTextSearch(config: IRawSearch, progressCallback: IProgressCallback, token: CancellationToken): Promise<ISerializedSearchSuccess> {
 		config.maxFilesize = MAX_FILE_SIZE;
 		let engine = new RipgrepEngine(config);
 
-		return new PPromise<ISerializedSearchComplete, ISerializedSearchProgressItem>((c, e, p) => {
+		token.onCancellationRequested(() => engine.cancel());
+
+		return new Promise<ISerializedSearchSuccess>((c, e) => {
 			// Use BatchedCollector to get new results to the frontend every 2s at least, until 50 results have been returned
-			const collector = new BatchedCollector<ISerializedFileMatch>(SearchService.BATCH_SIZE, p);
+			const collector = new BatchedCollector<ISerializedFileMatch>(SearchService.BATCH_SIZE, progressCallback);
 			engine.search((match) => {
 				collector.addItem(match, match.numMatches);
 			}, (message) => {
-				p(message);
+				progressCallback(message);
 			}, (error, stats) => {
 				collector.flush();
 
@@ -64,12 +103,10 @@ export class SearchService implements IRawSearchService {
 					c(stats);
 				}
 			});
-		}, () => {
-			engine.cancel();
 		});
 	}
 
-	public legacyTextSearch(config: IRawSearch): PPromise<ISerializedSearchComplete, ISerializedSearchProgressItem> {
+	private legacyTextSearch(config: IRawSearch, progressCallback: IProgressCallback, token: CancellationToken): Promise<ISerializedSearchComplete> {
 		if (!this.textSearchWorkerProvider) {
 			this.textSearchWorkerProvider = new TextSearchWorkerProvider();
 		}
@@ -87,47 +124,54 @@ export class SearchService implements IRawSearchService {
 			}),
 			this.textSearchWorkerProvider);
 
-		return this.doTextSearch(engine, SearchService.BATCH_SIZE);
+		return this.doTextSearch(engine, progressCallback, SearchService.BATCH_SIZE, token);
 	}
 
-	public doFileSearch(EngineClass: { new(config: IRawSearch): ISearchEngine<IRawFileMatch>; }, config: IRawSearch, batchSize?: number): PPromise<ISerializedSearchComplete, ISerializedSearchProgressItem> {
+	doFileSearch(EngineClass: { new(config: IRawSearch): ISearchEngine<IRawFileMatch>; }, config: IRawSearch, progressCallback: IProgressCallback, token?: CancellationToken, batchSize?: number): TPromise<ISerializedSearchSuccess> {
+		let resultCount = 0;
+		const fileProgressCallback: IFileProgressCallback = progress => {
+			if (Array.isArray(progress)) {
+				resultCount += progress.length;
+				progressCallback(progress.map(m => this.rawMatchToSearchItem(m)));
+			} else if ((<IRawFileMatch>progress).relativePath) {
+				resultCount++;
+				progressCallback(this.rawMatchToSearchItem(<IRawFileMatch>progress));
+			} else {
+				progressCallback(<IProgress>progress);
+			}
+		};
 
 		if (config.sortByScore) {
-			let sortedSearch = this.trySortedSearchFromCache(config);
+			let sortedSearch = this.trySortedSearchFromCache(config, fileProgressCallback, token);
 			if (!sortedSearch) {
 				const walkerConfig = config.maxResults ? objects.assign({}, config, { maxResults: null }) : config;
 				const engine = new EngineClass(walkerConfig);
-				sortedSearch = this.doSortedSearch(engine, config);
+				sortedSearch = this.doSortedSearch(engine, config, progressCallback, fileProgressCallback, token);
 			}
 
-			return new PPromise<ISerializedSearchComplete, ISerializedSearchProgressItem>((c, e, p) => {
-				process.nextTick(() => { // allow caller to register progress callback first
-					sortedSearch.then(([result, rawMatches]) => {
-						const serializedMatches = rawMatches.map(rawMatch => this.rawMatchToSearchItem(rawMatch));
-						this.sendProgress(serializedMatches, p, batchSize);
-						c(result);
-					}, e, p);
-				});
-			}, () => {
-				sortedSearch.cancel();
+			return new TPromise<ISerializedSearchSuccess>((c, e) => {
+				sortedSearch.then(([result, rawMatches]) => {
+					const serializedMatches = rawMatches.map(rawMatch => this.rawMatchToSearchItem(rawMatch));
+					this.sendProgress(serializedMatches, progressCallback, batchSize);
+					c(result);
+				}, e);
 			});
 		}
 
-		let searchPromise: PPromise<void, IFileSearchProgressItem>;
-		return new PPromise<ISerializedSearchComplete, ISerializedSearchProgressItem>((c, e, p) => {
-			const engine = new EngineClass(config);
-			searchPromise = this.doSearch(engine, batchSize)
-				.then(c, e, progress => {
-					if (Array.isArray(progress)) {
-						p(progress.map(m => this.rawMatchToSearchItem(m)));
-					} else if ((<IRawFileMatch>progress).relativePath) {
-						p(this.rawMatchToSearchItem(<IRawFileMatch>progress));
-					} else {
-						p(<IProgress>progress);
-					}
-				});
-		}, () => {
-			searchPromise.cancel();
+		const engine = new EngineClass(config);
+
+		return this.doSearch(engine, fileProgressCallback, batchSize, token).then(complete => {
+			return <ISerializedSearchSuccess>{
+				limitHit: complete.limitHit,
+				type: 'success',
+				stats: {
+					detailStats: complete.stats,
+					type: 'searchProcess',
+					fromCache: false,
+					resultCount,
+					sortingTime: undefined
+				}
+			};
 		});
 	}
 
@@ -135,62 +179,70 @@ export class SearchService implements IRawSearchService {
 		return { path: match.base ? join(match.base, match.relativePath) : match.relativePath };
 	}
 
-	private doSortedSearch(engine: ISearchEngine<IRawFileMatch>, config: IRawSearch): PPromise<[ISerializedSearchComplete, IRawFileMatch[]], IProgress> {
-		let searchPromise: PPromise<void, IFileSearchProgressItem>;
-		let allResultsPromise = new PPromise<[ISerializedSearchComplete, IRawFileMatch[]], IFileSearchProgressItem>((c, e, p) => {
+	private doSortedSearch(engine: ISearchEngine<IRawFileMatch>, config: IRawSearch, progressCallback: IProgressCallback, fileProgressCallback: IFileProgressCallback, token?: CancellationToken): TPromise<[ISerializedSearchSuccess, IRawFileMatch[]]> {
+		const emitter = new Emitter<IFileSearchProgressItem>();
+
+		let allResultsPromise = createCancelablePromise(token => {
 			let results: IRawFileMatch[] = [];
-			searchPromise = this.doSearch(engine, -1)
-				.then(result => {
-					c([result, results]);
-					if (this.telemetryPipe) {
-						// __GDPR__TODO__ classify event
-						this.telemetryPipe({
-							eventName: 'fileSearch',
-							data: result.stats
-						});
-					}
-				}, e, progress => {
-					if (Array.isArray(progress)) {
-						results = progress;
-					} else {
-						p(progress);
-					}
+
+			const innerProgressCallback: IFileProgressCallback = progress => {
+				if (Array.isArray(progress)) {
+					results = progress;
+				} else {
+					fileProgressCallback(progress);
+					emitter.fire(progress);
+				}
+			};
+
+			return this.doSearch(engine, innerProgressCallback, -1, token)
+				.then<[ISearchEngineSuccess, IRawFileMatch[]]>(result => {
+					return [result, results];
 				});
-		}, () => {
-			searchPromise.cancel();
 		});
 
 		let cache: Cache;
 		if (config.cacheKey) {
 			cache = this.getOrCreateCache(config.cacheKey);
-			cache.resultsToSearchCache[config.filePattern] = allResultsPromise;
-			allResultsPromise.then(null, err => {
+			const cacheRow: ICacheRow = {
+				promise: allResultsPromise,
+				event: emitter.event,
+				resolved: false
+			};
+			cache.resultsToSearchCache[config.filePattern] = cacheRow;
+			allResultsPromise.then(() => {
+				cacheRow.resolved = true;
+			}, err => {
 				delete cache.resultsToSearchCache[config.filePattern];
 			});
+
 			allResultsPromise = this.preventCancellation(allResultsPromise);
 		}
 
-		let chained: TPromise<void>;
-		return new PPromise<[ISerializedSearchComplete, IRawFileMatch[]], IProgress>((c, e, p) => {
-			chained = allResultsPromise.then(([result, results]) => {
+		return TPromise.wrap<[ISerializedSearchSuccess, IRawFileMatch[]]>(
+			allResultsPromise.then(([result, results]) => {
 				const scorerCache: ScorerCache = cache ? cache.scorerCache : Object.create(null);
-				const unsortedResultTime = Date.now();
-				return this.sortResults(config, results, scorerCache)
-					.then(sortedResults => {
-						const sortedResultTime = Date.now();
+				const sortSW = (typeof config.maxResults !== 'number' || config.maxResults > 0) && StopWatch.create(false);
+				return this.sortResults(config, results, scorerCache, token)
+					.then<[ISerializedSearchSuccess, IRawFileMatch[]]>(sortedResults => {
+						// sortingTime: -1 indicates a "sorted" search that was not sorted, i.e. populating the cache when quickopen is opened.
+						// Contrasting with findFiles which is not sorted and will have sortingTime: undefined
+						const sortingTime = sortSW ? sortSW.elapsed() : -1;
 
-						c([{
-							stats: objects.assign({}, result.stats, {
-								unsortedResultTime,
-								sortedResultTime
-							}),
+						return [{
+							type: 'success',
+							stats: {
+								detailStats: result.stats,
+								sortingTime,
+								fromCache: false,
+								type: 'searchProcess',
+								workspaceFolderCount: config.folderQueries.length,
+								resultCount: sortedResults.length
+							},
 							limitHit: result.limitHit || typeof config.maxResults === 'number' && results.length > config.maxResults
-						}, sortedResults]);
+						} as ISerializedSearchSuccess, sortedResults];
 					});
-			}, e, p);
-		}, () => {
-			chained.cancel();
-		});
+			})
+		);
 	}
 
 	private getOrCreateCache(cacheKey: string): Cache {
@@ -201,55 +253,42 @@ export class SearchService implements IRawSearchService {
 		return this.caches[cacheKey] = new Cache();
 	}
 
-	private trySortedSearchFromCache(config: IRawSearch): PPromise<[ISerializedSearchComplete, IRawFileMatch[]], IProgress> {
+	private trySortedSearchFromCache(config: IRawSearch, progressCallback: IFileProgressCallback, token?: CancellationToken): TPromise<[ISerializedSearchSuccess, IRawFileMatch[]]> {
 		const cache = config.cacheKey && this.caches[config.cacheKey];
 		if (!cache) {
 			return undefined;
 		}
 
-		const cacheLookupStartTime = Date.now();
-		const cached = this.getResultsFromCache(cache, config.filePattern);
+		const cached = this.getResultsFromCache(cache, config.filePattern, progressCallback, token);
 		if (cached) {
-			let chained: TPromise<void>;
-			return new PPromise<[ISerializedSearchComplete, IRawFileMatch[]], IProgress>((c, e, p) => {
-				chained = cached.then(([result, results, cacheStats]) => {
-					const cacheLookupResultTime = Date.now();
-					return this.sortResults(config, results, cache.scorerCache)
-						.then(sortedResults => {
-							const sortedResultTime = Date.now();
+			return cached.then(([result, results, cacheStats]) => {
+				const sortSW = StopWatch.create(false);
+				return this.sortResults(config, results, cache.scorerCache, token)
+					.then<[ISerializedSearchSuccess, IRawFileMatch[]]>(sortedResults => {
+						const sortingTime = sortSW.elapsed();
+						const stats: IFileSearchStats = {
+							fromCache: true,
+							detailStats: cacheStats,
+							type: 'searchProcess',
+							resultCount: results.length,
+							sortingTime
+						};
 
-							const stats: ICachedSearchStats = {
-								fromCache: true,
-								cacheLookupStartTime: cacheLookupStartTime,
-								cacheFilterStartTime: cacheStats.cacheFilterStartTime,
-								cacheLookupResultTime: cacheLookupResultTime,
-								cacheEntryCount: cacheStats.cacheFilterResultCount,
-								resultCount: results.length
-							};
-							if (config.sortByScore) {
-								stats.unsortedResultTime = cacheLookupResultTime;
-								stats.sortedResultTime = sortedResultTime;
-							}
-							if (!cacheStats.cacheWasResolved) {
-								stats.joined = result.stats;
-							}
-							c([
-								{
-									limitHit: result.limitHit || typeof config.maxResults === 'number' && results.length > config.maxResults,
-									stats: stats
-								},
-								sortedResults
-							]);
-						});
-				}, e, p);
-			}, () => {
-				chained.cancel();
+						return [
+							{
+								type: 'success',
+								limitHit: result.limitHit || typeof config.maxResults === 'number' && results.length > config.maxResults,
+								stats
+							} as ISerializedSearchSuccess,
+							sortedResults
+						];
+					});
 			});
 		}
 		return undefined;
 	}
 
-	private sortResults(config: IRawSearch, results: IRawFileMatch[], scorerCache: ScorerCache): TPromise<IRawFileMatch[]> {
+	private sortResults(config: IRawSearch, results: IRawFileMatch[], scorerCache: ScorerCache, token?: CancellationToken): TPromise<IRawFileMatch[]> {
 		// we use the same compare function that is used later when showing the results using fuzzy scoring
 		// this is very important because we are also limiting the number of results by config.maxResults
 		// and as such we want the top items to be included in this result set if the number of items
@@ -257,10 +296,10 @@ export class SearchService implements IRawSearchService {
 		const query = prepareQuery(config.filePattern);
 		const compare = (matchA: IRawFileMatch, matchB: IRawFileMatch) => compareItemsByScore(matchA, matchB, query, true, FileMatchItemAccessor, scorerCache);
 
-		return arrays.topAsync(results, compare, config.maxResults, 10000);
+		return arrays.topAsync(results, compare, config.maxResults, 10000, token);
 	}
 
-	private sendProgress(results: ISerializedFileMatch[], progressCb: (batch: ISerializedFileMatch[]) => void, batchSize: number) {
+	private sendProgress(results: ISerializedFileMatch[], progressCb: IProgressCallback, batchSize: number) {
 		if (batchSize && batchSize > 0) {
 			for (let i = 0; i < results.length; i += batchSize) {
 				progressCb(results.slice(i, i + batchSize));
@@ -270,118 +309,130 @@ export class SearchService implements IRawSearchService {
 		}
 	}
 
-	private getResultsFromCache(cache: Cache, searchValue: string): PPromise<[ISerializedSearchComplete, IRawFileMatch[], CacheStats], IProgress> {
-		if (isAbsolute(searchValue)) {
-			return null; // bypass cache if user looks up an absolute path where matching goes directly on disk
-		}
+	private getResultsFromCache(cache: Cache, searchValue: string, progressCallback: IFileProgressCallback, token?: CancellationToken): TPromise<[ISearchEngineSuccess, IRawFileMatch[], ICachedSearchStats]> {
+		const cacheLookupSW = StopWatch.create(false);
 
 		// Find cache entries by prefix of search value
 		const hasPathSep = searchValue.indexOf(sep) >= 0;
-		let cached: PPromise<[ISerializedSearchComplete, IRawFileMatch[]], IFileSearchProgressItem>;
-		let wasResolved: boolean;
+		let cachedRow: ICacheRow;
 		for (let previousSearch in cache.resultsToSearchCache) {
-
 			// If we narrow down, we might be able to reuse the cached results
 			if (strings.startsWith(searchValue, previousSearch)) {
 				if (hasPathSep && previousSearch.indexOf(sep) < 0) {
 					continue; // since a path character widens the search for potential more matches, require it in previous search too
 				}
 
-				const c = cache.resultsToSearchCache[previousSearch];
-				c.then(() => { wasResolved = false; });
-				wasResolved = true;
-				cached = this.preventCancellation(c);
+				const row = cache.resultsToSearchCache[previousSearch];
+				cachedRow = {
+					promise: this.preventCancellation(row.promise),
+					event: row.event,
+					resolved: row.resolved
+				};
 				break;
 			}
 		}
 
-		if (!cached) {
+		if (!cachedRow) {
 			return null;
 		}
 
-		return new PPromise<[ISerializedSearchComplete, IRawFileMatch[], CacheStats], IProgress>((c, e, p) => {
-			cached.then(([complete, cachedEntries]) => {
-				const cacheFilterStartTime = Date.now();
+		const cacheLookupTime = cacheLookupSW.elapsed();
+		const cacheFilterSW = StopWatch.create(false);
 
-				// Pattern match on results
-				let results: IRawFileMatch[] = [];
-				const normalizedSearchValueLowercase = strings.stripWildcards(searchValue).toLowerCase();
-				for (let i = 0; i < cachedEntries.length; i++) {
-					let entry = cachedEntries[i];
+		const listener = cachedRow.event(progressCallback);
+		if (token) {
+			token.onCancellationRequested(() => {
+				listener.dispose();
+			});
+		}
 
-					// Check if this entry is a match for the search value
-					if (!strings.fuzzyContains(entry.relativePath, normalizedSearchValueLowercase)) {
-						continue;
-					}
+		return TPromise.wrap(cachedRow.promise.then<[ISearchEngineSuccess, IRawFileMatch[], ICachedSearchStats]>(([complete, cachedEntries]) => {
+			if (token && token.isCancellationRequested) {
+				throw canceled();
+			}
 
-					results.push(entry);
+			// Pattern match on results
+			let results: IRawFileMatch[] = [];
+			const normalizedSearchValueLowercase = strings.stripWildcards(searchValue).toLowerCase();
+			for (let i = 0; i < cachedEntries.length; i++) {
+				let entry = cachedEntries[i];
+
+				// Check if this entry is a match for the search value
+				if (!strings.fuzzyContains(entry.relativePath, normalizedSearchValueLowercase)) {
+					continue;
 				}
 
-				c([complete, results, {
-					cacheWasResolved: wasResolved,
-					cacheFilterStartTime: cacheFilterStartTime,
-					cacheFilterResultCount: cachedEntries.length
-				}]);
-			}, e, p);
-		}, () => {
-			cached.cancel();
-		});
+				results.push(entry);
+			}
+
+			return [complete, results, {
+				cacheWasResolved: cachedRow.resolved,
+				cacheLookupTime,
+				cacheFilterTime: cacheFilterSW.elapsed(),
+				cacheEntryCount: cachedEntries.length
+			}];
+		}));
 	}
 
-	private doTextSearch(engine: TextSearchEngine, batchSize: number): PPromise<ISerializedSearchComplete, ISerializedSearchProgressItem> {
-		return new PPromise<ISerializedSearchComplete, ISerializedSearchProgressItem>((c, e, p) => {
+	private doTextSearch(engine: TextSearchEngine, progressCallback: IProgressCallback, batchSize: number, token: CancellationToken): Promise<ISerializedSearchSuccess> {
+		token.onCancellationRequested(() => engine.cancel());
+
+		return new Promise<ISerializedSearchSuccess>((c, e) => {
 			// Use BatchedCollector to get new results to the frontend every 2s at least, until 50 results have been returned
-			const collector = new BatchedCollector<ISerializedFileMatch>(batchSize, p);
+			const collector = new BatchedCollector<ISerializedFileMatch>(batchSize, progressCallback);
 			engine.search((matches) => {
 				const totalMatches = matches.reduce((acc, m) => acc + m.numMatches, 0);
 				collector.addItems(matches, totalMatches);
 			}, (progress) => {
-				p(progress);
+				progressCallback(progress);
 			}, (error, stats) => {
 				collector.flush();
 
 				if (error) {
 					e(error);
 				} else {
-					c(stats);
+					c({
+						type: 'success',
+						limitHit: stats.limitHit,
+						stats: null
+					});
 				}
 			});
-		}, () => {
-			engine.cancel();
 		});
 	}
 
-	private doSearch(engine: ISearchEngine<IRawFileMatch>, batchSize?: number): PPromise<ISerializedSearchComplete, IFileSearchProgressItem> {
-		return new PPromise<ISerializedSearchComplete, IFileSearchProgressItem>((c, e, p) => {
+	private doSearch(engine: ISearchEngine<IRawFileMatch>, progressCallback: IFileProgressCallback, batchSize: number, token?: CancellationToken): TPromise<ISearchEngineSuccess> {
+		return new TPromise<ISearchEngineSuccess>((c, e) => {
 			let batch: IRawFileMatch[] = [];
+			if (token) {
+				token.onCancellationRequested(() => engine.cancel());
+			}
+
 			engine.search((match) => {
 				if (match) {
 					if (batchSize) {
 						batch.push(match);
 						if (batchSize > 0 && batch.length >= batchSize) {
-							p(batch);
+							progressCallback(batch);
 							batch = [];
 						}
 					} else {
-						p(match);
+						progressCallback(match);
 					}
 				}
 			}, (progress) => {
-				process.nextTick(() => {
-					p(progress);
-				});
-			}, (error, stats) => {
+				progressCallback(progress);
+			}, (error, complete) => {
 				if (batch.length) {
-					p(batch);
+					progressCallback(batch);
 				}
+
 				if (error) {
 					e(error);
 				} else {
-					c(stats);
+					c(complete);
 				}
 			});
-		}, () => {
-			engine.cancel();
 		});
 	}
 
@@ -390,29 +441,35 @@ export class SearchService implements IRawSearchService {
 		return TPromise.as(undefined);
 	}
 
-	public fetchTelemetry(): PPromise<void, ITelemetryEvent> {
-		return new PPromise((c, e, p) => {
-			this.telemetryPipe = p;
-		}, () => {
-			this.telemetryPipe = null;
-		});
+	/**
+	 * Return a CancelablePromise which is not actually cancelable
+	 * TODO@rob - Is this really needed?
+	 */
+	private preventCancellation<C>(promise: CancelablePromise<C>): CancelablePromise<C> {
+		return new class implements CancelablePromise<C> {
+			cancel() {
+				// Do nothing
+			}
+			then(resolve, reject) {
+				return promise.then(resolve, reject);
+			}
+			catch(reject?) {
+				return this.then(undefined, reject);
+			}
+		};
 	}
+}
 
-	private preventCancellation<C, P>(promise: PPromise<C, P>): PPromise<C, P> {
-		return new PPromise<C, P>((c, e, p) => {
-			// Allow for piled up cancellations to come through first.
-			process.nextTick(() => {
-				promise.then(c, e, p);
-			});
-		}, () => {
-			// Do not propagate.
-		});
-	}
+interface ICacheRow {
+	// TODO@roblou - never actually canceled
+	promise: CancelablePromise<[ISearchEngineSuccess, IRawFileMatch[]]>;
+	resolved: boolean;
+	event: Event<IFileSearchProgressItem>;
 }
 
 class Cache {
 
-	public resultsToSearchCache: { [searchValue: string]: PPromise<[ISerializedSearchComplete, IRawFileMatch[]], IFileSearchProgressItem>; } = Object.create(null);
+	public resultsToSearchCache: { [searchValue: string]: ICacheRow; } = Object.create(null);
 
 	public scorerCache: ScorerCache = Object.create(null);
 }
@@ -432,12 +489,6 @@ const FileMatchItemAccessor = new class implements IItemAccessor<IRawFileMatch>
 	}
 };
 
-interface CacheStats {
-	cacheWasResolved: boolean;
-	cacheFilterStartTime: number;
-	cacheFilterResultCount: number;
-}
-
 /**
  * Collects items that have a size - before the cumulative size of collected items reaches START_BATCH_AFTER_COUNT, the callback is called for every
  * set of items collected.
diff --git a/src/vs/workbench/services/search/node/ripgrepFileSearch.ts b/src/vs/workbench/services/search/node/ripgrepFileSearch.ts
index e3fa4591f8c..0d2c576b0d9 100644
--- a/src/vs/workbench/services/search/node/ripgrepFileSearch.ts
+++ b/src/vs/workbench/services/search/node/ripgrepFileSearch.ts
@@ -74,6 +74,9 @@ function getRgArgs(config: IRawSearch, folderQuery: IFolderSearch, includePatter
 		args.push('--quiet');
 	}
 
+	args.push('--no-config');
+	args.push('--no-ignore-global');
+
 	// Folder to search
 	args.push('--');
 
diff --git a/src/vs/workbench/services/search/node/ripgrepTextSearch.ts b/src/vs/workbench/services/search/node/ripgrepTextSearch.ts
index 05ecdc78c93..94751dc40b8 100644
--- a/src/vs/workbench/services/search/node/ripgrepTextSearch.ts
+++ b/src/vs/workbench/services/search/node/ripgrepTextSearch.ts
@@ -4,24 +4,22 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
+import * as cp from 'child_process';
 import { EventEmitter } from 'events';
 import * as path from 'path';
-import { StringDecoder, NodeStringDecoder } from 'string_decoder';
-
-import * as cp from 'child_process';
-import { rgPath } from 'vscode-ripgrep';
-
+import { NodeStringDecoder, StringDecoder } from 'string_decoder';
+import * as glob from 'vs/base/common/glob';
 import * as objects from 'vs/base/common/objects';
+import * as paths from 'vs/base/common/paths';
 import * as platform from 'vs/base/common/platform';
 import * as strings from 'vs/base/common/strings';
-import * as paths from 'vs/base/common/paths';
-import * as extfs from 'vs/base/node/extfs';
-import * as encoding from 'vs/base/node/encoding';
-import * as glob from 'vs/base/common/glob';
 import { TPromise } from 'vs/base/common/winjs.base';
-
-import { ISerializedFileMatch, ISerializedSearchComplete, IRawSearch, IFolderSearch, LineMatch, FileMatch } from './search';
-import { IProgress } from 'vs/platform/search/common/search';
+import * as encoding from 'vs/base/node/encoding';
+import * as extfs from 'vs/base/node/extfs';
+import { IRange, Range } from 'vs/editor/common/core/range';
+import { IProgress, ITextSearchPreviewOptions, ITextSearchStats, TextSearchResult } from 'vs/platform/search/common/search';
+import { rgPath } from 'vscode-ripgrep';
+import { FileMatch, IFolderSearch, IRawSearch, ISerializedFileMatch, ISerializedSearchSuccess } from './search';
 
 // If vscode-ripgrep is in an .asar file, then the binary is unpacked.
 const rgDiskPath = rgPath.replace(/\bnode_modules\.asar\b/, 'node_modules.asar.unpacked');
@@ -47,12 +45,15 @@ export class RipgrepEngine {
 	}
 
 	// TODO@Rob - make promise-based once the old search is gone, and I don't need them to have matching interfaces anymore
-	search(onResult: (match: ISerializedFileMatch) => void, onMessage: (message: IProgress) => void, done: (error: Error, complete: ISerializedSearchComplete) => void): void {
+	search(onResult: (match: ISerializedFileMatch) => void, onMessage: (message: IProgress) => void, done: (error: Error, complete: ISerializedSearchSuccess) => void): void {
 		if (!this.config.folderQueries.length && !this.config.extraFiles.length) {
 			process.removeListener('exit', this.killRgProcFn);
 			done(null, {
+				type: 'success',
 				limitHit: false,
-				stats: null
+				stats: <ITextSearchStats>{
+					type: 'searchProcess'
+				}
 			});
 			return;
 		}
@@ -63,25 +64,24 @@ export class RipgrepEngine {
 		}
 
 		const cwd = platform.isWindows ? 'c:/' : '/';
-		process.nextTick(() => { // Allow caller to register progress callback
-			const escapedArgs = rgArgs.args
-				.map(arg => arg.match(/^-/) ? arg : `'${arg}'`)
-				.join(' ');
+		const escapedArgs = rgArgs.args
+			.map(arg => arg.match(/^-/) ? arg : `'${arg}'`)
+			.join(' ');
 
-			let rgCmd = `rg ${escapedArgs}\n - cwd: ${cwd}`;
-			if (rgArgs.siblingClauses) {
-				rgCmd += `\n - Sibling clauses: ${JSON.stringify(rgArgs.siblingClauses)}`;
-			}
+		let rgCmd = `rg ${escapedArgs}\n - cwd: ${cwd}`;
+		if (rgArgs.siblingClauses) {
+			rgCmd += `\n - Sibling clauses: ${JSON.stringify(rgArgs.siblingClauses)}`;
+		}
+
+		onMessage({ message: rgCmd });
 
-			onMessage({ message: rgCmd });
-		});
 		this.rgProc = cp.spawn(rgDiskPath, rgArgs.args, { cwd });
 		process.once('exit', this.killRgProcFn);
 
-		this.ripgrepParser = new RipgrepParser(this.config.maxResults, cwd, this.config.extraFiles);
+		this.ripgrepParser = new RipgrepParser(this.config.maxResults, cwd, this.config.extraFiles, this.config.previewOptions);
 		this.ripgrepParser.on('result', (match: ISerializedFileMatch) => {
 			if (this.postProcessExclusions) {
-				const handleResultP = (<TPromise<string>>this.postProcessExclusions(match.path, undefined, () => getSiblings(match.path)))
+				const handleResultP = (<TPromise<string>>this.postProcessExclusions(match.path, undefined, glob.hasSiblingPromiseFn(() => getSiblings(match.path))))
 					.then(globMatch => {
 						if (!globMatch) {
 							onResult(match);
@@ -97,8 +97,11 @@ export class RipgrepEngine {
 			this.cancel();
 			process.removeListener('exit', this.killRgProcFn);
 			done(null, {
+				type: 'success',
 				limitHit: true,
-				stats: null
+				stats: {
+					type: 'searchProcess'
+				}
 			});
 		});
 
@@ -127,11 +130,13 @@ export class RipgrepEngine {
 					process.removeListener('exit', this.killRgProcFn);
 					if (stderr && !gotData && (displayMsg = rgErrorMsgForDisplay(stderr))) {
 						done(new Error(displayMsg), {
+							type: 'success',
 							limitHit: false,
 							stats: null
 						});
 					} else {
 						done(null, {
+							type: 'success',
 							limitHit: false,
 							stats: null
 						});
@@ -148,20 +153,30 @@ export class RipgrepEngine {
  * "failed" when a fatal error was produced.
  */
 export function rgErrorMsgForDisplay(msg: string): string | undefined {
-	const firstLine = msg.split('\n')[0];
+	const lines = msg.trim().split('\n');
+	const firstLine = lines[0].trim();
 
 	if (strings.startsWith(firstLine, 'Error parsing regex')) {
 		return firstLine;
 	}
 
+	if (strings.startsWith(firstLine, 'regex parse error')) {
+		return strings.uppercaseFirstLetter(lines[lines.length - 1].trim());
+	}
+
 	if (strings.startsWith(firstLine, 'error parsing glob') ||
 		strings.startsWith(firstLine, 'unsupported encoding')) {
 		// Uppercase first letter
 		return firstLine.charAt(0).toUpperCase() + firstLine.substr(1);
 	}
 
+	if (firstLine === `Literal '\\n' not allowed.`) {
+		// I won't localize this because none of the Ripgrep error messages are localized
+		return `Literal '\\n' currently not supported`;
+	}
+
 	if (strings.startsWith(firstLine, 'Literal ')) {
-		// e.g. "Literal \n not allowed"
+		// Other unsupported chars
 		return firstLine;
 	}
 
@@ -183,7 +198,7 @@ export class RipgrepParser extends EventEmitter {
 
 	private numResults = 0;
 
-	constructor(private maxResults: number, private rootFolder: string, extraFiles?: string[]) {
+	constructor(private maxResults: number, private rootFolder: string, extraFiles?: string[], private previewOptions?: ITextSearchPreviewOptions) {
 		super();
 		this.stringDecoder = new StringDecoder();
 
@@ -261,7 +276,6 @@ export class RipgrepParser extends EventEmitter {
 			text = strings.stripUTF8BOM(text);
 		}
 
-		const lineMatch = new LineMatch(text, lineNum);
 		if (!this.fileMatch) {
 			// When searching a single file and no folderQueries, rg does not print the file line, so create it here
 			const singleFile = this.extraSearchFiles[0];
@@ -272,8 +286,6 @@ export class RipgrepParser extends EventEmitter {
 			this.fileMatch = this.getFileMatch(singleFile);
 		}
 
-		this.fileMatch.addMatch(lineMatch);
-
 		let lastMatchEndPos = 0;
 		let matchTextStartPos = -1;
 
@@ -282,6 +294,7 @@ export class RipgrepParser extends EventEmitter {
 		let textRealIdx = 0;
 		let hitLimit = false;
 
+		const matchRanges: IRange[] = [];
 		const realTextParts: string[] = [];
 
 		for (let i = 0; i < text.length - (RipgrepParser.MATCH_END_MARKER.length - 1);) {
@@ -297,7 +310,7 @@ export class RipgrepParser extends EventEmitter {
 				const chunk = text.slice(matchTextStartPos, i);
 				realTextParts.push(chunk);
 				if (!hitLimit) {
-					lineMatch.addMatch(matchTextStartRealIdx, textRealIdx - matchTextStartRealIdx);
+					matchRanges.push(new Range(lineNum, matchTextStartRealIdx, lineNum, textRealIdx));
 				}
 
 				matchTextStartPos = -1;
@@ -322,7 +335,9 @@ export class RipgrepParser extends EventEmitter {
 
 		// Replace preview with version without color codes
 		const preview = realTextParts.join('');
-		lineMatch.preview = preview;
+		matchRanges
+			.map(r => new TextSearchResult(preview, r, this.previewOptions))
+			.forEach(m => this.fileMatch.addMatch(m));
 
 		if (hitLimit) {
 			this.cancel();
@@ -496,6 +511,7 @@ function getRgArgs(config: IRawSearch) {
 	}
 
 	args.push('--no-config');
+	args.push('--no-ignore-global');
 
 	// Folder to search
 	args.push('--');
diff --git a/src/vs/workbench/services/search/node/search.ts b/src/vs/workbench/services/search/node/search.ts
index a1061c52d22..e3f65aa8fbe 100644
--- a/src/vs/workbench/services/search/node/search.ts
+++ b/src/vs/workbench/services/search/node/search.ts
@@ -5,9 +5,10 @@
 
 'use strict';
 
-import { PPromise, TPromise } from 'vs/base/common/winjs.base';
+import { Event } from 'vs/base/common/event';
 import { IExpression } from 'vs/base/common/glob';
-import { IProgress, ILineMatch, IPatternInfo, ISearchStats } from 'vs/platform/search/common/search';
+import { TPromise } from 'vs/base/common/winjs.base';
+import { IFileSearchStats, IPatternInfo, IProgress, ISearchEngineStats, ITextSearchPreviewOptions, ITextSearchResult, ITextSearchStats } from 'vs/platform/search/common/search';
 import { ITelemetryData } from 'vs/platform/telemetry/common/telemetry';
 
 export interface IFolderSearch {
@@ -33,6 +34,7 @@ export interface IRawSearch {
 	maxFilesize?: number;
 	useRipgrep?: boolean;
 	disregardIgnoreFiles?: boolean;
+	previewOptions?: ITextSearchPreviewOptions;
 }
 
 export interface ITelemetryEvent {
@@ -41,10 +43,9 @@ export interface ITelemetryEvent {
 }
 
 export interface IRawSearchService {
-	fileSearch(search: IRawSearch): PPromise<ISerializedSearchComplete, ISerializedSearchProgressItem>;
-	textSearch(search: IRawSearch): PPromise<ISerializedSearchComplete, ISerializedSearchProgressItem>;
+	fileSearch(search: IRawSearch): Event<ISerializedSearchProgressItem | ISerializedSearchComplete>;
+	textSearch(search: IRawSearch): Event<ISerializedSearchProgressItem | ISerializedSearchComplete>;
 	clearCache(cacheKey: string): TPromise<void>;
-	fetchTelemetry(): PPromise<void, ITelemetryEvent>;
 }
 
 export interface IRawFileMatch {
@@ -55,18 +56,48 @@ export interface IRawFileMatch {
 }
 
 export interface ISearchEngine<T> {
-	search: (onResult: (matches: T) => void, onProgress: (progress: IProgress) => void, done: (error: Error, complete: ISerializedSearchComplete) => void) => void;
+	search: (onResult: (matches: T) => void, onProgress: (progress: IProgress) => void, done: (error: Error, complete: ISearchEngineSuccess) => void) => void;
 	cancel: () => void;
 }
 
-export interface ISerializedSearchComplete {
+export interface ISerializedSearchSuccess {
+	type: 'success';
 	limitHit: boolean;
-	stats: ISearchStats;
+	stats: IFileSearchStats | ITextSearchStats;
+}
+
+export interface ISearchEngineSuccess {
+	limitHit: boolean;
+	stats: ISearchEngineStats;
+}
+
+export interface ISerializedSearchError {
+	type: 'error';
+	error: {
+		message: string,
+		stack: string
+	};
+}
+
+export type ISerializedSearchComplete = ISerializedSearchSuccess | ISerializedSearchError;
+
+export function isSerializedSearchComplete(arg: ISerializedSearchProgressItem | ISerializedSearchComplete): arg is ISerializedSearchComplete {
+	if ((arg as any).type === 'error') {
+		return true;
+	} else if ((arg as any).type === 'success') {
+		return true;
+	} else {
+		return false;
+	}
+}
+
+export function isSerializedSearchSuccess(arg: ISerializedSearchComplete): arg is ISerializedSearchSuccess {
+	return arg.type === 'success';
 }
 
 export interface ISerializedFileMatch {
 	path: string;
-	lineMatches?: ILineMatch[];
+	matches?: ITextSearchResult[];
 	numMatches?: number;
 }
 
@@ -77,56 +108,22 @@ export type IFileSearchProgressItem = IRawFileMatch | IRawFileMatch[] | IProgres
 
 export class FileMatch implements ISerializedFileMatch {
 	path: string;
-	lineMatches: LineMatch[];
+	matches: ITextSearchResult[];
 
 	constructor(path: string) {
 		this.path = path;
-		this.lineMatches = [];
+		this.matches = [];
 	}
 
-	addMatch(lineMatch: LineMatch): void {
-		this.lineMatches.push(lineMatch);
+	addMatch(match: ITextSearchResult): void {
+		this.matches.push(match);
 	}
 
 	serialize(): ISerializedFileMatch {
-		let lineMatches: ILineMatch[] = [];
-		let numMatches = 0;
-
-		for (let i = 0; i < this.lineMatches.length; i++) {
-			numMatches += this.lineMatches[i].offsetAndLengths.length;
-			lineMatches.push(this.lineMatches[i].serialize());
-		}
-
 		return {
 			path: this.path,
-			lineMatches,
-			numMatches
+			matches: this.matches,
+			numMatches: this.matches.length
 		};
 	}
 }
-
-export class LineMatch implements ILineMatch {
-	preview: string;
-	lineNumber: number;
-	offsetAndLengths: number[][];
-
-	constructor(preview: string, lineNumber: number) {
-		this.preview = preview.replace(/(\r|\n)*$/, '');
-		this.lineNumber = lineNumber;
-		this.offsetAndLengths = [];
-	}
-
-	addMatch(offset: number, length: number): void {
-		this.offsetAndLengths.push([offset, length]);
-	}
-
-	serialize(): ILineMatch {
-		const result = {
-			preview: this.preview,
-			lineNumber: this.lineNumber,
-			offsetAndLengths: this.offsetAndLengths
-		};
-
-		return result;
-	}
-}
\ No newline at end of file
diff --git a/src/vs/workbench/services/search/node/searchIpc.ts b/src/vs/workbench/services/search/node/searchIpc.ts
index 4e9575e0d55..1cc62837237 100644
--- a/src/vs/workbench/services/search/node/searchIpc.ts
+++ b/src/vs/workbench/services/search/node/searchIpc.ts
@@ -5,15 +5,15 @@
 
 'use strict';
 
-import { PPromise, TPromise } from 'vs/base/common/winjs.base';
-import { IChannel } from 'vs/base/parts/ipc/common/ipc';
-import { IRawSearchService, IRawSearch, ISerializedSearchComplete, ISerializedSearchProgressItem, ITelemetryEvent } from './search';
+import { Event } from 'vs/base/common/event';
+import { TPromise } from 'vs/base/common/winjs.base';
+import { IChannel } from 'vs/base/parts/ipc/node/ipc';
+import { IRawSearch, IRawSearchService, ISerializedSearchComplete, ISerializedSearchProgressItem } from './search';
 
 export interface ISearchChannel extends IChannel {
-	call(command: 'fileSearch', search: IRawSearch): PPromise<ISerializedSearchComplete, ISerializedSearchProgressItem>;
-	call(command: 'textSearch', search: IRawSearch): PPromise<ISerializedSearchComplete, ISerializedSearchProgressItem>;
+	listen(event: 'fileSearch', search: IRawSearch): Event<ISerializedSearchProgressItem | ISerializedSearchComplete>;
+	listen(event: 'textSearch', search: IRawSearch): Event<ISerializedSearchProgressItem | ISerializedSearchComplete>;
 	call(command: 'clearCache', cacheKey: string): TPromise<void>;
-	call(command: 'fetchTelemetry'): PPromise<void, ITelemetryEvent>;
 	call(command: string, arg: any): TPromise<any>;
 }
 
@@ -21,14 +21,19 @@ export class SearchChannel implements ISearchChannel {
 
 	constructor(private service: IRawSearchService) { }
 
-	call(command: string, arg?: any): TPromise<any> {
-		switch (command) {
+	listen<T>(event: string, arg?: any): Event<any> {
+		switch (event) {
 			case 'fileSearch': return this.service.fileSearch(arg);
 			case 'textSearch': return this.service.textSearch(arg);
-			case 'clearCache': return this.service.clearCache(arg);
-			case 'fetchTelemetry': return this.service.fetchTelemetry();
 		}
-		return undefined;
+		throw new Error('Event not found');
+	}
+
+	call(command: string, arg?: any): TPromise<any> {
+		switch (command) {
+			case 'clearCache': return this.service.clearCache(arg);
+		}
+		throw new Error('Call not found');
 	}
 }
 
@@ -36,19 +41,15 @@ export class SearchChannelClient implements IRawSearchService {
 
 	constructor(private channel: ISearchChannel) { }
 
-	fileSearch(search: IRawSearch): PPromise<ISerializedSearchComplete, ISerializedSearchProgressItem> {
-		return this.channel.call('fileSearch', search);
+	fileSearch(search: IRawSearch): Event<ISerializedSearchProgressItem | ISerializedSearchComplete> {
+		return this.channel.listen('fileSearch', search);
 	}
 
-	textSearch(search: IRawSearch): PPromise<ISerializedSearchComplete, ISerializedSearchProgressItem> {
-		return this.channel.call('textSearch', search);
+	textSearch(search: IRawSearch): Event<ISerializedSearchProgressItem | ISerializedSearchComplete> {
+		return this.channel.listen('textSearch', search);
 	}
 
 	clearCache(cacheKey: string): TPromise<void> {
 		return this.channel.call('clearCache', cacheKey);
 	}
-
-	fetchTelemetry(): PPromise<void, ITelemetryEvent> {
-		return this.channel.call('fetchTelemetry');
-	}
 }
\ No newline at end of file
diff --git a/src/vs/workbench/services/search/node/searchService.ts b/src/vs/workbench/services/search/node/searchService.ts
index f9bb3b703fe..0109bd5dc89 100644
--- a/src/vs/workbench/services/search/node/searchService.ts
+++ b/src/vs/workbench/services/search/node/searchService.ts
@@ -4,58 +4,73 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import { PPromise, TPromise } from 'vs/base/common/winjs.base';
-import uri from 'vs/base/common/uri';
+import { getPathFromAmdModule } from 'vs/base/common/amd';
 import * as arrays from 'vs/base/common/arrays';
+import { CancellationToken } from 'vs/base/common/cancellation';
+import { canceled } from 'vs/base/common/errors';
+import { Event } from 'vs/base/common/event';
+import { Disposable, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
+import { ResourceMap, values } from 'vs/base/common/map';
+import { Schemas } from 'vs/base/common/network';
 import * as objects from 'vs/base/common/objects';
+import { StopWatch } from 'vs/base/common/stopwatch';
 import * as strings from 'vs/base/common/strings';
-import { getNextTickChannel } from 'vs/base/parts/ipc/common/ipc';
+import { URI as uri } from 'vs/base/common/uri';
+import { TPromise } from 'vs/base/common/winjs.base';
+import * as pfs from 'vs/base/node/pfs';
+import { getNextTickChannel } from 'vs/base/parts/ipc/node/ipc';
 import { Client, IIPCOptions } from 'vs/base/parts/ipc/node/ipc.cp';
-import { IProgress, LineMatch, FileMatch, ISearchComplete, ISearchProgressItem, QueryType, IFileMatch, ISearchQuery, IFolderQuery, ISearchConfiguration, ISearchService, pathIncludedInQuery, ISearchResultProvider } from 'vs/platform/search/common/search';
-import { IUntitledEditorService } from 'vs/workbench/services/untitled/common/untitledEditorService';
+import { Range } from 'vs/editor/common/core/range';
+import { FindMatch, ITextModel } from 'vs/editor/common/model';
 import { IModelService } from 'vs/editor/common/services/modelService';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IRawSearch, ISerializedSearchComplete, ISerializedSearchProgressItem, ISerializedFileMatch, IRawSearchService, ITelemetryEvent } from './search';
-import { ISearchChannel, SearchChannelClient } from './searchIpc';
-import { IEnvironmentService, IDebugParams } from 'vs/platform/environment/common/environment';
-import { ResourceMap } from 'vs/base/common/map';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { onUnexpectedError } from 'vs/base/common/errors';
-import { Schemas } from 'vs/base/common/network';
-import * as pfs from 'vs/base/node/pfs';
+import { IDebugParams, IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { ILogService } from 'vs/platform/log/common/log';
+import { FileMatch, ICachedSearchStats, IFileMatch, IFileSearchStats, IFolderQuery, IProgress, ISearchComplete, ISearchConfiguration, ISearchEngineStats, ISearchProgressItem, ISearchQuery, ISearchResultProvider, ISearchService, ITextSearchPreviewOptions, pathIncludedInQuery, QueryType, SearchProviderType, TextSearchResult } from 'vs/platform/search/common/search';
+import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
+import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
+import { IUntitledEditorService } from 'vs/workbench/services/untitled/common/untitledEditorService';
+import { IRawSearch, IRawSearchService, ISerializedFileMatch, ISerializedSearchComplete, ISerializedSearchProgressItem, isSerializedSearchComplete, isSerializedSearchSuccess } from './search';
+import { ISearchChannel, SearchChannelClient } from './searchIpc';
 
-export class SearchService implements ISearchService {
+export class SearchService extends Disposable implements ISearchService {
 	public _serviceBrand: any;
 
 	private diskSearch: DiskSearch;
-	private readonly searchProviders: ISearchResultProvider[] = [];
-	private forwardingTelemetry: PPromise<void, ITelemetryEvent>;
+	private readonly fileSearchProviders = new Map<string, ISearchResultProvider>();
+	private readonly textSearchProviders = new Map<string, ISearchResultProvider>();
+	private readonly fileIndexProviders = new Map<string, ISearchResultProvider>();
 
 	constructor(
 		@IModelService private modelService: IModelService,
 		@IUntitledEditorService private untitledEditorService: IUntitledEditorService,
+		@IEditorService private editorService: IEditorService,
 		@IEnvironmentService environmentService: IEnvironmentService,
 		@ITelemetryService private telemetryService: ITelemetryService,
 		@IConfigurationService private configurationService: IConfigurationService,
 		@ILogService private logService: ILogService,
 		@IExtensionService private extensionService: IExtensionService
 	) {
+		super();
 		this.diskSearch = new DiskSearch(!environmentService.isBuilt || environmentService.verbose, /*timeout=*/undefined, environmentService.debugSearch);
 	}
 
-	public registerSearchResultProvider(provider: ISearchResultProvider): IDisposable {
-		this.searchProviders.push(provider);
-		return {
-			dispose: () => {
-				const idx = this.searchProviders.indexOf(provider);
-				if (idx >= 0) {
-					this.searchProviders.splice(idx, 1);
-				}
-			}
-		};
+	public registerSearchResultProvider(scheme: string, type: SearchProviderType, provider: ISearchResultProvider): IDisposable {
+		let list: Map<string, ISearchResultProvider>;
+		if (type === SearchProviderType.file) {
+			list = this.fileSearchProviders;
+		} else if (type === SearchProviderType.text) {
+			list = this.textSearchProviders;
+		} else if (type === SearchProviderType.fileIndex) {
+			list = this.fileIndexProviders;
+		}
+
+		list.set(scheme, provider);
+
+		return toDisposable(() => {
+			list.delete(scheme);
+		});
 	}
 
 	public extendQuery(query: ISearchQuery): void {
@@ -80,101 +95,228 @@ export class SearchService implements ISearchService {
 		}
 	}
 
-	public search(query: ISearchQuery): PPromise<ISearchComplete, ISearchProgressItem> {
-		this.forwardTelemetry();
+	public search(query: ISearchQuery, token?: CancellationToken, onProgress?: (item: ISearchProgressItem) => void): TPromise<ISearchComplete> {
+		// Get local results from dirty/untitled
+		const localResults = this.getLocalResults(query);
 
-		let combinedPromise: TPromise<void>;
+		if (onProgress) {
+			localResults.values().filter((res) => !!res).forEach(onProgress);
+		}
 
-		return new PPromise<ISearchComplete, ISearchProgressItem>((onComplete, onError, onProgress) => {
+		this.logService.trace('SearchService#search', JSON.stringify(query));
 
-			// Get local results from dirty/untitled
-			const localResults = this.getLocalResults(query);
-
-			// Allow caller to register progress callback
-			process.nextTick(() => localResults.values().filter((res) => !!res).forEach(onProgress));
-
-			this.logService.trace('SearchService#search', JSON.stringify(query));
-
-			const startTime = Date.now();
-			const searchWithProvider = (provider: ISearchResultProvider) => TPromise.wrap(provider.search(query)).then(e => e,
-				null,
-				progress => {
-					if (progress.resource) {
-						// Match
-						if (!localResults.has(progress.resource)) { // don't override local results
-							onProgress(progress);
-						}
-					} else {
-						// Progress
-						onProgress(<IProgress>progress);
-					}
-
-					if (progress.message) {
-						this.logService.debug('SearchService#search', progress.message);
-					}
-				});
-
-			const providerPromise = this.extensionService.whenInstalledExtensionsRegistered().then(() => {
-				// If no search providers are registered, fall back on DiskSearch
-				// TODO@roblou this is not properly waiting for search-rg to finish registering itself
-				if (this.searchProviders.length) {
-					return TPromise.join(this.searchProviders.map(p => searchWithProvider(p)))
-						.then(completes => {
-							completes = completes.filter(c => !!c);
-							if (!completes.length) {
-								return null;
-							}
-
-							return <ISearchComplete>{
-								limitHit: completes[0] && completes[0].limitHit,
-								stats: completes[0].stats,
-								results: arrays.flatten(completes.map(c => c.results))
-							};
-						}, errs => {
-							if (!Array.isArray(errs)) {
-								errs = [errs];
-							}
-
-							errs = errs.filter(e => !!e);
-							return TPromise.wrapError(errs[0]);
-						});
-				} else {
-					return searchWithProvider(this.diskSearch);
+		const onProviderProgress = progress => {
+			if (progress.resource) {
+				// Match
+				if (!localResults.has(progress.resource) && onProgress) { // don't override local results
+					onProgress(progress);
 				}
+			} else if (onProgress) {
+				// Progress
+				onProgress(<IProgress>progress);
+			}
+
+			if (progress.message) {
+				this.logService.debug('SearchService#search', progress.message);
+			}
+		};
+
+		const schemesInQuery = this.getSchemesInQuery(query);
+
+		const providerActivations: TPromise<any>[] = [TPromise.wrap(null)];
+		schemesInQuery.forEach(scheme => providerActivations.push(this.extensionService.activateByEvent(`onSearch:${scheme}`)));
+
+		const providerPromise = TPromise.join(providerActivations)
+			.then(() => this.extensionService.whenInstalledExtensionsRegistered())
+			.then(() => this.searchWithProviders(query, onProviderProgress, token))
+			.then(completes => {
+				completes = completes.filter(c => !!c);
+				if (!completes.length) {
+					return null;
+				}
+
+				return <ISearchComplete>{
+					limitHit: completes[0] && completes[0].limitHit,
+					stats: completes[0].stats,
+					results: arrays.flatten(completes.map(c => c.results))
+				};
+			}, errs => {
+				if (!Array.isArray(errs)) {
+					errs = [errs];
+				}
+
+				errs = errs.filter(e => !!e);
+				return TPromise.wrapError(errs[0]);
 			});
 
-			combinedPromise = providerPromise.then(value => {
-				this.logService.debug(`SearchService#search: ${Date.now() - startTime}ms`);
-				const values = [value];
+		return providerPromise.then(value => {
+			const values = [value];
 
-				const result: ISearchComplete = {
-					limitHit: false,
-					results: [],
-					stats: undefined
-				};
+			const result: ISearchComplete = {
+				limitHit: false,
+				results: [],
+				stats: undefined
+			};
 
-				// TODO@joh
-				// sorting, disjunct results
-				for (const value of values) {
-					if (!value) {
-						continue;
-					}
-					// TODO@joh individual stats/limit
-					result.stats = value.stats || result.stats;
-					result.limitHit = value.limitHit || result.limitHit;
+			// TODO@joh
+			// sorting, disjunct results
+			for (const value of values) {
+				if (!value) {
+					continue;
+				}
+				// TODO@joh individual stats/limit
+				result.stats = value.stats || result.stats;
+				result.limitHit = value.limitHit || result.limitHit;
 
-					for (const match of value.results) {
-						if (!localResults.has(match.resource)) {
-							result.results.push(match);
-						}
+				for (const match of value.results) {
+					if (!localResults.has(match.resource)) {
+						result.results.push(match);
 					}
 				}
+			}
 
-				return result;
+			return result;
+		});
 
-			}).then(onComplete, onError);
+	}
 
-		}, () => combinedPromise && combinedPromise.cancel());
+	private getSchemesInQuery(query: ISearchQuery): Set<string> {
+		const schemes = new Set<string>();
+		if (query.folderQueries) {
+			query.folderQueries.forEach(fq => schemes.add(fq.folder.scheme));
+		}
+
+		if (query.extraFileResources) {
+			query.extraFileResources.forEach(extraFile => schemes.add(extraFile.scheme));
+		}
+
+		return schemes;
+	}
+
+	private searchWithProviders(query: ISearchQuery, onProviderProgress: (progress: ISearchProgressItem) => void, token?: CancellationToken) {
+		const e2eSW = StopWatch.create(false);
+
+		const diskSearchQueries: IFolderQuery[] = [];
+		const searchPs: TPromise<ISearchComplete>[] = [];
+
+		query.folderQueries.forEach(fq => {
+			let provider = query.type === QueryType.File ?
+				this.fileSearchProviders.get(fq.folder.scheme) || this.fileIndexProviders.get(fq.folder.scheme) :
+				this.textSearchProviders.get(fq.folder.scheme);
+
+			if (!provider && fq.folder.scheme === 'file') {
+				diskSearchQueries.push(fq);
+			} else if (!provider) {
+				throw new Error('No search provider registered for scheme: ' + fq.folder.scheme);
+			} else {
+				const oneFolderQuery = {
+					...query,
+					...{
+						folderQueries: [fq]
+					}
+				};
+
+				searchPs.push(provider.search(oneFolderQuery, onProviderProgress, token));
+			}
+		});
+
+		const diskSearchExtraFileResources = query.extraFileResources && query.extraFileResources.filter(res => res.scheme === 'file');
+
+		if (diskSearchQueries.length || diskSearchExtraFileResources) {
+			const diskSearchQuery: ISearchQuery = {
+				...query,
+				...{
+					folderQueries: diskSearchQueries
+				},
+				extraFileResources: diskSearchExtraFileResources
+			};
+
+			searchPs.push(this.diskSearch.search(diskSearchQuery, onProviderProgress, token));
+		}
+
+		return TPromise.join(searchPs).then(completes => {
+			const endToEndTime = e2eSW.elapsed();
+			this.logService.trace(`SearchService#search: ${endToEndTime}ms`);
+			completes.forEach(complete => {
+				this.sendTelemetry(query, endToEndTime, complete);
+			});
+			return completes;
+		});
+	}
+
+	private sendTelemetry(query: ISearchQuery, endToEndTime: number, complete: ISearchComplete): void {
+		const fileSchemeOnly = query.folderQueries.every(fq => fq.folder.scheme === 'file');
+		const otherSchemeOnly = query.folderQueries.every(fq => fq.folder.scheme !== 'file');
+		const scheme = fileSchemeOnly ? 'file' :
+			otherSchemeOnly ? 'other' :
+				'mixed';
+
+		if (query.type === QueryType.File && complete.stats) {
+			const fileSearchStats = complete.stats as IFileSearchStats;
+			if (fileSearchStats.fromCache) {
+				const cacheStats: ICachedSearchStats = fileSearchStats.detailStats as ICachedSearchStats;
+
+				/* __GDPR__
+					"cachedSearchComplete" : {
+						"resultCount" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true  },
+						"workspaceFolderCount" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true  },
+						"type" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+						"endToEndTime" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true },
+						"sortingTime" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true },
+						"cacheWasResolved" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+						"cacheLookupTime" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true },
+						"cacheFilterTime" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true },
+						"cacheEntryCount" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true },
+						"scheme" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+					}
+				 */
+				this.telemetryService.publicLog('cachedSearchComplete', {
+					resultCount: fileSearchStats.resultCount,
+					workspaceFolderCount: query.folderQueries.length,
+					type: fileSearchStats.type,
+					endToEndTime: endToEndTime,
+					sortingTime: fileSearchStats.sortingTime,
+					cacheWasResolved: cacheStats.cacheWasResolved,
+					cacheLookupTime: cacheStats.cacheLookupTime,
+					cacheFilterTime: cacheStats.cacheFilterTime,
+					cacheEntryCount: cacheStats.cacheEntryCount,
+					scheme
+				});
+			} else {
+				const searchEngineStats: ISearchEngineStats = fileSearchStats.detailStats as ISearchEngineStats;
+
+				/* __GDPR__
+					"searchComplete" : {
+						"resultCount" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true  },
+						"workspaceFolderCount" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true  },
+						"type" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+						"endToEndTime" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true },
+						"sortingTime" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true },
+						"traversal" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+						"fileWalkTime" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true },
+						"directoriesWalked" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true },
+						"filesWalked" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true },
+						"cmdTime" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true },
+						"cmdResultCount" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true },
+						"scheme" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+					}
+				 */
+				this.telemetryService.publicLog('searchComplete', {
+					resultCount: fileSearchStats.resultCount,
+					workspaceFolderCount: query.folderQueries.length,
+					type: fileSearchStats.type,
+					endToEndTime: endToEndTime,
+					sortingTime: fileSearchStats.sortingTime,
+					traversal: searchEngineStats.traversal,
+					fileWalkTime: searchEngineStats.fileWalkTime,
+					directoriesWalked: searchEngineStats.directoriesWalked,
+					filesWalked: searchEngineStats.filesWalked,
+					cmdTime: searchEngineStats.cmdTime,
+					cmdResultCount: searchEngineStats.cmdResultCount,
+					scheme
+				});
+			}
+		}
 	}
 
 	private getLocalResults(query: ISearchQuery): ResourceMap<IFileMatch> {
@@ -188,6 +330,10 @@ export class SearchService implements ISearchService {
 					return;
 				}
 
+				if (!this.editorService.isOpen({ resource })) {
+					return;
+				}
+
 				// Support untitled files
 				if (resource.scheme === Schemas.untitled) {
 					if (!this.untitledEditorService.exists(resource)) {
@@ -214,7 +360,7 @@ export class SearchService implements ISearchService {
 					localResults.set(resource, fileMatch);
 
 					matches.forEach((match) => {
-						fileMatch.lineMatches.push(new LineMatch(model.getLineContent(match.range.startLineNumber), match.range.startLineNumber - 1, [[match.range.startColumn - 1, match.range.endColumn - match.range.startColumn]]));
+						fileMatch.matches.push(editorMatchToTextSearchResult(match, model, query.previewOptions));
 					});
 				} else {
 					localResults.set(resource, null);
@@ -248,16 +394,13 @@ export class SearchService implements ISearchService {
 	}
 
 	public clearCache(cacheKey: string): TPromise<void> {
-		return this.diskSearch.clearCache(cacheKey);
-	}
+		const clearPs = [
+			this.diskSearch,
+			...values(this.fileIndexProviders)
+		].map(provider => provider && provider.clearCache(cacheKey));
 
-	private forwardTelemetry() {
-		if (!this.forwardingTelemetry) {
-			this.forwardingTelemetry = this.diskSearch.fetchTelemetry()
-				.then(null, onUnexpectedError, event => {
-					this.telemetryService.publicLog(event.eventName, event.data);
-				});
-		}
+		return TPromise.join(clearPs)
+			.then(() => { });
 	}
 }
 
@@ -291,28 +434,28 @@ export class DiskSearch implements ISearchResultProvider {
 		}
 
 		const client = new Client(
-			uri.parse(require.toUrl('bootstrap')).fsPath,
+			getPathFromAmdModule(require, 'bootstrap-fork'),
 			opts);
 
 		const channel = getNextTickChannel(client.getChannel<ISearchChannel>('search'));
 		this.raw = new SearchChannelClient(channel);
 	}
 
-	public search(query: ISearchQuery): PPromise<ISearchComplete, ISearchProgressItem> {
+	public search(query: ISearchQuery, onProgress?: (p: ISearchProgressItem) => void, token?: CancellationToken): TPromise<ISearchComplete> {
 		const folderQueries = query.folderQueries || [];
 		return TPromise.join(folderQueries.map(q => q.folder.scheme === Schemas.file && pfs.exists(q.folder.fsPath)))
 			.then(exists => {
 				const existingFolders = folderQueries.filter((q, index) => exists[index]);
 				const rawSearch = this.rawSearchQuery(query, existingFolders);
 
-				let request: PPromise<ISerializedSearchComplete, ISerializedSearchProgressItem>;
+				let event: Event<ISerializedSearchProgressItem | ISerializedSearchComplete>;
 				if (query.type === QueryType.File) {
-					request = this.raw.fileSearch(rawSearch);
+					event = this.raw.fileSearch(rawSearch);
 				} else {
-					request = this.raw.textSearch(rawSearch);
+					event = this.raw.textSearch(rawSearch);
 				}
 
-				return DiskSearch.collectResults(request);
+				return DiskSearch.collectResultsFromEvent(event, onProgress, token);
 			});
 	}
 
@@ -329,7 +472,8 @@ export class DiskSearch implements ISearchResultProvider {
 			cacheKey: query.cacheKey,
 			useRipgrep: query.useRipgrep,
 			disregardIgnoreFiles: query.disregardIgnoreFiles,
-			ignoreSymlinks: query.ignoreSymlinks
+			ignoreSymlinks: query.ignoreSymlinks,
+			previewOptions: query.previewOptions
 		};
 
 		for (const q of existingFolders) {
@@ -357,45 +501,67 @@ export class DiskSearch implements ISearchResultProvider {
 		return rawSearch;
 	}
 
-	public static collectResults(request: PPromise<ISerializedSearchComplete, ISerializedSearchProgressItem>): PPromise<ISearchComplete, ISearchProgressItem> {
+	public static collectResultsFromEvent(event: Event<ISerializedSearchProgressItem | ISerializedSearchComplete>, onProgress?: (p: ISearchProgressItem) => void, token?: CancellationToken): TPromise<ISearchComplete> {
 		let result: IFileMatch[] = [];
-		return new PPromise<ISearchComplete, ISearchProgressItem>((c, e, p) => {
-			request.done((complete) => {
-				c({
-					limitHit: complete.limitHit,
-					results: result,
-					stats: complete.stats
+
+		let listener: IDisposable;
+		return new TPromise<ISearchComplete>((c, e) => {
+			if (token) {
+				token.onCancellationRequested(() => {
+					if (listener) {
+						listener.dispose();
+					}
+
+					e(canceled());
 				});
-			}, e, (data) => {
+			}
 
-				// Matches
-				if (Array.isArray(data)) {
-					const fileMatches = data.map(d => this.createFileMatch(d));
-					result = result.concat(fileMatches);
-					fileMatches.forEach(p);
-				}
+			listener = event(ev => {
+				if (isSerializedSearchComplete(ev)) {
+					if (isSerializedSearchSuccess(ev)) {
+						c({
+							limitHit: ev.limitHit,
+							results: result,
+							stats: ev.stats
+						});
+					} else {
+						e(ev.error);
+					}
 
-				// Match
-				else if ((<ISerializedFileMatch>data).path) {
-					const fileMatch = this.createFileMatch(<ISerializedFileMatch>data);
-					result.push(fileMatch);
-					p(fileMatch);
-				}
+					listener.dispose();
+				} else {
+					// Matches
+					if (Array.isArray(ev)) {
+						const fileMatches = ev.map(d => this.createFileMatch(d));
+						result = result.concat(fileMatches);
+						if (onProgress) {
+							fileMatches.forEach(onProgress);
+						}
+					}
 
-				// Progress
-				else {
-					p(<IProgress>data);
+					// Match
+					else if ((<ISerializedFileMatch>ev).path) {
+						const fileMatch = this.createFileMatch(<ISerializedFileMatch>ev);
+						result.push(fileMatch);
+
+						if (onProgress) {
+							onProgress(fileMatch);
+						}
+					}
+
+					// Progress
+					else if (onProgress) {
+						onProgress(<IProgress>ev);
+					}
 				}
 			});
-		}, () => request.cancel());
+		});
 	}
 
 	private static createFileMatch(data: ISerializedFileMatch): FileMatch {
 		let fileMatch = new FileMatch(uri.file(data.path));
-		if (data.lineMatches) {
-			for (let j = 0; j < data.lineMatches.length; j++) {
-				fileMatch.lineMatches.push(new LineMatch(data.lineMatches[j].preview, data.lineMatches[j].lineNumber, data.lineMatches[j].offsetAndLengths));
-			}
+		if (data.matches) {
+			fileMatch.matches.push(...data.matches); // TODO why
 		}
 		return fileMatch;
 	}
@@ -403,8 +569,21 @@ export class DiskSearch implements ISearchResultProvider {
 	public clearCache(cacheKey: string): TPromise<void> {
 		return this.raw.clearCache(cacheKey);
 	}
-
-	public fetchTelemetry(): PPromise<void, ITelemetryEvent> {
-		return this.raw.fetchTelemetry();
-	}
+}
+
+/**
+ * While search doesn't support multiline matches, collapse editor matches to a single line
+ */
+function editorMatchToTextSearchResult(match: FindMatch, model: ITextModel, previewOptions: ITextSearchPreviewOptions): TextSearchResult {
+	let endLineNumber = match.range.endLineNumber - 1;
+	let endCol = match.range.endColumn - 1;
+	if (match.range.endLineNumber !== match.range.startLineNumber) {
+		endLineNumber = match.range.startLineNumber - 1;
+		endCol = model.getLineLength(match.range.startLineNumber);
+	}
+
+	return new TextSearchResult(
+		model.getLineContent(match.range.startLineNumber),
+		new Range(match.range.startLineNumber - 1, match.range.startColumn - 1, endLineNumber, endCol),
+		previewOptions);
 }
diff --git a/src/vs/workbench/services/search/node/textSearch.ts b/src/vs/workbench/services/search/node/textSearch.ts
index c2002bb88ed..02b15dafa4a 100644
--- a/src/vs/workbench/services/search/node/textSearch.ts
+++ b/src/vs/workbench/services/search/node/textSearch.ts
@@ -6,14 +6,12 @@
 'use strict';
 
 import * as path from 'path';
-
 import { onUnexpectedError } from 'vs/base/common/errors';
 import { IProgress } from 'vs/platform/search/common/search';
 import { FileWalker } from 'vs/workbench/services/search/node/fileSearch';
-
-import { ISerializedFileMatch, ISerializedSearchComplete, IRawSearch, ISearchEngine } from './search';
-import { ISearchWorker } from './worker/searchWorkerIpc';
+import { IRawSearch, ISearchEngine, ISearchEngineSuccess, ISerializedFileMatch } from './search';
 import { ITextSearchWorkerProvider } from './textSearchWorkerProvider';
+import { ISearchWorker, ISearchWorkerSearchArgs } from './worker/searchWorkerIpc';
 
 export class Engine implements ISearchEngine<ISerializedFileMatch[]> {
 
@@ -60,7 +58,7 @@ export class Engine implements ISearchEngine<ISerializedFileMatch[]> {
 		});
 	}
 
-	search(onResult: (match: ISerializedFileMatch[]) => void, onProgress: (progress: IProgress) => void, done: (error: Error, complete: ISerializedSearchComplete) => void): void {
+	search(onResult: (match: ISerializedFileMatch[]) => void, onProgress: (progress: IProgress) => void, done: (error: Error, complete: ISearchEngineSuccess) => void): void {
 		this.workers = this.workerProvider.getWorkers();
 		this.initializeWorkers();
 
@@ -97,7 +95,7 @@ export class Engine implements ISearchEngine<ISerializedFileMatch[]> {
 			this.nextWorker = (this.nextWorker + 1) % this.workers.length;
 
 			const maxResults = this.config.maxResults && (this.config.maxResults - this.numResults);
-			const searchArgs = { absolutePaths: batch, maxResults, pattern: this.config.contentPattern, fileEncoding };
+			const searchArgs: ISearchWorkerSearchArgs = { absolutePaths: batch, maxResults, pattern: this.config.contentPattern, fileEncoding, previewOptions: this.config.previewOptions };
 			worker.search(searchArgs).then(result => {
 				if (!result || this.limitReached || this.isCanceled) {
 					return unwind(batchBytes);
diff --git a/src/vs/workbench/services/search/node/textSearchWorkerProvider.ts b/src/vs/workbench/services/search/node/textSearchWorkerProvider.ts
index 1b7b03ef9a7..f4d7855f295 100644
--- a/src/vs/workbench/services/search/node/textSearchWorkerProvider.ts
+++ b/src/vs/workbench/services/search/node/textSearchWorkerProvider.ts
@@ -7,11 +7,11 @@
 
 import * as os from 'os';
 
-import uri from 'vs/base/common/uri';
-import * as ipc from 'vs/base/parts/ipc/common/ipc';
+import * as ipc from 'vs/base/parts/ipc/node/ipc';
 import { Client } from 'vs/base/parts/ipc/node/ipc.cp';
 
 import { ISearchWorker, ISearchWorkerChannel, SearchWorkerChannelClient } from './worker/searchWorkerIpc';
+import { getPathFromAmdModule } from 'vs/base/common/amd';
 
 export interface ITextSearchWorkerProvider {
 	getWorkers(): ISearchWorker[];
@@ -31,7 +31,7 @@ export class TextSearchWorkerProvider implements ITextSearchWorkerProvider {
 
 	private createWorker(): void {
 		let client = new Client(
-			uri.parse(require.toUrl('bootstrap')).fsPath,
+			getPathFromAmdModule(require, 'bootstrap-fork'),
 			{
 				serverName: 'Search Worker ' + this.workers.length,
 				args: ['--type=searchWorker'],
@@ -49,4 +49,4 @@ export class TextSearchWorkerProvider implements ITextSearchWorkerProvider {
 
 		this.workers.push(channelClient);
 	}
-}
\ No newline at end of file
+}
diff --git a/src/vs/workbench/services/search/node/worker/searchWorker.ts b/src/vs/workbench/services/search/node/worker/searchWorker.ts
index cdda1b2b257..b1e340ac07b 100644
--- a/src/vs/workbench/services/search/node/worker/searchWorker.ts
+++ b/src/vs/workbench/services/search/node/worker/searchWorker.ts
@@ -7,16 +7,17 @@
 
 import * as fs from 'fs';
 import * as gracefulFs from 'graceful-fs';
-gracefulFs.gracefulify(fs);
-
 import { onUnexpectedError } from 'vs/base/common/errors';
 import * as strings from 'vs/base/common/strings';
 import { TPromise } from 'vs/base/common/winjs.base';
-import { LineMatch, FileMatch } from '../search';
-import { UTF16le, UTF16be, UTF8, UTF8_with_bom, encodingExists, decode, bomLength, detectEncodingFromBuffer } from 'vs/base/node/encoding';
-
+import { bomLength, decode, detectEncodingFromBuffer, encodingExists, UTF16be, UTF16le, UTF8, UTF8_with_bom } from 'vs/base/node/encoding';
+import { Range } from 'vs/editor/common/core/range';
+import { ITextSearchPreviewOptions, TextSearchResult } from 'vs/platform/search/common/search';
+import { FileMatch } from '../search';
 import { ISearchWorker, ISearchWorkerSearchArgs, ISearchWorkerSearchResult } from './searchWorkerIpc';
 
+gracefulFs.gracefulify(fs);
+
 interface ReadLinesOptions {
 	bufferLength: number;
 	encoding: string;
@@ -95,7 +96,7 @@ export class SearchWorkerEngine {
 
 			// Search in the given path, and when it's finished, search in the next path in absolutePaths
 			const startSearchInFile = (absolutePath: string): TPromise<void> => {
-				return this.searchInFile(absolutePath, contentPattern, fileEncoding, args.maxResults && (args.maxResults - result.numMatches)).then(fileResult => {
+				return this.searchInFile(absolutePath, contentPattern, fileEncoding, args.maxResults && (args.maxResults - result.numMatches), args.previewOptions).then(fileResult => {
 					// Finish early if search is canceled
 					if (this.isCanceled) {
 						return;
@@ -124,13 +125,12 @@ export class SearchWorkerEngine {
 		this.isCanceled = true;
 	}
 
-	private searchInFile(absolutePath: string, contentPattern: RegExp, fileEncoding: string, maxResults?: number): TPromise<IFileSearchResult> {
+	private searchInFile(absolutePath: string, contentPattern: RegExp, fileEncoding: string, maxResults?: number, previewOptions?: ITextSearchPreviewOptions): TPromise<IFileSearchResult> {
 		let fileMatch: FileMatch = null;
 		let limitReached = false;
 		let numMatches = 0;
 
 		const perLineCallback = (line: string, lineNumber: number) => {
-			let lineMatch: LineMatch = null;
 			let match = contentPattern.exec(line);
 
 			// Record all matches into file result
@@ -139,12 +139,8 @@ export class SearchWorkerEngine {
 					fileMatch = new FileMatch(absolutePath);
 				}
 
-				if (lineMatch === null) {
-					lineMatch = new LineMatch(line, lineNumber);
-					fileMatch.addMatch(lineMatch);
-				}
-
-				lineMatch.addMatch(match.index, match[0].length);
+				const lineMatch = new TextSearchResult(line, new Range(lineNumber, match.index, lineNumber, match.index + match[0].length), previewOptions);
+				fileMatch.addMatch(lineMatch);
 
 				numMatches++;
 				if (maxResults && numMatches >= maxResults) {
@@ -177,8 +173,8 @@ export class SearchWorkerEngine {
 						return clb(null); // return early if canceled or limit reached
 					}
 
-					fs.read(fd, buffer, 0, buffer.length, null, (error: Error, bytesRead: number, buffer: NodeBuffer) => {
-						const decodeBuffer = (buffer: NodeBuffer, start: number, end: number): string => {
+					fs.read(fd, buffer, 0, buffer.length, null, (error: Error, bytesRead: number, buffer: Buffer) => {
+						const decodeBuffer = (buffer: Buffer, start: number, end: number): string => {
 							if (options.encoding === UTF8 || options.encoding === UTF8_with_bom) {
 								return buffer.toString(undefined, start, end); // much faster to use built in toString() when encoding is default
 							}
diff --git a/src/vs/workbench/services/search/node/worker/searchWorkerIpc.ts b/src/vs/workbench/services/search/node/worker/searchWorkerIpc.ts
index 5260dc0b80d..5fed1210eec 100644
--- a/src/vs/workbench/services/search/node/worker/searchWorkerIpc.ts
+++ b/src/vs/workbench/services/search/node/worker/searchWorkerIpc.ts
@@ -6,16 +6,18 @@
 'use strict';
 
 import { TPromise } from 'vs/base/common/winjs.base';
-import { IChannel } from 'vs/base/parts/ipc/common/ipc';
+import { IChannel } from 'vs/base/parts/ipc/node/ipc';
 import { ISerializedFileMatch } from '../search';
-import { IPatternInfo } from 'vs/platform/search/common/search';
+import { IPatternInfo, ITextSearchPreviewOptions } from 'vs/platform/search/common/search';
 import { SearchWorker } from './searchWorker';
+import { Event } from 'vs/base/common/event';
 
 export interface ISearchWorkerSearchArgs {
 	pattern: IPatternInfo;
 	fileEncoding: string;
 	absolutePaths: string[];
 	maxResults?: number;
+	previewOptions?: ITextSearchPreviewOptions;
 }
 
 export interface ISearchWorkerSearchResult {
@@ -41,6 +43,10 @@ export class SearchWorkerChannel implements ISearchWorkerChannel {
 	constructor(private worker: SearchWorker) {
 	}
 
+	listen<T>(event: string, arg?: any): Event<T> {
+		throw new Error('No events');
+	}
+
 	call(command: string, arg?: any): TPromise<any> {
 		switch (command) {
 			case 'initialize': return this.worker.initialize();
diff --git a/src/vs/workbench/services/search/test/node/ripgrepTextSearch.test.ts b/src/vs/workbench/services/search/test/node/ripgrepTextSearch.test.ts
index ac23cfa0c7e..8e2f789924c 100644
--- a/src/vs/workbench/services/search/test/node/ripgrepTextSearch.test.ts
+++ b/src/vs/workbench/services/search/test/node/ripgrepTextSearch.test.ts
@@ -5,16 +5,13 @@
 
 'use strict';
 
-import * as path from 'path';
 import * as assert from 'assert';
-
+import * as path from 'path';
 import * as arrays from 'vs/base/common/arrays';
 import * as platform from 'vs/base/common/platform';
-
-import { RipgrepParser, getAbsoluteGlob, fixDriveC, fixRegexEndingPattern } from 'vs/workbench/services/search/node/ripgrepTextSearch';
+import { fixDriveC, fixRegexEndingPattern, getAbsoluteGlob, RipgrepParser } from 'vs/workbench/services/search/node/ripgrepTextSearch';
 import { ISerializedFileMatch } from 'vs/workbench/services/search/node/search';
 
-
 suite('RipgrepParser', () => {
 	const rootFolder = '/workspace';
 	const fileSectionEnd = '\n';
@@ -76,16 +73,40 @@ suite('RipgrepParser', () => {
 			<ISerializedFileMatch>{
 				numMatches: 2,
 				path: path.join(rootFolder, 'a.txt'),
-				lineMatches: [
+				matches: [
 					{
-						lineNumber: 0,
-						preview: 'beforematchafter',
-						offsetAndLengths: [[6, 5]]
+						preview: {
+							match: {
+								endColumn: 11,
+								endLineNumber: 0,
+								startColumn: 6,
+								startLineNumber: 0,
+							},
+							text: 'beforematchafter'
+						},
+						range: {
+							endColumn: 11,
+							endLineNumber: 0,
+							startColumn: 6,
+							startLineNumber: 0,
+						}
 					},
 					{
-						lineNumber: 1,
-						preview: 'beforematchafter',
-						offsetAndLengths: [[6, 5]]
+						preview: {
+							match: {
+								endColumn: 11,
+								endLineNumber: 0,
+								startColumn: 6,
+								startLineNumber: 0,
+							},
+							text: 'beforematchafter'
+						},
+						range: {
+							endColumn: 11,
+							endLineNumber: 1,
+							startColumn: 6,
+							startLineNumber: 1,
+						}
 					}
 				]
 			});
@@ -157,7 +178,7 @@ suite('RipgrepParser', () => {
 
 	test('Parses chunks broken in the middle of a multibyte character', () => {
 		const text = getFileLine('foo/bar') + '\n' + getMatchLine(0, ['before漢', 'match', 'after']) + '\n';
-		const buf = new Buffer(text);
+		const buf = Buffer.from(text);
 
 		// Split the buffer at every possible position - it should still be parsed correctly
 		for (let i = 0; i < buf.length; i++) {
@@ -168,8 +189,9 @@ suite('RipgrepParser', () => {
 
 			const results = parseInput(inputBufs);
 			assert.equal(results.length, 1);
-			assert.equal(results[0].lineMatches.length, 1);
-			assert.deepEqual(results[0].lineMatches[0].offsetAndLengths, [[7, 5]]);
+			assert.equal(results[0].matches.length, 1);
+			assert.equal(results[0].matches[0].range.startColumn, 7);
+			assert.equal(results[0].matches[0].range.endColumn, 12);
 		}
 	});
 });
diff --git a/src/vs/workbench/services/search/test/node/search.test.ts b/src/vs/workbench/services/search/test/node/search.test.ts
index c4a69c77005..7e8ded6fe5d 100644
--- a/src/vs/workbench/services/search/test/node/search.test.ts
+++ b/src/vs/workbench/services/search/test/node/search.test.ts
@@ -13,8 +13,9 @@ import * as platform from 'vs/base/common/platform';
 
 import { FileWalker, Engine as FileSearchEngine } from 'vs/workbench/services/search/node/fileSearch';
 import { IRawFileMatch, IFolderSearch } from 'vs/workbench/services/search/node/search';
+import { getPathFromAmdModule } from 'vs/base/common/amd';
 
-const TEST_FIXTURES = path.normalize(require.toUrl('./fixtures'));
+const TEST_FIXTURES = path.normalize(getPathFromAmdModule(require, './fixtures'));
 const EXAMPLES_FIXTURES = path.join(TEST_FIXTURES, 'examples');
 const MORE_FIXTURES = path.join(TEST_FIXTURES, 'more');
 const TEST_ROOT_FOLDER: IFolderSearch = { folder: TEST_FIXTURES };
@@ -23,7 +24,7 @@ const ROOT_FOLDER_QUERY: IFolderSearch[] = [
 ];
 
 const ROOT_FOLDER_QUERY_36438: IFolderSearch[] = [
-	{ folder: path.normalize(require.toUrl('./fixtures2/36438')) }
+	{ folder: path.normalize(getPathFromAmdModule(require, './fixtures2/36438')) }
 ];
 
 const MULTIROOT_QUERIES: IFolderSearch[] = [
@@ -578,29 +579,6 @@ suite('FileSearchEngine', () => {
 		});
 	});
 
-	test('Files: absolute path to file ignores excludes', function (done: () => void) {
-		this.timeout(testTimeout);
-		let engine = new FileSearchEngine({
-			folderQueries: ROOT_FOLDER_QUERY,
-			filePattern: path.normalize(path.join(require.toUrl('./fixtures'), 'site.css')),
-			excludePattern: { '**/*.css': true }
-		});
-
-		let count = 0;
-		let res: IRawFileMatch;
-		engine.search((result) => {
-			if (result) {
-				count++;
-			}
-			res = result;
-		}, () => { }, (error) => {
-			assert.ok(!error);
-			assert.equal(count, 1);
-			assert.equal(path.basename(res.relativePath), 'site.css');
-			done();
-		});
-	});
-
 	test('Files: relative path matched once', function (done: () => void) {
 		this.timeout(testTimeout);
 		let engine = new FileSearchEngine({
@@ -623,29 +601,6 @@ suite('FileSearchEngine', () => {
 		});
 	});
 
-	test('Files: relative path to file ignores excludes', function (done: () => void) {
-		this.timeout(testTimeout);
-		let engine = new FileSearchEngine({
-			folderQueries: ROOT_FOLDER_QUERY,
-			filePattern: path.normalize(path.join('examples', 'company.js')),
-			excludePattern: { '**/*.js': true }
-		});
-
-		let count = 0;
-		let res: IRawFileMatch;
-		engine.search((result) => {
-			if (result) {
-				count++;
-			}
-			res = result;
-		}, () => { }, (error) => {
-			assert.ok(!error);
-			assert.equal(count, 1);
-			assert.equal(path.basename(res.relativePath), 'company.js');
-			done();
-		});
-	});
-
 	test('Files: Include pattern, single files', function (done: () => void) {
 		this.timeout(testTimeout);
 		let engine = new FileSearchEngine({
@@ -675,9 +630,9 @@ suite('FileSearchEngine', () => {
 		let engine = new FileSearchEngine({
 			folderQueries: [],
 			extraFiles: [
-				path.normalize(path.join(require.toUrl('./fixtures'), 'site.css')),
-				path.normalize(path.join(require.toUrl('./fixtures'), 'examples', 'company.js')),
-				path.normalize(path.join(require.toUrl('./fixtures'), 'index.html'))
+				path.normalize(path.join(getPathFromAmdModule(require, './fixtures'), 'site.css')),
+				path.normalize(path.join(getPathFromAmdModule(require, './fixtures'), 'examples', 'company.js')),
+				path.normalize(path.join(getPathFromAmdModule(require, './fixtures'), 'index.html'))
 			],
 			filePattern: '*.js'
 		});
@@ -702,9 +657,9 @@ suite('FileSearchEngine', () => {
 		let engine = new FileSearchEngine({
 			folderQueries: [],
 			extraFiles: [
-				path.normalize(path.join(require.toUrl('./fixtures'), 'site.css')),
-				path.normalize(path.join(require.toUrl('./fixtures'), 'examples', 'company.js')),
-				path.normalize(path.join(require.toUrl('./fixtures'), 'index.html'))
+				path.normalize(path.join(getPathFromAmdModule(require, './fixtures'), 'site.css')),
+				path.normalize(path.join(getPathFromAmdModule(require, './fixtures'), 'examples', 'company.js')),
+				path.normalize(path.join(getPathFromAmdModule(require, './fixtures'), 'index.html'))
 			],
 			filePattern: '*.*',
 			includePattern: { '**/*.css': true }
@@ -730,9 +685,9 @@ suite('FileSearchEngine', () => {
 		let engine = new FileSearchEngine({
 			folderQueries: [],
 			extraFiles: [
-				path.normalize(path.join(require.toUrl('./fixtures'), 'site.css')),
-				path.normalize(path.join(require.toUrl('./fixtures'), 'examples', 'company.js')),
-				path.normalize(path.join(require.toUrl('./fixtures'), 'index.html'))
+				path.normalize(path.join(getPathFromAmdModule(require, './fixtures'), 'site.css')),
+				path.normalize(path.join(getPathFromAmdModule(require, './fixtures'), 'examples', 'company.js')),
+				path.normalize(path.join(getPathFromAmdModule(require, './fixtures'), 'index.html'))
 			],
 			filePattern: '*.*',
 			excludePattern: { '**/*.css': true }
@@ -988,4 +943,4 @@ suite('FileWalker', () => {
 		const lines = stdout.split('\n');
 		return files.every(file => lines.indexOf(file) >= 0);
 	}
-});
\ No newline at end of file
+});
diff --git a/src/vs/workbench/services/search/test/node/searchService.test.ts b/src/vs/workbench/services/search/test/node/searchService.test.ts
index 5d33088e881..37264624d97 100644
--- a/src/vs/workbench/services/search/test/node/searchService.test.ts
+++ b/src/vs/workbench/services/search/test/node/searchService.test.ts
@@ -7,29 +7,28 @@
 
 import * as assert from 'assert';
 import * as path from 'path';
-
-import { IProgress, IUncachedSearchStats } from 'vs/platform/search/common/search';
-import { ISearchEngine, IRawSearch, IRawFileMatch, ISerializedFileMatch, ISerializedSearchComplete, IFolderSearch } from 'vs/workbench/services/search/node/search';
+import { getPathFromAmdModule } from 'vs/base/common/amd';
+import { CancelablePromise, createCancelablePromise } from 'vs/base/common/async';
+import { Emitter, Event } from 'vs/base/common/event';
+import { IProgress, ISearchEngineStats, IFileSearchStats } from 'vs/platform/search/common/search';
 import { SearchService as RawSearchService } from 'vs/workbench/services/search/node/rawSearchService';
+import { IFolderSearch, IRawFileMatch, IRawSearch, ISearchEngine, ISerializedFileMatch, ISerializedSearchComplete, ISerializedSearchProgressItem, ISerializedSearchSuccess, ISearchEngineSuccess } from 'vs/workbench/services/search/node/search';
 import { DiskSearch } from 'vs/workbench/services/search/node/searchService';
 
 const TEST_FOLDER_QUERIES = [
 	{ folder: path.normalize('/some/where') }
 ];
 
-const TEST_FIXTURES = path.normalize(require.toUrl('./fixtures'));
+const TEST_FIXTURES = path.normalize(getPathFromAmdModule(require, './fixtures'));
 const MULTIROOT_QUERIES: IFolderSearch[] = [
 	{ folder: path.join(TEST_FIXTURES, 'examples') },
 	{ folder: path.join(TEST_FIXTURES, 'more') }
 ];
 
-const stats: IUncachedSearchStats = {
-	fromCache: false,
-	resultCount: 4,
+const stats: ISearchEngineStats = {
 	traversal: 'node',
-	errors: [],
-	fileWalkStartTime: 0,
-	fileWalkResultTime: 1,
+	fileWalkTime: 0,
+	cmdTime: 1,
 	directoriesWalked: 2,
 	filesWalked: 3
 };
@@ -44,7 +43,7 @@ class TestSearchEngine implements ISearchEngine<IRawFileMatch> {
 		TestSearchEngine.last = this;
 	}
 
-	public search(onResult: (match: IRawFileMatch) => void, onProgress: (progress: IProgress) => void, done: (error: Error, complete: ISerializedSearchComplete) => void): void {
+	public search(onResult: (match: IRawFileMatch) => void, onProgress: (progress: IProgress) => void, done: (error: Error, complete: ISearchEngineSuccess) => void): void {
 		const self = this;
 		(function next() {
 			process.nextTick(() => {
@@ -101,17 +100,17 @@ suite('SearchService', () => {
 		const service = new RawSearchService();
 
 		let results = 0;
-		return service.doFileSearch(Engine, rawSearch)
-			.then(() => {
-				assert.strictEqual(results, 5);
-			}, null, value => {
-				if (!Array.isArray(value)) {
-					assert.deepStrictEqual(value, match);
-					results++;
-				} else {
-					assert.fail(JSON.stringify(value));
-				}
-			});
+		const cb: (p: ISerializedSearchProgressItem) => void = value => {
+			if (!Array.isArray(value)) {
+				assert.deepStrictEqual(value, match);
+				results++;
+			} else {
+				assert.fail(JSON.stringify(value));
+			}
+		};
+
+		return service.doFileSearch(Engine, rawSearch, cb)
+			.then(() => assert.strictEqual(results, 5));
 	});
 
 	test('Batch results', function () {
@@ -121,19 +120,20 @@ suite('SearchService', () => {
 		const service = new RawSearchService();
 
 		const results = [];
-		return service.doFileSearch(Engine, rawSearch, 10)
-			.then(() => {
-				assert.deepStrictEqual(results, [10, 10, 5]);
-			}, null, value => {
-				if (Array.isArray(value)) {
-					value.forEach(m => {
-						assert.deepStrictEqual(m, match);
-					});
-					results.push(value.length);
-				} else {
-					assert.fail(JSON.stringify(value));
-				}
-			});
+		const cb: (p: ISerializedSearchProgressItem) => void = value => {
+			if (Array.isArray(value)) {
+				value.forEach(m => {
+					assert.deepStrictEqual(m, match);
+				});
+				results.push(value.length);
+			} else {
+				assert.fail(JSON.stringify(value));
+			}
+		};
+
+		return service.doFileSearch(Engine, rawSearch, cb, undefined, 10).then(() => {
+			assert.deepStrictEqual(results, [10, 10, 5]);
+		});
 	});
 
 	test('Collect batched results', function () {
@@ -143,14 +143,32 @@ suite('SearchService', () => {
 		const Engine = TestSearchEngine.bind(null, () => i-- && rawMatch);
 		const service = new RawSearchService();
 
+		function fileSearch(config: IRawSearch, batchSize: number): Event<ISerializedSearchProgressItem | ISerializedSearchComplete> {
+			let promise: CancelablePromise<ISerializedSearchSuccess>;
+
+			const emitter = new Emitter<ISerializedSearchProgressItem | ISerializedSearchComplete>({
+				onFirstListenerAdd: () => {
+					promise = createCancelablePromise(token => service.doFileSearch(Engine, config, p => emitter.fire(p), token, batchSize)
+						.then(c => emitter.fire(c), err => emitter.fire({ type: 'error', error: err })));
+				},
+				onLastListenerRemove: () => {
+					promise.cancel();
+				}
+			});
+
+			return emitter.event;
+		}
+
 		const progressResults = [];
-		return DiskSearch.collectResults(service.doFileSearch(Engine, rawSearch, 10))
+		const onProgress = match => {
+			assert.strictEqual(match.resource.path, uriPath);
+			progressResults.push(match);
+		};
+
+		return DiskSearch.collectResultsFromEvent(fileSearch(rawSearch, 10), onProgress)
 			.then(result => {
 				assert.strictEqual(result.results.length, 25, 'Result');
 				assert.strictEqual(progressResults.length, 25, 'Progress');
-			}, null, match => {
-				assert.strictEqual(match.resource.path, uriPath);
-				progressResults.push(match);
 			});
 	});
 
@@ -167,7 +185,7 @@ suite('SearchService', () => {
 			},
 		};
 
-		return DiskSearch.collectResults(service.fileSearch(query))
+		return DiskSearch.collectResultsFromEvent(service.fileSearch(query))
 			.then(result => {
 				assert.strictEqual(result.results.length, 1, 'Result');
 			});
@@ -186,7 +204,7 @@ suite('SearchService', () => {
 			},
 		};
 
-		return DiskSearch.collectResults(service.fileSearch(query))
+		return DiskSearch.collectResultsFromEvent(service.fileSearch(query))
 			.then(result => {
 				assert.strictEqual(result.results.length, 0, 'Result');
 				assert.ok(result.limitHit);
@@ -206,20 +224,22 @@ suite('SearchService', () => {
 		const service = new RawSearchService();
 
 		const results = [];
-		return service.doFileSearch(Engine, {
-			folderQueries: TEST_FOLDER_QUERIES,
-			filePattern: 'bb',
-			sortByScore: true,
-			maxResults: 2
-		}, 1).then(() => {
-			assert.notStrictEqual(typeof TestSearchEngine.last.config.maxResults, 'number');
-			assert.deepStrictEqual(results, [path.normalize('/some/where/bbc'), path.normalize('/some/where/bab')]);
-		}, null, value => {
+		const cb = value => {
 			if (Array.isArray(value)) {
 				results.push(...value.map(v => v.path));
 			} else {
 				assert.fail(JSON.stringify(value));
 			}
+		};
+
+		return service.doFileSearch(Engine, {
+			folderQueries: TEST_FOLDER_QUERIES,
+			filePattern: 'bb',
+			sortByScore: true,
+			maxResults: 2
+		}, cb, undefined, 1).then(() => {
+			assert.notStrictEqual(typeof TestSearchEngine.last.config.maxResults, 'number');
+			assert.deepStrictEqual(results, [path.normalize('/some/where/bbc'), path.normalize('/some/where/bab')]);
 		});
 	});
 
@@ -230,23 +250,24 @@ suite('SearchService', () => {
 		const service = new RawSearchService();
 
 		const results = [];
+		const cb = value => {
+			if (Array.isArray(value)) {
+				value.forEach(m => {
+					assert.deepStrictEqual(m, match);
+				});
+				results.push(value.length);
+			} else {
+				assert.fail(JSON.stringify(value));
+			}
+		};
 		return service.doFileSearch(Engine, {
 			folderQueries: TEST_FOLDER_QUERIES,
 			filePattern: 'a',
 			sortByScore: true,
 			maxResults: 23
-		}, 10)
+		}, cb, undefined, 10)
 			.then(() => {
 				assert.deepStrictEqual(results, [10, 10, 3]);
-			}, null, value => {
-				if (Array.isArray(value)) {
-					value.forEach(m => {
-						assert.deepStrictEqual(m, match);
-					});
-					results.push(value.length);
-				} else {
-					assert.fail(JSON.stringify(value));
-				}
 			});
 	});
 
@@ -263,37 +284,39 @@ suite('SearchService', () => {
 		const service = new RawSearchService();
 
 		const results = [];
-		return service.doFileSearch(Engine, {
-			folderQueries: TEST_FOLDER_QUERIES,
-			filePattern: 'b',
-			sortByScore: true,
-			cacheKey: 'x'
-		}, -1).then(complete => {
-			assert.strictEqual(complete.stats.fromCache, false);
-			assert.deepStrictEqual(results, [path.normalize('/some/where/bcb'), path.normalize('/some/where/bbc'), path.normalize('/some/where/aab')]);
-		}, null, value => {
+		const cb = value => {
 			if (Array.isArray(value)) {
 				results.push(...value.map(v => v.path));
 			} else {
 				assert.fail(JSON.stringify(value));
 			}
+		};
+		return service.doFileSearch(Engine, {
+			folderQueries: TEST_FOLDER_QUERIES,
+			filePattern: 'b',
+			sortByScore: true,
+			cacheKey: 'x'
+		}, cb, undefined, -1).then(complete => {
+			assert.strictEqual((<IFileSearchStats>complete.stats).fromCache, false);
+			assert.deepStrictEqual(results, [path.normalize('/some/where/bcb'), path.normalize('/some/where/bbc'), path.normalize('/some/where/aab')]);
 		}).then(() => {
 			const results = [];
-			return service.doFileSearch(Engine, {
-				folderQueries: TEST_FOLDER_QUERIES,
-				filePattern: 'bc',
-				sortByScore: true,
-				cacheKey: 'x'
-			}, -1).then(complete => {
-				assert.ok(complete.stats.fromCache);
-				assert.deepStrictEqual(results, [path.normalize('/some/where/bcb'), path.normalize('/some/where/bbc')]);
-			}, null, value => {
+			const cb = value => {
 				if (Array.isArray(value)) {
 					results.push(...value.map(v => v.path));
 				} else {
 					assert.fail(JSON.stringify(value));
 				}
-			});
+			};
+			return service.doFileSearch(Engine, {
+				folderQueries: TEST_FOLDER_QUERIES,
+				filePattern: 'bc',
+				sortByScore: true,
+				cacheKey: 'x'
+			}, cb, undefined, -1).then(complete => {
+				assert.ok((<IFileSearchStats>complete.stats).fromCache);
+				assert.deepStrictEqual(results, [path.normalize('/some/where/bcb'), path.normalize('/some/where/bbc')]);
+			}, null);
 		}).then(() => {
 			return service.clearCache('x');
 		}).then(() => {
@@ -304,21 +327,22 @@ suite('SearchService', () => {
 				size: 3
 			});
 			const results = [];
-			return service.doFileSearch(Engine, {
-				folderQueries: TEST_FOLDER_QUERIES,
-				filePattern: 'bc',
-				sortByScore: true,
-				cacheKey: 'x'
-			}, -1).then(complete => {
-				assert.strictEqual(complete.stats.fromCache, false);
-				assert.deepStrictEqual(results, [path.normalize('/some/where/bc')]);
-			}, null, value => {
+			const cb = value => {
 				if (Array.isArray(value)) {
 					results.push(...value.map(v => v.path));
 				} else {
 					assert.fail(JSON.stringify(value));
 				}
+			};
+			return service.doFileSearch(Engine, {
+				folderQueries: TEST_FOLDER_QUERIES,
+				filePattern: 'bc',
+				sortByScore: true,
+				cacheKey: 'x'
+			}, cb, undefined, -1).then(complete => {
+				assert.strictEqual((<IFileSearchStats>complete.stats).fromCache, false);
+				assert.deepStrictEqual(results, [path.normalize('/some/where/bc')]);
 			});
 		});
 	});
-});
\ No newline at end of file
+});
diff --git a/src/vs/workbench/services/search/test/node/textSearch.integrationTest.ts b/src/vs/workbench/services/search/test/node/textSearch.integrationTest.ts
index 93a86a86b12..21484acb566 100644
--- a/src/vs/workbench/services/search/test/node/textSearch.integrationTest.ts
+++ b/src/vs/workbench/services/search/test/node/textSearch.integrationTest.ts
@@ -15,12 +15,13 @@ import { ISerializedFileMatch, IRawSearch, IFolderSearch } from 'vs/workbench/se
 import { Engine as TextSearchEngine } from 'vs/workbench/services/search/node/textSearch';
 import { RipgrepEngine } from 'vs/workbench/services/search/node/ripgrepTextSearch';
 import { TextSearchWorkerProvider } from 'vs/workbench/services/search/node/textSearchWorkerProvider';
+import { getPathFromAmdModule } from 'vs/base/common/amd';
 
 function countAll(matches: ISerializedFileMatch[]): number {
 	return matches.reduce((acc, m) => acc + m.numMatches, 0);
 }
 
-const TEST_FIXTURES = path.normalize(require.toUrl('./fixtures'));
+const TEST_FIXTURES = path.normalize(getPathFromAmdModule(require, './fixtures'));
 const EXAMPLES_FIXTURES = path.join(TEST_FIXTURES, 'examples');
 const MORE_FIXTURES = path.join(TEST_FIXTURES, 'more');
 const TEST_ROOT_FOLDER: IFolderSearch = { folder: TEST_FIXTURES };
diff --git a/src/vs/workbench/services/textMate/electron-browser/TMSyntax.ts b/src/vs/workbench/services/textMate/electron-browser/TMSyntax.ts
index 59013467db6..0294ecefead 100644
--- a/src/vs/workbench/services/textMate/electron-browser/TMSyntax.ts
+++ b/src/vs/workbench/services/textMate/electron-browser/TMSyntax.ts
@@ -7,8 +7,8 @@
 import * as nls from 'vs/nls';
 import * as dom from 'vs/base/browser/dom';
 import * as types from 'vs/base/common/types';
+import * as resources from 'vs/base/common/resources';
 import { Event, Emitter } from 'vs/base/common/event';
-import { join, normalize } from 'path';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { onUnexpectedError } from 'vs/base/common/errors';
 import { ExtensionMessageCollector } from 'vs/workbench/services/extensions/common/extensionsRegistry';
@@ -22,7 +22,10 @@ import { TokenizationResult, TokenizationResult2 } from 'vs/editor/common/core/t
 import { nullTokenize2 } from 'vs/editor/common/modes/nullMode';
 import { generateTokensCSSForColorMap } from 'vs/editor/common/modes/supports/tokenization';
 import { Color } from 'vs/base/common/color';
-import URI from 'vs/base/common/uri';
+import { INotificationService } from 'vs/platform/notification/common/notification';
+import { URI } from 'vs/base/common/uri';
+import { IFileService } from 'vs/platform/files/common/files';
+import { ILogService } from 'vs/platform/log/common/log';
 
 export class TMScopeRegistry {
 
@@ -37,27 +40,27 @@ export class TMScopeRegistry {
 		this._encounteredLanguages = [];
 	}
 
-	public register(scopeName: string, filePath: string, embeddedLanguages?: IEmbeddedLanguagesMap, tokenTypes?: TokenTypesContribution): void {
+	public register(scopeName: string, grammarLocation: URI, embeddedLanguages?: IEmbeddedLanguagesMap, tokenTypes?: TokenTypesContribution): void {
 		if (this._scopeNameToLanguageRegistration[scopeName]) {
 			const existingRegistration = this._scopeNameToLanguageRegistration[scopeName];
-			if (existingRegistration.grammarFilePath !== filePath) {
+			if (!resources.isEqual(existingRegistration.grammarLocation, grammarLocation)) {
 				console.warn(
 					`Overwriting grammar scope name to file mapping for scope ${scopeName}.\n` +
-					`Old grammar file: ${existingRegistration.grammarFilePath}.\n` +
-					`New grammar file: ${filePath}`
+					`Old grammar file: ${existingRegistration.grammarLocation.toString()}.\n` +
+					`New grammar file: ${grammarLocation.toString()}`
 				);
 			}
 		}
-		this._scopeNameToLanguageRegistration[scopeName] = new TMLanguageRegistration(scopeName, filePath, embeddedLanguages, tokenTypes);
+		this._scopeNameToLanguageRegistration[scopeName] = new TMLanguageRegistration(scopeName, grammarLocation, embeddedLanguages, tokenTypes);
 	}
 
 	public getLanguageRegistration(scopeName: string): TMLanguageRegistration {
 		return this._scopeNameToLanguageRegistration[scopeName] || null;
 	}
 
-	public getFilePath(scopeName: string): string {
+	public getGrammarLocation(scopeName: string): URI {
 		let data = this.getLanguageRegistration(scopeName);
-		return data ? data.grammarFilePath : null;
+		return data ? data.grammarLocation : null;
 	}
 
 	/**
@@ -75,13 +78,13 @@ export class TMLanguageRegistration {
 	_topLevelScopeNameDataBrand: void;
 
 	readonly scopeName: string;
-	readonly grammarFilePath: string;
+	readonly grammarLocation: URI;
 	readonly embeddedLanguages: IEmbeddedLanguagesMap;
 	readonly tokenTypes: ITokenTypeMap;
 
-	constructor(scopeName: string, grammarFilePath: string, embeddedLanguages: IEmbeddedLanguagesMap, tokenTypes: TokenTypesContribution | undefined) {
+	constructor(scopeName: string, grammarLocation: URI, embeddedLanguages: IEmbeddedLanguagesMap, tokenTypes: TokenTypesContribution | undefined) {
 		this.scopeName = scopeName;
-		this.grammarFilePath = grammarFilePath;
+		this.grammarLocation = grammarLocation;
 
 		// embeddedLanguages handling
 		this.embeddedLanguages = Object.create(null);
@@ -136,9 +139,12 @@ export class TextMateService implements ITextMateService {
 	private _grammarRegistry: TPromise<[Registry, StackElement]>;
 	private _modeService: IModeService;
 	private _themeService: IWorkbenchThemeService;
+	private _fileService: IFileService;
+	private _logService: ILogService;
 	private _scopeRegistry: TMScopeRegistry;
 	private _injections: { [scopeName: string]: string[]; };
 	private _injectedEmbeddedLanguages: { [scopeName: string]: IEmbeddedLanguagesMap[]; };
+	private _notificationService: INotificationService;
 
 	private _languageToScope: Map<string, string>;
 	private _styleElement: HTMLStyleElement;
@@ -149,17 +155,23 @@ export class TextMateService implements ITextMateService {
 
 	constructor(
 		@IModeService modeService: IModeService,
-		@IWorkbenchThemeService themeService: IWorkbenchThemeService
+		@IWorkbenchThemeService themeService: IWorkbenchThemeService,
+		@IFileService fileService: IFileService,
+		@INotificationService notificationService: INotificationService,
+		@ILogService logService: ILogService
 	) {
 		this._styleElement = dom.createStyleSheet();
 		this._styleElement.className = 'vscode-tokens-styles';
 		this._modeService = modeService;
 		this._themeService = themeService;
+		this._fileService = fileService;
+		this._logService = logService;
 		this._scopeRegistry = new TMScopeRegistry();
 		this.onDidEncounterLanguage = this._scopeRegistry.onDidEncounterLanguage;
 		this._injections = {};
 		this._injectedEmbeddedLanguages = {};
 		this._languageToScope = new Map<string, string>();
+		this._notificationService = notificationService;
 
 		this._grammarRegistry = null;
 
@@ -199,10 +211,20 @@ export class TextMateService implements ITextMateService {
 
 	private _getOrCreateGrammarRegistry(): TPromise<[Registry, StackElement]> {
 		if (!this._grammarRegistry) {
-			this._grammarRegistry = TPromise.wrap(import('vscode-textmate')).then(({ Registry, INITIAL }) => {
+			this._grammarRegistry = TPromise.wrap(import('vscode-textmate')).then(({ Registry, INITIAL, parseRawGrammar }) => {
 				const grammarRegistry = new Registry({
-					getFilePath: (scopeName: string) => {
-						return this._scopeRegistry.getFilePath(scopeName);
+					loadGrammar: (scopeName: string) => {
+						const location = this._scopeRegistry.getGrammarLocation(scopeName);
+						if (!location) {
+							this._logService.trace(`No grammar found for scope ${scopeName}`);
+							return null;
+						}
+						return this._fileService.resolveContent(location, { encoding: 'utf8' }).then(content => {
+							return parseRawGrammar(content.value, location.path);
+						}, e => {
+							this._logService.error(`Unable to load and parse grammar for scope ${scopeName} from ${location}`, e);
+							return null;
+						});
 					},
 					getInjections: (scopeName: string) => {
 						return this._injections[scopeName];
@@ -290,14 +312,12 @@ export class TextMateService implements ITextMateService {
 			return;
 		}
 
-		//TODO@extensionLocation
-		let normalizedAbsolutePath = normalize(join(extensionLocation.fsPath, syntax.path));
-
-		if (normalizedAbsolutePath.indexOf(extensionLocation.fsPath) !== 0) {
-			collector.warn(nls.localize('invalid.path.1', "Expected `contributes.{0}.path` ({1}) to be included inside extension's folder ({2}). This might make the extension non-portable.", grammarsExtPoint.name, normalizedAbsolutePath, extensionLocation.fsPath));
+		const grammarLocation = resources.joinPath(extensionLocation, syntax.path);
+		if (!resources.isEqualOrParent(grammarLocation, extensionLocation)) {
+			collector.warn(nls.localize('invalid.path.1', "Expected `contributes.{0}.path` ({1}) to be included inside extension's folder ({2}). This might make the extension non-portable.", grammarsExtPoint.name, grammarLocation.path, extensionLocation.path));
 		}
 
-		this._scopeRegistry.register(syntax.scopeName, normalizedAbsolutePath, syntax.embeddedLanguages, syntax.tokenTypes);
+		this._scopeRegistry.register(syntax.scopeName, grammarLocation, syntax.embeddedLanguages, syntax.tokenTypes);
 
 		if (syntax.injectTo) {
 			for (let injectScope of syntax.injectTo) {
@@ -365,25 +385,20 @@ export class TextMateService implements ITextMateService {
 		let containsEmbeddedLanguages = (Object.keys(embeddedLanguages).length > 0);
 		return this._getOrCreateGrammarRegistry().then((_res) => {
 			const [grammarRegistry, initialState] = _res;
-			return new TPromise<ICreateGrammarResult>((c, e, p) => {
-				grammarRegistry.loadGrammarWithConfiguration(scopeName, languageId, { embeddedLanguages, tokenTypes: languageRegistration.tokenTypes }, (err, grammar) => {
-					if (err) {
-						return e(err);
-					}
-					c({
-						languageId: languageId,
-						grammar: grammar,
-						initialState: initialState,
-						containsEmbeddedLanguages: containsEmbeddedLanguages
-					});
-				});
+			return grammarRegistry.loadGrammarWithConfiguration(scopeName, languageId, { embeddedLanguages, tokenTypes: languageRegistration.tokenTypes }).then(grammar => {
+				return {
+					languageId: languageId,
+					grammar: grammar,
+					initialState: initialState,
+					containsEmbeddedLanguages: containsEmbeddedLanguages
+				};
 			});
 		});
 	}
 
 	private registerDefinition(modeId: string): void {
 		this._createGrammar(modeId).then((r) => {
-			TokenizationRegistry.register(modeId, new TMTokenization(this._scopeRegistry, r.languageId, r.grammar, r.initialState, r.containsEmbeddedLanguages));
+			TokenizationRegistry.register(modeId, new TMTokenization(this._scopeRegistry, r.languageId, r.grammar, r.initialState, r.containsEmbeddedLanguages, this._notificationService));
 		}, onUnexpectedError);
 	}
 }
@@ -396,8 +411,9 @@ class TMTokenization implements ITokenizationSupport {
 	private readonly _containsEmbeddedLanguages: boolean;
 	private readonly _seenLanguages: boolean[];
 	private readonly _initialState: StackElement;
+	private _tokenizationWarningAlreadyShown: boolean;
 
-	constructor(scopeRegistry: TMScopeRegistry, languageId: LanguageId, grammar: IGrammar, initialState: StackElement, containsEmbeddedLanguages: boolean) {
+	constructor(scopeRegistry: TMScopeRegistry, languageId: LanguageId, grammar: IGrammar, initialState: StackElement, containsEmbeddedLanguages: boolean, @INotificationService private notificationService: INotificationService) {
 		this._scopeRegistry = scopeRegistry;
 		this._languageId = languageId;
 		this._grammar = grammar;
@@ -421,6 +437,10 @@ class TMTokenization implements ITokenizationSupport {
 
 		// Do not attempt to tokenize if a line has over 20k
 		if (line.length >= 20000) {
+			if (!this._tokenizationWarningAlreadyShown) {
+				this._tokenizationWarningAlreadyShown = true;
+				this.notificationService.warn(nls.localize('too many characters', "Tokenization is skipped for lines longer than 20k characters for performance reasons."));
+			}
 			console.log(`Line (${line.substr(0, 15)}...): longer than 20k characters, tokenization skipped.`);
 			return nullTokenize2(this._languageId, line, state, offsetDelta);
 		}
diff --git a/src/vs/workbench/services/textfile/common/textFileEditorModel.ts b/src/vs/workbench/services/textfile/common/textFileEditorModel.ts
index a625dbdba08..5e727d770c4 100644
--- a/src/vs/workbench/services/textfile/common/textFileEditorModel.ts
+++ b/src/vs/workbench/services/textfile/common/textFileEditorModel.ts
@@ -8,17 +8,14 @@ import * as path from 'vs/base/common/paths';
 import * as nls from 'vs/nls';
 import { Event, Emitter } from 'vs/base/common/event';
 import { TPromise, TValueCallback, ErrorCallback } from 'vs/base/common/winjs.base';
-import { onUnexpectedError } from 'vs/base/common/errors';
 import { guessMimeTypes } from 'vs/base/common/mime';
 import { toErrorMessage } from 'vs/base/common/errorMessage';
-import URI from 'vs/base/common/uri';
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
-import * as diagnostics from 'vs/base/common/diagnostics';
-import * as types from 'vs/base/common/types';
+import { URI } from 'vs/base/common/uri';
+import { isUndefinedOrNull } from 'vs/base/common/types';
 import { IMode } from 'vs/editor/common/modes';
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { ITextFileService, IAutoSaveConfiguration, ModelState, ITextFileEditorModel, ISaveOptions, ISaveErrorHandler, ISaveParticipant, StateChange, SaveReason, IRawTextContent, ILoadOptions } from 'vs/workbench/services/textfile/common/textfiles';
+import { ITextFileService, IAutoSaveConfiguration, ModelState, ITextFileEditorModel, ISaveOptions, ISaveErrorHandler, ISaveParticipant, StateChange, SaveReason, IRawTextContent, ILoadOptions, LoadReason } from 'vs/workbench/services/textfile/common/textfiles';
 import { EncodingMode } from 'vs/workbench/common/editor';
 import { BaseTextEditorModel } from 'vs/workbench/common/editor/textEditorModel';
 import { IBackupFileService } from 'vs/workbench/services/backup/common/backup';
@@ -27,23 +24,37 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti
 import { IModeService } from 'vs/editor/common/services/modeService';
 import { IModelService } from 'vs/editor/common/services/modelService';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { RunOnceScheduler } from 'vs/base/common/async';
+import { RunOnceScheduler, timeout } from 'vs/base/common/async';
 import { ITextBufferFactory } from 'vs/editor/common/model';
 import { IHashService } from 'vs/workbench/services/hash/common/hashService';
 import { createTextBufferFactory } from 'vs/editor/common/model/textModel';
 import { INotificationService } from 'vs/platform/notification/common/notification';
 import { isLinux } from 'vs/base/common/platform';
+import { IDisposable, toDisposable } from 'vs/base/common/lifecycle';
+import { ILogService } from 'vs/platform/log/common/log';
+import { isEqual, isEqualOrParent } from 'vs/base/common/resources';
 
 /**
  * The text file editor model listens to changes to its underlying code editor model and saves these changes through the file service back to the disk.
  */
 export class TextFileEditorModel extends BaseTextEditorModel implements ITextFileEditorModel {
 
-	public static DEFAULT_CONTENT_CHANGE_BUFFER_DELAY = CONTENT_CHANGE_EVENT_BUFFER_DELAY;
-	public static DEFAULT_ORPHANED_CHANGE_BUFFER_DELAY = 100;
+	static DEFAULT_CONTENT_CHANGE_BUFFER_DELAY = CONTENT_CHANGE_EVENT_BUFFER_DELAY;
+	static DEFAULT_ORPHANED_CHANGE_BUFFER_DELAY = 100;
+	static WHITELIST_JSON = ['package.json', 'package-lock.json', 'tsconfig.json', 'jsconfig.json', 'bower.json', '.eslintrc.json', 'tslint.json', 'composer.json'];
+	static WHITELIST_WORKSPACE_JSON = ['settings.json', 'extensions.json', 'tasks.json', 'launch.json'];
 
 	private static saveErrorHandler: ISaveErrorHandler;
+	static setSaveErrorHandler(handler: ISaveErrorHandler): void { TextFileEditorModel.saveErrorHandler = handler; }
+
 	private static saveParticipant: ISaveParticipant;
+	static setSaveParticipant(handler: ISaveParticipant): void { TextFileEditorModel.saveParticipant = handler; }
+
+	private readonly _onDidContentChange: Emitter<StateChange> = this._register(new Emitter<StateChange>());
+	get onDidContentChange(): Event<StateChange> { return this._onDidContentChange.event; }
+
+	private readonly _onDidStateChange: Emitter<StateChange> = this._register(new Emitter<StateChange>());
+	get onDidStateChange(): Event<StateChange> { return this._onDidStateChange.event; }
 
 	private resource: URI;
 	private contentEncoding: string; 			// encoding as reported from disk
@@ -52,20 +63,16 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 	private versionId: number;
 	private bufferSavedVersionId: number;
 	private lastResolvedDiskStat: IFileStat;
-	private toDispose: IDisposable[];
 	private blockModelContentChange: boolean;
 	private autoSaveAfterMillies: number;
 	private autoSaveAfterMilliesEnabled: boolean;
-	private autoSavePromise: TPromise<void>;
+	private autoSaveDisposable: IDisposable;
 	private contentChangeEventScheduler: RunOnceScheduler;
 	private orphanedChangeEventScheduler: RunOnceScheduler;
 	private saveSequentializer: SaveSequentializer;
 	private disposed: boolean;
 	private lastSaveAttemptTime: number;
 	private createTextEditorModelPromise: TPromise<TextFileEditorModel>;
-	private readonly _onDidContentChange: Emitter<StateChange>;
-	private readonly _onDidStateChange: Emitter<StateChange>;
-
 	private inConflictMode: boolean;
 	private inOrphanMode: boolean;
 	private inErrorMode: boolean;
@@ -83,15 +90,12 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 		@IBackupFileService private backupFileService: IBackupFileService,
 		@IEnvironmentService private environmentService: IEnvironmentService,
 		@IWorkspaceContextService private contextService: IWorkspaceContextService,
-		@IHashService private hashService: IHashService
+		@IHashService private hashService: IHashService,
+		@ILogService private logService: ILogService
 	) {
 		super(modelService, modeService);
+
 		this.resource = resource;
-		this.toDispose = [];
-		this._onDidContentChange = new Emitter<StateChange>();
-		this._onDidStateChange = new Emitter<StateChange>();
-		this.toDispose.push(this._onDidContentChange);
-		this.toDispose.push(this._onDidStateChange);
 		this.preferredEncoding = preferredEncoding;
 		this.inOrphanMode = false;
 		this.dirty = false;
@@ -99,11 +103,8 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 		this.lastSaveAttemptTime = 0;
 		this.saveSequentializer = new SaveSequentializer();
 
-		this.contentChangeEventScheduler = new RunOnceScheduler(() => this._onDidContentChange.fire(StateChange.CONTENT_CHANGE), TextFileEditorModel.DEFAULT_CONTENT_CHANGE_BUFFER_DELAY);
-		this.toDispose.push(this.contentChangeEventScheduler);
-
-		this.orphanedChangeEventScheduler = new RunOnceScheduler(() => this._onDidStateChange.fire(StateChange.ORPHANED_CHANGE), TextFileEditorModel.DEFAULT_ORPHANED_CHANGE_BUFFER_DELAY);
-		this.toDispose.push(this.orphanedChangeEventScheduler);
+		this.contentChangeEventScheduler = this._register(new RunOnceScheduler(() => this._onDidContentChange.fire(StateChange.CONTENT_CHANGE), TextFileEditorModel.DEFAULT_CONTENT_CHANGE_BUFFER_DELAY));
+		this.orphanedChangeEventScheduler = this._register(new RunOnceScheduler(() => this._onDidStateChange.fire(StateChange.ORPHANED_CHANGE), TextFileEditorModel.DEFAULT_ORPHANED_CHANGE_BUFFER_DELAY));
 
 		this.updateAutoSaveConfiguration(textFileService.getAutoSaveConfiguration());
 
@@ -111,10 +112,10 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 	}
 
 	private registerListeners(): void {
-		this.toDispose.push(this.fileService.onFileChanges(e => this.onFileChanges(e)));
-		this.toDispose.push(this.textFileService.onAutoSaveConfigurationChange(config => this.updateAutoSaveConfiguration(config)));
-		this.toDispose.push(this.textFileService.onFilesAssociationChange(e => this.onFilesAssociationChange()));
-		this.toDispose.push(this.onDidStateChange(e => this.onStateChange(e)));
+		this._register(this.fileService.onFileChanges(e => this.onFileChanges(e)));
+		this._register(this.textFileService.onAutoSaveConfigurationChange(config => this.updateAutoSaveConfiguration(config)));
+		this._register(this.textFileService.onFilesAssociationChange(e => this.onFilesAssociationChange()));
+		this._register(this.onDidStateChange(e => this.onStateChange(e)));
 	}
 
 	private onStateChange(e: StateChange): void {
@@ -151,13 +152,13 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 		}
 
 		if (fileEventImpactsModel && this.inOrphanMode !== newInOrphanModeGuess) {
-			let checkOrphanedPromise: TPromise<boolean>;
+			let checkOrphanedPromise: Thenable<boolean>;
 			if (newInOrphanModeGuess) {
 				// We have received reports of users seeing delete events even though the file still
 				// exists (network shares issue: https://github.com/Microsoft/vscode/issues/13665).
 				// Since we do not want to mark the model as orphaned, we have to check if the
 				// file is really gone and not just a faulty file event.
-				checkOrphanedPromise = TPromise.timeout(100).then(() => {
+				checkOrphanedPromise = timeout(100).then(() => {
 					if (this.disposed) {
 						return true;
 					}
@@ -165,10 +166,10 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 					return this.fileService.existsFile(this.resource).then(exists => !exists);
 				});
 			} else {
-				checkOrphanedPromise = TPromise.as(false);
+				checkOrphanedPromise = Promise.resolve(false);
 			}
 
-			checkOrphanedPromise.done(newInOrphanModeValidated => {
+			checkOrphanedPromise.then(newInOrphanModeValidated => {
 				if (this.inOrphanMode !== newInOrphanModeValidated && !this.disposed) {
 					this.setOrphaned(newInOrphanModeValidated);
 				}
@@ -184,71 +185,34 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 	}
 
 	private updateAutoSaveConfiguration(config: IAutoSaveConfiguration): void {
-		if (typeof config.autoSaveDelay === 'number' && config.autoSaveDelay > 0) {
-			this.autoSaveAfterMillies = config.autoSaveDelay;
-			this.autoSaveAfterMilliesEnabled = true;
-		} else {
-			this.autoSaveAfterMillies = void 0;
-			this.autoSaveAfterMilliesEnabled = false;
-		}
+		const autoSaveAfterMilliesEnabled = (typeof config.autoSaveDelay === 'number') && config.autoSaveDelay > 0;
+
+		this.autoSaveAfterMilliesEnabled = autoSaveAfterMilliesEnabled;
+		this.autoSaveAfterMillies = autoSaveAfterMilliesEnabled ? config.autoSaveDelay : void 0;
 	}
 
 	private onFilesAssociationChange(): void {
-		this.updateTextEditorModelMode();
-	}
-
-	private updateTextEditorModelMode(modeId?: string): void {
 		if (!this.textEditorModel) {
 			return;
 		}
 
 		const firstLineText = this.getFirstLineText(this.textEditorModel);
-		const mode = this.getOrCreateMode(this.modeService, modeId, firstLineText);
+		const mode = this.getOrCreateMode(this.modeService, void 0, firstLineText);
 
 		this.modelService.setMode(this.textEditorModel, mode);
 	}
 
-	public get onDidContentChange(): Event<StateChange> {
-		return this._onDidContentChange.event;
-	}
-
-	public get onDidStateChange(): Event<StateChange> {
-		return this._onDidStateChange.event;
-	}
-
-	/**
-	 * The current version id of the model.
-	 */
-	public getVersionId(): number {
+	getVersionId(): number {
 		return this.versionId;
 	}
 
-	/**
-	 * Set a save error handler to install code that executes when save errors occur.
-	 */
-	public static setSaveErrorHandler(handler: ISaveErrorHandler): void {
-		TextFileEditorModel.saveErrorHandler = handler;
-	}
-
-	/**
-	 * Set a save participant handler to react on models getting saved.
-	 */
-	public static setSaveParticipant(handler: ISaveParticipant): void {
-		TextFileEditorModel.saveParticipant = handler;
-	}
-
-	/**
-	 * Discards any local changes and replaces the model with the contents of the version on disk.
-	 *
-	 * @param if the parameter soft is true, will not attempt to load the contents from disk.
-	 */
-	public revert(soft?: boolean): TPromise<void> {
+	revert(soft?: boolean): TPromise<void> {
 		if (!this.isResolved()) {
 			return TPromise.wrap<void>(null);
 		}
 
 		// Cancel any running auto-save
-		this.cancelAutoSavePromise();
+		this.cancelPendingAutoSave();
 
 		// Unset flags
 		const undo = this.setDirty(false);
@@ -273,28 +237,28 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 		});
 	}
 
-	public load(options?: ILoadOptions): TPromise<TextFileEditorModel> {
-		diag('load() - enter', this.resource, new Date());
+	load(options?: ILoadOptions): TPromise<TextFileEditorModel> {
+		this.logService.trace('load() - enter', this.resource);
 
-		// It is very important to not reload the model when the model is dirty. We only want to reload the model from the disk
-		// if no save is pending to avoid data loss. This might cause a save conflict in case the file has been modified on the disk
-		// meanwhile, but this is a very low risk.
+		// It is very important to not reload the model when the model is dirty.
+		// We also only want to reload the model from the disk if no save is pending
+		// to avoid data loss.
 		if (this.dirty || this.saveSequentializer.hasPendingSave()) {
-			diag('load() - exit - without loading because model is dirty or being saved', this.resource, new Date());
+			this.logService.trace('load() - exit - without loading because model is dirty or being saved', this.resource);
 
 			return TPromise.as(this);
 		}
 
 		// Only for new models we support to load from backup
 		if (!this.textEditorModel && !this.createTextEditorModelPromise) {
-			return this.loadWithBackup(options);
+			return this.loadFromBackup(options);
 		}
 
 		// Otherwise load from file resource
 		return this.loadFromFile(options);
 	}
 
-	private loadWithBackup(options?: ILoadOptions): TPromise<TextFileEditorModel> {
+	private loadFromBackup(options?: ILoadOptions): TPromise<TextFileEditorModel> {
 		return this.backupFileService.loadBackupResource(this.resource).then(backup => {
 
 			// Make sure meanwhile someone else did not suceed or start loading
@@ -310,10 +274,11 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 					mtime: Date.now(),
 					etag: void 0,
 					value: createTextBufferFactory(''), /* will be filled later from backup */
-					encoding: this.fileService.encoding.getWriteEncoding(this.resource, this.preferredEncoding)
+					encoding: this.fileService.encoding.getWriteEncoding(this.resource, this.preferredEncoding),
+					isReadonly: false
 				};
 
-				return this.loadWithContent(content, backup);
+				return this.loadWithContent(content, options, backup);
 			}
 
 			// Otherwise load from file
@@ -333,62 +298,77 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 			etag = this.lastResolvedDiskStat.etag; // otherwise respect etag to support caching
 		}
 
+		// Ensure to track the versionId before doing a long running operation
+		// to make sure the model was not changed in the meantime which would
+		// indicate that the user or program has made edits. If we would ignore
+		// this, we could potentially loose the changes that were made because
+		// after resolving the content we update the model and reset the dirty
+		// flag.
+		const currentVersionId = this.versionId;
+
 		// Resolve Content
 		return this.textFileService
 			.resolveTextContent(this.resource, { acceptTextOnly: !allowBinary, etag, encoding: this.preferredEncoding })
-			.then(content => this.handleLoadSuccess(content), error => this.handleLoadError(error));
+			.then(content => {
+
+				// Clear orphaned state when loading was successful
+				this.setOrphaned(false);
+
+				// Guard against the model having changed in the meantime
+				if (currentVersionId === this.versionId) {
+					return this.loadWithContent(content, options);
+				}
+
+				return this;
+			}, error => {
+				const result = error.fileOperationResult;
+
+				// Apply orphaned state based on error code
+				this.setOrphaned(result === FileOperationResult.FILE_NOT_FOUND);
+
+				// NotModified status is expected and can be handled gracefully
+				if (result === FileOperationResult.FILE_NOT_MODIFIED_SINCE) {
+
+					// Guard against the model having changed in the meantime
+					if (currentVersionId === this.versionId) {
+						this.setDirty(false); // Ensure we are not tracking a stale state
+					}
+
+					return TPromise.as<TextFileEditorModel>(this);
+				}
+
+				// Ignore when a model has been resolved once and the file was deleted meanwhile. Since
+				// we already have the model loaded, we can return to this state and update the orphaned
+				// flag to indicate that this model has no version on disk anymore.
+				if (this.isResolved() && result === FileOperationResult.FILE_NOT_FOUND) {
+					return TPromise.as<TextFileEditorModel>(this);
+				}
+
+				// Otherwise bubble up the error
+				return TPromise.wrapError<TextFileEditorModel>(error);
+			});
 	}
 
-	private handleLoadSuccess(content: IRawTextContent): TPromise<TextFileEditorModel> {
-
-		// Clear orphaned state when load was successful
-		this.setOrphaned(false);
-
-		return this.loadWithContent(content);
-	}
-
-	private handleLoadError(error: FileOperationError): TPromise<TextFileEditorModel> {
-		const result = error.fileOperationResult;
-
-		// Apply orphaned state based on error code
-		this.setOrphaned(result === FileOperationResult.FILE_NOT_FOUND);
-
-		// NotModified status is expected and can be handled gracefully
-		if (result === FileOperationResult.FILE_NOT_MODIFIED_SINCE) {
-			this.setDirty(false); // Ensure we are not tracking a stale state
-
-			return TPromise.as<TextFileEditorModel>(this);
-		}
-
-		// Ignore when a model has been resolved once and the file was deleted meanwhile. Since
-		// we already have the model loaded, we can return to this state and update the orphaned
-		// flag to indicate that this model has no version on disk anymore.
-		if (this.isResolved() && result === FileOperationResult.FILE_NOT_FOUND) {
-			return TPromise.as<TextFileEditorModel>(this);
-		}
-
-		// Otherwise bubble up the error
-		return TPromise.wrapError<TextFileEditorModel>(error);
-	}
-
-	private loadWithContent(content: IRawTextContent, backup?: URI): TPromise<TextFileEditorModel> {
+	private loadWithContent(content: IRawTextContent, options?: ILoadOptions, backup?: URI): TPromise<TextFileEditorModel> {
 		return this.doLoadWithContent(content, backup).then(model => {
-
 			// Telemetry: We log the fileGet telemetry event after the model has been loaded to ensure a good mimetype
-			if (this.isSettingsFile()) {
+			const settingsType = this.getTypeIfSettings();
+			if (settingsType) {
 				/* __GDPR__
-					"settingsRead" : {}
+					"settingsRead" : {
+						"settingsType": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+					}
 				*/
-				this.telemetryService.publicLog('settingsRead'); // Do not log read to user settings.json and .vscode folder as a fileGet event as it ruins our JSON usage data
+				this.telemetryService.publicLog('settingsRead', { settingsType }); // Do not log read to user settings.json and .vscode folder as a fileGet event as it ruins our JSON usage data
 			} else {
 				/* __GDPR__
 					"fileGet" : {
-						"mimeType" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-						"ext": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-						"path": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+						"${include}": [
+							"${FileTelemetryData}"
+						]
 					}
 				*/
-				this.telemetryService.publicLog('fileGet', { mimeType: guessMimeTypes(this.resource.fsPath).join(', '), ext: path.extname(this.resource.fsPath), path: this.hashService.createSHA1(this.resource.fsPath) });
+				this.telemetryService.publicLog('fileGet', this.getTelemetryData(options && options.reason ? options.reason : LoadReason.OTHER));
 			}
 
 			return model;
@@ -396,19 +376,19 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 	}
 
 	private doLoadWithContent(content: IRawTextContent, backup?: URI): TPromise<TextFileEditorModel> {
-		diag('load() - resolved content', this.resource, new Date());
+		this.logService.trace('load() - resolved content', this.resource);
 
 		// Update our resolved disk stat model
-		const resolvedStat: IFileStat = {
+		this.updateLastResolvedDiskStat({
 			resource: this.resource,
 			name: content.name,
 			mtime: content.mtime,
 			etag: content.etag,
 			isDirectory: false,
 			isSymbolicLink: false,
-			children: void 0
-		};
-		this.updateLastResolvedDiskStat(resolvedStat);
+			children: void 0,
+			isReadonly: content.isReadonly
+		} as IFileStat);
 
 		// Keep the original encoding to not loose it when saving
 		const oldEncoding = this.contentEncoding;
@@ -428,7 +408,7 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 
 		// Join an existing request to create the editor model to avoid race conditions
 		else if (this.createTextEditorModelPromise) {
-			diag('load() - join existing text editor model promise', this.resource, new Date());
+			this.logService.trace('load() - join existing text editor model promise', this.resource);
 
 			return this.createTextEditorModelPromise;
 		}
@@ -438,7 +418,7 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 	}
 
 	private doUpdateTextModel(value: ITextBufferFactory): TPromise<TextFileEditorModel> {
-		diag('load() - updated text editor model', this.resource, new Date());
+		this.logService.trace('load() - updated text editor model', this.resource);
 
 		// Ensure we are not tracking a stale state
 		this.setDirty(false);
@@ -458,7 +438,7 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 	}
 
 	private doCreateTextModel(resource: URI, value: ITextBufferFactory, backup: URI): TPromise<TextFileEditorModel> {
-		diag('load() - created text editor model', this.resource, new Date());
+		this.logService.trace('load() - created text editor model', this.resource);
 
 		this.createTextEditorModelPromise = this.doLoadBackup(backup).then(backupContent => {
 			const hasBackupContent = !!backupContent;
@@ -502,7 +482,7 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 		// where `value` was captured in the content change listener closure scope.
 
 		// Content Change
-		this.toDispose.push(this.textEditorModel.onDidChangeContent(() => this.onModelContentChanged()));
+		this._register(this.textEditorModel.onDidChangeContent(() => this.onModelContentChanged()));
 	}
 
 	private doLoadBackup(backup: URI): TPromise<ITextBufferFactory> {
@@ -518,11 +498,11 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 	}
 
 	private onModelContentChanged(): void {
-		diag(`onModelContentChanged() - enter`, this.resource, new Date());
+		this.logService.trace(`onModelContentChanged() - enter`, this.resource);
 
 		// In any case increment the version id because it tracks the textual content state of the model at all times
 		this.versionId++;
-		diag(`onModelContentChanged() - new versionId ${this.versionId}`, this.resource, new Date());
+		this.logService.trace(`onModelContentChanged() - new versionId ${this.versionId}`, this.resource);
 
 		// Ignore if blocking model changes
 		if (this.blockModelContentChange) {
@@ -534,7 +514,7 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 		// Note: we currently only do this check when auto-save is turned off because there you see
 		// a dirty indicator that you want to get rid of when undoing to the saved version.
 		if (!this.autoSaveAfterMilliesEnabled && this.textEditorModel.getAlternativeVersionId() === this.bufferSavedVersionId) {
-			diag('onModelContentChanged() - model content changed back to last saved version', this.resource, new Date());
+			this.logService.trace('onModelContentChanged() - model content changed back to last saved version', this.resource);
 
 			// Clear flags
 			const wasDirty = this.dirty;
@@ -548,7 +528,7 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 			return;
 		}
 
-		diag('onModelContentChanged() - model content changed and marked as dirty', this.resource, new Date());
+		this.logService.trace('onModelContentChanged() - model content changed and marked as dirty', this.resource);
 
 		// Mark as dirty
 		this.makeDirty();
@@ -558,7 +538,7 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 			if (!this.inConflictMode) {
 				this.doAutoSave(this.versionId);
 			} else {
-				diag('makeDirty() - prevented save because we are in conflict resolution mode', this.resource, new Date());
+				this.logService.trace('makeDirty() - prevented save because we are in conflict resolution mode', this.resource);
 			}
 		}
 
@@ -578,53 +558,50 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 		}
 	}
 
-	private doAutoSave(versionId: number): TPromise<void> {
-		diag(`doAutoSave() - enter for versionId ${versionId}`, this.resource, new Date());
+	private doAutoSave(versionId: number): void {
+		this.logService.trace(`doAutoSave() - enter for versionId ${versionId}`, this.resource);
 
 		// Cancel any currently running auto saves to make this the one that succeeds
-		this.cancelAutoSavePromise();
+		this.cancelPendingAutoSave();
 
-		// Create new save promise and keep it
-		this.autoSavePromise = TPromise.timeout(this.autoSaveAfterMillies).then(() => {
+		// Create new save timer and store it for disposal as needed
+		const handle = setTimeout(() => {
 
 			// Only trigger save if the version id has not changed meanwhile
 			if (versionId === this.versionId) {
-				this.doSave(versionId, { reason: SaveReason.AUTO }).done(null, onUnexpectedError); // Very important here to not return the promise because if the timeout promise is canceled it will bubble up the error otherwise - do not change
+				this.doSave(versionId, { reason: SaveReason.AUTO }); // Very important here to not return the promise because if the timeout promise is canceled it will bubble up the error otherwise - do not change
 			}
-		});
+		}, this.autoSaveAfterMillies);
 
-		return this.autoSavePromise;
+		this.autoSaveDisposable = toDisposable(() => clearTimeout(handle));
 	}
 
-	private cancelAutoSavePromise(): void {
-		if (this.autoSavePromise) {
-			this.autoSavePromise.cancel();
-			this.autoSavePromise = void 0;
+	private cancelPendingAutoSave(): void {
+		if (this.autoSaveDisposable) {
+			this.autoSaveDisposable.dispose();
+			this.autoSaveDisposable = void 0;
 		}
 	}
 
-	/**
-	 * Saves the current versionId of this editor model if it is dirty.
-	 */
-	public save(options: ISaveOptions = Object.create(null)): TPromise<void> {
+	save(options: ISaveOptions = Object.create(null)): TPromise<void> {
 		if (!this.isResolved()) {
 			return TPromise.wrap<void>(null);
 		}
 
-		diag('save() - enter', this.resource, new Date());
+		this.logService.trace('save() - enter', this.resource);
 
 		// Cancel any currently running auto saves to make this the one that succeeds
-		this.cancelAutoSavePromise();
+		this.cancelPendingAutoSave();
 
 		return this.doSave(this.versionId, options);
 	}
 
 	private doSave(versionId: number, options: ISaveOptions): TPromise<void> {
-		if (types.isUndefinedOrNull(options.reason)) {
+		if (isUndefinedOrNull(options.reason)) {
 			options.reason = SaveReason.EXPLICIT;
 		}
 
-		diag(`doSave(${versionId}) - enter with versionId ' + versionId`, this.resource, new Date());
+		this.logService.trace(`doSave(${versionId}) - enter with versionId ' + versionId`, this.resource);
 
 		// Lookup any running pending save for this versionId and return it if found
 		//
@@ -632,7 +609,7 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 		//           while the save was not yet finished to disk
 		//
 		if (this.saveSequentializer.hasPendingSave(versionId)) {
-			diag(`doSave(${versionId}) - exit - found a pending save for versionId ${versionId}`, this.resource, new Date());
+			this.logService.trace(`doSave(${versionId}) - exit - found a pending save for versionId ${versionId}`, this.resource);
 
 			return this.saveSequentializer.pendingSave;
 		}
@@ -645,7 +622,7 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 		//             Thus we avoid spawning multiple auto saves and only take the latest.
 		//
 		if ((!options.force && !this.dirty) || versionId !== this.versionId) {
-			diag(`doSave(${versionId}) - exit - because not dirty and/or versionId is different (this.isDirty: ${this.dirty}, this.versionId: ${this.versionId})`, this.resource, new Date());
+			this.logService.trace(`doSave(${versionId}) - exit - because not dirty and/or versionId is different (this.isDirty: ${this.dirty}, this.versionId: ${this.versionId})`, this.resource);
 
 			return TPromise.wrap<void>(null);
 		}
@@ -659,7 +636,7 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 		//             while the first save has not returned yet.
 		//
 		if (this.saveSequentializer.hasPendingSave()) {
-			diag(`doSave(${versionId}) - exit - because busy saving`, this.resource, new Date());
+			this.logService.trace(`doSave(${versionId}) - exit - because busy saving`, this.resource);
 
 			// Register this as the next upcoming save and return
 			return this.saveSequentializer.setNext(() => this.doSave(this.versionId /* make sure to use latest version id here */, options));
@@ -698,7 +675,7 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 			// be disposed if we are dirty, but if we are not dirty, save() and dispose() can still be triggered
 			// one after the other without waiting for the save() to complete. If we are disposed(), we risk
 			// saving contents to disk that are stale (see https://github.com/Microsoft/vscode/issues/50942).
-			// To fix this issue, we will not store the contents to disk when we got disposed. 
+			// To fix this issue, we will not store the contents to disk when we got disposed.
 			if (this.disposed) {
 				return void 0;
 			}
@@ -725,7 +702,7 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 
 			// Save to Disk
 			// mark the save operation as currently pending with the versionId (it might have changed from a save participant triggering)
-			diag(`doSave(${versionId}) - before updateContent()`, this.resource, new Date());
+			this.logService.trace(`doSave(${versionId}) - before updateContent()`, this.resource);
 			return this.saveSequentializer.setPending(newVersionId, this.fileService.updateContent(this.lastResolvedDiskStat.resource, this.createSnapshot(), {
 				overwriteReadonly: options.overwriteReadonly,
 				overwriteEncoding: options.overwriteEncoding,
@@ -734,30 +711,34 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 				etag: this.lastResolvedDiskStat.etag,
 				writeElevated: options.writeElevated
 			}).then(stat => {
-				diag(`doSave(${versionId}) - after updateContent()`, this.resource, new Date());
+				this.logService.trace(`doSave(${versionId}) - after updateContent()`, this.resource);
 
 				// Telemetry
-				if (this.isSettingsFile()) {
+				const settingsType = this.getTypeIfSettings();
+				if (settingsType) {
 					/* __GDPR__
-						"settingsWritten" : {}
+						"settingsWritten" : {
+							"settingsType": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+						}
 					*/
-					this.telemetryService.publicLog('settingsWritten'); // Do not log write to user settings.json and .vscode folder as a filePUT event as it ruins our JSON usage data
+					this.telemetryService.publicLog('settingsWritten', { settingsType }); // Do not log write to user settings.json and .vscode folder as a filePUT event as it ruins our JSON usage data
 				} else {
 					/* __GDPR__
 						"filePUT" : {
-							"mimeType" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-							"ext": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+							"${include}": [
+								"${FileTelemetryData}"
+							]
 						}
 					*/
-					this.telemetryService.publicLog('filePUT', { mimeType: guessMimeTypes(this.resource.fsPath).join(', '), ext: path.extname(this.lastResolvedDiskStat.resource.fsPath) });
+					this.telemetryService.publicLog('filePUT', this.getTelemetryData(options.reason));
 				}
 
 				// Update dirty state unless model has changed meanwhile
 				if (versionId === this.versionId) {
-					diag(`doSave(${versionId}) - setting dirty to false because versionId did not change`, this.resource, new Date());
+					this.logService.trace(`doSave(${versionId}) - setting dirty to false because versionId did not change`, this.resource);
 					this.setDirty(false);
 				} else {
-					diag(`doSave(${versionId}) - not setting dirty to false because versionId did change meanwhile`, this.resource, new Date());
+					this.logService.trace(`doSave(${versionId}) - not setting dirty to false because versionId did change meanwhile`, this.resource);
 				}
 
 				// Updated resolved stat with updated stat
@@ -769,7 +750,11 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 				// Emit File Saved Event
 				this._onDidStateChange.fire(StateChange.SAVED);
 			}, error => {
-				diag(`doSave(${versionId}) - exit - resulted in a save error: ${error.toString()}`, this.resource, new Date());
+				if (!error) {
+					error = new Error('Unknown Save Error'); // TODO@remote we should never get null as error (https://github.com/Microsoft/vscode/issues/55051)
+				}
+
+				this.logService.error(`doSave(${versionId}) - exit - resulted in a save error: ${error.toString()}`, this.resource);
 
 				// Flag as error state in the model
 				this.inErrorMode = true;
@@ -788,17 +773,69 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 		}));
 	}
 
-	private isSettingsFile(): boolean {
+	private getTypeIfSettings(): string {
+		if (path.extname(this.resource.fsPath) !== '.json') {
+			return '';
+		}
 
 		// Check for global settings file
-		if (path.isEqual(this.resource.fsPath, this.environmentService.appSettingsPath, !isLinux)) {
-			return true;
+		if (isEqual(this.resource, URI.file(this.environmentService.appSettingsPath), !isLinux)) {
+			return 'global-settings';
+		}
+
+		// Check for keybindings file
+		if (isEqual(this.resource, URI.file(this.environmentService.appKeybindingsPath), !isLinux)) {
+			return 'keybindings';
+		}
+
+		// Check for locale file
+		if (isEqual(this.resource, URI.file(path.join(this.environmentService.appSettingsHome, 'locale.json')), !isLinux)) {
+			return 'locale';
+		}
+
+		// Check for snippets
+		if (isEqualOrParent(this.resource, URI.file(path.join(this.environmentService.appSettingsHome, 'snippets')))) {
+			return 'snippets';
 		}
 
 		// Check for workspace settings file
-		return this.contextService.getWorkspace().folders.some(folder => {
-			return path.isEqualOrParent(this.resource.fsPath, path.join(folder.uri.fsPath, '.vscode'));
-		});
+		const folders = this.contextService.getWorkspace().folders;
+		for (let i = 0; i < folders.length; i++) {
+			if (isEqualOrParent(this.resource, folders[i].toResource('.vscode'))) {
+				const filename = path.basename(this.resource.fsPath);
+				if (TextFileEditorModel.WHITELIST_WORKSPACE_JSON.indexOf(filename) > -1) {
+					return `.vscode/${filename}`;
+				}
+			}
+		}
+
+		return '';
+	}
+
+	private getTelemetryData(reason: number): Object {
+		const ext = path.extname(this.resource.fsPath);
+		const fileName = path.basename(this.resource.fsPath);
+		const telemetryData = {
+			mimeType: guessMimeTypes(this.resource.fsPath).join(', '),
+			ext,
+			path: this.hashService.createSHA1(this.resource.fsPath),
+			reason
+		};
+
+		if (ext === '.json' && TextFileEditorModel.WHITELIST_JSON.indexOf(fileName) > -1) {
+			telemetryData['whitelistedjson'] = fileName;
+		}
+
+		/* __GDPR__FRAGMENT__
+			"FileTelemetryData" : {
+				"mimeType" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+				"ext": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+				"path": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+				"reason": { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+				"whitelistedjson": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+			}
+		*/
+		return telemetryData;
 	}
 
 	private doTouch(versionId: number): TPromise<void> {
@@ -874,31 +911,19 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 		TextFileEditorModel.saveErrorHandler.onSaveError(error, this);
 	}
 
-	/**
-	 * Returns true if the content of this model has changes that are not yet saved back to the disk.
-	 */
-	public isDirty(): boolean {
+	isDirty(): boolean {
 		return this.dirty;
 	}
 
-	/**
-	 * Returns the time in millies when this working copy was attempted to be saved.
-	 */
-	public getLastSaveAttemptTime(): number {
+	getLastSaveAttemptTime(): number {
 		return this.lastSaveAttemptTime;
 	}
 
-	/**
-	 * Returns the time in millies when this working copy was last modified by the user or some other program.
-	 */
-	public getETag(): string {
+	getETag(): string {
 		return this.lastResolvedDiskStat ? this.lastResolvedDiskStat.etag : null;
 	}
 
-	/**
-	 * Answers if this model is in a specific state.
-	 */
-	public hasState(state: ModelState): boolean {
+	hasState(state: ModelState): boolean {
 		switch (state) {
 			case ModelState.CONFLICT:
 				return this.inConflictMode;
@@ -915,11 +940,11 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 		}
 	}
 
-	public getEncoding(): string {
+	getEncoding(): string {
 		return this.preferredEncoding || this.contentEncoding;
 	}
 
-	public setEncoding(encoding: string, mode: EncodingMode): void {
+	setEncoding(encoding: string, mode: EncodingMode): void {
 		if (!this.isNewEncoding(encoding)) {
 			return; // return early if the encoding is already the same
 		}
@@ -935,7 +960,7 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 			}
 
 			if (!this.inConflictMode) {
-				this.save({ overwriteEncoding: true }).done(null, onUnexpectedError);
+				this.save({ overwriteEncoding: true });
 			}
 		}
 
@@ -952,11 +977,11 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 			// Load
 			this.load({
 				forceReadFromDisk: true	// because encoding has changed
-			}).done(null, onUnexpectedError);
+			});
 		}
 	}
 
-	public updatePreferredEncoding(encoding: string): void {
+	updatePreferredEncoding(encoding: string): void {
 		if (!this.isNewEncoding(encoding)) {
 			return;
 		}
@@ -979,41 +1004,35 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 		return true;
 	}
 
-	public isResolved(): boolean {
-		return !types.isUndefinedOrNull(this.lastResolvedDiskStat);
+	isResolved(): boolean {
+		return !isUndefinedOrNull(this.lastResolvedDiskStat);
 	}
 
-	/**
-	 * Returns true if the dispose() method of this model has been called.
-	 */
-	public isDisposed(): boolean {
+	isReadonly(): boolean {
+		return this.lastResolvedDiskStat && this.lastResolvedDiskStat.isReadonly;
+	}
+
+	isDisposed(): boolean {
 		return this.disposed;
 	}
 
-	/**
-	 * Returns the full resource URI of the file this text file editor model is about.
-	 */
-	public getResource(): URI {
+	getResource(): URI {
 		return this.resource;
 	}
 
-	/**
-	 * Stat accessor only used by tests.
-	 */
-	public getStat(): IFileStat {
+	getStat(): IFileStat {
 		return this.lastResolvedDiskStat;
 	}
 
-	public dispose(): void {
+	dispose(): void {
 		this.disposed = true;
 		this.inConflictMode = false;
 		this.inOrphanMode = false;
 		this.inErrorMode = false;
 
-		this.toDispose = dispose(this.toDispose);
 		this.createTextEditorModelPromise = null;
 
-		this.cancelAutoSavePromise();
+		this.cancelPendingAutoSave();
 
 		super.dispose();
 	}
@@ -1035,7 +1054,7 @@ export class SaveSequentializer {
 	private _pendingSave: IPendingSave;
 	private _nextSave: ISaveOperation;
 
-	public hasPendingSave(versionId?: number): boolean {
+	hasPendingSave(versionId?: number): boolean {
 		if (!this._pendingSave) {
 			return false;
 		}
@@ -1047,14 +1066,14 @@ export class SaveSequentializer {
 		return !!this._pendingSave;
 	}
 
-	public get pendingSave(): TPromise<void> {
+	get pendingSave(): TPromise<void> {
 		return this._pendingSave ? this._pendingSave.promise : void 0;
 	}
 
-	public setPending(versionId: number, promise: TPromise<void>): TPromise<void> {
+	setPending(versionId: number, promise: TPromise<void>): TPromise<void> {
 		this._pendingSave = { versionId, promise };
 
-		promise.done(() => this.donePending(versionId), () => this.donePending(versionId));
+		promise.then(() => this.donePending(versionId), () => this.donePending(versionId));
 
 		return promise;
 	}
@@ -1076,11 +1095,11 @@ export class SaveSequentializer {
 			this._nextSave = void 0;
 
 			// Run next save and complete on the associated promise
-			saveOperation.run().done(saveOperation.promiseValue, saveOperation.promiseError);
+			saveOperation.run().then(saveOperation.promiseValue, saveOperation.promiseError);
 		}
 	}
 
-	public setNext(run: () => TPromise<void>): TPromise<void> {
+	setNext(run: () => TPromise<void>): TPromise<void> {
 
 		// this is our first next save, so we create associated promise with it
 		// so that we can return a promise that completes when the save operation
@@ -1114,15 +1133,7 @@ class DefaultSaveErrorHandler implements ISaveErrorHandler {
 
 	constructor(@INotificationService private notificationService: INotificationService) { }
 
-	public onSaveError(error: any, model: TextFileEditorModel): void {
+	onSaveError(error: any, model: TextFileEditorModel): void {
 		this.notificationService.error(nls.localize('genericSaveError', "Failed to save '{0}': {1}", path.basename(model.getResource().fsPath), toErrorMessage(error, false)));
 	}
 }
-
-// Diagnostics support
-let diag: (...args: any[]) => void;
-if (!diag) {
-	diag = diagnostics.register('TextFileEditorModelDiagnostics', function (...args: any[]) {
-		console.log(args[1] + ' - ' + args[0] + ' (time: ' + args[2].getTime() + ' [' + args[2].toUTCString() + '])');
-	});
-}
diff --git a/src/vs/workbench/services/textfile/common/textFileEditorModelManager.ts b/src/vs/workbench/services/textfile/common/textFileEditorModelManager.ts
index 7b19b9d0a36..1e42a100449 100644
--- a/src/vs/workbench/services/textfile/common/textFileEditorModelManager.ts
+++ b/src/vs/workbench/services/textfile/common/textFileEditorModelManager.ts
@@ -6,25 +6,40 @@
 
 import { Event, Emitter, debounceEvent } from 'vs/base/common/event';
 import { TPromise } from 'vs/base/common/winjs.base';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { TextFileEditorModel } from 'vs/workbench/services/textfile/common/textFileEditorModel';
-import { dispose, IDisposable } from 'vs/base/common/lifecycle';
-import { ITextFileEditorModel, ITextFileEditorModelManager, TextFileModelChangeEvent, StateChange, IModelLoadOrCreateOptions, ILoadOptions } from 'vs/workbench/services/textfile/common/textfiles';
+import { dispose, IDisposable, Disposable } from 'vs/base/common/lifecycle';
+import { ITextFileEditorModel, ITextFileEditorModelManager, TextFileModelChangeEvent, StateChange, IModelLoadOrCreateOptions } from 'vs/workbench/services/textfile/common/textfiles';
 import { ILifecycleService } from 'vs/platform/lifecycle/common/lifecycle';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { ResourceMap } from 'vs/base/common/map';
+import { onUnexpectedError } from 'vs/base/common/errors';
 
-export class TextFileEditorModelManager implements ITextFileEditorModelManager {
-	private toUnbind: IDisposable[];
+export class TextFileEditorModelManager extends Disposable implements ITextFileEditorModelManager {
 
-	private readonly _onModelDisposed: Emitter<URI>;
-	private readonly _onModelContentChanged: Emitter<TextFileModelChangeEvent>;
-	private readonly _onModelDirty: Emitter<TextFileModelChangeEvent>;
-	private readonly _onModelSaveError: Emitter<TextFileModelChangeEvent>;
-	private readonly _onModelSaved: Emitter<TextFileModelChangeEvent>;
-	private readonly _onModelReverted: Emitter<TextFileModelChangeEvent>;
-	private readonly _onModelEncodingChanged: Emitter<TextFileModelChangeEvent>;
-	private readonly _onModelOrphanedChanged: Emitter<TextFileModelChangeEvent>;
+	private readonly _onModelDisposed: Emitter<URI> = this._register(new Emitter<URI>());
+	get onModelDisposed(): Event<URI> { return this._onModelDisposed.event; }
+
+	private readonly _onModelContentChanged: Emitter<TextFileModelChangeEvent> = this._register(new Emitter<TextFileModelChangeEvent>());
+	get onModelContentChanged(): Event<TextFileModelChangeEvent> { return this._onModelContentChanged.event; }
+
+	private readonly _onModelDirty: Emitter<TextFileModelChangeEvent> = this._register(new Emitter<TextFileModelChangeEvent>());
+	get onModelDirty(): Event<TextFileModelChangeEvent> { return this._onModelDirty.event; }
+
+	private readonly _onModelSaveError: Emitter<TextFileModelChangeEvent> = this._register(new Emitter<TextFileModelChangeEvent>());
+	get onModelSaveError(): Event<TextFileModelChangeEvent> { return this._onModelSaveError.event; }
+
+	private readonly _onModelSaved: Emitter<TextFileModelChangeEvent> = this._register(new Emitter<TextFileModelChangeEvent>());
+	get onModelSaved(): Event<TextFileModelChangeEvent> { return this._onModelSaved.event; }
+
+	private readonly _onModelReverted: Emitter<TextFileModelChangeEvent> = this._register(new Emitter<TextFileModelChangeEvent>());
+	get onModelReverted(): Event<TextFileModelChangeEvent> { return this._onModelReverted.event; }
+
+	private readonly _onModelEncodingChanged: Emitter<TextFileModelChangeEvent> = this._register(new Emitter<TextFileModelChangeEvent>());
+	get onModelEncodingChanged(): Event<TextFileModelChangeEvent> { return this._onModelEncodingChanged.event; }
+
+	private readonly _onModelOrphanedChanged: Emitter<TextFileModelChangeEvent> = this._register(new Emitter<TextFileModelChangeEvent>());
+	get onModelOrphanedChanged(): Event<TextFileModelChangeEvent> { return this._onModelOrphanedChanged.event; }
 
 	private _onModelsDirtyEvent: Event<TextFileModelChangeEvent[]>;
 	private _onModelsSaveError: Event<TextFileModelChangeEvent[]>;
@@ -41,25 +56,7 @@ export class TextFileEditorModelManager implements ITextFileEditorModelManager {
 		@ILifecycleService private lifecycleService: ILifecycleService,
 		@IInstantiationService private instantiationService: IInstantiationService
 	) {
-		this.toUnbind = [];
-
-		this._onModelDisposed = new Emitter<URI>();
-		this._onModelContentChanged = new Emitter<TextFileModelChangeEvent>();
-		this._onModelDirty = new Emitter<TextFileModelChangeEvent>();
-		this._onModelSaveError = new Emitter<TextFileModelChangeEvent>();
-		this._onModelSaved = new Emitter<TextFileModelChangeEvent>();
-		this._onModelReverted = new Emitter<TextFileModelChangeEvent>();
-		this._onModelEncodingChanged = new Emitter<TextFileModelChangeEvent>();
-		this._onModelOrphanedChanged = new Emitter<TextFileModelChangeEvent>();
-
-		this.toUnbind.push(this._onModelDisposed);
-		this.toUnbind.push(this._onModelContentChanged);
-		this.toUnbind.push(this._onModelDirty);
-		this.toUnbind.push(this._onModelSaveError);
-		this.toUnbind.push(this._onModelSaved);
-		this.toUnbind.push(this._onModelReverted);
-		this.toUnbind.push(this._onModelEncodingChanged);
-		this.toUnbind.push(this._onModelOrphanedChanged);
+		super();
 
 		this.mapResourceToModel = new ResourceMap<ITextFileEditorModel>();
 		this.mapResourceToDisposeListener = new ResourceMap<IDisposable>();
@@ -76,39 +73,7 @@ export class TextFileEditorModelManager implements ITextFileEditorModelManager {
 		this.lifecycleService.onShutdown(this.dispose, this);
 	}
 
-	public get onModelDisposed(): Event<URI> {
-		return this._onModelDisposed.event;
-	}
-
-	public get onModelContentChanged(): Event<TextFileModelChangeEvent> {
-		return this._onModelContentChanged.event;
-	}
-
-	public get onModelDirty(): Event<TextFileModelChangeEvent> {
-		return this._onModelDirty.event;
-	}
-
-	public get onModelSaveError(): Event<TextFileModelChangeEvent> {
-		return this._onModelSaveError.event;
-	}
-
-	public get onModelSaved(): Event<TextFileModelChangeEvent> {
-		return this._onModelSaved.event;
-	}
-
-	public get onModelReverted(): Event<TextFileModelChangeEvent> {
-		return this._onModelReverted.event;
-	}
-
-	public get onModelEncodingChanged(): Event<TextFileModelChangeEvent> {
-		return this._onModelEncodingChanged.event;
-	}
-
-	public get onModelOrphanedChanged(): Event<TextFileModelChangeEvent> {
-		return this._onModelOrphanedChanged.event;
-	}
-
-	public get onModelsDirty(): Event<TextFileModelChangeEvent[]> {
+	get onModelsDirty(): Event<TextFileModelChangeEvent[]> {
 		if (!this._onModelsDirtyEvent) {
 			this._onModelsDirtyEvent = this.debounce(this.onModelDirty);
 		}
@@ -116,7 +81,7 @@ export class TextFileEditorModelManager implements ITextFileEditorModelManager {
 		return this._onModelsDirtyEvent;
 	}
 
-	public get onModelsSaveError(): Event<TextFileModelChangeEvent[]> {
+	get onModelsSaveError(): Event<TextFileModelChangeEvent[]> {
 		if (!this._onModelsSaveError) {
 			this._onModelsSaveError = this.debounce(this.onModelSaveError);
 		}
@@ -124,7 +89,7 @@ export class TextFileEditorModelManager implements ITextFileEditorModelManager {
 		return this._onModelsSaveError;
 	}
 
-	public get onModelsSaved(): Event<TextFileModelChangeEvent[]> {
+	get onModelsSaved(): Event<TextFileModelChangeEvent[]> {
 		if (!this._onModelsSaved) {
 			this._onModelsSaved = this.debounce(this.onModelSaved);
 		}
@@ -132,7 +97,7 @@ export class TextFileEditorModelManager implements ITextFileEditorModelManager {
 		return this._onModelsSaved;
 	}
 
-	public get onModelsReverted(): Event<TextFileModelChangeEvent[]> {
+	get onModelsReverted(): Event<TextFileModelChangeEvent[]> {
 		if (!this._onModelsReverted) {
 			this._onModelsReverted = this.debounce(this.onModelReverted);
 		}
@@ -155,11 +120,11 @@ export class TextFileEditorModelManager implements ITextFileEditorModelManager {
 		return 250;
 	}
 
-	public get(resource: URI): ITextFileEditorModel {
+	get(resource: URI): ITextFileEditorModel {
 		return this.mapResourceToModel.get(resource);
 	}
 
-	public loadOrCreate(resource: URI, options?: IModelLoadOrCreateOptions): TPromise<ITextFileEditorModel> {
+	loadOrCreate(resource: URI, options?: IModelLoadOrCreateOptions): TPromise<ITextFileEditorModel> {
 
 		// Return early if model is currently being loaded
 		const pendingLoad = this.mapResourceToPendingModelLoaders.get(resource);
@@ -167,18 +132,23 @@ export class TextFileEditorModelManager implements ITextFileEditorModelManager {
 			return pendingLoad;
 		}
 
-		let modelLoadOptions: ILoadOptions;
-		if (options && options.allowBinary) {
-			modelLoadOptions = { allowBinary: true };
-		}
-
 		let modelPromise: TPromise<ITextFileEditorModel>;
 
 		// Model exists
 		let model = this.get(resource);
 		if (model) {
 			if (options && options.reload) {
-				modelPromise = model.load(modelLoadOptions);
+
+				// async reload: trigger a reload but return immediately
+				if (options.reload.async) {
+					modelPromise = TPromise.as(model);
+					model.load(options).then(null, onUnexpectedError);
+				}
+
+				// sync reload: do not return until model reloaded
+				else {
+					modelPromise = model.load(options);
+				}
 			} else {
 				modelPromise = TPromise.as(model);
 			}
@@ -187,7 +157,7 @@ export class TextFileEditorModelManager implements ITextFileEditorModelManager {
 		// Model does not exist
 		else {
 			model = this.instantiationService.createInstance(TextFileEditorModel, resource, options ? options.encoding : void 0);
-			modelPromise = model.load(modelLoadOptions);
+			modelPromise = model.load(options);
 
 			// Install state change listener
 			this.mapResourceToStateChangeListener.set(resource, model.onDidStateChange(state => {
@@ -249,7 +219,7 @@ export class TextFileEditorModelManager implements ITextFileEditorModelManager {
 		});
 	}
 
-	public getAll(resource?: URI, filter?: (model: ITextFileEditorModel) => boolean): ITextFileEditorModel[] {
+	getAll(resource?: URI, filter?: (model: ITextFileEditorModel) => boolean): ITextFileEditorModel[] {
 		if (resource) {
 			const res = this.mapResourceToModel.get(resource);
 
@@ -266,7 +236,7 @@ export class TextFileEditorModelManager implements ITextFileEditorModelManager {
 		return res;
 	}
 
-	public add(resource: URI, model: ITextFileEditorModel): void {
+	add(resource: URI, model: ITextFileEditorModel): void {
 		const knownModel = this.mapResourceToModel.get(resource);
 		if (knownModel === model) {
 			return; // already cached
@@ -286,7 +256,7 @@ export class TextFileEditorModelManager implements ITextFileEditorModelManager {
 		}));
 	}
 
-	public remove(resource: URI): void {
+	remove(resource: URI): void {
 		this.mapResourceToModel.delete(resource);
 
 		const disposeListener = this.mapResourceToDisposeListener.get(resource);
@@ -308,7 +278,7 @@ export class TextFileEditorModelManager implements ITextFileEditorModelManager {
 		}
 	}
 
-	public clear(): void {
+	clear(): void {
 
 		// model caches
 		this.mapResourceToModel.clear();
@@ -327,7 +297,7 @@ export class TextFileEditorModelManager implements ITextFileEditorModelManager {
 		this.mapResourceToModelContentChangeListener.clear();
 	}
 
-	public disposeModel(model: TextFileEditorModel): void {
+	disposeModel(model: TextFileEditorModel): void {
 		if (!model) {
 			return; // we need data!
 		}
@@ -346,8 +316,4 @@ export class TextFileEditorModelManager implements ITextFileEditorModelManager {
 
 		model.dispose();
 	}
-
-	public dispose(): void {
-		this.toUnbind = dispose(this.toUnbind);
-	}
 }
\ No newline at end of file
diff --git a/src/vs/workbench/services/textfile/common/textFileService.ts b/src/vs/workbench/services/textfile/common/textFileService.ts
index 4c86dfd430c..484e14d38c3 100644
--- a/src/vs/workbench/services/textfile/common/textFileService.ts
+++ b/src/vs/workbench/services/textfile/common/textFileService.ts
@@ -6,7 +6,7 @@
 
 import * as nls from 'vs/nls';
 import { TPromise } from 'vs/base/common/winjs.base';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import * as paths from 'vs/base/common/paths';
 import * as errors from 'vs/base/common/errors';
 import * as objects from 'vs/base/common/objects';
@@ -14,13 +14,13 @@ import { Event, Emitter } from 'vs/base/common/event';
 import * as platform from 'vs/base/common/platform';
 import { IWindowsService } from 'vs/platform/windows/common/windows';
 import { IBackupFileService } from 'vs/workbench/services/backup/common/backup';
-import { IResult, ITextFileOperationResult, ITextFileService, IRawTextContent, IAutoSaveConfiguration, AutoSaveMode, SaveReason, ITextFileEditorModelManager, ITextFileEditorModel, ModelState, ISaveOptions, AutoSaveContext } from 'vs/workbench/services/textfile/common/textfiles';
+import { IResult, ITextFileOperationResult, ITextFileService, IRawTextContent, IAutoSaveConfiguration, AutoSaveMode, SaveReason, ITextFileEditorModelManager, ITextFileEditorModel, ModelState, ISaveOptions, AutoSaveContext, IWillMoveEvent } from 'vs/workbench/services/textfile/common/textfiles';
 import { ConfirmResult, IRevertOptions } from 'vs/workbench/common/editor';
 import { ILifecycleService, ShutdownReason } from 'vs/platform/lifecycle/common/lifecycle';
 import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
 import { IFileService, IResolveContentOptions, IFilesConfiguration, FileOperationError, FileOperationResult, AutoSaveConfiguration, HotExitConfiguration } from 'vs/platform/files/common/files';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
+import { Disposable } from 'vs/base/common/lifecycle';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { IUntitledEditorService } from 'vs/workbench/services/untitled/common/untitledEditorService';
 import { UntitledEditorModel } from 'vs/workbench/common/editor/untitledEditorModel';
@@ -33,6 +33,7 @@ import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/c
 import { createTextBufferFactoryFromSnapshot } from 'vs/editor/common/model/textModel';
 import { IModelService } from 'vs/editor/common/services/modelService';
 import { INotificationService } from 'vs/platform/notification/common/notification';
+import { isEqualOrParent, isEqual } from 'vs/base/common/resources';
 
 export interface IBackupResult {
 	didBackup: boolean;
@@ -43,24 +44,26 @@ export interface IBackupResult {
  *
  * It also adds diagnostics and logging around file system operations.
  */
-export abstract class TextFileService implements ITextFileService {
+export abstract class TextFileService extends Disposable implements ITextFileService {
 
-	public _serviceBrand: any;
+	_serviceBrand: any;
+
+	private readonly _onFilesAssociationChange: Emitter<void> = this._register(new Emitter<void>());
+	get onAutoSaveConfigurationChange(): Event<IAutoSaveConfiguration> { return this._onAutoSaveConfigurationChange.event; }
+
+	private readonly _onAutoSaveConfigurationChange: Emitter<IAutoSaveConfiguration> = this._register(new Emitter<IAutoSaveConfiguration>());
+	get onFilesAssociationChange(): Event<void> { return this._onFilesAssociationChange.event; }
+
+	private readonly _onWillMove = this._register(new Emitter<IWillMoveEvent>());
+	get onWillMove(): Event<IWillMoveEvent> { return this._onWillMove.event; }
 
-	private toUnbind: IDisposable[];
 	private _models: TextFileEditorModelManager;
-
-	private readonly _onFilesAssociationChange: Emitter<void>;
 	private currentFilesAssociationConfig: { [key: string]: string; };
-
-	private readonly _onAutoSaveConfigurationChange: Emitter<IAutoSaveConfiguration>;
 	private configuredAutoSaveDelay: number;
 	private configuredAutoSaveOnFocusChange: boolean;
 	private configuredAutoSaveOnWindowChange: boolean;
-
-	private autoSaveContext: IContextKey<string>;
-
 	private configuredHotExit: string;
+	private autoSaveContext: IContextKey<string>;
 
 	constructor(
 		private lifecycleService: ILifecycleService,
@@ -77,13 +80,7 @@ export abstract class TextFileService implements ITextFileService {
 		contextKeyService: IContextKeyService,
 		private modelService: IModelService
 	) {
-		this.toUnbind = [];
-
-		this._onAutoSaveConfigurationChange = new Emitter<IAutoSaveConfiguration>();
-		this.toUnbind.push(this._onAutoSaveConfigurationChange);
-
-		this._onFilesAssociationChange = new Emitter<void>();
-		this.toUnbind.push(this._onFilesAssociationChange);
+		super();
 
 		this._models = this.instantiationService.createInstance(TextFileEditorModelManager);
 		this.autoSaveContext = AutoSaveContext.bindTo(contextKeyService);
@@ -96,7 +93,7 @@ export abstract class TextFileService implements ITextFileService {
 		this.registerListeners();
 	}
 
-	public get models(): ITextFileEditorModelManager {
+	get models(): ITextFileEditorModelManager {
 		return this._models;
 	}
 
@@ -106,14 +103,6 @@ export abstract class TextFileService implements ITextFileService {
 
 	abstract confirmSave(resources?: URI[]): TPromise<ConfirmResult>;
 
-	public get onAutoSaveConfigurationChange(): Event<IAutoSaveConfiguration> {
-		return this._onAutoSaveConfigurationChange.event;
-	}
-
-	public get onFilesAssociationChange(): Event<void> {
-		return this._onFilesAssociationChange.event;
-	}
-
 	private registerListeners(): void {
 
 		// Lifecycle
@@ -121,7 +110,7 @@ export abstract class TextFileService implements ITextFileService {
 		this.lifecycleService.onShutdown(this.dispose, this);
 
 		// Files configuration changes
-		this.toUnbind.push(this.configurationService.onDidChangeConfiguration(e => {
+		this._register(this.configurationService.onDidChangeConfiguration(e => {
 			if (e.affectsConfiguration('files')) {
 				this.onFilesConfigurationChange(this.configurationService.getValue<IFilesConfiguration>());
 			}
@@ -345,7 +334,7 @@ export abstract class TextFileService implements ITextFileService {
 
 		// save all dirty when enabling auto save
 		if (!wasAutoSaveEnabled && this.getAutoSaveMode() !== AutoSaveMode.OFF) {
-			this.saveAll().done(null, errors.onUnexpectedError);
+			this.saveAll();
 		}
 
 		// Check for change in files associations
@@ -364,7 +353,7 @@ export abstract class TextFileService implements ITextFileService {
 		}
 	}
 
-	public getDirty(resources?: URI[]): URI[] {
+	getDirty(resources?: URI[]): URI[] {
 
 		// Collect files
 		const dirty = this.getDirtyFileModels(resources).map(m => m.getResource());
@@ -375,7 +364,7 @@ export abstract class TextFileService implements ITextFileService {
 		return dirty;
 	}
 
-	public isDirty(resource?: URI): boolean {
+	isDirty(resource?: URI): boolean {
 
 		// Check for dirty file
 		if (this._models.getAll(resource).some(model => model.isDirty())) {
@@ -386,7 +375,7 @@ export abstract class TextFileService implements ITextFileService {
 		return this.untitledEditorService.getDirty().some(dirty => !resource || dirty.toString() === resource.toString());
 	}
 
-	public save(resource: URI, options?: ISaveOptions): TPromise<boolean> {
+	save(resource: URI, options?: ISaveOptions): TPromise<boolean> {
 
 		// Run a forced save if we detect the file is not dirty so that save participants can still run
 		if (options && options.force && this.fileService.canHandleResource(resource) && !this.isDirty(resource)) {
@@ -399,9 +388,9 @@ export abstract class TextFileService implements ITextFileService {
 		return this.saveAll([resource], options).then(result => result.results.length === 1 && result.results[0].success);
 	}
 
-	public saveAll(includeUntitled?: boolean, options?: ISaveOptions): TPromise<ITextFileOperationResult>;
-	public saveAll(resources: URI[], options?: ISaveOptions): TPromise<ITextFileOperationResult>;
-	public saveAll(arg1?: any, options?: ISaveOptions): TPromise<ITextFileOperationResult> {
+	saveAll(includeUntitled?: boolean, options?: ISaveOptions): TPromise<ITextFileOperationResult>;
+	saveAll(resources: URI[], options?: ISaveOptions): TPromise<ITextFileOperationResult>;
+	saveAll(arg1?: any, options?: ISaveOptions): TPromise<ITextFileOperationResult> {
 
 		// get all dirty
 		let toSave: URI[] = [];
@@ -435,16 +424,16 @@ export abstract class TextFileService implements ITextFileService {
 			for (let i = 0; i < untitledResources.length; i++) {
 				const untitled = untitledResources[i];
 				if (this.untitledEditorService.exists(untitled)) {
-					let targetPath: string;
+					let targetUri: URI;
 
 					// Untitled with associated file path don't need to prompt
 					if (this.untitledEditorService.hasAssociatedFilePath(untitled)) {
-						targetPath = untitled.fsPath;
+						targetUri = untitled.with({ scheme: Schemas.file });
 					}
 
 					// Otherwise ask user
 					else {
-						targetPath = await this.promptForPath(this.suggestFileName(untitled));
+						const targetPath = await this.promptForPath(this.suggestFileName(untitled));
 						if (!targetPath) {
 							return TPromise.as({
 								results: [...fileResources, ...untitledResources].map(r => {
@@ -454,9 +443,11 @@ export abstract class TextFileService implements ITextFileService {
 								})
 							});
 						}
+
+						targetUri = URI.file(targetPath);
 					}
 
-					targetsForUntitled.push(URI.file(targetPath));
+					targetsForUntitled.push(targetUri);
 				}
 			}
 
@@ -531,7 +522,7 @@ export abstract class TextFileService implements ITextFileService {
 		return this.getFileModels(arg1).filter(model => model.isDirty());
 	}
 
-	public saveAs(resource: URI, target?: URI, options?: ISaveOptions): TPromise<URI> {
+	saveAs(resource: URI, target?: URI, options?: ISaveOptions): TPromise<URI> {
 
 		// Get to target resource
 		let targetPromise: TPromise<URI>;
@@ -635,12 +626,12 @@ export abstract class TextFileService implements ITextFileService {
 	private suggestFileName(untitledResource: URI): string {
 		const untitledFileName = this.untitledEditorService.suggestFileName(untitledResource);
 
-		const lastActiveFile = this.historyService.getLastActiveFile();
+		const lastActiveFile = this.historyService.getLastActiveFile(Schemas.file);
 		if (lastActiveFile) {
 			return URI.file(paths.join(paths.dirname(lastActiveFile.fsPath), untitledFileName)).fsPath;
 		}
 
-		const lastActiveFolder = this.historyService.getLastActiveWorkspaceRoot('file');
+		const lastActiveFolder = this.historyService.getLastActiveWorkspaceRoot(Schemas.file);
 		if (lastActiveFolder) {
 			return URI.file(paths.join(lastActiveFolder.fsPath, untitledFileName)).fsPath;
 		}
@@ -648,11 +639,11 @@ export abstract class TextFileService implements ITextFileService {
 		return untitledFileName;
 	}
 
-	public revert(resource: URI, options?: IRevertOptions): TPromise<boolean> {
+	revert(resource: URI, options?: IRevertOptions): TPromise<boolean> {
 		return this.revertAll([resource], options).then(result => result.results.length === 1 && result.results[0].success);
 	}
 
-	public revertAll(resources?: URI[], options?: IRevertOptions): TPromise<ITextFileOperationResult> {
+	revertAll(resources?: URI[], options?: IRevertOptions): TPromise<ITextFileOperationResult> {
 
 		// Revert files first
 		return this.doRevertAllFiles(resources, options).then(operation => {
@@ -701,7 +692,107 @@ export abstract class TextFileService implements ITextFileService {
 		});
 	}
 
-	public getAutoSaveMode(): AutoSaveMode {
+	create(resource: URI, contents?: string, options?: { overwrite?: boolean }): TPromise<void> {
+		const existingModel = this.models.get(resource);
+
+		return this.fileService.createFile(resource, contents, options).then(() => {
+
+			// If we had an existing model for the given resource, load
+			// it again to make sure it is up to date with the contents
+			// we just wrote into the underlying resource by calling
+			// revert()
+			if (existingModel && !existingModel.isDisposed()) {
+				return existingModel.revert();
+			}
+
+			return void 0;
+		});
+	}
+
+	delete(resource: URI, options?: { useTrash?: boolean, recursive?: boolean }): TPromise<void> {
+		const dirtyFiles = this.getDirty().filter(dirty => isEqualOrParent(dirty, resource, !platform.isLinux /* ignorecase */));
+
+		return this.revertAll(dirtyFiles, { soft: true }).then(() => this.fileService.del(resource, options));
+	}
+
+	move(source: URI, target: URI, overwrite?: boolean): TPromise<void> {
+
+		const waitForPromises: TPromise[] = [];
+		this._onWillMove.fire({
+			oldResource: source,
+			newResource: target,
+			waitUntil(p: Thenable<any>) {
+				waitForPromises.push(TPromise.wrap(p).then(undefined, errors.onUnexpectedError));
+			}
+		});
+
+		// prevent async waitUntil-calls
+		Object.freeze(waitForPromises);
+
+		return TPromise.join(waitForPromises).then(() => {
+
+			// Handle target models if existing (if target URI is a folder, this can be multiple)
+			let handleTargetModelPromise: TPromise<any> = TPromise.as(void 0);
+			const dirtyTargetModels = this.getDirtyFileModels().filter(model => isEqualOrParent(model.getResource(), target, false /* do not ignorecase, see https://github.com/Microsoft/vscode/issues/56384 */));
+			if (dirtyTargetModels.length) {
+				handleTargetModelPromise = this.revertAll(dirtyTargetModels.map(targetModel => targetModel.getResource()), { soft: true });
+			}
+
+			return handleTargetModelPromise.then(() => {
+
+				// Handle dirty source models if existing (if source URI is a folder, this can be multiple)
+				let handleDirtySourceModels: TPromise<any>;
+				const dirtySourceModels = this.getDirtyFileModels().filter(model => isEqualOrParent(model.getResource(), source, !platform.isLinux /* ignorecase */));
+				const dirtyTargetModels: URI[] = [];
+				if (dirtySourceModels.length) {
+					handleDirtySourceModels = TPromise.join(dirtySourceModels.map(sourceModel => {
+						const sourceModelResource = sourceModel.getResource();
+						let targetModelResource: URI;
+
+						// If the source is the actual model, just use target as new resource
+						if (isEqual(sourceModelResource, source, !platform.isLinux /* ignorecase */)) {
+							targetModelResource = target;
+						}
+
+						// Otherwise a parent folder of the source is being moved, so we need
+						// to compute the target resource based on that
+						else {
+							targetModelResource = sourceModelResource.with({ path: paths.join(target.path, sourceModelResource.path.substr(source.path.length + 1)) });
+						}
+
+						// Remember as dirty target model to load after the operation
+						dirtyTargetModels.push(targetModelResource);
+
+						// Backup dirty source model to the target resource it will become later
+						return this.backupFileService.backupResource(targetModelResource, sourceModel.createSnapshot(), sourceModel.getVersionId());
+					}));
+				} else {
+					handleDirtySourceModels = TPromise.as(void 0);
+				}
+
+				return handleDirtySourceModels.then(() => {
+
+					// Soft revert the dirty source files if any
+					return this.revertAll(dirtySourceModels.map(dirtySourceModel => dirtySourceModel.getResource()), { soft: true }).then(() => {
+
+						// Rename to target
+						return this.fileService.moveFile(source, target, overwrite).then(() => {
+
+							// Load models that were dirty before
+							return TPromise.join(dirtyTargetModels.map(dirtyTargetModel => this.models.loadOrCreate(dirtyTargetModel))).then(() => void 0);
+						}, error => {
+
+							// In case of an error, discard any dirty target backups that were made
+							return TPromise.join(dirtyTargetModels.map(dirtyTargetModel => this.backupFileService.discardResourceBackup(dirtyTargetModel)))
+								.then(() => TPromise.wrapError(error));
+						});
+					});
+				});
+			});
+		});
+	}
+
+	getAutoSaveMode(): AutoSaveMode {
 		if (this.configuredAutoSaveOnFocusChange) {
 			return AutoSaveMode.ON_FOCUS_CHANGE;
 		}
@@ -717,7 +808,7 @@ export abstract class TextFileService implements ITextFileService {
 		return AutoSaveMode.OFF;
 	}
 
-	public getAutoSaveConfiguration(): IAutoSaveConfiguration {
+	getAutoSaveConfiguration(): IAutoSaveConfiguration {
 		return {
 			autoSaveDelay: this.configuredAutoSaveDelay && this.configuredAutoSaveDelay > 0 ? this.configuredAutoSaveDelay : void 0,
 			autoSaveFocusChange: this.configuredAutoSaveOnFocusChange,
@@ -725,14 +816,15 @@ export abstract class TextFileService implements ITextFileService {
 		};
 	}
 
-	public get isHotExitEnabled(): boolean {
+	get isHotExitEnabled(): boolean {
 		return !this.environmentService.isExtensionDevelopment && this.configuredHotExit !== HotExitConfiguration.OFF;
 	}
 
-	public dispose(): void {
-		this.toUnbind = dispose(this.toUnbind);
+	dispose(): void {
 
 		// Clear all caches
 		this._models.clear();
+
+		super.dispose();
 	}
 }
diff --git a/src/vs/workbench/services/textfile/common/textfiles.ts b/src/vs/workbench/services/textfile/common/textfiles.ts
index 7bcde710cea..56719225de5 100644
--- a/src/vs/workbench/services/textfile/common/textfiles.ts
+++ b/src/vs/workbench/services/textfile/common/textfiles.ts
@@ -5,7 +5,7 @@
 'use strict';
 
 import { TPromise } from 'vs/base/common/winjs.base';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { Event } from 'vs/base/common/event';
 import { IDisposable } from 'vs/base/common/lifecycle';
 import { IEncodingSupport, ConfirmResult, IRevertOptions } from 'vs/workbench/common/editor';
@@ -37,7 +37,7 @@ export interface ISaveParticipant {
 /**
  * States the text text file editor model can be in.
  */
-export enum ModelState {
+export const enum ModelState {
 	SAVED,
 	DIRTY,
 	PENDING_SAVE,
@@ -60,7 +60,7 @@ export enum ModelState {
 	ERROR
 }
 
-export enum StateChange {
+export const enum StateChange {
 	DIRTY,
 	SAVING,
 	SAVE_ERROR,
@@ -80,11 +80,11 @@ export class TextFileModelChangeEvent {
 		this._kind = kind;
 	}
 
-	public get resource(): URI {
+	get resource(): URI {
 		return this._resource;
 	}
 
-	public get kind(): StateChange {
+	get kind(): StateChange {
 		return this._kind;
 	}
 }
@@ -108,7 +108,7 @@ export interface IAutoSaveConfiguration {
 	autoSaveApplicationChange: boolean;
 }
 
-export enum AutoSaveMode {
+export const enum AutoSaveMode {
 	OFF,
 	AFTER_SHORT_DELAY,
 	AFTER_LONG_DELAY,
@@ -116,13 +116,19 @@ export enum AutoSaveMode {
 	ON_WINDOW_CHANGE
 }
 
-export enum SaveReason {
+export const enum SaveReason {
 	EXPLICIT = 1,
 	AUTO = 2,
 	FOCUS_CHANGE = 3,
 	WINDOW_CHANGE = 4
 }
 
+export const enum LoadReason {
+	EDITOR = 1,
+	REFERENCE = 2,
+	OTHER = 3
+}
+
 export const ITextFileService = createDecorator<ITextFileService>(TEXT_FILE_SERVICE_ID);
 
 export interface IRawTextContent extends IBaseStat {
@@ -140,6 +146,10 @@ export interface IRawTextContent extends IBaseStat {
 
 export interface IModelLoadOrCreateOptions {
 
+	/**
+	 * Context why the model is being loaded or created.
+	 */
+	reason?: LoadReason;
 
 	/**
 	 * The encoding to use when resolving the model text content.
@@ -147,9 +157,16 @@ export interface IModelLoadOrCreateOptions {
 	encoding?: string;
 
 	/**
-	 * Wether to reload the model if it already exists.
+	 * If the model was already loaded before, allows to trigger
+	 * a reload of it to fetch the latest contents:
+	 * - async: loadOrCreate() will return immediately and trigger
+	 * a reload that will run in the background.
+	 * - sync: loadOrCreate() will only return resolved when the
+	 * model has finished reloading.
 	 */
-	reload?: boolean;
+	reload?: {
+		async: boolean
+	};
 
 	/**
 	 * Allow to load a model even if we think it is a binary file.
@@ -203,6 +220,11 @@ export interface ILoadOptions {
 	 * Allow to load a model even if we think it is a binary file.
 	 */
 	allowBinary?: boolean;
+
+	/**
+	 * Context why the model is being loaded.
+	 */
+	reason?: LoadReason;
 }
 
 export interface ITextFileEditorModel extends ITextEditorModel, IEncodingSupport {
@@ -235,15 +257,27 @@ export interface ITextFileEditorModel extends ITextEditorModel, IEncodingSupport
 	isDisposed(): boolean;
 }
 
+
+export interface IWillMoveEvent {
+	oldResource: URI;
+	newResource: URI;
+	waitUntil(p: Thenable<any>): void;
+}
+
 export interface ITextFileService extends IDisposable {
 	_serviceBrand: any;
-	onAutoSaveConfigurationChange: Event<IAutoSaveConfiguration>;
-	onFilesAssociationChange: Event<void>;
+
+	readonly onAutoSaveConfigurationChange: Event<IAutoSaveConfiguration>;
+	readonly onFilesAssociationChange: Event<void>;
+
+	onWillMove: Event<IWillMoveEvent>;
+
+	readonly isHotExitEnabled: boolean;
 
 	/**
 	 * Access to the manager of text file editor models providing further methods to work with them.
 	 */
-	models: ITextFileEditorModelManager;
+	readonly models: ITextFileEditorModelManager;
 
 	/**
 	 * Resolve the contents of a file identified by the resource.
@@ -307,6 +341,22 @@ export interface ITextFileService extends IDisposable {
 	 */
 	revertAll(resources?: URI[], options?: IRevertOptions): TPromise<ITextFileOperationResult>;
 
+	/**
+	 * Create a file. If the file exists it will be overwritten with the contents if
+	 * the options enable to overwrite.
+	 */
+	create(resource: URI, contents?: string, options?: { overwrite?: boolean }): TPromise<void>;
+
+	/**
+	 * Delete a file. If the file is dirty, it will get reverted and then deleted from disk.
+	 */
+	delete(resource: URI, options?: { useTrash?: boolean, recursive?: boolean }): TPromise<void>;
+
+	/**
+	 * Move a file. If the file is dirty, its contents will be preserved and restored.
+	 */
+	move(source: URI, target: URI, overwrite?: boolean): TPromise<void>;
+
 	/**
 	 * Brings up the confirm dialog to either save, don't save or cancel.
 	 *
@@ -324,9 +374,4 @@ export interface ITextFileService extends IDisposable {
 	 * Convinient fast access to the raw configured auto save settings.
 	 */
 	getAutoSaveConfiguration(): IAutoSaveConfiguration;
-
-	/**
-	 * Convinient fast access to the hot exit file setting.
-	 */
-	isHotExitEnabled: boolean;
 }
diff --git a/src/vs/workbench/services/textfile/electron-browser/textFileService.ts b/src/vs/workbench/services/textfile/electron-browser/textFileService.ts
index fcb157c8807..866527408d2 100644
--- a/src/vs/workbench/services/textfile/electron-browser/textFileService.ts
+++ b/src/vs/workbench/services/textfile/electron-browser/textFileService.ts
@@ -10,7 +10,7 @@ import { TPromise } from 'vs/base/common/winjs.base';
 import * as paths from 'vs/base/common/paths';
 import * as strings from 'vs/base/common/strings';
 import { isWindows } from 'vs/base/common/platform';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { ConfirmResult } from 'vs/workbench/common/editor';
 import { TextFileService as AbstractTextFileService } from 'vs/workbench/services/textfile/common/textFileService';
 import { IRawTextContent } from 'vs/workbench/services/textfile/common/textfiles';
@@ -54,7 +54,7 @@ export class TextFileService extends AbstractTextFileService {
 		super(lifecycleService, contextService, configurationService, fileService, untitledEditorService, instantiationService, notificationService, environmentService, backupFileService, windowsService, historyService, contextKeyService, modelService);
 	}
 
-	public resolveTextContent(resource: URI, options?: IResolveContentOptions): TPromise<IRawTextContent> {
+	resolveTextContent(resource: URI, options?: IResolveContentOptions): TPromise<IRawTextContent> {
 		return this.fileService.resolveStreamContent(resource, options).then(streamContent => {
 			return createTextBufferFactoryFromStream(streamContent.value).then(res => {
 				const r: IRawTextContent = {
@@ -63,6 +63,7 @@ export class TextFileService extends AbstractTextFileService {
 					mtime: streamContent.mtime,
 					etag: streamContent.etag,
 					encoding: streamContent.encoding,
+					isReadonly: streamContent.isReadonly,
 					value: res
 				};
 				return r;
@@ -70,7 +71,7 @@ export class TextFileService extends AbstractTextFileService {
 		});
 	}
 
-	public confirmSave(resources?: URI[]): TPromise<ConfirmResult> {
+	confirmSave(resources?: URI[]): TPromise<ConfirmResult> {
 		if (this.environmentService.isExtensionDevelopment) {
 			return TPromise.wrap(ConfirmResult.DONT_SAVE); // no veto when we are in extension dev mode because we cannot assum we run interactive (e.g. tests)
 		}
@@ -101,7 +102,7 @@ export class TextFileService extends AbstractTextFileService {
 		});
 	}
 
-	public promptForPath(defaultPath: string): TPromise<string> {
+	promptForPath(defaultPath: string): TPromise<string> {
 		return this.windowService.showSaveDialog(this.getSaveDialogOptions(defaultPath));
 	}
 
diff --git a/src/vs/workbench/services/textfile/test/textFileEditorModel.test.ts b/src/vs/workbench/services/textfile/test/textFileEditorModel.test.ts
index 5c0b1ab4dbe..67e5baa76d0 100644
--- a/src/vs/workbench/services/textfile/test/textFileEditorModel.test.ts
+++ b/src/vs/workbench/services/textfile/test/textFileEditorModel.test.ts
@@ -371,7 +371,7 @@ suite('Files - TextFileEditorModel', () => {
 		let nextDone = false;
 		const res = sequentializer.setNext(() => TPromise.as(null).then(() => { nextDone = true; return null; }));
 
-		return res.done(() => {
+		return res.then(() => {
 			assert.ok(pendingDone);
 			assert.ok(nextDone);
 		});
@@ -387,7 +387,7 @@ suite('Files - TextFileEditorModel', () => {
 		let nextDone = false;
 		const res = sequentializer.setNext(() => timeout(1).then(() => { nextDone = true; return null; }));
 
-		return res.done(() => {
+		return res.then(() => {
 			assert.ok(pendingDone);
 			assert.ok(nextDone);
 		});
diff --git a/src/vs/workbench/services/textfile/test/textFileEditorModelManager.test.ts b/src/vs/workbench/services/textfile/test/textFileEditorModelManager.test.ts
index b07a9c25b47..c64891e9263 100644
--- a/src/vs/workbench/services/textfile/test/textFileEditorModelManager.test.ts
+++ b/src/vs/workbench/services/textfile/test/textFileEditorModelManager.test.ts
@@ -6,7 +6,7 @@
 'use strict';
 
 import * as assert from 'assert';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { TextFileEditorModelManager } from 'vs/workbench/services/textfile/common/textFileEditorModelManager';
 import { join } from 'vs/base/common/paths';
@@ -105,7 +105,7 @@ suite('Files - TextFileEditorModelManager', () => {
 		const resource = URI.file('/test.html');
 		const encoding = 'utf8';
 
-		return manager.loadOrCreate(resource, { encoding, reload: true }).then(model => {
+		return manager.loadOrCreate(resource, { encoding }).then(model => {
 			assert.ok(model);
 			assert.equal(model.getEncoding(), encoding);
 			assert.equal(manager.get(resource), model);
diff --git a/src/vs/workbench/services/textfile/test/textFileService.test.ts b/src/vs/workbench/services/textfile/test/textFileService.test.ts
index e6d16134bfd..f133ab8b10c 100644
--- a/src/vs/workbench/services/textfile/test/textFileService.test.ts
+++ b/src/vs/workbench/services/textfile/test/textFileService.test.ts
@@ -5,10 +5,12 @@
 'use strict';
 
 import * as assert from 'assert';
+import * as sinon from 'sinon';
 import * as platform from 'vs/base/common/platform';
+import { URI } from 'vs/base/common/uri';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { ILifecycleService, ShutdownEvent, ShutdownReason } from 'vs/platform/lifecycle/common/lifecycle';
-import { workbenchInstantiationService, TestLifecycleService, TestTextFileService, TestWindowsService, TestContextService } from 'vs/workbench/test/workbenchTestServices';
+import { workbenchInstantiationService, TestLifecycleService, TestTextFileService, TestWindowsService, TestContextService, TestFileService } from 'vs/workbench/test/workbenchTestServices';
 import { toResource } from 'vs/base/test/common/utils';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IWindowsService } from 'vs/platform/windows/common/windows';
@@ -17,9 +19,12 @@ import { ITextFileService } from 'vs/workbench/services/textfile/common/textfile
 import { ConfirmResult } from 'vs/workbench/common/editor';
 import { IUntitledEditorService } from 'vs/workbench/services/untitled/common/untitledEditorService';
 import { UntitledEditorModel } from 'vs/workbench/common/editor/untitledEditorModel';
-import { HotExitConfiguration } from 'vs/platform/files/common/files';
+import { HotExitConfiguration, IFileService } from 'vs/platform/files/common/files';
 import { TextFileEditorModelManager } from 'vs/workbench/services/textfile/common/textFileEditorModelManager';
 import { IWorkspaceContextService, Workspace } from 'vs/platform/workspace/common/workspace';
+import { IModelService } from 'vs/editor/common/services/modelService';
+import { ModelServiceImpl } from 'vs/editor/common/services/modelServiceImpl';
+import { Schemas } from 'vs/base/common/network';
 
 class ServiceAccessor {
 	constructor(
@@ -27,7 +32,9 @@ class ServiceAccessor {
 		@ITextFileService public textFileService: TestTextFileService,
 		@IUntitledEditorService public untitledEditorService: IUntitledEditorService,
 		@IWindowsService public windowsService: TestWindowsService,
-		@IWorkspaceContextService public contextService: TestContextService
+		@IWorkspaceContextService public contextService: TestContextService,
+		@IModelService public modelService: ModelServiceImpl,
+		@IFileService public fileService: TestFileService
 	) {
 	}
 }
@@ -194,6 +201,34 @@ suite('Files - TextFileService', () => {
 		});
 	});
 
+	test('save - UNC path', function () {
+		const untitledUncUri = URI.from({ scheme: 'untitled', authority: 'server', path: '/share/path/file.txt' });
+		model = instantiationService.createInstance(TextFileEditorModel, untitledUncUri, 'utf8');
+		(<TextFileEditorModelManager>accessor.textFileService.models).add(model.getResource(), model);
+
+		const mockedFileUri = untitledUncUri.with({ scheme: Schemas.file });
+		const mockedEditorInput = instantiationService.createInstance(TextFileEditorModel, mockedFileUri, 'utf8');
+		const loadOrCreateStub = sinon.stub(accessor.textFileService.models, 'loadOrCreate', () => TPromise.wrap(mockedEditorInput));
+
+		sinon.stub(accessor.untitledEditorService, 'exists', () => true);
+		sinon.stub(accessor.untitledEditorService, 'hasAssociatedFilePath', () => true);
+		sinon.stub(accessor.modelService, 'updateModel', () => { });
+
+		return model.load().then(() => {
+			model.textEditorModel.setValue('foo');
+
+			return accessor.textFileService.saveAll(true).then(res => {
+				assert.ok(loadOrCreateStub.calledOnce);
+				assert.equal(res.results.length, 1);
+				assert.ok(res.results[0].success);
+
+				assert.equal(res.results[0].target.scheme, Schemas.file);
+				assert.equal(res.results[0].target.authority, untitledUncUri.authority);
+				assert.equal(res.results[0].target.path, untitledUncUri.path);
+			});
+		});
+	});
+
 	test('saveAll - file', function () {
 		model = instantiationService.createInstance(TextFileEditorModel, toResource.call(this, '/path/file.txt'), 'utf8');
 		(<TextFileEditorModelManager>accessor.textFileService.models).add(model.getResource(), model);
@@ -252,6 +287,45 @@ suite('Files - TextFileService', () => {
 		});
 	});
 
+	test('delete - dirty file', function () {
+		model = instantiationService.createInstance(TextFileEditorModel, toResource.call(this, '/path/file.txt'), 'utf8');
+		(<TextFileEditorModelManager>accessor.textFileService.models).add(model.getResource(), model);
+
+		const service = accessor.textFileService;
+
+		return model.load().then(() => {
+			model.textEditorModel.setValue('foo');
+
+			assert.ok(service.isDirty(model.getResource()));
+
+			return service.delete(model.getResource()).then(() => {
+				assert.ok(!service.isDirty(model.getResource()));
+			});
+		});
+	});
+
+	test('move - dirty file', function () {
+		let sourceModel: TextFileEditorModel = instantiationService.createInstance(TextFileEditorModel, toResource.call(this, '/path/file.txt'), 'utf8');
+		let targetModel: TextFileEditorModel = instantiationService.createInstance(TextFileEditorModel, toResource.call(this, '/path/file_target.txt'), 'utf8');
+		(<TextFileEditorModelManager>accessor.textFileService.models).add(sourceModel.getResource(), sourceModel);
+		(<TextFileEditorModelManager>accessor.textFileService.models).add(targetModel.getResource(), targetModel);
+
+		const service = accessor.textFileService;
+
+		return sourceModel.load().then(() => {
+			sourceModel.textEditorModel.setValue('foo');
+
+			assert.ok(service.isDirty(sourceModel.getResource()));
+
+			return service.move(sourceModel.getResource(), targetModel.getResource(), true).then(() => {
+				assert.ok(!service.isDirty(sourceModel.getResource()));
+
+				sourceModel.dispose();
+				targetModel.dispose();
+			});
+		});
+	});
+
 	suite('Hot Exit', () => {
 		suite('"onExit" setting', () => {
 			test('should hot exit on non-Mac (reason: CLOSE, windows: single, workspace)', function () {
diff --git a/src/vs/workbench/services/textmodelResolver/common/textModelResolverService.ts b/src/vs/workbench/services/textmodelResolver/common/textModelResolverService.ts
index c7617a56e68..f9075bfd380 100644
--- a/src/vs/workbench/services/textmodelResolver/common/textModelResolverService.ts
+++ b/src/vs/workbench/services/textmodelResolver/common/textModelResolverService.ts
@@ -5,14 +5,14 @@
 'use strict';
 
 import { TPromise } from 'vs/base/common/winjs.base';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { first } from 'vs/base/common/async';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { ITextModel } from 'vs/editor/common/model';
 import { IDisposable, toDisposable, IReference, ReferenceCollection, ImmortalReference } from 'vs/base/common/lifecycle';
 import { IModelService } from 'vs/editor/common/services/modelService';
 import { ResourceEditorModel } from 'vs/workbench/common/editor/resourceEditorModel';
-import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
+import { ITextFileService, LoadReason } from 'vs/workbench/services/textfile/common/textfiles';
 import * as network from 'vs/base/common/network';
 import { ITextModelService, ITextModelContentProvider, ITextEditorModel } from 'vs/editor/common/services/resolverService';
 import { IUntitledEditorService } from 'vs/workbench/services/untitled/common/untitledEditorService';
@@ -31,16 +31,17 @@ class ResourceModelCollection extends ReferenceCollection<TPromise<ITextEditorMo
 		super();
 	}
 
-	public createReferencedObject(key: string): TPromise<ITextEditorModel> {
+	createReferencedObject(key: string): TPromise<ITextEditorModel> {
 		const resource = URI.parse(key);
 		if (this.fileService.canHandleResource(resource)) {
-			return this.textFileService.models.loadOrCreate(resource);
+			return this.textFileService.models.loadOrCreate(resource, { reason: LoadReason.REFERENCE });
 		}
+
 		return this.resolveTextModelContent(key).then(() => this.instantiationService.createInstance(ResourceEditorModel, resource));
 	}
 
-	public destroyReferencedObject(modelPromise: TPromise<ITextEditorModel>): void {
-		modelPromise.done(model => {
+	destroyReferencedObject(modelPromise: TPromise<ITextEditorModel>): void {
+		modelPromise.then(model => {
 			if (model instanceof TextFileEditorModel) {
 				this.textFileService.models.disposeModel(model);
 			} else {
@@ -51,7 +52,7 @@ class ResourceModelCollection extends ReferenceCollection<TPromise<ITextEditorMo
 		});
 	}
 
-	public registerTextModelContentProvider(scheme: string, provider: ITextModelContentProvider): IDisposable {
+	registerTextModelContentProvider(scheme: string, provider: ITextModelContentProvider): IDisposable {
 		const registry = this.providers;
 		const providers = registry[scheme] || (registry[scheme] = []);
 
@@ -81,11 +82,10 @@ class ResourceModelCollection extends ReferenceCollection<TPromise<ITextEditorMo
 	private resolveTextModelContent(key: string): TPromise<ITextModel> {
 		const resource = URI.parse(key);
 		const providers = this.providers[resource.scheme] || [];
-		const factories = providers.map(p => () => p.provideTextContent(resource));
+		const factories = providers.map(p => () => TPromise.wrap(p.provideTextContent(resource)));
 
 		return first(factories).then(model => {
 			if (!model) {
-				console.error(`Unable to open '${resource}' resource is not available.`); // TODO PII
 				return TPromise.wrapError<ITextModel>(new Error('resource is not available'));
 			}
 
@@ -108,21 +108,19 @@ export class TextModelResolverService implements ITextModelService {
 		this.resourceModelCollection = instantiationService.createInstance(ResourceModelCollection);
 	}
 
-	public createModelReference(resource: URI): TPromise<IReference<ITextEditorModel>> {
+	createModelReference(resource: URI): TPromise<IReference<ITextEditorModel>> {
 		return this._createModelReference(resource);
 	}
 
 	private _createModelReference(resource: URI): TPromise<IReference<ITextEditorModel>> {
 
 		// Untitled Schema: go through cached input
-		// TODO ImmortalReference is a hack
 		if (resource.scheme === network.Schemas.untitled) {
 			return this.untitledEditorService.loadOrCreate({ resource }).then(model => new ImmortalReference(model));
 		}
 
 		// InMemory Schema: go through model service cache
-		// TODO ImmortalReference is a hack
-		if (resource.scheme === 'inmemory') {
+		if (resource.scheme === network.Schemas.inMemory) {
 			const cachedModel = this.modelService.getModel(resource);
 
 			if (!cachedModel) {
@@ -144,7 +142,7 @@ export class TextModelResolverService implements ITextModelService {
 		);
 	}
 
-	public registerTextModelContentProvider(scheme: string, provider: ITextModelContentProvider): IDisposable {
+	registerTextModelContentProvider(scheme: string, provider: ITextModelContentProvider): IDisposable {
 		return this.resourceModelCollection.registerTextModelContentProvider(scheme, provider);
 	}
 }
diff --git a/src/vs/workbench/services/textmodelResolver/test/textModelResolverService.test.ts b/src/vs/workbench/services/textmodelResolver/test/textModelResolverService.test.ts
index 83b68a82c00..db48a7cf3cf 100644
--- a/src/vs/workbench/services/textmodelResolver/test/textModelResolverService.test.ts
+++ b/src/vs/workbench/services/textmodelResolver/test/textModelResolverService.test.ts
@@ -8,7 +8,7 @@
 import * as assert from 'assert';
 import { ITextModel } from 'vs/editor/common/model';
 import { TPromise } from 'vs/base/common/winjs.base';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { ResourceEditorInput } from 'vs/workbench/common/editor/resourceEditorInput';
 import { ResourceEditorModel } from 'vs/workbench/common/editor/resourceEditorModel';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
@@ -133,12 +133,12 @@ suite('Workbench - TextModelResolverService', () => {
 		let waitForIt = new TPromise(c => resolveModel = c);
 
 		const disposable = accessor.textModelResolverService.registerTextModelContentProvider('test', {
-			provideTextContent: async (resource: URI): TPromise<ITextModel> => {
-				await waitForIt;
-
-				let modelContent = 'Hello Test';
-				let mode = accessor.modeService.getOrCreateMode('json');
-				return accessor.modelService.createModel(modelContent, mode, resource);
+			provideTextContent: (resource: URI): TPromise<ITextModel> => {
+				return waitForIt.then(_ => {
+					let modelContent = 'Hello Test';
+					let mode = accessor.modeService.getOrCreateMode('json');
+					return accessor.modelService.createModel(modelContent, mode, resource);
+				});
 			}
 		});
 
diff --git a/src/vs/workbench/services/themes/common/workbenchThemeService.ts b/src/vs/workbench/services/themes/common/workbenchThemeService.ts
index 8d8a6df7b78..fb288d66132 100644
--- a/src/vs/workbench/services/themes/common/workbenchThemeService.ts
+++ b/src/vs/workbench/services/themes/common/workbenchThemeService.ts
@@ -59,6 +59,7 @@ export interface IWorkbenchThemeService extends IThemeService {
 	getColorTheme(): IColorTheme;
 	getColorThemes(): TPromise<IColorTheme[]>;
 	onDidColorThemeChange: Event<IColorTheme>;
+	restoreColorTheme();
 
 	setFileIconTheme(iconThemeId: string, settingsTarget: ConfigurationTarget): TPromise<IFileIconTheme>;
 	getFileIconTheme(): IFileIconTheme;
diff --git a/src/vs/workbench/services/themes/electron-browser/colorThemeData.ts b/src/vs/workbench/services/themes/electron-browser/colorThemeData.ts
index d125349a8fb..81c979f3f8a 100644
--- a/src/vs/workbench/services/themes/electron-browser/colorThemeData.ts
+++ b/src/vs/workbench/services/themes/electron-browser/colorThemeData.ts
@@ -13,14 +13,14 @@ import { TPromise } from 'vs/base/common/winjs.base';
 import * as nls from 'vs/nls';
 import * as types from 'vs/base/common/types';
 import * as objects from 'vs/base/common/objects';
-
-import * as pfs from 'vs/base/node/pfs';
-
+import * as resources from 'vs/base/common/resources';
 import { Extensions, IColorRegistry, ColorIdentifier, editorBackground, editorForeground } from 'vs/platform/theme/common/colorRegistry';
 import { ThemeType } from 'vs/platform/theme/common/themeService';
 import { Registry } from 'vs/platform/registry/common/platform';
-import { WorkbenchThemeService, IColorCustomizations } from 'vs/workbench/services/themes/electron-browser/workbenchThemeService';
+import { IColorCustomizations } from 'vs/workbench/services/themes/electron-browser/workbenchThemeService';
 import { getParseErrorMessage } from 'vs/base/common/jsonErrorMessages';
+import { URI } from 'vs/base/common/uri';
+import { IFileService } from 'vs/platform/files/common/files';
 
 let colorRegistry = Registry.as<IColorRegistry>(Extensions.ColorContribution);
 
@@ -44,7 +44,7 @@ export class ColorThemeData implements IColorTheme {
 	settingsId: string;
 	description?: string;
 	isLoaded: boolean;
-	path?: string;
+	location?: URI;
 	extensionData: ExtensionData;
 
 	get tokenColors(): ITokenColorizationRule[] {
@@ -136,10 +136,10 @@ export class ColorThemeData implements IColorTheme {
 		}
 	}
 
-	public ensureLoaded(themeService: WorkbenchThemeService): TPromise<void> {
+	public ensureLoaded(fileService: IFileService): TPromise<void> {
 		if (!this.isLoaded) {
-			if (this.path) {
-				return _loadColorThemeFromFile(this.path, this.themeTokenColors, this.colorMap).then(_ => {
+			if (this.location) {
+				return _loadColorTheme(fileService, this.location, this.themeTokenColors, this.colorMap).then(_ => {
 					this.isLoaded = true;
 					this.sanitizeTokenColors();
 				});
@@ -189,9 +189,12 @@ export class ColorThemeData implements IColorTheme {
 		return objects.equals(this.colorMap, other.colorMap) && objects.equals(this.tokenColors, other.tokenColors);
 	}
 
+	get baseTheme(): string {
+		return this.id.split(' ')[0];
+	}
+
 	get type(): ThemeType {
-		let baseTheme = this.id.split(' ')[0];
-		switch (baseTheme) {
+		switch (this.baseTheme) {
 			case VS_LIGHT_THEME: return 'light';
 			case VS_HC_THEME: return 'hc';
 			default: return 'dark';
@@ -244,7 +247,7 @@ export class ColorThemeData implements IColorTheme {
 		}
 	}
 
-	static fromExtensionTheme(theme: IThemeExtensionPoint, normalizedAbsolutePath: string, extensionData: ExtensionData): ColorThemeData {
+	static fromExtensionTheme(theme: IThemeExtensionPoint, colorThemeLocation: URI, extensionData: ExtensionData): ColorThemeData {
 		let baseTheme: string = theme['uiTheme'] || 'vs-dark';
 
 		let themeSelector = toCSSSelector(extensionData.extensionId + '-' + Paths.normalize(theme.path));
@@ -253,7 +256,7 @@ export class ColorThemeData implements IColorTheme {
 		themeData.label = theme.label || Paths.basename(theme.path);
 		themeData.settingsId = theme.id || themeData.label;
 		themeData.description = theme.description;
-		themeData.path = normalizedAbsolutePath;
+		themeData.location = colorThemeLocation;
 		themeData.extensionData = extensionData;
 		themeData.isLoaded = false;
 		return themeData;
@@ -270,17 +273,17 @@ function toCSSSelector(str: string) {
 	return str;
 }
 
-function _loadColorThemeFromFile(themePath: string, resultRules: ITokenColorizationRule[], resultColors: IColorMap): TPromise<any> {
-	if (Paths.extname(themePath) === '.json') {
-		return pfs.readFile(themePath).then(content => {
+function _loadColorTheme(fileService: IFileService, themeLocation: URI, resultRules: ITokenColorizationRule[], resultColors: IColorMap): TPromise<any> {
+	if (Paths.extname(themeLocation.path) === '.json') {
+		return fileService.resolveContent(themeLocation, { encoding: 'utf8' }).then(content => {
 			let errors: Json.ParseError[] = [];
-			let contentValue = Json.parse(content.toString(), errors);
+			let contentValue = Json.parse(content.value.toString(), errors);
 			if (errors.length > 0) {
 				return TPromise.wrapError(new Error(nls.localize('error.cannotparsejson', "Problems parsing JSON theme file: {0}", errors.map(e => getParseErrorMessage(e.error)).join(', '))));
 			}
 			let includeCompletes = TPromise.as(null);
 			if (contentValue.include) {
-				includeCompletes = _loadColorThemeFromFile(Paths.join(Paths.dirname(themePath), contentValue.include), resultRules, resultColors);
+				includeCompletes = _loadColorTheme(fileService, resources.joinPath(resources.dirname(themeLocation), contentValue.include), resultRules, resultColors);
 			}
 			return includeCompletes.then(_ => {
 				if (Array.isArray(contentValue.settings)) {
@@ -290,7 +293,7 @@ function _loadColorThemeFromFile(themePath: string, resultRules: ITokenColorizat
 				let colors = contentValue.colors;
 				if (colors) {
 					if (typeof colors !== 'object') {
-						return TPromise.wrapError(new Error(nls.localize({ key: 'error.invalidformat.colors', comment: ['{0} will be replaced by a path. Values in quotes should not be translated.'] }, "Problem parsing color theme file: {0}. Property 'colors' is not of type 'object'.", themePath)));
+						return TPromise.wrapError(new Error(nls.localize({ key: 'error.invalidformat.colors', comment: ['{0} will be replaced by a path. Values in quotes should not be translated.'] }, "Problem parsing color theme file: {0}. Property 'colors' is not of type 'object'.", themeLocation.toString())));
 					}
 					// new JSON color themes format
 					for (let colorId in colors) {
@@ -306,16 +309,16 @@ function _loadColorThemeFromFile(themePath: string, resultRules: ITokenColorizat
 						resultRules.push(...tokenColors);
 						return null;
 					} else if (typeof tokenColors === 'string') {
-						return _loadSyntaxTokensFromFile(Paths.join(Paths.dirname(themePath), tokenColors), resultRules, {});
+						return _loadSyntaxTokens(fileService, resources.joinPath(resources.dirname(themeLocation), tokenColors), resultRules, {});
 					} else {
-						return TPromise.wrapError(new Error(nls.localize({ key: 'error.invalidformat.tokenColors', comment: ['{0} will be replaced by a path. Values in quotes should not be translated.'] }, "Problem parsing color theme file: {0}. Property 'tokenColors' should be either an array specifying colors or a path to a TextMate theme file", themePath)));
+						return TPromise.wrapError(new Error(nls.localize({ key: 'error.invalidformat.tokenColors', comment: ['{0} will be replaced by a path. Values in quotes should not be translated.'] }, "Problem parsing color theme file: {0}. Property 'tokenColors' should be either an array specifying colors or a path to a TextMate theme file", themeLocation.toString())));
 					}
 				}
 				return null;
 			});
 		});
 	} else {
-		return _loadSyntaxTokensFromFile(themePath, resultRules, resultColors);
+		return _loadSyntaxTokens(fileService, themeLocation, resultRules, resultColors);
 	}
 }
 
@@ -324,11 +327,11 @@ function getPListParser() {
 	return pListParser || import('fast-plist');
 }
 
-function _loadSyntaxTokensFromFile(themePath: string, resultRules: ITokenColorizationRule[], resultColors: IColorMap): TPromise<any> {
-	return pfs.readFile(themePath).then(content => {
+function _loadSyntaxTokens(fileService: IFileService, themeLocation: URI, resultRules: ITokenColorizationRule[], resultColors: IColorMap): TPromise<any> {
+	return fileService.resolveContent(themeLocation, { encoding: 'utf8' }).then(content => {
 		return getPListParser().then(parser => {
 			try {
-				let contentValue = parser.parse(content.toString());
+				let contentValue = parser.parse(content.value.toString());
 				let settings: ITokenColorizationRule[] = contentValue.settings;
 				if (!Array.isArray(settings)) {
 					return TPromise.wrapError(new Error(nls.localize('error.plist.invalidformat', "Problem parsing tmTheme file: {0}. 'settings' is not array.")));
@@ -340,7 +343,7 @@ function _loadSyntaxTokensFromFile(themePath: string, resultRules: ITokenColoriz
 			}
 		});
 	}, error => {
-		return TPromise.wrapError(new Error(nls.localize('error.cannotload', "Problems loading tmTheme file {0}: {1}", themePath, error.message)));
+		return TPromise.wrapError(new Error(nls.localize('error.cannotload', "Problems loading tmTheme file {0}: {1}", themeLocation.toString(), error.message)));
 	});
 }
 
diff --git a/src/vs/workbench/services/themes/electron-browser/colorThemeStore.ts b/src/vs/workbench/services/themes/electron-browser/colorThemeStore.ts
index 8e31e971fcd..e6bbeb645ba 100644
--- a/src/vs/workbench/services/themes/electron-browser/colorThemeStore.ts
+++ b/src/vs/workbench/services/themes/electron-browser/colorThemeStore.ts
@@ -7,14 +7,14 @@
 import * as nls from 'vs/nls';
 
 import * as types from 'vs/base/common/types';
-import * as Paths from 'path';
+import * as resources from 'vs/base/common/resources';
 import { ExtensionsRegistry, ExtensionMessageCollector } from 'vs/workbench/services/extensions/common/extensionsRegistry';
 import { IColorTheme, ExtensionData, IThemeExtensionPoint, VS_LIGHT_THEME, VS_DARK_THEME, VS_HC_THEME } from 'vs/workbench/services/themes/common/workbenchThemeService';
 import { ColorThemeData } from 'vs/workbench/services/themes/electron-browser/colorThemeData';
 import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { Event, Emitter } from 'vs/base/common/event';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 
 
 let themesExtPoint = ExtensionsRegistry.registerExtensionPoint<IThemeExtensionPoint[]>('themes', [], {
@@ -93,13 +93,13 @@ export class ColorThemeStore {
 				));
 				return;
 			}
-			// TODO@extensionLocation
-			let normalizedAbsolutePath = Paths.normalize(Paths.join(extensionLocation.fsPath, theme.path));
 
-			if (normalizedAbsolutePath.indexOf(Paths.normalize(extensionLocation.fsPath)) !== 0) {
-				collector.warn(nls.localize('invalid.path.1', "Expected `contributes.{0}.path` ({1}) to be included inside extension's folder ({2}). This might make the extension non-portable.", themesExtPoint.name, normalizedAbsolutePath, extensionLocation.fsPath));
+			const colorThemeLocation = resources.joinPath(extensionLocation, theme.path);
+			if (!resources.isEqualOrParent(colorThemeLocation, extensionLocation)) {
+				collector.warn(nls.localize('invalid.path.1', "Expected `contributes.{0}.path` ({1}) to be included inside extension's folder ({2}). This might make the extension non-portable.", themesExtPoint.name, colorThemeLocation.path, extensionLocation.path));
 			}
-			let themeData = ColorThemeData.fromExtensionTheme(theme, normalizedAbsolutePath, extensionData);
+
+			let themeData = ColorThemeData.fromExtensionTheme(theme, colorThemeLocation, extensionData);
 			if (themeData.id === this.extensionsColorThemes[0].id) {
 				this.extensionsColorThemes[0] = themeData;
 			} else {
diff --git a/src/vs/workbench/services/themes/electron-browser/fileIconThemeData.ts b/src/vs/workbench/services/themes/electron-browser/fileIconThemeData.ts
index 5f233d3ea3d..b6d8dd31b17 100644
--- a/src/vs/workbench/services/themes/electron-browser/fileIconThemeData.ts
+++ b/src/vs/workbench/services/themes/electron-browser/fileIconThemeData.ts
@@ -4,14 +4,14 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import * as nls from 'vs/nls';
 import * as Paths from 'path';
+import * as resources from 'vs/base/common/resources';
 import * as Json from 'vs/base/common/json';
 import { ExtensionData, IThemeExtensionPoint, IFileIconTheme } from 'vs/workbench/services/themes/common/workbenchThemeService';
 import { TPromise } from 'vs/base/common/winjs.base';
-import * as pfs from 'vs/base/node/pfs';
-import { WorkbenchThemeService } from 'vs/workbench/services/themes/electron-browser/workbenchThemeService';
+import { IFileService } from 'vs/platform/files/common/files';
 import { getParseErrorMessage } from 'vs/base/common/jsonErrorMessages';
 
 export class FileIconThemeData implements IFileIconTheme {
@@ -23,7 +23,7 @@ export class FileIconThemeData implements IFileIconTheme {
 	hasFolderIcons?: boolean;
 	hidesExplorerArrows?: boolean;
 	isLoaded: boolean;
-	path?: string;
+	location?: URI;
 	extensionData: ExtensionData;
 
 	styleSheetContent?: string;
@@ -31,11 +31,11 @@ export class FileIconThemeData implements IFileIconTheme {
 	private constructor() {
 	}
 
-	public ensureLoaded(themeService: WorkbenchThemeService): TPromise<string> {
+	public ensureLoaded(fileService: IFileService): TPromise<string> {
 		if (!this.isLoaded) {
-			if (this.path) {
-				return _loadIconThemeDocument(this.path).then(iconThemeDocument => {
-					let result = _processIconThemeDocument(this.id, this.path, iconThemeDocument);
+			if (this.location) {
+				return _loadIconThemeDocument(fileService, this.location).then(iconThemeDocument => {
+					let result = _processIconThemeDocument(this.id, this.location, iconThemeDocument);
 					this.styleSheetContent = result.content;
 					this.hasFileIcons = result.hasFileIcons;
 					this.hasFolderIcons = result.hasFolderIcons;
@@ -48,13 +48,13 @@ export class FileIconThemeData implements IFileIconTheme {
 		return TPromise.as(this.styleSheetContent);
 	}
 
-	static fromExtensionTheme(iconTheme: IThemeExtensionPoint, normalizedAbsolutePath: string, extensionData: ExtensionData): FileIconThemeData {
+	static fromExtensionTheme(iconTheme: IThemeExtensionPoint, iconThemeLocation: URI, extensionData: ExtensionData): FileIconThemeData {
 		let themeData = new FileIconThemeData();
 		themeData.id = extensionData.extensionId + '-' + iconTheme.id;
 		themeData.label = iconTheme.label || Paths.basename(iconTheme.path);
 		themeData.settingsId = iconTheme.id;
 		themeData.description = iconTheme.description;
-		themeData.path = normalizedAbsolutePath;
+		themeData.location = iconThemeLocation;
 		themeData.extensionData = extensionData;
 		themeData.isLoaded = false;
 		return themeData;
@@ -89,13 +89,15 @@ export class FileIconThemeData implements IFileIconTheme {
 					case 'description':
 					case 'settingsId':
 					case 'extensionData':
-					case 'path':
 					case 'styleSheetContent':
 					case 'hasFileIcons':
 					case 'hidesExplorerArrows':
 					case 'hasFolderIcons':
 						theme[key] = data[key];
 						break;
+					case 'location':
+						theme.location = URI.revive(data.location);
+						break;
 				}
 			}
 			return theme;
@@ -110,7 +112,7 @@ export class FileIconThemeData implements IFileIconTheme {
 			label: this.label,
 			description: this.description,
 			settingsId: this.settingsId,
-			path: this.path,
+			location: this.location,
 			styleSheetContent: this.styleSheetContent,
 			hasFileIcons: this.hasFileIcons,
 			hasFolderIcons: this.hasFolderIcons,
@@ -156,10 +158,10 @@ interface IconThemeDocument extends IconsAssociation {
 	hidesExplorerArrows?: boolean;
 }
 
-function _loadIconThemeDocument(fileSetPath: string): TPromise<IconThemeDocument> {
-	return pfs.readFile(fileSetPath).then(content => {
+function _loadIconThemeDocument(fileService: IFileService, location: URI): TPromise<IconThemeDocument> {
+	return fileService.resolveContent(location, { encoding: 'utf8' }).then((content) => {
 		let errors: Json.ParseError[] = [];
-		let contentValue = Json.parse(content.toString(), errors);
+		let contentValue = Json.parse(content.value.toString(), errors);
 		if (errors.length > 0 || !contentValue) {
 			return TPromise.wrapError(new Error(nls.localize('error.cannotparseicontheme', "Problems parsing file icons file: {0}", errors.map(e => getParseErrorMessage(e.error)).join(', '))));
 		}
@@ -167,7 +169,7 @@ function _loadIconThemeDocument(fileSetPath: string): TPromise<IconThemeDocument
 	});
 }
 
-function _processIconThemeDocument(id: string, iconThemeDocumentPath: string, iconThemeDocument: IconThemeDocument): { content: string; hasFileIcons: boolean; hasFolderIcons: boolean; hidesExplorerArrows: boolean; } {
+function _processIconThemeDocument(id: string, iconThemeDocumentLocation: URI, iconThemeDocument: IconThemeDocument): { content: string; hasFileIcons: boolean; hasFolderIcons: boolean; hidesExplorerArrows: boolean; } {
 
 	let result = { content: '', hasFileIcons: false, hasFolderIcons: false, hidesExplorerArrows: iconThemeDocument.hidesExplorerArrows };
 
@@ -176,9 +178,9 @@ function _processIconThemeDocument(id: string, iconThemeDocumentPath: string, ic
 	}
 	let selectorByDefinitionId: { [def: string]: string[] } = {};
 
+	const iconThemeDocumentLocationDirname = resources.dirname(iconThemeDocumentLocation);
 	function resolvePath(path: string) {
-		const uri = URI.file(Paths.join(Paths.dirname(iconThemeDocumentPath), path));
-		return uri.toString();
+		return resources.joinPath(iconThemeDocumentLocationDirname, path);
 	}
 
 	function collectSelectors(associations: IconsAssociation, baseThemeClassName?: string) {
diff --git a/src/vs/workbench/services/themes/electron-browser/fileIconThemeStore.ts b/src/vs/workbench/services/themes/electron-browser/fileIconThemeStore.ts
index 7ab3a5bbe62..4b63bc2c96f 100644
--- a/src/vs/workbench/services/themes/electron-browser/fileIconThemeStore.ts
+++ b/src/vs/workbench/services/themes/electron-browser/fileIconThemeStore.ts
@@ -7,14 +7,14 @@
 import * as nls from 'vs/nls';
 
 import * as types from 'vs/base/common/types';
-import * as Paths from 'path';
+import * as resources from 'vs/base/common/resources';
 import { ExtensionsRegistry, ExtensionMessageCollector } from 'vs/workbench/services/extensions/common/extensionsRegistry';
 import { ExtensionData, IThemeExtensionPoint } from 'vs/workbench/services/themes/common/workbenchThemeService';
 import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { Event, Emitter } from 'vs/base/common/event';
 import { FileIconThemeData } from 'vs/workbench/services/themes/electron-browser/fileIconThemeData';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 
 let iconThemeExtPoint = ExtensionsRegistry.registerExtensionPoint<IThemeExtensionPoint[]>('iconThemes', [], {
 	description: nls.localize('vscode.extension.contributes.iconThemes', 'Contributes file icon themes.'),
@@ -95,14 +95,13 @@ export class FileIconThemeStore {
 				));
 				return;
 			}
-			// TODO@extensionLocation
-			let normalizedAbsolutePath = Paths.normalize(Paths.join(extensionLocation.fsPath, iconTheme.path));
 
-			if (normalizedAbsolutePath.indexOf(Paths.normalize(extensionLocation.fsPath)) !== 0) {
-				collector.warn(nls.localize('invalid.path.1', "Expected `contributes.{0}.path` ({1}) to be included inside extension's folder ({2}). This might make the extension non-portable.", iconThemeExtPoint.name, normalizedAbsolutePath, extensionLocation.fsPath));
+			const iconThemeLocation = resources.joinPath(extensionLocation, iconTheme.path);
+			if (!resources.isEqualOrParent(iconThemeLocation, extensionLocation)) {
+				collector.warn(nls.localize('invalid.path.1', "Expected `contributes.{0}.path` ({1}) to be included inside extension's folder ({2}). This might make the extension non-portable.", iconThemeExtPoint.name, iconThemeLocation.path, extensionLocation.path));
 			}
 
-			let themeData = FileIconThemeData.fromExtensionTheme(iconTheme, normalizedAbsolutePath, extensionData);
+			let themeData = FileIconThemeData.fromExtensionTheme(iconTheme, iconThemeLocation, extensionData);
 			this.knownIconThemes.push(themeData);
 		});
 
diff --git a/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.ts b/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.ts
index dc07f87f195..c6af43bc078 100644
--- a/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.ts
+++ b/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.ts
@@ -18,19 +18,17 @@ import { IConfigurationRegistry, Extensions as ConfigurationExtensions, IConfigu
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { ColorThemeData } from './colorThemeData';
 import { ITheme, Extensions as ThemingExtensions, IThemingRegistry } from 'vs/platform/theme/common/themeService';
-import { editorBackground } from 'vs/platform/theme/common/colorRegistry';
-import { Color } from 'vs/base/common/color';
 import { Event, Emitter } from 'vs/base/common/event';
 import * as colorThemeSchema from 'vs/workbench/services/themes/common/colorThemeSchema';
 import * as fileIconThemeSchema from 'vs/workbench/services/themes/common/fileIconThemeSchema';
 import { IDisposable } from 'vs/base/common/lifecycle';
-import { IBroadcastService } from 'vs/platform/broadcast/electron-browser/broadcastService';
 import { ColorThemeStore } from 'vs/workbench/services/themes/electron-browser/colorThemeStore';
 import { FileIconThemeStore } from 'vs/workbench/services/themes/electron-browser/fileIconThemeStore';
 import { FileIconThemeData } from 'vs/workbench/services/themes/electron-browser/fileIconThemeData';
 import { IWindowService } from 'vs/platform/windows/common/windows';
 import { removeClasses, addClasses } from 'vs/base/browser/dom';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
+import { IFileService } from 'vs/platform/files/common/files';
 
 // implementation
 
@@ -70,6 +68,8 @@ export interface IColorCustomizations {
 export class WorkbenchThemeService implements IWorkbenchThemeService {
 	_serviceBrand: any;
 
+	private fileService: IFileService;
+
 	private colorThemeStore: ColorThemeStore;
 	private currentColorTheme: ColorThemeData;
 	private container: HTMLElement;
@@ -94,7 +94,6 @@ export class WorkbenchThemeService implements IWorkbenchThemeService {
 		container: HTMLElement,
 		@IExtensionService extensionService: IExtensionService,
 		@IStorageService private storageService: IStorageService,
-		@IBroadcastService private broadcastService: IBroadcastService,
 		@IConfigurationService private configurationService: IConfigurationService,
 		@ITelemetryService private telemetryService: ITelemetryService,
 		@IWindowService private windowService: IWindowService,
@@ -127,9 +126,9 @@ export class WorkbenchThemeService implements IWorkbenchThemeService {
 		if (persistedThemeData) {
 			themeData = ColorThemeData.fromStorageData(persistedThemeData);
 		}
-		if (!themeData) {
-			let isLightTheme = (Array.prototype.indexOf.call(document.body.classList, 'vs') >= 0);
-			themeData = ColorThemeData.createUnloadedTheme(isLightTheme ? VS_LIGHT_THEME : VS_DARK_THEME);
+		let containerBaseTheme = this.getBaseThemeFromContainer();
+		if (!themeData || themeData && themeData.baseTheme !== containerBaseTheme) {
+			themeData = ColorThemeData.createUnloadedTheme(containerBaseTheme);
 		}
 		themeData.setCustomColors(this.colorCustomizations);
 		themeData.setCustomTokenColors(this.tokenColorCustomizations);
@@ -182,6 +181,10 @@ export class WorkbenchThemeService implements IWorkbenchThemeService {
 		});
 	}
 
+	acquireFileService(fileService: IFileService): void {
+		this.fileService = fileService;
+	}
+
 	public get onDidColorThemeChange(): Event<IColorTheme> {
 		return this.onColorThemeChange.event;
 	}
@@ -278,7 +281,7 @@ export class WorkbenchThemeService implements IWorkbenchThemeService {
 
 		return this.colorThemeStore.findThemeData(themeId, DEFAULT_THEME_ID).then(themeData => {
 			if (themeData) {
-				return themeData.ensureLoaded(this).then(_ => {
+				return themeData.ensureLoaded(this.fileService).then(_ => {
 					if (themeId === this.currentColorTheme.id && !this.currentColorTheme.isLoaded && this.currentColorTheme.hasEqualData(themeData)) {
 						// the loaded theme is identical to the perisisted theme. Don't need to send an event.
 						this.currentColorTheme = themeData;
@@ -291,13 +294,24 @@ export class WorkbenchThemeService implements IWorkbenchThemeService {
 					this.updateDynamicCSSRules(themeData);
 					return this.applyTheme(themeData, settingsTarget);
 				}, error => {
-					return TPromise.wrapError<IColorTheme>(new Error(nls.localize('error.cannotloadtheme', "Unable to load {0}: {1}", themeData.path, error.message)));
+					return TPromise.wrapError<IColorTheme>(new Error(nls.localize('error.cannotloadtheme', "Unable to load {0}: {1}", themeData.location.toString(), error.message)));
 				});
 			}
 			return null;
 		});
 	}
 
+	public restoreColorTheme() {
+		let colorThemeSetting = this.configurationService.getValue<string>(COLOR_THEME_SETTING);
+		if (colorThemeSetting !== this.currentColorTheme.settingsId) {
+			this.colorThemeStore.findThemeDataBySettingsId(colorThemeSetting, null).then(theme => {
+				if (theme) {
+					this.setColorTheme(theme.id, null);
+				}
+			});
+		}
+	}
+
 	private updateDynamicCSSRules(themeData: ITheme) {
 		let cssRules: string[] = [];
 		let hasRule: { [rule: string]: boolean } = {};
@@ -335,11 +349,6 @@ export class WorkbenchThemeService implements IWorkbenchThemeService {
 
 		this.onColorThemeChange.fire(this.currentColorTheme);
 
-		if (settingsTarget !== ConfigurationTarget.WORKSPACE) {
-			let background = Color.Format.CSS.formatHex(newTheme.getColor(editorBackground)); // only take RGB, its what is used in the initial CSS
-			let data = { id: newTheme.id, background: background };
-			this.broadcastService.broadcast({ channel: 'vscode:changeColorTheme', payload: JSON.stringify(data) });
-		}
 		// remember theme data for a quick restore
 		this.storageService.store(PERSISTED_THEME_STORAGE_KEY, newTheme.toStorageData());
 
@@ -405,7 +414,7 @@ export class WorkbenchThemeService implements IWorkbenchThemeService {
 			if (!iconThemeData) {
 				iconThemeData = FileIconThemeData.noIconTheme();
 			}
-			return iconThemeData.ensureLoaded(this).then(_ => {
+			return iconThemeData.ensureLoaded(this.fileService).then(_ => {
 				return _applyIconTheme(iconThemeData, onApply);
 			});
 		});
@@ -442,6 +451,18 @@ export class WorkbenchThemeService implements IWorkbenchThemeService {
 		}
 		return this._configurationWriter;
 	}
+
+	private getBaseThemeFromContainer() {
+		if (this.container) {
+			for (let i = this.container.classList.length - 1; i >= 0; i--) {
+				const item = document.body.classList.item(i);
+				if (item === VS_LIGHT_THEME || item === VS_DARK_THEME || item === VS_HC_THEME) {
+					return item;
+				}
+			}
+		}
+		return VS_DARK_THEME;
+	}
 }
 
 function _applyIconTheme(data: FileIconThemeData, onApply: (theme: FileIconThemeData) => TPromise<IFileIconTheme>): TPromise<IFileIconTheme> {
diff --git a/src/vs/workbench/services/timer/common/timerService.ts b/src/vs/workbench/services/timer/common/timerService.ts
deleted file mode 100644
index 84842c4eb00..00000000000
--- a/src/vs/workbench/services/timer/common/timerService.ts
+++ /dev/null
@@ -1,98 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-'use strict';
-
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-
-export const ITimerService = createDecorator<ITimerService>('timerService');
-
-/* __GDPR__FRAGMENT__
-	"IMemoryInfo" : {
-		"workingSetSize" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true },
-		"peakWorkingSetSize": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true },
-		"privateBytes": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true },
-		"sharedBytes": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true }
-	}
-*/
-export interface IMemoryInfo {
-	workingSetSize: number;
-	peakWorkingSetSize: number;
-	privateBytes: number;
-	sharedBytes: number;
-}
-
-/* __GDPR__FRAGMENT__
-	"IStartupMetrics" : {
-		"version" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
-		"ellapsed" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true },
-		"timers.ellapsedAppReady" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true },
-		"timers.ellapsedWindowLoad" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true },
-		"timers.ellapsedWindowLoadToRequire" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true },
-		"timers.ellapsedExtensions" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true },
-		"timers.ellapsedExtensionsReady" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true },
-		"timers.ellapsedRequire" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true },
-		"timers.ellapsedViewletRestore" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true },
-		"timers.ellapsedEditorRestore" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true },
-		"timers.ellapsedWorkbench" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true },
-		"timers.ellapsedTimersToTimersComputed" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true },
-		"timers.ellapsedNlsGeneration" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true },
-		"platform" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
-		"release" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
-		"arch" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
-		"totalmem" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true },
-		"freemem" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true },
-		"meminfo" : { "${inline}": [ "${IMemoryInfo}" ] },
-		"cpus.count" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true },
-		"cpus.speed" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true },
-		"cpus.model" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
-		"initialStartup" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true },
-		"hasAccessibilitySupport" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true },
-		"isVMLikelyhood" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true },
-		"emptyWorkbench" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true },
-		"loadavg" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" }
-	}
-*/
-export interface IStartupMetrics {
-	version: number;
-	ellapsed: number;
-	timers: {
-		ellapsedAppReady?: number;
-		ellapsedWindowLoad?: number;
-		ellapsedWindowLoadToRequire: number;
-		ellapsedExtensions: number;
-		ellapsedExtensionsReady: number;
-		ellapsedRequire: number;
-		ellapsedViewletRestore: number;
-		ellapsedEditorRestore: number;
-		ellapsedWorkbench: number;
-		ellapsedTimersToTimersComputed: number;
-		ellapsedNlsGeneration: number;
-	};
-	platform: string;
-	release: string;
-	arch: string;
-	totalmem: number;
-	freemem: number;
-	meminfo: IMemoryInfo;
-	cpus: { count: number; speed: number; model: string; };
-	initialStartup: boolean;
-	hasAccessibilitySupport: boolean;
-	isVMLikelyhood: number;
-	emptyWorkbench: boolean;
-	loadavg: number[];
-}
-
-export interface IInitData {
-	start: number;
-	windowLoad: number;
-	isInitialStartup: boolean;
-	hasAccessibilitySupport: boolean;
-}
-
-export interface ITimerService extends IInitData {
-	_serviceBrand: any;
-
-	readonly startupMetrics: IStartupMetrics;
-}
diff --git a/src/vs/workbench/services/timer/electron-browser/timerService.ts b/src/vs/workbench/services/timer/electron-browser/timerService.ts
new file mode 100644
index 00000000000..3134aa7889c
--- /dev/null
+++ b/src/vs/workbench/services/timer/electron-browser/timerService.ts
@@ -0,0 +1,422 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+'use strict';
+
+import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
+import { virtualMachineHint } from 'vs/base/node/id';
+import * as perf from 'vs/base/common/performance';
+import * as os from 'os';
+import { getAccessibilitySupport } from 'vs/base/browser/browser';
+import { AccessibilitySupport } from 'vs/base/common/platform';
+import { IWindowService, IWindowsService } from 'vs/platform/windows/common/windows';
+import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
+import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
+import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
+import { isFalsyOrEmpty } from 'vs/base/common/arrays';
+import { IUpdateService } from 'vs/platform/update/common/update';
+import { ILifecycleService } from 'vs/platform/lifecycle/common/lifecycle';
+import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet';
+import { IPanelService } from 'vs/workbench/services/panel/common/panelService';
+import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
+
+
+/* __GDPR__FRAGMENT__
+	"IMemoryInfo" : {
+		"workingSetSize" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true },
+		"peakWorkingSetSize": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true },
+		"privateBytes": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true },
+		"sharedBytes": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true }
+	}
+*/
+export interface IMemoryInfo {
+	workingSetSize: number;
+	peakWorkingSetSize: number;
+	privateBytes: number;
+	sharedBytes: number;
+}
+
+/* __GDPR__FRAGMENT__
+	"IStartupMetrics" : {
+		"version" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+		"ellapsed" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true },
+		"isLatestVersion": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+		"didUseCachedData": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+		"windowKind": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+		"windowCount": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+		"viewletId": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+		"panelId": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+		"editorIds": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+		"timers.ellapsedAppReady" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true },
+		"timers.ellapsedWindowLoad" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true },
+		"timers.ellapsedWindowLoadToRequire" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true },
+		"timers.ellapsedExtensions" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true },
+		"timers.ellapsedExtensionsReady" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true },
+		"timers.ellapsedRequire" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true },
+		"timers.ellapsedViewletRestore" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true },
+		"timers.ellapsedPanelRestore" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true },
+		"timers.ellapsedEditorRestore" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true },
+		"timers.ellapsedWorkbench" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true },
+		"timers.ellapsedTimersToTimersComputed" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true },
+		"timers.ellapsedNlsGeneration" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true },
+		"platform" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+		"release" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+		"arch" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+		"totalmem" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true },
+		"freemem" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true },
+		"meminfo" : { "${inline}": [ "${IMemoryInfo}" ] },
+		"cpus.count" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true },
+		"cpus.speed" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true },
+		"cpus.model" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+		"initialStartup" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true },
+		"hasAccessibilitySupport" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true },
+		"isVMLikelyhood" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true },
+		"emptyWorkbench" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true },
+		"loadavg" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" }
+	}
+*/
+export interface IStartupMetrics {
+
+	/**
+	 * The version of these metrics.
+	 */
+	version: 2;
+
+	/**
+	 * If this started the main process and renderer or just a renderer (new or reloaded).
+	 */
+	initialStartup: boolean;
+
+	/**
+	 * No folder, no file, no workspace has been opened
+	 */
+	emptyWorkbench: boolean;
+
+	/**
+	 * This is the latest (stable/insider) version. Iff not we should ignore this
+	 * measurement.
+	 */
+	isLatestVersion: boolean;
+
+	/**
+	 * Whether we asked for and V8 accepted cached data.
+	 */
+	didUseCachedData: boolean;
+
+	/**
+	 * How/why the window was created. See https://github.com/Microsoft/vscode/blob/d1f57d871722f4d6ba63e4ef6f06287121ceb045/src/vs/platform/lifecycle/common/lifecycle.ts#L50
+	 */
+	windowKind: number;
+
+	/**
+	 * The total number of windows that have been restored/created
+	 */
+	windowCount: number;
+
+	/**
+	 * The active viewlet id or `undedined`
+	 */
+	viewletId: string;
+
+	/**
+	 * The active panel id or `undefined`
+	 */
+	panelId: string;
+
+	/**
+	 * The editor input types or `[]`
+	 */
+	editorIds: string[];
+
+	/**
+	 * The time it took to create the workbench.
+	 *
+	 * * Happens in the main-process *and* the renderer-process
+	 * * Measured with the *start* and `didStartWorkbench`-performance mark. The *start* is either the start of the
+	 * main process or the start of the renderer.
+	 * * This should be looked at carefully because times vary depending on
+	 *  * This being the first window, the only window, or a reloaded window
+	 *  * Cached data being present and used or not
+	 *  * The numbers and types of editors being restored
+	 *  * The numbers of windows being restored (when starting 'fresh')
+	 *  * The viewlet being restored (esp. when it's a contributed viewlet)
+	 */
+	ellapsed: number;
+
+	/**
+	 * Individual timers...
+	 */
+	timers: {
+		/**
+		 * The time it took to receieve the [`ready`](https://electronjs.org/docs/api/app#event-ready)-event. Measured from the first line
+		 * of JavaScript code till receiving that event.
+		 *
+		 * * Happens in the main-process
+		 * * Measured with the `main:started` and `main:appReady` performance marks.
+		 * * This can be compared between insider and stable builds.
+		 * * This should be looked at per OS version and per electron version.
+		 * * This is often affected by AV software (and can change with AV software updates outside of our release-cycle).
+		 * * It is not our code running here and we can only observe what's happening.
+		 */
+		ellapsedAppReady?: number;
+
+		/**
+		 * The time it took to generate NLS data.
+		 *
+		 * * Happens in the main-process
+		 * * Measured with the `nlsGeneration:start` and `nlsGeneration:end` performance marks.
+		 * * This only happens when a non-english locale is being used.
+		 * * It is our code running here and we should monitor this carefully for regressions.
+		 */
+		ellapsedNlsGeneration: number;
+
+		/**
+		 * The time it took to tell electron to open/restore a renderer (browser window).
+		 *
+		 * * Happens in the main-process
+		 * * Measured with the `main:appReady` and `main:loadWindow` performance marks.
+		 * * This can be compared between insider and stable builds.
+		 * * It is our code running here and we should monitor this carefully for regressions.
+		 */
+		ellapsedWindowLoad?: number;
+
+		/**
+		 * The time it took to create a new renderer (browser window) and to initialize that to the point
+		 * of load the main-bundle (`workbench.main.js`).
+		 *
+		 * * Happens in the main-process *and* the renderer-process
+		 * * Measured with the `main:loadWindow` and `willLoadWorkbenchMain` performance marks.
+		 * * This can be compared between insider and stable builds.
+		 * * It is mostly not our code running here and we can only observe what's happening.
+		 *
+		 */
+		ellapsedWindowLoadToRequire: number;
+
+		/**
+		 * The time it took to load the main-bundle of the workbench, e.g `workbench.main.js`.
+		 *
+		 * * Happens in the renderer-process
+		 * * Measured with the `willLoadWorkbenchMain` and `didLoadWorkbenchMain` performance marks.
+		 * * This varies *a lot* when V8 cached data could be used or not
+		 * * This should be looked at with and without V8 cached data usage and per electron/v8 version
+		 * * This is affected by the size of our code bundle (which  grows about 3-5% per release)
+		 */
+		ellapsedRequire: number;
+
+		/**
+		 * The time it took to read extensions' package.json-files *and* interpret them (invoking
+		 * the contribution points).
+		 *
+		 * * Happens in the renderer-process
+		 * * Measured with the `willLoadExtensions` and `didLoadExtensions` performance marks.
+		 * * Reading of package.json-files is avoided by caching them all in a single file (after the read,
+		 * until another extension is installed)
+		 * * Happens in parallel to other things, depends on async timing
+		 *
+		 * todo@joh/ramya this measures an artifical dealy we have added, see https://github.com/Microsoft/vscode/blob/2f07ddae8bf56e969e3f4ba1447258ebc999672f/src/vs/workbench/services/extensions/electron-browser/extensionService.ts#L311-L326
+		 */
+		ellapsedExtensions: number;
+
+		// the time from start till `didLoadExtensions`
+		// remove?
+		ellapsedExtensionsReady: number;
+
+		/**
+		 * The time it took to restore the viewlet.
+		 *
+		 * * Happens in the renderer-process
+		 * * Measured with the `willRestoreViewlet` and `didRestoreViewlet` performance marks.
+		 * * This should be looked at per viewlet-type/id.
+		 * * Happens in parallel to other things, depends on async timing
+		 */
+		ellapsedViewletRestore: number;
+
+		/**
+		 * The time it took to restore the panel.
+		 *
+		 * * Happens in the renderer-process
+		 * * Measured with the `willRestorePanel` and `didRestorePanel` performance marks.
+		 * * This should be looked at per panel-type/id.
+		 * * Happens in parallel to other things, depends on async timing
+		 */
+		ellapsedPanelRestore: number;
+
+		/**
+		 * The time it took to restore editors - that is text editor and complex editor likes the settings UI
+		 * or webviews (markdown preview).
+		 *
+		 * * Happens in the renderer-process
+		 * * Measured with the `willRestoreEditors` and `didRestoreEditors` performance marks.
+		 * * This should be looked at per editor and per editor type.
+		 * * Happens in parallel to other things, depends on async timing
+		 *
+		 * todo@joh/ramya We should probably measures each editor individually?
+		 */
+		ellapsedEditorRestore: number;
+
+		/**
+		 * The time it took to create the workbench.
+		 *
+		 * * Happens in the renderer-process
+		 * * Measured with the `willStartWorkbench` and `didStartWorkbench` performance marks.
+		 *
+		 * todo@joh/ramya Not sure if this is useful because this includes too much
+		 */
+		ellapsedWorkbench: number;
+
+		// the time it took to generate this object.
+		// remove?
+		ellapsedTimersToTimersComputed: number;
+	};
+
+	hasAccessibilitySupport: boolean;
+	isVMLikelyhood: number;
+	platform: string;
+	release: string;
+	arch: string;
+	totalmem: number;
+	freemem: number;
+	meminfo: IMemoryInfo;
+	cpus: { count: number; speed: number; model: string; };
+	loadavg: number[];
+}
+
+export interface ITimerService {
+	_serviceBrand: any;
+	readonly startupMetrics: Promise<IStartupMetrics>;
+}
+
+class TimerService implements ITimerService {
+
+	_serviceBrand: any;
+
+	private _startupMetrics: Promise<IStartupMetrics>;
+
+	constructor(
+		@IWindowsService private readonly _windowsService: IWindowsService,
+		@IWindowService private readonly _windowService: IWindowService,
+		@ILifecycleService private readonly _lifecycleService: ILifecycleService,
+		@IWorkspaceContextService private readonly _contextService: IWorkspaceContextService,
+		@IExtensionService private readonly _extensionService: IExtensionService,
+		@IUpdateService private readonly _updateService: IUpdateService,
+		@IViewletService private readonly _viewletService: IViewletService,
+		@IPanelService private readonly _panelService: IPanelService,
+		@IEditorService private readonly _editorService: IEditorService,
+	) {
+	}
+
+	get startupMetrics(): Promise<IStartupMetrics> {
+		if (!this._startupMetrics) {
+			this._startupMetrics = Promise
+				.resolve(this._extensionService.whenInstalledExtensionsRegistered())
+				.then(() => this._computeStartupMetrics());
+		}
+		return this._startupMetrics;
+	}
+
+	private async _computeStartupMetrics(): Promise<IStartupMetrics> {
+
+		const now = Date.now();
+		const initialStartup = !!this._windowService.getConfiguration().isInitialStartup;
+		const startMark = initialStartup ? 'main:started' : 'main:loadWindow';
+
+		let totalmem: number;
+		let freemem: number;
+		let cpus: { count: number; speed: number; model: string; };
+		let platform: string;
+		let release: string;
+		let arch: string;
+		let loadavg: number[];
+		let meminfo: IMemoryInfo;
+		let isVMLikelyhood: number;
+
+		try {
+			totalmem = os.totalmem();
+			freemem = os.freemem();
+			platform = os.platform();
+			release = os.release();
+			arch = os.arch();
+			loadavg = os.loadavg();
+			meminfo = process.getProcessMemoryInfo();
+
+			isVMLikelyhood = Math.round((virtualMachineHint.value() * 100));
+
+			const rawCpus = os.cpus();
+			if (rawCpus && rawCpus.length > 0) {
+				cpus = { count: rawCpus.length, speed: rawCpus[0].speed, model: rawCpus[0].model };
+			}
+		} catch (error) {
+			// ignore, be on the safe side with these hardware method calls
+		}
+
+		return {
+			version: 2,
+			ellapsed: perf.getDuration(startMark, 'didStartWorkbench'),
+
+			// reflections
+			isLatestVersion: Boolean(await this._updateService.isLatestVersion()),
+			didUseCachedData: didUseCachedData(),
+			windowKind: this._lifecycleService.startupKind,
+			windowCount: await this._windowsService.getWindowCount(),
+			viewletId: this._viewletService.getActiveViewlet() ? this._viewletService.getActiveViewlet().getId() : undefined,
+			editorIds: this._editorService.visibleEditors.map(input => input.getTypeId()),
+			panelId: this._panelService.getActivePanel() ? this._panelService.getActivePanel().getId() : undefined,
+
+			// timers
+			timers: {
+				ellapsedAppReady: initialStartup ? perf.getDuration('main:started', 'main:appReady') : undefined,
+				ellapsedNlsGeneration: initialStartup ? perf.getDuration('nlsGeneration:start', 'nlsGeneration:end') : undefined,
+				ellapsedWindowLoad: initialStartup ? perf.getDuration('main:appReady', 'main:loadWindow') : undefined,
+				ellapsedWindowLoadToRequire: perf.getDuration('main:loadWindow', 'willLoadWorkbenchMain'),
+				ellapsedRequire: perf.getDuration('willLoadWorkbenchMain', 'didLoadWorkbenchMain'),
+				ellapsedExtensions: perf.getDuration('willLoadExtensions', 'didLoadExtensions'),
+				ellapsedEditorRestore: perf.getDuration('willRestoreEditors', 'didRestoreEditors'),
+				ellapsedViewletRestore: perf.getDuration('willRestoreViewlet', 'didRestoreViewlet'),
+				ellapsedPanelRestore: perf.getDuration('willRestorePanel', 'didRestorePanel'),
+				ellapsedWorkbench: perf.getDuration('willStartWorkbench', 'didStartWorkbench'),
+				ellapsedExtensionsReady: perf.getDuration(startMark, 'didLoadExtensions'),
+				ellapsedTimersToTimersComputed: Date.now() - now,
+			},
+
+			// system info
+			platform,
+			release,
+			arch,
+			totalmem,
+			freemem,
+			meminfo,
+			cpus,
+			loadavg,
+			initialStartup,
+			isVMLikelyhood,
+			hasAccessibilitySupport: getAccessibilitySupport() === AccessibilitySupport.Enabled,
+			emptyWorkbench: this._contextService.getWorkbenchState() === WorkbenchState.EMPTY
+		};
+	}
+}
+
+export const ITimerService = createDecorator<ITimerService>('timerService');
+
+registerSingleton(ITimerService, TimerService);
+
+//#region cached data logic
+
+export function didUseCachedData(): boolean {
+	// We surely don't use cached data when we don't tell the loader to do so
+	if (!Boolean((<any>global).require.getConfig().nodeCachedDataDir)) {
+		return false;
+	}
+	// whenever cached data is produced or rejected a onNodeCachedData-callback is invoked. That callback
+	// stores data in the `MonacoEnvironment.onNodeCachedData` global. See:
+	// https://github.com/Microsoft/vscode/blob/efe424dfe76a492eab032343e2fa4cfe639939f0/src/vs/workbench/electron-browser/bootstrap/index.js#L299
+	if (!isFalsyOrEmpty(MonacoEnvironment.onNodeCachedData)) {
+		return false;
+	}
+	return true;
+}
+
+declare type OnNodeCachedDataArgs = [{ errorCode: string, path: string, detail?: string }, { path: string, length: number }];
+declare const MonacoEnvironment: { onNodeCachedData: OnNodeCachedDataArgs[] };
+
+//#endregion
diff --git a/src/vs/workbench/services/timer/node/timerService.ts b/src/vs/workbench/services/timer/node/timerService.ts
deleted file mode 100644
index 1de3ba8f6cc..00000000000
--- a/src/vs/workbench/services/timer/node/timerService.ts
+++ /dev/null
@@ -1,109 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-'use strict';
-
-import { ITimerService, IStartupMetrics, IInitData, IMemoryInfo } from 'vs/workbench/services/timer/common/timerService';
-import { virtualMachineHint } from 'vs/base/node/id';
-import * as perf from 'vs/base/common/performance';
-import * as os from 'os';
-
-export class TimerService implements ITimerService {
-
-	public _serviceBrand: any;
-
-	public readonly start: number;
-	public readonly windowLoad: number;
-
-	public readonly isInitialStartup: boolean;
-	public readonly hasAccessibilitySupport: boolean;
-
-	private _startupMetrics: IStartupMetrics;
-
-	constructor(initData: IInitData, private isEmptyWorkbench: boolean) {
-		this.start = initData.start;
-		this.windowLoad = initData.windowLoad;
-
-		this.isInitialStartup = initData.isInitialStartup;
-		this.hasAccessibilitySupport = initData.hasAccessibilitySupport;
-	}
-
-	get startupMetrics(): IStartupMetrics {
-		if (!this._startupMetrics) {
-			this._computeStartupMetrics();
-		}
-		return this._startupMetrics;
-	}
-
-	public _computeStartupMetrics(): void {
-		const now = Date.now();
-		const initialStartup = !!this.isInitialStartup;
-		const start = initialStartup ? this.start : this.windowLoad;
-
-		let totalmem: number;
-		let freemem: number;
-		let cpus: { count: number; speed: number; model: string; };
-		let platform: string;
-		let release: string;
-		let arch: string;
-		let loadavg: number[];
-		let meminfo: IMemoryInfo;
-		let isVMLikelyhood: number;
-
-		try {
-			totalmem = os.totalmem();
-			freemem = os.freemem();
-			platform = os.platform();
-			release = os.release();
-			arch = os.arch();
-			loadavg = os.loadavg();
-			meminfo = process.getProcessMemoryInfo();
-
-			isVMLikelyhood = Math.round((virtualMachineHint.value() * 100));
-
-			const rawCpus = os.cpus();
-			if (rawCpus && rawCpus.length > 0) {
-				cpus = { count: rawCpus.length, speed: rawCpus[0].speed, model: rawCpus[0].model };
-			}
-		} catch (error) {
-			// ignore, be on the safe side with these hardware method calls
-		}
-
-		let nlsStart = perf.getEntry('mark', 'nlsGeneration:start');
-		let nlsEnd = perf.getEntry('mark', 'nlsGeneration:end');
-		let nlsTime = nlsStart && nlsEnd ? nlsEnd.startTime - nlsStart.startTime : 0;
-		this._startupMetrics = {
-			version: 1,
-			ellapsed: perf.getEntry('mark', 'didStartWorkbench').startTime - start,
-			timers: {
-				ellapsedExtensions: perf.getDuration('willLoadExtensions', 'didLoadExtensions'),
-				ellapsedExtensionsReady: perf.getEntry('mark', 'didLoadExtensions').startTime - start,
-				ellapsedRequire: perf.getDuration('willLoadWorkbenchMain', 'didLoadWorkbenchMain'),
-				ellapsedEditorRestore: perf.getDuration('willRestoreEditors', 'didRestoreEditors'),
-				ellapsedViewletRestore: perf.getDuration('willRestoreViewlet', 'didRestoreViewlet'),
-				ellapsedWorkbench: perf.getDuration('willStartWorkbench', 'didStartWorkbench'),
-				ellapsedWindowLoadToRequire: perf.getEntry('mark', 'willLoadWorkbenchMain').startTime - this.windowLoad,
-				ellapsedTimersToTimersComputed: Date.now() - now,
-				ellapsedNlsGeneration: nlsTime
-			},
-			platform,
-			release,
-			arch,
-			totalmem,
-			freemem,
-			meminfo,
-			cpus,
-			loadavg,
-			initialStartup,
-			isVMLikelyhood,
-			hasAccessibilitySupport: !!this.hasAccessibilitySupport,
-			emptyWorkbench: this.isEmptyWorkbench
-		};
-
-		if (initialStartup) {
-			this._startupMetrics.timers.ellapsedAppReady = perf.getDuration('main:started', 'main:appReady');
-			this._startupMetrics.timers.ellapsedWindowLoad = this.windowLoad - perf.getEntry('mark', 'main:appReady').startTime;
-		}
-	}
-}
diff --git a/src/vs/workbench/services/untitled/common/untitledEditorService.ts b/src/vs/workbench/services/untitled/common/untitledEditorService.ts
index b667bea963a..d2aff3db294 100644
--- a/src/vs/workbench/services/untitled/common/untitledEditorService.ts
+++ b/src/vs/workbench/services/untitled/common/untitledEditorService.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { createDecorator, IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import * as arrays from 'vs/base/common/arrays';
 import { UntitledEditorInput } from 'vs/workbench/common/editor/untitledEditorInput';
@@ -15,6 +15,7 @@ import { ResourceMap } from 'vs/base/common/map';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { UntitledEditorModel } from 'vs/workbench/common/editor/untitledEditorModel';
 import { Schemas } from 'vs/base/common/network';
+import { Disposable } from 'vs/base/common/lifecycle';
 
 export const IUntitledEditorService = createDecorator<IUntitledEditorService>('untitledEditorService');
 
@@ -104,42 +105,30 @@ export interface IUntitledEditorService {
 	getEncoding(resource: URI): string;
 }
 
-export class UntitledEditorService implements IUntitledEditorService {
+export class UntitledEditorService extends Disposable implements IUntitledEditorService {
 
-	public _serviceBrand: any;
+	_serviceBrand: any;
 
 	private mapResourceToInput = new ResourceMap<UntitledEditorInput>();
 	private mapResourceToAssociatedFilePath = new ResourceMap<boolean>();
 
-	private readonly _onDidChangeContent: Emitter<URI>;
-	private readonly _onDidChangeDirty: Emitter<URI>;
-	private readonly _onDidChangeEncoding: Emitter<URI>;
-	private readonly _onDidDisposeModel: Emitter<URI>;
+	private readonly _onDidChangeContent: Emitter<URI> = this._register(new Emitter<URI>());
+	get onDidChangeContent(): Event<URI> { return this._onDidChangeContent.event; }
+
+	private readonly _onDidChangeDirty: Emitter<URI> = this._register(new Emitter<URI>());
+	get onDidChangeDirty(): Event<URI> { return this._onDidChangeDirty.event; }
+
+	private readonly _onDidChangeEncoding: Emitter<URI> = this._register(new Emitter<URI>());
+	get onDidChangeEncoding(): Event<URI> { return this._onDidChangeEncoding.event; }
+
+	private readonly _onDidDisposeModel: Emitter<URI> = this._register(new Emitter<URI>());
+	get onDidDisposeModel(): Event<URI> { return this._onDidDisposeModel.event; }
 
 	constructor(
 		@IInstantiationService private instantiationService: IInstantiationService,
 		@IConfigurationService private configurationService: IConfigurationService
 	) {
-		this._onDidChangeContent = new Emitter<URI>();
-		this._onDidChangeDirty = new Emitter<URI>();
-		this._onDidChangeEncoding = new Emitter<URI>();
-		this._onDidDisposeModel = new Emitter<URI>();
-	}
-
-	public get onDidDisposeModel(): Event<URI> {
-		return this._onDidDisposeModel.event;
-	}
-
-	public get onDidChangeContent(): Event<URI> {
-		return this._onDidChangeContent.event;
-	}
-
-	public get onDidChangeDirty(): Event<URI> {
-		return this._onDidChangeDirty.event;
-	}
-
-	public get onDidChangeEncoding(): Event<URI> {
-		return this._onDidChangeEncoding.event;
+		super();
 	}
 
 	protected get(resource: URI): UntitledEditorInput {
@@ -154,11 +143,11 @@ export class UntitledEditorService implements IUntitledEditorService {
 		return this.mapResourceToInput.values();
 	}
 
-	public exists(resource: URI): boolean {
+	exists(resource: URI): boolean {
 		return this.mapResourceToInput.has(resource);
 	}
 
-	public revertAll(resources?: URI[], force?: boolean): URI[] {
+	revertAll(resources?: URI[], force?: boolean): URI[] {
 		const reverted: URI[] = [];
 
 		const untitledInputs = this.getAll(resources);
@@ -174,13 +163,13 @@ export class UntitledEditorService implements IUntitledEditorService {
 		return reverted;
 	}
 
-	public isDirty(resource: URI): boolean {
+	isDirty(resource: URI): boolean {
 		const input = this.get(resource);
 
 		return input && input.isDirty();
 	}
 
-	public getDirty(resources?: URI[]): URI[] {
+	getDirty(resources?: URI[]): URI[] {
 		let inputs: UntitledEditorInput[];
 		if (resources) {
 			inputs = resources.map(r => this.get(r)).filter(i => !!i);
@@ -193,11 +182,11 @@ export class UntitledEditorService implements IUntitledEditorService {
 			.map(i => i.getResource());
 	}
 
-	public loadOrCreate(options: IModelLoadOrCreateOptions = Object.create(null)): TPromise<UntitledEditorModel> {
+	loadOrCreate(options: IModelLoadOrCreateOptions = Object.create(null)): TPromise<UntitledEditorModel> {
 		return this.createOrGet(options.resource, options.modeId, options.initialValue, options.encoding, options.useResourcePath).resolve();
 	}
 
-	public createOrGet(resource?: URI, modeId?: string, initialValue?: string, encoding?: string, hasAssociatedFilePath: boolean = false): UntitledEditorInput {
+	createOrGet(resource?: URI, modeId?: string, initialValue?: string, encoding?: string, hasAssociatedFilePath: boolean = false): UntitledEditorInput {
 
 		if (resource) {
 			// Massage resource if it comes with a file:// scheme
@@ -274,26 +263,19 @@ export class UntitledEditorService implements IUntitledEditorService {
 		return input;
 	}
 
-	public hasAssociatedFilePath(resource: URI): boolean {
+	hasAssociatedFilePath(resource: URI): boolean {
 		return this.mapResourceToAssociatedFilePath.has(resource);
 	}
 
-	public suggestFileName(resource: URI): string {
+	suggestFileName(resource: URI): string {
 		const input = this.get(resource);
 
 		return input ? input.suggestFileName() : void 0;
 	}
 
-	public getEncoding(resource: URI): string {
+	getEncoding(resource: URI): string {
 		const input = this.get(resource);
 
 		return input ? input.getEncoding() : void 0;
 	}
-
-	public dispose(): void {
-		this._onDidChangeContent.dispose();
-		this._onDidChangeDirty.dispose();
-		this._onDidChangeEncoding.dispose();
-		this._onDidDisposeModel.dispose();
-	}
 }
diff --git a/src/vs/workbench/services/viewlet/browser/viewlet.ts b/src/vs/workbench/services/viewlet/browser/viewlet.ts
index 02006a2397a..a6903bb9fb9 100644
--- a/src/vs/workbench/services/viewlet/browser/viewlet.ts
+++ b/src/vs/workbench/services/viewlet/browser/viewlet.ts
@@ -41,6 +41,11 @@ export interface IViewletService {
 	 */
 	getViewlet(id: string): ViewletDescriptor;
 
+	/**
+	 * Returns all viewlets
+	 */
+	getAllViewlets(): ViewletDescriptor[];
+
 	/**
 	 * Returns all enabled viewlets
 	 */
diff --git a/src/vs/workbench/services/viewlet/browser/viewletService.ts b/src/vs/workbench/services/viewlet/browser/viewletService.ts
index 354410b5820..30f05343f48 100644
--- a/src/vs/workbench/services/viewlet/browser/viewletService.ts
+++ b/src/vs/workbench/services/viewlet/browser/viewletService.ts
@@ -13,40 +13,41 @@ import { Registry } from 'vs/platform/registry/common/platform';
 import { ViewletDescriptor, ViewletRegistry, Extensions as ViewletExtensions } from 'vs/workbench/browser/viewlet';
 import { IProgressService } from 'vs/platform/progress/common/progress';
 import { IContextKeyService, RawContextKey, IContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { dispose, IDisposable } from 'vs/base/common/lifecycle';
 import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
+import { Disposable } from 'vs/base/common/lifecycle';
 
 const ActiveViewletContextId = 'activeViewlet';
 export const ActiveViewletContext = new RawContextKey<string>(ActiveViewletContextId, '');
 
-export class ViewletService implements IViewletService {
+export class ViewletService extends Disposable implements IViewletService {
 
-	public _serviceBrand: any;
+	_serviceBrand: any;
 
 	private sidebarPart: SidebarPart;
 	private viewletRegistry: ViewletRegistry;
 
 	private activeViewletContextKey: IContextKey<string>;
 	private _onDidViewletEnable = new Emitter<{ id: string, enabled: boolean }>();
-	private disposables: IDisposable[] = [];
 
-	public get onDidViewletRegister(): Event<ViewletDescriptor> { return <Event<ViewletDescriptor>>this.viewletRegistry.onDidRegister; }
-	public get onDidViewletOpen(): Event<IViewlet> { return this.sidebarPart.onDidViewletOpen; }
-	public get onDidViewletClose(): Event<IViewlet> { return this.sidebarPart.onDidViewletClose; }
-	public get onDidViewletEnablementChange(): Event<{ id: string, enabled: boolean }> { return this._onDidViewletEnable.event; }
+	get onDidViewletRegister(): Event<ViewletDescriptor> { return <Event<ViewletDescriptor>>this.viewletRegistry.onDidRegister; }
+	get onDidViewletOpen(): Event<IViewlet> { return this.sidebarPart.onDidViewletOpen; }
+	get onDidViewletClose(): Event<IViewlet> { return this.sidebarPart.onDidViewletClose; }
+	get onDidViewletEnablementChange(): Event<{ id: string, enabled: boolean }> { return this._onDidViewletEnable.event; }
 
 	constructor(
 		sidebarPart: SidebarPart,
 		@IContextKeyService contextKeyService: IContextKeyService,
 		@IExtensionService private extensionService: IExtensionService
 	) {
+		super();
+
 		this.sidebarPart = sidebarPart;
 		this.viewletRegistry = Registry.as<ViewletRegistry>(ViewletExtensions.Viewlets);
 
 		this.activeViewletContextKey = ActiveViewletContext.bindTo(contextKeyService);
 
-		this.onDidViewletOpen(this._onDidViewletOpen, this, this.disposables);
-		this.onDidViewletClose(this._onDidViewletClose, this, this.disposables);
+		this._register(this.onDidViewletOpen(this._onDidViewletOpen, this));
+		this._register(this.onDidViewletClose(this._onDidViewletClose, this));
 	}
 
 	private _onDidViewletOpen(viewlet: IViewlet): void {
@@ -61,7 +62,7 @@ export class ViewletService implements IViewletService {
 		}
 	}
 
-	public setViewletEnablement(id: string, enabled: boolean): void {
+	setViewletEnablement(id: string, enabled: boolean): void {
 		const descriptor = this.getAllViewlets().filter(desc => desc.id === id).pop();
 		if (descriptor && descriptor.enabled !== enabled) {
 			descriptor.enabled = enabled;
@@ -69,7 +70,7 @@ export class ViewletService implements IViewletService {
 		}
 	}
 
-	public openViewlet(id: string, focus?: boolean): TPromise<IViewlet> {
+	openViewlet(id: string, focus?: boolean): TPromise<IViewlet> {
 		if (this.getViewlet(id)) {
 			return this.sidebarPart.openViewlet(id, focus);
 		}
@@ -82,33 +83,29 @@ export class ViewletService implements IViewletService {
 			});
 	}
 
-	public getActiveViewlet(): IViewlet {
+	getActiveViewlet(): IViewlet {
 		return this.sidebarPart.getActiveViewlet();
 	}
 
-	public getViewlets(): ViewletDescriptor[] {
+	getViewlets(): ViewletDescriptor[] {
 		return this.getAllViewlets()
 			.filter(v => v.enabled);
 	}
 
-	private getAllViewlets(): ViewletDescriptor[] {
+	getAllViewlets(): ViewletDescriptor[] {
 		return this.viewletRegistry.getViewlets()
 			.sort((v1, v2) => v1.order - v2.order);
 	}
 
-	public getDefaultViewletId(): string {
+	getDefaultViewletId(): string {
 		return this.viewletRegistry.getDefaultViewletId();
 	}
 
-	public getViewlet(id: string): ViewletDescriptor {
+	getViewlet(id: string): ViewletDescriptor {
 		return this.getViewlets().filter(viewlet => viewlet.id === id)[0];
 	}
 
-	public getProgressIndicator(id: string): IProgressService {
+	getProgressIndicator(id: string): IProgressService {
 		return this.sidebarPart.getProgressIndicator(id);
 	}
-
-	dispose(): void {
-		this.disposables = dispose(this.disposables);
-	}
 }
diff --git a/src/vs/workbench/services/workspace/common/workspaceEditing.ts b/src/vs/workbench/services/workspace/common/workspaceEditing.ts
index 920be3ef667..1c88e14cff2 100644
--- a/src/vs/workbench/services/workspace/common/workspaceEditing.ts
+++ b/src/vs/workbench/services/workspace/common/workspaceEditing.ts
@@ -7,7 +7,7 @@
 import { TPromise } from 'vs/base/common/winjs.base';
 import { createDecorator, ServiceIdentifier } from 'vs/platform/instantiation/common/instantiation';
 import { IWorkspaceIdentifier, IWorkspaceFolderCreationData } from 'vs/platform/workspaces/common/workspaces';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 
 export const IWorkspaceEditingService = createDecorator<IWorkspaceEditingService>('workspaceEditingService');
 
@@ -33,6 +33,11 @@ export interface IWorkspaceEditingService {
 	 */
 	updateFolders(index: number, deleteCount?: number, foldersToAdd?: IWorkspaceFolderCreationData[], donotNotifyError?: boolean): TPromise<void>;
 
+	/**
+	 * enters the workspace with the provided path.
+	 */
+	enterWorkspace(path: string): TPromise<void>;
+
 	/**
 	 * creates a new workspace with the provided folders and opens it. if path is provided
 	 * the workspace will be saved into that location.
diff --git a/src/vs/workbench/services/workspace/node/workspaceEditingService.ts b/src/vs/workbench/services/workspace/node/workspaceEditingService.ts
index 5e8f0fb6ca9..732af2d8dc1 100644
--- a/src/vs/workbench/services/workspace/node/workspaceEditingService.ts
+++ b/src/vs/workbench/services/workspace/node/workspaceEditingService.ts
@@ -6,7 +6,7 @@
 'use strict';
 
 import { IWorkspaceEditingService } from 'vs/workbench/services/workspace/common/workspaceEditing';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import * as nls from 'vs/nls';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
@@ -18,7 +18,7 @@ import { WorkspaceService } from 'vs/workbench/services/configuration/node/confi
 import { migrateStorageToMultiRootWorkspace } from 'vs/platform/storage/common/migration';
 import { IStorageService } from 'vs/platform/storage/common/storage';
 import { StorageService } from 'vs/platform/storage/common/storageService';
-import { ConfigurationScope, IConfigurationRegistry, Extensions as ConfigurationExtensions } from 'vs/platform/configuration/common/configurationRegistry';
+import { ConfigurationScope, IConfigurationRegistry, Extensions as ConfigurationExtensions, IConfigurationPropertySchema } from 'vs/platform/configuration/common/configurationRegistry';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
 import { IBackupFileService } from 'vs/workbench/services/backup/common/backup';
@@ -31,7 +31,7 @@ import { INotificationService, Severity } from 'vs/platform/notification/common/
 
 export class WorkspaceEditingService implements IWorkspaceEditingService {
 
-	public _serviceBrand: any;
+	_serviceBrand: any;
 
 	constructor(
 		@IJSONEditingService private jsonEditingService: IJSONEditingService,
@@ -46,7 +46,7 @@ export class WorkspaceEditingService implements IWorkspaceEditingService {
 	) {
 	}
 
-	public updateFolders(index: number, deleteCount?: number, foldersToAdd?: IWorkspaceFolderCreationData[], donotNotifyError?: boolean): TPromise<void> {
+	updateFolders(index: number, deleteCount?: number, foldersToAdd?: IWorkspaceFolderCreationData[], donotNotifyError?: boolean): TPromise<void> {
 		const folders = this.contextService.getWorkspace().folders;
 
 		let foldersToDelete: URI[] = [];
@@ -96,7 +96,7 @@ export class WorkspaceEditingService implements IWorkspaceEditingService {
 			.then(() => null, error => donotNotifyError ? TPromise.wrapError(error) : this.handleWorkspaceConfigurationEditingError(error));
 	}
 
-	public addFolders(foldersToAdd: IWorkspaceFolderCreationData[], donotNotifyError: boolean = false): TPromise<void> {
+	addFolders(foldersToAdd: IWorkspaceFolderCreationData[], donotNotifyError: boolean = false): TPromise<void> {
 		return this.doAddFolders(foldersToAdd, void 0, donotNotifyError);
 	}
 
@@ -122,7 +122,7 @@ export class WorkspaceEditingService implements IWorkspaceEditingService {
 			.then(() => null, error => donotNotifyError ? TPromise.wrapError(error) : this.handleWorkspaceConfigurationEditingError(error));
 	}
 
-	public removeFolders(foldersToRemove: URI[], donotNotifyError: boolean = false): TPromise<void> {
+	removeFolders(foldersToRemove: URI[], donotNotifyError: boolean = false): TPromise<void> {
 
 		// If we are in single-folder state and the opened folder is to be removed,
 		// we create an empty workspace and enter it.
@@ -138,17 +138,21 @@ export class WorkspaceEditingService implements IWorkspaceEditingService {
 	private includesSingleFolderWorkspace(folders: URI[]): boolean {
 		if (this.contextService.getWorkbenchState() === WorkbenchState.FOLDER) {
 			const workspaceFolder = this.contextService.getWorkspace().folders[0];
-			return (folders.some(folder => isEqual(folder, workspaceFolder.uri, !isLinux)));
+			return (folders.some(folder => isEqual(folder, workspaceFolder.uri)));
 		}
 
 		return false;
 	}
 
-	public createAndEnterWorkspace(folders?: IWorkspaceFolderCreationData[], path?: string): TPromise<void> {
+	enterWorkspace(path: string): TPromise<void> {
+		return this.doEnterWorkspace(() => this.windowService.enterWorkspace(path));
+	}
+
+	createAndEnterWorkspace(folders?: IWorkspaceFolderCreationData[], path?: string): TPromise<void> {
 		return this.doEnterWorkspace(() => this.windowService.createAndEnterWorkspace(folders, path));
 	}
 
-	public saveAndEnterWorkspace(path: string): TPromise<void> {
+	saveAndEnterWorkspace(path: string): TPromise<void> {
 		return this.doEnterWorkspace(() => this.windowService.saveAndEnterWorkspace(path));
 	}
 
@@ -188,9 +192,11 @@ export class WorkspaceEditingService implements IWorkspaceEditingService {
 
 		// Stop the extension host first to give extensions most time to shutdown
 		this.extensionService.stopExtensionHost();
+		let extensionHostStarted: boolean = false;
 
 		const startExtensionHost = () => {
 			this.extensionService.startExtensionHost();
+			extensionHostStarted = true;
 		};
 
 		return mainSidePromise().then(result => {
@@ -199,22 +205,22 @@ export class WorkspaceEditingService implements IWorkspaceEditingService {
 			if (result) {
 				return this.migrate(result.workspace).then(() => {
 
-					// TODO@Ben TODO@Sandeep the following requires ugly casts and should probably have a service interface
-
 					// Reinitialize backup service
-					const backupFileService = this.backupFileService as BackupFileService;
-					backupFileService.initialize(result.backupPath);
+					if (this.backupFileService instanceof BackupFileService) {
+						this.backupFileService.initialize(result.backupPath);
+					}
 
 					// Reinitialize configuration service
 					const workspaceImpl = this.contextService as WorkspaceService;
-					return workspaceImpl.initialize(result.workspace);
+					return workspaceImpl.initialize(result.workspace, startExtensionHost);
 				});
 			}
 
 			return TPromise.as(void 0);
-		}).then(startExtensionHost, error => {
-			startExtensionHost(); // in any case start the extension host again!
-
+		}).then(null, error => {
+			if (!extensionHostStarted) {
+				startExtensionHost(); // start the extension host if not started
+			}
 			return TPromise.wrapError(error);
 		});
 	}
@@ -226,7 +232,7 @@ export class WorkspaceEditingService implements IWorkspaceEditingService {
 
 		// Settings migration (only if we come from a folder workspace)
 		if (this.contextService.getWorkbenchState() === WorkbenchState.FOLDER) {
-			return this.copyWorkspaceSettings(toWorkspace);
+			return this.migrateWorkspaceSettings(toWorkspace);
 		}
 
 		return TPromise.as(void 0);
@@ -240,11 +246,23 @@ export class WorkspaceEditingService implements IWorkspaceEditingService {
 		storageImpl.setWorkspaceId(newWorkspaceId);
 	}
 
-	public copyWorkspaceSettings(toWorkspace: IWorkspaceIdentifier): TPromise<void> {
+	private migrateWorkspaceSettings(toWorkspace: IWorkspaceIdentifier): TPromise<void> {
+		return this.doCopyWorkspaceSettings(toWorkspace, setting => setting.scope === ConfigurationScope.WINDOW);
+	}
+
+	copyWorkspaceSettings(toWorkspace: IWorkspaceIdentifier): TPromise<void> {
+		return this.doCopyWorkspaceSettings(toWorkspace);
+	}
+
+	private doCopyWorkspaceSettings(toWorkspace: IWorkspaceIdentifier, filter?: (config: IConfigurationPropertySchema) => boolean): TPromise<void> {
 		const configurationProperties = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration).getConfigurationProperties();
 		const targetWorkspaceConfiguration = {};
 		for (const key of this.workspaceConfigurationService.keys().workspace) {
-			if (configurationProperties[key] && !configurationProperties[key].notMultiRootAdopted && configurationProperties[key].scope === ConfigurationScope.WINDOW) {
+			if (configurationProperties[key]) {
+				if (filter && !filter(configurationProperties[key])) {
+					continue;
+				}
+
 				targetWorkspaceConfiguration[key] = this.workspaceConfigurationService.inspect(key).workspace;
 			}
 		}
diff --git a/src/vs/workbench/test/browser/part.test.ts b/src/vs/workbench/test/browser/part.test.ts
index 22c8a969e55..c4a78a473c6 100644
--- a/src/vs/workbench/test/browser/part.test.ts
+++ b/src/vs/workbench/test/browser/part.test.ts
@@ -6,13 +6,13 @@
 'use strict';
 
 import * as assert from 'assert';
-import { Builder, $ } from 'vs/base/browser/builder';
 import { Part } from 'vs/workbench/browser/part';
 import * as Types from 'vs/base/common/types';
 import { IStorageService } from 'vs/platform/storage/common/storage';
 import { StorageService, InMemoryLocalStorage } from 'vs/platform/storage/common/storageService';
 import { TestThemeService } from 'vs/platform/theme/test/common/testThemeService';
 import { TestWorkspace } from 'vs/platform/workspace/test/common/testWorkspace';
+import { append, $, hide } from 'vs/base/browser/dom';
 
 class MyPart extends Part {
 
@@ -42,21 +42,21 @@ class MyPart2 extends Part {
 	}
 
 	public createTitleArea(parent: HTMLElement): HTMLElement {
-		return $(parent).div(function (div) {
-			div.span({
-				id: 'myPart.title',
-				innerHtml: 'Title'
-			});
-		}).getHTMLElement();
+		const titleContainer = append(parent, $('div'));
+		const titleLabel = append(titleContainer, $('span'));
+		titleLabel.id = 'myPart.title';
+		titleLabel.innerHTML = 'Title';
+
+		return titleContainer;
 	}
 
 	public createContentArea(parent: HTMLElement): HTMLElement {
-		return $(parent).div(function (div) {
-			div.span({
-				id: 'myPart.content',
-				innerHtml: 'Content'
-			});
-		}).getHTMLElement();
+		const contentContainer = append(parent, $('div'));
+		const contentSpan = append(contentContainer, $('span'));
+		contentSpan.id = 'myPart.content';
+		contentSpan.innerHTML = 'Content';
+
+		return contentContainer;
 	}
 }
 
@@ -71,12 +71,12 @@ class MyPart3 extends Part {
 	}
 
 	public createContentArea(parent: HTMLElement): HTMLElement {
-		return $(parent).div(function (div) {
-			div.span({
-				id: 'myPart.content',
-				innerHtml: 'Content'
-			});
-		}).getHTMLElement();
+		const contentContainer = append(parent, $('div'));
+		const contentSpan = append(contentContainer, $('span'));
+		contentSpan.id = 'myPart.content';
+		contentSpan.innerHTML = 'Content';
+
+		return contentContainer;
 	}
 }
 
@@ -97,11 +97,12 @@ suite('Workbench parts', () => {
 	});
 
 	test('Creation', function () {
-		let b = new Builder(document.getElementById(fixtureId));
-		b.div().hide();
+		let b = document.createElement('div');
+		document.getElementById(fixtureId).appendChild(b);
+		hide(b);
 
-		let part = new MyPart(b.getHTMLElement());
-		part.create(b.getHTMLElement());
+		let part = new MyPart(b);
+		part.create(b);
 
 		assert.strictEqual(part.getId(), 'myPart');
 
@@ -114,7 +115,7 @@ suite('Workbench parts', () => {
 		part.shutdown();
 
 		// Re-Create to assert memento contents
-		part = new MyPart(b.getHTMLElement());
+		part = new MyPart(b);
 
 		memento = part.getMemento(storage);
 		assert(memento);
@@ -126,29 +127,31 @@ suite('Workbench parts', () => {
 		delete memento.bar;
 
 		part.shutdown();
-		part = new MyPart(b.getHTMLElement());
+		part = new MyPart(b);
 		memento = part.getMemento(storage);
 		assert(memento);
 		assert.strictEqual(Types.isEmptyObject(memento), true);
 	});
 
 	test('Part Layout with Title and Content', function () {
-		let b = new Builder(document.getElementById(fixtureId));
-		b.div().hide();
+		let b = document.createElement('div');
+		document.getElementById(fixtureId).appendChild(b);
+		hide(b);
 
 		let part = new MyPart2();
-		part.create(b.getHTMLElement());
+		part.create(b);
 
 		assert(document.getElementById('myPart.title'));
 		assert(document.getElementById('myPart.content'));
 	});
 
 	test('Part Layout with Content only', function () {
-		let b = new Builder(document.getElementById(fixtureId));
-		b.div().hide();
+		let b = document.createElement('div');
+		document.getElementById(fixtureId).appendChild(b);
+		hide(b);
 
 		let part = new MyPart3();
-		part.create(b.getHTMLElement());
+		part.create(b);
 
 		assert(!document.getElementById('myPart.title'));
 		assert(document.getElementById('myPart.content'));
diff --git a/src/vs/workbench/test/browser/parts/editor/baseEditor.test.ts b/src/vs/workbench/test/browser/parts/editor/baseEditor.test.ts
index 2f2a863607d..b6d674c9226 100644
--- a/src/vs/workbench/test/browser/parts/editor/baseEditor.test.ts
+++ b/src/vs/workbench/test/browser/parts/editor/baseEditor.test.ts
@@ -6,7 +6,7 @@
 'use strict';
 
 import * as assert from 'assert';
-import { BaseEditor } from 'vs/workbench/browser/parts/editor/baseEditor';
+import { BaseEditor, EditorMemento } from 'vs/workbench/browser/parts/editor/baseEditor';
 import { EditorInput, EditorOptions, IEditorInputFactory, IEditorInputFactoryRegistry, Extensions as EditorExtensions } from 'vs/workbench/common/editor';
 import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
@@ -14,12 +14,14 @@ import * as Platform from 'vs/platform/registry/common/platform';
 import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { NullTelemetryService } from 'vs/platform/telemetry/common/telemetryUtils';
-import { workbenchInstantiationService, TestEditorGroup } from 'vs/workbench/test/workbenchTestServices';
+import { workbenchInstantiationService, TestEditorGroup, TestEditorGroupsService } from 'vs/workbench/test/workbenchTestServices';
 import { ResourceEditorInput } from 'vs/workbench/common/editor/resourceEditorInput';
 import { TestThemeService } from 'vs/platform/theme/test/common/testThemeService';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { IEditorRegistry, Extensions, EditorDescriptor } from 'vs/workbench/browser/editor';
 import { CancellationToken } from 'vs/base/common/cancellation';
+import { TPromise } from 'vs/base/common/winjs.base';
+import { IEditorModel } from 'vs/platform/editor/common/editor';
 
 const NullThemeService = new TestThemeService();
 
@@ -69,7 +71,7 @@ class MyInput extends EditorInput {
 		return '';
 	}
 
-	resolve(refresh?: boolean): any {
+	resolve(): any {
 		return null;
 	}
 }
@@ -79,7 +81,7 @@ class MyOtherInput extends EditorInput {
 		return '';
 	}
 
-	resolve(refresh?: boolean): any {
+	resolve(): any {
 		return null;
 	}
 }
@@ -188,6 +190,116 @@ suite('Workbench base editor', () => {
 		assert(factory);
 	});
 
+	test('EditorMemento - basics', function () {
+		const testGroup0 = new TestEditorGroup(0);
+		const testGroup1 = new TestEditorGroup(1);
+		const testGroup4 = new TestEditorGroup(4);
+
+		const editorGroupService = new TestEditorGroupsService([
+			testGroup0,
+			testGroup1,
+			new TestEditorGroup(2)
+		]);
+
+		interface TestViewState {
+			line: number;
+		}
+
+		const rawMemento = Object.create(null);
+		let memento = new EditorMemento<TestViewState>('id', 'key', rawMemento, 3, editorGroupService);
+
+		let res = memento.loadState(testGroup0, URI.file('/A'));
+		assert.ok(!res);
+
+		memento.saveState(testGroup0, URI.file('/A'), { line: 3 });
+		res = memento.loadState(testGroup0, URI.file('/A'));
+		assert.ok(res);
+		assert.equal(res.line, 3);
+
+		memento.saveState(testGroup1, URI.file('/A'), { line: 5 });
+		res = memento.loadState(testGroup1, URI.file('/A'));
+		assert.ok(res);
+		assert.equal(res.line, 5);
+
+		// Ensure capped at 3 elements
+		memento.saveState(testGroup0, URI.file('/B'), { line: 1 });
+		memento.saveState(testGroup0, URI.file('/C'), { line: 1 });
+		memento.saveState(testGroup0, URI.file('/D'), { line: 1 });
+		memento.saveState(testGroup0, URI.file('/E'), { line: 1 });
+
+		assert.ok(!memento.loadState(testGroup0, URI.file('/A')));
+		assert.ok(!memento.loadState(testGroup0, URI.file('/B')));
+		assert.ok(memento.loadState(testGroup0, URI.file('/C')));
+		assert.ok(memento.loadState(testGroup0, URI.file('/D')));
+		assert.ok(memento.loadState(testGroup0, URI.file('/E')));
+
+		// Save at an unknown group
+		memento.saveState(testGroup4, URI.file('/E'), { line: 1 });
+		assert.ok(memento.loadState(testGroup4, URI.file('/E'))); // only gets removed when memento is saved
+		memento.saveState(testGroup4, URI.file('/C'), { line: 1 });
+		assert.ok(memento.loadState(testGroup4, URI.file('/C'))); // only gets removed when memento is saved
+
+		memento.shutdown();
+
+		memento = new EditorMemento('id', 'key', rawMemento, 3, editorGroupService);
+		assert.ok(memento.loadState(testGroup0, URI.file('/C')));
+		assert.ok(memento.loadState(testGroup0, URI.file('/D')));
+		assert.ok(memento.loadState(testGroup0, URI.file('/E')));
+
+		// Check on entries no longer there from invalid groups
+		assert.ok(!memento.loadState(testGroup4, URI.file('/E')));
+		assert.ok(!memento.loadState(testGroup4, URI.file('/C')));
+
+		memento.clearState(URI.file('/C'));
+		memento.clearState(URI.file('/E'));
+
+		assert.ok(!memento.loadState(testGroup0, URI.file('/C')));
+		assert.ok(memento.loadState(testGroup0, URI.file('/D')));
+		assert.ok(!memento.loadState(testGroup0, URI.file('/E')));
+	});
+
+	test('EditoMemento - use with editor input', function () {
+		const testGroup0 = new TestEditorGroup(0);
+
+		interface TestViewState {
+			line: number;
+		}
+
+		class TestEditorInput extends EditorInput {
+			constructor(private resource: URI, private id = 'testEditorInput') {
+				super();
+			}
+			public getTypeId() { return 'testEditorInput'; }
+			public resolve(): TPromise<IEditorModel> { return null; }
+
+			public matches(other: TestEditorInput): boolean {
+				return other && this.id === other.id && other instanceof TestEditorInput;
+			}
+
+			public getResource(): URI {
+				return this.resource;
+			}
+		}
+
+		const rawMemento = Object.create(null);
+		let memento = new EditorMemento<TestViewState>('id', 'key', rawMemento, 3, new TestEditorGroupsService());
+
+		const testInputA = new TestEditorInput(URI.file('/A'));
+
+		let res = memento.loadState(testGroup0, testInputA);
+		assert.ok(!res);
+
+		memento.saveState(testGroup0, testInputA, { line: 3 });
+		res = memento.loadState(testGroup0, testInputA);
+		assert.ok(res);
+		assert.equal(res.line, 3);
+
+		// State removed when input gets disposed
+		testInputA.dispose();
+		res = memento.loadState(testGroup0, testInputA);
+		assert.ok(!res);
+	});
+
 	return {
 		MyEditor: MyEditor,
 		MyOtherEditor: MyOtherEditor
diff --git a/src/vs/workbench/test/browser/parts/editor/breadcrumbModel.test.ts b/src/vs/workbench/test/browser/parts/editor/breadcrumbModel.test.ts
new file mode 100644
index 00000000000..185cf678818
--- /dev/null
+++ b/src/vs/workbench/test/browser/parts/editor/breadcrumbModel.test.ts
@@ -0,0 +1,59 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+import * as assert from 'assert';
+import { URI } from 'vs/base/common/uri';
+import { Workspace, WorkspaceFolder } from 'vs/platform/workspace/common/workspace';
+import { EditorBreadcrumbsModel, FileElement } from 'vs/workbench/browser/parts/editor/breadcrumbsModel';
+import { TestContextService } from 'vs/workbench/test/workbenchTestServices';
+import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
+import { FileKind } from 'vs/platform/files/common/files';
+
+
+suite('Breadcrumb Model', function () {
+
+	const workspaceService = new TestContextService(new Workspace('ffff', [new WorkspaceFolder({ uri: URI.parse('foo:/bar/baz/ws'), name: 'ws', index: 0 })]));
+	const configService = new class extends TestConfigurationService {
+		getValue(...args: any[]) {
+			if (args[0] === 'breadcrumbs.filePath') {
+				return 'on';
+			}
+			if (args[0] === 'breadcrumbs.symbolPath') {
+				return 'on';
+			}
+			return super.getValue(...args);
+		}
+	};
+
+	test('only uri, inside workspace', function () {
+
+		let model = new EditorBreadcrumbsModel(URI.parse('foo:/bar/baz/ws/some/path/file.ts'), undefined, workspaceService, configService);
+		let elements = model.getElements();
+
+		assert.equal(elements.length, 3);
+		let [one, two, three] = elements as FileElement[];
+		assert.equal(one.kind, FileKind.FOLDER);
+		assert.equal(two.kind, FileKind.FOLDER);
+		assert.equal(three.kind, FileKind.FILE);
+		assert.equal(one.uri.toString(), 'foo:/bar/baz/ws/some');
+		assert.equal(two.uri.toString(), 'foo:/bar/baz/ws/some/path');
+		assert.equal(three.uri.toString(), 'foo:/bar/baz/ws/some/path/file.ts');
+	});
+
+	test('only uri, outside workspace', function () {
+
+		let model = new EditorBreadcrumbsModel(URI.parse('foo:/outside/file.ts'), undefined, workspaceService, configService);
+		let elements = model.getElements();
+
+		assert.equal(elements.length, 2);
+		let [one, two] = elements as FileElement[];
+		assert.equal(one.kind, FileKind.FOLDER);
+		assert.equal(two.kind, FileKind.FILE);
+		assert.equal(one.uri.toString(), 'foo:/outside');
+		assert.equal(two.uri.toString(), 'foo:/outside/file.ts');
+	});
+});
diff --git a/src/vs/workbench/test/browser/parts/editor/rangeDecorations.test.ts b/src/vs/workbench/test/browser/parts/editor/rangeDecorations.test.ts
index e395c7acabc..4fdcb2b7cef 100644
--- a/src/vs/workbench/test/browser/parts/editor/rangeDecorations.test.ts
+++ b/src/vs/workbench/test/browser/parts/editor/rangeDecorations.test.ts
@@ -5,7 +5,7 @@
 
 import * as assert from 'assert';
 import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { workbenchInstantiationService, TestEditorService } from 'vs/workbench/test/workbenchTestServices';
 import { IModelService } from 'vs/editor/common/services/modelService';
 import { IModeService } from 'vs/editor/common/services/modeService';
diff --git a/src/vs/workbench/test/browser/quickopen.test.ts b/src/vs/workbench/test/browser/quickopen.test.ts
index fd71405603a..d17bd4fdc81 100644
--- a/src/vs/workbench/test/browser/quickopen.test.ts
+++ b/src/vs/workbench/test/browser/quickopen.test.ts
@@ -22,10 +22,6 @@ export class TestQuickOpenService implements IQuickOpenService {
 		this.callback = callback;
 	}
 
-	pick(arg: any, options?: any, token?: any): Promise {
-		return TPromise.as(null);
-	}
-
 	accept(): void {
 	}
 
diff --git a/src/vs/workbench/test/common/editor/dataUriEditorInput.test.ts b/src/vs/workbench/test/common/editor/dataUriEditorInput.test.ts
index 8fd2d6f25b6..d77f3d29cc6 100644
--- a/src/vs/workbench/test/common/editor/dataUriEditorInput.test.ts
+++ b/src/vs/workbench/test/common/editor/dataUriEditorInput.test.ts
@@ -6,7 +6,7 @@
 'use strict';
 
 import * as assert from 'assert';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { workbenchInstantiationService } from 'vs/workbench/test/workbenchTestServices';
 import { DataUriEditorInput } from 'vs/workbench/common/editor/dataUriEditorInput';
diff --git a/src/vs/workbench/test/common/editor/editor.test.ts b/src/vs/workbench/test/common/editor/editor.test.ts
index 18f03391a6a..f729c337ccf 100644
--- a/src/vs/workbench/test/common/editor/editor.test.ts
+++ b/src/vs/workbench/test/common/editor/editor.test.ts
@@ -7,13 +7,13 @@
 
 import * as assert from 'assert';
 import { TPromise } from 'vs/base/common/winjs.base';
-import { EditorInput, toResource, EditorViewStateMemento } from 'vs/workbench/common/editor';
+import { EditorInput, toResource } from 'vs/workbench/common/editor';
 import { DiffEditorInput } from 'vs/workbench/common/editor/diffEditorInput';
 import { IEditorModel } from 'vs/platform/editor/common/editor';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { IUntitledEditorService, UntitledEditorService } from 'vs/workbench/services/untitled/common/untitledEditorService';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { workbenchInstantiationService, TestEditorGroupsService, TestEditorGroup } from 'vs/workbench/test/workbenchTestServices';
+import { workbenchInstantiationService } from 'vs/workbench/test/workbenchTestServices';
 import { Schemas } from 'vs/base/common/network';
 
 class ServiceAccessor {
@@ -35,7 +35,7 @@ class FileEditorInput extends EditorInput {
 		return this.resource;
 	}
 
-	resolve(refresh?: boolean): TPromise<IEditorModel> {
+	resolve(): TPromise<IEditorModel> {
 		return TPromise.as(null);
 	}
 }
@@ -86,114 +86,4 @@ suite('Workbench editor', () => {
 		assert.equal(toResource(file, { supportSideBySide: true, filter: Schemas.file }).toString(), file.getResource().toString());
 		assert.equal(toResource(file, { supportSideBySide: true, filter: [Schemas.file, Schemas.untitled] }).toString(), file.getResource().toString());
 	});
-
-	test('EditorViewStateMemento - basics', function () {
-		const testGroup0 = new TestEditorGroup(0);
-		const testGroup1 = new TestEditorGroup(1);
-		const testGroup4 = new TestEditorGroup(4);
-
-		const editorGroupService = new TestEditorGroupsService([
-			testGroup0,
-			testGroup1,
-			new TestEditorGroup(2)
-		]);
-
-		interface TestViewState {
-			line: number;
-		}
-
-		const rawMemento = Object.create(null);
-		let memento = new EditorViewStateMemento<TestViewState>(editorGroupService, rawMemento, 'key', 3);
-
-		let res = memento.loadState(testGroup0, URI.file('/A'));
-		assert.ok(!res);
-
-		memento.saveState(testGroup0, URI.file('/A'), { line: 3 });
-		res = memento.loadState(testGroup0, URI.file('/A'));
-		assert.ok(res);
-		assert.equal(res.line, 3);
-
-		memento.saveState(testGroup1, URI.file('/A'), { line: 5 });
-		res = memento.loadState(testGroup1, URI.file('/A'));
-		assert.ok(res);
-		assert.equal(res.line, 5);
-
-		// Ensure capped at 3 elements
-		memento.saveState(testGroup0, URI.file('/B'), { line: 1 });
-		memento.saveState(testGroup0, URI.file('/C'), { line: 1 });
-		memento.saveState(testGroup0, URI.file('/D'), { line: 1 });
-		memento.saveState(testGroup0, URI.file('/E'), { line: 1 });
-
-		assert.ok(!memento.loadState(testGroup0, URI.file('/A')));
-		assert.ok(!memento.loadState(testGroup0, URI.file('/B')));
-		assert.ok(memento.loadState(testGroup0, URI.file('/C')));
-		assert.ok(memento.loadState(testGroup0, URI.file('/D')));
-		assert.ok(memento.loadState(testGroup0, URI.file('/E')));
-
-		// Save at an unknown group
-		memento.saveState(testGroup4, URI.file('/E'), { line: 1 });
-		assert.ok(memento.loadState(testGroup4, URI.file('/E'))); // only gets removed when memento is saved
-		memento.saveState(testGroup4, URI.file('/C'), { line: 1 });
-		assert.ok(memento.loadState(testGroup4, URI.file('/C'))); // only gets removed when memento is saved
-
-		memento.save();
-
-		memento = new EditorViewStateMemento(editorGroupService, rawMemento, 'key', 3);
-		assert.ok(memento.loadState(testGroup0, URI.file('/C')));
-		assert.ok(memento.loadState(testGroup0, URI.file('/D')));
-		assert.ok(memento.loadState(testGroup0, URI.file('/E')));
-
-		// Check on entries no longer there from invalid groups
-		assert.ok(!memento.loadState(testGroup4, URI.file('/E')));
-		assert.ok(!memento.loadState(testGroup4, URI.file('/C')));
-
-		memento.clearState(URI.file('/C'));
-		memento.clearState(URI.file('/E'));
-
-		assert.ok(!memento.loadState(testGroup0, URI.file('/C')));
-		assert.ok(memento.loadState(testGroup0, URI.file('/D')));
-		assert.ok(!memento.loadState(testGroup0, URI.file('/E')));
-	});
-
-	test('EditorViewStateMemento - use with editor input', function () {
-		const testGroup0 = new TestEditorGroup(0);
-
-		interface TestViewState {
-			line: number;
-		}
-
-		class TestEditorInput extends EditorInput {
-			constructor(private resource: URI, private id = 'testEditorInput') {
-				super();
-			}
-			public getTypeId() { return 'testEditorInput'; }
-			public resolve(): TPromise<IEditorModel> { return null; }
-
-			public matches(other: TestEditorInput): boolean {
-				return other && this.id === other.id && other instanceof TestEditorInput;
-			}
-
-			public getResource(): URI {
-				return this.resource;
-			}
-		}
-
-		const rawMemento = Object.create(null);
-		let memento = new EditorViewStateMemento<TestViewState>(new TestEditorGroupsService(), rawMemento, 'key', 3);
-
-		const testInputA = new TestEditorInput(URI.file('/A'));
-
-		let res = memento.loadState(testGroup0, testInputA);
-		assert.ok(!res);
-
-		memento.saveState(testGroup0, testInputA, { line: 3 });
-		res = memento.loadState(testGroup0, testInputA);
-		assert.ok(res);
-		assert.equal(res.line, 3);
-
-		// State removed when input gets disposed
-		testInputA.dispose();
-		res = memento.loadState(testGroup0, testInputA);
-		assert.ok(!res);
-	});
 });
\ No newline at end of file
diff --git a/src/vs/workbench/test/common/editor/editorDiffModel.test.ts b/src/vs/workbench/test/common/editor/editorDiffModel.test.ts
index b4ce15928a4..1c9dba44a0a 100644
--- a/src/vs/workbench/test/common/editor/editorDiffModel.test.ts
+++ b/src/vs/workbench/test/common/editor/editorDiffModel.test.ts
@@ -11,7 +11,7 @@ import { DiffEditorInput } from 'vs/workbench/common/editor/diffEditorInput';
 import { IModelService } from 'vs/editor/common/services/modelService';
 import { IModeService } from 'vs/editor/common/services/modeService';
 import { ResourceEditorInput } from 'vs/workbench/common/editor/resourceEditorInput';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { ITextModelService } from 'vs/editor/common/services/resolverService';
 import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
 import { TestTextFileService, workbenchInstantiationService } from 'vs/workbench/test/workbenchTestServices';
@@ -55,7 +55,7 @@ suite('Workbench editor model', () => {
 		let otherInput = instantiationService.createInstance(ResourceEditorInput, 'name2', 'description', URI.from({ scheme: 'test', authority: null, path: 'thePath' }));
 		let diffInput = new DiffEditorInput('name', 'description', input, otherInput);
 
-		return diffInput.resolve(true).then((model: any) => {
+		return diffInput.resolve().then((model: any) => {
 			assert(model);
 			assert(model instanceof TextDiffEditorModel);
 
@@ -63,7 +63,7 @@ suite('Workbench editor model', () => {
 			assert(diffEditorModel.original);
 			assert(diffEditorModel.modified);
 
-			return diffInput.resolve(true).then((model: any) => {
+			return diffInput.resolve().then((model: any) => {
 				assert(model.isResolved());
 
 				assert(diffEditorModel !== model.textDiffEditorModel);
diff --git a/src/vs/workbench/test/common/editor/editorGroups.test.ts b/src/vs/workbench/test/common/editor/editorGroups.test.ts
index d29a9cd41e8..1400512cbd5 100644
--- a/src/vs/workbench/test/common/editor/editorGroups.test.ts
+++ b/src/vs/workbench/test/common/editor/editorGroups.test.ts
@@ -8,7 +8,7 @@
 import * as assert from 'assert';
 import { EditorGroup, ISerializedEditorGroup, EditorCloseEvent } from 'vs/workbench/common/editor/editorGroup';
 import { Extensions as EditorExtensions, IEditorInputFactoryRegistry, EditorInput, IFileEditorInput, IEditorInputFactory, CloseDirection } from 'vs/workbench/common/editor';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { TestStorageService, TestLifecycleService, TestContextService } from 'vs/workbench/test/workbenchTestServices';
 import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
 import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
diff --git a/src/vs/workbench/test/common/editor/editorInput.test.ts b/src/vs/workbench/test/common/editor/editorInput.test.ts
index b162d802d25..94eea4a8805 100644
--- a/src/vs/workbench/test/common/editor/editorInput.test.ts
+++ b/src/vs/workbench/test/common/editor/editorInput.test.ts
@@ -11,7 +11,7 @@ import { DiffEditorInput } from 'vs/workbench/common/editor/diffEditorInput';
 
 class MyEditorInput extends EditorInput {
 	getTypeId(): string { return ''; }
-	resolve(refresh?: boolean): any { return null; }
+	resolve(): any { return null; }
 }
 
 suite('Workbench editor input', () => {
diff --git a/src/vs/workbench/test/common/editor/editorModel.test.ts b/src/vs/workbench/test/common/editor/editorModel.test.ts
index b1f991b36fe..180f11cb122 100644
--- a/src/vs/workbench/test/common/editor/editorModel.test.ts
+++ b/src/vs/workbench/test/common/editor/editorModel.test.ts
@@ -16,7 +16,7 @@ import { IConfigurationService } from 'vs/platform/configuration/common/configur
 import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
 import { ModelServiceImpl } from 'vs/editor/common/services/modelServiceImpl';
 import { ITextBufferFactory } from 'vs/editor/common/model';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { createTextBufferFactory } from 'vs/editor/common/model/textModel';
 
 class MyEditorModel extends EditorModel { }
@@ -24,6 +24,10 @@ class MyTextEditorModel extends BaseTextEditorModel {
 	public createTextEditorModel(value: ITextBufferFactory, resource?: URI, modeId?: string) {
 		return super.createTextEditorModel(value, resource, modeId);
 	}
+
+	isReadonly(): boolean {
+		return false;
+	}
 }
 
 suite('Workbench editor model', () => {
diff --git a/src/vs/workbench/test/common/editor/editorOptions.test.ts b/src/vs/workbench/test/common/editor/editorOptions.test.ts
index f5dd20c857f..345b58f4833 100644
--- a/src/vs/workbench/test/common/editor/editorOptions.test.ts
+++ b/src/vs/workbench/test/common/editor/editorOptions.test.ts
@@ -16,12 +16,12 @@ suite('Workbench editor options', () => {
 		assert(!options.preserveFocus);
 		options.preserveFocus = true;
 		assert(options.preserveFocus);
-		assert(!options.forceOpen);
-		options.forceOpen = true;
-		assert(options.forceOpen);
+		assert(!options.forceReload);
+		options.forceReload = true;
+		assert(options.forceReload);
 
 		options = new EditorOptions();
-		options.forceOpen = true;
+		options.forceReload = true;
 	});
 
 	test('TextEditorOptions', function () {
@@ -35,7 +35,7 @@ suite('Workbench editor options', () => {
 		otherOptions.selection(1, 1, 2, 2);
 
 		options = new TextEditorOptions();
-		options.forceOpen = true;
+		options.forceReload = true;
 		options.selection(1, 1, 2, 2);
 	});
 });
\ No newline at end of file
diff --git a/src/vs/workbench/test/common/editor/resourceEditorInput.test.ts b/src/vs/workbench/test/common/editor/resourceEditorInput.test.ts
index f08815e0582..44a0eff301d 100644
--- a/src/vs/workbench/test/common/editor/resourceEditorInput.test.ts
+++ b/src/vs/workbench/test/common/editor/resourceEditorInput.test.ts
@@ -6,7 +6,7 @@
 'use strict';
 
 import * as assert from 'assert';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { ResourceEditorInput } from 'vs/workbench/common/editor/resourceEditorInput';
 import { ResourceEditorModel } from 'vs/workbench/common/editor/resourceEditorModel';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
diff --git a/src/vs/workbench/test/common/editor/untitledEditor.test.ts b/src/vs/workbench/test/common/editor/untitledEditor.test.ts
index 3f21eeb388a..814aa29645c 100644
--- a/src/vs/workbench/test/common/editor/untitledEditor.test.ts
+++ b/src/vs/workbench/test/common/editor/untitledEditor.test.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import * as assert from 'assert';
 import { join } from 'vs/base/common/paths';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
diff --git a/src/vs/workbench/test/electron-browser/api/extHost.api.impl.test.ts b/src/vs/workbench/test/electron-browser/api/extHost.api.impl.test.ts
new file mode 100644
index 00000000000..299caf29e7d
--- /dev/null
+++ b/src/vs/workbench/test/electron-browser/api/extHost.api.impl.test.ts
@@ -0,0 +1,20 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+import * as assert from 'assert';
+import { URI } from 'vs/base/common/uri';
+import { originalFSPath } from 'vs/workbench/api/node/extHost.api.impl';
+
+suite('ExtHost API', function () {
+	test('issue #51387: originalFSPath', function () {
+		assert.equal(originalFSPath(URI.file('C:\\test')).charAt(0), 'C');
+		assert.equal(originalFSPath(URI.file('c:\\test')).charAt(0), 'c');
+
+		assert.equal(originalFSPath(URI.revive(JSON.parse(JSON.stringify(URI.file('C:\\test'))))).charAt(0), 'C');
+		assert.equal(originalFSPath(URI.revive(JSON.parse(JSON.stringify(URI.file('c:\\test'))))).charAt(0), 'c');
+	});
+});
diff --git a/src/vs/workbench/test/electron-browser/api/extHostApiCommands.test.ts b/src/vs/workbench/test/electron-browser/api/extHostApiCommands.test.ts
index 34528d0623d..a1be3772424 100644
--- a/src/vs/workbench/test/electron-browser/api/extHostApiCommands.test.ts
+++ b/src/vs/workbench/test/electron-browser/api/extHostApiCommands.test.ts
@@ -8,7 +8,7 @@
 import * as assert from 'assert';
 import { setUnexpectedErrorHandler, errorHandler } from 'vs/base/common/errors';
 import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { TPromise } from 'vs/base/common/winjs.base';
 import * as types from 'vs/workbench/api/node/extHostTypes';
 import { TextModel as EditorModel } from 'vs/editor/common/model/textModel';
@@ -122,7 +122,7 @@ suite('ExtHostLanguageFeatureCommands', function () {
 		const diagnostics = new ExtHostDiagnostics(rpcProtocol);
 		rpcProtocol.set(ExtHostContext.ExtHostDiagnostics, diagnostics);
 
-		extHost = new ExtHostLanguageFeatures(rpcProtocol, null, extHostDocuments, commands, heapService, diagnostics);
+		extHost = new ExtHostLanguageFeatures(rpcProtocol, null, extHostDocuments, commands, heapService, diagnostics, new NullLogService());
 		rpcProtocol.set(ExtHostContext.ExtHostLanguageFeatures, extHost);
 
 		mainThread = rpcProtocol.set(MainContext.MainThreadLanguageFeatures, inst.createInstance(MainThreadLanguageFeatures, rpcProtocol));
@@ -332,12 +332,44 @@ suite('ExtHostLanguageFeatureCommands', function () {
 			return commands.executeCommand<vscode.SymbolInformation[]>('vscode.executeDocumentSymbolProvider', model.uri).then(values => {
 				assert.equal(values.length, 2);
 				let [first, second] = values;
+				assert.ok(first instanceof types.SymbolInformation);
+				assert.ok(second instanceof types.SymbolInformation);
 				assert.equal(first.name, 'testing2');
 				assert.equal(second.name, 'testing1');
 			});
 		});
 	});
 
+	test('vscode.executeDocumentSymbolProvider command only returns SymbolInformation[] rather than DocumentSymbol[] #57984', function () {
+		disposables.push(extHost.registerDocumentSymbolProvider(defaultSelector, <vscode.DocumentSymbolProvider>{
+			provideDocumentSymbols(): any {
+				return [
+					new types.SymbolInformation('SymbolInformation', types.SymbolKind.Enum, new types.Range(1, 0, 1, 0))
+				];
+			}
+		}));
+		disposables.push(extHost.registerDocumentSymbolProvider(defaultSelector, <vscode.DocumentSymbolProvider>{
+			provideDocumentSymbols(): any {
+				let root = new types.DocumentSymbol('DocumentSymbol', 'DocumentSymbol#detail', types.SymbolKind.Enum, new types.Range(1, 0, 1, 0), new types.Range(1, 0, 1, 0));
+				root.children = [new types.DocumentSymbol('DocumentSymbol#child', 'DocumentSymbol#detail#child', types.SymbolKind.Enum, new types.Range(1, 0, 1, 0), new types.Range(1, 0, 1, 0))];
+				return [root];
+			}
+		}));
+
+		return rpcProtocol.sync().then(() => {
+			return commands.executeCommand<(vscode.SymbolInformation & vscode.DocumentSymbol)[]>('vscode.executeDocumentSymbolProvider', model.uri).then(values => {
+				assert.equal(values.length, 2);
+				let [first, second] = values;
+				assert.ok(first instanceof types.SymbolInformation);
+				assert.ok(!(first instanceof types.DocumentSymbol));
+				assert.ok(second instanceof types.SymbolInformation);
+				assert.equal(first.name, 'DocumentSymbol');
+				assert.equal(first.children.length, 1);
+				assert.equal(second.name, 'SymbolInformation');
+			});
+		});
+	});
+
 	// --- suggest
 
 	test('Suggest, back and forth', function () {
@@ -448,6 +480,65 @@ suite('ExtHostLanguageFeatureCommands', function () {
 
 	});
 
+	test('"vscode.executeCompletionItemProvider" doesnot return a preselect field #53749', async function () {
+		disposables.push(extHost.registerCompletionItemProvider(defaultSelector, <vscode.CompletionItemProvider>{
+			provideCompletionItems(): any {
+				let a = new types.CompletionItem('item1');
+				a.preselect = true;
+				let b = new types.CompletionItem('item2');
+				let c = new types.CompletionItem('item3');
+				c.preselect = true;
+				let d = new types.CompletionItem('item4');
+				return new types.CompletionList([a, b, c, d], false);
+			}
+		}, []));
+
+		await rpcProtocol.sync();
+
+		let list = await commands.executeCommand<vscode.CompletionList>(
+			'vscode.executeCompletionItemProvider',
+			model.uri,
+			new types.Position(0, 4),
+			undefined
+		);
+
+		assert.ok(list instanceof types.CompletionList);
+		assert.equal(list.items.length, 4);
+
+		let [a, b, c, d] = list.items;
+		assert.equal(a.preselect, true);
+		assert.equal(b.preselect, undefined);
+		assert.equal(c.preselect, true);
+		assert.equal(d.preselect, undefined);
+	});
+
+	test('executeCompletionItemProvider doesn\'t capture commitCharacters #58228', async function () {
+		disposables.push(extHost.registerCompletionItemProvider(defaultSelector, <vscode.CompletionItemProvider>{
+			provideCompletionItems(): any {
+				let a = new types.CompletionItem('item1');
+				a.commitCharacters = ['a', 'b'];
+				let b = new types.CompletionItem('item2');
+				return new types.CompletionList([a, b], false);
+			}
+		}, []));
+
+		await rpcProtocol.sync();
+
+		let list = await commands.executeCommand<vscode.CompletionList>(
+			'vscode.executeCompletionItemProvider',
+			model.uri,
+			new types.Position(0, 4),
+			undefined
+		);
+
+		assert.ok(list instanceof types.CompletionList);
+		assert.equal(list.items.length, 2);
+
+		let [a, b] = list.items;
+		assert.deepEqual(a.commitCharacters, ['a', 'b']);
+		assert.equal(b.commitCharacters, undefined);
+	});
+
 	// --- quickfix
 
 	test('QuickFix, back and forth', function () {
@@ -633,4 +724,20 @@ suite('ExtHostLanguageFeatureCommands', function () {
 			});
 		});
 	});
+
+	test('"TypeError: e.onCancellationRequested is not a function" calling hover provider in Insiders #54174', function () {
+
+		disposables.push(extHost.registerHoverProvider(defaultSelector, <vscode.HoverProvider>{
+			provideHover(): any {
+				return new types.Hover('fofofofo');
+			}
+		}));
+
+		return rpcProtocol.sync().then(() => {
+			return commands.executeCommand<vscode.Hover[]>('vscode.executeHoverProvider', model.uri, new types.Position(1, 1)).then(value => {
+				assert.equal(value.length, 1);
+				assert.equal(value[0].contents.length, 1);
+			});
+		});
+	});
 });
diff --git a/src/vs/workbench/test/electron-browser/api/extHostConfiguration.test.ts b/src/vs/workbench/test/electron-browser/api/extHostConfiguration.test.ts
index 6638722bd03..948d8bdbbe6 100644
--- a/src/vs/workbench/test/electron-browser/api/extHostConfiguration.test.ts
+++ b/src/vs/workbench/test/electron-browser/api/extHostConfiguration.test.ts
@@ -6,7 +6,7 @@
 'use strict';
 
 import * as assert from 'assert';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { ExtHostWorkspace } from 'vs/workbench/api/node/extHostWorkspace';
 import { ExtHostConfiguration } from 'vs/workbench/api/node/extHostConfiguration';
 import { MainThreadConfigurationShape, IConfigurationInitData } from 'vs/workbench/api/node/extHost.protocol';
@@ -18,6 +18,7 @@ import { IWorkspaceFolder, WorkspaceFolder } from 'vs/platform/workspace/common/
 import { ConfigurationTarget } from 'vs/platform/configuration/common/configuration';
 import { NullLogService } from 'vs/platform/log/common/log';
 import { assign } from 'vs/base/common/objects';
+import { Counter } from 'vs/base/common/numbers';
 
 suite('ExtHostConfiguration', function () {
 
@@ -33,7 +34,7 @@ suite('ExtHostConfiguration', function () {
 		if (!shape) {
 			shape = new class extends mock<MainThreadConfigurationShape>() { };
 		}
-		return new ExtHostConfiguration(shape, new ExtHostWorkspace(new TestRPCProtocol(), null, new NullLogService()), createConfigurationData(contents));
+		return new ExtHostConfiguration(shape, new ExtHostWorkspace(new TestRPCProtocol(), null, new NullLogService(), new Counter()), createConfigurationData(contents));
 	}
 
 	function createConfigurationData(contents: any): IConfigurationInitData {
@@ -267,7 +268,7 @@ suite('ExtHostConfiguration', function () {
 	test('inspect in no workspace context', function () {
 		const testObject = new ExtHostConfiguration(
 			new class extends mock<MainThreadConfigurationShape>() { },
-			new ExtHostWorkspace(new TestRPCProtocol(), null, new NullLogService()),
+			new ExtHostWorkspace(new TestRPCProtocol(), null, new NullLogService(), new Counter()),
 			{
 				defaults: new ConfigurationModel({
 					'editor': {
@@ -314,7 +315,7 @@ suite('ExtHostConfiguration', function () {
 				'id': 'foo',
 				'folders': [aWorkspaceFolder(URI.file('foo'), 0)],
 				'name': 'foo'
-			}, new NullLogService()),
+			}, new NullLogService(), new Counter()),
 			{
 				defaults: new ConfigurationModel({
 					'editor': {
@@ -388,7 +389,7 @@ suite('ExtHostConfiguration', function () {
 				'id': 'foo',
 				'folders': [aWorkspaceFolder(firstRoot, 0), aWorkspaceFolder(secondRoot, 1)],
 				'name': 'foo'
-			}, new NullLogService()),
+			}, new NullLogService(), new Counter()),
 			{
 				defaults: new ConfigurationModel({
 					'editor': {
@@ -597,7 +598,7 @@ suite('ExtHostConfiguration', function () {
 				'id': 'foo',
 				'folders': [workspaceFolder],
 				'name': 'foo'
-			}, new NullLogService()),
+			}, new NullLogService(), new Counter()),
 			createConfigurationData({
 				'farboo': {
 					'config': false,
diff --git a/src/vs/workbench/test/electron-browser/api/extHostDiagnostics.test.ts b/src/vs/workbench/test/electron-browser/api/extHostDiagnostics.test.ts
index 0b454064c07..5440265b2cc 100644
--- a/src/vs/workbench/test/electron-browser/api/extHostDiagnostics.test.ts
+++ b/src/vs/workbench/test/electron-browser/api/extHostDiagnostics.test.ts
@@ -6,10 +6,10 @@
 'use strict';
 
 import * as assert from 'assert';
-import URI, { UriComponents } from 'vs/base/common/uri';
-import { DiagnosticCollection } from 'vs/workbench/api/node/extHostDiagnostics';
+import { URI, UriComponents } from 'vs/base/common/uri';
+import { DiagnosticCollection, ExtHostDiagnostics } from 'vs/workbench/api/node/extHostDiagnostics';
 import { Diagnostic, DiagnosticSeverity, Range, DiagnosticRelatedInformation, Location } from 'vs/workbench/api/node/extHostTypes';
-import { MainThreadDiagnosticsShape } from 'vs/workbench/api/node/extHost.protocol';
+import { MainThreadDiagnosticsShape, IMainContext } from 'vs/workbench/api/node/extHost.protocol';
 import { IMarkerData, MarkerSeverity } from 'vs/platform/markers/common/markers';
 import { mock } from 'vs/workbench/test/electron-browser/api/mock';
 import { Emitter, toPromise } from 'vs/base/common/event';
@@ -27,7 +27,7 @@ suite('ExtHostDiagnostics', () => {
 
 	test('disposeCheck', function () {
 
-		const collection = new DiagnosticCollection('test', 100, new DiagnosticsShape(), new Emitter());
+		const collection = new DiagnosticCollection('test', 'test', 100, new DiagnosticsShape(), new Emitter());
 
 		collection.dispose();
 		collection.dispose(); // that's OK
@@ -44,13 +44,13 @@ suite('ExtHostDiagnostics', () => {
 
 
 	test('diagnostic collection, forEach, clear, has', function () {
-		let collection = new DiagnosticCollection('test', 100, new DiagnosticsShape(), new Emitter());
+		let collection = new DiagnosticCollection('test', 'test', 100, new DiagnosticsShape(), new Emitter());
 		assert.equal(collection.name, 'test');
 		collection.dispose();
 		assert.throws(() => collection.name);
 
 		let c = 0;
-		collection = new DiagnosticCollection('test', 100, new DiagnosticsShape(), new Emitter());
+		collection = new DiagnosticCollection('test', 'test', 100, new DiagnosticsShape(), new Emitter());
 		collection.forEach(() => c++);
 		assert.equal(c, 0);
 
@@ -87,7 +87,7 @@ suite('ExtHostDiagnostics', () => {
 	});
 
 	test('diagnostic collection, immutable read', function () {
-		let collection = new DiagnosticCollection('test', 100, new DiagnosticsShape(), new Emitter());
+		let collection = new DiagnosticCollection('test', 'test', 100, new DiagnosticsShape(), new Emitter());
 		collection.set(URI.parse('foo:bar'), [
 			new Diagnostic(new Range(0, 0, 1, 1), 'message-1'),
 			new Diagnostic(new Range(0, 0, 1, 1), 'message-2')
@@ -112,7 +112,7 @@ suite('ExtHostDiagnostics', () => {
 
 
 	test('diagnostics collection, set with dupliclated tuples', function () {
-		let collection = new DiagnosticCollection('test', 100, new DiagnosticsShape(), new Emitter());
+		let collection = new DiagnosticCollection('test', 'test', 100, new DiagnosticsShape(), new Emitter());
 		let uri = URI.parse('sc:hightower');
 		collection.set([
 			[uri, [new Diagnostic(new Range(0, 0, 0, 1), 'message-1')]],
@@ -163,7 +163,7 @@ suite('ExtHostDiagnostics', () => {
 	test('diagnostics collection, set tuple overrides, #11547', function () {
 
 		let lastEntries: [UriComponents, IMarkerData[]][];
-		let collection = new DiagnosticCollection('test', 100, new class extends DiagnosticsShape {
+		let collection = new DiagnosticCollection('test', 'test', 100, new class extends DiagnosticsShape {
 			$changeMany(owner: string, entries: [UriComponents, IMarkerData[]][]): void {
 				lastEntries = entries;
 				return super.$changeMany(owner, entries);
@@ -190,9 +190,34 @@ suite('ExtHostDiagnostics', () => {
 		lastEntries = undefined;
 	});
 
+	test('don\'t send message when not making a change', function () {
+
+		let changeCount = 0;
+		let eventCount = 0;
+
+		const emitter = new Emitter<any>();
+		emitter.event(_ => eventCount += 1);
+		const collection = new DiagnosticCollection('test', 'test', 100, new class extends DiagnosticsShape {
+			$changeMany() {
+				changeCount += 1;
+			}
+		}, emitter);
+
+		let uri = URI.parse('sc:hightower');
+		let diag = new Diagnostic(new Range(0, 0, 0, 1), 'ffff');
+
+		collection.set(uri, [diag]);
+		assert.equal(changeCount, 1);
+		assert.equal(eventCount, 1);
+
+		collection.set(uri, [diag]);
+		assert.equal(changeCount, 1);
+		assert.equal(eventCount, 2);
+	});
+
 	test('diagnostics collection, tuples and undefined (small array), #15585', function () {
 
-		const collection = new DiagnosticCollection('test', 100, new DiagnosticsShape(), new Emitter());
+		const collection = new DiagnosticCollection('test', 'test', 100, new DiagnosticsShape(), new Emitter());
 		let uri = URI.parse('sc:hightower');
 		let uri2 = URI.parse('sc:nomad');
 		let diag = new Diagnostic(new Range(0, 0, 0, 1), 'ffff');
@@ -213,7 +238,7 @@ suite('ExtHostDiagnostics', () => {
 
 	test('diagnostics collection, tuples and undefined (large array), #15585', function () {
 
-		const collection = new DiagnosticCollection('test', 100, new DiagnosticsShape(), new Emitter());
+		const collection = new DiagnosticCollection('test', 'test', 100, new DiagnosticsShape(), new Emitter());
 		const tuples: [URI, Diagnostic[]][] = [];
 
 		for (let i = 0; i < 500; i++) {
@@ -237,7 +262,7 @@ suite('ExtHostDiagnostics', () => {
 	test('diagnostic capping', function () {
 
 		let lastEntries: [UriComponents, IMarkerData[]][];
-		let collection = new DiagnosticCollection('test', 250, new class extends DiagnosticsShape {
+		let collection = new DiagnosticCollection('test', 'test', 250, new class extends DiagnosticsShape {
 			$changeMany(owner: string, entries: [UriComponents, IMarkerData[]][]): void {
 				lastEntries = entries;
 				return super.$changeMany(owner, entries);
@@ -263,7 +288,7 @@ suite('ExtHostDiagnostics', () => {
 
 	test('diagnostic eventing', async function () {
 		let emitter = new Emitter<(string | URI)[]>();
-		let collection = new DiagnosticCollection('ddd', 100, new DiagnosticsShape(), emitter);
+		let collection = new DiagnosticCollection('ddd', 'test', 100, new DiagnosticsShape(), emitter);
 
 		let diag1 = new Diagnostic(new Range(1, 1, 2, 3), 'diag1');
 		let diag2 = new Diagnostic(new Range(1, 1, 2, 3), 'diag2');
@@ -301,7 +326,7 @@ suite('ExtHostDiagnostics', () => {
 
 	test('vscode.languages.onDidChangeDiagnostics Does Not Provide Document URI #49582', async function () {
 		let emitter = new Emitter<(string | URI)[]>();
-		let collection = new DiagnosticCollection('ddd', 100, new DiagnosticsShape(), emitter);
+		let collection = new DiagnosticCollection('ddd', 'test', 100, new DiagnosticsShape(), emitter);
 
 		let diag1 = new Diagnostic(new Range(1, 1, 2, 3), 'diag1');
 
@@ -324,7 +349,7 @@ suite('ExtHostDiagnostics', () => {
 
 	test('diagnostics with related information', function (done) {
 
-		let collection = new DiagnosticCollection('ddd', 100, new class extends DiagnosticsShape {
+		let collection = new DiagnosticCollection('ddd', 'test', 100, new class extends DiagnosticsShape {
 			$changeMany(owner: string, entries: [UriComponents, IMarkerData[]][]) {
 
 				let [[, data]] = entries;
@@ -347,4 +372,33 @@ suite('ExtHostDiagnostics', () => {
 
 		collection.set(URI.parse('aa:bb'), [diag]);
 	});
+
+	test('vscode.languages.getDiagnostics appears to return old diagnostics in some circumstances #54359', function () {
+		const ownerHistory: string[] = [];
+		const diags = new ExtHostDiagnostics(new class implements IMainContext {
+			getProxy(id: any): any {
+				return new class DiagnosticsShape {
+					$clear(owner: string): void {
+						ownerHistory.push(owner);
+					}
+				};
+			}
+			set(): any {
+				return null;
+			}
+			assertRegistered(): void {
+
+			}
+		});
+
+		let collection1 = diags.createDiagnosticCollection('foo');
+		let collection2 = diags.createDiagnosticCollection('foo'); // warns, uses a different owner
+
+		collection1.clear();
+		collection2.clear();
+
+		assert.equal(ownerHistory.length, 2);
+		assert.equal(ownerHistory[0], 'foo');
+		assert.equal(ownerHistory[1], 'foo0');
+	});
 });
diff --git a/src/vs/workbench/test/electron-browser/api/extHostDocumentData.test.ts b/src/vs/workbench/test/electron-browser/api/extHostDocumentData.test.ts
index daad9c035e9..3b06b1cd7d1 100644
--- a/src/vs/workbench/test/electron-browser/api/extHostDocumentData.test.ts
+++ b/src/vs/workbench/test/electron-browser/api/extHostDocumentData.test.ts
@@ -6,7 +6,7 @@
 'use strict';
 
 import * as assert from 'assert';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { ExtHostDocumentData } from 'vs/workbench/api/node/extHostDocumentData';
 import { Position } from 'vs/workbench/api/node/extHostTypes';
 import { Range } from 'vs/editor/common/core/range';
diff --git a/src/vs/workbench/test/electron-browser/api/extHostDocumentSaveParticipant.test.ts b/src/vs/workbench/test/electron-browser/api/extHostDocumentSaveParticipant.test.ts
index a4d4ceb1822..75a38895b19 100644
--- a/src/vs/workbench/test/electron-browser/api/extHostDocumentSaveParticipant.test.ts
+++ b/src/vs/workbench/test/electron-browser/api/extHostDocumentSaveParticipant.test.ts
@@ -5,7 +5,7 @@
 'use strict';
 
 import * as assert from 'assert';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { ExtHostDocuments } from 'vs/workbench/api/node/extHostDocuments';
 import { ExtHostDocumentsAndEditors } from 'vs/workbench/api/node/extHostDocumentsAndEditors';
diff --git a/src/vs/workbench/test/electron-browser/api/extHostDocumentsAndEditors.test.ts b/src/vs/workbench/test/electron-browser/api/extHostDocumentsAndEditors.test.ts
index aab5a265951..878c4c8e09a 100644
--- a/src/vs/workbench/test/electron-browser/api/extHostDocumentsAndEditors.test.ts
+++ b/src/vs/workbench/test/electron-browser/api/extHostDocumentsAndEditors.test.ts
@@ -6,7 +6,7 @@
 'use strict';
 
 import * as assert from 'assert';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { ExtHostDocumentsAndEditors } from 'vs/workbench/api/node/extHostDocumentsAndEditors';
 
 suite('ExtHostDocumentsAndEditors', () => {
diff --git a/src/vs/workbench/test/electron-browser/api/extHostFileSystemEventService.test.ts b/src/vs/workbench/test/electron-browser/api/extHostFileSystemEventService.test.ts
index 1bea8cfccef..2c1263203ea 100644
--- a/src/vs/workbench/test/electron-browser/api/extHostFileSystemEventService.test.ts
+++ b/src/vs/workbench/test/electron-browser/api/extHostFileSystemEventService.test.ts
@@ -6,18 +6,25 @@
 
 import * as assert from 'assert';
 import { ExtHostFileSystemEventService } from 'vs/workbench/api/node/extHostFileSystemEventService';
+import { IMainContext } from 'vs/workbench/api/node/extHost.protocol';
 
 suite('ExtHostFileSystemEventService', () => {
 
 
 	test('FileSystemWatcher ignore events properties are reversed #26851', function () {
 
-		const watcher1 = new ExtHostFileSystemEventService().createFileSystemWatcher('**/somethingInteresting', false, false, false);
+		const protocol: IMainContext = {
+			getProxy: () => { return undefined; },
+			set: undefined,
+			assertRegistered: undefined
+		};
+
+		const watcher1 = new ExtHostFileSystemEventService(protocol, undefined).createFileSystemWatcher('**/somethingInteresting', false, false, false);
 		assert.equal(watcher1.ignoreChangeEvents, false);
 		assert.equal(watcher1.ignoreCreateEvents, false);
 		assert.equal(watcher1.ignoreDeleteEvents, false);
 
-		const watcher2 = new ExtHostFileSystemEventService().createFileSystemWatcher('**/somethingBoring', true, true, true);
+		const watcher2 = new ExtHostFileSystemEventService(protocol, undefined).createFileSystemWatcher('**/somethingBoring', true, true, true);
 		assert.equal(watcher2.ignoreChangeEvents, true);
 		assert.equal(watcher2.ignoreCreateEvents, true);
 		assert.equal(watcher2.ignoreDeleteEvents, true);
diff --git a/src/vs/workbench/test/electron-browser/api/extHostLanguageFeatures.test.ts b/src/vs/workbench/test/electron-browser/api/extHostLanguageFeatures.test.ts
index 69c4b023ee8..18606175be9 100644
--- a/src/vs/workbench/test/electron-browser/api/extHostLanguageFeatures.test.ts
+++ b/src/vs/workbench/test/electron-browser/api/extHostLanguageFeatures.test.ts
@@ -8,7 +8,7 @@
 import * as assert from 'assert';
 import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
 import { setUnexpectedErrorHandler, errorHandler } from 'vs/base/common/errors';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import * as types from 'vs/workbench/api/node/extHostTypes';
 import { TextModel as EditorModel } from 'vs/editor/common/model/textModel';
 import { Position as EditorPosition } from 'vs/editor/common/core/position';
@@ -24,7 +24,7 @@ import { IHeapService } from 'vs/workbench/api/electron-browser/mainThreadHeapSe
 import { ExtHostDocuments } from 'vs/workbench/api/node/extHostDocuments';
 import { ExtHostDocumentsAndEditors } from 'vs/workbench/api/node/extHostDocumentsAndEditors';
 import { getDocumentSymbols } from 'vs/editor/contrib/quickOpen/quickOpen';
-import { DocumentSymbolProviderRegistry, DocumentHighlightKind, Hover, ResourceTextEdit } from 'vs/editor/common/modes';
+import * as modes from 'vs/editor/common/modes';
 import { getCodeLensData } from 'vs/editor/contrib/codelens/codelens';
 import { getDefinitionsAtPosition, getImplementationsAtPosition, getTypeDefinitionsAtPosition } from 'vs/editor/contrib/goToDefinition/goToDefinition';
 import { getHover } from 'vs/editor/contrib/hover/getHover';
@@ -37,7 +37,6 @@ import { provideSignatureHelp } from 'vs/editor/contrib/parameterHints/provideSi
 import { provideSuggestionItems } from 'vs/editor/contrib/suggest/suggest';
 import { getDocumentFormattingEdits, getDocumentRangeFormattingEdits, getOnTypeFormattingEdits } from 'vs/editor/contrib/format/format';
 import { getLinks } from 'vs/editor/contrib/links/getLinks';
-import { asWinJsPromise } from 'vs/base/common/async';
 import { MainContext, ExtHostContext } from 'vs/workbench/api/node/extHost.protocol';
 import { ExtHostDiagnostics } from 'vs/workbench/api/node/extHostDiagnostics';
 import { ExtHostHeapService } from 'vs/workbench/api/node/extHostHeapService';
@@ -46,6 +45,7 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti
 import { NullLogService } from 'vs/platform/log/common/log';
 import { ITextModel, EndOfLineSequence } from 'vs/editor/common/model';
 import { getColors } from 'vs/editor/contrib/colorPicker/color';
+import { CancellationToken } from 'vs/base/common/cancellation';
 
 const defaultSelector = { scheme: 'far' };
 const model: ITextModel = EditorModel.createFromString(
@@ -111,7 +111,7 @@ suite('ExtHostLanguageFeatures', function () {
 		const diagnostics = new ExtHostDiagnostics(rpcProtocol);
 		rpcProtocol.set(ExtHostContext.ExtHostDiagnostics, diagnostics);
 
-		extHost = new ExtHostLanguageFeatures(rpcProtocol, null, extHostDocuments, commands, heapService, diagnostics);
+		extHost = new ExtHostLanguageFeatures(rpcProtocol, null, extHostDocuments, commands, heapService, diagnostics, new NullLogService());
 		rpcProtocol.set(ExtHostContext.ExtHostLanguageFeatures, extHost);
 
 		mainThread = rpcProtocol.set(MainContext.MainThreadLanguageFeatures, inst.createInstance(MainThreadLanguageFeatures, rpcProtocol));
@@ -133,7 +133,7 @@ suite('ExtHostLanguageFeatures', function () {
 	// --- outline
 
 	test('DocumentSymbols, register/deregister', function () {
-		assert.equal(DocumentSymbolProviderRegistry.all(model).length, 0);
+		assert.equal(modes.DocumentSymbolProviderRegistry.all(model).length, 0);
 		let d1 = extHost.registerDocumentSymbolProvider(defaultSelector, <vscode.DocumentSymbolProvider>{
 			provideDocumentSymbols() {
 				return <vscode.SymbolInformation[]>[];
@@ -141,7 +141,7 @@ suite('ExtHostLanguageFeatures', function () {
 		});
 
 		return rpcProtocol.sync().then(() => {
-			assert.equal(DocumentSymbolProviderRegistry.all(model).length, 1);
+			assert.equal(modes.DocumentSymbolProviderRegistry.all(model).length, 1);
 			d1.dispose();
 			return rpcProtocol.sync();
 		});
@@ -162,8 +162,8 @@ suite('ExtHostLanguageFeatures', function () {
 
 		return rpcProtocol.sync().then(() => {
 
-			return getDocumentSymbols(model).then(value => {
-				assert.equal(value.entries.length, 1);
+			return getDocumentSymbols(model, true, CancellationToken.None).then(value => {
+				assert.equal(value.length, 1);
 			});
 		});
 	});
@@ -177,12 +177,12 @@ suite('ExtHostLanguageFeatures', function () {
 
 		return rpcProtocol.sync().then(() => {
 
-			return getDocumentSymbols(model).then(value => {
-				assert.equal(value.entries.length, 1);
+			return getDocumentSymbols(model, true, CancellationToken.None).then(value => {
+				assert.equal(value.length, 1);
 
-				let entry = value.entries[0];
+				let entry = value[0];
 				assert.equal(entry.name, 'test');
-				assert.deepEqual(entry.location.range, { startLineNumber: 1, startColumn: 1, endLineNumber: 1, endColumn: 1 });
+				assert.deepEqual(entry.range, { startLineNumber: 1, startColumn: 1, endLineNumber: 1, endColumn: 1 });
 			});
 		});
 	});
@@ -203,7 +203,7 @@ suite('ExtHostLanguageFeatures', function () {
 		}));
 
 		return rpcProtocol.sync().then(() => {
-			return getCodeLensData(model).then(value => {
+			return getCodeLensData(model, CancellationToken.None).then(value => {
 				assert.equal(value.length, 1);
 			});
 		});
@@ -224,13 +224,10 @@ suite('ExtHostLanguageFeatures', function () {
 
 		return rpcProtocol.sync().then(() => {
 
-			return getCodeLensData(model).then(value => {
+			return getCodeLensData(model, CancellationToken.None).then(value => {
 				assert.equal(value.length, 1);
 				let data = value[0];
-
-				return asWinJsPromise((token) => {
-					return data.provider.resolveCodeLens(model, data.symbol, token);
-				}).then(symbol => {
+				return Promise.resolve(data.provider.resolveCodeLens(model, data.symbol, CancellationToken.None)).then(symbol => {
 					assert.equal(symbol.command.id, 'id');
 					assert.equal(symbol.command.title, 'Title');
 				});
@@ -248,13 +245,11 @@ suite('ExtHostLanguageFeatures', function () {
 
 		return rpcProtocol.sync().then(() => {
 
-			return getCodeLensData(model).then(value => {
+			return getCodeLensData(model, CancellationToken.None).then(value => {
 				assert.equal(value.length, 1);
 
 				let data = value[0];
-				return asWinJsPromise((token) => {
-					return data.provider.resolveCodeLens(model, data.symbol, token);
-				}).then(symbol => {
+				return Promise.resolve(data.provider.resolveCodeLens(model, data.symbol, CancellationToken.None)).then(symbol => {
 
 					assert.equal(symbol.command.id, 'missing');
 					assert.equal(symbol.command.title, '<<MISSING COMMAND>>');
@@ -275,7 +270,7 @@ suite('ExtHostLanguageFeatures', function () {
 
 		return rpcProtocol.sync().then(() => {
 
-			return getDefinitionsAtPosition(model, new EditorPosition(1, 1)).then(value => {
+			return getDefinitionsAtPosition(model, new EditorPosition(1, 1), CancellationToken.None).then(value => {
 				assert.equal(value.length, 1);
 				let [entry] = value;
 				assert.deepEqual(entry.range, { startLineNumber: 2, startColumn: 3, endLineNumber: 4, endColumn: 5 });
@@ -299,7 +294,7 @@ suite('ExtHostLanguageFeatures', function () {
 
 		return rpcProtocol.sync().then(() => {
 
-			return getDefinitionsAtPosition(model, new EditorPosition(1, 1)).then(value => {
+			return getDefinitionsAtPosition(model, new EditorPosition(1, 1), CancellationToken.None).then(value => {
 				assert.equal(value.length, 2);
 			});
 		});
@@ -321,7 +316,7 @@ suite('ExtHostLanguageFeatures', function () {
 
 		return rpcProtocol.sync().then(() => {
 
-			return getDefinitionsAtPosition(model, new EditorPosition(1, 1)).then(value => {
+			return getDefinitionsAtPosition(model, new EditorPosition(1, 1), CancellationToken.None).then(value => {
 				assert.equal(value.length, 2);
 				// let [first, second] = value;
 
@@ -346,7 +341,7 @@ suite('ExtHostLanguageFeatures', function () {
 
 		return rpcProtocol.sync().then(() => {
 
-			return getDefinitionsAtPosition(model, new EditorPosition(1, 1)).then(value => {
+			return getDefinitionsAtPosition(model, new EditorPosition(1, 1), CancellationToken.None).then(value => {
 				assert.equal(value.length, 1);
 			});
 		});
@@ -363,7 +358,7 @@ suite('ExtHostLanguageFeatures', function () {
 		}));
 
 		return rpcProtocol.sync().then(() => {
-			return getImplementationsAtPosition(model, new EditorPosition(1, 1)).then(value => {
+			return getImplementationsAtPosition(model, new EditorPosition(1, 1), CancellationToken.None).then(value => {
 				assert.equal(value.length, 1);
 				let [entry] = value;
 				assert.deepEqual(entry.range, { startLineNumber: 2, startColumn: 3, endLineNumber: 4, endColumn: 5 });
@@ -383,7 +378,7 @@ suite('ExtHostLanguageFeatures', function () {
 		}));
 
 		return rpcProtocol.sync().then(() => {
-			return getTypeDefinitionsAtPosition(model, new EditorPosition(1, 1)).then(value => {
+			return getTypeDefinitionsAtPosition(model, new EditorPosition(1, 1), CancellationToken.None).then(value => {
 				assert.equal(value.length, 1);
 				let [entry] = value;
 				assert.deepEqual(entry.range, { startLineNumber: 2, startColumn: 3, endLineNumber: 4, endColumn: 5 });
@@ -403,7 +398,7 @@ suite('ExtHostLanguageFeatures', function () {
 		}));
 
 		return rpcProtocol.sync().then(() => {
-			getHover(model, new EditorPosition(1, 1)).then(value => {
+			getHover(model, new EditorPosition(1, 1), CancellationToken.None).then(value => {
 				assert.equal(value.length, 1);
 				let [entry] = value;
 				assert.deepEqual(entry.range, { startLineNumber: 1, startColumn: 1, endLineNumber: 1, endColumn: 5 });
@@ -422,7 +417,7 @@ suite('ExtHostLanguageFeatures', function () {
 
 		return rpcProtocol.sync().then(() => {
 
-			getHover(model, new EditorPosition(1, 1)).then(value => {
+			getHover(model, new EditorPosition(1, 1), CancellationToken.None).then(value => {
 				assert.equal(value.length, 1);
 				let [entry] = value;
 				assert.deepEqual(entry.range, { startLineNumber: 4, startColumn: 1, endLineNumber: 9, endColumn: 8 });
@@ -446,9 +441,9 @@ suite('ExtHostLanguageFeatures', function () {
 		}));
 
 		return rpcProtocol.sync().then(() => {
-			return getHover(model, new EditorPosition(1, 1)).then(value => {
+			return getHover(model, new EditorPosition(1, 1), CancellationToken.None).then(value => {
 				assert.equal(value.length, 2);
-				let [first, second] = value as Hover[];
+				let [first, second] = value as modes.Hover[];
 				assert.equal(first.contents[0].value, 'registered second');
 				assert.equal(second.contents[0].value, 'registered first');
 			});
@@ -471,7 +466,7 @@ suite('ExtHostLanguageFeatures', function () {
 
 		return rpcProtocol.sync().then(() => {
 
-			getHover(model, new EditorPosition(1, 1)).then(value => {
+			getHover(model, new EditorPosition(1, 1), CancellationToken.None).then(value => {
 
 				assert.equal(value.length, 1);
 			});
@@ -490,11 +485,11 @@ suite('ExtHostLanguageFeatures', function () {
 
 		return rpcProtocol.sync().then(() => {
 
-			return getOccurrencesAtPosition(model, new EditorPosition(1, 2)).then(value => {
+			return getOccurrencesAtPosition(model, new EditorPosition(1, 2), CancellationToken.None).then(value => {
 				assert.equal(value.length, 1);
 				let [entry] = value;
 				assert.deepEqual(entry.range, { startLineNumber: 1, startColumn: 1, endLineNumber: 1, endColumn: 5 });
-				assert.equal(entry.kind, DocumentHighlightKind.Text);
+				assert.equal(entry.kind, modes.DocumentHighlightKind.Text);
 			});
 		});
 	});
@@ -514,11 +509,11 @@ suite('ExtHostLanguageFeatures', function () {
 
 		return rpcProtocol.sync().then(() => {
 
-			return getOccurrencesAtPosition(model, new EditorPosition(1, 2)).then(value => {
+			return getOccurrencesAtPosition(model, new EditorPosition(1, 2), CancellationToken.None).then(value => {
 				assert.equal(value.length, 1);
 				let [entry] = value;
 				assert.deepEqual(entry.range, { startLineNumber: 1, startColumn: 1, endLineNumber: 1, endColumn: 5 });
-				assert.equal(entry.kind, DocumentHighlightKind.Text);
+				assert.equal(entry.kind, modes.DocumentHighlightKind.Text);
 			});
 		});
 	});
@@ -538,11 +533,11 @@ suite('ExtHostLanguageFeatures', function () {
 
 		return rpcProtocol.sync().then(() => {
 
-			return getOccurrencesAtPosition(model, new EditorPosition(1, 2)).then(value => {
+			return getOccurrencesAtPosition(model, new EditorPosition(1, 2), CancellationToken.None).then(value => {
 				assert.equal(value.length, 1);
 				let [entry] = value;
 				assert.deepEqual(entry.range, { startLineNumber: 1, startColumn: 1, endLineNumber: 1, endColumn: 3 });
-				assert.equal(entry.kind, DocumentHighlightKind.Text);
+				assert.equal(entry.kind, modes.DocumentHighlightKind.Text);
 			});
 		});
 	});
@@ -563,7 +558,7 @@ suite('ExtHostLanguageFeatures', function () {
 
 		return rpcProtocol.sync().then(() => {
 
-			return getOccurrencesAtPosition(model, new EditorPosition(1, 2)).then(value => {
+			return getOccurrencesAtPosition(model, new EditorPosition(1, 2), CancellationToken.None).then(value => {
 				assert.equal(value.length, 1);
 			});
 		});
@@ -587,7 +582,7 @@ suite('ExtHostLanguageFeatures', function () {
 
 		return rpcProtocol.sync().then(() => {
 
-			return provideReferences(model, new EditorPosition(1, 2)).then(value => {
+			return provideReferences(model, new EditorPosition(1, 2), CancellationToken.None).then(value => {
 				assert.equal(value.length, 2);
 
 				let [first, second] = value;
@@ -607,7 +602,7 @@ suite('ExtHostLanguageFeatures', function () {
 
 		return rpcProtocol.sync().then(() => {
 
-			return provideReferences(model, new EditorPosition(1, 2)).then(value => {
+			return provideReferences(model, new EditorPosition(1, 2), CancellationToken.None).then(value => {
 				assert.equal(value.length, 1);
 
 				let [item] = value;
@@ -633,7 +628,7 @@ suite('ExtHostLanguageFeatures', function () {
 
 		return rpcProtocol.sync().then(() => {
 
-			return provideReferences(model, new EditorPosition(1, 2)).then(value => {
+			return provideReferences(model, new EditorPosition(1, 2), CancellationToken.None).then(value => {
 				assert.equal(value.length, 1);
 			});
 
@@ -841,8 +836,10 @@ suite('ExtHostLanguageFeatures', function () {
 		return rpcProtocol.sync().then(() => {
 
 			return rename(model, new EditorPosition(1, 1), 'newName').then(value => {
-				assert.equal(value.edits.length, 1); // least relevant renamer
-				assert.equal((<ResourceTextEdit[]>value.edits)[0].edits.length, 2); // least relevant renamer
+				// least relevant rename provider
+				assert.equal(value.edits.length, 2);
+				assert.equal((<modes.ResourceTextEdit>value.edits[0]).edits.length, 1);
+				assert.equal((<modes.ResourceTextEdit>value.edits[1]).edits.length, 1);
 			});
 		});
 	});
@@ -869,7 +866,7 @@ suite('ExtHostLanguageFeatures', function () {
 
 		return rpcProtocol.sync().then(() => {
 
-			return provideSignatureHelp(model, new EditorPosition(1, 1)).then(value => {
+			return provideSignatureHelp(model, new EditorPosition(1, 1), { triggerReason: modes.SignatureHelpTriggerReason.Invoke }, CancellationToken.None).then(value => {
 				assert.ok(value);
 			});
 		});
@@ -884,7 +881,7 @@ suite('ExtHostLanguageFeatures', function () {
 
 		return rpcProtocol.sync().then(() => {
 
-			return provideSignatureHelp(model, new EditorPosition(1, 1)).then(value => {
+			return provideSignatureHelp(model, new EditorPosition(1, 1), { triggerReason: modes.SignatureHelpTriggerReason.Invoke }, CancellationToken.None).then(value => {
 				assert.equal(value, undefined);
 			});
 		});
@@ -1008,7 +1005,7 @@ suite('ExtHostLanguageFeatures', function () {
 		}));
 
 		return rpcProtocol.sync().then(() => {
-			return getDocumentFormattingEdits(model, { insertSpaces: true, tabSize: 4 }).then(value => {
+			return getDocumentFormattingEdits(model, { insertSpaces: true, tabSize: 4 }, CancellationToken.None).then(value => {
 				assert.equal(value.length, 2);
 				let [first, second] = value;
 				assert.equal(first.text, 'testing');
@@ -1029,7 +1026,7 @@ suite('ExtHostLanguageFeatures', function () {
 		}));
 
 		return rpcProtocol.sync().then(() => {
-			return getDocumentFormattingEdits(model, { insertSpaces: true, tabSize: 4 });
+			return getDocumentFormattingEdits(model, { insertSpaces: true, tabSize: 4 }, CancellationToken.None);
 		});
 	});
 
@@ -1054,7 +1051,7 @@ suite('ExtHostLanguageFeatures', function () {
 		}));
 
 		return rpcProtocol.sync().then(() => {
-			return getDocumentFormattingEdits(model, { insertSpaces: true, tabSize: 4 }).then(value => {
+			return getDocumentFormattingEdits(model, { insertSpaces: true, tabSize: 4 }, CancellationToken.None).then(value => {
 				assert.equal(value.length, 1);
 				let [first] = value;
 				assert.equal(first.text, 'testing');
@@ -1071,7 +1068,7 @@ suite('ExtHostLanguageFeatures', function () {
 		}));
 
 		return rpcProtocol.sync().then(() => {
-			return getDocumentRangeFormattingEdits(model, new EditorRange(1, 1, 1, 1), { insertSpaces: true, tabSize: 4 }).then(value => {
+			return getDocumentRangeFormattingEdits(model, new EditorRange(1, 1, 1, 1), { insertSpaces: true, tabSize: 4 }, CancellationToken.None).then(value => {
 				assert.equal(value.length, 1);
 				let [first] = value;
 				assert.equal(first.text, 'testing');
@@ -1097,7 +1094,7 @@ suite('ExtHostLanguageFeatures', function () {
 			}
 		}));
 		return rpcProtocol.sync().then(() => {
-			return getDocumentRangeFormattingEdits(model, new EditorRange(1, 1, 1, 1), { insertSpaces: true, tabSize: 4 }).then(value => {
+			return getDocumentRangeFormattingEdits(model, new EditorRange(1, 1, 1, 1), { insertSpaces: true, tabSize: 4 }, CancellationToken.None).then(value => {
 				assert.equal(value.length, 1);
 				let [first] = value;
 				assert.equal(first.text, 'range2');
@@ -1117,7 +1114,7 @@ suite('ExtHostLanguageFeatures', function () {
 		}));
 
 		return rpcProtocol.sync().then(() => {
-			return getDocumentRangeFormattingEdits(model, new EditorRange(1, 1, 1, 1), { insertSpaces: true, tabSize: 4 });
+			return getDocumentRangeFormattingEdits(model, new EditorRange(1, 1, 1, 1), { insertSpaces: true, tabSize: 4 }, CancellationToken.None);
 		});
 	});
 
@@ -1149,7 +1146,7 @@ suite('ExtHostLanguageFeatures', function () {
 		}));
 
 		return rpcProtocol.sync().then(() => {
-			return getLinks(model).then(value => {
+			return getLinks(model, CancellationToken.None).then(value => {
 				assert.equal(value.length, 1);
 				let [first] = value;
 
@@ -1174,7 +1171,7 @@ suite('ExtHostLanguageFeatures', function () {
 		}));
 
 		return rpcProtocol.sync().then(() => {
-			return getLinks(model).then(value => {
+			return getLinks(model, CancellationToken.None).then(value => {
 				assert.equal(value.length, 1);
 				let [first] = value;
 
@@ -1196,7 +1193,7 @@ suite('ExtHostLanguageFeatures', function () {
 		}));
 
 		return rpcProtocol.sync().then(() => {
-			return getColors(model).then(value => {
+			return getColors(model, CancellationToken.None).then(value => {
 				assert.equal(value.length, 1);
 				let [first] = value;
 
diff --git a/src/vs/workbench/test/electron-browser/api/extHostSearch.test.ts b/src/vs/workbench/test/electron-browser/api/extHostSearch.test.ts
index b1b4ee95411..138d41fa2f7 100644
--- a/src/vs/workbench/test/electron-browser/api/extHostSearch.test.ts
+++ b/src/vs/workbench/test/electron-browser/api/extHostSearch.test.ts
@@ -5,11 +5,10 @@
 'use strict';
 
 import * as assert from 'assert';
-import * as path from 'path';
 import { isPromiseCanceledError } from 'vs/base/common/errors';
 import { dispose } from 'vs/base/common/lifecycle';
 import { joinPath } from 'vs/base/common/resources';
-import URI, { UriComponents } from 'vs/base/common/uri';
+import { URI, UriComponents } from 'vs/base/common/uri';
 import { TPromise } from 'vs/base/common/winjs.base';
 import * as extfs from 'vs/base/node/extfs';
 import { IFileMatch, IPatternInfo, IRawFileMatch2, IRawSearchQuery, ISearchCompleteStats, ISearchQuery, QueryType } from 'vs/platform/search/common/search';
@@ -18,6 +17,7 @@ import { ExtHostSearch } from 'vs/workbench/api/node/extHostSearch';
 import { Range } from 'vs/workbench/api/node/extHostTypes';
 import { TestRPCProtocol } from 'vs/workbench/test/electron-browser/api/testRPCProtocol';
 import * as vscode from 'vscode';
+import { CancellationTokenSource } from 'vs/base/common/cancellation';
 
 let rpcProtocol: TestRPCProtocol;
 let extHostSearch: ExtHostSearch;
@@ -29,19 +29,27 @@ class MockMainThreadSearch implements MainThreadSearchShape {
 
 	results: (UriComponents | IRawFileMatch2)[] = [];
 
-	$registerSearchProvider(handle: number, scheme: string): void {
+	$registerFileSearchProvider(handle: number, scheme: string): void {
+		this.lastHandle = handle;
+	}
+
+	$registerFileIndexProvider(handle: number, scheme: string): void {
+		this.lastHandle = handle;
+	}
+
+	$registerTextSearchProvider(handle: number, scheme: string): void {
 		this.lastHandle = handle;
 	}
 
 	$unregisterProvider(handle: number): void {
 	}
 
-	$handleFindMatch(handle: number, session: number, data: UriComponents | IRawFileMatch2[]): void {
-		if (Array.isArray(data)) {
-			this.results.push(...data);
-		} else {
-			this.results.push(data);
-		}
+	$handleFileMatch(handle: number, session: number, data: UriComponents[]): void {
+		this.results.push(...data);
+	}
+
+	$handleTextMatch(handle: number, session: number, data: IRawFileMatch2[]): void {
+		this.results.push(...data);
 	}
 
 	$handleTelemetry(eventName: string, data: any): void {
@@ -54,18 +62,24 @@ class MockMainThreadSearch implements MainThreadSearchShape {
 let mockExtfs: Partial<typeof extfs>;
 
 suite('ExtHostSearch', () => {
-	async function registerTestSearchProvider(provider: vscode.SearchProvider, scheme = 'file'): TPromise<void> {
-		disposables.push(extHostSearch.registerSearchProvider(scheme, provider));
+	async function registerTestTextSearchProvider(provider: vscode.TextSearchProvider, scheme = 'file'): Promise<void> {
+		disposables.push(extHostSearch.registerTextSearchProvider(scheme, provider));
 		await rpcProtocol.sync();
 	}
 
-	async function runFileSearch(query: IRawSearchQuery, cancel = false): TPromise<{ results: URI[]; stats: ISearchCompleteStats }> {
+	async function registerTestFileSearchProvider(provider: vscode.FileSearchProvider, scheme = 'file'): Promise<void> {
+		disposables.push(extHostSearch.registerFileSearchProvider(scheme, provider));
+		await rpcProtocol.sync();
+	}
+
+	async function runFileSearch(query: IRawSearchQuery, cancel = false): Promise<{ results: URI[]; stats: ISearchCompleteStats }> {
 		let stats: ISearchCompleteStats;
 		try {
-			const p = extHostSearch.$provideFileSearchResults(mockMainThreadSearch.lastHandle, 0, query);
+			const cancellation = new CancellationTokenSource();
+			const p = extHostSearch.$provideFileSearchResults(mockMainThreadSearch.lastHandle, 0, query, cancellation.token);
 			if (cancel) {
 				await new TPromise(resolve => process.nextTick(resolve));
-				p.cancel();
+				cancellation.cancel();
 			}
 
 			stats = await p;
@@ -83,13 +97,14 @@ suite('ExtHostSearch', () => {
 		};
 	}
 
-	async function runTextSearch(pattern: IPatternInfo, query: IRawSearchQuery, cancel = false): TPromise<{ results: IFileMatch[], stats: ISearchCompleteStats }> {
+	async function runTextSearch(pattern: IPatternInfo, query: IRawSearchQuery, cancel = false): Promise<{ results: IFileMatch[], stats: ISearchCompleteStats }> {
 		let stats: ISearchCompleteStats;
 		try {
-			const p = extHostSearch.$provideTextSearchResults(mockMainThreadSearch.lastHandle, 0, pattern, query);
+			const cancellation = new CancellationTokenSource();
+			const p = extHostSearch.$provideTextSearchResults(mockMainThreadSearch.lastHandle, 0, pattern, query, cancellation.token);
 			if (cancel) {
 				await new TPromise(resolve => process.nextTick(resolve));
-				p.cancel();
+				cancellation.cancel();
 			}
 
 			stats = await p;
@@ -154,8 +169,8 @@ suite('ExtHostSearch', () => {
 		}
 
 		test('no results', async () => {
-			await registerTestSearchProvider({
-				provideFileSearchResults(options: vscode.FileSearchOptions, progress: vscode.Progress<string>, token: vscode.CancellationToken): Thenable<void> {
+			await registerTestFileSearchProvider({
+				provideFileSearchResults(query: vscode.FileSearchQuery, options: vscode.FileSearchOptions, token: vscode.CancellationToken): Thenable<URI[]> {
 					return TPromise.wrap(null);
 				}
 			});
@@ -172,10 +187,9 @@ suite('ExtHostSearch', () => {
 				joinPath(rootFolderA, 'file3.ts')
 			];
 
-			await registerTestSearchProvider({
-				provideFileSearchResults(options: vscode.FileSearchOptions, progress: vscode.Progress<string>, token: vscode.CancellationToken): Thenable<void> {
-					reportedResults.forEach(r => progress.report(path.basename(r.fsPath)));
-					return TPromise.wrap(null);
+			await registerTestFileSearchProvider({
+				provideFileSearchResults(query: vscode.FileSearchQuery, options: vscode.FileSearchOptions, token: vscode.CancellationToken): Thenable<URI[]> {
+					return TPromise.wrap(reportedResults);
 				}
 			});
 
@@ -187,14 +201,13 @@ suite('ExtHostSearch', () => {
 
 		test('Search canceled', async () => {
 			let cancelRequested = false;
-			await registerTestSearchProvider({
-				provideFileSearchResults(options: vscode.FileSearchOptions, progress: vscode.Progress<string>, token: vscode.CancellationToken): Thenable<void> {
+			await registerTestFileSearchProvider({
+				provideFileSearchResults(query: vscode.FileSearchQuery, options: vscode.FileSearchOptions, token: vscode.CancellationToken): Thenable<URI[]> {
 					return new TPromise((resolve, reject) => {
 						token.onCancellationRequested(() => {
 							cancelRequested = true;
-							progress.report('file1.ts');
 
-							resolve(null); // or reject or nothing?
+							resolve([joinPath(options.folder, 'file1.ts')]); // or reject or nothing?
 						});
 					});
 				}
@@ -205,31 +218,9 @@ suite('ExtHostSearch', () => {
 			assert(!results.length);
 		});
 
-		test('provider fail', async () => {
-			const reportedResults = [
-				'file1.ts',
-				'file2.ts',
-				'file3.ts',
-			];
-
-			await registerTestSearchProvider({
-				provideFileSearchResults(options: vscode.FileSearchOptions, progress: vscode.Progress<string>, token: vscode.CancellationToken): Thenable<void> {
-					reportedResults.forEach(r => progress.report(r));
-					throw new Error('I broke');
-				}
-			});
-
-			try {
-				await runFileSearch(getSimpleQuery());
-				assert(false, 'Expected to fail');
-			} catch {
-				// Expected to throw
-			}
-		});
-
 		test('provider returns null', async () => {
-			await registerTestSearchProvider({
-				provideFileSearchResults(options: vscode.FileSearchOptions, progress: vscode.Progress<string>, token: vscode.CancellationToken): Thenable<void> {
+			await registerTestFileSearchProvider({
+				provideFileSearchResults(query: vscode.FileSearchQuery, options: vscode.FileSearchOptions, token: vscode.CancellationToken): Thenable<URI[]> {
 					return null;
 				}
 			});
@@ -243,8 +234,8 @@ suite('ExtHostSearch', () => {
 		});
 
 		test('all provider calls get global include/excludes', async () => {
-			await registerTestSearchProvider({
-				provideFileSearchResults(options: vscode.FileSearchOptions, progress: vscode.Progress<string>, token: vscode.CancellationToken): Thenable<void> {
+			await registerTestFileSearchProvider({
+				provideFileSearchResults(query: vscode.FileSearchQuery, options: vscode.FileSearchOptions, token: vscode.CancellationToken): Thenable<URI[]> {
 					assert(options.excludes.length === 2 && options.includes.length === 2, 'Missing global include/excludes');
 					return TPromise.wrap(null);
 				}
@@ -272,8 +263,8 @@ suite('ExtHostSearch', () => {
 		});
 
 		test('global/local include/excludes combined', async () => {
-			await registerTestSearchProvider({
-				provideFileSearchResults(options: vscode.FileSearchOptions, progress: vscode.Progress<string>, token: vscode.CancellationToken): Thenable<void> {
+			await registerTestFileSearchProvider({
+				provideFileSearchResults(query: vscode.FileSearchQuery, options: vscode.FileSearchOptions, token: vscode.CancellationToken): Thenable<URI[]> {
 					if (options.folder.toString() === rootFolderA.toString()) {
 						assert.deepEqual(options.includes.sort(), ['*.ts', 'foo']);
 						assert.deepEqual(options.excludes.sort(), ['*.js', 'bar']);
@@ -314,8 +305,8 @@ suite('ExtHostSearch', () => {
 		});
 
 		test('include/excludes resolved correctly', async () => {
-			await registerTestSearchProvider({
-				provideFileSearchResults(options: vscode.FileSearchOptions, progress: vscode.Progress<string>, token: vscode.CancellationToken): Thenable<void> {
+			await registerTestFileSearchProvider({
+				provideFileSearchResults(query: vscode.FileSearchQuery, options: vscode.FileSearchOptions, token: vscode.CancellationToken): Thenable<URI[]> {
 					assert.deepEqual(options.includes.sort(), ['*.jsx', '*.ts']);
 					assert.deepEqual(options.excludes.sort(), []);
 
@@ -357,10 +348,10 @@ suite('ExtHostSearch', () => {
 				'file1.js',
 			];
 
-			await registerTestSearchProvider({
-				provideFileSearchResults(options: vscode.FileSearchOptions, progress: vscode.Progress<string>, token: vscode.CancellationToken): Thenable<void> {
-					reportedResults.forEach(r => progress.report(r));
-					return TPromise.wrap(null);
+			await registerTestFileSearchProvider({
+				provideFileSearchResults(query: vscode.FileSearchQuery, options: vscode.FileSearchOptions, token: vscode.CancellationToken): Thenable<URI[]> {
+					return TPromise.wrap(reportedResults
+						.map(relativePath => joinPath(options.folder, relativePath)));
 				}
 			});
 
@@ -388,25 +379,24 @@ suite('ExtHostSearch', () => {
 
 		test('multiroot sibling exclude clause', async () => {
 
-			await registerTestSearchProvider({
-				provideFileSearchResults(options: vscode.FileSearchOptions, progress: vscode.Progress<string>, token: vscode.CancellationToken): Thenable<void> {
-					let reportedResults;
+			await registerTestFileSearchProvider({
+				provideFileSearchResults(query: vscode.FileSearchQuery, options: vscode.FileSearchOptions, token: vscode.CancellationToken): Thenable<URI[]> {
+					let reportedResults: URI[];
 					if (options.folder.fsPath === rootFolderA.fsPath) {
 						reportedResults = [
 							'folder/fileA.scss',
 							'folder/fileA.css',
 							'folder/file2.css'
-						];
+						].map(relativePath => joinPath(rootFolderA, relativePath));
 					} else {
 						reportedResults = [
 							'fileB.ts',
 							'fileB.js',
 							'file3.js'
-						];
+						].map(relativePath => joinPath(rootFolderB, relativePath));
 					}
 
-					reportedResults.forEach(r => progress.report(r));
-					return TPromise.wrap(null);
+					return TPromise.wrap(reportedResults);
 				}
 			});
 
@@ -451,7 +441,7 @@ suite('ExtHostSearch', () => {
 				]);
 		});
 
-		test('max results = 1', async () => {
+		test.skip('max results = 1', async () => {
 			const reportedResults = [
 				joinPath(rootFolderA, 'file1.ts'),
 				joinPath(rootFolderA, 'file2.ts'),
@@ -459,12 +449,11 @@ suite('ExtHostSearch', () => {
 			];
 
 			let wasCanceled = false;
-			await registerTestSearchProvider({
-				provideFileSearchResults(options: vscode.FileSearchOptions, progress: vscode.Progress<string>, token: vscode.CancellationToken): Thenable<void> {
-					reportedResults.forEach(r => progress.report(path.basename(r.fsPath)));
+			await registerTestFileSearchProvider({
+				provideFileSearchResults(query: vscode.FileSearchQuery, options: vscode.FileSearchOptions, token: vscode.CancellationToken): Thenable<URI[]> {
 					token.onCancellationRequested(() => wasCanceled = true);
 
-					return TPromise.wrap(null);
+					return TPromise.wrap(reportedResults);
 				}
 			});
 
@@ -488,7 +477,7 @@ suite('ExtHostSearch', () => {
 			assert(wasCanceled, 'Expected to be canceled when hitting limit');
 		});
 
-		test('max results = 2', async () => {
+		test.skip('max results = 2', async () => {
 			const reportedResults = [
 				joinPath(rootFolderA, 'file1.ts'),
 				joinPath(rootFolderA, 'file2.ts'),
@@ -496,12 +485,11 @@ suite('ExtHostSearch', () => {
 			];
 
 			let wasCanceled = false;
-			await registerTestSearchProvider({
-				provideFileSearchResults(options: vscode.FileSearchOptions, progress: vscode.Progress<string>, token: vscode.CancellationToken): Thenable<void> {
-					reportedResults.forEach(r => progress.report(path.basename(r.fsPath)));
+			await registerTestFileSearchProvider({
+				provideFileSearchResults(query: vscode.FileSearchQuery, options: vscode.FileSearchOptions, token: vscode.CancellationToken): Thenable<URI[]> {
 					token.onCancellationRequested(() => wasCanceled = true);
 
-					return TPromise.wrap(null);
+					return TPromise.wrap(reportedResults);
 				}
 			});
 
@@ -525,19 +513,18 @@ suite('ExtHostSearch', () => {
 			assert(wasCanceled, 'Expected to be canceled when hitting limit');
 		});
 
-		test('provider returns maxResults exactly', async () => {
+		test.skip('provider returns maxResults exactly', async () => {
 			const reportedResults = [
 				joinPath(rootFolderA, 'file1.ts'),
 				joinPath(rootFolderA, 'file2.ts'),
 			];
 
 			let wasCanceled = false;
-			await registerTestSearchProvider({
-				provideFileSearchResults(options: vscode.FileSearchOptions, progress: vscode.Progress<string>, token: vscode.CancellationToken): Thenable<void> {
-					reportedResults.forEach(r => progress.report(path.basename(r.fsPath)));
+			await registerTestFileSearchProvider({
+				provideFileSearchResults(query: vscode.FileSearchQuery, options: vscode.FileSearchOptions, token: vscode.CancellationToken): Thenable<URI[]> {
 					token.onCancellationRequested(() => wasCanceled = true);
 
-					return TPromise.wrap(null);
+					return TPromise.wrap(reportedResults);
 				}
 			});
 
@@ -563,20 +550,18 @@ suite('ExtHostSearch', () => {
 
 		test('multiroot max results', async () => {
 			let cancels = 0;
-			await registerTestSearchProvider({
-				provideFileSearchResults(options: vscode.FileSearchOptions, progress: vscode.Progress<string>, token: vscode.CancellationToken): Thenable<void> {
+			await registerTestFileSearchProvider({
+				provideFileSearchResults(query: vscode.FileSearchQuery, options: vscode.FileSearchOptions, token: vscode.CancellationToken): Thenable<URI[]> {
 					token.onCancellationRequested(() => cancels++);
 
 					// Provice results async so it has a chance to invoke every provider
 					return new TPromise(r => process.nextTick(r))
 						.then(() => {
-							[
+							return [
 								'file1.ts',
 								'file2.ts',
 								'file3.ts',
-							].forEach(f => {
-								progress.report(f);
-							});
+							].map(relativePath => joinPath(options.folder, relativePath));
 						});
 				}
 			});
@@ -602,37 +587,6 @@ suite('ExtHostSearch', () => {
 			assert.equal(cancels, 2, 'Expected all invocations to be canceled when hitting limit');
 		});
 
-		test('respects filePattern', async () => {
-			const reportedResults = [
-				joinPath(rootFolderA, 'file1.ts'),
-				joinPath(rootFolderA, 'file2.ts'),
-				joinPath(rootFolderA, 'file3.ts'),
-			];
-
-			await registerTestSearchProvider({
-				provideFileSearchResults(options: vscode.FileSearchOptions, progress: vscode.Progress<string>, token: vscode.CancellationToken): Thenable<void> {
-					reportedResults.forEach(r => progress.report(path.basename(r.fsPath)));
-					return TPromise.wrap(null);
-				}
-			});
-
-			const query: ISearchQuery = {
-				type: QueryType.File,
-
-				filePattern: 'file3',
-
-				folderQueries: [
-					{
-						folder: rootFolderA
-					}
-				]
-			};
-
-			const { results } = await runFileSearch(query);
-			assert.equal(results.length, 1);
-			compareURIs(results, reportedResults.slice(2));
-		});
-
 		test('works with non-file schemes', async () => {
 			const reportedResults = [
 				joinPath(fancySchemeFolderA, 'file1.ts'),
@@ -641,10 +595,9 @@ suite('ExtHostSearch', () => {
 
 			];
 
-			await registerTestSearchProvider({
-				provideFileSearchResults(options: vscode.FileSearchOptions, progress: vscode.Progress<string>, token: vscode.CancellationToken): Thenable<void> {
-					reportedResults.forEach(r => progress.report(path.basename(r.fsPath)));
-					return TPromise.wrap(null);
+			await registerTestFileSearchProvider({
+				provideFileSearchResults(query: vscode.FileSearchQuery, options: vscode.FileSearchOptions, token: vscode.CancellationToken): Thenable<URI[]> {
+					return TPromise.wrap(reportedResults);
 				}
 			}, fancyScheme);
 
@@ -661,28 +614,6 @@ suite('ExtHostSearch', () => {
 			const { results } = await runFileSearch(query);
 			compareURIs(results, reportedResults);
 		});
-
-		// Mock fs?
-		// test('Returns result for absolute path', async () => {
-		// 	const queriedFile = makeFileResult(rootFolderA, 'file2.ts');
-		// 	const reportedResults = [
-		// 		makeFileResult(rootFolderA, 'file1.ts'),
-		// 		queriedFile,
-		// 		makeFileResult(rootFolderA, 'file3.ts'),
-		// 	];
-
-		// 	await registerTestSearchProvider({
-		// 		provideFileSearchResults(options: vscode.FileSearchOptions, progress: vscode.Progress<string>, token: vscode.CancellationToken): Thenable<void> {
-		// 			reportedResults.forEach(r => progress.report(r));
-		// 			return TPromise.wrap(null);
-		// 		}
-		// 	});
-
-		// 	const queriedFilePath = queriedFile.fsPath;
-		// 	const { results } = await runFileSearch(getSimpleQuery(queriedFilePath));
-		// 	assert.equal(results.length, 1);
-		// 	compareURIs(results, [queriedFile]);
-		// });
 	});
 
 	suite('Text:', () => {
@@ -694,11 +625,11 @@ suite('ExtHostSearch', () => {
 			};
 		}
 
-		function makeTextResult(relativePath: string): vscode.TextSearchResult {
+		function makeTextResult(baseFolder: URI, relativePath: string): vscode.TextSearchResult {
 			return {
 				preview: makePreview('foo'),
 				range: new Range(0, 0, 0, 3),
-				path: relativePath
+				uri: joinPath(baseFolder, relativePath)
 			};
 		}
 
@@ -718,19 +649,19 @@ suite('ExtHostSearch', () => {
 			};
 		}
 
-		function assertResults(actual: IFileMatch[], expected: vscode.TextSearchResult[], folder = rootFolderA) {
+		function assertResults(actual: IFileMatch[], expected: vscode.TextSearchResult[]) {
 			const actualTextSearchResults: vscode.TextSearchResult[] = [];
 			for (let fileMatch of actual) {
 				// Make relative
-				const relativePath = fileMatch.resource.toString().substr(folder.toString().length + 1);
-				for (let lineMatch of fileMatch.lineMatches) {
-					for (let [offset, length] of lineMatch.offsetAndLengths) {
-						actualTextSearchResults.push({
-							preview: { text: lineMatch.preview, match: null },
-							range: new Range(lineMatch.lineNumber, offset, lineMatch.lineNumber, length + offset),
-							path: relativePath
-						});
-					}
+				for (let lineMatch of fileMatch.matches) {
+					actualTextSearchResults.push({
+						preview: {
+							text: lineMatch.preview.text,
+							match: new Range(lineMatch.preview.match.startLineNumber, lineMatch.preview.match.startColumn, lineMatch.preview.match.endLineNumber, lineMatch.preview.match.endColumn)
+						},
+						range: new Range(lineMatch.range.startLineNumber, lineMatch.range.startColumn, lineMatch.range.endLineNumber, lineMatch.range.endColumn),
+						uri: fileMatch.resource
+					});
 				}
 			}
 
@@ -741,7 +672,7 @@ suite('ExtHostSearch', () => {
 				.map(r => ({
 					...r,
 					...{
-						uri: r.path.toString(),
+						uri: r.uri.toString(),
 						range: rangeToString(r.range),
 						preview: {
 							text: r.preview.text,
@@ -756,7 +687,7 @@ suite('ExtHostSearch', () => {
 		}
 
 		test('no results', async () => {
-			await registerTestSearchProvider({
+			await registerTestTextSearchProvider({
 				provideTextSearchResults(query: vscode.TextSearchQuery, options: vscode.TextSearchOptions, progress: vscode.Progress<vscode.TextSearchResult>, token: vscode.CancellationToken): Thenable<void> {
 					return TPromise.wrap(null);
 				}
@@ -769,11 +700,11 @@ suite('ExtHostSearch', () => {
 
 		test('basic results', async () => {
 			const providedResults: vscode.TextSearchResult[] = [
-				makeTextResult('file1.ts'),
-				makeTextResult('file2.ts')
+				makeTextResult(rootFolderA, 'file1.ts'),
+				makeTextResult(rootFolderA, 'file2.ts')
 			];
 
-			await registerTestSearchProvider({
+			await registerTestTextSearchProvider({
 				provideTextSearchResults(query: vscode.TextSearchQuery, options: vscode.TextSearchOptions, progress: vscode.Progress<vscode.TextSearchResult>, token: vscode.CancellationToken): Thenable<void> {
 					providedResults.forEach(r => progress.report(r));
 					return TPromise.wrap(null);
@@ -786,7 +717,7 @@ suite('ExtHostSearch', () => {
 		});
 
 		test('all provider calls get global include/excludes', async () => {
-			await registerTestSearchProvider({
+			await registerTestTextSearchProvider({
 				provideTextSearchResults(query: vscode.TextSearchQuery, options: vscode.TextSearchOptions, progress: vscode.Progress<vscode.TextSearchResult>, token: vscode.CancellationToken): Thenable<void> {
 					assert.equal(options.includes.length, 1);
 					assert.equal(options.excludes.length, 1);
@@ -815,7 +746,7 @@ suite('ExtHostSearch', () => {
 		});
 
 		test('global/local include/excludes combined', async () => {
-			await registerTestSearchProvider({
+			await registerTestTextSearchProvider({
 				provideTextSearchResults(query: vscode.TextSearchQuery, options: vscode.TextSearchOptions, progress: vscode.Progress<vscode.TextSearchResult>, token: vscode.CancellationToken): Thenable<void> {
 					if (options.folder.toString() === rootFolderA.toString()) {
 						assert.deepEqual(options.includes.sort(), ['*.ts', 'foo']);
@@ -856,7 +787,7 @@ suite('ExtHostSearch', () => {
 		});
 
 		test('include/excludes resolved correctly', async () => {
-			await registerTestSearchProvider({
+			await registerTestTextSearchProvider({
 				provideTextSearchResults(query: vscode.TextSearchQuery, options: vscode.TextSearchOptions, progress: vscode.Progress<vscode.TextSearchResult>, token: vscode.CancellationToken): Thenable<void> {
 					assert.deepEqual(options.includes.sort(), ['*.jsx', '*.ts']);
 					assert.deepEqual(options.excludes.sort(), []);
@@ -893,7 +824,7 @@ suite('ExtHostSearch', () => {
 		});
 
 		test('provider fail', async () => {
-			await registerTestSearchProvider({
+			await registerTestTextSearchProvider({
 				provideTextSearchResults(query: vscode.TextSearchQuery, options: vscode.TextSearchOptions, progress: vscode.Progress<vscode.TextSearchResult>, token: vscode.CancellationToken): Thenable<void> {
 					throw new Error('Provider fail');
 				}
@@ -920,11 +851,11 @@ suite('ExtHostSearch', () => {
 			};
 
 			const providedResults: vscode.TextSearchResult[] = [
-				makeTextResult('file1.js'),
-				makeTextResult('file1.ts')
+				makeTextResult(rootFolderA, 'file1.js'),
+				makeTextResult(rootFolderA, 'file1.ts')
 			];
 
-			await registerTestSearchProvider({
+			await registerTestTextSearchProvider({
 				provideTextSearchResults(query: vscode.TextSearchQuery, options: vscode.TextSearchOptions, progress: vscode.Progress<vscode.TextSearchResult>, token: vscode.CancellationToken): Thenable<void> {
 					providedResults.forEach(r => progress.report(r));
 					return TPromise.wrap(null);
@@ -968,20 +899,20 @@ suite('ExtHostSearch', () => {
 				}
 			};
 
-			await registerTestSearchProvider({
+			await registerTestTextSearchProvider({
 				provideTextSearchResults(query: vscode.TextSearchQuery, options: vscode.TextSearchOptions, progress: vscode.Progress<vscode.TextSearchResult>, token: vscode.CancellationToken): Thenable<void> {
 					let reportedResults;
 					if (options.folder.fsPath === rootFolderA.fsPath) {
 						reportedResults = [
-							makeTextResult('folder/fileA.scss'),
-							makeTextResult('folder/fileA.css'),
-							makeTextResult('folder/file2.css')
+							makeTextResult(rootFolderA, 'folder/fileA.scss'),
+							makeTextResult(rootFolderA, 'folder/fileA.css'),
+							makeTextResult(rootFolderA, 'folder/file2.css')
 						];
 					} else {
 						reportedResults = [
-							makeTextResult('fileB.ts'),
-							makeTextResult('fileB.js'),
-							makeTextResult('file3.js')
+							makeTextResult(rootFolderB, 'fileB.ts'),
+							makeTextResult(rootFolderB, 'fileB.js'),
+							makeTextResult(rootFolderB, 'file3.js')
 						];
 					}
 
@@ -1019,20 +950,20 @@ suite('ExtHostSearch', () => {
 
 			const { results } = await runTextSearch(getPattern('foo'), query);
 			assertResults(results, [
-				makeTextResult('folder/fileA.scss'),
-				makeTextResult('folder/file2.css'),
-				makeTextResult('fileB.ts'),
-				makeTextResult('fileB.js'),
-				makeTextResult('file3.js')]);
+				makeTextResult(rootFolderA, 'folder/fileA.scss'),
+				makeTextResult(rootFolderA, 'folder/file2.css'),
+				makeTextResult(rootFolderB, 'fileB.ts'),
+				makeTextResult(rootFolderB, 'fileB.js'),
+				makeTextResult(rootFolderB, 'file3.js')]);
 		});
 
 		test('include pattern applied', async () => {
 			const providedResults: vscode.TextSearchResult[] = [
-				makeTextResult('file1.js'),
-				makeTextResult('file1.ts')
+				makeTextResult(rootFolderA, 'file1.js'),
+				makeTextResult(rootFolderA, 'file1.ts')
 			];
 
-			await registerTestSearchProvider({
+			await registerTestTextSearchProvider({
 				provideTextSearchResults(query: vscode.TextSearchQuery, options: vscode.TextSearchOptions, progress: vscode.Progress<vscode.TextSearchResult>, token: vscode.CancellationToken): Thenable<void> {
 					providedResults.forEach(r => progress.report(r));
 					return TPromise.wrap(null);
@@ -1057,12 +988,12 @@ suite('ExtHostSearch', () => {
 
 		test('max results = 1', async () => {
 			const providedResults: vscode.TextSearchResult[] = [
-				makeTextResult('file1.ts'),
-				makeTextResult('file2.ts')
+				makeTextResult(rootFolderA, 'file1.ts'),
+				makeTextResult(rootFolderA, 'file2.ts')
 			];
 
 			let wasCanceled = false;
-			await registerTestSearchProvider({
+			await registerTestTextSearchProvider({
 				provideTextSearchResults(query: vscode.TextSearchQuery, options: vscode.TextSearchOptions, progress: vscode.Progress<vscode.TextSearchResult>, token: vscode.CancellationToken): Thenable<void> {
 					token.onCancellationRequested(() => wasCanceled = true);
 					providedResults.forEach(r => progress.report(r));
@@ -1088,13 +1019,13 @@ suite('ExtHostSearch', () => {
 
 		test('max results = 2', async () => {
 			const providedResults: vscode.TextSearchResult[] = [
-				makeTextResult('file1.ts'),
-				makeTextResult('file2.ts'),
-				makeTextResult('file3.ts')
+				makeTextResult(rootFolderA, 'file1.ts'),
+				makeTextResult(rootFolderA, 'file2.ts'),
+				makeTextResult(rootFolderA, 'file3.ts')
 			];
 
 			let wasCanceled = false;
-			await registerTestSearchProvider({
+			await registerTestTextSearchProvider({
 				provideTextSearchResults(query: vscode.TextSearchQuery, options: vscode.TextSearchOptions, progress: vscode.Progress<vscode.TextSearchResult>, token: vscode.CancellationToken): Thenable<void> {
 					token.onCancellationRequested(() => wasCanceled = true);
 					providedResults.forEach(r => progress.report(r));
@@ -1120,12 +1051,12 @@ suite('ExtHostSearch', () => {
 
 		test('provider returns maxResults exactly', async () => {
 			const providedResults: vscode.TextSearchResult[] = [
-				makeTextResult('file1.ts'),
-				makeTextResult('file2.ts')
+				makeTextResult(rootFolderA, 'file1.ts'),
+				makeTextResult(rootFolderA, 'file2.ts')
 			];
 
 			let wasCanceled = false;
-			await registerTestSearchProvider({
+			await registerTestTextSearchProvider({
 				provideTextSearchResults(query: vscode.TextSearchQuery, options: vscode.TextSearchOptions, progress: vscode.Progress<vscode.TextSearchResult>, token: vscode.CancellationToken): Thenable<void> {
 					token.onCancellationRequested(() => wasCanceled = true);
 					providedResults.forEach(r => progress.report(r));
@@ -1151,7 +1082,7 @@ suite('ExtHostSearch', () => {
 
 		test('multiroot max results', async () => {
 			let cancels = 0;
-			await registerTestSearchProvider({
+			await registerTestTextSearchProvider({
 				provideTextSearchResults(query: vscode.TextSearchQuery, options: vscode.TextSearchOptions, progress: vscode.Progress<vscode.TextSearchResult>, token: vscode.CancellationToken): Thenable<void> {
 					token.onCancellationRequested(() => cancels++);
 					return new TPromise(r => process.nextTick(r))
@@ -1160,7 +1091,7 @@ suite('ExtHostSearch', () => {
 								'file1.ts',
 								'file2.ts',
 								'file3.ts',
-							].forEach(f => progress.report(makeTextResult(f)));
+							].forEach(f => progress.report(makeTextResult(options.folder, f)));
 						});
 				}
 			});
@@ -1183,12 +1114,12 @@ suite('ExtHostSearch', () => {
 
 		test('works with non-file schemes', async () => {
 			const providedResults: vscode.TextSearchResult[] = [
-				makeTextResult('file1.ts'),
-				makeTextResult('file2.ts'),
-				makeTextResult('file3.ts')
+				makeTextResult(fancySchemeFolderA, 'file1.ts'),
+				makeTextResult(fancySchemeFolderA, 'file2.ts'),
+				makeTextResult(fancySchemeFolderA, 'file3.ts')
 			];
 
-			await registerTestSearchProvider({
+			await registerTestTextSearchProvider({
 				provideTextSearchResults(query: vscode.TextSearchQuery, options: vscode.TextSearchOptions, progress: vscode.Progress<vscode.TextSearchResult>, token: vscode.CancellationToken): Thenable<void> {
 					providedResults.forEach(r => progress.report(r));
 					return TPromise.wrap(null);
@@ -1204,7 +1135,7 @@ suite('ExtHostSearch', () => {
 			};
 
 			const { results } = await runTextSearch(getPattern('foo'), query);
-			assertResults(results, providedResults, fancySchemeFolderA);
+			assertResults(results, providedResults);
 		});
 	});
 });
diff --git a/src/vs/workbench/test/electron-browser/api/extHostTextEditor.test.ts b/src/vs/workbench/test/electron-browser/api/extHostTextEditor.test.ts
index ff187f60156..2b75c942682 100644
--- a/src/vs/workbench/test/electron-browser/api/extHostTextEditor.test.ts
+++ b/src/vs/workbench/test/electron-browser/api/extHostTextEditor.test.ts
@@ -6,21 +6,22 @@
 
 import * as assert from 'assert';
 import { TPromise } from 'vs/base/common/winjs.base';
-import { TextEditorLineNumbersStyle } from 'vs/workbench/api/node/extHostTypes';
+import { TextEditorLineNumbersStyle, Range } from 'vs/workbench/api/node/extHostTypes';
 import { TextEditorCursorStyle } from 'vs/editor/common/config/editorOptions';
 import { MainThreadTextEditorsShape, IResolvedTextEditorConfiguration, ITextEditorConfigurationUpdate } from 'vs/workbench/api/node/extHost.protocol';
 import { ExtHostTextEditorOptions, ExtHostTextEditor } from 'vs/workbench/api/node/extHostTextEditor';
 import { ExtHostDocumentData } from 'vs/workbench/api/node/extHostDocumentData';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
+import { mock } from 'vs/workbench/test/electron-browser/api/mock';
 
 suite('ExtHostTextEditor', () => {
 
 	let editor: ExtHostTextEditor;
+	let doc = new ExtHostDocumentData(undefined, URI.file(''), [
+		'aaaa bbbb+cccc abc'
+	], '\n', 'text', 1, false);
 
 	setup(() => {
-		let doc = new ExtHostDocumentData(undefined, URI.file(''), [
-			'aaaa bbbb+cccc abc'
-		], '\n', 'text', 1, false);
 		editor = new ExtHostTextEditor(null, 'fake', doc, [], { cursorStyle: 0, insertSpaces: true, lineNumbers: 1, tabSize: 4 }, [], 1);
 	});
 
@@ -39,6 +40,25 @@ suite('ExtHostTextEditor', () => {
 		assert.throws(() => editor._acceptOptions(null));
 		assert.throws(() => editor._acceptSelections([]));
 	});
+
+	test('API [bug]: registerTextEditorCommand clears redo stack even if no edits are made #55163', async function () {
+		let applyCount = 0;
+		let editor = new ExtHostTextEditor(new class extends mock<MainThreadTextEditorsShape>() {
+			$tryApplyEdits(): TPromise<boolean> {
+				applyCount += 1;
+				return TPromise.wrap(true);
+			}
+		}, 'edt1', doc, [], { cursorStyle: 0, insertSpaces: true, lineNumbers: 1, tabSize: 4 }, [], 1);
+
+		await editor.edit(edit => { });
+		assert.equal(applyCount, 0);
+
+		await editor.edit(edit => { edit.setEndOfLine(1); });
+		assert.equal(applyCount, 1);
+
+		await editor.edit(edit => { edit.delete(new Range(0, 0, 1, 1)); });
+		assert.equal(applyCount, 2);
+	});
 });
 
 suite('ExtHostTextEditorOptions', () => {
diff --git a/src/vs/workbench/test/electron-browser/api/extHostTextEditors.test.ts b/src/vs/workbench/test/electron-browser/api/extHostTextEditors.test.ts
index 8f6d051243b..d263621ce46 100644
--- a/src/vs/workbench/test/electron-browser/api/extHostTextEditors.test.ts
+++ b/src/vs/workbench/test/electron-browser/api/extHostTextEditors.test.ts
@@ -8,7 +8,7 @@ import * as assert from 'assert';
 import { TPromise } from 'vs/base/common/winjs.base';
 import * as extHostTypes from 'vs/workbench/api/node/extHostTypes';
 import { MainContext, MainThreadTextEditorsShape, WorkspaceEditDto } from 'vs/workbench/api/node/extHost.protocol';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { mock } from 'vs/workbench/test/electron-browser/api/mock';
 import { ExtHostDocumentsAndEditors } from 'vs/workbench/api/node/extHostDocumentsAndEditors';
 import { SingleProxyRPCProtocol, TestRPCProtocol } from 'vs/workbench/test/electron-browser/api/testRPCProtocol';
diff --git a/src/vs/workbench/test/electron-browser/api/extHostTreeViews.test.ts b/src/vs/workbench/test/electron-browser/api/extHostTreeViews.test.ts
index 284f16ac8ee..e4b5a3f176a 100644
--- a/src/vs/workbench/test/electron-browser/api/extHostTreeViews.test.ts
+++ b/src/vs/workbench/test/electron-browser/api/extHostTreeViews.test.ts
@@ -72,7 +72,7 @@ suite('ExtHostTreeView', function () {
 
 		rpcProtocol.set(MainContext.MainThreadCommands, inst.createInstance(MainThreadCommands, rpcProtocol));
 		target = new RecordingShape();
-		testObject = new ExtHostTreeViews(target, new ExtHostCommands(rpcProtocol, new ExtHostHeapService(), new NullLogService()));
+		testObject = new ExtHostTreeViews(target, new ExtHostCommands(rpcProtocol, new ExtHostHeapService(), new NullLogService()), new NullLogService());
 		onDidChangeTreeNode = new Emitter<{ key: string }>();
 		onDidChangeTreeNodeWithId = new Emitter<{ key: string }>();
 		testObject.createTreeView('testNodeTreeProvider', { treeDataProvider: aNodeTreeDataProvider() });
@@ -416,7 +416,7 @@ suite('ExtHostTreeView', function () {
 				assert.deepEqual('treeDataProvider', revealTarget.args[0][0]);
 				assert.deepEqual({ handle: '0/0:a', label: 'a', collapsibleState: TreeItemCollapsibleState.Collapsed }, removeUnsetKeys(revealTarget.args[0][1]));
 				assert.deepEqual([], revealTarget.args[0][2]);
-				assert.equal(void 0, revealTarget.args[0][3]);
+				assert.deepEqual({ select: true, focus: false }, revealTarget.args[0][3]);
 			});
 	});
 
@@ -429,7 +429,7 @@ suite('ExtHostTreeView', function () {
 				assert.deepEqual('treeDataProvider', revealTarget.args[0][0]);
 				assert.deepEqual({ handle: '0/0:a/0:aa', label: 'aa', collapsibleState: TreeItemCollapsibleState.None, parentHandle: '0/0:a' }, removeUnsetKeys(revealTarget.args[0][1]));
 				assert.deepEqual([{ handle: '0/0:a', label: 'a', collapsibleState: TreeItemCollapsibleState.Collapsed }], (<Array<any>>revealTarget.args[0][2]).map(arg => removeUnsetKeys(arg)));
-				assert.equal(void 0, revealTarget.args[0][3]);
+				assert.deepEqual({ select: true, focus: false }, revealTarget.args[0][3]);
 			});
 	});
 
@@ -444,7 +444,7 @@ suite('ExtHostTreeView', function () {
 					assert.deepEqual('treeDataProvider', revealTarget.args[0][0]);
 					assert.deepEqual({ handle: '0/0:a/0:aa', label: 'aa', collapsibleState: TreeItemCollapsibleState.None, parentHandle: '0/0:a' }, removeUnsetKeys(revealTarget.args[0][1]));
 					assert.deepEqual([{ handle: '0/0:a', label: 'a', collapsibleState: TreeItemCollapsibleState.Collapsed }], (<Array<any>>revealTarget.args[0][2]).map(arg => removeUnsetKeys(arg)));
-					assert.equal(void 0, revealTarget.args[0][3]);
+					assert.deepEqual({ select: true, focus: false }, revealTarget.args[0][3]);
 				}));
 	});
 
@@ -458,7 +458,7 @@ suite('ExtHostTreeView', function () {
 		};
 		const revealTarget = sinon.spy(target, '$reveal');
 		const treeView = testObject.createTreeView('treeDataProvider', { treeDataProvider: aCompleteNodeTreeDataProvider() });
-		return treeView.reveal({ key: 'bac' }, { select: false })
+		return treeView.reveal({ key: 'bac' }, { select: false, focus: false })
 			.then(() => {
 				assert.ok(revealTarget.calledOnce);
 				assert.deepEqual('treeDataProvider', revealTarget.args[0][0]);
@@ -467,7 +467,7 @@ suite('ExtHostTreeView', function () {
 					{ handle: '0/0:b', label: 'b', collapsibleState: TreeItemCollapsibleState.Collapsed },
 					{ handle: '0/0:b/0:ba', label: 'ba', collapsibleState: TreeItemCollapsibleState.Collapsed, parentHandle: '0/0:b' }
 				], (<Array<any>>revealTarget.args[0][2]).map(arg => removeUnsetKeys(arg)));
-				assert.deepEqual({ select: false }, revealTarget.args[0][3]);
+				assert.deepEqual({ select: false, focus: false }, revealTarget.args[0][3]);
 			});
 	});
 
@@ -494,7 +494,7 @@ suite('ExtHostTreeView', function () {
 						assert.deepEqual('treeDataProvider', revealTarget.args[0][0]);
 						assert.deepEqual({ handle: '0/0:a/0:ac', label: 'ac', collapsibleState: TreeItemCollapsibleState.None, parentHandle: '0/0:a' }, removeUnsetKeys(revealTarget.args[0][1]));
 						assert.deepEqual([{ handle: '0/0:a', label: 'a', collapsibleState: TreeItemCollapsibleState.Collapsed }], (<Array<any>>revealTarget.args[0][2]).map(arg => removeUnsetKeys(arg)));
-						assert.equal(void 0, revealTarget.args[0][3]);
+						assert.deepEqual({ select: true, focus: false }, revealTarget.args[0][3]);
 					});
 			});
 	});
@@ -533,12 +533,12 @@ suite('ExtHostTreeView', function () {
 						assert.deepEqual('treeDataProvider', revealTarget.args[0][0]);
 						assert.deepEqual({ handle: '0/0:b/0:bc', label: 'bc', collapsibleState: TreeItemCollapsibleState.None, parentHandle: '0/0:b' }, removeUnsetKeys(revealTarget.args[0][1]));
 						assert.deepEqual([{ handle: '0/0:b', label: 'b', collapsibleState: TreeItemCollapsibleState.Collapsed }], (<Array<any>>revealTarget.args[0][2]).map(arg => removeUnsetKeys(arg)));
-						assert.equal(void 0, revealTarget.args[0][3]);
+						assert.deepEqual({ select: true, focus: false }, revealTarget.args[0][3]);
 					});
 			});
 	});
 
-	function loadCompleteTree(treeId, element?: string): TPromise<void> {
+	function loadCompleteTree(treeId, element?: string) {
 		return testObject.$getChildren(treeId, element)
 			.then(elements => elements.map(e => loadCompleteTree(treeId, e.handle)))
 			.then(() => null);
@@ -637,4 +637,4 @@ suite('ExtHostTreeView', function () {
 		constructor(readonly key: string) { }
 	}
 
-});
\ No newline at end of file
+});
diff --git a/src/vs/workbench/test/electron-browser/api/extHostTypes.test.ts b/src/vs/workbench/test/electron-browser/api/extHostTypes.test.ts
index 316a1e3a3cc..00544e0a62e 100644
--- a/src/vs/workbench/test/electron-browser/api/extHostTypes.test.ts
+++ b/src/vs/workbench/test/electron-browser/api/extHostTypes.test.ts
@@ -6,7 +6,7 @@
 'use strict';
 
 import * as assert from 'assert';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import * as types from 'vs/workbench/api/node/extHostTypes';
 import { isWindows } from 'vs/base/common/platform';
 
@@ -368,60 +368,61 @@ suite('ExtHostTypes', function () {
 		]);
 
 		edit.set(b, undefined);
-		assert.ok(edit.has(b));
-		assert.equal(edit.size, 2);
+		assert.ok(!edit.has(b));
+		assert.equal(edit.size, 1);
 
 		edit.set(b, [types.TextEdit.insert(new types.Position(0, 0), 'ffff')]);
 		assert.equal(edit.get(b).length, 1);
-
 	});
 
-	// test('WorkspaceEdit should fail when editing deleted resource', () => {
-	// 	const resource = URI.parse('file:///a.ts');
+	test('WorkspaceEdit - keep order of text and file changes', function () {
 
-	// 	const edit = new types.WorkspaceEdit();
-	// 	edit.deleteResource(resource);
-	// 	try {
-	// 		edit.insert(resource, new types.Position(0, 0), '');
-	// 		assert.fail(false, 'Should disallow edit of deleted resource');
-	// 	} catch {
-	// 		// expected
-	// 	}
-	// });
+		const edit = new types.WorkspaceEdit();
+		edit.replace(URI.parse('foo:a'), new types.Range(1, 1, 1, 1), 'foo');
+		edit.renameFile(URI.parse('foo:a'), URI.parse('foo:b'));
+		edit.replace(URI.parse('foo:a'), new types.Range(2, 1, 2, 1), 'bar');
+		edit.replace(URI.parse('foo:b'), new types.Range(3, 1, 3, 1), 'bazz');
 
-	// test('WorkspaceEdit - keep order of text and file changes', function () {
+		const all = edit._allEntries();
+		assert.equal(all.length, 4);
 
-	// 	const edit = new types.WorkspaceEdit();
-	// 	edit.replace(URI.parse('foo:a'), new types.Range(1, 1, 1, 1), 'foo');
-	// 	edit.renameResource(URI.parse('foo:a'), URI.parse('foo:b'));
-	// 	edit.replace(URI.parse('foo:a'), new types.Range(2, 1, 2, 1), 'bar');
-	// 	edit.replace(URI.parse('foo:b'), new types.Range(3, 1, 3, 1), 'bazz');
+		function isFileChange(thing: [URI, types.TextEdit[]] | [URI, URI, { overwrite?: boolean }]): thing is [URI, URI, { overwrite?: boolean }] {
+			const [f, s] = thing;
+			return URI.isUri(f) && URI.isUri(s);
+		}
 
-	// 	const all = edit.allEntries();
-	// 	assert.equal(all.length, 3);
+		function isTextChange(thing: [URI, types.TextEdit[]] | [URI, URI, { overwrite?: boolean }]): thing is [URI, types.TextEdit[]] {
+			const [f, s] = thing;
+			return URI.isUri(f) && Array.isArray(s);
+		}
 
-	// 	function isFileChange(thing: [URI, types.TextEdit[]] | [URI, URI]): thing is [URI, URI] {
-	// 		const [f, s] = thing;
-	// 		return URI.isUri(f) && URI.isUri(s);
-	// 	}
+		const [first, second, third, fourth] = all;
+		assert.equal(first[0].toString(), 'foo:a');
+		assert.ok(!isFileChange(first));
+		assert.ok(isTextChange(first) && first[1].length === 1);
 
-	// 	function isTextChange(thing: [URI, types.TextEdit[]] | [URI, URI]): thing is [URI, types.TextEdit[]] {
-	// 		const [f, s] = thing;
-	// 		return URI.isUri(f) && Array.isArray(s);
-	// 	}
+		assert.equal(second[0].toString(), 'foo:a');
+		assert.ok(isFileChange(second));
 
-	// 	const [first, second, third] = all;
-	// 	assert.equal(first[0].toString(), 'foo:a');
-	// 	assert.ok(!isFileChange(first));
-	// 	assert.ok(isTextChange(first) && first[1].length === 2);
+		assert.equal(third[0].toString(), 'foo:a');
+		assert.ok(isTextChange(third) && third[1].length === 1);
 
-	// 	assert.equal(second[0].toString(), 'foo:a');
-	// 	assert.ok(isFileChange(second));
+		assert.equal(fourth[0].toString(), 'foo:b');
+		assert.ok(!isFileChange(fourth));
+		assert.ok(isTextChange(fourth) && fourth[1].length === 1);
+	});
 
-	// 	assert.equal(third[0].toString(), 'foo:b');
-	// 	assert.ok(!isFileChange(third));
-	// 	assert.ok(isTextChange(third) && third[1].length === 1);
-	// });
+	test('WorkspaceEdit - two edits for one resource', function () {
+		let edit = new types.WorkspaceEdit();
+		let uri = URI.parse('foo:bar');
+		edit.insert(uri, new types.Position(0, 0), 'Hello');
+		edit.insert(uri, new types.Position(0, 0), 'Foo');
+
+		assert.equal(edit._allEntries().length, 2);
+		let [first, second] = edit._allEntries();
+		assert.equal((first as [URI, types.TextEdit[]])[1][0].newText, 'Hello');
+		assert.equal((second as [URI, types.TextEdit[]])[1][0].newText, 'Foo');
+	});
 
 	test('DocumentLink', function () {
 		assert.throws(() => new types.DocumentLink(null, null));
diff --git a/src/vs/workbench/test/electron-browser/api/extHostWorkspace.test.ts b/src/vs/workbench/test/electron-browser/api/extHostWorkspace.test.ts
index 5b03bd47a60..052def1fa34 100644
--- a/src/vs/workbench/test/electron-browser/api/extHostWorkspace.test.ts
+++ b/src/vs/workbench/test/electron-browser/api/extHostWorkspace.test.ts
@@ -6,7 +6,7 @@
 'use strict';
 
 import * as assert from 'assert';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { basename } from 'path';
 import { ExtHostWorkspace } from 'vs/workbench/api/node/extHostWorkspace';
 import { TestRPCProtocol } from './testRPCProtocol';
@@ -15,6 +15,7 @@ import { IWorkspaceFolderData } from 'vs/platform/workspace/common/workspace';
 import { IExtensionDescription } from 'vs/workbench/services/extensions/common/extensions';
 import { NullLogService } from 'vs/platform/log/common/log';
 import { IMainContext } from 'vs/workbench/api/node/extHost.protocol';
+import { Counter } from 'vs/base/common/numbers';
 
 suite('ExtHostWorkspace', function () {
 
@@ -41,7 +42,7 @@ suite('ExtHostWorkspace', function () {
 
 	test('asRelativePath', function () {
 
-		const ws = new ExtHostWorkspace(new TestRPCProtocol(), { id: 'foo', folders: [aWorkspaceFolderData(URI.file('/Coding/Applications/NewsWoWBot'), 0)], name: 'Test' }, new NullLogService());
+		const ws = new ExtHostWorkspace(new TestRPCProtocol(), { id: 'foo', folders: [aWorkspaceFolderData(URI.file('/Coding/Applications/NewsWoWBot'), 0)], name: 'Test' }, new NullLogService(), new Counter());
 
 		assertAsRelativePath(ws, '/Coding/Applications/NewsWoWBot/bernd/das/brot', 'bernd/das/brot');
 		assertAsRelativePath(ws, '/Apps/DartPubCache/hosted/pub.dartlang.org/convert-2.0.1/lib/src/hex.dart',
@@ -55,7 +56,7 @@ suite('ExtHostWorkspace', function () {
 	test('asRelativePath, same paths, #11402', function () {
 		const root = '/home/aeschli/workspaces/samples/docker';
 		const input = '/home/aeschli/workspaces/samples/docker';
-		const ws = new ExtHostWorkspace(new TestRPCProtocol(), { id: 'foo', folders: [aWorkspaceFolderData(URI.file(root), 0)], name: 'Test' }, new NullLogService());
+		const ws = new ExtHostWorkspace(new TestRPCProtocol(), { id: 'foo', folders: [aWorkspaceFolderData(URI.file(root), 0)], name: 'Test' }, new NullLogService(), new Counter());
 
 		assertAsRelativePath(ws, (input), input);
 
@@ -64,20 +65,20 @@ suite('ExtHostWorkspace', function () {
 	});
 
 	test('asRelativePath, no workspace', function () {
-		const ws = new ExtHostWorkspace(new TestRPCProtocol(), null, new NullLogService());
+		const ws = new ExtHostWorkspace(new TestRPCProtocol(), null, new NullLogService(), new Counter());
 		assertAsRelativePath(ws, (''), '');
 		assertAsRelativePath(ws, ('/foo/bar'), '/foo/bar');
 	});
 
 	test('asRelativePath, multiple folders', function () {
-		const ws = new ExtHostWorkspace(new TestRPCProtocol(), { id: 'foo', folders: [aWorkspaceFolderData(URI.file('/Coding/One'), 0), aWorkspaceFolderData(URI.file('/Coding/Two'), 1)], name: 'Test' }, new NullLogService());
+		const ws = new ExtHostWorkspace(new TestRPCProtocol(), { id: 'foo', folders: [aWorkspaceFolderData(URI.file('/Coding/One'), 0), aWorkspaceFolderData(URI.file('/Coding/Two'), 1)], name: 'Test' }, new NullLogService(), new Counter());
 		assertAsRelativePath(ws, '/Coding/One/file.txt', 'One/file.txt');
 		assertAsRelativePath(ws, '/Coding/Two/files/out.txt', 'Two/files/out.txt');
 		assertAsRelativePath(ws, '/Coding/Two2/files/out.txt', '/Coding/Two2/files/out.txt');
 	});
 
 	test('slightly inconsistent behaviour of asRelativePath and getWorkspaceFolder, #31553', function () {
-		const mrws = new ExtHostWorkspace(new TestRPCProtocol(), { id: 'foo', folders: [aWorkspaceFolderData(URI.file('/Coding/One'), 0), aWorkspaceFolderData(URI.file('/Coding/Two'), 1)], name: 'Test' }, new NullLogService());
+		const mrws = new ExtHostWorkspace(new TestRPCProtocol(), { id: 'foo', folders: [aWorkspaceFolderData(URI.file('/Coding/One'), 0), aWorkspaceFolderData(URI.file('/Coding/Two'), 1)], name: 'Test' }, new NullLogService(), new Counter());
 
 		assertAsRelativePath(mrws, '/Coding/One/file.txt', 'One/file.txt');
 		assertAsRelativePath(mrws, '/Coding/One/file.txt', 'One/file.txt', true);
@@ -89,7 +90,7 @@ suite('ExtHostWorkspace', function () {
 		assertAsRelativePath(mrws, '/Coding/Two2/files/out.txt', '/Coding/Two2/files/out.txt', true);
 		assertAsRelativePath(mrws, '/Coding/Two2/files/out.txt', '/Coding/Two2/files/out.txt', false);
 
-		const srws = new ExtHostWorkspace(new TestRPCProtocol(), { id: 'foo', folders: [aWorkspaceFolderData(URI.file('/Coding/One'), 0)], name: 'Test' }, new NullLogService());
+		const srws = new ExtHostWorkspace(new TestRPCProtocol(), { id: 'foo', folders: [aWorkspaceFolderData(URI.file('/Coding/One'), 0)], name: 'Test' }, new NullLogService(), new Counter());
 		assertAsRelativePath(srws, '/Coding/One/file.txt', 'file.txt');
 		assertAsRelativePath(srws, '/Coding/One/file.txt', 'file.txt', false);
 		assertAsRelativePath(srws, '/Coding/One/file.txt', 'One/file.txt', true);
@@ -99,24 +100,24 @@ suite('ExtHostWorkspace', function () {
 	});
 
 	test('getPath, legacy', function () {
-		let ws = new ExtHostWorkspace(new TestRPCProtocol(), { id: 'foo', name: 'Test', folders: [] }, new NullLogService());
+		let ws = new ExtHostWorkspace(new TestRPCProtocol(), { id: 'foo', name: 'Test', folders: [] }, new NullLogService(), new Counter());
 		assert.equal(ws.getPath(), undefined);
 
-		ws = new ExtHostWorkspace(new TestRPCProtocol(), null, new NullLogService());
+		ws = new ExtHostWorkspace(new TestRPCProtocol(), null, new NullLogService(), new Counter());
 		assert.equal(ws.getPath(), undefined);
 
-		ws = new ExtHostWorkspace(new TestRPCProtocol(), undefined, new NullLogService());
+		ws = new ExtHostWorkspace(new TestRPCProtocol(), undefined, new NullLogService(), new Counter());
 		assert.equal(ws.getPath(), undefined);
 
-		ws = new ExtHostWorkspace(new TestRPCProtocol(), { id: 'foo', name: 'Test', folders: [aWorkspaceFolderData(URI.file('Folder'), 0), aWorkspaceFolderData(URI.file('Another/Folder'), 1)] }, new NullLogService());
+		ws = new ExtHostWorkspace(new TestRPCProtocol(), { id: 'foo', name: 'Test', folders: [aWorkspaceFolderData(URI.file('Folder'), 0), aWorkspaceFolderData(URI.file('Another/Folder'), 1)] }, new NullLogService(), new Counter());
 		assert.equal(ws.getPath().replace(/\\/g, '/'), '/Folder');
 
-		ws = new ExtHostWorkspace(new TestRPCProtocol(), { id: 'foo', name: 'Test', folders: [aWorkspaceFolderData(URI.file('/Folder'), 0)] }, new NullLogService());
+		ws = new ExtHostWorkspace(new TestRPCProtocol(), { id: 'foo', name: 'Test', folders: [aWorkspaceFolderData(URI.file('/Folder'), 0)] }, new NullLogService(), new Counter());
 		assert.equal(ws.getPath().replace(/\\/g, '/'), '/Folder');
 	});
 
 	test('WorkspaceFolder has name and index', function () {
-		const ws = new ExtHostWorkspace(new TestRPCProtocol(), { id: 'foo', folders: [aWorkspaceFolderData(URI.file('/Coding/One'), 0), aWorkspaceFolderData(URI.file('/Coding/Two'), 1)], name: 'Test' }, new NullLogService());
+		const ws = new ExtHostWorkspace(new TestRPCProtocol(), { id: 'foo', folders: [aWorkspaceFolderData(URI.file('/Coding/One'), 0), aWorkspaceFolderData(URI.file('/Coding/Two'), 1)], name: 'Test' }, new NullLogService(), new Counter());
 
 		const [one, two] = ws.getWorkspaceFolders();
 
@@ -135,7 +136,7 @@ suite('ExtHostWorkspace', function () {
 				aWorkspaceFolderData(URI.file('/Coding/Two'), 1),
 				aWorkspaceFolderData(URI.file('/Coding/Two/Nested'), 2)
 			]
-		}, new NullLogService());
+		}, new NullLogService(), new Counter());
 
 		let folder = ws.getWorkspaceFolder(URI.file('/foo/bar'));
 		assert.equal(folder, undefined);
@@ -175,7 +176,7 @@ suite('ExtHostWorkspace', function () {
 	});
 
 	test('Multiroot change event should have a delta, #29641', function (done) {
-		let ws = new ExtHostWorkspace(new TestRPCProtocol(), { id: 'foo', name: 'Test', folders: [] }, new NullLogService());
+		let ws = new ExtHostWorkspace(new TestRPCProtocol(), { id: 'foo', name: 'Test', folders: [] }, new NullLogService(), new Counter());
 
 		let finished = false;
 		const finish = (error?: any) => {
@@ -238,7 +239,7 @@ suite('ExtHostWorkspace', function () {
 	});
 
 	test('Multiroot change keeps existing workspaces live', function () {
-		let ws = new ExtHostWorkspace(new TestRPCProtocol(), { id: 'foo', name: 'Test', folders: [aWorkspaceFolderData(URI.parse('foo:bar'), 0)] }, new NullLogService());
+		let ws = new ExtHostWorkspace(new TestRPCProtocol(), { id: 'foo', name: 'Test', folders: [aWorkspaceFolderData(URI.parse('foo:bar'), 0)] }, new NullLogService(), new Counter());
 
 		let firstFolder = ws.getWorkspaceFolders()[0];
 		ws.$acceptWorkspaceData({ id: 'foo', name: 'Test', folders: [aWorkspaceFolderData(URI.parse('foo:bar2'), 0), aWorkspaceFolderData(URI.parse('foo:bar'), 1, 'renamed')] });
@@ -258,7 +259,7 @@ suite('ExtHostWorkspace', function () {
 	});
 
 	test('updateWorkspaceFolders - invalid arguments', function () {
-		let ws = new ExtHostWorkspace(new TestRPCProtocol(), { id: 'foo', name: 'Test', folders: [] }, new NullLogService());
+		let ws = new ExtHostWorkspace(new TestRPCProtocol(), { id: 'foo', name: 'Test', folders: [] }, new NullLogService(), new Counter());
 
 		assert.equal(false, ws.updateWorkspaceFolders(extensionDescriptor, null, null));
 		assert.equal(false, ws.updateWorkspaceFolders(extensionDescriptor, 0, 0));
@@ -267,7 +268,7 @@ suite('ExtHostWorkspace', function () {
 		assert.equal(false, ws.updateWorkspaceFolders(extensionDescriptor, -1, 0));
 		assert.equal(false, ws.updateWorkspaceFolders(extensionDescriptor, -1, -1));
 
-		ws = new ExtHostWorkspace(new TestRPCProtocol(), { id: 'foo', name: 'Test', folders: [aWorkspaceFolderData(URI.parse('foo:bar'), 0)] }, new NullLogService());
+		ws = new ExtHostWorkspace(new TestRPCProtocol(), { id: 'foo', name: 'Test', folders: [aWorkspaceFolderData(URI.parse('foo:bar'), 0)] }, new NullLogService(), new Counter());
 
 		assert.equal(false, ws.updateWorkspaceFolders(extensionDescriptor, 1, 1));
 		assert.equal(false, ws.updateWorkspaceFolders(extensionDescriptor, 0, 2));
@@ -289,7 +290,7 @@ suite('ExtHostWorkspace', function () {
 			assertRegistered: undefined
 		};
 
-		const ws = new ExtHostWorkspace(protocol, { id: 'foo', name: 'Test', folders: [] }, new NullLogService());
+		const ws = new ExtHostWorkspace(protocol, { id: 'foo', name: 'Test', folders: [] }, new NullLogService(), new Counter());
 
 		//
 		// Add one folder
@@ -522,15 +523,15 @@ suite('ExtHostWorkspace', function () {
 			}
 		};
 
-		let ws = new ExtHostWorkspace(new TestRPCProtocol(), { id: 'foo', name: 'Test', folders: [] }, new NullLogService());
+		let ws = new ExtHostWorkspace(new TestRPCProtocol(), { id: 'foo', name: 'Test', folders: [] }, new NullLogService(), new Counter());
 		let sub = ws.onDidChangeWorkspace(e => {
 			try {
 				assert.throws(() => {
 					(<any>e).added = [];
 				});
-				assert.throws(() => {
-					(<any>e.added)[0] = null;
-				});
+				// assert.throws(() => {
+				// 	(<any>e.added)[0] = null;
+				// });
 			} catch (error) {
 				finish(error);
 			}
@@ -545,7 +546,7 @@ suite('ExtHostWorkspace', function () {
 			id: 'foo', name: 'Test', folders: [
 				aWorkspaceFolderData(URI.file('c:/Users/marek/Desktop/vsc_test/'), 0)
 			]
-		}, new NullLogService());
+		}, new NullLogService(), new Counter());
 
 		assert.ok(ws.getWorkspaceFolder(URI.file('c:/Users/marek/Desktop/vsc_test/a.txt')));
 		assert.ok(ws.getWorkspaceFolder(URI.file('C:/Users/marek/Desktop/vsc_test/b.txt')));
diff --git a/src/vs/workbench/test/electron-browser/api/mainThreadConfiguration.test.ts b/src/vs/workbench/test/electron-browser/api/mainThreadConfiguration.test.ts
index 4cf96c8b3e8..bff0bac85ba 100644
--- a/src/vs/workbench/test/electron-browser/api/mainThreadConfiguration.test.ts
+++ b/src/vs/workbench/test/electron-browser/api/mainThreadConfiguration.test.ts
@@ -7,7 +7,7 @@
 
 import * as assert from 'assert';
 import * as sinon from 'sinon';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { Extensions, IConfigurationRegistry, ConfigurationScope } from 'vs/platform/configuration/common/configurationRegistry';
 import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
diff --git a/src/vs/workbench/test/electron-browser/api/mainThreadDiagnostics.test.ts b/src/vs/workbench/test/electron-browser/api/mainThreadDiagnostics.test.ts
index a5238a9372e..9eeeb4b3492 100644
--- a/src/vs/workbench/test/electron-browser/api/mainThreadDiagnostics.test.ts
+++ b/src/vs/workbench/test/electron-browser/api/mainThreadDiagnostics.test.ts
@@ -8,7 +8,7 @@
 import * as assert from 'assert';
 import { MarkerService } from 'vs/platform/markers/common/markerService';
 import { MainThreadDiagnostics } from 'vs/workbench/api/electron-browser/mainThreadDiagnostics';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 
 
 suite('MainThreadDiagnostics', function () {
diff --git a/src/vs/workbench/test/electron-browser/api/mainThreadEditors.test.ts b/src/vs/workbench/test/electron-browser/api/mainThreadEditors.test.ts
index 2057af0b39a..060ed7d2a53 100644
--- a/src/vs/workbench/test/electron-browser/api/mainThreadEditors.test.ts
+++ b/src/vs/workbench/test/electron-browser/api/mainThreadEditors.test.ts
@@ -16,16 +16,19 @@ import { ExtHostDocumentsAndEditorsShape, ExtHostContext, ExtHostDocumentsShape
 import { mock } from 'vs/workbench/test/electron-browser/api/mock';
 import { Event } from 'vs/base/common/event';
 import { MainThreadTextEditors } from 'vs/workbench/api/electron-browser/mainThreadEditors';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { Range } from 'vs/editor/common/core/range';
 import { Position } from 'vs/editor/common/core/position';
 import { IModelService } from 'vs/editor/common/services/modelService';
 import { EditOperation } from 'vs/editor/common/core/editOperation';
-import { TestFileService, TestEditorService, TestEditorGroupsService } from 'vs/workbench/test/workbenchTestServices';
+import { TestFileService, TestEditorService, TestEditorGroupsService, TestEnvironmentService, TestContextService } from 'vs/workbench/test/workbenchTestServices';
 import { TPromise } from 'vs/base/common/winjs.base';
-import { IFileStat } from 'vs/platform/files/common/files';
 import { ResourceTextEdit } from 'vs/editor/common/modes';
 import { BulkEditService } from 'vs/workbench/services/bulkEdit/electron-browser/bulkEditService';
+import { NullLogService } from 'vs/platform/log/common/log';
+import { ITextModelService, ITextEditorModel } from 'vs/editor/common/services/resolverService';
+import { IReference, ImmortalReference } from 'vs/base/common/lifecycle';
+import { LabelService } from 'vs/platform/label/common/label';
 
 suite('MainThreadEditors', () => {
 
@@ -47,23 +50,22 @@ suite('MainThreadEditors', () => {
 		createdResources.clear();
 		deletedResources.clear();
 
-		const fileService = new class extends TestFileService {
-			async moveFile(from: URI, target: URI): TPromise<IFileStat> {
-				movedResources.set(from, target);
-				return createMockFileStat(target);
-			}
-			async createFile(uri: URI): TPromise<IFileStat> {
-				createdResources.add(uri);
-				return createMockFileStat(uri);
-			}
-			async del(uri: URI): TPromise<any> {
-				deletedResources.add(uri);
-			}
-		};
-
+		const fileService = new TestFileService();
 
 		const textFileService = new class extends mock<ITextFileService>() {
 			isDirty() { return false; }
+			create(uri: URI, contents?: string, options?: any) {
+				createdResources.add(uri);
+				return TPromise.as(void 0);
+			}
+			delete(resource: URI) {
+				deletedResources.add(resource);
+				return TPromise.as(void 0);
+			}
+			move(source: URI, target: URI) {
+				movedResources.set(source, target);
+				return TPromise.as(void 0);
+			}
 			models = <any>{
 				onModelSaved: Event.None,
 				onModelReverted: Event.None,
@@ -72,8 +74,17 @@ suite('MainThreadEditors', () => {
 		};
 		const workbenchEditorService = new TestEditorService();
 		const editorGroupService = new TestEditorGroupsService();
+		const textModelService = new class extends mock<ITextModelService>() {
+			createModelReference(resource: URI): TPromise<IReference<ITextEditorModel>> {
+				const textEditorModel: ITextEditorModel = new class extends mock<ITextEditorModel>() {
+					textEditorModel = modelService.getModel(resource);
+				};
+				textEditorModel.isReadonly = () => false;
+				return TPromise.as(new ImmortalReference(textEditorModel));
+			}
+		};
 
-		const bulkEditService = new BulkEditService(modelService, new TestEditorService(), null, fileService);
+		const bulkEditService = new BulkEditService(new NullLogService(), modelService, new TestEditorService(), textModelService, new TestFileService(), textFileService, new LabelService(TestEnvironmentService, new TestContextService()));
 
 		const rpcProtocol = new TestRPCProtocol();
 		rpcProtocol.set(ExtHostContext.ExtHostDocuments, new class extends mock<ExtHostDocumentsShape>() {
@@ -130,12 +141,44 @@ suite('MainThreadEditors', () => {
 		});
 	});
 
+	test(`issue #54773: applyWorkspaceEdit checks model version in race situation`, () => {
+
+		let model = modelService.createModel('something', null, resource);
+
+		let workspaceResourceEdit1: ResourceTextEdit = {
+			resource: resource,
+			modelVersionId: model.getVersionId(),
+			edits: [{
+				text: 'asdfg',
+				range: new Range(1, 1, 1, 1)
+			}]
+		};
+		let workspaceResourceEdit2: ResourceTextEdit = {
+			resource: resource,
+			modelVersionId: model.getVersionId(),
+			edits: [{
+				text: 'asdfg',
+				range: new Range(1, 1, 1, 1)
+			}]
+		};
+
+		let p1 = editors.$tryApplyWorkspaceEdit({ edits: [workspaceResourceEdit1] }).then((result) => {
+			// first edit request succeeds
+			assert.equal(result, true);
+		});
+		let p2 = editors.$tryApplyWorkspaceEdit({ edits: [workspaceResourceEdit2] }).then((result) => {
+			// second edit request fails
+			assert.equal(result, false);
+		});
+		return TPromise.join([p1, p2]);
+	});
+
 	test(`applyWorkspaceEdit with only resource edit`, () => {
 		return editors.$tryApplyWorkspaceEdit({
 			edits: [
-				{ oldUri: resource, newUri: resource },
-				{ oldUri: undefined, newUri: resource },
-				{ oldUri: resource, newUri: undefined }
+				{ oldUri: resource, newUri: resource, options: undefined },
+				{ oldUri: undefined, newUri: resource, options: undefined },
+				{ oldUri: resource, newUri: undefined, options: undefined }
 			]
 		}).then((result) => {
 			assert.equal(result, true);
@@ -145,15 +188,3 @@ suite('MainThreadEditors', () => {
 		});
 	});
 });
-
-
-function createMockFileStat(target: URI): IFileStat {
-	return {
-		etag: '',
-		isDirectory: false,
-		name: target.path,
-		mtime: 0,
-		resource: target
-	};
-}
-
diff --git a/src/vs/workbench/test/electron-browser/api/testRPCProtocol.ts b/src/vs/workbench/test/electron-browser/api/testRPCProtocol.ts
index f7aa186cddd..af6d6512941 100644
--- a/src/vs/workbench/test/electron-browser/api/testRPCProtocol.ts
+++ b/src/vs/workbench/test/electron-browser/api/testRPCProtocol.ts
@@ -6,10 +6,12 @@
 'use strict';
 
 import { TPromise } from 'vs/base/common/winjs.base';
-import { ProxyIdentifier, IRPCProtocol } from 'vs/workbench/services/extensions/node/proxyIdentifier';
+import { ProxyIdentifier } from 'vs/workbench/services/extensions/node/proxyIdentifier';
 import { CharCode } from 'vs/base/common/charCode';
+import { IExtHostContext } from 'vs/workbench/api/node/extHost.protocol';
+import { isThenable } from 'vs/base/common/async';
 
-export function SingleProxyRPCProtocol(thing: any): IRPCProtocol {
+export function SingleProxyRPCProtocol(thing: any): IExtHostContext {
 	return {
 		getProxy<T>(): T {
 			return thing;
@@ -23,7 +25,7 @@ export function SingleProxyRPCProtocol(thing: any): IRPCProtocol {
 
 declare var Proxy: any; // TODO@TypeScript
 
-export class TestRPCProtocol implements IRPCProtocol {
+export class TestRPCProtocol implements IExtHostContext {
 
 	private _callCountValue: number = 0;
 	private _idle: Promise<any>;
@@ -68,10 +70,10 @@ export class TestRPCProtocol implements IRPCProtocol {
 	}
 
 	public getProxy<T>(identifier: ProxyIdentifier<T>): T {
-		if (!this._proxies[identifier.id]) {
-			this._proxies[identifier.id] = this._createProxy(identifier.id);
+		if (!this._proxies[identifier.sid]) {
+			this._proxies[identifier.sid] = this._createProxy(identifier.sid);
 		}
-		return this._proxies[identifier.id];
+		return this._proxies[identifier.sid];
 	}
 
 	private _createProxy<T>(proxyId: string): T {
@@ -89,7 +91,7 @@ export class TestRPCProtocol implements IRPCProtocol {
 	}
 
 	public set<T, R extends T>(identifier: ProxyIdentifier<T>, value: R): R {
-		this._locals[identifier.id] = value;
+		this._locals[identifier.sid] = value;
 		return value;
 	}
 
@@ -105,7 +107,7 @@ export class TestRPCProtocol implements IRPCProtocol {
 			let p: Thenable<any>;
 			try {
 				let result = (<Function>instance[path]).apply(instance, wireArgs);
-				p = TPromise.is(result) ? result : TPromise.as(result);
+				p = isThenable(result) ? result : TPromise.as(result);
 			} catch (err) {
 				p = TPromise.wrapError(err);
 			}
diff --git a/src/vs/workbench/test/electron-browser/quickopen.perf.integrationTest.ts b/src/vs/workbench/test/electron-browser/quickopen.perf.integrationTest.ts
index fe9c4ac96b0..2a61d2a9ed0 100644
--- a/src/vs/workbench/test/electron-browser/quickopen.perf.integrationTest.ts
+++ b/src/vs/workbench/test/electron-browser/quickopen.perf.integrationTest.ts
@@ -12,7 +12,6 @@ import { createSyncDescriptor } from 'vs/platform/instantiation/common/descripto
 import { IEditorGroupsService } from 'vs/workbench/services/group/common/editorGroupsService';
 import { ISearchService } from 'vs/platform/search/common/search';
 import { ITelemetryService, ITelemetryInfo } from 'vs/platform/telemetry/common/telemetry';
-import { IExperimentService, IExperiments } from 'vs/platform/telemetry/common/experiments';
 import { IUntitledEditorService, UntitledEditorService } from 'vs/workbench/services/untitled/common/untitledEditorService';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 import * as minimist from 'minimist';
@@ -24,13 +23,14 @@ import { ServiceCollection } from 'vs/platform/instantiation/common/serviceColle
 import { TestEnvironmentService, TestContextService, TestEditorService, TestEditorGroupsService } from 'vs/workbench/test/workbenchTestServices';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { TPromise } from 'vs/base/common/winjs.base';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { InstantiationService } from 'vs/platform/instantiation/common/instantiationService';
 import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { ModelServiceImpl } from 'vs/editor/common/services/modelServiceImpl';
 import { IModelService } from 'vs/editor/common/services/modelService';
 import { testWorkspace } from 'vs/platform/workspace/test/common/testWorkspace';
+import { CancellationToken } from 'vs/base/common/cancellation';
 
 namespace Timer {
 	export interface ITimerEvent {
@@ -68,11 +68,9 @@ suite.skip('QuickOpen performance (integration)', () => {
 		const testWorkspacePath = testWorkspaceArg ? path.resolve(testWorkspaceArg) : __dirname;
 
 		const telemetryService = new TestTelemetryService();
-		const experimentService = new TestExperimentService();
 		const configurationService = new TestConfigurationService();
 		const instantiationService = new InstantiationService(new ServiceCollection(
 			[ITelemetryService, telemetryService],
-			[IExperimentService, experimentService],
 			[IConfigurationService, configurationService],
 			[IModelService, new ModelServiceImpl(null, configurationService)],
 			[IWorkspaceContextService, new TestContextService(testWorkspace(URI.file(testWorkspacePath)))],
@@ -90,7 +88,7 @@ suite.skip('QuickOpen performance (integration)', () => {
 		function measure() {
 			const handler = descriptor.instantiate(instantiationService);
 			handler.onOpen();
-			return handler.getResults('a').then(result => {
+			return handler.getResults('a', CancellationToken.None).then(result => {
 				const uncachedEvent = popEvent();
 				assert.strictEqual(uncachedEvent.data.symbols.fromCache, false, 'symbols.fromCache');
 				assert.strictEqual(uncachedEvent.data.files.fromCache, true, 'files.fromCache');
@@ -99,7 +97,7 @@ suite.skip('QuickOpen performance (integration)', () => {
 				}
 				return uncachedEvent;
 			}).then(uncachedEvent => {
-				return handler.getResults('ab').then(result => {
+				return handler.getResults('ab', CancellationToken.None).then(result => {
 					const cachedEvent = popEvent();
 					assert.strictEqual(uncachedEvent.data.symbols.fromCache, false, 'symbols.fromCache');
 					assert.ok(cachedEvent.data.files.fromCache, 'filesFromCache');
@@ -179,12 +177,3 @@ class TestTelemetryService implements ITelemetryService {
 		});
 	}
 }
-
-class TestExperimentService implements IExperimentService {
-
-	_serviceBrand: any;
-
-	getExperiments(): IExperiments {
-		return {};
-	}
-}
diff --git a/src/vs/workbench/test/electron-browser/textsearch.perf.integrationTest.ts b/src/vs/workbench/test/electron-browser/textsearch.perf.integrationTest.ts
index e94ff2d8c1f..5ff0e54e5ce 100644
--- a/src/vs/workbench/test/electron-browser/textsearch.perf.integrationTest.ts
+++ b/src/vs/workbench/test/electron-browser/textsearch.perf.integrationTest.ts
@@ -22,7 +22,7 @@ import { ServiceCollection } from 'vs/platform/instantiation/common/serviceColle
 import { TestEnvironmentService, TestContextService, TestEditorService, TestEditorGroupsService } from 'vs/workbench/test/workbenchTestServices';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { TPromise } from 'vs/base/common/winjs.base';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { InstantiationService } from 'vs/platform/instantiation/common/instantiationService';
 import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
diff --git a/src/vs/workbench/test/workbenchTestServices.ts b/src/vs/workbench/test/workbenchTestServices.ts
index ce5053d10fe..0a98d5655b7 100644
--- a/src/vs/workbench/test/workbenchTestServices.ts
+++ b/src/vs/workbench/test/workbenchTestServices.ts
@@ -7,10 +7,11 @@
 
 import 'vs/workbench/parts/files/electron-browser/files.contribution'; // load our contribution into the test
 import { FileEditorInput } from 'vs/workbench/parts/files/common/editors/fileEditorInput';
-import { Promise, TPromise } from 'vs/base/common/winjs.base';
+import { TPromise } from 'vs/base/common/winjs.base';
 import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
 import * as paths from 'vs/base/common/paths';
-import URI from 'vs/base/common/uri';
+import * as resources from 'vs/base/common/resources';
+import { URI } from 'vs/base/common/uri';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { NullTelemetryService } from 'vs/platform/telemetry/common/telemetryUtils';
 import { StorageService, InMemoryLocalStorage } from 'vs/platform/storage/common/storageService';
@@ -26,7 +27,7 @@ import { TextModelResolverService } from 'vs/workbench/services/textmodelResolve
 import { ITextModelService } from 'vs/editor/common/services/resolverService';
 import { IEditorOptions, IResourceInput } from 'vs/platform/editor/common/editor';
 import { IUntitledEditorService, UntitledEditorService } from 'vs/workbench/services/untitled/common/untitledEditorService';
-import { IWorkspaceContextService, IWorkspace as IWorkbenchWorkspace, WorkbenchState, IWorkspaceFolder, IWorkspaceFoldersChangeEvent } from 'vs/platform/workspace/common/workspace';
+import { IWorkspaceContextService, IWorkspace as IWorkbenchWorkspace, WorkbenchState, IWorkspaceFolder, IWorkspaceFoldersChangeEvent, Workspace } from 'vs/platform/workspace/common/workspace';
 import { ILifecycleService, ShutdownEvent, ShutdownReason, StartupKind, LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
 import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
 import { TextFileService } from 'vs/workbench/services/textfile/common/textFileService';
@@ -41,19 +42,18 @@ import { IModeService } from 'vs/editor/common/services/modeService';
 import { IHistoryService } from 'vs/workbench/services/history/common/history';
 import { IInstantiationService, ServicesAccessor, ServiceIdentifier } from 'vs/platform/instantiation/common/instantiation';
 import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
-import { IWindowsService, IWindowService, INativeOpenDialogOptions, IEnterWorkspaceResult, IMessageBoxResult, IWindowConfiguration } from 'vs/platform/windows/common/windows';
+import { IWindowsService, IWindowService, INativeOpenDialogOptions, IEnterWorkspaceResult, IMessageBoxResult, IWindowConfiguration, MenuBarVisibility } from 'vs/platform/windows/common/windows';
 import { TestWorkspace } from 'vs/platform/workspace/test/common/testWorkspace';
 import { createTextBufferFactory } from 'vs/editor/common/model/textModel';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { isLinux } from 'vs/base/common/platform';
 import { generateUuid } from 'vs/base/common/uuid';
 import { TestThemeService } from 'vs/platform/theme/test/common/testThemeService';
-import { IWorkspaceIdentifier, ISingleFolderWorkspaceIdentifier, isSingleFolderWorkspaceIdentifier, IWorkspaceFolderCreationData } from 'vs/platform/workspaces/common/workspaces';
+import { IWorkspaceIdentifier, IWorkspaceFolderCreationData, ISingleFolderWorkspaceIdentifier, isSingleFolderWorkspaceIdentifier } from 'vs/platform/workspaces/common/workspaces';
 import { IRecentlyOpened } from 'vs/platform/history/common/history';
 import { ITextResourceConfigurationService } from 'vs/editor/common/services/resourceConfiguration';
 import { IPosition, Position as EditorPosition } from 'vs/editor/common/core/position';
-import { ICommandAction, IMenuService, MenuId, IMenu } from 'vs/platform/actions/common/actions';
+import { IMenuService, MenuId, IMenu, ISerializableCommandAction } from 'vs/platform/actions/common/actions';
 import { IHashService } from 'vs/workbench/services/hash/common/hashService';
 import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { MockContextKeyService, MockKeybindingService } from 'vs/platform/keybinding/test/common/mockKeybindingService';
@@ -64,15 +64,19 @@ import { INotificationService } from 'vs/platform/notification/common/notificati
 import { TestNotificationService } from 'vs/platform/notification/test/common/testNotificationService';
 import { IExtensionService, ProfileSession, IExtensionsStatus, ExtensionPointContribution, IExtensionDescription } from '../services/extensions/common/extensions';
 import { IExtensionPoint } from 'vs/workbench/services/extensions/common/extensionsRegistry';
-import { IKeybindingService } from '../../platform/keybinding/common/keybinding';
+import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { IDecorationsService, IResourceDecorationChangeEvent, IDecoration, IDecorationData, IDecorationsProvider } from 'vs/workbench/services/decorations/browser/decorations';
-import { IDisposable, toDisposable } from 'vs/base/common/lifecycle';
+import { IDisposable, toDisposable, Disposable } from 'vs/base/common/lifecycle';
 import { IEditorGroupsService, IEditorGroup, GroupsOrder, GroupsArrangement, GroupDirection, IAddGroupOptions, IMergeGroupOptions, IMoveEditorOptions, ICopyEditorOptions, IEditorReplacement, IGroupChangeEvent, EditorsOrder, IFindGroupScope, EditorGroupLayout } from 'vs/workbench/services/group/common/editorGroupsService';
 import { IEditorService, IOpenEditorOverrideHandler } from 'vs/workbench/services/editor/common/editorService';
 import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
 import { ICodeEditor, IDiffEditor } from 'vs/editor/browser/editorBrowser';
 import { IDecorationRenderOptions } from 'vs/editor/common/editorCommon';
 import { EditorGroup } from 'vs/workbench/common/editor/editorGroup';
+import { Dimension } from 'vs/base/browser/dom';
+import { ILogService, LogLevel } from 'vs/platform/log/common/log';
+import { ILabelService, LabelService } from 'vs/platform/label/common/label';
+import { timeout } from 'vs/base/common/async';
 
 export function createFileInput(instantiationService: IInstantiationService, resource: URI): FileEditorInput {
 	return instantiationService.createInstance(FileEditorInput, resource, void 0);
@@ -83,7 +87,7 @@ export const TestEnvironmentService = new EnvironmentService(parseArgs(process.a
 export class TestContextService implements IWorkspaceContextService {
 	public _serviceBrand: any;
 
-	private workspace: IWorkbenchWorkspace;
+	private workspace: Workspace;
 	private options: any;
 
 	private readonly _onDidChangeWorkspaceName: Emitter<void>;
@@ -130,7 +134,7 @@ export class TestContextService implements IWorkspaceContextService {
 	}
 
 	public getWorkspaceFolder(resource: URI): IWorkspaceFolder {
-		return this.isInsideWorkspace(resource) ? this.workspace.folders[0] : null;
+		return this.workspace.getFolder(resource);
 	}
 
 	public setWorkspace(workspace: any): void {
@@ -147,7 +151,7 @@ export class TestContextService implements IWorkspaceContextService {
 
 	public isInsideWorkspace(resource: URI): boolean {
 		if (resource && this.workspace) {
-			return paths.isEqualOrParent(resource.fsPath, this.workspace.folders[0].uri.fsPath, !isLinux /* ignorecase */);
+			return resources.isEqualOrParent(resource, this.workspace.folders[0].uri);
 		}
 
 		return false;
@@ -158,16 +162,7 @@ export class TestContextService implements IWorkspaceContextService {
 	}
 
 	public isCurrentWorkspace(workspaceIdentifier: ISingleFolderWorkspaceIdentifier | IWorkspaceIdentifier): boolean {
-		return isSingleFolderWorkspaceIdentifier(workspaceIdentifier) && this.pathEquals(this.workspace.folders[0].uri.fsPath, workspaceIdentifier);
-	}
-
-	private pathEquals(path1: string, path2: string): boolean {
-		if (!isLinux) {
-			path1 = path1.toLowerCase();
-			path2 = path2.toLowerCase();
-		}
-
-		return path1 === path2;
+		return isSingleFolderWorkspaceIdentifier(workspaceIdentifier) && resources.isEqual(this.workspace.folders[0].uri, workspaceIdentifier);
 	}
 }
 
@@ -248,7 +243,8 @@ export class TestTextFileService extends TextFileService {
 export function workbenchInstantiationService(): IInstantiationService {
 	let instantiationService = new TestInstantiationService(new ServiceCollection([ILifecycleService, new TestLifecycleService()]));
 	instantiationService.stub(IContextKeyService, <IContextKeyService>instantiationService.createInstance(MockContextKeyService));
-	instantiationService.stub(IWorkspaceContextService, new TestContextService(TestWorkspace));
+	const workspaceContextService = new TestContextService(TestWorkspace);
+	instantiationService.stub(IWorkspaceContextService, workspaceContextService);
 	const configService = new TestConfigurationService();
 	instantiationService.stub(IConfigurationService, configService);
 	instantiationService.stub(ITextResourceConfigurationService, new TestTextResourceConfigurationService(configService));
@@ -274,7 +270,9 @@ export function workbenchInstantiationService(): IInstantiationService {
 	instantiationService.stub(IEnvironmentService, TestEnvironmentService);
 	instantiationService.stub(IThemeService, new TestThemeService());
 	instantiationService.stub(IHashService, new TestHashService());
+	instantiationService.stub(ILogService, new TestLogService());
 	instantiationService.stub(IEditorGroupsService, new TestEditorGroupsService([new TestEditorGroup(0)]));
+	instantiationService.stub(ILabelService, new LabelService(TestEnvironmentService, workspaceContextService));
 	const editorService = new TestEditorService();
 	instantiationService.stub(IEditorService, editorService);
 	instantiationService.stub(ICodeEditorService, new TestCodeEditorService());
@@ -282,10 +280,23 @@ export function workbenchInstantiationService(): IInstantiationService {
 	return instantiationService;
 }
 
+export class TestLogService implements ILogService {
+	_serviceBrand: any; onDidChangeLogLevel: Event<LogLevel>;
+	getLevel(): LogLevel { return LogLevel.Info; }
+	setLevel(level: LogLevel): void { }
+	trace(message: string, ...args: any[]): void { }
+	debug(message: string, ...args: any[]): void { }
+	info(message: string, ...args: any[]): void { }
+	warn(message: string, ...args: any[]): void { }
+	error(message: string | Error, ...args: any[]): void { }
+	critical(message: string | Error, ...args: any[]): void { }
+	dispose(): void { }
+}
+
 export class TestDecorationsService implements IDecorationsService {
 	_serviceBrand: any;
 	onDidChangeDecorations: Event<IResourceDecorationChangeEvent> = Event.None;
-	registerDecorationsProvider(provider: IDecorationsProvider): IDisposable { return toDisposable(); }
+	registerDecorationsProvider(provider: IDecorationsProvider): IDisposable { return Disposable.None; }
 	getDecoration(uri: URI, includeChildren: boolean, overwrite?: IDecorationData): IDecoration { return void 0; }
 }
 
@@ -293,13 +304,13 @@ export class TestExtensionService implements IExtensionService {
 	_serviceBrand: any;
 	onDidRegisterExtensions: Event<void> = Event.None;
 	onDidChangeExtensionsStatus: Event<string[]> = Event.None;
-	activateByEvent(activationEvent: string): Promise<void> { return TPromise.as(void 0); }
-	whenInstalledExtensionsRegistered(): Promise<boolean> { return TPromise.as(true); }
-	getExtensions(): Promise<IExtensionDescription[]> { return TPromise.as([]); }
-	readExtensionPointContributions<T>(extPoint: IExtensionPoint<T>): Promise<ExtensionPointContribution<T>[]> { return TPromise.as(Object.create(null)); }
+	activateByEvent(activationEvent: string): TPromise<void> { return TPromise.as(void 0); }
+	whenInstalledExtensionsRegistered(): TPromise<boolean> { return TPromise.as(true); }
+	getExtensions(): TPromise<IExtensionDescription[]> { return TPromise.as([]); }
+	readExtensionPointContributions<T>(extPoint: IExtensionPoint<T>): TPromise<ExtensionPointContribution<T>[]> { return TPromise.as(Object.create(null)); }
 	getExtensionsStatus(): { [id: string]: IExtensionsStatus; } { return Object.create(null); }
 	canProfileExtensionHost(): boolean { return false; }
-	startExtensionHostProfile(): Promise<ProfileSession> { return TPromise.as(Object.create(null)); }
+	startExtensionHostProfile(): TPromise<ProfileSession> { return TPromise.as(Object.create(null)); }
 	restartExtensionHost(): void { }
 	startExtensionHost(): void { }
 	stopExtensionHost(): void { }
@@ -347,11 +358,11 @@ export class TestHistoryService implements IHistoryService {
 		return [];
 	}
 
-	public getLastActiveWorkspaceRoot(schemeFilter?: string): URI {
+	public getLastActiveWorkspaceRoot(schemeFilter: string): URI {
 		return this.root;
 	}
 
-	public getLastActiveFile(): URI {
+	public getLastActiveFile(schemeFilter: string): URI {
 		return void 0;
 	}
 }
@@ -360,11 +371,11 @@ export class TestDialogService implements IDialogService {
 
 	public _serviceBrand: any;
 
-	public confirm(confirmation: IConfirmation): Promise<IConfirmationResult> {
+	public confirm(confirmation: IConfirmation): TPromise<IConfirmationResult> {
 		return TPromise.as({ confirmed: false });
 	}
 
-	public show(severity: Severity, message: string, buttons: string[], options?: IDialogOptions): Promise<number, any> {
+	public show(severity: Severity, message: string, buttons: string[], options?: IDialogOptions): TPromise<number> {
 		return TPromise.as(0);
 	}
 }
@@ -374,18 +385,21 @@ export class TestPartService implements IPartService {
 	public _serviceBrand: any;
 
 	private _onTitleBarVisibilityChange = new Emitter<void>();
+	private _onMenubarVisibilityChange = new Emitter<Dimension>();
 	private _onEditorLayout = new Emitter<IDimension>();
 
 	public get onTitleBarVisibilityChange(): Event<void> {
 		return this._onTitleBarVisibilityChange.event;
 	}
 
+	public get onMenubarVisibilityChange(): Event<Dimension> {
+		return this._onMenubarVisibilityChange.event;
+	}
+
 	public get onEditorLayout(): Event<IDimension> {
 		return this._onEditorLayout.event;
 	}
 
-	public layout(): void { }
-
 	public isCreated(): boolean {
 		return true;
 	}
@@ -438,6 +452,10 @@ export class TestPartService implements IPartService {
 		return false;
 	}
 
+	public getMenubarVisibility(): MenuBarVisibility {
+		return null;
+	}
+
 	public getSideBarPosition() {
 		return 0;
 	}
@@ -452,7 +470,7 @@ export class TestPartService implements IPartService {
 
 	public addClass(clazz: string): void { }
 	public removeClass(clazz: string): void { }
-	public getWorkbenchElementId(): string { return ''; }
+	public getWorkbenchElement(): HTMLElement { return void 0; }
 
 	public toggleZenMode(): void { }
 
@@ -584,7 +602,7 @@ export class TestEditorGroup implements IEditorGroupView {
 	disposed: boolean;
 	editors: ReadonlyArray<IEditorInput> = [];
 	label: string;
-	whenRestored: Promise<void, any> = TPromise.as(void 0);
+	whenRestored: TPromise<void> = TPromise.as(void 0);
 	element: HTMLElement;
 	minimumWidth: number;
 	maximumWidth: number;
@@ -667,6 +685,7 @@ export class TestEditorGroup implements IEditorGroupView {
 	dispose(): void { }
 	toJSON(): object { return Object.create(null); }
 	layout(width: number, height: number): void { }
+	relayout() { }
 }
 
 export class TestEditorService implements EditorServiceImpl {
@@ -806,16 +825,14 @@ export class TestFileService implements IFileService {
 	}
 
 	updateContent(resource: URI, value: string | ITextSnapshot, options?: IUpdateContentOptions): TPromise<IFileStat> {
-		return TPromise.timeout(1).then(() => {
-			return {
-				resource,
-				etag: 'index.txt',
-				encoding: 'utf8',
-				mtime: Date.now(),
-				isDirectory: false,
-				name: paths.basename(resource.fsPath)
-			};
-		});
+		return TPromise.wrap(timeout(0).then(() => ({
+			resource,
+			etag: 'index.txt',
+			encoding: 'utf8',
+			mtime: Date.now(),
+			isDirectory: false,
+			name: paths.basename(resource.fsPath)
+		})));
 	}
 
 	moveFile(source: URI, target: URI, overwrite?: boolean): TPromise<IFileStat> {
@@ -834,10 +851,6 @@ export class TestFileService implements IFileService {
 		return TPromise.as(null);
 	}
 
-	rename(resource: URI, newName: string): TPromise<IFileStat> {
-		return TPromise.as(null);
-	}
-
 	onDidChangeFileSystemProviderRegistrations = Event.None;
 
 	registerProvider(scheme: string, provider) {
@@ -848,7 +861,7 @@ export class TestFileService implements IFileService {
 		return resource.scheme === 'file';
 	}
 
-	del(resource: URI, useTrash?: boolean): TPromise<void> {
+	del(resource: URI, options?: { useTrash?: boolean, recursive?: boolean }): TPromise<void> {
 		return TPromise.as(null);
 	}
 
@@ -869,8 +882,6 @@ export class TestFileService implements IFileService {
 export class TestBackupFileService implements IBackupFileService {
 	public _serviceBrand: any;
 
-	public backupEnabled: boolean;
-
 	public hasBackups(): TPromise<boolean> {
 		return TPromise.as(false);
 	}
@@ -958,11 +969,16 @@ export class TestWindowService implements IWindowService {
 	public _serviceBrand: any;
 
 	onDidChangeFocus: Event<boolean> = new Emitter<boolean>().event;
+	onDidChangeMaximize: Event<boolean>;
 
 	isFocused(): TPromise<boolean> {
 		return TPromise.as(false);
 	}
 
+	isMaximized(): TPromise<boolean> {
+		return TPromise.as(false);
+	}
+
 	getConfiguration(): IWindowConfiguration {
 		return Object.create(null);
 	}
@@ -1003,6 +1019,10 @@ export class TestWindowService implements IWindowService {
 		return TPromise.as(void 0);
 	}
 
+	enterWorkspace(path: string): TPromise<IEnterWorkspaceResult> {
+		return TPromise.as(void 0);
+	}
+
 	createAndEnterWorkspace(folders?: IWorkspaceFolderCreationData[], path?: string): TPromise<IEnterWorkspaceResult> {
 		return TPromise.as(void 0);
 	}
@@ -1027,7 +1047,19 @@ export class TestWindowService implements IWindowService {
 		return TPromise.as(void 0);
 	}
 
-	openWindow(paths: string[], options?: { forceNewWindow?: boolean, forceReuseWindow?: boolean, forceOpenWorkspaceAsFile?: boolean }): TPromise<void> {
+	maximizeWindow(): TPromise<void> {
+		return TPromise.as(void 0);
+	}
+
+	unmaximizeWindow(): TPromise<void> {
+		return TPromise.as(void 0);
+	}
+
+	minimizeWindow(): TPromise<void> {
+		return TPromise.as(void 0);
+	}
+
+	openWindow(paths: URI[], options?: { forceNewWindow?: boolean, forceReuseWindow?: boolean, forceOpenWorkspaceAsFile?: boolean }): TPromise<void> {
 		return TPromise.as(void 0);
 	}
 
@@ -1059,7 +1091,7 @@ export class TestWindowService implements IWindowService {
 		return TPromise.wrap(void 0);
 	}
 
-	updateTouchBar(items: ICommandAction[][]): Promise<void> {
+	updateTouchBar(items: ISerializableCommandAction[][]): TPromise<void> {
 		return TPromise.as(void 0);
 	}
 }
@@ -1104,6 +1136,9 @@ export class TestWindowsService implements IWindowsService {
 	onWindowOpen: Event<number>;
 	onWindowFocus: Event<number>;
 	onWindowBlur: Event<number>;
+	onWindowMaximize: Event<number>;
+	onWindowUnmaximize: Event<number>;
+	onRecentlyOpenedChange: Event<void>;
 
 	isFocused(windowId: number): TPromise<boolean> {
 		return TPromise.as(false);
@@ -1141,6 +1176,10 @@ export class TestWindowsService implements IWindowsService {
 		return TPromise.as(void 0);
 	}
 
+	enterWorkspace(windowId: number, path: string): TPromise<IEnterWorkspaceResult> {
+		return TPromise.as(void 0);
+	}
+
 	createAndEnterWorkspace(windowId: number, folders?: IWorkspaceFolderCreationData[], path?: string): TPromise<IEnterWorkspaceResult> {
 		return TPromise.as(void 0);
 	}
@@ -1157,11 +1196,11 @@ export class TestWindowsService implements IWindowsService {
 		return TPromise.as(void 0);
 	}
 
-	addRecentlyOpened(files: string[]): TPromise<void> {
+	addRecentlyOpened(files: URI[]): TPromise<void> {
 		return TPromise.as(void 0);
 	}
 
-	removeFromRecentlyOpened(paths: string[]): TPromise<void> {
+	removeFromRecentlyOpened(paths: URI[]): TPromise<void> {
 		return TPromise.as(void 0);
 	}
 
@@ -1189,6 +1228,10 @@ export class TestWindowsService implements IWindowsService {
 		return TPromise.as(void 0);
 	}
 
+	minimizeWindow(windowId: number): TPromise<void> {
+		return TPromise.as(void 0);
+	}
+
 	unmaximizeWindow(windowId: number): TPromise<void> {
 		return TPromise.as(void 0);
 	}
@@ -1218,7 +1261,7 @@ export class TestWindowsService implements IWindowsService {
 	}
 
 	// Global methods
-	openWindow(windowId: number, paths: string[], options?: { forceNewWindow?: boolean, forceReuseWindow?: boolean, forceOpenWorkspaceAsFile?: boolean }): TPromise<void> {
+	openWindow(windowId: number, paths: URI[], options?: { forceNewWindow?: boolean, forceReuseWindow?: boolean, forceOpenWorkspaceAsFile?: boolean }): TPromise<void> {
 		return TPromise.as(void 0);
 	}
 
@@ -1230,7 +1273,7 @@ export class TestWindowsService implements IWindowsService {
 		return TPromise.as(void 0);
 	}
 
-	getWindows(): TPromise<{ id: number; workspace?: IWorkspaceIdentifier; folderPath?: string; title: string; filename?: string; }[]> {
+	getWindows(): TPromise<{ id: number; workspace?: IWorkspaceIdentifier; folderUri?: ISingleFolderWorkspaceIdentifier; title: string; filename?: string; }[]> {
 		return TPromise.as(void 0);
 	}
 
@@ -1246,30 +1289,38 @@ export class TestWindowsService implements IWindowsService {
 		return TPromise.as(void 0);
 	}
 
-	showPreviousWindowTab(): Promise<void> {
+	newWindowTab(): TPromise<void> {
 		return TPromise.as(void 0);
 	}
 
-	showNextWindowTab(): Promise<void> {
+	showPreviousWindowTab(): TPromise<void> {
 		return TPromise.as(void 0);
 	}
 
-	moveWindowTabToNewWindow(): Promise<void> {
+	showNextWindowTab(): TPromise<void> {
 		return TPromise.as(void 0);
 	}
 
-	mergeAllWindowTabs(): Promise<void> {
+	moveWindowTabToNewWindow(): TPromise<void> {
 		return TPromise.as(void 0);
 	}
 
-	toggleWindowTabsBar(): Promise<void> {
+	mergeAllWindowTabs(): TPromise<void> {
 		return TPromise.as(void 0);
 	}
 
-	updateTouchBar(windowId: number, items: ICommandAction[][]): Promise<void> {
+	toggleWindowTabsBar(): TPromise<void> {
 		return TPromise.as(void 0);
 	}
 
+	updateTouchBar(windowId: number, items: ISerializableCommandAction[][]): TPromise<void> {
+		return TPromise.as(void 0);
+	}
+
+	getActiveWindowId(): TPromise<number | undefined> {
+		return TPromise.as(undefined);
+	}
+
 	// This needs to be handled from browser process to prevent
 	// foreground ordering issues on Windows
 	openExternal(url: string): TPromise<boolean> {
diff --git a/src/vs/workbench/workbench.main.ts b/src/vs/workbench/workbench.main.ts
index 5feaad584c7..ce9193eb9cf 100644
--- a/src/vs/workbench/workbench.main.ts
+++ b/src/vs/workbench/workbench.main.ts
@@ -16,7 +16,8 @@ import 'vs/workbench/services/configuration/common/configurationExtensionPoint';
 import 'vs/editor/editor.all';
 
 // Platform
-import 'vs/platform/widget/browser/widget.contribution';
+import 'vs/platform/widget/browser/contextScopedHistoryWidget';
+import 'vs/platform/label/electron-browser/label.contribution';
 
 // Menus/Actions
 import 'vs/workbench/services/actions/electron-browser/menusExtensionPoint';
@@ -54,6 +55,8 @@ import 'vs/workbench/parts/backup/common/backup.contribution';
 
 import 'vs/workbench/parts/stats/node/stats.contribution';
 
+import 'vs/workbench/parts/splash/electron-browser/partsSplash.contribution';
+
 import 'vs/workbench/parts/search/electron-browser/search.contribution';
 import 'vs/workbench/parts/search/browser/searchView'; // can be packaged separately
 import 'vs/workbench/parts/search/browser/openAnythingHandler'; // can be packaged separately
@@ -64,7 +67,6 @@ import 'vs/workbench/parts/scm/electron-browser/scmViewlet'; // can be packaged
 import 'vs/workbench/parts/debug/electron-browser/debug.contribution';
 import 'vs/workbench/parts/debug/browser/debugQuickOpen';
 import 'vs/workbench/parts/debug/electron-browser/repl';
-import 'vs/workbench/parts/debug/browser/debugEditorActions';
 import 'vs/workbench/parts/debug/browser/debugViewlet'; // can be packaged separately
 
 import 'vs/workbench/parts/markers/electron-browser/markers.contribution';
@@ -138,5 +140,8 @@ import 'vs/workbench/parts/welcome/overlay/browser/welcomeOverlay';
 
 import 'vs/workbench/parts/outline/electron-browser/outline.contribution';
 
+import 'vs/workbench/parts/navigation/common/navigation.contribution';
+
 // services
 import 'vs/workbench/services/bulkEdit/electron-browser/bulkEditService';
+import 'vs/workbench/parts/experiments/electron-browser/experiments.contribution';
diff --git a/test/all.js b/test/all.js
index 14c6897b197..915d68a6309 100644
--- a/test/all.js
+++ b/test/all.js
@@ -49,9 +49,10 @@ function main() {
 		nodeMain: __filename,
 		baseUrl: path.join(path.dirname(__dirname), 'src'),
 		paths: {
+			'vs/css': '../test/css.mock',
 			'vs': `../${ out }/vs`,
 			'lib': `../${ out }/lib`,
-			'bootstrap': `../${ out }/bootstrap`
+			'bootstrap-fork': `../${ out }/bootstrap-fork`
 		},
 		catchError: true
 	};
diff --git a/test/css.mock.js b/test/css.mock.js
new file mode 100644
index 00000000000..1829c6ae48e
--- /dev/null
+++ b/test/css.mock.js
@@ -0,0 +1,12 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+define([], function() {
+	return {
+		load: function(name, req, load) {
+			load({});
+		}
+	};
+});
diff --git a/test/electron/index.js b/test/electron/index.js
index ee98b8f8ea3..79c7136ca4c 100644
--- a/test/electron/index.js
+++ b/test/electron/index.js
@@ -9,6 +9,7 @@ const { join } = require('path');
 const path = require('path');
 const mocha = require('mocha');
 const events = require('events');
+const MochaJUnitReporter = require('mocha-junit-reporter');
 
 const defaultReporterName = process.platform === 'win32' ? 'list' : 'spec';
 
@@ -21,7 +22,7 @@ const optimist = require('optimist')
 	.describe('debug', 'open dev tools, keep window open, reuse app data').string('debug')
 	.describe('reporter', 'the mocha reporter').string('reporter').default('reporter', defaultReporterName)
 	.describe('reporter-options', 'the mocha reporter options').string('reporter-options').default('reporter-options', '')
-	.describe('tfs').boolean('tfs')
+	.describe('tfs').string('tfs')
 	.describe('help', 'show the help').alias('help', 'h');
 
 const argv = optimist.argv;
@@ -96,26 +97,6 @@ function parseReporterOption(value) {
 	return r ? { [r[1]]: r[2] } : {};
 }
 
-class TFSReporter extends mocha.reporters.Base {
-
-	constructor(runner) {
-		super(runner);
-
-		runner.on('pending', test => {
-			console.log('PEND', test.fullTitle());
-		});
-		runner.on('pass', test => {
-			console.log('OK  ', test.fullTitle(), `(${test.duration}ms)`);
-		});
-		runner.on('fail', test => {
-			console.log('FAIL', test.fullTitle(), `(${test.duration}ms)`);
-		});
-		runner.once('end', () => {
-			this.epilogue();
-		});
-	}
-}
-
 app.on('ready', () => {
 
 	const win = new BrowserWindow({
@@ -141,7 +122,13 @@ app.on('ready', () => {
 	const runner = new IPCRunner();
 
 	if (argv.tfs) {
-		new TFSReporter(runner);
+		new mocha.reporters.Spec(runner);
+		new MochaJUnitReporter(runner, {
+			reporterOptions: {
+				testsuitesTitle: `${argv.tfs} ${process.platform}`,
+				mochaFile: process.env.BUILD_ARTIFACTSTAGINGDIRECTORY ? path.join(process.env.BUILD_ARTIFACTSTAGINGDIRECTORY, `test-results/${process.platform}-${argv.tfs.toLowerCase().replace(/[^\w]/g, '-')}-results.xml`) : undefined
+			}
+		});
 	} else {
 		const reporterPath = path.join(path.dirname(require.resolve('mocha')), 'lib', 'reporters', argv.reporter);
 		let Reporter;
diff --git a/test/electron/renderer.js b/test/electron/renderer.js
index 63729010808..40aa7ed434a 100644
--- a/test/electron/renderer.js
+++ b/test/electron/renderer.js
@@ -13,6 +13,7 @@ const minimatch = require('minimatch');
 const istanbul = require('istanbul');
 const i_remap = require('remap-istanbul/lib/remap');
 const util = require('util');
+const bootstrap = require('../../src/bootstrap');
 
 // Disabled custom inspect. See #38847
 if (util.inspect && util.inspect['defaultOptions']) {
@@ -33,11 +34,11 @@ function initLoader(opts) {
 		nodeRequire: require,
 		nodeMain: __filename,
 		catchError: true,
-		baseUrl: path.join(__dirname, '../../src'),
+		baseUrl: bootstrap.uriFromPath(path.join(__dirname, '../../src')),
 		paths: {
 			'vs': `../${outdir}/vs`,
 			'lib': `../${outdir}/lib`,
-			'bootstrap': `../${outdir}/bootstrap`
+			'bootstrap-fork': `../${outdir}/bootstrap-fork`
 		}
 	};
 
diff --git a/test/smoke/package.json b/test/smoke/package.json
index e033db34da0..857e7a49440 100644
--- a/test/smoke/package.json
+++ b/test/smoke/package.json
@@ -9,7 +9,7 @@
     "copy-driver": "cpx src/vscode/driver.js out/vscode",
     "watch-driver": "cpx src/vscode/driver.js out/vscode -w",
     "copy-driver-definition": "node tools/copy-driver-definition.js",
-    "watch-driver-definition": "watch \"node tools/copy-driver-definition.js\" ../../src/vs/platform/driver/common",
+    "watch-driver-definition": "watch \"node tools/copy-driver-definition.js\" ../../src/vs/platform/driver/node",
     "mocha": "mocha"
   },
   "devDependencies": {
@@ -22,16 +22,18 @@
     "@types/webdriverio": "4.6.1",
     "concurrently": "^3.5.1",
     "cpx": "^1.5.0",
-    "electron": "1.7.7",
+    "electron": "^2.0.6",
     "htmlparser2": "^3.9.2",
     "mkdirp": "^0.5.1",
-    "mocha": "^3.2.0",
+    "mocha": "^5.2.0",
+    "mocha-junit-reporter": "^1.17.0",
+    "mocha-multi-reporters": "^1.1.7",
     "ncp": "^2.0.0",
     "portastic": "^1.0.1",
     "rimraf": "^2.6.1",
     "strip-json-comments": "^2.0.1",
     "tmp": "0.0.33",
-    "typescript": "2.5.2",
+    "typescript": "2.9.2",
     "watch": "^1.0.2"
   }
-}
+}
\ No newline at end of file
diff --git a/test/smoke/src/application.ts b/test/smoke/src/application.ts
index 7e08c89d140..d7505a0816e 100644
--- a/test/smoke/src/application.ts
+++ b/test/smoke/src/application.ts
@@ -8,7 +8,7 @@ import * as cp from 'child_process';
 import { Code, spawn, SpawnOptions } from './vscode/code';
 import { Logger } from './logger';
 
-export enum Quality {
+export const enum Quality {
 	Dev,
 	Insiders,
 	Stable
diff --git a/test/smoke/src/areas/activitybar/activityBar.ts b/test/smoke/src/areas/activitybar/activityBar.ts
index a2acb1ac44d..f055ad69621 100644
--- a/test/smoke/src/areas/activitybar/activityBar.ts
+++ b/test/smoke/src/areas/activitybar/activityBar.ts
@@ -5,7 +5,7 @@
 
 import { Code } from '../../vscode/code';
 
-export enum ActivityBarPosition {
+export const enum ActivityBarPosition {
 	LEFT = 0,
 	RIGHT = 1
 }
diff --git a/test/smoke/src/areas/debug/debug.ts b/test/smoke/src/areas/debug/debug.ts
index 312d99ce0db..4dc52619757 100644
--- a/test/smoke/src/areas/debug/debug.ts
+++ b/test/smoke/src/areas/debug/debug.ts
@@ -23,9 +23,9 @@ const BREAKPOINT_GLYPH = '.debug-breakpoint';
 const PAUSE = `.debug-actions-widget .debug-action.pause`;
 const DEBUG_STATUS_BAR = `.statusbar.debugging`;
 const NOT_DEBUG_STATUS_BAR = `.statusbar:not(debugging)`;
-const TOOLBAR_HIDDEN = `.debug-actions-widget.monaco-builder-hidden`;
+const TOOLBAR_HIDDEN = `.debug-actions-widget[aria-hidden="true"]`;
 const STACK_FRAME = `${VIEWLET} .monaco-tree-row .stack-frame`;
-const SPECIFIC_STACK_FRAME = filename => `${STACK_FRAME} .file[title$="${filename}"]`;
+const SPECIFIC_STACK_FRAME = filename => `${STACK_FRAME} .file[title*="${filename}"]`;
 const VARIABLE = `${VIEWLET} .debug-variables .monaco-tree-row .expression`;
 const CONSOLE_OUTPUT = `.repl .output.expression .value`;
 const CONSOLE_INPUT_OUTPUT = `.repl .input-output-pair .output.expression .value`;
@@ -130,7 +130,7 @@ export class Debug extends Viewlet {
 		await this.code.waitForSetValue(REPL_FOCUSED, text);
 
 		// Wait for the keys to be picked up by the editor model such that repl evalutes what just got typed
-		await this.editor.waitForEditorContents('debug:input', s => s.indexOf(text) >= 0);
+		await this.editor.waitForEditorContents('debug:replinput', s => s.indexOf(text) >= 0);
 		await this.code.dispatchKeybinding('enter');
 		await this.code.waitForElement(CONSOLE_INPUT_OUTPUT);
 		await this.waitForOutput(output => accept(output[output.length - 1] || ''));
diff --git a/test/smoke/src/areas/extensions/extensions.ts b/test/smoke/src/areas/extensions/extensions.ts
index 199242f8f50..b3ad16827c8 100644
--- a/test/smoke/src/areas/extensions/extensions.ts
+++ b/test/smoke/src/areas/extensions/extensions.ts
@@ -6,7 +6,7 @@
 import { Viewlet } from '../workbench/viewlet';
 import { Code } from '../../vscode/code';
 
-const SEARCH_BOX = 'div.extensions-viewlet[id="workbench.view.extensions"] input.search-box';
+const SEARCH_BOX = 'div.extensions-viewlet[id="workbench.view.extensions"] .monaco-editor textarea';
 
 export class Extensions extends Viewlet {
 
@@ -27,12 +27,13 @@ export class Extensions extends Viewlet {
 	async searchForExtension(name: string): Promise<any> {
 		await this.code.waitAndClick(SEARCH_BOX);
 		await this.code.waitForActiveElement(SEARCH_BOX);
-		await this.code.waitForSetValue(SEARCH_BOX, `name:"${name}"`);
+		await this.code.waitForTypeInEditor(SEARCH_BOX, `name:"${name}"`);
 	}
 
 	async installExtension(name: string): Promise<void> {
 		await this.searchForExtension(name);
-		await this.code.waitAndClick(`div.extensions-viewlet[id="workbench.view.extensions"] .monaco-list-row[aria-label="${name}"] .extension li[class='action-item'] .extension-action.install`);
-		await this.code.waitForElement(`div.extensions-viewlet[id="workbench.view.extensions"] .monaco-list-row[aria-label="${name}"] .extension li[class='action-item'] .extension-action.reload`);
+		const ariaLabel = `${name}. Press enter for extension details.`;
+		await this.code.waitAndClick(`div.extensions-viewlet[id="workbench.view.extensions"] .monaco-list-row[aria-label="${ariaLabel}"] .extension li[class='action-item'] .extension-action.install`);
+		await this.code.waitForElement(`.extension-editor .monaco-action-bar .action-item:not(.disabled) .extension-action.reload`);
 	}
 }
\ No newline at end of file
diff --git a/test/smoke/src/areas/git/git.test.ts b/test/smoke/src/areas/git/git.test.ts
index 8846db475a2..208301c012e 100644
--- a/test/smoke/src/areas/git/git.test.ts
+++ b/test/smoke/src/areas/git/git.test.ts
@@ -48,24 +48,19 @@ export function setup() {
 			const app = this.app as Application;
 
 			await app.workbench.scm.openSCMViewlet();
-
 			await app.workbench.scm.waitForChange('app.js', 'Modified');
+
 			await app.workbench.scm.stage('app.js');
-
-			await app.workbench.scm.waitForChange('app.js', 'Index Modified');
 			await app.workbench.scm.unstage('app.js');
-
-			await app.workbench.scm.waitForChange('app.js', 'Modified');
 		});
 
 		it(`stages, commits changes and verifies outgoing change`, async function () {
 			const app = this.app as Application;
 
 			await app.workbench.scm.openSCMViewlet();
-
 			await app.workbench.scm.waitForChange('app.js', 'Modified');
+
 			await app.workbench.scm.stage('app.js');
-			await app.workbench.scm.waitForChange('app.js', 'Index Modified');
 
 			await app.workbench.scm.commit('first commit');
 			await app.code.waitForTextContent(SYNC_STATUSBAR, ' 0↓ 1↑');
diff --git a/test/smoke/src/areas/git/scm.ts b/test/smoke/src/areas/git/scm.ts
index 0107b900ebd..ee6b16c73c8 100644
--- a/test/smoke/src/areas/git/scm.ts
+++ b/test/smoke/src/areas/git/scm.ts
@@ -10,12 +10,10 @@ import { findElement, findElements, Code } from '../../vscode/code';
 const VIEWLET = 'div[id="workbench.view.scm"]';
 const SCM_INPUT = `${VIEWLET} .scm-editor textarea`;
 const SCM_RESOURCE = `${VIEWLET} .monaco-list-row > .resource`;
-const SCM_RESOURCE_GROUP = `${VIEWLET} .monaco-list-row > .resource-group`;
 const REFRESH_COMMAND = `div[id="workbench.parts.sidebar"] .actions-container a.action-label[title="Refresh"]`;
 const COMMIT_COMMAND = `div[id="workbench.parts.sidebar"] .actions-container a.action-label[title="Commit"]`;
 const SCM_RESOURCE_CLICK = (name: string) => `${SCM_RESOURCE} .monaco-icon-label[title*="${name}"] .label-name`;
 const SCM_RESOURCE_ACTION_CLICK = (name: string, actionName: string) => `${SCM_RESOURCE} .monaco-icon-label[title*="${name}"] .actions .action-label[title="${actionName}"]`;
-const SCM_RESOURCE_GROUP_COMMAND_CLICK = (name: string) => `${SCM_RESOURCE_GROUP} .actions .action-label[title="${name}"]`;
 
 interface Change {
 	name: string;
@@ -64,14 +62,12 @@ export class SCM extends Viewlet {
 
 	async stage(name: string): Promise<void> {
 		await this.code.waitAndClick(SCM_RESOURCE_ACTION_CLICK(name, 'Stage Changes'));
-	}
-
-	async stageAll(): Promise<void> {
-		await this.code.waitAndClick(SCM_RESOURCE_GROUP_COMMAND_CLICK('Stage All Changes'));
+		await this.waitForChange(name, 'Index Modified');
 	}
 
 	async unstage(name: string): Promise<void> {
 		await this.code.waitAndClick(SCM_RESOURCE_ACTION_CLICK(name, 'Unstage Changes'));
+		await this.waitForChange('app.js', 'Modified');
 	}
 
 	async commit(message: string): Promise<void> {
diff --git a/test/smoke/src/areas/preferences/keybindings.ts b/test/smoke/src/areas/preferences/keybindings.ts
index 235621574f0..c9f1273d0c1 100644
--- a/test/smoke/src/areas/preferences/keybindings.ts
+++ b/test/smoke/src/areas/preferences/keybindings.ts
@@ -21,14 +21,14 @@ export class KeybindingsEditor {
 		await this.code.waitForActiveElement(SEARCH_INPUT);
 		await this.code.waitForSetValue(SEARCH_INPUT, command);
 
-		await this.code.waitAndClick('div[aria-label="Keybindings"] .monaco-list-row.keybinding-item');
-		await this.code.waitForElement('div[aria-label="Keybindings"] .monaco-list-row.keybinding-item.focused.selected');
+		await this.code.waitAndClick('.keybindings-list-container .monaco-list-row.keybinding-item');
+		await this.code.waitForElement('.keybindings-list-container .monaco-list-row.keybinding-item.focused.selected');
 
-		await this.code.waitAndClick('div[aria-label="Keybindings"] .monaco-list-row.keybinding-item .action-item .icon.add');
+		await this.code.waitAndClick('.keybindings-list-container .monaco-list-row.keybinding-item .action-item .icon.add');
 		await this.code.waitForActiveElement('.defineKeybindingWidget .monaco-inputbox input');
 
 		await this.code.dispatchKeybinding(keybinding);
 		await this.code.dispatchKeybinding('enter');
-		await this.code.waitForElement(`div[aria-label="Keybindings"] div[aria-label="Keybinding is ${ariaLabel}."]`);
+		await this.code.waitForElement(`.keybindings-list-container div[aria-label="Keybinding is ${ariaLabel}."]`);
 	}
 }
\ No newline at end of file
diff --git a/test/smoke/src/areas/preferences/settings.ts b/test/smoke/src/areas/preferences/settings.ts
index ecdef71c033..525d3774bcb 100644
--- a/test/smoke/src/areas/preferences/settings.ts
+++ b/test/smoke/src/areas/preferences/settings.ts
@@ -10,7 +10,7 @@ import { Editors } from '../editor/editors';
 import { Code } from '../../vscode/code';
 import { QuickOpen } from '../quickopen/quickopen';
 
-export enum ActivityBarPosition {
+export const enum ActivityBarPosition {
 	LEFT = 0,
 	RIGHT = 1
 }
@@ -42,6 +42,6 @@ export class SettingsEditor {
 	}
 
 	private async openSettings(): Promise<void> {
-		await this.quickopen.runCommand('Preferences: Open User Settings');
+		await this.quickopen.runCommand('Preferences: Open Settings (JSON)');
 	}
 }
\ No newline at end of file
diff --git a/test/smoke/src/areas/problems/problems.ts b/test/smoke/src/areas/problems/problems.ts
index b31ac96c572..bffd6a95fca 100644
--- a/test/smoke/src/areas/problems/problems.ts
+++ b/test/smoke/src/areas/problems/problems.ts
@@ -5,7 +5,7 @@
 
 import { Code } from '../../vscode/code';
 
-export enum ProblemSeverity {
+export const enum ProblemSeverity {
 	WARNING = 0,
 	ERROR = 1
 }
diff --git a/test/smoke/src/areas/quickinput/quickinput.ts b/test/smoke/src/areas/quickinput/quickinput.ts
index c13b308c0d9..aab4253c970 100644
--- a/test/smoke/src/areas/quickinput/quickinput.ts
+++ b/test/smoke/src/areas/quickinput/quickinput.ts
@@ -25,4 +25,13 @@ export class QuickInput {
 	private async waitForQuickInputClosed(): Promise<void> {
 		await this.code.waitForElement(QuickInput.QUICK_INPUT, r => !!r && r.attributes.style.indexOf('display: none;') !== -1);
 	}
+
+	async selectQuickInputElement(index: number): Promise<void> {
+		await this.waitForQuickInputOpened();
+		for (let from = 0; from < index; from++) {
+			await this.code.dispatchKeybinding('down');
+		}
+		await this.code.dispatchKeybinding('enter');
+		await this.waitForQuickInputClosed();
+	}
 }
diff --git a/test/smoke/src/areas/quickopen/quickopen.ts b/test/smoke/src/areas/quickopen/quickopen.ts
index e46dbdfaeae..d9989302e4b 100644
--- a/test/smoke/src/areas/quickopen/quickopen.ts
+++ b/test/smoke/src/areas/quickopen/quickopen.ts
@@ -8,8 +8,8 @@ import { Code } from '../../vscode/code';
 
 export class QuickOpen {
 
+	static QUICK_OPEN = 'div.monaco-quick-open-widget';
 	static QUICK_OPEN_HIDDEN = 'div.monaco-quick-open-widget[aria-hidden="true"]';
-	static QUICK_OPEN = 'div.monaco-quick-open-widget[aria-hidden="false"]';
 	static QUICK_OPEN_INPUT = `${QuickOpen.QUICK_OPEN} .quick-open-input input`;
 	static QUICK_OPEN_FOCUSED_ELEMENT = `${QuickOpen.QUICK_OPEN} .quick-open-tree .monaco-tree-row.focused .monaco-highlighted-label`;
 	static QUICK_OPEN_ENTRY_SELECTOR = 'div[aria-label="Quick Picker"] .monaco-tree-rows.show-twisties .monaco-tree-row .quick-open-entry';
diff --git a/test/smoke/src/areas/search/search.ts b/test/smoke/src/areas/search/search.ts
index 9238eeed6e6..e93328d086f 100644
--- a/test/smoke/src/areas/search/search.ts
+++ b/test/smoke/src/areas/search/search.ts
@@ -53,7 +53,7 @@ export class Search extends Viewlet {
 		await this.waitForInputFocus(INPUT);
 
 		await this.code.dispatchKeybinding('enter');
-		await this.code.waitForElement(`${VIEWLET} .messages[aria-hidden="false"]`);
+		await this.code.waitForElement(`${VIEWLET} .messages`);
 	}
 
 	async setFilesToIncludeText(text: string): Promise<void> {
@@ -77,6 +77,8 @@ export class Search extends Viewlet {
 			() => this.code.waitForElement(`${fileMatch} .action-label.icon.action-remove`, el => !!el && el.top > 0 && el.left > 0, 10)
 		);
 
+		// ¯\_(ツ)_/¯
+		await new Promise(c => setTimeout(c, 500));
 		await this.code.waitAndClick(`${fileMatch} .action-label.icon.action-remove`);
 		await this.code.waitForElement(fileMatch, el => !el);
 	}
@@ -101,15 +103,17 @@ export class Search extends Viewlet {
 			() => this.code.waitForElement(`${fileMatch} .action-label.icon.action-replace-all`, el => !!el && el.top > 0 && el.left > 0, 10)
 		);
 
+		// ¯\_(ツ)_/¯
+		await new Promise(c => setTimeout(c, 500));
 		await this.code.waitAndClick(`${fileMatch} .action-label.icon.action-replace-all`);
 	}
 
 	async waitForResultText(text: string): Promise<void> {
-		await this.code.waitForTextContent(`${VIEWLET} .messages[aria-hidden="false"] .message>p`, text);
+		await this.code.waitForTextContent(`${VIEWLET} .messages .message>p`, text);
 	}
 
 	async waitForNoResultText(): Promise<void> {
-		await this.code.waitForElement(`${VIEWLET} .messages[aria-hidden="false"] .message>p`, el => !el);
+		await this.code.waitForElement(`${VIEWLET} .messages[aria-hidden="true"] .message>p`);
 	}
 
 	private async waitForInputFocus(selector: string): Promise<void> {
diff --git a/test/smoke/src/areas/statusbar/statusbar.test.ts b/test/smoke/src/areas/statusbar/statusbar.test.ts
index dfb1d7550d3..b2212a92797 100644
--- a/test/smoke/src/areas/statusbar/statusbar.test.ts
+++ b/test/smoke/src/areas/statusbar/statusbar.test.ts
@@ -35,17 +35,17 @@ export function setup() {
 
 			await app.workbench.quickopen.openFile('app.js');
 			await app.workbench.statusbar.clickOn(StatusBarElement.INDENTATION_STATUS);
-			await app.workbench.quickopen.waitForQuickOpenOpened();
-			await app.workbench.quickopen.closeQuickOpen();
+			await app.workbench.quickinput.waitForQuickInputOpened();
+			await app.workbench.quickinput.closeQuickInput();
 			await app.workbench.statusbar.clickOn(StatusBarElement.ENCODING_STATUS);
-			await app.workbench.quickopen.waitForQuickOpenOpened();
-			await app.workbench.quickopen.closeQuickOpen();
+			await app.workbench.quickinput.waitForQuickInputOpened();
+			await app.workbench.quickinput.closeQuickInput();
 			await app.workbench.statusbar.clickOn(StatusBarElement.EOL_STATUS);
-			await app.workbench.quickopen.waitForQuickOpenOpened();
-			await app.workbench.quickopen.closeQuickOpen();
+			await app.workbench.quickinput.waitForQuickInputOpened();
+			await app.workbench.quickinput.closeQuickInput();
 			await app.workbench.statusbar.clickOn(StatusBarElement.LANGUAGE_STATUS);
-			await app.workbench.quickopen.waitForQuickOpenOpened();
-			await app.workbench.quickopen.closeQuickOpen();
+			await app.workbench.quickinput.waitForQuickInputOpened();
+			await app.workbench.quickinput.closeQuickInput();
 		});
 
 		it(`verifies that 'Problems View' appears when clicking on 'Problems' status element`, async function () {
@@ -84,8 +84,8 @@ export function setup() {
 			await app.workbench.quickopen.openFile('app.js');
 			await app.workbench.statusbar.clickOn(StatusBarElement.EOL_STATUS);
 
-			await app.workbench.quickopen.waitForQuickOpenOpened();
-			await app.workbench.quickopen.selectQuickOpenElement(1);
+			await app.workbench.quickinput.waitForQuickInputOpened();
+			await app.workbench.quickinput.selectQuickInputElement(1);
 
 			await app.workbench.statusbar.waitForEOL('CRLF');
 		});
diff --git a/test/smoke/src/areas/statusbar/statusbar.ts b/test/smoke/src/areas/statusbar/statusbar.ts
index dd3392a5a9c..b36678ea7d2 100644
--- a/test/smoke/src/areas/statusbar/statusbar.ts
+++ b/test/smoke/src/areas/statusbar/statusbar.ts
@@ -5,7 +5,7 @@
 
 import { Code } from '../../vscode/code';
 
-export enum StatusBarElement {
+export const enum StatusBarElement {
 	BRANCH_STATUS = 0,
 	SYNC_STATUS = 1,
 	PROBLEMS_STATUS = 2,
diff --git a/test/smoke/src/areas/terminal/terminal.ts b/test/smoke/src/areas/terminal/terminal.ts
index baeae18556d..5c67cf5a9d6 100644
--- a/test/smoke/src/areas/terminal/terminal.ts
+++ b/test/smoke/src/areas/terminal/terminal.ts
@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { Code } from '../../vscode/code';
+import { QuickOpen } from '../quickopen/quickopen';
 
 const PANEL_SELECTOR = 'div[id="workbench.panel.terminal"]';
 const XTERM_SELECTOR = `${PANEL_SELECTOR} .terminal-wrapper`;
@@ -11,10 +12,10 @@ const XTERM_TEXTAREA = `${XTERM_SELECTOR} textarea.xterm-helper-textarea`;
 
 export class Terminal {
 
-	constructor(private code: Code) { }
+	constructor(private code: Code, private quickopen: QuickOpen) { }
 
 	async showTerminal(): Promise<void> {
-		await this.code.dispatchKeybinding('ctrl+`');
+		await this.quickopen.runCommand('View: Toggle Integrated Terminal');
 		await this.code.waitForActiveElement(XTERM_TEXTAREA);
 		await this.code.waitForTerminalBuffer(XTERM_SELECTOR, lines => lines.some(line => line.length > 0));
 	}
diff --git a/test/smoke/src/areas/workbench/localization.test.ts b/test/smoke/src/areas/workbench/localization.test.ts
index ea7a25bf8cf..dace3cc683e 100644
--- a/test/smoke/src/areas/workbench/localization.test.ts
+++ b/test/smoke/src/areas/workbench/localization.test.ts
@@ -14,6 +14,10 @@ export function setup() {
 				return;
 			}
 
+			const extensionName = 'German Language Pack for Visual Studio Code';
+			await app.workbench.extensions.openExtensionsViewlet();
+			await app.workbench.extensions.installExtension(extensionName);
+
 			await app.restart({ extraArgs: ['--locale=DE'] });
 		});
 
diff --git a/test/smoke/src/areas/workbench/viewlet.ts b/test/smoke/src/areas/workbench/viewlet.ts
index 2293752b705..84ccb601012 100644
--- a/test/smoke/src/areas/workbench/viewlet.ts
+++ b/test/smoke/src/areas/workbench/viewlet.ts
@@ -12,6 +12,6 @@ export abstract class Viewlet {
 	constructor(protected code: Code) { }
 
 	async waitForTitle(fn: (title: string) => boolean): Promise<void> {
-		await this.code.waitForTextContent('.monaco-workbench-container .part.sidebar > .title > .title-label > span', undefined, fn);
+		await this.code.waitForTextContent('.monaco-workbench .part.sidebar > .title > .title-label > h2', undefined, fn);
 	}
 }
\ No newline at end of file
diff --git a/test/smoke/src/areas/workbench/workbench.ts b/test/smoke/src/areas/workbench/workbench.ts
index 005265f912c..1cb7a5023a0 100644
--- a/test/smoke/src/areas/workbench/workbench.ts
+++ b/test/smoke/src/areas/workbench/workbench.ts
@@ -57,7 +57,7 @@ export class Workbench {
 		this.problems = new Problems(code);
 		this.settingsEditor = new SettingsEditor(code, userDataPath, this.editors, this.editor, this.quickopen);
 		this.keybindingsEditor = new KeybindingsEditor(code);
-		this.terminal = new Terminal(code);
+		this.terminal = new Terminal(code, this.quickopen);
 	}
 }
 
diff --git a/test/smoke/src/main.ts b/test/smoke/src/main.ts
index 6ca50fe319c..dd17406a724 100644
--- a/test/smoke/src/main.ts
+++ b/test/smoke/src/main.ts
@@ -273,7 +273,7 @@ describe('Test', () => {
 
 			const app = this.app as Application;
 			const raw = await app.capturePage();
-			const buffer = new Buffer(raw, 'base64');
+			const buffer = Buffer.from(raw, 'base64');
 
 			const name = this.currentTest.fullTitle().replace(/[^a-z0-9\-]/ig, '_');
 			const screenshotPath = path.join(screenshotsPath, `${name}.png`);
diff --git a/test/smoke/src/vscode/code.ts b/test/smoke/src/vscode/code.ts
index cfc4dd74c80..612405b948c 100644
--- a/test/smoke/src/vscode/code.ts
+++ b/test/smoke/src/vscode/code.ts
@@ -195,6 +195,10 @@ export class Code {
 	) {
 		this.driver = new Proxy(driver, {
 			get(target, prop, receiver) {
+				if (typeof prop === 'symbol') {
+					throw new Error('Invalid usage');
+				}
+
 				if (typeof target[prop] !== 'function') {
 					return target[prop];
 				}
diff --git a/test/smoke/src/vscode/driver.js b/test/smoke/src/vscode/driver.js
index 24af32d436f..1da40e42b06 100644
--- a/test/smoke/src/vscode/driver.js
+++ b/test/smoke/src/vscode/driver.js
@@ -7,6 +7,6 @@ const path = require('path');
 
 exports.connect = function (outPath, handle) {
 	const bootstrapPath = path.join(outPath, 'bootstrap-amd.js');
-	const { bootstrap } = require(bootstrapPath);
-	return new Promise((c, e) => bootstrap('vs/platform/driver/node/driver', ({ connect }) => connect(handle).then(c, e), e));
+	const { load } = require(bootstrapPath);
+	return new Promise((c, e) => load('vs/platform/driver/node/driver', ({ connect }) => connect(handle).then(c, e), e));
 };
\ No newline at end of file
diff --git a/test/smoke/test/index.js b/test/smoke/test/index.js
new file mode 100644
index 00000000000..71023e7e91f
--- /dev/null
+++ b/test/smoke/test/index.js
@@ -0,0 +1,39 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+const path = require('path');
+const Mocha = require('mocha');
+const minimist = require('minimist');
+
+const suite = 'Smoke Tests';
+
+const [, , ...args] = process.argv;
+const opts = minimist(args, {
+	string: [
+		'f'
+	]
+});
+
+const options = {
+	useColors: true,
+	timeout: 60000,
+	slow: 30000,
+	grep: opts['f']
+};
+
+if (process.env.BUILD_ARTIFACTSTAGINGDIRECTORY) {
+	options.reporter = 'mocha-multi-reporters';
+	options.reporterOptions = {
+		reporterEnabled: 'spec, mocha-junit-reporter',
+		mochaJunitReporterReporterOptions: {
+			testsuitesTitle: `${suite} ${process.platform}`,
+			mochaFile: path.join(process.env.BUILD_ARTIFACTSTAGINGDIRECTORY, `test-results/${process.platform}-${suite.toLowerCase().replace(/[^\w]/g, '-')}-results.xml`)
+		}
+	};
+}
+
+const mocha = new Mocha(options);
+mocha.addFile('out/main.js');
+mocha.run(failures => process.exit(failures ? -1 : 0));
diff --git a/test/smoke/test/mocha.opts b/test/smoke/test/mocha.opts
deleted file mode 100644
index 7448824a9a6..00000000000
--- a/test/smoke/test/mocha.opts
+++ /dev/null
@@ -1,3 +0,0 @@
---timeout 60000
---slow 30000
-out/main.js
\ No newline at end of file
diff --git a/test/smoke/tools/copy-driver-definition.js b/test/smoke/tools/copy-driver-definition.js
index fedf0c28432..643e60a67fe 100644
--- a/test/smoke/tools/copy-driver-definition.js
+++ b/test/smoke/tools/copy-driver-definition.js
@@ -7,7 +7,7 @@ const fs = require('fs');
 const path = require('path');
 
 const root = path.dirname(path.dirname(path.dirname(__dirname)));
-const driverPath = path.join(root, 'src/vs/platform/driver/common/driver.ts');
+const driverPath = path.join(root, 'src/vs/platform/driver/node/driver.ts');
 
 let contents = fs.readFileSync(driverPath, 'utf8');
 contents = /\/\/\*START([\s\S]*)\/\/\*END/mi.exec(contents)[1].trim();
diff --git a/test/smoke/yarn.lock b/test/smoke/yarn.lock
index 2f15aec3278..57ac002dedb 100644
--- a/test/smoke/yarn.lock
+++ b/test/smoke/yarn.lock
@@ -41,9 +41,9 @@
   version "8.0.33"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.33.tgz#1126e94374014e54478092830704f6ea89df04cd"
 
-"@types/node@^7.0.18":
-  version "7.0.46"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.46.tgz#c3dedd25558c676b3d6303e51799abb9c3f8f314"
+"@types/node@^8.0.24":
+  version "8.10.23"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-8.10.23.tgz#e5ccfdafff42af5397c29669b6d7d65f7d629a00"
 
 "@types/rimraf@2.0.2":
   version "2.0.2"
@@ -86,6 +86,10 @@ ansi-regex@^2.0.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
 
+ansi-regex@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
+
 ansi-styles@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-1.1.0.tgz#eaecbf66cd706882760b2f4691582b8f55d7a7de"
@@ -238,9 +242,9 @@ braces@^1.8.2:
     preserve "^0.2.0"
     repeat-element "^1.1.2"
 
-browser-stdout@1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.0.tgz#f351d32969d32fa5d7a5567154263d928ae3bd1f"
+browser-stdout@1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.1.tgz#baa559ee14ced73452229bad7326467c61fabd60"
 
 builtin-modules@^1.0.0:
   version "1.1.1"
@@ -271,6 +275,10 @@ chalk@0.5.1:
     strip-ansi "^0.3.0"
     supports-color "^0.2.0"
 
+charenc@~0.0.1:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/charenc/-/charenc-0.0.2.tgz#c0a1d2f3a7092e03774bfa83f14c0fc5790a8667"
+
 chokidar@^1.6.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468"
@@ -300,16 +308,14 @@ combined-stream@^1.0.5, combined-stream@~1.0.5:
   dependencies:
     delayed-stream "~1.0.0"
 
+commander@2.15.1:
+  version "2.15.1"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.15.1.tgz#df46e867d0fc2aec66a34662b406a9ccafff5b0f"
+
 commander@2.6.0:
   version "2.6.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.6.0.tgz#9df7e52fb2a0cb0fb89058ee80c3104225f37e1d"
 
-commander@2.9.0:
-  version "2.9.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.9.0.tgz#9c99094176e12240cb22d6c5146098400fe0f7d4"
-  dependencies:
-    graceful-readlink ">= 1.0.0"
-
 commander@^2.8.1:
   version "2.11.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.11.0.tgz#157152fd1e7a6c8d98a5b715cf376df928004563"
@@ -367,6 +373,10 @@ cpx@^1.5.0:
     shell-quote "^1.6.1"
     subarg "^1.0.0"
 
+crypt@~0.0.1:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/crypt/-/crypt-0.0.2.tgz#88d7ff7ec0dfb86f713dc87bbb42d044d3e6c41b"
+
 cryptiles@2.x.x:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-2.0.5.tgz#3bdfecdc608147c1c67202fa291e7dca59eaa3b8"
@@ -395,18 +405,18 @@ date-fns@^1.23.0:
   version "1.29.0"
   resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-1.29.0.tgz#12e609cdcb935127311d04d33334e2960a2a54e6"
 
-debug@2.6.8:
-  version "2.6.8"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.8.tgz#e731531ca2ede27d188222427da17821d68ff4fc"
-  dependencies:
-    ms "2.0.0"
-
 debug@2.6.9, debug@^2.1.3, debug@^2.2.0:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
   dependencies:
     ms "2.0.0"
 
+debug@3.1.0, debug@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
+  dependencies:
+    ms "2.0.0"
+
 decamelize@^1.1.2:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
@@ -427,9 +437,9 @@ detect-libc@^1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
 
-diff@3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/diff/-/diff-3.2.0.tgz#c9ce393a4b7cbd0b058a725c93df299027868ff9"
+diff@3.5.0:
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
 
 dom-serializer@0:
   version "0.1.0"
@@ -483,11 +493,11 @@ electron-download@^3.0.1:
     semver "^5.3.0"
     sumchecker "^1.2.0"
 
-electron@1.7.7:
-  version "1.7.7"
-  resolved "https://registry.yarnpkg.com/electron/-/electron-1.7.7.tgz#cfd89ca9eba79d763ac0b0c6dcc583792097b9b6"
+electron@^2.0.6:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/electron/-/electron-2.0.6.tgz#8e5c1bd2ebc08fa7a6ee906de3753c1ece9d7300"
   dependencies:
-    "@types/node" "^7.0.18"
+    "@types/node" "^8.0.24"
     electron-download "^3.0.1"
     extract-zip "^1.0.3"
 
@@ -699,18 +709,7 @@ glob2base@^0.0.12:
   dependencies:
     find-index "^0.1.1"
 
-glob@7.1.1:
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.1.tgz#805211df04faaf1c63a3600306cdf5ade50b2ec8"
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.0.2"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
-glob@^7.0.5:
+glob@7.1.2, glob@^7.0.5:
   version "7.1.2"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
   dependencies:
@@ -725,13 +724,9 @@ graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.1.9:
   version "4.1.11"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
 
-"graceful-readlink@>= 1.0.0":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725"
-
-growl@1.9.2:
-  version "1.9.2"
-  resolved "https://registry.yarnpkg.com/growl/-/growl-1.9.2.tgz#0ea7743715db8d8de2c5ede1775e1b45ac85c02f"
+growl@1.10.5:
+  version "1.10.5"
+  resolved "https://registry.yarnpkg.com/growl/-/growl-1.10.5.tgz#f2735dc2283674fa67478b10181059355c369e5e"
 
 har-schema@^1.0.5:
   version "1.0.5"
@@ -765,6 +760,10 @@ has-flag@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-1.0.0.tgz#9d9e793165ce017a00f00418c43f942a7b1d11fa"
 
+has-flag@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
+
 has-unicode@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
@@ -865,7 +864,7 @@ is-binary-path@^1.0.0:
   dependencies:
     binary-extensions "^1.0.0"
 
-is-buffer@^1.1.5:
+is-buffer@^1.1.5, is-buffer@~1.1.1:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
 
@@ -979,10 +978,6 @@ json-stringify-safe@~5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
 
-json3@3.3.2:
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.2.tgz#3c0434743df93e2f5c42aee7b19bcb483575f4e1"
-
 jsonfile@^2.1.0:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-2.4.0.tgz#3736a2b428b87bbda0cc83b53fa3d633a35c2ae8"
@@ -1030,52 +1025,9 @@ load-json-file@^1.0.0:
     pinkie-promise "^2.0.0"
     strip-bom "^2.0.0"
 
-lodash._baseassign@^3.0.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz#8c38a099500f215ad09e59f1722fd0c52bfe0a4e"
-  dependencies:
-    lodash._basecopy "^3.0.0"
-    lodash.keys "^3.0.0"
-
-lodash._basecopy@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz#8da0e6a876cf344c0ad8a54882111dd3c5c7ca36"
-
-lodash._basecreate@^3.0.0:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/lodash._basecreate/-/lodash._basecreate-3.0.3.tgz#1bc661614daa7fc311b7d03bf16806a0213cf821"
-
-lodash._getnative@^3.0.0:
-  version "3.9.1"
-  resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5"
-
-lodash._isiterateecall@^3.0.0:
-  version "3.0.9"
-  resolved "https://registry.yarnpkg.com/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz#5203ad7ba425fae842460e696db9cf3e6aac057c"
-
-lodash.create@3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/lodash.create/-/lodash.create-3.1.1.tgz#d7f2849f0dbda7e04682bb8cd72ab022461debe7"
-  dependencies:
-    lodash._baseassign "^3.0.0"
-    lodash._basecreate "^3.0.0"
-    lodash._isiterateecall "^3.0.0"
-
-lodash.isarguments@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz#2f573d85c6a24289ff00663b491c1d338ff3458a"
-
-lodash.isarray@^3.0.0:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/lodash.isarray/-/lodash.isarray-3.0.4.tgz#79e4eb88c36a8122af86f844aa9bcd851b5fbb55"
-
-lodash.keys@^3.0.0:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/lodash.keys/-/lodash.keys-3.1.2.tgz#4dbc0472b156be50a0b286855d1bd0b0c656098a"
-  dependencies:
-    lodash._getnative "^3.0.0"
-    lodash.isarguments "^3.0.0"
-    lodash.isarray "^3.0.0"
+lodash@^4.16.4:
+  version "4.17.10"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"
 
 lodash@^4.5.1:
   version "4.17.5"
@@ -1092,6 +1044,14 @@ map-obj@^1.0.0, map-obj@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d"
 
+md5@^2.1.0:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/md5/-/md5-2.2.1.tgz#53ab38d5fe3c8891ba465329ea23fac0540126f9"
+  dependencies:
+    charenc "~0.0.1"
+    crypt "~0.0.1"
+    is-buffer "~1.1.1"
+
 meow@^3.1.0:
   version "3.7.0"
   resolved "https://registry.yarnpkg.com/meow/-/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb"
@@ -1149,7 +1109,7 @@ mime-types@~2.1.7:
   dependencies:
     mime-db "~1.33.0"
 
-minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.4:
+minimatch@3.0.4, minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
   dependencies:
@@ -1169,28 +1129,44 @@ mkdirp@0.5.0:
   dependencies:
     minimist "0.0.8"
 
-mkdirp@0.5.1, "mkdirp@>=0.5 0", mkdirp@^0.5.1:
+mkdirp@0.5.1, "mkdirp@>=0.5 0", mkdirp@^0.5.1, mkdirp@~0.5.1:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
   dependencies:
     minimist "0.0.8"
 
-mocha@^3.2.0:
-  version "3.5.3"
-  resolved "https://registry.yarnpkg.com/mocha/-/mocha-3.5.3.tgz#1e0480fe36d2da5858d1eb6acc38418b26eaa20d"
+mocha-junit-reporter@^1.17.0:
+  version "1.17.0"
+  resolved "https://registry.yarnpkg.com/mocha-junit-reporter/-/mocha-junit-reporter-1.17.0.tgz#2e5149ed40fc5d2e3ca71e42db5ab1fec9c6d85c"
   dependencies:
-    browser-stdout "1.3.0"
-    commander "2.9.0"
-    debug "2.6.8"
-    diff "3.2.0"
+    debug "^2.2.0"
+    md5 "^2.1.0"
+    mkdirp "~0.5.1"
+    strip-ansi "^4.0.0"
+    xml "^1.0.0"
+
+mocha-multi-reporters@^1.1.7:
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/mocha-multi-reporters/-/mocha-multi-reporters-1.1.7.tgz#cc7f3f4d32f478520941d852abb64d9988587d82"
+  dependencies:
+    debug "^3.1.0"
+    lodash "^4.16.4"
+
+mocha@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/mocha/-/mocha-5.2.0.tgz#6d8ae508f59167f940f2b5b3c4a612ae50c90ae6"
+  dependencies:
+    browser-stdout "1.3.1"
+    commander "2.15.1"
+    debug "3.1.0"
+    diff "3.5.0"
     escape-string-regexp "1.0.5"
-    glob "7.1.1"
-    growl "1.9.2"
+    glob "7.1.2"
+    growl "1.10.5"
     he "1.1.1"
-    json3 "3.3.2"
-    lodash.create "3.1.1"
+    minimatch "3.0.4"
     mkdirp "0.5.1"
-    supports-color "3.1.2"
+    supports-color "5.4.0"
 
 ms@2.0.0:
   version "2.0.0"
@@ -1726,6 +1702,12 @@ strip-ansi@^3.0.0, strip-ansi@^3.0.1:
   dependencies:
     ansi-regex "^2.0.0"
 
+strip-ansi@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
+  dependencies:
+    ansi-regex "^3.0.0"
+
 strip-bom@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e"
@@ -1755,11 +1737,11 @@ sumchecker@^1.2.0:
     debug "^2.2.0"
     es6-promise "^4.0.5"
 
-supports-color@3.1.2:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.1.2.tgz#72a262894d9d408b956ca05ff37b2ed8a6e2a2d5"
+supports-color@5.4.0:
+  version "5.4.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.4.0.tgz#1c6b337402c2137605efe19f10fec390f6faab54"
   dependencies:
-    has-flag "^1.0.0"
+    has-flag "^3.0.0"
 
 supports-color@^0.2.0:
   version "0.2.0"
@@ -1843,9 +1825,9 @@ typedarray@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
 
-typescript@2.5.2:
-  version "2.5.2"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.5.2.tgz#038a95f7d9bbb420b1bf35ba31d4c5c1dd3ffe34"
+typescript@2.9.2:
+  version "2.9.2"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.9.2.tgz#1cbf61d05d6b96269244eb6a3bce4bd914e0f00c"
 
 uid-number@^0.0.6:
   version "0.0.6"
@@ -1895,6 +1877,10 @@ wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
 
+xml@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/xml/-/xml-1.0.1.tgz#78ba72020029c5bc87b8a81a3cfcd74b4a2fc1e5"
+
 xtend@~2.1.1:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-2.1.2.tgz#6efecc2a4dad8e6962c4901b337ce7ba87b5d28b"
diff --git a/test/tree/package.json b/test/tree/package.json
new file mode 100644
index 00000000000..6826810e73e
--- /dev/null
+++ b/test/tree/package.json
@@ -0,0 +1,13 @@
+{
+  "name": "tree",
+  "version": "1.0.0",
+  "main": "index.js",
+  "license": "MIT",
+  "dependencies": {
+    "koa": "^2.5.1",
+    "koa-mount": "^3.0.0",
+    "koa-route": "^3.2.0",
+    "koa-static": "^5.0.0",
+    "mz": "^2.7.0"
+  }
+}
diff --git a/test/tree/public/index.html b/test/tree/public/index.html
new file mode 100644
index 00000000000..3716374c0de
--- /dev/null
+++ b/test/tree/public/index.html
@@ -0,0 +1,66 @@
+<html>
+
+<head>
+	<meta charset="utf-8">
+	<title>Tree</title>
+	<style>
+		#container {
+			width: 400;
+			height: 600;
+			border: 1px solid black;
+		}
+
+		.monaco-scrollable-element>.scrollbar>.slider {
+			background: rgba(100, 100, 100, .4);
+		}
+
+		.tl-contents {
+			flex: 1;
+		}
+	</style>
+</head>
+
+<body>
+	<div id="container"></div>
+
+	<script src="/static/vs/loader.js"></script>
+	<script>
+		require.config({ baseUrl: '/static' });
+
+		require(['vs/base/browser/ui/tree/tree', 'vs/base/common/iterator'], ({ Tree }, { iter }) => {
+			const delegate = {
+				getHeight() { return 22; },
+				getTemplateId() { return 'template'; }
+			};
+
+			const renderer = {
+				templateId: 'template',
+				renderTemplate(container) { return container; },
+				renderElement(element, index, container) {
+					container.textContent = element;
+				},
+				disposeTemplate() { }
+			};
+
+			const tree = new Tree(container, delegate, [renderer]);
+
+			const xhr = new XMLHttpRequest();
+			xhr.open('GET', '/api/ls?path=');
+			xhr.send();
+			xhr.onreadystatechange = function () {
+				if (this.readyState == 4 && this.status == 200) {
+					const data = JSON.parse(this.responseText);
+
+					performance.mark('before splice');
+					const start = performance.now();
+					tree.splice([0], 0, [data]);
+					console.log('splice took', performance.now() - start);
+					performance.mark('after splice');
+
+				}
+			};
+		});
+	</script>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/test/tree/server.js b/test/tree/server.js
new file mode 100644
index 00000000000..11ac8e1ac9b
--- /dev/null
+++ b/test/tree/server.js
@@ -0,0 +1,39 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+const fs = require('mz/fs');
+const path = require('path');
+const Koa = require('koa');
+const _ = require('koa-route');
+const serve = require('koa-static');
+const mount = require('koa-mount');
+
+const app = new Koa();
+const root = path.dirname(path.dirname(__dirname));
+
+async function getTree(fsPath, level) {
+	const element = path.basename(fsPath);
+	const stat = await fs.stat(fsPath);
+
+	if (!stat.isDirectory() || element === '.git' || element === '.build' || level >= 4) {
+		return { element };
+	}
+
+	const childNames = await fs.readdir(fsPath);
+	const children = await Promise.all(childNames.map(async childName => await getTree(path.join(fsPath, childName), level + 1)));
+	return { element, collapsible: true, collapsed: false, children };
+}
+
+app.use(serve('public'));
+app.use(mount('/static', serve('../../out')));
+app.use(_.get('/api/ls', async ctx => {
+	const relativePath = ctx.query.path;
+	const absolutePath = path.join(root, relativePath);
+
+	ctx.body = await getTree(absolutePath, 0);
+}))
+
+app.listen(3000);
+console.log('http://localhost:3000');
\ No newline at end of file
diff --git a/test/tree/yarn.lock b/test/tree/yarn.lock
new file mode 100644
index 00000000000..8ed55756e19
--- /dev/null
+++ b/test/tree/yarn.lock
@@ -0,0 +1,290 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+accepts@^1.2.2:
+  version "1.3.5"
+  resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.5.tgz#eb777df6011723a3b14e8a72c0805c8e86746bd2"
+  dependencies:
+    mime-types "~2.1.18"
+    negotiator "0.6.1"
+
+any-promise@^1.0.0, any-promise@^1.1.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f"
+
+co@^4.6.0:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
+
+content-disposition@~0.5.0:
+  version "0.5.2"
+  resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.2.tgz#0cf68bb9ddf5f2be7961c3a85178cb85dba78cb4"
+
+content-type@^1.0.0:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
+
+cookies@~0.7.0:
+  version "0.7.1"
+  resolved "https://registry.yarnpkg.com/cookies/-/cookies-0.7.1.tgz#7c8a615f5481c61ab9f16c833731bcb8f663b99b"
+  dependencies:
+    depd "~1.1.1"
+    keygrip "~1.0.2"
+
+debug@*, debug@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
+  dependencies:
+    ms "2.0.0"
+
+debug@^2.6.1:
+  version "2.6.9"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
+  dependencies:
+    ms "2.0.0"
+
+deep-equal@~1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.0.1.tgz#f5d260292b660e084eff4cdbc9f08ad3247448b5"
+
+delegates@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
+
+depd@^1.1.0, depd@~1.1.1, depd@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
+
+destroy@^1.0.3:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80"
+
+ee-first@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
+
+error-inject@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/error-inject/-/error-inject-1.0.0.tgz#e2b3d91b54aed672f309d950d154850fa11d4f37"
+
+escape-html@~1.0.1:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
+
+fresh@^0.5.2:
+  version "0.5.2"
+  resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
+
+http-assert@^1.1.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/http-assert/-/http-assert-1.3.0.tgz#a31a5cf88c873ecbb5796907d4d6f132e8c01e4a"
+  dependencies:
+    deep-equal "~1.0.1"
+    http-errors "~1.6.1"
+
+http-errors@^1.2.8, http-errors@^1.6.3, http-errors@~1.6.1, http-errors@~1.6.2:
+  version "1.6.3"
+  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d"
+  dependencies:
+    depd "~1.1.2"
+    inherits "2.0.3"
+    setprototypeof "1.1.0"
+    statuses ">= 1.4.0 < 2"
+
+inherits@2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
+
+is-generator-function@^1.0.3:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/is-generator-function/-/is-generator-function-1.0.7.tgz#d2132e529bb0000a7f80794d4bdf5cd5e5813522"
+
+isarray@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
+
+keygrip@~1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/keygrip/-/keygrip-1.0.2.tgz#ad3297c557069dea8bcfe7a4fa491b75c5ddeb91"
+
+koa-compose@^3.0.0, koa-compose@^3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/koa-compose/-/koa-compose-3.2.1.tgz#a85ccb40b7d986d8e5a345b3a1ace8eabcf54de7"
+  dependencies:
+    any-promise "^1.1.0"
+
+koa-compose@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/koa-compose/-/koa-compose-4.1.0.tgz#507306b9371901db41121c812e923d0d67d3e877"
+
+koa-convert@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/koa-convert/-/koa-convert-1.2.0.tgz#da40875df49de0539098d1700b50820cebcd21d0"
+  dependencies:
+    co "^4.6.0"
+    koa-compose "^3.0.0"
+
+koa-is-json@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/koa-is-json/-/koa-is-json-1.0.0.tgz#273c07edcdcb8df6a2c1ab7d59ee76491451ec14"
+
+koa-mount@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/koa-mount/-/koa-mount-3.0.0.tgz#08cab3b83d31442ed8b7e75c54b1abeb922ec197"
+  dependencies:
+    debug "^2.6.1"
+    koa-compose "^3.2.1"
+
+koa-route@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/koa-route/-/koa-route-3.2.0.tgz#76298b99a6bcfa9e38cab6fe5c79a8733e758bce"
+  dependencies:
+    debug "*"
+    methods "~1.1.0"
+    path-to-regexp "^1.2.0"
+
+koa-send@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/koa-send/-/koa-send-5.0.0.tgz#5e8441e07ef55737734d7ced25b842e50646e7eb"
+  dependencies:
+    debug "^3.1.0"
+    http-errors "^1.6.3"
+    mz "^2.7.0"
+    resolve-path "^1.4.0"
+
+koa-static@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/koa-static/-/koa-static-5.0.0.tgz#5e92fc96b537ad5219f425319c95b64772776943"
+  dependencies:
+    debug "^3.1.0"
+    koa-send "^5.0.0"
+
+koa@^2.5.1:
+  version "2.5.1"
+  resolved "https://registry.yarnpkg.com/koa/-/koa-2.5.1.tgz#79f8b95f8d72d04fe9a58a8da5ebd6d341103f9c"
+  dependencies:
+    accepts "^1.2.2"
+    content-disposition "~0.5.0"
+    content-type "^1.0.0"
+    cookies "~0.7.0"
+    debug "*"
+    delegates "^1.0.0"
+    depd "^1.1.0"
+    destroy "^1.0.3"
+    error-inject "~1.0.0"
+    escape-html "~1.0.1"
+    fresh "^0.5.2"
+    http-assert "^1.1.0"
+    http-errors "^1.2.8"
+    is-generator-function "^1.0.3"
+    koa-compose "^4.0.0"
+    koa-convert "^1.2.0"
+    koa-is-json "^1.0.0"
+    mime-types "^2.0.7"
+    on-finished "^2.1.0"
+    only "0.0.2"
+    parseurl "^1.3.0"
+    statuses "^1.2.0"
+    type-is "^1.5.5"
+    vary "^1.0.0"
+
+media-typer@0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
+
+methods@~1.1.0:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
+
+mime-db@~1.33.0:
+  version "1.33.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.33.0.tgz#a3492050a5cb9b63450541e39d9788d2272783db"
+
+mime-types@^2.0.7, mime-types@~2.1.18:
+  version "2.1.18"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.18.tgz#6f323f60a83d11146f831ff11fd66e2fe5503bb8"
+  dependencies:
+    mime-db "~1.33.0"
+
+ms@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
+
+mz@^2.7.0:
+  version "2.7.0"
+  resolved "https://registry.yarnpkg.com/mz/-/mz-2.7.0.tgz#95008057a56cafadc2bc63dde7f9ff6955948e32"
+  dependencies:
+    any-promise "^1.0.0"
+    object-assign "^4.0.1"
+    thenify-all "^1.0.0"
+
+negotiator@0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9"
+
+object-assign@^4.0.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
+
+on-finished@^2.1.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947"
+  dependencies:
+    ee-first "1.1.1"
+
+only@0.0.2:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/only/-/only-0.0.2.tgz#2afde84d03e50b9a8edc444e30610a70295edfb4"
+
+parseurl@^1.3.0:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.2.tgz#fc289d4ed8993119460c156253262cdc8de65bf3"
+
+path-is-absolute@1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
+
+path-to-regexp@^1.2.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-1.7.0.tgz#59fde0f435badacba103a84e9d3bc64e96b9937d"
+  dependencies:
+    isarray "0.0.1"
+
+resolve-path@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/resolve-path/-/resolve-path-1.4.0.tgz#c4bda9f5efb2fce65247873ab36bb4d834fe16f7"
+  dependencies:
+    http-errors "~1.6.2"
+    path-is-absolute "1.0.1"
+
+setprototypeof@1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656"
+
+"statuses@>= 1.4.0 < 2", statuses@^1.2.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
+
+thenify-all@^1.0.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/thenify-all/-/thenify-all-1.6.0.tgz#1a1918d402d8fc3f98fbf234db0bcc8cc10e9726"
+  dependencies:
+    thenify ">= 3.1.0 < 4"
+
+"thenify@>= 3.1.0 < 4":
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/thenify/-/thenify-3.3.0.tgz#e69e38a1babe969b0108207978b9f62b88604839"
+  dependencies:
+    any-promise "^1.0.0"
+
+type-is@^1.5.5:
+  version "1.6.16"
+  resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.16.tgz#f89ce341541c672b25ee7ae3c73dee3b2be50194"
+  dependencies:
+    media-typer "0.3.0"
+    mime-types "~2.1.18"
+
+vary@^1.0.0:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
diff --git a/tslint.json b/tslint.json
index 1fcafd325b6..7f1388dfa76 100644
--- a/tslint.json
+++ b/tslint.json
@@ -51,7 +51,6 @@
 			// !!! Do not relax these rules !!!
 			// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 			{
-				// vs/base/common cannot depend on anything else
 				"target": "**/vs/base/common/**",
 				"restrictions": [
 					"vs/nls",
@@ -59,7 +58,6 @@
 				]
 			},
 			{
-				// vs/base/test/common contains tests for vs/base/common
 				"target": "**/vs/base/test/common/**",
 				"restrictions": [
 					"assert",
@@ -69,7 +67,6 @@
 				]
 			},
 			{
-				// vs/base/browser can only depend on vs/base/common
 				"target": "**/vs/base/browser/**",
 				"restrictions": [
 					"vs/nls",
@@ -77,6 +74,14 @@
 					"**/vs/base/{common,browser}/**"
 				]
 			},
+			{
+				"target": "**/vs/base/node/**",
+				"restrictions": [
+					"vs/nls",
+					"**/vs/base/{common,browser,node}/**",
+					"*" // node modules
+				]
+			},
 			{
 				// vs/base/test/browser contains tests for vs/base/browser
 				"target": "**/vs/base/test/browser/**",
@@ -104,6 +109,34 @@
 					"**/vs/base/parts/*/{common,browser}/**"
 				]
 			},
+			{
+				"target": "**/vs/base/parts/*/node/**",
+				"restrictions": [
+					"vs/nls",
+					"**/vs/base/{common,browser,node}/**",
+					"**/vs/base/parts/*/{common,browser,node}/**",
+					"*" // node modules
+				]
+			},
+			{
+				"target": "**/vs/base/parts/*/electron-browser/**",
+				"restrictions": [
+					"vs/nls",
+					"vs/css!./**/*",
+					"**/vs/base/{common,browser,node,electron-browser}/**",
+					"**/vs/base/parts/*/{common,browser,node,electron-browser}/**",
+					"*" // node modules
+				]
+			},
+			{
+				"target": "**/vs/base/parts/*/electron-main/**",
+				"restrictions": [
+					"vs/nls",
+					"**/vs/base/{common,browser,node,electron-main}/**",
+					"**/vs/base/parts/*/{common,browser,node,electron-main}/**",
+					"*" // node modules
+				]
+			},
 			{
 				"target": "**/vs/platform/*/common/**",
 				"restrictions": [
@@ -134,6 +167,40 @@
 					"**/vs/platform/*/{common,browser}/**"
 				]
 			},
+			{
+				"target": "**/vs/platform/*/node/**",
+				"restrictions": [
+					"vs/nls",
+					"**/vs/base/{common,browser,node}/**",
+					"**/vs/base/parts/*/{common,browser,node}/**",
+					"**/vs/platform/node/*",
+					"**/vs/platform/*/{common,browser,node}/**",
+					"*" // node modules
+				]
+			},
+			{
+				"target": "**/vs/platform/*/electron-browser/**",
+				"restrictions": [
+					"vs/nls",
+					"vs/css!./**/*",
+					"**/vs/base/{common,browser,node}/**",
+					"**/vs/base/parts/*/{common,browser,node,electron-browser}/**",
+					"**/vs/platform/node/*",
+					"**/vs/platform/*/{common,browser,node,electron-browser}/**",
+					"*" // node modules
+				]
+			},
+			{
+				"target": "**/vs/platform/*/electron-main/**",
+				"restrictions": [
+					"vs/nls",
+					"**/vs/base/{common,browser,node}/**",
+					"**/vs/base/parts/*/{common,browser,node,electron-browser}/**",
+					"**/vs/platform/node/*",
+					"**/vs/platform/*/{common,browser,node,electron-main}/**",
+					"*" // node modules
+				]
+			},
 			{
 				"target": "**/vs/platform/*/test/browser/**",
 				"restrictions": [
@@ -268,7 +335,6 @@
 				"target": "**/vs/workbench/common/**",
 				"restrictions": [
 					"vs/nls",
-					"vs/css!./**/*",
 					"**/vs/base/common/**",
 					"**/vs/base/parts/*/common/**",
 					"**/vs/platform/*/common/**",
@@ -320,7 +386,6 @@
 				"target": "**/vs/workbench/node/**",
 				"restrictions": [
 					"vs/nls",
-					"vs/css!./**/*",
 					"**/vs/base/{common,node}/**",
 					"**/vs/base/parts/*/{common,node}/**",
 					"**/vs/platform/node/**",
@@ -351,7 +416,6 @@
 				"target": "**/vs/workbench/services/**/common/**",
 				"restrictions": [
 					"vs/nls",
-					"vs/css!./**/*",
 					"**/vs/base/**/common/**",
 					"**/vs/platform/**/common/**",
 					"**/vs/editor/common/**",
@@ -375,7 +439,6 @@
 				"target": "**/vs/workbench/services/**/node/**",
 				"restrictions": [
 					"vs/nls",
-					"vs/css!./**/*",
 					"**/vs/base/**/{common,node}/**",
 					"**/vs/platform/**/{common,node}/**",
 					"**/vs/editor/{common,node}/**",
@@ -398,14 +461,13 @@
 				]
 			},
 			{
-				"target": "**/vs/code/electron-browser/**",
+				"target": "**/vs/code/node/**",
 				"restrictions": [
 					"vs/nls",
-					"vs/css!./**/*",
-					"vs/nls",
-					"**/vs/base/**",
-					"**/vs/platform/**",
-					"**/vs/code/**",
+					"**/vs/base/**/{common,browser,node}/**",
+					"**/vs/base/parts/**/{common,browser,node}/**",
+					"**/vs/platform/**/{common,browser,node}/**",
+					"**/vs/code/**/{common,browser,node}/**",
 					"*" // node modules
 				]
 			},
@@ -414,20 +476,22 @@
 				"restrictions": [
 					"vs/nls",
 					"vs/css!./**/*",
-					"vs/nls",
-					"**/vs/base/**",
-					"**/vs/platform/**",
-					"**/vs/code/**",
+					"**/vs/base/**/{common,browser,node,electron-browser}/**",
+					"**/vs/base/parts/**/{common,browser,node,electron-browser}/**",
+					"**/vs/platform/**/{common,browser,node,electron-browser}/**",
+					"**/vs/code/**/{common,browser,node,electron-browser}/**",
 					"*" // node modules
 				]
 			},
 			{
-				"target": "**/vs/code/**",
+				"target": "**/vs/code/electron-main/**",
 				"restrictions": [
 					"vs/nls",
-					"**/vs/base/**",
-					"**/vs/platform/**",
-					"**/vs/code/**",
+					"**/vs/base/**/{common,browser,node}/**",
+					"**/vs/base/parts/**/{common,browser,node,electron-main}/**",
+					"**/vs/platform/**/{common,browser,node,electron-main}/**",
+					"**/vs/code/**/{common,browser,node,electron-main}/**",
+					"**/vs/code/code.main",
 					"*" // node modules
 				]
 			},
diff --git a/yarn.lock b/yarn.lock
index cdd6e17f7d7..1045e7659c2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -43,6 +43,161 @@
   version "1.16.34"
   resolved "https://registry.yarnpkg.com/@types/sinon/-/sinon-1.16.34.tgz#a9761fff33d0f7b3fe61875b577778a2576a9a03"
 
+"@types/tapable@*":
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/@types/tapable/-/tapable-1.0.4.tgz#b4ffc7dc97b498c969b360a41eee247f82616370"
+
+"@types/uglify-js@*":
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/@types/uglify-js/-/uglify-js-3.0.3.tgz#801a5ca1dc642861f47c46d14b700ed2d610840b"
+  dependencies:
+    source-map "^0.6.1"
+
+"@types/webpack@^4.4.10":
+  version "4.4.10"
+  resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.4.10.tgz#2ecf12589142bc531549140612815b7d8b076358"
+  dependencies:
+    "@types/node" "*"
+    "@types/tapable" "*"
+    "@types/uglify-js" "*"
+    source-map "^0.6.0"
+
+"@webassemblyjs/ast@1.5.13":
+  version "1.5.13"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.5.13.tgz#81155a570bd5803a30ec31436bc2c9c0ede38f25"
+  dependencies:
+    "@webassemblyjs/helper-module-context" "1.5.13"
+    "@webassemblyjs/helper-wasm-bytecode" "1.5.13"
+    "@webassemblyjs/wast-parser" "1.5.13"
+    debug "^3.1.0"
+    mamacro "^0.0.3"
+
+"@webassemblyjs/floating-point-hex-parser@1.5.13":
+  version "1.5.13"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.5.13.tgz#29ce0baa97411f70e8cce68ce9c0f9d819a4e298"
+
+"@webassemblyjs/helper-api-error@1.5.13":
+  version "1.5.13"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.5.13.tgz#e49b051d67ee19a56e29b9aa8bd949b5b4442a59"
+
+"@webassemblyjs/helper-buffer@1.5.13":
+  version "1.5.13"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.5.13.tgz#873bb0a1b46449231137c1262ddfd05695195a1e"
+  dependencies:
+    debug "^3.1.0"
+
+"@webassemblyjs/helper-code-frame@1.5.13":
+  version "1.5.13"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.5.13.tgz#1bd2181b6a0be14e004f0fe9f5a660d265362b58"
+  dependencies:
+    "@webassemblyjs/wast-printer" "1.5.13"
+
+"@webassemblyjs/helper-fsm@1.5.13":
+  version "1.5.13"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.5.13.tgz#cdf3d9d33005d543a5c5e5adaabf679ffa8db924"
+
+"@webassemblyjs/helper-module-context@1.5.13":
+  version "1.5.13"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.5.13.tgz#dc29ddfb51ed657655286f94a5d72d8a489147c5"
+  dependencies:
+    debug "^3.1.0"
+    mamacro "^0.0.3"
+
+"@webassemblyjs/helper-wasm-bytecode@1.5.13":
+  version "1.5.13"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.5.13.tgz#03245817f0a762382e61733146f5773def15a747"
+
+"@webassemblyjs/helper-wasm-section@1.5.13":
+  version "1.5.13"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.5.13.tgz#efc76f44a10d3073b584b43c38a179df173d5c7d"
+  dependencies:
+    "@webassemblyjs/ast" "1.5.13"
+    "@webassemblyjs/helper-buffer" "1.5.13"
+    "@webassemblyjs/helper-wasm-bytecode" "1.5.13"
+    "@webassemblyjs/wasm-gen" "1.5.13"
+    debug "^3.1.0"
+
+"@webassemblyjs/ieee754@1.5.13":
+  version "1.5.13"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.5.13.tgz#573e97c8c12e4eebb316ca5fde0203ddd90b0364"
+  dependencies:
+    ieee754 "^1.1.11"
+
+"@webassemblyjs/leb128@1.5.13":
+  version "1.5.13"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.5.13.tgz#ab52ebab9cec283c1c1897ac1da833a04a3f4cee"
+  dependencies:
+    long "4.0.0"
+
+"@webassemblyjs/utf8@1.5.13":
+  version "1.5.13"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.5.13.tgz#6b53d2cd861cf94fa99c1f12779dde692fbc2469"
+
+"@webassemblyjs/wasm-edit@1.5.13":
+  version "1.5.13"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.5.13.tgz#c9cef5664c245cf11b3b3a73110c9155831724a8"
+  dependencies:
+    "@webassemblyjs/ast" "1.5.13"
+    "@webassemblyjs/helper-buffer" "1.5.13"
+    "@webassemblyjs/helper-wasm-bytecode" "1.5.13"
+    "@webassemblyjs/helper-wasm-section" "1.5.13"
+    "@webassemblyjs/wasm-gen" "1.5.13"
+    "@webassemblyjs/wasm-opt" "1.5.13"
+    "@webassemblyjs/wasm-parser" "1.5.13"
+    "@webassemblyjs/wast-printer" "1.5.13"
+    debug "^3.1.0"
+
+"@webassemblyjs/wasm-gen@1.5.13":
+  version "1.5.13"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.5.13.tgz#8e6ea113c4b432fa66540189e79b16d7a140700e"
+  dependencies:
+    "@webassemblyjs/ast" "1.5.13"
+    "@webassemblyjs/helper-wasm-bytecode" "1.5.13"
+    "@webassemblyjs/ieee754" "1.5.13"
+    "@webassemblyjs/leb128" "1.5.13"
+    "@webassemblyjs/utf8" "1.5.13"
+
+"@webassemblyjs/wasm-opt@1.5.13":
+  version "1.5.13"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.5.13.tgz#147aad7717a7ee4211c36b21a5f4c30dddf33138"
+  dependencies:
+    "@webassemblyjs/ast" "1.5.13"
+    "@webassemblyjs/helper-buffer" "1.5.13"
+    "@webassemblyjs/wasm-gen" "1.5.13"
+    "@webassemblyjs/wasm-parser" "1.5.13"
+    debug "^3.1.0"
+
+"@webassemblyjs/wasm-parser@1.5.13":
+  version "1.5.13"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.5.13.tgz#6f46516c5bb23904fbdf58009233c2dd8a54c72f"
+  dependencies:
+    "@webassemblyjs/ast" "1.5.13"
+    "@webassemblyjs/helper-api-error" "1.5.13"
+    "@webassemblyjs/helper-wasm-bytecode" "1.5.13"
+    "@webassemblyjs/ieee754" "1.5.13"
+    "@webassemblyjs/leb128" "1.5.13"
+    "@webassemblyjs/utf8" "1.5.13"
+
+"@webassemblyjs/wast-parser@1.5.13":
+  version "1.5.13"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.5.13.tgz#5727a705d397ae6a3ae99d7f5460acf2ec646eea"
+  dependencies:
+    "@webassemblyjs/ast" "1.5.13"
+    "@webassemblyjs/floating-point-hex-parser" "1.5.13"
+    "@webassemblyjs/helper-api-error" "1.5.13"
+    "@webassemblyjs/helper-code-frame" "1.5.13"
+    "@webassemblyjs/helper-fsm" "1.5.13"
+    long "^3.2.0"
+    mamacro "^0.0.3"
+
+"@webassemblyjs/wast-printer@1.5.13":
+  version "1.5.13"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.5.13.tgz#bb34d528c14b4f579e7ec11e793ec50ad7cd7c95"
+  dependencies:
+    "@webassemblyjs/ast" "1.5.13"
+    "@webassemblyjs/wast-parser" "1.5.13"
+    long "^3.2.0"
+
 abbrev@1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
@@ -58,6 +213,12 @@ accepts@~1.3.4:
     mime-types "~2.1.16"
     negotiator "0.6.1"
 
+acorn-dynamic-import@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-3.0.0.tgz#901ceee4c7faaef7e07ad2a47e890675da50a278"
+  dependencies:
+    acorn "^5.0.0"
+
 acorn-jsx@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-3.0.1.tgz#afdf9488fb1ecefc8348f6fb22f464e32a58b36b"
@@ -72,6 +233,10 @@ acorn@^3.0.4:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a"
 
+acorn@^5.0.0, acorn@^5.6.2:
+  version "5.7.1"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.1.tgz#f095829297706a7c9776958c0afc8930a9b9d9d8"
+
 acorn@^5.2.1:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.2.1.tgz#317ac7821826c22c702d66189ab8359675f135d7"
@@ -86,6 +251,10 @@ ajv-keywords@^1.0.0:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-1.5.1.tgz#314dd0a4b3368fad3dfcdc54ede6171b886daf3c"
 
+ajv-keywords@^3.1.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.2.0.tgz#e86b819c602cf8821ad637413698f1dec021847a"
+
 ajv@^4.7.0, ajv@^4.9.1:
   version "4.11.8"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.8.tgz#82ffb02b29e662ae53bdc20af15947706739c536"
@@ -102,6 +271,15 @@ ajv@^5.1.0:
     fast-json-stable-stringify "^2.0.0"
     json-schema-traverse "^0.3.0"
 
+ajv@^6.1.0:
+  version "6.5.2"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.5.2.tgz#678495f9b82f7cca6be248dd92f59bff5e1f4360"
+  dependencies:
+    fast-deep-equal "^2.0.1"
+    fast-json-stable-stringify "^2.0.0"
+    json-schema-traverse "^0.4.1"
+    uri-js "^4.2.1"
+
 align-text@^0.1.1, align-text@^0.1.3:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/align-text/-/align-text-0.1.4.tgz#0cd90a561093f35d0a99256c22b7069433fad117"
@@ -122,6 +300,12 @@ amdefine@>=0.0.4:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
 
+ansi-colors@^1.0.1:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-1.1.0.tgz#6374b4dd5d4718ff3ce27a671a3b1cad077132a9"
+  dependencies:
+    ansi-wrap "^0.1.0"
+
 ansi-cyan@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/ansi-cyan/-/ansi-cyan-0.1.1.tgz#538ae528af8982f28ae30d86f2f17456d2609873"
@@ -132,6 +316,10 @@ ansi-escapes@^1.1.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-1.4.0.tgz#d3a8a83b319aa67793662b13e761c7911422306e"
 
+ansi-escapes@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.1.0.tgz#f73207bb81207d75fd6c83f125af26eea378ca30"
+
 ansi-gray@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/ansi-gray/-/ansi-gray-0.1.1.tgz#2962cf54ec9792c48510a3deb524436861ef7251"
@@ -170,22 +358,28 @@ ansi-styles@^3.1.0:
   dependencies:
     color-convert "^1.9.0"
 
-ansi-wrap@0.1.0:
+ansi-styles@^3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
+  dependencies:
+    color-convert "^1.9.0"
+
+ansi-wrap@0.1.0, ansi-wrap@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/ansi-wrap/-/ansi-wrap-0.1.0.tgz#a82250ddb0015e9a27ca82e82ea603bbfa45efaf"
 
-anymatch@^1.3.0:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-1.3.2.tgz#553dcb8f91e3c889845dfdba34c77721b90b9d7a"
+anymatch@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb"
   dependencies:
-    micromatch "^2.1.5"
-    normalize-path "^2.0.0"
+    micromatch "^3.1.4"
+    normalize-path "^2.1.1"
 
 applicationinsights@0.18.0:
   version "0.18.0"
   resolved "https://registry.yarnpkg.com/applicationinsights/-/applicationinsights-0.18.0.tgz#162ebb48a383408bc4de44db32b417307f45bbc1"
 
-aproba@^1.0.3:
+aproba@^1.0.3, aproba@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
 
@@ -219,14 +413,26 @@ arr-diff@^2.0.0:
   dependencies:
     arr-flatten "^1.0.1"
 
+arr-diff@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520"
+
 arr-flatten@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.0.1.tgz#e5ffe54d45e19f32f216e91eb99c8ce892bb604b"
 
+arr-flatten@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
+
 arr-union@^2.0.1:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-2.1.0.tgz#20f9eab5ec70f5c7d215b1077b1c39161d292c7d"
 
+arr-union@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
+
 array-differ@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/array-differ/-/array-differ-1.0.0.tgz#eff52e3758249d33be402b8bb8e564bb2b5d4031"
@@ -273,7 +479,11 @@ array-unique@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53"
 
-arrify@^1.0.0:
+array-unique@^0.3.2:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
+
+arrify@^1.0.0, arrify@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
 
@@ -294,9 +504,13 @@ asar@^0.14.0:
     mksnapshot "^0.3.0"
     tmp "0.0.28"
 
-asn1@0.1.11:
-  version "0.1.11"
-  resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.1.11.tgz#559be18376d08a4ec4dbe80877d27818639b2df7"
+asn1.js@^4.0.0:
+  version "4.10.1"
+  resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-4.10.1.tgz#b9c2bf5805f1e64aadeed6df3a2bfafb5a73f5a0"
+  dependencies:
+    bn.js "^4.0.0"
+    inherits "^2.0.1"
+    minimalistic-assert "^1.0.0"
 
 asn1@~0.2.3:
   version "0.2.3"
@@ -306,14 +520,20 @@ assert-plus@1.0.0, assert-plus@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
 
-assert-plus@^0.1.5:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-0.1.5.tgz#ee74009413002d84cec7219c6ac811812e723160"
-
 assert-plus@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-0.2.0.tgz#d74e1b87e7affc0db8aadb7021f3fe48101ab234"
 
+assert@^1.1.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/assert/-/assert-1.4.1.tgz#99912d591836b5a6f5b345c0f07eefc08fc65d91"
+  dependencies:
+    util "0.10.3"
+
+assign-symbols@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
+
 async-each@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d"
@@ -336,14 +556,14 @@ async@~0.2.8:
   version "0.2.10"
   resolved "https://registry.yarnpkg.com/async/-/async-0.2.10.tgz#b6bbe0b0674b9d719708ca38de8c237cb526c3d1"
 
-async@~0.9.0:
-  version "0.9.2"
-  resolved "https://registry.yarnpkg.com/async/-/async-0.9.2.tgz#aea74d5e61c1f899613bf64bda66d4c78f2fd17d"
-
 asynckit@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
 
+atob@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.1.tgz#ae2d5a729477f289d60dd7f96a6314a22dd6c22a"
+
 atob@~1.1.0:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/atob/-/atob-1.1.3.tgz#95f13629b12c3a51a5d215abdce2aa9f32f80773"
@@ -367,27 +587,10 @@ aws-sign2@~0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
 
-aws-sign@~0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/aws-sign/-/aws-sign-0.3.0.tgz#3d81ca69b474b1e16518728b51c24ff0bbedc6e9"
-
 aws4@^1.2.1, aws4@^1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.6.0.tgz#83ef5ca860b2b32e4a0deedee8c771b9db57471e"
 
-azure-storage@^0.3.1:
-  version "0.3.3"
-  resolved "https://registry.yarnpkg.com/azure-storage/-/azure-storage-0.3.3.tgz#5e1920ba75c678cb3f5e52a89136ef36210b58a1"
-  dependencies:
-    extend "~1.2.1"
-    mime "~1.2.4"
-    node-uuid "~1.4.0"
-    request "~2.27.0"
-    underscore "~1.4.4"
-    validator "~3.1.0"
-    xml2js "0.2.7"
-    xmlbuilder "0.4.3"
-
 azure-storage@^1.3.1:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/azure-storage/-/azure-storage-1.4.0.tgz#fb52fa68b3efa6980c33fd7c5cd489b7adc46ed1"
@@ -423,6 +626,22 @@ base64-js@0.0.8:
   version "0.0.8"
   resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-0.0.8.tgz#1101e9544f4a76b1bc3b26d452ca96d7a35e7978"
 
+base64-js@^1.0.2:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.0.tgz#cab1e6118f051095e58b5281aea8c1cd22bfc0e3"
+
+base@^0.11.1:
+  version "0.11.2"
+  resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f"
+  dependencies:
+    cache-base "^1.0.1"
+    class-utils "^0.3.5"
+    component-emitter "^1.2.1"
+    define-property "^1.0.0"
+    isobject "^3.0.1"
+    mixin-deep "^1.2.0"
+    pascalcase "^0.1.1"
+
 bcrypt-pbkdf@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz#63bc5dcb61331b92bc05fd528953c33462a06f8d"
@@ -437,6 +656,10 @@ big-integer@^1.6.25:
   version "1.6.25"
   resolved "https://registry.yarnpkg.com/big-integer/-/big-integer-1.6.25.tgz#1de45a9f57542ac20121c682f8d642220a34e823"
 
+big.js@^3.1.3:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/big.js/-/big.js-3.2.0.tgz#a5fc298b81b9e0dca2e458824784b65c52ba588e"
+
 binary-extensions@^1.0.0:
   version "1.10.0"
   resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.10.0.tgz#9aeb9a6c5e88638aad171e167f5900abe24835d0"
@@ -473,6 +696,14 @@ bl@~1.1.2:
   dependencies:
     readable-stream "~2.0.5"
 
+bluebird@^3.5.1:
+  version "3.5.1"
+  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.1.tgz#d9551f9de98f1fcda1e683d17ee91a0602ee2eb9"
+
+bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0:
+  version "4.11.8"
+  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.8.tgz#2cde09eb5ee341f484746bb0309b3253b1b1442f"
+
 body-parser@1.18.2:
   version "1.18.2"
   resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.18.2.tgz#87678a19d84b47d859b83199bd59bce222b10454"
@@ -492,12 +723,6 @@ boolbase@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
 
-boom@0.4.x:
-  version "0.4.2"
-  resolved "https://registry.yarnpkg.com/boom/-/boom-0.4.2.tgz#7a636e9ded4efcefb19cef4947a3c67dfaee911b"
-  dependencies:
-    hoek "0.9.x"
-
 boom@2.x.x:
   version "2.10.1"
   resolved "https://registry.yarnpkg.com/boom/-/boom-2.10.1.tgz#39c8918ceff5799f83f9492a848f625add0c766f"
@@ -531,14 +756,86 @@ braces@^1.8.2:
     preserve "^0.2.0"
     repeat-element "^1.1.2"
 
+braces@^2.3.0, braces@^2.3.1:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729"
+  dependencies:
+    arr-flatten "^1.1.0"
+    array-unique "^0.3.2"
+    extend-shallow "^2.0.1"
+    fill-range "^4.0.0"
+    isobject "^3.0.1"
+    repeat-element "^1.1.2"
+    snapdragon "^0.8.1"
+    snapdragon-node "^2.0.1"
+    split-string "^3.0.2"
+    to-regex "^3.0.1"
+
+brorand@^1.0.1:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
+
 "browser-request@>= 0.3.1 < 0.4.0":
   version "0.3.3"
   resolved "https://registry.yarnpkg.com/browser-request/-/browser-request-0.3.3.tgz#9ece5b5aca89a29932242e18bf933def9876cc17"
 
+browserify-aes@^1.0.0, browserify-aes@^1.0.4:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.2.0.tgz#326734642f403dabc3003209853bb70ad428ef48"
+  dependencies:
+    buffer-xor "^1.0.3"
+    cipher-base "^1.0.0"
+    create-hash "^1.1.0"
+    evp_bytestokey "^1.0.3"
+    inherits "^2.0.1"
+    safe-buffer "^5.0.1"
+
+browserify-cipher@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/browserify-cipher/-/browserify-cipher-1.0.1.tgz#8d6474c1b870bfdabcd3bcfcc1934a10e94f15f0"
+  dependencies:
+    browserify-aes "^1.0.4"
+    browserify-des "^1.0.0"
+    evp_bytestokey "^1.0.0"
+
+browserify-des@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/browserify-des/-/browserify-des-1.0.2.tgz#3af4f1f59839403572f1c66204375f7a7f703e9c"
+  dependencies:
+    cipher-base "^1.0.1"
+    des.js "^1.0.0"
+    inherits "^2.0.1"
+    safe-buffer "^5.1.2"
+
 browserify-mime@~1.2.9:
   version "1.2.9"
   resolved "https://registry.yarnpkg.com/browserify-mime/-/browserify-mime-1.2.9.tgz#aeb1af28de6c0d7a6a2ce40adb68ff18422af31f"
 
+browserify-rsa@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.0.1.tgz#21e0abfaf6f2029cf2fafb133567a701d4135524"
+  dependencies:
+    bn.js "^4.1.0"
+    randombytes "^2.0.1"
+
+browserify-sign@^4.0.0:
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.0.4.tgz#aa4eb68e5d7b658baa6bf6a57e630cbd7a93d298"
+  dependencies:
+    bn.js "^4.1.1"
+    browserify-rsa "^4.0.0"
+    create-hash "^1.1.0"
+    create-hmac "^1.1.2"
+    elliptic "^6.0.0"
+    inherits "^2.0.1"
+    parse-asn1 "^5.0.0"
+
+browserify-zlib@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.2.0.tgz#2869459d9aa3be245fe8fe2ca1f46e2e7f54d73f"
+  dependencies:
+    pako "~1.0.5"
+
 browserslist@^1.3.6, browserslist@^1.5.2, browserslist@^1.7.6:
   version "1.7.7"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-1.7.7.tgz#0bd76704258be829b2398bb50e4b62d1a166b0b9"
@@ -565,6 +862,22 @@ buffer-fill@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-0.1.1.tgz#76d825c4d6e50e06b7a31eb520c04d08cc235071"
 
+buffer-from@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
+
+buffer-xor@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9"
+
+buffer@^4.3.0:
+  version "4.9.1"
+  resolved "https://registry.yarnpkg.com/buffer/-/buffer-4.9.1.tgz#6d1bb601b07a4efced97094132093027c95bc298"
+  dependencies:
+    base64-js "^1.0.2"
+    ieee754 "^1.1.4"
+    isarray "^1.0.0"
+
 buffers@~0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/buffers/-/buffers-0.1.1.tgz#b24579c3bed4d6d396aeee6d9a8ae7f5482ab7bb"
@@ -579,10 +892,46 @@ builtin-modules@^1.0.0, builtin-modules@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
 
+builtin-status-codes@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8"
+
 bytes@3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
 
+cacache@^10.0.4:
+  version "10.0.4"
+  resolved "https://registry.yarnpkg.com/cacache/-/cacache-10.0.4.tgz#6452367999eff9d4188aefd9a14e9d7c6a263460"
+  dependencies:
+    bluebird "^3.5.1"
+    chownr "^1.0.1"
+    glob "^7.1.2"
+    graceful-fs "^4.1.11"
+    lru-cache "^4.1.1"
+    mississippi "^2.0.0"
+    mkdirp "^0.5.1"
+    move-concurrently "^1.0.1"
+    promise-inflight "^1.0.1"
+    rimraf "^2.6.2"
+    ssri "^5.2.4"
+    unique-filename "^1.1.0"
+    y18n "^4.0.0"
+
+cache-base@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2"
+  dependencies:
+    collection-visit "^1.0.0"
+    component-emitter "^1.2.1"
+    get-value "^2.0.6"
+    has-value "^1.0.0"
+    isobject "^3.0.1"
+    set-value "^2.0.0"
+    to-object-path "^0.3.0"
+    union-value "^1.0.0"
+    unset-value "^1.0.0"
+
 caller-path@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/caller-path/-/caller-path-0.1.0.tgz#94085ef63581ecd3daa92444a8fe94e82577751f"
@@ -666,6 +1015,14 @@ chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3:
     strip-ansi "^3.0.0"
     supports-color "^2.0.0"
 
+chalk@^2.0.0, chalk@^2.4.1:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.1.tgz#18c49ab16a037b6eb0152cc83e3471338215b66e"
+  dependencies:
+    ansi-styles "^3.2.1"
+    escape-string-regexp "^1.0.5"
+    supports-color "^5.3.0"
+
 chalk@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.3.0.tgz#b5ea48efc9c1793dccc9b4767c93914d3f2d52ba"
@@ -674,6 +1031,14 @@ chalk@^2.3.0:
     escape-string-regexp "^1.0.5"
     supports-color "^4.0.0"
 
+chardet@^0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.5.0.tgz#fe3ac73c00c3d865ffcc02a0682e2c20b6a06029"
+
+charenc@~0.0.1:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/charenc/-/charenc-0.0.2.tgz#c0a1d2f3a7092e03774bfa83f14c0fc5790a8667"
+
 cheerio@^1.0.0-rc.1:
   version "1.0.0-rc.2"
   resolved "https://registry.yarnpkg.com/cheerio/-/cheerio-1.0.0-rc.2.tgz#4b9f53a81b27e4d5dac31c0ffd0cfa03cc6830db"
@@ -685,6 +1050,25 @@ cheerio@^1.0.0-rc.1:
     lodash "^4.15.0"
     parse5 "^3.0.1"
 
+chokidar@^2.0.2:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.0.4.tgz#356ff4e2b0e8e43e322d18a372460bbcf3accd26"
+  dependencies:
+    anymatch "^2.0.0"
+    async-each "^1.0.0"
+    braces "^2.3.0"
+    glob-parent "^3.1.0"
+    inherits "^2.0.1"
+    is-binary-path "^1.0.0"
+    is-glob "^4.0.0"
+    lodash.debounce "^4.0.8"
+    normalize-path "^2.1.1"
+    path-is-absolute "^1.0.0"
+    readdirp "^2.0.0"
+    upath "^1.0.5"
+  optionalDependencies:
+    fsevents "^1.2.2"
+
 chownr@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.0.1.tgz#e2a75042a9551908bebd25b8523d5f9769d79181"
@@ -696,6 +1080,12 @@ chrome-remote-interface@^0.25.3:
     commander "2.11.x"
     ws "3.3.x"
 
+chrome-trace-event@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.0.tgz#45a91bd2c20c9411f0963b5aaeb9a1b95e09cc48"
+  dependencies:
+    tslib "^1.9.0"
+
 chromium-pickle-js@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/chromium-pickle-js/-/chromium-pickle-js-0.2.0.tgz#04a106672c18b085ab774d983dfa3ea138f22205"
@@ -704,6 +1094,13 @@ ci-info@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.1.1.tgz#47b44df118c48d2597b56d342e7e25791060171a"
 
+cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.4.tgz#8760e4ecc272f4c363532f926d874aae2c1397de"
+  dependencies:
+    inherits "^2.0.1"
+    safe-buffer "^5.0.1"
+
 circular-json@^0.3.1:
   version "0.3.3"
   resolved "https://registry.yarnpkg.com/circular-json/-/circular-json-0.3.3.tgz#815c99ea84f6809529d2f45791bdf82711352d66"
@@ -714,6 +1111,15 @@ clap@^1.0.9:
   dependencies:
     chalk "^1.1.3"
 
+class-utils@^0.3.5:
+  version "0.3.6"
+  resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463"
+  dependencies:
+    arr-union "^3.1.0"
+    define-property "^0.2.5"
+    isobject "^3.0.0"
+    static-extend "^0.1.1"
+
 clean-css@3.4.6:
   version "3.4.6"
   resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-3.4.6.tgz#fcb4f17057ddb7f8721616f70b07b294d95ffc45"
@@ -727,6 +1133,12 @@ cli-cursor@^1.0.1:
   dependencies:
     restore-cursor "^1.0.1"
 
+cli-cursor@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5"
+  dependencies:
+    restore-cursor "^2.0.0"
+
 cli-width@^2.0.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639"
@@ -797,6 +1209,13 @@ coffee-script@^1.10.0:
   version "1.12.7"
   resolved "https://registry.yarnpkg.com/coffee-script/-/coffee-script-1.12.7.tgz#c05dae0cb79591d05b3070a8433a98c9a89ccc53"
 
+collection-visit@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0"
+  dependencies:
+    map-visit "^1.0.0"
+    object-visit "^1.0.0"
+
 color-convert@^1.3.0, color-convert@^1.9.0:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.1.tgz#c1261107aeb2f294ebffec9ed9ecad529a6097ed"
@@ -847,12 +1266,6 @@ combined-stream@^1.0.5, combined-stream@~1.0.5:
   dependencies:
     delayed-stream "~1.0.0"
 
-combined-stream@~0.0.4:
-  version "0.0.7"
-  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-0.0.7.tgz#0137e657baa5a7541c57ac37ac5fc07d73b4dc1f"
-  dependencies:
-    delayed-stream "0.0.5"
-
 commander@*, commander@^2.11.0:
   version "2.15.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.15.0.tgz#ad2a23a1c3b036e392469b8012cec6b33b4c1322"
@@ -875,7 +1288,7 @@ commander@2.8.x:
   dependencies:
     graceful-readlink ">= 1.0.0"
 
-commander@^2.12.1:
+commander@^2.12.1, commander@~2.13.0:
   version "2.13.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.13.0.tgz#6964bca67685df7c1f1430c584f07d7597885b9c"
 
@@ -883,6 +1296,14 @@ commandpost@^1.0.0:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/commandpost/-/commandpost-1.2.1.tgz#2e9c4c7508b9dc704afefaa91cab92ee6054cc68"
 
+commondir@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
+
+component-emitter@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6"
+
 concat-map@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
@@ -895,6 +1316,15 @@ concat-stream@1.6.0, concat-stream@^1.5.2:
     readable-stream "^2.2.2"
     typedarray "^0.0.6"
 
+concat-stream@^1.5.0:
+  version "1.6.2"
+  resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
+  dependencies:
+    buffer-from "^1.0.0"
+    inherits "^2.0.3"
+    readable-stream "^2.2.2"
+    typedarray "^0.0.6"
+
 concat-with-sourcemaps@^1.0.0:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/concat-with-sourcemaps/-/concat-with-sourcemaps-1.0.4.tgz#f55b3be2aeb47601b10a2d5259ccfb70fd2f1dd6"
@@ -908,10 +1338,20 @@ config-chain@~1.1.5:
     ini "^1.3.4"
     proto-list "~1.2.1"
 
+console-browserify@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.1.0.tgz#f0241c45730a9fc6323b206dbf38edc741d0bb10"
+  dependencies:
+    date-now "^0.1.4"
+
 console-control-strings@^1.0.0, console-control-strings@~1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
 
+constants-browserify@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75"
+
 content-disposition@0.5.2:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.2.tgz#0cf68bb9ddf5f2be7961c3a85178cb85dba78cb4"
@@ -924,10 +1364,6 @@ convert-source-map@1.X, convert-source-map@^1.1.1:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.0.tgz#9acd70851c6d5dfdd93d9282e5edf94a03ff46b5"
 
-cookie-jar@~0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/cookie-jar/-/cookie-jar-0.3.0.tgz#bc9a27d4e2b97e186cd57c9e2063cb99fa68cccc"
-
 cookie-signature@1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
@@ -936,6 +1372,34 @@ cookie@0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"
 
+copy-concurrently@^1.0.0:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/copy-concurrently/-/copy-concurrently-1.0.5.tgz#92297398cae34937fcafd6ec8139c18051f0b5e0"
+  dependencies:
+    aproba "^1.1.1"
+    fs-write-stream-atomic "^1.0.8"
+    iferr "^0.1.5"
+    mkdirp "^0.5.1"
+    rimraf "^2.5.4"
+    run-queue "^1.0.0"
+
+copy-descriptor@^0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
+
+copy-webpack-plugin@^4.5.2:
+  version "4.5.2"
+  resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-4.5.2.tgz#d53444a8fea2912d806e78937390ddd7e632ee5c"
+  dependencies:
+    cacache "^10.0.4"
+    find-cache-dir "^1.0.0"
+    globby "^7.1.1"
+    is-glob "^4.0.0"
+    loader-utils "^1.1.0"
+    minimatch "^3.0.4"
+    p-limit "^1.0.0"
+    serialize-javascript "^1.4.0"
+
 core-util-is@1.0.2, core-util-is@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
@@ -950,6 +1414,34 @@ coveralls@^2.11.11:
     minimist "1.2.0"
     request "2.79.0"
 
+create-ecdh@^4.0.0:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.3.tgz#c9111b6f33045c4697f144787f9254cdc77c45ff"
+  dependencies:
+    bn.js "^4.1.0"
+    elliptic "^6.0.0"
+
+create-hash@^1.1.0, create-hash@^1.1.2:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/create-hash/-/create-hash-1.2.0.tgz#889078af11a63756bcfb59bd221996be3a9ef196"
+  dependencies:
+    cipher-base "^1.0.1"
+    inherits "^2.0.1"
+    md5.js "^1.3.4"
+    ripemd160 "^2.0.1"
+    sha.js "^2.4.0"
+
+create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4:
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/create-hmac/-/create-hmac-1.1.7.tgz#69170c78b3ab957147b2b8b04572e47ead2243ff"
+  dependencies:
+    cipher-base "^1.0.3"
+    create-hash "^1.1.0"
+    inherits "^2.0.1"
+    ripemd160 "^2.0.0"
+    safe-buffer "^5.0.1"
+    sha.js "^2.4.8"
+
 cross-spawn@^4.0.0:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-4.0.2.tgz#7b9247621c23adfdd3856004a823cbe397424d41"
@@ -965,11 +1457,19 @@ cross-spawn@^5.0.1:
     shebang-command "^1.2.0"
     which "^1.2.9"
 
-cryptiles@0.2.x:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-0.2.2.tgz#ed91ff1f17ad13d3748288594f8a48a0d26f325c"
+cross-spawn@^6.0.5:
+  version "6.0.5"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
   dependencies:
-    boom "0.4.x"
+    nice-try "^1.0.4"
+    path-key "^2.0.1"
+    semver "^5.5.0"
+    shebang-command "^1.2.0"
+    which "^1.2.9"
+
+crypt@~0.0.1:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/crypt/-/crypt-0.0.2.tgz#88d7ff7ec0dfb86f713dc87bbb42d044d3e6c41b"
 
 cryptiles@2.x.x:
   version "2.0.5"
@@ -983,6 +1483,22 @@ cryptiles@3.x.x:
   dependencies:
     boom "5.x.x"
 
+crypto-browserify@^3.11.0:
+  version "3.12.0"
+  resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz#396cf9f3137f03e4b8e532c58f698254e00f80ec"
+  dependencies:
+    browserify-cipher "^1.0.0"
+    browserify-sign "^4.0.0"
+    create-ecdh "^4.0.0"
+    create-hash "^1.1.0"
+    create-hmac "^1.1.0"
+    diffie-hellman "^5.0.0"
+    inherits "^2.0.1"
+    pbkdf2 "^3.0.3"
+    public-encrypt "^4.0.0"
+    randombytes "^2.0.0"
+    randomfill "^1.0.3"
+
 cson-parser@^1.3.3:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/cson-parser/-/cson-parser-1.3.5.tgz#7ec675e039145533bf2a6a856073f1599d9c2d24"
@@ -1069,10 +1585,6 @@ cssom@0.3.x, "cssom@>= 0.3.0 < 0.4.0":
   dependencies:
     cssom "0.3.x"
 
-ctype@0.5.3:
-  version "0.5.3"
-  resolved "https://registry.yarnpkg.com/ctype/-/ctype-0.5.3.tgz#82c18c2461f74114ef16c135224ad0b9144ca12f"
-
 cuint@^0.2.1:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/cuint/-/cuint-0.2.2.tgz#408086d409550c2631155619e9fa7bcadc3b991b"
@@ -1083,6 +1595,10 @@ currently-unhandled@^0.4.1:
   dependencies:
     array-find-index "^1.0.1"
 
+cyclist@~0.2.2:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-0.2.2.tgz#1b33792e11e914a2fd6d6ed6447464444e5fa640"
+
 d@1:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/d/-/d-1.0.0.tgz#754bb5bfe55451da69a58b94d45f4c5b0462d58f"
@@ -1095,6 +1611,10 @@ dashdash@^1.12.0:
   dependencies:
     assert-plus "^1.0.0"
 
+date-now@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b"
+
 dateformat@^1.0.11, dateformat@^1.0.7-1.2.3:
   version "1.0.12"
   resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-1.0.12.tgz#9f124b67594c937ff706932e4a642cca8dbbfee9"
@@ -1124,7 +1644,7 @@ debug@2.2.0, debug@~2.2.0:
   dependencies:
     ms "0.7.1"
 
-debug@2.6.9, debug@2.X, debug@^2.1.1, debug@^2.1.3, debug@^2.2.0:
+debug@2.6.9, debug@2.X, debug@^2.1.1, debug@^2.1.2, debug@^2.1.3, debug@^2.2.0, debug@^2.3.3:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
   dependencies:
@@ -1140,6 +1660,16 @@ decamelize@^1.0.0, decamelize@^1.1.1, decamelize@^1.1.2:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
 
+decamelize@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-2.0.0.tgz#656d7bbc8094c4c788ea53c5840908c9c7d063c7"
+  dependencies:
+    xregexp "4.0.0"
+
+decode-uri-component@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
+
 decompress-response@^3.3.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz#80a4dd323748384bfa248083622aedec982adff3"
@@ -1180,6 +1710,25 @@ defaults@^1.0.0:
   dependencies:
     clone "^1.0.2"
 
+define-property@^0.2.5:
+  version "0.2.5"
+  resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116"
+  dependencies:
+    is-descriptor "^0.1.0"
+
+define-property@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz#769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6"
+  dependencies:
+    is-descriptor "^1.0.0"
+
+define-property@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz#d459689e8d654ba77e02a817f8710d702cb16e9d"
+  dependencies:
+    is-descriptor "^1.0.2"
+    isobject "^3.0.1"
+
 defined@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/defined/-/defined-1.0.0.tgz#c98d9bcef75674188e110969151199e39b1fa693"
@@ -1196,10 +1745,6 @@ del@^2.0.2:
     pinkie-promise "^2.0.0"
     rimraf "^2.2.8"
 
-delayed-stream@0.0.5:
-  version "0.0.5"
-  resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-0.0.5.tgz#d4b1f43a93e8296dfe02694f4680bc37a313c73f"
-
 delayed-stream@0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-0.0.6.tgz#a2646cb7ec3d5d7774614670a7a65de0c173edbc"
@@ -1224,6 +1769,13 @@ deprecated@^0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/deprecated/-/deprecated-0.0.1.tgz#f9c9af5464afa1e7a971458a8bdef2aa94d5bb19"
 
+des.js@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.0.0.tgz#c074d2e2aa6a8a9a07dbd61f9a15c2cd83ec8ecc"
+  dependencies:
+    inherits "^2.0.1"
+    minimalistic-assert "^1.0.0"
+
 destroy@~1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80"
@@ -1242,7 +1794,7 @@ detect-indent@^2.0.0:
     minimist "^1.1.0"
     repeating "^1.1.0"
 
-detect-libc@^1.0.3:
+detect-libc@^1.0.2, detect-libc@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
 
@@ -1258,6 +1810,21 @@ diff@^3.2.0:
   version "3.4.0"
   resolved "https://registry.yarnpkg.com/diff/-/diff-3.4.0.tgz#b1d85507daf3964828de54b37d0d73ba67dda56c"
 
+diffie-hellman@^5.0.0:
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.3.tgz#40e8ee98f55a2149607146921c63e1ae5f3d2875"
+  dependencies:
+    bn.js "^4.1.0"
+    miller-rabin "^4.0.0"
+    randombytes "^2.0.0"
+
+dir-glob@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-2.0.0.tgz#0b205d2b6aef98238ca286598a8204d29d0a0034"
+  dependencies:
+    arrify "^1.0.1"
+    path-type "^3.0.0"
+
 doctrine@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.0.0.tgz#c73d8d2909d22291e1a007a395804da8b665fe63"
@@ -1283,6 +1850,10 @@ dom-serializer@0, dom-serializer@~0.1.0:
     domelementtype "~1.1.1"
     entities "~1.1.1"
 
+domain-browser@^1.1.1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda"
+
 domelementtype@1, domelementtype@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.0.tgz#b17aed82e8ab59e52dd9c19b1756e0fc187204c2"
@@ -1330,6 +1901,15 @@ duplexify@^3.2.0:
     readable-stream "^2.0.0"
     stream-shift "^1.0.0"
 
+duplexify@^3.4.2, duplexify@^3.6.0:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.6.0.tgz#592903f5d80b38d037220541264d69a198fb3410"
+  dependencies:
+    end-of-stream "^1.0.0"
+    inherits "^2.0.1"
+    readable-stream "^2.0.0"
+    stream-shift "^1.0.0"
+
 eachr@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/eachr/-/eachr-3.2.0.tgz#2c35e43ea086516f7997cf80b7aa64d55a4a4484"
@@ -1387,6 +1967,22 @@ electron-to-chromium@^1.2.7:
   version "1.3.27"
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.27.tgz#78ecb8a399066187bb374eede35d9c70565a803d"
 
+elliptic@^6.0.0:
+  version "6.4.0"
+  resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.4.0.tgz#cac9af8762c85836187003c8dfe193e5e2eae5df"
+  dependencies:
+    bn.js "^4.4.0"
+    brorand "^1.0.1"
+    hash.js "^1.0.0"
+    hmac-drbg "^1.0.0"
+    inherits "^2.0.1"
+    minimalistic-assert "^1.0.0"
+    minimalistic-crypto-utils "^1.0.0"
+
+emojis-list@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389"
+
 encodeurl@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.1.tgz#79e3d58655346909fe6f0f45a5de68103b294d20"
@@ -1403,6 +1999,14 @@ end-of-stream@~0.1.5:
   dependencies:
     once "~1.3.0"
 
+enhanced-resolve@^4.0.0, enhanced-resolve@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.1.0.tgz#41c7e0bfdfe74ac1ffe1e57ad6a5c6c9f3742a7f"
+  dependencies:
+    graceful-fs "^4.1.2"
+    memory-fs "^0.4.0"
+    tapable "^1.0.0"
+
 entities@^1.1.1, entities@~1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.1.tgz#6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0"
@@ -1411,6 +2015,12 @@ env-paths@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-1.0.0.tgz#4168133b42bb05c38a35b1ae4397c8298ab369e0"
 
+errno@^0.1.3, errno@~0.1.7:
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.7.tgz#4684d71779ad39af177e3f007996f7c67c852618"
+  dependencies:
+    prr "~1.0.1"
+
 error-ex@^1.2.0:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.1.tgz#f855a86ce61adc4e8621c3cda21e7a7612c3a8dc"
@@ -1522,6 +2132,13 @@ escope@^3.6.0:
     esrecurse "^4.1.0"
     estraverse "^4.1.1"
 
+eslint-scope@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.0.tgz#50bf3071e9338bcdc43331794a0cb533f0136172"
+  dependencies:
+    esrecurse "^4.1.0"
+    estraverse "^4.1.1"
+
 eslint@^3.0.0, eslint@^3.4.0:
   version "3.19.0"
   resolved "https://registry.yarnpkg.com/eslint/-/eslint-3.19.0.tgz#c8fc6201c7f40dd08941b87c085767386a679acc"
@@ -1633,6 +2250,17 @@ event-stream@^3.1.7, event-stream@^3.3.1, event-stream@^3.3.4, event-stream@~3.3
     stream-combiner "~0.0.4"
     through "~2.3.1"
 
+events@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/events/-/events-1.1.1.tgz#9ebdb7635ad099c70dcc4c2a1f5004288e8bd924"
+
+evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz#7fcbdb198dc71959432efe13842684e0525acb02"
+  dependencies:
+    md5.js "^1.3.4"
+    safe-buffer "^5.1.1"
+
 execa@^0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/execa/-/execa-0.7.0.tgz#944becd34cc41ee32a63a9faf27ad5a65fc59777"
@@ -1655,6 +2283,18 @@ expand-brackets@^0.1.4:
   dependencies:
     is-posix-bracket "^0.1.0"
 
+expand-brackets@^2.1.4:
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622"
+  dependencies:
+    debug "^2.3.3"
+    define-property "^0.2.5"
+    extend-shallow "^2.0.1"
+    posix-character-classes "^0.1.0"
+    regex-not "^1.0.0"
+    snapdragon "^0.8.1"
+    to-regex "^3.0.1"
+
 expand-range@^1.8.1:
   version "1.8.2"
   resolved "https://registry.yarnpkg.com/expand-range/-/expand-range-1.8.2.tgz#a299effd335fe2721ebae8e257ec79644fc85337"
@@ -1724,6 +2364,13 @@ extend-shallow@^2.0.1:
   dependencies:
     is-extendable "^0.1.0"
 
+extend-shallow@^3.0.0, extend-shallow@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8"
+  dependencies:
+    assign-symbols "^1.0.0"
+    is-extendable "^1.0.1"
+
 extend@^3.0.0, extend@~3.0.0, extend@~3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.1.tgz#a755ea7bc1adfcc5a31ce7e762dbaadc5e636444"
@@ -1732,12 +2379,33 @@ extend@~1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/extend/-/extend-1.2.1.tgz#a0f5fd6cfc83a5fe49ef698d60ec8a624dd4576c"
 
+external-editor@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.0.0.tgz#dc35c48c6f98a30ca27a20e9687d7f3c77704bb6"
+  dependencies:
+    chardet "^0.5.0"
+    iconv-lite "^0.4.22"
+    tmp "^0.0.33"
+
 extglob@^0.3.1:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/extglob/-/extglob-0.3.2.tgz#2e18ff3d2f49ab2765cec9023f011daa8d8349a1"
   dependencies:
     is-extglob "^1.0.0"
 
+extglob@^2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543"
+  dependencies:
+    array-unique "^0.3.2"
+    define-property "^1.0.0"
+    expand-brackets "^2.1.4"
+    extend-shallow "^2.0.1"
+    fragment-cache "^0.2.1"
+    regex-not "^1.0.0"
+    snapdragon "^0.8.1"
+    to-regex "^3.0.1"
+
 extract-opts@^3.2.0:
   version "3.3.1"
   resolved "https://registry.yarnpkg.com/extract-opts/-/extract-opts-3.3.1.tgz#5abbedc98c0d5202e3278727f9192d7e086c6be1"
@@ -1778,6 +2446,10 @@ fast-deep-equal@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz#96256a3bc975595eb36d82e9929d060d893439ff"
 
+fast-deep-equal@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"
+
 fast-json-stable-stringify@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
@@ -1790,7 +2462,7 @@ fast-levenshtein@~2.0.4:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
 
-fast-plist@0.1.2, fast-plist@^0.1.2:
+fast-plist@0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/fast-plist/-/fast-plist-0.1.2.tgz#a45aff345196006d406ca6cdcd05f69051ef35b8"
 
@@ -1807,6 +2479,12 @@ figures@^1.3.5:
     escape-string-regexp "^1.0.5"
     object-assign "^4.1.0"
 
+figures@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"
+  dependencies:
+    escape-string-regexp "^1.0.5"
+
 file-entry-cache@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-2.0.0.tgz#c392990c3e684783d838b8c84a45d8a048458361"
@@ -1835,6 +2513,15 @@ fill-range@^2.1.0:
     repeat-element "^1.1.2"
     repeat-string "^1.5.2"
 
+fill-range@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7"
+  dependencies:
+    extend-shallow "^2.0.1"
+    is-number "^3.0.0"
+    repeat-string "^1.6.1"
+    to-regex-range "^2.1.0"
+
 finalhandler@1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.0.tgz#ce0b6855b45853e791b2fcc680046d88253dd7f5"
@@ -1847,6 +2534,14 @@ finalhandler@1.1.0:
     statuses "~1.3.1"
     unpipe "~1.0.0"
 
+find-cache-dir@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-1.0.0.tgz#9288e3e9e3cc3748717d39eade17cf71fc30ee6f"
+  dependencies:
+    commondir "^1.0.1"
+    make-dir "^1.0.0"
+    pkg-dir "^2.0.0"
+
 find-index@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/find-index/-/find-index-0.1.1.tgz#675d358b2ca3892d795a1ab47232f8b6e2e0dde4"
@@ -1868,6 +2563,12 @@ find-up@^2.1.0:
   dependencies:
     locate-path "^2.0.0"
 
+find-up@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73"
+  dependencies:
+    locate-path "^3.0.0"
+
 findup-sync@^0.4.2:
   version "0.4.3"
   resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-0.4.3.tgz#40043929e7bc60adf0b7f4827c4c6e75a0deca12"
@@ -1908,11 +2609,18 @@ flatten@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/flatten/-/flatten-1.0.2.tgz#dae46a9d78fbe25292258cc1e780a41d95c03782"
 
+flush-write-stream@^1.0.0:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.0.3.tgz#c5d586ef38af6097650b49bc41b55fabb19f35bd"
+  dependencies:
+    inherits "^2.0.1"
+    readable-stream "^2.0.4"
+
 for-in@^0.1.5:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/for-in/-/for-in-0.1.5.tgz#007374e2b6d5c67420a1479bdb75a04872b738c4"
 
-for-in@^1.0.1:
+for-in@^1.0.1, for-in@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
 
@@ -1928,22 +2636,10 @@ for-own@^1.0.0:
   dependencies:
     for-in "^1.0.1"
 
-forever-agent@~0.5.0:
-  version "0.5.2"
-  resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.5.2.tgz#6d0e09c4921f94a27f63d3b49c5feff1ea4c5130"
-
 forever-agent@~0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
 
-form-data@~0.1.0:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-0.1.4.tgz#91abd788aba9702b1aabfa8bc01031a2ac9e3b12"
-  dependencies:
-    async "~0.9.0"
-    combined-stream "~0.0.4"
-    mime "~1.2.11"
-
 form-data@~1.0.0-rc4:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/form-data/-/form-data-1.0.1.tgz#ae315db9a4907fa065502304a66d7733475ee37c"
@@ -1978,10 +2674,23 @@ forwarded@~0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84"
 
+fragment-cache@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19"
+  dependencies:
+    map-cache "^0.2.2"
+
 fresh@0.5.2:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
 
+from2@^2.1.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/from2/-/from2-2.3.0.tgz#8bfb5502bde4a4d36cfdeea007fcca21d7e382af"
+  dependencies:
+    inherits "^2.0.1"
+    readable-stream "^2.0.0"
+
 from@~0:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/from/-/from-0.1.7.tgz#83c60afc58b9c56997007ed1a768b3ab303a44fe"
@@ -2011,10 +2720,32 @@ fs-extra@^2.0.0:
     graceful-fs "^4.1.2"
     jsonfile "^2.1.0"
 
+fs-minipass@^1.2.5:
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.5.tgz#06c277218454ec288df77ada54a03b8702aacb9d"
+  dependencies:
+    minipass "^2.2.1"
+
+fs-write-stream-atomic@^1.0.8:
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz#b47df53493ef911df75731e70a9ded0189db40c9"
+  dependencies:
+    graceful-fs "^4.1.2"
+    iferr "^0.1.5"
+    imurmurhash "^0.1.4"
+    readable-stream "1 || 2"
+
 fs.realpath@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
 
+fsevents@^1.2.2:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.4.tgz#f41dcb1af2582af3692da36fc55cbd8e1041c426"
+  dependencies:
+    nan "^2.9.2"
+    node-pre-gyp "^0.10.0"
+
 function-bind@^1.0.2:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
@@ -2068,6 +2799,10 @@ get-stream@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
 
+get-value@^2.0.3, get-value@^2.0.6:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
+
 getmac@1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/getmac/-/getmac-1.4.1.tgz#cfefcb3ee7d7a73cba5292129cb100c19afbe17a"
@@ -2107,7 +2842,7 @@ glob-parent@^2.0.0:
   dependencies:
     is-glob "^2.0.0"
 
-glob-parent@^3.0.0:
+glob-parent@^3.0.0, glob-parent@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae"
   dependencies:
@@ -2205,6 +2940,10 @@ glob@~3.1.21:
     inherits "1"
     minimatch "~0.2.11"
 
+global-modules-path@^2.1.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/global-modules-path/-/global-modules-path-2.3.0.tgz#b0e2bac6beac39745f7db5c59d26a36a0b94f7dc"
+
 global-modules@^0.2.3:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-0.2.3.tgz#ea5a3bed42c6d6ce995a4f8a1269b5dae223828d"
@@ -2236,6 +2975,17 @@ globby@^5.0.0:
     pify "^2.0.0"
     pinkie-promise "^2.0.0"
 
+globby@^7.1.1:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-7.1.1.tgz#fb2ccff9401f8600945dfada97440cca972b8680"
+  dependencies:
+    array-union "^1.0.1"
+    dir-glob "^2.0.0"
+    glob "^7.1.2"
+    ignore "^3.3.5"
+    pify "^3.0.0"
+    slash "^1.0.0"
+
 globule@~0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/globule/-/globule-0.1.0.tgz#d9c8edde1da79d125a151b79533b978676346ae5"
@@ -2259,7 +3009,7 @@ gm@^1.14.2:
     cross-spawn "^4.0.0"
     debug "~2.2.0"
 
-graceful-fs@4.1.11, graceful-fs@4.X, graceful-fs@^4.0.0, graceful-fs@^4.1.2, graceful-fs@^4.1.3, graceful-fs@^4.1.6, graceful-fs@^4.1.9:
+graceful-fs@4.1.11, graceful-fs@4.X, graceful-fs@^4.0.0, graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.3, graceful-fs@^4.1.6, graceful-fs@^4.1.9:
   version "4.1.11"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
 
@@ -2675,6 +3425,10 @@ has-flag@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-2.0.0.tgz#e8207af1cc7b30d446cc70b734b5e8be18f88d51"
 
+has-flag@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
+
 has-gulplog@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/has-gulplog/-/has-gulplog-0.1.0.tgz#6414c82913697da51590397dafb12f22967811ce"
@@ -2685,20 +3439,52 @@ has-unicode@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
 
+has-value@^0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f"
+  dependencies:
+    get-value "^2.0.3"
+    has-values "^0.1.4"
+    isobject "^2.0.0"
+
+has-value@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz#18b281da585b1c5c51def24c930ed29a0be6b177"
+  dependencies:
+    get-value "^2.0.6"
+    has-values "^1.0.0"
+    isobject "^3.0.0"
+
+has-values@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771"
+
+has-values@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f"
+  dependencies:
+    is-number "^3.0.0"
+    kind-of "^4.0.0"
+
 has@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/has/-/has-1.0.1.tgz#8461733f538b0837c9361e39a9ab9e9704dc2f28"
   dependencies:
     function-bind "^1.0.2"
 
-hawk@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/hawk/-/hawk-1.0.0.tgz#b90bb169807285411da7ffcb8dd2598502d3b52d"
+hash-base@^3.0.0:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/hash-base/-/hash-base-3.0.4.tgz#5fc8686847ecd73499403319a6b0a3f3f6ae4918"
   dependencies:
-    boom "0.4.x"
-    cryptiles "0.2.x"
-    hoek "0.9.x"
-    sntp "0.2.x"
+    inherits "^2.0.1"
+    safe-buffer "^5.0.1"
+
+hash.js@^1.0.0, hash.js@^1.0.3:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.5.tgz#e38ab4b85dfb1e0c40fe9265c0e9b54854c23812"
+  dependencies:
+    inherits "^2.0.3"
+    minimalistic-assert "^1.0.1"
 
 hawk@~3.1.3:
   version "3.1.3"
@@ -2718,9 +3504,13 @@ hawk@~6.0.2:
     hoek "4.x.x"
     sntp "2.x.x"
 
-hoek@0.9.x:
-  version "0.9.1"
-  resolved "https://registry.yarnpkg.com/hoek/-/hoek-0.9.1.tgz#3d322462badf07716ea7eb85baf88079cddce505"
+hmac-drbg@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1"
+  dependencies:
+    hash.js "^1.0.3"
+    minimalistic-assert "^1.0.0"
+    minimalistic-crypto-utils "^1.0.1"
 
 hoek@2.x.x:
   version "2.16.3"
@@ -2771,14 +3561,6 @@ http-proxy-agent@^2.1.0:
     agent-base "4"
     debug "3.1.0"
 
-http-signature@~0.10.0:
-  version "0.10.1"
-  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-0.10.1.tgz#4fbdac132559aa8323121e540779c0a012b27e66"
-  dependencies:
-    asn1 "0.1.11"
-    assert-plus "^0.1.5"
-    ctype "0.5.3"
-
 http-signature@~1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.1.1.tgz#df72e267066cd0ac67fb76adf8e134a8fbcf91bf"
@@ -2795,6 +3577,10 @@ http-signature@~1.2.0:
     jsprim "^1.2.2"
     sshpk "^1.7.0"
 
+https-browserify@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"
+
 https-proxy-agent@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.1.tgz#51552970fa04d723e04c56d04178c3f92592bbc0"
@@ -2815,16 +3601,41 @@ iconv-lite@0.4.19, iconv-lite@^0.4.19:
   version "0.4.19"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.19.tgz#f7468f60135f5e5dad3399c0a81be9a1603a082b"
 
-iconv-lite@0.4.23:
+iconv-lite@0.4.23, iconv-lite@^0.4.22, iconv-lite@^0.4.4:
   version "0.4.23"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.23.tgz#297871f63be507adcfbfca715d0cd0eed84e9a63"
   dependencies:
     safer-buffer ">= 2.1.2 < 3"
 
+ieee754@^1.1.11, ieee754@^1.1.4:
+  version "1.1.12"
+  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.12.tgz#50bf24e5b9c8bb98af4964c941cdb0918da7b60b"
+
+iferr@^0.1.5:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"
+
+ignore-walk@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.1.tgz#a83e62e7d272ac0e3b551aaa82831a19b69f82f8"
+  dependencies:
+    minimatch "^3.0.4"
+
 ignore@^3.2.0:
   version "3.3.7"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.7.tgz#612289bfb3c220e186a58118618d5be8c1bab021"
 
+ignore@^3.3.5:
+  version "3.3.10"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.10.tgz#0a97fb876986e8081c631160f8f9f389157f0043"
+
+import-local@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/import-local/-/import-local-1.0.0.tgz#5e4ffdc03f4fe6c009c6729beb29631c2f8227bc"
+  dependencies:
+    pkg-dir "^2.0.0"
+    resolve-cwd "^2.0.0"
+
 imurmurhash@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
@@ -2839,6 +3650,10 @@ indexes-of@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/indexes-of/-/indexes-of-1.0.1.tgz#f30f716c8e2bd346c7b67d3df3915566a7c05607"
 
+indexof@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/indexof/-/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d"
+
 inflight@^1.0.4:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
@@ -2884,6 +3699,24 @@ inquirer@^0.12.0:
     strip-ansi "^3.0.0"
     through "^2.3.6"
 
+inquirer@^6.0.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.1.0.tgz#8f65c7b31c498285f4ddf3b742ad8c487892040b"
+  dependencies:
+    ansi-escapes "^3.0.0"
+    chalk "^2.0.0"
+    cli-cursor "^2.1.0"
+    cli-width "^2.0.0"
+    external-editor "^3.0.0"
+    figures "^2.0.0"
+    lodash "^4.3.0"
+    mute-stream "0.0.7"
+    run-async "^2.2.0"
+    rxjs "^6.1.0"
+    string-width "^2.1.0"
+    strip-ansi "^4.0.0"
+    through "^2.3.6"
+
 int64-buffer@^0.1.9:
   version "0.1.9"
   resolved "https://registry.yarnpkg.com/int64-buffer/-/int64-buffer-0.1.9.tgz#9e039da043b24f78b196b283e04653ef5e990f61"
@@ -2892,6 +3725,10 @@ interpret@^1.0.0:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.0.4.tgz#820cdd588b868ffb191a809506d6c9c8f212b1b0"
 
+interpret@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.1.0.tgz#7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614"
+
 invert-kv@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"
@@ -2915,6 +3752,18 @@ is-absolute@^0.2.3:
     is-relative "^0.2.1"
     is-windows "^0.2.0"
 
+is-accessor-descriptor@^0.1.6:
+  version "0.1.6"
+  resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"
+  dependencies:
+    kind-of "^3.0.2"
+
+is-accessor-descriptor@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz#169c2f6d3df1f992618072365c9b0ea1f6878656"
+  dependencies:
+    kind-of "^6.0.0"
+
 is-arrayish@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
@@ -2929,6 +3778,10 @@ is-buffer@^1.0.2:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.4.tgz#cfc86ccd5dc5a52fa80489111c6920c457e2d98b"
 
+is-buffer@^1.1.5, is-buffer@~1.1.1:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
+
 is-builtin-module@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-builtin-module/-/is-builtin-module-1.0.0.tgz#540572d34f7ac3119f8f76c30cbc1b1e037affbe"
@@ -2941,6 +3794,34 @@ is-ci@^1.0.9:
   dependencies:
     ci-info "^1.0.0"
 
+is-data-descriptor@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
+  dependencies:
+    kind-of "^3.0.2"
+
+is-data-descriptor@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz#d84876321d0e7add03990406abbbbd36ba9268c7"
+  dependencies:
+    kind-of "^6.0.0"
+
+is-descriptor@^0.1.0:
+  version "0.1.6"
+  resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca"
+  dependencies:
+    is-accessor-descriptor "^0.1.6"
+    is-data-descriptor "^0.1.4"
+    kind-of "^5.0.0"
+
+is-descriptor@^1.0.0, is-descriptor@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec"
+  dependencies:
+    is-accessor-descriptor "^1.0.0"
+    is-data-descriptor "^1.0.0"
+    kind-of "^6.0.2"
+
 is-dotfile@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-dotfile/-/is-dotfile-1.0.2.tgz#2c132383f39199f8edc268ca01b9b007d205cc4d"
@@ -2955,11 +3836,17 @@ is-extendable@^0.1.0, is-extendable@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
 
+is-extendable@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4"
+  dependencies:
+    is-plain-object "^2.0.4"
+
 is-extglob@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-1.0.0.tgz#ac468177c4943405a092fc8f29760c6ffc6206c0"
 
-is-extglob@^2.1.0:
+is-extglob@^2.1.0, is-extglob@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
 
@@ -2991,6 +3878,12 @@ is-glob@^3.1.0:
   dependencies:
     is-extglob "^2.1.0"
 
+is-glob@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.0.tgz#9521c76845cc2610a85203ddf080a958c2ffabc0"
+  dependencies:
+    is-extglob "^2.1.1"
+
 is-my-json-valid@^2.10.0, is-my-json-valid@^2.12.4:
   version "2.16.1"
   resolved "https://registry.yarnpkg.com/is-my-json-valid/-/is-my-json-valid-2.16.1.tgz#5a846777e2c2620d1e69104e5d3a03b1f6088f11"
@@ -3006,6 +3899,12 @@ is-number@^2.0.2, is-number@^2.1.0:
   dependencies:
     kind-of "^3.0.2"
 
+is-number@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
+  dependencies:
+    kind-of "^3.0.2"
+
 is-path-cwd@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-1.0.0.tgz#d225ec23132e89edd38fda767472e62e65f1106d"
@@ -3022,11 +3921,11 @@ is-path-inside@^1.0.0:
   dependencies:
     path-is-inside "^1.0.1"
 
-is-plain-obj@^1.0.0:
+is-plain-obj@^1.0.0, is-plain-obj@^1.1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
 
-is-plain-object@^2.0.3:
+is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
   dependencies:
@@ -3040,6 +3939,10 @@ is-primitive@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/is-primitive/-/is-primitive-2.0.0.tgz#207bab91638499c07b2adf240a41a87210034575"
 
+is-promise@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"
+
 is-property@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-property/-/is-property-1.0.2.tgz#57fe1c4e48474edd65b09911f26b1cd4095dda84"
@@ -3088,6 +3991,10 @@ is-windows@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-0.2.0.tgz#de1aa6d63ea29dd248737b69f1ff8b8002d2108c"
 
+is-windows@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
+
 is@^3.1.0, is@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/is/-/is-3.2.1.tgz#d0ac2ad55eb7b0bec926a5266f6c662aaa83dca5"
@@ -3235,10 +4142,18 @@ json-edm-parser@0.1.2:
   dependencies:
     jsonparse "~1.2.0"
 
+json-parse-better-errors@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
+
 json-schema-traverse@^0.3.0:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340"
 
+json-schema-traverse@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
+
 json-schema@0.2.3:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
@@ -3249,10 +4164,14 @@ json-stable-stringify@^1.0.0, json-stable-stringify@^1.0.1:
   dependencies:
     jsonify "~0.0.0"
 
-json-stringify-safe@~5.0.0, json-stringify-safe@~5.0.1:
+json-stringify-safe@~5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
 
+json5@^0.5.0:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
+
 jsonfile@^2.1.0:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-2.4.0.tgz#3736a2b428b87bbda0cc83b53fa3d633a35c2ae8"
@@ -3297,6 +4216,26 @@ kind-of@^3.0.2:
   dependencies:
     is-buffer "^1.0.2"
 
+kind-of@^3.0.3, kind-of@^3.2.0:
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
+  dependencies:
+    is-buffer "^1.1.5"
+
+kind-of@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57"
+  dependencies:
+    is-buffer "^1.1.5"
+
+kind-of@^5.0.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d"
+
+kind-of@^6.0.0, kind-of@^6.0.2:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051"
+
 klaw@^1.0.0:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/klaw/-/klaw-1.3.1.tgz#4088433b46b3b1ba259d78785d8e96f73ba02439"
@@ -3375,6 +4314,18 @@ load-json-file@^1.0.0:
     pinkie-promise "^2.0.0"
     strip-bom "^2.0.0"
 
+loader-runner@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.3.0.tgz#f482aea82d543e07921700d5a46ef26fdac6b8a2"
+
+loader-utils@^1.0.2, loader-utils@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.1.0.tgz#c98aef488bcceda2ffb5e2de646d6a754429f5cd"
+  dependencies:
+    big.js "^3.1.3"
+    emojis-list "^2.0.0"
+    json5 "^0.5.0"
+
 locate-path@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"
@@ -3382,6 +4333,13 @@ locate-path@^2.0.0:
     p-locate "^2.0.0"
     path-exists "^3.0.0"
 
+locate-path@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e"
+  dependencies:
+    p-locate "^3.0.0"
+    path-exists "^3.0.0"
+
 lodash._basecopy@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz#8da0e6a876cf344c0ad8a54882111dd3c5c7ca36"
@@ -3457,6 +4415,14 @@ lodash._shimkeys@~2.4.1:
   dependencies:
     lodash._objecttypes "~2.4.1"
 
+lodash.clone@^4.3.2:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/lodash.clone/-/lodash.clone-4.5.0.tgz#195870450f5a13192478df4bc3d23d2dea1907b6"
+
+lodash.debounce@^4.0.8:
+  version "4.0.8"
+  resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
+
 lodash.defaults@~2.4.1:
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-2.4.1.tgz#a7e8885f05e68851144b6e12a8f3678026bc4c54"
@@ -3540,6 +4506,10 @@ lodash.restparam@^3.0.0:
   version "3.6.1"
   resolved "https://registry.yarnpkg.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805"
 
+lodash.some@^4.2.2:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/lodash.some/-/lodash.some-4.6.0.tgz#1bb9f314ef6b8baded13b549169b2a945eb68e4d"
+
 lodash.template@^2.4.1:
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-2.4.1.tgz#9e611007edf629129a974ab3c48b817b3e1cf20d"
@@ -3598,6 +4568,10 @@ lodash@^4.0.0, lodash@^4.13.1, lodash@^4.14.0, lodash@^4.15.0, lodash@^4.3.0:
   version "4.17.4"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
 
+lodash@^4.17.10:
+  version "4.17.10"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"
+
 lodash@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-1.0.2.tgz#8f57560c83b59fc270bd3d561b690043430e2551"
@@ -3614,6 +4588,14 @@ lolex@1.3.2:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/lolex/-/lolex-1.3.2.tgz#7c3da62ffcb30f0f5a80a2566ca24e45d8a01f31"
 
+long@4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/long/-/long-4.0.0.tgz#9a7b71cfb7d361a194ea555241c92f7468d5bf28"
+
+long@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/long/-/long-3.2.0.tgz#d821b7138ca1cb581c172990ef14db200b5c474b"
+
 longest@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097"
@@ -3647,6 +4629,12 @@ macaddress@^0.2.8:
   version "0.2.8"
   resolved "https://registry.yarnpkg.com/macaddress/-/macaddress-0.2.8.tgz#5904dc537c39ec6dbefeae902327135fa8511f12"
 
+make-dir@^1.0.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.3.0.tgz#79c1033b80515bd6d24ec9933e860ca75ee27f0c"
+  dependencies:
+    pify "^3.0.0"
+
 make-error-cause@^1.1.1:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/make-error-cause/-/make-error-cause-1.2.2.tgz#df0388fcd0b37816dff0a5fb8108939777dcbc9d"
@@ -3657,7 +4645,11 @@ make-error@^1.2.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.0.tgz#52ad3a339ccf10ce62b4040b708fe707244b8b96"
 
-map-cache@^0.2.0:
+mamacro@^0.0.3:
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/mamacro/-/mamacro-0.0.3.tgz#ad2c9576197c9f1abf308d0787865bd975a3f3e4"
+
+map-cache@^0.2.0, map-cache@^0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
 
@@ -3673,6 +4665,12 @@ map-stream@~0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/map-stream/-/map-stream-0.1.0.tgz#e56aa94c4c8055a16404a0674b78f215f7c8e194"
 
+map-visit@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"
+  dependencies:
+    object-visit "^1.0.0"
+
 markdown-it@^8.3.1:
   version "8.4.0"
   resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-8.4.0.tgz#e2400881bf171f7018ed1bd9da441dac8af6306d"
@@ -3687,6 +4685,21 @@ math-expression-evaluator@^1.2.14:
   version "1.2.17"
   resolved "https://registry.yarnpkg.com/math-expression-evaluator/-/math-expression-evaluator-1.2.17.tgz#de819fdbcd84dccd8fae59c6aeb79615b9d266ac"
 
+md5.js@^1.3.4:
+  version "1.3.4"
+  resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.4.tgz#e9bdbde94a20a5ac18b04340fc5764d5b09d901d"
+  dependencies:
+    hash-base "^3.0.0"
+    inherits "^2.0.1"
+
+md5@^2.1.0:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/md5/-/md5-2.2.1.tgz#53ab38d5fe3c8891ba465329ea23fac0540126f9"
+  dependencies:
+    charenc "~0.0.1"
+    crypt "~0.0.1"
+    is-buffer "~1.1.1"
+
 mdurl@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e"
@@ -3701,6 +4714,13 @@ mem@^1.1.0:
   dependencies:
     mimic-fn "^1.0.0"
 
+memory-fs@^0.4.0, memory-fs@^0.4.1, memory-fs@~0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552"
+  dependencies:
+    errno "^0.1.3"
+    readable-stream "^2.0.1"
+
 meow@^3.1.0, meow@^3.3.0:
   version "3.7.0"
   resolved "https://registry.yarnpkg.com/meow/-/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb"
@@ -3720,6 +4740,12 @@ merge-descriptors@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
 
+merge-options@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/merge-options/-/merge-options-1.0.1.tgz#2a64b24457becd4e4dc608283247e94ce589aa32"
+  dependencies:
+    is-plain-obj "^1.1"
+
 merge-stream@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-1.0.1.tgz#4041202d508a342ba00174008df0c251b8c135e1"
@@ -3748,6 +4774,31 @@ micromatch@^2.1.5, micromatch@^2.3.7:
     parse-glob "^3.0.4"
     regex-cache "^0.4.2"
 
+micromatch@^3.1.4, micromatch@^3.1.8:
+  version "3.1.10"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
+  dependencies:
+    arr-diff "^4.0.0"
+    array-unique "^0.3.2"
+    braces "^2.3.1"
+    define-property "^2.0.2"
+    extend-shallow "^3.0.2"
+    extglob "^2.0.4"
+    fragment-cache "^0.2.1"
+    kind-of "^6.0.2"
+    nanomatch "^1.2.9"
+    object.pick "^1.3.0"
+    regex-not "^1.0.0"
+    snapdragon "^0.8.1"
+    to-regex "^3.0.2"
+
+miller-rabin@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/miller-rabin/-/miller-rabin-4.0.1.tgz#f080351c865b0dc562a8462966daa53543c78a4d"
+  dependencies:
+    bn.js "^4.0.0"
+    brorand "^1.0.1"
+
 mime-db@~1.30.0:
   version "1.30.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.30.0.tgz#74c643da2dd9d6a45399963465b26d5ca7d71f01"
@@ -3758,14 +4809,14 @@ mime-types@^2.1.11, mime-types@^2.1.12, mime-types@~2.1.15, mime-types@~2.1.16,
   dependencies:
     mime-db "~1.30.0"
 
-mime@1.2.11, mime@~1.2.11, mime@~1.2.4, mime@~1.2.9:
-  version "1.2.11"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-1.2.11.tgz#58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10"
-
 mime@1.4.1, mime@^1.3.4:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6"
 
+mime@^1.4.1:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
+
 mimic-fn@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.1.0.tgz#e667783d92e89dbd342818b5230b9d62a672ad18"
@@ -3774,6 +4825,14 @@ mimic-response@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.0.tgz#df3d3652a73fded6b9b0b24146e6fd052353458e"
 
+minimalistic-assert@^1.0.0, minimalistic-assert@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"
+
+minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
+
 minimatch@0.3:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-0.3.0.tgz#275d8edaac4f1bb3326472089e7949c8394699dd"
@@ -3816,6 +4875,41 @@ minimist@~0.0.1:
   version "0.0.10"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
 
+minipass@^2.2.1, minipass@^2.3.3:
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.3.3.tgz#a7dcc8b7b833f5d368759cce544dccb55f50f233"
+  dependencies:
+    safe-buffer "^5.1.2"
+    yallist "^3.0.0"
+
+minizlib@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.1.0.tgz#11e13658ce46bc3a70a267aac58359d1e0c29ceb"
+  dependencies:
+    minipass "^2.2.1"
+
+mississippi@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-2.0.0.tgz#3442a508fafc28500486feea99409676e4ee5a6f"
+  dependencies:
+    concat-stream "^1.5.0"
+    duplexify "^3.4.2"
+    end-of-stream "^1.1.0"
+    flush-write-stream "^1.0.0"
+    from2 "^2.1.0"
+    parallel-transform "^1.1.0"
+    pump "^2.0.1"
+    pumpify "^1.3.3"
+    stream-each "^1.1.0"
+    through2 "^2.0.0"
+
+mixin-deep@^1.2.0:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.1.tgz#a49e7268dce1a0d9698e45326c5626df3543d0fe"
+  dependencies:
+    for-in "^1.0.2"
+    is-extendable "^1.0.1"
+
 mkdirp@0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.3.0.tgz#1bbf5ab1ba827af23575143490426455f481fe1e"
@@ -3844,6 +4938,16 @@ mksnapshot@^0.3.0:
     fs-extra "0.26.7"
     request "^2.79.0"
 
+mocha-junit-reporter@^1.17.0:
+  version "1.17.0"
+  resolved "https://registry.yarnpkg.com/mocha-junit-reporter/-/mocha-junit-reporter-1.17.0.tgz#2e5149ed40fc5d2e3ca71e42db5ab1fec9c6d85c"
+  dependencies:
+    debug "^2.2.0"
+    md5 "^2.1.0"
+    mkdirp "~0.5.1"
+    strip-ansi "^4.0.0"
+    xml "^1.0.0"
+
 mocha@^2.0.1, mocha@^2.2.5:
   version "2.5.3"
   resolved "https://registry.yarnpkg.com/mocha/-/mocha-2.5.3.tgz#161be5bdeb496771eb9b35745050b622b5aefc58"
@@ -3859,6 +4963,17 @@ mocha@^2.0.1, mocha@^2.2.5:
     supports-color "1.2.0"
     to-iso-string "0.0.2"
 
+move-concurrently@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz#be2c005fda32e0b29af1f05d7c4b33214c701f92"
+  dependencies:
+    aproba "^1.1.1"
+    copy-concurrently "^1.0.0"
+    fs-write-stream-atomic "^1.0.8"
+    mkdirp "^0.5.1"
+    rimraf "^2.5.4"
+    run-queue "^1.0.3"
+
 ms@0.7.1:
   version "0.7.1"
   resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.1.tgz#9cd13c03adbff25b65effde7ce864ee952017098"
@@ -3886,10 +5001,14 @@ mute-stream@0.0.5:
   version "0.0.5"
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.5.tgz#8fbfabb0a98a253d3184331f9e8deb7372fac6c0"
 
-mute-stream@~0.0.4:
+mute-stream@0.0.7, mute-stream@~0.0.4:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
 
+nan@2.10.0, nan@^2.9.2:
+  version "2.10.0"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.10.0.tgz#96d0cd610ebd58d4b4de9cc0c6828cda99c7548f"
+
 nan@2.8.0, nan@^2.8.0:
   version "2.8.0"
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.8.0.tgz#ed715f3fe9de02b57a5e6252d90a96675e1f085a"
@@ -3898,7 +5017,7 @@ nan@^2.0.0:
   version "2.9.2"
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.9.2.tgz#f564d75f5f8f36a6d9456cca7a6c4fe488ab7866"
 
-nan@^2.0.9, nan@^2.3.0:
+nan@^2.0.9:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.4.0.tgz#fb3c59d45fe4effe215f0b890f8adf6eb32d2232"
 
@@ -3906,10 +5025,30 @@ nan@^2.1.0:
   version "2.7.0"
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.7.0.tgz#d95bf721ec877e08db276ed3fc6eb78f9083ad46"
 
+nan@^2.10.0:
+  version "2.11.0"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.11.0.tgz#574e360e4d954ab16966ec102c0c049fd961a099"
+
 nan@^2.6.2:
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.6.2.tgz#e4ff34e6c95fdfb5aecc08de6596f43605a7db45"
 
+nanomatch@^1.2.9:
+  version "1.2.13"
+  resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119"
+  dependencies:
+    arr-diff "^4.0.0"
+    array-unique "^0.3.2"
+    define-property "^2.0.2"
+    extend-shallow "^3.0.2"
+    fragment-cache "^0.2.1"
+    is-windows "^1.0.2"
+    kind-of "^6.0.2"
+    object.pick "^1.3.0"
+    regex-not "^1.0.0"
+    snapdragon "^0.8.1"
+    to-regex "^3.0.1"
+
 native-is-elevated@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/native-is-elevated/-/native-is-elevated-0.2.1.tgz#70a2123a8575b9f624a3ef465d98cb74ae017385"
@@ -3930,21 +5069,80 @@ natural-compare@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
 
+needle@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/needle/-/needle-2.2.1.tgz#b5e325bd3aae8c2678902fa296f729455d1d3a7d"
+  dependencies:
+    debug "^2.1.2"
+    iconv-lite "^0.4.4"
+    sax "^1.2.4"
+
 negotiator@0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9"
 
+neo-async@^2.5.0:
+  version "2.5.1"
+  resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.5.1.tgz#acb909e327b1e87ec9ef15f41b8a269512ad41ee"
+
+nice-try@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.4.tgz#d93962f6c52f2c1558c0fbda6d512819f1efe1c4"
+
 node-abi@^2.2.0:
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.4.1.tgz#7628c4d4ec4e9cd3764ceb3652f36b2e7f8d4923"
   dependencies:
     semver "^5.4.1"
 
-node-pty@0.7.4:
-  version "0.7.4"
-  resolved "https://registry.yarnpkg.com/node-pty/-/node-pty-0.7.4.tgz#07146b2b40b76e432e57ce6750bda40f0da5c99f"
+node-libs-browser@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.1.0.tgz#5f94263d404f6e44767d726901fff05478d600df"
   dependencies:
-    nan "^2.6.2"
+    assert "^1.1.1"
+    browserify-zlib "^0.2.0"
+    buffer "^4.3.0"
+    console-browserify "^1.1.0"
+    constants-browserify "^1.0.0"
+    crypto-browserify "^3.11.0"
+    domain-browser "^1.1.1"
+    events "^1.0.0"
+    https-browserify "^1.0.0"
+    os-browserify "^0.3.0"
+    path-browserify "0.0.0"
+    process "^0.11.10"
+    punycode "^1.2.4"
+    querystring-es3 "^0.2.0"
+    readable-stream "^2.3.3"
+    stream-browserify "^2.0.1"
+    stream-http "^2.7.2"
+    string_decoder "^1.0.0"
+    timers-browserify "^2.0.4"
+    tty-browserify "0.0.0"
+    url "^0.11.0"
+    util "^0.10.3"
+    vm-browserify "0.0.4"
+
+node-pre-gyp@^0.10.0:
+  version "0.10.3"
+  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.10.3.tgz#3070040716afdc778747b61b6887bf78880b80fc"
+  dependencies:
+    detect-libc "^1.0.2"
+    mkdirp "^0.5.1"
+    needle "^2.2.1"
+    nopt "^4.0.1"
+    npm-packlist "^1.1.6"
+    npmlog "^4.0.2"
+    rc "^1.2.7"
+    rimraf "^2.6.1"
+    semver "^5.3.0"
+    tar "^4"
+
+node-pty@0.7.7:
+  version "0.7.7"
+  resolved "https://registry.yarnpkg.com/node-pty/-/node-pty-0.7.7.tgz#919a9de7f0462ee72b260a6e4d5459d28fde2d25"
+  dependencies:
+    nan "2.10.0"
 
 node-uuid@~1.4.0, node-uuid@~1.4.7:
   version "1.4.8"
@@ -3972,6 +5170,13 @@ nopt@3.x, nopt@^3.0.1, nopt@~3.0.1:
   dependencies:
     abbrev "1"
 
+nopt@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d"
+  dependencies:
+    abbrev "1"
+    osenv "^0.1.4"
+
 nopt@~1.0.10:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/nopt/-/nopt-1.0.10.tgz#6ddd21bd2a31417b92727dd585f8a6f37608ebee"
@@ -3991,7 +5196,7 @@ normalize-path@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-1.0.0.tgz#32d0e472f91ff345701c15a8311018d3b0a90379"
 
-normalize-path@^2.0.0:
+normalize-path@^2.0.0, normalize-path@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
   dependencies:
@@ -4014,13 +5219,24 @@ normalize-url@^1.4.0:
     query-string "^4.1.0"
     sort-keys "^1.0.0"
 
+npm-bundled@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.3.tgz#7e71703d973af3370a9591bafe3a63aca0be2308"
+
+npm-packlist@^1.1.6:
+  version "1.1.11"
+  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.1.11.tgz#84e8c683cbe7867d34b1d357d893ce29e28a02de"
+  dependencies:
+    ignore-walk "^3.0.1"
+    npm-bundled "^1.0.1"
+
 npm-run-path@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
   dependencies:
     path-key "^2.0.0"
 
-npmlog@^4.0.1:
+npmlog@^4.0.1, npmlog@^4.0.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
   dependencies:
@@ -4059,10 +5275,6 @@ number-is-nan@^1.0.0:
   version "1.4.3"
   resolved "https://registry.yarnpkg.com/nwmatcher/-/nwmatcher-1.4.3.tgz#64348e3b3d80f035b40ac11563d278f8b72db89c"
 
-oauth-sign@~0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.3.0.tgz#cb540f93bb2b22a7d5941691a288d60e8ea9386e"
-
 oauth-sign@~0.8.1, oauth-sign@~0.8.2:
   version "0.8.2"
   resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"
@@ -4079,10 +5291,24 @@ object-assign@^4.0.0, object-assign@^4.0.1, object-assign@^4.1.0:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
 
+object-copy@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c"
+  dependencies:
+    copy-descriptor "^0.1.0"
+    define-property "^0.2.5"
+    kind-of "^3.0.3"
+
 object-keys@~0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-0.4.0.tgz#28a6aae7428dd2c3a92f3d95f21335dd204e0336"
 
+object-visit@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb"
+  dependencies:
+    isobject "^3.0.0"
+
 object.defaults@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/object.defaults/-/object.defaults-1.1.0.tgz#3a7f868334b407dea06da16d88d5cd29e435fecf"
@@ -4099,7 +5325,7 @@ object.omit@^2.0.0:
     for-own "^0.1.3"
     is-extendable "^0.1.1"
 
-object.pick@^1.2.0:
+object.pick@^1.2.0, object.pick@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747"
   dependencies:
@@ -4127,9 +5353,15 @@ onetime@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/onetime/-/onetime-1.1.0.tgz#a1f7838f8314c516f05ecefcbc4ccfe04b4ed789"
 
-oniguruma@^6.0.1:
-  version "6.1.1"
-  resolved "https://registry.yarnpkg.com/oniguruma/-/oniguruma-6.1.1.tgz#1c7d96e53d116eb881dbe78b8355b4adc8225898"
+onetime@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz#067428230fd67443b2794b22bba528b6867962d4"
+  dependencies:
+    mimic-fn "^1.0.0"
+
+oniguruma@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/oniguruma/-/oniguruma-7.0.0.tgz#cf258a8b1a2ec1d0d68964d6336df264008ebf4c"
   dependencies:
     nan "^2.0.9"
 
@@ -4187,6 +5419,10 @@ ordered-read-streams@^0.3.0:
     is-stream "^1.0.1"
     readable-stream "^2.0.1"
 
+os-browserify@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27"
+
 os-homedir@^1.0.0, os-homedir@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
@@ -4199,7 +5435,7 @@ os-locale@^2.0.0:
     lcid "^1.0.0"
     mem "^1.1.0"
 
-os-tmpdir@^1.0.0, os-tmpdir@~1.0.1:
+os-tmpdir@^1.0.0, os-tmpdir@~1.0.1, os-tmpdir@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
 
@@ -4210,6 +5446,13 @@ osenv@^0.1.3:
     os-homedir "^1.0.0"
     os-tmpdir "^1.0.0"
 
+osenv@^0.1.4:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410"
+  dependencies:
+    os-homedir "^1.0.0"
+    os-tmpdir "^1.0.0"
+
 p-all@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-all/-/p-all-1.0.0.tgz#93bdf53a55a23821fdfa98b4174a99bf7f31df8d"
@@ -4220,18 +5463,36 @@ p-finally@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
 
+p-limit@^1.0.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8"
+  dependencies:
+    p-try "^1.0.0"
+
 p-limit@^1.1.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.2.0.tgz#0e92b6bedcb59f022c13d0f1949dc82d15909f1c"
   dependencies:
     p-try "^1.0.0"
 
+p-limit@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.0.0.tgz#e624ed54ee8c460a778b3c9f3670496ff8a57aec"
+  dependencies:
+    p-try "^2.0.0"
+
 p-locate@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43"
   dependencies:
     p-limit "^1.1.0"
 
+p-locate@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4"
+  dependencies:
+    p-limit "^2.0.0"
+
 p-map@^1.0.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/p-map/-/p-map-1.2.0.tgz#e4e94f311eabbc8633a1e79908165fca26241b6b"
@@ -4240,6 +5501,32 @@ p-try@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"
 
+p-try@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.0.0.tgz#85080bb87c64688fa47996fe8f7dfbe8211760b1"
+
+pako@~1.0.5:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.6.tgz#0101211baa70c4bca4a0f63f2206e97b7dfaf258"
+
+parallel-transform@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/parallel-transform/-/parallel-transform-1.1.0.tgz#d410f065b05da23081fcd10f28854c29bda33b06"
+  dependencies:
+    cyclist "~0.2.2"
+    inherits "^2.0.3"
+    readable-stream "^2.1.5"
+
+parse-asn1@^5.0.0:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.1.tgz#f6bf293818332bd0dab54efb16087724745e6ca8"
+  dependencies:
+    asn1.js "^4.0.0"
+    browserify-aes "^1.0.0"
+    create-hash "^1.1.0"
+    evp_bytestokey "^1.0.0"
+    pbkdf2 "^3.0.3"
+
 parse-filepath@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/parse-filepath/-/parse-filepath-1.0.1.tgz#159d6155d43904d16c10ef698911da1e91969b73"
@@ -4287,6 +5574,14 @@ parseurl@~1.3.2:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.2.tgz#fc289d4ed8993119460c156253262cdc8de65bf3"
 
+pascalcase@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
+
+path-browserify@0.0.0:
+  version "0.0.0"
+  resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.0.tgz#a0b870729aae214005b7d5032ec2cbbb0fb4451a"
+
 path-dirname@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0"
@@ -4309,7 +5604,7 @@ path-is-inside@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
 
-path-key@^2.0.0:
+path-key@^2.0.0, path-key@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
 
@@ -4339,12 +5634,28 @@ path-type@^1.0.0:
     pify "^2.0.0"
     pinkie-promise "^2.0.0"
 
+path-type@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f"
+  dependencies:
+    pify "^3.0.0"
+
 pause-stream@0.0.11:
   version "0.0.11"
   resolved "https://registry.yarnpkg.com/pause-stream/-/pause-stream-0.0.11.tgz#fe5a34b0cbce12b5aa6a2b403ee2e73b602f1445"
   dependencies:
     through "~2.3"
 
+pbkdf2@^3.0.3:
+  version "3.0.16"
+  resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.0.16.tgz#7404208ec6b01b62d85bf83853a8064f8d9c2a5c"
+  dependencies:
+    create-hash "^1.1.2"
+    create-hmac "^1.1.4"
+    ripemd160 "^2.0.1"
+    safe-buffer "^5.0.1"
+    sha.js "^2.4.8"
+
 pend@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50"
@@ -4361,6 +5672,10 @@ pify@^2.0.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
 
+pify@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
+
 pinkie-promise@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
@@ -4371,6 +5686,12 @@ pinkie@^2.0.0:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
 
+pkg-dir@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz#f6d5d1109e19d63edf428e0bd57e12777615334b"
+  dependencies:
+    find-up "^2.1.0"
+
 plist@^1.1.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/plist/-/plist-1.2.0.tgz#084b5093ddc92506e259f874b8d9b1afb8c79593"
@@ -4390,6 +5711,15 @@ plugin-error@^0.1.2:
     arr-union "^2.0.1"
     extend-shallow "^1.1.2"
 
+plugin-error@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/plugin-error/-/plugin-error-1.0.1.tgz#77016bd8919d0ac377fdcdd0322328953ca5781c"
+  dependencies:
+    ansi-colors "^1.0.1"
+    arr-diff "^4.0.0"
+    arr-union "^3.1.0"
+    extend-shallow "^3.0.2"
+
 plur@^2.1.0:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/plur/-/plur-2.1.2.tgz#7482452c1a0f508e3e344eaec312c91c29dc655a"
@@ -4400,6 +5730,10 @@ pluralize@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-1.2.1.tgz#d1a21483fd22bb41e58a12fa3421823140897c45"
 
+posix-character-classes@^0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
+
 postcss-calc@^5.2.0:
   version "5.3.1"
   resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-5.3.1.tgz#77bae7ca928ad85716e2fda42f261bf7c1d65b5e"
@@ -4673,6 +6007,10 @@ process-nextick-args@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa"
 
+process@^0.11.10:
+  version "0.11.10"
+  resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
+
 progress-stream@^1.1.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/progress-stream/-/progress-stream-1.2.0.tgz#2cd3cfea33ba3a89c9c121ec3347abe9ab125f77"
@@ -4684,6 +6022,10 @@ progress@^1.1.8:
   version "1.1.8"
   resolved "https://registry.yarnpkg.com/progress/-/progress-1.1.8.tgz#e260c78f6161cdd9b0e56cc3e0a85de17c7a57be"
 
+promise-inflight@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
+
 promisify-node@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/promisify-node/-/promisify-node-0.3.0.tgz#b4b55acf90faa7d2b8b90ca396899086c03060cf"
@@ -4701,10 +6043,24 @@ proxy-addr@~2.0.2:
     forwarded "~0.1.2"
     ipaddr.js "1.5.2"
 
+prr@~1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476"
+
 pseudomap@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
 
+public-encrypt@^4.0.0:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.2.tgz#46eb9107206bf73489f8b85b69d91334c6610994"
+  dependencies:
+    bn.js "^4.1.0"
+    browserify-rsa "^4.0.0"
+    create-hash "^1.1.0"
+    parse-asn1 "^5.0.0"
+    randombytes "^2.0.1"
+
 pump@^1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/pump/-/pump-1.0.3.tgz#5dfe8311c33bbf6fc18261f9f34702c47c08a954"
@@ -4719,17 +6075,33 @@ pump@^1.0.1:
     end-of-stream "^1.1.0"
     once "^1.3.1"
 
-pump@^2.0.1:
+pump@^2.0.0, pump@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/pump/-/pump-2.0.1.tgz#12399add6e4cf7526d973cbc8b5ce2e2908b3909"
   dependencies:
     end-of-stream "^1.1.0"
     once "^1.3.1"
 
-punycode@^1.4.1:
+pumpify@^1.3.3:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/pumpify/-/pumpify-1.5.1.tgz#36513be246ab27570b1a374a5ce278bfd74370ce"
+  dependencies:
+    duplexify "^3.6.0"
+    inherits "^2.0.3"
+    pump "^2.0.0"
+
+punycode@1.3.2:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d"
+
+punycode@^1.2.4, punycode@^1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
 
+punycode@^2.1.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
+
 q@^1.0.1, q@^1.1.2:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
@@ -4738,10 +6110,6 @@ qs@6.5.1, qs@~6.5.1:
   version "6.5.1"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.1.tgz#349cdf6eef89ec45c12d7d5eb3fc0c870343a6d8"
 
-qs@~0.6.0:
-  version "0.6.6"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-0.6.6.tgz#6e015098ff51968b8a3c819001d5f2c89bc4b107"
-
 qs@~6.2.0:
   version "6.2.3"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.2.3.tgz#1cfcb25c10a9b2b483053ff39f5dfc9233908cfe"
@@ -4761,6 +6129,14 @@ query-string@^4.1.0:
     object-assign "^4.1.0"
     strict-uri-encode "^1.0.0"
 
+querystring-es3@^0.2.0:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73"
+
+querystring@0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
+
 queue@3.0.6:
   version "3.0.6"
   resolved "https://registry.yarnpkg.com/queue/-/queue-3.0.6.tgz#66c0ffd0a1d9d28045adebda966a2d3946ab9f13"
@@ -4780,6 +6156,19 @@ randomatic@^1.1.3:
     is-number "^2.0.2"
     kind-of "^3.0.2"
 
+randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.0.6.tgz#d302c522948588848a8d300c932b44c24231da80"
+  dependencies:
+    safe-buffer "^5.1.0"
+
+randomfill@^1.0.3:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/randomfill/-/randomfill-1.0.4.tgz#c92196fc86ab42be983f1bf31778224931d61458"
+  dependencies:
+    randombytes "^2.0.5"
+    safe-buffer "^5.1.0"
+
 range-parser@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e"
@@ -4802,7 +6191,7 @@ rc@^1.1.2:
     minimist "^1.2.0"
     strip-json-comments "~2.0.1"
 
-rc@^1.1.6:
+rc@^1.1.6, rc@^1.2.7:
   version "1.2.8"
   resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
   dependencies:
@@ -4836,6 +6225,18 @@ read@^1.0.7:
   dependencies:
     mute-stream "~0.0.4"
 
+"readable-stream@1 || 2", readable-stream@^2.0.6, readable-stream@^2.3.0, readable-stream@^2.3.3, readable-stream@^2.3.5, readable-stream@^2.3.6:
+  version "2.3.6"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
+  dependencies:
+    core-util-is "~1.0.0"
+    inherits "~2.0.3"
+    isarray "~1.0.0"
+    process-nextick-args "~2.0.0"
+    safe-buffer "~5.1.1"
+    string_decoder "~1.1.1"
+    util-deprecate "~1.0.1"
+
 "readable-stream@>=1.0.33-1 <1.1.0-0", readable-stream@~1.0.17:
   version "1.0.34"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c"
@@ -4866,18 +6267,6 @@ readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable
     string_decoder "~1.0.3"
     util-deprecate "~1.0.1"
 
-readable-stream@^2.0.6, readable-stream@^2.3.0, readable-stream@^2.3.5:
-  version "2.3.6"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.3"
-    isarray "~1.0.0"
-    process-nextick-args "~2.0.0"
-    safe-buffer "~5.1.1"
-    string_decoder "~1.1.1"
-    util-deprecate "~1.0.1"
-
 readable-stream@~2.0.0, readable-stream@~2.0.5:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.0.6.tgz#8f90341e68a53ccc928788dacfcd11b36eb9b78e"
@@ -4940,6 +6329,13 @@ regex-cache@^0.4.2:
     is-equal-shallow "^0.1.3"
     is-primitive "^2.0.0"
 
+regex-not@^1.0.0, regex-not@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c"
+  dependencies:
+    extend-shallow "^3.0.2"
+    safe-regex "^1.1.0"
+
 remap-istanbul@^0.6.4:
   version "0.6.4"
   resolved "https://registry.yarnpkg.com/remap-istanbul/-/remap-istanbul-0.6.4.tgz#ac551eff1aa641504b4f318d0303dda61e3bb695"
@@ -4962,6 +6358,10 @@ repeat-string@^1.5.2:
   version "1.5.4"
   resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.5.4.tgz#64ec0c91e0f4b475f90d5b643651e3e6e5b6c2d5"
 
+repeat-string@^1.6.1:
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
+
 repeating@^1.1.0:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/repeating/-/repeating-1.1.3.tgz#3d4114218877537494f97f77f9785fab810fa4ac"
@@ -5069,23 +6469,6 @@ request@2.81.0:
     tunnel-agent "^0.6.0"
     uuid "^3.1.0"
 
-request@~2.27.0:
-  version "2.27.0"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.27.0.tgz#dfb1a224dd3a5a9bade4337012503d710e538668"
-  dependencies:
-    aws-sign "~0.3.0"
-    cookie-jar "~0.3.0"
-    forever-agent "~0.5.0"
-    form-data "~0.1.0"
-    hawk "~1.0.0"
-    http-signature "~0.10.0"
-    json-stringify-safe "~5.0.0"
-    mime "~1.2.9"
-    node-uuid "~1.4.0"
-    oauth-sign "~0.3.0"
-    qs "~0.6.0"
-    tunnel-agent "~0.3.0"
-
 request@~2.74.0:
   version "2.74.0"
   resolved "https://registry.yarnpkg.com/request/-/request-2.74.0.tgz#7693ca768bbb0ea5c8ce08c084a45efa05b892ab"
@@ -5127,6 +6510,12 @@ require-uncached@^1.0.2:
     caller-path "^0.1.0"
     resolve-from "^1.0.0"
 
+resolve-cwd@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-2.0.0.tgz#00a9f7387556e27038eae232caa372a6a59b665a"
+  dependencies:
+    resolve-from "^3.0.0"
+
 resolve-dir@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/resolve-dir/-/resolve-dir-0.1.1.tgz#b219259a5602fac5c5c496ad894a6e8cc430261e"
@@ -5138,7 +6527,11 @@ resolve-from@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-1.0.1.tgz#26cbfe935d1aeeeabb29bc3fe5aeb01e93d44226"
 
-resolve-url@~0.2.1:
+resolve-from@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748"
+
+resolve-url@^0.2.1, resolve-url@~0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
 
@@ -5159,6 +6552,17 @@ restore-cursor@^1.0.1:
     exit-hook "^1.0.0"
     onetime "^1.0.0"
 
+restore-cursor@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf"
+  dependencies:
+    onetime "^2.0.0"
+    signal-exit "^3.0.2"
+
+ret@~0.1.10:
+  version "0.1.15"
+  resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
+
 right-align@^0.1.1:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/right-align/-/right-align-0.1.3.tgz#61339b722fe6a3515689210d24e14c96148613ef"
@@ -5171,7 +6575,7 @@ rimraf@^2.2.8:
   dependencies:
     glob "^7.0.5"
 
-rimraf@^2.4.2:
+rimraf@^2.4.2, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2:
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36"
   dependencies:
@@ -5181,20 +6585,55 @@ rimraf@~2.2.6:
   version "2.2.8"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.2.8.tgz#e439be2aaee327321952730f99a8929e4fc50582"
 
+ripemd160@^2.0.0, ripemd160@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.2.tgz#a1c1a6f624751577ba5d07914cbc92850585890c"
+  dependencies:
+    hash-base "^3.0.0"
+    inherits "^2.0.1"
+
 run-async@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/run-async/-/run-async-0.1.0.tgz#c8ad4a5e110661e402a7d21b530e009f25f8e389"
   dependencies:
     once "^1.3.0"
 
+run-async@^2.2.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.3.0.tgz#0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0"
+  dependencies:
+    is-promise "^2.1.0"
+
+run-queue@^1.0.0, run-queue@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/run-queue/-/run-queue-1.0.3.tgz#e848396f057d223f24386924618e25694161ec47"
+  dependencies:
+    aproba "^1.1.1"
+
 rx-lite@^3.1.2:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-3.1.2.tgz#19ce502ca572665f3b647b10939f97fd1615f102"
 
+rxjs@^6.1.0:
+  version "6.2.2"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.2.2.tgz#eb75fa3c186ff5289907d06483a77884586e1cf9"
+  dependencies:
+    tslib "^1.9.0"
+
 safe-buffer@5.1.1, safe-buffer@^5.0.1, safe-buffer@^5.1.1, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"
 
+safe-buffer@^5.1.0, safe-buffer@^5.1.2:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
+
+safe-regex@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e"
+  dependencies:
+    ret "~0.1.10"
+
 "safer-buffer@>= 2.1.2 < 3":
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
@@ -5211,10 +6650,17 @@ sax@0.5.2:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/sax/-/sax-0.5.2.tgz#735ffaa39a1cff8ffb9598f0223abdb03a9fb2ea"
 
-sax@>=0.6.0, sax@~1.2.1:
+sax@>=0.6.0, sax@^1.2.4, sax@~1.2.1:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
 
+schema-utils@^0.4.4, schema-utils@^0.4.5:
+  version "0.4.7"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.4.7.tgz#ba74f597d2be2ea880131746ee17d0a093c68187"
+  dependencies:
+    ajv "^6.1.0"
+    ajv-keywords "^3.1.0"
+
 semaphore@1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/semaphore/-/semaphore-1.0.5.tgz#b492576e66af193db95d65e25ec53f5f19798d60"
@@ -5227,7 +6673,7 @@ semver@^4.1.0, semver@^4.3.4:
   version "4.3.6"
   resolved "https://registry.yarnpkg.com/semver/-/semver-4.3.6.tgz#300bc6e0e86374f7ba61068b5b1ecd57fc6532da"
 
-semver@^5.4.1, semver@^5.5.0:
+semver@^5.0.1, semver@^5.4.1, semver@^5.5.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab"
 
@@ -5253,6 +6699,10 @@ sequencify@~0.0.7:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/sequencify/-/sequencify-0.0.7.tgz#90cff19d02e07027fd767f5ead3e7b95d1e7380c"
 
+serialize-javascript@^1.4.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.5.0.tgz#1aa336162c88a890ddad5384baebc93a655161fe"
+
 serve-static@1.13.1:
   version "1.13.1"
   resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.13.1.tgz#4c57d53404a761d8f2e7c1e8a18a47dbf278a719"
@@ -5270,6 +6720,28 @@ set-immediate-shim@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz#4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61"
 
+set-value@^0.4.3:
+  version "0.4.3"
+  resolved "https://registry.yarnpkg.com/set-value/-/set-value-0.4.3.tgz#7db08f9d3d22dc7f78e53af3c3bf4666ecdfccf1"
+  dependencies:
+    extend-shallow "^2.0.1"
+    is-extendable "^0.1.1"
+    is-plain-object "^2.0.1"
+    to-object-path "^0.3.0"
+
+set-value@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.0.tgz#71ae4a88f0feefbbf52d1ea604f3fb315ebb6274"
+  dependencies:
+    extend-shallow "^2.0.1"
+    is-extendable "^0.1.1"
+    is-plain-object "^2.0.3"
+    split-string "^3.0.1"
+
+setimmediate@^1.0.4:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
+
 setprototypeof@1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.0.3.tgz#66567e37043eeb4f04d91bd658c0cbefb55b8e04"
@@ -5278,6 +6750,13 @@ setprototypeof@1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656"
 
+sha.js@^2.4.0, sha.js@^2.4.8:
+  version "2.4.11"
+  resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7"
+  dependencies:
+    inherits "^2.0.1"
+    safe-buffer "^5.0.1"
+
 shebang-command@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
@@ -5300,7 +6779,7 @@ sigmund@^1.0.1, sigmund@~1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/sigmund/-/sigmund-1.0.1.tgz#3ff21f198cad2175f9f3b781853fd94d0d19b590"
 
-signal-exit@^3.0.0:
+signal-exit@^3.0.0, signal-exit@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
 
@@ -5331,15 +6810,40 @@ sinon@^1.17.2:
     samsam "1.1.2"
     util ">=0.10.3 <1"
 
+slash@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"
+
 slice-ansi@0.0.4:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-0.0.4.tgz#edbf8903f66f7ce2f8eafd6ceed65e264c831b35"
 
-sntp@0.2.x:
-  version "0.2.4"
-  resolved "https://registry.yarnpkg.com/sntp/-/sntp-0.2.4.tgz#fb885f18b0f3aad189f824862536bceeec750900"
+snapdragon-node@^2.0.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b"
   dependencies:
-    hoek "0.9.x"
+    define-property "^1.0.0"
+    isobject "^3.0.0"
+    snapdragon-util "^3.0.1"
+
+snapdragon-util@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz#f956479486f2acd79700693f6f7b805e45ab56e2"
+  dependencies:
+    kind-of "^3.2.0"
+
+snapdragon@^0.8.1:
+  version "0.8.2"
+  resolved "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.2.tgz#64922e7c565b0e14204ba1aa7d6964278d25182d"
+  dependencies:
+    base "^0.11.1"
+    debug "^2.2.0"
+    define-property "^0.2.5"
+    extend-shallow "^2.0.1"
+    map-cache "^0.2.2"
+    source-map "^0.5.6"
+    source-map-resolve "^0.5.0"
+    use "^3.1.0"
 
 sntp@1.x.x:
   version "1.0.9"
@@ -5359,6 +6863,10 @@ sort-keys@^1.0.0:
   dependencies:
     is-plain-obj "^1.0.0"
 
+source-list-map@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.0.tgz#aaa47403f7b245a92fbc97ea08f250d6087ed085"
+
 source-map-resolve@^0.3.0:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.3.1.tgz#610f6122a445b8dd51535a2a71b783dfc1248761"
@@ -5368,6 +6876,20 @@ source-map-resolve@^0.3.0:
     source-map-url "~0.3.0"
     urix "~0.1.0"
 
+source-map-resolve@^0.5.0:
+  version "0.5.2"
+  resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.2.tgz#72e2cc34095543e43b2c62b2c4c10d4a9054f259"
+  dependencies:
+    atob "^2.1.1"
+    decode-uri-component "^0.2.0"
+    resolve-url "^0.2.1"
+    source-map-url "^0.4.0"
+    urix "^0.1.0"
+
+source-map-url@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
+
 source-map-url@~0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.3.0.tgz#7ecaf13b57bcd09da8a40c5d269db33799d4aaf9"
@@ -5378,7 +6900,7 @@ source-map@0.4.x, source-map@^0.4.4:
   dependencies:
     amdefine ">=0.0.4"
 
-source-map@0.X, source-map@>=0.5.6, source-map@^0.6.1, source-map@~0.6.1:
+source-map@0.X, source-map@>=0.5.6, source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
 
@@ -5402,9 +6924,9 @@ sparkles@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/sparkles/-/sparkles-1.0.0.tgz#1acbbfb592436d10bbe8f785b7cc6f82815012c3"
 
-spdlog@0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/spdlog/-/spdlog-0.6.0.tgz#20632ed4f1558ffa46e8a5827a5e97c61e0fa9ed"
+spdlog@0.7.2:
+  version "0.7.2"
+  resolved "https://registry.yarnpkg.com/spdlog/-/spdlog-0.7.2.tgz#9298753d7694b9ee9bbfd7e01ea1e4c6ace1e64d"
   dependencies:
     bindings "^1.3.0"
     mkdirp "^0.5.1"
@@ -5428,6 +6950,12 @@ speedometer@~0.1.2:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/speedometer/-/speedometer-0.1.4.tgz#9876dbd2a169d3115402d48e6ea6329c8816a50d"
 
+split-string@^3.0.1, split-string@^3.0.2:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2"
+  dependencies:
+    extend-shallow "^3.0.0"
+
 split@0.3:
   version "0.3.3"
   resolved "https://registry.yarnpkg.com/split/-/split-0.3.3.tgz#cd0eea5e63a211dfff7eb0f091c4133e2d0dd28f"
@@ -5452,6 +6980,19 @@ sshpk@^1.7.0:
     jsbn "~0.1.0"
     tweetnacl "~0.14.0"
 
+ssri@^5.2.4:
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/ssri/-/ssri-5.3.0.tgz#ba3872c9c6d33a0704a7d71ff045e5ec48999d06"
+  dependencies:
+    safe-buffer "^5.1.1"
+
+static-extend@^0.1.1:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6"
+  dependencies:
+    define-property "^0.2.5"
+    object-copy "^0.1.0"
+
 "statuses@>= 1.3.1 < 2":
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.4.0.tgz#bb73d446da2796106efcc1b601a253d6c46bd087"
@@ -5460,6 +7001,13 @@ statuses@~1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.3.1.tgz#faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e"
 
+stream-browserify@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.1.tgz#66266ee5f9bdb9940a4e4514cafb43bb71e5c9db"
+  dependencies:
+    inherits "~2.0.1"
+    readable-stream "^2.0.2"
+
 stream-combiner@~0.0.4:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/stream-combiner/-/stream-combiner-0.0.4.tgz#4d5e433c185261dde623ca3f44c586bcf5c4ad14"
@@ -5470,6 +7018,23 @@ stream-consume@~0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/stream-consume/-/stream-consume-0.1.0.tgz#a41ead1a6d6081ceb79f65b061901b6d8f3d1d0f"
 
+stream-each@^1.1.0:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/stream-each/-/stream-each-1.2.3.tgz#ebe27a0c389b04fbcc233642952e10731afa9bae"
+  dependencies:
+    end-of-stream "^1.1.0"
+    stream-shift "^1.0.0"
+
+stream-http@^2.7.2:
+  version "2.8.3"
+  resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.8.3.tgz#b2d242469288a5a27ec4fe8933acf623de6514fc"
+  dependencies:
+    builtin-status-codes "^3.0.0"
+    inherits "^2.0.1"
+    readable-stream "^2.3.6"
+    to-arraybuffer "^1.0.0"
+    xtend "^4.0.0"
+
 stream-shift@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.0.tgz#d5c752825e5367e786f78e18e445ea223a155952"
@@ -5496,13 +7061,19 @@ string-width@^1.0.1:
     is-fullwidth-code-point "^1.0.0"
     strip-ansi "^3.0.0"
 
-"string-width@^1.0.2 || 2", string-width@^2.0.0, string-width@^2.1.1:
+"string-width@^1.0.2 || 2", string-width@^2.0.0, string-width@^2.1.0, string-width@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
   dependencies:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^4.0.0"
 
+string_decoder@^1.0.0, string_decoder@~1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
+  dependencies:
+    safe-buffer "~5.1.0"
+
 string_decoder@~0.10.x:
   version "0.10.31"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
@@ -5513,12 +7084,6 @@ string_decoder@~1.0.3:
   dependencies:
     safe-buffer "~5.1.0"
 
-string_decoder@~1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
-  dependencies:
-    safe-buffer "~5.1.0"
-
 stringstream@~0.0.4, stringstream@~0.0.5:
   version "0.0.5"
   resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.5.tgz#4e484cd4de5a0bbbee18e46307710a8a81621878"
@@ -5613,6 +7178,12 @@ supports-color@^4.0.0:
   dependencies:
     has-flag "^2.0.0"
 
+supports-color@^5.3.0, supports-color@^5.4.0:
+  version "5.4.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.4.0.tgz#1c6b337402c2137605efe19f10fec390f6faab54"
+  dependencies:
+    has-flag "^3.0.0"
+
 svgo@^0.7.0:
   version "0.7.2"
   resolved "https://registry.yarnpkg.com/svgo/-/svgo-0.7.2.tgz#9f5772413952135c6fefbf40afe6a4faa88b4bb5"
@@ -5636,6 +7207,10 @@ table@^3.7.8:
     slice-ansi "0.0.4"
     string-width "^2.0.0"
 
+tapable@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.0.0.tgz#cbb639d9002eed9c6b5975eb20598d7936f1f9f2"
+
 tar-fs@^1.13.0:
   version "1.16.2"
   resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-1.16.2.tgz#17e5239747e399f7e77344f5f53365f04af53577"
@@ -5657,6 +7232,18 @@ tar-stream@^1.1.2:
     to-buffer "^1.1.0"
     xtend "^4.0.0"
 
+tar@^4:
+  version "4.4.6"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.6.tgz#63110f09c00b4e60ac8bcfe1bf3c8660235fbc9b"
+  dependencies:
+    chownr "^1.0.1"
+    fs-minipass "^1.2.5"
+    minipass "^2.3.3"
+    minizlib "^1.1.0"
+    mkdirp "^0.5.0"
+    safe-buffer "^5.1.2"
+    yallist "^3.0.2"
+
 temp@^0.8.1, temp@^0.8.3:
   version "0.8.3"
   resolved "https://registry.yarnpkg.com/temp/-/temp-0.8.3.tgz#e0c6bc4d26b903124410e4fed81103014dfc1f59"
@@ -5725,7 +7312,7 @@ through2@~0.2.3:
     readable-stream "~1.1.9"
     xtend "~2.1.1"
 
-through@2, through@^2.3.4, through@^2.3.6, through@~2.3, through@~2.3.1, through@~2.3.8:
+through@2, through@^2.3.4, through@^2.3.6, through@^2.3.8, through@~2.3, through@~2.3.1, through@~2.3.8:
   version "2.3.8"
   resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
 
@@ -5739,6 +7326,12 @@ time-stamp@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/time-stamp/-/time-stamp-1.1.0.tgz#764a5a11af50561921b133f3b44e618687e0f5c3"
 
+timers-browserify@^2.0.4:
+  version "2.0.10"
+  resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.10.tgz#1d28e3d2aadf1d5a5996c4e9f95601cd053480ae"
+  dependencies:
+    setimmediate "^1.0.4"
+
 tmp@0.0.28:
   version "0.0.28"
   resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.28.tgz#172735b7f614ea7af39664fa84cf0de4e515d120"
@@ -5751,12 +7344,22 @@ tmp@0.0.29:
   dependencies:
     os-tmpdir "~1.0.1"
 
+tmp@^0.0.33:
+  version "0.0.33"
+  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
+  dependencies:
+    os-tmpdir "~1.0.2"
+
 to-absolute-glob@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/to-absolute-glob/-/to-absolute-glob-0.1.1.tgz#1cdfa472a9ef50c239ee66999b662ca0eb39937f"
   dependencies:
     extend-shallow "^2.0.1"
 
+to-arraybuffer@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43"
+
 to-buffer@^1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/to-buffer/-/to-buffer-1.1.1.tgz#493bd48f62d7c43fcded313a03dcadb2e1213a80"
@@ -5765,6 +7368,28 @@ to-iso-string@0.0.2:
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/to-iso-string/-/to-iso-string-0.0.2.tgz#4dc19e664dfccbe25bd8db508b00c6da158255d1"
 
+to-object-path@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af"
+  dependencies:
+    kind-of "^3.0.2"
+
+to-regex-range@^2.1.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38"
+  dependencies:
+    is-number "^3.0.0"
+    repeat-string "^1.6.1"
+
+to-regex@^3.0.1, to-regex@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce"
+  dependencies:
+    define-property "^2.0.2"
+    extend-shallow "^3.0.2"
+    regex-not "^1.0.2"
+    safe-regex "^1.1.0"
+
 touch@0.0.3:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/touch/-/touch-0.0.3.tgz#51aef3d449571d4f287a5d87c9c8b49181a0db1d"
@@ -5789,6 +7414,16 @@ tryit@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/tryit/-/tryit-1.0.3.tgz#393be730a9446fd1ead6da59a014308f36c289cb"
 
+ts-loader@^4.4.2:
+  version "4.4.2"
+  resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-4.4.2.tgz#778d4464b24436873c78f7f9e914d88194c2a248"
+  dependencies:
+    chalk "^2.3.0"
+    enhanced-resolve "^4.0.0"
+    loader-utils "^1.0.2"
+    micromatch "^3.1.4"
+    semver "^5.0.1"
+
 tslib@^1.7.1:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.8.0.tgz#dc604ebad64bcbf696d613da6c954aa0e7ea1eb6"
@@ -5797,6 +7432,10 @@ tslib@^1.8.0:
   version "1.9.0"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.0.tgz#e37a86fda8cbbaf23a057f473c9f4dc64e5fc2e8"
 
+tslib@^1.9.0:
+  version "1.9.3"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286"
+
 tslint@^5.9.1:
   version "5.9.1"
   resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.9.1.tgz#1255f87a3ff57eb0b0e1f0e610a8b4748046c9ae"
@@ -5820,16 +7459,16 @@ tsutils@^2.12.1:
   dependencies:
     tslib "^1.7.1"
 
+tty-browserify@0.0.0:
+  version "0.0.0"
+  resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6"
+
 tunnel-agent@^0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
   dependencies:
     safe-buffer "^5.0.1"
 
-tunnel-agent@~0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.3.0.tgz#ad681b68f5321ad2827c4cfb1b7d5df2cfe942ee"
-
 tunnel-agent@~0.4.1:
   version "0.4.3"
   resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.4.3.tgz#6373db76909fe570e08d73583365ed828a74eeeb"
@@ -5879,9 +7518,9 @@ typescript-formatter@7.1.0:
     commandpost "^1.0.0"
     editorconfig "^0.15.0"
 
-typescript@2.9.1:
-  version "2.9.1"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.9.1.tgz#fdb19d2c67a15d11995fd15640e373e09ab09961"
+typescript@3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.0.3.tgz#4853b3e275ecdaa27f78fda46dc273a7eb7fc1c8"
 
 typescript@^2.6.2:
   version "2.6.2"
@@ -5898,6 +7537,13 @@ uglify-es@^3.0.18:
     commander "~2.11.0"
     source-map "~0.6.1"
 
+uglify-es@^3.3.4:
+  version "3.3.9"
+  resolved "https://registry.yarnpkg.com/uglify-es/-/uglify-es-3.3.9.tgz#0c1c4f0700bed8dbc124cdb304d2592ca203e677"
+  dependencies:
+    commander "~2.13.0"
+    source-map "~0.6.1"
+
 uglify-js@^2.6:
   version "2.8.29"
   resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.29.tgz#29c5733148057bb4e1f75df35b7a9cb72e6a59dd"
@@ -5918,6 +7564,19 @@ uglify-to-browserify@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7"
 
+uglifyjs-webpack-plugin@^1.2.4:
+  version "1.2.7"
+  resolved "https://registry.yarnpkg.com/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.2.7.tgz#57638dd99c853a1ebfe9d97b42160a8a507f9d00"
+  dependencies:
+    cacache "^10.0.4"
+    find-cache-dir "^1.0.0"
+    schema-utils "^0.4.5"
+    serialize-javascript "^1.4.0"
+    source-map "^0.6.1"
+    uglify-es "^3.3.4"
+    webpack-sources "^1.1.0"
+    worker-farm "^1.5.2"
+
 ultron@~1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/ultron/-/ultron-1.1.0.tgz#b07a2e6a541a815fc6a34ccd4533baec307ca864"
@@ -5934,6 +7593,15 @@ underscore@~1.4.4:
   version "1.4.4"
   resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.4.4.tgz#61a6a32010622afa07963bf325203cf12239d604"
 
+union-value@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.0.tgz#5c71c34cb5bad5dcebe3ea0cd08207ba5aa1aea4"
+  dependencies:
+    arr-union "^3.1.0"
+    get-value "^2.0.6"
+    is-extendable "^0.1.1"
+    set-value "^0.4.3"
+
 uniq@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/uniq/-/uniq-1.0.1.tgz#b31c5ae8254844a3a8281541ce2b04b865a734ff"
@@ -5948,6 +7616,18 @@ uniqs@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/uniqs/-/uniqs-2.0.0.tgz#ffede4b36b25290696e6e165d4a59edb998e6b02"
 
+unique-filename@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.0.tgz#d05f2fe4032560871f30e93cbe735eea201514f3"
+  dependencies:
+    unique-slug "^2.0.0"
+
+unique-slug@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.0.tgz#db6676e7c7cc0629878ff196097c78855ae9f4ab"
+  dependencies:
+    imurmurhash "^0.1.4"
+
 unique-stream@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unique-stream/-/unique-stream-1.0.0.tgz#d59a4a75427447d9aa6c91e70263f8d26a4b104b"
@@ -5963,6 +7643,23 @@ unpipe@1.0.0, unpipe@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
 
+unset-value@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"
+  dependencies:
+    has-value "^0.3.1"
+    isobject "^3.0.0"
+
+upath@^1.0.5:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/upath/-/upath-1.1.0.tgz#35256597e46a581db4793d0ce47fa9aebfc9fabd"
+
+uri-js@^4.2.1:
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz#94c540e1ff772956e2299507c010aea6c8838eb0"
+  dependencies:
+    punycode "^2.1.0"
+
 urix@^0.1.0, urix@~0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
@@ -5971,6 +7668,17 @@ url-join@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/url-join/-/url-join-1.1.0.tgz#741c6c2f4596c4830d6718460920d0c92202dc78"
 
+url@^0.11.0:
+  version "0.11.0"
+  resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"
+  dependencies:
+    punycode "1.3.2"
+    querystring "0.2.0"
+
+use@^3.1.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f"
+
 user-home@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/user-home/-/user-home-1.1.1.tgz#2b5be23a32b63a7c9deb8d0f28d485724a3df190"
@@ -5985,12 +7693,18 @@ util-deprecate@1.0.2, util-deprecate@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
 
-"util@>=0.10.3 <1":
+util@0.10.3, "util@>=0.10.3 <1":
   version "0.10.3"
   resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9"
   dependencies:
     inherits "2.0.1"
 
+util@^0.10.3:
+  version "0.10.4"
+  resolved "https://registry.yarnpkg.com/util/-/util-0.10.4.tgz#3aa0125bfe668a4672de58857d3ace27ecb76901"
+  dependencies:
+    inherits "2.0.3"
+
 utils-merge@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
@@ -5999,6 +7713,10 @@ uuid@^3.0.0, uuid@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.1.0.tgz#3dd3d3e790abc24d7b0d3a034ffababe28ebbc04"
 
+v8-compile-cache@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.0.2.tgz#a428b28bb26790734c4fc8bc9fa106fccebf6a6c"
+
 v8-inspect-profiler@^0.0.8:
   version "0.0.8"
   resolved "https://registry.yarnpkg.com/v8-inspect-profiler/-/v8-inspect-profiler-0.0.8.tgz#4d6bedb7c3d1bfc69e5bfdc2ded3d6784a5a76a6"
@@ -6022,10 +7740,6 @@ validate-npm-package-license@^3.0.1:
     spdx-correct "~1.0.0"
     spdx-expression-parse "~1.0.0"
 
-validator@~3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/validator/-/validator-3.1.0.tgz#2ea1ff7e92254d69367f385f015299e5ead8755b"
-
 validator@~3.22.2:
   version "3.22.2"
   resolved "https://registry.yarnpkg.com/validator/-/validator-3.22.2.tgz#6f297ae67f7f82acc76d0afdb49f18d9a09c18c0"
@@ -6139,15 +7853,21 @@ vinyl@~2.0.1:
     remove-trailing-separator "^1.0.1"
     replace-ext "^1.0.0"
 
-vsce@1.33.2:
-  version "1.33.2"
-  resolved "https://registry.yarnpkg.com/vsce/-/vsce-1.33.2.tgz#3645f69aaf984e22f74ea49d35f38dd18d66ff5f"
+vm-browserify@0.0.4:
+  version "0.0.4"
+  resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-0.0.4.tgz#5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73"
+  dependencies:
+    indexof "0.0.1"
+
+vsce@1.48.0:
+  version "1.48.0"
+  resolved "https://registry.yarnpkg.com/vsce/-/vsce-1.48.0.tgz#31c1a4c6909c3b8bdc48b3d32cc8c8e94c7113a2"
   dependencies:
     cheerio "^1.0.0-rc.1"
     commander "^2.8.1"
     denodeify "^1.2.1"
     glob "^7.0.6"
-    lodash "^4.15.0"
+    lodash "^4.17.10"
     markdown-it "^8.3.1"
     mime "^1.3.4"
     minimatch "^3.0.3"
@@ -6157,15 +7877,21 @@ vsce@1.33.2:
     semver "^5.1.0"
     tmp "0.0.29"
     url-join "^1.1.0"
-    vso-node-api "^6.1.2-preview"
+    vso-node-api "6.1.2-preview"
     yauzl "^2.3.1"
     yazl "^2.2.2"
 
-vscode-chokidar@1.6.2:
-  version "1.6.2"
-  resolved "https://registry.yarnpkg.com/vscode-chokidar/-/vscode-chokidar-1.6.2.tgz#4db06e2d963befe42dd44434212f5b8606b53831"
+vscode-anymatch@^1.3.0:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/vscode-anymatch/-/vscode-anymatch-1.3.2.tgz#fff357422ea59cc4d12a074f347957f08d251003"
+  dependencies:
+    micromatch "^2.1.5"
+    normalize-path "^2.0.0"
+
+vscode-chokidar@1.6.4:
+  version "1.6.4"
+  resolved "https://registry.yarnpkg.com/vscode-chokidar/-/vscode-chokidar-1.6.4.tgz#03e5b5f755a1e73b4f15310e66f59b11673fbdd2"
   dependencies:
-    anymatch "^1.3.0"
     async-each "^1.0.0"
     glob-parent "^2.0.0"
     inherits "^2.0.1"
@@ -6173,22 +7899,23 @@ vscode-chokidar@1.6.2:
     is-glob "^2.0.0"
     path-is-absolute "^1.0.0"
     readdirp "^2.0.0"
+    vscode-anymatch "^1.3.0"
   optionalDependencies:
-    vscode-fsevents "0.3.8"
+    vscode-fsevents "0.3.9"
 
-vscode-debugprotocol@1.28.0:
-  version "1.28.0"
-  resolved "https://registry.yarnpkg.com/vscode-debugprotocol/-/vscode-debugprotocol-1.28.0.tgz#b9fb97c3fb2dadbec78e5c1619ff12bf741ce406"
+vscode-debugprotocol@1.32.0-pre.0:
+  version "1.32.0-pre.0"
+  resolved "https://registry.yarnpkg.com/vscode-debugprotocol/-/vscode-debugprotocol-1.32.0-pre.0.tgz#14b3c07b8d7016f91b6984ec18292c18a42d2705"
 
-vscode-fsevents@0.3.8:
-  version "0.3.8"
-  resolved "https://registry.yarnpkg.com/vscode-fsevents/-/vscode-fsevents-0.3.8.tgz#389647fa2f6daffedf1b40132a5bb96ac6501521"
+vscode-fsevents@0.3.9:
+  version "0.3.9"
+  resolved "https://registry.yarnpkg.com/vscode-fsevents/-/vscode-fsevents-0.3.9.tgz#edbb66ea2c4eeb102b9194bb602e73bd9512c64c"
   dependencies:
-    nan "^2.3.0"
+    nan "^2.10.0"
 
-vscode-nls-dev@3.0.7:
-  version "3.0.7"
-  resolved "https://registry.yarnpkg.com/vscode-nls-dev/-/vscode-nls-dev-3.0.7.tgz#8cfbb371cb3c8f47f247073d9f84a6af357bbfe0"
+vscode-nls-dev@3.2.2:
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/vscode-nls-dev/-/vscode-nls-dev-3.2.2.tgz#5855c9b3e566dd00fd6108f9c2e1bd02c925c153"
   dependencies:
     clone "^2.1.1"
     event-stream "^3.3.4"
@@ -6212,22 +7939,21 @@ vscode-nsfw@1.0.17:
     nan "^2.0.0"
     promisify-node "^0.3.0"
 
-vscode-ripgrep@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/vscode-ripgrep/-/vscode-ripgrep-1.0.1.tgz#eff2f2b2a49921ac0acd3ff8dfecaaeebf0184cf"
+vscode-ripgrep@1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/vscode-ripgrep/-/vscode-ripgrep-1.1.0.tgz#93c1e39d88342ee1b15530a12898ce930d511948"
 
-vscode-textmate@^3.3.3:
-  version "3.3.3"
-  resolved "https://registry.yarnpkg.com/vscode-textmate/-/vscode-textmate-3.3.3.tgz#8d737f2965046503a4088d47c2793aebe246d355"
+vscode-textmate@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/vscode-textmate/-/vscode-textmate-4.0.1.tgz#6c36f28e9059ce12bc34907f7a33ea43166b26a8"
   dependencies:
-    fast-plist "^0.1.2"
-    oniguruma "^6.0.1"
+    oniguruma "^7.0.0"
 
-vscode-xterm@3.5.0-beta8:
-  version "3.5.0-beta8"
-  resolved "https://registry.yarnpkg.com/vscode-xterm/-/vscode-xterm-3.5.0-beta8.tgz#beaf158e00ce8341caa18703b3d1ed18be78b676"
+vscode-xterm@3.8.0-beta2:
+  version "3.8.0-beta2"
+  resolved "https://registry.yarnpkg.com/vscode-xterm/-/vscode-xterm-3.8.0-beta2.tgz#e6f5149199e757c2fb908aaf64f4c0749f216186"
 
-vso-node-api@^6.1.2-preview:
+vso-node-api@6.1.2-preview:
   version "6.1.2-preview"
   resolved "https://registry.yarnpkg.com/vso-node-api/-/vso-node-api-6.1.2-preview.tgz#aab3546df2451ecd894e071bb99b5df19c5fa78f"
   dependencies:
@@ -6236,6 +7962,81 @@ vso-node-api@^6.1.2-preview:
     typed-rest-client "^0.9.0"
     underscore "^1.8.3"
 
+watchpack@^1.5.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.6.0.tgz#4bc12c2ebe8aa277a71f1d3f14d685c7b446cd00"
+  dependencies:
+    chokidar "^2.0.2"
+    graceful-fs "^4.1.2"
+    neo-async "^2.5.0"
+
+webpack-cli@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-3.1.0.tgz#d71a83687dcfeb758fdceeb0fe042f96bcf62994"
+  dependencies:
+    chalk "^2.4.1"
+    cross-spawn "^6.0.5"
+    enhanced-resolve "^4.0.0"
+    global-modules-path "^2.1.0"
+    import-local "^1.0.0"
+    inquirer "^6.0.0"
+    interpret "^1.1.0"
+    loader-utils "^1.1.0"
+    supports-color "^5.4.0"
+    v8-compile-cache "^2.0.0"
+    yargs "^12.0.1"
+
+webpack-sources@^1.0.1, webpack-sources@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.1.0.tgz#a101ebae59d6507354d71d8013950a3a8b7a5a54"
+  dependencies:
+    source-list-map "^2.0.0"
+    source-map "~0.6.1"
+
+webpack-stream@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/webpack-stream/-/webpack-stream-5.1.1.tgz#15b1d91da6887a37f6832128383ae0282bd7d0e7"
+  dependencies:
+    fancy-log "^1.3.2"
+    lodash.clone "^4.3.2"
+    lodash.some "^4.2.2"
+    memory-fs "^0.4.1"
+    plugin-error "^1.0.1"
+    supports-color "^5.3.0"
+    through "^2.3.8"
+    vinyl "^2.1.0"
+    webpack "^4.7.0"
+
+webpack@^4.16.5, webpack@^4.7.0:
+  version "4.16.5"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.16.5.tgz#29fb39462823d7eb8aefcab8b45f7f241db0d092"
+  dependencies:
+    "@webassemblyjs/ast" "1.5.13"
+    "@webassemblyjs/helper-module-context" "1.5.13"
+    "@webassemblyjs/wasm-edit" "1.5.13"
+    "@webassemblyjs/wasm-opt" "1.5.13"
+    "@webassemblyjs/wasm-parser" "1.5.13"
+    acorn "^5.6.2"
+    acorn-dynamic-import "^3.0.0"
+    ajv "^6.1.0"
+    ajv-keywords "^3.1.0"
+    chrome-trace-event "^1.0.0"
+    enhanced-resolve "^4.1.0"
+    eslint-scope "^4.0.0"
+    json-parse-better-errors "^1.0.2"
+    loader-runner "^2.3.0"
+    loader-utils "^1.1.0"
+    memory-fs "~0.4.1"
+    micromatch "^3.1.8"
+    mkdirp "~0.5.0"
+    neo-async "^2.5.0"
+    node-libs-browser "^2.0.0"
+    schema-utils "^0.4.4"
+    tapable "^1.0.0"
+    uglifyjs-webpack-plugin "^1.2.4"
+    watchpack "^1.5.0"
+    webpack-sources "^1.0.1"
+
 whet.extend@~0.9.9:
   version "0.9.9"
   resolved "https://registry.yarnpkg.com/whet.extend/-/whet.extend-0.9.9.tgz#f877d5bf648c97e5aa542fadc16d6a259b9c11a1"
@@ -6281,6 +8082,10 @@ windows-process-tree@0.2.2:
   dependencies:
     nan "^2.6.2"
 
+winreg@^1.2.4:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/winreg/-/winreg-1.2.4.tgz#ba065629b7a925130e15779108cf540990e98d1b"
+
 wordwrap@0.0.2:
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f"
@@ -6293,6 +8098,12 @@ wordwrap@~0.0.2:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107"
 
+worker-farm@^1.5.2:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.6.0.tgz#aecc405976fab5a95526180846f0dba288f3a4a0"
+  dependencies:
+    errno "~0.1.7"
+
 wrap-ansi@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"
@@ -6335,6 +8146,10 @@ xml2js@^0.4.19:
     sax ">=0.6.0"
     xmlbuilder "~9.0.1"
 
+xml@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/xml/-/xml-1.0.1.tgz#78ba72020029c5bc87b8a81a3cfcd74b4a2fc1e5"
+
 xmlbuilder@0.4.3:
   version "0.4.3"
   resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-0.4.3.tgz#c4614ba74e0ad196e609c9272cd9e1ddb28a8a58"
@@ -6357,6 +8172,10 @@ xmldom@0.1.x:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/xmlhttprequest/-/xmlhttprequest-1.8.0.tgz#67fe075c5c24fef39f9d65f5f7b7fe75171968fc"
 
+xregexp@4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-4.0.0.tgz#e698189de49dd2a18cc5687b05e17c8e43943020"
+
 "xtend@>=4.0.0 <4.1.0-0", xtend@^4.0.0, xtend@~4.0.0, xtend@~4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
@@ -6375,10 +8194,24 @@ y18n@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41"
 
+"y18n@^3.2.1 || ^4.0.0", y18n@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b"
+
 yallist@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
 
+yallist@^3.0.0, yallist@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.2.tgz#8452b4bb7e83c7c188d8041c1a837c773d6d8bb9"
+
+yargs-parser@^10.1.0:
+  version "10.1.0"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-10.1.0.tgz#7202265b89f7e9e9f2e5765e0fe735a905edbaa8"
+  dependencies:
+    camelcase "^4.1.0"
+
 yargs-parser@^8.1.0:
   version "8.1.0"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-8.1.0.tgz#f1376a33b6629a5d063782944da732631e966950"
@@ -6402,6 +8235,23 @@ yargs@^10.1.1:
     y18n "^3.2.1"
     yargs-parser "^8.1.0"
 
+yargs@^12.0.1:
+  version "12.0.1"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.1.tgz#6432e56123bb4e7c3562115401e98374060261c2"
+  dependencies:
+    cliui "^4.0.0"
+    decamelize "^2.0.0"
+    find-up "^3.0.0"
+    get-caller-file "^1.0.1"
+    os-locale "^2.0.0"
+    require-directory "^2.1.1"
+    require-main-filename "^1.0.1"
+    set-blocking "^2.0.0"
+    string-width "^2.0.0"
+    which-module "^2.0.0"
+    y18n "^3.2.1 || ^4.0.0"
+    yargs-parser "^10.1.0"
+
 yargs@~3.10.0:
   version "3.10.0"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.10.0.tgz#f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1"
@@ -6424,7 +8274,7 @@ yauzl@^2.2.1, yauzl@^2.3.1, yauzl@^2.9.1:
     buffer-crc32 "~0.2.3"
     fd-slicer "~1.0.1"
 
-yazl@^2.2.1, yazl@^2.2.2:
+yazl@^2.2.1, yazl@^2.2.2, yazl@^2.4.3:
   version "2.4.3"
   resolved "https://registry.yarnpkg.com/yazl/-/yazl-2.4.3.tgz#ec26e5cc87d5601b9df8432dbdd3cd2e5173a071"
   dependencies: